diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 390df0c3ed..a03915a264 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3413 +1,3932 @@
-/types/abbrev/                                           @BendingBender
-/types/ably/                                             @ably
-/types/abs/                                              @AyaMorisawa
-/types/absolute/                                         @AyaMorisawa
-/types/acc-wizard/                                       @cyrilschumacher
-/types/accepts/                                          @bomret
-/types/accounting/                                       @gerich-home @chrisleck
-/types/ace/                                              @Diullei
-/types/acl/                                              @tkQubo
-/types/acorn/                                            @RReverser @e-cloud
-/types/actioncable/                                      @zhu1230
-/types/activex-adodb/                                    @zspitz
-/types/activex-scripting/                                @zspitz
-/types/activex-wia/                                      @zspitz
-/types/adal/                                             @mmaitre314
-/types/adm-zip/                                          @jvilk @abner
-/types/adone/                                            @s0m3on3 @maxveres
-/types/aframe/                                           @devpaul
-/types/agenda/                                           @meirgottlieb
-/types/aggregate-error/                                  @BendingBender
-/types/alertify/                                         @jjeffery
-/types/alexa-sdk/                                        @petebeegle @hoo29 @pascalwhoop @blforce
-/types/alexa-voice-service/                              @dolanmiu
-/types/algebra.js/                                       @CaselIT
-/types/algoliasearch/                                    @cbaptiste
-/types/alt/                                              @Shearerbeard
-/types/amazon-product-api/                               @MattiLehtinen
-/types/amcharts/                                         @aleksey-bykov
-/types/amplify/                                          @joeriks
-/types/amplify-deferred/                                 @joeriks @laurentiustamate94
-/types/amplitude-js/                                     @Asido
-/types/amqp/                                             @seikho
-/types/amqp-rpc/                                         @wokim
-/types/amqplib/                                          @mnahkies @abreits @nfantone
-/types/analytics-node/                                   @fongandrew
-/types/angular/                                          @diegovilar @thorn0 @calebstdenis @leonard-thieu
-/types/angular-agility/                                  @rolandzwaga
-/types/angular-animate/                                  @michelsalib @adidahiya @rasch @codyschaaf
-/types/angular-block-ui/                                 @lassebn @sclassen
-/types/angular-bootstrap-calendar/                       @Odrin
-/types/angular-bootstrap-lightbox/                       @rolandzwaga
-/types/angular-breadcrumb/                               @marctalary
-/types/angular-clipboard/                                @bradfordwagner
-/types/angular-cookie/                                   @borislavjivkov
-/types/angular-cookies/                                  @diegovilar @aciccarello
-/types/angular-deferred-bootstrap/                       @Ritzlgrmft
-/types/angular-dialog-service/                           @wcomartin
-/types/angular-dynamic-locale/                           @stephenlautier
-/types/angular-environment/                              @terrawheat
-/types/angular-es/                                       @mbutsykin
-/types/angular-feature-flags/                            @borislavjivkov
-/types/angular-file-saver/                               @deenairn
-/types/angular-formly/                                   @scatcher
-/types/angular-fullscreen/                               @julienpa
-/types/angular-gettext/                                  @AkosLukacs
-/types/angular-google-analytics/                         @cyrilschumacher @Toxantron
-/types/angular-gridster/                                 @jpmnteiro
-/types/angular-growl-v2/                                 @mkp05
-/types/angular-hotkeys/                                  @jlz27 @reppners
-/types/angular-http-auth/                                @vvakame
-/types/angular-httpi/                                    @Kukks
-/types/angular-idle/                                     @mthamil
-/types/angular-jwt/                                      @rerezz
-/types/angular-load/                                     @david-gang
-/types/angular-loading-bar/                              @stephenlautier
-/types/angular-local-storage/                            @kenfdev @dona278
-/types/angular-localforage/                              @reppners
-/types/angular-locker/                                   @nkovacic
-/types/angular-material/                                 @blbigelow @PeterHajdu @Dona278 @geertjansen
-/types/angular-media-queries/                            @jpmnteiro
-/types/angular-meteor/                                   @pgrm
-/types/angular-mocks/                                    @diegovilar @daltin
-/types/angular-modal/                                    @paullessing
-/types/angular-oauth2/                                   @anteriovieira
-/types/angular-pdfjs-viewer/                             @bastienmoulia
-/types/angular-permission/                               @vmishevski
-/types/angular-promise-tracker/                          @rufusl
-/types/angular-q-spread/                                 @rafw87
-/types/angular-resource/                                 @diegovilar @miffels
-/types/angular-route/                                    @park9140
-/types/angular-sanitize/                                 @diegovilar
-/types/angular-scenario/                                 @RomanoLindano
-/types/angular-scroll/                                   @samherrmann
-/types/angular-signalr-hub/                              @AdamSantaniello
-/types/angular-spinner/                                  @Biegal
-/types/angular-storage/                                  @mdekrey
-/types/angular-strap/                                    @samherrmann
-/types/angular-toastr/                                   @nkovacic @trodi
-/types/angular-toasty/                                   @muenchdo
-/types/angular-tooltips/                                 @leonard-thieu
-/types/angular-touchspin/                                @nkovacic
-/types/angular-translate/                                @michelsalib
-/types/angular-ui-bootstrap/                             @xt0rted @ry8806
-/types/angular-ui-router/                                @michelsalib @matiishyn
-/types/angular-ui-scroll/                                @marknadig
-/types/angular-ui-sortable/                              @thgreasi
-/types/angular-ui-tree/                                  @CalvinFernandez
-/types/angular-websocket/                                @nickveys
-/types/angular-wizard/                                   @mjurisic @rwwilden
-/types/angular-xeditable/                                @jpmnteiro
-/types/angular.throttle/                                 @reppners
-/types/angularfire/                                      @thSoft
-/types/angularlocalstorage/                              @horiuchi
-/types/angulartics/                                      @stevenfan
-/types/animation-frame/                                  @qinfchen
-/types/animejs/                                          @A-Babin
-/types/annyang/                                          @hisham @theluk
-/types/ansi-styles/                                      @brynbellomy
-/types/ansicolors/                                       @rogierschouten
-/types/any-db/                                           @rogierschouten
-/types/any-db-transaction/                               @rogierschouten
-/types/anybar/                                           @khoomeister
-/types/anydb-sql-migrations/                             @spion
-/types/anymatch/                                         @BendingBender
-/types/apex.js/                                          @y13i
-/types/aphrodite/                                        @asvetliakov
-/types/api-error-handler/                                @tkrotoff
-/types/apigee-access/                                    @CasperSkydt
-/types/app-root-path/                                    @shantmarouti
-/types/appframework/                                     @kyo-ago
-/types/appletvjs/                                        @brainded
-/types/applicationinsights/                              @scsouthw
-/types/applicationinsights-js/                           @kamilszostak
-/types/arbiter/                                          @arash16
-/types/arcgis-js-api/v3/                                 @Esri
-/types/arcgis-js-api/                                    @Esri
-/types/arcgis-rest-api/                                  @JeffJacobson
-/types/arcgis-to-geojson-utils/                          @JeffJacobson
-/types/archiver/                                         @dolanmiu @crevil
-/types/archy/                                            @vvakame
-/types/are-we-there-yet/                                 @brianloveswords
-/types/argparse/                                         @arcticwaters
-/types/argv/                                             @hookclaw
-/types/array-find-index/                                 @samverschueren
-/types/array-foreach/                                    @skysteve
-/types/array-uniq/                                       @DanielRosenwasser
-/types/arrify/                                           @wanganjun
-/types/artyom.js/                                        @semagarcia
-/types/asana/                                            @tkqubo
-/types/ascii2mathml/                                     @RagibHasin
-/types/asenv/                                            @remisery
-/types/askmethat-rating/                                 @AlexTeixeira
-/types/asn1js/                                           @microshine
-/types/aspnet-identity-pw/                               @jt000
-/types/assert-equal-jsx/                                 @seryl
-/types/assert-plus/                                      @KostyaTretyak
-/types/assertion-error/                                  @Bartvds
-/types/assertsharp/                                      @brunolm
-/types/assets-webpack-plugin/                            @kryops
-/types/async/                                            @borisyankov @kern0 @Penryn @fenying @pascalmartin
-/types/async-lock/                                       @elisee
-/types/async-polling/                                    @Goldsmith42
-/types/async.nexttick/                                   @pyrho
-/types/asyncblock/                                       @horiuchi
-/types/atmosphere/                                       @toedter
-/types/atom/                                             @vvakame
-/types/atom-keymap/                                      @enlight
-/types/atpl/                                             @soywiz
-/types/audiosprite/                                      @Perlmint
-/types/aurelia-knockout/                                 @code-chris
-/types/auth0/                                            @wbhob @westy92 @amiram
-/types/auth0-angular/                                    @homesar
-/types/auth0-js/v7/                                      @advancedrei
-/types/auth0-js/                                         @adrianchia @mdurrant
-/types/auth0-lock/                                       @carusology @goldcaddy77
-/types/auth0.widget/                                     @advancedrei
-/types/auto-launch/                                      @rhysd @unindented
-/types/auto-sni/                                         @janwo
-/types/autobahn/                                         @darkl @valepu
-/types/autobind-decorator/                               @NoHomey
-/types/autolinker/                                       @leonyu
-/types/autoprefixer/                                     @odnamrataizem
-/types/autosize/                                         @kingdango @keika299 @NeekSandhu
-/types/awesomplete/                                      @webbiesdk @bmdixon @tbekolay
-/types/aws-iot-device-sdk/                               @niik
-/types/aws-lambda/                                       @skarum @tobyhede @buggy @y13i @wwwy3y3
-/types/aws-serverless-express/                           @threesquared @jcaffey @mattmeye
-/types/aws4/                                             @ajcrites
-/types/axel/                                             @ruslan-molodyko
-/types/azure/                                            @AndrewGaspar @antiveeranna @SomaticIT
-/types/azure-mobile-services-client/                     @dmorosinotto
-/types/azure-sb/                                         @Azure
-/types/b_/                                               @outring
-/types/babel-code-frame/                                 @mohsen1
-/types/babel-core/                                       @yortus @marvinhagemeister
-/types/babel-generator/                                  @yortus @johnnyestilles
-/types/babel-plugin-syntax-jsx/                          @marvinhagemeister
-/types/babel-template/                                   @yortus @marvinhagemeister
-/types/babel-traverse/                                   @yortus @marvinhagemeister
-/types/babel-types/                                      @yortus @baxtersa @marvinhagemeister
-/types/babelify/                                         @TeamworkGuy2 @marvinhagemeister
-/types/babylon/                                          @yortus @marvinhagemeister
-/types/babyparse/                                        @cdiddy77
-/types/backbone/                                         @borisyankov @nvivo
-/types/backbone-associations/                            @craigbrett17
-/types/backbone-fetch-cache/                             @delphinus35
-/types/backbone-relational/                              @eirikhm
-/types/backbone.layoutmanager/                           @hejiang2000
-/types/backbone.localstorage/                            @lgrignon
-/types/backbone.marionette/                              @zhamid @nvivo @sventschui
-/types/backbone.paginator/                               @Nyamazing
-/types/backbone.radio/                                   @alphaleonis
-/types/backgrid/                                         @jlujan
-/types/backlog-js/                                       @vvatanabe
-/types/baconjs/                                          @alexander-matsievsky @gekkio
-/types/bagpipes/                                         @micmro
-/types/barcode/                                          @pvomhoff
-/types/bardjs/                                           @TepigMC
-/types/base-64/                                          @dolanmiu
-/types/base-x/                                           @chrootsu
-/types/base16/                                           @alechill
-/types/base64-js/                                        @pe8ter
-/types/bases/                                            @harikv
-/types/basic-auth/                                       @moonpyk @vesse
-/types/batch-stream/                                     @drudge
-/types/bazinga-translator/                               @alexndlm
-/types/bcrypt/                                           @codeanimal @IOAyman
-/types/bcryptjs/                                         @RafaelKr
-/types/bem-cn/                                           @selkinvitaly
-/types/better-curry/                                     @pocesar
-/types/better-sqlite3/                                   @Morfent
-/types/bezier-easing/                                    @ptlis
-/types/bezier-js/                                        @danmarshall
-/types/bgiframe/                                         @sumegizoltan
-/types/big.js/                                           @nycdotnet
-/types/bigi/                                             @mhegazy
-/types/bigint/                                           @Evgenus
-/types/bignum/                                           @Patman64
-/types/bignumber.js/                                     @LaserUnicorns
-/types/bigscreen/                                        @dduugg
-/types/bind-ponyfill/                                    @skysteve
-/types/bingmaps/                                         @rbrundritt
-/types/bintrees/                                         @CjS77
-/types/bip21/                                            @stefanhuber
-/types/bit-array/                                        @mudkipme
-/types/bitcoinjs-lib/                                    @mhegazy @dlebrecht @rbuckton
-/types/bittorrent-protocol/                              @feross @tlaziuk
-/types/bitwise-xor/                                      @rogierschouten
-/types/bl/                                               @Bartvds
-/types/blacklist/                                        @mhegazy
-/types/blazy/                                            @julienpa
-/types/blessed/                                          @brynbellomy
-/types/blissfuljs/                                       @fskorzec
-/types/blob-stream/                                      @erichillah
-/types/blob-util/                                        @WorldMaker
-/types/blocks/                                           @ksmigiel
-/types/bloomfilter/                                      @slawiko
-/types/blue-tape/                                        @sodatea
-/types/bluebird/v1/                                      @Bartvds
-/types/bluebird/v2/                                      @Bartvds @falsandtru
-/types/bluebird/                                         @lhecker
-/types/bluebird-global/                                  @d-ph
-/types/bluebird-retry/                                   @pvomhoff
-/types/blueimp-md5/                                      @rmartone @mkohlmyr
-/types/body-parser/                                      @santialbo @vilic @dreampulse @blendsdk @tlaziuk
-/types/bonjour/                                          @quentin-ol @octo-sniffle
-/types/bookshelf/                                        @arcticwaters @vesse
-/types/boom/v3/                                          @rogatty
-/types/boom/                                             @rogatty @AJamesPhillips @jineshshah36
-/types/bootbox/                                          @vbortone @konpikwastaken @kanup @icereed @trodi @stannynuytkens
-/types/bootpag/                                          @rdeneau
-/types/bootstrap/                                        @borisyankov
-/types/bootstrap-datepicker/                             @borisyankov
-/types/bootstrap-fileinput/                              @CheCoxshall
-/types/bootstrap-maxlength/                              @danmana
-/types/bootstrap-notify/                                 @niemyjski @mouse0270 @robert-voica
-/types/bootstrap-select/                                 @LKay
-/types/bootstrap-slider/                                 @dbeckwith @leonard-thieu
-/types/bootstrap-switch/                                 @johnmbaughman
-/types/bootstrap-table/                                  @talatbaig
-/types/bootstrap-touchspin/                              @albinsunnanbo
-/types/bootstrap-treeview/                               @jbtronics
-/types/bootstrap-validator/                              @BradyLiles
-/types/bootstrap.paginator/                              @derikwhittaker
-/types/bootstrap.timepicker/                             @derikwhittaker
-/types/bootstrap.v3.datetimepicker/v3/                   @bayitajesi
-/types/bootstrap.v3.datetimepicker/                      @katonap
-/types/bounce.js/                                        @cherrry
-/types/bowser/                                           @pocesar
-/types/box2d/                                            @jbaldwin
-/types/brace-expansion/                                  @BendingBender
-/types/braintree-web/                                    @chlela
-/types/breeze/                                           @borisyankov
-/types/brorand/                                          @chrootsu
-/types/browser-bunyan/                                   @PaulLockwood @kryops
-/types/browser-fingerprint/                              @LKay
-/types/browser-harness/                                  @scriby
-/types/browser-pack/                                     @TeamworkGuy2
-/types/browser-report/                                   @JTOne123
-/types/browser-resolve/                                  @marionebl
-/types/browser-sync/                                     @joeskeen
-/types/browserify/                                       @AndrewGaspar @jvilk @leonard-thieu
-/types/bs58/                                             @chrootsu
-/types/bson/                                             @horiuchi @CaselIT
-/types/bucks/                                            @zaneli
-/types/buffer-compare/                                   @chrootsu
-/types/buffer-equal/                                     @Bartvds
-/types/buffers/                                          @rhencke
-/types/bufferstream/                                     @Bartvds
-/types/bull/v2/                                          @bgrieder @JProgrammer
-/types/bull/                                             @bgrieder @JProgrammer @marshall007
-/types/bunnymq/                                          @cyrilschumacher
-/types/bunyan/                                           @amikhalev
-/types/bunyan-blackhole/                                 @olivr70
-/types/bunyan-config/                                    @cyrilschumacher
-/types/bunyan-prettystream/                              @jasonswearingen @enlight
-/types/bunyan-winston-adapter/                           @stevehipwell
-/types/busboy/                                           @jacobbaskin
-/types/business-rules-engine/                            @rsamec
-/types/bwip-js/                                          @MugeSo
-/types/byline/                                           @reppners
-/types/bytebuffer/                                       @cappellin
-/types/bytes/                                            @danny8002
-/types/c3/                                               @mcliment @gerinjacob @denyo
-/types/cache-manager/                                    @GausSim
-/types/cachefactory/                                     @vag1830 @danielmassa
-/types/cal-heatmap/                                      @RetroChrisB
-/types/callsite/                                         @newclear
-/types/callsites/                                        @BendingBender
-/types/calq/                                             @eirikhm
-/types/camelcase/                                        @samverschueren
-/types/camelcase-keys/                                   @mhegazy
-/types/camo/                                             @lucasmciruzzi
-/types/cannon/                                           @clark-stevenson
-/types/canvas-gauges/                                    @Mikhus
-/types/canvasjs/                                         @brutalimp
-/types/capitalize/                                       @frederickfogerty
-/types/cash/                                             @akvlko
-/types/casperjs/                                         @jedmao
-/types/cassandra-driver/                                 @Svjard
-/types/catbox/                                           @jasonswearingen @AJamesPhillips
-/types/cbor/                                             @pushplay
-/types/ccap/                                             @taoqf
-/types/chai/v2/                                          @Bartvds @AGBrown
-/types/chai/                                             @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin
-/types/chai-arrays/                                      @clementprevot
-/types/chai-as-promised/                                 @jt000 @Kuniwak @leonard-thieu
-/types/chai-datetime/                                    @cliffburger
-/types/chai-dom/                                         @mattlewis92
-/types/chai-enzyme/                                      @asvetliakov
-/types/chai-fuzzy/                                       @Bartvds
-/types/chai-http/                                        @Nemo157 @G1itcher @CaselIT
-/types/chai-jquery/                                      @kazimanzurrashid
-/types/chai-json-schema/                                 @ulrichheiniger
-/types/chai-oequal/                                      @mizunashi-mana
-/types/chai-spies/                                       @kuzn-ilya
-/types/chai-string/                                      @nmalaguti
-/types/chai-subset/                                      @delta62 @AGBrown
-/types/chai-xml/                                         @jedigo
-/types/chalk/                                            @Diullei @Bartvds @nicojs
-/types/chance/                                           @cbowdon
-/types/change-emitter/                                   @iskandersierra
-/types/charm/                                            @Xananax
-/types/chart.js/                                         @anuti @FabienLavocat @KentarouTakeda @larrybahr
-/types/chartist/                                         @mtgibbs @psimonski
-/types/chartjs/                                          @Steve-Fenton @FanaHOVA
-/types/chayns/                                           @HenningKuehl
-/types/check-sum/                                        @BendingBender
-/types/checkstyle-formatter/                             @mhegazy
-/types/checksum/                                         @rogierschouten
-/types/cheerio/                                          @blittle @wmaurer @umarniz
-/types/chokidar/                                         @reppners @felixfbecker
-/types/chosen-js/                                        @borisyankov @denisname
-/types/chroma-js/v0/                                     @invliD
-/types/chroma-js/                                        @invliD @mpacholec
-/types/chrome/                                           @matthewkimber @otiai10 @couven92 @rreverser @sreimer15
-/types/chunked-dc/                                       @dbrgn
-/types/circular-json/                                    @jpevarnek
-/types/ckeditor/                                         @ondrejsevcik
-/types/clamp-js/                                         @Hikariii
-/types/classnames/                                       @adidahiya @JKillian @seansfkelley @mradamczyk @marvinhagemeister
-/types/cldrjs/                                           @RamanBut-Husaim @gcastre
-/types/clean-css/                                        @tkrotoff
-/types/clean-stack/                                      @BendingBender
-/types/clear-require/                                    @dan-j
-/types/cli/                                              @kayahr
-/types/cli-color/                                        @ChaosinaCan
-/types/cli-table2/                                       @mgroenhoff
-/types/client-sessions/                                  @netroy
-/types/cliff/                                            @brynbellomy
-/types/clipboard/                                        @impworks
-/types/clipboard-js/                                     @markwongsk
-/types/clipboardy/                                       @BendingBender
-/types/clndr/                                            @jasperjn
-/types/closure-compiler/                                 @mprobst
-/types/cloud-env/                                        @Morfent
-/types/cloudflare-apps/                                  @MartynasZilinskas
-/types/co-body/                                          @geoffreak
-/types/co-views/                                         @devlee @geoffreak
-/types/code/                                             @prashaantt
-/types/codemirror/                                       @mihailik @nrbernard
-/types/codependency/                                     @morphatic
-/types/coffeeify/                                        @tkQubo
-/types/coinstring/                                       @mhegazy
-/types/collections/                                      @scarabedore
-/types/color/v0/                                         @LKay
-/types/color/v1/                                         @LKay
-/types/color/                                            @Airlun
-/types/color-convert/                                    @Airlun
-/types/color-name/                                       @Ailrun
-/types/color-string/                                     @BendingBender @danmarshall
-/types/colorbrewer/                                      @mtraynham
-/types/colors/                                           @Bartvds @staeke
-/types/com.darktalker.cordova.screenshot/                @akarienta
-/types/combine-source-map/                               @TeamworkGuy2
-/types/combined-stream/                                  @felixge @tlaziuk
-/types/combokeys/                                        @iclanton
-/types/cometd/                                           @derekcicerone
-/types/command-line-args/                                @CzBuCHi
-/types/command-line-commands/                            @CzBuCHi
-/types/commander/                                        @alan-agius4 @mdezem @vvakame
-/types/commangular/                                      @hiraash
-/types/comment-json/                                     @Jason3S
-/types/common-tags/                                      @zuzusik
-/types/commonmark/                                       @nicojs @leonard-thieu
-/types/compare-version/                                  @jpevarnek
-/types/complex/                                          @AyaMorisawa
-/types/component-emitter/                                @psnider
-/types/compose-function/                                 @denis-sokolov
-/types/compressible/                                     @BendingBender
-/types/compression/                                      @santialbo
-/types/compression-webpack-plugin/                       @dublicator
-/types/concat-stream/                                    @jmarianer
-/types/concaveman/                                       @DenisCarriere
-/types/conf/v0/                                          @SamVerschueren
-/types/conf/                                             @SamVerschueren @BendingBender
-/types/confidence/                                       @jppellerin
-/types/config/                                           @RWander
-/types/configstore/                                      @ArcticLight
-/types/confit/                                           @ethanresnick
-/types/connect/                                          @SomaticIT
-/types/connect-ensure-login/                             @0x6368656174
-/types/connect-flash/                                    @AndreasGassmann
-/types/connect-history-api-fallback/                     @douglasduteil
-/types/connect-livereload/                               @SomaticIT
-/types/connect-modrewrite/                               @tinganho
-/types/connect-mongo/                                    @Syati
-/types/connect-redis/                                    @xstoudi @morcerf
-/types/connect-slashes/                                  @samherrmann
-/types/connect-timeout/                                  @cyrilschumacher
-/types/console-stamp/                                    @ericbyers
-/types/consolidate/                                      @soywiz @theosherry @nicolashenry
-/types/consul/                                           @chrootsu
-/types/content-disposition/                              @bomret
-/types/content-type/                                     @horiuchi @BendingBender
-/types/contentful-resolve-response/                      @antonkarsten
-/types/contextjs/                                        @kernhanda
-/types/continuation-local-storage/                       @rath @heycalmdown @aboveyou00
-/types/convert-hrtime/                                   @BendingBender
-/types/convert-source-map/                               @AndrewGaspar @mgroenhoff @TeamworkGuy2
-/types/convict/                                          @Nemo157 @vesse @elyscape
-/types/cookie/                                           @pine613
-/types/cookie-parser/                                    @santialbo @BendingBender
-/types/cookie-session/                                   @borislavjivkov
-/types/cookie-signature/                                 @lith-light-g
-/types/cookie_js/                                        @slawiko
-/types/cookies/                                          @WangZishi @jkeylu @BendingBender
-/types/copy-paste/                                       @SrTobi
-/types/copy-text-to-clipboard/                           @BendingBender
-/types/copy-webpack-plugin/                              @flying-sheep
-/types/cordova-ionic/                                    @hendrikmaus
-/types/cordova-plugin-app-version/                       @Ritzlgrmft
-/types/cordova-plugin-background-mode/                   @Lordnoname
-/types/cordova-plugin-badge/                             @timbru31
-/types/cordova-plugin-ble-central/                       @gjunge
-/types/cordova-plugin-device-name/                       @larrybahr
-/types/cordova-plugin-ibeacon/                           @Ritzlgrmft
-/types/cordova-plugin-insomnia/                          @Ritzlgrmft
-/types/cordova-plugin-keyboard/                          @danmana
-/types/cordova-plugin-mapsforge/                         @rafw87
-/types/cordova-plugin-ms-adal/                           @KaiWalter
-/types/cordova-plugin-native-keyboard/                   @lobo87
-/types/cordova-plugin-ouralabs/                          @Justin-Credible
-/types/cordova-plugin-qrscanner/                         @bitjson @jab
-/types/cordova-plugin-spinner/                           @Justin-Credible
-/types/cordova-plugin-statusbar/                         @Xinkai
-/types/cordova-plugin-vibration/                         @Minishlink
-/types/cordova-plugin-x-socialsharing/                   @Ritzlgrmft @larrybahr
-/types/cordova-sqlite-storage/                           @rafw87
-/types/cordova.plugins.diagnostic/                       @dpa99c
-/types/cordova_app_version_plugin/                       @larrybahr
-/types/cordovarduino/                                    @hendrikmaus
-/types/core-decorators/                                  @tkqubo
-/types/core-js/                                          @rbuckton @mfdeveloper
-/types/cote/                                             @makepost
-/types/couchbase/                                        @maouida
-/types/countdown/                                        @gjuchault
-/types/country-list/                                     @iRoachie
-/types/country-select-js/                                @humrochagf
-/types/cp-file/                                          @BendingBender
-/types/cpy/                                              @mhegazy @BendingBender
-/types/cradle/                                           @panuhorsmalahti
-/types/crc/                                              @YuJianrong
-/types/create-error/                                     @tkrotoff
-/types/createjs/                                         @evilangelist @gyohk
-/types/createjs-lib/                                     @evilangelist @gyohk
-/types/credential/                                       @phuvo
-/types/credit-card-type/                                 @LKay
-/types/cron/                                             @horiuchi
-/types/cropperjs/                                        @stepancar
-/types/croppie/                                          @connor4312
-/types/crossfilter/                                      @schmuli @iebaker
-/types/crossroads/                                       @diullei
-/types/cryptiles/                                        @awendland
-/types/crypto-js/                                        @misak113
-/types/cryptojs/                                         @giabao
-/types/cson/                                             @stpettersens
-/types/csprng/                                           @winksaville
-/types/csrf/                                             @markis
-/types/css/                                              @ilich
-/types/css-font-loading-module/                          @slikts
-/types/css-modules/                                      @NeekSandhu
-/types/cssbeautify/                                      @rictic
-/types/csurf/                                            @horiuchi
-/types/csv-parse/                                        @davidm77 @obi-jan-kenobi
-/types/csv-stringify/                                    @rogierschouten @arjenvanderende
-/types/csvtojson/                                        @EricByers @wcarson
-/types/cucumber/v1/                                      @abraaoalves @jan-molak @isoung @BendingBender
-/types/cucumber/                                         @abraaoalves @jan-molak @isoung @BendingBender
-/types/currency-formatter/                               @mhegazy
-/types/custom-error-generator/                           @thmiceli
-/types/cwise/                                            @taoqf
-/types/cwise-compiler/                                   @taoqf
-/types/cwise-parser/                                     @taoqf
-/types/cybozulabs-md5/                                   @pine613
-/types/cypress/                                          @ghengeveld @mikewoudenberg
-/types/d3/v3/                                            @gustavderdrache @borisyankov
-/types/d3/                                               @tomwanzek @gustavderdrache @borisyankov
-/types/d3-array/                                         @gustavderdrache @borisyankov @tomwanzek
-/types/d3-axis/                                          @tomwanzek @gustavderdrache @borisyankov
-/types/d3-box/                                           @lk-chen
-/types/d3-brush/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-chord/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-collection/                                    @tomwanzek @gustavderdrache @borisyankov
-/types/d3-color/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-contour/                                       @tomwanzek @Ledragon
-/types/d3-dispatch/                                      @tomwanzek @gustavderdrache @borisyankov
-/types/d3-drag/                                          @tomwanzek @gustavderdrache @borisyankov
-/types/d3-dsv/                                           @tomwanzek @gustavderdrache @borisyankov
-/types/d3-ease/                                          @tomwanzek @gustavderdrache @borisyankov
-/types/d3-force/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-format/                                        @tomwanzek @gustavderdrache @borisyankov
-/types/d3-geo/                                           @Ledragon @tomwanzek @gustavderdrache @borisyankov
-/types/d3-hexbin/                                        @uncovertruth @tomwanzek
-/types/d3-hierarchy/                                     @tomwanzek @gustavderdrache @borisyankov
-/types/d3-hsv/                                           @arrayjam
-/types/d3-interpolate/                                   @tomwanzek @gustavderdrache @borisyankov
-/types/d3-path/                                          @tomwanzek @gustavderdrache @borisyankov
-/types/d3-polygon/                                       @tomwanzek @gustavderdrache @borisyankov
-/types/d3-quadtree/                                      @tomwanzek @gustavderdrache @borisyankov
-/types/d3-queue/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-random/                                        @tomwanzek @gustavderdrache @borisyankov
-/types/d3-request/                                       @Ledragon @gustavderdrache @borisyankov @tomwanzek
-/types/d3-sankey/                                        @tomwanzek @gustavderdrache
-/types/d3-scale/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-scale-chromatic/                               @Ledragon @gustavderdrache @borisyankov
-/types/d3-selection/                                     @tomwanzek @gustavderdrache @borisyankov
-/types/d3-selection-multi/                               @gustavderdrache @borisyankov
-/types/d3-shape/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-time/                                          @tomwanzek @gustavderdrache @borisyankov
-/types/d3-time-format/                                   @tomwanzek @gustavderdrache @borisyankov
-/types/d3-timer/                                         @tomwanzek @gustavderdrache @borisyankov
-/types/d3-tip/                                           @brspnnggrt
-/types/d3-transition/                                    @tomwanzek @gustavderdrache @borisyankov
-/types/d3-voronoi/                                       @tomwanzek @gustavderdrache @borisyankov
-/types/d3-zoom/                                          @tomwanzek @gustavderdrache @borisyankov
-/types/d3.cloud.layout/                                  @hansrwindhoff
-/types/d3.slider/                                        @lk-chen
-/types/d3kit/                                            @morphatic
-/types/d3pie/                                            @mc-petry
-/types/dagre/                                            @qinfchen
-/types/dagre-d3/                                         @markwongsk
-/types/dargs/                                            @BendingBender
-/types/dat-gui/                                          @gyohk @sonic3d @rroylance
-/types/data-driven/                                      @mrhen
-/types/datadog-metrics/                                  @pushplay
-/types/datatables.net/                                   @omidkrad @pragmatrix @denisemauldin
-/types/datatables.net-buttons/                           @SammyG4Free @jimhartford
-/types/datatables.net-fixedheader/                       @szechyjs
-/types/datatables.net-rowreorder/                        @baywet
-/types/datatables.net-select/                            @szechyjs
-/types/date.format.js/                                   @balrob
-/types/dateformat/                                       @aicest
-/types/datejs/                                           @rupertavery
-/types/daterangepicker/                                  @SirMartin @smasala
-/types/db-migrate-base/                                  @nickiannone
-/types/db-migrate-pg/                                    @nickiannone
-/types/db.js/                                            @cgwrench
-/types/dc/                                               @hansrwindhoff @mtraynham
-/types/deasync/                                          @Sicilica
-/types/debessmann/                                       @vkorehov
-/types/debounce/                                         @denis-sokolov
-/types/debug/                                            @swook @galtalmor @zamb3zi
-/types/decamelize/                                       @samverschueren
-/types/decay/                                            @enaeseth
-/types/decimal.js/                                       @musicist288
-/types/decorum/                                          @dflor003
-/types/dedent/                                           @douglasduteil
-/types/deep-assign/                                      @souldreamer
-/types/deep-diff/                                        @ZauberNerd
-/types/deep-equal/                                       @remojansen @janslow
-/types/deep-extend/                                      @rhysd
-/types/deep-freeze/                                      @Bartvds @aluanhaddad
-/types/deep-freeze-strict/                               @mhegazy
-/types/deepmerge/                                        @marvinscharle
-/types/defaults/                                         @IbtihelCHNAB
-/types/define-lazy-prop/                                 @BendingBender
-/types/defined/                                          @BendingBender
-/types/deku/                                             @pocka
-/types/del/v2/                                           @AyaMorisawa
-/types/del/                                              @AyaMorisawa @BendingBender
-/types/delaunator/                                       @DenisCarriere
-/types/delay/                                            @BendingBender
-/types/denodeify/                                        @joaomoreno
-/types/deoxxa-content-type/                              @pine613
-/types/depd/                                             @danny8002
-/types/deployjava/                                       @cyrilschumacher
-/types/destroy/                                          @BendingBender
-/types/destroy-on-hwm/                                   @BendingBender
-/types/detect-browser/                                   @rogierschouten
-/types/detect-hover/                                     @thomastilkema
-/types/detect-indent/v0/                                 @Bartvds
-/types/detect-indent/                                    @Bartvds @BendingBender
-/types/detect-it/                                        @thomastilkema
-/types/detect-newline/                                   @BendingBender
-/types/detect-passive-events/                            @thomastilkema
-/types/detect-pointer/                                   @thomastilkema
-/types/detect-port/                                      @lith-light-g
-/types/detect-touch-events/                              @thomastilkema
-/types/df-visible/                                       @Litee
-/types/dhtmlxgantt/                                      @mkozhukh @chriscamicas
-/types/dhtmlxscheduler/                                  @mkozhukh
-/types/di-lite/                                          @dcrusader
-/types/diacritics/                                       @otociulis
-/types/diff/                                             @vvakame
-/types/diff2html/                                        @rtfpessoa
-/types/dir-resolve/                                      @andy-ms
-/types/discontinuous-range/                              @OiCMudkips
-/types/disposable-email-domains/                         @geoffreak
-/types/doccookies/                                       @jonegerton
-/types/dockerode/                                        @seikho @nlaplante @isac322
-/types/docopt/                                           @giggio
-/types/doctrine/                                         @rictic
-/types/documentdb/                                       @NoelAbrahams @brettferdosi @ctstone @yifanwu
-/types/documentdb-server/                                @lith-light-g
-/types/dojo/                                             @vansimke
-/types/dom-inputevent/                                   @diagramatics
-/types/dom4/                                             @adidahiya @giladgray
-/types/domo/                                             @Steve-Fenton
-/types/dompurify/                                        @bazuzi
-/types/domready/                                         @dotnetnerd
-/types/donna/                                            @vvakame
-/types/dookie/                                           @swanest
-/types/dot/                                              @ZombieHunter
-/types/dot-object/                                       @nkovacic
-/types/dot-prop/v2/                                      @samverschueren
-/types/dot-prop/                                         @samverschueren @BendingBender
-/types/dotdotdot/                                        @milanjaros
-/types/dotenv/v2/                                        @borekb @enaeseth
-/types/dotenv/                                           @jussikinnula @borekb @enaeseth
-/types/dotenv-safe/                                      @krenor
-/types/dottie/                                           @domarmstrong
-/types/doublearray/                                      @mzsm
-/types/doubleclick-gpt/                                  @johngeorgewright
-/types/downloadjs/                                       @cwmoo740
-/types/draft-js/                                         @dmitryrogozhny @eelco @ghotiphud @schwers @michael-yx-wu @willisplummer
-/types/draggabilly/                                      @jaydubu
-/types/dragster/                                         @zskovacs
-/types/dragula/                                          @pwelter34 @abruzzihraig
-/types/dropboxjs/                                        @Steve-Fenton @xperiments
-/types/dropkickjs/                                       @VorobeY1326
-/types/dropzone/v4/                                      @nvivo @outring @renuo @Hikariii
-/types/dropzone/                                         @nvivo @outring @renuo @Hikariii @tedbcsgpro
-/types/duplexer2/                                        @Goldsmith42
-/types/duplexer3/                                        @BendingBender
-/types/durandal/                                         @BlueSpire
-/types/dustjs-linkedin/                                  @mdezem
-/types/dw-bxslider-4/                                    @namerci
-/types/dwt/                                              @yushulx
-/types/dymo-label-framework/                             @thijskuipers
-/types/dynatable/                                        @francoismassart
-/types/each/                                             @misak113
-/types/easeljs/                                          @evilangelist
-/types/easy-api-request/                                 @DeadAlready
-/types/easy-jsend/                                       @DeadAlready
-/types/easy-session/                                     @DeadAlready
-/types/easy-table/                                       @nikeee
-/types/easy-x-headers/                                   @DeadAlready
-/types/easy-xapi/                                        @DeadAlready
-/types/easy-xapi-supertest/                              @DeadAlready
-/types/easy-xapi-utils/                                  @DeadAlready
-/types/easystarjs/                                       @borundin
-/types/ebongarde-root/                                   @Ebongarde
-/types/echarts/                                          @xieisabug @AntiMoron
-/types/ecurve/                                           @mhegazy
-/types/egg/                                              @sheperdwind
-/types/egg-mock/                                         @sheperdwind
-/types/egg.js/                                           @ToastHawaii
-/types/ej.web.all/                                       @syncfusion
-/types/ejs-locals/                                       @jt000
-/types/ejson/                                            @shantanubhadoria
-/types/elasticsearch/                                    @CasperSkydt @bfsmith @ddunkin @pushplay @mlamp @ahmadferdous
-/types/electron-config/                                  @mrfunkycold @unindented
-/types/electron-debug/                                   @unindented
-/types/electron-devtools-installer/                      @gamesmaxed
-/types/electron-json-storage/                            @stpettersens
-/types/electron-notifications/                           @djpereira
-/types/electron-notify/                                  @djpereira
-/types/electron-packager/                                @SomaticIT @cortopy
-/types/electron-settings/v2/                             @leonard-thieu
-/types/electron-settings/                                @icopp
-/types/electron-store/                                   @unindented
-/types/electron-window-state/                            @rhysd
-/types/element-ready/                                    @BendingBender
-/types/element-resize-event/                             @rogierschouten @plgregoire
-/types/elm/                                              @thSoft
-/types/email-addresses/                                  @johngrimsey
-/types/email-templates/                                  @cyrilschumacher @gurisko
-/types/email-validator/                                  @paullessing
-/types/ember/v1/                                         @jedmao
-/types/ember/                                            @jedmao @bttf
-/types/emissary/                                         @vvakame
-/types/emojione/                                         @dbrgn
-/types/empower/                                          @vvakame
-/types/emscripten/                                       @zakki @periklis
-/types/engine.io/                                        @KentarouTakeda
-/types/engine.io-client/                                 @KentarouTakeda
-/types/enhanced-resolve/                                 @e-cloud @onigoetz
-/types/ent/                                              @rogierschouten
-/types/entities/                                         @aliceklipper
-/types/env-to-object/                                    @MugeSo
-/types/envify/                                           @tkQubo
-/types/enzyme/                                           @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden
-/types/enzyme-to-json/                                   @joscha
-/types/eonasdan-bootstrap-datetimepicker/                @ToastHawaii
-/types/epiceditor/                                       @borisyankov
-/types/epub/                                             @julien-c
-/types/eq.js/                                            @stephenlautier
-/types/errorhandler/                                     @santialbo
-/types/es6-collections/                                  @rbuckton
-/types/es6-error/                                        @LKay
-/types/es6-promise/                                      @fdecampredon @vvakame
-/types/es6-promisify/                                    @harryshipton
-/types/es6-shim/                                         @rbuckton
-/types/es6-weak-map/                                     @pine
-/types/escape-html/                                      @elisee
-/types/escape-latex/                                     @olsio
-/types/escape-string-regexp/                             @kruncher
-/types/escodegen/                                        @simondel
-/types/eslint-plugin-prettier/                           @ikatyang
-/types/esprima/                                          @teppeis @RReverser
-/types/esprima-walk/                                     @tswaters
-/types/esri-leaflet/                                     @strajuser
-/types/esri-leaflet-geocoder/                            @BendingBender
-/types/estraverse/                                       @sanex3339
-/types/estree/                                           @RReverser
-/types/etag/                                             @BendingBender
-/types/ethjs-signer/                                     @doppio
-/types/eureka-js-client/                                 @Schnillz
-/types/evaporate/                                        @kookster @chrisrhoden
-/types/event-emitter/                                    @LKay
-/types/event-kit/                                        @enlight
-/types/event-loop-lag/                                   @rogierschouten
-/types/event-stream/                                     @flcdrg
-/types/event-to-promise/                                 @flying-sheep
-/types/evernote/                                         @corps
-/types/exceljs/                                          @rogierschouten @alitaheri
-/types/execa/                                            @douglasduteil @BendingBender
-/types/exit/                                             @Bartvds
-/types/exit-hook/                                        @BendingBender
-/types/exorcist/                                         @TeamworkGuy2
-/types/expect/                                           @jmreidy @merrywhether
-/types/expect.js/                                        @teppeis
-/types/expectations/                                     @vvakame
-/types/expr-eval/                                        @connor4312
-/types/express/                                          @borisyankov
-/types/express-brute/                                    @cyrilschumacher
-/types/express-brute-memcached/                          @cyrilschumacher
-/types/express-brute-mongo/                              @cyrilschumacher
-/types/express-debug/                                    @federicobond
-/types/express-domain-middleware/                        @hookclaw
-/types/express-enforces-ssl/                             @kevinstubbs
-/types/express-fileupload/                               @Naktibalda
-/types/express-flash-2/                                  @mathsalmi
-/types/express-formidable/                               @tdolsen
-/types/express-graphql/                                  @isman-usoh @nitintutlani
-/types/express-handlebars/                               @stpettersens @yhaskell
-/types/express-jwt/                                      @wokim @kacepe @Sl1MBoy
-/types/express-less/                                     @xieyubo
-/types/express-minify/                                   @borislavjivkov
-/types/express-mung/                                     @cyrilschumacher
-/types/express-myconnection/                             @Cellule
-/types/express-mysql-session/                            @Akim95
-/types/express-openapi/                                  @mugeso
-/types/express-partials/                                 @jt000
-/types/express-rate-limit/                               @cyrilschumacher
-/types/express-route-fs/                                 @kripod
-/types/express-sanitized/                                @cjbarth
-/types/express-serve-static-core/                        @borisyankov @19majkel94 @kacepe
-/types/express-session/                                  @horiuchi
-/types/express-unless/                                   @wokim
-/types/extend/                                           @reppners
-/types/extended-listbox/                                 @code-chris
-/types/extjs/                                            @brian428
-/types/extract-stack/                                    @BendingBender
-/types/extract-text-webpack-plugin/                      @flying-sheep @katyo
-/types/extract-zip/                                      @mizunashi-mana
-/types/eyes/                                             @brynbellomy
-/types/f1/                                               @neolwc
-/types/fabric/                                           @oklemencic @joewashear007 @mrand01
-/types/facebook-js-sdk/                                  @amritk
-/types/facebook-pixel/                                   @noctishsu
-/types/faker/v3/                                         @Kuniwak
-/types/faker/                                            @bensw @basp @Kuniwak
-/types/falcor/                                           @Quramy
-/types/falcor-express/                                   @Quramy
-/types/falcor-http-datasource/                           @Quramy
-/types/falcor-json-graph/                                @Quramy
-/types/falcor-router/                                    @Quramy @cdhgee
-/types/famous/                                           @borisvasilenko
-/types/fancybox/                                         @borisyankov
-/types/farbtastic/                                       @EnableSoftware
-/types/fast-diff/                                        @djrenren
-/types/fast-levenshtein/                                 @mizunashi-mana
-/types/fast-stats/                                       @rogierschouten
-/types/fastclick/                                        @shinnn
-/types/favico.js/                                        @drowse314-dev-ymat
-/types/fb/                                               @JoshStrobl
-/types/fbemitter/                                        @kmxz
-/types/featherlight/                                     @xStrom
-/types/fecha/                                            @9y5
-/types/fetch-jsonp/                                      @tkrotoff
-/types/fetch-mock/                                       @asvetliakov @tamird @merrywhether @chrissinclair
-/types/fetch.io/                                         @newraina
-/types/ffi/                                              @loyd
-/types/ffmpeg-static/                                    @iamstevetran
-/types/ffprobe-static/                                   @iamstevetran
-/types/fibers/                                           @soywiz
-/types/figures/                                          @BendingBender
-/types/file-exists/                                      @BendingBender
-/types/file-saver/                                       @cyrilschumacher @DaIgeb
-/types/file-type/                                        @tcaesvk @BendingBender
-/types/filenamify/                                       @rokt33r
-/types/filesize/                                         @GiedriusGrabauskas
-/types/fill-pdf/                                         @westy92
-/types/finalhandler/                                     @chrootsu
-/types/finch/                                            @DavidSichau
-/types/find-up/                                          @BendingBender
-/types/findup-sync/                                      @Bartvds @ngbrown
-/types/fingerprintjs/                                    @zaneli
-/types/fingerprintjs2/                                   @curtstate
-/types/firebase/                                         @vbortone @dsebastien @ciekawy
-/types/firebase-client/                                  @fpsscarecrow
-/types/firebase-token-generator/                         @dotdotcommadot
-/types/firebird/                                         @karak
-/types/firefox/                                          @vvakame
-/types/firmata/                                          @troywweber7
-/types/first-mate/                                       @enlight
-/types/fixed-data-table/                                 @pepaar @stephenjelfs
-/types/flat/                                             @chrootsu
-/types/flatpickr/v2/                                     @UnwrittenFun
-/types/flatpickr/                                        @UnwrittenFun @rowellx68 @wagich
-/types/flexslider/                                       @diullei
-/types/flight/                                           @jonathanhedren
-/types/flightplan/                                       @borislavjivkov
-/types/flipsnap/                                         @kubosho @gsino @mayuki
-/types/flot/                                             @burlandm @Anticom
-/types/flowjs/                                           @ryan10132
-/types/fluent-ffmpeg/                                    @tcaesvk @DingWeizhe
-/types/flux/                                             @stkb @GiedriusGrabauskas
-/types/flux-standard-action/                             @tkqubo
-/types/fluxxor/                                          @mrk21
-/types/fm-websync/                                       @markusmauch
-/types/fontfaceobserver/                                 @RandScullard
-/types/fontoxml/                                         @rolandzwaga
-/types/forever-monitor/                                  @shuntksh
-/types/forge-di/                                         @adamcarr
-/types/form-data/                                        @soywiz @leonyu @BendingBender
-/types/form-serializer/                                  @flqw
-/types/format-unicorn/                                   @kruncher
-/types/formidable/                                       @Nemo157
-/types/forwarded/                                        @BendingBender
-/types/fossil-delta/                                     @endel
-/types/foundation/                                       @borisyankov
-/types/foundation-sites/                                 @samvloeberghs
-/types/fpsmeter/                                         @alampros
-/types/framebus/                                         @kbukum
-/types/freedom/                                          @jpevarnek
-/types/freeport/                                         @atd-schubert
-/types/fresh/                                            @BendingBender
-/types/frisby/                                           @johnny4753
-/types/from/                                             @Bartvds
-/types/from2/                                            @BendingBender
-/types/fromjs/                                           @glenndierckx
-/types/fromnow/                                          @marinewater
-/types/fs-ext/                                           @OguzhanE
-/types/fs-extra/                                         @alan-agius4 @midknight41 @shiftkey
-/types/fs-extra-promise/                                 @midknight41 @jasonswearingen @HiromiShikata
-/types/fs-extra-promise-es6/                             @midknight41 @jasonswearingen @geoffreak @HiromiShikata
-/types/fs-finder/                                        @misak113
-/types/fs-mock/                                          @rogierschouten
-/types/fs-promise/                                       @tarruda
-/types/fsevents/                                         @BendingBender
-/types/ftdomdelegate/                                    @dotnetnerd
-/types/ftp/                                              @rogierschouten
-/types/ftpd/                                             @rogierschouten
-/types/fullcalendar/v1/                                  @nestalk @hasellcamargo
-/types/fullcalendar/                                     @nestalk @hasellcamargo @panic175
-/types/fullname/                                         @kayahr
-/types/fuse/                                             @smrq
-/types/fusioncharts/                                     @rohitkr @shivarajkv
-/types/fuzzaldrin/                                       @mhegazy
-/types/fuzzaldrin-plus/                                  @jeancroy @jkillian
-/types/fuzzyset/                                         @lgrignon
-/types/fxn/                                              @charrondev
-/types/gae.channel.api/                                  @vvakame
-/types/gamequery/                                        @Laubi
-/types/gandi-livedns/                                    @xstoudi
-/types/gapi/                                             @sgtfrankieboy
-/types/gapi.analytics/                                   @gatsbimantico
-/types/gapi.auth2/                                       @flawless2011
-/types/gapi.calendar/                                    @tkrotoff
-/types/gapi.drive/                                       @baxtersa
-/types/gapi.pagespeedonline/                             @sgtfrankieboy
-/types/gapi.people/                                      @tkrotoff
-/types/gapi.plus/                                        @tkrotoff
-/types/gapi.translate/                                   @sgtfrankieboy
-/types/gapi.urlshortener/                                @sgtfrankieboy
-/types/gapi.youtube/                                     @sgtfrankieboy
-/types/gapi.youtubeanalytics/                            @sgtfrankieboy
-/types/gaussian/                                         @scttcper
-/types/generic-functions/                                @stpettersens
-/types/generic-pool/                                     @jerray
-/types/gently/                                           @bonnici
-/types/geodesy/                                          @DenisCarriere @HandyG52
-/types/geojson/                                          @cobster
-/types/geojson2osm/                                      @DenisCarriere
-/types/geokdbush/                                        @DenisCarriere
-/types/geolib/                                           @vvenegasv @dotnetpart
-/types/geometry-dom/                                     @nakakura
-/types/geopattern/                                       @Gaelan
-/types/get-node-dimensions/                              @vincekovacs
-/types/get-stdin/                                        @DanielRosenwasser
-/types/get-stream/                                       @douglasduteil @BendingBender
-/types/getos/                                            @BendingBender
-/types/gettext.js/                                       @jucrouzet
-/types/gijgo/                                            @atatanasov
-/types/giraffe/                                          @darthapo
-/types/git/                                              @vvakame
-/types/git-config/                                       @stpettersens
-/types/git-remote-origin-url/                            @janslow
-/types/gl-matrix/                                        @mattijskneppers @tatchx
-/types/gldatepicker/                                     @qcz
-/types/glidejs/                                          @milanjaros
-/types/glob/                                             @vvakame @voy
-/types/glob-base/                                        @alan-agius4
-/types/glob-expand/                                      @vvakame
-/types/glob-stream/                                      @Bartvds
-/types/global-tunnel-ng/                                 @BendingBender
-/types/globalize/                                        @gcastre @afromogli
-/types/globalize-compiler/                               @iclanton
-/types/globby/                                           @douglasduteil
-/types/globule/                                          @durad
-/types/gm/                                               @ChaosinaCan
-/types/go/                                               @NorthwoodsSoftware
-/types/google-adwords-scripts/                           @jafaircl
-/types/google-apps-script/                               @motemen
-/types/google-cloud__storage/                            @blove @nbperry
-/types/google-earth/                                     @icholy
-/types/google-images/                                    @dolanmiu
-/types/google-libphonenumber/                            @leonyu
-/types/google-map-react/                                 @honzabrecka
-/types/google-maps/                                      @DeividasBakanas @GiedriusGrabauskas
-/types/google-protobuf/                                  @marcuslongmuir
-/types/google.feeds/                                     @RodneyJT
-/types/google.fonts/                                     @danmarshall
-/types/google.geolocation/                               @vbortone
-/types/google.picker/                                    @grapswiz
-/types/google.visualization/                             @danludwig @gmoore-sjcorg @danmana @mlcheng @IvanBisultanov
-/types/googlemaps/                                       @cgwrench @nertzy @xaolas @mrmcnerd @martincostello
-/types/googlemaps.infobubble/                            @Dashue
-/types/got/                                              @BendingBender @LinusU
-/types/graceful-fs/                                      @Bartvds
-/types/graham_scan/                                      @hberntsen
-/types/graphene-pk11/                                    @microshine
-/types/graphite-udp/                                     @EricByers
-/types/graphql/                                          @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet
-/types/graphql-date/                                     @enaeseth
-/types/graphql-relay/                                    @arvitaly @nitintutlani @Grelinfo
-/types/graphql-type-json/                                @schfkt
-/types/graphviz/                                         @mhfrantz
-/types/gravatar/                                         @denis-sokolov
-/types/greasemonkey/                                     @kotas
-/types/grecaptcha/                                       @DethAriel
-/types/gregorian-calendar/                               @cwalv
-/types/griddle-react/                                    @hodavidhara
-/types/gridfs-stream/                                    @liorm
-/types/gridstack/                                        @PascalSenn @ZoolWay @Sl1MBoy
-/types/grunt/                                            @jeffmay @basarat
-/types/gsap/                                             @codebelt @ProbablePrime
-/types/gulp/                                             @GiedriusGrabauskas
-/types/gulp-angular-templatecache/                       @amanmahajan7
-/types/gulp-babel/                                       @AyaMorisawa
-/types/gulp-batch/                                       @alvarollmenezes @vizeke
-/types/gulp-cache/                                       @aravindarun
-/types/gulp-cached/                                      @tomc974
-/types/gulp-changed/                                     @tomc974
-/types/gulp-cheerio/                                     @tkQubo
-/types/gulp-coffeeify/                                   @tkQubo
-/types/gulp-coffeelint/                                  @tkQubo
-/types/gulp-concat/                                      @k-kagurazaka
-/types/gulp-connect/                                     @andrewiggins
-/types/gulp-copy/                                        @aravindarun
-/types/gulp-csso/                                        @tkrotoff
-/types/gulp-debug/                                       @tkrotoff
-/types/gulp-diff/                                        @ikatyang
-/types/gulp-dtsm/                                        @AyaMorisawa
-/types/gulp-espower/                                     @tkQubo
-/types/gulp-file-include/                                @DanielRosenwasser
-/types/gulp-filter/                                      @tkrotoff
-/types/gulp-flatten/                                     @k-kagurazaka
-/types/gulp-gzip/                                        @tkQubo
-/types/gulp-help/                                        @tkQubo
-/types/gulp-help-doc/                                    @Mikhus
-/types/gulp-html-replace/                                @peterjuras
-/types/gulp-htmlmin/                                     @tkrotoff
-/types/gulp-if/                                          @joeskeen
-/types/gulp-inject/                                      @k-kagurazaka
-/types/gulp-insert/                                      @shantmarouti
-/types/gulp-install/                                     @peterjuras
-/types/gulp-jade/                                        @berwyn
-/types/gulp-jasmine-browser/                             @tkrotoff
-/types/gulp-json-editor/                                 @peterjuras
-/types/gulp-jspm/                                        @peterjuras
-/types/gulp-less/                                        @k-kagurazaka
-/types/gulp-load-plugins/                                @joeskeen
-/types/gulp-minify-css/                                  @k-kagurazaka
-/types/gulp-minify-html/                                 @tkrotoff
-/types/gulp-modernizr/                                   @remisery
-/types/gulp-newer/                                       @tomc974
-/types/gulp-ng-annotate/                                 @tkQubo
-/types/gulp-nodemon/                                     @tkQubo
-/types/gulp-plumber/                                     @joeskeen
-/types/gulp-protractor/                                  @tkrotoff
-/types/gulp-pug/                                         @remisery
-/types/gulp-remember/                                    @tomc974
-/types/gulp-rev/                                         @tkrotoff
-/types/gulp-rev-replace/                                 @tkrotoff
-/types/gulp-ruby-sass/                                   @agnislav
-/types/gulp-shell/                                       @tkqubo
-/types/gulp-size/                                        @tkrotoff @remisery
-/types/gulp-sort/                                        @joeskeen
-/types/gulp-strip-debug/                                 @peterjuras
-/types/gulp-svg-sprite/                                  @tkqubo
-/types/gulp-task-listing/                                @joeskeen
-/types/gulp-tsd/                                         @k-kagurazaka
-/types/gulp-uglify/                                      @ChristopherHaws @leonard-thieu
-/types/gulp-useref/                                      @tkrotoff
-/types/gulp-util/                                        @jedmao
-/types/gulp-watch/                                       @tkrotoff
-/types/gzip-size/                                        @plantain-00
-/types/h2o2/                                             @jasonswearingen @AJamesPhillips
-/types/halfred/                                          @dherges
-/types/halogen/                                          @steller
-/types/hammerjs/                                         @milkisevil @codler
-/types/handlebars/                                       @borisyankov
-/types/handsontable/                                     @panesofglass @astegmaier
-/types/hapi/v8/                                          @jasonswearingen
-/types/hapi/v12/                                         @jasonswearingen
-/types/hapi/v15/                                         @jasonswearingen
-/types/hapi/                                             @jasonswearingen @AJamesPhillips
-/types/hapi-auth-basic/                                  @AJamesPhillips
-/types/hapi-auth-jwt2/                                   @warrenseymour
-/types/hapi-decorators/                                  @kenhowardpdx
-/types/har-format/                                       @micmro
-/types/hard-rejection/                                   @BendingBender
-/types/harmony-proxy/                                    @remojansen
-/types/has-ansi/                                         @BendingBender
-/types/hash-file/                                        @HiromiShikata
-/types/hash-stream/                                      @BendingBender
-/types/hasha/                                            @BendgingBender
-/types/hasher/                                           @flyfishMT
-/types/hashids/                                          @pocesar
-/types/hashmap/                                          @outring
-/types/haversine/                                        @screendriver
-/types/he/                                               @sedwards2009
-/types/headroom/                                         @hakubo
-/types/heap/                                             @ryan10132
-/types/heatmap.js/                                       @lookuptable
-/types/hedron/                                           @dborysov
-/types/hellojs/                                          @PavelPZ @vuorinem
-/types/hellosign-embedded/                               @xt0rted
-/types/helmet/                                           @cyrilschumacher @EvanHahn @bluehatbrit
-/types/heredatalens/                                     @denyo
-/types/heremaps/                                         @Josh-ES @denyo
-/types/highcharts/                                       @damianog @baltie @AlbertOzimek @hanssens
-/types/highcharts-ng/                                    @scatcher
-/types/highland/                                         @Bartvds @hgwood @iwllyu
-/types/highlight.js/                                     @nikeee @sourrust
-/types/hiredis/                                          @titan
-/types/history/v2/                                       @sergey-buturlakin @ngbrown
-/types/history/v3/                                       @sergey-buturlakin @ngbrown @LKay
-/types/history/                                          @sergey-buturlakin @ngbrown @rokoroku
-/types/history.js/                                       @borisyankov @gjunge
-/types/hjson/                                            @crunchie84
-/types/hls.js/                                           @jgainfort
-/types/hoek/                                             @prashaantt
-/types/homeworks/                                        @KennethanCeyer
-/types/hooker/                                           @misak113
-/types/hopscotch/                                        @pimterry
-/types/howler/                                           @xperiments @tdukart
-/types/hpp/                                              @kryops
-/types/html-entities/                                    @xstoudi
-/types/html-minifier/                                    @tkrotoff
-/types/html-pdf/                                         @westy92
-/types/html-to-text/                                     @erykwarren
-/types/html-webpack-plugin/                              @deevus @bumbleblym
-/types/html-webpack-template/                            @bumbleblym
-/types/html2canvas/                                      @rwhepburn @tan9
-/types/htmlbars-inline-precompile/                       @chriskrycho
-/types/htmlparser2/                                      @staticfunction
-/types/htmltojsx/                                        @basarat
-/types/http-assert/                                      @jkeylu
-/types/http-aws-es/                                      @marcogrcr
-/types/http-codes/                                       @mhegazy
-/types/http-errors/                                      @tkrotoff @BendingBender
-/types/http-proxy/                                       @SomaticIT
-/types/http-proxy-middleware/                            @zebMcCorkle @BendingBender
-/types/http-status/                                      @misak113
-/types/http-status-codes/                                @JoshMcCullough
-/types/http-string-parser/                               @pine613
-/types/httperr/                                          @yortus
-/types/hubot/                                            @dirk
-/types/hubspot-pace/                                     @borislavjivkov
-/types/humane/                                           @jmvrbanac
-/types/humanize-plus/                                    @DenisCarriere
-/types/humanparser/                                      @MichalPodeszwa
-/types/humps/                                            @nikeee
-/types/hyco-ws/                                          @mrcabellom
-/types/hyperscript/                                      @spacejack @jmfirth
-/types/hypertext-application-language/                   @maks3w
-/types/hystrixjs/                                        @igorsechyn
-/types/i18n/                                             @SomaticIT @FindQ
-/types/i18next/v2/                                       @mxl @deerawan @GiedriusGrabauskas
-/types/i18next/                                          @mxl @deerawan @GiedriusGrabauskas
-/types/i18next-browser-languagedetector/v0/              @cyrilschumacher @GiedriusGrabauskas
-/types/i18next-browser-languagedetector/                 @cyrilschumacher @GiedriusGrabauskas
-/types/i18next-express-middleware/                       @cyrilschumacher
-/types/i18next-node-fs-backend/                          @cyrilschumacher
-/types/i18next-sprintf-postprocessor/                    @cyrilschumacher
-/types/i18next-xhr-backend/                              @jamuhl @GiedriusGrabauskas
-/types/i2c-bus/                                          @101100
-/types/iban/                                             @cyrilschumacher
-/types/ibm-mobilefirst/                                  @nacho4d
-/types/ibm_db/                                           @agov
-/types/icepick/                                          @ngbrown @tobico
-/types/icheck/                                           @qcz
-/types/iconv/                                            @delphinus35
-/types/iconv-lite/                                       @poelstra
-/types/ids/                                              @3fd
-/types/iframe-resizer/                                   @arminbaljic
-/types/ignite-ui/                                        @IgniteUI
-/types/image-size/                                       @elisee
-/types/imagemagick/                                      @soywiz
-/types/imagemagick-native/                               @horiuchi
-/types/imagemapster/                                     @delphinus35
-/types/images/                                           @DingWeizhe
-/types/imagesloaded/                                     @coldacid @apexskier
-/types/imap/                                             @psnider
-/types/imap-simple/                                      @pushplay
-/types/imgur-rest-api/                                   @lukewestby
-/types/immutability-helper/                              @seansfkelley
-/types/impress/                                          @borisyankov
-/types/in-range/                                         @DanielRosenwasser
-/types/incremental-dom/                                  @basarat @lanthaler @vvakame
-/types/indent-string/                                    @mhegazy
-/types/inert/                                            @nycdotnet @AJamesPhillips
-/types/inflected/                                        @dsci
-/types/inflection/                                       @shiwano
-/types/inherits/                                         @chrootsu
-/types/ini/                                              @marcinporebski
-/types/iniparser/                                        @chrootsu
-/types/inline-css/                                       @philipisapain
-/types/inline-style-prefixer/                            @ahz @dpetrezselyova
-/types/inquirer/                                         @tkQubo @ppathan
-/types/insert-module-globals/                            @leonard-thieu
-/types/insight/                                          @vvakame
-/types/integer/                                          @Morfent
-/types/interact.js/                                      @dduugg @adidahiya @thasner
-/types/intercomjs/                                       @spencerwi
-/types/internal-ip/                                      @BendingBender
-/types/intl/                                             @RagibHasin
-/types/intl-messageformat/                               @mhegazy
-/types/intl-tel-input/                                   @fdnhkj @leonard-thieu
-/types/into-stream/                                      @BendingBender
-/types/intro.js/                                         @anahkiasen
-/types/invariant/                                        @bennett000
-/types/inversify-devtools/                               @inversify
-/types/ion.rangeslider/v1/                               @dduugg
-/types/ion.rangeslider/                                  @sixinli
-/types/ionic/                                            @spencerwi
-/types/ioredis/                                          @chrisleck
-/types/ip/                                               @codeanimal
-/types/ip-regex/                                         @unindented
-/types/irc/                                              @phillips1012
-/types/is/                                               @cabralRodrigo
-/types/is-absolute-url/                                  @mhegazy
-/types/is-alphanumerical/                                @vutran
-/types/is-archive/                                       @mhegazy
-/types/is-array/                                         @pine
-/types/is-binary-path/                                   @DanielRosenwasser
-/types/is-compressed/                                    @mhegazy
-/types/is-finite/                                        @mhegazy
-/types/is-ip/                                            @coderslagoon
-/types/is-my-json-valid/                                 @kruncher
-/types/is-number/                                        @harryshipton
-/types/is-path-cwd/                                      @DanielRosenwasser
-/types/is-path-in-cwd/                                   @mhegazy
-/types/is-plain-object/                                  @zengfenfei
-/types/is-promise/                                       @DanielRosenwasser
-/types/is-relative-url/                                  @mhegazy
-/types/is-root/                                          @mhegazy
-/types/is-root-path/                                     @mhegazy
-/types/is-stream/                                        @me
-/types/is-svg/                                           @BendingBender
-/types/is-text-path/                                     @mhegazy
-/types/is-url/                                           @RyotaMurohoshi
-/types/is-url-superb/                                    @kryops
-/types/is-windows/                                       @mizunashi-mana
-/types/isbn-utils/                                       @elhaard
-/types/iscroll/                                          @csrakowski
-/types/iso-3166-2/                                       @sicilica
-/types/iso8601-localizer/                                @avielfedida
-/types/isomorphic-fetch/                                 @toddlucas
-/types/isotope-layout/                                   @avidenic
-/types/istanbul/                                         @tkrotoff
-/types/istanbul-middleware/                              @hookclaw
-/types/ityped/                                           @DanielRosenwasser
-/types/ix.js/                                            @Igorbek
-/types/jade/                                             @panuhorsmalahti
-/types/jalaali-js/                                       @alitaheri
-/types/japanese-holidays/                                @syamatoo
-/types/jasmine/                                          @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software
-/types/jasmine-ajax/                                     @lgrignon
-/types/jasmine-data_driven_tests/                        @AnthonyMacKinnon
-/types/jasmine-enzyme/                                   @bolatovumar
-/types/jasmine-es6-promise-matchers/                     @stephenlautier
-/types/jasmine-expect/                                   @GeneralCss
-/types/jasmine-fixture/                                  @craigbrett17
-/types/jasmine-given/                                    @shairez
-/types/jasmine-jquery/                                   @gstamac
-/types/jasmine-matchers/                                 @Bartvds
-/types/jasmine-node/                                     @svi3c
-/types/jasmine-promise-matchers/                         @matthewjh
-/types/jasmine_dom_matchers/                             @devoto13
-/types/jasminewd2/                                       @sjelin
-/types/java/                                             @jimlloyd @hrl7
-/types/java-applet/                                      @cyrilschumacher
-/types/javascript-astar/                                 @ptlis
-/types/javascript-bignum/                                @sandersn
-/types/javascript-obfuscator/                            @sanex3339
-/types/javascript-state-machine/                         @borisyankov @mdocter @MrBigDog2U @samael65535 @taoqf
-/types/jbinary/                                          @tbureck
-/types/jcanvas/                                          @rogierschouten
-/types/jdataview/                                        @RReverser
-/types/jdenticon/                                        @mtr
-/types/jest/v16/                                         @NoHomey @jwbay
-/types/jest/                                             @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang
-/types/jest-matchers/                                    @joscha
-/types/jfs/                                              @tlaziuk
-/types/jimp/                                             @Jack-Works
-/types/jjv/                                              @Nemo157
-/types/jjve/                                             @Nemo157
-/types/jmespath/                                         @pushplay
-/types/jodata/                                           @cgwrench
-/types/johnny-five/                                      @nakakura
-/types/joi/v6/                                           @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
-/types/joi/                                              @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt
-/types/joigoose/                                         @boothwhack
-/types/jointjs/                                          @areel @DavidDurman @DenEwout @CaselIT @ChrisMoran
-/types/jpm/                                              @github-account-because-they-want-it
-/types/jqgrid/                                           @lokeshpeta
-/types/jqrangeslider/                                    @qcz
-/types/jquery/v1/                                        @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
-/types/jquery/v2/                                        @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
-/types/jquery/                                           @leonard-thieu @borisyankov @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @johnnyreilly @DickvdBrink @King2500
-/types/jquery-ajax-chain/                                @humana-fragilitas
-/types/jquery-alertable/                                 @stever
-/types/jquery-backstretch/                               @dkulyk
-/types/jquery-cropbox/                                   @PerKastman
-/types/jquery-deparam/                                   @patsissons
-/types/jquery-easy-loading/                              @delphinus35
-/types/jquery-editable-select/                           @baywet
-/types/jquery-fullscreen/                                @bgrieder
-/types/jquery-galleria/                                  @rimig
-/types/jquery-handsontable/                              @intelorca
-/types/jquery-jsonrpcclient/                             @Ty3uK
-/types/jquery-knob/                                      @iain8
-/types/jquery-mask-plugin/                               @avidenic
-/types/jquery-match-height/                              @kbytesys
-/types/jquery-mockjax/                                   @laszlojakab @vladeck
-/types/jquery-mousewheel/                                @xt0rted
-/types/jquery-param/                                     @patsissons
-/types/jquery-sortable/                                  @Seltzer
-/types/jquery-steps/                                     @jblank @nickwph
-/types/jquery-timeentry/                                 @marknadig
-/types/jquery-toastmessage-plugin/                       @joeskeen
-/types/jquery-truncate-html/                             @abraaoalves
-/types/jquery-urlparam/                                  @stpettersens
-/types/jquery-validation-unobtrusive/                    @EnableSoftware
-/types/jquery.address/                                   @martinduparc @mardaneus86
-/types/jquery.are-you-sure/                              @jonegerton
-/types/jquery.autosize/                                  @kingdango
-/types/jquery.bbq/                                       @sunetos
-/types/jquery.bootstrap.wizard/                          @niemyjski
-/types/jquery.cleditor/                                  @pushplay
-/types/jquery.clientsidelogging/                         @diullei
-/types/jquery.color/                                     @derekcicerone
-/types/jquery.colorbox/                                  @gjunge
-/types/jquery.colorpicker/                               @pushplay
-/types/jquery.contextmenu/                               @nvivo
-/types/jquery.cookie/                                    @RoyGoode @BenLorantfy
-/types/jquery.customselect/                              @adamcoulombe
-/types/jquery.cycle2/                                    @dnadolny
-/types/jquery.dropotron/                                 @cyrilschumacher
-/types/jquery.dynatree/                                  @fdecampredon
-/types/jquery.elang/                                     @sumegizoltan
-/types/jquery.fancytree/                                 @alphaleonis @abedi-ir
-/types/jquery.finger/                                    @maxackley
-/types/jquery.flagstrap/                                 @felipedgarcia
-/types/jquery.fullscreen/                                @piraveen
-/types/jquery.gridster/                                  @jbaldwin
-/types/jquery.growl/                                     @yeganemehr
-/types/jquery.highlight-bartaz/                          @Pro
-/types/jquery.jnotify/                                   @jamescurran
-/types/jquery.joyride/                                   @vbortone
-/types/jquery.jsignature/                                @pjmagee
-/types/jquery.leanmodal/                                 @FinelySliced
-/types/jquery.livestampjs/                               @vbortone
-/types/jquery.notify/                                    @evil-shrike
-/types/jquery.notifybar/                                 @zaneli
-/types/jquery.noty/                                      @kingdango @thelfensdrfer
-/types/jquery.payment/                                   @ejsmith @johnrutherford
-/types/jquery.pjax/                                      @lijunle
-/types/jquery.placeholder/                               @majorsilence @EnableSoftware
-/types/jquery.pnotify/                                   @DavidSichau @FUNExtreme
-/types/jquery.postmessage/                               @lijunle
-/types/jquery.prettyphoto/                               @pgaske
-/types/jquery.qrcode/                                    @danmana
-/types/jquery.rateit/                                    @gjunge
-/types/jquery.rowgrid/                                   @vinayak-garg
-/types/jquery.scrollto/                                  @nestalk
-/types/jquery.simplemodal/                               @ForNeVeR
-/types/jquery.simplepagination/                          @nvivo
-/types/jquery.simulate/                                  @derekcicerone
-/types/jquery.slimscroll/                                @Promact
-/types/jquery.soap/                                      @tigerxy
-/types/jquery.sortelements/                              @tbureck
-/types/jquery.superlink/                                 @niemyjski
-/types/jquery.tagsmanager/                               @vbortone
-/types/jquery.tile/                                      @zaneli
-/types/jquery.timepicker/                                @anwarjaved
-/types/jquery.timer/                                     @JoshStrobl
-/types/jquery.tinycarousel/                              @csrakowski
-/types/jquery.tinyscrollbar/                             @csrakowski
-/types/jquery.tipsy/                                     @bdukes
-/types/jquery.tools/                                     @joeskeen
-/types/jquery.tooltipster/                               @pjmagee @VorobeY1326 @leonard-thieu @janhi
-/types/jquery.total-storage/                             @JeremyCBrooks
-/types/jquery.transit/                                   @MrBigDog2U
-/types/jquery.ui.datetimepicker/                         @dougajmcdonald
-/types/jquery.ui.layout/                                 @Steve-Fenton @drarmstr
-/types/jquery.uniform/                                   @flyfishMT
-/types/jquery.validation/                                @fdecampredon @johnnyreilly @avidenic
-/types/jquery.watermark/                                 @anwarjaved
-/types/jquerymobile/                                     @borisyankov
-/types/jqueryui/                                         @borisyankov @johnnyreilly
-/types/js-base64/                                        @DenisCarriere
-/types/js-beautify/                                      @JoshuaKGoldberg @hansrwindhoff
-/types/js-clipper/                                       @omni360
-/types/js-combinatorics/                                 @outring
-/types/js-cookie/                                        @theodorejb
-/types/js-data/v1/                                       @reppners
-/types/js-data/                                          @reppners
-/types/js-data-angular/                                  @reppners
-/types/js-data-http/                                     @reppners
-/types/js-fixtures/                                      @kazimanzurrashid
-/types/js-git/                                           @Bartvds
-/types/js-md5/                                           @mwmccarthy
-/types/js-quantities/                                    @wrummler
-/types/js-schema/                                        @marcinporebski @roblabat
-/types/js-search/                                        @guoyunhe
-/types/js-to-java/                                       @skyitachi
-/types/js-url/                                           @pine613
-/types/js-yaml/                                          @Bartvds @sclausen
-/types/js.spec/                                          @mattbishop
-/types/jsbn/                                             @Evgenus
-/types/jscrollpane/                                      @qcz
-/types/jsdeferred/                                       @minodisk
-/types/jsdom/                                            @leonard-thieu
-/types/jsen/                                             @vladeck
-/types/jsend/                                            @CaselIT
-/types/jsesc/                                            @Bartvds
-/types/jsfl/                                             @soywiz
-/types/jsforce/                                          @dolanmiu @netes
-/types/jshamcrest/                                       @dharkness
-/types/jsmockito/                                        @shiver-me-timbers
-/types/jsnox/                                            @stkb @DovydasNavickas
-/types/json-merge-patch/                                 @senyaarseniy
-/types/json-patch/                                       @vvakame
-/types/json-pointer/                                     @Bartvds
-/types/json-rpc-ws/                                      @npenin
-/types/json-schema/                                      @bcherny
-/types/json-socket/                                      @svi3c
-/types/json-stable-stringify/                            @mhfrantz
-/types/json-stringify-safe/                              @BendingBender
-/types/json2md/                                          @MartynasZilinskas
-/types/jsoneditor/                                       @alejo90
-/types/jsoneditoronline/                                 @vbortone
-/types/jsonminify/                                       @no23reason
-/types/jsonnet/                                          @hookclaw
-/types/jsonp/                                            @surenkov
-/types/jsonpath/                                         @horiuchi @ikatyang
-/types/jsonrpc-serializer/                               @Akim95
-/types/jsonstream/                                       @Bartvds
-/types/jsonwebtoken/                                     @SomaticIT @danielheim
-/types/jspdf/                                            @amberjs
-/types/jsplumb/                                          @shearnie
-/types/jsrender/                                         @zakki
-/types/jsrp/                                             @harryshipton
-/types/jss/                                              @Ptival
-/types/jssha/                                            @randombk @SrTobi
-/types/jstimezonedetect/                                 @olamothe
-/types/jstorage/                                         @dflor003
-/types/jstree/                                           @adaskothebeast
-/types/jsts/                                             @StephaneAlie
-/types/jsuite/                                           @darrenhillconsulting
-/types/jsuri/                                            @coldacid @flqw
-/types/jsurl/                                            @agorshkov23
-/types/jsx-chai/                                         @nupplaphil
-/types/jszip/                                            @mzeiher
-/types/jug/                                              @yevt
-/types/jui/                                              @easylogic
-/types/jui-core/                                         @easylogic
-/types/jui-grid/                                         @easylogic
-/types/jweixin/                                          @taoqf
-/types/jwplayer/                                         @martinduparc
-/types/jwt-client/                                       @timoteoponce
-/types/jwt-decode/                                       @GiedriusGrabauskas @madsmadsen
-/types/jwt-simple/                                       @kenfdev @GaelMagnan
-/types/kafka-node/                                       @dansitu @bkim54 @sfrooster @amiram
-/types/karma/                                            @tkrotoff
-/types/karma-chai/                                       @JayAndCatchFire
-/types/karma-chai-sinon/                                 @vasek17
-/types/karma-coverage/                                   @tkrotoff
-/types/karma-fixture/                                    @evictor
-/types/karma-jasmine/                                    @michelsalib
-/types/katex/                                            @mrand01
-/types/kcors/                                            @Xstoudi @izayoiko
-/types/kdbush/                                           @DenisCarriere
-/types/kefir/                                            @AyaMorisawa
-/types/kendo-ui/                                         @telerik
-/types/keyboardjs/                                       @vbortone @piranha771
-/types/keycloak-js/                                      @eppsilon
-/types/keygrip/                                          @jkeylu
-/types/keymaster/                                        @nitram509
-/types/keymirror/                                        @jfahrenkrug
-/types/keypress.js/                                      @rcchen
-/types/keysym/                                           @harryshipton
-/types/keytar/                                           @miniak @shiftkey @juturu
-/types/kik-browser/                                      @joelday
-/types/klaw/                                             @mceachen
-/types/klaw-sync/                                        @shiftkey
-/types/knex/                                             @tkQubo @baronfel
-/types/knockback/                                        @borisyankov
-/types/knockout/                                         @EnableSoftware @BenjaminEckardt
-/types/knockout-amd-helpers/                             @DavidSichau
-/types/knockout-secure-binding/                          @pine613
-/types/knockout-transformations/                         @johnnyreilly @Nemo157
-/types/knockout.deferred.updates/                        @sgaliano
-/types/knockout.editables/                               @borisyankov
-/types/knockout.es5/                                     @sgaliano
-/types/knockout.kogrid/                                  @huer12
-/types/knockout.mapper/                                  @BMeyerKC
-/types/knockout.mapping/                                 @borisyankov
-/types/knockout.projections/                             @johnnyreilly
-/types/knockout.punches/                                 @johnnyreilly
-/types/knockout.rx/                                      @Igorbek
-/types/knockout.validation/                              @danludwig
-/types/knockout.viewmodel/                               @oising
-/types/knockstrap/                                       @adaskothebeast
-/types/knuddels-userapps-api/                            @Knuddels
-/types/ko.plus/                                          @conficient
-/types/koa/                                              @DavidCai1993 @jkeylu
-/types/koa-basic-auth/                                   @Tobias4872
-/types/koa-bodyparser/                                   @hellopao
-/types/koa-cache-control/                                @pe8ter
-/types/koa-compose/                                      @jkeylu
-/types/koa-compress/                                     @hellopao
-/types/koa-favicon/                                      @hellopao
-/types/koa-generic-session/                              @nsimmons
-/types/koa-hbs/                                          @jcbmln @mudkipme
-/types/koa-helmet/                                       @me
-/types/koa-json/                                         @brooklyndev
-/types/koa-json-error/                                   @mudkipme
-/types/koa-jwt/                                          @brunokrebs
-/types/koa-logger/                                       @geoffreak
-/types/koa-morgan/                                       @vesse
-/types/koa-mount/                                        @amirsaber
-/types/koa-passport/                                     @horiuchi
-/types/koa-pug/                                          @Xstoudi
-/types/koa-redis/                                        @nsimmons
-/types/koa-route/                                        @migstopheles
-/types/koa-router/                                       @hellopao @schfkt
-/types/koa-send/                                         @pe8ter
-/types/koa-session/                                      @kerol2r20
-/types/koa-session-minimal/                              @longztian
-/types/koa-static/                                       @hellopao
-/types/koa-views/                                        @brooklyndev
-/types/koa-websocket/                                    @me
-/types/kolite/                                           @borisyankov
-/types/konami.js/                                        @mareek
-/types/kramed/                                           @tonicblue
-/types/kss/                                              @giladgray
-/types/kue/                                              @drudge @amiram @pc-jedi
-/types/kuromoji/                                         @mzsm
-/types/lab/                                              @prashaantt
-/types/ladda/                                            @dflor003 @leemicw
-/types/lambda-phi/                                       @elitechance
-/types/later/                                            @jasond-s
-/types/latinize/                                         @GiedriusGrabauskas
-/types/launchpad/                                        @rictic
-/types/lazy.js/                                          @Bartvds
-/types/lazypipe/                                         @tomc974
-/types/ldapjs/                                           @cvillemure @peterkooijmans
-/types/leadfoot/                                         @theintern
-/types/leaflet/v0/                                       @rgripper
-/types/leaflet/                                          @alejo90
-/types/leaflet-areaselect/                               @awallat
-/types/leaflet-curve/                                    @onikiienko
-/types/leaflet-draw/                                     @matt-guest @reblace
-/types/leaflet-editable/                                 @dalie
-/types/leaflet-fullscreen/                               @DenisCarriere
-/types/leaflet-imageoverlay-rotated/                     @tkleinke
-/types/leaflet-label/                                    @Nemo157
-/types/leaflet-polylinedecorator/                        @soucekv
-/types/leaflet-providers/                                @BendingBender
-/types/leaflet.awesome-markers/v0/                       @Odrin @sebek64
-/types/leaflet.awesome-markers/                          @sebek64
-/types/leaflet.fullscreen/                               @wcomartin
-/types/leaflet.gridlayer.googlemutant/                   @ernest-rhinozeros
-/types/leaflet.locatecontrol/                            @DenisCarriere
-/types/leaflet.markercluster/                            @rimig
-/types/leaflet.markercluster.layersupport/               @AsamK
-/types/leaflet.pm/                                       @tkleinke
-/types/leapmotionts/                                     @logotype
-/types/left-pad/                                         @Goldsmith42
-/types/less/                                             @thasner @pranaygp
-/types/less-middleware/                                  @federicobond
-/types/lestate/                                          @thelambdaparty
-/types/level-sublevel/                                   @basp
-/types/leveldown/                                        @tarruda
-/types/levelup/                                          @blittle @tarruda
-/types/leven/                                            @jmalonzo
-/types/levenshtein/                                      @geoffreak
-/types/libpq/                                            @Lodin
-/types/libxmljs/                                         @fdecampredon
-/types/libxslt/                                          @alejo90
-/types/license-checker/                                  @rogierschouten
-/types/lime-js/                                          @arthur-xavier
-/types/line-by-line/                                     @etomsen
-/types/line-reader/                                      @stpettersens
-/types/linkify-it/                                       @praxxis
-/types/linq4js/                                          @morrisjdev
-/types/lls/                                              @borislavjivkov
-/types/load-json-file/                                   @SamVerschueren
-/types/loader-runner/                                    @e-cloud
-/types/loader-utils/                                     @Perlmint
-/types/lobibox/                                          @itboy87
-/types/localforage-cordovasqlitedriver/                  @thgreasi
-/types/localized-countries/                              @coderslagoon
-/types/locate-path/                                      @me
-/types/lockfile/v0/                                      @Bartvds
-/types/lockfile/                                         @Bartvds @BendingBender
-/types/lockr/                                            @droritos
-/types/locutus/                                          @hookclaw
-/types/lodash/v3/                                        @bczengel @chrootsu
-/types/lodash/                                           @bczengel @chrootsu @stepancar @ericanderson @aj-r @ailrun
-/types/lodash-es/                                        @stephenlautier
-/types/lodash-webpack-plugin/                            @bumbleblym
-/types/lodash.add/                                       @bczengel @chrootsu @stepancar
-/types/lodash.after/                                     @bczengel @chrootsu @stepancar
-/types/lodash.ary/                                       @bczengel @chrootsu @stepancar
-/types/lodash.assign/                                    @bczengel @chrootsu @stepancar
-/types/lodash.assignin/                                  @bczengel @chrootsu @stepancar
-/types/lodash.assigninwith/                              @bczengel @chrootsu @stepancar
-/types/lodash.assignwith/                                @bczengel @chrootsu @stepancar
-/types/lodash.at/                                        @bczengel @chrootsu @stepancar
-/types/lodash.attempt/                                   @bczengel @chrootsu @stepancar
-/types/lodash.before/                                    @bczengel @chrootsu @stepancar
-/types/lodash.bind/                                      @bczengel @chrootsu @stepancar
-/types/lodash.bindall/                                   @bczengel @chrootsu @stepancar
-/types/lodash.bindkey/                                   @bczengel @chrootsu @stepancar
-/types/lodash.camelcase/                                 @bczengel @chrootsu @stepancar
-/types/lodash.capitalize/                                @bczengel @chrootsu @stepancar
-/types/lodash.castarray/                                 @bczengel @chrootsu @stepancar
-/types/lodash.ceil/                                      @bczengel @chrootsu @stepancar
-/types/lodash.chunk/                                     @bczengel @chrootsu @stepancar
-/types/lodash.clamp/                                     @bczengel @chrootsu @stepancar
-/types/lodash.clone/                                     @bczengel @chrootsu @stepancar
-/types/lodash.clonedeep/                                 @bczengel @chrootsu @stepancar
-/types/lodash.clonedeepwith/                             @bczengel @chrootsu @stepancar
-/types/lodash.clonewith/                                 @bczengel @chrootsu @stepancar
-/types/lodash.compact/                                   @bczengel @chrootsu @stepancar
-/types/lodash.concat/                                    @bczengel @chrootsu @stepancar
-/types/lodash.constant/                                  @bczengel @chrootsu @stepancar
-/types/lodash.countby/                                   @bczengel @chrootsu @stepancar
-/types/lodash.create/                                    @bczengel @chrootsu @stepancar
-/types/lodash.curry/                                     @bczengel @chrootsu @stepancar
-/types/lodash.curryright/                                @bczengel @chrootsu @stepancar
-/types/lodash.debounce/                                  @bczengel @chrootsu @stepancar
-/types/lodash.deburr/                                    @bczengel @chrootsu @stepancar
-/types/lodash.defaults/                                  @bczengel @chrootsu @stepancar
-/types/lodash.defaultsdeep/                              @bczengel @chrootsu @stepancar
-/types/lodash.defer/                                     @bczengel @chrootsu @stepancar
-/types/lodash.delay/                                     @bczengel @chrootsu @stepancar
-/types/lodash.difference/                                @bczengel @chrootsu @stepancar
-/types/lodash.differenceby/                              @bczengel @chrootsu @stepancar
-/types/lodash.differencewith/                            @bczengel @chrootsu @stepancar
-/types/lodash.drop/                                      @bczengel @chrootsu @stepancar
-/types/lodash.dropright/                                 @bczengel @chrootsu @stepancar
-/types/lodash.droprightwhile/                            @bczengel @chrootsu @stepancar
-/types/lodash.dropwhile/                                 @bczengel @chrootsu @stepancar
-/types/lodash.endswith/                                  @bczengel @chrootsu @stepancar
-/types/lodash.eq/                                        @bczengel @chrootsu @stepancar
-/types/lodash.escape/                                    @bczengel @chrootsu @stepancar
-/types/lodash.escaperegexp/                              @bczengel @chrootsu @stepancar
-/types/lodash.every/                                     @bczengel @chrootsu @stepancar
-/types/lodash.fill/                                      @bczengel @chrootsu @stepancar
-/types/lodash.filter/                                    @bczengel @chrootsu @stepancar
-/types/lodash.find/                                      @bczengel @chrootsu @stepancar
-/types/lodash.findindex/                                 @bczengel @chrootsu @stepancar
-/types/lodash.findkey/                                   @bczengel @chrootsu @stepancar
-/types/lodash.findlast/                                  @bczengel @chrootsu @stepancar
-/types/lodash.findlastindex/                             @bczengel @chrootsu @stepancar
-/types/lodash.findlastkey/                               @bczengel @chrootsu @stepancar
-/types/lodash.first/                                     @bczengel @chrootsu @stepancar
-/types/lodash.flatmap/                                   @bczengel @chrootsu @stepancar
-/types/lodash.flatten/                                   @bczengel @chrootsu @stepancar
-/types/lodash.flattendeep/                               @bczengel @chrootsu @stepancar
-/types/lodash.flattendepth/                              @bczengel @chrootsu @stepancar
-/types/lodash.flip/                                      @bczengel @chrootsu @stepancar
-/types/lodash.floor/                                     @bczengel @chrootsu @stepancar
-/types/lodash.flow/                                      @bczengel @chrootsu @stepancar
-/types/lodash.flowright/                                 @bczengel @chrootsu @stepancar
-/types/lodash.foreach/                                   @bczengel @chrootsu @stepancar
-/types/lodash.foreachright/                              @bczengel @chrootsu @stepancar
-/types/lodash.forin/                                     @bczengel @chrootsu @stepancar
-/types/lodash.forinright/                                @bczengel @chrootsu @stepancar
-/types/lodash.forown/                                    @bczengel @chrootsu @stepancar
-/types/lodash.forownright/                               @bczengel @chrootsu @stepancar
-/types/lodash.frompairs/                                 @bczengel @chrootsu @stepancar
-/types/lodash.functions/                                 @bczengel @chrootsu @stepancar
-/types/lodash.functionsin/                               @bczengel @chrootsu @stepancar
-/types/lodash.get/                                       @bczengel @chrootsu @stepancar
-/types/lodash.groupby/                                   @bczengel @chrootsu @stepancar
-/types/lodash.gt/                                        @bczengel @chrootsu @stepancar
-/types/lodash.gte/                                       @bczengel @chrootsu @stepancar
-/types/lodash.has/                                       @bczengel @chrootsu @stepancar
-/types/lodash.hasin/                                     @bczengel @chrootsu @stepancar
-/types/lodash.head/                                      @bczengel @chrootsu @stepancar
-/types/lodash.identity/                                  @bczengel @chrootsu @stepancar
-/types/lodash.includes/                                  @bczengel @chrootsu @stepancar
-/types/lodash.indexof/                                   @bczengel @chrootsu @stepancar
-/types/lodash.initial/                                   @bczengel @chrootsu @stepancar
-/types/lodash.inrange/                                   @bczengel @chrootsu @stepancar
-/types/lodash.intersection/                              @bczengel @chrootsu @stepancar
-/types/lodash.intersectionby/                            @bczengel @chrootsu @stepancar
-/types/lodash.intersectionwith/                          @bczengel @chrootsu @stepancar
-/types/lodash.invert/                                    @bczengel @chrootsu @stepancar
-/types/lodash.invertby/                                  @bczengel @chrootsu @stepancar
-/types/lodash.invoke/                                    @bczengel @chrootsu @stepancar
-/types/lodash.invokemap/                                 @bczengel @chrootsu @stepancar
-/types/lodash.isarguments/                               @bczengel @chrootsu @stepancar
-/types/lodash.isarray/                                   @bczengel @chrootsu @stepancar
-/types/lodash.isarraybuffer/                             @bczengel @chrootsu @stepancar
-/types/lodash.isarraylike/                               @bczengel @chrootsu @stepancar
-/types/lodash.isarraylikeobject/                         @bczengel @chrootsu @stepancar
-/types/lodash.isboolean/                                 @bczengel @chrootsu @stepancar
-/types/lodash.isbuffer/                                  @bczengel @chrootsu @stepancar
-/types/lodash.isdate/                                    @bczengel @chrootsu @stepancar
-/types/lodash.iselement/                                 @bczengel @chrootsu @stepancar
-/types/lodash.isempty/                                   @bczengel @chrootsu @stepancar
-/types/lodash.isequal/                                   @bczengel @chrootsu @stepancar
-/types/lodash.isequalwith/                               @bczengel @chrootsu @stepancar
-/types/lodash.iserror/                                   @bczengel @chrootsu @stepancar
-/types/lodash.isfinite/                                  @bczengel @chrootsu @stepancar
-/types/lodash.isfunction/                                @bczengel @chrootsu @stepancar
-/types/lodash.isinteger/                                 @bczengel @chrootsu @stepancar
-/types/lodash.islength/                                  @bczengel @chrootsu @stepancar
-/types/lodash.ismap/                                     @bczengel @chrootsu @stepancar
-/types/lodash.ismatch/                                   @bczengel @chrootsu @stepancar
-/types/lodash.ismatchwith/                               @bczengel @chrootsu @stepancar
-/types/lodash.isnan/                                     @bczengel @chrootsu @stepancar
-/types/lodash.isnative/                                  @bczengel @chrootsu @stepancar
-/types/lodash.isnil/                                     @bczengel @chrootsu @stepancar
-/types/lodash.isnull/                                    @bczengel @chrootsu @stepancar
-/types/lodash.isnumber/                                  @bczengel @chrootsu @stepancar
-/types/lodash.isobject/                                  @bczengel @chrootsu @stepancar
-/types/lodash.isobjectlike/                              @bczengel @chrootsu @stepancar
-/types/lodash.isplainobject/                             @bczengel @chrootsu @stepancar
-/types/lodash.isregexp/                                  @bczengel @chrootsu @stepancar
-/types/lodash.issafeinteger/                             @bczengel @chrootsu @stepancar
-/types/lodash.isset/                                     @bczengel @chrootsu @stepancar
-/types/lodash.isstring/                                  @bczengel @chrootsu @stepancar
-/types/lodash.issymbol/                                  @bczengel @chrootsu @stepancar
-/types/lodash.istypedarray/                              @bczengel @chrootsu @stepancar
-/types/lodash.isundefined/                               @bczengel @chrootsu @stepancar
-/types/lodash.isweakmap/                                 @bczengel @chrootsu @stepancar
-/types/lodash.isweakset/                                 @bczengel @chrootsu @stepancar
-/types/lodash.iteratee/                                  @bczengel @chrootsu @stepancar
-/types/lodash.join/                                      @bczengel @chrootsu @stepancar
-/types/lodash.kebabcase/                                 @bczengel @chrootsu @stepancar
-/types/lodash.keyby/                                     @bczengel @chrootsu @stepancar
-/types/lodash.keys/                                      @bczengel @chrootsu @stepancar
-/types/lodash.keysin/                                    @bczengel @chrootsu @stepancar
-/types/lodash.last/                                      @bczengel @chrootsu @stepancar
-/types/lodash.lastindexof/                               @bczengel @chrootsu @stepancar
-/types/lodash.lowercase/                                 @bczengel @chrootsu @stepancar
-/types/lodash.lowerfirst/                                @bczengel @chrootsu @stepancar
-/types/lodash.lt/                                        @bczengel @chrootsu @stepancar
-/types/lodash.lte/                                       @bczengel @chrootsu @stepancar
-/types/lodash.mapkeys/                                   @bczengel @chrootsu @stepancar
-/types/lodash.mapvalues/                                 @bczengel @chrootsu @stepancar
-/types/lodash.matches/                                   @bczengel @chrootsu @stepancar
-/types/lodash.matchesproperty/                           @bczengel @chrootsu @stepancar
-/types/lodash.max/                                       @bczengel @chrootsu @stepancar
-/types/lodash.maxby/                                     @bczengel @chrootsu @stepancar
-/types/lodash.mean/                                      @bczengel @chrootsu @stepancar
-/types/lodash.meanby/                                    @bczengel @chrootsu @stepancar
-/types/lodash.memoize/                                   @bczengel @chrootsu @stepancar
-/types/lodash.merge/                                     @bczengel @chrootsu @stepancar
-/types/lodash.mergewith/                                 @bczengel @chrootsu @stepancar
-/types/lodash.method/                                    @bczengel @chrootsu @stepancar
-/types/lodash.methodof/                                  @bczengel @chrootsu @stepancar
-/types/lodash.min/                                       @bczengel @chrootsu @stepancar
-/types/lodash.minby/                                     @bczengel @chrootsu @stepancar
-/types/lodash.mixin/                                     @bczengel @chrootsu @stepancar
-/types/lodash.negate/                                    @bczengel @chrootsu @stepancar
-/types/lodash.noop/                                      @bczengel @chrootsu @stepancar
-/types/lodash.now/                                       @bczengel @chrootsu @stepancar
-/types/lodash.nth/                                       @bczengel @chrootsu @stepancar
-/types/lodash.ntharg/                                    @bczengel @chrootsu @stepancar
-/types/lodash.omit/                                      @bczengel @chrootsu @stepancar
-/types/lodash.omitby/                                    @bczengel @chrootsu @stepancar
-/types/lodash.once/                                      @bczengel @chrootsu @stepancar
-/types/lodash.orderby/                                   @bczengel @chrootsu @stepancar
-/types/lodash.over/                                      @bczengel @chrootsu @stepancar
-/types/lodash.overargs/                                  @bczengel @chrootsu @stepancar
-/types/lodash.overevery/                                 @bczengel @chrootsu @stepancar
-/types/lodash.oversome/                                  @bczengel @chrootsu @stepancar
-/types/lodash.pad/                                       @bczengel @chrootsu @stepancar
-/types/lodash.padend/                                    @bczengel @chrootsu @stepancar
-/types/lodash.padstart/                                  @bczengel @chrootsu @stepancar
-/types/lodash.parseint/                                  @bczengel @chrootsu @stepancar
-/types/lodash.partial/                                   @bczengel @chrootsu @stepancar
-/types/lodash.partialright/                              @bczengel @chrootsu @stepancar
-/types/lodash.partition/                                 @bczengel @chrootsu @stepancar
-/types/lodash.pick/                                      @bczengel @chrootsu @stepancar
-/types/lodash.pickby/                                    @bczengel @chrootsu @stepancar
-/types/lodash.property/                                  @bczengel @chrootsu @stepancar
-/types/lodash.propertyof/                                @bczengel @chrootsu @stepancar
-/types/lodash.pull/                                      @bczengel @chrootsu @stepancar
-/types/lodash.pullall/                                   @bczengel @chrootsu @stepancar
-/types/lodash.pullallby/                                 @bczengel @chrootsu @stepancar
-/types/lodash.pullat/                                    @bczengel @chrootsu @stepancar
-/types/lodash.random/                                    @bczengel @chrootsu @stepancar
-/types/lodash.range/                                     @bczengel @chrootsu @stepancar
-/types/lodash.rangeright/                                @bczengel @chrootsu @stepancar
-/types/lodash.rearg/                                     @bczengel @chrootsu @stepancar
-/types/lodash.reduce/                                    @bczengel @chrootsu @stepancar
-/types/lodash.reduceright/                               @bczengel @chrootsu @stepancar
-/types/lodash.reject/                                    @bczengel @chrootsu @stepancar
-/types/lodash.remove/                                    @bczengel @chrootsu @stepancar
-/types/lodash.repeat/                                    @bczengel @chrootsu @stepancar
-/types/lodash.replace/                                   @bczengel @chrootsu @stepancar
-/types/lodash.rest/                                      @bczengel @chrootsu @stepancar
-/types/lodash.result/                                    @bczengel @chrootsu @stepancar
-/types/lodash.reverse/                                   @bczengel @chrootsu @stepancar
-/types/lodash.round/                                     @bczengel @chrootsu @stepancar
-/types/lodash.sample/                                    @bczengel @chrootsu @stepancar
-/types/lodash.samplesize/                                @bczengel @chrootsu @stepancar
-/types/lodash.set/                                       @bczengel @chrootsu @stepancar
-/types/lodash.setwith/                                   @bczengel @chrootsu @stepancar
-/types/lodash.shuffle/                                   @bczengel @chrootsu @stepancar
-/types/lodash.size/                                      @bczengel @chrootsu @stepancar
-/types/lodash.slice/                                     @bczengel @chrootsu @stepancar
-/types/lodash.snakecase/                                 @bczengel @chrootsu @stepancar
-/types/lodash.some/                                      @bczengel @chrootsu @stepancar
-/types/lodash.sortby/                                    @bczengel @chrootsu @stepancar
-/types/lodash.sortedindex/                               @bczengel @chrootsu @stepancar
-/types/lodash.sortedindexby/                             @bczengel @chrootsu @stepancar
-/types/lodash.sortedindexof/                             @bczengel @chrootsu @stepancar
-/types/lodash.sortedlastindex/                           @bczengel @chrootsu @stepancar
-/types/lodash.sortedlastindexby/                         @bczengel @chrootsu @stepancar
-/types/lodash.sortedlastindexof/                         @bczengel @chrootsu @stepancar
-/types/lodash.sorteduniq/                                @bczengel @chrootsu @stepancar
-/types/lodash.sorteduniqby/                              @bczengel @chrootsu @stepancar
-/types/lodash.split/                                     @bczengel @chrootsu @stepancar
-/types/lodash.spread/                                    @bczengel @chrootsu @stepancar
-/types/lodash.startcase/                                 @bczengel @chrootsu @stepancar
-/types/lodash.startswith/                                @bczengel @chrootsu @stepancar
-/types/lodash.subtract/                                  @bczengel @chrootsu @stepancar
-/types/lodash.sum/                                       @bczengel @chrootsu @stepancar
-/types/lodash.sumby/                                     @bczengel @chrootsu @stepancar
-/types/lodash.tail/                                      @bczengel @chrootsu @stepancar
-/types/lodash.take/                                      @bczengel @chrootsu @stepancar
-/types/lodash.takeright/                                 @bczengel @chrootsu @stepancar
-/types/lodash.takerightwhile/                            @bczengel @chrootsu @stepancar
-/types/lodash.takewhile/                                 @bczengel @chrootsu @stepancar
-/types/lodash.template/                                  @bczengel @chrootsu @stepancar
-/types/lodash.throttle/                                  @bczengel @chrootsu @stepancar
-/types/lodash.times/                                     @bczengel @chrootsu @stepancar
-/types/lodash.toarray/                                   @bczengel @chrootsu @stepancar
-/types/lodash.tointeger/                                 @bczengel @chrootsu @stepancar
-/types/lodash.tolength/                                  @bczengel @chrootsu @stepancar
-/types/lodash.tolower/                                   @bczengel @chrootsu @stepancar
-/types/lodash.tonumber/                                  @bczengel @chrootsu @stepancar
-/types/lodash.topairs/                                   @bczengel @chrootsu @stepancar
-/types/lodash.topairsin/                                 @bczengel @chrootsu @stepancar
-/types/lodash.topath/                                    @bczengel @chrootsu @stepancar
-/types/lodash.toplainobject/                             @bczengel @chrootsu @stepancar
-/types/lodash.tosafeinteger/                             @bczengel @chrootsu @stepancar
-/types/lodash.tostring/                                  @bczengel @chrootsu @stepancar
-/types/lodash.toupper/                                   @bczengel @chrootsu @stepancar
-/types/lodash.transform/                                 @bczengel @chrootsu @stepancar
-/types/lodash.trim/                                      @bczengel @chrootsu @stepancar
-/types/lodash.trimend/                                   @bczengel @chrootsu @stepancar
-/types/lodash.trimstart/                                 @bczengel @chrootsu @stepancar
-/types/lodash.truncate/                                  @bczengel @chrootsu @stepancar
-/types/lodash.unary/                                     @bczengel @chrootsu @stepancar
-/types/lodash.unescape/                                  @bczengel @chrootsu @stepancar
-/types/lodash.union/                                     @bczengel @chrootsu @stepancar
-/types/lodash.unionby/                                   @bczengel @chrootsu @stepancar
-/types/lodash.unionwith/                                 @bczengel @chrootsu @stepancar
-/types/lodash.uniq/                                      @bczengel @chrootsu @stepancar
-/types/lodash.uniqby/                                    @bczengel @chrootsu @stepancar
-/types/lodash.uniqueid/                                  @bczengel @chrootsu @stepancar
-/types/lodash.uniqwith/                                  @bczengel @chrootsu @stepancar
-/types/lodash.unset/                                     @bczengel @chrootsu @stepancar
-/types/lodash.unzip/                                     @bczengel @chrootsu @stepancar
-/types/lodash.unzipwith/                                 @bczengel @chrootsu @stepancar
-/types/lodash.update/                                    @bczengel @chrootsu @stepancar
-/types/lodash.uppercase/                                 @bczengel @chrootsu @stepancar
-/types/lodash.upperfirst/                                @bczengel @chrootsu @stepancar
-/types/lodash.values/                                    @bczengel @chrootsu @stepancar
-/types/lodash.valuesin/                                  @bczengel @chrootsu @stepancar
-/types/lodash.without/                                   @bczengel @chrootsu @stepancar
-/types/lodash.words/                                     @bczengel @chrootsu @stepancar
-/types/lodash.wrap/                                      @bczengel @chrootsu @stepancar
-/types/lodash.xor/                                       @bczengel @chrootsu @stepancar
-/types/lodash.xorby/                                     @bczengel @chrootsu @stepancar
-/types/lodash.xorwith/                                   @bczengel @chrootsu @stepancar
-/types/lodash.zip/                                       @bczengel @chrootsu @stepancar
-/types/lodash.zipobject/                                 @bczengel @chrootsu @stepancar
-/types/lodash.zipobjectdeep/                             @bczengel @chrootsu @stepancar
-/types/lodash.zipwith/                                   @bczengel @chrootsu @stepancar
-/types/log-symbols/                                      @BendingBender
-/types/log-update/                                       @BendingBender
-/types/log4javascript/                                   @Ritzlgrmft
-/types/log4js/                                           @armorik83
-/types/logat/                                            @krvikash35
-/types/logg/                                             @blittle
-/types/loggly/                                           @rmartone @geoffreak
-/types/loglevel/                                         @Pro @flqw @szmeti
-/types/logrotate-stream/                                 @rogierschouten
-/types/lokijs/                                           @TeamworkGuy2
-/types/lolex/                                            @Nemo157 @joshuakgoldberg
-/types/long/                                             @peterkooijmans
-/types/loopback/                                         @kattsushi
-/types/loopback-boot/                                    @kattsushi
-/types/lorem-ipsum/                                      @durad
-/types/lory.js/                                          @kubosho @milkisevil
-/types/loud-rejection/                                   @BendingBender
-/types/lovefield/                                        @freshp86
-/types/lowdb/                                            @typicode
-/types/lowlight/                                         @NoHomey
-/types/lru-cache/                                        @Bartvds
-/types/lscache/                                          @Chris-Martinezz
-/types/ltx/                                              @PJakcson
-/types/luaparse/                                         @stpettersens
-/types/lunr/                                             @sebastian-lenz
-/types/lwip/                                             @AyaMorisawa
-/types/lz-string/                                        @M0ns1gn0r
-/types/magic-number/                                     @stpettersens
-/types/magicsuggest/                                     @leonardochaia
-/types/magnet-uri/                                       @tlaziuk
-/types/mailcheck/                                        @pocesar
-/types/maildev/                                          @cyrilschumacher @zbarbuto
-/types/mailgen/                                          @vothanhkiet @jordanfarrer
-/types/mailparser/                                       @psnider
-/types/main-bower-files/                                 @k-kagurazaka
-/types/make-dir/                                         @ikatyang @BendingBender
-/types/maker.js/                                         @danmarshall
-/types/mandrill-api/                                     @pocesar
-/types/map-obj/                                          @BendingBender
-/types/mapbox/                                           @anahkiasen
-/types/mapbox-gl/                                        @dobrud
-/types/mapbox__shelf-pack/                               @Perlmint
-/types/mapsjs/                                           @davismj
-/types/mariasql/                                         @bennett000
-/types/markdown-it/                                      @rapropos
-/types/markdown-it-anchor/                               @seryl
-/types/markdown-it-container/                            @hronex
-/types/marked/                                           @worr @BendingBender
-/types/marker-animate-unobtrusive/                       @viskin
-/types/markerclustererplus/                              @enanox
-/types/markitup/                                         @drillbits
-/types/maskedinput/                                      @lokeshpeta
-/types/masonry-layout/                                   @m-a-wilson @warriorrocker
-/types/massive/                                          @swissspidy @clarenceh
-/types/match-media-mock/                                 @asvetliakov
-/types/material-design-lite/                             @bradzacher
-/types/material-ui/                                      @ngbrown @theigor @alitaheri @herrmanno @DaIgeb @allienna @schlesingermatthias @InsidersByte @artyomsv @dan-j @minodisk
-/types/materialize-css/                                  @eriklieben @leonyu @SinghSukhdeep
-/types/math3d/                                           @laszlojakab
-/types/mathjax/                                          @rolandzwaga
-/types/mathjs/                                           @siavol
-/types/matter-js/                                        @piranha771
-/types/maxmind/                                          @geoffreak
-/types/mcustomscrollbar/                                 @flurg
-/types/md5/                                              @arcdev1 @jprogrammer
-/types/mdns/                                             @reppners
-/types/media-typer/                                      @BendingBender
-/types/medium-editor/                                    @keika299
-/types/mem/                                              @SamVerschueren
-/types/memcached/                                        @KentarouTakeda
-/types/memoizee/                                         @juanpicado
-/types/memory-cache/                                     @jedigo
-/types/memory-fs/                                        @e-cloud
-/types/memwatch-next/                                    @cyrilschumacher
-/types/meow/                                             @KnisterPeter
-/types/merge-descriptors/                                @danny8002
-/types/merge-stream/                                     @k-kagurazaka
-/types/merge2/                                           @tkrotoff @smac89
-/types/mersenne-twister/                                 @KentarouTakeda
-/types/meshblu/                                          @fnipo
-/types/mess/                                             @Nemo157
-/types/messenger/                                        @derekcicerone
-/types/meteor/                                           @barbatus @fullflavedave @orefalo @dagatsoin @birkskyum @ardatan @stefanholzapfel
-/types/meteor-accounts-phone/                            @DAB0mB
-/types/meteor-collection-hooks/                          @twastvedt
-/types/meteor-jboulhous-dev/                             @vangorra
-/types/meteor-persistent-session/                        @vangorra
-/types/meteor-prime8consulting-oauth2/                   @vangorra
-/types/meteor-publish-composite/                         @vangorra
-/types/meteor-roles/                                     @vangorra
-/types/method-override/                                  @santialbo
-/types/methods/                                          @cprecioso
-/types/metismenu/                                        @onokumus @denisname
-/types/metric-suffix/                                    @davidm77
-/types/micro/                                            @kaoDev
-/types/microgears/                                       @marcusdb
-/types/micromatch/                                       @glen-84
-/types/microrouter/                                      @mathieudutour
-/types/microsoft-ajax/                                   @pjmagee
-/types/microsoft-live-connect/                           @jvilk
-/types/microsoft-sdk-soap/                               @markusmauch
-/types/microsoftteams/                                   @OfficeDev
-/types/microtime/                                        @vincekovacs
-/types/milkcocoa/                                        @odangosan
-/types/mime/                                             @jedigo
-/types/mime-db/                                          @AJamesPhillips
-/types/mime-types/                                       @Perlmint
-/types/mimos/                                            @AJamesPhillips
-/types/mina/                                             @lhk @mattanja @kant2002
-/types/minimatch/                                        @vvakame @shantmarouti
-/types/minimist/                                         @Bartvds @Necroskillz @kamranayub
-/types/minipass/                                         @BendingBender
-/types/mithril/                                          @spacejack @andraaspar @isiahmeadows
-/types/mithril-global/                                   @spacejack @isiahmeadows
-/types/mitm/                                             @alejo90
-/types/mixpanel/                                         @hjellek
-/types/mixto/                                            @vvakame
-/types/mkdirp/                                           @Bartvds
-/types/mkpath/                                           @optical
-/types/mobile-detect/                                    @martinmcwhorter
-/types/mocha/                                            @kazimanzurrashid @otiai10 @jt000 @enlight
-/types/mocha-phantomjs/                                  @ErikSchierboom
-/types/mock-fs/                                          @Nemo157 @tkqubo
-/types/mock-raf/                                         @djpereira
-/types/mock-require/                                     @djpereira
-/types/mockdate/                                         @brunolm
-/types/mockery/                                          @jt000
-/types/modernizr/                                        @borisyankov @theodorejb @leonyu @lucax88x @nhardy
-/types/modesl/                                           @neeschit
-/types/moment-business/                                  @wonbyte
-/types/moment-duration-format/                           @SwintDC @TwoStone @leonard-thieu
-/types/moment-jalaali/                                   @alitaheri
-/types/moment-range/                                     @Burgov @wilgert @franjuan @MartynasZilinskas
-/types/moment-round/                                     @jacobbaskin
-/types/moment-timezone/                                  @michelsalib
-/types/mongodb/                                          @CaselIT @alanmarcell @kikar
-/types/mongoose/                                         @simonxca @horiuchi @sindrenm @lukasz-zak
-/types/mongoose-auto-increment/                          @AyaMorisawa
-/types/mongoose-deep-populate/                           @AyaMorisawa
-/types/mongoose-mock/                                    @jt000
-/types/mongoose-paginate/                                @linusbrolin @simonxca
-/types/mongoose-promise/                                 @simonxca
-/types/mongoose-seeder/                                  @Crevil
-/types/mongoose-sequence/                                @linusbrolin
-/types/mongoose-simple-random/                           @me
-/types/mongoose-unique-validator/                        @stevehipwell
-/types/monk/                                             @wzr1337
-/types/moo/                                              @deltaidea
-/types/morgan/                                           @staticfunction
-/types/morris.js/                                        @mareek @sindilevich
-/types/mousetrap/                                        @qcz
-/types/move-concurrently/                                @mgroenhoff
-/types/moviedb/                                          @basarat @0x6368656174
-/types/moxios/                                           @itoasuka
-/types/mpromise/                                         @sgkim126
-/types/mqtt/                                             @PekkaPLeppanen
-/types/mri/                                              @shiftkey @j-f1
-/types/ms/                                               @danny8002
-/types/msgpack-lite/                                     @endel @efokschaner
-/types/msgpack5/                                         @wokim @heycalmdown
-/types/msnodesql/                                        @borisyankov @SomaticIT
-/types/msportalfx-test/                                  @julioct
-/types/mssql/                                            @jaminfarr @buzinas @mrrichar @elhaard @pkeuter
-/types/mu2/                                              @jedigo
-/types/multer/                                           @jt000 @DavidBR-SW @mxl @hyunseob
-/types/multer-gridfs-storage/v1/                         @devconcept
-/types/multer-gridfs-storage/                            @devconcept
-/types/multer-s3/                                        @tcaesvk
-/types/multi-typeof/                                     @mhegazy
-/types/multimatch/                                       @stephenlautier
-/types/multiparty/                                       @kenfdev
-/types/multiplexjs/                                      @KamyarNazeri
-/types/murmurhash-js/                                    @cvle
-/types/murmurhash3js/                                    @dlee-nvisia
-/types/musicmetadata/                                    @Xstoudi
-/types/mustache/                                         @markashleybell
-/types/mysql/                                            @wjohnsto @kacepe
-/types/mz/                                               @ThomasHickman
-/types/n3/                                               @phreed
-/types/nano/                                             @timjacobi
-/types/nanoajax/                                         @nathancahill
-/types/nanomsg/                                          @titan
-/types/nanoscroller/                                     @zihark17
-/types/nanp/                                             @karn
-/types/natsort/                                          @mgroenhoff
-/types/natural/                                          @dmoonfire
-/types/natural-sort/                                     @a-morales
-/types/navigation/                                       @grahammendick
-/types/navigation-react/                                 @grahammendick
-/types/navigo/                                           @aersamkull
-/types/nblas/                                            @erikgerrits
-/types/nconf/                                            @jedigo @jmthibault
-/types/ncp/                                              @bartvds
-/types/ndarray/                                          @pawsong @taoqf
-/types/nearley/                                          @deltaidea
-/types/nedb/                                             @reppners
-/types/nedb-logger/                                      @thisboyiscrazy
-/types/needle/v0/                                        @bigsan
-/types/needle/                                           @bigsan @nikeee
-/types/negotiator/                                       @BendingBender
-/types/neo4j/                                            @cyrilschumacher
-/types/nes/                                              @NoHomey
-/types/netmask/                                          @mhfrantz
-/types/nexpect/                                          @vvakame
-/types/next/                                             @dru89
-/types/next-redux-wrapper/                               @stevegeek
-/types/ng-command/                                       @stephenlautier
-/types/ng-cordova/                                       @ksachdeva
-/types/ng-dialog/                                        @stephenlautier
-/types/ng-facebook/                                      @Crevil
-/types/ng-file-upload/                                   @johnnyreilly @thewarpaint
-/types/ng-flow/                                          @ryan10132
-/types/ng-grid/                                          @smithkl42 @rolandzwaga @kentcooper
-/types/ng-i18next/                                       @cyrilschumacher
-/types/ng-notify/                                        @nzamosenchuk
-/types/ng-stomp/                                         @lpotapczuk
-/types/ngbootbox/                                        @stpettersens
-/types/ngeohash/                                         @erkie
-/types/ngkookies/                                        @martinmcwhorter
-/types/ngmap/                                            @nkovacic
-/types/ngprogress/                                       @martinmcwhorter
-/types/ngprogress-lite/                                  @LukeForder
-/types/ngreact/                                          @velveret
-/types/ngstorage/                                        @kubiq
-/types/ngtoaster/                                        @btesser
-/types/ngwysiwyg/                                        @patrick-mackay
-/types/nightmare/                                        @horiuchi @samyang-au
-/types/noble/                                            @swook @wind-rider @shantanubhadoria @lukel99 @bioball
-/types/nock/                                             @bonnici @horiuchi
-/types/nodal/                                            @charrondev
-/types/node/v6/                                          @WilcoBakker
-/types/node/v7/                                          @parambirs @RobDesideri @tellnes @WilcoBakker @Tyriar
-/types/node/                                             @parambirs @RobDesideri @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @Tyriar @DeividasBakanas
-/types/node-7z/                                          @erkie
-/types/node-array-ext/                                   @Beng89
-/types/node-cache/                                       @chrootsu @dthunell
-/types/node-calendar/                                    @luzianz
-/types/node-cleanup/                                     @agadar
-/types/node-common-errors/                               @icopp
-/types/node-dir/                                         @panuhorsmalahti
-/types/node-dogstatsd/                                   @chrisbobo
-/types/node-emoji/                                       @jonestristand
-/types/node-feedparser/                                  @cortopy
-/types/node-fetch/                                       @torstenwerner
-/types/node-fibers/                                      @caryhaynie
-/types/node-forge/                                       @westy92 @flynetworks @a-k-g
-/types/node-gcm/                                         @horiuchi
-/types/node-getopt/                                      @kcauchy
-/types/node-hid/                                         @mhegazy @ert78gb
-/types/node-hue-api/                                     @fjmorel
-/types/node-int64/                                       @x3cion
-/types/node-ipc/                                         @arvitaly
-/types/node-jsfl-runner/                                 @mrand01
-/types/node-json-db/                                     @kuzn-ilya
-/types/node-mysql-wrapper/                               @kataras
-/types/node-notifier/                                    @tkQubo
-/types/node-pg-migrate/                                  @bradleyayers
-/types/node-polyglot/                                    @timjk
-/types/node-powershell/                                  @rodrigoff
-/types/node-ral/                                         @ssddi456
-/types/node-rsa/                                         @alitaheri
-/types/node-schedule/                                    @cyrilschumacher @flowpl
-/types/node-slack/                                       @tkQubo
-/types/node-snap7/                                       @heilingbrunner
-/types/node-sprite-generator/                            @Perlmint
-/types/node-static/                                      @Morfent
-/types/node-statsd/                                      @alexturek @convoyinc
-/types/node-telegram-bot-api/                            @ammuench @agadar
-/types/node-uuid/                                        @jeffmay
-/types/node-validator/                                   @kengorab
-/types/node-vault/                                       @YuJianrong
-/types/node-waves/                                       @stephenlautier
-/types/node-wit/                                         @julienduf
-/types/node-xmpp-client/                                 @PJakcson
-/types/node-xmpp-core/                                   @PJakcson
-/types/node-zookeeper-client/                            @plantain-00
-/types/node_redis/                                       @borisyankov
-/types/nodegit/                                          @dolanmiu
-/types/nodemailer/                                       @rogierschouten
-/types/nodemailer-direct-transport/                      @rogierschouten
-/types/nodemailer-mailgun-transport/                     @otociulis
-/types/nodemailer-pickup-transport/                      @psnider
-/types/nodemailer-ses-transport/                         @westy92
-/types/nodemailer-smtp-pool/                             @rogierschouten
-/types/nodemailer-smtp-transport/                        @rogierschouten
-/types/nodemailer-stub-transport/                        @cyrilschumacher
-/types/nodeunit/                                         @jedigo
-/types/noisejs/                                          @izmhr
-/types/nomnom/                                           @panopticoncentral
-/types/nopt/                                             @jbondc
-/types/normalize-url/                                    @odin3 @BendingBender
-/types/notie/                                            @mateusdemboski
-/types/notify/                                           @hellochar
-/types/notify.js/                                        @bahman616
-/types/notifyjs/                                         @soundTricker
-/types/nouislider/v7/                                    @acoreyj
-/types/nouislider/v8/                                    @bleuarg
-/types/nouislider/                                       @bleuarg @lagaffe
-/types/novnc-core/                                       @smithkl42 @BendingBender
-/types/npm/                                              @SomaticIT
-/types/npm-package-arg/                                  @mgroenhoff
-/types/ns-api/                                           @Archcry
-/types/nslog/                                            @unindented
-/types/nsqjs/                                            @cezaryrk
-/types/number-is-nan/                                    @mhegazy
-/types/number-to-words/                                  @frederickfogerty
-/types/numeral/                                          @vbortone
-/types/numjs/                                            @taoqf
-/types/nunjucks/                                         @RubenSlabbert
-/types/nunjucks-date/                                    @kruncher
-/types/nvd3/                                             @PjMitchell
-/types/nw.gui/                                           @xperiments
-/types/nw.js/                                            @alirdn
-/types/o.js/                                             @IceOnFire @bradzacher @janhommes
-/types/oauth.js/                                         @nobuoka
-/types/oauth2-server/                                    @vangorra @cirick
-/types/oauth2orize/                                      @wokim @heycalmdown @stevehipwell
-/types/obelisk.js/                                       @bdrupieski
-/types/object-assign/                                    @chbrown
-/types/object-diff/                                      @rogierschouten
-/types/object-hash/                                      @misak113
-/types/object-path/                                      @pocesar
-/types/object-refs/                                      @3fd
-/types/oblo-util/                                        @Oblosys
-/types/oboe/                                             @optical
-/types/observe-js/                                       @herrmanno
-/types/oclazyload/                                       @rolandzwaga
-/types/odata/                                            @janhommes
-/types/ofe/                                              @Morfent
-/types/office-js/                                        @OfficeDev @LanceEA
-/types/offline-js/                                       @cgwrench
-/types/oibackoff/                                        @geoffreak
-/types/oidc-token-manager/                               @rosieks
-/types/on-finished/                                      @czechboy0 @BendingBender
-/types/on-headers/                                       @jjeffery @BendingBender
-/types/once/                                             @denis-sokolov @BendingBender
-/types/onetime/                                          @BendingBender
-/types/onoff/                                            @marcel-ernst
-/types/open/                                             @Bartvds
-/types/opener/                                           @tikurahul
-/types/openfin/                                          @chrisbarker
-/types/openjscad/                                        @danmarshall
-/types/openlayers/v2/                                    @bolhovsky
-/types/openlayers/v3/                                    @osechet @matthiasdailey-ccri
-/types/openlayers/                                       @osechet @ganlhi
-/types/openstack-wrapper/                                @sanjaymadane
-/types/opentok/                                          @westy92 @CatGuardian
-/types/opentype.js/                                      @danmarshall
-/types/opn/                                              @shinnn @SomaticIT
-/types/optics-agent/                                     @crevil
-/types/optimist/                                         @soywiz @chbrown
-/types/optimize-css-assets-webpack-plugin/               @odnamrataizem
-/types/ora/v0/                                           @screendriver
-/types/ora/                                              @basarat @screendriver @BendingBender
-/types/oracledb/                                         @Bigous
-/types/orchestrator/                                     @tkQubo @TeamworkGuy2
-/types/orderedmap/                                       @bradleyayers
-/types/orientjs/                                         @saeedtabrizi
-/types/os-homedir/                                       @mhegazy
-/types/os-locale/v1/                                     @AyaMorisawa @BendingBender
-/types/os-locale/                                        @AyaMorisawa @BendingBender
-/types/os-name/                                          @BendingBender
-/types/os-tmpdir/                                        @mhegazy
-/types/osmosis/                                          @jurajkocan
-/types/osmtogeojson/                                     @tkqubo
-/types/owlcarousel/                                      @dpiatkowski
-/types/p-all/                                            @BendingBender
-/types/p-any/                                            @BendingBender
-/types/p-cancelable/                                     @BendingBender
-/types/p-debounce/                                       @BendingBender
-/types/p-defer/                                          @SamVerschueren
-/types/p-do-whilst/                                      @BendingBender
-/types/p-each-series/                                    @BendingBender
-/types/p-event/                                          @BendingBender
-/types/p-every/                                          @BendingBender
-/types/p-lazy/                                           @BendingBender
-/types/p-limit/                                          @BendingBender
-/types/p-locate/                                         @BendingBender
-/types/p-log/                                            @BendingBender
-/types/p-map/                                            @BendingBender
-/types/p-map-series/                                     @BendingBender
-/types/p-one/                                            @BendingBender
-/types/p-props/                                          @BendingBender
-/types/p-queue/                                          @BendingBender @evanshortiss
-/types/p-reduce/                                         @BendingBender
-/types/p-reflect/                                        @BendingBender
-/types/p-retry/                                          @BendingBender
-/types/p-series/                                         @BendingBender
-/types/p-settle/                                         @natesilva
-/types/p-some/                                           @BendingBender
-/types/p-tap/                                            @BendingBender
-/types/p-throttle/                                       @BendingBender
-/types/p-timeout/                                        @BendingBender
-/types/p-try/                                            @BendingBender
-/types/p-wait-for/                                       @BendingBender
-/types/p-whilst/                                         @BendingBender
-/types/p2/                                               @clark-stevenson
-/types/packery/                                          @piraveen @hanssens
-/types/pad/                                              @mhegazy
-/types/paho-mqtt/                                        @amikhalev
-/types/pako/                                             @cappellin @calebegg
-/types/papaparse/                                        @torpedro @rainshen49
-/types/paper/                                            @clark-stevenson
-/types/paralleljs/                                       @jbaldwin
-/types/parse/                                            @dpoetzsch @jaeggerr
-/types/parse-git-config/                                 @leonard-thieu
-/types/parse-glob/                                       @glen-84
-/types/parse-link-header/                                @zelein
-/types/parse-mockdb/                                     @dpoetzsch
-/types/parse-torrent/                                    @niieani @tlaziuk
-/types/parse-torrent-file/                               @tlaziuk
-/types/parse-unit/                                       @Jack-Works
-/types/parseurl/                                         @bomret
-/types/parsimmon/                                        @Bartvds @mizunashi-mana @bcherny @bvanreeven @leonard-thieu
-/types/passport/                                         @horiuchi @enaeseth
-/types/passport-anonymous/                               @0x6368656174
-/types/passport-beam/                                    @AtlasDev
-/types/passport-client-cert/                             @warnersean
-/types/passport-discord/                                 @kzay
-/types/passport-facebook/                                @staticfunction @lucasmacosta
-/types/passport-facebook-token/                          @rmartone
-/types/passport-github/                                  @yasupeke
-/types/passport-github2/                                 @yasupeke @mthmulders
-/types/passport-google-oauth/                            @staticfunction
-/types/passport-google-oauth2/                           @bluehatbrit
-/types/passport-http/                                    @krizalys
-/types/passport-http-bearer/                             @isman-usoh
-/types/passport-jwt/                                     @mugeso @alsiola
-/types/passport-local/                                   @SomaticIT
-/types/passport-local-mongoose/                          @linusbrolin
-/types/passport-oauth2-client-password/                  @akaNightmare
-/types/passport-saml/                                    @cjbarth
-/types/passport-steam/                                   @kzay
-/types/passport-strategy/                                @liorm
-/types/passport-twitter/                                 @staticfunction
-/types/passport-unique-token/                            @briman0094 @SomaticIT
-/types/password-hash/                                    @mugeso
-/types/password-hash-and-salt/                           @alitaheri
-/types/path-exists/v1/                                   @shiwano
-/types/path-exists/                                      @shiwano @BendingBender
-/types/path-is-absolute/                                 @mhegazy
-/types/pathfinding/                                      @BNedry
-/types/pathjs/                                           @lokeshpeta
-/types/pathwatcher/                                      @vvakame
-/types/pause/                                            @BendingBender
-/types/payment/                                          @apare
-/types/paypal-cordova-plugin/                            @Justin-Credible
-/types/paypal-rest-sdk/                                  @trainerbill
-/types/pbf/                                              @cschwarz
-/types/pdfjs-dist/                                       @jbaldwin
-/types/pdfkit/                                           @erichillah
-/types/pdfobject/                                        @nielsboogaard
-/types/pebblekitjs/                                      @makotokw
-/types/peerjs/                                           @nakakura
-/types/pegjs/                                            @vvakame @SrTobi @siegebell
-/types/pem/                                              @tony19 @DethAriel
-/types/perfect-scrollbar/                                @aicest @CarbonAtom
-/types/persona/                                          @Nycto
-/types/pet-finder-api/                                   @me
-/types/pg-connection-string/                             @bradleyayers
-/types/pg-pool/                                          @aleung
-/types/pg-query-stream/                                  @asmarques
-/types/pg-types/                                         @waratuman
-/types/pgwmodal/                                         @pine613
-/types/phantom/                                          @horiuchi @llRandom
-/types/phantomcss/                                       @abauzac
-/types/phantomjs/                                        @jedhunsaker @keesey
-/types/phoenix/                                          @mciastek
-/types/phone/                                            @DxCx
-/types/phone-formatter/                                  @westy92
-/types/phonegap/                                         @borisyankov @DickvdBrink
-/types/phonegap-facebook-plugin/                         @Justin-Credible
-/types/phonegap-nfc/                                     @michaeldesigaud
-/types/phonegap-plugin-push/                             @fredgalvao @larrybahr
-/types/phonon/                                           @kserin
-/types/photonui/                                         @florentpoujol
-/types/photoswipe/                                       @hellochar
-/types/physijs/                                          @gyohk
-/types/pi-spi/                                           @marcel-ernst
-/types/pick-weight/                                      @rsxdalv
-/types/pickadate/                                        @theodorejb @leonard-thieu
-/types/pidusage/                                         @cyrilschumacher
-/types/pify/                                             @samverschueren
-/types/pigpio/                                           @manerfan
-/types/pikaday-time/                                     @Sayan751
-/types/pinkyswear/                                       @chances
-/types/pino/v3/                                          @psnider
-/types/pino/                                             @psnider @BendingBender
-/types/pinterest-sdk/                                    @adamburmister
-/types/pinyin/                                           @wanganjun
-/types/piwik-tracker/                                    @lbguilherme
-/types/pkijs/                                            @microshine
-/types/platform/                                         @JakeH
-/types/playerframework/                                  @ricardosabino
-/types/pleasejs/                                         @nakakura
-/types/plotly.js/                                        @chrisgervang @martinduparc @frederikaalund @taoqf
-/types/plugapi/                                          @BNedry
-/types/plupload/                                         @patrickbussmann
-/types/pluralize/                                        @ukyo
-/types/png-async/                                        @kanreisa
-/types/podcast/                                          @nikeee
-/types/podium/                                           @AJamesPhillips
-/types/point-in-polygon/                                 @dyst5422 @kogai
-/types/polylabel/                                        @DenisCarriere
-/types/polyline/                                         @Kern0
-/types/polymer/                                          @lgrignon @laco0416
-/types/polymer-ts/                                       @lgrignon
-/types/popcorn/                                          @grapswiz
-/types/popper.js/                                        @joscha @seckardt @marcfallows
-/types/portscanner/                                      @douglasduteil
-/types/postal/                                           @lokeshpeta @myitcv
-/types/postmark/                                         @benbayard
-/types/pouch-redux-middleware/                           @charrondev
-/types/pouchdb/                                          @AGBrown @geppy @fredgalvao
-/types/pouchdb-adapter-fruitdown/                        @spaulg @geppy @fredgalvao
-/types/pouchdb-adapter-http/                             @spaulg @geppy @fredgalvao
-/types/pouchdb-adapter-idb/                              @spaulg @geppy @fredgalvao
-/types/pouchdb-adapter-leveldb/                          @spaulg @geppy @fredgalvao
-/types/pouchdb-adapter-localstorage/                     @spaulg @geppy @fredgalvao
-/types/pouchdb-adapter-memory/                           @spaulg @geppy @fredgalvao
-/types/pouchdb-adapter-node-websql/                      @spaulg @geppy @fredgalvao
-/types/pouchdb-adapter-websql/                           @spaulg @geppy @fredgalvao
-/types/pouchdb-browser/                                  @spaulg @geppy @fredgalvao
-/types/pouchdb-core/                                     @spaulg @trubit @geppy @fredgalvao @TobiasBales
-/types/pouchdb-find/                                     @trubit
-/types/pouchdb-http/                                     @spaulg @geppy @fredgalvao
-/types/pouchdb-mapreduce/                                @spaulg @geppy @fredgalvao
-/types/pouchdb-node/                                     @spaulg @geppy @fredgalvao
-/types/pouchdb-replication/                              @trubit
-/types/pouchdb-upsert/                                   @keithdmoore @hotforfeature
-/types/power-assert/                                     @vvakame
-/types/power-assert-formatter/                           @vvakame
-/types/precise/                                          @codeanimal
-/types/precond/                                          @olsio
-/types/preloadjs/                                        @endel
-/types/prelude-ls/                                       @AyaMorisawa
-/types/prettier/                                         @ikatyang
-/types/pretty-bytes/                                     @plantain-00
-/types/pretty-ms/                                        @BendingBender
-/types/printf/                                           @AluisioASG
-/types/priorityqueuejs/                                  @geoffreak
-/types/prismjs/                                          @eriklieben @andrewiggins
-/types/private-ip/                                       @coderslagoon
-/types/procfs-stats/                                     @cyrilschumacher
-/types/progress/                                         @sebastian-lenz
-/types/progressbar/                                      @atd-schubert
-/types/progressjs/                                       @zaneli
-/types/proj4/                                            @DenisCarriere
-/types/proj4leaflet/                                     @BendingBender
-/types/project-oxford/                                   @scsouthw
-/types/promise-dag/                                      @OSjoerdWie
-/types/promise-pg/                                       @coldacid
-/types/promise-polyfill/                                 @skysteve
-/types/promise-pool/                                     @vilic
-/types/promise.prototype.finally/                        @slavik57 @BendingBender
-/types/promised-temp/                                    @rokadias
-/types/promisify-node/                                   @borekb
-/types/promisify-supertest/                              @aleung
-/types/prompt-sync/                                      @MugeSo
-/types/prompt-sync-history/                              @MugeSo
-/types/promptly/                                         @danrspencer
-/types/prop-types/                                       @DovydasNavickas
-/types/properties-reader/                                @Goldsmith42
-/types/prosemirror-collab/                               @bradleyayers @davidka
-/types/prosemirror-commands/                             @bradleyayers @davidka
-/types/prosemirror-history/                              @bradleyayers @davidka
-/types/prosemirror-inputrules/                           @bradleyayers @davidka
-/types/prosemirror-keymap/                               @bradleyayers @davidka
-/types/prosemirror-markdown/                             @bradleyayers
-/types/prosemirror-menu/                                 @davidka
-/types/prosemirror-model/                                @bradleyayers @davidka
-/types/prosemirror-schema-basic/                         @bradleyayers @davidka
-/types/prosemirror-schema-list/                          @bradleyayers @davidka
-/types/prosemirror-state/                                @bradleyayers @davidka
-/types/prosemirror-transform/                            @bradleyayers @davidka
-/types/prosemirror-view/                                 @bradleyayers @davidka
-/types/protobufjs/                                       @panuhorsmalahti
-/types/protractor-browser-logs/                          @rokadias
-/types/protractor-helpers/                               @johncant
-/types/protractor-http-mock/                             @Crevil
-/types/proxy-addr/                                       @BendingBender
-/types/proxyquire/                                       @jt000
-/types/pty.js/                                           @enlight
-/types/public-ip/                                        @BendingBender
-/types/pubsub-js/                                        @borisyankov
-/types/pug/                                              @TonyPythoneer @19majkel94
-/types/pulltorefreshjs/                                  @DanielRosenwasser
-/types/pump/                                             @tlaziuk
-/types/pure-render-decorator/                            @seansfkelley
-/types/purl/                                             @danfma
-/types/pusher-js/                                        @tkqubo
-/types/pvutils/                                          @microshine
-/types/python-shell/                                     @dolanmiu
-/types/q/v0/                                             @bnemetchek @johnnyreilly
-/types/q/                                                @bnemetchek @AndrewGaspar @johnnyreilly @mboudreau
-/types/q-io/                                             @Bartvds
-/types/q-retry/                                          @vilic
-/types/qhistory/                                         @Kovensky
-/types/qlik/                                             @RubenSlabbert @AginicX
-/types/qlik-engineapi/                                   @konne
-/types/qlik-visualizationextensions/                     @konne
-/types/qr-image/                                         @taoqf
-/types/qrcode-generator/                                 @stefanhuber
-/types/qrcode.react/                                     @mleko
-/types/qs/                                               @RWander @leonyu @tehbelinda @zyml @artursvonda
-/types/qtip2/                                            @Seltzer @leonard-thieu
-/types/query-string/                                     @SamVerschueren @tkrotoff @huhuanming
-/types/quick-lru/                                        @BendingBender
-/types/quill/                                            @sumitkm @guillaume-ro-fr
-/types/quixote/                                          @greybax
-/types/qunit/v1/                                         @diullei
-/types/qunit/                                            @waratuman
-/types/quoted-printable/                                 @pushplay
-/types/qwest/                                            @lindsayevans
-/types/r-script/                                         @NaridaL
-/types/rabbit.js/                                        @wokim
-/types/radium/                                           @alexgorbatchev @nupplaphil @asvetliakov @mihe
-/types/radius/                                           @codeanimal
-/types/ramda/                                            @donnut @mdekrey @LiamGoodacre @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg
-/types/random-js/                                        @pistacchio
-/types/random-seed/                                      @endel
-/types/random-string/                                    @stpettersens
-/types/randomcolor/                                      @feitzi @BradyLiles
-/types/range-parser/                                     @tlaziuk
-/types/rangyinputs/                                      @ersimont
-/types/raphael/                                          @CheCoxshall
-/types/rappid/                                           @DenEwout
-/types/ratelimiter/                                      @AyaMorisawa
-/types/raty/                                             @terrawheat
-/types/raven/                                            @scttcper @1999
-/types/raygun4js/                                        @xt0rted @BenjaminHarding
-/types/rc/                                               @DanielRosenwasser
-/types/rc-select/                                        @DenisTirilis
-/types/rc-slider/                                        @mantasmarcinkus @mattoni
-/types/rc-tree/                                          @johnnyreilly
-/types/rcloader/                                         @panuhorsmalahti
-/types/react/v15/                                        @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                            @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @richseviora
-/types/react-app/                                        @prakarshpandey
-/types/react-autosuggest/                                @nicolas-schmitt @pjo256 @robessog @tbayne
-/types/react-body-classname/                             @mhegazy
-/types/react-bootstrap/                                  @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @katbusch
-/types/react-bootstrap-date-picker/                      @LKay @ssi-hu-antal-bodnar
-/types/react-bootstrap-daterangepicker/                  @ianks
-/types/react-bootstrap-table/                            @flaub @alelode
-/types/react-breadcrumbs/                                @KostyaEsmukov
-/types/react-burger-menu/                                @radziksh
-/types/react-calendar-timeline/                          @radziksh
-/types/react-chartjs-2/                                  @apare @FabienLavocat
-/types/react-codemirror/                                 @velveret @rudi-c
-/types/react-color/                                      @LKay @markspolakovs @mntdn
-/types/react-copy-to-clipboard/                          @mabels
-/types/react-cropper/                                    @stepancar
-/types/react-css-modules/                                @KostyaEsmukov @skirsdeda
-/types/react-css-transition-replace/                     @LKay
-/types/react-custom-scrollbars/v3/                       @David-LeBlanc-git
-/types/react-custom-scrollbars/                          @David-LeBlanc-git @kittimiyo
-/types/react-data-grid/v1/                               @SupernaviX
-/types/react-data-grid/                                  @SupernaviX @KieranPeat @martinnov92
-/types/react-datagrid/                                   @stephenjelfs
-/types/react-datepicker/                                 @radziksh @andrewBalekha @smrq @Rogach
-/types/react-daterange-picker/                           @uncovertruth @MartynasZilinskas
-/types/react-dates/                                      @Artur-A
-/types/react-daum-postcode/                              @Sa-ryong
-/types/react-dnd-html5-backend/                          @oizie
-/types/react-document-title/                             @cleverguy25
-/types/react-dom/                                        @MartynasZilinskas
-/types/react-dropzone/v2/                                @matdube @LynxEyes @goblindegook @benbayard
-/types/react-dropzone/                                   @matdube @LynxEyes @goblindegook @benbayard @LKay
-/types/react-easy-chart/                                 @danzel
-/types/react-event-listener/                             @asvetliakov
-/types/react-fa/                                         @flaub @patsissons @LKay
-/types/react-facebook-login/                             @apare @jankarres
-/types/react-faux-dom/                                   @alitaheri @cleverguy25
-/types/react-file-input/                                 @dmitryrogozhny
-/types/react-file-reader-input/                          @dmitryrogozhny @alitaheri
-/types/react-flatpickr/                                  @begincalendar
-/types/react-flex/                                       @pushplay
-/types/react-flexr/                                      @pushplay
-/types/react-flip-move/                                  @jmhain
-/types/react-fontawesome/                                @timurrustamov @dublicator @vincaslt @gavingregory
-/types/react-ga/                                         @telshin
-/types/react-geosuggest/                                 @brmenchl
-/types/react-gravatar/                                   @invliD
-/types/react-grid-layout/                                @abirkholz @alitaheri @ZheyangSong
-/types/react-hamburger-menu/                             @grzesie2k
-/types/react-helmet/v4/                                  @evanbb @isman-usoh
-/types/react-helmet/                                     @evanbb @isman-usoh @lith-light-g @sammkj @yuit
-/types/react-highlight-words/                            @mhegazy
-/types/react-highlighter/                                @oizie
-/types/react-holder/                                     @isman-usoh
-/types/react-hot-loader/                                 @jacekjagiello
-/types/react-i18next/v1/                                 @KostyaEsmukov
-/types/react-i18next/                                    @GiedriusGrabauskas
-/types/react-icon-base/                                  @apare @LKay
-/types/react-icons/                                      @apare
-/types/react-imageloader/                                @stephenjelfs
-/types/react-infinite/                                   @rhysd
-/types/react-infinite-scroller/                          @Lapanti @psrebniak
-/types/react-input-calendar/                             @stepancar
-/types/react-input-mask/                                 @apare
-/types/react-intl/v1/                                    @bgrieder
-/types/react-intl/                                       @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari
-/types/react-intl-redux/                                 @LKay
-/types/react-is-deprecated/                              @seansfkelley
-/types/react-joyride/                                    @DanielRosenwasser @bendxn
-/types/react-json-pretty/                                @LKay
-/types/react-json-tree/                                  @gnestor
-/types/react-jsonschema-form/                            @iamdanfox @sirreal
-/types/react-lazyload/                                   @m0a
-/types/react-leaflet/                                    @danzel @davschne @yuit
-/types/react-list/                                       @buptyyf
-/types/react-loadable/                                   @Kovensky @odensc
-/types/react-loader/                                     @artfuldev
-/types/react-maskedinput/                                @LKay @lavoaster @CarlosBonetti
-/types/react-mdl/                                        @bradzacher
-/types/react-measure/                                    @asvetliakov @marcfallows
-/types/react-mixin/                                      @tkqubo
-/types/react-modal/                                      @radziksh @drewnoakes @homburg @ttamminen @hallowatcher
-/types/react-monaco-editor/                              @jnetterf
-/types/react-motion/                                     @stepancar @asvetliakov
-/types/react-motion-slider/                              @asvetliakov
-/types/react-native/                                     @alloy @gyzerok @huhuanming @iRoachie @timwangdev @kamal
-/types/react-native-collapsible/                         @iRoachie
-/types/react-native-communications/                      @huhuanming
-/types/react-native-datepicker/                          @jacobbaskin
-/types/react-native-drawer/                              @jnbt
-/types/react-native-drawer-layout/                       @jmfirth
-/types/react-native-elements/                            @iRoachie
-/types/react-native-fbsdk/                               @ifiokjr
-/types/react-native-fetch-blob/                          @MNBuyskih
-/types/react-native-fs/                                  @pocesar
-/types/react-native-goby/                                @MessageDream
-/types/react-native-google-analytics-bridge/             @huhuanming @nbperry
-/types/react-native-keep-awake/                          @huhuanming
-/types/react-native-material-design-searchbar/           @iRoachie
-/types/react-native-material-ui/                         @iRoachie
-/types/react-native-modalbox/                            @iRoachie
-/types/react-native-orientation/                         @MoLow
-/types/react-native-scrollable-tab-view/                 @CaiHuan
-/types/react-native-sensor-manager/                      @SahinVardar
-/types/react-native-snap-carousel/                       @jnbt
-/types/react-native-sortable-list/                       @sivolobov
-/types/react-native-svg-uri/                             @iRoachie
-/types/react-native-swiper/                              @CaiHuan @huhuanming @mhcgrq
-/types/react-native-touch-id/                            @huhuanming
-/types/react-native-vector-icons/                        @iRoachie @timwangdev
-/types/react-native-video/                               @huhuanming
-/types/react-navigation/                                 @huhuanming @mhcgrq @fangpenlin @abrahambotros @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev
-/types/react-notification-system/                        @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
-/types/react-notification-system-redux/                  @LKay
-/types/react-onclickoutside/v5/                          @LKay
-/types/react-onclickoutside/                             @LKay
-/types/react-overlays/                                   @aaronbeall @vitosamson
-/types/react-paginate/                                   @deevus @wouterhardeman @pegel03 @archy-bold
-/types/react-pointable/                                  @istefo
-/types/react-portal/                                     @shuntksh
-/types/react-props-decorators/                           @tkqubo
-/types/react-recaptcha/                                  @mhegazy
-/types/react-redux/                                      @tkqubo @seansfkelley @thasner @kenzierocks @clayne11 @tansongyang
-/types/react-redux-i18n/                                 @clementdevos
-/types/react-redux-toastr/                               @Smiche @artyomsv @kulmajaba
-/types/react-relay/                                      @graphcool
-/types/react-responsive/                                 @asvetliakov
-/types/react-router/v2/                                  @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov
-/types/react-router/v3/                                  @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas
-/types/react-router/                                     @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga
-/types/react-router-bootstrap/                           @vlesierse @LKay @olmobrutall
-/types/react-router-config/                              @lith-light-g
-/types/react-router-dom/                                 @tkrotoff @huy-nguyen
-/types/react-router-native/                              @ezintz
-/types/react-router-redux/v3/                            @isman-usoh @noah79 @rosendi
-/types/react-router-redux/v4/                            @isman-usoh @noah79 @rosendi @LKay @DovydasNavickas
-/types/react-router-redux/                               @huy-nguyen @8398a7
-/types/react-scroll/                                     @sudoplz @GiedriusGrabauskas
-/types/react-scrollbar/                                  @stephenjelfs
-/types/react-select/                                     @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas
-/types/react-side-effect/                                @remojansen
-/types/react-sidebar/                                    @jeroenvervaeke
-/types/react-slick/                                      @andrewBalekha @GiedriusGrabauskas
-/types/react-smooth-scrollbar/                           @asvetliakov
-/types/react-sortable-hoc/                               @NoHomey @charlesrey
-/types/react-sortable-tree/                              @wouterhardeman
-/types/react-spinkit/v1/                                 @tkqubo @mleko @pelotom
-/types/react-spinkit/                                    @tkqubo @mleko @pelotom @zzanol
-/types/react-split-pane/                                 @rcchen
-/types/react-sticky/                                     @curtisw0
-/types/react-svg-pan-zoom/                               @huy-nguyen
-/types/react-swf/                                        @stepancar
-/types/react-swipe/                                      @DeividasBakanas
-/types/react-swipeable/                                  @GiedriusGrabauskas @mctep
-/types/react-swipeable-views/                            @mxl @DeividasBakanas
-/types/react-syntax-highlighter/                         @NoHomey
-/types/react-tabs/                                       @danez
-/types/react-tag-input/                                  @Ogglas @jankarres
-/types/react-tagcloud/                                   @wassname
-/types/react-tap-event-plugin/                           @mxl
-/types/react-test-renderer/                              @arvitaly @lochbrunner @lochbrunner @johnnyreilly
-/types/react-tether/                                     @ryprice
-/types/react-textarea-autosize/                          @asvetliakov @zry656565
-/types/react-toggle/v2/                                  @LKay
-/types/react-toggle/                                     @LKay
-/types/react-tooltip/                                    @DeividasBakanas
-/types/react-touch/                                      @grzesie2k
-/types/react-transition-group/v1/                        @LKay
-/types/react-transition-group/                           @LKay
-/types/react-user-tour/                                  @ccancellieri
-/types/react-virtual-keyboard/                           @bsurai
-/types/react-virtualized/                                @kaoDev @guntherjh @wasd171
-/types/react-virtualized-select/                         @seansfkelley
-/types/react-weui/                                       @tairan
-/types/react-widgets/                                    @rogierschouten @sanyatuning @frodehansen2
-/types/reactable/                                        @spielc
-/types/reactcss/                                         @chrisgervang @LKay
-/types/reactstrap/                                       @alihammad @mfal @danilobjr
-/types/read/                                             @timjk
-/types/read-package-tree/                                @mgroenhoff
-/types/readdir-stream/                                   @Bartvds
-/types/readline-sync/                                    @jonestristand
-/types/realm/                                            @Akim95
-/types/reapop/                                           @Barrokgl
-/types/recaptcha/                                        @brentj73
-/types/recase/                                           @18steps
-/types/recharts/                                         @mthmulders @rapmue
-/types/recompose/                                        @iskandersierra @mrapogee @clayne11
-/types/reconnectingwebsocket/                            @nguarracino
-/types/recursive-readdir/                                @elisee
-/types/redis/                                            @soywiz @CodeAnimal @MugeSo
-/types/redis-mock/                                       @BendingBender
-/types/redis-rate-limiter/                               @westy92
-/types/redis-scripto/                                    @westy92
-/types/redlock/v2/                                       @chrootsu
-/types/redlock/                                          @chrootsu @BendingBender
-/types/reduce-reducers/                                  @huy-nguyen
-/types/redux-action/                                     @newraina
-/types/redux-action-utils/                               @tkqubo
-/types/redux-actions/                                    @jaysoo @alexgorbatchev
-/types/redux-auth-wrapper/v1/                            @LKay
-/types/redux-auth-wrapper/                               @LKay
-/types/redux-batched-subscribe/                          @mDibyo
-/types/redux-bootstrap/                                  @remojansen
-/types/redux-debounced/                                  @seansfkelley
-/types/redux-devtools/                                   @mc-petry
-/types/redux-devtools-dock-monitor/                      @mc-petry
-/types/redux-devtools-log-monitor/                       @mc-petry
-/types/redux-doghouse/                                   @BendingBender
-/types/redux-first-router/                               @Valbrand @viggyfresh
-/types/redux-form/v4/                                    @aikoven
-/types/redux-form/v6/                                    @carsonf @aikoven @LKay @bancek
-/types/redux-form/                                       @carsonf @aikoven @LKay @bancek
-/types/redux-immutable/                                  @oizie @sebald @gavingregory
-/types/redux-immutable-state-invariant/                  @remojansen @highflying
-/types/redux-infinite-scroll/                            @silkyfray
-/types/redux-localstorage/                               @LKay
-/types/redux-localstorage-debounce/                      @LKay
-/types/redux-localstorage-filter/                        @LKay
-/types/redux-logger/                                     @arusakov
-/types/redux-mock-store/                                 @MarianPalkus
-/types/redux-optimistic-ui/                              @asvetliakov
-/types/redux-pack/                                       @tansongyang
-/types/redux-persist-transform-encrypt/                  @LKay
-/types/redux-persist-transform-filter/                   @LKay
-/types/redux-promise/                                    @molekilla @xStrom
-/types/redux-promise-middleware/                         @ianks
-/types/redux-recycle/                                    @LKay
-/types/redux-router/                                     @stepancar
-/types/redux-storage/                                    @asvetliakov
-/types/redux-ui/                                         @andyshuxin
-/types/ref/                                              @loyd
-/types/ref-array/                                        @loyd
-/types/ref-struct/                                       @loyd
-/types/ref-union/                                        @loyd
-/types/reflect-metadata/                                 @rbuckton
-/types/reflux/                                           @mauricedb
-/types/relateurl/                                        @tkrotoff
-/types/relaxed-json/                                     @18steps
-/types/remote-redux-devtools/                            @ColinEberhardt @unindented
-/types/remove-markdown/                                  @RagibHasin
-/types/replace-ext/                                      @DeividasBakanas
-/types/request/                                          @soywiz @bonnici @Bartvds @joeskeen @ccurrens
-/types/request-ip/                                       @mrhen
-/types/request-promise/                                  @cglantschnig @joeskeen @AyaMorisawa
-/types/request-promise-native/                           @gustavohenke
-/types/requestretry/                                     @EricByers
-/types/require-directory/                                @Igmat
-/types/require-from-string/                              @ikatyang
-/types/requirejs/                                        @jbaldwin
-/types/requirejs-domready/                               @lefb766
-/types/resemblejs/                                       @pimterry
-/types/resolve/                                          @marionebl
-/types/resolve-from/                                     @unional
-/types/response-time/                                    @urossmolnik @TonyPythoneer
-/types/rest/                                             @Nemo157
-/types/restangular/                                      @borisyankov
-/types/restful.js/                                       @tkqubo
-/types/restify/v4/                                       @blittle @stevehipwell
-/types/restify/                                          @blittle @stevehipwell
-/types/restify-cors-middleware/                          @dthunell
-/types/restify-errors/                                   @stevehipwell
-/types/restify-plugins/                                  @KostyaTretyak
-/types/restler/                                          @cyrilschumacher
-/types/resumablejs/                                      @DanielMcAssey
-/types/rethinkdb/                                        @alexgorbatchev
-/types/retry/                                            @krenor
-/types/rev-hash/                                         @ikatyang
-/types/revalidate/                                       @alex3165
-/types/revalidator/                                      @brewsoftware
-/types/reveal/                                           @robertop87 @Nava2
-/types/rewire/                                           @borislavjivkov @CaselIT
-/types/rfc2047/                                          @mugifly
-/types/rheostat/                                         @SashaBayan @kourge
-/types/rickshaw/                                         @niemyjski
-/types/rimraf/                                           @soywiz @e-cloud @bash
-/types/riot/                                             @Stubb0rn
-/types/riot-api-nodejs/                                  @zafixlrp
-/types/riot-games-api/                                   @xstoudi
-/types/riotcontrol/                                      @chrootsu
-/types/riotjs/                                           @vvakame
-/types/rison/                                            @impworks
-/types/rivets/                                           @TrevorDev
-/types/rollup/                                           @flying-sheep
-/types/ronomon__crypto-async/                            @BendingBender
-/types/rosie/                                            @abner
-/types/roslib/                                           @Pro @skycoop
-/types/rot-js/                                           @atiaxi
-/types/route-parser/                                     @ianks @bobbuehler
-/types/router5/                                          @sandersky
-/types/routie/                                           @Adilson
-/types/royalslider/                                      @csrakowski
-/types/rpio/                                             @DominikPalo
-/types/rrc/                                              @DeividasBakanas
-/types/rrule/                                            @waratuman
-/types/rsmq/                                             @MugeSo
-/types/rsmq-worker/                                      @MugeSo
-/types/rss/                                              @secondwtq
-/types/rsvp/                                             @Taytay @mkohlmyr @theroncross @chriskrycho
-/types/rsync/                                            @philippstucki
-/types/rtree/                                            @oefirouz
-/types/run-sequence/                                     @k-kagurazaka
-/types/rvo2/                                             @erikvullings
-/types/rx/                                               @Igorbek
-/types/rx-angular/                                       @mickdelaney
-/types/rx-core/                                          @Igorbek @mizunashi-mana
-/types/rx-core-binding/                                  @Igorbek
-/types/rx-dom/                                           @oliverw
-/types/rx-jquery/                                        @Igorbek
-/types/rx-lite/                                          @Igorbek
-/types/rx-lite-aggregates/                               @Igorbek
-/types/rx-lite-async/                                    @zoetrope @Igorbek
-/types/rx-lite-backpressure/                             @Igorbek
-/types/rx-lite-coincidence/                              @Igorbek
-/types/rx-lite-experimental/                             @Igorbek
-/types/rx-lite-joinpatterns/                             @Igorbek
-/types/rx-lite-testing/                                  @Igorbek
-/types/rx-lite-time/                                     @Igorbek
-/types/rx-lite-virtualtime/                              @Igorbek
-/types/rx.wamp/                                          @darkl
-/types/s3-upload-stream/                                 @geoffreak
-/types/safari-extension/                                 @luukd
-/types/safari-extension-content/                         @luukd
-/types/safe-json-stringify/                              @ericbyers
-/types/safe-regex/                                       @mhegazy
-/types/sails.io.js/                                      @arvitaly
-/types/saml2-js/                                         @horiuchi
-/types/saml20/                                           @HackerUndKoch
-/types/samlp/                                            @horiuchi
-/types/sammy/                                            @borisyankov @oising
-/types/sandboxed-module/                                 @svi3c
-/types/sane/                                             @BendingBender
-/types/sanitize-filename/                                @Nemo157
-/types/sanitize-html/                                    @rogierschouten @afshin
-/types/sap__xsenv/                                       @mad-mike
-/types/sass-graph/                                       @marvinhagemeister
-/types/sat/                                              @omni360
-/types/satnav/                                           @DotNetNerd
-/types/saywhen/                                          @SeanSobey
-/types/scalike/                                          @ryoppy
-/types/screenfull/                                       @icholy @lionelb @joelshepherd
-/types/screeps-profiler/                                 @ramblurr
-/types/scriptjs/                                         @ssttevee
-/types/scroll-into-view/                                 @zivni
-/types/scroller/                                         @borisyankov
-/types/scrollreveal/                                     @Davidblkx
-/types/scrolltofixed/                                    @bmdixon
-/types/scrypt-async/                                     @xStrom
-/types/seamless/                                         @danmana
-/types/seamless-immutable/                               @alex3165 @xsburg @geirsagberg
-/types/seedrandom/                                       @kernhanda
-/types/segment-analytics/                                @fongandrew
-/types/select2/                                          @borisyankov
-/types/selectize/                                        @adidahiya @naBausch
-/types/selenium-webdriver/v2/                            @BillArmstrong @Kuniwak @cnishina
-/types/selenium-webdriver/                               @BillArmstrong @Kuniwak @cnishina @SupernaviX @bendxn
-/types/semantic-ui/                                      @leonard-thieu
-/types/semantic-ui-accordion/                            @leonard-thieu
-/types/semantic-ui-api/                                  @leonard-thieu
-/types/semantic-ui-checkbox/                             @leonard-thieu
-/types/semantic-ui-dimmer/                               @leonard-thieu
-/types/semantic-ui-dropdown/                             @leonard-thieu
-/types/semantic-ui-embed/                                @leonard-thieu
-/types/semantic-ui-form/                                 @leonard-thieu
-/types/semantic-ui-modal/                                @leonard-thieu
-/types/semantic-ui-nag/                                  @leonard-thieu
-/types/semantic-ui-popup/                                @leonard-thieu
-/types/semantic-ui-progress/                             @leonard-thieu
-/types/semantic-ui-rating/                               @leonard-thieu
-/types/semantic-ui-search/                               @leonard-thieu
-/types/semantic-ui-shape/                                @leonard-thieu
-/types/semantic-ui-sidebar/                              @leonard-thieu
-/types/semantic-ui-site/                                 @leonard-thieu
-/types/semantic-ui-sticky/                               @leonard-thieu
-/types/semantic-ui-tab/                                  @leonard-thieu
-/types/semantic-ui-transition/                           @leonard-thieu
-/types/semantic-ui-visibility/                           @leonard-thieu
-/types/semaphore/                                        @mhfrantz
-/types/semver/                                           @Bartvds @BendingBender @LucianBuzzo
-/types/semver-diff/                                      @chrismbarr
-/types/sencha_touch/                                     @brian428
-/types/send/                                             @MikeJerred
-/types/seneca/                                           @psnider
-/types/sequelize/v3/                                     @samuelneff @codeanimal @drinchev @morpheusxaut @torhal
-/types/sequelize/                                        @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @morpheusxaut
-/types/sequelize-fixtures/                               @cschwarz
-/types/sequester/                                        @Strate
-/types/serialize-javascript/                             @lith-light-g
-/types/serialport/                                       @codefoster
-/types/serve-favicon/                                    @urossmolnik
-/types/serve-index/                                      @tkrotoff
-/types/serve-static/                                     @urossmolnik
-/types/session-file-store/                               @blendsdk
-/types/set-cookie-parser/                                @nickp10
-/types/sha1/                                             @arcdev1
-/types/shallowequal/                                     @seansfkelley
-/types/shapefile/                                        @DenisCarriere
-/types/sharedworker/                                     @nakakura
-/types/sharepoint/                                       @baywet
-/types/sharp/                                            @lith-light-g
-/types/sharp-timer/                                      @afractal
-/types/sheetify/                                         @toddself
-/types/shell-quote/                                      @jason0x43
-/types/shelljs/                                          @nikeee @voy
-/types/shipit/                                           @cyrilschumacher
-/types/shipit-utils/                                     @cyrilschumacher
-/types/shopify-buy/                                      @openminder
-/types/shortid/                                          @stpettersens @despairblue
-/types/shot/                                             @AJamesPhillips
-/types/should/                                           @varju
-/types/should-promised/                                  @devoto13
-/types/showdown/                                         @cbowdon @tan9
-/types/siema/                                            @Irmiz
-/types/siesta/                                           @bquarmby
-/types/sigmajs/                                          @qinfchen
-/types/signalr/                                          @borisyankov @keesey @GiedriusGrabauskas
-/types/signals/                                          @diullei
-/types/signature_pad/                                    @AbubakerB
-/types/simple-assign/                                    @NoHomey
-/types/simple-cw-node/                                   @vvakame
-/types/simple-mock/                                      @leonyu
-/types/simple-oauth2/                                    @mad-mike
-/types/simple-peer/                                      @tlaziuk
-/types/simple-url-cache/                                 @a-lucas
-/types/simple-xml/                                       @notVitaliy
-/types/simplebar/v1/                                     @gregonnet @leonard-thieu
-/types/simplebar/                                        @leonard-thieu
-/types/simplemde/                                        @Scalesoft
-/types/simplesmtp/                                       @rogierschouten
-/types/simplestorage.js/                                 @axelcostaspena @mxl
-/types/sinon/                                            @mrbigdog2u @rationull @lumaxis @nicojs @43081j
-/types/sinon-as-promised/                                @igrayson
-/types/sinon-chai/                                       @kazimanzurrashid @jedmao
-/types/sinon-chrome/                                     @pimterry
-/types/sinon-express-mock/                               @jpchip @tlaziuk
-/types/sinon-mongoose/                                   @stevehipwell
-/types/sinon-stub-promise/                               @vintem
-/types/sinon-test/                                       @mummybot
-/types/sip.js/                                           @decyrus
-/types/sipml/                                            @chookies
-/types/sitemap2/                                         @shundy
-/types/sizzle/                                           @leonard-thieu
-/types/sjcl/                                             @Evgenus
-/types/ski/                                              @AyaMorisawa
-/types/skyway/                                           @nakakura
-/types/slack-node/                                       @geoffreak
-/types/slack-winston/                                    @BlueHatbRit
-/types/slackify-html/                                    @hypexr
-/types/slate-irc/                                        @elisee
-/types/sleep/                                            @rajarz
-/types/slickgrid/                                        @jbaldwin
-/types/slideout/                                         @ToastHawaii
-/types/slimerjs/                                         @alexwall
-/types/slocket/                                          @BendingBender
-/types/slug/                                             @mhegazy
-/types/smart-fox-server/                                 @ChanceM
-/types/smooth-scrollbar/                                 @asvetliakov
-/types/smoothie/                                         @mikehhawley
-/types/smoothscroll-polyfill/                            @kryops
-/types/smtp-server/                                      @markisme
-/types/smtpapi/                                          @a-morales
-/types/snapsvg/                                          @lhk @mattanja @kant2002
-/types/snazzy-info-window/                               @milosd92
-/types/snekfetch/                                        @DarkerTV
-/types/snoowrap/                                         @vitosamson
-/types/soap/                                             @aleung @cagefox
-/types/socket.io/                                        @progre @divillysausages @florentpoujol @KentarouTakeda
-/types/socket.io-client/                                 @progre @divillysausages @florentpoujol
-/types/socket.io-redis/                                  @nupplaphil
-/types/socket.io.users/                                  @kataras
-/types/socketio-wildcard/                                @BendingBender
-/types/socketty/                                         @Nax
-/types/sockjs/                                           @pmccloghrylaing
-/types/sockjs-client/                                    @vladev @arusakov @BendingBender
-/types/solution-center-communicator/                     @dami-gg
-/types/sortablejs/                                       @Maw-Fox
-/types/source-list-map/                                  @e-cloud
-/types/source-map/                                       @MortenHoustonLudvigsen @rbuckton
-/types/source-map-support/                               @Bartvds @jason0x43
-/types/space-pen/                                        @vvakame
-/types/spark-md5/                                        @bastienmoulia
-/types/sparkly/                                          @BendingBender
-/types/sparkpost/v1/                                     @geoffreak
-/types/sparkpost/                                        @geoffreak @bondz
-/types/spatialite/                                       @atd-schubert
-/types/spdy/                                             @tony19
-/types/speakeasy/                                        @legendecas @mrOlorin
-/types/speakingurl/                                      @Goldsmith42
-/types/spectacle/                                        @zmaybury
-/types/spectrum/                                         @M-Zuber
-/types/spin.js/                                          @borisyankov @theodorejb
-/types/split/                                            @marcinporebski
-/types/split2/                                           @mugeso
-/types/spotify-api/                                      @skovmand
-/types/sprintf/                                          @soywiz
-/types/sql.js/                                           @Hozuki
-/types/sqlite3/                                          @nmalaguti @dpyro
-/types/sqlstring/                                        @marvinhagemeister
-/types/squirejs/                                         @bradleyayers
-/types/srp/                                              @Patman64
-/types/ss-utils/                                         @mythz
-/types/ssh2/                                             @tkQubo @rbuckton
-/types/ssh2-sftp-client/                                 @igrayson
-/types/ssh2-streams/                                     @rbuckton
-/types/sshpk/                                            @mabels
-/types/stack-mapper/                                     @rogierschouten
-/types/stack-trace/                                      @exceptionless
-/types/stack-utils/                                      @BendingBender
-/types/stacktrace-js/                                    @exceptionless @pilagod
-/types/stale-lru-cache/                                  @cxcorp
-/types/stampit/                                          @koresar
-/types/stamplay-js-sdk/                                  @ridermansb
-/types/stat-mode/                                        @BendingBender
-/types/stats.js/                                         @gregolai @hberntsen
-/types/statsd-client/                                    @peterkooijmans
-/types/status-bar/                                       @vvakame
-/types/statuses/                                         @tkrotoff @BendingBender
-/types/steam/                                            @kant2002
-/types/steed/                                            @Paul-Isache
-/types/stompjs/                                          @jimic
-/types/storejs/                                          @vbortone
-/types/storybook__addon-actions/                         @joscha
-/types/storybook__addon-knobs/                           @joscha @martynaskadisa
-/types/storybook__addon-links/                           @joscha
-/types/storybook__addon-notes/                           @joscha
-/types/storybook__addon-options/                         @joscha
-/types/storybook__react/                                 @joscha
-/types/stream-buffers/                                   @Jason3S
-/types/stream-meter/                                     @mugeso
-/types/stream-series/                                    @k-kagurazaka
-/types/stream-to-array/v0/                               @Bartvds
-/types/stream-to-array/                                  @Bartvds @BendingBender
-/types/streaming-json-stringify/                         @BendingBender
-/types/streamjs/                                         @erosb
-/types/strftime/                                         @cyrilschumacher
-/types/string/                                           @basp
-/types/string-hash/                                      @ethanrubio
-/types/string-similarity/                                @ragtime
-/types/string-template/                                  @TonyPythoneer
-/types/string_score/                                     @marcinporebski
-/types/stringify-object/                                 @khoomeister
-/types/strip-ansi/                                       @mhegazy
-/types/strip-bom/                                        @mhegazy
-/types/strip-json-comments/                              @dmoonfire
-/types/stripe-checkout/                                  @cgwrench
-/types/stripe-node/                                      @wjohnsto @codeanimal
-/types/stripe-v2/                                        @ejsmith @amritk @adamcmiel @jleider @galuszkak
-/types/stripe-v3/                                        @ejsmith @amritk @adamcmiel @jleider @galuszkak
-/types/striptags/                                        @ccitro
-/types/strong-cluster-control/                           @shuntksh
-/types/strophe/                                          @DavidKDeutsch
-/types/stylelint/                                        @alan-agius4
-/types/stylus/                                           @SomaticIT
-/types/subsume/                                          @BendingBender
-/types/succinct/                                         @EnableSoftware
-/types/sudo-block/                                       @BendingBender
-/types/suitescript/                                      @darrenhillconsulting
-/types/sumo-logger/                                      @forabi
-/types/superagent/                                       @NicoZelaya @mxl @paplorinc
-/types/superagent-no-cache/                              @mxl
-/types/superagent-prefix/                                @mxl
-/types/supercluster/                                     @DenisCarriere
-/types/supertest/                                        @varju
-/types/supertest-as-promised/                            @tkrotoff
-/types/supports-color/                                   @mgroenhoff
-/types/survey-knockout/                                  @andrewtelnov
-/types/svg-injector/                                     @poke
-/types/svg-pan-zoom/v2/                                  @Promact
-/types/svg-pan-zoom/                                     @Yimiprod
-/types/svg-sprite/                                       @tkqubo
-/types/svg2png/                                          @hansrwindhoff
-/types/svg4everybody/                                    @BendingBender
-/types/svgjs.draggable/                                  @LiFeleSs
-/types/svgjs.resize/                                     @jkevingutierrez
-/types/swag/                                             @shiwano
-/types/swagger-express-middleware/                       @alexandreroba
-/types/swagger-express-mw/                               @micmro
-/types/swagger-hapi/                                     @micmro
-/types/swagger-jsdoc/                                    @drGrove
-/types/swagger-node-runner/                              @micmro
-/types/swagger-parser/                                   @Tobias4872 @EricHenry
-/types/swagger-restify-mw/                               @micmro
-/types/swagger-sails-hook/                               @micmro
-/types/swagger-schema-official/                          @mohsen1 @bsouthga @nimerritt
-/types/swagger-tools/                                    @bricka
-/types/swaggerize-express/                               @mugeso @nickmorton
-/types/sweetalert/                                       @ToastHawaii
-/types/swfobject/                                        @rou
-/types/swiftclick/                                       @Laurence-C
-/types/swig/                                             @CodeAnimal @soywiz
-/types/swig-email-templates/                             @mrhen
-/types/swipe/                                            @kant2002
-/types/swiper/                                           @sgaliano @lucax88x
-/types/swipeview/                                        @borisyankov
-/types/switchery/                                        @bgrieder @claylaut
-/types/swiz/                                             @jedigo
-/types/sylvester/                                        @StephaneAlie
-/types/synaptic/                                         @ToastHawaii @austincummings
-/types/systeminformation/                                @PixelcrabAT
-/types/systemjs/                                         @ludohenin @NathanWalker @GiedriusGrabauskas
-/types/table/                                            @evanshortiss
-/types/tabtab/                                           @vojtechhabarta
-/types/tapable/                                          @e-cloud
-/types/tape/                                             @Bartvds @sodatea @DennisSchwartz
-/types/tar/                                              @SomaticIT
-/types/tedious/                                          @rogierschouten @cjthompson
-/types/tedious-connection-pool/                          @sandorfr
-/types/telebot/                                          @mariotsi
-/types/temp/                                             @DanielRosenwasser
-/types/temp-write/                                       @BendingBender
-/types/tempfile/                                         @SamVerschueren @BendingBender
-/types/tempy/                                            @douglasduteil
-/types/terminal-menu/                                    @aravindarun
-/types/testingbot-api/                                   @timbru31
-/types/tether/                                           @adidahiya
-/types/tether-drop/                                      @adidahiya
-/types/tether-shepherd/                                  @mtgibbs
-/types/text-buffer/                                      @vvakame
-/types/text-encoding/                                    @pine613
-/types/three/                                            @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner
-/types/thrift/                                           @kamek-pf
-/types/throng/                                           @cyrilschumacher
-/types/throttle/                                         @BendingBender
-/types/through/                                          @AndrewGaspar
-/types/through2/v0/                                      @Bartvds @jedmao
-/types/through2/                                         @Bartvds @jedmao @valotas @TeamworkGuy2
-/types/through2-map/                                     @LucasHill
-/types/tile-reduce/                                      @DenisCarriere
-/types/tilebelt/                                         @DenisCarriere
-/types/time-span/                                        @BendingBender @mdvorscak
-/types/timelinejs/                                       @rolandzwaga
-/types/timelinejs3/                                      @MikeMatusz
-/types/timer-machine/                                    @dolanmiu
-/types/timezone-js/                                      @bonnici
-/types/timezonecomplete/                                 @rogierschouten
-/types/tinder/                                           @pingec
-/types/tinycolor2/                                       @M-Zuber @geertjansen @nvh
-/types/tinycopy/                                         @vvatanabe
-/types/tinymce/                                          @martinduparc @ipoul
-/types/titanium/                                         @cyounkins
-/types/title/                                            @fa7ad
-/types/tldjs/                                            @geoffreak
-/types/tmp/                                              @optical @Perlmint
-/types/to-markdown/                                      @SuperPaintman
-/types/to-title-case-gouch/                              @stpettersens
-/types/toastr/                                           @borisyankov
-/types/tooltipster/                                      @stephenlautier
-/types/topojson/                                         @ricardo-mello @chenzhutian
-/types/torrent-stream/                                   @xstoudi
-/types/touch/                                            @mizunashi-mana @BendingBender
-/types/touch-events/                                     @kevinb7
-/types/tough-cookie/                                     @leonard-thieu
-/types/traceback/                                        @misak113
-/types/tracking/                                         @pimterry
-/types/transducers-js/                                   @colinkahn @dphilipson
-/types/transducers.js/                                   @dphilipson
-/types/traverse/                                         @newclear
-/types/traverson/                                        @marcinporebski
-/types/trayballoon/                                      @korve
-/types/trim/                                             @skysteve
-/types/trunk8/                                           @niemyjski
-/types/tspromise/                                        @soywiz
-/types/tunnel/                                           @BendingBender
-/types/turf/v2/                                          @gcroteau
-/types/turf/                                             @gcroteau @DenisCarriere
-/types/tus-js-client/                                    @kevhiggins
-/types/tv4/                                              @Bartvds @psnider
-/types/tween.js/                                         @Amos47 @sunetos @jzarnikov
-/types/tweenjs/                                          @evilangelist
-/types/tweezer.js/                                       @praxxis
-/types/twig/                                             @soywiz @enko
-/types/twilio/                                           @nickiannone @ashleybrener
-/types/twit/                                             @Volox
-/types/twitter/                                          @chitoku-k
-/types/twix/                                             @j3ko
-/types/type-check/                                       @hansrwindhoff
-/types/type-detect/                                      @Bartvds
-/types/type-is/                                          @BendingBender
-/types/type-name/                                        @armorik83
-/types/typeahead/                                        @igochkov @gjunge
-/types/typedarray-pool/                                  @pawsong
-/types/typescript-deferred/                              @DirtyHairy
-/types/tz-format/                                        @samverschueren
-/types/ua-parser-js/                                     @superduper @legendecas @MeLlamoPablo
-/types/uglify-js/                                        @tkrotoff
-/types/uglifycss/                                        @blendsdk
-/types/ui-grid/                                          @btesser @joeskeen
-/types/ui-router-extras/                                 @mputters @marcel-k @LaserUnicorns
-/types/ui-select/                                        @nkovacic
-/types/uid-safe/                                         @geoffreak
-/types/uikit/                                            @giovannicandido @s0x
-/types/uk.co.workingedge.phonegap.plugin.launchnavigator/ @dpa99c
-/types/umbraco/                                          @DeCareSystemsIreland
-/types/umd/                                              @TeamworkGuy2
-/types/umzug/                                            @drinchev
-/types/underscore/                                       @borisyankov @jbaldwin @ccurrens
-/types/underscore-ko/                                    @MagicMau
-/types/underscore.string/                                @rygine
-/types/undertaker/                                       @tkqubo @GiedriusGrabauskas
-/types/undertaker-registry/                              @GiedriusGrabauskas
-/types/uniq/                                             @hansrwindhoff
-/types/uniqid/                                           @me
-/types/unique-hash-stream/                               @BendingBender
-/types/unique-random/                                    @Kuniwak
-/types/unity-webapi/                                     @jmvrbanac
-/types/universal-analytics/                              @Bartvds @DarkerTV
-/types/universal-router/                                 @jtmthf
-/types/unorm/                                            @chbrown
-/types/untildify/                                        @BendingBender
-/types/unused-filename/                                  @BendingBender
-/types/update-notifier/                                  @vvakame @nchen63
-/types/uppercamelcase/                                   @plantain-00
-/types/urbanairship-cordova/                             @Justin-Credible
-/types/uri-templates/                                    @Bartvds
-/types/urijs/                                            @RodneyJT @xt0rted
-/types/uritemplate/                                      @teyc
-/types/url-assembler/                                    @wolfgang42
-/types/url-join/                                         @rogierschouten @devrelm
-/types/url-regex/                                        @unindented
-/types/url-template/                                     @marcinporebski
-/types/urlrouter/                                        @soywiz
-/types/urlsafe-base64/                                   @tkrotoff
-/types/usage/                                            @pvomhoff
-/types/usb/                                              @underscorebrody
-/types/user-home/                                        @mhegazy
-/types/useragent/                                        @geoffreak
-/types/username/                                         @kayahr
-/types/utf8/                                             @zelein
-/types/util-deprecate/                                   @BendingBender
-/types/util.promisify/                                   @adamvoss
-/types/utils-merge/                                      @chrootsu
-/types/uuid/                                             @iamolivinius @felipeochoa @cjbarth
-/types/uuid-1345/                                        @mugeso
-/types/uuid-js/                                          @mhegazy
-/types/uuid-validate/                                    @HiromiShikata
-/types/uuidjs/                                           @staxmanade
-/types/uws/                                              @plantain-00
-/types/valdr/                                            @ilbertz
-/types/valdr-message/                                    @ilbertz
-/types/valerie/                                          @conficient
-/types/valid-url/                                        @stevehipwell
-/types/validate.js/                                      @HillTravis
-/types/validator/                                        @tgfjt @chrootsu @IOAyman @louy @kacepe
-/types/validatorjs/                                      @LKay
-/types/vanilla-tilt/                                     @BrunnerLivio
-/types/vary/                                             @BendingBender
-/types/vast-client/                                      @jgainfort
-/types/vec3/                                             @xstoudi
-/types/vectorious/                                       @erikgerrits
-/types/vega/                                             @pelotom
-/types/velocity-animate/                                 @smrq
-/types/verror/                                           @svi3c @max4t
-/types/vertx3-eventbus-client/                           @oddeirik
-/types/vex-js/                                           @gdcohan
-/types/vexflow/                                          @rquiring @sebastianhaas @bohoffi
-/types/victory/                                          @asvetliakov @snerks @Havret
-/types/video.js/                                         @vbortone
-/types/viewability-helper/                               @lironzluf
-/types/viewerjs/                                         @lrh3321
-/types/viewporter/                                       @borisyankov
-/types/vimeo/                                            @DazWilkin
-/types/vimeo__player/                                    @denisyilmaz
-/types/vinyl/v0/                                         @jedmao
-/types/vinyl/                                            @vvakame @jedmao @thorn0
-/types/vinyl-buffer/                                     @tkQubo
-/types/vinyl-fs/                                         @vvakame @remisery
-/types/vinyl-paths/                                      @tkQubo
-/types/virtual-dom/                                      @chbrown
-/types/virtual-keyboard/                                 @bsurai
-/types/vis/                                              @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314
-/types/vision/                                           @jasonswearingen @AJamesPhillips
-/types/vitalsigns/                                       @cyrilschumacher
-/types/vivus/                                            @DanielRosenwasser @lekhmanrus
-/types/vkbeautify/                                       @sch3lp
-/types/voca/                                             @pine
-/types/voronoi-diagram/                                  @michaelneu
-/types/vortex-web-client/                                @Pro
-/types/voximplant-websdk/                                @aylarov
-/types/vue-i18n/                                         @aicest
-/types/vue-resource/                                     @kaorun343
-/types/w2ui/                                             @Ptival
-/types/wake_on_lan/                                      @SrTobi
-/types/wallabyjs/                                        @andrewconnell
-/types/wallpaper/                                        @BendingBender
-/types/wampy/                                            @KSDaemon
-/types/warning/                                          @cvle
-/types/watch/                                            @soywiz @Perlmint
-/types/watchify/                                         @TeamworkGuy2
-/types/watchpack/                                        @e-cloud
-/types/waterline/                                        @arvitaly
-/types/watson-developer-cloud/                           @waldo000000
-/types/waypoints/                                        @dominikbulaj @Koloto
-/types/weapp-api/                                        @vargeek
-/types/web-animations-js/                                @kritollm
-/types/web-bluetooth/                                    @urish
-/types/webappsec-credential-management/                  @iainmcgin
-/types/webassembly-js-api/                               @periklis
-/types/webcl/                                            @NCARalph
-/types/webcomponents.js/                                 @adidahiya
-/types/webcrypto/                                        @iislucas
-/types/webdriverio/                                      @nmalaguti @timbru31 @fsmedberg-tc @tanvirislam06
-/types/webfontloader/                                    @doskallemaskin
-/types/webgl-ext/                                        @zenmumbler
-/types/webgl2/                                           @nkemnitz
-/types/webgme/                                           @phreed
-/types/webix/                                            @mkozhukh
-/types/webmidi/                                          @lostfictions
-/types/webpack/                                          @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898
-/types/webpack-bundle-analyzer/                          @kryops
-/types/webpack-chain/                                    @eirikurn @psachs21
-/types/webpack-dev-middleware/                           @bumbleblym
-/types/webpack-dev-server/                               @maestroh @daveparslow
-/types/webpack-dotenv-plugin/                            @kryops
-/types/webpack-env/                                      @use-strict
-/types/webpack-fail-plugin/                              @deevus
-/types/webpack-hot-middleware/                           @bumbleblym
-/types/webpack-merge/                                    @deevus
-/types/webpack-notifier/                                 @bumbleblym
-/types/webpack-sources/                                  @e-cloud @chriseppstein
-/types/webpack-stream/                                   @iclanton @bumbleblym
-/types/webpack-validator/                                @deevus
-/types/webrtc/                                           @nakakura
-/types/websocket/                                        @loyd @flynetworks
-/types/webspeechapi/                                     @saschanaz
-/types/websql/                                           @TeamworkGuy2
-/types/webtorrent/                                       @niieani @tlaziuk
-/types/webvr-api/                                        @lostfictions
-/types/week/                                             @sindrenm
-/types/weighted/                                         @ccitro
-/types/weixin-app/                                       @taoqf
-/types/wellknown/                                        @yairtawil
-/types/whatwg-streams/                                   @saschanaz
-/types/when/                                             @derekcicerone @Nemo157
-/types/which/                                            @vvakame
-/types/wicg-mediasession/                                @jucrouzet
-/types/wiiu/                                             @mzsm
-/types/window-or-global/                                 @vvakame
-/types/window-size/                                      @pmkary
-/types/windows-1251/                                     @RomanGolovanov
-/types/windows-service/                                  @rogierschouten
-/types/winjs/v1/                                         @adamhewitt627 @craigktreasure @xirzec
-/types/winjs/v2/                                         @adamhewitt627 @craigktreasure @xirzec
-/types/winjs/                                            @adamhewitt627 @craigktreasure @xirzec
-/types/winreg/                                           @RX14 @BobBuehler
-/types/winrt-uwp/                                        @saschanaz @taylor224
-/types/winston/                                          @bonnici @codeanimal @DABH
-/types/winston-dynamodb/                                 @nickiannone
-/types/wiring-pi/                                        @NoHomey
-/types/wnumb/                                            @acoreyj
-/types/wolfy87-eventemitter/                             @ryiwamoto
-/types/wonder-commonlib/                                 @yyc-git
-/types/wonder-frp/                                       @yyc-git
-/types/wonder.js/                                        @yyc-git
-/types/wordcloud/                                        @joeskeen
-/types/words-to-numbers/                                 @James-Frowen
-/types/wrap-ansi/                                        @kayahr
-/types/wreck/                                            @marcinporebski
-/types/wrench/                                           @soywiz
-/types/write-file-atomic/                                @BendingBender
-/types/write-json-file/                                  @DenisCarriere
-/types/ws/                                               @loyd @elithrar
-/types/wu/                                               @phiresky
-/types/wx-js-sdk-dt/                                     @agasbzj
-/types/x-editable/                                       @sirkirby
-/types/xadesjs/                                          @microshine
-/types/xdate/                                            @yamada28go
-/types/xdg-basedir/                                      @tlaziuk
-/types/xlsx/                                             @themauveavenger
-/types/xml/                                              @YuJianrong
-/types/xml-parser/                                       @mhfrantz
-/types/xml2js/                                           @michelsalib @jasonrm @ccurrens @edwardhinkle
-/types/xml2json/                                         @dolanmiu
-/types/xmlbuilder/                                       @wallymathieu
-/types/xmldoc/                                           @Xstoudi @ajsheehan
-/types/xmldom/                                           @tkqubo
-/types/xmlpoke/                                          @garthk
-/types/xmltojson/                                        @traviscrowe
-/types/xmpp__jid/                                        @PJakcson
-/types/xregexp/                                          @Bartvds @jfahrenkrug @sigo
-/types/xrm/v7/                                           @daryllabar
-/types/xrm/                                              @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme
-/types/xsd-schema-validator/                             @Goldsmith42
-/types/xsockets/                                         @pushplay
-/types/xterm/                                            @blink1073 @LucianBuzzo
-/types/yallist/                                          @BendingBender
-/types/yandex-money-sdk/                                 @chrootsu
-/types/yargs/                                            @poelstra @mizunashi-mana @pushplay @jeffkenney
-/types/yayson/                                           @Codesleuth
-/types/ydn-db/                                           @yathit @gabrielmaldi
-/types/yeoman-generator/                                 @armorik83 @janslow
-/types/yeoman-test/                                      @ikatyang
-/types/yfiles/                                           @yGuy
-/types/yog-bigpipe/                                      @ssddi456
-/types/yog-log/                                          @ssddi456
-/types/yog2-kernel/                                      @ssddi456
-/types/yosay/                                            @armorik83
-/types/youtube/                                          @DazWilkin @JoshuaKGoldberg @eliotfallon213
-/types/yui/                                              @giabao
-/types/z-schema/                                         @pgonzal
-/types/zen-observable/                                   @aicest
-/types/zepto/                                            @jbaldwin
-/types/zeroclipboard/v1/                                 @ejsmith @niemyjski @balassy @leonyu
-/types/zeroclipboard/                                    @ejsmith @niemyjski @balassy @leonyu
-/types/zeromq/                                           @davemckeown @erikma
-/types/zetapush-js/                                      @ghoullier
-/types/zip.js/                                           @lgrignon
-/types/zmq/                                              @davemckeown
-/types/zui/                                              @yuanxu
-/types/zynga-scroller/                                   @haskellcamargo
+/types/abbrev/                                  @BendingBender
+/types/ably/                                    @ably
+/types/abs/                                     @AyaMorisawa
+/types/absolute/                                @AyaMorisawa
+/types/acc-wizard/                              @cyrilschumacher
+/types/accept-language-parser/                  @kampfgnom
+/types/accepts/                                 @bomret @brikou
+/types/accounting/                              @gerich-home @chrisleck
+/types/ace/                                     @Diullei
+/types/acl/                                     @tkQubo
+/types/acorn/                                   @RReverser @e-cloud
+/types/actioncable/                             @zhu1230
+/types/actions-on-google/                       @joelhegg
+/types/activex-access/                          @zspitz
+/types/activex-adodb/                           @zspitz
+/types/activex-dao/                             @zspitz
+/types/activex-excel/                           @zspitz
+/types/activex-infopath/                        @zspitz
+/types/activex-libreoffice/                     @zspitz
+/types/activex-msforms/                         @zspitz
+/types/activex-mshtml/                          @zspitz
+/types/activex-msxml2/                          @zspitz
+/types/activex-office/                          @zspitz
+/types/activex-outlook/                         @zspitz
+/types/activex-powerpoint/                      @zspitz
+/types/activex-scripting/                       @zspitz
+/types/activex-stdole/                          @zspitz
+/types/activex-vbide/                           @zspitz
+/types/activex-wia/                             @zspitz
+/types/activex-word/                            @zspitz
+/types/adal-angular/                            @unindented
+/types/add-zero/                                @Roaders
+/types/adm-zip/                                 @jvilk @abner
+/types/adone/                                   @s0m3on3 @maxveres
+/types/aframe/                                  @devpaul @bertoritger
+/types/agenda/                                  @meirgottlieb
+/types/aggregate-error/                         @BendingBender
+/types/alertify/                                @jjeffery
+/types/alexa-sdk/                               @petebeegle @hoo29 @pascalwhoop @blforce @rk-7
+/types/alexa-voice-service/                     @dolanmiu
+/types/algebra.js/                              @CaselIT
+/types/algoliasearch/                           @cbaptiste @haroenv @aherve
+/types/alt/                                     @Shearerbeard
+/types/amazon-product-api/                      @MattiLehtinen @alien35
+/types/amcharts/                                @ldrick
+/types/amplify/                                 @joeriks
+/types/amplify-deferred/                        @joeriks @laurentiustamate94
+/types/amplitude-js/                            @Asido
+/types/amqp/                                    @seikho @jonnysparkplugs
+/types/amqp-rpc/                                @wokim
+/types/amqplib/                                 @mnahkies @abreits @nfantone
+/types/analytics-node/                          @fongandrew
+/types/angular/                                 @diegovilar @thorn0 @calebstdenis @leonard-thieu
+/types/angular-agility/                         @rolandzwaga
+/types/angular-animate/                         @michelsalib @adidahiya @rasch @codyschaaf
+/types/angular-block-ui/                        @lassebn @sclassen
+/types/angular-bootstrap-calendar/              @Odrin
+/types/angular-bootstrap-lightbox/              @rolandzwaga
+/types/angular-breadcrumb/                      @marctalary
+/types/angular-clipboard/                       @bradfordwagner
+/types/angular-cookie/                          @borislavjivkov
+/types/angular-cookies/                         @diegovilar @aciccarello
+/types/angular-deferred-bootstrap/              @Ritzlgrmft
+/types/angular-dialog-service/                  @wcomartin
+/types/angular-dynamic-locale/                  @stephenlautier
+/types/angular-environment/                     @terrawheat
+/types/angular-es/                              @mbutsykin
+/types/angular-feature-flags/                   @borislavjivkov
+/types/angular-file-saver/                      @deenairn
+/types/angular-file-upload/                     @cyrilgandon
+/types/angular-formly/                          @scatcher
+/types/angular-fullscreen/                      @julienpa
+/types/angular-gettext/                         @AkosLukacs
+/types/angular-google-analytics/                @cyrilschumacher @Toxantron
+/types/angular-gridster/                        @jpmnteiro
+/types/angular-growl-v2/                        @mkp05
+/types/angular-hotkeys/                         @jlz27 @reppners @cyrilgandon
+/types/angular-http-auth/                       @vvakame
+/types/angular-httpi/                           @Kukks
+/types/angular-idle/                            @mthamil
+/types/angular-jwt/                             @rerezz
+/types/angular-load/                            @david-gang
+/types/angular-loading-bar/                     @stephenlautier @tyronedougherty
+/types/angular-local-storage/                   @kenfdev @dona278
+/types/angular-localforage/                     @reppners
+/types/angular-locker/                          @nkovacic
+/types/angular-material/                        @blbigelow @PeterHajdu @Dona278 @geertjansen @eknowles
+/types/angular-media-queries/                   @jpmnteiro
+/types/angular-meteor/                          @pgrm
+/types/angular-mocks/                           @diegovilar @daltin
+/types/angular-modal/                           @paullessing
+/types/angular-oauth2/                          @anteriovieira
+/types/angular-pdfjs-viewer/                    @bastienmoulia
+/types/angular-permission/                      @vmishevski
+/types/angular-promise-tracker/                 @rufusl
+/types/angular-q-spread/                        @rafw87
+/types/angular-resource/                        @diegovilar @miffels
+/types/angular-route/                           @park9140
+/types/angular-sanitize/                        @diegovilar
+/types/angular-scenario/                        @RomanoLindano
+/types/angular-scroll/                          @samherrmann
+/types/angular-signalr-hub/                     @AdamSantaniello
+/types/angular-spinner/                         @Biegal
+/types/angular-storage/                         @mdekrey
+/types/angular-strap/                           @samherrmann @mkannwischer
+/types/angular-toastr/                          @nkovacic @trodi
+/types/angular-toasty/                          @muenchdo
+/types/angular-tooltips/                        @leonard-thieu
+/types/angular-touchspin/                       @nkovacic
+/types/angular-translate/                       @michelsalib
+/types/angular-ui-bootstrap/                    @xt0rted @ry8806
+/types/angular-ui-router/                       @michelsalib @matiishyn @mikehaas763
+/types/angular-ui-scroll/                       @marknadig
+/types/angular-ui-sortable/                     @thgreasi
+/types/angular-ui-tree/                         @CalvinFernandez
+/types/angular-websocket/                       @nickveys
+/types/angular-wizard/                          @mjurisic @rwwilden
+/types/angular-xeditable/                       @jpmnteiro
+/types/angular.throttle/                        @reppners
+/types/angularfire/                             @thSoft
+/types/angularlocalstorage/                     @horiuchi
+/types/angulartics/                             @bateast2
+/types/animation-frame/                         @qinfchen
+/types/animejs/                                 @A-Babin
+/types/annyang/                                 @hisham @theluk
+/types/ansi-colors/                             @rogierschouten
+/types/ansi-regex/                              @mvachhar
+/types/ansi-styles/                             @brynbellomy
+/types/ansicolors/                              @rogierschouten
+/types/any-db/                                  @rogierschouten
+/types/any-db-transaction/                      @rogierschouten
+/types/anybar/                                  @khoomeister
+/types/anymatch/                                @BendingBender
+/types/apex.js/                                 @y13i
+/types/aphrodite/                               @asvetliakov
+/types/api-error-handler/                       @tkrotoff
+/types/apigee-access/                           @CasperSkydt
+/types/apollo-codegen/                          @bradleyayers
+/types/app-root-path/                           @shantmarouti
+/types/appdmg/                                  @unindented
+/types/appframework/                            @kyo-ago
+/types/applepayjs/                              @martincostello
+/types/appletvjs/                               @brainded
+/types/applicationinsights-js/                  @kamilszostak
+/types/arbiter/                                 @arash16
+/types/arcgis-js-api/v3/                        @Esri
+/types/arcgis-js-api/                           @Esri
+/types/arcgis-rest-api/                         @JeffJacobson
+/types/arcgis-to-geojson-utils/                 @JeffJacobson
+/types/archiver/                                @dolanmiu @crevil
+/types/archy/                                   @vvakame
+/types/are-we-there-yet/                        @brianloveswords
+/types/argon2-browser/                          @ivangabriele
+/types/argparse/                                @arcticwaters @tlaziuk
+/types/args/                                    @Slessi
+/types/argv/                                    @hookclaw
+/types/arr-union/                               @mrmlnc
+/types/array-find-index/                        @samverschueren
+/types/array-foreach/                           @skysteve
+/types/array-uniq/                              @DanielRosenwasser
+/types/arrify/                                  @wanganjun
+/types/artillery/                               @kmccoan-allocadia
+/types/asana/                                   @tkqubo
+/types/ascii2mathml/                            @RagibHasin
+/types/asenv/                                   @remisery
+/types/asn1js/                                  @microshine
+/types/aspnet-identity-pw/                      @jt000
+/types/assert-equal-jsx/                        @seryl
+/types/assert-plus/                             @KostyaTretyak
+/types/assertion-error/                         @Bartvds
+/types/assertsharp/                             @brunolm
+/types/assets-webpack-plugin/                   @kryops
+/types/async/                                   @borisyankov @kern0 @Penryn @fenying @pascalmartin
+/types/async-cache/                             @BendingBender
+/types/async-lock/                              @elisee
+/types/async-polling/                           @Goldsmith42
+/types/async.nexttick/                          @pyrho
+/types/asynciterator/                           @rubensworks
+/types/atmosphere.js/                           @toedter @Mory1879
+/types/atom/                                    @GlenCFL @smhxx @lierdakil
+/types/atom-keymap/                             @GlenCFL
+/types/atom-mocha-test-runner/                  @GlenCFL
+/types/atpl/                                    @soywiz
+/types/audiosprite/                             @Perlmint
+/types/auth0/                                   @wbhob @westy92 @amiram
+/types/auth0-angular/                           @homesar
+/types/auth0-js/v7/                             @advancedrei
+/types/auth0-js/                                @adrianchia @mdurrant @peterblazejewicz
+/types/auth0-lock/                              @carusology @goldcaddy77
+/types/auth0.widget/                            @advancedrei
+/types/auto-launch/                             @rhysd @unindented
+/types/auto-sni/                                @janwo
+/types/autobahn/                                @darkl @valepu
+/types/autolinker/                              @leonyu
+/types/autoprefixer/                            @odnamrataizem
+/types/autosize/                                @kingdango @keika299 @NeekSandhu
+/types/awesomplete/                             @webbiesdk @bmdixon @tbekolay
+/types/aws-iot-device-sdk/                      @niik @mlamp
+/types/aws-lambda/                              @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart
+/types/aws-serverless-express/                  @threesquared @jcaffey @mattmeye
+/types/aws4/                                    @ajcrites
+/types/axel/                                    @ruslan-molodyko
+/types/azure/                                   @AndrewGaspar @antiveeranna @SomaticIT
+/types/azure-mobile-services-client/            @dmorosinotto
+/types/azure-sb/                                @Azure
+/types/b_/                                      @outring
+/types/babel-code-frame/                        @mohsen1
+/types/babel-core/                              @yortus @marvinhagemeister
+/types/babel-generator/                         @yortus @johnnyestilles
+/types/babel-plugin-react-pug/                  @jpap
+/types/babel-plugin-syntax-jsx/                 @marvinhagemeister
+/types/babel-template/                          @yortus @marvinhagemeister
+/types/babel-traverse/                          @yortus @marvinhagemeister
+/types/babel-types/                             @yortus @baxtersa @marvinhagemeister @bcherny
+/types/babel-webpack-plugin/                    @j-f1
+/types/babelify/                                @TeamworkGuy2 @marvinhagemeister
+/types/babylon/                                 @yortus @marvinhagemeister
+/types/babylon-walk/                            @czbuchi
+/types/babyparse/                               @cdiddy77
+/types/backbone/                                @borisyankov @nvivo
+/types/backbone-associations/                   @craigbrett17
+/types/backbone-fetch-cache/                    @delphinus35
+/types/backbone-relational/                     @eirikhm
+/types/backbone.layoutmanager/                  @hejiang2000
+/types/backbone.localstorage/                   @lgrignon
+/types/backbone.marionette/                     @zhamid @nvivo @sventschui
+/types/backbone.paginator/                      @Nyamazing
+/types/backbone.radio/                          @alphaleonis
+/types/backgrid/                                @jlujan
+/types/backlog-js/                              @vvatanabe
+/types/backoff/                                 @BendingBender
+/types/baconjs/                                 @alexander-matsievsky @gekkio
+/types/bagpipes/                                @micmro
+/types/barcode/                                 @pvomhoff
+/types/bardjs/                                  @TepigMC
+/types/base-64/                                 @dolanmiu
+/types/base-x/                                  @chrootsu
+/types/base16/                                  @alechill
+/types/base64-js/                               @pe8ter
+/types/bases/                                   @harikv
+/types/bash-glob/                               @mrmlnc
+/types/basic-auth/                              @moonpyk @vesse
+/types/batch-stream/                            @drudge
+/types/bazinga-translator/                      @alexndlm
+/types/bcrypt/                                  @codeanimal @IOAyman
+/types/bcryptjs/                                @RafaelKr
+/types/beats/                                   @urish
+/types/bech32/                                  @micksatana
+/types/bem-cn/                                  @selkinvitaly
+/types/better-curry/                            @pocesar
+/types/better-sqlite3/                          @Morfent @matrumz
+/types/bezier-easing/                           @ptlis
+/types/bezier-js/                               @danmarshall
+/types/bgiframe/                                @sumegizoltan
+/types/big.js/                                  @nycdotnet @googol
+/types/bigi/                                    @mhegazy
+/types/bigint/                                  @Evgenus
+/types/bignum/                                  @Patman64
+/types/bigscreen/                               @dduugg
+/types/binary-parser/                           @riggs @dolanmiu
+/types/bind-ponyfill/                           @skysteve
+/types/bindings/                                @unindented
+/types/bingmaps/                                @rbrundritt
+/types/bintrees/                                @CjS77
+/types/bip21/                                   @stefanhuber
+/types/bip38/                                   @micksatana
+/types/bip39/                                   @micksatana
+/types/bit-array/                               @mudkipme
+/types/bitcoinjs-lib/                           @mhegazy @dlebrecht @rbuckton @micksatana @youssefgh
+/types/bittorrent-protocol/                     @feross @tlaziuk
+/types/bitwise-xor/                             @rogierschouten
+/types/bl/                                      @Bartvds
+/types/blacklist/                               @mhegazy
+/types/blazy/                                   @julienpa
+/types/blessed/                                 @brynbellomy @skellock
+/types/blissfuljs/                              @fskorzec
+/types/blob-stream/                             @erichillah
+/types/blob-to-buffer/                          @nrlquaker
+/types/blob-util/                               @WorldMaker
+/types/blocks/                                  @ksmigiel
+/types/bloomfilter/                             @slawiko
+/types/blue-tape/                               @sodatea
+/types/bluebird/v1/                             @Bartvds
+/types/bluebird/v2/                             @Bartvds @falsandtru
+/types/bluebird/                                @lhecker
+/types/bluebird-global/                         @d-ph
+/types/bluebird-retry/                          @pvomhoff
+/types/blueimp-md5/                             @rmartone @mkohlmyr
+/types/body-parser/                             @santialbo @vilic @dreampulse @blendsdk @tlaziuk
+/types/bonjour/                                 @quentin-ol @octo-sniffle
+/types/bookshelf/                               @arcticwaters @vesse
+/types/boom/v3/                                 @rogatty
+/types/boom/v4/                                 @rogatty @AJamesPhillips @jineshshah36
+/types/boom/                                    @rogatty @AJamesPhillips @jineshshah36 @TimonVS
+/types/bootbox/                                 @vbortone @konpikwastaken @kanup @icereed @trodi @stannynuytkens @renjfk
+/types/bootpag/                                 @rdeneau
+/types/bootstrap/                               @borisyankov
+/types/bootstrap-datepicker/                    @borisyankov
+/types/bootstrap-fileinput/                     @CheCoxshall
+/types/bootstrap-maxlength/                     @danmana
+/types/bootstrap-notify/                        @niemyjski @mouse0270 @robert-voica
+/types/bootstrap-select/                        @LKay
+/types/bootstrap-slider/                        @dbeckwith @leonard-thieu
+/types/bootstrap-switch/                        @johnmbaughman
+/types/bootstrap-table/                         @talatbaig
+/types/bootstrap-touchspin/                     @albinsunnanbo
+/types/bootstrap-treeview/                      @jbtronics
+/types/bootstrap-validator/                     @BradyLiles
+/types/bootstrap.paginator/                     @derikwhittaker
+/types/bootstrap.timepicker/                    @derikwhittaker @heatherbooker
+/types/bootstrap.v3.datetimepicker/v3/          @bayitajesi
+/types/bootstrap.v3.datetimepicker/             @katonap
+/types/bounce.js/                               @cherrry
+/types/box2d/                                   @jbaldwin
+/types/brace-expansion/                         @BendingBender
+/types/braces/                                  @vemoo
+/types/braft-editor/                            @me
+/types/braintree-web/                           @chlela
+/types/breeze/                                  @borisyankov
+/types/bricks.js/                               @kondi
+/types/brorand/                                 @chrootsu
+/types/browser-bunyan/                          @PaulLockwood @kryops
+/types/browser-fingerprint/                     @LKay
+/types/browser-harness/                         @scriby
+/types/browser-pack/                            @TeamworkGuy2
+/types/browser-report/                          @JTOne123
+/types/browser-resolve/                         @marionebl
+/types/browser-sync/                            @joeskeen
+/types/browserify/                              @AndrewGaspar @jvilk @leonard-thieu
+/types/bs58/                                    @chrootsu
+/types/bson/                                    @horiuchi @CaselIT
+/types/bucks/                                   @zaneli
+/types/buffer-compare/                          @chrootsu
+/types/buffer-equal/                            @Bartvds
+/types/buffers/                                 @rhencke
+/types/bufferstream/                            @Bartvds
+/types/bull/v2/                                 @bgrieder @JProgrammer
+/types/bull/                                    @bgrieder @JProgrammer @marshall007 @weeco
+/types/bump-regex/                              @silkentrance
+/types/bunnymq/                                 @cyrilschumacher
+/types/bunyan/                                  @amikhalev
+/types/bunyan-blackhole/                        @olivr70
+/types/bunyan-bugsnag/                          @pasieronen
+/types/bunyan-config/                           @cyrilschumacher
+/types/bunyan-format/                           @dex4er
+/types/bunyan-prettystream/                     @jasonswearingen @enlight
+/types/bunyan-winston-adapter/                  @stevehipwell
+/types/busboy/                                  @jacobbaskin
+/types/business-rules-engine/                   @rsamec
+/types/bwip-js/                                 @MugeSo
+/types/byline/                                  @reppners
+/types/bytebuffer/                              @cappellin
+/types/bytes/                                   @danny8002
+/types/c3/                                      @mcliment @gerinjacob @denyo
+/types/cache-manager/                           @GausSim
+/types/cal-heatmap/                             @RetroChrisB
+/types/callsite/                                @newclear
+/types/callsites/                               @BendingBender
+/types/calq/                                    @eirikhm
+/types/camelcase/                               @samverschueren
+/types/camelcase-keys/                          @mhegazy
+/types/camo/                                    @lucasmciruzzi
+/types/cancan/                                  @Vincent-Pang
+/types/cannon/                                  @clark-stevenson @Gelio
+/types/canvas-gauges/                           @Mikhus
+/types/canvasjs/                                @brutalimp
+/types/capitalize/                              @frederickfogerty
+/types/card-validator/                          @ChanceM
+/types/case-sensitive-paths-webpack-plugin/     @r3nya
+/types/caseless/                                @downace
+/types/cash/                                    @akvlko
+/types/casperjs/                                @jedmao @urielch
+/types/cassandra-driver/                        @Svjard
+/types/catbox/                                  @jasonswearingen @AJamesPhillips
+/types/cbor/                                    @pushplay
+/types/ccap/                                    @taoqf
+/types/chai/v2/                                 @Bartvds @AGBrown
+/types/chai/                                    @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin @Naktibalda @micksatana
+/types/chai-arrays/                             @clementprevot
+/types/chai-as-promised/                        @jt000 @Kuniwak @leonard-thieu @lazerwalker @mattbishop
+/types/chai-datetime/                           @cliffburger
+/types/chai-dom/                                @mattlewis92
+/types/chai-enzyme/                             @asvetliakov
+/types/chai-fuzzy/                              @Bartvds
+/types/chai-http/                               @Nemo157 @G1itcher @CaselIT
+/types/chai-jest-snapshot/                      @mattvperry
+/types/chai-jquery/                             @kazimanzurrashid
+/types/chai-json-schema/                        @ulrichheiniger
+/types/chai-oequal/                             @mizunashi-mana
+/types/chai-spies/                              @kuzn-ilya
+/types/chai-string/                             @nmalaguti
+/types/chai-subset/                             @delta62 @AGBrown
+/types/chai-webdriverio/                        @sherlock1982
+/types/chai-xml/                                @jedigo
+/types/chance/                                  @cbowdon @brikou
+/types/change-emitter/                          @iskandersierra
+/types/charm/                                   @Xananax
+/types/chart.js/                                @anuti @FabienLavocat @KentarouTakeda @larrybahr @mernen @josefpaij @danmana
+/types/chartist/                                @mtgibbs @psimonski @clottman
+/types/chayns/                                  @HenningKuehl
+/types/check-sum/                               @BendingBender
+/types/check-types/                             @idchlife
+/types/checkstyle-formatter/                    @mhegazy
+/types/checksum/                                @rogierschouten
+/types/cheerio/                                 @blittle @wmaurer @umarniz @LiJinyao
+/types/chmodr/                                  @BendingBender
+/types/chokidar/                                @reppners @felixfbecker @bayssmekanique
+/types/chosen-js/                               @borisyankov @denisname
+/types/chownr/                                  @BendingBender
+/types/chroma-js/v0/                            @invliD
+/types/chroma-js/                               @invliD @mpacholec
+/types/chrome/                                  @matthewkimber @otiai10 @couven92 @rreverser @sreimer15
+/types/circular-json/                           @jpevarnek
+/types/ckeditor/                                @wittwert
+/types/clamp-js/                                @Hikariii
+/types/clamp-js-main/                           @sinziananicolae
+/types/classnames/                              @adidahiya @JKillian @seansfkelley @mradamczyk @marvinhagemeister
+/types/cldrjs/                                  @RamanBut-Husaim @gcastre
+/types/clean-css/                               @tkrotoff
+/types/clean-stack/                             @BendingBender
+/types/clean-webpack-plugin/                    @j-f1
+/types/clear-require/                           @dan-j
+/types/cleave.js/                               @clentfort @jasongi-at-sportsbet
+/types/cli/                                     @kayahr
+/types/cli-color/                               @ChaosinaCan
+/types/cli-spinner/                             @janslow
+/types/cli-table2/                              @mgroenhoff
+/types/client-sessions/                         @netroy
+/types/cliff/                                   @brynbellomy
+/types/clipboard/                               @impworks
+/types/clipboard-js/                            @markwongsk
+/types/clipboardy/                              @BendingBender
+/types/clndr/                                   @jasperjn
+/types/clockpicker/                             @jfcere
+/types/closure-compiler/                        @mprobst
+/types/cloud-env/                               @Morfent
+/types/cloudflare-apps/                         @MartynasZilinskas
+/types/cls-hooked/                              @aleung
+/types/clusterize.js/                           @Pr1st0n
+/types/cmd-shim/                                @cspotcode
+/types/co-body/                                 @geoffreak
+/types/co-views/                                @devlee @geoffreak
+/types/code/                                    @prashaantt
+/types/codemirror/                              @mihailik @nrbernard @Pr1st0n
+/types/codependency/                            @morphatic
+/types/coffeeify/                               @tkQubo
+/types/coinbase/                                @rogierschouten
+/types/coinstring/                              @mhegazy
+/types/collections/                             @scarabedore
+/types/color/v0/                                @LKay
+/types/color/v1/                                @LKay
+/types/color/                                   @Airlun
+/types/color-convert/                           @Airlun
+/types/color-name/                              @Ailrun
+/types/color-string/                            @BendingBender @danmarshall
+/types/colorbrewer/                             @mtraynham
+/types/colors/                                  @Bartvds @staeke
+/types/com.darktalker.cordova.screenshot/       @akarienta
+/types/combine-source-map/                      @TeamworkGuy2
+/types/combined-stream/                         @felixge @tlaziuk
+/types/combokeys/                               @iclanton
+/types/cometd/                                  @derekcicerone
+/types/command-line-args/                       @CzBuCHi
+/types/command-line-commands/                   @CzBuCHi
+/types/commangular/                             @hiraash
+/types/comment-json/                            @Jason3S
+/types/common-tags/                             @zuzusik @tzupengwang
+/types/commonmark/                              @nicojs @leonard-thieu
+/types/compare-version/                         @jpevarnek
+/types/complex/                                 @AyaMorisawa
+/types/component-emitter/                       @psnider
+/types/compose-function/                        @denis-sokolov
+/types/compressible/                            @BendingBender
+/types/compression/                             @santialbo
+/types/compression-webpack-plugin/              @dublicator
+/types/compute-stdev/                           @mrmlnc
+/types/concat-stream/                           @jmarianer
+/types/concaveman/                              @DenisCarriere
+/types/conf/v0/                                 @SamVerschueren
+/types/conf/                                    @SamVerschueren @BendingBender
+/types/confidence/                              @jppellerin
+/types/config/                                  @RWander @forrestbice @jndonald3
+/types/configstore/                             @ArcticLight
+/types/confit/                                  @ethanresnick
+/types/connect/                                 @SomaticIT
+/types/connect-busboy/                          @pinguet62
+/types/connect-ensure-login/                    @0x6368656174
+/types/connect-flash/                           @AndreasGassmann
+/types/connect-history-api-fallback/            @douglasduteil
+/types/connect-livereload/                      @SomaticIT
+/types/connect-modrewrite/                      @tinganho
+/types/connect-mongo/                           @Syati
+/types/connect-pg-simple/                       @pasieronen
+/types/connect-redis/                           @xstoudi @morcerf
+/types/connect-slashes/                         @samherrmann
+/types/connect-timeout/                         @cyrilschumacher
+/types/console-stamp/                           @ericbyers
+/types/consolidate/                             @soywiz @theosherry @nicolashenry
+/types/consul/                                  @chrootsu
+/types/content-disposition/                     @bomret
+/types/content-type/                            @horiuchi @BendingBender
+/types/contentful-resolve-response/             @antonkarsten
+/types/contextjs/                               @kernhanda
+/types/continuation-local-storage/              @rath @heycalmdown @aboveyou00
+/types/convert-hrtime/                          @BendingBender
+/types/convert-layout/                          @xeningem
+/types/convert-source-map/                      @AndrewGaspar @mgroenhoff @TeamworkGuy2
+/types/convict/                                 @Nemo157 @vesse @elyscape
+/types/cookie/                                  @pine613
+/types/cookie-parser/                           @santialbo @BendingBender
+/types/cookie-session/                          @borislavjivkov
+/types/cookie-signature/                        @lith-light-g
+/types/cookie_js/                               @slawiko
+/types/cookies/                                 @WangZishi @jkeylu @BendingBender
+/types/copy-paste/                              @SrTobi
+/types/copy-text-to-clipboard/                  @BendingBender
+/types/copy-webpack-plugin/                     @flying-sheep
+/types/cordova-ionic/                           @hendrikmaus
+/types/cordova-plugin-app-version/              @Ritzlgrmft
+/types/cordova-plugin-background-mode/          @Lordnoname
+/types/cordova-plugin-badge/                    @timbru31
+/types/cordova-plugin-ble-central/              @gjunge
+/types/cordova-plugin-canvascamera/             @lordazzi
+/types/cordova-plugin-device-name/              @larrybahr
+/types/cordova-plugin-file-opener2/             @cyrilgandon
+/types/cordova-plugin-ibeacon/                  @Ritzlgrmft
+/types/cordova-plugin-insomnia/                 @Ritzlgrmft
+/types/cordova-plugin-keyboard/                 @danmana @jkfb
+/types/cordova-plugin-mapsforge/                @rafw87
+/types/cordova-plugin-ms-adal/                  @KaiWalter
+/types/cordova-plugin-native-keyboard/          @lobo87
+/types/cordova-plugin-ouralabs/                 @Justin-Credible
+/types/cordova-plugin-qrscanner/                @bitjson @jab
+/types/cordova-plugin-spinner/                  @Justin-Credible
+/types/cordova-plugin-x-socialsharing/          @Ritzlgrmft @larrybahr
+/types/cordova-sqlite-storage/                  @rafw87
+/types/cordova-universal-links-plugin/          @broder
+/types/cordova_app_version_plugin/              @larrybahr
+/types/cordovarduino/                           @hendrikmaus
+/types/core-js/                                 @rbuckton @mfdeveloper
+/types/cote/                                    @makepost
+/types/couchbase/                               @maouida
+/types/countdown/                               @gjuchault
+/types/counterpart/                             @santiagodoldan
+/types/countries-and-timezones/                 @zero51
+/types/country-list/                            @iRoachie
+/types/country-select-js/                       @humrochagf
+/types/coverup/                                 @bevalorous
+/types/cp-file/                                 @BendingBender
+/types/cpx/                                     @alan-agius4
+/types/cpy/                                     @mhegazy @BendingBender
+/types/cqrs-domain/                             @blissi
+/types/cradle/                                  @panuhorsmalahti
+/types/crc/                                     @YuJianrong
+/types/create-error/                            @tkrotoff
+/types/create-react-class/                      @jgoz
+/types/createjs/                                @evilangelist @gyohk
+/types/createjs-lib/                            @evilangelist @gyohk
+/types/credential/                              @phuvo
+/types/credit-card-type/                        @LKay
+/types/cron/                                    @horiuchi
+/types/cropperjs/                               @stepancar
+/types/croppie/                                 @connor4312 @dklmuc @sarunint
+/types/crossfilter/                             @schmuli @iebaker @nordfjord
+/types/crossroads/                              @diullei
+/types/cryptiles/                               @awendland
+/types/crypto-js/                               @misak113
+/types/cryptojs/                                @giabao
+/types/cson/                                    @stpettersens
+/types/csprng/                                  @winksaville
+/types/csrf/                                    @markis
+/types/css/                                     @ilich
+/types/css-font-loading-module/                 @slikts
+/types/css-modules/                             @NeekSandhu
+/types/cssbeautify/                             @rictic
+/types/csurf/                                   @horiuchi
+/types/csv-parse/                               @davidm77 @obi-jan-kenobi
+/types/csv-stringify/                           @rogierschouten @arjenvanderende
+/types/csvrow/                                  @codeanimal
+/types/csvtojson/                               @EricByers @wcarson
+/types/cucumber/v1/                             @abraaoalves @jan-molak @isoung @BendingBender
+/types/cucumber/                                @abraaoalves @jan-molak @isoung @BendingBender @ErikSchierboom
+/types/currency-formatter/                      @mhegazy @davidmpaz
+/types/custom-error-generator/                  @thmiceli
+/types/cwise/                                   @taoqf
+/types/cwise-compiler/                          @taoqf
+/types/cwise-parser/                            @taoqf
+/types/cybozulabs-md5/                          @pine613
+/types/cytoscape/                               @phreed @wy193777 @ypconstante
+/types/d3/v3/                                   @gustavderdrache @borisyankov @MatthiasJobst
+/types/d3/                                      @tomwanzek @gustavderdrache @borisyankov
+/types/d3-array/                                @gustavderdrache @borisyankov @tomwanzek
+/types/d3-axis/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3-box/                                  @lk-chen
+/types/d3-brush/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-chord/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-collection/                           @tomwanzek @gustavderdrache @borisyankov
+/types/d3-color/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-contour/                              @tomwanzek @Ledragon
+/types/d3-dispatch/                             @tomwanzek @gustavderdrache @borisyankov
+/types/d3-drag/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3-dsv/                                  @tomwanzek @gustavderdrache @borisyankov
+/types/d3-ease/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3-force/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-format/                               @tomwanzek @gustavderdrache @borisyankov
+/types/d3-geo/                                  @Ledragon @tomwanzek @gustavderdrache @borisyankov
+/types/d3-hexbin/                               @uncovertruth @tomwanzek
+/types/d3-hierarchy/                            @tomwanzek @gustavderdrache @borisyankov
+/types/d3-hsv/                                  @arrayjam
+/types/d3-interpolate/                          @tomwanzek @gustavderdrache @borisyankov
+/types/d3-path/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3-polygon/                              @tomwanzek @gustavderdrache @borisyankov
+/types/d3-quadtree/                             @tomwanzek @gustavderdrache @borisyankov
+/types/d3-queue/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-random/                               @tomwanzek @gustavderdrache @borisyankov
+/types/d3-request/                              @Ledragon @gustavderdrache @borisyankov @tomwanzek
+/types/d3-sankey/                               @tomwanzek @gustavderdrache
+/types/d3-scale/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-scale-chromatic/                      @Ledragon @gustavderdrache @borisyankov @henriquefm
+/types/d3-selection/                            @tomwanzek @gustavderdrache @borisyankov
+/types/d3-selection-multi/                      @gustavderdrache @borisyankov
+/types/d3-shape/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-time/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3-time-format/                          @tomwanzek @gustavderdrache @borisyankov
+/types/d3-timer/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-tip/                                  @brspnnggrt
+/types/d3-transition/                           @tomwanzek @gustavderdrache @borisyankov
+/types/d3-voronoi/                              @tomwanzek @gustavderdrache @borisyankov
+/types/d3-zoom/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3.cloud.layout/                         @hansrwindhoff
+/types/d3.slider/                               @lk-chen
+/types/d3kit/                                   @morphatic
+/types/d3pie/                                   @mc-petry
+/types/dagre/                                   @qinfchen @Frankrike @vilterp @rustedgrail
+/types/dagre-d3/                                @markwongsk
+/types/dagre-layout/                            @qinfchen @Frankrike @vilterp
+/types/dargs/                                   @BendingBender
+/types/dat-gui/                                 @gyohk @sonic3d @rroylance
+/types/data-driven/                             @mrhen
+/types/datadog-metrics/                         @pushplay
+/types/datatables.net/                          @Silver-Connection @omidkrad @pragmatrix @CNBoland
+/types/datatables.net-buttons/                  @Silver-Connection @SammyG4Free @jimhartford
+/types/datatables.net-fixedheader/              @szechyjs @Silver-Connection
+/types/datatables.net-rowreorder/               @baywet
+/types/datatables.net-select/                   @szechyjs
+/types/date-arithmetic/                         @HeeL
+/types/date.format.js/                          @balrob
+/types/dateformat/                              @aicest
+/types/datejs/                                  @rupertavery
+/types/daterangepicker/                         @SirMartin @smasala @nertzy
+/types/db-migrate-base/                         @nickiannone
+/types/db-migrate-pg/                           @nickiannone
+/types/db.js/                                   @cgwrench
+/types/dc/                                      @hansrwindhoff @mtraynham @MatthiasJobst
+/types/deasync/                                 @Sicilica
+/types/debessmann/                              @vkorehov
+/types/debounce/                                @denis-sokolov
+/types/debug/                                   @swook @galtalmor @zamb3zi
+/types/decamelize/                              @samverschueren
+/types/decay/                                   @enaeseth
+/types/decompress/                              @plantain-00
+/types/decorum/                                 @dflor003
+/types/dedent/                                  @douglasduteil
+/types/deep-assign/                             @souldreamer
+/types/deep-diff/                               @ZauberNerd
+/types/deep-equal/                              @remojansen @janslow
+/types/deep-extend/                             @rhysd
+/types/deep-freeze/                             @Bartvds @aluanhaddad
+/types/deep-freeze-es6/                         @mattbishop
+/types/deep-freeze-strict/                      @mhegazy
+/types/deepmerge/                               @marvinscharle @syy1125
+/types/defaults/                                @IbtihelCHNAB
+/types/defer-promise/                           @niklasf
+/types/define-lazy-prop/                        @BendingBender
+/types/defined/                                 @BendingBender
+/types/deku/                                    @pocka
+/types/del/v2/                                  @AyaMorisawa
+/types/del/                                     @AyaMorisawa @BendingBender
+/types/delaunator/                              @DenisCarriere
+/types/delay/                                   @BendingBender
+/types/denodeify/                               @joaomoreno
+/types/deoxxa-content-type/                     @pine613
+/types/depcheck/                                @ark120202
+/types/depd/                                    @danny8002 @BendingBender
+/types/deployjava/                              @cyrilschumacher
+/types/destroy/                                 @BendingBender
+/types/destroy-on-hwm/                          @BendingBender
+/types/detect-browser/                          @rogierschouten
+/types/detect-hover/                            @thomastilkema
+/types/detect-indent/v0/                        @Bartvds
+/types/detect-indent/                           @Bartvds @BendingBender
+/types/detect-it/                               @thomastilkema
+/types/detect-newline/                          @BendingBender
+/types/detect-passive-events/                   @thomastilkema
+/types/detect-pointer/                          @thomastilkema
+/types/detect-port/                             @lith-light-g
+/types/detect-touch-events/                     @thomastilkema
+/types/df-visible/                              @Litee
+/types/dhtmlxgantt/                             @mkozhukh @chriscamicas
+/types/dhtmlxscheduler/                         @mkozhukh
+/types/di-lite/                                 @dcrusader
+/types/diacritics/                              @otociulis
+/types/diff/                                    @vvakame
+/types/diff2html/                               @rtfpessoa
+/types/dir-resolve/                             @andy-ms
+/types/discontinuous-range/                     @OiCMudkips
+/types/disposable-email-domains/                @geoffreak
+/types/doccookies/                              @jonegerton
+/types/dockerode/                               @seikho @nlaplante @isac322 @lazarusx @meisenzahl
+/types/docopt/                                  @giggio
+/types/doctrine/                                @rictic
+/types/documentdb/                              @NoelAbrahams @brettferdosi @ctstone @yifanwu
+/types/documentdb-server/                       @lith-light-g
+/types/documentdb-session/                      @DanielRosenwasser
+/types/dojo/                                    @vansimke
+/types/dom-inputevent/                          @diagramatics
+/types/dom4/                                    @adidahiya @giladgray
+/types/domo/                                    @Steve-Fenton
+/types/dompurify/                               @bazuzi
+/types/domready/                                @dotnetnerd
+/types/donna/                                   @vvakame
+/types/dookie/                                  @swanest
+/types/dot/                                     @ZombieHunter
+/types/dot-object/                              @nkovacic
+/types/dot-prop/v2/                             @samverschueren
+/types/dot-prop/                                @samverschueren @BendingBender
+/types/dotdir-regex/                            @mrmlnc
+/types/dotdotdot/                               @milanjaros
+/types/dotenv/v2/                               @jussikinnula @borekb @enaeseth
+/types/dotenv/                                  @jussikinnula @borekb @enaeseth
+/types/dotenv-safe/                             @krenor
+/types/dotfile-regex/                           @mrmlnc
+/types/dottie/                                  @domarmstrong
+/types/double-ended-queue/                      @dsagal
+/types/doublearray/                             @mzsm
+/types/doubleclick-gpt/                         @johngeorgewright
+/types/download/                                @nicojs
+/types/downloadjs/                              @cwmoo740
+/types/draft-js/                                @dmitryrogozhny @eelco @ghotiphud @schwers @michael-yx-wu @willisplummer @smvilar
+/types/drag-timetable/                          @chinkan
+/types/draggabilly/                             @jaydubu
+/types/dragster/                                @zskovacs
+/types/dragula/                                 @pwelter34 @abruzzihraig
+/types/dropboxjs/                               @Steve-Fenton @xperiments
+/types/dropkickjs/                              @VorobeY1326
+/types/dropzone/v4/                             @nvivo @outring @renuo @Hikariii
+/types/dropzone/                                @nvivo @outring @renuo @Hikariii @tedbcsgpro
+/types/dts-generator/                           @mtraynham
+/types/duplexer2/                               @Goldsmith42
+/types/duplexer3/                               @BendingBender
+/types/duplexify/                               @strax
+/types/duplicate-package-checker-webpack-plugin/ @mtraynham
+/types/durandal/                                @BlueSpire
+/types/dustjs-linkedin/                         @mdezem
+/types/dvtng-jss/                               @Ptival
+/types/dw-bxslider-4/                           @namerci
+/types/dwt/v12/                                 @yushulx
+/types/dwt/                                     @yushulx @jbh
+/types/dygraphs/                                @danvk
+/types/dymo-label-framework/                    @thijskuipers
+/types/dynatable/                               @francoismassart
+/types/dynogels/                                @SpartanLabs
+/types/each/                                    @misak113
+/types/easeljs/                                 @evilangelist
+/types/easy-api-request/                        @DeadAlready
+/types/easy-jsend/                              @DeadAlready
+/types/easy-session/                            @DeadAlready
+/types/easy-table/                              @nikeee
+/types/easy-xapi/                               @DeadAlready
+/types/easy-xapi-utils/                         @DeadAlready
+/types/ebongarde-root/                          @Ebongarde
+/types/echarts/                                 @xieisabug @AntiMoron
+/types/ecurve/                                  @mhegazy
+/types/ed25519/                                 @erikma
+/types/egg-mock/                                @sheperdwind
+/types/egg.js/                                  @ToastHawaii
+/types/egjs__axes/                              @naver
+/types/egjs__component/                         @naver
+/types/ej.web.all/                              @syncfusion
+/types/ejs/                                     @benliddicott
+/types/ejs-locals/                              @jt000
+/types/ejson/                                   @shantanubhadoria
+/types/elasticsearch/                           @CasperSkydt @bfsmith @ddunkin @pushplay @mlamp @ahmadferdous @SimonSchick
+/types/electron-config/                         @mrfunkycold @unindented
+/types/electron-debug/                          @unindented
+/types/electron-devtools-installer/             @gamesmaxed
+/types/electron-is-dev/                         @trodi
+/types/electron-json-storage/                   @stpettersens @nrlquaker @jbw91
+/types/electron-notifications/                  @djpereira
+/types/electron-notify/                         @djpereira
+/types/electron-packager/                       @SomaticIT @cortopy
+/types/electron-settings/v2/                    @leonard-thieu
+/types/electron-settings/                       @icopp @nrlquaker
+/types/electron-spellchecker/                   @unindented
+/types/electron-store/                          @unindented
+/types/electron-util/                           @kputh
+/types/electron-window-state/                   @rhysd
+/types/electron-winstaller/                     @shiftkey @unindented
+/types/element-ready/                           @BendingBender
+/types/element-resize-detector/                 @saranshkataria
+/types/element-resize-event/                    @rogierschouten @plgregoire
+/types/elm/                                     @thSoft
+/types/email-templates/                         @cyrilschumacher @gurisko @blankstar85
+/types/ember/v1/                                @jedmao
+/types/ember/                                   @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie
+/types/ember-data/                              @dwickern @mike-north
+/types/ember-feature-flags/                     @tansongyang
+/types/ember-mocha/                             @dwickern
+/types/ember-modal-dialog/                      @tansongyang
+/types/ember-qunit/v2/                          @dwickern
+/types/ember-qunit/                             @dwickern
+/types/ember-test-helpers/                      @dwickern
+/types/ember-testing-helpers/                   @chriskrycho
+/types/emissary/                                @vvakame
+/types/emoji-mart/                              @Kovensky
+/types/emojione/                                @dbrgn
+/types/empower/                                 @vvakame
+/types/emscripten/                              @zakki @periklis
+/types/end-of-stream/                           @strax
+/types/engine.io/                               @KentarouTakeda
+/types/engine.io-client/                        @KentarouTakeda
+/types/enhanced-resolve/                        @e-cloud @onigoetz
+/types/enigma.js/                               @konne
+/types/ent/                                     @rogierschouten
+/types/entities/                                @aliceklipper
+/types/env-to-object/                           @MugeSo
+/types/envify/                                  @tkQubo
+/types/enzyme/                                  @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden
+/types/enzyme-adapter-react-15/                 @tkrotoff
+/types/enzyme-adapter-react-16/                 @tkrotoff
+/types/enzyme-to-json/                          @joscha
+/types/eonasdan-bootstrap-datetimepicker/       @ToastHawaii
+/types/epiceditor/                              @borisyankov
+/types/epilogue/                                @micksatana
+/types/epub/                                    @julien-c
+/types/eq.js/                                   @stephenlautier
+/types/errorhandler/                            @santialbo
+/types/es6-collections/                         @rbuckton
+/types/es6-promisify/                           @harryshipton
+/types/es6-shim/                                @rbuckton
+/types/es6-weak-map/                            @pine
+/types/escape-html/                             @elisee
+/types/escape-latex/                            @olsio
+/types/escape-string-regexp/                    @kruncher @faergeek
+/types/escodegen/                               @simondel
+/types/eslint-plugin-prettier/                  @ikatyang
+/types/esprima/v2/                              @teppeis @RReverser
+/types/esprima/                                 @teppeis @RReverser @peter-scott
+/types/esprima-walk/                            @tswaters
+/types/espruino/                                @stasberkov
+/types/esri-leaflet/                            @strajuser
+/types/esri-leaflet-geocoder/                   @BendingBender
+/types/estraverse/                              @sanex3339
+/types/estree/                                  @RReverser
+/types/etag/                                    @BendingBender
+/types/ethjs-signer/                            @doppio
+/types/eureka-js-client/                        @Schnillz
+/types/evaporate/                               @kookster @chrisrhoden
+/types/event-emitter/                           @LKay
+/types/event-kit/                               @GlenCFL
+/types/event-loop-lag/                          @rogierschouten
+/types/event-stream/                            @flcdrg
+/types/event-to-promise/                        @flying-sheep
+/types/events/                                  @yasupeke
+/types/evernote/                                @corps
+/types/exceljs/                                 @rogierschouten @alitaheri
+/types/execa/                                   @douglasduteil @BendingBender @borekb @mickdekkers
+/types/exit/                                    @Bartvds
+/types/exit-hook/                               @BendingBender
+/types/exorcist/                                @TeamworkGuy2
+/types/expect/                                  @jmreidy @merrywhether
+/types/expect.js/                               @teppeis
+/types/expectations/                            @vvakame
+/types/expo/v23/                                @KonstantinKai
+/types/expo/                                    @KonstantinKai @martynaskadisa
+/types/expr-eval/                               @connor4312
+/types/express/                                 @borisyankov
+/types/express-brute/                           @cyrilschumacher
+/types/express-brute-memcached/                 @cyrilschumacher
+/types/express-brute-mongo/                     @cyrilschumacher
+/types/express-brute-redis/                     @scottharwell
+/types/express-busboy/                          @pinguet62
+/types/express-cluster/                         @nenadalm
+/types/express-debug/                           @federicobond
+/types/express-domain-middleware/               @hookclaw
+/types/express-ejs-layouts/                     @erikma
+/types/express-enforces-ssl/                    @kevinstubbs
+/types/express-fileupload/                      @Naktibalda
+/types/express-flash-2/                         @mathsalmi
+/types/express-flash-notification/              @Mister4Eyes
+/types/express-formidable/                      @tdolsen @evanshortiss
+/types/express-graphql/                         @isman-usoh @nitintutlani @hubel
+/types/express-handlebars/                      @stpettersens @yhaskell
+/types/express-jwt/                             @wokim @kacepe @Sl1MBoy
+/types/express-less/                            @xieyubo
+/types/express-minify/                          @borislavjivkov
+/types/express-mongo-sanitize/                  @ericbyers
+/types/express-mung/                            @cyrilschumacher
+/types/express-myconnection/                    @Cellule
+/types/express-mysql-session/                   @Akim95
+/types/express-oauth-server/                    @atd-schubert
+/types/express-openapi/                         @mugeso
+/types/express-partials/                        @jt000
+/types/express-promise-router/                  @wanganjun
+/types/express-rate-limit/                      @cyrilschumacher @makepost
+/types/express-route-fs/                        @kripod
+/types/express-sanitized/                       @cjbarth
+/types/express-serve-static-core/               @borisyankov @19majkel94 @kacepe @micksatana
+/types/express-session/                         @horiuchi @jacobbogers
+/types/express-unless/                          @wokim
+/types/express-winston/                         @bricka
+/types/extend/                                  @reppners
+/types/extjs/                                   @brian428
+/types/extract-stack/                           @BendingBender
+/types/extract-text-webpack-plugin/             @flying-sheep @katyo
+/types/extract-zip/                             @mizunashi-mana
+/types/eyes/                                    @brynbellomy
+/types/f1/                                      @neolwc
+/types/fabric/                                  @oklemencic @joewashear007 @mrand01
+/types/facebook-js-sdk/                         @amritk
+/types/facebook-pixel/                          @noctishsu
+/types/faker/v3/                                @Kuniwak
+/types/faker/                                   @bensw @basp @Kuniwak @mattbishop
+/types/falcor/                                  @Quramy
+/types/falcor-express/                          @Quramy
+/types/falcor-http-datasource/                  @Quramy
+/types/falcor-json-graph/                       @Quramy
+/types/falcor-router/                           @Quramy @cdhgee
+/types/famous/                                  @borisvasilenko
+/types/fancy-log/                               @pine
+/types/fancybox/                                @borisyankov
+/types/farbtastic/                              @EnableSoftware
+/types/fast-diff/                               @djrenren
+/types/fast-levenshtein/                        @mizunashi-mana
+/types/fast-list/                               @BendingBender
+/types/fast-stats/                              @rogierschouten
+/types/fastclick/                               @shinnn
+/types/favico.js/                               @drowse314-dev-ymat
+/types/fb/                                      @JoshStrobl
+/types/fbemitter/                               @kmxz
+/types/featherlight/                            @xStrom
+/types/feedme/                                  @codeanimal
+/types/feedparser/                              @cortopy
+/types/fetch-jsonp/                             @tkrotoff
+/types/fetch-mock/                              @asvetliakov @tamird @merrywhether @chrissinclair
+/types/fetch.io/                                @newraina
+/types/ffi/                                     @loyd
+/types/ffmpeg-static/                           @iamstevetran
+/types/ffprobe-static/                          @iamstevetran
+/types/fibers/                                  @soywiz
+/types/figures/                                 @BendingBender
+/types/file-exists/                             @BendingBender
+/types/file-saver/                              @cyrilschumacher @DaIgeb @chrismbarr
+/types/file-type/                               @tcaesvk @BendingBender
+/types/file-url/                                @coderslagoon
+/types/filenamify/                              @rokt33r
+/types/filesize/                                @GiedriusGrabauskas
+/types/fill-pdf/                                @westy92
+/types/finalhandler/                            @chrootsu
+/types/finch/                                   @DavidSichau
+/types/find/                                    @andypyrope
+/types/find-up/                                 @BendingBender
+/types/findup-sync/                             @Bartvds @ngbrown
+/types/fingerprintjs/                           @zaneli
+/types/fingerprintjs2/                          @curtstate
+/types/firebase-client/                         @fpsscarecrow
+/types/firebase-token-generator/                @dotdotcommadot
+/types/firebird/                                @karak
+/types/firefox/                                 @vvakame
+/types/firefox-webext-browser/                  @bomjacob
+/types/firmata/                                 @troywweber7
+/types/first-mate/                              @GlenCFL
+/types/fixed-data-table/                        @pepaar @stephenjelfs
+/types/fixed-data-table-2/                      @ilivit
+/types/flat/                                    @chrootsu
+/types/flexslider/                              @diullei
+/types/flickity/                                @clmcgrath @wagich
+/types/flight/                                  @jonathanhedren
+/types/flightplan/                              @borislavjivkov
+/types/flipsnap/                                @kubosho @gsino @mayuki
+/types/flot/                                    @burlandm @Anticom @admiralsmaster
+/types/flowjs/                                  @ryan10132
+/types/fluent-ffmpeg/                           @tcaesvk @DingWeizhe
+/types/flux/                                    @stkb @GiedriusGrabauskas
+/types/fluxxor/                                 @mrk21
+/types/fm-websync/                              @markusmauch
+/types/fontfaceobserver/                        @RandScullard
+/types/fontoxml/                                @rolandzwaga
+/types/forever-monitor/                         @shuntksh
+/types/forge-di/                                @adamcarr
+/types/form-data/                               @soywiz @leonyu @BendingBender
+/types/form-serializer/                         @flqw
+/types/form-urlencoded/                         @alepee
+/types/format-duration/                         @Roaders
+/types/format-io/                               @amitbeck
+/types/format-unicorn/                          @kruncher
+/types/formidable/                              @Nemo157
+/types/forwarded/                               @BendingBender
+/types/fossil-delta/                            @endel
+/types/foundation/                              @borisyankov
+/types/fpsmeter/                                @alampros
+/types/framebus/                                @kbukum
+/types/freedom/                                 @jpevarnek
+/types/freeport/                                @atd-schubert
+/types/fresh/                                   @BendingBender
+/types/friendly-errors-webpack-plugin/          @bahlo
+/types/frisby/                                  @johnny4753
+/types/from/                                    @Bartvds
+/types/from2/                                   @BendingBender
+/types/fromjs/                                  @glenndierckx
+/types/fromnow/                                 @marinewater
+/types/fs-cson/                                 @dex4er
+/types/fs-ext/                                  @OguzhanE
+/types/fs-extra/v4/                             @alan-agius4 @midknight41 @shiftkey @mees-
+/types/fs-extra/                                @alan-agius4 @midknight41 @shiftkey @mees-
+/types/fs-extra-promise/                        @midknight41 @jasonswearingen @HiromiShikata
+/types/fs-extra-promise-es6/                    @midknight41 @jasonswearingen @geoffreak @HiromiShikata
+/types/fs-finder/                               @misak113
+/types/fs-mock/                                 @rogierschouten
+/types/fs-plus/                                 @unindented
+/types/fs-promise/                              @tarruda
+/types/fs-readdir-recursive/                    @pscanf
+/types/fs-readfile-promise/                     @mtsg
+/types/fscreen/                                 @joscha
+/types/fsevents/                                @BendingBender
+/types/ftdomdelegate/                           @dotnetnerd
+/types/ftp/                                     @rogierschouten
+/types/ftpd/                                    @rogierschouten
+/types/fullname/                                @kayahr
+/types/fullpage.js/                             @jodiwarren
+/types/fuse/                                    @smrq
+/types/fusioncharts/                            @rohitkr @shivarajkv
+/types/fuzzaldrin/                              @mhegazy
+/types/fuzzaldrin-plus/                         @jeancroy @jkillian
+/types/fuzzyset/                                @lgrignon
+/types/fuzzyset.js/                             @lgrignon
+/types/fxn/                                     @charrondev
+/types/gae.channel.api/                         @vvakame
+/types/gamequery/                               @Laubi
+/types/gandi-livedns/                           @xstoudi
+/types/gapi/                                    @sgtfrankieboy
+/types/gapi.analytics/                          @gatsbimantico
+/types/gapi.auth2/                              @flawless2011
+/types/gapi.calendar/                           @tkrotoff
+/types/gapi.client/                             @Bolisov
+/types/gapi.client.acceleratedmobilepageurl/    @Bolisov
+/types/gapi.client.adexchangebuyer/             @Bolisov
+/types/gapi.client.adexchangebuyer2/            @Bolisov
+/types/gapi.client.adexchangeseller/            @Bolisov
+/types/gapi.client.adexperiencereport/          @Bolisov
+/types/gapi.client.admin/                       @Bolisov
+/types/gapi.client.adsense/                     @Bolisov
+/types/gapi.client.adsensehost/                 @Bolisov
+/types/gapi.client.analytics/                   @Bolisov
+/types/gapi.client.analyticsreporting/          @Bolisov
+/types/gapi.client.androiddeviceprovisioning/   @Bolisov
+/types/gapi.client.androidenterprise/           @Bolisov
+/types/gapi.client.androidmanagement/           @Bolisov
+/types/gapi.client.androidpublisher/            @Bolisov
+/types/gapi.client.appengine/                   @Bolisov
+/types/gapi.client.appsactivity/                @Bolisov
+/types/gapi.client.appstate/                    @Bolisov
+/types/gapi.client.bigquery/                    @Bolisov
+/types/gapi.client.bigquerydatatransfer/        @Bolisov
+/types/gapi.client.blogger/                     @Bolisov
+/types/gapi.client.books/                       @Bolisov
+/types/gapi.client.calendar/                    @Bolisov
+/types/gapi.client.civicinfo/                   @Bolisov
+/types/gapi.client.classroom/                   @Bolisov
+/types/gapi.client.cloudbilling/                @Bolisov
+/types/gapi.client.cloudbuild/                  @Bolisov
+/types/gapi.client.clouddebugger/               @Bolisov
+/types/gapi.client.clouderrorreporting/         @Bolisov
+/types/gapi.client.cloudfunctions/              @Bolisov
+/types/gapi.client.cloudiot/                    @Bolisov
+/types/gapi.client.cloudkms/                    @Bolisov
+/types/gapi.client.cloudmonitoring/             @Bolisov
+/types/gapi.client.cloudresourcemanager/        @Bolisov
+/types/gapi.client.cloudtasks/                  @Bolisov
+/types/gapi.client.cloudtrace/                  @Bolisov
+/types/gapi.client.clouduseraccounts/           @Bolisov
+/types/gapi.client.compute/                     @Bolisov
+/types/gapi.client.consumersurveys/             @Bolisov
+/types/gapi.client.container/                   @Bolisov
+/types/gapi.client.content/                     @Bolisov
+/types/gapi.client.customsearch/                @Bolisov
+/types/gapi.client.dataflow/                    @Bolisov
+/types/gapi.client.dataproc/                    @Bolisov
+/types/gapi.client.datastore/                   @Bolisov
+/types/gapi.client.deploymentmanager/           @Bolisov
+/types/gapi.client.dfareporting/                @Bolisov
+/types/gapi.client.discovery/                   @Bolisov
+/types/gapi.client.dlp/                         @Bolisov
+/types/gapi.client.dns/                         @Bolisov
+/types/gapi.client.doubleclickbidmanager/       @Bolisov
+/types/gapi.client.doubleclicksearch/           @Bolisov
+/types/gapi.client.drive/                       @Bolisov
+/types/gapi.client.firebasedynamiclinks/        @Bolisov
+/types/gapi.client.firebaseremoteconfig/        @Bolisov
+/types/gapi.client.firebaserules/               @Bolisov
+/types/gapi.client.firestore/                   @Bolisov
+/types/gapi.client.fitness/                     @Bolisov
+/types/gapi.client.fusiontables/                @Bolisov
+/types/gapi.client.games/                       @Bolisov
+/types/gapi.client.gamesconfiguration/          @Bolisov
+/types/gapi.client.gamesmanagement/             @Bolisov
+/types/gapi.client.genomics/                    @Bolisov
+/types/gapi.client.gmail/                       @Bolisov
+/types/gapi.client.groupsmigration/             @Bolisov
+/types/gapi.client.groupssettings/              @Bolisov
+/types/gapi.client.iam/                         @Bolisov
+/types/gapi.client.identitytoolkit/             @Bolisov
+/types/gapi.client.kgsearch/                    @Bolisov
+/types/gapi.client.language/                    @Bolisov
+/types/gapi.client.licensing/                   @Bolisov
+/types/gapi.client.logging/                     @Bolisov
+/types/gapi.client.manufacturers/               @Bolisov
+/types/gapi.client.mirror/                      @Bolisov
+/types/gapi.client.ml/                          @Bolisov
+/types/gapi.client.monitoring/                  @Bolisov
+/types/gapi.client.oauth2/                      @Bolisov
+/types/gapi.client.oslogin/                     @Bolisov
+/types/gapi.client.pagespeedonline/             @Bolisov
+/types/gapi.client.partners/                    @Bolisov
+/types/gapi.client.people/                      @Bolisov
+/types/gapi.client.playcustomapp/               @Bolisov
+/types/gapi.client.playmoviespartner/           @Bolisov
+/types/gapi.client.plus/                        @Bolisov
+/types/gapi.client.plusdomains/                 @Bolisov
+/types/gapi.client.prediction/                  @Bolisov
+/types/gapi.client.proximitybeacon/             @Bolisov
+/types/gapi.client.pubsub/                      @Bolisov
+/types/gapi.client.qpxexpress/                  @Bolisov
+/types/gapi.client.reseller/                    @Bolisov
+/types/gapi.client.resourceviews/               @Bolisov
+/types/gapi.client.runtimeconfig/               @Bolisov
+/types/gapi.client.safebrowsing/                @Bolisov
+/types/gapi.client.script/                      @Bolisov
+/types/gapi.client.searchconsole/               @Bolisov
+/types/gapi.client.servicecontrol/              @Bolisov
+/types/gapi.client.servicemanagement/           @Bolisov
+/types/gapi.client.serviceuser/                 @Bolisov
+/types/gapi.client.sheets/                      @Bolisov
+/types/gapi.client.siteverification/            @Bolisov
+/types/gapi.client.slides/                      @Bolisov
+/types/gapi.client.sourcerepo/                  @Bolisov
+/types/gapi.client.spanner/                     @Bolisov
+/types/gapi.client.spectrum/                    @Bolisov
+/types/gapi.client.speech/                      @Bolisov
+/types/gapi.client.sqladmin/                    @Bolisov
+/types/gapi.client.storage/                     @Bolisov
+/types/gapi.client.storagetransfer/             @Bolisov
+/types/gapi.client.streetviewpublish/           @Bolisov
+/types/gapi.client.surveys/                     @Bolisov
+/types/gapi.client.tagmanager/                  @Bolisov
+/types/gapi.client.taskqueue/                   @Bolisov
+/types/gapi.client.tasks/                       @Bolisov
+/types/gapi.client.testing/                     @Bolisov
+/types/gapi.client.toolresults/                 @Bolisov
+/types/gapi.client.translate/                   @Bolisov
+/types/gapi.client.urlshortener/                @Bolisov
+/types/gapi.client.vault/                       @Bolisov
+/types/gapi.client.videointelligence/           @Bolisov
+/types/gapi.client.vision/                      @Bolisov
+/types/gapi.client.webfonts/                    @Bolisov
+/types/gapi.client.webmasters/                  @Bolisov
+/types/gapi.client.youtube/                     @Bolisov
+/types/gapi.client.youtubeanalytics/            @Bolisov
+/types/gapi.client.youtubereporting/            @Bolisov
+/types/gapi.drive/                              @baxtersa
+/types/gapi.pagespeedonline/                    @sgtfrankieboy
+/types/gapi.people/                             @tkrotoff
+/types/gapi.plus/                               @tkrotoff
+/types/gapi.translate/                          @sgtfrankieboy
+/types/gapi.urlshortener/                       @sgtfrankieboy
+/types/gapi.youtube/                            @sgtfrankieboy
+/types/gapi.youtubeanalytics/                   @sgtfrankieboy
+/types/gaussian/                                @scttcper
+/types/gen-readlines/                           @CodeAnimal
+/types/generic-functions/                       @stpettersens
+/types/generic-pool/                            @jerray
+/types/gently/                                  @bonnici
+/types/geodesy/                                 @DenisCarriere @HandyG52 @excelulous
+/types/geojson/                                 @cobster @atd-schubert @JeffJacobson
+/types/geojson2osm/                             @DenisCarriere
+/types/geokdbush/                               @DenisCarriere
+/types/geometry-dom/                            @nakakura
+/types/geopattern/                              @Gaelan
+/types/get-node-dimensions/                     @vincekovacs
+/types/get-stdin/                               @DanielRosenwasser
+/types/get-stream/                              @douglasduteil @BendingBender
+/types/getos/                                   @BendingBender
+/types/gettext.js/                              @jucrouzet
+/types/gifffer/                                 @gatimus
+/types/gijgo/                                   @atatanasov
+/types/giraffe/                                 @darthapo
+/types/git/                                     @vvakame
+/types/git-config/                              @stpettersens
+/types/git-remote-origin-url/                   @janslow
+/types/github-username-regex/                   @BehindTheMath
+/types/gl-matrix/                               @mattijskneppers @tatchx @nbabanov @auzmartist @surtr-isaz
+/types/gldatepicker/                            @qcz
+/types/glidejs/                                 @milanjaros
+/types/glob/                                    @vvakame @voy
+/types/glob-base/                               @alan-agius4
+/types/glob-expand/                             @vvakame
+/types/glob-parent/                             @mrmlnc
+/types/glob-stream/                             @Bartvds @mrmlnc
+/types/global-tunnel-ng/                        @BendingBender
+/types/globalize/                               @gcastre @afromogli
+/types/globalize-compiler/                      @iclanton
+/types/globby/                                  @douglasduteil @ikatyang
+/types/globule/                                 @durad
+/types/gm/                                      @ChaosinaCan @maartenvanvliet
+/types/go/                                      @NorthwoodsSoftware
+/types/google-adwords-scripts/                  @jafaircl
+/types/google-apps-script/                      @motemen
+/types/google-apps-script-oauth2/               @dhayab
+/types/google-cloud__datastore/                 @beaulac
+/types/google-cloud__pubsub/                    @pheromonez
+/types/google-cloud__storage/                   @blove @nbperry
+/types/google-earth/                            @icholy
+/types/google-images/                           @dolanmiu
+/types/google-libphonenumber/                   @leonyu
+/types/google-map-react/                        @honzabrecka
+/types/google-maps/                             @DeividasBakanas @GiedriusGrabauskas
+/types/google-protobuf/                         @marcuslongmuir
+/types/google.analytics/                        @tyler-murphy
+/types/google.feeds/                            @RodneyJT
+/types/google.fonts/                            @danmarshall
+/types/google.geolocation/                      @vbortone
+/types/google.picker/                           @grapswiz
+/types/google.visualization/                    @danludwig @gmoore-sjcorg @danmana @mlcheng @IvanBisultanov @glebm
+/types/googlemaps/                              @cgwrench @nertzy @xaolas @mrmcnerd @martincostello @svenkreiss
+/types/googlemaps.infobubble/                   @Dashue
+/types/got/                                     @BendingBender @LinusU
+/types/graceful-fs/v2/                          @Bartvds
+/types/graceful-fs/                             @Bartvds @BendingBender
+/types/graham_scan/                             @hberntsen
+/types/graphite-udp/                            @EricByers
+/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal
+/types/graphql-date/                            @enaeseth
+/types/graphql-relay/                           @arvitaly @nitintutlani @Grelinfo
+/types/graphql-type-json/                       @schfkt
+/types/graphviz/                                @mhfrantz
+/types/grasp/                                   @agnoster
+/types/gravatar/                                @denis-sokolov
+/types/gravatar-url/                            @ivangabriele
+/types/greasemonkey/                            @kotas
+/types/grecaptcha/v0/                           @brentj73
+/types/grecaptcha/                              @DethAriel
+/types/gregorian-calendar/                      @cwalv
+/types/gridfs-stream/                           @liorm
+/types/gridstack/                               @PascalSenn @ZoolWay @Sl1MBoy
+/types/grunt/                                   @jeffmay @basarat
+/types/gsap/                                    @codebelt @ProbablePrime
+/types/guid/                                    @maroy1986
+/types/gulp/                                    @GiedriusGrabauskas
+/types/gulp-angular-templatecache/              @amanmahajan7
+/types/gulp-babel/                              @AyaMorisawa
+/types/gulp-batch/                              @alvarollmenezes @vizeke
+/types/gulp-bump/                               @silkentrance
+/types/gulp-cache/                              @aravindarun
+/types/gulp-cached/                             @tomc974
+/types/gulp-changed/                            @tomc974
+/types/gulp-cheerio/                            @tkQubo
+/types/gulp-clean-dest/                         @andypyrope
+/types/gulp-coffeeify/                          @tkQubo
+/types/gulp-coffeelint/                         @tkQubo
+/types/gulp-concat/                             @k-kagurazaka
+/types/gulp-connect/                            @andrewiggins
+/types/gulp-copy/                               @aravindarun
+/types/gulp-csso/                               @tkrotoff
+/types/gulp-debug/                              @tkrotoff
+/types/gulp-diff/                               @ikatyang
+/types/gulp-dtsm/                               @AyaMorisawa
+/types/gulp-espower/                            @tkQubo
+/types/gulp-file-include/                       @DanielRosenwasser
+/types/gulp-filter/                             @tkrotoff
+/types/gulp-flatten/                            @k-kagurazaka
+/types/gulp-gzip/                               @tkQubo
+/types/gulp-help/                               @tkQubo
+/types/gulp-help-doc/                           @Mikhus
+/types/gulp-html-replace/                       @peterjuras
+/types/gulp-htmlmin/                            @tkrotoff
+/types/gulp-if/                                 @joeskeen
+/types/gulp-inject/                             @k-kagurazaka
+/types/gulp-insert/                             @shantmarouti
+/types/gulp-install/                            @peterjuras
+/types/gulp-jade/                               @berwyn
+/types/gulp-jasmine/                            @andypyrope
+/types/gulp-jasmine-browser/                    @tkrotoff
+/types/gulp-json-editor/                        @peterjuras
+/types/gulp-jsonminify/                         @pine
+/types/gulp-jspm/                               @peterjuras
+/types/gulp-less/                               @k-kagurazaka
+/types/gulp-load-plugins/                       @joeskeen
+/types/gulp-minify-css/                         @k-kagurazaka
+/types/gulp-minify-html/                        @tkrotoff
+/types/gulp-modernizr/                          @remisery
+/types/gulp-newer/                              @tomc974
+/types/gulp-ng-annotate/                        @tkQubo
+/types/gulp-nodemon/                            @tkQubo
+/types/gulp-plumber/                            @joeskeen
+/types/gulp-protractor/                         @tkrotoff
+/types/gulp-pug/                                @remisery
+/types/gulp-remember/                           @tomc974
+/types/gulp-rev/                                @tkrotoff
+/types/gulp-rev-replace/                        @tkrotoff
+/types/gulp-ruby-sass/                          @agnislav
+/types/gulp-shell/                              @tkqubo
+/types/gulp-size/                               @tkrotoff @remisery
+/types/gulp-sort/                               @joeskeen
+/types/gulp-strip-debug/                        @peterjuras
+/types/gulp-svg-sprite/                         @tkqubo
+/types/gulp-task-listing/                       @joeskeen
+/types/gulp-tsd/                                @k-kagurazaka
+/types/gulp-uglify/                             @ChristopherHaws @leonard-thieu
+/types/gulp-useref/                             @tkrotoff
+/types/gulp-util/                               @jedmao
+/types/gulp-watch/                              @tkrotoff
+/types/gulp-zip/                                @dudeofawesome
+/types/gzip-js/                                 @rhysd
+/types/gzip-size/v3/                            @plantain-00
+/types/gzip-size/                               @plantain-00 @jimivdw @andrewiggins
+/types/h2o2/                                    @jasonswearingen @AJamesPhillips
+/types/halfred/                                 @dherges
+/types/halogen/                                 @steller
+/types/hammerjs/                                @milkisevil @codler
+/types/handlebars/                              @borisyankov
+/types/hapi/v8/                                 @jasonswearingen
+/types/hapi/v12/                                @jasonswearingen
+/types/hapi/v15/                                @jasonswearingen
+/types/hapi/                                    @jasonswearingen @AJamesPhillips
+/types/hapi-auth-basic/                         @AJamesPhillips @saboya
+/types/hapi-auth-jwt2/                          @warrenseymour
+/types/hapi-decorators/                         @kenhowardpdx
+/types/har-format/                              @micmro
+/types/hard-rejection/                          @BendingBender
+/types/harmony-proxy/                           @remojansen
+/types/has-ansi/                                @BendingBender
+/types/hash-file/                               @HiromiShikata
+/types/hash-stream/                             @BendingBender
+/types/hasha/                                   @BendgingBender
+/types/hasher/                                  @flyfishMT
+/types/hashids/                                 @pocesar
+/types/hashmap/                                 @outring
+/types/haversine/                               @screendriver
+/types/he/                                      @sedwards2009
+/types/headroom/                                @hakubo
+/types/heap/                                    @ryan10132
+/types/heapdump/                                @weekens
+/types/heatmap.js/                              @lookuptable @rhys-vdw
+/types/hedron/                                  @dborysov
+/types/hellojs/                                 @PavelPZ @vuorinem
+/types/hellosign-embedded/                      @xt0rted
+/types/helmet/                                  @cyrilschumacher @EvanHahn @bluehatbrit
+/types/heredatalens/                            @denyo
+/types/heremaps/                                @Josh-ES @denyo
+/types/heroku-logger/                           @kylevogt
+/types/hex-rgba/                                @r3nya
+/types/hexo-bunyan/                             @segayuu
+/types/hexo-fs/                                 @segayuu
+/types/hexo-log/                                @segayuu
+/types/highcharts/                              @damianog @baltie @AlbertOzimek @hanssens
+/types/highcharts-ng/                           @scatcher
+/types/highland/                                @Bartvds @hgwood @iwllyu @alvis
+/types/highlight.js/                            @nikeee @sourrust @joshuakgoldberg
+/types/hiredis/                                 @titan
+/types/history/v2/                              @sergey-buturlakin @ngbrown
+/types/history/v3/                              @sergey-buturlakin @ngbrown @LKay
+/types/history/                                 @sergey-buturlakin @ngbrown @rokoroku
+/types/history.js/                              @borisyankov @gjunge
+/types/hjson/                                   @crunchie84
+/types/hls.js/                                  @jgainfort
+/types/hoek/                                    @prashaantt
+/types/holderjs/                                @renjfk
+/types/hooker/                                  @misak113
+/types/hopscotch/                               @pimterry @Aurimas1
+/types/howler/                                  @xperiments @tdukart @alien35 @nicholashza
+/types/hpp/                                     @kryops
+/types/html-entities/                           @xstoudi
+/types/html-minifier/v1/                        @tkrotoff
+/types/html-minifier/                           @tkrotoff @rikuayanokozy
+/types/html-pdf/                                @westy92
+/types/html-to-text/                            @erykwarren
+/types/html-webpack-plugin/                     @deevus @bumbleblym @tlaziuk
+/types/html-webpack-template/                   @bumbleblym
+/types/html2canvas/                             @rwhepburn @tan9
+/types/htmlbars-inline-precompile/              @chriskrycho
+/types/htmlparser2/                             @staticfunction @LinusU
+/types/htmltojsx/                               @basarat
+/types/http-assert/                             @jkeylu
+/types/http-aws-es/                             @marcogrcr
+/types/http-codes/                              @mhegazy
+/types/http-context/                            @mtraynham
+/types/http-errors/                             @tkrotoff @BendingBender
+/types/http-proxy/                              @SomaticIT
+/types/http-proxy-agent/                        @mrmlnc
+/types/http-proxy-middleware/                   @zebMcCorkle @BendingBender
+/types/http-server/                             @plantain-00
+/types/http-status/                             @misak113
+/types/http-string-parser/                      @pine613
+/types/httperr/                                 @yortus
+/types/hubot/                                   @dirk
+/types/hubspot-pace/                            @borislavjivkov
+/types/humane/                                  @jmvrbanac
+/types/humanize-plus/                           @DenisCarriere
+/types/humanparser/                             @MichalPodeszwa
+/types/humps/                                   @nikeee
+/types/hyco-ws/                                 @mrcabellom
+/types/hyperscript/                             @spacejack @jmfirth
+/types/hypertext-application-language/          @maks3w
+/types/hystrixjs/                               @igorsechyn
+/types/i18n/                                    @SomaticIT @FindQ
+/types/i18n-js/                                 @ypresto
+/types/i18next/v2/                              @mxl @deerawan @GiedriusGrabauskas
+/types/i18next/                                 @mxl @deerawan @GiedriusGrabauskas
+/types/i18next-browser-languagedetector/v0/     @cyrilschumacher @GiedriusGrabauskas
+/types/i18next-browser-languagedetector/        @cyrilschumacher @GiedriusGrabauskas
+/types/i18next-express-middleware/              @cyrilschumacher
+/types/i18next-node-fs-backend/                 @cyrilschumacher
+/types/i18next-sprintf-postprocessor/           @cyrilschumacher
+/types/i18next-xhr-backend/                     @jamuhl @GiedriusGrabauskas
+/types/i2c-bus/                                 @101100
+/types/iban/                                    @cyrilschumacher
+/types/ibm-mobilefirst/                         @nacho4d
+/types/ibm_db/                                  @agov
+/types/icepick/                                 @ngbrown @tobico
+/types/icheck/                                  @qcz
+/types/iconv/                                   @delphinus35
+/types/ids/                                     @3fd
+/types/iframe-resizer/                          @arminbaljic
+/types/ignite-ui/                               @IgniteUI
+/types/ignore-styles/                           @tai2
+/types/iltorb/                                  @Alorel
+/types/image-size/                              @elisee
+/types/imagemagick/                             @soywiz
+/types/imagemagick-native/                      @horiuchi
+/types/imagemapster/                            @delphinus35
+/types/images/                                  @DingWeizhe
+/types/imagesloaded/                            @coldacid @apexskier
+/types/imap/                                    @psnider
+/types/imap-simple/                             @pushplay
+/types/imgur-rest-api/                          @lukewestby
+/types/immutability-helper/                     @seansfkelley
+/types/impress/                                 @borisyankov
+/types/in-range/                                @DanielRosenwasser
+/types/incremental-dom/                         @basarat @lanthaler @vvakame
+/types/indent-string/                           @mhegazy
+/types/inert/                                   @nycdotnet @AJamesPhillips
+/types/inflected/                               @dsci
+/types/inflection/                              @shiwano
+/types/inherits/                                @chrootsu
+/types/ini/                                     @marcinporebski
+/types/iniparser/                               @chrootsu
+/types/inline-css/                              @philipisapain
+/types/inline-style-prefixer/                   @ahz @dpetrezselyova
+/types/inquirer/                                @tkQubo @ppathan @jouderianjr
+/types/insert-module-globals/                   @leonard-thieu
+/types/insight/                                 @vvakame
+/types/integer/                                 @Morfent
+/types/interact.js/                             @dduugg @adidahiya @thasner
+/types/intercom-web/                            @fongandrew @salbahra
+/types/intercomjs/                              @spencerwi
+/types/internal-ip/                             @BendingBender
+/types/intl/                                    @RagibHasin
+/types/intl-messageformat/                      @mhegazy
+/types/intl-tel-input/                          @fdnhkj @leonard-thieu
+/types/into-stream/                             @BendingBender
+/types/intro.js/                                @anahkiasen
+/types/invariant/                               @bennett000
+/types/inversify-devtools/                      @inversify
+/types/ion.rangeslider/v1/                      @dduugg
+/types/ion.rangeslider/                         @sixinli
+/types/ioredis/                                 @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor
+/types/iota.lib.js/                             @fogsh
+/types/ip/                                      @codeanimal
+/types/ip-regex/                                @unindented
+/types/irc/                                     @phillips1012
+/types/iron/                                    @simonschick @rafaelsouzaf
+/types/is/                                      @cabralRodrigo
+/types/is-absolute-url/                         @mhegazy
+/types/is-alphanumerical/                       @vutran
+/types/is-archive/                              @mhegazy
+/types/is-array/                                @pine
+/types/is-binary-path/                          @DanielRosenwasser
+/types/is-compressed/                           @mhegazy
+/types/is-finite/                               @mhegazy
+/types/is-glob/                                 @mrmlnc
+/types/is-ip/                                   @coderslagoon
+/types/is-my-json-valid/                        @kruncher
+/types/is-negated-glob/                         @ajafff
+/types/is-number/                               @harryshipton
+/types/is-object/                               @wbhob
+/types/is-path-cwd/                             @DanielRosenwasser
+/types/is-path-in-cwd/                          @mhegazy
+/types/is-promise/                              @DanielRosenwasser
+/types/is-relative-url/                         @mhegazy
+/types/is-root/                                 @mhegazy
+/types/is-root-path/                            @mhegazy
+/types/is-scoped/                               @postcrafter
+/types/is-stream/                               @me
+/types/is-svg/                                  @BendingBender
+/types/is-text-path/                            @mhegazy
+/types/is-url/                                  @RyotaMurohoshi
+/types/is-url-superb/                           @kryops
+/types/is-windows/                              @mizunashi-mana
+/types/isbn-utils/                              @elhaard
+/types/iscroll/                                 @csrakowski
+/types/iso-3166-2/                              @sicilica
+/types/iso8601-localizer/                       @avielfedida
+/types/isomorphic-fetch/                        @toddlucas
+/types/isotope-layout/                          @avidenic
+/types/istanbul/                                @tkrotoff
+/types/istanbul-lib-coverage/                   @jason0x43
+/types/istanbul-lib-hook/                       @jason0x43
+/types/istanbul-lib-instrument/                 @jason0x43
+/types/istanbul-lib-report/                     @jason0x43
+/types/istanbul-lib-source-maps/                @jason0x43
+/types/istanbul-middleware/                     @hookclaw
+/types/istanbul-reports/                        @jason0x43
+/types/ityped/                                  @DanielRosenwasser
+/types/ix.js/                                   @Igorbek
+/types/jade/                                    @panuhorsmalahti
+/types/jalaali-js/                              @alitaheri
+/types/japanese-holidays/                       @syamatoo
+/types/jasmine/                                 @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software
+/types/jasmine-ajax/                            @lgrignon
+/types/jasmine-data_driven_tests/               @AnthonyMacKinnon
+/types/jasmine-enzyme/                          @bolatovumar
+/types/jasmine-es6-promise-matchers/            @stephenlautier
+/types/jasmine-fixture/                         @craigbrett17
+/types/jasmine-given/                           @shairez
+/types/jasmine-jquery/                          @gstamac
+/types/jasmine-matchers/                        @Bartvds
+/types/jasmine-node/                            @svi3c
+/types/jasmine-promise-matchers/                @matthewjh
+/types/jasmine_dom_matchers/                    @devoto13
+/types/jasminewd2/                              @sjelin
+/types/java/                                    @jimlloyd @hrl7
+/types/java-applet/                             @cyrilschumacher
+/types/javascript-astar/                        @ptlis
+/types/javascript-bignum/                       @sandersn
+/types/javascript-obfuscator/                   @sanex3339
+/types/javascript-state-machine/                @borisyankov @mdocter @MrBigDog2U @samael65535 @taoqf
+/types/jbinary/                                 @tbureck
+/types/jcanvas/                                 @rogierschouten
+/types/jdataview/                               @RReverser
+/types/jdenticon/                               @mtr
+/types/jest/v16/                                @NoHomey @jwbay
+/types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil
+/types/jest-diff/                               @myabc
+/types/jest-docblock/                           @ikatyang
+/types/jest-get-type/                           @myabc
+/types/jest-in-case/                            @geovanisouza92
+/types/jest-json-schema/                        @deadNightTiger
+/types/jest-matcher-utils/                      @myabc
+/types/jest-matchers/                           @joscha
+/types/jest-validate/                           @ikatyang
+/types/jfs/                                     @tlaziuk
+/types/jjv/                                     @Nemo157
+/types/jjve/                                    @Nemo157
+/types/jmespath/                                @pushplay
+/types/johnny-five/                             @nakakura
+/types/joi/v6/                                  @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
+/types/joi/v10/                                 @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku
+/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus
+/types/joigoose/                                @boothwhack
+/types/jpeg-js/                                 @DanielRosenwasser
+/types/jpm/                                     @github-account-because-they-want-it
+/types/jqgrid/                                  @lokeshpeta
+/types/jqrangeslider/                           @qcz
+/types/jquery/v1/                               @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
+/types/jquery/v2/                               @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
+/types/jquery/                                  @leonard-thieu @borisyankov @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @johnnyreilly @DickvdBrink @King2500
+/types/jquery-ajax-chain/                       @humana-fragilitas
+/types/jquery-alertable/                        @stever
+/types/jquery-backstretch/                      @dkulyk
+/types/jquery-cropbox/                          @PerKastman
+/types/jquery-deparam/                          @patsissons
+/types/jquery-easy-loading/                     @delphinus35
+/types/jquery-editable-select/                  @baywet
+/types/jquery-fullscreen/                       @bgrieder
+/types/jquery-galleria/                         @rimig
+/types/jquery-handsontable/                     @intelorca
+/types/jquery-jcrop/                            @joeskeen
+/types/jquery-jsonrpcclient/                    @Ty3uK
+/types/jquery-knob/                             @iain8
+/types/jquery-mask-plugin/                      @avidenic
+/types/jquery-match-height/                     @kbytesys
+/types/jquery-mockjax/                          @laszlojakab @vladeck
+/types/jquery-mousewheel/                       @xt0rted
+/types/jquery-notifier/                         @allipierre
+/types/jquery-param/                            @patsissons
+/types/jquery-sortable/                         @Seltzer
+/types/jquery-steps/                            @jblank @nickwph
+/types/jquery-timeentry/                        @marknadig
+/types/jquery-toastmessage-plugin/              @joeskeen
+/types/jquery-truncate-html/                    @abraaoalves
+/types/jquery-urlparam/                         @stpettersens
+/types/jquery-validation-unobtrusive/           @EnableSoftware
+/types/jquery.address/                          @martinduparc @mardaneus86
+/types/jquery.are-you-sure/                     @jonegerton
+/types/jquery.autosize/                         @kingdango
+/types/jquery.bbq/                              @sunetos
+/types/jquery.bootstrap.wizard/                 @niemyjski @dennisahlin
+/types/jquery.cleditor/                         @pushplay
+/types/jquery.clientsidelogging/                @diullei
+/types/jquery.color/                            @derekcicerone
+/types/jquery.colorbox/                         @gjunge
+/types/jquery.colorpicker/                      @pushplay
+/types/jquery.contextmenu/                      @nvivo
+/types/jquery.cookie/                           @RoyGoode @BenLorantfy
+/types/jquery.customselect/                     @adamcoulombe
+/types/jquery.cycle2/                           @dnadolny
+/types/jquery.dropotron/                        @cyrilschumacher
+/types/jquery.dynatree/                         @fdecampredon
+/types/jquery.elang/                            @sumegizoltan
+/types/jquery.fancytree/                        @alphaleonis @abedi-ir @Nitecube
+/types/jquery.filtertable/                      @totpero
+/types/jquery.finger/                           @maxackley
+/types/jquery.flagstrap/                        @felipedgarcia
+/types/jquery.fullscreen/                       @piraveen
+/types/jquery.gridster/                         @jbaldwin
+/types/jquery.growl/                            @yeganemehr
+/types/jquery.highlight-bartaz/                 @Pro
+/types/jquery.jnotify/                          @jamescurran
+/types/jquery.joyride/                          @vbortone
+/types/jquery.jsignature/                       @pjmagee
+/types/jquery.leanmodal/                        @FinelySliced
+/types/jquery.livestampjs/                      @vbortone
+/types/jquery.notify/                           @evil-shrike
+/types/jquery.notifybar/                        @zaneli
+/types/jquery.noty/                             @kingdango @thelfensdrfer
+/types/jquery.payment/                          @ejsmith @johnrutherford
+/types/jquery.pjax/                             @lijunle
+/types/jquery.placeholder/                      @majorsilence @EnableSoftware
+/types/jquery.pnotify/                          @DavidSichau @FUNExtreme
+/types/jquery.postmessage/                      @lijunle
+/types/jquery.prettyphoto/                      @pgaske
+/types/jquery.qrcode/                           @danmana
+/types/jquery.rateit/                           @gjunge
+/types/jquery.rowgrid/                          @vinayak-garg
+/types/jquery.scrollto/                         @nestalk
+/types/jquery.simplemodal/                      @ForNeVeR
+/types/jquery.simplepagination/                 @nvivo
+/types/jquery.simulate/                         @derekcicerone
+/types/jquery.slimscroll/                       @Promact
+/types/jquery.soap/                             @tigerxy
+/types/jquery.sortelements/                     @tbureck
+/types/jquery.superlink/                        @niemyjski
+/types/jquery.tagsmanager/                      @vbortone
+/types/jquery.tile/                             @zaneli
+/types/jquery.timepicker/                       @anwarjaved
+/types/jquery.timer/                            @JoshStrobl
+/types/jquery.tinycarousel/                     @csrakowski
+/types/jquery.tinyscrollbar/                    @csrakowski
+/types/jquery.tipsy/                            @bdukes
+/types/jquery.tools/                            @joeskeen
+/types/jquery.total-storage/                    @JeremyCBrooks
+/types/jquery.transit/                          @MrBigDog2U
+/types/jquery.ui.datetimepicker/                @dougajmcdonald
+/types/jquery.ui.layout/                        @Steve-Fenton @drarmstr
+/types/jquery.uniform/                          @flyfishMT
+/types/jquery.validation/                       @fdecampredon @johnnyreilly @avidenic
+/types/jquery.watermark/                        @anwarjaved
+/types/jquerymobile/                            @borisyankov
+/types/jqueryui/                                @borisyankov @johnnyreilly
+/types/js-base64/                               @DenisCarriere @tlent
+/types/js-beautify/                             @JoshuaKGoldberg @hansrwindhoff
+/types/js-clipper/                              @omni360
+/types/js-combinatorics/                        @outring
+/types/js-cookie/                               @theodorejb @BendingBender
+/types/js-data-angular/                         @reppners
+/types/js-fixtures/                             @kazimanzurrashid
+/types/js-git/                                  @Bartvds
+/types/js-md5/                                  @mwmccarthy
+/types/js-quantities/                           @wrummler
+/types/js-schema/                               @marcinporebski @roblabat
+/types/js-search/                               @guoyunhe
+/types/js-to-java/                              @skyitachi
+/types/js-url/                                  @pine613
+/types/js-yaml/                                 @Bartvds @sclausen
+/types/js.spec/                                 @mattbishop
+/types/jsbn/                                    @Evgenus @al2xed
+/types/jschannel/                               @yitzchok
+/types/jscrollpane/                             @qcz
+/types/jsdeferred/                              @minodisk
+/types/jsdom/                                   @leonard-thieu
+/types/jsen/                                    @vladeck
+/types/jsend/                                   @CaselIT
+/types/jsesc/                                   @Bartvds
+/types/jsfl/                                    @soywiz
+/types/jsforce/                                 @dolanmiu @netes
+/types/jshamcrest/                              @dharkness
+/types/jsmockito/                               @shiver-me-timbers
+/types/jsnox/                                   @stkb @DovydasNavickas
+/types/json-merge-patch/                        @senyaarseniy
+/types/json-patch/                              @vvakame
+/types/json-pointer/                            @Bartvds
+/types/json-query/                              @mtraynham
+/types/json-rpc-ws/                             @npenin @mlamp
+/types/json-schema/                             @bcherny @cyrilletuzi
+/types/json-socket/                             @svi3c
+/types/json-stable-stringify/                   @mhfrantz
+/types/json-stringify-safe/                     @BendingBender
+/types/json2md/                                 @MartynasZilinskas
+/types/jsonata/                                 @nick121212
+/types/jsoneditor/                              @alejo90
+/types/jsoneditoronline/                        @vbortone
+/types/jsonfile/                                @dbowring
+/types/jsonminify/                              @no23reason
+/types/jsonnet/                                 @hookclaw
+/types/jsonp/                                   @surenkov
+/types/jsonpath/                                @horiuchi @ikatyang
+/types/jsonrpc-serializer/                      @Akim95
+/types/jsonstream/                              @Bartvds
+/types/jsonwebtoken/                            @SomaticIT @danielheim @brikou
+/types/jspdf/                                   @amberjs
+/types/jsqrcode/                                @lordazzi
+/types/jsrender/                                @zakki
+/types/jsrp/                                    @harryshipton
+/types/jss/                                     @appsforartists @kof
+/types/jssha/                                   @randombk @SrTobi
+/types/jstimezonedetect/                        @olamothe
+/types/jstorage/                                @dflor003
+/types/jstree/                                  @adaskothebeast
+/types/jsts/                                    @StephaneAlie
+/types/jsuite/                                  @darrenhillconsulting
+/types/jsuri/                                   @coldacid @flqw
+/types/jsurl/                                   @agorshkov23
+/types/jsx-chai/                                @nupplaphil
+/types/jszip/                                   @mzeiher @forabi
+/types/jug/                                     @yevt
+/types/jui/                                     @easylogic
+/types/jui-core/                                @easylogic
+/types/jui-grid/                                @easylogic
+/types/jweixin/                                 @taoqf @gomydodo
+/types/jwplayer/                                @martinduparc @kutomer
+/types/jws/                                     @JustinBeckwith
+/types/jwt-client/                              @timoteoponce
+/types/jwt-decode/v1/                           @QuatroDevOfficial
+/types/jwt-decode/                              @GiedriusGrabauskas @madsmadsen
+/types/jwt-simple/                              @kenfdev @GaelMagnan
+/types/kafka-node/                              @dansitu @bkim54 @sfrooster @amiram
+/types/karma/                                   @tkrotoff @43081j
+/types/karma-chai/                              @JayAndCatchFire
+/types/karma-chai-sinon/                        @vasek17
+/types/karma-coverage/                          @tkrotoff
+/types/karma-fixture/                           @evictor
+/types/karma-jasmine/                           @michelsalib
+/types/karma-webpack/                           @mtraynham
+/types/katex/                                   @mrand01
+/types/kcors/                                   @Xstoudi @izayoiko
+/types/kdbush/                                  @DenisCarriere
+/types/kefir/                                   @AyaMorisawa @HitoriSensei
+/types/kendo-ui/                                @telerik
+/types/keyboardjs/                              @vbortone @piranha771
+/types/keygrip/                                 @jkeylu
+/types/keymaster/                               @nitram509
+/types/keymirror/                               @jfahrenkrug
+/types/keypress.js/                             @rcchen
+/types/keysym/                                  @harryshipton
+/types/keytar/                                  @miniak @shiftkey @juturu
+/types/kik-browser/                             @joelday
+/types/klaw/v1/                                 @mceachen
+/types/klaw/                                    @mceachen
+/types/klaw-sync/                               @shiftkey
+/types/knex/                                    @tkQubo @baronfel @MeLlamoPablo @mastermatt @micksatana
+/types/knex-postgis/                            @vesse
+/types/knockback/                               @borisyankov
+/types/knockout/                                @borisyankov @Igorbek @moonpyk @EnableSoftware @BenjaminEckardt @ffMathy
+/types/knockout-amd-helpers/                    @DavidSichau
+/types/knockout-secure-binding/                 @pine613
+/types/knockout-transformations/                @johnnyreilly @Nemo157
+/types/knockout.deferred.updates/               @sgaliano
+/types/knockout.editables/                      @borisyankov
+/types/knockout.es5/                            @sgaliano
+/types/knockout.kogrid/                         @huer12
+/types/knockout.mapper/                         @BMeyerKC
+/types/knockout.mapping/                        @borisyankov @ffMathy
+/types/knockout.projections/                    @johnnyreilly
+/types/knockout.punches/                        @johnnyreilly
+/types/knockout.rx/                             @Igorbek
+/types/knockout.validation/                     @danludwig
+/types/knockout.viewmodel/                      @oising
+/types/knockstrap/                              @adaskothebeast
+/types/knuddels-userapps-api/                   @Knuddels
+/types/ko.plus/                                 @conficient
+/types/koa/                                     @DavidCai1993 @jkeylu @brikou
+/types/koa-basic-auth/                          @Tobias4872
+/types/koa-bodyparser/                          @hellopao
+/types/koa-cache-control/                       @pe8ter
+/types/koa-compose/                             @jkeylu
+/types/koa-compress/                            @hellopao
+/types/koa-conditional-get/                     @wingsbob
+/types/koa-csrf/                                @haskaalo
+/types/koa-etag/                                @wingsbob
+/types/koa-favicon/                             @hellopao
+/types/koa-generic-session/                     @nsimmons @Ragg-
+/types/koa-hbs/                                 @jcbmln @mudkipme
+/types/koa-helmet/                              @me
+/types/koa-joi-router/                          @wingsbob
+/types/koa-json/                                @brooklyndev
+/types/koa-json-error/                          @mudkipme
+/types/koa-logger/                              @geoffreak @tlaziuk
+/types/koa-logger-winston/                      @stevehipwell
+/types/koa-morgan/                              @vesse
+/types/koa-mount/                               @amirsaber
+/types/koa-passport/                            @horiuchi @tlaziuk @brendtumi
+/types/koa-pino-logger/                         @khell
+/types/koa-pug/                                 @Xstoudi
+/types/koa-range/                               @strax
+/types/koa-redis/                               @nsimmons
+/types/koa-route/                               @migstopheles
+/types/koa-router/                              @hellopao @schfkt
+/types/koa-send/                                @pe8ter @tlaziuk
+/types/koa-session/                             @kerol2r20
+/types/koa-session-minimal/                     @longztian
+/types/koa-sslify/                              @wingsbob
+/types/koa-static/                              @hellopao @tlaziuk
+/types/koa-views/                               @brooklyndev
+/types/koa-webpack/                             @malj
+/types/koa-websocket/                           @me
+/types/koa2-cors/                               @xialeistudio
+/types/koa__cors/                               @Xstoudi @izayoiko @stevehipwell
+/types/kolite/                                  @borisyankov
+/types/konami.js/                               @mareek
+/types/kraken-js/                               @darkwebdev
+/types/kramed/                                  @tonicblue
+/types/kss/                                     @giladgray
+/types/kue/                                     @drudge @amiram @pc-jedi
+/types/kurento-utils/                           @nenadalm
+/types/kuromoji/                                @mzsm @kgtkr
+/types/lab/                                     @prashaantt
+/types/ladda/                                   @dflor003 @leemicw
+/types/lasso/                                   @darkwebdev
+/types/later/                                   @jasond-s
+/types/latinize/                                @GiedriusGrabauskas
+/types/latlon-geohash/                          @rimig
+/types/launchpad/                               @rictic
+/types/lazy.js/                                 @Bartvds
+/types/lazypipe/                                @tomc974
+/types/ldapjs/                                  @cvillemure @peterkooijmans
+/types/leadfoot/                                @theintern
+/types/leaflet/v0/                              @rgripper
+/types/leaflet/                                 @alejo90 @atd-schubert
+/types/leaflet-areaselect/                      @awallat
+/types/leaflet-curve/                           @onikiienko
+/types/leaflet-draw/                            @matt-guest @reblace @YunS-Stacy
+/types/leaflet-editable/                        @dalie
+/types/leaflet-fullscreen/                      @DenisCarriere
+/types/leaflet-geocoder-mapzen/                 @leezu
+/types/leaflet-gpx/                             @soucekv
+/types/leaflet-imageoverlay-rotated/            @tkleinke
+/types/leaflet-label/                           @Nemo157
+/types/leaflet-polylinedecorator/               @soucekv
+/types/leaflet-providers/                       @BendingBender
+/types/leaflet-rotatedmarker/                   @robert-prib-polestar
+/types/leaflet.awesome-markers/v0/              @Odrin @sebek64
+/types/leaflet.awesome-markers/                 @sebek64
+/types/leaflet.fullscreen/                      @wcomartin
+/types/leaflet.gridlayer.googlemutant/          @ernest-rhinozeros
+/types/leaflet.heat/                            @onderceylan
+/types/leaflet.locatecontrol/                   @DenisCarriere
+/types/leaflet.markercluster/                   @rimig
+/types/leaflet.markercluster.layersupport/      @AsamK
+/types/leaflet.mouseposition/                   @Hanyon
+/types/leaflet.pancontrol/                      @Brictarus
+/types/leaflet.pm/                              @tkleinke
+/types/leaflet.polylinemeasure/                 @RiON69
+/types/leapmotionts/                            @logotype
+/types/legal-eagle/                             @j-f1
+/types/less/                                    @thasner @pranaygp
+/types/less-middleware/                         @federicobond
+/types/less2sass/                               @gatimus
+/types/lestate/                                 @thelambdaparty
+/types/level-sublevel/                          @basp
+/types/leveldown/                               @tarruda
+/types/levelup/                                 @blittle @tarruda
+/types/leven/                                   @jmalonzo
+/types/levenshtein/                             @geoffreak
+/types/libpq/                                   @Lodin
+/types/libxmljs/                                @fdecampredon
+/types/libxslt/                                 @alejo90
+/types/license-checker/                         @rogierschouten @unindented
+/types/lil-uuid/                                @Pr1st0n
+/types/lime-js/                                 @arthur-xavier
+/types/line-by-line/                            @etomsen
+/types/line-reader/                             @stpettersens
+/types/linkify-it/                              @praxxis
+/types/linq4js/                                 @morrisjdev
+/types/lls/                                     @borislavjivkov
+/types/load-json-file/                          @SamVerschueren
+/types/loader-runner/                           @e-cloud
+/types/loader-utils/                            @Perlmint @TotooriaHyperion
+/types/loadware/                                @ALyman
+/types/lobibox/                                 @itboy87
+/types/local-dynamo/                            @Sicilica
+/types/localforage-cordovasqlitedriver/         @thgreasi
+/types/localized-countries/                     @coderslagoon
+/types/localizejs-library/                      @salbahra
+/types/locate-path/                             @me
+/types/lockfile/v0/                             @Bartvds
+/types/lockfile/                                @Bartvds @BendingBender
+/types/lockr/                                   @droritos
+/types/locutus/                                 @hookclaw
+/types/lodash/v3/                               @bczengel @chrootsu
+/types/lodash/                                  @bczengel @chrootsu @stepancar @ericanderson @aj-r @ailrun @e-cloud @thorn0 @jtmthf
+/types/lodash-es/                               @stephenlautier @e-cloud
+/types/lodash-webpack-plugin/                   @bumbleblym
+/types/lodash.add/                              @bczengel @chrootsu @stepancar
+/types/lodash.after/                            @bczengel @chrootsu @stepancar
+/types/lodash.ary/                              @bczengel @chrootsu @stepancar
+/types/lodash.assign/                           @bczengel @chrootsu @stepancar
+/types/lodash.assignin/                         @bczengel @chrootsu @stepancar
+/types/lodash.assigninwith/                     @bczengel @chrootsu @stepancar
+/types/lodash.assignwith/                       @bczengel @chrootsu @stepancar
+/types/lodash.at/                               @bczengel @chrootsu @stepancar
+/types/lodash.attempt/                          @bczengel @chrootsu @stepancar
+/types/lodash.before/                           @bczengel @chrootsu @stepancar
+/types/lodash.bind/                             @bczengel @chrootsu @stepancar
+/types/lodash.bindall/                          @bczengel @chrootsu @stepancar
+/types/lodash.bindkey/                          @bczengel @chrootsu @stepancar
+/types/lodash.camelcase/                        @bczengel @chrootsu @stepancar
+/types/lodash.capitalize/                       @bczengel @chrootsu @stepancar
+/types/lodash.castarray/                        @bczengel @chrootsu @stepancar
+/types/lodash.ceil/                             @bczengel @chrootsu @stepancar
+/types/lodash.chunk/                            @bczengel @chrootsu @stepancar
+/types/lodash.clamp/                            @bczengel @chrootsu @stepancar
+/types/lodash.clone/                            @bczengel @chrootsu @stepancar
+/types/lodash.clonedeep/                        @bczengel @chrootsu @stepancar
+/types/lodash.clonedeepwith/                    @bczengel @chrootsu @stepancar
+/types/lodash.clonewith/                        @bczengel @chrootsu @stepancar
+/types/lodash.compact/                          @bczengel @chrootsu @stepancar
+/types/lodash.concat/                           @bczengel @chrootsu @stepancar
+/types/lodash.cond/                             @bczengel @chrootsu @stepancar
+/types/lodash.constant/                         @bczengel @chrootsu @stepancar
+/types/lodash.countby/                          @bczengel @chrootsu @stepancar
+/types/lodash.create/                           @bczengel @chrootsu @stepancar
+/types/lodash.curry/                            @bczengel @chrootsu @stepancar
+/types/lodash.curryright/                       @bczengel @chrootsu @stepancar
+/types/lodash.debounce/                         @bczengel @chrootsu @stepancar
+/types/lodash.deburr/                           @bczengel @chrootsu @stepancar
+/types/lodash.defaults/                         @bczengel @chrootsu @stepancar
+/types/lodash.defaultsdeep/                     @bczengel @chrootsu @stepancar
+/types/lodash.defer/                            @bczengel @chrootsu @stepancar
+/types/lodash.delay/                            @bczengel @chrootsu @stepancar
+/types/lodash.difference/                       @bczengel @chrootsu @stepancar
+/types/lodash.differenceby/                     @bczengel @chrootsu @stepancar
+/types/lodash.differencewith/                   @bczengel @chrootsu @stepancar
+/types/lodash.divide/                           @bczengel @chrootsu @stepancar
+/types/lodash.drop/                             @bczengel @chrootsu @stepancar
+/types/lodash.dropright/                        @bczengel @chrootsu @stepancar
+/types/lodash.droprightwhile/                   @bczengel @chrootsu @stepancar
+/types/lodash.dropwhile/                        @bczengel @chrootsu @stepancar
+/types/lodash.endswith/                         @bczengel @chrootsu @stepancar
+/types/lodash.eq/                               @bczengel @chrootsu @stepancar
+/types/lodash.escape/                           @bczengel @chrootsu @stepancar
+/types/lodash.escaperegexp/                     @bczengel @chrootsu @stepancar
+/types/lodash.every/                            @bczengel @chrootsu @stepancar
+/types/lodash.fill/                             @bczengel @chrootsu @stepancar
+/types/lodash.filter/                           @bczengel @chrootsu @stepancar
+/types/lodash.find/                             @bczengel @chrootsu @stepancar
+/types/lodash.findindex/                        @bczengel @chrootsu @stepancar
+/types/lodash.findkey/                          @bczengel @chrootsu @stepancar
+/types/lodash.findlast/                         @bczengel @chrootsu @stepancar
+/types/lodash.findlastindex/                    @bczengel @chrootsu @stepancar
+/types/lodash.findlastkey/                      @bczengel @chrootsu @stepancar
+/types/lodash.first/                            @bczengel @chrootsu @stepancar
+/types/lodash.flatmap/                          @bczengel @chrootsu @stepancar
+/types/lodash.flatmapdeep/                      @bczengel @chrootsu @stepancar
+/types/lodash.flatmapdepth/                     @bczengel @chrootsu @stepancar
+/types/lodash.flatten/                          @bczengel @chrootsu @stepancar
+/types/lodash.flattendeep/                      @bczengel @chrootsu @stepancar
+/types/lodash.flattendepth/                     @bczengel @chrootsu @stepancar
+/types/lodash.flip/                             @bczengel @chrootsu @stepancar
+/types/lodash.floor/                            @bczengel @chrootsu @stepancar
+/types/lodash.flow/                             @bczengel @chrootsu @stepancar
+/types/lodash.flowright/                        @bczengel @chrootsu @stepancar
+/types/lodash.foreach/                          @bczengel @chrootsu @stepancar
+/types/lodash.foreachright/                     @bczengel @chrootsu @stepancar
+/types/lodash.forin/                            @bczengel @chrootsu @stepancar
+/types/lodash.forinright/                       @bczengel @chrootsu @stepancar
+/types/lodash.forown/                           @bczengel @chrootsu @stepancar
+/types/lodash.forownright/                      @bczengel @chrootsu @stepancar
+/types/lodash.frompairs/                        @bczengel @chrootsu @stepancar
+/types/lodash.functions/                        @bczengel @chrootsu @stepancar
+/types/lodash.functionsin/                      @bczengel @chrootsu @stepancar
+/types/lodash.get/                              @bczengel @chrootsu @stepancar
+/types/lodash.groupby/                          @bczengel @chrootsu @stepancar
+/types/lodash.gt/                               @bczengel @chrootsu @stepancar
+/types/lodash.gte/                              @bczengel @chrootsu @stepancar
+/types/lodash.has/                              @bczengel @chrootsu @stepancar
+/types/lodash.hasin/                            @bczengel @chrootsu @stepancar
+/types/lodash.head/                             @bczengel @chrootsu @stepancar
+/types/lodash.identity/                         @bczengel @chrootsu @stepancar
+/types/lodash.includes/                         @bczengel @chrootsu @stepancar
+/types/lodash.indexof/                          @bczengel @chrootsu @stepancar
+/types/lodash.initial/                          @bczengel @chrootsu @stepancar
+/types/lodash.inrange/                          @bczengel @chrootsu @stepancar
+/types/lodash.intersection/                     @bczengel @chrootsu @stepancar
+/types/lodash.intersectionby/                   @bczengel @chrootsu @stepancar
+/types/lodash.intersectionwith/                 @bczengel @chrootsu @stepancar
+/types/lodash.invert/                           @bczengel @chrootsu @stepancar
+/types/lodash.invertby/                         @bczengel @chrootsu @stepancar
+/types/lodash.invoke/                           @bczengel @chrootsu @stepancar
+/types/lodash.invokemap/                        @bczengel @chrootsu @stepancar
+/types/lodash.isarguments/                      @bczengel @chrootsu @stepancar
+/types/lodash.isarray/                          @bczengel @chrootsu @stepancar
+/types/lodash.isarraybuffer/                    @bczengel @chrootsu @stepancar
+/types/lodash.isarraylike/                      @bczengel @chrootsu @stepancar
+/types/lodash.isarraylikeobject/                @bczengel @chrootsu @stepancar
+/types/lodash.isboolean/                        @bczengel @chrootsu @stepancar
+/types/lodash.isbuffer/                         @bczengel @chrootsu @stepancar
+/types/lodash.isdate/                           @bczengel @chrootsu @stepancar
+/types/lodash.iselement/                        @bczengel @chrootsu @stepancar
+/types/lodash.isempty/                          @bczengel @chrootsu @stepancar
+/types/lodash.isequal/                          @bczengel @chrootsu @stepancar
+/types/lodash.isequalwith/                      @bczengel @chrootsu @stepancar
+/types/lodash.iserror/                          @bczengel @chrootsu @stepancar
+/types/lodash.isfinite/                         @bczengel @chrootsu @stepancar
+/types/lodash.isfunction/                       @bczengel @chrootsu @stepancar
+/types/lodash.isinteger/                        @bczengel @chrootsu @stepancar
+/types/lodash.islength/                         @bczengel @chrootsu @stepancar
+/types/lodash.ismap/                            @bczengel @chrootsu @stepancar
+/types/lodash.ismatch/                          @bczengel @chrootsu @stepancar
+/types/lodash.ismatchwith/                      @bczengel @chrootsu @stepancar
+/types/lodash.isnan/                            @bczengel @chrootsu @stepancar
+/types/lodash.isnative/                         @bczengel @chrootsu @stepancar
+/types/lodash.isnil/                            @bczengel @chrootsu @stepancar
+/types/lodash.isnull/                           @bczengel @chrootsu @stepancar
+/types/lodash.isnumber/                         @bczengel @chrootsu @stepancar
+/types/lodash.isobject/                         @bczengel @chrootsu @stepancar
+/types/lodash.isobjectlike/                     @bczengel @chrootsu @stepancar
+/types/lodash.isplainobject/                    @bczengel @chrootsu @stepancar
+/types/lodash.isregexp/                         @bczengel @chrootsu @stepancar
+/types/lodash.issafeinteger/                    @bczengel @chrootsu @stepancar
+/types/lodash.isset/                            @bczengel @chrootsu @stepancar
+/types/lodash.isstring/                         @bczengel @chrootsu @stepancar
+/types/lodash.issymbol/                         @bczengel @chrootsu @stepancar
+/types/lodash.istypedarray/                     @bczengel @chrootsu @stepancar
+/types/lodash.isundefined/                      @bczengel @chrootsu @stepancar
+/types/lodash.isweakmap/                        @bczengel @chrootsu @stepancar
+/types/lodash.isweakset/                        @bczengel @chrootsu @stepancar
+/types/lodash.iteratee/                         @bczengel @chrootsu @stepancar
+/types/lodash.join/                             @bczengel @chrootsu @stepancar
+/types/lodash.kebabcase/                        @bczengel @chrootsu @stepancar
+/types/lodash.keyby/                            @bczengel @chrootsu @stepancar
+/types/lodash.keys/                             @bczengel @chrootsu @stepancar
+/types/lodash.keysin/                           @bczengel @chrootsu @stepancar
+/types/lodash.last/                             @bczengel @chrootsu @stepancar
+/types/lodash.lastindexof/                      @bczengel @chrootsu @stepancar
+/types/lodash.lowercase/                        @bczengel @chrootsu @stepancar
+/types/lodash.lowerfirst/                       @bczengel @chrootsu @stepancar
+/types/lodash.lt/                               @bczengel @chrootsu @stepancar
+/types/lodash.lte/                              @bczengel @chrootsu @stepancar
+/types/lodash.mapkeys/                          @bczengel @chrootsu @stepancar
+/types/lodash.mapvalues/                        @bczengel @chrootsu @stepancar
+/types/lodash.matches/                          @bczengel @chrootsu @stepancar
+/types/lodash.matchesproperty/                  @bczengel @chrootsu @stepancar
+/types/lodash.max/                              @bczengel @chrootsu @stepancar
+/types/lodash.maxby/                            @bczengel @chrootsu @stepancar
+/types/lodash.mean/                             @bczengel @chrootsu @stepancar
+/types/lodash.meanby/                           @bczengel @chrootsu @stepancar
+/types/lodash.memoize/                          @bczengel @chrootsu @stepancar
+/types/lodash.merge/                            @bczengel @chrootsu @stepancar
+/types/lodash.mergewith/                        @bczengel @chrootsu @stepancar
+/types/lodash.method/                           @bczengel @chrootsu @stepancar
+/types/lodash.methodof/                         @bczengel @chrootsu @stepancar
+/types/lodash.min/                              @bczengel @chrootsu @stepancar
+/types/lodash.minby/                            @bczengel @chrootsu @stepancar
+/types/lodash.mixin/                            @bczengel @chrootsu @stepancar
+/types/lodash.negate/                           @bczengel @chrootsu @stepancar
+/types/lodash.noop/                             @bczengel @chrootsu @stepancar
+/types/lodash.now/                              @bczengel @chrootsu @stepancar
+/types/lodash.nth/                              @bczengel @chrootsu @stepancar
+/types/lodash.ntharg/                           @bczengel @chrootsu @stepancar
+/types/lodash.omit/                             @bczengel @chrootsu @stepancar
+/types/lodash.omitby/                           @bczengel @chrootsu @stepancar
+/types/lodash.once/                             @bczengel @chrootsu @stepancar
+/types/lodash.orderby/                          @bczengel @chrootsu @stepancar
+/types/lodash.over/                             @bczengel @chrootsu @stepancar
+/types/lodash.overargs/                         @bczengel @chrootsu @stepancar
+/types/lodash.overevery/                        @bczengel @chrootsu @stepancar
+/types/lodash.oversome/                         @bczengel @chrootsu @stepancar
+/types/lodash.pad/                              @bczengel @chrootsu @stepancar
+/types/lodash.padend/                           @bczengel @chrootsu @stepancar
+/types/lodash.padstart/                         @bczengel @chrootsu @stepancar
+/types/lodash.parseint/                         @bczengel @chrootsu @stepancar
+/types/lodash.partial/                          @bczengel @chrootsu @stepancar
+/types/lodash.partialright/                     @bczengel @chrootsu @stepancar
+/types/lodash.partition/                        @bczengel @chrootsu @stepancar
+/types/lodash.pick/                             @bczengel @chrootsu @stepancar
+/types/lodash.pickby/                           @bczengel @chrootsu @stepancar
+/types/lodash.property/                         @bczengel @chrootsu @stepancar
+/types/lodash.propertyof/                       @bczengel @chrootsu @stepancar
+/types/lodash.pull/                             @bczengel @chrootsu @stepancar
+/types/lodash.pullall/                          @bczengel @chrootsu @stepancar
+/types/lodash.pullallby/                        @bczengel @chrootsu @stepancar
+/types/lodash.pullallwith/                      @bczengel @chrootsu @stepancar
+/types/lodash.pullat/                           @bczengel @chrootsu @stepancar
+/types/lodash.random/                           @bczengel @chrootsu @stepancar
+/types/lodash.range/                            @bczengel @chrootsu @stepancar
+/types/lodash.rangeright/                       @bczengel @chrootsu @stepancar
+/types/lodash.rearg/                            @bczengel @chrootsu @stepancar
+/types/lodash.reduce/                           @bczengel @chrootsu @stepancar
+/types/lodash.reduceright/                      @bczengel @chrootsu @stepancar
+/types/lodash.reject/                           @bczengel @chrootsu @stepancar
+/types/lodash.remove/                           @bczengel @chrootsu @stepancar
+/types/lodash.repeat/                           @bczengel @chrootsu @stepancar
+/types/lodash.replace/                          @bczengel @chrootsu @stepancar
+/types/lodash.rest/                             @bczengel @chrootsu @stepancar
+/types/lodash.result/                           @bczengel @chrootsu @stepancar
+/types/lodash.reverse/                          @bczengel @chrootsu @stepancar
+/types/lodash.round/                            @bczengel @chrootsu @stepancar
+/types/lodash.sample/                           @bczengel @chrootsu @stepancar
+/types/lodash.samplesize/                       @bczengel @chrootsu @stepancar
+/types/lodash.set/                              @bczengel @chrootsu @stepancar
+/types/lodash.setwith/                          @bczengel @chrootsu @stepancar
+/types/lodash.shuffle/                          @bczengel @chrootsu @stepancar
+/types/lodash.size/                             @bczengel @chrootsu @stepancar
+/types/lodash.slice/                            @bczengel @chrootsu @stepancar
+/types/lodash.snakecase/                        @bczengel @chrootsu @stepancar
+/types/lodash.some/                             @bczengel @chrootsu @stepancar
+/types/lodash.sortby/                           @bczengel @chrootsu @stepancar
+/types/lodash.sortedindex/                      @bczengel @chrootsu @stepancar
+/types/lodash.sortedindexby/                    @bczengel @chrootsu @stepancar
+/types/lodash.sortedindexof/                    @bczengel @chrootsu @stepancar
+/types/lodash.sortedlastindex/                  @bczengel @chrootsu @stepancar
+/types/lodash.sortedlastindexby/                @bczengel @chrootsu @stepancar
+/types/lodash.sortedlastindexof/                @bczengel @chrootsu @stepancar
+/types/lodash.sorteduniq/                       @bczengel @chrootsu @stepancar
+/types/lodash.sorteduniqby/                     @bczengel @chrootsu @stepancar
+/types/lodash.split/                            @bczengel @chrootsu @stepancar
+/types/lodash.spread/                           @bczengel @chrootsu @stepancar
+/types/lodash.startcase/                        @bczengel @chrootsu @stepancar
+/types/lodash.startswith/                       @bczengel @chrootsu @stepancar
+/types/lodash.subtract/                         @bczengel @chrootsu @stepancar
+/types/lodash.sum/                              @bczengel @chrootsu @stepancar
+/types/lodash.sumby/                            @bczengel @chrootsu @stepancar
+/types/lodash.tail/                             @bczengel @chrootsu @stepancar
+/types/lodash.take/                             @bczengel @chrootsu @stepancar
+/types/lodash.takeright/                        @bczengel @chrootsu @stepancar
+/types/lodash.takerightwhile/                   @bczengel @chrootsu @stepancar
+/types/lodash.takewhile/                        @bczengel @chrootsu @stepancar
+/types/lodash.template/                         @bczengel @chrootsu @stepancar
+/types/lodash.throttle/                         @bczengel @chrootsu @stepancar
+/types/lodash.times/                            @bczengel @chrootsu @stepancar
+/types/lodash.toarray/                          @bczengel @chrootsu @stepancar
+/types/lodash.tofinite/                         @bczengel @chrootsu @stepancar
+/types/lodash.tointeger/                        @bczengel @chrootsu @stepancar
+/types/lodash.tolength/                         @bczengel @chrootsu @stepancar
+/types/lodash.tolower/                          @bczengel @chrootsu @stepancar
+/types/lodash.tonumber/                         @bczengel @chrootsu @stepancar
+/types/lodash.topairs/                          @bczengel @chrootsu @stepancar
+/types/lodash.topairsin/                        @bczengel @chrootsu @stepancar
+/types/lodash.topath/                           @bczengel @chrootsu @stepancar
+/types/lodash.toplainobject/                    @bczengel @chrootsu @stepancar
+/types/lodash.tosafeinteger/                    @bczengel @chrootsu @stepancar
+/types/lodash.tostring/                         @bczengel @chrootsu @stepancar
+/types/lodash.toupper/                          @bczengel @chrootsu @stepancar
+/types/lodash.transform/                        @bczengel @chrootsu @stepancar
+/types/lodash.trim/                             @bczengel @chrootsu @stepancar
+/types/lodash.trimend/                          @bczengel @chrootsu @stepancar
+/types/lodash.trimstart/                        @bczengel @chrootsu @stepancar
+/types/lodash.truncate/                         @bczengel @chrootsu @stepancar
+/types/lodash.unary/                            @bczengel @chrootsu @stepancar
+/types/lodash.unescape/                         @bczengel @chrootsu @stepancar
+/types/lodash.union/                            @bczengel @chrootsu @stepancar
+/types/lodash.unionby/                          @bczengel @chrootsu @stepancar
+/types/lodash.unionwith/                        @bczengel @chrootsu @stepancar
+/types/lodash.uniq/                             @bczengel @chrootsu @stepancar
+/types/lodash.uniqby/                           @bczengel @chrootsu @stepancar
+/types/lodash.uniqueid/                         @bczengel @chrootsu @stepancar
+/types/lodash.uniqwith/                         @bczengel @chrootsu @stepancar
+/types/lodash.unset/                            @bczengel @chrootsu @stepancar
+/types/lodash.unzip/                            @bczengel @chrootsu @stepancar
+/types/lodash.unzipwith/                        @bczengel @chrootsu @stepancar
+/types/lodash.update/                           @bczengel @chrootsu @stepancar
+/types/lodash.updatewith/                       @bczengel @chrootsu @stepancar
+/types/lodash.uppercase/                        @bczengel @chrootsu @stepancar
+/types/lodash.upperfirst/                       @bczengel @chrootsu @stepancar
+/types/lodash.values/                           @bczengel @chrootsu @stepancar
+/types/lodash.valuesin/                         @bczengel @chrootsu @stepancar
+/types/lodash.without/                          @bczengel @chrootsu @stepancar
+/types/lodash.words/                            @bczengel @chrootsu @stepancar
+/types/lodash.wrap/                             @bczengel @chrootsu @stepancar
+/types/lodash.xor/                              @bczengel @chrootsu @stepancar
+/types/lodash.xorby/                            @bczengel @chrootsu @stepancar
+/types/lodash.xorwith/                          @bczengel @chrootsu @stepancar
+/types/lodash.zip/                              @bczengel @chrootsu @stepancar
+/types/lodash.zipobject/                        @bczengel @chrootsu @stepancar
+/types/lodash.zipobjectdeep/                    @bczengel @chrootsu @stepancar
+/types/lodash.zipwith/                          @bczengel @chrootsu @stepancar
+/types/log-symbols/                             @BendingBender
+/types/log-update/                              @BendingBender
+/types/logat/                                   @krvikash35
+/types/logg/                                    @blittle
+/types/loggly/                                  @rmartone @geoffreak
+/types/loglevel/                                @Pro @szmeti @screendriver
+/types/logrotate-stream/                        @rogierschouten
+/types/lokijs/                                  @TeamworkGuy2
+/types/lolex/                                   @Nemo157 @joshuakgoldberg @rogierschouten
+/types/long/                                    @peterkooijmans
+/types/loopback/                                @kattsushi @enko @sequoia @drmikecrowe
+/types/loopback-boot/                           @kattsushi
+/types/lorem-ipsum/                             @durad
+/types/lory.js/                                 @kubosho @milkisevil
+/types/loud-rejection/                          @BendingBender
+/types/lovefield/                               @freshp86
+/types/lowdb/                                   @typicode @niieani
+/types/lowlight/                                @NoHomey
+/types/lozad/                                   @plantain-00
+/types/lru-cache/                               @Bartvds @BendingBender
+/types/lscache/                                 @Chris-Martinezz
+/types/ltx/                                     @PJakcson
+/types/luaparse/                                @stpettersens
+/types/lunr/v0/                                 @sebastian-lenz
+/types/lunr/                                    @seantanly
+/types/lusca/                                   @crutchcorn
+/types/luxon/                                   @colbydehart @FourwingsY
+/types/lwip/                                    @AyaMorisawa
+/types/lz-string/                               @M0ns1gn0r
+/types/magic-number/                            @stpettersens
+/types/magicsuggest/                            @leonardochaia
+/types/magnet-uri/                              @tlaziuk
+/types/mailcheck/                               @pocesar
+/types/maildev/                                 @cyrilschumacher @zbarbuto
+/types/mailgen/                                 @vothanhkiet @jordanfarrer
+/types/mailparser/                              @psnider
+/types/main-bower-files/                        @k-kagurazaka
+/types/make-dir/                                @ikatyang @BendingBender
+/types/maker.js/                                @danmarshall
+/types/mandrill-api/                            @pocesar
+/types/map-obj/                                 @BendingBender
+/types/mapbox/                                  @anahkiasen
+/types/mapbox-gl/                               @dobrud @patrickr
+/types/mapbox__shelf-pack/                      @Perlmint
+/types/mapnik/                                  @ipv4sec
+/types/mapsjs/                                  @davismj
+/types/mariasql/                                @bennett000
+/types/mark.js/                                 @renjfk
+/types/markdown-it/                             @rapropos
+/types/markdown-it-anchor/                      @seryl
+/types/markdown-it-container/                   @hronex
+/types/markdownlint/                            @ark120202
+/types/marked/                                  @worr @BendingBender
+/types/marker-animate-unobtrusive/              @viskin
+/types/markerclustererplus/                     @enanox @mxl
+/types/markitup/                                @drillbits
+/types/maskedinput/                             @lokeshpeta
+/types/masonry-layout/                          @m-a-wilson @warriorrocker
+/types/massive/v3/                              @swissspidy @clarenceh
+/types/massive/                                 @swissspidy @clarenceh @AmazingTurtle
+/types/match-media-mock/                        @asvetliakov
+/types/material-design-lite/                    @bradzacher
+/types/material-ui/                             @ngbrown @theigor @alitaheri @herrmanno @DaIgeb @allienna @schlesingermatthias @InsidersByte @artyomsv @dan-j @minodisk
+/types/material-ui-datatables/                  @coding2012
+/types/materialize-css/v0/                      @eriklieben @leonyu @SinghSukhdeep @jfcere @scote
+/types/materialize-css/                         @huww98
+/types/math3d/                                  @laszlojakab @jimsmart
+/types/mathjax/                                 @rolandzwaga
+/types/mathjs/                                  @siavol
+/types/matter-js/                               @piranha771
+/types/maxmind/                                 @geoffreak
+/types/mcustomscrollbar/                        @flurg
+/types/md5/                                     @arcdev1 @jprogrammer
+/types/mdns/                                    @reppners
+/types/mdurl/                                   @rokt33r
+/types/media-typer/                             @BendingBender
+/types/medium-editor/                           @keika299
+/types/mem/                                     @SamVerschueren
+/types/memcached/                               @KentarouTakeda
+/types/memoizee/                                @juanpicado
+/types/memory-cache/                            @jedigo @thieman
+/types/memory-fs/                               @e-cloud
+/types/memwatch-next/                           @cyrilschumacher
+/types/meow/                                    @KnisterPeter
+/types/merge-descriptors/                       @danny8002
+/types/merge-stream/                            @k-kagurazaka @daniel-zazula
+/types/merge2/                                  @tkrotoff @smac89
+/types/mersenne-twister/                        @KentarouTakeda
+/types/meshblu/                                 @fnipo
+/types/mess/                                    @Nemo157
+/types/messenger/                               @derekcicerone
+/types/meteor/                                  @barbatus @fullflavedave @orefalo @dagatsoin @birkskyum @ardatan @stefanholzapfel
+/types/meteor-accounts-phone/                   @DAB0mB
+/types/meteor-collection-hooks/                 @twastvedt
+/types/meteor-jboulhous-dev/                    @vangorra
+/types/meteor-persistent-session/               @vangorra
+/types/meteor-prime8consulting-oauth2/          @vangorra
+/types/meteor-publish-composite/                @vangorra
+/types/meteor-roles/                            @vangorra
+/types/method-override/                         @santialbo
+/types/methods/                                 @cprecioso
+/types/metric-suffix/                           @davidm77
+/types/mfiles/                                  @avonwyss
+/types/micro/                                   @kaoDev
+/types/micromatch/v2/                           @glen-84
+/types/micromatch/                              @glen-84 @vemoo
+/types/microrouter/                             @mathieudutour
+/types/microsoft-ajax/                          @pjmagee
+/types/microsoft-live-connect/                  @jvilk
+/types/microsoft-sdk-soap/                      @markusmauch
+/types/microsoftteams/                          @WrathOfZombies @jayongg @ydogandjiev
+/types/microtime/                               @vincekovacs
+/types/milkcocoa/                               @odangosan
+/types/mime/                                    @jedigo @dhritzkiv
+/types/mime-db/                                 @AJamesPhillips
+/types/mime-types/                              @Perlmint
+/types/mimos/                                   @AJamesPhillips
+/types/mina/                                    @lhk @mattanja @kant2002
+/types/minimatch/                               @vvakame @shantmarouti
+/types/minimist/                                @Bartvds @Necroskillz @kamranayub
+/types/minimist-options/                        @ikatyang
+/types/minipass/                                @BendingBender
+/types/mirrorx/                                 @aaronphy
+/types/mithril/                                 @spacejack @andraaspar @isiahmeadows
+/types/mithril-global/                          @spacejack @isiahmeadows
+/types/mitm/                                    @alejo90
+/types/mixpanel/                                @hjellek @Manduro
+/types/mixto/                                   @vvakame
+/types/mkdirp/                                  @Bartvds @mrmlnc
+/types/mkpath/                                  @optical
+/types/mobx-apollo/                             @pselden
+/types/mocha/                                   @kazimanzurrashid @otiai10 @jt000 @enlight
+/types/mocha-phantomjs/                         @ErikSchierboom
+/types/mochaccino/                              @thomas-p
+/types/mock-aws-s3/                             @bluehatbrit
+/types/mock-fs/                                 @Nemo157 @tkqubo
+/types/mock-knex/                               @jessezhang91
+/types/mock-raf/                                @djpereira
+/types/mock-require/                            @gDelgado14
+/types/mockdate/                                @brunolm
+/types/mockery/                                 @jt000
+/types/modernizr/                               @borisyankov @theodorejb @leonyu @lucax88x @nhardy
+/types/modesl/                                  @neeschit
+/types/moji/                                    @yasupeke
+/types/moment-business/                         @wonbyte
+/types/moment-business-time/                    @swist
+/types/moment-duration-format/                  @SwintDC @TwoStone @leonard-thieu
+/types/moment-holiday/                          @rwdalpe
+/types/moment-jalaali/                          @alitaheri
+/types/moment-range/                            @Burgov @wilgert @franjuan @MartynasZilinskas
+/types/moment-round/                            @jacobbaskin
+/types/moment-strftime2/                        @dex4er
+/types/moment-timezone/                         @michelsalib @alanblins
+/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi
+/types/mongoose/                                @simonxca @horiuchi @sindrenm @lukasz-zak
+/types/mongoose-auto-increment/                 @AyaMorisawa
+/types/mongoose-deep-populate/                  @AyaMorisawa
+/types/mongoose-geojson-schema/                 @bondz
+/types/mongoose-mock/                           @jt000
+/types/mongoose-paginate/                       @linusbrolin @simonxca
+/types/mongoose-promise/                        @simonxca
+/types/mongoose-seeder/                         @Crevil
+/types/mongoose-sequence/                       @linusbrolin
+/types/mongoose-simple-random/                  @rsxdalv
+/types/mongoose-unique-validator/               @stevehipwell
+/types/moo/                                     @deltaidea @MofX
+/types/moonjs/                                  @DanielRosenwasser
+/types/morgan/                                  @staticfunction @pscanf
+/types/morris.js/                               @mareek @sindilevich
+/types/mousetrap/                               @qcz
+/types/move-concurrently/                       @mgroenhoff
+/types/moviedb/                                 @basarat @0x6368656174
+/types/moxios/                                  @itoasuka
+/types/mpromise/                                @sgkim126
+/types/mri/                                     @shiftkey @j-f1
+/types/ms/                                      @danny8002
+/types/msgpack-lite/                            @endel @efokschaner
+/types/msgpack5/                                @wokim @heycalmdown
+/types/msnodesql/                               @borisyankov @SomaticIT
+/types/msportalfx-test/                         @julioct
+/types/mssql/                                   @jaminfarr @buzinas @mrrichar @elhaard @pkeuter
+/types/mu2/                                     @jedigo
+/types/multer/                                  @jt000 @DavidBR-SW @mxl @hyunseob
+/types/multer-gridfs-storage/v1/                @devconcept
+/types/multer-gridfs-storage/                   @devconcept
+/types/multer-s3/                               @tcaesvk @galtalmor
+/types/multi-typeof/                            @mhegazy
+/types/multimatch/                              @stephenlautier
+/types/multiparty/                              @kenfdev
+/types/multiplexjs/                             @KamyarNazeri
+/types/multisort/                               @CzBuCHi
+/types/multistream/                             @mrmlnc
+/types/murmurhash-js/                           @cvle
+/types/murmurhash3js/                           @dlee-nvisia
+/types/musicmetadata/                           @Xstoudi
+/types/mustache/                                @markashleybell
+/types/mv/                                      @nenadalm
+/types/mysql/                                   @wjohnsto @kacepe @kpping
+/types/mz/                                      @ThomasHickman
+/types/n3/                                      @phreed
+/types/nano/                                    @timjacobi @vincekovacs
+/types/nanoajax/                                @nathancahill
+/types/nanomsg/                                 @titan
+/types/nanoscroller/                            @zihark17
+/types/nanp/                                    @karn
+/types/nats-hemera/                             @vforv
+/types/natsort/                                 @mgroenhoff
+/types/natural/                                 @dmoonfire
+/types/natural-sort/                            @a-morales
+/types/navigation/                              @grahammendick
+/types/navigation-react/                        @grahammendick
+/types/navigo/                                  @aersamkull
+/types/nblas/                                   @erikgerrits
+/types/nconf/                                   @jedigo @jmthibault
+/types/ncp/                                     @bartvds
+/types/ndarray/                                 @pawsong @taoqf
+/types/nearley/                                 @deltaidea @BendingBender
+/types/nedb/                                    @reppners @anthonynichols
+/types/nedb-logger/                             @thisboyiscrazy
+/types/needle/v0/                               @bigsan
+/types/needle/v1/                               @bigsan @nikeee
+/types/needle/                                  @bigsan @nikeee @sindilevich
+/types/negotiator/                              @BendingBender
+/types/neo4j/                                   @cyrilschumacher
+/types/nes/                                     @NoHomey @saboya
+/types/net-keepalive/                           @hertzg
+/types/netmask/                                 @mhfrantz
+/types/nexpect/                                 @vvakame
+/types/next/                                    @dru89 @brikou
+/types/next-redux-wrapper/                      @stevegeek
+/types/ng-command/                              @stephenlautier
+/types/ng-cordova/                              @ksachdeva
+/types/ng-dialog/                               @stephenlautier
+/types/ng-facebook/                             @Crevil
+/types/ng-file-upload/                          @johnnyreilly @thewarpaint
+/types/ng-flow/                                 @ryan10132
+/types/ng-grid/                                 @smithkl42 @rolandzwaga @kentcooper
+/types/ng-i18next/                              @cyrilschumacher
+/types/ng-notify/                               @nzamosenchuk
+/types/ng-stomp/                                @lpotapczuk
+/types/ngbootbox/                               @stpettersens
+/types/ngeohash/                                @erkie
+/types/ngkookies/                               @martinmcwhorter
+/types/ngmap/                                   @nkovacic
+/types/ngprogress/                              @martinmcwhorter
+/types/ngprogress-lite/                         @LukeForder
+/types/ngreact/                                 @velveret
+/types/ngstorage/                               @kubiq
+/types/ngtoaster/                               @btesser
+/types/ngwysiwyg/                               @patrick-mackay
+/types/nightmare/                               @horiuchi @samyang-au
+/types/nightwatch/                              @rkavalap @schlesiger
+/types/noble/                                   @swook @wind-rider @shantanubhadoria @lukel99 @bioball @keton
+/types/nock/                                    @bonnici @horiuchi @afharo @mastermatt
+/types/nodal/                                   @charrondev
+/types/node/v4/                                 @eps1lon
+/types/node/v6/                                 @WilcoBakker @inlined @eps1lon
+/types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon
+/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno
+/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff
+/types/node-7z/                                 @erkie
+/types/node-array-ext/                          @Beng89
+/types/node-cache/                              @chrootsu @dthunell @useltmann
+/types/node-calendar/                           @luzianz
+/types/node-cleanup/                            @agadar
+/types/node-common-errors/                      @icopp
+/types/node-dir/                                @panuhorsmalahti
+/types/node-dogstatsd/                          @chrisbobo
+/types/node-emoji/                              @jonestristand @styu
+/types/node-fetch/                              @torstenwerner
+/types/node-fibers/                             @caryhaynie
+/types/node-forge/                              @westy92 @flynetworks @a-k-g @rafal2228
+/types/node-gcm/                                @horiuchi
+/types/node-geocoder/                           @rosek86
+/types/node-getopt/                             @kcauchy
+/types/node-hid/                                @mhegazy @ert78gb
+/types/node-horseman/                           @apratheek
+/types/node-hue-api/                            @fjmorel
+/types/node-int64/                              @x3cion @kevin-greene-ck
+/types/node-ipc/                                @arvitaly
+/types/node-jsfl-runner/                        @mrand01
+/types/node-json-db/                            @kuzn-ilya
+/types/node-mysql-wrapper/                      @kataras
+/types/node-notifier/                           @tkQubo
+/types/node-pg-migrate/                         @bradleyayers
+/types/node-polyglot/                           @timjk
+/types/node-powershell/                         @rodrigoff
+/types/node-ral/                                @ssddi456
+/types/node-red/                                @andersea
+/types/node-rsa/                                @alitaheri
+/types/node-schedule/                           @cyrilschumacher @flowpl
+/types/node-slack/                              @tkQubo
+/types/node-snap7/                              @heilingbrunner
+/types/node-sprite-generator/                   @Perlmint
+/types/node-static/                             @Morfent
+/types/node-statsd/                             @alexturek @convoyinc
+/types/node-telegram-bot-api/                   @ammuench @agadar @Dabolus
+/types/node-uuid/                               @jeffmay
+/types/node-validator/                          @kengorab
+/types/node-vault/                              @YuJianrong
+/types/node-waves/                              @stephenlautier
+/types/node-wit/                                @julienduf
+/types/node-xmpp-client/                        @PJakcson
+/types/node-xmpp-core/                          @PJakcson
+/types/node-zookeeper-client/                   @plantain-00 @jessezhang91
+/types/node_redis/                              @borisyankov
+/types/nodegit/                                 @dolanmiu
+/types/nodemailer/v3/                           @rogierschouten
+/types/nodemailer/                              @rogierschouten @dex4er
+/types/nodemailer-direct-transport/             @rogierschouten
+/types/nodemailer-mailgun-transport/            @otociulis
+/types/nodemailer-pickup-transport/             @psnider
+/types/nodemailer-ses-transport/                @westy92
+/types/nodemailer-smtp-pool/                    @rogierschouten
+/types/nodemailer-smtp-transport/               @rogierschouten
+/types/nodemailer-stub-transport/               @cyrilschumacher
+/types/nodeunit/                                @jedigo
+/types/noisejs/                                 @izmhr
+/types/nomnom/                                  @panopticoncentral
+/types/nopt/                                    @jbondc
+/types/normalize-package-data/                  @jdxcode
+/types/normalize-url/                           @odin3 @BendingBender
+/types/notie/                                   @mateusdemboski
+/types/notify/                                  @hellochar
+/types/notifyjs/                                @soundTricker
+/types/notifyjs-browser/                        @bahman616
+/types/notyf/                                   @gurov
+/types/nouislider/v7/                           @acoreyj
+/types/nouislider/v8/                           @bleuarg
+/types/nouislider/                              @bleuarg @lagaffe
+/types/novnc-core/                              @smithkl42 @BendingBender
+/types/npm/                                     @SomaticIT
+/types/npm-package-arg/                         @mgroenhoff
+/types/ns-api/                                  @Archcry
+/types/nslog/                                   @unindented
+/types/nsqjs/                                   @cezaryrk
+/types/number-is-nan/                           @mhegazy
+/types/number-to-words/                         @frederickfogerty
+/types/numeral/                                 @vbortone
+/types/numjs/                                   @taoqf
+/types/nunjucks/                                @RubenSlabbert
+/types/nunjucks-date/                           @kruncher
+/types/nvd3/                                    @PjMitchell
+/types/nw.gui/                                  @xperiments
+/types/nw.js/                                   @alirdn
+/types/o.js/                                    @IceOnFire @bradzacher @janhommes @jcchalte
+/types/oauth.js/                                @nobuoka
+/types/oauth2-server/                           @vangorra @cirick
+/types/oauth2orize/                             @wokim @heycalmdown @stevehipwell
+/types/obelisk.js/                              @bdrupieski
+/types/object-assign/                           @chbrown
+/types/object-diff/                             @rogierschouten
+/types/object-hash/                             @misak113
+/types/object-inspect/                          @demurgos
+/types/object-map/                              @wolfgang42
+/types/object-path/                             @pocesar
+/types/object-refs/                             @3fd
+/types/oblo-util/                               @Oblosys
+/types/oboe/                                    @optical
+/types/observe-js/                              @herrmanno
+/types/oclazyload/                              @rolandzwaga
+/types/odata/                                   @janhommes @jcchalte
+/types/ofe/                                     @Morfent
+/types/office-js/                               @OfficeDev @LanceEA
+/types/offline-js/                              @cgwrench
+/types/oibackoff/                               @geoffreak
+/types/oidc-token-manager/                      @rosieks
+/types/on-finished/                             @czechboy0 @BendingBender
+/types/on-headers/                              @jjeffery @BendingBender
+/types/once/                                    @denis-sokolov @BendingBender
+/types/onesignal-cordova-plugin/                @broder
+/types/onetime/                                 @BendingBender
+/types/oniguruma/                               @smhxx
+/types/onoff/                                   @marcel-ernst
+/types/open/                                    @Bartvds
+/types/opener/                                  @tikurahul
+/types/openfin/                                 @chrisbarker
+/types/openjscad/                               @danmarshall
+/types/openlayers/v2/                           @bolhovsky
+/types/openlayers/v3/                           @osechet @matthiasdailey-ccri
+/types/openlayers/                              @osechet @wb14123 @ailrun @mylen @iamthechad @danmana
+/types/openstack-wrapper/                       @sanjaymadane
+/types/opentok/                                 @westy92 @CatGuardian
+/types/opentype.js/                             @danmarshall
+/types/opn/                                     @shinnn @SomaticIT @tlent
+/types/optics-agent/                            @crevil
+/types/optimist/                                @soywiz @chbrown
+/types/optimize-css-assets-webpack-plugin/      @odnamrataizem
+/types/ora/v0/                                  @screendriver
+/types/ora/                                     @basarat @screendriver @BendingBender
+/types/oracledb/                                @Bigous
+/types/orchestrator/                            @tkQubo @TeamworkGuy2
+/types/orderedmap/                              @bradleyayers
+/types/orientjs/                                @saeedtabrizi
+/types/os-homedir/                              @mhegazy
+/types/os-locale/v1/                            @AyaMorisawa @BendingBender
+/types/os-locale/                               @AyaMorisawa @BendingBender
+/types/os-name/                                 @BendingBender
+/types/os-tmpdir/                               @mhegazy
+/types/osmosis/                                 @jurajkocan
+/types/osmtogeojson/                            @tkqubo
+/types/osrm/                                    @DenisCarriere
+/types/otplib/                                  @renjfk
+/types/owasp-password-strength-test/            @stephtr
+/types/owl.carousel/                            @igorissen @KennethanCeyer
+/types/owlcarousel/                             @dpiatkowski
+/types/p-all/                                   @BendingBender
+/types/p-any/                                   @BendingBender
+/types/p-cancelable/                            @BendingBender
+/types/p-debounce/                              @BendingBender
+/types/p-defer/                                 @SamVerschueren
+/types/p-do-whilst/                             @BendingBender
+/types/p-each-series/                           @BendingBender
+/types/p-event/                                 @BendingBender
+/types/p-every/                                 @BendingBender
+/types/p-lazy/                                  @BendingBender
+/types/p-limit/                                 @BendingBender
+/types/p-locate/                                @BendingBender
+/types/p-log/                                   @BendingBender
+/types/p-map/                                   @BendingBender
+/types/p-map-series/                            @BendingBender
+/types/p-one/                                   @BendingBender
+/types/p-props/                                 @BendingBender
+/types/p-queue/                                 @BendingBender @evanshortiss
+/types/p-reduce/                                @BendingBender
+/types/p-reflect/                               @BendingBender
+/types/p-retry/                                 @BendingBender
+/types/p-series/                                @BendingBender
+/types/p-settle/                                @natesilva
+/types/p-some/                                  @BendingBender
+/types/p-tap/                                   @BendingBender
+/types/p-throttle/                              @BendingBender
+/types/p-timeout/                               @BendingBender
+/types/p-try/                                   @BendingBender
+/types/p-wait-for/                              @BendingBender
+/types/p-whilst/                                @BendingBender
+/types/p2/                                      @clark-stevenson
+/types/package-json/                            @jinwoo
+/types/packery/                                 @piraveen @hanssens
+/types/pad/                                     @mhegazy
+/types/paho-mqtt/                               @amikhalev
+/types/pako/                                    @cappellin @calebegg
+/types/pangu/                                   @plantain-00
+/types/papaparse/                               @torpedro @rainshen49 @jfloff @johnnyreilly
+/types/paper/                                   @clark-stevenson @Xakaloz
+/types/paralleljs/                              @jbaldwin
+/types/parent-package-json/                     @sgmccli
+/types/parse/                                   @dpoetzsch @jaeggerr @flavionegrao
+/types/parse-git-config/                        @leonard-thieu
+/types/parse-glob/                              @glen-84
+/types/parse-json/                              @mrmlnc
+/types/parse-link-header/                       @zelein
+/types/parse-mockdb/                            @dpoetzsch
+/types/parse-ms/                                @Roaders
+/types/parse-torrent/                           @niieani @tlaziuk
+/types/parse-torrent-file/                      @tlaziuk
+/types/parse-unit/                              @Jack-Works
+/types/parseurl/                                @bomret
+/types/parsimmon/                               @Bartvds @mizunashi-mana @bcherny @bvanreeven @leonard-thieu
+/types/passport/                                @horiuchi @enaeseth @theigor @tlaziuk
+/types/passport-anonymous/                      @0x6368656174
+/types/passport-beam/                           @AtlasDev
+/types/passport-discord/                        @kzay
+/types/passport-facebook/                       @staticfunction @lucasmacosta
+/types/passport-facebook-token/                 @rmartone @mrand01
+/types/passport-github/                         @yasupeke
+/types/passport-github2/                        @yasupeke @mthmulders
+/types/passport-google-oauth/                   @staticfunction
+/types/passport-google-oauth2/                  @bluehatbrit
+/types/passport-http/                           @krizalys
+/types/passport-http-bearer/                    @isman-usoh
+/types/passport-local/                          @SomaticIT
+/types/passport-local-mongoose/                 @linusbrolin
+/types/passport-oauth2/                         @pasieronen
+/types/passport-oauth2-client-password/         @akaNightmare
+/types/passport-saml/                           @cjbarth
+/types/passport-steam/                          @kzay
+/types/passport-strategy/                       @liorm
+/types/passport-twitter/                        @staticfunction
+/types/passport-unique-token/                   @briman0094 @SomaticIT
+/types/password-hash/                           @mugeso
+/types/password-hash-and-salt/                  @alitaheri
+/types/path-exists/v1/                          @shiwano
+/types/path-exists/                             @shiwano @BendingBender
+/types/path-is-absolute/                        @mhegazy
+/types/pathfinding/                             @BNedry
+/types/pathjs/                                  @lokeshpeta
+/types/pathwatcher/                             @GlenCFL
+/types/pause/                                   @BendingBender
+/types/payment/                                 @apare
+/types/paypal-cordova-plugin/                   @Justin-Credible
+/types/paypal-rest-sdk/                         @trainerbill
+/types/pbf/                                     @cschwarz
+/types/pdfjs-dist/                              @jbaldwin
+/types/pdfkit/                                  @erichillah
+/types/pdfobject/                               @nielsboogaard
+/types/pebblekitjs/                             @makotokw
+/types/peer-dial/                               @RealTYPICAL
+/types/peerjs/                                  @nakakura
+/types/pegjs/                                   @vvakame @SrTobi @siegebell
+/types/pem/                                     @tony19 @DethAriel
+/types/persona/                                 @Nycto
+/types/pet-finder-api/                          @me
+/types/pg/v6/                                   @pspeter3
+/types/pg/                                      @pspeter3
+/types/pg-ears/                                 @bradleyayers
+/types/pg-escape/                               @khell
+/types/pg-pool/                                 @aleung
+/types/pg-query-stream/                         @asmarques
+/types/pg-types/                                @waratuman
+/types/pgwmodal/                                @pine613
+/types/phantom/                                 @horiuchi @llRandom
+/types/phantomcss/                              @abauzac
+/types/phantomjs/                               @jedhunsaker @keesey
+/types/phoenix/                                 @mciastek
+/types/phone/                                   @DxCx
+/types/phone-formatter/                         @westy92
+/types/phonegap/                                @borisyankov @DickvdBrink
+/types/phonegap-facebook-plugin/                @Justin-Credible
+/types/phonegap-nfc/                            @michaeldesigaud
+/types/phonon/                                  @kserin
+/types/photonui/                                @florentpoujol
+/types/photoswipe/                              @hellochar
+/types/physijs/                                 @gyohk
+/types/pi-spi/                                  @marcel-ernst
+/types/pick-weight/                             @rsxdalv
+/types/pickadate/                               @theodorejb @leonard-thieu
+/types/picturefill/                             @alaz
+/types/pidusage/                                @cyrilschumacher
+/types/pify/                                    @samverschueren @mad-mike
+/types/pigpio/                                  @manerfan
+/types/pikaday/                                 @MidnightDesign @wake42
+/types/pikaday-time/                            @Sayan751
+/types/pinkyswear/                              @chances
+/types/pino/v3/                                 @psnider
+/types/pino/                                    @psnider @BendingBender
+/types/pino-multi-stream/                       @JakeGinnivan
+/types/pinterest-sdk/                           @adamburmister
+/types/pinyin/                                  @wanganjun
+/types/piwik-tracker/                           @lbguilherme
+/types/pixelmatch/                              @iamolegga
+/types/pkg-dir/                                 @NK-WEB-Git
+/types/pkijs/                                   @microshine
+/types/platform/                                @JakeH
+/types/playcanvas/                              @Neoflash1979
+/types/playerframework/                         @ricardosabino
+/types/pleasejs/                                @nakakura
+/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf
+/types/plugapi/                                 @BNedry
+/types/plugin-error/                            @rogierschouten
+/types/plupload/                                @patrickbussmann
+/types/pluralize/                               @ukyo
+/types/png-async/                               @kanreisa
+/types/pngjs/                                   @jason0x43
+/types/podcast/                                 @nikeee
+/types/podium/                                  @AJamesPhillips
+/types/point-in-polygon/                        @dyst5422 @kogai
+/types/polylabel/                               @DenisCarriere
+/types/polyline/                                @Kern0
+/types/polymer/                                 @lgrignon @laco0416
+/types/polymer-ts/                              @lgrignon
+/types/popcorn/                                 @grapswiz
+/types/portscanner/                             @douglasduteil
+/types/postal/                                  @lokeshpeta @myitcv
+/types/postmark/                                @benbayard
+/types/pouch-redux-middleware/                  @charrondev
+/types/pouchdb/                                 @AGBrown @geppy @fredgalvao
+/types/pouchdb-adapter-fruitdown/               @spaulg @geppy @fredgalvao
+/types/pouchdb-adapter-http/                    @spaulg @geppy @fredgalvao
+/types/pouchdb-adapter-idb/                     @spaulg @geppy @fredgalvao
+/types/pouchdb-adapter-leveldb/                 @spaulg @geppy @fredgalvao
+/types/pouchdb-adapter-localstorage/            @spaulg @geppy @fredgalvao
+/types/pouchdb-adapter-memory/                  @spaulg @geppy @fredgalvao
+/types/pouchdb-adapter-node-websql/             @spaulg @geppy @fredgalvao
+/types/pouchdb-adapter-websql/                  @spaulg @geppy @fredgalvao
+/types/pouchdb-browser/                         @spaulg @geppy @fredgalvao
+/types/pouchdb-core/                            @spaulg @trubit @geppy @fredgalvao @TobiasBales
+/types/pouchdb-find/                            @trubit
+/types/pouchdb-http/                            @spaulg @geppy @fredgalvao
+/types/pouchdb-mapreduce/                       @spaulg @geppy @fredgalvao
+/types/pouchdb-node/                            @spaulg @geppy @fredgalvao
+/types/pouchdb-replication/                     @trubit
+/types/pouchdb-upsert/                          @keithdmoore @hotforfeature @apolkingg8
+/types/power-assert/                            @vvakame
+/types/power-assert-formatter/                  @vvakame
+/types/precise/                                 @codeanimal
+/types/precond/                                 @olsio
+/types/preloadjs/                               @endel
+/types/prelude-ls/                              @AyaMorisawa
+/types/prettier/                                @ikatyang
+/types/pretty-bytes/                            @plantain-00
+/types/pretty-format/                           @ikatyang
+/types/pretty-ms/                               @BendingBender
+/types/printf/                                  @AluisioASG
+/types/priorityqueuejs/                         @geoffreak
+/types/prismjs/                                 @eriklieben @andrewiggins @mmiszy
+/types/private-ip/                              @coderslagoon
+/types/procfs-stats/                            @cyrilschumacher
+/types/progress/                                @sebastian-lenz
+/types/progressbar/                             @atd-schubert
+/types/progressjs/                              @zaneli
+/types/proj4/                                   @DenisCarriere
+/types/proj4leaflet/                            @BendingBender
+/types/project-oxford/                          @scsouthw
+/types/promise-dag/                             @OSjoerdWie
+/types/promise-pg/                              @coldacid
+/types/promise-polyfill/                        @skysteve
+/types/promise-pool/                            @vilic
+/types/promise-retry/                           @shirakaba
+/types/promise.prototype.finally/               @slavik57 @BendingBender
+/types/promised-temp/                           @rokadias
+/types/promisify-node/                          @borekb
+/types/promisify-supertest/                     @aleung
+/types/prompt-sync/                             @MugeSo
+/types/prompt-sync-history/                     @MugeSo
+/types/promptly/                                @danrspencer
+/types/prop-types/                              @DovydasNavickas
+/types/properties-reader/                       @Goldsmith42
+/types/prosemirror-collab/                      @bradleyayers @davidka @timjb
+/types/prosemirror-commands/                    @bradleyayers @davidka @timjb
+/types/prosemirror-gapcursor/                   @bradleyayers @davidka @timjb
+/types/prosemirror-history/                     @bradleyayers @davidka @timjb
+/types/prosemirror-inputrules/                  @bradleyayers @davidka @timjb
+/types/prosemirror-keymap/                      @bradleyayers @davidka @timjb
+/types/prosemirror-markdown/                    @bradleyayers @davidka @timjb
+/types/prosemirror-menu/                        @bradleyayers @davidka @timjb
+/types/prosemirror-model/                       @bradleyayers @davidka @timjb
+/types/prosemirror-schema-basic/                @bradleyayers @davidka @timjb
+/types/prosemirror-schema-list/                 @bradleyayers @davidka @timjb
+/types/prosemirror-state/                       @bradleyayers @davidka @timjb
+/types/prosemirror-tables/                      @superchu @eshvedai
+/types/prosemirror-transform/                   @bradleyayers @davidka @timjb
+/types/prosemirror-view/                        @bradleyayers @davidka @timjb
+/types/protractor-browser-logs/                 @rokadias
+/types/protractor-helpers/                      @johncant
+/types/protractor-http-mock/                    @Crevil
+/types/provinces/                               @gatimus
+/types/proxy-addr/                              @BendingBender
+/types/proxyquire/                              @jt000
+/types/pty.js/                                  @enlight
+/types/public-ip/                               @BendingBender
+/types/pubnub/                                  @bitbankinc @rollymaduk
+/types/pubsub-js/                               @borisyankov
+/types/pug/                                     @TonyPythoneer @19majkel94
+/types/pulltorefreshjs/                         @DanielRosenwasser
+/types/pump/                                    @tlaziuk
+/types/pupa/                                    @nju33
+/types/puppeteer/                               @marvinhagemeister @cdeutsch
+/types/pure-render-decorator/                   @seansfkelley
+/types/purl/                                    @danfma
+/types/pusher-js/                               @tkqubo
+/types/pvutils/                                 @microshine
+/types/python-shell/                            @dolanmiu
+/types/q/v0/                                    @bnemetchek @johnnyreilly
+/types/q/                                       @bnemetchek @AndrewGaspar @johnnyreilly @mboudreau
+/types/q-io/                                    @Bartvds
+/types/q-retry/                                 @vilic
+/types/qhistory/                                @Kovensky
+/types/qlik/                                    @RubenSlabbert @AginicX
+/types/qlik-engineapi/                          @konne
+/types/qlik-visualizationextensions/            @konne
+/types/qr-image/                                @taoqf
+/types/qrcode.react/                            @mleko
+/types/qs/                                      @RWander @leonyu @tehbelinda @zyml @artursvonda @CarlosBonetti
+/types/qtip2/                                   @Seltzer @leonard-thieu
+/types/query-string/                            @SamVerschueren @tkrotoff @huhuanming
+/types/quick-lru/                               @BendingBender
+/types/quill/                                   @sumitkm @guillaume-ro-fr @43081j
+/types/quixote/                                 @greybax
+/types/qunit/v1/                                @diullei
+/types/qunit/                                   @waratuman
+/types/quoted-printable/                        @pushplay
+/types/qwest/                                   @lindsayevans
+/types/r-script/                                @NaridaL
+/types/rabbit.js/                               @wokim
+/types/radium/                                  @alexgorbatchev @nupplaphil @asvetliakov @mihe
+/types/radius/                                  @codeanimal
+/types/ramda/                                   @donnut @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @charlespwd @samsonkeung @angeloocana @raynerd @googol @moshensky
+/types/random-js/                               @pistacchio
+/types/random-seed/                             @endel
+/types/random-string/                           @stpettersens
+/types/randomcolor/                             @feitzi @BradyLiles
+/types/range-parser/                            @tlaziuk
+/types/rangyinputs/                             @ersimont
+/types/raphael/                                 @CheCoxshall
+/types/rappid/                                  @DenEwout
+/types/raspi/                                   @nebrius
+/types/raspi-board/                             @nebrius
+/types/raspi-peripheral/                        @nebrius
+/types/ratelimiter/                             @AyaMorisawa
+/types/raty/                                    @terrawheat
+/types/raven/                                   @scttcper @1999
+/types/raven-for-redux/                         @chiubaka
+/types/raygun4js/                               @xt0rted @BenjaminHarding
+/types/rbac-a/                                  @tlaziuk
+/types/rc/                                      @DanielRosenwasser
+/types/rc-select/                               @DenisTirilis
+/types/rc-slider/                               @mantasmarcinkus @mattoni @paustint @j-fro
+/types/rc-tree/                                 @johnnyreilly
+/types/rcloader/                                @panuhorsmalahti
+/types/rdf-data-model/                          @rubensworks
+/types/rdf-js/                                  @rubensworks
+/types/react/v15/                               @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz
+/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @richseviora @theruther4d
+/types/react-alert/                             @ssyrell
+/types/react-alice-carousel/                    @endigo
+/types/react-app/                               @prakarshpandey
+/types/react-aria-menubutton/                   @forabi @crohlfs
+/types/react-autosuggest/                       @nicolas-schmitt @pjo256 @robessog @tbayne @cdeutsch @rosskevin
+/types/react-beautiful-dnd/                     @varHarrie @bradleyayers
+/types/react-body-classname/                    @mhegazy
+/types/react-bootstrap/                         @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall
+/types/react-bootstrap-date-picker/             @LKay @ssi-hu-antal-bodnar
+/types/react-bootstrap-daterangepicker/         @ianks
+/types/react-bootstrap-table/v2/                @flaub @alelode @UJosue10
+/types/react-bootstrap-table/                   @flaub @alelode @UJosue10 @dawnmist @Ogglas
+/types/react-bootstrap-typeahead/               @Guymestef
+/types/react-breadcrumbs/                       @KostyaEsmukov
+/types/react-breadcrumbs-dynamic/               @mitsuruog
+/types/react-broadcast/                         @kandros
+/types/react-burger-menu/                       @radziksh
+/types/react-calendar-heatmap/                  @9renpoto
+/types/react-calendar-timeline/                 @radziksh
+/types/react-cartographer/                      @trevonmckay
+/types/react-codemirror/                        @velveret @rudi-c
+/types/react-collapse/                          @Kimahriman
+/types/react-color/                             @LKay @markspolakovs @mntdn
+/types/react-confirm/                           @santiagodoldan
+/types/react-content-loader/                    @alaatm
+/types/react-copy-to-clipboard/                 @mabels
+/types/react-cropper/                           @stepancar
+/types/react-css-modules/                       @KostyaEsmukov @skirsdeda
+/types/react-css-transition-replace/            @LKay
+/types/react-custom-scrollbars/v3/              @David-LeBlanc-git
+/types/react-custom-scrollbars/                 @David-LeBlanc-git @kittimiyo
+/types/react-data-grid/v1/                      @SupernaviX
+/types/react-data-grid/                         @SupernaviX @KieranPeat @martinnov92
+/types/react-datagrid/                          @stephenjelfs
+/types/react-date-range/                        @Junbong
+/types/react-datepicker/                        @radziksh @andrewBalekha @smrq @Rogach @royxue
+/types/react-daterange-picker/                  @uncovertruth @MartynasZilinskas
+/types/react-dates/                             @Artur-A
+/types/react-daum-postcode/                     @Sa-ryong
+/types/react-dnd-html5-backend/                 @oizie
+/types/react-dnd-multi-backend/                 @dawnmist
+/types/react-dnd-test-backend/                  @gustavohenke
+/types/react-dnd-touch-backend/                 @mleko @dawnmist
+/types/react-document-title/                    @cleverguy25
+/types/react-dom/v15/                           @MartynasZilinskas
+/types/react-dom/                               @MartynasZilinskas @theruther4d
+/types/react-dom-factories/                     @jgoz
+/types/react-dropzone/v2/                       @matdube @LynxEyes @goblindegook @benbayard
+/types/react-dropzone/v3/                       @matdube @LynxEyes @goblindegook @benbayard @LKay
+/types/react-dropzone/                          @matdube @LynxEyes @goblindegook @benbayard @LKay @codeaid @jurosh
+/types/react-easy-chart/                        @danzel
+/types/react-event-listener/                    @asvetliakov
+/types/react-fa/                                @flaub @patsissons @LKay
+/types/react-facebook-login/                    @apare @jankarres
+/types/react-faux-dom/                          @alitaheri @cleverguy25
+/types/react-file-input/                        @dmitryrogozhny
+/types/react-file-reader-input/                 @dmitryrogozhny @alitaheri
+/types/react-flatpickr/                         @begincalendar
+/types/react-flex/                              @pushplay
+/types/react-flexr/                             @pushplay
+/types/react-fontawesome/                       @timurrustamov @dublicator @vincaslt @gavingregory
+/types/react-form/v1/                           @cameron-mcateer
+/types/react-form/                              @cameron-mcateer
+/types/react-foundation/                        @danielearwicker
+/types/react-geosuggest/                        @brmenchl
+/types/react-google-recaptcha/                  @KoalaHuman
+/types/react-gravatar/                          @invliD
+/types/react-grid-layout/                       @abirkholz @alitaheri @ZheyangSong @andrewhathaway
+/types/react-hamburger-menu/                    @grzesie2k
+/types/react-helmet/v4/                         @evanbb @isman-usoh
+/types/react-helmet/                            @evanbb @isman-usoh @lith-light-g @sammkj @yuit
+/types/react-highlight-words/                   @mhegazy
+/types/react-highlighter/                       @oizie
+/types/react-holder/                            @isman-usoh
+/types/react-hot-loader/                        @jacekjagiello
+/types/react-hyperscript/                       @tock203
+/types/react-i18next/v1/                        @KostyaEsmukov
+/types/react-i18next/v4/                        @GiedriusGrabauskas
+/types/react-i18next/                           @GiedriusGrabauskas @chnoch
+/types/react-icon-base/                         @apare @LKay
+/types/react-icons/                             @apare @johnnyreilly @LKay
+/types/react-image-gallery/                     @adamwpc
+/types/react-imageloader/                       @stephenjelfs
+/types/react-infinite/                          @rhysd
+/types/react-infinite-scroller/                 @Lapanti @psrebniak
+/types/react-input-calendar/                    @stepancar
+/types/react-input-mask/                        @apare
+/types/react-intl/v1/                           @bgrieder
+/types/react-intl/                              @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari
+/types/react-intl-redux/                        @LKay
+/types/react-is-deprecated/                     @seansfkelley
+/types/react-joyride/                           @DanielRosenwasser @bendxn
+/types/react-json/                              @spielc
+/types/react-json-pretty/                       @LKay
+/types/react-json-tree/                         @gnestor
+/types/react-jsonschema-form/                   @iamdanfox @sirreal @iplus26 @KurtPreston
+/types/react-lazyload/                          @m0a
+/types/react-leaflet/                           @danzel @davschne @yuit
+/types/react-list/                              @buptyyf @tomshen
+/types/react-loadable/                          @Kovensky @odensc
+/types/react-loader/                            @artfuldev
+/types/react-maskedinput/                       @LKay @lavoaster @CarlosBonetti
+/types/react-mce/                               @morphologue
+/types/react-mdl/                               @bradzacher
+/types/react-measure/                           @asvetliakov @marcfallows
+/types/react-mixin/                             @tkqubo
+/types/react-modal/                             @radziksh @drewnoakes @homburg @ttamminen @hallowatcher @peterblazejewicz
+/types/react-monaco-editor/                     @jnetterf
+/types/react-motion/                            @stepancar @asvetliakov
+/types/react-motion-slider/                     @asvetliakov
+/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi
+/types/react-native-collapsible/                @iRoachie
+/types/react-native-communications/             @huhuanming @PaitoAnderson
+/types/react-native-datepicker/                 @jacobbaskin
+/types/react-native-doc-viewer/                 @iRoachie
+/types/react-native-document-picker/            @plantain-00
+/types/react-native-drawer/                     @jnbt
+/types/react-native-drawer-layout/              @jmfirth
+/types/react-native-fabric/                     @josephroque
+/types/react-native-fbsdk/                      @ifiokjr
+/types/react-native-fetch-blob/                 @MNBuyskih
+/types/react-native-fs/                         @pocesar @josephroque
+/types/react-native-google-signin/              @j-fro
+/types/react-native-keep-awake/                 @huhuanming
+/types/react-native-linear-gradient/            @j-fro
+/types/react-native-material-design-searchbar/  @iRoachie
+/types/react-native-material-kit/               @iRoachie @timwangdev
+/types/react-native-material-ui/                @iRoachie
+/types/react-native-mixpanel/                   @r3nya
+/types/react-native-modalbox/                   @iRoachie
+/types/react-native-orientation/                @MoLow
+/types/react-native-popup-dialog/               @PaitoAnderson @connectdotz
+/types/react-native-push-notification/          @PaitoAnderson
+/types/react-native-qrcode/                     @plantain-00
+/types/react-native-safari-view/                @mrand01
+/types/react-native-scrollable-tab-view/        @CaiHuan
+/types/react-native-sensor-manager/             @SahinVardar
+/types/react-native-snap-carousel/              @jnbt
+/types/react-native-sortable-grid/              @j-fro
+/types/react-native-sortable-list/              @sivolobov
+/types/react-native-svg-uri/                    @iRoachie
+/types/react-native-swiper/                     @CaiHuan @huhuanming @mhcgrq
+/types/react-native-tab-navigator/              @iRoachie
+/types/react-native-tab-view/                   @kaoDev
+/types/react-native-touch-id/                   @huhuanming
+/types/react-native-vector-icons/               @iRoachie @timwangdev
+/types/react-native-video/                      @huhuanming @abrahambotros
+/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @abrahambotros @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko
+/types/react-notification-system/               @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
+/types/react-notification-system-redux/         @LKay
+/types/react-numeric-input/                     @heatherbooker
+/types/react-onclickoutside/v5/                 @LKay
+/types/react-onclickoutside/                    @LKay
+/types/react-overlays/                          @aaronbeall @vitosamson
+/types/react-paginate/                          @deevus @wouterhardeman @pegel03 @archy-bold
+/types/react-pointable/                         @istefo @mdibyo
+/types/react-portal/                            @shuntksh
+/types/react-props-decorators/                  @tkqubo
+/types/react-recaptcha/                         @mhegazy @zzanol
+/types/react-redux/                             @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
+/types/react-redux-i18n/                        @clementdevos
+/types/react-redux-toastr/                      @Smiche @artyomsv @kulmajaba
+/types/react-relay/                             @graphcool @voxmatt @alloy
+/types/react-resolver/                          @forabi
+/types/react-responsive/v1/                     @asvetliakov
+/types/react-responsive/                        @asvetliakov @alechill @xaviergonz
+/types/react-router/v2/                         @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov
+/types/react-router/v3/                         @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @ssorallen
+/types/react-router/                            @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga
+/types/react-router-bootstrap/                  @vlesierse @LKay @olmobrutall
+/types/react-router-config/                     @lith-light-g
+/types/react-router-dom/                        @tkrotoff @huy-nguyen
+/types/react-router-native/                     @ezintz
+/types/react-router-redux/v3/                   @isman-usoh @noah79 @rosendi
+/types/react-router-redux/v4/                   @isman-usoh @noah79 @rosendi @LKay @DovydasNavickas
+/types/react-router-redux/                      @huy-nguyen @8398a7
+/types/react-s-alert/                           @mitsuruog
+/types/react-scroll/                            @sudoplz @GiedriusGrabauskas
+/types/react-scrollbar/                         @stephenjelfs
+/types/react-select/                            @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4
+/types/react-side-effect/                       @remojansen
+/types/react-sidebar/                           @jeroenvervaeke
+/types/react-sketchapp/                         @ricokahler
+/types/react-slick/                             @andrewBalekha @GiedriusGrabauskas @r3nya
+/types/react-smooth-scrollbar/                  @asvetliakov
+/types/react-sortable-hoc/                      @NoHomey @charlesrey
+/types/react-sortable-pane/                     @rhysd
+/types/react-sortable-tree/                     @wouterhardeman @jzoric
+/types/react-spinkit/v1/                        @tkqubo @mleko @pelotom
+/types/react-spinkit/                           @tkqubo @mleko @pelotom @zzanol
+/types/react-sticky/                            @curtisw0
+/types/react-stripe-elements/                   @dan-j @santiagodoldan @sonnysangha
+/types/react-svg-pan-zoom/                      @huy-nguyen
+/types/react-swf/                               @stepancar
+/types/react-swipe/                             @DeividasBakanas
+/types/react-swipeable/                         @GiedriusGrabauskas @mctep @horiuchi
+/types/react-swipeable-views/                   @mxl @DeividasBakanas
+/types/react-syntax-highlighter/                @NoHomey
+/types/react-table/                             @royxue @psakalo @Havret
+/types/react-tabs/                              @danez
+/types/react-tag-input/                         @Ogglas @jankarres
+/types/react-tagcloud/                          @wassname
+/types/react-tagsinput/                         @mykter
+/types/react-tap-event-plugin/                  @mxl
+/types/react-test-renderer/v15/                 @arvitaly @lochbrunner @lochbrunner @johnnyreilly
+/types/react-test-renderer/                     @arvitaly @lochbrunner @johnnyreilly @jgoz
+/types/react-tether/                            @ryprice
+/types/react-textarea-autosize/                 @asvetliakov @zry656565
+/types/react-toastr/                            @shssoichiro
+/types/react-toggle/v2/                         @LKay
+/types/react-toggle/                            @LKay
+/types/react-tooltip/                           @DeividasBakanas
+/types/react-touch/                             @grzesie2k
+/types/react-tracking/                          @alloy
+/types/react-transition-group/v1/               @LKay
+/types/react-transition-group/                  @LKay
+/types/react-treeview/                          @janslow
+/types/react-truncate/                          @mattvperry
+/types/react-user-tour/                         @ccancellieri
+/types/react-virtual-keyboard/                  @bsurai
+/types/react-virtualized/                       @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen
+/types/react-virtualized-select/                @seansfkelley
+/types/react-weui/                              @tairan
+/types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2
+/types/react-widgets-moment/                    @dawnmist
+/types/react-youtube/                           @kgtkr
+/types/reactable/                               @spielc
+/types/reactcss/                                @chrisgervang @LKay
+/types/reactstrap/v4/                           @alihammad @mfal @danilobjr @fabiopaiva
+/types/reactstrap/                              @alihammad @mfal @danilobjr @fabiopaiva @FaithForHumans @KurtPreston
+/types/read/                                    @timjk
+/types/read-chunk/                              @crispybee
+/types/read-package-tree/                       @mgroenhoff
+/types/read-pkg/                                @jdxcode
+/types/read-pkg-up/                             @dudeofawesome @jdxcode
+/types/readdir-stream/                          @Bartvds
+/types/readline-sync/                           @jonestristand
+/types/reapop/                                  @Barrokgl
+/types/recase/                                  @18steps
+/types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong
+/types/recompose/                               @iskandersierra @mrapogee @clayne11
+/types/reconnectingwebsocket/                   @nguarracino
+/types/recursive-readdir/v1/                    @elisee
+/types/recursive-readdir/                       @elisee @MicahZoltu
+/types/redis/                                   @soywiz @CodeAnimal @MugeSo @UppaJung @Rokt33r @43081j
+/types/redis-errors/                            @43081j
+/types/redis-mock/                              @BendingBender
+/types/redis-rate-limiter/                      @westy92
+/types/redis-scripto/                           @westy92
+/types/redlock/v2/                              @chrootsu
+/types/redlock/                                 @chrootsu @BendingBender
+/types/redom/                                   @RauliL
+/types/reduce-reducers/                         @huy-nguyen
+/types/redux-action/                            @newraina
+/types/redux-action-utils/                      @tkqubo
+/types/redux-actions/                           @jaysoo @alexgorbatchev @alechill
+/types/redux-auth-wrapper/v1/                   @LKay
+/types/redux-auth-wrapper/                      @LKay
+/types/redux-batched-subscribe/                 @mDibyo
+/types/redux-debounced/                         @seansfkelley
+/types/redux-devtools/                          @mc-petry
+/types/redux-devtools-dock-monitor/             @mc-petry
+/types/redux-devtools-log-monitor/              @mc-petry
+/types/redux-doghouse/                          @BendingBender
+/types/redux-first-router/                      @Valbrand @viggyfresh @janb87 @corydeppen
+/types/redux-first-router-link/                 @janb87
+/types/redux-form/v4/                           @aikoven
+/types/redux-form/v6/                           @carsonf @aikoven @LKay @bancek
+/types/redux-form/                              @carsonf @aikoven @LKay @bancek @alsiola @tehbi4
+/types/redux-immutable/                         @oizie @sebald @gavingregory
+/types/redux-immutable-state-invariant/         @remojansen @highflying
+/types/redux-infinite-scroll/                   @silkyfray
+/types/redux-injectable-store/                  @unindented
+/types/redux-localstorage/                      @LKay
+/types/redux-localstorage-debounce/             @LKay
+/types/redux-localstorage-filter/               @LKay
+/types/redux-logger/                            @arusakov @kgroat
+/types/redux-mock-store/                        @MarianPalkus
+/types/redux-optimistic-ui/                     @asvetliakov
+/types/redux-pack/                              @tansongyang
+/types/redux-persist-transform-encrypt/         @LKay
+/types/redux-persist-transform-filter/          @LKay
+/types/redux-promise/                           @molekilla @xStrom
+/types/redux-promise-middleware/                @ianks
+/types/redux-recycle/                           @LKay
+/types/redux-router/                            @stepancar
+/types/redux-storage/                           @asvetliakov
+/types/redux-storage-engine-jsurl/              @screendriver
+/types/redux-storage-engine-localstorage/       @screendriver
+/types/redux-ui/                                @andyshuxin
+/types/ref/                                     @loyd
+/types/ref-array/                               @loyd
+/types/ref-struct/                              @loyd
+/types/ref-union/                               @loyd
+/types/reflux/                                  @mauricedb
+/types/relateurl/                               @tkrotoff
+/types/relaxed-json/                            @18steps
+/types/relay-runtime/                           @voxmatt @alloy
+/types/remote-redux-devtools/                   @ColinEberhardt @unindented
+/types/remove-markdown/                         @RagibHasin
+/types/replace-ext/                             @DeividasBakanas
+/types/request/                                 @soywiz @bonnici @Bartvds @joeskeen @ccurrens @lookfirst @mastermatt
+/types/request-ip/                              @mrhen
+/types/request-promise/                         @cglantschnig @joeskeen @AyaMorisawa
+/types/request-promise-native/                  @gustavohenke
+/types/requestretry/                            @EricByers @trainerbill
+/types/require-dir/                             @weekens
+/types/require-directory/                       @Igmat
+/types/require-from-string/                     @ikatyang
+/types/requirejs/                               @jbaldwin
+/types/requirejs-domready/                      @lefb766
+/types/resemblejs/                              @pimterry
+/types/resolve/                                 @marionebl @ajafff
+/types/resolve-from/                            @unional
+/types/resourcejs/                              @shaunluttin
+/types/response-time/                           @urossmolnik @TonyPythoneer
+/types/rest/                                    @Nemo157
+/types/restangular/                             @borisyankov
+/types/restful.js/                              @tkqubo
+/types/restify/v4/                              @blittle @stevehipwell
+/types/restify/                                 @blittle @stevehipwell
+/types/restify-cookies/                         @weekens
+/types/restify-cors-middleware/                 @dthunell
+/types/restify-errors/                          @stevehipwell
+/types/restify-plugins/                         @KostyaTretyak
+/types/restler/                                 @cyrilschumacher
+/types/restling/                                @loghorn
+/types/resumablejs/                             @DanielMcAssey
+/types/rethinkdb/                               @alexgorbatchev
+/types/retry/                                   @krenor
+/types/rev-hash/                                @ikatyang
+/types/revalidate/                              @alex3165
+/types/revalidator/                             @brewsoftware
+/types/reveal/                                  @robertop87 @Nava2
+/types/rewire/                                  @borislavjivkov @CaselIT
+/types/rfc2047/                                 @mugifly
+/types/rheostat/                                @SashaBayan @kourge
+/types/rickshaw/                                @niemyjski
+/types/rimraf/                                  @soywiz @e-cloud @bash
+/types/riot/                                    @Stubb0rn
+/types/riot-api-nodejs/                         @zafixlrp
+/types/riot-games-api/                          @xstoudi
+/types/riotcontrol/                             @chrootsu
+/types/riotjs/                                  @vvakame
+/types/rison/                                   @impworks
+/types/rivets/                                  @TrevorDev @matjanos
+/types/rollup/                                  @flying-sheep @csvn
+/types/rollup-plugin-json/                      @asmockler
+/types/ronomon__crypto-async/                   @BendingBender
+/types/rosie/                                   @abner @subvertallchris
+/types/roslib/                                  @Pro @skycoop
+/types/rot-js/                                  @atiaxi
+/types/route-parser/                            @ianks @bobbuehler
+/types/routie/                                  @Adilson
+/types/royalslider/                             @csrakowski
+/types/rpio/                                    @DominikPalo
+/types/rrc/                                     @DeividasBakanas
+/types/rrule/                                   @waratuman
+/types/rsmq/                                    @MugeSo
+/types/rsmq-worker/                             @MugeSo
+/types/rss/                                     @secondwtq
+/types/rsvp/                                    @chriskrycho
+/types/rsync/                                   @philippstucki
+/types/rtree/                                   @oefirouz
+/types/run-sequence/                            @k-kagurazaka
+/types/rx/                                      @Igorbek
+/types/rx-angular/                              @mickdelaney
+/types/rx-core/                                 @Igorbek @mizunashi-mana
+/types/rx-core-binding/                         @Igorbek
+/types/rx-dom/                                  @oliverw
+/types/rx-jquery/                               @Igorbek
+/types/rx-lite/                                 @Igorbek
+/types/rx-lite-aggregates/                      @Igorbek
+/types/rx-lite-async/                           @zoetrope @Igorbek
+/types/rx-lite-backpressure/                    @Igorbek
+/types/rx-lite-coincidence/                     @Igorbek
+/types/rx-lite-experimental/                    @Igorbek
+/types/rx-lite-joinpatterns/                    @Igorbek
+/types/rx-lite-testing/                         @Igorbek
+/types/rx-lite-time/                            @Igorbek
+/types/rx-lite-virtualtime/                     @Igorbek
+/types/rx.wamp/                                 @darkl
+/types/s3-upload-stream/                        @geoffreak
+/types/safari-extension/                        @luukd
+/types/safari-extension-content/                @luukd
+/types/safe-compare/                            @bevalorous
+/types/safe-json-stringify/                     @ericbyers
+/types/safe-regex/                              @mhegazy
+/types/sails.io.js/                             @arvitaly
+/types/saml2-js/                                @horiuchi
+/types/saml20/                                  @HackerUndKoch
+/types/samlp/                                   @horiuchi
+/types/sammy/                                   @borisyankov @oising
+/types/sanctuary/                               @davidchambers @cortopy
+/types/sandboxed-module/                        @svi3c
+/types/sane/                                    @BendingBender
+/types/sanitize-filename/                       @Nemo157
+/types/sanitize-html/                           @rogierschouten @afshin @BehindTheMath
+/types/sap__xsenv/                              @mad-mike
+/types/sass-graph/                              @marvinhagemeister
+/types/sat/                                     @omni360
+/types/satnav/                                  @DotNetNerd
+/types/saywhen/                                 @SeanSobey
+/types/scalike/                                 @ryoppy
+/types/screenfull/                              @icholy @lionelb @joelshepherd
+/types/screeps/                                 @MarkoSulamagi @NhanHo @bryanbecker @resir014 @Arcath @apemanzilla
+/types/screeps-profiler/                        @ramblurr
+/types/scriptjs/                                @ssttevee
+/types/scroll-into-view/                        @zivni
+/types/scroller/                                @haskellcamargo
+/types/scrollreveal/                            @Davidblkx
+/types/scrolltofixed/                           @bmdixon
+/types/scrypt-async/                            @xStrom
+/types/scryptsy/                                @micksatana
+/types/seamless/                                @danmana
+/types/seamless-immutable/                      @alex3165 @xsburg @geirsagberg
+/types/seedrandom/                              @kernhanda
+/types/segment-analytics/                       @fongandrew
+/types/select2/                                 @borisyankov
+/types/selectables/                             @renjfk
+/types/selectize/                               @adidahiya @naBausch
+/types/selenium-webdriver/v2/                   @BillArmstrong @Kuniwak @cnishina
+/types/selenium-webdriver/                      @BillArmstrong @Kuniwak @cnishina @SupernaviX @bendxn
+/types/semantic-ui/                             @leonard-thieu
+/types/semantic-ui-accordion/                   @leonard-thieu
+/types/semantic-ui-api/                         @leonard-thieu
+/types/semantic-ui-checkbox/                    @leonard-thieu
+/types/semantic-ui-dimmer/                      @leonard-thieu
+/types/semantic-ui-dropdown/                    @leonard-thieu
+/types/semantic-ui-embed/                       @leonard-thieu
+/types/semantic-ui-form/                        @leonard-thieu
+/types/semantic-ui-modal/                       @leonard-thieu
+/types/semantic-ui-nag/                         @leonard-thieu
+/types/semantic-ui-popup/                       @leonard-thieu
+/types/semantic-ui-progress/                    @leonard-thieu
+/types/semantic-ui-rating/                      @leonard-thieu
+/types/semantic-ui-search/                      @leonard-thieu
+/types/semantic-ui-shape/                       @leonard-thieu
+/types/semantic-ui-sidebar/                     @leonard-thieu
+/types/semantic-ui-site/                        @leonard-thieu
+/types/semantic-ui-sticky/                      @leonard-thieu
+/types/semantic-ui-tab/                         @leonard-thieu
+/types/semantic-ui-transition/                  @leonard-thieu
+/types/semantic-ui-visibility/                  @leonard-thieu
+/types/semaphore/                               @mhfrantz @Alorel
+/types/semver/                                  @Bartvds @BendingBender @LucianBuzzo
+/types/semver-compare/                          @vincekovacs
+/types/semver-diff/                             @chrismbarr
+/types/sencha_touch/                            @brian428
+/types/send/                                    @MikeJerred
+/types/seneca/                                  @psnider
+/types/sequelize/v3/                            @samuelneff @codeanimal @drinchev @morpheusxaut @torhal
+/types/sequelize/                               @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01
+/types/sequelize-fixtures/                      @cschwarz
+/types/sequencify/                              @npenin
+/types/sequester/                               @Strate
+/types/serialize-javascript/                    @lith-light-g
+/types/serialport/v4/                           @codefoster
+/types/serialport/                              @codefoster @apearson
+/types/serve-favicon/                           @urossmolnik
+/types/serve-index/                             @tkrotoff
+/types/serve-static/                            @urossmolnik @LinusU
+/types/server-destroy/                          @gyszalai
+/types/session-file-store/                      @blendsdk @rokt33r
+/types/set-cookie-parser/                       @nickp10
+/types/sha1/                                    @arcdev1
+/types/shallowequal/                            @seansfkelley
+/types/shapefile/                               @DenisCarriere
+/types/sharedworker/                            @nakakura
+/types/sharepoint/                              @gandjustas @andrei-markeev @baywet @teroarvola @dennispg
+/types/sharp/                                   @lith-light-g
+/types/sheetify/                                @toddself
+/types/shell-escape/                            @nenadalm
+/types/shell-quote/                             @jason0x43
+/types/shelljs/                                 @nikeee @voy
+/types/shimmer/                                 @kjin
+/types/shipit/                                  @cyrilschumacher
+/types/shipit-utils/                            @cyrilschumacher
+/types/shopify-buy/                             @openminder
+/types/shortid/                                 @stpettersens @despairblue
+/types/shot/                                    @AJamesPhillips
+/types/showdown/                                @cbowdon @tan9
+/types/shrink-ray/                              @forabi
+/types/siema/                                   @Irmiz @0x6368656174 @samnau
+/types/siesta/                                  @bquarmby
+/types/sigmajs/                                 @qinfchen
+/types/sigmund/                                 @BendingBender
+/types/signalr/                                 @borisyankov @keesey @GiedriusGrabauskas
+/types/signalr-no-jquery/                       @gjoshevski
+/types/signals/                                 @diullei
+/types/signature_pad/                           @AbubakerB @jrmihalick
+/types/simple-assign/                           @NoHomey
+/types/simple-cw-node/                          @vvakame
+/types/simple-mock/                             @leonyu
+/types/simple-oauth2/                           @mad-mike
+/types/simple-peer/                             @tlaziuk
+/types/simple-url-cache/                        @a-lucas
+/types/simple-xml/                              @notVitaliy
+/types/simplebar/v1/                            @gregonnet @leonard-thieu
+/types/simplebar/                               @leonard-thieu
+/types/simplemde/                               @Scalesoft
+/types/simplesmtp/                              @rogierschouten
+/types/simplestorage.js/                        @axelcostaspena @mxl
+/types/sinon/                                   @mrbigdog2u @rationull @lumaxis @nicojs @43081j
+/types/sinon-as-promised/                       @igrayson
+/types/sinon-chai/                              @kazimanzurrashid @jedmao
+/types/sinon-chrome/                            @pimterry
+/types/sinon-express-mock/                      @jpchip @tlaziuk
+/types/sinon-mongoose/                          @stevehipwell
+/types/sinon-stub-promise/                      @vintem
+/types/sinon-test/                              @mummybot
+/types/sip.js/                                  @decyrus
+/types/sipml/                                   @chookies
+/types/sitemap2/                                @shundy
+/types/sizzle/                                  @leonard-thieu
+/types/sjcl/                                    @Evgenus
+/types/ski/                                     @AyaMorisawa
+/types/skyway/                                  @nakakura
+/types/slack-node/                              @geoffreak
+/types/slack-winston/                           @BlueHatbRit
+/types/slackify-html/                           @hypexr
+/types/slate-irc/                               @elisee
+/types/sleep/                                   @rajarz
+/types/slickgrid/                               @jbaldwin
+/types/slideout/                                @ToastHawaii
+/types/slimerjs/                                @alexwall
+/types/slocket/                                 @BendingBender
+/types/slug/                                    @mhegazy
+/types/smart-fox-server/                        @ChanceM
+/types/smoothscroll-polyfill/                   @kryops
+/types/smtp-server/v1/                          @markisme @Taisiias
+/types/smtp-server/                             @markisme @Taisiias @dex4er
+/types/smtpapi/                                 @a-morales
+/types/snapsvg/                                 @lhk @mattanja @kant2002
+/types/snazzy-info-window/                      @milosd92
+/types/snekfetch/                               @DarkerTV
+/types/snoowrap/                                @vitosamson
+/types/snowboy/                                 @dolanmiu
+/types/socket.io/                               @progre @divillysausages @florentpoujol @KentarouTakeda @gigi
+/types/socket.io-client/                        @progre @divillysausages @florentpoujol
+/types/socket.io-parser/                        @plantain-00
+/types/socket.io-redis/                         @nupplaphil
+/types/socket.io.users/                         @kataras
+/types/socketio-wildcard/                       @BendingBender
+/types/socketty/                                @Nax
+/types/sockjs/                                  @pmccloghrylaing
+/types/sockjs-client/                           @vladev @arusakov @BendingBender @renjfk
+/types/solution-center-communicator/            @dami-gg
+/types/sort-array/                              @mrmlnc
+/types/sortablejs/                              @Maw-Fox
+/types/soundmanager2/                           @elton2048
+/types/source-list-map/                         @e-cloud
+/types/source-map-support/                      @Bartvds @jason0x43
+/types/space-pen/                               @vvakame
+/types/spark-md5/                               @bastienmoulia
+/types/sparkly/                                 @BendingBender
+/types/sparkpost/v1/                            @geoffreak
+/types/sparkpost/                               @geoffreak @bondz
+/types/sparqljs/                                @AlexeyMz
+/types/spatialite/                              @atd-schubert
+/types/spdx-correct/                            @jinwoo
+/types/spdx-satisfies/                          @jinwoo
+/types/spdy/                                    @tony19
+/types/speakeasy/                               @legendecas @mrOlorin
+/types/speakingurl/                             @Goldsmith42
+/types/spectacle/                               @zmaybury
+/types/spectrum/                                @M-Zuber
+/types/split/                                   @marcinporebski
+/types/split.js/                                @icholy
+/types/split2/                                  @mugeso
+/types/spotify-api/                             @skovmand
+/types/spotify-web-playback-sdk/                @Festify
+/types/sprintf/                                 @soywiz @BendingBender
+/types/sprintf-js/                              @jasonswearingen @BendingBender
+/types/sql.js/                                  @Hozuki
+/types/sqlite3/                                 @nmalaguti @dpyro
+/types/sqlstring/                               @marvinhagemeister
+/types/squirejs/                                @bradleyayers
+/types/srp/                                     @Patman64
+/types/ssh-key-decrypt/                         @BendingBender
+/types/ssh2/                                    @tkQubo @rbuckton
+/types/ssh2-sftp-client/                        @igrayson @ascariandrea
+/types/ssh2-streams/                            @rbuckton
+/types/sshpk/                                   @mabels
+/types/stack-mapper/                            @rogierschouten
+/types/stack-trace/                             @exceptionless
+/types/stack-utils/                             @BendingBender
+/types/stacktrace-js/                           @exceptionless @pilagod
+/types/stale-lru-cache/                         @cxcorp
+/types/stampit/                                 @koresar
+/types/stamplay-js-sdk/                         @ridermansb
+/types/stat-mode/                               @BendingBender
+/types/stats.js/                                @gregolai @hberntsen @danvk
+/types/statsd-client/                           @peterkooijmans @chrisleck
+/types/statuses/                                @tkrotoff @BendingBender
+/types/steam/                                   @kant2002
+/types/steed/                                   @Paul-Isache
+/types/stemmer/                                 @will-ockmore
+/types/sticky-cluster/                          @paustint
+/types/stompjs/                                 @jimic
+/types/stoppable/                               @EricByers
+/types/storejs/                                 @vbortone @harry0000
+/types/storybook__addon-actions/                @joscha
+/types/storybook__addon-backgrounds/            @hyunseob
+/types/storybook__addon-info/                   @mkornblum @fyrkant
+/types/storybook__addon-knobs/                  @joscha @martynaskadisa
+/types/storybook__addon-links/                  @joscha
+/types/storybook__addon-notes/                  @joscha
+/types/storybook__addon-options/                @joscha
+/types/storybook__react/                        @joscha @wapgear
+/types/stream-buffers/                          @Jason3S
+/types/stream-meter/                            @mugeso
+/types/stream-series/                           @k-kagurazaka
+/types/stream-to-array/v0/                      @Bartvds
+/types/stream-to-array/                         @Bartvds @BendingBender
+/types/streaming-json-stringify/                @BendingBender
+/types/streamjs/                                @erosb
+/types/strftime/                                @cyrilschumacher
+/types/string/                                  @basp
+/types/string-hash/                             @ethanrubio
+/types/string-similarity/                       @ragtime
+/types/string-template/                         @TonyPythoneer
+/types/string_score/                            @marcinporebski
+/types/stringify-object/                        @khoomeister
+/types/strip-ansi/                              @mhegazy
+/types/strip-bom/                               @mhegazy
+/types/strip-json-comments/                     @dmoonfire
+/types/stripe/                                  @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi
+/types/stripe-checkout/                         @cgwrench
+/types/stripe-v2/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
+/types/stripe-v3/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
+/types/strong-cluster-control/                  @shuntksh
+/types/strophe/                                 @DavidKDeutsch
+/types/styled-jsx/                              @R1ZZU
+/types/stylelint/                               @alan-agius4
+/types/stylelint-webpack-plugin/                @bahlo
+/types/stylus/                                  @SomaticIT
+/types/subsume/                                 @BendingBender
+/types/succinct/                                @EnableSoftware
+/types/sudo-block/                              @BendingBender
+/types/suitescript/                             @darrenhillconsulting
+/types/sumo-logger/                             @forabi
+/types/superagent/v2/                           @varju @NicoZelaya @mxl
+/types/superagent/                              @NicoZelaya @mxl @paplorinc
+/types/superagent-no-cache/                     @mxl
+/types/superagent-prefix/                       @mxl
+/types/supercluster/                            @DenisCarriere
+/types/supertest/                               @varju
+/types/supertest-as-promised/                   @tkrotoff
+/types/supports-color/                          @mgroenhoff
+/types/svg-injector/                            @poke
+/types/svg-parser/                              @mrmlnc
+/types/svg-sprite/                              @tkqubo
+/types/svg2png/                                 @hansrwindhoff @sccgithub
+/types/svg4everybody/                           @BendingBender
+/types/svgjs.draggable/                         @LiFeleSs
+/types/svgjs.resize/                            @jkevingutierrez
+/types/svgo/                                    @bradleyayers
+/types/swag/                                    @shiwano
+/types/swagger-express-middleware/              @alexandreroba
+/types/swagger-express-mw/                      @micmro
+/types/swagger-hapi/                            @micmro
+/types/swagger-jsdoc/                           @drGrove
+/types/swagger-node-runner/                     @micmro
+/types/swagger-parser/                          @Tobias4872 @EricHenry
+/types/swagger-restify-mw/                      @micmro
+/types/swagger-sails-hook/                      @micmro
+/types/swagger-schema-official/                 @mohsen1 @bsouthga @nimerritt
+/types/swagger-tools/                           @bricka
+/types/swaggerize-express/                      @mugeso @nickmorton
+/types/swfobject/                               @rou
+/types/swiftclick/                              @Laurence-C
+/types/swig/                                    @CodeAnimal @soywiz
+/types/swig-email-templates/                    @mrhen @micksatana
+/types/swipe/                                   @kant2002
+/types/swiper/                                  @sgaliano @lucax88x
+/types/swipeview/                               @borisyankov
+/types/switchery/                               @bgrieder @claylaut
+/types/swiz/                                    @jedigo
+/types/sylvester/                               @StephaneAlie
+/types/synaptic/                                @ToastHawaii @austincummings
+/types/systeminformation/                       @PixelcrabAT
+/types/systemjs/                                @ludohenin @NathanWalker @GiedriusGrabauskas @aluanhaddad
+/types/table/                                   @evanshortiss @mrmlnc
+/types/tabris-plugin-firebase/                  @eclipsesource
+/types/tabtab/                                  @vojtechhabarta
+/types/tabulator/                               @euginio
+/types/tapable/                                 @e-cloud
+/types/tape/                                    @Bartvds @sodatea @DennisSchwartz @mikehenrty
+/types/tar/                                     @SomaticIT @connor4312
+/types/tcp-ping/                                @stegano
+/types/tedious/                                 @rogierschouten @cjthompson
+/types/tedious-connection-pool/                 @sandorfr
+/types/telebot/                                 @mariotsi
+/types/temp/                                    @DanielRosenwasser
+/types/temp-write/                              @BendingBender
+/types/tempfile/                                @SamVerschueren @BendingBender
+/types/tempy/                                   @douglasduteil
+/types/terminal-menu/                           @aravindarun
+/types/testingbot-api/                          @timbru31
+/types/tether/                                  @adidahiya
+/types/tether-drop/                             @adidahiya
+/types/tether-shepherd/                         @mtgibbs
+/types/text-buffer/                             @GlenCFL
+/types/text-encoding/                           @pine613
+/types/text-encoding-utf-8/                     @trxcllnt
+/types/three/                                   @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv
+/types/thrift/                                  @kamek-pf @kevin-greene-ck @jessezhang91
+/types/throng/                                  @cyrilschumacher @tatethurston
+/types/throttle/                                @BendingBender
+/types/throttle-debounce/                       @czbuchi
+/types/through/                                 @AndrewGaspar
+/types/through2/v0/                             @Bartvds @jedmao
+/types/through2/                                @Bartvds @jedmao @valotas @TeamworkGuy2
+/types/through2-map/                            @LucasHill
+/types/tile-reduce/                             @DenisCarriere
+/types/tilebelt/                                @DenisCarriere
+/types/time-span/                               @BendingBender @mdvorscak
+/types/timelinejs/                              @rolandzwaga
+/types/timelinejs3/                             @MikeMatusz
+/types/timer-machine/                           @dolanmiu
+/types/timezone-js/                             @bonnici
+/types/tinder/                                  @pingec
+/types/tinycolor2/                              @M-Zuber @geertjansen @nvh
+/types/tinycopy/                                @vvatanabe
+/types/tinymce/                                 @martinduparc @ipoul
+/types/titanium/                                @cyounkins
+/types/title/                                   @fa7ad
+/types/tldjs/                                   @geoffreak
+/types/tmp/                                     @optical @Perlmint
+/types/to-absolute-glob/                        @ajafff
+/types/to-camel-case/                           @j-f1
+/types/to-markdown/                             @SuperPaintman
+/types/to-title-case-gouch/                     @stpettersens
+/types/toastr/                                  @borisyankov
+/types/tocktimer/                               @evanshortiss
+/types/tooltipster/                             @stephenlautier @pjmagee @VorobeY1326 @leonard-thieu @janhi @joeskeen
+/types/topojson/                                @ricardo-mello @chenzhutian
+/types/torrent-stream/                          @xstoudi
+/types/touch/                                   @mizunashi-mana @BendingBender
+/types/touch-events/                            @kevinb7
+/types/tough-cookie/                            @leonard-thieu @LiJinyao
+/types/traceback/                               @misak113
+/types/tracking/                                @pimterry
+/types/transducers-js/                          @colinkahn @dphilipson @NaridaL
+/types/transducers.js/                          @dphilipson
+/types/trash/                                   @matthew-matvei
+/types/traverse/                                @newclear
+/types/traverson/                               @marcinporebski
+/types/trayballoon/                             @korve
+/types/tress/                                   @sindilevich
+/types/trim/                                    @skysteve
+/types/trunk8/                                  @niemyjski
+/types/tspromise/                               @soywiz
+/types/tunnel/                                  @BendingBender
+/types/tus-js-client/                           @kevhiggins
+/types/tv4/                                     @Bartvds @psnider
+/types/tween.js/                                @Amos47 @sunetos @jzarnikov @alexburner
+/types/tweenjs/                                 @evilangelist
+/types/tweezer.js/                              @praxxis
+/types/twig/                                    @soywiz @enko
+/types/twilio/                                  @nickiannone @ashleybrener
+/types/twit/                                    @Volox @lostfictions
+/types/twitter/                                 @chitoku-k
+/types/twitter-stream-channels/                 @adrianbardan
+/types/twitter-text/                            @rhysd
+/types/twix/                                    @j3ko
+/types/type-check/                              @hansrwindhoff
+/types/type-detect/                             @Bartvds
+/types/type-is/                                 @BendingBender
+/types/type-name/                               @armorik83
+/types/typeahead/                               @igochkov @gjunge
+/types/typedarray-pool/                         @pawsong
+/types/typescript-deferred/                     @DirtyHairy
+/types/tz-format/                               @samverschueren
+/types/ua-parser-js/                            @superduper @legendecas @MeLlamoPablo
+/types/uglify-js/                               @tkrotoff
+/types/uglifycss/                               @blendsdk
+/types/ui-grid/                                 @btesser @joeskeen
+/types/ui-router-extras/                        @mputters @marcel-k @LaserUnicorns
+/types/ui-select/                               @nkovacic
+/types/uid-safe/                                @geoffreak
+/types/uikit/                                   @giovannicandido @s0x
+/types/uinput/                                  @Fidge123
+/types/ultra-strftime/                          @dex4er
+/types/umbraco/                                 @DeCareSystemsIreland
+/types/umd/                                     @TeamworkGuy2
+/types/umzug/                                   @drinchev @mlamp
+/types/underscore/                              @borisyankov @jbaldwin @ccurrens @clottman
+/types/underscore-ko/                           @MagicMau
+/types/underscore.string/                       @rygine
+/types/undertaker/                              @tkqubo @GiedriusGrabauskas
+/types/undertaker-registry/                     @GiedriusGrabauskas
+/types/uniq/                                    @hansrwindhoff
+/types/uniqid/                                  @idchlife
+/types/unique-hash-stream/                      @BendingBender
+/types/unique-random/                           @Kuniwak
+/types/unist/                                   @bizen241
+/types/unity-webapi/                            @jmvrbanac
+/types/universal-analytics/                     @Bartvds @DarkerTV
+/types/universal-router/                        @jtmthf
+/types/unorm/                                   @chbrown
+/types/untildify/                               @BendingBender
+/types/unused-filename/                         @BendingBender
+/types/unzip/                                   @coding2012
+/types/update-notifier/                         @vvakame @nchen63
+/types/uppercamelcase/                          @plantain-00
+/types/urbanairship-cordova/                    @Justin-Credible
+/types/uri-templates/                           @Bartvds
+/types/urijs/                                   @RodneyJT @xt0rted
+/types/uritemplate/                             @teyc @rubensworks
+/types/url-assembler/                           @wolfgang42
+/types/url-join/                                @rogierschouten @devrelm
+/types/url-metadata/                            @mrkmg
+/types/url-parse/                               @ChernenkoPaul
+/types/url-regex/                               @unindented
+/types/url-search-params/                       @nick121212
+/types/url-template/                            @marcinporebski
+/types/urlrouter/                               @soywiz
+/types/urlsafe-base64/                          @tkrotoff
+/types/usage/                                   @pvomhoff
+/types/usb/                                     @underscorebrody
+/types/user-home/                               @mhegazy
+/types/useragent/                               @geoffreak
+/types/username/                                @kayahr
+/types/utf8/                                    @zelein
+/types/util-deprecate/                          @BendingBender
+/types/util.promisify/                          @adamvoss
+/types/utils-merge/                             @chrootsu
+/types/uuid/                                    @iamolivinius @felipeochoa @cjbarth
+/types/uuid-1345/                               @mugeso
+/types/uuid-js/                                 @mhegazy
+/types/uuid-validate/                           @HiromiShikata
+/types/uws/                                     @plantain-00
+/types/valdr/                                   @ilbertz
+/types/valdr-message/                           @ilbertz
+/types/valerie/                                 @conficient
+/types/vali-date/                               @SamVerschueren
+/types/valid-url/                               @stevehipwell
+/types/validator/                               @tgfjt @chrootsu @IOAyman @louy @kacepe @deptno
+/types/validatorjs/                             @LKay @danmana
+/types/vanilla-modal/                           @samnau
+/types/vanilla-tilt/                            @BrunnerLivio
+/types/vary/                                    @BendingBender
+/types/vast-client/                             @jgainfort
+/types/vec3/                                    @xstoudi
+/types/vectorious/                              @erikgerrits
+/types/vega/                                    @pelotom
+/types/velocity-animate/                        @smrq
+/types/verror/                                  @svi3c @max4t
+/types/vertx3-eventbus-client/                  @oddeirik
+/types/vex-js/                                  @gdcohan
+/types/vexflow/                                 @rquiring @sebastianhaas @bohoffi
+/types/vfile/                                   @bizen241 @rokt33r
+/types/victory/                                 @asvetliakov @snerks @Havret
+/types/video.js/                                @vbortone @scleriot @SWBennett06 @IgelCampus
+/types/viewability-helper/                      @lironzluf
+/types/viewerjs/                                @lrh3321
+/types/viewporter/                              @borisyankov
+/types/vimeo/                                   @DazWilkin
+/types/vimeo__player/                           @denisyilmaz
+/types/vinyl/v0/                                @jedmao
+/types/vinyl/                                   @vvakame @jedmao @thorn0
+/types/vinyl-buffer/                            @tkQubo
+/types/vinyl-fs/                                @vvakame @remisery
+/types/vinyl-paths/                             @tkQubo
+/types/virtual-dom/                             @chbrown
+/types/virtual-keyboard/                        @bsurai
+/types/vis/                                     @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314 @supercargo @takato1314
+/types/vision/                                  @jasonswearingen @AJamesPhillips
+/types/vitalsigns/                              @cyrilschumacher
+/types/vivus/                                   @DanielRosenwasser @lekhmanrus
+/types/vkbeautify/                              @sch3lp
+/types/voca/                                    @pine
+/types/voronoi-diagram/                         @michaelneu
+/types/vortex-web-client/                       @Pro
+/types/voximplant-websdk/                       @aylarov
+/types/vue-resource/                            @kaorun343
+/types/vue-scrollto/                            @vincekovacs
+/types/vuex-i18n/                               @jaeggerr
+/types/w2ui/                                    @Ptival
+/types/w3c-generic-sensor/                      @kenchris
+/types/w3c-image-capture/                       @cosium
+/types/w3c-screen-orientation/                  @kenchris
+/types/w3c-web-usb/                             @larsgk
+/types/waitme/                                  @totpero
+/types/wake_on_lan/                             @SrTobi
+/types/wallabyjs/                               @andrewconnell
+/types/wallpaper/                               @BendingBender
+/types/wampy/                                   @KSDaemon
+/types/warning/                                 @cvle
+/types/watch/                                   @soywiz @Perlmint
+/types/watchify/                                @TeamworkGuy2
+/types/watchpack/                               @e-cloud
+/types/waterline/                               @arvitaly
+/types/watson-developer-cloud/                  @waldo000000 @Naktibalda
+/types/waypoints/                               @dominikbulaj @Koloto
+/types/wcwidth/                                 @rokt33r
+/types/weak/                                    @int0h
+/types/weapp-api/                               @vargeek
+/types/web-animations-js/                       @kritollm
+/types/web-bluetooth/                           @urish
+/types/webappsec-credential-management/         @iainmcgin
+/types/webassembly-js-api/                      @periklis
+/types/webcl/                                   @NCARalph
+/types/webcomponents.js/                        @adidahiya
+/types/webcrypto/                               @iislucas
+/types/webdriverio/                             @nmalaguti @timbru31 @fsmedberg-tc @tanvirislam06
+/types/webfontloader/                           @doskallemaskin
+/types/webgl-ext/                               @zenmumbler
+/types/webgl2/                                  @nkemnitz
+/types/webix/                                   @mkozhukh
+/types/webmidi/                                 @lostfictions
+/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4
+/types/webpack-bundle-analyzer/                 @kryops
+/types/webpack-chain/                           @eirikurn @psachs21
+/types/webpack-chunk-hash/                      @mtraynham
+/types/webpack-cleanup-plugin/                  @malj
+/types/webpack-dev-middleware/v1/               @bumbleblym @reduckted
+/types/webpack-dev-middleware/                  @bumbleblym @reduckted
+/types/webpack-dev-server/                      @maestroh @daveparslow @ZheyangSong @alan-agius4
+/types/webpack-dotenv-plugin/                   @kryops
+/types/webpack-env/                             @use-strict @rhonsby
+/types/webpack-fail-plugin/                     @deevus
+/types/webpack-hot-middleware/                  @bumbleblym @icylace
+/types/webpack-manifest-plugin/                 @r3nya
+/types/webpack-merge/v0/                        @deevus
+/types/webpack-merge/                           @deevus @mtraynham
+/types/webpack-node-externals/                  @mtraynham
+/types/webpack-notifier/                        @bumbleblym
+/types/webpack-sources/                         @e-cloud @chriseppstein
+/types/webpack-stream/                          @iclanton @bumbleblym
+/types/webpack-validator/                       @deevus
+/types/webrtc/                                  @nakakura
+/types/websocket/                               @loyd @flynetworks @zhaoleimxd
+/types/webspeechapi/                            @saschanaz
+/types/websql/                                  @TeamworkGuy2
+/types/webtorrent/                              @niieani @tlaziuk
+/types/webvr-api/                               @lostfictions
+/types/week/                                    @sindrenm
+/types/weighted/                                @ccitro
+/types/weixin-app/                              @taoqf
+/types/wellknown/                               @yairtawil
+/types/whatwg-streams/                          @saschanaz
+/types/wheel/                                   @BTOdell
+/types/when/                                    @derekcicerone @Nemo157
+/types/which/                                   @vvakame @cspotcode
+/types/wicg-mediasession/                       @jucrouzet
+/types/wiiu/                                    @mzsm
+/types/window-or-global/                        @vvakame
+/types/window-size/                             @pmkary
+/types/windows-1251/                            @RomanGolovanov
+/types/windows-service/                         @rogierschouten
+/types/winjs/v1/                                @adamhewitt627 @craigktreasure @xirzec
+/types/winjs/v2/                                @adamhewitt627 @craigktreasure @xirzec
+/types/winjs/                                   @adamhewitt627 @craigktreasure @xirzec
+/types/winreg/                                  @RX14 @BobBuehler
+/types/winrt-uwp/                               @saschanaz @taylor224
+/types/winston/                                 @bonnici @codeanimal @DABH
+/types/winston-dynamodb/                        @nickiannone
+/types/wiring-pi/                               @NoHomey
+/types/wnumb/                                   @acoreyj
+/types/wonder.js/                               @yyc-git
+/types/word-list-json/                          @dovidm
+/types/wordcloud/                               @joeskeen
+/types/words-to-numbers/                        @James-Frowen
+/types/wrap-ansi/                               @kayahr
+/types/wreck/                                   @marcinporebski
+/types/wrench/                                  @soywiz
+/types/write-file-atomic/                       @BendingBender
+/types/write-json-file/                         @DenisCarriere
+/types/ws/                                      @loyd @elithrar @mlamp
+/types/wtfnode/                                 @dex4er
+/types/wu/                                      @phiresky
+/types/wx-js-sdk-dt/                            @agasbzj
+/types/x-editable/                              @sirkirby
+/types/x-ray/                                   @mtraynham
+/types/x-ray-crawler/                           @mtraynham
+/types/xdate/                                   @yamada28go
+/types/xdg-basedir/                             @tlaziuk
+/types/xhr-mock/                                @joscha
+/types/xml/                                     @YuJianrong
+/types/xml-parser/                              @mhfrantz
+/types/xml2js/                                  @michelsalib @jasonrm @ccurrens @edwardhinkle @BehindTheMath
+/types/xml2json/                                @dolanmiu
+/types/xmlbuilder/                              @wallymathieu
+/types/xmldoc/                                  @Xstoudi @ajsheehan
+/types/xmldom/                                  @tkqubo
+/types/xmlpoke/                                 @garthk
+/types/xmltojson/                               @traviscrowe
+/types/xmpp__jid/                               @PJakcson
+/types/xregexp/                                 @Bartvds @jfahrenkrug @sigo
+/types/xrm/v7/                                  @daryllabar
+/types/xrm/v8/                                  @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme @mariusagur
+/types/xrm/                                     @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme @scottdurow
+/types/xsd-schema-validator/                    @Goldsmith42
+/types/xsockets/                                @pushplay
+/types/xterm/                                   @blink1073 @LucianBuzzo
+/types/xxhashjs/                                @mDibyo
+/types/yallist/                                 @BendingBender
+/types/yandex-maps/                             @Delagen
+/types/yandex-money-sdk/                        @chrootsu
+/types/yargs/v8/                                @poelstra @mizunashi-mana @pushplay @jeffkenney
+/types/yargs/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
+/types/yayson/                                  @Codesleuth
+/types/ydn-db/                                  @yathit @gabrielmaldi
+/types/yeoman-generator/                        @armorik83 @janslow @ikatyang
+/types/yeoman-test/                             @ikatyang
+/types/yfiles/                                  @yGuy
+/types/yog-bigpipe/                             @ssddi456
+/types/yog-log/                                 @ssddi456
+/types/yog2-kernel/                             @ssddi456
+/types/yosay/                                   @armorik83
+/types/youtube/                                 @DazWilkin @JoshuaKGoldberg @eliotfallon213
+/types/youtube-dl/                              @bsurai
+/types/yui/                                     @giabao
+/types/yup/                                     @dhardtke @vtserman
+/types/z-schema/                                @pgonzal
+/types/zapier-platform-core/                    @bradleyayers
+/types/zen-observable/                          @aicest
+/types/zen-push/                                @daprahamian
+/types/zenscroll/                               @HamedFathi
+/types/zepto/                                   @jbaldwin
+/types/zeroclipboard/v1/                        @ejsmith @niemyjski @balassy @leonyu
+/types/zeroclipboard/                           @ejsmith @niemyjski @balassy @leonyu
+/types/zeromq/                                  @davemckeown @erikma
+/types/zip.js/                                  @lgrignon
+/types/zipcodes/                                @headdetect
+/types/zmq/                                     @davemckeown
+/types/zookeeper/                               @xialeistudio
+/types/zui/                                     @yuanxu
+/types/zxcvbn/                                  @mtraynham
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4078b4808b..536e38c4e2 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,9 @@
+If you know how to fix the issue, make a pull request instead.
+
 - [ ] I tried using the `@types/xxxx` package and had problems.
 - [ ] I tried using the latest stable version of tsc. https://www.npmjs.com/package/typescript
 - [ ] I have a question that is inappropriate for [StackOverflow](https://stackoverflow.com/).  (Please ask any appropriate questions there).
 - [ ] [Mention](https://github.com/blog/821-mention-somebody-they-re-notified) the authors (see `Definitions by:` in `index.d.ts`) so they can respond.
   - Authors: @....
+
+If you do not mention the authors the issue will be ignored.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 979a8311e0..4217471f9d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,7 +12,7 @@ If adding a new definition:
 - [ ] The package does not provide its own types, and you can not add them.
 - [ ] If this is for an NPM package, match the name. If not, do not conflict with the name of an NPM package.
 - [ ] Create it with `dts-gen --dt`, not by basing it on an existing project.
-- [ ] `tslint.json` should be present, and `tsconfig.json` should have `noImplicitAny`, `noImplicitThis`, and `strictNullChecks` set to `true`.
+- [ ] `tslint.json` should be present, and `tsconfig.json` should have `noImplicitAny`, `noImplicitThis`, `strictNullChecks`, and `strictFunctionTypes` set to `true`.
 
 If changing an existing definition:
 - [ ] Provide a URL to documentation or source code which provides context for the suggested changes: <<url here>>
diff --git a/.travis.yml b/.travis.yml
index 07914721a9..9bd31bda14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - node
+  - 8
 
 sudo: false
 
diff --git a/README.md b/README.md
index b826bf5ad5..854cae7e40 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ or just look for any ".d.ts" files in the package and manually include them with
 These can be used by TypeScript 1.0.
 
 * [Typings](https://github.com/typings/typings)
-* ~~[NuGet](http://nuget.org/Tpackages?q=DefinitelyTyped)~~ (use preferred alternatives, nuget DT type publishing has been turned off)
+* ~~[NuGet](http://nuget.org/packages?q=DefinitelyTyped)~~ (use preferred alternatives, nuget DT type publishing has been turned off)
 * Manually download from the `master` branch of this repository
 
 You may need to add manual [references](http://www.typescriptlang.org/docs/handbook/triple-slash-directives.html).
@@ -313,6 +313,18 @@ When `dts-gen` is used to scaffold a scoped package, the `paths` property has to
 
 GitHub doesn't [support](http://stackoverflow.com/questions/5646174/how-to-make-github-follow-directory-history-after-renames) file history for renamed files. Use [`git log --follow`](https://www.git-scm.com/docs/git-log) instead.
 
+#### Should I add an empty namespace to a package that doesn't export a module to use ES6 style imports?
+
+Some packages, like [chai-http](https://github.com/chaijs/chai-http), export a function.
+
+Importing this module with an ES6 style import in the form `import * as foo from "foo";` leads to the error:
+
+> error TS2497: Module 'foo' resolves to a non-module entity and cannot be imported using this construct
+
+This error can be suppressed by merging the function declaration with an empty namespace of the same name, but this practice is discouraged.
+This is a commonly cited [Stack Overflow answer](https://stackoverflow.com/questions/39415661/what-does-resolves-to-a-non-module-entity-and-cannot-be-imported-using-this) regarding this matter.
+
+It is more appropriate to import the module using the `import foo = require("foo");` syntax, or to use a default import like `import foo from "foo";` if using the `--allowSyntheticDefaultImports` flag if your module runtime supports an interop scheme for non-ECMAScript modules as such.
 
 ## License
 
diff --git a/notNeededPackages.json b/notNeededPackages.json
index 579bcf46ef..8f3270392f 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -42,18 +42,60 @@
             "sourceRepoURL": "https://github.com/doxout/anydb-sql",
             "asOfVersion": "0.6.46"
         },
+        {
+            "libraryName": "anydb-sql-migrations",
+            "typingsPackageName": "anydb-sql-migrations",
+            "sourceRepoURL": "https://github.com/spion/anydb-sql-migrations",
+            "asOfVersion": "2.1.1"
+        },
         {
             "libraryName": "apn",
             "typingsPackageName": "apn",
             "sourceRepoURL": "https://github.com/node-apn/node-apn",
             "asOfVersion": "2.1.2"
         },
+        {
+            "libraryName": "Application Insights",
+            "typingsPackageName": "applicationinsights",
+            "sourceRepoURL": "https://github.com/Microsoft/ApplicationInsights-node.js",
+            "asOfVersion": "0.20.0"
+        },
         {
             "libraryName": "Argon2",
             "typingsPackageName": "argon2",
             "sourceRepoURL": "https://github.com/ranisalt/node-argon2",
             "asOfVersion": "0.15.0"
         },
+        {
+            "libraryName": "artyom.js",
+            "typingsPackageName": "artyom.js",
+            "sourceRepoURL": "https://github.com/sdkcarlos/artyom.js",
+            "asOfVersion": "1.0.6"
+        },
+        {
+            "libraryName": "askmethat-rating",
+            "typingsPackageName": "askmethat-rating",
+            "sourceRepoURL": "https://github.com/AlexTeixeira/Askmethat-Rating",
+            "asOfVersion": "0.4.0"
+        },
+        {
+            "libraryName": "asyncblock",
+            "typingsPackageName": "asyncblock",
+            "sourceRepoURL": "https://github.com/scriby/asyncblock",
+            "asOfVersion": "2.2.11"
+        },
+        {
+            "libraryName": "aurelia-knockout",
+            "typingsPackageName": "aurelia-knockout",
+            "sourceRepoURL": "https://github.com/code-chris/aurelia-knockout",
+            "asOfVersion": "2.1.0"
+        },
+        {
+            "libraryName": "autobind-decorator",
+            "typingsPackageName": "autobind-decorator",
+            "sourceRepoURL": "https://github.com/andreypopp/autobind-decorator",
+            "asOfVersion": "2.1.0"
+        },
         {
             "libraryName": "aws-sdk",
             "typingsPackageName": "aws-sdk",
@@ -72,6 +114,12 @@
             "sourceRepoURL": "https://github.com/mzabriskie/axios",
             "asOfVersion": "0.14.0"
         },
+        {
+            "libraryName": "axios-mock-adapter",
+            "typingsPackageName": "axios-mock-adapter",
+            "sourceRepoURL": "https://github.com/ctimmerm/axios-mock-adapter",
+            "asOfVersion": "1.10.0"
+        },
         {
             "libraryName": "azure-mobile-apps",
             "typingsPackageName": "azure-mobile-apps",
@@ -90,24 +138,60 @@
             "sourceRepoURL": "https://github.com/brianloveswords/base64url",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "better-scroll",
+            "typingsPackageName": "better-scroll",
+            "sourceRepoURL": "https://github.com/ustbhuangyi/better-scroll",
+            "asOfVersion": "1.5.0"
+        },
         {
             "libraryName": "BigInteger.js",
             "typingsPackageName": "big-integer",
             "sourceRepoURL": "https://github.com/peterolson/BigInteger.js",
             "asOfVersion": "0.0.31"
         },
+        {
+            "libraryName": "bignumber.js",
+            "typingsPackageName": "bignumber.js",
+            "sourceRepoURL": "https://github.com/MikeMcl/bignumber.js/",
+            "asOfVersion": "5.0.0"
+        },
+        {
+            "libraryName": "botvs",
+            "typingsPackageName": "botvs",
+            "sourceRepoURL": "https://www.botvs.com/",
+            "asOfVersion": "1.0.0"
+        },
+        {
+            "libraryName": "Bowser",
+            "typingsPackageName": "bowser",
+            "sourceRepoURL": "https://github.com/ded/bowser",
+            "asOfVersion": "1.1.1"
+        },
         {
             "libraryName": "Bugsnag Browser",
             "typingsPackageName": "bugsnag-js",
             "sourceRepoURL": "https://github.com/bugsnag/bugsnag-js",
             "asOfVersion": "3.1.0"
         },
+        {
+            "libraryName": "CacheFactory",
+            "typingsPackageName": "cachefactory",
+            "sourceRepoURL": "https://github.com/jmdobry/CacheFactory",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "camel-case",
             "typingsPackageName": "camel-case",
             "sourceRepoURL": "https://github.com/blakeembrey/camel-case",
             "asOfVersion": "1.2.1"
         },
+        {
+            "libraryName": "chalk",
+            "typingsPackageName": "chalk",
+            "sourceRepoURL": "https://github.com/chalk/chalk",
+            "asOfVersion": "2.2.0"
+        },
         {
             "libraryName": "change-case",
             "typingsPackageName": "change-case",
@@ -120,18 +204,162 @@
             "sourceRepoURL": "https://github.com/mapbox/cheap-ruler",
             "asOfVersion": "2.5.0"
         },
+        {
+            "libraryName": "chunked-dc",
+            "typingsPackageName": "chunked-dc",
+            "sourceRepoURL": "https://github.com/saltyrtc/chunked-dc-js",
+            "asOfVersion": "0.2.2"
+        },
+        {
+            "libraryName": "commander",
+            "typingsPackageName": "commander",
+            "sourceRepoURL": "https://github.com/tj/commander.js",
+            "asOfVersion": "2.12.2"
+        },
+        {
+            "libraryName": "confirmdialog",
+            "typingsPackageName": "confirmdialog",
+            "sourceRepoURL": "https://github.com/allipierre/Type-definitions-for-jquery-confirm/tree/master/types/confirmDialog-js",
+            "asOfVersion": "1.0.0"
+        },
         {
             "libraryName": "constant-case",
             "typingsPackageName": "constant-case",
             "sourceRepoURL": "https://github.com/blakeembrey/constant-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "cordova-plugin-battery-status",
+            "typingsPackageName": "cordova-plugin-battery-status",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-battery-status",
+            "asOfVersion": "1.2.3"
+        },
+        {
+            "libraryName": "cordova-plugin-camera",
+            "typingsPackageName": "cordova-plugin-camera",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-camera",
+            "asOfVersion": "2.4.0"
+        },
+        {
+            "libraryName": "cordova-plugin-contacts",
+            "typingsPackageName": "cordova-plugin-contacts",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-contacts",
+            "asOfVersion": "2.3.0"
+        },
+        {
+            "libraryName": "cordova-plugin-device",
+            "typingsPackageName": "cordova-plugin-device",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-device",
+            "asOfVersion": "1.1.5"
+        },
+        {
+            "libraryName": "cordova-plugin-device-motion",
+            "typingsPackageName": "cordova-plugin-device-motion",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-device-motion",
+            "asOfVersion": "1.2.4"
+        },
+        {
+            "libraryName": "Apache Cordova Device Orientation plugin",
+            "typingsPackageName": "cordova-plugin-device-orientation",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-device-orientation",
+            "asOfVersion": "1.0.6"
+        },
+        {
+            "libraryName": "cordova-plugin-dialogs",
+            "typingsPackageName": "cordova-plugin-dialogs",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-dialogs",
+            "asOfVersion": "1.3.2"
+        },
+        {
+            "libraryName": "Apache Cordova File System plugin",
+            "typingsPackageName": "cordova-plugin-file",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-file",
+            "asOfVersion": "4.3.2"
+        },
+        {
+            "libraryName": "cordova-plugin-file-transfer",
+            "typingsPackageName": "cordova-plugin-file-transfer",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-file-transfer",
+            "asOfVersion": "1.6.2"
+        },
+        {
+            "libraryName": "cordova-plugin-globalization",
+            "typingsPackageName": "cordova-plugin-globalization",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-globalization",
+            "asOfVersion": "1.0.6"
+        },
+        {
+            "libraryName": "cordova-plugin-inappbrowser",
+            "typingsPackageName": "cordova-plugin-inappbrowser",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-inappbrowser",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "cordova-plugin-media",
+            "typingsPackageName": "cordova-plugin-media",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-media",
+            "asOfVersion": "3.0.0"
+        },
+        {
+            "libraryName": "cordova-plugin-media-capture",
+            "typingsPackageName": "cordova-plugin-media-capture",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-media-capture",
+            "asOfVersion": "1.4.2"
+        },
+        {
+            "libraryName": "cordova-plugin-network-information",
+            "typingsPackageName": "cordova-plugin-network-information",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-network-information",
+            "asOfVersion": "1.3.2"
+        },
+        {
+            "libraryName": "cordova-plugin-splashscreen",
+            "typingsPackageName": "cordova-plugin-splashscreen",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-splashscreen",
+            "asOfVersion": "4.0.2"
+        },
+        {
+            "libraryName": "Apache Cordova StatusBar plugin",
+            "typingsPackageName": "cordova-plugin-statusbar",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-statusbar",
+            "asOfVersion": "2.2.2"
+        },
+        {
+            "libraryName": "Apache Cordova Vibration plugin",
+            "typingsPackageName": "cordova-plugin-vibration",
+            "sourceRepoURL": "https://github.com/apache/cordova-plugin-vibration",
+            "asOfVersion": "2.1.4"
+        },
+        {
+            "libraryName": "cordova.plugins.diagnostic",
+            "typingsPackageName": "cordova.plugins.diagnostic",
+            "sourceRepoURL": "https://github.com/dpa99c/cordova-diagnostic-plugin",
+            "asOfVersion": "3.7.0"
+        },
+        {
+            "libraryName": "core-decorators.js",
+            "typingsPackageName": "core-decorators",
+            "sourceRepoURL": "https://github.com/jayphelps/core-decorators.js",
+            "asOfVersion": "0.20.0"
+        },
+        {
+            "libraryName": "cypress",
+            "typingsPackageName": "cypress",
+            "sourceRepoURL": "https://cypress.io",
+            "asOfVersion": "1.1.3"
+        },
         {
             "libraryName": "date-fns",
             "typingsPackageName": "date-fns",
             "sourceRepoURL": "https://github.com/date-fns/date-fns",
             "asOfVersion": "2.6.0"
         },
+        {
+            "libraryName": "decimal.js",
+            "typingsPackageName": "decimal.js",
+            "sourceRepoURL": "https://github.com/MikeMcl/decimal.js",
+            "asOfVersion": "7.4.0"
+        },
         {
             "libraryName": "DevExtreme",
             "typingsPackageName": "devextreme",
@@ -144,6 +372,12 @@
             "sourceRepoURL": "https://github.com/dfahlander/Dexie.js",
             "asOfVersion": "1.3.1"
         },
+        {
+            "libraryName": "docker-file-parser",
+            "typingsPackageName": "docker-file-parser",
+            "sourceRepoURL": "https://github.com/joyent/docker-file-parser",
+            "asOfVersion": "1.0.3"
+        },
         {
             "libraryName": "dot-case",
             "typingsPackageName": "dot-case",
@@ -156,12 +390,36 @@
             "sourceRepoURL": "https://github.com/dvajs/dva",
             "asOfVersion": "1.1.0"
         },
+        {
+            "libraryName": "easy-x-headers",
+            "typingsPackageName": "easy-x-headers",
+            "sourceRepoURL": "https://github.com/DeadAlready/easy-x-headers",
+            "asOfVersion": "1.0.0"
+        },
+        {
+            "libraryName": "easy-xapi-supertest",
+            "typingsPackageName": "easy-xapi-supertest",
+            "sourceRepoURL": "https://github.com/DeadAlready/easy-xapi-supertest",
+            "asOfVersion": "1.0.0"
+        },
+        {
+            "libraryName": "EasyStar.js",
+            "typingsPackageName": "easystarjs",
+            "sourceRepoURL": "http://easystarjs.com/",
+            "asOfVersion": "0.3.1"
+        },
         {
             "libraryName": "ecmarkup",
             "typingsPackageName": "ecmarkup",
             "sourceRepoURL": "https://github.com/bterlson/ecmarkup",
             "asOfVersion": "3.4.0"
         },
+        {
+            "libraryName": "Egg",
+            "typingsPackageName": "egg",
+            "sourceRepoURL": "https://github.com/eggjs/egg",
+            "asOfVersion": "1.5.0"
+        },
         {
             "libraryName": "electron",
             "typingsPackageName": "electron",
@@ -174,6 +432,36 @@
             "sourceRepoURL": "https://github.com/loopline-systems/electron-builder",
             "asOfVersion": "2.8.0"
         },
+        {
+            "libraryName": "email-addresses",
+            "typingsPackageName": "email-addresses",
+            "sourceRepoURL": "https://github.com/jackbowman/email-addresses",
+            "asOfVersion": "3.0.0"
+        },
+        {
+            "libraryName": "email-validator",
+            "typingsPackageName": "email-validator",
+            "sourceRepoURL": "https://github.com/Sembiance/email-validator",
+            "asOfVersion": "1.0.6"
+        },
+        {
+            "libraryName": "error-stack-parser",
+            "typingsPackageName": "error-stack-parser",
+            "sourceRepoURL": "https://github.com/stacktracejs/error-stack-parser",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "es6-error",
+            "typingsPackageName": "es6-error",
+            "sourceRepoURL": "https://github.com/bjyoungblood/es6-error",
+            "asOfVersion": "4.0.2"
+        },
+        {
+            "libraryName": "es6-promise",
+            "typingsPackageName": "es6-promise",
+            "sourceRepoURL": "https://github.com/jakearchibald/ES6-Promise",
+            "asOfVersion": "3.3.0"
+        },
         {
             "libraryName": "eventemitter2",
             "typingsPackageName": "eventemitter2",
@@ -186,12 +474,24 @@
             "sourceRepoURL": "https://github.com/primus/eventemitter3",
             "asOfVersion": "2.0.2"
         },
+        {
+            "libraryName": "expr-eval",
+            "typingsPackageName": "expr-eval",
+            "sourceRepoURL": "https://github.com/silentmatt/expr-eval",
+            "asOfVersion": "1.1.0"
+        },
         {
             "libraryName": "express-validator",
             "typingsPackageName": "express-validator",
             "sourceRepoURL": "https://github.com/ctavan/express-validator",
             "asOfVersion": "3.0.0"
         },
+        {
+            "libraryName": "extended-listbox",
+            "typingsPackageName": "extended-listbox",
+            "sourceRepoURL": "https://github.com/code-chris/extended-listbox",
+            "asOfVersion": "4.0.1"
+        },
         {
             "libraryName": "JSON-Patch",
             "typingsPackageName": "fast-json-patch",
@@ -204,30 +504,120 @@
             "sourceRepoURL": "https://www.npmjs.com/package/fast-simplex-noise",
             "asOfVersion": "3.0.0"
         },
+        {
+            "libraryName": "fecha",
+            "typingsPackageName": "fecha",
+            "sourceRepoURL": "https://github.com/taylorhakes/fecha",
+            "asOfVersion": "2.3.1"
+        },
         {
             "libraryName": "FineUploader",
             "typingsPackageName": "fine-uploader",
             "sourceRepoURL": "http://fineuploader.com/",
             "asOfVersion": "5.14.0"
         },
+        {
+            "libraryName": "Firebase API",
+            "typingsPackageName": "firebase",
+            "sourceRepoURL": "https://www.firebase.com/docs/javascript/firebase",
+            "asOfVersion": "3.2.1"
+        },
+        {
+            "libraryName": "flatpickr",
+            "typingsPackageName": "flatpickr",
+            "sourceRepoURL": "https://github.com/chmln/flatpickr",
+            "asOfVersion": "3.1.2"
+        },
+        {
+            "libraryName": "flux-standard-action",
+            "typingsPackageName": "flux-standard-action",
+            "sourceRepoURL": "https://github.com/acdlite/flux-standard-action",
+            "asOfVersion": "1.1.0"
+        },
+        {
+            "libraryName": "Foundation Sites",
+            "typingsPackageName": "foundation-sites",
+            "sourceRepoURL": "http://foundation.zurb.com/",
+            "asOfVersion": "6.4.3"
+        },
+        {
+            "libraryName": "FullCalendar",
+            "typingsPackageName": "fullcalendar",
+            "sourceRepoURL": "http://arshaw.com/fullcalendar/",
+            "asOfVersion": "3.8.0"
+        },
         {
             "libraryName": "gaea-model",
             "typingsPackageName": "gaea-model",
             "sourceRepoURL": "https://github.com/ascoders/gaea-model",
             "asOfVersion": "0.0.0"
         },
+        {
+            "libraryName": "geolib",
+            "typingsPackageName": "geolib",
+            "sourceRepoURL": "https://github.com/manuelbieh/Geolib",
+            "asOfVersion": "2.0.23"
+        },
         {
             "libraryName": "github",
             "typingsPackageName": "github",
             "sourceRepoURL": "https://github.com/mikedeboer/node-github",
             "asOfVersion": "7.1.0"
         },
+        {
+            "libraryName": "graphene-pk11",
+            "typingsPackageName": "graphene-pk11",
+            "sourceRepoURL": "https://github.com/PeculiarVentures/graphene",
+            "asOfVersion": "2.0.31"
+        },
+        {
+            "libraryName": "griddle-react",
+            "typingsPackageName": "griddle-react",
+            "sourceRepoURL": "https://github.com/griddlegriddle/griddle",
+            "asOfVersion": "1.3.0"
+        },
+        {
+            "libraryName": "gulp-tslint",
+            "typingsPackageName": "gulp-tslint",
+            "sourceRepoURL": "https://github.com/panuhorsmalahti/gulp-tslint",
+            "asOfVersion": "4.2.0"
+        },
         {
             "libraryName": "gulp-typescript",
             "typingsPackageName": "gulp-typescript",
             "sourceRepoURL": "https://github.com/ivogabe/gulp-typescript",
             "asOfVersion": "2.13.0"
         },
+        {
+            "libraryName": "handsontable",
+            "typingsPackageName": "handsontable",
+            "sourceRepoURL": "https://handsontable.com/",
+            "asOfVersion": "0.35.0"
+        },
+        {
+            "libraryName": "homeworks",
+            "typingsPackageName": "homeworks",
+            "sourceRepoURL": "https://github.com/IGAWorksDev/homeworks/",
+            "asOfVersion": "1.0.19"
+        },
+        {
+            "libraryName": "http-status-codes",
+            "typingsPackageName": "http-status-codes",
+            "sourceRepoURL": "https://github.com/prettymuchbryce/node-http-status",
+            "asOfVersion": "1.2.0"
+        },
+        {
+            "libraryName": "iconv-lite",
+            "typingsPackageName": "iconv-lite",
+            "sourceRepoURL": "https://github.com/ashtuchkin/iconv-lite",
+            "asOfVersion": "0.4.14"
+        },
+        {
+            "libraryName": "immutability-helper",
+            "typingsPackageName": "immutability-helper",
+            "sourceRepoURL": "https://github.com/kolodny/immutability-helper",
+            "asOfVersion": "2.6.3"
+        },
         {
             "libraryName": "Facebook's Immutable",
             "typingsPackageName": "immutable",
@@ -270,18 +660,54 @@
             "sourceRepoURL": "https://github.com/inversify/inversify-restify-utils",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "Ionic",
+            "typingsPackageName": "ionic",
+            "sourceRepoURL": "http://ionicframework.com",
+            "asOfVersion": "3.19.0"
+        },
         {
             "libraryName": "is-lower-case",
             "typingsPackageName": "is-lower-case",
             "sourceRepoURL": "https://github.com/blakeembrey/is-lower-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "is-plain-object",
+            "typingsPackageName": "is-plain-object",
+            "sourceRepoURL": "https://github.com/jonschlinkert/is-plain-object",
+            "asOfVersion": "2.0.4"
+        },
         {
             "libraryName": "is-upper-case",
             "typingsPackageName": "is-upper-case",
             "sourceRepoURL": "https://github.com/blakeembrey/is-upper-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "jasmine-expect",
+            "typingsPackageName": "jasmine-expect",
+            "sourceRepoURL": "https://github.com/JamieMason/Jasmine-Matchers",
+            "asOfVersion": "3.8.1"
+        },
+        {
+            "libraryName": "jimp",
+            "typingsPackageName": "jimp",
+            "sourceRepoURL": "https://github.com/oliver-moran/jimp#readme",
+            "asOfVersion": "0.2.28"
+        },
+        {
+            "libraryName": "joData",
+            "typingsPackageName": "jodata",
+            "sourceRepoURL": "https://github.com/mccow002/joData",
+            "asOfVersion": "1.0.13"
+        },
+        {
+            "libraryName": "JointJS",
+            "typingsPackageName": "jointjs",
+            "sourceRepoURL": "http://www.jointjs.com/",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "jpush-react-native",
             "typingsPackageName": "jpush-react-native",
@@ -300,6 +726,12 @@
             "sourceRepoURL": "https://github.com/js-data/js-data",
             "asOfVersion": "3.0.0"
         },
+        {
+            "libraryName": "JSData Http Adapter",
+            "typingsPackageName": "js-data-http",
+            "sourceRepoURL": "https://github.com/js-data/js-data-http",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "JSNLog",
             "typingsPackageName": "jsnlog",
@@ -312,6 +744,18 @@
             "sourceRepoURL": "https://github.com/tdegrunt/jsonschema",
             "asOfVersion": "1.1.1"
         },
+        {
+            "libraryName": "jsplumb",
+            "typingsPackageName": "jsplumb",
+            "sourceRepoURL": "https://github.com/jsplumb/jsPlumb",
+            "asOfVersion": "2.5.7"
+        },
+        {
+            "libraryName": "keycloak-js",
+            "typingsPackageName": "keycloak-js",
+            "sourceRepoURL": "https://github.com/keycloak/keycloak",
+            "asOfVersion": "3.4.1"
+        },
         {
             "libraryName": "knockout-paging",
             "typingsPackageName": "knockout-paging",
@@ -324,12 +768,30 @@
             "sourceRepoURL": "https://github.com/ErikSchierboom/knockout-pre-rendered",
             "asOfVersion": "0.7.1"
         },
+        {
+            "libraryName": "koa-jwt",
+            "typingsPackageName": "koa-jwt",
+            "sourceRepoURL": "https://github.com/koajs/jwt",
+            "asOfVersion": "3.3.0"
+        },
         {
             "libraryName": "lambda-phi",
             "typingsPackageName": "lambda-phi",
             "sourceRepoURL": "https://github.com/elitechance/lambda-phi",
             "asOfVersion": "1.0.1"
         },
+        {
+            "libraryName": "ldclient-js",
+            "typingsPackageName": "ldclient-js",
+            "sourceRepoURL": "https://github.com/launchdarkly/js-client",
+            "asOfVersion": "1.1.11"
+        },
+        {
+            "libraryName": "left-pad",
+            "typingsPackageName": "left-pad",
+            "sourceRepoURL": "https://github.com/stevemao/left-pad",
+            "asOfVersion": "1.2.0"
+        },
         {
             "libraryName": "Linq.JS",
             "typingsPackageName": "linq",
@@ -354,6 +816,12 @@
             "sourceRepoURL": "https://github.com/steelsojka/lodash-decorators",
             "asOfVersion": "4.0.0"
         },
+        {
+            "libraryName": "log4javascript",
+            "typingsPackageName": "log4javascript",
+            "sourceRepoURL": "http://log4javascript.org/",
+            "asOfVersion": "1.4.15"
+        },
         {
             "libraryName": "log4js",
             "typingsPackageName": "log4js",
@@ -384,6 +852,24 @@
             "sourceRepoURL": "http://www.mendix.com",
             "asOfVersion": "0.8.1"
         },
+        {
+            "libraryName": "metisMenu",
+            "typingsPackageName": "metismenu",
+            "sourceRepoURL": "https://github.com/onokumus/metisMenu",
+            "asOfVersion": "2.7.1"
+        },
+        {
+            "libraryName": "microgears",
+            "typingsPackageName": "microgears",
+            "sourceRepoURL": "https://github.com/marcusdb/microgears",
+            "asOfVersion": "4.0.5"
+        },
+        {
+            "libraryName": "mobile-detect",
+            "typingsPackageName": "mobile-detect",
+            "sourceRepoURL": "http://hgoebl.github.io/mobile-detect.js/",
+            "asOfVersion": "1.3.4"
+        },
         {
             "libraryName": "mobservable",
             "typingsPackageName": "mobservable",
@@ -402,6 +888,12 @@
             "sourceRepoURL": "https://github.com/moment/moment",
             "asOfVersion": "2.13.0"
         },
+        {
+            "libraryName": "Monk",
+            "typingsPackageName": "monk",
+            "sourceRepoURL": "https://github.com/LearnBoost/monk.git",
+            "asOfVersion": "6.0.0"
+        },
         {
             "libraryName": "MQTT",
             "typingsPackageName": "mqtt",
@@ -414,6 +906,12 @@
             "sourceRepoURL": "https://github.com/esvit/ng-table",
             "asOfVersion": "2.0.1"
         },
+        {
+            "libraryName": "node-pg-migrate",
+            "typingsPackageName": "node-pg-migrate",
+            "sourceRepoURL": "https://github.com/theoephraim/node-pg-migrate#readme",
+            "asOfVersion": "2.15.0"
+        },
         {
             "libraryName": "Normalizr",
             "typingsPackageName": "normalizr",
@@ -450,6 +948,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/pascal-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "passport-client-cert",
+            "typingsPackageName": "passport-client-cert",
+            "sourceRepoURL": "https://github.com/ripjar/passport-client-cert",
+            "asOfVersion": "2.1.0"
+        },
         {
             "libraryName": "path-case",
             "typingsPackageName": "path-case",
@@ -462,12 +966,30 @@
             "sourceRepoURL": "https://github.com/pillarjs/path-to-regexp",
             "asOfVersion": "1.7.0"
         },
+        {
+            "libraryName": "perfect-scrollbar",
+            "typingsPackageName": "perfect-scrollbar",
+            "sourceRepoURL": "https://github.com/noraesae/perfect-scrollbar",
+            "asOfVersion": "1.3.0"
+        },
+        {
+            "libraryName": "pg-connection-string",
+            "typingsPackageName": "pg-connection-string",
+            "sourceRepoURL": "https://github.com/iceddev/pg-connection-string",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "pg-promise",
             "typingsPackageName": "pg-promise",
             "sourceRepoURL": "https://github.com/vitaly-t/pg-promise",
             "asOfVersion": "5.4.3"
         },
+        {
+            "libraryName": "phonegap-plugin-push",
+            "typingsPackageName": "phonegap-plugin-push",
+            "sourceRepoURL": "https://github.com/phonegap/phonegap-plugin-push",
+            "asOfVersion": "2.1.2"
+        },
         {
             "libraryName": "pixi-spine",
             "typingsPackageName": "pixi-spine",
@@ -480,18 +1002,36 @@
             "sourceRepoURL": "https://github.com/PeculiarVentures/pkcs11js",
             "asOfVersion": "1.0.4"
         },
+        {
+            "libraryName": "plottable",
+            "typingsPackageName": "plottable",
+            "sourceRepoURL": "http://plottablejs.org/",
+            "asOfVersion": "3.7.0"
+        },
         {
             "libraryName": "poly2tri.js",
             "typingsPackageName": "poly2tri",
             "sourceRepoURL": "https://github.com/r3mi/poly2tri.js",
             "asOfVersion": "1.4.0"
         },
+        {
+            "libraryName": "popper.js",
+            "typingsPackageName": "popper.js",
+            "sourceRepoURL": "https://github.com/FezVrasta/popper.js/",
+            "asOfVersion": "1.11.0"
+        },
         {
             "libraryName": "Prando",
             "typingsPackageName": "prando",
             "sourceRepoURL": "https://github.com/zeh/prando",
             "asOfVersion": "1.0.0"
         },
+        {
+            "libraryName": "ProtoBuf.js",
+            "typingsPackageName": "protobufjs",
+            "sourceRepoURL": "https://github.com/dcodeIO/ProtoBuf.js",
+            "asOfVersion": "6.0.0"
+        },
         {
             "libraryName": "Protractor",
             "typingsPackageName": "protractor",
@@ -504,6 +1044,12 @@
             "sourceRepoURL": "https://github.com/qiniu/nodejs-sdk",
             "asOfVersion": "7.0.1"
         },
+        {
+            "libraryName": "qrcode-generator",
+            "typingsPackageName": "qrcode-generator",
+            "sourceRepoURL": "https://github.com/kazuhikoarase/qrcode-generator",
+            "asOfVersion": "1.0.6"
+        },
         {
             "libraryName": "Raven JS",
             "typingsPackageName": "raven-js",
@@ -516,12 +1062,66 @@
             "sourceRepoURL": "https://github.com/stream-utils/raw-body",
             "asOfVersion": "2.3.0"
         },
+        {
+            "libraryName": "react-chartjs-2",
+            "typingsPackageName": "react-chartjs-2",
+            "sourceRepoURL": "https://github.com/gor181/react-chartjs-2",
+            "asOfVersion": "2.5.7"
+        },
         {
             "libraryName": "react-day-picker",
             "typingsPackageName": "react-day-picker",
             "sourceRepoURL": "https://github.com/gpbl/react-day-picker",
             "asOfVersion": "5.3.0"
         },
+        {
+            "libraryName": "react-flip-move",
+            "typingsPackageName": "react-flip-move",
+            "sourceRepoURL": "https://github.com/joshwcomeau/react-flip-move",
+            "asOfVersion": "2.9.12"
+        },
+        {
+            "libraryName": "react-ga",
+            "typingsPackageName": "react-ga",
+            "sourceRepoURL": "https://github.com/react-ga/react-ga",
+            "asOfVersion": "2.3.0"
+        },
+        {
+            "libraryName": "react-native-elements",
+            "typingsPackageName": "react-native-elements",
+            "sourceRepoURL": "https://github.com/react-native-training/react-native-elements",
+            "asOfVersion": "0.18.0"
+        },
+        {
+            "libraryName": "react-native-goby",
+            "typingsPackageName": "react-native-goby",
+            "sourceRepoURL": "https://gitlab.com/MessageDream/react-native-goby",
+            "asOfVersion": "0.0.5"
+        },
+        {
+            "libraryName": "react-native-google-analytics-bridge",
+            "typingsPackageName": "react-native-google-analytics-bridge",
+            "sourceRepoURL": "https://github.com/idehub/react-native-google-analytics-bridge",
+            "asOfVersion": "5.3.3"
+        },
+        {
+            "libraryName": "react-native-modal",
+            "typingsPackageName": "react-native-modal",
+            "sourceRepoURL": "https://github.com/react-native-community/react-native-modal",
+            "asOfVersion": "4.1.1"
+        },
+        {
+            "libraryName": "react-split-pane",
+            "typingsPackageName": "react-split-pane",
+            "sourceRepoURL": "https://github.com/tomkp/react-split-pane",
+            "asOfVersion": "0.1.67"
+        },
+        {
+            "libraryName": "realm",
+            "typingsPackageName": "realm",
+            "sourceRepoURL": "https://github.com/realm/realm-js",
+            "asOfVersion": "1.13.0"
+        },
         {
             "libraryName": "Redux",
             "typingsPackageName": "redux",
@@ -534,6 +1134,12 @@
             "sourceRepoURL": "https://github.com/tshelburne/redux-batched-actions",
             "asOfVersion": "0.1.5"
         },
+        {
+            "libraryName": "react-bootstrap",
+            "typingsPackageName": "redux-bootstrap",
+            "sourceRepoURL": "https://github.com/remojansen/redux-bootstrap",
+            "asOfVersion": "1.1.0"
+        },
         {
             "libraryName": "redux-devtools-extension",
             "typingsPackageName": "redux-devtools-extension",
@@ -558,12 +1164,24 @@
             "sourceRepoURL": "https://github.com/redux-saga/redux-saga",
             "asOfVersion": "0.10.5"
         },
+        {
+            "libraryName": "redux-saga-routines",
+            "typingsPackageName": "redux-saga-routines",
+            "sourceRepoURL": "https://github.com/afitiskin/redux-saga-routines#readme",
+            "asOfVersion": "2.1.0"
+        },
         {
             "libraryName": "Redux Thunk",
             "typingsPackageName": "redux-thunk",
             "sourceRepoURL": "https://github.com/gaearon/redux-thunk",
             "asOfVersion": "2.1.0"
         },
+        {
+            "libraryName": "reflect-metadata",
+            "typingsPackageName": "reflect-metadata",
+            "sourceRepoURL": "https://github.com/rbuckton/ReflectDecorators",
+            "asOfVersion": "0.1.0"
+        },
         {
             "libraryName": "reselect",
             "typingsPackageName": "reselect",
@@ -588,6 +1206,12 @@
             "sourceRepoURL": "https://github.com/router5/router5",
             "asOfVersion": "5.0.0"
         },
+        {
+            "libraryName": "rvo2",
+            "typingsPackageName": "rvo2",
+            "sourceRepoURL": "https://github.com/TNOCS/rvo2",
+            "asOfVersion": "1.1.0"
+        },
         {
             "libraryName": "samchon",
             "typingsPackageName": "samchon",
@@ -624,36 +1248,102 @@
             "sourceRepoURL": "https://github.com/blakeembrey/sentence-case",
             "asOfVersion": "1.1.3"
         },
+        {
+            "libraryName": "sharp-timer",
+            "typingsPackageName": "sharp-timer",
+            "sourceRepoURL": "https://github.com/afractal/SharpTimer",
+            "asOfVersion": "0.1.3"
+        },
         {
             "libraryName": "Shopify Prime",
             "typingsPackageName": "shopify-prime",
             "sourceRepoURL": "https://github.com/nozzlegear/shopify-prime",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "should.js",
+            "typingsPackageName": "should",
+            "sourceRepoURL": "https://github.com/shouldjs/should.js",
+            "asOfVersion": "13.0.0"
+        },
         {
             "libraryName": "SimpleSignal",
             "typingsPackageName": "simplesignal",
             "sourceRepoURL": "https://github.com/zeh/simplesignal",
             "asOfVersion": "1.0.0"
         },
+        {
+            "libraryName": "smooth-scrollbar",
+            "typingsPackageName": "smooth-scrollbar",
+            "sourceRepoURL": "https://github.com/idiotWu/smooth-scrollbar",
+            "asOfVersion": "8.2.5"
+        },
+        {
+            "libraryName": "Smoothie Charts",
+            "typingsPackageName": "smoothie",
+            "sourceRepoURL": "https://github.com/joewalnes/smoothie",
+            "asOfVersion": "1.29.1"
+        },
         {
             "libraryName": "snake-case",
             "typingsPackageName": "snake-case",
             "sourceRepoURL": "https://github.com/blakeembrey/snake-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "soap",
+            "typingsPackageName": "soap",
+            "sourceRepoURL": "https://www.npmjs.com/package/soap",
+            "asOfVersion": "0.21.0"
+        },
+        {
+            "libraryName": "source-map",
+            "typingsPackageName": "source-map",
+            "sourceRepoURL": "https://github.com/mozilla/source-map",
+            "asOfVersion": "0.5.7"
+        },
+        {
+            "libraryName": "Spin.js",
+            "typingsPackageName": "spin.js",
+            "sourceRepoURL": "http://fgnass.github.com/spin.js/",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "spotify-web-api-js",
             "typingsPackageName": "spotify-web-api-js",
             "sourceRepoURL": "https://github.com/JMPerez/spotify-web-api-js",
             "asOfVersion": "0.21.0"
         },
+        {
+            "libraryName": "ServiceStack Utils",
+            "typingsPackageName": "ss-utils",
+            "sourceRepoURL": "https://servicestack.net/",
+            "asOfVersion": "0.1.5"
+        },
+        {
+            "libraryName": "striptags",
+            "typingsPackageName": "striptags",
+            "sourceRepoURL": "https://github.com/ericnorris/striptags",
+            "asOfVersion": "3.1.1"
+        },
         {
             "libraryName": "Sugar",
             "typingsPackageName": "sugar",
             "sourceRepoURL": "https://github.com/andrewplummer/Sugar",
             "asOfVersion": "2.0.2"
         },
+        {
+            "libraryName": "survey-knockout",
+            "typingsPackageName": "survey-knockout",
+            "sourceRepoURL": "http://surveyjs.org/",
+            "asOfVersion": "0.10.0"
+        },
+        {
+            "libraryName": "svg-pan-zoom",
+            "typingsPackageName": "svg-pan-zoom",
+            "sourceRepoURL": "https://github.com/ariutta/svg-pan-zoom",
+            "asOfVersion": "3.4.0"
+        },
         {
             "libraryName": "svg.js",
             "typingsPackageName": "svg.js",
@@ -666,6 +1356,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/swap-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "SweetAlert",
+            "typingsPackageName": "sweetalert",
+            "sourceRepoURL": "https://github.com/t4t5/sweetalert/",
+            "asOfVersion": "2.0.4"
+        },
         {
             "libraryName": "Tabris.js",
             "typingsPackageName": "tabris",
@@ -678,6 +1374,12 @@
             "sourceRepoURL": "http://gcanti.github.io/tcomb/guide/index.html",
             "asOfVersion": "2.6.0"
         },
+        {
+            "libraryName": "timezonecomplete",
+            "typingsPackageName": "timezonecomplete",
+            "sourceRepoURL": "https://github.com/SpiritIT/timezonecomplete",
+            "asOfVersion": "5.5.0"
+        },
         {
             "libraryName": "title-case",
             "typingsPackageName": "title-case",
@@ -714,6 +1416,12 @@
             "sourceRepoURL": "https://github.com/dpa99c/phonegap-istablet",
             "asOfVersion": "1.1.3"
         },
+        {
+            "libraryName": "uk.co.workingedge.phonegap.plugin.launchnavigator",
+            "typingsPackageName": "uk.co.workingedge.phonegap.plugin.launchnavigator",
+            "sourceRepoURL": "https://github.com/dpa99c/phonegap-launch-navigator",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "upper-case",
             "typingsPackageName": "upper-case",
@@ -726,6 +1434,18 @@
             "sourceRepoURL": "https://github.com/blakeembrey/upper-case-first",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "UUID.js",
+            "typingsPackageName": "uuidjs",
+            "sourceRepoURL": "https://github.com/LiosK/UUID.js",
+            "asOfVersion": "3.6.0"
+        },
+        {
+            "libraryName": "Validate.js",
+            "typingsPackageName": "validate.js",
+            "sourceRepoURL": "https://github.com/ansman/validate.js",
+            "asOfVersion": "0.11.0"
+        },
         {
             "libraryName": "vso-node-api",
             "typingsPackageName": "vso-node-api",
@@ -738,6 +1458,12 @@
             "sourceRepoURL": "https://github.com/vuejs/vue",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "vue-i18n",
+            "typingsPackageName": "vue-i18n",
+            "sourceRepoURL": "https://github.com/kazupon/vue-i18n",
+            "asOfVersion": "7.0.0"
+        },
         {
             "libraryName": "vue-router",
             "typingsPackageName": "vue-router",
@@ -750,12 +1476,42 @@
             "sourceRepoURL": "https://github.com/tgdwyer/WebCola",
             "asOfVersion": "3.2.0"
         },
+        {
+            "libraryName": "webgme",
+            "typingsPackageName": "webgme",
+            "sourceRepoURL": "https://webgme.org",
+            "asOfVersion": "2.11.0"
+        },
+        {
+            "libraryName": "wolfy87-eventemitter",
+            "typingsPackageName": "wolfy87-eventemitter",
+            "sourceRepoURL": "https://github.com/Wolfy87/EventEmitter",
+            "asOfVersion": "5.2.0"
+        },
+        {
+            "libraryName": "wonder-commonlib",
+            "typingsPackageName": "wonder-commonlib",
+            "sourceRepoURL": "https://github.com/yyc-git/Wonder-CommonLib",
+            "asOfVersion": "0.1.12"
+        },
+        {
+            "libraryName": "wonder-frp",
+            "typingsPackageName": "wonder-frp",
+            "sourceRepoURL": "https://github.com/yyc-git/Wonder-FRP",
+            "asOfVersion": "0.1.25"
+        },
         {
             "libraryName": "x2js",
             "typingsPackageName": "x2js",
             "sourceRepoURL": "https://code.google.com/p/x2js/",
             "asOfVersion": "3.1.0"
         },
+        {
+            "libraryName": "xadesjs",
+            "typingsPackageName": "xadesjs",
+            "sourceRepoURL": "https://github.com/PeculiarVentures/xadesjs",
+            "asOfVersion": "2.0.2"
+        },
         {
             "libraryName": "xlsx",
             "typingsPackageName": "xlsx",
@@ -774,6 +1530,12 @@
             "sourceRepoURL": "github.com/node-xmpp/node-xmpp/",
             "asOfVersion": "1.2.0"
         },
+        {
+            "libraryName": "zetapush-js",
+            "typingsPackageName": "zetapush-js",
+            "sourceRepoURL": "https://github.com/zetapush/zetapush-js",
+            "asOfVersion": "3.1.2"
+        },
         {
             "libraryName": "Zone.js",
             "typingsPackageName": "zone.js",
diff --git a/types/absolute/tslint.json b/types/absolute/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/absolute/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/acc-wizard/tslint.json b/types/acc-wizard/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/acc-wizard/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/accepts/index.d.ts b/types/accepts/index.d.ts
index 08ac71e919..33ee0db8a1 100644
--- a/types/accepts/index.d.ts
+++ b/types/accepts/index.d.ts
@@ -1,13 +1,14 @@
 // Type definitions for accepts 1.3
 // Project: https://github.com/jshttp/accepts
 // Definitions by: Stefan Reichel <https://github.com/bomret>
+//                 Brice BERNARD <https://github.com/brikou>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace accepts {
-    interface Headers {
-        [key: string]: string | string[];
-    }
+/// <reference types="node" />
 
+import { IncomingMessage } from "http";
+
+declare namespace accepts {
     interface Accepts {
         /**
          * Return the first accepted charset. If nothing in `charsets` is accepted, then `false` is returned.
@@ -55,6 +56,6 @@ declare namespace accepts {
     }
 }
 
-declare function accepts(req: { headers: accepts.Headers }): accepts.Accepts;
+declare function accepts(req: IncomingMessage): accepts.Accepts;
 
 export = accepts;
diff --git a/types/ace/index.d.ts b/types/ace/index.d.ts
index 456727756c..822c394a32 100644
--- a/types/ace/index.d.ts
+++ b/types/ace/index.d.ts
@@ -345,18 +345,47 @@ declare namespace AceAjax {
         insert(position: Position, text: string): any;
 
         /**
-         * Inserts the elements in `lines` into the document, starting at the row index given by `row`. This method also triggers the `'change'` event.
-         * @param row The index of the row to insert at
-         * @param lines An array of strings
-        **/
+         * @deprecated Use the insertFullLines method instead.
+         */
         insertLines(row: number, lines: string[]): any;
 
         /**
-         * Inserts a new line into the document at the current row's `position`. This method also triggers the `'change'` event.
-         * @param position The position to insert at
-        **/
+         * Inserts the elements in `lines` into the document as full lines (does not merge with existing line), starting at the row index given by `row`. This method also triggers the `"change"` event.
+         * @param {Number} row The index of the row to insert at
+         * @param {Array} lines An array of strings
+         * @returns {Object} Contains the final row and column, like this:
+         *   ```
+         *   {row: endRow, column: 0}
+         *   ```
+         *   If `lines` is empty, this function returns an object containing the current row, and column, like this:
+         *   ```
+         *   {row: row, column: 0}
+         *   ```
+         *
+         **/
+        insertFullLines(row: number, lines: string[]): any;
+
+        /**
+         * @deprecated Use insertMergedLines(position, ['', '']) instead.
+         */
         insertNewLine(position: Position): any;
 
+        /**
+         * Inserts the elements in `lines` into the document, starting at the position index given by `row`. This method also triggers the `"change"` event.
+         * @param {Number} row The index of the row to insert at
+         * @param {Array} lines An array of strings
+         * @returns {Object} Contains the final row and column, like this:
+         *   ```
+         *   {row: endRow, column: 0}
+         *   ```
+         *   If `lines` is empty, this function returns an object containing the current row, and column, like this:
+         *   ```
+         *   {row: row, column: 0}
+         *   ```
+         *
+         **/
+        insertMergedLines(row: number, lines: string[]): any;
+
         /**
          * Inserts `text` into the `position` at the current row. This method also triggers the `'change'` event.
          * @param position The position to insert at
@@ -379,12 +408,19 @@ declare namespace AceAjax {
         removeInLine(row: number, startColumn: number, endColumn: number): any;
 
         /**
-         * Removes a range of full lines. This method also triggers the `'change'` event.
-         * @param firstRow The first row to be removed
-         * @param lastRow The last row to be removed
-        **/
+         * @deprecated Use the removeFullLines method instead.
+         */
         removeLines(firstRow: number, lastRow: number): string[];
 
+        /**
+         * Removes a range of full lines. This method also triggers the `"change"` event.
+         * @param {Number} firstRow The first row to be removed
+         * @param {Number} lastRow The last row to be removed
+         * @returns {[String]} Returns all the removed lines.
+         *
+         **/
+        removeFullLines(firstRow: number, lastRow: number): string[];
+
         /**
          * 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
@@ -474,9 +510,9 @@ declare namespace AceAjax {
         removeFold(arg: any): void;
 
         expandFold(arg: any): void;
-        
+
         foldAll(startRow?: number, endRow?: number, depth?: number): void
-        
+
         unfold(arg1: any, arg2: boolean): void;
 
         screenToDocumentColumn(row: number, column: number): void;
@@ -2659,9 +2695,9 @@ declare namespace AceAjax {
         characterWidth: number;
 
         lineHeight: number;
-        
+
         setScrollMargin(top:number, bottom:number, left: number, right: number): void;
-        
+
         screenToTextCoordinates(left: number, top: number): void;
 
         /**
diff --git a/types/ace/tslint.json b/types/ace/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ace/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/acl/tslint.json b/types/acl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/acl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/acorn/acorn-tests.ts b/types/acorn/acorn-tests.ts
index 72ca71d2f6..7574df2481 100644
--- a/types/acorn/acorn-tests.ts
+++ b/types/acorn/acorn-tests.ts
@@ -1,13 +1,13 @@
 import acorn = require('acorn');
 import * as ESTree from 'estree';
 
-declare var token: acorn.Token;
-declare var tokens: acorn.Token[];
-declare var comment: acorn.Comment;
-declare var comments: acorn.Comment[];
-declare var program: ESTree.Program;
-var any: any;
-var string: string;
+declare let token: acorn.Token;
+declare let tokens: acorn.Token[];
+declare let comment: acorn.Comment;
+declare let comments: acorn.Comment[];
+declare let program: ESTree.Program;
+let any: any;
+let string: string;
 
 // acorn
 string = acorn.version;
@@ -32,16 +32,12 @@ const parser = new acorn.Parser({}, 'export default ""', 0);
 const node = new acorn.Node(parser, 1, 1);
 
 class LooseParser {
-    constructor(input: string, options = {}) {
-
-    }
+    constructor(input: string, options = {}) {}
 
     // this means you can extend LooseParser
-    test() {
-
-    }
+    test() {}
 }
-acorn.addLooseExports(function () {
+acorn.addLooseExports(() => {
     return {
         type: 'Program',
         sourceType: 'script',
@@ -50,7 +46,7 @@ acorn.addLooseExports(function () {
                 type: 'EmptyStatement'
             }
         ]
-    }
+    };
 }, LooseParser, {});
 
 acorn.parseExpressionAt('string', 2);
@@ -63,8 +59,7 @@ acorn.isIdentifierChar(56);
 
 acorn.getLineInfo('string', 56);
 
-acorn.plugins['test'] = function (p: acorn.Parser, config: any) {
-}
+acorn.plugins['test'] = (p: acorn.Parser, config: any) => {};
 
 acorn.tokenizer('console.log("hello world)', {locations: true}).getToken();
 acorn.tokenizer('console.log("hello world)', {locations: true})[Symbol.iterator]().next();
diff --git a/types/acorn/index.d.ts b/types/acorn/index.d.ts
index ce7da6d368..5d02bd716c 100644
--- a/types/acorn/index.d.ts
+++ b/types/acorn/index.d.ts
@@ -1,10 +1,8 @@
-// Type definitions for Acorn v4.0.3
+// Type definitions for Acorn 4.0
 // Project: https://github.com/marijnh/acorn
 // Definitions by: RReverser <https://github.com/RReverser>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="estree" />
-
 export as namespace acorn;
 export = acorn;
 import * as ESTree from 'estree';
@@ -181,7 +179,7 @@ declare namespace acorn {
         _typeof: TokenType;
         _void: TokenType;
         _delete: TokenType;
-    }
+    };
 
     class TokContext {
         constructor(token: string, isExpr: boolean, preserveSpace: boolean, override: (p: Parser) => void);
@@ -230,19 +228,18 @@ declare namespace acorn {
 
     const version: string;
 
-    interface IParse {
-        (input: string, options?: Options): ESTree.Program;
-    }
+    // TODO: rename type.
+    type IParse = (input: string, options?: Options) => ESTree.Program;
 
     const parse: IParse;
 
     function parseExpressionAt(input: string, pos?: number, options?: Options): ESTree.Expression;
 
     interface ITokenizer {
-      getToken() : Token,
-      [Symbol.iterator](): Iterator<Token>
+      getToken(): Token;
+      [Symbol.iterator](): Iterator<Token>;
     }
-  
+
     function tokenizer(input: string, options: Options): ITokenizer;
 
     let parse_dammit: IParse | undefined;
@@ -250,12 +247,10 @@ declare namespace acorn {
     let pluginsLoose: PluginsObject | undefined;
 
     interface ILooseParserClass {
-        new (input: string, options?: Options): ILooseParser
+        new (input: string, options?: Options): ILooseParser;
     }
 
-    interface ILooseParser {
-
-    }
+    interface ILooseParser {}
 
     function addLooseExports(parse: IParse, parser: ILooseParserClass, plugins: PluginsObject): void;
 }
diff --git a/types/acorn/tslint.json b/types/acorn/tslint.json
new file mode 100644
index 0000000000..2d05b8507c
--- /dev/null
+++ b/types/acorn/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "export-just-namespace": false,
+        "interface-name": false,
+        "no-empty-interface": false,
+        "no-unnecessary-class": false
+    }
+}
diff --git a/types/actioncable/tslint.json b/types/actioncable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/actioncable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/actions-on-google/NOTICE b/types/actions-on-google/NOTICE
new file mode 100644
index 0000000000..262b08db36
--- /dev/null
+++ b/types/actions-on-google/NOTICE
@@ -0,0 +1,13 @@
+License Notices:
+
+The API definitions are from Actions on Google reference site [1] and actions-on-google library [2].
+The actions-on-google library is licensed under the Apache 2.0 License [3].
+
+The code documentation is reproduced from work created and shared by Google [4]
+and used according to terms described in the Creative Commons 3.0 Attribution License [5].
+
+[1] https://developers.google.com/actions/
+[2] https://github.com/actions-on-google/actions-on-google-nodejs
+[3] http://www.apache.org/licenses/LICENSE-2.0
+[4] https://developers.google.com/readme/policies/
+[5] http://creativecommons.org/licenses/by/3.0/
diff --git a/types/actions-on-google/actions-on-google-tests.ts b/types/actions-on-google/actions-on-google-tests.ts
new file mode 100644
index 0000000000..e57e1e8d98
--- /dev/null
+++ b/types/actions-on-google/actions-on-google-tests.ts
@@ -0,0 +1,33 @@
+import { ActionsSdkApp, ActionsSdkAppOptions, DialogflowApp, DialogflowAppOptions, AssistantApp,
+    Responses, Transactions } from 'actions-on-google';
+import * as express from 'express';
+
+function testActionsSdk(request: express.Request, response: express.Response) {
+    const app = new ActionsSdkApp({request, response});
+    const actionMap = new Map();
+    actionMap.set(app.StandardIntents.MAIN, () => {
+        const richResponse: Responses.RichResponse = app.buildRichResponse()
+            .addSimpleResponse('Hello world')
+            .addSuggestions(['foo', 'bar']);
+        app.ask(richResponse);
+    });
+    app.handleRequest(actionMap);
+}
+
+function testDialogflow(request: express.Request, response: express.Response) {
+    const app = new DialogflowApp({request, response});
+    const actionMap = new Map();
+    actionMap.set(app.StandardIntents.MAIN, () => {
+        const order: Transactions.Order = app.buildOrder('foo');
+        app.askForTransactionDecision(order, {
+            type: app.Transactions.PaymentType.PAYMENT_CARD,
+            displayName: 'VISA-1234',
+            deliveryAddressRequired: true
+        });
+    });
+    app.handleRequest(actionMap);
+}
+
+const expressApp = express();
+expressApp.get('/actionssdk', testActionsSdk);
+expressApp.get('/dialogflow', testDialogflow);
diff --git a/types/actions-on-google/actions-sdk-app.d.ts b/types/actions-on-google/actions-sdk-app.d.ts
new file mode 100644
index 0000000000..afa422fad3
--- /dev/null
+++ b/types/actions-on-google/actions-sdk-app.d.ts
@@ -0,0 +1,427 @@
+import * as express from 'express';
+
+import { AssistantApp } from './assistant-app';
+import { Carousel, List, RichResponse, SimpleResponse } from './response-builder';
+
+// ---------------------------------------------------------------------------
+//                   Actions SDK support
+// ---------------------------------------------------------------------------
+
+export interface ActionsSdkAppOptions {
+    /** Express HTTP request object. */
+    request: express.Request;
+    /** Express HTTP response object. */
+    response: express.Response;
+    /** Function callback when session starts. */
+    sessionStarted?(): any;
+}
+
+/**
+ * This is the class that handles the conversation API directly from Assistant,
+ * providing implementation for all the methods available in the API.
+ */
+export class ActionsSdkApp extends AssistantApp {
+    /**
+     * Constructor for ActionsSdkApp object.
+     * To be used in the Actions SDK HTTP endpoint logic.
+     *
+     * @example
+     * const ActionsSdkApp = require('actions-on-google').ActionsSdkApp;
+     * const app = new ActionsSdkApp({request: request, response: response,
+     *   sessionStarted:sessionStarted});
+     *
+     * @actionssdk
+     */
+    constructor(options: ActionsSdkAppOptions);
+
+    /**
+     * @deprecated
+     * Validates whether request is from Assistant through signature verification.
+     * Uses Google-Auth-Library to verify authorization token against given
+     * Google Cloud Project ID. Auth token is given in request header with key,
+     * "Authorization".
+     *
+     * @example
+     * const app = new ActionsSdkApp({request, response});
+     * app.isRequestFromAssistant('nodejs-cloud-test-project-1234')
+     *   .then(() => {
+     *     app.ask('Hey there, thanks for stopping by!');
+     *   })
+     *   .catch(err => {
+     *     response.status(400).send();
+     *   });
+     *
+     * @param projectId Google Cloud Project ID for the Assistant app.
+     * @return Promise resolving with google-auth-library LoginTicket
+     *     if request is from a valid source, otherwise rejects with the error reason
+     *     for an invalid token.
+     * @actionssdk
+     */
+    isRequestFromAssistant(projectId: string): Promise<object>;
+
+    /**
+     * Validates whether request is from Google through signature verification.
+     * Uses Google-Auth-Library to verify authorization token against given
+     * Google Cloud Project ID. Auth token is given in request header with key,
+     * "Authorization".
+     *
+     * @example
+     * const app = new ActionsSdkApp({request, response});
+     * app.isRequestFromGoogle('nodejs-cloud-test-project-1234')
+     *   .then(() => {
+     *     app.ask('Hey there, thanks for stopping by!');
+     *   })
+     *   .catch(err => {
+     *     response.status(400).send();
+     *   });
+     *
+     * @param projectId Google Cloud Project ID for the Assistant app.
+     * @return Promise resolving with google-auth-library LoginTicket
+     *     if request is from a valid source, otherwise rejects with the error reason
+     *     for an invalid token.
+     * @actionssdk
+     */
+    isRequestFromGoogle(projectId: string): Promise<object>;
+
+    /**
+     * Gets the request Conversation API version.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * const apiVersion = app.getApiVersion();
+     *
+     * @return Version value or null if no value.
+     * @actionssdk
+     */
+    getApiVersion(): string;
+
+    /**
+     * Gets the user's raw input query.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * app.tell('You said ' + app.getRawInput());
+     *
+     * @return User's raw query or null if no value.
+     * @actionssdk
+     */
+    getRawInput(): string;
+
+    /**
+     * Gets previous JSON dialog state that the app sent to Assistant.
+     * Alternatively, use the app.data field to store JSON values between requests.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * const dialogState = app.getDialogState();
+     *
+     * @return JSON object provided to the Assistant in the previous
+     *     user turn or {} if no value.
+     * @actionssdk
+     */
+    getDialogState(): any;
+
+    /**
+     * Gets the "versionLabel" specified inside the Action Package.
+     * Used by app to do version control.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * const actionVersionLabel = app.getActionVersionLabel();
+     *
+     * @return The specified version label or null if unspecified.
+     * @actionssdk
+     */
+    getActionVersionLabel(): string;
+
+    /**
+     * Gets the unique conversation ID. It's a new ID for the initial query,
+     * and stays the same until the end of the conversation.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * const conversationId = app.getConversationId();
+     *
+     * @return Conversation ID or null if no value.
+     * @actionssdk
+     */
+    getConversationId(): string;
+
+    /**
+     * Get the current intent. Alternatively, using a handler Map with
+     * {@link AssistantApp#handleRequest|handleRequest}, the client library will
+     * automatically handle the incoming intents.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     *
+     * function responseHandler (app) {
+     *   const intent = app.getIntent();
+     *   switch (intent) {
+     *     case app.StandardIntents.MAIN:
+     *       const inputPrompt = app.buildInputPrompt(false, 'Welcome to action snippets! Say anything.');
+     *       app.ask(inputPrompt);
+     *       break;
+     *
+     *     case app.StandardIntents.TEXT:
+     *       app.tell('You said ' + app.getRawInput());
+     *       break;
+     *   }
+     * }
+     *
+     * app.handleRequest(responseHandler);
+     *
+     * @return Intent id or null if no value.
+     * @actionssdk
+     */
+    getIntent(): string;
+
+    /**
+     * Get the argument value by name from the current intent. If the argument
+     * is not a text argument, the entire argument object is returned.
+     *
+     * Note: If incoming request is using an API version under 2 (e.g. 'v1'),
+     * the argument object will be in Proto2 format (snake_case, etc).
+     *
+     * @param argName Name of the argument.
+     * @return Argument value matching argName
+     *     or null if no matching argument.
+     * @actionssdk
+     */
+    getArgument(argName: string): string;
+
+    /**
+     * Returns the option key user chose from options response.
+     *
+     * @example
+     * const app = new App({request: req, response: res});
+     *
+     * function pickOption (app) {
+     *   if (app.hasSurfaceCapability(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     app.askWithCarousel('Which of these looks good?',
+     *       app.buildCarousel().addItems(
+     *         app.buildOptionItem('another_choice', ['Another choice']).
+     *         setTitle('Another choice').setDescription('Choose me!')));
+     *   } else {
+     *     app.ask('What would you like?');
+     *   }
+     * }
+     *
+     * function optionPicked (app) {
+     *   app.ask('You picked ' + app.getSelectedOption());
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.TEXT, pickOption);
+     * actionMap.set(app.StandardIntents.OPTION, optionPicked);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * @return Option key of selected item. Null if no option selected or
+     *     if current intent is not OPTION intent.
+     * @actionssdk
+     */
+    getSelectedOption(): string;
+
+    /**
+     * Asks to collect user's input; all user's queries need to be sent to the app.
+     * {@link https://developers.google.com/actions/policies/general-policies#user_experience|
+     *     The guidelines when prompting the user for a response must be followed at all times}.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     *
+     * const noInputs = [
+     *   `I didn't hear a number`,
+     *   `If you're still there, what's the number?`,
+     *   'What is the number?'
+     * ];
+     *
+     * function mainIntent (app) {
+     *   const ssml = '<speak>Hi! <break time="1"/> ' +
+     *     'I can read out an ordinal like ' +
+     *     '<say-as interpret-as="ordinal">123</say-as>. Say a number.</speak>';
+     *   const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *   app.ask(inputPrompt);
+     * }
+     *
+     * function rawInput (app) {
+     *   if (app.getRawInput() === 'bye') {
+     *     app.tell('Goodbye!');
+     *   } else {
+     *     const ssml = '<speak>You said, <say-as interpret-as="ordinal">' +
+     *       app.getRawInput() + '</say-as></speak>';
+     *     const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *     app.ask(inputPrompt);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MAIN, mainIntent);
+     * actionMap.set(app.StandardIntents.TEXT, rawInput);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * @param inputPrompt Holding initial and
+     *     no-input prompts.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by App.
+     * @return The response that is sent to Assistant to ask user to provide input.
+     * @actionssdk
+     */
+    ask(inputPrompt: object | SimpleResponse | RichResponse, dialogState?: object): express.Response | null;
+
+    /**
+     * Asks to collect user's input with a list.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request, response});
+     *
+     * function welcomeIntent (app) {
+     *   app.askWithList('Which of these looks good?',
+     *     app.buildList('List title')
+     *      .addItems([
+     *        app.buildOptionItem(SELECTION_KEY_ONE,
+     *          ['synonym of KEY_ONE 1', 'synonym of KEY_ONE 2'])
+     *          .setTitle('Number one'),
+     *        app.buildOptionItem(SELECTION_KEY_TWO,
+     *          ['synonym of KEY_TWO 1', 'synonym of KEY_TWO 2'])
+     *          .setTitle('Number two'),
+     *      ]));
+     * }
+     *
+     * function optionIntent (app) {
+     *   if (app.getSelectedOption() === SELECTION_KEY_ONE) {
+     *     app.tell('Number one is a great choice!');
+     *   } else {
+     *     app.tell('Number two is a great choice!');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.TEXT, welcomeIntent);
+     * actionMap.set(app.StandardIntents.OPTION, optionIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param inputPrompt Holding initial and
+     *     no-input prompts. Cannot contain basic card.
+     * @param list List built with {@link AssistantApp#buildList|buildList}.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant.
+     * @return The response that is sent to Assistant to ask user to provide input.
+     * @actionssdk
+     */
+    askWithList(inputPrompt: object | SimpleResponse | RichResponse, list: List, dialogState?: object): express.Response | null;
+
+    /**
+     * Asks to collect user's input with a carousel.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request, response});
+     *
+     * function welcomeIntent (app) {
+     *   app.askWithCarousel('Which of these looks good?',
+     *     app.buildCarousel()
+     *      .addItems([
+     *        app.buildOptionItem(SELECTION_KEY_ONE,
+     *          ['synonym of KEY_ONE 1', 'synonym of KEY_ONE 2'])
+     *          .setTitle('Number one'),
+     *        app.buildOptionItem(SELECTION_KEY_TWO,
+     *          ['synonym of KEY_TWO 1', 'synonym of KEY_TWO 2'])
+     *          .setTitle('Number two'),
+     *      ]));
+     * }
+     *
+     * function optionIntent (app) {
+     *   if (app.getSelectedOption() === SELECTION_KEY_ONE) {
+     *     app.tell('Number one is a great choice!');
+     *   } else {
+     *     app.tell('Number two is a great choice!');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.TEXT, welcomeIntent);
+     * actionMap.set(app.StandardIntents.OPTION, optionIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param inputPrompt Holding initial and
+     *     no-input prompts. Cannot contain basic card.
+     * @param carousel Carousel built with
+     *      {@link AssistantApp#buildCarousel|buildCarousel}.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant.
+     * @return The response that is sent to Assistant to ask user to provide input.
+     * @actionssdk
+     */
+    askWithCarousel(inputPrompt: object | SimpleResponse | RichResponse, carousel: Carousel, dialogState?: object): express.Response | null;
+
+    /**
+     * Tells Assistant to render the speech response and close the mic.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     *
+     * const noInputs = [
+     *   `I didn't hear a number`,
+     *   `If you're still there, what's the number?`,
+     *   'What is the number?'
+     * ];
+     *
+     * function mainIntent (app) {
+     *   const ssml = '<speak>Hi! <break time="1"/> ' +
+     *     'I can read out an ordinal like ' +
+     *     '<say-as interpret-as="ordinal">123</say-as>. Say a number.</speak>';
+     *   const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *   app.ask(inputPrompt);
+     * }
+     *
+     * function rawInput (app) {
+     *   if (app.getRawInput() === 'bye') {
+     *     app.tell('Goodbye!');
+     *   } else {
+     *     const ssml = '<speak>You said, <say-as interpret-as="ordinal">' +
+     *       app.getRawInput() + '</say-as></speak>';
+     *     const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *     app.ask(inputPrompt);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MAIN, mainIntent);
+     * actionMap.set(app.StandardIntents.TEXT, rawInput);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * @param textToSpeech Final response.
+     *     Spoken response can be SSML.
+     * @return The HTTP response that is sent back to Assistant.
+     * @actionssdk
+     */
+    tell(textToSpeech: string | SimpleResponse | RichResponse): express.Response | null;
+
+    /**
+     * Builds the {@link https://developers.google.com/actions/reference/conversation#InputPrompt|InputPrompt object}
+     *     from initial prompt and no-input prompts.
+     *
+     * The App needs one initial prompt to start the conversation. If there is no user response,
+     * the App re-opens the mic and renders the no-input prompts three times
+     * (one for each no-input prompt that was configured) to help the user
+     * provide the right response.
+     *
+     * Note: we highly recommend app to provide all the prompts required here in order to ensure a
+     * good user experience.
+     *
+     * @example
+     * const inputPrompt = app.buildInputPrompt(false, 'Welcome to action snippets! Say a number.',
+     *     ['Say any number', 'Pick a number', 'What is the number?']);
+     * app.ask(inputPrompt);
+     *
+     * @param isSsml Indicates whether the text to speech is SSML or not.
+     * @param initialPrompt The initial prompt the App asks the user.
+     * @param noInputs Array of re-prompts when the user does not respond (max 3).
+     * @return.
+     * @actionssdk
+     */
+    buildInputPrompt(isSsml: boolean, initialPrompt: string, noInputs?: string[]): object;
+}
diff --git a/types/actions-on-google/assistant-app.d.ts b/types/actions-on-google/assistant-app.d.ts
new file mode 100644
index 0000000000..58d933baf2
--- /dev/null
+++ b/types/actions-on-google/assistant-app.d.ts
@@ -0,0 +1,1545 @@
+import * as express from 'express';
+
+import { BasicCard, Carousel, ImageDisplays, List, OptionItem, RichResponse } from './response-builder';
+import { ActionPaymentTransactionConfig, Cart, GooglePaymentTransactionConfig, LineItem,
+         Location, Order, OrderUpdate, TransactionDecision, TransactionValues } from './transactions';
+
+//
+// Note: These enums are exported due to limitations with Typescript and this
+// library. If you try to import and access them they'll end up null at runtime.
+// Either access them through an AssistantApp instance or AssistantApp.prototype.
+//
+
+/**
+ * List of standard intents that the app provides.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum StandardIntents {
+    /** App fires MAIN intent for queries like [talk to $app]. */
+    MAIN,
+    /** App fires TEXT intent when action issues ask intent. */
+    TEXT,
+    /** App fires PERMISSION intent when action invokes askForPermission. */
+    PERMISSION,
+    /** App fires OPTION intent when user chooses from options provided. */
+    OPTION,
+    /** App fires TRANSACTION_REQUIREMENTS_CHECK intent when action sets up transaction. */
+    TRANSACTION_REQUIREMENTS_CHECK,
+    /** App fires DELIVERY_ADDRESS intent when action asks for delivery address. */
+    DELIVERY_ADDRESS,
+    /** App fires TRANSACTION_DECISION intent when action asks for transaction decision. */
+    TRANSACTION_DECISION,
+    /** App fires CONFIRMATION intent when requesting affirmation from user. */
+    CONFIRMATION,
+    /** App fires DATETIME intent when requesting date/time from user. */
+    DATETIME,
+    /** App fires SIGN_IN intent when requesting sign-in from user. */
+    SIGN_IN,
+    /** App fires NO_INPUT intent when user doesn't provide input. */
+    NO_INPUT,
+    /** App fires CANCEL intent when user exits app mid-dialog. */
+    CANCEL,
+    /** App fires NEW_SURFACE intent when requesting handoff to a new surface from user. */
+    NEW_SURFACE,
+    /** App fires REGISTER_UPDATE intent when requesting user to register for proactive updates. */
+    REGISTER_UPDATE,
+    /** App receives CONFIGURE_UPDATES intent to indicate a REGISTER_UPDATE intent should be sent. */
+    CONFIGURE_UPDATES
+}
+
+/**
+ * List of supported permissions the app supports.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum SupportedPermissions {
+    /**
+     * The user's name as defined in the
+     * {@link https://developers.google.com/actions/reference/conversation#UserProfile|UserProfile object}
+     */
+    NAME,
+    /**
+     * The location of the user's current device, as defined in the
+     * {@link https://developers.google.com/actions/reference/conversation#Location|Location object}.
+     */
+    DEVICE_PRECISE_LOCATION,
+    /**
+     * City and zipcode corresponding to the location of the user's current device, as defined in the
+     * {@link https://developers.google.com/actions/reference/conversation#Location|Location object}.
+     */
+    DEVICE_COARSE_LOCATION,
+    /**
+     * Confirmation to receive proactive content at any time from the app.
+     */
+    UPDATE
+}
+
+/**
+ * List of built-in argument names.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum BuiltInArgNames {
+    /**
+     * Permission granted argument.
+     */
+    PERMISSION_GRANTED,
+    /**
+     * Option selected argument.
+     */
+    OPTION,
+    /**
+     * Transaction requirements check result argument.
+     */
+    TRANSACTION_REQ_CHECK_RESULT,
+    /**
+     * Delivery address value argument.
+     */
+    DELIVERY_ADDRESS_VALUE,
+    /**
+     * Transactions decision argument.
+     */
+    TRANSACTION_DECISION_VALUE,
+    /**
+     * Confirmation argument.
+     */
+    CONFIRMATION,
+    /**
+     * DateTime argument.
+     */
+    DATETIME,
+    /**
+     * Sign in status argument.
+     */
+    SIGN_IN,
+    /**
+     * Reprompt count for consecutive NO_INPUT intents.
+     */
+    REPROMPT_COUNT,
+    /**
+     * Flag representing finality of NO_INPUT intent.
+     */
+    IS_FINAL_REPROMPT,
+    /**
+     * New surface value argument.
+     */
+    NEW_SURFACE,
+    /** Update registration value argument. */
+    REGISTER_UPDATE
+}
+
+/**
+ * List of possible conversation stages, as defined in the
+ * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
+ * @actionssdk
+ * @dialogflow
+ * @deprecated Use {@link ConversationTypes} instead.
+ */
+export type ConversationStages = ConversationTypes;
+
+/**
+ * List of possible conversation types, as defined in the
+ * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum ConversationTypes {
+    /**
+     * Unspecified conversation state.
+     */
+    UNSPECIFIED,
+    /**
+     * A new conversation.
+     */
+    NEW,
+    /**
+     * An active (ongoing) conversation.
+     */
+    ACTIVE,
+}
+
+/**
+ * List of surface capabilities supported by the app.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum SurfaceCapabilities {
+    /**
+     * The ability to output audio.
+     */
+    AUDIO_OUTPUT,
+    /**
+     * The ability to output on a screen
+     */
+    SCREEN_OUTPUT,
+}
+
+/**
+ * List of possible user input types.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum InputTypes {
+    /**
+     * Unspecified.
+     */
+    UNSPECIFIED,
+    /**
+     * Input given by touch.
+     */
+    TOUCH,
+    /**
+     * Input given by voice (spoken).
+     */
+    VOICE,
+    /**
+     * Input given by keyboard (typed).
+     */
+    KEYBOARD
+}
+
+/**
+ * List of possible sign in result status values.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum SignInStatus {
+    /**
+     * Unknown status.
+     */
+    UNSPECIFIED,
+    /**
+     * User successfully completed the account linking.
+     */
+    OK,
+    /**
+     * Cancelled or dismissed account linking.
+     */
+    CANCELLED,
+    /**
+     * System or network error.
+     */
+    ERROR
+}
+
+/**
+ * Possible update trigger time context frequencies.
+ */
+export enum TimeContextFrequency {
+    DAILY
+}
+
+/**
+ * User provided date/time info.
+ */
+export interface DateTime {
+    date: {
+        year: number;
+        month: number;
+        day: number;
+    };
+    time: {
+        hours: number;
+        minutes: number;
+        seconds: number;
+        nanos: number;
+    };
+}
+
+/**
+ * User's permissioned name info.
+ */
+export interface UserName {
+    /** User's display name. */
+    displayName: string;
+    /** User's given name. */
+    givenName: string;
+    /** User's family name. */
+    familyName: string;
+}
+
+/**
+ * User's permissioned device location.
+ */
+export interface DeviceLocation {
+    /** {latitude, longitude}. Requested with SupportedPermissions.DEVICE_PRECISE_LOCATION. */
+    coordinates: object;
+    /** Full, formatted street address. Requested with SupportedPermissions.DEVICE_PRECISE_LOCATION. */
+    address: string;
+    /** Zip code. Requested with SupportedPermissions.DEVICE_COARSE_LOCATION. */
+    zipCode: string;
+    /** Device city. Requested with SupportedPermissions.DEVICE_COARSE_LOCATION. */
+    city: string;
+}
+
+/**
+ * User object.
+ */
+export interface User {
+    /** Random string ID for Google user. */
+    userId: string;
+    /**
+     * User name information. Null if not requested with
+     *     {@link AssistantApp#askForPermission|askForPermission(SupportedPermissions.NAME)}.
+     */
+    userName: UserName;
+    /** Unique Oauth2 token. Only available with account linking. */
+    accessToken: string;
+    /**
+     * Timestamp for the last access from the user.
+     * Retrieve using app.getLastSeen() to get a Date object or null if never seen.
+     */
+    lastSeen: string;
+    /**
+     * A string persistent across sessions.
+     * Retrieved and set using app.userStorage which allows you to store it like an JSON object
+     * which is abstracted for convenience by the client library.
+     */
+    userStorage: string;
+}
+
+/**
+ * Actions on Google Surface.
+ */
+export interface Surface {
+    /** Capabilities of the surface. */
+    capabilities: Capability[];
+}
+
+/**
+ * Surface capability.
+ */
+export interface Capability {
+    /** Name of the capability. */
+    name: SurfaceCapabilities;
+}
+
+/**
+ * Intent Argument. For incoming intents, the argument value can be retrieved
+ * using {@link AssistantApp#getArgument}.
+ */
+export interface IntentArgument {
+    /** Name of the argument. */
+    name: string;
+    /** Text value of the argument. */
+    textValue: string;
+}
+
+/**
+ * The Actions on Google client library AssistantApp base class.
+ *
+ * This class contains the methods that are shared between platforms to support the conversation API
+ * protocol from Assistant. It also exports the 'State' class as a helper to represent states by
+ * name.
+ */
+export class AssistantApp {
+    /**
+     * The session state.
+     */
+    state: string;
+
+    /**
+     * The session data in JSON format.
+     */
+    data: object;
+
+    /**
+     * The data persistent across sessions in JSON format.
+     * It exists in the same context as getUser().userId
+     *
+     * @example
+     * // Actions SDK
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * app.userStorage.someProperty = 'someValue';
+     * // Dialogflow
+     * const app = new DialogflowApp({request: request, response: response});
+     * app.userStorage.someProperty = 'someValue';
+     */
+    userStorage: object;
+
+    /**
+     * List of standard intents that the app provides.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly StandardIntents: typeof StandardIntents;
+
+    /**
+     * List of supported permissions the app supports.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly SupportedPermissions: typeof SupportedPermissions;
+
+    /**
+     * List of built-in argument names.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly BuiltInArgNames: typeof BuiltInArgNames;
+
+    /**
+     * List of possible conversation stages, as defined in the
+     * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
+     * @actionssdk
+     * @dialogflow
+     * @deprecated Use {@link ConversationTypes} instead.
+     */
+    readonly ConversationStages: typeof ConversationTypes;
+
+    /**
+     * List of possible conversation types, as defined in the
+     * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly ConversationTypes: typeof ConversationTypes;
+
+    /**
+     * List of surface capabilities supported by the app.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly SurfaceCapabilities: typeof SurfaceCapabilities;
+
+    /**
+     * List of possible user input types.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly InputTypes: typeof InputTypes;
+
+    /**
+     * List of possible sign in result status values.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly SignInStatus: typeof SignInStatus;
+
+    /**
+     * Values related to supporting {@link ImageDisplays}.
+     */
+    readonly ImageDisplays: typeof ImageDisplays;
+
+    /**
+     * Values related to supporting {@link Transactions}.
+     */
+    readonly Transactions: typeof TransactionValues;
+
+    /**
+     * Possible update trigger time context frequencies.
+     */
+    readonly TimeContextFrequency: typeof TimeContextFrequency;
+
+    // ---------------------------------------------------------------------------
+    //                   Public APIs
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Handles the incoming Assistant request using a handler or Map of handlers.
+     * Each handler can be a function callback or Promise.
+     *
+     * @example
+     * // Actions SDK
+     * const app = new ActionsSdkApp({request: request, response: response});
+     *
+     * const noInputs = [
+     *   `I didn't hear a number`,
+     *   `If you're still there, what's the number?`,
+     *   'What is the number?'
+     * ];
+     *
+     * function mainIntent (app) {
+     *   const ssml = '<speak>Hi! <break time="1"/> ' +
+     *     'I can read out an ordinal like ' +
+     *     '<say-as interpret-as="ordinal">123</say-as>. Say a number.</speak>';
+     *   const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *   app.ask(inputPrompt);
+     * }
+     *
+     * function rawInput (app) {
+     *   if (app.getRawInput() === 'bye') {
+     *     app.tell('Goodbye!');
+     *   } else {
+     *     const ssml = '<speak>You said, <say-as interpret-as="ordinal">' +
+     *       app.getRawInput() + '</say-as></speak>';
+     *     const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *     app.ask(inputPrompt);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MAIN, mainIntent);
+     * actionMap.set(app.StandardIntents.TEXT, rawInput);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * // Dialogflow
+     * const app = new DialogflowApp({request: req, response: res});
+     * const NAME_ACTION = 'make_name';
+     * const COLOR_ARGUMENT = 'color';
+     * const NUMBER_ARGUMENT = 'number';
+     *
+     * function makeName (app) {
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   const color = app.getArgument(COLOR_ARGUMENT);
+     *   app.tell('Alright, your silly name is ' +
+     *     color + ' ' + number +
+     *     '! I hope you like it. See you next time.');
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(NAME_ACTION, makeName);
+     * app.handleRequest(actionMap);
+     *
+     * @param handler The handler (or Map of handlers) for the request.
+     * @actionssdk
+     * @dialogflow
+     */
+    handleRequest(handler: ((app: AssistantApp) => any) | (Map<string, (app: AssistantApp) => any>)): void;
+
+    /**
+     * Asynchronously handles the incoming Assistant request using a handler or Map of handlers.
+     * Each handler can be a function callback or Promise.
+     *
+     * @example
+     * // Actions SDK
+     * const app = new ActionsSdkApp({request: request, response: response});
+     *
+     * const noInputs = [
+     *   `I didn't hear a number`,
+     *   `If you're still there, what's the number?`,
+     *   'What is the number?'
+     * ];
+     *
+     * function mainIntent (app) {
+     *   const ssml = '<speak>Hi! <break time="1"/> ' +
+     *     'I can read out an ordinal like ' +
+     *     '<say-as interpret-as="ordinal">123</say-as>. Say a number.</speak>';
+     *   const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *   app.ask(inputPrompt);
+     * }
+     *
+     * function rawInput (app) {
+     *   if (app.getRawInput() === 'bye') {
+     *     app.tell('Goodbye!');
+     *   } else {
+     *     const ssml = '<speak>You said, <say-as interpret-as="ordinal">' +
+     *       app.getRawInput() + '</say-as></speak>';
+     *     const inputPrompt = app.buildInputPrompt(true, ssml, noInputs);
+     *     app.ask(inputPrompt);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MAIN, mainIntent);
+     * actionMap.set(app.StandardIntents.TEXT, rawInput);
+     *
+     * app.handleRequestAsync(actionMap)
+     * .then(
+     *   (result) => {
+     *     // handle the result
+     *   })
+     * .catch(
+     *   (reason) => {
+     *     // handle an error
+     *   });
+     *
+     * // Dialogflow
+     * const app = new DialogflowApp({request: req, response: res});
+     * const NAME_ACTION = 'make_name';
+     * const COLOR_ARGUMENT = 'color';
+     * const NUMBER_ARGUMENT = 'number';
+     *
+     * function makeName (app) {
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   const color = app.getArgument(COLOR_ARGUMENT);
+     *   app.tell('Alright, your silly name is ' +
+     *     color + ' ' + number +
+     *     '! I hope you like it. See you next time.');
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(NAME_ACTION, makeName);
+     *
+     * app.handleRequestAsync(actionMap)
+     * .then(
+     *   (result) => {
+     *     // handle the result
+     *   })
+     * .catch(
+     *   (reason) => {
+     *     // handle an error
+     *   });
+     *
+     * @param handler The handler (or Map of handlers) for the request.
+     * @return Promise to resolve the result of the handler that was invoked.
+     * @actionssdk
+     * @dialogflow
+     */
+    handleRequestAsync(handler: ((app: AssistantApp) => any) | (Map<string, (app: AssistantApp) => any>)): Promise<any>;
+
+    /**
+     * Equivalent to {@link AssistantApp#askForPermission|askForPermission},
+     * but allows you to prompt the user for more than one permission at once.
+     *
+     * Notes:
+     *
+     * * The order in which you specify the permission prompts does not matter -
+     *   it is controlled by the Assistant to provide a consistent user experience.
+     * * The user will be able to either accept all permissions at once, or none.
+     *   If you wish to allow them to selectively accept one or other, make several
+     *   dialog turns asking for each permission independently with askForPermission.
+     * * Asking for DEVICE_COARSE_LOCATION and DEVICE_PRECISE_LOCATION at once is
+     *   equivalent to just asking for DEVICE_PRECISE_LOCATION
+     *
+     * @example
+     * const app = new DialogflowApp({request: req, response: res});
+     * const REQUEST_PERMISSION_ACTION = 'request_permission';
+     * const GET_RIDE_ACTION = 'get_ride';
+     *
+     * function requestPermission (app) {
+     *   const permission = [
+     *     app.SupportedPermissions.NAME,
+     *     app.SupportedPermissions.DEVICE_PRECISE_LOCATION
+     *   ];
+     *   app.askForPermissions('To pick you up', permissions);
+     * }
+     *
+     * function sendRide (app) {
+     *   if (app.isPermissionGranted()) {
+     *     const displayName = app.getUserName().displayName;
+     *     const address = app.getDeviceLocation().address;
+     *     app.tell('I will tell your driver to pick up ' + displayName +
+     *         ' at ' + address);
+     *   } else {
+     *     // Response shows that user did not grant permission
+     *     app.tell('Sorry, I could not figure out where to pick you up.');
+     *   }
+     * }
+     * const actionMap = new Map();
+     * actionMap.set(REQUEST_PERMISSION_ACTION, requestPermission);
+     * actionMap.set(GET_RIDE_ACTION, sendRide);
+     * app.handleRequest(actionMap);
+     *
+     * @param context Context why the permission is being asked; it's the TTS
+     *     prompt prefix (action phrase) we ask the user.
+     * @param permissions Array of permissions App supports, each of
+     *     which comes from AssistantApp.SupportedPermissions.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return A response is sent to Assistant to ask for the user's permission.
+     *     For any invalid input, we return null.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForPermissions(context: string, permissions: string[], dialogState?: object): express.Response | null;
+
+    /**
+     * Prompts the user for permission to send proactive updates at any time.
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const REQUEST_PERMISSION_ACTION = 'request.permission';
+     * const PERMISSION_REQUESTED = 'permission.requested';
+     * const SHOW_IMAGE = 'show.image';
+     *
+     * function requestPermission (app) {
+     *   app.askForUpdatePermission('show.image', [
+     *     {
+     *       name: 'image_to_show',
+     *       textValue: 'image_type_1'
+     *     }
+     *   ]);
+     * }
+     *
+     * function checkPermission (app) {
+     *   if (app.isPermissionGranted()) {
+     *     app.tell(`Great, I'll send an update whenever I notice a change`);
+     *   } else {
+     *     // Response shows that user did not grant permission
+     *     app.tell('Alright, just let me know whenever you need the weather!');
+     *   }
+     * }
+     *
+     * function showImage (app) {
+     *   showPicture(app.getArgument('image_to_show'));
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(REQUEST_PERMISSION_ACTION, requestPermission);
+     * actionMap.set(PERMISSION_REQUESTED, checkPermission);
+     * actionMap.set(SHOW_IMAGE, showImage);
+     * app.handleRequest(actionMap);
+     *
+     * @param intent If using Dialogflow, the action name of the intent
+     *     to be triggered when the update is received. If using Actions SDK, the
+     *     intent name to be triggered when the update is received.
+     * @param intentArguments The necessary arguments
+     *     to fulfill the intent triggered on update. These can be retrieved using
+     *     {@link AssistantApp#getArgument}.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return A response is sent to Assistant to ask for the user's permission.
+     *     For any invalid input, we return null.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForUpdatePermission(intent: string, intentArguments: IntentArgument[], dialogState?: object): express.Response | null;
+
+    /**
+     * Checks whether user is in transactable state.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const TXN_REQ_COMPLETE = 'txn.req.complete';
+     *
+     * let transactionConfig = {
+     *     deliveryAddressRequired: false,
+     *     type: app.Transactions.PaymentType.BANK,
+     *     displayName: 'Checking-1234'
+     * };
+     * function welcomeIntent (app) {
+     *   app.askForTransactionRequirements(transactionConfig);
+     * }
+     *
+     * function txnReqCheck (app) {
+     *   if (app.getTransactionRequirementsResult() === app.Transactions.ResultType.OK) {
+     *     // continue cart building flow
+     *   } else {
+     *     // don't continue cart building
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(TXN_REQ_COMPLETE, txnReqCheck);
+     * app.handleRequest(actionMap);
+     *
+     * @param
+     *     transactionConfig Configuration for the transaction. Includes payment
+     *     options and order options. Optional if order has no payment or
+     *     delivery.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForTransactionRequirements(transactionConfig?: ActionPaymentTransactionConfig | GooglePaymentTransactionConfig, dialogState?: object): express.Response | null;
+
+    /**
+     * Asks user to confirm transaction information.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const TXN_COMPLETE = 'txn.complete';
+     *
+     * let transactionConfig = {
+     *     deliveryAddressRequired: false,
+     *     type: app.Transactions.PaymentType.BANK,
+     *     displayName: 'Checking-1234'
+     * };
+     *
+     * let order = app.buildOrder();
+     * // fill order cart
+     *
+     * function welcomeIntent (app) {
+     *   app.askForTransaction(order, transactionConfig);
+     * }
+     *
+     * function txnComplete (app) {
+     *   // respond with order update
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(TXN_COMPLETE, txnComplete);
+     * app.handleRequest(actionMap);
+     *
+     * @param order Order built with buildOrder().
+     * @param
+     *     transactionConfig Configuration for the transaction. Includes payment
+     *     options and order options.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response
+     * @dialogflow
+     */
+    askForTransactionDecision(order: Order, transactionConfig: ActionPaymentTransactionConfig | GooglePaymentTransactionConfig, dialogState?: object): express.Response | null;
+
+    /**
+     * Asks the Assistant to guide the user to grant a permission. For example,
+     * if you want your app to get access to the user's name, you would invoke
+     * the askForPermission method with a context containing the reason for the request,
+     * and the AssistantApp.SupportedPermissions.NAME permission. With this, the Assistant will ask
+     * the user, in your agent's voice, the following: '[Context with reason for the request],
+     * I'll just need to get your name from Google, is that OK?'.
+     *
+     * Once the user accepts or denies the request, the Assistant will fire another intent:
+     * app.StandardIntents.PERMISSION with a boolean argument: app.BuiltInArgNames.PERMISSION_GRANTED
+     * and, if granted, the information that you requested.
+     *
+     * Read more:
+     *
+     * * {@link https://developers.google.com/actions/reference/conversation#ExpectedIntent|
+     *       Supported Permissions}
+     * * Check if the permission has been granted with
+     *       {@link AssistantApp#isPermissionGranted|isPermissionsGranted}
+     * * {@link AssistantApp#getDeviceLocation|getDeviceLocation}
+     * * {@link AssistantApp#getUserName|getUserName}
+     *
+     * @example
+     * const app = new DialogflowApp({request: req, response: res});
+     * const REQUEST_PERMISSION_ACTION = 'request_permission';
+     * const GET_RIDE_ACTION = 'get_ride';
+     *
+     * function requestPermission (app) {
+     *   const permission = app.SupportedPermissions.NAME;
+     *   app.askForPermission('To pick you up', permission);
+     * }
+     *
+     * function sendRide (app) {
+     *   if (app.isPermissionGranted()) {
+     *     const displayName = app.getUserName().displayName;
+     *     app.tell('I will tell your driver to pick up ' + displayName);
+     *   } else {
+     *     // Response shows that user did not grant permission
+     *     app.tell('Sorry, I could not figure out who to pick up.');
+     *   }
+     * }
+     * const actionMap = new Map();
+     * actionMap.set(REQUEST_PERMISSION_ACTION, requestPermission);
+     * actionMap.set(GET_RIDE_ACTION, sendRide);
+     * app.handleRequest(actionMap);
+     *
+     * @param context Context why permission is asked; it's the TTS
+     *     prompt prefix (action phrase) we ask the user.
+     * @param permission One of the permissions Assistant supports, each of
+     *     which comes from AssistantApp.SupportedPermissions.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant.
+     * @return A response is sent to the Assistant to ask for the user's permission;
+     *     for any invalid input, we return null.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForPermission(context: string, permission: string, dialogState?: object): express.Response | null;
+
+    /**
+     * Returns true if the request follows a previous request asking for
+     * permission from the user and the user granted the permission(s). Otherwise,
+     * false. Use with {@link AssistantApp#askForPermissions|askForPermissions}.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * // or
+     * const app = new DialogflowApp({request: request, response: response});
+     * app.askForPermissions("To get you a ride", [
+     *   app.SupportedPermissions.NAME,
+     *   app.SupportedPermissions.DEVICE_PRECISE_LOCATION
+     * ]);
+     * // ...
+     * // In response handler for subsequent intent:
+     * if (app.isPermissionGranted()) {
+     *  // Use the requested permission(s) to get the user a ride
+     * }
+     *
+     * @return true if permissions granted.
+     * @dialogflow
+     * @actionssdk
+     */
+    isPermissionGranted(): boolean;
+
+    /**
+     * Asks user for delivery address.
+     *
+     * @example
+     * // For DialogflowApp:
+     * const app = new DialogflowApp({request, response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const DELIVERY_INTENT = 'delivery.address';
+     *
+     * function welcomeIntent (app) {
+     *   app.askForDeliveryAddress('To make sure I can deliver to you');
+     * }
+     *
+     * function addressIntent (app) {
+     *   const postalCode = app.getDeliveryAddress().postalAddress.postalCode;
+     *   if (isInDeliveryZone(postalCode)) {
+     *     app.tell('Great looks like you\'re in our delivery area!');
+     *   } else {
+     *     app.tell('I\'m sorry it looks like we can\'t deliver to you.');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(DELIVERY_INTENT, addressIntent);
+     * app.handleRequest(actionMap);
+     *
+     * // For ActionsSdkApp:
+     * const app = new ActionsSdkApp({request, response});
+     * const WELCOME_INTENT = app.StandardIntents.MAIN;
+     * const DELIVERY_INTENT = app.StandardIntents.DELIVERY_ADDRESS;
+     *
+     * function welcomeIntent (app) {
+     *   app.askForDeliveryAddress('To make sure I can deliver to you');
+     * }
+     *
+     * function addressIntent (app) {
+     *   const postalCode = app.getDeliveryAddress().postalAddress.postalCode;
+     *   if (isInDeliveryZone(postalCode)) {
+     *     app.tell('Great looks like you\'re in our delivery area!');
+     *   } else {
+     *     app.tell('I\'m sorry it looks like we can\'t deliver to you.');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(DELIVERY_INTENT, addressIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param reason Reason given to user for asking delivery address.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant.
+     * @return HTTP response.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForDeliveryAddress(reason: string, dialogState?: object): express.Response | null;
+
+    /**
+     * Asks user for a confirmation.
+     *
+     * @example
+     * const app = new DialogflowApp({ request, response });
+     * const WELCOME_INTENT = 'input.welcome';
+     * const CONFIRMATION = 'confirmation';
+     *
+     * function welcomeIntent (app) {
+     *   app.askForConfirmation('Are you sure you want to do that?');
+     * }
+     *
+     * function confirmation (app) {
+     *   if (app.getUserConfirmation()) {
+     *     app.tell('Great! I\'m glad you want to do it!');
+     *   } else {
+     *     app.tell('That\'s okay. Let\'s not do it now.');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(CONFIRMATION, confirmation);
+     * app.handleRequest(actionMap);
+     *
+     * @param prompt The confirmation prompt presented to the user to
+     *     query for an affirmative or negative response. If undefined or null,
+     *     Google will use a generic yes/no prompt.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForConfirmation(prompt?: string, dialogState?: object): express.Response | null;
+
+    /**
+     * Asks user for a timezone-agnostic date and time.
+     *
+     * @example
+     * const app = new DialogflowApp({ request, response });
+     * const WELCOME_INTENT = 'input.welcome';
+     * const DATETIME = 'datetime';
+     *
+     * function welcomeIntent (app) {
+     *   app.askForDateTime('When do you want to come in?',
+     *     'Which date works best for you?',
+     *     'What time of day works best for you?');
+     * }
+     *
+     * function datetime (app) {
+     *   app.tell({speech: 'Great see you at your appointment!',
+     *     displayText: 'Great, we will see you on '
+     *     + app.getDateTime().date.month
+     *     + '/' + app.getDateTime().date.day
+     *     + ' at ' + app.getDateTime().time.hours
+     *     + (app.getDateTime().time.minutes || '')});
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(DATETIME, datetime);
+     * app.handleRequest(actionMap);
+     *
+     * @param initialPrompt The initial prompt used to ask for a
+     *     date and time. If undefined or null, Google will use a generic
+     *     prompt.
+     * @param datePrompt The prompt used to specifically ask for the
+     *     date if not provided by user. If undefined or null, Google will use a
+     *     generic prompt.
+     * @param timePrompt The prompt used to specifically ask for the
+     *     time if not provided by user. If undefined or null, Google will use a
+     *     generic prompt.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForDateTime(initialPrompt?: string, datePrompt?: string, timePrompt?: string, dialogState?: object): express.Response | null;
+
+    /**
+     * Hands the user off to a web sign in flow. App sign in and OAuth credentials
+     * are set in the {@link https://console.actions.google.com|Actions Console}.
+     * Retrieve the access token in subsequent intents using
+     * app.getUser().accessToken.
+     * Works only for en-* locales.
+     *
+     * @example
+     * const app = new DialogflowApp({ request, response });
+     * const WELCOME_INTENT = 'input.welcome';
+     * const SIGN_IN = 'sign.in';
+     *
+     * function welcomeIntent (app) {
+     *   app.askForSignIn();
+     * }
+     *
+     * function signIn (app) {
+     *   if (app.getSignInStatus() === app.SignInstatus.OK) {
+     *     let accessToken = app.getUser().accessToken;
+     *     app.ask('Great, thanks for signing in!');
+     *   } else {
+     *     app.ask('I won\'t be able to save your data, but let\'s continue!');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(SIGN_IN, signIn);
+     * app.handleRequest(actionMap);
+     *
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForSignIn(dialogState?: object): express.Response | null;
+
+    /**
+     * Requests the user to switch to another surface during the conversation.
+     * Works only for en-* locales.
+     *
+     * @example
+     * const app = new DialogflowApp({ request, response });
+     * const WELCOME_INTENT = 'input.welcome';
+     * const SHOW_IMAGE = 'show.image';
+     *
+     * function welcomeIntent (app) {
+     *   if (app.hasSurfaceCapability(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     showPicture(app);
+     *   } else if (app.hasAvailableSurfaceCapabilities(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     app.askForNewSurface('To show you an image',
+     *       'Check out this image',
+     *       [app.SurfaceCapabilities.SCREEN_OUTPUT]
+     *     );
+     *   } else {
+     *     app.tell('This part of the app only works on screen devices. Sorry about that');
+     *   }
+     * }
+     *
+     * function showImage (app) {
+     *   if (!app.isNewSurface()) {
+     *     app.tell('Ok, I understand. You don't want to see pictures. Bye');
+     *   } else {
+     *     showPicture(app, pictureType);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(SHOW_IMAGE, showImage);
+     * app.handleRequest(actionMap);
+     *
+     * @param context Context why new surface is requested; it's the TTS
+     *     prompt prefix (action phrase) we ask the user.
+     * @param notificationTitle Title of the notification appearing on
+     *     new surface device.
+     * @param capabilities The list of capabilities required in
+     *     the surface.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @dialogflow
+     * @actionssdk
+     */
+    askForNewSurface(context: string, notificationTitle: string, capabilities: SurfaceCapabilities[], dialogState?: object): express.Response | null;
+
+    /**
+     * Requests the user to register for daily updates.
+     *
+     * @example
+     * const app = new DialogflowApp({ request, response });
+     * const WELCOME_INTENT = 'input.welcome';
+     * const SHOW_IMAGE = 'show.image';
+     *
+     * function welcomeIntent (app) {
+     *   app.askToRegisterDailyUpdate('show.image', [
+     *     {
+     *       name: 'image_to_show',
+     *       textValue: 'image_type_1'
+     *     }
+     *   ]);
+     * }
+     *
+     * function showImage (app) {
+     *   showPicture(app.getArgument('image_to_show'));
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(SHOW_IMAGE, showImage);
+     * app.handleRequest(actionMap);
+     *
+     * @param intent If using Dialogflow, the action name of the intent
+     *     to be triggered when the update is received. If using Actions SDK, the
+     *     intent name to be triggered when the update is received.
+     * @param intentArguments The necessary arguments
+     *     to fulfill the intent triggered on update. These can be retrieved using
+     *     {@link AssistantApp#getArgument}.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @dialogflow
+     * @actionssdk
+     */
+    askToRegisterDailyUpdate(intent: string, intentArguments: IntentArgument[], dialogState?: object): express.Response | null;
+
+    /**
+     * Gets the {@link User} object.
+     * The user object contains information about the user, including
+     * a string identifier and personal information (requires requesting permissions,
+     * see {@link AssistantApp#askForPermissions|askForPermissions}).
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * // or
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * const userId = app.getUser().userId;
+     *
+     * @return Null if no value.
+     * @actionssdk
+     * @dialogflow
+     */
+    getUser(): User;
+
+    /**
+     * If granted permission to user's name in previous intent, returns user's
+     * display name, family name, and given name. If name info is unavailable,
+     * returns null.
+     *
+     * @example
+     * const app = new DialogflowApp({request: req, response: res});
+     * const REQUEST_PERMISSION_ACTION = 'request_permission';
+     * const SAY_NAME_ACTION = 'get_name';
+     *
+     * function requestPermission (app) {
+     *   const permission = app.SupportedPermissions.NAME;
+     *   app.askForPermission('To know who you are', permission);
+     * }
+     *
+     * function sayName (app) {
+     *   if (app.isPermissionGranted()) {
+     *     app.tell('Your name is ' + app.getUserName().displayName));
+     *   } else {
+     *     // Response shows that user did not grant permission
+     *     app.tell('Sorry, I could not get your name.');
+     *   }
+     * }
+     * const actionMap = new Map();
+     * actionMap.set(REQUEST_PERMISSION_ACTION, requestPermission);
+     * actionMap.set(SAY_NAME_ACTION, sayName);
+     * app.handleRequest(actionMap);
+     * @return Null if name permission is not granted.
+     * @actionssdk
+     * @dialogflow
+     */
+    getUserName(): UserName;
+
+    /**
+     * Gets the user locale. Returned string represents the regional language
+     * information of the user set in their Assistant settings.
+     * For example, 'en-US' represents US English.
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const locale = app.getUserLocale();
+     *
+     * @return User's locale, e.g. 'en-US'. Null if no locale given.
+     * @actionssdk
+     * @dialogflow
+     */
+    getUserLocale(): string;
+
+    /**
+     * Get the user's last seen time as a Date object.
+     * Not supported in V1.
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const lastSeen = app.getLastSeen();
+     *
+     * @return User's last seen date or null if never seen
+     */
+    getLastSeen(): Date | null;
+
+    /**
+     * If granted permission to device's location in previous intent, returns device's
+     * location (see {@link AssistantApp#askForPermissions|askForPermissions}).
+     * If device info is unavailable, returns null.
+     *
+     * @example
+     * const app = new DialogflowApp({request: req, response: res});
+     * // or
+     * const app = new ActionsSdkApp({request: req, response: res});
+     * app.askForPermission("To get you a ride",
+     *   app.SupportedPermissions.DEVICE_PRECISE_LOCATION);
+     * // ...
+     * // In response handler for permissions fallback intent:
+     * if (app.isPermissionGranted()) {
+     *   sendCarTo(app.getDeviceLocation().coordinates);
+     * }
+     *
+     * @return Null if location permission is not granted.
+     * @actionssdk
+     * @dialogflow
+     */
+    getDeviceLocation(): DeviceLocation;
+
+    /**
+     * Gets type of input used for this request.
+     * @return One of AssistantApp.InputTypes.
+     *     Null if no input type given.
+     * @dialogflow
+     * @actionssdk
+     */
+    getInputType(): number | string;
+
+    /**
+     * Gets transactability of user. Only use after calling
+     * askForTransactionRequirements. Null if no result given.
+     *
+     * @return One of Transactions.ResultType.
+     * @dialogflow
+     * @actionssdk
+     */
+    getTransactionRequirementsResult(): string;
+
+    /**
+     * Gets order delivery address. Only use after calling askForDeliveryAddress.
+     *
+     * @return Delivery address information. Null if user
+     *     denies permission, or no address given.
+     * @dialogflow
+     * @actionssdk
+     */
+    getDeliveryAddress(): Location;
+
+    /**
+     * Gets transaction decision information. Only use after calling
+     * askForTransactionDecision.
+     *
+     * @return Transaction decision data. Returns object with
+     *     userDecision only if user declines. userDecision will be one of
+     *     Transactions.ConfirmationDecision. Null if no decision given.
+     * @dialogflow
+     * @actionssdk
+     */
+    getTransactionDecision(): TransactionDecision;
+
+    /**
+     * Gets confirmation decision. Use after askForConfirmation.
+     *
+     * @return False if user replied with negative response. Null if no user
+     *     confirmation decision given.
+     * @dialogflow
+     * @actionssdk
+     */
+    getUserConfirmation(): boolean | null;
+
+    /**
+     * Gets user provided date and time. Use after askForDateTime.
+     *
+     * @return Date and time given by the user. Null if no user
+     *     date and time given.
+     * @dialogflow
+     * @actionssdk
+     */
+    getDateTime(): DateTime;
+
+    /**
+     * Gets status of user sign in request.
+     *
+     * @return Result of user sign in request. One of
+     * DialogflowApp.SignInStatus or ActionsSdkApp.SignInStatus
+     * Null if no sign in status.
+     * @dialogflow
+     * @actionssdk
+     */
+    getSignInStatus(): string;
+
+    /**
+     * Returns true if user device has a given surface capability.
+     *
+     * @param requestedCapability Must be one of {@link SurfaceCapabilities}.
+     * @return True if user device has the given capability.
+     *
+     * @example
+     * const app = new DialogflowApp({request: req, response: res});
+     * const DESCRIBE_SOMETHING = 'DESCRIBE_SOMETHING';
+     *
+     * function describe (app) {
+     *   if (app.hasSurfaceCapability(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     app.tell(richResponseWithBasicCard);
+     *   } else {
+     *     app.tell('Let me tell you about ...');
+     *   }
+     * }
+     * const actionMap = new Map();
+     * actionMap.set(DESCRIBE_SOMETHING, describe);
+     * app.handleRequest(actionMap);
+     *
+     * @dialogflow
+     * @actionssdk
+     */
+    hasSurfaceCapability(requestedCapability: SurfaceCapabilities): boolean;
+
+    /**
+     * Gets surface capabilities of user device.
+     *
+     * @return Supported surface capabilities, as defined in
+     *     AssistantApp.SurfaceCapabilities.
+     * @dialogflow
+     * @actionssdk
+     */
+    getSurfaceCapabilities(): SurfaceCapabilities[];
+
+    /**
+     * Returns the set of other available surfaces for the user.
+     *
+     * @return Empty if no available surfaces.
+     * @actionssdk
+     * @dialogflow
+     */
+    getAvailableSurfaces(): Surface[];
+
+    /**
+     * Returns true if user has an available surface which includes all given
+     * capabilities. Available surfaces capabilities may exist on surfaces other
+     * than that used for an ongoing conversation.
+     *
+     * @param capabilities Must be one of
+     *     {@link SurfaceCapabilities}.
+     * @return True if user has a capability available on some surface.
+     *
+     * @dialogflow
+     * @actionssdk
+     */
+    hasAvailableSurfaceCapabilities(capabilities: SurfaceCapabilities | SurfaceCapabilities[]): boolean;
+
+    /**
+     * Returns the result of the AskForNewSurface helper.
+     *
+     * @return True if user has triggered conversation on a new device
+     *     following the NEW_SURFACE intent.
+     * @actionssdk
+     * @dialogflow
+     */
+    isNewSurface(): boolean;
+
+    /**
+     * Returns true if the app is being tested in sandbox mode. Enable sandbox
+     * mode in the (Actions console)[console.actions.google.com] to test
+     * transactions.
+     *
+     * @return True if app is being used in Sandbox mode.
+     * @dialogflow
+     * @actionssdk
+     */
+    isInSandbox(): boolean;
+
+    /**
+     * Returns the number of subsequent reprompts related to silent input from the
+     * user. This should be used along with the NO_INPUT intent to reprompt the
+     * user for input in cases where the Google Assistant could not pick up any
+     * speech.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request, response});
+     *
+     * function welcome (app) {
+     *   app.ask('Welcome to your app!');
+     * }
+     *
+     * function noInput (app) {
+     *   if (app.getRepromptCount() === 0) {
+     *     app.ask(`What was that?`);
+     *   } else if (app.getRepromptCount() === 1) {
+     *     app.ask(`Sorry I didn't catch that. Could you repeat yourself?`);
+     *   } else if (app.isFinalReprompt()) {
+     *     app.tell(`Okay let's try this again later.`);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MAIN, welcome);
+     * actionMap.set(app.StandardIntents.NO_INPUT, noInput);
+     * app.handleRequest(actionMap);
+     *
+     * @return The current reprompt count. Null if no reprompt count
+     *     available (e.g. not in the NO_INPUT intent).
+     * @dialogflow
+     * @actionssdk
+     */
+    getRepromptCount(): number;
+
+    /**
+     * Returns true if it is the final reprompt related to silent input from the
+     * user. This should be used along with the NO_INPUT intent to give the final
+     * response to the user after multiple silences and should be an app.tell
+     * which ends the conversation.
+     *
+     * @example
+     * const app = new ActionsSdkApp({request, response});
+     *
+     * function welcome (app) {
+     *   app.ask('Welcome to your app!');
+     * }
+     *
+     * function noInput (app) {
+     *   if (app.getRepromptCount() === 0) {
+     *     app.ask(`What was that?`);
+     *   } else if (app.getRepromptCount() === 1) {
+     *     app.ask(`Sorry I didn't catch that. Could you repeat yourself?`);
+     *   } else if (app.isFinalReprompt()) {
+     *     app.tell(`Okay let's try this again later.`);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MAIN, welcome);
+     * actionMap.set(app.StandardIntents.NO_INPUT, noInput);
+     * app.handleRequest(actionMap);
+     *
+     * @return True if in a NO_INPUT intent and this is the final turn
+     *     of dialog.
+     * @dialogflow
+     * @actionssdk
+     */
+    isFinalReprompt(): boolean;
+
+    /**
+     * Returns true if user accepted update registration request. Used with
+     * {@link AssistantApp#askToRegisterDailyUpdate}
+     *
+     * @return True if user accepted update registration request.
+     * @dialogflow
+     * @actionssdk
+     */
+    isUpdateRegistered(): boolean;
+
+    // ---------------------------------------------------------------------------
+    //                   Response Builders
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Constructs RichResponse with chainable property setters.
+     *
+     * @param richResponse RichResponse to clone.
+     * @return Constructed RichResponse.
+     */
+    buildRichResponse(richResponse?: RichResponse): RichResponse;
+
+    /**
+     * Constructs BasicCard with chainable property setters.
+     *
+     * @param bodyText Body text of the card. Can be set using setTitle
+     *     instead.
+     * @return Constructed BasicCard.
+     */
+    buildBasicCard(bodyText?: string): BasicCard;
+
+    /**
+     * Constructs List with chainable property setters.
+     *
+     * @param title A title to set for a new List.
+     * @return Constructed List.
+     */
+    buildList(title?: string): List;
+
+    /**
+     * Constructs Carousel with chainable property setters.
+     *
+     * @return Constructed Carousel.
+     */
+    buildCarousel(): Carousel;
+
+    /**
+     * Constructs OptionItem with chainable property setters.
+     *
+     * @param key A unique key to identify this option. This key will
+     *     be returned as an argument in the resulting actions.intent.OPTION
+     *     intent.
+     * @param synonyms A list of synonyms which the user may
+     *     use to identify this option instead of the option key.
+     * @return Constructed OptionItem.
+     */
+    buildOptionItem(key?: string, synonyms?: string | string[]): OptionItem;
+
+    // ---------------------------------------------------------------------------
+    //                   Transaction Builders
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Constructs Order with chainable property setters.
+     *
+     * @param orderId Unique identifier for the order.
+     * @return Constructed Order.
+     */
+    buildOrder(orderId: string): Order;
+
+    /**
+     * Constructs Cart with chainable property setters.
+     *
+     * @param cartId Unique identifier for the cart.
+     * @return Constructed Cart.
+     */
+    buildCart(cartId?: string): Cart;
+
+    /**
+     * Constructs LineItem with chainable property setters.
+     * Because of a previous bug, the parameters are swapped compared to
+     * the LineItem constructor to prevent a breaking change.
+     *
+     * @param name Name of the line item.
+     * @param id Unique identifier for the item.
+     * @return Constructed LineItem.
+     */
+    buildLineItem(name: string, id: string): LineItem;
+
+    /**
+     * Constructs OrderUpdate with chainable property setters.
+     *
+     * @param orderId Unique identifier of the order.
+     * @param isGoogleOrderId True if the order ID is provided by
+     *     Google. False if the order ID is app provided.
+     * @return Constructed OrderUpdate.
+     */
+    buildOrderUpdate(orderId: string, isGoogleOrderId: boolean): OrderUpdate;
+}
diff --git a/types/actions-on-google/dialogflow-app.d.ts b/types/actions-on-google/dialogflow-app.d.ts
new file mode 100644
index 0000000000..4eeda87e06
--- /dev/null
+++ b/types/actions-on-google/dialogflow-app.d.ts
@@ -0,0 +1,572 @@
+import * as express from 'express';
+
+import { AssistantApp } from './assistant-app';
+import { Carousel, List, RichResponse, SimpleResponse } from './response-builder';
+
+// ---------------------------------------------------------------------------
+//                   Dialogflow support
+// ---------------------------------------------------------------------------
+
+/**
+ * Dialogflow {@link https://dialogflow.com/docs/concept-contexts|Context}.
+ */
+export interface Context {
+    /** Full name of the context. */
+    name: string;
+    /**
+     * Parameters carried within this context.
+     * See {@link https://dialogflow.com/docs/concept-actions#section-extracting-values-from-contexts|here}.
+     */
+    parameters: object;
+    /** Remaining number of intents */
+    lifespan: number;
+}
+
+export interface DialogflowAppOptions {
+    /** Express HTTP request object. */
+    request: express.Request;
+    /** Express HTTP response object. */
+    response: express.Response;
+    /**
+     * Function callback when session starts.
+     * Only called if webhook is enabled for welcome/triggering intents, and
+     * called from Web Simulator or Google Home device (i.e., not Dialogflow simulator).
+     */
+    sessionStarted?(): any;
+}
+
+/**
+ * This is the class that handles the communication with Dialogflow's fulfillment API v1.
+ * Doesn't currently support Dialogflow's fulfillment API v2.
+ */
+export class DialogflowApp extends AssistantApp {
+    /**
+     * Constructor for DialogflowApp object.
+     * To be used in the Dialogflow fulfillment webhook logic.
+     *
+     * @example
+     * const DialogflowApp = require('actions-on-google').DialogflowApp;
+     * const app = new DialogflowApp({request: request, response: response,
+     *   sessionStarted:sessionStarted});
+     *
+     * @dialogflow
+     */
+    constructor(options: DialogflowAppOptions);
+
+    /**
+     * @deprecated
+     * Verifies whether the request comes from Dialogflow.
+     *
+     * @param key The header key specified by the developer in the
+     *     Dialogflow Fulfillment settings of the app.
+     * @param value The private value specified by the developer inside the
+     *     fulfillment header.
+     * @return True if the request comes from Dialogflow.
+     * @dialogflow
+     */
+    isRequestFromApiAi(key: string, value: string): boolean;
+
+    /**
+     * Verifies whether the request comes from Dialogflow.
+     *
+     * @param key The header key specified by the developer in the
+     *     Dialogflow Fulfillment settings of the app.
+     * @param value The private value specified by the developer inside the
+     *     fulfillment header.
+     * @return True if the request comes from Dialogflow.
+     * @dialogflow
+     */
+    isRequestFromDialogflow(key: string, value: string): boolean;
+
+    /**
+     * Get the current intent. Alternatively, using a handler Map with
+     * {@link AssistantApp#handleRequest|handleRequest},
+     * the client library will automatically handle the incoming intents.
+     * 'Intent' in the Dialogflow context translates into the current action.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     *
+     * function responseHandler (app) {
+     *   const intent = app.getIntent();
+     *   switch (intent) {
+     *     case WELCOME_INTENT:
+     *       app.ask('Welcome to action snippets! Say a number.');
+     *       break;
+     *
+     *     case NUMBER_INTENT:
+     *       const number = app.getArgument(NUMBER_ARGUMENT);
+     *       app.tell('You said ' + number);
+     *       break;
+     *   }
+     * }
+     *
+     * app.handleRequest(responseHandler);
+     *
+     * @return Intent id or null if no value (action name).
+     * @dialogflow
+     */
+    getIntent(): string;
+
+    /**
+     * Get the argument value by name from the current intent. If the argument
+     * is included in originalRequest, and is not a text argument, the entire
+     * argument object is returned.
+     *
+     * Note: If incoming request is using an API version under 2 (e.g. 'v1'),
+     * the argument object will be in Proto2 format (snake_case, etc).
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const NUMBER_INTENT = 'input.number';
+     *
+     * function welcomeIntent (app) {
+     *   app.ask('Welcome to action snippets! Say a number.');
+     * }
+     *
+     * function numberIntent (app) {
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   app.tell('You said ' + number);
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(NUMBER_INTENT, numberIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param argName Name of the argument.
+     * @return Argument value matching argName
+     *     or null if no matching argument.
+     * @dialogflow
+     */
+    getArgument(argName: string): object;
+
+    /**
+     * Get the context argument value by name from the current intent. Context
+     * arguments include parameters collected in previous intents during the
+     * lifespan of the given context. If the context argument has an original
+     * value, usually representing the underlying entity value, that will be given
+     * as part of the return object.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const NUMBER_INTENT = 'input.number';
+     * const OUT_CONTEXT = 'output_context';
+     * const NUMBER_ARG = 'myNumberArg';
+     *
+     * function welcomeIntent (app) {
+     *   const parameters = {};
+     *   parameters[NUMBER_ARG] = '42';
+     *   app.setContext(OUT_CONTEXT, 1, parameters);
+     *   app.ask('Welcome to action snippets! Ask me for your number.');
+     * }
+     *
+     * function numberIntent (app) {
+     *   const number = app.getContextArgument(OUT_CONTEXT, NUMBER_ARG);
+     *   // number === { value: 42 }
+     *   app.tell('Your number is  ' + number.value);
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(NUMBER_INTENT, numberIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param contextName Name of the context.
+     * @param argName Name of the argument.
+     * @return Object containing value property and optional original
+     *     property matching context argument. Null if no matching argument.
+     * @dialogflow
+     */
+    getContextArgument(contextName: string, argName: string): object;
+
+    /**
+     * Returns the RichResponse constructed in Dialogflow response builder.
+     *
+     * @example
+     * const app = new App({request: req, response: res});
+     *
+     * function tellFact (app) {
+     *   let fact = 'Google was founded in 1998';
+     *
+     *   if (app.hasSurfaceCapability(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     app.ask(app.getIncomingRichResponse().addSimpleResponse('Here\'s a ' +
+     *       'fact for you. ' + fact + ' Which one do you want to hear about ' +
+     *       'next, Google\'s history or headquarters?'));
+     *   } else {
+     *     app.ask('Here\'s a fact for you. ' + fact + ' Which one ' +
+     *       'do you want to hear about next, Google\'s history or headquarters?');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set('tell.fact', tellFact);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * @return RichResponse created in Dialogflow. If no RichResponse was
+     *     created, an empty RichResponse is returned.
+     * @dialogflow
+     */
+    getIncomingRichResponse(): RichResponse;
+
+    /**
+     * Returns the List constructed in Dialogflow response builder.
+     *
+     * @example
+     * const app = new App({request: req, response: res});
+     *
+     * function pickOption (app) {
+     * if (app.hasSurfaceCapability(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     app.askWithList('Which of these looks good?',
+     *       app.getIncomingList().addItems(
+     *         app.buildOptionItem('another_choice', ['Another choice']).
+     *         setTitle('Another choice')));
+     *   } else {
+     *     app.ask('What would you like?');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set('pick.option', pickOption);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * @return List created in Dialogflow. If no List was created, an empty
+     *     List is returned.
+     * @dialogflow
+     */
+    getIncomingList(): List;
+
+    /**
+     * Returns the Carousel constructed in Dialogflow response builder.
+     *
+     * @example
+     * const app = new App({request: req, response: res});
+     *
+     * function pickOption (app) {
+     * if (app.hasSurfaceCapability(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     app.askWithCarousel('Which of these looks good?',
+     *       app.getIncomingCarousel().addItems(
+     *         app.buildOptionItem('another_choice', ['Another choice']).
+     *         setTitle('Another choice').setDescription('Choose me!')));
+     *   } else {
+     *     app.ask('What would you like?');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set('pick.option', pickOption);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * @return Carousel created in Dialogflow. If no Carousel was created,
+     *     an empty Carousel is returned.
+     * @dialogflow
+     */
+    getIncomingCarousel(): Carousel;
+
+    /**
+     * Returns the option key user chose from options response.
+     *
+     * @example
+     * const app = new App({request: req, response: res});
+     *
+     * function pickOption (app) {
+     *   if (app.hasSurfaceCapability(app.SurfaceCapabilities.SCREEN_OUTPUT)) {
+     *     app.askWithCarousel('Which of these looks good?',
+     *       app.getIncomingCarousel().addItems(
+     *         app.buildOptionItem('another_choice', ['Another choice']).
+     *         setTitle('Another choice').setDescription('Choose me!')));
+     *   } else {
+     *     app.ask('What would you like?');
+     *   }
+     * }
+     *
+     * function optionPicked (app) {
+     *   app.ask('You picked ' + app.getSelectedOption());
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set('pick.option', pickOption);
+     * actionMap.set('option.picked', optionPicked);
+     *
+     * app.handleRequest(actionMap);
+     *
+     * @return Option key of selected item. Null if no option selected or
+     *     if current intent is not OPTION intent.
+     * @dialogflow
+     */
+    getSelectedOption(): string;
+
+    /**
+     * Asks to collect the user's input.
+     * {@link https://developers.google.com/actions/policies/general-policies#user_experience|The guidelines when prompting the user for a response must be followed at all times}.
+     *
+     * NOTE: Due to a bug, if you specify the no-input prompts,
+     * the mic is closed after the 3rd prompt, so you should use the 3rd prompt
+     * for a bye message until the bug is fixed.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const NUMBER_INTENT = 'input.number';
+     *
+     * function welcomeIntent (app) {
+     *   app.ask('Welcome to action snippets! Say a number.',
+     *     ['Say any number', 'Pick a number', 'We can stop here. See you soon.']);
+     * }
+     *
+     * function numberIntent (app) {
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   app.tell('You said ' + number);
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(NUMBER_INTENT, numberIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param inputPrompt The input prompt
+     *     response.
+     * @param noInputs Array of re-prompts when the user does not respond (max 3).
+     * @return HTTP response.
+     * @dialogflow
+     */
+    ask(inputPrompt: string | SimpleResponse | RichResponse, noInputs?: string[]): express.Response | null;
+
+    /**
+     * Asks to collect the user's input with a list.
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const OPTION_INTENT = 'option.select';
+     *
+     * function welcomeIntent (app) {
+     *   app.askWithList('Which of these looks good?',
+     *     app.buildList('List title')
+     *      .addItems([
+     *        app.buildOptionItem(SELECTION_KEY_ONE,
+     *          ['synonym of KEY_ONE 1', 'synonym of KEY_ONE 2'])
+     *          .setTitle('Title of First List Item'),
+     *        app.buildOptionItem(SELECTION_KEY_TWO,
+     *          ['synonym of KEY_TWO 1', 'synonym of KEY_TWO 2'])
+     *          .setTitle('Title of Second List Item'),
+     *      ]));
+     * }
+     *
+     * function optionIntent (app) {
+     *   if (app.getSelectedOption() === SELECTION_KEY_ONE) {
+     *     app.tell('Number one is a great choice!');
+     *   } else {
+     *     app.tell('Number two is a great choice!');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(OPTION_INTENT, optionIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param inputPrompt The input prompt
+     *     response.
+     * @param.list List built with {@link AssistantApp#buildList|buildList}
+     * @return HTTP response.
+     * @dialogflow
+     */
+    askWithList(inputPrompt: string | RichResponse | SimpleResponse, list: List): express.Response | null;
+
+    /**
+     * Asks to collect the user's input with a carousel.
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const OPTION_INTENT = 'option.select';
+     *
+     * function welcomeIntent (app) {
+     *   app.askWithCarousel('Which of these looks good?',
+     *     app.buildCarousel()
+     *      .addItems([
+     *        app.buildOptionItem(SELECTION_KEY_ONE,
+     *          ['synonym of KEY_ONE 1', 'synonym of KEY_ONE 2'])
+     *          .setTitle('Number one'),
+     *        app.buildOptionItem(SELECTION_KEY_TWO,
+     *          ['synonym of KEY_TWO 1', 'synonym of KEY_TWO 2'])
+     *          .setTitle('Number two'),
+     *      ]));
+     * }
+     *
+     * function optionIntent (app) {
+     *   if (app.getSelectedOption() === SELECTION_KEY_ONE) {
+     *     app.tell('Number one is a great choice!');
+     *   } else {
+     *     app.tell('Number two is a great choice!');
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(OPTION_INTENT, optionIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param inputPrompt The input prompt
+     *     response.
+     * @param carousel Carousel built with
+     *     {@link AssistantApp#buildCarousel|buildCarousel}.
+     * @return HTTP response.
+     * @dialogflow
+     */
+    askWithCarousel(inputPrompt: string | RichResponse | SimpleResponse, carousel: Carousel): express.Response | null;
+
+    /**
+     * Tells the Assistant to render the speech response and close the mic.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const WELCOME_INTENT = 'input.welcome';
+     * const NUMBER_INTENT = 'input.number';
+     *
+     * function welcomeIntent (app) {
+     *   app.ask('Welcome to action snippets! Say a number.');
+     * }
+     *
+     * function numberIntent (app) {
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   app.tell('You said ' + number);
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(NUMBER_INTENT, numberIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param speechResponse Final response.
+     *     Spoken response can be SSML.
+     * @return The response that is sent back to Assistant.
+     * @dialogflow
+     */
+    tell(speechResponse: string | SimpleResponse | RichResponse): express.Response | null;
+
+    /**
+     * Set a new context for the current intent.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const CONTEXT_NUMBER = 'number';
+     * const NUMBER_ARGUMENT = 'myNumber';
+     *
+     * function welcomeIntent (app) {
+     *   app.setContext(CONTEXT_NUMBER);
+     *   app.ask('Welcome to action snippets! Say a number.');
+     * }
+     *
+     * function numberIntent (app) {
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   app.tell('You said ' + number);
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(NUMBER_INTENT, numberIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param name Name of the context. Dialogflow converts to lowercase.
+     * @param [lifespan=1] Context lifespan.
+     * @param parameters Context JSON parameters.
+     * @return Null if the context name is not defined.
+     * @dialogflow
+     */
+    setContext(name: string, lifespan?: number, parameters?: any): null | undefined;
+
+    /**
+     * Returns the incoming contexts for this intent.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const CONTEXT_NUMBER = 'number';
+     * const NUMBER_ARGUMENT = 'myNumber';
+     *
+     * function welcomeIntent (app) {
+     *   app.setContext(CONTEXT_NUMBER);
+     *   app.ask('Welcome to action snippets! Say a number.');
+     * }
+     *
+     * function numberIntent (app) {
+     *   let contexts = app.getContexts();
+     *   // contexts === [{
+     *   //   name: 'number',
+     *   //   lifespan: 0,
+     *   //   parameters: {
+     *   //     myNumber: '23',
+     *   //     myNumber.original: '23'
+     *   //   }
+     *   // }]
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   app.tell('You said ' + number);
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(NUMBER_INTENT, numberIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @return Empty if no active contexts.
+     * @dialogflow
+     */
+    getContexts(): Context[];
+
+    /**
+     * Returns the incoming context by name for this intent.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * const CONTEXT_NUMBER = 'number';
+     * const NUMBER_ARGUMENT = 'myNumber';
+     *
+     * function welcomeIntent (app) {
+     *   app.setContext(CONTEXT_NUMBER);
+     *   app.ask('Welcome to action snippets! Say a number.');
+     * }
+     *
+     * function numberIntent (app) {
+     *   let context = app.getContext(CONTEXT_NUMBER);
+     *   // context === {
+     *   //   name: 'number',
+     *   //   lifespan: 0,
+     *   //   parameters: {
+     *   //     myNumber: '23',
+     *   //     myNumber.original: '23'
+     *   //   }
+     *   // }
+     *   const number = app.getArgument(NUMBER_ARGUMENT);
+     *   app.tell('You said ' + number);
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(NUMBER_INTENT, numberIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @param name The name of the Context to retrieve.
+     * @return Context value matching name
+     *     or null if no matching context.
+     * @dialogflow
+     */
+    getContext(name: string): object;
+
+    /**
+     * Gets the user's raw input query.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     * app.tell('You said ' + app.getRawInput());
+     *
+     * @return User's raw query or null if no value.
+     * @dialogflow
+     */
+    getRawInput(): string;
+}
diff --git a/types/actions-on-google/index.d.ts b/types/actions-on-google/index.d.ts
new file mode 100644
index 0000000000..23a2c1483d
--- /dev/null
+++ b/types/actions-on-google/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for actions-on-google 1.7
+// Project: https://github.com/actions-on-google/actions-on-google-nodejs
+// Definitions by: Joel Hegg <https://github.com/joelhegg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/**
+ * The Actions on Google client library.
+ * https://developers.google.com/actions/
+ */
+
+import * as Transactions from './transactions';
+import * as Responses from './response-builder';
+
+export { AssistantApp } from './assistant-app';
+export { ActionsSdkApp, ActionsSdkAppOptions } from './actions-sdk-app';
+export { DialogflowApp, DialogflowAppOptions } from './dialogflow-app';
+export { Transactions };
+export { Responses };
+// Backwards compatibility
+export { AssistantApp as Assistant } from './assistant-app';
+export { ActionsSdkApp as ActionsSdkAssistant } from './actions-sdk-app';
+export { DialogflowApp as ApiAiAssistant } from './dialogflow-app';
+export { DialogflowApp as ApiAiApp } from './dialogflow-app';
diff --git a/types/actions-on-google/response-builder.d.ts b/types/actions-on-google/response-builder.d.ts
new file mode 100644
index 0000000000..4ebb9b3007
--- /dev/null
+++ b/types/actions-on-google/response-builder.d.ts
@@ -0,0 +1,443 @@
+/**
+ * A collection of response builders.
+ */
+
+import { OrderUpdate } from './transactions';
+
+/**
+ * List of possible options to display the image in a BasicCard.
+ * When the aspect ratio of an image is not the same as the surface,
+ * this attribute changes how the image is displayed in the card.
+ */
+export enum ImageDisplays {
+    /**
+     * Pads the gaps between the image and image frame with a blurred copy of the
+     * same image.
+     */
+    DEFAULT,
+    /**
+     * Fill the gap between the image and image container with white bars.
+     */
+    WHITE,
+    /**
+     * Image is centered and resized so the image fits perfectly in the container.
+     */
+    CROPPED
+}
+
+/**
+ * Simple Response type.
+ */
+export interface SimpleResponse {
+    /** Speech to be spoken to user. SSML allowed. */
+    speech: string;
+    /** Optional text to be shown to user */
+    displayText?: string;
+}
+
+/**
+ * Suggestions to show with response.
+ */
+export interface Suggestion {
+    /** Text of the suggestion. */
+    title: string;
+}
+
+/**
+ * Link Out Suggestion. Used in rich response as a suggestion chip which, when
+ * selected, links out to external URL.
+ */
+export interface LinkOutSuggestion {
+    /** Text shown on the suggestion chip. */
+    title: string;
+    /** String URL to open. */
+    url: string;
+}
+
+/**
+ * Image type shown on visual elements.
+ */
+export interface Image {
+    /** Image source URL. */
+    url: string;
+    /** Text to replace for image for accessibility. */
+    accessibilityText: string;
+    /** Width of the image. */
+    width: number;
+    /** Height of the image. */
+    height: number;
+}
+
+/**
+ * Basic Card Button. Shown below basic cards. Open a URL when selected.
+ */
+export interface Button {
+    /** Text shown on the button. */
+    title: string;
+    /** Action to take when selected. */
+    openUrlAction: {
+      /** String URL to open. */
+      url: string;
+    };
+}
+
+/**
+ * Option info. Provides unique identifier for a given OptionItem.
+ */
+export interface OptionInfo {
+    /** Unique string ID for this option. */
+    key: string;
+    /** Synonyms that can be used by the user to indicate this option if they do not use the key. */
+    synonyms: string[];
+}
+
+export interface StructuredResponse {
+    orderUpdate: OrderUpdate;
+}
+
+export interface ItemBasicCard {
+    basicCard: BasicCard;
+}
+
+export interface ItemSimpleResponse {
+    simpleResponse: SimpleResponse;
+}
+
+export interface ItemStructuredResponse {
+    structuredResponse: StructuredResponse;
+}
+
+export type RichResponseItem = ItemBasicCard | ItemSimpleResponse | ItemStructuredResponse;
+
+/**
+ * Class for initializing and constructing Rich Responses with chainable interface.
+ */
+export class RichResponse {
+    /**
+     * Constructor for RichResponse. Accepts optional RichResponse to clone.
+     *
+     * @param richResponse Optional RichResponse to clone.
+     */
+    constructor(richResponse?: RichResponse);
+
+    /**
+     * Ordered list of either SimpleResponse objects or BasicCard objects.
+     * First item must be SimpleResponse. There can be at most one card.
+     */
+    items: RichResponseItem[];
+
+    /**
+     * Ordered list of text suggestions to display. Optional.
+     */
+    suggestions: Suggestion[];
+
+    /**
+     * Link Out Suggestion chip for this rich response. Optional.
+     */
+    linkOutSuggestion?: LinkOutSuggestion;
+
+    /**
+     * Adds a SimpleResponse to list of items.
+     *
+     * @param simpleResponse Simple response to present to
+     *     user. If just a string, display text will not be set.
+     * @return Returns current constructed RichResponse.
+     */
+    addSimpleResponse(simpleResponse: string | SimpleResponse): RichResponse;
+
+    /**
+     * Adds a BasicCard to list of items.
+     *
+     * @param basicCard Basic card to include in response.
+     * @return Returns current constructed RichResponse.
+     */
+    addBasicCard(basicCard: BasicCard): RichResponse;
+
+    /**
+     * Adds a single suggestion or list of suggestions to list of items.
+     *
+     * @param suggestions Either a single string suggestion
+     *     or list of suggestions to add.
+     * @return Returns current constructed RichResponse.
+     */
+    addSuggestions(suggestions: string | string[]): RichResponse;
+
+    /**
+     * Returns true if the given suggestion text is valid to be added to the suggestion list. A valid
+     * text string is not longer than 25 characters.
+     * @param suggestionText Text to validate as suggestion.
+     * @return True if the text is valid, false otherwise.s
+     */
+    isValidSuggestionText(suggestionText: string): boolean;
+
+    /**
+     * Sets the suggestion link for this rich response. The destination site must be verified
+     * (https://developers.google.com/actions/console/brand-verification).
+     *
+     * @param destinationName Name of the link out destination.
+     * @param suggestionUrl - String URL to open when suggestion is used.
+     * @return Returns current constructed RichResponse.
+     */
+    addSuggestionLink(destinationName: string, suggestionUrl: string): RichResponse;
+
+    /**
+     * Adds an order update to this response. Use after a successful transaction
+     * decision to confirm the order.
+     *
+     * @param orderUpdate OrderUpdate object to add.
+     * @return Returns current constructed RichResponse.
+     */
+    addOrderUpdate(orderUpdate: OrderUpdate): RichResponse;
+}
+
+/**
+ * Class for initializing and constructing Basic Cards with chainable interface.
+ */
+export class BasicCard {
+    /**
+     * Constructor for BasicCard. Accepts optional BasicCard to clone.
+     *
+     * @param basicCard Optional BasicCard to clone.
+     */
+    constructor(basicCard?: BasicCard);
+
+    /**
+     * Title of the card. Optional.
+     */
+    title?: string;
+
+    /**
+     * Body text to show on the card. Required, unless image is present.
+     */
+    formattedText: string;
+
+    /**
+     * Subtitle of the card. Optional.
+     */
+    subtitle?: string;
+
+    /**
+     * Image to show on the card. Optional.
+     */
+    image?: Image;
+
+    /**
+     * Ordered list of buttons to show below card. Optional.
+     */
+    buttons: Button[];
+
+    /**
+     * Sets the title for this Basic Card.
+     *
+     * @param title Title to show on card.
+     * @return Returns current constructed BasicCard.
+     */
+    setTitle(title: string): BasicCard;
+
+    /**
+     * Sets the subtitle for this Basic Card.
+     *
+     * @param subtitle Subtitle to show on card.
+     * @return Returns current constructed BasicCard.
+     */
+    setSubtitle(subtitle: string): BasicCard;
+
+    /**
+     * Sets the body text for this Basic Card.
+     *
+     * @param bodyText Body text to show on card.
+     * @return Returns current constructed BasicCard.
+     */
+    setBodyText(bodyText: string): BasicCard;
+
+    /**
+     * Sets the image for this Basic Card.
+     *
+     * @param url Image source URL.
+     * @param accessibilityText Text to replace for image for
+     *     accessibility.
+     * @param width Width of the image.
+     * @param height Height of the image.
+     * @return Returns current constructed BasicCard.
+     */
+    setImage(url: string, accessibilityText: string, width?: number, height?: number): BasicCard;
+
+    /**
+     * Sets the display options for the image in this Basic Card.
+     * Use one of the image display constants. If none is chosen,
+     * ImageDisplays.DEFAULT will be enforced.
+     *
+     * @param option The option for displaying the image.
+     * @return Returns current constructed BasicCard.
+     */
+    setImageDisplay(option: ImageDisplays): BasicCard;
+
+    /**
+     * Adds a button below card.
+     *
+     * @param text Text to show on button.
+     * @param url URL to open when button is selected.
+     * @return Returns current constructed BasicCard.
+     */
+    addButton(text: string, url: string): BasicCard;
+}
+
+/**
+ * Class for initializing and constructing Lists with chainable interface.
+ */
+export class List {
+    /**
+     * Constructor for List. Accepts optional List to clone, string title, or
+     * list of items to copy.
+     *
+     * @param list Either a list to clone, a title
+     *     to set for a new List, or an array of OptionItem to initialize a new
+     *     list.
+     */
+    constructor(list?: List | string | OptionItem[]);
+
+    /**
+     * Title of the list. Optional.
+     */
+    title?: string;
+
+    /**
+     * List of 2-20 items to show in this list. Required.
+     */
+    items: OptionItem[];
+
+    /**
+     * Sets the title for this List.
+     *
+     * @param title Title to show on list.
+     * @return Returns current constructed List.
+     */
+    setTitle(title: string): List;
+
+    /**
+     * Adds a single item or list of items to the list.
+     *
+     * @param optionItems OptionItems to add.
+     * @return Returns current constructed List.
+     */
+    addItems(optionItems: OptionItem | OptionItem[]): List;
+}
+
+/**
+ * Class for initializing and constructing Carousel with chainable interface.
+ */
+export class Carousel {
+    /**
+     * Constructor for Carousel. Accepts optional Carousel to clone or list of
+     * items to copy.
+     *
+     * @param carousel Either a carousel to clone
+     *     or an array of OptionItem to initialize a new carousel
+     */
+    constructor(carousel?: Carousel | OptionItem[]);
+
+    /**
+     * List of 2-20 items to show in this carousel. Required.
+     */
+    items: OptionItem[];
+
+    /**
+     * Adds a single item or list of items to the carousel.
+     *
+     * @param optionItems OptionItems to add.
+     * @return Returns current constructed Carousel.
+     */
+    addItems(optionItems: OptionItem | OptionItem[]): Carousel;
+}
+
+/**
+ * Class for initializing and constructing Option Items with chainable interface.
+ */
+export class OptionItem {
+    /**
+     * Constructor for OptionItem. Accepts optional OptionItem to clone.
+     *
+     * @param optionItem Optional OptionItem to clone.
+     */
+    constructor(optionItem?: OptionItem);
+
+    /**
+     * Option info of the option item. Required.
+     */
+    optionInfo: OptionInfo;
+
+    /**
+     * Title of the option item. Required.
+     */
+    title: string;
+
+    /**
+     * Description text of the item. Optional.
+     */
+    description?: string;
+
+    /**
+     * Image to show on item. Optional.
+     */
+    image?: Image;
+
+    /**
+     * Sets the title for this Option Item.
+     *
+     * @param title Title to show on item.
+     * @return Returns current constructed OptionItem.
+     */
+    setTitle(title: string): OptionItem;
+
+    /**
+     * Sets the description for this Option Item.
+     *
+     * @param description Description to show on item.
+     * @return Returns current constructed OptionItem.
+     */
+    setDescription(description: string): OptionItem;
+
+    /**
+     * Sets the image for this Option Item.
+     *
+     * @param url Image source URL.
+     * @param accessibilityText Text to replace for image for
+     *     accessibility.
+     * @param width Width of the image.
+     * @param height Height of the image.
+     * @return Returns current constructed OptionItem.
+     */
+    setImage(url: string, accessibilityText: string, width?: number, height?: number): OptionItem;
+
+    /**
+     * Sets the key for the OptionInfo of this Option Item. This will be returned
+     * as an argument in the resulting actions.intent.OPTION intent.
+     *
+     * @param key Key to uniquely identify this item.
+     * @return Returns current constructed OptionItem.
+     */
+    setKey(key: string): OptionItem;
+
+    /**
+     * Adds a single synonym or list of synonyms to item.
+     *
+     * @param synonyms Either a single string synonyms
+     *     or list of synonyms to add.
+     * @return Returns current constructed OptionItem.
+     */
+    addSynonyms(synonyms: string | string[]): OptionItem;
+}
+
+/**
+ * Check if given text contains SSML.
+ * @param text Text to check.
+ * @return True if text contains SSML, false otherwise.
+ */
+export function isSsml(text: string): boolean;
+
+/**
+ * Check if given text contains SSML, allowing for whitespace padding.
+ * @param text Text to check.
+ * @return True if text contains possibly whitespace padded SSML, false otherwise.
+ */
+export function isPaddedSsml(text: string): boolean;
diff --git a/types/actions-on-google/transactions.d.ts b/types/actions-on-google/transactions.d.ts
new file mode 100644
index 0000000000..59e6cd9b37
--- /dev/null
+++ b/types/actions-on-google/transactions.d.ts
@@ -0,0 +1,1063 @@
+/**
+ * A collection of Transaction related constants, utility functions, and
+ * builders.
+ */
+
+import { Image } from './response-builder';
+
+/**
+ * Price type.
+ */
+export interface Price {
+    /** One of Transaction.PriceType. */
+    type: TransactionValues.PriceType;
+    amount: {
+        /** Currency code of price. */
+        currencyCode: string;
+        /** Unit count of price. */
+        units: number;
+        /** Partial unit count of price. */
+        nanos?: number;
+    };
+}
+
+/**
+ * Order rejection info.
+ */
+export interface RejectionInfo {
+    /** One of Transaction.ReasonType. */
+    type: TransactionValues.ReasonType;
+    /** Reason for the order rejection. */
+    reason: string;
+}
+
+/**
+ * Order receipt info.
+ */
+export interface ReceiptInfo {
+    /** Action provided order ID. Used when the order has been received by the integrator. */
+    confirmedActionOrderId: string;
+}
+
+/**
+ * Order cancellation info.
+ */
+export interface CancellationInfo {
+    /** Reason for the cancellation. */
+    reason: string;
+}
+
+/**
+ * Order transit info.
+ */
+export interface TransitInfo {
+    /** UTC timestamp of the transit update as an RFC 3339 string. */
+    updatedTime: string;
+}
+
+/**
+ * Order fulfillment info.
+ */
+export interface FulfillmentInfo {
+    /** UTC timestamp of the fulfillment update as an RFC 3339 string. */
+    deliveryTime: string;
+}
+
+/**
+ * Order return info.
+ */
+export interface ReturnInfo {
+    /** Reason for the return. */
+    reason: string;
+}
+
+/**
+ * Transaction config for transactions not involving a Google provided
+ * payment instrument.
+ */
+export interface ActionPaymentTransactionConfig {
+    /** True if delivery address is required for the transaction. */
+    deliveryAddressRequired: boolean;
+    /** One of Transactions.PaymentType. */
+    type: TransactionValues.PaymentType;
+    /** The name of the instrument displayed on receipt. For example, for card payment, could be "VISA-1234". */
+    displayName: string;
+    customerInfoOptions?: CustomerInfoOptions;
+}
+
+/**
+ * Transaction config for transactions involving a Google provided payment
+ * instrument.
+ */
+export interface GooglePaymentTransactionConfig {
+    /** True if delivery address is required for the transaction. */
+    deliveryAddressRequired: boolean;
+    /** Tokenization parameters provided by payment gateway. */
+    tokenizationParameters: object;
+    /** List of accepted card networks. Must be any number of Transactions.CardNetwork. */
+    cardNetworks: TransactionValues.CardNetwork[];
+    /** True if prepaid cards are not allowed for transaction. */
+    prepaidCardDisallowed: boolean;
+    /** The type of tokenization. Default is {@see TransactionValues.PaymentMethodTokenizationType.PAYMENT_GATEWAY}. */
+    tokenizationType: string;
+    customerInfoOptions?: CustomerInfoOptions;
+}
+
+/**
+ * Customer information requested as part of the transaction
+ */
+export interface CustomerInfoOptions {
+    customerInfoProperties: string[];
+}
+
+/**
+ * Generic Location type.
+ */
+export interface Location {
+    postalAddress: {
+        regionCode: string;
+        languageCode: string;
+        postalCode: string;
+        administrativeArea: string;
+        locality: string;
+        addressLines: string[];
+        recipients: string;
+    };
+    phoneNumber: string;
+    notes: string;
+}
+
+/**
+ * Decision and order information returned when calling getTransactionDecision().
+ */
+export interface TransactionDecision {
+    /** One of Transactions.ConfirmationDecision. */
+    userDecision: TransactionValues.TransactionUserDecision;
+    checkResult: {
+        /** One of Transactions.ResultType. */
+        resultType: TransactionValues.ResultType;
+    };
+    order: {
+        /** The proposed order used in the transaction decision. */
+        finalOrder: Order;
+        /** Order ID assigned by Google. */
+        googleOrderId: string;
+        /** User visible order ID set in proposed order. */
+        actionOrderId: string;
+        orderDate: {
+            seconds: string;
+            nanos: number;
+        };
+        paymentInfo: object;
+        customerInfo: {
+            /** Customer email. */
+            email: string;
+        };
+    };
+    /**
+     * The delivery address if user requested.
+     * Will appear if userDecision is Transactions.DELIVERY_ADDRESS_UPDATED.
+     */
+    deliveryAddress: Location;
+}
+
+/**
+ * Values related to supporting transactions
+ */
+export namespace TransactionValues {
+    /**
+     * List of transaction card networks available when paying with Google.
+     */
+    enum CardNetwork {
+        /**
+         * Unspecified.
+         */
+        UNSPECIFIED,
+        /**
+         * American Express.
+         */
+        AMEX,
+        /**
+         * Discover.
+         */
+        DISCOVER,
+        /**
+         * Master Card.
+         */
+        MASTERCARD,
+        /**
+         * Visa.
+         */
+        VISA,
+        /**
+         * JCB.
+         */
+        JCB
+    }
+
+    /**
+     * List of possible item types.
+     * @deprecated Use {@link TransactionValues.LineItemType} instead.
+     */
+    // tslint:disable-next-line: strict-export-declare-modifiers
+    export import ItemType = LineItemType;
+
+    /**
+     * List of possible item types.
+     */
+    enum LineItemType {
+        /**
+         * Unspecified.
+         */
+        UNSPECIFIED,
+        /**
+         * Regular.
+         */
+        REGULAR,
+        /**
+         * Tax.
+         */
+        TAX,
+        /**
+         * Discount
+         */
+        DISCOUNT,
+        /**
+         * Gratuity
+         */
+        GRATUITY,
+        /**
+         * Delivery
+         */
+        DELIVERY,
+        /**
+         * Subtotal
+         */
+        SUBTOTAL,
+        /**
+         * Fee. For everything else, there's fee.
+         */
+        FEE
+    }
+
+    /**
+     * List of price types.
+     */
+    enum PriceType {
+        /**
+         * Unknown.
+         */
+        UNKNOWN,
+        /**
+         * Estimate.
+         */
+        ESTIMATE,
+        /**
+         * Actual.
+         */
+        ACTUAL
+    }
+
+    /**
+     * List of possible item types.
+     */
+    enum PaymentType {
+        /**
+         * Unspecified.
+         */
+        UNSPECIFIED,
+        /**
+         * Payment card.
+         */
+        PAYMENT_CARD,
+        /**
+         * Bank.
+         */
+        BANK,
+        /**
+         * Loyalty program.
+         */
+        LOYALTY_PROGRAM,
+        /**
+         * On order fulfillment, such as cash on delivery.
+         */
+        ON_FULFILLMENT,
+        /**
+         * Gift card.
+         */
+        GIFT_CARD
+    }
+
+    /**
+     * List of customer information properties that can be requested.
+     */
+    enum CustomerInfoProperties {
+        CUSTOMER_INFO_PROPERTY_UNSPECIFIED,
+        EMAIL
+    }
+
+    /**
+     * List of possible order confirmation user decisions
+     * @deprecated Use {@link TransactionValues.TransactionUserDecision} instead.
+     */
+    // tslint:disable-next-line: strict-export-declare-modifiers
+    export import ConfirmationDecision = TransactionUserDecision;
+
+    /**
+     * List of possible order confirmation user decisions
+     */
+    enum TransactionUserDecision {
+        /**
+         * Unspecified user decision.
+         */
+        UNKNOWN_USER_DECISION,
+        /**
+         * Order was approved by user.
+         */
+        ACCEPTED,
+        /**
+         * Order was declined by user.
+         */
+        REJECTED,
+        /**
+         * Order was not declined, but the delivery address was updated during
+         * confirmation.
+         */
+        DELIVERY_ADDRESS_UPDATED,
+        /**
+         * Order was not declined, but the cart was updated during confirmation.
+         */
+        CART_CHANGE_REQUESTED
+    }
+
+    /**
+     * List of possible order states.
+     */
+    enum OrderState {
+        /**
+         * Order was created at the integrator's system.
+         */
+        CREATED,
+        /**
+         * Order was rejected.
+         */
+        REJECTED,
+        /**
+         * Order was confirmed by integrator and is active.
+         */
+        CONFIRMED,
+        /**
+         * User cancelled the order.
+         */
+        CANCELLED,
+        /**
+         * Order is being delivered.
+         */
+        IN_TRANSIT,
+        /**
+         * User performed a return.
+         */
+        RETURNED,
+        /**
+         * User received what was ordered.
+         */
+        FULFILLED
+    }
+
+    /**
+     * List of possible actions to take on the order.
+     * @deprecated Use {@link TransactionValues.ActionType} instead.
+     */
+    // tslint:disable-next-line: strict-export-declare-modifiers
+    export import OrderAction = ActionType;
+
+    /**
+     * List of possible actions to take on the order.
+     */
+    enum ActionType {
+        /**
+         * Unknown action.
+         */
+        UNKNOWN,
+        /**
+         * View details.
+         */
+        VIEW_DETAILS,
+        /**
+         * Modify order.
+         */
+        MODIFY,
+        /**
+         * Cancel order.
+         */
+        CANCEL,
+        /**
+         * Return order.
+         */
+        RETURN,
+        /**
+         * Exchange order.
+         */
+        EXCHANGE,
+        /**
+         * Email.
+         */
+        EMAIL,
+        /**
+         * Call.
+         */
+        CALL,
+        /**
+         * Reorder.
+         */
+        REORDER,
+        /**
+         * Review.
+         */
+        REVIEW,
+        /**
+         * Customer Service.
+         */
+        CUSTOMER_SERVICE
+    }
+
+    /**
+     * List of possible types of order rejection.
+     * @deprecated Use {@link TransactionValues.ReasonType} instead.
+     */
+    // tslint:disable-next-line: strict-export-declare-modifiers
+    export import RejectionType = ReasonType;
+
+    /**
+     * List of possible types of order rejection.
+     */
+    enum ReasonType {
+        /**
+         * Unknown
+         */
+        UNKNOWN,
+        /**
+         * Payment was declined.
+         */
+        PAYMENT_DECLINED
+    }
+
+    /**
+     * List of possible order state objects.
+     */
+    enum OrderStateInfo {
+        /**
+         * Information about order rejection. Used with {@link RejectionInfo}.
+         */
+        REJECTION,
+        /**
+         * Information about order receipt. Used with {@link ReceiptInfo}.
+         */
+        RECEIPT,
+        /**
+         * Information about order cancellation. Used with {@link CancellationInfo}.
+         */
+        CANCELLATION,
+        /**
+         * Information about in-transit order. Used with {@link TransitInfo}.
+         */
+        IN_TRANSIT,
+        /**
+         * Information about order fulfillment. Used with {@link FulfillmentInfo}.
+         */
+        FULFILLMENT,
+        /**
+         * Information about order return. Used with {@link ReturnInfo}.
+         */
+        RETURN
+    }
+
+    /**
+     * List of possible order transaction requirements check result types.
+     */
+    enum ResultType {
+        /**
+         * Unspecified.
+         */
+        UNSPECIFIED,
+        /**
+         * OK to continue transaction.
+         */
+        OK,
+        /**
+         * User is expected to take action, e.g. enable payments, to continue
+         * transaction.
+         */
+        USER_ACTION_REQUIRED,
+        /**
+         * Transactions are not supported on current device/surface.
+         */
+        ASSISTANT_SURFACE_NOT_SUPPORTED,
+        /**
+         * Transactions are not supported for current region/country.
+         */
+        REGION_NOT_SUPPORTED
+    }
+
+    /**
+     * List of possible user decisions to give delivery address.
+     * @deprecated Use {@link TransactionValues.DeliveryAddressUserDecision} instead.
+     */
+    // tslint:disable-next-line: strict-export-declare-modifiers
+    export import DeliveryAddressDecision = DeliveryAddressUserDecision;
+
+    /**
+     * List of possible user decisions to give delivery address.
+     */
+    enum DeliveryAddressUserDecision {
+        /**
+         * Unknown.
+         */
+        UNKNOWN,
+        /**
+         * User granted delivery address.
+         */
+        ACCEPTED,
+        /**
+         * User denied to give delivery address.
+         */
+        REJECTED
+    }
+
+    /**
+     * List of possible order location types.
+     * @deprecated Use {@link TransactionValues.OrderLocationType} instead.
+     */
+    // tslint:disable-next-line: strict-export-declare-modifiers
+    export import LocationType = OrderLocationType;
+
+    /**
+     * List of possible order location types.
+     */
+    enum OrderLocationType {
+        /**
+         * Unknown.
+         */
+        UNKNOWN,
+        /**
+         * Delivery location for an order.
+         */
+        DELIVERY,
+        /**
+         * Business location of order provider.
+         */
+        BUSINESS,
+        /**
+         * Origin of the order.
+         */
+        ORIGIN,
+        /**
+         * Destination of the order.
+         */
+        DESTINATION,
+        /**
+         * Pick up location of the order.
+         */
+        PICK_UP
+    }
+
+    /**
+     * List of possible order time types.
+     */
+    enum TimeType {
+        /**
+         * Unknown.
+         */
+        UNKNOWN,
+        /**
+         * Date of delivery for the order.
+         */
+        DELIVERY_DATE,
+        /**
+         * Estimated Time of Arrival for order.
+         */
+        ETA,
+        /**
+         * Reservation time.
+         */
+        RESERVATION_SLOT
+    }
+
+    /**
+     * List of possible tokenization types for the payment method
+     */
+    enum PaymentMethodTokenizationType {
+        /**
+         * Unspecified tokenization type.
+         */
+        UNSPECIFIED_TOKENIZATION_TYPE,
+        /**
+         * Use external payment gateway tokenization API to tokenize selected payment method.
+         */
+        PAYMENT_GATEWAY
+    }
+}
+
+/**
+ * Class for initializing and constructing Order with chainable interface.
+ */
+export class Order {
+    /**
+     * Constructor for Order.
+     *
+     * @param orderId Unique identifier for the order.
+     */
+    constructor(orderId: string);
+
+    /**
+     * ID for the order. Required.
+     */
+    id: string;
+
+    /**
+     * Cart for the order.
+     */
+    cart?: Cart;
+
+    /**
+     * Items not held in the order cart.
+     */
+    otherItems: LineItem[];
+
+    /**
+     * Image for the order.
+     */
+    image?: Image;
+
+    /**
+     * TOS for the order.
+     */
+    termsOfServiceUrl?: string;
+
+    /**
+     * Total price for the order.
+     */
+    totalPrice?: Price;
+
+    /**
+     * Extensions for this order. Used for vertical-specific order attributes,
+     * like times and locations.
+     */
+    extension?: object;
+
+    /**
+     * Set the cart for this order.
+     *
+     * @param cart Cart for this order.
+     * @return Returns current constructed Order.
+     */
+    setCart(cart: Cart): Order;
+
+    /**
+     * Adds a single item or list of items to the non-cart items list.
+     *
+     * @param items Line Items to add.
+     * @return Returns current constructed Order.
+     */
+    addOtherItems(items: LineItem | LineItem[]): Order;
+
+    /**
+     * Sets the image for this order.
+     *
+     * @param url Image source URL.
+     * @param accessibilityText Text to replace for image for
+     *     accessibility.
+     * @param width Width of the image.
+     * @param height Height of the image.
+     * @return Returns current constructed Order.
+     */
+    setImage(url: string, accessibilityText: string, width?: number, height?: number): Order;
+
+    /**
+     * Set the TOS for this order.
+     *
+     * @param url String URL of the TOS.
+     * @return Returns current constructed Order.
+     */
+    setTermsOfService(url: string): Order;
+
+    /**
+     * Sets the total price for this order.
+     *
+     * @param priceType One of TransactionValues.PriceType.
+     * @param currencyCode Currency code of price.
+     * @param units Unit count of price.
+     * @param nanos Partial unit count of price.
+     * @return Returns current constructed Order.
+     */
+    setTotalPrice(priceType: TransactionValues.PriceType, currencyCode: string, units: number, nanos?: number): Order;
+
+    /**
+     * Adds an associated location to the order. Up to 2 locations can be added.
+     *
+     * @param type One of TransactionValues.OrderLocationType.
+     * @param location Location to add.
+     * @return Returns current constructed Order.
+     */
+    addLocation(type: TransactionValues.OrderLocationType, location: Location): Order;
+
+    /**
+     * Sets an associated time to the order.
+     *
+     * @param type One of TransactionValues.TimeType.
+     * @param time Time to add. Time should be ISO 8601 representation
+     *     of time value. Could be date, datetime, or duration.
+     * @return Returns current constructed Order.
+     */
+    setTime(type: TransactionValues.TimeType, time: string): Order;
+}
+
+/**
+ * Class for initializing and constructing Cart with chainable interface.
+ */
+export class Cart {
+    /**
+     * Constructor for Cart.
+     *
+     * @param cartId Optional unique identifier for the cart.
+     */
+    constructor(cartId?: string);
+
+    /**
+     * ID for the cart. Optional.
+     */
+    id?: string;
+
+    /**
+     * Merchant providing the cart.
+     */
+    merchant?: object;
+
+    /**
+     * Optional notes about the cart.
+     */
+    notes?: string;
+
+    /**
+     * Items held in the order cart.
+     */
+    lineItems: LineItem[];
+
+    /**
+     * Non-line items.
+     */
+    otherItems: LineItem[];
+
+    /**
+     * Set the merchant for this cart.
+     *
+     * @param id Merchant ID.
+     * @param name Name of the merchant.
+     * @return Returns current constructed Cart.
+     */
+    setMerchant(id: string, name: string): Cart;
+
+    /**
+     * Set the notes for this cart.
+     *
+     * @param notes Notes.
+     * @return Returns current constructed Cart.
+     */
+    setNotes(notes: string): Cart;
+
+    /**
+     * Adds a single item or list of items to the cart.
+     *
+     * @param items Line Items to add.
+     * @return Returns current constructed Cart.
+     */
+    addLineItems(items: LineItem | LineItem[]): Cart;
+
+    /**
+     * Adds a single item or list of items to the non-items list of this cart.
+     *
+     * @param items Line Items to add.
+     * @return Returns current constructed Cart.
+     */
+    addOtherItems(items: LineItem | LineItem[]): Cart;
+}
+
+/**
+ * Class for initializing and constructing LineItem with chainable interface.
+ */
+export class LineItem {
+    /**
+     * Constructor for LineItem.
+     *
+     * @param lineItemId Unique identifier for the item.
+     * @param name Name of the item.
+     */
+    constructor(lineItemId: string, name: string);
+
+    /**
+     * Item ID.
+     */
+    id: string;
+
+    /**
+     * Name of the item.
+     */
+    name: string;
+
+    /**
+     * Item price.
+     */
+    price?: Price;
+
+    /**
+     * Sublines for current item. Only valid if item type is REGULAR.
+     */
+    subLines?: Array<string | LineItem>;
+
+    /**
+     * Image of the item.
+     */
+    image?: Image;
+
+    /**
+     * Type of the item. One of TransactionValues.LineItemType.
+     */
+    type?: TransactionValues.LineItemType;
+
+    /**
+     * Quantity of the item.
+     */
+    quantity?: number;
+
+    /**
+     * Description for the item.
+     */
+    description?: string;
+
+    /**
+     * Offer ID for the item.
+     */
+    offerId?: string;
+
+    /**
+     * Adds a single item or list of items or notes to the sublines. Only valid
+     * if item type is REGULAR.
+     *
+     * @param items Sublines to add.
+     * @return Returns current constructed LineItem.
+     */
+    addSublines(items: string | LineItem | Array<string | LineItem>): LineItem;
+
+    /**
+     * Sets the image for this item.
+     *
+     * @param url Image source URL.
+     * @param accessibilityText Text to replace for image for
+     *     accessibility.
+     * @param width Width of the image.
+     * @param height Height of the image.
+     * @return Returns current constructed LineItem.
+     */
+    setImage(url: string, accessibilityText: string, width?: number, height?: number): LineItem;
+
+    /**
+     * Sets the price of this item.
+     *
+     * @param priceType One of TransactionValues.PriceType.
+     * @param currencyCode Currency code of price.
+     * @param units Unit count of price.
+     * @param nanos Partial unit count of price.
+     * @return Returns current constructed LineItem.
+     */
+    setPrice(priceType: TransactionValues.PriceType, currencyCode: string, units: number, nanos?: number): LineItem;
+
+    /**
+     * Set the type of the item.
+     *
+     * @param type Type of the item. One of TransactionValues.LineItemType.
+     * @return Returns current constructed LineItem.
+     */
+    setType(type: TransactionValues.LineItemType): LineItem;
+
+    /**
+     * Set the quantity of the item.
+     *
+     * @param quantity Quantity of the item.
+     * @return Returns current constructed LineItem.
+     */
+    setQuantity(quantity: number): LineItem;
+
+    /**
+     * Set the description of the item.
+     *
+     * @param description Description of the item.
+     * @return Returns current constructed LineItem.
+     */
+    setDescription(description: string): LineItem;
+
+    /**
+     * Set the Offer ID of the item.
+     *
+     * @param offerId Offer ID of the item.
+     * @return Returns current constructed LineItem.
+     */
+    setOfferId(offerId: string): LineItem;
+}
+
+/**
+ * Class for initializing and constructing OrderUpdate with chainable interface.
+ */
+export class OrderUpdate {
+    /**
+     * Constructor for OrderUpdate.
+     *
+     * @param orderId Unique identifier of the order.
+     * @param isGoogleOrderId True if the order ID is provided by
+     *     Google. False if the order ID is app provided.
+     */
+    constructor(orderId: string, isGoogleOrderId: boolean);
+
+    /**
+     * Google provided identifier of the order.
+     */
+    googleOrderId?: string;
+
+    /**
+     * App provided identifier of the order.
+     */
+    actionOrderId?: string;
+
+    /**
+     * State of the order.
+     */
+    orderState?: object;
+
+    /**
+     * Updates for items in the order. Mapped by item id to state or price.
+     */
+    lineItemUpdates: object;
+
+    /**
+     * UTC timestamp of the order update as an RFC 3339 string.
+     */
+    updateTime?: string;
+
+    /**
+     * Actionable items presented to the user to manage the order.
+     */
+    orderManagementActions: object[];
+
+    /**
+     * Notification content to the user for the order update.
+     */
+    userNotification?: object;
+
+    /**
+     * Updated total price of the order.
+     */
+    totalPrice?: Price;
+
+    /**
+     * Set the Google provided order ID of the order.
+     *
+     * @param orderId Google provided order ID.
+     * @return Returns current constructed OrderUpdate.
+     */
+    setGoogleOrderId(orderId: string): OrderUpdate;
+
+    /**
+     * Set the Action provided order ID of the order.
+     *
+     * @param orderId Action provided order ID.
+     * @return Returns current constructed OrderUpdate.
+     */
+    setActionOrderId(orderId: string): OrderUpdate;
+
+    /**
+     * Set the state of the order.
+     *
+     * @param state One of TransactionValues.OrderState.
+     * @param label Label for the order state.
+     * @return Returns current constructed OrderUpdate.
+     */
+    setOrderState(state: TransactionValues.OrderState, label: string): OrderUpdate;
+
+    /**
+     * Set the update time of the order.
+     *
+     * @param seconds Seconds since Unix epoch.
+     * @param nanos Partial time units. It is rounded to the nearest millisecond.
+     * @return Returns current constructed OrderUpdate.
+     */
+    setUpdateTime(seconds: number, nanos?: number): OrderUpdate;
+
+    /**
+     * Set the user notification content of the order update.
+     *
+     * @param title Title of the notification.
+     * @param text Text of the notification.
+     * @return Returns current constructed OrderUpdate.
+     */
+    setUserNotification(title: string, text: object): OrderUpdate;
+
+    /**
+     * Sets the total price for this order.
+     *
+     * @param priceType One of TransactionValues.PriceType.
+     * @param currencyCode Currency code of price.
+     * @param units Unit count of price.
+     * @param nanos Partial unit count of price.
+     * @return Returns current constructed OrderUpdate.
+     */
+    setTotalPrice(priceType: TransactionValues.PriceType, currencyCode: string, units: number, nanos?: number): OrderUpdate;
+
+    /**
+     * Adds an actionable item for the user to manage the order.
+     *
+     * @param type One of TransactionValues.ActionType.
+     * @param label Button label.
+     * @param url URL to open when button is clicked.
+     * @return Returns current constructed OrderUpdate.
+     */
+    addOrderManagementAction(type: TransactionValues.ActionType, label: string, url: string): OrderUpdate;
+
+    /**
+     * Adds a single price update for a particular line item in the order.
+     *
+     * @param itemId Line item ID for the order item updated.
+     * @param priceType One of TransactionValues.PriceType.
+     * @param currencyCode Currency code of new price.
+     * @param units Unit count of new price.
+     * @param nanos Partial unit count of new price.
+     * @param reason Reason for the price change. Required unless a
+     *     reason for this line item change was already declared in
+     *     addLineItemStateUpdate.
+     * @return Returns current constructed OrderUpdate.
+     */
+    addLineItemPriceUpdate(itemId: string, priceType: TransactionValues.PriceType, currencyCode: string, units: number, nanos?: number, reason?: string): OrderUpdate;
+
+    /**
+     * Adds a single state update for a particular line item in the order.
+     *
+     * @param itemId Line item ID for the order item updated.
+     * @param state One of TransactionValues.OrderState.
+     * @param label Label for the new item state.
+     * @param reason Reason for the price change. This will overwrite
+     *     any reason given in addLineitemPriceUpdate.
+     * @return Returns current constructed OrderUpdate.
+     */
+    addLineItemStateUpdate(itemId: string, state: TransactionValues.OrderState, label: string, reason?: string): OrderUpdate;
+
+    /**
+     * Sets some extra information about the order. Takes an order update info
+     * type, and any accompanying data. This should only be called once per
+     * order update.
+     *
+     * @param type One of TransactionValues.OrderStateInfo.
+     * @param data Proper Object matching the data necessary for the info
+     *     type. For instance, for the TransactionValues.OrderStateInfo.RECEIPT info
+     *     type, use the {@link ReceiptInfo} data type.
+     * @return Returns current constructed OrderUpdate.
+     */
+    setInfo(type: string, data: object): OrderUpdate;
+}
diff --git a/types/actions-on-google/tsconfig.json b/types/actions-on-google/tsconfig.json
new file mode 100644
index 0000000000..6682b5c194
--- /dev/null
+++ b/types/actions-on-google/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "assistant-app.d.ts",
+        "actions-sdk-app.d.ts",
+        "dialogflow-app.d.ts",
+        "response-builder.d.ts",
+        "transactions.d.ts",
+        "actions-on-google-tests.ts"
+    ]
+}
diff --git a/types/artyom.js/tslint.json b/types/actions-on-google/tslint.json
similarity index 100%
rename from types/artyom.js/tslint.json
rename to types/actions-on-google/tslint.json
diff --git a/types/activex-access/package.json b/types/activex-access/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-access/package.json
+++ b/types/activex-access/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-adodb/package.json b/types/activex-adodb/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-adodb/package.json
+++ b/types/activex-adodb/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-dao/package.json b/types/activex-dao/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-dao/package.json
+++ b/types/activex-dao/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-excel/package.json b/types/activex-excel/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-excel/package.json
+++ b/types/activex-excel/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-infopath/package.json b/types/activex-infopath/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-infopath/package.json
+++ b/types/activex-infopath/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-libreoffice/tslint.json b/types/activex-libreoffice/tslint.json
index 098cdac415..8e56cb082c 100644
--- a/types/activex-libreoffice/tslint.json
+++ b/types/activex-libreoffice/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         "interface-name": [false],
         "ban-types": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
         "no-unnecessary-qualifier": false
     }
 }
\ No newline at end of file
diff --git a/types/activex-msforms/package.json b/types/activex-msforms/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-msforms/package.json
+++ b/types/activex-msforms/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-mshtml/package.json b/types/activex-mshtml/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-mshtml/package.json
+++ b/types/activex-mshtml/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-msxml2/package.json b/types/activex-msxml2/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-msxml2/package.json
+++ b/types/activex-msxml2/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-office/package.json b/types/activex-office/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-office/package.json
+++ b/types/activex-office/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-outlook/package.json b/types/activex-outlook/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-outlook/package.json
+++ b/types/activex-outlook/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-powerpoint/package.json b/types/activex-powerpoint/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-powerpoint/package.json
+++ b/types/activex-powerpoint/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-scripting/package.json b/types/activex-scripting/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-scripting/package.json
+++ b/types/activex-scripting/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-stdole/package.json b/types/activex-stdole/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-stdole/package.json
+++ b/types/activex-stdole/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-vbide/package.json b/types/activex-vbide/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-vbide/package.json
+++ b/types/activex-vbide/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-wia/package.json b/types/activex-wia/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-wia/package.json
+++ b/types/activex-wia/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/activex-word/package.json b/types/activex-word/package.json
index d9b1031263..cff3db7dba 100644
--- a/types/activex-word/package.json
+++ b/types/activex-word/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "activex-helpers": "*"
     }
-}
\ No newline at end of file
+}
diff --git a/types/adal-angular/adal-angular-tests.ts b/types/adal-angular/adal-angular-tests.ts
new file mode 100644
index 0000000000..272591d56e
--- /dev/null
+++ b/types/adal-angular/adal-angular-tests.ts
@@ -0,0 +1,84 @@
+import AuthenticationContext, {
+    AuthenticationContextOptions,
+    TokenCallback,
+    UserCallback
+} from "adal-angular";
+
+const onLogin: TokenCallback = (errorDescription, idToken, error) => {
+    if (error) {
+        console.error(errorDescription, error);
+        return;
+    }
+    if (config.popUp) {
+        authenticationContext.getUser(onUser);
+    }
+};
+
+const onToken: TokenCallback = (errorDesc, token, error) => {
+    if (error) {
+        console.error(error);
+        return;
+    }
+    console.log('Making request with token:', token);
+};
+
+const onUser: UserCallback = (error, user) => {
+    if (error) {
+        console.error(error);
+        return;
+    }
+    acquireAnAccessToken();
+};
+
+const acquireAnAccessToken = () => {
+    const resourceId = "https://graph.microsoft.net";
+    authenticationContext.acquireToken(
+        resourceId,
+        (errorDesc, token, error) => {
+            if (error) {
+                if (config.popUp) {
+                    authenticationContext.acquireTokenPopup(
+                        resourceId,
+                        null,
+                        null,
+                        onToken
+                    );
+                } else {
+                    authenticationContext.acquireTokenRedirect(
+                        resourceId,
+                        null,
+                        null
+                    );
+                }
+            } else {
+                onToken(errorDesc, token, error);
+            }
+        }
+    );
+};
+
+const config: AuthenticationContextOptions = {
+    clientId: "7cee0f68-5051-41f6-9e45-80463d21d65d",
+    redirectUri: "http://localhost:16969/",
+    instance: "https://login.microsoftonline.com/",
+    tenant: "contoso.onmicrosoft.com",
+    extraQueryParameter: "nux=1",
+    correlationId: "123",
+    popUp: true,
+    cacheLocation: "localStorage",
+    callback: onLogin
+};
+
+const authenticationContext = new AuthenticationContext(config);
+
+if (authenticationContext.isCallback(window.location.hash)) {
+    authenticationContext.handleWindowCallback();
+} else if (authenticationContext.getCachedUser() == null) {
+    authenticationContext.login();
+} else {
+    acquireAnAccessToken();
+}
+
+setTimeout(() => {
+    authenticationContext.logOut();
+}, 60000);
diff --git a/types/adal-angular/index.d.ts b/types/adal-angular/index.d.ts
new file mode 100644
index 0000000000..00dc813ee8
--- /dev/null
+++ b/types/adal-angular/index.d.ts
@@ -0,0 +1,277 @@
+// Type definitions for adal-angular 1.0
+// Project: https://github.com/AzureAD/azure-activedirectory-library-for-js#readme
+// Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export enum LoggingLevel {
+    ERROR = 0,
+    WARNING = 1,
+    INFO = 2,
+    VERBOSE = 3
+}
+
+export type RequestType = "LOGIN" | "RENEW_TOKEN" | "UNKNOWN";
+
+export type ResponseType = "id_token token" | "token";
+
+export interface RequestInfo {
+    /**
+     * Object comprising of fields such as id_token/error, session_state, state, e.t.c.
+     */
+    parameters: any;
+    /**
+     * Request type.
+     */
+    requestType: RequestType;
+    /**
+     * Whether state is valid.
+     */
+    stateMatch: boolean;
+    /**
+     * Unique guid used to match the response with the request.
+     */
+    stateResponse: string;
+    /**
+     * Whether `requestType` contains `id_token`, `access_token` or error.
+     */
+    valid: boolean;
+}
+
+export interface UserInfo {
+    /**
+     * Username assigned from UPN or email.
+     */
+    userName: string;
+    /**
+     * Properties parsed from `id_token`.
+     */
+    profile: any;
+}
+
+export type TokenCallback = (
+    errorDesc: string | null,
+    token: string,
+    error: any
+) => void;
+
+export type UserCallback = (errorDesc: string | null, user: UserInfo) => void;
+
+export interface AuthenticationContextOptions {
+    /**
+     * Client ID assigned to your app by Azure Active Directory.
+     */
+    clientId: string;
+    /**
+     * Endpoint at which you expect to receive tokens.Defaults to `window.location.href`.
+     */
+    redirectUri: string;
+    /**
+     * Azure Active Directory instance. Defaults to `https://login.microsoftonline.com/`.
+     */
+    instance?: string;
+    /**
+     * Your target tenant. Defaults to `common`.
+     */
+    tenant?: string;
+    /**
+     * Query parameters to add to the authentication request.
+     */
+    extraQueryParameter?: string;
+    /**
+     * Unique identifier used to map the request with the response. Defaults to RFC4122 version 4 guid (128 bits).
+     */
+    correlationId?: string;
+    /**
+     * User defined function of handling the navigation to Azure AD authorization endpoint in case of login.
+     */
+    displayCall?: (url: string) => void;
+    /**
+     * Set this to true to enable login in a popup winodow instead of a full redirect. Defaults to `false`.
+     */
+    popUp?: boolean;
+    /**
+     * Set this to the resource to request on login. Defaults to `clientId`.
+     */
+    loginResource?: string;
+    /**
+     * Set this to redirect the user to a custom login page.
+     */
+    localLoginUrl?: string;
+    /**
+     * Redirects to start page after login. Defaults to `true`.
+     */
+    navigateToLoginRequestUrl?: boolean;
+    /**
+     * Set this to redirect the user to a custom logout page.
+     */
+    logOutUri?: string;
+    /**
+     * Redirects the user to postLogoutRedirectUri after logout. Defaults to `redirectUri`.
+     */
+    postLogoutRedirectUri?: string;
+    /**
+     * Sets browser storage to either 'localStorage' or sessionStorage'. Defaults to `sessionStorage`.
+     */
+    cacheLocation?: "localStorage" | "sessionStorage";
+    /**
+     * Array of keywords or URIs. Adal will attach a token to outgoing requests that have these keywords or URIs.
+     */
+    endpoints?: { [resource: string]: string };
+    /**
+     * Array of keywords or URIs. Adal will not attach a token to outgoing requests that have these keywords or URIs.
+     */
+    anonymousEndpoints?: string[];
+    /**
+     * If the cached token is about to be expired in the expireOffsetSeconds (in seconds), Adal will renew the token instead of using the cached token. Defaults to 300 seconds.
+     */
+    expireOffsetSeconds?: number;
+    /**
+     * The number of milliseconds of inactivity before a token renewal response from AAD should be considered timed out. Defaults to 6 seconds.
+     */
+    loadFrameTimeout?: number;
+    /**
+     * Callback to be invoked when a token is acquired.
+     */
+    callback?: TokenCallback;
+}
+
+export default class AuthenticationContext {
+    constructor(options: AuthenticationContextOptions);
+    /**
+     * Initiates the login process by redirecting the user to Azure AD authorization endpoint.
+     */
+    login(): void;
+    /**
+     * Returns whether a login is in progress.
+     */
+    loginInProgress(): boolean;
+    /**
+     * Gets token for the specified resource from the cache.
+     * @param resource A URI that identifies the resource for which the token is requested.
+     */
+    getCachedToken(resource: string): string;
+    /**
+     * If user object exists, returns it. Else creates a new user object by decoding `id_token` from the cache.
+     */
+    getCachedUser(): UserInfo;
+    /**
+     * Adds the passed callback to the array of callbacks for the specified resource.
+     * @param resource A URI that identifies the resource for which the token is requested.
+     * @param expectedState A unique identifier (guid).
+     * @param callback The callback provided by the caller. It will be called with token or error.
+     */
+    registerCallback(
+        expectedState: string,
+        resource: string,
+        callback: TokenCallback
+    ): void;
+    /**
+     * Acquires token from the cache if it is not expired. Otherwise sends request to AAD to obtain a new token.
+     * @param resource Resource URI identifying the target resource.
+     * @param callback The callback provided by the caller. It will be called with token or error.
+     */
+    acquireToken(resource: string, callback: TokenCallback): void;
+    /**
+     * Acquires token (interactive flow using a popup window) by sending request to AAD to obtain a new token.
+     * @param resource Resource URI identifying the target resource.
+     * @param extraQueryParameters Query parameters to add to the authentication request.
+     * @param claims Claims to add to the authentication request.
+     * @param callback The callback provided by the caller. It will be called with token or error.
+     */
+    acquireTokenPopup(
+        resource: string,
+        extraQueryParameters: string | null | undefined,
+        claims: string | null | undefined,
+        callback: TokenCallback
+    ): void;
+    /**
+     * Acquires token (interactive flow using a redirect) by sending request to AAD to obtain a new token. In this case the callback passed in the authentication request constructor will be called.
+     * @param resource Resource URI identifying the target resource.
+     * @param extraQueryParameters Query parameters to add to the authentication request.
+     * @param claims Claims to add to the authentication request.
+     */
+    acquireTokenRedirect(
+        resource: string,
+        extraQueryParameters?: string | null,
+        claims?: string | null
+    ): void;
+    /**
+     * Redirects the browser to Azure AD authorization endpoint.
+     * @param urlNavigate URL of the authorization endpoint.
+     */
+    promptUser(urlNavigate: string): void;
+    /**
+     * Clears cache items.
+     */
+    clearCache(): void;
+    /**
+     * Clears cache items for a given resource.
+     * @param resource Resource URI identifying the target resource.
+     */
+    clearCacheForResource(resource: string): void;
+    /**
+     * Redirects user to logout endpoint. After logout, it will redirect to `postLogoutRedirectUri` if added as a property on the config object.
+     */
+    logOut(): void;
+    /**
+     * Calls the passed in callback with the user object or error message related to the user.
+     * @param callback The callback provided by the caller. It will be called with user or error.
+     */
+    getUser(callback: UserCallback): void;
+    /**
+     * Checks if the URL fragment contains access token, id token or error description.
+     * @param hash Hash passed from redirect page.
+     */
+    isCallback(hash: string): boolean;
+    /**
+     * Gets login error.
+     */
+    getLoginError(): string;
+    /**
+     * Creates a request info object from the URL fragment and returns it.
+     */
+    getRequestInfo(hash: string): RequestInfo;
+    /**
+     * Saves token or error received in the response from AAD in the cache. In case of `id_token`, it also creates the user object.
+     */
+    saveTokenFromHash(requestInfo: RequestInfo): void;
+    /**
+     * Gets resource for given endpoint if mapping is provided with config.
+     * @param endpoint Resource URI identifying the target resource.
+     */
+    getResourceForEndpoint(resource: string): string;
+    /**
+     * This method must be called for processing the response received from AAD. It extracts the hash, processes the token or error, saves it in the cache and calls the callbacks with the result.
+     * @param hash Hash fragment of URL. Defaults to `window.location.hash`.
+     */
+    handleWindowCallback(hash?: string): void;
+
+    /**
+     * Checks the logging Level, constructs the log message and logs it. Users need to implement/override this method to turn on logging.
+     * @param level Level can be set 0, 1, 2 and 3 which turns on 'error', 'warning', 'info' or 'verbose' level logging respectively.
+     * @param message Message to log.
+     * @param error Error to log.
+     */
+    log(level: LoggingLevel, message: string, error: any): void;
+    /**
+     * Logs messages when logging level is set to 0.
+     * @param message Message to log.
+     * @param error Error to log.
+     */
+    error(message: string, error: any): void;
+    /**
+     * Logs messages when logging level is set to 1.
+     * @param message Message to log.
+     */
+    warn(message: string): void;
+    /**
+     * Logs messages when logging level is set to 2.
+     * @param message Message to log.
+     */
+    info(message: string): void;
+    /**
+     * Logs messages when logging level is set to 3.
+     * @param message Message to log.
+     */
+    verbose(message: string): void;
+}
diff --git a/types/adal-angular/tsconfig.json b/types/adal-angular/tsconfig.json
new file mode 100644
index 0000000000..9052e3fc04
--- /dev/null
+++ b/types/adal-angular/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "adal-angular-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/askmethat-rating/tslint.json b/types/adal-angular/tslint.json
similarity index 100%
rename from types/askmethat-rating/tslint.json
rename to types/adal-angular/tslint.json
diff --git a/types/adal/adal-angular.d.ts b/types/adal/adal-angular.d.ts
deleted file mode 100644
index 28d9682f19..0000000000
--- a/types/adal/adal-angular.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for ADAL.JS 1.0.8
-// Project: https://github.com/AzureAD/azure-activedirectory-library-for-js
-// Definitions by: mmaitre314 <https://github.com/mmaitre314>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference types="angular" />
-
-declare namespace adal {
-
-    interface AdalAuthenticationServiceProvider {
-        init(configOptions: Config, httpProvider: angular.IHttpProvider): void;
-    }
-
-    interface UserInfo {
-        isAuthenticated: boolean,
-        userName: string,
-        loginError: string,
-        profile: any
-    }
-
-    interface AdalAuthenticationService {
-
-        config: Config;
-        userInfo: UserInfo,
-
-        login(): void;
-        loginInProgress(): boolean;
-        logOut(): void;
-        getCachedToken(resource: string): string;
-        acquireToken(resource: string): angular.IPromise<string>;
-        getUser(): angular.IPromise<User>;
-        getResourceForEndpoint(endpoint: string): string,
-        clearCache(): void;
-        clearCacheForResource(resource: string): void;
-        info(message: string): void;
-        verbose(message: string): void;
-    }
-
-}
\ No newline at end of file
diff --git a/types/adal/index.d.ts b/types/adal/index.d.ts
deleted file mode 100644
index a51933b734..0000000000
--- a/types/adal/index.d.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-// Type definitions for ADAL.JS 1.0.14
-// Project: https://github.com/AzureAD/azure-activedirectory-library-for-js
-// Definitions by: mmaitre314 <https://github.com/mmaitre314>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-declare var AuthenticationContext: adal.AuthenticationContextStatic;
-declare var Logging: adal.Logging;
-
-declare module 'adal' {
-    export const AuthenticationContext: adal.AuthenticationContextStatic;
-    export const Logging: adal.Logging;
-}
-
-declare namespace adal {
-
-    interface Config {
-        tenant?: string;
-        clientId: string;
-        redirectUri?: string;
-        instance?: string;
-        endpoints?: any;  // If you need to send CORS api requests.
-        popUp?: boolean;
-        localLoginUrl?: string;
-        displayCall?: (urlNavigate: string) => any;
-        postLogoutRedirectUri?: string; // redirect url after succesful logout operation
-        cacheLocation?: string;
-        anonymousEndpoints?: string[];
-        expireOffsetSeconds?: number;
-        correlationId?: string;
-        loginResource?: string;
-        resource?: string;
-        extraQueryParameter?: string;
-        navigateToLoginRequestUrl?: boolean;
-        logOutUri?: string;
-        isAngular?: boolean;
-    }
-
-    interface User {
-        userName: string;
-        profile: any;
-    }
-
-    interface RequestInfo {
-        valid: boolean;
-        parameters: any;
-        stateMatch: boolean;
-        stateResponse: string;
-        requestType: string;
-    }
-
-    interface Logging {
-        log: (message: string) => void;
-        level: LoggingLevel;
-    }
-
-    enum LoggingLevel {
-        ERROR = 0,
-        WARNING = 1,
-        INFO = 2,
-        VERBOSE = 3
-    }
-
-    interface AuthenticationContextStatic {
-        new (config: Config): AuthenticationContext;
-    }
-
-    interface AuthenticationContext {
-
-        instance: string;
-        config: Config;
-
-        /**
-         * Gets initial Idtoken for the app backend
-         * Saves the resulting Idtoken in localStorage.
-         */
-        login(): void;
-
-        /**
-         * Indicates whether login is in progress now or not.
-         */
-        loginInProgress(): boolean;
-
-        /**
-         * Gets token for the specified resource from local storage cache
-         * @param {string}   resource A URI that identifies the resource for which the token is valid.
-         * @returns {string} token if exists and not expired or null
-         */
-        getCachedToken(resource: string): string;
-
-        /**
-         * Retrieves and parse idToken from localstorage
-         * @returns {User} user object
-         */
-        getCachedUser(): User;
-
-        registerCallback(expectedState: string, resource: string, callback: (message: string, token: string) => any): void;
-
-        /**
-         * Acquire token from cache if not expired and available. Acquires token from iframe if expired.
-         * @param {string}   resource  ResourceUri identifying the target resource
-         * @param {requestCallback} callback
-         */
-        acquireToken(resource: string, callback: (message: string, token: string) => any): void;
-
-        /**
-         * Redirect the Browser to Azure AD Authorization endpoint
-         * @param {string}   urlNavigate The authorization request url
-         */
-        promptUser(urlNavigate: string): void;
-
-        /**
-         * Clear cache items.
-         */
-        clearCache(): void;
-
-        /**
-         * Clear cache items for a resource.
-         */
-        clearCacheForResource(resource: string): void;
-
-        /**
-         * Logout user will redirect page to logout endpoint.
-         * After logout, it will redirect to post_logout page if provided.
-         */
-        logOut(): void;
-
-        /**
-         * Gets a user profile
-         * @param {requestCallback} callback - The callback that handles the response.
-         */
-        getUser(callback: (message: string, user?: User) => any): void;
-
-        /**
-         * Checks if hash contains access token or id token or error_description
-         * @param {string} hash  -  Hash passed from redirect page
-         * @returns {Boolean}
-         */
-        isCallback(hash: string): boolean;
-
-        /**
-         * Gets login error
-         * @returns {string} error message related to login
-         */
-        getLoginError(): string;
-
-        /**
-         * Gets requestInfo from given hash.
-         * @returns {RequestInfo} for appropriate hash.
-         */
-        getRequestInfo(hash: string): RequestInfo;
-
-        /**
-         * Saves token from hash that is received from redirect.
-         */
-        saveTokenFromHash(requestInfo: RequestInfo): void;
-
-        /**
-         * Gets resource for given endpoint if mapping is provided with config.
-         * @param {string} endpoint  -  API endpoint
-         * @returns {string} resource for this API endpoint
-         */
-        getResourceForEndpoint(endpoint: string): string;
-
-        /**
-         * Handles redirection after login operation.
-         * Gets access token from url and saves token to the (local/session) storage
-         * or saves error in case unsuccessful login.
-         */
-        handleWindowCallback(): void;
-
-        log(level: number, message: string, error: any): void;
-        error(message: string, error: any): void;
-        warn(message: string): void;
-        info(message: string): void;
-        verbose(message: string): void;
-    }
-
-}
diff --git a/types/adal/test/angular.ts b/types/adal/test/angular.ts
deleted file mode 100644
index 64ab64c898..0000000000
--- a/types/adal/test/angular.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-// Code samples from:
-//  - https://github.com/AzureAD/azure-activedirectory-library-for-js
-//  - https://github.com/Azure-Samples/active-directory-angularjs-singlepageapp
-
-// Variable provided by AngularJS
-var $httpProvider: angular.IHttpProvider = null;
-var adalAuthenticationServiceProvider: adal.AdalAuthenticationServiceProvider = null;
-var adalAuthenticationService: adal.AdalAuthenticationService = null;
-
-var endpoints = {
-    "https://yourhost/api": "b6a68585-5287-45b2-ba82-383ba1f60932",
-};
-adalAuthenticationServiceProvider.init({
-        tenant: "52d4b072-9470-49fb-8721-bc3a1c9912a1",
-        clientId: "e9a5a8b6-8af7-4719-9821-0deef255f68e",
-        endpoints: endpoints
-    },
-    $httpProvider
-);
-
-adalAuthenticationServiceProvider.init({
-    clientId: "e9a5a8b6-8af7-4719-9821-0deef255f68e"
-    },
-    $httpProvider
-);
-
-adalAuthenticationServiceProvider.init(
-    {
-        clientId: 'cb68f72f...',
-        cacheLocation: 'localStorage'
-    },
-    $httpProvider   // pass http provider to inject request interceptor to attach tokens
-);
-
-adalAuthenticationServiceProvider.init({
-        tenant: 'Enter your tenant name here e.g. contoso.onmicrosoft.com',
-        clientId: 'Enter your client ID here e.g. e9a5a8b6-8af7-4719-9821-0deef255f68e',
-        extraQueryParameter: 'nux=1'
-    },
-    $httpProvider
-);
-
-adalAuthenticationService.login();
-adalAuthenticationService.logOut();
diff --git a/types/adal/test/index.ts b/types/adal/test/index.ts
deleted file mode 100644
index 32a6715222..0000000000
--- a/types/adal/test/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-var endpoints = {
-    "https://yourhost/api": "b6a68585-5287-45b2-ba82-383ba1f60932",
-};
-
-var config : adal.Config = {
-    tenant: "52d4b072-9470-49fb-8721-bc3a1c9912a1", // Optional by default, it sends common
-    clientId: "e9a5a8b6-8af7-4719-9821-0deef255f68e", // Required
-    endpoints: endpoints  // If you need to send CORS api requests.
-};
-
-var auth = new AuthenticationContext(config);
-
-Logging.log = (message: string) => {
-    console.log(message);
-}
-
-Logging.level = 4;
-
-auth.info("Logging message");
-
-var userName: string = auth.getCachedUser().userName;var postLogoutRedirectUrl = auth.config.postLogoutRedirectUri;
-var isValidRequest = auth.getRequestInfo('hash').valid;
\ No newline at end of file
diff --git a/types/adal/tsconfig.json b/types/adal/tsconfig.json
deleted file mode 100644
index a024918b3a..0000000000
--- a/types/adal/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "adal-angular.d.ts",
-        "test/index.ts",
-        "test/angular.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/add-zero/add-zero-tests.ts b/types/add-zero/add-zero-tests.ts
new file mode 100644
index 0000000000..ac0509d26d
--- /dev/null
+++ b/types/add-zero/add-zero-tests.ts
@@ -0,0 +1,3 @@
+import addZero from "add-zero";
+
+addZero(5, 2);
diff --git a/types/add-zero/index.d.ts b/types/add-zero/index.d.ts
new file mode 100644
index 0000000000..907364a62d
--- /dev/null
+++ b/types/add-zero/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for add-zero 1.0
+// Project: https://github.com/rafaelrinaldi/add-zero#readme
+// Definitions by: Giles Roadnight <https://github.com/Roaders>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default function addZero(value: string | number, digits?: number): string;
diff --git a/types/add-zero/tsconfig.json b/types/add-zero/tsconfig.json
new file mode 100644
index 0000000000..e71d235cdf
--- /dev/null
+++ b/types/add-zero/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "add-zero-tests.ts"
+    ]
+}
diff --git a/types/aurelia-knockout/tslint.json b/types/add-zero/tslint.json
similarity index 100%
rename from types/aurelia-knockout/tslint.json
rename to types/add-zero/tslint.json
diff --git a/types/add2home/tslint.json b/types/add2home/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/add2home/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/adm-zip/tslint.json b/types/adm-zip/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/adm-zip/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/adone/glosses/collections.d.ts b/types/adone/glosses/collections.d.ts
index c21c13abb9..178921136d 100644
--- a/types/adone/glosses/collections.d.ts
+++ b/types/adone/glosses/collections.d.ts
@@ -455,7 +455,6 @@ declare namespace adone {
              * Writes a 32bit le float
              *
              * @param offset Offset to write to
-             * @returns {this}
              */
             writeFloatLE(value: number, offset?: number): this;
 
@@ -802,8 +801,7 @@ declare namespace adone {
              * Resizes this ByteArray to be backed by a buffer of at least the given capacity.
              * Will do nothing if already that large or larger.
              *
-             * @param {number} capacity	Capacity required
-             * @returns {this}
+             * @param capacity	Capacity required
              */
             resize(capacity: number): this;
 
@@ -1654,6 +1652,7 @@ declare namespace adone {
              * Ends the stream
              */
             end(chunk?: Buffer): void;
+            end(chunk?: () => void): void;
 
             /**
              * Returns the byte at the specified index
@@ -1679,8 +1678,8 @@ declare namespace adone {
              * Returns a new BufferList object containing the bytes within the range specified.
              * No copies will be performed. All buffers in the result share memory with the original list.
              *
-             * @param {number} start slice from
-             * @param {number} end slice to
+             * @param start slice from
+             * @param end slice to
              */
             shallowSlice(start?: number, end?: number): BufferList;
 
@@ -1705,11 +1704,11 @@ declare namespace adone {
             destroy(): void;
 
             then<T1 = Buffer, T2 = never>(
-                onfulfilled?: ((value: Buffer) => T1 | PromiseLike<T1>) | undefined | null,
-                onrejected?: ((reason: any) => T2 | PromiseLike<T2>) | undefined | null
+                onfulfilled?: ((value: Buffer) => T1 | PromiseLike<T1>) | null,
+                onrejected?: ((reason: any) => T2 | PromiseLike<T2>) | null
             ): PromiseLike<T1 | T2>;
 
-            catch<T>(onrejected?: ((reason: any) => T | PromiseLike<T>) | undefined | null): PromiseLike<T | Buffer>;
+            catch<T>(onrejected?: ((reason: any) => T | PromiseLike<T>) | null): PromiseLike<T | Buffer>;
         }
 
         /**
diff --git a/types/adone/glosses/datetime.d.ts b/types/adone/glosses/datetime.d.ts
index 417f706d95..5ce320f613 100644
--- a/types/adone/glosses/datetime.d.ts
+++ b/types/adone/glosses/datetime.d.ts
@@ -731,9 +731,6 @@ declare namespace adone {
                  */
                 creationData(): DatetimeCreationData;
 
-                /**
-                 *
-                 */
                 parsingFlags(): DatetimeParsingFlags;
 
                 /**
diff --git a/types/adone/glosses/math/matrix.d.ts b/types/adone/glosses/math/matrix.d.ts
index 0340929ed6..2b0e54e450 100644
--- a/types/adone/glosses/math/matrix.d.ts
+++ b/types/adone/glosses/math/matrix.d.ts
@@ -149,18 +149,18 @@ declare namespace adone.math {
             /**
              * Math.ceil the components of a vec2
              *
-             * @param {vec2} out the receiving vector
-             * @param {vec2} a vector to ceil
-             * @returns {vec2} out
+             * @param out the receiving vector
+             * @param a vector to ceil
+             * @returns out
              */
             function ceil(out: I.vec2, a: I.vec2 | number[]): I.vec2;
 
             /**
              * Math.floor the components of a vec2
              *
-             * @param {vec2} out the receiving vector
-             * @param {vec2} a vector to floor
-             * @returns {vec2} out
+             * @param out the receiving vector
+             * @param a vector to floor
+             * @returns out
              */
             function floor(out: I.vec2, a: I.vec2 | number[]): I.vec2;
 
@@ -187,9 +187,9 @@ declare namespace adone.math {
             /**
              * Math.round the components of a vec2
              *
-             * @param {vec2} out the receiving vector
-             * @param {vec2} a vector to round
-             * @returns {vec2} out
+             * @param out the receiving vector
+             * @param a vector to round
+             * @returns out
              */
             function round(out: I.vec2, a: I.vec2 | number[]): I.vec2;
 
@@ -438,18 +438,18 @@ declare namespace adone.math {
             /**
              * Returns whether or not the vectors exactly have the same elements in the same position (when compared with ===)
              *
-             * @param {vec2} a The first vector.
-             * @param {vec2} b The second vector.
-             * @returns {boolean} True if the vectors are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the vectors are equal, false otherwise.
              */
             function exactEquals(a: I.vec2 | number[], b: I.vec2 | number[]): boolean;
 
             /**
              * Returns whether or not the vectors have approximately the same elements in the same position.
              *
-             * @param {vec2} a The first vector.
-             * @param {vec2} b The second vector.
-             * @returns {boolean} True if the vectors are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the vectors are equal, false otherwise.
              */
             function equals(a: I.vec2 | number[], b: I.vec2 | number[]): boolean;
         }
@@ -580,18 +580,18 @@ declare namespace adone.math {
             /**
              * Math.ceil the components of a vec3
              *
-             * @param {vec3} out the receiving vector
-             * @param {vec3} a vector to ceil
-             * @returns {vec3} out
+             * @param out the receiving vector
+             * @param a vector to ceil
+             * @returns out
              */
             function ceil(out: I.vec3, a: I.vec3 | number[]): I.vec3;
 
             /**
              * Math.floor the components of a vec3
              *
-             * @param {vec3} out the receiving vector
-             * @param {vec3} a vector to floor
-             * @returns {vec3} out
+             * @param out the receiving vector
+             * @param a vector to floor
+             * @returns out
              */
             function floor(out: I.vec3, a: I.vec3 | number[]): I.vec3;
 
@@ -618,9 +618,9 @@ declare namespace adone.math {
             /**
              * Math.round the components of a vec3
              *
-             * @param {vec3} out the receiving vector
-             * @param {vec3} a vector to round
-             * @returns {vec3} out
+             * @param out the receiving vector
+             * @param a vector to round
+             * @returns out
              */
             function round(out: I.vec3, a: I.vec3 | number[]): I.vec3;
 
@@ -773,26 +773,26 @@ declare namespace adone.math {
             /**
              * Performs a hermite interpolation with two control points
              *
-             * @param {vec3} out the receiving vector
-             * @param {vec3} a the first operand
-             * @param {vec3} b the second operand
-             * @param {vec3} c the third operand
-             * @param {vec3} d the fourth operand
-             * @param {number} t interpolation amount between the two inputs
-             * @returns {vec3} out
+             * @param out the receiving vector
+             * @param a the first operand
+             * @param b the second operand
+             * @param c the third operand
+             * @param d the fourth operand
+             * @param t interpolation amount between the two inputs
+             * @returns out
              */
             function hermite(out: I.vec3, a: I.vec3 | number[], b: I.vec3 | number[], c: I.vec3 | number[], d: I.vec3 | number[], t: number): I.vec3;
 
             /**
              * Performs a bezier interpolation with two control points
              *
-             * @param {vec3} out the receiving vector
-             * @param {vec3} a the first operand
-             * @param {vec3} b the second operand
-             * @param {vec3} c the third operand
-             * @param {vec3} d the fourth operand
-             * @param {number} t interpolation amount between the two inputs
-             * @returns {vec3} out
+             * @param out the receiving vector
+             * @param a the first operand
+             * @param b the second operand
+             * @param c the third operand
+             * @param d the fourth operand
+             * @param t interpolation amount between the two inputs
+             * @returns out
              */
             function bezier(out: I.vec3, a: I.vec3 | number[], b: I.vec3 | number[], c: I.vec3 | number[], d: I.vec3 | number[], t: number): I.vec3;
 
@@ -884,7 +884,6 @@ declare namespace adone.math {
              * @param fn Function to call for each vector in the array
              * @param arg additional argument to pass to fn
              * @returns a
-             * @function
              */
             function forEach(a: Float32Array, stride: number, offset: number, count: number,
                                   fn: (a: I.vec3 | number[], b: I.vec3 | number[], arg: any) => void, arg: any): Float32Array;
@@ -898,7 +897,6 @@ declare namespace adone.math {
              * @param count Number of vec3s to iterate over. If 0 iterates over entire array
              * @param fn Function to call for each vector in the array
              * @returns a
-             * @function
              */
             function forEach(a: Float32Array, stride: number, offset: number, count: number,
                                   fn: (a: I.vec3 | number[], b: I.vec3 | number[]) => void): Float32Array;
@@ -922,18 +920,18 @@ declare namespace adone.math {
             /**
              * Returns whether or not the vectors have exactly the same elements in the same position (when compared with ===)
              *
-             * @param {vec3} a The first vector.
-             * @param {vec3} b The second vector.
-             * @returns {boolean} True if the vectors are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the vectors are equal, false otherwise.
              */
             function exactEquals(a: I.vec3 | number[], b: I.vec3 | number[]): boolean;
 
             /**
              * Returns whether or not the vectors have approximately the same elements in the same position.
              *
-             * @param {vec3} a The first vector.
-             * @param {vec3} b The second vector.
-             * @returns {boolean} True if the vectors are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the vectors are equal, false otherwise.
              */
             function equals(a: I.vec3 | number[], b: I.vec3 | number[]): boolean;
         }
@@ -1066,18 +1064,18 @@ declare namespace adone.math {
             /**
              * Math.ceil the components of a vec4
              *
-             * @param {vec4} out the receiving vector
-             * @param {vec4} a vector to ceil
-             * @returns {vec4} out
+             * @param out the receiving vector
+             * @param a vector to ceil
+             * @returns out
              */
             function ceil(out: I.vec4, a: I.vec4 | number[]): I.vec4;
 
             /**
              * Math.floor the components of a vec4
              *
-             * @param {vec4} out the receiving vector
-             * @param {vec4} a vector to floor
-             * @returns {vec4} out
+             * @param out the receiving vector
+             * @param a vector to floor
+             * @returns out
              */
             function floor(out: I.vec4, a: I.vec4 | number[]): I.vec4;
 
@@ -1104,9 +1102,9 @@ declare namespace adone.math {
             /**
              * Math.round the components of a vec4
              *
-             * @param {vec4} out the receiving vector
-             * @param {vec4} a vector to round
-             * @returns {vec4} out
+             * @param out the receiving vector
+             * @param a vector to round
+             * @returns out
              */
             function round(out: I.vec4, a: I.vec4 | number[]): I.vec4;
 
@@ -1294,7 +1292,6 @@ declare namespace adone.math {
              * @param fn Function to call for each vector in the array
              * @param arg additional argument to pass to fn
              * @returns a
-             * @function
              */
             function forEach(a: Float32Array, stride: number, offset: number, count: number,
                                   fn: (a: I.vec4 | number[], b: I.vec4 | number[], arg: any) => void, arg: any): Float32Array;
@@ -1308,7 +1305,6 @@ declare namespace adone.math {
              * @param count Number of vec4s to iterate over. If 0 iterates over entire array
              * @param fn Function to call for each vector in the array
              * @returns a
-             * @function
              */
             function forEach(a: Float32Array, stride: number, offset: number, count: number,
                                   fn: (a: I.vec4 | number[], b: I.vec4 | number[]) => void): Float32Array;
@@ -1324,18 +1320,18 @@ declare namespace adone.math {
             /**
              * Returns whether or not the vectors have exactly the same elements in the same position (when compared with ===)
              *
-             * @param {vec4} a The first vector.
-             * @param {vec4} b The second vector.
-             * @returns {boolean} True if the vectors are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the vectors are equal, false otherwise.
              */
             function exactEquals(a: I.vec4 | number[], b: I.vec4 | number[]): boolean;
 
             /**
              * Returns whether or not the vectors have approximately the same elements in the same position.
              *
-             * @param {vec4} a The first vector.
-             * @param {vec4} b The second vector.
-             * @returns {boolean} True if the vectors are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the vectors are equal, false otherwise.
              */
             function equals(a: I.vec4 | number[], b: I.vec4 | number[]): boolean;
         }
@@ -1383,23 +1379,23 @@ declare namespace adone.math {
             /**
              * Create a new mat2 with the given values
              *
-             * @param {number} m00 Component in column 0, row 0 position (index 0)
-             * @param {number} m01 Component in column 0, row 1 position (index 1)
-             * @param {number} m10 Component in column 1, row 0 position (index 2)
-             * @param {number} m11 Component in column 1, row 1 position (index 3)
-             * @returns {mat2} out A new 2x2 matrix
+             * @param m00 Component in column 0, row 0 position (index 0)
+             * @param m01 Component in column 0, row 1 position (index 1)
+             * @param m10 Component in column 1, row 0 position (index 2)
+             * @param m11 Component in column 1, row 1 position (index 3)
+             * @returns out A new 2x2 matrix
              */
             function fromValues(m00: number, m01: number, m10: number, m11: number): I.mat2;
 
             /**
              * Set the components of a mat2 to the given values
              *
-             * @param {mat2} out the receiving matrix
-             * @param {number} m00 Component in column 0, row 0 position (index 0)
-             * @param {number} m01 Component in column 0, row 1 position (index 1)
-             * @param {number} m10 Component in column 1, row 0 position (index 2)
-             * @param {number} m11 Component in column 1, row 1 position (index 3)
-             * @returns {mat2} out
+             * @param out the receiving matrix
+             * @param m00 Component in column 0, row 0 position (index 0)
+             * @param m01 Component in column 0, row 1 position (index 1)
+             * @param m10 Component in column 1, row 0 position (index 2)
+             * @param m11 Component in column 1, row 1 position (index 3)
+             * @returns out
              */
             function set(out: I.mat2, m00: number, m01: number, m10: number, m11: number): I.mat2;
 
@@ -1485,9 +1481,9 @@ declare namespace adone.math {
              *     mat2.identity(dest);
              *     mat2.rotate(dest, dest, rad);
              *
-             * @param {mat2} out mat2 receiving operation result
-             * @param {number} rad the angle to rotate the matrix by
-             * @returns {mat2} out
+             * @param out mat2 receiving operation result
+             * @param rad the angle to rotate the matrix by
+             * @returns out
              */
             function fromRotation(out: I.mat2, rad: number): I.mat2;
 
@@ -1498,9 +1494,9 @@ declare namespace adone.math {
              *     mat2.identity(dest);
              *     mat2.scale(dest, dest, vec);
              *
-             * @param {mat2} out mat2 receiving operation result
-             * @param {vec2} v Scaling vector
-             * @returns {mat2} out
+             * @param out mat2 receiving operation result
+             * @param v Scaling vector
+             * @returns out
              */
             function fromScaling(out: I.mat2, v: I.vec2 | number[]): I.mat2;
 
@@ -1532,69 +1528,69 @@ declare namespace adone.math {
             /**
              * Adds two mat2's
              *
-             * @param {mat2} out the receiving matrix
-             * @param {mat2} a the first operand
-             * @param {mat2} b the second operand
-             * @returns {mat2} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function add(out: I.mat2, a: I.mat2, b: I.mat2): I.mat2;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat2} out the receiving matrix
-             * @param {mat2} a the first operand
-             * @param {mat2} b the second operand
-             * @returns {mat2} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function subtract(out: I.mat2, a: I.mat2, b: I.mat2): I.mat2;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat2} out the receiving matrix
-             * @param {mat2} a the first operand
-             * @param {mat2} b the second operand
-             * @returns {mat2} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function sub(out: I.mat2, a: I.mat2, b: I.mat2): I.mat2;
 
             /**
              * Returns whether or not the matrices have exactly the same elements in the same position (when compared with ===)
              *
-             * @param {mat2} a The first matrix.
-             * @param {mat2} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function exactEquals(a: I.mat2, b: I.mat2): boolean;
 
             /**
              * Returns whether or not the matrices have approximately the same elements in the same position.
              *
-             * @param {mat2} a The first matrix.
-             * @param {mat2} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function equals(a: I.mat2, b: I.mat2): boolean;
 
             /**
              * Multiply each element of the matrix by a scalar.
              *
-             * @param {mat2} out the receiving matrix
-             * @param {mat2} a the matrix to scale
-             * @param {number} b amount to scale the matrix's elements by
-             * @returns {mat2} out
+             * @param out the receiving matrix
+             * @param a the matrix to scale
+             * @param b amount to scale the matrix's elements by
+             * @returns out
              */
             function multiplyScalar(out: I.mat2, a: I.mat2, b: number): I.mat2;
 
             /**
              * Adds two mat2's after multiplying each element of the second operand by a scalar value.
              *
-             * @param {mat2} out the receiving vector
-             * @param {mat2} a the first operand
-             * @param {mat2} b the second operand
-             * @param {number} scale the amount to scale b's elements by before adding
-             * @returns {mat2} out
+             * @param out the receiving vector
+             * @param a the first operand
+             * @param b the second operand
+             * @param scale the amount to scale b's elements by before adding
+             * @returns out
              */
             function multiplyScalarAndAdd(out: I.mat2, a: I.mat2, b: I.mat2, scale: number): I.mat2;
         }
@@ -1642,27 +1638,27 @@ declare namespace adone.math {
             /**
              * Create a new mat2d with the given values
              *
-             * @param {number} a Component A (index 0)
-             * @param {number} b Component B (index 1)
-             * @param {number} c Component C (index 2)
-             * @param {number} d Component D (index 3)
-             * @param {number} tx Component TX (index 4)
-             * @param {number} ty Component TY (index 5)
-             * @returns {mat2d} A new mat2d
+             * @param a Component A (index 0)
+             * @param b Component B (index 1)
+             * @param c Component C (index 2)
+             * @param d Component D (index 3)
+             * @param tx Component TX (index 4)
+             * @param ty Component TY (index 5)
+             * @returns A new mat2d
              */
             function fromValues(a: number, b: number, c: number, d: number, tx: number, ty: number): I.mat2d;
 
             /**
              * Set the components of a mat2d to the given values
              *
-             * @param {mat2d} out the receiving matrix
-             * @param {number} a Component A (index 0)
-             * @param {number} b Component B (index 1)
-             * @param {number} c Component C (index 2)
-             * @param {number} d Component D (index 3)
-             * @param {number} tx Component TX (index 4)
-             * @param {number} ty Component TY (index 5)
-             * @returns {mat2d} out
+             * @param out the receiving matrix
+             * @param a Component A (index 0)
+             * @param b Component B (index 1)
+             * @param c Component C (index 2)
+             * @param d Component D (index 3)
+             * @param tx Component TX (index 4)
+             * @param ty Component TY (index 5)
+             * @returns out
              */
             function set(out: I.mat2d, a: number, b: number, c: number, d: number, tx: number, ty: number): I.mat2d;
 
@@ -1740,9 +1736,9 @@ declare namespace adone.math {
              *     mat2d.identity(dest);
              *     mat2d.rotate(dest, dest, rad);
              *
-             * @param {mat2d} out mat2d receiving operation result
-             * @param {number} rad the angle to rotate the matrix by
-             * @returns {mat2d} out
+             * @param out mat2d receiving operation result
+             * @param rad the angle to rotate the matrix by
+             * @returns out
              */
             function fromRotation(out: I.mat2d, rad: number): I.mat2d;
 
@@ -1753,9 +1749,9 @@ declare namespace adone.math {
              *     mat2d.identity(dest);
              *     mat2d.scale(dest, dest, vec);
              *
-             * @param {mat2d} out mat2d receiving operation result
-             * @param {vec2} v Scaling vector
-             * @returns {mat2d} out
+             * @param out mat2d receiving operation result
+             * @param v Scaling vector
+             * @returns out
              */
             function fromScaling(out: I.mat2d, v: I.vec2 | number[]): I.mat2d;
 
@@ -1766,9 +1762,9 @@ declare namespace adone.math {
              *     mat2d.identity(dest);
              *     mat2d.translate(dest, dest, vec);
              *
-             * @param {mat2d} out mat2d receiving operation result
-             * @param {vec2} v Translation vector
-             * @returns {mat2d} out
+             * @param out mat2d receiving operation result
+             * @param v Translation vector
+             * @returns out
              */
             function fromTranslation(out: I.mat2d, v: I.vec2 | number[]): I.mat2d;
 
@@ -1791,69 +1787,69 @@ declare namespace adone.math {
             /**
              * Adds two mat2d's
              *
-             * @param {mat2d} out the receiving matrix
-             * @param {mat2d} a the first operand
-             * @param {mat2d} b the second operand
-             * @returns {mat2d} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function add(out: I.mat2d, a: I.mat2d, b: I.mat2d): I.mat2d;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat2d} out the receiving matrix
-             * @param {mat2d} a the first operand
-             * @param {mat2d} b the second operand
-             * @returns {mat2d} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function subtract(out: I.mat2d, a: I.mat2d, b: I.mat2d): I.mat2d;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat2d} out the receiving matrix
-             * @param {mat2d} a the first operand
-             * @param {mat2d} b the second operand
-             * @returns {mat2d} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function sub(out: I.mat2d, a: I.mat2d, b: I.mat2d): I.mat2d;
 
             /**
              * Multiply each element of the matrix by a scalar.
              *
-             * @param {mat2d} out the receiving matrix
-             * @param {mat2d} a the matrix to scale
-             * @param {number} b amount to scale the matrix's elements by
-             * @returns {mat2d} out
+             * @param out the receiving matrix
+             * @param a the matrix to scale
+             * @param b amount to scale the matrix's elements by
+             * @returns out
              */
             function multiplyScalar(out: I.mat2d, a: I.mat2d, b: number): I.mat2d;
 
             /**
              * Adds two mat2d's after multiplying each element of the second operand by a scalar value.
              *
-             * @param {mat2d} out the receiving vector
-             * @param {mat2d} a the first operand
-             * @param {mat2d} b the second operand
-             * @param {number} scale the amount to scale b's elements by before adding
-             * @returns {mat2d} out
+             * @param out the receiving vector
+             * @param a the first operand
+             * @param b the second operand
+             * @param scale the amount to scale b's elements by before adding
+             * @returns out
              */
             function multiplyScalarAndAdd(out: I.mat2d, a: I.mat2d, b: I.mat2d, scale: number): I.mat2d;
 
             /**
              * Returns whether or not the matrices have exactly the same elements in the same position (when compared with ===)
              *
-             * @param {mat2d} a The first matrix.
-             * @param {mat2d} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function exactEquals(a: I.mat2d, b: I.mat2d): boolean;
 
             /**
              * Returns whether or not the matrices have approximately the same elements in the same position.
              *
-             * @param {mat2d} a The first matrix.
-             * @param {mat2d} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function equals(a: I.mat2d, b: I.mat2d): boolean;
         }
@@ -1876,9 +1872,9 @@ declare namespace adone.math {
             /**
              * Copies the upper-left 3x3 values into the given mat3.
              *
-             * @param {mat3} out the receiving 3x3 matrix
-             * @param {mat4} a   the source 4x4 matrix
-             * @returns {mat3} out
+             * @param out the receiving 3x3 matrix
+             * @param a   the source 4x4 matrix
+             * @returns out
              */
             function fromMat4(out: I.mat3, a: I.mat4): I.mat3;
 
@@ -1902,33 +1898,33 @@ declare namespace adone.math {
             /**
              * Create a new mat3 with the given values
              *
-             * @param {number} m00 Component in column 0, row 0 position (index 0)
-             * @param {number} m01 Component in column 0, row 1 position (index 1)
-             * @param {number} m02 Component in column 0, row 2 position (index 2)
-             * @param {number} m10 Component in column 1, row 0 position (index 3)
-             * @param {number} m11 Component in column 1, row 1 position (index 4)
-             * @param {number} m12 Component in column 1, row 2 position (index 5)
-             * @param {number} m20 Component in column 2, row 0 position (index 6)
-             * @param {number} m21 Component in column 2, row 1 position (index 7)
-             * @param {number} m22 Component in column 2, row 2 position (index 8)
-             * @returns {mat3} A new mat3
+             * @param m00 Component in column 0, row 0 position (index 0)
+             * @param m01 Component in column 0, row 1 position (index 1)
+             * @param m02 Component in column 0, row 2 position (index 2)
+             * @param m10 Component in column 1, row 0 position (index 3)
+             * @param m11 Component in column 1, row 1 position (index 4)
+             * @param m12 Component in column 1, row 2 position (index 5)
+             * @param m20 Component in column 2, row 0 position (index 6)
+             * @param m21 Component in column 2, row 1 position (index 7)
+             * @param m22 Component in column 2, row 2 position (index 8)
+             * @returns A new mat3
              */
             function fromValues(m00: number, m01: number, m02: number, m10: number, m11: number, m12: number, m20: number, m21: number, m22: number): I.mat3;
 
             /**
              * Set the components of a mat3 to the given values
              *
-             * @param {mat3} out the receiving matrix
-             * @param {number} m00 Component in column 0, row 0 position (index 0)
-             * @param {number} m01 Component in column 0, row 1 position (index 1)
-             * @param {number} m02 Component in column 0, row 2 position (index 2)
-             * @param {number} m10 Component in column 1, row 0 position (index 3)
-             * @param {number} m11 Component in column 1, row 1 position (index 4)
-             * @param {number} m12 Component in column 1, row 2 position (index 5)
-             * @param {number} m20 Component in column 2, row 0 position (index 6)
-             * @param {number} m21 Component in column 2, row 1 position (index 7)
-             * @param {number} m22 Component in column 2, row 2 position (index 8)
-             * @returns {mat3} out
+             * @param out the receiving matrix
+             * @param m00 Component in column 0, row 0 position (index 0)
+             * @param m01 Component in column 0, row 1 position (index 1)
+             * @param m02 Component in column 0, row 2 position (index 2)
+             * @param m10 Component in column 1, row 0 position (index 3)
+             * @param m11 Component in column 1, row 1 position (index 4)
+             * @param m12 Component in column 1, row 2 position (index 5)
+             * @param m20 Component in column 2, row 0 position (index 6)
+             * @param m21 Component in column 2, row 1 position (index 7)
+             * @param m22 Component in column 2, row 2 position (index 8)
+             * @returns out
              */
             function set(out: I.mat3, m00: number, m01: number, m02: number, m10: number, m11: number, m12: number, m20: number, m21: number, m22: number): I.mat3;
 
@@ -2032,9 +2028,9 @@ declare namespace adone.math {
              *     mat3.identity(dest);
              *     mat3.translate(dest, dest, vec);
              *
-             * @param {mat3} out mat3 receiving operation result
-             * @param {vec2} v Translation vector
-             * @returns {mat3} out
+             * @param out mat3 receiving operation result
+             * @param v Translation vector
+             * @returns out
              */
             function fromTranslation(out: I.mat3, v: I.vec2 | number[]): I.mat3;
 
@@ -2045,9 +2041,9 @@ declare namespace adone.math {
              *     mat3.identity(dest);
              *     mat3.rotate(dest, dest, rad);
              *
-             * @param {mat3} out mat3 receiving operation result
-             * @param {number} rad the angle to rotate the matrix by
-             * @returns {mat3} out
+             * @param out mat3 receiving operation result
+             * @param rad the angle to rotate the matrix by
+             * @returns out
              */
             function fromRotation(out: I.mat3, rad: number): I.mat3;
 
@@ -2058,9 +2054,9 @@ declare namespace adone.math {
              *     mat3.identity(dest);
              *     mat3.scale(dest, dest, vec);
              *
-             * @param {mat3} out mat3 receiving operation result
-             * @param {vec2} v Scaling vector
-             * @returns {mat3} out
+             * @param out mat3 receiving operation result
+             * @param v Scaling vector
+             * @returns out
              */
             function fromScaling(out: I.mat3, v: I.vec2 | number[]): I.mat3;
 
@@ -2068,7 +2064,7 @@ declare namespace adone.math {
              * Copies the values from a mat2d into a mat3
              *
              * @param out the receiving matrix
-             * @param {mat2d} a the matrix to copy
+             * @param a the matrix to copy
              * @returns out
              */
             function fromMat2d(out: I.mat3, a: I.mat2d): I.mat3;
@@ -2112,69 +2108,69 @@ declare namespace adone.math {
             /**
              * Adds two mat3's
              *
-             * @param {mat3} out the receiving matrix
-             * @param {mat3} a the first operand
-             * @param {mat3} b the second operand
-             * @returns {mat3} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function add(out: I.mat3, a: I.mat3, b: I.mat3): I.mat3;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat3} out the receiving matrix
-             * @param {mat3} a the first operand
-             * @param {mat3} b the second operand
-             * @returns {mat3} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function subtract(out: I.mat3, a: I.mat3, b: I.mat3): I.mat3;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat3} out the receiving matrix
-             * @param {mat3} a the first operand
-             * @param {mat3} b the second operand
-             * @returns {mat3} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function sub(out: I.mat3, a: I.mat3, b: I.mat3): I.mat3;
 
             /**
              * Multiply each element of the matrix by a scalar.
              *
-             * @param {mat3} out the receiving matrix
-             * @param {mat3} a the matrix to scale
-             * @param {number} b amount to scale the matrix's elements by
-             * @returns {mat3} out
+             * @param out the receiving matrix
+             * @param a the matrix to scale
+             * @param b amount to scale the matrix's elements by
+             * @returns out
              */
             function multiplyScalar(out: I.mat3, a: I.mat3, b: number): I.mat3;
 
             /**
              * Adds two mat3's after multiplying each element of the second operand by a scalar value.
              *
-             * @param {mat3} out the receiving vector
-             * @param {mat3} a the first operand
-             * @param {mat3} b the second operand
-             * @param {number} scale the amount to scale b's elements by before adding
-             * @returns {mat3} out
+             * @param out the receiving vector
+             * @param a the first operand
+             * @param b the second operand
+             * @param scale the amount to scale b's elements by before adding
+             * @returns out
              */
             function multiplyScalarAndAdd(out: I.mat3, a: I.mat3, b: I.mat3, scale: number): I.mat3;
 
             /**
              * Returns whether or not the matrices have exactly the same elements in the same position (when compared with ===)
              *
-             * @param {mat3} a The first matrix.
-             * @param {mat3} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function exactEquals(a: I.mat3, b: I.mat3): boolean;
 
             /**
              * Returns whether or not the matrices have approximately the same elements in the same position.
              *
-             * @param {mat3} a The first matrix.
-             * @param {mat3} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function equals(a: I.mat3, b: I.mat3): boolean;
         }
@@ -2214,23 +2210,23 @@ declare namespace adone.math {
             /**
              * Create a new mat4 with the given values
              *
-             * @param {number} m00 Component in column 0, row 0 position (index 0)
-             * @param {number} m01 Component in column 0, row 1 position (index 1)
-             * @param {number} m02 Component in column 0, row 2 position (index 2)
-             * @param {number} m03 Component in column 0, row 3 position (index 3)
-             * @param {number} m10 Component in column 1, row 0 position (index 4)
-             * @param {number} m11 Component in column 1, row 1 position (index 5)
-             * @param {number} m12 Component in column 1, row 2 position (index 6)
-             * @param {number} m13 Component in column 1, row 3 position (index 7)
-             * @param {number} m20 Component in column 2, row 0 position (index 8)
-             * @param {number} m21 Component in column 2, row 1 position (index 9)
-             * @param {number} m22 Component in column 2, row 2 position (index 10)
-             * @param {number} m23 Component in column 2, row 3 position (index 11)
-             * @param {number} m30 Component in column 3, row 0 position (index 12)
-             * @param {number} m31 Component in column 3, row 1 position (index 13)
-             * @param {number} m32 Component in column 3, row 2 position (index 14)
-             * @param {number} m33 Component in column 3, row 3 position (index 15)
-             * @returns {mat4} A new mat4
+             * @param m00 Component in column 0, row 0 position (index 0)
+             * @param m01 Component in column 0, row 1 position (index 1)
+             * @param m02 Component in column 0, row 2 position (index 2)
+             * @param m03 Component in column 0, row 3 position (index 3)
+             * @param m10 Component in column 1, row 0 position (index 4)
+             * @param m11 Component in column 1, row 1 position (index 5)
+             * @param m12 Component in column 1, row 2 position (index 6)
+             * @param m13 Component in column 1, row 3 position (index 7)
+             * @param m20 Component in column 2, row 0 position (index 8)
+             * @param m21 Component in column 2, row 1 position (index 9)
+             * @param m22 Component in column 2, row 2 position (index 10)
+             * @param m23 Component in column 2, row 3 position (index 11)
+             * @param m30 Component in column 3, row 0 position (index 12)
+             * @param m31 Component in column 3, row 1 position (index 13)
+             * @param m32 Component in column 3, row 2 position (index 14)
+             * @param m33 Component in column 3, row 3 position (index 15)
+             * @returns A new mat4
              */
             function fromValues(
                 m00: number,
@@ -2254,24 +2250,24 @@ declare namespace adone.math {
             /**
              * Set the components of a mat4 to the given values
              *
-             * @param {mat4} out the receiving matrix
-             * @param {number} m00 Component in column 0, row 0 position (index 0)
-             * @param {number} m01 Component in column 0, row 1 position (index 1)
-             * @param {number} m02 Component in column 0, row 2 position (index 2)
-             * @param {number} m03 Component in column 0, row 3 position (index 3)
-             * @param {number} m10 Component in column 1, row 0 position (index 4)
-             * @param {number} m11 Component in column 1, row 1 position (index 5)
-             * @param {number} m12 Component in column 1, row 2 position (index 6)
-             * @param {number} m13 Component in column 1, row 3 position (index 7)
-             * @param {number} m20 Component in column 2, row 0 position (index 8)
-             * @param {number} m21 Component in column 2, row 1 position (index 9)
-             * @param {number} m22 Component in column 2, row 2 position (index 10)
-             * @param {number} m23 Component in column 2, row 3 position (index 11)
-             * @param {number} m30 Component in column 3, row 0 position (index 12)
-             * @param {number} m31 Component in column 3, row 1 position (index 13)
-             * @param {number} m32 Component in column 3, row 2 position (index 14)
-             * @param {number} m33 Component in column 3, row 3 position (index 15)
-             * @returns {mat4} out
+             * @param out the receiving matrix
+             * @param m00 Component in column 0, row 0 position (index 0)
+             * @param m01 Component in column 0, row 1 position (index 1)
+             * @param m02 Component in column 0, row 2 position (index 2)
+             * @param m03 Component in column 0, row 3 position (index 3)
+             * @param m10 Component in column 1, row 0 position (index 4)
+             * @param m11 Component in column 1, row 1 position (index 5)
+             * @param m12 Component in column 1, row 2 position (index 6)
+             * @param m13 Component in column 1, row 3 position (index 7)
+             * @param m20 Component in column 2, row 0 position (index 8)
+             * @param m21 Component in column 2, row 1 position (index 9)
+             * @param m22 Component in column 2, row 2 position (index 10)
+             * @param m23 Component in column 2, row 3 position (index 11)
+             * @param m30 Component in column 3, row 0 position (index 12)
+             * @param m31 Component in column 3, row 1 position (index 13)
+             * @param m32 Component in column 3, row 2 position (index 14)
+             * @param m33 Component in column 3, row 3 position (index 15)
+             * @returns out
              */
             function set(
                 out: I.mat4,
@@ -2424,9 +2420,9 @@ declare namespace adone.math {
              *     mat4.identity(dest);
              *     mat4.translate(dest, dest, vec);
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {vec3} v Translation vector
-             * @returns {mat4} out
+             * @param out mat4 receiving operation result
+             * @param v Translation vector
+             * @returns out
              */
             function fromTranslation(out: I.mat4, v: I.vec3 | number[]): I.mat4;
 
@@ -2437,9 +2433,9 @@ declare namespace adone.math {
              *     mat4.identity(dest);
              *     mat4.scale(dest, dest, vec);
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {vec3} v Scaling vector
-             * @returns {mat4} out
+             * @param out mat4 receiving operation result
+             * @param v Scaling vector
+             * @returns out
              */
             function fromScaling(out: I.mat4, v: I.vec3 | number[]): I.mat4;
 
@@ -2450,10 +2446,10 @@ declare namespace adone.math {
              *     mat4.identity(dest);
              *     mat4.rotate(dest, dest, rad, axis);
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {number} rad the angle to rotate the matrix by
-             * @param {vec3} axis the axis to rotate around
-             * @returns {mat4} out
+             * @param out mat4 receiving operation result
+             * @param rad the angle to rotate the matrix by
+             * @param axis the axis to rotate around
+             * @returns out
              */
             function fromRotation(out: I.mat4, rad: number, axis: I.vec3 | number[]): I.mat4;
 
@@ -2464,9 +2460,9 @@ declare namespace adone.math {
              *     mat4.identity(dest);
              *     mat4.rotateX(dest, dest, rad);
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {number} rad the angle to rotate the matrix by
-             * @returns {mat4} out
+             * @param out mat4 receiving operation result
+             * @param rad the angle to rotate the matrix by
+             * @returns out
              */
             function fromXRotation(out: I.mat4, rad: number): I.mat4;
 
@@ -2477,9 +2473,9 @@ declare namespace adone.math {
              *     mat4.identity(dest);
              *     mat4.rotateY(dest, dest, rad);
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {number} rad the angle to rotate the matrix by
-             * @returns {mat4} out
+             * @param out mat4 receiving operation result
+             * @param rad the angle to rotate the matrix by
+             * @returns out
              */
             function fromYRotation(out: I.mat4, rad: number): I.mat4;
 
@@ -2490,9 +2486,9 @@ declare namespace adone.math {
              *     mat4.identity(dest);
              *     mat4.rotateZ(dest, dest, rad);
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {number} rad the angle to rotate the matrix by
-             * @returns {mat4} out
+             * @param out mat4 receiving operation result
+             * @param rad the angle to rotate the matrix by
+             * @returns out
              */
             function fromZRotation(out: I.mat4, rad: number): I.mat4;
 
@@ -2518,9 +2514,9 @@ declare namespace adone.math {
              *  matrix. If a matrix is built with fromRotationTranslation,
              *  the returned vector will be the same as the translation vector
              *  originally supplied.
-             * @param  {vec3} out Vector to receive translation component
-             * @param  {mat4} mat Matrix to be decomposed (input)
-             * @return {vec3} out
+             * @param  out Vector to receive translation component
+             * @param  mat Matrix to be decomposed (input)
+             * @return out
              */
             function getTranslation(out: I.vec3, mat: I.mat4): I.vec3;
 
@@ -2529,9 +2525,9 @@ declare namespace adone.math {
              * If a matrix is built with fromRotationTranslationScale with a
              * normalized Quaternion parameter, the returned vector will be
              * the same as the scaling vector originally supplied.
-             * @param {vec3} out Vector to receive scaling factor component
-             * @param {mat4} mat Matrix to be decomposed (input)
-             * @return {vec3} out
+             * @param out Vector to receive scaling factor component
+             * @param mat Matrix to be decomposed (input)
+             * @return out
              */
             function getScaling(out: I.vec3, mat: I.mat4): I.vec3;
 
@@ -2540,9 +2536,9 @@ declare namespace adone.math {
              *  of a transformation matrix. If a matrix is built with
              *  fromRotationTranslation, the returned quaternion will be the
              *  same as the quaternion originally supplied.
-             * @param {quat} out Quaternion to receive the rotation component
-             * @param {mat4} mat Matrix to be decomposed (input)
-             * @return {quat} out
+             * @param out Quaternion to receive the rotation component
+             * @param mat Matrix to be decomposed (input)
+             * @return out
              */
             function getRotation(out: I.quat, mat: I.mat4): I.quat;
 
@@ -2578,22 +2574,22 @@ declare namespace adone.math {
              *     mat4.scale(dest, scale)
              *     mat4.translate(dest, negativeOrigin);
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {quat} q Rotation quaternion
-             * @param {vec3} v Translation vector
-             * @param {vec3} s Scaling vector
-             * @param {vec3} o The origin vector around which to scale and rotate
-             * @returns {mat4} out
+             * @param out mat4 receiving operation result
+             * @param q Rotation quaternion
+             * @param v Translation vector
+             * @param s Scaling vector
+             * @param o The origin vector around which to scale and rotate
+             * @returns out
              */
             function fromRotationTranslationScaleOrigin(out: I.mat4, q: I.quat, v: I.vec3 | number[], s: I.vec3 | number[], o: I.vec3 | number[]): I.mat4;
 
             /**
              * Calculates a 4x4 matrix from the given quaternion
              *
-             * @param {mat4} out mat4 receiving operation result
-             * @param {quat} q Quaternion to create matrix from
+             * @param out mat4 receiving operation result
+             * @param q Quaternion to create matrix from
              *
-             * @returns {mat4} out
+             * @returns out
              */
             function fromQuat(out: I.mat4, q: I.quat): I.mat4;
 
@@ -2630,11 +2626,11 @@ declare namespace adone.math {
              * This is primarily useful for generating projection matrices to be used
              * with the still experimental WebVR API.
              *
-             * @param {mat4} out mat4 frustum matrix will be written into
-             * @param {Object} fov Object containing the following values: upDegrees, downDegrees, leftDegrees, rightDegrees
-             * @param {number} near Near bound of the frustum
-             * @param {number} far Far bound of the frustum
-             * @returns {mat4} out
+             * @param out mat4 frustum matrix will be written into
+             * @param fov Object containing the following values: upDegrees, downDegrees, leftDegrees, rightDegrees
+             * @param near Near bound of the frustum
+             * @param far Far bound of the frustum
+             * @returns out
              */
             function perspectiveFromFieldOfView(
                 out: I.mat4,
@@ -2692,69 +2688,69 @@ declare namespace adone.math {
             /**
              * Adds two mat4's
              *
-             * @param {mat4} out the receiving matrix
-             * @param {mat4} a the first operand
-             * @param {mat4} b the second operand
-             * @returns {mat4} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function add(out: I.mat4, a: I.mat4, b: I.mat4): I.mat4;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat4} out the receiving matrix
-             * @param {mat4} a the first operand
-             * @param {mat4} b the second operand
-             * @returns {mat4} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function subtract(out: I.mat4, a: I.mat4, b: I.mat4): I.mat4;
 
             /**
              * Subtracts matrix b from matrix a
              *
-             * @param {mat4} out the receiving matrix
-             * @param {mat4} a the first operand
-             * @param {mat4} b the second operand
-             * @returns {mat4} out
+             * @param out the receiving matrix
+             * @param a the first operand
+             * @param b the second operand
+             * @returns out
              */
             function sub(out: I.mat4, a: I.mat4, b: I.mat4): I.mat4;
 
             /**
              * Multiply each element of the matrix by a scalar.
              *
-             * @param {mat4} out the receiving matrix
-             * @param {mat4} a the matrix to scale
-             * @param {number} b amount to scale the matrix's elements by
-             * @returns {mat4} out
+             * @param out the receiving matrix
+             * @param a the matrix to scale
+             * @param b amount to scale the matrix's elements by
+             * @returns out
              */
             function multiplyScalar(out: I.mat4, a: I.mat4, b: number): I.mat4;
 
             /**
              * Adds two mat4's after multiplying each element of the second operand by a scalar value.
              *
-             * @param {mat4} out the receiving vector
-             * @param {mat4} a the first operand
-             * @param {mat4} b the second operand
-             * @param {number} scale the amount to scale b's elements by before adding
-             * @returns {mat4} out
+             * @param out the receiving vector
+             * @param a the first operand
+             * @param b the second operand
+             * @param scale the amount to scale b's elements by before adding
+             * @returns out
              */
             function multiplyScalarAndAdd(out: I.mat4, a: I.mat4, b: I.mat4, scale: number): I.mat4;
 
             /**
              * Returns whether or not the matrices have exactly the same elements in the same position (when compared with ===)
              *
-             * @param {mat4} a The first matrix.
-             * @param {mat4} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function exactEquals(a: I.mat4, b: I.mat4): boolean;
 
             /**
              * Returns whether or not the matrices have approximately the same elements in the same position.
              *
-             * @param {mat4} a The first matrix.
-             * @param {mat4} b The second matrix.
-             * @returns {boolean} True if the matrices are equal, false otherwise.
+             * @param a The first matrix.
+             * @param b The second matrix.
+             * @returns True if the matrices are equal, false otherwise.
              */
             function equals(a: I.mat4, b: I.mat4): boolean;
         }
@@ -2779,7 +2775,6 @@ declare namespace adone.math {
              *
              * @param a quaternion to clone
              * @returns a new quaternion
-             * @function
              */
             function clone(a: I.quat): I.quat;
 
@@ -2791,7 +2786,6 @@ declare namespace adone.math {
              * @param z Z component
              * @param w W component
              * @returns a new quaternion
-             * @function
              */
             function fromValues(x: number, y: number, z: number, w: number): I.quat;
 
@@ -2801,7 +2795,6 @@ declare namespace adone.math {
              * @param out the receiving quaternion
              * @param a the source quaternion
              * @returns out
-             * @function
              */
             function copy(out: I.quat, a: I.quat): I.quat;
 
@@ -2814,7 +2807,6 @@ declare namespace adone.math {
              * @param z Z component
              * @param w W component
              * @returns out
-             * @function
              */
             function set(out: I.quat, x: number, y: number, z: number, w: number): I.quat;
 
@@ -2832,10 +2824,10 @@ declare namespace adone.math {
              *
              * Both vectors are assumed to be unit length.
              *
-             * @param {quat} out the receiving quaternion.
-             * @param {vec3} a the initial vector
-             * @param {vec3} b the destination vector
-             * @returns {quat} out
+             * @param out the receiving quaternion.
+             * @param a the initial vector
+             * @param b the destination vector
+             * @returns out
              */
             function rotationTo(out: I.quat, a: I.vec3 | number[], b: I.vec3 | number[]): I.quat;
 
@@ -2857,10 +2849,10 @@ declare namespace adone.math {
              * axes. Each axis is a vec3 and is expected to be unit length and
              * perpendicular to all other specified axes.
              *
-             * @param {vec3} view  the vector representing the viewing direction
-             * @param {vec3} right the vector representing the local "right" direction
-             * @param {vec3} up    the vector representing the local "up" direction
-             * @returns {quat} out
+             * @param view  the vector representing the viewing direction
+             * @param right the vector representing the local "right" direction
+             * @param up    the vector representing the local "up" direction
+             * @returns out
              */
             function setAxes(out: I.quat, view: I.vec3 | number[], right: I.vec3 | number[], up: I.vec3 | number[]): I.quat;
 
@@ -2897,9 +2889,9 @@ declare namespace adone.math {
              * Example: The quaternion formed by axis [0, 0, 1] and
              *  angle -90 is the same as the quaternion formed by
              *  [0, 0, 1] and 270. This method favors the latter.
-             * @param  {vec3} out_axis  Vector receiving the axis of rotation
-             * @param  {quat} q     Quaternion to be decomposed
-             * @return {number}     Angle, in radians, of the rotation
+             * @param  out_axis  Vector receiving the axis of rotation
+             * @param  q     Quaternion to be decomposed
+             * @return     Angle, in radians, of the rotation
              */
             function getAxisAngle(out_axis: I.vec3 | number[], q: I.quat): number;
 
@@ -2910,7 +2902,6 @@ declare namespace adone.math {
              * @param a the first operand
              * @param b the second operand
              * @returns out
-             * @function
              */
             function add(out: I.quat, a: I.quat, b: I.quat): I.quat;
 
@@ -2941,7 +2932,6 @@ declare namespace adone.math {
              * @param a the vector to scale
              * @param b amount to scale the vector by
              * @returns out
-             * @function
              */
             function scale(out: I.quat, a: I.quat, b: number): I.quat;
 
@@ -2950,7 +2940,6 @@ declare namespace adone.math {
              *
              * @param a vector to calculate length of
              * @returns length of a
-             * @function
              */
             function length(a: I.quat): number;
 
@@ -2959,7 +2948,6 @@ declare namespace adone.math {
              *
              * @param a vector to calculate length of
              * @returns length of a
-             * @function
              */
             function len(a: I.quat): number;
 
@@ -2968,7 +2956,6 @@ declare namespace adone.math {
              *
              * @param a vector to calculate squared length of
              * @returns squared length of a
-             * @function
              */
             function squaredLength(a: I.quat): number;
 
@@ -2977,7 +2964,6 @@ declare namespace adone.math {
              *
              * @param a vector to calculate squared length of
              * @returns squared length of a
-             * @function
              */
             function sqrLen(a: I.quat): number;
 
@@ -2987,7 +2973,6 @@ declare namespace adone.math {
              * @param out the receiving quaternion
              * @param a quaternion to normalize
              * @returns out
-             * @function
              */
             function normalize(out: I.quat, a: I.quat): I.quat;
 
@@ -2997,7 +2982,6 @@ declare namespace adone.math {
              * @param a the first operand
              * @param b the second operand
              * @returns dot product of a and b
-             * @function
              */
             function dot(a: I.quat, b: I.quat): number;
 
@@ -3009,7 +2993,6 @@ declare namespace adone.math {
              * @param b the second operand
              * @param t interpolation amount between the two inputs
              * @returns out
-             * @function
              */
             function lerp(out: I.quat, a: I.quat, b: I.quat, t: number): I.quat;
 
@@ -3027,13 +3010,13 @@ declare namespace adone.math {
             /**
              * Performs a spherical linear interpolation with two control points
              *
-             * @param {quat} out the receiving quaternion
-             * @param {quat} a the first operand
-             * @param {quat} b the second operand
-             * @param {quat} c the third operand
-             * @param {quat} d the fourth operand
-             * @param {number} t interpolation amount
-             * @returns {quat} out
+             * @param out the receiving quaternion
+             * @param a the first operand
+             * @param b the second operand
+             * @param c the third operand
+             * @param d the fourth operand
+             * @param t interpolation amount
+             * @returns out
              */
             function sqlerp(out: I.quat, a: I.quat, b: I.quat, c: I.quat, d: I.quat, t: number): I.quat;
 
@@ -3103,7 +3086,6 @@ declare namespace adone.math {
              * @param out the receiving quaternion
              * @param m rotation matrix
              * @returns out
-             * @function
              */
             function fromMat3(out: I.quat, m: I.mat3): I.quat;
 
@@ -3121,18 +3103,18 @@ declare namespace adone.math {
             /**
              * Returns whether or not the quaternions have exactly the same elements in the same position (when compared with ===)
              *
-             * @param {quat} a The first vector.
-             * @param {quat} b The second vector.
-             * @returns {boolean} True if the quaternions are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the quaternions are equal, false otherwise.
              */
             function exactEquals(a: I.quat, b: I.quat): boolean;
 
             /**
              * Returns whether or not the quaternions have approximately the same elements in the same position.
              *
-             * @param {quat} a The first vector.
-             * @param {quat} b The second vector.
-             * @returns {boolean} True if the quaternions are equal, false otherwise.
+             * @param a The first vector.
+             * @param b The second vector.
+             * @returns True if the quaternions are equal, false otherwise.
              */
             function equals(a: I.quat, b: I.quat): boolean;
         }
diff --git a/types/adone/glosses/math/simd.d.ts b/types/adone/glosses/math/simd.d.ts
index a90d761036..57f19e5eb3 100644
--- a/types/adone/glosses/math/simd.d.ts
+++ b/types/adone/glosses/math/simd.d.ts
@@ -53,41 +53,27 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values swizzled.
-                 * @param a
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
                  */
                 swizzle(a: Float32x4, l1: number, l2: number, l3: number, l4: number): Float32x4;
 
                 /**
                  * Returns a new instance with the lane values shuffled.
-                 * @param a
-                 * @param b
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
                  */
                 shuffle(a: Float32x4, b: Float32x4, l1: number, l2: number, l3: number, l4: number): Float32x4;
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Float32x4. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Float32x4): Float32x4;
 
                 /**
                  * Creates a new SIMD.Float32x4 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: number): Float32x4;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -121,16 +107,8 @@ declare namespace adone.math {
 
                 div(a: Float32x4, b: Float32x4): Float32x4;
 
-                /**
-                 *
-                 * @param a
-                 */
                 neg(a: Float32x4): Float32x4;
 
-                /**
-                 *
-                 * @param a
-                 */
                 abs(a: Float32x4): Float32x4;
 
                 min(a: Float32x4, b: Float32x4): Float32x4;
@@ -143,16 +121,8 @@ declare namespace adone.math {
 
                 reciprocalApproximation(a: Float32x4, b: Float32x4): Float32x4;
 
-                /**
-                 *
-                 * @param a
-                 */
                 reciprocalSqrtApproximation(a: Float32x4): Float32x4;
 
-                /**
-                 *
-                 * @param a
-                 */
                 sqrt(a: Float32x4): Float32x4;
 
                 /**
@@ -310,41 +280,27 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values swizzled.
-                 * @param a
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
                  */
                 swizzle(a: Int32x4, l1: number, l2: number, l3: number, l4: number): Int32x4;
 
                 /**
                  * Returns a new instance with the lane values shuffled.
-                 * @param a
-                 * @param b
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
                  */
                 shuffle(a: Int32x4, b: Int32x4, l1: number, l2: number, l3: number, l4: number): Int32x4;
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Int32x4. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Int32x4): Int32x4;
 
                 /**
                  * Creates a new SIMD.Int32x4 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: number): Int32x4;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -384,10 +340,6 @@ declare namespace adone.math {
 
                 mul(a: Int32x4, b: Int32x4): Int32x4;
 
-                /**
-                 *
-                 * @param a
-                 */
                 neg(a: Int32x4): Int32x4;
 
                 /**
@@ -565,49 +517,27 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values swizzled.
-                 * @param a
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
                  */
                 swizzle(a: Int16x8, l1: number, l2: number, l3: number, l4: number, l5: number, l6: number, l7: number, l8: number): Int16x8;
 
                 /**
                  * Returns a new instance with the lane values shuffled.
-                 * @param a
-                 * @param b
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
                  */
                 shuffle(a: Int16x8, b: Int16x8, l1: number, l2: number, l3: number, l4: number, l5: number, l6: number, l7: number, l8: number): Int16x8;
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Int16x8. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Int16x8): Int16x8;
 
                 /**
                  * Creates a new SIMD.Int16x8 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: number): Int16x8;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -647,10 +577,6 @@ declare namespace adone.math {
 
                 mul(a: Int16x8, b: Int16x8): Int16x8;
 
-                /**
-                 *
-                 * @param a
-                 */
                 neg(a: Int16x8): Int16x8;
 
                 /**
@@ -803,23 +729,6 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values swizzled.
-                 * @param a
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
-                 * @param l9
-                 * @param l10
-                 * @param l11
-                 * @param l12
-                 * @param l13
-                 * @param l14
-                 * @param l15
-                 * @param l16
                  */
                 swizzle(
                     a: Int8x16,
@@ -843,24 +752,6 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values shuffled.
-                 * @param a
-                 * @param b
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
-                 * @param l9
-                 * @param l10
-                 * @param l11
-                 * @param l12
-                 * @param l13
-                 * @param l14
-                 * @param l15
-                 * @param l16
                  */
                 shuffle(
                     a: Int8x16,
@@ -885,20 +776,17 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Int8x16. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Int8x16): Int8x16;
 
                 /**
                  * Creates a new SIMD.Int8x16 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: number): Int8x16;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -938,10 +826,6 @@ declare namespace adone.math {
 
                 mul(a: Int8x16, b: Int8x16): Int8x16;
 
-                /**
-                 *
-                 * @param a
-                 */
                 neg(a: Int8x16): Int8x16;
 
                 /**
@@ -1065,41 +949,27 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values swizzled.
-                 * @param a
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
                  */
                 swizzle(a: Uint32x4, l1: number, l2: number, l3: number, l4: number): Uint32x4;
 
                 /**
                  * Returns a new instance with the lane values shuffled.
-                 * @param a
-                 * @param b
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
                  */
                 shuffle(a: Uint32x4, b: Uint32x4, l1: number, l2: number, l3: number, l4: number): Uint32x4;
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Uint32x4. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Uint32x4): Uint32x4;
 
                 /**
                  * Creates a new SIMD.Uint32x4 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: number): Uint32x4;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -1314,49 +1184,27 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values swizzled.
-                 * @param a
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
                  */
                 swizzle(a: Uint16x8, l1: number, l2: number, l3: number, l4: number, l5: number, l6: number, l7: number, l8: number): Uint16x8;
 
                 /**
                  * Returns a new instance with the lane values shuffled.
-                 * @param a
-                 * @param b
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
                  */
                 shuffle(a: Uint16x8, b: Uint16x8, l1: number, l2: number, l3: number, l4: number, l5: number, l6: number, l7: number, l8: number): Uint16x8;
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Uint16x8. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Uint16x8): Uint16x8;
 
                 /**
                  * Creates a new SIMD.Uint16x8 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: number): Uint16x8;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -1546,23 +1394,6 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values swizzled.
-                 * @param a
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
-                 * @param l9
-                 * @param l10
-                 * @param l11
-                 * @param l12
-                 * @param l13
-                 * @param l14
-                 * @param l15
-                 * @param l16
                  */
                 swizzle(
                     a: Uint8x16,
@@ -1586,24 +1417,6 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance with the lane values shuffled.
-                 * @param a
-                 * @param b
-                 * @param l1
-                 * @param l2
-                 * @param l3
-                 * @param l4
-                 * @param l5
-                 * @param l6
-                 * @param l7
-                 * @param l8
-                 * @param l9
-                 * @param l10
-                 * @param l11
-                 * @param l12
-                 * @param l13
-                 * @param l14
-                 * @param l15
-                 * @param l16
                  */
                 shuffle(
                     a: Uint8x16,
@@ -1628,20 +1441,17 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Uint8x16. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Uint8x16): Uint8x16;
 
                 /**
                  * Creates a new SIMD.Uint8x16 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: number): Uint8x16;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -1802,20 +1612,17 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Bool32x4. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Bool32x4): Bool32x4;
 
                 /**
                  * Creates a new SIMD.Bool32x4 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: boolean): Bool32x4;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -1823,13 +1630,11 @@ declare namespace adone.math {
 
                 /**
                  * If all lane values are `true`, return `true`.
-                 * @param a
                  */
                 allTrue(a: Bool32x4): boolean;
 
                 /**
                  * If any lane values are `true`, return `true`.
-                 * @param a
                  */
                 anyTrue(a: Bool32x4): boolean;
 
@@ -1888,20 +1693,17 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Bool16x8. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Bool16x8): Bool16x8;
 
                 /**
                  * Creates a new SIMD.Bool16x8 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: boolean): Bool16x8;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -1909,13 +1711,11 @@ declare namespace adone.math {
 
                 /**
                  * If all lane values are `true`, return `true`.
-                 * @param a
                  */
                 allTrue(a: Bool16x8): boolean;
 
                 /**
                  * If any lane values are `true`, return `true`.
-                 * @param a
                  */
                 anyTrue(a: Bool16x8): boolean;
 
@@ -1998,20 +1798,17 @@ declare namespace adone.math {
 
                 /**
                  * Returns a new instance if the parameter is a valid SIMD data type and the same as Bool8x16. Throws a TypeError otherwise.
-                 * @param a
                  */
                 check(a: Bool8x16): Bool8x16;
 
                 /**
                  * Creates a new SIMD.Bool8x16 data type with all lanes set to a given value.
-                 * @param n
                  */
                 splat(n: boolean): Bool8x16;
 
                 /**
                  * Returns a new instance with the given lane value replaced.
                  * @param simd An instance of a corresponding SIMD type.
-                 * @param lane
                  * @param value A new value to be used for the lane.
                  * @return A new SIMD data type with the given lane value replaced.
                  */
@@ -2019,13 +1816,11 @@ declare namespace adone.math {
 
                 /**
                  * If all lane values are `true`, return `true`.
-                 * @param a
                  */
                 allTrue(a: Bool8x16): boolean;
 
                 /**
                  * If any lane values are `true`, return `true`.
-                 * @param a
                  */
                 anyTrue(a: Bool8x16): boolean;
 
diff --git a/types/adone/glosses/promise.d.ts b/types/adone/glosses/promise.d.ts
index d0f59b0340..cdfe0ec2f5 100644
--- a/types/adone/glosses/promise.d.ts
+++ b/types/adone/glosses/promise.d.ts
@@ -47,8 +47,8 @@ declare namespace adone {
         /**
          * Converts a function that returns promises to a node.js style callback function
          *
-         * @param {Function} fn Function
-         * @returns {Promise} the original promise
+         * @param fn Function
+         * @returns the original promise
          */
         export function callbackify<R>(fn: () => Promise<R>): (callback: (err?: any, result?: R) => void) => Promise<R>;
         export function callbackify<T, R>(fn: (a: T) => Promise<R>): (a: T, callback: (err?: any, result?: R) => void) => Promise<R>;
diff --git a/types/aframe/aframe-tests.ts b/types/aframe/aframe-tests.ts
index 439d314f4a..5af66a09d1 100644
--- a/types/aframe/aframe-tests.ts
+++ b/types/aframe/aframe-tests.ts
@@ -1,5 +1,4 @@
 // Global
-
 const threeCamera = new AFRAME.THREE.Camera();
 AFRAME.TWEEN.Easing;
 
@@ -42,9 +41,18 @@ entity.addEventListener('child-detached', (event) => {
 const Component = AFRAME.registerComponent('test', {});
 
 // Scene
-
 const scene = document.querySelector('a-scene');
 scene.hasLoaded;
 
 // System
 const system = scene.systems['systemName'];
+
+// Register Custom Geometry
+AFRAME.registerGeometry('a-test-geometry', {
+	schema: {
+		groupIndex: { default: 0 }
+	},
+	init(data) {
+		this.geometry = new THREE.Geometry();
+	}
+});
diff --git a/types/aframe/index.d.ts b/types/aframe/index.d.ts
index f1f5cd7a20..803318a754 100644
--- a/types/aframe/index.d.ts
+++ b/types/aframe/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for AFRAME 0.5
+// Type definitions for AFRAME 0.7
 // Project: https://aframe.io/
 // Definitions by: Paul Shannon <https://github.com/devpaul>
+//                 Roberto Ritger <https://github.com/bertoritger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -40,7 +41,7 @@ declare namespace AFrame {
 		primitives: { [ key: string ]: Entity };
 		registerComponent(name: string, component: ComponentDefinition): ComponentConstructor;
 		registerElement(name: string, element: ANode): void;
-		registerGeometry(name: string, geometery: THREE.Geometry): Geometry;
+		registerGeometry(name: string, geometry: GeometryDefinition): Geometry;
 		registerPrimitive(name: string, primitive: PrimitiveDefinition): void;
 		registerShader(name: string, shader: any): void;
 		registerSystem(name: string, definition: SystemDefinition): void;
@@ -101,7 +102,7 @@ declare namespace AFrame {
 		name: string;
 		schema: Schema;
 
-		init(): void;
+		init(data?: any): void;
 		pause(): void;
 		play(): void;
 		remove(): void;
@@ -124,7 +125,7 @@ declare namespace AFrame {
 		multiple?: boolean;
 		schema?: Schema;
 
-		init?(): void;
+		init?(data?: any): void;
 		pause?(): void;
 		play?(): void;
 		remove?(): void;
@@ -222,6 +223,10 @@ declare namespace AFrame {
 		[ key: string ]: any;
 	}
 
+	interface GeometryDefinition extends ComponentDefinition {
+		geometry?: THREE.Geometry;
+	}
+
 	interface GeometryDescriptor {
 		Geometry: Geometry;
 		schema: Schema;
diff --git a/types/agenda/index.d.ts b/types/agenda/index.d.ts
index d170a6f6f1..426b187d7c 100644
--- a/types/agenda/index.d.ts
+++ b/types/agenda/index.d.ts
@@ -113,8 +113,8 @@ declare class Agenda extends EventEmitter {
      * @param options The options for the job.
      * @param handler The handler to execute.
      */
-    define(name: string, handler: (job?: Agenda.Job, done?: (err?: Error) => void) => void): void;
-    define(name: string, options: Agenda.JobOptions, handler: (job?: Agenda.Job, done?: (err?: Error) => void) => void): void;
+    define(name: string, handler: (job: Agenda.Job, done: (err?: Error) => void) => void): void;
+    define(name: string, options: Agenda.JobOptions, handler: (job: Agenda.Job, done: (err?: Error) => void) => void): void;
 
     /**
      * Runs job name at the given interval. Optionally, data and options can be passed in.
diff --git a/types/agenda/tslint.json b/types/agenda/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/agenda/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/alertify/tslint.json b/types/alertify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/alertify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/alexa-sdk/index.d.ts b/types/alexa-sdk/index.d.ts
index 1c39755b2d..02def0b4d6 100644
--- a/types/alexa-sdk/index.d.ts
+++ b/types/alexa-sdk/index.d.ts
@@ -4,15 +4,85 @@
 //                  Huw <https://github.com/hoo29>
 //                  pascalwhoop <https://github.com/pascalwhoop>
 //                  Ben <https://github.com/blforce>
+//                  rk-7 <https://github.com/rk-7>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 export function handler<T>(event: RequestBody<T>, context: Context, callback?: (err: any, response: any) => void): AlexaObject<T>;
 export function CreateStateHandler(state: string, obj: any): any;
 export let StateString: string;
-
 export type ConfirmationStatuses = "NONE" | "DENIED" | "CONFIRMED";
 export type DialogStates = "STARTED" | "IN_PROGRESS" | "COMPLETED";
+export type ListItemObjectStatus = "active" | "completed";
+export type ListObjectState = "active" | "archived";
+export type ImageSourceSize = "X_SMALL" | "SMALL" | "MEDIUM" | "LARGE" | "X_LARGE";
+export type TemplateBackButtonVisibility = "HIDDEN" | "VISIBLE";
+export type TemplateType = "BodyTemplate1" | "BodyTemplate2" | "BodyTemplate3" | "BodyTemplate6" | "BodyTemplate6" | "ListTemplate1" | "ListTemplate2";
+export type AudioPlayerActivity = "IDLE" | "PAUSED" | "PLAYING" | "BUFFER_UNDERRUN" | "FINISHED" | "STOPPED";
+export type CardType = "Standard" | "Simple" | "LinkAccount" | "AskForPermissionsConsent";
+export type HintType = "PlainText";
+export type DirectiveTypes = "AudioPlayer.Play" | "AudioPlayer.Stop" | "AudioPlayer.ClearQueue" | "Display.RenderTemplate" | "Hint" | "VideoApp.Launch";
+export type TextContentType = "PlainText" | "RichText";
+
+//#region Types
+export interface CardImage {
+    /**
+     * Recommended size (in px): 720w x 480h
+     */
+    smallImageUrl: string;
+    /**
+     * Recommended size (in px): 1200w x 800h
+     */
+    largeImageUrl: string;
+}
+export interface ImageSource {
+    url: string;
+    widthPixels?: number;
+    heightPixels?: number;
+    /**
+     * Recommended sizes for the following dimensions (in px):
+     * 480 x 320 for X_SMALL,
+     * 720 x 480 for SMALL,
+     * 960 x 640 for MEDIUM,
+     * 1200 x 800 for LARGE,
+     * 1920 x 1280 for X_LARGE
+     */
+    size?: ImageSourceSize;
+}
+export interface Image {
+    contentDescription: string;
+    sources: ImageSource[];
+}
+export interface TextField {
+    text: string;
+    type: string;
+}
+export interface TextContent {
+    primaryText?: TextField;
+    secondaryText?: TextField;
+    tertiaryText?: TextField;
+}
+export interface ListItem {
+    image?: Image;
+    token: string;
+    textContent?: TextContent;
+}
+
+export interface Template {
+    title?: string;
+    token: string;
+    backgroundImage?: Image;
+    /**
+     * Visibility of the back button.
+     */
+    backButton?: TemplateBackButtonVisibility;
+    /**
+     * Template type.
+     */
+    type: TemplateType;
+    image?: Image;
+    listItems?: ListItem[];
+}
 
 export interface AlexaObject<T> extends Handler<T> {
     _event: any;
@@ -38,12 +108,16 @@ export interface Handler<T> {
     emitWithState: any;
     state: any;
     handler: any;
+    i18n: any;
+    locale: any;
     event: RequestBody<T>;
     attributes: any;
     context: any;
+    callback: (param: any) => void;
     name: any;
     isOverriden: any;
     t: (token: string, ...args: any[]) => void;
+    response: ResponseBuilder;
 }
 
 export interface Context {
@@ -55,8 +129,28 @@ export interface Context {
     functionVersion: string;
     invokeid: string;
     awsRequestId: string;
+    System?: System;
+    AudioPlayer?: AudioPlayer;
+}
+export interface Application {
+    applicationId: string;
+    [key: string]: string;
+}
+export interface System {
+    apiAccessToken: string;
+    apiEndpoint: string;
+    application: Application;
+    device: any;
+    user: any;
+}
+export interface AudioPlayer {
+    token: string;
+    offsetInMilliseconds: number;
+    /**
+     * Player activity
+     */
+    playerActivity: AudioPlayerActivity;
 }
-
 export interface RequestBody<T> {
     version: string;
     session: Session;
@@ -66,20 +160,22 @@ export interface RequestBody<T> {
 export interface Session {
     new: boolean;
     sessionId: string;
-    attributes: any;
-    application: SessionApplication;
+    attributes: { [key: string]: any };
+    application: Application;
     user: SessionUser;
 }
-
-export interface SessionApplication {
-    applicationId: string;
-}
-
 export interface SessionUser {
     userId: string;
     accessToken?: string;
+    permissions: Permissions;
+}
+export interface Permissions {
+    /**
+     * @deprecated
+     */
+    consentToken: string;
+    [key: string]: string;
 }
-
 export interface LaunchRequest extends Request { }
 
 export interface IntentRequest extends Request {
@@ -144,7 +240,8 @@ export interface Response {
     outputSpeech?: OutputSpeech;
     card?: Card;
     reprompt?: Reprompt;
-    shouldEndSession: boolean;
+    directives?: any;
+    shouldEndSession?: boolean;
 }
 
 export interface OutputSpeech {
@@ -154,18 +251,682 @@ export interface OutputSpeech {
 }
 
 export interface Card {
-    type: "Simple" | "Standard" | "LinkAccount";
+    type: CardType;
     title?: string;
     content?: string;
     text?: string;
-    image?: Image;
-}
-
-export interface Image {
-    smallImageUrl: string;
-    largeImageUrl: string;
+    image?: CardImage;
 }
 
 export interface Reprompt {
     outputSpeech: OutputSpeech;
 }
+
+export interface ApiClientOptions {
+    hostname: string;
+    port: string;
+    path: string;
+    protocol: string;
+    headers: string;
+    method: string;
+}
+export interface ApiClientResponse {
+    statusCode: string;
+    statusText: string;
+    body: object;
+    headers: object;
+}
+/**
+ * Todo-ListItem class
+ * Refer https://developer.amazon.com/docs/custom-skills/access-the-alexa-shopping-and-to-do-lists.html
+ */
+export interface ListItemObject {
+    /**
+     * item id (String, limit 60 characters)
+     */
+    id: string;
+    /**
+     * item value (String, limit is 256 characters)
+     */
+    value: string;
+    /**
+     * item status
+     */
+    status?: ListItemObjectStatus;
+    /**
+     * item version (Positive integer)
+     */
+    version?: number | string;
+    /**
+     * created time (ISO 8601 time format with time zone)
+     */
+    createdTime: Date;
+    /**
+     * updated time (ISO 8601 time format with time zone)
+     */
+    updatedTime: Date;
+    /**
+     *  URL to retrieve the item (String)
+     */
+    href?: string;
+}
+/**
+ * Todo-List class
+ * Refer https://developer.amazon.com/docs/custom-skills/access-the-alexa-shopping-and-to-do-lists.html
+ */
+export interface ListObject {
+    /**
+     * list id (String)
+     */
+    listId: string;
+    /**
+     * list name (String)
+     */
+    name: string;
+    /**
+     * state
+     * "active" or "archived" (Enum)
+     */
+    state?: ListObjectState;
+    /**
+     * Possibly status of the list (or state?)
+     * Fetched from commit eebba0d at https://github.com/alexa/alexa-skills-kit-sdk-for-nodejs/
+     * File path: alexa-skills-kit-sdk-for-nodejs/lib/services/listManagementService.js
+     */
+    status?: string;
+    /**
+     * list version (Positive integer)
+     */
+    version?: number;
+    /**
+     * Urls to active and completed items
+     * href is lint to the items having certain status.
+     * The status can be "active" or "completed".
+     */
+    statusMap: { href: string; status: ListItemObjectStatus; };
+    /**
+     * Items that belong to this list.
+     */
+    items: ListItemObject[];
+}
+//#endregion
+
+//#region templateBuilders
+/**
+ * Generates templates for Echo Show device.
+ */
+export namespace templateBuilders {
+    interface SetTextContent<T extends TemplateBuilder<T>> {
+        setTextContent(primaryText: TextField, secondaryText?: TextField, tertiaryText?: TextField): T;
+    }
+    interface SetListItems<T extends TemplateBuilder<T>> {
+        setListItems(listItems: ListItem[]): T;
+    }
+    /**
+     * Refer https://developer.amazon.com/docs/custom-skills/display-interface-reference.html#image-sizes
+     */
+    abstract class TemplateBuilder<T extends TemplateBuilder<T>> {
+        template: Template;
+        constructor();
+
+        /**
+         * Sets the title of the template
+         * @param title title
+         * @returns TemplateBuilder
+         */
+        setTitle(title: string): T;
+
+        /**
+         * Sets the token of the template
+         * @param token token
+         * @returns TemplateBuilder
+         */
+        setToken(token: string): T;
+
+        /**
+         * Sets the background image of the template
+         * @param image image
+         * @returns TemplateBuilder
+         */
+        setBackgroundImage(image: Image): T;
+
+        /**
+         * Sets the backButton behavior
+         * @param backButtonBehavior "VISIBLE" or "HIDDEN"
+         * @returns TemplateBuilder
+         */
+        setBackButtonBehavior(backButtonBehavior: string): T;
+
+        /**
+         * Builds the template JSON object
+         * @returns Template
+         */
+        build(): Template;
+    }
+    /**
+     * Used to build a list of ListItems for ListTemplate
+     */
+    class ListItemBuilder {
+        constructor();
+        items: ListItem[];
+        /**
+         * Add an item to the list of template
+         * @param image image
+         * @param token token
+         * @param primaryText primaryText
+         * @param secondaryText secondaryText
+         * @param tertiaryText tertiaryText
+         */
+        addItem(image: Image, token: string, primaryText: TextField, secondaryText?: TextField, tertiaryText?: TextField): ListItemBuilder;
+
+        build(): ListItem[];
+    }
+    /**
+     * Used to create BodyTemplate1 objects
+     */
+    class BodyTemplate1Builder extends TemplateBuilder<BodyTemplate1Builder> implements SetTextContent<BodyTemplate1Builder> {
+        constructor();
+        /**
+         * Sets the text content for the template
+         * @param primaryText primaryText
+         * @param secondaryText secondaryText
+         * @param tertiaryText tertiaryText
+         * @returns BodyTemplate1Builder
+         */
+        setTextContent(primaryText: TextField, secondaryText?: TextField, tertiaryText?: TextField): BodyTemplate1Builder;
+    }
+    /**
+     * Used to create BodyTemplate2 objects
+     */
+    class BodyTemplate2Builder extends TemplateBuilder<BodyTemplate2Builder> implements SetTextContent<BodyTemplate2Builder> {
+        constructor();
+
+        /**
+         * Sets the image for the template
+         * @param image image
+         * @returns BodyTemplate2Builder
+         */
+        setImage(image: Image): BodyTemplate2Builder;
+
+        /**
+         * Sets the text content for the template
+         * @param primaryText primaryText
+         * @param secondaryText secondaryText
+         * @param tertiaryText tertiaryText
+         * @returns BodyTemplate2Builder
+         */
+        setTextContent(primaryText: TextField, secondaryText?: TextField, tertiaryText?: TextField): BodyTemplate2Builder;
+    }
+    /**
+     * Used to create BodyTemplate3 objects
+     */
+    class BodyTemplate3Builder extends TemplateBuilder<BodyTemplate3Builder> implements SetTextContent<BodyTemplate3Builder> {
+        constructor();
+
+        /**
+         * Sets the image for the template
+         * @param image image
+         * @returns BodyTemplate3Builder
+         */
+        setImage(image: Image): BodyTemplate3Builder;
+
+        /**
+         * Sets the text content for the template
+         * @param primaryText primaryText
+         * @param secondaryText secondaryText
+         * @param tertiaryText tertiaryText
+         * @returns BodyTemplate3Builder
+         */
+        setTextContent(primaryText: TextField, secondaryText?: TextField, tertiaryText?: TextField): BodyTemplate3Builder;
+    }
+    /**
+     * Used to create BodyTemplate6 objects
+     */
+    class BodyTemplate6Builder extends TemplateBuilder<BodyTemplate6Builder> implements SetTextContent<BodyTemplate6Builder> {
+        constructor();
+
+        /**
+         * Sets the image for the template
+         * @param image image
+         * @returns BodyTemplate6Builder
+         */
+        setImage(image: Image): BodyTemplate6Builder;
+
+        /**
+         * Sets the text content for the template
+         * @param primaryText primaryText
+         * @param secondaryText secondaryText
+         * @param tertiaryText tertiaryText
+         * @returns BodyTemplate6Builder
+         */
+        setTextContent(primaryText: TextField, secondaryText?: TextField, tertiaryText?: TextField): BodyTemplate6Builder;
+    }
+    /**
+     * Used to create BodyTemplate7 objects
+     */
+    class BodyTemplate7Builder extends TemplateBuilder<BodyTemplate7Builder> {
+        constructor();
+
+        /**
+         * Sets the image for the template
+         * @param image image
+         * @returns BodyTemplate7Builder
+         */
+        setImage(image: Image): BodyTemplate7Builder;
+    }
+    /**
+     * Used to create ListTemplate1 objects
+     */
+    class ListTemplate1Builder extends TemplateBuilder<ListTemplate1Builder> implements SetListItems<ListTemplate1Builder> {
+        constructor();
+
+        /**
+         * Set the items for the list
+         * @param listItems listItems
+         * @returns ListTemplate1Builder
+         */
+        setListItems(listItems: ListItem[]): ListTemplate1Builder;
+    }
+    /**
+     * Used to create ListTemplate2 objects
+     */
+    class ListTemplate2Builder extends TemplateBuilder<ListTemplate2Builder> implements SetListItems<ListTemplate2Builder> {
+        constructor();
+
+        /**
+         * Set the items for the list
+         * @param listItems listItems
+         * @returns ListTemplate2Builder
+         */
+        setListItems(listItems: ListItem[]): ListTemplate2Builder;
+    }
+}
+//#endregion
+
+//#region services
+export namespace services {
+    interface ApiClient {
+        /**
+         * Make a POST API call to the specified uri with headers and optional body
+         * @param uri http(s?) endpoint to call
+         * @param headers Key value pair of headers
+         * @param body post body to send
+         * @returns Promise<ApiClientResponse>
+         */
+        post(uri: string, headers: object, body?: string): Promise<ApiClientResponse>;
+        /**
+         * Make a PUT API call to the specified uri with headers and optional body
+         * @param uri http(s?) endpoint to call
+         * @param headers Key value pair of headers
+         * @param body post body to send
+         * @returns Promise<ApiClientResponse>
+         */
+        put(uri: string, headers: object, body?: string): Promise<ApiClientResponse>;
+        /**
+         * Make a GET API call to the specified uri with headers
+         * @param uri http(s?) endpoint to call
+         * @param headers key value pair of headers
+         * @returns Promise<ApiClientResponse>
+         */
+        get(uri: string, headers: object): Promise<ApiClientResponse>;
+        /**
+         * Make a DELETE API call to the specified uri with headers
+         * @param uri http(s?) endpoint to call
+         * @param headers key value pair of headers
+         * @returns Promise<ApiClientResponse>
+         */
+        delete(uri: string, headers: object): Promise<ApiClientResponse>;
+    }
+    class DeviceAddressService {
+        /**
+         * Create an instance of DeviceAddressService
+         * @param [apiClient=new ApiClient()] ApiClient
+         */
+        constructor(apiClient: ApiClient);
+
+        /**
+         * Get full address information from Alexa Device Address API
+         * @param deviceId deviceId from Alexa request
+         * @param apiEndpoint API apiEndpoint from Alexa request
+         * @param token bearer token for device address permission
+         * @returns Promise<object>
+         */
+        getFullAddress(deviceId: string, apiEndpoint: string, token: string): Promise<object>;
+
+        /**
+         * Get country and postal information from Alexa Device Address API
+         * @param deviceId deviceId from Alexa request
+         * @param apiEndpoint API apiEndpoint from Alexa request
+         * @param token bearer token for device address permission
+         * @returns Promise<object>
+         */
+        getCountryAndPostalCode(deviceId: string, apiEndpoint: string, token: string): Promise<object>;
+    }
+    class DirectiveService {
+        /**
+         * Creates an instance of DirectiveService.
+         * @param [apiClient=new ApiClient()] ApiClient
+         */
+        constructor(apiClient: ApiClient);
+
+        /**
+         * Send the specified directiveObj to Alexa directive service
+         *
+         * @param directive directive to send to service
+         * @param apiEndpoint API endpoint from Alexa request
+         * @param token bearer token for directive service
+         * @returns Promise<void>
+         */
+        enqueue(directive: object, apiEndpoint: string, token: string): Promise<void>;
+    }
+    class ListManagementService {
+        /**
+         * Create an instance of ListManagementService
+         * @param apiClient apiClient
+         */
+        constructor(apiClient: ApiClient);
+
+        /**
+         * Set apiEndpoint address, default is "https://api.amazonalexa.com"
+         * @param apiEndpoint apiEndpoint
+         * @returns void
+         */
+        setApiEndpoint(apiEndpoint: string): void;
+
+        /**
+         * Get currently set apiEndpoint address
+         * @returns string
+         */
+        getApiEndpoint(): string;
+
+        /**
+         * Retrieve the metadata for all customer lists, including the customer's default lists
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        getListsMetadata(token: string): Promise<object>;
+
+        /**
+         * Create a custom list. The new list name must be different than any existing list name
+         * @param listObject listObject
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        createList(listObject: ListObject, token: string): Promise<object>;
+
+        /**
+         * Retrieve list metadata including the items in the list with requested status
+         * @param listId unique Id associated with the list
+         * @param itemStatus itemsStatus can be either "active" or "completed"
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        getList(listId: string, itemStatus: ListItemObjectStatus, token: string): Promise<object>;
+
+        /**
+         * Update a custom list. Only the list name or state can be updated
+         * @param listId unique Id associated with the list
+         * @param listObject listObject
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        updateList(listId: string, listObject: ListObject, token: string): Promise<object>;
+
+        /**
+         * Delete a custom list
+         * @param listId unique Id associated with the list
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        deleteList(listId: string, token: string): Promise<object>;
+
+        /**
+         * Create an item in an active list or in a default list
+         * @param listId unique Id associated with the list
+         * @param listItemObject listItemObject
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        createListItem(listId: string, listItemObject: ListItemObject, token: string): Promise<object>;
+
+        /**
+         * Retrieve single item within any list by listId and itemId
+         * @param listId unique Id associated with the list
+         * @param itemId unique Id associated with the item
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        getListItem(listId: string, itemId: string, token: string): Promise<object>;
+
+        /**
+         * Update an item value or item status
+         * @param listId unique Id associated with the list
+         * @param itemId unique Id associated with the item
+         * @param listItemObject listItemObject
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        updateListItem(listId: string, itemId: string, listItemObject: ListItemObject, token: string): Promise<object>;
+
+        /**
+         * Delete an item in the specified list
+         * @param listId unique Id associated with the list
+         * @param itemId unique Id associated with the item
+         * @param token bearer token for list management permission
+         * @returns Promise<object>
+         */
+        deleteListItem(listId: string, itemId: string, token: string): Promise<object>;
+    }
+}
+//#endregion
+
+//#region ResponseBuilder
+/**
+ * Responsible for building JSON responses as per the Alexa skills kit interface
+ * https://developer.amazon.com/public/solutions/alexa/alexa-skills-kit/docs/alexa-skills-kit-interface-reference#response-body-syntax
+ */
+export class ResponseBuilder {
+    constructor(alexaHandler: Handler<Request>);
+
+    /**
+     * Have Alexa say the provided speechOutput to the user
+     * @param speechOutput speechOutput
+     * @returns ResponseBuilder
+     */
+    speak(speechOutput: string): ResponseBuilder;
+
+    /**
+     * Have alexa listen for speech from the user. If the user doesn't respond within 8 seconds
+     * then have alexa reprompt with the provided reprompt speech
+     * @param repromptSpeech repromptSpeech
+     * @returns ResponseBuilder
+     */
+    listen(repromptSpeech: string): ResponseBuilder;
+
+    /**
+     * Render a card with the following title, content and image
+     * @param cardTitle cardTitle
+     * @param cardContent cardContent
+     * @param cardImage cardImage
+     * @returns ResponseBuilder
+     */
+    cardRenderer(cardTitle: string, cardContent: string, cardImage: CardImage): ResponseBuilder;
+
+    /**
+     * Render a link account card
+     * @returns ResponseBuilder
+     */
+    linkAccountCard(): ResponseBuilder;
+
+    /**
+     * Render a askForPermissionsConsent card
+     * @param permissions permissions
+     * @returns ResponseBuilder
+     */
+    askForPermissionsConsentCard(permissions: [{ [key: string]: string }]): ResponseBuilder;
+
+    /**
+     * Creates a play, stop or clearQueue audioPlayer directive depending on the directive type passed in.
+     * @deprecated - use audioPlayerPlay, audioPlayerStop, audioPlayerClearQueue instead
+     * @param directiveType directiveType
+     * @param behavior behavior
+     * @param url url
+     * @param token token
+     * @param expectedPreviousToken expectedPreviousToken
+     * @param offsetInMilliseconds offsetInMilliseconds
+     * @returns ResponseBuilder
+     */
+    audioPlayer(directiveType: string, behavior: string, url: string, token: string, expectedPreviousToken: string, offsetInMilliseconds: number): ResponseBuilder;
+
+    /**
+     * Creates an AudioPlayer play directive
+     * @param behavior Describes playback behavior. Accepted values:
+     * REPLACE_ALL: Immediately begin playback of the specified stream, and replace current and enqueued streams.
+     * ENQUEUE: Add the specified stream to the end of the current queue. This does not impact the currently playing stream.
+     * REPLACE_ENQUEUED: Replace all streams in the queue. This does not impact the currently playing stream.
+     * @param url Identifies the location of audio content at a remote HTTPS location.
+     * The audio file must be hosted at an Internet-accessible HTTPS endpoint. HTTPS is required, and the domain hosting the
+     * files must present a valid, trusted SSL certificate. Self-signed certificates cannot be used.
+     * The supported formats for the audio file include AAC/MP4, MP3, HLS, PLS and M3U. Bitrates: 16kbps to 384 kbps.
+     * @param token A token that represents the audio stream. This token cannot exceed 1024 characters
+     * @param expectedPreviousToken A token that represents the expected previous stream.
+     * This property is required and allowed only when the playBehavior is ENQUEUE. This is used to prevent potential race conditions
+     * if requests to progress through a playlist and change tracks occur at the same time.
+     * @param offsetInMilliseconds The timestamp in the stream from which Alexa should begin playback.
+     * Set to 0 to start playing the stream from the beginning. Set to any other value to start playback from that associated point in the stream
+     * @returns ResponseBuilder
+     */
+    audioPlayerPlay(behavior: string, url: string, token: string, expectedPreviousToken: string, offsetInMilliseconds: number): ResponseBuilder;
+
+    /**
+     * Creates an AudioPlayer Stop directive - Stops the current audio Playback
+     * @returns ResponseBuilder
+     */
+    audioPlayerStop(): ResponseBuilder;
+
+    /**
+     * Creates an AudioPlayer ClearQueue directive - clear the queue without stopping the currently playing stream,
+     * or clear the queue and stop any currently playing stream.
+     * @param clearBehavior Describes the clear queue behavior. Accepted values:
+     * CLEAR_ENQUEUED: clears the queue and continues to play the currently playing stream
+     * CLEAR_ALL: clears the entire playback queue and stops the currently playing stream (if applicable).
+     * @returns ResponseBuilder
+     */
+    audioPlayerClearQueue(clearBehavior: string): ResponseBuilder;
+
+    /**
+     * Creates a Display RenderTemplate Directive
+     * Use a template builder to generate a template object
+     * @param template template
+     * @returns ResponseBuilder
+     */
+    renderTemplate(template: Template): ResponseBuilder;
+
+    /**
+     * Creates a hint directive - show a hint on the screen of the echo show
+     * @param hintText text to show on the hint
+     * @param hintType (optional) Default value : PlainText
+     * @returns ResponseBuilder
+     */
+    hint(hintText: string, hintType?: HintType): ResponseBuilder;
+
+    /**
+     * Creates a VideoApp play directive to play a video
+     * @param source Identifies the location of video content at a remote HTTPS location.
+     * The video file must be hosted at an Internet-accessible HTTPS endpoint.
+     * @param metadata (optional) Contains an object that provides the
+     * information that can be displayed on VideoApp.
+     * @returns ResponseBuilder
+     */
+    playVideo(source: string, metadata?: { title: string, subtitle: string }): ResponseBuilder;
+}
+//#endregion
+
+//#region directives
+export namespace directives {
+    class VoicePlayerSpeakDirective {
+        header: { requestId: string };
+        directive: { type: string, speech: string };
+        /**
+         * Creates an instance of VoicePlayerSpeakDirective.
+         * @param requestId - requestId from which the call is originated from
+         * @param speechContent - Contents of the speech directive either in plain text or SSML.
+         */
+        constructor(requestId: string, speechContent: string);
+    }
+}
+//#endregion
+
+//#region utils
+export namespace utils {
+    namespace ImageUtils {
+        /**
+         * Creates an image object with a single source
+         * These images may be in either JPEG or PNG formats, with the appropriate file extensions.
+         * An image cannot be larger than 2 MB
+         * You must host the images at HTTPS URLs that are publicly accessible.
+         * widthPixels and heightPixels are optional - Do not include them unless they are exactly correct.
+         * By default, for Echo Show, size takes the value X_SMALL. If the other size values are included,
+         * then the order of precedence for displaying images begins with X_LARGE and proceeds downward,
+         * which means that larger images will be downscaled for display on Echo Show if provided.
+         * example : ImageUtils.makeImage("https://url/to/my/img.png", 300, 400, "SMALL", "image description")
+         * @param url url of the image
+         * @param widthPixels (optional) width of the image in pixels
+         * @param heightPixels (optional) height of the image in pixels
+         * @param size size of the image (X_SMALL, SMALL, MEDIUM, LARGE, X_LARGE)
+         * @param description text used to describe the image in a screen reader
+         * @returns Image
+         */
+        function makeImage(url: string, widthPixels?: number, heightPixels?: number, size?: ImageSourceSize, description?: string): Image;
+        /**
+         * Creates an image object with a multiple sources, source images are provided as an array of image objects
+         * These images may be in either JPEG or PNG formats, with the appropriate file extensions.
+         * An image cannot be larger than 2 MB
+         * You must host the images at HTTPS URLs that are publicly accessible.
+         * widthPixels and heightPixels are optional - Do not include them unless they are exactly correct.
+         * By default, for Echo Show, size takes the value X_SMALL. If the other size values are included,
+         * then the order of precedence for displaying images begins with X_LARGE and proceeds downward,
+         * which means that larger images will be downscaled for display on Echo Show if provided.
+         * example :
+         * let imgArr = [
+         *  { "https://url/to/my/small.png", 300, 400, "SMALL" },
+         *  { "https://url/to/my/large.png", 900, 1200, "LARGE" },
+         * ]
+         *  ImageUtils.makeImage(imgArr, "image description")
+         *
+         * @param imgArr Array of Image
+         * @param description text used to describe the image in a screen reader
+         * @returns Image
+         */
+        function makeImages(imgArr: Array<{ url: string, widthPixels?: number, heightPixels?: number, size: ImageSourceSize }>, description: string): Image;
+    }
+    /**
+     * Utility methods for building TextField objects
+     */
+    namespace TextUtils {
+        /**
+         * Creates a plain TextField object with contents : text
+         * @param text contents of plain text object
+         * @returns TextField
+         */
+        function makePlainText(text: string): TextField;
+
+        /**
+         * Creates a rich TextField object with contents : text
+         * @param text text
+         * @returns TextField
+         */
+        function makeRichText(text: string): TextField;
+
+        /**
+         * Creates a textContent
+         * @param primaryText primary Text
+         * @param secondaryText secondary Text
+         * @param tertiaryText tertiary Text
+         * @returns TextContent
+         */
+        function makeTextContent(primaryText: { type: TextContentType, text: string },
+            secondaryText: { type: TextContentType, text: string }, tertiaryText: { type: TextContentType, text: string }): TextContent;
+    }
+}
+//#endregion
diff --git a/types/alexa-sdk/tsconfig.json b/types/alexa-sdk/tsconfig.json
index acc11c8263..d1932fa469 100644
--- a/types/alexa-sdk/tsconfig.json
+++ b/types/alexa-sdk/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "alexa-sdk-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/alexa-sdk/tslint.json b/types/alexa-sdk/tslint.json
index 78f1939ba2..32a9916641 100644
--- a/types/alexa-sdk/tslint.json
+++ b/types/alexa-sdk/tslint.json
@@ -1,10 +1,11 @@
-{ "extends": "dtslint/dt.json",
-  "rules": {
-      "object-literal-shorthand": false,
-      "object-literal-key-quote": false,
-      "no-empty-interface": false,
-      "prefer-method-signature": false,
-      "object-literal-key-quotes": false,
-      "no-any": false
-      }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "object-literal-shorthand": false,
+        "object-literal-key-quote": false,
+        "no-empty-interface": false,
+        "prefer-method-signature": false,
+        "object-literal-key-quotes": false,
+        "no-any": false
+    }
 }
diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index dfcf27c94f..0814b0fc03 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -1,144 +1,153 @@
-import * as algoliasearch from "algoliasearch";
-import { ClientOptions, SynonymOption, AlgoliaUserKeyOptions, SearchSynonymOptions, AlgoliaResponse,
-    AlgoliaSecuredApiOptions, AlgoliaIndexSettings, AlgoliaQueryParameters, AlgoliaIndex } from "algoliasearch";
+import * as algoliasearch from 'algoliasearch';
+import {
+  ClientOptions,
+  SynonymOption,
+  AlgoliaApiKeyOptions,
+  SearchSynonymOptions,
+  AlgoliaResponse,
+  AlgoliaSecuredApiOptions,
+  AlgoliaIndexSettings,
+  AlgoliaQueryParameters,
+  AlgoliaIndex,
+} from 'algoliasearch';
 
 let _algoliaResponse: AlgoliaResponse = {
-    hits: [{}, {}],
-    page: 0,
-    nbHits: 12,
-    nbPages: 6,
-    hitsPerPage: 2,
-    processingTimeMS: 32,
-    query: "",
-    params: "",
+  hits: [{}, {}],
+  page: 0,
+  nbHits: 12,
+  nbPages: 6,
+  hitsPerPage: 2,
+  processingTimeMS: 32,
+  query: '',
+  params: '',
 };
 
 let _clientOptions: ClientOptions = {
-    timeout: 12,
-    protocol: "",
-    httpAgent: "",
+  timeout: 12,
+  protocol: '',
+  httpAgent: '',
 };
 
 let _synonymOption: SynonymOption = {
-    forwardToSlaves: false,
-    replaceExistingSynonyms: false,
+  forwardToReplicas: false,
+  replaceExistingSynonyms: false,
 };
 
-let _algoliaUserKeyOptions: AlgoliaUserKeyOptions = {
-    validity: 0,
-    maxQueriesPerIPPerHour: 0,
-    indexes: [""],
-    queryParameters: { attributesToRetrieve: ["algolia"] },
-    description: "",
+let _algoliaApiKeyOptions: AlgoliaApiKeyOptions = {
+  validity: 0,
+  maxQueriesPerIPPerHour: 0,
+  indexes: [''],
+  queryParameters: { attributesToRetrieve: ['algolia'] },
+  description: '',
 };
 
 let _searchSynonymOptions: SearchSynonymOptions = {
-    query: "",
-    page: 0,
-    type: "",
-    hitsPerPage: 0,
+  query: '',
+  page: 0,
+  type: '',
+  hitsPerPage: 0,
 };
 
 let _algoliaSecuredApiOptions: AlgoliaSecuredApiOptions = {
-    filters: "",
-    validUntil: 0,
-    restrictIndices: "",
-    userToken: "",
+  filters: '',
+  validUntil: 0,
+  restrictIndices: '',
+  userToken: '',
 };
 
 let _algoliaIndexSettings: AlgoliaIndexSettings = {
-    attributesToIndex: [""],
-    attributesForFaceting: [""],
-    unretrievableAttributes: [""],
-    attributesToRetrieve: [""],
-    ranking: [""],
-    customRanking: [""],
-    slaves: [""],
-    maxValuesPerFacet: "",
-    attributesToHighlight: [""],
-    attributesToSnippet: [""],
-    highlightPreTag: "",
-    highlightPostTag: "",
-    snippetEllipsisText: "",
-    restrictHighlightAndSnippetArrays: false,
-    hitsPerPage: 0,
-    minWordSizefor1Typo: 0,
-    minWordSizefor2Typos: 0,
-    typoTolerance: false,
-    allowTyposOnNumericTokens: false,
-    ignorePlurals: false,
-    disableTypoToleranceOnAttributes: "",
-    separatorsToIndex: "",
-    queryType: "",
-    removeWordsIfNoResults: "",
-    advancedSyntax: false,
-    optionalWords: [""],
-    removeStopWords: [""],
-    disablePrefixOnAttributes: [""],
-    disableExactOnAttributes: [""],
-    exactOnSingleWordQuery: "",
-    alternativesAsExact: false,
-    attributeForDistinct: "",
-    distinct: false,
-    numericAttributesToIndex: [""],
-    allowCompressionOfIntegerArray: false,
-    altCorrections: [{}],
-    minProximity: 0,
-    placeholders: "",
+  attributesToIndex: [''],
+  attributesForFaceting: [''],
+  unretrievableAttributes: [''],
+  attributesToRetrieve: [''],
+  ranking: [''],
+  customRanking: [''],
+  replicas: [''],
+  maxValuesPerFacet: '',
+  attributesToHighlight: [''],
+  attributesToSnippet: [''],
+  highlightPreTag: '',
+  highlightPostTag: '',
+  snippetEllipsisText: '',
+  restrictHighlightAndSnippetArrays: false,
+  hitsPerPage: 0,
+  minWordSizefor1Typo: 0,
+  minWordSizefor2Typos: 0,
+  typoTolerance: false,
+  allowTyposOnNumericTokens: false,
+  ignorePlurals: false,
+  disableTypoToleranceOnAttributes: '',
+  separatorsToIndex: '',
+  queryType: '',
+  removeWordsIfNoResults: '',
+  advancedSyntax: false,
+  optionalWords: [''],
+  removeStopWords: [''],
+  disablePrefixOnAttributes: [''],
+  disableExactOnAttributes: [''],
+  exactOnSingleWordQuery: '',
+  alternativesAsExact: false,
+  attributeForDistinct: '',
+  distinct: false,
+  numericAttributesToIndex: [''],
+  allowCompressionOfIntegerArray: false,
+  altCorrections: [{}],
+  minProximity: 0,
+  placeholders: '',
 };
 
 let _algoliaQueryParameters: AlgoliaQueryParameters = {
-    query: "",
-    filters: "",
-    attributesToRetrieve: [""],
-    restrictSearchableAttributes: [""],
-    facets: "",
-    maxValuesPerFacet: "",
-    attributesToHighlight: [""],
-    attributesToSnippet: [""],
-    highlightPreTag: "",
-    highlightPostTag: "",
-    snippetEllipsisText: "",
-    restrictHighlightAndSnippetArrays: false,
-    hitsPerPage: 0,
-    page: 0,
-    offset: 0,
-    length: 0,
-    minWordSizefor1Typo: 0,
-    minWordSizefor2Typos: 0,
-    typoTolerance: false,
-    allowTyposOnNumericTokens: false,
-    ignorePlurals: false,
-    disableTypoToleranceOnAttributes: "",
-    aroundLatLng: "",
-    aroundLatLngViaIP: "",
-    aroundRadius: "",
-    aroundPrecision: 0,
-    minimumAroundRadius: 0,
-    insideBoundingBox: "",
-    queryType: "",
-    insidePolygon: "",
-    removeWordsIfNoResults: "",
-    advancedSyntax: false,
-    optionalWords: [""],
-    removeStopWords: [""],
-    disableExactOnAttributes: [""],
-    exactOnSingleWordQuery: "",
-    alternativesAsExact: true,
-    distinct: 0,
-    getRankingInfo: false,
-    numericAttributesToIndex: [""],
-    numericFilters: [""],
-    tagFilters: "",
-    facetFilters: "",
-    analytics: false,
-    analyticsTags: [""],
-    synonyms: true,
-    replaceSynonymsInHighlight: false,
-    minProximity: 0,
+  query: '',
+  filters: '',
+  attributesToRetrieve: [''],
+  restrictSearchableAttributes: [''],
+  facets: '',
+  maxValuesPerFacet: '',
+  attributesToHighlight: [''],
+  attributesToSnippet: [''],
+  highlightPreTag: '',
+  highlightPostTag: '',
+  snippetEllipsisText: '',
+  restrictHighlightAndSnippetArrays: false,
+  hitsPerPage: 0,
+  page: 0,
+  offset: 0,
+  length: 0,
+  minWordSizefor1Typo: 0,
+  minWordSizefor2Typos: 0,
+  typoTolerance: false,
+  allowTyposOnNumericTokens: false,
+  ignorePlurals: false,
+  disableTypoToleranceOnAttributes: '',
+  aroundLatLng: '',
+  aroundLatLngViaIP: '',
+  aroundRadius: 0,
+  aroundPrecision: 0,
+  minimumAroundRadius: 0,
+  insideBoundingBox: [[0]],
+  queryType: '',
+  insidePolygon: [[0]],
+  removeWordsIfNoResults: '',
+  advancedSyntax: false,
+  optionalWords: [''],
+  removeStopWords: [''],
+  disableExactOnAttributes: [''],
+  exactOnSingleWordQuery: '',
+  alternativesAsExact: true,
+  distinct: 0,
+  getRankingInfo: false,
+  numericAttributesToIndex: [''],
+  numericFilters: [''],
+  tagFilters: '',
+  facetFilters: '',
+  analytics: false,
+  analyticsTags: [''],
+  synonyms: true,
+  replaceSynonymsInHighlight: false,
+  minProximity: 0,
 };
 
-let index: AlgoliaIndex = algoliasearch("", "").initIndex("");
+let index: AlgoliaIndex = algoliasearch('', '').initIndex('');
 
-let search = index.search({query: ""});
-             index.search({query: ""}, (err, res) => {});
+let search = index.search({ query: '' });
+index.search({ query: '' }, (err, res) => {});
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 2f94b2c907..c56b0f8a9f 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -1,1527 +1,1936 @@
-// Type definitions for algoliasearch-client-js 3.18.1
+// Type definitions for algoliasearch-client-js 3.24.8
 // Project: https://github.com/algolia/algoliasearch-client-js
 // Definitions by: Baptiste Coquelle <https://github.com/cbaptiste>
 //                 Haroen Viaene <https://github.com/haroenv>
+//                 Aurélien Hervé <https://github.com/aherve>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare namespace algoliasearch {
-    interface AlgoliaResponse {
-        /**
-         * Contains all the hits matching the query
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        hits: any[];
-        /**
-         * Current page
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        page: number;
-        /**
-         * Number of total hits matching the query
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        nbHits: number;
-        /**
-         * Number of pages
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        nbPages: number;
-        /**
-         * Number of hits per pages
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        hitsPerPage: number;
-        /**
-         * Engine processing time (excluding network transfer)
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        processingTimeMS: number;
-        /**
-         * Query used to perform the search
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        query: string;
-        /**
-         * GET parameters used to perform the search
-         * https://github.com/algolia/algoliasearch-client-js#response-format
-         */
-        params: string;
-    }
-    /*
-    Interface for the algolia client object
-    */
-    interface AlgoliaClient {
-        /**
-         * Initialization of the index
-         * @param name: index name
-         * return algolia index object
-         * https://github.com/algolia/algoliasearch-client-js#init-index---initindex
-         */
-        initIndex(name: string): AlgoliaIndex;
-        /**
-         * Query on multiple index
-         * @param queries index name, query and query parameters
-         * @param cb callback(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
-         */
-        search(queries: { indexName: string, query: string, options: AlgoliaQueryParameters }, cb: (err: Error, res: any) => void): void;
-        /**
-         * Query on multiple index
-         * @param queries index name, query and query parameters
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
-         */
-        search(queries: { indexName: string, query: string, options: AlgoliaQueryParameters }): Promise<AlgoliaResponse>;
-        /**
-         * clear browser cache
-         * https://github.com/algolia/algoliasearch-client-js#cache
-         */
-        clearCache(): void;
-        /**
-         * kill alive connections
-         * https://github.com/algolia/algoliasearch-client-js#keep-alive
-         */
-        destroy(): void;
-        /**
-         * List all your indices along with their associated information (number of entries, disk size, etc.)
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
-         */
-        listIndexes(cb: (err: Error, res: any) => void): void;
-        /**
-         * List all your indices along with their associated information (number of entries, disk size, etc.)
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
-         */
-        listIndexes(): Promise<any>;
-        /**
-         * Delete a specific index
-         * @param name
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
-         */
-        deleteIndex(name: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Delete a specific index
-         * @param name
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
-         */
-        deleteIndex(name: string): Promise<any>;
-        /**
-         * Copy an  index from a specific index to a new one
-         * @param from origin index
-         * @param to destination index
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
-         */
-        copyIndex(from: string, to: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Copy an  index from a specific index to a new one
-         * @param from origin index
-         * @param to destination index
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
-         */
-        copyIndex(from: string, to: string): Promise<any>;
-        /**
-         * Move index to a new one (and will overwrite the original one)
-         * @param from origin index
-         * @param to destination index
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
-         */
-        moveIndex(from: string, to: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Move index to a new one (and will overwrite the original one)
-         * @param from origin index
-         * @param to destination index
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
-         */
-        moveIndex(from: string, to: string): Promise<any>;
-        /**
-         * Generate a public API key
-         * @param key api key
-         * @param filters
-         * https://github.com/algolia/algoliasearch-client-js#generate-key---generatesecuredapikey
-         */
-        generateSecuredApiKey(key: string, filters: AlgoliaSecuredApiOptions): void;
-        /**
-         * Perform multiple operations with one API call to reduce latency
-         * @param action
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-         */
-        batch(action: AlgoliaAction, cb: (err: Error, res: any) => void): void;
-        /**
-         * Perform multiple operations with one API call to reduce latency
-         * @param action
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-         */
-        batch(action: AlgoliaAction): Promise<any>;
-        /**
-         * Lists global API Keys
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-         */
-        listUserKeys(cb: (err: Error, res: any) => void): void;
-        /**
-         * Lists global API Keys
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-         */
-        listUserKeys(): Promise<any>;
-        /**
-         * Add global API Keys
-         * @param scopes
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        addUserKey(scopes: string[], cb: (err: Error, res: any) => void): void;
-        /**
-         * Add global API Key
-         * @param scopes
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        addUserKey(scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-        /**
-         * Add global API Keys
-         * @param scopes
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        addUserKey(scopes: string[], options?: AlgoliaUserKeyOptions): Promise<any>;
-        /**
-         * Update global API key
-         * @param key
-         * @param scopes
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        updateUserKey(key: string, scopes: string[], cb: (err: Error, res: any) => void): void;
-        /**
-         * Update global API key
-         * @param key
-         * @param scopes
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-        /**
-         * Update global API key
-         * @param key
-         * @param scopes
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        updateUserKey(key: string, scopes: string[], options?: AlgoliaUserKeyOptions): Promise<any>;
-        /**
-         * Gets the rights of a global key
-         * @param key
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        getUserKeyACL(key: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Gets the rights of a global key
-         * @param key
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        getUserKeyACL(key: string): Promise<any>;
-        /**
-         * Deletes a global key
-         * @param key
-         * @param cb(err,res)
-         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-         */
-        deleteUserKey(key: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Deletes a global key
-         * @param key
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-         */
-        deleteUserKey(key: string): Promise<any>;
-        /**
-         * Get 1000 last events
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-         */
-        getLogs(options: LogsOptions, cb: (err: Error, res: any) => void): void;
-        /**
-         * Get 1000 last events
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-         */
-        getLogs(options: LogsOptions): Promise<any>;
-    }
+  interface AlgoliaResponse {
     /**
-     * Interface for the index algolia object
+     * Contains all the hits matching the query
+     * https://github.com/algolia/algoliasearch-client-js#response-format
      */
-    interface AlgoliaIndex {
-        /**
-         * Gets a specific object
-         * @param objectID
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-         */
-        getObject(objectID: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Gets specific attributes from an object
-         * @param objectID
-         * @param attributes
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-         */
-        getObject(objectID: string, attributes: string[], cb: (err: Error, res: any) => void): void;
-        /**
-         * Gets a list of objects
-         * @param objectIDs
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-         */
-        getObjects(objectIDs: string[], cb: (err: Error, res: any) => void): void;
-        /**
-         * Add a specific object
-         * @param object without objectID
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-         */
-        addObject(object: {}, cb: (err: Error, res: any) => void): void;
-        /**
-         * Add a list of objects
-         * @param object with objectID
-         * @param objectID
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-         */
-        addObject(object: {}, objectID: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Add list of objects
-         * @param objects
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-         */
-        addObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
-        /**
-         * Add or replace a specific object
-         * @param object
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        saveObject(object: {}, cb: (err: Error, res: any) => void): void;
-        /**
-         * Add or replace several objects
-         * @param objects
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        saveObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
-        /**
-         * Update parameters of a specific object
-         * @param object
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        partialUpdateObject(object: {}, cb: (err: Error, res: any) => void): void;
-        /**
-         * Update parameters of a list of objects
-         * @param objects
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        partialUpdateObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
-        /**
-         * Delete a specific object
-         * @param objectID
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-         */
-        deleteObject(objectID: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Delete a list of objects
-         * @param objectIDs
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-         */
-        deleteObjects(objectIDs: string[], cb: (err: Error, res: any) => void): void;
-        /**
-         * Delete objects that matches the query
-         * @param query
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
-         */
-        deleteByQuery(query: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Delete objects that matches the query
-         * @param query
-         * @param params of the object
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
-         */
-        deleteByQuery(query: string, params: {}, cb: (err: Error, res: any) => void): void;
-        /**
-         * Wait for an indexing task to be compete
-         * @param taskID
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
-         */
-        waitTask(taskID: number, cb: (err: Error, res: any) => void): void;
-        /**
-         * Get an index settings
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
-         */
-        getSettings(cb: (err: Error, res: any) => void): void;
-        /**
-         * Set an index settings
-         * @param settings
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
-         */
-        setSettings(settings: AlgoliaIndexSettings, cb: (err: Error, res: any) => void): void;
-        /**
-         * Clear cache of an index
-         * https://github.com/algolia/algoliasearch-client-js#cache
-         */
-        clearCache(): void;
-        /**
-         * Clear an index content
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
-         */
-        clearIndex(cb: (err: Error, res: any) => void): void;
-        /**
-         * Save a synonym object
-         * @param synonym
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-         */
-        saveSynonym(synonym: AlgoliaSynonym, options: SynonymOption, cb: (err: Error, res: any) => void): void;
-        /**
-         * Save a synonym object
-         * @param synonyms
-         * @param options
-         * @param cb(err, res)
-         */
-        batchSynonyms(synonyms: AlgoliaSynonym[], options: SynonymOption, cb: (err: Error, res: any) => void): void;
-        /**
-         * Delete a specific synonym
-         * @param identifier
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
-         */
-        deleteSynonym(identifier: string, options: SynonymOption, cb: (err: Error, res: any) => void): void;
-        /**
-         * Clear all synonyms of an index
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
-         */
-        clearSynonyms(options: SynonymOption, cb: (err: Error, res: any) => void): void;
-        /**
-         * Get a specific synonym
-         * @param identifier
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
-         */
-        getSynonym(identifier: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Search a synonyms
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-         */
-        searchSynonyms(options: SearchSynonymOptions, cb: (err: Error, res: any) => void): void;
-        /**
-         * List index user keys
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
-         */
-        listUserKeys(cb: (err: Error, res: any) => void): void;
-        /**
-         * Add key for this index
-         * @param scopes
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        addUserKey(scopes: string[], cb: (err: Error, res: any) => void): void;
-        /**
-         * Add key for this index
-         * @param scopes
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        addUserKey(scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-        /**
-         * Update a key for this index
-         * @param key
-         * @param scopes
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        updateUserKey(key: string, scopes: string[], cb: (err: Error, res: any) => void): void;
-        /**
-         * Update a key for this index
-         * @param key
-         * @param scopes
-         * @param options
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-        /**
-         * Gets the rights of an index specific key
-         * @param key
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getuserkeyacl
-         */
-        getUserKeyACL(key: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Deletes an index specific key
-         * @param key
-         * @param cb(err, res)
-         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-         */
-        deleteUserKey(key: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Gets specific attributes from an object
-         * @param objectID
-         * @param attributes
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-         */
-        getObject(objectID: string, attributes?: string[]): Promise<any> ;
-        /**
-         * Gets a list of objects
-         * @param objectIDs
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-         */
-        getObjects(objectIDs: string[]): Promise<any> ;
-        /**
-         * Add a list of objects
-         * @param object with objectID
-         * @param objectID
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-         */
-        addObject(object: {}, objectID?: string): Promise<any> ;
-        /**
-         * Add list of objects
-         * @param objects
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-         */
-        addObjects(objects: [{}]): Promise<any> ;
-        /**
-         * Add or replace a specific object
-         * @param object
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        saveObject(object: {}): Promise<any> ;
-        /**
-         * Add or replace several objects
-         * @param objects
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        saveObjects(objects: [{}]): Promise<any> ;
-        /**
-         * Update parameters of a specific object
-         * @param object
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        partialUpdateObject(object: {}): Promise<any> ;
-        /**
-         * Update parameters of a list of objects
-         * @param objects
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-         */
-        partialUpdateObjects(objects: [{}]): Promise<any> ;
-        /**
-         * Delete a specific object
-         * @param objectID
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-         */
-        deleteObject(objectID: string): Promise<any> ;
-        /**
-         * Delete a list of objects
-         * @param objectIDs
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-         */
-        deleteObjects(objectIDs: string[]): Promise<any> ;
-        /**
-         * Delete objects that matches the query
-         * @param query
-         * @param params of the object
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
-         */
-        deleteByQuery(query: string, params?: {}): Promise<any> ;
-        /**
-         * Wait for an indexing task to be compete
-         * @param taskID
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
-         */
-        waitTask(taskID: number): Promise<any> ;
-        /**
-         * Get an index settings
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
-         */
-        getSettings(): Promise<any> ;
-        /**
-         * Set an index settings
-         * @param settings
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
-         */
-        setSettings(settings: AlgoliaIndexSettings): Promise<any> ;
-        /**
-         * Search in an index
-         * @param params query parameter
-         * return {Promise}
-         * @param err() error callback
-         * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
-         */
-        search(params: AlgoliaQueryParameters): Promise<any> ;
-        /**
-         * Search in an index
-         * @param params query parameter
-         * @param cb(err, res)
-         * @param err() error callback
-         * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
-         */
-        search(params: AlgoliaQueryParameters, cb: (err: Error, res: any) => void): void;
-        /**
-         * Browse an index
-         * @param query
-         * @param cb(err, content)
-         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-         */
-        browse(query: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Browse an index
-         * @param query
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-         */
-        browse(query: string): Promise<AlgoliaBrowseResponse>;
-        /**
-         * Browse an index from a cursor
-         * @param cursor
-         * @param cb(err, content)
-         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-         */
-        browseFrom(cursor: string, cb: (err: Error, res: any) => void): void;
-        /**
-         * Browse an index from a cursor
-         * @param cursor
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-         */
-        browseFrom(cursor: string): Promise<AlgoliaBrowseResponse>;
-        /**
-         * Browse an entire index
-         * return Promise
-         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-         */
-        browseAll(): Promise<AlgoliaResponse>;
-        /**
-         * Clear an index content
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
-         */
-        clearIndex(): Promise<any> ;
-        /**
-         * Save a synonym object
-         * @param synonym
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-         */
-        saveSynonym(synonym: AlgoliaSynonym, options: SynonymOption): Promise<any> ;
-        /**
-         * Save a synonym object
-         * @param synonyms
-         * @param options
-         * return {Promise}
-         */
-        batchSynonyms(synonyms: AlgoliaSynonym[], options: SynonymOption): Promise<any> ;
-        /**
-         * Delete a specific synonym
-         * @param identifier
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
-         */
-        deleteSynonym(identifier: string, options: SynonymOption): Promise<any> ;
-        /**
-         * Clear all synonyms of an index
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
-         */
-        clearSynonyms(options: SynonymOption): Promise<any> ;
-        /**
-         * Get a specific synonym
-         * @param identifier
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
-         */
-        getSynonym(identifier: string): Promise<any> ;
-        /**
-         * Search a synonyms
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-         */
-        searchSynonyms(options: SearchSynonymOptions): Promise<any> ;
-        /**
-         * List index user keys
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
-         */
-        listUserKeys(): Promise<any> ;
-        /**
-         * Add key for this index
-         * @param scopes
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        addUserKey(scopes: string[], options?: AlgoliaUserKeyOptions): Promise<any> ;
-        /**
-         * Update a key for this index
-         * @param key
-         * @param scopes
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        updateUserKey(key: string, scopes: string[]): Promise<any> ;
-        /**
-         * Update a key for this index
-         * @param key
-         * @param scopes
-         * @param options
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-         */
-        updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions): Promise<any> ;
-        /**
-         * Gets the rights of an index specific key
-         * @param key
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getuserkeyacl
-         */
-        getUserKeyACL(key: string): Promise<any> ;
-        /**
-         * Deletes an index specific key
-         * @param key
-         * return {Promise}
-         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-         */
-        deleteUserKey(key: string): Promise<any> ;
-    }
-    /*
-    Interface describing available options when initializing a client
-    */
-    interface ClientOptions {
-        /**
-         * Timeout for requests to our servers, in milliseconds
-         * default: 15s (node), 2s (browser)
-         * https://github.com/algolia/algoliasearch-client-js#client-options
-         */
-        timeout?: number;
-        /**
-         * Protocol to use when communicating with algolia
-         * default: current protocol(browser), https(node)
-         * https://github.com/algolia/algoliasearch-client-js#client-options
-         */
-        protocol?: string;
-        /**
-         * (node only) httpAgent instance to use when communicating with Algolia servers.
-         * https://github.com/algolia/algoliasearch-client-js#client-options
-         */
-        httpAgent?: any;
-        /**
-         * read: array of read hosts to use to call Algolia servers, computed automatically
-         * write: array of read hosts to use to call Algolia servers, computed automatically
-         * https://github.com/algolia/algoliasearch-client-js#client-options
-         */
-        hosts?: { read?: string[], write?: string[] };
-    }
-    /*
-    Interface describing options available for gettings the logs
-    */
-    interface LogsOptions {
-        /**
-         * Specify the first entry to retrieve (0-based, 0 is the most recent log entry).
-         * default: 0
-         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-         */
-        offset?: number;
-        /**
-         * Specify the maximum number of entries to retrieve starting at the offset.
-         * default: 10
-         * maximum: 1000
-         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-         */
-        length?: number;
-        /**
-         * @deprecated
-         * Retrieve only logs with an HTTP code different than 200 or 201
-         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-         */
-        onlyErrors?: boolean;
-        /**
-         * Specify the type of logs to retrieve
-         * 'query' Retrieve only the queries
-         * 'build' Retrieve only the build operations
-         * 'error' Retrieve only the errors (same as onlyErrors parameters)
-         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-         */
-            type?: string;
-    }
+    hits: any[];
     /**
-     * Describe the action object used for batch operation
+     * Current page
+     * https://github.com/algolia/algoliasearch-client-js#response-format
      */
-    interface AlgoliaAction {
-        /**
-         * Type of the batch action
-         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-         */
-        action: "addObject" | "updateObject" | "partialUpdateObject" | "partialUpdateObjectNoCreate" | "deleteObject" | "delete" | "clear";
-        /**
-         * Name of the index where the bact will be performed
-         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-         */
+    page: number;
+    /**
+     * Number of total hits matching the query
+     * https://github.com/algolia/algoliasearch-client-js#response-format
+     */
+    nbHits: number;
+    /**
+     * Number of pages
+     * https://github.com/algolia/algoliasearch-client-js#response-format
+     */
+    nbPages: number;
+    /**
+     * Number of hits per pages
+     * https://github.com/algolia/algoliasearch-client-js#response-format
+     */
+    hitsPerPage: number;
+    /**
+     * Engine processing time (excluding network transfer)
+     * https://github.com/algolia/algoliasearch-client-js#response-format
+     */
+    processingTimeMS: number;
+    /**
+     * Query used to perform the search
+     * https://github.com/algolia/algoliasearch-client-js#response-format
+     */
+    query: string;
+    /**
+     * GET parameters used to perform the search
+     * https://github.com/algolia/algoliasearch-client-js#response-format
+     */
+    params: string;
+  }
+  interface AlgoliaMultiResponse {
+    results: AlgoliaResponse[];
+  }
+  /*
+  Interface for the algolia client object
+  */
+  interface AlgoliaClient {
+    /**
+     * Initialization of the index
+     * @param name: index name
+     * return algolia index object
+     * https://github.com/algolia/algoliasearch-client-js#init-index---initindex
+     */
+    initIndex(name: string): AlgoliaIndex;
+    /**
+     * Query on multiple index
+     * @param queries index name, query and query parameters
+     * @param cb callback(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
+     */
+    search(
+      queries: {
         indexName: string;
-        /**
-         * Object
-         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-         */
-        body: {};
-    }
-    /**
-     * Describes the option used when creating user key
-     */
-    interface AlgoliaUserKeyOptions {
-        /**
-         * Add a validity period. The key will be valid for a specific period of time (in seconds).
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        validity?: number;
-        /**
-         * Specify the maximum number of API calls allowed from an IP address per hour
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        maxQueriesPerIPPerHour?: number;
-        /**
-         * Specify the maximum number of hits this API key can retrieve in one call
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        maxHitsPerQuery?: boolean;
-        /**
-         * Specify the list of targeted indices
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        indexes?: string[];
-        /**
-         * Specify the list of referers
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        referers?: string[];
-        /**
-         * Specify the list of query parameters
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        queryParameters?: AlgoliaQueryParameters;
-        /**
-         * Specify a description to describe where the key is used.
-         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-         */
-        description?: string;
-    }
-    /**
-     * Describes option used when making operation on synonyms
-     */
-    interface SynonymOption {
-        /**
-         * You can forward all settings updates to the slaves of an index
-         * https://github.com/algolia/algoliasearch-client-js#slave-settings
-         */
-        forwardToSlaves?: boolean;
-        /**
-         * Replace all existing synonyms on the index with the content of the batch
-         * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
-         */
-        replaceExistingSynonyms?: boolean;
-    }
-    /**
-     * Describes options used when searching for synonyms
-     */
-    interface SearchSynonymOptions {
-        /**
-         * The actual search query to find synonyms
-         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-         */
-        query?: string;
-        /**
-         * The page to fetch when browsing through several pages of results
-         * default: 100
-         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-         */
-        page?: number;
-        /**
-         * Restrict the search to a specific type of synonym
-         * Use an empty string to search all types (default behavior)
-         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-         */
-            type?: string;
-        /**
-         * Number of hits per page
-         * default: 100
-         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-         */
-        hitsPerPage?: number;
-    }
-    interface AlgoliaBrowseResponse {
-        cursor?: string;
-        hits: any[];
-        params: string;
         query: string;
-        processingTimeMS: number;
-    }
+        params: AlgoliaQueryParameters;
+      }[],
+      cb: (err: Error, res: AlgoliaMultiResponse) => void
+    ): void;
     /**
-     * Describes a synonym object
+     * Query on multiple index
+     * @param queries index name, query and query parameters
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
      */
-    interface AlgoliaSynonym {
+    search(queries: {
+      indexName: string;
+      query: string;
+      params: AlgoliaQueryParameters;
+    }[]): Promise<AlgoliaMultiResponse>;
+    /**
+     * clear browser cache
+     * https://github.com/algolia/algoliasearch-client-js#cache
+     */
+    clearCache(): void;
+    /**
+     * kill alive connections
+     * https://github.com/algolia/algoliasearch-client-js#keep-alive
+     */
+    destroy(): void;
+    /**
+     * Add a header to be sent with all upcoming requests
+     */
+    setExtraHeader(name: string, value: string): void;
+    /**
+     * Get the value of an extra header
+     */
+    getExtraHeader(name: string): string;
+    /**
+     * remove an extra header for all upcoming requests
+     */
+    unsetExtraHeader(name: string): void;
+    /**
+     * List all your indices along with their associated information (number of entries, disk size, etc.)
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
+     */
+    listIndexes(cb: (err: Error, res: any) => void): void;
+    /**
+     * List all your indices along with their associated information (number of entries, disk size, etc.)
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
+     */
+    listIndexes(): Promise<any>;
+    /**
+     * Delete a specific index
+     * @param name
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
+     */
+    deleteIndex(name: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Delete a specific index
+     * @param name
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
+     */
+    deleteIndex(name: string): Promise<any>;
+    /**
+     * Copy an  index from a specific index to a new one
+     * @param from origin index
+     * @param to destination index
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
+     */
+    copyIndex(
+      from: string,
+      to: string,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Copy an  index from a specific index to a new one
+     * @param from origin index
+     * @param to destination index
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
+     */
+    copyIndex(from: string, to: string): Promise<any>;
+    /**
+     * Move index to a new one (and will overwrite the original one)
+     * @param from origin index
+     * @param to destination index
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
+     */
+    moveIndex(
+      from: string,
+      to: string,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Move index to a new one (and will overwrite the original one)
+     * @param from origin index
+     * @param to destination index
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
+     */
+    moveIndex(from: string, to: string): Promise<any>;
+    /**
+     * Generate a public API key
+     * @param key api key
+     * @param filters
+     * https://github.com/algolia/algoliasearch-client-js#generate-key---generatesecuredapikey
+     */
+    generateSecuredApiKey(
+      key: string,
+      filters: AlgoliaSecuredApiOptions
+    ): string;
+    /**
+     * Perform multiple operations with one API call to reduce latency
+     * @param action
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+     */
+    batch(action: AlgoliaAction[], cb: (err: Error, res: any) => void): void;
+    /**
+     * Perform multiple operations with one API call to reduce latency
+     * @param action
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+     */
+    batch(action: AlgoliaAction[]): Promise<any>;
+    /**
+     * Lists global API Keys
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+     */
+    listApiKeys(cb: (err: Error, res: any) => void): void;
+    /**
+     * Lists global API Keys
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+     */
+    listApiKeys(): Promise<any>;
+    /**
+     * Add global API Keys
+     * @param scopes
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    addApiKey(scopes: string[], cb: (err: Error, res: any) => void): void;
+    /**
+     * Add global API Key
+     * @param scopes
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    addApiKey(
+      scopes: string[],
+      options: AlgoliaApiKeyOptions,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Add global API Keys
+     * @param scopes
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    addApiKey(scopes: string[], options?: AlgoliaApiKeyOptions): Promise<any>;
+    /**
+     * Update global API key
+     * @param key
+     * @param scopes
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    updateApiKey(
+      key: string,
+      scopes: string[],
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Update global API key
+     * @param key
+     * @param scopes
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    updateApiKey(
+      key: string,
+      scopes: string[],
+      options: AlgoliaApiKeyOptions,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Update global API key
+     * @param key
+     * @param scopes
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    updateApiKey(
+      key: string,
+      scopes: string[],
+      options?: AlgoliaApiKeyOptions
+    ): Promise<any>;
+    /**
+     * Gets the rights of a global key
+     * @param key
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    getApiKey(key: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Gets the rights of a global key
+     * @param key
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    getApiKey(key: string): Promise<any>;
+    /**
+     * Deletes a global key
+     * @param key
+     * @param cb(err,res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteapikey
+     */
+    deleteApiKey(key: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Deletes a global key
+     * @param key
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteapikey
+     */
+    deleteApiKey(key: string): Promise<any>;
+    /**
+     * Get 1000 last events
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+     */
+    getLogs(options: LogsOptions, cb: (err: Error, res: any) => void): void;
+    /**
+     * Get 1000 last events
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+     */
+    getLogs(options: LogsOptions): Promise<any>;
+  }
+  /**
+   * Interface for the index algolia object
+   */
+  interface AlgoliaIndex {
+    /**
+     * Gets a specific object
+     * @param objectID
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+     */
+    getObject(objectID: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Gets specific attributes from an object
+     * @param objectID
+     * @param attributes
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+     */
+    getObject(
+      objectID: string,
+      attributes: string[],
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Gets a list of objects
+     * @param objectIDs
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+     */
+    getObjects(objectIDs: string[], cb: (err: Error, res: any) => void): void;
+    /**
+     * Add a specific object
+     * @param object without objectID
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+     */
+    addObject(object: {}, cb: (err: Error, res: any) => void): void;
+    /**
+     * Add a list of objects
+     * @param object with objectID
+     * @param objectID
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+     */
+    addObject(
+      object: {},
+      objectID: string,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Add list of objects
+     * @param objects
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+     */
+    addObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
+    /**
+     * Add or replace a specific object
+     * @param object
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    saveObject(object: {}, cb: (err: Error, res: any) => void): void;
+    /**
+     * Add or replace several objects
+     * @param objects
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    saveObjects(objects: object[], cb: (err: Error, res: any) => void): void;
+    /**
+     * Update parameters of a specific object
+     * @param object
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    partialUpdateObject(object: {}, cb: (err: Error, res: any) => void): void;
+    /**
+     * Update parameters of a list of objects
+     * @param objects
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    partialUpdateObjects(
+      objects: [{}],
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Delete a specific object
+     * @param objectID
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+     */
+    deleteObject(objectID: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Delete a list of objects
+     * @param objectIDs
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+     */
+    deleteObjects(
+      objectIDs: string[],
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Delete objects that matches the query
+     * @param query
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
+     */
+    deleteByQuery(query: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Delete objects that matches the query
+     * @param query
+     * @param params of the object
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
+     */
+    deleteByQuery(
+      query: string,
+      params: {},
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Delete objects that matches the query
+     * @param query
+     * @param params of the object
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deleteby
+     */
+    deleteBy(params: {}, cb: (err: Error, res: any) => void): void;
+    /**
+     * Wait for an indexing task to be compete
+     * @param taskID
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
+     */
+    waitTask(taskID: number, cb: (err: Error, res: any) => void): void;
+    /**
+     * Get an index settings
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
+     */
+    getSettings(cb: (err: Error, res: any) => void): void;
+    /**
+     * Set an index settings
+     * @param settings
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
+     */
+    setSettings(
+      settings: AlgoliaIndexSettings,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Clear cache of an index
+     * https://github.com/algolia/algoliasearch-client-js#cache
+     */
+    clearCache(): void;
+    /**
+     * Clear an index content
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
+     */
+    clearIndex(cb: (err: Error, res: any) => void): void;
+    /**
+     * Save a synonym object
+     * @param synonym
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+     */
+    saveSynonym(
+      synonym: AlgoliaSynonym,
+      options: SynonymOption,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Save a synonym object
+     * @param synonyms
+     * @param options
+     * @param cb(err, res)
+     */
+    batchSynonyms(
+      synonyms: AlgoliaSynonym[],
+      options: SynonymOption,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Delete a specific synonym
+     * @param identifier
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
+     */
+    deleteSynonym(
+      identifier: string,
+      options: SynonymOption,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Clear all synonyms of an index
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
+     */
+    clearSynonyms(
+      options: SynonymOption,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Get a specific synonym
+     * @param identifier
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
+     */
+    getSynonym(identifier: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Search a synonyms
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+     */
+    searchSynonyms(
+      options: SearchSynonymOptions,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Save a rule object
+     * @param rule
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#save-rule---saverule
+     */
+    saveRule(
+      rule: AlgoliaRule,
+      options: RuleOption,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Save a rule object
+     * @param rules
+     * @param options
+     * @param cb(err, res)
+     */
+    batchRules(
+      rules: AlgoliaRule[],
+      options: RuleOption,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Delete a specific rule
+     * @param identifier
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#batch-rules---batchrules
+     */
+    deleteRule(
+      identifier: string,
+      options: RuleOption,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Clear all rules of an index
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#clear-all-rules---clearrules
+     */
+    clearRules(options: RuleOption, cb: (err: Error, res: any) => void): void;
+    /**
+     * Get a specific rule
+     * @param identifier
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#get-rule---getrule
+     */
+    getRule(identifier: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Search a rules
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#search-rules---searchrules
+     */
+    searchRules(
+      options: SearchRuleOptions,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * List index user keys
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
+     */
+    listApiKeys(cb: (err: Error, res: any) => void): void;
+    /**
+     * Add key for this index
+     * @param scopes
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    addApiKey(scopes: string[], cb: (err: Error, res: any) => void): void;
+    /**
+     * Add key for this index
+     * @param scopes
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    addApiKey(
+      scopes: string[],
+      options: AlgoliaApiKeyOptions,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Update a key for this index
+     * @param key
+     * @param scopes
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    updateApiKey(
+      key: string,
+      scopes: string[],
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Update a key for this index
+     * @param key
+     * @param scopes
+     * @param options
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    updateApiKey(
+      key: string,
+      scopes: string[],
+      options: AlgoliaApiKeyOptions,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Gets the rights of an index specific key
+     * @param key
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getapikeyacl
+     */
+    getApiKey(key: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Deletes an index specific key
+     * @param key
+     * @param cb(err, res)
+     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteapikey
+     */
+    deleteApiKey(key: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Gets specific attributes from an object
+     * @param objectID
+     * @param attributes
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+     */
+    getObject(objectID: string, attributes?: string[]): Promise<any>;
+    /**
+     * Gets a list of objects
+     * @param objectIDs
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+     */
+    getObjects(objectIDs: string[]): Promise<any>;
+    /**
+     * Add a list of objects
+     * @param object with objectID
+     * @param objectID
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+     */
+    addObject(object: {}, objectID?: string): Promise<any>;
+    /**
+     * Add list of objects
+     * @param objects
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+     */
+    addObjects(objects: [{}]): Promise<any>;
+    /**
+     * Add or replace a specific object
+     * @param object
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    saveObject(object: {}): Promise<any>;
+    /**
+     * Add or replace several objects
+     * @param objects
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    saveObjects(objects: object[]): Promise<any>;
+    /**
+     * Update parameters of a specific object
+     * @param object
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    partialUpdateObject(object: {}): Promise<any>;
+    /**
+     * Update parameters of a list of objects
+     * @param objects
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+     */
+    partialUpdateObjects(objects: [{}]): Promise<any>;
+    /**
+     * Delete a specific object
+     * @param objectID
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+     */
+    deleteObject(objectID: string): Promise<any>;
+    /**
+     * Delete a list of objects
+     * @param objectIDs
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+     */
+    deleteObjects(objectIDs: string[]): Promise<any>;
+    /**
+     * Delete objects that matches the query
+     * @param query
+     * @param params of the object
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
+     */
+    deleteByQuery(query: string, params?: {}): Promise<any>;
+    /**
+     * Delete objects that matches the query
+     * @param params of the search
+     * return {Promise}
+     * https://www.algolia.com/doc/api-reference/api-methods/delete-by-query/
+     */
+    deleteBy(params: {}): Promise<any>;
+    /**
+     * Wait for an indexing task to be compete
+     * @param taskID
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
+     */
+    waitTask(taskID: number): Promise<any>;
+    /**
+     * Get an index settings
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
+     */
+    getSettings(): Promise<any>;
+    /**
+     * Set an index settings
+     * @param settings
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
+     */
+    setSettings(settings: AlgoliaIndexSettings): Promise<any>;
+    /**
+     * Search in an index
+     * @param params query parameter
+     * return {Promise}
+     * @param err() error callback
+     * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
+     */
+    search(params: AlgoliaQueryParameters): Promise<AlgoliaResponse>;
+    /**
+     * Search in an index
+     * @param params query parameter
+     * @param cb(err, res)
+     * @param err() error callback
+     * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
+     */
+    search(
+      params: AlgoliaQueryParameters,
+      cb: (err: Error, res: AlgoliaResponse) => void
+    ): void;
+    /**
+     * Search in an index
+     * @param params query parameter
+     * return {Promise}
+     * @param err() error callback
+     * https://www.algolia.com/doc/api-reference/api-methods/search-for-facet-values/
+     */
+    searchForFacetValues({
+      facetName,
+      facetQuery,
+      ...qp,
+    }: {
+      facetName: string;
+      facetQuery: string;
+    } & AlgoliaQueryParameters): Promise<any>;
+    /**
+     * Search in an index
+     * @param params query parameter
+     * @param cb(err, res)
+     * @param err() error callback
+     * https://www.algolia.com/doc/api-reference/api-methods/search-for-facet-values/
+     */
+    searchForFacetValues(
+      {
+        facetName,
+        facetQuery,
+        ...qp,
+      }: {
+        facetName: string;
+        facetQuery: string;
+      } & AlgoliaQueryParameters,
+      cb: (err: Error, res: any) => void
+    ): void;
+    /**
+     * Browse an index
+     * @param query
+     * @param cb(err, content)
+     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+     */
+    browse(query: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Browse an index
+     * @param query
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+     */
+    browse(query: string): Promise<AlgoliaBrowseResponse>;
+    /**
+     * Browse an index from a cursor
+     * @param cursor
+     * @param cb(err, content)
+     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+     */
+    browseFrom(cursor: string, cb: (err: Error, res: any) => void): void;
+    /**
+     * Browse an index from a cursor
+     * @param cursor
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+     */
+    browseFrom(cursor: string): Promise<AlgoliaBrowseResponse>;
+    /**
+     * Browse an entire index
+     * return Promise
+     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+     */
+    browseAll(): Promise<AlgoliaResponse>;
+    /**
+     * Clear an index content
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
+     */
+    clearIndex(): Promise<any>;
+    /**
+     * Save a synonym object
+     * @param synonym
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+     */
+    saveSynonym(synonym: AlgoliaSynonym, options: SynonymOption): Promise<any>;
+    /**
+     * Save a synonym object
+     * @param synonyms
+     * @param options
+     * return {Promise}
+     */
+    batchSynonyms(
+      synonyms: AlgoliaSynonym[],
+      options: SynonymOption
+    ): Promise<any>;
+    /**
+     * Delete a specific synonym
+     * @param identifier
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
+     */
+    deleteSynonym(identifier: string, options: SynonymOption): Promise<any>;
+    /**
+     * Clear all synonyms of an index
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
+     */
+    clearSynonyms(options: SynonymOption): Promise<any>;
+    /**
+     * Get a specific synonym
+     * @param identifier
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
+     */
+    getSynonym(identifier: string): Promise<any>;
+    /**
+     * Search a synonyms
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+     */
+    searchSynonyms(options: SearchSynonymOptions): Promise<any>;
+    /**
+     * Save a rule object
+     * @param rule
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#save-rule---saverule
+     */
+    saveRule(rule: AlgoliaRule, options: RuleOption): Promise<any>;
+    /**
+     * Save a rule object
+     * @param rules
+     * @param options
+     * return {Promise}
+     */
+    batchRules(rules: AlgoliaRule[], options: RuleOption): Promise<any>;
+    /**
+     * Delete a specific rule
+     * @param identifier
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#batch-rules---batchrules
+     */
+    deleteRule(identifier: string, options: RuleOption): Promise<any>;
+    /**
+     * Clear all query rules of an index
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#clear-all-rules---clearrules
+     */
+    clearRules(options: RuleOption): Promise<any>;
+    /**
+     * Get a specific query rule
+     * @param identifier
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#get-rule---getrule
+     */
+    getRule(identifier: string): Promise<any>;
+    /**
+     * Search for query rules
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#search-rules---searchrules
+     */
+    searchRules(options: SearchRuleOptions): Promise<any>;
+    /**
+     * List index user keys
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
+     */
+    listApiKeys(): Promise<any>;
+    /**
+     * Add key for this index
+     * @param scopes
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    addApiKey(scopes: string[], options?: AlgoliaApiKeyOptions): Promise<any>;
+    /**
+     * Update a key for this index
+     * @param key
+     * @param scopes
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    updateApiKey(key: string, scopes: string[]): Promise<any>;
+    /**
+     * Update a key for this index
+     * @param key
+     * @param scopes
+     * @param options
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateapikey
+     */
+    updateApiKey(
+      key: string,
+      scopes: string[],
+      options: AlgoliaApiKeyOptions
+    ): Promise<any>;
+    /**
+     * Gets the rights of an index specific key
+     * @param key
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getapikeyacl
+     */
+    getApiKey(key: string): Promise<any>;
+    /**
+     * Deletes an index specific key
+     * @param key
+     * return {Promise}
+     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteapikey
+     */
+    deleteApiKey(key: string): Promise<any>;
+  }
+  /*
+Interface describing available options when initializing a client
+*/
+  interface ClientOptions {
+    /**
+     * Timeout for requests to our servers, in milliseconds
+     * default: 15s (node), 2s (browser)
+     * https://github.com/algolia/algoliasearch-client-js#client-options
+     */
+    timeout?: number;
+    /**
+     * Protocol to use when communicating with algolia
+     * default: current protocol(browser), https(node)
+     * https://github.com/algolia/algoliasearch-client-js#client-options
+     */
+    protocol?: string;
+    /**
+     * (node only) httpAgent instance to use when communicating with Algolia servers.
+     * https://github.com/algolia/algoliasearch-client-js#client-options
+     */
+    httpAgent?: any;
+    /**
+     * read: array of read hosts to use to call Algolia servers, computed automatically
+     * write: array of read hosts to use to call Algolia servers, computed automatically
+     * https://github.com/algolia/algoliasearch-client-js#client-options
+     */
+    hosts?: { read?: string[]; write?: string[] };
+  }
+  /*
+Interface describing options available for gettings the logs
+*/
+  interface LogsOptions {
+    /**
+     * Specify the first entry to retrieve (0-based, 0 is the most recent log entry).
+     * default: 0
+     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+     */
+    offset?: number;
+    /**
+     * Specify the maximum number of entries to retrieve starting at the offset.
+     * default: 10
+     * maximum: 1000
+     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+     */
+    length?: number;
+    /**
+     * @deprecated
+     * Retrieve only logs with an HTTP code different than 200 or 201
+     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+     */
+    onlyErrors?: boolean;
+    /**
+     * Specify the type of logs to retrieve
+     * 'query' Retrieve only the queries
+     * 'build' Retrieve only the build operations
+     * 'error' Retrieve only the errors (same as onlyErrors parameters)
+     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+     */
+    type?: string;
+  }
+  /**
+   * Describe the action object used for batch operation
+   */
+  interface AlgoliaAction {
+    /**
+     * Type of the batch action
+     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+     */
+    action:
+      | 'addObject'
+      | 'updateObject'
+      | 'partialUpdateObject'
+      | 'partialUpdateObjectNoCreate'
+      | 'deleteObject'
+      | 'delete'
+      | 'clear';
+    /**
+     * Name of the index where the bact will be performed
+     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+     */
+    indexName: string;
+    /**
+     * Object
+     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+     */
+    body: {};
+  }
+  /**
+   * Describes the option used when creating user key
+   */
+  interface AlgoliaApiKeyOptions {
+    /**
+     * Add a validity period. The key will be valid for a specific period of time (in seconds).
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    validity?: number;
+    /**
+     * Specify the maximum number of API calls allowed from an IP address per hour
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    maxQueriesPerIPPerHour?: number;
+    /**
+     * Specify the maximum number of hits this API key can retrieve in one call
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    maxHitsPerQuery?: boolean;
+    /**
+     * Specify the list of targeted indices
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    indexes?: string[];
+    /**
+     * Specify the list of referers
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    referers?: string[];
+    /**
+     * Specify the list of query parameters
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    queryParameters?: AlgoliaQueryParameters;
+    /**
+     * Specify a description to describe where the key is used.
+     * https://github.com/algolia/algoliasearch-client-js#add-user-key---addapikey
+     */
+    description?: string;
+  }
+  /**
+   * Describes option used when making operation on synonyms
+   */
+  interface SynonymOption {
+    /**
+     * You can forward all settings updates to the replicas of an index
+     * https://github.com/algolia/algoliasearch-client-js#replica-settings
+     */
+    forwardToReplicas?: boolean;
+    /**
+     * Replace all existing synonyms on the index with the content of the batch
+     * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
+     */
+    replaceExistingSynonyms?: boolean;
+  }
+  /**
+   * Describes options used when searching for synonyms
+   */
+  interface SearchSynonymOptions {
+    /**
+     * The actual search query to find synonyms
+     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+     */
+    query?: string;
+    /**
+     * The page to fetch when browsing through several pages of results
+     * default: 0
+     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+     */
+    page?: number;
+    /**
+     * Restrict the search to a specific type of synonym
+     * Use an empty string to search all types (default behavior)
+     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+     */
+    type?: string;
+    /**
+     * Number of hits per page
+     * default: 100
+     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+     */
+    hitsPerPage?: number;
+  }
+  /**
+   * Describes option used when making operation on query rules
+   */
+  interface RuleOption {
+    /**
+     * You can forward all settings updates to the replicas of an index
+     * https://github.com/algolia/algoliasearch-client-js#replica-settings
+     */
+    forwardToReplicas?: boolean;
+    /**
+     * Replace all existing query rules on the index with the content of the batch
+     */
+    clearExistingRules?: boolean;
+  }
+  /**
+   * Describes options used when searching for query rules
+   */
+  interface SearchRuleOptions {
+    /**
+     * The actual search query to find synonyms
+     */
+    query?: string;
+    /**
+     * When specified, restricts matches to rules with a specific anchoring type.
+     * When omitted, all anchoring types may match.
+     */
+    anchoring?: string;
+    /**
+     * When specified, restricts matches to contextual rules with a specific context (exact match).
+     * When omitted, any generic or contextual rule (with any context) may match.
+     */
+    context?: string;
+    /**
+     * Requested page (zero-based)
+     * default: 0
+     */
+    page?: number;
+    /**
+     * Number of hits per page
+     * default: 20
+     */
+    hitsPerPage?: number;
+  }
+  interface AlgoliaBrowseResponse {
+    cursor?: string;
+    hits: any[];
+    params: string;
+    query: string;
+    processingTimeMS: number;
+  }
+  /**
+   * Describes a synonym object
+   */
+  interface AlgoliaSynonym {
+    /**
+     * ObjectID of the synonym
+     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+     */
+    objectID: string;
+    /**
+     * Type of synonym
+     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+     */
+    type: 'synonym' | 'oneWaySynonym';
+    /**
+     * Values used for the synonym
+     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+     */
+    synonyms: string[];
+  }
+  /**
+   * Describes a query rule object
+   */
+  interface AlgoliaRule {
+    /**
+     * ObjectID of the synonym
+     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+     */
+    objectID: string;
+    /**
+     * Condition of the rule
+     */
+    condition: {
+      /**
+       * Query pattern
+       * syntax: https://www.algolia.com/doc/rest-api/query-rules/?language=php#query-pattern-syntax
+       */
+      pattern: string;
+      /**
+       * Whether the pattern must match the beginning or the end of the query string, or both, or none.
+       */
+      anchoring: 'is' | 'startsWith' | 'endsWith' | 'contains';
+      /**
+       * Rule context (format: [A-Za-z0-9_-]+).
+       * When specified, the rule is contextual and applies only when the same context is specified
+       * at query time (using the ruleContexts parameter).
+       * When absent, the rule is generic and always applies
+       * (provided that its other conditions are met, of course).
+       */
+      context?: string;
+    };
+    /**
+     * Consequence of the rule. At least one of the following must be used:
+     */
+    consequence: {
+      params?: {
         /**
-         * ObjectID of the synonym
-         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+         * When a string, it replaces the entire query string.
+         * When an object, describes incremental edits to be made to the query string.
+         */
+        query?:
+          | string
+          | {
+              /**
+               * Tokens (literals or placeholders) from the query pattern
+               * that should be removed from the query string.
+               */
+              remove: string[];
+            };
+        /**
+         * Names of facets to which automatic filtering must be applied;
+         * they must match the facet name of a facet value placeholder in the query pattern.
+         */
+        automaticFacetFilters?: string[];
+        /**
+         * Same as automaticFacetFilters, but for optionalFacetFilters.
+         * The same syntax as query parameters can be used to specify a score: facetName<score=1>.
+         */
+        automaticOptionalFacetFilters?: string[];
+      };
+      /**
+       * Objects to promote as hits. Each object must contain the following fields
+       */
+      promote?: {
+        /**
+         * Unique identifier of the object to promote
          */
         objectID: string;
         /**
-         * Type of synonym
-         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+         *  Promoted rank for the object (zero-based)
          */
-            type: "synonym" | "oneWaySynonym";
-        /**
-         * Values used for the synonym
-         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-         */
-        synonyms: string[];
-    }
+        position: number;
+      }[];
+      /**
+       *  Custom JSON object that will be appended to the userData array in the response.
+       * This object is not interpreted by the API. It is limited to 1kB of minified JSON.
+       */
+      userData?: {};
+    };
     /**
-     * Describes the options used when generating new api keys
+     * This field is intended for rule management purposes,
+     * in particular to ease searching for rules and presenting them to human readers.
+     * It is not interpreted by the API.
      */
-    interface AlgoliaSecuredApiOptions {
-        /**
-         * Filter the query with numeric, facet or/and tag filters
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#filters-1
-         */
-        filters?: string;
-        /**
-         * Defines the expiration date of the API key
-         * https://github.com/algolia/algoliasearch-client-js#valid-until
-         */
-        validUntil?: number;
-        /**
-         * Restricts the key to a list of index names allowed for the secured API key
-         * https://github.com/algolia/algoliasearch-client-js#index-restriction
-         */
-        restrictIndices?: string;
-        /**
-         * Allows you to restrict a single user to performing a maximum of N API calls per hour
-         * https://github.com/algolia/algoliasearch-client-js#user-rate-limiting
-         */
-        userToken?: string;
-    }
-
+    description?: string;
+  }
+  /**
+   * Describes the options used when generating new api keys
+   */
+  interface AlgoliaSecuredApiOptions {
     /**
-     * Describes the settings available for configure your index
+     * Filter the query with numeric, facet or/and tag filters
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#filters-1
      */
-    interface AlgoliaIndexSettings {
-        /**
-         * The list of attributes you want index
-         * default: *
-         * https://github.com/algolia/algoliasearch-client-js#attributestoindex
-         */
-        attributesToIndex?: string[];
-        /**
-         * The list of attributes you want to use for faceting
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#attributesforfaceting
-         */
-        attributesForFaceting?: string[];
-        /**
-         * The list of attributes that cannot be retrieved at query time
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#unretrievableattributes
-         */
-        unretrievableAttributes?: string[];
-        /**
-         * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer
-         * default: *
-         * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
-         */
-        attributesToRetrieve?: string[];
-        /**
-         * Controls the way results are sorted
-         * default: ['typo', 'geo', 'words', 'filters', 'proximity', 'attribute', 'exact', 'custom']
-         * https://github.com/algolia/algoliasearch-client-js#ranking
-         */
-        ranking?: string[];
-        /**
-         * Lets you specify part of the ranking
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#customranking
-         */
-        customRanking?: string[];
-        /**
-         * The list of indices on which you want to replicate all write operations
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#slaves
-         */
-        slaves?: string[];
-        /**
-         * Limit the number of facet values returned for each facet
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
-         */
-        maxValuesPerFacet?: string;
-        /**
-         * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
-         */
-        attributesToHighlight?: string[];
-        /**
-         * Default list of attributes to snippet alongside the number of words to return
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
-         */
-        attributesToSnippet?: string[];
-        /**
-         * Specify the string that is inserted before the highlighted parts in the query result
-         * default: <em>
-         * https://github.com/algolia/algoliasearch-client-js#highlightpretag
-         */
-        highlightPreTag?: string;
-        /**
-         * Specify the string that is inserted after the highlighted parts in the query result
-         * default: </em>
-         * https://github.com/algolia/algoliasearch-client-js#highlightposttag
-         */
-        highlightPostTag?: string;
-        /**
-         * String used as an ellipsis indicator when a snippet is truncated.
-         * default: …
-         * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
-         */
-        snippetEllipsisText?: string;
-        /**
-         * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
-         */
-        restrictHighlightAndSnippetArrays?: boolean;
-        /**
-         * Pagination parameter used to select the number of hits per page
-         * default: 20
-         * https://github.com/algolia/algoliasearch-client-js#hitsperpage
-         */
-        hitsPerPage?: number;
-        /**
-         * The minimum number of characters needed to accept one typo
-         * default: 4
-         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
-         */
-        minWordSizefor1Typo?: number;
-        /**
-         * The minimum number of characters needed to accept two typos.
-         * default: 8
-         * https://github.com/algolia/algoliasearch-client-js#highlightposttag
-         */
-        minWordSizefor2Typos?: number;
-        /**
-         * This option allows you to control the number of typos allowed in the result set
-         * default: true
-         * 'true' The typo tolerance is enabled and all matching hits are retrieved (default behavior).
-         * 'false' The typo tolerance is disabled. All results with typos will be hidden.
-         * 'min' Only keep results with the minimum number of typos. For example, if one result matches without typos, then all results with typos will be hidden.
-         * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
-         * https://github.com/algolia/algoliasearch-client-js#typotolerance
-         */
-        typoTolerance?: any;
-        /**
-         * If set to false, disables typo tolerance on numeric tokens (numbers).
-         * default: true
-         * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
-         */
-        allowTyposOnNumericTokens?: boolean;
-        /**
-         * If set to true, plural won't be considered as a typo
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
-         */
-        ignorePlurals?: boolean;
-        /**
-         * List of attributes on which you want to disable typo tolerance
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
-         */
-        disableTypoToleranceOnAttributes?: string;
-        /**
-         * Specify the separators (punctuation characters) to index.
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#separatorstoindex
-         */
-        separatorsToIndex?: string;
-        /**
-         * Selects how the query words are interpreted
-         * default: 'prefixLast'
-         * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
-         * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
-         * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
-         * https://github.com/algolia/algoliasearch-client-js#querytype
-         */
-        queryType?: any;
-        /**
-         * This option is used to select a strategy in order to avoid having an empty result page
-         * default: 'none'
-         * 'lastWords' When a query does not return any results, the last word will be added as optional
-         * 'firstWords' When a query does not return any results, the first word will be added as optional
-         * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
-         * 'none' No specific processing is done when a query does not return any results
-         * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
-         */
-        removeWordsIfNoResults?: string;
-        /**
-         * Enables the advanced query syntax
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
-         */
-        advancedSyntax?: boolean;
-        /**
-         * A string that contains the comma separated list of words that should be considered as optional when found in the query
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#optionalwords
-         */
-        optionalWords?: string[];
-        /**
-         * Remove stop words from the query before executing it
-         * default: false
-         * true|false: enable or disable stop words for all 41 supported languages; or
-         * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
-         * https://github.com/algolia/algoliasearch-client-js#removestopwords
-         */
-        removeStopWords?: string[];
-        /**
-         * List of attributes on which you want to disable prefix matching
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#disableprefixonattributes
-         */
-        disablePrefixOnAttributes?: string[];
-        /**
-         * List of attributes on which you want to disable the computation of exact criteria
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
-         */
-        disableExactOnAttributes?: string[];
-        /**
-         * This parameter control how the exact ranking criterion is computed when the query contains one word
-         * default: attribute
-         * 'none': no exact on single word query
-         * 'word': exact set to 1 if the query word is found in the record
-         * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
-         * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
-         */
-        exactOnSingleWordQuery?: string;
-        /**
-         * Specify the list of approximation that should be considered as an exact match in the ranking formula
-         * default: ['ignorePlurals', 'singleWordSynonym']
-         * 'ignorePlurals': alternative words added by the ignorePlurals feature
-         * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
-         * 'multiWordsSynonym': multiple-words synonym
-         * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
-         */
-        alternativesAsExact?: any;
-        /**
-         * The name of the attribute used for the Distinct feature
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#attributefordistinct
-         */
-        attributeForDistinct?: string;
-        /**
-         * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
-         * https://github.com/algolia/algoliasearch-client-js#distinct
-         */
-        distinct?: any;
-        /**
-         * All numerical attributes are automatically indexed as numerical filters
-         * default ''
-         * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
-         */
-        numericAttributesToIndex?: string[];
-        /**
-         * Allows compression of big integer arrays.
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#allowcompressionofintegerarray
-         */
-        allowCompressionOfIntegerArray?: boolean;
-        /**
-         * Specify alternative corrections that you want to consider.
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#altcorrections
-         */
-        altCorrections?: [{}];
-        /**
-         * Configure the precision of the proximity ranking criterion
-         * default: 1
-         * https://github.com/algolia/algoliasearch-client-js#minproximity
-         */
-        minProximity?: number;
-        /**
-         * This is an advanced use-case to define a token substitutable by a list of words without having the original token searchable
-         * default: ''
-         * https://github.com/algolia/algoliasearch-client-js#placeholders
-         */
-        placeholders?: any;
-    }
+    filters?: string;
+    /**
+     * Defines the expiration date of the API key
+     * https://github.com/algolia/algoliasearch-client-js#valid-until
+     */
+    validUntil?: number;
+    /**
+     * Restricts the key to a list of index names allowed for the secured API key
+     * https://github.com/algolia/algoliasearch-client-js#index-restriction
+     */
+    restrictIndices?: string;
+    /**
+     * Allows you to restrict a single user to performing a maximum of N API calls per hour
+     * https://github.com/algolia/algoliasearch-client-js#user-rate-limiting
+     */
+    userToken?: string;
+  }
 
-    interface AlgoliaQueryParameters {
-        /**
-         * Query string used to perform the search
-         * default: ''
-         * https://github.com/algolia/algoliasearch-client-js#query
-         */
-        query?: string;
-        /**
-         * Filter the query with numeric, facet or/and tag filters
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#filters
-         */
-        filters?: string;
-        /**
-         * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer.
-         * default: *
-         * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
-         */
-        attributesToRetrieve?: string[];
-        /**
-         * List of attributes you want to use for textual search
-         * default: attributeToIndex
-         * https://github.com/algolia/algoliasearch-client-js#restrictsearchableattributes
-         */
-        restrictSearchableAttributes?: string[];
-        /**
-         * You can use facets to retrieve only a part of your attributes declared in attributesForFaceting attributes
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#facets
-         */
-        facets?: string;
-        /**
-         * Limit the number of facet values returned for each facet.
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
-         */
-        maxValuesPerFacet?: string;
-        /**
-         * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
-         */
-        attributesToHighlight?: string[];
-        /**
-         * Default list of attributes to snippet alongside the number of words to return
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
-         */
-        attributesToSnippet?: string[];
-        /**
-         * Specify the string that is inserted before the highlighted parts in the query result
-         * default: <em>
-         * https://github.com/algolia/algoliasearch-client-js#highlightpretag
-         */
-        highlightPreTag?: string;
-        /**
-         * Specify the string that is inserted after the highlighted parts in the query result
-         * default: </em>
-         * https://github.com/algolia/algoliasearch-client-js#highlightposttag
-         */
-        highlightPostTag?: string;
-        /**
-         * String used as an ellipsis indicator when a snippet is truncated.
-         * default: …
-         * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
-         */
-        snippetEllipsisText?: string;
-        /**
-         * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
-         */
-        restrictHighlightAndSnippetArrays?: boolean;
-        /**
-         * Pagination parameter used to select the number of hits per page
-         * default: 20
-         * https://github.com/algolia/algoliasearch-client-js#hitsperpage
-         */
-        hitsPerPage?: number;
-        /**
-         * Pagination parameter used to select the page to retrieve.
-         * default: 0
-         * https://github.com/algolia/algoliasearch-client-js#page
-         */
-        page?: number;
-        /**
-         * Offset of the first hit to return
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#offset
-         */
-        offset?: number;
-        /**
-         * Number of hits to return.
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#length
-         */
-        length?: number;
-        /**
-         * The minimum number of characters needed to accept one typo.
-         * default: 4
-         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
-         */
-        minWordSizefor1Typo?: number;
-        /**
-         * The minimum number of characters needed to accept two typo.
-         * fault: 8
-         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
-         */
-        minWordSizefor2Typos?: number;
-        /**
-         * This option allows you to control the number of typos allowed in the result set:
-         * default: true
-         * 'true' The typo tolerance is enabled and all matching hits are retrieved
-         * 'false' The typo tolerance is disabled. All results with typos will be hidden.
-         * 'min' Only keep results with the minimum number of typos
-         * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
-         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
-         */
-        typoTolerance?: boolean;
-        /**
-         * If set to false, disables typo tolerance on numeric tokens (numbers).
-         * default:
-         * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
-         */
-        allowTyposOnNumericTokens?: boolean;
-        /**
-         * If set to true, plural won't be considered as a typo
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
-         */
-        ignorePlurals?: boolean;
-        /**
-         * List of attributes on which you want to disable typo tolerance
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
-         */
-        disableTypoToleranceOnAttributes?: string;
-        /**
-         * Search for entries around a given location
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#aroundlatlng
-         */
-        aroundLatLng?: string;
-        /**
-         * Search for entries around a given latitude/longitude automatically computed from user IP address.
-         * default: ""
-         * https://github.com/algolia/algoliasearch-client-js#aroundlatlngviaip
-         */
-        aroundLatLngViaIP?: string;
-        /**
-         * Control the radius associated with a geo search. Defined in meters.
-         * default: null
-         * You can specify aroundRadius=all if you want to compute the geo distance without filtering in a geo area
-         * https://github.com/algolia/algoliasearch-client-js#aroundradius
-         */
-        aroundRadius?: any;
-        /**
-         * Control the precision of a geo search
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#aroundprecision
-         */
-        aroundPrecision?: number;
-        /**
-         * Define the minimum radius used for a geo search when aroundRadius is not set.
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#minimumaroundradius
-         */
-        minimumAroundRadius?: number;
-        /**
-         * Search entries inside a given area defined by the two extreme points of a rectangle
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#insideboundingbox
-         */
-        insideBoundingBox?: string;
-        /**
-         * Selects how the query words are interpreted
-         * default: 'prefixLast'
-         * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
-         * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
-         * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
-         * https://github.com/algolia/algoliasearch-client-js#querytype
-         */
-        queryType?: any;
-        /**
-         * Search entries inside a given area defined by a set of points
-         * defauly: ''
-         * https://github.com/algolia/algoliasearch-client-js#insidepolygon
-         */
-        insidePolygon?: string;
-        /**
-         * This option is used to select a strategy in order to avoid having an empty result page
-         * default: 'none'
-         * 'lastWords' When a query does not return any results, the last word will be added as optional
-         * 'firstWords' When a query does not return any results, the first word will be added as optional
-         * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
-         * 'none' No specific processing is done when a query does not return any results
-         * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
-         */
-        removeWordsIfNoResults?: string;
-        /**
-         * Enables the advanced query syntax
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
-         */
-        advancedSyntax?: boolean;
-        /**
-         * A string that contains the comma separated list of words that should be considered as optional when found in the query
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#optionalwords
-         */
-        optionalWords?: string[];
-        /**
-         * Remove stop words from the query before executing it
-         * default: false
-         * true|false: enable or disable stop words for all 41 supported languages; or
-         * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
-         * https://github.com/algolia/algoliasearch-client-js#removestopwords
-         */
-        removeStopWords?: string[];
-        /**
-         * List of attributes on which you want to disable the computation of exact criteria
-         * default: []
-         * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
-         */
-        disableExactOnAttributes?: string[];
-        /**
-         * This parameter control how the exact ranking criterion is computed when the query contains one word
-         * default: attribute
-         * 'none': no exact on single word query
-         * 'word': exact set to 1 if the query word is found in the record
-         * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
-         * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
-         */
-        exactOnSingleWordQuery?: string;
-        /**
-         * Specify the list of approximation that should be considered as an exact match in the ranking formula
-         * default: ['ignorePlurals', 'singleWordSynonym']
-         * 'ignorePlurals': alternative words added by the ignorePlurals feature
-         * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
-         * 'multiWordsSynonym': multiple-words synonym
-         * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
-         */
-        alternativesAsExact?: any;
-        /**
-         * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
-         * https://github.com/algolia/algoliasearch-client-js#distinct
-         */
-        distinct?: any;
-        /**
-         * If set to true, the result hits will contain ranking information in the _rankingInfo attribute.
-         * default: false
-         * https://github.com/algolia/algoliasearch-client-js#getrankinginfo
-         */
-        getRankingInfo?: boolean;
-        /**
-         * All numerical attributes are automatically indexed as numerical filters
-         * default: ''
-         * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
-         */
-        numericAttributesToIndex?: string[];
-        /**
-         * @deprecated please use filters instead
-         * A string that contains the comma separated list of numeric filters you want to apply.
-         * https://github.com/algolia/algoliasearch-client-js#numericfilters-deprecated
-         */
-        numericFilters?: string[];
-        /**
-         * @deprecated
-         * Filter the query by a set of tags.
-         * https://github.com/algolia/algoliasearch-client-js#tagfilters-deprecated
-         */
-        tagFilters?: string;
-        /**
-         * @deprecated
-         * Filter the query by a set of facets.
-         * https://github.com/algolia/algoliasearch-client-js#facetfilters-deprecated
-         */
-        facetFilters?: string;
-        /**
-         * If set to false, this query will not be taken into account in the analytics feature.
-         * default true
-         * https://github.com/algolia/algoliasearch-client-js#analytics
-         */
-        analytics?: boolean;
-        /**
-         * If set, tag your query with the specified identifiers
-         * default: null
-         * https://github.com/algolia/algoliasearch-client-js#analyticstags
-         */
-        analyticsTags?: string[];
-        /**
-         * If set to false, the search will not use the synonyms defined for the targeted index.
-         * default: true
-         * https://github.com/algolia/algoliasearch-client-js#synonyms
-         */
-        synonyms?: boolean;
-        /**
-         * If set to false, words matched via synonym expansion will not be replaced by the matched synonym in the highlighted result.
-         * default: true
-         * https://github.com/algolia/algoliasearch-client-js#replacesynonymsinhighlight
-         */
-        replaceSynonymsInHighlight?: boolean;
-        /**
-         * Configure the precision of the proximity ranking criterion
-         * default: 1
-         * https://github.com/algolia/algoliasearch-client-js#minproximity
-         */
-        minProximity?: number;
-    }
+  /**
+   * Describes the settings available for configure your index
+   */
+  interface AlgoliaIndexSettings {
+    /**
+     * The list of attributes you want index
+     * default: *
+     * https://github.com/algolia/algoliasearch-client-js#attributestoindex
+     */
+    attributesToIndex?: string[];
+    /**
+     * The list of attributes you want to use for faceting
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#attributesforfaceting
+     */
+    attributesForFaceting?: string[];
+    /**
+     * The list of attributes that cannot be retrieved at query time
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#unretrievableattributes
+     */
+    unretrievableAttributes?: string[];
+    /**
+     * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer
+     * default: *
+     * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
+     */
+    attributesToRetrieve?: string[];
+    /**
+     * Controls the way results are sorted
+     * default: ['typo', 'geo', 'words', 'filters', 'proximity', 'attribute', 'exact', 'custom']
+     * https://github.com/algolia/algoliasearch-client-js#ranking
+     */
+    ranking?: string[];
+    /**
+     * Lets you specify part of the ranking
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#customranking
+     */
+    customRanking?: string[];
+    /**
+     * The list of indices on which you want to replicate all write operations
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#replicas
+     */
+    replicas?: string[];
+    /**
+     * Limit the number of facet values returned for each facet
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
+     */
+    maxValuesPerFacet?: string;
+    /**
+     * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
+     */
+    attributesToHighlight?: string[];
+    /**
+     * Default list of attributes to snippet alongside the number of words to return
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
+     */
+    attributesToSnippet?: string[];
+    /**
+     * Specify the string that is inserted before the highlighted parts in the query result
+     * default: <em>
+     * https://github.com/algolia/algoliasearch-client-js#highlightpretag
+     */
+    highlightPreTag?: string;
+    /**
+     * Specify the string that is inserted after the highlighted parts in the query result
+     * default: </em>
+     * https://github.com/algolia/algoliasearch-client-js#highlightposttag
+     */
+    highlightPostTag?: string;
+    /**
+     * String used as an ellipsis indicator when a snippet is truncated.
+     * default: …
+     * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
+     */
+    snippetEllipsisText?: string;
+    /**
+     * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
+     */
+    restrictHighlightAndSnippetArrays?: boolean;
+    /**
+     * Pagination parameter used to select the number of hits per page
+     * default: 20
+     * https://github.com/algolia/algoliasearch-client-js#hitsperpage
+     */
+    hitsPerPage?: number;
+    /**
+     * The minimum number of characters needed to accept one typo
+     * default: 4
+     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
+     */
+    minWordSizefor1Typo?: number;
+    /**
+     * The minimum number of characters needed to accept two typos.
+     * default: 8
+     * https://github.com/algolia/algoliasearch-client-js#highlightposttag
+     */
+    minWordSizefor2Typos?: number;
+    /**
+     * This option allows you to control the number of typos allowed in the result set
+     * default: true
+     * 'true' The typo tolerance is enabled and all matching hits are retrieved (default behavior).
+     * 'false' The typo tolerance is disabled. All results with typos will be hidden.
+     * 'min' Only keep results with the minimum number of typos. For example, if one result matches without typos, then all results with typos will be hidden.
+     * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
+     * https://github.com/algolia/algoliasearch-client-js#typotolerance
+     */
+    typoTolerance?: any;
+    /**
+     * If set to false, disables typo tolerance on numeric tokens (numbers).
+     * default: true
+     * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
+     */
+    allowTyposOnNumericTokens?: boolean;
+    /**
+     * If set to true, plural won't be considered as a typo
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
+     */
+    ignorePlurals?: boolean;
+    /**
+     * List of attributes on which you want to disable typo tolerance
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
+     */
+    disableTypoToleranceOnAttributes?: string;
+    /**
+     * Specify the separators (punctuation characters) to index.
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#separatorstoindex
+     */
+    separatorsToIndex?: string;
+    /**
+     * Selects how the query words are interpreted
+     * default: 'prefixLast'
+     * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
+     * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
+     * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
+     * https://github.com/algolia/algoliasearch-client-js#querytype
+     */
+    queryType?: any;
+    /**
+     * This option is used to select a strategy in order to avoid having an empty result page
+     * default: 'none'
+     * 'lastWords' When a query does not return any results, the last word will be added as optional
+     * 'firstWords' When a query does not return any results, the first word will be added as optional
+     * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
+     * 'none' No specific processing is done when a query does not return any results
+     * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
+     */
+    removeWordsIfNoResults?: string;
+    /**
+     * Enables the advanced query syntax
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
+     */
+    advancedSyntax?: boolean;
+    /**
+     * A string that contains the comma separated list of words that should be considered as optional when found in the query
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#optionalwords
+     */
+    optionalWords?: string[];
+    /**
+     * Remove stop words from the query before executing it
+     * default: false
+     * true|false: enable or disable stop words for all 41 supported languages; or
+     * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
+     * https://github.com/algolia/algoliasearch-client-js#removestopwords
+     */
+    removeStopWords?: string[];
+    /**
+     * List of attributes on which you want to disable prefix matching
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#disableprefixonattributes
+     */
+    disablePrefixOnAttributes?: string[];
+    /**
+     * List of attributes on which you want to disable the computation of exact criteria
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
+     */
+    disableExactOnAttributes?: string[];
+    /**
+     * This parameter control how the exact ranking criterion is computed when the query contains one word
+     * default: attribute
+     * 'none': no exact on single word query
+     * 'word': exact set to 1 if the query word is found in the record
+     * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
+     * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
+     */
+    exactOnSingleWordQuery?: string;
+    /**
+     * Specify the list of approximation that should be considered as an exact match in the ranking formula
+     * default: ['ignorePlurals', 'singleWordSynonym']
+     * 'ignorePlurals': alternative words added by the ignorePlurals feature
+     * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
+     * 'multiWordsSynonym': multiple-words synonym
+     * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
+     */
+    alternativesAsExact?: any;
+    /**
+     * The name of the attribute used for the Distinct feature
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#attributefordistinct
+     */
+    attributeForDistinct?: string;
+    /**
+     * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
+     * https://github.com/algolia/algoliasearch-client-js#distinct
+     */
+    distinct?: any;
+    /**
+     * All numerical attributes are automatically indexed as numerical filters
+     * default ''
+     * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
+     */
+    numericAttributesToIndex?: string[];
+    /**
+     * Allows compression of big integer arrays.
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#allowcompressionofintegerarray
+     */
+    allowCompressionOfIntegerArray?: boolean;
+    /**
+     * Specify alternative corrections that you want to consider.
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#altcorrections
+     */
+    altCorrections?: [{}];
+    /**
+     * Configure the precision of the proximity ranking criterion
+     * default: 1
+     * https://github.com/algolia/algoliasearch-client-js#minproximity
+     */
+    minProximity?: number;
+    /**
+     * This is an advanced use-case to define a token substitutable by a list of words without having the original token searchable
+     * default: ''
+     * https://github.com/algolia/algoliasearch-client-js#placeholders
+     */
+    placeholders?: any;
+  }
+
+  interface AlgoliaQueryParameters {
+    /**
+     * Query string used to perform the search
+     * default: ''
+     * https://github.com/algolia/algoliasearch-client-js#query
+     */
+    query?: string;
+    /**
+     * Filter the query with numeric, facet or/and tag filters
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#filters
+     */
+    filters?: string;
+    /**
+     * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer.
+     * default: *
+     * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
+     */
+    attributesToRetrieve?: string[];
+    /**
+     * List of attributes you want to use for textual search
+     * default: attributeToIndex
+     * https://github.com/algolia/algoliasearch-client-js#restrictsearchableattributes
+     */
+    restrictSearchableAttributes?: string[];
+    /**
+     * You can use facets to retrieve only a part of your attributes declared in attributesForFaceting attributes
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#facets
+     */
+    facets?: string;
+    /**
+     * Limit the number of facet values returned for each facet.
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
+     */
+    maxValuesPerFacet?: string;
+    /**
+     * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
+     */
+    attributesToHighlight?: string[];
+    /**
+     * Default list of attributes to snippet alongside the number of words to return
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
+     */
+    attributesToSnippet?: string[];
+    /**
+     * Specify the string that is inserted before the highlighted parts in the query result
+     * default: <em>
+     * https://github.com/algolia/algoliasearch-client-js#highlightpretag
+     */
+    highlightPreTag?: string;
+    /**
+     * Specify the string that is inserted after the highlighted parts in the query result
+     * default: </em>
+     * https://github.com/algolia/algoliasearch-client-js#highlightposttag
+     */
+    highlightPostTag?: string;
+    /**
+     * String used as an ellipsis indicator when a snippet is truncated.
+     * default: …
+     * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
+     */
+    snippetEllipsisText?: string;
+    /**
+     * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
+     */
+    restrictHighlightAndSnippetArrays?: boolean;
+    /**
+     * Pagination parameter used to select the number of hits per page
+     * default: 20
+     * https://github.com/algolia/algoliasearch-client-js#hitsperpage
+     */
+    hitsPerPage?: number;
+    /**
+     * Pagination parameter used to select the page to retrieve.
+     * default: 0
+     * https://github.com/algolia/algoliasearch-client-js#page
+     */
+    page?: number;
+    /**
+     * Offset of the first hit to return
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#offset
+     */
+    offset?: number;
+    /**
+     * Number of hits to return.
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#length
+     */
+    length?: number;
+    /**
+     * The minimum number of characters needed to accept one typo.
+     * default: 4
+     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
+     */
+    minWordSizefor1Typo?: number;
+    /**
+     * The minimum number of characters needed to accept two typo.
+     * fault: 8
+     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
+     */
+    minWordSizefor2Typos?: number;
+    /**
+     * This option allows you to control the number of typos allowed in the result set:
+     * default: true
+     * 'true' The typo tolerance is enabled and all matching hits are retrieved
+     * 'false' The typo tolerance is disabled. All results with typos will be hidden.
+     * 'min' Only keep results with the minimum number of typos
+     * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
+     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
+     */
+    typoTolerance?: boolean;
+    /**
+     * If set to false, disables typo tolerance on numeric tokens (numbers).
+     * default:
+     * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
+     */
+    allowTyposOnNumericTokens?: boolean;
+    /**
+     * If set to true, plural won't be considered as a typo
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
+     */
+    ignorePlurals?: boolean;
+    /**
+     * List of attributes on which you want to disable typo tolerance
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
+     */
+    disableTypoToleranceOnAttributes?: string;
+    /**
+     * Search for entries around a given location
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#aroundlatlng
+     */
+    aroundLatLng?: string;
+    /**
+     * Search for entries around a given latitude/longitude automatically computed from user IP address.
+     * default: ""
+     * https://github.com/algolia/algoliasearch-client-js#aroundlatlngviaip
+     */
+    aroundLatLngViaIP?: string;
+    /**
+     * Control the radius associated with a geo search. Defined in meters.
+     * default: null
+     * You can specify aroundRadius=all if you want to compute the geo distance without filtering in a geo area
+     * https://github.com/algolia/algoliasearch-client-js#aroundradius
+     */
+    aroundRadius?: number | 'all';
+    /**
+     * Control the precision of a geo search
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#aroundprecision
+     */
+    aroundPrecision?: number;
+    /**
+     * Define the minimum radius used for a geo search when aroundRadius is not set.
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#minimumaroundradius
+     */
+    minimumAroundRadius?: number;
+    /**
+     * Search entries inside a given area defined by the two extreme points of a rectangle
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#insideboundingbox
+     */
+    insideBoundingBox?: number[][];
+    /**
+     * Selects how the query words are interpreted
+     * default: 'prefixLast'
+     * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
+     * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
+     * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
+     * https://github.com/algolia/algoliasearch-client-js#querytype
+     */
+    queryType?: any;
+    /**
+     * Search entries inside a given area defined by a set of points
+     * defauly: ''
+     * https://github.com/algolia/algoliasearch-client-js#insidepolygon
+     */
+    insidePolygon?: number[][];
+    /**
+     * This option is used to select a strategy in order to avoid having an empty result page
+     * default: 'none'
+     * 'lastWords' When a query does not return any results, the last word will be added as optional
+     * 'firstWords' When a query does not return any results, the first word will be added as optional
+     * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
+     * 'none' No specific processing is done when a query does not return any results
+     * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
+     */
+    removeWordsIfNoResults?: string;
+    /**
+     * Enables the advanced query syntax
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
+     */
+    advancedSyntax?: boolean;
+    /**
+     * A string that contains the comma separated list of words that should be considered as optional when found in the query
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#optionalwords
+     */
+    optionalWords?: string[];
+    /**
+     * Remove stop words from the query before executing it
+     * default: false
+     * true|false: enable or disable stop words for all 41 supported languages; or
+     * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
+     * https://github.com/algolia/algoliasearch-client-js#removestopwords
+     */
+    removeStopWords?: string[];
+    /**
+     * List of attributes on which you want to disable the computation of exact criteria
+     * default: []
+     * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
+     */
+    disableExactOnAttributes?: string[];
+    /**
+     * This parameter control how the exact ranking criterion is computed when the query contains one word
+     * default: attribute
+     * 'none': no exact on single word query
+     * 'word': exact set to 1 if the query word is found in the record
+     * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
+     * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
+     */
+    exactOnSingleWordQuery?: string;
+    /**
+     * Specify the list of approximation that should be considered as an exact match in the ranking formula
+     * default: ['ignorePlurals', 'singleWordSynonym']
+     * 'ignorePlurals': alternative words added by the ignorePlurals feature
+     * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
+     * 'multiWordsSynonym': multiple-words synonym
+     * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
+     */
+    alternativesAsExact?: any;
+    /**
+     * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
+     * https://github.com/algolia/algoliasearch-client-js#distinct
+     */
+    distinct?: any;
+    /**
+     * If set to true, the result hits will contain ranking information in the _rankingInfo attribute.
+     * default: false
+     * https://github.com/algolia/algoliasearch-client-js#getrankinginfo
+     */
+    getRankingInfo?: boolean;
+    /**
+     * All numerical attributes are automatically indexed as numerical filters
+     * default: ''
+     * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
+     */
+    numericAttributesToIndex?: string[];
+    /**
+     * @deprecated please use filters instead
+     * A string that contains the comma separated list of numeric filters you want to apply.
+     * https://github.com/algolia/algoliasearch-client-js#numericfilters-deprecated
+     */
+    numericFilters?: string[];
+    /**
+     * @deprecated
+     * Filter the query by a set of tags.
+     * https://github.com/algolia/algoliasearch-client-js#tagfilters-deprecated
+     */
+    tagFilters?: string;
+    /**
+     * @deprecated
+     * Filter the query by a set of facets.
+     * https://github.com/algolia/algoliasearch-client-js#facetfilters-deprecated
+     */
+    facetFilters?: string;
+    /**
+     * If set to false, this query will not be taken into account in the analytics feature.
+     * default true
+     * https://github.com/algolia/algoliasearch-client-js#analytics
+     */
+    analytics?: boolean;
+    /**
+     * If set, tag your query with the specified identifiers
+     * default: null
+     * https://github.com/algolia/algoliasearch-client-js#analyticstags
+     */
+    analyticsTags?: string[];
+    /**
+     * If set to false, the search will not use the synonyms defined for the targeted index.
+     * default: true
+     * https://github.com/algolia/algoliasearch-client-js#synonyms
+     */
+    synonyms?: boolean;
+    /**
+     * If set to false, words matched via synonym expansion will not be replaced by the matched synonym in the highlighted result.
+     * default: true
+     * https://github.com/algolia/algoliasearch-client-js#replacesynonymsinhighlight
+     */
+    replaceSynonymsInHighlight?: boolean;
+    /**
+     * Configure the precision of the proximity ranking criterion
+     * default: 1
+     * https://github.com/algolia/algoliasearch-client-js#minproximity
+     */
+    minProximity?: number;
+  }
 }
 
-declare function algoliasearch(applicationId: string, apiKey: string, options?: algoliasearch.ClientOptions): algoliasearch.AlgoliaClient;
+declare function algoliasearch(
+  applicationId: string,
+  apiKey: string,
+  options?: algoliasearch.ClientOptions
+): algoliasearch.AlgoliaClient;
 export = algoliasearch;
diff --git a/types/algoliasearch/tsconfig.json b/types/algoliasearch/tsconfig.json
index 3358732ba3..4d7e52dd8b 100644
--- a/types/algoliasearch/tsconfig.json
+++ b/types/algoliasearch/tsconfig.json
@@ -1,23 +1,16 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "algoliasearch-tests.ts"
-    ]
-}
\ No newline at end of file
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": ["index.d.ts", "algoliasearch-tests.ts"]
+}
diff --git a/types/algoliasearch/tslint.json b/types/algoliasearch/tslint.json
new file mode 100644
index 0000000000..886f1a8b6c
--- /dev/null
+++ b/types/algoliasearch/tslint.json
@@ -0,0 +1,79 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "adjacent-overload-signatures": false,
+    "array-type": false,
+    "arrow-return-shorthand": false,
+    "ban-types": false,
+    "callable-types": false,
+    "comment-format": false,
+    "dt-header": false,
+    "eofline": false,
+    "export-just-namespace": false,
+    "import-spacing": false,
+    "interface-name": false,
+    "interface-over-type-literal": false,
+    "jsdoc-format": false,
+    "max-line-length": false,
+    "member-access": false,
+    "new-parens": false,
+    "no-any-union": false,
+    "no-boolean-literal-compare": false,
+    "no-conditional-assignment": false,
+    "no-consecutive-blank-lines": false,
+    "no-construct": false,
+    "no-declare-current-package": false,
+    "no-duplicate-imports": false,
+    "no-duplicate-variable": false,
+    "no-empty-interface": false,
+    "no-for-in-array": false,
+    "no-inferrable-types": false,
+    "no-internal-module": false,
+    "no-irregular-whitespace": false,
+    "no-mergeable-namespace": false,
+    "no-misused-new": false,
+    "no-namespace": false,
+    "no-object-literal-type-assertion": false,
+    "no-padding": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
+    "no-redundant-undefined": false,
+    "no-reference-import": false,
+    "no-relative-import-in-test": false,
+    "no-self-import": false,
+    "no-single-declare-module": false,
+    "no-string-throw": false,
+    "no-unnecessary-callback-wrapper": false,
+    "no-unnecessary-class": false,
+    "no-unnecessary-generics": false,
+    "no-unnecessary-qualifier": false,
+    "no-unnecessary-type-assertion": false,
+    "no-useless-files": false,
+    "no-var-keyword": false,
+    "no-var-requires": false,
+    "no-void-expression": false,
+    "no-trailing-whitespace": false,
+    "object-literal-key-quotes": false,
+    "object-literal-shorthand": false,
+    "one-line": false,
+    "one-variable-per-declaration": false,
+    "only-arrow-functions": false,
+    "prefer-conditional-expression": false,
+    "prefer-const": false,
+    "prefer-declare-function": false,
+    "prefer-for-of": false,
+    "prefer-method-signature": false,
+    "prefer-template": false,
+    "radix": false,
+    "semicolon": false,
+    "space-before-function-paren": false,
+    "space-within-parens": false,
+    "strict-export-declare-modifiers": false,
+    "trim-file": false,
+    "triple-equals": false,
+    "typedef-whitespace": false,
+    "unified-signatures": false,
+    "void-return": false,
+    "whitespace": false
+  }
+}
diff --git a/types/alt/tslint.json b/types/alt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/alt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/amazon-product-api/amazon-product-api-tests.ts b/types/amazon-product-api/amazon-product-api-tests.ts
index 0a02153236..37682a11aa 100644
--- a/types/amazon-product-api/amazon-product-api-tests.ts
+++ b/types/amazon-product-api/amazon-product-api-tests.ts
@@ -3,7 +3,7 @@ declare var process: { env: any };
 
 import amazon = require('amazon-product-api');
 
-var client = amazon.createClient({
+let client = amazon.createClient({
     awsId: process.env.AWS_ACCESS_KEY_ID,
     awsSecret: process.env.AWS_SECRET,
     awsTag: process.env.AWS_ASSOCIATE_TAG
@@ -12,7 +12,7 @@ var client = amazon.createClient({
 
 // Item Search
 
-var searchQuery = {
+let searchQuery = {
     director: 'Quentin Tarantino',
     actor: 'Samuel L. Jackson',
     searchIndex: 'DVD',
@@ -37,11 +37,11 @@ client.itemSearch(searchQuery, (err, results) => {
 
 // Item Lookup
 
-var lookupQuery = {
+let lookupQuery = {
     itemId: 'B00008OE6I',
     idType: 'ASIN',
     responseGroup: 'OfferFull',
-    Condition: 'All'
+    condition: 'All'
 };
 
 client.itemLookup(lookupQuery).then((results) => {
@@ -58,9 +58,22 @@ client.itemLookup(lookupQuery, (err, results) => {
     console.log(getResultCount(results) + " lookup results");
 });
 
+let lookupQueryWithItemIdArray = {
+    itemId: ['B00008OE6I', 'B00008OE6E'],
+    idType: 'ASIN',
+    responseGroup: 'OfferFull',
+    condition: 'All'
+};
+
+client.itemLookup(lookupQueryWithItemIdArray).then((results) => {
+    console.log(getResultCount(results) + " lookup results");
+}).catch(function(err){
+    console.log(err);
+});
+
 // Browse Node Lookup
 
-var nodeLookupQuery = {
+let nodeLookupQuery = {
     browseNodeId: '2625373011'
 };
 
@@ -81,4 +94,4 @@ client.browseNodeLookup(nodeLookupQuery, (err, results) => {
 
 function getResultCount(results: Object[]) {
     return results != undefined ? results.length : 0;
-}
\ No newline at end of file
+}
diff --git a/types/amazon-product-api/index.d.ts b/types/amazon-product-api/index.d.ts
index 797adf45f4..34bafd04f4 100644
--- a/types/amazon-product-api/index.d.ts
+++ b/types/amazon-product-api/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for amazon-product-api
 // Project: https://github.com/t3chnoboy/amazon-product-api
-// Definitions by: Matti Lehtinen <https://github.com/MattiLehtinen>
+// Definitions by: Matti Lehtinen <https://github.com/MattiLehtinen>, Alex Leon <https://github.com/alien35>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -15,10 +15,35 @@ interface IAmazonProductQueryCallback {
     (err: string, results: Object[]): void;
 }
 
+interface IItemSearchOptions {
+    condition?: string;
+    keywords?: string;
+    responseGroup?: string;
+    searchIndex?: string;
+    itemPage?: number;
+    sort?: string;
+}
+
+interface IItemLookupOptions {
+    condition?: string;
+    idType?: string;
+    includeReviewsSummary?: boolean;
+    itemId?: string | string[];
+    responseGroup?: string;
+    searchIndex?: string;
+    truncateReviewsAt?: number;
+    variationPage?: string;
+}
+
+interface IBrowseNodeLookupOptions {
+    browseNodeId?: string;
+    responseGroup?: string;
+}
+
 interface IAmazonProductClient {
-    itemSearch(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
-    itemLookup(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
-    browseNodeLookup(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+    itemSearch(query: IItemSearchOptions, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+    itemLookup(query: IItemLookupOptions, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+    browseNodeLookup(query: IBrowseNodeLookupOptions, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
 }
 
 export declare function createClient(credentials: ICredentials): IAmazonProductClient;
diff --git a/types/amazon-product-api/tslint.json b/types/amazon-product-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/amazon-product-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/amcharts/AmAngularGauge.d.ts b/types/amcharts/AmAngularGauge.d.ts
new file mode 100644
index 0000000000..d4199f83cd
--- /dev/null
+++ b/types/amcharts/AmAngularGauge.d.ts
@@ -0,0 +1,629 @@
+import AmBalloon from "./AmBalloon";
+import AmChart from "./AmChart";
+import AmLegend from "./AmLegend";
+import ExportSettings from "./ExportSettings";
+import GaugeArrow from "./GaugeArrow";
+import GaugeAxis from "./GaugeAxis";
+import Label from "./Label";
+import Title from "./Title";
+
+/**
+ * AmAngularGauge Extension for AmChart to create gauge charts.
+ */
+export default class AmAngularGauge extends AmChart {
+    /**
+     * When enabled, chart adds aria-label attributes to columns, bullets or map objects.
+     * You can control values of these labels using properties like accessibleLabel of AmGraph.
+     * Note, not all screen readers support these tags.
+     * We tested this mostly with NVDA Screen reader.
+     * WAI-ARIA is now official W3 standard, so in future more readers will handle this well.
+     * We will be improving accessibility on our charts, so we would be glad to hear your feedback.
+     * @default true
+     */
+    accessible: boolean;
+
+    /**
+     * Description which will be added to node of SVG element.
+     * Most of the screen readers will read this description.
+     */
+    accessibleDescription: string;
+
+    /**
+     * Description which is added to of a SVG element. Some of the screen readers will read this description.
+     */
+    accessibleTitle: string;
+
+    /**
+     * Specifies, if class names should be added to chart elements.
+     * @default false
+     */
+    addClassNames: boolean;
+
+    /**
+     * Uses the whole space of the canvas to draw the gauge.
+     * @default true
+     */
+    adjustSize: boolean;
+
+    /**
+     * Array of Labels. Example of label object, with all possible properties:
+     * {
+     *     "x": 20,
+     *     "y": 20,
+     *     "text": "this is label",
+     *     "align": "left",
+     *     "size": 12,
+     *     "color": "#CC0000",
+     *     "alpha": 1,
+     *     "rotation": 0,
+     *     "bold": true,
+     *     "url": "http://www.amcharts.com"
+     * }
+     * @default []
+     */
+    allLabels: [Label];
+
+    /**
+     * Array of arrows.
+     */
+    arrows: [GaugeArrow];
+
+    /**
+     * If you set it to true the chart will automatically monitor changes of display style of chart’s container
+     * (or any of it’s parents) and will render chart correctly if it is changed from none to block.
+     * We recommend setting it to true if you change this style at a run time, as it affects performance a bit.
+     * @default false
+     */
+    autoDisplay: boolean;
+
+    /**
+     * Set this to false if you don't want chart to resize itself whenever its parent container size changes.
+     * @default true
+     */
+    autoResize: boolean;
+
+    /**
+     * If you set it to true and your chart div (or any of the parent div) has css scale applied,
+     * the chart will position mouse at a correct position.
+     * Default value is false because this operation consumes some CPU and quite a
+     * few people are using css transfroms.
+     * @default false
+     */
+    autoTransform: boolean;
+
+    /**
+     * Array of axes.
+     * @default [GaugeAxis]
+     */
+    axes: [GaugeAxis];
+
+    /**
+     * Opacity of background. Set it to >0 value if you want backgroundColor to work.
+     * However we recommend changing div's background-color style for changing background color.
+     * @default 0
+     */
+    backgroundAlpha: number;
+
+    /**
+     * Background color. You should set backgroundAlpha to >0 value in order background to be visible.
+     * We recommend setting background color directly on a chart's DIV instead of using this property.
+     * @default #FFFFFF
+     */
+    backgroundColor: string;
+
+    /**
+     * The chart creates AmBalloon class itself.
+     * If you want to customize balloon, get balloon instance using this property,
+     * and then change balloon's properties.
+     * @default AmBalloon
+     */
+    balloon: AmBalloon;
+
+    /**
+     * Opacity of chart's border. Value range is 0 - 1.
+     * @default 0
+     */
+    borderAlpha: number;
+
+    /**
+     * Color of chart's border. You should set borderAlpha >0 in order border to be visible.
+     * We recommend setting border color directly on a chart's DIV instead of using this property.
+     * @default #000000
+     */
+    borderColor: string;
+
+    /**
+     * This prefix is added to all class names which are added to all visual elements of a chart
+     * in case addClassNames is set to true.
+     * @default amcharts
+     */
+    classNamePrefix: string;
+
+    /**
+     * In case you use gauge to create a clock, set this to true.
+     * @default false
+     */
+    clockWiseOnly: boolean;
+
+    /**
+     * Text color.
+     * @default #000000
+     */
+    color: string;
+
+    /**
+     * Non-commercial version only. Specifies position of link to amCharts site.
+     * Allowed values are: top-left, top-right, bottom-left and bottom-right.
+     * @default 'top - left'
+     */
+    creditsPosition: string;
+
+    /**
+     * A config object for Data Loader plugin. Please refer to the following page for more information.
+     */
+    dataLoader: object;
+
+    /**
+     * Array of data objects, for example:
+     * [
+     *     {country:"US", value:524},
+     *     {country:"UK", value:624},
+     *     {country:"Lithuania", value:824}
+     * ]
+     * You can have any number of fields and use any field names.
+     * In case of AmMap, data provider should be MapData object.
+     * The data set data.
+     * Important: if you are using date/time-based category axis, the data points needs to come pre-ordered
+     * in ascending order. Data with incorrect order might result in visual and functional glitches on the chart.
+     */
+    dataProvider: [object];
+
+    /**
+     * Decimal separator.
+     * @default "."
+     */
+    decimalSeparator: string;
+
+    /**
+     * Using this property you can add any additional information to SVG, like SVG filters or clip paths.
+     * The structure of this object should be identical to XML structure of a object you are adding,
+     * only in JSON format.
+     */
+    defs: object;
+
+    /**
+     * Export config. Specifies how export to image/data export/print/annotate menu will look and behave.
+     * You can find a lot of examples in amcharts/plugins/export folder. More details can be found here.
+     */
+    export: ExportSettings;
+
+    /**
+     * Gauge face opacity.
+     * @default 0
+     */
+    faceAlpha: number;
+
+    /**
+     * Gauge face border opacity.
+     * @default 0
+     */
+    faceBorderAlpha: number;
+
+    /**
+     * Gauge face border color.
+     * @default #555555
+     */
+    faceBorderColor: string;
+
+    /**
+     * Gauge face border width.
+     * @default 1
+     */
+    faceBorderWidth: number;
+
+    /**
+     * Gauge face color, requires faceAlpha > 0
+     * @default #FAFAFA
+     */
+    faceColor: string;
+
+    /**
+     * Gauge face image-pattern.
+     * Example: {"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4}
+     * fontFamily	String	Verdana	Font family.
+     * fontSize	Number	11	Font size.
+     */
+    facePattern: object;
+
+    /**
+     * Gauge's horizontal position in pixel, origin is the center. Centered by default.
+     */
+    gaugeX: number;
+
+    /**
+     * Gauge's vertical position in pixel, origin is the center. Centered by default.
+     */
+    gaugeY: number;
+
+    /**
+     * If you set this to true, the lines of the chart will be distorted and will produce hand-drawn effect.
+     * Try to adjust chart.handDrawScatter and chart.handDrawThickness properties for a more scattered result.
+     * @default false
+     */
+    handDrawn: boolean;
+
+    /**
+     * Defines by how many pixels hand-drawn line (when handDrawn is set to true) will fluctuate.
+     * @default 2
+     */
+    handDrawScatter: number;
+
+    /**
+     * Defines by how many pixels line thickness will fluctuate (when handDrawn is set to true).
+     * @default 1
+     */
+    handDrawThickness: number;
+
+    /**
+     * Time, in milliseconds after which balloon is hidden if the user rolls-out of the object.
+     * Might be useful for AmMap to avoid balloon flickering while moving mouse over the areas.
+     * Note, this is not duration of fade-out. Duration of fade-out is set in AmBalloon class.
+     * @default 150
+     */
+    hideBalloonTime: number;
+
+    /**
+     * Allows changing language easily.
+     * Note, you should include language js file from amcharts/lang or ammap/lang folder and then use
+     * variable name used in this file, like chart.language = "de"; Note, for maps this works differently -
+     * you use language only for country names, as there are no other strings in the maps application.
+     */
+    language: string;
+
+    /**
+     * Legend of a chart.
+     */
+    legend: AmLegend;
+
+    /**
+     * Read-only. Reference to the div of the legend.
+     */
+    legendDiv: HTMLElement;
+
+    /**
+     * You can add listeners of events using this property.
+     * Example: listeners = [{"event":"dataUpdated", "method":handleEvent}];
+     * @default [Object]
+     */
+    listeners: [object];
+
+    /**
+     * Bottom spacing between chart and container.
+     * @default 10
+     */
+    marginBottom: number;
+
+    /**
+     * Left-hand spacing between chart and container.
+     * @default 10
+     */
+    marginLeft: number;
+
+    /**
+     * Right-hand spacing between chart and container.
+     * @default 10
+     */
+    marginRight: number;
+
+    /**
+     * Top spacing between chart and container.
+     * @default 10
+     */
+    marginTop: number;
+
+    /**
+     * Minimum radius of a gauge.
+     * @default 10
+     */
+    minRadius: number;
+
+    /**
+     * This setting affects touch-screen devices only.
+     * If a chart is on a page, and panEventsEnabled are set to true, the page won't move if
+     * the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device,
+     * the user won’t be able to move the page at all.
+     * If you think that selecting/panning the chart or moving/pinching the map is a primary purpose of your users,
+     * you should set panEventsEnabled to true, otherwise - false.
+     * @default true
+     */
+    panEventsEnabled: boolean;
+
+    /**
+     * Specifies absolute or relative path to amCharts files, i.e."amcharts/". (where all.js files are located)
+     * If relative URLs are used, they will be relative to the current web page, displaying the chart.
+     * You can also set path globally, using global JavaScript variable AmCharts_path.If this variable is set,
+     * and "path" is not set in chart config, the chart will assume the path from the global variable.
+     * This allows setting amCharts path globally.
+     * I.e.:
+     * let AmCharts_path = "/libs/amcharts/";
+     * "path" parameter will be used by the charts to locate it's files, like images, plugins or patterns.
+     * @default 'amcharts/'
+     */
+    path: string;
+
+    /**
+     * Specifies path to the folder where images like resize grips, lens and similar are.
+     * IMPORTANT: Since V3.14.12, you should use "path" to point to amCharts directory instead.
+     * The "pathToImages" will be automatically set and does not need to be in the chart config,
+     * unless you keep your images separately from other amCharts files.
+     */
+    pathToImages: string;
+
+    /**
+     * Precision of percent values. -1 means percent values won't be rounded at all and show as they are.
+     * @default 2
+     */
+    percentPrecision: number;
+
+    /**
+     * Precision of values. -1 means values won't be rounded at all and show as they are.
+     * @default -1
+     */
+    precision: number;
+
+    /**
+     * Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc.
+     * Prefixes are used on value axes and in the legend.
+     * To enable prefixes, set usePrefixes property to true.
+     * @default [
+     *     {"number": 1e+3, "prefix": "k"},
+     *     {"number": 1e+6, "prefix": "M"},
+     *     {"number": 1e+9, "prefix": "G"},
+     *     {"number": 1e+12, "prefix": "T"},
+     *     {"number": 1e+15, "prefix": "P"},
+     *     {"number": 1e+18, "prefix": "E"},
+     *     {"number": 1e+21, "prefix": "Z"},
+     *     {"number": 1e+24, "prefix": "Y"}
+     * ]
+     */
+    prefixesOfBigNumbers: [{ number: number; prefix: string }];
+
+    /**
+     * Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc.
+     * Prefixes are used on value axes and in the legend.
+     * To enable prefixes, set usePrefixes property to true.
+     * @default [
+     *     {"number": 1e-24, "prefix": "y"},
+     *     {"number": 1e-21, "prefix": "z"},
+     *     {"number": 1e-18, "prefix": "a"},
+     *     {"number": 1e-15, "prefix": "f"},
+     *     {"number": 1e-12, "prefix": "p"},
+     *     {"number": 1e-9, "prefix": "n"},
+     *     {"number": 1e-6, "prefix": "μ"},
+     *     {"number": 1e-3, "prefix": "m"}
+     * ]
+     */
+    prefixesOfSmallNumbers: [{ number: number; prefix: string }];
+
+    /**
+     * If processTimeout is > 0, 1000 data items will be parsed at a time,
+     * then the chart will make pause and continue parsing data until it finishes.
+     * @default 1000
+     */
+    processCount: number;
+
+    /**
+     * If you set it to 1 millisecond or some bigger value, chart will be built in chunks instead of all at once.
+     * This is useful if you work with a lot of data and the initial build of the chart takes a lot of time,
+     * which freezes the whole web application by not allowing other processes to do their
+     * job while the chart is busy.
+     * @default 0
+     */
+    processTimeout: number;
+
+    /**
+     * A config object for Responsive plugin. Please refer to the following page for more information.
+     */
+    responsive: object;
+
+    /**
+     * Duration of arrow animation.
+     * @default 1
+     */
+    startDuration: number;
+
+    /**
+     * Transition effect of the arrows, possible effects: easeOutSine, easeInSine, elastic, bounce.
+     * @default easeInSine
+     */
+    startEffect: string;
+
+    /**
+     * Charts will use SVG icons (some are loaded from images folder and some are drawn inline)
+     * if browser supports SVG. his makes icons look good on retina displays on all resolutions.
+     * @default true
+     */
+    svgIcons: boolean;
+
+    /**
+     * Charts which require gestures like swipe (charts with scrollbar/cursor) or pinch (maps) used to prevent
+     * regular page scrolling and could result page to stick to the same spot if the chart occupied whole screen.
+     * Now, in order these gestures to start working user has to touch the chart/maps once.
+     * Regular touch events like touching on the bar/slice/map area do not require the first tap and will
+     * show balloons and perform other tasks as usual.
+     * If you have a map or chart which occupies full screen and your page does not require scrolling,
+     * set tapToActivate to false – this will bring old behavior back.
+     * @default true
+     */
+    tapToActivate: boolean;
+
+    /**
+     * Theme of a chart. Config files of themes can be found in amcharts/themes/ folder.
+     * More info about using themes.
+     * @default none
+     */
+    theme: string;
+
+    /**
+     * Thousands separator.
+     * @default ,
+     */
+    thousandsSeparator: string;
+
+    /**
+     * Array of Title objects.
+     * @default []
+     */
+    titles: [Title];
+
+    /**
+     * If you set it to 200 (milliseconds) or so, the chart will fire clickGraphItem or clickSlice (AmSlicedChart)
+     * or clickMapObject only if user holds his/her finger for 0.2 seconds (200 ms) on the
+     * column/bullet/slice/map object.
+     * @default 0
+     */
+    touchClickDuration: number;
+
+    /**
+     * Type of a chart. Required when creating chart using JSON.
+     * Possible types are: serial, pie, xy, radar, funnel, gauge, map, gantt, stock.
+     */
+    type: string;
+
+    /**
+     * If true, prefixes will be used for big and small numbers.
+     * You can set arrays of prefixes via prefixesOfSmallNumbers and prefixesOfBigNumbers properties.
+     * @default false
+     */
+    usePrefixes: boolean;
+
+    /**
+     * Read-only. Indicates current version of a script.
+     */
+    version: string;
+
+    /**
+     * Adds arrow to the chart.
+     */
+    addArrow(arrow: GaugeArrow): void;
+
+    /**
+     * Adds axis to angular gauge.
+     */
+    addAxis(axis: GaugeAxis): void;
+
+    /**
+     * Adds a label on a chart. You can use it for labeling axes, adding chart title,
+     * etc. x and y coordinates can be set in number, percent, or a number with ! in front of it -
+     * coordinate will be calculated from right or bottom instead of left or top.
+     */
+    addLabel(
+        x: number,
+        y: number,
+        text: string,
+        align: string,
+        size: number,
+        color: string,
+        rotation: number,
+        alpha: number,
+        bold: boolean,
+        url: string,
+    ): void;
+
+    /**
+     * Adds a legend to the chart. By default, you don't need to create div for your legend,
+     * however if you want it to be positioned in some different way,
+     * you can create div anywhere you want and pass id or reference to your div as a second parameter.
+     * NOTE: This method will not work on StockPanel.
+     */
+    addLegend(legend: AmLegend, legendDivId?: string): void;
+    /**
+     * Adds a legend to the chart.
+     * By default, you don't need to create div for your legend,
+     * however if you want it to be positioned in some different way,
+     * you can create div anywhere you want and pass id or reference to your div as a second parameter.
+     * NOTE: This method will not work on StockPanel.
+     * @param legend - The legend.
+     * @param legendDiv - Legend div (optional).
+     */
+    addLegend(legend: AmLegend, legendDiv: HTMLElement): void;
+
+    /**
+     * Adds event listener to the object.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                type: string;
+                chart: AmChart;
+            },
+        ) => void,
+    ): void;
+
+    /**
+     * Adds title to the top of the chart. Pie, Radar positions are updated so that they won't overlap.
+     * Plot area of Serial/XY chart is also updated unless autoMargins property is set to false.
+     * You can add any number of titles - each of them will be placed in a new line.
+     * To remove titles, simply clear titles array: chart.titles = []; and call chart.validateNow() method.
+     */
+    addTitle(text: string, size: number, color: string, alpha: number, bold: boolean): void;
+
+    /**
+     * Clears the chart area, intervals, etc.
+     */
+    clear(): void;
+
+    /**
+     * Removes all labels added to the chart.
+     */
+    clearLabels(): void;
+
+    /**
+     * Use this method to force the chart to resize to it's current container size.
+     */
+    invalidateSize(): void;
+
+    /**
+     * This method allows to create charts with a single config.
+     */
+    makeChart(container: string, config: any, delay: number): AmChart;
+
+    /**
+     * Removes arrow from the chart.
+     */
+    removeArrow(arrow: GaugeArrow): void;
+
+    /**
+     * Removes axis from the chart.
+     */
+    removeAxis(axis: GaugeAxis): void;
+
+    /**
+     * Removes chart's legend.
+     */
+    removeLegend(): void;
+
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+
+    /**
+     * This method should be called after data in your data provider changed or a new array was set to dataProvider.
+     * After calling this method the chart will parse data and redraw.
+     */
+    validateData(): void;
+
+    /**
+     * This method should be called after you changed one or more properties of any class.
+     * The chart will redraw after this method is called.
+     * Both attributes, validateData and skipEvents are optional (false by default).
+     */
+    validateNow(): void;
+
+    /**
+     * Adds chart to the specified DIV.
+     */
+    write(container: string | HTMLDivElement): void;
+}
diff --git a/types/amcharts/AmBalloon.d.ts b/types/amcharts/AmBalloon.d.ts
new file mode 100644
index 0000000000..1549b72a18
--- /dev/null
+++ b/types/amcharts/AmBalloon.d.ts
@@ -0,0 +1,107 @@
+/**
+ * AmBalloon is the class which generates balloons (datatips).
+ * Balloon follows the mouse when you roll-over the pie slice/line bullet/column/etc, chart indicator of
+ * serial charts displays value balloons and category balloon.
+ * Balloon instance is created by the chart automatically and can be accessed via "balloon" property of AmChart.
+ * Chart shows/hides and sets position for every balloon automatically,
+ * so all you need to do is to change balloon appearance, if you want to.
+ * @example
+ * let chart = new AmCharts.AmSerialChart();
+ * // get balloon intance
+ * let balloon = chart.balloon;
+ * // set properties
+ * balloon.adjustBorderColor = true;
+ * balloon.color = "#000000";
+ * balloon.cornerRadius = 5;
+ * balloon.fillColor = "#FFFFFF";
+ */
+export default class AmBalloon {
+    /**
+     * If this is set to true, border color instead of background color will be changed
+     * when user rolls-over the slice, graph, etc.
+     */
+    adjustBorderColor: boolean;
+    /**
+     * Balloon border opacity. Value range is 0 - 1.
+     * @default 1
+     */
+    borderAlpha: number;
+    /**
+     * Balloon border color. #FFFFFF
+     */
+    borderColor: string;
+    /**
+     * Balloon border thickness.
+     * @default 2
+     */
+    borderThickness: number;
+    /**
+     * Color of text in the balloon. #FFFFFF
+     */
+    color: string;
+    /**
+     * Balloon corner radius.
+     * @default 6
+     */
+    cornerRadius: number;
+    /**
+     * Balloon background opacity.
+     * @default 1
+     */
+    fillAlpha: number;
+    /**
+     * Balloon background color. Usually balloon background color is set by the chart.
+     * Only if "adjustBorderColor" is "true" this color will be used.
+     * @default "#CC0000"
+     */
+    fillColor: string;
+    /**
+     * Size of text in the balloon. Chart's fontSize is used by default.
+     */
+    fontSize: string;
+    /**
+     * Horizontal padding of the balloon.
+     * @default 8
+     */
+    horizontalPadding: number;
+    /**
+     * The width of the pointer (arrow) "root". Only used if cornerRadius is 0.
+     * @default 10
+     */
+    pointerWidth: number;
+    /**
+     * If cornerRadius of a balloon is >0, showBullet is set to true for value balloons when ChartCursor is used.
+     * If you don't want the bullet near the balloon, set it to false: chart.balloon.showBullet = false
+     */
+    showBullet: boolean;
+    /**
+     * Text alignment, possible values "left", "middle" and "right" middle
+     */
+    textAlign: string;
+    /**
+     * Color of the text shadow. #000000
+     */
+    textShadowColor: string;
+    /**
+     * Vertical padding of the balloon.
+     * @default 5
+     */
+    verticalPadding: number;
+    /**
+     * Hides balloon.
+     */
+    hide(): void;
+    /**
+     * Defines a square within which the balloon should appear.
+     * Bounds are set by chart class, you don't need to call this method yourself.
+     */
+    setBounds(left: number, top: number, right: number, bottom: number): void;
+    /**
+     * Sets coordinates the balloon should point to.
+     */
+    setPosition(x: number, y: number): void;
+    /**
+     * Specifies the text which should be displayed.
+     */
+    show(value: string): void;
+}
diff --git a/types/amcharts/AmChart.d.ts b/types/amcharts/AmChart.d.ts
new file mode 100644
index 0000000000..927d054369
--- /dev/null
+++ b/types/amcharts/AmChart.d.ts
@@ -0,0 +1,358 @@
+import AmBalloon from "./AmBalloon";
+import AmLegend from "./AmLegend";
+import ExportSettings from "./ExportSettings";
+import Label from "./Label";
+import Title from "./Title";
+
+/**
+ * AmChart is a base class of all charts. It can not be instantiated explicitly.
+ * AmCoordinateChart, AmPieChart and AmMap extend AmChart class.
+ */
+export default class AmChart {
+    /**
+     * used when constructing a chart with a theme
+     */
+    constructor(theme?: any);
+    /**
+     * Specifies, if class names should be added to chart elements.
+     */
+    addClassNames: boolean;
+    /**
+     * Array of Labels. Example of label object, with all possible properties:
+     * {
+     *     "x": 20,
+     *     "y": 20,
+     *     "text": "this is label",
+     *     "align": "left",
+     *     "size": 12,
+     *     "color": "#CC0000",
+     *     "alpha": 1,
+     *     "rotation": 0,
+     *     "bold": true,
+     *     "url": "http://www.amcharts.com"
+     * }
+     */
+    allLabels: Label[];
+    /**
+     * Set this to false if you don't want chart to resize itself whenever its parent container size changes.
+     */
+    autoResize: boolean;
+    /**
+     * Opacity of background. Set it to >0 value if you want backgroundColor to work.
+     * However we recommend changing div's background-color style for changing background color.
+     */
+    backgroundAlpha: number;
+    /**
+     * Background color. You should set backgroundAlpha to >0 value in order background to be visible.
+     * We recommend setting background color directly on a chart's DIV instead of using this property.
+     * @default "#FFFFFF"
+     */
+    backgroundColor: string;
+    /**
+     * The chart creates AmBalloon class itself.
+     * If you want to customize balloon, get balloon instance using this property,
+     * and then change balloon's properties.
+     */
+    balloon: AmBalloon;
+    /**
+     * Opacity of chart's border. Value range is 0 - 1.
+     */
+    borderAlpha: number;
+    /**
+     * Color of chart's border. You should set borderAlpha >0 in order border to be visible.
+     * We recommend setting border color directly on a chart's DIV instead of using this property.
+     * @default #000000
+     */
+    borderColor: string;
+    /**
+     * This prefix is added to all class names which are added to all visual elements of a chart
+     * in case addClassNames is set to true.
+     */
+    classNamePrefix: string;
+    /**
+     * Text color. #000000
+     */
+    color: string;
+    /**
+     * Non-commercial version only. Specifies position of link to amCharts site.
+     * Allowed values are: top-left, top-right, bottom-left and bottom-right.
+     * @default 'top-left'
+     */
+    creditsPosition: string;
+    /**
+     * Array of data objects, for example:
+     * [{country:"US", value:524}, {country:"UK", value:624}, {country:"Lithuania", value:824}].
+     * You can have any number of fields and use any field names.
+     * In case of AmMap, data provider should be MapData object.
+     */
+    dataProvider: any[];
+    /**
+     * Decimal separator.
+     * @default "."
+     */
+    decimalSeparator: string;
+    /**
+     * Using this property you can add any additional information to SVG, like SVG filters or clip paths.
+     * The structure of this object should be identical to XML structure of a object you are adding,
+     * only in JSON format.
+     */
+    defs: any;
+    /**
+     * Export config. Specifies how export to image/data export/print/annotate menu will look and behave.
+     * You can find a lot of examples in amcharts/plugins/export folder.
+     */
+    export: ExportSettings;
+    /**
+     * Font family. Verdana
+     */
+    fontFamily: string;
+    /**
+     * Font size.
+     * @default 11
+     */
+    fontSize: string;
+    /**
+     * If you set this to true, the lines of the chart will be distorted and will produce hand-drawn effect.
+     * Try to adjust chart.handDrawScatter and chart.handDrawThickness properties for a more scattered result.
+     * @default false
+     */
+    handDrawn: boolean;
+    /**
+     * Defines by how many pixels hand-drawn line (when handDrawn is set to true) will fluctuate.
+     * @default 2
+     */
+    handDrawScatter: number;
+    /**
+     * Defines by how many pixels line thickness will fluctuate (when handDrawn is set to true).
+     * @default 1
+     */
+    handDrawThickness: number;
+    /**
+     * Time, in milliseconds after which balloon is hidden if the user rolls-out of the object.
+     * Might be useful for AmMap to avoid balloon flickering while moving mouse over the areas.
+     * Note, this is not duration of fade-out. Duration of fade-out is set in AmBalloon class.
+     * @default 150
+     */
+    hideBalloonTime: number;
+    /**
+     * Legend of a chart.
+     */
+    legend: AmLegend;
+    /**
+     * Reference to the div of the legend.
+     */
+    legendDiv: HTMLElement;
+    /**
+     * You can add listeners of events using this property. Example:
+     * listeners = [{"event":"dataUpdated", "method":handleEvent}];
+     */
+    listerns: object[];
+    /**
+     * This setting affects touch-screen devices only.
+     * If a chart is on a page, and panEventsEnabled are set to true, the page won't move
+     * if the user touches the chart first.
+     * If a chart is big enough and occupies all the screen of your touch device,
+     * the user won’t be able to move the page at all. That's why the default value is "false".
+     * If you think that selecting/panning the chart or moving/pinching the map is a primary purpose of your users,
+     * you should set panEventsEnabled to true.
+     */
+    panEventsEnabled: boolean;
+    /**
+     * Specifies absolute or relative path to amCharts files, i.e. "amcharts/". (where all .js files are located)
+     * If relative URLs are used, they will be relative to the current web page, displaying the chart.
+     * You can also set path globally, using global JavaScript variable AmCharts_path.
+     * If this variable is set, and "path" is not set in chart config, the chart will assume the path from the
+     * global variable. This allows setting amCharts path globally. I.e.:
+     * let AmCharts_path = "/libs/amcharts/";
+     * "path" parameter will be used by the charts to locate it's files, like images, plugins or patterns.
+     */
+    path: string;
+    /**
+     * Specifies path to the folder where images like resize grips, lens and similar are.
+     * IMPORTANT: Since V3.14.12, you should use "path" to point to amCharts directory instead.
+     * The "pathToImages" will be automatically set and does not need to be in the chart config,
+     * unless you keep your images separately from other amCharts files.
+     */
+    pathToImages: string;
+    /**
+     * Precision of percent values. -1 means percent values won't be rounded at all and show as they are.
+     * @default 2
+     */
+    percentPrecision: number;
+    /**
+     * Precision of values. -1 means values won't be rounded at all and show as they are.
+     * @default 1
+     */
+    precision: number;
+    /**
+     * Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc.
+     * Prefixes are used on value axes and in the legend.
+     * To enable prefixes, set usePrefixes property to true.
+     * [
+     *     {number:1e+3,prefix:"k"},
+     *     {number:1e+6,prefix:"M"},
+     *     {number:1e+9,prefix:"G"},
+     *     {number:1e+12,prefix:"T"},
+     *     {number:1e+15,prefix:"P"},
+     *     {number:1e+18,prefix:"E"},
+     *     {number:1e+21,prefix:"Z"},
+     *     {number:1e+24,prefix:"Y"}
+     * ]
+     */
+    prefixesOfBigNumbers: any[];
+    /**
+     * Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc.
+     * Prefixes are used on value axes and in the legend.
+     * To enable prefixes, set usePrefixes property to true.
+     * [
+     *     {number:1e-24, prefix:"y"},
+     *     {number:1e-21, prefix:"z"},
+     *     {number:1e-18, prefix:"a"},
+     *     {number:1e-15, prefix:"f"},
+     *     {number:1e-12, prefix:"p"},
+     *     {number:1e-9, prefix:"n"},
+     *     {number:1e-6, prefix:"μ"},
+     *     {number:1e-3, prefix:"m"}
+     * ]
+     */
+    prefixesOfSmallNumbers: any[];
+    /**
+     * Theme of a chart. Config files of themes can be found in amcharts/themes/ folder.
+     * More info about using themes.
+     */
+    theme: string;
+    /**
+     * Thousands separator.
+     * @default "."
+     */
+    thousandsSeparator: string;
+    /**
+     * Array of Title objects.
+     */
+    titles: Title[];
+    /**
+     * Type of a chart. Required when creating chart using JSON.
+     * Possible types are: serial, pie, xy, radar, funnel, gauge, map, stock.
+     */
+    type: string;
+    /**
+     * If true, prefixes will be used for big and small numbers.
+     * You can set arrays of prefixes via prefixesOfSmallNumbers and prefixesOfBigNumbers properties.
+     */
+    usePrefixes: boolean;
+    /**
+     * Read-only. Indicates current version of a script.
+     */
+    version: string;
+    /**
+     * Adds a label on a chart.
+     * You can use it for labeling axes, adding chart title, etc. x and y coordinates can be set in
+     * number, percent, or a number with ! in front of it -
+     * coordinate will be calculated from right or bottom instead of left or top.
+     * x - horizontal coordinate
+     * y - vertical coordinate
+     * text - label's text
+     * align - alignment (left/right/center)
+     * size - text size
+     * color - text color
+     * rotation - angle of rotation
+     * alpha - label alpha
+     * bold - specifies if text is bold (true/false),
+     * url - url
+     */
+    addLabel(
+        x: number | string,
+        y: number | string,
+        text: string,
+        align: string,
+        size?: number,
+        color?: string,
+        rotation?: number,
+        alpha?: number,
+        bold?: boolean,
+        url?: string,
+    ): any;
+    /**
+     * Adds a legend to the chart.
+     * By default, you don't need to create div for your legend,
+     * however if you want it to be positioned in some different way,
+     * you can create div anywhere you want and pass id or reference to your div as a second parameter.
+     * (NOTE: This method will not work on StockPanel.)
+     * @param legend - The legend.
+     * @param legendDivId - Id of the legend div (optional).
+     */
+    addLegend(legend: AmLegend, legendDivId?: string): void;
+    /**
+     * Adds a legend to the chart.
+     * By default, you don't need to create div for your legend,
+     * however if you want it to be positioned in some different way,
+     * you can create div anywhere you want and pass id or reference to your div as a second parameter.
+     * (NOTE: This method will not work on StockPanel.)
+     * @param legend - The legend.
+     * @param legendDiv - Legend div (optional).
+     */
+    addLegend(legend: AmLegend, legendDiv: HTMLElement): void;
+
+    /**
+     * Adds title to the top of the chart. Pie, Radar positions are updated so that they won't overlap.
+     * Plot area of Serial/XY chart is also updated unless autoMargins property is set to false.
+     * You can add any number of titles - each of them will be placed in a new line.
+     * To remove titles, simply clear titles array: chart.titles = []; and call chart.validateNow() method.
+     * text - text of a title size - font size color - title color alpha - title opacity bold -
+     * boolean value indicating if title should be bold.
+     */
+    addTitle(text: string, size: number, color: string, alpha: number, bold: boolean): void;
+    /**
+     * Clears the chart area, intervals, etc.
+     */
+    clear(): void;
+    /**
+     * Removes all labels added to the chart.
+     */
+    clearLabels(): void;
+    /**
+     * Use this method to force the chart to resize to it's current container size.
+     */
+    invalidateSize(): void;
+    /**
+     * Removes chart's legend.
+     */
+    removeLegend(): void;
+    /**
+     * This method should be called after data in your data provider changed or a new array was set to dataProvider.
+     * After calling this method the chart will parse data and redraw.
+     */
+    validateData(): void;
+    /**
+     * This method should be called after you changed one or more properties of any class.
+     * The chart will redraw after this method is called.
+     */
+    validateNow(): void;
+
+    /**
+     * Adds chart to the specified DIV.
+     */
+    write(container: string | HTMLDivElement): void;
+
+    /**
+     * Adds event listener of the type "dataUpdated" or "init" to the object.
+     * @param type "dataUpdated" or "init".
+     * @param handler
+     * If the type is "dataUpdated".
+     * Dispatched when chart is build for the first time or after validateData() method was called.
+     * If the type is "init". Dispatched when chart is build for the first time.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                type: string; // Either "dataUpdated" or "init".
+                chart: AmChart;
+            },
+        ) => void,
+    ): void;
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+}
diff --git a/types/amcharts/AmCoordinateChart.d.ts b/types/amcharts/AmCoordinateChart.d.ts
new file mode 100644
index 0000000000..6fea3b7209
--- /dev/null
+++ b/types/amcharts/AmCoordinateChart.d.ts
@@ -0,0 +1,151 @@
+import AmChart from "./AmChart";
+import AmGraph from "./AmGraph";
+import GraphDataItem from "./GraphDataItem";
+import Guide from "./Guide";
+import ValueAxis from "./ValueAxis";
+
+/**
+ * AmCoordinateChart is a base class of AmRectangularChart. It can not be instantiated explicitly.
+ */
+export default class AmCoordinateChart extends AmChart {
+    /**
+     * Array, holding processed chart's data.
+     */
+    chartData: object[];
+    /**
+     * Specifies the colors of the graphs if the lineColor of a graph is not set.
+     * It there are more graphs then colors in this array, the chart picks random color.
+     * @default ['#FF6600','#FCD202','#B0DE09','#0D8ECF','#2A0CD0','#CD0D74','#CC0000','#00CC00',
+     * '#0000CC','#DDDDDD','#999999','#333333','#990000']
+     */
+    colors: string[];
+    /**
+     * The array of graphs belonging to this chart.
+     * To add/remove graph use addGraph/removeGraph methods instead of adding/removing graphs directly to array.
+     */
+    graphs: AmGraph[];
+    /**
+     * Specifies if grid should be drawn above the graphs or below. Will not work properly with 3D charts.
+     * @default false
+     */
+    gridAboveGraphs: boolean;
+    /**
+     * Instead of adding guides to the axes, you can push all of them to this array.
+     * In case guide has category or date defined, it will automatically will be assigned to the category axis.
+     * Otherwise to first value axis, unless you specify a different valueAxis for the guide.
+     */
+    guides: Guide[];
+    /**
+     * Specifies whether the animation should be sequenced or all objects should appear at once.
+     * @default true
+     */
+    sequencedAnimation: boolean;
+    /**
+     * The initial opacity of the column/line.
+     * If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha.
+     * Value range is 0 - 1.
+     * @default 1
+     */
+    startAlpha: number;
+    /**
+     * Duration of the animation, in seconds.
+     */
+    startDuration: number;
+    /**
+     * Animation effect.
+     * Possible values are ">", "<", elastic" and "bounce".
+     * @default "elastic"
+     */
+    startEffect: string;
+    /**
+     * Target of url.
+     * @default this
+     */
+    urlTarget: any;
+    /**
+     * The array of value axes.
+     * To add/remove value axis use addValueAxis/removeValueAxis methods instead of
+     * adding/removing axes directly to array.
+     * Chart creates one value axis automatically, so if you need only one value axis, you don't need to create it.
+     */
+    valueAxes: any[];
+    /**
+     * Adds a graph to the chart.
+     */
+    addGraph(graph: AmGraph): void;
+    /**
+     * Adds value axis to the chart.
+     * One value axis is created automatically, so if you don't want to change anything or add more value axes,
+     * you don't need to add it.
+     */
+    addValueAxis(axis: ValueAxis): void;
+    /**
+     * You can trigger the animation of the chart.
+     */
+    animateAgain(): void;
+    /**
+     * AmGraph Returns graph by id.
+     */
+    getGraphById(graphId: string): AmGraph;
+    /**
+     * Returns value axis by id.
+     */
+    getValueAxisById(axisId: string): ValueAxis;
+    /**
+     * Hide the graph (if it is visible).
+     * Usually this method is called from the Legend, when you click on the legend marker.
+     */
+    hideGraph(graph: AmGraph): void;
+    /**
+     * Hide value balloon of a graph.
+     * Usually this method is called from the Legend, when you click on the legend text.
+     */
+    hideGraphsBalloon(graph: AmGraph): void;
+    /**
+     * Highlight the graph. Usually this method is called from the Legend, when you roll-over the legend entry.
+     */
+    highlightGraph(graph: AmGraph): void;
+    /**
+     * Removes graph from the chart.
+     */
+    removeGraph(graph: AmGraph): void;
+    /**
+     * Removes value axis from the chart.
+     * When you remove value axis, all graphs assigned to this axis are also removed.
+     */
+    removeValueAxis(axis: ValueAxis): void;
+    /**
+     * Show the graph (if it is hidden).
+     * Usually this method is called from the Legend, when you click on the legend marker.
+     */
+    showGraph(graph: AmGraph): void;
+    /**
+     * Show value balloon of a graph.
+     * Usually this method is called from the Legend, when you click on the legend text.
+     */
+    showGraphsBalloon(graph: AmGraph): void;
+    /**
+     * UnhighlightGraph the graph.
+     * Usually this method is called from the Legend, when you roll-out the legend entry.
+     */
+    unhighlightGraph(graph: AmGraph): void;
+    /**
+     * Adds event listener of the type "clickGraphItem" or "doubleClickGraphItem" or
+     * "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem" to the object.
+     * @param type Either "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem"
+     * or "rollOutGraphItem" or "rollOverGraphItem".
+     * @param handler Dispatched when user clicks on the data item (column/bullet)
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                type: string;
+                graph: AmGraph;
+                item: GraphDataItem;
+                index: number;
+                chart: AmChart;
+            },
+        ) => void,
+    ): void;
+}
diff --git a/types/amcharts/AmGraph.d.ts b/types/amcharts/AmGraph.d.ts
new file mode 100644
index 0000000000..170806637b
--- /dev/null
+++ b/types/amcharts/AmGraph.d.ts
@@ -0,0 +1,652 @@
+import AmBalloon from "./AmBalloon";
+import GraphDataItem from "./GraphDataItem";
+import ValueAxis from "./ValueAxis";
+
+/**
+ * AmGraph class displays all types of graphs - line, column, step line, smoothed line, ohlc and candlestick.
+ * @example
+ * let chart = new AmCharts.AmSerialChart();
+ * let graph = new AmCharts.AmGraph();
+ * graph.valueField = 'value';
+ * graph.type = 'column';
+ * graph.fillAlphas = 1;
+ * chart.addGraph(graph);
+ */
+export default class AmGraph {
+    /**
+     * Text which screen readers will read if user rolls-over the bullet/column or sets focus using tab key
+     * (this is possible only if tabIndex property of AmGraph is set to some number).
+     * Text is added as aria-label tag. Note - not all screen readers and browsers support this.
+     * @default "[[title]] [[category]] [[value]]"
+     */
+    accessibleLabel: string;
+    /**
+     * Name of the alpha field in your dataProvider.
+     */
+    alphaField: string;
+    /**
+     * If you set this to true before chart is drawn, the animation of this graph won't be played.
+     * @default false
+     */
+    animationPlayed: boolean;
+    /**
+     * Allows customizing graphs balloons individually (only when ChartCursor is used).
+     * Note: the balloon object is not created automatically, you should create it before setting properties
+     */
+    balloon: AmBalloon;
+    /**
+     * Value balloon color. Will use graph or data item color if not set.
+     */
+    balloonColor: string;
+    /**
+     * If you set some function, the graph will call it and pass GraphDataItem and AmGraph objects to it.
+     * This function should return a string which will be displayed in a balloon.
+     */
+    balloonFunction(graphDataItem: GraphDataItem, amGraph: AmGraph): string;
+    /**
+     * Balloon text.
+     * You can use tags like
+     * [[value]],
+     * [[description]],
+     * [[percents]],
+     * [[open]],
+     * [[category]]
+     * or any other field name from your data provider. HTML tags can also be used.
+     * @default [[value]]
+     */
+    balloonText: string;
+    /**
+     * Specifies if the line graph should be placed behind column graphs
+     * @default false
+     */
+    behindColumns: boolean;
+    /**
+     * Type of the bullets.
+     * Possible values are:
+     * "none", "round", "square", "triangleUp", "triangleDown", "triangleLeft", "triangleRight",
+     * "bubble", "diamond", "xError", "yError" and "custom".
+     * @default "none"
+     */
+    bullet: string;
+    /**
+     * Opacity of bullets. Value range is 0 - 1.
+     * @default 1
+     */
+    bulletAlpha: number;
+    /**
+     * bulletAxis value is used when you are building error chart.
+     * Error chart is a regular serial or XY chart with bullet type set to "xError" or "yError".
+     * The graph should know which axis should be used to determine the size of this bullet -
+     * that's when bulletAxis should be set. Besides that, you should also set graph.errorField.
+     * You can also use other bullet types with this feature too.
+     * For example, if you set bulletAxis for XY chart, the size of a bullet will change as you zoom the chart.
+     */
+    bulletAxis: ValueAxis;
+    /**
+     * Bullet border opacity.
+     * @default 0
+     */
+    bulletBorderAlpha: number;
+    /**
+     * Bullet border color. Will use lineColor if not set.
+     */
+    bulletBorderColor: string;
+    /**
+     * Bullet border thickness.
+     * @default 2
+     */
+    bulletBorderThickness: number;
+    /**
+     * Bullet color. Will use lineColor if not set.
+     */
+    bulletColor: string;
+    /**
+     * Name of the bullet field in your dataProvider.
+     */
+    bulletField: string;
+    /**
+     * Useful for touch devices - if you set it to 20 or so, the bullets of a graph will have
+     * invisible circle around the actual bullet (bullets should still be enabled),
+     * which will be easier to touch (bullets usually are smaller and hard to hit).
+     */
+    bulletHitAreaSize: number;
+    /**
+     * Bullet offset. Distance from the actual data point to the bullet.
+     * Can be used to place custom bullets above the columns.
+     * @default 0
+     */
+    bulletOffset: number;
+    /**
+     * Bullet size.
+     * @default 8
+     */
+    bulletSize: number;
+    /**
+     * Name of the bullet size field in your dataProvider.
+     */
+    bulletSizeField: string;
+    /**
+     * If this field is set and addClassNames is enabled, the chart will look for a class name string in
+     * data using this setting and apply additional class names to elements of the particular data points,
+     * such as bullets.
+     */
+    classNameField: string;
+    /**
+     * Name of the close field (used by candlesticks and ohlc) in your dataProvider.
+     */
+    closeField: string;
+    /**
+     * In case you want to place this graph's columns in front of other columns, set this to false.
+     * In case "true", the columns will be clustered next to each other.
+     * NOTE: clustering works only for graphs of type "column".
+     * @default true
+     */
+    clustered: boolean;
+    /**
+     * Color of value labels. Will use chart's color if not set.
+     */
+    color: string;
+    /**
+     * Name of the color field in your dataProvider.
+     */
+    colorField: string;
+    /**
+     * You can use this property with non-stacked column graphs and specify order of columns of each category
+     * (starting from 0).
+     * Important: this feature does not work in stacked columns scenarios as well as with graph
+     * toggling enabled in legend.
+     */
+    columnIndexField: string;
+    /**
+     * You can specify custom column width for each graph individually.
+     * Value range is 0 - 1 (we set relative width, not pixel width here).
+     */
+    columnWidth: number;
+    /**
+     * Specifies whether to connect data points if data is missing. The default value is true.
+     * This feature does not work with XY chart.
+     * @default true
+     */
+    connect: boolean;
+    /**
+     * Corner radius of column. It can be set both in pixels or in percents.
+     * The chart's depth and angle styles must be set to 0. The default value is 0.
+     * Note, cornerRadiusTop will be applied for all corners of the column,
+     * JavaScript charts do not have a possibility to set separate corner radius for top and bottom.
+     * As we want all the property names to be the same both on JS and Flex, we didn't change this too.
+     * @default 0
+     */
+    cornerRadiusTop: number;
+    /**
+     * If bulletsEnabled of ChartCurosor is true, a bullet on each graph follows the cursor.
+     * You can set opacity of each graphs bullet. In case you want to disable these bullets for a certain graph,
+     * set opacity to 0.
+     * @default 1
+     */
+    cursorBulletAlpha: number;
+    /**
+     * Path to the image of custom bullet.
+     */
+    customBullet: string;
+    /**
+     * Name of the custom bullet field in your dataProvider.
+     */
+    customBulletField: string;
+    /**
+     * Path to the image for legend marker.
+     */
+    customMarker: string;
+    /**
+     * Dash length. If you set it to a value greater than 0, the graph line (or columns border) will be dashed.
+     * @default 0
+     */
+    dashLength: number;
+    /**
+     * Name of the dash length field in your dataProvider.
+     * This property adds a possibility to change graphs’ line from solid to dashed on any data point.
+     * You can also make columns border dashed using this setting. Note, this won't work with smoothedLineGraph.
+     */
+    dashLengthField: string;
+    /**
+     * Used to format balloons if value axis is date-based.
+     * @default "MMM DD, YYYY"
+     */
+    dateFormat: string;
+    /**
+     * Name of the description field in your dataProvider.
+     */
+    descriptionField: string;
+    /**
+     * Name of error value field in your data provider.
+     */
+    errorField: string;
+    /**
+     * Opacity of fill. Plural form is used to keep the same property names as our Flex charts'.
+     * Flex charts can accept array of numbers to generate gradients.
+     * Although you can set array here, only first value of this array will be used.
+     * @default 0
+     */
+    fillAlphas: number;
+    /**
+     * Fill color. Will use lineColor if not set. You can also set array of colors here.
+     */
+    fillColors: string;
+    /**
+     * Name of the fill colors field in your dataProvider.
+     * This property adds a possibility to change line graphs’ fill color on any data point to create highlighted
+     * sections of the graph. Works only with AmSerialChart.
+     */
+    fillColorsField: string;
+    /**
+     * XY chart only. If you set this property to id or reference of your X or Y axis, and the fillAlphas is > 0,
+     * the area between graph and axis will be filled with color, like in this demo.
+     */
+    fillToAxis: ValueAxis;
+    /**
+     * You can set another graph here and if fillAlpha is >0, the area from this graph to fillToGraph will be filled
+     * (instead of filling the area to the X axis).
+     * This feature is not supported by smoothedLine graphs and Radar chart.
+     */
+    fillToGraph: AmGraph;
+    /**
+     * Column width in pixels.
+     * If you set this property, columns will be of a fixed width and won't adjust to the available space.
+     */
+    fixedColumnWidth: number;
+    /**
+     * Size of value labels text. Will use chart's fontSize if not set.
+     */
+    fontSize: number;
+    /**
+     * If this is set `true`, the graph will always break the line if the distance in time between
+     * two adjacent data points is bigger than `gapPeriod x minPeriod`, even if `connect` is set to `true`.
+     * @default false
+     */
+    forceGap: boolean;
+    /**
+     * Name of the gap field in your dataProvider.
+     * You can force graph to show gap at a desired data point using this feature.
+     * This feature does not work with XY chart.
+     */
+    gapField: string;
+    /**
+     * Using this property you can specify when graph should display gap -
+     * if the time difference between data points is bigger than duration of minPeriod * gapPeriod,
+     * and connect property of a graph is set to false, graph will display gap.
+     * @default 1.1
+     */
+    gapPeriod: number;
+    /**
+     * Orientation of the gradient fills (only for "column" graph type).
+     * Possible values are "vertical" and "horizontal".
+     * @default "vertical"
+     */
+    gradientOrientation: string;
+    /**
+     * Specifies whether the graph is hidden.
+     * Do not use this to show/hide the graph, use hideGraph(graph) and showGraph(graph) methods instead.
+     * @default false
+     */
+    hidden: boolean;
+    /**
+     * If there are more data points than hideBulletsCount, the bullets will not be shown.
+     * 0 means the bullets will always be visible.
+     * @default 0
+     */
+    hideBulletsCount: number;
+    /**
+     * Name of the high field (used by candlesticks and ohlc) in your dataProvider.
+     */
+    highField: string;
+    /**
+     * Unique id of a graph.
+     * It is not required to set one, unless you want to use this graph for as your scrollbar's graph and need
+     * to indicate which graph should be used.
+     */
+    id: string;
+    /**
+     * Whether to include this graph when calculating min and max value of the axis.
+     * @default true
+     */
+    includeInMinMax: boolean;
+    /**
+     * Data label text anchor.
+     * @default "auto"
+     */
+    labelAnchor: string;
+    /**
+     * Name of label color field in data provider.
+     */
+    labelColorField: string;
+    /**
+     * You can use it to format labels of data items in any way you want.
+     * Graph will call this function and pass reference to GraphDataItem and formatted text as attributes.
+     * This function should return string which will be displayed as label.
+     */
+    labelFunction(value: number, valueText: string, valueAxis: ValueAxis): string;
+    labelFunction(valueText: string, data: Date, valueAxis: ValueAxis): string;
+    /**
+     * Offset of data label.
+     * @default 0
+     */
+    labelOffset: number;
+    /**
+     * Position of value label. Possible values are: "bottom", "top", "right", "left", "inside", "middle".
+     * Sometimes position is changed by the chart, depending on a graph type, rotation, etc.
+     * @default "top"
+     */
+    labelPosition: string;
+    /**
+     * Rotation of a data label.
+     * @default 0
+     */
+    labelRotation: number;
+    /**
+     * Value label text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]].
+     */
+    labelText: string;
+    /**
+     * Legend marker opacity. Will use lineAlpha if not set. Value range is 0 - 1.
+     */
+    legendAlpha: number;
+    /**
+     * Legend marker color. Will use lineColor if not set.
+     */
+    legendColor: string;
+    /**
+     * It is called and the following attributes are passed:
+     * dataItem, formattedText, periodValues, periodPercentValues
+     * It should return hex color code which will be used for legend marker.
+     */
+    legendColorFunction: object;
+    /**
+     * The text which will be displayed in the value portion of the legend when user is not hovering above
+     * any data point. The tags should be made out of two parts - the name of a field
+     * (value / open / close / high / low)
+     * and the value of the period you want to be show -
+     * open / close / high / low / sum / average / count.
+     * For example: [[value.sum]]
+     * means that sum of all data points of value field in the selected period will be displayed.
+     */
+    legendPeriodValueText: string;
+    /**
+     * Legend value text.
+     * You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]]
+     * You can also use custom fields from your dataProvider. If not set, uses Legend's valueText.
+     */
+    legendValueText: string;
+    /**
+     * Opacity of the line (or column border). Value range is 0 - 1.
+     * @default 1
+     */
+    lineAlpha: number;
+    /**
+     * Color of the line (or column border).
+     * If you do not set any, the color from AmCoordinateChart.colors array will be used for each subsequent graph.
+     */
+    lineColor: string;
+    /**
+     * Name of the line color field in your dataProvider.
+     * This property adds a possibility to change graphs’ line color on any data point to create highlighted
+     * sections of the graph. Works only with AmSerialChart.
+     */
+    lineColorField: string;
+    /**
+     * Specifies thickness of the graph line (or column border).
+     * @default 1
+     */
+    lineThickness: number;
+    /**
+     * Name of the low field (used by candlesticks and ohlc) in your dataProvider.
+     */
+    lowField: string;
+    /**
+     * Legend marker type. You can set legend marker (key) type for individual graphs.
+     * Possible values are:
+     * square, circle, diamond, triangleUp, triangleDown, triangleLeft, triangleDown, bubble, line, none.
+     */
+    markerType: string;
+    /**
+     * Specifies size of the bullet which value is the biggest (XY chart).
+     * @default 50
+     */
+    maxBulletSize: number;
+    /**
+     * Specifies minimum size of the bullet (XY chart).
+     * @default 4
+     */
+    minBulletSize: number;
+    /**
+     * It is useful if you have really lots of data points.
+     * Based on this property the graph will omit some of the lines
+     * (if the distance between points is less that minDistance, in pixels).
+     * This will not affect the bullets or indicator in anyway, so the user will not see any difference
+     * (unless you set minValue to a bigger value, let say 5),
+     * but will increase performance as less lines will be drawn.
+     * By setting value to a bigger number you can also make your lines look less jagged.
+     * @default 1
+     */
+    minDistance: number;
+    /**
+     * If you use different colors for your negative values, a graph below zero line is filled with negativeColor.
+     * With this property you can define a different base value at which
+     * colors should be changed to negative colors.
+     * @default 0
+     */
+    negativeBase: number;
+    /**
+     * Fill opacity of negative part of the graph. Will use fillAlphas if not set.
+     */
+    negativeFillAlphas: number;
+    /**
+     * Fill color of negative part of the graph. Will use fillColors if not set.
+     */
+    negativeFillColors: string;
+    /**
+     * Opacity of the negative portion of the line (or column border). Value range is 0 - 1.
+     * @default 1
+     */
+    negativeLineAlpha: number;
+    /**
+     * Color of the line (or column) when the values are negative.
+     * In case the graph type is "candlestick" or "ohlc", "negativeLineColor" is used
+     * when close value is less then open value.
+     */
+    negativeLineColor: string;
+    /**
+     * If you set it to true, column chart will begin new stack.
+     * This allows having Clustered and Stacked column/bar chart.
+     * @default false
+     */
+    newStack: boolean;
+    /**
+     * In case you want to have a step line graph without risers, you should set this to true.
+     * @default false
+     */
+    noStepRisers: boolean;
+    /**
+     * Name of the open field (used by floating columns, candlesticks and ohlc) in your dataProvider.
+     */
+    openField: string;
+    /**
+     * Value of pattern should be object with url, width, height of an image, optionally it might have x, y, randomX
+     * and randomY values.
+     * For example: {"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4}.
+     * If you want to have individual patterns for each column, define patterns in data provider and set
+     * graph.patternField property. Check amcharts/patterns folder for some patterns.
+     * You can create your own patterns and use them. Note, x, y, randomX and randomY properties won't work
+     * with IE8 and older. 3D bar/Pie charts won't work properly with patterns.
+     */
+    pattern: object;
+    /**
+     * Field name in your data provider which holds pattern information.
+     * Value of pattern should be object with url, width, height of an image,
+     * optionally it might have x, y, randomX and randomY values.
+     * For example: {"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4}.
+     * Check amcharts/patterns folder for some patterns. You can create your own patterns and use them.
+     * Note, x, y, randomX and randomY properties won't work with IE8 and older.
+     * 3D bar/Pie charts won't work properly with patterns.
+     */
+    patternField: string;
+    /**
+     * This property can be used by step graphs - you can set how many periods one horizontal line should span.
+     * @default 1
+     */
+    periodSpan: number;
+    /**
+     * Specifies where data points should be placed -
+     * on the beginning of the period (day, hour, etc) or in the middle
+     * (only when parseDates property of categoryAxis is set to true).
+     * This setting affects Serial chart only. Possible values are "start", "middle" and "end"
+     * @default "middle"
+     */
+    pointPosition: string;
+    /**
+     * Precision of values. Will use chart's precision if not set any.
+     */
+    precision: number;
+    /**
+     * If this is set to true, candlesticks will be colored in a different manner -
+     * if current close is less than current open, the candlestick will be empty, otherwise - filled with color.
+     * If previous close is less than current close, the candlestick will use positive color,
+     * otherwise - negative color.
+     * @default false
+     */
+    proCandlesticks: boolean;
+    /**
+     * Gantt chart only. Contains unmodified segment object from data provider.
+     */
+    segmentData: object;
+    /**
+     * If graph's type is column and labelText is set, graph hides labels which do not fit into the column's
+     * space or go outside plot area. If you don't want these labels to be hidden, set this to true.
+     * @default false
+     */
+    showAllValueLabels: boolean;
+    /**
+     * Specifies whether the value balloon of this graph is shown when mouse is over data item or chart's
+     * indicator is over some series.
+     * @default true
+     */
+    showBalloon: boolean;
+    /**
+     * Specifies graphs value at which cursor is showed. This is only important for candlestick and ohlc charts,
+     * also if column chart has "open" value.
+     * Possible values are: "open", "close", "high", "low".
+     * "top" and "bottom" values will glue the balloon to top/bottom of the plot area.
+     * @default "close"
+     */
+    showBalloonAt: string;
+    /**
+     * Works with candlestick graph type, you can set it to open, close, high, low.
+     * If you set it to high, the events will be shown at the tip of the high line.
+     * @default "close"
+     */
+    showBulletsAt: string;
+    /**
+     * If you want mouse pointer to change to hand when hovering the graph, set this property to true.
+     * @default false
+     */
+    showHandOnHover: boolean;
+    /**
+     * It can only be used together with topRadius (when columns look like cylinders).
+     * If you set it to true, the cylinder will be lowered down so that the center of it's bottom circle would be
+     * right on category axis.
+     * @default false
+     */
+    showOnAxis: boolean;
+    /**
+     * If the value axis of this graph has stack types like "regular" or "100%"
+     * You can exclude this graph from stacking.
+     * @default true
+     */
+    stackable: boolean;
+    /**
+     * Step graph only. Specifies to which direction step should be drawn.
+     * @default "right"
+     */
+    stepDirection: string;
+    /**
+     * If you set it to false, the graph will not be hidden when user clicks on legend entry.
+     * @default true
+     */
+    switchable: boolean;
+    /**
+     * In case you set it to some number, the chart will set focus on bullet/column (starting from first)
+     * when user clicks tab key. When a focus is set, screen readers like NVDA Screen reader will read label
+     * which is set using accessibleLabel property of AmGraph. Note, not all browsers and readers support this.
+     */
+    tabIndex: number;
+    /**
+     * Graph title.
+     */
+    title: string;
+    /**
+     * If you set this to 1, columns will become cylinders (must set depth3D and angle properties of a chart to >0
+     * values in order this to be visible). you can make columns look like cones (set topRadius to 0)
+     * or even like some glasses (set to bigger than 1). We strongly recommend setting grid opacity to 0
+     * in order this to look good.
+     */
+    topRadius: number;
+    /**
+     * Type of the graph.
+     * Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc".
+     * XY and Radar charts can only display "line" type graphs.
+     * @default "line"
+     */
+    type: string;
+    /**
+     * Name of the url field in your dataProvider.
+     */
+    urlField: string;
+    /**
+     * Target to open URLs in, i.e. _blank, _top, etc.
+     */
+    urlTarget: string;
+    /**
+     * If set to true, the bullet border will take the same color as graph line.
+     * @default false
+     */
+    useLineColorForBulletBorder: boolean;
+    /**
+     * If negativeLineColor and/or negativeFillColors are set and useNegativeColorIfDown is set to true
+     * (default is false), the line, step and column graphs will use these colors for lines,
+     * bullets or columns if previous value is bigger than current value. In case you set openField for the graph,
+     * the graph will compare current value with openField value instead of comparing to previous value.
+     * @default false
+     */
+    useNegativeColorIfDown: boolean;
+    /**
+     * Specifies which value axis the graph will use. Will use the first value axis if not set.
+     * You can use reference to the real ValueAxis object or set value axis id.
+     * @default ValueAxis
+     */
+    valueAxis: ValueAxis;
+    /**
+     * Name of the value field in your dataProvider.
+     */
+    valueField: string;
+    /**
+     * Specifies whether this graph should be shown in the Legend.
+     * @default true
+     */
+    visibleInLegend: boolean;
+    /**
+     * XY chart only. A horizontal value axis object to attach graph to.
+     * @default ValueAxis
+     */
+    xAxis: ValueAxis;
+    /**
+     * XY chart only. Name of the x field in your dataProvider.
+     */
+    xField: string;
+    /**
+     * XY chart only. A vertical value axis object to attach graph to.
+     * @default ValueAxis
+     */
+    yAxis: ValueAxis;
+    /**
+     * XY chart only. Name of the y field in your dataProvider.
+     */
+    yField: string;
+}
diff --git a/types/amcharts/AmLegend.d.ts b/types/amcharts/AmLegend.d.ts
new file mode 100644
index 0000000000..0802fa32f3
--- /dev/null
+++ b/types/amcharts/AmLegend.d.ts
@@ -0,0 +1,247 @@
+import AmChart from "./AmChart";
+
+/**
+ * AmLegend is the class that displays legend of the chart.
+ * Legend to the chart should be added using chart.addLegend(legend) method.
+ * @example
+ * let chart = new AmCharts.AmSerialChart();
+ * let legend = new AmCharts.AmLegend();
+ * chart.addLegend(legend);
+ */
+export default class AmLegend {
+    /**
+     * Alignment of legend entries. Possible values are: "left", "center", "right". left
+     */
+    align: string;
+    /**
+     * Used if chart is Serial or XY.
+     * In case true, margins of the legend are adjusted and made equal to chart's margins.
+     * @default true
+     */
+    autoMargins: boolean;
+    /**
+     * Opacity of legend's background. Value range is 0 - 1
+     */
+    backgroundAlpha: number;
+    /**
+     * Background color. You should set backgroundAlpha to >0 vallue in order background to be visible.
+     * @default "#FFFFFF"
+     */
+    backgroundColor: string;
+    /**
+     * Opacity of chart's border. Value range is 0 - 1.
+     */
+    borderAlpha: number;
+    /**
+     * Color of legend's border. You should set borderAlpha >0 in order border to be visible.
+     * @default "#000000"
+     */
+    borderColor: string;
+    /**
+     * In case legend position is set to "absolute", you can set distance from bottom of the chart, in pixels.
+     */
+    bottom: number;
+    /**
+     * Text color. Will use chart's color if not set.
+     */
+    color: string;
+    /**
+     * This can be used by AmMap only.
+     * You can pass array of objects with title, color, markerType values, for example:
+     * [{title: "One", color: "#3366CC"},{title: "Two", color: "#FFCC33"}]
+     */
+    data: any[];
+    /**
+     * Specifies if each of legend entry should be equal to the most wide entry.
+     * Won't look good if legend has more than one line.
+     * @default true
+     */
+    equalWidths: boolean;
+    /**
+     * Font size. Will use chart's font size if not set.
+     */
+    fontSize: string;
+    /**
+     * Horizontal space between legend item and left/right border.
+     */
+    horizontalGap: number;
+    /**
+     * The text which will be displayed in the legend.
+     * Tag [[title]] will be replaced with the title of the graph. [[title]]
+     */
+    labelText: string;
+    /**
+     * In case legend position is set to "absolute", you can set distance from left side of the chart, in pixels.
+     */
+    left: number;
+    /**
+     * Bottom margin.
+     */
+    marginBottom: number;
+    /**
+     * Left margin.
+     * This property will be ignored if chart is Serial or XY
+     * and autoMargins property of the legend is true (default).
+     * @default 20
+     */
+    marginLeft: number;
+    /**
+     * Right margin.
+     * This property will be ignored if chart is Serial or XY
+     * and autoMargins property of the legend is true (default).
+     * @default 20
+     */
+    marginRight: number;
+    /**
+     * Top margin.
+     */
+    marginTop: number;
+    /**
+     * Marker border opacity 1.
+     */
+    markerBorderAlpha: number;
+    /**
+     * Marker border color. If not set, will use the same color as marker.
+     */
+    markerBorderColor: string;
+    /**
+     * Thickness of the legend border.
+     * The default value (0) means the line will be a "hairline" (1 px).
+     * In case marker type is line, this style will be used for line thickness.
+     * @default 1
+     */
+    markerBorderThickness: number;
+    /**
+     * The color of the disabled marker (when the graph is hidden). #AAB3B3
+     */
+    markerDisabledColor: string;
+    /**
+     * Space between legend marker and legend text, in pixels.
+     * @default 5
+     */
+    markerLabelGap: number;
+    /**
+     * Size of the legend marker (key).
+     * @default 16
+     */
+    markerSize: number;
+    /**
+     * Shape of the legend marker (key).
+     * Possible values are:
+     * "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none". square
+     */
+    markerType: string;
+    /**
+     * Maximum number of columns in the legend.
+     * If Legend's position is set to "right" or "left", maxColumns is automatically set to 1.
+     */
+    maxColumns: number;
+    /**
+     * Position of a legend. Possible values are: "bottom", "top", "left", "right" and "absolute".
+     * In case "absolute", you should set left and top properties too. (this setting is ignored in Stock charts).
+     * In case legend is used with AmMap, position is set to "absolute" automatically.  bottom
+     */
+    position: string;
+    /**
+     * Specifies whether legend entries should be placed in reversed order.
+     */
+    reversedOrder: boolean;
+    /**
+     * In case legend position is set to "absolute", you can set distance from right side of the chart, in pixels.
+     */
+    right: number;
+    /**
+     * Legend item text color on roll-over.  #CC0000
+     */
+    rollOverColor: string;
+    /**
+     * When you roll-over the legend entry, all other graphs can reduce their opacity,
+     * so that the graph you rolled-over would be distinguished. This style specifies the opacity of the graphs.
+     * @default 1
+     */
+    rollOverGraphAlpha: number;
+    /**
+     * You can use this property to turn all the legend entries off.
+     * @default true
+     */
+    showEntries: boolean;
+    /**
+     * Horizontal space between legend items, in pixels.
+     * @default 10
+     */
+    spacing: number;
+    /**
+     * Whether showing/hiding of graphs by clicking on the legend marker is enabled or not.
+     * In case legend is used with AmMap, this is set to false automatically.
+     * @default true
+     */
+    switchable: boolean;
+    /**
+     * Legend switch color. #FFFFFF
+     */
+    switchColor: string;
+    /**
+     * Legend switch type (in case the legend is switchable). Possible values are "x" and "v". x
+     */
+    switchType: string;
+    /**
+     * If true, clicking on the text will show/hide balloon of the graph.
+     * Otherwise it will show/hide graph/slice, if switchable is set to true.
+     */
+    textClickEnabled: boolean;
+    /**
+     * In case legend position is set to "absolute", you can set distance from top of the chart, in pixels.
+     */
+    top: number;
+    /**
+     * Legend markers can mirror graph’s settings, displaying a line and a real bullet as in the graph itself.
+     * Set this property to true if you want to enable this feature.
+     * Note, if you set graph colors in dataProvider, they will not be reflected in the marker.
+     * @default false
+     */
+    useGraphSettings: boolean;
+    /**
+     * Specifies if legend labels should be use same color as corresponding markers.
+     */
+    useMarkerColorForLabels: boolean;
+    /**
+     * Alignment of the value text. Possible values are "left" and "right". right
+     */
+    valueAlign: string;
+    /**
+     * The text which will be displayed in the value portion of the legend.
+     * You can use tags like
+     * [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. [[value]]
+     */
+    valueText: string;
+    /**
+     * Width of the value text.
+     * @default 80
+     */
+    valueWidth: number;
+    /**
+     * Vertical space between legend items also between legend border and first and last legend row.
+     * @default: 10
+     */
+    verticalGap: number;
+    /**
+     * Adds event listener of the type "clickLabel" or "clickMarker" or "hideItem" to the object.
+     * @param type Either "clickLabel" or "clickMarker" or "hideItem".
+     * @param handler The event handler.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                type: string;
+                dataItem: object;
+                chart: AmChart;
+            },
+        ) => void,
+    ): void;
+
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+}
diff --git a/types/amcharts/AmPieChart.d.ts b/types/amcharts/AmPieChart.d.ts
new file mode 100644
index 0000000000..0db5e23ee5
--- /dev/null
+++ b/types/amcharts/AmPieChart.d.ts
@@ -0,0 +1,314 @@
+import AmChart from "./AmChart";
+import Slice from "./Slice";
+
+/**
+ * AmPieChart class creates pie/donut chart.
+ * In order to display pie chart you need to set at least these three properties
+ * dataProvider, titleField and valueField.
+ * @example
+ * let chartData = [{title:"Pie I have eaten",value:70},{title:"Pie I haven\'t eaten",value:30}];
+ * let chart = new AmCharts.AmPieChart();
+ * chart.valueField = "value";
+ * chart.titleField = "title";
+ * chart.dataProvider = chartData;
+ * chart.write("chartdiv");
+ */
+export default class AmPieChart extends AmChart {
+    /**
+     * Name of the field in chart's dataProvider which holds slice's alpha.
+     */
+    alphaField: string;
+    /**
+     * Pie lean angle (for 3D effect). Valid range is 0 - 90.
+     */
+    angle: number;
+    /**
+     * Balloon text. The following tags can be used:
+     * [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]% ([[value]])\n[[description]]
+     */
+    balloonText: string;
+    /**
+     * Read-only. Array of Slice objects.
+     */
+    chartData: any[];
+    /**
+     * Name of the field in chart's dataProvider which holds slice's color.
+     */
+    colorField: string;
+    /**
+     * Specifies the colors of the slices, if the slice color is not set.
+     * If there are more slices than colors in this array, the chart picks random color.
+     * [
+     * "#FF0F00", "#FF6600", "#FF9E01", "#FCD202", "#F8FF01", "#B0DE09", "#04D215", "#0D8ECF",
+     * "#0D52D1", "#2A0CD0", "#8A0CCF", "#CD0D74", "#754DEB", "#DDDDDD", "#999999", "#333333",
+     * "#000000", "#57032A", "#CA9726", "#990000", "#4B0C25"
+     * ]
+     */
+    colors: any[];
+    /**
+     * Depth of the pie (for 3D effect).
+     */
+    depth3D: number;
+    /**
+     * Name of the field in chart's dataProvider which holds a string with description.
+     */
+    descriptionField: string;
+    /**
+     * Example: [-0.2,0.2]. Will make slices to be filled with color gradients.
+     */
+    gradientRatio: number[];
+    /**
+     * Opacity of the group slice. Value range is 0 - 1.
+     * @default 1
+     */
+    groupedAlpha: number;
+    /**
+     * Color of the group slice. The default value is not set -
+     * this means the next available color from "colors" array will be used.
+     */
+    groupedColor: string;
+    /**
+     * Description of the group slice.
+     */
+    groupedDescription: string;
+    /**
+     * If this is set to true, the group slice will be pulled out when the chart loads.
+     */
+    groupedPulled: boolean;
+    /**
+     * Title of the group slice. Other
+     */
+    groupedTitle: string;
+    /**
+     * If there is more than one slice whose percentage of the pie is less than this number,
+     * those slices will be grouped together into one slice.
+     * This is the "other" slice. It will always be the last slice in a pie.
+     */
+    groupPercent: number;
+    /**
+     * Slices with percent less then hideLabelsPercent won't display labels.
+     * This is useful to avoid cluttering up the chart, if you have a lot of small slices.
+     * 0 means all labels will be shown.
+     */
+    hideLabelsPercent: number;
+    /**
+     * Opacity of a hovered slice. Value range is 0 - 1.
+     * @default 1
+     */
+    hoverAlpha: number;
+    /**
+     * Inner radius of the pie, in pixels or percents.
+     */
+    innerRadius: any;
+    /**
+     * The distance between the label and the slice, in pixels.
+     * You can use negative values to put the label on the slice.
+     * @default 30
+     */
+    labelRadius: number;
+    /**
+     * Name of the field in dataProvider which specifies the length of a tick.
+     * Note, the chart will not try to arrange labels automatically if this property is set.
+     */
+    labelRadiusField: string;
+    /**
+     * Specifies whether data labels are visible.
+     * @default true
+     */
+    labelsEnabled: boolean;
+    /**
+     * Label text. The following tags can be used:
+     * [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]%
+     */
+    labelText: string;
+    /**
+     * Label tick opacity. Value range is 0 - 1. 0.2
+     */
+    labelTickAlpha: number;
+    /**
+     * Label tick color. #000000
+     */
+    labelTickColor: string;
+    /**
+     * Bottom margin of the chart.
+     * @default 5
+     */
+    marginBottom: number;
+    /**
+     * Left margin of the chart.
+     */
+    marginLeft: number;
+    /**
+     * Right margin of the chart.
+     */
+    marginRight: number;
+    /**
+     * Top margin of the chart.
+     * @default 5
+     */
+    marginTop: number;
+    /**
+     * Minimum radius of the pie, in pixels.
+     * @default 10
+     */
+    minRadius: number;
+    /**
+     * Pie outline opacity. Value range is 0 - 1.
+     */
+    outlineAlpha: number;
+    /**
+     * Pie outline color. #FFFFFF
+     */
+    outlineColor: string;
+    /**
+     * Pie outline thickness.
+     * @default 1
+     */
+    outlineThickness: number;
+    /**
+     * Opacity of the slices. You can set the opacity of individual slice too.
+     * @default 1
+     */
+    pieAlpha: number;
+    /**
+     * Color of the first slice. All the other will be colored with darker or brighter colors.
+     */
+    pieBaseColor: string;
+    /**
+     * Lightness increase of each subsequent slice. This is only useful if pieBaseColor is set.
+     * Use negative values for darker colors. Value range is from -255 to 255.
+     * @default 30
+     */
+    pieBrightnessStep: number;
+    /**
+     * You can set fixed position of a pie center, in pixels or in percents.
+     */
+    pieX: any;
+    /**
+     * You can set fixed position of a pie center, in pixels or in percents.
+     */
+    pieY: any;
+    /**
+     * Name of the field in chart's dataProvider which holds a boolean value
+     * telling the chart whether this slice must be pulled or not.
+     */
+    pulledField: string;
+    /**
+     * Pull out duration, in seconds.
+     * @default 1
+     */
+    pullOutDuration: number;
+    /**
+     * Pull out effect. Possible values are ">", "<", elastic" and "bounce". bounce
+     */
+    pullOutEffect: string;
+    /**
+     * If this is set to true, only one slice can be pulled out at a time.
+     * If the viewer clicks on a slice, any other pulled-out slice will be pulled in.
+     */
+    pullOutOnlyOne: boolean;
+    /**
+     * Pull out radius, in pixels or percents 0.2
+     */
+    pullOutRadius: any;
+    /**
+     * Radius of a pie, in pixels or percents. By default, radius is calculated automatically.
+     */
+    radius: any;
+    /**
+     * Specifies whether the animation should be sequenced or all slices should appear at once.
+     */
+    sequencedAnimation: boolean;
+    /**
+     * Initial opacity of all slices. If you set startDuration higher than 0, slices will fade in from startAlpha.
+     * @default 1
+     */
+    startAlpha: number;
+    /**
+     * Angle of the first slice, in degrees. This will work properly only if "depth3D" is set to 0.
+     * If "depth3D" is greater than 0, then there can be two angles only: 90 and 270. Value range is 0-360.
+     * @default 90
+     */
+    startAngle: number;
+    /**
+     * Duration of the animation, in seconds.
+     * @default 1
+     */
+    startDuration: number;
+    /**
+     * Animation effect. Possible values are ">", "<", "elastic" and "bounce". bounce
+     */
+    startEffect: string;
+    /**
+     * Radius of the positions from which the slices will fly in.
+     * @default 5
+     */
+    startRadius: any;
+    /**
+     * Name of the field in chart's dataProvider which holds slice's title.
+     */
+    titleField: string;
+    /**
+     * Name of the field in chart's dataProvider
+     * which holds url which would be accessed if the user clicks on a slice.
+     */
+    urlField: string;
+    /**
+     * If url is specified for a slice, it will be opened when user clicks on it.
+     * urlTarget specifies target of this url. Use _blank if you want url to be opened in a new window. _self
+     */
+    urlTarget: string;
+    /**
+     * Name of the field in chart's dataProvider which holds slice's value.
+     */
+    valueField: string;
+    /**
+     * Name of the field in chart's dataProvider which holds boolean variable
+     * defining whether this data item should have an entry in the legend.
+     */
+    visibleInLegendField: string;
+    /**
+     * You can trigger the animation of the pie chart.
+     */
+    animateAgain(): void;
+    /**
+     * You can trigger the click on a slice from outside. index - the number of a slice or Slice object.
+     */
+    clickSlice(index: number): void;
+    /**
+     * Hides slice. index - the number of a slice or Slice object.
+     */
+    hideSlice(index: number): void;
+    /**
+     * You can simulate roll-out of a slice from outside. index - the number of a slice or Slice object.
+     */
+    rollOutSlice(index: number): void;
+    /**
+     * You can simulate roll-over a slice from outside. index - the number of a slice or Slice object.
+     */
+    rollOverSlice(index: number): void;
+    /**
+     * Shows slice. index - the number of a slice or Slice object.
+     */
+    showSlice(index: number): void;
+    /**
+     * Adds event listener of the type "clickSlice" or "pullInSlice" or "pullOutSlice" to the object.
+     * @param type Always "clickSlice" or "pullInSlice" or "pullOutSlice".
+     * @param handler
+     * If the type is "clickSlice", dispatched when user clicks on a slice.
+     * If the type is "pullInSlice", dispatched when user clicks on a slice and the slice is pulled-in.
+     * If the type is "pullOutSlice", dispatched when user clicks on a slice and the slice is pulled-out.
+     * If the type is "rollOutSlice", dispatched when user rolls-out of the slice.
+     * If the type is "rollOverSlice", dispatched when user rolls-over the slice.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                type: string; // Always "rollOverSlice".
+                dataItem: Slice;
+                chart: AmChart;
+            },
+        ) => void,
+    ): void;
+}
diff --git a/types/amcharts/AmRadarChart.d.ts b/types/amcharts/AmRadarChart.d.ts
new file mode 100644
index 0000000000..908178452d
--- /dev/null
+++ b/types/amcharts/AmRadarChart.d.ts
@@ -0,0 +1,60 @@
+import AmCoordinateChart from "./AmCoordinateChart";
+
+/**
+ * AmRadarChart is the class you have to use for radar and polar chart types.
+ * @example
+ * let chart;
+ * let chartData = [
+ *    {country:"Czech Republic",litres:156.90},
+ *    {country:"Ireland",litres:131.10},
+ *    {country:"Germany",litres:115.80},
+ *    {country:"Australia",litres:109.90},
+ *    {country:"Austria",litres:108.30},
+ *    {country:"UK",litres:99.00}
+ * ];
+ *
+ * window.onload = function() {
+ *    chart = new AmCharts.AmRadarChart();
+ *    chart.dataProvider = chartData;
+ *    chart.categoryField = "country";
+ *    chart.startDuration = 2;
+ *
+ *    let valueAxis = new AmCharts.ValueAxis();
+ *    valueAxis.axisAlpha = 0.15;
+ *    valueAxis.minimum = 0;
+ *    valueAxis.dashLength = 3;
+ *    valueAxis.axisTitleOffset = 20;
+ *    valueAxis.gridCount = 5;
+ *    chart.addValueAxis(valueAxis);
+ *
+ *    let graph = new AmCharts.AmGraph();
+ *    graph.valueField = "litres";
+ *    graph.bullet = "round";
+ *    graph.balloonText = "[[value]] litres of beer per year"
+ *    chart.addGraph(graph);
+ *
+ *    chart.write("chartdiv");
+ * };
+ */
+export default class AmRadarChart extends AmCoordinateChart {
+    /**
+     * Bottom margin of the chart.
+     */
+    marginBottom: number;
+    /**
+     * Left margin of the chart.
+     */
+    marginLeft: number;
+    /**
+     * Right margin of the chart.
+     */
+    marginRight: number;
+    /**
+     * Top margin of the chart.
+     */
+    marginTop: number;
+    /**
+     * Radius of a radar. 0.35
+     */
+    radius: any;
+}
diff --git a/types/amcharts/AmRectangularChart.d.ts b/types/amcharts/AmRectangularChart.d.ts
new file mode 100644
index 0000000000..60e7443762
--- /dev/null
+++ b/types/amcharts/AmRectangularChart.d.ts
@@ -0,0 +1,171 @@
+import AmCoordinateChart from "./AmCoordinateChart";
+import ChartCursor from "./ChartCursor";
+import ChartScrollbar from "./ChartScrollbar";
+import TrendLine from "./TrendLine";
+
+/**
+ * AmRectangularChart is a base class of AmSerialChart and AmXYChart. It can not be instantiated explicitly.
+ */
+export default class AmRectangularChart extends AmCoordinateChart {
+    /**
+     * The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0).
+     * @default 0
+     */
+    angle: number;
+    /**
+     * Space left from axis labels/title to the chart's outside border, if autoMargins set to true.
+     * @default 10
+     */
+    autoMarginOffset: number;
+    /**
+     * Specifies if margins of a chart should be calculated automatically so that labels of axes would fit.
+     * The chart will adjust only margins with axes.
+     * Other margins will use values set with marginRight, marginTop, marginLeft and marginBottom properties.
+     * @default true
+     */
+    autoMargins: boolean;
+    /**
+     * Cursor of a chart.
+     */
+    chartCursor: ChartCursor;
+    /**
+     * Chart scrollbar.
+     */
+    chartScrollbar: ChartScrollbar;
+    /**
+     * The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0).
+     * @default 0
+     */
+    depth3D: number;
+    /**
+     * Number of pixels between the container's bottom border and plot area.
+     * This space can be used for bottom axis' values.
+     * If autoMargin is true and bottom side has axis, this property is ignored.
+     * @default 20
+     */
+    marginBottom: number;
+    /**
+     * Number of pixels between the container's left border and plot area.
+     * This space can be used for left axis' values.
+     * If autoMargin is true and left side has axis, this property is ignored.
+     * @default 20
+     */
+    marginLeft: number;
+    /**
+     * Number of pixels between the container's right border and plot area.
+     * This space can be used for Right axis' values.
+     * If autoMargin is true and right side has axis, this property is ignored.
+     * @default 20
+     */
+    marginRight: number;
+    /**
+     * Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call.
+     * @default false
+     */
+    marginsUpdated: boolean;
+    /**
+     * Number of pixels between the container's top border and plot area.
+     * This space can be used for top axis' values.
+     * If autoMargin is true and top side has axis, this property is ignored.
+     * @default 20
+     */
+    marginTop: number;
+    /**
+     * The opacity of plot area's border. Value range is 0 - 1.
+     * @default 0
+     */
+    plotAreaBorderAlpha: number;
+    /**
+     * The color of the plot area's border.
+     * Note, the it is invisible by default, as plotAreaBorderAlpha default value is 0.
+     * Set it to a value higher than 0 to make it visible.
+     * @default '#000000'
+     */
+    plotAreaBorderColor: string;
+    /**
+     * Opacity of plot area. Plural form is used to keep the same property names as our Flex charts'.
+     * Flex charts can accept array of numbers to generate gradients.
+     * Although you can set array here, only first value of this array will be used.
+     * @default 0
+     */
+    plotAreaFillAlphas: number;
+    /**
+     * You can set both one color if you need a solid color or array of colors to generate gradients, for example:
+     * ["#000000", "#0000CC"]
+     * @default '#FFFFFF'
+     */
+    plotAreaFillColors: any;
+    /**
+     * If you are using gradients to fill the plot area, you can use this property to set gradient angle.
+     * The only allowed values are horizontal and vertical: 0, 90, 180, 270.
+     * @default 0
+     */
+    plotAreaGradientAngle: number;
+    /**
+     * Array of trend lines added to a chart.
+     * You can add trend lines to a chart using this array or access already existing trend lines
+     */
+    trendLines: TrendLine[];
+    /**
+     * Opacity of zoom-out button background.
+     * @default 0
+     */
+    zoomOutButtonAlpha: number;
+    /**
+     * Zoom-out button background color.
+     * @default '#e5e5e5'
+     */
+    zoomOutButtonColor: string;
+    /**
+     * Name of zoom-out button image. In the images folder there is another lens image, called lensWhite.png.
+     * You might want to have white lens when background is dark. Or you can simply use your own image.
+     * @default lens.png
+     */
+    zoomOutButtonImage: string;
+    /**
+     * Size of zoom-out button image
+     * @default: 17
+     */
+    zoomOutButtonImageSize: number;
+    /**
+     * Padding around the text and image.
+     * @default: 8
+     */
+    zoomOutButtonPadding: number;
+    /**
+     * Opacity of zoom-out button background when mouse is over it.
+     * @default: 1
+     */
+    zoomOutButtonRollOverAlpha: number;
+    /**
+     * Text in the zoom-out button. Show all
+     */
+    zoomOutText: string;
+
+    /**
+     * Adds a ChartCursor object to a chart
+     */
+    addChartCursor(cursor: ChartCursor): void;
+    /**
+     * Adds a ChartScrollbar to a chart
+     */
+    addChartScrollbar(scrollbar: ChartScrollbar): void;
+    /**
+     * Adds a TrendLine to a chart.
+     * You should call chart.validateNow() after this method is called in order the trend line to be visible.
+     */
+    addTrendLine(trendLine: TrendLine): void;
+    /**
+     * Removes cursor from the chart
+     */
+    removeChartCursor(): void;
+    /**
+     * Removes scrollbar from the chart
+     */
+    removeChartScrollbar(): void;
+    /**
+     * Removes a trend line from a chart.
+     * You should call chart.validateNow() in order the changes to be visible.
+     */
+    removeTrendLine(trendLine: TrendLine): void;
+}
diff --git a/types/amcharts/AmSerialChart.d.ts b/types/amcharts/AmSerialChart.d.ts
new file mode 100644
index 0000000000..422bb78b3f
--- /dev/null
+++ b/types/amcharts/AmSerialChart.d.ts
@@ -0,0 +1,130 @@
+import AmRectangularChart from "./AmRectangularChart";
+import CategoryAxis from "./CategoryAxis";
+
+/**
+ * AmSerialChart is the class you have to use for majority of chart types.
+ * The supported chart types are: line, area, column, bar, step line, smoothed line, candlestick and OHLC.
+ * The chart can be rotated by 90 degrees so the column chart becomes bar chart.
+ * The chart supports simple and logarithmic scales, it can have multiple value axes.
+ * The chart can place data points at equal intervals or can parse dates and place data points
+ * at irregular intervals.
+ * @example
+ * let chartData = [{title:"sample 1",value:130},{title:"sample 2",value:26}];
+ *
+ * let chart = new AmCharts.AmSerialChart();
+ * chart.categoryField = "title";
+ * chart.dataProvider = chartData;
+ *
+ * let graph = new AmCharts.AmGraph();
+ * graph.valueField = "value";
+ * graph.type = "column";
+ * graph.fillAlphas = 1;
+ * chart.addGraph(graph);
+ *
+ * chart.write("chartdiv");
+ */
+export default class AmSerialChart extends AmRectangularChart {
+    /**
+     * Date format of the graph balloon (if chart parses dates and you don't use chartCursor).
+     * @default 'MMM DD, YYYY'
+     */
+    balloonDateFormat: string;
+    /**
+     * Read-only. Chart creates category axis itself.
+     * If you want to change some properties, you should get this axis from the chart and
+     * set properties to this object.
+     */
+    categoryAxis: CategoryAxis;
+    /**
+     * Category field name tells the chart the name of the field in your dataProvider object
+     * which will be used for category axis values.
+     */
+    categoryField: string;
+    /**
+     * The gap in pixels between two columns of the same category.
+     * @default 5
+     */
+    columnSpacing: number;
+    /**
+     * Space between 3D stacked columns.
+     * @default 0
+     */
+    columnSpacing3D: number;
+    /**
+     * Relative width of columns. Value range is 0 - 1.
+     * @default 0.8
+     */
+    columnWidth: number;
+    /**
+     * Read-only. If category axis parses dates endDate indicates date to which the chart is currently displayed.
+     */
+    endDate: Date;
+    /**
+     * Read-only. Category index to which the chart is currently displayed.
+     */
+    endIndex: number;
+    /**
+     * Maximum number of series allowed to select.
+     */
+    maxSelectedSeries: number;
+    /**
+     * The longest time span allowed to select (in milliseconds) for example
+     * 259200000 will limit selection to 3 days.
+     */
+    maxSelectedTime: number;
+    /**
+     * The shortest time span allowed to select (in milliseconds) for example
+     * 1000 will limit selection to 1 second.
+     * @default 0
+     */
+    minSelectedTime: number;
+    /**
+     * Specifies if scrolling of a chart with mouse wheel is enabled.
+     * If you press shift while rotating mouse wheel, the chart will zoom-in/out.
+     */
+    mouseWheelScrollEnabled: boolean;
+    /**
+     * Specifies if zooming of a chart with mouse wheel is enabled.
+     * If you press shift while rotating mouse wheel, the chart will scroll.
+     */
+    mouseWheelZoomEnabled: boolean;
+    /**
+     * If you set this to true, the chart will be rotated by 90 degrees (the columns will become bars).
+     */
+    rotate: boolean;
+    /**
+     * Read-only.
+     * If category axis parses dates startDate indicates date from which the chart is currently displayed.
+     */
+    startDate: Date;
+    /**
+     * Read-only. Category index from which the chart is currently displayed.
+     */
+    startIndex: number;
+    /**
+     * Specifies if chart should zoom-out when data is updated.
+     * @default true
+     */
+    zoomOutOnDataUpdate: boolean;
+
+    /**
+     * Number Returns index of the specified category value.
+     */
+    getCategoryIndexByValue(value: number): void;
+    /**
+     * Zooms out, charts shows all available data.
+     */
+    zoomOut(): void;
+    /**
+     * Zooms the chart by the value of the category axis.
+     */
+    zoomToCategoryValues(start: Date, end: Date): void;
+    /**
+     * Zooms the chart from one date to another.
+     */
+    zoomToDates(start: Date, end: Date): void;
+    /**
+     * Zooms the chart by the index of the category.
+     */
+    zoomToIndexes(start: Date, end: Date): void;
+}
diff --git a/types/amcharts/AmStockChart.d.ts b/types/amcharts/AmStockChart.d.ts
new file mode 100644
index 0000000000..b4deec4f1c
--- /dev/null
+++ b/types/amcharts/AmStockChart.d.ts
@@ -0,0 +1,198 @@
+import AmBalloon from "./AmBalloon";
+import AmChart from "./AmChart";
+import AmSerialChart from "./AmSerialChart";
+import CategoryAxesSettings from "./CategoryAxesSettings";
+import ChartCursorSettings from "./ChartCursorSettings";
+import ChartScrollbarSettings from "./ChartScrollbarSettings";
+import DataSet from "./DataSet";
+import DataSetSelector from "./DataSetSelector";
+import LegendSettings from "./LegendSettings";
+import PanelsSettings from "./PanelSettings";
+import PeriodSelector from "./PeriodSelector";
+import StockEvent from "./StockEvent";
+import StockGraph from "./StockGraph";
+import StockPanel from "./StockPanel";
+import ValueAxesSettings from "./ValueAxesSettings";
+
+/**
+ * AmStockChart is a main class Stock chart.
+ */
+export default class AmStockChart {
+    /**
+     * Specifies if animation was already played.
+     * Animation is only played once, when chart is rendered for the first time.
+     * If you want the animation to be repeated, set this property to false.
+     */
+    animationPlayed: boolean;
+    /**
+     * Balloon object.
+     */
+    balloon: AmBalloon;
+    /**
+     * Settings for category axes.
+     */
+    categoryAxesSettings: CategoryAxesSettings;
+    /**
+     * Indicates if the chart is created.
+     */
+    chartCreated: boolean;
+    /**
+     * Chart cursor settings.
+     */
+    chartCursorSettings: ChartCursorSettings;
+    /**
+     * Chart scrollbar settings.
+     */
+    chartScrollbarSettings: ChartScrollbarSettings;
+    /**
+     * Array of colors used by data sets if no color was set explicitly on data set itself.
+     * [
+     * #FF6600, "#FCD202", "#B0DE09", "#0D8ECF", "#2A0CD0", "#CD0D74", "#CC0000",
+     * "#00CC00", "#0000CC", "#DDDDDD", "#999999", "#333333", "#990000"
+     * ]
+     */
+    colors: any[];
+    /**
+     * Array of data sets selected for comparing.
+     */
+    comparedDataSets: any[];
+    /**
+     * Array of DataSets.
+     */
+    dataSets: any[];
+    /**
+     * DataSetSelector object.
+     * You can add it if you have more than one data set and want users to be able to select/compare them.
+     */
+    dataSetSelector: DataSetSelector;
+    /**
+     * Current end date of the selected period, get only.
+     * To set start/end dates, use stockChart.zoom(startDate, endDate) method.
+     */
+    endDate: Date;
+    /**
+     * Defines on which day week starts. 0 - Sunday, 1 - Monday..
+     * @default 1
+     */
+    firstDayOfWeek: number;
+    /**
+     * If set to true the scope of the data view will be set to the end after data update.
+     */
+    glueToTheEnd: boolean;
+    /**
+     * Legend settings.
+     */
+    legendSettings: LegendSettings;
+    /**
+     * Data set selected as main.
+     */
+    mainDataSet: DataSet;
+    /**
+     * Array of StockPanels (charts).
+     */
+    panels: any[];
+    /**
+     * Settings for stock panels.
+     */
+    panelsSettings: PanelsSettings;
+    /**
+     * Period selector object.
+     * You can add it if you want user's to be able to enter date ranges or
+     * zoom chart with predefined period buttons.
+     */
+    periodSelector: PeriodSelector;
+    /**
+     * Scrollbar's chart object, get only.
+     */
+    scrollbarChart: AmSerialChart;
+    /**
+     * Current start date of the selected period, get only.
+     * To set start/end dates, use stockChart.zoom(startDate, endDate) method.
+     */
+    startDate: Date;
+    /**
+     * Settings for stock events.
+     */
+    stockEventsSettings: any;
+    /**
+     * Settings for value axes.
+     */
+    valueAxesSettings: ValueAxesSettings;
+    /**
+     * read-only. Indicates current version of a script.
+     */
+    version: string;
+    /**
+     * Specifies whether the chart should zoom-out when main data set is changed.
+     */
+    zoomOutOnDataSetChange: boolean;
+
+    /**
+     * Adds panel to the stock chart. Requires stockChart.validateNow() method to be called after this action.
+     */
+    addPanel(panel: StockPanel): void;
+    /**
+     * Adds panel to the stock chart at a specified index.
+     * Requires stockChart.validateNow() method to be called after this action.
+     */
+    addPanelAt(panel: StockPanel, index: number): void;
+    /**
+     * Destroys chart, all timeouts and listeners.
+     */
+    clear(): void;
+    /**
+     * Hides event bullets.
+     */
+    hideStockEvents(): void;
+    /**
+     * Removes panel from the stock chart. Requires stockChart.validateNow() method to be called after this action.
+     */
+    removePanel(panel: StockPanel): void;
+    /**
+     * Shows event bullets.
+     */
+    showStockEvents(): void;
+    /**
+     * Method which should be called after data was changed.
+     */
+    validateData(): void;
+    /**
+     * Method which forces the stock chart to rebuild. Should be called after properties are changed.
+     */
+    validateNow(): void;
+    /**
+     * Zooms chart to specified dates. startDate, endDate - Date objects.
+     */
+    zoom(startDate: Date, endDate: Date): void;
+    /**
+     * Zooms out the chart.
+     */
+    zoomOut(): void;
+    /**
+     * Adds event listener.
+     * @param type - One of
+     * "buildStarted", "clickStockEvent", "dataUpdated", "init", "panelRemoved", "rendered", "rollOutStockEvent",
+     * "rollOverStockEvent", "zoomed".
+     * @param handler - The event handler.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                chart: AmStockChart;
+                date?: Date;
+                endDate?: Date;
+                eventObject?: StockEvent;
+                graph?: StockGraph;
+                panel?: StockPanel;
+                period?: string;
+                startDate?: Date;
+                type: string;
+            },
+        ) => void,
+    ): void;
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+}
diff --git a/types/amcharts/AmXYChart.d.ts b/types/amcharts/AmXYChart.d.ts
new file mode 100644
index 0000000000..04b61e7d86
--- /dev/null
+++ b/types/amcharts/AmXYChart.d.ts
@@ -0,0 +1,68 @@
+import AmRectangularChart from "./AmRectangularChart";
+
+/**
+ * AmXYChart is the class you have to use for XY/Bubble/Scatter chart types.
+ * The chart supports simple and logarithmic scales, it can have multiple value axes.
+ * @example
+ * let chartData = [
+ *     {x:10, y:14, value:59},
+ *     {x:5, y:3, value:50},
+ *     {x:-10, y:-3, value:19},
+ *     {x:-6, y:5, value:65},
+ *     {x:15, y:-4, value:92},
+ *     {x:13, y:1, value:8},
+ *     {x:1, y:6, value:35}
+ * ];
+ *
+ * let chart = new AmCharts.AmXYChart();
+ * chart.pathToImages = "../../amcharts/javascript/images/";
+ * chart.dataProvider = chartData;
+ * chart.marginLeft = 35;
+ * chart.startDuration = 1.5;
+ *
+ * let xAxis = new AmCharts.ValueAxis();
+ * xAxis.position = "left";
+ * xAxis.autoGridCount = true;
+ * chart.addValueAxis(xAxis);
+ *
+ * let yAxis = new AmCharts.ValueAxis();
+ * yAxis.position = "bottom";
+ * yAxis.autoGridCount = true;
+ * chart.addValueAxis(yAxis);
+ *
+ * let graph = new AmCharts.AmGraph();
+ * graph.valueField = "value";
+ * graph.xField = "x";
+ * graph.yField = "y";
+ * graph.lineAlpha = 0;
+ * graph.bullet = "round";
+ * chart.addGraph(graph);
+ *
+ * let chartCursor = new AmCharts.ChartCursor();
+ * chart.addChartCursor(chartCursor);
+ *
+ * let chartScrollbar = new AmCharts.ChartScrollbar();
+ * chartScrollbar.hideResizeGrips = false;
+ * chart.addChartScrollbar(chartScrollbar);
+ *
+ * chart.write("chartdiv);
+ */
+export default class AmXYChart extends AmRectangularChart {
+    /**
+     * Specifies if Scrollbar of X axis (horizontal) should be hidden.
+     */
+    hideXScrollbar: boolean;
+    /**
+     * Specifies if Scrollbar of Y axis (vertical) should be hidden.
+     */
+    hideYScrollbar: boolean;
+    /**
+     * Maximum zoom factor of the chart.
+     * @default 20
+     */
+    maxZoomFactor: number;
+    /**
+     * Zooms out, charts shows all available data.
+     */
+    zoomOut(): void;
+}
diff --git a/types/amcharts/AreasSettings.d.ts b/types/amcharts/AreasSettings.d.ts
new file mode 100644
index 0000000000..88b309558a
--- /dev/null
+++ b/types/amcharts/AreasSettings.d.ts
@@ -0,0 +1,92 @@
+/**
+ * AreasSettings is a class which holds common settings of all MapArea objects.
+ */
+export default class AreasSettings {
+    /**
+     * Opacity of areas.
+     * @default 1
+     */
+    alpha: number;
+    /**
+     * Specifies if the areas should be zoomed-in when user clicks on them, event if zoom properties are not set.
+     */
+    autoZoom: boolean;
+    /**
+     * Text which is displayed in a roll-over balloon. You can use the following tags:
+     * [[title]], [[description]], [[value]] and [[percent]] [[title]]
+     */
+    balloonText: string;
+    /**
+     * Color of the areas.
+     * @default "#FFCC00"
+     */
+    color: string;
+    /**
+     * Color of area with highest value.
+     * Colors for areas with values less then highest will be colored with intermediate colors
+     * between color and colorSolid.
+     * Use colorSteps property of AmMap to change the number of intermediate colors.
+     * @default "#990000"
+     */
+    colorSolid: string;
+    /**
+     * Height of a description window.
+     */
+    descriptionWindowHeight: number;
+    /**
+     * Width of a description window.
+     * @default 250
+     */
+    descriptionWindowWidth: number;
+    /**
+     * X position of a description window.
+     */
+    descriptionWindowX: number;
+    /**
+     * Y position of a description window.
+     */
+    descriptionWindowY: number;
+    /**
+     * Opacity of area's outline.
+     * @default 1
+     */
+    outlineAlpha: number;
+    /**
+     * Color of area's outline. #FFFFFF
+     */
+    outlineColor: string;
+    /**
+     * Thickness of area's outline. 0.5
+     */
+    outlineThickness: number;
+    /**
+     * Color of area when user rolls-over it. undefined
+     */
+    rollOverColor: string;
+    /**
+     * Color of area's outline when user rolls-over it. #CC0000
+     */
+    rollOverOutlineColor: string;
+    /**
+     * Color of area which is currently selected. #CC0000
+     */
+    selectedColor: string;
+    /**
+     * Opacity of all areas which are in the map svg file, but not listed as areas in DataSet.
+     * @default 1
+     */
+    unlistedAreasAlpha: number;
+    /**
+     * Color of all areas which are in the map svg file, but not listed as areas in DataSet. #DDDDDD
+     */
+    unlistedAreasColor: string;
+    /**
+     * Opacity of all areas' outline which are in the map svg file, but not listed as areas in DataSet.
+     * @default 1
+     */
+    unlistedAreasOutlineAlpha: number;
+    /**
+     * Color of all areas' outline which are in the map svg file, but not listed as areas in DataSet. #FFFFFF
+     */
+    unlistedAreasOutlineColor: string;
+}
diff --git a/types/amcharts/AxisBase.d.ts b/types/amcharts/AxisBase.d.ts
new file mode 100644
index 0000000000..67fd0dd333
--- /dev/null
+++ b/types/amcharts/AxisBase.d.ts
@@ -0,0 +1,148 @@
+import Guide from "./Guide";
+
+/**
+ * AxisBase is the base class for ValueAxis and CategoryAxis. It can not be instantiated explicitly.
+ */
+export default class AxisBase {
+    /**
+     * Specifies whether number of gridCount is specified automatically, acoarding to the axis size.
+     * @default true
+     */
+    autoGridCount: boolean;
+    /**
+     * Axis opacity. Value range is 0 - 1.
+     * @default 1
+     */
+    axisAlpha: number;
+    /**
+     * Axis color.  #000000
+     */
+    axisColor: string;
+    /**
+     * Thickness of the axis.
+     * @default 1
+     */
+    axisThickness: number;
+    /**
+     * Color of axis value labels. Will use chart's color if not set.
+     */
+    color: string;
+    /**
+     * Length of a dash. 0 means line is not dashed.
+     */
+    dashLength: number;
+    /**
+     * Fill opacity. Every second space between grid lines can be filled with color.
+     * Set fillAlpha to a value greater than 0 to see the fills.
+     */
+    fillAlpha: number;
+    /**
+     * Fill color. Every second space between grid lines can be filled with color.
+     * Set fillAlpha to a value greater than 0 to see the fills.
+     * @default "#FFFFFF"
+     */
+    fillColor: string;
+    /**
+     * Size of value labels text. Will use chart's fontSize if not set.
+     */
+    fontSize: string;
+    /**
+     * Opacity of grid lines. 0.2
+     */
+    gridAlpha: number;
+    /**
+     * Color of grid lines. #000000
+     */
+    gridColor: string;
+    /**
+     * Number of grid lines. In case this is value axis, or your categoryAxis parses dates,
+     * the number is approximate. The default value is 5. If you set autoGridCount to true,
+     * this property is ignored.
+     * @default 5
+     */
+    gridCount: number;
+    /**
+     * Thickness of grid lines.
+     * @default 1
+     */
+    gridThickness: number;
+    /**
+     * The array of guides belonging to this axis.
+     */
+    guides: any[];
+    /**
+     * If autoMargins of a chart is set to true, but you want this axis not to be measured when calculating margin,
+     * set ignoreAxisWidth to true.
+     */
+    ignoreAxisWidth: boolean;
+    /**
+     * Specifies whether values should be placed inside or outside plot area.
+     */
+    inside: boolean;
+    /**
+     * Frequency at which labels should be placed. Doesn't work for CategoryAxis if parseDates is set to true.
+     * @default 1
+     */
+    labelFrequency: number;
+    /**
+     * Rotation angle of a label. Only horizontal axis' values can be rotated.
+     * If you set this for vertical axis, the setting will be ignored.
+     */
+    labelRotation: number;
+    /**
+     * Specifies whether axis displays category axis' labels and value axis' values.
+     * @default true
+     */
+    labelsEnabled: boolean;
+    /**
+     * The distance of the axis to the plot area, in pixels. Negative values can also be used.
+     */
+    offset: number;
+    /**
+     * Possible values are: "top", "bottom", "left", "right".
+     * If axis is vertical, default position is "left".
+     * If axis is horizontal, default position is "bottom".
+     */
+    position: string;
+    /**
+     * Whether to show first axis label or not.
+     * @default true
+     */
+    showFirstLabel: boolean;
+    /**
+     * Whether to show last axis label or not.
+     * @default true
+     */
+    showLastLabel: boolean;
+    /**
+     * Length of the tick marks.
+     * @default 5
+     */
+    tickLength: number;
+    /**
+     * Title of the axis.
+     */
+    title: string;
+    /**
+     * Specifies if title should be bold or not.
+     * @default true
+     */
+    titleBold: boolean;
+    /**
+     * Color of axis title. Will use text color of chart if not set any.
+     */
+    titleColor: string;
+    /**
+     * Font size of axis title. Will use font size of chart plus two pixels if not set any.
+     */
+    titlefontSize: string;
+
+    /**
+     * Adds guide to the axis.
+     */
+    addGuide(guide: Guide): void;
+    /**
+     * Removes guide from the axis.
+     */
+    removeGuide(guide: Guide): void;
+}
diff --git a/types/amcharts/CategoryAxesSettings.d.ts b/types/amcharts/CategoryAxesSettings.d.ts
new file mode 100644
index 0000000000..f1ff10bda4
--- /dev/null
+++ b/types/amcharts/CategoryAxesSettings.d.ts
@@ -0,0 +1,135 @@
+/**
+ * CategoryAxesSettings settings set's settings common for all CategoryAxes of StockPanels.
+ * If you change a property after the chart is initialized, you should call stockChart.validateNow() method in
+ * order for it to work. If there is no default value specified, default value of CategoryAxis class will be used.
+ */
+export default class CategoryAxesSettings {
+    /**
+     * Specifies whether number of gridCount is specified automatically, according to the axis size.
+     * @default true
+     */
+    autoGridCount: boolean;
+    /**
+     * Axis opacity.
+     */
+    axisAlpha: number;
+    /**
+     * Axis color.
+     */
+    axisColor: string;
+    /**
+     * Height of category axes. Set it to 0 if you set inside property to true.
+     * @default 28
+     */
+    axisHeight: number;
+    /**
+     * Thickness of the axis.
+     */
+    axisThickness: number;
+    /**
+     * Text color.
+     */
+    color: string;
+    /**
+     * Length of a dash.
+     */
+    dashLength: number;
+    /**
+     * Date formats of different periods.
+     * Possible period values:
+     * fff - milliseconds,
+     * ss - seconds,
+     * mm - minutes,
+     * hh - hours,
+     * DD - days,
+     * MM - months,
+     * WW - weeks,
+     * YYYY - years
+     * Check this page for date formatting strings.
+     */
+    dateFormats: any[];
+    /**
+     * If you want data points to be placed at equal intervals (omiting dates with no data),
+     * set equalSpacing to true.
+     */
+    equalSpacing: boolean;
+    /**
+     * Fill opacity. Every second space between grid lines can be filled with fillColor.
+     */
+    fillAlpha: number;
+    /**
+     * Fill color. Every second space between grid lines can be filled with color.
+     * Set fillAlpha to a value greater than 0 to see the fills.
+     */
+    fillColor: string;
+    /**
+     * Text size.
+     */
+    fontSize: string;
+    /**
+     * Opacity of grid lines.
+     */
+    gridAlpha: number;
+    /**
+     * Color of grid lines.
+     */
+    gridColor: string;
+    /**
+     * Approximate number of grid lines.
+     * You should set autoGridCount to false in order this property not to be ignored.
+     * @default 10
+     */
+    gridCount: number;
+    /**
+     * Thickness of grid lines.
+     */
+    gridThickness: number;
+    /**
+     * Periods to which data will be gruoped in case there are more data items in
+     * the selected period than specified in maxSeries property.
+     * ["ss", "10ss", "30ss", "mm", "10mm", "30mm", "hh", "DD", "WW", "MM", "YYYY"]
+     */
+    groupToPeriods: any[];
+    /**
+     * Specifies whether values should be placed inside or outside of plot area.
+     */
+    inside: boolean;
+    /**
+     * Rotation angle of a label.
+     */
+    labelRotation: number;
+    /**
+     * Maximum series shown at a time.
+     * In case there are more data points in the selection than maxSeries,
+     * the chart will group data to longer periods, for example - you have 250 days in the selection,
+     * and maxSeries is 150 - the chart will group data to weeks.
+     * @default 150
+     */
+    maxSeries: number;
+    /**
+     * Specifies the shortest period of your data.
+     * fff - millisecond,
+     * ss - second,
+     * mm - minute,
+     * hh - hour,
+     * DD - day,
+     * MM - month,
+     * YYYY - year
+     * @default "DD"
+     */
+    minPeriod: string;
+    /**
+     * top or "bottom".
+     */
+    position: string;
+    /**
+     * Specifies whether the graph should start on axis or not.
+     * In case you display columns, it is recommended to set this to false.
+     * startOnAxis can be set to true only if equalSpacing is set to true.
+     */
+    startOnAxis: boolean;
+    /**
+     * Tick length.
+     */
+    tickLength: number;
+}
diff --git a/types/amcharts/CategoryAxis.d.ts b/types/amcharts/CategoryAxis.d.ts
new file mode 100644
index 0000000000..18510f0257
--- /dev/null
+++ b/types/amcharts/CategoryAxis.d.ts
@@ -0,0 +1,106 @@
+import AxisBase from "./AxisBase";
+
+export default class CategoryAxis extends AxisBase {
+    /**
+     * When parse dates is on for the category axis, the chart will try to highlight the beginning of the periods,
+     * like month, in bold. Set this to false to disable the functionality.
+     * @default true
+     */
+    boldPeriodBeginning: boolean;
+    /**
+     * Date formats of different periods. Possible period values:
+     * fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, WW - weeks, YYYY - years.
+     * Check this page for date formatting strings.
+     * [
+     *     {period:'fff',format:'JJ:NN:SS'},
+     *     {period:'ss',format:'JJ:NN:SS'},
+     *     {period:'mm',format:'JJ:NN'},
+     *     {period:'hh',format:'JJ:NN'},
+     *     {period:'DD',format:'MMM DD'},
+     *     {period:'WW',format:'MMM DD'},
+     *     {period:'MM',format:'MMM'},
+     *     {period:'YYYY',format:'YYYY'}
+     * ]
+     */
+    dateFormats: any[];
+    /**
+     * In case your category axis values are Date objects and parseDates is set to true,
+     * the chart will parse dates and will place your data points at irregular intervals.
+     * However if you want dates to be parsed (displayed on the axis, baloons, etc),
+     * but data points to be placed at equal intervals (omiting dates with no data), set equalSpacing to true.
+     */
+    equalSpacing: boolean;
+    /**
+     * Field in data provider which specifies if the category value should always be shown.
+     * For example: categoryAxis.forceShowField = "forceShow";
+     * Field in data provider which specifies if the category value should always be shown.
+     * For example: categoryAxis.forceShowField = "forceShow";
+     * And in data:
+     * {category:"one", forceShow:true, value:100}
+     * Note, this works only when parseDates is set to false.
+     */
+    forceShowField: string;
+    /**
+     * Specifies if a grid line is placed on the center of a cell or on the beginning of a cell.
+     * Possible values are: "start" and "middle" This setting doesn't work if parseDates is set to true.
+     * @default "middle"
+     */
+    gridPosition: string;
+    /**
+     * Specifies if minor grid should be displayed.
+     * NOTE: If equalSpacing is set to true, this setting will be ignored.
+     * @default false
+     */
+    minorGridEnabled: boolean;
+    /**
+     * Specifies the shortest period of your data. This should be set only if parseDates is set to "true".
+     * Possible period values:
+     * fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, YYYY - years.
+     * @default "DD"
+     */
+    minPeriod: string;
+    /**
+     * In case your category axis values are Date objects, set this to true.
+     * In this case the chart will parse dates and will place your data points at irregular intervals.
+     * If you want dates to be parsed, but data points to be placed at equal intervals,
+     * set both parseDates and equalSpacing to true.
+     */
+    parseDates: boolean;
+    /**
+     * Specifies whether the graph should start on axis or not.
+     * In case you display columns, it is recommended to set this to false.
+     * If parseDates is set to true, startOnAxis will allways be false, unless equalSpacing is set to true.
+     */
+    startOnAxis: boolean;
+    /**
+     * Works only when parseDates is set to true and equalSpacing is false.
+     * If you set it to true, at the position where bigger period changes,
+     * category axis will display date strings of bot small and big period, in two rows.
+     * @default false
+     */
+    twoLineMode: boolean;
+    /**
+     * Use line color for bullet
+     * @default false
+     */
+    useLineColorForBulletBorder: boolean;
+    /**
+     * Number returns coordinate of a category. Works only if parseDates is false.
+     * If parseDates is true, use dateToCoordinate method.
+     */
+    categoryToCoordinate(category: string): void;
+    /**
+     * date - Date object Returns Date of the coordinate, in case parseDates is set to true and
+     * equalSpacing is set to false.
+     */
+    coordinateToDate(coordinate: number): void;
+    /**
+     * Number Returns coordinate of the date, in case parseDates is set to true.
+     * If parseDates is false, use categoryToCoordinate method.
+     */
+    dateToCoordinate(date: Date): void;
+    /**
+     * Number Returns index of the category which is most close to specified coordinate.
+     */
+    xToIndex(x: number): void;
+}
diff --git a/types/amcharts/ChartCursor.d.ts b/types/amcharts/ChartCursor.d.ts
new file mode 100644
index 0000000000..f2523c150b
--- /dev/null
+++ b/types/amcharts/ChartCursor.d.ts
@@ -0,0 +1,149 @@
+import AmChart from "./AmChart";
+import AmGraph from "./AmGraph";
+
+/**
+ * ChartCursor is a class which displays a cursor which follows the mouse.
+ * In case of Serial chart it also shows value and category balloons.
+ * @example
+ * let chart = new AmCharts.AmSerialChart();
+ * let chartCursor = new AmCharts.ChartCursor();
+ * chart.addChartCursor(chartCursor);
+ */
+export default class ChartCursor {
+    /**
+     * Specifies if bullet for each graph will follow the cursor.
+     */
+    bulletsEnabled: boolean;
+    /**
+     * Size of bullets, following the cursor.
+     * @default 8
+     */
+    bulletSize: number;
+    /**
+     * Opacity of the category balloon.
+     * @default 1
+     */
+    categoryBalloonAlpha: number;
+    /**
+     * Color of the category balloon. cursorColor is used if not set.
+     */
+    categoryBalloonColor: string;
+    /**
+     * Category balloon date format (used only if category axis parses dates).
+     * Check this page for instructions on how to format dates. MMM DD, YYYY
+     */
+    categoryBalloonDateFormat: string;
+    /**
+     * Specifies whether category balloon is enabled.
+     * @default true
+     */
+    categoryBalloonEnabled: boolean;
+    /**
+     * Text color. #FFFFFF
+     */
+    color: string;
+    /**
+     * Opacity of the cursor line.  1
+     */
+    cursorAlpha: number;
+    /**
+     * Color of the cursor line. #CC0000
+     */
+    cursorColor: string;
+    /**
+     * Specifies where the cursor line should be placed - on the beginning of the period (day, hour, etc) or
+     * in the middle (only when parseDates property of categoryAxis is set to true).
+     * If you want the cursor to follow mouse and not to glue to the nearest data point, set "mouse" here.
+     * Possible values are: "start", "middle", "mouse".
+     */
+    cursorPosition: string;
+    /**
+     * Specifies whether cursor is enabled.
+     * @default true
+     */
+    enabled: boolean;
+    /**
+     * If set to true, instead of a cursor line user will see a fill which width will always
+     * be equal to the width of one data item.
+     * Recommend setting cursorAlpha to 0.1 or some other small number if using this feature.
+     * @default false
+     */
+    fullWidth: boolean;
+    /**
+     * If this is set to true, only one balloon at a time will be displayed. Note, this is quite CPU consuming.
+     */
+    oneBalloonOnly: boolean;
+    /**
+     * If this is set to true, the user will be able to pan the chart (Serial only) instead of zooming.
+     */
+    pan: boolean;
+    /**
+     * Opacity of the selection.
+     */
+    selectionAlpha: number;
+    /**
+     * Specifies if cursor should only mark selected area but not zoom-in after user releases mouse button.
+     */
+    selectWithoutZooming: boolean;
+    /**
+     * Specifies whether value balloons are enabled.
+     * In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet.
+     * @default true
+     */
+    valueBalloonsEnabled: boolean;
+    /**
+     * Specifies if the user can zoom-in the chart.
+     * If pan is set to true, zoomable is switched to false automatically.
+     * @default true
+     */
+    zoomable: boolean;
+    /**
+     * Indicates if currently user is selecting some chart area to zoom-in.
+     */
+    zooming: boolean;
+
+    /**
+     * Hides cursor.
+     */
+    hideCursor(): void;
+    /**
+     * You can force cursor to appear at specified cateogry or date.
+     */
+    showCursorAt(category: string | Date): void;
+    /**
+     * Adds event listener.
+     * @param type One of "changed", "draw", "moved", "onHideCursor", "onShowCursor", "panning",
+     * "selected", "zoomed", "zoomStarted".
+     * @param handler The event handler.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                chart: AmChart;
+                delta2X?: number;
+                delta2Y?: number;
+                deltaX?: number;
+                deltaY?: number;
+                end?: number;
+                finalX?: number;
+                finalY?: number;
+                index?: number;
+                initialX?: number;
+                initialY?: number;
+                mostCloseGraph?: AmGraph;
+                start?: number;
+                target?: ChartCursor;
+                type: string;
+                x?: number;
+                y?: number;
+                zooming?: boolean;
+            },
+        ) => void,
+    ): void;
+
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+}
diff --git a/types/amcharts/ChartCursorSettings.d.ts b/types/amcharts/ChartCursorSettings.d.ts
new file mode 100644
index 0000000000..b8664acc3c
--- /dev/null
+++ b/types/amcharts/ChartCursorSettings.d.ts
@@ -0,0 +1,81 @@
+/**
+ * ChartCursorSettings settings set's settings for chart cursor.
+ * If you change a property after the chart is initialized, you should call stockChart.validateNow() method
+ * in order for it to work. If there is no default value specified, default value of ChartCursor class will be used.
+ */
+export default class ChartCursorSettings {
+    /**
+     * Specifies if bullet for each graph will follow the cursor.
+     */
+    bulletsEnabled: boolean;
+    /**
+     * Size of bullets, following the cursor.
+     */
+    bulletSize: number;
+    /**
+     * Opacity of the category balloon.
+     */
+    categoryBalloonAlpha: number;
+    /**
+     * Color of the category balloon.
+     */
+    categoryBalloonColor: string;
+    /**
+     * Array of date format objects. Date format object must have "period" and "format" items.
+     * Available periods are:
+     * fff - millisecond,
+     * ss - second,
+     * mm - minute,
+     * hh - hour,
+     * DD - date,
+     * WW - week,
+     * MM - month,
+     * YYYY - year
+     * [
+     *     {period:"YYYY", format:"YYYY"},
+     *     {period:"MM", format:"MMM, YYYY"},
+     *     {period:"WW", format:"MMM DD, YYYY"},
+     *     {period:"DD", format:"MMM DD, YYYY"},
+     *     {period:"hh", format:"JJ:NN"},
+     *     {period:"mm", format:"JJ:NN"},
+     *     {period:"ss", format:"JJ:NN:SS"},
+     *     {period:"fff", format:"JJ:NN:SS"}
+     * ]
+     */
+    categoryBalloonDateFormats: any[];
+    /**
+     * Specifies whether category balloon is enabled.
+     */
+    categoryBalloonEnabled: boolean;
+    /**
+     * Opacity of the cursor line.
+     */
+    cursorAlpha: number;
+    /**
+     * Color of the cursor line.
+     */
+    cursorColor: string;
+    /**
+     * Possible values: "start", "middle" and "mouse".
+     */
+    cursorPosition: string;
+    /**
+     * Set this to "false" if you don't want chart cursor to appear in your charts.
+     * @default true
+     */
+    enabled: boolean;
+    /**
+     * If this is set to true, the user will be able to pan the chart instead of zooming.
+     */
+    pan: boolean;
+    /**
+     * Specifies whether value balloons are enabled.
+     * In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet.
+     */
+    valueBalloonsEnabled: boolean;
+    /**
+     * Specifies if the user can zoom-in the chart.
+     * If pan is set to true, zoomable is switched to false automatically.
+     */
+    zoomable: boolean;
+}
diff --git a/types/amcharts/ChartScrollbar.d.ts b/types/amcharts/ChartScrollbar.d.ts
new file mode 100644
index 0000000000..217d6763d9
--- /dev/null
+++ b/types/amcharts/ChartScrollbar.d.ts
@@ -0,0 +1,121 @@
+import AmGraph from "./AmGraph";
+import CategoryAxis from "./CategoryAxis";
+
+/**
+ * ChartScrollbar class displays chart scrollbar. Supported by AmSerialChart and AmXYChart.
+ * @example
+ * let chart = new AmCharts.AmSerialChart();
+ * let chartScrollbar = new AmCharts.ChartScrollbar();
+ * chart.addChartScrollbar(chartScrollbar);
+ */
+export default class ChartScrollbar {
+    /**
+     * Specifies whether number of gridCount is specified automatically, acoarding to the axis size.
+     */
+    autoGridCount: boolean;
+    /**
+     * Background opacity.
+     * @default 1
+     */
+    backgroundAlpha: number;
+    /**
+     * Background color of the scrollbar.
+     * @default #D4D4D4
+     */
+    backgroundColor: string;
+    /**
+     * Read-only. Category axis of the scrollbar.
+     */
+    categoryAxis: CategoryAxis;
+    /**
+     * Text color. Will use chart's color if not set.
+     */
+    color: string;
+    /**
+     * Specifies which graph will be displayed in the scrollbar. Only Serial chart's scrollbar can display a graph.
+     */
+    graph: AmGraph;
+    /**
+     * Graph fill opacity. Value range is 0 - 1.  0.1
+     */
+    graphFillAlpha: number;
+    /**
+     * Graph fill color. #000000
+     */
+    graphFillColor: string;
+    /**
+     * Graph line opacity. Value range is 0 - 1.
+     */
+    graphLineAlpha: number;
+    /**
+     * Graph line color. #000000
+     */
+    graphLineColor: string;
+    /**
+     * By default the graph type is the same as the original graph's type,
+     * however in case of "candlestick" or "ohlc" you might want to show line graph in the scrollbar.
+     * Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc".
+     */
+    graphType: string;
+    /**
+     * Grid opacity. Value range is 0 - 1. 0.7
+     */
+    gridAlpha: number;
+    /**
+     * Grid color. #FFFFFF
+     */
+    gridColor: string;
+    /**
+     * The number of grid lines.
+     */
+    gridCount: number;
+    /**
+     * Specifies whether resize grips are hidden when mouse is away from the scrollbar.
+     */
+    hideResizeGrips: boolean;
+    /**
+     * Specifies whether scrollbar has a resize feature.
+     * @default true
+     */
+    resizeEnabled: boolean;
+    /**
+     * Height (width, if chart is rotated) of a scrollbar.
+     * @default 20
+     */
+    scrollbarHeight: number;
+    /**
+     * Duration of scrolling, when the user clicks on scrollbar's background, in seconds.
+     * @default 2
+     */
+    scrollDuration: number;
+    /**
+     * Selected backround opacity.
+     * @default 1
+     */
+    selectedBackgroundAlpha: number;
+    /**
+     * Selected background color. #EFEFEF
+     */
+    selectedBackgroundColor: string;
+    /**
+     * Selected graph's fill opacity. Value range is 0 - 1. 0.5
+     */
+    selectedGraphFillAlpha: number;
+    /**
+     * Selected graph's fill color. #000000
+     */
+    selectedGraphFillColor: string;
+    /**
+     * Selected graph's line opacity. Value range is 0 - 1.
+     */
+    selectedGraphLineAlpha: number;
+    /**
+     * Selected graph's line color. #000000
+     */
+    selectedGraphLineColor: string;
+    /**
+     * Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment
+     * when user releases mouse button.
+     */
+    updateOnReleaseOnly: boolean;
+}
diff --git a/types/amcharts/ChartScrollbarSettings.d.ts b/types/amcharts/ChartScrollbarSettings.d.ts
new file mode 100644
index 0000000000..a481792ea6
--- /dev/null
+++ b/types/amcharts/ChartScrollbarSettings.d.ts
@@ -0,0 +1,117 @@
+import AmGraph from "./AmGraph";
+
+/**
+ * ChartScrollbarSettings settings set's settings for chart scrollbar.
+ * If you change a property after the chart is initialized, you should call stockChart.validateNow() method in
+ * order for it to work. If there is no default value specified, default value of ChartScrollbar class will be used.
+ */
+export default class ChartScrollbarSettings {
+    /**
+     * Specifies whether number of gridCount is specified automatically, according to the axis size.
+     * @default true
+     */
+    autoGridCount: boolean;
+    /**
+     * Background opacity.
+     */
+    backgroundAlpha: number;
+    /**
+     * Background color of the scrollbar.
+     */
+    backgroundColor: string;
+    /**
+     * Text color.
+     */
+    color: string;
+    /**
+     * Set false if you don't need scrollbar.
+     * @default true
+     */
+    enabled: boolean;
+    /**
+     * Font size.
+     */
+    fontSize: string;
+    /**
+     * Specifies which graph will be displayed in the scrollbar.
+     */
+    graph: AmGraph;
+    /**
+     * Graph fill opacity.
+     */
+    graphFillAlpha: number;
+    /**
+     * Graph fill color.
+     */
+    graphFillColor: string;
+    /**
+     * Graph line opacity.
+     */
+    graphLineAlpha: number;
+    /**
+     * Graph line color.
+     */
+    graphLineColor: string;
+    /**
+     * Type of chart scrollbar's graph.
+     * By default the graph type is the same as the original graph's type, however in case of "candlestick" or
+     * "ohlc" you might want to show line graph in the scrollbar.
+     * Possible values are: line, column, step, smoothedLine, candlestick, ohlc.
+     */
+    graphType: string;
+    /**
+     * Grid opacity.
+     */
+    gridAlpha: number;
+    /**
+     * Grid color.
+     */
+    gridColor: string;
+    /**
+     * Grid count. You should set autoGridCount to false in order this property to work.
+     */
+    gridCount: number;
+    /**
+     * Height of scrollbar, in pixels.
+     * @default 40
+     */
+    height: number;
+    /**
+     * Specifies whether resize grips are hidden when mouse is away from the scrollbar.
+     */
+    hideResizeGrips: boolean;
+    /**
+     * Duration of scrolling, when the user clicks on scrollbar's background, in seconds.
+     */
+    scrollDuration: number;
+    /**
+     * Selected background opacity.
+     */
+    selectedBackgroundAlpha: number;
+    /**
+     * Selected background color.
+     */
+    selectedBackgroundColor: string;
+    /**
+     * Selected graph'sfill opacity.
+     */
+    selectedGraphFillAlpha: number;
+    /**
+     * Selected graph'sfill color.
+     */
+    selectedGraphFillColor: string;
+    /**
+     * Selected graph'sline opacity.
+     */
+    selectedGraphLineAlpha: number;
+    /**
+     * Selected graph's line color.
+     */
+    selectedGraphLineColor: string;
+    /**
+     * Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment when
+     * user releases mouse button. Usefull when working with large data sets.
+     * @default true
+     */
+    updateOnReleaseOnly: boolean;
+}
diff --git a/types/amcharts/DataSet.d.ts b/types/amcharts/DataSet.d.ts
new file mode 100644
index 0000000000..a5a9690662
--- /dev/null
+++ b/types/amcharts/DataSet.d.ts
@@ -0,0 +1,50 @@
+import StockEvent from "./StockEvent";
+
+/**
+ * DataSet is objects which holds all information about data.
+ */
+export default class DataSet {
+    /**
+     * Category field name in your dataProvider.
+     */
+    categoryField: string;
+    /**
+     * Color of the data set. One of colors from AmStockChart.colors array will be used if not set.
+     */
+    color: string;
+    /**
+     * Whether this data set is selected for comparing.
+     * If you change this property, you should call stockChart.validateData() method
+     * in order the changes to be applied.
+     */
+    compared: boolean;
+    /**
+     * Data provider of the data set.
+     */
+    dataProvider: any[];
+    /**
+     * Array of field mappings. Field mapping is an object with fromField and toField properties.
+     * fromField is a name of your value field in dataProvider.
+     * toField might be chosen freely, it will be used to set value/open/close/high/low fields for the StockGraph.
+     * Example: {fromField:"val1", toField:"value"}.
+     */
+    fieldMappings: any[];
+    /**
+     * Specifies whether this data set should be visible in "compare to" list.
+     * @default true
+     */
+    showInCompare: boolean;
+    /**
+     * Specifies whether this data set should be visible in "select" dropdown.
+     * @default true
+     */
+    showInSelect: boolean;
+    /**
+     * Array of StockEvent objects.
+     */
+    stockEvents: StockEvent[];
+    /**
+     * DataSet title.
+     */
+    title: string;
+}
diff --git a/types/amcharts/DataSetSelector.d.ts b/types/amcharts/DataSetSelector.d.ts
new file mode 100644
index 0000000000..8dfb1ed905
--- /dev/null
+++ b/types/amcharts/DataSetSelector.d.ts
@@ -0,0 +1,33 @@
+/**
+ * DataSetSelector is a tool for selecting data set's as main and for comparing with main data set.
+ */
+export default class DataSetSelector {
+    /**
+     * Text displayed in the "compare to" combobox (when position is "top" or "bottom"). Select...
+     */
+    comboBoxSelectText: string;
+    /**
+     * Text displayed near "compare to" list. Compare to:
+     */
+    compareText: string;
+    /**
+     * The maximum height of the Compare to field in pixels.
+     * @default 150
+     */
+    listHeight: number;
+    /**
+     * Possible values: "right", "left", "top", "bottom". "top" and "bottom" positions has a limitation -
+     * only one data set can be selected for comparing.
+     * @default "left"
+     */
+    position: string;
+    /**
+     * Text displayed near "Select" dropDown. Select:
+     */
+    selectText: string;
+    /**
+     * Width of a Data set selector, when position is "left" or "right".
+     * @default 180
+     */
+    width: number;
+}
diff --git a/types/amcharts/ExportSettings.d.ts b/types/amcharts/ExportSettings.d.ts
new file mode 100644
index 0000000000..f4422cfed2
--- /dev/null
+++ b/types/amcharts/ExportSettings.d.ts
@@ -0,0 +1,11 @@
+/**
+ * Seems like this is meant: https://github.com/amcharts/export
+ */
+export default class ExportSettings {
+    enabled: boolean;
+    libs: object;
+    menu: object;
+    config: any;
+    capture(config: any, callback: () => void): any;
+    toJPG(config: any, callback: (config: any) => void): any;
+}
diff --git a/types/amcharts/GaugeArrow.d.ts b/types/amcharts/GaugeArrow.d.ts
new file mode 100644
index 0000000000..59d82e576f
--- /dev/null
+++ b/types/amcharts/GaugeArrow.d.ts
@@ -0,0 +1,92 @@
+import GaugeAxis from "./GaugeAxis";
+
+export default class GaugeArrow {
+    /**
+     * Opacity of an arrow.
+     * @default 1
+     */
+    alpha: number;
+
+    /**
+     * Axis of the arrow. You can use reference to the axis or id of the axis.
+     * If you don't set any axis, the first axis of a chart will be used.
+     * @default GaugeAxis
+     */
+    axis: GaugeAxis;
+
+    /**
+     * Opacity of arrow border.
+     * @default 1
+     */
+    borderAlpha: number;
+
+    /**
+     * In case you need the arrow to rotate only clock-wise, set this property to true.
+     * @default false
+     */
+    clockWiseOnly: boolean;
+
+    /**
+     * Color of an arrow.
+     * @default #000000
+     */
+    color: string;
+
+    /**
+     * Unique id of an arrow.
+     */
+    id: string;
+
+    /**
+     * Inner radius of an arrow.
+     * @default 0
+     */
+    innerRadius: any;
+
+    /**
+     * Opacity of a nail, holding the arrow.
+     * @default 1
+     */
+    nailAlpha: number;
+
+    /**
+     * Opacity of nail border.
+     * @default 0
+     */
+    nailBorderAlpha: number;
+
+    /**
+     * Thickness of nail border.
+     * @default 1
+     */
+    nailBorderThickness: number;
+
+    /**
+     * Radius of a nail, holding the arrow.
+     * @default 8
+     */
+    nailRadius: number;
+
+    /**
+     * Radius of an arrow.
+     * @default '90%'
+     */
+    radius: any;
+
+    /**
+     * Width of arrow root.
+     * @default 8
+     */
+    startWidth: number;
+
+    /**
+     * Value to which the arrow should point at.
+     */
+    value: number;
+
+    /**
+     * Sets value for the arrow.
+     * Arrow will animate to this value if you do it after chart is written to it's container.
+     */
+    setValue(value: number): void;
+}
diff --git a/types/amcharts/GaugeAxis.d.ts b/types/amcharts/GaugeAxis.d.ts
new file mode 100644
index 0000000000..e9bcf979e4
--- /dev/null
+++ b/types/amcharts/GaugeAxis.d.ts
@@ -0,0 +1,312 @@
+import AmChart from "./AmChart";
+import GaugeBand from "./GaugeBand";
+
+export default class GaugeAxis {
+    /**
+     * Axis opacity.
+     * @default 1
+     */
+    axisAlpha: number;
+
+    /**
+     * Axis color.
+     * @default #000000
+     */
+    axisColor: string;
+
+    /**
+     * Thickness of the axis outline.
+     * @default 1
+     */
+    axisThickness: number;
+
+    /**
+     * Opacity of band fills.
+     * @default 1
+     */
+    bandAlpha: number;
+
+    /**
+     * Example: [-0.2, 0, -0.2]. Will make bands to be filled with color gradients.
+     * Negative value means the color will be darker than the original,
+     * and positive number means the color will be lighter.
+     * @default []
+     */
+    bandGradientRatio: [number];
+
+    /**
+     * Opacity of band outlines.
+     * @default 0
+     */
+    bandOutlineAlpha: number;
+
+    /**
+     * Color of band outlines.
+     * @default #000000
+     */
+    bandOutlineColor: string;
+
+    /**
+     * Thickness of band outlines.
+     * @default 0
+     */
+    bandOutlineThickness: number;
+
+    /**
+     * Array of bands - GaugeBand objects. Bands are used to draw color fills between specified values.
+     */
+    bands: [GaugeBand];
+
+    /**
+     * Text displayed below the axis center.
+     */
+    bottomText: string;
+
+    /**
+     * Specifies if text should be bold.
+     * @default true
+     */
+    bottomTextBold: boolean;
+
+    /**
+     * Bottom text color.
+     */
+    bottomTextColor: string;
+
+    /**
+     * Font size of bottom text.
+     */
+    bottomTextFontSize: number;
+
+    /**
+     * Y offset of bottom text.
+     * @default 0
+     */
+    bottomTextYOffset: number;
+
+    /**
+     * X position of the axis, relative to the center of the gauge.
+     * @default '0%'
+     */
+    centerX: any;
+
+    /**
+     * Y position of the axis, relative to the center of the gauge.
+     * @default '0%'
+     */
+    centerY: any;
+
+    /**
+     * Specifies labels color of the axis.
+     */
+    color: string;
+
+    /**
+     * Axis end angle. Valid values are from - 180 to 180.
+     * @default 120
+     */
+    endAngle: number;
+
+    /**
+     * Axis end (max) value
+     */
+    endValue: number;
+
+    /**
+     * Font size for axis labels.
+     */
+    fontSize: number;
+
+    /**
+     * Number of grid lines. Note, GaugeAxis doesn't adjust gridCount,
+     * so you should check your values and choose a proper gridCount which would result grids at round numbers.
+     * @default 5
+     */
+    gridCount: number;
+
+    /**
+     * Specifies if grid should be drawn inside or outside the axis.
+     * @default true
+     */
+    gridInside: boolean;
+
+    /**
+     * Unique id of an axis.
+     */
+    id: any;
+
+    /**
+     * Specifies if labels should be placed inside or outside the axis.
+     * @default true
+     */
+    inside: boolean;
+
+    /**
+     * Frequency of labels.
+     * @default 1
+     */
+    labelFrequency: number;
+
+    /**
+     * You can use this function to format axis labels.
+     * This function is called and value is passed as a attribute: labelFunction(value);
+     */
+    labelFunction: (value: number) => string;
+
+    /**
+     * Distance from axis to the labels.
+     * @default 15
+     */
+    labelOffset: number;
+
+    /**
+     * Specifies if labels on the axis should be shown.
+     * @default true
+     */
+    labelsEnabled: boolean;
+
+    /**
+     * You can add listeners of events using this property.
+     * Example: listeners = [{"event":"clickBand", "method":handleClick}];
+     */
+    listeners: object[];
+
+    /**
+     * Interval, at which minor ticks should be placed.
+     */
+    minorTickInterval: number;
+
+    /**
+     * Length of a minor tick.
+     * @default 5
+     */
+    minorTickLength: number;
+
+    /**
+     * Axis radius.
+     * @default '95%'
+     */
+    radius: any;
+
+    /**
+     * Specifies if the first label should be shown.
+     * @default true
+     */
+    showFirstLabel: boolean;
+
+    /**
+     * Specifies if the last label should be shown.
+     * @default true
+     */
+    showLastLabel: boolean;
+
+    /**
+     * Axis start angle. Valid values are from - 180 to 180.
+     * @default -120
+     */
+    startAngle: number;
+
+    /**
+     * Axis start (min) value.
+     * @default 0
+     */
+    startValue: number;
+
+    /**
+     * Opacity of axis ticks.
+     * @default 1
+     */
+    tickAlpha: number;
+
+    /**
+     * Color of axis ticks.
+     * @default #555555
+     */
+    tickColor: string;
+
+    /**
+     * Length of a major tick.
+     * @default 10
+     */
+    tickLength: number;
+
+    /**
+     * Tick thickness.
+     * @default 1
+     */
+    tickThickness: number;
+
+    /**
+     * Text displayed above the axis center.
+     */
+    topText: string;
+
+    /**
+     * Specifies if text should be bold.
+     * @default true
+     */
+    topTextBold: boolean;
+
+    /**
+     * Color of top text.
+     */
+    topTextColor: string;
+
+    /**
+     * Font size of top text.
+     */
+    topTextFontSize: number;
+
+    /**
+     * Y offset of top text.
+     * @default 0
+     */
+    topTextYOffset: number;
+
+    /**
+     * A string which can be placed next to axis labels.
+     */
+    unit: string;
+
+    /**
+     * Position of the unit.
+     * @default right
+     */
+    unitPosition: string;
+
+    /**
+     * Specifies if small and big numbers should use prefixes to make them more readable.
+     * @default false
+     */
+    usePrefixes: boolean;
+
+    /**
+     * Interval, at which ticks with values should be placed.
+     */
+    valueInterval: number;
+
+    /**
+     * Adds event listener to the object.
+     */
+    addListener(type: string, handler: any): void;
+
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+
+    /**
+     * Sets bottom text.
+     */
+    setBottomText(text: string): void;
+
+    /**
+     * Sets top text.
+     */
+    setTopText(textstring: string): void;
+
+    /**
+     * Returns angle of the value.
+     */
+    value2angle(value: number): void;
+}
diff --git a/types/amcharts/GaugeBand.d.ts b/types/amcharts/GaugeBand.d.ts
new file mode 100644
index 0000000000..dcbb9c6ddf
--- /dev/null
+++ b/types/amcharts/GaugeBand.d.ts
@@ -0,0 +1,65 @@
+export default class GaugeBand {
+    /**
+     * Opacity of band fill. Will use axis.bandAlpha if not set any.
+     */
+    alpha: number;
+
+    /**
+     * When rolled-over, band will display balloon if you set some text for this property.
+     */
+    balloonText: string;
+
+    /**
+     * Color of a band.
+     */
+    color: string;
+
+    /**
+     * End value of a fill.
+     */
+    endValue: number;
+
+    /**
+     * Example: [-0.2, 0, -0.2]. Will make bands to be filled with color gradients.
+     * Negative value means the color will be darker than the original,
+     * and positive number means the color will be lighter.
+     * @default []
+     */
+    gradientRatio: [number];
+
+    /**
+     * Unique id of a band.
+     */
+    id: string;
+
+    /**
+     * Inner radius of a band. If not set any, the band will end with the end of minor ticks.
+     * Set 0 if you want the band to be drawn to the axis center.
+     */
+    innerRadius: any;
+
+    /**
+     * Band radius. If not set any, the band will start with the axis outline.
+     */
+    radius: any;
+
+    /**
+     * Start value of a fill.
+     */
+    startValue: number;
+
+    /**
+     * Gauge band can be clickable and can lead to some page.
+     */
+    url: string;
+
+    /**
+     * Sets end value for the band.
+     */
+    setEndValue(value: number): void;
+
+    /**
+     * Sets start value for the band.
+     */
+    setStartValue(value: number): void;
+}
diff --git a/types/amcharts/GraphDataItem.d.ts b/types/amcharts/GraphDataItem.d.ts
new file mode 100644
index 0000000000..94df08ad67
--- /dev/null
+++ b/types/amcharts/GraphDataItem.d.ts
@@ -0,0 +1,70 @@
+import SerialDataItem from "./SerialDataItem";
+
+/**
+ * GraphDataItem holds all the information about the graph's data item.
+ * When working with a chart, you do not create GraphDataItem objects or change it's properties directly.
+ * GraphDataItem is passed to you by events when user interacts with data item on the chart.
+ * The list of properties below will help you to extract data item's value/coordinate/etc.
+ */
+export default class GraphDataItem {
+    /**
+     * Opacity of the data item.
+     */
+    alpha: number;
+    /**
+     * Bullet type.
+     */
+    bullet: string;
+    /**
+     * Bullet size.
+     */
+    bulletSize: number;
+    /**
+     * Category value.
+     */
+    category: string;
+    /**
+     * Color of the data item.
+     */
+    color: string;
+    /**
+     * Custom bullet (path to file name).
+     */
+    customBullet: string;
+    /**
+     * Original object from data provider.
+     */
+    dataContext: object;
+    /**
+     * Description.
+     */
+    description: string;
+    /**
+     * Array of colors of the data item, used by column and candlestick chart only.
+     */
+    fillColors: any[];
+    /**
+     * Object which holds percents when recalculateToPercents is set to true.
+     */
+    percents: object;
+    /**
+     * SerialDataItem of this graphDataItem
+     */
+    serialDataItem: SerialDataItem;
+    /**
+     * url
+     */
+    url: string;
+    /**
+     * Object which holds values of the data item (value, open, close, low, high).
+     */
+    values: object;
+    /**
+     * x coordinate of the data item.
+     */
+    x: number;
+    /**
+     * y coordinate of the data item.
+     */
+    y: number;
+}
diff --git a/types/amcharts/Guide.d.ts b/types/amcharts/Guide.d.ts
new file mode 100644
index 0000000000..51d8c4443b
--- /dev/null
+++ b/types/amcharts/Guide.d.ts
@@ -0,0 +1,123 @@
+import ValueAxis from "./ValueAxis";
+
+/**
+ * Guides are straight vertical or horizontal lines or areas supported by AmSerialChart, AmXYChart and AmRadarChart.
+ * You can have guides both on value and category axes.
+ * To add/remove a guide to an axis, use axis.addGuide(guide)/axis.removeGuide(guide) methods.
+ * If you do not set properties such as dashLength, lineAlpha, lineColor, etc - values of the axis are used.
+ */
+export default class Guide {
+   /**
+    * If you set it to true, the guide will be displayed above the graphs.
+    */
+   above: boolean;
+   /**
+    * Radar chart only. Specifies angle at which guide should start. Affects only fills, not lines.
+    */
+   angle: number;
+   /**
+    * Baloon fill color.
+    */
+   balloonColor: string;
+   /**
+    * The text which will be displayed if the user rolls-over the guide.
+    */
+   balloonText: string;
+   /**
+    * Specifies if label should be bold or not.
+    */
+   boldLabel: boolean;
+   /**
+    * Category of the guide (in case the guide is for category axis).
+    */
+   category: string;
+   /**
+    * Dash length.
+    */
+   dashLength: number;
+   /**
+    * Date of the guide (in case the guide is for category axis and parseDates is set to true).
+    */
+   date: Date;
+   /**
+    * Works if a guide is added to CategoryAxis and this axis is non-date-based.
+    * If you set it to true, the guide will start (or be placed, if it's not a fill) on the
+    * beginning of the category cell and will end at the end of toCategory cell.
+    */
+   expand: boolean;
+   /**
+    * Fill opacity. Value range is 0 - 1.
+    */
+   fillAlpha: number;
+   /**
+    * Fill color.
+    */
+   fillColor: string;
+   /**
+    * Font size of guide label.
+    */
+   fontSize: string;
+   /**
+    * Unique id of a Guide. You don't need to set it, unless you want to.
+    */
+   id: string;
+   /**
+    * Specifies whether label should be placed inside or outside plot area.
+    */
+   inside: boolean;
+   /**
+    * The label which will be displayed near the guide.
+    */
+   label: string;
+   /**
+    * Rotation angle of a guide label.
+    */
+   labelRotation: number;
+   /**
+    * Line opacity.
+    */
+   lineAlpha: number;
+   /**
+    * Line color.
+    */
+   lineColor: string;
+   /**
+    * Line thickness.
+    */
+   lineThickness: number;
+   /**
+    * Position of guide label. Possible values are "left" or "right" for horizontal axis
+    * and "top" or "bottom" for vertical axis.
+    */
+   position: string;
+   /**
+    * Tick length.
+    */
+   tickLength: number;
+   /**
+    * Radar chart only. Specifies angle at which guide should end. Affects only fills, not lines.
+    */
+   toAngle: number;
+   /**
+    * To category of the guide (in case the guide is for category axis).
+    */
+   toCategory: string;
+   /**
+    * To date of the guide (in case the guide is for category axis and parseDates is set to true).
+    * If you have both date and toDate, the space between these two dates can be filled with color.
+    */
+   toDate: Date;
+   /**
+    * To value of the guide (in case the guide is for value axis).
+    */
+   toValue: number;
+   /**
+    * Value of the guide (in case the guide is for value axis).
+    */
+   value: number;
+   /**
+    * Value axis of a guide. As you can add guides directly to the chart,
+    * you might need to specify which which value axis should be used.
+    */
+   valueAxis: ValueAxis;
+}
diff --git a/types/amcharts/ImagesSettings.d.ts b/types/amcharts/ImagesSettings.d.ts
new file mode 100644
index 0000000000..ab4759536d
--- /dev/null
+++ b/types/amcharts/ImagesSettings.d.ts
@@ -0,0 +1,97 @@
+/**
+ * ImagesSettings is a class which holds common settings of all MapImage objects.
+ */
+export default class ImagesSettings {
+    /**
+     * Opacity of the image.
+     * @default 1
+     */
+    alpha: number;
+    /**
+     * Text which is displayed in a roll-over balloon. You can use the following tags:
+     * [[title]], [[description]], [[value]] and [[percent]]. [[title]]
+     */
+    balloonText: string;
+    /**
+     * Specifies if the image's center should be placed in the provided coordinates.
+     * If false, top-left corner will be at provided coordinates.
+     * @default true
+     */
+    centered: boolean;
+    /**
+     * Color of image.
+     * This will affect only predefined images (with "type" property set) and images with svgPath set.
+     * This property won't affect bitmap images and loaded SVG images.
+     * @default "#000000"
+     */
+    color: string;
+    /**
+     * Height of a description window.
+     */
+    descriptionWindowHeight: number;
+    /**
+     * Width of a description window.
+     * @default 250
+     */
+    descriptionWindowWidth: number;
+    /**
+     * X position of a description window.
+     */
+    descriptionWindowX: number;
+    /**
+     * Y position of a description window.
+     */
+    descriptionWindowY: number;
+    /**
+     * Label color. #000000
+     */
+    labelColor: string;
+    /**
+     * Font size of a label.
+     * @default 11
+     */
+    labelfontSize: string;
+    /**
+     * Position of the label. Allowed values are: left, right, top, bottom and middle. right
+     */
+    labelPosition: string;
+    /**
+     * Label roll-over color. #00CC00
+     */
+    labelRollOverColor: string;
+    /**
+     * Opacity of image outline.
+     * This will affect only predefined images (with "type" property set) and images with svgPath set.
+     * This property won't affect bitmap images and loaded SVG images.
+     */
+    outlineAlpha: number;
+    /**
+     * Color of image outline.
+     * This will affect only predefined images (with "type" property set) and images with svgPath set.
+     * This property won't affect bitmap images and loaded SVG images.
+     */
+    outlineColor: string;
+    /**
+     * Thickness of image outline.
+     * This will affect only predefined images (with "type" property set) and images with svgPath set.
+     * This property won't affect bitmap images and loaded SVG images.
+     * @default 1
+     */
+    outlineThickness: number;
+    /**
+     * Color of image when hovered.
+     * This will affect only predefined images (with "type" property set) and images with svgPath set.
+     * This property won't affect bitmap images and loaded SVG images.
+     */
+    rollOverColor: string;
+    /**
+     * Scale of the image when hovered. Use value like 1.5 - 2 to enlarge image when user rolls-over it.
+     * @default 1
+     */
+    rollOverScale: number;
+    /**
+     * Scale of the image if it is selected. Use value like 1.5 - 2 to enlarge selected image.
+     * @default 1
+     */
+    selectedScale: number;
+}
diff --git a/types/amcharts/Label.d.ts b/types/amcharts/Label.d.ts
new file mode 100644
index 0000000000..a539c76d88
--- /dev/null
+++ b/types/amcharts/Label.d.ts
@@ -0,0 +1,49 @@
+/**
+ * Creates a label on the chart which can be placed anywhere, multiple can be assigned.
+ */
+export default class Label {
+    /**
+     * @Default 'left'
+     */
+    align: string;
+    /**
+     * @Default 1
+     */
+    alpha: number;
+    /**
+     * Specifies if label is bold or not.
+     */
+    bold: boolean;
+    /**
+     * Color of a label
+     */
+    color: string;
+    /**
+     * Unique id of a Label. You don't need to set it, unless you want to.
+     */
+    id: string;
+    /**
+     * Rotation angle.
+     */
+    rotation: number;
+    /**
+     * Text size
+     */
+    size: number;
+    /**
+     * Text of a label
+     */
+    text: string;
+    /**
+     * URL which will be access if user clicks on a label.
+     */
+    url: string;
+    /**
+     * X position of a label.
+     */
+    x: number | string;
+    /**
+     * y position of a label.
+     */
+    y: number | string;
+}
diff --git a/types/amcharts/LegendSettings.d.ts b/types/amcharts/LegendSettings.d.ts
new file mode 100644
index 0000000000..94b73bd430
--- /dev/null
+++ b/types/amcharts/LegendSettings.d.ts
@@ -0,0 +1,114 @@
+/**
+ * Common settings of legends.
+ * If you change a property after the chart is initialized, you should call stockChart.validateNow() method
+ * in order for it to work. If there is no default value specified, default value of StockLegend class will be used.
+ */
+export default class LegendSettings {
+   /**
+    * Alignment of legend entries. Possible values are: "left", "right" and "center".
+    */
+   align: string;
+   /**
+    * Specifies if each legend entry should take the same space as the longest legend entry.
+    */
+   equalWidths: boolean;
+   /**
+    * Horizontal space between legend item and left/right border.
+    */
+   horizontalGap: number;
+   /**
+    * The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph.
+    */
+   labelText: string;
+   /**
+    * Space below the last row of the legend, in pixels.
+    */
+   marginBottom: number;
+   /**
+    * Space above the first row of the legend, in pixels.
+    */
+   marginTop: number;
+   /**
+    * Opacity of marker border.
+    */
+   markerBorderAlpha: number;
+   /**
+    * Marker border color.
+    */
+   markerBorderColor: string;
+   /**
+    * Thickness of the legend border.
+    */
+   markerBorderThickness: number;
+   /**
+    * The color of the disabled marker (when the graph is hidden).
+    */
+   markerDisabledColor: string;
+   /**
+    * Space between legend marker and legend text, in pixels.
+    */
+   markerLabelGap: number;
+   /**
+    * Size of the legend marker (key).
+    */
+   markerSize: number;
+   /**
+    * Shape of the legend marker (key).
+    * Possible values are:
+    * "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none".
+    */
+   markerType: string;
+   /**
+    * Specifies whether legend entries should be placed in reversed order.
+    */
+   reversedOrder: boolean;
+   /**
+    * Legend item text color on roll-over.
+    */
+   rollOverColor: string;
+   /**
+    * When you roll-over the legend entry, all other graphs can reduce their opacity,
+    * so that the graph you rolled-over would be distinguished. This property specifies the opacity of the graphs.
+    */
+   rollOverGraphAlpha: number;
+   /**
+    * Whether showing/hiding of graphs by clicking on the legend marker is enabled or not.
+    */
+   switchable: boolean;
+   /**
+    * Legend switch color.
+    */
+   switchColor: string;
+   /**
+    * Legend switch type (in case the legend is switchable). Possible values are: "x" and "v".
+    */
+   switchType: string;
+   /**
+    * Specifies whether the legend text is clickable or not.
+    * Clicking on legend text can show/hide value balloons if they are enabled.
+    */
+   textClickEnabled: boolean;
+   /**
+    * Specifies if legend labels should be use same color as corresponding markers.
+    */
+   useMarkerColorForLabels: boolean;
+   /**
+    * The text which will be displayed in the value portion of the legend when graph is comparable and
+    * at least one dataSet is selected for comparing.
+    * You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]].
+    */
+   valueTextComparing: string;
+   /**
+    * The text which will be displayed in the value portion of the legend.
+    * You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]].
+    */
+   valueTextRegular: string;
+   /**
+    * Width of the value text. Increase this value if your values do not fit in the allocated space.
+    */
+   valueWidth: number;
+   /**
+    * Vertical space between legend items, in pixels.
+    */
+   verticalGap: number;
+}
diff --git a/types/amcharts/PanelSettings.d.ts b/types/amcharts/PanelSettings.d.ts
new file mode 100644
index 0000000000..471e146d62
--- /dev/null
+++ b/types/amcharts/PanelSettings.d.ts
@@ -0,0 +1,145 @@
+/**
+ * PanelsSettings settings set's settings for all StockPanels.
+ * If you change a property after the chart is initialized,
+ * you should call stockChart.validateNow() method in order for it to work.
+ * If there is no default value specified, default value of StockPanel class will be used.
+ */
+export default class PanelsSettings {
+    /**
+     * The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0).
+     */
+    angle: number;
+    /**
+     * Opacity of panel background. Possible values are 1 and 0. Values like 0.5 will not make it half-transparent.
+     */
+    backgroundAlpha: number;
+    /**
+     * Background color of panels. Set backgroundAlpha to > 0 value in order to make background visible.
+     * @default "#FFFFFF"
+     */
+    backgroundColor: string;
+    /**
+     * The gap in pixels between two columns of the same category.
+     */
+    columnSpacing: number;
+    /**
+     * Relative width of columns. Valid values 0 - 1.
+     */
+    columnWidth: number;
+    /**
+     * The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0).
+     */
+    depth3D: number;
+    /**
+     * Font family.
+     */
+    fontFamily: string;
+    /**
+     * Font size.
+     */
+    fontSize: string;
+    /**
+     * Number of pixels between the container's bottom border and plot area.
+     * @default 1
+     */
+    marginBottom: number;
+    /**
+     * Number of pixels between the container's left border and plot area.
+     * If your left valueAxis values ar not placed inside the plot area,
+     * you should set marginLeft to 80 or some close value.
+     */
+    marginLeft: number;
+    /**
+     * Number of pixels between the container's left border and plot area.
+     * If your right valueAxis values ar not placed inside the plot area,
+     * you should set marginRight to 80 or some close value.
+     */
+    marginRight: number;
+    /**
+     * Number of pixels between the container's top border and plot area.
+     */
+    marginTop: number;
+    /**
+     * Gap between panels.
+     * @default 8
+     */
+    panelSpacing: number;
+    /**
+     * This setting affects touch-screen devices only.
+     * If a chart is on a page, and panEventsEnabled are set to true,
+     * the page won't move if the user touches the chart first.
+     * If a chart is big enough and occupies all the screen of your touch device,
+     * the user won’t be able to move the page at all. That's why the default value is "false".
+     * If you think that selecting or or panning the chart is a primary purpose of your chart users,
+     * you should set panEventsEnabled to true.
+     */
+    panEventsEnabled: boolean;
+    /**
+     * The opacity of plot area's border.
+     */
+    plotAreaBorderAlpha: number;
+    /**
+     * The color of the plot area's border.
+     */
+    plotAreaBorderColor: string;
+    /**
+     * Opacity of plot area fill.
+     */
+    plotAreaFillAlphas: number;
+    /**
+     * Specifies the colors used to tint the background gradient fill of the plot area. String or Array of Strings
+     */
+    plotAreaFillColors: any;
+    /**
+     * Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc.
+     * Prefixes are used on value axes and in the legend.
+     * To enable prefixes, set usePrefixes property to true.
+     * [
+     *     {number:1e+3,prefix:"k"},
+     *     {number:1e+6,prefix:"M"},
+     *     {number:1e+9,prefix:"G"},
+     *     {number:1e+12,prefix:"T"},
+     *     {number:1e+15,prefix:"P"},
+     *     {number:1e+18,prefix:"E"},
+     *     {number:1e+21,prefix:"Z"},
+     *     {number:1e+24,prefix:"Y"}
+     * ]
+     */
+    prefixesOfBigNumbers: any[];
+    /**
+     * Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc.
+     * Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true.
+     * [
+     *     {number:1e-24, prefix:"y"},
+     *     {number:1e-21, prefix:"z"},
+     *     {number:1e-18, prefix:"a"},
+     *     {number:1e-15, prefix:"f"},
+     *     {number:1e-12, prefix:"p"},
+     *     {number:1e-9, prefix:"n"},
+     *     {number:1e-6, prefix:"μ"},
+     *     {number:1e-3, prefix:"m"}
+     * ]
+     */
+    prefixesOfSmallNumbers: any[];
+    /**
+     * Specifies whether the animation should be sequenced or all objects should appear at once.
+     */
+    sequencedAnimation: boolean;
+    /**
+     * The initial opacity of the column/line.
+     * If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha.
+     */
+    startAlpha: number;
+    /**
+     * Duration of the animation, in seconds.
+     */
+    startDuration: number;
+    /**
+     * Possible values are: "linear", "<", ">" "<>", "elastic", "bounce".
+     */
+    startEffect: string;
+    /**
+     * If true, prefixes will be used for big and small numbers.
+     */
+    usePrefixes: boolean;
+}
diff --git a/types/amcharts/PeriodSelector.d.ts b/types/amcharts/PeriodSelector.d.ts
new file mode 100644
index 0000000000..672fa0ba5b
--- /dev/null
+++ b/types/amcharts/PeriodSelector.d.ts
@@ -0,0 +1,88 @@
+import AmChart from "./AmChart";
+
+export default class PeriodSelector {
+    /**
+     * Date format of date input fields.
+     * Check [[http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/mx/formatters/DateFormatter.html
+     * @default "DD-MM-YYYY"
+     */
+    dateFormat: string;
+    /**
+     * Text displayed next to "from" date input field. From:
+     */
+    fromText: string;
+    /**
+     * Specifies if period buttons with date range bigger than available data should be hidden.
+     * @default true
+     */
+    hideOutOfScopePeriods: boolean;
+    /**
+     * Specifies whether period selector displays "from" and "to" date input fields.
+     * @default true
+     */
+    inputFieldsEnabled: boolean;
+    /**
+     * Width of date input fields, in pixels. Works only if period selector is horizontal.
+     * @default 100
+     */
+    inputFieldWidth: number;
+    /**
+     * Array of predefined period objects. Period object has 4 properties - period, count, label and selected.
+     * Possible period values are:
+     * "ss" - seconds,
+     * "mm" - minutes,
+     * "hh" - hours,
+     * "DD" - days,
+     * "MM" - months,
+     * "YYYY" - years.
+     * Property "count" specifies how many periods this button will select.
+     * "label" will be displayed on a button.
+     * "selected" is a boolean which specifies if this button is selected when chart is initialized or not.
+     * Example: {period:"DD", count:10, label:"10 days", selected:false}.
+     */
+    periods: any[];
+    /**
+     * Text displayed next to predefined period buttons. Zoom:
+     */
+    periodsText: string;
+    /**
+     * Possible values: "right", "left", "top", "bottom". bottom
+     */
+    position: string;
+    /**
+     * Specifies whether predefined period buttons should select a period from the beginning or the end of the data.
+     */
+    selectFromStart: boolean;
+    /**
+     * Text displayed next to "to" date input field. To:
+     */
+    toText: string;
+    /**
+     * Width of a period selector, when position is "left" or "right".
+     * @default 180
+     */
+    width: number;
+
+    /**
+     * Adds event listener to the object.
+     * @param handler - Dispatched when dates in period selector input fields are changed or
+     * user clicks on one of the predefined period buttons.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                type: string;
+                startDate: Date;
+                endDate: Date;
+                predefinedPeriod: string;
+                count: number;
+            },
+        ) => void,
+    ): void;
+
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+}
diff --git a/types/amcharts/SerialDataItem.d.ts b/types/amcharts/SerialDataItem.d.ts
new file mode 100644
index 0000000000..cd549a9791
--- /dev/null
+++ b/types/amcharts/SerialDataItem.d.ts
@@ -0,0 +1,26 @@
+/**
+ * SerialDataItem holds all the information about each series.
+ * When working with a chart, you do not create SerialDataItem objects or change it's properties directly.
+ * Consider properties of a SerialDataItem read-only - change values in chart's data provider if you need to.
+ * When serial chart parses dataProvider, it generates "chartData" array.
+ * Objects of this array are SerialDataItem objects.
+ */
+export default class SerialDataItem {
+    /**
+     * You can access each GraphDataItem using this object.
+     * The data structure is: graphDataItem = serialDataItem.axes[axisId].graphs[graphId].
+     */
+    axes: object;
+    /**
+     * category value. String if parseDates is false, Date if true.
+     */
+    category: any;
+    /**
+     * Timestamp of a series date. Avalable only if parseDates property of CategoryAxis is set to true.
+     */
+    time: number;
+    /**
+     * Coordinate (horizontal or vertical, depends on chart's rotate property) of the series.
+     */
+    x: number;
+}
diff --git a/types/amcharts/Slice.d.ts b/types/amcharts/Slice.d.ts
new file mode 100644
index 0000000000..a63cda4ebc
--- /dev/null
+++ b/types/amcharts/Slice.d.ts
@@ -0,0 +1,52 @@
+/**
+ * Slice is an item of AmPieChart's chartData Array and holds all the information about the slice.
+ * When working with a pie chart, you do not create slices or change it's properties directly,
+ * instead you set array of data using dataProvider property.
+ * Consider properties of a Slice read-only - change values in chart's data provider if you need to.
+ */
+export default class Slice {
+    /**
+     * Opacity of a slice.
+     */
+    alpha: number;
+    /**
+     * Color of a slice.
+     */
+    color: string;
+    /**
+     * Original object from data provider.
+     */
+    dataContext: object;
+    /**
+     * Slice description.
+     */
+    description: string;
+    /**
+     * Specifies whether the slice is hidden
+     */
+    hidden: boolean;
+    /**
+     * Percent value of a slice.
+     */
+    percents: number;
+    /**
+     * Specifies whether the slice is pulled or not.
+     */
+    pulled: boolean;
+    /**
+     * Slice title
+     */
+    title: string;
+    /**
+     * Url of a slice
+     */
+    url: string;
+    /**
+     * Value of a slice
+     */
+    value: number;
+    /**
+     * specifies whether this slice has a legend entry
+     */
+    visibleInLegend: boolean;
+}
diff --git a/types/amcharts/StockEvent.d.ts b/types/amcharts/StockEvent.d.ts
new file mode 100644
index 0000000000..13b6b53fb5
--- /dev/null
+++ b/types/amcharts/StockEvent.d.ts
@@ -0,0 +1,69 @@
+import StockGraph from "./StockGraph";
+
+/**
+ * StockEvent is object which holds information about event(bullet).
+ * Values from StockEventsSettings will be used if not set.
+ * Stock event bullet's size depends on it's graphs fontSize.
+ * When user rolls - over, clicks or rolls - out of the event bullet, AmStockChart dispatches events.
+ */
+export default class StockEvent {
+    /**
+     * Opacity of bullet background.
+     * @default 1
+     */
+    backgroundAlpha: number;
+    /**
+     * Color of bullet background. #DADADA
+     */
+    backgroundColor: string;
+    /**
+     * Opacity of bullet border.
+     * @default 1
+     */
+    borderAlpha: number;
+    /**
+     * Bullet border color. #888888
+     */
+    borderColor: string;
+    /**
+     * The color of the event text. #000000
+     */
+    color: string;
+    /**
+     * Date of an event. Must be Date object, not a string.
+     */
+    date: Date;
+    /**
+     * graph on which event will be displayed.
+     */
+    graph: StockGraph;
+    /**
+     * Roll-over background color. #CC0000
+     */
+    rollOverColor: string;
+    /**
+     * Specifies if the event should be displayed on category axis
+     */
+    showOnAxis: boolean;
+    /**
+     * Letter which will be displayed on the event. Not all types can display letters.
+     * "text" type can display longer texts.
+     */
+    text: string;
+    /**
+     * Type of bullet.
+     * Possible values are:
+     * "flag", "sign", "pin", "triangleUp", "triangleDown", "triangleLeft", "triangleRight", "text",
+     * "arrowUp", "arrowDown"
+     * @default "sign"
+     */
+    type: string;
+    /**
+     * A URL to go to when user clicks the event.
+     */
+    url: string;
+    /**
+     * target of url, "_blank" for example.
+     */
+    urlTarget: string;
+}
diff --git a/types/amcharts/StockGraph.d.ts b/types/amcharts/StockGraph.d.ts
new file mode 100644
index 0000000000..e8bd53cc16
--- /dev/null
+++ b/types/amcharts/StockGraph.d.ts
@@ -0,0 +1,74 @@
+import AmGraph from "./AmGraph";
+
+export default class StockGraph extends AmGraph {
+    /**
+     * Specifies whether this graph will be compared if some data set is selected for comparing.
+     */
+    comparable: boolean;
+    /**
+     * Specifies a field to be used to generate comparing graph.
+     * Note, this field is not the one used in your dataProvider, but toField from FieldMapping object.
+     */
+    compareField: string;
+    /**
+     * Balloon color of comparing graph.
+     */
+    compareGraphBalloonColor: string;
+    /**
+     * Balloon text of comparing graph.
+     */
+    compareGraphBalloonText: string;
+    /**
+     * Bullet of comparing graph.
+     * Possible values are: "square", "round", "line", "triangleUp", "triangleDown", "dashedLine", "bubble".
+     */
+    compareGraphBullet: string;
+    /**
+     * Bullet size of comparing graph.
+     */
+    compareGraphBulletSize: number;
+    /**
+     * Corner radius of comparing graph (if type is "column").
+     */
+    compareGraphCornerRadiusTop: number;
+    /**
+     * Dash length of compare graph.
+     */
+    compareGraphDashLength: number;
+    /**
+     * Fill alpha of comparing graph.
+     */
+    compareGraphFillAlphas: number;
+    /**
+     * Fill color of comparing graph.
+     */
+    compareGraphFillColors: string;
+    /**
+     * Opacity of comparing graph line.
+     */
+    compareGraphLineAlpha: number;
+    /**
+     * Thickness of compare graph.
+     */
+    compareGraphLineThickness: number;
+    /**
+     * Type of comparing graph. Possible values are: "line", "column", "step", "smoothedLine." line
+     */
+    compareGraphType: string;
+    /**
+     * Specifies if compare graph is visible in legend.
+     * @default true
+     */
+    compareGraphVisibleInLegend: boolean;
+    /**
+     * When data is grouped to periods, the graph must know which period value should be used.
+     * Possible values are: "Open", "Low", "High", "Close", "Average" and "Sum".
+     * @default "Close"
+     */
+    periodValue: string;
+    /**
+     * Specifies whether data set color should be used as this graph's lineColor.
+     * @default true
+     */
+    useDataSetColors: boolean;
+}
diff --git a/types/amcharts/StockLegend.d.ts b/types/amcharts/StockLegend.d.ts
new file mode 100644
index 0000000000..ae765b98e3
--- /dev/null
+++ b/types/amcharts/StockLegend.d.ts
@@ -0,0 +1,23 @@
+import AmLegend from "./AmLegend";
+
+/**
+ * StockLegend is a legend of StockPanel.
+ */
+export default class StockLegend extends AmLegend {
+    /**
+     * The text which will be displayed in the value portion of the legend when graph is comparable and
+     * at least one dataSet is selected for comparing.
+     * You can use tags like
+     * [[value]], [[open]], [[high]], [[low]], [[close]], [[percents.value/open/close/low/high]],
+     * [[description]]
+     * @default [[percents.value]]%
+     */
+    valueTextComparing: string;
+    /**
+     * The text which will be displayed in the value portion of the legend.
+     * You can use tags like
+     * [[value]], [[open]], [[high]], [[low]], [[close]],[[percents]], [[description]]
+     * @default [[value]]
+     */
+    valueTextRegular: string;
+}
diff --git a/types/amcharts/StockPanel.d.ts b/types/amcharts/StockPanel.d.ts
new file mode 100644
index 0000000000..817c7a1f7a
--- /dev/null
+++ b/types/amcharts/StockPanel.d.ts
@@ -0,0 +1,85 @@
+import AmSerialChart from "./AmSerialChart";
+import StockGraph from "./StockGraph";
+import StockLegend from "./StockLegend";
+import ValueAxis from "./ValueAxis";
+
+/**
+ * StockPanel class creates stock panels (charts). AmStockChart can have multiple Stock panels.
+ */
+export default class StockPanel extends AmSerialChart {
+    /**
+     * Specifies whether x button will be displayed near the panel. This button allows turning panel off.
+     */
+    allowTurningOff: boolean;
+    /**
+     * If true, drawing icons will be displayed in top-right corner.
+     */
+    drawingIconsEnabled: boolean;
+    /**
+     * Specifies on which value axis user can draw trend lines.
+     * Set drawingIconsEnabled to true if you want drawing icons to be visible.
+     * First value axis will be used if not set here.
+     */
+    drawOnAxis: ValueAxis;
+    /**
+     * Specifies if all trend lines should be erased when erase button is clicked.
+     * If false, trend lines can be erased one by one.
+     */
+    eraseAll: boolean;
+    /**
+     * Size of trend line drawing icons.
+     * If you change this size, you should update icon images if you want them to look properly.
+     * @default 18
+     */
+    iconSize: number;
+    /**
+     * Relative height of panel. Possible values 0 - 100.
+     */
+    percentHeight: number;
+    /**
+     * Specifies when values should be recalculated to percents.
+     * Possible values are: "never", "always", "whenComparing".
+     * @default "whenComparing"
+     */
+    recalculateToPercents: string;
+    /**
+     * Specifies whether this panel will show category axis.
+     * @default true
+     */
+    showCategoryAxis: boolean;
+    stockGraphs: StockGraph[];
+    /**
+     * Stock chart legend.
+     */
+    stockLegend: StockLegend;
+    /**
+     * Title of a panel. Note, StockLegend should be added in order title to be displayed.
+     */
+    title: string;
+    /**
+     * Trend line opacity.
+     * @default 1
+     */
+    trendLineAlpha: number;
+    /**
+     * Trend line color. #00CC00
+     */
+    trendLineColor: string;
+    /**
+     * Trend line dash length.
+     */
+    trendLineDashLength: number;
+    /**
+     * Trend line thickness.
+     * @default 2
+     */
+    trendLineThickness: number;
+    /**
+     * Adds a graph to the panel.
+     */
+    addStockGraph(graph: StockGraph): void;
+    /**
+     * Removes graph from the panel.
+     */
+    removeStockGraph(graph: StockGraph): void;
+}
diff --git a/types/amcharts/Title.d.ts b/types/amcharts/Title.d.ts
new file mode 100644
index 0000000000..2508ff303a
--- /dev/null
+++ b/types/amcharts/Title.d.ts
@@ -0,0 +1,27 @@
+export default class Title {
+    /**
+     * @default 1
+     */
+    alpha: number;
+    /**
+     * Specifies if the tile is bold or not.
+     * @default false
+     */
+    bold: boolean;
+    /**
+     * Text color of a title.
+     */
+    color: string;
+    /**
+     * Unique id of a Title. You don't need to set it, unless you want to.
+     */
+    id: string;
+    /**
+     * Text size
+     */
+    size: number;
+    /**
+     * Text of a label
+     */
+    text: string;
+}
diff --git a/types/amcharts/TrendLine.d.ts b/types/amcharts/TrendLine.d.ts
new file mode 100644
index 0000000000..150f3b8071
--- /dev/null
+++ b/types/amcharts/TrendLine.d.ts
@@ -0,0 +1,15 @@
+/**
+ * Trend lines are straight lines indicating trends, might also be used for some different purposes.
+ * Can be used by Serial and XY charts.
+ * To add/remove trend line, use chart.addTrendLine(trendLine)/chart.removeTrendLine(trendLine) methods
+ * or simply pass array of trend lines: chart.trendLines = [trendLine1, trendLine2].
+ * @example
+ * let trendLine = new AmCharts.TrendLine();
+ * trendLine.initialDate = new Date(2012, 0, 2, 12); // 12 is hour - to start trend line in the middle of the day
+ * trendLine.finalDate = new Date(2012, 0, 11, 12);
+ * trendLine.initialValue = 10;
+ * trendLine.finalValue = 19;
+ * trendLine.lineColor = "#CC0000";
+ * chart.addTrendLine(trendLine);
+ */
+export default class TrendLine { }
diff --git a/types/amcharts/ValueAxesSettings.d.ts b/types/amcharts/ValueAxesSettings.d.ts
new file mode 100644
index 0000000000..1b7676b7d7
--- /dev/null
+++ b/types/amcharts/ValueAxesSettings.d.ts
@@ -0,0 +1,126 @@
+/**
+ * ValueAxesSettings settings sets settings for all ValueAxes.
+ * If you change a property after the chart is initialized,
+ * you should call stockChart.validateNow() method in order for it to work.
+ * If there is no default value specified, default value of ValueAxis class will be used.
+ */
+export default class ValueAxesSettings {
+    /**
+     * Specifies whether number for gridCount is specified automatically, according to the axis size.
+     * @default true
+     */
+    autoGridCount: boolean;
+    /**
+     * Axis opacity.
+     */
+    axisAlpha: number;
+    /**
+     * Axis color.
+     */
+    axisColor: string;
+    /**
+     * Thickness of the axis.
+     */
+    axisThickness: number;
+    /**
+     * Label color.
+     */
+    color: string;
+    /**
+     * Length of a dash. By default, the grid line is not dashed.
+     */
+    dashLength: number;
+    /**
+     * Fill opacity. Every second space between grid lines can be filled with color.
+     */
+    fillAlpha: number;
+    /**
+     * Fill color. Every second space between grid lines can be filled with color.
+     * Set fillAlpha to a value greater than 0 to see the fills.
+     */
+    fillColor: string;
+    /**
+     * Opacity of grid lines.
+     */
+    gridAlpha: number;
+    /**
+     * Color of grid lines.
+     */
+    gridColor: string;
+    /**
+     * Approximate number of grid lines. autoGridCount should be set to false,
+     * otherwise this property will be ignored.
+     */
+    gridCount: number;
+    /**
+     * Thickness of grid lines.
+     */
+    gridThickness: number;
+    /**
+     * Specifies whether guide values should be included when calculating min and max of the axis.
+     */
+    includeGuidesInMinMax: boolean;
+    /**
+     * If true, the axis will include hidden graphs when calculating min and max values.
+     */
+    includeHidden: boolean;
+    /**
+     * Specifies whether values should be placed inside or outside plot area.
+     * In case you set this to false, you'll have to adjust marginLeft or marginRight in
+     * [[PanelsSettings]] in order labels to be visible.
+     * @default true
+     */
+    inside: boolean;
+    /**
+     * Specifies whether values on axis can only be integers or both integers and doubles.
+     */
+    integersOnly: boolean;
+    /**
+     * Frequency at which labels should be placed.
+     */
+    labelFrequency: number;
+    /**
+     * Specifies whether value labels are displayed.
+     */
+    labelsEnabled: boolean;
+    /**
+     * Set to true if value axis is logarithmic, false otherwise.
+     */
+    logarithmic: boolean;
+    /**
+     * The distance of the axis to the plot area, in pixels. Useful if you have more then one axis on the same side.
+     */
+    offset: number;
+    /**
+     * Position of the value axis. Possible values are "left" and "right".
+     */
+    position: string;
+    /**
+     * Set to true if value axis is reversed (smaller values on top), false otherwise.
+     */
+    reversed: boolean;
+    /**
+     * Specifies if first label of value axis should be displayed.
+     */
+    showFirstLabel: boolean;
+    /**
+     * Specifies if last label of value axis should be displayed.
+     */
+    showLastLabel: boolean;
+    /**
+     * Stacking mode of the axis. Possible values are: "none", "regular", "100%", "3d".
+     */
+    stackType: string;
+    /**
+     * Tick length.
+     */
+    tickLength: number;
+    /**
+     * Unit which will be added to the value label.
+     */
+    unit: string;
+    /**
+     * Position of the unit. Possible values are "left" or "right".
+     */
+    unitPosition: string;
+}
diff --git a/types/amcharts/ValueAxis.d.ts b/types/amcharts/ValueAxis.d.ts
new file mode 100644
index 0000000000..dd9832d750
--- /dev/null
+++ b/types/amcharts/ValueAxis.d.ts
@@ -0,0 +1,250 @@
+import AmChart from "./AmChart";
+import AxisBase from "./AxisBase";
+import Guide from "./Guide";
+
+/**
+ * ValueAxis is the class which displays value axis for the chart. The chart can have any number of value axes.
+ * For Serial chart one value axis is created automatically.
+ * For XY Chart two value axes (horizontal and vertical) are created automatically.
+ */
+export default class ValueAxis extends AxisBase {
+    /**
+     * Radar chart only. Specifies distance from axis to the axis title (category)  10
+     */
+    axisTitleOffset: number;
+    /**
+     * Read-only. Coordinate of the base value.
+     */
+    baseCoord: number;
+    /**
+     * Specifies base value of the axis.
+     */
+    baseValue: number;
+    /**
+     * If your values represents time units, and you want value axis labels to be formatted as duration,
+     * you have to set the duration unit. Possible values are: "ss", "mm", "hh" and "DD".
+     */
+    duration: string;
+    /**
+     * If duration property is set, you can specify what string should be displayed next to day,
+     * hour, minute and second.
+     * {DD:"d. ", hh:":", mm:":",ss:""}
+     */
+    durationUnits: { DD: string; hh: string; mm: string; ss: string };
+    /**
+     * Radar chart only. Possible values are: "polygons" and "circles". Set "circles" for polar charts.
+     * @default "polygons"
+     */
+    gridType: string;
+    /**
+     * Unique id of value axis. It is not required to set it, unless you need to tell the graph which exact
+     * value axis it should use.
+     */
+    id: string;
+    /**
+     * Specifies whether guide values should be included when calculating min and max of the axis.
+     */
+    includeGuidesInMinMax: boolean;
+    /**
+     * If true, the axis will include hidden graphs when calculating min and max values.
+     */
+    includeHidden: boolean;
+    /**
+     * Specifies whether values on axis can only be integers or both integers and doubles.
+     */
+    integersOnly: boolean;
+    /**
+     * You can use this function to format Value axis labels.
+     * This function is called and these parameters are passed: labelFunction(value, valueText, valueAxis);
+     * Where value is numeric value, valueText is formatted string and valueAxis is a reference to valueAxis object.
+     * If axis type is "date", labelFunction will pass different arguments:
+     * labelFunction(valueText, date, valueAxis)
+     * Your function should return string.
+     */
+    labelFunction(value: number, valueText: string, valueAxis: ValueAxis): string;
+    labelFunction(valueText: string, data: Date, valueAxis: ValueAxis): string;
+    /**
+     * Specifies if this value axis' scale should be logarithmic.
+     */
+    logarithmic: boolean;
+    /**
+     * Read-only. Maximum value of the axis.
+     */
+    max: number;
+    /**
+     * If you don't want max value to be calculated by the chart, set it using this property.
+     * This value might still be adjusted so that it would be possible to draw grid at rounded intervals.
+     */
+    maximum: number;
+    /**
+     * If your value axis is date-based, you can specify maximum date of the axis.
+     * Can be set as date object, timestamp number or string if dataDateFormat is set.
+     */
+    maximumData: Date;
+    /**
+     * Read-only. Minimum value of the axis.
+     */
+    min: number;
+    /**
+     * If you don't want min value to be calculated by the chart, set it using this property.
+     * This value might still be adjusted so that it would be possible to draw grid at rounded intervals.
+     */
+    minimum: number;
+    /**
+     * If your value axis is date-based, you can specify minimum date of the axis.
+     * Can be set as date object, timestamp number or string if dataDateFormat is set.
+     */
+    minimumDate: Date;
+    /**
+     * If set value axis scale (min and max numbers) will be multiplied by it.
+     * I.e. if set to 1.2 the scope of values will increase by 20%.
+     */
+    minMaxMultiplier: number;
+    /**
+     * Works with radar charts only.
+     * If you set it to “middle�, labels and data points will be placed in the middle between axes.
+     */
+    pointPosition: string;
+    /**
+     * Possible values are: "top", "bottom", "left", "right".
+     * If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom".
+     */
+    position: string;
+    /**
+     * Precision (number of decimals) of values.
+     */
+    precision: number;
+    /**
+     * Radar chart only. Specifies if categories (axes' titles) should be displayed near axes)
+     * @default true
+     */
+    radarCategoriesEnabled: boolean;
+    /**
+     * pecifies if graphs's values should be recalculated to percents.
+     */
+    recalculateToPercents: boolean;
+    /**
+     * Specifies if value axis should be reversed (smaller values on top).
+     */
+    reversed: boolean;
+    /**
+     * Stacking mode of the axis.
+     * Possible values are: "none", "regular", "100%", "3d".
+     * Note, only graphs of one type will be stacked.
+     * @default "none"
+     */
+    stackType: string;
+    /**
+     * Read-only. Value difference between two grid lines.
+     */
+    step: number;
+    /**
+     * If you set minimum and maximum for your axis, chart adjusts them so that grid would start and end on the
+     * beginning and end of plot area and grid would be at equal intervals.
+     * If you set strictMinMax to true, the chart will not adjust minimum and maximum of value axis.
+     */
+    strictMinMax: boolean;
+    /**
+     * In case you synchronize one value axis with another, you need to set the synchronization multiplier.
+     * Use synchronizeWithAxis method to set with which axis it should be synced.
+     */
+    synchronizationMultiplier: number;
+    /**
+     * One value axis can be synchronized with another value axis.
+     * You can use both reference to your axis or id of the axis here.
+     * You should set synchronizationMultiplyer in order for this to work.
+     */
+    synchronizeWith: ValueAxis;
+    /**
+     * If this value axis is stacked and has columns, setting valueAxis.totalText = "[[total]]" will make it
+     * to display total value above the most-top column.
+     */
+    totalText: string;
+    /**
+     * Color of total text.
+     */
+    totalTextColor: string;
+    /**
+     * Distance from data point to total text.
+     */
+    totalTextOffset: number;
+    /**
+     * This allows you to have logarithmic value axis and have zero values in the data.
+     * You must set it to >0 value in order to work.
+     */
+    treatZeroAs: number;
+    /**
+     * Type of value axis.
+     * If your values in data provider are dates and you want this axis to show dates instead of numbers,
+     * set it to "date".
+     */
+    type: string;
+    /**
+     * Unit which will be added to the value label.
+     */
+    unit: string;
+    /**
+     * Position of the unit. Possible values are "left" and "right". right
+     */
+    unitPosition: string;
+    /**
+     * If true, prefixes will be used for big and small numbers.
+     * You can set arrays of prefixes directly to the chart object
+     * via prefixesOfSmallNumbers and prefixesOfBigNumbers.
+     */
+    usePrefixes: boolean;
+    /**
+     * If true, values will always be formatted using scientific notation (5e+8, 5e-8...)
+     * Otherwise only values bigger then 1e+21 and smaller then 1e-7 will be displayed in scientific notation.
+     */
+    useScientificNotation: boolean;
+
+    /**
+     * Adds guide to the axis.
+     */
+    addGuide(guide: Guide): void;
+    /**
+     * Number, - value of coordinate. Returns value of the coordinate.  coordinate - y or x coordinate, in pixels.
+     */
+    coordinateToValue(coordinate: number): void;
+    /**
+     * Number - coordinate Returns coordinate of the value in pixels. value - Number
+     */
+    getCoordinate(value: number): void;
+    /**
+     * Removes guide from the axis.
+     */
+    removeGuide(guide: Guide): void;
+
+    /**
+     * One value axis can be synchronized with another value axis.
+     * You should set synchronizationMultiplyer in order for this to work.
+     */
+    synchronizeWithAxis(axis: ValueAxis): void;
+    /**
+     * XY Chart only. Zooms-in the axis to the provided values.
+     */
+    zoomToValues(startValue: number, endValue: number): void;
+
+    /**
+     * Adds event listener.
+     * @param type One of "axisChanged", "axisZoomed", "logarithmicAxisFailed".
+     * @param handler The event handler.
+     */
+    addListener(
+        type: string,
+        handler: (
+            e: {
+                type: string;
+                startValue?: Date;
+                endValue?: Date;
+                chart: AmChart;
+            },
+        ) => void,
+    ): void;
+
+    /**
+     * Removes event listener from chart object.
+     */
+    removeListener(chart: AmChart, type: string, handler: any): void;
+}
diff --git a/types/amcharts/amcharts-tests.ts b/types/amcharts/amcharts-tests.ts
new file mode 100644
index 0000000000..7dedc76ead
--- /dev/null
+++ b/types/amcharts/amcharts-tests.ts
@@ -0,0 +1,76 @@
+import { AmCharts } from "amcharts";
+
+const theme = AmCharts.themes.light;
+
+// Global namespace settings.
+AmCharts.useUTC = false;
+AmCharts.theme = theme;
+
+// "JSON"-style API.
+const chart = AmCharts.makeChart("chartdiv", {
+    type: "gauge",
+    arrows: [
+        {
+            value: 130
+        }
+    ],
+    titles: [
+        {
+            text: "Speedometer",
+            size: 15
+        }
+    ],
+    axes: [
+        {
+            bottomText: "0 km/h",
+            endValue: 220,
+            valueInterval: 10,
+            bands: [
+                {
+                    color: "#00CC00",
+                    endValue: 90,
+                    startValue: 0
+                },
+                {
+                    color: "#ffac29",
+                    endValue: 130,
+                    startValue: 90
+                },
+                {
+                    color: "#ea3838",
+                    endValue: 220,
+                    startValue: 130,
+                    innerRadius: "95%"
+                }
+            ]
+        }
+    ]
+});
+
+// Object based API.
+const amAngularGauge = new AmCharts.AmAngularGauge(theme);
+const amBalloon = new AmCharts.AmBalloon();
+const amChart = new AmCharts.AmChart(theme);
+const amCoordinateChart = new AmCharts.AmCoordinateChart(theme);
+const amGraph = new AmCharts.AmGraph();
+const amLegend = new AmCharts.AmLegend();
+const amPieChart = new AmCharts.AmPieChart(theme);
+const amRadarChart = new AmCharts.AmRadarChart(theme);
+const amRectangularChart = new AmCharts.AmRectangularChart(theme);
+const amSerialChart = new AmCharts.AmSerialChart(theme);
+const amXYChart = new AmCharts.AmXYChart(theme);
+const axisBase = new AmCharts.AxisBase();
+const categoryBase = new AmCharts.CategoryAxis();
+const chartCursor = new AmCharts.ChartCursor();
+const chartScrollbar = new AmCharts.ChartScrollbar();
+const gaugeArrow = new AmCharts.GaugeArrow();
+const gaugeAxis = new AmCharts.GaugeAxis();
+const gaugeBand = new AmCharts.GaugeBand();
+const graphDataItem = new AmCharts.GraphDataItem();
+const guid = new AmCharts.Guide();
+const label = new AmCharts.Label();
+const serialDateItem = new AmCharts.SerialDataItem();
+const slice = new AmCharts.Slice();
+const title = new AmCharts.Title();
+const trendLine = new AmCharts.TrendLine();
+const valueAxis = new AmCharts.ValueAxis();
diff --git a/types/amcharts/index.d.ts b/types/amcharts/index.d.ts
index 98fae5adeb..759e22e942 100644
--- a/types/amcharts/index.d.ts
+++ b/types/amcharts/index.d.ts
@@ -1,2607 +1,141 @@
-// Type definitions for amCharts
+// Type definitions for amCharts 3.21
 // Project: http://www.amcharts.com/
-// Definitions by: aleksey-bykov <https://github.com/aleksey-bykov>
+// Definitions by: ldrick <https://github.com/ldrick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-/// AmCharts object (it's not a class) is create automatically when amcharts.js or amstock.js file is included in a web page.
-declare namespace AmCharts {
+import _AmAngularGauge from "./AmAngularGauge";
+import _AmBalloon from "./AmBalloon";
+import _AmChart from "./AmChart";
+import _AmCoordinateChart from "./AmCoordinateChart";
+// import _AmFunnelChart from "./AmFunnelChart";
+// import _AmGanttChart from "./AmGanttChart";
+import _AmGraph from "./AmGraph";
+import _AmLegend from "./AmLegend";
+import _AmPieChart from "./AmPieChart";
+import _AmRadarChart from "./AmRadarChart";
+import _AmRectangularChart from "./AmRectangularChart";
+import _AmSerialChart from "./AmSerialChart";
+// import _AmSlicedChart from "./AmSlicedChart";
+import _AmXYChart from "./AmXYChart";
+import _AxisBase from "./AxisBase";
+import _CategoryAxis from "./CategoryAxis";
+import _ChartCursor from "./ChartCursor";
+import _ChartScrollbar from "./ChartScrollbar";
+import _GaugeArrow from "./GaugeArrow";
+import _GaugeAxis from "./GaugeAxis";
+import _GaugeBand from "./GaugeBand";
+import _GraphDataItem from "./GraphDataItem";
+import _Guide from "./Guide";
+// import _Image from "./Image";
+import _Label from "./Label";
+import _SerialDataItem from "./SerialDataItem";
+import _Slice from "./Slice";
+import _Title from "./Title";
+import _TrendLine from "./TrendLine";
+import _ValueAxis from "./ValueAxis";
 
-    /** Set it to true if you have base href set for your page. This will fix rendering problems in Firefox caused by base href. */
-    var baseHref: boolean;
+/**
+ * AmCharts namespace is create automatically when amcharts.js or amstock.js file is included.
+ */
+export namespace AmCharts {
+    /**
+     * Set it to true if you have base href set for your page.
+     * This will fix rendering problems in Firefox caused by base href.
+     */
+    let baseHref: boolean;
 
-    /** Array of day names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] */
-    var dayNames: string[];
+    /**
+     * Array of day names, used when formatting dates (if categoryAxis.parseDates is set to true)
+     * ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+     */
+    let dayNames: string[];
 
-    /** Array of month names, used when formatting dates (if categoryAxis.parseDates is set to true) ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] */
-    var monthNames: string[];
+    /**
+     * Array of month names, used when formatting dates (if categoryAxis.parseDates is set to true)
+     * [
+     * 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August',
+     * 'September', 'October', 'November','December'
+     * ]
+     */
+    let monthNames: string[];
 
-    /** Array of short versions of day names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'] */
-    var shortDayNames: string[];
+    /**
+     * Array of short versions of day names, used when formatting dates (if categoryAxis.parseDates is set to true)
+     * ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
+     */
+    let shortDayNames: string[];
 
-    /** Array of short versions of month names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] */
-    var shortMonthNames: string[];
+    /**
+     * Array of short versions of month names, used when formatting dates (if categoryAxis.parseDates is set to true)
+     * ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+     */
+    let shortMonthNames: string[];
 
-    /** Set it to true if you want UTC time to be used instead of local time. */
-    var useUTC: boolean;
+    /**
+     * Set it to true if you want UTC time to be used instead of local time.
+     */
+    let useUTC: boolean;
 
-    /** Object with themes */
-    var themes: any;
+    /**
+     * Set global used AmCharts theme.
+     */
+    let theme: any;
 
-    /** Clears all the charts on page, removes listeners and intervals. */
+    /**
+     * Object with existing themes.
+     */
+    let themes: any;
+
+    /**
+     * Clears all the charts on page, removes listeners and intervals.
+     */
     function clear(): void;
 
-    /** Handle ready event */
-    function ready(f: Function): void;
-
-    /** Create chart by params. */
+    /**
+     * Create chart by params.
+     */
     function makeChart(selector: string, params: any, delay?: number): AmChart;
 
-    /** Set a method to be called before initializing the chart.
+    /**
+     * Set a method to be called before initializing the chart.
      * When the method is called, the chart instance is passed as an attribute.
      * You can use this feature to preprocess chart data or do some other things you need
      * before initializing the chart.
-     * @param {Function} handler - The method to be called.
-     * @param {string[]} types - Which chart types should call this method. Defaults to all
+     * @param handler - The method to be called.
+     * @param types - Which chart types should call this method. Defaults to all
      * if none is passed.
      */
-    function addInitHandler(handler: Function, types: string[]): any;
-
-    /** AmPieChart class creates pie/donut chart. In order to display pie chart you need to set at least three properties - dataProvider, titleField and valueField.
-        @example
-            var chartData = [{title:"Pie I have eaten",value:70},{title:"Pie I haven\'t eaten",value:30}];
-            var chart = new AmCharts.AmPieChart();
-            chart.valueField = "value";
-            chart.titleField = "title";
-            chart.dataProvider = chartData;
-            chart.write("chartdiv");
-    */
-    class AmPieChart extends AmChart {
-        /** Name of the field in chart's dataProvider which holds slice's alpha. */
-        alphaField: string;
-        /** Pie lean angle (for 3D effect). Valid range is 0 - 90. */
-        angle: number;
-        /** Balloon text. The following tags can be used: [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]% ([[value]])\n[[description]] */
-        balloonText: string;
-        /** Read-only. Array of Slice objects. */
-        chartData: any[];
-        /** Name of the field in chart's dataProvider which holds slice's color. */
-        colorField: string;
-        /** Specifies the colors of the slices, if the slice color is not set. If there are more slices than colors in this array, the chart picks random color. ["#FF0F00", "#FF6600", "#FF9E01", "#FCD202", "#F8FF01", "#B0DE09", "#04D215", "#0D8ECF", "#0D52D1", "#2A0CD0", "#8A0CCF", "#CD0D74", "#754DEB", "#DDDDDD", "#999999", "#333333", "#000000", "#57032A", "#CA9726", "#990000", "#4B0C25"] */
-        colors: any[];
-        /** Depth of the pie (for 3D effect). */
-        depth3D: number;
-        /** Name of the field in chart's dataProvider which holds a string with description. */
-        descriptionField: string;
-        /** Example: [-0.2,0.2]. Will make slices to be filled with color gradients. */
-        gradientRatio: number[];
-        /** Opacity of the group slice. Value range is 0 - 1.
-            @default 1
-        */
-        groupedAlpha: number;
-        /** Color of the group slice. The default value is not set - this means the next available color from "colors" array will be used. */
-        groupedColor: string;
-        /** Description of the group slice. */
-        groupedDescription: string;
-        /** If this is set to true, the group slice will be pulled out when the chart loads. */
-        groupedPulled: boolean;
-        /** Title of the group slice. Other */
-        groupedTitle: string;
-        /** If there is more than one slice whose percentage of the pie is less than this number, those slices will be grouped together into one slice. This is the "other" slice. It will always be the last slice in a pie. */
-        groupPercent: number;
-        /** Slices with percent less then hideLabelsPercent won't display labels This is useful to avoid cluttering up the chart, if you have a lot of small slices. 0 means all labels will be shown. */
-        hideLabelsPercent: number;
-        /** Opacity of a hovered slice. Value range is 0 - 1.
-            @default 1
-        */
-        hoverAlpha: number;
-        /** Inner radius of the pie, in pixels or percents. */
-        innerRadius: any;
-        /** The distance between the label and the slice, in pixels. You can use negative values to put the label on the slice.
-            @default 30
-        */
-        labelRadius: number;
-        /** Name of the field in dataProvider which specifies the length of a tick. Note, the chart will not try to arrange labels automatically if this property is set. */
-        labelRadiusField: string;
-        /** Specifies whether data labels are visible.
-            @default true
-        */
-        labelsEnabled: boolean;
-        /** Label text. The following tags can be used: [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]% */
-        labelText: string;
-        /** Label tick opacity. Value range is 0 - 1. 0.2 */
-        labelTickAlpha: number;
-        /** Label tick color. #000000 */
-        labelTickColor: string;
-        /** Bottom margin of the chart.
-            @default 5
-        */
-        marginBottom: number;
-        /** Left margin of the chart. */
-        marginLeft: number;
-        /** Right margin of the chart. */
-        marginRight: number;
-        /** Top margin of the chart.
-            @default 5
-        */
-        marginTop: number;
-        /** Minimum radius of the pie, in pixels.
-            @default 10
-        */
-        minRadius: number;
-        /** Pie outline opacity. Value range is 0 - 1. */
-        outlineAlpha: number;
-        /** Pie outline color. #FFFFFF */
-        outlineColor: string;
-        /** Pie outline thickness.
-            @default 1
-        */
-        outlineThickness: number;
-        /** Opacity of the slices. You can set the opacity of individual slice too.
-            @default 1
-        */
-        pieAlpha: number;
-        /** Color of the first slice. All the other will be colored with darker or brighter colors. */
-        pieBaseColor: string;
-        /** Lightness increase of each subsequent slice. This is only useful if pieBaseColor is set. Use negative values for darker colors. Value range is from -255 to 255.
-            @default 30*/
-        pieBrightnessStep: number;
-        /** You can set fixed position of a pie center, in pixels or in percents. */
-        pieX: any;
-        /** You can set fixed position of a pie center, in pixels or in percents. */
-        pieY: any;
-        /** Name of the field in chart's dataProvider which holds a boolean value telling the chart whether this slice must be pulled or not. */
-        pulledField: string;
-        /** Pull out duration, in seconds.
-            @default 1
-        */
-        pullOutDuration: number;
-        /** Pull out effect. Possible values are ">", "<", elastic" and "bounce". bounce */
-        pullOutEffect: string;
-        /** If this is set to true, only one slice can be pulled out at a time. If the viewer clicks on a slice, any other pulled-out slice will be pulled in. */
-        pullOutOnlyOne: boolean;
-        /** Pull out radius, in pixels or percents 0.2 */
-        pullOutRadius: any;
-        /** Radius of a pie, in pixels or percents. By default, radius is calculated automatically. */
-        radius: any;
-        /** Specifies whether the animation should be sequenced or all slices should appear at once. */
-        sequencedAnimation: boolean;
-        /** Initial opacity of all slices. If you set startDuration higher than 0, slices will fade in from startAlpha.
-            @default 1
-        */
-        startAlpha: number;
-        /** Angle of the first slice, in degrees. This will work properly only if "depth3D" is set to 0. If "depth3D" is greater than 0, then there can be two angles only: 90 and 270. Value range is 0-360.
-            @default 90
-        */
-        startAngle: number;
-        /** Duration of the animation, in seconds.
-            @default 1
-        */
-        startDuration: number;
-        /** Animation effect. Possible values are ">", "<", "elastic" and "bounce". bounce */
-        startEffect: string;
-        /** Radius of the positions from which the slices will fly in.
-            default 5
-        */
-        startRadius: any;
-        /** Name of the field in chart's dataProvider which holds slice's title. */
-        titleField: string;
-        /** Name of the field in chart's dataProvider which holds url which would be accessed if the user clicks on a slice. */
-        urlField: string;
-        /** If url is specified for a slice, it will be opened when user clicks on it. urlTarget specifies target of this url. Use _blank if you want url to be opened in a new window. _self */
-        urlTarget: string;
-        /** Name of the field in chart's dataProvider which holds slice's value. */
-        valueField: string;
-        /** Name of the field in chart's dataProvider which holds boolean variable defining whether this data item should have an entry in the legend. */
-        visibleInLegendField: string;
-
-        /** You can trigger the animation of the pie chart. */
-        animateAgain(): void;
-        /** You can trigger the click on a slice from outside. index - the number of a slice or Slice object. */
-        clickSlice(index: number): void;
-        /** Hides slice. index - the number of a slice or Slice object. */
-        hideSlice(index: number): void;
-        /** You can simulate roll-out of a slice from outside. index - the number of a slice or Slice object. */
-        rollOutSlice(index: number): void;
-        /** You can simulate roll-over a slice from outside. index - the number of a slice or Slice object. */
-        rollOverSlice(index: number): void;
-        /** Shows slice. index - the number of a slice or Slice object. */
-        showSlice(index: number): void;
-
-        /** Adds event listener of the type "clickSlice" or "pullInSlice" or "pullOutSlice" to the object.
-            @param type Always "clickSlice" or "pullInSlice" or "pullOutSlice".
-            @param handler
-                If the type is "clickSlice", dispatched when user clicks on a slice.
-                If the type is "pullInSlice", dispatched when user clicks on a slice and the slice is pulled-in.
-                If the type is "pullOutSlice", dispatched when user clicks on a slice and the slice is pulled-out.
-                If the type is "rollOutSlice", dispatched when user rolls-out of the slice.
-                If the type is "rollOverSlice", dispatched when user rolls-over the slice.
-        */
-        addListener(type: string, handler: (e: {/** Always "rollOverSlice". */
-            type: string; dataItem: Slice; chart: AmChart;
-        }) => void): void;
-    }
-
-    /** AmRadarChart is the class you have to use for radar and polar chart types.
-        @example
-    var chart;
-    var chartData = [
-        {country:"Czech Republic",litres:156.90},
-        {country:"Ireland",litres:131.10},
-        {country:"Germany",litres:115.80},
-        {country:"Australia",litres:109.90},
-        {country:"Austria",litres:108.30},
-        {country:"UK",litres:99.00}
-    ];
-
-    window.onload = function() {
-      chart = new AmCharts.AmRadarChart();
-      chart.dataProvider = chartData;
-      chart.categoryField = "country";
-      chart.startDuration = 2;
-
-      var valueAxis = new AmCharts.ValueAxis();
-      valueAxis.axisAlpha = 0.15;
-      valueAxis.minimum = 0;
-      valueAxis.dashLength = 3;
-      valueAxis.axisTitleOffset = 20;
-      valueAxis.gridCount = 5;
-      chart.addValueAxis(valueAxis);
-
-      var graph = new AmCharts.AmGraph();
-      graph.valueField = "litres";
-      graph.bullet = "round";
-      graph.balloonText = "[[value]] litres of beer per year"
-      chart.addGraph(graph);
-
-      chart.write("chartdiv");
-    }
-    */
-    class AmRadarChart extends AmCoordinateChart {
-        /** Bottom margin of the chart. */
-        marginBottom: number;
-        /** Left margin of the chart. */
-        marginLeft: number;
-        /** Right margin of the chart. */
-        marginRight: number;
-        /** Top margin of the chart. */
-        marginTop: number;
-        /** Radius of a radar. 0.35 */
-        radius: any;
-    }
-
-    /** AmXYChart is the class you have to use for XY/Bubble/Scatter chart types. The chart supports simple and logarithmic scales, it can have multiple value axes.
-        @example
-            var chartData = [
-                {x:10, y:14, value:59},
-                {x:5, y:3, value:50},
-                {x:-10, y:-3, value:19},
-                {x:-6, y:5, value:65},
-                {x:15, y:-4, value:92},
-                {x:13, y:1, value:8},
-                {x:1, y:6, value:35}
-            ];
-
-            var chart = new AmCharts.AmXYChart();
-            chart.pathToImages = "../../amcharts/javascript/images/";
-            chart.dataProvider = chartData;
-            chart.marginLeft = 35;
-            chart.startDuration = 1.5;
-
-            var xAxis = new AmCharts.ValueAxis();
-            xAxis.position = "left";
-            xAxis.autoGridCount = true;
-            chart.addValueAxis(xAxis);
-
-            var yAxis = new AmCharts.ValueAxis();
-            yAxis.position = "bottom";
-            yAxis.autoGridCount = true;
-            chart.addValueAxis(yAxis);
-
-            var graph = new AmCharts.AmGraph();
-            graph.valueField = "value";
-            graph.xField = "x";
-            graph.yField = "y";
-            graph.lineAlpha = 0;
-            graph.bullet = "round";
-            chart.addGraph(graph);
-
-            var chartCursor = new AmCharts.ChartCursor();
-            chart.addChartCursor(chartCursor);
-
-            var chartScrollbar = new AmCharts.ChartScrollbar();
-            chartScrollbar.hideResizeGrips = false;
-            chart.addChartScrollbar(chartScrollbar);
-
-            chart.write("chartdiv);
-    */
-    class AmXYChart extends AmRectangularChart {
-        /** Specifies if Scrollbar of X axis (horizontal) should be hidden. */
-        hideXScrollbar: boolean;
-        /** Specifies if Scrollbar of Y axis (vertical) should be hidden. */
-        hideYScrollbar: boolean;
-        /** Maximum zoom factor of the chart.
-            @default 20
-        */
-        maxZoomFactor: number;
-        /** Zooms out, charts shows all available data.*/
-        zoomOut(): void;
-    }
-    /** Guides are straight vertical or horizontal lines or areas supported by AmSerialChart, AmXYChart and AmRadarChart. You can have guides both on value and category axes. To add/remove a guide to an axis, use axis.addGuide(guide)/axis.removeGuide(guide) methods.
-
-If you do not set properties such as dashLength, lineAlpha, lineColor, etc - values of the axis are used.*/
-    class Guide {
-        /** If you set it to true, the guide will be displayed above the graphs. */
-        above: boolean;
-        /** Radar chart only. Specifies angle at which guide should start. Affects only fills, not lines. */
-        angle: number;
-        /** Baloon fill color. */
-        balloonColor: string;
-        /** The text which will be displayed if the user rolls-over the guide. */
-        balloonText: string;
-        /** Specifies if label should be bold or not. */
-        boldLabel: boolean;
-        /** Category of the guide (in case the guide is for category axis). */
-        category: string;
-        /** Dash length. */
-        dashLength: number;
-        /** Date of the guide (in case the guide is for category axis and parseDates is set to true). */
-        date: Date;
-        /** Works if a guide is added to CategoryAxis and this axis is non-date-based. If you set it to true, the guide will start (or be placed, if it's not a fill) on the beginning of the category cell and will end at the end of toCategory cell. */
-        expand: boolean;
-        /** Fill opacity. Value range is 0 - 1. */
-        fillAlpha: number;
-        /** Fill color. */
-        fillColor: string;
-        /** Font size of guide label. */
-        fontSize: string;
-        /** Unique id of a Guide. You don't need to set it, unless you want to. */
-        id: string;
-        /** Specifies whether label should be placed inside or outside plot area. */
-        inside: boolean;
-        /** The label which will be displayed near the guide. */
-        label: string;
-        /** Rotation angle of a guide label. */
-        labelRotation: number;
-        /** Line opacity. */
-        lineAlpha: number;
-        /** Line color. */
-        lineColor: string;
-        /** Line thickness. */
-        lineThickness: number;
-        /** Position of guide label. Possible values are "left" or "right" for horizontal axis and "top" or "bottom" for vertical axis.  */
-        position: string;
-        /** Tick length. */
-        tickLength: number;
-        /** Radar chart only. Specifies angle at which guide should end. Affects only fills, not lines. */
-        toAngle: number;
-        /** To category of the guide (in case the guide is for category axis). */
-        toCategory: string;
-        /** To date of the guide (in case the guide is for category axis and parseDates is set to true) If you have both date and toDate, the space between these two dates can be filled with color. */
-        toDate: Date;
-        /** To value of the guide (in case the guide is for value axis). */
-        toValue: number;
-        /** Value of the guide (in case the guide is for value axis). */
-        value: number;
-        /** Value axis of a guide. As you can add guides directly to the chart, you might need to specify which which value axis should be used. */
-        valueAxis: ValueAxis;
-    }
-    /** ImagesSettings is a class which holds common settings of all MapImage objects. */
-    class ImagesSettings {
-        /** Opacity of the image.
-            @default 1
-        */
-        alpha: number;
-        /** Text which is displayed in a roll-over balloon. You can use the following tags: [[title]], [[description]], [[value]] and [[percent]]. [[title]] */
-        balloonText: string;
-        /** Specifies if the image's center should be placed in the provided coordinates. If false, top-left corner will be at provided coordinates.
-            @default true
-        */
-        centered: boolean;
-        /** Color of image. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. #000000 */
-        color: string;
-        /** Height of a description window. */
-        descriptionWindowHeight: number;
-        /** Width of a description window.
-            @default 250
-        */
-        descriptionWindowWidth: number;
-        /** X position of a description window. */
-        descriptionWindowX: number;
-        /** Y position of a description window. */
-        descriptionWindowY: number;
-        /** Label color. #000000 */
-        labelColor: string;
-        /** Font size of a label.
-            @default 11
-        */
-        labelfontSize: string;
-        /** Position of the label. Allowed values are: left, right, top, bottom and middle. right */
-        labelPosition: string;
-        /** Label roll-over color. #00CC00 */
-        labelRollOverColor: string;
-        /** Opacity of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
-        outlineAlpha: number;
-        /** Color of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
-        outlineColor: string;
-        /** Thickness of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images.
-            @default 1
-        */
-        outlineThickness: number;
-        /** Color of image when hovered. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
-        rollOverColor: string;
-        /** Scale of the image when hovered. Use value like 1.5 - 2 to enlarge image when user rolls-over it.
-            @default 1
-        */
-        rollOverScale: number;
-        /** Scale of the image if it is selected. Use value like 1.5 - 2 to enlarge selected image.
-            @default 1
-        */
-        selectedScale: number;
-    }
-
-    /** AreasSettings is a class which holds common settings of all MapArea objects. */
-    class AreasSettings {
-        /** Opacity of areas.
-            @default 1
-        */
-        alpha: number;
-        /** Specifies if the areas should be zoomed-in when user clicks on them, event if zoom properties are not set. */
-        autoZoom: boolean;
-        /** Text which is displayed in a roll-over balloon. You can use the following tags: [[title]], [[description]], [[value]] and [[percent]] [[title]] */
-        balloonText: string;
-        /** Color of the areas. #FFCC00 */
-        color: string;
-        /** Color of area with highest value. Colors for areas with values less then highest will be colored with intermediate colors between color and colorSolid. Use colorSteps property of AmMap to change the number of intermediate colors. #990000 */
-        colorSolid: string;
-        /** Height of a description window. */
-        descriptionWindowHeight: number;
-        /** Width of a description window.
-            @default 250
-        */
-        descriptionWindowWidth: number;
-        /** X position of a description window. */
-        descriptionWindowX: number;
-        /** Y position of a description window. */
-        descriptionWindowY: number;
-        /** Opacity of area's outline.
-            @default 1
-        */
-        outlineAlpha: number;
-        /** Color of area's outline. #FFFFFF */
-        outlineColor: string;
-        /** Thickness of area's outline. 0.5 */
-        outlineThickness: number;
-        /** Color of area when user rolls-over it. undefined */
-        rollOverColor: string;
-        /** Color of area's outline when user rolls-over it. #CC0000 */
-        rollOverOutlineColor: string;
-        /** Color of area which is currently selected. #CC0000 */
-        selectedColor: string;
-        /** Opacity of all areas which are in the map svg file, but not listed as areas in DataSet.
-            @default 1
-        */
-        unlistedAreasAlpha: number;
-        /** Color of all areas which are in the map svg file, but not listed as areas in DataSet. #DDDDDD */
-        unlistedAreasColor: string;
-        /** Opacity of all areas' outline which are in the map svg file, but not listed as areas in DataSet.
-            @default 1
-        */
-        unlistedAreasOutlineAlpha: number;
-        /** Color of all areas' outline which are in the map svg file, but not listed as areas in DataSet. #FFFFFF */
-        unlistedAreasOutlineColor: string;
-    }
-
-    /** Slice is an item of AmPieChart's chartData Array and holds all the information about the slice. When working with a pie chart, you do not create slices or change it's properties directly, instead you set array of data using dataProvider property. Consider properties of a Slice read-only - change values in chart's data provider if you need to. */
-    class Slice {
-        /** Opacity of a slice. */
-        alpha: number;
-        /** Color of a slice. */
-        color: string;
-        /** Original object from data provider. */
-        dataContext: Object;
-        /** Slice description. */
-        description: string;
-        /** Specifies whether the slice is hidden */
-        hidden: boolean;
-        /** Percent value of a slice. */
-        percents: number;
-        /** Specifies whether the slice is pulled or not. */
-        pulled: boolean;
-        /** Slice title */
-        title: string;
-        /** Url of a slice */
-        url: string;
-        /** Value of a slice */
-        value: number;
-        /** specifies whether this slice has a legend entry */
-        visibleInLegend: boolean;
-    }
-
-
-    /** AmStockChart is a main class Stock chart. */
-    class AmStockChart {
-        /** Specifies if animation was already played. Animation is only played once, when chart is rendered for the first time. If you want the animation to be repeated, set this property to false. */
-        animationPlayed: boolean;
-        /** Balloon object. */
-        balloon: AmBalloon;
-        /** Settings for category axes. */
-        categoryAxesSettings: CategoryAxesSettings;
-        /** Indicates if the chart is created. */
-        chartCreated: boolean;
-        /** Chart cursor settings. */
-        chartCursorSettings: ChartCursorSettings;
-        /** Chart scrollbar settings. */
-        chartScrollbarSettings: ChartScrollbarSettings;
-        /** Array of colors used by data sets if no color was set explicitly on data set itself. #FF6600, "#FCD202", "#B0DE09", "#0D8ECF", "#2A0CD0", "#CD0D74", "#CC0000", "#00CC00", "#0000CC", "#DDDDDD", "#999999", "#333333", "#990000" */
-        colors: any[];
-        /** Array of data sets selected for comparing. */
-        comparedDataSets: any[];
-        /** Array of DataSets. */
-        dataSets: any[];
-        /** DataSetSelector object. You can add it if you have more than one data set and want users to be able to select/compare them. */
-        dataSetSelector: DataSetSelector;
-        /** Current end date of the selected period, get only. To set start/end dates, use stockChart.zoom(startDate, endDate) method. */
-        endDate: Date;
-        /** Defines on which day week starts. 0 - Sunday, 1 - Monday..
-            @default 1 */
-        firstDayOfWeek: number;
-        /** If set to true the scope of the data view will be set to the end after data update. */
-        glueToTheEnd: boolean;
-        /** Legend settings. */
-        legendSettings: LegendSettings;
-        /** Data set selected as main. */
-        mainDataSet: DataSet;
-        /** Array of StockPanels (charts). */
-        panels: any[];
-        /** Settings for stock panels. */
-        panelsSettings: PanelsSettings;
-        /** Period selector object. You can add it if you want user's to be able to enter date ranges or zoom chart with predefined period buttons. */
-        periodSelector: PeriodSelector;
-        /** Scrollbar's chart object, get only. */
-        scrollbarChart: AmSerialChart;
-        /** Current start date of the selected period, get only. To set start/end dates, use stockChart.zoom(startDate, endDate) method. */
-        startDate: Date;
-        /** Settings for stock events. */
-        stockEventsSettings: any;
-        /** Settings for value axes. */
-        valueAxesSettings: ValueAxesSettings;
-        /** read-only. Indicates current version of a script. */
-        version: string;
-        /** Specifies whether the chart should zoom-out when main data set is changed. */
-        zoomOutOnDataSetChange: boolean;
-
-        /** Adds panel to the stock chart. Requires stockChart.validateNow() method to be called after this action. */
-        addPanel(panel: StockPanel): void;
-        /** Adds panel to the stock chart at a specified index. Requires stockChart.validateNow() method to be called after this action. */
-        addPanelAt(panel: StockPanel, index: number): void;
-        /** Destroys chart, all timeouts and listeners. */
-        clear(): void;
-        /** Hides event bullets. */
-        hideStockEvents(): void;
-        /** Removes event listener from the object. */
-        removeListener(obj: any, type: string, handler: any): void;
-        /** Removes panel from the stock chart. Requires stockChart.validateNow() method to be called after this action. */
-        removePanel(panel: StockPanel): void;
-        /** Shows event bullets. */
-        showStockEvents(): void;
-        /** Method which should be called after data was changed. */
-        validateData(): void;
-        /** Method which forces the stock chart to rebuild. Should be called after properties are changed. */
-        validateNow(): void;
-        /** Zooms chart to specified dates. startDate, endDate - Date objects. */
-        zoom(startDate: Date, endDate: Date): void;
-        /** Zooms out the chart. */
-        zoomOut(): void;
-
-        /** Adds event listener of the type "dataUpdated" or "init" or "rendered" to the object.
-            @param type Always "dataUpdated" or "init" or "rendered".
-            @param handler
-                If the type is "dataUpdated", dispatched when the chart was updated with new data.
-                If the type is "init", dispatched when the chart is initialized for the first time. In case you want it to fire again after validateNow() method is called, set chart.chartCreated = false.
-                If the type is "rendered", dispatched each when chart is rendered.
-        */
-        addListener(type: string, handler: (e: {
-            /** Either "dataUpdated" or "init". */
-            type: string;
-            chart: AmStockChart;
-        }) => void): void;
-
-        /** Adds event listener of the type "rollOutStockEvent" or "rollOverStockEvent" or "clickStockEvent" to the object.
-            @param type     // Either "rollOutStockEvent" or "rollOverStockEvent" or "clickStockEvent".
-            @param handler
-                If the type is "rollOutStockEvent", dispatched when the user rolls-out of the Stock event (bullet).
-                If the type is "rollOverStockEvent", dispatched when the user rolls-over of the Stock event (bullet).
-                If the type is "clickStockEvent", dispatched when the user clicks on the Stock event (bullet).
-        */
-
-        addListener(type: string, handler: (e: {
-            /** Always "rollOverStockEvent". */
-            type: string;
-            eventObject: any;
-            graph: AmGraph;
-            date: Date;
-            chart: AmStockChart;
-        }) => void): void;
-
-        /** Adds event listener of the type "zoomed" to the object.
-            @param type Always "zoomed".
-            @param handler Dispatched when the chart is zoomed (even for the first time, when chart is initialized).*/
-        addListener(type: string, handler: (e: {
-            /** Always "zoomed". */
-            type: string;
-            startDate: Date;
-            endDate: Date;
-            period: string;
-            chart: AmStockChart;
-        }) => void): void;
-
-        /** Adds event listener of the type "panelRemoved" to the object.
-            @param type Always "panelRemoved".
-            @param handler Dispatched when the StockPanel is removed.*/
-        addListener(type: string, handler: (e: {
-            /** Always "panelRemoved". */
-
-            type: string;
-            panel: StockPanel;
-            chart: AmStockChart;
-        }) => void): void;
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any): void;
-    }
-
-    /** ValueAxesSettings settings set 's settings for all ValueAxes. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ValueAxis class will be used. */
-    class ValueAxesSettings {
-        /** Specifies whether number for gridCount is specified automatically, according to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Axis opacity. */
-        axisAlpha: number;
-        /** Axis color.  */
-        axisColor: string;
-        /** Thickness of the axis. */
-        axisThickness: number;
-        /** Label color. */
-        color: string;
-        /** Length of a dash. By default, the grid line is not dashed. */
-        dashLength: number;
-        /** Fill opacity. Every second space between grid lines can be filled with color. */
-        fillAlpha: number;
-        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. */
-        fillColor: string;
-        /** Opacity of grid lines. */
-        gridAlpha: number;
-        /** Color of grid lines. */
-        gridColor: string;
-        /** Approximate number of grid lines. autoGridCount should be set to false, otherwise this property will be ignored. */
-        gridCount: number;
-        /** Thickness of grid lines. */
-        gridThickness: number;
-        /** Specifies whether guide values should be included when calculating min and max of the axis. */
-        includeGuidesInMinMax: boolean;
-        /** If true, the axis will include hidden graphs when calculating min and max values. */
-        includeHidden: boolean;
-        /** Specifies whether values should be placed inside or outside plot area. In case you set this to false, you'll have to adjust marginLeft or marginRight in [[PanelsSettings]] in order labels to be visible.
-            @default true
-        */
-        inside: boolean;
-        /** Specifies whether values on axis can only be integers or both integers and doubles. */
-        integersOnly: boolean;
-        /** Frequency at which labels should be placed.  */
-        labelFrequency: number;
-        /** Specifies whether value labels are displayed. */
-        labelsEnabled: boolean;
-        /** Set to true if value axis is logarithmic, false otherwise. */
-        logarithmic: boolean;
-        /** The distance of the axis to the plot area, in pixels. Useful if you have more then one axis on the same side.  */
-        offset: number;
-        /** Position of the value axis. Possible values are "left" and "right". */
-        position: string;
-        /** Set to true if value axis is reversed (smaller values on top), false otherwise. */
-        reversed: boolean;
-        /** Specifies if first label of value axis should be displayed. */
-        showFirstLabel: boolean;
-        /** Specifies if last label of value axis should be displayed. */
-        showLastLabel: boolean;
-        /** Stacking mode of the axis. Possible values are: "none", "regular", "100%", "3d". */
-        stackType: string;
-        /** Tick length. */
-        tickLength: number;
-        /** Unit which will be added to the value label.  */
-        unit: string;
-        /** Position of the unit. Possible values are "left" or "right". */
-        unitPosition: string;
-
-    }
-
-
-    /** AmLegend is the class that displays legend of the chart. Legend to the chart should be added using chart.addLegend(legend) method.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var legend = new AmCharts.AmLegend();
-            chart.addLegend(legend);
-    */
-    class AmLegend {
-
-        /** Alignment of legend entries. Possible values are: "left", "center", "right". left */
-        align: string;
-        /** Used if chart is Serial or XY. In case true, margins of the legend are adjusted and made equal to chart's margins.
-            @default true
-        */
-        autoMargins: boolean;
-        /** Opacity of legend's background. Value range is 0 - 1 */
-        backgroundAlpha: number;
-        /** Background color. You should set backgroundAlpha to >0 vallue in order background to be visible. #FFFFFF */
-        backgroundColor: string;
-        /** Opacity of chart's border. Value range is 0 - 1. */
-        borderAlpha: number;
-        /** Color of legend's border. You should set borderAlpha >0 in order border to be visible. #000000 */
-        borderColor: string;
-        /** In case legend position is set to "absolute", you can set distance from bottom of the chart, in pixels.  */
-        bottom: number;
-        /** Text color. Will use chart's color if not set. */
-        color: string;
-        /** This can be used by AmMap only. You can pass array of objects with title, color, markerType values, for example: [{title: "One", color: "#3366CC"},{title: "Two", color: "#FFCC33"}] */
-        data: any[];
-        /** Specifies if each of legend entry should be equal to the most wide entry. Won't look good if legend has more than one line.
-            @default true
-        */
-        equalWidths: boolean;
-        /** Font size. Will use chart's font size if not set. */
-        fontSize: string;
-        /** Horizontal space between legend item and left/right border. */
-        horizontalGap: number;
-        /** The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph. [[title]] */
-        labelText: string;
-        /** In case legend position is set to "absolute", you can set distance from left side of the chart, in pixels. */
-        left: number;
-        /** Bottom margin.  */
-        marginBottom: number;
-        /** Left margin. This property will be ignored if chart is Serial or XY and autoMargins property of the legend is true (default).
-            @default 20
-        */
-        marginLeft: number;
-        /** Right margin. This property will be ignored if chart is Serial or XY and autoMargins property of the legend is true (default).
-            @default 20
-        */
-        marginRight: number;
-        /** Top margin. */
-        marginTop: number;
-        /** Marker border opacity 1. */
-        markerBorderAlpha: number;
-        /** Marker border color. If not set, will use the same color as marker. */
-        markerBorderColor: string;
-        /** Thickness of the legend border. The default value (0) means the line will be a "hairline" (1 px). In case marker type is line, this style will be used for line thickness.
-            @default 1
-        */
-        markerBorderThickness: number;
-        /** The color of the disabled marker (when the graph is hidden). #AAB3B3 */
-        markerDisabledColor: string;
-        /** Space between legend marker and legend text, in pixels.
-            @default 5
-        */
-        markerLabelGap: number;
-        /** Size of the legend marker (key).
-            @default 16
-        */
-        markerSize: number;
-        /** Shape of the legend marker (key). Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none". square */
-        markerType: string;
-        /** Maximum number of columns in the legend. If Legend's position is set to "right" or "left", maxColumns is automatically set to 1. */
-        maxColumns: number;
-        /** Position of a legend. Possible values are: "bottom", "top", "left", "right" and "absolute". In case "absolute", you should set left and top properties too. (this setting is ignored in Stock charts). In case legend is used with AmMap, position is set to "absolute" automatically.  bottom */
-        position: string;
-        /** Specifies whether legend entries should be placed in reversed order. */
-        reversedOrder: boolean;
-        /** In case legend position is set to "absolute", you can set distance from right side of the chart, in pixels. */
-        right: number;
-        /** Legend item text color on roll-over.  #CC0000 */
-        rollOverColor: string;
-        /** When you roll-over the legend entry, all other graphs can reduce their opacity, so that the graph you rolled-over would be distinguished. This style specifies the opacity of the graphs.
-            @default 1
-        */
-        rollOverGraphAlpha: number;
-        /** You can use this property to turn all the legend entries off.
-            @default true
-        */
-        showEntries: boolean;
-        /** Horizontal space between legend items, in pixels.
-            @default 10
-        */
-        spacing: number;
-        /** Whether showing/hiding of graphs by clicking on the legend marker is enabled or not. In case legend is used with AmMap, this is set to false automatically.
-            @default true
-        */
-        switchable: boolean;
-        /** Legend switch color. #FFFFFF */
-        switchColor: string;
-        /** Legend switch type (in case the legend is switchable). Possible values are "x" and "v". x */
-        switchType: string;
-        /** If true, clicking on the text will show/hide balloon of the graph. Otherwise it will show/hide graph/slice, if switchable is set to true.  */
-        textClickEnabled: boolean;
-        /** In case legend position is set to "absolute", you can set distance from top of the chart, in pixels. */
-        top: number;
-        /** Legend markers can mirror graph’s settings, displaying a line and a real bullet as in the graph itself.
-        Set this property to true if you want to enable this feature. Note, if you set graph colors in dataProvider, they will not be reflected in the marker.
-        @default false*/
-        useGraphSettings: boolean;
-        /** Specifies if legend labels should be use same color as corresponding markers. */
-        useMarkerColorForLabels: boolean;
-        /** Alignment of the value text. Possible values are "left" and "right". right */
-        valueAlign: string;
-        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. [[value]] */
-        valueText: string;
-        /** Width of the value text.
-            @default 80
-        */
-        valueWidth: number;
-        /** Vertical space between legend items also between legend border and first and last legend row.  10 */
-        verticalGap: number;
-        /** Adds event listener of the type "clickLabel" or "clickMarker" or "hideItem" to the object.
-            @param type Either "clickLabel" or "clickMarker" or "hideItem".
-            @param handler
-                If the type is "clickLabel", dispatched when legend label is clicked.
-                If the type is "clickMarker", dispatched when legend marker is clicked.
-                If the type is "hideItem", dispatched when user clicks on a legend item marker and hides corresponding object.
-                If the type is "rollOutItem", dispatched when user rolls-out of the legend item label (or whole item, if switchable is set to false).
-                If the type if "rollOverItem", dispatched when user rolls-over the legend item label (or whole item, if switchable is set to false).
-                If the type is "rollOutMarker", dispatched when user clicks out of a legend item marker and shows corresponding object.
-                If the type if "rollOverMarker", dispatched when user clicks on a legend item marker and shows corresponding object.
-        */
-
-        /** Adds event listener of the type "showItem" to the object.
-            @param type Always "showItem".
-            @param handler
-        */
-        addListener(type: string, handler: (e: {/** Always "showItem". */
-            type: string; dataItem: Object; chart: AmChart;
-        }) => void): void;
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any): void;
-    }
-
-    /** StockLegend is a legend of StockPanel. */
-
-    class StockLegend extends AmLegend {
-        /** The text which will be displayed in the value portion of the legend when graph is comparable and at least one dataSet is selected for comparing. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents.value/open/close/low/high]], [[description]]. [[percents.value]]% */
-
-        valueTextComparing: string;
-        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]].  [[value]] */
-
-        valueTextRegular: string;
-    }
-
-    /** StockPanel class creates stock panels (charts). AmStockChart can have multiple Stock panels. */
-
-    class StockPanel extends AmSerialChart {
-        /** Specifies whether x button will be displayed near the panel. This button allows turning panel off. */
-        allowTurningOff: boolean;
-        /** If true, drawing icons will be displayed in top-right corner. */
-        drawingIconsEnabled: boolean;
-        /** Specifies on which value axis user can draw trend lines. Set drawingIconsEnabled to true if you want drawing icons to be visible. First value axis will be used if not set here. */
-        drawOnAxis: ValueAxis;
-        /** Specifies if all trend lines should be erased when erase button is clicked. If false, trend lines can be erased one by one. */
-        eraseAll: boolean;
-        /** Size of trend line drawing icons. If you change this size, you should update icon images if you want them to look properly.
-            @default 18
-        */
-        iconSize: number;
-        /** Relative height of panel. Possible values 0 - 100. */
-        percentHeight: number;
-        /** Specifies when values should be recalculated to percents. Possible values are: "never", "always", "whenComparing".  whenComparing */
-        recalculateToPercents: string;
-        /** Specifies whether this panel will show category axis.
-            @default true
-        */
-        showCategoryAxis: boolean;
-        /**  */
-        stockGraphs: StockGraph[];
-        /** Stock chart legend. */
-        stockLegend: StockLegend;
-        /** Title of a panel. Note, StockLegend should be added in order title to be displayed. */
-        title: string;
-        /** Trend line opacity.
-            @default 1
-        */
-        trendLineAlpha: number;
-        /** Trend line color. #00CC00 */
-        trendLineColor: string;
-        /** Trend line dash length. */
-        trendLineDashLength: number;
-        /** Trend line thickness.
-            @default 2
-        */
-        trendLineThickness: number;
-        /** Adds a graph to the panel. */
-        addStockGraph(graph: StockGraph): void;
-        /** Removes graph from the panel. */
-        removeStockGraph(graph: StockGraph): void;
-    }
-
-    /** AmChart is a base class of all charts. It can not be instantiated explicitly. AmCoordinateChart, AmPieChart and AmMap extend AmChart class. */
-    class AmChart {
-        /** used when constructing a chart with a theme */
-        constructor(theme?: any);
-        /** Specifies, if class names should be added to chart elements. */
-        addClassNames: boolean;
-        /** Array of Labels. Example of label object, with all possible properties:
-{"x": 20, "y": 20, "text": "this is label", "align": "left", "size": 12, "color": "#CC0000", "alpha": 1, "rotation": 0, "bold": true, "url": "http://www.amcharts.com"} */
-        allLabels: Label[];
-        /**  Set this to false if you don't want chart to resize itself whenever its parent container size changes. */
-        autoResize: boolean;
-        /** Opacity of background. Set it to >0 value if you want backgroundColor to work. However we recommend changing div's background-color style for changing background color. */
-        backgroundAlpha: number;
-        /** Background color. You should set backgroundAlpha to >0 value in order background to be visible. We recommend setting background color directly on a chart's DIV instead of using this property. #FFFFFF */
-        backgroundColor: string;
-        /** The chart creates AmBalloon class itself. If you want to customize balloon, get balloon instance using this property, and then change balloon's properties.  AmBalloon */
-        balloon: AmBalloon;
-        /** Opacity of chart's border. Value range is 0 - 1. */
-        borderAlpha: number;
-        /** Color of chart's border. You should set borderAlpha >0 in order border to be visible. We recommend setting border color directly on a chart's DIV instead of using this property. #000000 */
-        borderColor: string;
-        /** This prefix is added to all class names which are added to all visual elements of a chart in case addClassNames is set to true. */
-        classNamePrefix: string;
-        /** Text color. #000000 */
-        color: string;
-        /** Non-commercial version only. Specifies position of link to amCharts site. Allowed values are: top-left, top-right, bottom-left and bottom-right.
-            @default 'top-left'
-        */
-        creditsPosition: string;
-        /** Array of data objects, for example: [{country:"US", value:524},{country:"UK", value:624},{country:"Lithuania", value:824}]. You can have any number of fields and use any field names. In case of AmMap, data provider should be MapData object. */
-        dataProvider: any[];
-        /** Decimal separator.
-            @Default . */
-        decimalSeparator: string;
-        /** Using this property you can add any additional information to SVG, like SVG filters or clip paths. The structure of this object should be identical to XML structure of a object you are adding, only in JSON format. */
-        defs: any;
-        /** Export config. Specifies how export to image/data export/print/annotate menu will look and behave. You can find a lot of examples in amcharts/plugins/export folder. */
-        export: ExportSettings;
-        /** Font family. Verdana */
-        fontFamily: string;
-        /** Font size.
-            @default 11
-        */
-        fontSize: string;
-        /** If you set this to true, the lines of the chart will be distorted and will produce hand-drawn effect. Try to adjust chart.handDrawScatter and chart.handDrawThickness properties for a more scattered result.
-            @Default false
-        */
-        handDrawn: boolean;
-        /** Defines by how many pixels hand-drawn line (when handDrawn is set to true) will fluctuate.
-            @Default 2
-        */
-        handDrawScatter: number;
-        /** Defines by how many pixels line thickness will fluctuate (when handDrawn is set to true).
-            @Default 1
-        */
-        handDrawThickness: number;
-        /** Time, in milliseconds after which balloon is hidden if the user rolls-out of the object. Might be useful for AmMap to avoid balloon flickering while moving mouse over the areas. Note, this is not duration of fade-out. Duration of fade-out is set in AmBalloon class.
-            @Default 150
-        */
-        hideBalloonTime: number;
-        /** Legend of a chart. */
-        legend: AmLegend;
-        /** Reference to the div of the legend. */
-        legendDiv: HTMLElement;
-        /** You can add listeners of events using this property. Example: listeners = [{"event":"dataUpdated", "method":handleEvent}]; */
-        listerns: Object[];
-        /** This setting affects touch-screen devices only. If a chart is on a page, and panEventsEnabled are set to true, the page won't move if the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device, the user won’t be able to move the page at all. That's why the default value is "false". If you think that selecting/panning the chart or moving/pinching the map is a primary purpose of your users, you should set panEventsEnabled to true. */
-        panEventsEnabled: boolean;
-        /**  Specifies absolute or relative path to amCharts files, i.e. "amcharts/". (where all .js files are located)
-            If relative URLs are used, they will be relative to the current web page, displaying the chart.
-            You can also set path globally, using global JavaScript variable AmCharts_path. If this variable is set, and "path" is not set in chart config, the chart will assume the path from the global variable. This allows setting amCharts path globally. I.e.:
-            var AmCharts_path = "/libs/amcharts/";
-            "path" parameter will be used by the charts to locate it's files, like images, plugins or patterns.*/
-        path: string;
-        /** Specifies path to the folder where images like resize grips, lens and similar are.
-            IMPORTANT: Since V3.14.12, you should use "path" to point to amCharts directory instead. The "pathToImages" will be automatically set and does not need to be in the chart config, unless you keep your images separately from other amCharts files. */
-        pathToImages: string;
-        /** Precision of percent values. -1 means percent values won't be rounded at all and show as they are.
-            @default 2
-        */
-        percentPrecision: number;
-        /** Precision of values. -1 means values won't be rounded at all and show as they are.
-            @Default 1*/
-        precision: number;
-        /** Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e+3,prefix:"k"},{number:1e+6,prefix:"M"},{number:1e+9,prefix:"G"},{number:1e+12,prefix:"T"},{number:1e+15,prefix:"P"},{number:1e+18,prefix:"E"},{number:1e+21,prefix:"Z"},{number:1e+24,prefix:"Y"}] */
-        prefixesOfBigNumbers: any[];
-        /** Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e-24, prefix:"y"},{number:1e-21, prefix:"z"},{number:1e-18, prefix:"a"},{number:1e-15, prefix:"f"},{number:1e-12, prefix:"p"},{number:1e-9, prefix:"n"},{number:1e-6, prefix:"μ"},{number:1e-3, prefix:"m"}] */
-        prefixesOfSmallNumbers: any[];
-        /** Theme of a chart. Config files of themes can be found in amcharts/themes/ folder. More info about using themes. */
-        theme: string;
-        /** Thousands separator.
-            @default .
-        */
-        thousandsSeparator: string;
-        /** Array of Title objects. */
-        titles: Title[];
-        /** Type of a chart. Required when creating chart using JSON. Possible types are: serial, pie, xy, radar, funnel, gauge, map, stock. */
-        type: string;
-        /** If true, prefixes will be used for big and small numbers. You can set arrays of prefixes via prefixesOfSmallNumbers and prefixesOfBigNumbers properties. */
-        usePrefixes: boolean;
-        /** Read-only. Indicates current version of a script. */
-        version: string;
-        /** Adds a label on a chart.
-            You can use it for labeling axes, adding chart title, etc. x and y coordinates can be set in number, percent, or a number with ! in front of it - coordinate will be calculated from right or bottom instead of left or top.
-            x - horizontal coordinate
-            y - vertical coordinate
-            text - label's text
-            align - alignment (left/right/center)
-            size - text size
-            color - text color
-            rotation - angle of rotation
-            alpha - label alpha
-            bold - specifies if text is bold (true/false),
-            url - url
-        */
-        addLabel(x: number|string, y: number|string, text: string, align: string, size?: number, color?: string, rotation?: number, alpha?: number, bold?: boolean, url?: string): any;
-        /** Adds a legend to the chart.
-            By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter.
-            (NOTE: This method will not work on StockPanel.)
-            @param legend
-            @param legendDivId - Id of the legend div (optional).
-        */
-        addLegend(legend: AmLegend, legendDivId?: string): void;
-        /** Adds a legend to the chart.
-            By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter.
-            (NOTE: This method will not work on StockPanel.)
-            @param legend
-            @param legendDiv - Legend div (optional).
-        */
-        addLegend(legend: AmLegend, legendDiv: HTMLElement): void;
-
-        /**   Adds title to the top of the chart. Pie, Radar positions are updated so that they won't overlap. Plot area of Serial/XY chart is also updated unless autoMargins property is set to false. You can add any number of titles - each of them will be placed in a new line. To remove titles, simply clear titles array: chart.titles = []; and call chart.validateNow() method. text - text of a title size - font size color - title color alpha - title opacity bold - boolean value indicating if title should be bold. */
-        addTitle(text: string, size: number, color: string, alpha: number, bold: boolean): void;
-        /** Clears the chart area, intervals, etc. */
-        clear(): void;
-        /** Removes all labels added to the chart. */
-        clearLabels(): void;
-        /** Use this method to force the chart to resize to it's current container size. */
-        invalidateSize(): void;
-        /** Removes chart's legend. */
-        removeLegend(): void;
-        /** This method should be called after data in your data provider changed or a new array was set to dataProvider. After calling this method the chart will parse data and redraw. */
-        validateData(): void;
-        /** This method should be called after you changed one or more properties of any class. The chart will redraw after this method is called. */
-        validateNow(): void;
-
-        /** Adds chart to the specified DIV.
-            @param container DIV object which will hold the chart. */
-        write(container: HTMLElement): void;
-        /** Adds chart to the specified DIV.
-            @param container Id of a DIV which will hold the chart. */
-        write(container: string): void;
-
-        /** Adds event listener of the type "dataUpdated" or "init" to the object.
-            @param type "dataUpdated" or "init".
-            @param handler
-                If the type is "dataUpdated".
-                    Dispatched when chart is build for the first time or after validateData() method was called.
-                If the type is "init".
-                    Dispatched when chart is build for the first time.
-        */
-        addListener(type: string, handler: (e: {
-            /** Either "dataUpdated" or "init". */
-            type: string;
-            chart: AmChart;
-        }) => void): void;
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any): void;
-    }
-
-    /** AmCoordinateChart is a base class of AmRectangularChart. It can not be instantiated explicitly. */
-
-    class AmCoordinateChart extends AmChart {
-        /** Read-only. Array, holding processed chart's data. */
-        chartData: Object[];
-        /** Specifies the colors of the graphs if the lineColor of a graph is not set.
-            It there are more graphs then colors in this array, the chart picks random color.
-            @default ['#FF6600', '#FCD202', '#B0DE09', '#0D8ECF', '#2A0CD0', '#CD0D74', '#CC0000', '#00CC00', '#0000CC', '#DDDDDD', '#999999', '#333333', '#990000'] */
-        colors: string[];
-        /** The array of graphs belonging to this chart.
-            To add/remove graph use addGraph/removeGraph methods instead of adding/removing graphs directly to array.
-        */
-        graphs: AmGraph[];
-        /** Specifies if grid should be drawn above the graphs or below. Will not work properly with 3D charts.
-            @default false
-        */
-        gridAboveGraphs: boolean;
-        /** Instead of adding guides to the axes, you can push all of them to this array. In case guide has category or date defined, it will automatically will be assigned to the category axis. Otherwise to first value axis, unless you specify a different valueAxis for the guide. */
-        guides: Guide[];
-        /** Specifies whether the animation should be sequenced or all objects should appear at once.
-            @default true
-        */
-        sequencedAnimation: boolean;
-        /** The initial opacity of the column/line.
-            If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha.
-            Value range is 0 - 1.
-            @default 1
-        */
-        startAlpha: number;
-        /** Duration of the animation, in seconds. */
-        startDuration: number;
-        /** Animation effect.
-            Possible values are ">", "<", elastic" and "bounce".
-            @default "elastic"
-        */
-        startEffect: string;
-        /** Target of url.
-            @default this
-        */
-        urlTarget: any;
-        /** The array of value axes.
-            To add/remove value axis use addValueAxis/removeValueAxis methods instead of adding/removing axes directly to array.
-            Chart creates one value axis automatically, so if you need only one value axis, you don't need to create it.
-        */
-        valueAxes: any[];
-        /**  Adds a graph to the chart.
-         */
-        addGraph(graph: AmGraph): void;
-        /** Adds a legend to the chart. By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter. (NOTE: This method will not work on StockPanel.) */
-        /** Adds value axis to the chart.
-            One value axis is created automatically, so if you don't want to change anything or add more value axes, you don't need to add it.
-        */
-        addValueAxis(axis: ValueAxis): void;
-        /** You can trigger the animation of the chart. */
-        animateAgain(): void;
-
-        /** AmGraph Returns graph by id. */
-        getGraphById(graphId: string): AmGraph;
-
-        /**  Returns value axis by id.*/
-        getValueAxisById(axisId: string): ValueAxis;
-
-        /** Hide the graph (if it is visible). Usually this method is called from the Legend, when you click on the legend marker.
-        */
-        hideGraph(graph: AmGraph): void;
-
-        /** Hide value balloon of a graph. Usually this method is called from the Legend, when you click on the legend text.*/
-        hideGraphsBalloon(graph: AmGraph): void;
-
-        /** Highlight the graph. Usually this method is called from the Legend, when you roll-over the legend entry.*/
-        highlightGraph(graph: AmGraph): void;
-
-        /** Removes graph from the chart.*/
-        removeGraph(graph: AmGraph): void;
-
-        /** Removes value axis from the chart. When you remove value axis, all graphs assigned to this axis are also removed. */
-        removeValueAxis(axis: ValueAxis): void;
-
-        /** Show the graph (if it is hidden). Usually this method is called from the Legend, when you click on the legend marker.*/
-        showGraph(graph: AmGraph): void;
-
-        /** Show value balloon of a graph. Usually this method is called from the Legend, when you click on the legend text.*/
-        showGraphsBalloon(graph: AmGraph): void;
-
-        /** UnhighlightGraph the graph. Usually this method is called from the Legend, when you roll-out the legend entry.*/
-        unhighlightGraph(graph: AmGraph): void;
-        /** Adds event listener of the type "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem" to the object.
-            @param type Either "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem".
-            @param handler Dispatched when user clicks on the data item (column/bullet)
-        */
-        addListener(type: string, handler: (e: {
-            /** Either "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem". */
-            type: string;
-            graph: AmGraph;
-            item: GraphDataItem;
-            index: number;
-            chart: AmChart;
-        }) => void): void;
-    }
-
-    /** GraphDataItem holds all the information about the graph's data item. When working with a chart, you do not create GraphDataItem objects or change it's properties directly. GraphDataItem is passed to you by events when user interacts with data item on the chart. The list of properties below will help you to extract data item's value/coordinate/etc. */
-    class GraphDataItem {
-        /** Opacity of the data item. */
-        alpha: number;
-        /** Bullet type. */
-        bullet: string;
-        /** Bullet size.  */
-        bulletSize: number;
-        /** Category value. */
-        category: string;
-        /** Color of the data item. */
-        color: string;
-        /** Custom bullet (path to file name). */
-        customBullet: string;
-        /** Original object from data provider. */
-        dataContext: Object;
-        /** Description. */
-        description: string;
-        /** Array of colors of the data item, used by column and candlestick chart only. */
-        fillColors: any[];
-        /** Object which holds percents when recalculateToPercents is set to true. */
-        percents: Object;
-        /** SerialDataItem of this graphDataItem */
-        serialDataItem: SerialDataItem;
-        /** url */
-        url: string;
-        /** Object which holds values of the data item (value, open, close, low, high). */
-        values: Object;
-        /** x coordinate of the data item. */
-        x: number;
-        /** y coordinate of the data item. */
-        y: number;
-    }
-
-    /** SerialDataItem holds all the information about each series. When working with a chart, you do not create SerialDataItem objects or change it's properties directly. Consider properties of a SerialDataItem read-only - change values in chart's data provider if you need to. When serial chart parses dataProvider, it generates "chartData" array. Objects of this array are SerialDataItem objects. */
-    class SerialDataItem {
-
-        /** You can access each GraphDataItem using this object. The data structure is: graphDataItem = serialDataItem.axes[axisId].graphs[graphId]. */
-        axes: Object;
-
-        /** category value. String if parseDates is false, Date if true. */
-        category: any;
-
-        /** Timestamp of a series date. Avalable only if parseDates property of CategoryAxis is set to true. */
-        time: number;
-
-        /** Coordinate (horizontal or vertical, depends on chart's rotate property) of the series. */
-        x: number;
-    }
-
-    class CategoryAxis extends AxisBase {
-
-        /** When parse dates is on for the category axis, the chart will try to highlight the beginning of the periods, like month, in bold. Set this to false to disable the functionality.
-            @default true
-        */
-        boldPeriodBeginning: boolean;
-
-        /** Date formats of different periods. Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, WW - weeks, YYYY - years. Check this page for date formatting strings. [{period:'fff',format:'JJ:NN:SS'},{period:'ss',format:'JJ:NN:SS'},{period:'mm',format:'JJ:NN'},{period:'hh',format:'JJ:NN'},{period:'DD',format:'MMM DD'},{period:'WW',format:'MMM DD'},{period:'MM',format:'MMM'},{period:'YYYY',format:'YYYY'}] */
-        dateFormats: any[];
-
-        /** In case your category axis values are Date objects and parseDates is set to true, the chart will parse dates and will place your data points at irregular intervals. However if you want dates to be parsed (displayed on the axis, baloons, etc), but data points to be placed at equal intervals (omiting dates with no data), set equalSpacing to true. */
-        equalSpacing: boolean;
-
-        /** Field in data provider which specifies if the category value should always be shown. For example: categoryAxis.forceShowField = "forceShow"; Field in data provider which specifies if the category value should always be shown. For example: categoryAxis.forceShowField = "forceShow";
-        And in data:
-        {category:"one", forceShow:true, value:100}
-        Note, this works only when parseDates is set to false.*/
-        forceShowField: string;
-
-        /** Specifies if a grid line is placed on the center of a cell or on the beginning of a cell. Possible values are: "start" and "middle" This setting doesn't work if parseDates is set to true. middle */
-        gridPosition: string;
-
-        /**   Specifies if minor grid should be displayed.
-        NOTE: If equalSpacing is set to true, this setting will be ignored.
-        @default false*/
-        minorGridEnabled: boolean;
-
-        /** Specifies the shortest period of your data. This should be set only if parseDates is set to "true". Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, YYYY - years. DD */
-        minPeriod: string;
-
-        /** In case your category axis values are Date objects, set this to true. In this case the chart will parse dates and will place your data points at irregular intervals. If you want dates to be parsed, but data points to be placed at equal intervals, set both parseDates and equalSpacing to true. */
-        parseDates: boolean;
-
-        /** Specifies whether the graph should start on axis or not. In case you display columns, it is recommended to set this to false. If parseDates is set to true, startOnAxis will allways be false, unless equalSpacing is set to true. */
-        startOnAxis: boolean;
-
-        /** Works only when parseDates is set to true and equalSpacing is false. If you set it to true, at the position where bigger period changes,
-        category axis will display date strings of bot small and big period, in two rows.
-        @default false*/
-        twoLineMode: boolean;
-
-        /** Use line color for bullet
-        @default false*/
-        useLineColorForBulletBorder: boolean;
-        /** Number returns coordinate of a category. Works only if parseDates is false. If parseDates is true, use dateToCoordinate method. category - String */
-        categoryToCoordinate(category: string): void;
-
-        /** date - Date object Returns Date of the coordinate, in case parseDates is set to true and equalSpacing is set to false.  coordinate - Number */
-        coordinateToDate(coordinate: number): void;
-
-        /** Number Returns coordinate of the date, in case parseDates is set to true. if parseDates is false, use categoryToCoordinate method. date - Date object */
-        dateToCoordinate(date: Date): void;
-
-        /** Number Returns index of the category which is most close to specified coordinate. x - coordinate */
-        xToIndex(x: number): void;
-    }
-
-    /** ChartScrollbar class displays chart scrollbar. Supported by AmSerialChart and AmXYChart.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var chartScrollbar = new AmCharts.ChartScrollbar();
-            chart.addChartScrollbar(chartScrollbar);
-    */
-    class ChartScrollbar {
-        /** Specifies whether number of gridCount is specified automatically, acoarding to the axis size. */
-        autoGridCount: boolean;
-        /** Background opacity.
-            @default 1
-        */
-        backgroundAlpha: number;
-        /** Background color of the scrollbar.
-            @default #D4D4D4
-        */
-        backgroundColor: string;
-        /** Read-only. Category axis of the scrollbar. */
-        categoryAxis: CategoryAxis;
-        /** Text color. Will use chart's color if not set. */
-        color: string;
-        /** Specifies which graph will be displayed in the scrollbar. Only Serial chart's scrollbar can display a graph. */
-        graph: AmGraph;
-        /** Graph fill opacity. Value range is 0 - 1.  0.1 */
-        graphFillAlpha: number;
-        /** Graph fill color. #000000 */
-        graphFillColor: string;
-        /** Graph line opacity. Value range is 0 - 1. */
-        graphLineAlpha: number;
-        /** Graph line color. #000000 */
-        graphLineColor: string;
-        /** by default the graph type is the same as the original graph's type, however in case of candlestick or ohlc you might want to show line graph in the scrollbar. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". */
-        graphType: string;
-        /** Grid opacity. Value range is 0 - 1. 0.7 */
-        gridAlpha: number;
-        /** Grid color. #FFFFFF */
-        gridColor: string;
-        /** The number of grid lines. */
-        gridCount: number;
-        /** Specifies whether resize grips are hidden when mouse is away from the scrollbar. */
-        hideResizeGrips: boolean;
-        /** Specifies whether scrollbar has a resize feature.
-            @default true
-        */
-        resizeEnabled: boolean;
-        /** Height (width, if chart is rotated) of a scrollbar.  20 */
-        scrollbarHeight: number;
-        /** Duration of scrolling, when the user clicks on scrollbar's background, in seconds.
-            @default 2
-        3*/
-        scrollDuration: number;
-        /** Selected backround opacity.
-            @default 1
-        */
-        selectedBackgroundAlpha: number;
-        /** Selected background color. #EFEFEF */
-        selectedBackgroundColor: string;
-        /** Selected graph's fill opacity. Value range is 0 - 1. 0.5 */
-        selectedGraphFillAlpha: number;
-        /** Selected graph's fill color. #000000 */
-        selectedGraphFillColor: string;
-        /** Selected graph's line opacity. Value range is 0 - 1. */
-        selectedGraphLineAlpha: number;
-        /** Selected graph's line color. #000000 */
-        selectedGraphLineColor: string;
-        /** Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment when user releases mouse button. */
-        updateOnReleaseOnly: boolean;
-    }
-
-    /** AmRectangularChart is a base class of AmSerialChart and AmXYChart. It can not be instantiated explicitly.*/
-    class AmRectangularChart extends AmCoordinateChart {
-        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0).
-            @default 0
-        */
-        angle: number;
-        /** Space left from axis labels/title to the chart's outside border, if autoMargins set to true.
-            @default 10
-        */
-        autoMarginOffset: number;
-        /** Specifies if margins of a chart should be calculated automatically so that labels of axes would fit. The chart will adjust only margins with axes. Other margins will use values set with marginRight, marginTop, marginLeft and marginBottom properties.
-            @default true
-        */
-        autoMargins: boolean;
-        /** Cursor of a chart. */
-        chartCursor: ChartCursor;
-        /** Chart scrollbar. */
-        chartScrollbar: ChartScrollbar;
-        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0).
-            @default 0*/
-        depth3D: number;
-        /** Number of pixels between the container's bottom border and plot area. This space can be used for bottom axis' values. If autoMargin is true and bottom side has axis, this property is ignored.
-            @default 20
-        */
-        marginBottom: number;
-        /** Number of pixels between the container's left border and plot area. This space can be used for left axis' values. If autoMargin is true and left side has axis, this property is ignored.
-            @default 20
-        */
-        marginLeft: number;
-        /** Number of pixels between the container's right border and plot area. This space can be used for Right axis' values. If autoMargin is true and right side has axis, this property is ignored.
-            @default 20
-        */
-        marginRight: number;
-        /** Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call.
-            @default false
-        */
-        marginsUpdated: boolean;
-        /** Number of pixels between the container's top border and plot area. This space can be used for top axis' values. If autoMargin is true and top side has axis, this property is ignored.
-            @default 20
-        */
-        marginTop: number;
-        /** The opacity of plot area's border. Value range is 0 - 1.
-            @default 0
-         */
-        plotAreaBorderAlpha: number;
-        /** The color of the plot area's border. Note, the it is invisible by default, as plotAreaBorderAlpha default value is 0. Set it to a value higher than 0 to make it visible.
-            @default '#000000'*/
-        plotAreaBorderColor: string;
-        /** Opacity of plot area. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used.
-            @default 0
-        */
-        plotAreaFillAlphas: number;
-        /** You can set both one color if you need a solid color or array of colors to generate gradients, for example: ["#000000", "#0000CC"]
-            @default '#FFFFFF'
-        */
-        plotAreaFillColors: any;
-        /** If you are using gradients to fill the plot area, you can use this property to set gradient angle. The only allowed values are horizontal and vertical: 0, 90, 180, 270.
-            @default 0
-        */
-        plotAreaGradientAngle: number;
-        /** Array of trend lines added to a chart. You can add trend lines to a chart using this array or access already existing trend lines */
-        trendLines: TrendLine[];
-        /** Opacity of zoom-out button background.
-            @default 0
-        */
-        zoomOutButtonAlpha: number;
-        /** Zoom-out button background color.
-            @default '#e5e5e5'
-        */
-        zoomOutButtonColor: string;
-        /** Name of zoom-out button image. In the images folder there is another lens image, called lensWhite.png. You might want to have white lens when background is dark. Or you can simply use your own image.
-            @default lens.png
-        */
-        zoomOutButtonImage: string;
-        /** Size of zoom-out button image
-            @default: 17
-        */
-        zoomOutButtonImageSize: number;
-        /** Padding around the text and image.
-            @default: 8
-        */
-        zoomOutButtonPadding: number;
-        /** Opacity of zoom-out button background when mouse is over it.
-            @default: 1
-        */
-        zoomOutButtonRollOverAlpha: number;
-        /** Text in the zoom-out button. Show all */
-        zoomOutText: string;
-
-        /** Adds a ChartCursor object to a chart */
-        addChartCursor(cursor: ChartCursor): void;
-        /** Adds a ChartScrollbar to a chart */
-        addChartScrollbar(scrollbar: ChartScrollbar): void;
-        /** Adds a TrendLine to a chart.
-            You should call chart.validateNow() after this method is called in order the trend line to be visible. */
-        addTrendLine(trendLine: TrendLine): void;
-        /** Removes cursor from the chart */
-        removeChartCursor(): void;
-        /** Removes scrollbar from the chart */
-        removeChartScrollbar(): void;
-        /** Removes a trend line from a chart.
-            You should call chart.validateNow() in order the changes to be visible. */
-        removeTrendLine(trendLine: TrendLine): void;
-    }
-
-    /* Trend lines are straight lines indicating trends, might also be used for some different purposes. Can be used by Serial and XY charts. To add/remove trend line, use chart.addTrendLine(trendLine)/chart.removeTrendLine(trendLine) methods or simply pass array of trend lines: chart.trendLines = [trendLine1, trendLine2].
-        @example
-            var trendLine = new AmCharts.TrendLine();
-            trendLine.initialDate = new Date(2012, 0, 2, 12); // 12 is hour - to start trend line in the middle of the day
-            trendLine.finalDate = new Date(2012, 0, 11, 12);
-            trendLine.initialValue = 10;
-            trendLine.finalValue = 19;
-            trendLine.lineColor = "#CC0000";
-            chart.addTrendLine(trendLine);
-    */
-    class TrendLine {
-
-    }
-
-    /** ChartCursor is a class which displays a cursor which follows the mouse. In case of Serial chart it also shows value and category balloons.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var chartCursor = new AmCharts.ChartCursor();
-            chart.addChartCursor(chartCursor);
-    */
-    class ChartCursor {
-        /** Specifies if bullet for each graph will follow the cursor. */
-        bulletsEnabled: boolean;
-        /** Size of bullets, following the cursor.
-            @default 8
-        */
-        bulletSize: number;
-        /** Opacity of the category balloon.
-            @default 1
-        */
-        categoryBalloonAlpha: number;
-        /** Color of the category balloon. cursorColor is used if not set. */
-        categoryBalloonColor: string;
-        /** Category balloon date format (used only if category axis parses dates). Check this page for instructions on how to format dates. MMM DD, YYYY */
-        categoryBalloonDateFormat: string;
-        /** Specifies whether category balloon is enabled.
-            @default true
-        */
-        categoryBalloonEnabled: boolean;
-        /** Text color. #FFFFFF */
-        color: string;
-        /** Opacity of the cursor line.  1 */
-        cursorAlpha: number;
-        /** Color of the cursor line. #CC0000 */
-        cursorColor: string;
-        /** Specifies where the cursor line should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). If you want the cursor to follow mouse and not to glue to the nearest data point, set "mouse" here. Possible values are: "start", "middle", "mouse". */
-        cursorPosition: string;
-        /** Specifies whether cursor is enabled.
-            @default true
-        */
-        enabled: boolean;
-        /** If set to true, instead of a cursor line user will see a fill which width will always be equal to the width of one data item.
-        Recommend setting cursorAlpha to 0.1 or some other small number if using this feature.
-        @default false*/
-        fullWidth: boolean;
-        /** If this is set to true, only one balloon at a time will be displayed. Note, this is quite CPU consuming. */
-        oneBalloonOnly: boolean;
-        /** If this is set to true, the user will be able to pan the chart (Serial only) instead of zooming. */
-        pan: boolean;
-        /** Opacity of the selection. */
-        selectionAlpha: number;
-        /** Specifies if cursor should only mark selected area but not zoom-in after user releases mouse button. */
-        selectWithoutZooming: boolean;
-        /** Specifies whether value balloons are enabled. In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet.
-            @default true
-        */
-        valueBalloonsEnabled: boolean;
-        /** Specifies if the user can zoom-in the chart. If pan is set to true, zoomable is switched to false automatically.
-            @default true
-        */
-        zoomable: boolean;
-        /** Indicates if currently user is selecting some chart area to zoom-in. */
-        zooming: boolean;
-
-
-        /** Hides cursor. */
-        hideCursor(): void;
-        /** You can force cursor to appear at specified cateogry or date. */
-        showCursorAt(category: string): void;
-        /** Adds event listener of the type "changed" to the object.
-            @param type Always "changed".
-            @param handler Dispatched when cursor position is changed. "index" is a series index over which chart cursors currently is. "zooming" specifies if user is currently zooming (is selecting) the chart. mostCloseGraph property is set only when oneBalloonOnly is set to true.*/
-        addListener(type: string, handler: (e: {/** Always "changed". */
-            type: string; index: number; zooming: boolean; mostCloseGraph: AmGraph; chart: AmChart;
-        }) => void): void;
-        /** Adds event listener of the type "onHideCursor" to the object.
-            @param type Always "onHideCursor".
-            @param handler Dispatched when cursor is hidden.*/
-        addListener(type: string, handler: (e: {/** Always "onHideCursor". */
-            type: string; chart: AmChart;
-        }) => void): void;
-        /** Adds event listener of the type "selected" or "zoomed" to the object.
-            @param type "selected" or "zoomed".
-            @param handler
-                If the type is "selected". Dispatched if selectWithoutZooming is set to true and when user selects some period. start and end are indices or timestamp (when categoryAxis.parseDates is true) of selection start/end.
-                If the type is "zoomed". Dispatched when user zooms to some period. start and end are indices or timestamp (when categoryAxis.parseDates is true) of selection start/end.
-        */
-        addListener(type: string, handler: (e: {/** Always "zoomed". */
-            type: string; index: number; zooming: boolean; chart: AmChart;
-        }) => void): void;
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any): void;
-    }
-
-    /** AmSerialChart is the class you have to use for majority of chart types. The supported chart types are: line, area, column, bar, step line, smoothed line, candlestick and OHLC. The chart can be rotated by 90 degrees so the column chart becomes bar chart. The chart supports simple and logarithmic scales, it can have multiple value axes. The chart can place data points at equal intervals or can parse dates and place data points at irregular intervals.
-        @example
-            var chartData = [{title:"sample 1",value:130},{title:"sample 2",value:26}];
-
-            var chart = new AmCharts.AmSerialChart();
-            chart.categoryField = "title";
-            chart.dataProvider = chartData;
-
-            var graph = new AmCharts.AmGraph();
-            graph.valueField = "value";
-            graph.type = "column";
-            graph.fillAlphas = 1;
-            chart.addGraph(graph);
-
-            chart.write("chartdiv");
-    */
-    class AmSerialChart extends AmRectangularChart {
-    	/** Date format of the graph balloon (if chart parses dates and you don't use chartCursor).
-            @default 'MMM DD, YYYY'
-        */
-        balloonDateFormat: string;
-        /** Read-only. Chart creates category axis itself. If you want to change some properties, you should get this axis from the chart and set properties to this object. */
-        categoryAxis: CategoryAxis;
-        /** Category field name tells the chart the name of the field in your dataProvider object which will be used for category axis values. */
-        categoryField: string;
-        /** The gap in pixels between two columns of the same category.
-            @default 5
-        */
-        columnSpacing: number;
-        /** Space between 3D stacked columns.
-            @default 0
-        */
-        columnSpacing3D: number;
-        /** Relative width of columns. Value range is 0 - 1.
-            @default 0.8
-        */
-        columnWidth: number;
-        /** Read-only. If category axis parses dates endDate indicates date to which the chart is currently displayed. */
-        endDate: Date;
-        /** Read-only. Category index to which the chart is currently displayed. */
-        endIndex: number;
-        /** Maximum number of series allowed to select. */
-        maxSelectedSeries: number;
-        /** The longest time span allowed to select (in milliseconds) for example, 259200000 will limit selection to 3 days. */
-        maxSelectedTime: number;
-        /** The shortest time span allowed to select (in milliseconds) for example, 1000 will limit selection to 1 second.
-            @default 0
-        */
-        minSelectedTime: number;
-        /** Specifies if scrolling of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will zoom-in/out. */
-        mouseWheelScrollEnabled: boolean;
-        /** Specifies if zooming of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will scroll. */
-        mouseWheelZoomEnabled: boolean;
-        /** If you set this to true, the chart will be rotated by 90 degrees (the columns will become bars). */
-        rotate: boolean;
-        /** Read-only. If category axis parses dates startDate indicates date from which the chart is currently displayed. */
-        startDate: Date;
-        /** Read-only. Category index from which the chart is currently displayed. */
-        startIndex: number;
-        /** Specifies if chart should zoom-out when data is updated.
-            @default true
-         */
-        zoomOutOnDataUpdate: boolean;
-
-        /** Number Returns index of the specified category value. value - series (category value) which index you want to find. */
-        getCategoryIndexByValue(value: number): void;
-        /** Zooms out, charts shows all available data. */
-        zoomOut(): void;
-        /** Zooms the chart by the value of the category axis. start - category value, String \\ end - category value, String */
-        zoomToCategoryValues(start: Date, end: Date): void;
-        /** Zooms the chart from one date to another. start - start date, Date object \\ end - end date, Date object */
-        zoomToDates(start: Date, end: Date): void;
-        /** Zooms the chart by the index of the category. start - start index, Number \\ end - end index, Number */
-        zoomToIndexes(start: Date, end: Date): void;
-    }
-
-    class PeriodSelector {
-        /** Date format of date input fields. Check [[http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/mx/formatters/DateFormatter.html DD-MM-YYYY */
-        dateFormat: string;
-        /** Text displayed next to "from" date input field. From: */
-        fromText: string;
-        /** Specifies if period buttons with date range bigger than available data should be hidden.
-            @default true
-        */
-        hideOutOfScopePeriods: boolean;
-        /** Specifies whether period selector displays "from" and "to" date input fields.
-            @default true
-        */
-        inputFieldsEnabled: boolean;
-        /** Width of date input fields, in pixels. Works only if period selector is horizontal.
-            @default 100
-        */
-        inputFieldWidth: number;
-        /** Array of predefined period objects. Period object has 4 properties - period, count, label and selected. Possible period values are: "ss" - seconds, "mm" - minutes, "hh" - hours, "DD" - days, "MM" - months and "YYYY" - years. property "count" specifies how many periods this button will select. "label" will be displayed on a button and "selected" is a boolean which specifies if this button is selected when chart is initialized or not. Example: {period:"DD", count:10, label:"10 days", selected:false}. */
-        periods: any[];
-        /** Text displayed next to predefined period buttons. Zoom: */
-        periodsText: string;
-        /** Possible values: "right", "left", "top", "bottom". bottom */
-        position: string;
-        /** Specifies whether predefined period buttons should select a period from the beginning or the end of the data. */
-        selectFromStart: boolean;
-        /** Text displayed next to "to" date input field. To: */
-        toText: string;
-        /** Width of a period selector, when position is "left" or "right".
-            @default 180
-        */
-        width: number;
-
-        /** Adds event listener to the object.
-       .
-@param handler - Dispatched when dates in period selector input fields are changed or user clicks on one of the predefined period buttons. */
-
-        addListener(type: string, handler: (e: {
-            /** Always: "changed" */
-
-            type: string;
-            startDate: Date;
-            endDate: Date;
-            predefinedPeriod: string;
-            count: number;
-        }) => void): void;
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any): void;
-    }
-
-    /** PanelsSettings settings set's settings for all StockPanels. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of StockPanel class will be used. */
-
-    class PanelsSettings {
-        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0). */
-        angle: number;
-        /** Opacity of panel background. Possible values are 1 and 0. Values like 0.5 will not make it half-transparent. */
-        backgroundAlpha: number;
-        /** Background color of panels. Set backgroundAlpha to > 0 value in order to make background visible. #FFFFFF */
-        backgroundColor: string;
-        /** The gap in pixels between two columns of the same category. */
-        columnSpacing: number;
-        /** Relative width of columns. Valid values 0 - 1. */
-        columnWidth: number;
-        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0). */
-        depth3D: number;
-        /** Font family. */
-        fontFamily: string;
-        /** Font size. */
-        fontSize: string;
-        /** Number of pixels between the container's bottom border and plot area.
-            @default 1
-        */
-        marginBottom: number;
-        /** Number of pixels between the container's left border and plot area. If your left valueAxis values ar not placed inside the plot area, you should set marginLeft to 80 or some close value. */
-        marginLeft: number;
-        /** Number of pixels between the container's left border and plot area. If your right valueAxis values ar not placed inside the plot area, you should set marginRight to 80 or some close value. */
-        marginRight: number;
-        /** Number of pixels between the container's top border and plot area. */
-        marginTop: number;
-        /** Gap between panels.
-            @default 8
-        */
-        panelSpacing: number;
-        /** This setting affects touch-screen devices only. If a chart is on a page, and panEventsEnabled are set to true, the page won't move if the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device, the user won’t be able to move the page at all. That's why the default value is "false". If you think that selecting or or panning the chart is a primary purpose of your chart users, you should set panEventsEnabled to true. */
-        panEventsEnabled: boolean;
-        /** The opacity of plot area's border. */
-        plotAreaBorderAlpha: number;
-        /** The color of the plot area's border. */
-        plotAreaBorderColor: string;
-        /** Opacity of plot area fill. */
-        plotAreaFillAlphas: number;
-        /** Specifies the colors used to tint the background gradient fill of the plot area. String or Array of Strings */
-        plotAreaFillColors: any;
-        /** Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e+3,prefix:"k"},{number:1e+6,prefix:"M"},{number:1e+9,prefix:"G"},{number:1e+12,prefix:"T"},{number:1e+15,prefix:"P"},{number:1e+18,prefix:"E"},{number:1e+21,prefix:"Z"},{number:1e+24,prefix:"Y"}] */
-        prefixesOfBigNumbers: any[];
-        /** Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e-24, prefix:"y"},{number:1e-21, prefix:"z"},{number:1e-18, prefix:"a"},{number:1e-15, prefix:"f"},{number:1e-12, prefix:"p"},{number:1e-9, prefix:"n"},{number:1e-6, prefix:"μ"},{number:1e-3, prefix:"m"}] */
-        prefixesOfSmallNumbers: any[];
-        /** Specifies whether the animation should be sequenced or all objects should appear at once. */
-        sequencedAnimation: boolean;
-        /** The initial opacity of the column/line. If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha. */
-        startAlpha: number;
-        /** Duration of the animation, in seconds. */
-        startDuration: number;
-        /** Possible values are: "linear", "<", ">" "<>", "elastic", "bounce". */
-        startEffect: string;
-        /** If true, prefixes will be used for big and small numbers. */
-        usePrefixes: boolean;
-    }
-
-    /** DataSet is objects which holds all information about data. */
-
-    class DataSet {
-        /** Category field name in your dataProvider. */
-        categoryField: string;
-        /** Color of the data set. One of colors from AmStockChart.colors array will be used if not set. */
-        color: string;
-        /** Whether this data set is selected for comparing. If you change this property, you should call stockChart.validateData() method in order the changes to be applied. */
-        compared: boolean;
-        /** Data provider of the data set. */
-        dataProvider: any[];
-        /** Array of field mappings. Field mapping is an object with fromField and toField properties. fromField is a name of your value field in dataProvider. toField might be chosen freely, it will be used to set value/open/close/high/low fields for the StockGraph. Example: {fromField:"val1", toField:"value"}. */
-        fieldMappings: any[];
-        /** Specifies whether this data set should be visible in "compare to" list.
-            @default true
-        */
-        showInCompare: boolean;
-        /** Specifies whether this data set should be visible in "select" dropdown.
-            @default true
-         */
-        showInSelect: boolean;
-        /** Array of StockEvent objects. */
-        stockEvents: StockEvent[];
-        /** DataSet title. */
-        title: string;
-    }
-
-    class StockGraph extends AmGraph {
-        /** Specifies whether this graph will be compared if some data set is selected for comparing. */
-        comparable: boolean;
-        /** Specifies a field to be used to generate comparing graph. Note, this field is not the one used in your dataProvider, but toField from FieldMapping object. */
-        compareField: string;
-        /** Balloon color of comparing graph. */
-        compareGraphBalloonColor: string;
-        /** Balloon text of comparing graph. */
-        compareGraphBalloonText: string;
-        /** Bullet of comparing graph. Possible values are: "square", "round", "line", "triangleUp", "triangleDown", "dashedLine", "bubble". */
-        compareGraphBullet: string;
-        /** Bullet size of comparing graph. */
-        compareGraphBulletSize: number;
-        /** Corner radius of comparing graph (if type is "column"). */
-        compareGraphCornerRadiusTop: number;
-        /** Dash length of compare graph. */
-        compareGraphDashLength: number;
-        /** Fill alpha of comparing graph. */
-        compareGraphFillAlphas: number;
-        /** Fill color of comparing graph. */
-        compareGraphFillColors: string;
-        /** Opacity of comparing graph line. */
-        compareGraphLineAlpha: number;
-        /** Thickness of compare graph. */
-        compareGraphLineThickness: number;
-        /** Type of comparing graph. Possible values are: "line", "column", "step", "smoothedLine." line */
-        compareGraphType: string;
-        /** Specifies if compare graph is visible in legend.
-            @default true
-        */
-        compareGraphVisibleInLegend: boolean;
-        /** When data is grouped to periods, the graph must know which period value should be used. Possible values are: "Open", "Low", "High", "Close", "Average" and "Sum". Close */
-        periodValue: string;
-        /** Specifies whether data set color should be used as this graph's lineColor.
-            @default true
-        */
-        useDataSetColors: boolean;
-    }
-
-    /** StockEvent is object which holds information about event(bullet).Values from StockEventsSettings will be used if not set.Stock event bullet's size depends on it's graphs fontSize.When user rolls - over, clicks or rolls - out of the event bullet, AmStockChart dispatches events.*/
-    class StockEvent {
-        /** Opacity of bullet background.
-            @default 1
-        */
-        backgroundAlpha: number;
-        /** Color of bullet background. #DADADA */
-        backgroundColor: string;
-        /** Opacity of bullet border.
-            @default 1
-        */
-        borderAlpha: number;
-        /** Bullet border color. #888888 */
-        borderColor: string;
-        /** The color of the event text. #000000 */
-        color: string;
-        /** Date of an event. Must be Date object, not a string. */
-        date: Date;
-        /** graph on which event will be displayed. */
-        graph: StockGraph;
-        /** Roll-over background color. #CC0000 */
-        rollOverColor: string;
-        /** Specifies if the event should be displayed on category axis */
-        showOnAxis: boolean;
-        /** Letter which will be displayed on the event. Not all types can display letters. "text" type can display longer texts. */
-        text: string;
-        /** Type of bullet. Possible values are: "flag", "sign", "pin", "triangleUp", "triangleDown", "triangleLeft", "triangleRight", "text", "arrowUp", "arrowDown". sign */
-        type: string;
-        /** A URL to go to when user clicks the event. */
-        url: string;
-        /** target of url, "_blank" for example. */
-        urlTarget: string;
-    }
-
-    /** Creates a label on the chart which can be placed anywhere, multiple can be assigned. */
-    class Label {
-        /** @Default 'left' */
-        align: string;
-        /** @Default 1 */
-        alpha: number;
-        /** Specifies if label is bold or not. */
-        bold: boolean;
-        /** Color of a label */
-        color: string;
-        /** Unique id of a Label. You don't need to set it, unless you want to. */
-        id: string;
-        /** Rotation angle. */
-        rotation: number;
-        /** Text size */
-        size: number;
-        /** Text of a label */
-        text: string;
-        /** URL which will be access if user clicks on a label. */
-        url: string;
-        /** X position of a label. */
-        x: number | string;
-        /** y position of a label. */
-        y: number | string;
-    }
-    /** Common settings of legends. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of StockLegend class will be used. */
-    class LegendSettings {
-        /** Alignment of legend entries. Possible values are: "left", "right" and "center". */
-        align: string;
-        /** Specifies if each legend entry should take the same space as the longest legend entry. */
-        equalWidths: boolean;
-        /** Horizontal space between legend item and left/right border. */
-        horizontalGap: number;
-        /** The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph. */
-        labelText: string;
-        /** Space below the last row of the legend, in pixels. */
-        marginBottom: number;
-        /** Space above the first row of the legend, in pixels. */
-        marginTop: number;
-        /** Opacity of marker border. */
-        markerBorderAlpha: number;
-        /** Marker border color. */
-        markerBorderColor: string;
-        /** Thickness of the legend border. */
-        markerBorderThickness: number;
-        /** The color of the disabled marker (when the graph is hidden). */
-        markerDisabledColor: string;
-        /** Space between legend marker and legend text, in pixels. */
-        markerLabelGap: number;
-        /** Size of the legend marker (key). */
-        markerSize: number;
-        /** Shape of the legend marker (key). Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none". */
-        markerType: string;
-        /** Specifies whether legend entries should be placed in reversed order. */
-        reversedOrder: boolean;
-        /** Legend item text color on roll-over. */
-        rollOverColor: string;
-        /** When you roll-over the legend entry, all other graphs can reduce their opacity, so that the graph you rolled-over would be distinguished. This property specifies the opacity of the graphs. */
-        rollOverGraphAlpha: number;
-        /** Whether showing/hiding of graphs by clicking on the legend marker is enabled or not. */
-        switchable: boolean;
-        /** Legend switch color. */
-        switchColor: string;
-        /** Legend switch type (in case the legend is switchable). Possible values are: "x" and "v". */
-        switchType: string;
-        /** Specifies whether the legend text is clickable or not. Clicking on legend text can show/hide value balloons if they are enabled. */
-        textClickEnabled: boolean;
-        /** Specifies if legend labels should be use same color as corresponding markers. */
-        useMarkerColorForLabels: boolean;
-        /** The text which will be displayed in the value portion of the legend when graph is comparable and at least one dataSet is selected for comparing. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. */
-        valueTextComparing: string;
-        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. */
-        valueTextRegular: string;
-        /** Width of the value text. Increase this value if your values do not fit in the allocated space. */
-        valueWidth: number;
-        /** Vertical space between legend items, in pixels. */
-        verticalGap: number;
-
-    }
-
-    /** DataSetSelector is a tool for selecting data set's as main and for comparing with main data set. */
-    class DataSetSelector {
-        /** Text displayed in the "compare to" combobox (when position is "top" or "bottom"). Select... */
-        comboBoxSelectText: string;
-        /** Text displayed near "compare to" list. Compare to: */
-        compareText: string;
-        /** The maximum height of the Compare to field in pixels.
-            @default 150
-        */
-        listHeight: number;
-        /** Possible values: "right", "left", "top", "bottom". "top" and "bottom" positions has a limitation - only one data set can be selected for comparing. left */
-        position: string;
-        /** Text displayed near "Select" dropDown. Select: */
-        selectText: string;
-        /** Width of a Data set selector, when position is "left" or "right".
-            @default 180
-        */
-        width: number;
-    }
-
-    /** AmBalloon is the class which generates balloons (datatips). Balloon follows the mouse when you roll-over the pie slice/line bullet/column/etc, chart indicator of serial charts displays value balloons and category balloon. Balloon instance is created by the chart automatically and can be accessed via "balloon" property of AmChart. Chart shows/hides and sets position for every balloon automatically, so all you need to do is to change balloon appearance, if you want to.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            // get balloon intance
-            var balloon = chart.balloon;
-            // set properties
-            balloon.adjustBorderColor = true;
-            balloon.color = "#000000";
-            balloon.cornerRadius = 5;
-            balloon.fillColor = "#FFFFFF";
-    */
-    class AmBalloon {
-        /** If this is set to true, border color instead of background color will be changed when user rolls-over the slice, graph, etc. */
-        adjustBorderColor: boolean;
-        /** Balloon border opacity. Value range is 0 - 1.
-            @default 1
-        */
-        borderAlpha: number;
-        /** Balloon border color. #FFFFFF */
-        borderColor: string;
-        /** Balloon border thickness.
-            @default 2
-        */
-        borderThickness: number;
-        /** Color of text in the balloon. #FFFFFF */
-        color: string;
-        /** Balloon corner radius.
-            @default 6
-        */
-        cornerRadius: number;
-        /** Balloon background opacity.
-            @default 1
-        */
-        fillAlpha: number;
-        /** Balloon background color. Usually balloon background color is set by the chart. Only if "adjustBorderColor" is "true" this color will be used. #CC0000 */
-        fillColor: string;
-        /** Size of text in the balloon. Chart's fontSize is used by default. */
-        fontSize: string;
-        /** Horizontal padding of the balloon.
-            @default 8
-        3*/
-        horizontalPadding: number;
-        /** The width of the pointer (arrow) "root". Only used if cornerRadius is 0.
-            @default 10
-        */
-        pointerWidth: number;
-        /** If cornerRadius of a balloon is >0, showBullet is set to true for value balloons when ChartCursor is used. If you don't want the bullet near the balloon, set it to false: chart.balloon.showBullet = false */
-        showBullet: boolean;
-        /** Text alignment, possible values "left", "middle" and "right" middle */
-        textAlign: string;
-        /** Color of the text shadow. #000000 */
-        textShadowColor: string;
-        /** Vertical padding of the balloon.
-            @default 5
-        */
-        verticalPadding: number;
-        /** Hides balloon. */
-        hide(): void;
-        /** Defines a square within which the balloon should appear. Bounds are set by chart class, you don't need to call this method yourself. */
-        setBounds(left: number, top: number, right: number, bottom: number): void;
-        /** Sets coordinates the balloon should point to. */
-        setPosition(x: number, y: number): void;
-        /** Specifies the text which should be displayed. */
-        show(value: string): void;
-    }
-
-    /** CategoryAxesSettings settings set's settings common for all CategoryAxes of StockPanels. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of CategoryAxis class will be used. */
-    class CategoryAxesSettings {
-        /** Specifies whether number of gridCount is specified automatically, according to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Axis opacity. */
-        axisAlpha: number;
-        /** Axis color. */
-        axisColor: string;
-        /** Height of category axes. Set it to 0 if you set inside property to true.
-            @default 28
-        */
-        axisHeight: number;
-        /** Thickness of the axis. */
-        axisThickness: number;
-        /** Text color. */
-        color: string;
-        /** Length of a dash. */
-        dashLength: number;
-        /** Date formats of different periods. Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, WW - weeks, YYYY - years. Check this page for date formatting strings. */
-        dateFormats: any[];
-        /** If you want data points to be placed at equal intervals (omiting dates with no data), set equalSpacing to true. */
-        equalSpacing: boolean;
-        /** Fill opacity. Every second space between grid lines can be filled with fillColor. */
-        fillAlpha: number;
-        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. */
-        fillColor: string;
-        /** Text size. */
-        fontSize: string;
-        /** Opacity of grid lines. */
-        gridAlpha: number;
-        /** Color of grid lines. */
-        gridColor: string;
-        /** Approximate number of grid lines. You should set autoGridCount to false in order this property not to be ignored.
-            @default 10
-        */
-        gridCount: number;
-        /** Thickness of grid lines. */
-        gridThickness: number;
-        /** Periods to which data will be gruoped in case there are more data items in the selected period than specified in maxSeries property. ["ss", "10ss", "30ss", "mm", "10mm", "30mm", "hh", "DD", "WW", "MM", "YYYY"] */
-        groupToPeriods: any[];
-        /** Specifies whether values should be placed inside or outside of plot area. */
-        inside: boolean;
-        /** Rotation angle of a label. */
-        labelRotation: number;
-        /** Maximum series shown at a time. In case there are more data points in the selection than maxSeries, the chart will group data to longer periods, for example - you have 250 days in the selection, and maxSeries is 150 - the chart will group data to weeks.
-            @default 150
-        */
-        maxSeries: number;
-        /** Specifies the shortest period of your data. fff - millisecond, ss - second, mm - minute, hh - hour, DD - day, MM - month, YYYY - year. DD */
-        minPeriod: string;
-        /** top or "bottom". */
-        position: string;
-        /** Specifies whether the graph should start on axis or not. In case you display columns, it is recommended to set this to false. startOnAxis can be set to true only if equalSpacing is set to true. */
-        startOnAxis: boolean;
-        /** Tick length. */
-        tickLength: number;
-    }
-
-    /** ChartCursorSettings settings set's settings for chart cursor. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ChartCursor class will be used. */
-    class ChartCursorSettings {
-        /** Specifies if bullet for each graph will follow the cursor. */
-        bulletsEnabled: boolean;
-        /** Size of bullets, following the cursor. */
-        bulletSize: number;
-        /** Opacity of the category balloon. */
-        categoryBalloonAlpha: number;
-        /** Color of the category balloon. */
-        categoryBalloonColor: string;
-        /** Array of date format objects. Date format object must have "period" and "format" items. Available periods are: fff - millisecond, ss - second, mm - minute, hh - hour, DD - date, WW - week, MM - month, YYYY - year. [{period:"YYYY", format:"YYYY"}, {period:"MM", format:"MMM, YYYY"}, {period:"WW", format:"MMM DD, YYYY"}, {period:"DD", format:"MMM DD, YYYY"}, {period:"hh", format:"JJ:NN"}, {period:"mm", format:"JJ:NN"}, {period:"ss", format:"JJ:NN:SS"}, {period:"fff", format:"JJ:NN:SS"}] */
-        categoryBalloonDateFormats: any[];
-        /** Specifies whether category balloon is enabled. */
-        categoryBalloonEnabled: boolean;
-        /** Opacity of the cursor line. */
-        cursorAlpha: number;
-        /** Color of the cursor line. */
-        cursorColor: string;
-        /** Possible values: "start", "middle" and "mouse". */
-        cursorPosition: string;
-        /** Set this to "false" if you don't want chart cursor to appear in your charts.
-            @default true
-        */
-        enabled: boolean;
-        /** If this is set to true, the user will be able to pan the chart instead of zooming. */
-        pan: boolean;
-        /** Specifies whether value balloons are enabled. In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet. */
-        valueBalloonsEnabled: boolean;
-        /** Specifies if the user can zoom-in the chart. If pan is set to true, zoomable is switched to false automatically. */
-        zoomable: boolean;
-    }
-
-    /* ChartScrollbarSettings settings set's settings for chart scrollbar. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ChartScrollbar class will be used.*/
-    class ChartScrollbarSettings {
-        /** Specifies whether number of gridCount is specified automatically, according to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Background opacity. */
-        backgroundAlpha: number;
-        /** Background color of the scrollbar. */
-        backgroundColor: string;
-        /** Text color. */
-        color: string;
-        /** Set false if you don't need scrollbar.
-            @default true
-        */
-        enabled: boolean;
-        /** Font size. */
-        fontSize: string;
-        /** Specifies which graph will be displayed in the scrollbar. */
-        graph: AmGraph;
-        /** Graph fill opacity. */
-        graphFillAlpha: number;
-        /** Graph fill color. */
-        graphFillColor: string;
-        /** Graph line opacity. */
-        graphLineAlpha: number;
-        /** Graph line color. */
-        graphLineColor: string;
-        /** Type of chart scrollbar's graph. By default the graph type is the same as the original graph's type, however in case of candlestick or ohlc you might want to show line graph in the scrollbar. Possible values are: line, column, step, smoothedLine, candlestick, ohlc. */
-        graphType: string;
-        /** Grid opacity. */
-        gridAlpha: number;
-        /** Grid color. */
-        gridColor: string;
-        /** Grid count. You should set autoGridCount to false in order this property to work. */
-        gridCount: number;
-        /** Height of scrollbar, in pixels.
-            @default 40
-        */
-        height: number;
-        /** Specifies whether resize grips are hidden when mouse is away from the scrollbar. */
-        hideResizeGrips: boolean;
-        /** Duration of scrolling, when the user clicks on scrollbar's background, in seconds. */
-        scrollDuration: number;
-        /** Selected background opacity. */
-        selectedBackgroundAlpha: number;
-        /** Selected background color. */
-        selectedBackgroundColor: string;
-        /** Selected graph'sfill opacity. */
-        selectedGraphFillAlpha: number;
-        /** Selected graph'sfill color. */
-        selectedGraphFillColor: string;
-        /** Selected graph'sline opacity. */
-        selectedGraphLineAlpha: number;
-        /** Selected graph's line color. */
-        selectedGraphLineColor: string;
-        /** Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment when user releases mouse button. Usefull when working with large data sets.
-            @default true
-        */
-        updateOnReleaseOnly: boolean;
-    }
-
-    /** AmGraph class displays all types of graphs - line, column, step line, smoothed line, ohlc and candlestick.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var graph = new AmCharts.AmGraph();
-            graph.valueField = 'value';
-            graph.type = 'column';
-            graph.fillAlphas = 1;
-            chart.addGraph(graph);
-    */
-    class AmGraph {
-        /** Name of the alpha field in your dataProvider. */
-        alphaField: string;
-        /** Value balloon color. Will use graph or data item color if not set. */
-        balloonColor: string;
-        /**	If you set some function, the graph will call it and pass GraphDataItem and AmGraph object to it. This function should return a string which will be displayed in a balloon.  */
-        balloonFunction(graphDataItem: GraphDataItem, amGraph: AmGraph): string;
-        /** Balloon text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] [[value]] */
-        balloonText: string;
-        /** Specifies if the line graph should be placed behind column graphs */
-        behindColumns: boolean;
-        /** Type of the bullets. Possible values are: "none", "round", "square", "triangleUp", "triangleDown", "bubble", "custom". none */
-        bullet: string;
-        /** Opacity of bullets. Value range is 0 - 1.
-            @default 1
-        */
-        bulletAlpha: number;
-        /** Bullet border opacity.
-            @default 1
-        */
-        bulletBorderAlpha: number;
-        /** Bullet border color. Will use lineColor if not set.   */
-        bulletBorderColor: string;
-        /** Bullet border thickness.
-            @default 2
-        */
-        bulletBorderThickness: number;
-        /** Bullet color. Will use lineColor if not set. */
-        bulletColor: string;
-        /** Name of the bullet field in your dataProvider. */
-        bulletField: string;
-        /** Bullet offset. Distance from the actual data point to the bullet. Can be used to place custom bullets above the columns. */
-        bulletOffset: number;
-        /** Bullet size.
-            @default 8
-        */
-        bulletSize: number;
-        /** Name of the bullet size field in your dataProvider. */
-        bulletSizeField: string;
-        /** Name of the close field (used by candlesticks and ohlc) in your dataProvider. */
-        closeField: string;
-        /** Color of value labels. Will use chart's color if not set. */
-        color: string;
-        /** Name of the color field in your dataProvider. */
-        colorField: string;
-        /** Specifies whether to connect data points if data is missing. The default value is true.
-            @default true
-        */
-        connect: boolean;
-        /** Corner radius of column. It can be set both in pixels or in percents. The chart's depth and angle styles must be set to 0. The default value is 0. Note, cornerRadiusTop will be applied for all corners of the column, JavaScript charts do not have a possibility to set separate corner radius for top and bottom. As we want all the property names to be the same both on JS and Flex, we didn't change this too. */
-        cornerRadiusTop: number;
-        /** If bulletsEnabled of ChartCurosor is true, a bullet on each graph follows the cursor. You can set opacity of each graphs bullet. In case you want to disable these bullets for a certain graph, set opacity to 0.
-            @default 1
-        */
-        cursorBulletAlpha: number;
-        /** Path to the image of custom bullet. */
-        customBullet: string;
-        /** Name of the custom bullet field in your dataProvider. */
-        customBulletField: string;
-        /** Dash length. If you set it to a value greater than 0, the graph line will be dashed. */
-        dashLength: number;
-        /** Name of the description field in your dataProvider. */
-        descriptionField: string;
-        /** Opacity of fill. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used. */
-        fillAlphas: number;
-        /** Fill color. Will use lineColor if not set. */
-        fillColors: any;
-        /** Name of the fill colors field in your dataProvider. */
-        fillColorsField: string;
-        /** You can set another graph here and if fillAlpha is >0, the area from this graph to fillToGraph will be filled (instead of filling the area to the X axis). */
-        fillToGraph: AmGraph;
-        /** Size of value labels text. Will use chart's fontSize if not set. */
-        fontSize: string;
-        /** Orientation of the gradient fills (only for "column" graph type). Possible values are "vertical" and "horizontal". vertical */
-        gradientOrientation: string;
-        /** Specifies whether the graph is hidden. Do not use this to show/hide the graph, use hideGraph(graph) and showGraph(graph) methods instead. */
-        hidden: boolean;
-        /** If there are more data points than hideBulletsCount, the bullets will not be shown. 0 means the bullets will always be visible. */
-        hideBulletsCount: number;
-        /** Name of the high field (used by candlesticks and ohlc) in your dataProvider. */
-        highField: string;
-
-         /** Unique id of a graph. It is not required to set one, unless you want to use this graph for as your scrollbar's graph and need to indicate which graph should be used.*/
-        id?: string;
-
-        /** Whether to include this graph when calculating min and max value of the axis.
-            @default true
-        */
-        includeInMinMax: boolean;
-        /** Name of label color field in data provider. */
-        labelColorField: string;
-        /** Position of value label. Possible values are: "bottom", "top", "right", "left", "inside", "middle". Sometimes position is changed by the chart, depending on a graph type, rotation, etc. top */
-        labelPosition: string;
-        /** Value label text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]]. */
-        labelText: string;
-        /** Legend marker opacity. Will use lineAlpha if not set. Value range is 0 - 1. */
-        legendAlpha: number;
-        /** Legend marker color. Will use lineColor if not set. */
-        legendColor: string;
-        /** Legend value text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] You can also use custom fields from your dataProvider. If not set, uses Legend's valueText. */
-        legendValueText: string;
-        /** Opacity of the line (or column border). Value range is 0 - 1.
-            @default 1
-        */
-        lineAlpha: number;
-        /** Color of the line (or column border). If you do not set any, the color from [[AmCoordinateChart */
-        lineColor: string;
-        /** Name of the line color field (used by columns and candlesticks only) in your dataProvider. */
-        lineColorField: string;
-        /** Specifies thickness of the graph line (or column border).
-            @default 1
-        */
-        lineThickness: number;
-        /** Name of the low field (used by candlesticks and ohlc) in your dataProvider. */
-        lowField: string;
-        /** Legend marker type. You can set legend marker (key) type for individual graphs. Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble". */
-        markerType: string;
-        /** Specifies size of the bullet which value is the biggest (XY chart).
-            @default 50
-        */
-        maxBulletSize: number;
-        /** Specifies minimum size of the bullet (XY chart). */
-        minBulletSize: number;
-        /** If you use different colors for your negative values, a graph below zero line is filled with negativeColor. With this property you can define a different base value at which colors should be changed to negative colors. */
-        negativeBase: number;
-        /** Fill opacity of negative part of the graph. Will use fillAlphas if not set. */
-        negativeFillAlphas: number;
-        /** Fill color of negative part of the graph. Will use fillColors if not set. */
-        negativeFillColors: any; //String /Array;
-        /** Color of the line (or column) when the values are negative. In case the graph type is candlestick or ohlc, negativeLineColor is used when close value is less then open value. */
-        negativeLineColor: string;
-        /** Example: {precision:-1, decimalSeparator:'.', thousandsSeparator:','}. The graph uses this object's values to format the numbers. Uses chart's numberFormatter if not defined. */
-        numberFormatter: Object;
-        /** Name of the open field (used by floating columns, candlesticks and ohlc) in your dataProvider. */
-        openField: string;
-        /**Precision of values. Will use chart's precision if not set any.*/
-        precision: number;
-        /** Specifies where data points should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). This setting affects Serial chart only. Possible values are "start" and "middle". middle */
-        pointPosition: string;
-        /** If graph's type is column and labelText is set, graph hides labels which do not fit into the column's space. If you don't want these labels to be hidden, set this to true. */
-        showAllValueLabels: boolean;
-        /** Specifies whether the value balloon of this graph is shown when mouse is over data item or chart's indicator is over some series.
-            @default true
-        */
-        showBalloon: boolean;
-        /** Specifies graphs value at which cursor is showed. This is only important for candlestick and ohlc charts, also if column chart has "open" value. Possible values are: "open", "close", "high", "low". close */
-        showBalloonAt: string;
-        /** If the value axis of this graph has stack types like "regular" or "100%" You can exclude this graph from stacking.
-            @default true
-        */
-        stackable: boolean;
-        /** Graph title. */
-        title: string;
-        /** Type of the graph. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". XY and Radar charts can only display "line" type graphs. line */
-        type: string;
-        /** Name of the url field in your dataProvider. */
-        urlField: string;
-        /** Target to open URLs in, i.e. _blank, _top, etc. */
-        urlTarget: string;
-        /** Specifies which value axis the graph will use. Will use the first value axis if not set. */
-        valueAxis: ValueAxis;
-        /** Name of the value field in your dataProvider. */
-        valueField: string;
-        /** Specifies whether this graph should be shown in the Legend.
-            @default true
-        */
-        visibleInLegend: boolean;
-        /** XY chart only. A horizontal value axis object to attach graph to. */
-        xAxis: ValueAxis;
-        /** XY chart only. Name of the x field in your dataProvider. */
-        xField: string;
-        /** XY chart only. A vertical value axis object to attach graph to. */
-        yAxis: ValueAxis;
-        /** XY chart only. Name of the y field in your dataProvider. */
-        yField: string;
-    }
-
-    /** AxisBase is the base class for ValueAxis and CategoryAxis. It can not be instantiated explicitly. */
-    class AxisBase {
-        /** Specifies whether number of gridCount is specified automatically, acoarding to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Axis opacity. Value range is 0 - 1.
-            @default 1
-        */
-        axisAlpha: number;
-        /** Axis color.  #000000 */
-        axisColor: string;
-        /** Thickness of the axis.
-            @default 1
-        */
-        axisThickness: number;
-        /** Color of axis value labels. Will use chart's color if not set. */
-        color: string;
-        /** Length of a dash. 0 means line is not dashed. */
-        dashLength: number;
-        /** Fill opacity. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills.  */
-        fillAlpha: number;
-        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. #FFFFFF */
-        fillColor: string;
-        /** Size of value labels text. Will use chart's fontSize if not set. */
-        fontSize: string;
-        /** Opacity of grid lines. 0.2 */
-        gridAlpha: number;
-        /** Color of grid lines. #000000 */
-        gridColor: string;
-        /** Number of grid lines. In case this is value axis, or your categoryAxis parses dates, the number is approximate. The default value is 5. If you set autoGridCount to true, this property is ignored.
-            @default 5
-        */
-        gridCount: number;
-        /** Thickness of grid lines.
-            @default 1
-        */
-        gridThickness: number;
-        /** The array of guides belonging to this axis. */
-        guides: any[];
-        /** If autoMargins of a chart is set to true, but you want this axis not to be measured when calculating margin, set ignoreAxisWidth to true.  */
-        ignoreAxisWidth: boolean;
-        /** Specifies whether values should be placed inside or outside plot area. */
-        inside: boolean;
-        /** Frequency at which labels should be placed. Doesn't work for CategoryAxis if parseDates is set to true.
-            @default 1
-        */
-        labelFrequency: number;
-        /** Rotation angle of a label. Only horizontal axis' values can be rotated. If you set this for vertical axis, the setting will be ignored. */
-        labelRotation: number;
-        /** Specifies whether axis displays category axis' labels and value axis' values.
-            @default true
-        */
-        labelsEnabled: boolean;
-        /** The distance of the axis to the plot area, in pixels. Negative values can also be used.  */
-        offset: number;
-        /** Possible values are: "top", "bottom", "left", "right". If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom".  */
-        position: string;
-        /** Whether to show first axis label or not.
-            @default true
-        */
-        showFirstLabel: boolean;
-        /** Whether to show last axis label or not.
-            @default true
-        */
-        showLastLabel: boolean;
-        /** Length of the tick marks.
-            @default 5
-        */
-        tickLength: number;
-        /** Title of the axis. */
-        title: string;
-        /** Specifies if title should be bold or not.
-            @default true
-        */
-        titleBold: boolean;
-        /** Color of axis title. Will use text color of chart if not set any. */
-        titleColor: string;
-        /** Font size of axis title. Will use font size of chart plus two pixels if not set any. */
-        titlefontSize: string;
-
-        /** Adds guide to the axis. */
-        addGuide(guide: Guide): void;
-        /** Removes guide from the axis. */
-        removeGuide(guide: Guide): void;
-    }
-
-    /** ValueAxis is the class which displays value axis for the chart. The chart can have any number of value axes. For Serial chart one value axis is created automatically. For XY Chart two value axes (horizontal and vertical) are created automatically. */
-    class ValueAxis extends AxisBase {
-        /** Radar chart only. Specifies distance from axis to the axis title (category)  10 */
-        axisTitleOffset: number;
-        /** Read-only. Coordinate of the base value. */
-        baseCoord: number;
-        /** Specifies base value of the axis. */
-        baseValue: number;
-        /** If your values represents time units, and you want value axis labels to be formatted as duration, you have to set the duration unit. Possible values are: "ss", "mm", "hh" and "DD". */
-        duration: string;
-        /** If duration property is set, you can specify what string should be displayed next to day, hour, minute and second. {DD:"d. ", hh:":", mm:":",ss:""} */
-        durationUnits: Object;
-        /** Radar chart only. Possible values are: "polygons" and "circles". Set "circles" for polar charts. polygons */
-        gridType: string;
-        /** Unique id of value axis. It is not required to set it, unless you need to tell the graph which exact value axis it should use. */
-        id: string;
-        /** Specifies whether guide values should be included when calculating min and max of the axis. */
-        includeGuidesInMinMax: boolean;
-        /** If true, the axis will include hidden graphs when calculating min and max values. */
-        includeHidden: boolean;
-        /** Specifies whether values on axis can only be integers or both integers and doubles. */
-        integersOnly: boolean;
-        /** You can use this function to format Value axis labels. This function is called and these parameters are passed: labelFunction(value, valueText, valueAxis);
-Where value is numeric value, valueText is formatted string and valueAxis is a reference to valueAxis object.
-
-If axis type is "date", labelFunction will pass different arguments:
-labelFunction(valueText, date, valueAxis)
-
-Your function should return string.*/
-        labelFunction(value: number, valueText: string, valueAxis: ValueAxis): string;
-        labelFunction(valueText: string, data: Date, valueAxis: ValueAxis): string;
-        /** Specifies if this value axis' scale should be logarithmic. */
-        logarithmic: boolean;
-        /** Read-only. Maximum value of the axis. */
-        max: number;
-        /** If you don't want max value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
-        maximum: number;
-        /** If your value axis is date-based, you can specify maximum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
-        maximumData: Date;
-        /** Read-only. Minimum value of the axis. */
-        min: number;
-        /** If you don't want min value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
-        minimum: number;
-        /** If your value axis is date-based, you can specify minimum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
-        minimumDate: Date;
-        /** If set value axis scale (min and max numbers) will be multiplied by it. I.e. if set to 1.2 the scope of values will increase by 20%. */
-        minMaxMultiplier: number;
-        /** Works with radar charts only. If you set it to “middle�, labels and data points will be placed in the middle between axes. */
-        pointPosition: string;
-        /** Possible values are: "top", "bottom", "left", "right". If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom". */
-        position: string;
-        /** Precision (number of decimals) of values. */
-        precision: number;
-        /** Radar chart only. Specifies if categories (axes' titles) should be displayed near axes)
-            @default true
-        */
-        radarCategoriesEnabled: boolean;
-        /** pecifies if graphs's values should be recalculated to percents. */
-        recalculateToPercents: boolean;
-        /** Specifies if value axis should be reversed (smaller values on top).  */
-        reversed: boolean;
-        /** Stacking mode of the axis. Possible values are: "none", "regular", "100%", "3d". none Note, only graphs of one type will be stacked. */
-        stackType: string;
-        /** Read-only. Value difference between two grid lines. */
-        step: number;
-        /** If you set minimum and maximum for your axis, chart adjusts them so that grid would start and end on the beginning and end of plot area and grid would be at equal intervals. If you set strictMinMax to true, the chart will not adjust minimum and maximum of value axis. */
-        strictMinMax: boolean;
-        /** In case you synchronize one value axis with another, you need to set the synchronization multiplier. Use synchronizeWithAxis method to set with which axis it should be synced. */
-        synchronizationMultiplier: number;
-        /** One value axis can be synchronized with another value axis. You can use both reference to your axis or id of the axis here. You should set synchronizationMultiplyer in order for this to work. */
-        synchronizeWith: ValueAxis;
-        /** If this value axis is stacked and has columns, setting valueAxis.totalText = "[[total]]" will make it to display total value above the most-top column. */
-        totalText: string;
-        /** Color of total text. */
-        totalTextColor: string;
-        /** Distance from data point to total text. */
-        totalTextOffset: number;
-        /** This allows you to have logarithmic value axis and have zero values in the data. You must set it to >0 value in order to work. */
-        treatZeroAs: number;
-        /** Type of value axis. If your values in data provider are dates and you want this axis to show dates instead of numbers, set it to "date". */
-        type: string;
-        /** Unit which will be added to the value label. */
-        unit: string;
-        /** Position of the unit. Possible values are "left" and "right". right */
-        unitPosition: string;
-        /** If true, prefixes will be used for big and small numbers. You can set arrays of prefixes directly to the chart object via prefixesOfSmallNumbers and prefixesOfBigNumbers. */
-        usePrefixes: boolean;
-        /** If true, values will always be formatted using scientific notation (5e+8, 5e-8...) Otherwise only values bigger then 1e+21 and smaller then 1e-7 will be displayed in scientific notation. */
-        useScientificNotation: boolean;
-
-        /** Adds guide to the axis. */
-        addGuide(guide: Guide): void;
-        /** Adds event listener to the object.  type - string like 'axisChanged' (should be listed in 'events' section of this class or classes which extend this class). handler - function which is called when event happens */
-        addListener(type: string, handler: any): void;
-        /** Number, - value of coordinate. Returns value of the coordinate.  coordinate - y or x coordinate, in pixels. */
-        coordinateToValue(coordinate: number): void;
-        /** Number - coordinate Returns coordinate of the value in pixels. value - Number */
-        getCoordinate(value: number): void;
-        /** Removes guide from the axis.*/
-        removeGuide(guide: Guide): void;
-        /** Removes event listener from the object. */
-        removeListener(obj: any, type: string, handler: any): void;
-
-        /** One value axis can be synchronized with another value axis. You should set synchronizationMultiplyer in order for this to work. */
-        synchronizeWithAxis(axis: ValueAxis): void;
-        /** XY Chart only. Zooms-in the axis to the provided values. */
-        zoomToValues(startValue: number, endValue: number): void;
-
-        /** Adds event listener of the type "axisZoomed" to the object.
-            @param type Always "axisZoomed".
-            @param handler XY chart only. Dispatched when axis is zoomed.*/
-        addListener(type: string, handler: (e: {
-            /** Always "axisZoomed". */
-            type: string; startValue: Date; endValue: Date; chart: AmChart;
-        }) => void): void;
-        /** Adds event listener of the type "logarithmicAxisFailed" to the object.
-            @param type Always "logarithmicAxisFailed".
-            @param handler Dispatched when valueAxis is logarithmic and values equal or less then zero were found in data.*/
-        addListener(type: string, handler: (e: {
-            /** Always "logarithmicAxisFailed". */
-            type: string; chart: AmChart;
-        }) => void): void;
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any): void;
-    }
-
-    class Title {
-        /** @default 1 */
-        alpha: number;
-        /** Specifies if the tile is bold or not.
-            @default false*/
-        bold: boolean;
-        /** Text color of a title. */
-        color: string;
-        /** Unique id of a Title. You don't need to set it, unless you want to. */
-        id: string;
-        /** Text size */
-        size: number;
-        /** Text of a label */
-        text: string;
-    }
-    class ExportSettings {
-        enabled: boolean;
-        libs: Object;
-        menu: Object;
-        config: any;
-        capture(config: any, callback: () => void): any;
-        toJPG(config: any, callback: (config:any) => void): any;
-    }
+    function addInitHandler(handler: () => {}, types?: string[]): any;
+
+    class AmAngularGauge extends _AmAngularGauge { }
+    class AmBalloon extends _AmBalloon { }
+    class AmChart extends _AmChart { }
+    class AmCoordinateChart extends _AmCoordinateChart { }
+    // class AmFunnelChart extends _AmFunnelChart { }
+    // class AmGanttChart extends _AmGanttChart { }
+    class AmGraph extends _AmGraph { }
+    class AmLegend extends _AmLegend { }
+    class AmPieChart extends _AmPieChart { }
+    class AmRadarChart extends _AmRadarChart { }
+    class AmRectangularChart extends _AmRectangularChart { }
+    class AmSerialChart extends _AmSerialChart { }
+    // class AmSlicedChart extends _AmSlicedChart { }
+    class AmXYChart extends _AmXYChart { }
+    class AxisBase extends _AxisBase { }
+    class CategoryAxis extends _CategoryAxis { }
+    class ChartCursor extends _ChartCursor { }
+    class ChartScrollbar extends _ChartScrollbar { }
+    class GaugeArrow extends _GaugeArrow { }
+    class GaugeAxis extends _GaugeAxis { }
+    class GaugeBand extends _GaugeBand { }
+    class GraphDataItem extends _GraphDataItem { }
+    class Guide extends _Guide { }
+    // class Image extends _Image { }
+    class Label extends _Label { }
+    class SerialDataItem extends _SerialDataItem { }
+    class Slice extends _Slice { }
+    class Title extends _Title { }
+    class TrendLine extends _TrendLine { }
+    class ValueAxis extends _ValueAxis { }
 }
diff --git a/types/amcharts/tsconfig.json b/types/amcharts/tsconfig.json
index fa1c069762..1d07459b73 100644
--- a/types/amcharts/tsconfig.json
+++ b/types/amcharts/tsconfig.json
@@ -5,9 +5,9 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": false,
+        "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -18,6 +18,50 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "AmAngularGauge.d.ts",
+        "AmBalloon.d.ts",
+        "AmChart.d.ts",
+        "AmCoordinateChart.d.ts",
+        "AmGraph.d.ts",
+        "AmLegend.d.ts",
+        "AmPieChart.d.ts",
+        "AmRadarChart.d.ts",
+        "AmRectangularChart.d.ts",
+        "AmSerialChart.d.ts",
+        "AmStockChart.d.ts",
+        "AmXYChart.d.ts",
+        "AreasSettings.d.ts",
+        "AxisBase.d.ts",
+        "CategoryAxesSettings.d.ts",
+        "CategoryAxis.d.ts",
+        "ChartCursor.d.ts",
+        "ChartCursorSettings.d.ts",
+        "ChartScrollbar.d.ts",
+        "ChartScrollbarSettings.d.ts",
+        "DataSet.d.ts",
+        "DataSetSelector.d.ts",
+        "ExportSettings.d.ts",
+        "GaugeArrow.d.ts",
+        "GaugeAxis.d.ts",
+        "GaugeBand.d.ts",
+        "GraphDataItem.d.ts",
+        "Guide.d.ts",
+        "ImagesSettings.d.ts",
+        "Label.d.ts",
+        "LegendSettings.d.ts",
+        "PanelSettings.d.ts",
+        "PeriodSelector.d.ts",
+        "SerialDataItem.d.ts",
+        "Slice.d.ts",
+        "StockEvent.d.ts",
+        "StockGraph.d.ts",
+        "StockLegend.d.ts",
+        "StockPanel.d.ts",
+        "Title.d.ts",
+        "TrendLine.d.ts",
+        "ValueAxesSettings.d.ts",
+        "ValueAxis.d.ts",
+        "amcharts-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/amcharts/tslint.json b/types/amcharts/tslint.json
new file mode 100644
index 0000000000..96b5837fb6
--- /dev/null
+++ b/types/amcharts/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": [true, 120]
+    }
+}
\ No newline at end of file
diff --git a/types/amplitude-js/tslint.json b/types/amplitude-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/amplitude-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/amqp-rpc/tslint.json b/types/amqp-rpc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/amqp-rpc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/amqplib/callback_api.d.ts b/types/amqplib/callback_api.d.ts
index 60ff8cf622..9fca3972e4 100644
--- a/types/amqplib/callback_api.d.ts
+++ b/types/amqplib/callback_api.d.ts
@@ -54,6 +54,19 @@ export interface ConfirmChannel extends Channel {
     waitForConfirms(callback?: (err: any) => void): void;
 }
 
+export const credentials: {
+    external(): {
+      mechanism: string;
+      response(): Buffer;
+    };
+    plain(username: string, password: string): {
+      mechanism: string;
+      response(): Buffer;
+      username: string;
+      password: string;
+    };
+};
+
 export function connect(callback: (err: any, connection: Connection) => void): void;
 export function connect(url: string, callback: (err: any, connection: Connection) => void): void;
 export function connect(url: string, socketOptions: any, callback: (err: any, connection: Connection) => void): void;
diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 91060d23b0..25b0ef04e9 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -63,4 +63,17 @@ export interface ConfirmChannel extends Channel {
     waitForConfirms(): Promise<void>;
 }
 
-export function connect(url: string, socketOptions?: any): Promise<Connection>;
+export const credentials: {
+    external(): {
+      mechanism: string;
+      response(): Buffer;
+    };
+    plain(username: string, password: string): {
+      mechanism: string;
+      response(): Buffer;
+      username: string;
+      password: string;
+    };
+};
+
+export function connect(url: string | Options.Connect, socketOptions?: any): Promise<Connection>;
diff --git a/types/amqplib/properties.d.ts b/types/amqplib/properties.d.ts
index 12514d7810..af90909d8c 100644
--- a/types/amqplib/properties.d.ts
+++ b/types/amqplib/properties.d.ts
@@ -21,6 +21,64 @@ export namespace Replies {
 }
 
 export namespace Options {
+    interface Connect {
+        /**
+         * The to be used protocol
+         *
+         * Default value: 'amqp'
+         */
+        protocol?: string;
+        /**
+         * Hostname used for connecting to the server.
+         *
+         * Default value: 'localhost'
+         */
+        hostname?: string;
+        /**
+         * Port used for connecting to the server.
+         *
+         * Default value: 5672
+         */
+        port?: number;
+        /**
+         * Username used for authenticating against the server.
+         *
+         * Default value: 'guest'
+         */
+        username?: string;
+        /**
+         * Password used for authenticating against the server.
+         *
+         * Default value: 'guest'
+         */
+        password?: string;
+        /**
+         * The desired locale for error messages. RabbitMQ only ever uses en_US
+         *
+         * Default value: 'en_US'
+         */
+        locale?: string;
+        /**
+         * The size in bytes of the maximum frame allowed over the connection. 0 means
+         * no limit (but since frames have a size field which is an unsigned 32 bit integer, it’s perforce 2^32 - 1).
+         *
+         * Default value: 0x1000 (4kb) - That's the allowed minimum, it will fit many purposes
+         */
+        frameMax?: number;
+        /**
+         * The period of the connection heartbeat in seconds.
+         *
+         * Default value: 0
+         */
+        heartbeat?: number;
+        /**
+         * What VHost shall be used.
+         *
+         * Default value: '/'
+         */
+        vhost?: string;
+    }
+
     interface AssertQueue {
         exclusive?: boolean;
         durable?: boolean;
@@ -85,4 +143,4 @@ export interface Message {
     content: Buffer;
     fields: any;
     properties: any;
-}
\ No newline at end of file
+}
diff --git a/types/analytics-node/tslint.json b/types/analytics-node/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/analytics-node/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-agility/tslint.json b/types/angular-agility/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-agility/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-animate/index.d.ts b/types/angular-animate/index.d.ts
index 0ce96a2f2f..6a51b368c8 100644
--- a/types/angular-animate/index.d.ts
+++ b/types/angular-animate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://angularjs.org
 // Definitions 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>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare var _: string;
 export = _;
diff --git a/types/angular-animate/tslint.json b/types/angular-animate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-animate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-block-ui/index.d.ts b/types/angular-block-ui/index.d.ts
index 47ba9902b9..f415d386e9 100644
--- a/types/angular-block-ui/index.d.ts
+++ b/types/angular-block-ui/index.d.ts
@@ -67,7 +67,7 @@ declare module 'angular' {
              * If the filter function returns a string it will be passed as the message
              * argument to the start method of the service.
              *
-             * @param {angular.IRequestConfig} config - the Angular request config object.
+             * @param config the Angular request config object.
              *
              */
             requestFilter?(config: IRequestConfig): (string | boolean);
@@ -123,7 +123,7 @@ declare module 'angular' {
              *
              * This behaviour can be modified in the configuration.
              *
-             * @param {string|IBlockUIConfig} messageOrOptions -
+             * @param messageOrOptions
              *     Either supply the message (string) to be show in the
              *     overlay or specify an IBlockUIConfig object that will be
              *     merged/extended into the block ui instance state.
@@ -156,7 +156,7 @@ declare module 'angular' {
              * Allows the message shown in the overlay to be updated
              * while to block is active.
              *
-             * @param {string} message - The message to show in the overlay.
+             * @param message The message to show in the overlay.
              */
             message(message: string): void;
 
diff --git a/types/angular-bootstrap-calendar/package.json b/types/angular-bootstrap-calendar/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/angular-bootstrap-calendar/package.json
+++ b/types/angular-bootstrap-calendar/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-bootstrap-calendar/tslint.json b/types/angular-bootstrap-calendar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-bootstrap-calendar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-bootstrap-lightbox/tslint.json b/types/angular-bootstrap-lightbox/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-bootstrap-lightbox/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-breadcrumb/tslint.json b/types/angular-breadcrumb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-breadcrumb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-clipboard/tslint.json b/types/angular-clipboard/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-clipboard/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-cookie/tslint.json b/types/angular-cookie/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-cookie/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-cookies/tslint.json b/types/angular-cookies/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-cookies/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-deferred-bootstrap/tslint.json b/types/angular-deferred-bootstrap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-deferred-bootstrap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-dialog-service/tslint.json b/types/angular-dialog-service/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-dialog-service/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-dynamic-locale/angular-dynamic-locale-tests.ts b/types/angular-dynamic-locale/angular-dynamic-locale-tests.ts
index 1e30aafd94..962219d465 100644
--- a/types/angular-dynamic-locale/angular-dynamic-locale-tests.ts
+++ b/types/angular-dynamic-locale/angular-dynamic-locale-tests.ts
@@ -5,6 +5,7 @@ app.config((localStorageServiceProvider: angular.dynamicLocale.tmhDynamicLocaleP
 	localStorageServiceProvider
 		.localeLocationPattern("app/config/locales/")
 		.useCookieStorage();
+    localStorageServiceProvider.defaultLocale('en');
 });
 
 class LocaleTestController {
diff --git a/types/angular-dynamic-locale/index.d.ts b/types/angular-dynamic-locale/index.d.ts
index 1aa14d4c3b..e68c037fa3 100644
--- a/types/angular-dynamic-locale/index.d.ts
+++ b/types/angular-dynamic-locale/index.d.ts
@@ -17,6 +17,7 @@ declare module 'angular' {
         }
 
         interface tmhDynamicLocaleProvider extends angular.IServiceProvider {
+            defaultLocale(locale: string): void;
             localeLocationPattern(location: string): tmhDynamicLocaleProvider;
             localeLocationPattern(): string;
             storageKey(storageKey: string): void;
diff --git a/types/angular-dynamic-locale/tslint.json b/types/angular-dynamic-locale/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-dynamic-locale/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-environment/tslint.json b/types/angular-environment/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-environment/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-es/tslint.json b/types/angular-es/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-es/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-feature-flags/tslint.json b/types/angular-feature-flags/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-feature-flags/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-file-saver/tslint.json b/types/angular-file-saver/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-file-saver/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-file-upload/index.d.ts b/types/angular-file-upload/index.d.ts
index ee1982123a..edac0ce2ad 100644
--- a/types/angular-file-upload/index.d.ts
+++ b/types/angular-file-upload/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nervgh/angular-file-upload
 // Definitions by: Cyril Gandon <https://github.com/cyrilgandon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
diff --git a/types/angular-formly/tslint.json b/types/angular-formly/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-formly/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-fullscreen/tslint.json b/types/angular-fullscreen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-fullscreen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-gettext/tslint.json b/types/angular-gettext/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-gettext/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-google-analytics/tslint.json b/types/angular-google-analytics/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-google-analytics/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-growl-v2/tslint.json b/types/angular-growl-v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-growl-v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-hotkeys/README.md b/types/angular-hotkeys/README.md
deleted file mode 100644
index a31ed8a936..0000000000
--- a/types/angular-hotkeys/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-## What is it?
-
-This is a typescript interface to be used with [angular-hotkeys](https://github.com/chieffancypants/angular-hotkeys/).
-
-## What are declaration files?
-
-See the [TypeScript handbook](http://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
-
-
-## How do I get them?
-
-### npm
-
-This is the preferred method. This is only available for TypeScript 2.0+ users. For these typings:
-
-```sh
-npm install --save-dev @types/angular-hotkeys
-```
-
-The types should then be automatically included by the compiler.
-See more in the [handbook](http://www.typescriptlang.org/docs/handbook/declaration-files/consumption.html).
-
-
-### Other methods
-
-These can be used by TypeScript 1.0.
-
-* [Typings](https://github.com/typings/typings)
-* ~~[NuGet](http://nuget.org/Tpackages?q=DefinitelyTyped)~~ (use preferred alternatives, nuget DT type publishing has been turned off)
-* Manually download from the `master` branch of this repository
-
-You may need to add manual [references](http://www.typescriptlang.org/docs/handbook/triple-slash-directives.html).
-
-## How to use
-
-After installing a package you can import the definition file and begin using it as so:
-
-```ts
-
-import * as hotkeys from '../../node_modules/@types/angular-hotkeys'
-
-class FooController  {
-    static $inject = [
-        'hotkeys'
-    ];
-
-    constructor(
-        private hotkeys: ng.hotkeys.HotkeysProvider
-    ) { }
-}
-
-```
-
-for a detailed explanation of the behavior of angular-hotkeys please refer to [its documentation](https://github.com/chieffancypants/angular-hotkeys/)
-
diff --git a/types/angular-hotkeys/angular-hotkeys-tests.ts b/types/angular-hotkeys/angular-hotkeys-tests.ts
index c0bd9b974d..503080e9d8 100644
--- a/types/angular-hotkeys/angular-hotkeys-tests.ts
+++ b/types/angular-hotkeys/angular-hotkeys-tests.ts
@@ -1,30 +1,67 @@
-var scope: ng.IScope;
-var hotkeyProvider: ng.hotkeys.HotkeysProvider;
-var hotkeyObj: ng.hotkeys.Hotkey;
+import { HotkeysProvider, Hotkey } from 'angular-hotkeys';
+import { module } from 'angular';
 
-hotkeyProvider.add("mod+s", "saves a file", (event: Event, hotkey: ng.hotkeys.Hotkey) => {} );
-hotkeyProvider.add(["mod+s"], "saves a file", (event: Event, hotkey: ng.hotkeys.Hotkey) => {} );
-hotkeyProvider.add(hotkeyObj);
-hotkeyProvider.bindTo(scope);
-hotkeyProvider.del("mod+s");
-hotkeyProvider.del(["mod+s"]);
-hotkeyProvider.get("mod+s");
-hotkeyProvider.get(["mod+s"]);
-hotkeyProvider.toggleCheatSheet();
-
-hotkeyProvider.add(hotkeyObj.combo, hotkeyObj.description ,hotkeyObj.callback);
-
-hotkeyProvider.bindTo(scope)
-	.add(hotkeyObj)
-	.add(hotkeyObj)
-	.add({
-		combo: 'w',
-		description: 'blah blah',
-		callback: function() {}
-	})
-	.add({
-		combo: ['w', 'mod+w'],
-		description: 'blah blah',
-		callback: function() {}
+module('myApp', ['cfp.hotkeys'])
+	.config((hotkeysProvider: HotkeysProvider) => {
+		hotkeysProvider.includeCheatSheet = false;
+		const somehotKeyObj: Hotkey = {
+			combo: '',
+			callback: () => { }
+		};
 	});
 
+function someInjectionService(
+	scope: ng.IScope,
+	hotkeyProvider: ng.hotkeys.HotkeysProvider,
+	hotkeyObj: ng.hotkeys.Hotkey
+) {
+	hotkeyProvider.add("mod+s", "saves a file", (event: Event, hotkey: ng.hotkeys.Hotkey) => { });
+	hotkeyProvider.add(["mod+s"], "saves a file", (event: Event, hotkey: ng.hotkeys.Hotkey) => { });
+	hotkeyProvider.add(hotkeyObj);
+	hotkeyProvider.bindTo(scope);
+	hotkeyProvider.del("mod+s");
+	hotkeyProvider.del(["mod+s"]);
+	hotkeyProvider.get("mod+s");
+	hotkeyProvider.get(["mod+s"]);
+	hotkeyProvider.toggleCheatSheet();
+
+	hotkeyProvider.add(hotkeyObj.combo, hotkeyObj.description, hotkeyObj.callback);
+
+	hotkeyProvider.bindTo(scope)
+		.add(hotkeyObj)
+		.add(hotkeyObj)
+		.add({
+			combo: 'w',
+			description: 'blah blah',
+			callback: () => { }
+		})
+		.add({
+			combo: ['w', 'mod+w'],
+			description: 'blah blah',
+			callback: () => { }
+		});
+
+	hotkeyProvider.add({
+		combo: 'ctrl+w',
+		description: 'Description goes here',
+		callback: (event, hotkey) => {
+			event.preventDefault();
+		}
+	});
+
+	hotkeyProvider.add({
+		combo: 'ctrl+x',
+		callback: (event, hotkey) => {
+			//
+		}
+	});
+
+	hotkeyProvider.add({
+		combo: 'ctrl+w',
+		description: 'Description goes here',
+		allowIn: ['INPUT', 'SELECT', 'TEXTAREA'],
+		callback(event, hotkey) {
+			event.preventDefault();
+		}
+	});
+}
diff --git a/types/angular-hotkeys/index.d.ts b/types/angular-hotkeys/index.d.ts
index 0f0be68d8e..360e2cefbe 100644
--- a/types/angular-hotkeys/index.d.ts
+++ b/types/angular-hotkeys/index.d.ts
@@ -1,12 +1,10 @@
-// Type definitions for angular-hotkeys
+// Type definitions for angular-hotkeys 1.7
 // Project: https://github.com/chieffancypants/angular-hotkeys
-// Definitions by: Jason Zhao <https://github.com/jlz27>, Stefan Steinhart <https://github.com/reppners>
+// Definitions by: Jason Zhao <https://github.com/jlz27>
+//                 Stefan Steinhart <https://github.com/reppners>
+//                 Cyril Gandon <https://github.com/cyrilgandon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
-//readme written by David Valentine <https://github.com/dvalenti314>
-
-
-/// <reference types="angular" />
 
 import * as ng from 'angular';
 
@@ -15,46 +13,123 @@ export type HotkeysProviderChained = ng.hotkeys.HotkeysProviderChained;
 export type Hotkey = ng.hotkeys.Hotkey;
 
 declare module 'angular' {
-    export namespace hotkeys {
-
+    namespace hotkeys {
         interface HotkeysProvider {
-            template: string;
-            templateTitle: string;
+            /**
+             * Configurable setting to disable the cheatsheet entirely.
+             * @default true
+             */
             includeCheatSheet: boolean;
+            /**
+             * Configurable setting to disable ngRoute hooks.
+             */
+            useNgRoute: boolean;
+            /**
+             * Configurable setting for the cheat sheet title
+             * @default 'Keyboard Shortcuts'
+             */
+            templateTitle: string;
+            /**
+             * Configurable settings for the cheat sheet header in HTML.
+             * This overrides the normal title if specified.
+             * @default null
+             */
+            templateHeader: string | null;
+            /**
+             * Configurable settings for the cheat sheet footer in HTML.
+             * @default null
+             */
+            templateFooter: string | null;
+            /**
+             * Cheat sheet template in the event you want to totally customize it.
+             */
+            template: string;
+            /**
+             * Configurable setting for the cheat sheet hotkey.
+             * @default '?'
+             */
             cheatSheetHotkey: string;
+            /**
+             * Configurable setting for the cheat sheet description.
+             * @default 'Show / hide this help menu'
+             */
             cheatSheetDescription: string;
 
-            add(combo: string | string[], callback: (event: Event, hotkey?: Hotkey) => void, action?: string, allowIn?: Array<string>, persistent?: boolean): ng.hotkeys.Hotkey;
+            /**
+             * Creates a new Hotkey and creates the Mousetrap binding.
+             */
+            add(combo: string | string[], description?: string, callback?: (event: Event, hotkey: Hotkey) => void, action?: string, allowIn?: string[], persistent?: boolean): Hotkey;
 
-            add(combo: string | string[], description: string, callback: (event: Event, hotkey?: Hotkey) => void, action?: string, allowIn?: Array<string>, persistent?: boolean): ng.hotkeys.Hotkey;
+            /**
+             * Creates a new Hotkey and creates the Mousetrap binding.
+             */
+            add(hotkeyObj: Hotkey): Hotkey;
 
-            add(hotkeyObj: ng.hotkeys.Hotkey): ng.hotkeys.Hotkey;
+            /**
+             * Binds the hotkey to a particular scope.
+             * Useful if the scope is destroyed, we can automatically destroy the hotkey binding.
+             * @param scope The scope to bind to
+             */
+            bindTo(scope: IScope): HotkeysProviderChained;
 
-            bindTo(scope: ng.IScope): ng.hotkeys.HotkeysProviderChained;
+            /**
+             * Removes and unbinds a hotkey
+             * @param combo The keyboard combo (shortcut) or the HotKey object
+             */
+            del(combo: string | string[] | Hotkey): void;
 
-            del(combo: string | string[]): void;
-
-            del(hotkeyObj: ng.hotkeys.Hotkey): void;
-
-            get(combo: string | string[]): ng.hotkeys.Hotkey;
+            /**
+             * Returns the Hotkey object
+             * @param combo The keyboard combo (shortcut)
+             */
+            get(combo: string | string[]): Hotkey;
 
+            /**
+             * Toggles the help menu element's visiblity
+             */
             toggleCheatSheet(): void;
-
+            /**
+             * Purges all non-persistent hotkeys (such as those defined in routes)
+             *
+             * Without this, the same hotkey would get recreated everytime
+             * the route is accessed.
+             */
             purgeHotkeys(): void;
         }
 
         interface HotkeysProviderChained {
-            add(combo: string | string[], description: string, callback: (event: Event, hotkeys: ng.hotkeys.Hotkey) => void): HotkeysProviderChained;
+            add(combo: string | string[], description: string, callback: (event: Event, hotkeys: Hotkey) => void): HotkeysProviderChained;
 
-            add(hotkeyObj: ng.hotkeys.Hotkey): HotkeysProviderChained;
+            add(hotkeyObj: Hotkey): HotkeysProviderChained;
         }
 
         interface Hotkey {
+            /**
+             * They keyboard combo (shortcut) you want to bind to.
+             */
             combo: string | string[];
+            /**
+             * The description for what the combo does and is only used for the Cheat Sheet.
+             * If it is not supplied, it will not show up, and in effect, allows you to have unlisted hotkeys.
+             */
             description?: string;
-            callback: (event: Event, hotkey: ng.hotkeys.Hotkey) => void;
+            /**
+             * The function to execute when the key(s) are pressed. Passes along two arguments, event and hotkey
+             */
+            callback(event: Event, hotkey: Hotkey): void;
+            /**
+             * The type of event to listen for, such as keypress, keydown or keyup.
+             * Usage of this parameter is discouraged as the underlying library will pick the most suitable option automatically.
+             * This should only be necessary in advanced situations.
+             */
             action?: string;
-            allowIn?: Array<string>;
+            /**
+             * An array of tag names to allow this combo in ('INPUT', 'SELECT', and/or 'TEXTAREA')
+             */
+            allowIn?: Array<'INPUT' | 'SELECT' | 'TEXTAREA'>;
+            /**
+             * Whether the hotkey persists navigation events
+             */
             persistent?: boolean;
         }
     }
diff --git a/types/angular-hotkeys/tsconfig.json b/types/angular-hotkeys/tsconfig.json
index f277241888..acb11ff247 100644
--- a/types/angular-hotkeys/tsconfig.json
+++ b/types/angular-hotkeys/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "angular-hotkeys-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/bignumber.js/tslint.json b/types/angular-hotkeys/tslint.json
similarity index 100%
rename from types/bignumber.js/tslint.json
rename to types/angular-hotkeys/tslint.json
diff --git a/types/angular-http-auth/tslint.json b/types/angular-http-auth/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-http-auth/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-httpi/tslint.json b/types/angular-httpi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-httpi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-idle/tslint.json b/types/angular-idle/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-idle/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-jwt/tslint.json b/types/angular-jwt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-jwt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-load/tslint.json b/types/angular-load/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-load/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-loading-bar/tslint.json b/types/angular-loading-bar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-loading-bar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-local-storage/tslint.json b/types/angular-local-storage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-local-storage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-localforage/package.json b/types/angular-localforage/package.json
index 22ff6e6118..9ef28aa765 100644
--- a/types/angular-localforage/package.json
+++ b/types/angular-localforage/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "localforage": "^1.5.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-localforage/tslint.json b/types/angular-localforage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-localforage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-locker/angular-locker-tests.ts b/types/angular-locker/angular-locker-tests.ts
index 368dd1d308..7bb27d68e1 100644
--- a/types/angular-locker/angular-locker-tests.ts
+++ b/types/angular-locker/angular-locker-tests.ts
@@ -131,7 +131,7 @@ angular
     $scope['foo']; // = undefined
     locker.get('foo'); // = undefined
 
-    if (! locker.supported()) {
+    if (! locker.supported('session')) {
         // load a polyfill?
     }
 }]);
diff --git a/types/angular-locker/index.d.ts b/types/angular-locker/index.d.ts
index 0fd1d0a472..37bc041ec1 100644
--- a/types/angular-locker/index.d.ts
+++ b/types/angular-locker/index.d.ts
@@ -140,7 +140,7 @@ declare module 'angular' {
             *
             * @param  {String}  driver  The driver to check support with
             */
-            supported(): boolean;
+            supported(driver: string): boolean;
             /**
             * Unbind a storage key from a $scope property
             *
diff --git a/types/angular-locker/tslint.json b/types/angular-locker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-locker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-material/angular-material-tests.ts b/types/angular-material/angular-material-tests.ts
index 79f72f0b5d..8d6955c697 100644
--- a/types/angular-material/angular-material-tests.ts
+++ b/types/angular-material/angular-material-tests.ts
@@ -5,6 +5,7 @@ interface TestScope extends ng.IScope {
 }
 
 myApp.config((
+    $mdAriaProvider: ng.material.IAriaProvider,
     $mdThemingProvider: ng.material.IThemingProvider,
     $mdIconProvider: ng.material.IIconProvider,
     $mdProgressCircularProvider: ng.material.IProgressCircularProvider) => {
@@ -52,6 +53,9 @@ myApp.config((
             return c * Math.pow(2, (t / d - 1) * 10) + b;
         }
     });
+
+    // Globally disables all ARIA warnings.
+    $mdAriaProvider.disableWarnings();
 });
 
 myApp.controller('BottomSheetController', ($scope: TestScope, $mdBottomSheet: ng.material.IBottomSheetService, $q: ng.IQService) => {
@@ -136,6 +140,9 @@ myApp.controller('DialogController', ($scope: TestScope, $mdDialog: ng.material.
     $scope['promptDialog'] = () => {
         $mdDialog.show($mdDialog.prompt().initialValue('Buddy'));
     };
+    $scope['promptDialog'] = () => {
+        $mdDialog.show($mdDialog.prompt().required(true));
+    };
     $scope['prerenderedDialog'] = () => {
         $mdDialog.show({
             template: '<md-dialog>Hello!</md-dialog>',
@@ -189,7 +196,7 @@ myApp.controller('DialogController', ($scope: TestScope, $mdDialog: ng.material.
 });
 
 class IconDirective implements ng.IDirective {
-    private $mdIcon: ng.material.IIcon;
+    private readonly $mdIcon: ng.material.IIcon;
     constructor($mdIcon: ng.material.IIcon) {
         this.$mdIcon = $mdIcon;
     }
@@ -264,6 +271,48 @@ myApp.controller('ToastController', ($scope: TestScope, $mdToast: ng.material.IT
     };
 });
 
+myApp.controller('ThemeController', ($element: JQuery, $scope: TestScope, $mdTheming: ng.material.IThemingService) => {
+    $mdTheming($element);
+
+    const PALETTES: ng.material.IConfiguredColorPalette = $mdTheming.PALETTES;
+    const redPalette: ng.material.IPalette = PALETTES.red;
+    const myPalette: ng.material.IPalette = PALETTES.myPalette;
+    const THEMES: ng.material.IConfiguredThemes = $mdTheming.THEMES;
+    const defaultTheme: ng.material.ITheme = THEMES.default;
+    const myTheme: ng.material.ITheme = THEMES.myTheme;
+
+    $scope['registered'] = () => {
+        let registered: boolean = $mdTheming.registered('default');
+        registered = $mdTheming.registered('myTheme');
+    };
+
+    $scope['defaultTheme'] = () => {
+        const themeName: string = $mdTheming.defaultTheme();
+    };
+
+    $scope['generateTheme'] = () => {
+        $mdTheming.generateTheme('myTheme');
+    };
+
+    $scope['setBrowserColors'] = () => {
+        const browserColors: ng.material.IBrowserColors = {
+            theme: 'default',
+            palette: 'neonRed',
+            hue: '500'
+        };
+        const remove: () => void = $mdTheming.setBrowserColor(browserColors);
+    };
+
+    $scope['defineTheme'] = () => {
+        const newTheme: ng.material.IDefineThemeOptions = {
+            primary: 'blue',
+            accent: 'orange',
+            dark: true
+        };
+        $mdTheming.defineTheme('newTheme', newTheme);
+    };
+});
+
 myApp.controller('PanelController', ($scope: TestScope, $mdPanel: ng.material.IPanelService, $q: ng.IQService) => {
     $scope['createPanel'] = () => {
         const config: ng.material.IPanelConfig = {
diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index a8808f92ff..92f6d46751 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for angular-material 1.1
 // Project: https://github.com/angular/material
-// Definitions by: Blake Bigelow <https://github.com/blbigelow>, Peter Hajdu <https://github.com/PeterHajdu>, Davide Donadello <https://github.com/Dona278>, Geert Jansen <https://github.com/geertjansen>
+// Definitions by: Blake Bigelow <https://github.com/blbigelow>, Peter Hajdu <https://github.com/PeterHajdu>, Davide Donadello <https://github.com/Dona278>, Geert Jansen <https://github.com/geertjansen>, Edward Knowles <https://github.com/eknowles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -11,6 +11,10 @@ export = _;
 
 declare module 'angular' {
     namespace material {
+        interface IAriaProvider {
+            disableWarnings(): void;
+        }
+
         interface ResolveObject {
             [name: string]: Injectable<(...args: any[]) => PromiseLike<any>>;
         }
@@ -76,6 +80,7 @@ declare module 'angular' {
 
         interface IPromptDialog extends IPresetDialog<IPromptDialog> {
             cancel(cancel: string): IPromptDialog;
+            required(required: boolean): IPromptDialog; // default: false
             placeholder(placeholder: string): IPromptDialog;
             initialValue(initialValue: string): IPromptDialog;
         }
@@ -290,6 +295,25 @@ declare module 'angular' {
             configuration(): IThemeConfig;
         }
 
+        interface IDefineThemeOptions {
+            primary?: string;
+            accent?: string;
+            warn?: string;
+            background?: string;
+            dark?: boolean;
+        }
+
+        interface IThemingService {
+            PALETTES: IConfiguredColorPalette; // get only
+            THEMES: IConfiguredThemes; // get only
+            (element: JQuery): void;
+            registered(themeName: string): boolean;
+            defaultTheme(): string;
+            generateTheme(name: string): void;
+            setBrowserColor(options: IBrowserColors): () => void;
+            defineTheme(name: string, options: IDefineThemeOptions): IPromise<string>;
+        }
+
         interface IDateLocaleProvider {
             months: string[];
             shortMonths: string[];
@@ -330,6 +354,18 @@ declare module 'angular' {
             'blue-grey': IPalette;
         }
 
+        interface IConfiguredColorPalette extends IColorPalette {
+            [name: string]: IPalette;
+        }
+
+        interface IThemes {
+            default: ITheme;
+        }
+
+        interface IConfiguredThemes extends IThemes {
+            [name: string]: ITheme;
+        }
+
         interface IPanelConfig {
             id?: string;
             template?: string;
diff --git a/types/angular-media-queries/tslint.json b/types/angular-media-queries/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-media-queries/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-meteor/tslint.json b/types/angular-meteor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-meteor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-mocks/tslint.json b/types/angular-mocks/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-mocks/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-modal/angular-modal-tests.ts b/types/angular-modal/angular-modal-tests.ts
index edb4d7e6ef..1f55403490 100644
--- a/types/angular-modal/angular-modal-tests.ts
+++ b/types/angular-modal/angular-modal-tests.ts
@@ -45,9 +45,9 @@ function withContainerAsString() {
     });
 }
 
-// With container as jQuery element
+// With container as jQuery/JQLite element
 function withContainerAsJquery() {
-    var container: JQuery = $('body');
+    var container: JQuery = angular.element('body');
     btfModal({
         template: '<div></div>',
         container: container
@@ -94,6 +94,10 @@ function callingValues() {
         template: '<div></div>'
     });
     modal.activate().then(() => {}, () => {});
+    // activating with random locals
+    modal.activate({name: 'TestName'}).then(() => {}, () => {});
+    // activating with genericly typed locals
+    modal.activate<{name: string}>({name: 'TestName'}).then(() => {}, () => {});
     modal.deactivate().then(() => {}, () => {});
     var isActive: boolean = modal.active();
 }
diff --git a/types/angular-modal/index.d.ts b/types/angular-modal/index.d.ts
index 40106e955e..e817157adb 100644
--- a/types/angular-modal/index.d.ts
+++ b/types/angular-modal/index.d.ts
@@ -5,7 +5,6 @@
 // TypeScript Version: 2.3
 
 /// <reference types="angular" />
-/// <reference types="jquery" />
 
 declare namespace angularModal {
 
@@ -28,7 +27,8 @@ declare namespace angularModal {
     }
 
     export interface AngularModal {
-        activate(): angular.IPromise<void>;
+        activate(locals?: {}): angular.IPromise<void>;
+        activate<T>(locals: T): angular.IPromise<void>;
         deactivate(): angular.IPromise<void>;
         active(): boolean;
     }
diff --git a/types/angular-modal/tslint.json b/types/angular-modal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-modal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-notifications/tslint.json b/types/angular-notifications/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-notifications/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-notify/tslint.json b/types/angular-notify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-notify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-odata-resources/tslint.json b/types/angular-odata-resources/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-odata-resources/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-permission/tslint.json b/types/angular-permission/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-permission/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-promise-tracker/tslint.json b/types/angular-promise-tracker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-promise-tracker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-q-spread/tslint.json b/types/angular-q-spread/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-q-spread/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-route/tslint.json b/types/angular-route/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-route/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-sanitize/angular-sanitize-tests.ts b/types/angular-sanitize/angular-sanitize-tests.ts
index b093f2bbb0..51d48db90d 100644
--- a/types/angular-sanitize/angular-sanitize-tests.ts
+++ b/types/angular-sanitize/angular-sanitize-tests.ts
@@ -4,5 +4,6 @@ declare var $sanitizeService: ng.sanitize.ISanitizeService;
 shouldBeString = $sanitizeService(shouldBeString);
 
 declare var $linky: ng.sanitize.filter.ILinky;
+shouldBeString = $linky(shouldBeString);
 shouldBeString = $linky(shouldBeString, "target");
 shouldBeString = $linky(shouldBeString, shouldBeString);
diff --git a/types/angular-sanitize/index.d.ts b/types/angular-sanitize/index.d.ts
index ad42ec362e..b9d16aaeb2 100644
--- a/types/angular-sanitize/index.d.ts
+++ b/types/angular-sanitize/index.d.ts
@@ -36,7 +36,7 @@ declare module 'angular' {
              * see https://docs.angularjs.org/api/ngSanitize/filter/linky
              */
             interface ILinky {
-                (text: string, target: string, attributes?: { [attribute: string]: string } | ((url: string) => { [attribute: string]: string })): string;
+                (text: string, target?: string, attributes?: { [attribute: string]: string } | ((url: string) => { [attribute: string]: string })): string;
             }
         }
 
diff --git a/types/angular-sanitize/tslint.json b/types/angular-sanitize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-sanitize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-scenario/tslint.json b/types/angular-scenario/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-scenario/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-scroll/angular-scroll-tests.ts b/types/angular-scroll/angular-scroll-tests.ts
index fbc1c01642..84491706bc 100644
--- a/types/angular-scroll/angular-scroll-tests.ts
+++ b/types/angular-scroll/angular-scroll-tests.ts
@@ -50,11 +50,11 @@ namespace TestApp {
             var horixontalPosition: number = $document.duScrollLeft();
         }
 
-        private invertedEasingFn = (x: number): number => {
+        private readonly invertedEasingFn = (x: number): number => {
             return 1 - x;
         }
 
-        private onScrollCompleted = (): void => {
+        private readonly onScrollCompleted = (): void => {
             console.log('Done scrolling');
         }
     }
diff --git a/types/angular-scroll/tslint.json b/types/angular-scroll/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-scroll/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-signalr-hub/angular-signalr-hub-tests.ts b/types/angular-signalr-hub/angular-signalr-hub-tests.ts
index 14d202e171..62ea189787 100644
--- a/types/angular-signalr-hub/angular-signalr-hub-tests.ts
+++ b/types/angular-signalr-hub/angular-signalr-hub-tests.ts
@@ -1,6 +1,6 @@
 class EmployeesFactory {
     static $inject = ['$rootScope', 'Hub', '$timeout'];
-    private hub: ngSignalr.Hub;
+    private readonly hub: ngSignalr.Hub;
     public all: Array<Employee>;
 
     constructor($rootScope: ng.IRootScopeService, Hub: ngSignalr.HubFactory, $timeout: ng.ITimeoutService) {
diff --git a/types/angular-signalr-hub/tslint.json b/types/angular-signalr-hub/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-signalr-hub/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-spinner/tslint.json b/types/angular-spinner/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-spinner/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-storage/index.d.ts b/types/angular-storage/index.d.ts
index 8021ba2f5e..a5f65955f5 100644
--- a/types/angular-storage/index.d.ts
+++ b/types/angular-storage/index.d.ts
@@ -6,10 +6,13 @@
 
 /// <reference types="angular" />
 
+declare var _: string;
+export = _;
+
 import * as angular from 'angular';
 
 declare module 'angular' {
-	export namespace a0.storage {
+	namespace a0.storage {
 		interface IStoreService extends INamespacedStoreService {
 			/**
 			 * Returns a namespaced store
diff --git a/types/angular-storage/tslint.json b/types/angular-storage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-storage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-toastr/tslint.json b/types/angular-toastr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-toastr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-toasty/tslint.json b/types/angular-toasty/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-toasty/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-tooltips/index.d.ts b/types/angular-tooltips/index.d.ts
index d3cf83c1ec..682737756f 100644
--- a/types/angular-tooltips/index.d.ts
+++ b/types/angular-tooltips/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://720kb.github.io/angular-tooltips
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare const AngularTooltips: '720kb.tooltips';
 export = AngularTooltips;
diff --git a/types/angular-touchspin/tslint.json b/types/angular-touchspin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-touchspin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-translate/tslint.json b/types/angular-translate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-translate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-ui-bootstrap/tslint.json b/types/angular-ui-bootstrap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-ui-bootstrap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-ui-notification/tslint.json b/types/angular-ui-notification/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-ui-notification/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-ui-router/angular-ui-router-tests.ts b/types/angular-ui-router/angular-ui-router-tests.ts
index 406e94a1eb..889e92bfc9 100644
--- a/types/angular-ui-router/angular-ui-router-tests.ts
+++ b/types/angular-ui-router/angular-ui-router-tests.ts
@@ -137,10 +137,10 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
     static $inject = ["$http", "$rootScope", "$urlRouter", "$state"];
 
     constructor(
-        private $http: ng.IHttpService,
-        private $rootScope: ng.IRootScopeService,
-        private $urlRouter: ng.ui.IUrlRouterService,
-        private $state: ng.ui.IStateService
+        private readonly $http: ng.IHttpService,
+        private readonly $rootScope: ng.IRootScopeService,
+        private readonly $urlRouter: ng.ui.IUrlRouterService,
+        private readonly $state: ng.ui.IStateService
     ) {
         $rootScope.$on("$locationChangeSuccess", (event: ng.IAngularEvent) => this.onLocationChangeSuccess(event));
         $rootScope.$on('$stateNotFound', (event: ng.IAngularEvent, unfoundState: ng.ui.IUnfoundState, fromState: ng.ui.IState, fromParams: {}) =>
diff --git a/types/angular-ui-router/tslint.json b/types/angular-ui-router/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-ui-router/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-ui-scroll/tslint.json b/types/angular-ui-scroll/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-ui-scroll/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-ui-sortable/tslint.json b/types/angular-ui-sortable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-ui-sortable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-ui-tree/tslint.json b/types/angular-ui-tree/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-ui-tree/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-websocket/angular-websocket-tests.ts b/types/angular-websocket/angular-websocket-tests.ts
index 1df77b7a2a..51246c529a 100644
--- a/types/angular-websocket/angular-websocket-tests.ts
+++ b/types/angular-websocket/angular-websocket-tests.ts
@@ -1,69 +1,62 @@
-let dummySocket: ng.websocket.IWebSocket;
-let dummyPromise: ng.IPromise<void>;
-let dummyScope: ng.IScope;
+import * as ng from 'angular';
 
-let provider: ng.websocket.IWebSocketProvider = (url: string, protocols?:string[] | ng.websocket.IWebSocketConfigOptions, options?: ng.websocket.IWebSocketConfigOptions) => {
-    return dummySocket;
-}
+(promise: angular.IPromise<void>, scope: ng.IScope, provider: ng.websocket.IWebSocketProvider) => {
+    const socket = provider("wss://localhost");
+    const socketWithProtocols = provider("wss://localhost", ["protocol-a", "protocol-b"]);
 
-let socketWithProtocol = provider("wss://localhost", "protocol");
-let socketWithProtocols = provider("wss://localhost", ["protocol-a", "protocol-b"]);
+    const socketWithOptions = provider("wss://localhost", {
+        scope,
+        rootScopeFailOver: true,
+        useApplyAsync: true,
+        initialTimeout: 100,
+        maxTimeout: 300000,
+        reconnectIfNotNormalClose: true,
+        binaryType: "blob"
+    });
 
-let socketWithOptions = provider("wss://localhost", {
-  scope: dummyScope,
-  rootScopeFailOver: true,
-  useApplyAsync: true,
-  initialTimeout: 100,
-  maxTimeout: 300000,
-  reconnectIfNotNormalClose: true,
-  binaryType: "blob"
-});
+    const socketWithProtocolAndOptions = provider("wss://localhost", "protocol", {
+        scope,
+        rootScopeFailOver: true,
+        useApplyAsync: true,
+        initialTimeout: 100,
+        maxTimeout: 300000,
+        reconnectIfNotNormalClose: true,
+        binaryType: "blob"
+    });
 
-let socketWithProtocolAndOptions = provider("wss://localhost", "protocol", {
-  scope: dummyScope,
-  rootScopeFailOver: true,
-  useApplyAsync: true,
-  initialTimeout: 100,
-  maxTimeout: 300000,
-  reconnectIfNotNormalClose: true,
-  binaryType: "blob"
-});
+    socket.onOpen((event: Event) => {})
+        .onClose((event: Event) => {})
+        .onError((event: Event) => {})
+        .onMessage((event: Event) => {});
 
-let socket = provider("wss://localhost");
+    socket.onMessage((event: Event) => {}, { filter: /Some Filter/ })
+        .onMessage((event: Event) => {}, { filter: 'Some Filter' })
+        .onMessage((event: Event) => {}, { filter: 'Some Filter', autoApply: true })
+        .onMessage((event: Event) => {}, { autoApply: false });
 
-socket.onOpen((event) => {})
-      .onClose((event) => {})
-      .onError((event) => {})
-      .onMessage((event) => {});
+    socket.close(true);
+    socket.close();
 
-socket.onMessage((event) => {}, { filter: /Some Filter/ })
-      .onMessage((event) => {}, { filter: 'Some Filter' })
-      .onMessage((event) => {}, { filter: 'Some Filter', autoApply: true })
-      .onMessage((event) => {}, { autoApply: false });
+    socket.send("Some great data here!").finally(() => {});
+    socket.send({ list: [1, 2, 3, 4] });
 
-socket.close(true);
-socket.close();
+    socket.socket.send("data");
+    socket.socket.close();
+    socket.socket.close(1);
+    socket.socket.close(1, "reason");
 
-socket.send("Some great data here!").finally(() => {});
-socket.send({ list: [1, 2, 3, 4] });
+    socket.sendQueue.push({ message: "msg", defered: promise });
 
-socket.socket.send("data");
-socket.socket.close();
-socket.socket.close(1);
-socket.socket.close(1, "reason");
+    socket.onOpenCallbacks.push((event: Event) => {});
+    socket.onCloseCallbacks.push((event: CloseEvent) => {});
+    socket.onErrorCallbacks.push((event: Event) => {});
+    socket.onMessageCallbacks.push({ fn: (event: MessageEvent) => {}, pattern: 'Some Filter', autoApply: true });
+    socket.onMessageCallbacks.push({ fn: (event: MessageEvent) => {}, pattern: /Some Filter/, autoApply: true });
+    socket.onMessageCallbacks.push({ fn: (event: MessageEvent) => {}, autoApply: true });
 
-socket.sendQueue.push({ message: "msg", defered: dummyPromise });
+    socket.readyState = 0;
 
-socket.onOpenCallbacks.push((event: Event) => {});
-socket.onCloseCallbacks.push((event: CloseEvent) => {});
-socket.onErrorCallbacks.push((event: Event) => {});
-socket.onMessageCallbacks.push({ fn: (event: MessageEvent) => {}, pattern: 'Some Filter', autoApply: true });
-socket.onMessageCallbacks.push({ fn: (event: MessageEvent) => {}, pattern: /Some Filter/, autoApply: true });
-socket.onMessageCallbacks.push({ fn: (event: MessageEvent) => {}, pattern: undefined, autoApply: true });
-
-socket.readyState = 0;
-
-socket.initialTimeout = 10;
-
-socket.maxTimeout = 5000;
+    socket.initialTimeout = 10;
 
+    socket.maxTimeout = 5000;
+};
diff --git a/types/angular-websocket/index.d.ts b/types/angular-websocket/index.d.ts
index b7b3f55093..0b26bd2cfd 100644
--- a/types/angular-websocket/index.d.ts
+++ b/types/angular-websocket/index.d.ts
@@ -1,39 +1,45 @@
-// Type definitions for angular-websocket v2.0
+// Type definitions for angular-websocket 2.0
 // Project: https://github.com/AngularClass/angular-websocket
 // Definitions by: Nick Veys <https://github.com/nickveys>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import * as ng from "angular";
+import * as angular from "angular";
+
+export type IWebSocketConfigOptions = angular.websocket.IWebSocketConfigOptions;
+export type IWebSocketProvider = angular.websocket.IWebSocketProvider;
+export type IWebSocketMessageOptions = angular.websocket.IWebSocketMessageOptions;
+export type IWebSocketMessageHandler = angular.websocket.IWebSocketMessageHandler;
+export type IWebSocketQueueItem = angular.websocket.IWebSocketQueueItem;
+export type IWebSocket = angular.websocket.IWebSocket;
 
 declare module "angular" {
     namespace websocket {
-
         /**
          * Options available to be specified for IWebSocketProvider.
          */
-        type IWebSocketConfigOptions = {
-        scope?: ng.IScope;
-        rootScopeFailOver?: boolean;
-        useApplyAsync?: boolean;
-        initialTimeout?: number;
-        maxTimeout?: number;
-        binaryType?: "blob" | "arraybuffer";
-        reconnectIfNotNormalClose?: boolean;
-        }
-        interface IWebSocketProvider {
-            /**
-             * Creates and opens an IWebSocket instance.
-             *
-             * @param url url to connect to
-             * @return websocket instance
-             */
-            (url: string, protocols?: string | string[] | IWebSocketConfigOptions, options?: IWebSocketConfigOptions): IWebSocket;
+        interface IWebSocketConfigOptions {
+            scope?: IScope;
+            rootScopeFailOver?: boolean;
+            useApplyAsync?: boolean;
+            initialTimeout?: number;
+            maxTimeout?: number;
+            binaryType?: "blob" | "arraybuffer";
+            reconnectIfNotNormalClose?: boolean;
         }
 
+        /**
+         * Creates and opens an IWebSocket instance.
+         *
+         * @param url url to connect to
+         * @return websocket instance
+         */
+        type IWebSocketProvider =
+            (url: string, protocols?: string | string[] | IWebSocketConfigOptions,
+                options?: IWebSocketConfigOptions) => IWebSocket;
+
         /** Options available to be specified for IWebSocket.onMessage */
-        type IWebSocketMessageOptions = {
-
+        interface IWebSocketMessageOptions {
             /**
              * If specified, only messages that match the filter will cause the message event
              * to be fired.
@@ -44,21 +50,20 @@ declare module "angular" {
             autoApply?: boolean;
         }
 
-        /** Type corresponding to onMessage callbaks stored in $Websocket#onMessageCallbacks instance. */
-        type IWebSocketMessageHandler = {
-        fn: (evt: MessageEvent) => void;
-        pattern: string | RegExp;
-        autoApply: boolean;
+        /** Type corresponding to onMessage callbacks stored in $Websocket#onMessageCallbacks instance. */
+        interface IWebSocketMessageHandler {
+            fn: (evt: MessageEvent) => void;
+            pattern?: string | RegExp;
+            autoApply: boolean;
         }
 
         /** Type corresponding to items stored in $WebSocket#sendQueue instance. */
-        type IWebSocketQueueItem = {
-        message: any;
-        defered: ng.IPromise<void>;
+        interface IWebSocketQueueItem {
+            message: any;
+            defered: IPromise<void>;
         }
 
         interface IWebSocket {
-
             /**
              * Adds a callback to be executed each time a socket connection is opened for
              * this instance.
@@ -108,7 +113,7 @@ declare module "angular" {
              *
              * @param data data to send, if this is an object, it will be stringified before sending
              */
-            send(data: string | {}): ng.IPromise<any>;
+            send(data: string | {}): IPromise<any>;
 
             /**
              * WebSocket instance.
@@ -123,7 +128,7 @@ declare module "angular" {
             /**
              * List of callbacks to be executed when the socket is opened.
              */
-            onOpenCallbacks: ((evt: Event) => void)[];
+            onOpenCallbacks: Array<((evt: Event) => void)>;
 
             /**
              * List of callbacks to be executed when a message is received from the socket.
@@ -133,12 +138,12 @@ declare module "angular" {
             /**
              * List of callbacks to be executed when an error is received from the socket.
              */
-            onErrorCallbacks: ((evt: Event) => void)[];
+            onErrorCallbacks: Array<((evt: Event) => void)>;
 
             /**
              * List of callbacks to be executed when the socket is closed.
              */
-            onCloseCallbacks: ((evt: CloseEvent) => void)[];
+            onCloseCallbacks: Array<((evt: CloseEvent) => void)>;
 
             /**
              * Returns either the readyState value from the underlying WebSocket instance
diff --git a/types/angular-websocket/tsconfig.json b/types/angular-websocket/tsconfig.json
index 96aab30ef0..89d5cb9dc3 100644
--- a/types/angular-websocket/tsconfig.json
+++ b/types/angular-websocket/tsconfig.json
@@ -1,8 +1,4 @@
 {
-    "files": [
-        "index.d.ts",
-        "angular-websocket-tests.ts"
-    ],
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
@@ -11,8 +7,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,5 +16,9 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-    }
-}
\ No newline at end of file
+    },
+    "files": [
+        "index.d.ts",
+        "angular-websocket-tests.ts"
+    ]
+}
diff --git a/types/angular-websocket/tslint.json b/types/angular-websocket/tslint.json
new file mode 100644
index 0000000000..2c7c1bed53
--- /dev/null
+++ b/types/angular-websocket/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "interface-name": false
+    }
+}
diff --git a/types/angular-wizard/tslint.json b/types/angular-wizard/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-wizard/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular-xeditable/tslint.json b/types/angular-xeditable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular-xeditable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular.throttle/tslint.json b/types/angular.throttle/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angular.throttle/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angular/angular-tests.ts b/types/angular/angular-tests.ts
index c60da29504..795e74a058 100644
--- a/types/angular/angular-tests.ts
+++ b/types/angular/angular-tests.ts
@@ -6,8 +6,6 @@
  * License: MIT
  */
 
-/* tslint:disable:no-empty no-shadowed-variable */
-
 class AuthService {
     /**
       * Holds all the requests which failed due to 401 response,
@@ -163,7 +161,7 @@ namespace My.Namespace {
 }
 
 class TestProvider implements ng.IServiceProvider {
-    constructor(private $scope: ng.IScope) {}
+    constructor(private readonly $scope: ng.IScope) {}
 
     $get() {}
 }
@@ -178,7 +176,7 @@ mod.controller('name', class {
     // $onChanges(x: number) { }
 });
 mod.controller({
-    MyCtrl: class{},
+    MyCtrl: class {},
     MyCtrl2() {},
     MyCtrl3: ['$fooService', ($fooService: any) => { }]
 });
@@ -229,7 +227,7 @@ mod.provider(My.Namespace);
 mod.service('name', ($scope: ng.IScope) => {});
 mod.service('name', ['$scope', ($scope: ng.IScope) => {}]);
 mod.service({
-    MyCtrl: class{},
+    MyCtrl: class {},
     MyCtrl2: () => {}, // tslint:disable-line:object-literal-shorthand
     MyCtrl3: ['$fooService', ($fooService: any) => {}]
 });
@@ -491,9 +489,7 @@ namespace TestInjector {
 
     // $injector.instantiate
     {
-        class Foobar {
-            constructor($q) {}
-        }
+        class Foobar {}
         const result: Foobar = $injector.instantiate(Foobar);
     }
 
@@ -509,7 +505,13 @@ namespace TestInjector {
         }
 
         const anyFunction: Function = foobar;
-        const anyResult: string = $injector.invoke(anyFunction);
+        let anyResult: string = $injector.invoke(anyFunction);
+
+        const inlineAnnotatedFunction: any[] = [false, foobar];
+        anyResult = $injector.invoke(inlineAnnotatedFunction);
+        anyResult = $injector.invoke(inlineAnnotatedFunction, 'anyContext', 'anyLocals');
+        anyResult = $injector.invoke(inlineAnnotatedFunction, 'anyContext');
+        anyResult = $injector.invoke(inlineAnnotatedFunction, undefined, 'anyLocals');
     }
 }
 
@@ -640,6 +642,9 @@ isolateScope = element.find('div').isolateScope();
 isolateScope = element.children().isolateScope();
 let element2 = angular.element(element);
 let elementArray = angular.element(document.querySelectorAll('div'));
+let elementReadyFn = angular.element(() => {
+    console.log('ready');
+});
 
 // $timeout signature tests
 namespace TestTimeout {
@@ -700,7 +705,7 @@ class SampleDirective implements ng.IDirective {
     restrict = 'A';
     name = 'doh';
 
-    compile(templateElement: ng.IAugmentedJQuery) {
+    compile(templateElement: JQLite) {
         return {
             post: this.link
         };
@@ -716,7 +721,7 @@ class SampleDirective implements ng.IDirective {
 class SampleDirective2 implements ng.IDirective {
     restrict = 'EAC';
 
-    compile(templateElement: ng.IAugmentedJQuery) {
+    compile(templateElement: JQLite) {
         return {
             pre: this.link
         };
@@ -734,7 +739,7 @@ angular.module('SameplDirective', []).directive('sampleDirective', SampleDirecti
 angular.module('AnotherSampleDirective', []).directive('myDirective', ['$interpolate', '$q', ($interpolate: ng.IInterpolateService, $q: ng.IQService) => {
     return {
         restrict: 'A',
-        link: (scope: ng.IScope, el: ng.IAugmentedJQuery, attr: ng.IAttributes) => {
+        link: (scope: ng.IScope, el: JQLite, attr: ng.IAttributes) => {
             $interpolate(attr['test'])(scope);
             $interpolate('', true)(scope);
             $interpolate('', true, 'html')(scope);
@@ -862,7 +867,7 @@ angular.module('docsTimeDirective', [])
     }])
     .directive('myCurrentTime', ['$interval', 'dateFilter', ($interval: any, dateFilter: any) => {
         return {
-            link(scope: ng.IScope, element: ng.IAugmentedJQuery, attrs: ng.IAttributes) {
+            link(scope: ng.IScope, element: JQLite, attrs: ng.IAttributes) {
                 let format: any;
                 let timeoutId: any;
 
@@ -909,7 +914,7 @@ angular.module('docsTransclusionExample', [])
             transclude: true,
             scope: {},
             templateUrl: 'my-dialog.html',
-            link(scope: ng.IScope, element: ng.IAugmentedJQuery) {
+            link(scope: ng.IScope, element: JQLite) {
                 scope['name'] = 'Jeff';
             }
         };
@@ -1010,7 +1015,7 @@ angular.module('docsTabsExample', [])
             scope: {
                 title: '@'
             },
-            link(scope: ng.IScope, element: ng.IAugmentedJQuery, attrs: ng.IAttributes, tabsCtrl: any) {
+            link(scope: ng.IScope, element: JQLite, attrs: ng.IAttributes, tabsCtrl: any) {
                 tabsCtrl.addPane(scope);
             },
             templateUrl: 'my-pane.html'
@@ -1091,6 +1096,18 @@ angular.module('copyExample', [])
         $scope.reset();
     }]);
 
+// Extending IScope for a directive, see https://github.com/DefinitelyTyped/DefinitelyTyped/issues/21160
+interface IMyScope extends angular.IScope {
+    myScopeProperty: boolean;
+}
+
+angular.module('aaa').directive('directive', () => ({
+    link(scope: IMyScope) {
+        console.log(scope.myScopeProperty);
+        return;
+    }
+}));
+
 namespace locationTests {
     const $location: ng.ILocationService = null;
 
@@ -1305,3 +1322,35 @@ function toPromise<T>(val: T): ng.IPromise<T> {
     const p: ng.IPromise<T> = null;
     return p;
 }
+
+const directiveCompileFn: ng.IDirectiveCompileFn = (
+        templateElement: JQLite,
+        templateAttributes: ng.IAttributes,
+        transclude: ng.ITranscludeFunction
+    ): ng.IDirectiveLinkFn => {
+    return (
+        scope: ng.IScope,
+        instanceElement: JQLite,
+        instanceAttributes: ng.IAttributes
+    ) => {
+        return null;
+    };
+};
+
+interface MyScope extends ng.IScope {
+    foo: string;
+}
+
+const directiveCompileFnWithGeneric: ng.IDirectiveCompileFn<MyScope> = (
+        templateElement: JQLite,
+        templateAttributes: ng.IAttributes,
+        transclude: ng.ITranscludeFunction
+    ): ng.IDirectiveLinkFn<MyScope> => {
+    return (
+        scope: MyScope,
+        instanceElement: JQLite,
+        instanceAttributes: ng.IAttributes
+    ) => {
+        return null;
+    };
+};
diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 8415c6e6b7..5d8b6315b0 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -9,9 +9,6 @@
 
 /// <reference path="jqlite.d.ts" />
 
-// NOTE: @types/angular technically doesn't require TypeScript 2.3, only TypeScript 2.1.
-// It has a TypeScript 2.3 header so that merging tests with @types/jquery v3 will work.
-
 declare var angular: angular.IAngularStatic;
 
 // Support for painless dependency injection
@@ -162,7 +159,7 @@ declare namespace angular {
         module(
             name: string,
             requires?: string[],
-            configFn?: Function): IModule;
+            configFn?: Injectable<Function>): IModule;
 
         noop(...args: any[]): void;
         reloadWithDebugInfo(): void;
@@ -232,8 +229,8 @@ declare namespace angular {
          * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind)
          * @param directiveFactory An injectable directive factory function.
          */
-        directive(name: string, directiveFactory: Injectable<IDirectiveFactory>): IModule;
-        directive(object: {[directiveName: string]: Injectable<IDirectiveFactory>}): IModule;
+        directive<TScope extends IScope = IScope>(name: string, directiveFactory: Injectable<IDirectiveFactory<TScope>>): IModule;
+        directive<TScope extends IScope = IScope>(object: {[directiveName: string]: Injectable<IDirectiveFactory<TScope>>}): IModule;
         /**
          * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider.
          *
@@ -392,6 +389,7 @@ declare namespace angular {
         $rollbackViewValue(): void;
         $commitViewValue(): void;
         $isEmpty(value: any): boolean;
+        $overrideModelOptions(options: INgModelOptions): void;
 
         $viewValue: any;
 
@@ -1088,7 +1086,7 @@ declare namespace angular {
          * Retrieves or overrides whether to generate an error when a rejected promise is not handled.
          * This feature is enabled by default.
          *
-         * @returns {boolean} Current value
+         * @returns Current value
          */
         errorOnUnhandledRejections(): boolean;
 
@@ -1096,8 +1094,8 @@ declare namespace angular {
          * Retrieves or overrides whether to generate an error when a rejected promise is not handled.
          * This feature is enabled by default.
          *
-         * @param {boolean} value Whether to generate an error when a rejected promise is not handled.
-         * @returns {ng.IQProvider} Self for chaining otherwise.
+         * @param value Whether to generate an error when a rejected promise is not handled.
+         * @returns Self for chaining otherwise.
          */
         errorOnUnhandledRejections(value: boolean): IQProvider;
     }
@@ -1108,8 +1106,8 @@ declare namespace angular {
          * The successCallBack may return IPromise<never> for when a $q.reject() needs to be returned
          * This method returns a new promise which is resolved or rejected via the return value of the successCallback, errorCallback. It also notifies via the return value of the notifyCallback method. The promise can not be resolved or rejected from the notifyCallback method.
          */
-        then<TResult>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: null | undefined, notifyCallback?: (state: any) => any): IPromise<TResult>;
-        then<TResult1, TResult2>(successCallback: (promiseValue: T) => IPromise<TResult1>|TResult2, errorCallback?: null | undefined, notifyCallback?: (state: any) => any): IPromise<TResult1 | TResult2>;
+        then<TResult>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: null, notifyCallback?: (state: any) => any): IPromise<TResult>;
+        then<TResult1, TResult2>(successCallback: (promiseValue: T) => IPromise<TResult1>|TResult2, errorCallback?: null, notifyCallback?: (state: any) => any): IPromise<TResult1 | TResult2>;
 
         then<TResult, TCatch>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback: (reason: any) => IPromise<TCatch>|TCatch, notifyCallback?: (state: any) => any): IPromise<TResult | TCatch>;
         then<TResult1, TResult2, TCatch1, TCatch2>(successCallback: (promiseValue: T) => IPromise<TResult1>|TResult2, errorCallback: (reason: any) => IPromise<TCatch1>|TCatch2, notifyCallback?: (state: any) => any): IPromise<TResult1 | TResult2 | TCatch1 | TCatch2>;
@@ -1251,8 +1249,8 @@ declare namespace angular {
     }
 
     interface ICompileProvider extends IServiceProvider {
-        directive(name: string, directiveFactory: Injectable<IDirectiveFactory>): ICompileProvider;
-        directive(object: {[directiveName: string]: Injectable<IDirectiveFactory>}): ICompileProvider;
+        directive<TScope extends IScope = IScope>(name: string, directiveFactory: Injectable<IDirectiveFactory<TScope>>): ICompileProvider;
+        directive<TScope extends IScope = IScope>(object: {[directiveName: string]: Injectable<IDirectiveFactory<TScope>>}): ICompileProvider;
 
         component(name: string, options: IComponentOptions): ICompileProvider;
 
@@ -1301,6 +1299,17 @@ declare namespace angular {
          */
         cssClassDirectivesEnabled(): boolean;
         cssClassDirectivesEnabled(enabled: boolean): ICompileProvider;
+
+        /**
+        * Call this method to enable/disable strict component bindings check.
+        * If enabled, the compiler will enforce that for all bindings of a
+        * component that are not set as optional with ?, an attribute needs
+        * to be provided on the component's HTML tag.
+        * Defaults to false.
+        * See: https://docs.angularjs.org/api/ng/provider/$compileProvider#strictComponentBindingsEnabled
+        */
+        strictComponentBindingsEnabled(): boolean;
+        strictComponentBindingsEnabled(enabled: boolean): ICompileProvider;
     }
 
     interface ICloneAttachFunction {
@@ -1638,9 +1647,8 @@ declare namespace angular {
         useApplyAsync(value: boolean): IHttpProvider;
 
         /**
-         *
-         * @param {boolean=} value If true, `$http` will return a normal promise without the `success` and `error` methods.
-         * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+         * @param value If true, `$http` will return a normal promise without the `success` and `error` methods.
+         * @returns If a value is specified, returns the $httpProvider for chaining.
          *    otherwise, returns the current configured value.
          */
         useLegacyPromiseExtensions(value: boolean): boolean | IHttpProvider;
@@ -1761,7 +1769,6 @@ declare namespace angular {
         (tpl: string, ignoreRequestError?: boolean): IPromise<string>;
         /**
          * total amount of pending template requests being downloaded.
-         * @type {number}
          */
         totalPendingRequests: number;
     }
@@ -1962,13 +1969,13 @@ declare namespace angular {
     // and http://docs.angularjs.org/guide/directive
     ///////////////////////////////////////////////////////////////////////////
 
-    interface IDirectiveFactory {
-        (...args: any[]): IDirective | IDirectiveLinkFn;
+    interface IDirectiveFactory<TScope extends IScope = IScope> {
+        (...args: any[]): IDirective<TScope> | IDirectiveLinkFn<TScope>;
     }
 
-    interface IDirectiveLinkFn {
+    interface IDirectiveLinkFn<TScope extends IScope = IScope> {
         (
-            scope: IScope,
+            scope: TScope,
             instanceElement: JQLite,
             instanceAttributes: IAttributes,
             controller?: IController | IController[] | {[key: string]: IController},
@@ -1976,12 +1983,12 @@ declare namespace angular {
         ): void;
     }
 
-    interface IDirectivePrePost {
-        pre?: IDirectiveLinkFn;
-        post?: IDirectiveLinkFn;
+    interface IDirectivePrePost<TScope extends IScope = IScope> {
+        pre?: IDirectiveLinkFn<TScope>;
+        post?: IDirectiveLinkFn<TScope>;
     }
 
-    interface IDirectiveCompileFn {
+    interface IDirectiveCompileFn<TScope extends IScope = IScope> {
         (
             templateElement: JQLite,
             templateAttributes: IAttributes,
@@ -1992,11 +1999,11 @@ declare namespace angular {
              * that is passed to the link function instead.
              */
             transclude: ITranscludeFunction
-        ): void | IDirectiveLinkFn | IDirectivePrePost;
+        ): void | IDirectiveLinkFn<TScope> | IDirectivePrePost<TScope>;
     }
 
-    interface IDirective {
-        compile?: IDirectiveCompileFn;
+    interface IDirective<TScope extends IScope = IScope> {
+        compile?: IDirectiveCompileFn<TScope>;
         controller?: string | Injectable<IControllerConstructor>;
         controllerAs?: string;
         /**
@@ -2005,7 +2012,7 @@ declare namespace angular {
          * relies upon bindings inside a $onInit method on the controller, instead.
          */
         bindToController?: boolean | {[boundProperty: string]: string};
-        link?: IDirectiveLinkFn | IDirectivePrePost;
+        link?: IDirectiveLinkFn<TScope> | IDirectivePrePost<TScope>;
         multiElement?: boolean;
         priority?: number;
         /**
@@ -2078,9 +2085,7 @@ declare namespace angular {
             get<T>(name: '$xhrFactory'): IXhrFactory<T>;
             has(name: string): boolean;
             instantiate<T>(typeConstructor: {new(...args: any[]): T}, locals?: any): T;
-            invoke(inlineAnnotatedFunction: any[]): any;
-            invoke<T>(func: (...args: any[]) => T, context?: any, locals?: any): T;
-            invoke(func: Function, context?: any, locals?: any): any;
+            invoke<T = any>(func: Injectable<Function | ((...args: any[]) => T)>, context?: any, locals?: any): T;
             strictDi: boolean;
         }
 
diff --git a/types/angular/jqlite.d.ts b/types/angular/jqlite.d.ts
index 858201fb18..a9da89cf65 100644
--- a/types/angular/jqlite.d.ts
+++ b/types/angular/jqlite.d.ts
@@ -684,7 +684,7 @@ interface JQuery {
 }
 
 interface JQueryStatic {
-    (element: string | Element | Document | JQuery | ArrayLike<Element>): JQLite;
+    (element: string | Element | Document | JQuery | ArrayLike<Element> | (() => void)): JQLite;
 }
 
 /**
diff --git a/types/angular/tsconfig.json b/types/angular/tsconfig.json
index 92d1e026c3..5ce810f938 100644
--- a/types/angular/tsconfig.json
+++ b/types/angular/tsconfig.json
@@ -16,7 +16,7 @@
         "noImplicitAny": false,
         "noImplicitThis": false,
         "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -25,4 +25,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
\ No newline at end of file
+}
diff --git a/types/angularfire/index.d.ts b/types/angularfire/index.d.ts
index de1482b0e3..a339e89bc5 100644
--- a/types/angularfire/index.d.ts
+++ b/types/angularfire/index.d.ts
@@ -112,7 +112,7 @@ interface AngularFireObject extends AngularFireSimpleObject {
 	 * @param {object} scope
 	 * @param {string} varName
 	 * @returns a promise which resolves to an unbind method after data is set in scope
-	 */	
+	 */
 	$bindTo(scope: ng.IScope, varName: string): ng.IPromise<any>;
 
 	/**
@@ -125,7 +125,7 @@ interface AngularFireObject extends AngularFireSimpleObject {
 	 * @param {Function} cb
 	 * @param {Object} [context]
 	 * @returns {Function} invoke to stop observing events
-	 */	
+	 */
 	$watch(callback: Function, context?: any): Function;
 
 	/**
diff --git a/types/angularfire/package.json b/types/angularfire/package.json
new file mode 100644
index 0000000000..3cf0b2f8bd
--- /dev/null
+++ b/types/angularfire/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/firebase": "^2.4.1"
+    }
+}
diff --git a/types/angularfire/tslint.json b/types/angularfire/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angularfire/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angularlocalstorage/angularlocalstorage-tests.ts b/types/angularlocalstorage/angularlocalstorage-tests.ts
index 22d71f8b5d..df50c6694a 100644
--- a/types/angularlocalstorage/angularlocalstorage-tests.ts
+++ b/types/angularlocalstorage/angularlocalstorage-tests.ts
@@ -3,7 +3,7 @@ interface TestScope extends ng.IScope {
 }
 
 class TestController {
-  constructor(private $scope: TestScope, private storage: ng.localStorage.ILocalStorageService) {
+  constructor(private readonly $scope: TestScope, private readonly storage: ng.localStorage.ILocalStorageService) {
     storage.bind($scope, 'varName');
     storage.bind($scope,'varName', { defaultValue: 'randomValue123', storeName: 'customStoreKey' });
     $scope.viewType = 'ANYTHING';
diff --git a/types/angularlocalstorage/tslint.json b/types/angularlocalstorage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angularlocalstorage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/angulartics/angulartics-tests.ts b/types/angulartics/angulartics-tests.ts
index 5a5660a3f8..a130ec64b2 100644
--- a/types/angulartics/angulartics-tests.ts
+++ b/types/angulartics/angulartics-tests.ts
@@ -1,5 +1,5 @@
 import * as angular from 'angular';
-import { angulartics } from 'angulartics';
+import * as angulartics from 'angulartics';
 
 namespace Analytics {
     angular.module("angulartics.app", ["angulartics"])
diff --git a/types/angulartics/index.d.ts b/types/angulartics/index.d.ts
index 0d9ba1f17f..40ff202329 100644
--- a/types/angulartics/index.d.ts
+++ b/types/angulartics/index.d.ts
@@ -1,11 +1,13 @@
-// Type definitions for Angulartics 1.3
+// Type definitions for Angulartics 1.4
 // Project: http://luisfarzati.github.io/angulartics/
-// Definitions by: Steven Fan <https://github.com/stevenfan>
+// Definitions by: Bateast2 <https://github.com/bateast2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
+export = angulartics;//AMD/Require module support
+export as namespace angulartics;//UMD module support
 declare namespace angulartics {
 
     interface IAngularticsStatic {
@@ -13,41 +15,67 @@ declare namespace angulartics {
     }
 
     interface IAnalyticsService {
-        eventTrack(eventName: string, properties?: any): any;
-        getOptOut(): boolean;
         pageTrack(path: string, location?: angular.ILocationService): any;
+        eventTrack(eventName: string, properties?: any): any;
+        exceptionTrack(error: any, cause: string): any;
+        transactionTrack: any;
         setAlias(alias: string): any;
-        setOptOut(value: boolean): void;
         setUsername(username: string): any;
-        setUserProperties(properties: any): any;
-        setSuperProperties(properties: any): any;
+        setUserProperties(userProperties: any): any;
+        setUserPropertiesOnce(userProperties: any): any;
+        setSuperProperties(superProperties: any): any;
+        setSuperPropertiesOnce(superProperties: any): any;
+        incrementProperty(property: string, value?: any): any;
+        userTimings(properties: any): any;
+        clearCookies: any;
+
+        getOptOut(): boolean;
+        setOptOut(value: boolean): void;
     }
 
     interface IAnalyticsServiceProvider extends angular.IServiceProvider {
         virtualPageviews(value: boolean): void;
+        trackStates(value: boolean): void;
+        trackRoutes(value: boolean): void;
         excludeRoutes(value: string[]): void;
+        queryKeysWhitelist(keys: string[]): void
+        queryKeysBlacklist(keys: string[]): void
         firstPageview(value: boolean): void;
         withBase(value: boolean): void;
         withAutoBase(value: boolean): void;
-        developerMode(value: boolean): void;
         trackExceptions(value: boolean): void;
-        trackRoutes(value: boolean): void;
-        trackStates(value: boolean): void;
+        developerMode(value: boolean): void;
 
         registerPageTrack(callback: (path: string, location?: angular.ILocationService) => any): void;
         registerEventTrack(callback: (eventName: string, properties?: any) => any): void;
+        registerTransactionTrack(callback: any): void;
         registerSetAlias(callback: (alias: string) => any): void;
         registerSetUsername(callback: (username: string) => any): void;
         registerSetUserProperties(callback: (userProperties: any) => any): void;
+        registerSetUserPropertiesOnce(callback: (userProperties: any) => any): void;
         registerSetSuperProperties(callback: (superProperties: any) => any): void;
+        registerSetSuperPropertiesOnce(callback: (superProperties: any) => any): void;
+        registerIncrementProperty(callback: (property: string, value?: any) => any): void;
+        registerUserTimings(callback: (properties: any) => any): void;
+        registerClearCookies(callback: any): void;
 
         settings: {
             pageTracking: {
                 autoTrackingVirtualPages: boolean,
                 autoTrackingFirstPage: boolean,
+                trackRelativePath: boolean,
+                trackRoutes: boolean,
+                trackStates: boolean,
+                autoBasePath: boolean,
                 basePath: string,
-                autoBasePath: boolean
+                excludedRoutes: string[],
+                queryKeysWhitelisted: string[],
+                queryKeysBlacklisted: string[]
             },
+            eventTracking: {},
+            bufferFlushDelay: number,
+            trackExceptions: boolean,
+            optOut: boolean,
             developerMode: boolean
         };
     }
diff --git a/types/angulartics/tslint.json b/types/angulartics/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/angulartics/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/animation-frame/tslint.json b/types/animation-frame/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/animation-frame/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/annyang/index.d.ts b/types/annyang/index.d.ts
index fee0cb9acb..76f2bdb455 100644
--- a/types/annyang/index.d.ts
+++ b/types/annyang/index.d.ts
@@ -6,39 +6,23 @@
 
 /**
  * Options for function `start`
- *
- * @export
- * @interface StartOptions
  */
 export interface StartOptions {
     /**
      * Should annyang restart itself if it is closed indirectly, because of silence or window conflicts?
-     *
-     * @type {boolean}
      */
     autoRestart?: boolean;
     /**
      * Allow forcing continuous mode on or off. Annyang is pretty smart about this, so only set this if you know what you're doing.
-     *
-     * @type {boolean}
      */
     continuous?: boolean;
 }
 
 /**
  * A command option that supports custom regular expressions
- *
- * @export
- * @interface CommandOptionRegex
  */
 export interface CommandOptionRegex {
-    /**
-     * @type {RegExp}
-     */
     regexp: RegExp;
-    /**
-     * @type {() => any}
-     */
     callback(): void;
 }
 
@@ -50,8 +34,6 @@ export interface CommandOptionRegex {
  * {'hello :name': helloFunction, 'howdy': helloFunction};
  * {'hi': helloFunction};
  * ````
- * @export
- * @interface CommandOption
  */
 export interface CommandOption {
     [command: string]: CommandOptionRegex | (() => void);
@@ -92,8 +74,6 @@ export interface Annyang {
     /**
      * Start listening.
      * It's a good idea to call this after adding some commands first, but not mandatory.
-     *
-     * @param {StartOptions} options
      */
     start(options?: StartOptions): void;
 
@@ -119,15 +99,13 @@ export interface Annyang {
     /**
      * Turn on output of debug messages to the console. Ugly, but super-handy!
      *
-     * @export
-     * @param {boolean} [newState=true] Turn on/off debug messages
+     * @param [newState=true] Turn on/off debug messages
      */
     debug(newState?: boolean): void;
 
     /**
      * Set the language the user will speak in. If this method is not called, defaults to 'en-US'.
      *
-     * @param {string} lang
      * @see [Languages](https://github.com/TalAter/annyang/blob/master/docs/FAQ.md#what-languages-are-supported)
      */
     setLanguage(lang: string): void;
@@ -144,8 +122,6 @@ export interface Annyang {
      * annyang.addCommands(commands2);
      * // annyang will now listen to all three commands
      * ````
-     *
-     * @param {CommandOption} commands
      */
     addCommands(commands: CommandOption): void;
 
@@ -161,7 +137,6 @@ export interface Annyang {
      * // Remove all existing commands
      * annyang.removeCommands();
      * ````
-     * @param {string} command
      */
     removeCommands(command?: string): void;
 
@@ -175,37 +150,22 @@ export interface Annyang {
      * // Don't respond to howdy or hi
      * annyang.removeCommands(['howdy', 'hi']);
      * ````
-     *
-     * @param {string[]} command
      */
     removeCommands(command: string[]): void;
 
-    /**
-     * @param {Events} event
-     * @param {(userSaid : string, commandText : string, results : string[]) => void} callback
-     * @param {*} [context]
-     */
     addCallback(event: Events, callback: (userSaid?: string, commandText?: string, results?: string[]) => void, context?: any): void;
 
-    /**
-     * @param {Events} [event]
-     * @param {Function} [callback]
-     */
     removeCallback(event?: Events, callback?: (userSaid: string, commandText: string, results: string[]) => void): void;
 
     /**
      * Returns true if speech recognition is currently on.
      * Returns false if speech recognition is off or annyang is paused.
-     *
-     * @returns {boolean}
      */
     isListening(): boolean;
 
     /**
      * Returns the instance of the browser's SpeechRecognition object used by annyang.
      * Useful in case you want direct access to the browser's Speech Recognition engine.
-     *
-     * @returns {*}
      */
     getSpeechRecognizer(): any;
 
@@ -223,8 +183,6 @@ export interface Annyang {
      *     ['Time for some thrilling heroics', 'Time for some thrilling aerobics']
      *   );
      * ````
-     *
-     * @param {string} command
      */
     trigger(command: string | string[]): void;
 }
diff --git a/types/ansi-colors/ansi-colors-tests.ts b/types/ansi-colors/ansi-colors-tests.ts
new file mode 100644
index 0000000000..9a9afc43f4
--- /dev/null
+++ b/types/ansi-colors/ansi-colors-tests.ts
@@ -0,0 +1,30 @@
+import * as colors from 'ansi-colors';
+
+let s: string;
+
+s = colors.bgblack("hello");
+s = colors.bgblue("hello");
+s = colors.bgcyan("hello");
+s = colors.bggreen("hello");
+s = colors.bgmagenta("hello");
+s = colors.bgred("hello");
+s = colors.bgwhite("hello");
+s = colors.bgyellow("hello");
+s = colors.black("hello");
+s = colors.blue("hello");
+s = colors.bold("hello");
+s = colors.cyan("hello");
+s = colors.dim("hello");
+s = colors.gray("hello");
+s = colors.green("hello");
+s = colors.grey("hello");
+s = colors.hidden("hello");
+s = colors.inverse("hello");
+s = colors.italic("hello");
+s = colors.magenta("hello");
+s = colors.red("hello");
+s = colors.reset("hello");
+s = colors.strikethrough("hello");
+s = colors.underline("hello");
+s = colors.white("hello");
+s = colors.yellow("hello");
diff --git a/types/ansi-colors/index.d.ts b/types/ansi-colors/index.d.ts
new file mode 100644
index 0000000000..092c4c1f2b
--- /dev/null
+++ b/types/ansi-colors/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for ansi-colors 1.0
+// Project: https://github.com/doowb/ansi-colors
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function bgblack(s: string): string;
+export function bgblue(s: string): string;
+export function bgcyan(s: string): string;
+export function bggreen(s: string): string;
+export function bgmagenta(s: string): string;
+export function bgred(s: string): string;
+export function bgwhite(s: string): string;
+export function bgyellow(s: string): string;
+export function black(s: string): string;
+export function blue(s: string): string;
+export function bold(s: string): string;
+export function cyan(s: string): string;
+export function dim(s: string): string;
+export function gray(s: string): string;
+export function green(s: string): string;
+export function grey(s: string): string;
+export function hidden(s: string): string;
+export function inverse(s: string): string;
+export function italic(s: string): string;
+export function magenta(s: string): string;
+export function red(s: string): string;
+export function reset(s: string): string;
+export function strikethrough(s: string): string;
+export function underline(s: string): string;
+export function white(s: string): string;
+export function yellow(s: string): string;
diff --git a/types/ansi-colors/tsconfig.json b/types/ansi-colors/tsconfig.json
new file mode 100644
index 0000000000..8a0f980cbc
--- /dev/null
+++ b/types/ansi-colors/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ansi-colors-tests.ts"
+    ]
+}
diff --git a/types/chunked-dc/tslint.json b/types/ansi-colors/tslint.json
similarity index 100%
rename from types/chunked-dc/tslint.json
rename to types/ansi-colors/tslint.json
diff --git a/types/ansi-regex/ansi-regex-tests.ts b/types/ansi-regex/ansi-regex-tests.ts
new file mode 100644
index 0000000000..a5787902f0
--- /dev/null
+++ b/types/ansi-regex/ansi-regex-tests.ts
@@ -0,0 +1,13 @@
+import ansiRegex = require("ansi-regex");
+
+ansiRegex(); // $ExpectType RegExp
+
+// From the ansi-regex README.md
+ansiRegex().test('\u001B[4mcake\u001B[0m'); // $ExpectType boolean
+// => true
+
+ansiRegex().test('cake'); // $ExpectType boolean
+// => false
+
+'\u001B[4mcake\u001B[0m'.match(ansiRegex()); // $ExpectType RegExpMatchArray | null
+// => ['\u001B[4m', '\u001B[0m']
diff --git a/types/ansi-regex/index.d.ts b/types/ansi-regex/index.d.ts
new file mode 100644
index 0000000000..34890912dc
--- /dev/null
+++ b/types/ansi-regex/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for ansi-regex 3.0
+// Project: https://github.com/chalk/ansi-regex#readme
+// Definitions by: Manish Vachharajani <https://github.com/mvachhar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function r(): RegExp;
+export = r;
diff --git a/types/ansi-regex/tsconfig.json b/types/ansi-regex/tsconfig.json
new file mode 100644
index 0000000000..cf1ac84a5c
--- /dev/null
+++ b/types/ansi-regex/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+	"strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ansi-regex-tests.ts"
+    ]
+}
diff --git a/types/cypress/tslint.json b/types/ansi-regex/tslint.json
similarity index 100%
rename from types/cypress/tslint.json
rename to types/ansi-regex/tslint.json
diff --git a/types/ansi-styles/tslint.json b/types/ansi-styles/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ansi-styles/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ansicolors/tslint.json b/types/ansicolors/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ansicolors/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/any-db-transaction/tslint.json b/types/any-db-transaction/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/any-db-transaction/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/any-db/tslint.json b/types/any-db/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/any-db/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/anybar/tslint.json b/types/anybar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/anybar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/anydb-sql-migrations/anydb-sql-migrations-tests.ts b/types/anydb-sql-migrations/anydb-sql-migrations-tests.ts
deleted file mode 100644
index ed79ace368..0000000000
--- a/types/anydb-sql-migrations/anydb-sql-migrations-tests.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import anydbsql = require('anydb-sql');
-import { Table, Column } from 'anydb-sql'
-import migrator = require('anydb-sql-migrations');
-
-function do_not_run() {
-
-    var db = anydbsql({
-        url: 'postgres://user:pass@host:port/database',
-        connections: { min: 2, max: 20 }
-    });
-
-    migrator
-    .create(db, '/path/to/migrations/dir')
-    .run();
-}
diff --git a/types/anydb-sql-migrations/index.d.ts b/types/anydb-sql-migrations/index.d.ts
deleted file mode 100644
index f6e12ed752..0000000000
--- a/types/anydb-sql-migrations/index.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for anydb-sql-migrations
-// Project: https://github.com/spion/anydb-sql-migrations
-// Definitions by: Gorgi Kosev <https://github.com/spion>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import Promise = require('bluebird');
-import { Column, Table, Transaction, AnydbSql } from 'anydb-sql';
-export interface Migration {
-    version: string;
-}
-export interface MigrationsTable extends Table<Migration> {
-    version: Column<string>;
-}
-export interface MigFn {
-    (tx: Transaction): Promise<any>;
-}
-export interface MigrationTask {
-    up: MigFn;
-    down: MigFn;
-    name: string;
-}
-export declare function create(db: AnydbSql, tasks: string | MigrationTask[]): {
-    run: () => Promise<any>;
-    migrateTo: (target?: string) => Promise<any>;
-    check: (f: (m: {
-        type: string;
-        items: MigrationTask[];
-    }) => any) => Promise<any>;
-};
diff --git a/types/anydb-sql-migrations/package.json b/types/anydb-sql-migrations/package.json
deleted file mode 100644
index 7ce063c332..0000000000
--- a/types/anydb-sql-migrations/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "anydb-sql": "^0.6.53"
-    }
-}
\ No newline at end of file
diff --git a/types/anydb-sql-migrations/tsconfig.json b/types/anydb-sql-migrations/tsconfig.json
deleted file mode 100644
index 33bb5ae800..0000000000
--- a/types/anydb-sql-migrations/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "anydb-sql-migrations-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/apex.js/index.d.ts b/types/apex.js/index.d.ts
index 20178369dc..0998ce794c 100644
--- a/types/apex.js/index.d.ts
+++ b/types/apex.js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/apex/node-apex
 // Definitions by: Yoriki Yamaguchi <https://github.com/y13i>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="aws-lambda" />
 
diff --git a/types/aphrodite/tslint.json b/types/aphrodite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/aphrodite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/api-error-handler/api-error-handler-tests.ts b/types/api-error-handler/api-error-handler-tests.ts
index 3bc39c4a7b..67afbb0fce 100644
--- a/types/api-error-handler/api-error-handler-tests.ts
+++ b/types/api-error-handler/api-error-handler-tests.ts
@@ -1,4 +1,3 @@
-
 import * as errorHandler from 'api-error-handler';
 import * as express from 'express';
 
diff --git a/types/api-error-handler/index.d.ts b/types/api-error-handler/index.d.ts
index e9337cc448..41e91a35ea 100644
--- a/types/api-error-handler/index.d.ts
+++ b/types/api-error-handler/index.d.ts
@@ -2,9 +2,7 @@
 // Project: https://github.com/expressjs/api-error-handler
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
+// TypeScript Version: 2.2
 
 import * as express from 'express';
 
diff --git a/types/api-error-handler/tslint.json b/types/api-error-handler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/api-error-handler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/apigee-access/tslint.json b/types/apigee-access/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/apigee-access/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/app-root-path/tslint.json b/types/app-root-path/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/app-root-path/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/appdmg/appdmg-tests.ts b/types/appdmg/appdmg-tests.ts
new file mode 100644
index 0000000000..47800d622f
--- /dev/null
+++ b/types/appdmg/appdmg-tests.ts
@@ -0,0 +1,47 @@
+import appdmg = require("appdmg");
+import { Options, Specification, SpecificationOptions } from "appdmg";
+
+const proc = appdmg({
+  target: "/foo/bar.dmg",
+  basepath: "/baz",
+  specification: {
+    title: "Happy",
+    icon: "happy.icns",
+    background: "happy.tiff",
+    format: "UDBZ",
+    "icon-size": 98,
+    contents: [
+      {
+        x: 405,
+        y: 150,
+        type: "link",
+        path: "/Applications"
+      },
+      {
+        x: 127,
+        y: 150,
+        type: "file",
+        path: "/foo/bar.app"
+      }
+    ]
+  }
+});
+
+proc.on("progress", info => {
+  if (info.type === "step-begin") {
+    process.stdout.write(`${info.title}... `);
+  }
+
+  if (info.type === "step-end") {
+    process.stdout.write(`${info.status}\n`);
+  }
+});
+
+proc.on("finish", () => {
+  console.log('Installer was created successfully!');
+});
+
+proc.on("error", (err) => {
+  console.error('Installer could not be created', err);
+  process.exit(1);
+});
diff --git a/types/appdmg/index.d.ts b/types/appdmg/index.d.ts
new file mode 100644
index 0000000000..2e23009f44
--- /dev/null
+++ b/types/appdmg/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for appdmg 0.5
+// Project: https://github.com/LinusU/node-appdmg#readme
+// Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace appdmg {
+  interface Progress {
+    current: number;
+    total: number;
+    type: "step-begin" | "step-end";
+    title: string;
+    status: "ok" | "skip" | "fail";
+  }
+
+  interface EventEmitter extends NodeJS.EventEmitter {
+    on(event: "progress", listener: (info: Progress) => void): this;
+    on(event: "finish", listener: () => void): this;
+    on(event: "error", listener: (err: any) => void): this;
+  }
+
+  interface SpecificationOptions {
+    app: string;
+    background: string;
+    icon: string;
+    iconSize: number;
+    title: string;
+  }
+
+  interface SpecificationWindow {
+    position?: { x: number; y: number };
+    size?: { width: number; height: number };
+  }
+
+  interface SpecificationContents {
+    x: number;
+    y: number;
+    type: "link" | "file" | "position";
+    path: string;
+    name?: string;
+  }
+
+  interface SpecificationCodeSign {
+    "signing-identity": string;
+    identifier?: string;
+  }
+
+  interface Specification {
+    title: string;
+    icon?: string;
+    background?: string;
+    "background-color"?: string;
+    "icon-size"?: number;
+    window?: SpecificationWindow;
+    format: "UDRW" | "UDRO" | "UDCO" | "UDZO" | "UDBZ" | "ULFO";
+    contents: SpecificationContents[];
+    "code-sign"?: SpecificationCodeSign;
+  }
+
+  interface Options {
+    target: string;
+    basepath: string;
+    specification: Specification;
+  }
+}
+
+declare function appdmg(options?: appdmg.Options): appdmg.EventEmitter;
+
+export = appdmg;
diff --git a/types/appdmg/tsconfig.json b/types/appdmg/tsconfig.json
new file mode 100644
index 0000000000..f4ca0f95c5
--- /dev/null
+++ b/types/appdmg/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "appdmg-tests.ts"
+    ]
+}
diff --git a/types/egg/tslint.json b/types/appdmg/tslint.json
similarity index 100%
rename from types/egg/tslint.json
rename to types/appdmg/tslint.json
diff --git a/types/appframework/tslint.json b/types/appframework/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/appframework/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/applepayjs/applepayjs-tests.ts b/types/applepayjs/applepayjs-tests.ts
index 505dbd2daf..99b323453b 100644
--- a/types/applepayjs/applepayjs-tests.ts
+++ b/types/applepayjs/applepayjs-tests.ts
@@ -22,7 +22,7 @@ describe("ApplePaySession", () => {
     });
     it("can create a new instance", () => {
         const version = 1;
-        const paymentRequest = {
+        const paymentRequest: ApplePayJS.ApplePayPaymentRequest = {
             countryCode: "US",
             currencyCode: "USD",
             supportedNetworks: [
@@ -57,8 +57,8 @@ describe("ApplePaySession", () => {
             });
     });
     it("can call instance methods", () => {
-        const version = 1;
-        const paymentRequest = {
+        const version = 3;
+        const paymentRequest: ApplePayJS.ApplePayPaymentRequest = {
             countryCode: "US",
             currencyCode: "USD",
             supportedNetworks: [
@@ -66,7 +66,9 @@ describe("ApplePaySession", () => {
                 "visa"
             ],
             merchantCapabilities: [
-                "supports3DS"
+                "supports3DS",
+                "supportsCredit",
+                "supportsDebit"
             ],
             total: {
                 label: "My Store",
@@ -80,15 +82,29 @@ describe("ApplePaySession", () => {
         session.completeMerchantValidation({
             foo: "bar"
         });
+
         session.completePayment(ApplePaySession.STATUS_SUCCESS);
 
-        const total = {
+        const authorizationResult: ApplePayJS.ApplePayPaymentAuthorizationResult = {
+            status: ApplePaySession.STATUS_FAILURE,
+            errors: [
+                {
+                    code: "addressUnserviceable",
+                    contactField: "postalCode",
+                    message: "The specified postal code cannot be delivered to."
+                }
+            ]
+        };
+
+        session.completePayment(authorizationResult);
+
+        const total: ApplePayJS.ApplePayLineItem = {
             label: "Subtotal",
             type: "final",
             amount: "35.00"
         };
 
-        const lineItems = [
+        const lineItems: ApplePayJS.ApplePayLineItem[] = [
             {
                 label: "Subtotal",
                 type: "final",
@@ -97,11 +113,12 @@ describe("ApplePaySession", () => {
             {
                 label: "Free Shipping",
                 amount: "0.00",
-                type: "pending"
+                type: "final"
             },
             {
                 label: "Estimated Tax",
-                amount: "3.06"
+                amount: "3.06",
+                type: "pending"
             }
         ];
 
@@ -120,17 +137,35 @@ describe("ApplePaySession", () => {
 
         session.completePaymentMethodSelection(total, lineItems);
 
+        const paymentUpdate = {
+            newTotal: total
+        };
+
+        session.completePaymentMethodSelection(paymentUpdate);
+
         session.completeShippingContactSelection(
             ApplePaySession.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
             shippingMethods,
             total,
             lineItems);
 
+        const contactUpdate = {
+            newTotal: total
+        };
+
+        session.completeShippingContactSelection(contactUpdate);
+
         session.completeShippingMethodSelection(
             ApplePaySession.STATUS_SUCCESS,
             total,
             lineItems);
 
+        const shippingUpdate = {
+            newTotal: total
+        };
+
+        session.completeShippingMethodSelection(shippingUpdate);
+
         session.oncancel = (event: ApplePayJS.Event): void => {
             event.cancelBubble = true;
         };
@@ -201,7 +236,9 @@ describe("ApplePayPaymentRequest", () => {
                 "1 Infinite Loop"
             ],
             locality: "Cupertino",
+            subLocality: "",
             administrativeArea: "CA",
+            subAdministrativeArea: "",
             postalCode: "95014",
             country: "United States",
             countryCode: "US"
@@ -233,7 +270,7 @@ describe("ApplePayPaymentRequest", () => {
             "postalAddress",
             "name",
             "phone",
-            "email"
+            "name"
         ];
 
         paymentRequest.shippingContact = {
@@ -241,11 +278,15 @@ describe("ApplePayPaymentRequest", () => {
             familyName: "Patel",
             givenName: "Ravi",
             phoneNumber: "(408) 555-5555",
+            phoneticFamilyName: "Patel",
+            phoneticGivenName: "Ravi",
             addressLines: [
                 "1 Infinite Loop"
             ],
             locality: "Cupertino",
+            subLocality: "",
             administrativeArea: "CA",
+            subAdministrativeArea: "",
             postalCode: "95014",
             country: "United States",
             countryCode: "US"
@@ -265,5 +306,6 @@ describe("ApplePayPaymentRequest", () => {
         ];
 
         paymentRequest.shippingType = "storePickup";
+        paymentRequest.shippingType = "delivery";
     });
 });
diff --git a/types/applepayjs/index.d.ts b/types/applepayjs/index.d.ts
index f705a4fad2..a37f60b6fd 100644
--- a/types/applepayjs/index.d.ts
+++ b/types/applepayjs/index.d.ts
@@ -1,26 +1,26 @@
-// Type definitions for Apple Pay JS 1.0
+// Type definitions for Apple Pay JS 3.0
 // Project: https://developer.apple.com/reference/applepayjs
-// Definitions by: Martin Costello <https://martincostello.com/>
+// Definitions by: Martin Costello <https://github.com/martincostello>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
- * A session object for managing the payment process on the web.
+ * ApplePaySession is the entry point for Apple Pay on the web.
  */
 declare class ApplePaySession extends EventTarget {
     /**
-     * Creates a new instance of the ApplePaySession class.
-     * @param version - The version of the ApplePay JS API you are using.
-     * @param paymentRequest - An ApplePayPaymentRequest object that contains the information that is displayed on the Apple Pay payment sheet.
+     * The entry point for Apple Pay on the web.
+     * @param version - The version number of the ApplePay JS API you are using. The current API version number is 3.
+     * @param paymentRequest - An ApplePayPaymentRequest object that contains the information to be displayed on the Apple Pay payment sheet.
      */
     constructor(version: number, paymentRequest: ApplePayJS.ApplePayPaymentRequest);
 
     /**
-     * A callback function that is automatically called when the payment UI is dismissed with an error.
+     * A callback function that is automatically called when the payment UI is dismissed.
      */
     oncancel: (event: ApplePayJS.Event) => void;
 
     /**
-     * A callback function that is automatically called when the user has authorized the Apple Pay payment, typically via TouchID.
+     * A callback function that is automatically called when the user has authorized the Apple Pay payment with Touch ID, Face ID, or passcode.
      */
     onpaymentauthorized: (event: ApplePayJS.ApplePayPaymentAuthorizedEvent) => void;
 
@@ -45,28 +45,28 @@ declare class ApplePaySession extends EventTarget {
     onvalidatemerchant: (event: ApplePayJS.ApplePayValidateMerchantEvent) => void;
 
     /**
-     * Indicates whether or not the device supports Apple Pay.
+     * Indicates whether the device supports Apple Pay.
      * @returns true if the device supports making payments with Apple Pay; otherwise, false.
      */
     static canMakePayments(): boolean;
 
     /**
-     * Indicates whether or not the device supports Apple Pay and if the user has an active card in Wallet.
-     * @param merchantIdentifier - The merchant ID received when the merchant enrolled in Apple Pay.
-     * @returns true if the device supports Apple Pay and there is at least one active card in Wallet; otherwise, false.
+     * Indicates whether the device supports Apple Pay and whether the user has an active card in Wallet.
+     * @param merchantIdentifier - The merchant ID created when the merchant enrolled in Apple Pay.
+     * @returns true if the device supports Apple Pay and there is at least one active card in Wallet that is qualified for payments on the web; otherwise, false.
      */
     static canMakePaymentsWithActiveCard(merchantIdentifier: string): Promise<boolean>;
 
     /**
      * Displays the Set up Apple Pay button.
-     * @param merchantIdentifier - The merchant ID received when the merchant enrolled in Apple Pay.
+     * @param merchantIdentifier - The merchant ID created when the merchant enrolled in Apple Pay.
      * @returns A boolean value indicating whether setup was successful.
      */
     static openPaymentSetup(merchantIdentifier: string): Promise<boolean>;
 
     /**
-     * Verifies if a web browser supports a given Apple Pay JS API version.
-     * @param version - A number representing the Apple Pay JS API version being checked. The initial version is 1.
+     * Verifies whether a web browser supports a given Apple Pay JS API version.
+     * @param version - A number representing the Apple Pay JS API version being checked. The initial version is 1. The latest version is 3.
      * @returns A boolean value indicating whether the web browser supports the given API version. Returns false if the web browser does not support the specified version.
      */
     static supportsVersion(version: number): boolean;
@@ -82,26 +82,33 @@ declare class ApplePaySession extends EventTarget {
     begin(): void;
 
     /**
-     * Call after the merchant has been validated.
+     * Completes the validation for a merchant session.
      * @param merchantSession - An opaque message session object.
      */
     completeMerchantValidation(merchantSession: any): void;
 
     /**
-     * Call when a payment has been authorized.
-     * @param status - The status of the payment.
+     * Completes the payment authorization with a result.
+     * @param result - The status of the payment, whether it succeeded or failed for Apple Pay JS versions 1 and 2,
+     * or the result of the payment authorization, including its status and list of errors for Apple Pay JS version 3.
      */
-    completePayment(status: number): void;
+    completePayment(result: number | ApplePayJS.ApplePayPaymentAuthorizationResult): void;
 
     /**
-     * Call after a payment method has been selected.
+     * Call after a payment method has been selected for Apple Pay JS versions 1 and 2.
      * @param newTotal - An ApplePayLineItem dictionary representing the total price for the purchase.
      * @param newLineItems - A sequence of ApplePayLineItem dictionaries.
      */
     completePaymentMethodSelection(newTotal: ApplePayJS.ApplePayLineItem, newLineItems: ApplePayJS.ApplePayLineItem[]): void;
 
     /**
-     * Call after a shipping contact has been selected.
+     * Completes the selection of a payment method with an update for Apple Pay JS version 3.
+     * @param update - The updated payment method.
+     */
+    completePaymentMethodSelection(update: ApplePayJS.ApplePayPaymentMethodUpdate): void;
+
+    /**
+     * Completes the selection of a shipping contact with an update for Apple Pay JS versions 1 and 2.
      * @param status - The status of the shipping contact update.
      * @param newShippingMethods - A sequence of ApplePayShippingMethod dictionaries.
      * @param newTotal - An ApplePayLineItem dictionary representing the total price for the purchase.
@@ -114,13 +121,25 @@ declare class ApplePaySession extends EventTarget {
         newLineItems: ApplePayJS.ApplePayLineItem[]): void;
 
     /**
-     * Call after the shipping method has been selected.
+     * Completes the selection of a shipping contact with an update for Apple Pay JS version 3.
+     * @param update - The updated shipping contact.
+     */
+    completeShippingContactSelection(update: ApplePayJS.ApplePayShippingContactUpdate): void;
+
+    /**
+     * Call after the shipping method has been selected for Apple Pay JS versions 1 and 2.
      * @param status - The status of the shipping method update.
      * @param newTotal - An ApplePayLineItem dictionary representing the total price for the purchase.
      * @param newLineItems - A sequence of ApplePayLineItem dictionaries.
      */
     completeShippingMethodSelection(status: number, newTotal: ApplePayJS.ApplePayLineItem, newLineItems: ApplePayJS.ApplePayLineItem[]): void;
 
+    /**
+     * Completes the selection of a shipping method with an update for Apple Pay JS version 3.
+     * @param update - The updated shipping method.
+     */
+    completeShippingMethodSelection(update: ApplePayJS.ApplePayShippingMethodUpdate): void;
+
     /**
      * The requested action succeeded.
      */
@@ -163,6 +182,78 @@ declare class ApplePaySession extends EventTarget {
 }
 
 declare namespace ApplePayJS {
+    /**
+     * Field names used for requesting contact information in a payment request.
+     */
+    type ApplePayContactField =
+        'email' |
+        'name' |
+        'phone' |
+        'postalAddress' |
+        'phoneticName';
+
+    /**
+     * A customizable error type that you create to indicate problems with the address or contact information on an Apple Pay sheet.
+     */
+    interface ApplePayError {
+        /**
+         * The error code for this instance.
+         */
+        code: ApplePayErrorCode;
+
+        /**
+         * The name of the field that contains the error.
+         */
+        contactField?: ApplePayErrorContactField;
+
+        /**
+         * A localized, user-facing string that describes the error.
+         */
+        message: string;
+    }
+
+    /**
+     * The error code that indicates whether an error on the payment sheet is for shipping or billing information, or for another kind of error.
+     */
+    type ApplePayErrorCode =
+        /**
+         * Shipping address or contact information is invalid or missing.
+         */
+        'shippingContactInvalid' |
+
+        /**
+         * Billing address information is invalid or missing.
+         */
+        'billingContactInvalid' |
+
+        /**
+         * The merchant cannot provide service to the shipping address (for example, can't deliver to a P.O. Box).
+         */
+        'addressUnserviceable' |
+
+        /**
+         * An unknown but nonfatal error occurred during payment processing. The user can attempt authorization again.
+         */
+        'unknown';
+
+    /**
+     * Names of the fields in the shipping or billing contact information, used to locate errors in the payment sheet.
+     */
+    type ApplePayErrorContactField =
+        'phoneNumber' |
+        'emailAddress' |
+        'name' |
+        'phoneticName' |
+        'postalAddress' |
+        'addressLines' |
+        'locality' |
+        'subLocality' |
+        'postalCode' |
+        'administrativeArea' |
+        'subAdministrativeArea' |
+        'country' |
+        'countryCode';
+
     /**
      * Defines a line item in a payment request - for example, total, tax, discount, or grand total.
      */
@@ -180,15 +271,53 @@ declare namespace ApplePayJS {
         /**
          * A value that indicates if the line item is final or pending.
          */
-        type?: string;
+        type?: ApplePayLineItemType;
     }
 
+    /**
+     * A type that indicates whether a line item is final or pending.
+     */
+    type ApplePayLineItemType =
+        /**
+         * A line item representing the known, final cost.
+         */
+        'final' |
+
+        /**
+         * A line item representing an estimated or unknown cost.
+         */
+        'pending';
+
+    /**
+     * The payment capabilities supported by the merchant.
+     */
+    type ApplePayMerchantCapability =
+        /**
+         * Required. This value must be supplied.
+         */
+        'supports3DS' |
+
+        /**
+         * Include this value only if you support China Union Pay transactions.
+         */
+        'supportsEMV' |
+
+        /**
+         * Optional. If present, only transactions that are categorized as credit cards are allowed.
+         */
+        'supportsCredit' |
+
+        /**
+         * Optional. If present, only transactions that are categorized as debit cards are allowed.
+         */
+        'supportsDebit';
+
     /**
      * Represents the result of authorizing a payment request and contains encrypted payment information.
      */
     interface ApplePayPayment {
         /**
-         * The encrypted token for an authorized payment.
+         * The encrypted information for an authorized payment.
          */
         token: ApplePayPaymentToken;
 
@@ -208,11 +337,26 @@ declare namespace ApplePayJS {
      */
     abstract class ApplePayPaymentAuthorizedEvent extends Event {
         /**
-         * The payment token used to authorize a payment.
+         * The authorized payment information for this transaction.
          */
         readonly payment: ApplePayPayment;
     }
 
+    /**
+     * The result of payment authorization, including status and errors.
+     */
+    interface ApplePayPaymentAuthorizationResult {
+        /**
+         * The status code for the authorization result.
+         */
+        status: number;
+
+        /**
+         * A list of custom errors to display on the payment sheet.
+         */
+        errors?: ApplePayError[];
+    }
+
     /**
      * Encapsulates contact information needed for billing and shipping.
      */
@@ -220,56 +364,76 @@ declare namespace ApplePayJS {
         /**
          * An email address for the contact.
          */
-        emailAddress: string;
+        emailAddress?: string;
 
         /**
          * The contact's family name.
          */
-        familyName: string;
+        familyName?: string;
 
         /**
          * The contact's given name.
          */
-        givenName: string;
+        givenName?: string;
 
         /**
          * A phone number for the contact.
          */
-        phoneNumber: string;
+        phoneNumber?: string;
 
         /**
-         * The address for the contact.
+         * The phonetic spelling of the contact's family name.
          */
-        addressLines: string[];
+        phoneticFamilyName?: string;
+
+        /**
+         * The phonetic spelling of the contact's given name.
+         */
+        phoneticGivenName?: string;
+
+        /**
+         * The street portion of the address for the contact.
+         */
+        addressLines?: string[];
 
         /**
          * The city for the contact.
          */
-        locality: string;
+        locality?: string;
+
+        /**
+         * Additional information associated with the location, typically defined at the city or town level (such as district or neighborhood), in a postal address.
+         */
+        subLocality?: string;
 
         /**
          * The state for the contact.
          */
-        administrativeArea: string;
+        administrativeArea?: string;
 
         /**
-         * The zip code, where applicable, for the contact.
+         * The subadministrative area (such as a county or other region) in a postal address.
          */
-        postalCode: string;
+        subAdministrativeArea?: string;
 
         /**
-         * The colloquial country name for the contact.
+         * The zip code or postal code, where applicable, for the contact.
          */
-        country: string;
+        postalCode?: string;
 
         /**
-         * The contact's ISO country code.
+         * The name of the country for the contact.
          */
-        countryCode: string;
+        country?: string;
+
+        /**
+         * The contact’s two-letter ISO 3166 country code.
+         */
+        countryCode?: string;
     }
 
     /**
-     * Contains information about an Apple Pay payment card.
+     * A dictionary that describes an Apple Pay payment card.
      */
     interface ApplePayPaymentMethod {
         /**
@@ -279,21 +443,29 @@ declare namespace ApplePayJS {
 
         /**
          * A string, suitable for display, that is the name of the payment network backing the card.
-         * The value is one of the supported networks specified in the supportedNetworks property of the ApplePayPaymentRequest.
          */
         network: string;
 
         /**
          * A value representing the card's type of payment.
          */
-        type: string;
+        type: ApplePayPaymentMethodType;
 
         /**
-         * The payment pass object associated with the payment.
+         * The payment pass object currently selected to complete the payment.
          */
         paymentPass: ApplePayPaymentPass;
     }
 
+    /**
+     * A payment card's type of payment.
+     */
+    type ApplePayPaymentMethodType =
+        'debit' |
+        'credit' |
+        'prepaid' |
+        'store';
+
     /**
      * The ApplePayPaymentMethodSelectedEvent class defines the attributes contained by the ApplePaySession.onpaymentmethodselected callback function.
      */
@@ -304,6 +476,21 @@ declare namespace ApplePayJS {
         readonly paymentMethod: ApplePayPaymentMethod;
     }
 
+    /**
+     * Updated transaction details resulting from a change in payment method.
+     */
+    interface ApplePayPaymentMethodUpdate {
+        /**
+         * An optional list of line items.
+         */
+        newLineItems?: ApplePayLineItem[];
+
+        /**
+         * The new total resulting from a change in the payment method.
+         */
+        newTotal: ApplePayLineItem;
+    }
+
     /**
      * Represents a provisioned payment card for Apple Pay payments.
      */
@@ -331,9 +518,38 @@ declare namespace ApplePayJS {
         /**
          * The activation state of the pass.
          */
-        activationState: string;
+        activationState: ApplePayPaymentPassActivationState;
     }
 
+    /**
+     * Payment pass activation states.
+     */
+    type ApplePayPaymentPassActivationState =
+        /**
+         * Active and ready to be used for payment.
+         */
+        'activated' |
+
+        /**
+         * Not active but may be activated by the issuer.
+         */
+        'requiresActivation' |
+
+        /**
+         * Not ready for use but activation is in progress.
+         */
+        'activating' |
+
+        /**
+         * Not active and can't be activated.
+         */
+        'suspended' |
+
+        /**
+         * Not active because the issuer has disabled the account associated with the device.
+         */
+        'deactivated';
+
     /**
      * Encapsulates a request for payment, including information about payment processing capabilities, the payment amount, and shipping information.
      */
@@ -357,7 +573,7 @@ declare namespace ApplePayJS {
          * The payment capabilities supported by the merchant.
          * The value must at least contain ApplePayMerchantCapability.supports3DS.
          */
-        merchantCapabilities: string[];
+        merchantCapabilities: ApplePayMerchantCapability[];
 
         /**
          * The payment networks supported by the merchant.
@@ -377,12 +593,12 @@ declare namespace ApplePayJS {
         /**
          * The billing information that you require from the user in order to process the transaction.
          */
-        requiredBillingContactFields?: string[];
+        requiredBillingContactFields?: ApplePayContactField[];
 
         /**
          * The shipping information that you require from the user in order to fulfill the order.
          */
-        requiredShippingContactFields?: string[];
+        requiredShippingContactFields?: ApplePayContactField[];
 
         /**
          * Shipping contact information for the user.
@@ -397,7 +613,12 @@ declare namespace ApplePayJS {
         /**
          * How the items are to be shipped.
          */
-        shippingType?: string;
+        shippingType?: ApplePayShippingType;
+
+        /**
+         * A list of ISO 3166 country codes for limiting payments to cards from specific countries.
+         */
+        supportedCountries?: string[];
 
         /**
          * Optional user-defined data.
@@ -406,7 +627,7 @@ declare namespace ApplePayJS {
     }
 
     /**
-     * Contains the user's payment credentials.
+     * An object that contains the user's payment credentials.
      */
     interface ApplePayPaymentToken {
         /**
@@ -426,7 +647,7 @@ declare namespace ApplePayJS {
     }
 
     /**
-     * The ApplePayShippingContactSelectedEvent class defines the attributes contained by the ApplePaySession.onshippingcontactselected callback function.
+     * Encapsulates the attributes contained by the onshippingcontactselected callback function.
      */
     abstract class ApplePayShippingContactSelectedEvent extends Event {
         /**
@@ -435,6 +656,31 @@ declare namespace ApplePayJS {
         readonly shippingContact: ApplePayPaymentContact;
     }
 
+    /**
+     * Updated transaction details resulting from a change in shipping contact, including any errors.
+     */
+    class ApplePayShippingContactUpdate {
+        /**
+         * List of custom errors to display on the payment sheet.
+         */
+        errors?: ApplePayError[];
+
+        /**
+         * An optional list of updated line items.
+         */
+        newLineItems?: ApplePayLineItem[];
+
+        /**
+         * A list of shipping methods that are available to the updated shipping contact.
+         */
+        newShippingMethods?: ApplePayShippingMethod[];
+
+        /**
+         * The new total resulting from a change in the shipping contact.
+         */
+        newTotal: ApplePayLineItem;
+    }
+
     /**
      * Defines a shipping method for delivering physical goods.
      */
@@ -471,11 +717,35 @@ declare namespace ApplePayJS {
     }
 
     /**
-     * The ApplePayValidateMerchantEvent class defines the attributes contained by the ApplePaySession.onvalidatemerchant callback function.
+     * Updated transaction details resulting from a change in shipping method.
+     */
+    interface ApplePayShippingMethodUpdate {
+        /**
+         * An optional list of updated line items.
+         */
+        newLineItems?: ApplePayLineItem[];
+
+        /**
+         * The new total resulting from a change in the shipping method.
+         */
+        newTotal: ApplePayLineItem;
+    }
+
+    /**
+     * A type that indicates how purchased items are to be shipped.
+     */
+    type ApplePayShippingType =
+        'shipping' |
+        'delivery' |
+        'storePickup' |
+        'servicePickup';
+
+    /**
+     * The attributes contained by the onvalidatemerchant callback function.
      */
     abstract class ApplePayValidateMerchantEvent extends Event {
         /**
-         * The URL used to validate the merchant server.
+         * The URL your server must use to validate itself and obtain a merchant session object.
          */
         readonly validationURL: string;
     }
diff --git a/types/appletvjs/tslint.json b/types/appletvjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/appletvjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index 17137d67dd..4214837ddf 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -777,7 +777,7 @@ declare module Microsoft.ApplicationInsights {
          * @param authenticatedUserId {string} - The authenticated user id. A unique and persistent string that represents each authenticated user in the service.
          * @param accountId {string} - An optional string to represent the account associated with the authenticated user.
          */
-        setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string): any;
+        setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string, storeInCookie?: boolean): any;
         /**
          * Clears the authenticated user id and the account id from the user context.
          */
diff --git a/types/applicationinsights-js/tslint.json b/types/applicationinsights-js/tslint.json
index e4be61c456..29f4a79556 100644
--- a/types/applicationinsights-js/tslint.json
+++ b/types/applicationinsights-js/tslint.json
@@ -6,7 +6,10 @@
         "no-declare-current-package": false,
         "no-internal-module": false,
         "no-mergeable-namespace": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
         "no-single-declare-module": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-qualifier": false
     }
 }
diff --git a/types/applicationinsights/applicationinsights-tests.ts b/types/applicationinsights/applicationinsights-tests.ts
deleted file mode 100644
index 00c303eff4..0000000000
--- a/types/applicationinsights/applicationinsights-tests.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as appInsights from "applicationinsights";
-
-// basic use
-appInsights.setup("<instrumentation_key>").start();
-
-// basic use with auto-collection configuration
-appInsights.setup("<instrumentation_key>")
-    .setAutoCollectRequests(false)
-    .setAutoCollectPerformance(false)
-    .setAutoCollectExceptions(false)
-    // no telemetry will be sent until .start() is called
-    // this prevents any of the auto-collectors from initializing
-    .enableVerboseLogging()
-    .start();
-
-appInsights.client.trackEvent("custom event", {customProperty: "custom property value"});
-appInsights.client.trackException(new Error("handled exceptions can be logged with this method"));
-appInsights.client.trackMetric("custom metric", 3);
-appInsights.client.trackTrace("trace message");
-appInsights.client.trackDependency("dependency name", "commandName", 500, true);
-
-// assign common properties to all telemetry
-appInsights.client.commonProperties = {
-    environment: "dev"
-};
-
-// send any pending data and log the response
-appInsights.client.sendPendingData(function (response) {
-    console.log(response);
-});
diff --git a/types/applicationinsights/index.d.ts b/types/applicationinsights/index.d.ts
deleted file mode 100644
index 471089a96f..0000000000
--- a/types/applicationinsights/index.d.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-// Type definitions for Application Insights v0.15.12
-// Project: https://github.com/Microsoft/ApplicationInsights-node.js
-// Definitions by: Scott Southwood <https://github.com/scsouthw>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface AutoCollectConsole {
-    constructor(client: Client): AutoCollectConsole;
-    enable(isEnabled: boolean): void;
-    isInitialized(): boolean;
-}
-
-interface AutoCollectExceptions {
-    constructor(client:Client): AutoCollectExceptions;
-    isInitialized(): boolean;
-    enable(isEnabled:boolean): void;
-}
-
-interface AutoCollectPerformance {
-    constructor(client: Client): AutoCollectPerformance;
-    enable(isEnabled: boolean): void;
-    isInitialized(): boolean;
-}
-
-interface AutoCollectRequests {
-    constructor(client: Client): AutoCollectRequests;
-    enable(isEnabled: boolean): void;
-    isInitialized(): boolean;
-}
-
-
-declare namespace ContractsModule {
-    enum DataPointType {
-        Measurement = 0,
-        Aggregation = 1,
-    }
-    enum DependencyKind {
-        SQL = 0,
-        Http = 1,
-        Other = 2,
-    }
-    enum DependencySourceType {
-        Undefined = 0,
-        Aic = 1,
-        Apmc = 2,
-    }
-    enum SessionState {
-        Start = 0,
-        End = 1,
-    }
-    enum SeverityLevel {
-        Verbose = 0,
-        Information = 1,
-        Warning = 2,
-        Error = 3,
-        Critical = 4,
-    }
-    interface ContextTagKeys {
-        applicationVersion: string;
-        applicationBuild: string;
-        deviceId: string;
-        deviceIp: string;
-        deviceLanguage: string;
-        deviceLocale: string;
-        deviceModel: string;
-        deviceNetwork: string;
-        deviceOEMName: string;
-        deviceOS: string;
-        deviceOSVersion: string;
-        deviceRoleInstance: string;
-        deviceRoleName: string;
-        deviceScreenResolution: string;
-        deviceType: string;
-        deviceMachineName: string;
-        locationIp: string;
-        operationId: string;
-        operationName: string;
-        operationParentId: string;
-        operationRootId: string;
-        operationSyntheticSource: string;
-        operationIsSynthetic: string;
-        sessionId: string;
-        sessionIsFirst: string;
-        sessionIsNew: string;
-        userAccountAcquisitionDate: string;
-        userAccountId: string;
-        userAgent: string;
-        userId: string;
-        userStoreRegion: string;
-        sampleRate: string;
-        internalSdkVersion: string;
-        internalAgentVersion: string;
-        constructor(): ContextTagKeys;
-    }
-    interface Domain {
-        ver: number;
-        properties: any;
-        constructor(): Domain;
-    }
-    interface Data<TDomain extends ContractsModule.Domain> {
-        baseType: string;
-        baseData: TDomain;
-        constructor(): Data<TDomain>;
-    }
-    interface Envelope {
-        ver: number;
-        name: string;
-        time: string;
-        sampleRate: number;
-        seq: string;
-        iKey: string;
-        flags: number;
-        deviceId: string;
-        os: string;
-        osVer: string;
-        appId: string;
-        appVer: string;
-        userId: string;
-        tags: {
-            [key: string]: string;
-        };
-        data: Data<Domain>;
-        constructor(): Envelope;
-    }
-    interface EventData extends ContractsModule.Domain {
-        ver: number;
-        name: string;
-        properties: any;
-        measurements: any;
-        constructor(): EventData;
-    }
-    interface MessageData extends ContractsModule.Domain {
-        ver: number;
-        message: string;
-        severityLevel: ContractsModule.SeverityLevel;
-        properties: any;
-        constructor(): MessageData;
-    }
-    interface ExceptionData extends ContractsModule.Domain {
-        ver: number;
-        handledAt: string;
-        exceptions: ExceptionDetails[];
-        severityLevel: ContractsModule.SeverityLevel;
-        problemId: string;
-        crashThreadId: number;
-        properties: any;
-        measurements: any;
-        constructor(): ExceptionData;
-    }
-    interface StackFrame {
-        level: number;
-        method: string;
-        assembly: string;
-        fileName: string;
-        line: number;
-        constructor(): StackFrame;
-    }
-    interface ExceptionDetails {
-        id: number;
-        outerId: number;
-        typeName: string;
-        message: string;
-        hasFullStack: boolean;
-        stack: string;
-        parsedStack: StackFrame[];
-        constructor(): ExceptionDetails;
-    }
-    interface DataPoint {
-        name: string;
-        kind: ContractsModule.DataPointType;
-        value: number;
-        count: number;
-        min: number;
-        max: number;
-        stdDev: number;
-        constructor(): DataPoint;
-    }
-    interface MetricData extends ContractsModule.Domain {
-        ver: number;
-        metrics: DataPoint[];
-        properties: any;
-        constructor(): MetricData;
-    }
-    interface PageViewData extends ContractsModule.EventData {
-        ver: number;
-        url: string;
-        name: string;
-        duration: string;
-        properties: any;
-        measurements: any;
-        constructor(): PageViewData;
-    }
-    interface PageViewPerfData extends ContractsModule.PageViewData {
-        ver: number;
-        url: string;
-        perfTotal: string;
-        name: string;
-        duration: string;
-        networkConnect: string;
-        sentRequest: string;
-        receivedResponse: string;
-        domProcessing: string;
-        properties: any;
-        measurements: any;
-        constructor(): PageViewPerfData;
-    }
-    interface RemoteDependencyData extends ContractsModule.Domain {
-        ver: number;
-        name: string;
-        kind: ContractsModule.DataPointType;
-        value: number;
-        count: number;
-        min: number;
-        max: number;
-        stdDev: number;
-        dependencyKind: ContractsModule.DependencyKind;
-        success: boolean;
-        async: boolean;
-        dependencySource: ContractsModule.DependencySourceType;
-        commandName: string;
-        dependencyTypeName: string;
-        properties: any;
-        constructor(): RemoteDependencyData;
-    }
-    interface AjaxCallData extends ContractsModule.PageViewData {
-        ver: number;
-        url: string;
-        ajaxUrl: string;
-        name: string;
-        duration: string;
-        requestSize: number;
-        responseSize: number;
-        timeToFirstByte: string;
-        timeToLastByte: string;
-        callbackDuration: string;
-        responseCode: string;
-        success: boolean;
-        properties: any;
-        measurements: any;
-        constructor(): AjaxCallData;
-    }
-    interface RequestData extends ContractsModule.Domain {
-        ver: number;
-        id: string;
-        name: string;
-        startTime: string;
-        duration: string;
-        responseCode: string;
-        success: boolean;
-        httpMethod: string;
-        url: string;
-        properties: any;
-        measurements: any;
-        constructor(): RequestData;
-    }
-    interface SessionStateData extends ContractsModule.Domain {
-        ver: number;
-        state: ContractsModule.SessionState;
-        constructor(): SessionStateData;
-    }
-    interface PerformanceCounterData extends ContractsModule.Domain {
-        ver: number;
-        categoryName: string;
-        counterName: string;
-        instanceName: string;
-        kind: DataPointType;
-        count: number;
-        min: number;
-        max: number;
-        stdDev: number;
-        value: number;
-        properties: any;
-        constructor(): PerformanceCounterData;
-    }
-}
-
-
-interface Channel {
-    constructor(isDisabled: () => boolean, getBatchSize: () => number, getBatchIntervalMs: () => number, sender: Sender): Channel;
-    /**
-     * Add a telemetry item to the send buffer
-     */
-    send(envelope: ContractsModule.Envelope): void;
-    handleCrash(envelope: ContractsModule.Envelope): void;
-    /**
-     * Immediately send buffered data
-     */
-    triggerSend(isNodeCrashing?: boolean): void;
-}
-
-interface Client {
-    config: Config;
-    context: Context;
-    commonProperties: {
-        [key: string]: string;
-    };
-    channel: Channel;
-    /**
-     * Constructs a new client of the client
-     * @param iKey the instrumentation key to use (read from environment variable if not specified)
-     */
-    constructor(iKey?: string): Client;
-    /**
-     * Log a user action or other occurrence.
-     * @param   name    A string to identify this event in the portal.
-     * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
-     * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
-     */
-    trackEvent(name: string, properties?: {
-        [key: string]: string;
-    }, measurements?: {
-        [key: string]: number;
-    }): void;
-    /**
-     * Log a trace message
-     * @param   message    A string to identify this event in the portal.
-     * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
-     */
-    trackTrace(message: string, severityLevel?: ContractsModule.SeverityLevel, properties?: {
-        [key: string]: string;
-    }): void;
-    /**
-     * Log an exception you have caught.
-     * @param   exception   An Error from a catch clause, or the string error message.
-     * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
-     * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
-     */
-    trackException(exception: Error, properties?: {
-        [key: string]: string;
-    }): void;
-    /**
-     * Log a numeric value that is not associated with a specific event. Typically used to send regular reports of performance indicators.
-     * To send a single measurement, use just the first two parameters. If you take measurements very frequently, you can reduce the
-     * telemetry bandwidth by aggregating multiple measurements and sending the resulting average at intervals.
-     * @param name   A string that identifies the metric.
-     * @param value  The value of the metric
-     * @param count  the number of samples used to get this value
-     * @param min    the min sample for this set
-     * @param max    the max sample for this set
-     * @param stdDev the standard deviation of the set
-     */
-    trackMetric(name: string, value: number, count?:number, min?: number, max?: number, stdDev?: number, properties?: {
-        [key: string]: string;
-    }): void;
-
-    /**
-     * Log an incoming http request to your server. The request data will be tracked during the response "finish" event if it is successful or the request "error"
-     * event if it fails. The request duration is automatically calculated as the timespan between when the trackRequest method was called, and when the response "finish"
-     * or request "error" events were fired.
-     * @param request   The http.IncomingMessage object to track
-     * @param response  The http.ServerResponse object for this request
-     * @param properties    map[string, string] - additional data used to filter requests in the portal. Defaults to empty.
-     */
-    trackRequest(request: any /* http.IncomingMessage */, response: any /* http.ServerResponse */, properties?: {
-        [key: string]: string;
-    }): void;
-
-    /**
-     * Log an incoming http request to your server. The request data is tracked synchronously rather than waiting for the response "finish"" or request "error"" events.
-     * Use this if you need your request telemetry to respect custom app insights operation and user context (for example if you set any appInsights.client.context.tags).
-     * @param request   The http.IncomingMessage object to track
-     * @param response  The http.ServerResponse object for this request
-     * @param ellapsedMilliseconds  The duration for this request. Defaults to 0.
-     * @param properties    map[string, string] - additional data used to filter requests in the portal. Defaults to empty.
-     * @param error     An error that was returned for this request if it was unsuccessful. Defaults to null.
-     */
-    trackRequestSync(request: any /*http.IncomingMessage */, response: any /*http.ServerResponse */, ellapsedMilliseconds?: number, properties?: {
-        [key: string]: string;}, error?: any) : void;
-
-    /**
-     * Log information about a dependency of your app. Typically used to track the time database calls or outgoing http requests take from your server.
-     * @param name   The name of the dependency (i.e. "myDatabse")
-     * @param commandname   The name of the command executed on the dependency
-     * @param elapsedTimeMs   The amount of time in ms that the dependency took to return the result
-     * @param success         True if the dependency succeeded, false otherwise
-     * @param dependencyTypeName  The type of the dependency (i.e. "SQL" "HTTP"). Defaults to empty.
-     * @param properties   map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
-     * @param dependencyKind   ContractsModule.DependencyKind of this dependency. Defaults to Other.
-     * @param async  True if the dependency was executed asynchronously, false otherwise. Defaults to false
-     * @param dependencySource  ContractsModule.DependencySourceType of this dependency. Defaults to Undefined.
-     */
-    trackDependency(name: string, commandName: string, elapsedTimeMs: number, success: boolean, dependencyTypeName?: string, properties?: {}, dependencyKind?: any, async?: boolean, dependencySource?: number): void;
-    /**
-     * Immediately send all queued telemetry.
-     */
-    sendPendingData(callback?: (response: string) => void): void;
-    getEnvelope(data: ContractsModule.Data<ContractsModule.Domain>, tagOverrides?: {
-        [key: string]: string;
-    }): ContractsModule.Envelope;
-    /**
-     * Generic track method for all telemetry types
-     * @param data the telemetry to send
-     * @param tagOverrides the context tags to use for this telemetry which overwrite default context values
-     */
-    track(data: ContractsModule.Data<ContractsModule.Domain>, tagOverrides?: {
-        [key: string]: string;
-    }): void;
-}
-
-interface Config {
-    instrumentationKey: string;
-    sessionRenewalMs: number;
-    sessionExpirationMs: number;
-    endpointUrl: string;
-    maxBatchSize: number;
-    maxBatchIntervalMs: number;
-    disableAppInsights: boolean;
-    constructor(instrumentationKey?: string): Config;
-}
-
-interface Context {
-    keys: ContractsModule.ContextTagKeys;
-    tags: {
-        [key: string]: string;
-    };
-    constructor(packageJsonPath?: string): Context;
-}
-
-interface Sender {
-    constructor(getUrl: () => string, onSuccess?: (response: string) => void, onError?: (error: Error) => void): Sender;
-    send(payload: any/* Buffer */): void;
-    saveOnCrash(payload: string): void;
-    /**
-     * enable caching events locally on error
-     */
-    enableCacheOnError(): void;
-    /**
-     * disable caching events locally on error
-     */
-    disableCacheOnError(): void;
-}
-
-/**
- * The singleton meta interface for the default client of the client. This interface is used to setup/start and configure
- * the auto-collection behavior of the application insights module.
- */
-interface ApplicationInsights {
-    client: Client;
-    /**
-     * Initializes a client with the given instrumentation key, if this is not specified, the value will be
-     * read from the environment variable APPINSIGHTS_INSTRUMENTATIONKEY
-     * @returns {ApplicationInsights/Client} a new client
-     */
-    getClient(instrumentationKey?: string): Client;
-    /**
-     * Initializes the default client of the client and sets the default configuration
-     * @param instrumentationKey the instrumentation key to use. Optional, if this is not specified, the value will be
-     * read from the environment variable APPINSIGHTS_INSTRUMENTATIONKEY
-     * @returns {ApplicationInsights} this interface
-     */
-    setup(instrumentationKey?: string): ApplicationInsights;
-    /**
-     * Starts automatic collection of telemetry. Prior to calling start no telemetry will be collected
-     * @returns {ApplicationInsights} this interface
-     */
-    start(): ApplicationInsights;
-    /**
-     * Sets the state of console tracking (enabled by default)
-     * @param value if true console activity will be sent to Application Insights
-     * @returns {ApplicationInsights} this interface
-     */
-    setAutoCollectConsole(value: boolean): ApplicationInsights;
-    /**
-     * Sets the state of exception tracking (enabled by default)
-     * @param value if true uncaught exceptions will be sent to Application Insights
-     * @returns {ApplicationInsights} this interface
-     */
-    setAutoCollectExceptions(value: boolean): ApplicationInsights;
-    /**
-     * Sets the state of performance tracking (enabled by default)
-     * @param value if true performance counters will be collected every second and sent to Application Insights
-     * @returns {ApplicationInsights} this interface
-     */
-    setAutoCollectPerformance(value: boolean): ApplicationInsights;
-    /**
-     * Sets the state of request tracking (enabled by default)
-     * @param value if true requests will be sent to Application Insights
-     * @returns {ApplicationInsights} this interface
-     */
-    setAutoCollectRequests(value: boolean): ApplicationInsights;
-    /**
-     * Enables verbose debug logging
-     * @returns {ApplicationInsights} this interface
-     */
-    enableVerboseLogging(): ApplicationInsights;
-}
-
-declare module "applicationinsights" {
-    const applicationinsights: ApplicationInsights;
-    export = applicationinsights;
-}
diff --git a/types/applicationinsights/tsconfig.json b/types/applicationinsights/tsconfig.json
deleted file mode 100644
index abc81fb75c..0000000000
--- a/types/applicationinsights/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "applicationinsights-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/arbiter/tslint.json b/types/arbiter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/arbiter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/arcgis-js-api/index.d.ts b/types/arcgis-js-api/index.d.ts
index 9202525e55..dadb02d265 100644
--- a/types/arcgis-js-api/index.d.ts
+++ b/types/arcgis-js-api/index.d.ts
@@ -1,37 +1,47 @@
-// Type definitions for ArcGIS API for JavaScript 4.5
+// Type definitions for ArcGIS API for JavaScript 4.6
 // Project: http://js.arcgis.com
 // Definitions by: Esri <https://github.com/Esri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+
 interface HashMap<T = any> {
   [index: string]: T;
 }
 
+interface IPromiseLike<T = any> {
+  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | IPromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | IPromiseLike<TResult2>) | undefined | null): IPromiseLike<TResult1 | TResult2>;
+}
+
 interface IPromise<T = any> {
-  always<U>(callback?: (valueOrError: T) => IPromise<U> | U | void): IPromise<U>;
+  always<TResult1 = T>(callback?: ((valueOrError: T | any) => TResult1 | IPromiseLike<TResult1>) | undefined | null): IPromise<TResult1>;
   cancel?<U>(reason?: U, strict?: boolean): U;
+  catch<TResult = never>(onrejected?: ((reason: any) => TResult | IPromiseLike<TResult>) | undefined | null): IPromise<T | TResult>;
   isCanceled?(): boolean;
   isFulfilled(): boolean;
   isRejected(): boolean;
   isResolved(): boolean;
-  otherwise<U>(errback?: (reason: any) => IPromise<U> | U | void): IPromise<T | U>;
-  then<U>(callback?: (value: T) => IPromise<U> | U | void, errback?: (reason: any) => IPromise<U> | U | void, progback?: (update: any) => IPromise<U> | U | void): IPromise<U>;
+  otherwise<TResult = never>(onrejected?: ((reason: any) => TResult | IPromiseLike<TResult>) | undefined | null): IPromise<T | TResult>;
+  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | IPromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | IPromiseLike<TResult2>) | undefined | null): IPromise<TResult1 | TResult2>;
 }
 
 interface IHandle {
   remove(): void;
 }
 
+
+
 declare namespace JSX {
   interface IntrinsicElements {
     [elementName: string]: any;
   }
 
-  interface Element {}
+  interface Element {
+  }
 }
 
 declare namespace __esri {
+
   export class Accessor {
     constructor(obj?: any);
 
@@ -52,6 +62,15 @@ declare namespace __esri {
     protected _set<T>(propertyName: string, value: T): this;
   }
 
+  export interface AnonymousAccessor extends Object {
+    get?<T>(propertyName: string): T;
+    get?(propertyName: string): any;
+    set?<T>(propertyName: string, value: T): this;
+    set?(props: HashMap<any>): this;
+    watch?(path: string | string[], callback: WatchCallback, sync?: boolean): WatchHandle;
+  }
+  
+
 
   export type ItemCallback<T> = (item: T, index: number) => void;
 
@@ -108,7 +127,7 @@ declare namespace __esri {
     slice(begin?: number, end?: number): Collection<T>;
     some(callback: ItemCallback<T>): boolean;
     sort(compareFunction?: ItemCompareCallback<T>): void;
-    splice(start: number, deleteCount: number, items: T[] | Collection<T>): T[];
+    splice(start: number, deleteCount: number, ...items: T[]): T[];
     toArray(): T[];
     unshift(...items: T[]): number;
 
@@ -204,6 +223,10 @@ declare namespace __esri {
 
   export type MapViewPointerDownEventHandler = (event: MapViewPointerDownEvent) => void;
 
+  export type MapViewPointerEnterEventHandler = (event: MapViewPointerEnterEvent) => void;
+
+  export type MapViewPointerLeaveEventHandler = (event: MapViewPointerLeaveEvent) => void;
+
   export type MapViewPointerMoveEventHandler = (event: MapViewPointerMoveEvent) => void;
 
   export type MapViewPointerUpEventHandler = (event: MapViewPointerUpEvent) => void;
@@ -211,21 +234,79 @@ declare namespace __esri {
   export type MapViewResizeEventHandler = (event: MapViewResizeEvent) => void;
 
   interface Basemap extends Accessor, Loadable, JSONSupport {
+    /**
+     * A collection of tile layers that make up the basemap's features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#baseLayers)
+     */
     baseLayers: Collection<Layer>;
+    /**
+     * An identifier used to refer to the basemap when referencing it elsewhere.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#id)
+     */
     id: string;
-    loaded: boolean;
+    /**
+     * Indicates whether the basemap instance has loaded. When `true`, all the properties of the object can be accessed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#loaded)
+     * 
+     * @default false
+     */
+    readonly loaded: boolean;
+    /**
+     * The portal item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#portalItem)
+     */
     portalItem: PortalItem;
+    /**
+     * A collection of tiled reference layers for displaying labels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#referenceLayers)
+     */
     referenceLayers: Collection<Layer>;
+    /**
+     * The URL pointing to an image that represents the basemap. When using a custom basemap in the [BasemapToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html) widget, the image specified here will display in the widget. When the user clicks the image, the map's basemap will update to the basemap associated with the image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#thumbnailUrl)
+     */
     thumbnailUrl: string;
+    /**
+     * The title of the basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#title)
+     */
     title: string;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#clone)
+     * 
+     * 
+     */
     clone(): Basemap;
   }
 
   interface BasemapConstructor {
+    /**
+     * Basemap is used for creating custom basemaps. These basemaps may be created from tiled services you publish to your own server or from tiled services published by third parties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html)
+     */
+
     new(properties?: BasemapProperties): Basemap;
 
 
+    /**
+     * Creates a new basemap instance from a [well known basemap ID](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap). See [Map.basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) for a list of possible values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#fromId)
+     * 
+     * @param id The basemap ID.
+     * 
+     */
     fromId(id: string): Basemap;
 
     fromJSON(json: any): Basemap;
@@ -234,25 +315,94 @@ declare namespace __esri {
   export const Basemap: BasemapConstructor;
 
   interface BasemapProperties extends LoadableProperties {
+    /**
+     * A collection of tile layers that make up the basemap's features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#baseLayers)
+     */
     baseLayers?: CollectionProperties<LayerProperties>;
+    /**
+     * An identifier used to refer to the basemap when referencing it elsewhere.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#id)
+     */
     id?: string;
-    loaded?: boolean;
+    /**
+     * The portal item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#portalItem)
+     */
     portalItem?: PortalItemProperties;
+    /**
+     * A collection of tiled reference layers for displaying labels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#referenceLayers)
+     */
     referenceLayers?: CollectionProperties<LayerProperties>;
+    /**
+     * The URL pointing to an image that represents the basemap. When using a custom basemap in the [BasemapToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html) widget, the image specified here will display in the widget. When the user clicks the image, the map's basemap will update to the basemap associated with the image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#thumbnailUrl)
+     */
     thumbnailUrl?: string;
+    /**
+     * The title of the basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#title)
+     */
     title?: string;
   }
 
   interface Camera extends Accessor, JSONSupport {
+    /**
+     * The field of view of the camera in degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#fov)
+     * 
+     * @default 55
+     */
     fov: number;
+    /**
+     * The compass heading of the camera in degrees. Heading is zero when north is the top of the screen. It increases as the view rotates clockwise. The angles are always normalized between 0 and 360 degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading)
+     * 
+     * @default 0
+     */
     heading: number;
+    /**
+     * The position of the camera defined by a map point. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#position)
+     */
     position: Point;
+    /**
+     * The tilt of the camera in degrees with respect to the surface as projected down from the camera position. Tilt is zero when looking straight down at the surface and 90 degrees when the camera is looking parallel to the surface.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#tilt)
+     * 
+     * @default 0
+     */
     tilt: number;
 
+    /**
+     * Creates a deep clone of the camera object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#clone)
+     * 
+     * 
+     */
     clone(): Camera;
   }
 
   interface CameraConstructor {
+    /**
+     * The camera defines the [position](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#position), [tilt](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#tilt), and [heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading) of the point from which the [SceneView's](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) visible extent is observed. It is not associated with device hardware. This class only applies to 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html)
+     */
+
     new(properties?: CameraProperties): Camera;
 
     fromJSON(json: any): Camera;
@@ -261,83 +411,455 @@ declare namespace __esri {
   export const Camera: CameraConstructor;
 
   interface CameraProperties {
+    /**
+     * The field of view of the camera in degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#fov)
+     * 
+     * @default 55
+     */
     fov?: number;
+    /**
+     * The compass heading of the camera in degrees. Heading is zero when north is the top of the screen. It increases as the view rotates clockwise. The angles are always normalized between 0 and 360 degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading)
+     * 
+     * @default 0
+     */
     heading?: number;
+    /**
+     * The position of the camera defined by a map point. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#position)
+     */
     position?: PointProperties;
+    /**
+     * The tilt of the camera in degrees with respect to the surface as projected down from the camera position. Tilt is zero when looking straight down at the surface and 90 degrees when the camera is looking parallel to the surface.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#tilt)
+     * 
+     * @default 0
+     */
     tilt?: number;
   }
 
   interface Color {
+    /**
+     * The alpha value. This value can be any number between `0` and `1` and represents the opacity of the Color. `0` indicates the color is fully transparent and `1` indicates it is fully opaque.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#a)
+     */
     a: number;
+    /**
+     * The blue value. This value can range between `0` and `255`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#b)
+     */
     b: number;
+    /**
+     * The green value. This value can range between `0` and `255`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#g)
+     */
     g: number;
+    /**
+     * The red value. This value can range between `0` and `255`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#r)
+     */
     r: number;
 
+    /**
+     * Creates a deep clone of the Color instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#clone)
+     * 
+     * 
+     */
     clone(): Color;
+    /**
+     * Takes a named string, hex string, array of rgb or rgba values, an object with r, g, b, and a properties, or another Color object and sets this color instance to the input value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#setColor)
+     * 
+     * @param color The new color value. This parameter can be a string representing a named color or a hex value; an array of three or four numbers representing r, g, b, a values; or an object with r, g, b, a properties.
+     * 
+     */
     setColor(color: string | number[] | any): Color;
+    /**
+     * Returns a CSS color string in rgba form representing the Color instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#toCss)
+     * 
+     * @param includeAlpha If `true`, the alpha value will be included in the result.
+     * 
+     */
     toCss(includeAlpha?: boolean): string;
+    /**
+     * Returns a CSS color string in hexadecimal form that represents the Color instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#toHex)
+     * 
+     * 
+     */
     toHex(): string;
+    /**
+     * Returns a JSON object with all the values from a Color instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
+    /**
+     * Returns a 3-component array of rgb values that represent the Color instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#toRgb)
+     * 
+     * 
+     */
     toRgb(): number[];
+    /**
+     * Returns a 4-component array of rgba values that represent the Color instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#toRgba)
+     * 
+     * 
+     */
     toRgba(): number[];
   }
 
   interface ColorConstructor {
+    /**
+     * Creates a new color object by passing either a hex, rgba, or named color value. This class inherits all attributes from **dojo/_base/Color** to provide functions for setting colors.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html)
+     */
 
+
+    /**
+     * Creates a Color instance by blending two colors using a weight factor. Optionally accepts a Color object to update and return instead of creating a new object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#blendColors)
+     * 
+     * @param start The start color.
+     * @param end The end color.
+     * @param weight The weight value is a number from 0 to 1, with 0.5 being a 50/50 blend.
+     * @param obj A previously allocated Color object to reuse for the result.
+     * 
+     */
     blendColors(start: Color, end: Color, weight: number, obj?: Color): Color;
+
     new(color: string | number[] | any): Color;
+    /**
+     * Creates a Color instance using a 3 or 4 element array, mapping each element in sequence to the rgb(a) values of the color. Optionally accepts a Color object to update with the color value and return instead of creating a new object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#fromArray)
+     * 
+     * @param a The input array.
+     * @param obj A previously allocated Color object to reuse for the result.
+     * 
+     */
     fromArray(a: number[], obj?: Color): Color;
+    /**
+     * Creates a Color instance from a hex string with a '#' prefix. Supports 12-bit #rgb shorthand. Optionally accepts a Color object to update with the parsed value and return instead of creating a new object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#fromHex)
+     * 
+     * @param color The input color in a hex string.
+     * @param obj A previously allocated Color object to reuse for the result.
+     * 
+     */
     fromHex(color: string, obj?: Color): Color;
+    /**
+     * Creates a new Color instance, and initializes it with values from a JSON object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance.
+     * 
+     */
     fromJSON(json: any): Color;
+    /**
+     * Creates a Color instance from a string of the form "rgb()" or "rgba()". Optionally accepts a Color object to update with the parsed value and return instead of creating a new object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#fromRgb)
+     * 
+     * @param color The input color in a string of the form "rgb()" or "rgba()".
+     * @param obj A previously allocated Color object to reuse for the result.
+     * 
+     */
     fromRgb(color: string, obj?: Color): Color;
+    /**
+     * Creates a Color instance by parsing a generic string. Accepts hex, rgb, and rgba style color values. Optionally accepts a Color object to update with the parsed value and return instead of creating a new object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html#fromString)
+     * 
+     * @param str The input value.
+     * @param obj A previously allocated Color object to reuse for the result.
+     * 
+     */
     fromString(str: string, obj?: Color): Color;
   }
 
   export const Color: ColorConstructor;
 
+  /**
+   * Configure global properties of the library.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html)
+   */
   interface config {
+    /**
+     * The default [GeometryService](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html) used by widgets and other operations, such as on-the-fly projections.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#geometryServiceUrl)
+     * 
+     * @default "https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer"
+     */
     geometryServiceUrl: string;
+    /**
+     * The URL for the utility service used by [GeoRSSLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html) to convert GeoRSS documents.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#geoRSSServiceUrl)
+     * 
+     * @default "https://utility.arcgis.com/sharing/rss"
+     */
     geoRSSServiceUrl: string;
+    /**
+     * The URL for the utility service used by [KMLLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html) to convert KML documents.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#kmlServiceUrl)
+     * 
+     * @default "https://utility.arcgis.com/sharing/kml"
+     */
     kmlServiceUrl: string;
+    /**
+     * The URL of the portal instance. If using an on-premise portal, this value should be set to the portal instance, for example: `https://www.example.com/arcgis`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl)
+     * 
+     * @default "https://www.arcgis.com"
+     */
     portalUrl: string;
+    /**
+     * An object with properties that control various aspects of communication between the library and web servers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     request: configRequest;
+    /**
+     * The AMD loader's configuration object, which is loaded with each worker. Modify the configuration to specify locations of packages to be loaded with [the workers framework](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers.html) or to define a feature detection.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#workers)
+     */
     workers: configWorkers;
   }
 
   export const config: config;
 
-  export interface configRequest {
+
+  export interface configRequest extends Object {
+    /**
+     * Indicates whether the library automatically detects if [CORS](http://enable-cors.org/) (Cross-Origin Resource Sharing) specification is supported by ArcGIS Servers used in your application.  Upon successful detection, the server will be added to `corsEnabledServers` list. CORS detection will not be performed for a server if it is already listed in `corsEnabledServers`.  The default is `true` if your application is running in a web browser, or `false` if your application is running on [Apache Cordova](https://cordova.apache.org/) platform.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     corsDetection?: boolean;
+    /**
+     * Number of seconds to wait for response from the ArcGIS Server during CORS detection. If the detection is not complete before this time expires, then it is assumed that the server does not support CORS.  Applicable when `corsDetection` is true.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     * 
+     * @default 15
+     */
     corsDetectionTimeout?: number;
+    /**
+     * A list of servers known to support CORS specification.  Out of the box, this list includes many Esri hosted servers that are known to support CORS and is updated at every release as the list grows. The library is capable of automatically detecting CORS support for servers used in an application (see `corsDetection`), but if you are already aware that a server supports CORS, then it should be added to this list. Since the API includes some servers by default it's important to add items onto this array rather than overwriting it.  The following servers are enabled by default: 
+     *   * `basemaps.arcgis.com` (added in 4.3)
+     *   * `demographics1.arcgis.com` (added in 4.4)
+     *   * `demographics2.arcgis.com` (added in 4.4)
+     *   * `demographics3.arcgis.com` (added in 4.4)
+     *   * `demographics4.arcgis.com` (added in 4.4)
+     *   * `demographics5.arcgis.com` (added in 4.4)
+     *   * `demographics6.arcgis.com` (added in 4.4)
+     *   * `elevation3d.arcgis.com`
+     *   * `geocode.arcgis.com`
+     *   * `geoenrich.arcgis.com`
+     *   * `js.arcgis.com`
+     *   * `server.arcgisonline.com`
+     *   * `services.arcgis.com`
+     *   * `services.arcgisonline.com`
+     *   * `services1.arcgis.com`
+     *   * `services2.arcgis.com`
+     *   * `services3.arcgis.com`
+     *   * `services4.arcgis.com`
+     *   * `services5.arcgis.com`
+     *   * `services6.arcgis.com`
+     *   * `services7.arcgis.com`
+     *   * `services8.arcgis.com`
+     *   * `services9.arcgis.com`
+     *   * `static.arcgis.com`
+     *   * `tiles.arcgis.com`
+     *   * `tiles1.arcgis.com`
+     *   * `tiles2.arcgis.com`
+     *   * `tiles3.arcgis.com`
+     *   * `tiles4.arcgis.com`
+     *   * `utility.arcgis.com` (added in 4.4)
+     *   * `utility.arcgisonline.com`
+     *   * `www.arcgis.com`
+     *   
+     *   
+     * Example:
+     * ```js
+     * // Add a known server to the list.
+     * require(["esri/config"], function(esriConfig) {
+     *   esriConfig.request.corsEnabledServers.push("<hostname>.<domain>:<port>");
+     * });
+     * ```
+     * 
+     * You can also pass objects to this property with the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     corsEnabledServers?: (string | configRequestCorsEnabledServers)[];
+    /**
+     * Indicates whether the proxy specified in `proxyUrl` is used for all AJAX requests made using [request](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html) and images added using `<img>` element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     * 
+     * @default false
+     */
     forceProxy?: boolean;
+    /**
+     * List of domain suffixes known to support https. This will automatically upgrade requests made to such domains to use https instead of http when the application is not running on http. Note that port numbers should not be included in the domain suffix to be matched.  If no `httpsDomains` list exists , the API redirects all calls using https. If the list exists and a domain of a required http resource is not listed, the API sends the URL as it is specified within the code. Likewise, if the list exists and the domain of a required http resource is listed in it, the API sends an https request to that resource.  The list includes the following domain suffixes by default:
+     *   * `arcgis.com`
+     *   * `arcgisonline.com`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     httpsDomains?: string[];
+    /**
+     * Maximum number of characters allowed in the URL for HTTP GET requests made by [request](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html). If this limit is exceeded, HTTP POST method will be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     * 
+     * @default 2000
+     */
     maxUrlLength?: number;
+    /**
+     * Resource proxy for your application. It is used by the library when communicating with a web server hosted on a domain that is different from the domain where your application is hosted.  The library may or may not use the proxy depending on the type of request made, whether the server support CORS, whether the application is being run on older versions of browsers etc. To keep it simple, it is recommended that you always configure a resource proxy for your application.  You can download the resource proxy from this [GitHub repo](https://github.com/Esri/resource-proxy). 
+     * ```js
+     * require(["esri/config"], function(esriConfig) {
+     *   esriConfig.request.proxyUrl = "/resource-proxy/Java/proxy.jsp";
+     * });
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     proxyUrl?: string;
+    /**
+     * Number of milliseconds [request](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html) will wait for response from a server. If a server fails to respond before this time expires, then the request is considered to have encountered an error.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     * 
+     * @default 60000
+     */
     timeout?: number;
+    /**
+     * Indicates whether the library will use [CORS](http://enable-cors.org/)-enabled requests when communicating with a web server hosted on a domain that is different from the domain where the application is hosted. If `true`, AJAX requests are directly made to servers that support CORS. If `with-credentials` is specified, then AJAX requests will use credentials stored in a client's cookies. If `false`, direct requests are not made. A proxy will be used if available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     * 
+     * @default with-credentials
+     */
     useCors?: string | boolean;
+    /**
+     * **Since:** 4.5 Indicates whether `esri/request` will request a credential from `IdentityManager`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     * 
+     * @default true
+     */
     useIdentity?: boolean;
+    /**
+     * A proxy rule defines a proxy for a set of resources with an identical URL prefix. When using [esriRequest](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html), if a target URL matches a rule, then the request will be sent to the specified proxy. Rather than populating this array directly, use the urlUtils.addProxyRule() method. Rule objects have the following properties:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     proxyRules?: configRequestProxyRules[];
   }
 
-  export interface configRequestCorsEnabledServers {
+
+  export interface configRequestCorsEnabledServers extends Object {
+    /**
+     * The host name of the server to add to the list of CORS-enabled servers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     host?: string;
+    /**
+     * Indicates whether requests made to the associated server should include credentials such as cookies and authorization headers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     * 
+     * @default false
+     */
     withCredentials?: boolean;
   }
 
-  export interface configRequestProxyRules {
+
+  export interface configRequestProxyRules extends Object {
+    /**
+     * The URL of the proxy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     proxyUrl?: string;
+    /**
+     * URL prefix for resources that need to be accessed through a specific proxy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
     urlPrefix?: string;
   }
 
-  export interface configWorkers {
+
+  export interface configWorkers extends Object {
+    /**
+     * The configuration parameters for [the workers framework](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#workers)
+     */
     loaderConfig?: configWorkersLoaderConfig;
   }
 
-  export interface configWorkersLoaderConfig {
+
+  export interface configWorkersLoaderConfig extends Object {
+    /**
+     * Determines if the specified feature capabilities are supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#workers)
+     */
     has?: any;
+    /**
+     * Map of module id fragments to file paths.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#workers)
+     */
     paths?: any;
+    /**
+     * Map paths in module identifiers to different paths.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#workers)
+     */
     map?: any;
+    /**
+     * An array of objects which provide the package name and its location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#workers)
+     */
     packages?: any[];
   }
 
@@ -345,28 +867,137 @@ declare namespace __esri {
 
   export type WatchCallback = (newValue: any, oldValue: any, propertyName: string, target: Accessor) => void;
 
-  export interface WatchHandle {
+  /**
+   * Represents a watch created when an object invokes [watch()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html#watch).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html#WatchHandle)
+   */
+  export interface WatchHandle extends Object {
+    /**
+     * Removes the watch handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html#WatchHandle)
+     * 
+     * 
+     */
     remove(): void;
   }
 
+
   interface decorators {
+    /**
+     * A property decorator that creates a two-way binding between the property it decorates and an inner property of one of its members.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#aliasOf)
+     * 
+     * @param propertyName The aliased property name.
+     * 
+     */
     aliasOf(propertyName: string): Function;
+    /**
+     * This method decorator is used to define the method that will cast a property from a class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#cast)
+     * 
+     * @param propertyName The property name the function will cast.
+     * 
+     */
     cast(propertyName: string): Function;
+    /**
+     * This parameter decorator is used to define the function or class for a parameter of a method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#cast)
+     * 
+     * @param classFunction The function or class to cast the parameter
+     * 
+     */
     cast(classFunction: Function): Function;
+    /**
+     * A function that can be used as a class. It extends [expression](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-1-6.html#extending-expressions) and is used in conjunction with the `@subclass` decorator to create a class compatible to [dojo.declare](https://dojotoolkit.org/reference-guide/1.10/dojo/declare.html). Please refer to the `subclass` documentation for further information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#declared)
+     * 
+     * @param baseClass The class to extend.
+     * @param mixinClasses The mixin classes used to extend the base class.
+     * 
+     */
     declared<T>(baseClass: T, ...mixinClasses: any[]): T;
+    /**
+     * This convenience decorator is used to define an [Accessor](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html) property. Any property defined with this decorator can now be `get` and `set`. In addition, you can [watch for any property changes](https://developers.arcgis.com/javascript/latest/guide/working-with-props/index.html). Many times this decorator is used in conjunction with the [@renderable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html) decorator.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     * 
+     * @param propertyMetadata An object describing the property.
+     * @param propertyMetadata.dependsOn Property names of dependencies.
+     * @param propertyMetadata.type The constructor used to [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html) the property.
+     * @param propertyMetadata.cast The function to use to [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html) the property. Alternative to define the `type`. The function is called with the value set by the user and should return the cast value.
+     * @param propertyMetadata.readOnly Indicates whether the property is read-only.
+     * @param propertyMetadata.constructOnly Indicates whether the property can be set during construction but is otherwise read-only.
+     * @param propertyMetadata.aliasOf The property decorator that creates a two-way binding between the property it decorates and an inner property of one of its members.
+     * @param propertyMetadata.value The default value for the property.
+     * 
+     */
     property(propertyMetadata?: decoratorsPropertyPropertyMetadata): Function;
+    /**
+     * A class decorator that must be used together with the `declared` function to create a class compatible to [dojo.declare](https://dojotoolkit.org/reference-guide/1.10/dojo/declare.html). It supports both single and multiple inheritance and can be considered the underlying functionality needed when creating 4.x classes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#subclass)
+     * 
+     * @param declaredClass The subclass name.
+     * 
+     */
     subclass(declaredClass?: string): Function;
   }
 
   export const decorators: decorators;
 
-  export interface decoratorsPropertyPropertyMetadata {
+
+  export interface decoratorsPropertyPropertyMetadata extends Object {
+    /**
+     * Property names of dependencies.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     */
     dependsOn?: string[];
+    /**
+     * The constructor used to [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html) the property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     */
     type?: Function;
+    /**
+     * The function to use to [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html) the property. Alternative to define the `type`. The function is called with the value set by the user and should return the cast value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     */
     cast?: Function;
+    /**
+     * Indicates whether the property is read-only.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     * 
+     * @default false
+     */
     readOnly?: boolean;
+    /**
+     * Indicates whether the property can be set during construction but is otherwise read-only.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     * 
+     * @default false
+     */
     constructOnly?: boolean;
+    /**
+     * The property decorator that creates a two-way binding between the property it decorates and an inner property of one of its members.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     */
     aliasOf?: string;
+    /**
+     * The default value for the property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html#property)
+     */
     value?: any;
   }
 
@@ -382,182 +1013,812 @@ declare namespace __esri {
 
 
 
+
   interface Error {
+    /**
+     * The details object provides additional details specific to the error, giving more information about why the error was raised. For example, the details object for esriRequest includes additional information to help the developer diagnose issues with a problematic request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Error.html#details)
+     */
     details: any;
+    /**
+     * A message describing the details of the error.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Error.html#message)
+     */
     message: string;
+    /**
+     * A unique error name. This can be used to map to a localized error message to present to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Error.html#name)
+     */
     name: string;
   }
 
   export const Error: Error;
 
   export class Evented {
+    /**
+     * Emits an event on the instance. This method should only be used when creating subclasses of this class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Evented.html#emit)
+     * 
+     * @param type The name of the event.
+     * @param event The event payload.
+     * 
+     */
     protected emit(type: string, event: any): void;
+    /**
+     * Indicates whether there is an event listener on the instance that matches the provided event name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Evented.html#hasEventListener)
+     * 
+     * @param type The name of the event.
+     * 
+     */
     hasEventListener(type: string): boolean;
+    /**
+     * Registers an event handler on the instance. Call this method to hook an event with a listener.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Evented.html#on)
+     * 
+     * @param type The name of event to listen for.
+     * @param listener The function to call when the event is fired.
+     * 
+     */
     on(type: string, listener: EventHandler): IHandle;
   }
 
   export type EventHandler = (event: any) => void;
 
   interface JSONSupport {
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-JSONSupport.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface JSONSupportConstructor {
+
+
     new(): JSONSupport;
 
 
+    /**
+     * Creates a new instance of [this class]() and initializes it with values from a JSON object generated from a product in the ArcGIS platform. The object passed into the input `json` parameter often comes from a response to a query operation in the REST API or a [toJSON()](http://pro.arcgis.com/en/pro-app/tool-reference/conversion/features-to-json.htm) method from another ArcGIS product. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for details and examples of when and how to use this function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-JSONSupport.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance in the ArcGIS format. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Classification_objects/02r30000019z000000/) for examples of the structure of various input JSON objects.
+     * 
+     */
     fromJSON(json: any): any;
   }
 
   export const JSONSupport: JSONSupportConstructor;
 
+
   interface lang {
+    /**
+     * Use this method to deeply clone objects with properties that are computed or have their own `clone()` method. For example, if you are creating an object that stores an initial extent and a spatial reference for your application, you can use `esriLang.clone(initialProps)` to clone this object so that the `extent` and `spatialReference` are properly cloned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-lang.html#clone)
+     * 
+     * @param elem The object to be cloned.
+     * 
+     */
     clone(elem: any): any;
   }
 
   export const lang: lang;
 
   interface Loadable {
-    loadError: Error;
-    loadStatus: string;
-    loadWarnings: any[];
+    /**
+     * The Error object returned if an error occurred while loading.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#loadError)
+     * 
+     * @default null
+     */
+    readonly loadError: Error;
+    /**
+     * Represents the status of a [load](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#load) operation. 
+     * 
+     * Value | Description
+     * ------|------------
+     * not-loaded | The object's resources have not loaded.
+     * loading | The object's resources are currently loading.
+     * loaded | The object's resources have loaded without errors.
+     * failed | The object's resources failed to load. See [loadError](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#loadError) for more details.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#loadStatus)
+     * 
+     * @default not-loaded
+     */
+    readonly loadStatus: string;
+    /**
+     * A list of warnings which occurred while loading.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#loadWarnings)
+     */
+    readonly loadWarnings: any[];
 
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `always()` may be used to execute a function if the promise is rejected or resolved. The input function will always execute no matter the response. For more information about promises, see the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#always)
+     * 
+     * @param callbackOrErrback The function to execute when the promise is rejected or resolved.
+     * 
+     */
     always(callbackOrErrback?: Function): IPromise<any>;
+    /**
+     * Cancels a [load()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#load) operation if it is already in progress.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#cancelLoad)
+     * 
+     * 
+     */
     cancelLoad(): void;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `isFulfilled()` may be used to verify if the promise is fulfilled (either resolved or rejected). If it is fulfilled, `true` will be returned. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for more information about promises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#isFulfilled)
+     * 
+     * 
+     */
     isFulfilled(): boolean;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `isRejected()` may be used to verify if the promise is rejected. If it is rejected, `true` will be returned. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for more information about promises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#isRejected)
+     * 
+     * 
+     */
     isRejected(): boolean;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `isResolved()` may be used to verify if the promise is resolved. If it is resolved, `true` will be returned. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for more information about promises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#isResolved)
+     * 
+     * 
+     */
     isResolved(): boolean;
+    /**
+     * Loads the resources referenced by this class. This method automatically executes for a [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) and all of the resources it references in [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) if the view is constructed with a map instance.  This method must be called by the developer when accessing a resource that will not be loaded in a [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#load)
+     * 
+     * 
+     */
     load(): IPromise<any>;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Use `otherwise()` to call a function once the promise is rejected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#otherwise)
+     * 
+     * @param errback The function to execute when the promise fails.
+     * 
+     */
     otherwise(errback?: Function): IPromise<any>;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `then()` may be leveraged once an instance of the class is created. This method takes two input parameters: a `callback` function and an `errback` function. The `callback` executes when the promise resolves (when the instance of the class loads). The `errback` executes if the promise fails. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for additional details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#then)
+     * 
+     * @param callback The function to call when the promise resolves.
+     * @param errback The function to execute when the promise fails.
+     * @param progback The function to invoke when the promise emits a progress update.
+     * 
+     */
     then(callback?: Function, errback?: Function, progback?: Function): IPromise<any>;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `when()` may be leveraged once an instance of the class is created. This method takes two input parameters: a `callback` function and an `errback` function. The `callback` executes when the promise resolves (when the instance of the class loads). The `errback` executes if the promise fails. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for additional details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#when)
+     * 
+     * @param callback The function to call when the promise resolves.
+     * @param errback The function to execute when the promise fails.
+     * @param progback The function to invoke when the promise emits a progress update.
+     * 
+     */
+    when(callback?: Function, errback?: Function, progback?: Function): IPromise<any>;
   }
 
   interface LoadableConstructor {
+
+
     new(): Loadable;
   }
 
   export const Loadable: LoadableConstructor;
 
   interface LoadableProperties {
-    loadError?: Error;
-    loadStatus?: string;
-    loadWarnings?: any[];
+
   }
 
   interface corePromise {
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `always()` may be used to execute a function if the promise is rejected or resolved. The input function will always execute no matter the response. For more information about promises, see the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#always)
+     * 
+     * @param callbackOrErrback The function to execute when the promise is rejected or resolved.
+     * 
+     */
     always(callbackOrErrback?: Function): IPromise<any>;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `isFulfilled()` may be used to verify if the promise is fulfilled (either resolved or rejected). If it is fulfilled, `true` will be returned. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for more information about promises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#isFulfilled)
+     * 
+     * 
+     */
     isFulfilled(): boolean;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `isRejected()` may be used to verify if the promise is rejected. If it is rejected, `true` will be returned. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for more information about promises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#isRejected)
+     * 
+     * 
+     */
     isRejected(): boolean;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `isResolved()` may be used to verify if the promise is resolved. If it is resolved, `true` will be returned. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for more information about promises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#isResolved)
+     * 
+     * 
+     */
     isResolved(): boolean;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Use `otherwise()` to call a function once the promise is rejected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#otherwise)
+     * 
+     * @param errback The function to execute when the promise fails.
+     * 
+     */
     otherwise(errback?: Function): IPromise<any>;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `then()` may be leveraged once an instance of the class is created. This method takes two input parameters: a `callback` function and an `errback` function. The `callback` executes when the promise resolves (when the instance of the class loads). The `errback` executes if the promise fails. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for additional details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#then)
+     * 
+     * @param callback The function to call when the promise resolves.
+     * @param errback The function to execute when the promise fails.
+     * @param progback The function to invoke when the promise emits a progress update.
+     * 
+     */
     then(callback?: Function, errback?: Function, progback?: Function): IPromise<any>;
+    /**
+     * An instance of this class is a [Promise](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html). Therefore `when()` may be leveraged once an instance of the class is created. This method takes two input parameters: a `callback` function and an `errback` function. The `callback` executes when the promise resolves (when the instance of the class loads). The `errback` executes if the promise fails. See the [Working with Promises](https://developers.arcgis.com/javascript/latest/guide/working-with-promises/index.html) guide page for additional details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#when)
+     * 
+     * @param callback The function to call when the promise resolves.
+     * @param errback The function to execute when the promise fails.
+     * @param progback The function to invoke when the promise emits a progress update.
+     * 
+     */
+    when(callback?: Function, errback?: Function, progback?: Function): IPromise<any>;
   }
 
   interface corePromiseConstructor {
+
+
     new(): corePromise;
   }
 
   export const corePromise: corePromiseConstructor;
 
+
   interface promiseUtils {
+    /**
+     * Convenience utility method to wait for a number of promises to either resolve or reject. The resulting promise resolves to an array of result objects containing the promise and either a value if the promise resolved, or an error if the promise rejected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#eachAlways)
+     * 
+     * @param promises Array of promises, or object where each property is a promise.
+     * 
+     */
     eachAlways(promises: IPromise<any>[] | any): IPromise<EachAlwaysResult[]> | any;
+    /**
+     * A convenience utility method for filtering an array of values using an asynchronous predicate function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#filter)
+     * 
+     * @param input The array of input values to filter.
+     * @param predicate A predicate function returning a promise. Only array entries for which the returned promise contains `true` are kept.
+     * 
+     */
     filter<T>(input: T[], predicate: FilterPredicateCallback): IPromise<T[]>;
+    /**
+     * Convenience utility method to create a promise that has been rejected with a provided error value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#reject)
+     * 
+     * @param error The error to reject the resulting promise with.
+     * 
+     */
     reject<T>(error?: any): IPromise<T>;
+    /**
+     * Convenience utility method to create a promise that will be resolved with a provided value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#resolve)
+     * 
+     * @param value The value to resolve the resulting promise with.
+     * 
+     */
     resolve<T>(value?: T): IPromise<T>;
   }
 
   export const promiseUtils: promiseUtils;
 
-  export interface EachAlwaysResult {
+  /**
+   * The result object for a promise passed to [promiseUtils.eachAlways](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#eachAlways).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#EachAlwaysResult)
+   */
+  export interface EachAlwaysResult extends Object {
+    /**
+     * The promise that has been fulfilled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#EachAlwaysResult)
+     */
     promise: IPromise<any>;
-    value: any;
-    error: any;
+    /**
+     * The value with which the promise resolved. Defined only if the promise resolved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#EachAlwaysResult)
+     */
+    value?: any;
+    /**
+     * The error with which the promise rejected. Defined only if the promise rejected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-promiseUtils.html#EachAlwaysResult)
+     */
+    error?: any;
   }
 
   export type FilterPredicateCallback = (value: any, index: number) => IPromise<any>;
 
+
   interface requireUtils {
+    /**
+     * Dynamically requires one or more modules and returns a promise that resolves when all the specified modules have loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-requireUtils.html#when)
+     * 
+     * @param moduleRequire The `require` function used to load the modules. This is the AMD alias (e.g. the `moduleRequire` reference in the snippets below) used to reference the `require` module.
+     * @param moduleNames The names of the modules to load.
+     * 
+     */
     when(moduleRequire: any, moduleNames: string[] | string): IPromise<any>;
   }
 
   export const requireUtils: requireUtils;
 
+
   interface urlUtils {
+    /**
+     * Adds the given proxy rule to the proxy rules list: `esriConfig.request.proxyRules`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-urlUtils.html#addProxyRule)
+     * 
+     * @param rule An object specifying a URL that should use the proxy. See the object specification table below for the required properties of this object.
+     * @param rule.proxyUrl The URL of the proxy.
+     * @param rule.urlPrefix The URL prefix of the resources that should be accessed through the given proxy.
+     * 
+     */
     addProxyRule(rule: urlUtilsAddProxyRuleRule): number;
+    /**
+     * Returns the proxy rule that matches the given URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-urlUtils.html#getProxyRule)
+     * 
+     * @param url The URL of the resources accessed via proxy.
+     * 
+     */
     getProxyRule(url: string): any;
+    /**
+     * Converts the URL arguments to an object representation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-urlUtils.html#urlToObject)
+     * 
+     * @param url The input URL.
+     * 
+     */
     urlToObject(url: string): any;
   }
 
   export const urlUtils: urlUtils;
 
-  export interface urlUtilsAddProxyRuleRule {
+
+  export interface urlUtilsAddProxyRuleRule extends Object {
+    /**
+     * The URL of the proxy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-urlUtils.html#addProxyRule)
+     */
     proxyUrl: string;
+    /**
+     * The URL prefix of the resources that should be accessed through the given proxy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-urlUtils.html#addProxyRule)
+     */
     urlPrefix: string;
   }
 
+
   interface watchUtils {
+    /**
+     * Watches a property for changes and calls the callback with the initial value of the property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#init)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call with the initial value of the property when the property changes.
+     * 
+     */
     init(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
-    on(obj: Accessor, propertyName: string, eventName: string, eventHandler: Function, attachedHandler?: EventAttachedCallback, detachedHandler?: EventAttachedCallback): WatchHandle;
-    once(obj: Accessor, propertyName: string, callback?: WatchCallback): PromisedWatchHandle;
-    pausable(obj: Accessor, propertyName: string, callback?: WatchCallback): PausableWatchHandle;
+    /**
+     * Watches a property for changes and automatically attaches and detaches an event handler for a given event to the property value as needed.  The attachedHandler and detachedHandler are optional and if provided will be called whenever the event handler is attached and detached respectively.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#on)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param eventName The name of the event to attach the event handler for.
+     * @param eventHandler The event handler callback function.
+     * @param attachedHandler Callback called each time the event handler is attached.
+     * @param detachedHandler Callback called each time the event handler is detached.
+     * 
+     */
+    on(obj: Accessor, propertyName: string | string[], eventName: string, eventHandler: Function, attachedHandler?: EventAttachedCallback, detachedHandler?: EventAttachedCallback): WatchHandle;
+    /**
+     * Watches a property for changes once. The returned watch handle is removed after the first time the callback has been invoked.  The returned handle additionally implements the Promise interface and can be used to create a promise chain to asynchronously handle a property value becoming truthy. The promise result is an object containing a `value`, `oldValue`, `propertyName` and `target`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#once)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    once(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PromisedWatchHandle;
+    /**
+     * Watches a property for changes. The returned handle can be paused (and resumed) to temporarily prevent the callback from being called on property changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#pausable)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    pausable(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PausableWatchHandle;
+    /**
+     * Watches a property for changes. This is an alias for [Accessor.watch()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html#watch), provided for completeness.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#watch)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
     watch(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
-    when(obj: Accessor, propertyName: string, callback: WatchCallback): WatchHandle;
-    whenDefined(obj: Accessor, propertyName: string, callback: WatchCallback): WatchHandle;
-    whenDefinedOnce(obj: Accessor, propertyName: string, callback?: WatchCallback): PromisedWatchHandle;
-    whenFalse(obj: Accessor, propertyName: string, callback: WatchCallback): WatchHandle;
-    whenFalseOnce(obj: Accessor, propertyName: string, callback?: WatchCallback): PromisedWatchHandle;
-    whenNot(obj: Accessor, propertyName: string, callback: WatchCallback): WatchHandle;
-    whenNotOnce(obj: Accessor, propertyName: string, callback?: WatchCallback): PromisedWatchHandle;
-    whenOnce(obj: Accessor, propertyName: string, callback?: WatchCallback): PromisedWatchHandle;
-    whenTrue(obj: Accessor, propertyName: string, callback: WatchCallback): WatchHandle;
-    whenTrueOnce(obj: Accessor, propertyName: string, callback?: WatchCallback): PromisedWatchHandle;
-    whenUndefined(obj: Accessor, propertyName: string, callback: WatchCallback): WatchHandle;
-    whenUndefinedOnce(obj: Accessor, propertyName: string, callback?: WatchCallback): PromisedWatchHandle;
+    /**
+     * Watches a property for becoming truthy. As with module:esri/core/watchUtils#init, the callback is called initially if the property is initially truthy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#when)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    when(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
+    /**
+     * Watches a property for becoming `defined`. As with init(), the callback is called if the property is initially defined.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenDefined)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenDefined(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
+    /**
+     * Watches a property for becoming `defined` once. As with init(), the callback is called if the property is initially `defined`. The returned watch handle is removed after the first time the callback has been invoked.  The returned handle additionally implements the Promise interface and can be used to create a promise chain to asynchronously handle a property value becoming defined. The promise result is an object containing a `value`, `oldValue`, `propertyName` and `target`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenDefinedOnce)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenDefinedOnce(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PromisedWatchHandle;
+    /**
+     * Watches a property for becoming `false`. As with init(), the callback is called if the property is initially `false`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenFalse)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenFalse(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
+    /**
+     * Watches a property for becoming `false` once. As with init(), the callback is called if the property is initially `false`. The returned watch handle is removed after the first time the callback has been invoked.  The returned handle additionally implements the Promise interface and can be used to create a promise chain to asynchronously handle a property value becoming false. The promise result is an object containing a `value`, `oldValue`, `propertyName` and `target`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenFalseOnce)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenFalseOnce(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PromisedWatchHandle;
+    /**
+     * Watches a property for becoming falsy. As with module:esri/core/watchUtils#init, the callback is called initially if the property is initially falsy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenNot)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenNot(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
+    /**
+     * Watches a property for becoming falsy once. As with init(), the callback is called if the property is initially falsy. The returned watch handle is removed after the first time the callback has been invoked.  The returned handle additionally implements the Promise interface and can be used to create a promise chain to asynchronously handle a property value becoming falsy. The promise result is an object containing a `value`, `oldValue`, `propertyName` and `target`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenNotOnce)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenNotOnce(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PromisedWatchHandle;
+    /**
+     * Watches a property for becoming truthy once. As with init(), the callback is called if the property is initially truthy. The returned watch handle is removed after the first time the callback has been invoked.  The returned handle additionally implements the Promise interface and can be used to create a promise chain to asynchronously handle a property value becoming truthy. The promise result is an object containing a `value`, `oldValue`, `propertyName` and `target`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenOnce)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenOnce(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PromisedWatchHandle;
+    /**
+     * Watches a property for becoming `true`. As with init(), the callback is called if the property is initially `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenTrue)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenTrue(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
+    /**
+     * Watches a property for becoming `true` once. As with init(), the callback is called if the property is initially `true`. The returned watch handle is removed after the first time the callback has been invoked.  The returned handle additionally implements the Promise interface and can be used to create a promise chain to asynchronously handle a property value becoming true. The promise result is an object containing a `value`, `oldValue`, `propertyName` and `target`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenTrueOnce)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenTrueOnce(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PromisedWatchHandle;
+    /**
+     * Watches a property for becoming `undefined`. As with init(), the callback is called if the property is initially `undefined`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenUndefined)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenUndefined(obj: Accessor, propertyName: string | string[], callback: WatchCallback): WatchHandle;
+    /**
+     * Watches a property for becoming `undefined` once. As with init(), the callback is called if the property is initially `undefined`. The returned watch handle is removed after the first time the callback has been invoked.  The returned handle additionally implements the Promise interface and can be used to create a promise chain to asynchronously handle a property value becoming undefined. The promise result is an object containing a `value`, `oldValue`, `propertyName` and `target`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#whenUndefinedOnce)
+     * 
+     * @param obj The object containing the property to watch.
+     * @param propertyName The name of the property to watch.
+     * @param callback The function to call when the property changes.
+     * 
+     */
+    whenUndefinedOnce(obj: Accessor, propertyName: string | string[], callback?: WatchCallback): PromisedWatchHandle;
   }
 
   export const watchUtils: watchUtils;
 
   export type EventAttachedCallback = (target: any, propName: string, obj: Accessor, eventName: string) => void;
 
-  export interface PausableWatchHandle {
+  /**
+   * Represents a watch created when an object invokes [watch()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html#watch).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#PausableWatchHandle)
+   */
+  export interface PausableWatchHandle extends Object {
+    /**
+     * Removes the watch handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#PausableWatchHandle)
+     * 
+     * 
+     */
     remove(): void;
+    /**
+     * Pauses the handle preventing changes to invoke the associated callback.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#PausableWatchHandle)
+     * 
+     * 
+     */
     pause(): void;
+    /**
+     * Resumes a paused the handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-watchUtils.html#PausableWatchHandle)
+     * 
+     * 
+     */
     resume(): void;
   }
 
   export interface PromisedWatchHandle extends IPromise<any> {
+
     remove(): void;
   }
 
+  /**
+   * This module is a utility framework that simplifies the use of [Web Workers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers) in the ArcGIS API for JavaScript.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers.html)
+   */
   interface workers {
+    /**
+     * Opens a connection to workers and loads a script with the workers framework.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers.html#open)
+     * 
+     * @param client The instance of the client which will be using the [Connection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers-Connection.html).
+     * @param modulePath A fully qualified URL to a script to execute with the workers framework.
+     * 
+     */
     open(client: any, modulePath: string): IPromise<Connection>;
   }
 
   export const workers: workers;
 
   interface Connection {
+    /**
+     * A convenient method that broadcasts a message to all workers. Use this method if it is mandatory that all workers need to have a piece of information which is critical for them to process additional requests.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers-Connection.html#broadcast)
+     * 
+     * @param methodName The name of the method to invoke on all workers.
+     * @param data The object which contains all required parameters to be passed to the method. The data passed between the main thread and the workers framework are copied, not shared. Objects are serialized and de-serialized on both ends.
+     * @param buffers An array of [transferable](https://developer.mozilla.org/en-US/docs/Web/API/Transferable) buffers. Each buffer in the array should have a corresponding entry in the data object. Transferable objects are transferred from one context to another with a zero-copy operation, which results in a big performance improvement when sending large data sets.
+     * 
+     */
     broadcast(methodName: string, data?: any, buffers?: ArrayBuffer[]): IPromise<any[]>;
+    /**
+     * Closes the existing connection instance to workers. Notify all workers to destroy the connection instance and unload the connection module.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers-Connection.html#close)
+     * 
+     * 
+     */
     close(): void;
+    /**
+     * Invokes a method on the script loaded with the workers framework.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers-Connection.html#invoke)
+     * 
+     * @param methodName The name of the method to be invoked in the script.
+     * @param data The object which contains all required parameters to be passed to the method. The data passed between the main thread and the workers framework are copied, not shared. Objects are serialized and de-serialized on both ends.
+     * @param buffers An array of [transferable](https://developer.mozilla.org/en-US/docs/Web/API/Transferable) buffers. Each buffer in the array should have a corresponding entry in the data object. Transferable objects are transferred from one context to another with a zero-copy operation, which results in a big performance improvement when sending large data sets.
+     * 
+     */
     invoke(methodName: string, data?: any, buffers?: ArrayBuffer[]): IPromise<any>;
   }
 
   interface ConnectionConstructor {
+    /**
+     * The Connection class is used to access code loaded into a separate thread via the [workers framework](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-workers-Connection.html)
+     */
+
+
     new(client: any, id: number): Connection;
   }
 
   export const Connection: ConnectionConstructor;
 
+  /**
+   * A convenience module for importing [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) classes when developing with [TypeScript](https://developers.arcgis.com/javascript/latest/guide/typescript-setup/index.html). For example, rather than importing geometries one at a time like this:
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry.html)
+   */
+  interface geometry {
+  }
+
+  export const geometry: geometry;
+
   interface Circle extends Polygon {
-    center: Point | number[];
+    /**
+     * The center point of the circle. The center must be specified either as a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) or an array of longitude/latitude coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#center)
+     */
+    center: Point;
+    /**
+     * Applicable when the spatial reference of the center point is either set to Web Mercator (wkid: 3857) or geographic/geodesic (wkid: 4326). When  either of those spatial references is used, set geodesic to `true` to minimize distortion. Other coordinate systems will not create geodesic circles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#geodesic)
+     * 
+     * @default false
+     */
     geodesic: boolean;
+    /**
+     * This value defines the number of points along the curve of the circle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#numberOfPoints)
+     * 
+     * @default 60
+     */
     numberOfPoints: number;
+    /**
+     * The radius of the circle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#radius)
+     * 
+     * @default 1000
+     */
     radius: number;
+    /**
+     * Unit of the radius.  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#radiusUnit)
+     * 
+     * @default meters
+     */
     radiusUnit: string;
 
+    /**
+     * Creates a deep clone of Circle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#clone)
+     * 
+     * 
+     */
     clone(): Circle;
   }
 
   interface CircleConstructor {
+
+
     new(properties?: CircleProperties): Circle;
 
     fromJSON(json: any): Circle;
@@ -566,39 +1827,233 @@ declare namespace __esri {
   export const Circle: CircleConstructor;
 
   interface CircleProperties extends PolygonProperties {
-    center?: PointProperties | number[];
+    /**
+     * The center point of the circle. The center must be specified either as a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) or an array of longitude/latitude coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#center)
+     */
+    center?: PointProperties;
+    /**
+     * Applicable when the spatial reference of the center point is either set to Web Mercator (wkid: 3857) or geographic/geodesic (wkid: 4326). When  either of those spatial references is used, set geodesic to `true` to minimize distortion. Other coordinate systems will not create geodesic circles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#geodesic)
+     * 
+     * @default false
+     */
     geodesic?: boolean;
+    /**
+     * This value defines the number of points along the curve of the circle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#numberOfPoints)
+     * 
+     * @default 60
+     */
     numberOfPoints?: number;
+    /**
+     * The radius of the circle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#radius)
+     * 
+     * @default 1000
+     */
     radius?: number;
+    /**
+     * Unit of the radius.  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Circle.html#radiusUnit)
+     * 
+     * @default meters
+     */
     radiusUnit?: string;
   }
 
   interface Extent extends Geometry {
-    center: Point;
-    height: number;
+    /**
+     * The center point of the extent in map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#center)
+     */
+    readonly center: Point;
+    /**
+     * The height of the extent in map units (the distance between [ymin](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#ymin) and [ymax](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#ymax)).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#height)
+     */
+    readonly height: number;
+    /**
+     * The maximum possible `m` value in an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#mmax)
+     * 
+     * @default undefined
+     */
     mmax: number;
+    /**
+     * The minimum possible `m` value of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#mmin)
+     * 
+     * @default undefined
+     */
     mmin: number;
-    width: number;
+    /**
+     * For Extent, the type is always `extent`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#type)
+     */
+    readonly type: "extent";
+    /**
+     * The width of the extent in map units (the distance between [xmin](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#xmin) and [xmax](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#xmax)).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#width)
+     */
+    readonly width: number;
+    /**
+     * The bottom-right X-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#xmax)
+     * 
+     * @default 0
+     */
     xmax: number;
+    /**
+     * The top-left X-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#xmin)
+     * 
+     * @default 0
+     */
     xmin: number;
+    /**
+     * The top-right Y-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#ymax)
+     * 
+     * @default 0
+     */
     ymax: number;
+    /**
+     * The bottom-left Y-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#ymin)
+     * 
+     * @default 0
+     */
     ymin: number;
+    /**
+     * The maximum possible `z`, or elevation, value in an extent envelope. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#zmax)
+     * 
+     * @default undefined
+     */
     zmax: number;
+    /**
+     * The minimum possible `z`, or elevation, value of an extent envelope. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#zmin)
+     * 
+     * @default undefined
+     */
     zmin: number;
 
+    /**
+     * Centers the extent to the specified [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html). This method modifies the extent geometry in-place. You should [clone](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone) the extent object before calling this method where appropriate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#centerAt)
+     * 
+     * @param point The point to center the extent.
+     * 
+     */
     centerAt(point: Point): Extent;
+    /**
+     * Creates a deep clone of Extent object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone)
+     * 
+     * 
+     */
     clone(): Extent;
+    /**
+     * Checks if the input geometry is contained within the extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#contains)
+     * 
+     * @param geometry Input geometry to test if it is contained within the extent.
+     * 
+     */
     contains(geometry: Point | Extent): boolean;
+    /**
+     * Indicates if the input extent is equal to the testing extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#equals)
+     * 
+     * @param extent Input extent.
+     * 
+     */
     equals(extent: Extent): boolean;
+    /**
+     * Expands the extent by the given factor. For example, a value of 1.5 will expand the extent to be 50 percent larger than the original extent. This method modifies the extent geometry in-place. You should [clone](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone) the extent object before calling this method where appropriate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#expand)
+     * 
+     * @param factor The multiplier value.
+     * 
+     */
     expand(factor: number): Extent;
+    /**
+     * Shrinks the original extent to the intersection with the input extent. This method modifies the extent geometry in-place. You should [clone](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone) the extent object before calling this method where appropriate. If the original extent and the input extent have no intersection, the extent is not modified and null is returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#intersection)
+     * 
+     * @param extent The input extent to intersect.
+     * 
+     */
     intersection(extent: Extent): Extent;
+    /**
+     * Tests to validate if the input geometry intersects the extent and returns a Boolean value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#intersects)
+     * 
+     * @param geometry The geometry used to test the intersection. It can be a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html), [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) or [Multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html).
+     * 
+     */
     intersects(geometry: Geometry): boolean;
+    /**
+     * Returns an array with either one Extent that's been shifted to within +/- 180 or two Extents if the original extent intersects the International Dateline.  This method modifies the extent geometry in-place. You should [clone](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone) the extent object before calling this method where appropriate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#normalize)
+     * 
+     * 
+     */
     normalize(): Extent[];
+    /**
+     * Modifies the extent geometry in-place with X and Y offsets in map units. You should [clone](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone) the extent object before calling this method where appropriate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#offset)
+     * 
+     * @param dx The offset distance in map units for the X-coordinate.
+     * @param dy The offset distance in map units for the Y-coordinate.
+     * @param dz The offset distance in map units for the Z-coordinate.
+     * 
+     */
     offset(dx: number, dy: number, dz: number): Extent;
+    /**
+     * Expands the original extent to include the extent of the input Extent. This method modifies the extent geometry in-place. You should [clone](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone) the extent object before calling this method where appropriate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#union)
+     * 
+     * @param extent The input extent to union.
+     * 
+     */
     union(extent: Extent): Extent;
   }
 
   interface ExtentConstructor {
+
+
     new(properties?: ExtentProperties): Extent;
 
     fromJSON(json: any): Extent;
@@ -607,31 +2062,128 @@ declare namespace __esri {
   export const Extent: ExtentConstructor;
 
   interface ExtentProperties extends GeometryProperties {
-    center?: PointProperties;
-    height?: number;
+    /**
+     * The maximum possible `m` value in an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#mmax)
+     * 
+     * @default undefined
+     */
     mmax?: number;
+    /**
+     * The minimum possible `m` value of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#mmin)
+     * 
+     * @default undefined
+     */
     mmin?: number;
-    width?: number;
+    /**
+     * The bottom-right X-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#xmax)
+     * 
+     * @default 0
+     */
     xmax?: number;
+    /**
+     * The top-left X-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#xmin)
+     * 
+     * @default 0
+     */
     xmin?: number;
+    /**
+     * The top-right Y-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#ymax)
+     * 
+     * @default 0
+     */
     ymax?: number;
+    /**
+     * The bottom-left Y-coordinate of an extent envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#ymin)
+     * 
+     * @default 0
+     */
     ymin?: number;
+    /**
+     * The maximum possible `z`, or elevation, value in an extent envelope. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#zmax)
+     * 
+     * @default undefined
+     */
     zmax?: number;
+    /**
+     * The minimum possible `z`, or elevation, value of an extent envelope. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#zmin)
+     * 
+     * @default undefined
+     */
     zmin?: number;
   }
 
   interface Geometry extends Accessor, JSONSupport {
-    cache: any;
-    extent: Extent;
+    /**
+     * The cache is used to store values computed from geometries that need to cleared or recomputed upon mutation. An example is the extent of a polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#cache)
+     */
+    readonly cache: any;
+    /**
+     * The extent of the geometry. For points, the extent is null.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#extent)
+     */
+    readonly extent: Extent;
+    /**
+     * Indicates if the geometry has M values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#hasM)
+     */
     hasM: boolean;
+    /**
+     * Indicates if the geometry has Z (elevation) values. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#hasZ)
+     */
     hasZ: boolean;
+    /**
+     * The spatial reference of the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#spatialReference)
+     * 
+     * @default WGS84 (wkid: 4326)
+     */
     spatialReference: SpatialReference;
-    type: string;
+    /**
+     * The geometry type.  **Possible Values:** point | multipoint | polyline | polygon | extent
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#type)
+     */
+    readonly type: string;
 
+    /**
+     * Creates a deep clone of the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#clone)
+     * 
+     * 
+     */
     clone(): Geometry;
   }
 
   interface GeometryConstructor {
+
+
     new(properties?: GeometryProperties): Geometry;
 
     fromJSON(json: any): Geometry;
@@ -640,111 +2192,861 @@ declare namespace __esri {
   export const Geometry: GeometryConstructor;
 
   interface GeometryProperties {
-    cache?: any;
-    extent?: ExtentProperties;
+    /**
+     * Indicates if the geometry has M values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#hasM)
+     */
     hasM?: boolean;
+    /**
+     * Indicates if the geometry has Z (elevation) values. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#hasZ)
+     */
     hasZ?: boolean;
+    /**
+     * The spatial reference of the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#spatialReference)
+     * 
+     * @default WGS84 (wkid: 4326)
+     */
     spatialReference?: SpatialReferenceProperties;
-    type?: string;
   }
 
+
   interface geometryEngine {
+    /**
+     * Creates planar (or Euclidean) buffer polygons at a specified distance around the input geometries.  The GeometryEngine has two methods for buffering geometries client-side: buffer and [geodesicBuffer](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicBuffer). Use caution when deciding which method to use. As a general rule, use [geodesicBuffer](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicBuffer) if the input geometries have a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator). Only use buffer (this method) when attempting to buffer geometries with a [projected coordinate system](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) other than Web Mercator. If you need to buffer geometries with a [geographic coordinate system](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) other than WGS84 (wkid: 4326), use [GeometryService.buffer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#buffer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#buffer)
+     * 
+     * @param geometry The buffer input geometry. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array.
+     * @param distance The specified distance(s) for buffering. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array. When using an array of geometries as input, the length of the geometry array does not have to equal the length of the `distance` array. For example, if you pass an array of four geometries: `[g1, g2, g3, g4]` and an array with one distance: `[d1]`, all four geometries will be buffered by the single distance value. If instead you use an array of three distances: `[d1, d2, d3]`, `g1` will be buffered by `d1`, `g2` by `d2`, and `g3` and `g4` will both be buffered by `d3`. The value of the geometry array will be matched one to one with those in the distance array until the final value of the distance array is reached, in which case that value will be applied to the remaining geometries.
+     * @param unit Measurement unit of the distance(s). Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * @param unionResults Determines whether the output geometries should be unioned into a single polygon.
+     * 
+     */
     buffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): Polygon | Polygon[];
+    /**
+     * Calculates the clipped geometry from a target geometry by an envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#clip)
+     * 
+     * @param geometry The geometry to be clipped.
+     * @param envelope The envelope used to clip.
+     * 
+     */
     clip(geometry: Geometry, envelope: Extent): Geometry;
+    /**
+     * Indicates if one geometry contains another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#contains)
+     * 
+     * @param containerGeometry The geometry that is tested for the "contains" relationship to the other geometry. Think of this geometry as the potential "container" of the `insideGeometry`.
+     * @param insideGeometry The geometry that is tested for the "within" relationship to the `containerGeometry`.
+     * 
+     */
     contains(containerGeometry: Geometry, insideGeometry: Geometry): boolean;
+    /**
+     * Calculates the convex hull of the input geometry. A convex hull is the smallest convex polygon that encloses a group of Objects, such as points. The input geometry can be a point, multipoint, polyline or polygon. The hull is typically a polygon but can also be a polyline or point in degenerate cases.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#convexHull)
+     * 
+     * @param geometry The input geometry.
+     * @param merge Dictates whether to merge output geometries.
+     * 
+     */
     convexHull(geometry: Geometry, merge?: boolean): Geometry | Geometry[];
+    /**
+     * Indicates if one geometry crosses another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#crosses)
+     * 
+     * @param geometry1 The geometry to cross.
+     * @param geometry2 The geometry being crossed.
+     * 
+     */
     crosses(geometry1: Geometry, geometry2: Geometry): boolean;
+    /**
+     * Split the input Polyline or Polygon where it crosses a cutting Polyline. For Polylines, all left cuts are grouped together in the first Geometry. Right cuts and coincident cuts are grouped in the second Geometry and each undefined cut, along with any uncut parts, are output as separate Polylines. For Polygons, all left cuts are grouped in the first Polygon, all right cuts are grouped in the second Polygon, and each undefined cut, along with any left-over parts after cutting, are output as a separate Polygon. If no cuts are returned then the array will be empty. An undefined cut will only be produced if a left cut or right cut was produced and there was a part left over after cutting, or a cut is bounded to the left and right of the cutter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#cut)
+     * 
+     * @param geometry The geometry to be cut.
+     * @param cutter The polyline to cut the geometry.
+     * 
+     */
     cut(geometry: Geometry, cutter: Polyline): Geometry[];
+    /**
+     * Densify geometries by plotting points between existing vertices.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#densify)
+     * 
+     * @param geometry The geometry to be densified.
+     * @param maxSegmentLength The maximum segment length allowed. Must be a positive value.
+     * @param maxSegmentLengthUnit Measurement unit for maxSegmentLength. Defaults to the units of the input geometry. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     densify(geometry: Geometry, maxSegmentLength: number, maxSegmentLengthUnit: string | number): Geometry;
+    /**
+     * Creates the difference of two geometries. The resultant geometry is the portion of `inputGeometry` not in the `subtractor`. The dimension of the `subtractor` has to be equal to or greater than that of the `inputGeometry`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#difference)
+     * 
+     * @param inputGeometry The input geometry to subtract from.
+     * @param subtractor The geometry being subtracted from inputGeometry.
+     * 
+     */
     difference(inputGeometry: Geometry | Geometry[], subtractor: Geometry): Geometry | Geometry[];
+    /**
+     * Indicates if one geometry is disjoint (doesn't intersect in any way) with another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#disjoint)
+     * 
+     * @param geometry1 The base geometry that is tested for the "disjoint" relationship to the other geometry.
+     * @param geometry2 The comparison geometry that is tested for the "disjoint" relationship to the other geometry.
+     * 
+     */
     disjoint(geometry1: Geometry, geometry2: Geometry): boolean;
+    /**
+     * Calculates the shortest planar distance between two geometries. Distance is reported in the linear units specified by `distanceUnit` or, if `distanceUnit` is null, the units of the spatialReference of input geometry. 
+     * > To calculate the geodesic distance between two points, first construct a [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) using the two points of interest as the beginning and ending points of a single path. Then use the polyline as input for the [geodesicLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicLength) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#distance)
+     * 
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
+     * @param distanceUnit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     distance(geometry1: Geometry, geometry2: Geometry, distanceUnit: string | number): number;
+    /**
+     * Indicates if two geometries are equal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#equals)
+     * 
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
+     * 
+     */
     equals(geometry1: Geometry, geometry2: Geometry): boolean;
+    /**
+     * Returns an Object containing additional information about the input spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#extendedSpatialReferenceInfo)
+     * 
+     * @param spatialReference The input spatial reference.
+     * 
+     */
     extendedSpatialReferenceInfo(spatialReference: SpatialReference): any;
+    /**
+     * Flips a geometry on the horizontal axis. Can optionally be flipped around a point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#flipHorizontal)
+     * 
+     * @param geometry The input geometry to be flipped.
+     * @param flipOrigin Point to flip the geometry around. Defaults to the centroid of the geometry.
+     * 
+     */
     flipHorizontal(geometry: Geometry, flipOrigin?: Point): Geometry;
+    /**
+     * Flips a geometry on the vertical axis. Can optionally be flipped around a point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#flipVertical)
+     * 
+     * @param geometry The input geometry to be flipped.
+     * @param flipOrigin Point to flip the geometry around. Defaults to the centroid of the geometry.
+     * 
+     */
     flipVertical(geometry: Geometry, flipOrigin?: Point): Geometry;
+    /**
+     * Performs the generalize operation on the geometries in the cursor. Point and Multipoint geometries are left unchanged. Envelope is converted to a Polygon and then generalized.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#generalize)
+     * 
+     * @param geometry The input geometry to be generalized.
+     * @param maxDeviation The maximum allowed deviation from the generalized geometry to the original geometry.
+     * @param removeDegenerateParts When `true` the degenerate parts of the geometry will be removed from the output (may be undesired for drawing).
+     * @param maxDeviationUnit Measurement unit for maxDeviation. Defaults to the units of the input geometry. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     generalize(geometry: Geometry, maxDeviation: number, removeDegenerateParts?: boolean, maxDeviationUnit?: string | number): Geometry;
+    /**
+     * Calculates the area of the input geometry. As opposed to [planarArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#planarArea), geodesicArea takes into account the curvature of the earth when performing this calculation. Therefore, when using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate areas using geodesicArea(). If the input geometries have a projected coordinate system other than Web Mercator, use [planarArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#planarArea) instead.  This method only works with WGS84 (wkid: 4326) and [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator) spatial references.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicArea)
+     * 
+     * @param geometry The input polygon.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for area units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.AreaUnit.Code.ACRE). **Possible Values:** acres | ares | hectares | square-feet | square-meters | square-yards | square-kilometers | square-miles
+     * 
+     */
     geodesicArea(geometry: Polygon, unit: string | number): number;
+    /**
+     * Creates geodesic buffer polygons at a specified distance around the input geometries. When calculating distances, this method takes the curvature of the earth into account, which provides highly accurate results when dealing with very large geometries and/or geometries that spatially vary on a global scale where one projected coordinate system could not accurately plot coordinates and measure distances for all the geometries.  This method only works with WGS84 (wkid: 4326) and [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator) spatial references. In general, if your input geometries are assigned one of those two spatial references, you should always use geodesicBuffer() to obtain the most accurate results for those geometries. If needing to buffer points assigned a [projected coordinate system other than Web Mercator](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/), use [buffer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#buffer) instead. If the input geometries have a [geographic coordinate system](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) other than WGS84 (wkid: 4326), use [GeometryService.buffer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#buffer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicBuffer)
+     * 
+     * @param geometry The buffer input geometry. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array.
+     * @param distance The specified distance(s) for buffering. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array. When using an array of geometries as input, the length of the geometry array does not have to equal the length of the `distance` array. For example, if you pass an array of four geometries: `[g1, g2, g3, g4]` and an array with one distance: `[d1]`, all four geometries will be buffered by the single distance value. If instead you use an array of three distances: `[d1, d2, d3]`, `g1` will be buffered by `d1`, `g2` by `d2`, and `g3` and `g4` will both be buffered by `d3`. The value of the geometry array will be matched one to one with those in the distance array until the final value of the distance array is reached, in which case that value will be applied to the remaining geometries.
+     * @param unit Measurement unit of the distance(s). Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * @param unionResults Determines whether the output geometries should be unioned into a single polygon.
+     * 
+     */
     geodesicBuffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): Polygon | Polygon[];
+    /**
+     * Returns a geodesically densified version of the input geometry. Use this function to draw the line(s) of the geometry along great circles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicDensify)
+     * 
+     * @param geometry A polyline or polygon to densify.
+     * @param maxSegmentLength The maximum segment length allowed. This must be a positive value.
+     * @param maxSegmentLengthUnit Measurement unit for `maxSegmentLength`. If a unit is not specified, the units are considered to be the same as the units of the `geometry`. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     geodesicDensify(geometry: Polyline | Polygon, maxSegmentLength: number, maxSegmentLengthUnit: string | number): Geometry;
+    /**
+     * Calculates the length of the input geometry. As opposed to [planarLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#planarLength), geodesicLength() takes into account the curvature of the earth when performing this calculation. Therefore, when using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate lengths using geodesicLength(). If the input geometries have a projected coordinate system other than Web Mercator, use [planarLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#planarLength) instead.  This method only works with WGS84 (wkid: 4326) and [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator) spatial references.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicLength)
+     * 
+     * @param geometry The input geometry.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometry. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     geodesicLength(geometry: Geometry, unit: string | number): number;
+    /**
+     * Creates a new geometry through intersection between two geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#intersect)
+     * 
+     * @param geometry The input geometry(ies).
+     * @param intersector The geometry being intersected.
+     * 
+     */
     intersect(geometry: Geometry | Geometry[], intersector: Geometry): Geometry | Geometry[];
+    /**
+     * Indicates if one geometry intersects another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#intersects)
+     * 
+     * @param geometry1 The geometry that is tested for the intersects relationship to the other geometry.
+     * @param geometry2 The geometry being intersected.
+     * 
+     */
     intersects(geometry1: Geometry, geometry2: Geometry): boolean;
+    /**
+     * Indicates if the given geometry is topologically simple.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#isSimple)
+     * 
+     * @param geometry The input geometry.
+     * 
+     */
     isSimple(geometry: Geometry): boolean;
+    /**
+     * Finds the coordinate of the geometry that is closest to the specified point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#nearestCoordinate)
+     * 
+     * @param geometry The geometry to consider.
+     * @param inputPoint The point used to search the nearest coordinate in the geometry.
+     * 
+     */
     nearestCoordinate(geometry: Geometry, inputPoint: Point): NearestPointResult;
+    /**
+     * Finds the vertex on the geometry nearest to the specified point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#nearestVertex)
+     * 
+     * @param geometry The geometry to consider.
+     * @param inputPoint The point used to search the nearest vertex in the geometry.
+     * 
+     */
     nearestVertex(geometry: Geometry, inputPoint: Point): NearestPointResult;
+    /**
+     * Finds all vertices in the given distance from the specified point, sorted from the closest to the furthest and returns them as an array of Objects.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#nearestVertices)
+     * 
+     * @param geometry The geometry to consider.
+     * @param inputPoint The point from which to measure.
+     * @param searchRadius The distance to search from the inputPoint in the units of the view's spatial reference.
+     * @param maxVertexCountToReturn The maximum number of vertices to return.
+     * 
+     */
     nearestVertices(geometry: Geometry, inputPoint: Point, searchRadius: number, maxVertexCountToReturn: number): NearestPointResult[];
+    /**
+     * The offset operation creates a geometry that is a constant planar distance from an input polyline or polygon. It is similar to buffering, but produces a one-sided result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#offset)
+     * 
+     * @param geometry The geometries to offset.
+     * @param offsetDistance The planar distance to offset from the input geometry. If offsetDistance > 0, then the offset geometry is constructed to the right of the oriented input geometry, if offsetDistance = 0, then there is no change in the geometries, otherwise it is constructed to the left. For a simple polygon, the orientation of outer rings is clockwise and for inner rings it is counter clockwise. So the "right side" of a simple polygon is always its inside.
+     * @param offsetUnit Measurement unit of the offset distance. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * @param joinType The join type.     **Possible values:** round | bevel | miter | square
+     * @param bevelRatio Applicable when `joinType = 'miter'`; bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
+     * @param flattenError Applicable when `joinType = 'round'`; flattenError determines the maximum distance of the resulting segments compared to the true circular arc. The algorithm never produces more than around 180 vertices for each round join.
+     * 
+     */
     offset(geometry: Geometry | Geometry[], offsetDistance: number, offsetUnit: string | number, joinType: string, bevelRatio?: number, flattenError?: number): Geometry | Geometry[];
+    /**
+     * Indicates if one geometry overlaps another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#overlaps)
+     * 
+     * @param geometry1 The base geometry that is tested for the "overlaps" relationship with the other geometry.
+     * @param geometry2 The comparison geometry that is tested for the "overlaps" relationship with the other geometry.
+     * 
+     */
     overlaps(geometry1: Geometry, geometry2: Geometry): boolean;
+    /**
+     * Calculates the area of the input geometry. As opposed to [geodesicArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicArea), planarArea() performs this calculation using projected coordinates and does not take into account the earth's curvature. When using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate areas using [geodesicArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicArea). If the input geometries have a projected coordinate system other than Web Mercator, use planarArea() instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#planarArea)
+     * 
+     * @param geometry The input polygon.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for area units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.AreaUnit.Code.ACRE).  **Possible Values:** acres | ares | hectares | square-feet | square-meters | square-yards | square-kilometers | square-miles
+     * 
+     */
     planarArea(geometry: Polygon, unit: string | number): number;
+    /**
+     * Calculates the length of the input geometry. As opposed to [geodesicLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicLength), planarLength() uses projected coordinates and does not take into account the curvature of the earth when performing this calculation. When using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate lengths using [geodesicLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#geodesicLength). If the input geometries have a projected coordinate system other than Web Mercator, use planarLength() instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#planarLength)
+     * 
+     * @param geometry The input geometry.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER).  **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     planarLength(geometry: Geometry, unit: string | number): number;
+    /**
+     * Indicates if the given DE-9IM relation holds for the two geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#relate)
+     * 
+     * @param geometry1 The first geometry for the relation.
+     * @param geometry2 The second geometry for the relation.
+     * @param relation The Dimensionally Extended 9 Intersection Model (DE-9IM) matrix relation (encoded as a string) to test against the relationship of the two geometries. This string contains the test result of each intersection represented in the DE-9IM matrix. Each result is one character of the string and may be represented as either a number (maximum dimension returned: `0`,`1`,`2`), a Boolean value (`T` or `F`), or a mask character (for ignoring results: '\*').    Example: Each of the following DE-9IM string codes are valid for testing whether a polygon geometry completely contains a line geometry: `TTTFFTFFT` (Boolean), 'T*\*\*\*\*\*FF\*' (ignore irrelevant intersections), or '102FF\*FF\*' (dimension form). Each returns the same result.    See [this article](https://en.wikipedia.org/wiki/DE-9IM) and [this ArcGIS help page](https://desktop.arcgis.com/en/arcmap/latest/manage-data/using-sql-with-gdbs/relational-functions-for-st-geometry.htm) for more information about the DE-9IM model and how string codes are constructed.
+     * 
+     */
     relate(geometry1: Geometry, geometry2: Geometry, relation: string): boolean;
+    /**
+     * Rotates a geometry counterclockwise by the specified number of degrees. Rotation is around the centroid, or a given rotation point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#rotate)
+     * 
+     * @param geometry The geometry to rotate.
+     * @param angle The rotation angle in degrees.
+     * @param rotationOrigin Point to rotate the geometry around. Defaults to the centroid of the geometry.
+     * 
+     */
     rotate(geometry: Geometry, angle: number, rotationOrigin?: Point): Geometry;
+    /**
+     * Performs the simplify operation on the geometry which alters the given geometries to make their definitions topologically legal with respect to their geometry type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#simplify)
+     * 
+     * @param geometry The geometry to be simplified.
+     * 
+     */
     simplify(geometry: Geometry): Geometry;
+    /**
+     * Creates the symmetric difference of two geometries. The symmetric difference includes the parts that are in either of the sets, but not in both.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#symmetricDifference)
+     * 
+     * @param leftGeometry One of the Geometry instances in the XOR operation.
+     * @param rightGeometry One of the Geometry instances in the XOR operation.
+     * 
+     */
     symmetricDifference(leftGeometry: Geometry | Geometry[], rightGeometry: Geometry): Geometry | Geometry[];
+    /**
+     * Indicates if one geometry touches another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#touches)
+     * 
+     * @param geometry1 The geometry to test the "touches" relationship with the other geometry.
+     * @param geometry2 The geometry to be touched.
+     * 
+     */
     touches(geometry1: Geometry, geometry2: Geometry): boolean;
+    /**
+     * All inputs must be of the same type of geometries and share one spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#union)
+     * 
+     * @param geometries An array of Geometries to union.
+     * 
+     */
     union(geometries: Geometry[]): Geometry;
+    /**
+     * Indicates if one geometry is within another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#within)
+     * 
+     * @param innerGeometry The base geometry that is tested for the "within" relationship to the other geometry.
+     * @param outerGeometry The comparison geometry that is tested for the "contains" relationship to the other geometry.
+     * 
+     */
     within(innerGeometry: Geometry, outerGeometry: Geometry): boolean;
   }
 
   export const geometryEngine: geometryEngine;
 
-  export interface NearestPointResult {
+  /**
+   * Object returned from the [nearestCoordinate()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#nearestCoordinate), [nearestVertex()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#nearestVertex), and [nearestVertices()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#nearestVertices) methods.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#NearestPointResult)
+   */
+  export interface NearestPointResult extends Object {
+    /**
+     * A vertex within the specified distance of the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#NearestPointResult)
+     */
     coordinate: Point;
+    /**
+     * The distance from the `inputPoint` in the units of the view's spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#NearestPointResult)
+     */
     distance: number;
+    /**
+     * Indicates if the vertex is on the right side of the `geometry`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#NearestPointResult)
+     */
     isRightSide: boolean;
+    /**
+     * The index of the vertex within the geometry's rings or paths.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#NearestPointResult)
+     */
     vertexIndex: number;
+    /**
+     * Indicates if it is an empty geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#NearestPointResult)
+     */
     isEmpty: boolean;
   }
 
+
   interface geometryEngineAsync {
+    /**
+     * Creates planar (or Euclidean) buffer polygons at a specified distance around the input geometries.  The GeometryEngine has two methods for buffering geometries client-side: buffer and [geodesicBuffer](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicBuffer). Use caution when deciding which method to use. As a general rule, use [geodesicBuffer](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicBuffer) if the input geometries have a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator). Only use buffer (this method) when attempting to buffer geometries with a [projected coordinate system](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) other than Web Mercator. If you need to buffer geometries with a [geographic coordinate system](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) other than WGS84 (wkid: 4326), use [GeometryService.buffer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#buffer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#buffer)
+     * 
+     * @param geometry The buffer input geometry. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array.
+     * @param distance The specified distance(s) for buffering. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array. When using an array of geometries as input, the length of the geometry array does not have to equal the length of the `distance` array. For example, if you pass an array of four geometries: `[g1, g2, g3, g4]` and an array with one distance: `[d1]`, all four geometries will be buffered by the single distance value. If instead you use an array of three distances: `[d1, d2, d3]`, `g1` will be buffered by `d1`, `g2` by `d2`, and `g3` and `g4` will both be buffered by `d3`. The value of the geometry array will be matched one to one with those in the distance array until the final value of the distance array is reached, in which case that value will be applied to the remaining geometries.
+     * @param unit Measurement unit of the distance(s). Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * @param unionResults Determines whether the output geometries should be unioned into a single polygon.
+     * 
+     */
     buffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): IPromise<Polygon | Polygon[]>;
+    /**
+     * Calculates the clipped geometry from a target geometry by an envelope.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#clip)
+     * 
+     * @param geometry The geometry to be clipped.
+     * @param envelope The envelope used to clip.
+     * 
+     */
     clip(geometry: Geometry, envelope: Extent): IPromise<Geometry>;
+    /**
+     * Indicates if one geometry contains another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#contains)
+     * 
+     * @param containerGeometry The geometry that is tested for the "contains" relationship to the other geometry. Think of this geometry as the potential "container" of the `insideGeometry`.
+     * @param insideGeometry The geometry that is tested for the "within" relationship to the `containerGeometry`.
+     * 
+     */
     contains(containerGeometry: Geometry, insideGeometry: Geometry): IPromise<boolean>;
+    /**
+     * Calculates the convex hull of the input geometry. A convex hull is the smallest convex polygon that encloses a group of Objects, such as points. The input geometry can be a point, multipoint, polyline or polygon. The hull is typically a polygon but can also be a polyline or point in degenerate cases.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#convexHull)
+     * 
+     * @param geometry The input geometry.
+     * @param merge Dictates whether to merge output geometries.
+     * 
+     */
     convexHull(geometry: Geometry, merge?: boolean): IPromise<Geometry>;
+    /**
+     * Indicates if one geometry crosses another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#crosses)
+     * 
+     * @param geometry1 The geometry to cross.
+     * @param geometry2 The geometry being crossed.
+     * 
+     */
     crosses(geometry1: Geometry, geometry2: Geometry): IPromise<boolean>;
+    /**
+     * Split the input Polyline or Polygon where it crosses a cutting Polyline. For Polylines, all left cuts are grouped together in the first Geometry. Right cuts and coincident cuts are grouped in the second Geometry and each undefined cut, along with any uncut parts, are output as separate Polylines. For Polygons, all left cuts are grouped in the first Polygon, all right cuts are grouped in the second Polygon, and each undefined cut, along with any left-over parts after cutting, are output as a separate Polygon. If no cuts are returned then the array will be empty. An undefined cut will only be produced if a left cut or right cut was produced and there was a part left over after cutting, or a cut is bounded to the left and right of the cutter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#cut)
+     * 
+     * @param geometry The geometry to be cut.
+     * @param cutter The polyline to cut the geometry.
+     * 
+     */
     cut(geometry: Geometry, cutter: Polyline): IPromise<Geometry[]>;
+    /**
+     * Densify geometries by plotting points between existing vertices.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#densify)
+     * 
+     * @param geometry The geometry to be densified.
+     * @param maxSegmentLength The maximum segment length allowed. Must be a positive value.
+     * @param maxSegmentLengthUnit Measurement unit for maxSegmentLength. Defaults to the units of the input geometry. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     densify(geometry: Geometry, maxSegmentLength: number, maxSegmentLengthUnit: string | number): IPromise<Geometry>;
+    /**
+     * Creates the difference of two geometries. The resultant geometry is the portion of inputGeometry not in the subtractor. The dimension of the subtractor has to be equal to or greater than that of the inputGeometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#difference)
+     * 
+     * @param inputGeometry The input geometry to subtract from.
+     * @param subtractor The geometry being subtracted from inputGeometry.
+     * 
+     */
     difference(inputGeometry: Geometry | Geometry[], subtractor: Geometry): IPromise<Geometry>;
+    /**
+     * Indicates if one geometry is disjoint (doesn't intersect in any way) with another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#disjoint)
+     * 
+     * @param geometry1 The base geometry that is tested for the "disjoint" relationship to the other geometry.
+     * @param geometry2 The comparison geometry that is tested for the "disjoint" relationship to the other geometry.
+     * 
+     */
     disjoint(geometry1: Geometry, geometry2: Geometry): IPromise<boolean>;
+    /**
+     * Calculates the shortest planar distance between two geometries. Distance is reported in the linear units specified by `distanceUnit` or, if `distanceUnit` is null, the units of the spatialReference of input geometry. 
+     * > To calculate the geodesic distance between two points, first construct a [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) using the two points of interest as the beginning and ending points of a single path. Then use the polyline as input for the [geodesicLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicLength) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#distance)
+     * 
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
+     * @param distanceUnit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     distance(geometry1: Geometry, geometry2: Geometry, distanceUnit: string | number): IPromise<number>;
+    /**
+     * Indicates if two geometries are equal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#equals)
+     * 
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
+     * 
+     */
     equals(geometry1: Geometry, geometry2: Geometry): IPromise<boolean>;
+    /**
+     * Returns an Object containing additional information about the input spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#extendedSpatialReferenceInfo)
+     * 
+     * @param spatialReference The input spatial reference.
+     * 
+     */
     extendedSpatialReferenceInfo(spatialReference: SpatialReference): IPromise<any>;
+    /**
+     * Flips a geometry on the horizontal axis. Can optionally be flipped around a point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#flipHorizontal)
+     * 
+     * @param geometry The input geometry to be flipped.
+     * @param flipOrigin Point to flip the geometry around. Defaults to the centroid of the geometry.
+     * 
+     */
     flipHorizontal(geometry: Geometry, flipOrigin?: Point): IPromise<Geometry>;
+    /**
+     * Flips a geometry on the vertical axis. Can optionally be flipped around a point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#flipVertical)
+     * 
+     * @param geometry The input geometry to be flipped.
+     * @param flipOrigin Point to flip the geometry around. Defaults to the centroid of the geometry.
+     * 
+     */
     flipVertical(geometry: Geometry, flipOrigin?: Point): IPromise<Geometry>;
+    /**
+     * Performs the generalize operation on the geometries in the cursor. Point and Multipoint geometries are left unchanged. Envelope is converted to a Polygon and then generalized.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#generalize)
+     * 
+     * @param geometry The input geometry to be generalized.
+     * @param maxDeviation The maximum allowed deviation from the generalized geometry to the original geometry.
+     * @param removeDegenerateParts When `true` the degenerate parts of the geometry will be removed from the output (may be undesired for drawing).
+     * @param maxDeviationUnit Measurement unit for maxDeviation. Defaults to the units of the input geometry. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     generalize(geometry: Geometry, maxDeviation: number, removeDegenerateParts?: boolean, maxDeviationUnit?: string | number): IPromise<Geometry>;
+    /**
+     * Calculates the area of the input geometry. As opposed to [planarArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#planarArea), geodesicArea takes into account the curvature of the earth when performing this calculation. Therefore, when using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate areas using geodesicArea(). If the input geometries have a projected coordinate system other than Web Mercator, use [planarArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#planarArea) instead.  This method only works with WGS84 (wkid: 4326) and [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator) spatial references.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicArea)
+     * 
+     * @param geometry The input polygon.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for area units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.AreaUnit.Code.ACRE). **Possible Values:** acres | ares | hectares | square-feet | square-meters | square-yards | square-kilometers | square-miles
+     * 
+     */
     geodesicArea(geometry: Polygon, unit: string | number): IPromise<number>;
+    /**
+     * Creates geodesic buffer polygons at a specified distance around the input geometries. When calculating distances, this method takes the curvature of the earth into account, which provides highly accurate results when dealing with very large geometries and/or geometries that spatially vary on a global scale where one projected coordinate system could not accurately plot coordinates and measure distances for all the geometries.  This method only works with WGS84 (wkid: 4326) and [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator) spatial references. In general, if your input geometries are assigned one of those two spatial references, you should always use geodesicBuffer() to obtain the most accurate results for those geometries. If needing to buffer points assigned a [projected coordinate system other than Web Mercator](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/), use [buffer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#buffer) instead. If the input geometries have a [geographic coordinate system](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) other than WGS84 (wkid: 4326), use [GeometryService.buffer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#buffer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicBuffer)
+     * 
+     * @param geometry The buffer input geometry. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array.
+     * @param distance The specified distance(s) for buffering. The `geometry` and `distance` parameters must be specified as either both arrays or both non-arrays. Never specify one as an array and the other a non-array. When using an array of geometries as input, the length of the geometry array does not have to equal the length of the `distance` array. For example, if you pass an array of four geometries: `[g1, g2, g3, g4]` and an array with one distance: `[d1]`, all four geometries will be buffered by the single distance value. If instead you use an array of three distances: `[d1, d2, d3]`, `g1` will be buffered by `d1`, `g2` by `d2`, and `g3` and `g4` will both be buffered by `d3`. The value of the geometry array will be matched one to one with those in the distance array until the final value of the distance array is reached, in which case that value will be applied to the remaining geometries.
+     * @param unit Measurement unit of the distance(s). Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * @param unionResults Determines whether the output geometries should be unioned into a single polygon.
+     * 
+     */
     geodesicBuffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): IPromise<Polygon | Polygon[]>;
+    /**
+     * Returns a geodesically densified version of the input geometry. Use this function to draw the line(s) of the geometry along great circles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicDensify)
+     * 
+     * @param geometry A polyline or polygon to densify.
+     * @param maxSegmentLength The maximum segment length allowed. This must be a positive value.
+     * @param maxSegmentLengthUnit Measurement unit for `maxSegmentLength`. If a unit is not specified, the units are considered to be the same as the units of the `geometry`. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     geodesicDensify(geometry: Polyline | Polygon, maxSegmentLength: number, maxSegmentLengthUnit: string | number): IPromise<Geometry>;
+    /**
+     * Calculates the length of the input geometry. As opposed to [planarLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#planarLength), geodesicLength() takes into account the curvature of the earth when performing this calculation. Therefore, when using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate lengths using geodesicLength(). If the input geometries have a projected coordinate system other than Web Mercator, use [planarLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#planarLength) instead.  This method only works with WGS84 (wkid: 4326) and [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator) spatial references.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicLength)
+     * 
+     * @param geometry The input geometry.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometry. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     geodesicLength(geometry: Geometry, unit: string | number): IPromise<number>;
+    /**
+     * Creates a new geometry through intersection between two geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#intersect)
+     * 
+     * @param geometry The input geometry(ies).
+     * @param intersector The geometry being intersected.
+     * 
+     */
     intersect(geometry: Geometry | Geometry[], intersector: Geometry): IPromise<Geometry>;
+    /**
+     * Indicates if one geometry intersects another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#intersects)
+     * 
+     * @param geometry1 The geometry that is tested for the intersects relationship to the other geometry.
+     * @param geometry2 The geometry being intersected.
+     * 
+     */
     intersects(geometry1: Geometry, geometry2: Geometry): IPromise<boolean>;
+    /**
+     * Indicates if the given geometry is topologically simple.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#isSimple)
+     * 
+     * @param geometry The input geometry.
+     * 
+     */
     isSimple(geometry: Geometry): IPromise<boolean>;
+    /**
+     * Finds the coordinate of the geometry that is closest to the specified point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#nearestCoordinate)
+     * 
+     * @param geometry The geometry to consider.
+     * @param inputPoint The point used to search the nearest coordinate in the geometry.
+     * 
+     */
     nearestCoordinate(geometry: Geometry, inputPoint: Point): IPromise<NearestPointResult>;
+    /**
+     * Finds vertex on the geometry nearest to the specified point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#nearestVertex)
+     * 
+     * @param geometry The geometry to consider.
+     * @param inputPoint The point used to search the nearest vertex in the geometry.
+     * 
+     */
     nearestVertex(geometry: Geometry, inputPoint: Point): IPromise<NearestPointResult>;
+    /**
+     * Finds all vertices in the given distance from the specified point, sorted from the closest to the furthest and returns them as an array of Objects.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#nearestVertices)
+     * 
+     * @param geometry The geometry to consider.
+     * @param inputPoint The point from which to measure.
+     * @param searchRadius The distance to search from the inputPoint in the units of the view's spatial reference.
+     * @param maxVertexCountToReturn The maximum number of vertices to return.
+     * 
+     */
     nearestVertices(geometry: Geometry, inputPoint: Point, searchRadius: number, maxVertexCountToReturn: number): IPromise<NearestPointResult>;
+    /**
+     * The offset operation creates a geometry that is a constant planar distance from an input polyline or polygon. It is similar to buffering, but produces a one-sided result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#offset)
+     * 
+     * @param geometry The geometries to offset.
+     * @param offsetDistance The planar distance to offset from the input geometry. If offsetDistance > 0, then the offset geometry is constructed to the right of the oriented input geometry, if offsetDistance = 0, then there is no change in the geometries, otherwise it is constructed to the left. For a simple polygon, the orientation of outer rings is clockwise and for inner rings it is counter clockwise. So the "right side" of a simple polygon is always its inside.
+     * @param offsetUnit Measurement unit of the offset distance. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * @param joinType The join type.     **Possible values:** round | bevel | miter | square
+     * @param bevelRatio Applicable when `joinType = 'miter'`; bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
+     * @param flattenError Applicable when `joinType = 'round'`; flattenError determines the maximum distance of the resulting segments compared to the true circular arc. The algorithm never produces more than around 180 vertices for each round join.
+     * 
+     */
     offset(geometry: Geometry | Geometry[], offsetDistance: number, offsetUnit: string | number, joinType: string, bevelRatio?: number, flattenError?: number): IPromise<Geometry[]>;
+    /**
+     * Indicates if one geometry overlaps another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#overlaps)
+     * 
+     * @param geometry1 The base geometry that is tested for the "overlaps" relationship with the other geometry.
+     * @param geometry2 The comparison geometry that is tested for the "overlaps" relationship with the other geometry.
+     * 
+     */
     overlaps(geometry1: Geometry, geometry2: Geometry): IPromise<boolean>;
+    /**
+     * Calculates the area of the input geometry. As opposed to [geodesicArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicArea), planarArea() performs this calculation using projected coordinates and does not take into account the earth's curvature. When using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate areas using [geodesicArea()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicArea). If the input geometries have a projected coordinate system other than Web Mercator, use planarArea() instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#planarArea)
+     * 
+     * @param geometry The input polygon.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for area units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.AreaUnit.Code.ACRE). **Possible Values:** acres | ares | hectares | square-feet | square-meters | square-yards | square-kilometers | square-miles
+     * 
+     */
     planarArea(geometry: Polygon, unit: string | number): IPromise<number>;
+    /**
+     * Calculates the length of the input geometry. As opposed to [geodesicLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicLength), planarLength() uses projected coordinates and does not take into account the curvature of the earth when performing this calculation. When using input geometries with a spatial reference of either WGS84 (wkid: 4326) or [Web Mercator](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator), it is best practice to calculate lengths using [geodesicLength()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#geodesicLength). If the input geometries have a projected coordinate system other than Web Mercator, use planarLength() instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#planarLength)
+     * 
+     * @param geometry The input geometry.
+     * @param unit Measurement unit of the return value. Defaults to the units of the input geometries. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER). **Possible Values:** meters | feet | kilometers | miles | nautical-miles | yards
+     * 
+     */
     planarLength(geometry: Geometry, unit: string | number): IPromise<number>;
+    /**
+     * Indicates if the given DE-9IM relation holds for the two geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#relate)
+     * 
+     * @param geometry1 The first geometry for the relation.
+     * @param geometry2 The second geometry for the relation.
+     * @param relation The Dimensionally Extended 9 Intersection Model (DE-9IM) matrix relation (encoded as a string) to test against the relationship of the two geometries. This string contains the test result of each intersection represented in the DE-9IM matrix. Each result is one character of the string and may be represented as either a number (maximum dimension returned: `0`,`1`,`2`), a Boolean value (`T` or `F`), or a mask character (for ignoring results: '\*').    Example: Each of the following DE-9IM string codes are valid for testing whether a polygon geometry completely contains a line geometry: `TTTFFTFFT` (Boolean), 'T\*\*\*\*\*FF\*' (ignore irrelevant intersections), or '102FF\*FF\*' (dimension form). Each returns the same result.    See [this article](https://en.wikipedia.org/wiki/DE-9IM) and [this ArcGIS help page](https://desktop.arcgis.com/en/arcmap/latest/manage-data/using-sql-with-gdbs/relational-functions-for-st-geometry.htm) for more information about the DE-9IM model and how string codes are constructed.
+     * 
+     */
     relate(geometry1: Geometry, geometry2: Geometry, relation: string): IPromise<boolean>;
+    /**
+     * Rotates a geometry counterclockwise by the specified number of degrees. Rotation is around the centroid, or a given rotation point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#rotate)
+     * 
+     * @param geometry The geometry to rotate.
+     * @param angle The rotation angle in degrees.
+     * @param rotationOrigin Point to rotate the geometry around. Defaults to the centroid of the geometry.
+     * 
+     */
     rotate(geometry: Geometry, angle: number, rotationOrigin?: Point): IPromise<Geometry>;
+    /**
+     * Performs the simplify operation on the geometry which alters the given geometries to make their definitions topologically legal with respect to their geometry type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#simplify)
+     * 
+     * @param geometry The geometry to be simplified.
+     * 
+     */
     simplify(geometry: Geometry): IPromise<Geometry>;
+    /**
+     * Creates the symmetric difference of two geometries. The symmetric difference includes the parts that are in either of the sets, but not in both.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#symmetricDifference)
+     * 
+     * @param leftGeometry One of the Geometry instances in the XOR operation.
+     * @param rightGeometry One of the Geometry instances in the XOR operation.
+     * 
+     */
     symmetricDifference(leftGeometry: Geometry | Geometry[], rightGeometry: Geometry): IPromise<Geometry | Geometry[]>;
+    /**
+     * Indicates if one geometry touches another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#touches)
+     * 
+     * @param geometry1 The geometry to test the "touches" relationship with the other geometry.
+     * @param geometry2 The geometry to be touched.
+     * 
+     */
     touches(geometry1: Geometry, geometry2: Geometry): IPromise<boolean>;
+    /**
+     * All inputs must be of the same type of geometries and share one spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#union)
+     * 
+     * @param geometries An array of Geometries to union.
+     * 
+     */
     union(geometries: Geometry[]): IPromise<Geometry>;
+    /**
+     * Indicates if one geometry is within another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngineAsync.html#within)
+     * 
+     * @param innerGeometry The base geometry that is tested for the "within" relationship to the other geometry.
+     * @param outerGeometry The comparison geometry that is tested for the "contains" relationship to the other geometry.
+     * 
+     */
     within(innerGeometry: Geometry, outerGeometry: Geometry): IPromise<boolean>;
   }
 
   export const geometryEngineAsync: geometryEngineAsync;
 
   interface HeightModelInfo extends Accessor, JSONSupport {
-    heightModel: string;
-    heightUnit: string;
-    vertCRS: string;
+    /**
+     * The surface type or height model of the vertical coordinate system (VCS). A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) will only render layers containing data that is compatible with the HeightModelInfo of the scene. 
+     * 
+     * Value | Description
+     * ------|------------
+     * gravity-related-height | A gravity-related VCS may set its zero point through a local mean sea level or a benchmark, and is compatible with other gravity-related VCS for the purposes of rendering.
+     * ellipsoidal | An ellipsoidal VCS defines heights that are referenced to an ellipsoid of a geographic coordinate system.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-HeightModelInfo.html#heightModel)
+     * 
+     * @default "gravity-related-height"
+     */
+    readonly heightModel: string;
+    /**
+     * The unit of the vertical coordinate system. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) will use this property to check that the vertical data of layers that define a HeightModelInfo is compatible with the view.  **Possible Values:** meters | feet | us-feet | clarke-feet | clarke-yards | clarke-links | sears-yards | sears-feet | sears-chains | benoit-1895-b-chains | indian-yards | indian-1937-yards | gold-coast-feet | sears-1922-truncated-chains | 50-kilometers | 150-kilometers
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-HeightModelInfo.html#heightUnit)
+     * 
+     * @default "meters"
+     */
+    readonly heightUnit: string;
+    /**
+     * The datum realization of the vertical coordinate system. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) will only render layers that define a HeightModelInfo with an identical `vertCRS` to that of the scene, when using an `ellipsoidal` height model.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-HeightModelInfo.html#vertCRS)
+     */
+    readonly vertCRS: string;
   }
 
   interface HeightModelInfoConstructor {
+
+
     new(properties?: HeightModelInfoProperties): HeightModelInfo;
 
     fromJSON(json: any): HeightModelInfo;
@@ -753,22 +3055,100 @@ declare namespace __esri {
   export const HeightModelInfo: HeightModelInfoConstructor;
 
   interface HeightModelInfoProperties {
+    /**
+     * The surface type or height model of the vertical coordinate system (VCS). A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) will only render layers containing data that is compatible with the HeightModelInfo of the scene. 
+     * 
+     * Value | Description
+     * ------|------------
+     * gravity-related-height | A gravity-related VCS may set its zero point through a local mean sea level or a benchmark, and is compatible with other gravity-related VCS for the purposes of rendering.
+     * ellipsoidal | An ellipsoidal VCS defines heights that are referenced to an ellipsoid of a geographic coordinate system.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-HeightModelInfo.html#heightModel)
+     * 
+     * @default "gravity-related-height"
+     */
     heightModel?: string;
+    /**
+     * The unit of the vertical coordinate system. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) will use this property to check that the vertical data of layers that define a HeightModelInfo is compatible with the view.  **Possible Values:** meters | feet | us-feet | clarke-feet | clarke-yards | clarke-links | sears-yards | sears-feet | sears-chains | benoit-1895-b-chains | indian-yards | indian-1937-yards | gold-coast-feet | sears-1922-truncated-chains | 50-kilometers | 150-kilometers
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-HeightModelInfo.html#heightUnit)
+     * 
+     * @default "meters"
+     */
     heightUnit?: string;
+    /**
+     * The datum realization of the vertical coordinate system. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) will only render layers that define a HeightModelInfo with an identical `vertCRS` to that of the scene, when using an `ellipsoidal` height model.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-HeightModelInfo.html#vertCRS)
+     */
     vertCRS?: string;
   }
 
   interface Multipoint extends Geometry {
+    /**
+     * An array of points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#points)
+     */
     points: number[][];
+    /**
+     * For Multipoint, the type is always `multipoint`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#type)
+     */
+    readonly type: "multipoint";
 
+    /**
+     * Adds a point to the Multipoint.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#addPoint)
+     * 
+     * @param point The point to add to the multipoint. The point can either be a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) or an array of numbers representing XY coordinates.
+     * 
+     */
     addPoint(point: Point | number[]): Multipoint;
+    /**
+     * Creates a deep clone of Multipoint object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#clone)
+     * 
+     * 
+     */
     clone(): Multipoint;
+    /**
+     * Returns the point at the specified index.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#getPoint)
+     * 
+     * @param index The index of the point in the [points](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#points) property.
+     * 
+     */
     getPoint(index: number): Point;
+    /**
+     * Removes a point from the Multipoint. The index specifies which point to remove.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#removePoint)
+     * 
+     * @param index The index of the point to remove.
+     * 
+     */
     removePoint(index: number): Point;
+    /**
+     * Updates the point at the specified index.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#setPoint)
+     * 
+     * @param index The index of the point in the [points](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#points) property.
+     * @param point Point geometry that specifies the new location.
+     * 
+     */
     setPoint(index: number, point: Point): Multipoint;
   }
 
   interface MultipointConstructor {
+
+
     new(properties?: MultipointProperties): Multipoint;
 
     fromJSON(json: any): Multipoint;
@@ -777,25 +3157,119 @@ declare namespace __esri {
   export const Multipoint: MultipointConstructor;
 
   interface MultipointProperties extends GeometryProperties {
+    /**
+     * An array of points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html#points)
+     */
     points?: number[][];
   }
 
   interface Point extends Geometry {
+    /**
+     * The latitude of the point if the spatial reference is Web Mercator (wkid: 3857) or WGS84 (wkid: 4326).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#latitude)
+     */
     latitude: number;
+    /**
+     * The longitude of the point if the spatial reference is Web Mercator (wkid: 3857) or WGS84 (wkid: 4326).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#longitude)
+     */
     longitude: number;
+    /**
+     * The m-coordinate of the point in map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#m)
+     * 
+     * @default undefined
+     */
     m: number;
+    /**
+     * For Point, the type is always `point`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#type)
+     */
+    readonly type: "point";
+    /**
+     * The x-coordinate (easting) of the point in map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#x)
+     * 
+     * @default 0
+     */
     x: number;
+    /**
+     * The y-coordinate (northing) of the point in map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#y)
+     * 
+     * @default 0
+     */
     y: number;
+    /**
+     * The z-coordinate (or elevation) of the point in map units. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#z)
+     * 
+     * @default undefined
+     */
     z: number;
 
+    /**
+     * Creates a deep clone of Point object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#clone)
+     * 
+     * 
+     */
     clone(): Point;
+    /**
+     * Copies all values from another Point instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#copy)
+     * 
+     * @param other The point to copy from.
+     * 
+     */
     copy(other: Point): void;
+    /**
+     * Computes the Euclidean distance between this Point and a given Point. Points must have the same spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#distance)
+     * 
+     * @param other The point to compute the distance to.
+     * 
+     */
     distance(other: Point): number;
+    /**
+     * Determines if the input point is equal to the point calling the function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#equals)
+     * 
+     * @param point The input point to test.
+     * 
+     */
     equals(point: Point): boolean;
+    /**
+     * Modifies the point geometry in-place by shifting the X-coordinate to within +/- 180 span in map units. You should [clone](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#clone) the point object before calling this method where appropriate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#normalize)
+     * 
+     * 
+     */
     normalize(): Point;
   }
 
   interface PointConstructor {
+    /**
+     * A location defined by X, Y, and Z coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html)
+     */
+
     new(properties?: PointProperties): Point;
 
     fromJSON(json: any): Point;
@@ -804,34 +3278,193 @@ declare namespace __esri {
   export const Point: PointConstructor;
 
   interface PointProperties extends GeometryProperties {
+    /**
+     * The latitude of the point if the spatial reference is Web Mercator (wkid: 3857) or WGS84 (wkid: 4326).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#latitude)
+     */
     latitude?: number;
+    /**
+     * The longitude of the point if the spatial reference is Web Mercator (wkid: 3857) or WGS84 (wkid: 4326).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#longitude)
+     */
     longitude?: number;
+    /**
+     * The m-coordinate of the point in map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#m)
+     * 
+     * @default undefined
+     */
     m?: number;
+    /**
+     * The x-coordinate (easting) of the point in map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#x)
+     * 
+     * @default 0
+     */
     x?: number;
+    /**
+     * The y-coordinate (northing) of the point in map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#y)
+     * 
+     * @default 0
+     */
     y?: number;
+    /**
+     * The z-coordinate (or elevation) of the point in map units. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#z)
+     * 
+     * @default undefined
+     */
     z?: number;
   }
 
   interface Polygon extends Geometry {
+    /**
+     * The centroid of the polygon. For a polygon with multiple rings, it represents the centroid of the largest ring.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#centroid)
+     */
     centroid: Point;
+    /**
+     * Checks to see if polygon rings cross each other and indicates if the polygon is self-intersecting, which means the ring of the polygon crosses itself.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#isSelfIntersecting)
+     */
     isSelfIntersecting: boolean;
+    /**
+     * An array of rings. Each ring is a two-dimensional array of numbers representing the coordinates of each vertex in the ring in the spatial reference of the view. The first vertex of each ring should always be the same as the last vertex. Each vertex is an array of two, three, or four numbers. The table below shows the various structures of a vertex array.
+     * 
+     * Case | Vertex array
+     * --- | ---
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM)| [x, y]
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM) | [x, y, m]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM) | [x, y, z]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM) | [x, y, z, m]
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#rings)
+     */
     rings: number[][][];
+    /**
+     * For Polygon, the type is always `polygon`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#type)
+     */
+    readonly type: "polygon";
 
-    addRing(ring: Point[] | number[][]): Polygon;
+    /**
+     * Adds a ring to the Polygon. The ring can be one of the following: an array of numbers or an array of points. When added the index of the ring is incremented by one.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#addRing)
+     * 
+     * @param points A polygon ring. The first and last coordinates/points in the ring must be the same. This can either be defined as an array of Point geometries or an array of XY coordinates.
+     * 
+     */
+    addRing(points: Point[] | number[][]): Polygon;
+    /**
+     * Creates a deep clone of Polygon object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#clone)
+     * 
+     * 
+     */
     clone(): Polygon;
+    /**
+     * Checks on the client if the input point is inside the polygon. A point on the polygon line is considered inside.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#contains)
+     * 
+     * @param point The point to test whether it is contained within the testing polygon.
+     * 
+     */
     contains(point: Point): boolean;
+    /**
+     * Returns a point specified by a ring and point in the path.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#getPoint)
+     * 
+     * @param ringIndex The index of the ring containing the desired point.
+     * @param pointIndex The index of the desired point within the ring.
+     * 
+     */
     getPoint(ringIndex: number, pointIndex: number): Point;
-    insertPoint(ringIndex: number, pointIndex: number, point: Point): Polygon;
+    /**
+     * Inserts a new point into the polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#insertPoint)
+     * 
+     * @param ringIndex The index of the ring in which to insert the point.
+     * @param pointIndex The index of the point to insert within the ring.
+     * @param point The point to insert.
+     * 
+     */
+    insertPoint(ringIndex: number, pointIndex: number, point: Point | number[]): Polygon;
+    /**
+     * Checks if a Polygon ring is clockwise.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#isClockwise)
+     * 
+     * @param ring A polygon ring. The first and last coordinates/points in the ring must be the same. This can either be defined as an array of Point geometries or an array of XY coordinates.
+     * 
+     */
     isClockwise(ring: Point[] | number[][]): boolean;
+    /**
+     * Removes a point from the polygon at the given `pointIndex` within the ring identified by `ringIndex`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#removePoint)
+     * 
+     * @param ringIndex The index of the ring containing the point to remove.
+     * @param pointIndex The index of the point to remove within the ring.
+     * 
+     */
     removePoint(ringIndex: number, pointIndex: number): Point[];
+    /**
+     * Removes a ring from the Polygon. The index specifies which ring to remove.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#removeRing)
+     * 
+     * @param index The index of the ring to remove.
+     * 
+     */
     removeRing(index: number): Point[];
-    setPoint(ringIndex: number, pointIndex: number, point: Point): Polygon;
+    /**
+     * Updates a point in the polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#setPoint)
+     * 
+     * @param ringIndex The index of the ring containing the point to update.
+     * @param pointIndex The index of the point to update within the ring.
+     * @param point The new point geometry.
+     * 
+     */
+    setPoint(ringIndex: number, pointIndex: number, point: Point | number[]): Polygon;
   }
 
   interface PolygonConstructor {
+    /**
+     * A polygon contains an array of [rings](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#rings) and a [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#spatialReference). Each ring is represented as an array points. The first and last points of a ring must be the same. A polygon also has boolean-valued [hasM](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM) and [hasZ](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html)
+     */
+
     new(properties?: PolygonProperties): Polygon;
 
 
+    /**
+     * Converts the given Extent to a Polygon instance. This is useful for scenarios in which you would like to display an area of interest, which is typically defined by an Extent or bounding box, as a polygon with a fill symbol in the view. Some geoprocessing tools require input geometries to be of a Polygon type and not an Extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#fromExtent)
+     * 
+     * @param extent An extent object to convert to a polygon.
+     * 
+     */
     fromExtent(extent: Extent): Polygon;
 
     fromJSON(json: any): Polygon;
@@ -840,24 +3473,129 @@ declare namespace __esri {
   export const Polygon: PolygonConstructor;
 
   interface PolygonProperties extends GeometryProperties {
+    /**
+     * The centroid of the polygon. For a polygon with multiple rings, it represents the centroid of the largest ring.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#centroid)
+     */
     centroid?: PointProperties;
+    /**
+     * Checks to see if polygon rings cross each other and indicates if the polygon is self-intersecting, which means the ring of the polygon crosses itself.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#isSelfIntersecting)
+     */
     isSelfIntersecting?: boolean;
+    /**
+     * An array of rings. Each ring is a two-dimensional array of numbers representing the coordinates of each vertex in the ring in the spatial reference of the view. The first vertex of each ring should always be the same as the last vertex. Each vertex is an array of two, three, or four numbers. The table below shows the various structures of a vertex array.
+     * 
+     * Case | Vertex array
+     * --- | ---
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM)| [x, y]
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM) | [x, y, m]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM) | [x, y, z]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#hasM) | [x, y, z, m]
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html#rings)
+     */
     rings?: number[][][];
   }
 
   interface Polyline extends Geometry {
+    /**
+     * An array of paths, or line segments, that make up the polyline. Each path is a two-dimensional array of numbers representing the coordinates of each vertex in the path in the spatial reference of the view. Each vertex is represented as an array of two, three, or four numbers. The table below shows the various structures of a vertex array.
+     * 
+     * Case | Vertex array
+     * --- | ---
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y]
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y, m]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y, z]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y, z, m]
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#paths)
+     */
     paths: number[][][];
+    /**
+     * For Polyline, the type is always `polyline`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#type)
+     */
+    readonly type: "polyline";
 
-    addPath(points: number[][]): Polyline;
+    /**
+     * Adds a path, or line segment, to the polyline. When added, the index of the path is incremented by one.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#addPath)
+     * 
+     * @param points A polyline path. This can either be defined as an array of Point geometries or an array of XY coordinates.
+     * 
+     */
+    addPath(points: Point[] | number[][]): Polyline;
+    /**
+     * Creates a deep clone of Polyline object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#clone)
+     * 
+     * 
+     */
     clone(): Polyline;
+    /**
+     * Returns a point specified by a path and point in the path.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#getPoint)
+     * 
+     * @param pathIndex The index of a path in the polyline.
+     * @param pointIndex The index of a point in a path.
+     * 
+     */
     getPoint(pathIndex: number, pointIndex: number): Point;
-    insertPoint(pathIndex: number, pointIndex: number, point: Point): Polyline;
+    /**
+     * Inserts a new point into a polyline.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#insertPoint)
+     * 
+     * @param pathIndex The index of the path in which to insert a point.
+     * @param pointIndex The index of the inserted point in the path.
+     * @param point The point to insert.
+     * 
+     */
+    insertPoint(pathIndex: number, pointIndex: number, point: Point | number[]): Polyline;
+    /**
+     * Removes a path from the Polyline. The index specifies which path to remove.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#removePath)
+     * 
+     * @param index The index of the path to remove from the polyline.
+     * 
+     */
     removePath(index: number): Point[];
+    /**
+     * Removes a point from the polyline at the given `pointIndex` within the path identified by the given `pathIndex`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#removePoint)
+     * 
+     * @param pathIndex The index of the path containing the point to be removed.
+     * @param pointIndex The index of the point to be removed within the path.
+     * 
+     */
     removePoint(pathIndex: number, pointIndex: number): Point;
-    setPoint(pathIndex: number, pointIndex: number, point: Point): Polyline;
+    /**
+     * Updates a point in a polyline.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#setPoint)
+     * 
+     * @param pathIndex The index of the path that contains the point to be updated.
+     * @param pointIndex The index of the point to be updated in the path.
+     * @param point Point geometry to update in the path.
+     * 
+     */
+    setPoint(pathIndex: number, pointIndex: number, point: Point | number[]): Polyline;
   }
 
   interface PolylineConstructor {
+
+
     new(properties?: PolylineProperties): Polyline;
 
     fromJSON(json: any): Polyline;
@@ -866,96 +3604,354 @@ declare namespace __esri {
   export const Polyline: PolylineConstructor;
 
   interface PolylineProperties extends GeometryProperties {
+    /**
+     * An array of paths, or line segments, that make up the polyline. Each path is a two-dimensional array of numbers representing the coordinates of each vertex in the path in the spatial reference of the view. Each vertex is represented as an array of two, three, or four numbers. The table below shows the various structures of a vertex array.
+     * 
+     * Case | Vertex array
+     * --- | ---
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y]
+     * [without z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y, m]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [without m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y, z]
+     * [with z](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasZ) and [with m](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#hasM) | [x, y, z, m]
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html#paths)
+     */
     paths?: number[][][];
   }
 
   interface ScreenPoint extends Accessor {
+    /**
+     * X-coordinate in pixels relative to the top-left corner of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-ScreenPoint.html#x)
+     * 
+     * @default 0
+     */
     x: number;
+    /**
+     * Y-coordinate in pixels relative to the top-left corner of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-ScreenPoint.html#y)
+     * 
+     * @default 0
+     */
     y: number;
+
+    /**
+     * Creates a deep clone of ScreenPoint object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-ScreenPoint.html#clone)
+     * 
+     * 
+     */
+    clone(): ScreenPoint;
   }
 
   interface ScreenPointConstructor {
+
+
     new(properties?: ScreenPointProperties): ScreenPoint;
   }
 
   export const ScreenPoint: ScreenPointConstructor;
 
   interface ScreenPointProperties {
+    /**
+     * X-coordinate in pixels relative to the top-left corner of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-ScreenPoint.html#x)
+     * 
+     * @default 0
+     */
     x?: number;
+    /**
+     * Y-coordinate in pixels relative to the top-left corner of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-ScreenPoint.html#y)
+     * 
+     * @default 0
+     */
     y?: number;
   }
 
   interface SpatialReference extends Accessor, JSONSupport {
-    isGeographic: boolean;
-    isWebMercator: boolean;
-    isWGS84: boolean;
-    isWrappable: boolean;
-    WebMercator: SpatialReference;
-    WGS84: SpatialReference;
+    /**
+     * Indicates if the spatial reference refers to a geographic coordinate system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isGeographic)
+     */
+    readonly isGeographic: boolean;
+    /**
+     * Indicates if the [wkid](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkid) of the spatial reference object is one of the following values: `102113`, `102100`, `3857`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWebMercator)
+     */
+    readonly isWebMercator: boolean;
+    /**
+     * Indicates if the [wkid](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkid) of the spatial reference object is `4326`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWGS84)
+     */
+    readonly isWGS84: boolean;
+    /**
+     * Indicates if the spatial reference of the map supports wrapping around the International Date Line. Value is `true` if the spatial reference is Web Mercator or WGS84.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#isWrappable)
+     */
+    readonly isWrappable: boolean;
+    /**
+     * The well-known ID of a spatial reference. See [Projected Coordinate Systems](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) and [Geographic Coordinate Systems](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) for the list of supported spatial references.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkid)
+     */
     wkid: number;
+    /**
+     * The well-known text that defines a spatial reference. Many browsers have a limit to the length of a GET request of approximately 2048 characters. When using well-known text to specify the spatial reference you can easily exceed this limit. In these cases, you will need to setup and use a proxy page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkt)
+     */
     wkt: string;
 
+    /**
+     * Returns a deep clone of the spatial reference object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#clone)
+     * 
+     * 
+     */
     clone(): SpatialReference;
+    /**
+     * Checks if the specified spatial reference object has the same [wkid](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkid) or [wkt](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkt) as this spatial reference object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#equals)
+     * 
+     * @param spatialReference The spatial reference to compare to.
+     * 
+     */
     equals(spatialReference: SpatialReference): boolean;
   }
 
   interface SpatialReferenceConstructor {
+
+
     new(properties?: SpatialReferenceProperties): SpatialReference;
 
+
+    /**
+     * A convenience spatial reference instance for Web Mercator.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#WebMercator)
+     */
+    WebMercator: SpatialReference;
+    /**
+     * A convenience spatial reference instance for WGS84.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#WGS84)
+     */
+    WGS84: SpatialReference;
+
     fromJSON(json: any): SpatialReference;
   }
 
   export const SpatialReference: SpatialReferenceConstructor;
 
   interface SpatialReferenceProperties {
-    isGeographic?: boolean;
-    isWebMercator?: boolean;
-    isWGS84?: boolean;
-    isWrappable?: boolean;
-    WebMercator?: SpatialReferenceProperties;
-    WGS84?: SpatialReferenceProperties;
+    /**
+     * The well-known ID of a spatial reference. See [Projected Coordinate Systems](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) and [Geographic Coordinate Systems](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) for the list of supported spatial references.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkid)
+     */
     wkid?: number;
+    /**
+     * The well-known text that defines a spatial reference. Many browsers have a limit to the length of a GET request of approximately 2048 characters. When using well-known text to specify the spatial reference you can easily exceed this limit. In these cases, you will need to setup and use a proxy page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html#wkt)
+     */
     wkt?: string;
   }
 
+
   interface jsonUtils {
+    /**
+     * Creates a new instance of an appropriate [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) class and initializes it with values from a JSON object generated from a product in the ArcGIS platform. The object passed into the input `json` parameter often comes from a response to a query operation in the REST API or a [toJSON()](http://pro.arcgis.com/en/pro-app/tool-reference/conversion/features-to-json.htm) method from another ArcGIS product. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for details and examples of when and how to use this function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-jsonUtils.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance in the ArcGIS format. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geometry_objects/02r3000000n1000000/) for examples of the structure of various input JSON objects.
+     * 
+     */
     fromJSON(json: any): Geometry;
+    /**
+     * Returns the type for a given geometry in the JSON format used by the ArcGIS platform. This only applies to geometries that can be processed by the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-jsonUtils.html#getJsonType)
+     * 
+     * @param geometry The input geometry object.
+     * 
+     */
     getJsonType(geometry: Geometry): string;
   }
 
   export const jsonUtils: jsonUtils;
 
+
   interface normalizeUtils {
+    /**
+     * Normalizes geometries that intersect the central meridian or fall outside the world extent so they stay within the coordinate system of the view. Only supported for Web Mercator and WGS84 spatial references.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-normalizeUtils.html#normalizeCentralMeridian)
+     * 
+     * @param geometries An array of geometries to normalize.
+     * @param geometryService A geometry service used to perform the normalization. If this value is `null` then the default geometry service in [esriConfig.geometryServiceUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#geometryServiceUrl) is used.
+     * 
+     */
     normalizeCentralMeridian(geometries: Geometry[], geometryService?: GeometryService): IPromise<Geometry[]>;
   }
 
   export const normalizeUtils: normalizeUtils;
 
+
   interface webMercatorUtils {
+    /**
+     * Returns `true` if the `source` spatial reference can be projected to the `target` spatial reference with the [project()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#project) function, or if the `source` and `target` are the same [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#canProject)
+     * 
+     * @param source The input [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html) or an object with `spatialReference` property such as [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) or [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html).
+     * @param target The target [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html) or an object with `spatialReference` property such as [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) or [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html).
+     * 
+     */
     canProject(source: SpatialReference | any, target: SpatialReference | any): boolean;
+    /**
+     * Converts a geometry from geographic units (wkid: 4326) to Web Mercator units (wkid: 3857).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#geographicToWebMercator)
+     * 
+     * @param geometry The input geometry to convert.
+     * 
+     */
     geographicToWebMercator(geometry: Geometry): Geometry;
+    /**
+     * Translates the given latitude and longitude (decimal degree) values to Web Mercator XY values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#lngLatToXY)
+     * 
+     * @param long The longitude value to convert.
+     * @param lat The latitude value to convert.
+     * 
+     */
     lngLatToXY(long: number, lat: number): number[];
+    /**
+     * Projects the geometry clientside (if possible). You should test the input geometry in [canProject()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#canProject) prior to using this function. If the result of [canProject()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#canProject) is `true`, then proceed to project. If [canProject()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#canProject) returns `false`, then `project()` won't return useful results. Use [GeometryService.project()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#project) instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#project)
+     * 
+     * @param geometry The input geometry.
+     * @param spatialReference The target [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html) or an object with `spatialReference` property such as [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) or [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html).
+     * 
+     */
     project(geometry: Geometry, spatialReference: SpatialReference | any): Geometry;
+    /**
+     * Converts a geometry from Web Mercator units (wkid: 3857) to geographic units (wkid: 4326).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#webMercatorToGeographic)
+     * 
+     * @param geometry The input geometry to convert.
+     * 
+     */
     webMercatorToGeographic(geometry: Geometry): Geometry;
+    /**
+     * Translates the given Web Mercator coordinates to Longitude and Latitude values (decimal degrees). By default the returned longitude is normalized so that it is within -180 and +180.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-support-webMercatorUtils.html#xyToLngLat)
+     * 
+     * @param x The X coordinate value to convert.
+     * @param y The Y coordinate value to convert.
+     * 
+     */
     xyToLngLat(x: number, y: number): number[];
   }
 
   export const webMercatorUtils: webMercatorUtils;
 
   interface Graphic extends Accessor, JSONSupport {
+    /**
+     * Name-value pairs of fields and field values associated with the graphic.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes)
+     */
     attributes: any;
+    /**
+     * The geometry that defines the graphic's location. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#geometry)
+     */
     geometry: Geometry;
-    layer: FeatureLayer | GraphicsLayer;
+    /**
+     * If applicable, references the layer in which the graphic is stored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#layer)
+     */
+    layer: Layer;
+    /**
+     * The template for displaying content in a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when the graphic is selected. The [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) may be used to access a graphic's [attributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes) and display their values in the view's default popup. See the documentation for [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) for details on how to display attribute values in the popup.  As of version 4.5, if the `popupTemplate` is not defined on the `Graphic`, it will use the graphic [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#layer) popupTemplate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
+    /**
+     * The [Symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html) for the graphic. Choosing a symbol for a graphic depends on the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) type (SceneView or MapView), and the [geometry type](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#type) of the graphic.  If the symbol is not specified for a graphic in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), it displays using the symbol defined in the layer's [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html). Each graphic may have its own symbol specified when the parent layer is a [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#symbol)
+     */
     symbol: Symbol;
+    /**
+     * Indicates the visibility of the graphic.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#visible)
+     * 
+     * @default true
+     */
     visible: boolean;
 
+    /**
+     * Creates a deep clone of the graphic object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#clone)
+     * 
+     * 
+     */
     clone(): Graphic;
+    /**
+     * Returns the value of the specified attribute.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#getAttribute)
+     * 
+     * @param name The name of the attribute.
+     * 
+     */
     getAttribute(name: string): any;
+    /**
+     * Sets a new value to the specified attribute.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#setAttribute)
+     * 
+     * @param name The name of the attribute to set.
+     * @param newValue The new value to set on the named attribute.
+     * 
+     */
     setAttribute(name: string, newValue: any): void;
   }
 
   interface GraphicConstructor {
+    /**
+     * A Graphic is a vector representation of real world geographic phenomena. It can contain [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#geometry), a [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#symbol), and [attributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes). A Graphic is displayed in the [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html)
+     */
+
     new(properties?: GraphicProperties): Graphic;
 
     fromJSON(json: any): Graphic;
@@ -964,23 +3960,92 @@ declare namespace __esri {
   export const Graphic: GraphicConstructor;
 
   interface GraphicProperties {
+    /**
+     * Name-value pairs of fields and field values associated with the graphic.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes)
+     */
     attributes?: any;
+    /**
+     * The geometry that defines the graphic's location. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#geometry)
+     */
     geometry?: GeometryProperties;
-    layer?: FeatureLayerProperties | GraphicsLayerProperties;
+    /**
+     * If applicable, references the layer in which the graphic is stored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#layer)
+     */
+    layer?: LayerProperties;
+    /**
+     * The template for displaying content in a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when the graphic is selected. The [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) may be used to access a graphic's [attributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes) and display their values in the view's default popup. See the documentation for [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) for details on how to display attribute values in the popup.  As of version 4.5, if the `popupTemplate` is not defined on the `Graphic`, it will use the graphic [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#layer) popupTemplate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * The [Symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html) for the graphic. Choosing a symbol for a graphic depends on the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) type (SceneView or MapView), and the [geometry type](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#type) of the graphic.  If the symbol is not specified for a graphic in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), it displays using the symbol defined in the layer's [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html). Each graphic may have its own symbol specified when the parent layer is a [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#symbol)
+     */
     symbol?: SymbolProperties;
+    /**
+     * Indicates the visibility of the graphic.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#visible)
+     * 
+     * @default true
+     */
     visible?: boolean;
   }
 
   interface Ground extends Accessor, Loadable, JSONSupport {
-    layers: Collection<Layer>;
-    loaded: boolean;
+    /**
+     * A collection of [ElevationLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html) that define the elevation or terrain that makes up the ground surface. When elevation layers are added to the ground, the topographical variations of the surface are rendered in 3D as they would appear in the real world.  ![elev-default](https://developers.arcgis.com/javascript/latest/assets/img/apiref/ground/elev-default.png)  When the layers collection is empty, the ground surface is flat.  ![no-elev](https://developers.arcgis.com/javascript/latest/assets/img/apiref/ground/no-elev.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers)
+     */
+    layers: Collection<ElevationLayer>;
+    /**
+     * Indicates whether the instance has loaded. When `true`, the properties of the object can be accessed. A Ground is considered loaded when its [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers) are fully created, but not yet loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#loaded)
+     * 
+     * @default false
+     */
+    readonly loaded: boolean;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#clone)
+     * 
+     * 
+     */
     clone(): Ground;
+    /**
+     * Queries the ground layer services for elevation values for the given geometry. The returned result contains a copy of the geometry with z-values sampled from elevation data from the first layer that has data available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#queryElevation)
+     * 
+     * @param geometry The geometry to sample.
+     * @param options Additional query options.
+     * @param options.returnSampleInfo Indicates whether to return additional sample information for each sampled coordinate.
+     * @param options.noDataValue The value that appears in the resulting geometry when there is no data available.
+     * 
+     */
     queryElevation(geometry: Point | Multipoint | Polyline, options?: GroundQueryElevationOptions): IPromise<ElevationQueryResult>;
   }
 
   interface GroundConstructor {
+    /**
+     * The Ground class contains properties that specify how the ground surface is displayed in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). It contains a [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers) property, which is a collection of [ElevationLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html) that defines the elevation or terrain of the map's surface.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html)
+     */
+
     new(properties?: GroundProperties): Ground;
 
     fromJSON(json: any): Ground;
@@ -989,74 +4054,242 @@ declare namespace __esri {
   export const Ground: GroundConstructor;
 
   interface GroundProperties extends LoadableProperties {
-    layers?: CollectionProperties<LayerProperties>;
-    loaded?: boolean;
+    /**
+     * A collection of [ElevationLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html) that define the elevation or terrain that makes up the ground surface. When elevation layers are added to the ground, the topographical variations of the surface are rendered in 3D as they would appear in the real world.  ![elev-default](https://developers.arcgis.com/javascript/latest/assets/img/apiref/ground/elev-default.png)  When the layers collection is empty, the ground surface is flat.  ![no-elev](https://developers.arcgis.com/javascript/latest/assets/img/apiref/ground/no-elev.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers)
+     */
+    layers?: CollectionProperties<ElevationLayerProperties>;
   }
 
-  export interface ElevationQueryResult {
+  /**
+   * Object returned when [queryElevation()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#queryElevation) promise resolves:
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#ElevationQueryResult)
+   */
+  export interface ElevationQueryResult extends Object {
+    /**
+     * The geometry with sampled z-values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#ElevationQueryResult)
+     */
     geometry: Point | Multipoint | Polyline;
-    sampleInfo: ElevationQueryResultSampleInfo[];
+    /**
+     * Contains additional information about how the geometry was sampled. This property is present depending on whether the user set `options.returnSampleInfo = true`, for each coordinate in the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#ElevationQueryResult)
+     */
+    sampleInfo?: ElevationQueryResultSampleInfo[];
+    /**
+     * The value used when there is no data available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#ElevationQueryResult)
+     */
     noDataValue: number;
   }
 
-  export interface GroundQueryElevationOptions {
+
+  export interface GroundQueryElevationOptions extends Object {
+    /**
+     * Indicates whether to return additional sample information for each sampled coordinate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#queryElevation)
+     * 
+     * @default false
+     */
     returnSampleInfo?: boolean;
+    /**
+     * The value that appears in the resulting geometry when there is no data available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#queryElevation)
+     * 
+     * @default 0
+     */
     noDataValue?: number;
   }
 
-  export interface ElevationQueryResultSampleInfo {
+
+  export interface ElevationQueryResultSampleInfo extends Object {
+    /**
+     * The resolution at which the z-value was sampled. If no data was available for sampling for a given coordinate, the dem resolution value will be -1 for that coordinate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#ElevationQueryResult)
+     */
     demResolution: number;
+    /**
+     * The elevation source from which the data for the corresponding coordinate was sampled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#ElevationQueryResult)
+     */
     source: ElevationLayer;
   }
 
   interface Credential extends Accessor {
+    /**
+     * Token expiration time specified as number of milliseconds since 1 January 1970 00:00:00 UTC.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#expires)
+     */
     expires: number;
+    /**
+     * Indicates whether this credential belongs to a user with admin privileges.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#isAdmin)
+     */
     isAdmin: boolean;
+    /**
+     * The Identity Manager's [setOAuthRedirectionHandler](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#setOAuthRedirectionHandler) returns an object that contains a `state` property. This information is returned for this property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#oAuthState)
+     */
     oAuthState: any;
+    /**
+     * The server url.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#server)
+     */
     server: string;
+    /**
+     * Indicates whether the resources accessed using this credential should be fetched over HTTPS protocol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#ssl)
+     */
     ssl: boolean;
+    /**
+     * Token generated by the token service using the specified userId and password.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#token)
+     */
     token: string;
+    /**
+     * User associated with the Credential object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#userId)
+     */
     userId: string;
 
+    /**
+     * Destroys the credential. When the credential is destroyed, you should remove any map layers that are using this credential.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#destroy)
+     * 
+     * 
+     */
     destroy(): void;
+    /**
+     * Generates a new token and updates the Credential's [token](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#token) property with the newly acquired token. Tokens are typically kept valid using a timer that automatically triggers a refresh before the token expires. Use this method in cases where the timer has been delayed or stopped.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#refreshToken)
+     * 
+     * 
+     */
     refreshToken(): void;
   }
 
   interface CredentialConstructor {
+
+
     new(properties?: CredentialProperties): Credential;
   }
 
   export const Credential: CredentialConstructor;
 
   interface CredentialProperties {
+    /**
+     * Token expiration time specified as number of milliseconds since 1 January 1970 00:00:00 UTC.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#expires)
+     */
     expires?: number;
+    /**
+     * Indicates whether this credential belongs to a user with admin privileges.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#isAdmin)
+     */
     isAdmin?: boolean;
+    /**
+     * The Identity Manager's [setOAuthRedirectionHandler](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#setOAuthRedirectionHandler) returns an object that contains a `state` property. This information is returned for this property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#oAuthState)
+     */
     oAuthState?: any;
+    /**
+     * The server url.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#server)
+     */
     server?: string;
+    /**
+     * Indicates whether the resources accessed using this credential should be fetched over HTTPS protocol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#ssl)
+     */
     ssl?: boolean;
+    /**
+     * Token generated by the token service using the specified userId and password.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#token)
+     */
     token?: string;
+    /**
+     * User associated with the Credential object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html#userId)
+     */
     userId?: string;
   }
 
   interface IdentityManager extends IdentityManagerBase {
+    /**
+     * Dialog box widget used to challenge the user for their credentials when the application attempts to access a secure resource. This property is available after the dialog-create event has fired.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#dialog)
+     */
     dialog: any;
 
+    /**
+     * When accessing secure resources via Oauth 2.0 from ArcGIS.com or one of its sub-domains the IdentityManager redirects the user to the ArcGIS.com or Portal for ArcGIS sign-in page. Once the user successfully logs in they are redirected back to the application. Use this method if the application needs to execute custom logic before the page is redirected. The IdentityManager calls the custom handler function with an object containing redirection properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#setOAuthRedirectionHandler)
+     * 
+     * @param handlerFunction When called, the callback passed to `setOAuthRedirectionHandler` receives an object containing the redirection properties.
+     * 
+     */
     setOAuthRedirectionHandler(handlerFunction: HandlerCallback): void;
+    /**
+     * Use this method in the popup callback page to pass the token and other values back to the IdentityManager.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#setOAuthResponseHash)
+     * 
+     * @param hash The token information in addition to any other values needed to be passed back to the IdentityManager.
+     * 
+     */
     setOAuthResponseHash(hash: string): void;
 
+
     on(name: "credential-create", eventHandler: IdentityManagerCredentialCreateEventHandler): IHandle;
+
     on(name: "credential-create", modifiers: string[], eventHandler: IdentityManagerCredentialCreateEventHandler): IHandle;
+
     on(name: "credentials-destroy", eventHandler: IdentityManagerCredentialsDestroyEventHandler): IHandle;
+
     on(name: "credentials-destroy", modifiers: string[], eventHandler: IdentityManagerCredentialsDestroyEventHandler): IHandle;
   }
 
   interface IdentityManagerConstructor {
+    /**
+     * This object provides the framework and helper methods used in managing user credentials for the following resources:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html)
+     */
+
     new(): IdentityManager;
   }
 
   export const IdentityManager: IdentityManagerConstructor;
 
   export interface IdentityManagerCredentialCreateEvent {
+
     credential: Credential;
   }
 
@@ -1066,91 +4299,463 @@ declare namespace __esri {
   export type HandlerCallback = (authorizeParams: any, authorizeUrl: string, oAuthInfo: OAuthInfo, resourceUrl: string, serverInfo: ServerInfo) => void;
 
   interface IdentityManagerBase extends Evented {
+    /**
+     * The suggested lifetime of the token in minutes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#tokenValidity)
+     * 
+     * @default 60
+     */
     tokenValidity: number;
 
+    /**
+     * Returns the [Credential](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html) if the user has already signed in to access the given resource. If the user has not signed in, then the promise will be rejected and its error callback will be called.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#checkSignInStatus)
+     * 
+     * @param resUrl The resource URL.
+     * 
+     */
     checkSignInStatus(resUrl: string): IPromise<Credential>;
+    /**
+     * Destroys all credentials.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#destroyCredentials)
+     * 
+     * 
+     */
     destroyCredentials(): void;
+    /**
+     * Returns the [Credential](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html) for the resource identified by the specified url. Optionally, you can provide a userId to find credentials for a specific user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#findCredential)
+     * 
+     * @param url The URL to a server.
+     * @param userId The userId for which you want to obtain credentials.
+     * 
+     */
     findCredential(url: string, userId?: string): Credential;
+    /**
+     * Returns the [OAuthInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html) configuration for the passed in Portal server URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#findOAuthInfo)
+     * 
+     * @param url The URL to a Portal.
+     * 
+     */
     findOAuthInfo(url: string): OAuthInfo;
+    /**
+     * Returns information about the server that is hosting the specified URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#findServerInfo)
+     * 
+     * @param url The URL to the server
+     * 
+     */
     findServerInfo(url: string): ServerInfo;
+    /**
+     * Returns an object containing a token and its expiration time. It is necessary to provide the [ServerInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html) object that contains a token service URL and a user info object containing username and password. This is a helper method typically called by sub-classes to generate tokens.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#generateToken)
+     * 
+     * @param serverInfo A ServerInfo object that contains a token service URL.
+     * @param userInfo A user info object containing a user name and password.
+     * @param options See the table below for the structure of this object.
+     * @param options.serverUrl The server URL.
+     * @param options.token The server token.
+     * @param options.ssl Indicates if the server requires SSL.
+     * 
+     */
     generateToken(serverInfo: ServerInfo, userInfo: any, options?: IdentityManagerBaseGenerateTokenOptions): IPromise<any>;
+    /**
+     * Returns a [Credential](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-Credential.html) object that can be used to access the secured resource identified by the input URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#getCredential)
+     * 
+     * @param url The URL for the secure resource
+     * @param options See the table below for the structure of the **options** object.
+     * @param options.error Error object returned by the server from a previous attempt to fetch the given URL.
+     * @param options.oAuthPopupConfirmation If set to *false*, the user will not be shown a dialog before the OAuth popup window is opened.
+     * @param options.retry Determines if the method should make additional attempts to get the credentials after a failure.
+     * @param options.token Token used for a previous unsuccessful attempt to fetch the given URL.
+     * 
+     */
     getCredential(url: string, options?: IdentityManagerBaseGetCredentialOptions): IPromise<any>;
+    /**
+     * Call this method during application initialization with the JSON previously obtained from the [toJSON()](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#toJSON) method used to re-hydrate the state of IdentityManager.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#initialize)
+     * 
+     * @param json The JSON obtained from the [toJSON()](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#toJSON) method.
+     * 
+     */
     initialize(json: any): void;
+    /**
+     * Indicates if the IdentityManager is busy accepting user input. For example, it returns `true` if the user has invoked [signIn](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#signIn) and is waiting for a response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#isBusy)
+     * 
+     * 
+     */
     isBusy(): boolean;
+    /**
+     * Subclasses must implement this method if OAuth support is required.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#oAuthSignIn)
+     * 
+     * @param resUrl The resource URL.
+     * @param serverInfo A ServerInfo object that contains the token service URL.
+     * @param oAuthInfo An OAuthInfo object that contains the authorization configuration.
+     * @param options See the table below for the structure of the **options** object.
+     * @param options.error Error object returned by the server from a previous attempt to fetch the given URL.
+     * @param options.oAuthPopupConfirmation Indicates whether the user will be shown a dialog before the OAuth popup window is opened.
+     * @param options.token Token used for previous unsuccessful attempts to fetch the given URL.
+     * 
+     */
     oAuthSignIn(resUrl: string, serverInfo: ServerInfo, oAuthInfo: OAuthInfo, options?: IdentityManagerBaseOAuthSignInOptions): IPromise<any>;
+    /**
+     * Registers OAuth 2.0 configurations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#registerOAuthInfos)
+     * 
+     * @param oAuthInfos An array of OAuthInfo objects that defines the OAuth configurations.
+     * 
+     */
     registerOAuthInfos(oAuthInfos: OAuthInfo[]): void;
+    /**
+     * Register secure servers and the token endpoints.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#registerServers)
+     * 
+     * @param serverInfos An array of ServerInfos objects that defines the secure service and token endpoint. The IdentityManager makes its best guess to determine the location of the secure server and token endpoint. Therefore, in most cases calling this method is not necessary. However, if the location of your server or token endpoint is not standard, use this method to register the location.
+     * 
+     */
     registerServers(serverInfos: ServerInfo[]): void;
+    /**
+     * Registers the given OAuth 2.0 access token or ArcGIS Server token with the IdentityManager. See [registerOAuthInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#registerOAuthInfos) for additional information. The `registerToken` method is an advanced workflow for pre-registering long-term tokens for when you don't want users to sign in. See also [resource-proxy](https://github.com/Esri/resource-proxy) for another workflow to achieve this result.  Once a user logs in, the access token is registered with the IdentityManager. Subsequently, every AJAX request made by the application forwards this token when accessing web maps and other items stored in ArcGIS Online, or resources on your server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#registerToken)
+     * 
+     * @param properties See the table below for the structure of the **properties** object.
+     * @param properties.expires Token expiration time specified as number of milliseconds since 1 January 1970 00:00:00 UTC.
+     * @param properties.server For ArcGIS Online or Portal, this is https://www.arcgis.com/sharing/rest or similar to https://www.example.com/portal/sharing/rest. For ArcGIS Server this is similar to https://www.example.com/arcgis/rest/services.
+     * @param properties.ssl Set this to `true` if the user has an ArcGIS Online organizational account and the organization is configured to allow access to resources only through SSL.
+     * @param properties.token The access token.
+     * @param properties.userId The id of the user who owns the access token.
+     * 
+     */
     registerToken(properties: IdentityManagerBaseRegisterTokenProperties): void;
+    /**
+     * When accessing secured resources, the IdentityManager may prompt for username and password and send them to the server using a secure connection. Due to potential browser limitations, it may not be possible to establish a secure connection with the server if the application is being run over HTTP protocol. In such cases, the Identity Manager will abort the request to fetch the secured resource. To resolve this issue, configure your web application server with HTTPS support and run the application over HTTPS. This is the recommended solution for production environments. However, for internal development environments that don't have HTTPS support, you can define a protocol error handler that allows the Identity Manager to continue with the process over HTTP protocol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setProtocolErrorHandler)
+     * 
+     * @param handlerFunction The function to call when the protocol is mismatched.
+     * @param handlerFunction.resourceUrl The secure resource URL.
+     * @param handlerFunction.serverInfo ServerInfo object describing the server where the secure resource is hosted.
+     * 
+     */
     setProtocolErrorHandler(handlerFunction: IdentityManagerBaseSetProtocolErrorHandlerHandlerFunction): void;
+    /**
+     * When accessing secure resources from ArcGIS.com or one of its subdomains, the IdentityManager redirects the user to the ArcGIS.com sign-in page. Once the user successfully logs in they are redirected back to the application. Use this method if the application needs to execute custom logic before the page is redirected by creating a custom redirection handler. The IdentityManager calls the custom handler function with an object containing the redirection properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setRedirectionHandler)
+     * 
+     * @param handlerFunction The function passed to setRedirectionHandler receives an object containing redirection properties. These properties are listed in the table below.
+     * @param handlerFunction.resourceUrl The URL of the secure resource that triggers the redirection to the ArcGIS.com sign-in page.
+     * @param handlerFunction.returnUrlParamName The application URL where the sign-in page redirects after a successful login. To create the return URL, append the application's URL to signInPage as a parameter. The *returnUrlParamName* contains the name of the parameter.
+     * @param handlerFunction.serverInfo The ServerInfo object describing the server where the secure resource is hosted.
+     * @param handlerFunction.signInPage URL of the sign-in page where users will be redirected.
+     * 
+     */
     setRedirectionHandler(handlerFunction: IdentityManagerBaseSetRedirectionHandlerHandlerFunction): void;
+    /**
+     * Subclasses must implement this method to create and manage the user interface used to obtain a username and password from the end user. It should perform the following tasks:
+     *   * challenge the user for a username and password,
+     *   * generate a token and return it to the caller.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#signIn)
+     * 
+     * @param url URL for the secured resource.
+     * @param serverInfo A ServerInfo object that contains the token service URL.
+     * @param options See the table below for the structure of the **options** object.
+     * @param options.error Error object returned by the server from a previous attempt to fetch the given URL.
+     * 
+     */
     signIn(url: string, serverInfo: ServerInfo, options?: IdentityManagerBaseSignInOptions): IPromise<any>;
+    /**
+     * Return properties of this object in JSON format. It can be stored in a cookie or persisted in HTML5 LocalStorage and later used to:
+     *   * Initialize the IdentityManager the next time a user opens your application.
+     *   * Share the state of the IdentityManager between multiple web pages of your website. This way users will not be asked to sign in repeatedly when they launch your app multiple times or when navigating between multiple web pages in your website.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface IdentityManagerBaseConstructor {
+    /**
+     * This class provides the framework and helper methods required to implement a solution for managing user credentials.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html)
+     */
+
     new(): IdentityManagerBase;
   }
 
   export const IdentityManagerBase: IdentityManagerBaseConstructor;
 
-  export interface IdentityManagerBaseGenerateTokenOptions {
+
+  export interface IdentityManagerBaseGenerateTokenOptions extends Object {
+    /**
+     * The server URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#generateToken)
+     */
     serverUrl: string;
+    /**
+     * The server token.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#generateToken)
+     */
     token: string;
+    /**
+     * Indicates if the server requires SSL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#generateToken)
+     */
     ssl: boolean;
   }
 
-  export interface IdentityManagerBaseGetCredentialOptions {
+
+  export interface IdentityManagerBaseGetCredentialOptions extends Object {
+    /**
+     * Error object returned by the server from a previous attempt to fetch the given URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#getCredential)
+     */
     error?: Error;
+    /**
+     * If set to *false*, the user will not be shown a dialog before the OAuth popup window is opened.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#getCredential)
+     * 
+     * @default true
+     */
     oAuthPopupConfirmation?: boolean;
+    /**
+     * Determines if the method should make additional attempts to get the credentials after a failure.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#getCredential)
+     */
     retry?: boolean;
+    /**
+     * Token used for a previous unsuccessful attempt to fetch the given URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#getCredential)
+     */
     token?: string;
   }
 
-  export interface IdentityManagerBaseOAuthSignInOptions {
-    error: Error;
-    oAuthPopupConfirmation: boolean;
-    token: string;
+
+  export interface IdentityManagerBaseOAuthSignInOptions extends Object {
+    /**
+     * Error object returned by the server from a previous attempt to fetch the given URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#oAuthSignIn)
+     */
+    error?: Error;
+    /**
+     * Indicates whether the user will be shown a dialog before the OAuth popup window is opened.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#oAuthSignIn)
+     * 
+     * @default true
+     */
+    oAuthPopupConfirmation?: boolean;
+    /**
+     * Token used for previous unsuccessful attempts to fetch the given URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#oAuthSignIn)
+     */
+    token?: string;
   }
 
-  export interface IdentityManagerBaseRegisterTokenProperties {
+
+  export interface IdentityManagerBaseRegisterTokenProperties extends Object {
+    /**
+     * Token expiration time specified as number of milliseconds since 1 January 1970 00:00:00 UTC.
+     * 
+     * [Read more...](properties.html)
+     */
     expires?: number;
+    /**
+     * For ArcGIS Online or Portal, this is https://www.arcgis.com/sharing/rest or similar to https://www.example.com/portal/sharing/rest. For ArcGIS Server this is similar to https://www.example.com/arcgis/rest/services.
+     * 
+     * [Read more...](properties.html)
+     */
     server: string;
+    /**
+     * Set this to `true` if the user has an ArcGIS Online organizational account and the organization is configured to allow access to resources only through SSL.
+     * 
+     * [Read more...](properties.html)
+     */
     ssl?: boolean;
+    /**
+     * The access token.
+     * 
+     * [Read more...](properties.html)
+     */
     token: string;
+    /**
+     * The id of the user who owns the access token.
+     * 
+     * [Read more...](properties.html)
+     */
     userId?: string;
   }
 
-  export interface IdentityManagerBaseSetProtocolErrorHandlerHandlerFunction {
+
+  export interface IdentityManagerBaseSetProtocolErrorHandlerHandlerFunction extends Object {
+    /**
+     * The secure resource URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setProtocolErrorHandler)
+     */
     resourceUrl: string;
+    /**
+     * ServerInfo object describing the server where the secure resource is hosted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setProtocolErrorHandler)
+     */
     serverInfo: ServerInfo;
   }
 
-  export interface IdentityManagerBaseSetRedirectionHandlerHandlerFunction {
+
+  export interface IdentityManagerBaseSetRedirectionHandlerHandlerFunction extends Object {
+    /**
+     * The URL of the secure resource that triggers the redirection to the ArcGIS.com sign-in page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setRedirectionHandler)
+     */
     resourceUrl: string;
+    /**
+     * The application URL where the sign-in page redirects after a successful login. To create the return URL, append the application's URL to signInPage as a parameter. The *returnUrlParamName* contains the name of the parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setRedirectionHandler)
+     */
     returnUrlParamName: string;
+    /**
+     * The ServerInfo object describing the server where the secure resource is hosted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setRedirectionHandler)
+     */
     serverInfo: ServerInfo;
+    /**
+     * URL of the sign-in page where users will be redirected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#setRedirectionHandler)
+     */
     signInPage: string;
   }
 
-  export interface IdentityManagerBaseSignInOptions {
+
+  export interface IdentityManagerBaseSignInOptions extends Object {
+    /**
+     * Error object returned by the server from a previous attempt to fetch the given URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManagerBase.html#signIn)
+     */
     error: Error;
   }
 
   interface OAuthInfo extends Accessor, JSONSupport {
+    /**
+     * The registered application id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#appId)
+     */
     appId: string;
+    /**
+     * Applications with the same value will share the stored token on the same host.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#authNamespace)
+     * 
+     * @default / (forward slash)
+     */
     authNamespace: string;
+    /**
+     * The number of minutes that the token is valid.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#expiration)
+     * 
+     * @default 20160 (two weeks)
+     */
     expiration: number;
+    /**
+     * The locale for the OAuth sign in page. The default locale is based on your browser/OS and the organization locale. You can use the locale property to change this. The locale needs to follow the language dash country code syntax supported by ArcGIS.com.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#locale)
+     * 
+     * @default Based on your browser/OS and the organization locale.
+     */
     locale: string;
+    /**
+     * The minimum time in minutes before a saved token is due to expire that it should still be considered valid for use.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#minTimeUntilExpiration)
+     * 
+     * @default 30
+     */
     minTimeUntilExpiration: number;
+    /**
+     * Set to `true` to show the OAuth sign in page in a popup window.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#popup)
+     * 
+     * @default false
+     */
     popup: boolean;
+    /**
+     * Applicable if working with the popup user-login workflow. This is a relative page URL that redirects the user back to the secured application after successful login.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#popupCallbackUrl)
+     * 
+     * @default "oauth-callback.html"
+     */
     popupCallbackUrl: string;
+    /**
+     * The window features passed to [window.open()](https://developer.mozilla.org/en-US/docs/Web/API/Window/open).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#popupWindowFeatures)
+     * 
+     * @default height=490,width=800,resizable,scrollbars,status
+     */
     popupWindowFeatures: string;
+    /**
+     * The ArcGIS for Portal URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#portalUrl)
+     * 
+     * @default "https://www.arcgis.com"
+     */
     portalUrl: string;
 
+    /**
+     * Creates a copy of the OAuthInfo object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#clone)
+     * 
+     * 
+     */
     clone(): OAuthInfo;
   }
 
   interface OAuthInfoConstructor {
+
+
     new(properties?: OAuthInfoProperties): OAuthInfo;
 
     fromJSON(json: any): OAuthInfo;
@@ -1159,26 +4764,114 @@ declare namespace __esri {
   export const OAuthInfo: OAuthInfoConstructor;
 
   interface OAuthInfoProperties {
+    /**
+     * The registered application id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#appId)
+     */
     appId?: string;
+    /**
+     * Applications with the same value will share the stored token on the same host.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#authNamespace)
+     * 
+     * @default / (forward slash)
+     */
     authNamespace?: string;
+    /**
+     * The number of minutes that the token is valid.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#expiration)
+     * 
+     * @default 20160 (two weeks)
+     */
     expiration?: number;
+    /**
+     * The locale for the OAuth sign in page. The default locale is based on your browser/OS and the organization locale. You can use the locale property to change this. The locale needs to follow the language dash country code syntax supported by ArcGIS.com.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#locale)
+     * 
+     * @default Based on your browser/OS and the organization locale.
+     */
     locale?: string;
+    /**
+     * The minimum time in minutes before a saved token is due to expire that it should still be considered valid for use.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#minTimeUntilExpiration)
+     * 
+     * @default 30
+     */
     minTimeUntilExpiration?: number;
+    /**
+     * Set to `true` to show the OAuth sign in page in a popup window.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#popup)
+     * 
+     * @default false
+     */
     popup?: boolean;
+    /**
+     * Applicable if working with the popup user-login workflow. This is a relative page URL that redirects the user back to the secured application after successful login.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#popupCallbackUrl)
+     * 
+     * @default "oauth-callback.html"
+     */
     popupCallbackUrl?: string;
+    /**
+     * The window features passed to [window.open()](https://developer.mozilla.org/en-US/docs/Web/API/Window/open).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#popupWindowFeatures)
+     * 
+     * @default height=490,width=800,resizable,scrollbars,status
+     */
     popupWindowFeatures?: string;
+    /**
+     * The ArcGIS for Portal URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-OAuthInfo.html#portalUrl)
+     * 
+     * @default "https://www.arcgis.com"
+     */
     portalUrl?: string;
   }
 
   interface ServerInfo extends Accessor, JSONSupport {
+    /**
+     * The token service URL used to generate tokens for ArcGIS Server Admin resources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#adminTokenServiceUrl)
+     */
     adminTokenServiceUrl: string;
+    /**
+     * Version of the ArcGIS Server deployed on this server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#currentVersion)
+     */
     currentVersion: number;
+    /**
+     * The server URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#server)
+     */
     server: string;
+    /**
+     * Validity of short-lived token in minutes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#shortLivedTokenValidity)
+     */
     shortLivedTokenValidity: number;
+    /**
+     * The token service URL used to generate tokens for the secured resources on the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#tokenServiceUrl)
+     */
     tokenServiceUrl: string;
   }
 
   interface ServerInfoConstructor {
+
+
     new(properties?: ServerInfoProperties): ServerInfo;
 
     fromJSON(json: any): ServerInfo;
@@ -1187,262 +4880,961 @@ declare namespace __esri {
   export const ServerInfo: ServerInfoConstructor;
 
   interface ServerInfoProperties {
+    /**
+     * The token service URL used to generate tokens for ArcGIS Server Admin resources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#adminTokenServiceUrl)
+     */
     adminTokenServiceUrl?: string;
+    /**
+     * Version of the ArcGIS Server deployed on this server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#currentVersion)
+     */
     currentVersion?: number;
+    /**
+     * The server URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#server)
+     */
     server?: string;
+    /**
+     * Validity of short-lived token in minutes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#shortLivedTokenValidity)
+     */
     shortLivedTokenValidity?: number;
+    /**
+     * The token service URL used to generate tokens for the secured resources on the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-ServerInfo.html#tokenServiceUrl)
+     */
     tokenServiceUrl?: string;
   }
 
+
   interface kernel {
-    version: string;
+    /**
+     * Current version of the ArcGIS API for JavaScript. 
+     * ```js
+     * require([
+     *   "esri/kernel"
+     * ], function(esriNS) {
+     *   console.log(esriNS.version);
+     * });
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-kernel.html#version)
+     */
+    readonly version: string;
   }
 
   export const kernel: kernel;
 
-  interface BaseDynamicLayer extends Layer, ScaleRangeLayer {
+  interface BaseDynamicLayer extends Layer, ScaleRangeLayer, RefreshableLayer {
+    /**
+     * Adds a promise to the layer's [loadable](https://developers.arcgis.com/javascript/latest/guide/loadable/index.html) chain. This is typically used in the [load()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#load) method to ensure that all [loadable](https://developers.arcgis.com/javascript/latest/guide/loadable/index.html) resources required for the layer to function are loaded prior to this layer resolving and becoming [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#loaded).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#addResolvingPromise)
+     * 
+     * @param promiseToLoad A promise that must resolve for the layer to resolve and move from the `loading` [status](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#loadStatus) to being [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#loaded).
+     * 
+     */
     addResolvingPromise(promiseToLoad: IPromise<any>): IPromise<any>;
+    /**
+     * This method fetches the image for the specified extent and size. Override this method if the data returned from the server needs to be processed before it can be displayed. For example, if the server returns binary data, override this method to convert the binary data to an image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#fetchImage)
+     * 
+     * @param extent The extent of the view. This value is provided by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param width The width of the view in pixels. This value is provided by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param height The height of the view in pixels. This value is provided by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param options Optional settings for the image request. The options have the following properties.
+     * @param options.allowImageDataAccess Indicates if access to pixels of the image is allowed. This value must be set to `true` if the layer will be drawn in 3D and [WebGL textures](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL) are required to display the layer. Loading of WebGL textures is dependent on [cross-domain access](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL#Cross-domain_textures) controls. This option allows cross-domain access to create WebGL textures.
+     * 
+     */
     fetchImage(extent: Extent, width: number, height: number, options?: BaseDynamicLayerFetchImageOptions): IPromise<HTMLImageElement | HTMLCanvasElement>;
+    /**
+     * This method returns a URL to an image for a given extent, width, and height. Override this method to construct the URL for the image based on user interaction.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#getImageUrl)
+     * 
+     * @param extent Extent of the view. This value is populated by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param width Width of the view in pixels. This value is populated by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param height Height of the view in pixels. This value is populated by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * 
+     */
     getImageUrl(extent: Extent, width: number, height: number): IPromise<string> | string;
 
+
     on(name: "layerview-create", eventHandler: BaseDynamicLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: BaseDynamicLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: BaseDynamicLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: BaseDynamicLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface BaseDynamicLayerConstructor {
+    /**
+     * This class may be extended to create dynamic map layers. Dynamic layers display an image dynamically generated on the server based on a request, including the extent and size of the image. The exported image covers the entire view extent. Each interaction on the view (e.g. panning, zooming) will result in an export of a new image on the server. Each export is unique so it cannot be cached in the browser.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html)
+     */
+
     new(properties?: BaseDynamicLayerProperties): BaseDynamicLayer;
   }
 
   export const BaseDynamicLayer: BaseDynamicLayerConstructor;
 
-  interface BaseDynamicLayerProperties extends LayerProperties, ScaleRangeLayerProperties {
+  interface BaseDynamicLayerProperties extends LayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
 
   }
 
-  export interface BaseDynamicLayerFetchImageOptions {
+
+  export interface BaseDynamicLayerFetchImageOptions extends Object {
+    /**
+     * Indicates if access to pixels of the image is allowed. This value must be set to `true` if the layer will be drawn in 3D and [WebGL textures](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL) are required to display the layer. Loading of WebGL textures is dependent on [cross-domain access](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL#Cross-domain_textures) controls. This option allows cross-domain access to create WebGL textures.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseDynamicLayer.html#fetchImage)
+     */
     allowImageDataAccess?: boolean;
   }
 
   export interface BaseDynamicLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface BaseDynamicLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface BaseElevationLayer extends Layer {
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#spatialReference)
+     * 
+     * @default {@link module:esri/geometry/SpatialReference#WebMercator SpatialReference.WebMercator}
+     */
     spatialReference: SpatialReference;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#tileInfo)
+     */
     tileInfo: TileInfo;
 
+    /**
+     * Adds a promise to the layer's [loadable](https://developers.arcgis.com/javascript/latest/guide/loadable/index.html) chain. This is typically used in the [load()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#load) method to ensure that all [loadable](https://developers.arcgis.com/javascript/latest/guide/loadable/index.html) resources required for the layer to function are loaded prior to this layer resolving and becoming [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#loaded).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#addResolvingPromise)
+     * 
+     * @param promiseToLoad A promise that must resolve for the layer to resolve and move from the `loading` [status](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#loadStatus) to being [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#loaded).
+     * 
+     */
     addResolvingPromise(promiseToLoad: IPromise<any>): IPromise<any>;
+    /**
+     * Fetches a tile at the given level, row, and column present in the view. This method must be overwritten to display custom elevation values in the [Map.ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#ground). Note that this method must return a promise that resolves to an object with the properties defined in [ElevationTileData](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#ElevationTileData).  See the following samples for examples of how to overwrite this method: 
+     *   * [Sample - Custom ElevationLayer: Exaggerating elevation](https://developers.arcgis.com/javascript/latest/sample-code/layers-custom-elevation-exaggerated/index.html)
+     *   * [Sample - Custom ElevationLayer: Thematic data as elevation](https://developers.arcgis.com/javascript/latest/sample-code/layers-custom-elevation-thematic/index.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#fetchTile)
+     * 
+     * @param level The level of detail of the tile to fetch.
+     * @param row The row (y) position of the tile to fetch.
+     * @param column The column (x) position of the tile to fetch.
+     * @param options Optional settings for the tile request.
+     * @param options.noDataValue The value representing pixels in the tile that don't contain an elevation value.
+     * 
+     */
     fetchTile(level: number, row: number, column: number, options?: BaseElevationLayerFetchTileOptions): IPromise<ElevationTileData>;
+    /**
+     * Returns the bounds of the tile as an array of four numbers that can be readily converted to an [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) object. See the table in the `returns` section below for more details about the values returned by this method.  This function can be used inside [fetchTile()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#fetchTile) so you can get the bounds of the current tile, convert it to an extent object, and request the desired data for the given extent. See the [Custom ElevationLayer: Thematic data as elevation](https://developers.arcgis.com/javascript/latest/sample-code/layers-custom-elevation-thematic/index.html) sample for an example of how this method works.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#getTileBounds)
+     * 
+     * @param level The level of detail (LOD) of the tile.
+     * @param row The tile's row (y) position in the dataset.
+     * @param column The tiles column (x) position in the dataset.
+     * @param out Array for storing the tile bounds or extent.
+     * 
+     */
     getTileBounds(level: number, row: number, column: number, out?: number[]): number[];
 
+
     on(name: "layerview-create", eventHandler: BaseElevationLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: BaseElevationLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: BaseElevationLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: BaseElevationLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface BaseElevationLayerConstructor {
+    /**
+     * BaseElevationLayer is intended to be extended for creating custom elevation layers. You create a custom [ElevationLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html) by calling [createSubclass()](https://dojotoolkit.org/reference-guide/1.10/dojo/_base/declare.html#createsubclass) on the `BaseElevationLayer`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html)
+     */
+
     new(properties?: BaseElevationLayerProperties): BaseElevationLayer;
   }
 
   export const BaseElevationLayer: BaseElevationLayerConstructor;
 
   interface BaseElevationLayerProperties extends LayerProperties {
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#spatialReference)
+     * 
+     * @default {@link module:esri/geometry/SpatialReference#WebMercator SpatialReference.WebMercator}
+     */
     spatialReference?: SpatialReferenceProperties;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#tileInfo)
+     */
     tileInfo?: TileInfoProperties;
   }
 
-  export interface BaseElevationLayerFetchTileOptions {
+
+  export interface BaseElevationLayerFetchTileOptions extends Object {
+    /**
+     * The value representing pixels in the tile that don't contain an elevation value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#fetchTile)
+     */
     noDataValue?: number;
   }
 
-  export interface ElevationTileData {
+  /**
+   * Describes elevation contained in the pixels that comprise an elevation tile.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#ElevationTileData)
+   */
+  export interface ElevationTileData extends Object {
+    /**
+     * The elevation values of each pixel in the tile.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#ElevationTileData)
+     */
     values: number[];
+    /**
+     * The width of the tile in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#ElevationTileData)
+     */
     width: number;
+    /**
+     * The height of the tile in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#ElevationTileData)
+     */
     height: number;
+    /**
+     * The maximum allowed error of the Z-value for each value in meters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#ElevationTileData)
+     */
     maxZError: number;
+    /**
+     * Indicating the pixel values where no elevation data is present.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseElevationLayer.html#ElevationTileData)
+     */
     noDataValue: number;
   }
 
   export interface BaseElevationLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface BaseElevationLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  interface BaseTileLayer extends Layer, ScaleRangeLayer {
+  interface BaseTileLayer extends Layer, ScaleRangeLayer, RefreshableLayer {
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#spatialReference)
+     * 
+     * @default {@link module:esri/geometry/SpatialReference#WebMercator SpatialReference.WebMercator}
+     */
     spatialReference: SpatialReference;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#tileInfo)
+     */
     tileInfo: TileInfo;
 
+    /**
+     * Adds a promise to the layer's [loadable](https://developers.arcgis.com/javascript/latest/guide/loadable/index.html) chain. This is typically used in the [load()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#load) method to ensure that all [loadable](https://developers.arcgis.com/javascript/latest/guide/loadable/index.html) resources required for the layer to function are loaded prior to this layer resolving and becoming [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#loaded).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#addResolvingPromise)
+     * 
+     * @param promiseToLoad A promise that must resolve for the layer to resolve and move from the `loading` [status](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#loadStatus) to being [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#loaded).
+     * 
+     */
     addResolvingPromise(promiseToLoad: IPromise<any>): IPromise<any>;
+    /**
+     * This method fetches a tile for the given level, row and column present in the view. Override this method if the data or image returned from the server needs to be processed before it can be displayed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#fetchTile)
+     * 
+     * @param level Level of detail of the tile to fetch. This value is provided by [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param row The row (y) position of the tile fetch. This value is provided by [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param column The column (x) position of the tile to fetch. This value is provided by [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param options Optional settings for the tile request. The options have the following properties.
+     * @param options.allowImageDataAccess Indicates if access to pixels of the image is allowed. This value must be set to `true` if the layer will be drawn in 3D and [WebGL textures](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL) are required to display the layer. Loading of WebGL textures is dependent on [cross-domain access](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL#Cross-domain_textures) controls. This option allows cross-domain access to create WebGL textures.
+     * 
+     */
     fetchTile(level: number, row: number, column: number, options?: BaseTileLayerFetchTileOptions): IPromise<HTMLImageElement | HTMLCanvasElement>;
+    /**
+     * Returns the bounds of the tile as an array of four numbers that be readily converted to an [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) object. The value for each item in the array is described in the following table: 
+     * 
+     * Index | Value
+     * ------|------
+     * 0 | Minimum x-value
+     * 1 | Minimum y-value
+     * 2 | Maximum x-value
+     * 3 | Maximum y-value
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#getTileBounds)
+     * 
+     * @param level The level of detail (LOD) of the tile.
+     * @param row The tile's row (y) position in the dataset.
+     * @param column The tiles column (x) position in the dataset.
+     * @param out Array for storing the tile bounds or extent.
+     * 
+     */
     getTileBounds(level: number, row: number, column: number, out?: number[]): number[];
+    /**
+     * This method returns a URL to an image for a given level, row and column. Override this method to construct the URL for the image based on user interaction.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#getTileUrl)
+     * 
+     * @param level Level of detail. This value is provided by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param row Tile row. This value is provided by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param column Tile column. This value is provided by the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * 
+     */
     getTileUrl(level: number, row: number, column: number): string | IPromise<any>;
 
+
     on(name: "layerview-create", eventHandler: BaseTileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: BaseTileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: BaseTileLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: BaseTileLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface BaseTileLayerConstructor {
+    /**
+     * This class may be extended to create a custom [TileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html). Tile layers are composed of images, such as satellite imagery, that are composed of square tiles mosaicked together in columns and rows, giving the layer the appearance that it is one continuous image. These layers have several levels of detail (LOD) that permit users to zoom in to any region of the map and load additional tiles that depict features in higher resolution at larger map scales.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html)
+     */
+
     new(properties?: BaseTileLayerProperties): BaseTileLayer;
   }
 
   export const BaseTileLayer: BaseTileLayerConstructor;
 
-  interface BaseTileLayerProperties extends LayerProperties, ScaleRangeLayerProperties {
+  interface BaseTileLayerProperties extends LayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#spatialReference)
+     * 
+     * @default {@link module:esri/geometry/SpatialReference#WebMercator SpatialReference.WebMercator}
+     */
     spatialReference?: SpatialReferenceProperties;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#tileInfo)
+     */
     tileInfo?: TileInfoProperties;
   }
 
-  export interface BaseTileLayerFetchTileOptions {
+
+  export interface BaseTileLayerFetchTileOptions extends Object {
+    /**
+     * Indicates if access to pixels of the image is allowed. This value must be set to `true` if the layer will be drawn in 3D and [WebGL textures](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL) are required to display the layer. Loading of WebGL textures is dependent on [cross-domain access](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL#Cross-domain_textures) controls. This option allows cross-domain access to create WebGL textures.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BaseTileLayer.html#fetchTile)
+     */
     allowImageDataAccess?: boolean;
   }
 
   export interface BaseTileLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface BaseTileLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface CSVLayer extends Layer {
+    /**
+     * Copyright information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#copyright)
+     */
     copyright: string;
+    /**
+     * The column delimiter. See the table below for possible values. 
+     * 
+     * | Value  | Description|
+     * | --- | --- |
+     * | `,`    | comma |
+     * | ` `    | space |
+     * | `;`    | semicolon |
+     * | `|`    | pipe |
+     * | `\t`     | tab-delimited |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#delimiter)
+     */
     delimiter: string;
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). This property may only be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#elevationInfo)
+     */
     elevationInfo: CSVLayerElevationInfo;
+    /**
+     * Configures the method for decluttering overlapping features in the view. If this property is not set (or set to `null`), every feature is drawn individually.  Currently this property is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) for point features with non-draped [Icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html) or [Text](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html) symbol layers.  ![declutter](https://developers.arcgis.com/javascript/latest/assets/img/samples/city-points-declutter.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#featureReduction)
+     */
     featureReduction: CSVLayerFeatureReduction;
+    /**
+     * An array of fields in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#fields)
+     */
     fields: Field[];
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html). Use this property to specify labeling properties for the layer.  For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelsVisible) property of this layer must be set to `true`. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  Each graphic can have only one label. Multiple [Label classes](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) with different [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where) clauses can be used to have different label styles on different features that belong to the same layer (for example blue labels for lakes and green labels for parks).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelingInfo)
+     */
     labelingInfo: LabelClass[];
+    /**
+     * Indicates whether to display labels for this layer. If `true`, labels will appear as defined in the [labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelingInfo) property. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible: boolean;
+    /**
+     * The latitude field name. If not specified, the API will look for following field names in the CSV source: "lat", "latitude", "y", "ycenter", "latitude83", "latdecdeg", "POINT-Y".
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#latitudeField)
+     */
     latitudeField: string;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * The longitude field name. If not specified, the API will look for following field names in the CSV source: "lon", "lng", "long", "longitude", "x", "xcenter", "longitude83", "longdecdeg", "POINT-X".
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#longitudeField)
+     */
     longitudeField: string;
+    /**
+     * The maximum scale at which the layer is visible in the view. If the map is zoomed in beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#maxScale)
+     * 
+     * @default 0
+     */
     maxScale: number;
+    /**
+     * The minimum scale at which the layer is visible in the view. If the map is zoomed out beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a minimum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#minScale)
+     * 
+     * @default 0
+     */
     minScale: number;
+    /**
+     * An array of field names to include in the CSVLayer. If not specified, the layer will include all fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#outFields)
+     */
     outFields: string[];
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled: boolean;
+    /**
+     * The popup template for the layer. When set on the layer, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a feature is selected using text and/or charts. See the [PopupTemplate sample](https://developers.arcgis.com/javascript/latest/sample-code/intro-popuptemplate/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each feature in the layer. Depending on the renderer type, features may be visualized with the same symbol, or with varying symbols based on the values of provided attribute fields or functions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#renderer)
+     */
     renderer: Renderer;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective. As screen size perspective changes the size based on distance to the camera, it should be set to false when using {@link module:esri/renderers/Renderer#SizeVisualVariable size visual variables}.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled: boolean;
+    /**
+     * The URL of the CSV file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#url)
+     */
     url: string;
 
+
     on(name: "layerview-create", eventHandler: CSVLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: CSVLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: CSVLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: CSVLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface CSVLayerConstructor {
+    /**
+     * The CSVLayer is a point layer based on a CSV file (.csv, .txt). CSV is a plain-text file format used to represent tabular data, including geographic point features (latitude, longitude). Typically the latitude coordinate is the Y value, and the longitude coordinate is the X value. Features from the CSV file are accessible via the API so you can query features and use them as input to geometry or geoprocessing services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html)
+     */
+
     new(properties?: CSVLayerProperties): CSVLayer;
   }
 
   export const CSVLayer: CSVLayerConstructor;
 
   interface CSVLayerProperties extends LayerProperties {
+    /**
+     * Copyright information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#copyright)
+     */
     copyright?: string;
+    /**
+     * The column delimiter. See the table below for possible values. 
+     * 
+     * | Value  | Description|
+     * | --- | --- |
+     * | `,`    | comma |
+     * | ` `    | space |
+     * | `;`    | semicolon |
+     * | `|`    | pipe |
+     * | `\t`     | tab-delimited |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#delimiter)
+     */
     delimiter?: string;
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). This property may only be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#elevationInfo)
+     */
     elevationInfo?: CSVLayerElevationInfo;
+    /**
+     * Configures the method for decluttering overlapping features in the view. If this property is not set (or set to `null`), every feature is drawn individually.  Currently this property is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) for point features with non-draped [Icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html) or [Text](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html) symbol layers.  ![declutter](https://developers.arcgis.com/javascript/latest/assets/img/samples/city-points-declutter.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#featureReduction)
+     */
     featureReduction?: CSVLayerFeatureReduction;
+    /**
+     * An array of fields in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#fields)
+     */
     fields?: FieldProperties[];
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html). Use this property to specify labeling properties for the layer.  For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelsVisible) property of this layer must be set to `true`. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  Each graphic can have only one label. Multiple [Label classes](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) with different [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where) clauses can be used to have different label styles on different features that belong to the same layer (for example blue labels for lakes and green labels for parks).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelingInfo)
+     */
     labelingInfo?: LabelClassProperties[];
+    /**
+     * Indicates whether to display labels for this layer. If `true`, labels will appear as defined in the [labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelingInfo) property. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible?: boolean;
+    /**
+     * The latitude field name. If not specified, the API will look for following field names in the CSV source: "lat", "latitude", "y", "ycenter", "latitude83", "latdecdeg", "POINT-Y".
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#latitudeField)
+     */
     latitudeField?: string;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled?: boolean;
+    /**
+     * The longitude field name. If not specified, the API will look for following field names in the CSV source: "lon", "lng", "long", "longitude", "x", "xcenter", "longitude83", "longdecdeg", "POINT-X".
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#longitudeField)
+     */
     longitudeField?: string;
+    /**
+     * The maximum scale at which the layer is visible in the view. If the map is zoomed in beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#maxScale)
+     * 
+     * @default 0
+     */
     maxScale?: number;
+    /**
+     * The minimum scale at which the layer is visible in the view. If the map is zoomed out beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a minimum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#minScale)
+     * 
+     * @default 0
+     */
     minScale?: number;
+    /**
+     * An array of field names to include in the CSVLayer. If not specified, the layer will include all fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#outFields)
+     */
     outFields?: string[];
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled?: boolean;
+    /**
+     * The popup template for the layer. When set on the layer, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a feature is selected using text and/or charts. See the [PopupTemplate sample](https://developers.arcgis.com/javascript/latest/sample-code/intro-popuptemplate/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each feature in the layer. Depending on the renderer type, features may be visualized with the same symbol, or with varying symbols based on the values of provided attribute fields or functions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#renderer)
+     */
     renderer?: RendererProperties;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective. As screen size perspective changes the size based on distance to the camera, it should be set to false when using {@link module:esri/renderers/Renderer#SizeVisualVariable size visual variables}.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled?: boolean;
+    /**
+     * The URL of the CSV file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#url)
+     */
     url?: string;
   }
 
-  export interface CSVLayerElevationInfo {
+
+  export interface CSVLayerElevationInfo extends Object {
+    /**
+     * Defines how the graphic is placed with respect to the terrain surface. See the table below for a list of possible values. 
+     * 
+     * Mode | Description
+     * ------|------------
+     * on-the-ground | Graphics are draped on the terrain surface. This is the default value for [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html)
+     * geometries rendered with [ObjectSymbol3DLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html).
+     * relative-to-ground | Graphics are placed at an elevation relative to the terrain surface. The graphic's elevation is determined
+     * by summing up the terrain elevation and the result of `featureExpressionInfo` (if defined). This is the default value for [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries rendered with [IconSymbol3DLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html). absolute-height | Graphics are placed at an absolute height above sea level. This height is determined by the result of `featureExpressionInfo` (if defined). This mode doesn't take the elevation of the terrain into account. relative-to-scene | Graphics are aligned to buildings and other objects part of 3D Object [SceneLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) or [IntegratedMeshLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html), depending on which has higher elevation. If the graphic is not directly above a building or any other feature, it is aligned to the terrain surface elevation. If defined, the result of `featureExpressionInfo` is added to the 3D Object/terrain surface elevation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#elevationInfo)
+     */
     mode: string;
+    /**
+     * An elevation offset, which is added to the vertical position of the graphic. If `unit` is not defined, the offset is in `meters`. When `mode = "on-the-ground"`, this property has no effect.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#elevationInfo)
+     */
     offset?: number;
+    /**
+     * This object contains information about setting a custom height on the graphic. If this property is set, then z values are not considered for calculating graphic height.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#elevationInfo)
+     */
     featureExpressionInfo?: CSVLayerElevationInfoFeatureExpressionInfo;
+    /**
+     * The unit for `featureExpressionInfo` and `offset` values.  **Possible Values:** feet | meters | kilometers | miles | us-feet | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#elevationInfo)
+     */
     unit?: string;
   }
 
-  export interface CSVLayerElevationInfoFeatureExpressionInfo {
+
+  export interface CSVLayerElevationInfoFeatureExpressionInfo extends Object {
+    /**
+     * An [Arcade expression](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) evaluating to a number that determines the height of the graphic. When `mode = "on-the-ground"`, this property has no effect. For line and polygon geometries the result of the expression is the same for all vertices of a feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#elevationInfo)
+     */
     expression?: string;
   }
 
-  export interface CSVLayerFeatureReduction {
+
+  export interface CSVLayerFeatureReduction extends Object {
+    /**
+     * Type of the decluttering method. The only supported type at the moment is `"selection"`. In this method, some of the overlapping features are hidden such that none of the remaining features intersect on screen. Label deconfliction also respects this option and hides labels that would overlap with the features of this layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#featureReduction)
+     */
     type: string;
   }
 
   export interface CSVLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface CSVLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface DynamicLayer {
+    /**
+     * The portal item from which the layer is loaded. This will load the layer along with any overridden properties (e.g. renderers, definition expressions, etc.) saved to the portal item, not the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#portalItem)
+     */
     portalItem: PortalItem;
+    /**
+     * The URL to the REST endpoint of the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#url)
+     */
     url: string;
 
+    /**
+     * This method fetches the image for the specified extent and size.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#fetchImage)
+     * 
+     * @param extent The extent of the view.
+     * @param width The width of the view in pixels.
+     * @param height The height of the view in pixels.
+     * @param options The parameter options is an object with the following properties.
+     * @param options.allowImageDataAccess Indicates if the access to the pixels of the image is required.
+     * @param options.rotation The rotation in degrees of the exported image. Available since ArcGIS for Server 10.3.
+     * @param options.pixelRatio The ratio of the resolution in physical pixels of the image to the resolution it will be displayed at.
+     * 
+     */
     fetchImage(extent: Extent, width: number, height: number, options?: DynamicLayerFetchImageOptions): IPromise<HTMLImageElement | HTMLCanvasElement>;
+    /**
+     * This method returns a URL to an image for a given extent, width and height.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#getImageUrl)
+     * 
+     * @param extent The extent of the exported image.
+     * @param width The width of the view in pixels.
+     * @param height The height of the view in pixels.
+     * @param options The parameter options is an object with the following properties.
+     * @param options.pixelRatio The ratio of the resolution in physical pixels of the image to the resolution it will be displayed at.
+     * @param options.rotation The rotation in degrees of the exported image. Available since ArcGIS for Server 10.3.
+     * 
+     */
     getImageUrl(extent: Extent, width: number, height: number, options?: DynamicLayerGetImageUrlOptions): IPromise<string> | string;
   }
 
   interface DynamicLayerConstructor {
+
+
     new(): DynamicLayer;
   }
 
   export const DynamicLayer: DynamicLayerConstructor;
 
   interface DynamicLayerProperties {
+    /**
+     * The portal item from which the layer is loaded. This will load the layer along with any overridden properties (e.g. renderers, definition expressions, etc.) saved to the portal item, not the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#portalItem)
+     */
     portalItem?: PortalItemProperties;
+    /**
+     * The URL to the REST endpoint of the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#url)
+     */
     url?: string;
   }
 
-  export interface DynamicLayerFetchImageOptions {
+
+  export interface DynamicLayerFetchImageOptions extends Object {
+    /**
+     * Indicates if the access to the pixels of the image is required.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#fetchImage)
+     */
     allowImageDataAccess?: boolean;
+    /**
+     * The rotation in degrees of the exported image. Available since ArcGIS for Server 10.3.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#fetchImage)
+     */
     rotation?: number;
+    /**
+     * The ratio of the resolution in physical pixels of the image to the resolution it will be displayed at.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#fetchImage)
+     */
     pixelRatio?: number;
   }
 
-  export interface DynamicLayerGetImageUrlOptions {
+
+  export interface DynamicLayerGetImageUrlOptions extends Object {
+    /**
+     * The ratio of the resolution in physical pixels of the image to the resolution it will be displayed at.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#getImageUrl)
+     */
     pixelRatio?: number;
+    /**
+     * The rotation in degrees of the exported image. Available since ArcGIS for Server 10.3.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-DynamicLayer.html#getImageUrl)
+     */
     rotation?: number;
   }
 
   interface ElevationLayer extends Layer, ArcGISMapService, ArcGISCachedService, PortalLayer, TiledLayer {
+    /**
+     * URL pointing to the Elevation layer resource on an ArcGIS Image Server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#url)
+     */
     url: string;
 
+    /**
+     * Requests a tile from the service and decodes the data into a linear array of elevation values.  The returned promise resolves with a plain object describing the obtained elevation data for the tile. The object has the following properties: 
+     * 
+     * Property  | Type         | Description
+     * ----------|--------------|------------
+     * values    | Float32Array | The elevation values contained in the tile.
+     * width     | number       | The number of elevation values in one row of the tile.
+     * height    | number       | The number of elevation values in one column of the tile.
+     * maxZError | number       | The upper bound for the compression error on the elevation values.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#fetchTile)
+     * 
+     * @param level the tile level.
+     * @param row the tile row.
+     * @param column the tile column.
+     * @param noDataValue the value to use when a tile is partially missing data.
+     * 
+     */
     fetchTile(level: number, row: number, column: number, noDataValue?: number): IPromise<ElevationTileData>;
+    /**
+     * Queries the service layer for elevation values for the given geometry. The returned result contains a copy of the geometry with z-values sampled from elevation data from the service. The resolution from which the elevation is queried can be set using the `demResolution` option. In many cases, `auto` demResolution can be used to get high quality elevation samples without the need to know exactly where the data in the service is located. This is particularly useful for services which combine elevation data from many sources (such as the world elevation service). If more control, or higher quality samples are required, use either `finest-contiguous` or a fixed `{number}` resolution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#queryElevation)
+     * 
+     * @param geometry The geometry to use for sampling elevation data.
+     * @param options Additional query options. See the table below.
+     * @param options.demResolution 
+     * Controls the horizontal resolution (cell size) in meters from which elevation data is sampled (defaults to `auto`). See the table below for more details on the different settings. 
+     * 
+     * demResolution          | Description
+     * -----------------------|-------------
+     * `auto`                 | Automatically chooses an appropriate resolution for each coordinate of the input geometry. The current implementation will try to use the finest available resolution given that the total required number of tile requests does not exceed a certain maximum amount (currently 100). Note that this may result in values being sampled from different resolutions.
+     * `finest-contiguous`    | Sample elevation from the finest available resolution (cell size) across the entire geometry.
+     * `{number}`             | Sample elevation from the resolution closest to the specified resolution (in meters).
+     * @param options.returnSampleInfo Indicates whether to return additional sample information for each coordinate.
+     * @param options.noDataValue The value to use when there is no data available.
+     * 
+     */
     queryElevation(geometry: Point | Multipoint | Polyline, options?: ElevationLayerQueryElevationOptions): IPromise<ElevationLayerElevationQueryResult>;
 
+
     on(name: "layerview-create", eventHandler: ElevationLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: ElevationLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: ElevationLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: ElevationLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface ElevationLayerConstructor {
+    /**
+     * ElevationLayer is a tile layer used for rendering elevations in [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). A default [world elevation layer](http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer) can be added to the map by setting the [map's ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#ground) property to `world-elevation`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html)
+     */
+
     new(properties?: ElevationLayerProperties): ElevationLayer;
 
     fromJSON(json: any): ElevationLayer;
@@ -1451,84 +5843,409 @@ declare namespace __esri {
   export const ElevationLayer: ElevationLayerConstructor;
 
   interface ElevationLayerProperties extends LayerProperties, ArcGISMapServiceProperties, ArcGISCachedServiceProperties, PortalLayerProperties, TiledLayerProperties {
+    /**
+     * URL pointing to the Elevation layer resource on an ArcGIS Image Server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#url)
+     */
     url?: string;
   }
 
-  export interface ElevationLayerQueryElevationOptions {
+
+  export interface ElevationLayerQueryElevationOptions extends Object {
+    /**
+     * Controls the horizontal resolution (cell size) in meters from which elevation data is sampled (defaults to `auto`). See the table below for more details on the different settings. 
+     * 
+     * demResolution          | Description
+     * -----------------------|-------------
+     * `auto`                 | Automatically chooses an appropriate resolution for each coordinate of the input geometry. The current implementation will try to use the finest available resolution given that the total required number of tile requests does not exceed a certain maximum amount (currently 100). Note that this may result in values being sampled from different resolutions.
+     * `finest-contiguous`    | Sample elevation from the finest available resolution (cell size) across the entire geometry.
+     * `{number}`             | Sample elevation from the resolution closest to the specified resolution (in meters).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#queryElevation)
+     * 
+     * @default auto
+     */
     demResolution?: number | string;
+    /**
+     * Indicates whether to return additional sample information for each coordinate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#queryElevation)
+     * 
+     * @default false
+     */
     returnSampleInfo?: boolean;
+    /**
+     * The value to use when there is no data available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#queryElevation)
+     * 
+     * @default 0
+     */
     noDataValue?: number;
   }
 
-  export interface ElevationLayerElevationQueryResult {
+  /**
+   * Object returned when [queryElevation()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#queryElevation) promise resolves:
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#ElevationQueryResult)
+   */
+  export interface ElevationLayerElevationQueryResult extends Object {
+    /**
+     * The geometry with sampled z-values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#ElevationQueryResult)
+     */
     geometry: Point | Multipoint | Polyline;
-    sampleInfo: ElevationLayerElevationQueryResultSampleInfo[];
+    /**
+     * Contains additional information about how the geometry was sampled. This property is present depending on whether the user set `options.returnSampleInfo = true`, for each coordinate in the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#ElevationQueryResult)
+     */
+    sampleInfo?: ElevationLayerElevationQueryResultSampleInfo[];
+    /**
+     * The value used when there is no data available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#ElevationQueryResult)
+     */
     noDataValue: number;
   }
 
   export interface ElevationLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface ElevationLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface ElevationLayerElevationQueryResultSampleInfo {
+
+  export interface ElevationLayerElevationQueryResultSampleInfo extends Object {
+    /**
+     * The resolution at which the z-value was sampled. If no data was available for sampling for a given coordinate, the dem resolution value will be -1 for that coordinate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html#ElevationQueryResult)
+     */
     demResolution: number;
   }
 
-  interface FeatureLayer extends Layer, PortalLayer, ScaleRangeLayer {
-    capabilities: FeatureLayerCapabilities;
+  interface FeatureLayer extends Layer, PortalLayer, ScaleRangeLayer, RefreshableLayer {
+    /**
+     * Indicates the layer's supported capabilities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
+    readonly capabilities: FeatureLayerCapabilities;
+    /**
+     * The copyright text as defined by the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#copyright)
+     */
     copyright: string;
+    /**
+     * The SQL where clause used to filter features on the client. Only the features that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). Setting a definition expression is useful when the dataset is large and you don't want to bring all features to the client for analysis. Definition expressions may be set when a layer is constructed prior to it loading in the view or after it has been added to the map. If the definition expression is set after the layer has been added to the map, the view will automatically refresh itself to display the features that satisfy the new definition expression. 
+     * > **Known Limitations**  Definition expressions will not be honored when working with FeatureLayers created from client-side graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#definitionExpression)
+     */
     definitionExpression: string;
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#displayField)
+     */
     displayField: string;
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). This property may only be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo)
+     */
     elevationInfo: FeatureLayerElevationInfo;
+    /**
+     * Configures the method for decluttering overlapping features in the view. If this property is not set (or set to `null`), every feature is drawn individually.  Currently this property is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) for point features with non-draped [Icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html) or [Text](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html) symbol layers.  ![declutter](https://developers.arcgis.com/javascript/latest/assets/img/samples/city-points-declutter.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#featureReduction)
+     */
     featureReduction: FeatureLayerFeatureReduction;
+    /**
+     * An array of fields in the layer. Each field represents an attribute that may contain a value for each feature in the layer. For example, a field named `POP_2015`, stores information about total population as a numeric value for each feature; this value represents the total number of people living within the geographic bounds of the feature.  This property must be set in the constructor when creating a FeatureLayer from client-side [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). To create FeatureLayers from client-side graphics you must also set the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields)
+     */
     fields: Field[];
-    gdbVersion: string;
+    /**
+     * The version of the geodatabase of the feature service data. Read the [Overview of versioning](https://desktop.arcgis.com/en/arcmap/latest/manage-data/geodatabases/an-overview-of-versioning.htm) topic for more details about this capability.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#gdbVersion)
+     */
+    readonly gdbVersion: string;
+    /**
+     * The geometry type of features in the layer. All features must be of the same type. This property is read-only when the layer is created from a [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url).  However, when creating a FeatureLayer from client-side graphics, this property must be specified in the layer's constructor along with the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), and [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField) properties.  **Possible Values:** point | mulitpoint | polyline | polygon | extent
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType)
+     */
     geometryType: string;
-    hasAttachments: boolean;
-    hasM: boolean;
-    hasZ: boolean;
+    /**
+     * Value is `true` if attachments are enabled on the feature layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#hasAttachments)
+     * 
+     * @default false
+     */
+    readonly hasAttachments: boolean;
+    /**
+     * Indicates if the features in the layer have M values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#hasM)
+     * 
+     * @default false
+     */
+    readonly hasM: boolean;
+    /**
+     * Indicates if the features in the layer have Z values. See [elevationInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo) for details regarding placement and rendering of graphics with z-values in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#hasZ)
+     * 
+     * @default false
+     */
+    readonly hasZ: boolean;
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html). Use this property to specify labeling properties for the layer such as label expression, placement, and size.   For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible) property of this layer must be set to `true`. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  Each graphic can have only one label. Multiple [Label classes](esri-layers-support-LabelClass.html) with different [where](esri-layers-support-LabelClass.html#where) clauses can be used to have different label styles on different features that belong to the same layer (for example blue labels for lakes and green labels for parks).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelingInfo)
+     */
     labelingInfo: LabelClass[];
+    /**
+     * Indicates whether to display labels for this layer. If `true`, labels will appear as defined in the [labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelingInfo) property. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible: boolean;
+    /**
+     * The layer ID, or layer index, of a Feature Service layer. This is particularly useful when loading a single FeatureLayer with the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#portalItem) property from a service containing multiple layers. You can specify this value in one of two scenarios: 
+     *   * When loading the layer via the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#portalItem) property.
+     *   * When pointing the layer [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url) directly to the Feature Service.
+     *   
+     *   
+     * If a layerId is not specified in either of the above scenarios, then the first layer in the service (`layerId = 0`) is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#layerId)
+     */
     layerId: number;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * The name of one of the provided [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields) for each graphic containing a unique value or identifier for that graphic. This is required when constructing a FeatureLayer from a collection of client-side [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html).  When creating a FeatureLayer from client-side graphics, the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties must also be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField)
+     */
     objectIdField: string;
+    /**
+     * An array of field names from the service to include in the FeatureLayer. If not specified, the layer will only return the `OBJECTID` field. To fetch the values from all fields in the layer, use `["*"]`. This is particularly useful when editing features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#outFields)
+     */
     outFields: string[];
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled: boolean;
+    /**
+     * The popup template for the layer. When set on the layer, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a feature is selected using text and/or charts. See the [PopupTemplate sample](https://developers.arcgis.com/javascript/latest/sample-code/intro-popuptemplate/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each feature in the layer. Depending on the renderer type, features may be visualized with the same symbol, or with varying symbols based on the values of provided attribute fields or functions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer)
+     */
     renderer: Renderer;
+    /**
+     * When `true`, indicates that M values will be returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnM)
+     * 
+     * @default false
+     */
     returnM: boolean;
+    /**
+     * When `true`, indicates that Z values will be returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnZ)
+     * 
+     * @default false
+     */
     returnZ: boolean;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective. As screen size perspective changes the size based on distance to the camera, it should be set to false when using {@link module:esri/renderers/Renderer#SizeVisualVariable size visual variables}.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled: boolean;
+    /**
+     * A collection of [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) objects used to create a FeatureLayer. This property should only used when creating a FeatureLayer from client-side graphics. When creating a FeatureLayer from client-side graphics, the [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties must also be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source)
+     */
     source: Collection<Graphic>;
+    /**
+     * The spatial reference of the layer. When creating the layer from a [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url), the spatial reference is read from the service.  This property should be set explicitly when creating a FeatureLayer from client-side graphics. When creating a FeatureLayer from client-side graphics, the [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties must also be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference)
+     */
     spatialReference: SpatialReference;
+    /**
+     * An array of feature templates defined in the feature layer. See [ArcGIS Pro subtypes document](https://pro.arcgis.com/en/pro-app/help/data/geodatabases/overview/an-overview-of-subtypes.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#templates)
+     */
     templates: FeatureTemplate[];
-    token: string;
+    /**
+     * Token generated by the token service using the specified userId and password. The recommended approach to pass a token on a layer is to use [IdentityManager.registerToken()](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#registerToken).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#token)
+     */
+    readonly token: string;
+    /**
+     * The name of the field holding the type ID or subtypes for the features. See [ArcGIS Pro subtypes document](https://pro.arcgis.com/en/pro-app/help/data/geodatabases/overview/an-overview-of-subtypes.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#typeIdField)
+     */
     typeIdField: string;
+    /**
+     * An array of subtypes defined in the feature service exposed by ArcGIS REST API. Each item includes information about the type, such as the type ID, name, and definition expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#types)
+     */
     types: FeatureType[];
+    /**
+     * The URL of the REST endpoint of the layer or service. The URL may either point to a resource on ArcGIS for Server, Portal for ArcGIS, or ArcGIS Online.  If the url points directly to a service, then the layer must be specified in the [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#layerId) property. If no [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#layerId) is given, then the first layer in the service will be loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url)
+     */
     url: string;
-    version: number;
+    /**
+     * The version of ArcGIS Server in which the layer is published.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#version)
+     */
+    readonly version: number;
 
+    /**
+     * Applies edits to features in a feature layer. New features can be created and existing features can be updated or deleted. Feature geometries and/or attributes may be modified. Only applicable to layers in a [feature service](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Feature_Service/02r3000000z2000000/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits)
+     * 
+     * @param edits Object containing features to be added, updated or deleted.
+     * @param edits.addFeatures Array of features to be added. Values of non nullable fields must be provided when adding new features. Date fields must have [numeric](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTime) values representing universal time.
+     * @param edits.updateFeatures Array of features to be updated. Each feature must have valid [objectId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField). Values of non nullable fields must be provided when updating features. Date fields must have [numeric](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTime) values representing universal time.
+     * @param edits.deleteFeatures An array of features or objects to be deleted. When an array of features is passed, each feature must have a valid [objectId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField). When an array of objects is used, each object must have a valid `objectId` property.
+     * 
+     */
     applyEdits(edits: FeatureLayerApplyEditsEdits): IPromise<any>;
+    /**
+     * Creates query parameters that can be used to fetch features that satisfy the layer's current filters, and definitions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#createQuery)
+     * 
+     * 
+     */
     createQuery(): Query;
+    /**
+     * Returns the [Domain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html) associated with the given field name. The domain can be either a [CodedValueDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html) or [RangeDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RangeDomain.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#getFieldDomain)
+     * 
+     * @param fieldName Name of the field.
+     * @param options An object specifying additional options. See the object specification table below for the required properties of this object.
+     * @param options.feature The feature to which the [Domain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html) is assigned.
+     * 
+     */
     getFieldDomain(fieldName: string, options?: FeatureLayerGetFieldDomainOptions): Domain;
-    queryExtent(params?: Query): IPromise<any>;
-    queryFeatureCount(params?: Query): IPromise<number>;
-    queryFeatures(params?: Query): IPromise<FeatureSet>;
-    queryObjectIds(params?: Query): IPromise<number[]>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the feature service and returns the [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of features that satisfy the query. If no parameters are specified, then the extent and count of all features satisfying the layer's configuration/filters are returned. This is valid only for [hosted feature services](http://doc.arcgis.com/en/arcgis-online/share-maps/hosted-web-layers.htm) on [arcgis.com](http://arcgis.com) and for ArcGIS Server 10.3.1 and later. 
+     * > To query for the extent of features/graphics available to or visible in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) on the client rather than making a server-side query, you must use the [FeatureLayerView.queryExtent()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryExtent) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryExtent)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. If no parameters are specified, then the extent and count of all features satisfying the layer's configuration/filters are returned. If working with a FeatureLayer created from a FeatureCollection (via [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source)), only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation.
+     * 
+     */
+    queryExtent(params?: Query | QueryProperties): IPromise<any>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the feature service and returns the number of features that satisfy the query. If no parameters are specified, then the total number of features satisfying the layer's configuration/filters is returned. 
+     * > To query for the count of features/graphics available to or visible in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) on the client rather than making a server-side query, you must use the [FeatureLayerView.queryFeatureCount()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryFeatureCount) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatureCount)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. If no parameters are specified, then the total number of features satisfying the layer's configuration/filters is returned. If working with a FeatureLayer created from a FeatureCollection (via [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source)), only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation.
+     * 
+     */
+    queryFeatureCount(params?: Query | QueryProperties): IPromise<number>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the feature service and returns a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html), which can be accessed using the `.then()` method once the promise resolves. A [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) contains an array of [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) features, which can be added to the [view's graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#graphics). This array will not be populated if zero results are found. 
+     * > To query features/graphics available to or visible in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) on the client rather than making a server-side query, you must use the [FeatureLayerView.queryFeatures()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryFeatures) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatures)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. If no parameters are specified, then all features satisfying the layer's configuration/filters are returned. If working with a FeatureLayer created from a FeatureCollection (via [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source)), only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation.
+     * 
+     */
+    queryFeatures(params?: Query | QueryProperties): IPromise<FeatureSet>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the feature service and returns an array of Object IDs for features that satisfy the input query. If no parameters are specified, then the Object IDs of all features satisfying the layer's configuration/filters are returned. 
+     * > To query for ObjectIDs of features/graphics available to or visible in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) on the client rather than making a server-side query, you must use the [FeatureLayerView.queryObjectIds()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryObjectIds) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryObjectIds)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. If no parameters are specified, then the Object IDs of all features satisfying the layer's configuration/filters are returned. If working with a FeatureLayer created from a FeatureCollection (via [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source)), only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation.
+     * 
+     */
+    queryObjectIds(params?: Query | QueryProperties): IPromise<number[]>;
+
 
     on(name: "layerview-create", eventHandler: FeatureLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: FeatureLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: FeatureLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: FeatureLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface FeatureLayerConstructor {
+    /**
+     * A FeatureLayer is a single layer that can be created from a [Map Service](http://server.arcgis.com/en/server/latest/publish-services/windows/what-is-a-map-service.htm) or [Feature Service](http://server.arcgis.com/en/server/latest/publish-services/windows/what-is-a-feature-service-.htm); ArcGIS Online or ArcGIS for Portal items; or from an array of client-side graphics. It is composed of discrete features, each of which has a [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) that allows it to be rendered in either a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) as a [graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) with spatial context. Features also contain data [attributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes) that provide additional information about the real-world feature it represents; attributes may be viewed in [popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#popupTemplate) windows and used for [rendering](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) the layer. FeatureLayers may be [queried](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatures), [analyzed](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html), and [rendered](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) to visualize data in a spatial context.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html)
+     */
+
     new(properties?: FeatureLayerProperties): FeatureLayer;
 
     fromJSON(json: any): FeatureLayer;
@@ -1536,238 +6253,870 @@ declare namespace __esri {
 
   export const FeatureLayer: FeatureLayerConstructor;
 
-  interface FeatureLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties {
-    capabilities?: FeatureLayerCapabilities;
+  interface FeatureLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
+    /**
+     * The copyright text as defined by the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#copyright)
+     */
     copyright?: string;
+    /**
+     * The SQL where clause used to filter features on the client. Only the features that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). Setting a definition expression is useful when the dataset is large and you don't want to bring all features to the client for analysis. Definition expressions may be set when a layer is constructed prior to it loading in the view or after it has been added to the map. If the definition expression is set after the layer has been added to the map, the view will automatically refresh itself to display the features that satisfy the new definition expression. 
+     * > **Known Limitations**  Definition expressions will not be honored when working with FeatureLayers created from client-side graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#definitionExpression)
+     */
     definitionExpression?: string;
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#displayField)
+     */
     displayField?: string;
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). This property may only be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo)
+     */
     elevationInfo?: FeatureLayerElevationInfo;
+    /**
+     * Configures the method for decluttering overlapping features in the view. If this property is not set (or set to `null`), every feature is drawn individually.  Currently this property is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) for point features with non-draped [Icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html) or [Text](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html) symbol layers.  ![declutter](https://developers.arcgis.com/javascript/latest/assets/img/samples/city-points-declutter.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#featureReduction)
+     */
     featureReduction?: FeatureLayerFeatureReduction;
+    /**
+     * An array of fields in the layer. Each field represents an attribute that may contain a value for each feature in the layer. For example, a field named `POP_2015`, stores information about total population as a numeric value for each feature; this value represents the total number of people living within the geographic bounds of the feature.  This property must be set in the constructor when creating a FeatureLayer from client-side [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). To create FeatureLayers from client-side graphics you must also set the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields)
+     */
     fields?: FieldProperties[];
-    gdbVersion?: string;
+    /**
+     * The geometry type of features in the layer. All features must be of the same type. This property is read-only when the layer is created from a [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url).  However, when creating a FeatureLayer from client-side graphics, this property must be specified in the layer's constructor along with the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), and [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField) properties.  **Possible Values:** point | mulitpoint | polyline | polygon | extent
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType)
+     */
     geometryType?: string;
-    hasAttachments?: boolean;
-    hasM?: boolean;
-    hasZ?: boolean;
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html). Use this property to specify labeling properties for the layer such as label expression, placement, and size.   For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible) property of this layer must be set to `true`. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  Each graphic can have only one label. Multiple [Label classes](esri-layers-support-LabelClass.html) with different [where](esri-layers-support-LabelClass.html#where) clauses can be used to have different label styles on different features that belong to the same layer (for example blue labels for lakes and green labels for parks).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelingInfo)
+     */
     labelingInfo?: LabelClassProperties[];
+    /**
+     * Indicates whether to display labels for this layer. If `true`, labels will appear as defined in the [labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelingInfo) property. 
+     * > **Known Limitations**  There is no support for labeling in 2D. Labeling is only supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible?: boolean;
+    /**
+     * The layer ID, or layer index, of a Feature Service layer. This is particularly useful when loading a single FeatureLayer with the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#portalItem) property from a service containing multiple layers. You can specify this value in one of two scenarios: 
+     *   * When loading the layer via the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#portalItem) property.
+     *   * When pointing the layer [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url) directly to the Feature Service.
+     *   
+     *   
+     * If a layerId is not specified in either of the above scenarios, then the first layer in the service (`layerId = 0`) is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#layerId)
+     */
     layerId?: number;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled?: boolean;
+    /**
+     * The name of one of the provided [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields) for each graphic containing a unique value or identifier for that graphic. This is required when constructing a FeatureLayer from a collection of client-side [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html).  When creating a FeatureLayer from client-side graphics, the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties must also be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField)
+     */
     objectIdField?: string;
+    /**
+     * An array of field names from the service to include in the FeatureLayer. If not specified, the layer will only return the `OBJECTID` field. To fetch the values from all fields in the layer, use `["*"]`. This is particularly useful when editing features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#outFields)
+     */
     outFields?: string[];
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled?: boolean;
+    /**
+     * The popup template for the layer. When set on the layer, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a feature is selected using text and/or charts. See the [PopupTemplate sample](https://developers.arcgis.com/javascript/latest/sample-code/intro-popuptemplate/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each feature in the layer. Depending on the renderer type, features may be visualized with the same symbol, or with varying symbols based on the values of provided attribute fields or functions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer)
+     */
     renderer?: RendererProperties;
+    /**
+     * When `true`, indicates that M values will be returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnM)
+     * 
+     * @default false
+     */
     returnM?: boolean;
+    /**
+     * When `true`, indicates that Z values will be returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnZ)
+     * 
+     * @default false
+     */
     returnZ?: boolean;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective. As screen size perspective changes the size based on distance to the camera, it should be set to false when using {@link module:esri/renderers/Renderer#SizeVisualVariable size visual variables}.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled?: boolean;
+    /**
+     * A collection of [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) objects used to create a FeatureLayer. This property should only used when creating a FeatureLayer from client-side graphics. When creating a FeatureLayer from client-side graphics, the [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties must also be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source)
+     */
     source?: CollectionProperties<GraphicProperties>;
+    /**
+     * The spatial reference of the layer. When creating the layer from a [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url), the spatial reference is read from the service.  This property should be set explicitly when creating a FeatureLayer from client-side graphics. When creating a FeatureLayer from client-side graphics, the [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#source), and [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType) properties must also be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
+    /**
+     * An array of feature templates defined in the feature layer. See [ArcGIS Pro subtypes document](https://pro.arcgis.com/en/pro-app/help/data/geodatabases/overview/an-overview-of-subtypes.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#templates)
+     */
     templates?: FeatureTemplateProperties[];
-    token?: string;
+    /**
+     * The name of the field holding the type ID or subtypes for the features. See [ArcGIS Pro subtypes document](https://pro.arcgis.com/en/pro-app/help/data/geodatabases/overview/an-overview-of-subtypes.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#typeIdField)
+     */
     typeIdField?: string;
+    /**
+     * An array of subtypes defined in the feature service exposed by ArcGIS REST API. Each item includes information about the type, such as the type ID, name, and definition expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#types)
+     */
     types?: FeatureTypeProperties[];
+    /**
+     * The URL of the REST endpoint of the layer or service. The URL may either point to a resource on ArcGIS for Server, Portal for ArcGIS, or ArcGIS Online.  If the url points directly to a service, then the layer must be specified in the [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#layerId) property. If no [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#layerId) is given, then the first layer in the service will be loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#url)
+     */
     url?: string;
-    version?: number;
   }
 
-  export interface FeatureEditResult {
+  /**
+   * FeatureEditResult represents the result of adding, updating or deleting a feature.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#FeatureEditResult)
+   */
+  export interface FeatureEditResult extends Object {
+    /**
+     * Object Id of the feature that was edited.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#FeatureEditResult)
+     */
     objectId: number;
+    /**
+     * If the edit failed, the edit result includes an error.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#FeatureEditResult)
+     */
     error: FeatureEditResultError;
   }
 
-  export interface FeatureLayerApplyEditsEdits {
+
+  export interface FeatureLayerApplyEditsEdits extends Object {
+    /**
+     * Array of features to be added. Values of non nullable fields must be provided when adding new features. Date fields must have [numeric](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTime) values representing universal time.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits)
+     */
     addFeatures?: Graphic[];
+    /**
+     * Array of features to be updated. Each feature must have valid [objectId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField). Values of non nullable fields must be provided when updating features. Date fields must have [numeric](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTime) values representing universal time.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits)
+     */
     updateFeatures?: Graphic[];
+    /**
+     * An array of features or objects to be deleted. When an array of features is passed, each feature must have a valid [objectId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField). When an array of objects is used, each object must have a valid `objectId` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits)
+     */
     deleteFeatures?: Graphic[] | any[];
   }
 
-  export interface FeatureLayerCapabilities {
+
+  export interface FeatureLayerCapabilities extends Object {
+    /**
+     * Indicates data capabilities that can be performed on features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     data: FeatureLayerCapabilitiesData;
+    /**
+     * Indicates editing capabilities that can be performed on the features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     editing: FeatureLayerCapabilitiesEditing;
+    /**
+     * Indicates operations that can be performed on features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     operations: FeatureLayerCapabilitiesOperations;
+    /**
+     * Indicates query operations that can be performed on features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     query: FeatureLayerCapabilitiesQuery;
+    /**
+     * Indicates if the layer's query operation supports querying features or records related to features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     queryRelated: FeatureLayerCapabilitiesQueryRelated;
   }
 
-  export interface FeatureLayerCapabilitiesData {
+
+  export interface FeatureLayerCapabilitiesData extends Object {
+    /**
+     * Indicates if the attachment is enabled on the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsAttachment: boolean;
+    /**
+     * Indicates if the features in the layer support M values. Requires ArcGIS Server service 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsM: boolean;
+    /**
+     * Indicates if the features in the layer support Z values. Requires ArcGIS Server service 10.1 or greater. See [elevationInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo) for details regarding placement and rendering of graphics with z-values in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsZ: boolean;
   }
 
-  export interface FeatureLayerCapabilitiesEditing {
+
+  export interface FeatureLayerCapabilitiesEditing extends Object {
+    /**
+     * Indicates if anonymous users can delete features created by others.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsDeleteByAnonymous: boolean;
+    /**
+     * Indicates if logged in users can delete features created by others.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsDeleteByOthers: boolean;
+    /**
+     * Indicates if the geometry of the features in the layer can be edited.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsGeometryUpdate: boolean;
+    /**
+     * Indicates if the `globalid` values provided by the client are used in [applyEdits](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsGlobalId: boolean;
+    /**
+     * Indicates if the `rollbackOnFailure` parameter can be set to `true` or `false` when running the synchronizeReplica operation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsRollbackOnFailure: boolean;
+    /**
+     * Indicates if anonymous users can update features created by others.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsUpdateByAnonymous: boolean;
+    /**
+     * Indicates if logged in users can update features created by others.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsUpdateByOthers: boolean;
+    /**
+     * Indicates if `m-values` must be provided when updating features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsUpdateWithoutM: boolean;
+    /**
+     * Indicates if the layer supports uploading attachments by [UploadId](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Item/02r3000000vq000000/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsUploadWithItemId: boolean;
   }
 
-  export interface FeatureLayerCapabilitiesOperations {
+
+  export interface FeatureLayerCapabilitiesOperations extends Object {
+    /**
+     * Indicates if new features can be [added](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits) to the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsAdd: boolean;
+    /**
+     * Indicates if features can be [deleted](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits) from the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsDelete: boolean;
+    /**
+     * Indicates if features in the layer can be [updated](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsUpdate: boolean;
+    /**
+     * Indicates if features in the layer can be [edited](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#applyEdits). Use `supportsAdd`, `supportsUpdate` and `supportsDelete` to determine which editing operations are supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsEditing: boolean;
+    /**
+     * Indicates if values of one or more field values in the layer can be updated. See the [Calculate REST operation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Calculate_Feature_Service_Layer/02r30000029n000000/) document for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsCalculate: boolean;
+    /**
+     * Indicates if features in the layer can be [queried](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatures).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsQuery: boolean;
+    /**
+     * Indicates if the layer supports a SQL-92 expression or where clause. This operation is only supported in ArcGIS Online hosted feature services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsValidateSql: boolean;
   }
 
-  export interface FeatureLayerCapabilitiesQuery {
+
+  export interface FeatureLayerCapabilitiesQuery extends Object {
+    /**
+     * Indicates if the geometry centroid associated with each polygon feature can be returned. This operation is only supported in ArcGIS Online hosted feature services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsCentroid: boolean;
+    /**
+     * Indicates if the layer's query operation supports a buffer distance for input geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsDistance: boolean;
+    /**
+     * Indicates if the layer supports queries for distinct values based on fields specified in the [outFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#outFields).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsDistinct: boolean;
+    /**
+     * Indicates if the layer's query response includes the extent of features. At 10.3, this option is only available for hosted feature services. At 10.3.1, it is available for hosted and non-hosted feature services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsExtent: boolean;
+    /**
+     * Indicates if the layer's query response contains geometry attributes, including shape area and length attributes. This operation is only supported in ArcGIS Online hosted feature services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsGeometryProperties: boolean;
+    /**
+     * Indicates if features returned in the query response can be ordered by one or more fields. Requires an ArcGIS Server service 10.3 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsOrderBy: boolean;
+    /**
+     * Indicates if the query response supports pagination. Requires an ArcGIS Server service 10.3 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsPagination: boolean;
+    /**
+     * Indicates if the query operation supports the projection of geometries onto a virtual grid. Requires an ArcGIS Server service 10.3 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsQuantization: boolean;
+    /**
+     * Indicates if the number of features returned by the query operation can be controlled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsResultType: boolean;
+    /**
+     * Indicates if the query operation supports SQL expressions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsSqlExpression: boolean;
+    /**
+     * Indicates if the query operation supports using standardized queries. Learn more about [standardized queries here](http://server.arcgis.com/en/server/latest/administer/linux/about-standardized-queries.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsStandardizedQueriesOnly: boolean;
+    /**
+     * Indicates if the layer supports field-based statistical functions. Requires ArcGIS Server service 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsStatistics: boolean;
   }
 
-  export interface FeatureLayerCapabilitiesQueryRelated {
+
+  export interface FeatureLayerCapabilitiesQueryRelated extends Object {
+    /**
+     * Indicates if the layer's query response includes the number of features or records related to features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsCount: boolean;
+    /**
+     * Indicates if the related features or records returned in the query response can be ordered by one or more fields. Requires ArcGIS Server service 10.3 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsOrderBy: boolean;
+    /**
+     * Indicates if the query response supports pagination for related features or records. Requires ArcGIS Server service 10.3 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#capabilities)
+     */
     supportsPagination: boolean;
   }
 
-  export interface FeatureLayerElevationInfo {
+
+  export interface FeatureLayerElevationInfo extends Object {
+    /**
+     * Defines how the graphic is placed with respect to the terrain surface. [returnZ](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnZ) must be set to `true` if z-values of the features should be considered for the elevation mode. If the geometry consists of multiple points (e.g. lines or polygons), the elevation is evaluated separately for each point. See the table below for a list of possible values. 
+     * 
+     * Mode | Description
+     * ------|------------
+     * on-the-ground | Graphics are draped on the terrain surface. This is the default value for features with [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) or [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries and features with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries rendered with [ObjectSymbol3DLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html).
+     * relative-to-ground | Graphics are placed at an elevation relative to the terrain surface. The graphic's elevation is determined by summing up the terrain elevation and the geometry's z-value (if present). If `featureExpressionInfo` is defined, the result of the expression is used instead of the geometry’s z-value. `relative-to-ground` is the default value for [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries rendered with [IconSymbol3DLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html).
+     * absolute-height | Graphics are placed at an absolute height above sea level. This height is determined by the geometry's z-value (if present). If `featureExpressionInfo` is defined, the result of the expression is used instead of the geometry’s z-value. This mode doesn't take the elevation of the terrain into account. This is the default value of features with any geometry type where [hasZ](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#hasZ) is `true`.
+     * relative-to-scene | Graphics are aligned to buildings and other objects part of 3D Object [SceneLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) or [IntegratedMeshLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html), depending on which has higher elevation. If the graphic is not directly above a building or any other feature, it is aligned to the terrain surface elevation. If defined, the result of `featureExpressionInfo` is added to the 3D Object/terrain surface elevation. In this mode z-values are ignored.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo)
+     */
     mode: string;
+    /**
+     * An elevation offset, which is added to the vertical position of the graphic. If `unit` is not defined, the offset is in `meters`. When `mode = "on-the-ground"`, this property has no effect.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo)
+     */
     offset?: number;
+    /**
+     * This object contains information about setting a custom height on the graphic. If this property is set, then z values are not considered for calculating graphic height.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo)
+     */
     featureExpressionInfo?: FeatureLayerElevationInfoFeatureExpressionInfo;
+    /**
+     * The unit for `featureExpressionInfo` and `offset` values. It doesn't apply to z-values.  **Possible Values:** feet | meters | kilometers | miles | us-feet | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo)
+     */
     unit?: string;
   }
 
-  export interface FeatureLayerElevationInfoFeatureExpressionInfo {
+
+  export interface FeatureLayerElevationInfoFeatureExpressionInfo extends Object {
+    /**
+     * An [Arcade expression](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) evaluating to a number that determines the height of the graphic. If the geometry has z-values, they will be ignored and only `featureExpressionInfo` is used to calculate the vertical position of the graphic. When `mode = "on-the-ground"`, this property has no effect. For line and polygon geometries the result of the expression is the same for all vertices of a feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo)
+     */
     expression?: string;
   }
 
-  export interface FeatureLayerFeatureReduction {
+
+  export interface FeatureLayerFeatureReduction extends Object {
+    /**
+     * Type of the decluttering method. The only supported type at the moment is `"selection"`. In this method, some of the overlapping features are hidden such that none of the remaining features intersect on screen. Label deconfliction also respects this option and hides labels that would overlap with the features of this layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#featureReduction)
+     */
     type: string;
   }
 
-  export interface FeatureLayerGetFieldDomainOptions {
+
+  export interface FeatureLayerGetFieldDomainOptions extends Object {
+    /**
+     * The feature to which the [Domain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html) is assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#getFieldDomain)
+     */
     feature: Graphic;
   }
 
   export interface FeatureLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface FeatureLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface FeatureEditResultError {
+
+  export interface FeatureEditResultError extends Object {
+    /**
+     * Error name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#FeatureEditResult)
+     */
     name: string;
+    /**
+     * Message describing the error.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#FeatureEditResult)
+     */
     message: string;
   }
 
   interface GeoRSSLayer extends Layer, ScaleRangeLayer {
+    /**
+     * Symbol used to represent line features from the GeoRSS feed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#lineSymbol)
+     */
     lineSymbol: SimpleLineSymbol;
+    /**
+     * Symbol used to represent point features from the GeoRSS feed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#pointSymbol)
+     */
     pointSymbol: PictureMarkerSymbol;
+    /**
+     * Symbol used to represent polygon features from the GeoRSS feed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#polygonSymbol)
+     */
     polygonSymbol: SimpleFillSymbol;
+    /**
+     * The URL pointing to a GeoRSS file. This must be publicly available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#url)
+     */
     url: string;
 
+
     on(name: "layerview-create", eventHandler: GeoRSSLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: GeoRSSLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: GeoRSSLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: GeoRSSLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface GeoRSSLayerConstructor {
+    /**
+     * The GeoRSSLayer class is used to create a layer based on [GeoRSS](http://www.georss.org/). GeoRSS is a way to add geographic information to an RSS feed. The GeoRSSLayer supports both `GeoRSS-Simple` and `GeoRSS GML` encodings, and multiple geometry types.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html)
+     */
+
     new(properties?: GeoRSSLayerProperties): GeoRSSLayer;
   }
 
   export const GeoRSSLayer: GeoRSSLayerConstructor;
 
   interface GeoRSSLayerProperties extends LayerProperties, ScaleRangeLayerProperties {
+    /**
+     * Symbol used to represent line features from the GeoRSS feed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#lineSymbol)
+     */
     lineSymbol?: SimpleLineSymbolProperties;
+    /**
+     * Symbol used to represent point features from the GeoRSS feed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#pointSymbol)
+     */
     pointSymbol?: PictureMarkerSymbolProperties;
+    /**
+     * Symbol used to represent polygon features from the GeoRSS feed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#polygonSymbol)
+     */
     polygonSymbol?: SimpleFillSymbolProperties;
+    /**
+     * The URL pointing to a GeoRSS file. This must be publicly available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html#url)
+     */
     url?: string;
   }
 
   export interface GeoRSSLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface GeoRSSLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface GraphicsLayer extends Layer, ScaleRangeLayer {
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). This property may only be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#elevationInfo)
+     */
     elevationInfo: GraphicsLayerElevationInfo;
+    /**
+     * A collection of [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in the layer. Each graphic is a vector representation of the location of a real-world feature. Each graphic in a single GraphicsLayer may contain either a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), or [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#geometry). In addition, each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in the collection may contain its own [attributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes), [Symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html), and [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  To add a graphic to the GraphicsLayer use [add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#add), or [GraphicsLayer.graphics.add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#add).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#graphics)
+     */
     graphics: Collection<Graphic>;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled: boolean;
 
+    /**
+     * Adds a graphic to the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#add)
+     * 
+     * @param graphic The graphic to add to the layer.
+     * 
+     */
     add(graphic: Graphic): void;
+    /**
+     * Adds an array of graphics to the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#addMany)
+     * 
+     * @param graphics The graphic(s) to add to the layer.
+     * 
+     */
     addMany(graphics: Graphic[]): void;
+    /**
+     * Removes a graphic from the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#remove)
+     * 
+     * @param graphic The graphic to remove from the layer.
+     * 
+     */
     remove(graphic: Graphic): void;
+    /**
+     * Clears all the graphics from the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#removeAll)
+     * 
+     * 
+     */
     removeAll(): void;
+    /**
+     * Removes an array of graphics from the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#removeMany)
+     * 
+     * @param graphics The graphics to remove from the layer.
+     * 
+     */
     removeMany(graphics: Graphic[]): void;
 
+
     on(name: "layerview-create", eventHandler: GraphicsLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: GraphicsLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: GraphicsLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: GraphicsLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface GraphicsLayerConstructor {
+    /**
+     * A GraphicsLayer contains one or more client-side [Graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). Each [graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#graphics) in the GraphicsLayer is rendered in a [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) inside either a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) or a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). The [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#graphics) contain discrete vector [geometries](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) that represent real-world phenomena.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html)
+     */
+
     new(properties?: GraphicsLayerProperties): GraphicsLayer;
   }
 
   export const GraphicsLayer: GraphicsLayerConstructor;
 
   interface GraphicsLayerProperties extends LayerProperties, ScaleRangeLayerProperties {
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). This property may only be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#elevationInfo)
+     */
     elevationInfo?: GraphicsLayerElevationInfo;
+    /**
+     * A collection of [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in the layer. Each graphic is a vector representation of the location of a real-world feature. Each graphic in a single GraphicsLayer may contain either a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), or [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#geometry). In addition, each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in the collection may contain its own [attributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#attributes), [Symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html), and [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  To add a graphic to the GraphicsLayer use [add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#add), or [GraphicsLayer.graphics.add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#add).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#graphics)
+     */
     graphics?: CollectionProperties<GraphicProperties>;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled?: boolean;
   }
 
-  export interface GraphicsLayerElevationInfo {
+
+  export interface GraphicsLayerElevationInfo extends Object {
+    /**
+     * Defines how the graphic is placed with respect to the terrain surface. If the geometry consists of multiple points (e.g. lines or polygons), the elevation is evaluated separately for each point. See the table below for a list of possible values. 
+     * 
+     * Mode | Description
+     * ------|------------
+     * on-the-ground | Graphics are placed on the terrain surface.
+     * relative-to-ground | Graphics are placed at an elevation relative to the terrain surface. The graphic's elevation is determined by summing up
+     * the terrain elevation, and the geometry's z-value (if present). In case `featureExpressionInfo` is defined, the result of the expression is used
+     * instead of the geometry’s z-value. absolute-height | Graphics are placed at an absolute height above sea level. This height is determined by the geometry's z-value (if present). If `featureExpressionInfo` is defined, the result of the expression is used instead of the geometry’s z-value. It doesn't take the elevation of the terrain into account. relative-to-scene | Graphics are aligned to buildings and other objects part of 3D Object [SceneLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) or [IntegratedMeshLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html), depending on which has higher elevation. If the graphic is not directly above a building or any other feature, it is aligned to the terrain surface elevation. If defined, the result of `featureExpressionInfo` is added to the 3D Object/terrain surface elevation. In this mode z-values are ignored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#elevationInfo)
+     */
     mode: string;
+    /**
+     * An elevation offset, which is added to the vertical position of the graphic. If `unit` is not defined, the offset is in `meters`. When `mode = "on-the-ground"`, this property has no effect.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#elevationInfo)
+     */
     offset?: number;
+    /**
+     * This object contains information about setting a custom height on the graphic. If this property is set, then z values are not considered for calculating graphic height.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#elevationInfo)
+     */
     featureExpressionInfo?: GraphicsLayerElevationInfoFeatureExpressionInfo;
+    /**
+     * The unit for `featureExpressionInfo` and `offset` values. It doesn't apply to z-values.  **Possible Values:** feet | meters | kilometers | miles | us-feet | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#elevationInfo)
+     */
     unit?: string;
   }
 
-  export interface GraphicsLayerElevationInfoFeatureExpressionInfo {
+
+  export interface GraphicsLayerElevationInfoFeatureExpressionInfo extends Object {
+    /**
+     * An [Arcade expression](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) evaluating to a number that determines the height of the graphic. If the geometry has z-values, they will be ignored and only `featureExpressionInfo` is used to calculate the vertical position of the graphic. When `mode = "on-the-ground"`, this property has no effect. For line and polygon geometries the result of the expression is the same for all vertices of a feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#elevationInfo)
+     */
     expression?: string;
   }
 
   export interface GraphicsLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface GraphicsLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface GroupLayer extends Layer, LayersMixin, PortalLayer {
+    /**
+     * Indicates how to manage the visibility of the children layers. Possible values are described in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * independent | Each child layer manages its visibility independent from other layers.
+     * inherited | Each child layer's visibility matches the [GroupLayer’s visibility](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html#visible).
+     * exclusive | Only one child layer is visible at a time.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html#visibilityMode)
+     */
     visibilityMode: string;
 
+
     on(name: "layerview-create", eventHandler: GroupLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: GroupLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: GroupLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: GroupLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface GroupLayerConstructor {
+    /**
+     * GroupLayer provides the ability to organize several sublayers into one common layer. Suppose there are several [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) that all represent water features in different dimensions. For example, wells (points), streams (lines), and lakes (polygons). The GroupLayer provides the functionality to treat them as one layer called "Water Features" even though they are stored as separate feature layers. To accomplish this, create a new GroupLayer and use the [add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html#add) method to add each of the water layers to the GroupLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html)
+     */
+
     new(properties?: GroupLayerProperties): GroupLayer;
 
     fromJSON(json: any): GroupLayer;
@@ -1776,34 +7125,89 @@ declare namespace __esri {
   export const GroupLayer: GroupLayerConstructor;
 
   interface GroupLayerProperties extends LayerProperties, LayersMixinProperties, PortalLayerProperties {
+    /**
+     * Indicates how to manage the visibility of the children layers. Possible values are described in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * independent | Each child layer manages its visibility independent from other layers.
+     * inherited | Each child layer's visibility matches the [GroupLayer’s visibility](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html#visible).
+     * exclusive | Only one child layer is visible at a time.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html#visibilityMode)
+     */
     visibilityMode?: string;
   }
 
   export interface GroupLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface GroupLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  interface ImageryLayer extends Layer, ArcGISImageService, ScaleRangeLayer {
+  interface ImageryLayer extends Layer, ArcGISImageService, ScaleRangeLayer, RefreshableLayer {
+    /**
+     * A function that processes [pixelData](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-ImageryLayerView.html#pixelData). The `pixelData` object contains a [pixelBlock](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html) property that gives you access to all of the pixels in the raster on the client.  Inside the `pixelFilter` you may loop through all the [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) found in the `pixelBlock` property of the `pixelData` object and process them. This function may be used to hide some pixels from the view, alter their values, and change their color.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#pixelFilter)
+     */
     pixelFilter: Function;
+    /**
+     * Indicates whether to display popups when the layer is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled: boolean;
+    /**
+     * The portal item from which the layer is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#portalItem)
+     */
     portalItem: PortalItem;
-    token: string;
+    /**
+     * Token generated by the token service using the specified userId and password. The recommended approach to pass a token on a layer is to use [IdentityManager.registerToken()](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#registerToken).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#token)
+     */
+    readonly token: string;
 
+    /**
+     * Executes the [pixelFilter](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#pixelFilter) function and redraws the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#redraw)
+     * 
+     * 
+     */
     redraw(): void;
 
+
     on(name: "layerview-create", eventHandler: ImageryLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: ImageryLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: ImageryLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: ImageryLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface ImageryLayerConstructor {
+    /**
+     * Represents an image service resource as a layer. An ImageryLayer retrieves and displays data from image services. ImageryLayer allows you to and apply client side [pixel filtering](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#pixelFilter), server defined or client-defined [rendering rules](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#renderingRule) (e.g. remap, colormap), and [mosaic rules](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#mosaicRule). This layer is particularly useful when you need to interactively change pixel manipulation criteria and get an immediate response on the client.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html)
+     */
+
     new(properties?: ImageryLayerProperties): ImageryLayer;
 
     fromJSON(json: any): ImageryLayer;
@@ -1811,33 +7215,68 @@ declare namespace __esri {
 
   export const ImageryLayer: ImageryLayerConstructor;
 
-  interface ImageryLayerProperties extends LayerProperties, ArcGISImageServiceProperties, ScaleRangeLayerProperties {
+  interface ImageryLayerProperties extends LayerProperties, ArcGISImageServiceProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
+    /**
+     * A function that processes [pixelData](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-ImageryLayerView.html#pixelData). The `pixelData` object contains a [pixelBlock](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html) property that gives you access to all of the pixels in the raster on the client.  Inside the `pixelFilter` you may loop through all the [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) found in the `pixelBlock` property of the `pixelData` object and process them. This function may be used to hide some pixels from the view, alter their values, and change their color.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#pixelFilter)
+     */
     pixelFilter?: Function;
+    /**
+     * Indicates whether to display popups when the layer is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled?: boolean;
+    /**
+     * The portal item from which the layer is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#portalItem)
+     */
     portalItem?: PortalItemProperties;
-    token?: string;
   }
 
   export interface ImageryLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface ImageryLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface IntegratedMeshLayer extends Layer, SceneService, PortalLayer {
+    /**
+     * Specifies how the mesh is placed on the vertical axis (z). This property only affects [IntegratedMeshLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html) when using the `absolute-height` mode. Integrated mesh layers always render in front of the ground surface, so setting negative offset values will not render them below the ground.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html#elevationInfo)
+     */
     elevationInfo: IntegratedMeshLayerElevationInfo;
 
+
     on(name: "layerview-create", eventHandler: IntegratedMeshLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: IntegratedMeshLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: IntegratedMeshLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: IntegratedMeshLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface IntegratedMeshLayerConstructor {
+    /**
+     * The IntegratedMeshLayer is designed for visualizing accurate representations in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) of infrastructure and natural landscapes that are difficult to access.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html)
+     */
+
     new(properties?: IntegratedMeshLayerProperties): IntegratedMeshLayer;
 
     fromJSON(json: any): IntegratedMeshLayer;
@@ -1846,39 +7285,90 @@ declare namespace __esri {
   export const IntegratedMeshLayer: IntegratedMeshLayerConstructor;
 
   interface IntegratedMeshLayerProperties extends LayerProperties, SceneServiceProperties, PortalLayerProperties {
+    /**
+     * Specifies how the mesh is placed on the vertical axis (z). This property only affects [IntegratedMeshLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html) when using the `absolute-height` mode. Integrated mesh layers always render in front of the ground surface, so setting negative offset values will not render them below the ground.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html#elevationInfo)
+     */
     elevationInfo?: IntegratedMeshLayerElevationInfo;
   }
 
-  export interface IntegratedMeshLayerElevationInfo {
+
+  export interface IntegratedMeshLayerElevationInfo extends Object {
+    /**
+     * Defines how the mesh is placed on the vertical axis (z). Currently only `absolute-height` is supported. 
+     * 
+     * Mode | Description
+     * ------|------------
+     * absolute-height | The mesh is placed at an absolute height above sea level. This height is determined by summing up the `offset` value and the mesh's z-value. It doesn't take the elevation of the terrain into account. This is the only supported elevation mode for an IntegratedMeshLayer.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html#elevationInfo)
+     */
     mode: string;
+    /**
+     * An elevation offset, which is added to the vertical position of the mesh.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html#elevationInfo)
+     * 
+     * @default 0
+     */
     offset?: number;
+    /**
+     * The unit for `offset` values.  **Possible Values:** feet | meters | kilometers | miles | us-feet | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html#elevationInfo)
+     * 
+     * @default meters
+     */
+    unit?: string;
   }
 
   export interface IntegratedMeshLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface IntegratedMeshLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface KMLLayer extends Layer, PortalLayer, ScaleRangeLayer {
-    allVisibleMapImages: Collection<any>;
-    allVisiblePoints: Collection<Point>;
-    allVisiblePolygons: Collection<Polygon>;
-    allVisiblePolylines: Collection<Polyline>;
+    /**
+     * A collection of [KMLSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html#sublayers)
+     */
     sublayers: Collection<KMLSublayer>;
+    /**
+     * The publicly accessible URL for a .kml or .kmz file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html#url)
+     */
     url: string;
 
+
     on(name: "layerview-create", eventHandler: KMLLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: KMLLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: KMLLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: KMLLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface KMLLayerConstructor {
+    /**
+     * The KMLLayer class is used to create a layer based on a KML file (.kml, .kmz). KML is an XML-based file format used to represent geographic features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html)
+     */
+
     new(properties?: KMLLayerProperties): KMLLayer;
 
     fromJSON(json: any): KMLLayer;
@@ -1887,75 +7377,240 @@ declare namespace __esri {
   export const KMLLayer: KMLLayerConstructor;
 
   interface KMLLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties {
-    allVisibleMapImages?: CollectionProperties<any>;
-    allVisiblePoints?: CollectionProperties<PointProperties>;
-    allVisiblePolygons?: CollectionProperties<PolygonProperties>;
-    allVisiblePolylines?: CollectionProperties<PolylineProperties>;
+    /**
+     * A collection of [KMLSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html#sublayers)
+     */
     sublayers?: CollectionProperties<KMLSublayerProperties>;
+    /**
+     * The publicly accessible URL for a .kml or .kmz file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html#url)
+     */
     url?: string;
   }
 
   export interface KMLLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface KMLLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface Layer extends Accessor, Loadable, Evented {
+    /**
+     * The full extent of the layer. By default, this is worldwide. This property may be used to set the extent of the view to match a layer's extent so that its features appear to fill the view. See the sample snippet below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#fullExtent)
+     */
     fullExtent: Extent;
+    /**
+     * The unique ID assigned to the layer. If not set by the developer, it is automatically generated when the layer is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#id)
+     */
     id: string;
+    /**
+     * Indicates how the layer should display in the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) widget. The known values are listed below. 
+     * 
+     * Value | Description
+     * ------|------------
+     *  show | The layer is visible in the table of contents.
+     *  hide | The layer is hidden in the table of contents.
+     *  hide-children | If the layer is a [GroupLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html), hide the children layers from the table of contents.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#listMode)
+     * 
+     * @default show
+     */
     listMode: string;
-    loaded: boolean;
+    /**
+     * Indicates whether the layer's resources have loaded. When `true`, all the properties of the object can be accessed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#loaded)
+     * 
+     * @default false
+     */
+    readonly loaded: boolean;
+    /**
+     * The opacity of the layer. This value can range between `1` and `0`, where `0` is 100 percent transparent and `1` is completely opaque.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#opacity)
+     * 
+     * @default 1
+     */
     opacity: number;
+    /**
+     * The title of the layer used to identify it in places such as the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) and [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) widgets.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#title)
+     */
     title: string;
-    type: string;
+    /**
+     * The layer type provides a convenient way to check the type of the layer without the need to import specific layer modules.  **Possible values:** base-dynamic | base-elevation | base-tile | elevation | feature | graphics | group | imagery | integrated-mesh | map-image | open-street-map | point-cloud | scene | stream | tile | unknown | unsupported | vector-tile | web-tile
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#type)
+     */
+    readonly type: string;
+    /**
+     * Indicates if the layer is visible in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). When `false`, the layer may still be added to a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) instance that is referenced in a view, but its features will not be visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#visible)
+     * 
+     * @default true
+     */
     visible: boolean;
 
+    /**
+     * Fetches custom attribution data for the layer when it becomes available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#fetchAttributionData)
+     * 
+     * 
+     */
     fetchAttributionData(): IPromise<any>;
   }
 
   interface LayerConstructor {
+    /**
+     * The layer is the most fundamental component of a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html). It is a collection of spatial data in the form of vector graphics or raster images that represent real-world phenomena. Layers may contain discrete features that store vector data or continuous cells/pixels that store raster data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html)
+     */
+
     new(properties?: LayerProperties): Layer;
 
 
+    /**
+     * Creates a new layer instance from an ArcGIS Server URL. Depending on the URL, the returned layer type may be a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), [TileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html), [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html), [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html), [StreamLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html), [ElevationLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html) or [GroupLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html).  This is useful when you work with various ArcGIS Server URLs, but you don't necessarily know which layer type(s) they create. This method creates the appropriate layer type for you. In case of a feature service or a scene service, when the URL points to the service and the service has multiple layers, the returned promise will resolve to a [GroupLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#fromArcGISServerUrl)
+     * 
+     * @param params Input parameters for creating the layer.
+     * @param params.url The ArcGIS Server URL used to create the layer.
+     * @param params.properties Set any of the layer's properties here for constructing the layer instance (e.g. popupTemplate, renderer, etc.).
+     * 
+     */
     fromArcGISServerUrl(params: LayerFromArcGISServerUrlParams): IPromise<Layer>;
+    /**
+     * Creates a new layer instance of the appropriate layer class from an ArcGIS Online or ArcGIS for Portal [portal item](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html). If the item points to a feature service with multiple layers, then a [GroupLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html) is created. If the item points to a service with a single layer, then it resolves to a layer of the same type of class as the service.  See also: [isLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#isLayer)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#fromPortalItem)
+     * 
+     * @param params The parameters for loading the portal item.
+     * @param params.portalItem The object representing an ArcGIS Online or ArcGIS for Portal item from which to load the layer.
+     * 
+     */
     fromPortalItem(params: LayerFromPortalItemParams): IPromise<Layer>;
   }
 
   export const Layer: LayerConstructor;
 
   interface LayerProperties extends LoadableProperties {
+    /**
+     * The full extent of the layer. By default, this is worldwide. This property may be used to set the extent of the view to match a layer's extent so that its features appear to fill the view. See the sample snippet below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#fullExtent)
+     */
     fullExtent?: ExtentProperties;
+    /**
+     * The unique ID assigned to the layer. If not set by the developer, it is automatically generated when the layer is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#id)
+     */
     id?: string;
+    /**
+     * Indicates how the layer should display in the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) widget. The known values are listed below. 
+     * 
+     * Value | Description
+     * ------|------------
+     *  show | The layer is visible in the table of contents.
+     *  hide | The layer is hidden in the table of contents.
+     *  hide-children | If the layer is a [GroupLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html), hide the children layers from the table of contents.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#listMode)
+     * 
+     * @default show
+     */
     listMode?: string;
-    loaded?: boolean;
+    /**
+     * The opacity of the layer. This value can range between `1` and `0`, where `0` is 100 percent transparent and `1` is completely opaque.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#opacity)
+     * 
+     * @default 1
+     */
     opacity?: number;
+    /**
+     * The title of the layer used to identify it in places such as the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) and [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) widgets.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#title)
+     */
     title?: string;
-    type?: string;
+    /**
+     * Indicates if the layer is visible in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). When `false`, the layer may still be added to a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) instance that is referenced in a view, but its features will not be visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#visible)
+     * 
+     * @default true
+     */
     visible?: boolean;
   }
 
-  export interface LayerFromArcGISServerUrlParams {
+
+  export interface LayerFromArcGISServerUrlParams extends Object {
+    /**
+     * The ArcGIS Server URL used to create the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#fromArcGISServerUrl)
+     */
     url: string;
+    /**
+     * Set any of the layer's properties here for constructing the layer instance (e.g. popupTemplate, renderer, etc.).
+     * 
+     * [Read more...](properties.html)
+     */
     properties?: any;
   }
 
-  export interface LayerFromPortalItemParams {
+
+  export interface LayerFromPortalItemParams extends Object {
+    /**
+     * The object representing an ArcGIS Online or ArcGIS for Portal item from which to load the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#fromPortalItem)
+     */
     portalItem: PortalItem;
   }
 
-  interface MapImageLayer extends Layer, ArcGISMapService, ArcGISDynamicMapService, DynamicLayer, ScaleRangeLayer {
+  interface MapImageLayer extends Layer, ArcGISMapService, ArcGISDynamicMapService, DynamicLayer, ScaleRangeLayer, RefreshableLayer {
+
     on(name: "layerview-create", eventHandler: MapImageLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: MapImageLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: MapImageLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: MapImageLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface MapImageLayerConstructor {
+    /**
+     * MapImageLayer allows you to display and analyze data from [sublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html#sublayers) defined in a [map service](http://server.arcgis.com/en/server/latest/publish-services/windows/what-is-a-map-service.htm), exporting images instead of features. Map service images are dynamically generated on the server based on a request, which includes an LOD (level of detail), a bounding box, dpi, spatial reference and other options. The exported image is of the entire map extent specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html)
+     */
+
     new(properties?: MapImageLayerProperties): MapImageLayer;
 
     fromJSON(json: any): MapImageLayer;
@@ -1963,28 +7618,42 @@ declare namespace __esri {
 
   export const MapImageLayer: MapImageLayerConstructor;
 
-  interface MapImageLayerProperties extends LayerProperties, ArcGISMapServiceProperties, ArcGISDynamicMapServiceProperties, DynamicLayerProperties, ScaleRangeLayerProperties {
+  interface MapImageLayerProperties extends LayerProperties, ArcGISMapServiceProperties, ArcGISDynamicMapServiceProperties, DynamicLayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
 
   }
 
   export interface MapImageLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface MapImageLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface MapNotesLayer extends Layer, PortalLayer, ScaleRangeLayer {
+
     on(name: "layerview-create", eventHandler: MapNotesLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: MapNotesLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: MapNotesLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: MapNotesLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface MapNotesLayerConstructor {
+    /**
+     * The MapNotesLayer is used to create layers based on Map Notes within a WebMap or PortalItem. Map notes are part of web maps, and are typically created with ArcGIS Online MapViewer. For additional information, please refer to the ArcGIS Online documentation on how to [Add Map notes](http://doc.arcgis.com/en/arcgis-online/create-maps/add-layers.htm#ESRI_SECTION1_0C90A3B63ABD49D5B9535055991F4684). Within the [web map specification](https://developers.arcgis.com/web-map-specification/), map notes are a special type of [FeatureCollections](https://developers.arcgis.com/web-map-specification/objects/featureCollection/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapNotesLayer.html)
+     */
+
     new(properties?: MapNotesLayerProperties): MapNotesLayer;
 
     fromJSON(json: any): MapNotesLayer;
@@ -1997,23 +7666,49 @@ declare namespace __esri {
   }
 
   export interface MapNotesLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface MapNotesLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface ArcGISCachedService {
+    /**
+     * Contains information about the tiling scheme for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISCachedService.html#tileInfo)
+     */
     tileInfo: TileInfo;
 
+    /**
+     * Creates a new instance of [this class]() and initializes it with values from a JSON object generated from a product in the ArcGIS platform. The object passed into the input `json` parameter often comes from a response to a query operation in the REST API or a [toJSON()](http://pro.arcgis.com/en/pro-app/tool-reference/conversion/features-to-json.htm) method from another ArcGIS product. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for details and examples of when and how to use this function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISCachedService.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance in the ArcGIS format. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Classification_objects/02r30000019z000000/) for examples of the structure of various input JSON objects.
+     * 
+     */
     fromJSON(json: any): any;
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISCachedService.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface ArcGISCachedServiceConstructor {
+
+
     new(properties?: ArcGISCachedServiceProperties): ArcGISCachedService;
 
     fromJSON(json: any): ArcGISCachedService;
@@ -2022,76 +7717,362 @@ declare namespace __esri {
   export const ArcGISCachedService: ArcGISCachedServiceConstructor;
 
   interface ArcGISCachedServiceProperties {
+    /**
+     * Contains information about the tiling scheme for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISCachedService.html#tileInfo)
+     */
     tileInfo?: TileInfoProperties;
   }
 
   interface ArcGISDynamicMapService {
-    allSublayers: Collection<Sublayer>;
+    /**
+     * A flat [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of all the [sublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#sublayers) in the MapImageLayer including the sublayers of its sublayers. All sublayers are referenced in the order in which they are drawn in the view (bottom to top).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#allSublayers)
+     */
+    readonly allSublayers: Collection<Sublayer>;
+    /**
+     * The output dots per inch (DPI) of the MapImageLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#dpi)
+     * 
+     * @default 96
+     */
     dpi: number;
+    /**
+     * The version of the geodatabase of the map service data. Read the [Overview of versioning](https://desktop.arcgis.com/en/arcmap/latest/manage-data/geodatabases/an-overview-of-versioning.htm) topic for more details about this capability.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#gdbVersion)
+     */
     gdbVersion: string;
+    /**
+     * The output image type.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg | pngjpg
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageFormat)
+     * 
+     * @default png24
+     */
     imageFormat: string;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageMaxHeight)
+     * 
+     * @default 2048
+     */
     imageMaxHeight: number;
+    /**
+     * Indicates the maximum width of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageMaxWidth)
+     * 
+     * @default 2048
+     */
     imageMaxWidth: number;
+    /**
+     * Indicates whether the background of the image exported by the service is transparent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageTransparency)
+     * 
+     * @default true
+     */
     imageTransparency: boolean;
+    /**
+     * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Sublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html) objects that allow you to alter the properties of one or more sublayers of the MapImageLayer. If this property is not specified, all the sublayers from the service are displayed as defined in the service. If an empty array is passed to this property then none of the sublayers from the service are displayed in the layer.  All sublayers are referenced in the order in which they are drawn in the view (bottom to top). They may be [added](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#add), [removed](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#remove), or [reordered](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#reorder) using the [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) methods. Because [Sublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html) extends [Accessor](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html), its properties may be [watched](https://developers.arcgis.com/javascript/latest/guide/working-with-props/index.html#watchProperties).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#sublayers)
+     */
     sublayers: Collection<Sublayer>;
 
+    /**
+     * Returns a deep clone of a map service's [sublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html) as defined by the service. This is useful for scenarios when the developer is unfamiliar with the service sublayers and needs to "reset" the layer's sublayers to match those defined by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#createServiceSublayers)
+     * 
+     * 
+     */
     createServiceSublayers(): Collection<Sublayer>;
+    /**
+     * Returns the sublayer with the given layerId.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#findSublayerById)
+     * 
+     * @param id The [id](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#id) of the sublayer.
+     * 
+     */
     findSublayerById(id: number): Sublayer;
+    /**
+     * Gets the parameters of the exported image to use when calling the [export REST operation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Export_Map/02r3000000v7000000/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#getExportImageParameters)
+     * 
+     * @param extent The extent of the exported image
+     * @param width The width of the exported image
+     * @param height The height of the exported image
+     * @param options The parameter options is an object with the following properties.
+     * @param options.rotation The rotation in degrees of the exported image. Available since ArcGIS for Server 10.3.
+     * 
+     */
     getExportImageParameters(extent: Extent, width: number, height: number, options?: ArcGISDynamicMapServiceGetExportImageParametersOptions): any;
   }
 
   interface ArcGISDynamicMapServiceConstructor {
+
+
     new(): ArcGISDynamicMapService;
   }
 
   export const ArcGISDynamicMapService: ArcGISDynamicMapServiceConstructor;
 
   interface ArcGISDynamicMapServiceProperties {
-    allSublayers?: CollectionProperties<SublayerProperties>;
+    /**
+     * The output dots per inch (DPI) of the MapImageLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#dpi)
+     * 
+     * @default 96
+     */
     dpi?: number;
+    /**
+     * The version of the geodatabase of the map service data. Read the [Overview of versioning](https://desktop.arcgis.com/en/arcmap/latest/manage-data/geodatabases/an-overview-of-versioning.htm) topic for more details about this capability.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#gdbVersion)
+     */
     gdbVersion?: string;
+    /**
+     * The output image type.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg | pngjpg
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageFormat)
+     * 
+     * @default png24
+     */
     imageFormat?: string;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageMaxHeight)
+     * 
+     * @default 2048
+     */
     imageMaxHeight?: number;
+    /**
+     * Indicates the maximum width of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageMaxWidth)
+     * 
+     * @default 2048
+     */
     imageMaxWidth?: number;
+    /**
+     * Indicates whether the background of the image exported by the service is transparent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#imageTransparency)
+     * 
+     * @default true
+     */
     imageTransparency?: boolean;
+    /**
+     * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Sublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html) objects that allow you to alter the properties of one or more sublayers of the MapImageLayer. If this property is not specified, all the sublayers from the service are displayed as defined in the service. If an empty array is passed to this property then none of the sublayers from the service are displayed in the layer.  All sublayers are referenced in the order in which they are drawn in the view (bottom to top). They may be [added](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#add), [removed](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#remove), or [reordered](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#reorder) using the [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) methods. Because [Sublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html) extends [Accessor](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html), its properties may be [watched](https://developers.arcgis.com/javascript/latest/guide/working-with-props/index.html#watchProperties).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#sublayers)
+     */
     sublayers?: CollectionProperties<SublayerProperties>;
   }
 
-  export interface ArcGISDynamicMapServiceGetExportImageParametersOptions {
+
+  export interface ArcGISDynamicMapServiceGetExportImageParametersOptions extends Object {
+    /**
+     * The rotation in degrees of the exported image. Available since ArcGIS for Server 10.3.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#getExportImageParameters)
+     */
     rotation?: number;
   }
 
   interface ArcGISImageService {
+    /**
+     * The compression quality value. This controls how much loss the image will be subjected to. Only valid when using `jpg` [image format](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#format).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#compressionQuality)
+     */
     compressionQuality: number;
+    /**
+     * The output image compression tolerance value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#compressionTolerance)
+     * 
+     * @default 0.01
+     */
     compressionTolerance: number;
+    /**
+     * The copyright text as defined by the image service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#copyright)
+     */
     copyright: string;
+    /**
+     * The SQL where clause used to filter rasters on the client. Only the rasters that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#definitionExpression)
+     */
     definitionExpression: string;
+    /**
+     * An array of fields in the layer for which a [Domain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html) has been defined.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#domainFields)
+     */
     domainFields: Field[];
+    /**
+     * An array of fields in the layer. Each field represents an attribute that may contain a value for each raster in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#fields)
+     */
     fields: Field[];
+    /**
+     * The output image type. The default value is `lerc` if a [pixelFilter](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#pixelFilter) is set on the layer.  **Known Values:** png | png8 | png24 | png32 | jpg | bmp | gif | jpgpng | lerc
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#format)
+     * 
+     * @default jpgpng
+     */
     format: string;
+    /**
+     * The full extent of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#fullExtent)
+     */
     fullExtent: Extent;
+    /**
+     * Indicates if the Image Service has [multidimensionalInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#multidimensionalInfo).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#hasMultidimensions)
+     */
     hasMultidimensions: boolean;
+    /**
+     * Indicates if the Image Service has a [raster attribute table](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTable). If `true`, the raster attribute table can be accessed with the [rasterAttributeTable](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTable) property after the layer has [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#loaded).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#hasRasterAttributeTable)
+     */
     hasRasterAttributeTable: boolean;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#imageMaxHeight)
+     * 
+     * @default 4100
+     */
     imageMaxHeight: number;
+    /**
+     * Indicates the maximum width of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#imageMaxWidth)
+     * 
+     * @default 15000
+     */
     imageMaxWidth: number;
+    /**
+     * Defines how overlapping images should be mosaicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#mosaicRule)
+     */
     mosaicRule: MosaicRule;
+    /**
+     * The multidimensional information associated with the service. This will have a value if `serviceInfo` has `hasMultidimensionalInfo = true`.  If defined, multidimensional information contains various "dimensions" of data for a particular value, such as time, depth, altitude, etc. Defining slices of particular dimensions in the layer is handled with the [multidimensionalDefinition](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#multidimensionalDefinition) property of the [mosaicRule](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#mosaicRule).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#multidimensionalInfo)
+     */
     multidimensionalInfo: any;
+    /**
+     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#pixelType)
+     */
     pixelType: string;
+    /**
+     * The popup template for the layer. When set on the layer, the popupTemplate allows users to access attributes and display their values using text and/or charts in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a pixel is clicked. See [this sample](https://developers.arcgis.com/javascript/latest/sample-code/layers-imagery-popup/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with an [ImageryLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
+    /**
+     * The raster attribute table associated with the service. To access the raster attribute table, the layer must be [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#loaded).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTable)
+     */
     rasterAttributeTable: any;
+    /**
+     * Prefix used to define the fields from the raster attribute table. It's primarily used for [popups](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTableFieldPrefix)
+     * 
+     * @default Raster.
+     */
     rasterAttributeTableFieldPrefix: string;
+    /**
+     * A complete list of fields that consists of fields from the layer, pixel value fields and the attribute table fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterFields)
+     */
     rasterFields: Field[];
+    /**
+     * Specifies the rule for how the requested image should be rendered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#renderingRule)
+     */
     renderingRule: RasterFunction;
-    spatialReference: SpatialReference;
+    /**
+     * The spatial reference of the image service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#spatialReference)
+     */
+    readonly spatialReference: SpatialReference;
+    /**
+     * The URL to the REST endpoint of the layer. The URL may either point to a resource on ArcGIS for Server, Portal for ArcGIS, or ArcGIS Online.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#url)
+     */
     url: string;
-    version: number;
+    /**
+     * The version of ArcGIS Server in which the image service is published.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#version)
+     */
+    readonly version: number;
 
+    /**
+     * Returns an image using the [export REST operation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Export_Image/02r3000000wm000000/) that displays data from an [ImageryLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#fetchImage)
+     * 
+     * @param extent The extent of the image to export.
+     * @param width The width of the image in pixels.
+     * @param height The height of the image in pixels.
+     * 
+     */
     fetchImage(extent: Extent, width: number, height: number): IPromise<any>;
+    /**
+     * Creates a new instance of [this class]() and initializes it with values from a JSON object generated from a product in the ArcGIS platform. The object passed into the input `json` parameter often comes from a response to a query operation in the REST API or a [toJSON()](http://pro.arcgis.com/en/pro-app/tool-reference/conversion/features-to-json.htm) method from another ArcGIS product. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for details and examples of when and how to use this function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance in the ArcGIS format. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Classification_objects/02r30000019z000000/) for examples of the structure of various input JSON objects.
+     * 
+     */
     fromJSON(json: any): any;
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface ArcGISImageServiceConstructor {
+
+
     new(properties?: ArcGISImageServiceProperties): ArcGISImageService;
 
     fromJSON(json: any): ArcGISImageService;
@@ -2100,39 +8081,174 @@ declare namespace __esri {
   export const ArcGISImageService: ArcGISImageServiceConstructor;
 
   interface ArcGISImageServiceProperties {
+    /**
+     * The compression quality value. This controls how much loss the image will be subjected to. Only valid when using `jpg` [image format](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#format).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#compressionQuality)
+     */
     compressionQuality?: number;
+    /**
+     * The output image compression tolerance value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#compressionTolerance)
+     * 
+     * @default 0.01
+     */
     compressionTolerance?: number;
+    /**
+     * The copyright text as defined by the image service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#copyright)
+     */
     copyright?: string;
+    /**
+     * The SQL where clause used to filter rasters on the client. Only the rasters that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#definitionExpression)
+     */
     definitionExpression?: string;
+    /**
+     * An array of fields in the layer for which a [Domain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html) has been defined.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#domainFields)
+     */
     domainFields?: FieldProperties[];
+    /**
+     * An array of fields in the layer. Each field represents an attribute that may contain a value for each raster in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#fields)
+     */
     fields?: FieldProperties[];
+    /**
+     * The output image type. The default value is `lerc` if a [pixelFilter](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#pixelFilter) is set on the layer.  **Known Values:** png | png8 | png24 | png32 | jpg | bmp | gif | jpgpng | lerc
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#format)
+     * 
+     * @default jpgpng
+     */
     format?: string;
+    /**
+     * The full extent of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#fullExtent)
+     */
     fullExtent?: ExtentProperties;
+    /**
+     * Indicates if the Image Service has [multidimensionalInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#multidimensionalInfo).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#hasMultidimensions)
+     */
     hasMultidimensions?: boolean;
+    /**
+     * Indicates if the Image Service has a [raster attribute table](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTable). If `true`, the raster attribute table can be accessed with the [rasterAttributeTable](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTable) property after the layer has [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#loaded).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#hasRasterAttributeTable)
+     */
     hasRasterAttributeTable?: boolean;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#imageMaxHeight)
+     * 
+     * @default 4100
+     */
     imageMaxHeight?: number;
+    /**
+     * Indicates the maximum width of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#imageMaxWidth)
+     * 
+     * @default 15000
+     */
     imageMaxWidth?: number;
+    /**
+     * Defines how overlapping images should be mosaicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#mosaicRule)
+     */
     mosaicRule?: MosaicRuleProperties;
+    /**
+     * The multidimensional information associated with the service. This will have a value if `serviceInfo` has `hasMultidimensionalInfo = true`.  If defined, multidimensional information contains various "dimensions" of data for a particular value, such as time, depth, altitude, etc. Defining slices of particular dimensions in the layer is handled with the [multidimensionalDefinition](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#multidimensionalDefinition) property of the [mosaicRule](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#mosaicRule).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#multidimensionalInfo)
+     */
     multidimensionalInfo?: any;
+    /**
+     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#pixelType)
+     */
     pixelType?: string;
+    /**
+     * The popup template for the layer. When set on the layer, the popupTemplate allows users to access attributes and display their values using text and/or charts in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a pixel is clicked. See [this sample](https://developers.arcgis.com/javascript/latest/sample-code/layers-imagery-popup/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with an [ImageryLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * The raster attribute table associated with the service. To access the raster attribute table, the layer must be [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#loaded).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTable)
+     */
     rasterAttributeTable?: any;
+    /**
+     * Prefix used to define the fields from the raster attribute table. It's primarily used for [popups](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterAttributeTableFieldPrefix)
+     * 
+     * @default Raster.
+     */
     rasterAttributeTableFieldPrefix?: string;
+    /**
+     * A complete list of fields that consists of fields from the layer, pixel value fields and the attribute table fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#rasterFields)
+     */
     rasterFields?: FieldProperties[];
+    /**
+     * Specifies the rule for how the requested image should be rendered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#renderingRule)
+     */
     renderingRule?: RasterFunctionProperties;
-    spatialReference?: SpatialReferenceProperties;
+    /**
+     * The URL to the REST endpoint of the layer. The URL may either point to a resource on ArcGIS for Server, Portal for ArcGIS, or ArcGIS Online.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISImageService.html#url)
+     */
     url?: string;
-    version?: number;
   }
 
   interface ArcGISMapService {
+    /**
+     * The copyright text as defined by the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#copyright)
+     */
     copyright: string;
+    /**
+     * The full extent of the layer as defined by the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#fullExtent)
+     */
     fullExtent: Extent;
-    spatialReference: SpatialReference;
-    token: string;
+    /**
+     * The spatial reference of the layer as defined by the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#spatialReference)
+     */
+    readonly spatialReference: SpatialReference;
+    /**
+     * Token generated by the token service using the specified userId and password. The recommended approach to pass a token on a layer is to use [IdentityManager.registerToken()](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#registerToken).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#token)
+     */
+    readonly token: string;
   }
 
   interface ArcGISMapServiceConstructor {
+
+
     new(properties?: ArcGISMapServiceProperties): ArcGISMapService;
 
     fromJSON(json: any): ArcGISMapService;
@@ -2141,17 +8257,32 @@ declare namespace __esri {
   export const ArcGISMapService: ArcGISMapServiceConstructor;
 
   interface ArcGISMapServiceProperties {
+    /**
+     * The copyright text as defined by the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#copyright)
+     */
     copyright?: string;
+    /**
+     * The full extent of the layer as defined by the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#fullExtent)
+     */
     fullExtent?: ExtentProperties;
-    spatialReference?: SpatialReferenceProperties;
-    token?: string;
   }
 
   interface PortalLayer {
+    /**
+     * The portal item from which the layer is loaded. If the portal item references a Feature Service or Scene Service, then you can specify a single layer to load with the [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-PortalLayer.html#layerId) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-PortalLayer.html#portalItem)
+     */
     portalItem: PortalItem;
   }
 
   interface PortalLayerConstructor {
+
+
     new(properties?: PortalLayerProperties): PortalLayer;
 
     fromJSON(json: any): PortalLayer;
@@ -2160,35 +8291,149 @@ declare namespace __esri {
   export const PortalLayer: PortalLayerConstructor;
 
   interface PortalLayerProperties {
+    /**
+     * The portal item from which the layer is loaded. If the portal item references a Feature Service or Scene Service, then you can specify a single layer to load with the [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-PortalLayer.html#layerId) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-PortalLayer.html#portalItem)
+     */
     portalItem?: PortalItemProperties;
   }
 
+  interface RefreshableLayer {
+    /**
+     * Refresh interval of the layer in minutes. Minimum refresh interval is 0.1 minute (6 seconds). Value of `0` indicates no refresh. 
+     * > **Known Limitations**  Refreshing is only supported in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-RefreshableLayer.html#refreshInterval)
+     * 
+     * @default 0
+     */
+    refreshInterval: number;
+
+    /**
+     * Fetches all the data for the layer. 
+     * > **Known Limitations**  Refreshing is only supported in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-RefreshableLayer.html#refresh)
+     * 
+     * 
+     */
+    refresh(): void;
+  }
+
+  interface RefreshableLayerConstructor {
+
+
+    new(): RefreshableLayer;
+  }
+
+  export const RefreshableLayer: RefreshableLayerConstructor;
+
+  interface RefreshableLayerProperties {
+    /**
+     * Refresh interval of the layer in minutes. Minimum refresh interval is 0.1 minute (6 seconds). Value of `0` indicates no refresh. 
+     * > **Known Limitations**  Refreshing is only supported in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-RefreshableLayer.html#refreshInterval)
+     * 
+     * @default 0
+     */
+    refreshInterval?: number;
+  }
+
   interface ScaleRangeLayer {
+    /**
+     * The maximum scale at which the layer is visible in the view. If the map is zoomed in beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ScaleRangeLayer.html#maxScale)
+     * 
+     * @default 0
+     */
     maxScale: number;
+    /**
+     * The minimum scale at which the layer is visible in the view. If the map is zoomed out beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a minimum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ScaleRangeLayer.html#minScale)
+     * 
+     * @default 0
+     */
     minScale: number;
   }
 
   interface ScaleRangeLayerConstructor {
+
+
     new(): ScaleRangeLayer;
   }
 
   export const ScaleRangeLayer: ScaleRangeLayerConstructor;
 
   interface ScaleRangeLayerProperties {
+    /**
+     * The maximum scale at which the layer is visible in the view. If the map is zoomed in beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ScaleRangeLayer.html#maxScale)
+     * 
+     * @default 0
+     */
     maxScale?: number;
+    /**
+     * The minimum scale at which the layer is visible in the view. If the map is zoomed out beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a minimum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ScaleRangeLayer.html#minScale)
+     * 
+     * @default 0
+     */
     minScale?: number;
   }
 
   interface SceneService {
+    /**
+     * The copyright text as defined by the scene service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#copyright)
+     */
     copyright: string;
+    /**
+     * The layer ID, or layer index, of a Scene Service layer. This is particularly useful when loading a single SceneLayer with the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#portalItem) property from a service containing multiple layers. You can specify this value in one of two scenarios: 
+     *   * When loading the layer via the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#portalItem) property.
+     *   * When pointing the layer [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#url) directly to the Scene Service.
+     *   
+     *   
+     * If a layerId is not specified in either of the above scenarios, then the first layer in the service (`layerId = 0`) is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#layerId)
+     */
     layerId: number;
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#spatialReference)
+     */
     spatialReference: SpatialReference;
-    token: string;
+    /**
+     * Token generated by the token service using the specified userId and password. The recommended approach to pass a token on a layer is to use [IdentityManager.registerToken()](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#registerToken).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#token)
+     */
+    readonly token: string;
+    /**
+     * The URL of the REST endpoint of the layer or scene service. The URL may either point to a resource on ArcGIS Server, Portal for ArcGIS, or ArcGIS Online.  The layer may be specified using the [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#layerId) property when the url points directly to a service and not a specific layer. If [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#layerId) is not specified, then it will default to the first layer in the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#url)
+     */
     url: string;
-    version: SceneServiceVersion;
+    /**
+     * The version of the scene service specification used for this service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#version)
+     */
+    readonly version: SceneServiceVersion;
   }
 
   interface SceneServiceConstructor {
+
+
     new(properties?: SceneServiceProperties): SceneService;
 
     fromJSON(json: any): SceneService;
@@ -2197,28 +8442,77 @@ declare namespace __esri {
   export const SceneService: SceneServiceConstructor;
 
   interface SceneServiceProperties {
+    /**
+     * The copyright text as defined by the scene service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#copyright)
+     */
     copyright?: string;
+    /**
+     * The layer ID, or layer index, of a Scene Service layer. This is particularly useful when loading a single SceneLayer with the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#portalItem) property from a service containing multiple layers. You can specify this value in one of two scenarios: 
+     *   * When loading the layer via the [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#portalItem) property.
+     *   * When pointing the layer [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#url) directly to the Scene Service.
+     *   
+     *   
+     * If a layerId is not specified in either of the above scenarios, then the first layer in the service (`layerId = 0`) is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#layerId)
+     */
     layerId?: number;
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
-    token?: string;
+    /**
+     * The URL of the REST endpoint of the layer or scene service. The URL may either point to a resource on ArcGIS Server, Portal for ArcGIS, or ArcGIS Online.  The layer may be specified using the [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#layerId) property when the url points directly to a service and not a specific layer. If [layerId](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#layerId) is not specified, then it will default to the first layer in the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#url)
+     */
     url?: string;
-    version?: SceneServiceVersion;
   }
 
-  export interface SceneServiceVersion {
+
+  export interface SceneServiceVersion extends Object {
+    /**
+     * The major version of the scene layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#version)
+     */
     major: number;
+    /**
+     * The minor version of the scene layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#version)
+     */
     minor: number;
+    /**
+     * The complete version string of the scene layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-SceneService.html#version)
+     */
     versionString: string;
   }
 
   interface OpenStreetMapLayer extends WebTileLayer {
+
     on(name: "layerview-create", eventHandler: OpenStreetMapLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: OpenStreetMapLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: OpenStreetMapLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: OpenStreetMapLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface OpenStreetMapLayerConstructor {
+    /**
+     * Allows you to use [basemaps](http://wiki.openstreetmap.org/wiki/List_of_OSM-based_services) from [OpenStreetMap](http://www.openstreetmap.org/). Set the [tileservers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-OpenStreetMapLayer.html#tileServers) property to change which OpenStreetMap tiles you want to use.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-OpenStreetMapLayer.html)
+     */
+
     new(properties?: OpenStreetMapLayerProperties): OpenStreetMapLayer;
 
     fromJSON(json: any): OpenStreetMapLayer;
@@ -2231,28 +8525,64 @@ declare namespace __esri {
   }
 
   export interface OpenStreetMapLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface OpenStreetMapLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface PointCloudLayer extends Layer, SceneService, PortalLayer {
+    /**
+     * Specifies how points are placed on the vertical axis (z). This property only affects [PointCloudLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html) when using the `absolute-height` mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#elevationInfo)
+     */
     elevationInfo: PointCloudLayerElevationInfo;
+    /**
+     * An array of fields accessible in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#fields)
+     */
     fields: Field[];
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each point in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#renderer)
+     */
     renderer: PointCloudRenderer;
 
+
     on(name: "layerview-create", eventHandler: PointCloudLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: PointCloudLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: PointCloudLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: PointCloudLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface PointCloudLayerConstructor {
+    /**
+     * The PointCloudLayer is designed for visualizing large collections of points in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html)
+     */
+
     new(properties?: PointCloudLayerProperties): PointCloudLayer;
 
     fromJSON(json: any): PointCloudLayer;
@@ -2261,56 +8591,248 @@ declare namespace __esri {
   export const PointCloudLayer: PointCloudLayerConstructor;
 
   interface PointCloudLayerProperties extends LayerProperties, SceneServiceProperties, PortalLayerProperties {
+    /**
+     * Specifies how points are placed on the vertical axis (z). This property only affects [PointCloudLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html) when using the `absolute-height` mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#elevationInfo)
+     */
     elevationInfo?: PointCloudLayerElevationInfo;
+    /**
+     * An array of fields accessible in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#fields)
+     */
     fields?: FieldProperties[];
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled?: boolean;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each point in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#renderer)
+     */
     renderer?: PointCloudRendererProperties;
   }
 
   export interface PointCloudLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface PointCloudLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface PointCloudLayerElevationInfo {
+
+  export interface PointCloudLayerElevationInfo extends Object {
+    /**
+     * Defines how the points are placed on the vertical axis (z). Currently only `absolute-height` mode is supported. 
+     * 
+     * Mode | Description
+     * ------|------------
+     * absolute-height | Points are placed at an absolute height above sea level. This height is determined by summing up the `offset` value and the point's z-value. It doesn't take the elevation of the terrain into account. This is the only supported elevation mode for a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#elevationInfo)
+     */
     mode: string;
+    /**
+     * An elevation offset, which is added to the vertical position of each point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#elevationInfo)
+     * 
+     * @default 0
+     */
     offset?: number;
+    /**
+     * The unit for `offset` values.  **Possible Values:** feet | meters | kilometers | miles | us-feet | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html#elevationInfo)
+     * 
+     * @default meters
+     */
+    unit?: string;
   }
 
   interface SceneLayer extends Layer, SceneService, PortalLayer {
+    /**
+     * The SQL where clause used to filter features on the client. Only the features that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). Setting a definition expression is useful when only a subset of the data in the layer should be displayed.  Setting the definition expression of a layer automatically updates all layer views.  If the definition expression is set after the layer has been added to the map, the view will automatically refresh itself to display the features that satisfy the new definition expression.  Important to note is that the initial loading time of the features remains unchanged, even if they are filtered. This happens because, as opposed to Feature Layers, feature filtering is done client-side. As a result all features need to be downloaded always for filter evaluation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#definitionExpression)
+     */
     definitionExpression: string;
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.  This property only affects 3D Object [SceneLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) when using the `absolute-height` mode. [SceneLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries support all the elevation modes listed below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#elevationInfo)
+     */
     elevationInfo: SceneLayerElevationInfo;
+    /**
+     * Configures the method for decluttering overlapping features in the view. If this property is not set (or set to `null`), every feature is drawn individually.  This property is only supported for point scene layers with non-draped [Icon](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html) or [Text](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html) symbol layers.  [![declutter](https://developers.arcgis.com/javascript/latest/assets/img/samples/city-points-declutter.gif)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-point-styles/index.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#featureReduction)
+     */
     featureReduction: SceneLayerFeatureReduction;
+    /**
+     * An array of fields accessible in the layer. Depending on the scene service, fields may have limited support for certain capabilities. Use [getFieldUsageInfo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#getFieldUsageInfo) to query the contexts (rendering, labeling, popups or querying) for which a particular field may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#fields)
+     */
     fields: Field[];
+    /**
+     * The geometry type of features in the layer.  **Possible Values:** point | mesh
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType)
+     */
     geometryType: string;
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html). Use this property to specify labeling properties for the layer such as label expression, placement, and size.  For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelsVisible) property of this layer must be set to `true`. 
+     * > **Known Limitations**  This property is only relevant to SceneLayers with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries. This property has no effect on SceneLayers with other geometry types.  Each point can have only one label. Multiple [Label classes](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) with different [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where) clauses can be used to have different label styles on different features that belong to the same layer (for example blue labels for lakes and green labels for parks).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelingInfo)
+     */
     labelingInfo: LabelClass[];
+    /**
+     * Indicates whether to display labels for this layer. If `true`, labels will appear as defined in the [labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelingInfo) property.  This property is only relevant to SceneLayers with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries. This property has no effect on SceneLayers with other geometry types.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible: boolean;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * The name of the field containing each graphic's Object ID. If this is not explicitly specified, this is automatically derived from the [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#fields) of the service by taking the first field of type `oid`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#objectIdField)
+     */
     objectIdField: string;
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled: boolean;
+    /**
+     * The popup template for the layer. When set on the layer, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a feature is selected using text and/or charts. See the [PopupTemplate sample](https://developers.arcgis.com/javascript/latest/sample-code/intro-popuptemplate/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). Setting a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) on this layer type is done in the same way as a FeatureLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each feature in the layer. Depending on the renderer type, features may be visualized with the same symbol, or with varying symbols based on the values of provided attribute fields or functions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#renderer)
+     */
     renderer: Renderer;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective. As screen size perspective changes the size based on distance to the camera, it should be set to false when using {@link module:esri/renderers/Renderer#SizeVisualVariable size visual variables}.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled: boolean;
 
+    /**
+     * Creates a query object that can be used to fetch features that satisfy the layer's current definition expression. The query should only be used on the layer and not on the layer view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#createQuery)
+     * 
+     * 
+     */
     createQuery(): Query;
+    /**
+     * Gets field usage information. The usage of a field depends on whether it is stored as part of the scene service cache. The returned object contains the following usage information: 
+     * 
+     * Property              | Type    | Description
+     * ----------------------|---------|------------
+     * supportsRenderer      | boolean | Indicates that a field can be used in a renderer (e.g. in visual variables), [see renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#renderer).
+     * supportsLabelingInfo  | boolean | Indicates that a field can be used for labeling, [see labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelingInfo).
+     * supportsPopupTemplate | boolean | Indicates that a field can be used in a popup template, [see popupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#popupTemplate).
+     * supportsLayerQuery    | boolean | Indicates that a field can be used in layer queries, [see queryFeatures()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryFeatures).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#getFieldUsageInfo)
+     * 
+     * @param fieldName The name of the field to get usage info for.
+     * 
+     */
     getFieldUsageInfo(fieldName: string): any;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the service and returns the 2D [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of features that satisfy the query. At the moment the 3D Extent can be returned by using [SceneLayerView.queryExtent()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-SceneLayerView.html#queryExtent), but this will return the 3D extent only for features currently in the view. The query succeeds only if the layer's `supportsLayerQuery` capability is enabled. Use the [getFieldUsageInfo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#getFieldUsageInfo) method to check if the layer supports queries. If querying is not enabled, then an error with the name `scenelayer:query-not-available` is thrown. Read more about queries in the Query section of the class description above.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryExtent)
+     * 
+     * @param params Specifies the query parameters.
+     * 
+     */
     queryExtent(params?: Query): IPromise<any>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the service and returns the number of the features that satisfy the query. The query succeeds only if the layer's `supportsLayerQuery` capability is enabled. Use the [getFieldUsageInfo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#getFieldUsageInfo) method to check if the layer supports queries. If querying is not enabled, then an error with the name `scenelayer:query-not-available` is thrown. Read more about queries in the Query section of the class description above.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryFeatureCount)
+     * 
+     * @param params Specifies the query parameters.
+     * 
+     */
     queryFeatureCount(params?: Query): IPromise<number>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the service and returns a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). The query succeeds only if the layer's `supportsLayerQuery` capability is enabled. Use the [getFieldUsageInfo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#getFieldUsageInfo) method to check if the layer supports queries. If querying is not enabled, then an error with the name `scenelayer:query-not-available` is thrown. Read more about queries in the Query section of the class description above.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryFeatures)
+     * 
+     * @param params Specifies the query parameters.
+     * 
+     */
     queryFeatures(params?: Query): IPromise<FeatureSet>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the service and returns an array of the ObjectIDs of features that satisfy the input query. The query succeeds only if the layer's `supportsLayerQuery` capability is enabled. Use the [getFieldUsageInfo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#getFieldUsageInfo) method to check if the layer supports queries. If querying is not enabled, then an error with the name `scenelayer:query-not-available` is thrown. Read more about queries in the Query section of the class description above.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryObjectIds)
+     * 
+     * @param params Specifies the query parameters.
+     * 
+     */
     queryObjectIds(params?: Query): IPromise<number[]>;
 
+
     on(name: "layerview-create", eventHandler: SceneLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: SceneLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: SceneLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: SceneLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface SceneLayerConstructor {
+    /**
+     * The SceneLayer is a layer type designed for on-demand streaming and displaying large amounts of data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). SceneLayers support two geometry types: [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) and 3D Objects (e.g. Buildings).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html)
+     */
+
     new(properties?: SceneLayerProperties): SceneLayer;
 
     fromJSON(json: any): SceneLayer;
@@ -2319,55 +8841,209 @@ declare namespace __esri {
   export const SceneLayer: SceneLayerConstructor;
 
   interface SceneLayerProperties extends LayerProperties, SceneServiceProperties, PortalLayerProperties {
+    /**
+     * The SQL where clause used to filter features on the client. Only the features that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). Setting a definition expression is useful when only a subset of the data in the layer should be displayed.  Setting the definition expression of a layer automatically updates all layer views.  If the definition expression is set after the layer has been added to the map, the view will automatically refresh itself to display the features that satisfy the new definition expression.  Important to note is that the initial loading time of the features remains unchanged, even if they are filtered. This happens because, as opposed to Feature Layers, feature filtering is done client-side. As a result all features need to be downloaded always for filter evaluation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#definitionExpression)
+     */
     definitionExpression?: string;
+    /**
+     * Specifies how graphics are placed on the vertical axis (z). See the [ElevationInfo sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-elevationinfo/index.html) for an example of how this property may be used.  This property only affects 3D Object [SceneLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) when using the `absolute-height` mode. [SceneLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries support all the elevation modes listed below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#elevationInfo)
+     */
     elevationInfo?: SceneLayerElevationInfo;
+    /**
+     * Configures the method for decluttering overlapping features in the view. If this property is not set (or set to `null`), every feature is drawn individually.  This property is only supported for point scene layers with non-draped [Icon](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html) or [Text](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html) symbol layers.  [![declutter](https://developers.arcgis.com/javascript/latest/assets/img/samples/city-points-declutter.gif)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-point-styles/index.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#featureReduction)
+     */
     featureReduction?: SceneLayerFeatureReduction;
+    /**
+     * An array of fields accessible in the layer. Depending on the scene service, fields may have limited support for certain capabilities. Use [getFieldUsageInfo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#getFieldUsageInfo) to query the contexts (rendering, labeling, popups or querying) for which a particular field may be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#fields)
+     */
     fields?: FieldProperties[];
+    /**
+     * The geometry type of features in the layer.  **Possible Values:** point | mesh
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType)
+     */
     geometryType?: string;
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html). Use this property to specify labeling properties for the layer such as label expression, placement, and size.  For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelsVisible) property of this layer must be set to `true`. 
+     * > **Known Limitations**  This property is only relevant to SceneLayers with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries. This property has no effect on SceneLayers with other geometry types.  Each point can have only one label. Multiple [Label classes](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) with different [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where) clauses can be used to have different label styles on different features that belong to the same layer (for example blue labels for lakes and green labels for parks).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelingInfo)
+     */
     labelingInfo?: LabelClassProperties[];
+    /**
+     * Indicates whether to display labels for this layer. If `true`, labels will appear as defined in the [labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelingInfo) property.  This property is only relevant to SceneLayers with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries. This property has no effect on SceneLayers with other geometry types.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible?: boolean;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled?: boolean;
+    /**
+     * The name of the field containing each graphic's Object ID. If this is not explicitly specified, this is automatically derived from the [fields](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#fields) of the service by taking the first field of type `oid`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#objectIdField)
+     */
     objectIdField?: string;
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled?: boolean;
+    /**
+     * The popup template for the layer. When set on the layer, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when a feature is selected using text and/or charts. See the [PopupTemplate sample](https://developers.arcgis.com/javascript/latest/sample-code/intro-popuptemplate/index.html) for an example of how [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) interacts with a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). Setting a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) on this layer type is done in the same way as a FeatureLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * The renderer assigned to the layer. The renderer defines how to visualize each feature in the layer. Depending on the renderer type, features may be visualized with the same symbol, or with varying symbols based on the values of provided attribute fields or functions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#renderer)
+     */
     renderer?: RendererProperties;
+    /**
+     * Apply perspective scaling to screen-size point symbols in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). When `true`, screen sized objects such as [icons](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [labels](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) or [callouts](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html) integrate better in the 3D scene by applying a certain perspective projection to the sizing of features. This only applies when using a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  `layer.screenSizePerspectiveEnabled = true`  ![screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-screenSize-perspective.png)  `layer.screenSizePerspectiveEnabled = false`  ![no-screen-size-perspective](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-no-screenSize-perspective.png) 
+     * > **Known Limitations**  Screen size perspective is currently not optimized for situations where the camera is very near the ground, or for scenes with point features located far from the ground surface. In these cases it may be better to turn off screen size perspective. As screen size perspective changes the size based on distance to the camera, it should be set to false when using {@link module:esri/renderers/Renderer#SizeVisualVariable size visual variables}.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#screenSizePerspectiveEnabled)
+     * 
+     * @default true
+     */
     screenSizePerspectiveEnabled?: boolean;
   }
 
   export interface SceneLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface SceneLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface SceneLayerElevationInfo {
+
+  export interface SceneLayerElevationInfo extends Object {
+    /**
+     * Defines how the graphic is placed with respect to the terrain surface. See the table below for a list of possible values. 
+     * 
+     * Mode | Description
+     * ------|------------
+     * on-the-ground | Graphics are draped on the terrain surface. This is the default value for features with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries rendered with [ObjectSymbol3DLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html).
+     * relative-to-ground | The graphic is placed at an elevation relative to the terrain surface. The graphic's elevation is determined by summing up the terrain elevation, the `offset` value and the geometry's z-value (if present). This is the default value for [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries rendered with [IconSymbol3DLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html).
+     * absolute-height | Graphics are placed at an absolute height above sea level. This height is determined by summing up the `offset` value and the geometry's z-value (if present). It doesn't take the elevation of the terrain into account. This is the default value for features with 3D Object geometries and [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries where [hasZ](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#hasZ) is `true`.
+     * relative-to-scene | Graphics are aligned to buildings and other objects part of 3D Object [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) or [IntegratedMeshLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-IntegratedMeshLayer.html), depending on which has higher elevation. If the graphic is not directly above a building or any other feature, it is aligned to the terrain surface elevation. If present, z-values will be ignored.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#elevationInfo)
+     */
     mode: string;
+    /**
+     * An elevation offset which is added to the vertical position of the graphic. When `mode = "on-the-ground"`, this property has no effect.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#elevationInfo)
+     * 
+     * @default 0
+     */
     offset?: number;
+    /**
+     * The unit for `offset` values.  **Possible Values:** feet | meters | kilometers | miles | us-feet | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#elevationInfo)
+     * 
+     * @default meters
+     */
+    unit?: string;
   }
 
-  export interface SceneLayerFeatureReduction {
+
+  export interface SceneLayerFeatureReduction extends Object {
+    /**
+     * Type of the decluttering method. The only supported type at the moment is `"selection"`. In this method, some of the overlapping features are hidden such that none of the remaining features intersect on screen. Label deconfliction also respects this option and hides labels that would overlap with the features of this layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#featureReduction)
+     */
     type: string;
   }
 
   interface StreamLayer extends FeatureLayer {
-    filter: StreamLayerFilter;
+    /**
+     * Contains the attribute and spatial filters used to filter messages sent to the client by a Stream Service. This property can be set in the constructor but is `read-only` after the layer is created. To change the filter after the layer is created, use the [updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter)
+     */
+    readonly filter: StreamLayerFilter;
+    /**
+     * An extent object used to filter features. Only features intersecting the extent are displayed in the view. Instead of using this property, use [StreamLayer.filter.geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter) when creating the service or [StreamLayer.updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter) when changing the spatial filter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#geometryDefinition)
+     */
     geometryDefinition: Extent;
+    /**
+     * Maximum number of features to show per trackId
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#maximumTrackPoints)
+     */
     maximumTrackPoints: number;
+    /**
+     * Options for purging stale features. Use these options to avoid overloading the browser with graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#purgeOptions)
+     */
     purgeOptions: StreamLayerPurgeOptions;
 
+    /**
+     * Updates the [filter](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter) on the layer. The filter is updated on all views that contain the layer. If the input `filterChanges` object is `undefined` or `null`, the spatial and attribute filters are removed. To update the filter on a single layer view associated with the layer, use the [StreamLayerView.updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#updateFilter) method after getting the layer view object.  Filter changes only apply to incoming features. Features already displayed in the view are not filtered. Therefore, you may want to clear the graphics in the layer view prior to applying a new filter. To do so, get the layer view then call [removeAll()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#removeAll) on the [StreamLayerView.graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#graphics). You may also filter features already present in the view using the [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) methods. See the examples below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter)
+     * 
+     * @param filterChanges Updates the spatial and attribute [filters](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter) on the layer and all of its associated views. If `null`, all filters are cleared.
+     * @param filterChanges.geometry A spatial filter for filtering features. Only features that intersect the given geometry are displayed in the view(s). If `null`, the spatial filter is cleared.
+     * @param filterChanges.where A SQL where clause used to filter features by attributes. If `null`, the attribute filter is cleared.
+     * 
+     */
     updateFilter(filterChanges: StreamLayerUpdateFilterFilterChanges): IPromise<any>;
 
+
     on(name: "layerview-create", eventHandler: StreamLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: StreamLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: StreamLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: StreamLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface StreamLayerConstructor {
+    /**
+     * The stream layer extends the feature layer to add the ability to connect to a stream of data using HTML5 WebSockets. It connects to a server that emits geographic features continuously. While the feature layer is used to map relatively static data, the stream layer is suitable when you would like to map dynamic streams of data that are unbounded and continuous. When a stream layer is added to a map, users are able to see real-time updates pushed out by the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html)
+     */
+
     new(properties?: StreamLayerProperties): StreamLayer;
 
     fromJSON(json: any): StreamLayer;
@@ -2376,44 +9052,116 @@ declare namespace __esri {
   export const StreamLayer: StreamLayerConstructor;
 
   interface StreamLayerProperties extends FeatureLayerProperties {
+    /**
+     * Contains the attribute and spatial filters used to filter messages sent to the client by a Stream Service. This property can be set in the constructor but is `read-only` after the layer is created. To change the filter after the layer is created, use the [updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter)
+     */
     filter?: StreamLayerFilter;
+    /**
+     * An extent object used to filter features. Only features intersecting the extent are displayed in the view. Instead of using this property, use [StreamLayer.filter.geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter) when creating the service or [StreamLayer.updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter) when changing the spatial filter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#geometryDefinition)
+     */
     geometryDefinition?: ExtentProperties;
+    /**
+     * Maximum number of features to show per trackId
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#maximumTrackPoints)
+     */
     maximumTrackPoints?: number;
+    /**
+     * Options for purging stale features. Use these options to avoid overloading the browser with graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#purgeOptions)
+     */
     purgeOptions?: StreamLayerPurgeOptions;
   }
 
   export interface StreamLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface StreamLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface StreamLayerFilter {
+
+  export interface StreamLayerFilter extends Object {
+    /**
+     * A spatial filter for filtering features. Only features that intersect the given geometry are displayed in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter)
+     */
     geometry?: Extent;
+    /**
+     * A SQL where clause used to filter features by attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#filter)
+     */
     where?: string;
   }
 
-  export interface StreamLayerPurgeOptions {
+
+  export interface StreamLayerPurgeOptions extends Object {
+    /**
+     * The maximum number of features to display. Excess features are purged from the beginning of the graphics array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#purgeOptions)
+     */
     displayCount: number;
+    /**
+     * The maximum time in minutes that a feature should be kept. After this time, the feature is removed from the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#purgeOptions)
+     */
     age: number;
   }
 
-  export interface StreamLayerUpdateFilterFilterChanges {
+
+  export interface StreamLayerUpdateFilterFilterChanges extends Object {
+    /**
+     * A spatial filter for filtering features. Only features that intersect the given geometry are displayed in the view(s). If `null`, the spatial filter is cleared.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter)
+     */
     geometry: Extent;
+    /**
+     * A SQL where clause used to filter features by attributes. If `null`, the attribute filter is cleared.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter)
+     */
     where: string;
   }
 
   interface CodedValueDomain extends Domain {
+    /**
+     * An array of the coded values in the domain. See the object specification table below for the properties each item in the array should contain.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html#codedValues)
+     */
     codedValues: CodedValueDomainCodedValues[];
 
+    /**
+     * Returns the name of the coded-value associated with the specified code.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html#getName)
+     * 
+     * @param code The code associated with the desired name.
+     * 
+     */
     getName(code: string | number): string;
   }
 
   interface CodedValueDomainConstructor {
+
+
     new(properties?: CodedValueDomainProperties): CodedValueDomain;
 
     fromJSON(json: any): CodedValueDomain;
@@ -2422,35 +9170,99 @@ declare namespace __esri {
   export const CodedValueDomain: CodedValueDomainConstructor;
 
   interface CodedValueDomainProperties extends DomainProperties {
+    /**
+     * An array of the coded values in the domain. See the object specification table below for the properties each item in the array should contain.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html#codedValues)
+     */
     codedValues?: CodedValueDomainCodedValues[];
   }
 
-  export interface CodedValueDomainCodedValues {
+
+  export interface CodedValueDomainCodedValues extends Object {
+    /**
+     * The name of the coded value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html#codedValues)
+     */
     name: string;
+    /**
+     * The value of the code.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html#codedValues)
+     */
     code: string | number;
   }
 
   interface DimensionalDefinition {
+    /**
+     * The dimension associated with the variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-DimensionalDefinition.html#dimensionName)
+     */
     dimensionName: string;
+    /**
+     * Indicates whether the values indicate slices (rather than ranges).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-DimensionalDefinition.html#isSlice)
+     * 
+     * @default false
+     */
     isSlice: boolean;
+    /**
+     * An array of tuples [min, max] each defining a range of valid values along the specified dimension.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-DimensionalDefinition.html#values)
+     */
     values: any[];
+    /**
+     * The variable name by which to filter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-DimensionalDefinition.html#variableName)
+     */
     variableName: string;
 
+    /**
+     * Returns a serialized JSON object representation of the dimensional definition in the format of the ArcGIS Platform.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-DimensionalDefinition.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface DimensionalDefinitionConstructor {
+    /**
+     * A dimensional definition defines a filter based on one variable and one dimension. You can filter with one or multiple dimensional slices. Instances of this class are typically used when filtering data based on [slices](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-DimensionalDefinition.html#isSlice) or ranges in one or more dimensions with [MosaicRule](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-DimensionalDefinition.html)
+     */
+
+
     new(properties?: any): DimensionalDefinition;
   }
 
   export const DimensionalDefinition: DimensionalDefinitionConstructor;
 
   interface Domain extends Accessor, JSONSupport {
+    /**
+     * The domain name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html#name)
+     */
     name: string;
+    /**
+     * The domain type.  **Possible Values:** range | coded-value | inherited
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html#type)
+     */
     type: string;
   }
 
   interface DomainConstructor {
+
+
     new(properties?: DomainProperties): Domain;
 
     fromJSON(json: any): Domain;
@@ -2459,19 +9271,56 @@ declare namespace __esri {
   export const Domain: DomainConstructor;
 
   interface DomainProperties {
+    /**
+     * The domain name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html#name)
+     */
     name?: string;
+    /**
+     * The domain type.  **Possible Values:** range | coded-value | inherited
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Domain.html#type)
+     */
     type?: string;
   }
 
   interface FeatureTemplate extends Accessor, JSONSupport {
+    /**
+     * Description of the feature template.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#description)
+     */
     description: string;
+    /**
+     * Name of the default drawing tool defined for the template to create a feature.  **Known Values:** auto-complete-polygon | circle | ellipse | freehand | line | none | point | polygon | rectangle | arrow | triangle | left-arrow | right-arrow | up-arrow | down-arrow
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#drawingTool)
+     */
     drawingTool: string;
+    /**
+     * Name of the feature template.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#name)
+     */
     name: string;
+    /**
+     * An instance of the prototypical feature described by the [feature template](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html). It specifies default values for the attribute fields and does not contain geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#prototype)
+     */
     prototype: any;
+    /**
+     * An object used to create a thumbnail image that represents a feature type in the feature template.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#thumbnail)
+     */
     thumbnail: FeatureTemplateThumbnail;
   }
 
   interface FeatureTemplateConstructor {
+
+
     new(properties?: FeatureTemplateProperties): FeatureTemplate;
 
     fromJSON(json: any): FeatureTemplate;
@@ -2480,28 +9329,96 @@ declare namespace __esri {
   export const FeatureTemplate: FeatureTemplateConstructor;
 
   interface FeatureTemplateProperties {
+    /**
+     * Description of the feature template.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#description)
+     */
     description?: string;
+    /**
+     * Name of the default drawing tool defined for the template to create a feature.  **Known Values:** auto-complete-polygon | circle | ellipse | freehand | line | none | point | polygon | rectangle | arrow | triangle | left-arrow | right-arrow | up-arrow | down-arrow
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#drawingTool)
+     */
     drawingTool?: string;
+    /**
+     * Name of the feature template.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#name)
+     */
     name?: string;
+    /**
+     * An instance of the prototypical feature described by the [feature template](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html). It specifies default values for the attribute fields and does not contain geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#prototype)
+     */
     prototype?: any;
+    /**
+     * An object used to create a thumbnail image that represents a feature type in the feature template.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#thumbnail)
+     */
     thumbnail?: FeatureTemplateThumbnail;
   }
 
-  export interface FeatureTemplateThumbnail {
+
+  export interface FeatureTemplateThumbnail extends Object {
+    /**
+     * The MIME type of the image.  **Known Values:** image | png | jpg | jpeg
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#thumbnail)
+     */
     contentType: any;
+    /**
+     * The [base64EncodedImageData](https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding) presenting the thumbnail image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#thumbnail)
+     */
     imageData: string;
+    /**
+     * The height of the thumbnail.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#thumbnail)
+     */
     height: number;
+    /**
+     * The width of the thumbnail.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#thumbnail)
+     */
     width: number;
   }
 
   interface FeatureType extends Accessor, JSONSupport {
+    /**
+     * Domains associated with the feature type. It is an object where the name of each property corresponds with the name of a field containing a domain. If a field's domain is an instance of [InheritedDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-InheritedDomain.html), the application will use the domain defined for the field from the layer. If the domain is an instance of [CodedValueDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html) or [RangeDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RangeDomain.html) then the domain is defined specifically for the given feature type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#domains)
+     */
     domains: any;
+    /**
+     * The feature type identifier.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#id)
+     */
     id: number | string;
+    /**
+     * The feature type name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#name)
+     */
     name: string;
+    /**
+     * Array of [feature templates](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html) associated with the feature type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#templates)
+     */
     templates: FeatureTemplate[];
   }
 
   interface FeatureTypeConstructor {
+
+
     new(properties?: FeatureTypeProperties): FeatureType;
 
     fromJSON(json: any): FeatureType;
@@ -2510,23 +9427,80 @@ declare namespace __esri {
   export const FeatureType: FeatureTypeConstructor;
 
   interface FeatureTypeProperties {
+    /**
+     * Domains associated with the feature type. It is an object where the name of each property corresponds with the name of a field containing a domain. If a field's domain is an instance of [InheritedDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-InheritedDomain.html), the application will use the domain defined for the field from the layer. If the domain is an instance of [CodedValueDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-CodedValueDomain.html) or [RangeDomain](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RangeDomain.html) then the domain is defined specifically for the given feature type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#domains)
+     */
     domains?: any;
+    /**
+     * The feature type identifier.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#id)
+     */
     id?: number | string;
+    /**
+     * The feature type name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#name)
+     */
     name?: string;
+    /**
+     * Array of [feature templates](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html) associated with the feature type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureType.html#templates)
+     */
     templates?: FeatureTemplateProperties[];
   }
 
   interface Field extends Accessor, JSONSupport {
+    /**
+     * The alias name for the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#alias)
+     */
     alias: string;
+    /**
+     * The domain associated with the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#domain)
+     */
     domain: Domain;
+    /**
+     * Indicates whether the field is editable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#editable)
+     */
     editable: boolean;
+    /**
+     * The field length.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#length)
+     */
     length: number;
+    /**
+     * The name of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#name)
+     */
     name: string;
+    /**
+     * Indicates if the field can accept `null` values. *Requires ArcGIS Server version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#nullable)
+     */
     nullable: boolean;
+    /**
+     * The data type of the field.  **Possible Values:** small-integer | integer | single | double | long | string | date | oid | geometry | blob | raster | guid | global-id | xml
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#type)
+     */
     type: string;
   }
 
   interface FieldConstructor {
+
+
     new(properties?: FieldProperties): Field;
 
     fromJSON(json: any): Field;
@@ -2535,46 +9509,202 @@ declare namespace __esri {
   export const Field: FieldConstructor;
 
   interface FieldProperties {
+    /**
+     * The alias name for the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#alias)
+     */
     alias?: string;
+    /**
+     * The domain associated with the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#domain)
+     */
     domain?: DomainProperties;
+    /**
+     * Indicates whether the field is editable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#editable)
+     */
     editable?: boolean;
+    /**
+     * The field length.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#length)
+     */
     length?: number;
+    /**
+     * The name of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#name)
+     */
     name?: string;
+    /**
+     * Indicates if the field can accept `null` values. *Requires ArcGIS Server version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#nullable)
+     */
     nullable?: boolean;
+    /**
+     * The data type of the field.  **Possible Values:** small-integer | integer | single | double | long | string | date | oid | geometry | blob | raster | guid | global-id | xml
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#type)
+     */
     type?: string;
   }
 
   interface ImageParameters extends Accessor {
+    /**
+     * Dots per inch setting for an module:esri/layersMapImageLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#dpi)
+     * 
+     * @default 96
+     */
     dpi: number;
+    /**
+     * Extent of map to be exported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#extent)
+     */
     extent: Extent;
+    /**
+     * Map image format.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#format)
+     * 
+     * @default png8
+     */
     format: string;
+    /**
+     * Requested image height in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#height)
+     */
     height: number;
+    /**
+     * Spatial reference of exported map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#imageSpatialReference)
+     */
     imageSpatialReference: SpatialReference;
+    /**
+     * Array of layer definition expressions that allows you to filter the features of individual layers in the exported map image. Layer definitions with semicolons or colons are supported if using a map service published using ArcGIS Server 10 or later.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerDefinitions)
+     */
     layerDefinitions: string[];
+    /**
+     * A list of layer IDs, that represent which layers to include in the exported map. Use in combination with [layerOption](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerOption) to specify how layer visibility is handled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerIds)
+     */
     layerIds: number[];
+    /**
+     * The option for displaying or hiding the layer.  **Known Values:** show | hide | include | exclude
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerOption)
+     */
     layerOption: string;
+    /**
+     * Indicates whether or not the background of the dynamic image is transparent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#transparent)
+     * 
+     * @default true
+     */
     transparent: boolean;
+    /**
+     * Requested image width in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#width)
+     */
     width: number;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface ImageParametersConstructor {
+
+
     new(properties?: ImageParametersProperties): ImageParameters;
   }
 
   export const ImageParameters: ImageParametersConstructor;
 
   interface ImageParametersProperties {
+    /**
+     * Dots per inch setting for an module:esri/layersMapImageLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#dpi)
+     * 
+     * @default 96
+     */
     dpi?: number;
+    /**
+     * Extent of map to be exported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#extent)
+     */
     extent?: ExtentProperties;
+    /**
+     * Map image format.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#format)
+     * 
+     * @default png8
+     */
     format?: string;
+    /**
+     * Requested image height in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#height)
+     */
     height?: number;
+    /**
+     * Spatial reference of exported map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#imageSpatialReference)
+     */
     imageSpatialReference?: SpatialReferenceProperties;
+    /**
+     * Array of layer definition expressions that allows you to filter the features of individual layers in the exported map image. Layer definitions with semicolons or colons are supported if using a map service published using ArcGIS Server 10 or later.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerDefinitions)
+     */
     layerDefinitions?: string[];
+    /**
+     * A list of layer IDs, that represent which layers to include in the exported map. Use in combination with [layerOption](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerOption) to specify how layer visibility is handled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerIds)
+     */
     layerIds?: number[];
+    /**
+     * The option for displaying or hiding the layer.  **Known Values:** show | hide | include | exclude
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerOption)
+     */
     layerOption?: string;
+    /**
+     * Indicates whether or not the background of the dynamic image is transparent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#transparent)
+     * 
+     * @default true
+     */
     transparent?: boolean;
+    /**
+     * Requested image width in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#width)
+     */
     width?: number;
   }
 
@@ -2582,6 +9712,8 @@ declare namespace __esri {
   }
 
   interface InheritedDomainConstructor {
+
+
     new(properties?: InheritedDomainProperties): InheritedDomain;
 
     fromJSON(json: any): InheritedDomain;
@@ -2594,20 +9726,53 @@ declare namespace __esri {
   }
 
   interface KMLSublayer extends Accessor, JSONSupport {
+    /**
+     * Description for the KML sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#description)
+     */
     description: string;
+    /**
+     * The id for the KML sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#id)
+     */
     id: number;
+    /**
+     * The [KMLLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#layer)
+     */
     layer: KMLLayer;
-    mapImages: Collection<any>;
-    networkLink: KMLSublayerNetworkLink;
-    points: Collection<Point>;
-    polygons: Collection<Polygon>;
-    polylines: Collection<Polyline>;
+    /**
+     * Network link info for the current layer. A link info object with properties that describe the network link.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#networkLink)
+     */
+    networkLink: any;
+    /**
+     * A collection of [KMLSublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#sublayers)
+     */
     sublayers: Collection<KMLSublayer>;
+    /**
+     * The title of the KML sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#title)
+     */
     title: string;
+    /**
+     * Indicates if the sublayer is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#visible)
+     */
     visible: boolean;
   }
 
   interface KMLSublayerConstructor {
+
+
     new(properties?: KMLSublayerProperties): KMLSublayer;
 
     fromJSON(json: any): KMLSublayer;
@@ -2616,47 +9781,122 @@ declare namespace __esri {
   export const KMLSublayer: KMLSublayerConstructor;
 
   interface KMLSublayerProperties {
+    /**
+     * Description for the KML sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#description)
+     */
     description?: string;
+    /**
+     * The id for the KML sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#id)
+     */
     id?: number;
+    /**
+     * The [KMLLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#layer)
+     */
     layer?: KMLLayerProperties;
-    mapImages?: CollectionProperties<any>;
-    networkLink?: KMLSublayerNetworkLink;
-    points?: CollectionProperties<PointProperties>;
-    polygons?: CollectionProperties<PolygonProperties>;
-    polylines?: CollectionProperties<PolylineProperties>;
+    /**
+     * Network link info for the current layer. A link info object with properties that describe the network link.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#networkLink)
+     */
+    networkLink?: any;
+    /**
+     * A collection of [KMLSublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#sublayers)
+     */
     sublayers?: CollectionProperties<KMLSublayerProperties>;
+    /**
+     * The title of the KML sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#title)
+     */
     title?: string;
+    /**
+     * Indicates if the sublayer is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-KMLSublayer.html#visible)
+     */
     visible?: boolean;
   }
 
-  export interface KMLSublayerNetworkLink {
-    id: number;
-    name: string;
-    description: string;
-    visibility: number;
-    refreshMode: string;
-    refreshInterval: number;
-    viewRefreshMode: string;
-    viewRefreshTime: number;
-    viewBoundScale: number;
-    viewFormat: string;
-    httpQuery: string;
-  }
-
   interface LabelClass extends Accessor, JSONSupport {
+    /**
+     * Defines the content of label text for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html). If working with [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), use [labelExpressionInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo) instead.  Attribute values may be included in labels using SQL syntax. To include an attribute value in a label, wrap the name of the field in square brackets `[]`. See the example snippet below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpression)
+     */
     labelExpression: string;
+    /**
+     * Defines the content of label text for [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). If working with [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html), use [labelExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpression) instead.  Attribute values may be included in label expressions. To include an attribute value in a label, wrap the name of the field in curly braces. See the example snippet below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo)
+     */
     labelExpressionInfo: LabelClassLabelExpressionInfo;
+    /**
+     * The position of the label. Known values are based on the feature type. This property requires a value for labels to be visible.  **Known Values (Points):** above-center | above-left | above-right | below-center | below-left | below-right | center-center | center-left | center-right  **Known Values (Polylines):**  above-after | above-along | above-before | above-start | above-end | below-after | below-along | below-before | below-start | below-end | center-after | center-along | center-before | center-start | center-end  **Known Values (Polygons):** always-horizontal 
+     * > **Known Limitations**  Currently, if the label has a [line callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html) then only "above-center" is supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelPlacement)
+     */
     labelPlacement: string;
+    /**
+     * The maximum scale to show labels. The value of maxScale should always be less than the value of [minScale](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#minScale). If the value is `0`, then the label's visibility isn't dependent on maximum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#maxScale)
+     * 
+     * @default 0
+     */
     maxScale: number;
+    /**
+     * The minimum scale to show labels. The value of minScale should always be greater than the value of [maxScale](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#maxScale). If the value of this property is `0`, then the visibility of labels isn't dependent on minimum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#minScale)
+     * 
+     * @default 0
+     */
     minScale: number;
+    /**
+     * Defines the symbol used for rendering the label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#symbol)
+     */
     symbol: TextSymbol | LabelSymbol3D;
+    /**
+     * Indicates whether to use domain names if the fields in the [labelExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpression) or [labelExpressionInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo) have domains.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#useCodedValues)
+     */
     useCodedValues: boolean;
+    /**
+     * A SQL where clause used to determine the features to which the label class should be applied. When specified, only features evaluating to `true` based on this expression will be labeled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where)
+     */
     where: string;
 
+    /**
+     * Creates a deep clone of the LabelClass.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#clone)
+     * 
+     * 
+     */
     clone(): LabelClass;
   }
 
   interface LabelClassConstructor {
+    /**
+     * Defines label expressions, symbols, scale ranges, label priorities, and sets of label placement options for different groups of labels on a layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html)
+     */
+
     new(properties?: LabelClassProperties): LabelClass;
 
     fromJSON(json: any): LabelClass;
@@ -2665,29 +9905,107 @@ declare namespace __esri {
   export const LabelClass: LabelClassConstructor;
 
   interface LabelClassProperties {
+    /**
+     * Defines the content of label text for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html). If working with [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), use [labelExpressionInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo) instead.  Attribute values may be included in labels using SQL syntax. To include an attribute value in a label, wrap the name of the field in square brackets `[]`. See the example snippet below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpression)
+     */
     labelExpression?: string;
+    /**
+     * Defines the content of label text for [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). If working with [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html), use [labelExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpression) instead.  Attribute values may be included in label expressions. To include an attribute value in a label, wrap the name of the field in curly braces. See the example snippet below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo)
+     */
     labelExpressionInfo?: LabelClassLabelExpressionInfo;
+    /**
+     * The position of the label. Known values are based on the feature type. This property requires a value for labels to be visible.  **Known Values (Points):** above-center | above-left | above-right | below-center | below-left | below-right | center-center | center-left | center-right  **Known Values (Polylines):**  above-after | above-along | above-before | above-start | above-end | below-after | below-along | below-before | below-start | below-end | center-after | center-along | center-before | center-start | center-end  **Known Values (Polygons):** always-horizontal 
+     * > **Known Limitations**  Currently, if the label has a [line callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html) then only "above-center" is supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelPlacement)
+     */
     labelPlacement?: string;
+    /**
+     * The maximum scale to show labels. The value of maxScale should always be less than the value of [minScale](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#minScale). If the value is `0`, then the label's visibility isn't dependent on maximum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#maxScale)
+     * 
+     * @default 0
+     */
     maxScale?: number;
+    /**
+     * The minimum scale to show labels. The value of minScale should always be greater than the value of [maxScale](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#maxScale). If the value of this property is `0`, then the visibility of labels isn't dependent on minimum scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#minScale)
+     * 
+     * @default 0
+     */
     minScale?: number;
+    /**
+     * Defines the symbol used for rendering the label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#symbol)
+     */
     symbol?: TextSymbolProperties | LabelSymbol3DProperties;
+    /**
+     * Indicates whether to use domain names if the fields in the [labelExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpression) or [labelExpressionInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo) have domains.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#useCodedValues)
+     */
     useCodedValues?: boolean;
+    /**
+     * A SQL where clause used to determine the features to which the label class should be applied. When specified, only features evaluating to `true` based on this expression will be labeled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where)
+     */
     where?: string;
   }
 
-  export interface LabelClassLabelExpressionInfo {
+
+  export interface LabelClassLabelExpressionInfo extends Object {
+    /**
+     * The expression defining the content of the label text.  **Deprecated as of v4.5. Use `expression` instead.**
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo)
+     */
     value?: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression that evaluates to a string used to label features in the layer. The most simple expressions return field values. For example, to label a layer of cities with their names, simply reference the field value with the global variable: `$feature.CITY_NAME`. Expressions can be more sophisticated and use logical functions. This may be useful if you want to use classed labels. For example, the following expression appends `city` to the end of the label if the feature's population field contains a number greater than 10,000. Otherwise, `town` is appended to the end of the label.  `IIF($feature.POPULATION > 10000, $feature.NAME + ' city', $feature.NAME + ' town')`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelExpressionInfo)
+     */
     expression: string;
   }
 
   interface LOD extends Accessor, JSONSupport {
+    /**
+     * ID for each level. The top most level is `0`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#level)
+     */
     level: number;
+    /**
+     * String to be used when constructing a URL to access a tile from this LOD. If `levelValue` is not defined, level will be used for the tile access URL. This property is useful when an LOD object represents a WMTS TileMatrix with non-numeric matrix identifiers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#levelValue)
+     */
     levelValue: string;
+    /**
+     * Resolution in map units of each pixel in a tile for each level.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#resolution)
+     */
     resolution: number;
+    /**
+     * Scale for each level.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#scale)
+     */
     scale: number;
   }
 
   interface LODConstructor {
+
+
     new(properties?: LODProperties): LOD;
 
     fromJSON(json: any): LOD;
@@ -2696,23 +10014,84 @@ declare namespace __esri {
   export const LOD: LODConstructor;
 
   interface LODProperties {
+    /**
+     * ID for each level. The top most level is `0`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#level)
+     */
     level?: number;
+    /**
+     * String to be used when constructing a URL to access a tile from this LOD. If `levelValue` is not defined, level will be used for the tile access URL. This property is useful when an LOD object represents a WMTS TileMatrix with non-numeric matrix identifiers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#levelValue)
+     */
     levelValue?: string;
+    /**
+     * Resolution in map units of each pixel in a tile for each level.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#resolution)
+     */
     resolution?: number;
+    /**
+     * Scale for each level.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html#scale)
+     */
     scale?: number;
   }
 
   interface MapImage extends Accessor, JSONSupport {
+    /**
+     * The extent of the exported map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#extent)
+     */
     extent: Extent;
+    /**
+     * The requested image height in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#height)
+     */
     height: number;
+    /**
+     * URL to the returned image. The image format must be of a type supported by the HTML `<img>` tag.  **Known Values:** gif | jpg | png | bmp
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#href)
+     */
     href: string;
+    /**
+     * The opacity of the image. Value can be any number between `0` and `1` where `0` is 100% transparent, `0.5` is 50% transparent and `1` is fully opaque.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#opacity)
+     * 
+     * @default 1
+     */
     opacity: number;
+    /**
+     * Scale of the requested dynamic map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#scale)
+     */
     scale: number;
+    /**
+     * Indicates if the requested image is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#visible)
+     * 
+     * @default true
+     */
     visible: boolean;
+    /**
+     * The requested image width in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#width)
+     */
     width: number;
   }
 
   interface MapImageConstructor {
+
+
     new(properties?: MapImageProperties): MapImage;
 
     fromJSON(json: any): MapImage;
@@ -2721,29 +10100,126 @@ declare namespace __esri {
   export const MapImage: MapImageConstructor;
 
   interface MapImageProperties {
+    /**
+     * The extent of the exported map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#extent)
+     */
     extent?: ExtentProperties;
+    /**
+     * The requested image height in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#height)
+     */
     height?: number;
+    /**
+     * URL to the returned image. The image format must be of a type supported by the HTML `<img>` tag.  **Known Values:** gif | jpg | png | bmp
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#href)
+     */
     href?: string;
+    /**
+     * The opacity of the image. Value can be any number between `0` and `1` where `0` is 100% transparent, `0.5` is 50% transparent and `1` is fully opaque.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#opacity)
+     * 
+     * @default 1
+     */
     opacity?: number;
+    /**
+     * Scale of the requested dynamic map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#scale)
+     */
     scale?: number;
+    /**
+     * Indicates if the requested image is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#visible)
+     * 
+     * @default true
+     */
     visible?: boolean;
+    /**
+     * The requested image width in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#width)
+     */
     width?: number;
   }
 
   interface MosaicRule extends Accessor, JSONSupport {
+    /**
+     * Indicates whether the sort should be ascending. This property applies to all mosaic [methods](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method) where an ordering is defined except `seamline`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#ascending)
+     * 
+     * @default true
+     */
     ascending: boolean;
+    /**
+     * An array of raster Ids. All the rasters with the given list of raster Ids are selected to participate in the mosaic. The rasters will be visible at all pixel sizes regardless of the minimum and maximum pixel size range of the locked rasters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#lockRasterIds)
+     */
     lockRasterIds: number[];
+    /**
+     * The mosaic method determines how the selected rasters are ordered.  **Known Values:** none | center | nadir | viewpoint | attribute | lock-raster | northwest | seamline
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method)
+     */
     method: string;
+    /**
+     * A multiple dimensional service can have multiple dimensions for one or more variables. Use multiDimensionalDefinitions to filter data based on a slice or range of data. For example, a single ImageryLayer may have a `depth` dimension storing sea temperatures for the same pixel location at various depths. Another dimension could be `time`, where the same pixel stores multiple values based on a window of time.  This property can be used to filter and display ImageryLayer pixels for specific "slices" in those dimensions (e.g. display sea temperature at 1000m below sea level for a specific week in the year).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#multidimensionalDefinition)
+     */
     multidimensionalDefinition: DimensionalDefinition[];
+    /**
+     * Defines a selection using a set of ObjectIDs. This property applies to all mosaic methods.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#objectIds)
+     */
     objectIds: number[];
+    /**
+     * Defines the mosaic operation used to resolve overlapping pixels.  **Known Values:** first | last | min | max | mean | blend
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#operation)
+     */
     operation: string;
+    /**
+     * The name of the attribute field that is used with a constant sortValue to define the mosaicking order when the mosaic [method](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method) is set to `attribute`. The ordering is defined by the absolute value of the difference between the specified sort field value and the sort base value. For example, if the sort field is `Month` and the sort value is `7 (July)`, then the ordering is defined by `ABS(Month -7)`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#sortField)
+     */
     sortField: string;
+    /**
+     * A constant value defining a reference or base value for the sort field when the mosaic [method](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method) is set to `attribute`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#sortValue)
+     */
     sortValue: string;
+    /**
+     * Defines the viewpoint location on which the ordering is defined based on the distance from the viewpoint and the nadir of rasters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#viewpoint)
+     */
     viewpoint: Point;
+    /**
+     * The where clause determines which rasters will participate in the mosaic. This property applies to all mosaic methods.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#where)
+     */
     where: string;
   }
 
   interface MosaicRuleConstructor {
+    /**
+     * Specifies the mosaic rule when defining how individual images should be mosaicked. It specifies selection, mosaic method, sort order, overlapping pixel resolution, etc. Mosaic rules are for mosaicking rasters in the mosaic dataset. A mosaic rule is used to define:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html)
+     */
+
     new(properties?: MosaicRuleProperties): MosaicRule;
 
     fromJSON(json: any): MosaicRule;
@@ -2752,64 +10228,248 @@ declare namespace __esri {
   export const MosaicRule: MosaicRuleConstructor;
 
   interface MosaicRuleProperties {
+    /**
+     * Indicates whether the sort should be ascending. This property applies to all mosaic [methods](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method) where an ordering is defined except `seamline`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#ascending)
+     * 
+     * @default true
+     */
     ascending?: boolean;
+    /**
+     * An array of raster Ids. All the rasters with the given list of raster Ids are selected to participate in the mosaic. The rasters will be visible at all pixel sizes regardless of the minimum and maximum pixel size range of the locked rasters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#lockRasterIds)
+     */
     lockRasterIds?: number[];
+    /**
+     * The mosaic method determines how the selected rasters are ordered.  **Known Values:** none | center | nadir | viewpoint | attribute | lock-raster | northwest | seamline
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method)
+     */
     method?: string;
+    /**
+     * A multiple dimensional service can have multiple dimensions for one or more variables. Use multiDimensionalDefinitions to filter data based on a slice or range of data. For example, a single ImageryLayer may have a `depth` dimension storing sea temperatures for the same pixel location at various depths. Another dimension could be `time`, where the same pixel stores multiple values based on a window of time.  This property can be used to filter and display ImageryLayer pixels for specific "slices" in those dimensions (e.g. display sea temperature at 1000m below sea level for a specific week in the year).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#multidimensionalDefinition)
+     */
     multidimensionalDefinition?: DimensionalDefinition[];
+    /**
+     * Defines a selection using a set of ObjectIDs. This property applies to all mosaic methods.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#objectIds)
+     */
     objectIds?: number[];
+    /**
+     * Defines the mosaic operation used to resolve overlapping pixels.  **Known Values:** first | last | min | max | mean | blend
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#operation)
+     */
     operation?: string;
+    /**
+     * The name of the attribute field that is used with a constant sortValue to define the mosaicking order when the mosaic [method](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method) is set to `attribute`. The ordering is defined by the absolute value of the difference between the specified sort field value and the sort base value. For example, if the sort field is `Month` and the sort value is `7 (July)`, then the ordering is defined by `ABS(Month -7)`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#sortField)
+     */
     sortField?: string;
+    /**
+     * A constant value defining a reference or base value for the sort field when the mosaic [method](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#method) is set to `attribute`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#sortValue)
+     */
     sortValue?: string;
+    /**
+     * Defines the viewpoint location on which the ordering is defined based on the distance from the viewpoint and the nadir of rasters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#viewpoint)
+     */
     viewpoint?: PointProperties;
+    /**
+     * The where clause determines which rasters will participate in the mosaic. This property applies to all mosaic methods.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#where)
+     */
     where?: string;
   }
 
   interface PixelBlock extends Accessor {
+    /**
+     * The height (or number of rows) of the PixelBlock in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#height)
+     */
     height: number;
+    /**
+     * An array of numbers representing pixels to show and pixels to hide from the view. The length of this array is [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#height) * [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#width). It's arranged row by row in this format: `[p_00, p_10, p_20, ... p_10, p_11, .....]` where `p_xy` is the pixel value at the column `x` and row `y`.  The mask is per pixel, not per band. Items in the mask array with a value of `0` indicates [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) to not display in the view at that index. Items with a value of `1` indicate to display the [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) at there corresponding indices.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#mask)
+     */
     mask: number[];
+    /**
+     * A two dimensional array representing the pixels from the Image Service displayed on the client. The length of the first dimension is the same as the number of bands in the layer. The length of the second dimension is [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#height) * [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#width). The length of each band is the same. The pixels in each band are arranged row by row in this format: `[p_00, p_10, p_20, ... p_10, p_11, ...]` where `p_xy` is the pixel value at the column `x` and row `y`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels)
+     */
     pixels: number[][];
+    /**
+     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixelType)
+     */
     pixelType: string;
+    /**
+     * An array of objects containing numeric statistical properties. Each object has the following specification if defined:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#statistics)
+     */
     statistics: PixelBlockStatistics[];
+    /**
+     * The width (or number of columns) of the PixelBlock in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#width)
+     */
     width: number;
 
+    /**
+     * Adds another plane to the PixelBlock.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#addData)
+     * 
+     * @param planeData The data to add to the PixelBlock.
+     * @param planeData.pixels A two dimensional array representing the pixels to add.
+     * @param planeData.statistics An array of objects containing numeric statistical properties. See [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#statistics) for details on the specifications of each object.
+     * 
+     */
     addData(planeData: PixelBlockAddDataPlaneData): void;
+    /**
+     * Returns pixels and masks using a single array in bip format (e.g. [p_00_r, p_00_g, p_00_b, p_00_a, p_10_r, p_10_g, p_10_b, p_10_a, .....]). Use this method to get an unsigned 8 bit pixel array. The result can be used to create a webgl texture.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#getAsRGBA)
+     * 
+     * 
+     */
     getAsRGBA(): number[];
+    /**
+     * Similar to [getAsRGBA](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#getAsRGBA), but returns floating point data. The result can be used to create a webgl texture (OES_texture_float).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#getAsRGBAFloat)
+     * 
+     * 
+     */
     getAsRGBAFloat(): number[];
+    /**
+     * Returns the plane band count of the PixelBlock.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#getPlaneCount)
+     * 
+     * 
+     */
     getPlaneCount(): number;
   }
 
   interface PixelBlockConstructor {
+
+
     new(properties?: PixelBlockProperties): PixelBlock;
   }
 
   export const PixelBlock: PixelBlockConstructor;
 
   interface PixelBlockProperties {
+    /**
+     * The height (or number of rows) of the PixelBlock in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#height)
+     */
     height?: number;
+    /**
+     * An array of numbers representing pixels to show and pixels to hide from the view. The length of this array is [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#height) * [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#width). It's arranged row by row in this format: `[p_00, p_10, p_20, ... p_10, p_11, .....]` where `p_xy` is the pixel value at the column `x` and row `y`.  The mask is per pixel, not per band. Items in the mask array with a value of `0` indicates [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) to not display in the view at that index. Items with a value of `1` indicate to display the [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) at there corresponding indices.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#mask)
+     */
     mask?: number[];
+    /**
+     * A two dimensional array representing the pixels from the Image Service displayed on the client. The length of the first dimension is the same as the number of bands in the layer. The length of the second dimension is [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#height) * [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#width). The length of each band is the same. The pixels in each band are arranged row by row in this format: `[p_00, p_10, p_20, ... p_10, p_11, ...]` where `p_xy` is the pixel value at the column `x` and row `y`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels)
+     */
     pixels?: number[][];
+    /**
+     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixelType)
+     */
     pixelType?: string;
+    /**
+     * An array of objects containing numeric statistical properties. Each object has the following specification if defined:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#statistics)
+     */
     statistics?: PixelBlockStatistics[];
+    /**
+     * The width (or number of columns) of the PixelBlock in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#width)
+     */
     width?: number;
   }
 
-  export interface PixelBlockAddDataPlaneData {
+
+  export interface PixelBlockAddDataPlaneData extends Object {
+    /**
+     * A two dimensional array representing the pixels to add.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#addData)
+     */
     pixels: number[][];
+    /**
+     * An array of objects containing numeric statistical properties. See [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#statistics) for details on the specifications of each object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#addData)
+     */
     statistics: any[];
   }
 
-  export interface PixelBlockStatistics {
+
+  export interface PixelBlockStatistics extends Object {
+    /**
+     * The maximum pixel value in the [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#statistics)
+     */
     maxValue?: number;
+    /**
+     * The minimum pixel value in the [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#statistics)
+     */
     minValue?: number;
+    /**
+     * Value representing areas of no data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#statistics)
+     */
     noDataValue?: number;
   }
 
   interface RangeDomain extends Domain {
+    /**
+     * The maximum valid value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RangeDomain.html#maxValue)
+     */
     maxValue: number;
+    /**
+     * The minimum valid value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RangeDomain.html#minValue)
+     */
     minValue: number;
   }
 
   interface RangeDomainConstructor {
+
+
     new(properties?: RangeDomainProperties): RangeDomain;
 
     fromJSON(json: any): RangeDomain;
@@ -2818,18 +10478,56 @@ declare namespace __esri {
   export const RangeDomain: RangeDomainConstructor;
 
   interface RangeDomainProperties extends DomainProperties {
+    /**
+     * The maximum valid value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RangeDomain.html#maxValue)
+     */
     maxValue?: number;
+    /**
+     * The minimum valid value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RangeDomain.html#minValue)
+     */
     minValue?: number;
   }
 
   interface RasterFunction extends Accessor, JSONSupport {
+    /**
+     * The arguments for the raster function. The structure depends on the function specified. See [raster functions](http://resources.arcgis.com/en/help/arcgis-rest-api/#/Raster_Function_Objects/02r3000000rv000000/) for a list of functions and their arguments.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#functionArguments)
+     */
     functionArguments: any;
+    /**
+     * The raster function name. See [raster functions](http://resources.arcgis.com/en/help/arcgis-rest-api/#/Raster_Function_Objects/02r3000000rv000000/) for a list of functions and their arguments.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#functionName)
+     */
     functionName: string;
+    /**
+     * Defines the pixel type of the output image.  **Known Values:** c128 | c64 | f32 | f64 | s16 | s32 | s8 | u1 | u16 | u2 | u32 | u4 | u8 | unknown
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#outputPixelType)
+     * 
+     * @default unknown
+     */
     outputPixelType: string;
+    /**
+     * The variable name for the raster function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#variableName)
+     */
     variableName: any;
   }
 
   interface RasterFunctionConstructor {
+    /**
+     * Specifies processing to be done to the image service. See [raster functions](http://resources.arcgis.com/en/help/arcgis-rest-api/#/Raster_Function_Objects/02r3000000rv000000/) for a list of functions and their [arguments](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#functionArguments). The following image shows a landcover ImageryLayer rendered with two chained client-side raster functions used to reclass pixel values (Remap) and assign each pixel a new color (Colormap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html)
+     */
+
     new(properties?: RasterFunctionProperties): RasterFunction;
 
     fromJSON(json: any): RasterFunction;
@@ -2838,145 +10536,754 @@ declare namespace __esri {
   export const RasterFunction: RasterFunctionConstructor;
 
   interface RasterFunctionProperties {
+    /**
+     * The arguments for the raster function. The structure depends on the function specified. See [raster functions](http://resources.arcgis.com/en/help/arcgis-rest-api/#/Raster_Function_Objects/02r3000000rv000000/) for a list of functions and their arguments.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#functionArguments)
+     */
     functionArguments?: any;
+    /**
+     * The raster function name. See [raster functions](http://resources.arcgis.com/en/help/arcgis-rest-api/#/Raster_Function_Objects/02r3000000rv000000/) for a list of functions and their arguments.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#functionName)
+     */
     functionName?: string;
+    /**
+     * Defines the pixel type of the output image.  **Known Values:** c128 | c64 | f32 | f64 | s16 | s32 | s8 | u1 | u16 | u2 | u32 | u4 | u8 | unknown
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#outputPixelType)
+     * 
+     * @default unknown
+     */
     outputPixelType?: string;
+    /**
+     * The variable name for the raster function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-RasterFunction.html#variableName)
+     */
     variableName?: any;
   }
 
   interface Sublayer extends Accessor {
+    /**
+     * A SQL where clause used to filter features in the image. Only the features that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). Definition expressions may be set when a sublayer is constructed prior to it loading in the view or after it has been added to the MapImageLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#definitionExpression)
+     */
     definitionExpression: string;
+    /**
+     * The sublayer's layer ID. When a [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#source) is not defined on the layer, this value represents the id of the sublayer defined by the map service. If creating a [DynamicDataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer) or a [MapDataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#MapDataLayer) and adding it to the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#source) property of the sublayer, the value of this property can be anything set by the developer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#id)
+     */
     id: number;
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) objects. Use this property to specify labeling properties for the layer such as label expression, placement, and size. For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelsVisible) property of the sublayer must be `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelingInfo)
+     */
     labelingInfo: LabelClass[];
+    /**
+     * Indicates if labels for the sublayer will be visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible: boolean;
+    /**
+     * The [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#layer)
+     */
     layer: MapImageLayer;
+    /**
+     * Indicates whether the layer will be included in the legend. When `false`, the layer will be excluded from the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * The maximum scale at which the layer is visible in the view. If the map is zoomed in beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.  The user or developer can only set `minScale` and `maxScale` if the new values are within the scale range defined in the map service. 
+     * ```js
+     * // the service specifies minScale = 10000 and maxScale = 500000
+     * 
+     * // this is valid
+     * sublayer.minScale = 30000;
+     * sublayer.maxScale = 100000;
+     * 
+     * // this is not valid because the values are
+     * // outside the range specified by the service
+     * sublayer.minScale = 5000;
+     * sublayer.maxScale = 1000000;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#maxScale)
+     */
     maxScale: number;
+    /**
+     * The minimum scale at which the layer is visible in the view. If the map is zoomed out beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.  The user or developer can only set `minScale` and `maxScale` if the new values are within the scale range defined in the map service. 
+     * ```js
+     * // the service specifies minScale = 10000 and maxScale = 500000
+     * 
+     * // this is valid
+     * sublayer.minScale = 30000;
+     * sublayer.maxScale = 100000;
+     * 
+     * // this is not valid because the values are
+     * // outside the range specified by the service
+     * sublayer.minScale = 5000;
+     * sublayer.maxScale = 1000000;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#minScale)
+     */
     minScale: number;
+    /**
+     * The level of opacity to set on the sublayer on a scale from 0.0 - 1.0 where `0` is fully transparent and `1.0` is fully opaque. If the [MapImageLayer.opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html#opacity) is set, the actual opacity value of the sublayer will be the value of [MapImageLayer.opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html#opacity) multiplied by the sublayer's opacity.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#opacity)
+     */
     opacity: number;
+    /**
+     * The popup template for the sublayer. When set, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when the user clicks the image.  Sublayers with a [RasterDataSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#RasterDataSource) cannot be queried and therefore do not support [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
+    /**
+     * The renderer to apply to the sublayer. This value overrides the renderer read from the map service. 
+     * > **Known Limitations** 
+     *   * [3D symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html) are not supported in renderers set on MapImageLayer sublayers.
+     *   * [visual variables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables) are not supported in renderers set on MapImageLayer sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#renderer)
+     */
     renderer: Renderer;
+    /**
+     * An object that allows you to create a dynamic layer with data either from the map service sublayers or data from a registered workspace. See [DynamicMapLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicMapLayer) for creating dynamic layers from map service layers for on the fly rendering, labeling, and filtering (definition expressions). To create dynamic layers from other sources in registered workspaces such as tables and table joins, see [DynamicDataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#source)
+     */
     source: DynamicMapLayer | DynamicDataLayer;
+    /**
+     * If a sublayer contains sublayers, this property is a [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Sublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html) objects belonging to the given sublayer with sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#sublayers)
+     */
     sublayers: Collection<Sublayer>;
+    /**
+     * The title of the sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets. This value can be defined in the map service or programmatically by the developer. It can also be useful for finding a specific sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#title)
+     */
     title: string;
+    /**
+     * The URL to the REST endpoint of the sublayer. This allows you to view the schema of fields and query tables located in registered workspaces.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#url)
+     */
     url: string;
+    /**
+     * Indicates if the layer is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#visible)
+     */
     visible: boolean;
 
+    /**
+     * Creates a deep clone of the sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#clone)
+     * 
+     * 
+     */
     clone(): Sublayer;
+    /**
+     * Creates a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) object with default values representing the layer's state, including filters (definition expression) on the layer's features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#createQuery)
+     * 
+     * 
+     */
     createQuery(): Query;
-    queryFeatures(params?: Query): IPromise<FeatureSet>;
+    /**
+     * Executes a [query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html) against features in the sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#queryFeatures)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. If no parameters are specified, then all features satisfying the layer's configuration/filters are returned.
+     * 
+     */
+    queryFeatures(params?: Query | QueryProperties): IPromise<FeatureSet>;
   }
 
   interface SublayerConstructor {
+    /**
+     * Represents a sublayer in a [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html). MapImageLayer allows you to display, query, and analyze layers from data defined in a [map service](http://server.arcgis.com/en/server/latest/publish-services/windows/what-is-a-map-service.htm). Map services contain sublayers with properties such as [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#renderer), [labelingInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelingInfo), and [definitionExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#definitionExpression), and others that are defined on the server. The properties of each sublayer on the map service may be dynamically changed by the user or developer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html)
+     */
+
     new(properties?: SublayerProperties): Sublayer;
   }
 
   export const Sublayer: SublayerConstructor;
 
   interface SublayerProperties {
+    /**
+     * A SQL where clause used to filter features in the image. Only the features that satisfy the definition expression are displayed in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). Definition expressions may be set when a sublayer is constructed prior to it loading in the view or after it has been added to the MapImageLayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#definitionExpression)
+     */
     definitionExpression?: string;
+    /**
+     * The sublayer's layer ID. When a [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#source) is not defined on the layer, this value represents the id of the sublayer defined by the map service. If creating a [DynamicDataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer) or a [MapDataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#MapDataLayer) and adding it to the [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#source) property of the sublayer, the value of this property can be anything set by the developer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#id)
+     */
     id?: number;
+    /**
+     * The label definition for this layer, specified as an array of [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) objects. Use this property to specify labeling properties for the layer such as label expression, placement, and size. For labels to display in the view, the [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelsVisible) property of the sublayer must be `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelingInfo)
+     */
     labelingInfo?: LabelClassProperties[];
+    /**
+     * Indicates if labels for the sublayer will be visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelsVisible)
+     * 
+     * @default false
+     */
     labelsVisible?: boolean;
+    /**
+     * The [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#layer)
+     */
     layer?: MapImageLayerProperties;
+    /**
+     * Indicates whether the layer will be included in the legend. When `false`, the layer will be excluded from the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled?: boolean;
+    /**
+     * The maximum scale at which the layer is visible in the view. If the map is zoomed in beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.  The user or developer can only set `minScale` and `maxScale` if the new values are within the scale range defined in the map service. 
+     * ```js
+     * // the service specifies minScale = 10000 and maxScale = 500000
+     * 
+     * // this is valid
+     * sublayer.minScale = 30000;
+     * sublayer.maxScale = 100000;
+     * 
+     * // this is not valid because the values are
+     * // outside the range specified by the service
+     * sublayer.minScale = 5000;
+     * sublayer.maxScale = 1000000;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#maxScale)
+     */
     maxScale?: number;
+    /**
+     * The minimum scale at which the layer is visible in the view. If the map is zoomed out beyond this scale, the layer will not be visible. A value of `0` means the layer does not have a maximum scale.  The user or developer can only set `minScale` and `maxScale` if the new values are within the scale range defined in the map service. 
+     * ```js
+     * // the service specifies minScale = 10000 and maxScale = 500000
+     * 
+     * // this is valid
+     * sublayer.minScale = 30000;
+     * sublayer.maxScale = 100000;
+     * 
+     * // this is not valid because the values are
+     * // outside the range specified by the service
+     * sublayer.minScale = 5000;
+     * sublayer.maxScale = 1000000;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#minScale)
+     */
     minScale?: number;
+    /**
+     * The level of opacity to set on the sublayer on a scale from 0.0 - 1.0 where `0` is fully transparent and `1.0` is fully opaque. If the [MapImageLayer.opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html#opacity) is set, the actual opacity value of the sublayer will be the value of [MapImageLayer.opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html#opacity) multiplied by the sublayer's opacity.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#opacity)
+     */
     opacity?: number;
+    /**
+     * The popup template for the sublayer. When set, the `popupTemplate` allows users to access attributes and display their values in the [view's popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#popup) when the user clicks the image.  Sublayers with a [RasterDataSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#RasterDataSource) cannot be queried and therefore do not support [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * The renderer to apply to the sublayer. This value overrides the renderer read from the map service. 
+     * > **Known Limitations** 
+     *   * [3D symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html) are not supported in renderers set on MapImageLayer sublayers.
+     *   * [visual variables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables) are not supported in renderers set on MapImageLayer sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#renderer)
+     */
     renderer?: RendererProperties;
+    /**
+     * An object that allows you to create a dynamic layer with data either from the map service sublayers or data from a registered workspace. See [DynamicMapLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicMapLayer) for creating dynamic layers from map service layers for on the fly rendering, labeling, and filtering (definition expressions). To create dynamic layers from other sources in registered workspaces such as tables and table joins, see [DynamicDataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#source)
+     */
     source?: DynamicMapLayer | DynamicDataLayer;
+    /**
+     * If a sublayer contains sublayers, this property is a [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Sublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html) objects belonging to the given sublayer with sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#sublayers)
+     */
     sublayers?: CollectionProperties<SublayerProperties>;
+    /**
+     * The title of the sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets. This value can be defined in the map service or programmatically by the developer. It can also be useful for finding a specific sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#title)
+     */
     title?: string;
+    /**
+     * The URL to the REST endpoint of the sublayer. This allows you to view the schema of fields and query tables located in registered workspaces.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#url)
+     */
     url?: string;
+    /**
+     * Indicates if the layer is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#visible)
+     */
     visible?: boolean;
   }
 
-  export interface DynamicDataLayer {
+  /**
+   * A dynamic data layer is a layer created on-the-fly with data stored in a [registered workspace](https://server.arcgis.com/en/server/latest/publish-services/windows/overview-register-data-with-arcgis-server.htm). This is data that can be rendered and queried on the fly, but that isn't explicitly exposed as a service sublayer. Depending on the type of data source, these layers are classified as one of the following: 
+   * 
+   * Data source | Description
+   * ------------|------------
+   * [TableDataSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#TableDataSource) | A feature class with geometries or table without geometries. When a table data source does not contain geometries, it may be used as one of the sources in a [join operation](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource). Feature class tables may be used on their own since they contain a geometry field.
+   * [QueryTableDataSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource) | A feature class or table that may be queried on the fly with a SQL where clause. This data source is useful for scenarios where you have a table containing unique geometries and another table with multiple records that match to each geometry. You can use the QueryTableDataSource to select only a subset of those matching records (so records in both tables have a one-to-one relationship with each other) and join them to the table with geometries.
+   * [RasterDataSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#RasterDataSource) | A raster dataset used for visualization purposes only.
+   * [JoinTableDataSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource) | This data source consists of two data sources joined by a common attribute or key. The left table data source typically contains geometries, while the right source may be a table or query table without geometries.
+   * 
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer)
+   */
+  export interface DynamicDataLayer extends Object {
+    /**
+     * This value is always `data-layer` and is inferred when the `dataSource` property is set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer)
+     */
     type: string;
+    /**
+     * A table, feature class, or raster that resides in a registered workspace (either a folder or geodatabase). The data sources are not visible in the Services Directory by default. They may be viewed, published, and configured using the ArcGIS Server Manager.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer)
+     */
     dataSource: TableDataSource | QueryTableDataSource | RasterDataSource | JoinTableDataSource;
+    /**
+     * Controls field visibility in the layer. Only specified fields will be visible. If `null`, all fields are visible in the dynamic layer. The specification for a field object is provided below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer)
+     */
     fields: DynamicDataLayerFields[];
   }
 
-  export interface DynamicMapLayer {
+  /**
+   * A dynamic map layer refers to a layer published in a map service that has dynamic layers enabled. This layer type may be used to create multiple [sublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#sublayers) that point to the same service layer, but are assigned different definition expressions, renderers, and other properties.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicMapLayer)
+   */
+  export interface DynamicMapLayer extends Object {
+    /**
+     * This value is always `map-layer` and is inferred when the `mapLayerId` property is set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicMapLayer)
+     */
     type: string;
+    /**
+     * The [id](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#id) of the service sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicMapLayer)
+     */
     mapLayerId: number;
+    /**
+     * An optional property for specifying the GDB version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicMapLayer)
+     */
     gdbVersion: string;
   }
 
-  export interface JoinTableDataSource {
+  /**
+   * The result of an on-the-fly join operation at runtime. Nested joins are supported. To use nested joins, set either `leftTableSource` or `rightTableSource` to `join-table`.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource)
+   */
+  export interface JoinTableDataSource extends Object {
+    /**
+     * This value is always `join-table` and is inferred when other join table properties of this object are set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource)
+     */
     type: string;
+    /**
+     * The field name used for joining or matching records in the left table to records in the right table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource)
+     */
     leftTableKey: string;
+    /**
+     * The field name used for joining or matching records in the right table to records in the left table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource)
+     */
     rightTableKey: string;
+    /**
+     * The left table for joining to the right table source. This can either be a dynamic map layer or a dynamic data layer. The dynamic data layer may contain another join data source used for nested joining.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource)
+     */
     leftTableSource: DynamicMapLayer | DynamicDataLayer;
+    /**
+     * The right table for joining to the left table source. This can either be a dynamic map layer or a dynamic data layer. The dynamic data layer may contain another join data source used for nested joining.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource)
+     */
     rightTableSource: DynamicMapLayer | DynamicDataLayer;
+    /**
+     * The type of join that will be performed. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * left-outer-join | Unmatched records in the left table source are preserved and joined with `null` values in the right table source.
+     * left-inner-join | Records in the left table source are discarded if they are unmatched with records in the right table source.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinTableDataSource)
+     */
     joinType: string;
   }
 
-  export interface QueryTableDataSource {
+  /**
+   * A query table is a feature class or table defined by a SQL query on the fly. Query layers allow both spatial and nonspatial information stored in a database to be easily integrated into map service operations. Since a query table uses SQL to directly query database tables and views, spatial information used by a query table is not required to be in a geodatabase.  This data source is useful for scenarios where you have a table containing multiple records that match to a single geometry in either another table or a map service layer. You can use the QueryTableDataSource to select only a subset of those matching records and join them to the table with geometries so records in both tables have a one-to-one relationship with each other.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource)
+   */
+  export interface QueryTableDataSource extends Object {
+    /**
+     * This value is always `query-table` and is inferred when the `query` property of this object is set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource)
+     */
     type: string;
+    /**
+     * The workspace where the data resides (defined in ArcGIS Server Manager).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource)
+     */
     workspaceId: string;
+    /**
+     * The SQL query used to filter records.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource)
+     */
     query: string;
+    /**
+     * The field name(s) containing the unique IDs for each record in the table. This can be a comma separated list if the query table is used in a [JoinTableDataSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#JoinDataTableSource).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource)
+     */
     oidFields: string;
+    /**
+     * The spatial reference of the geometry of each feature in the table source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource)
+     */
     spatialReference: SpatialReference;
+    /**
+     * The geometry type of each record in the table. **Possible Values:** point | multipoint | polyline | polygon | multipatch
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#QueryTableDataSource)
+     */
     geometryType: string;
   }
 
-  export interface RasterDataSource {
+  /**
+   * A file-based raster that resides in a registered raster workspace. The raster may only be displayed in the view, not queried or assigned a renderer.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#RasterDataSource)
+   */
+  export interface RasterDataSource extends Object {
+    /**
+     * This value is always `raster`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#RasterDataSource)
+     */
     type: string;
+    /**
+     * The workspace where the raster resides as defined in the ArcGIS Server Manager.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#RasterDataSource)
+     */
     workspaceId: string;
+    /**
+     * The name of the raster in the registered workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#RasterDataSource)
+     */
     dataSourceName: string;
   }
 
-  export interface TableDataSource {
+  /**
+   * A table or feature class that resides in a registered workspace (either a folder or geodatabase). In the case of a geodatabase, if versioned, use `version` to switch to an alternate geodatabase version.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#TableDataSource)
+   */
+  export interface TableDataSource extends Object {
+    /**
+     * This value is always `table`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#TableDataSource)
+     */
     type: string;
+    /**
+     * The workspace where the table resides as defined in the ArcGIS Server Manager.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#TableDataSource)
+     */
     workspaceId: string;
+    /**
+     * The name of the table in the registered workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#TableDataSource)
+     */
     dataSourceName: string;
+    /**
+     * References the geodatabase version if multiple versions exist in the geodatabase.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#TableDataSource)
+     */
     gdbVersion: string;
   }
 
-  export interface DynamicDataLayerFields {
+
+  export interface DynamicDataLayerFields extends Object {
+    /**
+     * The name of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer)
+     */
     name: string;
+    /**
+     * The alias of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#DynamicDataLayer)
+     */
     alias: string;
   }
 
   interface TileInfo extends Accessor, JSONSupport {
+    /**
+     * The dots per inch (DPI) of the tiling scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#dpi)
+     */
     dpi: number;
+    /**
+     * Image format of the cached tiles.  **Possible Values:** png | png24 | png32 | jpg | dib | tiff | emf | ps | pdf | gif | svg | svgz | mixed | lerc
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#format)
+     */
     format: string;
+    /**
+     * Indicates if the tiling scheme supports wrap around.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#isWrappable)
+     */
     isWrappable: boolean;
+    /**
+     * An array of levels of detail that define the tiling scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#lods)
+     */
     lods: LOD[];
+    /**
+     * The tiling scheme origin.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#origin)
+     */
     origin: Point;
+    /**
+     * Size of tiles in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#size)
+     */
     size: number[];
+    /**
+     * The spatial reference of the tiling schema.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#spatialReference)
+     */
     spatialReference: SpatialReference;
+
+    /**
+     * Utility method used to convert a scale value to its corresponding zoom value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#scaleToZoom)
+     * 
+     * @param scale The scale value to convert.
+     * 
+     */
+    scaleToZoom(scale: number): number;
+    /**
+     * Utility method used to convert a zoom value to its corresponding scale value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#zoomToScale)
+     * 
+     * @param zoom The zoom value to convert.
+     * 
+     */
+    zoomToScale(zoom: number): number;
   }
 
   interface TileInfoConstructor {
+
+
     new(properties?: TileInfoProperties): TileInfo;
 
+
+    /**
+     * A convenience method used to create a new TileInfo instance with preset properties like [LODs](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#lods). Optionally, properties such as `size`, `scales[]`, and a `[SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html)` can also be set to calculate [LODs](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#lods) for each TileInfo.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#create)
+     * 
+     * @param options An object that contains the size, scales, and/or [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html) used to compute the new TileInfo instance.
+     * @param options.size The size of each tile in pixels.
+     * @param options.spatialReference The spatial reference for the new TileInfo instance. If the spatial reference is not WGS84 nor WebMercator, the origin of the TileInfo is `0.0`.
+     * @param options.scales An array of scale values to use for the TileInfo. If none are specified, the scales from the [ArcGIS Online basemaps](https://www.arcgis.com/home/group.html?id=702026e41f6641fb85da88efe79dc166#overview) are used from level 0 through 24.
+     * 
+     */
+    create(options?: TileInfoCreateOptions): TileInfo;
+
     fromJSON(json: any): TileInfo;
   }
 
   export const TileInfo: TileInfoConstructor;
 
   interface TileInfoProperties {
+    /**
+     * The dots per inch (DPI) of the tiling scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#dpi)
+     */
     dpi?: number;
+    /**
+     * Image format of the cached tiles.  **Possible Values:** png | png24 | png32 | jpg | dib | tiff | emf | ps | pdf | gif | svg | svgz | mixed | lerc
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#format)
+     */
     format?: string;
+    /**
+     * Indicates if the tiling scheme supports wrap around.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#isWrappable)
+     */
     isWrappable?: boolean;
+    /**
+     * An array of levels of detail that define the tiling scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#lods)
+     */
     lods?: LODProperties[];
+    /**
+     * The tiling scheme origin.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#origin)
+     */
     origin?: PointProperties;
+    /**
+     * Size of tiles in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#size)
+     */
     size?: number[];
+    /**
+     * The spatial reference of the tiling schema.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
   }
 
+
+  export interface TileInfoCreateOptions extends Object {
+    /**
+     * The size of each tile in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#create)
+     * 
+     * @default 256
+     */
+    size?: number;
+    /**
+     * The spatial reference for the new TileInfo instance. If the spatial reference is not WGS84 nor WebMercator, the origin of the TileInfo is `0.0`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#create)
+     * 
+     * @default WebMercator
+     */
+    spatialReference?: SpatialReference;
+    /**
+     * An array of scale values to use for the TileInfo. If none are specified, the scales from the [ArcGIS Online basemaps](https://www.arcgis.com/home/group.html?id=702026e41f6641fb85da88efe79dc166#overview) are used from level 0 through 24.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileInfo.html#create)
+     * 
+     * @default The scales provided by ArcGIS Online basemaps
+     */
+    scales?: number[];
+  }
+
   interface TileMatrixSet extends Accessor, JSONSupport {
+    /**
+     * The full extent of the TileMatrixSet.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html#fullExtent)
+     */
     fullExtent: Extent;
+    /**
+     * The unique ID assigned to the TileMatrixSet.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html#id)
+     */
     id: string;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html#tileInfo)
+     */
     tileInfo: TileInfo;
 
+    /**
+     * Creates a deep clone of this TileMatrixSet.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html#clone)
+     * 
+     * 
+     */
     clone(): TileMatrixSet;
   }
 
   interface TileMatrixSetConstructor {
+
+
     new(properties?: TileMatrixSetProperties): TileMatrixSet;
 
     fromJSON(json: any): TileMatrixSet;
@@ -2985,45 +11292,256 @@ declare namespace __esri {
   export const TileMatrixSet: TileMatrixSetConstructor;
 
   interface TileMatrixSetProperties {
+    /**
+     * The full extent of the TileMatrixSet.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html#fullExtent)
+     */
     fullExtent?: ExtentProperties;
+    /**
+     * The unique ID assigned to the TileMatrixSet.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html#id)
+     */
     id?: string;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html#tileInfo)
+     */
     tileInfo?: TileInfoProperties;
   }
 
-  interface WMSSublayer {
+  interface WMSSublayer extends Accessor {
+    /**
+     * Description for the WMS sublayer. This defaults to the value of the Abstract property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#description)
+     */
     description: string;
+    /**
+     * The full extent of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#fullExtent)
+     */
     fullExtent: Extent;
+    /**
+     * The id for the WMS sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#id)
+     */
     id: number;
+    /**
+     * The [WMSLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#layer)
+     */
     layer: WMSLayer;
+    /**
+     * Indicates whether the layer will be included in the legend. When `false`, the layer will be excluded from the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * A string url pointing to a legend image for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#legendUrl)
+     */
     legendUrl: string;
+    /**
+     * Name of the WMS sublayer. This defaults to the value of the Name property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#name)
+     */
     name: string;
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#popupEnabled)
+     * 
+     * @default false
+     */
     popupEnabled: boolean;
+    /**
+     * Indicates if the layer can be queried, i.e. the service supports GetFeatureInfo with either text/html or text/plain formats.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#queryable)
+     * 
+     * @default false
+     */
     queryable: boolean;
+    /**
+     * List of spatialReferences (WKID) derived from the CRS elements of the first layer in the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#spatialReferences)
+     */
     spatialReferences: number[];
+    /**
+     * A collection of [WMSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#sublayers)
+     */
     sublayers: Collection<WMSSublayer>;
+    /**
+     * The title of the WMS sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets. This defaults to the value of the Title property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#title)
+     */
     title: string;
+    /**
+     * Indicates if the layer is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#visible)
+     */
     visible: boolean;
 
+    /**
+     * Creates a deep clone of the WMS sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#clone)
+     * 
+     * 
+     */
     clone(): WMSSublayer;
   }
 
   interface WMSSublayerConstructor {
-    new(properties?: any): WMSSublayer;
+
+
+    new(properties?: WMSSublayerProperties): WMSSublayer;
   }
 
   export const WMSSublayer: WMSSublayerConstructor;
 
+  interface WMSSublayerProperties {
+    /**
+     * Description for the WMS sublayer. This defaults to the value of the Abstract property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#description)
+     */
+    description?: string;
+    /**
+     * The full extent of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#fullExtent)
+     */
+    fullExtent?: ExtentProperties;
+    /**
+     * The id for the WMS sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#id)
+     */
+    id?: number;
+    /**
+     * The [WMSLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#layer)
+     */
+    layer?: WMSLayerProperties;
+    /**
+     * Indicates whether the layer will be included in the legend. When `false`, the layer will be excluded from the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#legendEnabled)
+     * 
+     * @default true
+     */
+    legendEnabled?: boolean;
+    /**
+     * A string url pointing to a legend image for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#legendUrl)
+     */
+    legendUrl?: string;
+    /**
+     * Name of the WMS sublayer. This defaults to the value of the Name property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#name)
+     */
+    name?: string;
+    /**
+     * Indicates whether to display popups when features in the layer are clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#popupEnabled)
+     * 
+     * @default false
+     */
+    popupEnabled?: boolean;
+    /**
+     * Indicates if the layer can be queried, i.e. the service supports GetFeatureInfo with either text/html or text/plain formats.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#queryable)
+     * 
+     * @default false
+     */
+    queryable?: boolean;
+    /**
+     * List of spatialReferences (WKID) derived from the CRS elements of the first layer in the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#spatialReferences)
+     */
+    spatialReferences?: number[];
+    /**
+     * A collection of [WMSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#sublayers)
+     */
+    sublayers?: CollectionProperties<WMSSublayerProperties>;
+    /**
+     * The title of the WMS sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets. This defaults to the value of the Title property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#title)
+     */
+    title?: string;
+    /**
+     * Indicates if the layer is visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#visible)
+     */
+    visible?: boolean;
+  }
+
   interface WMTSStyle extends Accessor, JSONSupport {
+    /**
+     * Description for the WMTS style. This defaults to the value of the Abstract property from the WMTS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#description)
+     */
     description: string;
+    /**
+     * The unique ID assigned to the style.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#id)
+     */
     id: string;
+    /**
+     * The URL to the legend which gets used in [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widget. This defaults to the value of the LegendURL property from the WMTS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#legendUrl)
+     */
     legendUrl: string;
+    /**
+     * The title of the WMTS style.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#title)
+     */
     title: string;
 
+    /**
+     * Creates a deep clone of the WMTSStyle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#clone)
+     * 
+     * 
+     */
     clone(): WMTSStyle;
   }
 
   interface WMTSStyleConstructor {
+
+
     new(properties?: WMTSStyleProperties): WMTSStyle;
 
     fromJSON(json: any): WMTSStyle;
@@ -3032,30 +11550,119 @@ declare namespace __esri {
   export const WMTSStyle: WMTSStyleConstructor;
 
   interface WMTSStyleProperties {
+    /**
+     * Description for the WMTS style. This defaults to the value of the Abstract property from the WMTS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#description)
+     */
     description?: string;
+    /**
+     * The unique ID assigned to the style.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#id)
+     */
     id?: string;
+    /**
+     * The URL to the legend which gets used in [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widget. This defaults to the value of the LegendURL property from the WMTS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#legendUrl)
+     */
     legendUrl?: string;
+    /**
+     * The title of the WMTS style.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html#title)
+     */
     title?: string;
   }
 
   interface WMTSSublayer extends Accessor, JSONSupport {
+    /**
+     * Description for the WMTS sublayer. This defaults to the value of the Abstract property from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#description)
+     */
     description: string;
+    /**
+     * The full extent of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#fullExtent)
+     */
     fullExtent: Extent;
+    /**
+     * The unique ID assigned to the sublayer. If not set by the developer, it is automatically generated when the layer is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#id)
+     */
     id: string;
+    /**
+     * The map image format (MIME type) to request. Defaults to the first item in [imageFormats](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormats). Must be one of the supported [imageFormats](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormats).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormat)
+     */
     imageFormat: string;
+    /**
+     * Supported image formats as retrieved from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormats)
+     */
     imageFormats: string[];
+    /**
+     * The [WMTSLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#layer)
+     */
     layer: WMTSLayer;
+    /**
+     * The [WMTSStyle](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html) to request. Defaults to the id of the first item in [styles](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styles). Should be one of the supported [styles](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styles).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styleId)
+     */
     styleId: string;
+    /**
+     * A collection of supported [WMTSStyle](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html)s as retrieved from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styles)
+     */
     styles: Collection<WMTSStyle>;
+    /**
+     * The [TileMatrixSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html) to request. Defaults to the first item in [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet) that matches the spatialReference of the view. Must be one of the supported [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet)
+     */
     tileMatrixSet: TileMatrixSet;
+    /**
+     * The id of the [TileMatrixSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html) to request. Defaults to the id of the first item in [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet) that matches the spatialReference of the view. Must be one of the supported [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSetId)
+     */
     tileMatrixSetId: string;
+    /**
+     * A collection of supported [TileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSets)
+     */
     tileMatrixSets: Collection<TileMatrixSet>;
+    /**
+     * The title of the WMTS sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets. This defaults to the value of the Title property from the WMTS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#title)
+     */
     title: string;
 
+    /**
+     * Creates a deep clone of the WMTS sublayer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#clone)
+     * 
+     * 
+     */
     clone(): WMTSSublayer;
   }
 
   interface WMTSSublayerConstructor {
+
+
     new(properties?: WMTSSublayerProperties): WMTSSublayer;
 
     fromJSON(json: any): WMTSSublayer;
@@ -3064,25 +11671,92 @@ declare namespace __esri {
   export const WMTSSublayer: WMTSSublayerConstructor;
 
   interface WMTSSublayerProperties {
+    /**
+     * Description for the WMTS sublayer. This defaults to the value of the Abstract property from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#description)
+     */
     description?: string;
+    /**
+     * The full extent of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#fullExtent)
+     */
     fullExtent?: ExtentProperties;
+    /**
+     * The unique ID assigned to the sublayer. If not set by the developer, it is automatically generated when the layer is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#id)
+     */
     id?: string;
+    /**
+     * The map image format (MIME type) to request. Defaults to the first item in [imageFormats](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormats). Must be one of the supported [imageFormats](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormats).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormat)
+     */
     imageFormat?: string;
+    /**
+     * Supported image formats as retrieved from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#imageFormats)
+     */
     imageFormats?: string[];
+    /**
+     * The [WMTSLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html) to which the sublayer belongs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#layer)
+     */
     layer?: WMTSLayerProperties;
+    /**
+     * The [WMTSStyle](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html) to request. Defaults to the id of the first item in [styles](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styles). Should be one of the supported [styles](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styles).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styleId)
+     */
     styleId?: string;
+    /**
+     * A collection of supported [WMTSStyle](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSStyle.html)s as retrieved from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#styles)
+     */
     styles?: CollectionProperties<WMTSStyleProperties>;
+    /**
+     * The [TileMatrixSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html) to request. Defaults to the first item in [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet) that matches the spatialReference of the view. Must be one of the supported [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet)
+     */
     tileMatrixSet?: TileMatrixSetProperties;
+    /**
+     * The id of the [TileMatrixSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html) to request. Defaults to the id of the first item in [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet) that matches the spatialReference of the view. Must be one of the supported [tileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSet).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSetId)
+     */
     tileMatrixSetId?: string;
+    /**
+     * A collection of supported [TileMatrixSets](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-TileMatrixSet.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#tileMatrixSets)
+     */
     tileMatrixSets?: CollectionProperties<TileMatrixSetProperties>;
+    /**
+     * The title of the WMTS sublayer used to identify it in places such as the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) and [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widgets. This defaults to the value of the Title property from the WMTS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#title)
+     */
     title?: string;
   }
 
   interface TiledLayer {
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TiledLayer.html#tileInfo)
+     */
     tileInfo: TileInfo;
   }
 
   interface TiledLayerConstructor {
+
+
     new(properties?: TiledLayerProperties): TiledLayer;
 
     fromJSON(json: any): TiledLayer;
@@ -3091,26 +11765,90 @@ declare namespace __esri {
   export const TiledLayer: TiledLayerConstructor;
 
   interface TiledLayerProperties {
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TiledLayer.html#tileInfo)
+     */
     tileInfo?: TileInfoProperties;
   }
 
-  interface TileLayer extends Layer, ArcGISMapService, ArcGISCachedService, ScaleRangeLayer, PortalLayer, TiledLayer {
-    attributionDataUrl: string;
-    hasAttributionData: boolean;
+  interface TileLayer extends Layer, ArcGISMapService, ArcGISCachedService, RefreshableLayer, ScaleRangeLayer, PortalLayer, TiledLayer {
+    /**
+     * The URL that points to the location of the layer's attribution data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#attributionDataUrl)
+     */
+    readonly attributionDataUrl: string;
+    /**
+     * Indicates if the layer has attribution data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#hasAttributionData)
+     */
+    readonly hasAttributionData: boolean;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * An array of tile servers used for changing map tiles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#tileServers)
+     */
     tileServers: string[];
+    /**
+     * The URL of the REST endpoint of the layer. The URL may either point to a resource on ArcGIS for Server, Portal for ArcGIS, or ArcGIS Online.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#url)
+     */
     url: string;
 
+    /**
+     * This method fetches a tile for the given level, row and column present in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#fetchTile)
+     * 
+     * @param level Level of detail of the tile to fetch. This value is provided by [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param row The row(y) position of the tile fetch. This value is provided by [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param column The column(x) position of the tile to fetch. This value is provided by [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html).
+     * @param options Optional settings for the tile request. The options have the following properties.
+     * @param options.allowImageDataAccess Indicates if the access to pixels of the image is allowed.
+     * 
+     */
     fetchTile(level: number, row: number, column: number, options?: TileLayerFetchTileOptions): IPromise<HTMLImageElement | HTMLCanvasElement>;
+    /**
+     * This method returns a URL to a tile for a given level, row and column.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#getTileUrl)
+     * 
+     * @param level The requested tile's level.
+     * @param row The requested tile's row.
+     * @param col The requested tile's column.
+     * 
+     */
     getTileUrl(level: number, row: number, col: number): string;
 
+
     on(name: "layerview-create", eventHandler: TileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: TileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: TileLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: TileLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface TileLayerConstructor {
+    /**
+     * The TileLayer allows you work with a cached [map service](http://server.arcgis.com/en/server/latest/publish-services/windows/what-is-a-map-service.htm) exposed by the ArcGIS Server REST API and add it to a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) as a tile layer. A cached service accesses tiles from a cache instead of dynamically rendering images. Because they are cached, tiled layers render faster than [MapImageLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html). To create an instance of TileLayer, you must reference the URL of the cached map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html)
+     */
+
     new(properties?: TileLayerProperties): TileLayer;
 
     fromJSON(json: any): TileLayer;
@@ -3118,36 +11856,71 @@ declare namespace __esri {
 
   export const TileLayer: TileLayerConstructor;
 
-  interface TileLayerProperties extends LayerProperties, ArcGISMapServiceProperties, ArcGISCachedServiceProperties, ScaleRangeLayerProperties, PortalLayerProperties, TiledLayerProperties {
-    attributionDataUrl?: string;
-    hasAttributionData?: boolean;
+  interface TileLayerProperties extends LayerProperties, ArcGISMapServiceProperties, ArcGISCachedServiceProperties, RefreshableLayerProperties, ScaleRangeLayerProperties, PortalLayerProperties, TiledLayerProperties {
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled?: boolean;
+    /**
+     * An array of tile servers used for changing map tiles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#tileServers)
+     */
     tileServers?: string[];
+    /**
+     * The URL of the REST endpoint of the layer. The URL may either point to a resource on ArcGIS for Server, Portal for ArcGIS, or ArcGIS Online.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#url)
+     */
     url?: string;
   }
 
   export interface TileLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface TileLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface TileLayerFetchTileOptions {
+
+  export interface TileLayerFetchTileOptions extends Object {
+    /**
+     * Indicates if the access to pixels of the image is allowed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#fetchTile)
+     */
     allowImageDataAccess?: boolean;
   }
 
   interface UnknownLayer extends Layer {
+
     on(name: "layerview-create", eventHandler: UnknownLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: UnknownLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: UnknownLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: UnknownLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface UnknownLayerConstructor {
+    /**
+     * Represents a layer whose type could not be determined. For example, when loading a layer from a URL and the layer type cannot be determined, then it is represented as an instance of this class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-UnknownLayer.html)
+     */
+
     new(properties?: UnknownLayerProperties): UnknownLayer;
   }
 
@@ -3158,23 +11931,33 @@ declare namespace __esri {
   }
 
   export interface UnknownLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface UnknownLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface UnsupportedLayer extends Layer {
+
     on(name: "layerview-create", eventHandler: UnsupportedLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: UnsupportedLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: UnsupportedLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: UnsupportedLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface UnsupportedLayerConstructor {
+
+
     new(properties?: UnsupportedLayerProperties): UnsupportedLayer;
   }
 
@@ -3185,31 +11968,84 @@ declare namespace __esri {
   }
 
   export interface UnsupportedLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface UnsupportedLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface VectorTileLayer extends Layer, PortalLayer, ScaleRangeLayer, TiledLayer {
-    attributionDataUrl: string;
-    currentStyleInfo: VectorTileLayerCurrentStyleInfo;
+    /**
+     * The URL that points to the location of the layer's attribution data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#attributionDataUrl)
+     */
+    readonly attributionDataUrl: string;
+    /**
+     * The current style information of the VectorTileLayer. See the object specification below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
+     */
+    readonly currentStyleInfo: VectorTileLayerCurrentStyleInfo;
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#spatialReference)
+     */
     spatialReference: SpatialReference;
-    token: string;
-    url: string | any;
+    /**
+     * A style JSON object of vector tiles that will be used to render the layer. If initializing the layer with a style JSON object, the tiles are fetched from the tile servers specified in the style object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#style)
+     */
+    style: any;
+    /**
+     * Token generated by the token service using the specified userId and password. The recommended approach to pass a token on a layer is to use [IdentityManager.registerToken()](https://developers.arcgis.com/javascript/latest/api-reference/esri-identity-IdentityManager.html#registerToken).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#token)
+     */
+    readonly token: string;
+    /**
+     * The URL to the vector tile service, or the URL to the style resource of vector tiles that will be used to render the layer. If specifying a URL to a style, the tiles are fetched from the tile servers specified in the style object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#url)
+     */
+    url: string;
 
+    /**
+     * Loads a style to render a layer from the specified URL to a style resource or style JSON object. It is equivalent of changing the entire CSS style sheet for web page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#loadStyle)
+     * 
+     * @param style The URL to a style of vector tiles or style JSON object.
+     * 
+     */
     loadStyle(style: string | any): IPromise<any>;
 
+
     on(name: "layerview-create", eventHandler: VectorTileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: VectorTileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: VectorTileLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: VectorTileLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface VectorTileLayerConstructor {
+    /**
+     * A VectorTileLayer accesses cached tiles of data and renders it in vector format. It is similar to a [WebTileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html) in the context of caching; however, a [WebTileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html) renders as a series of images, not vector data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html)
+     */
+
     new(properties?: VectorTileLayerProperties): VectorTileLayer;
 
     fromJSON(json: any): VectorTileLayer;
@@ -3218,46 +12054,131 @@ declare namespace __esri {
   export const VectorTileLayer: VectorTileLayerConstructor;
 
   interface VectorTileLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties, TiledLayerProperties {
-    attributionDataUrl?: string;
-    currentStyleInfo?: VectorTileLayerCurrentStyleInfo;
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
-    token?: string;
-    url?: string | any;
+    /**
+     * A style JSON object of vector tiles that will be used to render the layer. If initializing the layer with a style JSON object, the tiles are fetched from the tile servers specified in the style object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#style)
+     */
+    style?: any;
+    /**
+     * The URL to the vector tile service, or the URL to the style resource of vector tiles that will be used to render the layer. If specifying a URL to a style, the tiles are fetched from the tile servers specified in the style object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#url)
+     */
+    url?: string;
   }
 
   export interface VectorTileLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface VectorTileLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface VectorTileLayerCurrentStyleInfo {
+
+  export interface VectorTileLayerCurrentStyleInfo extends Object {
+    /**
+     * The URL of a vector tile service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
+     */
     serviceUrl: string;
+    /**
+     * The URL of a style for vector tiles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
+     */
     styleUrl: string;
+    /**
+     * The sprite URL included in a style.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
+     */
     spriteUrl: string;
+    /**
+     * The template URL of font sets for vector tiles. The URL includes `{fontstack}` and `{range}` tokens.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
+     */
     glyphsUrl: string;
+    /**
+     * Style JSON object for vector tiles. Style object includes `version` of the style specification, `sprite` and `glyphs` properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
+     */
     style: any;
+    /**
+     * Vector tile service information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
+     */
     layerDefinition: any;
   }
 
-  interface WebTileLayer extends Layer, TiledLayer, ScaleRangeLayer {
+  interface WebTileLayer extends Layer, TiledLayer, ScaleRangeLayer, RefreshableLayer {
+    /**
+     * The attribution information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#copyright)
+     */
     copyright: string;
-    spatialReference: SpatialReference;
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#spatialReference)
+     * 
+     * @default Web Mercator Auxiliary Sphere (wkid: 3857)
+     */
+    readonly spatialReference: SpatialReference;
+    /**
+     * A string of subDomain names where tiles are served to speed up tile retrieval. If subDomains are specified, the [urlTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#urlTemplate) should include a `{subDomain}` place holder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#subDomains)
+     */
     subDomains: string[];
+    /**
+     * The tile server names for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#tileServers)
+     */
     tileServers: string[];
+    /**
+     * URL template for the hosted tiles. The `urlTemplate` should contain a `{subDomain}` place holder if [subDomains](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#subDomains) are specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#urlTemplate)
+     */
     urlTemplate: string;
 
+
     on(name: "layerview-create", eventHandler: WebTileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: WebTileLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: WebTileLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: WebTileLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface WebTileLayerConstructor {
+    /**
+     * WebTileLayer provides a simple way to add non-ArcGIS Server map tiles as a layer to a map. The constructor takes a URL template that usually follows a pattern of `http://some.domain.com/{level}/{col}/{row}/` where `level` corresponds to a zoom level, and `column` and `row` represent tile column and row, respectively. This pattern is not required, but is the most common one currently on the web.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html)
+     */
+
     new(properties?: WebTileLayerProperties): WebTileLayer;
 
     fromJSON(json: any): WebTileLayer;
@@ -3265,53 +12186,197 @@ declare namespace __esri {
 
   export const WebTileLayer: WebTileLayerConstructor;
 
-  interface WebTileLayerProperties extends LayerProperties, TiledLayerProperties, ScaleRangeLayerProperties {
+  interface WebTileLayerProperties extends LayerProperties, TiledLayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
+    /**
+     * The attribution information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#copyright)
+     */
     copyright?: string;
-    spatialReference?: SpatialReferenceProperties;
+    /**
+     * A string of subDomain names where tiles are served to speed up tile retrieval. If subDomains are specified, the [urlTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#urlTemplate) should include a `{subDomain}` place holder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#subDomains)
+     */
     subDomains?: string[];
+    /**
+     * The tile server names for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#tileServers)
+     */
     tileServers?: string[];
+    /**
+     * URL template for the hosted tiles. The `urlTemplate` should contain a `{subDomain}` place holder if [subDomains](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#subDomains) are specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#urlTemplate)
+     */
     urlTemplate?: string;
   }
 
   export interface WebTileLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface WebTileLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  interface WMSLayer extends Layer, PortalLayer, ScaleRangeLayer {
+  interface WMSLayer extends Layer, PortalLayer, ScaleRangeLayer, RefreshableLayer {
+    /**
+     * Copyright information for the WMS service. This defaults to the value of the AccessConstraints property from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#copyright)
+     */
     copyright: string;
+    /**
+     * Use this to append different custom parameters to the WMS map requests. The custom layer parameters are applied to GetMap and GetFeatureInfo.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#customLayerParameters)
+     */
     customLayerParameters: any;
+    /**
+     * Use this to append custom parameters to all WMS requests. The custom parameters are applied to GetCapabilities, GetMap and GetFeatureInfo. For example, if an access key is required, the key can be configured as a custom parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#customParameters)
+     */
     customParameters: any;
+    /**
+     * Description for the WMS layer. This defaults to the value of the Abstract property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#description)
+     */
     description: string;
+    /**
+     * Return format of feature information (MIME type).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#featureInfoFormat)
+     */
     featureInfoFormat: string;
+    /**
+     * The URL for the WMS GetFeatureInfo call.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#featureInfoUrl)
+     */
     featureInfoUrl: string;
+    /**
+     * All bounding boxes defined for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#fullExtents)
+     */
     fullExtents: Extent[];
+    /**
+     * The map image format (MIME type) to request. Defaults to `image/png` if the WMS service supports it. If not, it defaults to the value of the first `<Format>` in `<GetMap>` in the GetCapabilities response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageFormat)
+     */
     imageFormat: string;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageMaxHeight)
+     * 
+     * @default 2048
+     */
     imageMaxHeight: number;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageMaxWidth)
+     * 
+     * @default 2048
+     */
     imageMaxWidth: number;
+    /**
+     * Indicates whether the background of the image exported by the service is transparent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageTransparency)
+     * 
+     * @default true
+     */
     imageTransparency: boolean;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled: boolean;
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#spatialReference)
+     */
     spatialReference: SpatialReference;
+    /**
+     * List of spatialReference well known ids derived from the CRS elements of the first layer in the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#spatialReferences)
+     */
     spatialReferences: number[];
+    /**
+     * A collection of [WMSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#sublayers)
+     */
     sublayers: Collection<WMSSublayer>;
+    /**
+     * The URL of the WMS service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#url)
+     */
     url: string;
+    /**
+     * Version of the [WMS specification](http://www.opengeospatial.org/standards/wms) to use. For example, `1.3.0`, `1.1.1`, `1.1` or `1.0`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#version)
+     */
     version: string;
 
+    /**
+     * Fetching the WMS image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#fetchImage)
+     * 
+     * @param extent The extent of the view.
+     * @param width The width of the view in pixels.
+     * @param height The height of the view in pixels.
+     * @param options The parameter options is an object with the following properties.
+     * @param options.allowImageDataAccess Indicates if the access to the pixels of the image is required.
+     * @param options.pixelRatio The ratio of the resolution in physical pixels of the image to the resolution it will be displayed at.
+     * @param options.rotation The rotation in degrees of the exported image.
+     * 
+     */
     fetchImage(extent: Extent, width: number, height: number, options?: WMSLayerFetchImageOptions): IPromise<any>;
+    /**
+     * Returns a [WMSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html) based on the given sublayer id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#findSublayerById)
+     * 
+     * @param id The [id](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html#id) of the WMS sublayer.
+     * 
+     */
     findSublayerById(id: number): WMSSublayer;
 
+
     on(name: "layerview-create", eventHandler: WMSLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: WMSLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: WMSLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: WMSLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface WMSLayerConstructor {
+
+
     new(properties?: WMSLayerProperties): WMSLayer;
 
     fromJSON(json: any): WMSLayer;
@@ -3319,61 +12384,230 @@ declare namespace __esri {
 
   export const WMSLayer: WMSLayerConstructor;
 
-  interface WMSLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties {
+  interface WMSLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
+    /**
+     * Copyright information for the WMS service. This defaults to the value of the AccessConstraints property from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#copyright)
+     */
     copyright?: string;
+    /**
+     * Use this to append different custom parameters to the WMS map requests. The custom layer parameters are applied to GetMap and GetFeatureInfo.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#customLayerParameters)
+     */
     customLayerParameters?: any;
+    /**
+     * Use this to append custom parameters to all WMS requests. The custom parameters are applied to GetCapabilities, GetMap and GetFeatureInfo. For example, if an access key is required, the key can be configured as a custom parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#customParameters)
+     */
     customParameters?: any;
+    /**
+     * Description for the WMS layer. This defaults to the value of the Abstract property from the WMS GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#description)
+     */
     description?: string;
+    /**
+     * Return format of feature information (MIME type).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#featureInfoFormat)
+     */
     featureInfoFormat?: string;
+    /**
+     * The URL for the WMS GetFeatureInfo call.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#featureInfoUrl)
+     */
     featureInfoUrl?: string;
+    /**
+     * All bounding boxes defined for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#fullExtents)
+     */
     fullExtents?: ExtentProperties[];
+    /**
+     * The map image format (MIME type) to request. Defaults to `image/png` if the WMS service supports it. If not, it defaults to the value of the first `<Format>` in `<GetMap>` in the GetCapabilities response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageFormat)
+     */
     imageFormat?: string;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageMaxHeight)
+     * 
+     * @default 2048
+     */
     imageMaxHeight?: number;
+    /**
+     * Indicates the maximum height of the image exported by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageMaxWidth)
+     * 
+     * @default 2048
+     */
     imageMaxWidth?: number;
+    /**
+     * Indicates whether the background of the image exported by the service is transparent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#imageTransparency)
+     * 
+     * @default true
+     */
     imageTransparency?: boolean;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#legendEnabled)
+     * 
+     * @default true
+     */
     legendEnabled?: boolean;
+    /**
+     * The spatial reference of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
+    /**
+     * List of spatialReference well known ids derived from the CRS elements of the first layer in the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#spatialReferences)
+     */
     spatialReferences?: number[];
-    sublayers?: CollectionProperties<WMSSublayer>;
+    /**
+     * A collection of [WMSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMSSublayer.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#sublayers)
+     */
+    sublayers?: CollectionProperties<WMSSublayerProperties>;
+    /**
+     * The URL of the WMS service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#url)
+     */
     url?: string;
+    /**
+     * Version of the [WMS specification](http://www.opengeospatial.org/standards/wms) to use. For example, `1.3.0`, `1.1.1`, `1.1` or `1.0`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#version)
+     */
     version?: string;
   }
 
   export interface WMSLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface WMSLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
-  export interface WMSLayerFetchImageOptions {
+
+  export interface WMSLayerFetchImageOptions extends Object {
+    /**
+     * Indicates if the access to the pixels of the image is required.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#fetchImage)
+     */
     allowImageDataAccess?: boolean;
+    /**
+     * The ratio of the resolution in physical pixels of the image to the resolution it will be displayed at.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#fetchImage)
+     */
     pixelRatio?: number;
+    /**
+     * The rotation in degrees of the exported image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMSLayer.html#fetchImage)
+     */
     rotation?: number;
   }
 
-  interface WMTSLayer extends Layer, PortalLayer, ScaleRangeLayer {
+  interface WMTSLayer extends Layer, PortalLayer, ScaleRangeLayer, RefreshableLayer {
+    /**
+     * Currently active sublayer. Defaults to the first sublayer in [sublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#sublayers).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#activeLayer)
+     */
     activeLayer: WMTSSublayer;
+    /**
+     * Copyright information for the WMTS service. This defaults to the value of the AccessConstraints property from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#copyright)
+     */
     copyright: string;
+    /**
+     * Use this to append different custom parameters to the WMTS tile requests. The custom layer parameters are applied to GetTile.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#customLayerParameters)
+     */
     customLayerParameters: any;
+    /**
+     * Use this to append custom parameters to all WMTS requests. The custom parameters are applied to GetCapabilities and GetTile. For example, if an access key is required, the key can be configured as a custom parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#customParameters)
+     */
     customParameters: any;
+    /**
+     * The service mode for the WMTS layer. If not specified, the API will first make a getCapabilities request using `RESTful`. If that fails, it will try using `KVP`.  **Possible Values:** RESTful | KVP
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#serviceMode)
+     * 
+     * @default RESTful
+     */
     serviceMode: string;
+    /**
+     * A collection of [WMTSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html) objects.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#sublayers)
+     */
     sublayers: Collection<WMTSSublayer>;
+    /**
+     * The URL of the WMTS service. The URL for the GetCapabilities is created based on the url and serviceMode properties. For example https://gibs.earthdata.nasa.gov/wmts/epsg4326/best.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#url)
+     */
     url: string;
+    /**
+     * Version of the [WMTS specification](http://www.opengeospatial.org/standards/wmts) to use. Probably `1.0.0`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#version)
+     */
     version: string;
 
+    /**
+     * Returns a [WMTSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html) based on the given sublayer id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#findSublayerById)
+     * 
+     * @param id The [id](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html#id) of the WMTS sublayer.
+     * 
+     */
     findSublayerById(id: string): WMTSSublayer;
 
+
     on(name: "layerview-create", eventHandler: WMTSLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: WMTSLayerLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: WMTSLayerLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: WMTSLayerLayerviewDestroyEventHandler): IHandle;
   }
 
   interface WMTSLayerConstructor {
+
+
     new(properties?: WMTSLayerProperties): WMTSLayer;
 
     fromJSON(json: any): WMTSLayer;
@@ -3381,58 +12615,239 @@ declare namespace __esri {
 
   export const WMTSLayer: WMTSLayerConstructor;
 
-  interface WMTSLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties {
+  interface WMTSLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
+    /**
+     * Currently active sublayer. Defaults to the first sublayer in [sublayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#sublayers).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#activeLayer)
+     */
     activeLayer?: WMTSSublayerProperties;
+    /**
+     * Copyright information for the WMTS service. This defaults to the value of the AccessConstraints property from the GetCapabilities request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#copyright)
+     */
     copyright?: string;
+    /**
+     * Use this to append different custom parameters to the WMTS tile requests. The custom layer parameters are applied to GetTile.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#customLayerParameters)
+     */
     customLayerParameters?: any;
+    /**
+     * Use this to append custom parameters to all WMTS requests. The custom parameters are applied to GetCapabilities and GetTile. For example, if an access key is required, the key can be configured as a custom parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#customParameters)
+     */
     customParameters?: any;
+    /**
+     * The service mode for the WMTS layer. If not specified, the API will first make a getCapabilities request using `RESTful`. If that fails, it will try using `KVP`.  **Possible Values:** RESTful | KVP
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#serviceMode)
+     * 
+     * @default RESTful
+     */
     serviceMode?: string;
+    /**
+     * A collection of [WMTSSublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-WMTSSublayer.html) objects.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#sublayers)
+     */
     sublayers?: CollectionProperties<WMTSSublayerProperties>;
+    /**
+     * The URL of the WMTS service. The URL for the GetCapabilities is created based on the url and serviceMode properties. For example https://gibs.earthdata.nasa.gov/wmts/epsg4326/best.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#url)
+     */
     url?: string;
+    /**
+     * Version of the [WMTS specification](http://www.opengeospatial.org/standards/wmts) to use. Probably `1.0.0`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WMTSLayer.html#version)
+     */
     version?: string;
   }
 
   export interface WMTSLayerLayerviewCreateEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   export interface WMTSLayerLayerviewDestroyEvent {
+
     layerView: LayerView;
+
     view: View;
   }
 
   interface Map extends Accessor, LayersMixin {
-    allLayers: Collection<Layer>;
+    /**
+     * A flat collection of all the [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) in the map. This collection contains [basemap layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap), [operational layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) and [ground layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#ground). [Group Layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html) and their [children layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html#layers) are also part of this collection. Reference layers in the basemap will always be included at the end of the collection.  Layers should not be added directly to this collection. They must only be added via the [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers), [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) or [ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#ground) properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#allLayers)
+     */
+    readonly allLayers: Collection<Layer>;
+    /**
+     * Specifies a basemap for the map. The basemap is a set of tile layers that give geographic context to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the other [operational layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) in the map.  This value can be an instance of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) or one of the strings listed in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * streets | ![basemap-streets](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets.jpg)
+     * satellite | ![basemap-satellite](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/satellite.jpg)
+     * hybrid | ![basemap-hybrid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/hybrid.jpg)
+     * topo | ![basemap-topo](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/topo.jpg)
+     * gray | ![basemap-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/gray.jpg)
+     * dark-gray | ![basemap-dark-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/dark-gray.jpg)
+     * oceans | ![basemap-oceans](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/oceans.jpg)
+     * national-geographic | ![basemap-national-geographic](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/national-geographic.jpg)
+     * terrain | ![basemap-terrain](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/terrain.jpg)
+     * osm | ![basemap-osm](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/osm.jpg)
+     * dark-gray-vector | ![dark-gray-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/dark-gray.jpg)
+     * gray-vector | ![gray-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/gray.jpg)
+     * streets-vector | ![streets-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets.jpg)
+     * topo-vector | ![topo-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/topo.jpg)
+     * streets-night-vector | ![streets-night-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets-night.jpg)
+     * streets-relief-vector | ![streets-relief-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets-relief.jpg)
+     * streets-navigation-vector | ![streets-navigation-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets-navigation.jpg)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap)
+     */
     basemap: Basemap;
+    /**
+     * Specifies the surface properties for the map. This property is only relevant when adding the map to a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). It renders the terrain or topographical variations in the real world on the map's surface with a collection of [ElevationLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html).  This value can be an instance of [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html), or the string `world-elevation` for a default instance of ground using the [World Elevation Service](https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer). The ground may not be set to `null` or `undefined`, it is guaranteed to always contain an instance of type [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html). The elevation can be removed from the ground by setting the ground property to a new empty [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html) instance or by removing all the ground layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#ground)
+     */
     ground: Ground;
   }
 
   interface MapConstructor {
+    /**
+     * The Map class contains properties and methods for storing, managing, and overlaying [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) common to both 2D and 3D viewing. Layers can be added and removed from the map, but are rendered via a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) (for viewing data in 2D) or a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) (for viewing data in 3D). Thus a map instance is a simple container that holds the layers, while the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is the means of displaying and interacting with a map's layers and basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html)
+     */
+
     new(properties?: MapProperties): Map;
   }
 
   export const Map: MapConstructor;
 
   interface MapProperties extends LayersMixinProperties {
-    allLayers?: CollectionProperties<LayerProperties>;
-    basemap?: BasemapProperties;
-    ground?: GroundProperties;
+    /**
+     * Specifies a basemap for the map. The basemap is a set of tile layers that give geographic context to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the other [operational layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) in the map.  This value can be an instance of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) or one of the strings listed in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * streets | ![basemap-streets](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets.jpg)
+     * satellite | ![basemap-satellite](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/satellite.jpg)
+     * hybrid | ![basemap-hybrid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/hybrid.jpg)
+     * topo | ![basemap-topo](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/topo.jpg)
+     * gray | ![basemap-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/gray.jpg)
+     * dark-gray | ![basemap-dark-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/dark-gray.jpg)
+     * oceans | ![basemap-oceans](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/oceans.jpg)
+     * national-geographic | ![basemap-national-geographic](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/national-geographic.jpg)
+     * terrain | ![basemap-terrain](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/terrain.jpg)
+     * osm | ![basemap-osm](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/osm.jpg)
+     * dark-gray-vector | ![dark-gray-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/dark-gray.jpg)
+     * gray-vector | ![gray-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/gray.jpg)
+     * streets-vector | ![streets-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets.jpg)
+     * topo-vector | ![topo-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/topo.jpg)
+     * streets-night-vector | ![streets-night-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets-night.jpg)
+     * streets-relief-vector | ![streets-relief-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets-relief.jpg)
+     * streets-navigation-vector | ![streets-navigation-vector](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets-navigation.jpg)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap)
+     */
+    basemap?: BasemapProperties | string;
+    /**
+     * Specifies the surface properties for the map. This property is only relevant when adding the map to a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). It renders the terrain or topographical variations in the real world on the map's surface with a collection of [ElevationLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ElevationLayer.html).  This value can be an instance of [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html), or the string `world-elevation` for a default instance of ground using the [World Elevation Service](https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer). The ground may not be set to `null` or `undefined`, it is guaranteed to always contain an instance of type [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html). The elevation can be removed from the ground by setting the ground property to a new empty [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html) instance or by removing all the ground layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#ground)
+     */
+    ground?: GroundProperties | string;
   }
 
   interface PopupTemplate extends Accessor, JSONSupport {
-    actions: Collection<Collection<Action>>;
+    /**
+     * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) objects. Each object represents an action or function that may be executed by clicking the icon or image symbolizing them in the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html). By default, every [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) has a `zoom-to` action styled with a magnifying glass icon ![popupTemplate-zoom-action](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-zoom-action.png). When this icon is clicked, the view zooms in four LODs and centers on the selected feature.  PopupTemplates do not have default actions. To override actions on the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) using PopupTemplate see [overwriteActions](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#overwriteActions). Actions defined in a PopupTemplate will only appear in the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) for features or layers that apply that particular PopupTemplate.  The order of each action in the popup is the same order in which they appear in the actions [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html).  The [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event in [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) fires each time an action in the popup is clicked. This event should be used to execute custom code for each action clicked. For example, if you would like to add a `zoom-out` action to the PopupTemplate that zooms the view out several LODs, you would define the zoom-out code in a separate function. Then you would call the custom `zoom-out` function in the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event handler. See the sample code snippet below for more details on how this works.  Actions are defined with the properties listed in the [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#actions)
+     */
+    actions: Collection<Action>;
+    /**
+     * The template for defining and formatting a popup's content. Content may be defined with one of four types of values. 
+     *   * **String** - A popup's content can be a simple text or string value referencing field values or [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions. Expressions must be defined in the [expressionInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos) property. These values are referenced via placeholders. Within the string, placeholders are denoted by `{fieldName}` or `{expression/expressionName}` which are used to specify which values from field attributes or expressions to display within certain locations in the string. When the application runs, substitution occurs and the placeholder is replaced with the actual attribute or expression value for the selected feature. The string can also include HTML markup and formatting functions.
+     *   * **Popup elements** - You can also display content as popup elements defined as an array of Objects. These elements can be used individually or combined. The order in which they are set determines how they display within the popup. See the items below describing each element.
+     *   * **text** - Object that provides descriptive text as content. This object must be defined using the [text popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#text).
+     *   * **media** - Array of objects used to display media such as charts and/or images. This object must be defined using the [media popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media).
+     *   * **fields** - Array of [fieldInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos) objects. If `fieldInfos` is not set directly within the `content` property, the popup will display whatever is set in the [PopupTemplate.fieldInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos) property. This must be defined using the [fields popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fields).
+     *   * **attachments** - Array of attachmentInfos objects listed in the popup. This object must be defined using the [attachments popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#attachments).
+     *   * **promise** - The PopupTemplate's content may also be defined with a promise that resolves to any of the above-mentioned elements. This is useful for cases when you run a task or execute a query and want to display the results in the popup. Simply pass the promise to the popupTemplate's content and ensure that it resolves to a string or other popup element.
+     *   * **function** - Content may be defined with a JavaScript function that returns any of the above-mentioned elements. This is handy when your popup requires additional processing or functionality than what is provided with the four content types listed above. For example, let’s assume that you would like to display charts using third-party JavaScript libraries or categorize information into separate tabs. In these cases, you can use a function that returns either a string, a reference to an HTML element, a popup element, or a promise. When the feature is clicked, the feature is passed as an argument to the function and provides access to the feature’s graphic and attributes. The function then executes and returns a value to display in the popup template. It is also possible to check a specific feature attribute and determine whether to apply a function based on its value. Out-of-the-box formatting functions can be used to format date, time, and number values. The syntax for using an out-of-the-box formatting function is: `{field-name:format-function-name(option-a: value, option-b: value)}`
+     *   
+     *   
+     * The formatter functions are described below: 
+     * 
+     * Type | Description
+     * ----- | -----------
+     * DateString | Formats the date into a human-readable format. Supports the following options:    `hideTime: false` - When `true` shows time. Default value is `false`.    `local: false` - Displays date and time in the local time zone. Default value is `false`. When `false` the date will display in UTC.    `systemLocale: false` - Displays date and time in the system locale (local time zone). Default value is `false`.
+     * DateFormat | Converts date fields into a human-readable format using [dojo/date/locale.format](https://dojotoolkit.org/reference-guide/1.10/dojo/date/locale/format.html) method. Supports the same options as [dojo/date/locale.format](https://dojotoolkit.org/reference-guide/1.10/dojo/date/locale/format.html). The following snippets show some usage examples:    `{DATE_FIELD:DateFormat}` produces `3/8/08 4:00 PM`.    `{DATE_FIELD:DateFormat(selector: 'date', fullYear: true)}` produces `4/8/2009`.
+     * NumberFormat | Formats numbers into various formats using the [dojo/number.format](https://dojotoolkit.org/reference-guide/1.10/dojo/number.html#format) method. Supports the same set of options as [dojo/number.format](https://dojotoolkit.org/reference-guide/1.10/dojo/number.html#format). The following snippets show examples of usage pattern examples:    `{Magnitude:NumberFormat}` produces `4.23456`.    `{Magnitude:NumberFormat(places:2)}` produces `4.23`.
+     * 
+     * Out-of-the-box formatting functions and custom functions are supported as of version 4.1.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#content)
+     */
     content: string | any[] | Function | IPromise<any>;
+    /**
+     * An array of objects that reference [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions. These expressions evaluate to either a number or a string value on a feature-by-feature basis at runtime. The values display within the view's popup as if they are field values. They can be displayed in a table using the `fieldInfos` of the popupTemplate's content or referenced within a simple string. See the object specification table below for a description of the properties that may be set in each object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos)
+     */
     expressionInfos: PopupTemplateExpressionInfos[];
+    /**
+     * An array of objects that defines how fields in the dataset or values from [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions participate in a popup. Each object contains properties for a single field or expression. See the object specification table below for available options to set on each field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     fieldInfos: PopupTemplateFieldInfos[];
+    /**
+     * Additional options that can be defined for the popup layer. Currently supports one property, `showNoDataRecords`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#layerOptions)
+     * 
+     * @default null
+     */
     layerOptions: PopupTemplateLayerOptions;
+    /**
+     * Indicates whether actions should replace existing [popup actions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#overwriteActions)
+     * 
+     * @default false
+     */
     overwriteActions: boolean;
+    /**
+     * The template for defining how to format the title used in a popup. You can format the title by specifying either a string value or a function that returns a simple string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#title)
+     */
     title: string | Function;
-
-    clone(): PopupTemplate;
   }
 
   interface PopupTemplateConstructor {
+    /**
+     * A PopupTemplate formats and defines the content of a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) for a specific [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) or [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). A PopupTemplate allows the user to access values from feature attributes and values returned from [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions when a feature in the view is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html)
+     */
+
     new(properties?: PopupTemplateProperties): PopupTemplate;
 
     fromJSON(json: any): PopupTemplate;
@@ -3441,325 +12856,1652 @@ declare namespace __esri {
   export const PopupTemplate: PopupTemplateConstructor;
 
   interface PopupTemplateProperties {
-    actions?: CollectionProperties<CollectionProperties<ActionProperties>>;
+    /**
+     * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) objects. Each object represents an action or function that may be executed by clicking the icon or image symbolizing them in the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html). By default, every [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) has a `zoom-to` action styled with a magnifying glass icon ![popupTemplate-zoom-action](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-zoom-action.png). When this icon is clicked, the view zooms in four LODs and centers on the selected feature.  PopupTemplates do not have default actions. To override actions on the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) using PopupTemplate see [overwriteActions](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#overwriteActions). Actions defined in a PopupTemplate will only appear in the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) for features or layers that apply that particular PopupTemplate.  The order of each action in the popup is the same order in which they appear in the actions [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html).  The [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event in [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) fires each time an action in the popup is clicked. This event should be used to execute custom code for each action clicked. For example, if you would like to add a `zoom-out` action to the PopupTemplate that zooms the view out several LODs, you would define the zoom-out code in a separate function. Then you would call the custom `zoom-out` function in the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event handler. See the sample code snippet below for more details on how this works.  Actions are defined with the properties listed in the [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#actions)
+     */
+    actions?: CollectionProperties<ActionProperties>;
+    /**
+     * The template for defining and formatting a popup's content. Content may be defined with one of four types of values. 
+     *   * **String** - A popup's content can be a simple text or string value referencing field values or [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions. Expressions must be defined in the [expressionInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos) property. These values are referenced via placeholders. Within the string, placeholders are denoted by `{fieldName}` or `{expression/expressionName}` which are used to specify which values from field attributes or expressions to display within certain locations in the string. When the application runs, substitution occurs and the placeholder is replaced with the actual attribute or expression value for the selected feature. The string can also include HTML markup and formatting functions.
+     *   * **Popup elements** - You can also display content as popup elements defined as an array of Objects. These elements can be used individually or combined. The order in which they are set determines how they display within the popup. See the items below describing each element.
+     *   * **text** - Object that provides descriptive text as content. This object must be defined using the [text popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#text).
+     *   * **media** - Array of objects used to display media such as charts and/or images. This object must be defined using the [media popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media).
+     *   * **fields** - Array of [fieldInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos) objects. If `fieldInfos` is not set directly within the `content` property, the popup will display whatever is set in the [PopupTemplate.fieldInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos) property. This must be defined using the [fields popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fields).
+     *   * **attachments** - Array of attachmentInfos objects listed in the popup. This object must be defined using the [attachments popup element specification table](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#attachments).
+     *   * **promise** - The PopupTemplate's content may also be defined with a promise that resolves to any of the above-mentioned elements. This is useful for cases when you run a task or execute a query and want to display the results in the popup. Simply pass the promise to the popupTemplate's content and ensure that it resolves to a string or other popup element.
+     *   * **function** - Content may be defined with a JavaScript function that returns any of the above-mentioned elements. This is handy when your popup requires additional processing or functionality than what is provided with the four content types listed above. For example, let’s assume that you would like to display charts using third-party JavaScript libraries or categorize information into separate tabs. In these cases, you can use a function that returns either a string, a reference to an HTML element, a popup element, or a promise. When the feature is clicked, the feature is passed as an argument to the function and provides access to the feature’s graphic and attributes. The function then executes and returns a value to display in the popup template. It is also possible to check a specific feature attribute and determine whether to apply a function based on its value. Out-of-the-box formatting functions can be used to format date, time, and number values. The syntax for using an out-of-the-box formatting function is: `{field-name:format-function-name(option-a: value, option-b: value)}`
+     *   
+     *   
+     * The formatter functions are described below: 
+     * 
+     * Type | Description
+     * ----- | -----------
+     * DateString | Formats the date into a human-readable format. Supports the following options:    `hideTime: false` - When `true` shows time. Default value is `false`.    `local: false` - Displays date and time in the local time zone. Default value is `false`. When `false` the date will display in UTC.    `systemLocale: false` - Displays date and time in the system locale (local time zone). Default value is `false`.
+     * DateFormat | Converts date fields into a human-readable format using [dojo/date/locale.format](https://dojotoolkit.org/reference-guide/1.10/dojo/date/locale/format.html) method. Supports the same options as [dojo/date/locale.format](https://dojotoolkit.org/reference-guide/1.10/dojo/date/locale/format.html). The following snippets show some usage examples:    `{DATE_FIELD:DateFormat}` produces `3/8/08 4:00 PM`.    `{DATE_FIELD:DateFormat(selector: 'date', fullYear: true)}` produces `4/8/2009`.
+     * NumberFormat | Formats numbers into various formats using the [dojo/number.format](https://dojotoolkit.org/reference-guide/1.10/dojo/number.html#format) method. Supports the same set of options as [dojo/number.format](https://dojotoolkit.org/reference-guide/1.10/dojo/number.html#format). The following snippets show examples of usage pattern examples:    `{Magnitude:NumberFormat}` produces `4.23456`.    `{Magnitude:NumberFormat(places:2)}` produces `4.23`.
+     * 
+     * Out-of-the-box formatting functions and custom functions are supported as of version 4.1.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#content)
+     */
     content?: string | any[] | Function | IPromise<any>;
+    /**
+     * An array of objects that reference [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions. These expressions evaluate to either a number or a string value on a feature-by-feature basis at runtime. The values display within the view's popup as if they are field values. They can be displayed in a table using the `fieldInfos` of the popupTemplate's content or referenced within a simple string. See the object specification table below for a description of the properties that may be set in each object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos)
+     */
     expressionInfos?: PopupTemplateExpressionInfos[];
+    /**
+     * An array of objects that defines how fields in the dataset or values from [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions participate in a popup. Each object contains properties for a single field or expression. See the object specification table below for available options to set on each field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     fieldInfos?: PopupTemplateFieldInfos[];
+    /**
+     * Additional options that can be defined for the popup layer. Currently supports one property, `showNoDataRecords`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#layerOptions)
+     * 
+     * @default null
+     */
     layerOptions?: PopupTemplateLayerOptions;
+    /**
+     * Indicates whether actions should replace existing [popup actions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#overwriteActions)
+     * 
+     * @default false
+     */
     overwriteActions?: boolean;
+    /**
+     * The template for defining how to format the title used in a popup. You can format the title by specifying either a string value or a function that returns a simple string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#title)
+     */
     title?: string | Function;
   }
 
-  export interface Attachments {
+  /**
+   * Attachments are a type of popup element. Similar to text and media elements, attachments can only be set within the content.  ![popuptemplate-attachments-element](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-attachments-element.png)   The object specification for the fields popup element is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#attachments)
+   */
+  export interface Attachments extends Object {
+    /**
+     * **Required.** The type of popup element to display. To list attachments, set this to `attachments`. The attachmentInfos are queried from the service and will list within the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#attachments)
+     */
     type: string;
   }
 
-  export interface Fields {
+  /**
+   * It is possible to set the fieldInfos directly within the PopupTemplate's content. If the fieldInfos is not set within the content, it will revert to whatever may be set within the [PopupTemplate.fieldInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos) property.  ![popuptemplate-fields-element](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-fields-element.png)  The object specification for the fields popup element is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fields)
+   */
+  export interface Fields extends Object {
+    /**
+     * **Required.** The type of popup element to display. To display tabular field data, set this to `fields`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fields)
+     */
     type: string;
+    /**
+     * Object array of [fieldInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos). If the `fieldInfos` property is not provided directly within the content, the popup will display whatever is set directly in the `PopupTemplate.fieldInfos`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fields)
+     */
     fieldInfos: any[];
   }
 
-  export interface Media {
+  /**
+   * It is possible to set media elements such as charts and/or images within the PopupTemplate's content. This content is set within the mediaInfos. You will need to reference a dijit stylesheet and reference its class within the `<body>` HTML div. You can see this in the [Multiple popup elements sample](https://developers.arcgis.com/javascript/latest/sample-code/popup-multipleelements/index.html).  ![popuptemplate-media-element](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-media-element.png)  The object specification for the media popup element is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+   */
+  export interface Media extends Object {
+    /**
+     * **Required.** The type of popup element to display. To display charts or images, set this to `media`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     type: string;
+    /**
+     * **Required.** Object array of mediaInfos representing images or charts for display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     mediaInfos: MediaMediaInfos[];
   }
 
-  export interface PopupTemplateExpressionInfos {
+
+  export interface PopupTemplateExpressionInfos extends Object {
+    /**
+     * The name of the expression. This is used to reference the value of the given `expression` in the popupTemplate's [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#content) property by wrapping it in curly braces and prefacing it with `expression/` (e.g. `{expression/expressionName}`). See the code snippets below for more examples.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos)
+     */
     name: string;
+    /**
+     * The title used to describe the value returned by the expression in the popup. This will display if the value is referenced in a `fieldInfos` table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos)
+     */
     title?: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to either a string or a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos)
+     */
     expression: string;
+    /**
+     * Indicates the return type of the Arcade expression. This is an optional property.  **Known Values:** string | number
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos)
+     */
     returnType?: string;
   }
 
-  export interface PopupTemplateFieldInfos {
+
+  export interface PopupTemplateFieldInfos extends Object {
+    /**
+     * **Required.** The field name as defined by the service or the `name` of an [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression. Arcade expression names are defined in the [expressionInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos) property. When referencing Arcade expressions, you must preface the name with `expression/`, such as `expression/percent-total`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     fieldName: string;
+    /**
+     * An object used with numerical or date fields to provide more detail about how the value should be displayed in a popup. When formatting Number fields, you must set both the `digitSeparator` and `places` properties for the formatting to take effect.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     format?: PopupTemplateFieldInfosFormat;
+    /**
+     * The field alias to display in place of the `fieldName` in the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     label?: string;
+    /**
+     * For editable popups, defines the text box format.      **Known Values:** rich-text | text-area | text-box
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     stringFieldOption?: string;
+    /**
+     * Defines a tooltip for editable popup fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     tooltip?: string;
+    /**
+     * Defines whether the field is visible in the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     visible?: boolean;
   }
 
-  export interface PopupTemplateFieldInfosFormat {
+
+  export interface PopupTemplateFieldInfosFormat extends Object {
+    /**
+     * Used only with Date fields. Specifies how the date should appear in a popup. **Known Values:** short-date | short-date-le | long-date | day-short-month-year | long-month-day-year | short-date-long-time | short-date-le-long-time | short-date-short-time | short-date-le-short-time | short-date-short-time-24 | short-date-le-short-time-24 | short-date-short-time-24 | short-date-le-short-time-24 | long-month-year | short-month-year | year
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     dateFormat?: string;
+    /**
+     * Used only with Number fields. A value of `true` indicates the number should have a digit (or thousands) separator when the value appears in popups. A value of `false` means that no separator will be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     digitSeparator?: boolean;
+    /**
+     * Used only with Number fields to specify the number of supported decimal places that should appear in popups. Any places beyond this value are rounded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
+     */
     places?: number;
   }
 
-  export interface PopupTemplateLayerOptions {
+
+  export interface PopupTemplateLayerOptions extends Object {
+    /**
+     * Applicable to [Imagery Layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html). Indicates whether records without data should display within the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#layerOptions)
+     */
     showNoDataRecords: boolean;
   }
 
-  export interface Text {
+  /**
+   * An object used to define descriptive text as an element within the PopupTemplate's content. The text may reference values returned from a field attribute or an [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression.  ![popuptemplate-text-element](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-text-element.png)  The object specification for the text popup element is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#text)
+   */
+  export interface Text extends Object {
+    /**
+     * **Required.** The type of popup element to display. For descriptive text, set this to `text`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#text)
+     */
     type: string;
+    /**
+     * **Required.** The formatted string content to display. This may contain a field name enclosed in `{}`, such as `{FIELDNAME}`, or an [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression name, referenced as `{expression/EXPRESSIONNAME}`. Text content may also leverage HTML tags such as `<b></b>`, `<p></p>`, and `<table></table>` for formatting the look and feel of the content. To use this element, set the `type` property to `text`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#text)
+     */
     text: string;
   }
 
-  export interface MediaMediaInfos {
+
+  export interface MediaMediaInfos extends Object {
+    /**
+     * Defines the media title.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     title: string;
+    /**
+     * Defines a caption for the media.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     caption: string;
+    /**
+     * **Since: 4.5**   Refresh interval of the layer in minutes. Non-zero value indicates automatic layer refresh at the specified interval. Value of `0` indicates auto refresh is not enabled. If the property does not exist, it is equivalent to having a value of `0`. Only applicable when `type` is set to `image`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     refreshInterval: number;
+    /**
+     * Defines the media type. **Possible Values:** image | pie-chart | bar-chart | column-chart | line-chart
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     type: string;
+    /**
+     * Defines the value format. This depends on the media type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     value: MediaMediaInfosValue;
   }
 
-  export interface MediaMediaInfosValue {
+
+  export interface MediaMediaInfosValue extends Object {
+    /**
+     * Use this for image values. It defines the sourceURL pointing to the image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     sourceURL: string;
+    /**
+     * Used for chart values. An array of strings indicating field names from the specified layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     fields: string[];
+    /**
+     * Used for chart values. A field used to normalize data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     normalizationField: string;
+    /**
+     * Used for chart values. Defines a new dojo theme, only valid for chart types. View the [Dojox Charting Theme Preview](https://download.dojotoolkit.org/release-1.10.0/dojo-release-1.10.0/dojox/charting/tests/theme_preview.html) to see some of the theme options.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     theme: string;
+    /**
+     * Used for chart values. Defines the tooltip display field that displays when hovering over the chart.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#media)
+     */
     tooltipField: string;
   }
 
   interface Portal extends Accessor, Loadable {
+    /**
+     * The access level of the organization. When public, anonymous users can access the organization. When private, access is restricted to only members of the organization.  **Known Values:** public | private
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#access)
+     */
     access: string;
+    /**
+     * When `true`, access to the organization's Portal resources must occur over SSL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#allSSL)
+     */
     allSSL: boolean;
+    /**
+     * The authentication mode for handling authentication when the user attempts to access a secure resource. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * anonymous | An error will be returned when a secure resource is requested.
+     * auto | The user will be signed in when a secure resource is requested.
+     * immediate | The user will be signed in when the Portal is loaded.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#authMode)
+     * 
+     * @default auto
+     */
     authMode: string;
+    /**
+     * Array of trusted servers to send credentials to when making Cross-Origin Resource Sharing (CORS) requests to access services secured with web-tier authentication.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#authorizedCrossOriginDomains)
+     */
     authorizedCrossOriginDomains: string[];
+    /**
+     * The query that defines the basemaps that should be displayed in the [BasemapGallery](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html) when [useVectorBasemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useVectorBasemaps) is not true. The [fetchBasemaps()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchBasemaps) method does this automatically.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#basemapGalleryGroupQuery)
+     */
     basemapGalleryGroupQuery: string;
+    /**
+     * The Bing key to use for web maps using Bing Maps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#bingKey)
+     */
     bingKey: string;
+    /**
+     * Indicates whether an organization can list applications in the marketplace .
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canListApps)
+     */
     canListApps: boolean;
+    /**
+     * Indicates whether an organization can list data services in the marketplace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canListData)
+     */
     canListData: boolean;
+    /**
+     * Indicates whether an organization can list pre-provisioned items in the marketplace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canListPreProvisionedItems)
+     */
     canListPreProvisionedItems: boolean;
+    /**
+     * Indicates whether an organization can provision direct purchases in the marketplace without customer request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canProvisionDirectPurchase)
+     */
     canProvisionDirectPurchase: boolean;
+    /**
+     * When `true`, the organization's public items, groups and users are included in search queries. When `false`, no public items outside of the organization are included. However, public items which are part of the organization are included.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSearchPublic)
+     */
     canSearchPublic: boolean;
+    /**
+     * The Bing key can be shared to the public and is returned as part of a portal's description call (`/sharing/rest/portals/<orgid>`). This requires the access of the portal to be set to public. The canShareBingPublic property is not returned publicly but only shown to users within the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canShareBingPublic)
+     * 
+     * @default false
+     */
     canShareBingPublic: boolean;
+    /**
+     * When `true`, members of the organization can share resources outside the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSharePublic)
+     * 
+     * @default false
+     */
     canSharePublic: boolean;
+    /**
+     * Indicates whether to allow an organization with an enterprise IDP configured to be able to turn on or off the ArcGIS sign in.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSignInArcGIS)
+     * 
+     * @default false
+     */
     canSignInArcGIS: boolean;
+    /**
+     * Indicates whether to allow an organization with an enterprise IDP configured to be able to turn on or off the enterprise sign in.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSignInIDP)
+     * 
+     * @default false
+     */
     canSignInIDP: boolean;
+    /**
+     * The query that identifies the group containing the color sets used for rendering in the map viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#colorSetsGroupQuery)
+     */
     colorSetsGroupQuery: string;
+    /**
+     * Indicates whether to allow the organization to disable commenting. When commentsEnabled is false, comments are hidden and not removed. numComments are set to zero for all items in the organization. Calls to add a comment and view comments will fail. If the organization re-enables comments, the comments display and numComments are restored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#commentsEnabled)
+     * 
+     * @default false
+     */
     commentsEnabled: boolean;
+    /**
+     * Date the organization was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#created)
+     */
     created: Date;
+    /**
+     * The default locale (language and country) information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#culture)
+     */
     culture: string;
+    /**
+     * The custom base URL for the portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#customBaseUrl)
+     */
     customBaseUrl: string;
+    /**
+     * The default basemap to use for the portal. Used in the map viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultBasemap)
+     */
     defaultBasemap: Basemap;
+    /**
+     * The default extent to use for the portal. Used in the map viewer. The extent will be in the default basemap's spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultExtent)
+     */
     defaultExtent: Extent;
+    /**
+     * The default vector basemap to use for the portal. Used in the map viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultVectorBasemap)
+     */
     defaultVectorBasemap: Basemap;
+    /**
+     * A description of the organization/portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#description)
+     */
     description: string;
+    /**
+     * The featured groups for the portal. Returns an array of objects that provide access to the owner and title for each featured group. Each item in this array has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#featuredGroups)
+     */
     featuredGroups: PortalFeaturedGroups[];
+    /**
+     * The query that defines the featured group. If null, then the most viewed items in the organization will be the featured items.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#featuredItemsGroupQuery)
+     */
     featuredItemsGroupQuery: string;
+    /**
+     * The query that identifies the group containing features items for the gallery. Set a Group ID or, if null, then the most viewed items in your organization are displayed in the gallery.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#galleryTemplatesGroupQuery)
+     */
     galleryTemplatesGroupQuery: string;
+    /**
+     * Helper services provided by the portal. For the detailed information about these services, see the [about utility services](https://server.arcgis.com/en/portal/latest/administer/windows/about-utility-services.htm) topic from the ArcGIS Server documentation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#helperServices)
+     */
     helperServices: any;
+    /**
+     * The group that contains featured content to be displayed on the home page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#homePageFeaturedContent)
+     */
     homePageFeaturedContent: string;
+    /**
+     * The number of featured items that can be displayed on the home page. The max is 100. Accepts integers only.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#homePageFeaturedContentCount)
+     */
     homePageFeaturedContentCount: number;
+    /**
+     * The port used by the portal for HTTP communication.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#httpPort)
+     */
     httpPort: number;
+    /**
+     * The port used by the portal for HTTPS communication.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#httpsPort)
+     */
     httpsPort: number;
+    /**
+     * The id of the organization that owns this portal. If `null` then this is the default portal for anonymous and non-organizational users.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#id)
+     */
     id: string;
+    /**
+     * The country code of the calling IP (ArcGIS Online only).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#ipCntryCode)
+     */
     ipCntryCode: string;
-    isOrganization: boolean;
+    /**
+     * Indicates whether the portal is an organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#isOrganization)
+     */
+    readonly isOrganization: boolean;
+    /**
+     * Indicates if the portal is on-premises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#isPortal)
+     */
     isPortal: boolean;
+    /**
+     * The query that identifies the group containing editing templates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#layerTemplatesGroupQuery)
+     */
     layerTemplatesGroupQuery: string;
-    loaded: boolean;
+    /**
+     * Indicates whether the portal's resources have loaded. When `true`, all the properties of the object can be accessed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#loaded)
+     * 
+     * @default false
+     */
+    readonly loaded: boolean;
+    /**
+     * The maximum validity in minutes of tokens issued for users of the organization. -1 is the default and is a special value that indicates infinite timeout or permanent tokens. For tokens granted using OAuth 2.0 authorization grant, it represents the maximum validity of refresh tokens. For access tokens, the maximum validity is the lower of two weeks or this value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#maxTokenExpirationMinutes)
+     */
     maxTokenExpirationMinutes: number;
+    /**
+     * Date the organization was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#modified)
+     */
     modified: Date;
+    /**
+     * Name of the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#name)
+     */
     name: string;
+    /**
+     * URL of the portal host.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalHostname)
+     */
     portalHostname: string;
+    /**
+     * The portal mode.  **Known Values:** multitenant | singletenant
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalMode)
+     */
     portalMode: string;
+    /**
+     * Properties specific to the organization, for example the "contact us" link. If the organization is public, the properties are visible to the anonymous user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalProperties)
+     */
     portalProperties: any;
+    /**
+     * The region for the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#region)
+     */
     region: string;
-    restUrl: string;
+    /**
+     * The REST URL for the portal, for example "https://www.arcgis.com/sharing/rest" for ArcGIS Online and "https://www.example.com/arcgis/sharing/rest" for your in-house portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#restUrl)
+     */
+    readonly restUrl: string;
+    /**
+     * Custom HTML for the home page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#rotatorPanels)
+     */
     rotatorPanels: any[];
+    /**
+     * Indicates whether the description of your organization displays on the home page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#showHomePageDescription)
+     */
     showHomePageDescription: boolean;
+    /**
+     * Indicates whether hosted services are supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#supportsHostedServices)
+     * 
+     * @default false
+     */
     supportsHostedServices: boolean;
+    /**
+     * The query that defines the symbols sets.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#symbolSetsGroupQuery)
+     */
     symbolSetsGroupQuery: string;
+    /**
+     * The query that defines the collection of templates that will appear in the template gallery.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#templatesGroupQuery)
+     */
     templatesGroupQuery: string;
-    thumbnailUrl: string;
+    /**
+     * The URL to the thumbnail of the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#thumbnailUrl)
+     */
+    readonly thumbnailUrl: string;
+    /**
+     * Sets the units of measure for the organization's users. The user default is derived from the organization's [region](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#region).  **Known Values:** english | metric
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#units)
+     */
     units: string;
+    /**
+     * The URL to the portal instance. Setting the location of the portal instance via [esriConfig.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) should be used in favor of setting it directly on this property.  If using an on-premise portal, the syntax should look similar to: `https://www.example.com/arcgis`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#url)
+     * 
+     * @default {@link module:esri/config#portalUrl esriConfig.portalUrl}
+     */
     url: string;
+    /**
+     * The prefix selected by the organization's administrator to be used with the customBaseURL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#urlKey)
+     */
     urlKey: string;
+    /**
+     * Information representing a registered user of the portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#user)
+     */
     user: PortalUser;
+    /**
+     * When `true`, only simple where clauses that are compliant with SQL92 can be used when querying layers and tables. The recommended security setting is true.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useStandardizedQuery)
+     */
     useStandardizedQuery: boolean;
+    /**
+     * When `true`, the organization has opted in to use the vector tile basemaps, and (a) [vectorBasemapGalleryGroupQuery](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#vectorBasemapGalleryGroupQuery) should be used instead of [basemapGalleryGroupQuery](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#basemapGalleryGroupQuery), while (b) [defaultVectorBasemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultVectorBasemap) should be used instead of [defaultBasemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultBasemap). The [fetchBasemaps()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchBasemaps) method automatically uses vectorBasemapGalleryGroupQuery.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useVectorBasemaps)
+     */
     useVectorBasemaps: boolean;
+    /**
+     * The query that defines the vector tiles basemaps that should be displayed in the [BasemapGallery](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html) when [useVectorBasemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useVectorBasemaps) is true. The [fetchBasemaps()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchBasemaps) method does this automatically.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#vectorBasemapGalleryGroupQuery)
+     */
     vectorBasemapGalleryGroupQuery: string;
 
+    /**
+     * Fetches the [basemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) that are displayed in the [BasemapGallery](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html). When [useVectorBasemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useVectorBasemaps) is `true`, the basemaps will be based on [vectorBasemapGalleryGroupQuery](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#vectorBasemapGalleryGroupQuery), and otherwise on [basemapGalleryGroupQuery](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#basemapGalleryGroupQuery).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchBasemaps)
+     * 
+     * @param basemapGalleryGroupQuery When provided, this argument is used to fetch basemaps based on input query parameters.
+     * 
+     */
     fetchBasemaps(basemapGalleryGroupQuery?: string): IPromise<Basemap[]>;
+    /**
+     * Fetches the featured groups in the Portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchFeaturedGroups)
+     * 
+     * 
+     */
     fetchFeaturedGroups(): IPromise<PortalGroup[]>;
-    queryGroups(queryParams: PortalQueryParams): IPromise<PortalQueryResult>;
-    queryItems(queryParams: PortalQueryParams): IPromise<PortalQueryResult>;
-    queryUsers(queryParams: PortalQueryParams): IPromise<PortalQueryResult>;
+    /**
+     * Executes a query against the Portal to return an array of [PortalGroup](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html) objects that match the input query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#queryGroups)
+     * 
+     * @param queryParams The input query parameters defined in [PortalQueryParams](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html).
+     * 
+     */
+    queryGroups(queryParams: PortalQueryParams | PortalQueryParamsProperties): IPromise<PortalQueryResult>;
+    /**
+     * Executes a query against the Portal to return an array of [PortalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html) objects that match the input query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#queryItems)
+     * 
+     * @param queryParams The input query parameters defined in [PortalQueryParams](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html).
+     * 
+     */
+    queryItems(queryParams: PortalQueryParams | PortalQueryParamsProperties): IPromise<PortalQueryResult>;
+    /**
+     * Executes a query against the Portal to return an array of [PortalUser](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html) objects that match the input query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#queryUsers)
+     * 
+     * @param queryParams The input query parameters defined in [PortalQueryParams](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html).
+     * 
+     */
+    queryUsers(queryParams: PortalQueryParams | PortalQueryParamsProperties): IPromise<PortalQueryResult>;
   }
 
   interface PortalConstructor {
+    /**
+     * The Portal class is part of the [ArcGIS Portal API](http://server.arcgis.com/en/portal/) which provides a way to build applications that work with content from [ArcGIS Online](http://www.arcgis.com/home/) or an [ArcGIS Portal API](http://server.arcgis.com/en/portal/). [ArcGIS Portal API](http://server.arcgis.com/en/portal/) is software from Esri that customers can deploy either on-premises or in the cloud. [ArcGIS Online](http://www.arcgis.com/home/) is Esri's Software as a Service offering that represents GIS as a Service and is implemented using the same technology as ArcGIS Portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html)
+     */
+
     new(properties?: PortalProperties): Portal;
 
 
+    /**
+     * Returns a cached default Portal instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#getDefault)
+     * 
+     * 
+     */
     getDefault(): Portal;
   }
 
   export const Portal: PortalConstructor;
 
   interface PortalProperties extends LoadableProperties {
+    /**
+     * The access level of the organization. When public, anonymous users can access the organization. When private, access is restricted to only members of the organization.  **Known Values:** public | private
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#access)
+     */
     access?: string;
+    /**
+     * When `true`, access to the organization's Portal resources must occur over SSL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#allSSL)
+     */
     allSSL?: boolean;
+    /**
+     * The authentication mode for handling authentication when the user attempts to access a secure resource. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * anonymous | An error will be returned when a secure resource is requested.
+     * auto | The user will be signed in when a secure resource is requested.
+     * immediate | The user will be signed in when the Portal is loaded.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#authMode)
+     * 
+     * @default auto
+     */
     authMode?: string;
+    /**
+     * Array of trusted servers to send credentials to when making Cross-Origin Resource Sharing (CORS) requests to access services secured with web-tier authentication.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#authorizedCrossOriginDomains)
+     */
     authorizedCrossOriginDomains?: string[];
+    /**
+     * The query that defines the basemaps that should be displayed in the [BasemapGallery](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html) when [useVectorBasemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useVectorBasemaps) is not true. The [fetchBasemaps()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchBasemaps) method does this automatically.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#basemapGalleryGroupQuery)
+     */
     basemapGalleryGroupQuery?: string;
+    /**
+     * The Bing key to use for web maps using Bing Maps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#bingKey)
+     */
     bingKey?: string;
+    /**
+     * Indicates whether an organization can list applications in the marketplace .
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canListApps)
+     */
     canListApps?: boolean;
+    /**
+     * Indicates whether an organization can list data services in the marketplace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canListData)
+     */
     canListData?: boolean;
+    /**
+     * Indicates whether an organization can list pre-provisioned items in the marketplace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canListPreProvisionedItems)
+     */
     canListPreProvisionedItems?: boolean;
+    /**
+     * Indicates whether an organization can provision direct purchases in the marketplace without customer request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canProvisionDirectPurchase)
+     */
     canProvisionDirectPurchase?: boolean;
+    /**
+     * When `true`, the organization's public items, groups and users are included in search queries. When `false`, no public items outside of the organization are included. However, public items which are part of the organization are included.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSearchPublic)
+     */
     canSearchPublic?: boolean;
+    /**
+     * The Bing key can be shared to the public and is returned as part of a portal's description call (`/sharing/rest/portals/<orgid>`). This requires the access of the portal to be set to public. The canShareBingPublic property is not returned publicly but only shown to users within the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canShareBingPublic)
+     * 
+     * @default false
+     */
     canShareBingPublic?: boolean;
+    /**
+     * When `true`, members of the organization can share resources outside the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSharePublic)
+     * 
+     * @default false
+     */
     canSharePublic?: boolean;
+    /**
+     * Indicates whether to allow an organization with an enterprise IDP configured to be able to turn on or off the ArcGIS sign in.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSignInArcGIS)
+     * 
+     * @default false
+     */
     canSignInArcGIS?: boolean;
+    /**
+     * Indicates whether to allow an organization with an enterprise IDP configured to be able to turn on or off the enterprise sign in.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#canSignInIDP)
+     * 
+     * @default false
+     */
     canSignInIDP?: boolean;
+    /**
+     * The query that identifies the group containing the color sets used for rendering in the map viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#colorSetsGroupQuery)
+     */
     colorSetsGroupQuery?: string;
+    /**
+     * Indicates whether to allow the organization to disable commenting. When commentsEnabled is false, comments are hidden and not removed. numComments are set to zero for all items in the organization. Calls to add a comment and view comments will fail. If the organization re-enables comments, the comments display and numComments are restored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#commentsEnabled)
+     * 
+     * @default false
+     */
     commentsEnabled?: boolean;
+    /**
+     * Date the organization was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#created)
+     */
     created?: DateProperties;
+    /**
+     * The default locale (language and country) information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#culture)
+     */
     culture?: string;
+    /**
+     * The custom base URL for the portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#customBaseUrl)
+     */
     customBaseUrl?: string;
+    /**
+     * The default basemap to use for the portal. Used in the map viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultBasemap)
+     */
     defaultBasemap?: BasemapProperties;
+    /**
+     * The default extent to use for the portal. Used in the map viewer. The extent will be in the default basemap's spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultExtent)
+     */
     defaultExtent?: ExtentProperties;
+    /**
+     * The default vector basemap to use for the portal. Used in the map viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultVectorBasemap)
+     */
     defaultVectorBasemap?: BasemapProperties;
+    /**
+     * A description of the organization/portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#description)
+     */
     description?: string;
+    /**
+     * The featured groups for the portal. Returns an array of objects that provide access to the owner and title for each featured group. Each item in this array has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#featuredGroups)
+     */
     featuredGroups?: PortalFeaturedGroups[];
+    /**
+     * The query that defines the featured group. If null, then the most viewed items in the organization will be the featured items.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#featuredItemsGroupQuery)
+     */
     featuredItemsGroupQuery?: string;
+    /**
+     * The query that identifies the group containing features items for the gallery. Set a Group ID or, if null, then the most viewed items in your organization are displayed in the gallery.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#galleryTemplatesGroupQuery)
+     */
     galleryTemplatesGroupQuery?: string;
+    /**
+     * Helper services provided by the portal. For the detailed information about these services, see the [about utility services](https://server.arcgis.com/en/portal/latest/administer/windows/about-utility-services.htm) topic from the ArcGIS Server documentation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#helperServices)
+     */
     helperServices?: any;
+    /**
+     * The group that contains featured content to be displayed on the home page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#homePageFeaturedContent)
+     */
     homePageFeaturedContent?: string;
+    /**
+     * The number of featured items that can be displayed on the home page. The max is 100. Accepts integers only.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#homePageFeaturedContentCount)
+     */
     homePageFeaturedContentCount?: number;
+    /**
+     * The port used by the portal for HTTP communication.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#httpPort)
+     */
     httpPort?: number;
+    /**
+     * The port used by the portal for HTTPS communication.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#httpsPort)
+     */
     httpsPort?: number;
+    /**
+     * The id of the organization that owns this portal. If `null` then this is the default portal for anonymous and non-organizational users.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#id)
+     */
     id?: string;
+    /**
+     * The country code of the calling IP (ArcGIS Online only).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#ipCntryCode)
+     */
     ipCntryCode?: string;
-    isOrganization?: boolean;
+    /**
+     * Indicates if the portal is on-premises.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#isPortal)
+     */
     isPortal?: boolean;
+    /**
+     * The query that identifies the group containing editing templates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#layerTemplatesGroupQuery)
+     */
     layerTemplatesGroupQuery?: string;
-    loaded?: boolean;
+    /**
+     * The maximum validity in minutes of tokens issued for users of the organization. -1 is the default and is a special value that indicates infinite timeout or permanent tokens. For tokens granted using OAuth 2.0 authorization grant, it represents the maximum validity of refresh tokens. For access tokens, the maximum validity is the lower of two weeks or this value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#maxTokenExpirationMinutes)
+     */
     maxTokenExpirationMinutes?: number;
+    /**
+     * Date the organization was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#modified)
+     */
     modified?: DateProperties;
+    /**
+     * Name of the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#name)
+     */
     name?: string;
+    /**
+     * URL of the portal host.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalHostname)
+     */
     portalHostname?: string;
+    /**
+     * The portal mode.  **Known Values:** multitenant | singletenant
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalMode)
+     */
     portalMode?: string;
+    /**
+     * Properties specific to the organization, for example the "contact us" link. If the organization is public, the properties are visible to the anonymous user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalProperties)
+     */
     portalProperties?: any;
+    /**
+     * The region for the organization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#region)
+     */
     region?: string;
-    restUrl?: string;
+    /**
+     * Custom HTML for the home page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#rotatorPanels)
+     */
     rotatorPanels?: any[];
+    /**
+     * Indicates whether the description of your organization displays on the home page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#showHomePageDescription)
+     */
     showHomePageDescription?: boolean;
+    /**
+     * Indicates whether hosted services are supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#supportsHostedServices)
+     * 
+     * @default false
+     */
     supportsHostedServices?: boolean;
+    /**
+     * The query that defines the symbols sets.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#symbolSetsGroupQuery)
+     */
     symbolSetsGroupQuery?: string;
+    /**
+     * The query that defines the collection of templates that will appear in the template gallery.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#templatesGroupQuery)
+     */
     templatesGroupQuery?: string;
-    thumbnailUrl?: string;
+    /**
+     * Sets the units of measure for the organization's users. The user default is derived from the organization's [region](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#region).  **Known Values:** english | metric
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#units)
+     */
     units?: string;
+    /**
+     * The URL to the portal instance. Setting the location of the portal instance via [esriConfig.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) should be used in favor of setting it directly on this property.  If using an on-premise portal, the syntax should look similar to: `https://www.example.com/arcgis`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#url)
+     * 
+     * @default {@link module:esri/config#portalUrl esriConfig.portalUrl}
+     */
     url?: string;
+    /**
+     * The prefix selected by the organization's administrator to be used with the customBaseURL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#urlKey)
+     */
     urlKey?: string;
+    /**
+     * Information representing a registered user of the portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#user)
+     */
     user?: PortalUserProperties;
+    /**
+     * When `true`, only simple where clauses that are compliant with SQL92 can be used when querying layers and tables. The recommended security setting is true.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useStandardizedQuery)
+     */
     useStandardizedQuery?: boolean;
+    /**
+     * When `true`, the organization has opted in to use the vector tile basemaps, and (a) [vectorBasemapGalleryGroupQuery](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#vectorBasemapGalleryGroupQuery) should be used instead of [basemapGalleryGroupQuery](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#basemapGalleryGroupQuery), while (b) [defaultVectorBasemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultVectorBasemap) should be used instead of [defaultBasemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#defaultBasemap). The [fetchBasemaps()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchBasemaps) method automatically uses vectorBasemapGalleryGroupQuery.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useVectorBasemaps)
+     */
     useVectorBasemaps?: boolean;
+    /**
+     * The query that defines the vector tiles basemaps that should be displayed in the [BasemapGallery](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html) when [useVectorBasemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#useVectorBasemaps) is true. The [fetchBasemaps()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchBasemaps) method does this automatically.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#vectorBasemapGalleryGroupQuery)
+     */
     vectorBasemapGalleryGroupQuery?: string;
   }
 
-  export interface PortalFeaturedGroups {
+
+  export interface PortalFeaturedGroups extends Object {
+    /**
+     * Name of the group owner.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#featuredGroups)
+     */
     owner: string;
+    /**
+     * Group title.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#featuredGroups)
+     */
     title: string;
   }
 
   interface PortalFolder extends Accessor {
+    /**
+     * The date the folder was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#created)
+     */
     created: Date;
+    /**
+     * The unique id of the folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#id)
+     */
     id: string;
+    /**
+     * The portal associated with the folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#portal)
+     */
     portal: Portal;
+    /**
+     * The title of the folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#title)
+     */
     title: string;
-    url: string;
+    /**
+     * The URL to the folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#url)
+     */
+    readonly url: string;
   }
 
   interface PortalFolderConstructor {
+
+
     new(properties?: PortalFolderProperties): PortalFolder;
   }
 
   export const PortalFolder: PortalFolderConstructor;
 
   interface PortalFolderProperties {
+    /**
+     * The date the folder was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#created)
+     */
     created?: DateProperties;
+    /**
+     * The unique id of the folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#id)
+     */
     id?: string;
+    /**
+     * The portal associated with the folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#portal)
+     */
     portal?: PortalProperties;
+    /**
+     * The title of the folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalFolder.html#title)
+     */
     title?: string;
-    url?: string;
   }
 
   interface PortalGroup extends Accessor {
+    /**
+     * The access privileges on the group which determines who can see and access the group.  **Known Values:** private | org | public
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#access)
+     */
     access: string;
+    /**
+     * The date the group was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#created)
+     */
     created: Date;
+    /**
+     * A detailed description of the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#description)
+     */
     description: string;
+    /**
+     * The unique id for the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#id)
+     */
     id: string;
+    /**
+     * If set to `true`, then users will not be able to apply to join the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#isInvitationOnly)
+     * 
+     * @default false
+     */
     isInvitationOnly: boolean;
+    /**
+     * The date the group was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#modified)
+     */
     modified: Date;
+    /**
+     * The username of the group's owner.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#owner)
+     */
     owner: string;
+    /**
+     * The portal associated with the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#portal)
+     */
     portal: Portal;
+    /**
+     * A short summary that describes the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#snippet)
+     */
     snippet: string;
+    /**
+     * User defined tags that describe the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#tags)
+     */
     tags: string[];
-    thumbnailUrl: string;
+    /**
+     * The URL to the thumbnail used for the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#thumbnailUrl)
+     */
+    readonly thumbnailUrl: string;
+    /**
+     * The title of the group. This is the name that is displayed to users. It is also used to refer to the group. Every group must have a title and it must be unique.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#title)
+     */
     title: string;
-    url: string;
+    /**
+     * The URL to the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#url)
+     */
+    readonly url: string;
 
+    /**
+     * Fetches the current members of the group. This method is only available to members or administrators of the group. View the ArcGIS Portal API REST documentation for the [Group Users](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Group_Users/02r30000006p000000/) for more details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#fetchMembers)
+     * 
+     * 
+     */
     fetchMembers(): IPromise<any>;
+    /**
+     * Get the URL to the thumbnail image for the group.  Available width sizes: 150, 300 and 600.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#getThumbnailUrl)
+     * 
+     * @param width The desired image width.
+     * 
+     */
     getThumbnailUrl(width?: number): string;
-    queryItems(queryParams?: PortalQueryParams): IPromise<PortalQueryResult>;
+    /**
+     * Executes a query against the group to return an array of [PortalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html) objects that match the input query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#queryItems)
+     * 
+     * @param queryParams The input query parameters defined in [PortalQueryParams](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html).
+     * 
+     */
+    queryItems(queryParams?: PortalQueryParams | PortalQueryParamsProperties): IPromise<PortalQueryResult>;
   }
 
   interface PortalGroupConstructor {
+
+
     new(properties?: PortalGroupProperties): PortalGroup;
   }
 
   export const PortalGroup: PortalGroupConstructor;
 
   interface PortalGroupProperties {
+    /**
+     * The access privileges on the group which determines who can see and access the group.  **Known Values:** private | org | public
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#access)
+     */
     access?: string;
+    /**
+     * The date the group was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#created)
+     */
     created?: DateProperties;
+    /**
+     * A detailed description of the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#description)
+     */
     description?: string;
+    /**
+     * The unique id for the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#id)
+     */
     id?: string;
+    /**
+     * If set to `true`, then users will not be able to apply to join the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#isInvitationOnly)
+     * 
+     * @default false
+     */
     isInvitationOnly?: boolean;
+    /**
+     * The date the group was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#modified)
+     */
     modified?: DateProperties;
+    /**
+     * The username of the group's owner.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#owner)
+     */
     owner?: string;
+    /**
+     * The portal associated with the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#portal)
+     */
     portal?: PortalProperties;
+    /**
+     * A short summary that describes the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#snippet)
+     */
     snippet?: string;
+    /**
+     * User defined tags that describe the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#tags)
+     */
     tags?: string[];
-    thumbnailUrl?: string;
+    /**
+     * The title of the group. This is the name that is displayed to users. It is also used to refer to the group. Every group must have a title and it must be unique.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#title)
+     */
     title?: string;
-    url?: string;
   }
 
   interface PortalItem extends Accessor, Loadable, JSONSupport {
+    /**
+     * Indicates the level of access to this item: `private`, `shared`, `org`, or `public`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#access)
+     */
     access: string;
+    /**
+     * Information on the source of the item and its copyright status.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#accessInformation)
+     */
     accessInformation: string;
+    /**
+     * Average rating. Uses a weighted average called "Bayesian average."
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#avgRating)
+     */
     avgRating: number;
+    /**
+     * The date the item was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#created)
+     */
     created: Date;
+    /**
+     * The item's locale information (language and country).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#culture)
+     */
     culture: string;
+    /**
+     * The detailed description of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#description)
+     */
     description: string;
+    /**
+     * The geographic extent, or bounding rectangle, of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#extent)
+     */
     extent: Extent;
+    /**
+     * The unique id for the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#id)
+     */
     id: string;
-    isLayer: boolean;
-    itemControl: string;
-    itemUrl: string;
+    /**
+     * Indicates whether a layer can be created from this item using [Layer.fromPortalItem()](esri-layers-Layer.html#fromPortalItem).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#isLayer)
+     */
+    readonly isLayer: boolean;
+    /**
+     * Indicates whether an item can be updated and deleted. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * admin | The item can be updated or deleted.
+     * update | The item can be updated, but not deleted.
+     * null | The item cannot be updated nor deleted.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#itemControl)
+     */
+    readonly itemControl: string;
+    /**
+     * The URL to the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#itemUrl)
+     */
+    readonly itemUrl: string;
+    /**
+     * Information on license or restrictions related to the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#licenseInfo)
+     */
     licenseInfo: string;
-    loaded: boolean;
+    /**
+     * Indicates whether the item's resources have loaded from the portal. When `true`, all the properties of the object can be accessed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#loaded)
+     * 
+     * @default false
+     */
+    readonly loaded: boolean;
+    /**
+     * The date the item was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#modified)
+     */
     modified: Date;
+    /**
+     * The name of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#name)
+     */
     name: string;
+    /**
+     * Number of comments on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#numComments)
+     */
     numComments: number;
+    /**
+     * Number of ratings on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#numRatings)
+     */
     numRatings: number;
+    /**
+     * Number of views on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#numViews)
+     */
     numViews: number;
+    /**
+     * The username of the user who owns this item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#owner)
+     */
     owner: string;
+    /**
+     * The portal that contains the item. Defaults to the value in [config.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) (e.g. https://www.arcgis.com). Suggested to use [config.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) instead of this property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#portal)
+     */
     portal: Portal;
+    /**
+     * The size of the item (in bytes).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#size)
+     */
     size: number;
+    /**
+     * A summary description of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#snippet)
+     */
     snippet: string;
+    /**
+     * User defined tags that describe the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#tags)
+     */
     tags: string[];
-    thumbnailUrl: string;
+    /**
+     * The URL to the thumbnail used for the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#thumbnailUrl)
+     */
+    readonly thumbnailUrl: string;
+    /**
+     * The title for the item. This is the name that is displayed to users and used to refer to the item. Every item must have a title.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#title)
+     */
     title: string;
+    /**
+     * The GIS content type of this item. Example types include Web Map, Map Service, Shapefile, and Web Mapping Application. See the [ArcGIS REST API Items and Items Types Reference](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Items_and_item_types/02r3000000ms000000/) to get an understanding of the item type hierarchy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#type)
+     */
     type: string;
+    /**
+     * Type keywords that describe the type of content of this item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#typeKeywords)
+     */
     typeKeywords: string[];
+    /**
+     * The service URL of this item. Only certain layer item types such as "Feature Service", "Map Service", "Image Service", "Scene Service", "WMS" and "KML" have service URLs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#url)
+     */
     url: string;
 
+    /**
+     * Adds a rating to an accessible item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#addRating)
+     * 
+     * @param rating Rating to set for the item. Rating must be a number between 1.0 and 5.0.
+     * 
+     */
     addRating(rating: number | PortalRating): IPromise<PortalRating>;
+    /**
+     * Deletes a rating for the specified item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#deleteRating)
+     * 
+     * 
+     */
     deleteRating(): IPromise<any>;
+    /**
+     * Requests a PortalItem in the format specified in `responseType`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#fetchData)
+     * 
+     * @param responseType The format of the response.  **Known Values:** json | xml | text | blob | array-buffer | document
+     * 
+     */
     fetchData(responseType?: string): IPromise<any>;
+    /**
+     * Returns the rating (if any) given to the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#fetchRating)
+     * 
+     * 
+     */
     fetchRating(): IPromise<PortalRating>;
+    /**
+     * Gets all the related items of a certain relationship type for the portal item. An optional direction can be specified if the direction of the relationship is ambiguous. Otherwise, the service will try to infer it.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#fetchRelatedItems)
+     * 
+     * @param params See the object specifications table below for the parameters that may be passed as properties in this object.
+     * @param params.relationshipType The type of relationship between the two items. See [Relationship types](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000mm000000) for a complete listing of types.
+     * @param params.direction The direction of the relationship. Can either be `forward` (from origin to destination) or `reverse` (from destination to origin).  **Possible Values:** forward | reverse
+     * 
+     */
     fetchRelatedItems(params: PortalItemFetchRelatedItemsParams): IPromise<PortalItem[]>;
+    /**
+     * Get the URL to the thumbnail image for the item.  Available width sizes: 200, 400, 800 and 2400.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#getThumbnailUrl)
+     * 
+     * @param width The desired image width.
+     * 
+     */
     getThumbnailUrl(width?: number): string;
+    /**
+     * Updates the item's properties to the portal, and optionally its data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#update)
+     * 
+     * @param params See the object specifications table below for the parameters that may be passed as properties in this object.
+     * @param params.data **Optional**. The component used to stream the data represented by the item to the client.
+     * 
+     */
     update(params?: PortalItemUpdateParams): IPromise<PortalItem>;
+    /**
+     * Updates the item's thumbnail on the portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#updateThumbnail)
+     * 
+     * @param params See the object specification table below for the parameters that may be passed as properties in this object.
+     * @param params.thumbnail A URL, Data URI, Blob, or File. The accepted formats are `GIF`, `JPG`, and `PNG`.
+     * 
+     */
     updateThumbnail(params: PortalItemUpdateThumbnailParams): IPromise<PortalItem>;
   }
 
   interface PortalItemConstructor {
+
+
     new(properties?: PortalItemProperties): PortalItem;
 
     fromJSON(json: any): PortalItem;
@@ -3768,198 +14510,896 @@ declare namespace __esri {
   export const PortalItem: PortalItemConstructor;
 
   interface PortalItemProperties extends LoadableProperties {
+    /**
+     * Indicates the level of access to this item: `private`, `shared`, `org`, or `public`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#access)
+     */
     access?: string;
+    /**
+     * Information on the source of the item and its copyright status.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#accessInformation)
+     */
     accessInformation?: string;
+    /**
+     * Average rating. Uses a weighted average called "Bayesian average."
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#avgRating)
+     */
     avgRating?: number;
+    /**
+     * The date the item was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#created)
+     */
     created?: DateProperties;
+    /**
+     * The item's locale information (language and country).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#culture)
+     */
     culture?: string;
+    /**
+     * The detailed description of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#description)
+     */
     description?: string;
+    /**
+     * The geographic extent, or bounding rectangle, of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#extent)
+     */
     extent?: ExtentProperties;
+    /**
+     * The unique id for the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#id)
+     */
     id?: string;
-    isLayer?: boolean;
-    itemControl?: string;
-    itemUrl?: string;
+    /**
+     * Information on license or restrictions related to the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#licenseInfo)
+     */
     licenseInfo?: string;
-    loaded?: boolean;
+    /**
+     * The date the item was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#modified)
+     */
     modified?: DateProperties;
+    /**
+     * The name of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#name)
+     */
     name?: string;
+    /**
+     * Number of comments on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#numComments)
+     */
     numComments?: number;
+    /**
+     * Number of ratings on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#numRatings)
+     */
     numRatings?: number;
+    /**
+     * Number of views on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#numViews)
+     */
     numViews?: number;
+    /**
+     * The username of the user who owns this item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#owner)
+     */
     owner?: string;
+    /**
+     * The portal that contains the item. Defaults to the value in [config.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) (e.g. https://www.arcgis.com). Suggested to use [config.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) instead of this property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#portal)
+     */
     portal?: PortalProperties;
+    /**
+     * The size of the item (in bytes).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#size)
+     */
     size?: number;
+    /**
+     * A summary description of the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#snippet)
+     */
     snippet?: string;
+    /**
+     * User defined tags that describe the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#tags)
+     */
     tags?: string[];
-    thumbnailUrl?: string;
+    /**
+     * The title for the item. This is the name that is displayed to users and used to refer to the item. Every item must have a title.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#title)
+     */
     title?: string;
+    /**
+     * The GIS content type of this item. Example types include Web Map, Map Service, Shapefile, and Web Mapping Application. See the [ArcGIS REST API Items and Items Types Reference](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Items_and_item_types/02r3000000ms000000/) to get an understanding of the item type hierarchy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#type)
+     */
     type?: string;
+    /**
+     * Type keywords that describe the type of content of this item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#typeKeywords)
+     */
     typeKeywords?: string[];
+    /**
+     * The service URL of this item. Only certain layer item types such as "Feature Service", "Map Service", "Image Service", "Scene Service", "WMS" and "KML" have service URLs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#url)
+     */
     url?: string;
   }
 
-  export interface PortalItemFetchRelatedItemsParams {
+
+  export interface PortalItemFetchRelatedItemsParams extends Object {
+    /**
+     * The type of relationship between the two items. See [Relationship types](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000mm000000) for a complete listing of types.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#fetchRelatedItems)
+     */
     relationshipType: string;
+    /**
+     * The direction of the relationship. Can either be `forward` (from origin to destination) or `reverse` (from destination to origin).  **Possible Values:** forward | reverse
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#fetchRelatedItems)
+     */
     direction?: string;
   }
 
-  export interface PortalItemUpdateParams {
+
+  export interface PortalItemUpdateParams extends Object {
+    /**
+     * **Optional**. The component used to stream the data represented by the item to the client.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#update)
+     */
     data: string | any;
   }
 
-  export interface PortalItemUpdateThumbnailParams {
+
+  export interface PortalItemUpdateThumbnailParams extends Object {
+    /**
+     * A URL, Data URI, Blob, or File. The accepted formats are `GIF`, `JPG`, and `PNG`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#updateThumbnail)
+     */
     thumbnail: Blob | string;
   }
 
   interface PortalQueryParams extends Accessor {
+    /**
+     * Only relevant when querying for [PortalItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html). When specified, restricts the results of the query to the extent defined here.  The [spatial reference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#spatialReference) of the given extent must be WGS84 (wkid 4326) or Web Mercator (wkid 3857).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#extent)
+     */
     extent: Extent;
+    /**
+     * The maximum number of results to be included in the [result](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#results) set response. The maximum value allowed is `100`. The [start](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#start) property combined with the `num` property can be used to paginate the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#num)
+     * 
+     * @default 10
+     */
     num: number;
+    /**
+     * The query string used for the search. View the [ArcGIS REST API Search Reference](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000mn000000) for details on constructing a valid query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#query)
+     */
     query: string;
+    /**
+     * A comma-delimited list of fields to sort. Field names may vary depending on what is being queried. For example, the fields allowed for a user query are much more limited than if performing a basic search query for portal items. A list of possible field names is listed below. These names correspond to either item (search), group, and/or user queries. 
+     * 
+     * Field name | Query functionality
+     * ---------------|------------
+     * title | search, group
+     * uploaded | search
+     * modified | search
+     * username | user
+     * created | user, group
+     * type | search
+     * owner | search, group
+     * avg-rating | search
+     * num-ratings | search
+     * num-comments | search
+     * num-views | search
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#sortField)
+     */
     sortField: string;
+    /**
+     * The order in which to sort the results. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * asc | Sort the results in ascending order.
+     * desc | Sort the results in descending order.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#sortOrder)
+     * 
+     * @default asc
+     */
     sortOrder: string;
+    /**
+     * The index of the first entry in the result set response. The index is 1-based. The [start](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#start) property, along with the [num](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#num) property can be used to paginate the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#start)
+     * 
+     * @default 1
+     */
     start: number;
 
+    /**
+     * Creates a deep clone of the instance of PortalQueryParams that calls this method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#clone)
+     * 
+     * 
+     */
     clone(): PortalQueryParams;
   }
 
   interface PortalQueryParamsConstructor {
+
+
     new(properties?: PortalQueryParamsProperties): PortalQueryParams;
   }
 
   export const PortalQueryParams: PortalQueryParamsConstructor;
 
   interface PortalQueryParamsProperties {
+    /**
+     * Only relevant when querying for [PortalItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html). When specified, restricts the results of the query to the extent defined here.  The [spatial reference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#spatialReference) of the given extent must be WGS84 (wkid 4326) or Web Mercator (wkid 3857).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#extent)
+     */
     extent?: ExtentProperties;
+    /**
+     * The maximum number of results to be included in the [result](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#results) set response. The maximum value allowed is `100`. The [start](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#start) property combined with the `num` property can be used to paginate the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#num)
+     * 
+     * @default 10
+     */
     num?: number;
+    /**
+     * The query string used for the search. View the [ArcGIS REST API Search Reference](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000mn000000) for details on constructing a valid query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#query)
+     */
     query?: string;
+    /**
+     * A comma-delimited list of fields to sort. Field names may vary depending on what is being queried. For example, the fields allowed for a user query are much more limited than if performing a basic search query for portal items. A list of possible field names is listed below. These names correspond to either item (search), group, and/or user queries. 
+     * 
+     * Field name | Query functionality
+     * ---------------|------------
+     * title | search, group
+     * uploaded | search
+     * modified | search
+     * username | user
+     * created | user, group
+     * type | search
+     * owner | search, group
+     * avg-rating | search
+     * num-ratings | search
+     * num-comments | search
+     * num-views | search
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#sortField)
+     */
     sortField?: string;
+    /**
+     * The order in which to sort the results. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * asc | Sort the results in ascending order.
+     * desc | Sort the results in descending order.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#sortOrder)
+     * 
+     * @default asc
+     */
     sortOrder?: string;
+    /**
+     * The index of the first entry in the result set response. The index is 1-based. The [start](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#start) property, along with the [num](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#num) property can be used to paginate the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#start)
+     * 
+     * @default 1
+     */
     start?: number;
   }
 
   interface PortalQueryResult extends Accessor {
+    /**
+     * The query parameters for the next set of results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#nextQueryParams)
+     */
     nextQueryParams: PortalQueryParams;
+    /**
+     * The query parameters for the first set of results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#queryParams)
+     */
     queryParams: PortalQueryParams;
+    /**
+     * An array of result item objects.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#results)
+     */
     results: any[];
+    /**
+     * The total number of results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#total)
+     */
     total: number;
   }
 
   interface PortalQueryResultConstructor {
+
+
     new(properties?: PortalQueryResultProperties): PortalQueryResult;
   }
 
   export const PortalQueryResult: PortalQueryResultConstructor;
 
   interface PortalQueryResultProperties {
+    /**
+     * The query parameters for the next set of results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#nextQueryParams)
+     */
     nextQueryParams?: PortalQueryParamsProperties;
+    /**
+     * The query parameters for the first set of results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#queryParams)
+     */
     queryParams?: PortalQueryParamsProperties;
+    /**
+     * An array of result item objects.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#results)
+     */
     results?: any[];
+    /**
+     * The total number of results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryResult.html#total)
+     */
     total?: number;
   }
 
   interface PortalRating extends Accessor {
+    /**
+     * Date the rating was added to the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalRating.html#created)
+     */
     created: Date;
+    /**
+     * A rating between 1.0 and 5.0 for the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalRating.html#rating)
+     */
     rating: number;
   }
 
   interface PortalRatingConstructor {
+
+
     new(properties?: PortalRatingProperties): PortalRating;
   }
 
   export const PortalRating: PortalRatingConstructor;
 
   interface PortalRatingProperties {
+    /**
+     * Date the rating was added to the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalRating.html#created)
+     */
     created?: DateProperties;
+    /**
+     * A rating between 1.0 and 5.0 for the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalRating.html#rating)
+     */
     rating?: number;
   }
 
   interface PortalUser extends Accessor {
+    /**
+     * Indicates the level of access of the user. If private, the user descriptive information will not be available to others nor will the username be searchable.  **Known Values:** private | org | public
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#access)
+     */
     access: string;
+    /**
+     * The date the user was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#created)
+     */
     created: Date;
+    /**
+     * The culture information for the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#culture)
+     */
     culture: string;
+    /**
+     * A description of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#description)
+     */
     description: string;
+    /**
+     * The user's e-mail address.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#email)
+     */
     email: string;
+    /**
+     * The user's full name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fullName)
+     */
     fullName: string;
+    /**
+     * The date the user was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#modified)
+     */
     modified: Date;
+    /**
+     * The ID of the organization the user belongs to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#orgId)
+     */
     orgId: string;
+    /**
+     * The portal associated with the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#portal)
+     */
     portal: Portal;
+    /**
+     * The user's preferred view for content, either web or GIS.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#preferredView)
+     */
     preferredView: string;
+    /**
+     * The user preferred region, used to set the featured maps on the home page, content in the gallery, and the default extent of new maps in the Viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#region)
+     */
     region: string;
+    /**
+     * Defines the user's role in the organization. See [roleId](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#roleId) for more details about when user has a custom role.  **Known Values:** org_admin | org_publisher | org_user
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role)
+     */
     role: string;
+    /**
+     * The ID of the user's role.  Only set if the user is assigned a custom role.  When present, the [role](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role) will indicate the "base" role of the custom role based on the privileges the custom role contains. For example, if the custom role contains some publisher privileges, the [role](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role) will be set to `org_publisher`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#roleId)
+     */
     roleId: string;
-    thumbnailUrl: string;
+    /**
+     * The URL to the thumbnail image for the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#thumbnailUrl)
+     */
+    readonly thumbnailUrl: string;
+    /**
+     * The user's personal units of measure setting.  **Known Values:** english | metric
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#units)
+     */
     units: string;
-    userContentUrl: string;
+    /**
+     * The URL for the user's content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#userContentUrl)
+     */
+    readonly userContentUrl: string;
+    /**
+     * The username of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#username)
+     */
     username: string;
 
+    /**
+     * Adds an item to the user's portal content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#addItem)
+     * 
+     * @param params See the object specifications table below for the parameters that may be passed as properties in this object.
+     * @param params.item The item to add to the user's content.
+     * @param params.data The component used to stream the data represented by the item to the client.
+     * @param params.folder The portal folder in which to store the item.
+     * 
+     */
     addItem(params: PortalUserAddItemParams): IPromise<PortalItem>;
+    /**
+     * Deletes an item from the user's portal content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#deleteItem)
+     * 
+     * @param item The portal item to remove.
+     * 
+     */
     deleteItem(item: PortalItem): IPromise<any>;
+    /**
+     * Fetches all of the user's folders used to organize portal content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fetchFolders)
+     * 
+     * 
+     */
     fetchFolders(): IPromise<PortalFolder[]>;
+    /**
+     * Fetches all the groups that the portal user has permission to access.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fetchGroups)
+     * 
+     * 
+     */
     fetchGroups(): IPromise<PortalGroup[]>;
-    fetchItems(params: PortalUserFetchItemsParams): IPromise<any>;
+    /**
+     * Retrieves all the items in the specified folder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fetchItems)
+     * 
+     * @param params See the object specifications table below for the parameters that may be passed as properties in this object.
+     * @param params.folder The folder to retrieve items from.
+     * @param params.num The maximum number of results to be included in the result set response. The maximum value allowed is 100. The start property combined with the num property can be used to paginate the search results.
+     * @param params.start The index of the first entry in the result set response. The index is 1-based.
+     * 
+     */
+    fetchItems(params?: PortalUserFetchItemsParams): IPromise<any>;
+    /**
+     * Get the URL to the thumbnail image for the user.  Available width sizes: 150, 300 and 600.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#getThumbnailUrl)
+     * 
+     * @param width The desired image width.
+     * 
+     */
     getThumbnailUrl(width?: number): string;
+    /**
+     * Executes a query against the user's favorite group to return an array of [PortalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html) objects that match the input query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#queryFavorites)
+     * 
+     * @param queryParams The input query parameters defined in [PortalQueryParams](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html). This object may be [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/).
+     * 
+     */
     queryFavorites(queryParams?: PortalQueryParams): IPromise<PortalQueryResult>;
   }
 
   interface PortalUserConstructor {
+
+
     new(properties?: PortalUserProperties): PortalUser;
   }
 
   export const PortalUser: PortalUserConstructor;
 
   interface PortalUserProperties {
+    /**
+     * Indicates the level of access of the user. If private, the user descriptive information will not be available to others nor will the username be searchable.  **Known Values:** private | org | public
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#access)
+     */
     access?: string;
+    /**
+     * The date the user was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#created)
+     */
     created?: DateProperties;
+    /**
+     * The culture information for the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#culture)
+     */
     culture?: string;
+    /**
+     * A description of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#description)
+     */
     description?: string;
+    /**
+     * The user's e-mail address.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#email)
+     */
     email?: string;
+    /**
+     * The user's full name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fullName)
+     */
     fullName?: string;
+    /**
+     * The date the user was last modified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#modified)
+     */
     modified?: DateProperties;
+    /**
+     * The ID of the organization the user belongs to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#orgId)
+     */
     orgId?: string;
+    /**
+     * The portal associated with the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#portal)
+     */
     portal?: PortalProperties;
+    /**
+     * The user's preferred view for content, either web or GIS.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#preferredView)
+     */
     preferredView?: string;
+    /**
+     * The user preferred region, used to set the featured maps on the home page, content in the gallery, and the default extent of new maps in the Viewer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#region)
+     */
     region?: string;
+    /**
+     * Defines the user's role in the organization. See [roleId](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#roleId) for more details about when user has a custom role.  **Known Values:** org_admin | org_publisher | org_user
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role)
+     */
     role?: string;
+    /**
+     * The ID of the user's role.  Only set if the user is assigned a custom role.  When present, the [role](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role) will indicate the "base" role of the custom role based on the privileges the custom role contains. For example, if the custom role contains some publisher privileges, the [role](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role) will be set to `org_publisher`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#roleId)
+     */
     roleId?: string;
-    thumbnailUrl?: string;
+    /**
+     * The user's personal units of measure setting.  **Known Values:** english | metric
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#units)
+     */
     units?: string;
-    userContentUrl?: string;
+    /**
+     * The username of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#username)
+     */
     username?: string;
   }
 
-  export interface PortalUserAddItemParams {
+
+  export interface PortalUserAddItemParams extends Object {
+    /**
+     * The item to add to the user's content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#addItem)
+     */
     item: PortalItem;
+    /**
+     * The component used to stream the data represented by the item to the client.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#addItem)
+     */
     data?: string | any;
+    /**
+     * The portal folder in which to store the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#addItem)
+     */
     folder?: PortalFolder;
   }
 
-  export interface PortalUserFetchItemsParams {
-    folder: PortalFolder;
-    num: number;
-    start: number;
+
+  export interface PortalUserFetchItemsParams extends Object {
+    /**
+     * The folder to retrieve items from.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fetchItems)
+     */
+    folder?: PortalFolder;
+    /**
+     * The maximum number of results to be included in the result set response. The maximum value allowed is 100. The start property combined with the num property can be used to paginate the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fetchItems)
+     * 
+     * @default 10
+     */
+    num?: number;
+    /**
+     * The index of the first entry in the result set response. The index is 1-based.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#fetchItems)
+     * 
+     * @default 1
+     */
+    start?: number;
   }
 
   interface ClassBreaksRenderer extends Renderer, VisualVariablesMixin {
+    /**
+     * When symbolizing polygon features with graduated symbols, set a [FillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html) on this property to visualize the boundaries of each feature. Use a [FillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html) of varying sizes in the [classBreakInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos) to indicate the quantity.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#backgroundFillSymbol)
+     */
     backgroundFillSymbol: FillSymbol;
+    /**
+     * Each element in the array is an object that provides information about a class break associated with the renderer. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos)
+     */
     classBreakInfos: ClassBreaksRendererClassBreakInfos[];
+    /**
+     * The classification method used to generate class breaks if the renderer was generated with either of the two following methods: 
+     *   * [colorRendererCreator.createClassBreaksRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     *   * [sizeRendererCreator.createClassBreaksRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     *   
+     *   
+     * **Known Values:** equal-interval | natural-breaks | quantile | standard-deviation
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classificationMethod)
+     */
+    classificationMethod: string;
+    /**
+     * The default symbol assigned to features with a value not matched to a given break. If `null`, unmatched features will not be assigned a symbol. 
+     * > **Known Limitations**  SceneLayers with a `mesh` [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) will display unmatching features with a generic symbol even if the `defaultSymbol` is `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#defaultSymbol)
+     */
     defaultSymbol: Symbol;
+    /**
+     * The name of the attribute field the renderer uses to render data. A function may also be used to return a numeric value if the data does not already explicitly exist in a field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#field)
+     */
     field: string | Function;
+    /**
+     * If `true`, graphics with attribute values equal to the max value of a class will be included in that class. Set this property to `false` if the desired behavior is to make a class include values less than, but not equal to the max value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#isMaxInclusive)
+     * 
+     * @default true
+     */
     isMaxInclusive: boolean;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#legendOptions)
+     */
     legendOptions: ClassBreaksRendererLegendOptions;
+    /**
+     * When [normalizationType](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationType) is `field`, this property contains the attribute field name used for normalization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationField)
+     */
     normalizationField: string;
+    /**
+     * When [normalizationType](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationType) is `percent-of-total`, this property contains the total of all data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationTotal)
+     */
     normalizationTotal: number;
+    /**
+     * Indicates how the data is normalized. If this property is defined, then the class breaks contain a normalized min/max value instead of the value in the given [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#field). The data value obtained from the field is normalized in one of the following ways before it is compared with the class breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * field | Divides the data value using the attribute value of the field specified in the [normalizationField](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationField) property. This value is set by default if the [normalizationField](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationField) is provided.
+     * log | Computes the base 10 logarithm of the data value. This can be a useful approach for some data distributions because it reduces the influence of very large data values.
+     * percent-of-total | Divides the data value by the sum of all data values then multiplies by 100. Use [normalizationTotal](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationTotal) to define the total value by which to normalize. This value is set by default if the [normalizationTotal](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationTotal) is provided.
+     * 
+     * With the exception of `log` normalization, data normalization creates a ratio by dividing two values. When comparing attribute values between features, normalization minimizes the effect of varying map areas and the number of observations.  For example, dividing the 18 to 30 year old population by the area of a polygon feature yields a density value that can be compared evenly with other features, regardless of their size.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationType)
+     */
     normalizationType: string;
-    type: string;
+    /**
+     * The type of renderer. For ClassBreaksRenderer this value is always `class-breaks`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#type)
+     */
+    readonly type: "class-breaks";
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime.  This property is typically used as an alternative to [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#field) for data-driven visualizations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#valueExpression)
+     */
     valueExpression: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the [valueExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#valueExpression) property. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the [legendOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#legendOptions) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#valueExpressionTitle)
+     */
     valueExpressionTitle: string;
 
+    /**
+     * Adds a class break to the renderer. You can provide the minimum, maximum and symbol values as individual arguments or by using the info object. The range of the break is greater than or equal to the minimum value and less than the maximum value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#addClassBreakInfo)
+     * 
+     * @param min The minimum value to use in the break. This can be a number or an info object as defined in [classBreakInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos).
+     * @param max The maximum value to use in the break.
+     * @param symbol Symbol to use for the break.
+     * 
+     */
     addClassBreakInfo(min: number | any, max: number, symbol: Symbol): void;
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): ClassBreaksRenderer;
+    /**
+     * Returns the [classBreakInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos) information (as defined by the renderer) associated with the given graphic.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#getClassBreakInfo)
+     * 
+     * @param graphic The graphic whose rendering information will be returned.
+     * 
+     */
     getClassBreakInfo(graphic: Graphic): any;
+    /**
+     * Removes a break from the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#removeClassBreakInfo)
+     * 
+     * @param min Minimum value in the break to remove
+     * @param max Maximum value in the break to remove.
+     * 
+     */
     removeClassBreakInfo(min: number, max: number): void;
   }
 
   interface ClassBreaksRendererConstructor {
+    /**
+     * ClassBreaksRenderer defines the symbol of each feature in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) based on the value of a numeric attribute. Symbols are assigned based on classes or ranges of data. Each feature is assigned a symbol based on the class break in which the value of the attribute falls.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html)
+     */
+
     new(properties?: ClassBreaksRendererProperties): ClassBreaksRenderer;
 
     fromJSON(json: any): ClassBreaksRenderer;
@@ -3968,41 +15408,185 @@ declare namespace __esri {
   export const ClassBreaksRenderer: ClassBreaksRendererConstructor;
 
   interface ClassBreaksRendererProperties extends RendererProperties, VisualVariablesMixinProperties {
+    /**
+     * When symbolizing polygon features with graduated symbols, set a [FillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html) on this property to visualize the boundaries of each feature. Use a [FillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html) of varying sizes in the [classBreakInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos) to indicate the quantity.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#backgroundFillSymbol)
+     */
     backgroundFillSymbol?: FillSymbolProperties;
+    /**
+     * Each element in the array is an object that provides information about a class break associated with the renderer. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos)
+     */
     classBreakInfos?: ClassBreaksRendererClassBreakInfos[];
+    /**
+     * The classification method used to generate class breaks if the renderer was generated with either of the two following methods: 
+     *   * [colorRendererCreator.createClassBreaksRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     *   * [sizeRendererCreator.createClassBreaksRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     *   
+     *   
+     * **Known Values:** equal-interval | natural-breaks | quantile | standard-deviation
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classificationMethod)
+     */
+    classificationMethod?: string;
+    /**
+     * The default symbol assigned to features with a value not matched to a given break. If `null`, unmatched features will not be assigned a symbol. 
+     * > **Known Limitations**  SceneLayers with a `mesh` [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) will display unmatching features with a generic symbol even if the `defaultSymbol` is `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#defaultSymbol)
+     */
     defaultSymbol?: SymbolProperties;
+    /**
+     * The name of the attribute field the renderer uses to render data. A function may also be used to return a numeric value if the data does not already explicitly exist in a field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#field)
+     */
     field?: string | Function;
+    /**
+     * If `true`, graphics with attribute values equal to the max value of a class will be included in that class. Set this property to `false` if the desired behavior is to make a class include values less than, but not equal to the max value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#isMaxInclusive)
+     * 
+     * @default true
+     */
     isMaxInclusive?: boolean;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#legendOptions)
+     */
     legendOptions?: ClassBreaksRendererLegendOptions;
+    /**
+     * When [normalizationType](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationType) is `field`, this property contains the attribute field name used for normalization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationField)
+     */
     normalizationField?: string;
+    /**
+     * When [normalizationType](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationType) is `percent-of-total`, this property contains the total of all data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationTotal)
+     */
     normalizationTotal?: number;
+    /**
+     * Indicates how the data is normalized. If this property is defined, then the class breaks contain a normalized min/max value instead of the value in the given [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#field). The data value obtained from the field is normalized in one of the following ways before it is compared with the class breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * field | Divides the data value using the attribute value of the field specified in the [normalizationField](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationField) property. This value is set by default if the [normalizationField](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationField) is provided.
+     * log | Computes the base 10 logarithm of the data value. This can be a useful approach for some data distributions because it reduces the influence of very large data values.
+     * percent-of-total | Divides the data value by the sum of all data values then multiplies by 100. Use [normalizationTotal](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationTotal) to define the total value by which to normalize. This value is set by default if the [normalizationTotal](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationTotal) is provided.
+     * 
+     * With the exception of `log` normalization, data normalization creates a ratio by dividing two values. When comparing attribute values between features, normalization minimizes the effect of varying map areas and the number of observations.  For example, dividing the 18 to 30 year old population by the area of a polygon feature yields a density value that can be compared evenly with other features, regardless of their size.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#normalizationType)
+     */
     normalizationType?: string;
-    type?: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime.  This property is typically used as an alternative to [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#field) for data-driven visualizations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#valueExpression)
+     */
     valueExpression?: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the [valueExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#valueExpression) property. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the [legendOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#legendOptions) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#valueExpressionTitle)
+     */
     valueExpressionTitle?: string;
   }
 
-  export interface ClassBreaksRendererClassBreakInfos {
+
+  export interface ClassBreaksRendererClassBreakInfos extends Object {
+    /**
+     * The minimum value of the break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos)
+     */
     minValue: number;
+    /**
+     * The maximum value of the break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos)
+     */
     maxValue: number;
+    /**
+     * The symbol used to style features whose values are between the `minValue` and `maxValue` of the break. This value may be autocast by specifying the symbol `type`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos)
+     */
     symbol: Symbol;
+    /**
+     * The label used to describe features in the break in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#classBreakInfos)
+     */
     label?: string;
   }
 
-  export interface ClassBreaksRendererLegendOptions {
+
+  export interface ClassBreaksRendererLegendOptions extends Object {
+    /**
+     * Describes the variable driving the visualization. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) and takes precedence over a [field alias](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#alias) or [valueExpressionTitle](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#valueExpressionTitle).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html#legendOptions)
+     */
     title: string;
   }
 
   interface PointCloudClassBreaksRenderer extends PointCloudRenderer {
+    /**
+     * Each element in the array is an object that provides information about a class break associated with the renderer. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#colorClassBreakInfos)
+     */
     colorClassBreakInfos: PointCloudClassBreaksRendererColorClassBreakInfos[];
+    /**
+     * The name of the field that is used to drive the color visualization for the renderer. The value of this field determines which class break each point is assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#field)
+     */
     field: string;
+    /**
+     * A transform that is applied to the field value before evaluating the renderer.  **Possible Values:** none | low-four-bit | high-four-bit | absolute-value | modulo-ten
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#fieldTransformType)
+     * 
+     * @default null
+     */
     fieldTransformType: string;
-    type: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#legendOptions)
+     */
+    legendOptions: PointCloudClassBreaksRendererLegendOptions;
+    /**
+     * The type of renderer. For PointCloudClassBreaksRenderer this value is always `point-cloud-class-breaks`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#type)
+     */
+    readonly type: "point-cloud-class-breaks";
 
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): PointCloudClassBreaksRenderer;
   }
 
   interface PointCloudClassBreaksRendererConstructor {
+    /**
+     * This class defines the color of each point in a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html) based on the value of a numeric attribute. Colors are assigned based on classes or ranges of data. Each point is assigned a symbol based on the class break in which the value of the attribute falls.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html)
+     */
+
     new(properties?: PointCloudClassBreaksRendererProperties): PointCloudClassBreaksRenderer;
 
     fromJSON(json: any): PointCloudClassBreaksRenderer;
@@ -4011,28 +15595,107 @@ declare namespace __esri {
   export const PointCloudClassBreaksRenderer: PointCloudClassBreaksRendererConstructor;
 
   interface PointCloudClassBreaksRendererProperties extends PointCloudRendererProperties {
+    /**
+     * Each element in the array is an object that provides information about a class break associated with the renderer. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#colorClassBreakInfos)
+     */
     colorClassBreakInfos?: PointCloudClassBreaksRendererColorClassBreakInfos[];
+    /**
+     * The name of the field that is used to drive the color visualization for the renderer. The value of this field determines which class break each point is assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#field)
+     */
     field?: string;
+    /**
+     * A transform that is applied to the field value before evaluating the renderer.  **Possible Values:** none | low-four-bit | high-four-bit | absolute-value | modulo-ten
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#fieldTransformType)
+     * 
+     * @default null
+     */
     fieldTransformType?: string;
-    type?: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#legendOptions)
+     */
+    legendOptions?: PointCloudClassBreaksRendererLegendOptions;
   }
 
-  export interface PointCloudClassBreaksRendererColorClassBreakInfos {
+
+  export interface PointCloudClassBreaksRendererColorClassBreakInfos extends Object {
+    /**
+     * The minimum value of the break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#colorClassBreakInfos)
+     */
     minValue: number;
+    /**
+     * The maximum value of the break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#colorClassBreakInfos)
+     */
     maxValue: number;
+    /**
+     * The color used to colorize the points where values are between the `minValue` and `maxValue` of the break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#colorClassBreakInfos)
+     */
     color: Color;
+    /**
+     * The label used to describe point in the break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#colorClassBreakInfos)
+     */
     label?: string;
   }
 
+
+  export interface PointCloudClassBreaksRendererLegendOptions extends Object {
+    /**
+     * Describes the variable driving the visualization. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) and takes precedence over a [field alias](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#alias).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudClassBreaksRenderer.html#legendOptions)
+     */
+    title?: string;
+  }
+
   interface PointCloudRenderer extends Accessor, JSONSupport {
+    /**
+     * Reduces the brightness of the point's color, based on the value of another field, usually `intensity`. High values leave the color unchanged, while low values darken the color of the point. This helps to display the scanned surface in a more realistic way.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#colorModulation)
+     */
     colorModulation: PointCloudRendererColorModulation;
+    /**
+     * Specifies how the size of the points in the point cloud is computed for rendering.  The splat algorithm automatically computes a size based on the density, which varies with the Level of Detail that is currently displayed.  The fixed size algorithm displays all points with the same size, either in screen space or real world units.  When `pointSizeAlgorithm` is not set, the default is `splat`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointSizeAlgorithm)
+     */
     pointSizeAlgorithm: PointCloudRendererPointSizeAlgorithm;
+    /**
+     * The number of points to draw per display inch. This property determines the level of detail in the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointsPerInch)
+     * 
+     * @default 10
+     */
     pointsPerInch: number;
 
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): PointCloudRenderer;
   }
 
   interface PointCloudRendererConstructor {
+
+
     new(properties?: PointCloudRendererProperties): PointCloudRenderer;
 
     fromJSON(json: any): PointCloudRenderer;
@@ -4041,33 +15704,121 @@ declare namespace __esri {
   export const PointCloudRenderer: PointCloudRendererConstructor;
 
   interface PointCloudRendererProperties {
+    /**
+     * Reduces the brightness of the point's color, based on the value of another field, usually `intensity`. High values leave the color unchanged, while low values darken the color of the point. This helps to display the scanned surface in a more realistic way.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#colorModulation)
+     */
     colorModulation?: PointCloudRendererColorModulation;
+    /**
+     * Specifies how the size of the points in the point cloud is computed for rendering.  The splat algorithm automatically computes a size based on the density, which varies with the Level of Detail that is currently displayed.  The fixed size algorithm displays all points with the same size, either in screen space or real world units.  When `pointSizeAlgorithm` is not set, the default is `splat`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointSizeAlgorithm)
+     */
     pointSizeAlgorithm?: PointCloudRendererPointSizeAlgorithm;
+    /**
+     * The number of points to draw per display inch. This property determines the level of detail in the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointsPerInch)
+     * 
+     * @default 10
+     */
     pointsPerInch?: number;
   }
 
-  export interface PointCloudRendererColorModulation {
+
+  export interface PointCloudRendererColorModulation extends Object {
+    /**
+     * Field to use for the color modulation. Commonly modulation is used with the `intensity` field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#colorModulation)
+     */
     field: string;
+    /**
+     * Field value at which the point color becomes darkest.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#colorModulation)
+     * 
+     * @default 0
+     */
     minValue?: number;
+    /**
+     * Field value at which the point color will be left unchanged.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#colorModulation)
+     * 
+     * @default 255
+     */
     maxValue?: number;
   }
 
-  export interface PointCloudRendererPointSizeAlgorithm {
+
+  export interface PointCloudRendererPointSizeAlgorithm extends Object {
+    /**
+     * `fixed-size` or `splat`. Choosing `fixed-size` implies setting `size` and `useRealWorldSymbolSizes`. If `splat` is chosen then `scaleFactor` should be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointSizeAlgorithm)
+     */
     type: string;
+    /**
+     * Specifies whether `size` is in real world units or screen-space units. Applies to `fixed-size` only.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointSizeAlgorithm)
+     */
     useRealWorldSymbolSizes?: boolean;
+    /**
+     * Point size in meters (`useRealWorldSymbolSizes = true`) or points. Applies to `fixed-size` only.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointSizeAlgorithm)
+     */
     size?: number;
+    /**
+     * Specifies the scale factor that is applied to the size estimated by the density. Applies to `splat` only.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointSizeAlgorithm)
+     * 
+     * @default 1
+     */
     scaleFactor?: number;
+    /**
+     * Minimum screen space size in points. Applies to `splat` only.  **Deprecated since version 4.5**
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#pointSizeAlgorithm)
+     */
     minSize?: number;
   }
 
   interface PointCloudRGBRenderer extends PointCloudRenderer {
+    /**
+     * The name of the field containing RGB values used to drive the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRGBRenderer.html#field)
+     */
     field: string;
-    type: string;
+    /**
+     * The type of Renderer. For PointCloudRGBRenderer this value is always `point-cloud-rgb`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRGBRenderer.html#type)
+     */
+    readonly type: "point-cloud-rgb";
 
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRGBRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): PointCloudRGBRenderer;
   }
 
   interface PointCloudRGBRendererConstructor {
+    /**
+     * PointCloudRGBRenderer defines the color of each point in a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html) based on the value of a color attribute.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRGBRenderer.html)
+     */
+
     new(properties?: PointCloudRGBRendererProperties): PointCloudRGBRenderer;
 
     fromJSON(json: any): PointCloudRGBRenderer;
@@ -4076,20 +15827,65 @@ declare namespace __esri {
   export const PointCloudRGBRenderer: PointCloudRGBRendererConstructor;
 
   interface PointCloudRGBRendererProperties extends PointCloudRendererProperties {
+    /**
+     * The name of the field containing RGB values used to drive the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRGBRenderer.html#field)
+     */
     field?: string;
-    type?: string;
   }
 
   interface PointCloudStretchRenderer extends PointCloudRenderer {
+    /**
+     * The name of the number field whose values are used to drive the continuous color visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#field)
+     */
     field: string;
+    /**
+     * A transform that is applied to the field value before evaluating the renderer.  **Possible Values:** none | low-four-bit | high-four-bit | absolute-value | modulo-ten
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#fieldTransformType)
+     * 
+     * @default null
+     */
     fieldTransformType: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#legendOptions)
+     */
+    legendOptions: PointCloudStretchRendererLegendOptions;
+    /**
+     * An array of color value pairs. Points with values between the specified stops are colorized with linearly interpolated colors.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#stops)
+     */
     stops: PointCloudStretchRendererStops[];
-    type: string;
+    /**
+     * The type of Renderer. For PointCloudStretchRenderer this value is always `point-cloud-stretch`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#type)
+     */
+    readonly type: "point-cloud-stretch";
 
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): PointCloudStretchRenderer;
   }
 
   interface PointCloudStretchRendererConstructor {
+    /**
+     * PointCloudStretchRenderer defines the color of each point in a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html) based on the value of a numeric attribute. It allows you to easily map continuous color ramps to minimum and maximum data values of one of the layer's numeric attribute fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html)
+     */
+
     new(properties?: PointCloudStretchRendererProperties): PointCloudStretchRenderer;
 
     fromJSON(json: any): PointCloudStretchRenderer;
@@ -4098,28 +15894,117 @@ declare namespace __esri {
   export const PointCloudStretchRenderer: PointCloudStretchRendererConstructor;
 
   interface PointCloudStretchRendererProperties extends PointCloudRendererProperties {
+    /**
+     * The name of the number field whose values are used to drive the continuous color visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#field)
+     */
     field?: string;
+    /**
+     * A transform that is applied to the field value before evaluating the renderer.  **Possible Values:** none | low-four-bit | high-four-bit | absolute-value | modulo-ten
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#fieldTransformType)
+     * 
+     * @default null
+     */
     fieldTransformType?: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#legendOptions)
+     */
+    legendOptions?: PointCloudStretchRendererLegendOptions;
+    /**
+     * An array of color value pairs. Points with values between the specified stops are colorized with linearly interpolated colors.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#stops)
+     */
     stops?: PointCloudStretchRendererStops[];
-    type?: string;
   }
 
-  export interface PointCloudStretchRendererStops {
+
+  export interface PointCloudStretchRendererLegendOptions extends Object {
+    /**
+     * Describes the variable driving the visualization. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) and takes precedence over a [field alias](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#alias).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#legendOptions)
+     */
+    title?: string;
+  }
+
+
+  export interface PointCloudStretchRendererStops extends Object {
+    /**
+     * The value for this stop.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#stops)
+     */
     value: number;
+    /**
+     * The label for this stop.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#stops)
+     */
     label?: string;
+    /**
+     * The color value for this stop.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html#stops)
+     */
     color: Color;
   }
 
   interface PointCloudUniqueValueRenderer extends PointCloudRenderer {
+    /**
+     * Each element in the array is an object that matches a unique value with a specific color. Features with equal values to those specified here will be assigned the associated color. For example, you may choose to visualize points representing low vegetation with a green color and points representing power lines with a gray color. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#colorUniqueValueInfos)
+     */
     colorUniqueValueInfos: PointCloudUniqueValueRendererColorUniqueValueInfos[];
+    /**
+     * The name of the field whose values are used to drive the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#field)
+     */
     field: string;
+    /**
+     * A transform that is applied to the field value before evaluating the renderer.  **Possible Values:** none | low-four-bit | high-four-bit | absolute-value | modulo-ten
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#fieldTransformType)
+     * 
+     * @default null
+     */
     fieldTransformType: string;
-    type: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#legendOptions)
+     */
+    legendOptions: PointCloudUniqueValueRendererLegendOptions;
+    /**
+     * The type of Renderer. For PointCloudUniqueValueRenderer this value is always `point-cloud-unique-value`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#type)
+     */
+    readonly type: "point-cloud-unique-value";
 
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): PointCloudUniqueValueRenderer;
   }
 
   interface PointCloudUniqueValueRendererConstructor {
+    /**
+     * PointCloudUniqueValueRenderer allows you to colorize points in a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html) based on an attribute value. This is done by assigning unique colors to represent points with equal attribute values. This renderer is used to visualize points of the same type, not interpolate colors along a continuous ramp mapped to numbers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html)
+     */
+
     new(properties?: PointCloudUniqueValueRendererProperties): PointCloudUniqueValueRenderer;
 
     fromJSON(json: any): PointCloudUniqueValueRenderer;
@@ -4128,23 +16013,82 @@ declare namespace __esri {
   export const PointCloudUniqueValueRenderer: PointCloudUniqueValueRendererConstructor;
 
   interface PointCloudUniqueValueRendererProperties extends PointCloudRendererProperties {
+    /**
+     * Each element in the array is an object that matches a unique value with a specific color. Features with equal values to those specified here will be assigned the associated color. For example, you may choose to visualize points representing low vegetation with a green color and points representing power lines with a gray color. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#colorUniqueValueInfos)
+     */
     colorUniqueValueInfos?: PointCloudUniqueValueRendererColorUniqueValueInfos[];
+    /**
+     * The name of the field whose values are used to drive the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#field)
+     */
     field?: string;
+    /**
+     * A transform that is applied to the field value before evaluating the renderer.  **Possible Values:** none | low-four-bit | high-four-bit | absolute-value | modulo-ten
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#fieldTransformType)
+     * 
+     * @default null
+     */
     fieldTransformType?: string;
-    type?: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#legendOptions)
+     */
+    legendOptions?: PointCloudUniqueValueRendererLegendOptions;
   }
 
-  export interface PointCloudUniqueValueRendererColorUniqueValueInfos {
-    values: number[];
+
+  export interface PointCloudUniqueValueRendererColorUniqueValueInfos extends Object {
+    /**
+     * A unique combination of values that will be represented with the given `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#colorUniqueValueInfos)
+     */
+    values: string[];
+    /**
+     * The color used to represent points whose value matches `values`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#colorUniqueValueInfos)
+     */
     color: Color;
+    /**
+     * Label used to describe points matched to the unique value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#colorUniqueValueInfos)
+     */
     label?: string;
   }
 
+
+  export interface PointCloudUniqueValueRendererLegendOptions extends Object {
+    /**
+     * Describes the variable driving the visualization. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) and takes precedence over a [field alias](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#alias).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html#legendOptions)
+     */
+    title?: string;
+  }
+
   interface Renderer extends Accessor, JSONSupport {
+    /**
+     * Authoring metadata only included in renderers generated from one of the Smart Mapping creator methods, such as [sizeRendererCreator.createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer) or [colorRendererCreator.createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer). This includes information from UI elements such as sliders and selected classification methods and themes. This allows the authoring clients to save specific overridable settings so that next time it is accessed via the UI, their selections can be remembered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#authoringInfo)
+     */
     authoringInfo: AuthoringInfo;
   }
 
   interface RendererConstructor {
+    /**
+     * Renderers define how to visually represent each feature in one of the following layer types:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html)
+     */
+
     new(properties?: RendererProperties): Renderer;
 
     fromJSON(json: any): Renderer;
@@ -4153,118 +16097,795 @@ declare namespace __esri {
   export const Renderer: RendererConstructor;
 
   interface RendererProperties {
-    authoringInfo?: AuthoringInfo;
+    /**
+     * Authoring metadata only included in renderers generated from one of the Smart Mapping creator methods, such as [sizeRendererCreator.createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer) or [colorRendererCreator.createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer). This includes information from UI elements such as sliders and selected classification methods and themes. This allows the authoring clients to save specific overridable settings so that next time it is accessed via the UI, their selections can be remembered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#authoringInfo)
+     */
+    authoringInfo?: AuthoringInfoProperties;
   }
 
-  export interface AuthoringInfo {
+  /**
+   * Defines a [size visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) with minimum and maximum bounds. When an object with this specification is applied to the [visualVariables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables) property of a renderer, then feature sizes are bounded by min and max data values. Features with values greater than the provided max value are assigned the specified maximum size. Likewise, features with values less than the provied min value are assigned the specified minimum size. Features with values between the min and the max are assigned a corresponding size that is linearly interpolated between the provided min and max size values.  The object specification for this object is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+   */
+  export interface BoundedMinMax extends Object {
+    /**
+     * The size used to render a feature containing the maximum data value.
+     *   * When setting a number, sizes are expressed in points for all 2D symbols and 3D flat symbol layers; size is expressed in meters for all 3D volumetric symbols.
+     *   * String values are only supported for 2D symbols and 3D flat symbol layers. Strings may specify size in either points or pixels (e.g. `minSize: "16pt"`, `minSize: "12px"`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    maxSize: string | number;
+    /**
+     * Value must be `size`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
     type: string;
-    fields: string[];
-    classificationMethod: string;
-    standardDeviationInterval: number;
-    visualVariables: AuthoringInfoVisualVariables[];
+    /**
+     * The name of the numeric attribute field used to normalize the data in `field`. If this field is used, then the values in `maxDataValue` and `minDataValue` should be normalized as percentages or ratios.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    normalizationField?: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime. The values returned from this expression are the data used to drive the visualization. This takes precedence over `field`. Therefore, this property is typically used as an alternative to `field` in visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    valueExpression?: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the `valueExpression` property. This is displayed as the title of the corresponding size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the `legendOptions` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    valueExpressionTitle?: string;
+    /**
+     * The maximum data value used in the size ramp. Features with this value or higher will be rendered at the size defined in `maxSize`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    maxDataValue: number;
+    /**
+     * Indicates the source of the data values used to determine the size of each feature. 
+     * 
+     * Value Type | Description
+     * ------|-----------
+     * String | The name of the numeric attribute field that contains the data values used to determine the size of each feature.
+     * Function | A function that iterates through each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html), which includes the feature's attributes, and returns the value used to determine the size of the given feature.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    field?: string | Function;
+    /**
+     * The minimum data value used in the size ramp. Features with this value or lower will be rendered at the size defined in `minSize`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    minDataValue: number;
+    /**
+     * The size used to render a feature containing the minimum data value.
+     *   * When setting a number, sizes are expressed in points for all 2D symbols and 3D flat symbol layers; size is expressed in meters for all 3D volumetric symbols.
+     *   * String values are only supported for 2D symbols and 3D flat symbol layers. Strings may specify size in either points or pixels (e.g. `minSize: "16pt"`, `minSize: "12px"`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    minSize: string | number;
+    /**
+     * An object providing options for displaying the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    legendOptions?: BoundedMinMaxLegendOptions;
+    /**
+     * Only applicable when working in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Defines the axis the size visual variable should be applied to when rendering features with an [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html). See the [local scene sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-local/index.html) for an example of this. 
+     * 
+     * Possible Value | Description
+     * ----------------|-----------
+     * width | The diameter of the symbol from east to west.
+     * depth | The diameter of the symbol from north to south.
+     * height | The height of the symbol.
+     * width-and-depth | Applies the size visual variable to both width and depth axes.
+     * all | Applies the size visual variable to all axes.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    axis?: string;
+    /**
+     * When setting a size visual variable on a renderer using an [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), this property indicates whether to apply the value defined by the [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#height), [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#width), or [depth](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#depth) properties to the corresponding axis of this visual variable instead of proportionally scaling this axis' value after other axes. [View an example](https://developers.arcgis.com/javascript/latest/sample-code/visualization-multivariate-3d/index.html) of this.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    useSymbolValue?: boolean;
   }
 
-  export interface ColorVisualVariable {
+  /**
+   * The **color** visual variable defines how a continuous color ramp is applied to features based on the values of a numeric attribute field. The minimum and maximum values of the data should be indicated along with their respective color values. You must specify `stops` to construct the color ramp, and either `field` or `valueExpression` to define the driving value.  [![renderer-vv-color](https://developers.arcgis.com/javascript/latest/assets/img/samples/7-vv-color.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-vv-color/index.html)  The object specification for color is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+   */
+  export interface ColorVisualVariable extends Object {
+    /**
+     * **Required.** Value must be `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     type: string;
+    /**
+     * Indicates the source of the data values used to determine the color of each feature.
+     * 
+     * Value Type | Description
+     * ------|-----------
+     * String | The name of the numeric attribute field that contains the data values used to determine the color of each feature.
+     * Function | A function that iterates through each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) including a feature's attributes and returns the value used to determine the color of the given feature.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     field: string | Function;
+    /**
+     * Name of the numeric attribute field by which to normalize the data. If this field is used, then the values in `stops` should be normalized as percentages or ratios.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     normalizationField: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime. The values returned from this expression are the data used to drive the visualization. This takes precedence over `field`. Therefore, this property is typically used as an alternative to `field` in visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     valueExpression: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the `valueExpression` property. This is displayed as the title of the corresponding color ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the `legendOptions` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     valueExpressionTitle: string;
+    /**
+     * An object providing options for displaying the color ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     legendOptions: ColorVisualVariableLegendOptions;
+    /**
+     * An array of objects that defines the color ramp in a sequence of stops. At least two stops are required. Features with values between the given stops will be assigned colors along the ramp proportional to the minimum and maximum values used. The stops must be listed in ascending order based on the value of the `value` property in each stop. Each stop object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     stops: ColorVisualVariableStops[];
   }
 
-  export interface OpacityVisualVariable {
+  /**
+   * The **opacity** visual variable defines the opacity of each feature's symbol based on a numeric attribute field value. The minimum and maximum values of the data should be indicated along with their respective opacity values. The specification for this object is provided below. You must specify `stops` to construct the opacity ramp, and either `field` or `valueExpression` to define the driving value.  [![renderer-vv-opacity](https://developers.arcgis.com/javascript/latest/assets/img/samples/12-vv-transparency.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-vv-opacity/index.html)
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+   */
+  export interface OpacityVisualVariable extends Object {
+    /**
+     * **Required.** Value must be `opacity`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     type: string;
+    /**
+     * Indicates the source of the data values used to determine the opacity of each feature.
+     * 
+     * Value Type | Description
+     * ------|-----------
+     * String | The name of the numeric attribute field that contains the data values used to determine the opacity of each feature.
+     * Function | A function that iterates through each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) including the attributes of the feature and returns the value used to determine the opacity of the given feature.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     field: string | Function;
+    /**
+     * Name of the attribute field by which to normalize the data. If this field is used, then the values in `stops` should be normalized as percentages or ratios.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     normalizationField: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime. The values returned from this expression are the data used to drive the visualization. This takes precedence over `field`. Therefore, this property is typically used as an alternative to `field` in visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     valueExpression: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the `valueExpression` property. This is displayed as the title of the corresponding opacity ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the `legendOptions` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     valueExpressionTitle: string;
+    /**
+     * An object providing options for displaying the opacity ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     legendOptions: OpacityVisualVariableLegendOptions;
+    /**
+     * An array of objects that defines the thematic opacity ramp in a sequence of stops. At least two stops are required. The stops must be listed in ascending order based on the value of the `value` property in each stop. Each stop object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     stops: OpacityVisualVariableStops[];
   }
 
-  export interface RotationVisualVariable {
+  /**
+   * Defines a [size visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) where data values are interpreted as real-world sizes based on a given unit. Features are then sized according to the real-world measurements, not thematic values and screen units.  [![renderer-vv-rw](https://developers.arcgis.com/javascript/latest/assets/img/samples/2-extrude-height.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-buildings-3d/index.html)  The object specification for this object is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+   */
+  export interface RealWorldSize extends Object {
+    /**
+     * Value must be `size`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
     type: string;
-    field: string | Function;
-    valueExpression: string;
-    axis: string;
-    rotationType: string;
-  }
-
-  export interface SizeVisualVariable {
-    maxDataValue: number;
-    type: string;
-    normalizationField: string;
-    valueExpression: string;
-    valueExpressionTitle: string;
-    legendOptions: SizeVisualVariableLegendOptions;
-    axis: string;
-    expression: string;
-    field: string | Function;
-    minDataValue: number;
-    maxSize: string | number | SizeVisualVariable;
-    minSize: string | number | SizeVisualVariable;
-    stops: SizeVisualVariableStops[];
+    /**
+     * Indicates the source of the data values used to determine the size of each feature.
+     * 
+     * Value Type | Description
+     * ------|-----------
+     * String | The name of the numeric attribute field that contains the data values used to determine the size of each feature.
+     * Function | A function that iterates through each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html), which includes the feature's attributes, and returns the value used to determine the size of the given feature.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    field?: string | Function;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime. The values returned from this expression are the data used to drive the visualization. This takes precedence over `field`. Therefore, this property is typically used as an alternative to `field` in visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    valueExpression?: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the `valueExpression` property. This is displayed as the title of the corresponding size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the `legendOptions` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    valueExpressionTitle?: string;
+    /**
+     * Indicates the unit of measurement used to interpret the value returned by `field` or `valueExpression`. For 3D volumetric symbols the default is `meters`. This property should not be used if the data value represents a thematic quantity (e.g. traffic count, census data, etc.).  **Possible Values:** unknown | inches | feet | yards | miles | nautical-miles | millimeters | centimeters | decimeters | meters | kilometers | decimal-degrees
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
     valueUnit: string;
+    /**
+     * Specifies how to apply the data value when mapping real-world sizes. See table below for supported values. 
+     * 
+     * Value | Description
+     * ------|-----------
+     * radius | The point data value represents the radius of a circular feature.
+     * diameter | The point data value represents the diameter of a circular feature.
+     * area | The point data value represents the area of a feature.
+     * width | The polyline data value represents the width of a line.
+     * distance | The polyline data value represents the distance from the center line (one half of the width).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
     valueRepresentation: string;
-    useSymbolValue: boolean;
+    /**
+     * An object providing options for displaying the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    legendOptions?: RealWorldSizeLegendOptions;
+    /**
+     * Only applicable when working in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Defines the axis the size visual variable should be applied to when rendering features with an [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html). See the [local scene sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-local/index.html) for an example of this. 
+     * 
+     * Possible Value | Description
+     * ----------------|-----------
+     * width | The diameter of the symbol from east to west.
+     * depth | The diameter of the symbol from north to south.
+     * height | The height of the symbol.
+     * width-and-depth | Applies the size visual variable to both width and depth axes.
+     * all | Applies the size visual variable to all axes.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    axis?: string;
+    /**
+     * When setting a size visual variable on a renderer using an [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), this property indicates whether to apply the value defined by the [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#height), [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#width), or [depth](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#depth) properties to the corresponding axis of this visual variable instead of proportionally scaling this axis' value after other axes. [View an example](https://developers.arcgis.com/javascript/latest/sample-code/visualization-multivariate-3d/index.html) of this.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    useSymbolValue?: boolean;
   }
 
-  export interface AuthoringInfoVisualVariables {
+  /**
+   * The **rotation** visual variable defines how features rendered with [marker symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html) or [text symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html) in a MapView or [3D object symbol layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html) in a SceneView are rotated. The rotation value is determined by mapping the values to data in a field, or by other arithmetic means with a function.  This object may be used to depict variables such as wind direction, vehicle heading, etc.  [![renderer-vv-rotation](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/renderer-vv-rotation.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-vv-rotation/index.html) 
+   * > **Known Limitations**  In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) rotation visual variables are not supported with [marker symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html), [text symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html), [3D icon symbol layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html) and [3D text symbol layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable)
+   */
+  export interface RotationVisualVariable extends Object {
+    /**
+     * **Required.** Value must be `rotation`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable)
+     */
     type: string;
-    field: string;
-    minSliderValue: number;
-    maxSliderValue: number;
-    theme: string;
-    style: string;
-    units: string;
-    startTime: string | number;
-    endTime: string | number;
+    /**
+     * Indicates the source of the rotation angle of each feature.
+     * 
+     * Value Type | Description
+     * ------|-----------
+     * String | The name of the numeric attribute field that contains the rotation angle of each feature.
+     * Function | A function that iterates through each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html), which includes the feature's attributes, and returns the rotation angle of the given feature.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable)
+     */
+    field: string | Function;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime. The values returned from this expression are the data used to drive the visualization. This takes precedence over `field`. Therefore, this property is typically used as an alternative to `field` in visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable)
+     */
+    valueExpression: string;
+    /**
+     * Only applicable when working in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Defines the axis the rotation visual variable should be applied to when rendering features with an [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html).  If the symbol resource is aligned such that its forward facing side points in the direction of the y-axis (the y-axis always points North in WGS84 or WebMercator coordinates), its upwards facing side is pointing in the direction of the z-axis, and its right-hand side points in the direction of the x-axis (the x-axis always points East in WGS84 or WebMercator coordinates), then the following rotation axis will rotate the symbol as indicated by their name. 
+     * 
+     * Possible Value | Description
+     * ----------------|-----------
+     * heading | The rotation of the symbol in the horizontal plane (i.e., around the z axis).
+     * tilt | The rotation of the symbol in the longitudinal vertical plane (i.e., around the x axis).
+     * roll | The rotation of the symbol in the lateral vertical plane (i.e., around the y axis).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable)
+     */
+    axis?: string;
+    /**
+     * Defines the origin and direction of rotation depending on how the angle of rotation was measured. See the table below for a list of possible values. This property only applies to rotations around the `heading` axis.
+     * 
+     * Value | Description
+     * ------|------------
+     * geographic | Rotates the symbol from the north in a clockwise direction.
+     * arithmetic | Rotates the symbol from the east in a counter-clockwise direction.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable)
+     */
+    rotationType?: string;
   }
 
-  export interface ColorVisualVariableLegendOptions {
+  /**
+   * **Only applicable to [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html)**.  Defines icon sizes in a [size visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) based on minimum and maximum bounds similar to the [BoundedMinMax](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax) case. However, this specification allows the developer to specify various min and max sizes based on the [MapView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale).  Features with values greater than the provided max value are assigned the specified maximum size for the given view scale. Likewise, features with values less than the provied min value are assigned the specified minumum size for the given view scale. Features with values between the min and the max are assigned a corresponding size that is linearly interpolated between the provided min and max size values for the given scale value.  The object specification for this object is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+   */
+  export interface ScaleDependentIcons extends Object {
+    /**
+     * Value must be `size`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    type: string;
+    /**
+     * Indicates the source of the data values used to determine the size of each feature. 
+     * 
+     * Value Type | Description
+     * ------|-----------
+     * String | The name of the numeric attribute field that contains the data values used to determine the size of each feature.
+     * Function | A function that iterates through each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html), which includes the feature's attributes, and returns the value used to determine the size of the given feature.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    field?: string | Function;
+    /**
+     * The name of the numeric attribute field used to normalize the data in `field`. If this field is used, then the values in `maxDataValue` and `minDataValue` should be normalized as percentages or ratios.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    normalizationField?: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime. The values returned from this expression are the data used to drive the visualization. This takes precedence over `field`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    valueExpression?: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the `valueExpression` property. This is displayed as the title of the corresponding size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the `legendOptions` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    valueExpressionTitle?: string;
+    /**
+     * The maximum data value used in the size ramp. Features with this value or higher will be rendered at the size defined in `maxSize`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    maxDataValue: number;
+    /**
+     * An object defining the size of features whose data value (defined in `field` or `valueExpression`) is greater than or equal to the `maxDataValue` for the given view scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    maxSize: ScaleDependentStops;
+    /**
+     * The minimum data value used in the size ramp. Features with this value or lower will be rendered at the size defined in `minSize`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    minDataValue: number;
+    /**
+     * An object defining the size of features whose data value (defined in `field` or `valueExpression`) is less than or equal to the `minDataValue` for the given view scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    minSize: ScaleDependentStops;
+    /**
+     * An object providing options for displaying the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    legendOptions?: ScaleDependentIconsLegendOptions;
+  }
+
+  /**
+   * **Only applicable to [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html)**.  Defines feature sizes and outline widths in a [size visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) based on the [MapView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale). It also provides the specification of the `minSize` and `maxSize` properties in a [ScaleDependentIcons](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons) size visual variable.  The object specification for this object is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+   */
+  export interface ScaleDependentStops extends Object {
+    /**
+     * Value must be `size`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+     */
+    type: string;
+    /**
+     * This value must be `$view.scale`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+     */
+    valueExpression: string;
+    /**
+     * **Deprecated since version 4.2. Use `valueExpression` instead**. The only supported expression is `view.scale`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+     */
+    expression?: string;
+    /**
+     * This value must be `outline` when scaling polygon outline widths based on the view scale. If scale-dependent icons are desired, then this property should be ignored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+     */
+    target?: string;
+    /**
+     * An array of objects that define the size of the icon (or alternatively the width of the polygon outline) at the given scale `value`. At least two stops are required. The stops must be listed in ascending order based on the value of the `value` property in each stop. Each stop object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+     */
+    stops: ScaleDependentStopsStops[];
+  }
+
+  /**
+   * The **size** visual variable defines the size of individual features in a layer based on a numeric (often thematic) value. This value comes from one of the following: 
+   *   * An attribute `field`
+   *   * The value of an attribute `field` divided by a `normalizationField`
+   *   * A value returned from an [Arcade expression](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) specified in `valueExpression`.
+   *   
+   *   
+   * Size is defined in the form of a continuous ramp, which may be applied to renderers in either a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  Symbol size may be applied either thematically, or literally using real-world units. See the following object specification tables for details about each potential use of a size visual variable: 
+   *   * **[BoundedMinMax](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)** - Feature sizes are bounded by min and max data values.
+   *   * **[ThematicStops](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)** - Defines two or more stops at which feature sizes are mapped to data values.
+   *   * **[ScaleDependentIcons](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)** - Icons sizes are bounded by min and max data values, but the min and max sizes (and interpolated sizes) change based on the scale of the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+   *   * **[ScaleDependentStops](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)** - Defines the width of polygon outlines at various view scales.
+   *   * **[RealWorldSize](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)** - Feature sizes are determined based on real-world measurements and units, not thematic values and screen units.
+   *   
+   *   
+   * [![renderer-unique-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/renderer-unique-vv.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-multivariate-2d/index.html)
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable)
+   */
+  export interface SizeVisualVariable extends Object {
+  }
+
+  /**
+   * Defines two or more stops at which feature sizes are mapped to data values in a [size visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable). Setting two stops will have the same effect as creating a [BoundedMinMax](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax) size visual variable. Adding additional stops allows you to map specific sizes with data values. Sizes are interpolated linearly between stop values.  The object specification for this object is provided below.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+   */
+  export interface ThematicStops extends Object {
+    /**
+     * Value must be `size`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    type: string;
+    /**
+     * Indicates the source of the data values used to determine the size of each feature.
+     * 
+     * Value Type | Description
+     * ------|-----------
+     * String | The name of the numeric attribute field that contains the data values used to determine the size of each feature.
+     * Function | A function that iterates through each [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html), which includes the feature's attributes, and returns the value used to determine the size of the given feature.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    field?: string | Function;
+    /**
+     * The name of the numeric attribute field used to normalize the data in `field`. If this field is used, then the values in `stops` should be normalized as percentages or ratios.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    normalizationField?: string;
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime. The values returned from this expression are the data used to drive the visualization. This takes precedence over `field`. Therefore, this property is typically used as an alternative to `field` in visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    valueExpression?: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the `valueExpression` property. This is displayed as the title of the corresponding size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the `legendOptions` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    valueExpressionTitle?: string;
+    /**
+     * An array of objects that defines the thematic size ramp in a sequence of data or expression stops. At least two stops are required. The stops must be listed in ascending order based on the value of the `value` property in each stop. Each stop object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    stops: ThematicStopsStops[];
+    /**
+     * An object providing options for displaying the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    legendOptions?: ThematicStopsLegendOptions;
+    /**
+     * Only applicable when working in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Defines the axis the size visual variable should be applied to when rendering features with an [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html). See the [local scene sample](https://developers.arcgis.com/javascript/latest/sample-code/scene-local/index.html) for an example of this. 
+     * 
+     * Possible Value | Description
+     * ----------------|-----------
+     * width | The diameter of the symbol from east to west.
+     * depth | The diameter of the symbol from north to south.
+     * height | The height of the symbol.
+     * width-and-depth | Applies the size visual variable to both width and depth axes.
+     * all | Applies the size visual variable to all axes.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    axis?: string;
+    /**
+     * When setting a size visual variable on a renderer using an [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), this property indicates whether to apply the value defined by the [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#height), [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#width), or [depth](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#depth) properties to the corresponding axis of this visual variable instead of proportionally scaling this axis' value after other axes. [View an example](https://developers.arcgis.com/javascript/latest/sample-code/visualization-multivariate-3d/index.html) of this.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    useSymbolValue?: boolean;
+  }
+
+
+  export interface BoundedMinMaxLegendOptions extends Object {
+    /**
+     * The title describing the visualization of the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). This takes precedence over a field alias or `valueExpressionTitle`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    title?: string;
+    /**
+     * Indicates whether to show the size ramp in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#BoundedMinMax)
+     */
+    showLegend?: boolean;
+  }
+
+
+  export interface ColorVisualVariableLegendOptions extends Object {
+    /**
+     * The title describing the visualization of the color ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). This takes precedence over a field alias or `valueExpressionTitle`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     title: string;
+    /**
+     * Indicates whether to show the color ramp in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     showLegend: boolean;
   }
 
-  export interface ColorVisualVariableStops {
+
+  export interface ColorVisualVariableStops extends Object {
+    /**
+     * **Required**. Specifies the data value to map with the given `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     value: number;
+    /**
+     * **Required**. The [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) used to render features with the given `value`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     color: Color;
+    /**
+     * A string value used to label the stop in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable)
+     */
     label: string;
   }
 
-  export interface OpacityVisualVariableLegendOptions {
+
+  export interface OpacityVisualVariableLegendOptions extends Object {
+    /**
+     * The title describing the visualization of the opacity ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). This takes precedence over a field alias or `valueExpressionTitle`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     title: string;
+    /**
+     * Indicates whether to show the opacity ramp in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     showLegend: boolean;
   }
 
-  export interface OpacityVisualVariableStops {
+
+  export interface OpacityVisualVariableStops extends Object {
+    /**
+     * **Required**. Specifies the data value to map with the given `opacity`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     value: number;
+    /**
+     * **Required**. The opacity value used to render features containing the specified `value`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     opacity: number;
+    /**
+     * A string value used to label the stop in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable)
+     */
     label: string;
   }
 
-  export interface SizeVisualVariableLegendOptions {
-    title: string;
-    showLegend: boolean;
+
+  export interface RealWorldSizeLegendOptions extends Object {
+    /**
+     * The title describing the visualization of the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). This takes precedence over a field alias or `valueExpressionTitle`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    title?: string;
+    /**
+     * Indicates whether to show the size ramp in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RealWorldSize)
+     */
+    showLegend?: boolean;
   }
 
-  export interface SizeVisualVariableStops {
+
+  export interface ScaleDependentIconsLegendOptions extends Object {
+    /**
+     * The title describing the visualization of the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). This takes precedence over a field alias or `valueExpressionTitle`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    title?: string;
+    /**
+     * Indicates whether to show the size ramp in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentIcons)
+     */
+    showLegend?: boolean;
+  }
+
+
+  export interface ScaleDependentStopsStops extends Object {
+    /**
+     * Specifies the scale value to map with the given `size`. When the [MapView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale) equals the given number then icons (or outlines) will be rendered with the given size.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+     */
     value: number;
-    size: string | number | any;
-    label: string;
+    /**
+     * The size at which to render features at the specified scale `value`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ScaleDependentStops)
+     */
+    size: string | number;
+  }
+
+
+  export interface ThematicStopsLegendOptions extends Object {
+    /**
+     * The title describing the visualization of the size ramp in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). This takes precedence over a field alias or `valueExpressionTitle`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    title?: string;
+    /**
+     * Indicates whether to show the size ramp in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    showLegend?: boolean;
+  }
+
+
+  export interface ThematicStopsStops extends Object {
+    /**
+     * Specifies the data or expression value to map with the given `size`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    value: number;
+    /**
+     * The size at which to render features containing the specified `value`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    size: number | string;
+    /**
+     * A string value used to label the stop in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ThematicStops)
+     */
+    label?: string;
   }
 
   interface SimpleRenderer extends Renderer, VisualVariablesMixin {
+    /**
+     * The label for the renderer. This describes what features with the given [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#symbol) represent in the real world. This will display next to the layer's [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#symbol) inside the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widget.  This text is not displayed in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) when [visualVariables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables) are used. When the renderer contains [visualVariables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables), you should set the `title` property in `legendOptions` on each visual variable to describe the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#label)
+     */
     label: string;
+    /**
+     * The symbol used by the renderer to visualize all features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#symbol)
+     */
     symbol: Symbol;
-    type: string;
+    /**
+     * The type of renderer. For SimpleRenderer this value is always `simple`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#type)
+     */
+    readonly type: "simple";
 
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): SimpleRenderer;
   }
 
   interface SimpleRendererConstructor {
+    /**
+     * SimpleRenderer renders all features in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) with one [Symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html). This renderer may be used to simply visualize the location of geographic features. For example, layers representing political boundaries, cities, buildings, rivers, etc. that are typically used for providing geographic context in an application may be defined with a single symbol per layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html)
+     */
+
     new(properties?: SimpleRendererProperties): SimpleRenderer;
 
     fromJSON(json: any): SimpleRenderer;
@@ -4273,358 +16894,2515 @@ declare namespace __esri {
   export const SimpleRenderer: SimpleRendererConstructor;
 
   interface SimpleRendererProperties extends RendererProperties, VisualVariablesMixinProperties {
+    /**
+     * The label for the renderer. This describes what features with the given [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#symbol) represent in the real world. This will display next to the layer's [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#symbol) inside the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widget.  This text is not displayed in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) when [visualVariables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables) are used. When the renderer contains [visualVariables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables), you should set the `title` property in `legendOptions` on each visual variable to describe the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#label)
+     */
     label?: string;
+    /**
+     * The symbol used by the renderer to visualize all features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#symbol)
+     */
     symbol?: SymbolProperties;
-    type?: string;
   }
 
+  /**
+   * This object contains helper methods for generating data-driven visualizations with continuous color or class breaks based on a field value or expression from features in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The methods in this module generate renderer or visual variable objects that may be applied directly to a supported layer. The renderers specify how features should be visualized based on data values and colors optimized based on the indicated basemap.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html)
+   */
   interface color {
+    /**
+     * Generates a [ClassBreaksRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html) that may be applied directly to the layer used to call this method. The resulting renderer defines the symbol color of each feature based on the value of the given `field` value. A default color scheme is determined based on the given `basemap`. Depending on the `classificationMethod`, class breaks (or data ranges) are generated based on the statistics of the data. Each feature is assigned a color based on the class break in which the value of the `field` falls.  In most cases you will provide a `layer`, `basemap`, `field`, and `classificationMethod` to generate this renderer. This is a scenario in which the statistics of the data aren't well known and the user doesn't know what colors to use in the visualization.  The other options are provided for convenience for more involved custom visualization authoring applications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @param params Input parameters for generating a classed color visualization based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visualization is generated.
+     * @param params.field The name of the field whose data will be queried for statistics and classified.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.normalizationType With the exception of `log` normalization, data normalization creates a ratio by dividing two values. When comparing attribute values between features, normalization minimizes the effect of varying map areas and the number of observations. For example, dividing the 18 to 30 year old population by the area of a polygon feature yields a density value that can be compared evenly with other features, regardless of their size.
+     * Indicates how the data is normalized. The data value obtained from the `field` is normalized in one of the following ways before it is compared with the class breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * field | Divides the `field` value by the value of `normalizationField`. This value is set by default if the `normalizationField` is provided.
+     * log | Computes the base 10 logarithm of the data value. This can be a useful approach for some data distributions because it reduces the influence of very large data values.
+     * percent-of-total | Divides the data value by the sum of all data values then multiplies by 100. Use `normalizationTotal` to define the total value by which to normalize. This value is set by default if the `normalizationTotal` is provided.
+     * 
+     * @param params.normalizationTotal When `normalizationType` is `percent-of-total`, this property contains the total of all data values.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.classificationMethod 
+     * The classification method used for generating breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * equal-interval | Divides the range of attribute values into equal-sized subranges. For example, if you specify three classes for a field whose values range from 0 to 300, this method will create three classes with ranges of 0–100, 101–200, and 201–300. Equal interval is best applied to familiar data ranges, such as percentages and temperature. This method emphasizes the amount of an attribute value relative to other values. For example, it could show if a store is part of the group of stores that make up the top one-third of all sales.
+     * natural-breaks | Groups similar values that maximize the differences between classes. Features are divided into classes whose boundaries are set where there are relatively big differences in the data values. Natural breaks are data-specific classifications and not useful for comparing multiple maps built from different underlying information.
+     * quantile | Assigns the same number of data values to each class. This is well suited to linearly distributed data. Because features are grouped in equal numbers in each class, the resulting map can often be misleading. Similar features can potentially be placed in adjacent classes, or features with widely different values can be put in the same class. You can minimize this distortion by increasing the number of classes.
+     * standard-deviation | Creates class breaks with equal value ranges that are a proportion of the standard deviation. This is usually done at intervals of one, one-half, one-third, or one-fourth standard deviations from the mean.
+     * @param params.standardDeviationInterval If a `standard-deviation` classification method is used, then this indicates the interval by which to generate class breaks.  **Possible Values:** 1 | 0.5 | 0.33 | 0.25
+     * @param params.numClasses The number of class breaks to generate. This is ignored if a `standard-deviation` classification method is specified.
+     * @param params.colorScheme In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.legendOptions Provides options for setting a title to describe a field instead of using the field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.minValue A minimum value set by the user. Use this in conjunction with `maxValue` to generate class breaks between lower and upper bounds. This will be the lower bound of the lowest class break.
+     * @param params.maxValue A maximum value set by the user. Use this in conjunction with `minValue` to generate class breaks between lower and upper bounds. This will be the upper bound of the highest class break.
+     * @param params.defaultSymbolEnabled Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric"`, but isn't required for layers with a `mesh` geometry type.
+     * @param params.symbolType 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter does not need to be specified for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * @param params.colorMixMode 
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     */
+    createClassBreaksRenderer(params: colorCreateClassBreaksRendererParams): IPromise<ClassBreaksRendererResult>;
+    /**
+     * Generates a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) that may be applied directly to the layer used to call this method. The renderer contains a continuous color visual variable that maps optimal colors based on the indicated basemap to specific stop values based on queried statistics from the indicated field or expression.  In most cases you will provide a `layer`, `basemap`, `field`, and `theme` to generate this renderer. This is a scenario in which the statistics of the data aren't well known and the user doesn't know what colors to use in the visualization.  The other options are provided for convenience for more involved custom visualization authoring applications. For example, if you already generated statistics in another operation, you can pass the statistics object to the `statistics` parameter to avoid making an extra call to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     * 
+     * @param params Input parameters for generating a continuous color visualization based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visualization is generated.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.theme 
+     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * @param params.colorScheme In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on a `theme` and the `basemap`.
+     * @param params.legendOptions Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.minValue A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned color visual variable.
+     * @param params.maxValue A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned color visual variable.
+     * @param params.defaultSymbolEnabled Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric"`, but isn't required for layers with a `mesh` geometry type.
+     * @param params.symbolType 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter does not need to be specified for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * @param params.colorMixMode 
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     */
     createContinuousRenderer(params: colorCreateContinuousRendererParams): IPromise<ContinuousRendererResult>;
+    /**
+     * Generates a [PointCloudStretchRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudStretchRenderer.html) with a color scheme best-suited for the given basemap based on statistics returned from a given field of a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html). All that's required is a layer instance, field name, and basemap ID. You can optionally set the size and density of the points to suit the needs of the desired visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     * 
+     * @param params Input parameters for generating a renderer based on the given field of the input layer. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visualization is generated.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization. The only field names used for this renderer type are `elevation` and `intensity`.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.size The size of each point expressed as a percentage. This value will determine point sizes scaled based on the given `density` of points. When the value is `100%`, the size of each point is set so that it minimizes the number of gaps between neighboring points. Any value above `100%` will allow for points to overlap neighboring points scaled to the given value. Values below `100%` scale point sizes smaller so there appear to be more gaps between points.
+     * @param params.density The number of points per inch in the view.
+     * @param params.colorScheme In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the stats object here to avoid making a second statistics query to the server.
+     * 
+     */
     createPCContinuousRenderer(params: colorCreatePCContinuousRendererParams): IPromise<PCContinuousRendererResult>;
+    /**
+     * Generates a [PointCloudRGBRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRGBRenderer.html) based on the `RGB` field of a given [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html). This method simplifies the experience of creating a [PointCloudRGBRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRGBRenderer.html) manually. All that's required is a layer instance. You can optionally set the size and density of the points to suit the needs of the desired visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCTrueColorRenderer)
+     * 
+     * @param params Input parameters for generating a true color visualization based on the `RGB` field of the input layer. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visualization is generated.
+     * @param params.size The size of each point expressed as a percentage. This value will determine point sizes scaled based on the given `density` of points. When the value is `100%`, the size of each point is set so that it minimizes the number of gaps between neighboring points. Any value above `100%` will allow for points to overlap neighboring points scaled to the given value. Values below `100%` scale point sizes smaller so there appear to be more gaps between points.
+     * @param params.density The number of points per inch in the view.
+     * 
+     */
     createPCTrueColorRenderer(params: colorCreatePCTrueColorRendererParams): IPromise<PCTrueColorRendererResult>;
+    /**
+     * This method generates a color visual variable with default stops that are optimally chosen based on the statistics queried for the indicated field or expression and colors based on the input basemap.  There are two different ways this method may be called. The most common case is by providing a `layer`, `basemap`, `field`, and `theme`. This is the scenario where the statistics of the data aren't well known and the user doesn't know what colors to use.  The other options are provided for convenience for more involved custom visualization authoring applications. For example, if you already generated statistics in another operation, you can pass the object in the `statistics` parameter to avoid making an extra call to the server. You can also provide a `colorScheme` if you don't want one picked for you. In this case the `basemap` and `theme` options would be ignored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     * 
+     * @param params Input parameters for generating a color visual variable based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visual variable is generated.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.theme 
+     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * @param params.colorScheme In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on a `theme` and the `basemap`.
+     * @param params.legendOptions Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.minValue A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned color visual variable.
+     * @param params.maxValue A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned color visual variable.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This property is only applicable to generating visualizations with 3D symbols, except for layers with a `mesh` geometry type.
+     * @param params.worldScale Indicates if the size units of the symbols will be in meters. This should be `true` when generating visualizations with 3D volumetric symbology, except for layers with a `mesh` geometry type. A `view` must be provided if this property is set to `true`.
+     * 
+     */
     createVisualVariable(params: colorCreateVisualVariableParams): IPromise<VisualVariableResult>;
   }
 
   export const color: color;
 
-  export interface colorCreateContinuousRendererParams {
+  /**
+   * The result object of the [createClassBreaksRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ClassBreaksRendererResult)
+   */
+  export interface ClassBreaksRendererResult extends Object {
+    /**
+     * The renderer object configured to best match the given basemap and the spread of the data. Set this on a layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ClassBreaksRendererResult)
+     */
+    renderer: ClassBreaksRenderer;
+    /**
+     * This object describes class breaks generated from data in a layer for a given field with a specified classification method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ClassBreaksRendererResult)
+     */
+    classBreaksResult: ClassBreaksResult;
+    /**
+     * The color scheme used for the class breaks.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ClassBreaksRendererResult)
+     */
+    colorScheme: ColorScheme;
+    /**
+     * Indicates whether default values are used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ClassBreaksRendererResult)
+     */
+    defaultValuesUsed: boolean;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ClassBreaksRendererResult)
+     */
+    basemapId: string;
+  }
+
+
+  export interface colorCreateClassBreaksRendererParams extends Object {
+    /**
+     * The layer for which the visualization is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The name of the field whose data will be queried for statistics and classified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
     field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
     normalizationField?: string;
+    /**
+     * Indicates how the data is normalized. The data value obtained from the `field` is normalized in one of the following ways before it is compared with the class breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * field | Divides the `field` value by the value of `normalizationField`. This value is set by default if the `normalizationField` is provided.
+     * log | Computes the base 10 logarithm of the data value. This can be a useful approach for some data distributions because it reduces the influence of very large data values.
+     * percent-of-total | Divides the data value by the sum of all data values then multiplies by 100. Use `normalizationTotal` to define the total value by which to normalize. This value is set by default if the `normalizationTotal` is provided.
+     * 
+     * With the exception of `log` normalization, data normalization creates a ratio by dividing two values. When comparing attribute values between features, normalization minimizes the effect of varying map areas and the number of observations. For example, dividing the 18 to 30 year old population by the area of a polygon feature yields a density value that can be compared evenly with other features, regardless of their size.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
+    normalizationType?: string;
+    /**
+     * When `normalizationType` is `percent-of-total`, this property contains the total of all data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
+    normalizationTotal?: number;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
-    theme?: string;
+    /**
+     * The classification method used for generating breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * equal-interval | Divides the range of attribute values into equal-sized subranges. For example, if you specify three classes for a field whose values range from 0 to 300, this method will create three classes with ranges of 0–100, 101–200, and 201–300. Equal interval is best applied to familiar data ranges, such as percentages and temperature. This method emphasizes the amount of an attribute value relative to other values. For example, it could show if a store is part of the group of stores that make up the top one-third of all sales.
+     * natural-breaks | Groups similar values that maximize the differences between classes. Features are divided into classes whose boundaries are set where there are relatively big differences in the data values. Natural breaks are data-specific classifications and not useful for comparing multiple maps built from different underlying information.
+     * quantile | Assigns the same number of data values to each class. This is well suited to linearly distributed data. Because features are grouped in equal numbers in each class, the resulting map can often be misleading. Similar features can potentially be placed in adjacent classes, or features with widely different values can be put in the same class. You can minimize this distortion by increasing the number of classes.
+     * standard-deviation | Creates class breaks with equal value ranges that are a proportion of the standard deviation. This is usually done at intervals of one, one-half, one-third, or one-fourth standard deviations from the mean.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @default equal-interval
+     */
+    classificationMethod?: string;
+    /**
+     * If a `standard-deviation` classification method is used, then this indicates the interval by which to generate class breaks.  **Possible Values:** 1 | 0.5 | 0.33 | 0.25
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @default 1
+     */
+    standardDeviationInterval?: number;
+    /**
+     * The number of class breaks to generate. This is ignored if a `standard-deviation` classification method is specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @default 5
+     */
+    numClasses?: number;
+    /**
+     * In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
     colorScheme?: ColorScheme;
-    legendOptions?: colorCreateContinuousRendererParamsLegendOptions;
-    statistics?: SummaryStatisticsResult;
+    /**
+     * Provides options for setting a title to describe a field instead of using the field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
+    legendOptions?: colorCreateClassBreaksRendererParamsLegendOptions;
+    /**
+     * A minimum value set by the user. Use this in conjunction with `maxValue` to generate class breaks between lower and upper bounds. This will be the lower bound of the lowest class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
     minValue?: number;
+    /**
+     * A maximum value set by the user. Use this in conjunction with `minValue` to generate class breaks between lower and upper bounds. This will be the upper bound of the highest class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
     maxValue?: number;
+    /**
+     * Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @default true
+     */
     defaultSymbolEnabled?: boolean;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric"`, but isn't required for layers with a `mesh` geometry type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
     view?: SceneView;
+    /**
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter does not need to be specified for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @default 2d
+     */
     symbolType?: string;
+    /**
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * 
+     * @default replace
+     */
     colorMixMode?: string;
   }
 
-  export interface colorCreateContinuousRendererParamsLegendOptions {
-    title: string;
+
+  export interface colorCreateClassBreaksRendererParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     */
+    title?: string;
   }
 
-  export interface colorCreatePCContinuousRendererParams {
-    layer: PointCloudLayer;
-    field: string;
-    basemap?: string | Basemap;
-    size?: string;
-    density?: number;
-    colorScheme?: ColorScheme;
-    statistics?: SummaryStatisticsResult;
-  }
 
-  export interface colorCreatePCTrueColorRendererParams {
-    layer: PointCloudLayer;
-    size?: string;
-    density?: number;
-  }
-
-  export interface colorCreateVisualVariableParams {
+  export interface colorCreateContinuousRendererParams extends Object {
+    /**
+     * The layer for which the visualization is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     normalizationField?: string;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
+    /**
+     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     theme?: string;
+    /**
+     * In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on a `theme` and the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     colorScheme?: ColorScheme;
-    legendOptions?: colorCreateVisualVariableParamsLegendOptions;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
+    legendOptions?: colorCreateContinuousRendererParamsLegendOptions;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     statistics?: SummaryStatisticsResult;
+    /**
+     * A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     minValue?: number;
+    /**
+     * A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     maxValue?: number;
+    /**
+     * Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     * 
+     * @default true
+     */
+    defaultSymbolEnabled?: boolean;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric"`, but isn't required for layers with a `mesh` geometry type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
     view?: SceneView;
+    /**
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter does not need to be specified for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     * 
+     * @default 2d
+     */
+    symbolType?: string;
+    /**
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     * 
+     * @default replace
+     */
+    colorMixMode?: string;
+  }
+
+
+  export interface colorCreateContinuousRendererParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
+    title?: string;
+    /**
+     * Indicates whether to describe the renderer in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     */
+    showLegend?: boolean;
+  }
+
+
+  export interface colorCreatePCContinuousRendererParams extends Object {
+    /**
+     * The layer for which the visualization is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     */
+    layer: PointCloudLayer;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization. The only field names used for this renderer type are `elevation` and `intensity`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     */
+    field: string;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     * 
+     * @default gray
+     */
+    basemap?: string | Basemap;
+    /**
+     * The size of each point expressed as a percentage. This value will determine point sizes scaled based on the given `density` of points. When the value is `100%`, the size of each point is set so that it minimizes the number of gaps between neighboring points. Any value above `100%` will allow for points to overlap neighboring points scaled to the given value. Values below `100%` scale point sizes smaller so there appear to be more gaps between points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     * 
+     * @default 100%
+     */
+    size?: string;
+    /**
+     * The number of points per inch in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     * 
+     * @default 25
+     */
+    density?: number;
+    /**
+     * In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     */
+    colorScheme?: ColorScheme;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the stats object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer)
+     */
+    statistics?: SummaryStatisticsResult;
+  }
+
+
+  export interface colorCreatePCTrueColorRendererParams extends Object {
+    /**
+     * The layer for which the visualization is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCTrueColorRenderer)
+     */
+    layer: PointCloudLayer;
+    /**
+     * The size of each point expressed as a percentage. This value will determine point sizes scaled based on the given `density` of points. When the value is `100%`, the size of each point is set so that it minimizes the number of gaps between neighboring points. Any value above `100%` will allow for points to overlap neighboring points scaled to the given value. Values below `100%` scale point sizes smaller so there appear to be more gaps between points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCTrueColorRenderer)
+     * 
+     * @default 100%
+     */
+    size?: string;
+    /**
+     * The number of points per inch in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCTrueColorRenderer)
+     * 
+     * @default 25
+     */
+    density?: number;
+  }
+
+
+  export interface colorCreateVisualVariableParams extends Object {
+    /**
+     * The layer for which the visual variable is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    layer: FeatureLayer | SceneLayer;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    normalizationField?: string;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     * 
+     * @default gray
+     */
+    basemap?: string | Basemap;
+    /**
+     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    theme?: string;
+    /**
+     * In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on a `theme` and the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    colorScheme?: ColorScheme;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    legendOptions?: colorCreateVisualVariableParamsLegendOptions;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    statistics?: SummaryStatisticsResult;
+    /**
+     * A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    minValue?: number;
+    /**
+     * A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    maxValue?: number;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This property is only applicable to generating visualizations with 3D symbols, except for layers with a `mesh` geometry type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    view?: SceneView;
+    /**
+     * Indicates if the size units of the symbols will be in meters. This should be `true` when generating visualizations with 3D volumetric symbology, except for layers with a `mesh` geometry type. A `view` must be provided if this property is set to `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
     worldScale?: boolean;
   }
 
-  export interface colorCreateVisualVariableParamsLegendOptions {
-    title: string;
+
+  export interface colorCreateVisualVariableParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    title?: string;
+    /**
+     * Indicates whether to describe the renderer in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     */
+    showLegend?: boolean;
   }
 
-  export interface ContinuousRendererResult {
+  /**
+   * The result object of the [createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ContinuousRendererResult)
+   */
+  export interface ContinuousRendererResult extends Object {
+    /**
+     * The renderer object configured to best match the given basemap and the spread of the data. Set this on a layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ContinuousRendererResult)
+     */
     renderer: ClassBreaksRenderer;
+    /**
+     * A color visual variable configured based on the statistics of the data and the given basemap and scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ContinuousRendererResult)
+     */
     visualVariable: ColorVisualVariable;
+    /**
+     * The color scheme used by the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ContinuousRendererResult)
+     */
     colorScheme: ColorScheme;
+    /**
+     * Indicates whether default values are used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ContinuousRendererResult)
+     */
     defaultValuesUsed: boolean;
+    /**
+     * Basic statistics returned from a query to the service for data from the given field name or expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ContinuousRendererResult)
+     */
     statistics: SummaryStatisticsResult;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#ContinuousRendererResult)
+     */
     basemapId: string;
   }
 
-  export interface PCContinuousRendererResult {
+  /**
+   * The result object of the [createPCContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCContinuousRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCContinuousRendererResult)
+   */
+  export interface PCContinuousRendererResult extends Object {
+    /**
+     * The renderer object configured to best match the given basemap and the spread of the data. Set this object on the input layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCContinuousRendererResult)
+     */
     renderer: PointCloudStretchRenderer;
+    /**
+     * The color scheme used by the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCContinuousRendererResult)
+     */
     colorScheme: ColorScheme;
+    /**
+     * Indicates whether default values are used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCContinuousRendererResult)
+     */
     defaultValuesUsed: boolean;
+    /**
+     * Basic statistics returned from a query to the service for data from the given field name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCContinuousRendererResult)
+     */
     statistics: SummaryStatisticsResult;
+    /**
+     * The ID of the basemap used to determine the optimal color scheme for the output renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCContinuousRendererResult)
+     */
     basemapId: string;
   }
 
-  export interface PCTrueColorRendererResult {
+  /**
+   * The result object of the [createPCTrueColorRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createPCTrueColorRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCTrueColorRendererResult)
+   */
+  export interface PCTrueColorRendererResult extends Object {
+    /**
+     * The renderer object configured to represent the true color of each point in the point cloud. This gives the PointCloudLayer a realistic visualization of how it looks in the real world. Set this object on the input layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#PCTrueColorRendererResult)
+     */
     renderer: PointCloudRGBRenderer;
   }
 
-  export interface VisualVariableResult {
+  /**
+   * The result object of the [createVisualVariable()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#VisualVariableResult)
+   */
+  export interface VisualVariableResult extends Object {
+    /**
+     * A color visual variable configured based on the statistics of the data and the given basemap and scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#VisualVariableResult)
+     */
     visualVariable: ColorVisualVariable;
+    /**
+     * The color scheme used by the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#VisualVariableResult)
+     */
     colorScheme: ColorScheme;
+    /**
+     * Basic statistics returned from a query to the service for the given field or expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#VisualVariableResult)
+     */
     statistics: SummaryStatisticsResult;
+    /**
+     * Indicates whether default values are used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#VisualVariableResult)
+     */
     defaultValuesUsed: boolean;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#VisualVariableResult)
+     */
     basemapId: string;
+    /**
+     * Authoring information related to the creation of the visual variable. This includes information related to UI inputs from sliders and selected themes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#VisualVariableResult)
+     */
     authoringInfo: AuthoringInfo;
   }
 
+  /**
+   * This object contains helper methods for generating location-only visualizations (not data-driven) in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The [createRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer) method generates a [SimpleRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html) object that may be applied directly to the layer. This renderer contains a single symbol with a color optimally selected based on the indicated basemap.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html)
+   */
   interface location {
+    /**
+     * Generates a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) that may be applied directly to a supported [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The renderer contains a single symbol with a color optimally chosen based on the indicated basemap.  In most cases you will provide a `layer` and `basemap` to generate this renderer. If working in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), then the `view` and `symbolType` options should be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer)
+     * 
+     * @param params Input parameters for generating a location-based visualization. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visualization is generated.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.locationScheme In authoring apps, the user may select a pre-defined location scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric"`, except for layers with a `mesh` geometryType.
+     * @param params.symbolType 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter does not need to be specified for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * @param params.colorMixMode 
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     */
     createRenderer(params: locationCreateRendererParams): IPromise<RendererResult>;
   }
 
   export const location: location;
 
-  export interface locationCreateRendererParams {
+
+  export interface locationCreateRendererParams extends Object {
+    /**
+     * The layer for which the visualization is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
+    /**
+     * In authoring apps, the user may select a pre-defined location scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer)
+     */
     locationScheme?: PointLocationScheme | PolylineLocationScheme | PolygonLocationScheme;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric"`, except for layers with a `mesh` geometryType.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer)
+     */
     view?: SceneView;
+    /**
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter does not need to be specified for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer)
+     * 
+     * @default 2d
+     */
     symbolType?: string;
+    /**
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer)
+     * 
+     * @default replace
+     */
     colorMixMode?: string;
   }
 
-  export interface RendererResult {
+  /**
+   * The result object of the [createRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#createRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#RendererResult)
+   */
+  export interface RendererResult extends Object {
+    /**
+     * A simple renderer configured with a single color best suited to match the given basemap. Set this to a layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#RendererResult)
+     */
     renderer: SimpleRenderer;
+    /**
+     * The location scheme used by the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#RendererResult)
+     */
     locationScheme: PointLocationScheme | PolylineLocationScheme | PolygonLocationScheme;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-location.html#RendererResult)
+     */
     basemapId: string;
   }
 
+  /**
+   * This object contains a helper method for generating data-driven visualizations with continuous opacity based on data returned from a field value or expression in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html)
+   */
+  interface opacity {
+    /**
+     * This method generates an opacity visual variable with default alpha values optimally mapped to data values based on the statistics queried for the indicated field or expression.  There are several ways this method may be called. The most common case is by providing a `layer` and a `field`. This is the scenario where the statistics of the data aren't well known and the user doesn't know the which alpha values to map to data values.  The other options are provided for convenience for more involved custom visualization authoring applications. For example, if you already generated statistics in another operation, you can pass the stats in the `statistics` parameter to avoid making an extra call to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     * 
+     * @param params Input parameters for generating an opacity visual variable based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visual variable is generated.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.legendOptions Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.minValue A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned visual variable.
+     * @param params.maxValue A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned visual variable.
+     * 
+     */
+    createVisualVariable(params: opacityCreateVisualVariableParams): IPromise<opacityVisualVariableResult>;
+  }
+
+  export const opacity: opacity;
+
+
+  export interface opacityCreateVisualVariableParams extends Object {
+    /**
+     * The layer for which the visual variable is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    layer: FeatureLayer | SceneLayer;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    normalizationField?: string;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    legendOptions?: opacityCreateVisualVariableParamsLegendOptions;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    statistics?: SummaryStatisticsResult;
+    /**
+     * A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    minValue?: number;
+    /**
+     * A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    maxValue?: number;
+  }
+
+
+  export interface opacityCreateVisualVariableParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     */
+    title?: string;
+  }
+
+  /**
+   * The result object of the [createVisualVariable()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#VisualVariableResult)
+   */
+  export interface opacityVisualVariableResult extends Object {
+    /**
+     * An opacity visual variable configured based on the statistics of the data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#VisualVariableResult)
+     */
+    visualVariable: OpacityVisualVariable;
+    /**
+     * Basic statistics returned from a query to the service for the given field or expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#VisualVariableResult)
+     */
+    statistics: SummaryStatisticsResult;
+    /**
+     * Indicates whether default values are used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#VisualVariableResult)
+     */
+    defaultValuesUsed: boolean;
+    /**
+     * Authoring information related to the creation of the visual variable. This includes information related to UI inputs from sliders and selected themes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#VisualVariableResult)
+     */
+    authoringInfo: AuthoringInfo;
+  }
+
+  /**
+   * This object contains helper methods for generating data-driven visualizations with continuous size or class breaks based on a field value or expression from features in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The methods in this module generate renderer or visual variable objects that may be applied directly to a supported layer. The renderers specify how features should be visualized based on data values and sizes optimized based on the indicated basemap.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html)
+   */
   interface size {
+    /**
+     * Generates a [ClassBreaksRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-ClassBreaksRenderer.html) that may be applied directly to the layer used to call this method. The resulting renderer defines the symbol size of each feature based on the value of the given `field` value. A default size scheme is determined based on the given `basemap`. Depending on the `classificationMethod`, class breaks (or data ranges) are generated based on the statistics of the data. Each feature is assigned a color based on the class break in which the value of the `field` falls.  In most cases you will provide a `layer`, `basemap`, `field`, and `classificationMethod` to generate this renderer. This is a scenario in which the statistics of the data aren't well known and the user doesn't know what sizes to use in the visualization.  The other options are provided for convenience for more involved custom visualization authoring applications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * 
+     * @param params Input parameters for generating a classed size visualization based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visualization is generated.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.field The name of the field whose data will be queried for statistics and classified.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.normalizationType With the exception of `log` normalization, data normalization creates a ratio by dividing two values. When comparing attribute values between features, normalization minimizes the effect of varying map areas and the number of observations. For example, dividing the 18 to 30 year old population by the area of a polygon feature yields a density value that can be compared evenly with other features, regardless of their size.
+     * Indicates how the data is normalized. The data value obtained from the `field` is normalized in one of the following ways before it is compared with the class breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * field | Divides the `field` value by the value of `normalizationField`. This value is set by default if the `normalizationField` is provided.
+     * log | Computes the base 10 logarithm of the data value. This can be a useful approach for some data distributions because it reduces the influence of very large data values.
+     * percent-of-total | Divides the data value by the sum of all data values then multiplies by 100. Use `normalizationTotal` to define the total value by which to normalize. This value is set by default if the `normalizationTotal` is provided.
+     * 
+     * @param params.normalizationTotal When `normalizationType` is `percent-of-total`, this property contains the total of all data values.
+     * @param params.classificationMethod 
+     * The classification method used for generating breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * equal-interval | Divides the range of attribute values into equal-sized subranges. For example, if you specify three classes for a field whose values range from 0 to 300, this method will create three classes with ranges of 0–100, 101–200, and 201–300. Equal interval is best applied to familiar data ranges, such as percentages and temperature. This method emphasizes the amount of an attribute value relative to other values. For example, it could show if a store is part of the group of stores that make up the top one-third of all sales.
+     * natural-breaks | Groups similar values that maximize the differences between classes. Features are divided into classes whose boundaries are set where there are relatively big differences in the data values. Natural breaks are data-specific classifications and not useful for comparing multiple maps built from different underlying information.
+     * quantile | Assigns the same number of data values to each class. This is well suited to linearly distributed data. Because features are grouped in equal numbers in each class, the resulting map can often be misleading. Similar features can potentially be placed in adjacent classes, or features with widely different values can be put in the same class. You can minimize this distortion by increasing the number of classes.
+     * standard-deviation | Creates class breaks with equal value ranges that are a proportion of the standard deviation. This is usually done at intervals of one, one-half, one-third, or one-fourth standard deviations from the mean.
+     * @param params.standardDeviationInterval If a `standard-deviation` classification method is used, then this indicates the interval by which to generate class breaks.  **Possible Values:** 1 | 0.5 | 0.33 | 0.25
+     * @param params.numClasses The number of class breaks to generate. This is ignored if a `standard-deviation` classification method is specified.
+     * @param params.sizeScheme In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.legendOptions Provides options for setting a title to describe a field instead of using the field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.minValue A minimum value set by the user. Use this in conjunction with `maxValue` to generate class breaks between lower and upper bounds. This will be the lower bound of the lowest class break.
+     * @param params.maxValue A maximum value set by the user. Use this in conjunction with `minValue` to generate class breaks between lower and upper bounds. This will be the upper bound of the highest class break.
+     * @param params.defaultSymbolEnabled Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`.
+     * @param params.symbolType 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sized uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     */
+    createClassBreaksRenderer(params: sizeCreateClassBreaksRendererParams): IPromise<sizeClassBreaksRendererResult>;
+    /**
+     * Generates a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) that may be applied directly to the layer used to call this method. The renderer contains a continuous size visual variable that maps marker sizes to specific stop values based on queried statistics from the indicated field or expression.  In most cases you will provide a `layer`, `basemap`, and `field` to generate this renderer. This is a scenario in which the statistics of the data aren't well known and the user doesn't know what colors to use in the visualization.  The other options are provided for convenience for more involved custom visualization authoring applications. For example, if you already generated statistics in another operation, you can pass the statistics object to the `statistics` parameter to avoid making an extra call to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     * 
+     * @param params Input parameters for generating size visual variables based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the renderer is generated.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.sizeScheme In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.legendOptions Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.minValue A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned size visual variable.
+     * @param params.maxValue A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned size visual variable.
+     * @param params.defaultSymbolEnabled Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`.
+     * @param params.symbolType 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sized uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     */
     createContinuousRenderer(params: sizeCreateContinuousRendererParams): IPromise<sizeContinuousRendererResult>;
+    /**
+     * This method generates an array of size visual variables with default stops that are optimally chosen based on the statistics queried for the indicated field or expression and mapped to appropriate sizes.  There are two different ways this method may be called. The most common case is by providing a `layer`, `basemap`, and `field`. This is the scenario where the statistics of the data aren't well known and the user doesn't know what colors to use.  The other options are provided for convenience for more involved custom visualization authoring applications. For example, if you already generated statistics in another operation, you can pass the object in the `statistics` parameter to avoid making an extra call to the server. You can also provide a `colorScheme` if you don't want one picked for you. In this case the `basemap` and `theme` options would be ignored.  The resulting array of visual variables will contain exactly one size visual variable unless the `axis` parameter is set to "height".
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     * 
+     * @param params Input parameters for generating size visual variables based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visual variables are generated.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.sizeScheme In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.legendOptions Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.minValue A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned size visual variable.
+     * @param params.maxValue A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned size visual variable.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This property is only applicable to generating visualizations with 3D symbols.
+     * @param params.worldScale Indicates if the size units of the symbols will be in meters. This should be `true` when generating visualizations with 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * @param params.axis When set to `all`, a single size variable that scales uniformly in all dimensions is generated. When set to `height`, the result contains two size visual variables: the first one sizes the height according to the field statistics, while the second defines a constant size for width and depth.  **Possible Values:** all | height
+     * 
+     */
     createVisualVariables(params: sizeCreateVisualVariablesParams): IPromise<sizeVisualVariableResult>;
   }
 
   export const size: size;
 
-  export interface sizeContinuousRendererResult {
+  /**
+   * The result object of the [createClassBreaksRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ClassBreaksRendererResult)
+   */
+  export interface sizeClassBreaksRendererResult extends Object {
+    /**
+     * The renderer object configured to best match the given basemap and the spread of the data. Set this on a layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ClassBreaksRendererResult)
+     */
     renderer: ClassBreaksRenderer;
-    visualVariables: SizeVisualVariable[];
+    /**
+     * This object describes class breaks generated from data in a layer for a given field with a specified classification method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ClassBreaksRendererResult)
+     */
+    classBreaksResult: ClassBreaksResult;
+    /**
+     * The size scheme used by the visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ClassBreaksRendererResult)
+     */
     sizeScheme: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
+    /**
+     * Indicates whether default values are used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ClassBreaksRendererResult)
+     */
     defaultValuesUsed: boolean;
-    statistics: SummaryStatisticsResult;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ClassBreaksRendererResult)
+     */
     basemapId: string;
   }
 
-  export interface sizeCreateContinuousRendererParams {
+  /**
+   * The result object of the [createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ContinuousRendererResult)
+   */
+  export interface sizeContinuousRendererResult extends Object {
+    /**
+     * The renderer object configured to best match the given basemap and the spread of the data. Set this on a layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ContinuousRendererResult)
+     */
+    renderer: ClassBreaksRenderer;
+    /**
+     * Size visual variables configured based on the statistics of the data and the given basemap and scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ContinuousRendererResult)
+     */
+    visualVariables: SizeVisualVariable[];
+    /**
+     * The size scheme used by the visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ContinuousRendererResult)
+     */
+    sizeScheme: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
+    /**
+     * Indicates whether default values are used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ContinuousRendererResult)
+     */
+    defaultValuesUsed: boolean;
+    /**
+     * Basic statistics returned from a query to the service for data from the given field name or expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ContinuousRendererResult)
+     */
+    statistics: SummaryStatisticsResult;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#ContinuousRendererResult)
+     */
+    basemapId: string;
+  }
+
+
+  export interface sizeCreateClassBreaksRendererParams extends Object {
+    /**
+     * The layer for which the visualization is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
     layer: FeatureLayer | SceneLayer;
-    field: string;
-    normalizationField?: string;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
+    /**
+     * The name of the field whose data will be queried for statistics and classified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
+    field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
+    normalizationField?: string;
+    /**
+     * Indicates how the data is normalized. The data value obtained from the `field` is normalized in one of the following ways before it is compared with the class breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * field | Divides the `field` value by the value of `normalizationField`. This value is set by default if the `normalizationField` is provided.
+     * log | Computes the base 10 logarithm of the data value. This can be a useful approach for some data distributions because it reduces the influence of very large data values.
+     * percent-of-total | Divides the data value by the sum of all data values then multiplies by 100. Use `normalizationTotal` to define the total value by which to normalize. This value is set by default if the `normalizationTotal` is provided.
+     * 
+     * With the exception of `log` normalization, data normalization creates a ratio by dividing two values. When comparing attribute values between features, normalization minimizes the effect of varying map areas and the number of observations. For example, dividing the 18 to 30 year old population by the area of a polygon feature yields a density value that can be compared evenly with other features, regardless of their size.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
+    normalizationType?: string;
+    /**
+     * When `normalizationType` is `percent-of-total`, this property contains the total of all data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
+    normalizationTotal?: number;
+    /**
+     * The classification method used for generating breaks. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * equal-interval | Divides the range of attribute values into equal-sized subranges. For example, if you specify three classes for a field whose values range from 0 to 300, this method will create three classes with ranges of 0–100, 101–200, and 201–300. Equal interval is best applied to familiar data ranges, such as percentages and temperature. This method emphasizes the amount of an attribute value relative to other values. For example, it could show if a store is part of the group of stores that make up the top one-third of all sales.
+     * natural-breaks | Groups similar values that maximize the differences between classes. Features are divided into classes whose boundaries are set where there are relatively big differences in the data values. Natural breaks are data-specific classifications and not useful for comparing multiple maps built from different underlying information.
+     * quantile | Assigns the same number of data values to each class. This is well suited to linearly distributed data. Because features are grouped in equal numbers in each class, the resulting map can often be misleading. Similar features can potentially be placed in adjacent classes, or features with widely different values can be put in the same class. You can minimize this distortion by increasing the number of classes.
+     * standard-deviation | Creates class breaks with equal value ranges that are a proportion of the standard deviation. This is usually done at intervals of one, one-half, one-third, or one-fourth standard deviations from the mean.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * 
+     * @default equal-interval
+     */
+    classificationMethod?: string;
+    /**
+     * If a `standard-deviation` classification method is used, then this indicates the interval by which to generate class breaks.  **Possible Values:** 1 | 0.5 | 0.33 | 0.25
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * 
+     * @default 1
+     */
+    standardDeviationInterval?: number;
+    /**
+     * The number of class breaks to generate. This is ignored if a `standard-deviation` classification method is specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * 
+     * @default 5
+     */
+    numClasses?: number;
+    /**
+     * In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
     sizeScheme?: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
-    legendOptions?: sizeCreateContinuousRendererParamsLegendOptions;
-    statistics?: SummaryStatisticsResult;
+    /**
+     * Provides options for setting a title to describe a field instead of using the field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
+    legendOptions?: sizeCreateClassBreaksRendererParamsLegendOptions;
+    /**
+     * A minimum value set by the user. Use this in conjunction with `maxValue` to generate class breaks between lower and upper bounds. This will be the lower bound of the lowest class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
     minValue?: number;
+    /**
+     * A maximum value set by the user. Use this in conjunction with `minValue` to generate class breaks between lower and upper bounds. This will be the upper bound of the highest class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
     maxValue?: number;
+    /**
+     * Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * 
+     * @default true
+     */
     defaultSymbolEnabled?: boolean;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
     view?: SceneView;
+    /**
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sized uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * 
+     * @default 2d
+     */
     symbolType?: string;
   }
 
-  export interface sizeCreateContinuousRendererParamsLegendOptions {
-    title: string;
+
+  export interface sizeCreateClassBreaksRendererParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     */
+    title?: string;
   }
 
-  export interface sizeCreateVisualVariablesParams {
+
+  export interface sizeCreateContinuousRendererParams extends Object {
+    /**
+     * The layer for which the renderer is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     normalizationField?: string;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
+    /**
+     * In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     sizeScheme?: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
-    legendOptions?: sizeCreateVisualVariablesParamsLegendOptions;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
+    legendOptions?: sizeCreateContinuousRendererParamsLegendOptions;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     statistics?: SummaryStatisticsResult;
+    /**
+     * A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned size visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     minValue?: number;
+    /**
+     * A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned size visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     maxValue?: number;
+    /**
+     * Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     * 
+     * @default true
+     */
+    defaultSymbolEnabled?: boolean;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
     view?: SceneView;
+    /**
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sized uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     * 
+     * @default 2d
+     */
+    symbolType?: string;
+  }
+
+
+  export interface sizeCreateContinuousRendererParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
+    title?: string;
+    /**
+     * Indicates whether to describe the renderer in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     */
+    showLegend?: boolean;
+  }
+
+
+  export interface sizeCreateVisualVariablesParams extends Object {
+    /**
+     * The layer for which the visual variables are generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    layer: FeatureLayer | SceneLayer;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    normalizationField?: string;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     * 
+     * @default gray
+     */
+    basemap?: string | Basemap;
+    /**
+     * In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    sizeScheme?: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    legendOptions?: sizeCreateVisualVariablesParamsLegendOptions;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    statistics?: SummaryStatisticsResult;
+    /**
+     * A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned size visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    minValue?: number;
+    /**
+     * A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned size visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    maxValue?: number;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This property is only applicable to generating visualizations with 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    view?: SceneView;
+    /**
+     * Indicates if the size units of the symbols will be in meters. This should be `true` when generating visualizations with 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
     worldScale?: boolean;
+    /**
+     * When set to `all`, a single size variable that scales uniformly in all dimensions is generated. When set to `height`, the result contains two size visual variables: the first one sizes the height according to the field statistics, while the second defines a constant size for width and depth.  **Possible Values:** all | height
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     * 
+     * @default all
+     */
     axis?: boolean;
   }
 
-  export interface sizeCreateVisualVariablesParamsLegendOptions {
-    title: string;
+
+  export interface sizeCreateVisualVariablesParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    title?: string;
+    /**
+     * Indicates whether to describe the renderer in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     */
+    showLegend?: boolean;
   }
 
-  export interface sizeVisualVariableResult {
+  /**
+   * The result object of the [createVisualVariables()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#VisualVariableResult)
+   */
+  export interface sizeVisualVariableResult extends Object {
+    /**
+     * An array of size visual variables configured based on the statistics of the data and the view scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#VisualVariableResult)
+     */
     visualVariables: SizeVisualVariable[];
+    /**
+     * The size scheme used by the main visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#VisualVariableResult)
+     */
     sizeScheme: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
+    /**
+     * Indicates whether default values were used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#VisualVariableResult)
+     */
     defaultValuesUsed: boolean;
+    /**
+     * Basic statistics returned from a query to the service for the given field or expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#VisualVariableResult)
+     */
     statistics: SummaryStatisticsResult;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#VisualVariableResult)
+     */
     basemapId: string;
+    /**
+     * Authoring information related to the creation of the visual variable. This includes information related to UI inputs from sliders and selected themes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#VisualVariableResult)
+     */
     authoringInfo: AuthoringInfo;
   }
 
+  /**
+   * This object contains helper methods for generating data-driven visualizations with unique types (or categories) based on a field value from features in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The [createRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer) method generates a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) object that may be applied directly to the layer used to generate it. This renderer contains unique values with colors best suited to the given basemap.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html)
+   */
   interface type {
+    /**
+     * Generates a [PointCloudUniqueValueRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudUniqueValueRenderer.html) based on a given field of a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html). This renderer visualizes points of the same type, usually from the `CLASS_CODE` field or an equivalent field that stores information related to the classification of the data (e.g. low vegetation, high vegetation, ground, etc.). The generated renderer visualizes each point with a standard predefined color matching the class code of the point.  All that's required is a layer instance and field name. You can optionally set the size and density of the points to suit the needs of the desired visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer)
+     * 
+     * @param params Input parameters for generating a renderer based on the given field of the input layer. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visualization is generated.
+     * @param params.field The name of the field containing classification data for the given layer. A common field name used for this renderer type is `CLASS_CODE`, though other fields can be used.
+     * @param params.size The size of each point expressed as a percentage. This value will determine point sizes scaled based on the given `density` of points. When the value is `100%`, the size of each point is set so that it minimizes the number of gaps between neighboring points. Any value above `100%` will allow for points to overlap neighboring points scaled to the given value. Values below `100%` scale point sizes smaller so there appear to be more gaps between points.
+     * @param params.density The number of points per inch in the view.
+     * @param params.typeScheme In authoring apps, the user may select a pre-defined type scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.statistics A statistics object generated from the [uniqueValues](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     */
     createPCClassRenderer(params: typeCreatePCClassRendererParams): IPromise<PCClassRendererResult>;
+    /**
+     * Generates a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) that may be applied directly to a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) that supports renderers. The renderer contains unique symbols representing a string or a numeric value returned from the indicated field.  In most cases you will provide a `layer`, `basemap`, and `field` to generate this renderer. This is a scenario in which the values of the field aren't well known and the user doesn't know which colors to use in the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     * 
+     * @param params Input parameters for generating symbols to represent unique types based on data returned from a given field. See the table below for details of each parameter.
+     * @param params.layer The layer for which the renderer is generated.
+     * @param params.field The name of the field from which to extract unique values that will be used for the basis of the data-driven visualization.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.numTypes The number of types (or categories) displayed by the renderer. Use `-1` to display all returned types.
+     * @param params.sortBy 
+     * Indicates how values should be sorted in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). See the table below for information about values that may be passed to this parameter.
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * count | Unique values/types will be sorted from highest to lowest based on the count of features that fall in each category.
+     * value | Unique values/types will be sorted in alphabetical order.
+     * 
+     * **Known Values:** count | value
+     * @param params.typeScheme In authoring apps, the user may select a pre-defined type scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * @param params.legendOptions Provides options for setting a title to a field that will override the field alias defined in the service. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * @param params.defaultSymbolEnabled Enables the `defaultSymbol` on the renderer and assigns it to features with no value.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`, except for layers with a `mesh` geometry type.
+     * @param params.symbolType 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter can be ignored for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly-sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sized uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * @param params.statistics A statistics object generated from the [uniqueValues](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.colorMixMode 
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     */
     createRenderer(params: typeCreateRendererParams): IPromise<typeRendererResult>;
   }
 
   export const type: type;
 
-  export interface PCClassRendererResult {
+  /**
+   * The result object of the [createPCClassRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#PCClassRendererResult)
+   */
+  export interface PCClassRendererResult extends Object {
+    /**
+     * The renderer object configured to represent the class codes in the point cloud. Set this object on the input layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#PCClassRendererResult)
+     */
     renderer: PointCloudUniqueValueRenderer;
   }
 
-  export interface typeRendererResult {
+  /**
+   * The result object of the [createRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+   */
+  export interface typeRendererResult extends Object {
+    /**
+     * The renderer object configured to best match the given basemap. Set this on a layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     renderer: UniqueValueRenderer;
+    /**
+     * An array of objects describing the value, symbol, and count of each unique type or category represented in the renderer. See the table below describing each property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     uniqueValueInfos: RendererResultUniqueValueInfos[];
+    /**
+     * An array of objects describing the values or categories excluded from consideration in visualizing data from the given field. The specification of each object matches that of the objects specified in the `uniqueValueInfos` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     excludedUniqueValueInfos: any[];
+    /**
+     * The scheme used to represent each category within the `uniqueValueInfos`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     typeScheme: PointTypeScheme | PolylineTypeScheme | PolygonTypeScheme | MeshTypeScheme;
+    /**
+     * The ID of the basemap used to determine the optimal color scheme to represent the categorical variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     basemapId: string;
   }
 
-  export interface typeCreatePCClassRendererParams {
+
+  export interface typeCreatePCClassRendererParams extends Object {
+    /**
+     * The layer for which the visualization is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer)
+     */
     layer: PointCloudLayer;
+    /**
+     * The name of the field containing classification data for the given layer. A common field name used for this renderer type is `CLASS_CODE`, though other fields can be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer)
+     */
     field: string;
+    /**
+     * The size of each point expressed as a percentage. This value will determine point sizes scaled based on the given `density` of points. When the value is `100%`, the size of each point is set so that it minimizes the number of gaps between neighboring points. Any value above `100%` will allow for points to overlap neighboring points scaled to the given value. Values below `100%` scale point sizes smaller so there appear to be more gaps between points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer)
+     * 
+     * @default 100%
+     */
     size?: string;
+    /**
+     * The number of points per inch in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer)
+     * 
+     * @default 25
+     */
     density?: number;
+    /**
+     * In authoring apps, the user may select a pre-defined type scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer)
+     */
     typeScheme?: PointTypeScheme;
+    /**
+     * A statistics object generated from the [uniqueValues](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createPCClassRenderer)
+     */
     statistics?: UniqueValuesResult;
   }
 
-  export interface typeCreateRendererParams {
+
+  export interface typeCreateRendererParams extends Object {
+    /**
+     * The layer for which the renderer is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The name of the field from which to extract unique values that will be used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     field: string;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
+    /**
+     * The number of types (or categories) displayed by the renderer. Use `-1` to display all returned types.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     * 
+     * @default 10
+     */
     numTypes?: number;
+    /**
+     * Indicates how values should be sorted in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html). See the table below for information about values that may be passed to this parameter.
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * count | Unique values/types will be sorted from highest to lowest based on the count of features that fall in each category.
+     * value | Unique values/types will be sorted in alphabetical order.
+     * 
+     * **Known Values:** count | value
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     * 
+     * @default count
+     */
     sortBy?: string;
+    /**
+     * In authoring apps, the user may select a pre-defined type scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     typeScheme?: PointTypeScheme | PolylineTypeScheme | PolygonTypeScheme | MeshTypeScheme;
+    /**
+     * Provides options for setting a title to a field that will override the field alias defined in the service. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     legendOptions?: typeCreateRendererParamsLegendOptions;
+    /**
+     * Enables the `defaultSymbol` on the renderer and assigns it to features with no value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     defaultSymbolEnabled?: boolean;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`, except for layers with a `mesh` geometry type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     view?: SceneView;
+    /**
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. This parameter can be ignored for layers with a `mesh` geometry type. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly-sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sized uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     * 
+     * @default 2d
+     */
     symbolType?: string;
+    /**
+     * A statistics object generated from the [uniqueValues](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     statistics?: UniqueValuesResult;
+    /**
+     * **This option only applies to generating renderers for mesh SceneLayers**. Specifies how the symbol's color is applied to the geometry color/texture. See the documentation in [FillSymbol3DLayer.material](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#material) for more context. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * tint | Applies the symbol `color` to the desaturated geometry/texture color.
+     * replace | Removes the geometry/texture color and applies the symbol `color`.
+     * multiply | Multiplies geometry/texture color value with the symbol `color` value. The result is a darker color. Multiplying with white keeps the geometry color the same.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     * 
+     * @default replace
+     */
     colorMixMode?: string;
   }
 
-  export interface typeCreateRendererParamsLegendOptions {
+
+  export interface typeCreateRendererParamsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     */
     title: string;
   }
 
-  export interface RendererResultUniqueValueInfos {
+
+  export interface RendererResultUniqueValueInfos extends Object {
+    /**
+     * A unique value representing a type or category of features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     value: string | number;
+    /**
+     * The number of features assigned the given `value` (or belonging to the given category).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     count: number;
+    /**
+     * The label describing the value or category in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     label: string;
+    /**
+     * The symbol used to represent features belonging to the given category.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#RendererResult)
+     */
     symbol: Symbol;
   }
 
+  /**
+   * This object contains helper methods for generating data-driven univariate visualizations using both continuous color and continuous size based on a field value or expression from features in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The [createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer) method generates a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) object that may be applied directly to a supported layer. This renderer contains a continuous color and size ramp with optimal colors based on the indicated basemap and mapped to specific break values based on the statistics of the indicated field or expression.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html)
+   */
   interface univariateColorSize {
+    /**
+     * Generates a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) that may be applied directly to a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The renderer contains continuous color and size visual variables that map symbols with optimal colors and sizes based on the indicated basemap to specific stop values based on queried statistics from the indicated field or expression.  In most cases you will provide a `layer`, `basemap`, `field`, and `theme` to generate this renderer. This is a scenario in which the statistics of the data aren't well known and the user doesn't know what colors and sizes to use in the visualization.  The other options are provided for convenience for more involved custom visualization authoring applications. For example, if you already generated statistics in another operation, you can pass the statistics object to the `statistics` parameter to avoid making an extra call to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     * 
+     * @param params See the table below for details of each parameter that may be passed to this method.
+     * @param params.layer The layer for which the visual variable is generated.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.minValue A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned visual variables.
+     * @param params.maxValue A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned visual variables.
+     * @param params.defaultSymbolEnabled Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * @param params.colorOptions Options for configuring the color portion of the visualization.
+     * @param params.sizeOptions Options for configuring the size portion of the visualization.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`.
+     * @param params.symbolType 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sizes uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     */
     createContinuousRenderer(params: univariateColorSizeCreateContinuousRendererParams): IPromise<univariateColorSizeContinuousRendererResult>;
+    /**
+     * This method generates color and size visual variables, both based on the same given field or expression. These visual variables are generated with default stops that are optimally chosen based on the statistics queried for the indicated field or expression and colors based on the input basemap.  There are two different ways this method may be called. The most common case is by providing a `layer`, `basemap`, and `field`. This is the scenario where the statistics of the data aren't well known and the user doesn't know what colors to use.  The other options are provided for convenience for more involved custom visualization authoring applications. For example, if you already generated statistics in another operation, you can pass the object in the `statistics` parameter to avoid making an extra call to the server. You can also provide a `colorScheme` and/or a `sizeScheme` if you don't want one picked for you. In this case the `basemap` and `theme` options would be ignored.  The resulting array of visual variables will contain one color visual variable, and one or two size visual variables depending on the value of the `sizeOptions.axis` parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     * 
+     * @param params Input parameters for generating color and size visual variables based on data returned from a given field or expression. See the table below for details of each parameter.
+     * @param params.layer The layer for which the visual variable is generated.
+     * @param params.basemap The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * @param params.field The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * @param params.normalizationField The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * @param params.statistics A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * @param params.minValue A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned visual variables.
+     * @param params.maxValue A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned visual variables.
+     * @param params.colorOptions Options for configuring the color portion of the visualization.
+     * @param params.sizeOptions Options for configuring the size portion of the visualization.
+     * @param params.view The SceneView instance in which the visualization will be rendered. This property is only applicable to generating visualizations with 3D symbols.
+     * @param params.worldScale Indicates if the size units of the symbols will be in meters. This should be `true` when generating visualizations with 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     */
     createVisualVariables(params: univariateColorSizeCreateVisualVariablesParams): IPromise<VisualVariablesResult>;
   }
 
   export const univariateColorSize: univariateColorSize;
 
-  export interface univariateColorSizeContinuousRendererResult {
+  /**
+   * The result object of the [createContinuousRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+   */
+  export interface univariateColorSizeContinuousRendererResult extends Object {
+    /**
+     * The renderer object configured to best match the given basemap and the spread of the data. Set this on a layer's `renderer` property to update its visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     renderer: ClassBreaksRenderer;
+    /**
+     * Object containing visual variable and scheme information for the color portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     color: ContinuousRendererResultColor;
+    /**
+     * Object containing visual variable and scheme information for the size portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     size: ContinuousRendererResultSize;
+    /**
+     * Indicates whether default values were used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     defaultValuesUsed: boolean;
+    /**
+     * Basic statistics returned from a query to the service for the given field or expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     statistics: SummaryStatisticsResult;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     basemapId: string;
   }
 
-  export interface univariateColorSizeCreateContinuousRendererParams {
+
+  export interface univariateColorSizeCreateContinuousRendererParams extends Object {
+    /**
+     * The layer for which the visual variable is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     normalizationField?: string;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     statistics?: SummaryStatisticsResult;
+    /**
+     * A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     minValue?: number;
+    /**
+     * A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     maxValue?: number;
+    /**
+     * Enables the `defaultSymbol` on the renderer and assigns it to features with no value and features that do not fall within the configured data range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     defaultSymbolEnabled?: boolean;
+    /**
+     * Options for configuring the color portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     colorOptions?: univariateColorSizeCreateContinuousRendererParamsColorOptions;
+    /**
+     * Options for configuring the size portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     sizeOptions?: univariateColorSizeCreateContinuousRendererParamsSizeOptions;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This parameter is required if `symbolType = "3d-volumetric" or "3d-volumetric-uniform"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     view?: SceneView;
+    /**
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Known values are described below. 
+     * 
+     * | Value | Description |
+     * | ----- | ----------- |
+     * | 2d | Generates a visualization using 2D symbols such as [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html), or [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html). Use this option if generating a visualization for data in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). |
+     * | 3d-flat | Generates a visualization using 3D symbols with flat symbol layers such as [IconSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html), [LineSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html), or [FillSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html). Use this option if generating a 2D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). |
+     * | 3d-volumetric | Generates a visualization using 3D symbols with volumetric symbol layers such as [ObjectSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html), [PathSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html), or [ExtrudeSymbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html). Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and only the symbol's height should be variable, for example with cylinders. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * | 3d-volumetric-uniform | Generates a visualization using uniformly sized 3D symbols with volumetric symbol layers. Use this option if generating a 3D visualization for data in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) and the symbol should be sizes uniformly, for example with spheres. A SceneView instance must be provided to the `view` parameter if this option is used. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     * 
+     * @default 2d
+     */
     symbolType?: string;
   }
 
-  export interface univariateColorSizeCreateContinuousRendererParamsColorOptions {
+
+  export interface univariateColorSizeCreateContinuousRendererParamsColorOptions extends Object {
+    /**
+     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     theme?: string;
+    /**
+     * In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on a `theme` and the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     colorScheme?: ColorScheme;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     legendOptions?: univariateColorSizeCreateContinuousRendererParamsColorOptionsLegendOptions;
   }
 
-  export interface univariateColorSizeCreateContinuousRendererParamsColorOptionsLegendOptions {
+
+  export interface univariateColorSizeCreateContinuousRendererParamsColorOptionsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     title: string;
   }
 
-  export interface univariateColorSizeCreateContinuousRendererParamsSizeOptions {
+
+  export interface univariateColorSizeCreateContinuousRendererParamsSizeOptions extends Object {
+    /**
+     * In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     sizeScheme?: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     legendOptions?: univariateColorSizeCreateContinuousRendererParamsSizeOptionsLegendOptions;
   }
 
-  export interface univariateColorSizeCreateContinuousRendererParamsSizeOptionsLegendOptions {
+
+  export interface univariateColorSizeCreateContinuousRendererParamsSizeOptionsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     */
     title: string;
   }
 
-  export interface univariateColorSizeCreateVisualVariablesParams {
+
+  export interface univariateColorSizeCreateVisualVariablesParams extends Object {
+    /**
+     * The layer for which the visual variable is generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The [named string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of the Esri basemap or basemap object that will be paired with the output visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     * 
+     * @default gray
+     */
     basemap?: string | Basemap;
+    /**
+     * The name of the field whose data will be queried for statistics and used for the basis of the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     field: string;
+    /**
+     * The name of the field to normalize the values of the given `field`. Providing a normalization field helps minimize some visualization errors and standardizes the data so all features are visualized with minimal bias due to area differences or count variation. This option is commonly used when visualizing densities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     normalizationField?: string;
+    /**
+     * A statistics object generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) function. If statistics for the field have already been generated, then pass the object here to avoid making a second statistics query to the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     statistics?: SummaryStatisticsResult;
+    /**
+     * A custom minimum value set by the user. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds. This will be the lowest stop in the returned visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     minValue?: number;
+    /**
+     * A custom maximum value set by the user. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds. This will be the uppermost stop in the returned visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     maxValue?: number;
+    /**
+     * Options for configuring the color portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     colorOptions?: univariateColorSizeCreateVisualVariablesParamsColorOptions;
+    /**
+     * Options for configuring the size portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     sizeOptions?: univariateColorSizeCreateVisualVariablesParamsSizeOptions;
+    /**
+     * The SceneView instance in which the visualization will be rendered. This property is only applicable to generating visualizations with 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     view?: SceneView;
+    /**
+     * Indicates if the size units of the symbols will be in meters. This should be `true` when generating visualizations with 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     worldScale?: boolean;
   }
 
-  export interface univariateColorSizeCreateVisualVariablesParamsColorOptions {
+
+  export interface univariateColorSizeCreateVisualVariablesParamsColorOptions extends Object {
+    /**
+     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     theme?: string;
+    /**
+     * In authoring apps, the user may select a pre-defined color scheme. Pass the scheme object to this property to avoid getting one based on a `theme` and the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     colorScheme?: ColorScheme;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     legendOptions?: univariateColorSizeCreateVisualVariablesParamsColorOptionsLegendOptions;
   }
 
-  export interface univariateColorSizeCreateVisualVariablesParamsColorOptionsLegendOptions {
+
+  export interface univariateColorSizeCreateVisualVariablesParamsColorOptionsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     title: string;
   }
 
-  export interface univariateColorSizeCreateVisualVariablesParamsSizeOptions {
+
+  export interface univariateColorSizeCreateVisualVariablesParamsSizeOptions extends Object {
+    /**
+     * When set to `all`, a single size variable that scales uniformly in all dimensions is generated. When set to `height`, the result contains two size visual variables: the first one sizes the height according to the field statistics, while the second defines a constant size for width and depth.  **Possible Values:** all | height
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     * 
+     * @default all
+     */
     axis?: boolean;
+    /**
+     * In authoring apps, the user may select a pre-defined size scheme. Pass the scheme object to this property to avoid getting one based on the `basemap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     sizeScheme?: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
+    /**
+     * Provides options for setting a title to a field when an expression is provided instead of a field name. This title will represent the field in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     legendOptions?: univariateColorSizeCreateVisualVariablesParamsSizeOptionsLegendOptions;
   }
 
-  export interface univariateColorSizeCreateVisualVariablesParamsSizeOptionsLegendOptions {
+
+  export interface univariateColorSizeCreateVisualVariablesParamsSizeOptionsLegendOptions extends Object {
+    /**
+     * The title used to represent the given field or expression in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     */
     title: string;
   }
 
-  export interface VisualVariablesResult {
+  /**
+   * The result object of the [createVisualVariables()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables) method. See the table below for details of each property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+   */
+  export interface VisualVariablesResult extends Object {
+    /**
+     * Object containing visual variable and scheme information for the color portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     color: VisualVariablesResultColor;
+    /**
+     * Object containing visual variable and scheme information for the size portion of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     size: VisualVariablesResultSize;
+    /**
+     * Indicates whether default values were used in the absence of sufficient data and/or statistics from the layer. Default values are typically used when all features have the same field value or no value at all.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     defaultValuesUsed: boolean;
+    /**
+     * Basic statistics returned from a query to the service for the given field or expression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     statistics: SummaryStatisticsResult;
+    /**
+     * The ID of the basemap used to determine the optimal fill color of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     basemapId: string;
+    /**
+     * Authoring information related to the creation of the visual variables. This includes inforamation related to UI inputs from sliders and selected themes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     authoringInfo: AuthoringInfo;
   }
 
-  export interface ContinuousRendererResultColor {
+
+  export interface ContinuousRendererResultColor extends Object {
+    /**
+     * A color visual variable configured based on the statistics of the data and the given basemap and scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     visualVariable: ColorVisualVariable;
+    /**
+     * The color scheme used by the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     colorScheme: ColorScheme;
   }
 
-  export interface ContinuousRendererResultSize {
+
+  export interface ContinuousRendererResultSize extends Object {
+    /**
+     * The size visual variable(s) configured based on the statistics of the data and the view scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     visualVariables: SizeVisualVariable[];
+    /**
+     * The size scheme used by the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#ContinuousRendererResult)
+     */
     sizeScheme: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
   }
 
-  export interface VisualVariablesResultColor {
+
+  export interface VisualVariablesResultColor extends Object {
+    /**
+     * A color visual variable configured based on the statistics of the data and the given basemap and scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     visualVariable: ColorVisualVariable;
+    /**
+     * The color scheme used by the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     colorScheme: ColorScheme;
   }
 
-  export interface VisualVariablesResultSize {
+
+  export interface VisualVariablesResultSize extends Object {
+    /**
+     * The size visual variable(s) configured based on the statistics of the data and the view scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     visualVariables: SizeVisualVariable[];
+    /**
+     * The size scheme used by the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#VisualVariablesResult)
+     */
     sizeScheme: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme;
   }
 
+  /**
+   * Function for generating class breaks for an input field in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) based on a given classification method and normalization type.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html)
+   */
   interface classBreaks {
+    /**
+     * Generates class breaks for an input field of a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) based on a given classification method and normalization type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     * 
+     * @param params See the table below for details about parameters that may be passed to this function.
+     * @param params.layer The layer from which to generate class breaks.
+     * @param params.field The class breaks will be generated based on values of this field. If a field is provided, the values from the given field from all features will be queried in the service.
+     * @param params.normalizationField The field by which to normalize the values returned from the given `field`.
+     * @param params.classificationMethod 
+     * The method for classifying the data. See the table below for a list of possible values. 
+     * 
+     * | Possible Value | Description |
+     * |---------------|------------ |
+     * | natural-breaks | Data values that cluster are placed into a single class. Class breaks occur where gaps exist between clusters. You should use this method if your data is unevenly distributed; that is, many features have the same or similar values and there are gaps between groups of values. |
+     * | equal-interval | Each class has an equal range of values; in other words, the difference between the high and low value is equal for each class. You should use this method if your data is evenly distributed and you want to emphasize the difference in values between the features. |
+     * | quantile | Each class has roughly the same number of features. If your data is evenly distributed and you want to emphasize the difference in relative position between features, you should use the quantile classification method. If, for example, the point values are divided into five classes, points in the highest class would fall into the top fifth of all points.  |
+     * | standard-deviation | Class breaks are placed above and below the mean value at intervals of `1`, `0.5`, or `0.25` standard deviations until all the data values are included in a class.  |
+     * @param params.standardDeviationInterval When `classificationMethod = "standard-deviation"`, this sets the interval at which each class break should be set (e.g. `0.25`, `0.33`, `0.5`, `1`).
+     * @param params.minValue The minimum bounding value for the class breaks definition. Use this in conjunction with `maxValue` to generate class breaks between lower and upper bounds.
+     * @param params.maxValue The maximum bounding value for the class breaks definition. Use this in conjunction with `minValue` to generate class breaks between lower and upper bounds.
+     * @param params.numClasses Indicates the number of classes to generate for the class breaks definition.
+     * 
+     */
     classBreaks(params: classBreaksClassBreaksParams): IPromise<ClassBreaksResult>;
   }
 
@@ -4632,30 +19410,150 @@ declare namespace __esri {
   export const classBreaks: typeof __classBreaksMapped.classBreaks;
 
 
-  export interface classBreaksClassBreaksParams {
+
+  export interface classBreaksClassBreaksParams extends Object {
+    /**
+     * The layer from which to generate class breaks.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     layer: FeatureLayer | SceneLayer;
+    /**
+     * The class breaks will be generated based on values of this field. If a field is provided, the values from the given field from all features will be queried in the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     field?: string;
+    /**
+     * The field by which to normalize the values returned from the given `field`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     normalizationField?: string;
+    /**
+     * The method for classifying the data. See the table below for a list of possible values. 
+     * 
+     * | Possible Value | Description |
+     * |---------------|------------ |
+     * | natural-breaks | Data values that cluster are placed into a single class. Class breaks occur where gaps exist between clusters. You should use this method if your data is unevenly distributed; that is, many features have the same or similar values and there are gaps between groups of values. |
+     * | equal-interval | Each class has an equal range of values; in other words, the difference between the high and low value is equal for each class. You should use this method if your data is evenly distributed and you want to emphasize the difference in values between the features. |
+     * | quantile | Each class has roughly the same number of features. If your data is evenly distributed and you want to emphasize the difference in relative position between features, you should use the quantile classification method. If, for example, the point values are divided into five classes, points in the highest class would fall into the top fifth of all points.  |
+     * | standard-deviation | Class breaks are placed above and below the mean value at intervals of `1`, `0.5`, or `0.25` standard deviations until all the data values are included in a class.  |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     classificationMethod?: string;
+    /**
+     * When `classificationMethod = "standard-deviation"`, this sets the interval at which each class break should be set (e.g. `0.25`, `0.33`, `0.5`, `1`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     standardDeviationInterval?: number;
+    /**
+     * The minimum bounding value for the class breaks definition. Use this in conjunction with `maxValue` to generate class breaks between lower and upper bounds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     minValue?: number;
+    /**
+     * The maximum bounding value for the class breaks definition. Use this in conjunction with `minValue` to generate class breaks between lower and upper bounds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     maxValue?: number;
+    /**
+     * Indicates the number of classes to generate for the class breaks definition.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     */
     numClasses?: number;
   }
 
-  export interface ClassBreaksResult {
+  /**
+   * Object returned from the [classBreaks()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks) method. This object describes classes generated from data in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) for a given field with a specified classification method.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+   */
+  export interface ClassBreaksResult extends Object {
+    /**
+     * An array of objects describing the class breaks generated from the [classBreaks()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+     */
     classBreaksInfos: ClassBreaksResultClassBreaksInfos[];
+    /**
+     * The minimum value of features in the dataset. This will be the lower bound of the lowest class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+     */
     minValue: number;
+    /**
+     * The maximum value of features in the dataset. This will be the upper bound of the highest class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+     */
     maxValue: number;
+    /**
+     * The normalization total if `normalizationType` is set to `percent-of-total` when generating class breaks with [createClassBreaksRenderer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+     */
+    normalizationTotal: number;
   }
 
-  export interface ClassBreaksResultClassBreaksInfos {
+
+  export interface ClassBreaksResultClassBreaksInfos extends Object {
+    /**
+     * The label describing the given class break for use in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+     */
     label: string;
+    /**
+     * The lower bound of the class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+     */
     minValue: number;
+    /**
+     * The upper bound of the class break.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#ClassBreaksResult)
+     */
     maxValue: number;
   }
 
+  /**
+   * Generates a histogram based on data in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) for a given field. The returned object can be used for displaying a histogram in the UI within visualization authoring applications and analytical apps that query and display statistics.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html)
+   */
   interface histogram {
+    /**
+     * Generates a histogram for data returned from a `field` in a given `layer`. The returned object can be used for displaying a histogram to the UI in visualization authoring applications and analytical apps that query and display statistics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     * 
+     * @param params See the table below for details on parameters that may be passed to this function.
+     * @param params.layer The layer for which to generate a histogram.
+     * @param params.field The name of the numeric field for which the histogram will be generated.
+     * @param params.normalizationField The field by which to normalize the values returned from the given `field`.
+     * @param params.classificationMethod 
+     * The method for classifying the data. See the table below for a list of possible values. 
+     * 
+     * | Possible Value | Description |
+     * |---------------|------------ |
+     * | natural-breaks | Data values that cluster are placed into a single class. Class breaks occur where gaps exist between clusters. You should use this method if your data is unevenly distributed; that is, many features have the same or similar values and there are gaps between groups of values. |
+     * | equal-interval | Each class has an equal range of values; in other words, the difference between the high and low value is equal for each class. You should use this method if your data is evenly distributed and you want to emphasize the difference in values between the features. |
+     * | quantile | Each class has roughly the same number of features. If your data is evenly distributed and you want to emphasize the difference in relative position between features, you should use the quantile classification method. If, for example, the point values are divided into five classes, points in the highest class would fall into the top fifth of all points.  |
+     * | standard-deviation | Class breaks are placed above and below the mean value at intervals of `1`, `0.5`, or `0.25` standard deviations until all the data values are included in a class.  |
+     * @param params.standardDeviationInterval When `classificationMethod = "standard-deviation"`, this sets the interval at which each class break should be set (e.g. `0.25`, `0.33`, `0.5`, `1`).
+     * @param params.minValue The minimum bounding value for the histogram. Use this in conjunction with `maxValue` to generate a histogram between custom lower and upper bounds.
+     * @param params.maxValue The maximum bounding value for the histogram. Use this in conjunction with `minValue` to generate a histogram between custom lower and upper bounds.
+     * @param params.numBins Indicates the number of classes to generate for the histogram.
+     * 
+     */
     histogram(params: histogramHistogramParams): IPromise<HistogramResult>;
   }
 
@@ -4663,30 +19561,136 @@ declare namespace __esri {
   export const histogram: typeof __histogramMapped.histogram;
 
 
-  export interface histogramHistogramParams {
+
+  export interface histogramHistogramParams extends Object {
+    /**
+     * The layer for which to generate a histogram.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     */
     layer: FeatureLayer | SceneLayer | PointCloudLayer;
+    /**
+     * The name of the numeric field for which the histogram will be generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     */
     field?: string;
+    /**
+     * The field by which to normalize the values returned from the given `field`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     */
     normalizationField?: string;
+    /**
+     * The method for classifying the data. See the table below for a list of possible values. 
+     * 
+     * | Possible Value | Description |
+     * |---------------|------------ |
+     * | natural-breaks | Data values that cluster are placed into a single class. Class breaks occur where gaps exist between clusters. You should use this method if your data is unevenly distributed; that is, many features have the same or similar values and there are gaps between groups of values. |
+     * | equal-interval | Each class has an equal range of values; in other words, the difference between the high and low value is equal for each class. You should use this method if your data is evenly distributed and you want to emphasize the difference in values between the features. |
+     * | quantile | Each class has roughly the same number of features. If your data is evenly distributed and you want to emphasize the difference in relative position between features, you should use the quantile classification method. If, for example, the point values are divided into five classes, points in the highest class would fall into the top fifth of all points.  |
+     * | standard-deviation | Class breaks are placed above and below the mean value at intervals of `1`, `0.5`, or `0.25` standard deviations until all the data values are included in a class.  |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     */
     classificationMethod?: string;
+    /**
+     * When `classificationMethod = "standard-deviation"`, this sets the interval at which each class break should be set (e.g. `0.25`, `0.33`, `0.5`, `1`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     */
     standardDeviationInterval?: number;
+    /**
+     * The minimum bounding value for the histogram. Use this in conjunction with `maxValue` to generate a histogram between custom lower and upper bounds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     */
     minValue?: number;
+    /**
+     * The maximum bounding value for the histogram. Use this in conjunction with `minValue` to generate a histogram between custom lower and upper bounds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     */
     maxValue?: number;
+    /**
+     * Indicates the number of classes to generate for the histogram.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     * 
+     * @default 10
+     */
     numBins?: number;
   }
 
-  export interface HistogramResult {
+  /**
+   * The result returned from the [histogram()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram) method.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#HistogramResult)
+   */
+  export interface HistogramResult extends Object {
+    /**
+     * An array of objects representing each bin in the histogram.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#HistogramResult)
+     */
     bins: HistogramResultBins[];
+    /**
+     * The minimum value returned by the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#HistogramResult)
+     */
     minValue: number;
+    /**
+     * The maximum value returned by the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#HistogramResult)
+     */
     maxValue: number;
   }
 
-  export interface HistogramResultBins {
+
+  export interface HistogramResultBins extends Object {
+    /**
+     * The number of features that are contained between the indicated `minValue` and `maxValue`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#HistogramResult)
+     */
     count: number;
+    /**
+     * The minimum value of the bin.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#HistogramResult)
+     */
     minValue: number;
+    /**
+     * The maximum value of the bin.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#HistogramResult)
+     */
     maxValue: number;
   }
 
+  /**
+   * Function for generating attribute statistics in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) based on values returned from a given field.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html)
+   */
   interface summaryStatistics {
+    /**
+     * Returns an object containing various statistics describing a set of values returned from a field in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     * 
+     * @param params See the table below for details of each parameter.
+     * @param params.layer The layer from which to generate statistics for the given `field`.
+     * @param params.field The name of the numeric field for which the summary statistics will be generated.
+     * @param params.normalizationField The field by which to normalize the values returned from the given `field`.
+     * @param params.features If the FeatureLayer is constructed with client-side graphics or you would like to calculate statistics based on a subset of features, then pass the features in this parameter.
+     * @param params.minValue The minimum bounding value for the statistics calculation. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds.
+     * @param params.maxValue The maximum bounding value for the statistics calculation. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds.
+     * 
+     */
     summaryStatistics(params: summaryStatisticsSummaryStatisticsParams): IPromise<SummaryStatisticsResult>;
   }
 
@@ -4694,26 +19698,114 @@ declare namespace __esri {
   export const summaryStatistics: typeof __summaryStatisticsMapped.summaryStatistics;
 
 
-  export interface SummaryStatisticsResult {
+  /**
+   * The statistics returned from the [summaryStatistics()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics) query.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+   */
+  export interface SummaryStatisticsResult extends Object {
+    /**
+     * The average of all values returned from the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+     */
     avg: number;
+    /**
+     * The number of features evaluated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+     */
     count: number;
+    /**
+     * The maximum of all values returned from the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+     */
     max: number;
+    /**
+     * The minimum of all values returned from the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+     */
     min: number;
+    /**
+     * The standard deviation calculated from values returned from the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+     */
     stddev: number;
+    /**
+     * The sum of all values returned from the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+     */
     sum: number;
+    /**
+     * The calculated variance from all values returned from the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#SummaryStatisticsResult)
+     */
     variance: number;
   }
 
-  export interface summaryStatisticsSummaryStatisticsParams {
+
+  export interface summaryStatisticsSummaryStatisticsParams extends Object {
+    /**
+     * The layer from which to generate statistics for the given `field`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     */
     layer: FeatureLayer | SceneLayer | PointCloudLayer;
+    /**
+     * The name of the numeric field for which the summary statistics will be generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     */
     field?: string;
+    /**
+     * The field by which to normalize the values returned from the given `field`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     */
     normalizationField?: string;
+    /**
+     * If the FeatureLayer is constructed with client-side graphics or you would like to calculate statistics based on a subset of features, then pass the features in this parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     */
     features?: Graphic[];
+    /**
+     * The minimum bounding value for the statistics calculation. Use this in conjunction with `maxValue` to generate statistics between lower and upper bounds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     */
     minValue?: number;
+    /**
+     * The maximum bounding value for the statistics calculation. Use this in conjunction with `minValue` to generate statistics between lower and upper bounds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     */
     maxValue?: number;
   }
 
+  /**
+   * A function that queries for unique values from a field in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html)
+   */
   interface uniqueValues {
+    /**
+     * Returns an object containing an array of unique values queried from a given field in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) along with the total count of features that belong to the given category.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues)
+     * 
+     * @param params See the table below for details of each parameter.
+     * @param params.layer The layer from which to query for unique values.
+     * @param params.field The name of the numeric or string field from which the unique values will be obtained.
+     * @param params.features If the `layer` is a FeatureLayer constructed with client-side graphics or you would like to calculate statistics based on a subset of features, then pass the features in this parameter.
+     * @param params.returnAllCodedValues Indicates that all domain codes should be returned if the given field has domain values.
+     * 
+     */
     uniqueValues(params: uniqueValuesUniqueValuesParams): IPromise<UniqueValuesResult>;
   }
 
@@ -4721,239 +19813,1298 @@ declare namespace __esri {
   export const uniqueValues: typeof __uniqueValuesMapped.uniqueValues;
 
 
-  export interface UniqueValuesResult {
+  /**
+   * An object that contains the unique values returned from the [uniqueValues()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues) query of a layer's field.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#UniqueValuesResult)
+   */
+  export interface UniqueValuesResult extends Object {
+    /**
+     * An array of objects, each containing a unique value/type/category present in the field specifed in the [uniqueValues()](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues) query. See table below for the specification of each object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#UniqueValuesResult)
+     */
     uniqueValueInfos: UniqueValuesResultUniqueValueInfos[];
   }
 
-  export interface uniqueValuesUniqueValuesParams {
+
+  export interface uniqueValuesUniqueValuesParams extends Object {
+    /**
+     * The layer from which to query for unique values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues)
+     */
     layer: FeatureLayer | SceneLayer | PointCloudLayer;
+    /**
+     * The name of the numeric or string field from which the unique values will be obtained.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues)
+     */
     field: string;
+    /**
+     * If the `layer` is a FeatureLayer constructed with client-side graphics or you would like to calculate statistics based on a subset of features, then pass the features in this parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues)
+     */
     features?: Graphic[];
+    /**
+     * Indicates that all domain codes should be returned if the given field has domain values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues)
+     */
     returnAllCodedValues?: boolean;
   }
 
-  export interface UniqueValuesResultUniqueValueInfos {
+
+  export interface UniqueValuesResultUniqueValueInfos extends Object {
+    /**
+     * A unique value representing a type or category of features in the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#UniqueValuesResult)
+     */
     value: string | number;
+    /**
+     * The number of features assigned the given `value` (or belonging to the given category).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#UniqueValuesResult)
+     */
     count: number;
   }
 
+
   interface symbologyColor {
+    /**
+     * Clones a color scheme object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#cloneScheme)
+     * 
+     * @param scheme The color scheme object to clone.
+     * 
+     */
     cloneScheme(scheme: ColorScheme): ColorScheme;
+    /**
+     * Flips the colors in reverse order of the input color scheme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#flipColors)
+     * 
+     * @param scheme The color scheme to reverse.
+     * 
+     */
     flipColors(scheme: ColorScheme): ColorScheme;
+    /**
+     * Returns a primary scheme and secondary schemes defining symbol properties for data-driven color visualizions in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). The `basemap` parameter determines the color schemes of the graphics used to visualize each feature. The `geometryType` determines which type of symbol to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#getSchemes)
+     * 
+     * @param params See the table below for details of each parameter that may be passed to this function.
+     * @param params.basemap The basemap to pair with the visualization. This value indicates the best symbol colors for visualizing features against the given basemap.
+     * @param params.geometryType The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * @param params.theme 
+     * The theme determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * @param params.view The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * @param params.worldScale Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     */
     getSchemes(params: colorGetSchemesParams): any;
+    /**
+     * Returns metadata for the available themes. If a `basemap` is provided, returns themes that look best with the given basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#getThemes)
+     * 
+     * @param basemap The [Esri basemap string](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) or object that will be used with the returned theme(s).
+     * 
+     */
     getThemes(basemap?: string | Basemap): any[];
   }
 
   export const symbologyColor: symbologyColor;
 
-  export interface colorGetSchemesParams {
+
+  export interface colorGetSchemesParams extends Object {
+    /**
+     * The basemap to pair with the visualization. This value indicates the best symbol colors for visualizing features against the given basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#getSchemes)
+     */
     basemap: string | Basemap;
+    /**
+     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#getSchemes)
+     */
     geometryType: string;
+    /**
+     * The theme determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#getSchemes)
+     */
     theme: string;
+    /**
+     * The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#getSchemes)
+     */
     view?: SceneView;
+    /**
+     * Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#getSchemes)
+     */
     worldScale?: boolean;
   }
 
-  export interface ColorScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize features with attribute data-driven color.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+   */
+  export interface ColorScheme extends Object {
+    /**
+     * The unique id of the color scheme to usee in the visualization. The id is assigned based on the following template: `<themeName>/<basemapName>/<schemeName>`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     id: string;
+    /**
+     * Indicates which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * 
+     * | Value | Description | Example |
+     * | ----- | ----------- | ------- |
+     * | high-to-low | High values are emphasized with strong colors. | ![high-to-low](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-high-to-low.png) |
+     * | above-and-below | Values centered around a given point (e.g. the average) are visualized with weak colors while other values are emphasized with strong colors. | ![above-and-below](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-above-and-below.png) |
+     * | centered-on | Values centered around a given point (e.g. the average) are emphasized with strong colors while other values are visualized with weak colors. | ![centered-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-centered-on.png) |
+     * | extremes | High and low values are emphasized with strong colors. All others are visualized with weak colors. | ![extremes](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/sm-extremes.png) |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     theme: string;
+    /**
+     * The continuous color ramp that will be applied to the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     colors: Color[];
+    /**
+     * The color of the symbol used to indicate features with no data and features that are out of range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     noDataColor: Color;
+    /**
+     * Predefined classed color schemes to use for the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     colorsForClassBreaks: ColorSchemeColorsForClassBreaks[];
+    /**
+     * Properties for defining the outline of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     outline: ColorSchemeOutline;
+    /**
+     * The default size of the symbol in pixels or points if the geometry type is `point`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     size: number;
+    /**
+     * The default width of the symbol in pixels or points if the geometry type is `polyline`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     width: number;
+    /**
+     * The opacity of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     opacity: number;
   }
 
-  export interface ColorSchemeColorsForClassBreaks {
+
+  export interface ColorSchemeColorsForClassBreaks extends Object {
+    /**
+     * An array of hex color strings. Each color is assigned to a specific break in classed color visualizations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     colors: Color[];
+    /**
+     * The number of classes used in the classed color visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     numClasses: number;
   }
 
-  export interface ColorSchemeOutline {
+
+  export interface ColorSchemeOutline extends Object {
+    /**
+     * The outline color of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     color: Color;
+    /**
+     * The width of the symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-color.html#ColorScheme)
+     */
     width: number;
   }
 
+
   interface symbologyLocation {
+    /**
+     * Clones a location scheme object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#cloneScheme)
+     * 
+     * @param scheme The location scheme object to clone.
+     * 
+     */
     cloneScheme(scheme: PointLocationScheme | PolylineLocationScheme | PolygonLocationScheme): PointLocationScheme | PolylineLocationScheme | PolygonLocationScheme;
+    /**
+     * Returns a primary scheme and secondary schemes defining symbol properties for location-only visualizions in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html). The `basemap` parameter determines the color of the graphics used to visualize each feature. The `geometryType` determines which type of symbol to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#getSchemes)
+     * 
+     * @param params See the table below for details of each parameter that may be passed to this function.
+     * @param params.basemap The basemap to pair with the visualization. This value indicates the best symbol color for visualizing features on top of the given basemap.
+     * @param params.geometryType The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * @param params.view The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * @param params.worldScale Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     */
     getSchemes(params: locationGetSchemesParams): any;
   }
 
   export const symbologyLocation: symbologyLocation;
 
-  export interface locationGetSchemesParams {
+
+  export interface locationGetSchemesParams extends Object {
+    /**
+     * The basemap to pair with the visualization. This value indicates the best symbol color for visualizing features on top of the given basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#getSchemes)
+     */
     basemap: string | Basemap;
+    /**
+     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#getSchemes)
+     */
     geometryType: string;
+    /**
+     * The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#getSchemes)
+     */
     view?: SceneView;
+    /**
+     * Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#getSchemes)
+     */
     worldScale?: boolean;
   }
 
-  export interface PointLocationScheme {
+  /**
+   * Properties defining the location-only symbology scheme used to visualize point features.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PointLocationScheme)
+   */
+  export interface PointLocationScheme extends Object {
+    /**
+     * The fill color of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PointLocationScheme)
+     */
     color: Color;
+    /**
+     * Properties for defining the outline of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PointLocationScheme)
+     */
     outline: PointLocationSchemeOutline;
+    /**
+     * The size of the marker symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PointLocationScheme)
+     */
     size: number;
+    /**
+     * The opacity of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PointLocationScheme)
+     */
     opacity: number;
   }
 
-  export interface PolygonLocationScheme {
+  /**
+   * Properties defining the location-only symbology scheme used to visualize polygon features driven by attribute data.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolygonLocationScheme)
+   */
+  export interface PolygonLocationScheme extends Object {
+    /**
+     * The color of the fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolygonLocationScheme)
+     */
     color: Color;
+    /**
+     * Properties for defining the outline of the fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolygonLocationScheme)
+     */
     outline: PolygonLocationSchemeOutline;
+    /**
+     * The opacity of the fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolygonLocationScheme)
+     */
     opacity: number;
   }
 
-  export interface PolylineLocationScheme {
+  /**
+   * Properties defining the location-only symbology scheme used to visualize polyline features.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolylineLocationScheme)
+   */
+  export interface PolylineLocationScheme extends Object {
+    /**
+     * The color of the line symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolylineLocationScheme)
+     */
     color: Color;
+    /**
+     * The width of the line symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolylineLocationScheme)
+     */
     width: number;
+    /**
+     * The opacity of the line symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolylineLocationScheme)
+     */
     opacity: number;
   }
 
-  export interface PointLocationSchemeOutline {
+
+  export interface PointLocationSchemeOutline extends Object {
+    /**
+     * The outline color of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PointLocationScheme)
+     */
     color: Color;
+    /**
+     * The width of the marker symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PointLocationScheme)
+     */
     width: number;
   }
 
-  export interface PolygonLocationSchemeOutline {
+
+  export interface PolygonLocationSchemeOutline extends Object {
+    /**
+     * The outline color of the fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolygonLocationScheme)
+     */
     color: Color;
+    /**
+     * The width of the fill symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#PolygonLocationScheme)
+     */
     width: number;
   }
 
+
   interface symbologySize {
+    /**
+     * Clones a size scheme object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#cloneScheme)
+     * 
+     * @param scheme The SizeScheme object to clone.
+     * 
+     */
     cloneScheme(scheme: PointSizeScheme | PolylineSizeScheme | PolygonSizeScheme): any;
+    /**
+     * Returns a primary scheme and secondary schemes defining symbol properties for size-based data-driven visualizions in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). The `basemap` parameter determines the color of the graphics used to visualize each feature. The `geometryType` determines which type of symbol to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#getSchemes)
+     * 
+     * @param params See the table below for details of each parameter that may be passed to this function.
+     * @param params.basemap The basemap to pair with the visualization. This value indicates the best symbol color for visualizing features against the given basemap.
+     * @param params.geometryType The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon
+     * @param params.view The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * @param params.worldScale Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     */
     getSchemes(params: sizeGetSchemesParams): any;
   }
 
   export const symbologySize: symbologySize;
 
-  export interface PointSizeScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize point features driven by attribute data.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+   */
+  export interface PointSizeScheme extends Object {
+    /**
+     * The fill color of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     color: Color;
+    /**
+     * The color of the marker symbol used to indicate features with no data and features that are out of range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     noDataColor: Color;
+    /**
+     * Properties for defining the outline of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     outline: PointSizeSchemeOutline;
+    /**
+     * The default size of the marker symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     size: number;
+    /**
+     * The size of the marker symbol (in pixels or points) used to indicate features with no data and features that are out of range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     noDataSize: number;
+    /**
+     * The minimum size of a marker symbol in pixels or points representing features with low data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     minSize: number;
+    /**
+     * The maximum size of a marker symbol in pixels or points representing features with high data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     maxSize: number;
+    /**
+     * The opacity of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     opacity: number;
   }
 
-  export interface PolygonSizeScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize polygon features driven by attribute data. When visualized by size, polygons are represented with marker symbols.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+   */
+  export interface PolygonSizeScheme extends Object {
+    /**
+     * The scheme defining the symbology of the marker symbol used to represent polygon features by size.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+     */
     marker: PointSizeScheme;
+    /**
+     * The schema defining the backgound symbol of the feature. This is a fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+     */
     background: PolygonSizeSchemeBackground;
+    /**
+     * The opacity of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+     */
     opacity: number;
   }
 
-  export interface PolylineSizeScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize polyline features driven by attribute data.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+   */
+  export interface PolylineSizeScheme extends Object {
+    /**
+     * The color of the line symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+     */
     color: Color;
+    /**
+     * The color of the line symbol used to indicate features with no data and features that are out of range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+     */
     noDataColor: Color;
+    /**
+     * The default width of the line symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+     */
     width: number;
+    /**
+     * The width of the line symbol in pixels or points used to indicate features with no data and features that are out of range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+     */
     noDataWidth: number;
+    /**
+     * The minimum width of a line symbol in pixels or points representing features with low data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+     */
     minWidth: number;
+    /**
+     * The maximum width of a line symbol in pixels or points representing features with high data values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+     */
     maxWidth: number;
+    /**
+     * The opacity of the line symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolylineSizeScheme)
+     */
     opacity: number;
   }
 
-  export interface sizeGetSchemesParams {
+
+  export interface sizeGetSchemesParams extends Object {
+    /**
+     * The basemap to pair with the visualization. This value indicates the best symbol color for visualizing features against the given basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#getSchemes)
+     */
     basemap: string | Basemap;
+    /**
+     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#getSchemes)
+     */
     geometryType: string;
+    /**
+     * The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#getSchemes)
+     */
     view?: SceneView;
+    /**
+     * Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#getSchemes)
+     */
     worldScale?: boolean;
   }
 
-  export interface PointSizeSchemeOutline {
+
+  export interface PointSizeSchemeOutline extends Object {
+    /**
+     * The outline color of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     color: Color;
+    /**
+     * The width of the marker symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PointSizeScheme)
+     */
     width: number;
   }
 
-  export interface PolygonSizeSchemeBackground {
+
+  export interface PolygonSizeSchemeBackground extends Object {
+    /**
+     * The color of the fill symbol representing the polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+     */
     color: Color;
+    /**
+     * Properties for defining the outline of the background fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+     */
     outline: PolygonSizeSchemeBackgroundOutline;
   }
 
-  export interface PolygonSizeSchemeBackgroundOutline {
+
+  export interface PolygonSizeSchemeBackgroundOutline extends Object {
+    /**
+     * The outline color of the background fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+     */
     color: Color;
+    /**
+     * The width of the background fill symbol's outline in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#PolygonSizeScheme)
+     */
     width: number;
   }
 
+
   interface symbologyType {
+    /**
+     * Clones a type scheme object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#cloneScheme)
+     * 
+     * @param scheme The type scheme object to clone.
+     * 
+     */
     cloneScheme(scheme: PointTypeScheme | PolylineTypeScheme | PolygonTypeScheme | MeshTypeScheme): any;
+    /**
+     * Returns a primary scheme and secondary schemes defining symbol properties for type-based data-driven visualizions in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). The `basemap` parameter determines the color of the graphics used to visualize each feature. The `geometryType` determines which type of symbol to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#getSchemes)
+     * 
+     * @param params See the table below for details of each parameter that may be passed to this function.
+     * @param params.basemap The basemap to pair with the visualization. This value indicates the best symbol color for visualizing features against the given basemap.
+     * @param params.geometryType The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * @param params.theme Determines whether to return a standardized  unique value scheme for point cloud class renderers (i.e. when the `CLASS_CODE` field is driving the visualization in a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html)), or to return the other default primary schemes used in other unique value renderers generated for non-point cloud layer types.  **Known Values:** point-cloud-class | default
+     * @param params.worldScale Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * @param params.view The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * 
+     */
     getSchemes(params: typeGetSchemesParams): any;
   }
 
   export const symbologyType: symbologyType;
 
-  export interface MeshTypeScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize mesh features driven by type-based attribute data.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#MeshTypeScheme)
+   */
+  export interface MeshTypeScheme extends Object {
+    /**
+     * The fill colors of the symbols comprising the theme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#MeshTypeScheme)
+     */
     colors: Color[];
+    /**
+     * The color of the fill symbol used to indicate features with no data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#MeshTypeScheme)
+     */
     noDataColor: Color;
+    /**
+     * The opacity of the symbol (0 - 1).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#MeshTypeScheme)
+     */
     opacity: number;
   }
 
-  export interface PointTypeScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize point features driven by type-based attribute data.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+   */
+  export interface PointTypeScheme extends Object {
+    /**
+     * The fill colors of the point symbols comprising the theme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+     */
     colors: Color[];
+    /**
+     * The color of the point symbol used to indicate features with no data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+     */
     noDataColor: Color;
+    /**
+     * Properties for defining the outline of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+     */
     outline: PointTypeSchemeOutline;
+    /**
+     * The default size of the point symbol in pixels, points, or real-world units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+     */
     size: number;
+    /**
+     * The opacity of the point symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+     */
     opacity: number;
   }
 
-  export interface PolygonTypeScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize polygon features driven by type-based attribute data.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolygonTypeScheme)
+   */
+  export interface PolygonTypeScheme extends Object {
+    /**
+     * The fill colors of the symbols comprising the theme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolygonTypeScheme)
+     */
     colors: Color[];
+    /**
+     * The color of the fill symbol used to indicate features with no data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolygonTypeScheme)
+     */
     noDataColor: Color;
+    /**
+     * Properties for defining the outline of the fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolygonTypeScheme)
+     */
     outline: PolygonTypeSchemeOutline;
+    /**
+     * The opacity of the symbol (0 - 1).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolygonTypeScheme)
+     */
     opacity: number;
   }
 
-  export interface PolylineTypeScheme {
+  /**
+   * Properties defining the symbology scheme used to visualize polyline features driven by type-based attribute data.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolylineTypeScheme)
+   */
+  export interface PolylineTypeScheme extends Object {
+    /**
+     * The colors of the line symbols comprising the theme.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolylineTypeScheme)
+     */
     colors: Color[];
+    /**
+     * The color of the line symbol used to indicate features with no data and features that are out of range.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolylineTypeScheme)
+     */
     noDataColor: Color;
+    /**
+     * The default width of the line symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolylineTypeScheme)
+     */
     width: number;
+    /**
+     * The opacity of the line symbol (0 - 1).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolylineTypeScheme)
+     */
     opacity: number;
   }
 
-  export interface typeGetSchemesParams {
+
+  export interface typeGetSchemesParams extends Object {
+    /**
+     * The basemap to pair with the visualization. This value indicates the best symbol color for visualizing features against the given basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#getSchemes)
+     */
     basemap: string | Basemap;
+    /**
+     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#getSchemes)
+     */
     geometryType: string;
+    /**
+     * Determines whether to return a standardized  unique value scheme for point cloud class renderers (i.e. when the `CLASS_CODE` field is driving the visualization in a [PointCloudLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-PointCloudLayer.html)), or to return the other default primary schemes used in other unique value renderers generated for non-point cloud layer types.  **Known Values:** point-cloud-class | default
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#getSchemes)
+     * 
+     * @default default
+     */
     theme?: string;
+    /**
+     * Indicates if the size units of the scheme will be in meters. This should be `true` when the scheme is intended for 3D volumetric symbology. A `view` must be provided if this property is set to `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#getSchemes)
+     */
     worldScale?: boolean;
+    /**
+     * The SceneView instance in which the scheme will be used. This property is only applicable when the scheme will be used in conjunction with 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#getSchemes)
+     */
     view?: SceneView;
   }
 
-  export interface PointTypeSchemeOutline {
+
+  export interface PointTypeSchemeOutline extends Object {
+    /**
+     * The outline color of the marker symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+     */
     color: Color;
+    /**
+     * The width of the marker symbol in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PointTypeScheme)
+     */
     width: number;
   }
 
-  export interface PolygonTypeSchemeOutline {
+
+  export interface PolygonTypeSchemeOutline extends Object {
+    /**
+     * The outline color of the fill symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolygonTypeScheme)
+     */
     color: Color;
+    /**
+     * The width of the fill symbol's outline in pixels or points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#PolygonTypeScheme)
+     */
     width: number;
   }
 
+  interface AuthoringInfo extends Accessor, JSONSupport {
+    /**
+     * Indicates which classification method was used if a classed color or classed size renderer was generated using one of the Smart Mapping functions.  **Known Values:** equal-interval | manual | natural-breaks | quantile | standard-deviation
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#classificationMethod)
+     */
+    classificationMethod: string;
+    /**
+     * An array of string values representing field names used for creating predominance renderers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#fields)
+     */
+    fields: string[];
+    /**
+     * **Only applicable to renderer used in web scenes.** Indicates the unit used in real-world sizes.  **Known Values:** inches | feet | yards | miles | nautical-miles | millimeters | centimeters | decimeters | meters | kilometers | decimal-degrees
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#lengthUnit)
+     */
+    lengthUnit: string;
+    /**
+     * Indicates the standard deviation interval for each stop in a classed color or classed size renderer that was generated using the `standard-deviation` classification method.  **Known Values:** 0.25 | 0.33 | 0.5 | 1
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#standardDeviationInterval)
+     */
+    standardDeviationInterval: number;
+    /**
+     * Indicates the renderer type generated from one of the Smart Mapping functions.  **Known Values:** class-breaks-size | class-breaks-color | predominance | univariate-color-size
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#type)
+     */
+    type: string;
+    /**
+     * Contains authoring properties of visual variables generated from one of the Smart Mapping methods or sliders.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#visualVariables)
+     */
+    visualVariables: AuthoringInfoVisualVariable[];
+
+    /**
+     * Creates a deep clone of the instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#clone)
+     * 
+     * 
+     */
+    clone(): AuthoringInfo;
+  }
+
+  interface AuthoringInfoConstructor {
+
+
+    new(properties?: AuthoringInfoProperties): AuthoringInfo;
+
+    fromJSON(json: any): AuthoringInfo;
+  }
+
+  export const AuthoringInfo: AuthoringInfoConstructor;
+
+  interface AuthoringInfoProperties {
+    /**
+     * Indicates which classification method was used if a classed color or classed size renderer was generated using one of the Smart Mapping functions.  **Known Values:** equal-interval | manual | natural-breaks | quantile | standard-deviation
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#classificationMethod)
+     */
+    classificationMethod?: string;
+    /**
+     * An array of string values representing field names used for creating predominance renderers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#fields)
+     */
+    fields?: string[];
+    /**
+     * **Only applicable to renderer used in web scenes.** Indicates the unit used in real-world sizes.  **Known Values:** inches | feet | yards | miles | nautical-miles | millimeters | centimeters | decimeters | meters | kilometers | decimal-degrees
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#lengthUnit)
+     */
+    lengthUnit?: string;
+    /**
+     * Indicates the standard deviation interval for each stop in a classed color or classed size renderer that was generated using the `standard-deviation` classification method.  **Known Values:** 0.25 | 0.33 | 0.5 | 1
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#standardDeviationInterval)
+     */
+    standardDeviationInterval?: number;
+    /**
+     * Indicates the renderer type generated from one of the Smart Mapping functions.  **Known Values:** class-breaks-size | class-breaks-color | predominance | univariate-color-size
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#type)
+     */
+    type?: string;
+    /**
+     * Contains authoring properties of visual variables generated from one of the Smart Mapping methods or sliders.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#visualVariables)
+     */
+    visualVariables?: AuthoringInfoVisualVariableProperties[];
+  }
+
+  interface AuthoringInfoVisualVariable extends Accessor, JSONSupport {
+    /**
+     * If an age or timeline renderer was generated, indicates the end time of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#endTime)
+     */
+    endTime: string | number;
+    /**
+     * Indicates the field name used for generating the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#field)
+     */
+    field: string;
+    /**
+     * Indicates the value of the upper handle if a slider was used to generate the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#maxSliderValue)
+     */
+    maxSliderValue: number;
+    /**
+     * Indicates the value of the lower handle if a slider was used to generate the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#minSliderValue)
+     */
+    minSliderValue: number;
+    /**
+     * If an age or timeline renderer was generated, indicates the start time of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#startTime)
+     */
+    startTime: string | number;
+    /**
+     * If the UI offers the option to display values based on a ratio or percentage, this indicates which selection was made.  **Known Values:** percent | percent-of-total | ratio
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#style)
+     */
+    style: string;
+    /**
+     * Indicates the theme selected by the user when generating a renderer or visual variable with one of the Smart Mapping functions.  **Known Values:** above-and-below | centered-on | extremes | high-to-low
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#theme)
+     */
+    theme: string;
+    /**
+     * The type of visual variable generated.  **Known Values:** color | size | opacity
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#type)
+     */
+    type: string;
+    /**
+     * If an age or timeline renderer was generated, indicates the time units used.  **Known Values:** seconds | minutes | hours | days | months | years
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#units)
+     */
+    units: string;
+
+    /**
+     * Creates a deep clone of the instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#clone)
+     * 
+     * 
+     */
+    clone(): AuthoringInfoVisualVariable;
+  }
+
+  interface AuthoringInfoVisualVariableConstructor {
+
+
+    new(properties?: AuthoringInfoVisualVariableProperties): AuthoringInfoVisualVariable;
+
+    fromJSON(json: any): AuthoringInfoVisualVariable;
+  }
+
+  export const AuthoringInfoVisualVariable: AuthoringInfoVisualVariableConstructor;
+
+  interface AuthoringInfoVisualVariableProperties {
+    /**
+     * If an age or timeline renderer was generated, indicates the end time of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#endTime)
+     */
+    endTime?: string | number;
+    /**
+     * Indicates the field name used for generating the data-driven visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#field)
+     */
+    field?: string;
+    /**
+     * Indicates the value of the upper handle if a slider was used to generate the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#maxSliderValue)
+     */
+    maxSliderValue?: number;
+    /**
+     * Indicates the value of the lower handle if a slider was used to generate the visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#minSliderValue)
+     */
+    minSliderValue?: number;
+    /**
+     * If an age or timeline renderer was generated, indicates the start time of the visualization.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#startTime)
+     */
+    startTime?: string | number;
+    /**
+     * If the UI offers the option to display values based on a ratio or percentage, this indicates which selection was made.  **Known Values:** percent | percent-of-total | ratio
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#style)
+     */
+    style?: string;
+    /**
+     * Indicates the theme selected by the user when generating a renderer or visual variable with one of the Smart Mapping functions.  **Known Values:** above-and-below | centered-on | extremes | high-to-low
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#theme)
+     */
+    theme?: string;
+    /**
+     * The type of visual variable generated.  **Known Values:** color | size | opacity
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#type)
+     */
+    type?: string;
+    /**
+     * If an age or timeline renderer was generated, indicates the time units used.  **Known Values:** seconds | minutes | hours | days | months | years
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#units)
+     */
+    units?: string;
+  }
+
+
   interface supportJsonUtils {
+    /**
+     * Creates a new instance of an appropriate [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) class and initializes it with values from a JSON object generated from a product in the ArcGIS platform. The object passed into the input `json` parameter often comes from a response to a query operation in the REST API or a [toJSON()](http://pro.arcgis.com/en/pro-app/tool-reference/conversion/features-to-json.htm) method from another ArcGIS product. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for details and examples of when and how to use this function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-jsonUtils.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance in the ArcGIS format. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Renderer_objects/02r30000019t000000/) for examples of the structure of various input JSON objects.
+     * 
+     */
     fromJSON(json: any): Renderer;
   }
 
   export const supportJsonUtils: supportJsonUtils;
 
   interface UniqueValueRenderer extends Renderer, VisualVariablesMixin {
+    /**
+     * Label used in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) to describe features assigned the [default symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultSymbol). The [default symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultSymbol) is used to draw all features with unspecified, unmatched values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultLabel)
+     */
     defaultLabel: string;
+    /**
+     * The default symbol used to draw a feature whose value is not matched or specified by the renderer. If `null`, unmatched features will not be assigned a symbol. 
+     * > **Known Limitations**  SceneLayers with a `mesh` [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) will display unmatching features with a generic symbol even if the `defaultSymbol` is `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultSymbol)
+     */
     defaultSymbol: Symbol;
+    /**
+     * The name of the attribute field the renderer uses to match unique values or types. A function may also be used to return a string value representing unique types if the desired type does not already explicitly exist in a field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field)
+     */
     field: string | Function;
+    /**
+     * If needed, specifies the name of an additional attribute field the renderer will use to match values. For example, if you specify two fields: 
+     * ```js
+     * var renderer = {
+     *   type: "unique-value",  // autocasts as new UniqueValueRenderer()
+     *   field: "REGION",
+     *   field2: "RANK",
+     *   fieldDelimiter: ", ",  // comma + space used to separate values from all fields
+     *   uniqueValueInfos: [
+     *     {
+     *       value: "North, 1",  // features in the "North" region and a rank of 1
+     *       symbol: sym1  // will be assigned sym1
+     *     }, {
+     *       value: "North, 2",  // features in the "North" region and a rank of 2
+     *       symbol: sym2  // will be assigned sym2
+     *     },
+     *     ...
+     *   ]
+     * };
+     * ```
+     * 
+     * All combinations of values of [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field) and `field2` are unique values and
+     * may have their own symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field2)
+     */
     field2: string;
+    /**
+     * If needed, specify the name of a third attribute field the renderer will use to match values. For example, if you specify three fields: 
+     * ```js
+     * var renderer = {
+     *   type: "unique-value",  // autocasts as new UniqueValueRenderer()
+     *   field: "REGION",
+     *   field2: "RANK",
+     *   field3: "CLASS",
+     *   fieldDelimiter: ", ",  // comma + space used to separate values from all fields
+     *   uniqueValueInfos: [
+     *     {
+     *       value: "North, 1, medium",  // features in the "North" region, a rank of 1, and "medium" class
+     *       symbol: sym1  // will be assigned sym1
+     *     }, {
+     *       value: "North, 2, medium",  // features in the "North" region, a rank of 2, and a "medium class
+     *       symbol: sym2  // will be assigned sym2
+     *     },
+     *     ...
+     *   ]
+     * };
+     * ```
+     * 
+     * All combinations of values of [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field), [field2](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field2), and `field3` are unique values and
+     * may have their own symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field3)
+     */
     field3: string;
+    /**
+     * String inserted between the values if multiple attribute fields are specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#fieldDelimiter)
+     */
     fieldDelimiter: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#legendOptions)
+     */
     legendOptions: UniqueValueRendererLegendOptions;
-    type: string;
+    /**
+     * The type of Renderer. For UniqueValueRenderer this value is always `unique-value`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#type)
+     */
+    readonly type: "unique-value";
+    /**
+     * Each element in the array is an object that provides information about a unique value associated with the renderer. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#uniqueValueInfos)
+     */
     uniqueValueInfos: UniqueValueRendererUniqueValueInfos[];
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to either a string or a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime.  This property is typically used as an alternative to [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field) for data-driven visualizations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#valueExpression)
+     */
     valueExpression: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the [valueExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#valueExpression) property. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the [legendOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#legendOptions) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#valueExpressionTitle)
+     */
     valueExpressionTitle: string;
 
-    addUniqueValueInfo(valueOrInfo: string | number | any, symbol?: Symbol): void;
+    /**
+     * Adds a unique value and symbol to the renderer. You can provide the value and its associated symbol as individual arguments or as an info object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#addUniqueValueInfo)
+     * 
+     * @param valueOrInfo The value to match. The value can be provided as an individual argument or as an [info object described in uniqueValueInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#uniqueValueInfos).
+     * @param symbol The symbol used to represent features matching the specified `value`.
+     * 
+     */
+    addUniqueValueInfo(valueOrInfo: string | number | any, symbol?: Symbol | SymbolProperties): void;
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#clone)
+     * 
+     * 
+     */
     clone(): UniqueValueRenderer;
+    /**
+     * Returns rendering and legend information (as defined by the renderer) associated with the given graphic.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#getUniqueValueInfo)
+     * 
+     * @param graphic The graphic whose rendering and legend information will be returned.
+     * 
+     */
     getUniqueValueInfo(graphic: Graphic): any;
+    /**
+     * Removes a unique value from the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#removeUniqueValueInfo)
+     * 
+     * @param value Value to remove from [uniqueValueInfos](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#uniqueValueInfos).
+     * 
+     */
     removeUniqueValueInfo(value: string): void;
   }
 
   interface UniqueValueRendererConstructor {
+    /**
+     * UniqueValueRenderer allows you to symbolize features in a [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) based on one or more matching string attributes. This is typically done by using unique colors, fill styles, or images to represent features with equal values in a string field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html)
+     */
+
     new(properties?: UniqueValueRendererProperties): UniqueValueRenderer;
 
     fromJSON(json: any): UniqueValueRenderer;
@@ -4962,44 +21113,218 @@ declare namespace __esri {
   export const UniqueValueRenderer: UniqueValueRendererConstructor;
 
   interface UniqueValueRendererProperties extends RendererProperties, VisualVariablesMixinProperties {
+    /**
+     * Label used in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) to describe features assigned the [default symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultSymbol). The [default symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultSymbol) is used to draw all features with unspecified, unmatched values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultLabel)
+     */
     defaultLabel?: string;
+    /**
+     * The default symbol used to draw a feature whose value is not matched or specified by the renderer. If `null`, unmatched features will not be assigned a symbol. 
+     * > **Known Limitations**  SceneLayers with a `mesh` [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) will display unmatching features with a generic symbol even if the `defaultSymbol` is `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#defaultSymbol)
+     */
     defaultSymbol?: SymbolProperties;
+    /**
+     * The name of the attribute field the renderer uses to match unique values or types. A function may also be used to return a string value representing unique types if the desired type does not already explicitly exist in a field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field)
+     */
     field?: string | Function;
+    /**
+     * If needed, specifies the name of an additional attribute field the renderer will use to match values. For example, if you specify two fields: 
+     * ```js
+     * var renderer = {
+     *   type: "unique-value",  // autocasts as new UniqueValueRenderer()
+     *   field: "REGION",
+     *   field2: "RANK",
+     *   fieldDelimiter: ", ",  // comma + space used to separate values from all fields
+     *   uniqueValueInfos: [
+     *     {
+     *       value: "North, 1",  // features in the "North" region and a rank of 1
+     *       symbol: sym1  // will be assigned sym1
+     *     }, {
+     *       value: "North, 2",  // features in the "North" region and a rank of 2
+     *       symbol: sym2  // will be assigned sym2
+     *     },
+     *     ...
+     *   ]
+     * };
+     * ```
+     * 
+     * All combinations of values of [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field) and `field2` are unique values and
+     * may have their own symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field2)
+     */
     field2?: string;
+    /**
+     * If needed, specify the name of a third attribute field the renderer will use to match values. For example, if you specify three fields: 
+     * ```js
+     * var renderer = {
+     *   type: "unique-value",  // autocasts as new UniqueValueRenderer()
+     *   field: "REGION",
+     *   field2: "RANK",
+     *   field3: "CLASS",
+     *   fieldDelimiter: ", ",  // comma + space used to separate values from all fields
+     *   uniqueValueInfos: [
+     *     {
+     *       value: "North, 1, medium",  // features in the "North" region, a rank of 1, and "medium" class
+     *       symbol: sym1  // will be assigned sym1
+     *     }, {
+     *       value: "North, 2, medium",  // features in the "North" region, a rank of 2, and a "medium class
+     *       symbol: sym2  // will be assigned sym2
+     *     },
+     *     ...
+     *   ]
+     * };
+     * ```
+     * 
+     * All combinations of values of [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field), [field2](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field2), and `field3` are unique values and
+     * may have their own symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field3)
+     */
     field3?: string;
+    /**
+     * String inserted between the values if multiple attribute fields are specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#fieldDelimiter)
+     */
     fieldDelimiter?: string;
+    /**
+     * An object providing options for displaying the renderer in the Legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#legendOptions)
+     */
     legendOptions?: UniqueValueRendererLegendOptions;
-    type?: string;
+    /**
+     * Each element in the array is an object that provides information about a unique value associated with the renderer. Each object has the following specification:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#uniqueValueInfos)
+     */
     uniqueValueInfos?: UniqueValueRendererUniqueValueInfos[];
+    /**
+     * An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression evaluating to either a string or a number. This expression can reference field values using the `$feature` global variable and perform mathematical calculations and logical evaluations at runtime.  This property is typically used as an alternative to [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#field) for data-driven visualizations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#valueExpression)
+     */
     valueExpression?: string;
+    /**
+     * The title identifying and describing the associated [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression as defined in the [valueExpression](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#valueExpression) property. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) in the absence of a provided `title` in the [legendOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#legendOptions) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#valueExpressionTitle)
+     */
     valueExpressionTitle?: string;
   }
 
-  export interface UniqueValueRendererLegendOptions {
+
+  export interface UniqueValueRendererLegendOptions extends Object {
+    /**
+     * Describes the variable driving the visualization. This is displayed as the title of the corresponding renderer in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) and takes precedence over a [field alias](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Field.html#alias) or [valueExpressionTitle](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#valueExpressionTitle).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#legendOptions)
+     */
     title?: string;
   }
 
-  export interface UniqueValueRendererUniqueValueInfos {
+
+  export interface UniqueValueRendererUniqueValueInfos extends Object {
+    /**
+     * The unique value used to classify features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#uniqueValueInfos)
+     */
     value: string | number;
+    /**
+     * The symbol used to style features whose value matches `value`. This value may be autocast by specifying the symbol `type`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#uniqueValueInfos)
+     */
     symbol: Symbol;
+    /**
+     * Label used to describe features matched to this unique value in the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-UniqueValueRenderer.html#uniqueValueInfos)
+     */
     label?: string;
   }
 
   interface VisualVariablesMixin {
+    /**
+     * Visual variables define the parameters for data-driven geographic visualizations of numeric data. They allow you to easily map continuous ramps of [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable), [size](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable), [opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable), and/or [rotation](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable) to minimum and maximum data values of one of the layer's numeric attribute fields.  Visual variables can primarily be used in two ways.  **1**. Thematic mapping  Visual variables allow you to easily create stunning visualizations based on thematic attributes (e.g. population, education, rank, money, magnitude, etc.) in either 2D or 3D. This is accomplished by mapping data values from a numeric field attribute to color, size, and/or opacity values. The renderer then takes over and re-sizes or shades features based on the value of the given field and its position relative to the minimum and maximum values. The sample below uses three visual variables (size, color, and opacity).  [![renderer-unique-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/renderer-unique-vv.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-multivariate-2d/index.html)  **2**. Mapping real-world sizes  The [size](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) visual variable can be used to visualize the true sizes of features (e.g. tree canopy, road width, building height, etc.) based on their size in the real world. This can be particularly powerful when working in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). The image below shows a layer of building footprints that uses visual variables to extrude each feature to the true height of the buildings based on data stored in an attribute field.  [![renderer-vv-rw](https://developers.arcgis.com/javascript/latest/assets/img/samples/2-extrude-height.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-buildings-3d/index.html)  The `visualVariables` property of the renderer is an array of objects called "visual variables". Each object must indicate the type of visual variable to apply (e.g. color, size, opacity, rotation), the numeric field from which to drive the visualization, and the ramp of visual values to map to the data. The following list identifies each visual variable type and provides a link to the specification table of each. 
+     * 
+     * Type | Object Specification | Legend Example
+     * -----|----------------------|---------------
+     * color | [ColorVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable) | ![legend-color-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/legend-color-vv.png)
+     * size | [SizeVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) | ![legend-color-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/legend-size-vv.png)
+     * opacity | [OpacityVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable) | ![legend-color-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/legend-opacity-vv.png)
+     * rotation | [RotationVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable) | -
+     * 
+     * See the [Visualize features with realistic 3D symbols](https://developers.arcgis.com/javascript/latest/sample-code/visualization-trees-realistic/index.html) for an example of using multiple visual variables to visualize your data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-VisualVariablesMixin.html#visualVariables)
+     */
     visualVariables: any[];
   }
 
   interface VisualVariablesMixinConstructor {
+
+
     new(): VisualVariablesMixin;
   }
 
   export const VisualVariablesMixin: VisualVariablesMixinConstructor;
 
   interface VisualVariablesMixinProperties {
+    /**
+     * Visual variables define the parameters for data-driven geographic visualizations of numeric data. They allow you to easily map continuous ramps of [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable), [size](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable), [opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable), and/or [rotation](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable) to minimum and maximum data values of one of the layer's numeric attribute fields.  Visual variables can primarily be used in two ways.  **1**. Thematic mapping  Visual variables allow you to easily create stunning visualizations based on thematic attributes (e.g. population, education, rank, money, magnitude, etc.) in either 2D or 3D. This is accomplished by mapping data values from a numeric field attribute to color, size, and/or opacity values. The renderer then takes over and re-sizes or shades features based on the value of the given field and its position relative to the minimum and maximum values. The sample below uses three visual variables (size, color, and opacity).  [![renderer-unique-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/renderer-unique-vv.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-multivariate-2d/index.html)  **2**. Mapping real-world sizes  The [size](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) visual variable can be used to visualize the true sizes of features (e.g. tree canopy, road width, building height, etc.) based on their size in the real world. This can be particularly powerful when working in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). The image below shows a layer of building footprints that uses visual variables to extrude each feature to the true height of the buildings based on data stored in an attribute field.  [![renderer-vv-rw](https://developers.arcgis.com/javascript/latest/assets/img/samples/2-extrude-height.png)](https://developers.arcgis.com/javascript/latest/sample-code/visualization-buildings-3d/index.html)  The `visualVariables` property of the renderer is an array of objects called "visual variables". Each object must indicate the type of visual variable to apply (e.g. color, size, opacity, rotation), the numeric field from which to drive the visualization, and the ramp of visual values to map to the data. The following list identifies each visual variable type and provides a link to the specification table of each. 
+     * 
+     * Type | Object Specification | Legend Example
+     * -----|----------------------|---------------
+     * color | [ColorVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#ColorVisualVariable) | ![legend-color-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/legend-color-vv.png)
+     * size | [SizeVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) | ![legend-color-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/legend-size-vv.png)
+     * opacity | [OpacityVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#OpacityVisualVariable) | ![legend-color-vv](https://developers.arcgis.com/javascript/latest/assets/img/apiref/renderers/legend-opacity-vv.png)
+     * rotation | [RotationVisualVariable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#RotationVisualVariable) | -
+     * 
+     * See the [Visualize features with realistic 3D symbols](https://developers.arcgis.com/javascript/latest/sample-code/visualization-trees-realistic/index.html) for an example of using multiple visual variables to visualize your data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-VisualVariablesMixin.html#visualVariables)
+     */
     visualVariables?: any[];
   }
 
+
   interface request {
+    /**
+     * Retrieves data from a remote server or uploads a file from a user's computer. If the request returns an [Error](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Error.html), the error object will include the details specified in [EsriErrorDetails](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @param url The request URL.
+     * @param options An object with the following properties that describe the request.
+     * @param options.callbackParamName Name of the callback parameter (a special service parameter) to be specified when requesting data in JSONP format. It is ignored for all other data formats. For ArcGIS services the value is always `callback`.
+     * @param options.query If the request URL points to a web server that requires parameters, specify them here.
+     * @param options.responseType Response format. When this value is `image` the `method` and `timeout` options are ignored.  **Possible Values:** json | xml | text | blob | array-buffer | document | image
+     * @param options.headers Headers to use for the request. This is an object whose property names are header names. This is not applicable for non-XHR requests.
+     * @param options.timeout Indicates the amount of time in milliseconds to wait for a response from the server. Set to `0` to wait for the response indefinitely. This option is ignored when `responseType = "image"`.
+     * @param options.method Indicates if the request should be made using the HTTP POST method. By default, this is determined automatically based on the request size. This option is ignored when `responseType = "image"`.  **Known Values:** auto | post
+     * @param options.body If uploading a file, specify the form data or element used to submit the file here. If a form element is specified, the parameters of the `query` will be added to the URL. If not specified, then query parameters will only be added to the URL when a GET request is used. If POST is used, then query parameters will be added to the body.
+     * @param options.useProxy Indicates the request should use the proxy. By default this is determined automatically based on the domain of the request url.
+     * @param options.cacheBust Indicates whether to send an extra query parameter to ensure the server doesn't supply cached values.
+     * @param options.allowImageDataAccess Indicates whether apps are allowed to read image data (when used with Canvas) from images hosted on third-party sites. Only applicable when `responseType = "image"`.
+     * @param options.authMode 
+     * Indicates if and how requests to ArcGIS Services are authenticated. Only applicable when [`esriConfig.request.useIdentity = true`](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request). 
+     * 
+     * | Known Value | Description |
+     * |-------------|-------------|
+     * | auto |  The user will be signed in when a secure resource is requested. |
+     * | anonymous | An error will be returned when a secure resource is requested. |
+     * | immediate | The user will be signed in before the resource is requested. |
+     * | no-prompt | Checks for whether the user is already signed in. If so, no additional prompts display for sign-in. |
+     * 
+     */
     esriRequest(url: string, options?: requestEsriRequestOptions): IPromise<any>;
   }
 
@@ -5007,84 +21332,371 @@ declare namespace __esri {
   export const request: typeof __requestMapped.esriRequest;
 
 
-  export interface EsriErrorDetails {
+  /**
+   * The specification of the [details object](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Error.html#details) returned in an [Error](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Error.html) object.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+   */
+  export interface EsriErrorDetails extends Object {
+    /**
+     * A function to retrieve headers sent from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     getHeader: GetHeader;
+    /**
+     * The status of the http request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     httpStatus: number;
+    /**
+     * The error message code.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     messageCode: string;
+    /**
+     * Additional error message(s).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     messages: string[];
+    /**
+     * The query parameters sent with the http request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     requestOptions: any;
+    /**
+     * Indicates if the request required https.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     ssl: boolean;
+    /**
+     * The error message subcode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     subCode: number;
+    /**
+     * The URL of the request that returned an error message.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#EsriErrorDetails)
+     */
     url: string;
   }
 
   export type GetHeader = (headerName: string) => string;
 
-  export interface requestEsriRequestOptions {
+
+  export interface requestEsriRequestOptions extends Object {
+    /**
+     * Name of the callback parameter (a special service parameter) to be specified when requesting data in JSONP format. It is ignored for all other data formats. For ArcGIS services the value is always `callback`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     */
     callbackParamName?: string;
+    /**
+     * If the request URL points to a web server that requires parameters, specify them here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     */
     query?: any;
+    /**
+     * Response format. When this value is `image` the `method` and `timeout` options are ignored.  **Possible Values:** json | xml | text | blob | array-buffer | document | image
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @default json
+     */
     responseType?: string;
+    /**
+     * Headers to use for the request. This is an object whose property names are header names. This is not applicable for non-XHR requests.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     */
     headers?: any;
+    /**
+     * Indicates the amount of time in milliseconds to wait for a response from the server. Set to `0` to wait for the response indefinitely. This option is ignored when `responseType = "image"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @default 60000
+     */
     timeout?: number;
+    /**
+     * Indicates if the request should be made using the HTTP POST method. By default, this is determined automatically based on the request size. This option is ignored when `responseType = "image"`.  **Known Values:** auto | post
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @default auto
+     */
     method?: string;
+    /**
+     * If uploading a file, specify the form data or element used to submit the file here. If a form element is specified, the parameters of the `query` will be added to the URL. If not specified, then query parameters will only be added to the URL when a GET request is used. If POST is used, then query parameters will be added to the body.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     */
     body?: FormData | HTMLFormElement | string;
+    /**
+     * Indicates the request should use the proxy. By default this is determined automatically based on the domain of the request url.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @default false
+     */
     useProxy?: boolean;
+    /**
+     * Indicates whether to send an extra query parameter to ensure the server doesn't supply cached values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @default false
+     */
     cacheBust?: boolean;
+    /**
+     * Indicates whether apps are allowed to read image data (when used with Canvas) from images hosted on third-party sites. Only applicable when `responseType = "image"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @default false
+     */
     allowImageDataAccess?: boolean;
+    /**
+     * Indicates if and how requests to ArcGIS Services are authenticated. Only applicable when [`esriConfig.request.useIdentity = true`](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request). 
+     * 
+     * | Known Value | Description |
+     * |-------------|-------------|
+     * | auto |  The user will be signed in when a secure resource is requested. |
+     * | anonymous | An error will be returned when a secure resource is requested. |
+     * | immediate | The user will be signed in before the resource is requested. |
+     * | no-prompt | Checks for whether the user is already signed in. If so, no additional prompts display for sign-in. |
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest)
+     * 
+     * @default auto
+     */
     authMode?: string;
   }
 
   interface Action extends Accessor {
+    /**
+     * Adds a CSS class to the action's node. Can be used in conjunction with the `image` property or by itself. Any icon font may be used in this property. The [Esri Icon Font](https://developers.arcgis.com/javascript/latest/guide/esri-icon-font/index.html) is automatically made available via the ArcGIS API for JavaScript for you to use in styling custom actions. To use one of these provided icon fonts, you must prefix the class name with `esri-`. For example, the default `zoom-to` action in [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) uses the font `esri-icon-zoom-in-magnifying-glass`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#className)
+     */
     className: string;
+    /**
+     * The name of the ID assigned to this action. This is used for differentiating actions when listening to the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#event:trigger-action) event.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#id)
+     */
     id: string;
+    /**
+     * The URL to an image that will be used to represent the action. This property will be used as a background image for the node. It may be used in conjunction with the `className` property or by itself. If neither `image` nor `className` are specified, a default icon ![default icon](https://developers.arcgis.com/javascript/latest/assets/img/guide/whats-new/41/default-action.png) will display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#image)
+     */
     image: string;
+    /**
+     * The title of the action.  _For popups_: When there are fewer than three actions defined in a popup, this text is displayed to the right of the icon or image representing the action. If there are three or more actions in the popup, then this text is used as a tooltip on the action.  _For LayerList_: The first action is displayed in the layerlist with an icon. The layerlist has a menu that will display all actions with their titles
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#title)
+     */
     title: string;
+    /**
+     * Indicates if the action is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#visible)
+     * 
+     * @default true
+     */
     visible: boolean;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#clone)
+     * 
+     * 
+     */
     clone(): Action;
   }
 
   interface ActionConstructor {
+
+
     new(properties?: ActionProperties): Action;
   }
 
   export const Action: ActionConstructor;
 
   interface ActionProperties {
+    /**
+     * Adds a CSS class to the action's node. Can be used in conjunction with the `image` property or by itself. Any icon font may be used in this property. The [Esri Icon Font](https://developers.arcgis.com/javascript/latest/guide/esri-icon-font/index.html) is automatically made available via the ArcGIS API for JavaScript for you to use in styling custom actions. To use one of these provided icon fonts, you must prefix the class name with `esri-`. For example, the default `zoom-to` action in [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) uses the font `esri-icon-zoom-in-magnifying-glass`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#className)
+     */
     className?: string;
+    /**
+     * The name of the ID assigned to this action. This is used for differentiating actions when listening to the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#event:trigger-action) event.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#id)
+     */
     id?: string;
+    /**
+     * The URL to an image that will be used to represent the action. This property will be used as a background image for the node. It may be used in conjunction with the `className` property or by itself. If neither `image` nor `className` are specified, a default icon ![default icon](https://developers.arcgis.com/javascript/latest/assets/img/guide/whats-new/41/default-action.png) will display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#image)
+     */
     image?: string;
+    /**
+     * The title of the action.  _For popups_: When there are fewer than three actions defined in a popup, this text is displayed to the right of the icon or image representing the action. If there are three or more actions in the popup, then this text is used as a tooltip on the action.  _For LayerList_: The first action is displayed in the layerlist with an icon. The layerlist has a menu that will display all actions with their titles
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#title)
+     */
     title?: string;
+    /**
+     * Indicates if the action is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#visible)
+     * 
+     * @default true
+     */
     visible?: boolean;
   }
 
   interface LayersMixin {
+    /**
+     * A collection of operational [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). This property only contains interactive operational layers, such as [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), [WebTileLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html) and {@link module:esri/layers/GraphicsLayer GraphicsLayers}  that may be queried, assigned different renderers, analyzed, etc. It does not include [basemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html).  A [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) is a collection of one or more features, or {@link module:esri/Graphic graphics}, that represent real-world phenomena. Each feature contains a {@link module:esri/symbols/Symbol symbol}  and [geographic data](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) that allows it to be rendered on the map as a graphic with spatial context. Features within the layer may also contain data attributes that provide additional information that may be viewed in [popup windows](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) and used for {@link module:esri/renderers/Renderer rendering the layer}.  Layers may be added in the [constructor](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#constructors-summary), with the [add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#add) or [addMany()](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#addMany) methods, or directly to the layers collection using [add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#add) or [addMany()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#addMany). 
+     * > A [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) may only be added to one parent. Adding the same layer to multiple [Maps](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) or [GroupLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html) is not possible. If you attempt to do so, the layer will automatically be removed from its current parent and placed in the new parent. 
+     * > ```js
+     * > var layer = new GraphicsLayer();
+     * > // The layer belongs to map1
+     * > map1.layers.add(layer);
+     * > // The layer now belongs to map2
+     * > // and implicitly does: map1.layers.remove(layer)
+     * > map2.layers.add(layer);
+     * > ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers)
+     */
     layers: Collection<Layer>;
 
-    add(layers: Layer, index?: number): void;
+    /**
+     * Adds a layer to the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#add)
+     * 
+     * @param layer Layer to be added to the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers).
+     * @param index A layer can be added at a specified index in the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers). If no index is specified or the index specified is greater than the current number of layers, the layer is automatically appended to the list of layers in the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers) and the index is normalized.
+     * 
+     */
+    add(layer: Layer, index?: number): void;
+    /**
+     * Adds a layer or an array of layers to the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#addMany)
+     * 
+     * @param layers Layer(s) to be added to the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers).
+     * @param index A layer can be added at a specified index in the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers). If no index is specified or the index specified is greater than the current number of layers, the layer is automatically appended to the list of layers in the [layers collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers) and the index is normalized.
+     * 
+     */
     addMany(layers: Layer[], index?: number): void;
+    /**
+     * Returns a layer based on the given layer id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#findLayerById)
+     * 
+     * @param layerId The ID assigned to the layer.
+     * 
+     */
     findLayerById(layerId: string): Layer;
+    /**
+     * Removes the specified layer from the layers collection.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#remove)
+     * 
+     * @param layer Layer to remove from the layers collection.
+     * 
+     */
     remove(layer: Layer): Layer;
+    /**
+     * Removes all layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#removeAll)
+     * 
+     * 
+     */
     removeAll(): Layer[];
+    /**
+     * Removes the specified layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#removeMany)
+     * 
+     * @param layers Array of layers to remove from the layers collection.
+     * 
+     */
     removeMany(layers: Layer[]): Layer[];
+    /**
+     * Changes the layer order. The first layer added is always the base layer, even if its order is changed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#reorder)
+     * 
+     * @param layer The layer to be moved.
+     * @param index The index location for placing the layer. The bottom-most layer has an index of `0`.
+     * 
+     */
     reorder(layer: Layer, index: number): Layer;
   }
 
   interface LayersMixinConstructor {
+
+
     new(): LayersMixin;
   }
 
   export const LayersMixin: LayersMixinConstructor;
 
   interface LayersMixinProperties {
-    layers?: CollectionProperties<LayerProperties>;
+    /**
+     * A collection of operational [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html). This property only contains interactive operational layers, such as [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), [WebTileLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html) and {@link module:esri/layers/GraphicsLayer GraphicsLayers}  that may be queried, assigned different renderers, analyzed, etc. It does not include [basemaps](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html).  A [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) is a collection of one or more features, or {@link module:esri/Graphic graphics}, that represent real-world phenomena. Each feature contains a {@link module:esri/symbols/Symbol symbol}  and [geographic data](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) that allows it to be rendered on the map as a graphic with spatial context. Features within the layer may also contain data attributes that provide additional information that may be viewed in [popup windows](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) and used for {@link module:esri/renderers/Renderer rendering the layer}.  Layers may be added in the [constructor](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#constructors-summary), with the [add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#add) or [addMany()](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#addMany) methods, or directly to the layers collection using [add()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#add) or [addMany()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#addMany). 
+     * > A [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html) may only be added to one parent. Adding the same layer to multiple [Maps](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) or [GroupLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GroupLayer.html) is not possible. If you attempt to do so, the layer will automatically be removed from its current parent and placed in the new parent. 
+     * > ```js
+     * > var layer = new GraphicsLayer();
+     * > // The layer belongs to map1
+     * > map1.layers.add(layer);
+     * > // The layer now belongs to map2
+     * > // and implicitly does: map1.layers.remove(layer)
+     * > map2.layers.add(layer);
+     * > ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-LayersMixin.html#layers)
+     */
+    layers?: CollectionProperties<LayerProperties> | LayerProperties[];
   }
 
   interface Callout3D extends Accessor, JSONSupport {
+    /**
+     * Creates a deep clone of the callout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html#clone)
+     * 
+     * 
+     */
     clone(): Callout3D;
   }
 
   interface Callout3DConstructor {
+    /**
+     * When symbols have an offset from their position, it's important to still see what the real location is. This can be achieved with callouts:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-Callout3D.html)
+     */
+
     new(properties?: Callout3DProperties): Callout3D;
 
     fromJSON(json: any): Callout3D;
@@ -5097,15 +21709,52 @@ declare namespace __esri {
   }
 
   interface LineCallout3D extends Callout3D {
+    /**
+     * The border settings of the callout line. The border of the callout line can be used to improve the contrast of the callout line color against various background colors. If the border is `null`, then no border will be visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#border)
+     */
     border: LineCallout3DBorder;
+    /**
+     * The color of the callout line. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#color)
+     * 
+     * @default black
+     */
     color: Color;
+    /**
+     * The width of the callout line in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#size)
+     * 
+     * @default 1px
+     */
     size: number;
+    /**
+     * For LineCallout3D the type is always `line`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#type)
+     */
     type: string;
 
+    /**
+     * Creates a deep clone of the callout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#clone)
+     * 
+     * 
+     */
     clone(): LineCallout3D;
   }
 
   interface LineCallout3DConstructor {
+    /**
+     * This type of callout displays a line to connect a symbol or a label with its actual location in the scene. For example when displaying points of interest in a city, visualizing them with a callout line helps to understand where the points are actually located:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html)
+     */
+
     new(properties?: LineCallout3DProperties): LineCallout3D;
 
     fromJSON(json: any): LineCallout3D;
@@ -5114,26 +21763,92 @@ declare namespace __esri {
   export const LineCallout3D: LineCallout3DConstructor;
 
   interface LineCallout3DProperties extends Callout3DProperties {
+    /**
+     * The border settings of the callout line. The border of the callout line can be used to improve the contrast of the callout line color against various background colors. If the border is `null`, then no border will be visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#border)
+     */
     border?: LineCallout3DBorderProperties;
-    color?: Color;
-    size?: number;
+    /**
+     * The color of the callout line. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#color)
+     * 
+     * @default black
+     */
+    color?: Color | number[] | string;
+    /**
+     * The width of the callout line in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#size)
+     * 
+     * @default 1px
+     */
+    size?: number | string;
+    /**
+     * For LineCallout3D the type is always `line`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#type)
+     */
     type?: string;
   }
 
-  export interface LineCallout3DBorderProperties {
+
+  export interface LineCallout3DBorderProperties extends Object {
+    /**
+     * The color of the callout line border. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#border)
+     * 
+     * @default white
+     */
     color?: Color;
   }
-  export interface LineCallout3DBorder extends Accessor {
+
+  export interface LineCallout3DBorder extends AnonymousAccessor {
+    /**
+     * The color of the callout line border. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html#border)
+     * 
+     * @default white
+     */
     color?: Color;
   }
 
   interface ExtrudeSymbol3DLayer extends Symbol3DLayer {
+    /**
+     * The height of the extrusion in meters. Negative values will extrude the polygon surface downward towards or below the ground.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html#size)
+     * 
+     * @default 1
+     */
     size: number;
+    /**
+     * For ExtrudeSymbol3DLayer the type is always `extrude`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html#type)
+     */
+    readonly type: "extrude";
 
+    /**
+     * Creates a deep clone of the symbol layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html#clone)
+     * 
+     * 
+     */
     clone(): ExtrudeSymbol3DLayer;
   }
 
   interface ExtrudeSymbol3DLayerConstructor {
+    /**
+     * ExtrudeSymbol3DLayer is used to render [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries by extruding them upward from the ground, creating a 3D volumetric object. This is done with a [PolygonSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PolygonSymbol3D.html) in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) does not support 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html)
+     */
+
     new(properties?: ExtrudeSymbol3DLayerProperties): ExtrudeSymbol3DLayer;
 
     fromJSON(json: any): ExtrudeSymbol3DLayer;
@@ -5142,14 +21857,32 @@ declare namespace __esri {
   export const ExtrudeSymbol3DLayer: ExtrudeSymbol3DLayerConstructor;
 
   interface ExtrudeSymbol3DLayerProperties extends Symbol3DLayerProperties {
+    /**
+     * The height of the extrusion in meters. Negative values will extrude the polygon surface downward towards or below the ground.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ExtrudeSymbol3DLayer.html#size)
+     * 
+     * @default 1
+     */
     size?: number;
   }
 
   interface FillSymbol extends Symbol {
+    /**
+     * The outline of the polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html#outline)
+     */
     outline: SimpleLineSymbol;
   }
 
   interface FillSymbolConstructor {
+    /**
+     * Fill symbols are used to draw [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) graphics in a [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html) or a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) in a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). To create new fill symbols, use either [SimpleFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html) or [PictureFillSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html)
+     */
+
     new(properties?: FillSymbolProperties): FillSymbol;
 
     fromJSON(json: any): FillSymbol;
@@ -5158,16 +21891,45 @@ declare namespace __esri {
   export const FillSymbol: FillSymbolConstructor;
 
   interface FillSymbolProperties extends SymbolProperties {
+    /**
+     * The outline of the polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html#outline)
+     */
     outline?: SimpleLineSymbolProperties;
   }
 
   interface FillSymbol3DLayer extends Symbol3DLayer {
+    /**
+     * The outline used to draw a line around the filled geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#outline)
+     */
     outline: FillSymbol3DLayerOutline;
+    /**
+     * For FillSymbol3DLayer the type is always `fill`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#type)
+     */
+    readonly type: "fill";
 
+    /**
+     * Creates a deep clone of the symbol layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#clone)
+     * 
+     * 
+     */
     clone(): FillSymbol3DLayer;
   }
 
   interface FillSymbol3DLayerConstructor {
+    /**
+     * FillSymbol3DLayer is used to render the surfaces of flat 2D [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries and 3D volumetric meshes in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) does not support 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html)
+     */
+
     new(properties?: FillSymbol3DLayerProperties): FillSymbol3DLayer;
 
     fromJSON(json: any): FillSymbol3DLayer;
@@ -5176,19 +21938,63 @@ declare namespace __esri {
   export const FillSymbol3DLayer: FillSymbol3DLayerConstructor;
 
   interface FillSymbol3DLayerProperties extends Symbol3DLayerProperties {
-    outline?: FillSymbol3DLayerOutline;
+    /**
+     * The outline used to draw a line around the filled geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#outline)
+     */
+    outline?: FillSymbol3DLayerOutlineProperties;
   }
 
-  export interface FillSymbol3DLayerOutline {
+
+  export interface FillSymbol3DLayerOutlineProperties extends Object {
+    /**
+     * The color of the outline. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#outline)
+     */
+    color?: Color | number[] | string;
+    /**
+     * The width of the outline in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#outline)
+     */
+    size?: number | string;
+  }
+
+  export interface FillSymbol3DLayerOutline extends AnonymousAccessor {
+    /**
+     * The color of the outline. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#outline)
+     */
     color: Color;
+    /**
+     * The width of the outline in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol3DLayer.html#outline)
+     */
     size: number;
   }
 
   interface Font extends Accessor, JSONSupport {
+    /**
+     * Creates a deep clone of the font object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#clone)
+     * 
+     * 
+     */
     clone(): Font;
   }
 
   interface FontConstructor {
+    /**
+     * The font used to display [text symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html) added to the [graphics layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html)
+     */
+
     new(properties?: FontProperties): Font;
 
     fromJSON(json: any): Font;
@@ -5201,15 +22007,60 @@ declare namespace __esri {
   }
 
   interface IconSymbol3DLayer extends Symbol3DLayer {
+    /**
+     * The positioning of the icon relative to the geometry.  **Possible values:** center | left | right | top | bottom | top-left | top-right | bottom-left | bottom-right
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#anchor)
+     * 
+     * @default center
+     */
     anchor: string;
+    /**
+     * The outline of the icon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#outline)
+     */
     outline: IconSymbol3DLayerOutline;
+    /**
+     * The shape (`primitive`) or image URL (`href`) used to visualize the features. If both properties are present, `href` takes precedence and `primitive` is ignored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#resource)
+     * 
+     * @default { primitive: "circle" }
+     */
     resource: IconSymbol3DLayerResource;
+    /**
+     * The size of the icon in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#size)
+     * 
+     * @default 12
+     */
     size: number;
+    /**
+     * For IconSymbol3DLayer the type is always `icon`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#type)
+     */
+    readonly type: "icon";
 
+    /**
+     * Creates a deep clone of the symbol layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#clone)
+     * 
+     * 
+     */
     clone(): IconSymbol3DLayer;
   }
 
   interface IconSymbol3DLayerConstructor {
+    /**
+     * IconSymbol3DLayer is used to render [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries using a flat 2D icon (e.g. a circle) with a [PointSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html) in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) does not support 3D symbols. [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) features may also be rendered with IconSymbol3DLayers, but the icon symbol layer must be contained within a [PolygonSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PolygonSymbol3D.html), not a [PointSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html) in that scenario.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html)
+     */
+
     new(properties?: IconSymbol3DLayerProperties): IconSymbol3DLayer;
 
     fromJSON(json: any): IconSymbol3DLayer;
@@ -5218,30 +22069,139 @@ declare namespace __esri {
   export const IconSymbol3DLayer: IconSymbol3DLayerConstructor;
 
   interface IconSymbol3DLayerProperties extends Symbol3DLayerProperties {
+    /**
+     * The positioning of the icon relative to the geometry.  **Possible values:** center | left | right | top | bottom | top-left | top-right | bottom-left | bottom-right
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#anchor)
+     * 
+     * @default center
+     */
     anchor?: string;
-    outline?: IconSymbol3DLayerOutline;
+    /**
+     * The outline of the icon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#outline)
+     */
+    outline?: IconSymbol3DLayerOutlineProperties;
+    /**
+     * The shape (`primitive`) or image URL (`href`) used to visualize the features. If both properties are present, `href` takes precedence and `primitive` is ignored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#resource)
+     * 
+     * @default { primitive: "circle" }
+     */
     resource?: IconSymbol3DLayerResource;
-    size?: number;
+    /**
+     * The size of the icon in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#size)
+     * 
+     * @default 12
+     */
+    size?: number | string;
   }
 
-  export interface IconSymbol3DLayerOutline {
+
+  export interface IconSymbol3DLayerOutlineProperties extends Object {
+    /**
+     * The color of the outline. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#outline)
+     * 
+     * @default black
+     */
+    color?: Color | number[] | string;
+    /**
+     * The width of the outline in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#outline)
+     * 
+     * @default 1.125
+     */
+    size?: number | string;
+  }
+
+  export interface IconSymbol3DLayerOutline extends AnonymousAccessor {
+    /**
+     * The color of the outline. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#outline)
+     * 
+     * @default black
+     */
     color?: Color;
+    /**
+     * The width of the outline in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#outline)
+     * 
+     * @default 1.125
+     */
     size?: number;
   }
 
-  export interface IconSymbol3DLayerResource {
+
+  export interface IconSymbol3DLayerResource extends Object {
+    /**
+     * Uses a built-in shape. See the table below for list of possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * circle | ![s3d-icon-circle](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-icon-circle.png)
+     * square |  ![s3d-icon-square](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-icon-square.png)
+     * cross | ![s3d-icon-cross](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-icon-cross.png)
+     * x | ![s3d-icon-x](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-icon-x.png)
+     * kite | ![s3d-icon-kite](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-icon-kite.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#resource)
+     */
     primitive?: string;
+    /**
+     * The URL or data URI for the image. If the external resource is an SVG then the SVG root node must have a set width and height, otherwise it will not render at the correct size. SVG is not supported in IE11.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-IconSymbol3DLayer.html#resource)
+     */
     href?: string;
   }
 
   interface LabelSymbol3D extends Symbol3D {
+    /**
+     * Settings for adding a callout visualization to the symbol. Callouts are drawn from the point feature location that is being symbolized, to the vertical offset of the symbol. This property has no effect if [verticalOffset](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset) is not set. At the moment only callouts of type `line` are supported. See [LineCallout3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#callout)
+     */
     callout: Callout3D;
+    /**
+     * For LabelSymbol3D the type is always `label-3d`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#type)
+     */
+    readonly type: "label-3d";
+    /**
+     * Shifts the symbol along the vertical world axis by a given height. The height is set in screen space units like points or pixels. For points displayed with a [callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#callout) `verticalOffset` should be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     verticalOffset: LabelSymbol3DVerticalOffset;
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#clone)
+     * 
+     * 
+     */
     clone(): LabelSymbol3D;
   }
 
   interface LabelSymbol3DConstructor {
+    /**
+     * LabelSymbol3D is used to render labels for features from a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This symbol type is not supported in 2D MapViews.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html)
+     */
+
     new(properties?: LabelSymbol3DProperties): LabelSymbol3D;
 
     fromJSON(json: any): LabelSymbol3D;
@@ -5250,27 +22210,89 @@ declare namespace __esri {
   export const LabelSymbol3D: LabelSymbol3DConstructor;
 
   interface LabelSymbol3DProperties extends Symbol3DProperties {
+    /**
+     * Settings for adding a callout visualization to the symbol. Callouts are drawn from the point feature location that is being symbolized, to the vertical offset of the symbol. This property has no effect if [verticalOffset](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset) is not set. At the moment only callouts of type `line` are supported. See [LineCallout3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#callout)
+     */
     callout?: Callout3DProperties;
+    /**
+     * Shifts the symbol along the vertical world axis by a given height. The height is set in screen space units like points or pixels. For points displayed with a [callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#callout) `verticalOffset` should be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     verticalOffset?: LabelSymbol3DVerticalOffsetProperties;
   }
 
-  export interface LabelSymbol3DVerticalOffsetProperties {
+
+  export interface LabelSymbol3DVerticalOffsetProperties extends Object {
+    /**
+     * The vertical symbol offset in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     screenLength?: number;
+    /**
+     * The minimum vertical symbol offset in world units. It acts as a lower bound to avoid the vertical offset becoming too small.  In the following animation the green symbol on the left has `minWorldLength = 20` and for the orange symbol on the right `minWorldLength` has not been set:  ![minWorldLength-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-minWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     minWorldLength?: number;
+    /**
+     * The maximum vertical symbol offset in world units. It acts as an upper bound to avoid vertical offset becoming too big.  In the following animation the green symbols have `maxWorldLength = 50` and orange symbols don't have `maxWorldLength` set:  ![maxWorldLength](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-maxWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     maxWorldLength?: number;
   }
-  export interface LabelSymbol3DVerticalOffset extends Accessor {
+
+  export interface LabelSymbol3DVerticalOffset extends AnonymousAccessor {
+    /**
+     * The vertical symbol offset in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     screenLength: number;
+    /**
+     * The minimum vertical symbol offset in world units. It acts as a lower bound to avoid the vertical offset becoming too small.  In the following animation the green symbol on the left has `minWorldLength = 20` and for the orange symbol on the right `minWorldLength` has not been set:  ![minWorldLength-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-minWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     minWorldLength?: number;
+    /**
+     * The maximum vertical symbol offset in world units. It acts as an upper bound to avoid vertical offset becoming too big.  In the following animation the green symbols have `maxWorldLength = 50` and orange symbols don't have `maxWorldLength` set:  ![maxWorldLength](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-maxWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html#verticalOffset)
+     */
     maxWorldLength?: number;
   }
 
   interface LineSymbol extends Symbol {
+    /**
+     * The color of the symbol. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol.html#color)
+     * 
+     * @default "black"
+     */
     color: Color;
+    /**
+     * The width of the symbol in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol.html#width)
+     * 
+     * @default 0.75
+     */
     width: number;
   }
 
   interface LineSymbolConstructor {
+    /**
+     * Line symbols are used to draw [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) in a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol.html)
+     */
+
     new(properties?: LineSymbolProperties): LineSymbol;
 
     fromJSON(json: any): LineSymbol;
@@ -5279,15 +22301,49 @@ declare namespace __esri {
   export const LineSymbol: LineSymbolConstructor;
 
   interface LineSymbolProperties extends SymbolProperties {
-    color?: Color;
-    width?: number;
+    /**
+     * The color of the symbol. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol.html#color)
+     * 
+     * @default "black"
+     */
+    color?: Color | number[] | string;
+    /**
+     * The width of the symbol in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol.html#width)
+     * 
+     * @default 0.75
+     */
+    width?: number | string;
   }
 
   interface LineSymbol3D extends Symbol3D {
+    /**
+     * For LineSymbol3D the type is always `line-3d`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3D.html#type)
+     */
+    readonly type: "line-3d";
+
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3D.html#clone)
+     * 
+     * 
+     */
     clone(): LineSymbol3D;
   }
 
   interface LineSymbol3DConstructor {
+    /**
+     * LineSymbol3D is used to render features with [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) geometry in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This symbol type is not supported in 2D MapViews.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3D.html)
+     */
+
     new(properties?: LineSymbol3DProperties): LineSymbol3D;
 
     fromJSON(json: any): LineSymbol3D;
@@ -5300,12 +22356,38 @@ declare namespace __esri {
   }
 
   interface LineSymbol3DLayer extends Symbol3DLayer {
+    /**
+     * The width of the line in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html#size)
+     * 
+     * @default 0.75
+     */
     size: number;
+    /**
+     * For LineSymbol3DLayer the type is always `line`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html#type)
+     */
+    readonly type: "line";
 
+    /**
+     * Creates a deep clone of the symbol layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html#clone)
+     * 
+     * 
+     */
     clone(): LineSymbol3DLayer;
   }
 
   interface LineSymbol3DLayerConstructor {
+    /**
+     * LineSymbol3DLayer renders [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) geometries using a flat 2D line with a [LineSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3D.html) in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) does not support 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html)
+     */
+
     new(properties?: LineSymbol3DLayerProperties): LineSymbol3DLayer;
 
     fromJSON(json: any): LineSymbol3DLayer;
@@ -5314,16 +22396,53 @@ declare namespace __esri {
   export const LineSymbol3DLayer: LineSymbol3DLayerConstructor;
 
   interface LineSymbol3DLayerProperties extends Symbol3DLayerProperties {
-    size?: number;
+    /**
+     * The width of the line in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3DLayer.html#size)
+     * 
+     * @default 0.75
+     */
+    size?: number | string;
   }
 
   interface MarkerSymbol extends Symbol {
+    /**
+     * The angle of the marker in degrees. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html#angle)
+     * 
+     * @default 0
+     */
     angle: number;
+    /**
+     * The offset on the x-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html#xoffset)
+     * 
+     * @default 0
+     */
     xoffset: number;
+    /**
+     * The offset on the y-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html#yoffset)
+     * 
+     * @default 0
+     */
     yoffset: number;
   }
 
   interface MarkerSymbolConstructor {
+    /**
+     * Marker symbols are used to draw [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) graphics in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or individual [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). To create new marker symbols, use either [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html) or [PictureMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html)
+     */
+
     new(properties?: MarkerSymbolProperties): MarkerSymbol;
 
     fromJSON(json: any): MarkerSymbol;
@@ -5332,16 +22451,60 @@ declare namespace __esri {
   export const MarkerSymbol: MarkerSymbolConstructor;
 
   interface MarkerSymbolProperties extends SymbolProperties {
+    /**
+     * The angle of the marker in degrees. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html#angle)
+     * 
+     * @default 0
+     */
     angle?: number;
-    xoffset?: number;
-    yoffset?: number;
+    /**
+     * The offset on the x-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html#xoffset)
+     * 
+     * @default 0
+     */
+    xoffset?: number | string;
+    /**
+     * The offset on the y-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html#yoffset)
+     * 
+     * @default 0
+     */
+    yoffset?: number | string;
   }
 
   interface MeshSymbol3D extends Symbol3D {
+    /**
+     * For MeshSymbol3D, the type is always `mesh-3d`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MeshSymbol3D.html#type)
+     */
+    readonly type: "mesh-3d";
+
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MeshSymbol3D.html#clone)
+     * 
+     * 
+     */
     clone(): MeshSymbol3D;
   }
 
   interface MeshSymbol3DConstructor {
+    /**
+     * MeshSymbol3D is used to render 3D mesh features in a [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This symbol type is not supported in 2D MapViews.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MeshSymbol3D.html)
+     */
+
     new(properties?: MeshSymbol3DProperties): MeshSymbol3D;
 
     fromJSON(json: any): MeshSymbol3D;
@@ -5354,19 +22517,88 @@ declare namespace __esri {
   }
 
   interface ObjectSymbol3DLayer extends Symbol3DLayer {
+    /**
+     * The positioning of the object relative to the geometry. `origin` is only valid when an `href` resource is specified and uses the pivot point defined by the 3D model.  **Possible Values:** center | top | bottom | origin
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#anchor)
+     * 
+     * @default center
+     */
     anchor: string;
+    /**
+     * The depth, or diameter from north to south, of the object in meters. If `undefined`, the depth will be calculated to maintain the original proportions of the object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#depth)
+     * 
+     * @default 10
+     */
     depth: number;
+    /**
+     * The clockwise rotation of the symbol in the horizontal plane (i.e., around the z axis). The rotation is specified in degrees and is relative to the y-axis.  If the symbol resource is aligned such that its forward facing side points in the direction of the y-axis (the y-axis always points North in WGS84 or WebMercator coordinates), its upwards facing side is pointing in the direction of the z-axis, and its right-hand side points in the direction of the x-axis (the x-axis always points East in WGS84 or WebMercator coordinates), then this angle corresponds to the heading of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#heading)
+     */
     heading: number;
+    /**
+     * The height of the object in meters. If `undefined`, the height will be calculated to maintain the original proportions of the object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#height)
+     * 
+     * @default 10
+     */
     height: number;
+    /**
+     * The primitive shape (`primitive`) or external 3D model (`href`) used to visualize the points. If both properties are present, `primitive` takes precedence and `href` is ignored. When using the `href` property, external 3D models must be present in a specific format, which can be generated using the ArcGIS Pro SDK. [See these instructions](https://github.com/Esri/arcgis-pro-sdk-community-samples/tree/master/Map-Authoring/ExportWeb3DObjectResource#exportweb3dobjectresource) to learn how to generate a custom 3D model for use in this property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#resource)
+     * 
+     * @default { primitive: "sphere" }
+     */
     resource: ObjectSymbol3DLayerResource;
+    /**
+     * The rotation of the symbol in the lateral vertical plane (i.e., around the y axis). The rotation is specified in degrees and is relative to the x-axis. At 0 degrees, the model is level. A positive value lifts the left part and lowers the right part of the model.  If the symbol resource is aligned such that its forward facing side points in the direction of the y-axis (the y-axis always points North in WGS84 or WebMercator coordinates), its upwards facing side is pointing in the direction of the z-axis, and its right-hand side points in the direction of the x-axis (the x-axis always points East in WGS84 or WebMercator coordinates), then this angle corresponds to the roll of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#roll)
+     */
     roll: number;
+    /**
+     * The rotation of the symbol in the longitudinal vertical plane (i.e., around the x axis). The rotation is specified in degrees and is relative to the y-axis. At 0 degrees, the model is level. A positive value points lifts the front and lowers the back of the model.  If the symbol resource is aligned such that its forward facing side points in the direction of the y-axis (the y-axis always points North in WGS84 or WebMercator coordinates), its upwards facing side is pointing in the direction of the z-axis, and its right-hand side points in the direction of the x-axis (the x-axis always points East in WGS84 or WebMercator coordinates), then this angle corresponds to the tilt of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#tilt)
+     */
     tilt: number;
+    /**
+     * For ObjectSymbol3DLayer the type is always `object`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#type)
+     */
+    readonly type: "object";
+    /**
+     * The width, or diameter from east to west, of the object in meters. If `undefined`, the width will be calculated to maintain the original proportions of the object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#width)
+     * 
+     * @default 10
+     */
     width: number;
 
+    /**
+     * Creates a deep clone of the symbol layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#clone)
+     * 
+     * 
+     */
     clone(): ObjectSymbol3DLayer;
   }
 
   interface ObjectSymbol3DLayerConstructor {
+    /**
+     * ObjectSymbol3DLayer is used to render [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries using a volumetric 3D shape (e.g., a sphere or cylinder) with a [PointSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html) in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) does not support 3D symbols. [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) features may also be rendered with ObjectSymbol3DLayers, but the object symbol layer must be contained in a [PolygonSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PolygonSymbol3D.html), not a [PointSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html) in this scenario.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html)
+     */
+
     new(properties?: ObjectSymbol3DLayerProperties): ObjectSymbol3DLayer;
 
     fromJSON(json: any): ObjectSymbol3DLayer;
@@ -5375,28 +22607,126 @@ declare namespace __esri {
   export const ObjectSymbol3DLayer: ObjectSymbol3DLayerConstructor;
 
   interface ObjectSymbol3DLayerProperties extends Symbol3DLayerProperties {
+    /**
+     * The positioning of the object relative to the geometry. `origin` is only valid when an `href` resource is specified and uses the pivot point defined by the 3D model.  **Possible Values:** center | top | bottom | origin
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#anchor)
+     * 
+     * @default center
+     */
     anchor?: string;
+    /**
+     * The depth, or diameter from north to south, of the object in meters. If `undefined`, the depth will be calculated to maintain the original proportions of the object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#depth)
+     * 
+     * @default 10
+     */
     depth?: number;
+    /**
+     * The clockwise rotation of the symbol in the horizontal plane (i.e., around the z axis). The rotation is specified in degrees and is relative to the y-axis.  If the symbol resource is aligned such that its forward facing side points in the direction of the y-axis (the y-axis always points North in WGS84 or WebMercator coordinates), its upwards facing side is pointing in the direction of the z-axis, and its right-hand side points in the direction of the x-axis (the x-axis always points East in WGS84 or WebMercator coordinates), then this angle corresponds to the heading of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#heading)
+     */
     heading?: number;
+    /**
+     * The height of the object in meters. If `undefined`, the height will be calculated to maintain the original proportions of the object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#height)
+     * 
+     * @default 10
+     */
     height?: number;
+    /**
+     * The primitive shape (`primitive`) or external 3D model (`href`) used to visualize the points. If both properties are present, `primitive` takes precedence and `href` is ignored. When using the `href` property, external 3D models must be present in a specific format, which can be generated using the ArcGIS Pro SDK. [See these instructions](https://github.com/Esri/arcgis-pro-sdk-community-samples/tree/master/Map-Authoring/ExportWeb3DObjectResource#exportweb3dobjectresource) to learn how to generate a custom 3D model for use in this property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#resource)
+     * 
+     * @default { primitive: "sphere" }
+     */
     resource?: ObjectSymbol3DLayerResource;
+    /**
+     * The rotation of the symbol in the lateral vertical plane (i.e., around the y axis). The rotation is specified in degrees and is relative to the x-axis. At 0 degrees, the model is level. A positive value lifts the left part and lowers the right part of the model.  If the symbol resource is aligned such that its forward facing side points in the direction of the y-axis (the y-axis always points North in WGS84 or WebMercator coordinates), its upwards facing side is pointing in the direction of the z-axis, and its right-hand side points in the direction of the x-axis (the x-axis always points East in WGS84 or WebMercator coordinates), then this angle corresponds to the roll of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#roll)
+     */
     roll?: number;
+    /**
+     * The rotation of the symbol in the longitudinal vertical plane (i.e., around the x axis). The rotation is specified in degrees and is relative to the y-axis. At 0 degrees, the model is level. A positive value points lifts the front and lowers the back of the model.  If the symbol resource is aligned such that its forward facing side points in the direction of the y-axis (the y-axis always points North in WGS84 or WebMercator coordinates), its upwards facing side is pointing in the direction of the z-axis, and its right-hand side points in the direction of the x-axis (the x-axis always points East in WGS84 or WebMercator coordinates), then this angle corresponds to the tilt of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#tilt)
+     */
     tilt?: number;
+    /**
+     * The width, or diameter from east to west, of the object in meters. If `undefined`, the width will be calculated to maintain the original proportions of the object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#width)
+     * 
+     * @default 10
+     */
     width?: number;
   }
 
-  export interface ObjectSymbol3DLayerResource {
+
+  export interface ObjectSymbol3DLayerResource extends Object {
+    /**
+     * Uses a built-in shape. See the table below for possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * sphere | ![s3d-object-sphere](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-sphere.png)
+     * cylinder | ![s3d-object-cylinder](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-cylinder.png)
+     * cube | ![s3d-object-cube](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-cube.png)
+     * cone | ![s3d-object-cone](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-cone.png)
+     * inverted-cone | ![s3d-object-inverted-cone](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-inverted-cone.png)
+     * diamond | ![s3d-object-diamond](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-diamond.png)
+     * tetrahedron | ![s3d-object-tetrahedron](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-tetrahedron.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#resource)
+     */
     primitive?: string;
+    /**
+     * The URL to the 3D model. [See these instructions](https://github.com/Esri/arcgis-pro-sdk-community-samples/tree/master/Map-Authoring/ExportWeb3DObjectResource#exportweb3dobjectresource) to learn how to create a custom 3D model.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-ObjectSymbol3DLayer.html#resource)
+     */
     href?: string;
   }
 
   interface PathSymbol3DLayer extends Symbol3DLayer {
+    /**
+     * The diameter of the tube in meters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html#size)
+     * 
+     * @default 1
+     */
     size: number;
+    /**
+     * For PathSymbol3DLayer, the type is always `path`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html#type)
+     */
+    readonly type: "path";
 
+    /**
+     * Creates a deep clone of the symbol layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html#clone)
+     * 
+     * 
+     */
     clone(): PathSymbol3DLayer;
   }
 
   interface PathSymbol3DLayerConstructor {
+    /**
+     * PathSymbol3DLayer renders [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) geometries using a volumetric 3D tube with a [LineSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LineSymbol3D.html) in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) does not support 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html)
+     */
+
     new(properties?: PathSymbol3DLayerProperties): PathSymbol3DLayer;
 
     fromJSON(json: any): PathSymbol3DLayer;
@@ -5405,22 +22735,95 @@ declare namespace __esri {
   export const PathSymbol3DLayer: PathSymbol3DLayerConstructor;
 
   interface PathSymbol3DLayerProperties extends Symbol3DLayerProperties {
+    /**
+     * The diameter of the tube in meters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PathSymbol3DLayer.html#size)
+     * 
+     * @default 1
+     */
     size?: number;
   }
 
   interface PictureFillSymbol extends FillSymbol {
+    /**
+     * The height of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#height)
+     * 
+     * @default 12
+     */
     height: number;
+    /**
+     * For PictureFillSymbol the type is always `picture-fill`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#type)
+     */
+    readonly type: "picture-fill";
+    /**
+     * The URL to the image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#url)
+     */
     url: string;
+    /**
+     * The width of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#width)
+     * 
+     * @default 12
+     */
     width: number;
+    /**
+     * The offset on the x-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#xoffset)
+     * 
+     * @default 0
+     */
     xoffset: number;
+    /**
+     * The scale factor on the x axis of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#xscale)
+     * 
+     * @default 1
+     */
     xscale: number;
+    /**
+     * The offset on the y-axis in pixels or points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#yoffset)
+     * 
+     * @default 0
+     */
     yoffset: number;
+    /**
+     * The scale factor on the y axis of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#yscale)
+     * 
+     * @default 1
+     */
     yscale: number;
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#clone)
+     * 
+     * 
+     */
     clone(): PictureFillSymbol;
   }
 
   interface PictureFillSymbolConstructor {
+    /**
+     * PictureFillSymbol uses an image in a repeating pattern to symbolize polygon features in a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). A [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#url) must point to a valid image. In addition, the symbol can have an optional [outline](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#outline), which is defined by a [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html). PictureFillSymbols may be applied to polygon features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or an individual [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html)
+     */
+
     new(properties?: PictureFillSymbolProperties): PictureFillSymbol;
 
     fromJSON(json: any): PictureFillSymbol;
@@ -5429,24 +22832,112 @@ declare namespace __esri {
   export const PictureFillSymbol: PictureFillSymbolConstructor;
 
   interface PictureFillSymbolProperties extends FillSymbolProperties {
-    height?: number;
+    /**
+     * The height of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#height)
+     * 
+     * @default 12
+     */
+    height?: number | string;
+    /**
+     * The URL to the image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#url)
+     */
     url?: string;
-    width?: number;
-    xoffset?: number;
+    /**
+     * The width of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#width)
+     * 
+     * @default 12
+     */
+    width?: number | string;
+    /**
+     * The offset on the x-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#xoffset)
+     * 
+     * @default 0
+     */
+    xoffset?: number | string;
+    /**
+     * The scale factor on the x axis of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#xscale)
+     * 
+     * @default 1
+     */
     xscale?: number;
-    yoffset?: number;
+    /**
+     * The offset on the y-axis in pixels or points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#yoffset)
+     * 
+     * @default 0
+     */
+    yoffset?: number | string;
+    /**
+     * The scale factor on the y axis of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureFillSymbol.html#yscale)
+     * 
+     * @default 1
+     */
     yscale?: number;
   }
 
   interface PictureMarkerSymbol extends MarkerSymbol {
+    /**
+     * The height of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#height)
+     * 
+     * @default 12
+     */
     height: number;
+    /**
+     * For PictureMarkerSymbol the type is always `picture-marker`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#type)
+     */
+    readonly type: "picture-marker";
+    /**
+     * The URL to the image. To avoid CORS issues with this symbol, do one of the following: 
+     *   * Use an image hosted on the same domain as the application.
+     *   * If the image is on a different domain and that server is CORS enabled, add the domain to the [corsEnabledServers](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request) array.
+     *   * Install a proxy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#url)
+     */
     url: string;
+    /**
+     * The width of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#width)
+     * 
+     * @default 12
+     */
     width: number;
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#clone)
+     * 
+     * 
+     */
     clone(): PictureMarkerSymbol;
   }
 
   interface PictureMarkerSymbolConstructor {
+    /**
+     * PictureMarkerSymbol renders [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) graphics in either a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) using an image. A [url](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#url) must point to a valid image. PictureMarkerSymbols may be applied to point features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or individual [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). The image below depicts a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) whose point features are styled with a [PictureMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html)
+     */
+
     new(properties?: PictureMarkerSymbolProperties): PictureMarkerSymbol;
 
     fromJSON(json: any): PictureMarkerSymbol;
@@ -5455,19 +22946,70 @@ declare namespace __esri {
   export const PictureMarkerSymbol: PictureMarkerSymbolConstructor;
 
   interface PictureMarkerSymbolProperties extends MarkerSymbolProperties {
-    height?: number;
+    /**
+     * The height of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#height)
+     * 
+     * @default 12
+     */
+    height?: number | string;
+    /**
+     * The URL to the image. To avoid CORS issues with this symbol, do one of the following: 
+     *   * Use an image hosted on the same domain as the application.
+     *   * If the image is on a different domain and that server is CORS enabled, add the domain to the [corsEnabledServers](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request) array.
+     *   * Install a proxy.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#url)
+     */
     url?: string;
-    width?: number;
+    /**
+     * The width of the image in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html#width)
+     * 
+     * @default 12
+     */
+    width?: number | string;
   }
 
   interface PointSymbol3D extends Symbol3D {
+    /**
+     * Settings for adding a callout visualization to the symbol. Callouts are drawn from the point feature location that is being symbolized, to the vertical offset of the symbol. This property has no effect if [verticalOffset](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset) is not set. At the moment only callouts of type line are supported. See [LineCallout3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#callout)
+     */
     callout: Callout3D;
+    /**
+     * For PointSymbol3D the type is always `point-3d`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#type)
+     */
+    readonly type: "point-3d";
+    /**
+     * Shifts the symbol along the vertical world axis by a given height. The height is set in screen space units like points or pixels. For points displayed with a [callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#callout) `verticalOffset` should be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     verticalOffset: PointSymbol3DVerticalOffset;
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#clone)
+     * 
+     * 
+     */
     clone(): PointSymbol3D;
   }
 
   interface PointSymbol3DConstructor {
+    /**
+     * PointSymbol3D is used to render features with [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometry in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This symbol type is not supported in 2D MapViews.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html)
+     */
+
     new(properties?: PointSymbol3DProperties): PointSymbol3D;
 
     fromJSON(json: any): PointSymbol3D;
@@ -5476,26 +23018,88 @@ declare namespace __esri {
   export const PointSymbol3D: PointSymbol3DConstructor;
 
   interface PointSymbol3DProperties extends Symbol3DProperties {
+    /**
+     * Settings for adding a callout visualization to the symbol. Callouts are drawn from the point feature location that is being symbolized, to the vertical offset of the symbol. This property has no effect if [verticalOffset](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset) is not set. At the moment only callouts of type line are supported. See [LineCallout3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#callout)
+     */
     callout?: Callout3DProperties;
+    /**
+     * Shifts the symbol along the vertical world axis by a given height. The height is set in screen space units like points or pixels. For points displayed with a [callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#callout) `verticalOffset` should be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     verticalOffset?: PointSymbol3DVerticalOffsetProperties;
   }
 
-  export interface PointSymbol3DVerticalOffsetProperties {
+
+  export interface PointSymbol3DVerticalOffsetProperties extends Object {
+    /**
+     * The vertical symbol offset in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     screenLength?: number;
+    /**
+     * The minimum vertical symbol offset in world units. It acts as a lower bound to avoid vertical offset becoming too small.  In the following animation the green symbol on the left has `minWorldLength = 20` and for the orange symbol on the right `minWorldLength` has not been set:  ![minWorldLength-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-minWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     minWorldLength?: number;
+    /**
+     * The maximum vertical symbol offset in world units. It acts as an upper bound to avoid vertical offset becoming too big.  In the following animation the green symbols have `maxWorldLength = 50` and orange symbols don't have `maxWorldLength` set:  ![maxWorldLength](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-maxWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     maxWorldLength?: number;
   }
-  export interface PointSymbol3DVerticalOffset extends Accessor {
+
+  export interface PointSymbol3DVerticalOffset extends AnonymousAccessor {
+    /**
+     * The vertical symbol offset in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     screenLength: number;
+    /**
+     * The minimum vertical symbol offset in world units. It acts as a lower bound to avoid vertical offset becoming too small.  In the following animation the green symbol on the left has `minWorldLength = 20` and for the orange symbol on the right `minWorldLength` has not been set:  ![minWorldLength-on](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-minWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     minWorldLength?: number;
+    /**
+     * The maximum vertical symbol offset in world units. It acts as an upper bound to avoid vertical offset becoming too big.  In the following animation the green symbols have `maxWorldLength = 50` and orange symbols don't have `maxWorldLength` set:  ![maxWorldLength](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3D-line-callout-maxWorldLength.gif)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html#verticalOffset)
+     */
     maxWorldLength?: number;
   }
 
   interface PolygonSymbol3D extends Symbol3D {
+    /**
+     * For PolygonSymbol3D the type is always `polygon-3d`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PolygonSymbol3D.html#type)
+     */
+    readonly type: "polygon-3d";
+
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PolygonSymbol3D.html#clone)
+     * 
+     * 
+     */
     clone(): PolygonSymbol3D;
   }
 
   interface PolygonSymbol3DConstructor {
+    /**
+     * PolygonSymbol3D is used to render features with [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometry in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This symbol type is not supported in 2D MapViews. Polygon features may also be rendered as points with icons or objects at the centroid of each polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PolygonSymbol3D.html)
+     */
+
     new(properties?: PolygonSymbol3DProperties): PolygonSymbol3D;
 
     fromJSON(json: any): PolygonSymbol3D;
@@ -5508,13 +23112,59 @@ declare namespace __esri {
   }
 
   interface SimpleFillSymbol extends FillSymbol {
+    /**
+     * The color of the symbol. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#color)
+     * 
+     * @default [0, 0, 0, 0.25] - black, semitransparent
+     */
     color: Color;
+    /**
+     * The fill style. Valid values are listed in the table below: 
+     * 
+     * Value | Description
+     * ------|-------------
+     * backward-diagonal | ![sfs-backward-diagonal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-backward-diagonal.png)
+     * cross | ![sfs-cross](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-cross.png)
+     * diagonal-cross | ![sfs-diagonal-cross](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-diagonal-cross.png)
+     * forward-diagonal | ![sfs-forward-diagonal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-forward-diagonal.png)
+     * horizontal | ![sfs-horizontal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-horizontal.png)
+     * none | The polygon has no fill.
+     * solid | ![sfs-solid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-solid.png)
+     * vertical | ![sfs-vertical](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-vertical.png)
+     * 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#style)
+     * 
+     * @default solid
+     */
     style: string;
+    /**
+     * For SimpleFillSymbol the type is always `simple-fill`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#type)
+     */
+    readonly type: "simple-fill";
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#clone)
+     * 
+     * 
+     */
     clone(): SimpleFillSymbol;
   }
 
   interface SimpleFillSymbolConstructor {
+    /**
+     * SimpleFillSymbol is used for rendering 2D polygons in either a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). It can be filled with a solid [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#color), or a [pattern](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#style). In addition, the symbol can have an optional [outline](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#outline), which is defined by a [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html)
+     */
+
     new(properties?: SimpleFillSymbolProperties): SimpleFillSymbol;
 
     fromJSON(json: any): SimpleFillSymbol;
@@ -5523,20 +23173,116 @@ declare namespace __esri {
   export const SimpleFillSymbol: SimpleFillSymbolConstructor;
 
   interface SimpleFillSymbolProperties extends FillSymbolProperties {
-    color?: Color;
+    /**
+     * The color of the symbol. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#color)
+     * 
+     * @default [0, 0, 0, 0.25] - black, semitransparent
+     */
+    color?: Color | number[] | string;
+    /**
+     * The fill style. Valid values are listed in the table below: 
+     * 
+     * Value | Description
+     * ------|-------------
+     * backward-diagonal | ![sfs-backward-diagonal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-backward-diagonal.png)
+     * cross | ![sfs-cross](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-cross.png)
+     * diagonal-cross | ![sfs-diagonal-cross](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-diagonal-cross.png)
+     * forward-diagonal | ![sfs-forward-diagonal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-forward-diagonal.png)
+     * horizontal | ![sfs-horizontal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-horizontal.png)
+     * none | The polygon has no fill.
+     * solid | ![sfs-solid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-solid.png)
+     * vertical | ![sfs-vertical](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sfs-vertical.png)
+     * 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleFillSymbol.html#style)
+     * 
+     * @default solid
+     */
     style?: string;
   }
 
   interface SimpleLineSymbol extends LineSymbol {
+    /**
+     * Specifies the cap style. The cap is the end of a line segment.  **Known Values:** butt | round | square 
+     * > **Known Limitations** 
+     *   * This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * This property does not persist when applied to a symbol used in a layer saved to a web map or portal item. See the [web map specification](https://developers.arcgis.com/web-map-specification/objects/esriSLS_symbol/) for more details about properties that persist when a SimpleLineSymbol is saved to an ArcGIS Online or Portal item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#cap)
+     * 
+     * @default butt
+     */
     cap: string;
+    /**
+     * Specifies the join style.  **Known Values:** miter | round | bevel 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#join)
+     * 
+     * @default miter
+     */
     join: string;
+    /**
+     * Size threshold for showing mitered line joins. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#miterLimit)
+     * 
+     * @default 0.75
+     */
     miterLimit: number;
+    /**
+     * Specifies the line style. Valid values are listed in the table below: 
+     * 
+     * Value | Description
+     * ------|-------------
+     * dash | ![sls-dash](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dash.png)
+     * dash-dot | ![sls-dash-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dash-dot.png)
+     * dot | ![sls-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dot.png)
+     * long-dash | ![sls-long-dash](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-long-dash.png)
+     * long-dash-dot | ![sls-long-dash-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-long-dash-dot.png)
+     * long-dash-dot-dot | ![sls-dash-dot-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dash-dot-dot.png)
+     * none | The line has no symbol.
+     * short-dash | ![sls-short-dash](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dash.png)
+     * short-dash-dot | ![sls-short-dash-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dash-dot.png)
+     * short-dash-dot-dot | ![sls-short-dash-dot-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dash-dot-dot.png)
+     * short-dot | ![sls-short-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dot.png)
+     * solid | ![sls-solid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-solid.png)
+     * 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#style)
+     * 
+     * @default solid
+     */
     style: string;
+    /**
+     * For SimpleLineSymbol, the type is always `simple-line`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#type)
+     */
+    readonly type: "simple-line";
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#clone)
+     * 
+     * 
+     */
     clone(): SimpleLineSymbol;
   }
 
   interface SimpleLineSymbolConstructor {
+    /**
+     * SimpleLineSymbol is used for rendering 2D [polyline geometries](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) in a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). SimpleLineSymbol is also used for rendering outlines for [marker symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html) and [fill symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-FillSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html)
+     */
+
     new(properties?: SimpleLineSymbolProperties): SimpleLineSymbol;
 
     fromJSON(json: any): SimpleLineSymbol;
@@ -5545,23 +23291,134 @@ declare namespace __esri {
   export const SimpleLineSymbol: SimpleLineSymbolConstructor;
 
   interface SimpleLineSymbolProperties extends LineSymbolProperties {
+    /**
+     * Specifies the cap style. The cap is the end of a line segment.  **Known Values:** butt | round | square 
+     * > **Known Limitations** 
+     *   * This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * This property does not persist when applied to a symbol used in a layer saved to a web map or portal item. See the [web map specification](https://developers.arcgis.com/web-map-specification/objects/esriSLS_symbol/) for more details about properties that persist when a SimpleLineSymbol is saved to an ArcGIS Online or Portal item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#cap)
+     * 
+     * @default butt
+     */
     cap?: string;
+    /**
+     * Specifies the join style.  **Known Values:** miter | round | bevel 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#join)
+     * 
+     * @default miter
+     */
     join?: string;
-    miterLimit?: number;
+    /**
+     * Size threshold for showing mitered line joins. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#miterLimit)
+     * 
+     * @default 0.75
+     */
+    miterLimit?: number | string;
+    /**
+     * Specifies the line style. Valid values are listed in the table below: 
+     * 
+     * Value | Description
+     * ------|-------------
+     * dash | ![sls-dash](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dash.png)
+     * dash-dot | ![sls-dash-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dash-dot.png)
+     * dot | ![sls-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dot.png)
+     * long-dash | ![sls-long-dash](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-long-dash.png)
+     * long-dash-dot | ![sls-long-dash-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-long-dash-dot.png)
+     * long-dash-dot-dot | ![sls-dash-dot-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-dash-dot-dot.png)
+     * none | The line has no symbol.
+     * short-dash | ![sls-short-dash](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dash.png)
+     * short-dash-dot | ![sls-short-dash-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dash-dot.png)
+     * short-dash-dot-dot | ![sls-short-dash-dot-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dash-dot-dot.png)
+     * short-dot | ![sls-short-dot](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-short-dot.png)
+     * solid | ![sls-solid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sls-solid.png)
+     * 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html#style)
+     * 
+     * @default solid
+     */
     style?: string;
   }
 
   interface SimpleMarkerSymbol extends MarkerSymbol {
+    /**
+     * The color of the symbol. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object. 
+     * > The `color` property does not apply to marker symbols defined with the `cross` or `x` [style](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#style). Since these styles are wholly comprised of outlines, you must modify the [outline.color](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#outline) property to set the color of symbols with those styles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#color)
+     * 
+     * @default [255, 255, 255, 0.25] - white, semitransparent
+     */
     color: Color;
+    /**
+     * The outline of the marker symbol. The `color` property of this object directly modifies the overall color of marker symbols defined with the `cross` or `x` [style](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#style).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#outline)
+     */
     outline: SimpleLineSymbol;
+    /**
+     * The SVG path of the icon. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#path)
+     */
     path: string;
+    /**
+     * The size of the marker in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#size)
+     * 
+     * @default 12
+     */
     size: number;
+    /**
+     * The marker style. Possible values are in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * circle | ![sms_circle](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-circle.png)
+     * cross | ![sms_cross](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-cross.png)
+     * diamond | ![sms_diamond](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-diamond.png)
+     * square | ![sms_square](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-square.png)
+     * x | ![sms_x](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-x.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#style)
+     * 
+     * @default circle
+     */
     style: string;
+    /**
+     * For SimpleMarkerSymbol the type is always `simple-marker`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#type)
+     */
+    readonly type: "simple-marker";
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#clone)
+     * 
+     * 
+     */
     clone(): SimpleMarkerSymbol;
   }
 
   interface SimpleMarkerSymbolConstructor {
+    /**
+     * SimpleMarkerSymbol is used for rendering 2D [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometries with a simple shape and [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#color) in either a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). It may be filled with a solid [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#color) and have an optional [outline](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#outline), which is defined with a [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html)
+     */
+
     new(properties?: SimpleMarkerSymbolProperties): SimpleMarkerSymbol;
 
     fromJSON(json: any): SimpleMarkerSymbol;
@@ -5570,24 +23427,155 @@ declare namespace __esri {
   export const SimpleMarkerSymbol: SimpleMarkerSymbolConstructor;
 
   interface SimpleMarkerSymbolProperties extends MarkerSymbolProperties {
-    color?: Color;
+    /**
+     * The color of the symbol. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object. 
+     * > The `color` property does not apply to marker symbols defined with the `cross` or `x` [style](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#style). Since these styles are wholly comprised of outlines, you must modify the [outline.color](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#outline) property to set the color of symbols with those styles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#color)
+     * 
+     * @default [255, 255, 255, 0.25] - white, semitransparent
+     */
+    color?: Color | number[] | string;
+    /**
+     * The outline of the marker symbol. The `color` property of this object directly modifies the overall color of marker symbols defined with the `cross` or `x` [style](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#style).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#outline)
+     */
     outline?: SimpleLineSymbolProperties;
+    /**
+     * The SVG path of the icon. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#path)
+     */
     path?: string;
-    size?: number;
+    /**
+     * The size of the marker in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#size)
+     * 
+     * @default 12
+     */
+    size?: number | string;
+    /**
+     * The marker style. Possible values are in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * circle | ![sms_circle](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-circle.png)
+     * cross | ![sms_cross](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-cross.png)
+     * diamond | ![sms_diamond](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-diamond.png)
+     * square | ![sms_square](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-square.png)
+     * x | ![sms_x](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols-sms-x.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html#style)
+     * 
+     * @default circle
+     */
     style?: string;
   }
 
+
   interface symbolsSupportJsonUtils {
+    /**
+     * Creates a new instance of an appropriate [Symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html) class and initializes it with values from a JSON object generated from a product in the ArcGIS platform. The object passed into the input `json` parameter often comes from a response to a query operation in the REST API or a [toJSON()](http://pro.arcgis.com/en/pro-app/tool-reference/conversion/features-to-json.htm) method from another ArcGIS product. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for details and examples of when and how to use this function.  When you create a [MarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html), [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html) or [PictureMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PictureMarkerSymbol.html) from a JSON object, you may specify a property angle to rotate the symbol. Be aware that the angle in the JSON is different from [MarkerSymbol.angle](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-MarkerSymbol.html#angle). The angle in the JSON follows the traditional ArcGIS specification and is rotated counter-clockwise, whereas the angle in the symbol is rotated clockwise.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-jsonUtils.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance in the ArcGIS format. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Symbol_Objects/02r3000000n5000000/) for examples of the structure of various input JSON objects.
+     * 
+     */
     fromJSON(json: any): Symbol;
   }
 
   export const symbolsSupportJsonUtils: symbolsSupportJsonUtils;
 
+
+  interface symbolPreview {
+    /**
+     * Generates a preview image of a given symbol that can be displayed in a custom widget or other DOM element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     * 
+     * @param symbol The symbol for which to generate a preview image.
+     * @param options Formatting options for the symbol preview image.
+     * @param options.node The parent node to append to the symbol.
+     * @param options.size The size of the symbol preview in points.
+     * @param options.maxSize The maximum size of the symbol preview in points.
+     * @param options.opacity The opacity of the layer represented by the `symbol`.
+     * @param options.scale Indicates whether to scale the symbol preview.
+     * @param options.disableUpsampling Indicates whether to disable upsampling for raster images.
+     * @param options.symbolConfig For "tall" symbols in portrait view, then the `tall` value should be used here.
+     * 
+     */
+    renderPreviewHTML(symbol: Symbol, options?: symbolPreviewRenderPreviewHTMLOptions): IPromise<HTMLElement>;
+  }
+
+  export const symbolPreview: symbolPreview;
+
+
+  export interface symbolPreviewRenderPreviewHTMLOptions extends Object {
+    /**
+     * The parent node to append to the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     */
+    node?: HTMLElement;
+    /**
+     * The size of the symbol preview in points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     */
+    size?: number;
+    /**
+     * The maximum size of the symbol preview in points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     */
+    maxSize?: number;
+    /**
+     * The opacity of the layer represented by the `symbol`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     */
+    opacity?: number;
+    /**
+     * Indicates whether to scale the symbol preview.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     */
+    scale?: boolean;
+    /**
+     * Indicates whether to disable upsampling for raster images.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     */
+    disableUpsampling?: boolean;
+    /**
+     * For "tall" symbols in portrait view, then the `tall` value should be used here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-support-symbolPreview.html#renderPreviewHTML)
+     */
+    symbolConfig?: string;
+  }
+
   interface Symbol extends Accessor, JSONSupport {
-    type: string;
+    /**
+     * The symbol type.  **Possible values:** simple-marker | picture-marker | simple-line | cartographic-line-symbol |  simple-fill | picture-fill | text | shield-label-symbol | point-3d | line-3d | polygon-3d | mesh-3d | label-3d
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html#type)
+     */
+    readonly type: string;
   }
 
   interface SymbolConstructor {
+    /**
+     * Symbol is the base class for all symbols. Symbols represent point, line, polygon, and mesh geometries as vector graphics within a [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). They can be set on individual [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#symbol) or in a [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) that is applied to a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html)
+     */
+
     new(properties?: SymbolProperties): Symbol;
 
     fromJSON(json: any): Symbol;
@@ -5596,15 +23584,31 @@ declare namespace __esri {
   export const Symbol: SymbolConstructor;
 
   interface SymbolProperties {
-    type?: string;
+
   }
 
   interface Symbol3D extends Symbol {
-    styleOrigin: Symbol3DStyleOrigin;
+    /**
+     * The origin of the style from which the symbol was originally referenced. A reference to the style origin can be either by styleName or by styleUrl (but not both). This information is part of the WebScene persistence model and may be used to understand where a symbol was originally sourced from. It does not affect actual appearance or rendering of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html#styleOrigin)
+     */
+    readonly styleOrigin: Symbol3DStyleOrigin;
+    /**
+     * A Collection of [Symbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3DLayer.html) objects used to visualize the graphic or feature. Individual symbol layers may be autocast as objects and specified using the `type` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html#symbolLayers)
+     */
     symbolLayers: Collection<Symbol3DLayer>;
   }
 
   interface Symbol3DConstructor {
+    /**
+     * Symbol3D is the base class for all 3D symbols. It is used to render 2D [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), and [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) and 3D mesh features in a [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html). All 3D symbols must be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) instance; there is no support for 3D rendering in [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html)
+     */
+
     new(properties?: Symbol3DProperties): Symbol3D;
 
     fromJSON(json: any): Symbol3D;
@@ -5613,22 +23617,69 @@ declare namespace __esri {
   export const Symbol3D: Symbol3DConstructor;
 
   interface Symbol3DProperties extends SymbolProperties {
-    styleOrigin?: Symbol3DStyleOrigin;
+    /**
+     * A Collection of [Symbol3DLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3DLayer.html) objects used to visualize the graphic or feature. Individual symbol layers may be autocast as objects and specified using the `type` property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html#symbolLayers)
+     */
     symbolLayers?: CollectionProperties<Symbol3DLayerProperties>;
   }
 
-  export interface Symbol3DStyleOrigin {
+
+  export interface Symbol3DStyleOrigin extends Object {
+    /**
+     * a well-known esri-provided style, such as `EsriThematicShapesStyle`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html#styleOrigin)
+     */
     styleName?: string;
+    /**
+     * url to a style definition
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html#styleOrigin)
+     */
     styleUrl?: string;
+    /**
+     * name of the symbol in the style referenced by styleName or styleUrl
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html#styleOrigin)
+     */
     name: string;
   }
 
   interface Symbol3DLayer extends Accessor, JSONSupport {
+    /**
+     * The material used to shade the geometry. For `material` properties, see the documentation of the individual symbol layer classes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3DLayer.html#material)
+     */
     material: any;
-    type: string;
+    /**
+     * The 3D symbol layer type. See the table below for a list of possible values. 
+     * 
+     * Value | Description
+     * ------|------------
+     * icon | ![s3d-icon](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-icon-circle.png)
+     * object | ![s3d-object](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-object-sphere.png)
+     * line | ![s3d-line](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-line-line.png)
+     * path | ![s3d-path](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-path-tube.png)
+     * fill | ![s3d-fill](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-fill-solid.png)
+     * extrusion | ![s3d-extrusion](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-extrude-solid.png)
+     * text | ![s3d-text](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/symbols3d-label-text.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3DLayer.html#type)
+     */
+    readonly type: string;
   }
 
   interface Symbol3DLayerConstructor {
+    /**
+     * Symbol layers are used to define the visualization of [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html), and mesh geometries rendered with [3D symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html). [3D symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html) may only be used to render features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html), or standalone [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). There is no support for 3D symbols in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3DLayer.html)
+     */
+
     new(properties?: Symbol3DLayerProperties): Symbol3DLayer;
 
     fromJSON(json: any): Symbol3DLayer;
@@ -5637,31 +23688,158 @@ declare namespace __esri {
   export const Symbol3DLayer: Symbol3DLayerConstructor;
 
   interface Symbol3DLayerProperties {
+    /**
+     * The material used to shade the geometry. For `material` properties, see the documentation of the individual symbol layer classes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3DLayer.html#material)
+     */
     material?: any;
-    type?: string;
   }
 
   interface TextSymbol extends Symbol {
+    /**
+     * The angle of the text. `0` is horizontal and the angle moves clockwise. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#angle)
+     * 
+     * @default 0
+     */
     angle: number;
+    /**
+     * The background color of the label's bounding box. This property is only supported for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#backgroundColor)
+     */
     backgroundColor: Color;
+    /**
+     * The border color of the label's bounding box. This property is only supported for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#borderLineColor)
+     */
     borderLineColor: Color;
+    /**
+     * The border size or width of the label's bounding box. This property is only supported for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#borderLineSize)
+     */
     borderLineSize: number;
+    /**
+     * The color of the text. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#color)
+     */
     color: Color;
+    /**
+     * The font used to style the text. 
+     * > **Known Limitations**  This property is not fully supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#font)
+     */
     font: Font;
+    /**
+     * The color of the text symbol's halo. To include a halo in the TextSymbol, you must also set the size of the halo in [haloSize](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloSize). 
+     * > **Known Limitations** 
+     *   * Not supported in IE 9 or below.
+     *   * Sub-pixel halo (i.e. fractional size such as 1.25px) renders inconsistently in various browsers.
+     *   * Not supported in [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html), but will be in a future release.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloColor)
+     */
     haloColor: Color;
+    /**
+     * The size in points of the text symbol's halo. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). To include a halo in the TextSymbol, you must also set the color of the halo in [haloColor](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloColor). 
+     * > **Known Limitations** 
+     *   * Not supported in IE 9 or below.
+     *   * Sub-pixel halo (i.e. fractional size such as 1.25px) renders inconsistently in various browsers.
+     *   * Not supported in [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html), but will be in a future release.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloSize)
+     */
     haloSize: number;
+    /**
+     * The horizontal alignment of the text with respect to the graphic.  **Possible Values:** left | right | center | justify 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#horizontalAlignment)
+     * 
+     * @default center
+     */
     horizontalAlignment: string;
+    /**
+     * Determines whether to adjust the spacing between characters in the text string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#kerning)
+     * 
+     * @default true
+     */
     kerning: boolean;
+    /**
+     * Determines whether every character in the text string is rotated. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#rotated)
+     * 
+     * @default false
+     */
     rotated: boolean;
+    /**
+     * The text string to display in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#text)
+     */
     text: string;
+    /**
+     * For TextSymbol, the type is always `text`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#type)
+     */
+    readonly type: "text";
+    /**
+     * The vertical alignment of the text with respect to the graphic.  **Possible Values:** baseline | top | middle | bottom 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#verticalAlignment)
+     * 
+     * @default baseline
+     */
     verticalAlignment: string;
+    /**
+     * The offset on the x-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#xoffset)
+     * 
+     * @default 0
+     */
     xoffset: number;
+    /**
+     * The offset on the y-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#yoffset)
+     * 
+     * @default 0
+     */
     yoffset: number;
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#clone)
+     * 
+     * 
+     */
     clone(): TextSymbol;
   }
 
   interface TextSymbolConstructor {
+    /**
+     * Text symbols are used to define the graphic for displaying labels on a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). With this class, you may alter the [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#color), [font](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#font), [halo](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloSize), and other properties of the label graphic.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html)
+     */
+
     new(properties?: TextSymbolProperties): TextSymbol;
 
     fromJSON(json: any): TextSymbol;
@@ -5670,33 +23848,178 @@ declare namespace __esri {
   export const TextSymbol: TextSymbolConstructor;
 
   interface TextSymbolProperties extends SymbolProperties {
+    /**
+     * The angle of the text. `0` is horizontal and the angle moves clockwise. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#angle)
+     * 
+     * @default 0
+     */
     angle?: number;
-    backgroundColor?: Color;
-    borderLineColor?: Color;
+    /**
+     * The background color of the label's bounding box. This property is only supported for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#backgroundColor)
+     */
+    backgroundColor?: Color | number[] | string;
+    /**
+     * The border color of the label's bounding box. This property is only supported for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#borderLineColor)
+     */
+    borderLineColor?: Color | number[] | string;
+    /**
+     * The border size or width of the label's bounding box. This property is only supported for [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#borderLineSize)
+     */
     borderLineSize?: number;
-    color?: Color;
+    /**
+     * The color of the text. This can be autocast with a named string; hex string; array of rgb or rgba values; an object with `r`, `g`, `b`, and `a` properties; or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#color)
+     */
+    color?: Color | number[] | string;
+    /**
+     * The font used to style the text. 
+     * > **Known Limitations**  This property is not fully supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#font)
+     */
     font?: FontProperties;
+    /**
+     * The color of the text symbol's halo. To include a halo in the TextSymbol, you must also set the size of the halo in [haloSize](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloSize). 
+     * > **Known Limitations** 
+     *   * Not supported in IE 9 or below.
+     *   * Sub-pixel halo (i.e. fractional size such as 1.25px) renders inconsistently in various browsers.
+     *   * Not supported in [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html), but will be in a future release.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloColor)
+     */
     haloColor?: Color;
-    haloSize?: number;
+    /**
+     * The size in points of the text symbol's halo. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). To include a halo in the TextSymbol, you must also set the color of the halo in [haloColor](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloColor). 
+     * > **Known Limitations** 
+     *   * Not supported in IE 9 or below.
+     *   * Sub-pixel halo (i.e. fractional size such as 1.25px) renders inconsistently in various browsers.
+     *   * Not supported in [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html), but will be in a future release.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#haloSize)
+     */
+    haloSize?: number | string;
+    /**
+     * The horizontal alignment of the text with respect to the graphic.  **Possible Values:** left | right | center | justify 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#horizontalAlignment)
+     * 
+     * @default center
+     */
     horizontalAlignment?: string;
+    /**
+     * Determines whether to adjust the spacing between characters in the text string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#kerning)
+     * 
+     * @default true
+     */
     kerning?: boolean;
+    /**
+     * Determines whether every character in the text string is rotated. 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#rotated)
+     * 
+     * @default false
+     */
     rotated?: boolean;
+    /**
+     * The text string to display in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#text)
+     */
     text?: string;
+    /**
+     * The vertical alignment of the text with respect to the graphic.  **Possible Values:** baseline | top | middle | bottom 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#verticalAlignment)
+     * 
+     * @default baseline
+     */
     verticalAlignment?: string;
-    xoffset?: number;
-    yoffset?: number;
+    /**
+     * The offset on the x-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#xoffset)
+     * 
+     * @default 0
+     */
+    xoffset?: number | string;
+    /**
+     * The offset on the y-axis in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). 
+     * > **Known Limitations**  This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol.html#yoffset)
+     * 
+     * @default 0
+     */
+    yoffset?: number | string;
   }
 
   interface TextSymbol3DLayer extends Symbol3DLayer {
+    /**
+     * The font of the text label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#font)
+     */
     font: TextSymbol3DLayerFont;
+    /**
+     * The halo surrounding the text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#halo)
+     */
     halo: TextSymbol3DLayerHalo;
+    /**
+     * Size of the text label in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#size)
+     * 
+     * @default 9
+     */
     size: number;
+    /**
+     * The text to be displayed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#text)
+     */
     text: string;
+    /**
+     * For TextSymbol3DLayer the type is always `text`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#type)
+     */
+    readonly type: "text";
 
+    /**
+     * Creates a deep clone of the symbol layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#clone)
+     * 
+     * 
+     */
     clone(): TextSymbol3DLayer;
   }
 
   interface TextSymbol3DLayerConstructor {
+    /**
+     * TextSymbol3DLayer is used to draw text labels for features of any geometry type. This is typically done by adding it to a [LabelSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-LabelSymbol3D.html) in a 3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) does not support 3D symbols.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html)
+     */
+
     new(properties?: TextSymbol3DLayerProperties): TextSymbol3DLayer;
 
     fromJSON(json: any): TextSymbol3DLayer;
@@ -5705,34 +24028,158 @@ declare namespace __esri {
   export const TextSymbol3DLayer: TextSymbol3DLayerConstructor;
 
   interface TextSymbol3DLayerProperties extends Symbol3DLayerProperties {
+    /**
+     * The font of the text label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#font)
+     */
     font?: TextSymbol3DLayerFont;
-    halo?: TextSymbol3DLayerHalo;
-    size?: number;
+    /**
+     * The halo surrounding the text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#halo)
+     */
+    halo?: TextSymbol3DLayerHaloProperties;
+    /**
+     * Size of the text label in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#size)
+     * 
+     * @default 9
+     */
+    size?: number | string;
+    /**
+     * The text to be displayed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#text)
+     */
     text?: string;
   }
 
-  export interface TextSymbol3DLayerFont {
+
+  export interface TextSymbol3DLayerFont extends Object {
+    /**
+     * The font family. See [MDN: font-family](https://developer.mozilla.org/en-US/docs/Web/CSS/font-family).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#font)
+     * 
+     * @default Arial
+     */
     family?: string;
+    /**
+     * The font weight.  **Known Values:** normal | bold
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#font)
+     * 
+     * @default normal
+     */
     weight?: string;
+    /**
+     * The font style.  **Known Values:** normal | italic
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#font)
+     * 
+     * @default normal
+     */
     style?: string;
   }
 
-  export interface TextSymbol3DLayerHalo {
+
+  export interface TextSymbol3DLayerHaloProperties extends Object {
+    /**
+     * The color of the halo. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#halo)
+     * 
+     * @default black
+     */
+    color?: Color | number[] | string;
+    /**
+     * The size of the halo in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#halo)
+     * 
+     * @default 0
+     */
+    size?: number | string;
+  }
+
+  export interface TextSymbol3DLayerHalo extends AnonymousAccessor {
+    /**
+     * The color of the halo. This can be autocast with a named string, hex string, array of rgb or rgba values, an object with `r`, `g`, `b`, and `a` properties, or a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#halo)
+     * 
+     * @default black
+     */
     color?: Color;
+    /**
+     * The size of the halo in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#halo)
+     * 
+     * @default 0
+     */
     size?: number;
   }
 
   interface WebStyleSymbol extends Symbol {
+    /**
+     * The name of the symbol within the web style. Each symbol in a web style is identified by a unique name. Only [Esri-provided web style symbol names](https://developers.arcgis.com/javascript/latest/guide/esri-web-style-symbols/index.html) can be referenced here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#name)
+     */
     name: string;
+    /**
+     * The portal that contains the web style this symbol refers to. Only required when [styleName](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleName) is set.  Defaults to the value in [config.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) (e.g. https://www.arcgis.com).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#portal)
+     */
     portal: Portal;
+    /**
+     * A registered web style name. Only [Esri-provided web style names](https://developers.arcgis.com/javascript/latest/guide/esri-web-style-symbols/index.html) can be referenced here. Requires [portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#portal) property to be set. Can not be used in conjunction with [styleUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleUrl).  See class description for example.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleName)
+     */
     styleName: string;
+    /**
+     * URL that points to the web style definition. Cannot be used in conjunction with [styleName](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleName) and [portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#portal).  See class description for example.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleUrl)
+     */
     styleUrl: string;
+    /**
+     * For WebStyleSymbol the type is always `web-style`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#type)
+     */
+    readonly type: "web-style";
 
+    /**
+     * Creates a deep clone of the symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#clone)
+     * 
+     * 
+     */
     clone(): WebStyleSymbol;
+    /**
+     * Downloads and returns the [PointSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html) instance the WebStyleSymbol refers to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#fetchSymbol)
+     * 
+     * 
+     */
     fetchSymbol(): IPromise<PointSymbol3D>;
   }
 
   interface WebStyleSymbolConstructor {
+    /**
+     * WebStyleSymbol is a class used to conveniently create realistic and thematic 3D symbols. It is a wrapper for creating [PointSymbol3D](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-PointSymbol3D.html) objects that point to a web style resource available in the API. This symbol type is not supported in 2D MapViews.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html)
+     */
+
     new(properties?: WebStyleSymbolProperties): WebStyleSymbol;
 
     fromJSON(json: any): WebStyleSymbol;
@@ -5741,17 +24188,52 @@ declare namespace __esri {
   export const WebStyleSymbol: WebStyleSymbolConstructor;
 
   interface WebStyleSymbolProperties extends SymbolProperties {
+    /**
+     * The name of the symbol within the web style. Each symbol in a web style is identified by a unique name. Only [Esri-provided web style symbol names](https://developers.arcgis.com/javascript/latest/guide/esri-web-style-symbols/index.html) can be referenced here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#name)
+     */
     name?: string;
+    /**
+     * The portal that contains the web style this symbol refers to. Only required when [styleName](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleName) is set.  Defaults to the value in [config.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl) (e.g. https://www.arcgis.com).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#portal)
+     */
     portal?: PortalProperties;
+    /**
+     * A registered web style name. Only [Esri-provided web style names](https://developers.arcgis.com/javascript/latest/guide/esri-web-style-symbols/index.html) can be referenced here. Requires [portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#portal) property to be set. Can not be used in conjunction with [styleUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleUrl).  See class description for example.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleName)
+     */
     styleName?: string;
+    /**
+     * URL that points to the web style definition. Cannot be used in conjunction with [styleName](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleName) and [portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#portal).  See class description for example.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-WebStyleSymbol.html#styleUrl)
+     */
     styleUrl?: string;
   }
 
   interface ClosestFacilityTask extends Task {
+    /**
+     * Solves the closest facility.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ClosestFacilityTask.html#solve)
+     * 
+     * @param params Defines the parameters of the closest facility analysis.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     solve(params: ClosestFacilityParameters, requestOptions?: any): IPromise<ClosestFacilitySolveResult>;
   }
 
   interface ClosestFacilityTaskConstructor {
+    /**
+     * Helps you find closest facilities around any location (incident) on a network.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ClosestFacilityTask.html)
+     */
+
     new(properties?: ClosestFacilityTaskProperties): ClosestFacilityTask;
   }
 
@@ -5762,46 +24244,282 @@ declare namespace __esri {
   }
 
   interface FindTask extends Task {
+    /**
+     * The geodatabase version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-FindTask.html#gdbVersion)
+     */
     gdbVersion: string;
 
+    /**
+     * Sends a request to the ArcGIS REST map service resource to perform a search based on the input [params](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-FindTask.html#execute)
+     * 
+     * @param params Specifies the layers and fields that are used for the search.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     execute(params: FindParameters, requestOptions?: any): IPromise<any>;
   }
 
   interface FindTaskConstructor {
+    /**
+     * Search a map service exposed by the ArcGIS Server REST API based on a string value. The search can be conducted on a single field of a single layer, on many fields of a layer, or on many fields of many layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-FindTask.html)
+     */
+
     new(properties?: FindTaskProperties): FindTask;
   }
 
   export const FindTask: FindTaskConstructor;
 
   interface FindTaskProperties extends TaskProperties {
+    /**
+     * The geodatabase version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-FindTask.html#gdbVersion)
+     */
     gdbVersion?: string;
   }
 
   interface GeometryService extends Task {
+    /**
+     * Computes the area and length for the input [polygons](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#areasAndLengths)
+     * 
+     * @param areasAndLengthsParameters Specify the input polygons and optionally the linear and area units.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     areasAndLengths(areasAndLengthsParameters: AreasAndLengthsParameters, requestOptions?: any): IPromise<any>;
+    /**
+     * The Auto Complete operation is performed on a geometry service resource. The AutoComplete operation simplifies the process of constructing new polygons that are adjacent to other polygons. It constructs polygons that fill in the gaps between existing polygons and a set of polylines.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#autoComplete)
+     * 
+     * @param polygons The array of polygons that will provide boundaries for new polygons.
+     * @param polylines An array of polylines that will provide the remaining boundaries for new polygons.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     autoComplete(polygons: Polygon[], polylines: Polyline[], requestOptions?: any): IPromise<Polygon>;
+    /**
+     * Creates buffer polygons at a specified distance around the given geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#buffer)
+     * 
+     * @param bufferParameters Specifies the input geometries, buffer distances, and other options.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     buffer(bufferParameters: BufferParameters, requestOptions?: any): IPromise<Polygon[]>;
+    /**
+     * The convexHull operation is performed on a geometry service resource. It returns the convex hull of the input geometry. The input geometry can be a point, multipoint, polyline or polygon. The hull is typically a polygon but can also be a polyline or point in degenerate cases.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#convexHull)
+     * 
+     * @param geometries The geometries whose convex hull is to be created.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     convexHull(geometries: Geometry[], requestOptions?: any): IPromise<Geometry>;
+    /**
+     * The cut operation is performed on a geometry service resource. This operation splits the input polyline or polygon where it crosses a cutting polyline.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#cut)
+     * 
+     * @param geometries The polylines or polygons to be cut.
+     * @param cutter The polyline that will be used to divide the target into pieces where it crosses the target.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     cut(geometries: Geometry[], cutter: Polyline, requestOptions?: any): IPromise<any>;
+    /**
+     * The densify operation is performed on a geometry service resource. This operation densifies geometries by plotting points between existing vertices.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#densify)
+     * 
+     * @param densifyParameters The DensifyParameters objects contains `geometries`, `geodesic`, `lengthUnit`, and `maxSegmentLength` properties.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     densify(densifyParameters: DensifyParameters, requestOptions?: any): IPromise<Geometry[]>;
+    /**
+     * The difference operation is performed on a geometry service resource. This operation constructs the set-theoretic difference between an array of geometries and another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#difference)
+     * 
+     * @param geometries An array of points, multipoints, polylines or polygons.
+     * @param geometry A single geometry of any type, with a dimension equal to or greater than the items in geometries.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     difference(geometries: Geometry[], geometry: Geometry, requestOptions?: any): IPromise<Geometry>;
+    /**
+     * Measures the planar or geodesic distance between geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#distance)
+     * 
+     * @param params Sets the input geometries to measure, distance units, and other parameters.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     distance(params: DistanceParameters, requestOptions?: any): IPromise<number>;
+    /**
+     * Converts an array of well-known strings into xy-coordinates based on the conversion type and spatial reference supplied by the user. Only available with ArcGIS Server 10.3 or above.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#fromGeoCoordinateString)
+     * 
+     * @param params See the object specifications table below for the structure of the  `params`  object.
+     * @param params.strings An array of formatted strings as specified by `conversionType`. Example: `["01N AA 66021 00000" , "11S NT 00000 62155" , "31U BT 94071 65288"]`
+     * @param params.sr The spatial reference or well-known ID to convert the input string coordinates to.
+     * @param params.conversionType The converstion type of the input strings.  **Possible Values:** mrgs | usng | utm | geo-ref | gars | dms | ddm | dd
+     * @param params.conversionMode Conversion options for mrgs, utm and gars conversion types. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r30000026z000000) for valid values and their descriptions.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     fromGeoCoordinateString(params: GeometryServiceFromGeoCoordinateStringParams, requestOptions?: any): IPromise<any>;
+    /**
+     * Generalizes the input geometries using the Douglas-Peucker algorithm.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#generalize)
+     * 
+     * @param params An array of geometries to generalize and a maximum deviation. Optionally set the deviation units.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     generalize(params: GeneralizeParameters, requestOptions?: any): IPromise<Geometry[]>;
+    /**
+     * The intersect operation is performed on a geometry service resource. This operation constructs the set-theoretic intersection between an array of geometries and another geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#intersect)
+     * 
+     * @param geometries An array of points, multipoints, polylines, or polygons.
+     * @param intersector A single geometry of any type, of dimension equal to or greater than the dimension of the items in `geometries`.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     intersect(geometries: Geometry[], intersector: Geometry, requestOptions?: any): IPromise<Geometry[]>;
+    /**
+     * Calculates an interior point for each polygon specified. These interior points can be used by clients for labeling the polygons.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#labelPoints)
+     * 
+     * @param polygons The polygon graphics to process.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     labelPoints(polygons: Polygon[], requestOptions?: any): IPromise<Point>;
+    /**
+     * Gets the lengths for a [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) when the geometry type is [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#lengths)
+     * 
+     * @param params Specify the polylines and optionally the length unit and the geodesic length option.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     lengths(params: LengthsParameters, requestOptions?: any): IPromise<any>;
+    /**
+     * Constructs the offset of the input geometries based on a planar distance. If the offsetDistance is positive the constructed offset will be on the right side of the geometry. Left side offsets are constructed with negative values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#offset)
+     * 
+     * @param params Set the geometries to offset, distance, and units.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     offset(params: OffsetParameters, requestOptions?: any): IPromise<Geometry[]>;
+    /**
+     * Projects a set of geometries to a new spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#project)
+     * 
+     * @param params The input projection parameters.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     project(params: ProjectParameters, requestOptions?: any): IPromise<Geometry[]>;
+    /**
+     * Computes the set of pairs of geometries from the input geometry arrays that belong to the specified relation. Both arrays are assumed to be in the same spatial reference. The relations are evaluated in 2D. Z-coordinates are not used. Geometry types cannot be mixed within an array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#relation)
+     * 
+     * @param params The set of parameters required to perform the comparison.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     relation(params: RelationParameters, requestOptions?: any): IPromise<Polygon[]>;
+    /**
+     * The reshape operation is performed on a geometry service resource. It reshapes a [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html) or a part of a [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) using a reshaping line.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#reshape)
+     * 
+     * @param targetGeometry The Polyline or Polygon to be reshaped.
+     * @param reshaper The single-part polyline that performs the reshaping.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     reshape(targetGeometry: Geometry, reshaper: Geometry, requestOptions?: any): IPromise<Geometry>;
+    /**
+     * Alters the given geometries to make their definitions topologically legal with respect to their geometry type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#simplify)
+     * 
+     * @param geometries The geometries to simplify.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     simplify(geometries: Geometry[], requestOptions?: any): IPromise<Geometry[]>;
+    /**
+     * Converts an array of XY-coordinates into well-known strings based on the conversion type and spatial reference supplied by the user. Only available with ArcGIS Server 10.3 or above.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     * 
+     * @param params See the object specifications table below for the structure of the `params` object.
+     * @param params.sr The spatial reference (or WKID of the spatial reference) of the XY-coordinates to be converted.
+     * @param params.coordinates An array of XY-coordinates (in JSON format) to be converted.
+     * @param params.conversionType The conversion type of the input strings.  **Possible values:** mgrs | usng | utm | geo-ref | gars | dms | ddm | dd
+     * @param params.conversionMode Conversion options for mgrs and utm conversion types. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r30000026w000000) for valid conversion modes and their descriptions.
+     * @param params.numOfDigits The number of digits to output for each of the numerical portions in the string. The default value depends of `conversionType`. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r30000026z000000) for default values.
+     * @param params.rounding If `true`, then numeric portions of the string are rounded to the nearest whole magnitude as specified by `numOfDigits`. Otherwise, numeric portions of the string are truncated. The rounding parameter applies only to conversion types `mgrs`, `usng` and `geo-ref`.
+     * @param params.addSpaces If `true`, then spaces are added between components of the string. The `addSpaces` parameter applies only to conversion types `mgrs`, `usng` and `utm`. The default value for `mgrs` is `false` , while the default value for both `usng` and `utm` is `true`.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     toGeoCoordinateString(params: GeometryServiceToGeoCoordinateStringParams, requestOptions?: any): IPromise<string[]>;
+    /**
+     * Trims or extends the input polylines using the user specified guide polyline. When trimming features, the portion to the left of the cutting line is preserved in the output and the rest is discarded. If the input polyline is not cut or extended then an empty polyline is added to the output array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#trimExtend)
+     * 
+     * @param params Input parameters for the `trimExtend` operation.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     trimExtend(params: TrimExtendParameters, requestOptions?: any): IPromise<Geometry[]>;
+    /**
+     * The union operation is performed on a geometry service resource. This operation constructs the set-theoretic union of the geometries in the input array. All inputs must be of the same type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#union)
+     * 
+     * @param geometries An array of the geometries to be unioned.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     union(geometries: Geometry[], requestOptions?: any): IPromise<Geometry>;
   }
 
   interface GeometryServiceConstructor {
+    /**
+     * Represents a geometry service resource exposed by the ArcGIS REST API. It is used to perform various operations on geometries such as project, simplify, buffer, and relationships.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html)
+     */
+
     new(properties?: GeometryServiceProperties): GeometryService;
   }
 
@@ -5811,71 +24529,301 @@ declare namespace __esri {
 
   }
 
-  export interface GeometryServiceFromGeoCoordinateStringParams {
+
+  export interface GeometryServiceFromGeoCoordinateStringParams extends Object {
+    /**
+     * An array of formatted strings as specified by `conversionType`. Example: `["01N AA 66021 00000" , "11S NT 00000 62155" , "31U BT 94071 65288"]`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#fromGeoCoordinateString)
+     */
     strings: string[];
+    /**
+     * The spatial reference or well-known ID to convert the input string coordinates to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#fromGeoCoordinateString)
+     */
     sr: SpatialReference | string;
-    conversionType: string;
+    /**
+     * The converstion type of the input strings.  **Possible Values:** mrgs | usng | utm | geo-ref | gars | dms | ddm | dd
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#fromGeoCoordinateString)
+     * 
+     * @default mrgs
+     */
+    conversionType?: string;
+    /**
+     * Conversion options for mrgs, utm and gars conversion types. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r30000026z000000) for valid values and their descriptions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#fromGeoCoordinateString)
+     */
     conversionMode?: string;
   }
 
-  export interface GeometryServiceToGeoCoordinateStringParams {
+
+  export interface GeometryServiceToGeoCoordinateStringParams extends Object {
+    /**
+     * The spatial reference (or WKID of the spatial reference) of the XY-coordinates to be converted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     */
     sr: SpatialReference | string;
+    /**
+     * An array of XY-coordinates (in JSON format) to be converted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     */
     coordinates: number[][];
+    /**
+     * The conversion type of the input strings.  **Possible values:** mgrs | usng | utm | geo-ref | gars | dms | ddm | dd
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     */
     conversionType: string;
+    /**
+     * Conversion options for mgrs and utm conversion types. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r30000026w000000) for valid conversion modes and their descriptions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     */
     conversionMode?: string;
+    /**
+     * The number of digits to output for each of the numerical portions in the string. The default value depends of `conversionType`. See the [ArcGIS REST API documentation](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r30000026z000000) for default values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     */
     numOfDigits?: number;
+    /**
+     * If `true`, then numeric portions of the string are rounded to the nearest whole magnitude as specified by `numOfDigits`. Otherwise, numeric portions of the string are truncated. The rounding parameter applies only to conversion types `mgrs`, `usng` and `geo-ref`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     * 
+     * @default true
+     */
     rounding?: boolean;
+    /**
+     * If `true`, then spaces are added between components of the string. The `addSpaces` parameter applies only to conversion types `mgrs`, `usng` and `utm`. The default value for `mgrs` is `false` , while the default value for both `usng` and `utm` is `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
+     */
     addSpaces?: boolean;
   }
 
   interface Geoprocessor extends Task {
+    /**
+     * The spatial reference of the output geometries. If not specified, the output geometries will be in the spatial reference of the input geometries. If [processSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#processSpatialReference) is specified and `outSpatialReference` is not specified, the output geometries will be in the spatial reference of the process spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * The spatial reference that the model will use to perform geometry operations. If `processSpatialReference` is specified and [outputSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#outputSpatialReference) is not specified, the output geometries will be in the spatial reference of the process spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#processSpatialReference)
+     */
     processSpatialReference: SpatialReference;
+    /**
+     * The time interval in milliseconds between each job status request sent to an asynchronous GP task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#updateDelay)
+     * 
+     * @default 1000
+     */
     updateDelay: number;
 
+    /**
+     * Cancels an asynchronous geoprocessing job. Requires an ArcGIS Server 10.1 service or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#cancelJob)
+     * 
+     * @param jobId A string that uniquely identifies a job on the server. It is created when a job is submitted for execution and later used to check its status and retrieve the results.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     cancelJob(jobId: string, requestOptions?: any): IPromise<any>;
+    /**
+     * Cancels the periodic job status updates automatically initiated when [submitJob()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#submitJob) is invoked for the job identified by `jobId`. You can still obtain the status of this job by calling the [checkJobStatus()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#checkJobStatus) method at your own discretion.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#cancelJobStatusUpdates)
+     * 
+     * @param jobId A string that uniquely identifies the job for which the job updates are cancelled.
+     * 
+     */
     cancelJobStatusUpdates(jobId: string): void;
+    /**
+     * Sends a request to the GP Task for the current state of the job identified by `jobId`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#checkJobStatus)
+     * 
+     * @param jobId The jobId returned from [JobInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html).
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     checkJobStatus(jobId: string, requestOptions?: any): IPromise<any>;
+    /**
+     * Sends a request to the server to execute a synchronous GP task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#execute)
+     * 
+     * @param params ```
+     * Specifies the input parameters accepted by the task and their corresponding values. These input parameters are listed in the parameters field of the associated GP Task resource. For example, assume that a GP Task resource has the following input parameters:
+     *   * `<GPFeatureRecordSetLayer>` Input_Points
+     *   * `<GPDouble>` Distance
+     *   
+     *   
+     * The `params` argument would then be an Object of the form: 
+     * ```
+     * {
+     *  Input_Points: <FeatureSet>,
+     *  Distance: <Number>
+     * }
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     execute(params: any, requestOptions?: any): IPromise<any>;
+    /**
+     * Sends a request to the GP Task to get the task result identified by `jobId` and `resultName`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#getResultData)
+     * 
+     * @param jobId The jobId returned from [JobInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html).
+     * @param resultName The name of the result parameter as defined in Services Directory.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getResultData(jobId: string, resultName: string, requestOptions?: any): IPromise<any>;
+    /**
+     * Sends a request to the GP Task to get the task result identified by `jobId` and `resultName` as an image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#getResultImage)
+     * 
+     * @param jobId The jobId returned from [JobInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html).
+     * @param resultName The name of the result parameter as defined in the Services Directory.
+     * @param imageParams Specifies the properties of the result image.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getResultImage(jobId: string, resultName: string, imageParams: ImageParameters, requestOptions?: any): IPromise<any>;
+    /**
+     * Get the task result identified by `jobId` as an [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html). This method supports MapImageLayer 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#getResultMapImageLayer)
+     * 
+     * @param jobId The jobId returned from [JobInfo](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html).
+     * 
+     */
     getResultMapImageLayer(jobId: string): MapImageLayer;
+    /**
+     * Submits a job to the server for asynchronous processing by the GP task.  The task execution results can be retrieved using the [getResultData()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#getResultData), [getResultImage()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#getResultImage), or [getResultMapImageLayer()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#getResultMapImageLayer) methods.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#submitJob)
+     * 
+     * @param params ```
+     * specifies the input parameters accepted by the task and their corresponding values. These input parameters are listed in the parameters field of the associated GP Task resource. For example, assume that a GP Task resource has the following input parameters:
+     *   * `<GPFeatureRecordSetLayer>` Input_Points
+     *   * `<GPDouble>` Distance
+     *   
+     *   
+     * The `params` argument would then be an Object of the form: 
+     * ```
+     * {
+     *  Input_Points: <FeatureSet>,
+     *  Distance: <Number>
+     * }
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     submitJob(params: any, requestOptions?: any): IPromise<any>;
   }
 
   interface GeoprocessorConstructor {
+
+
     new(properties?: GeoprocessorProperties): Geoprocessor;
   }
 
   export const Geoprocessor: GeoprocessorConstructor;
 
   interface GeoprocessorProperties extends TaskProperties {
+    /**
+     * The spatial reference of the output geometries. If not specified, the output geometries will be in the spatial reference of the input geometries. If [processSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#processSpatialReference) is specified and `outSpatialReference` is not specified, the output geometries will be in the spatial reference of the process spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * The spatial reference that the model will use to perform geometry operations. If `processSpatialReference` is specified and [outputSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#outputSpatialReference) is not specified, the output geometries will be in the spatial reference of the process spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#processSpatialReference)
+     */
     processSpatialReference?: SpatialReferenceProperties;
+    /**
+     * The time interval in milliseconds between each job status request sent to an asynchronous GP task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Geoprocessor.html#updateDelay)
+     * 
+     * @default 1000
+     */
     updateDelay?: number;
   }
 
   interface IdentifyTask extends Task {
+    /**
+     * Specifies the geodatabase version to display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-IdentifyTask.html#gdbVersion)
+     */
     gdbVersion: string;
 
+    /**
+     * Sends a request to the ArcGIS REST map service resource to identify features based on the [IdentifyParameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html) specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-IdentifyTask.html#execute)
+     * 
+     * @param params Specifies the criteria used to identify the features.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     execute(params: IdentifyParameters, requestOptions?: any): IPromise<any>;
   }
 
   interface IdentifyTaskConstructor {
+    /**
+     * Performs an identify operation on the layers of a map service exposed by the ArcGIS Server REST API. Use [IdentifyParameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html) to set the parameters for the identify operation and [IdentifyResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html) to work with the results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-IdentifyTask.html)
+     */
+
     new(properties?: IdentifyTaskProperties): IdentifyTask;
   }
 
   export const IdentifyTask: IdentifyTaskConstructor;
 
   interface IdentifyTaskProperties extends TaskProperties {
+    /**
+     * Specifies the geodatabase version to display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-IdentifyTask.html#gdbVersion)
+     */
     gdbVersion?: string;
   }
 
   interface ImageServiceIdentifyTask extends Task {
+    /**
+     * Sends a request to the ArcGIS REST image service resource to identify content based on the [ImageServiceIdentifyParameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html) specified in the `params` argument.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ImageServiceIdentifyTask.html#execute)
+     * 
+     * @param params Specifies the criteria used to identify the features.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     execute(params: ImageServiceIdentifyParameters, requestOptions?: any): IPromise<ImageServiceIdentifyResult>;
   }
 
   interface ImageServiceIdentifyTaskConstructor {
+
+
     new(properties?: ImageServiceIdentifyTaskProperties): ImageServiceIdentifyTask;
   }
 
@@ -5886,103 +24834,462 @@ declare namespace __esri {
   }
 
   interface Locator extends Task {
+    /**
+     * Limit the results to one or more categories. For example "Populated Place" or "airport". Only applicable when using the World Geocode Service. View the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#categories)
+     */
     categories: string[];
+    /**
+     * Limits the results to only search in the country provided. For example `US` for United States or `SE` for Sweden. Only applies to the World Geocode Service. See the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#countryCode)
+     */
     countryCode: string;
+    /**
+     * The spatial reference of the output geometries. If not specified, the output geometries are in the spatial reference of the input geometries when performing a reverse geocode and in the default spatial reference returned by the service if finding locations by address.  If `processSpatialReference` is specified and `outSpatialReference` is not specified, the output geometries are in the spatial reference of the process spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
 
+    /**
+     * Find address candidates for multiple input addresses. This method requires an ArcGIS Server 10.1 or greater geocode service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressesToLocations)
+     * 
+     * @param params See specifications below.
+     * @param params.addresses ```
+     * The input addresses in the format supported by the geocode service. If the service supports 'Single Line Input' the input addresses will be in the following format:
+     * ```js
+     * {
+     *   "OBJECTID": 0,
+     *   "Single Line Input":"440 Arguello Blvd, 94118"
+     * }
+     * @param params.countryCode Limits the results to only search in the country provided. For example `US` for United States or `SE` for Sweden. Only applies to the World Geocode Service. See the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * @param params.categories Limit result to one or more categories. For example, "Populated Place" or "Scandinavian Food". Only applies to the World Geocode Service. See [Category filtering (World Geocoding Service)](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm#ESRI_SECTION1_502B3FE2028145D7B189C25B1A00E17B) for more information.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     addressesToLocations(params: LocatorAddressesToLocationsParams, requestOptions?: any): IPromise<AddressCandidate[]>;
+    /**
+     * Sends a request to the ArcGIS REST geocode resource to find candidates for a single address specified in the address parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     * 
+     * @param params Specify at least the address and optionally other properties. See the object specifications table below.
+     * @param params.address visit the ArcGIS Online Geocoding Service help for more details on the World Geocoder.
+     * The address argument is data object that contains properties representing the various address fields accepted by the corresponding geocode service. These fields are listed in the addressFields property of the associated geocode service resource. For example, if the *addressFields* of a geocode service resource includes fields with the following names: Street, City, State and Zone, then the address argument is of the form:
+     * ```js
+     * {
+     *   Street: "1234 W Main St",
+     *   City: "Small Town",
+     *   State: "WA",
+     *   Zone: "99027"
+     * }
+     * ```
+     * 
+     * Locators published using ArcGIS 10 or later support a single line address field, which
+     * can be specified using the following syntax where field_name is the name of the single
+     * line address field. You can find this name by viewing the help or services directory for
+     * your locator services. Common values are *SingleLine* and *SingleLineFieldName*:
+     * ```js
+     * var address = { "field_name": "380 New York St, Redlands, CA 92373" };
+     * ```
+     * The Services Directory can be used to find out the required and optional address fields
+     * and the correct names for the input name fields. If you are using the World Geocoding Service
+     * @param params.categories Limit result to one or more categories. For example, "Populated Place" or "Scandinavian Food". Only applies to the World Geocode Service. See [Category filtering (World Geocoding Service)](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm#ESRI_SECTION1_502B3FE2028145D7B189C25B1A00E17B) for more information.
+     * @param params.countryCode Limit result to a specific country. For example, "US" for United States or "SE" for Sweden. Only applies to the World Geocode Service. See Geocode coverage (World Geocoding Service) for more information.
+     * @param params.distance Used in combination with `location` option to weight returned results within this distance (meters).
+     * @param params.forStorage Allows the results of single geocode transactions to be persisted.
+     * @param params.location Used in combination with `distance` option to weight returned results for a specified area.
+     * @param params.magicKey A `suggestLocations` result ID (magicKey). Used to query for a specific results information.
+     * @param params.maxLocations Maximum results to return from the query.
+     * @param params.outFields The list of fields included in the returned result set. This list is a comma delimited list of field names. If you specify the shape field in the list of return fields, it is ignored. For non-intersection addresses you can specify the candidate fields as defined in the geocode service. For intersection addresses you can specify the intersection candidate fields.
+     * @param params.searchExtent Defines the extent within which the geocode server will search. Requires ArcGIS Server version 10.1 or greater.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     addressToLocations(params: LocatorAddressToLocationsParams, requestOptions?: any): IPromise<AddressCandidate[]>;
+    /**
+     * Locates an address based on a given point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#locationToAddress)
+     * 
+     * @param location The point at which to search for the closest address. The location should be in the same spatial reference as that of the geocode service.
+     * @param distance The distance in meters from the given location within which a matching address should be searched. If this parameter is not provided or an invalid value is provided, a default value of 0 meters is used.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     locationToAddress(location: Point, distance?: number, requestOptions?: any): IPromise<AddressCandidate>;
-    suggestLocations(params: LocatorSuggestLocationsParams, requestOptions?: any): IPromise<SuggestionResult>;
+    /**
+     * Get character by character auto complete suggestions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#suggestLocations)
+     * 
+     * @param params An object that defines suggest parameters. See specifications below.
+     * @param params.categories A place or address type which can be used to filter suggest results. The parameter supports input of single category values or multiple comma-separated values.
+     * @param params.distance Used with the `location` property. The `distance` property specifies the radial distance from the location.
+     * @param params.location Defines a normalized location point that is used with the distance parameter to sort geocoding candidates based upon their proximity to the given location.
+     * @param params.text The input text entered by a user which is used by the suggest operation to generate a list of possible matches.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
+    suggestLocations(params: LocatorSuggestLocationsParams, requestOptions?: any): IPromise<SuggestionResult[]>;
   }
 
   interface LocatorConstructor {
+    /**
+     * Represents a geocode service resource exposed by the ArcGIS Server REST API. It is used to generate candidates for an address. It is also used to generate batch results for a set of addresses.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html)
+     */
+
     new(properties?: LocatorProperties): Locator;
   }
 
   export const Locator: LocatorConstructor;
 
   interface LocatorProperties extends TaskProperties {
+    /**
+     * Limit the results to one or more categories. For example "Populated Place" or "airport". Only applicable when using the World Geocode Service. View the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#categories)
+     */
     categories?: string[];
+    /**
+     * Limits the results to only search in the country provided. For example `US` for United States or `SE` for Sweden. Only applies to the World Geocode Service. See the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#countryCode)
+     */
     countryCode?: string;
+    /**
+     * The spatial reference of the output geometries. If not specified, the output geometries are in the spatial reference of the input geometries when performing a reverse geocode and in the default spatial reference returned by the service if finding locations by address.  If `processSpatialReference` is specified and `outSpatialReference` is not specified, the output geometries are in the spatial reference of the process spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
   }
 
-  export interface LocatorAddressesToLocationsParams {
+
+  export interface LocatorAddressesToLocationsParams extends Object {
+    /**
+     * The input addresses in the format supported by the geocode service. If the service supports 'Single Line Input' the input addresses will be in the following format:
+     * ```js
+     * {
+     *   "OBJECTID": 0,
+     *   "Single Line Input":"440 Arguello Blvd, 94118"
+     * }
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressesToLocations)
+     */
     addresses: any[];
+    /**
+     * Limits the results to only search in the country provided. For example `US` for United States or `SE` for Sweden. Only applies to the World Geocode Service. See the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressesToLocations)
+     */
     countryCode: string;
+    /**
+     * Limit result to one or more categories. For example, "Populated Place" or "Scandinavian Food". Only applies to the World Geocode Service. See [Category filtering (World Geocoding Service)](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm#ESRI_SECTION1_502B3FE2028145D7B189C25B1A00E17B) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressesToLocations)
+     */
     categories: string[];
   }
 
-  export interface LocatorAddressToLocationsParams {
+
+  export interface LocatorAddressToLocationsParams extends Object {
+    /**
+     * The address argument is data object that contains properties representing the various address fields accepted by the corresponding geocode service. These fields are listed in the addressFields property of the associated geocode service resource. For example, if the *addressFields* of a geocode service resource includes fields with the following names: Street, City, State and Zone, then the address argument is of the form:
+     * ```js
+     * {
+     *   Street: "1234 W Main St",
+     *   City: "Small Town",
+     *   State: "WA",
+     *   Zone: "99027"
+     * }
+     * ```
+     * 
+     * Locators published using ArcGIS 10 or later support a single line address field, which
+     * can be specified using the following syntax where field_name is the name of the single
+     * line address field. You can find this name by viewing the help or services directory for
+     * your locator services. Common values are *SingleLine* and *SingleLineFieldName*:
+     * ```js
+     * var address = { "field_name": "380 New York St, Redlands, CA 92373" };
+     * ```
+     * The Services Directory can be used to find out the required and optional address fields
+     * and the correct names for the input name fields. If you are using the World Geocoding Service
+     * visit the ArcGIS Online Geocoding Service help for more details on the World Geocoder.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     address: any;
+    /**
+     * Limit result to one or more categories. For example, "Populated Place" or "Scandinavian Food". Only applies to the World Geocode Service. See [Category filtering (World Geocoding Service)](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm#ESRI_SECTION1_502B3FE2028145D7B189C25B1A00E17B) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     categories: string[];
+    /**
+     * Limit result to a specific country. For example, "US" for United States or "SE" for Sweden. Only applies to the World Geocode Service. See Geocode coverage (World Geocoding Service) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     countryCode: string;
+    /**
+     * Used in combination with `location` option to weight returned results within this distance (meters).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     distance: number;
+    /**
+     * Allows the results of single geocode transactions to be persisted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     forStorage: boolean;
+    /**
+     * Used in combination with `distance` option to weight returned results for a specified area.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     location: Point;
+    /**
+     * A `suggestLocations` result ID (magicKey). Used to query for a specific results information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     magicKey: string;
+    /**
+     * Maximum results to return from the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     maxLocations: number;
+    /**
+     * The list of fields included in the returned result set. This list is a comma delimited list of field names. If you specify the shape field in the list of return fields, it is ignored. For non-intersection addresses you can specify the candidate fields as defined in the geocode service. For intersection addresses you can specify the intersection candidate fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     outFields: string[];
+    /**
+     * Defines the extent within which the geocode server will search. Requires ArcGIS Server version 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations)
+     */
     searchExtent: Extent;
   }
 
-  export interface LocatorSuggestLocationsParams {
+
+  export interface LocatorSuggestLocationsParams extends Object {
+    /**
+     * A place or address type which can be used to filter suggest results. The parameter supports input of single category values or multiple comma-separated values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#suggestLocations)
+     */
     categories: string[];
+    /**
+     * Used with the `location` property. The `distance` property specifies the radial distance from the location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#suggestLocations)
+     */
     distance: number;
+    /**
+     * Defines a normalized location point that is used with the distance parameter to sort geocoding candidates based upon their proximity to the given location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#suggestLocations)
+     */
     location: Point;
+    /**
+     * The input text entered by a user which is used by the suggest operation to generate a list of possible matches.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#suggestLocations)
+     */
     text: string;
   }
 
-  export interface SuggestionResult {
+  /**
+   * Describes the object representing the result of the [suggestLocations()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#suggestLocations) method.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#SuggestionResult)
+   */
+  export interface SuggestionResult extends Object {
+    /**
+     * Indicates if the result is a Collection.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#SuggestionResult)
+     */
     isCollection: boolean;
+    /**
+     * ID used in combination with the `text` property to uniquely identify a suggestion.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#SuggestionResult)
+     */
     magicKey: string;
+    /**
+     * The string name of the suggested location to geocode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#SuggestionResult)
+     */
     text: string;
   }
 
   interface PrintTask extends Task {
-    mode: string;
+    /**
+     * The mode for the print task execution.  **Known Values:** async | sync
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-PrintTask.html#mode)
+     * 
+     * @default sync
+     */
+    readonly mode: string;
+    /**
+     * The time interval in milliseconds between each job status request sent to an asynchronous GP task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-PrintTask.html#updateDelay)
+     * 
+     * @default 1000
+     */
     updateDelay: number;
 
+    /**
+     * Sends a request to the print service to create a print page using the options specified in the [PrintParameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-PrintTask.html#execute)
+     * 
+     * @param params Defines the printing options.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     execute(params: PrintParameters, requestOptions?: any): IPromise<any>;
   }
 
   interface PrintTaskConstructor {
+    /**
+     * The PrintTask generates a printer-ready version of the map using an [Export Web Map Task](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Export_Web_Map_Task/02r3000001m3000000/) available with ArGIS Server 10.1 and later. This class is used when you want to have more granular control over the user interface, for example, if you want to provide users the ability to define what appears on the printed page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-PrintTask.html)
+     */
+
     new(properties?: PrintTaskProperties): PrintTask;
   }
 
   export const PrintTask: PrintTaskConstructor;
 
   interface PrintTaskProperties extends TaskProperties {
-    mode?: string;
+    /**
+     * The time interval in milliseconds between each job status request sent to an asynchronous GP task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-PrintTask.html#updateDelay)
+     * 
+     * @default 1000
+     */
     updateDelay?: number;
   }
 
   interface QueryTask extends Task {
+    /**
+     * Specify the geodatabase version to display. Requires ArcGIS Server service 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#gdbVersion)
+     */
     gdbVersion: string;
 
-    execute(params: Query, requestOptions?: any): IPromise<FeatureSet>;
-    executeForCount(params: Query, requestOptions?: any): IPromise<number>;
-    executeForExtent(params: Query, requestOptions?: any): IPromise<any>;
-    executeForIds(params: Query, requestOptions?: any): IPromise<number[]>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against an ArcGIS Server map layer. The result is returned as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html), which can be accessed using the `.then()` method. A [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) contains an array of [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) features, which can be added to the map. This array will not be populated if no results are found.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#execute)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
+    execute(params: Query | QueryProperties, requestOptions?: any): IPromise<FeatureSet>;
+    /**
+     * Gets a count of the number of features that satisfy the input query. Valid only for layers published using ArcGIS Server 10 SP1 or greater. Layers published with earlier versions of ArcGIS Server return an error to the `errback` param of `.then()`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#executeForCount)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
+    executeForCount(params: Query | QueryProperties, requestOptions?: any): IPromise<number>;
+    /**
+     * Gets the extent of the features that satisfy the input query. The count of features that satisfy the input query is returned upon resolution as well. Valid only for [hosted feature services](http://doc.arcgis.com/en/arcgis-online/share-maps/hosted-web-layers.htm) on [arcgis.com](http://arcgis.com) and for ArcGIS Server 10.3.1 and later.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#executeForExtent)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
+    executeForExtent(params: Query | QueryProperties, requestOptions?: any): IPromise<any>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against an ArcGIS Server map layer. The result is an array of the object IDs of features that satisfy the input query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#executeForIds)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
+    executeForIds(params: Query | QueryProperties, requestOptions?: any): IPromise<number[]>;
+    /**
+     * Executes a [RelationshipQuery](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html) against an ArcGIS Server map layer (or table). If the query is successful, the result is returned as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html), which can be accessed using the `.then()` method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#executeRelationshipQuery)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     executeRelationshipQuery(params: RelationshipQuery, requestOptions?: any): IPromise<FeatureSet>;
   }
 
   interface QueryTaskConstructor {
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) operation on a layer. The most common method used in this class is [execute()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#execute), which executes the query as defined in the [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) object that is passed as a parameter to the function. `QueryTask.execute()` returns a Promise that resolves to a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html), which contains the features in the layer that satisfy the [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html)
+     */
+
     new(properties?: QueryTaskProperties): QueryTask;
   }
 
   export const QueryTask: QueryTaskConstructor;
 
   interface QueryTaskProperties extends TaskProperties {
+    /**
+     * Specify the geodatabase version to display. Requires ArcGIS Server service 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html#gdbVersion)
+     */
     gdbVersion?: string;
   }
 
   interface RouteTask extends Task {
+    /**
+     * Solves the route against the route layer with the route parameters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html#solve)
+     * 
+     * @param params Route parameters used as input to generate the route.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     solve(params: RouteParameters, requestOptions?: any): IPromise<RouteResult>;
   }
 
   interface RouteTaskConstructor {
+    /**
+     * Find routes between two or more locations and optionally get driving directions. The RouteTask uses ArcGIS Server network analysis services to calculate routes. Network analysis services allow you to solve simple routing problems as well as complex ones that take into account multiple stops, barriers, and time windows.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html)
+     */
+
     new(properties?: RouteTaskProperties): RouteTask;
   }
 
@@ -5993,10 +25300,25 @@ declare namespace __esri {
   }
 
   interface ServiceAreaTask extends Task {
+    /**
+     * Determines the service area based on a set of parameters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html#solve)
+     * 
+     * @param params The parameters needed to define the service area.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     solve(params: ServiceAreaParameters, requestOptions?: any): IPromise<ServiceAreaSolveResult>;
   }
 
   interface ServiceAreaTaskConstructor {
+    /**
+     * ServiceAreaTask helps you find service areas around any location on a network. A network service area is a region that encompasses all accessible streets (streets that are within a specified impedance). For instance, the 5-minute service area for a point includes all the streets that can be reached within five minutes from that point.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html)
+     */
+
     new(properties?: ServiceAreaTaskProperties): ServiceAreaTask;
   }
 
@@ -6007,14 +25329,41 @@ declare namespace __esri {
   }
 
   interface AddressCandidate extends Accessor, JSONSupport {
+    /**
+     * Address of the candidate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#address)
+     */
     address: string;
+    /**
+     * Name value pairs of field name and field value as defined in `outFields` in [Locator.addressToLocations()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#attributes)
+     */
     attributes: any;
+    /**
+     * The minimum and maximum X and Y coordinates of a bounding box of the address candidate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#extent)
+     */
     extent: Extent;
+    /**
+     * The [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) object representing the location of the [address](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#address).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#location)
+     */
     location: Point;
+    /**
+     * Numeric score between `0` and `100` for geocode candidates. A candidate with a score of `100` means a perfect match, and `0` means no match.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#score)
+     */
     score: number;
   }
 
   interface AddressCandidateConstructor {
+
+
     new(properties?: AddressCandidateProperties): AddressCandidate;
 
     fromJSON(json: any): AddressCandidate;
@@ -6023,161 +25372,769 @@ declare namespace __esri {
   export const AddressCandidate: AddressCandidateConstructor;
 
   interface AddressCandidateProperties {
+    /**
+     * Address of the candidate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#address)
+     */
     address?: string;
+    /**
+     * Name value pairs of field name and field value as defined in `outFields` in [Locator.addressToLocations()](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html#addressToLocations).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#attributes)
+     */
     attributes?: any;
+    /**
+     * The minimum and maximum X and Y coordinates of a bounding box of the address candidate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#extent)
+     */
     extent?: ExtentProperties;
+    /**
+     * The [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) object representing the location of the [address](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#address).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#location)
+     */
     location?: PointProperties;
+    /**
+     * Numeric score between `0` and `100` for geocode candidates. A candidate with a score of `100` means a perfect match, and `0` means no match.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AddressCandidate.html#score)
+     */
     score?: number;
   }
 
   interface AreasAndLengthsParameters extends Accessor {
+    /**
+     * The area unit in which areas of polygons will be calculated. Use the strings listed below or [any other valid area unit](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.AreaUnit.Code.ACRE).  **Possible Values:** acres | hectares | square-miles | square-kilometers | square-meters | square-feet | square-yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#areaUnit)
+     */
     areaUnit: string;
+    /**
+     * Defines the type of calculation for the geometry. The type can be one of the following: 
+     * 
+     * Value | Description
+     * ------|------------
+     * planar | Planar measurements use 2D Cartesian mathematics to calculate length. Use this type if the length needs to be calculated in the input spatial reference. Otherwise use `preserveShape`.
+     * geodesic | Use this type to calculate an area or length using only the vertices of the polygon to define the lines connecting the vertices as geodesic segments independent of the actual shape of the polygon. **Note:** a geodesic segment is the shortest path between two points on an ellipsoid.
+     * preserve-shape | Calculate the area or length of the geometry on the surface of the Earth ellipsoid (for geometries defined in a projected or geographic coordinate system). This method preserves the shape of the geometry in its coordinate system, which means the true area or length will be calculated for the geometry that is displayed on the map.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#calculationType)
+     */
     calculationType: string;
+    /**
+     * The length unit in which perimeters of polygons will be calculated. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#lengthUnit)
+     */
     lengthUnit: string;
+    /**
+     * Polygon geometries for which to compute areas and lengths.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#polygons)
+     */
     polygons: Polygon[];
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface AreasAndLengthsParametersConstructor {
+
+
     new(properties?: AreasAndLengthsParametersProperties): AreasAndLengthsParameters;
   }
 
   export const AreasAndLengthsParameters: AreasAndLengthsParametersConstructor;
 
   interface AreasAndLengthsParametersProperties {
+    /**
+     * The area unit in which areas of polygons will be calculated. Use the strings listed below or [any other valid area unit](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.AreaUnit.Code.ACRE).  **Possible Values:** acres | hectares | square-miles | square-kilometers | square-meters | square-feet | square-yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#areaUnit)
+     */
     areaUnit?: string;
+    /**
+     * Defines the type of calculation for the geometry. The type can be one of the following: 
+     * 
+     * Value | Description
+     * ------|------------
+     * planar | Planar measurements use 2D Cartesian mathematics to calculate length. Use this type if the length needs to be calculated in the input spatial reference. Otherwise use `preserveShape`.
+     * geodesic | Use this type to calculate an area or length using only the vertices of the polygon to define the lines connecting the vertices as geodesic segments independent of the actual shape of the polygon. **Note:** a geodesic segment is the shortest path between two points on an ellipsoid.
+     * preserve-shape | Calculate the area or length of the geometry on the surface of the Earth ellipsoid (for geometries defined in a projected or geographic coordinate system). This method preserves the shape of the geometry in its coordinate system, which means the true area or length will be calculated for the geometry that is displayed on the map.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#calculationType)
+     */
     calculationType?: string;
+    /**
+     * The length unit in which perimeters of polygons will be calculated. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#lengthUnit)
+     */
     lengthUnit?: string;
+    /**
+     * Polygon geometries for which to compute areas and lengths.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-AreasAndLengthsParameters.html#polygons)
+     */
     polygons?: PolygonProperties[];
   }
 
   interface BufferParameters extends Accessor {
+    /**
+     * The spatial reference in which the geometries are buffered.  If `bufferSpatialReference` is not specified, the geometries are buffered in the spatial reference specified by `outSpatialReference`. If `outSpatialReference` is also not specified, they are buffered in the spatial reference of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#bufferSpatialReference)
+     */
     bufferSpatialReference: SpatialReference;
+    /**
+     * The distances the input features are buffered. The distance units are specified by `unit`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#distances)
+     */
     distances: number[];
+    /**
+     * If the input geometries are in a geographic coordinate system, set geodesic to `true` to generate a buffer polygon using a geodesic distance. The `bufferSpatialReference` property is ignored when geodesic is set to `true`. Requires ArcGIS Server 10.1 or greater geometry service. For more information, see the ArcGIS REST API documentation on the GeometryService buffer operation and the geodesic property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#geodesic)
+     */
     geodesic: boolean;
+    /**
+     * The input geometries to buffer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#geometries)
+     */
     geometries: Geometry[];
+    /**
+     * The spatial reference for the returned geometries.  If `outSpatialReference` is not specified, the output geometries are in the spatial reference specified by `bufferSpatialReference`. If `bufferSpatialReference` also is not specified, they are in the spatial reference of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * If `true`, all geometries buffered at a given distance are unioned into a single (possibly multipart) polygon, and the unioned geometry is placed in the output array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#unionResults)
+     */
     unionResults: boolean;
+    /**
+     * The units for calculating each buffer distance. If `unit` is not specified, the units are derived from `bufferSpatialReference`. If `bufferSpatialReference` is not specified, the units are derived from the features.  For a list of valid units, see [esriSRUnitType Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnitType_Constants/000w00000042000000/) and [esriSRUnit2Type Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnit2Type_Constants/000w00000041000000/).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#unit)
+     */
     unit: string;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface BufferParametersConstructor {
+
+
     new(properties?: BufferParametersProperties): BufferParameters;
   }
 
   export const BufferParameters: BufferParametersConstructor;
 
   interface BufferParametersProperties {
+    /**
+     * The spatial reference in which the geometries are buffered.  If `bufferSpatialReference` is not specified, the geometries are buffered in the spatial reference specified by `outSpatialReference`. If `outSpatialReference` is also not specified, they are buffered in the spatial reference of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#bufferSpatialReference)
+     */
     bufferSpatialReference?: SpatialReferenceProperties;
+    /**
+     * The distances the input features are buffered. The distance units are specified by `unit`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#distances)
+     */
     distances?: number[];
+    /**
+     * If the input geometries are in a geographic coordinate system, set geodesic to `true` to generate a buffer polygon using a geodesic distance. The `bufferSpatialReference` property is ignored when geodesic is set to `true`. Requires ArcGIS Server 10.1 or greater geometry service. For more information, see the ArcGIS REST API documentation on the GeometryService buffer operation and the geodesic property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#geodesic)
+     */
     geodesic?: boolean;
+    /**
+     * The input geometries to buffer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#geometries)
+     */
     geometries?: GeometryProperties[];
+    /**
+     * The spatial reference for the returned geometries.  If `outSpatialReference` is not specified, the output geometries are in the spatial reference specified by `bufferSpatialReference`. If `bufferSpatialReference` also is not specified, they are in the spatial reference of the features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * If `true`, all geometries buffered at a given distance are unioned into a single (possibly multipart) polygon, and the unioned geometry is placed in the output array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#unionResults)
+     */
     unionResults?: boolean;
+    /**
+     * The units for calculating each buffer distance. If `unit` is not specified, the units are derived from `bufferSpatialReference`. If `bufferSpatialReference` is not specified, the units are derived from the features.  For a list of valid units, see [esriSRUnitType Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnitType_Constants/000w00000042000000/) and [esriSRUnit2Type Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnit2Type_Constants/000w00000041000000/).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-BufferParameters.html#unit)
+     */
     unit?: string;
   }
 
   interface ClosestFacilityParameters extends Accessor {
+    /**
+     * The list of network attribute names to be accumulated with the analysis, i.e., which attributes should be returned as part of the response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#accumulateAttributes)
+     */
     accumulateAttributes: string[];
+    /**
+     * An array of attribute parameter values that determine which network elements can be used by a vehicle. View the object specifications below for properties of the individual objects in this array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#attributeParameterValues)
+     */
     attributeParameterValues: ClosestFacilityParametersAttributeParameterValues[];
+    /**
+     * The cutoff value used to determine when to stop traversing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#defaultCutoff)
+     */
     defaultCutoff: number;
+    /**
+     * The number of facilities to find.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#defaultTargetFacilityCount)
+     */
     defaultTargetFacilityCount: number;
+    /**
+     * The language used when generating driving directions. This parameter applies only when [returnDirections](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnDirections) parameter is set to `true`. If an unsupported language code is specified, the service returns the directions using the default language, English.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsLanguage)
+     */
     directionsLanguage: string;
+    /**
+     * The length units used when computing driving directions. This parameter applies only when [returnDirections](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnDirections) parameter is set to `true`. If not specified the task will use the value defined by the routing network layer is used.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsLengthUnits)
+     */
     directionsLengthUnits: string;
+    /**
+     * Defines the amount of direction information returned. The default value is standard.  **Known Values:** complete | complete-no-events | instructions-only | standard | summary-only
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsOutputType)
+     */
     directionsOutputType: string;
+    /**
+     * The style to be used when returning directions. The default will be as defined in the network layer. View the REST layer description for your network service to see a list of supported styles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsStyleName)
+     */
     directionsStyleName: string;
+    /**
+     * The name of the attribute field that contains the drive time values. If not specified, the task will use the attribute field defined by the routing network layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsTimeAttribute)
+     */
     directionsTimeAttribute: string;
+    /**
+     * When `true`, restricted network elements should be considered when finding network locations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#doNotLocateOnRestrictedElements)
+     * 
+     * @default true
+     */
     doNotLocateOnRestrictedElements: boolean;
+    /**
+     * The set of facilities loaded as network locations during analysis. These can be specified as either a [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html).  At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url  property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#facilities)
+     */
     facilities: DataLayer | FeatureSet;
+    /**
+     * The network attribute field name used as the impedance attribute during analysis. If not specified the default value defined by the routing network layer.  Valid values include any attribute name listed in the Service Directory under Network Dataset > Network Attributes with a Usage Type of `esriNauTCost`. Specify none to indicate that no network attributes should be used for impedance. If you specify an empty string the default value defined by the service will be used. See the [Understanding the network attribute](https://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000) help topic for more details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#impedanceAttribute)
+     */
     impedanceAttribute: string;
+    /**
+     * The set of incidents loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#incidents)
+     */
     incidents: DataLayer | FeatureSet;
+    /**
+     * The output geometry precision. When `0`, no generalization of the output geometry is performed. Positive values represent the `MaximumAllowableOffset` parameter used by generalize.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputGeometryPrecision)
+     */
     outputGeometryPrecision: number;
+    /**
+     * The units of the output geometry precision.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputGeometryPrecisionUnits)
+     */
     outputGeometryPrecisionUnits: string;
+    /**
+     * The type of output lines to be generated in the result. The default is defined in the specific routing network layer used in your RouteTask. See NAOutputLine for a list of valid values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputLines)
+     */
     outputLines: string;
+    /**
+     * The well-known id of the spatial reference or the spatial reference object for the geometries returned with the analysis results. If `outSpatialReference` is not specified, the geometries are returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference | string;
+    /**
+     * The set of point barriers loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#pointBarriers)
+     */
     pointBarriers: DataLayer | FeatureSet;
+    /**
+     * The set of polygon barriers loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#polygonBarriers)
+     */
     polygonBarriers: DataLayer | FeatureSet;
+    /**
+     * The set of polyline barriers loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#polylineBarriers)
+     */
     polylineBarriers: DataLayer | FeatureSet;
+    /**
+     * The list of network attribute names to be used as restrictions with the analysis. The default is as defined in the specific routing network layer used in your RouteTask. Possible values are listed in the Service Directory under Network Dataset > Network Attributes. You can also specify a value of none to indicate that no network attributes should be used as restrictions. If you specify an empty array, it will default to the default of the service. Use `["none"]` to override the service defaults and specify that no restrictions should be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#restrictionAttributes)
+     */
     restrictionAttributes: string[];
+    /**
+     * Specifies how U-Turns should be handled. The default is as defined in the specific routing network layer used in your module:"esri/tasks/ClosestFacilityTask".  **Known Values:**  allow-backtrack | at-dead-ends-only | no-backtrack | at-dead-ends-and-intersections
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#restrictUTurns)
+     */
     restrictUTurns: string;
+    /**
+     * Indicates whether the service should generate driving directions for each route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnDirections)
+     * 
+     * @default false
+     */
     returnDirections: boolean;
+    /**
+     * If `true`, facilities will be returned with the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnFacilities)
+     * 
+     * @default false
+     */
     returnFacilities: boolean;
+    /**
+     * If `true`, incidents will be returned with the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnIncidents)
+     * 
+     * @default false
+     */
     returnIncidents: boolean;
+    /**
+     * If `true`, point barriers will be returned in the barriers property of the [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnPointBarriers)
+     * 
+     * @default false
+     */
     returnPointBarriers: boolean;
+    /**
+     * If `true`, polygon barriers will be returned in the barriers property of the [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnPolygonBarriers)
+     * 
+     * @default false
+     */
     returnPolygonBarriers: boolean;
+    /**
+     * If `true`, polyline barriers will be returned in the barriers property of the [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnPolylineBarriers)
+     * 
+     * @default false
+     */
     returnPolylineBarriers: boolean;
+    /**
+     * When `true`, closest facility routes will be generated and returned in the route property of each [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnRoutes)
+     * 
+     * @default true
+     */
     returnRoutes: boolean;
+    /**
+     * The arrival or departure date and time. For example, if the travelDirection is set to `TO_FACILITY` and `timeOfDayUsage` is set to "end" and `timeOfDay` is set to 8:00 a.m., the returned route(s) will be setup to arrive at the facility at 8:00 a.m. local time. *Requires ArcGIS Server service version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#timeOfDay)
+     */
     timeOfDay: Date;
+    /**
+     * Defines the way the `timeOfDay` value is used. The default value is defined in the network layer. *Requires ArcGIS Server service version 10.1 or greater.*  **Known Values:** start | end
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#timeOfDayUsage)
+     */
     timeOfDayUsage: string;
+    /**
+     * Options for traveling to or from the facility. Default values are defined by the newtork layer. See NATravelDirection for a list of valid values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#travelDirection)
+     */
     travelDirection: string;
+    /**
+     * If `true`, the hierarchy attribute for the network will be used in analysis. The default is defined in the routing network layer used by the [ClosestFacilityTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ClosestFacilityTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#useHierarchy)
+     * 
+     * @default false
+     */
     useHierarchy: boolean;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface ClosestFacilityParametersConstructor {
+    /**
+     * Input parameters for [ClosestFacilityTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ClosestFacilityTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html)
+     */
+
     new(properties?: ClosestFacilityParametersProperties): ClosestFacilityParameters;
   }
 
   export const ClosestFacilityParameters: ClosestFacilityParametersConstructor;
 
   interface ClosestFacilityParametersProperties {
+    /**
+     * The list of network attribute names to be accumulated with the analysis, i.e., which attributes should be returned as part of the response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#accumulateAttributes)
+     */
     accumulateAttributes?: string[];
+    /**
+     * An array of attribute parameter values that determine which network elements can be used by a vehicle. View the object specifications below for properties of the individual objects in this array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#attributeParameterValues)
+     */
     attributeParameterValues?: ClosestFacilityParametersAttributeParameterValues[];
+    /**
+     * The cutoff value used to determine when to stop traversing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#defaultCutoff)
+     */
     defaultCutoff?: number;
+    /**
+     * The number of facilities to find.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#defaultTargetFacilityCount)
+     */
     defaultTargetFacilityCount?: number;
+    /**
+     * The language used when generating driving directions. This parameter applies only when [returnDirections](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnDirections) parameter is set to `true`. If an unsupported language code is specified, the service returns the directions using the default language, English.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsLanguage)
+     */
     directionsLanguage?: string;
+    /**
+     * The length units used when computing driving directions. This parameter applies only when [returnDirections](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnDirections) parameter is set to `true`. If not specified the task will use the value defined by the routing network layer is used.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsLengthUnits)
+     */
     directionsLengthUnits?: string;
+    /**
+     * Defines the amount of direction information returned. The default value is standard.  **Known Values:** complete | complete-no-events | instructions-only | standard | summary-only
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsOutputType)
+     */
     directionsOutputType?: string;
+    /**
+     * The style to be used when returning directions. The default will be as defined in the network layer. View the REST layer description for your network service to see a list of supported styles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsStyleName)
+     */
     directionsStyleName?: string;
+    /**
+     * The name of the attribute field that contains the drive time values. If not specified, the task will use the attribute field defined by the routing network layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#directionsTimeAttribute)
+     */
     directionsTimeAttribute?: string;
+    /**
+     * When `true`, restricted network elements should be considered when finding network locations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#doNotLocateOnRestrictedElements)
+     * 
+     * @default true
+     */
     doNotLocateOnRestrictedElements?: boolean;
+    /**
+     * The set of facilities loaded as network locations during analysis. These can be specified as either a [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html).  At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url  property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#facilities)
+     */
     facilities?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The network attribute field name used as the impedance attribute during analysis. If not specified the default value defined by the routing network layer.  Valid values include any attribute name listed in the Service Directory under Network Dataset > Network Attributes with a Usage Type of `esriNauTCost`. Specify none to indicate that no network attributes should be used for impedance. If you specify an empty string the default value defined by the service will be used. See the [Understanding the network attribute](https://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000) help topic for more details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#impedanceAttribute)
+     */
     impedanceAttribute?: string;
+    /**
+     * The set of incidents loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#incidents)
+     */
     incidents?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The output geometry precision. When `0`, no generalization of the output geometry is performed. Positive values represent the `MaximumAllowableOffset` parameter used by generalize.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputGeometryPrecision)
+     */
     outputGeometryPrecision?: number;
+    /**
+     * The units of the output geometry precision.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputGeometryPrecisionUnits)
+     */
     outputGeometryPrecisionUnits?: string;
+    /**
+     * The type of output lines to be generated in the result. The default is defined in the specific routing network layer used in your RouteTask. See NAOutputLine for a list of valid values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputLines)
+     */
     outputLines?: string;
+    /**
+     * The well-known id of the spatial reference or the spatial reference object for the geometries returned with the analysis results. If `outSpatialReference` is not specified, the geometries are returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties | string;
+    /**
+     * The set of point barriers loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#pointBarriers)
+     */
     pointBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The set of polygon barriers loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#polygonBarriers)
+     */
     polygonBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The set of polyline barriers loaded as network locations during analysis. Can be an instance of [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html) or [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#polylineBarriers)
+     */
     polylineBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The list of network attribute names to be used as restrictions with the analysis. The default is as defined in the specific routing network layer used in your RouteTask. Possible values are listed in the Service Directory under Network Dataset > Network Attributes. You can also specify a value of none to indicate that no network attributes should be used as restrictions. If you specify an empty array, it will default to the default of the service. Use `["none"]` to override the service defaults and specify that no restrictions should be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#restrictionAttributes)
+     */
     restrictionAttributes?: string[];
+    /**
+     * Specifies how U-Turns should be handled. The default is as defined in the specific routing network layer used in your module:"esri/tasks/ClosestFacilityTask".  **Known Values:**  allow-backtrack | at-dead-ends-only | no-backtrack | at-dead-ends-and-intersections
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#restrictUTurns)
+     */
     restrictUTurns?: string;
+    /**
+     * Indicates whether the service should generate driving directions for each route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnDirections)
+     * 
+     * @default false
+     */
     returnDirections?: boolean;
+    /**
+     * If `true`, facilities will be returned with the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnFacilities)
+     * 
+     * @default false
+     */
     returnFacilities?: boolean;
+    /**
+     * If `true`, incidents will be returned with the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnIncidents)
+     * 
+     * @default false
+     */
     returnIncidents?: boolean;
+    /**
+     * If `true`, point barriers will be returned in the barriers property of the [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnPointBarriers)
+     * 
+     * @default false
+     */
     returnPointBarriers?: boolean;
+    /**
+     * If `true`, polygon barriers will be returned in the barriers property of the [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnPolygonBarriers)
+     * 
+     * @default false
+     */
     returnPolygonBarriers?: boolean;
+    /**
+     * If `true`, polyline barriers will be returned in the barriers property of the [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnPolylineBarriers)
+     * 
+     * @default false
+     */
     returnPolylineBarriers?: boolean;
+    /**
+     * When `true`, closest facility routes will be generated and returned in the route property of each [ClosestFacilitySolveResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#returnRoutes)
+     * 
+     * @default true
+     */
     returnRoutes?: boolean;
+    /**
+     * The arrival or departure date and time. For example, if the travelDirection is set to `TO_FACILITY` and `timeOfDayUsage` is set to "end" and `timeOfDay` is set to 8:00 a.m., the returned route(s) will be setup to arrive at the facility at 8:00 a.m. local time. *Requires ArcGIS Server service version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#timeOfDay)
+     */
     timeOfDay?: DateProperties;
+    /**
+     * Defines the way the `timeOfDay` value is used. The default value is defined in the network layer. *Requires ArcGIS Server service version 10.1 or greater.*  **Known Values:** start | end
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#timeOfDayUsage)
+     */
     timeOfDayUsage?: string;
+    /**
+     * Options for traveling to or from the facility. Default values are defined by the newtork layer. See NATravelDirection for a list of valid values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#travelDirection)
+     */
     travelDirection?: string;
+    /**
+     * If `true`, the hierarchy attribute for the network will be used in analysis. The default is defined in the routing network layer used by the [ClosestFacilityTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ClosestFacilityTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#useHierarchy)
+     * 
+     * @default false
+     */
     useHierarchy?: boolean;
   }
 
-  export interface ClosestFacilityParametersAttributeParameterValues {
+
+  export interface ClosestFacilityParametersAttributeParameterValues extends Object {
+    /**
+     * The name of the attribute.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#attributeParameterValues)
+     */
     attributeName: string;
+    /**
+     * The parameter name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#attributeParameterValues)
+     */
     parameterName: string;
+    /**
+     * The parameter value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#attributeParameterValues)
+     */
     value: string;
   }
 
   interface ClosestFacilitySolveResult extends Accessor, JSONSupport {
+    /**
+     * An array of directions. A direction is an instance of [DirectionsFeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html). Route directions are returned if `returnDirections = true` (default is false).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#directions)
+     */
     directions: DirectionsFeatureSet;
+    /**
+     * An array of points representing facilities. Only returned when `ClosestFacilityParameters.returnFacilities = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#facilities)
+     */
     facilities: Point[];
+    /**
+     * An array of points representing incidents. Only returned when `ClosestFacilityParameters.returnIncidents = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#incidents)
+     */
     incidents: Point[];
+    /**
+     * Message received when the solve is complete. If a closest facility cannot be solved, the message returned by the server identifies the incident that could not be solved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#messages)
+     */
     messages: NAMessage[];
+    /**
+     * The point barriers are an array of points. They are returned only if `ClosestFacilityParameters.returnPointBarriers` was set to `true` (which is not the default). If you send in the point barriers as a FeatureSet (instead of using DataLayer), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#pointBarriers)
+     */
     pointBarriers: Point[];
+    /**
+     * The polygon barriers are an array of polygons. They are returned only if `ClosestFacilityParameters.returnPolygonBarriers` was set to `true` (which is not the default). If you send in the polygon barriers as a FeatureSet (instead of using DataLayer), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#polygonBarriers)
+     */
     polygonBarriers: Polygon[];
+    /**
+     * The polyline barriers are an array of polylines. They are returned only if `ClosestFacilityParameters.returnPolylineBarriers` was set to `true` (which is not the default). If you send in the polyline barriers as a FeatureSet (instead of using DataLayer), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#polylineBarriers)
+     */
     polylineBarriers: Polyline[];
+    /**
+     * The array of routes. Route graphics are returned if `returnRoutes = true` and `outputLines` does not equal `esriNAOutputLineNone`. From version 2.0 to 2.5 the type is an array of Polylines. At version 2.6 the type is an array of Graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#routes)
+     */
     routes: Graphic[];
   }
 
   interface ClosestFacilitySolveResultConstructor {
+    /**
+     * The result from [ClosestFacilityTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ClosestFacilityTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html)
+     */
+
     new(properties?: ClosestFacilitySolveResultProperties): ClosestFacilitySolveResult;
 
     fromJSON(json: any): ClosestFacilitySolveResult;
@@ -6186,22 +26143,74 @@ declare namespace __esri {
   export const ClosestFacilitySolveResult: ClosestFacilitySolveResultConstructor;
 
   interface ClosestFacilitySolveResultProperties {
+    /**
+     * An array of directions. A direction is an instance of [DirectionsFeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html). Route directions are returned if `returnDirections = true` (default is false).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#directions)
+     */
     directions?: DirectionsFeatureSetProperties;
+    /**
+     * An array of points representing facilities. Only returned when `ClosestFacilityParameters.returnFacilities = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#facilities)
+     */
     facilities?: PointProperties[];
+    /**
+     * An array of points representing incidents. Only returned when `ClosestFacilityParameters.returnIncidents = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#incidents)
+     */
     incidents?: PointProperties[];
+    /**
+     * Message received when the solve is complete. If a closest facility cannot be solved, the message returned by the server identifies the incident that could not be solved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#messages)
+     */
     messages?: NAMessageProperties[];
+    /**
+     * The point barriers are an array of points. They are returned only if `ClosestFacilityParameters.returnPointBarriers` was set to `true` (which is not the default). If you send in the point barriers as a FeatureSet (instead of using DataLayer), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#pointBarriers)
+     */
     pointBarriers?: PointProperties[];
+    /**
+     * The polygon barriers are an array of polygons. They are returned only if `ClosestFacilityParameters.returnPolygonBarriers` was set to `true` (which is not the default). If you send in the polygon barriers as a FeatureSet (instead of using DataLayer), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#polygonBarriers)
+     */
     polygonBarriers?: PolygonProperties[];
+    /**
+     * The polyline barriers are an array of polylines. They are returned only if `ClosestFacilityParameters.returnPolylineBarriers` was set to `true` (which is not the default). If you send in the polyline barriers as a FeatureSet (instead of using DataLayer), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#polylineBarriers)
+     */
     polylineBarriers?: PolylineProperties[];
+    /**
+     * The array of routes. Route graphics are returned if `returnRoutes = true` and `outputLines` does not equal `esriNAOutputLineNone`. From version 2.0 to 2.5 the type is an array of Polylines. At version 2.6 the type is an array of Graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilitySolveResult.html#routes)
+     */
     routes?: GraphicProperties[];
   }
 
   interface DataFile extends Accessor, JSONSupport {
+    /**
+     * The ID of the uploaded file returned as a result of the upload operation. For ArcGIS Server 10.1 and greater services that support uploads, this class can be used to specify an uploaded item as input by specifying the ItemID.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html#itemId)
+     */
     itemId: string;
+    /**
+     * URL to the location of the data file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html#url)
+     */
     url: string;
   }
 
   interface DataFileConstructor {
+
+
     new(properties?: DataFileProperties): DataFile;
 
     fromJSON(json: any): DataFile;
@@ -6210,38 +26219,141 @@ declare namespace __esri {
   export const DataFile: DataFileConstructor;
 
   interface DataFileProperties {
+    /**
+     * The ID of the uploaded file returned as a result of the upload operation. For ArcGIS Server 10.1 and greater services that support uploads, this class can be used to specify an uploaded item as input by specifying the ItemID.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html#itemId)
+     */
     itemId?: string;
+    /**
+     * URL to the location of the data file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html#url)
+     */
     url?: string;
   }
 
   interface DataLayer extends Accessor {
+    /**
+     * The geometry to apply to the spatial filter. The spatial relationship as specified by [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#spatialRelationship) is applied to this geometry while performing the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#geometry)
+     */
     geometry: Geometry;
+    /**
+     * The name of the data layer in the map service that is being referenced.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#name)
+     */
     name: string;
+    /**
+     * The spatial relationship to be applied on the input geometry while performing the query. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * intersects | Part of a feature from feature class 1 is contained in a feature from feature class 2.
+     * contains | Part or all of a feature from feature class 1 is contained within a feature from feature class 2.
+     * crosses | The feature from feature class 1 crosses a feature from feature class 2.
+     * envelope-intersects | The envelope of feature class 1 intersects with the envelope of feature class 2.
+     * index-intersects | The envelope of the query feature class intersects the index entry for the target feature class.
+     * overlaps | Features from feature class 1 overlap features in feature class 2.
+     * touches | The feature from feature class 1 touches the border of a feature from feature class 2.
+     * within | The feature from feature class 1 is completely enclosed by the feature from feature class 2.
+     * relation | Allows specification of any relationship defined using the [Shape Comparison Language](http://resources.esri.com/help/9.3/arcgisengine/dotnet/concepts_start.htm#40de6491-9b2d-440d-848b-2609efcd46b1.htm).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#spatialRelationship)
+     */
     spatialRelationship: string;
+    /**
+     * A where clause for the query. Any legal SQL where clause operating on the fields in the layer is allowed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#where)
+     */
     where: string;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface DataLayerConstructor {
+    /**
+     * Input for properties of ClosestFacilityParameters,RouteParameters or ServiceAreaParameters. The DataLayer can be used to define the following for each paramater type:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html)
+     */
+
     new(properties?: DataLayerProperties): DataLayer;
   }
 
   export const DataLayer: DataLayerConstructor;
 
   interface DataLayerProperties {
+    /**
+     * The geometry to apply to the spatial filter. The spatial relationship as specified by [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#spatialRelationship) is applied to this geometry while performing the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#geometry)
+     */
     geometry?: GeometryProperties;
+    /**
+     * The name of the data layer in the map service that is being referenced.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#name)
+     */
     name?: string;
+    /**
+     * The spatial relationship to be applied on the input geometry while performing the query. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * intersects | Part of a feature from feature class 1 is contained in a feature from feature class 2.
+     * contains | Part or all of a feature from feature class 1 is contained within a feature from feature class 2.
+     * crosses | The feature from feature class 1 crosses a feature from feature class 2.
+     * envelope-intersects | The envelope of feature class 1 intersects with the envelope of feature class 2.
+     * index-intersects | The envelope of the query feature class intersects the index entry for the target feature class.
+     * overlaps | Features from feature class 1 overlap features in feature class 2.
+     * touches | The feature from feature class 1 touches the border of a feature from feature class 2.
+     * within | The feature from feature class 1 is completely enclosed by the feature from feature class 2.
+     * relation | Allows specification of any relationship defined using the [Shape Comparison Language](http://resources.esri.com/help/9.3/arcgisengine/dotnet/concepts_start.htm#40de6491-9b2d-440d-848b-2609efcd46b1.htm).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#spatialRelationship)
+     */
     spatialRelationship?: string;
+    /**
+     * A where clause for the query. Any legal SQL where clause operating on the fields in the layer is allowed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html#where)
+     */
     where?: string;
   }
 
   interface supportDate extends Accessor, JSONSupport {
+    /**
+     * Date value returned from server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Date.html#date)
+     */
     date: Date;
+    /**
+     * The format of the date used in the date property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Date.html#format)
+     * 
+     * @default EEE MMM dd HH:mm:ss zzz yyyy
+     */
     format: string;
   }
 
   interface supportDateConstructor {
+
+
     new(properties?: supportDateProperties): supportDate;
 
     fromJSON(json: any): supportDate;
@@ -6250,44 +26362,151 @@ declare namespace __esri {
   export const supportDate: supportDateConstructor;
 
   interface supportDateProperties {
+    /**
+     * Date value returned from server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Date.html#date)
+     */
     date?: DateProperties;
+    /**
+     * The format of the date used in the date property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Date.html#format)
+     * 
+     * @default EEE MMM dd HH:mm:ss zzz yyyy
+     */
     format?: string;
   }
 
   interface DensifyParameters extends Accessor {
+    /**
+     * If `true`, Geographic Coordinate System spatial references are used or densify geodesic will be performed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#geodesic)
+     */
     geodesic: boolean;
+    /**
+     * The array of geometries to be densified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#geometries)
+     */
     geometries: Geometry[];
+    /**
+     * The length unit of `maxSegmentLength`. For a list of valid units, see [esriSRUnitType Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnitType_Constants/000w00000042000000/) and [esriSRUnit2Type Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnit2Type_Constants/000w00000041000000/).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#lengthUnit)
+     */
     lengthUnit: string;
+    /**
+     * All segments longer than `maxSegmentLength` are replaced with sequences of lines no longer than `maxSegmentLength.`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#maxSegmentLength)
+     */
     maxSegmentLength: number;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface DensifyParametersConstructor {
+
+
     new(properties?: DensifyParametersProperties): DensifyParameters;
   }
 
   export const DensifyParameters: DensifyParametersConstructor;
 
   interface DensifyParametersProperties {
+    /**
+     * If `true`, Geographic Coordinate System spatial references are used or densify geodesic will be performed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#geodesic)
+     */
     geodesic?: boolean;
+    /**
+     * The array of geometries to be densified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#geometries)
+     */
     geometries?: GeometryProperties[];
+    /**
+     * The length unit of `maxSegmentLength`. For a list of valid units, see [esriSRUnitType Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnitType_Constants/000w00000042000000/) and [esriSRUnit2Type Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnit2Type_Constants/000w00000041000000/).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#lengthUnit)
+     */
     lengthUnit?: string;
+    /**
+     * All segments longer than `maxSegmentLength` are replaced with sequences of lines no longer than `maxSegmentLength.`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DensifyParameters.html#maxSegmentLength)
+     */
     maxSegmentLength?: number;
   }
 
   interface DirectionsFeatureSet extends FeatureSet, Accessor {
+    /**
+     * The extent of the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#extent)
+     */
     extent: Extent;
+    /**
+     * A single polyline representing the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#mergedGeometry)
+     */
     mergedGeometry: Polyline;
+    /**
+     * The ID of the route returned from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#routeId)
+     */
     routeId: string;
+    /**
+     * Name specified in [RouteParameters.stops](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#stops).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#routeName)
+     */
     routeName: string;
+    /**
+     * Lists additional information about the directions depending on the value of [RouteParameters.directionsOutputType](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsOutputType).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#strings)
+     */
     strings: any[];
+    /**
+     * Actual drive time calculated for the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#totalDriveTime)
+     */
     totalDriveTime: number;
+    /**
+     * The length of the route as specified in the units set in [RouteParameters.directionsLengthUnits](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsLengthUnits).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#totalLength)
+     */
     totalLength: number;
+    /**
+     * The total time calculated for the route as specified in the units set in [RouteParameters.directionsTimeAttribute](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsTimeAttribute).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#totalTime)
+     */
     totalTime: number;
   }
 
   interface DirectionsFeatureSetConstructor {
+    /**
+     * A [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) that has properties specific to routing. The [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#features) property contains the turn by turn directions text and geometry of the route. The attributes for each feature provide information associated with the corresponding route segment. The following attributes are returned:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html)
+     */
+
     new(properties?: DirectionsFeatureSetProperties): DirectionsFeatureSet;
 
     fromJSON(json: any): DirectionsFeatureSet;
@@ -6296,48 +26515,169 @@ declare namespace __esri {
   export const DirectionsFeatureSet: DirectionsFeatureSetConstructor;
 
   interface DirectionsFeatureSetProperties extends FeatureSetProperties {
+    /**
+     * The extent of the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#extent)
+     */
     extent?: ExtentProperties;
+    /**
+     * A single polyline representing the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#mergedGeometry)
+     */
     mergedGeometry?: PolylineProperties;
+    /**
+     * The ID of the route returned from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#routeId)
+     */
     routeId?: string;
+    /**
+     * Name specified in [RouteParameters.stops](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#stops).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#routeName)
+     */
     routeName?: string;
+    /**
+     * Lists additional information about the directions depending on the value of [RouteParameters.directionsOutputType](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsOutputType).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#strings)
+     */
     strings?: any[];
+    /**
+     * Actual drive time calculated for the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#totalDriveTime)
+     */
     totalDriveTime?: number;
+    /**
+     * The length of the route as specified in the units set in [RouteParameters.directionsLengthUnits](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsLengthUnits).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#totalLength)
+     */
     totalLength?: number;
+    /**
+     * The total time calculated for the route as specified in the units set in [RouteParameters.directionsTimeAttribute](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsTimeAttribute).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DirectionsFeatureSet.html#totalTime)
+     */
     totalTime?: number;
   }
 
   interface DistanceParameters extends Accessor {
+    /**
+     * Specifies the units for measuring distance between [geometry1](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry1) and [geometry2](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry2). If the unit is not specified the units are derived from the spatial reference. For a list of valid units, see [esriSRUnitType Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnitType_Constants/000w00000042000000/) and [esriSRUnit2Type Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnit2Type_Constants/000w00000041000000/).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#distanceUnit)
+     */
     distanceUnit: string;
+    /**
+     * When `true`, the geodesic distance between [geometry1](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry1) and [geometry2](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry2) is measured.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geodesic)
+     */
     geodesic: boolean;
+    /**
+     * The geometry from which the distance is to be measured. The geometry can be a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html), or a [Multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry1)
+     */
     geometry1: Geometry[];
+    /**
+     * The geometry to which the distance is to be measured. The geometry can be a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html), or a [Multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry2)
+     */
     geometry2: Geometry[];
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface DistanceParametersConstructor {
+
+
     new(properties?: DistanceParametersProperties): DistanceParameters;
   }
 
   export const DistanceParameters: DistanceParametersConstructor;
 
   interface DistanceParametersProperties {
+    /**
+     * Specifies the units for measuring distance between [geometry1](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry1) and [geometry2](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry2). If the unit is not specified the units are derived from the spatial reference. For a list of valid units, see [esriSRUnitType Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnitType_Constants/000w00000042000000/) and [esriSRUnit2Type Constants](http://resources.arcgis.com/en/help/arcobjects-cpp/componenthelp/index.html#/esriSRUnit2Type_Constants/000w00000041000000/).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#distanceUnit)
+     */
     distanceUnit?: string;
+    /**
+     * When `true`, the geodesic distance between [geometry1](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry1) and [geometry2](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry2) is measured.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geodesic)
+     */
     geodesic?: boolean;
+    /**
+     * The geometry from which the distance is to be measured. The geometry can be a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html), or a [Multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry1)
+     */
     geometry1?: GeometryProperties[];
+    /**
+     * The geometry to which the distance is to be measured. The geometry can be a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html), or a [Multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DistanceParameters.html#geometry2)
+     */
     geometry2?: GeometryProperties[];
   }
 
   interface FeatureSet extends Accessor, JSONSupport {
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the feature. This is only applicable when the FeatureSet is returned from a task. It is ignored when the FeatureSet is used as input to a geoprocessing task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#displayFieldName)
+     */
     displayFieldName: string;
+    /**
+     * Typically, a layer has a limit on the number of features (i.e., records) returned by the query operation. If `maxRecordCount` is configured for a layer, `exceededTransferLimit` will be `true` if a query matches more than the `maxRecordCount` features. It will be `false` otherwise. Supported by ArcGIS Server version 10.1 and later.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#exceededTransferLimit)
+     */
     exceededTransferLimit: boolean;
+    /**
+     * The array of graphics returned from a task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#features)
+     */
     features: Graphic[];
+    /**
+     * Information about each field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#fields)
+     */
     fields: Field[];
+    /**
+     * The geometry type of the FeatureSet.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#geometryType)
+     */
     geometryType: string;
+    /**
+     * When a FeatureSet is used as input to Geoprocessor, the spatial reference is set to the map's spatial reference by default. This value can be changed. When a FeatureSet is returned from a task, the value is the result as returned from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#spatialReference)
+     */
     spatialReference: SpatialReference;
   }
 
   interface FeatureSetConstructor {
+
+
     new(properties?: FeatureSetProperties): FeatureSet;
 
     fromJSON(json: any): FeatureSet;
@@ -6346,54 +26686,213 @@ declare namespace __esri {
   export const FeatureSet: FeatureSetConstructor;
 
   interface FeatureSetProperties {
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the feature. This is only applicable when the FeatureSet is returned from a task. It is ignored when the FeatureSet is used as input to a geoprocessing task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#displayFieldName)
+     */
     displayFieldName?: string;
+    /**
+     * Typically, a layer has a limit on the number of features (i.e., records) returned by the query operation. If `maxRecordCount` is configured for a layer, `exceededTransferLimit` will be `true` if a query matches more than the `maxRecordCount` features. It will be `false` otherwise. Supported by ArcGIS Server version 10.1 and later.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#exceededTransferLimit)
+     */
     exceededTransferLimit?: boolean;
+    /**
+     * The array of graphics returned from a task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#features)
+     */
     features?: GraphicProperties[];
+    /**
+     * Information about each field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#fields)
+     */
     fields?: FieldProperties[];
+    /**
+     * The geometry type of the FeatureSet.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#geometryType)
+     */
     geometryType?: string;
+    /**
+     * When a FeatureSet is used as input to Geoprocessor, the spatial reference is set to the map's spatial reference by default. This value can be changed. When a FeatureSet is returned from a task, the value is the result as returned from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
   }
 
   interface FindParameters extends Accessor {
+    /**
+     * Determines whether to look for an exact match of the search text or not. If `true`, searches for a value that contains the provided [searchText](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchText). This is a case-insensitive search. If `false`, searches for an exact match of the [searchText](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchText) string. The exact match is case-sensitive.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#contains)
+     * 
+     * @default true
+     */
     contains: boolean;
+    /**
+     * Specify the number of decimal places for the geometries returned by the task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#geometryPrecision)
+     */
     geometryPrecision: number;
+    /**
+     * The layers to perform the find operation on. The layers are specified as a comma-separated list of layer ids. The list of ids is returned in [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html) layerInfos.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#layerIds)
+     */
     layerIds: number[];
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the find operation. The offset is in the units of [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#outSpatialReference). If [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#outSpatialReference) is not defined, the spatial reference of the map is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#maxAllowableOffset)
+     */
     maxAllowableOffset: number;
+    /**
+     * The spatial reference of the output geometries. If this is not specified, the output geometries are returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * If `true`, the output will include the geometry associated with each result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry: boolean;
+    /**
+     * The names of the fields of a layer to search. The fields are specified as a comma-separated list of field names. If this parameter is not specified, all fields are searched by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchFields)
+     */
     searchFields: string[];
+    /**
+     * The text that is searched across the layers and the fields as specified in the `layers` and [searchFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchFields) properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchText)
+     */
     searchText: string;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface FindParametersConstructor {
+
+
     new(properties?: FindParametersProperties): FindParameters;
   }
 
   export const FindParameters: FindParametersConstructor;
 
   interface FindParametersProperties {
+    /**
+     * Determines whether to look for an exact match of the search text or not. If `true`, searches for a value that contains the provided [searchText](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchText). This is a case-insensitive search. If `false`, searches for an exact match of the [searchText](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchText) string. The exact match is case-sensitive.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#contains)
+     * 
+     * @default true
+     */
     contains?: boolean;
+    /**
+     * Specify the number of decimal places for the geometries returned by the task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#geometryPrecision)
+     */
     geometryPrecision?: number;
+    /**
+     * The layers to perform the find operation on. The layers are specified as a comma-separated list of layer ids. The list of ids is returned in [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html) layerInfos.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#layerIds)
+     */
     layerIds?: number[];
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the find operation. The offset is in the units of [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#outSpatialReference). If [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#outSpatialReference) is not defined, the spatial reference of the map is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#maxAllowableOffset)
+     */
     maxAllowableOffset?: number;
+    /**
+     * The spatial reference of the output geometries. If this is not specified, the output geometries are returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * If `true`, the output will include the geometry associated with each result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry?: boolean;
+    /**
+     * The names of the fields of a layer to search. The fields are specified as a comma-separated list of field names. If this parameter is not specified, all fields are searched by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchFields)
+     */
     searchFields?: string[];
+    /**
+     * The text that is searched across the layers and the fields as specified in the `layers` and [searchFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchFields) properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindParameters.html#searchText)
+     */
     searchText?: string;
   }
 
   interface FindResult extends Accessor, JSONSupport {
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#displayFieldName)
+     */
     displayFieldName: string;
+    /**
+     * The found feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#feature)
+     */
     feature: Graphic;
+    /**
+     * The name of the field that contains the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#foundFieldName)
+     */
     foundFieldName: string;
+    /**
+     * Unique ID of the layer that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#layerId)
+     */
     layerId: number;
+    /**
+     * The layer name that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#layerName)
+     */
     layerName: string;
+    /**
+     * The value of the `foundFieldName` in the feature's attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#value)
+     */
     value: void;
   }
 
   interface FindResultConstructor {
+
+
     new(properties?: FindResultProperties): FindResult;
 
     fromJSON(json: any): FindResult;
@@ -6402,40 +26901,121 @@ declare namespace __esri {
   export const FindResult: FindResultConstructor;
 
   interface FindResultProperties {
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#displayFieldName)
+     */
     displayFieldName?: string;
+    /**
+     * The found feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#feature)
+     */
     feature?: GraphicProperties;
+    /**
+     * The name of the field that contains the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#foundFieldName)
+     */
     foundFieldName?: string;
+    /**
+     * Unique ID of the layer that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#layerId)
+     */
     layerId?: number;
+    /**
+     * The layer name that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#layerName)
+     */
     layerName?: string;
+    /**
+     * The value of the `foundFieldName` in the feature's attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FindResult.html#value)
+     */
     value?: void;
   }
 
   interface GeneralizeParameters extends Accessor {
+    /**
+     * The maximum deviation unit. If the unit is not specified, units are derived from the spatial reference. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GeneralizeParameters.html#deviationUnit)
+     */
     deviationUnit: string;
+    /**
+     * The array of input geometries to generalize. All geometries in this array must be of the same geometry type (e.g. `esriGeometryPolyline` or `esriGeometryPolygon`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GeneralizeParameters.html#geometries)
+     */
     geometries: Geometry[];
+    /**
+     * The maximum deviation for constructing a generalized geometry based on the input geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GeneralizeParameters.html#maxDeviation)
+     */
     maxDeviation: number;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GeneralizeParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface GeneralizeParametersConstructor {
+
+
     new(properties?: GeneralizeParametersProperties): GeneralizeParameters;
   }
 
   export const GeneralizeParameters: GeneralizeParametersConstructor;
 
   interface GeneralizeParametersProperties {
+    /**
+     * The maximum deviation unit. If the unit is not specified, units are derived from the spatial reference. Use one of the possible values listed below or any of the [numeric codes for linear units](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GeneralizeParameters.html#deviationUnit)
+     */
     deviationUnit?: string;
+    /**
+     * The array of input geometries to generalize. All geometries in this array must be of the same geometry type (e.g. `esriGeometryPolyline` or `esriGeometryPolygon`).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GeneralizeParameters.html#geometries)
+     */
     geometries?: GeometryProperties[];
+    /**
+     * The maximum deviation for constructing a generalized geometry based on the input geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GeneralizeParameters.html#maxDeviation)
+     */
     maxDeviation?: number;
   }
 
   interface GPMessage extends Accessor, JSONSupport {
+    /**
+     * The geoprocessing message.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GPMessage.html#description)
+     */
     description: string;
+    /**
+     * The geoprocessing message type.  **Known Values:** informative | process-definition | process-start | process-stop | warning | error | empty | abort
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GPMessage.html#type)
+     */
     type: string;
   }
 
   interface GPMessageConstructor {
+
+
     new(properties?: GPMessageProperties): GPMessage;
 
     fromJSON(json: any): GPMessage;
@@ -6444,56 +27024,251 @@ declare namespace __esri {
   export const GPMessage: GPMessageConstructor;
 
   interface GPMessageProperties {
+    /**
+     * The geoprocessing message.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GPMessage.html#description)
+     */
     description?: string;
+    /**
+     * The geoprocessing message type.  **Known Values:** informative | process-definition | process-start | process-stop | warning | error | empty | abort
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-GPMessage.html#type)
+     */
     type?: string;
   }
 
   interface IdentifyParameters extends Accessor {
+    /**
+     * Resolution of the current map view in dots per inch.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#dpi)
+     * 
+     * @default 96
+     */
     dpi: number;
+    /**
+     * The geometry used to select features during the Identify operation. The type of the geometry is specified by [Geometry.type](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#type). The most common geometry used with Identify is a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#geometry)
+     */
     geometry: Geometry;
+    /**
+     * Specify the number of decimal places for the geometries returned by the task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#geometryPrecision)
+     */
     geometryPrecision: number;
+    /**
+     * Height of the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#height)
+     * 
+     * @default 400
+     */
     height: number;
+    /**
+     * The layers on which to perform the identify operation. The layers are specified as a comma-separated list of layer IDs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#layerIds)
+     */
     layerIds: number[];
+    /**
+     * Specifies which layers to use when using Identify. 
+     * 
+     * Possible values | Description
+     * --------------- | -----------
+     * top | Only the top-most visible layer is identified.
+     * visible | All visible layers are identified.
+     * all | All layers are identified, even if they are not visible. If your service has many layers, a request using this option will not perform well. A visible layer means you can see it in the map at the current extent.  If a layer is turned off or not in range based on its scale dependency settings, it cannot be identified.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#layerOption)
+     * 
+     * @default top
+     */
     layerOption: string;
+    /**
+     * The Extent or bounding box of the current map view. The `mapExtent` property is assumed to be in the spatial reference of the map unless [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference) has been specified.  The values for [mapExtent](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#mapExtent), [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#height), [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#width), and [dpi](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#dpi) are used to determine the current map scale. Once the scale is known, the map service can exclude layers based on their scale dependency settings. The map service is not performing a spatial intersection based on the provided extent. These properties are also used to calculate the search distance on the map based on the tolerance in screen pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#mapExtent)
+     */
     mapExtent: Extent;
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the identify operation. The offset is in the units of the [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference). If a [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference) is not defined the spatial reference of the view is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#maxAllowableOffset)
+     */
     maxAllowableOffset: number;
+    /**
+     * If `true`, the result set includes the geometry associated with each result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry: boolean;
+    /**
+     * The spatial reference of the input and output geometries as well as of the [mapExtent](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#mapExtent). If the spatial reference is not specified, the geometry and the extent are assumed to be in the spatial reference of the view, and the output geometries will also be in the spatial reference of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference)
+     */
     spatialReference: SpatialReference;
+    /**
+     * The distance in screen pixels from the specified geometry within which the identify should be performed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#tolerance)
+     */
     tolerance: number;
+    /**
+     * Width of the current map view in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#width)
+     * 
+     * @default 400
+     */
     width: number;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface IdentifyParametersConstructor {
+
+
     new(properties?: IdentifyParametersProperties): IdentifyParameters;
   }
 
   export const IdentifyParameters: IdentifyParametersConstructor;
 
   interface IdentifyParametersProperties {
+    /**
+     * Resolution of the current map view in dots per inch.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#dpi)
+     * 
+     * @default 96
+     */
     dpi?: number;
+    /**
+     * The geometry used to select features during the Identify operation. The type of the geometry is specified by [Geometry.type](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#type). The most common geometry used with Identify is a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#geometry)
+     */
     geometry?: GeometryProperties;
+    /**
+     * Specify the number of decimal places for the geometries returned by the task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#geometryPrecision)
+     */
     geometryPrecision?: number;
+    /**
+     * Height of the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#height)
+     * 
+     * @default 400
+     */
     height?: number;
+    /**
+     * The layers on which to perform the identify operation. The layers are specified as a comma-separated list of layer IDs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#layerIds)
+     */
     layerIds?: number[];
+    /**
+     * Specifies which layers to use when using Identify. 
+     * 
+     * Possible values | Description
+     * --------------- | -----------
+     * top | Only the top-most visible layer is identified.
+     * visible | All visible layers are identified.
+     * all | All layers are identified, even if they are not visible. If your service has many layers, a request using this option will not perform well. A visible layer means you can see it in the map at the current extent.  If a layer is turned off or not in range based on its scale dependency settings, it cannot be identified.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#layerOption)
+     * 
+     * @default top
+     */
     layerOption?: string;
+    /**
+     * The Extent or bounding box of the current map view. The `mapExtent` property is assumed to be in the spatial reference of the map unless [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference) has been specified.  The values for [mapExtent](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#mapExtent), [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#height), [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#width), and [dpi](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#dpi) are used to determine the current map scale. Once the scale is known, the map service can exclude layers based on their scale dependency settings. The map service is not performing a spatial intersection based on the provided extent. These properties are also used to calculate the search distance on the map based on the tolerance in screen pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#mapExtent)
+     */
     mapExtent?: ExtentProperties;
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the identify operation. The offset is in the units of the [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference). If a [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference) is not defined the spatial reference of the view is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#maxAllowableOffset)
+     */
     maxAllowableOffset?: number;
+    /**
+     * If `true`, the result set includes the geometry associated with each result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry?: boolean;
+    /**
+     * The spatial reference of the input and output geometries as well as of the [mapExtent](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#mapExtent). If the spatial reference is not specified, the geometry and the extent are assumed to be in the spatial reference of the view, and the output geometries will also be in the spatial reference of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
+    /**
+     * The distance in screen pixels from the specified geometry within which the identify should be performed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#tolerance)
+     */
     tolerance?: number;
+    /**
+     * Width of the current map view in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyParameters.html#width)
+     * 
+     * @default 400
+     */
     width?: number;
   }
 
   interface IdentifyResult extends Accessor, JSONSupport {
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#displayFieldName)
+     */
     displayFieldName: string;
+    /**
+     * An identified feature from the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#feature)
+     */
     feature: Graphic;
+    /**
+     * Unique ID of the layer that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#layerId)
+     */
     layerId: number;
+    /**
+     * The layer name that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#layerName)
+     */
     layerName: string;
   }
 
   interface IdentifyResultConstructor {
+
+
     new(properties?: IdentifyResultProperties): IdentifyResult;
 
     fromJSON(json: any): IdentifyResult;
@@ -6502,55 +27277,219 @@ declare namespace __esri {
   export const IdentifyResult: IdentifyResultConstructor;
 
   interface IdentifyResultProperties {
+    /**
+     * The name of the layer's primary display field. The value of this property matches the name of one of the fields of the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#displayFieldName)
+     */
     displayFieldName?: string;
+    /**
+     * An identified feature from the map service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#feature)
+     */
     feature?: GraphicProperties;
+    /**
+     * Unique ID of the layer that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#layerId)
+     */
     layerId?: number;
+    /**
+     * The layer name that contains the feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-IdentifyResult.html#layerName)
+     */
     layerName?: string;
   }
 
   interface ImageServiceIdentifyParameters extends Accessor {
+    /**
+     * Input geometry that defines the location to be identified. The location can be a point or a polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#geometry)
+     */
     geometry: Point | Polygon;
+    /**
+     * Specifies the mosaic rules defining the image sorting order. When a mosaic rule is not specified, `center` is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#mosaicRule)
+     */
     mosaicRule: MosaicRule;
+    /**
+     * The pixel or RGB color value representing no information. It can be defined as a number `noData = 0` representing a pixel value or as a string `noData = "58,128,187"` representing an RGB color value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#noData)
+     */
     noData: string | number;
+    /**
+     * Specifies the pixel level being identified on the x and y axis. Defaults to the base resolution of the dataset when not specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#pixelSize)
+     */
     pixelSize: Symbol;
+    /**
+     * The pixel level being identified (or the resolution being looked at) on the x-axis. If not specified, it will default to the base resolution of the dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#pixelSizeX)
+     */
     pixelSizeX: number;
+    /**
+     * The pixel level being identified (or the resolution being looked at) on the y-axis. If not specified, it will default to the base resolution of the dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#pixelSizeY)
+     */
     pixelSizeY: number;
+    /**
+     * Specifies the rendering rule for how the requested image should be rendered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#renderingRule)
+     */
     renderingRule: RasterFunction;
+    /**
+     * If `true`, returns both geometry and attributes of the catalog items. Set to `false` when catalog items are not needed to significantly improve identify operation's performance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#returnCatalogItems)
+     * 
+     * @default true
+     */
     returnCatalogItems: boolean;
+    /**
+     * When `true`, each feature in the catalog items includes the geometry. Set to `false` to not display the features on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry: boolean;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface ImageServiceIdentifyParametersConstructor {
+
+
     new(properties?: ImageServiceIdentifyParametersProperties): ImageServiceIdentifyParameters;
   }
 
   export const ImageServiceIdentifyParameters: ImageServiceIdentifyParametersConstructor;
 
   interface ImageServiceIdentifyParametersProperties {
+    /**
+     * Input geometry that defines the location to be identified. The location can be a point or a polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#geometry)
+     */
     geometry?: PointProperties | PolygonProperties;
+    /**
+     * Specifies the mosaic rules defining the image sorting order. When a mosaic rule is not specified, `center` is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#mosaicRule)
+     */
     mosaicRule?: MosaicRuleProperties;
+    /**
+     * The pixel or RGB color value representing no information. It can be defined as a number `noData = 0` representing a pixel value or as a string `noData = "58,128,187"` representing an RGB color value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#noData)
+     */
     noData?: string | number;
+    /**
+     * Specifies the pixel level being identified on the x and y axis. Defaults to the base resolution of the dataset when not specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#pixelSize)
+     */
     pixelSize?: SymbolProperties;
+    /**
+     * The pixel level being identified (or the resolution being looked at) on the x-axis. If not specified, it will default to the base resolution of the dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#pixelSizeX)
+     */
     pixelSizeX?: number;
+    /**
+     * The pixel level being identified (or the resolution being looked at) on the y-axis. If not specified, it will default to the base resolution of the dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#pixelSizeY)
+     */
     pixelSizeY?: number;
+    /**
+     * Specifies the rendering rule for how the requested image should be rendered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#renderingRule)
+     */
     renderingRule?: RasterFunctionProperties;
+    /**
+     * If `true`, returns both geometry and attributes of the catalog items. Set to `false` when catalog items are not needed to significantly improve identify operation's performance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#returnCatalogItems)
+     * 
+     * @default true
+     */
     returnCatalogItems?: boolean;
+    /**
+     * When `true`, each feature in the catalog items includes the geometry. Set to `false` to not display the features on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyParameters.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry?: boolean;
   }
 
   interface ImageServiceIdentifyResult extends Accessor, JSONSupport {
+    /**
+     * The set of catalog items that overlap the input geometry. Catalog Items are returned only when the image service source is a mosaic dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#catalogItems)
+     */
     catalogItems: FeatureSet;
+    /**
+     * The set of visible areas for the identified catalog items. `CatalogItemVisibilities` are returned only when the image service source is a mosaic dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#catalogItemVisibilities)
+     */
     catalogItemVisibilities: number[];
+    /**
+     * The identified location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#location)
+     */
     location: Point;
+    /**
+     * The identify property name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#name)
+     */
     name: string;
+    /**
+     * The identify property id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#objectId)
+     */
     objectId: number;
+    /**
+     * The attributes of the identified object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#properties)
+     */
     properties: any;
+    /**
+     * The identify property pixel value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#value)
+     */
     value: string;
   }
 
   interface ImageServiceIdentifyResultConstructor {
+
+
     new(properties?: ImageServiceIdentifyResultProperties): ImageServiceIdentifyResult;
 
     fromJSON(json: any): ImageServiceIdentifyResult;
@@ -6559,22 +27498,74 @@ declare namespace __esri {
   export const ImageServiceIdentifyResult: ImageServiceIdentifyResultConstructor;
 
   interface ImageServiceIdentifyResultProperties {
+    /**
+     * The set of catalog items that overlap the input geometry. Catalog Items are returned only when the image service source is a mosaic dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#catalogItems)
+     */
     catalogItems?: FeatureSetProperties;
+    /**
+     * The set of visible areas for the identified catalog items. `CatalogItemVisibilities` are returned only when the image service source is a mosaic dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#catalogItemVisibilities)
+     */
     catalogItemVisibilities?: number[];
+    /**
+     * The identified location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#location)
+     */
     location?: PointProperties;
+    /**
+     * The identify property name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#name)
+     */
     name?: string;
+    /**
+     * The identify property id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#objectId)
+     */
     objectId?: number;
+    /**
+     * The attributes of the identified object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#properties)
+     */
     properties?: any;
+    /**
+     * The identify property pixel value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ImageServiceIdentifyResult.html#value)
+     */
     value?: string;
   }
 
   interface JobInfo extends Accessor, JSONSupport {
+    /**
+     * The unique job ID assigned by ArcGIS Server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html#jobId)
+     */
     jobId: string;
+    /**
+     * The job status.  **Known Values:** job-cancelled | job-cancelling | job-deleted | job-deleting | job-timed-out | job-executing | job-failed | job-new | job-submitted | job-succeeded | job-waiting
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html#jobStatus)
+     */
     jobStatus: string;
+    /**
+     * An array of messages that include the message type and a description.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html#messages)
+     */
     messages: GPMessage[];
   }
 
   interface JobInfoConstructor {
+
+
     new(properties?: JobInfoProperties): JobInfo;
 
     fromJSON(json: any): JobInfo;
@@ -6583,57 +27574,181 @@ declare namespace __esri {
   export const JobInfo: JobInfoConstructor;
 
   interface JobInfoProperties {
+    /**
+     * The unique job ID assigned by ArcGIS Server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html#jobId)
+     */
     jobId?: string;
+    /**
+     * The job status.  **Known Values:** job-cancelled | job-cancelling | job-deleted | job-deleting | job-timed-out | job-executing | job-failed | job-new | job-submitted | job-succeeded | job-waiting
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html#jobStatus)
+     */
     jobStatus?: string;
+    /**
+     * An array of messages that include the message type and a description.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-JobInfo.html#messages)
+     */
     messages?: GPMessageProperties[];
   }
 
   interface LegendLayer extends Accessor {
+    /**
+     * The id of the operational layer to include in the printout's legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LegendLayer.html#layerId)
+     */
     layerId: string;
+    /**
+     * The ids of the sublayers to include in the printout's legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LegendLayer.html#subLayerIds)
+     */
     subLayerIds: string[];
+    /**
+     * The title of the feature layer. Use this property to modify feature layer name in the legend for the printout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LegendLayer.html#title)
+     */
     title: string;
   }
 
   interface LegendLayerConstructor {
+
+
     new(properties?: LegendLayerProperties): LegendLayer;
   }
 
   export const LegendLayer: LegendLayerConstructor;
 
   interface LegendLayerProperties {
+    /**
+     * The id of the operational layer to include in the printout's legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LegendLayer.html#layerId)
+     */
     layerId?: string;
+    /**
+     * The ids of the sublayers to include in the printout's legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LegendLayer.html#subLayerIds)
+     */
     subLayerIds?: string[];
+    /**
+     * The title of the feature layer. Use this property to modify feature layer name in the legend for the printout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LegendLayer.html#title)
+     */
     title?: string;
   }
 
   interface LengthsParameters extends Accessor {
+    /**
+     * Defines the type of calculation for the geometry. The type can be one of the following: 
+     * 
+     * Value | Description
+     * ---------------|---------------
+     * planar | Planar measurements use 2D Cartesian mathematics to calculate length. Use this type if the length needs to be calculated in the input spatial reference otherwise use `preserve-shape`.
+     * geodesic | Use this type to calculate an area or length using only the vertices of the polygon to define the lines connecting the vertices as geodesic segments independent of the actual shape of the polygon. **Note:** a geodesic segment is the shortest path between two points on an ellipsoid.
+     * preserve-shape | Calculate the area or length of the geometry on the surface of the Earth ellipsoid, for geometries defined in a projected or geographic coordinate system. This method preserves the shape of the geometry in its coordinate system which means the true area or length will be calculated for the geometry that is displayed on the map.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#calculationType)
+     */
     calculationType: string;
+    /**
+     * If polylines are in a geographic coordinate system, then geodesic needs to be set to `true` in order to calculate the ellipsoidal shortest path distance between each pair of the vertices in the polylines. If `lengthUnit` is not specified, the output is returned in meters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#geodesic)
+     */
     geodesic: boolean;
+    /**
+     * The length unit in which perimeters of polygons will be calculated. For a list of valid units, see [linear unit codes](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#lengthUnit)
+     */
     lengthUnit: number | string;
+    /**
+     * The array of polylines whose lengths are to be computed. The structure of each polyline in the array is same as the structure of the JSON polyline objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#polylines)
+     */
     polylines: Polyline[];
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface LengthsParametersConstructor {
+
+
     new(properties?: LengthsParametersProperties): LengthsParameters;
   }
 
   export const LengthsParameters: LengthsParametersConstructor;
 
   interface LengthsParametersProperties {
+    /**
+     * Defines the type of calculation for the geometry. The type can be one of the following: 
+     * 
+     * Value | Description
+     * ---------------|---------------
+     * planar | Planar measurements use 2D Cartesian mathematics to calculate length. Use this type if the length needs to be calculated in the input spatial reference otherwise use `preserve-shape`.
+     * geodesic | Use this type to calculate an area or length using only the vertices of the polygon to define the lines connecting the vertices as geodesic segments independent of the actual shape of the polygon. **Note:** a geodesic segment is the shortest path between two points on an ellipsoid.
+     * preserve-shape | Calculate the area or length of the geometry on the surface of the Earth ellipsoid, for geometries defined in a projected or geographic coordinate system. This method preserves the shape of the geometry in its coordinate system which means the true area or length will be calculated for the geometry that is displayed on the map.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#calculationType)
+     */
     calculationType?: string;
+    /**
+     * If polylines are in a geographic coordinate system, then geodesic needs to be set to `true` in order to calculate the ellipsoidal shortest path distance between each pair of the vertices in the polylines. If `lengthUnit` is not specified, the output is returned in meters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#geodesic)
+     */
     geodesic?: boolean;
+    /**
+     * The length unit in which perimeters of polygons will be calculated. For a list of valid units, see [linear unit codes](https://developers.arcgis.com/java/api-reference/constant-values.html#com.esri.core.geometry.LinearUnit.Code.CENTIMETER).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#lengthUnit)
+     */
     lengthUnit?: number | string;
+    /**
+     * The array of polylines whose lengths are to be computed. The structure of each polyline in the array is same as the structure of the JSON polyline objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LengthsParameters.html#polylines)
+     */
     polylines?: PolylineProperties[];
   }
 
   interface LinearUnit extends Accessor, JSONSupport {
+    /**
+     * Specifies the value of the linear distance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LinearUnit.html#distance)
+     * 
+     * @default 0
+     */
     distance: number;
+    /**
+     * Specifies the unit type of the linear distance.  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LinearUnit.html#units)
+     */
     units: string;
   }
 
   interface LinearUnitConstructor {
+
+
     new(properties?: LinearUnitProperties): LinearUnit;
 
     fromJSON(json: any): LinearUnit;
@@ -6642,16 +27757,40 @@ declare namespace __esri {
   export const LinearUnit: LinearUnitConstructor;
 
   interface LinearUnitProperties {
+    /**
+     * Specifies the value of the linear distance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LinearUnit.html#distance)
+     * 
+     * @default 0
+     */
     distance?: number;
+    /**
+     * Specifies the unit type of the linear distance.  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LinearUnit.html#units)
+     */
     units?: string;
   }
 
   interface NAMessage extends Accessor, JSONSupport {
+    /**
+     * A description of the network analyst message.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-NAMessage.html#description)
+     */
     description: string;
+    /**
+     * The network analyst message type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-NAMessage.html#type)
+     */
     type: any;
   }
 
   interface NAMessageConstructor {
+
+
     new(properties?: NAMessageProperties): NAMessage;
 
     fromJSON(json: any): NAMessage;
@@ -6660,40 +27799,151 @@ declare namespace __esri {
   export const NAMessage: NAMessageConstructor;
 
   interface NAMessageProperties {
+    /**
+     * A description of the network analyst message.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-NAMessage.html#description)
+     */
     description?: string;
+    /**
+     * The network analyst message type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-NAMessage.html#type)
+     */
     type?: any;
   }
 
   interface OffsetParameters extends Accessor {
+    /**
+     * The `bevelRatio` is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled. When mitered is specified, the value set for `bevelRatio` is ignored and `10` is used internally. If beveled is specified, `1.1` will be used if no value is set for bevelRatio. The bevelRatio is ignored when `rounded` is specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#bevelRatio)
+     */
     bevelRatio: number;
+    /**
+     * The array of geometries to be offset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#geometries)
+     */
     geometries: Geometry[];
+    /**
+     * Specifies the planar distance for constructing an offset based on the input geometries. If the `offsetDistance` parameter is positive, the constructed offset will be on the right side of the curve. Left side offsets are constructed with negative values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#offsetDistance)
+     */
     offsetDistance: number;
+    /**
+     * Options that determine how the ends intersect. Set to one of the following options: 
+     * 
+     * Possible Value | Description
+     * ---------------|-------------
+     * bevelled | Squares off the corner after a given ratio distance.
+     * mitered | Attempts to allow extended offsets to naturally intersect. If the intersection occurs too far from a corner, the corner will be beveled off at a fixed distance.
+     * rounded | Rounds the corner between extended offsets.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#offsetHow)
+     */
     offsetHow: string;
+    /**
+     * The offset distance unit. For a list of valid units see [esriSRUnitType constants](http://resources.esri.com/help/9.3/ArcGISDesktop/ArcObjects/esriGeometry/esriSRUnitType.htm) or [esriSRUnit2Type constants](http://resources.esri.com/help/9.3/ArcGISDesktop/ArcObjects/esriGeometry/esriSRUnit2Type.htm).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#offsetUnit)
+     */
     offsetUnit: string;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface OffsetParametersConstructor {
+
+
     new(properties?: OffsetParametersProperties): OffsetParameters;
   }
 
   export const OffsetParameters: OffsetParametersConstructor;
 
   interface OffsetParametersProperties {
+    /**
+     * The `bevelRatio` is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled. When mitered is specified, the value set for `bevelRatio` is ignored and `10` is used internally. If beveled is specified, `1.1` will be used if no value is set for bevelRatio. The bevelRatio is ignored when `rounded` is specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#bevelRatio)
+     */
     bevelRatio?: number;
+    /**
+     * The array of geometries to be offset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#geometries)
+     */
     geometries?: GeometryProperties[];
+    /**
+     * Specifies the planar distance for constructing an offset based on the input geometries. If the `offsetDistance` parameter is positive, the constructed offset will be on the right side of the curve. Left side offsets are constructed with negative values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#offsetDistance)
+     */
     offsetDistance?: number;
+    /**
+     * Options that determine how the ends intersect. Set to one of the following options: 
+     * 
+     * Possible Value | Description
+     * ---------------|-------------
+     * bevelled | Squares off the corner after a given ratio distance.
+     * mitered | Attempts to allow extended offsets to naturally intersect. If the intersection occurs too far from a corner, the corner will be beveled off at a fixed distance.
+     * rounded | Rounds the corner between extended offsets.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#offsetHow)
+     */
     offsetHow?: string;
+    /**
+     * The offset distance unit. For a list of valid units see [esriSRUnitType constants](http://resources.esri.com/help/9.3/ArcGISDesktop/ArcObjects/esriGeometry/esriSRUnitType.htm) or [esriSRUnit2Type constants](http://resources.esri.com/help/9.3/ArcGISDesktop/ArcObjects/esriGeometry/esriSRUnit2Type.htm).  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-OffsetParameters.html#offsetUnit)
+     */
     offsetUnit?: string;
   }
 
   interface ParameterValue extends Accessor, JSONSupport {
+    /**
+     * Specifies the parameter's data type.  **Possible Values:** string | double | long | boolean | date | linear-unit | data-file | raster-data | record-set | raster-data-layer | feature-record-set-layer | multi-value
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ParameterValue.html#dataType)
+     */
     dataType: string;
+    /**
+     * The value of the parameter. The data structure of this value depends on the `dataType`. 
+     * 
+     * Data Type | JavaScript Type
+     * ----------|----------------
+     * string | [String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)
+     * double | [Number (float)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)
+     * long | [Number (int)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)
+     * boolean | [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)
+     * date | [Date](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Date.html)
+     * linear-unit | [LinearUnit](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LinearUnit.html)
+     * data-file | [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html)
+     * raster-data | [RasterData](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html)
+     * record-set | [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html)
+     * raster-data-layer | [RasterData](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html)
+     * feature-record-set-layer | [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html)
+     * multi-value | [String[]](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ParameterValue.html#value)
+     */
     value: any;
   }
 
   interface ParameterValueConstructor {
+
+
     new(properties?: ParameterValueProperties): ParameterValue;
 
     fromJSON(json: any): ParameterValue;
@@ -6702,176 +27952,874 @@ declare namespace __esri {
   export const ParameterValue: ParameterValueConstructor;
 
   interface ParameterValueProperties {
+    /**
+     * Specifies the parameter's data type.  **Possible Values:** string | double | long | boolean | date | linear-unit | data-file | raster-data | record-set | raster-data-layer | feature-record-set-layer | multi-value
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ParameterValue.html#dataType)
+     */
     dataType?: string;
+    /**
+     * The value of the parameter. The data structure of this value depends on the `dataType`. 
+     * 
+     * Data Type | JavaScript Type
+     * ----------|----------------
+     * string | [String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)
+     * double | [Number (float)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)
+     * long | [Number (int)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)
+     * boolean | [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)
+     * date | [Date](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Date.html)
+     * linear-unit | [LinearUnit](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LinearUnit.html)
+     * data-file | [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html)
+     * raster-data | [RasterData](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html)
+     * record-set | [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html)
+     * raster-data-layer | [RasterData](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html)
+     * feature-record-set-layer | [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html)
+     * multi-value | [String[]](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ParameterValue.html#value)
+     */
     value?: any;
   }
 
   interface PrintParameters extends Accessor {
+    /**
+     * Additional parameters for the print service. When an arcpy script is published as a custom print service there may be additional parameters associated with the print service. To determine the extra parameters visit the ArcGIS REST Services Directory page for the print service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#extraParameters)
+     */
     extraParameters: any;
+    /**
+     * Specify the output spatial reference for the printout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * Defines the layout template used for the printed map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#template)
+     */
     template: PrintTemplate;
+    /**
+     * The view to print.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#view)
+     */
     view: MapView;
   }
 
   interface PrintParametersConstructor {
+
+
     new(properties?: PrintParametersProperties): PrintParameters;
   }
 
   export const PrintParameters: PrintParametersConstructor;
 
   interface PrintParametersProperties {
+    /**
+     * Additional parameters for the print service. When an arcpy script is published as a custom print service there may be additional parameters associated with the print service. To determine the extra parameters visit the ArcGIS REST Services Directory page for the print service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#extraParameters)
+     */
     extraParameters?: any;
+    /**
+     * Specify the output spatial reference for the printout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * Defines the layout template used for the printed map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#template)
+     */
     template?: PrintTemplateProperties;
+    /**
+     * The view to print.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintParameters.html#view)
+     */
     view?: MapViewProperties;
   }
 
   interface PrintTemplate extends Accessor {
+    /**
+     * When `false`, the attribution is not displayed on the printout. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layout) value is `map-only`. Reference our policies on [Licensing & Attribution](https://developers.arcgis.com/javascript/latest/guide/licensing/) for specific attribution requirements.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#attributionVisible)
+     * 
+     * @default true
+     */
     attributionVisible: boolean;
+    /**
+     * Define the map width, height and dpi. Required when `layout = 'map-only'`. See the object specification table below for available options to set for exportOptions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#exportOptions)
+     */
     exportOptions: PrintTemplateExportOptions;
+    /**
+     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#format)
+     * 
+     * @default png32
+     */
     format: string;
+    /**
+     * The layout used for the print output. When the value is `map-only` or is empty, the output map does not contain any page layout surroundings (for example, title, legend, scale bar and so forth). The print service provides out-of-the-box templates listed in possible values. The server administrator can add additional templates to the print service.  Possible values are listed below:
+     * 
+     * Value | Description
+     * | --- | ---
+     * map-only | Map does not contain any layout elements. Only map image is printed.
+     * a3-landscape | 16.54 x 11.69 in
+     * a3-portrait | 11.69 x 16.54 in
+     * a4-landscape | 11.69 x 8.27 in
+     * a4-portrait | 8.27 × 11.69 in
+     * letter-ansi-a-landscape | 11.0 x 8.5 in
+     * letter-ansi-a-portrait | 8.5 x 11.0 in
+     * tabloid-ansi-b-landscape| 17.0 x 11.0 in
+     * tabloid-ansi-b-portrait | 11.0 x 17.0 in
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layout)
+     * 
+     * @default map-only
+     */
     layout: string;
+    /**
+     * Defines the layout elements. It's an object with the following properties:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     */
     layoutOptions: PrintTemplateLayoutOptions;
+    /**
+     * The optional map scale of the printed map. Only applies when `preserveScale = true`. If `outScale` is less than 1, then the printed map will use the scale of the input map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#outScale)
+     * 
+     * @default 0
+     */
     outScale: number;
+    /**
+     * Define whether the printed map should preserve map scale or map extent. If `true`, the printed map will use the `outScale` property or default to the scale of the input map. If `false`, the printed map will use the same extent as the input map and thus scale might change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#preserveScale)
+     * 
+     * @default true
+     */
     preserveScale: boolean;
+    /**
+     * When `true`, labels will be shown on the layout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#showLabels)
+     * 
+     * @default true
+     */
     showLabels: boolean;
   }
 
   interface PrintTemplateConstructor {
+
+
     new(properties?: PrintTemplateProperties): PrintTemplate;
   }
 
   export const PrintTemplate: PrintTemplateConstructor;
 
   interface PrintTemplateProperties {
+    /**
+     * When `false`, the attribution is not displayed on the printout. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layout) value is `map-only`. Reference our policies on [Licensing & Attribution](https://developers.arcgis.com/javascript/latest/guide/licensing/) for specific attribution requirements.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#attributionVisible)
+     * 
+     * @default true
+     */
     attributionVisible?: boolean;
+    /**
+     * Define the map width, height and dpi. Required when `layout = 'map-only'`. See the object specification table below for available options to set for exportOptions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#exportOptions)
+     */
     exportOptions?: PrintTemplateExportOptions;
+    /**
+     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#format)
+     * 
+     * @default png32
+     */
     format?: string;
+    /**
+     * The layout used for the print output. When the value is `map-only` or is empty, the output map does not contain any page layout surroundings (for example, title, legend, scale bar and so forth). The print service provides out-of-the-box templates listed in possible values. The server administrator can add additional templates to the print service.  Possible values are listed below:
+     * 
+     * Value | Description
+     * | --- | ---
+     * map-only | Map does not contain any layout elements. Only map image is printed.
+     * a3-landscape | 16.54 x 11.69 in
+     * a3-portrait | 11.69 x 16.54 in
+     * a4-landscape | 11.69 x 8.27 in
+     * a4-portrait | 8.27 × 11.69 in
+     * letter-ansi-a-landscape | 11.0 x 8.5 in
+     * letter-ansi-a-portrait | 8.5 x 11.0 in
+     * tabloid-ansi-b-landscape| 17.0 x 11.0 in
+     * tabloid-ansi-b-portrait | 11.0 x 17.0 in
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layout)
+     * 
+     * @default map-only
+     */
     layout?: string;
+    /**
+     * Defines the layout elements. It's an object with the following properties:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     */
     layoutOptions?: PrintTemplateLayoutOptions;
+    /**
+     * The optional map scale of the printed map. Only applies when `preserveScale = true`. If `outScale` is less than 1, then the printed map will use the scale of the input map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#outScale)
+     * 
+     * @default 0
+     */
     outScale?: number;
+    /**
+     * Define whether the printed map should preserve map scale or map extent. If `true`, the printed map will use the `outScale` property or default to the scale of the input map. If `false`, the printed map will use the same extent as the input map and thus scale might change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#preserveScale)
+     * 
+     * @default true
+     */
     preserveScale?: boolean;
+    /**
+     * When `true`, labels will be shown on the layout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#showLabels)
+     * 
+     * @default true
+     */
     showLabels?: boolean;
   }
 
-  export interface PrintTemplateExportOptions {
+
+  export interface PrintTemplateExportOptions extends Object {
+    /**
+     * Map width. Default value is 800.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#exportOptions)
+     */
     width?: number;
+    /**
+     * Map height. Default value is 1100.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#exportOptions)
+     */
     height?: number;
+    /**
+     * Resolution in dots per inch. Default value is 96.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#exportOptions)
+     */
     dpi?: number;
   }
 
-  export interface PrintTemplateLayoutOptions {
+
+  export interface PrintTemplateLayoutOptions extends Object {
+    /**
+     * The text used for the map title if the specified layout contains a title text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     */
     titleText: string;
+    /**
+     * The text used for the author if the specified layout contains an author text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     */
     authorText: string;
+    /**
+     * The text used for the copyright if the specified layout contains an copyright text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     */
     copyrightText: string;
-    scalebarUnit: string;
+    /**
+     * The unit used for the scalebar.  **Known Values:** `Miles` | `Kilometers` | `Meters` | `Feet`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     * 
+     * @default Miles
+     */
+    scalebarUnit?: string;
+    /**
+     * An array of [LegendLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-LegendLayer.html) containing the id's of the layers that will be included in the legend. If `legendLayers` is not specified, all operational layers will be present in the legend. To specify that no layers will be included in the legend set `legendLayer = []`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     */
     legendLayers: LegendLayer[];
+    /**
+     * An array of name-value pairs. Use this property to update the text for custom text elements on the page layout. Values must be strings.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
+     */
     customTextElements: any[];
   }
 
   interface ProjectParameters extends Accessor {
+    /**
+     * The input geometries to project.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#geometries)
+     */
     geometries: Geometry[];
+    /**
+     * The spatial reference to which you are projecting the geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * The spatial reference to which you are projecting the geometries. Use [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#outSpatialReference) instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#outSR)
+     */
     outSR: SpatialReference;
+    /**
+     * The well-known id {wkid:number} or well-known text {wkt:string} of the datum transformation to be applied to the projected geometries. See [Datum transformations](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000r8000000) for a list of valid datum transformations that may be used here.  If a transformation is specified, a value must also be specified in the [transformForward](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformForward) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformation)
+     */
     transformation: ProjectParametersTransformation;
+    /**
+     * Indicates whether to transform forward or not. The forward or reverse direction of transformation is implied in the name of the transformation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformForward)
+     */
     transformForward: boolean;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface ProjectParametersConstructor {
+
+
     new(properties?: ProjectParametersProperties): ProjectParameters;
   }
 
   export const ProjectParameters: ProjectParametersConstructor;
 
   interface ProjectParametersProperties {
+    /**
+     * The input geometries to project.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#geometries)
+     */
     geometries?: GeometryProperties[];
+    /**
+     * The spatial reference to which you are projecting the geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * The spatial reference to which you are projecting the geometries. Use [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#outSpatialReference) instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#outSR)
+     */
     outSR?: SpatialReferenceProperties;
+    /**
+     * The well-known id {wkid:number} or well-known text {wkt:string} of the datum transformation to be applied to the projected geometries. See [Datum transformations](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000r8000000) for a list of valid datum transformations that may be used here.  If a transformation is specified, a value must also be specified in the [transformForward](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformForward) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformation)
+     */
     transformation?: ProjectParametersTransformation;
+    /**
+     * Indicates whether to transform forward or not. The forward or reverse direction of transformation is implied in the name of the transformation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformForward)
+     */
     transformForward?: boolean;
   }
 
-  export interface ProjectParametersTransformation {
+
+  export interface ProjectParametersTransformation extends Object {
+    /**
+     * The well-known ID of the datum transformation to apply to the projection. [List of valid IDs for Datum transformations](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000r8000000).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformation)
+     */
     wkid?: number;
+    /**
+     * The well-known text that defines a spatial reference. Many browsers have a limit to the length of a GET request of approximately 2048 characters. When using well-known text to specify the spatial reference you can easily exceed this limit. In these cases, you will need to [setup and use a proxy page](https://developers.arcgis.com/javascript/latest/guide/proxies/index.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ProjectParameters.html#transformation)
+     */
     wkt?: string;
   }
 
-  interface Query extends Accessor {
+  interface Query extends Accessor, JSONSupport {
+    /**
+     * Buffer distance for input geometries. The distance unit is specified by [units property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#units). Query results will include features within the distance specified of the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) of the query. This parameter only applies if [supportsQueryWithDistance](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Query_Feature_Service_Layer/02r3000000r1000000/) is `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#distance)
+     */
     distance: number;
+    /**
+     * The geometry to apply to the spatial filter. The spatial relationship as specified by `spatialRelationship` is applied to this geometry while performing the query. The valid geometry types are [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html), [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), or [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry)
+     */
     geometry: Geometry;
+    /**
+     * Specify the number of decimal places for the geometries returned by the query operation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometryPrecision)
+     */
     geometryPrecision: number;
+    /**
+     * One or more field names that will be used to group the statistics. This is only valid when `outStatistics` has been defined. Requires ArcGIS Server service version 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#groupByFieldsForStatistics)
+     */
     groupByFieldsForStatistics: string[];
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the query operation. The offset is in the units of `outSpatialReference`. If `outSpatialReference` is not defined, the spatial reference of the map is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#maxAllowableOffset)
+     */
     maxAllowableOffset: number;
+    /**
+     * Parameter dictates how the geometry of a multipatch feature will be returned. Currently, the only supported value is `xyFootprint` and the xy footprint of each multipatch geometry will be returned in the result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#multipatchOption)
+     */
     multipatchOption: string;
+    /**
+     * Number of features to retrieve. Should be used in conjunction with [start property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#start). Use this to implement paging and retrieve "pages" of results when querying. If not provided, but an instance of Query has a start property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#num)
+     */
     num: number;
+    /**
+     * A comma delimited list of ObjectIds for the features in the layer/table being queried.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds)
+     */
     objectIds: number[];
+    /**
+     * One or more field names that will be used to order the query results. Specfiy `ASC` (ascending) or `DESC` (descending) after the field name to control the order. The default order is `ASC`. `orderByFields` is only supported on [MapImageLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html) and tables where `supportsAdvancedQueries = true`. *Requires ArcGIS Server service version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#orderByFields)
+     */
     orderByFields: string[];
+    /**
+     * Attribute fields to include in the FeatureSet. Fields must exist in the map layer. You must list actual field names rather than the alias names. You are, however, able to use the alias names when you display the results. You can set field alias names in the map document.  When specifying the output fields, you should limit the fields to only those you expect to use in the query or the results. The fewer fields you include, the faster the response will be.  Each query must have access to the Shape and ObjectId fields for a layer. However, your list of fields does not need to include these two fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outFields)
+     */
     outFields: string[];
+    /**
+     * The spatial reference for the returned geometry. If not specified, the geometry is returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * The definitions for one or more field-based statistics to be calculated. `outStatistics` is only supported on layers/tables where `supportsStatistics = true`. If `outStatistics` is specified the only other query parameters that will be used are `groupByFieldsForStatistics`, `orderByFields`, `text` and `where`. *Requires ArcGIS Server service version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outStatistics)
+     */
     outStatistics: StatisticDefinition[];
+    /**
+     * Specify the pixel level to be identified on the X and Y axis. Defaults to the base resolution of the dataset if not specified. Applicable only to Image Service layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#pixelSize)
+     */
     pixelSize: Symbol;
+    /**
+     * Used to project the geometry onto a virtual grid, likely representing pixels on the screen. *Only works with ArcGIS Online hosted services.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
+     */
     quantizationParameters: QueryQuantizationParameters;
-    relationParam: string;
+    /**
+     * The string describes the spatial relationship to be tested when the spatial relationship is `relation`. The [Relational functions for ST_Geometry](https://desktop.arcgis.com/en/arcmap/latest/manage-data/using-sql-with-gdbs/relational-functions-for-st-geometry.htm) topic has additional details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#relationParameter)
+     */
+    relationParameter: string;
+    /**
+     * If `true`, each feature in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) each polygon geometry will be returned with a centroid. This operation is only supported in ArcGIS Online hosted feature services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnCentroid)
+     * 
+     * @default false
+     */
+    returnCentroid: boolean;
+    /**
+     * If `true` then the query returns distinct values based on the fields specified in `outFields`. This parameter applies only if `supportsAdvancedQueries` property of the layer is `true`. *Requires ArcGIS Server 10.1 Service Pack 1 or later.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnDistinctValues)
+     * 
+     * @default false
+     */
     returnDistinctValues: boolean;
+    /**
+     * If `true`, then all features are returned for each tile request, even if they exceed the maximum record limit per query indicated on the service by `maxRecordCount`. If `false`, the tile request will not return any features if the `maxRecordCount` limit is exceeded.  **Support is limited to feature services hosted on ArcGIS Online.**
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnExceededLimitFeatures)
+     * 
+     * @default true
+     */
+    returnExceededLimitFeatures: boolean;
+    /**
+     * If `true`, each feature in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) includes the geometry. Set to `false` (default) if you do not plan to include highlighted features on a map since the geometry takes up a significant portion of the response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry: boolean;
+    /**
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then m-values are returned in the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnM)
+     * 
+     * @default false
+     */
+    returnM: boolean;
+    /**
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then z-values are returned in the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnZ)
+     * 
+     * @default false
+     */
     returnZ: boolean;
+    /**
+     * The spatial relationship to be applied to the input geometry while performing the query. The valid values are listed in the table below: 
+     * 
+     * Value | Description
+     * ------|-------------
+     * intersects | Part of a feature from feature class 1 intersects a feature from feature class 2.
+     * contains | Part or all of a feature from feature class 1 is contained within a feature from feature class 2.
+     * crosses | The feature from feature class 1 crosses a feature from feature class 2.
+     * envelope-intersects | The envelope of feature class 1 intersects with the envelope of feature class 2.
+     * index-intersects | The envelope of the query feature class intersects the index entry for the target feature class.
+     * overlaps | Features from feature class 1 overlap features in feature class 2.
+     * touches | The feature from feature class 1 touches the border of a feature from feature class 2.
+     * within | The feature from feature class 1 is completely enclosed by the feature from feature class 2.
+     * relation | Allows specification of any relationship defined using the [Shape Comparison Language](http://resources.esri.com/help/9.3/arcgisengine/dotnet/concepts_start.htm#40de6491-9b2d-440d-848b-2609efcd46b1.htm).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship)
+     * 
+     * @default intersects
+     */
     spatialRelationship: string;
+    /**
+     * Zero-based index indicating where to begin retrieving features. Should be used in conjunction with [num](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#num). Use this to implement paging and retrieve "pages" of results when querying. Features are sorted ascending by object ID by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#start)
+     */
     start: number;
+    /**
+     * Shorthand for a where clause using "like". The field used is the display field defined in the map document. You can determine what the display field is for a layer in the Services Directory.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#text)
+     * 
+     * @default null
+     */
     text: string;
+    /**
+     * The unit for calculating the buffer distance. if unit is not specified, the unit is derived from the geometry spatial reference. If the geometry spatial reference is not specified, the unit is derived from the feature service spatial reference. This parameter only applies if [supportsQueryWithDistance](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Query_Feature_Service_Layer/02r3000000r1000000/) is `true`.  **Known Values:** feet | miles | nautical-miles | us-nautical-miles | meters | kilometers
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#units)
+     */
     units: string;
+    /**
+     * A where clause for the query. Any legal SQL where clause operating on the fields in the layer is allowed. Be sure to have the correct sequence of single and double quotes when writing the where clause in JavaScript.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where)
+     */
     where: string;
 
-    toJSON(): any;
+    /**
+     * Creates a deep clone of Query object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#clone)
+     * 
+     * 
+     */
+    clone(): Query;
   }
 
   interface QueryConstructor {
+    /**
+     * Query is used to define parameters to filter a layer's features, either by its attributes or its geometry. Once a Query object is created, you can set its properties to conform to the filtering requirements of the application. Once a Query object is created and its properties are set, it is then ready to be passed into an executable function in [QueryTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-QueryTask.html) (e.g. `QueryTask.execute(Query)`). The returned result is often a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html)
+     */
+
     new(properties?: QueryProperties): Query;
+
+    fromJSON(json: any): Query;
   }
 
   export const Query: QueryConstructor;
 
   interface QueryProperties {
+    /**
+     * Buffer distance for input geometries. The distance unit is specified by [units property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#units). Query results will include features within the distance specified of the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) of the query. This parameter only applies if [supportsQueryWithDistance](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Query_Feature_Service_Layer/02r3000000r1000000/) is `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#distance)
+     */
     distance?: number;
+    /**
+     * The geometry to apply to the spatial filter. The spatial relationship as specified by `spatialRelationship` is applied to this geometry while performing the query. The valid geometry types are [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html), [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html), [Multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html), [Polyline](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polyline.html), or [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry)
+     */
     geometry?: GeometryProperties;
+    /**
+     * Specify the number of decimal places for the geometries returned by the query operation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometryPrecision)
+     */
     geometryPrecision?: number;
+    /**
+     * One or more field names that will be used to group the statistics. This is only valid when `outStatistics` has been defined. Requires ArcGIS Server service version 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#groupByFieldsForStatistics)
+     */
     groupByFieldsForStatistics?: string[];
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the query operation. The offset is in the units of `outSpatialReference`. If `outSpatialReference` is not defined, the spatial reference of the map is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#maxAllowableOffset)
+     */
     maxAllowableOffset?: number;
+    /**
+     * Parameter dictates how the geometry of a multipatch feature will be returned. Currently, the only supported value is `xyFootprint` and the xy footprint of each multipatch geometry will be returned in the result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#multipatchOption)
+     */
     multipatchOption?: string;
+    /**
+     * Number of features to retrieve. Should be used in conjunction with [start property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#start). Use this to implement paging and retrieve "pages" of results when querying. If not provided, but an instance of Query has a start property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#num)
+     */
     num?: number;
+    /**
+     * A comma delimited list of ObjectIds for the features in the layer/table being queried.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds)
+     */
     objectIds?: number[];
+    /**
+     * One or more field names that will be used to order the query results. Specfiy `ASC` (ascending) or `DESC` (descending) after the field name to control the order. The default order is `ASC`. `orderByFields` is only supported on [MapImageLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html) and tables where `supportsAdvancedQueries = true`. *Requires ArcGIS Server service version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#orderByFields)
+     */
     orderByFields?: string[];
+    /**
+     * Attribute fields to include in the FeatureSet. Fields must exist in the map layer. You must list actual field names rather than the alias names. You are, however, able to use the alias names when you display the results. You can set field alias names in the map document.  When specifying the output fields, you should limit the fields to only those you expect to use in the query or the results. The fewer fields you include, the faster the response will be.  Each query must have access to the Shape and ObjectId fields for a layer. However, your list of fields does not need to include these two fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outFields)
+     */
     outFields?: string[];
+    /**
+     * The spatial reference for the returned geometry. If not specified, the geometry is returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * The definitions for one or more field-based statistics to be calculated. `outStatistics` is only supported on layers/tables where `supportsStatistics = true`. If `outStatistics` is specified the only other query parameters that will be used are `groupByFieldsForStatistics`, `orderByFields`, `text` and `where`. *Requires ArcGIS Server service version 10.1 or greater.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outStatistics)
+     */
     outStatistics?: StatisticDefinitionProperties[];
+    /**
+     * Specify the pixel level to be identified on the X and Y axis. Defaults to the base resolution of the dataset if not specified. Applicable only to Image Service layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#pixelSize)
+     */
     pixelSize?: SymbolProperties;
+    /**
+     * Used to project the geometry onto a virtual grid, likely representing pixels on the screen. *Only works with ArcGIS Online hosted services.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
+     */
     quantizationParameters?: QueryQuantizationParameters;
-    relationParam?: string;
+    /**
+     * The string describes the spatial relationship to be tested when the spatial relationship is `relation`. The [Relational functions for ST_Geometry](https://desktop.arcgis.com/en/arcmap/latest/manage-data/using-sql-with-gdbs/relational-functions-for-st-geometry.htm) topic has additional details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#relationParameter)
+     */
+    relationParameter?: string;
+    /**
+     * If `true`, each feature in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) each polygon geometry will be returned with a centroid. This operation is only supported in ArcGIS Online hosted feature services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnCentroid)
+     * 
+     * @default false
+     */
+    returnCentroid?: boolean;
+    /**
+     * If `true` then the query returns distinct values based on the fields specified in `outFields`. This parameter applies only if `supportsAdvancedQueries` property of the layer is `true`. *Requires ArcGIS Server 10.1 Service Pack 1 or later.*
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnDistinctValues)
+     * 
+     * @default false
+     */
     returnDistinctValues?: boolean;
+    /**
+     * If `true`, then all features are returned for each tile request, even if they exceed the maximum record limit per query indicated on the service by `maxRecordCount`. If `false`, the tile request will not return any features if the `maxRecordCount` limit is exceeded.  **Support is limited to feature services hosted on ArcGIS Online.**
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnExceededLimitFeatures)
+     * 
+     * @default true
+     */
+    returnExceededLimitFeatures?: boolean;
+    /**
+     * If `true`, each feature in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) includes the geometry. Set to `false` (default) if you do not plan to include highlighted features on a map since the geometry takes up a significant portion of the response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry)
+     * 
+     * @default false
+     */
     returnGeometry?: boolean;
+    /**
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then m-values are returned in the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnM)
+     * 
+     * @default false
+     */
+    returnM?: boolean;
+    /**
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then z-values are returned in the geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnZ)
+     * 
+     * @default false
+     */
     returnZ?: boolean;
+    /**
+     * The spatial relationship to be applied to the input geometry while performing the query. The valid values are listed in the table below: 
+     * 
+     * Value | Description
+     * ------|-------------
+     * intersects | Part of a feature from feature class 1 intersects a feature from feature class 2.
+     * contains | Part or all of a feature from feature class 1 is contained within a feature from feature class 2.
+     * crosses | The feature from feature class 1 crosses a feature from feature class 2.
+     * envelope-intersects | The envelope of feature class 1 intersects with the envelope of feature class 2.
+     * index-intersects | The envelope of the query feature class intersects the index entry for the target feature class.
+     * overlaps | Features from feature class 1 overlap features in feature class 2.
+     * touches | The feature from feature class 1 touches the border of a feature from feature class 2.
+     * within | The feature from feature class 1 is completely enclosed by the feature from feature class 2.
+     * relation | Allows specification of any relationship defined using the [Shape Comparison Language](http://resources.esri.com/help/9.3/arcgisengine/dotnet/concepts_start.htm#40de6491-9b2d-440d-848b-2609efcd46b1.htm).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship)
+     * 
+     * @default intersects
+     */
     spatialRelationship?: string;
+    /**
+     * Zero-based index indicating where to begin retrieving features. Should be used in conjunction with [num](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#num). Use this to implement paging and retrieve "pages" of results when querying. Features are sorted ascending by object ID by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#start)
+     */
     start?: number;
+    /**
+     * Shorthand for a where clause using "like". The field used is the display field defined in the map document. You can determine what the display field is for a layer in the Services Directory.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#text)
+     * 
+     * @default null
+     */
     text?: string;
+    /**
+     * The unit for calculating the buffer distance. if unit is not specified, the unit is derived from the geometry spatial reference. If the geometry spatial reference is not specified, the unit is derived from the feature service spatial reference. This parameter only applies if [supportsQueryWithDistance](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Query_Feature_Service_Layer/02r3000000r1000000/) is `true`.  **Known Values:** feet | miles | nautical-miles | us-nautical-miles | meters | kilometers
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#units)
+     */
     units?: string;
+    /**
+     * A where clause for the query. Any legal SQL where clause operating on the fields in the layer is allowed. Be sure to have the correct sequence of single and double quotes when writing the where clause in JavaScript.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where)
+     */
     where?: string;
   }
 
-  export interface QueryQuantizationParameters {
+
+  export interface QueryQuantizationParameters extends Object {
+    /**
+     * An extent defining the quantization grid bounds. Its [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html) matches the input geometry spatial reference if one is specified for the query. Otherwise, the extent will be in the layer's spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
+     */
     extent?: Extent;
+    /**
+     * Geometry coordinates are optimized for viewing and displaying of data. **Known Values:** view
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
+     */
     mode?: string;
+    /**
+     * The integer's coordinates will be returned relative to the origin position defined by this property value. **Known Values:** upper-left | lower-left
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
+     * 
+     * @default upper-left
+     */
     originPosition?: string;
+    /**
+     * The size of one pixel in the units of outSpatialReference. This number is used to convert coordinates to integers by building a grid with a resolution matching the tolerance. Each coordinate is then snapped to one pixel on the grid. Consecutive coordinates snapped to the same pixel are removed for reducing the overall response size. The units of tolerance will match the units of outSpatialReference. If outSpatialReference is not specified, then tolerance is assumed to be in the units of the spatial reference of the layer. If tolerance is not specified, the maxAllowableOffset is used. If tolerance and maxAllowableOffset are not specified, a grid of 10,000 * 10,000 grid is used by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
+     */
     tolerance?: number;
   }
 
   interface RasterData extends Accessor, JSONSupport {
+    /**
+     * Specifies the format of the raster data, such as "jpg", "tif", etc.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html#format)
+     */
     format: string;
+    /**
+     * The ID of the uploaded file returned as a result of the upload operation. For ArcGIS Server 10.1 and greater, this class can be used to specify an uploaded item as input by specifying the ItemID.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html#itemId)
+     */
     itemId: string;
+    /**
+     * URL to the location of the raster data file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html#url)
+     */
     url: string;
   }
 
   interface RasterDataConstructor {
+
+
     new(properties?: RasterDataProperties): RasterData;
 
     fromJSON(json: any): RasterData;
@@ -6880,159 +28828,791 @@ declare namespace __esri {
   export const RasterData: RasterDataConstructor;
 
   interface RasterDataProperties {
+    /**
+     * Specifies the format of the raster data, such as "jpg", "tif", etc.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html#format)
+     */
     format?: string;
+    /**
+     * The ID of the uploaded file returned as a result of the upload operation. For ArcGIS Server 10.1 and greater, this class can be used to specify an uploaded item as input by specifying the ItemID.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html#itemId)
+     */
     itemId?: string;
+    /**
+     * URL to the location of the raster data file.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RasterData.html#url)
+     */
     url?: string;
   }
 
   interface RelationParameters extends Accessor {
+    /**
+     * The first array of geometries to compute the relation. The structure of each geometry in the array is same as the structure of the json geometry objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#geometries1)
+     */
     geometries1: Geometry[];
+    /**
+     * The second array of geometries to compute the relation. The structure of each geometry in the array is same as the structure of the json geometry objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#geometries2)
+     */
     geometries2: Geometry[];
+    /**
+     * The spatial relationship to be tested between the two input geometry arrays. See table below for a list of possible values. If the relation is specified as `relation`, the `relationParamater` parameter describes the spatial relationship and must be specified. 
+     * 
+     * Value | Description
+     * ------|------------
+     * cross | Two polylines cross if they share only points in common, at least one of which is not an endpoint. A polyline and an polygon cross if they share a polyline in common on the interior of the polygon which is not equivalent to the entire polyline. Cross is a Clementini operator. If either one of the geometries is empty, the geometries do not cross.
+     * disjoint | Two geometries are disjoint if their intersection is empty. Two geometries intersect if disjoint is "false".
+     * in | The base geometry is within the comparison geometry if the base geometry is the intersection of the geometries and the intersection of their interiors is not empty. An empty geometry is within another geometry, unless the other geometry is empty.
+     * interior-intersection | Geometries intersect excluding boundary touch.
+     * intersection | Geometry interiors intersect or boundaries touch, same as 'not disjoint'.
+     * line-coincidence | The boundaries of the geometries must share an intersection, but the relationship between the interiors of the shapes is not considered (they could overlap, one could be contained in the other, or their interiors could be disjoint). This relation applies to polylines and polygons.
+     * line-touch | Two geometries are said to touch when the intersection of the geometries is non-empty, but the intersection of their interiors is empty. This evaluates if the touch occurs along a boundary (not a point). Valid for polygons.
+     * overlap | Two polylines share a common sub-line, or two polygons share a common sub-area. Two geometries do not overlap if either one is empty.
+     * point-touch | Two geometries are said to touch when the intersection of the geometries is non-empty, but the intersection of their interiors is empty. This evaluates if the touch occurs at a point (not a boundary).
+     * relation | Allows specification of any relationship defined using the Shape Comparison Language. If this value is used, a value for `relationParameter` must be specified.
+     * touch | The union of point touch and line touch. Two geometries are said to touch when the intersection of the geometries is non-empty, but the intersection of their interiors is empty. For example, a point touches a polyline only if the point is coincident with one of the polyline end points. If either one of the two geometries is empty, the geometries are not touched.
+     * within | Same as `in` but also allows polylines that are strictly on the boundaries of polygons to be considered in the polygon.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#relation)
+     */
     relation: string;
-    relationParam: string;
+    /**
+     * The string describes the spatial relationship to be tested when `RelationParameters.relation = 'relation'`. The [Relational functions for ST_Geometry](https://desktop.arcgis.com/en/arcmap/latest/manage-data/using-sql-with-gdbs/relational-functions-for-st-geometry.htm) topic has additional details. An example of a valid string is: `FFFTTT**`. Also see the description of [geometryEngine.relate()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#relate) for additional examples of valid strings.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#relationParameter)
+     */
+    relationParameter: string;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface RelationParametersConstructor {
+
+
     new(properties?: RelationParametersProperties): RelationParameters;
   }
 
   export const RelationParameters: RelationParametersConstructor;
 
   interface RelationParametersProperties {
+    /**
+     * The first array of geometries to compute the relation. The structure of each geometry in the array is same as the structure of the json geometry objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#geometries1)
+     */
     geometries1?: GeometryProperties[];
+    /**
+     * The second array of geometries to compute the relation. The structure of each geometry in the array is same as the structure of the json geometry objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#geometries2)
+     */
     geometries2?: GeometryProperties[];
+    /**
+     * The spatial relationship to be tested between the two input geometry arrays. See table below for a list of possible values. If the relation is specified as `relation`, the `relationParamater` parameter describes the spatial relationship and must be specified. 
+     * 
+     * Value | Description
+     * ------|------------
+     * cross | Two polylines cross if they share only points in common, at least one of which is not an endpoint. A polyline and an polygon cross if they share a polyline in common on the interior of the polygon which is not equivalent to the entire polyline. Cross is a Clementini operator. If either one of the geometries is empty, the geometries do not cross.
+     * disjoint | Two geometries are disjoint if their intersection is empty. Two geometries intersect if disjoint is "false".
+     * in | The base geometry is within the comparison geometry if the base geometry is the intersection of the geometries and the intersection of their interiors is not empty. An empty geometry is within another geometry, unless the other geometry is empty.
+     * interior-intersection | Geometries intersect excluding boundary touch.
+     * intersection | Geometry interiors intersect or boundaries touch, same as 'not disjoint'.
+     * line-coincidence | The boundaries of the geometries must share an intersection, but the relationship between the interiors of the shapes is not considered (they could overlap, one could be contained in the other, or their interiors could be disjoint). This relation applies to polylines and polygons.
+     * line-touch | Two geometries are said to touch when the intersection of the geometries is non-empty, but the intersection of their interiors is empty. This evaluates if the touch occurs along a boundary (not a point). Valid for polygons.
+     * overlap | Two polylines share a common sub-line, or two polygons share a common sub-area. Two geometries do not overlap if either one is empty.
+     * point-touch | Two geometries are said to touch when the intersection of the geometries is non-empty, but the intersection of their interiors is empty. This evaluates if the touch occurs at a point (not a boundary).
+     * relation | Allows specification of any relationship defined using the Shape Comparison Language. If this value is used, a value for `relationParameter` must be specified.
+     * touch | The union of point touch and line touch. Two geometries are said to touch when the intersection of the geometries is non-empty, but the intersection of their interiors is empty. For example, a point touches a polyline only if the point is coincident with one of the polyline end points. If either one of the two geometries is empty, the geometries are not touched.
+     * within | Same as `in` but also allows polylines that are strictly on the boundaries of polygons to be considered in the polygon.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#relation)
+     */
     relation?: string;
-    relationParam?: string;
+    /**
+     * The string describes the spatial relationship to be tested when `RelationParameters.relation = 'relation'`. The [Relational functions for ST_Geometry](https://desktop.arcgis.com/en/arcmap/latest/manage-data/using-sql-with-gdbs/relational-functions-for-st-geometry.htm) topic has additional details. An example of a valid string is: `FFFTTT**`. Also see the description of [geometryEngine.relate()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-geometryEngine.html#relate) for additional examples of valid strings.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationParameters.html#relationParameter)
+     */
+    relationParameter?: string;
   }
 
   interface RelationshipQuery extends Accessor {
+    /**
+     * The definition expression to be applied to the related table or layer. Only records that fit the definition expression and are in the list of `objectIds` will be returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#definitionExpression)
+     */
     definitionExpression: string;
+    /**
+     * Specify the number of decimal places for the geometries returned by the query operation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#geometryPrecision)
+     */
     geometryPrecision: number;
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the query operation. The offset is in the units of the `outSpatialReference`. If `outSpatialReference` is not defined, the spatial reference of the map is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#maxAllowableOffset)
+     */
     maxAllowableOffset: number;
+    /**
+     * A comma delimited list of `ObjectIds` for the features in the layer/table that you want to query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#objectIds)
+     */
     objectIds: number[];
+    /**
+     * Attribute fields to include in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). Fields must exist in the map layer. You must list the actual field names rather than the alias names. Returned fields are also the actual field names. However, you are able to use the alias names when you display the results. You can set field alias names in the map document.  When you specify the output fields, you should limit the fields to only those you expect to use in the query or the results. The fewer fields you include, the faster the response will be.  Each query must have access to the Shape and ObjectId fields for a layer, but your list of fields does not need to include these two fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#outFields)
+     */
     outFields: string[];
+    /**
+     * The spatial reference for the returned geometry. If not specified, the geometry is returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * The ID of the relationship to test. The ids for the relationships the table or layer participates in are listed in the ArcGIS Services directory.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#relationshipId)
+     */
     relationshipId: number;
+    /**
+     * If `true`, each feature in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) includes the geometry. Set to `false` (default) if you do not plan to include highlighted features on a map since the geometry makes up a significant portion of the response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#returnGeometry)
+     */
     returnGeometry: boolean;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface RelationshipQueryConstructor {
+
+
     new(properties?: RelationshipQueryProperties): RelationshipQuery;
   }
 
   export const RelationshipQuery: RelationshipQueryConstructor;
 
   interface RelationshipQueryProperties {
+    /**
+     * The definition expression to be applied to the related table or layer. Only records that fit the definition expression and are in the list of `objectIds` will be returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#definitionExpression)
+     */
     definitionExpression?: string;
+    /**
+     * Specify the number of decimal places for the geometries returned by the query operation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#geometryPrecision)
+     */
     geometryPrecision?: number;
+    /**
+     * The maximum allowable offset used for generalizing geometries returned by the query operation. The offset is in the units of the `outSpatialReference`. If `outSpatialReference` is not defined, the spatial reference of the map is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#maxAllowableOffset)
+     */
     maxAllowableOffset?: number;
+    /**
+     * A comma delimited list of `ObjectIds` for the features in the layer/table that you want to query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#objectIds)
+     */
     objectIds?: number[];
+    /**
+     * Attribute fields to include in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). Fields must exist in the map layer. You must list the actual field names rather than the alias names. Returned fields are also the actual field names. However, you are able to use the alias names when you display the results. You can set field alias names in the map document.  When you specify the output fields, you should limit the fields to only those you expect to use in the query or the results. The fewer fields you include, the faster the response will be.  Each query must have access to the Shape and ObjectId fields for a layer, but your list of fields does not need to include these two fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#outFields)
+     */
     outFields?: string[];
+    /**
+     * The spatial reference for the returned geometry. If not specified, the geometry is returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * The ID of the relationship to test. The ids for the relationships the table or layer participates in are listed in the ArcGIS Services directory.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#relationshipId)
+     */
     relationshipId?: number;
+    /**
+     * If `true`, each feature in the [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) includes the geometry. Set to `false` (default) if you do not plan to include highlighted features on a map since the geometry makes up a significant portion of the response.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RelationshipQuery.html#returnGeometry)
+     */
     returnGeometry?: boolean;
   }
 
   interface RouteParameters extends Accessor {
+    /**
+     * The list of network attribute names to be accumulated with the analysis. For example, which attributes should be returned as part of the response. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset -> Network Attributes` as `Usage Type: esriNAUTCost`. See also [Understanding the network attribute](http://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#accumulateAttributes)
+     */
     accumulateAttributes: string[];
+    /**
+     * Each element in the array is an object that describes the parameter values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#attributeParameterValues)
+     */
     attributeParameterValues: AttributeParamValue;
+    /**
+     * The set of point barriers loaded as network locations during analysis. At ArcGIS Server 10.1 an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#barriers)
+     */
     barriers: DataLayer | FeatureSet;
+    /**
+     * The language used when computing directions. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). By default, NAServer gets installed with `en_US` only - it is up to the server administrator to add additional languages.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsLanguage)
+     */
     directionsLanguage: string;
+    /**
+     * The length units to use when computing directions. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsLengthUnits)
+     */
     directionsLengthUnits: string;
+    /**
+     * Defines the amount of direction information returned.  **Known Values:** complete | complete-no-events | instructions-only | standard | summary-only
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsOutputType)
+     * 
+     * @default standard
+     */
     directionsOutputType: string;
+    /**
+     * The style to be used when returning directions. The default will be as defined in the network layer. View the REST layer description for your network service to see a list of supported styles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsStyleName)
+     */
     directionsStyleName: string;
+    /**
+     * The name of network attribute to use for the drive time when computing directions. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsTimeAttribute)
+     */
     directionsTimeAttribute: string;
+    /**
+     * If `true`, avoids network elements restricted by barriers or restrictions specified in [restrictionAttributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#restrictionAttributes).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#doNotLocateOnRestrictedElements)
+     * 
+     * @default true
+     */
     doNotLocateOnRestrictedElements: boolean;
+    /**
+     * The [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html) can help you find the most efficient path for visiting a given list of stops. This is sometimes known as the "traveling salesperson" problem. When the `findBestSequence = true`, the route solver is solving the Traveling Salesperson problem by computing the optimal sequence to visit the stops. As this is a combinatorial problem, we employ heuristics to solve this in a reasonable time. The heuristics do not guarantee the optimal sequence (as there is no good/fast way to prove optimality for large number of stops). It returns a solution that is close to optimal if not the optimal. The heuristic performs favorably when tested with known TSP benchmarks available in the OR research community. For these stops to be visited in the most efficient way, specify the following parameters: 
+     * ```js
+     * routeParams.findBestSequence = true;
+     * routeParams.preserveFirstStop = false;
+     * routeParams.preserveLastStop = false;
+     * routeParams.returnStops = true;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#findBestSequence)
+     */
     findBestSequence: boolean;
+    /**
+     * In routes where a stop is not located on a network or a stop could not be reached, the results will differ depending on the value of this property:
+     *   * When `false`, the solve operation will fail if at least one of the stops specified cannot be located or reached.
+     *   * When `true`, as long as there are at least two valid stops that have been connected by a route, a valid result is returned. If multiple routes are processed in a single request, as long as least one route is built, a valid result is returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#ignoreInvalidLocations)
+     */
     ignoreInvalidLocations: boolean;
+    /**
+     * The network attribute name to be used as the impedance attribute in the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset -> Network Attributes` as `Usage Type: esriNAUTCost`. You can also specify a value of `none` to indicate that no network attributes should be used for impedance. If you specify an empty array, it will default to the default of the service.  For example, set `impedanceAttribute = "Time"` for the quickest route and `impedanceAttribute = "Length"` for shortest drive, assuming the service has those two esriNAUTCost attributes.  For more information, see [Understanding the network attribute](http://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#impedanceAttribute)
+     */
     impedanceAttribute: string;
+    /**
+     * The precision of the output geometry after generalization. If `0`, no generalization of output geometry is performed. If present and positive, it represents the `MaximumAllowableOffset` parameter and generalization is performed according to `IPolycurve.Generalize`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outputGeometryPrecision)
+     */
     outputGeometryPrecision: number;
+    /**
+     * The units of the output geometry precision.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outputGeometryPrecisionUnits)
+     */
     outputGeometryPrecisionUnits: string;
+    /**
+     * The type of output lines to be generated in the result. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).  **Known Values:** none | straight | true-shape | true-shape-with-measure
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outputLines)
+     * 
+     * @default true-shape
+     */
     outputLines: string;
+    /**
+     * The well-known ID of the spatial reference for the geometries returned with the analysis results. If not specified, the geometries are returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * The set of polygon barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the `features` or `url` property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#polygonBarriers)
+     */
     polygonBarriers: DataLayer | FeatureSet;
+    /**
+     * The set of polyline barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the `features` or `url` property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#polylineBarriers)
+     */
     polylineBarriers: DataLayer | FeatureSet;
+    /**
+     * If `true`, keeps the first stop fixed in the sequence even when `findBestSequence = true`. Only applicable if `findBestSequence = true`. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#preserveFirstStop)
+     */
     preserveFirstStop: boolean;
+    /**
+     * If `true`, keeps the last stop fixed in the sequence even when `findBestSequence = true`. Only applicable if `findBestSequence = true`. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#preserveLastStop)
+     */
     preserveLastStop: boolean;
+    /**
+     * The list of network attribute names to be used as restrictions with the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). Possible values are listed in the Service Directory under `Network Dataset -> Network Attributes`. You can also specify a value of `none` to indicate that no network attributes should be used as restrictions. If you specify an empty array, it will default to the default of the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#restrictionAttributes)
+     */
     restrictionAttributes: string[];
+    /**
+     * Specifies how U-Turns should be handled. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).  **Known Values:**  allow-backtrack | at-dead-ends-only | no-backtrack | at-dead-ends-and-intersections
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#restrictUTurns)
+     */
     restrictUTurns: string;
+    /**
+     * If `true`, barriers are returned with the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnBarriers)
+     * 
+     * @default false
+     */
     returnBarriers: boolean;
+    /**
+     * If `true`, barriers are returned in the [directions property of each RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#directions).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnDirections)
+     * 
+     * @default false
+     */
     returnDirections: boolean;
+    /**
+     * If `true`, polygon barriers are returned in the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnPolygonBarriers)
+     * 
+     * @default false
+     */
     returnPolygonBarriers: boolean;
+    /**
+     * If `true`, polyline barriers are returned in the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnPolylineBarriers)
+     * 
+     * @default false
+     */
     returnPolylineBarriers: boolean;
+    /**
+     * If `true`, routes are generated and returned in the route property of each [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnRoutes)
+     * 
+     * @default true
+     */
     returnRoutes: boolean;
+    /**
+     * If `true`, stops are returned in the stops property of each [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnStops)
+     * 
+     * @default false
+     */
     returnStops: boolean;
+    /**
+     * If `true`, `z` values are returned in the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnZ)
+     * 
+     * @default true
+     */
     returnZ: boolean;
+    /**
+     * The time the route begins. If not specified, the default is the time specified in the route service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#startTime)
+     */
     startTime: Date;
+    /**
+     * If `true`, the start time will be in UTC format.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#startTimeIsUTC)
+     */
     startTimeIsUTC: boolean;
+    /**
+     * The set of stops loaded as network locations during analysis. When `stops` takes a FeatureSet, each feature in the FeatureSet must have a defined spatial reference. If the feature contains `x` and `y` attributes, those values are used for the stop, even if the feature includes geometry.  At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The `url` property can be specified using DataFile Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#stops)
+     */
     stops: DataLayer | FeatureSet;
+    /**
+     * If `true`, the hierarchy attribute for the network should be used in analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#useHierarchy)
+     */
     useHierarchy: boolean;
+    /**
+     * A useful feature of the [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html) is the ability to constrain stop visits to certain times of day, or "time windows". If you were required to deliver orders to four homes and each customer was available during a limited time period during the day, the route task could help you find the most efficient path for making all the deliveries.  Time windows are treated as a "soft" constraint. This means that although the solver attempts to honor time windows, if necessary, it will violate the time windows of some stops in order to reach them. Remember, the stops will be visited in the order they were added unless you set `RouteParameters.findBestSequence = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#useTimeWindows)
+     */
     useTimeWindows: boolean;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface RouteParametersConstructor {
+
+
     new(properties?: RouteParametersProperties): RouteParameters;
   }
 
   export const RouteParameters: RouteParametersConstructor;
 
   interface RouteParametersProperties {
+    /**
+     * The list of network attribute names to be accumulated with the analysis. For example, which attributes should be returned as part of the response. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset -> Network Attributes` as `Usage Type: esriNAUTCost`. See also [Understanding the network attribute](http://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#accumulateAttributes)
+     */
     accumulateAttributes?: string[];
+    /**
+     * Each element in the array is an object that describes the parameter values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#attributeParameterValues)
+     */
     attributeParameterValues?: AttributeParamValue;
+    /**
+     * The set of point barriers loaded as network locations during analysis. At ArcGIS Server 10.1 an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#barriers)
+     */
     barriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The language used when computing directions. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). By default, NAServer gets installed with `en_US` only - it is up to the server administrator to add additional languages.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsLanguage)
+     */
     directionsLanguage?: string;
+    /**
+     * The length units to use when computing directions. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsLengthUnits)
+     */
     directionsLengthUnits?: string;
+    /**
+     * Defines the amount of direction information returned.  **Known Values:** complete | complete-no-events | instructions-only | standard | summary-only
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsOutputType)
+     * 
+     * @default standard
+     */
     directionsOutputType?: string;
+    /**
+     * The style to be used when returning directions. The default will be as defined in the network layer. View the REST layer description for your network service to see a list of supported styles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsStyleName)
+     */
     directionsStyleName?: string;
+    /**
+     * The name of network attribute to use for the drive time when computing directions. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#directionsTimeAttribute)
+     */
     directionsTimeAttribute?: string;
+    /**
+     * If `true`, avoids network elements restricted by barriers or restrictions specified in [restrictionAttributes](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#restrictionAttributes).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#doNotLocateOnRestrictedElements)
+     * 
+     * @default true
+     */
     doNotLocateOnRestrictedElements?: boolean;
+    /**
+     * The [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html) can help you find the most efficient path for visiting a given list of stops. This is sometimes known as the "traveling salesperson" problem. When the `findBestSequence = true`, the route solver is solving the Traveling Salesperson problem by computing the optimal sequence to visit the stops. As this is a combinatorial problem, we employ heuristics to solve this in a reasonable time. The heuristics do not guarantee the optimal sequence (as there is no good/fast way to prove optimality for large number of stops). It returns a solution that is close to optimal if not the optimal. The heuristic performs favorably when tested with known TSP benchmarks available in the OR research community. For these stops to be visited in the most efficient way, specify the following parameters: 
+     * ```js
+     * routeParams.findBestSequence = true;
+     * routeParams.preserveFirstStop = false;
+     * routeParams.preserveLastStop = false;
+     * routeParams.returnStops = true;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#findBestSequence)
+     */
     findBestSequence?: boolean;
+    /**
+     * In routes where a stop is not located on a network or a stop could not be reached, the results will differ depending on the value of this property:
+     *   * When `false`, the solve operation will fail if at least one of the stops specified cannot be located or reached.
+     *   * When `true`, as long as there are at least two valid stops that have been connected by a route, a valid result is returned. If multiple routes are processed in a single request, as long as least one route is built, a valid result is returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#ignoreInvalidLocations)
+     */
     ignoreInvalidLocations?: boolean;
+    /**
+     * The network attribute name to be used as the impedance attribute in the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset -> Network Attributes` as `Usage Type: esriNAUTCost`. You can also specify a value of `none` to indicate that no network attributes should be used for impedance. If you specify an empty array, it will default to the default of the service.  For example, set `impedanceAttribute = "Time"` for the quickest route and `impedanceAttribute = "Length"` for shortest drive, assuming the service has those two esriNAUTCost attributes.  For more information, see [Understanding the network attribute](http://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#impedanceAttribute)
+     */
     impedanceAttribute?: string;
+    /**
+     * The precision of the output geometry after generalization. If `0`, no generalization of output geometry is performed. If present and positive, it represents the `MaximumAllowableOffset` parameter and generalization is performed according to `IPolycurve.Generalize`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outputGeometryPrecision)
+     */
     outputGeometryPrecision?: number;
+    /**
+     * The units of the output geometry precision.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outputGeometryPrecisionUnits)
+     */
     outputGeometryPrecisionUnits?: string;
+    /**
+     * The type of output lines to be generated in the result. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).  **Known Values:** none | straight | true-shape | true-shape-with-measure
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outputLines)
+     * 
+     * @default true-shape
+     */
     outputLines?: string;
+    /**
+     * The well-known ID of the spatial reference for the geometries returned with the analysis results. If not specified, the geometries are returned in the spatial reference of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * The set of polygon barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the `features` or `url` property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#polygonBarriers)
+     */
     polygonBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The set of polyline barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the `features` or `url` property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#polylineBarriers)
+     */
     polylineBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * If `true`, keeps the first stop fixed in the sequence even when `findBestSequence = true`. Only applicable if `findBestSequence = true`. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#preserveFirstStop)
+     */
     preserveFirstStop?: boolean;
+    /**
+     * If `true`, keeps the last stop fixed in the sequence even when `findBestSequence = true`. Only applicable if `findBestSequence = true`. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#preserveLastStop)
+     */
     preserveLastStop?: boolean;
+    /**
+     * The list of network attribute names to be used as restrictions with the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). Possible values are listed in the Service Directory under `Network Dataset -> Network Attributes`. You can also specify a value of `none` to indicate that no network attributes should be used as restrictions. If you specify an empty array, it will default to the default of the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#restrictionAttributes)
+     */
     restrictionAttributes?: string[];
+    /**
+     * Specifies how U-Turns should be handled. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).  **Known Values:**  allow-backtrack | at-dead-ends-only | no-backtrack | at-dead-ends-and-intersections
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#restrictUTurns)
+     */
     restrictUTurns?: string;
+    /**
+     * If `true`, barriers are returned with the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnBarriers)
+     * 
+     * @default false
+     */
     returnBarriers?: boolean;
+    /**
+     * If `true`, barriers are returned in the [directions property of each RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#directions).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnDirections)
+     * 
+     * @default false
+     */
     returnDirections?: boolean;
+    /**
+     * If `true`, polygon barriers are returned in the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnPolygonBarriers)
+     * 
+     * @default false
+     */
     returnPolygonBarriers?: boolean;
+    /**
+     * If `true`, polyline barriers are returned in the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnPolylineBarriers)
+     * 
+     * @default false
+     */
     returnPolylineBarriers?: boolean;
+    /**
+     * If `true`, routes are generated and returned in the route property of each [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnRoutes)
+     * 
+     * @default true
+     */
     returnRoutes?: boolean;
+    /**
+     * If `true`, stops are returned in the stops property of each [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnStops)
+     * 
+     * @default false
+     */
     returnStops?: boolean;
+    /**
+     * If `true`, `z` values are returned in the [RouteResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#returnZ)
+     * 
+     * @default true
+     */
     returnZ?: boolean;
+    /**
+     * The time the route begins. If not specified, the default is the time specified in the route service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#startTime)
+     */
     startTime?: DateProperties;
+    /**
+     * If `true`, the start time will be in UTC format.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#startTimeIsUTC)
+     */
     startTimeIsUTC?: boolean;
+    /**
+     * The set of stops loaded as network locations during analysis. When `stops` takes a FeatureSet, each feature in the FeatureSet must have a defined spatial reference. If the feature contains `x` and `y` attributes, those values are used for the stop, even if the feature includes geometry.  At ArcGIS Server 10.1 an optional `url` property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The `url` property can be specified using DataFile Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#stops)
+     */
     stops?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * If `true`, the hierarchy attribute for the network should be used in analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#useHierarchy)
+     */
     useHierarchy?: boolean;
+    /**
+     * A useful feature of the [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html) is the ability to constrain stop visits to certain times of day, or "time windows". If you were required to deliver orders to four homes and each customer was available during a limited time period during the day, the route task could help you find the most efficient path for making all the deliveries.  Time windows are treated as a "soft" constraint. This means that although the solver attempts to honor time windows, if necessary, it will violate the time windows of some stops in order to reach them. Remember, the stops will be visited in the order they were added unless you set `RouteParameters.findBestSequence = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#useTimeWindows)
+     */
     useTimeWindows?: boolean;
   }
 
-  export interface AttributeParamValue {
+  /**
+   * An object describing the parameter values for the [attributeParameterValues](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#attributeParameterValues) property of [RouteParameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#AttributeParamValue)
+   */
+  export interface AttributeParamValue extends Object {
+    /**
+     * The name of the attribute.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#AttributeParamValue)
+     */
     attributeName: string;
+    /**
+     * The name of the parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#AttributeParamValue)
+     */
     parameterName: string;
+    /**
+     * The parameter's value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#AttributeParamValue)
+     */
     value: string;
   }
 
   interface RouteResult extends Accessor, JSONSupport {
+    /**
+     * Route directions are returned if `RouteParameters.returnDirections = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#directions)
+     */
     directions: DirectionsFeatureSet;
+    /**
+     * The Route graphic that is returned if `RouteParameters.returnRoutes = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#route)
+     */
     route: Graphic;
+    /**
+     * The name of the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#routeName)
+     */
     routeName: string;
+    /**
+     * Array of stops. Returned only if `RouteParameters.returnStops = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#stops)
+     */
     stops: Graphic[];
   }
 
   interface RouteResultConstructor {
+
+
     new(properties?: RouteResultProperties): RouteResult;
 
     fromJSON(json: any): RouteResult;
@@ -7041,101 +29621,583 @@ declare namespace __esri {
   export const RouteResult: RouteResultConstructor;
 
   interface RouteResultProperties {
+    /**
+     * Route directions are returned if `RouteParameters.returnDirections = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#directions)
+     */
     directions?: DirectionsFeatureSetProperties;
+    /**
+     * The Route graphic that is returned if `RouteParameters.returnRoutes = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#route)
+     */
     route?: GraphicProperties;
+    /**
+     * The name of the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#routeName)
+     */
     routeName?: string;
+    /**
+     * Array of stops. Returned only if `RouteParameters.returnStops = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html#stops)
+     */
     stops?: GraphicProperties[];
   }
 
   interface ServiceAreaParameters extends Accessor {
+    /**
+     * The list of network attribute names to be accumulated with the analysis (i.e. which attributes should be returned as part of the response). The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attributes names listed in the Service Directory under `Network Dataset > Network Attributes` as `Usage Type: esriNAUTCost`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#accumulateAttributes)
+     */
     accumulateAttributes: string[];
+    /**
+     * A set of attribute parameter values that can be parameterized to determine which network elements can be used by a vehicle. The parameter holding a vehicle characteristic is compared to a value coming from a descriptor attribute to determine whether or not a network element is traversable. For example, a parameterized restriction attribute can compare the height of your vehicle with a descriptor attribute that holds the clearance under overpasses through tunnels. If the vehicle's height is greater than the clearance, the edge is restricted.  Parameterized cost attributes that reference other cost attributes and scale them, can also be used. This is useful when inclement weather like ice, fog or heavy rain, descends on the study area and hinders normal flow of traffic. By having a parameter already outfitted on a cost attribute, travel-time expectations and traversable network paths can be adjusted with respect to changes in traffic speeds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#attributeParameterValues)
+     */
     attributeParameterValues: any[];
+    /**
+     * An array of numbers defining the breaks. The default value is defined in the network analysis layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#defaultBreaks)
+     */
     defaultBreaks: number[];
+    /**
+     * When `true`, restricted network elements should be considered when finding network locations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#doNotLocateOnRestrictedElements)
+     * 
+     * @default true
+     */
     doNotLocateOnRestrictedElements: boolean;
+    /**
+     * An array of network source names to NOT use when generating polygons. This property specifies if certain network sources should be excluded from the service area polygon generation. A service area on a multi-modal network where only one mode is being used to compute the service area would get a more appropriate shape if other modes are excluded from the polygons.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#excludeSourcesFromPolygons)
+     */
     excludeSourcesFromPolygons: string[];
+    /**
+     * The set of facilities loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using `DataFile`. Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#facilities)
+     */
     facilities: DataLayer | FeatureSet;
+    /**
+     * The network attribute name used as the impedance attribute in analysis. The default is as defined in the routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset > Network Attributes` as `Usage Type: esriNAUTCost`. You can also specify a value of `none` to indicate that no network attributes should be used for impedance. If you specify an empty string, it will use the default of the service.  For example, set `impedanceAttribute = 'Time'` for quickest route and `impedanceAttribute = 'Length'` for shortest drive. Assuming the service has those two esriNAUTCost attributes.  View the [Understanding the network attribute](http://help.arcgis.com/en/arcgisdesktop/10.0/help/index.html#//00470000000M000000.htm) ArcGIS desktop help topic for more details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#impedanceAttribute)
+     */
     impedanceAttribute: string;
+    /**
+     * If `true`, similar ranges will be merged in the resulting polygons.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#mergeSimilarPolygonRanges)
+     * 
+     * @default false
+     */
     mergeSimilarPolygonRanges: boolean;
+    /**
+     * The precision of the output geometry after generalization. If `0`, no generalization of output geometry is performed. If present and positive, it represents the `MaximumAllowableOffset` parameter and generalization is performed according to IPolycurve.Generalize.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputGeometryPrecision)
+     */
     outputGeometryPrecision: number;
+    /**
+     * The units of the output geometry precision.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputGeometryPrecisionUnits)
+     */
     outputGeometryPrecisionUnits: string;
+    /**
+     * The type of output lines to be generated in the result. The default is defined in the specific routing network layer used in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html). 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * none | No lines are returned
+     * straight | Only returns straight lines
+     * true-shape | Return the true shape of the lines
+     * true-shape-with-measure | Return the true shape of the lines with their measurments
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputLines)
+     */
     outputLines: string;
+    /**
+     * The type of output polygons to be generated in the result. The default is as defined in the specific routing network layer used in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).  **Possible Values:** none | simplified | detailed
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputPolygons)
+     */
     outputPolygons: string;
+    /**
+     * The well-known ID of the spatial reference for the geometries returned with the analysis results. If `outSpatialReference` is not specified, the geometries are returned in the spatial reference of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outSpatialReference)
+     */
     outSpatialReference: SpatialReference;
+    /**
+     * Indicates if the lines should overlap from multiple facilities. The default is defined by the network analysis layer in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#overlapLines)
+     * 
+     * @default false
+     */
     overlapLines: boolean;
+    /**
+     * Indicates if the polygons should overlap from multiple facilities. The default is defined by the network analysis layer in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#overlapPolygons)
+     * 
+     * @default false
+     */
     overlapPolygons: boolean;
+    /**
+     * The set of point barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#pointBarriers)
+     */
     pointBarriers: DataLayer | FeatureSet;
+    /**
+     * The set of polygon barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#polygonBarriers)
+     */
     polygonBarriers: DataLayer | FeatureSet;
+    /**
+     * The set of polyline barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#polylineBarriers)
+     */
     polylineBarriers: DataLayer | FeatureSet;
+    /**
+     * The list of network attribute names to be used as restrictions with the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attributes names listed in the Service Directory under `Network Dataset > Network Attributes` as `Usage Type: esriNAUTCost`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#restrictionAttributes)
+     */
     restrictionAttributes: string[];
+    /**
+     * Specifies how U-turns should be handled. The default is defined in the routing network layer used in your RouteTask. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * allow-backtrack | Allows U-turns on everywhere
+     * at-dead-ends-only | Only allows U-turns at dead ends
+     * no-backtrack | Restricts U-turns everywhere
+     * at-dead-ends-and-intersections | Only allows U-turns at dead ends and intersections
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#restrictUTurns)
+     */
     restrictUTurns: string;
+    /**
+     * If `true`, facilities will be returned with the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnFacilities)
+     * 
+     * @default false
+     */
     returnFacilities: boolean;
+    /**
+     * If `true`, point barriers will be returned in the [pointBarriers](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#pointBarriers) property of the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnPointBarriers)
+     * 
+     * @default false
+     */
     returnPointBarriers: boolean;
+    /**
+     * If `true`, polygon barriers will be returned in the [polygonBarriers](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polygonBarriers) property of the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnPolygonBarriers)
+     * 
+     * @default false
+     */
     returnPolygonBarriers: boolean;
+    /**
+     * If `true`, polyline barriers will be returned in the [polylineBarriers](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polylineBarriers) property of the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnPolylineBarriers)
+     * 
+     * @default false
+     */
     returnPolylineBarriers: boolean;
+    /**
+     * If `true`, lines will be split at breaks.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#splitLinesAtBreaks)
+     * 
+     * @default false
+     */
     splitLinesAtBreaks: boolean;
+    /**
+     * If `true`, polygons will be split at breaks.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#splitPolygonsAtBreaks)
+     * 
+     * @default false
+     */
     splitPolygonsAtBreaks: boolean;
+    /**
+     * Local date and time at the facility. if `travelDirection = "esriNATravelDirectionToFacility"`, the `timeOfDay` value specifies arrival time at the facility. if `travelDirection = "esriNATravelDirectionFromFacility"`, `timeOfDay` specifies departure time from the facility. Requires ArcGIS Server service version 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#timeOfDay)
+     */
     timeOfDay: Date;
+    /**
+     * Options for traveling to or from the facility. Default values are defined by the network layer. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * from-facility | Sets travel direction from the facility
+     * to-facility | Sets travel direction to the facility
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#travelDirection)
+     */
     travelDirection: string;
+    /**
+     * If `true`, the outermost polygon (at the maximum break value) will be trimmed. The default is defined in the network analysis layer in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimOuterPolygon)
+     * 
+     * @default false
+     */
     trimOuterPolygon: boolean;
+    /**
+     * If polygons are being trimmed, provides the distance to trim. The default value is defined in the network analysis layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimPolygonDistance)
+     */
     trimPolygonDistance: number;
+    /**
+     * If polygons are being trimmed, specifies the units of [trimPolygonDistance](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimPolygonDistance). The default is defined in the network analysis layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimPolygonDistanceUnits)
+     */
     trimPolygonDistanceUnits: string;
+    /**
+     * When `true`, the hierarchy attributes for the network will be used in the analysis. The default value is defined in the network layer. `useHierarchy` cannot be used in conjunction with [outputLines](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputLines). Requires an ArcGIS Server service version 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#useHierarchy)
+     */
     useHierarchy: boolean;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface ServiceAreaParametersConstructor {
+    /**
+     * Input parameters for [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html)
+     */
+
     new(properties?: ServiceAreaParametersProperties): ServiceAreaParameters;
   }
 
   export const ServiceAreaParameters: ServiceAreaParametersConstructor;
 
   interface ServiceAreaParametersProperties {
+    /**
+     * The list of network attribute names to be accumulated with the analysis (i.e. which attributes should be returned as part of the response). The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attributes names listed in the Service Directory under `Network Dataset > Network Attributes` as `Usage Type: esriNAUTCost`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#accumulateAttributes)
+     */
     accumulateAttributes?: string[];
+    /**
+     * A set of attribute parameter values that can be parameterized to determine which network elements can be used by a vehicle. The parameter holding a vehicle characteristic is compared to a value coming from a descriptor attribute to determine whether or not a network element is traversable. For example, a parameterized restriction attribute can compare the height of your vehicle with a descriptor attribute that holds the clearance under overpasses through tunnels. If the vehicle's height is greater than the clearance, the edge is restricted.  Parameterized cost attributes that reference other cost attributes and scale them, can also be used. This is useful when inclement weather like ice, fog or heavy rain, descends on the study area and hinders normal flow of traffic. By having a parameter already outfitted on a cost attribute, travel-time expectations and traversable network paths can be adjusted with respect to changes in traffic speeds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#attributeParameterValues)
+     */
     attributeParameterValues?: any[];
+    /**
+     * An array of numbers defining the breaks. The default value is defined in the network analysis layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#defaultBreaks)
+     */
     defaultBreaks?: number[];
+    /**
+     * When `true`, restricted network elements should be considered when finding network locations.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#doNotLocateOnRestrictedElements)
+     * 
+     * @default true
+     */
     doNotLocateOnRestrictedElements?: boolean;
+    /**
+     * An array of network source names to NOT use when generating polygons. This property specifies if certain network sources should be excluded from the service area polygon generation. A service area on a multi-modal network where only one mode is being used to compute the service area would get a more appropriate shape if other modes are excluded from the polygons.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#excludeSourcesFromPolygons)
+     */
     excludeSourcesFromPolygons?: string[];
+    /**
+     * The set of facilities loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using `DataFile`. Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#facilities)
+     */
     facilities?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The network attribute name used as the impedance attribute in analysis. The default is as defined in the routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset > Network Attributes` as `Usage Type: esriNAUTCost`. You can also specify a value of `none` to indicate that no network attributes should be used for impedance. If you specify an empty string, it will use the default of the service.  For example, set `impedanceAttribute = 'Time'` for quickest route and `impedanceAttribute = 'Length'` for shortest drive. Assuming the service has those two esriNAUTCost attributes.  View the [Understanding the network attribute](http://help.arcgis.com/en/arcgisdesktop/10.0/help/index.html#//00470000000M000000.htm) ArcGIS desktop help topic for more details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#impedanceAttribute)
+     */
     impedanceAttribute?: string;
+    /**
+     * If `true`, similar ranges will be merged in the resulting polygons.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#mergeSimilarPolygonRanges)
+     * 
+     * @default false
+     */
     mergeSimilarPolygonRanges?: boolean;
+    /**
+     * The precision of the output geometry after generalization. If `0`, no generalization of output geometry is performed. If present and positive, it represents the `MaximumAllowableOffset` parameter and generalization is performed according to IPolycurve.Generalize.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputGeometryPrecision)
+     */
     outputGeometryPrecision?: number;
+    /**
+     * The units of the output geometry precision.  **Known Values:** centimeters | decimal-degrees | decimeters | feet | inches | kilometers | meters | miles | millimeters | nautical-miles | points | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputGeometryPrecisionUnits)
+     */
     outputGeometryPrecisionUnits?: string;
+    /**
+     * The type of output lines to be generated in the result. The default is defined in the specific routing network layer used in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html). 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * none | No lines are returned
+     * straight | Only returns straight lines
+     * true-shape | Return the true shape of the lines
+     * true-shape-with-measure | Return the true shape of the lines with their measurments
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputLines)
+     */
     outputLines?: string;
+    /**
+     * The type of output polygons to be generated in the result. The default is as defined in the specific routing network layer used in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).  **Possible Values:** none | simplified | detailed
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputPolygons)
+     */
     outputPolygons?: string;
+    /**
+     * The well-known ID of the spatial reference for the geometries returned with the analysis results. If `outSpatialReference` is not specified, the geometries are returned in the spatial reference of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outSpatialReference)
+     */
     outSpatialReference?: SpatialReferenceProperties;
+    /**
+     * Indicates if the lines should overlap from multiple facilities. The default is defined by the network analysis layer in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#overlapLines)
+     * 
+     * @default false
+     */
     overlapLines?: boolean;
+    /**
+     * Indicates if the polygons should overlap from multiple facilities. The default is defined by the network analysis layer in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#overlapPolygons)
+     * 
+     * @default false
+     */
     overlapPolygons?: boolean;
+    /**
+     * The set of point barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#pointBarriers)
+     */
     pointBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The set of polygon barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#polygonBarriers)
+     */
     polygonBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The set of polyline barriers loaded as network locations during analysis. At ArcGIS Server 10.1, an optional url property was added. Use this property to specify a REST query request to a Feature, Map or GP Service that returns a JSON feature set. The url property can be specified using [DataFile](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataFile.html). Note that either the features or url property should be specified.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#polylineBarriers)
+     */
     polylineBarriers?: DataLayerProperties | FeatureSetProperties;
+    /**
+     * The list of network attribute names to be used as restrictions with the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attributes names listed in the Service Directory under `Network Dataset > Network Attributes` as `Usage Type: esriNAUTCost`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#restrictionAttributes)
+     */
     restrictionAttributes?: string[];
+    /**
+     * Specifies how U-turns should be handled. The default is defined in the routing network layer used in your RouteTask. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * allow-backtrack | Allows U-turns on everywhere
+     * at-dead-ends-only | Only allows U-turns at dead ends
+     * no-backtrack | Restricts U-turns everywhere
+     * at-dead-ends-and-intersections | Only allows U-turns at dead ends and intersections
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#restrictUTurns)
+     */
     restrictUTurns?: string;
+    /**
+     * If `true`, facilities will be returned with the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnFacilities)
+     * 
+     * @default false
+     */
     returnFacilities?: boolean;
+    /**
+     * If `true`, point barriers will be returned in the [pointBarriers](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#pointBarriers) property of the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnPointBarriers)
+     * 
+     * @default false
+     */
     returnPointBarriers?: boolean;
+    /**
+     * If `true`, polygon barriers will be returned in the [polygonBarriers](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polygonBarriers) property of the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnPolygonBarriers)
+     * 
+     * @default false
+     */
     returnPolygonBarriers?: boolean;
+    /**
+     * If `true`, polyline barriers will be returned in the [polylineBarriers](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polylineBarriers) property of the analysis results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#returnPolylineBarriers)
+     * 
+     * @default false
+     */
     returnPolylineBarriers?: boolean;
+    /**
+     * If `true`, lines will be split at breaks.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#splitLinesAtBreaks)
+     * 
+     * @default false
+     */
     splitLinesAtBreaks?: boolean;
+    /**
+     * If `true`, polygons will be split at breaks.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#splitPolygonsAtBreaks)
+     * 
+     * @default false
+     */
     splitPolygonsAtBreaks?: boolean;
+    /**
+     * Local date and time at the facility. if `travelDirection = "esriNATravelDirectionToFacility"`, the `timeOfDay` value specifies arrival time at the facility. if `travelDirection = "esriNATravelDirectionFromFacility"`, `timeOfDay` specifies departure time from the facility. Requires ArcGIS Server service version 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#timeOfDay)
+     */
     timeOfDay?: DateProperties;
+    /**
+     * Options for traveling to or from the facility. Default values are defined by the network layer. 
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * from-facility | Sets travel direction from the facility
+     * to-facility | Sets travel direction to the facility
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#travelDirection)
+     */
     travelDirection?: string;
+    /**
+     * If `true`, the outermost polygon (at the maximum break value) will be trimmed. The default is defined in the network analysis layer in your [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimOuterPolygon)
+     * 
+     * @default false
+     */
     trimOuterPolygon?: boolean;
+    /**
+     * If polygons are being trimmed, provides the distance to trim. The default value is defined in the network analysis layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimPolygonDistance)
+     */
     trimPolygonDistance?: number;
+    /**
+     * If polygons are being trimmed, specifies the units of [trimPolygonDistance](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimPolygonDistance). The default is defined in the network analysis layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#trimPolygonDistanceUnits)
+     */
     trimPolygonDistanceUnits?: string;
+    /**
+     * When `true`, the hierarchy attributes for the network will be used in the analysis. The default value is defined in the network layer. `useHierarchy` cannot be used in conjunction with [outputLines](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#outputLines). Requires an ArcGIS Server service version 10.1 or greater.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#useHierarchy)
+     */
     useHierarchy?: boolean;
   }
 
   interface ServiceAreaSolveResult extends Accessor, JSONSupport {
+    /**
+     * Array of points only returned if `ServiceAreaParameters.returnFacilities = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#facilities)
+     */
     facilities: Point[];
+    /**
+     * Message received when solve is completed. If a service area cannot be solved, the message returned by the server identifies the incident that could not be solved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#messages)
+     */
     messages: NAMessage[];
+    /**
+     * The point barriers are returned only if `ServiceAreaParameters.returnPointBarriers = true` (which is not the default). If you send in the point barriers as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) (instead of using [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html)), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#pointBarriers)
+     */
     pointBarriers: Point[];
+    /**
+     * The polygon barriers are returned only if `ServiceAreaParameters.returnPolygonBarriers = true` (which is not the default). If you send in the polygon barriers as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) (instead of using [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html)), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polygonBarriers)
+     */
     polygonBarriers: Polygon[];
+    /**
+     * The polyline barriers are returned only if `ServiceAreaParameters.returnPolylineBarriers = true` (which is not the default). If you send in the polyline barriers as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) (instead of using [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html)), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polylineBarriers)
+     */
     polylineBarriers: Polyline[];
+    /**
+     * An array of service area polygon graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#serviceAreaPolygons)
+     */
     serviceAreaPolygons: Graphic[];
+    /**
+     * An array of service area polyline graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#serviceAreaPolylines)
+     */
     serviceAreaPolylines: Graphic[];
   }
 
   interface ServiceAreaSolveResultConstructor {
+    /**
+     * The result from [ServiceAreaTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-ServiceAreaTask.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html)
+     */
+
     new(properties?: ServiceAreaSolveResultProperties): ServiceAreaSolveResult;
 
     fromJSON(json: any): ServiceAreaSolveResult;
@@ -7144,842 +30206,4021 @@ declare namespace __esri {
   export const ServiceAreaSolveResult: ServiceAreaSolveResultConstructor;
 
   interface ServiceAreaSolveResultProperties {
+    /**
+     * Array of points only returned if `ServiceAreaParameters.returnFacilities = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#facilities)
+     */
     facilities?: PointProperties[];
+    /**
+     * Message received when solve is completed. If a service area cannot be solved, the message returned by the server identifies the incident that could not be solved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#messages)
+     */
     messages?: NAMessageProperties[];
+    /**
+     * The point barriers are returned only if `ServiceAreaParameters.returnPointBarriers = true` (which is not the default). If you send in the point barriers as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) (instead of using [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html)), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#pointBarriers)
+     */
     pointBarriers?: PointProperties[];
+    /**
+     * The polygon barriers are returned only if `ServiceAreaParameters.returnPolygonBarriers = true` (which is not the default). If you send in the polygon barriers as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) (instead of using [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html)), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polygonBarriers)
+     */
     polygonBarriers?: PolygonProperties[];
+    /**
+     * The polyline barriers are returned only if `ServiceAreaParameters.returnPolylineBarriers = true` (which is not the default). If you send in the polyline barriers as a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) (instead of using [DataLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-DataLayer.html)), you already have the barriers and might not need to request them back from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#polylineBarriers)
+     */
     polylineBarriers?: PolylineProperties[];
+    /**
+     * An array of service area polygon graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#serviceAreaPolygons)
+     */
     serviceAreaPolygons?: GraphicProperties[];
+    /**
+     * An array of service area polyline graphics.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaSolveResult.html#serviceAreaPolylines)
+     */
     serviceAreaPolylines?: GraphicProperties[];
   }
 
-  interface StatisticDefinition extends Accessor {
+  interface StatisticDefinition extends Accessor, JSONSupport {
+    /**
+     * Defines the field for which statistics will be calculated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#onStatisticField)
+     */
     onStatisticField: string;
+    /**
+     * Specifies the output field name. Output field names can only contain alpha-numeric characters and an underscore. If no output field name is specified, the map server assigns a field name to the returned statistic field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#outStatisticFieldName)
+     */
     outStatisticFieldName: string;
+    /**
+     * Defines the type of statistic.  **Known Values:** count | sum | min | max | avg | stddev | var
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#statisticType)
+     */
     statisticType: string;
-
-    toJSON(): any;
   }
 
   interface StatisticDefinitionConstructor {
+
+
     new(properties?: StatisticDefinitionProperties): StatisticDefinition;
+
+    fromJSON(json: any): StatisticDefinition;
   }
 
   export const StatisticDefinition: StatisticDefinitionConstructor;
 
   interface StatisticDefinitionProperties {
+    /**
+     * Defines the field for which statistics will be calculated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#onStatisticField)
+     */
     onStatisticField?: string;
+    /**
+     * Specifies the output field name. Output field names can only contain alpha-numeric characters and an underscore. If no output field name is specified, the map server assigns a field name to the returned statistic field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#outStatisticFieldName)
+     */
     outStatisticFieldName?: string;
+    /**
+     * Defines the type of statistic.  **Known Values:** count | sum | min | max | avg | stddev | var
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#statisticType)
+     */
     statisticType?: string;
   }
 
   interface TrimExtendParameters extends Accessor {
+    /**
+     * A flag used with the `trimExtend` operation. 
+     * 
+     * Possible Value | Description
+     * ---------------|-------------
+     * default-curve-extension | The extension considers both ends of the path. The old ends remain and new points are added to the extended ends. The new points have attributes that are extrapolated from existing adjacent segments.
+     * relocate-ends | When an extension is performed at an end, relocate the end point to the new position.
+     * keep-end-attributes | When an extension is performed at an end, do not extrapolate the end segments attributes for the new point. Instead, the attributes will be the same as the current end.
+     * no-end-attributes | When an extension is performed at an end, do not extrapolate the end segments attributes for the new point. Instead the attributes will be empty.
+     * no-extend-at-from | Do not extend the 'from' end of any path.
+     * no-extend-at-to | Do not extend the 'to' end of any path.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-TrimExtendParameters.html#extendHow)
+     * 
+     * @default default-curve-extension
+     */
     extendHow: string;
+    /**
+     * The array of polylines to trim or extend. The structure of each geometry in the array is the same as the structure of the JSON polyline objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-TrimExtendParameters.html#polylines)
+     */
     polylines: Polyline[];
+    /**
+     * A polyline used as a guide for trimming or extending input polylines. The structure of the polyline is the same as the structure of the JSON polyline object returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-TrimExtendParameters.html#trimExtendTo)
+     */
     trimExtendTo: Polyline;
 
+    /**
+     * Converts an instance of  [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-TrimExtendParameters.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
   }
 
   interface TrimExtendParametersConstructor {
+
+
     new(properties?: TrimExtendParametersProperties): TrimExtendParameters;
   }
 
   export const TrimExtendParameters: TrimExtendParametersConstructor;
 
   interface TrimExtendParametersProperties {
+    /**
+     * A flag used with the `trimExtend` operation. 
+     * 
+     * Possible Value | Description
+     * ---------------|-------------
+     * default-curve-extension | The extension considers both ends of the path. The old ends remain and new points are added to the extended ends. The new points have attributes that are extrapolated from existing adjacent segments.
+     * relocate-ends | When an extension is performed at an end, relocate the end point to the new position.
+     * keep-end-attributes | When an extension is performed at an end, do not extrapolate the end segments attributes for the new point. Instead, the attributes will be the same as the current end.
+     * no-end-attributes | When an extension is performed at an end, do not extrapolate the end segments attributes for the new point. Instead the attributes will be empty.
+     * no-extend-at-from | Do not extend the 'from' end of any path.
+     * no-extend-at-to | Do not extend the 'to' end of any path.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-TrimExtendParameters.html#extendHow)
+     * 
+     * @default default-curve-extension
+     */
     extendHow?: string;
+    /**
+     * The array of polylines to trim or extend. The structure of each geometry in the array is the same as the structure of the JSON polyline objects returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-TrimExtendParameters.html#polylines)
+     */
     polylines?: PolylineProperties[];
+    /**
+     * A polyline used as a guide for trimming or extending input polylines. The structure of the polyline is the same as the structure of the JSON polyline object returned by the ArcGIS REST API.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-TrimExtendParameters.html#trimExtendTo)
+     */
     trimExtendTo?: PolylineProperties;
   }
 
   interface Task extends Accessor {
+    /**
+     * The [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for data requests. These options can also be controlled through the `requestOptions` method parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Task.html#requestOptions)
+     */
     requestOptions: any;
+    /**
+     * The ArcGIS Server REST service URL (usually of a Feature Service Layer or Map Service Layer) for use in a task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Task.html#url)
+     */
     url: string;
   }
 
   interface TaskConstructor {
+
+
     new(properties?: TaskProperties): Task;
   }
 
   export const Task: TaskConstructor;
 
   interface TaskProperties {
+    /**
+     * The [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for data requests. These options can also be controlled through the `requestOptions` method parameter.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Task.html#requestOptions)
+     */
     requestOptions?: any;
+    /**
+     * The ArcGIS Server REST service URL (usually of a Feature Service Layer or Map Service Layer) for use in a task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Task.html#url)
+     */
     url?: string;
   }
 
   interface ConfigurationTask extends Task {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#url)
+     */
     url: string;
 
+    /**
+     * Gets an array of all the user groups that are configured in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getAllGroups)
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getAllGroups(requestOptions?: any): IPromise<any[]>;
+    /**
+     * Gets an array of all the users that are configured in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getAllUsers)
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getAllUsers(requestOptions?: any): IPromise<any[]>;
+    /**
+     * Gets the properties and an array of geodatabase versions for a data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getDataWorkspaceDetails)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.dataWorkspaceId The unique id of the data workspace, whose version will be returned.
+     * @param params.user The user name of the user who is requesting the information.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getDataWorkspaceDetails(params: ConfigurationTaskGetDataWorkspaceDetailsParams, requestOptions?: any): IPromise<any[]>;
+    /**
+     * Gets a single user group in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getGroup)
+     * 
+     * @param groupId The unique id of the  group whose information will be retrieved.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getGroup(groupId: number, requestOptions?: any): IPromise<any[]>;
+    /**
+     * Gets the detailed configuration properties of a job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getJobTypeDetails)
+     * 
+     * @param jobTypeId The unique id of a job type.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getJobTypeDetails(jobTypeId: number, requestOptions?: any): IPromise<JobTypeDetails>;
+    /**
+     * Gets the configuration of a publicly accessible job query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getPublicJobQueryDetails)
+     * 
+     * @param queryId The unique id of public query.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getPublicJobQueryDetails(queryId: number, requestOptions?: any): IPromise<JobQueryDetails>;
+    /**
+     * Gets the [configuration information](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo) specific to a Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getServiceInfo)
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getServiceInfo(requestOptions?: any): IPromise<WorkflowManagerServiceInfo>;
+    /**
+     * Gets an array of registered [table relationships](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#TableRelationship) in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getTableRelationshipsDetails)
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getTableRelationshipsDetails(requestOptions?: any): IPromise<TableRelationship>;
+    /**
+     * Gets information for a single user in the system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getUser)
+     * 
+     * @param user The user name of the user whose information will be returned.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getUser(user: string, requestOptions?: any): IPromise<UserDetails>;
+    /**
+     * Gets the configuration of a user-owned job query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getUserJobQueryDetails)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.queryId The unique id of user query.
+     * @param params.user The user name of the user who is requesting the information.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getUserJobQueryDetails(params: ConfigurationTaskGetUserJobQueryDetailsParams, requestOptions?: any): IPromise<JobQueryDetails>;
+    /**
+     * Gets all the job types a user is allowed to see and create.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getVisibleJobTypes)
+     * 
+     * @param user The user name of the user for whom the information will be retrieved.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getVisibleJobTypes(user: string, requestOptions?: any): IPromise<JobType>;
   }
 
   interface ConfigurationTaskConstructor {
+
+
     new(properties?: ConfigurationTaskProperties): ConfigurationTask;
   }
 
   export const ConfigurationTask: ConfigurationTaskConstructor;
 
   interface ConfigurationTaskProperties extends TaskProperties {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#url)
+     */
     url?: string;
   }
 
-  export interface ConfigurationTaskGetDataWorkspaceDetailsParams {
+
+  export interface ConfigurationTaskGetDataWorkspaceDetailsParams extends Object {
+    /**
+     * The unique id of the data workspace, whose version will be returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getDataWorkspaceDetails)
+     */
     dataWorkspaceId: string;
+    /**
+     * The user name of the user who is requesting the information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getDataWorkspaceDetails)
+     */
     user: string;
   }
 
-  export interface ConfigurationTaskGetUserJobQueryDetailsParams {
+
+  export interface ConfigurationTaskGetUserJobQueryDetailsParams extends Object {
+    /**
+     * The unique id of user query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getUserJobQueryDetails)
+     */
     queryId: number;
+    /**
+     * The user name of the user who is requesting the information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#getUserJobQueryDetails)
+     */
     user: string;
   }
 
-  export interface DataWorkspace {
+  /**
+   * A geospatial database that will be used for editing in the Workflow Manager system.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#DataWorkspace)
+   */
+  export interface DataWorkspace extends Object {
+    /**
+     * The unique id of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#DataWorkspace)
+     */
     id: string;
+    /**
+     * The name of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#DataWorkspace)
+     */
     name: string;
   }
 
-  export interface GroupMembership {
+  /**
+   * The membership attributes of a group.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#GroupMembership)
+   */
+  export interface GroupMembership extends Object {
+    /**
+     * The unique id for the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#GroupMembership)
+     */
     id: number;
+    /**
+     * The name of the group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#GroupMembership)
+     */
     name: string;
   }
 
-  export interface HoldType {
+  /**
+   * The type of hold that can be applied to suspend the execution of a job.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#HoldType)
+   */
+  export interface HoldType extends Object {
+    /**
+     * The description of the type of hold.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#HoldType)
+     */
     description: string;
+    /**
+     * The unique id for the hold type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#HoldType)
+     */
     id: number;
+    /**
+     * The name of the hold type
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#HoldType)
+     */
     name: string;
   }
 
-  export interface JobPriority {
+  /**
+   * The properties of a job priority. Job priority is a way to assign a level of importance to the job.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobPriority)
+   */
+  export interface JobPriority extends Object {
+    /**
+     * The description of the priority.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobPriority)
+     */
     description: string;
+    /**
+     * The name of the priority.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobPriority)
+     */
     name: string;
+    /**
+     * The unique id of the priority.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobPriority)
+     */
     value: number;
   }
 
-  export interface JobQuery {
+  /**
+   * A query that is available to the user to execute. A query returns jobs based on a specific criteria.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQuery)
+   */
+  export interface JobQuery extends Object {
+    /**
+     * The unique id for the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQuery)
+     */
     id: number;
+    /**
+     * The name of the priority.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQuery)
+     */
     name: string;
   }
 
-  export interface JobQueryContainer {
+  /**
+   * A container of job queries, it can also contain nested containers with child job query containers under it.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer)
+   */
+  export interface JobQueryContainer extends Object {
+    /**
+     * One or more [job query containers](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer) which are nested under the parent container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer)
+     */
     containers: JobQueryContainer[];
+    /**
+     * The unique id for the container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer)
+     */
     id: number;
+    /**
+     * The name of the query container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer)
+     */
     name: string;
+    /**
+     * An array of [queries](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQuery) inside the query container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer)
+     */
     queries: JobQuery[];
   }
 
-  export interface JobQueryDetails {
+  /**
+   * Detailed properties of a job query.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+   */
+  export interface JobQueryDetails extends Object {
+    /**
+     * An array of field aliases included in the select statement.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+     */
     aliases: string[];
+    /**
+     * An array of fields included in the select statement.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+     */
     fields: string[];
+    /**
+     * The unique id for the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+     */
     id: number;
+    /**
+     * The name of the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+     */
     name: string;
+    /**
+     * The field used to order the results returned by the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+     */
     orderBy: string;
+    /**
+     * An array of tables selected from and used in the where clause.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+     */
     tables: string[];
+    /**
+     * The where clause used as filter for selecting job information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryDetails)
+     */
     where: string;
   }
 
-  export interface JobStatus {
+  /**
+   * Properties of a job status.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobStatus)
+   */
+  export interface JobStatus extends Object {
+    /**
+     * An alias name for the status.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobStatus)
+     */
     caption: string;
+    /**
+     * The description of the type of status.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobStatus)
+     */
     description: string;
+    /**
+     * The unique id for the status type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobStatus)
+     */
     id: number;
+    /**
+     * The name of the status type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobStatus)
+     */
     name: string;
   }
 
-  export interface JobType {
+  /**
+   * A list of properties that describe a job type.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobType)
+   */
+  export interface JobType extends Object {
+    /**
+     * A category to group other similar job types.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobType)
+     */
     category: string;
+    /**
+     * The description of the job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobType)
+     */
     description: string;
+    /**
+     * The unique id for the job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobType)
+     */
     id: string;
+    /**
+     * The name of the job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobType)
+     */
     name: string;
+    /**
+     * The state of the job type.  **Possible Values:** draft | active | retired
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobType)
+     */
     state: string;
   }
 
-  export interface JobTypeDetails {
+  /**
+   * Detailed information of a job type.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+   */
+  export interface JobTypeDetails extends Object {
+    /**
+     * The name of the geodatabase version that will be assigned the parent version of the job's geodatabase by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultParentVersionName: string;
+    /**
+     * Indicates whether jobs of this type will have their workflows automatically executed, when created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     autoExecuteCreatedJobs: boolean;
+    /**
+     * The category of the job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     category: string;
+    /**
+     * The name of the user or group that the job will be assigned to by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultAssignedTo: string;
+    /**
+     * Indicates whether the job is assigned to a user, group or unassigned by default.  **Possible Values:** unassigned | user | group
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultAssignedType: string;
+    /**
+     * The unique id of the default data workspace of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultDataWorkspaceId: string;
+    /**
+     * The description that gets associated with the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultDescription: string;
+    /**
+     * The default due date of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultDueDate: string;
+    /**
+     * The duration for completing the job assigned by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultJobDuration: number;
+    /**
+     * Indicates whether jobs of this type allows users to modify the current data workspace in the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     canDataWorkspaceChange: boolean;
+    /**
+     * The numeric priority value assigned to the job by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultPriority: string;
+    /**
+     * The default start date of this job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     defaultStartDate: Date;
+    /**
+     * The description of the job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     description: string;
+    /**
+     * The unique id automatically generated for this job type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     id: string;
+    /**
+     * The naming scheme for this job type, which would serve as template for the name of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     jobNamingScheme: string;
+    /**
+     * The naming scheme for this job type, which would serve as template for the name of job's version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     jobVersionNamingScheme: string;
+    /**
+     * The naming scheme for this job type, which would serve as template for the name of job's map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     mxdNamingScheme: string;
+    /**
+     * The job type name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     name: string;
+    /**
+     * The state of the job type.  **Possible Values:** draft | active | retired
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobTypeDetails)
+     */
     state: string;
   }
 
-  export interface Privilege {
+  /**
+   * A privilege in the Workflow Manager system that controls application access.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#Privilege)
+   */
+  export interface Privilege extends Object {
+    /**
+     * The description of the privilege.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#Privilege)
+     */
     description: string;
+    /**
+     * The unique id for the privilege.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#Privilege)
+     */
     id: number;
+    /**
+     * The name of the privilege.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#Privilege)
+     */
     name: string;
   }
 
-  export interface TableRelationship {
+  /**
+   * TableRelationship represents a list of extended properties tables and the properties that identify them like name and cardinality.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#TableRelationship)
+   */
+  export interface TableRelationship extends Object {
+    /**
+     * The type of extra property table relationship, one-to-one represents one row for each property and one-to-many represents there will be multiple values for the property.  **Possible Values:** one-to-one | one-to-many
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#TableRelationship)
+     */
     cardinality: string;
+    /**
+     * The foreign key field used to join the jobs table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#TableRelationship)
+     */
     linkField: string;
+    /**
+     * The alias name of the table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#TableRelationship)
+     */
     tableAlias: string;
+    /**
+     * The name of the extended properties table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#TableRelationship)
+     */
     tableName: string;
   }
 
-  export interface UserDetails {
+  /**
+   * A list of properties including groups and privileges associated with a Workflow Manager user.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+   */
+  export interface UserDetails extends Object {
+    /**
+     * The last name of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     lastName: string;
+    /**
+     * The address of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     address: string;
+    /**
+     * The fax number of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     faxNumber: string;
+    /**
+     * The first name of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     firstName: string;
+    /**
+     * The full name of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     fullName: string;
+    /**
+     * An array of [group memberships](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#GroupMembership) of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     groups: GroupMembership[];
+    /**
+     * The email address of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     email: string;
+    /**
+     * The phone number of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     phoneNumber: string;
+    /**
+     * An array of [application privileges](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#Privilege) of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     privileges: Privilege[];
+    /**
+     * The room number of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     roomNumber: string;
+    /**
+     * The login username for the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     userName: string;
+    /**
+     * An array of [queries](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer) owned by the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     userQueries: JobQueryContainer[];
+    /**
+     * The zip code of the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#UserDetails)
+     */
     zipCode: string;
   }
 
-  export interface VersionInfo {
+  /**
+   * A list of properties that describe a geodatabase version.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#VersionInfo)
+   */
+  export interface VersionInfo extends Object {
+    /**
+     * The level of access to the geodatabase version.  **Possible Values:** esriVersionAccessPrivate | esriVersionAccessPublic | esriVersionAccessProtected
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#VersionInfo)
+     */
     access: string;
+    /**
+     * The name of the geodatabase version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#VersionInfo)
+     */
     name: string;
+    /**
+     * The name of the parent version of the geodatabase.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#VersionInfo)
+     */
     parent: string;
   }
 
-  export interface WorkflowManagerServiceInfo {
+  /**
+   * The base properties of a Workflow Manager service.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+   */
+  export interface WorkflowManagerServiceInfo extends Object {
+    /**
+     * An array of [job priorities](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobPriority) in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     jobPriorities: JobPriority[];
+    /**
+     * An array of activity types in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     activityTypes: ActivityType[];
+    /**
+     * The current software version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     currentVersion: number;
+    /**
+     * An array of [data workspaces](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#DataWorkspace) in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     dataWorkspaces: DataWorkspace[];
+    /**
+     * An array of [hold types](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#HoldType) in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     holdTypes: HoldType[];
+    /**
+     * The configuration properties of the Workflow Manager system stored in the database table as key/value pairs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     configProperties: WorkflowManagerServiceInfoConfigProperties;
+    /**
+     * An array of [job statuses](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobStatus) in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     jobStatuses: JobStatus[];
+    /**
+     * An array of [job types](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobType) in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     jobTypes: JobType[];
+    /**
+     * An array of notification types in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     notificationTypes: NotificationType[];
+    /**
+     * An array of [privileges](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#Privilege) in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     privileges: Privilege[];
+    /**
+     * The array of [public queries](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#JobQueryContainer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     publicQueries: JobQueryContainer[];
   }
 
-  export interface WorkflowManagerServiceInfoConfigProperties {
+
+  export interface WorkflowManagerServiceInfoConfigProperties extends Object {
+    /**
+     * Indicates whether the location of interest (LOI) for jobs are allowed to overlap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     AOIOVERLAP: string;
+    /**
+     * The color of the current job's LOI when selected in the LOI tab. The value is in range of 0 to 167772155.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     AOISELECTIONCOLOR: number;
+    /**
+     * Indicates whether the job will be automatically assigned based on step assignment.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     AUTOASSIGNJOB: boolean;
+    /**
+     * Indicates whether the job will be automatically closed after the last step in the workflow is marked as complete.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     AUTOCLOSEJOB: boolean;
+    /**
+     * Indicates whether the job workflow witll be automatically committed to the database when saved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     AUTOCOMMITWORKFLOW: boolean;
+    /**
+     * Indicates whether the status of the jobs will be automatically assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     AUTOSTATUSASSIGN: boolean;
+    /**
+     * Indicates whether the user will be required to confirm that they want to mark the current procedural step as complete.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     CONFIRMPROCEDURALCHECK: boolean;
+    /**
+     * The default email address to be used in the sender field when sending notifications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     DEFAULT_SENDER_EMAIL: string;
+    /**
+     * The default name displayed to be used in the sender field when sending notifications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     DEFAULT_SENDER_NAME: string;
+    /**
+     * Indicates whether notifications will be sent as HTML.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     HTML_SUPPORT: string;
+    /**
+     * The starting value of job ids in the system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     JOB_ID_START_VALUE: string;
+    /**
+     * Indicates whether the the number of days for each hold is taken out of the pending days calculation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     PENDING_DAYS_USE_HOLDS: boolean;
+    /**
+     * Indicates whether the user attempting to delete a job version would be prompted to enter a password for the sde owner of the versions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     PROMPTSDEPWD: boolean;
+    /**
+     * Indicates whether it will be required to mark procedural steps as started.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     REQUIREPROCEDURALCHECKSTART: number;
+    /**
+     * Indicates whether the editing behavior will be restricted to data in the job's AOI using editing restriction rules.  **Possible Values:** Warn | NoSelect | Off
+     *   * `Warn` - Warn users when selecting features outside the job AOI.
+     *   * `NoSelect` - Prevent users from selecting features outside the job AOI.
+     *   * `Off` - Allow edits to features outside the job AOI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     RESTRICT_AOI_OPTION: string;
+    /**
+     * Indicates whether the spatial notifications will be sent on Workflow Manager Post.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SEND_SN_CUSTOM_POST: boolean;
+    /**
+     * Indicates whether to show step ids on workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SHOW_STEP_IDS: boolean;
+    /**
+     * Indicates whether the step completion percentage will be displayed on the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SHOW_STEP_PERCENT_COMPLETE: boolean;
+    /**
+     * The password of the authenticated SMTP user in the secure SMTP server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SMTP_PASSWORD: string;
+    /**
+     * Indicates whether the pending days will be displayed in the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SHOW_PENDING_DAYS: boolean;
+    /**
+     * The SMTP server port to be used for sending notifications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SMTP_PORT: string;
+    /**
+     * SMTP Authentication protocol.  **Possible Values:** SSL | TLS
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SMTP_PROTOCOL: string;
+    /**
+     * The name of the SMTP Server to be used for sending notifications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SMTP_SERVER: string;
+    /**
+     * The user name that is authenticated in the secure SMTP server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     SMTP_USERNAME: string;
+    /**
+     * Indicates whether to use step status assignment such that the job's status updates to match the step status when the step is reached.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     USE_STEP_STATUS: boolean;
+    /**
+     * Indicates the user store of the Workflow Manager system, whether the users will be stored in a Portal or the Workflow Manager system.  **Possible Values:** traditional | portal
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     USER_STORE: string;
+    /**
+     * Indicates whether a user will be authenticated using domain along with the user name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     USEUSERDOMAIN: boolean;
+    /**
+     * The fill color of a selected step in a workflow. The value is in range of 0 to 167772155. When the option is disabled it's value is -1.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     WF_SEL_STEP_FILL_COLOR: number;
+    /**
+     * The outline color of a selected step in a workflow. The value is in range of 0 to 167772155. When the option is disabled it's value is -1.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     WF_SEL_STEP_OUTLINE_COLOR: number;
+    /**
+     * The outline width of a selected step in a workflow.  **Possible Values:** 1 | 2 | 3
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     WF_SEL_STEP_OUTLINE_WIDTH: number;
+    /**
+     * Indicates whether the LOI of the job will be automatically zoomed to in the LOI tab.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ConfigurationTask.html#WorkflowManagerServiceInfo)
+     */
     ZOOMTOAOI: boolean;
   }
 
   interface JobTask extends Task {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#url)
+     */
     url: string;
 
+    /**
+     * Uploads a file and attaches it to the job as an embedded attachment.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addEmbeddedAttachment)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.form The form element that contains the file input control. The form parameter can be an instance of FormData. Using FormData you can send a "multipart/form-data" request to the server without having to create an HTML form element in markup. Note that the FormData api is not available in all browsers.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     addEmbeddedAttachment(params: JobTaskAddEmbeddedAttachmentParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Adds a linked attachment to a job (url or file).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedAttachment)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.attachmentType The type of attachment to be added.  **Possible Values:** linked-file | url
+     * @param params.path The file path to the attachment.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     addLinkedAttachment(params: JobTaskAddLinkedAttachmentParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Adds a linked property record to a job's linked properties table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedRecord)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.tableName The name of the table to which the record will be added.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     addLinkedRecord(params: JobTaskAddLinkedRecordParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Assigns one or more jobs to a user or group.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#assignJobs)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobIds An array of unique job Ids.
+     * @param params.assignedType Indicates whether the job is assigned to a user, group or unassigned.  **Possible Values:** unassigned | user | group
+     * @param params.assignedTo The name of the user or group to whom the job will be assigned.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     assignJobs(params: JobTaskAssignJobsParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Closes one or more jobs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#closeJobs)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobIds An array of unique job Ids.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     closeJobs(params: JobTaskCloseJobsParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Creates a job dependency.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.heldOnType Indicates whether the current job (to which the dependency is being added) will be held at a step, stage or status.  **Possible Values:** step | stage | status
+     * @param params.heldOnValue The value of the step, stage or status at which the current job will be held.
+     * @param params.depJobId The unique id of the job on which the current job will depend.
+     * @param params.depOnType Indicates whether the current job (to which the dependency is being added) will be dependent on a step, stage or status of the other job.  **Possible Values:** step | stage | status
+     * @param params.depOnValue The value of the step or status of the other job on which the current job will be dependent.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     createDependency(params: JobTaskCreateDependencyParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Creates a job hold.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createHold)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.holdTypeId The unique id representing the hold type to be placed on the job.
+     * @param params.comments Reason or more detailed information regarding why the hold is being added.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     createHold(params: JobTaskCreateHoldParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Creates new jobs based on the provided parameters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createJobs)
+     * 
+     * @param params The parameters to be used for job creation, parameters defined in the job type can be overritten. The jobTypeId and user are required parameters when creating a job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     createJobs(params: JobCreationParameters, requestOptions?: any): IPromise<string[]>;
+    /**
+     * Creates a version specific to the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createJobVersion)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.name The name of the version to be created.
+     * @param params.parent The name of the job's assigned geodatabase (data workspace) version, based on which the new version will be created.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     createJobVersion(params: JobTaskCreateJobVersionParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Deletes an attachment from a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteAttachment)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.attachmentId The unique id of the attachment to be deleted.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     deleteAttachment(params: JobTaskDeleteAttachmentParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Deletes a job dependency.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteDependency)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.dependencyId The unique id of the dependency to be deleted.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     deleteDependency(params: JobTaskDeleteDependencyParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Delete one or more jobs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteJobs)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobIds An array of unique job Ids.
+     * @param params.deleteHistory Indicates whether or not to delete the associated job history, the default is to delete job history.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     deleteJobs(params: JobTaskDeleteJobsParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Deletes a record from a job's linked properties table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteLinkedRecord)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.tableName The name of the table from which linked record will be deleted.
+     * @param params.recordId The unique id of the record in the table.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     deleteLinkedRecord(params: JobTaskDeleteLinkedRecordParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Gets the activity log for a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getActivityLog)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getActivityLog(jobId: number, requestOptions?: any): IPromise<any[]>;
+    /**
+     * Gets the URL to access the file content of an embedded job attachment.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getAttachmentContentUrl)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.attachmentId The Id of the attachment to be retrieved.
+     * 
+     */
     getAttachmentContentUrl(params: JobTaskGetAttachmentContentUrlParams): string;
+    /**
+     * Gets all the attachments associated with the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getAttachments)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getAttachments(jobId: number, requestOptions?: any): IPromise<JobAttachment>;
+    /**
+     * Gets an array of dependencies configured for a job. A job with a dependency is held at a step, stage or status of the other job, and cannot progress until the other job reaches the step, stage or status defined in the dependency. Once the other job reaches step, stage or status as defined in the dependency criteria the dependency is released and the dependent job can progress.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getDependencies)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getDependencies(jobId: number, requestOptions?: any): IPromise<JobDependency>;
+    /**
+     * Gets an array of [extended properties](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordContainer) for a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getExtendedProperties)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getExtendedProperties(jobId: number, requestOptions?: any): IPromise<AuxRecordContainer>;
+    /**
+     * Gets an array of holds on a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getHolds)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getHolds(jobId: number, requestOptions?: any): IPromise<any[]>;
+    /**
+     * Gets the [job](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo) object based on the given id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getJob)
+     * 
+     * @param jobId The unique id of the job to be retrieved.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getJob(jobId: number, requestOptions?: any): IPromise<JobTaskJobInfo>;
+    /**
+     * Gets all the job ids in the system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getJobIds)
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getJobIds(requestOptions?: any): IPromise<string[]>;
+    /**
+     * Gets the notes for a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getNotes)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getNotes(jobId: number, requestOptions?: any): IPromise<string>;
+    /**
+     * Gets an array of [values and descriptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#FieldValue) for a geodatabase domain or table list extended property field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listFieldValues)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.tableName The name of the extended property table.
+     * @param params.field The field name of the extended property for which to retrieve values.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     listFieldValues(params: JobTaskListFieldValuesParams, requestOptions?: any): IPromise<FieldValue>;
+    /**
+     * Gets an array of [display values](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#FieldValue) for a given fields that comprise a multi-level table list extended property. As each display field is selected, for example using a dropdown UI control, this method can be called to obtain a list of values to display in the subsequent dropdown control.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listMultiLevelFieldValues)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.field The name of the field.
+     * @param params.previousSelectedValues The array of previous values, on which the current value is dependent on. For example, when selecting a city based on the state and county. The value for the state and county would be the previous values.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     listMultiLevelFieldValues(params: JobTaskListMultiLevelFieldValuesParams, requestOptions?: any): IPromise<FieldValue>;
+    /**
+     * Logs an action in a job's activity log.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#logAction)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.activityTypeId The unique id representing the [activity type](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#ActivityType) of the action associated with this log record.
+     * @param params.comments The comment that is added to the history.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     logAction(params: JobTaskLogActionParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Queries the jobs using the queryId of an existing query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#queryJobs)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.queryId The unique id of a query, used to query jobs in the database.
+     * @param params.user The username of the user who is requesting query.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     queryJobs(params: JobTaskQueryJobsParams, requestOptions?: any): IPromise<QueryResult>;
+    /**
+     * Queries the jobs using an ad-hoc query definition and gets the [query result](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryResult).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#queryJobsAdHoc)
+     * 
+     * @param params The [parameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters) to query jobs.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     queryJobsAdHoc(params: JobQueryParameters, requestOptions?: any): IPromise<QueryResult>;
+    /**
+     * Gets an array of string values representing the current display values for each display field in a multi-level table list extended property. The values from this method should be used to pre-select items in dropdown lists when initially displaying the extended properties of a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#queryMultiLevelSelectedValues)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.field The name of the field.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     queryMultiLevelSelectedValues(params: JobTaskQueryMultiLevelSelectedValuesParams, requestOptions?: any): IPromise<string[]>;
+    /**
+     * Releases a job hold.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#releaseHold)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.holdId The unique id of the hold.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     releaseHold(params: JobTaskReleaseHoldParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Reopens one or more closed jobs. Supported from 10.3 onwards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#reopenClosedJobs)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobIds An array of unique job Ids.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     reopenClosedJobs(params: JobTaskReopenClosedJobsParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Performs a freeform text search and returns a set of matching job records.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#searchJobs)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.text The text which will be used to perform the search.
+     * @param params.user The username of the user who is requesting search.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     searchJobs(params: JobTaskSearchJobsParams, requestOptions?: any): IPromise<QueryResult>;
+    /**
+     * Unassigns one or more jobs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#unassignJobs)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobIds An array of unique job Ids.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     unassignJobs(params: JobTaskUnassignJobsParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Update a job's properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateJob)
+     * 
+     * @param params The [parameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters) to be used for job properties update, the jobId and the user are required when updating jobs.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     updateJob(params: JobUpdateParameters, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Updates the notes for a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateNotes)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.notes The new notes for the job. Set to an empty (zero-length) string to clear the job notes.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     updateNotes(params: JobTaskUpdateNotesParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Updates the values of an extended or linked properties record.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateRecord)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.record The record to be updated.
+     * @param params.user The user name of the user who is requesting the change.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     updateRecord(params: JobTaskUpdateRecordParams, requestOptions?: any): IPromise<boolean>;
   }
 
   interface JobTaskConstructor {
+    /**
+     * Helps you work with Workflow Manager jobs. A job is a single unit of work that is carried out within an organization. Various methods are available in the class to work with the following:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html)
+     */
+
     new(properties?: JobTaskProperties): JobTask;
   }
 
   export const JobTask: JobTaskConstructor;
 
   interface JobTaskProperties extends TaskProperties {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#url)
+     */
     url?: string;
   }
 
-  export interface ActivityType {
+  /**
+   * ActivityType represents an activity type template that gets logged on a job when a certain event is fired in the application.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#ActivityType)
+   */
+  export interface ActivityType extends Object {
+    /**
+     * The description of the activity being recorded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#ActivityType)
+     */
     desription: string;
+    /**
+     * The unique id of the activity that is logged.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#ActivityType)
+     */
     id: number;
+    /**
+     * The message that will be logged when this type of activity occurs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#ActivityType)
+     */
     message: string;
+    /**
+     * The name of the activity that occured.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#ActivityType)
+     */
     name: string;
   }
 
-  export interface AuxRecord {
+  /**
+   * AuxRecord represents the extended/linked properties record information associated with a job so that you can fetch or update the information for a specified record.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecord)
+   */
+  export interface AuxRecord extends Object {
+    /**
+     * The display value of the record.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecord)
+     */
     displayProperty: any;
+    /**
+     * The unique id of the record.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecord)
+     */
     id: number;
+    /**
+     * The array of the values in the [records](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecord)
+     */
     recordvalues: AuxRecordValue;
   }
 
-  export interface AuxRecordContainer {
+  /**
+   * AuxRecordContainer represents the extended/linked properties table characteristics.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordContainer)
+   */
+  export interface AuxRecordContainer extends Object {
+    /**
+     * The array of extended property [records](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecord).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordContainer)
+     */
     records: AuxRecord;
+    /**
+     * The type of extended property relationship.  **Possible Values:** one-to-one | one-to-many
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordContainer)
+     */
     relationshipType: string;
+    /**
+     * The table alias.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordContainer)
+     */
     tableAlias: string;
+    /**
+     * The table name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordContainer)
+     */
     tableName: string;
   }
 
-  export interface AuxRecordDescription {
+  /**
+   * AuxRecordDescription represents the type of value that is captured in a specific AuxRecord field. There are multiple data types supported in Workflow Manager like - file, folder, text, date, etc.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordDescription)
+   */
+  export interface AuxRecordDescription extends Object {
+    /**
+     * The array of property/value pairs of the record.
+     * 
+     * [Read more...](properties.html)
+     */
     properties: any;
+    /**
+     * The unique id of the record.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordDescription)
+     */
     recordId: number;
+    /**
+     * The table name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordDescription)
+     */
     tableName: string;
   }
 
-  export interface AuxRecordValue {
+  /**
+   * AuxRecordValue represents the values of extended/linked properties associated with a job.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+   */
+  export interface AuxRecordValue extends Object {
+    /**
+     * The filter to restrict the types of records supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     filter: string;
+    /**
+     * The alias for the field in the table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     alias: string;
+    /**
+     * The data contained in the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     data: any;
+    /**
+     * The type of data expected in the field.  **Possible Values:** small-integer | integer | single | double | string | date | oid | geometry | blob | raster | guid | global-id | xml
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     dataType: string;
+    /**
+     * The order each field is displayed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     displayOrder: number;
+    /**
+     * The type of extended property item.  **Possible Values:** default | text | date | domain | file | geo-file | folder | list | table-list | multi-level-table-list
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     displayType: string;
+    /**
+     * The domain value configured for the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     domain: string;
+    /**
+     * Indicates whether the extended property value can be updated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     canUpdate: boolean;
+    /**
+     * The length of the property string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     length: number;
+    /**
+     * The name property associated with the record.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     name: string;
+    /**
+     * Indicates whether the property is a required or optional field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     required: boolean;
+    /**
+     * The lookup table that contains the list of values which will be selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     tableListClass: string;
+    /**
+     * The field that will be displayed for the extended property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     tableListDisplayField: string;
+    /**
+     * The field that contains the value that gets stored as the extended property value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     tableListStoreField: string;
+    /**
+     * Indicates whether the value will be visible to the user or not.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#AuxRecordValue)
+     */
     userVisible: boolean;
   }
 
-  export interface FieldValue {
+  /**
+   * FieldValue represents a single entry of a geodatabase domain or table list, applicable to constraining the values of an extended or linked property.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#FieldValue)
+   */
+  export interface FieldValue extends Object {
+    /**
+     * The description of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#FieldValue)
+     */
     description: string;
+    /**
+     * The value that is stored for the extended properties record.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#FieldValue)
+     */
     value: any;
   }
 
-  export interface JobAttachment {
+  /**
+   * JobAttachment represents an attachments associated with a job.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobAttachment)
+   */
+  export interface JobAttachment extends Object {
+    /**
+     * The name of the file attachment.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobAttachment)
+     */
     filename: string;
+    /**
+     * The file folder path or a URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobAttachment)
+     */
     folder: string;
+    /**
+     * The unique id of the attachment.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobAttachment)
+     */
     id: number;
+    /**
+     * The storage type of the attachment.  **Possible Values:** linked-file | embedded | url
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobAttachment)
+     */
     storageType: string;
   }
 
-  export interface JobCreationParameters {
+  /**
+   * JobCreationParameters provides information about the properties used for creating a job.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+   */
+  export interface JobCreationParameters extends Object {
+    /**
+     * The geometry of the job's location of interest (LOI). Supported geometry types include point, multipoint and polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     loi: Geometry;
+    /**
+     * The name of the user or group to whom the job will be assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     assignedTo: string;
+    /**
+     * Indicates whether the workflow will be automatically committed upon creation of the job. The workflow cannot be edited after being committed to the system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     autoCommitWorkflow: boolean;
+    /**
+     * Indicates whether the job workflow will start execution automatically upon creation  of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     autoExecute: boolean;
+    /**
+     * The unique id of the data workspace of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     dataWorkspaceId: string;
+    /**
+     * The description of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     description: string;
+    /**
+     * The date on which the job is expected to be complete.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     dueDate: Date;
+    /**
+     * The unique id of the job type from which to create the new job from.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     jobTypeId: number;
+    /**
+     * Indicates whether the job is assigned to a user, group or unassigned.  **Possible Values:** unassigned | user | group
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     assignedType: string;
+    /**
+     * The name of the new job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     name: string;
+    /**
+     * The number of jobs to be created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     numJobs: string;
+    /**
+     * The name of the user that will own the job. Job ownership allows modification of job properties and not workflow execution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     ownedBy: string;
+    /**
+     * The unique id of the job that will be designated as the parent job of the new job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     parentJobId: number;
+    /**
+     * The name of the geodatabase version that will be the parent version of the new job's version. By default it'll be the parent version of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     parentVersion: string;
+    /**
+     * The numeric value to denote priority of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     priority: number;
+    /**
+     * The date on which the job is scheduled to begin.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     startDate: Date;
+    /**
+     * The username of the user creating the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobCreationParameters)
+     */
     user: string;
   }
 
-  export interface JobDependency {
+  /**
+   * JobDependency represents a dependency associated with a job.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+   */
+  export interface JobDependency extends Object {
+    /**
+     * The unique id of the job on which the current job depends.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+     */
     depJobId: number;
+    /**
+     * Indicates whether the job is dependent on a step, stage or status of the other job.  **Possible Values:** step | stage | status
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+     */
     depOnType: string;
+    /**
+     * The value of the step, stage or status of the other job on which the current job is dependent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+     */
     depOnValue: string;
+    /**
+     * The value of the step, stage or status at which the current job will be held.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+     */
     heldOnValue: number;
+    /**
+     * Indicates whether the job is held at a step, stage or status.  **Possible Values:** step | stage | status
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+     */
     holdOnType: string;
+    /**
+     * The unique id of the dependency.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+     */
     id: number;
+    /**
+     * The unique id of the job on which the dependency exists.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobDependency)
+     */
     jobID: string;
   }
 
-  export interface JobTaskJobInfo {
+  /**
+   * JobInfo represents a collection of job properties
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+   */
+  export interface JobTaskJobInfo extends Object {
+    /**
+     * The name of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     name: string;
+    /**
+     * The name of the user or group to whom the job is assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     assignedTo: string;
+    /**
+     * An array of unique job ids designated as child jobs for the current job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     childJobIds: number[];
+    /**
+     * The user name of the person that created the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     createdBy: string;
+    /**
+     * The date the job was created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     createdDate: Date;
+    /**
+     * The unique id of the data workspace of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     dataWorkspaceId: string;
+    /**
+     * The description of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     description: string;
+    /**
+     * The date on which the job is expected to be complete.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     dueDate: Date;
+    /**
+     * The actual date the job's workflow was completed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     endDate: Date;
+    /**
+     * The unique id to identify the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     id: number;
+    /**
+     * The unique id of the job type whose instance is the current job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     jobTypeId: number;
+    /**
+     * The geometry of the job's location of interest (LOI). Supported geometry types include point, multipoint and polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     loi: Geometry;
+    /**
+     * Indicates whether the job is assigned to a user, group or unassigned.  **Possible Values:** unassigned | user | group
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     assignedType: string;
+    /**
+     * The name of the user that will own the job. Job ownership allows modification of job properties and not workflow execution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     ownedBy: string;
+    /**
+     * The unique id of the job that will be designated as the parent job of the new job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     parentJobId: number;
+    /**
+     * The name of the geodatabase version that is the parent version of the job's version. By default it'll be the parent version of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     parentVersion: string;
+    /**
+     * The number of days that the job has been active.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     pendingDays: number;
+    /**
+     * The percentage of work completed on the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     percentageComplete: number;
+    /**
+     * The numeric value to denote priority of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     priority: number;
+    /**
+     * The internal stage of the job which corresponds to the status of the job.  **Possible Values:** created | ready | working | done | closed
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     stage: string;
+    /**
+     * The date on which the job is scheduled to begin.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     startDate: Date;
+    /**
+     * The numeric value to represent the current status of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     status: number;
+    /**
+     * Indicates whether a version exists for the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     versionExists: boolean;
+    /**
+     * The information about job's geodatabase version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     versionInfo: JobVersionInfo;
+    /**
+     * The name of the job's geodatabase version.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobInfo)
+     */
     versionName: string;
   }
 
-  export interface JobQueryParameters {
+  /**
+   * JobQueryParameters is a full query definition of the selected query.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters)
+   */
+  export interface JobQueryParameters extends Object {
+    /**
+     * An alias of fields included in the select statement.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters)
+     */
     aliases: string;
+    /**
+     * An array of fields included in the select statement.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters)
+     */
     fields: string;
+    /**
+     * The field that will be used to order the results returned by the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters)
+     */
     orderBy: string;
+    /**
+     * The tables that will be used in the where clause for selection.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters)
+     */
     tables: string;
+    /**
+     * The where clause used as a filter for selecting job information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters)
+     */
     where: string;
+    /**
+     * The username of the user who is requesting query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobQueryParameters)
+     */
     user: string;
   }
 
-  export interface JobTaskAddEmbeddedAttachmentParams {
+
+  export interface JobTaskAddEmbeddedAttachmentParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addEmbeddedAttachment)
+     */
     jobId: number;
+    /**
+     * The form element that contains the file input control. The form parameter can be an instance of FormData. Using FormData you can send a "multipart/form-data" request to the server without having to create an HTML form element in markup. Note that the FormData api is not available in all browsers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addEmbeddedAttachment)
+     */
     form: any;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addEmbeddedAttachment)
+     */
     user: string;
   }
 
-  export interface JobTaskAddLinkedAttachmentParams {
+
+  export interface JobTaskAddLinkedAttachmentParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedAttachment)
+     */
     jobId: number;
+    /**
+     * The type of attachment to be added.  **Possible Values:** linked-file | url
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedAttachment)
+     */
     attachmentType: number;
+    /**
+     * The file path to the attachment.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedAttachment)
+     */
     path: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedAttachment)
+     */
     user: string;
   }
 
-  export interface JobTaskAddLinkedRecordParams {
+
+  export interface JobTaskAddLinkedRecordParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedRecord)
+     */
     jobId: number;
+    /**
+     * The name of the table to which the record will be added.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedRecord)
+     */
     tableName: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#addLinkedRecord)
+     */
     user: string;
   }
 
-  export interface JobTaskAssignJobsParams {
+
+  export interface JobTaskAssignJobsParams extends Object {
+    /**
+     * An array of unique job Ids.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#assignJobs)
+     */
     jobIds: number[];
+    /**
+     * Indicates whether the job is assigned to a user, group or unassigned.  **Possible Values:** unassigned | user | group
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#assignJobs)
+     */
     assignedType: string;
+    /**
+     * The name of the user or group to whom the job will be assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#assignJobs)
+     */
     assignedTo: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#assignJobs)
+     */
     user: string;
   }
 
-  export interface JobTaskCloseJobsParams {
+
+  export interface JobTaskCloseJobsParams extends Object {
+    /**
+     * An array of unique job Ids.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#closeJobs)
+     */
     jobIds: number[];
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#closeJobs)
+     */
     user: string;
   }
 
-  export interface JobTaskCreateDependencyParams {
+
+  export interface JobTaskCreateDependencyParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     */
     jobId: number;
+    /**
+     * Indicates whether the current job (to which the dependency is being added) will be held at a step, stage or status.  **Possible Values:** step | stage | status
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     */
     heldOnType: string;
+    /**
+     * The value of the step, stage or status at which the current job will be held.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     */
     heldOnValue: number;
+    /**
+     * The unique id of the job on which the current job will depend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     */
     depJobId: number;
+    /**
+     * Indicates whether the current job (to which the dependency is being added) will be dependent on a step, stage or status of the other job.  **Possible Values:** step | stage | status
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     */
     depOnType: string;
+    /**
+     * The value of the step or status of the other job on which the current job will be dependent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     */
     depOnValue: number;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createDependency)
+     */
     user: string;
   }
 
-  export interface JobTaskCreateHoldParams {
+
+  export interface JobTaskCreateHoldParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createHold)
+     */
     jobId: number;
+    /**
+     * The unique id representing the hold type to be placed on the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createHold)
+     */
     holdTypeId: number;
+    /**
+     * Reason or more detailed information regarding why the hold is being added.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createHold)
+     */
     comments: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createHold)
+     */
     user: string;
   }
 
-  export interface JobTaskCreateJobVersionParams {
+
+  export interface JobTaskCreateJobVersionParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createJobVersion)
+     */
     jobId: number;
+    /**
+     * The name of the version to be created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createJobVersion)
+     */
     name: string;
+    /**
+     * The name of the job's assigned geodatabase (data workspace) version, based on which the new version will be created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createJobVersion)
+     */
     parent: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#createJobVersion)
+     */
     user: string;
   }
 
-  export interface JobTaskDeleteAttachmentParams {
+
+  export interface JobTaskDeleteAttachmentParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteAttachment)
+     */
     jobId: number;
+    /**
+     * The unique id of the attachment to be deleted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteAttachment)
+     */
     attachmentId: number;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteAttachment)
+     */
     user: string;
   }
 
-  export interface JobTaskDeleteDependencyParams {
+
+  export interface JobTaskDeleteDependencyParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteDependency)
+     */
     jobId: number;
+    /**
+     * The unique id of the dependency to be deleted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteDependency)
+     */
     dependencyId: number;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteDependency)
+     */
     user: string;
   }
 
-  export interface JobTaskDeleteJobsParams {
+
+  export interface JobTaskDeleteJobsParams extends Object {
+    /**
+     * An array of unique job Ids.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteJobs)
+     */
     jobIds: number[];
+    /**
+     * Indicates whether or not to delete the associated job history, the default is to delete job history.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteJobs)
+     */
     deleteHistory?: boolean;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteJobs)
+     */
     user: string;
   }
 
-  export interface JobTaskDeleteLinkedRecordParams {
+
+  export interface JobTaskDeleteLinkedRecordParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteLinkedRecord)
+     */
     jobId: number;
+    /**
+     * The name of the table from which linked record will be deleted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteLinkedRecord)
+     */
     tableName: string;
+    /**
+     * The unique id of the record in the table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteLinkedRecord)
+     */
     recordId: number;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#deleteLinkedRecord)
+     */
     user: string;
   }
 
-  export interface JobTaskGetAttachmentContentUrlParams {
+
+  export interface JobTaskGetAttachmentContentUrlParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getAttachmentContentUrl)
+     */
     jobId: number;
+    /**
+     * The Id of the attachment to be retrieved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#getAttachmentContentUrl)
+     */
     attachmentId: number;
   }
 
-  export interface JobTaskListFieldValuesParams {
+
+  export interface JobTaskListFieldValuesParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listFieldValues)
+     */
     jobId: number;
+    /**
+     * The name of the extended property table.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listFieldValues)
+     */
     tableName: string;
+    /**
+     * The field name of the extended property for which to retrieve values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listFieldValues)
+     */
     field: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listFieldValues)
+     */
     user: string;
   }
 
-  export interface JobTaskListMultiLevelFieldValuesParams {
+
+  export interface JobTaskListMultiLevelFieldValuesParams extends Object {
+    /**
+     * The name of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listMultiLevelFieldValues)
+     */
     field: string;
+    /**
+     * The array of previous values, on which the current value is dependent on. For example, when selecting a city based on the state and county. The value for the state and county would be the previous values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listMultiLevelFieldValues)
+     */
     previousSelectedValues: string[];
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#listMultiLevelFieldValues)
+     */
     user: string;
   }
 
-  export interface JobTaskLogActionParams {
+
+  export interface JobTaskLogActionParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#logAction)
+     */
     jobId: number;
+    /**
+     * The unique id representing the [activity type](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#ActivityType) of the action associated with this log record.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#logAction)
+     */
     activityTypeId: number;
+    /**
+     * The comment that is added to the history.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#logAction)
+     */
     comments: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#logAction)
+     */
     user: string;
   }
 
-  export interface JobTaskQueryJobsParams {
+
+  export interface JobTaskQueryJobsParams extends Object {
+    /**
+     * The unique id of a query, used to query jobs in the database.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#queryJobs)
+     */
     queryId: number;
+    /**
+     * The username of the user who is requesting query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#queryJobs)
+     */
     user: string;
   }
 
-  export interface JobTaskQueryMultiLevelSelectedValuesParams {
+
+  export interface JobTaskQueryMultiLevelSelectedValuesParams extends Object {
+    /**
+     * The name of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#queryMultiLevelSelectedValues)
+     */
     field: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#queryMultiLevelSelectedValues)
+     */
     user: string;
   }
 
-  export interface JobTaskReleaseHoldParams {
+
+  export interface JobTaskReleaseHoldParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#releaseHold)
+     */
     jobId: number;
+    /**
+     * The unique id of the hold.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#releaseHold)
+     */
     holdId: number;
   }
 
-  export interface JobTaskReopenClosedJobsParams {
+
+  export interface JobTaskReopenClosedJobsParams extends Object {
+    /**
+     * An array of unique job Ids.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#reopenClosedJobs)
+     */
     jobIds: number[];
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#reopenClosedJobs)
+     */
     user: string;
   }
 
-  export interface JobTaskSearchJobsParams {
+
+  export interface JobTaskSearchJobsParams extends Object {
+    /**
+     * The text which will be used to perform the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#searchJobs)
+     */
     text: string;
+    /**
+     * The username of the user who is requesting search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#searchJobs)
+     */
     user: string;
   }
 
-  export interface JobTaskUnassignJobsParams {
+
+  export interface JobTaskUnassignJobsParams extends Object {
+    /**
+     * An array of unique job Ids.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#unassignJobs)
+     */
     jobIds: number[];
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#unassignJobs)
+     */
     user: string;
   }
 
-  export interface JobTaskUpdateNotesParams {
+
+  export interface JobTaskUpdateNotesParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateNotes)
+     */
     jobId: number;
+    /**
+     * The new notes for the job. Set to an empty (zero-length) string to clear the job notes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateNotes)
+     */
     notes: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateNotes)
+     */
     user: string;
   }
 
-  export interface JobTaskUpdateRecordParams {
+
+  export interface JobTaskUpdateRecordParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateRecord)
+     */
     jobId: number;
+    /**
+     * The record to be updated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateRecord)
+     */
     record: AuxRecordDescription;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#updateRecord)
+     */
     user: string;
   }
 
-  export interface JobUpdateParameters {
+  /**
+   * JobUpdateParameters is a collection of properties that can be updated for jobs.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+   */
+  export interface JobUpdateParameters extends Object {
+    /**
+     * The name of the user that will own the job. Job ownership allows modification of job properties and not workflow execution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     ownedBy: string;
+    /**
+     * The name of the user or group to whom the job will be assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     assignedTo: string;
+    /**
+     * The unique id of the data workspace of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     dataWorkspaceId: string;
+    /**
+     * The description of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     description: string;
+    /**
+     * The date on which the job is expected to be complete.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     dueDate: Date;
+    /**
+     * The geometry of the job's location of interest (LOI). Supported geometry types include point, multipoint and polygon.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     loi: Geometry;
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     jobId: number;
+    /**
+     * The name of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     name: string;
+    /**
+     * Indicates whether the job is assigned to a user, group or unassigned.  **Possible Values:** unassigned | user | group
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     assignedType: string;
+    /**
+     * The unique id of the job that will be designated as the parent job of the new job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     parentJobId: number;
+    /**
+     * The name of the geodatabase version that will be the parent version of the new job's version. By default it'll be the parent version of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     parentVersion: string;
+    /**
+     * The percentage of work completed on the job's current step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     percent: number;
+    /**
+     * The numeric value to denote priority of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     priority: number;
+    /**
+     * The date on which the job is scheduled to begin.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     startDate: Date;
+    /**
+     * The unique id of the job's new status.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     status: number;
+    /**
+     * The name of the geodatabase version to be used for the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     versionName: string;
+    /**
+     * The user name of the user who is requesting the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobUpdateParameters)
+     */
     user: string;
   }
 
-  export interface JobVersionInfo {
+  /**
+   * JobVersionInfo represents a collection of properties for a job's version.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobVersionInfo)
+   */
+  export interface JobVersionInfo extends Object {
+    /**
+     * The unique id of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobVersionInfo)
+     */
     dataWorkspaceId: string;
+    /**
+     * The name of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobVersionInfo)
+     */
     name: string;
+    /**
+     * The parent version of the geodatabase.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobVersionInfo)
+     */
     parent: string;
+    /**
+     * Indicates whether the version has been created or not.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobVersionInfo)
+     */
     created: boolean;
+    /**
+     * The name of the version owner.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#JobVersionInfo)
+     */
     owner: string;
   }
 
-  export interface QueryFieldInfo {
+  /**
+   * QueryFieldInfo represents a collection of field properties that are returned as part of a query.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryFieldInfo)
+   */
+  export interface QueryFieldInfo extends Object {
+    /**
+     * The alias name of the field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryFieldInfo)
+     */
     alias: string;
+    /**
+     * The field length.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryFieldInfo)
+     */
     length: string;
+    /**
+     * The name of the data workspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryFieldInfo)
+     */
     name: string;
+    /**
+     * The type of data expected in the field.  **Possible Values:** small-integer | integer | single | double | string | date | oid | geometry | blob | raster | guid | global-id | xml
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryFieldInfo)
+     */
     type: string;
   }
 
-  export interface QueryResult {
+  /**
+   * QueryResult contains the result of a query after it has been executed.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryResult)
+   */
+  export interface QueryResult extends Object {
+    /**
+     * An array of fields and field properties in the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryResult)
+     */
     fields: QueryFieldInfo[];
+    /**
+     * The rows of results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-JobTask.html#QueryResult)
+     */
     rows: string[];
   }
 
   interface NotificationTask extends Task {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#url)
+     */
     url: string;
 
+    /**
+     * Creates a new spatial notification change rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#addChangeRule)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.rule The [change rule](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule) to be added.
+     * @param params.user The username requesting the addition of the rule.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     addChangeRule(params: NotificationTaskAddChangeRuleParams, requestOptions?: any): IPromise<ChangeRule>;
+    /**
+     * Deletes a spatial notification change rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#deleteChangeRule)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.ruleId The unique id of the rule to be deleted.
+     * @param params.user The username requesting the deletion of the rule.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     deleteChangeRule(params: NotificationTaskDeleteChangeRuleParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Get an array of all the spatial notification [change rules](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule) configured in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#getAllChangeRules)
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getAllChangeRules(requestOptions?: any): IPromise<ChangeRule>;
+    /**
+     * Get a single spatial notification [change rule](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule) by ruleId.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#getChangeRule)
+     * 
+     * @param ruleId The unique id of the [change rule](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule).
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getChangeRule(ruleId: string, requestOptions?: any): IPromise<ChangeRule>;
+    /**
+     * Get information about a [match](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch) for a change and change rule related to a spatial notification.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#getChangeRuleMatch)
+     * 
+     * @param matchId The unique id of the spatial notification match.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getChangeRuleMatch(matchId: string, requestOptions?: any): IPromise<ChangeRule>;
+    /**
+     * Get the current time of the database.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#getDatabaseTime)
+     * 
+     * @param dataWorkspaceId The unique id of the dataWorkspace.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getDatabaseTime(dataWorkspaceId: string, requestOptions?: any): IPromise<Date>;
+    /**
+     * Get an array of [matches](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch) that match the change rule criteria in a specific editing session.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#getSessionMatches)
+     * 
+     * @param sessionId The unique id of the spatial notification session.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getSessionMatches(sessionId: string, requestOptions?: any): IPromise<ChangeRuleMatch>;
+    /**
+     * Sends the notifications configured for the matches found during a rule evaluation session.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#notifySession)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.sessionid The unique id of the spatial notification session.
+     * @param params.deleteAfter Indicates whether to delete the session matches after sending any notifications. The default is false.
+     * @param params.user The username requesting the sending of notification.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     notifySession(params: NotificationTaskNotifySessionParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Queries the array of spatial notification [change rules](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule) based on specified criteria.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#queryChangeRules)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.name A search string to find within change rule names.
+     * @param params.description A search string to find within change rule descriptions.
+     * @param params.searchType The type of search to perform, default is contains.  **Possible Values:** contains | exact | starts-with | ends-with
+     * @param params.user The username requesting the search.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     queryChangeRules(params: NotificationTaskQueryChangeRulesParams, requestOptions?: any): IPromise<ChangeRule>;
+    /**
+     * Executes the configured spatial notification change rules on a data workspace by evaluating the geodatabase archive.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#runSpatialNotificationOnHistory)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.dataWorkspaceId The unique id of the dataWorkspace.
+     * @param params.from The starting time to query for new changes.
+     * @param params.to The ending time to query for new changes.
+     * @param params.logMatches Indicates whether to keep the matches found, stored in the ArcGIS Workflow Manager repository. The default is false.
+     * @param params.send Indicates whether to the send notifications at the time matches are found. The default is false.
+     * @param params.user The username requesting the execution of the rule.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     runSpatialNotificationOnHistory(params: NotificationTaskRunSpatialNotificationOnHistoryParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Sends an email of the specified [notification type](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#sendNotification)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.notificationType The name of the [notification type](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType) to be sent.
+     * @param params.user The username requesting to send the notification.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     sendNotification(params: NotificationTaskSendNotificationParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Adds an email address to the subscriber list for a specific notification type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#subscribeToNotification)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.notificationTypeId The unique id of the notification type to which the email address will be added.
+     * @param params.email The email address to add to the notification type's subscriber list. May contain tokens.
+     * @param params.user The username requesting the addition of email address to the notification subscriber's list.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     subscribeToNotification(params: NotificationTaskSubscribeToNotificationParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Removes an email address from the subscriber list for a specific notification type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#unsubscribeFromNotification)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.notificationTypeId The unique id of the notification type from which the email address will be removed.
+     * @param params.email The email address to remove from the notification type's subscriber list. May contain tokens.
+     * @param params.user The username requesting the removal of email address to the notification subscriber's list.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     unsubscribeFromNotification(params: NotificationTaskUnsubscribeFromNotificationParams, requestOptions?: any): IPromise<boolean>;
   }
 
   interface NotificationTaskConstructor {
+    /**
+     * Exposes functions to perform operations with Workflow Manager notifications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html)
+     */
+
     new(properties?: NotificationTaskProperties): NotificationTask;
   }
 
   export const NotificationTask: NotificationTaskConstructor;
 
   interface NotificationTaskProperties extends TaskProperties {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#url)
+     */
     url?: string;
   }
 
-  export interface AOIEvaluator {
+  /**
+   * AOIEvaluator represents the rules that triggers a spatial notification based on area of interest(AOI). This contains the geometric operation and the criteria to be used based on the AOI.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator)
+   */
+  export interface AOIEvaluator extends Object {
+    /**
+     * The area of interest.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator)
+     */
     aoi: Polygon;
+    /**
+     * Indicates whether to inverse the spatial relationship or not. For example, if the spatial relationship is inversed for operator Within, then features that are not within will be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator)
+     */
     inverse: boolean;
+    /**
+     * The name of the AOI evaluator.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator)
+     */
     name: string;
+    /**
+     * The spatial relationship to be applied for evaluation of the rule.  **Possible Values:** intersects | contains | crosses | envelope-intersects | index-intersects | overlaps | touches | within | relation
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator)
+     */
     relation: string;
+    /**
+     * The type of the AOI evaluator.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator)
+     */
     type: string;
+    /**
+     * Indicates whether job AOI should be used as the extent or not for the evaluation of the rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator)
+     */
     useJobAOI: boolean;
   }
 
-  export interface ChangeRule {
+  /**
+   * ChangeRule represents a single change rule that triggers a spatial notification. When the criteria defined in the rule is met an email notification is sent to recipients.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule)
+   */
+  export interface ChangeRule extends Object {
+    /**
+     * The description of the change rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule)
+     */
     description: string;
+    /**
+     * An array of [AOI](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#AOIEvaluator) and [Dataset](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DataSetEvaluator) evaluators.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule)
+     */
     evaluators: any[];
+    /**
+     * The unique id of the change rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule)
+     */
     id: number;
+    /**
+     * The name of the change rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule)
+     */
     name: string;
+    /**
+     * The type of notifier, the default is [email notifier](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier). This can be extended to use your own notifiers like SMS, instant messaging.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule)
+     */
     notifier: any;
+    /**
+     * Indicates whether to summarize email contents or not.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule)
+     */
     summarize: boolean;
   }
 
-  export interface ChangeRuleMatch {
+  /**
+   * ChangeRuleMatch represents information about the change and change rule related to a spatial notification match.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+   */
+  export interface ChangeRuleMatch extends Object {
+    /**
+     * The time the change occured to the data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+     */
     changeTime: Date;
+    /**
+     * The type of change that happened to the data.  **Possible Values:** add | modify | delete | all
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+     */
     changeType: string;
+    /**
+     * The dataset that changed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+     */
     dataset: string;
+    /**
+     * The unique id of the data workspace containing the changed data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+     */
     dataWorkspaceId: string;
+    /**
+     * The unique id of the associated to the change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+     */
     id: string;
+    /**
+     * The unique id of the job where the change was made.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+     */
     jobID: string;
+    /**
+     * The unique id of the change rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRuleMatch)
+     */
     ruleID: string;
   }
 
-  export interface DatasetConfiguration {
+  /**
+   * DatasetConfiguration represents the criteria and dataset that the change rule applies to.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration)
+   */
+  export interface DatasetConfiguration extends Object {
+    /**
+     * This indicates whether the notification will be sent always or if values change to defined in whereConditions or if values change from defined in whereConditions.  **Possible Values:** always | changed-to | changed-from
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration)
+     */
     changeCondition: number;
+    /**
+     * The name of the fields, changes to which trigger the notification.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration)
+     */
     changeFields: string;
+    /**
+     * The name of the dataset that will trigger the notification.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration)
+     */
     dataset: string;
+    /**
+     * The unique id of the data workspace containing the changed data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration)
+     */
     dataWorkspaceId: string;
+    /**
+     * The name of the dataset configuration rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration)
+     */
     name: string;
+    /**
+     * The [where conditions](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#WhereCondition) defining the criteria to trigger the rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration)
+     */
     whereConditions: WhereCondition[];
   }
 
-  export interface DataSetEvaluator {
+  /**
+   * DataSetEvaluator represents the rules that triggers a spatial notification based on the changes in a dataset. This contains the specific features and feature class that are participating in a spatial notification rule.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DataSetEvaluator)
+   */
+  export interface DataSetEvaluator extends Object {
+    /**
+     * The array of [DatasetConfigurations](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration) representing the dataset to which the rule applies.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DataSetEvaluator)
+     */
     dataSetConfigurations: DatasetConfiguration[];
+    /**
+     * The name of the dataset evaluator.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DataSetEvaluator)
+     */
     name: string;
+    /**
+     * The type of the dataset evaluator.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DataSetEvaluator)
+     */
     type: string;
   }
 
-  export interface EmailNotifier {
+  /**
+   * EmailNotifier represents the properties of a notification type that is configured in the Workflow Manager system.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+   */
+  export interface EmailNotifier extends Object {
+    /**
+     * Indicates whether the job's file attachment will be attached to the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     attachJobAttachments: boolean;
+    /**
+     * The message content sent as part of the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     message: string;
+    /**
+     * The name of the notifier.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     name: string;
+    /**
+     * The sender's (from) email address.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     senderEmail: string;
+    /**
+     * The sender's (from) name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     senderName: string;
+    /**
+     * The subject of the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     subject: string;
+    /**
+     * The array of subscribers who will get the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     subscribers: string[];
+    /**
+     * The type of notifier.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#EmailNotifier)
+     */
     type: string;
   }
 
-  export interface NotificationTaskAddChangeRuleParams {
+
+  export interface NotificationTaskAddChangeRuleParams extends Object {
+    /**
+     * The [change rule](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#ChangeRule) to be added.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#addChangeRule)
+     */
     rule: ChangeRule;
+    /**
+     * The username requesting the addition of the rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#addChangeRule)
+     */
     user: string;
   }
 
-  export interface NotificationTaskDeleteChangeRuleParams {
+
+  export interface NotificationTaskDeleteChangeRuleParams extends Object {
+    /**
+     * The unique id of the rule to be deleted.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#deleteChangeRule)
+     */
     ruleId: string;
+    /**
+     * The username requesting the deletion of the rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#deleteChangeRule)
+     */
     user: string;
   }
 
-  export interface NotificationTaskNotifySessionParams {
+
+  export interface NotificationTaskNotifySessionParams extends Object {
+    /**
+     * The unique id of the spatial notification session.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#notifySession)
+     */
     sessionid: string;
+    /**
+     * Indicates whether to delete the session matches after sending any notifications. The default is false.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#notifySession)
+     */
     deleteAfter: boolean;
+    /**
+     * The username requesting the sending of notification.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#notifySession)
+     */
     user: string;
   }
 
-  export interface NotificationTaskQueryChangeRulesParams {
+
+  export interface NotificationTaskQueryChangeRulesParams extends Object {
+    /**
+     * A search string to find within change rule names.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#queryChangeRules)
+     */
     name: string;
+    /**
+     * A search string to find within change rule descriptions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#queryChangeRules)
+     */
     description: string;
+    /**
+     * The type of search to perform, default is contains.  **Possible Values:** contains | exact | starts-with | ends-with
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#queryChangeRules)
+     */
     searchType: string;
+    /**
+     * The username requesting the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#queryChangeRules)
+     */
     user: string;
   }
 
-  export interface NotificationTaskRunSpatialNotificationOnHistoryParams {
+
+  export interface NotificationTaskRunSpatialNotificationOnHistoryParams extends Object {
+    /**
+     * The unique id of the dataWorkspace.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#runSpatialNotificationOnHistory)
+     */
     dataWorkspaceId: string;
+    /**
+     * The starting time to query for new changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#runSpatialNotificationOnHistory)
+     */
     from: Date;
+    /**
+     * The ending time to query for new changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#runSpatialNotificationOnHistory)
+     */
     to: Date;
+    /**
+     * Indicates whether to keep the matches found, stored in the ArcGIS Workflow Manager repository. The default is false.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#runSpatialNotificationOnHistory)
+     */
     logMatches: boolean;
+    /**
+     * Indicates whether to the send notifications at the time matches are found. The default is false.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#runSpatialNotificationOnHistory)
+     */
     send: boolean;
+    /**
+     * The username requesting the execution of the rule.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#runSpatialNotificationOnHistory)
+     */
     user: string;
   }
 
-  export interface NotificationTaskSendNotificationParams {
+
+  export interface NotificationTaskSendNotificationParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#sendNotification)
+     */
     jobId: number;
+    /**
+     * The name of the [notification type](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType) to be sent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#sendNotification)
+     */
     notificationType: string;
+    /**
+     * The username requesting to send the notification.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#sendNotification)
+     */
     user: string;
   }
 
-  export interface NotificationTaskSubscribeToNotificationParams {
+
+  export interface NotificationTaskSubscribeToNotificationParams extends Object {
+    /**
+     * The unique id of the notification type to which the email address will be added.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#subscribeToNotification)
+     */
     notificationTypeId: number;
+    /**
+     * The email address to add to the notification type's subscriber list. May contain tokens.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#subscribeToNotification)
+     */
     email: string;
+    /**
+     * The username requesting the addition of email address to the notification subscriber's list.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#subscribeToNotification)
+     */
     user: string;
   }
 
-  export interface NotificationTaskUnsubscribeFromNotificationParams {
+
+  export interface NotificationTaskUnsubscribeFromNotificationParams extends Object {
+    /**
+     * The unique id of the notification type from which the email address will be removed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#unsubscribeFromNotification)
+     */
     notificationTypeId: number;
+    /**
+     * The email address to remove from the notification type's subscriber list. May contain tokens.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#unsubscribeFromNotification)
+     */
     email: string;
+    /**
+     * The username requesting the removal of email address to the notification subscriber's list.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#unsubscribeFromNotification)
+     */
     user: string;
   }
 
-  export interface NotificationType {
+  /**
+   * NotificationType represents the properties of a notification type that are sent when certain events happen in the Workflow Manager system.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+   */
+  export interface NotificationType extends Object {
+    /**
+     * Indicates whether the job's file attachment will be attached to the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     attachJobAttachments: boolean;
+    /**
+     * The unique id of the notification type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     id: number;
+    /**
+     * The message content sent as part of the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     message: string;
+    /**
+     * The sender's (from) email address.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     senderEmail: string;
+    /**
+     * The sender's (from) name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     senderName: string;
+    /**
+     * The subject of the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     subject: string;
+    /**
+     * The array of subscribers who will get the email.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     subscribers: string[];
+    /**
+     * The type of notifier.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#NotificationType)
+     */
     type: string;
   }
 
-  export interface WhereCondition {
+  /**
+   * WhereCondition returns the condition set in [DatasetConfiguration](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DatasetConfiguration) for a [Dataset](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#DataSetEvaluator) evaluator.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#WhereCondition)
+   */
+  export interface WhereCondition extends Object {
+    /**
+     * The value to be compared/evaluated with.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#WhereCondition)
+     */
     compareValue: any;
+    /**
+     * The field name that contains the value to be compared.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#WhereCondition)
+     */
     field: string;
+    /**
+     * The operator to be used for comparison.  **Possible Values:** equal | not-equal | greater-than | greater-or-equal | less-than | less-or-equal | contains
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-NotificationTask.html#WhereCondition)
+     */
     operator: string;
   }
 
   interface ReportTask extends Task {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#url)
+     */
     url: string;
 
+    /**
+     * Generates a report and returns the output as formatted HTML.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#generateReport)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.reportId The id of the report.
+     * @param params.user The user name requesting the report.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     generateReport(params: ReportTaskGenerateReportParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Gets all the [reports](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#Report) that are configured in the Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getAllReports)
+     * 
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getAllReports(requestOptions?: any): IPromise<Report>;
+    /**
+     * Returns the URL string for the report content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getReportContentUrl)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.reportId The id of the report.
+     * @param params.user The username of the user requesting the report content.
+     * 
+     */
     getReportContentUrl(params: ReportTaskGetReportContentUrlParams): string;
+    /**
+     * Executes a report and returns the raw [report data](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportData).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getReportData)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.reportId The id of the report.
+     * @param params.user The username of the user requesting the report data.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getReportData(params: ReportTaskGetReportDataParams, requestOptions?: any): IPromise<ReportData>;
+    /**
+     * Gets the XSLT stylesheet for the specified report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getReportStylesheet)
+     * 
+     * @param reportId The id of the report.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getReportStylesheet(reportId: number, requestOptions?: any): IPromise<string>;
   }
 
   interface ReportTaskConstructor {
+    /**
+     * Helps you generate reports about the work being managed in your Workflow Manager system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html)
+     */
+
     new(properties?: ReportTaskProperties): ReportTask;
   }
 
   export const ReportTask: ReportTaskConstructor;
 
   interface ReportTaskProperties extends TaskProperties {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#url)
+     */
     url?: string;
   }
 
-  export interface Report {
+  /**
+   * Report represents a configured report in the Workflow Manager system.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#Report)
+   */
+  export interface Report extends Object {
+    /**
+     * A description of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#Report)
+     */
     description: string;
+    /**
+     * The category to which the report belongs in the system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#Report)
+     */
     hierarchy: string;
+    /**
+     * A unique id for the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#Report)
+     */
     id: number;
+    /**
+     * The name of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#Report)
+     */
     name: string;
+    /**
+     * The title of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#Report)
+     */
     title: string;
   }
 
-  export interface ReportData {
+  /**
+   * ReportData is the generated result of a report after it has been executed.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportData)
+   */
+  export interface ReportData extends Object {
+    /**
+     * The name of columns returned as part of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportData)
+     */
     columns: string[];
+    /**
+     * A description of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportData)
+     */
     description: string;
+    /**
+     * The [aggregation of the report data](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportDataGroup) into subcategories.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportData)
+     */
     groups: ReportDataGroup[];
+    /**
+     * The title of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportData)
+     */
     title: string;
   }
 
-  export interface ReportDataGroup {
+  /**
+   * ReportDataGroup aggregates the report results into user defined categories.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportDataGroup)
+   */
+  export interface ReportDataGroup extends Object {
+    /**
+     * The label of the aggregate category as defined in the report, eg. Total Jobs.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportDataGroup)
+     */
     aggregateLabel: string;
+    /**
+     * The value of the aggregate category based on the calculation defined in the report section options.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportDataGroup)
+     */
     aggregateValue: string;
+    /**
+     * The rows containing the data returned in the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportDataGroup)
+     */
     row: string[];
+    /**
+     * The data value based on which the section is created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#ReportDataGroup)
+     */
     value: string;
   }
 
-  export interface ReportTaskGenerateReportParams {
+
+  export interface ReportTaskGenerateReportParams extends Object {
+    /**
+     * The id of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#generateReport)
+     */
     reportId: number;
+    /**
+     * The user name requesting the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#generateReport)
+     */
     user: string;
   }
 
-  export interface ReportTaskGetReportContentUrlParams {
+
+  export interface ReportTaskGetReportContentUrlParams extends Object {
+    /**
+     * The id of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getReportContentUrl)
+     */
     reportId: number;
+    /**
+     * The username of the user requesting the report content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getReportContentUrl)
+     */
     user: number;
   }
 
-  export interface ReportTaskGetReportDataParams {
+
+  export interface ReportTaskGetReportDataParams extends Object {
+    /**
+     * The id of the report.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getReportData)
+     */
     reportId: number;
+    /**
+     * The username of the user requesting the report data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-ReportTask.html#getReportData)
+     */
     user: string;
   }
 
   interface TokenTask extends Task {
+    /**
+     * Parses a string with embedded tokens using user and job information. The string is returned with embedded tokens replaced by their actual values.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-TokenTask.html#parseTokens)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId A unique id for the job.
+     * @param params.stringToParse The string representing the tokens to be parsed.
+     * @param params.user The username of the user requesting token parsing.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     parseTokens(params: TokenTaskParseTokensParams, requestOptions?: any): IPromise<string>;
   }
 
   interface TokenTaskConstructor {
+    /**
+     * Helps you parse Workflow Manager tokens to the actual value of tokens in the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-TokenTask.html)
+     */
+
     new(properties?: TokenTaskProperties): TokenTask;
   }
 
@@ -7989,217 +34230,1033 @@ declare namespace __esri {
 
   }
 
-  export interface TokenTaskParseTokensParams {
+
+  export interface TokenTaskParseTokensParams extends Object {
+    /**
+     * A unique id for the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-TokenTask.html#parseTokens)
+     */
     jobId: any;
+    /**
+     * The string representing the tokens to be parsed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-TokenTask.html#parseTokens)
+     */
     stringToParse: string;
+    /**
+     * The username of the user requesting token parsing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-TokenTask.html#parseTokens)
+     */
     user: string;
   }
 
   interface WorkflowTask extends Task {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#url)
+     */
     url: string;
 
+    /**
+     * Get the information which indicates whether this workflow step can be run.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#canRunStep)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepId The unique id of the step.
+     * @param params.user The user name of the user wanting to run the step.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     canRunStep(params: WorkflowTaskCanRunStepParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Executes the specified steps in order and gets back [execution information](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo) of the steps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#executeSteps)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepIds The array of unique step Ids.
+     * @param params.auto Indicates whether to automatically execute as many steps as possible, based on the workflow configuration. The default is false, to execute only the current step.
+     * @param params.user The user name of the user executing the step.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     executeSteps(params: WorkflowTaskExecuteStepsParams, requestOptions?: any): IPromise<ExecuteInfo>;
+    /**
+     * Gets all workflow [steps](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step) of a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getAllSteps)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getAllSteps(jobId: number, requestOptions?: any): IPromise<Step>;
+    /**
+     * Gets all current [steps](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step) of a job. A workflow will have more than one current step if it is configured to support parallel steps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getCurrentSteps)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getCurrentSteps(jobId: number, requestOptions?: any): IPromise<Step>;
+    /**
+     * Gets a specific workflow [step](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step) of a job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStep)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepId The unique id of the step.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getStep(params: WorkflowTaskGetStepParams, requestOptions?: any): IPromise<Step>;
+    /**
+     * Get the help associated with a workflow step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStepDescription)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepId The unique id of the step.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getStepDescription(params: WorkflowTaskGetStepDescriptionParams, requestOptions?: any): IPromise<string>;
+    /**
+     * Gets a URL to access the file content of a file step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStepFileUrl)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepId The unique id of the step.
+     * 
+     */
     getStepFileUrl(params: WorkflowTaskGetStepFileUrlParams): string;
+    /**
+     * Get a job's [workflow display details](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowDisplayDetails).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getWorkflowDisplayDetails)
+     * 
+     * @param jobId The unique id of the job.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     getWorkflowDisplayDetails(jobId: number, requestOptions?: any): IPromise<WorkflowDisplayDetails>;
+    /**
+     * Gets a URL of an image depicting the current state of a job's workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getWorkflowImageUrl)
+     * 
+     * @param jobId The unique id of the job.
+     * 
+     */
     getWorkflowImageUrl(jobId: number): string;
+    /**
+     * Marks the specified steps of a job workflow as completed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#markStepsAsDone)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepIds The array of unique step Ids.
+     * @param params.user The user name of the user marking the step complete.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     markStepsAsDone(params: WorkflowTaskMarkStepsAsDoneParams, requestOptions?: any): IPromise<ExecuteInfo>;
+    /**
+     * Advances the workflow to the next step based on a return code value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#moveToNextStep)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job Id.
+     * @param params.stepId The unique id of the step.
+     * @param params.returnCode A numeric value representing the return code.
+     * @param params.user The user name of the user advancing the workflow to the next step.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     moveToNextStep(params: WorkflowTaskMoveToNextStepParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * The job workflow is updated with the latest workflow of job type, after the job has been created.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#recreateWorkflow)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.user The user name of the user recreating the workflow.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     recreateWorkflow(params: WorkflowTaskRecreateWorkflowParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Resolves workflow path conflicts resulting from executing or marking as complete a step, which can have two or more next steps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#resolveConflict)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepId The unique id of the step.
+     * @param params.optionReturnCode A numeric value representing the return code from the step where the conflict was encountered.
+     * @param params.optionStepIds An array of unique step IDs of all the possible next steps.
+     * @param params.user The user name of the user resolving the conflict.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     resolveConflict(params: WorkflowTaskResolveConflictParams, requestOptions?: any): IPromise<boolean>;
+    /**
+     * Sets a step as the current active step of a job workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#setCurrentStep)
+     * 
+     * @param params See the object specifications in table below for the structure of the `params` object.
+     * @param params.jobId The unique id of the job.
+     * @param params.stepId The unique id of the step.
+     * @param params.user The user name of the user setting the current step.
+     * @param requestOptions Additional [options](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#esriRequest) to be used for the data request (will override requestOptions defined during construction).
+     * 
+     */
     setCurrentStep(params: WorkflowTaskSetCurrentStepParams, requestOptions?: any): IPromise<boolean>;
   }
 
   interface WorkflowTaskConstructor {
+    /**
+     * Class to perform operations on Workflow Manager workflows and steps. The workflows are collections of steps that are executed while working on a job. Workflows are designed to organize and simplify tasks to ensure that no step is missed. The steps are the building blocks of your workflows and are connected using paths. Step and path properties determine the flow of the work.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html)
+     */
+
     new(properties?: WorkflowTaskProperties): WorkflowTask;
   }
 
   export const WorkflowTask: WorkflowTaskConstructor;
 
   interface WorkflowTaskProperties extends TaskProperties {
+    /**
+     * URL to the ArcGIS Workflow Manager REST service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#url)
+     */
     url?: string;
   }
 
-  export interface ExecuteInfo {
+  /**
+   * ExecuteInfo provides information on whether a step can be executed.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+   */
+  export interface ExecuteInfo extends Object {
+    /**
+     * Information about [conflicts](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowConflicts) in workflow step progression.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     conflicts: WorkflowConflicts;
+    /**
+     * The error code returned by the steps in the workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     errorCode: number;
+    /**
+     * The description for the errors returned by the steps in the workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     errorDescription: string;
+    /**
+     * The result of a step execution.  **Possible Values:** executed | dependent-on-step | dependent-on-stage | dependent-on-status | job-on-hold | step-depends-on-step | check | step-assigned-to-other-user | step-assigned-to-other-group | job-assigned-to-others | job-closed | invalid-platform | invalid-step | dependent-on-job | not-current-step
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     executionResult: string;
+    /**
+     * Indicates whether a step has conflicts.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     hasConflicts: boolean;
+    /**
+     * Indicates whether a step has return code.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     hasReturnCode: boolean;
+    /**
+     * The unique id of current job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     jobID: number;
+    /**
+     * The return code for the current workflow step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     returnCode: number;
+    /**
+     * The unique id of the current step in the workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     stepID: number;
+    /**
+     * Indicates whether the step threw an error during execution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#ExecuteInfo)
+     */
     threwError: boolean;
   }
 
-  export interface Step {
+  /**
+   * Step retpresents the properties of a step that is used in a job's workflow.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+   */
+  export interface Step extends Object {
+    /**
+     * Indicates whether the step has already been executed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     hasBeenExecuted: boolean;
+    /**
+     * The user or group to whom the step is assigned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     assignedTo: string;
+    /**
+     * Indicates whether the step can be run asynchronously.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     async: boolean;
+    /**
+     * Indicates whether the step can be automatically executed when reached.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     autoRun: boolean;
+    /**
+     * Indicates whether the step can be skipped without executing it.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     canSkip: boolean;
+    /**
+     * Indicates whether the step can start parallel execution of other steps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     canSpawnConcurrency: boolean;
+    /**
+     * The unique id of step type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     commonId: number;
+    /**
+     * The default percentage completion of the job once step is reached.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     defaultPercentComplete: number;
+    /**
+     * Indicates whether the job is assigned to a user, group or unassigned.  **Possible Values:** none | unassigned | user | group
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     assignedType: string;
+    /**
+     * Indicates whether the step has been started.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     hasBeenStarted: boolean;
+    /**
+     * The unique id generated as the step Id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     id: number;
+    /**
+     * The name of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     name: string;
+    /**
+     * Indicates whether the step will be automatically marked as complete when complete.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     selfCheck: boolean;
+    /**
+     * The unique numeric status value configured as the status of the job once step is reached.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     statusId: number;
+    /**
+     * The percentage completion of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     stepPercentComplete: number;
+    /**
+     * The type of notification that will be sent when the step finishes execution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     notificationType: string;
+    /**
+     * The [step template](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType) for current step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#Step)
+     */
     stepType: StepType;
   }
 
-  export interface StepType {
+  /**
+   * StepType represents properties of step templates that are available in the Workflow Manager system for authoring workflows.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+   */
+  export interface StepType extends Object {
+    /**
+     * The program/application/code that will be executed on this step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     program: string;
+    /**
+     * The step arguments required at runtime.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     arguments: string;
+    /**
+     * The type of execution for the step.  **Possible Values:** executable | function | procedural | launch-url | question | open-file
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     executionType: string;
+    /**
+     * The unique id for the step type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     id: number;
+    /**
+     * The name of the step type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     name: string;
+    /**
+     * The description of the step type.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     description: string;
+    /**
+     * The path/URL of the step description.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     stepDescriptionLink: string;
+    /**
+     * The type of step description.  **Possible Values:** none | embedded-html | link
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     stepDescriptionType: string;
+    /**
+     * The shape of the step as it will appear in a workflow graphic.  **Possible Values:** rounded-rectangle | rectangle | oval | diamond | parallelogram
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     stepIndicatorType: string;
+    /**
+     * The platform on which the step can be executed.  **Possible Values:** desktop | server | both
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     supportedPlatform: string;
+    /**
+     * Indicates whether Workflow Manager will be minimized and hidden during step execution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#StepType)
+     */
     visible: boolean;
   }
 
-  export interface WorkflowAnnotationDisplayDetails {
+  /**
+   * WorkflowAnnotationDisplayDetails represents properties of a workflow annotation.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+   */
+  export interface WorkflowAnnotationDisplayDetails extends Object {
+    /**
+     * The X coordinate of the annotation object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     centerX: number;
+    /**
+     * The Y coordinate of the annotation object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     centerY: number;
+    /**
+     * The fill color of the annotation object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     fillColor: Color;
+    /**
+     * The height of the annotation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     height: number;
+    /**
+     * The annotation text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     label: string;
+    /**
+     * The color of annotation label text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     labelColor: Color;
+    /**
+     * The outline color.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     OutlineColor: Color;
+    /**
+     * The width of the annotation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails)
+     */
     width: number;
   }
 
-  export interface WorkflowConflicts {
+  /**
+   * WorkflowConflicts represents properties for workflows that have a conflicting path or multiple possible paths for progression.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowConflicts)
+   */
+  export interface WorkflowConflicts extends Object {
+    /**
+     * The unique id of currently active job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowConflicts)
+     */
     jobID: number;
+    /**
+     * The information about the step in the workflow returned as [WorkflowOption](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowOption).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowConflicts)
+     */
     options: WorkflowOption[];
+    /**
+     * Indicates whether the step will begin a concurrent path in the workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowConflicts)
+     */
     spawnsConcurrency: boolean;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowConflicts)
+     */
     stepId: number;
   }
 
-  export interface WorkflowDisplayDetails {
+  /**
+   * WorkflowDisplayDetails represents a collection of properties that constitute a workflow - annotations, steps, and paths.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowDisplayDetails)
+   */
+  export interface WorkflowDisplayDetails extends Object {
+    /**
+     * The properties of how the [annotations are displayed](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowAnnotationDisplayDetails).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowDisplayDetails)
+     */
     annotations: WorkflowAnnotationDisplayDetails[];
+    /**
+     * The properties of how the [path are displayed](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowDisplayDetails)
+     */
     paths: WorkflowPathDisplayDetails[];
+    /**
+     * The properties of how the [step are displayed](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowDisplayDetails)
+     */
     steps: WorkflowStepDisplayDetails[];
   }
 
-  export interface WorkflowOption {
+  /**
+   * WorkflowOption represents properties of a workflow that have return codes and step branches.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowOption)
+   */
+  export interface WorkflowOption extends Object {
+    /**
+     * The return code generated from a step execution.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowOption)
+     */
     returnCode: number;
+    /**
+     * The collection of [descriptions for workflow steps](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepInfo).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowOption)
+     */
     steps: WorkflowStepInfo[];
   }
 
-  export interface WorkflowPathDisplayDetails {
+  /**
+   * WorkflowPathDisplayDetails represents properties of a workflow's path properties like location, destination steps, postion on the workflow canvas.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+   */
+  export interface WorkflowPathDisplayDetails extends Object {
+    /**
+     * The unique id of the step to which the path will lead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     destStepId: number;
+    /**
+     * The unique id of the step just executed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     sourceStepID: number;
+    /**
+     * The label associated with the path.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     label: string;
+    /**
+     * The color of the label on the path.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     labelColor: Color;
+    /**
+     * The X coordinate of the label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     labelX: number;
+    /**
+     * The Y coordinate of the label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     labelY: number;
+    /**
+     * The color of the line representing the path.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     lineColor: Color;
+    /**
+     * An object with following properties. 
+     * 
+     * Name | Type | Description
+     * ---------|--------|-------------
+     * isDefault | Boolean | Indicates whehter this is the default path(only path) from the source step.
+     * numReturnValues | Number[] | The number of possible return values for the path.
+     * returnValueX | Number[] | The return values associated with the path.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowPathDisplayDetails)
+     */
     pathObject: any;
   }
 
-  export interface WorkflowStepDisplayDetails {
+  /**
+   * WorkflowStepDisplayDetails represents properties of a workflow step.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+   */
+  export interface WorkflowStepDisplayDetails extends Object {
+    /**
+     * The color of step label text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     labelColor: Color;
+    /**
+     * The X coordinate of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     centerX: number;
+    /**
+     * The fill color of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     fillColor: Color;
+    /**
+     * The height of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     height: number;
+    /**
+     * The step text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     label: string;
+    /**
+     * The Y coordinate of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     centerY: number;
+    /**
+     * The outline color.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     OutlineColor: Color;
+    /**
+     * The shape of the step.  **Possible Values:** rounded-rectangle | rectangle | oval | diamond | parallelogram
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     shape: string;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     stepId: number;
+    /**
+     * The step execution type.  **Possible Values:** executable | function | procedural | launch-url | question | open-file
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     stepType: string;
+    /**
+     * The width of the annotation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepDisplayDetails)
+     */
     width: number;
   }
 
-  export interface WorkflowStepInfo {
+  /**
+   * WorkflowStepInfo represents collection of descriptions for workflow's steps.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepInfo)
+   */
+  export interface WorkflowStepInfo extends Object {
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepInfo)
+     */
     id: number;
+    /**
+     * The name of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#WorkflowStepInfo)
+     */
     name: string;
   }
 
-  export interface WorkflowTaskCanRunStepParams {
+
+  export interface WorkflowTaskCanRunStepParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#canRunStep)
+     */
     jobId: number;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#canRunStep)
+     */
     stepId: number;
+    /**
+     * The user name of the user wanting to run the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#canRunStep)
+     */
     user: string;
   }
 
-  export interface WorkflowTaskExecuteStepsParams {
+
+  export interface WorkflowTaskExecuteStepsParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#executeSteps)
+     */
     jobId: number;
+    /**
+     * The array of unique step Ids.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#executeSteps)
+     */
     stepIds: number[];
+    /**
+     * Indicates whether to automatically execute as many steps as possible, based on the workflow configuration. The default is false, to execute only the current step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#executeSteps)
+     */
     auto: boolean;
+    /**
+     * The user name of the user executing the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#executeSteps)
+     */
     user: string;
   }
 
-  export interface WorkflowTaskGetStepDescriptionParams {
+
+  export interface WorkflowTaskGetStepDescriptionParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStepDescription)
+     */
     jobId: number;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStepDescription)
+     */
     stepId: number;
   }
 
-  export interface WorkflowTaskGetStepFileUrlParams {
+
+  export interface WorkflowTaskGetStepFileUrlParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStepFileUrl)
+     */
     jobId: number;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStepFileUrl)
+     */
     stepId: number;
   }
 
-  export interface WorkflowTaskGetStepParams {
+
+  export interface WorkflowTaskGetStepParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStep)
+     */
     jobId: number;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#getStep)
+     */
     stepId: number;
   }
 
-  export interface WorkflowTaskMarkStepsAsDoneParams {
+
+  export interface WorkflowTaskMarkStepsAsDoneParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#markStepsAsDone)
+     */
     jobId: number;
+    /**
+     * The array of unique step Ids.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#markStepsAsDone)
+     */
     stepIds: number[];
+    /**
+     * The user name of the user marking the step complete.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#markStepsAsDone)
+     */
     user: string;
   }
 
-  export interface WorkflowTaskMoveToNextStepParams {
+
+  export interface WorkflowTaskMoveToNextStepParams extends Object {
+    /**
+     * The unique id of the job Id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#moveToNextStep)
+     */
     jobId: number;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#moveToNextStep)
+     */
     stepId: number;
+    /**
+     * A numeric value representing the return code.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#moveToNextStep)
+     */
     returnCode: number;
+    /**
+     * The user name of the user advancing the workflow to the next step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#moveToNextStep)
+     */
     user: string;
   }
 
-  export interface WorkflowTaskRecreateWorkflowParams {
+
+  export interface WorkflowTaskRecreateWorkflowParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#recreateWorkflow)
+     */
     jobId: number;
+    /**
+     * The user name of the user recreating the workflow.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#recreateWorkflow)
+     */
     user: string;
   }
 
-  export interface WorkflowTaskResolveConflictParams {
+
+  export interface WorkflowTaskResolveConflictParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#resolveConflict)
+     */
     jobId: number;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#resolveConflict)
+     */
     stepId: number;
+    /**
+     * A numeric value representing the return code from the step where the conflict was encountered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#resolveConflict)
+     */
     optionReturnCode: number;
+    /**
+     * An array of unique step IDs of all the possible next steps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#resolveConflict)
+     */
     optionStepIds: number[];
+    /**
+     * The user name of the user resolving the conflict.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#resolveConflict)
+     */
     user: string;
   }
 
-  export interface WorkflowTaskSetCurrentStepParams {
+
+  export interface WorkflowTaskSetCurrentStepParams extends Object {
+    /**
+     * The unique id of the job.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#setCurrentStep)
+     */
     jobId: number;
+    /**
+     * The unique id of the step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#setCurrentStep)
+     */
     stepId: number;
+    /**
+     * The user name of the user setting the current step.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-workflow-WorkflowTask.html#setCurrentStep)
+     */
     user: string;
   }
 
   interface Viewpoint extends Accessor, JSONSupport {
+    /**
+     * The viewpoint camera (3D only). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#camera)
+     */
     camera: Camera;
+    /**
+     * The rotation of due north in relation to the top of the view in degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#rotation)
+     * 
+     * @default 0
+     */
     rotation: number;
+    /**
+     * The scale of the viewpoint.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#scale)
+     */
     scale: number;
+    /**
+     * The target geometry framed by the viewpoint. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#targetGeometry)
+     */
     targetGeometry: Geometry;
 
+    /**
+     * Create a deep clone of the viewpoint.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#clone)
+     * 
+     * 
+     */
     clone(): Viewpoint;
   }
 
   interface ViewpointConstructor {
+
+
     new(properties?: ViewpointProperties): Viewpoint;
 
     fromJSON(json: any): Viewpoint;
@@ -8208,303 +35265,1164 @@ declare namespace __esri {
   export const Viewpoint: ViewpointConstructor;
 
   interface ViewpointProperties {
+    /**
+     * The viewpoint camera (3D only). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#camera)
+     */
     camera?: CameraProperties;
+    /**
+     * The rotation of due north in relation to the top of the view in degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#rotation)
+     * 
+     * @default 0
+     */
     rotation?: number;
+    /**
+     * The scale of the viewpoint.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#scale)
+     */
     scale?: number;
+    /**
+     * The target geometry framed by the viewpoint. 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#targetGeometry)
+     */
     targetGeometry?: GeometryProperties;
   }
 
   interface Draw extends Accessor {
-    activeAction: PointDrawAction | PolygonDrawAction | PolylineDrawAction;
+    /**
+     * A reference to the active draw action. An instance of the draw action is created when [create()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#create) method is called.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#activeAction)
+     */
+    activeAction: PointDrawAction | MultipointDrawAction | PolygonDrawAction | PolylineDrawAction;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). Set this to link the draw to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#view)
+     */
     view: MapView;
 
-    create(drawAction: string): PointDrawAction | PolygonDrawAction | PolylineDrawAction;
+    /**
+     * Creates an instance of the requested draw action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#create)
+     * 
+     * @param drawAction Name of the draw action to create. See the table below for a list of known values and type of draw action it creates.  **Known Values:** point | multipoint | polyline | polygon
+     * 
+     */
+    create(drawAction: string): PointDrawAction | MultipointDrawAction | PolylineDrawAction | PolygonDrawAction;
+    /**
+     * Resets the drawing by clearing the active action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#reset)
+     * 
+     * 
+     */
+    reset(): void;
   }
 
   interface DrawConstructor {
+    /**
+     * The Draw class provides advanced drawing capabilities for developers who need complete control over creating temporary geometries. For example, if you want to prevent users from drawing self-intersecting lines or overlapping polygons, then you can use this class to implement these rules. The draw experience is built upon draw actions, which use the view events to generate a set of coordinates for creating new geometries. Each geometry type has a corresponding draw action class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html)
+     */
+
     new(properties?: DrawProperties): Draw;
   }
 
   export const Draw: DrawConstructor;
 
   interface DrawProperties {
-    activeAction?: PointDrawActionProperties | PolygonDrawActionProperties | PolylineDrawActionProperties;
+    /**
+     * A reference to the active draw action. An instance of the draw action is created when [create()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#create) method is called.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#activeAction)
+     */
+    activeAction?: PointDrawActionProperties | MultipointDrawActionProperties | PolygonDrawActionProperties | PolylineDrawActionProperties;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). Set this to link the draw to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#view)
+     */
     view?: MapViewProperties;
   }
 
-  interface PointDrawAction extends Accessor, Evented {
+  interface MultipointDrawAction extends Accessor, Evented {
+    /**
+     * Two-dimensional array of numbers representing the coordinates of each vertex that comprises the drawn geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#vertices)
+     */
+    readonly vertices: number[][];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#view)
+     */
     view: MapView;
 
+    /**
+     * Indicates if the [redo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#redo) method can be called on the action instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#canRedo)
+     * 
+     * 
+     */
+    canRedo(): boolean;
+    /**
+     * Indicates if the [undo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#undo) method can be called on the action instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#canUndo)
+     * 
+     * 
+     */
+    canUndo(): boolean;
+    /**
+     * Completes drawing the [multipoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Multipoint.html) geometry and fires the [draw-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#event:draw-complete) event. Call this method if the drawing logic needs to be completed other than by double-clicking or pressing the "C" key.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#complete)
+     * 
+     * 
+     */
+    complete(): void;
+    /**
+     * Incrementally redo actions recorded in the stack. Call [canRedo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#canRedo) prior to calling this method to check if this method can be called on the action instance. Calling this method will fire the [vertex-add](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#event:vertex-add) or [vertex-remove](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#event:vertex-remove) event depending on the last action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#redo)
+     * 
+     * 
+     */
+    redo(): void;
+    /**
+     * Incrementally undo actions recorded in the stack. Call [canUndo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#canUndo) prior to calling this method to check if this method can be called on the action instance. Calling this method will fire the [vertex-add](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#event:vertex-add) or [vertex-remove](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#event:vertex-remove) event depending on the last action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#undo)
+     * 
+     * 
+     */
+    undo(): void;
+
+
+    on(name: "cursor-update", eventHandler: MultipointDrawActionCursorUpdateEventHandler): IHandle;
+
+    on(name: "cursor-update", modifiers: string[], eventHandler: MultipointDrawActionCursorUpdateEventHandler): IHandle;
+
+    on(name: "vertex-add", eventHandler: MultipointDrawActionVertexAddEventHandler): IHandle;
+
+    on(name: "vertex-add", modifiers: string[], eventHandler: MultipointDrawActionVertexAddEventHandler): IHandle;
+
+    on(name: "vertex-remove", eventHandler: MultipointDrawActionVertexRemoveEventHandler): IHandle;
+
+    on(name: "vertex-remove", modifiers: string[], eventHandler: MultipointDrawActionVertexRemoveEventHandler): IHandle;
+
+    on(name: "draw-complete", eventHandler: MultipointDrawActionDrawCompleteEventHandler): IHandle;
+
+    on(name: "draw-complete", modifiers: string[], eventHandler: MultipointDrawActionDrawCompleteEventHandler): IHandle;
+  }
+
+  interface MultipointDrawActionConstructor {
+
+
+    new(properties?: MultipointDrawActionProperties): MultipointDrawAction;
+  }
+
+  export const MultipointDrawAction: MultipointDrawActionConstructor;
+
+  interface MultipointDrawActionProperties {
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html#view)
+     */
+    view?: MapViewProperties;
+  }
+
+  export interface MultipointDrawActionCursorUpdateEvent {
+
+    defaultPrevented: boolean;
+
+    preventDefault: Function;
+
+    type: string;
+
+    vertexIndex: number;
+
+    vertices: number[][];
+  }
+
+  export interface MultipointDrawActionDrawCompleteEvent {
+
+    defaultPrevented: boolean;
+
+    preventDefault: Function;
+
+    type: string;
+
+    vertices: number[][];
+  }
+
+  export interface MultipointDrawActionVertexAddEvent {
+
+    defaultPrevented: boolean;
+
+    preventDefault: Function;
+
+    type: string;
+
+    vertexIndex: number;
+
+    vertices: number[][];
+  }
+
+  export interface MultipointDrawActionVertexRemoveEvent {
+
+    defaultPrevented: boolean;
+
+    preventDefault: Function;
+
+    type: string;
+
+    vertexIndex: number;
+
+    vertices: number[][];
+  }
+
+  interface PointDrawAction extends Accessor, Evented {
+    /**
+     * An array of x,y coordinates for the [point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PointDrawAction.html#coordinates)
+     */
+    coordinates: number[];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PointDrawAction.html#view)
+     */
+    view: MapView;
+
+    /**
+     * Completes drawing the [point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometry and fires the [draw-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PointDrawAction.html#event:draw-complete) event. Call this method if the drawing logic needs to be completed other than by double-clicking or pressing the "C" key.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PointDrawAction.html#complete)
+     * 
+     * 
+     */
     complete(): void;
 
+
     on(name: "cursor-update", eventHandler: PointDrawActionCursorUpdateEventHandler): IHandle;
+
     on(name: "cursor-update", modifiers: string[], eventHandler: PointDrawActionCursorUpdateEventHandler): IHandle;
+
     on(name: "draw-complete", eventHandler: PointDrawActionDrawCompleteEventHandler): IHandle;
+
     on(name: "draw-complete", modifiers: string[], eventHandler: PointDrawActionDrawCompleteEventHandler): IHandle;
   }
 
   interface PointDrawActionConstructor {
+
+
     new(properties?: PointDrawActionProperties): PointDrawAction;
   }
 
   export const PointDrawAction: PointDrawActionConstructor;
 
   interface PointDrawActionProperties {
+    /**
+     * An array of x,y coordinates for the [point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PointDrawAction.html#coordinates)
+     */
+    coordinates?: number[];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PointDrawAction.html#view)
+     */
     view?: MapViewProperties;
   }
 
   export interface PointDrawActionCursorUpdateEvent {
+
     coordinates: number[];
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
   }
 
   export interface PointDrawActionDrawCompleteEvent {
+
     coordinates: number[];
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
   }
 
   interface PolygonDrawAction extends Accessor, Evented {
-    vertices: number[][];
+    /**
+     * Two-dimensional array of numbers representing the coordinates of each vertex comprising the geometry being drawn.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#vertices)
+     */
+    readonly vertices: number[][];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#view)
+     */
     view: MapView;
 
+    /**
+     * Indicates if the [redo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#redo) method can be called on the action instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#canRedo)
+     * 
+     * 
+     */
     canRedo(): boolean;
+    /**
+     * Indicates if the [undo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#undo) method can be called on the action instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#canUndo)
+     * 
+     * 
+     */
     canUndo(): boolean;
+    /**
+     * Completes drawing the polygon geometry and fires the [draw-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#event:draw-complete) event. Call this method if the drawing logic needs to be completed other than by double-clicking or pressing the "C" key.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#complete)
+     * 
+     * 
+     */
     complete(): void;
+    /**
+     * Incrementally redo actions recorded in the stack. Call [canRedo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#canRedo) prior to calling this method to check if this method can be called on the action instance. Calling this method will fire the [vertex-add](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#event:vertex-add) or [vertex-remove](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#event:vertex-remove) events depending on the last action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#redo)
+     * 
+     * 
+     */
     redo(): void;
+    /**
+     * Incrementally undo actions recorded in the stack. Call [canUndo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#canUndo) prior to calling this method to check if this method can be called on the action instance. Calling this method will fire the [vertex-add](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#event:vertex-add) or [vertex-remove](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#event:vertex-remove) events depending on the last action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#undo)
+     * 
+     * 
+     */
     undo(): void;
 
+
     on(name: "cursor-update", eventHandler: PolygonDrawActionCursorUpdateEventHandler): IHandle;
+
     on(name: "cursor-update", modifiers: string[], eventHandler: PolygonDrawActionCursorUpdateEventHandler): IHandle;
+
     on(name: "vertex-add", eventHandler: PolygonDrawActionVertexAddEventHandler): IHandle;
+
     on(name: "vertex-add", modifiers: string[], eventHandler: PolygonDrawActionVertexAddEventHandler): IHandle;
+
     on(name: "vertex-remove", eventHandler: PolygonDrawActionVertexRemoveEventHandler): IHandle;
+
     on(name: "vertex-remove", modifiers: string[], eventHandler: PolygonDrawActionVertexRemoveEventHandler): IHandle;
+
     on(name: "draw-complete", eventHandler: PolygonDrawActionDrawCompleteEventHandler): IHandle;
+
     on(name: "draw-complete", modifiers: string[], eventHandler: PolygonDrawActionDrawCompleteEventHandler): IHandle;
   }
 
   interface PolygonDrawActionConstructor {
+
+
     new(properties?: PolygonDrawActionProperties): PolygonDrawAction;
   }
 
   export const PolygonDrawAction: PolygonDrawActionConstructor;
 
   interface PolygonDrawActionProperties {
-    vertices?: number[][];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html#view)
+     */
     view?: MapViewProperties;
   }
 
   export interface PolygonDrawActionCursorUpdateEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertexIndex: number;
+
     vertices: number[][];
   }
 
   export interface PolygonDrawActionDrawCompleteEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertices: number[][];
   }
 
   export interface PolygonDrawActionVertexAddEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertexIndex: number;
+
     vertices: number[][];
   }
 
   export interface PolygonDrawActionVertexRemoveEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertexIndex: number;
+
     vertices: number[][];
   }
 
   interface PolylineDrawAction extends Accessor, Evented {
-    vertices: number[][];
+    /**
+     * Two-dimensional array of numbers representing the coordinates of each vertex that comprising the drawn geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#vertices)
+     */
+    readonly vertices: number[][];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#view)
+     */
     view: MapView;
 
+    /**
+     * Indicates if the [redo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#redo) method can be called on the action instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#canRedo)
+     * 
+     * 
+     */
     canRedo(): boolean;
+    /**
+     * Indicates if the [undo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#undo) method can be called on the action instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#canUndo)
+     * 
+     * 
+     */
     canUndo(): boolean;
+    /**
+     * Completes drawing the polyline geometry and fires the [draw-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#event:draw-complete) event. Call this method if the drawing logic needs to be completed other than by double-clicking or pressing the "C" key.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#complete)
+     * 
+     * 
+     */
     complete(): void;
+    /**
+     * Incrementally redo actions recorded in the stack. Call [canRedo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#canRedo) prior to calling this method to check if this method can be called on the action instance. Calling this method will fire the [vertex-add](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#event:vertex-add) or [vertex-remove](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#event:vertex-remove) event depending on the last action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#redo)
+     * 
+     * 
+     */
     redo(): void;
+    /**
+     * Incrementally undo actions recorded in the stack. Call [canUndo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#canUndo) prior to calling this method to check if this method can be called on the action instance. Calling this method will fire the [vertex-add](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#event:vertex-add) or [vertex-remove](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#event:vertex-remove) event depending on the last action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#undo)
+     * 
+     * 
+     */
     undo(): void;
 
+
     on(name: "cursor-update", eventHandler: PolylineDrawActionCursorUpdateEventHandler): IHandle;
+
     on(name: "cursor-update", modifiers: string[], eventHandler: PolylineDrawActionCursorUpdateEventHandler): IHandle;
+
     on(name: "vertex-add", eventHandler: PolylineDrawActionVertexAddEventHandler): IHandle;
+
     on(name: "vertex-add", modifiers: string[], eventHandler: PolylineDrawActionVertexAddEventHandler): IHandle;
+
     on(name: "vertex-remove", eventHandler: PolylineDrawActionVertexRemoveEventHandler): IHandle;
+
     on(name: "vertex-remove", modifiers: string[], eventHandler: PolylineDrawActionVertexRemoveEventHandler): IHandle;
+
     on(name: "draw-complete", eventHandler: PolylineDrawActionDrawCompleteEventHandler): IHandle;
+
     on(name: "draw-complete", modifiers: string[], eventHandler: PolylineDrawActionDrawCompleteEventHandler): IHandle;
   }
 
   interface PolylineDrawActionConstructor {
+
+
     new(properties?: PolylineDrawActionProperties): PolylineDrawAction;
   }
 
   export const PolylineDrawAction: PolylineDrawActionConstructor;
 
   interface PolylineDrawActionProperties {
-    vertices?: number[][];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html#view)
+     */
     view?: MapViewProperties;
   }
 
   export interface PolylineDrawActionCursorUpdateEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertexIndex: number;
+
     vertices: number[][];
   }
 
   export interface PolylineDrawActionDrawCompleteEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertices: number[][];
   }
 
   export interface PolylineDrawActionVertexAddEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertexIndex: number;
+
     vertices: number[][];
   }
 
   export interface PolylineDrawActionVertexRemoveEvent {
+
     defaultPrevented: boolean;
+
     preventDefault: Function;
+
     type: string;
+
     vertexIndex: number;
+
     vertices: number[][];
   }
 
+  /**
+   * map/scene on screen. The ArcGIS API for JavaScript offers a low-level interface to access the SceneView's WebGL context, and thus enables creating custom visualizations that interact with the scene the same way as built-in layers. Developers can either write WebGL code directly, or integrate with third-party WebGL libraries.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html)
+   */
   interface externalRenderers {
+    /**
+     * Adds an external renderer to the view. The external renderer is defined by an object that contains certain methods and properties, as defined by [ExternalRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ExternalRenderer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#add)
+     * 
+     * @param view The view to which to attach the external renderer.
+     * @param renderer The external renderer.
+     * 
+     */
     add(view: SceneView, renderer: ExternalRenderer): void;
-    fromRenderCoordinates(view: SceneView, srcCoordinates: number[] | any, srcStart: number, destCoordinates: number[] | any, destStart: number, destSpatialReference: SpatialReference, count: number): number[] | any;
+    /**
+     * Transforms positions from the internal rendering coordinate system to the output spatial reference. The allowable output spatial reference is limited and depends on the [viewingMode](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode):
+     *   * In `global` mode, it can either be Web Mercator or WGS84.
+     *   * In `local` mode, it has to match [view.spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#spatialReference), and the call to this function simply copies the coordinates from `srcCoordinates` to `destCoordinates`.
+     *   
+     *   
+     * If these conditions are not met, nothing is written to `destCoordinates` and the function returns `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#fromRenderCoordinates)
+     * 
+     * @param view The view related to the input coordinates.
+     * @param srcCoordinates A linear array of one or more vectors that are interpreted as XYZ coordinates. For example, two position vectors would be represented as `[x1, y1, z1, x2, y2, z2]`. This must contain at least `srcStart + 3 * count` elements.
+     * @param srcStart An index in `srcCoordinates` from which the coordinates will start being read.
+     * @param destCoordinates A reference to an array in which the results will be written.
+     * @param destStart An index in `destCoordinates` in which the coordinates will start to be written.
+     * @param destSpatialReference The spatial reference of the output coordinates. When `null`, `view.spatialReference` is used instead.
+     * @param count The number of vertices to be transformed.
+     * 
+     */
+    fromRenderCoordinates(view: SceneView, srcCoordinates: number[] | Float32Array, srcStart: number, destCoordinates: number[] | Float32Array, destStart: number, destSpatialReference: SpatialReference, count: number): number[] | Float32Array;
+    /**
+     * Removes an external renderer from the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#remove)
+     * 
+     * @param view The view from which to remove the external renderer.
+     * @param renderer The external renderer.
+     * 
+     */
     remove(view: SceneView, renderer: ExternalRenderer): void;
-    renderCoordinateTransformAt(view: SceneView, origin: number[] | any, srcSpatialReference?: SpatialReference, dest?: number[] | any): number[] | any;
+    /**
+     * Computes a 4x4 affine transformation matrix that constitutes a linear coordinate transformation from a local Cartesian coordinate system to the virtual world coordinate system. For example, this matrix can be used to transform the vertices of a 3D model to the rendering coordinate system.  The local Cartesian system is defined by its origin and the following axis definition:
+     *   * X: Easting
+     *   * Y: Northing
+     *   * Z: Elevation
+     *   
+     *   
+     * ![externalRenderers-renderCoordinateTransformAt](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/3d/externalRenderers-renderCoordinateTransformAt.png)  When [view.viewingMode](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode) is `global`, a linear transformation does not take the curvature of the globe or other non-linear projection aspects into account. Thus, the resulting coordinates will only appear correct within a small region around the origin of the local Cartesian system.  The allowable spatial reference of `origin` depends on the [viewingMode](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode):
+     *   * In `global` mode, it can either be Web Mercator or WGS84.
+     *   * In `local` mode, it has to match [view.spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#spatialReference).
+     *   
+     *   
+     * If these conditions are not met, nothing will be written to `dest` and the function will return `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#renderCoordinateTransformAt)
+     * 
+     * @param view The view for which the transformation will be used.
+     * @param origin The global coordinates of the origin in the local Cartesian coordinate system.
+     * @param srcSpatialReference The spatial reference of the origin coordinates. If undefined, `view.spatialReference` is used instead.
+     * @param dest A reference to an array where the 16 matrix elements will be stored. The resulting matrix follows OpenGL conventions where the translation components occupy the 13th, 14th and 15th elements. If undefined, a newly created matrix returned.
+     * 
+     */
+    renderCoordinateTransformAt(view: SceneView, origin: number[] | Float32Array, srcSpatialReference?: SpatialReference, dest?: number[] | Float32Array): number[] | Float32Array;
+    /**
+     * Requests the view to be redrawn.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#requestRender)
+     * 
+     * @param view The view to which the external renderer is attached.
+     * 
+     */
     requestRender(view: SceneView): void;
-    toRenderCoordinates(view: SceneView, srcCoordinates: number[] | any, srcStart: number, srcSpatialReference: SpatialReference, destCoordinates: number[] | any, destStart: number, count: number): number[] | any;
+    /**
+     * Transforms positions from the given spatial reference to the internal rendering coordinate system. The allowable input spatial reference is limited and depends on the [viewingMode](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode):
+     *   * In `global` mode, it can either be Web Mercator or WGS84.
+     *   * In `local` mode, it has to match [view.spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#spatialReference); the call to this function simply copies the coordinates from `srcCoordinates` to `destCoordinates`.
+     *   
+     *   
+     * If these conditions are not met, nothing is written to `destCoordinates` and the function returns `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#toRenderCoordinates)
+     * 
+     * @param view The view in which the coordinates will be used.
+     * @param srcCoordinates A linear array of one or more vectors which are interpreted as XYZ coordinates. For example, two position vectors would be represented as `[x1, y1, z1, x2, y2, z2]`. This must contain at least `srcStart + 3 * count` elements.
+     * @param srcStart An index in `srcCoordinates` from which the coordinates start to be read.
+     * @param srcSpatialReference The spatial reference of the input coordinates. When `null`, `view.spatialReference` is used instead.
+     * @param destCoordinates A reference to an array where the results will be written.
+     * @param destStart An index in `destCoordinates` to which the coordinates will start to be written.
+     * @param count The number of vertices to be transformed.
+     * 
+     */
+    toRenderCoordinates(view: SceneView, srcCoordinates: number[] | Float32Array, srcStart: number, srcSpatialReference: SpatialReference, destCoordinates: number[] | Float32Array, destStart: number, count: number): number[] | Float32Array;
   }
 
   export const externalRenderers: externalRenderers;
 
-  export interface ColorAndIntensity {
+  /**
+   * Tuple of an RGB color value and an intensity value.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ColorAndIntensity)
+   */
+  export interface ColorAndIntensity extends Object {
+    /**
+     * RGB color with values between 0 and 1.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ColorAndIntensity)
+     */
     color: any;
+    /**
+     * Scalar intensity value by which the color should be scaled for compositing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ColorAndIntensity)
+     */
     intensity: number;
   }
 
-  export interface ExternalRenderer {
+  /**
+   * Defines an external renderer using callbacks and properties.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ExternalRenderer)
+   */
+  export interface ExternalRenderer extends Object {
+    /**
+     * Typically called once after adding the external renderer to a view, or whenever the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) becomes [ready](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#ready). It may be called again if the ready state cycles, for example when a different [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) is assigned to the view. Receives a single parameter of type [RenderContext](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ExternalRenderer)
+     * 
+     * 
+     */
     setup(): void;
+    /**
+     * Called in every frame to execute the state update and draw calls. Receives a single parameter of type [RenderContext](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ExternalRenderer)
+     * 
+     * 
+     */
     render(): void;
+    /**
+     * Called when the external renderer is removed from a view, or when the [ready](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#ready) state of the view turns false. Receives a single parameter of type [RenderContext](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#ExternalRenderer)
+     * 
+     * 
+     */
     dispose(): void;
   }
 
-  export interface RenderCamera {
+  /**
+   * The camera object passed to renderer callbacks in [RenderContext](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext). This is not the same as [Camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html). All properties are read-only and defined in terms of the internal rendering coordinate system (see the [section on coordinate systems](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#coordinate-systems) at the top of this page).  Vectors (`Vec3`) are presented as arrays with 3 elements (x, y, z). Matrices (`Mat4`) are presented as linear arrays with 16 elements following the OpenGL conventions where the translation components occupy the 13th, 14th, and 15th elements.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+   */
+  export interface RenderCamera extends Object {
+    /**
+     * A 4x4 matrix that transforms coordinates from world space to camera space.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     viewMatrix: any;
+    /**
+     * The inverse transpose of `viewMatrix`, used to transform normals from world space to camera space.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     viewInverseTransposeMatrix: any;
+    /**
+     * A 4x4 matrix that defines the perspective projection transformation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     projectionMatrix: any;
+    /**
+     * The position of the camera in the internal Cartesian rendering coordinate system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     eye: any;
+    /**
+     * The camera target ("look at") position in the internal Cartesian rendering coordinate system.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     center: any;
+    /**
+     * The camera up vector.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     up: any;
+    /**
+     * The distance to the near plane.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     near: number;
+    /**
+     * The distance to the far plane.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     far: number;
+    /**
+     * The horizontal field of view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     fovX: number;
+    /**
+     * The vertical field of view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderCamera)
+     */
     fovY: number;
   }
 
-  export interface RenderContext {
+  /**
+   * The object passed as a parameter to every call to `setup` and `render` the external renderer.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext)
+   */
+  export interface RenderContext extends Object {
+    /**
+     * The WebGL rendering context.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext)
+     */
     gl: any;
+    /**
+     * The camera used to render the current frame.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext)
+     */
     camera: RenderCamera;
+    /**
+     * The lighting used by [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) to render the current frame.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext)
+     */
     sunLight: SunLight;
 
+    /**
+     * A convenience function provided to completely reset the WebGL state after using it.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext)
+     * 
+     * 
+     */
     resetWebGLState(): void;
+    /**
+     * Binds the color and depth buffers an external renderer is supposed to render into.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#RenderContext)
+     * 
+     * 
+     */
     bindRenderTarget(): void;
   }
 
-  export interface SunLight {
+  /**
+   * Describes the lighting used by [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), derived from its sun lighting model. It consists of a directional Lambertian (`diffuse`) and a constant (`ambient`) term, which should be treated in the sense of the [Phong Reflection Model](https://en.wikipedia.org/wiki/Phong_reflection_model).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#SunLight)
+   */
+  export interface SunLight extends Object {
+    /**
+     * The incident light direction in render coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#SunLight)
+     */
     direction: any;
+    /**
+     * The diffuse light color and intensity.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#SunLight)
+     */
     diffuse: ColorAndIntensity;
+    /**
+     * The ambient light color and intensity.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-3d-externalRenderers.html#SunLight)
+     */
     ambient: ColorAndIntensity;
   }
 
   interface BreakpointsOwner {
+    /**
+     * A convenience property used for defining the breakpoints on the [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) and [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view. The sizes specified here determine the values of the [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) and [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) properties depending on the view's size.  Setting up breakpoints can aid in responsive app design. It does this by watching width and height breakpoints. This is helpful as it removes the need for multiple [`@media` calls](https://developer.mozilla.org/en-US/docs/Web/CSS/Media_Queries). Instead of listening for the view's size and/or resizes property, you can set up a watch handler for either the [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) or [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) properties of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints)
+     */
     breakpoints: BreakpointsOwnerBreakpoints;
+    /**
+     * A convenience property indicating the general size of the view's height. This value is determined based on where the view's [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) falls in the ranges defined in the [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints) property. See the table below for a list of possible values. 
+     * > Please refer to the [styling guide](https://developers.arcgis.com/javascript/latest/guide/styling/index.html#view-size-css-classes) for additional information on working with this.
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * xsmall | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is smaller than the value set in the `xsmall` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * small | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is between the values set in the `xsmall` and `small` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * medium | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is between the values set in the `small` and `medium` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * large | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is between the values set in the `medium` and `large` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * xlarge | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is larger than the value set in the `large` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint)
+     */
     heightBreakpoint: string;
-    orientation: string;
+    /**
+     * A convenience property indicating the view's orientation. See the table below for a list of possible values. 
+     * > Please refer to the [styling guide](https://developers.arcgis.com/javascript/latest/guide/styling/index.html#view-size-css-classes) for additional information on working with this.
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * landscape | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is greater than its [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height).
+     * portrait | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is equal to or smaller than its [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#orientation)
+     */
+    readonly orientation: string;
+    /**
+     * A convenience property indicating the general size of the view's width. This value is determined based on where the view's [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) falls in the ranges defined in the [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints) property. See the table below for a list of possible values. 
+     * > Please refer to the [styling guide](https://developers.arcgis.com/javascript/latest/guide/styling/index.html#view-size-css-classes) for additional information on working with this.
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * xsmall | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is smaller than the value set in the `xsmall` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * small | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is between the values set in the `xsmall` and `small` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * medium | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is between the values set in the `small` and `medium` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * large | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is between the values set in the `medium` and `large` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * xlarge | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is larger than the value set in the `large` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint)
+     */
     widthBreakpoint: string;
   }
 
   interface BreakpointsOwnerConstructor {
+
+
     new(): BreakpointsOwner;
   }
 
   export const BreakpointsOwner: BreakpointsOwnerConstructor;
 
   interface BreakpointsOwnerProperties {
+    /**
+     * A convenience property used for defining the breakpoints on the [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) and [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view. The sizes specified here determine the values of the [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) and [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) properties depending on the view's size.  Setting up breakpoints can aid in responsive app design. It does this by watching width and height breakpoints. This is helpful as it removes the need for multiple [`@media` calls](https://developer.mozilla.org/en-US/docs/Web/CSS/Media_Queries). Instead of listening for the view's size and/or resizes property, you can set up a watch handler for either the [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) or [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) properties of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints)
+     */
     breakpoints?: BreakpointsOwnerBreakpoints;
+    /**
+     * A convenience property indicating the general size of the view's height. This value is determined based on where the view's [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) falls in the ranges defined in the [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints) property. See the table below for a list of possible values. 
+     * > Please refer to the [styling guide](https://developers.arcgis.com/javascript/latest/guide/styling/index.html#view-size-css-classes) for additional information on working with this.
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * xsmall | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is smaller than the value set in the `xsmall` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * small | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is between the values set in the `xsmall` and `small` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * medium | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is between the values set in the `small` and `medium` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * large | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is between the values set in the `medium` and `large` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * xlarge | The [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) of the view is larger than the value set in the `large` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint)
+     */
     heightBreakpoint?: string;
-    orientation?: string;
+    /**
+     * A convenience property indicating the general size of the view's width. This value is determined based on where the view's [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) falls in the ranges defined in the [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints) property. See the table below for a list of possible values. 
+     * > Please refer to the [styling guide](https://developers.arcgis.com/javascript/latest/guide/styling/index.html#view-size-css-classes) for additional information on working with this.
+     * 
+     * Possible Value | Description
+     * ---------------|------------
+     * xsmall | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is smaller than the value set in the `xsmall` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * small | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is between the values set in the `xsmall` and `small` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * medium | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is between the values set in the `small` and `medium` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * large | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is between the values set in the `medium` and `large` [breakpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * xlarge | The [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) of the view is larger than the value set in the `large` [breakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints).
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint)
+     */
     widthBreakpoint?: string;
   }
 
-  export interface BreakpointsOwnerBreakpoints {
-    xsmall: number;
-    small: number;
-    medium: number;
-    large: number;
+
+  export interface BreakpointsOwnerBreakpoints extends Object {
+    /**
+     * Sets the `xsmall` breakpoint in pixels used by [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) and [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint). If the view's [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) or [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) is smaller than this value, then the value of [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) or [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) will be `xsmall`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints)
+     * 
+     * @default 544
+     */
+    xsmall?: number;
+    /**
+     * Sets the `small` breakpoint in pixels used by [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) and [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint). If the view's [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) or [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) is between this value and the value of the `xsmall` property, then the value of [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) or [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) will be `small`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints)
+     * 
+     * @default 768
+     */
+    small?: number;
+    /**
+     * Sets the `medium` breakpoint in pixels used by [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) and [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint). If the view's [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) or [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) is between this value and the value of the `small` property, then the value of [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) or [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) will be `medium`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints)
+     * 
+     * @default 992
+     */
+    medium?: number;
+    /**
+     * Sets the `large` breakpoint in pixels used by [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) and [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint). If the view's [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#height) or [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#width) is between this value and the value of the `medium` property, then the value of [widthBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#widthBreakpoint) or [heightBreakpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#heightBreakpoint) will be `large`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-BreakpointsOwner.html#breakpoints)
+     * 
+     * @default 1200
+     */
+    large?: number;
   }
 
   interface DOMContainer {
+    /**
+     * The `id` or node representing the DOM element containing the view. This is typically set in the view's constructor.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#container)
+     */
     container: HTMLDivElement | string;
-    height: number;
+    /**
+     * The height of the view in pixels read from the view container element.  The view container needs to have a height greater than 0 to be displayed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#height)
+     * 
+     * @default 0
+     */
+    readonly height: number;
+    /**
+     * A Popup object that displays general content or attributes from [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) in the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#map).  The view has a default instance of [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) with predefined styles and a template for defining content. The content in this default instance may be modified directly in the [popup's content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content) or in a layer's [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  You may create a new [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) instance and set it to this property to customize the style, positioning, and content of the popup in favor of using the default popup instance on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#popup)
+     */
     popup: Popup;
-    resizing: boolean;
-    size: number[];
-    suspended: boolean;
+    /**
+     * Indicates if the view is being resized.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#resizing)
+     * 
+     * @default false
+     */
+    readonly resizing: boolean;
+    /**
+     * An array containing the width and height of the view in pixels, e.g. `[width, height]`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#size)
+     */
+    readonly size: number[];
+    /**
+     * Indicates if the view is visible on the page. Is `true` if the view has no [container](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#container), a [height](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#height) or [width](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#width) equal to 0, or the CSS `visibility` is `hidden`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#suspended)
+     * 
+     * @default true
+     */
+    readonly suspended: boolean;
+    /**
+     * Exposes the default widgets available in the view and allows you to toggle them on and off. See [DefaultUI](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html) for more details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#ui)
+     */
     ui: DefaultUI;
-    width: number;
+    /**
+     * The width of the view in pixels read from the view container element.  The view container needs to have a width greater than 0 to be displayed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#width)
+     * 
+     * @default 0
+     */
+    readonly width: number;
   }
 
   interface DOMContainerConstructor {
+
+
     new(): DOMContainer;
   }
 
   export const DOMContainer: DOMContainerConstructor;
 
   interface DOMContainerProperties {
+    /**
+     * The `id` or node representing the DOM element containing the view. This is typically set in the view's constructor.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#container)
+     */
     container?: HTMLDivElement | string;
-    height?: number;
+    /**
+     * A Popup object that displays general content or attributes from [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) in the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#map).  The view has a default instance of [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) with predefined styles and a template for defining content. The content in this default instance may be modified directly in the [popup's content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content) or in a layer's [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  You may create a new [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) instance and set it to this property to customize the style, positioning, and content of the popup in favor of using the default popup instance on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#popup)
+     */
     popup?: PopupProperties;
-    resizing?: boolean;
-    size?: number[];
-    suspended?: boolean;
+    /**
+     * Exposes the default widgets available in the view and allows you to toggle them on and off. See [DefaultUI](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html) for more details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-DOMContainer.html#ui)
+     */
     ui?: DefaultUIProperties;
-    width?: number;
   }
 
   interface CSVLayerView extends LayerView {
+    /**
+     * Highlights the given feature(s). 
+     * > **Known Limitations**  Currently the highlight method is only supported in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#highlight)
+     * 
+     * @param target The feature(s) to highlight.
+     * 
+     */
     highlight(target?: Graphic | Graphic[]): any;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns the [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of features that satisfy the query.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#queryExtent)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If query parameters are not provided, the extent and count of all features available for drawing are returned.
+     * 
+     */
     queryExtent(params?: Query): IPromise<any>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns the number of features that satisfy the query. If query parameters are not provided, the count of all features available for drawing is returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#queryFeatureCount)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If query parameters are not provided, the count of all features available for drawing is returned.
+     * 
+     */
     queryFeatureCount(params?: Query): IPromise<number>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns an array of [Graphic[]](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). If query parameters are not provided, all features available for drawing are returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#queryFeatures)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If specifying a [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) parameter, note that [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) is the only supported geometry. If query parameters are not provided, all features available for drawing are returned.
+     * 
+     */
     queryFeatures(params?: Query): IPromise<Graphic[]>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns array of the ObjectIDs of features that satisfy the input query. If query parameters are not provided, the ObjectIDs of all features available for drawing are returned.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#queryObjectIds)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If query parameters are not provided, the ObjectIDs of all features available for drawing are returned.
+     * 
+     */
     queryObjectIds(params?: Query): IPromise<number[]>;
   }
 
   interface CSVLayerViewConstructor {
+
+
     new(properties?: CSVLayerViewProperties): CSVLayerView;
   }
 
@@ -8515,14 +36433,65 @@ declare namespace __esri {
   }
 
   interface FeatureLayerView extends LayerView {
+    /**
+     * Highlights the given feature(s). 
+     * > **Known Limitations**  In 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) this method is only supported for [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) that have opted in to [WebGL rendering](esri-layers-FeatureLayer.html#webgl-rendering).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#highlight)
+     * 
+     * @param target The feature(s) to highlight. When passing a graphic or array of graphics, each feature must have a valid `objectID`. You may alternatively pass one or more objectIDs as a single number or an array.
+     * 
+     */
     highlight(target?: Graphic | Graphic[] | number | number[]): any;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns the [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of features that satisfy the query. Valid only for [hosted feature services](http://doc.arcgis.com/en/arcgis-online/share-maps/hosted-web-layers.htm) on [arcgis.com](http://arcgis.com) and for ArcGIS Server 10.3.1 and later. If query parameters are not provided, the extent and count of all features available for drawing are returned. 
+     * > To query for the extent of features directly from a Feature Service rather than those visible in the view, you must use the [FeatureLayer.queryExtent()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryExtent) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryExtent)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If query parameters are not provided, the extent and count of all features available for drawing are returned.
+     * 
+     */
     queryExtent(params?: Query): IPromise<any>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns the number of features that satisfy the query. If query parameters are not provided, the count of all features available for drawing is returned. 
+     * > To query for the count of features directly from a Feature Service rather than those visible in the view, you must use the [FeatureLayer.queryFeatureCount()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatureCount) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryFeatureCount)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If query parameters are not provided, the count of all features available for drawing is returned.
+     * 
+     */
     queryFeatureCount(params?: Query): IPromise<number>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns an array of [Graphic[]](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). If query parameters are not provided, all features available for drawing are returned. 
+     * > To execute a query against all the features in a Feature Service rather than only those visible in the view, you must use the [FeatureLayer.queryFeatures()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatures) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryFeatures)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If specifying a [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) parameter, note that [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) is the only supported geometry. If query parameters are not provided, all features available for drawing are returned.
+     * 
+     */
     queryFeatures(params?: Query): IPromise<Graphic[]>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features available for drawing in the layer view and returns array of the ObjectIDs of features that satisfy the input query. If query parameters are not provided, the ObjectIDs of all features available for drawing are returned. 
+     * > To query for ObjectIDs of features directly from a Feature Service rather than those visible in the view, you must use the [FeatureLayer.queryObjectIds()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryObjectIds) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryObjectIds)
+     * 
+     * @param params Specifies the attributes and spatial filter of the query. Only the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry), [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds), and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) properties should be specified. Adding any other properties will return an error. If specifying a spatialRelationship, note that `intersects` is the only supported operation. If query parameters are not provided, the ObjectIDs of all features available for drawing are returned.
+     * 
+     */
     queryObjectIds(params?: Query): IPromise<number[]>;
   }
 
   interface FeatureLayerViewConstructor {
+    /**
+     * Represents the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) of a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) after it has been added to a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) in either a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html)
+     */
+
     new(properties?: FeatureLayerViewProperties): FeatureLayerView;
   }
 
@@ -8533,11 +36502,33 @@ declare namespace __esri {
   }
 
   interface GraphicsLayerView extends LayerView {
+    /**
+     * Highlights the given feature(s). 
+     * > **Known Limitations**  Currently the highlight method is only supported in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-GraphicsLayerView.html#highlight)
+     * 
+     * @param target The feature(s) to highlight. When passing a graphic or array of graphics, each feature must have a valid `objectID`. You may alternatively pass one or more objectIDs as a single number or an array.
+     * 
+     */
     highlight(target?: Graphic | Graphic[] | number | number[]): any;
+    /**
+     * Returns all graphics available for drawing in the layer view as an array of [Graphic[]](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-GraphicsLayerView.html#queryGraphics)
+     * 
+     * 
+     */
     queryGraphics(): IPromise<Graphic[]>;
   }
 
   interface GraphicsLayerViewConstructor {
+    /**
+     * Represents the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) of a [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html) after it has been added to a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) in either a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-GraphicsLayerView.html)
+     */
+
     new(properties?: GraphicsLayerViewProperties): GraphicsLayerView;
   }
 
@@ -8548,53 +36539,231 @@ declare namespace __esri {
   }
 
   interface ImageryLayerView extends LayerView {
+    /**
+     * An object that provides the user access to [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) and their values in the layer. See the object specifications table below for details about each property. This object is used as input in the [pixelFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#pixelFilter) function for filtering and processing each pixel in the block.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-ImageryLayerView.html#pixelData)
+     */
     pixelData: ImageryLayerViewPixelData;
   }
 
   interface ImageryLayerViewConstructor {
+    /**
+     * Represents the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) of an [ImageryLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html) after it has been added to a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) in either a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-ImageryLayerView.html)
+     */
+
     new(properties?: ImageryLayerViewProperties): ImageryLayerView;
   }
 
   export const ImageryLayerView: ImageryLayerViewConstructor;
 
   interface ImageryLayerViewProperties extends LayerViewProperties {
+    /**
+     * An object that provides the user access to [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) and their values in the layer. See the object specifications table below for details about each property. This object is used as input in the [pixelFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-ImageryLayer.html#pixelFilter) function for filtering and processing each pixel in the block.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-ImageryLayerView.html#pixelData)
+     */
     pixelData?: ImageryLayerViewPixelData;
   }
 
-  export interface ImageryLayerViewPixelData {
+
+  export interface ImageryLayerViewPixelData extends Object {
+    /**
+     * The extent of the `pixelBlock`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-ImageryLayerView.html#pixelData)
+     */
     extent?: Extent;
+    /**
+     * An object representing the pixels in the view. This provides the user access to each pixel on the client via the `pixels` property of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-ImageryLayerView.html#pixelData)
+     */
     pixelBlock: PixelBlock;
   }
 
+  interface KMLLayerView extends LayerView {
+    /**
+     * A collection of all the [MapImages](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#MapImage) from visible sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#allVisibleMapImages)
+     */
+    readonly allVisibleMapImages: Collection<KMLLayerViewMapImage>;
+    /**
+     * A collection of all the points from visible sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#allVisiblePoints)
+     */
+    readonly allVisiblePoints: Collection<Point>;
+    /**
+     * A collection of all the polygons from visible sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#allVisiblePolygons)
+     */
+    readonly allVisiblePolygons: Collection<Polygon>;
+    /**
+     * A collection of all the polylines from visible sublayers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#allVisiblePolylines)
+     */
+    readonly allVisiblePolylines: Collection<Polyline>;
+  }
+
+  interface KMLLayerViewConstructor {
+
+
+    new(properties?: KMLLayerViewProperties): KMLLayerView;
+  }
+
+  export const KMLLayerView: KMLLayerViewConstructor;
+
+  interface KMLLayerViewProperties extends LayerViewProperties {
+
+  }
+
+  /**
+   * **MapImage** represents an image overlay draped onto the terrain.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#MapImage)
+   */
+  export interface KMLLayerViewMapImage extends Object {
+    /**
+     * Map image id.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#MapImage)
+     */
+    id: number;
+    /**
+     * URL to the map image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#MapImage)
+     */
+    href: string;
+    /**
+     * The [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of the map image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#MapImage)
+     */
+    Extent: Extent;
+    /**
+     * Rotation of the map image about its center, in degrees. Values can be ±180. The default is 0 (north). Rotations are specified in a counterclockwise direction.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-KMLLayerView.html#MapImage)
+     */
+    rotation: number;
+  }
+
   interface LayerView extends Accessor, corePromise {
-    layer: Layer;
-    suspended: boolean;
-    updating: boolean;
+    /**
+     * The layer being viewed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html#layer)
+     */
+    readonly layer: Layer;
+    /**
+     * Value is `true` if the layer is suspended (i.e., layer will not redraw or update itself when the extent changes).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html#suspended)
+     */
+    readonly suspended: boolean;
+    /**
+     * Value is `true` when the layer is updating; for example, if it is in the process of fetching data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html#updating)
+     * 
+     * @default false
+     */
+    readonly updating: boolean;
+    /**
+     * When `true`, the layer is visible in the view. Set this property to `false` to hide the layer from the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html#visible)
+     * 
+     * @default true
+     */
     visible: boolean;
   }
 
   interface LayerViewConstructor {
+
+
     new(properties?: LayerViewProperties): LayerView;
   }
 
   export const LayerView: LayerViewConstructor;
 
   interface LayerViewProperties {
-    layer?: LayerProperties;
-    suspended?: boolean;
-    updating?: boolean;
+    /**
+     * When `true`, the layer is visible in the view. Set this property to `false` to hide the layer from the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html#visible)
+     * 
+     * @default true
+     */
     visible?: boolean;
   }
 
   interface SceneLayerView extends LayerView {
+    /**
+     * Highlights the given feature(s).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-SceneLayerView.html#highlight)
+     * 
+     * @param target The feature(s) to highlight. When passing a graphic or array of graphics, each feature must have a valid `objectID`. You may alternatively pass one or more objectIDs as a single number or an array.
+     * 
+     */
     highlight(target?: Graphic | Graphic[] | number | number[]): any;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features in the layer view and returns the 3D [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of features that satisfy the query. If query parameters are not provided, the extent and count of all loaded features are returned.  This method is not yet supported when the associated scene layer has a [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) of `point`. Read more about queries in the Query section of the [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) class description. 
+     * > To query for the extent of features directly from a Scene Service rather than those loaded for the current view, you must use the [SceneLayer.queryExtent()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryExtent) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-SceneLayerView.html#queryExtent)
+     * 
+     * @param params Specifies the attributes of the query. Only the [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds) property should be specified. Adding any other properties will return an error. If query parameters are not provided, the extent and count of all loaded features are returned.
+     * 
+     */
     queryExtent(params?: Query): IPromise<any>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features in the layer view and returns the number of features that satisfy the query. If query parameters are not provided, the count of all loaded features is returned. Read more about queries in the Query section of the [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) class description.  This method is not yet supported when the associated scene layer has a [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) of `point`. 
+     * > To query for the count of features directly from a Scene Service rather than those loaded for the current view, you must use the [SceneLayer.queryFeatureCount()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryFeatureCount) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-SceneLayerView.html#queryFeatureCount)
+     * 
+     * @param params Specifies the attributes of the query. Only the [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds) property should be specified. Adding any other properties will return an error. If query parameters are not provided, the count of all loaded features is returned.
+     * 
+     */
     queryFeatureCount(params?: Query): IPromise<number>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features in the layer view and returns a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). If query parameters are not provided, all loaded features are returned.  This method is not yet supported when the associated scene layer has a [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) of `point`. Read more about queries in the Query section of the [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) class description. 
+     * > To execute a query against all the features in a Scene Service rather than only those loaded for the current view, you must use the [SceneLayer.queryFeatures()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryFeatures) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-SceneLayerView.html#queryFeatures)
+     * 
+     * @param params Specifies the attributes of the query. Only the [outFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outFields) and [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds) properties should be specified. Adding any other properties will return an error. If query parameters are not provided, all loaded features are returned.
+     * 
+     */
     queryFeatures(params?: Query): IPromise<FeatureSet>;
+    /**
+     * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against features in the layer view and returns an array of the ObjectIDs of features that satisfy the input query. If query parameters are not provided, the ObjectIDs of all loaded features are returned.  This method is not yet supported when the associated scene layer has a [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#geometryType) of `point`. Read more about queries in the Query section of the [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) class description. 
+     * > To query for ObjectIDs of features directly from a Scene Service rather than those loaded for the current view, you must use the [SceneLayer.queryObjectIds()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#queryObjectIds) method.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-SceneLayerView.html#queryObjectIds)
+     * 
+     * @param params Specifies the attributes of the query. Only the [objectIds](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#objectIds) property should be specified. Adding any other properties will return an error. If query parameters are not provided, the ObjectIDs of all loaded features are returned.
+     * 
+     */
     queryObjectIds(params?: Query): IPromise<number[]>;
   }
 
   interface SceneLayerViewConstructor {
+    /**
+     * Represents the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) of a [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) after it has been added to a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-SceneLayerView.html)
+     */
+
     new(properties?: SceneLayerViewProperties): SceneLayerView;
   }
 
@@ -8605,1941 +36774,8717 @@ declare namespace __esri {
   }
 
   interface StreamLayerView extends LayerView, Evented {
-    connectionError: Error;
-    connectionStatus: string;
-    filter: StreamLayerViewFilter;
+    /**
+     * The error that explains an unsuccessful attempt to connect to the stream service or an unexpected disconnection from the stream service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#connectionError)
+     */
+    readonly connectionError: Error;
+    /**
+     * The status of the Web Socket connection with the stream service. This property can be watched to see if the connection is lost unexpectedly.  **Possible Values:** connected | disconnected
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#connectionStatus)
+     */
+    readonly connectionStatus: string;
+    /**
+     * Contains the attribute and spatial filters used to filter messages sent to the given layer view by a stream service. To change the filter for only a single layer view, use the [updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#updateFilter) method. The layer view's filter is always updated when the [updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter) method of the associated stream layer instance is called.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#filter)
+     */
+    readonly filter: StreamLayerViewFilter;
+    /**
+     * Contains the collection of [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) visible in the layer view for the live stream. Graphics may be removed from the layer view by calling the [removeAll()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#removeAll) method from [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#graphics)
+     */
     graphics: Collection<Graphic>;
 
+    /**
+     * Opens a web socket connection with the stream service to start receiving messages. This is called internally when the StreamLayer is added to a view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#connect)
+     * 
+     * 
+     */
     connect(): IPromise<any>;
+    /**
+     * Closes the web socket connection with the stream service. This is called internally when the StreamLayer is removed from a view.  To verify when the connection is closed, watch the [connectionStatus](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#property:connectionStatus) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#disconnect)
+     * 
+     * 
+     */
     disconnect(): void;
+    /**
+     * Updates the [filter](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#filter) on the StreamLayerView. The filter is updated only on the layer view from which it is called. To update the filter on all layer views generated from a common layer, use the [StreamLayer.updateFilter()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html#updateFilter) method. If the input `filter` object is `undefined` or `null`, the spatial and attribute filters are removed.  Filter changes only apply to incoming features. Features already displayed in the view are not filtered. Therefore, you may want to clear the graphics in the layer view prior to applying a new filter. To do so, get the layer view then call [removeAll()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#removeAll) on the [StreamLayerView.graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#graphics). You may also filter features already present in the view using the [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) methods. See the examples below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#updateFilter)
+     * 
+     * @param filter Updates the spatial and attribute [filters](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#filter). If `null`, all filters are cleared.
+     * @param filter.geometry A spatial filter for filtering features. Only features that intersect the given geometry are displayed in the view. If `null`, the spatial filter is cleared.
+     * @param filter.where A SQL where clause used to filter features by attributes. If `null`, the attribute filter is cleared.
+     * 
+     */
     updateFilter(filter: StreamLayerViewUpdateFilterFilter): IPromise<any>;
 
+
     on(name: "data-received", eventHandler: StreamLayerViewDataReceivedEventHandler): IHandle;
+
     on(name: "data-received", modifiers: string[], eventHandler: StreamLayerViewDataReceivedEventHandler): IHandle;
   }
 
   interface StreamLayerViewConstructor {
+    /**
+     * The StreamLayerView provides methods for connecting, disconnecting, and filtering data received from a stream service for a layer view associated with a [StreamLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html)
+     */
+
     new(properties?: StreamLayerViewProperties): StreamLayerView;
   }
 
   export const StreamLayerView: StreamLayerViewConstructor;
 
   interface StreamLayerViewProperties extends LayerViewProperties {
-    connectionError?: Error;
-    connectionStatus?: string;
-    filter?: StreamLayerViewFilter;
+    /**
+     * Contains the collection of [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) visible in the layer view for the live stream. Graphics may be removed from the layer view by calling the [removeAll()](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html#removeAll) method from [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#graphics)
+     */
     graphics?: CollectionProperties<GraphicProperties>;
   }
 
   export interface StreamLayerViewDataReceivedEvent {
   }
 
-  export interface StreamLayerViewFilter {
+
+  export interface StreamLayerViewFilter extends Object {
+    /**
+     * A spatial filter for filtering features. Only features that intersect the given geometry are displayed in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#filter)
+     */
     geometry?: Extent;
+    /**
+     * A SQL where clause used to filter features by attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#filter)
+     */
     where?: string;
   }
 
-  export interface StreamLayerViewUpdateFilterFilter {
+
+  export interface StreamLayerViewUpdateFilterFilter extends Object {
+    /**
+     * A spatial filter for filtering features. Only features that intersect the given geometry are displayed in the view. If `null`, the spatial filter is cleared.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#updateFilter)
+     */
     geometry?: Extent;
+    /**
+     * A SQL where clause used to filter features by attributes. If `null`, the attribute filter is cleared.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-StreamLayerView.html#updateFilter)
+     */
     where?: string;
   }
 
   interface MapView extends View, BreakpointsOwner {
+    /**
+     * Represents the view's center point; when setting the center, you may pass a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) instance or an array of numbers representing a longitude/latitude pair (`[-100.4593, 36.9014]`). Setting the center immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  If set in the constructor, this property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#viewpoint) or [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#extent) properties are also set in the constructor.  The returned [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) object is always in the spatial reference of the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#map) and may be modified internally. To persist the returned object, create a clone using [Point.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center)
+     */
     center: Point;
+    /**
+     * Specifies constraints to [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale), [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom), and [rotation](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#rotation) that may be applied to the MapView. See object specification below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     constraints: MapViewConstraints;
+    /**
+     * The extent represents the visible portion of a [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) within the view as an instance of [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html). Setting the extent immediately changes the view without animation. To animate the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  The returned [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) object is an internal reference which may be modified internally. To persist the returned object, create a copy using [Extent.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#extent)
+     * 
+     * @default null
+     */
     extent: Extent;
+    /**
+     * Options for configuring the highlight. Use the highlight method on the appropriate [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) to highlight a feature. 
+     * > **Known Limitations**  Only [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) renderered with [WebGL](esri-layers-FeatureLayer.html#webgl-rendering) support highlight. See [FeatureLayerView.highlight()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#highlight) for details of how to highlight features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     */
     highlightOptions: MapViewHighlightOptions;
+    /**
+     * Defines which anchor stays still while resizing the browser window. The default, `center`, ensures the view's center point remains constantly visible as the window size changes. The other options allow  the respective portion of the view to remain visible when the window's size is changed.  **Possible values:** center | left | right | top | bottom | top-left | top-right | bottom-left | bottom-right
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#resizeAlign)
+     * 
+     * @default center
+     */
     resizeAlign: string;
+    /**
+     * The clockwise rotation of due north in relation to the top of the view in degrees. The view may be rotated by directly setting the rotation or by using the following mouse event: `Right-click + Drag`. Map rotation may be disabled by setting the `rotationEnabled` property in [constraints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints) to `false`. See the code snippet below for an example of this.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#rotation)
+     * 
+     * @default 0
+     */
     rotation: number;
+    /**
+     * Represents the map scale at the center of the view. Setting the scale immediately changes the view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale)
+     */
     scale: number;
+    /**
+     * Represents the current view as a [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) or point of observation on the view. Setting the viewpoint immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  The returned [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) object is an internal reference which may be modified internally. To persist the returned object, create a copy using [Viewpoint.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#viewpoint)
+     */
     viewpoint: Viewpoint;
+    /**
+     * Represents the level of detail (LOD) at the center of the view. Setting the zoom immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  Setting this property in conjunction with [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center) is a convenient way to set the initial extent of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom)
+     */
     zoom: number;
 
+    /**
+     * Sets the focus on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#focus)
+     * 
+     * 
+     */
     focus(): void;
-    goTo(target: number[] | Geometry | Geometry[] | Graphic | Graphic[] | Viewpoint | MapViewGoToTarget, options?: MapViewGoToOptions): IPromise<ViewAnimation>;
+    /**
+     * Sets the view to a given target. The target parameter can be one of the following:
+     *   * `[longitude, latitude]` pair of coordinates
+     *   * [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) (or array of [Geometry[]](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html))
+     *   * [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) (or array of [Graphic[]](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html))
+     *   * [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html)
+     *   * Object with a combination of `target`, `center` and `scale` properties (with `target` being any of the types listed above). The `center` property is provided as a convenience to animate the [MapView.center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center) and is equivalent to specifying the `target` with the center [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html).
+     *   
+     *   
+     * This function returns a promise which resolves as soon as the new view has been set to the target. If the transition is animated, then the ongoing animation can be obtained using [MapView.animation](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#animation).  Take note that if you pass in an [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) as the `target` geometry, the `goTo` method will zoom to the nearest LOD of the basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     * 
+     * @param target The target location/viewpoint to animate to. When using an object for `target`, use the properties in the table below.
+     * @param target.target The target of the animation.
+     * @param target.center The [MapView.center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center) to go to.
+     * @param target.scale The [MapView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale) to go to.
+     * @param target.zoom The [MapView.zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom) to go to.
+     * @param options Animation options. See properties below for object specifications.
+     * @param options.animate Indicates if the transition to the new view should be animated.
+     * @param options.duration The duration of the animation in milliseconds.
+     * @param options.easing The easing function used for the animation.  **Possible Values:** linear | ease | ease-in | ease-out | ease-in-out
+     * 
+     */
+    goTo(target: number[] | Geometry | Geometry[] | Graphic | Graphic[] | Viewpoint | MapViewGoToTarget, options?: MapViewGoToOptions): IPromise<any>;
+    /**
+     * Indicates whether there is an event listener on the instance that matches the provided event name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#hasEventListener)
+     * 
+     * @param type The name of the event.
+     * 
+     */
     hasEventListener(type: string): boolean;
+    /**
+     * Returns the topmost feature from each layer that intersects the specified screen coordinates. The following layer types will return a result if a hit is made on an intersecting feature: [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html), [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html), [GeoRSSLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html), [KMLLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html), and [StreamLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html).  At 4.6 and later, a hit test will always return a result from [VectorTileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html). However, the result will only indicate the ID and the name of the layer within the [vector tile style](https://doc.arcgis.com/en/arcgis-online/reference/tile-layers.htm#ESRI_SECTION1_8F68399EB47B48FF9EF46719FCC96978) that intersects the screen point. Detailed attribute and spatial information about the actual feature represented in the layer is not returned. HitTest results returned from VectorTileLayers are primarily used for [Vector tile style editor applications](https://maps.esri.com/jg/VectorBasemapStyleEditor/index.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#hitTest)
+     * 
+     * @param screenPoint The screen coordinates of the click on the view.
+     * @param screenPoint.x The horizontal screen coordinate of the click on the view.
+     * @param screenPoint.y The vertical screen coordinate of the click on the view.
+     * 
+     */
     hitTest(screenPoint: MapViewHitTestScreenPoint): IPromise<HitTestResult>;
+    /**
+     * Registers an event handler on the instance. Call this method to hook an event with a listener. See the [Events summary table](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#events-summary) for a list of listened events.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#on)
+     * 
+     * @param type The name of the event or the events to listen for.
+     * @param modifiersOrHandler Additional modifier keys to filter the events by. Alternatively, if no modifiers are required, the function to call when the event is fired.
+     * @param handler? The function to call when the event is fired, if modifiers were specified.
+     * 
+     */
     on(type: string | string[], modifiersOrHandler: string[] | EventHandler, handler?: EventHandler): IHandle;
+    /**
+     * Converts the given screen point to a [map point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#toMap)
+     * 
+     * @param screenPoint The screen coordinates to convert.
+     * @param screenPoint.x The horizontal screen coordinate to convert.
+     * @param screenPoint.y The vertical screen coordinate to convert.
+     * 
+     */
     toMap(screenPoint: MapViewToMapScreenPoint): Point;
+    /**
+     * Converts the given [map point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) to a [screen point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-ScreenPoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#toScreen)
+     * 
+     * @param point A point geometry.
+     * @param screenPoint ScreenPoint object that will reference the result.
+     * 
+     */
     toScreen(point: Point, screenPoint?: ScreenPoint): ScreenPoint;
 
+
     on(name: "resize", eventHandler: MapViewResizeEventHandler): IHandle;
+
     on(name: "resize", modifiers: string[], eventHandler: MapViewResizeEventHandler): IHandle;
+
     on(name: "layerview-create", eventHandler: MapViewLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: MapViewLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: MapViewLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: MapViewLayerviewDestroyEventHandler): IHandle;
+
     on(name: "click", eventHandler: MapViewClickEventHandler): IHandle;
+
     on(name: "click", modifiers: string[], eventHandler: MapViewClickEventHandler): IHandle;
+
     on(name: "double-click", eventHandler: MapViewDoubleClickEventHandler): IHandle;
+
     on(name: "double-click", modifiers: string[], eventHandler: MapViewDoubleClickEventHandler): IHandle;
+
     on(name: "hold", eventHandler: MapViewHoldEventHandler): IHandle;
+
     on(name: "hold", modifiers: string[], eventHandler: MapViewHoldEventHandler): IHandle;
+
     on(name: "drag", eventHandler: MapViewDragEventHandler): IHandle;
+
     on(name: "drag", modifiers: string[], eventHandler: MapViewDragEventHandler): IHandle;
+
     on(name: "mouse-wheel", eventHandler: MapViewMouseWheelEventHandler): IHandle;
+
     on(name: "mouse-wheel", modifiers: string[], eventHandler: MapViewMouseWheelEventHandler): IHandle;
+
     on(name: "key-down", eventHandler: MapViewKeyDownEventHandler): IHandle;
+
     on(name: "key-down", modifiers: string[], eventHandler: MapViewKeyDownEventHandler): IHandle;
+
     on(name: "key-up", eventHandler: MapViewKeyUpEventHandler): IHandle;
+
     on(name: "key-up", modifiers: string[], eventHandler: MapViewKeyUpEventHandler): IHandle;
+
     on(name: "pointer-down", eventHandler: MapViewPointerDownEventHandler): IHandle;
+
     on(name: "pointer-down", modifiers: string[], eventHandler: MapViewPointerDownEventHandler): IHandle;
+
     on(name: "pointer-move", eventHandler: MapViewPointerMoveEventHandler): IHandle;
+
     on(name: "pointer-move", modifiers: string[], eventHandler: MapViewPointerMoveEventHandler): IHandle;
+
     on(name: "pointer-up", eventHandler: MapViewPointerUpEventHandler): IHandle;
+
     on(name: "pointer-up", modifiers: string[], eventHandler: MapViewPointerUpEventHandler): IHandle;
+
+    on(name: "pointer-enter", eventHandler: MapViewPointerEnterEventHandler): IHandle;
+
+    on(name: "pointer-enter", modifiers: string[], eventHandler: MapViewPointerEnterEventHandler): IHandle;
+
+    on(name: "pointer-leave", eventHandler: MapViewPointerLeaveEventHandler): IHandle;
+
+    on(name: "pointer-leave", modifiers: string[], eventHandler: MapViewPointerLeaveEventHandler): IHandle;
   }
 
   interface MapViewConstructor {
+    /**
+     * A MapView displays a 2D view of a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) instance. An instance of MapView must be created to render a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) (along with its operational and base layers) in 2D. To render a map and its layers in 3D, see the documentation for [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). For a general overview of views, see [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html)
+     */
+
     new(properties?: MapViewProperties): MapView;
   }
 
   export const MapView: MapViewConstructor;
 
   interface MapViewProperties extends ViewProperties, BreakpointsOwnerProperties {
-    center?: PointProperties;
+    /**
+     * Represents the view's center point; when setting the center, you may pass a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) instance or an array of numbers representing a longitude/latitude pair (`[-100.4593, 36.9014]`). Setting the center immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  If set in the constructor, this property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#viewpoint) or [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#extent) properties are also set in the constructor.  The returned [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) object is always in the spatial reference of the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#map) and may be modified internally. To persist the returned object, create a clone using [Point.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center)
+     */
+    center?: PointProperties | number[];
+    /**
+     * Specifies constraints to [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale), [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom), and [rotation](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#rotation) that may be applied to the MapView. See object specification below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     constraints?: MapViewConstraints;
+    /**
+     * The extent represents the visible portion of a [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) within the view as an instance of [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html). Setting the extent immediately changes the view without animation. To animate the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  The returned [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) object is an internal reference which may be modified internally. To persist the returned object, create a copy using [Extent.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#extent)
+     * 
+     * @default null
+     */
     extent?: ExtentProperties;
-    highlightOptions?: MapViewHighlightOptions;
+    /**
+     * Options for configuring the highlight. Use the highlight method on the appropriate [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) to highlight a feature. 
+     * > **Known Limitations**  Only [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) renderered with [WebGL](esri-layers-FeatureLayer.html#webgl-rendering) support highlight. See [FeatureLayerView.highlight()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#highlight) for details of how to highlight features.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     */
+    highlightOptions?: MapViewHighlightOptionsProperties;
+    /**
+     * Defines which anchor stays still while resizing the browser window. The default, `center`, ensures the view's center point remains constantly visible as the window size changes. The other options allow  the respective portion of the view to remain visible when the window's size is changed.  **Possible values:** center | left | right | top | bottom | top-left | top-right | bottom-left | bottom-right
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#resizeAlign)
+     * 
+     * @default center
+     */
     resizeAlign?: string;
+    /**
+     * The clockwise rotation of due north in relation to the top of the view in degrees. The view may be rotated by directly setting the rotation or by using the following mouse event: `Right-click + Drag`. Map rotation may be disabled by setting the `rotationEnabled` property in [constraints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints) to `false`. See the code snippet below for an example of this.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#rotation)
+     * 
+     * @default 0
+     */
     rotation?: number;
+    /**
+     * Represents the map scale at the center of the view. Setting the scale immediately changes the view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale)
+     */
     scale?: number;
+    /**
+     * Represents the current view as a [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) or point of observation on the view. Setting the viewpoint immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  The returned [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) object is an internal reference which may be modified internally. To persist the returned object, create a copy using [Viewpoint.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#viewpoint)
+     */
     viewpoint?: ViewpointProperties;
+    /**
+     * Represents the level of detail (LOD) at the center of the view. Setting the zoom immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  Setting this property in conjunction with [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center) is a convenient way to set the initial extent of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom)
+     */
     zoom?: number;
   }
 
   export interface MapViewClickEvent {
+
     button: number;
+
     mapPoint: Point;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface MapViewDoubleClickEvent {
+
     button: number;
+
     mapPoint: Point;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface MapViewDragEvent {
+
     action: string;
+
     native: any;
+
     origin: MapViewDragEventOrigin;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
-  export interface HitTestResult {
+  /**
+   * Object specification for the result of the [hitTest()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#hitTest) method.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#HitTestResult)
+   */
+  export interface HitTestResult extends Object {
+    /**
+     * An array of result objects returned from the [hitTest()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#hitTest). Results are returned when the location of the input screen coordinates intersect a [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in the view. See the table below for the specification of each object in this array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#HitTestResult)
+     */
     results: HitTestResultResults[];
   }
 
   export interface MapViewHoldEvent {
+
     button: number;
+
     mapPoint: Point;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface MapViewKeyDownEvent {
+
     key: string;
+
     native: any;
+
     repeat: boolean;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
   }
 
   export interface MapViewKeyUpEvent {
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
   }
 
   export interface MapViewLayerviewCreateEvent {
+
     layer: Layer;
+
     layerView: LayerView;
   }
 
   export interface MapViewLayerviewDestroyEvent {
+
     layer: Layer;
+
     layerView: LayerView;
   }
 
-  export interface MapViewConstraints {
+
+  export interface MapViewConstraints extends Object {
+    /**
+     * An array of [LODs](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html). If not specified, this value is read from the [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html). This property may be [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     lods?: LOD[];
+    /**
+     * The minimum [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale) the user is allowed to zoom to within the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     minScale?: number;
+    /**
+     * The maximum [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale) the user is allowed to zoom to within the view. Setting this value to `0` allows the user to overzoom layer tiles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     maxScale?: number;
+    /**
+     * The minimum [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom) level the user is allowed to zoom to within the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     minZoom?: number;
+    /**
+     * The maximum [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom) level the user is allowed to zoom to within the view. Setting this value to `0` allows the user to overzoom layer tiles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     maxZoom?: number;
+    /**
+     * When `true`, the view snaps to the next LOD when zooming in or out. When `false`, the zoom is continuous.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     * 
+     * @default true
+     */
     snapToZoom?: boolean;
+    /**
+     * Indicates whether the user can rotate the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     * 
+     * @default true
+     */
     rotationEnabled?: boolean;
+    /**
+     * A read-only property that specifies the levels of detail (LODs) read from the [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     effectiveLODs?: LOD[];
+    /**
+     * A read-only property that specifies the minimum [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom) level the user is allowed to zoom to within the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     effectiveMinZoom?: number;
+    /**
+     * A read-only property that specifies the maximum [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom) level the user is allowed to zoom to within the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     effectiveMaxZoom?: number;
+    /**
+     * A read-only property that specifies the minimum [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale) the user is allowed to zoom to within the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     effectiveMinScale?: number;
+    /**
+     * A read-only property that specifies the maximum [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale) the user is allowed to zoom to within the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints)
+     */
     effectiveMaxScale?: number;
   }
 
-  export interface MapViewGoToOptions {
+
+  export interface MapViewGoToOptions extends Object {
+    /**
+     * Indicates if the transition to the new view should be animated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     * 
+     * @default true
+     */
     animate?: boolean;
+    /**
+     * The duration of the animation in milliseconds.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     */
     duration?: number;
+    /**
+     * The easing function used for the animation.  **Possible Values:** linear | ease | ease-in | ease-out | ease-in-out
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     * 
+     * @default ease
+     */
     easing?: string | Function;
   }
 
-  export interface MapViewGoToTarget {
+
+  export interface MapViewGoToTarget extends Object {
+    /**
+     * The target of the animation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     */
     target?: number[] | Geometry | Geometry[] | Graphic | Graphic[] | Viewpoint;
+    /**
+     * The [MapView.center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     */
     center?: number[];
+    /**
+     * The [MapView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#scale) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     */
     scale?: number;
+    /**
+     * The [MapView.zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
+     */
     zoom?: number;
   }
 
-  export interface MapViewHighlightOptions {
-    color?: Color;
+
+  export interface MapViewHighlightOptionsProperties extends Object {
+    /**
+     * The color of the highlight.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     * 
+     * @default #00ffff
+     */
+    color?: Color | number[] | string;
+    /**
+     * The opacity of the highlight halo. This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     * 
+     * @default 1
+     */
     haloOpacity?: number;
+    /**
+     * The opacity of the fill (area within the halo). This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     * 
+     * @default 0.25
+     */
     fillOpacity?: number;
   }
 
-  export interface MapViewHitTestScreenPoint {
+  export interface MapViewHighlightOptions extends AnonymousAccessor {
+    /**
+     * The color of the highlight.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     * 
+     * @default #00ffff
+     */
+    color?: Color;
+    /**
+     * The opacity of the highlight halo. This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     * 
+     * @default 1
+     */
+    haloOpacity?: number;
+    /**
+     * The opacity of the fill (area within the halo). This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions)
+     * 
+     * @default 0.25
+     */
+    fillOpacity?: number;
+  }
+
+
+  export interface MapViewHitTestScreenPoint extends Object {
+    /**
+     * The horizontal screen coordinate of the click on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#hitTest)
+     */
     x: number;
+    /**
+     * The vertical screen coordinate of the click on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#hitTest)
+     */
     y: number;
   }
 
-  export interface MapViewToMapScreenPoint {
+
+  export interface MapViewToMapScreenPoint extends Object {
+    /**
+     * The horizontal screen coordinate to convert.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#toMap)
+     */
     x: number;
+    /**
+     * The vertical screen coordinate to convert.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#toMap)
+     */
     y: number;
   }
 
   export interface MapViewMouseWheelEvent {
+
     deltaY: number;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface MapViewPointerDownEvent {
+
     native: any;
+
     pointerId: number;
+
     pointerType: string;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
+    y: number;
+  }
+
+  export interface MapViewPointerEnterEvent {
+
+    native: any;
+
+    pointerId: number;
+
+    pointerType: string;
+
+    stopPropagation: Function;
+
+    timestamp: number;
+
+    type: string;
+
+    x: number;
+
+    y: number;
+  }
+
+  export interface MapViewPointerLeaveEvent {
+
+    native: any;
+
+    pointerId: number;
+
+    pointerType: string;
+
+    stopPropagation: Function;
+
+    timestamp: number;
+
+    type: string;
+
+    x: number;
+
     y: number;
   }
 
   export interface MapViewPointerMoveEvent {
+
     native: any;
+
     pointerId: number;
+
     pointerType: string;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface MapViewPointerUpEvent {
+
     native: any;
+
     pointerId: number;
+
     pointerType: string;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface MapViewResizeEvent {
+
     height: number;
+
     oldHeight: number;
+
     oldWidth: number;
+
     width: number;
   }
 
-  export interface MapViewDragEventOrigin {
+
+  export interface MapViewDragEventOrigin extends Object {
+
     x: number;
+
     y: number;
   }
 
-  export interface HitTestResultResults {
+
+  export interface HitTestResultResults extends Object {
+    /**
+     * A graphic representing a feature in the view that intersects the input screen coordinates. If the graphic comes from a layer with an applied [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html), then the [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#symbol) property will be empty. Other properties may be empty based on the context in which the graphic is fetched.  If the result comes from a [VectorTileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html) then a static graphic is returned with two `attributes`: `layerId` and `layerName`. These correspond to the name and id of the style-layer in the [vector tile style](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Vector_Tile_Style/02r3000002nv000000/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#HitTestResult)
+     */
     graphic: Graphic;
+    /**
+     * The point geometry in the spatial reference of the view corresponding with the input screen coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#HitTestResult)
+     */
     mapPoint: Point;
   }
 
   interface SceneView extends View, BreakpointsOwner {
+    /**
+     * The observation point from which the visible portion (or perspective) of the SceneView is determined. Contains properties including the elevation, tilt, and heading (in degrees) of the current view. Setting the camera immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  When set in the constructor, this property overrides the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent), [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center), [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale), and [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) properties.  The camera property contains an internal reference which may be modified in the future. To persist or modify the camera, create a clone using [camera.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#clone). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera)
+     */
     camera: Camera;
+    /**
+     * Represents the view's center point; when setting the center you may pass a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) instance or an array of numbers representing at longitude/latitude pair (`[-100.4593, 36.9014]`). Setting the center immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  If set in the constructor, this property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera), or [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent) properties are also set in the constructor.  The center property contains an internal reference which may be modified in the future. To persist or modify the center, create a clone using [center.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#clone). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center)
+     */
     center: Point;
+    /**
+     * Represents an optional clipping area used to define the visible [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of a local scene. If defined, only data (including the basemap) within the area will be displayed.  The `clippingArea` property only applies to [local](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode) scenes.  ![scene-clipping-area](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-clipping-area.png%20%22Local%20scene%20with%20clippingArea%22)  The clippingArea property contains an internal reference which may be modified in the future. To persist or modify the clippingArea, create a clone using [clippingArea.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#clippingArea)
+     */
     clippingArea: Extent;
+    /**
+     * Specifies constraints for [Camera tilt](esri-Camera.html#tilt) and altitude that may be applied to the SceneView. See the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     constraints: SceneViewConstraints;
+    /**
+     * Specifies various properties of the environment's visualization in the view. The SceneView will redraw automatically when any property of environment changes. 
+     * ```js
+     * var view = new SceneView({
+     *   map: map,
+     *   container: "viewDiv"
+     * });
+     * 
+     * // Set the sun position to reflect the current time
+     * view.environment.lighting.date = Date.now();
+     * 
+     * // Disable automatic lighting updates by camera tracking
+     * view.environment.lighting.cameraTrackingEnabled = true;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     environment: SceneViewEnvironment;
+    /**
+     * The extent represents the visible portion of a [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) within the view as an instance of [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html). Setting the extent immediately changes the view without animation. To animate the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  Rather than using extent to change the visible portion of the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) in a SceneView, you should use [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) since it easily allows you to define the heading, elevation and tilt of the observation point from which the view's perspective is created.  When set in the constructor, this property overrides the [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center), [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale), and [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) properties. This property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint) or [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) are also set in the constructor.  The extent property contains an internal reference which may be modified in the future. To persist or modify the extent, create a clone using [extent.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent)
+     * 
+     * @default null
+     */
     extent: Extent;
+    /**
+     * Options for configuring the highlight. Use the highlight method on the appropriate [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) to highlight a feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     */
     highlightOptions: SceneViewHighlightOptions;
+    /**
+     * SceneView can draw scenes in two different quality modes: `high` and `low`. Using the `low` quality profile significantly increases performance on slower browsers and devices by reducing the visual quality in the following aspects: 
+     *   * Map resolution
+     *   * Scene layer detail level
+     *   * Anti-aliasing (edge smoothing)
+     *   
+     *   
+     * The default value is based on the detected browser: 
+     *   * `low` for Internet Explorer 11 and Safari
+     *   * `high` for any other browser
+     *   
+     *   
+     * Overriding the default value is best done in the constructor (see example below). If the value is modified after construction, only a subset of the quality aspects are affected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#qualityProfile)
+     */
     qualityProfile: string;
+    /**
+     * Represents an approximation of the map scale at the center of the view. Setting the scale immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  When set in the constructor, this property overrides the [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) property. This property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera), or [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent) properties are also set in the constructor.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale)
+     */
     scale: number;
+    /**
+     * The viewing mode (`local` or `global`). Global scenes render the earth as a sphere. Local scenes render the earth on a flat plane and allow for navigation and feature display in a localized or [clipped](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#clippingArea) area. Users may also navigate the camera of a local scene below the surface of a basemap. 
+     * 
+     * Value | Example | Description
+     * ------|-------|------------
+     * global | ![scene-global](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-global.png) | Global scenes allow the entire globe to render in the view, showing the curvature of the earth.
+     * local | ![scene-local](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-local.png) | Local scenes render the earth on a flat surface. They can be constrained to only show a "local" area by setting the [clippingArea](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#clipplingArea) property. Local scenes also allow for displaying and exploring data that would otherwise be hidden by the surface of the earth.
+     * 
+     * Depending on the viewing mode different [supported coordinate systems](esri-views-SceneView.html#supported-coordinate-systems) are available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode)
+     * 
+     * @default global
+     */
     viewingMode: string;
+    /**
+     * Represents the current view as a [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) or point of observation on the view. In SceneViews, [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) should be used in favor of viewpoint for watching or changing the point of view. Setting the viewpoint immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  When set in the constructor, this property overrides the [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent), [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center), [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale), and [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) properties. This property will be ignored if [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) is also set in the constructor.  The viewpoint property contains an internal reference which may be modified in the future. To persist or modify the viewpoint, create a clone using [viewpoint.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint)
+     */
     viewpoint: Viewpoint;
+    /**
+     * Represents the level of detail (LOD) at the center of the view. Setting the zoom immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  Setting this property in conjunction with [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center) is a convenient way to set the initial extent of the view.  If set in the constructor, this property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera), [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent), or [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale) properties are also set in the constructor.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom)
+     */
     zoom: number;
 
+    /**
+     * Sets the focus on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#focus)
+     * 
+     * 
+     */
     focus(): void;
+    /**
+     * Sets the view to a given target. The target parameter can be one of the following:
+     *   * `[longitude, latitude]` pair of coordinates
+     *   * [Geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html) (or array of [Geometry[]](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html))
+     *   * [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) (or array of [Graphic[]](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html))
+     *   * [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html)
+     *   * [Camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html)
+     *   * Object with a combination of `target`, `center`, `scale`, `position`, `heading` and `tilt` properties (with `target` being any of the types listed above). The `center` property is provided as a convenience to animate the [SceneView.center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center) and is the equivalent of specifying the `target` with the center [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html). The target must be provided in the spatial reference of the view.
+     *   
+     *   
+     * This function returns a promise which resolves as soon as the new view has been set to the target. If the transition is animated, then the ongoing animation can be obtained using [SceneView.animation](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#animation).  If the given target is far away from the current camera position, then heading and tilt will be automatically set to their neutral values (facing north, looking top down). Tilt and heading can always be explicitly set to override this behavior.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     * 
+     * @param target The target location/viewpoint to go to. When using an object for `target`, use the properties in the table below.
+     * @param target.target The target of the animation.
+     * @param target.center The [SceneView.center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center) to go to.
+     * @param target.scale The [SceneView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale) to go to.
+     * @param target.zoom The final [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) value to go to.
+     * @param target.heading The [Camera.heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading) to go to.
+     * @param target.tilt The [Camera.tilt](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#position) to go to.
+     * @param target.position The [Camera.position](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#position) to go to.
+     * @param options View transition options.
+     * @param options.animate Indicates if the transition to the new view should be animated.
+     * @param options.speedFactor Increases or decreases the animation speed by the specified factor. A speedFactor of 2 will make the animation twice as fast, while a speedFactor of 0.5 will make the animation half as fast. Setting the speed factor will automatically adapt the default maxDuration accordingly.
+     * @param options.duration Set the exact duration (in milliseconds) of the animation. Note that by default, animation duration is calculated based on the time required to reach the target at a constant speed. Setting duration overrides the speedFactor option. Note that the resulting duration is still limited to the maxDuration.
+     * @param options.maxDuration The maximum allowed duration (in milliseconds) of the animation. The default maxDuration value takes the specified speedFactor into account.
+     * @param options.easing The easing function to use for the animation. This may either be a preset (named) function, or a user specified function. Supported named presets are: `linear`, `in-cubic`, `out-cubic`, `in-out-cubic`, `in-expo`, `out-expo`, `in-out-expo`  By default, animations that are less than 1000 ms use an out easing function; longer animations use an in-out function.
+     * 
+     */
     goTo(target: number[] | Geometry | Geometry[] | Graphic | Graphic[] | Viewpoint | Camera | SceneViewGoToTarget, options?: SceneViewGoToOptions): IPromise<any>;
+    /**
+     * Indicates whether there is an event listener on the instance that matches the provided event name.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#hasEventListener)
+     * 
+     * @param type The name of the event.
+     * 
+     */
     hasEventListener(type: string): boolean;
+    /**
+     * Returns the topmost feature from each layer that intersects the specified screen coordinates. The following layer types will return a result if a hit is made on an intersecting feature: [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html), [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html), [GeoRSSLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GeoRSSLayer.html), [KMLLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-KMLLayer.html), and [StreamLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-StreamLayer.html).  Draped graphics (i.e. graphics in layers where the [elevation mode](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#elevationInfo) is `on-the-ground`) are currently **not** returned from this method, even when they intersect the input screen point.  When the ground surface is hit, but no graphic is found, then the result of hitTest will be a single object with its mapPoint set to the point on the surface that was hit, but its graphic will be set to `null`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#hitTest)
+     * 
+     * @param screenPoint The screen coordinates of the click on the view.
+     * @param screenPoint.x The horizontal screen coordinate of the click on the view.
+     * @param screenPoint.y The vertical screen coordinate of the click on the view.
+     * 
+     */
     hitTest(screenPoint: SceneViewHitTestScreenPoint): IPromise<SceneViewHitTestResult>;
+    /**
+     * Registers an event handler on the instance. Call this method to hook an event with a listener. See the [Events summary table](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#events-summary) for a list of listened events.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#on)
+     * 
+     * @param type The name of the event or the events to listen for.
+     * @param modifiersOrHandler Additional modifier keys to filter the events by. Alternatively, if no modifiers are required, the function to call when the event is fired.
+     * @param handler? The function to call when the event is fired, if modifiers were specified.
+     * 
+     */
     on(type: string | string[], modifiersOrHandler: string[] | EventHandler, handler?: EventHandler): IHandle;
+    /**
+     * Converts the given screen point to a [map point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#toMap)
+     * 
+     * @param screenPoint The screen coordinates to convert.
+     * @param screenPoint.x The horizontal screen coordinate to convert.
+     * @param screenPoint.y The vertical screen coordinate to convert.
+     * @param mapPoint The point object that will reference the result.
+     * 
+     */
     toMap(screenPoint: SceneViewToMapScreenPoint, mapPoint?: Point): Point;
+    /**
+     * Converts the given [map point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) to a [screen point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-ScreenPoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#toScreen)
+     * 
+     * @param point A point geometry.
+     * @param screenPoint ScreenPoint object that will reference the result.
+     * 
+     */
     toScreen(point: Point, screenPoint?: ScreenPoint): ScreenPoint;
 
+
     on(name: "resize", eventHandler: SceneViewResizeEventHandler): IHandle;
+
     on(name: "resize", modifiers: string[], eventHandler: SceneViewResizeEventHandler): IHandle;
+
     on(name: "layerview-create", eventHandler: SceneViewLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-create", modifiers: string[], eventHandler: SceneViewLayerviewCreateEventHandler): IHandle;
+
     on(name: "layerview-destroy", eventHandler: SceneViewLayerviewDestroyEventHandler): IHandle;
+
     on(name: "layerview-destroy", modifiers: string[], eventHandler: SceneViewLayerviewDestroyEventHandler): IHandle;
+
     on(name: "click", eventHandler: SceneViewClickEventHandler): IHandle;
+
     on(name: "click", modifiers: string[], eventHandler: SceneViewClickEventHandler): IHandle;
+
     on(name: "double-click", eventHandler: SceneViewDoubleClickEventHandler): IHandle;
+
     on(name: "double-click", modifiers: string[], eventHandler: SceneViewDoubleClickEventHandler): IHandle;
+
     on(name: "hold", eventHandler: SceneViewHoldEventHandler): IHandle;
+
     on(name: "hold", modifiers: string[], eventHandler: SceneViewHoldEventHandler): IHandle;
+
     on(name: "drag", eventHandler: SceneViewDragEventHandler): IHandle;
+
     on(name: "drag", modifiers: string[], eventHandler: SceneViewDragEventHandler): IHandle;
+
     on(name: "mouse-wheel", eventHandler: SceneViewMouseWheelEventHandler): IHandle;
+
     on(name: "mouse-wheel", modifiers: string[], eventHandler: SceneViewMouseWheelEventHandler): IHandle;
+
     on(name: "key-down", eventHandler: SceneViewKeyDownEventHandler): IHandle;
+
     on(name: "key-down", modifiers: string[], eventHandler: SceneViewKeyDownEventHandler): IHandle;
+
     on(name: "key-up", eventHandler: SceneViewKeyUpEventHandler): IHandle;
+
     on(name: "key-up", modifiers: string[], eventHandler: SceneViewKeyUpEventHandler): IHandle;
+
     on(name: "pointer-down", eventHandler: SceneViewPointerDownEventHandler): IHandle;
+
     on(name: "pointer-down", modifiers: string[], eventHandler: SceneViewPointerDownEventHandler): IHandle;
+
     on(name: "pointer-move", eventHandler: SceneViewPointerMoveEventHandler): IHandle;
+
     on(name: "pointer-move", modifiers: string[], eventHandler: SceneViewPointerMoveEventHandler): IHandle;
+
     on(name: "pointer-up", eventHandler: SceneViewPointerUpEventHandler): IHandle;
+
     on(name: "pointer-up", modifiers: string[], eventHandler: SceneViewPointerUpEventHandler): IHandle;
+
+    on(name: "pointer-enter", eventHandler: SceneViewPointerEnterEventHandler): IHandle;
+
+    on(name: "pointer-enter", modifiers: string[], eventHandler: SceneViewPointerEnterEventHandler): IHandle;
+
+    on(name: "pointer-leave", eventHandler: SceneViewPointerLeaveEventHandler): IHandle;
+
+    on(name: "pointer-leave", modifiers: string[], eventHandler: SceneViewPointerLeaveEventHandler): IHandle;
   }
 
   interface SceneViewConstructor {
+    /**
+     * A SceneView displays a 3D view of a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) or [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html) instance using WebGL. To render a map and its layers in 2D, see the documentation for [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). For a general overview of views, see [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html)
+     */
+
     new(properties?: SceneViewProperties): SceneView;
   }
 
   export const SceneView: SceneViewConstructor;
 
   interface SceneViewProperties extends ViewProperties, BreakpointsOwnerProperties {
+    /**
+     * The observation point from which the visible portion (or perspective) of the SceneView is determined. Contains properties including the elevation, tilt, and heading (in degrees) of the current view. Setting the camera immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  When set in the constructor, this property overrides the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent), [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center), [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale), and [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) properties.  The camera property contains an internal reference which may be modified in the future. To persist or modify the camera, create a clone using [camera.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#clone). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera)
+     */
     camera?: CameraProperties;
-    center?: PointProperties;
+    /**
+     * Represents the view's center point; when setting the center you may pass a [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) instance or an array of numbers representing at longitude/latitude pair (`[-100.4593, 36.9014]`). Setting the center immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  If set in the constructor, this property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera), or [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent) properties are also set in the constructor.  The center property contains an internal reference which may be modified in the future. To persist or modify the center, create a clone using [center.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#clone). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center)
+     */
+    center?: PointProperties | number[];
+    /**
+     * Represents an optional clipping area used to define the visible [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of a local scene. If defined, only data (including the basemap) within the area will be displayed.  The `clippingArea` property only applies to [local](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode) scenes.  ![scene-clipping-area](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-clipping-area.png%20%22Local%20scene%20with%20clippingArea%22)  The clippingArea property contains an internal reference which may be modified in the future. To persist or modify the clippingArea, create a clone using [clippingArea.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#clippingArea)
+     */
     clippingArea?: ExtentProperties;
+    /**
+     * Specifies constraints for [Camera tilt](esri-Camera.html#tilt) and altitude that may be applied to the SceneView. See the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     constraints?: SceneViewConstraintsProperties;
+    /**
+     * Specifies various properties of the environment's visualization in the view. The SceneView will redraw automatically when any property of environment changes. 
+     * ```js
+     * var view = new SceneView({
+     *   map: map,
+     *   container: "viewDiv"
+     * });
+     * 
+     * // Set the sun position to reflect the current time
+     * view.environment.lighting.date = Date.now();
+     * 
+     * // Disable automatic lighting updates by camera tracking
+     * view.environment.lighting.cameraTrackingEnabled = true;
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     environment?: SceneViewEnvironmentProperties;
+    /**
+     * The extent represents the visible portion of a [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) within the view as an instance of [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html). Setting the extent immediately changes the view without animation. To animate the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo).  Rather than using extent to change the visible portion of the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) in a SceneView, you should use [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) since it easily allows you to define the heading, elevation and tilt of the observation point from which the view's perspective is created.  When set in the constructor, this property overrides the [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center), [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale), and [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) properties. This property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint) or [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) are also set in the constructor.  The extent property contains an internal reference which may be modified in the future. To persist or modify the extent, create a clone using [extent.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#clone). 
+     * > **Z-values** defined in a geographic or metric coordinate system are expressed in meters. However, in local scenes that use a projected coordinate system, vertical units are assumed to be the same as the horizontal units specified by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent)
+     * 
+     * @default null
+     */
     extent?: ExtentProperties;
-    highlightOptions?: SceneViewHighlightOptions;
+    /**
+     * Options for configuring the highlight. Use the highlight method on the appropriate [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) to highlight a feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     */
+    highlightOptions?: SceneViewHighlightOptionsProperties;
+    /**
+     * SceneView can draw scenes in two different quality modes: `high` and `low`. Using the `low` quality profile significantly increases performance on slower browsers and devices by reducing the visual quality in the following aspects: 
+     *   * Map resolution
+     *   * Scene layer detail level
+     *   * Anti-aliasing (edge smoothing)
+     *   
+     *   
+     * The default value is based on the detected browser: 
+     *   * `low` for Internet Explorer 11 and Safari
+     *   * `high` for any other browser
+     *   
+     *   
+     * Overriding the default value is best done in the constructor (see example below). If the value is modified after construction, only a subset of the quality aspects are affected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#qualityProfile)
+     */
     qualityProfile?: string;
+    /**
+     * Represents an approximation of the map scale at the center of the view. Setting the scale immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  When set in the constructor, this property overrides the [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) property. This property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera), or [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent) properties are also set in the constructor.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale)
+     */
     scale?: number;
+    /**
+     * The viewing mode (`local` or `global`). Global scenes render the earth as a sphere. Local scenes render the earth on a flat plane and allow for navigation and feature display in a localized or [clipped](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#clippingArea) area. Users may also navigate the camera of a local scene below the surface of a basemap. 
+     * 
+     * Value | Example | Description
+     * ------|-------|------------
+     * global | ![scene-global](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-global.png) | Global scenes allow the entire globe to render in the view, showing the curvature of the earth.
+     * local | ![scene-local](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-local.png) | Local scenes render the earth on a flat surface. They can be constrained to only show a "local" area by setting the [clippingArea](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#clipplingArea) property. Local scenes also allow for displaying and exploring data that would otherwise be hidden by the surface of the earth.
+     * 
+     * Depending on the viewing mode different [supported coordinate systems](esri-views-SceneView.html#supported-coordinate-systems) are available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode)
+     * 
+     * @default global
+     */
     viewingMode?: string;
+    /**
+     * Represents the current view as a [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) or point of observation on the view. In SceneViews, [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) should be used in favor of viewpoint for watching or changing the point of view. Setting the viewpoint immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  When set in the constructor, this property overrides the [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent), [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center), [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale), and [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) properties. This property will be ignored if [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera) is also set in the constructor.  The viewpoint property contains an internal reference which may be modified in the future. To persist or modify the viewpoint, create a clone using [viewpoint.clone()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html#clone).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint)
+     */
     viewpoint?: ViewpointProperties;
+    /**
+     * Represents the level of detail (LOD) at the center of the view. Setting the zoom immediately changes the current view. For animating the view, see [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo).  Setting this property in conjunction with [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center) is a convenient way to set the initial extent of the view.  If set in the constructor, this property will be ignored if the [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewpoint), [camera](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#camera), [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#extent), or [scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale) properties are also set in the constructor.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom)
+     */
     zoom?: number;
   }
 
   export interface SceneViewClickEvent {
+
     button: number;
+
     mapPoint: Point;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface SceneViewDoubleClickEvent {
+
     button: number;
+
     mapPoint: Point;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface SceneViewDragEvent {
+
     action: string;
+
     native: any;
+
     origin: SceneViewDragEventOrigin;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export type EasingFunction = (t: number, duration: number) => number;
 
-  export interface SceneViewHitTestResult {
+  /**
+   * Object specification for the result of the [hitTest()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#hitTest) method.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#HitTestResult)
+   */
+  export interface SceneViewHitTestResult extends Object {
+    /**
+     * An array of result objects returned from the [hitTest()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#hitTest). Results are returned when the location of the input screen coordinates intersect a [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) in the view. See the table below for the specification of each object in this array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#HitTestResult)
+     */
     results: SceneViewHitTestResultResults[];
   }
 
   export interface SceneViewHoldEvent {
+
     button: number;
+
     mapPoint: Point;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface SceneViewKeyDownEvent {
+
     key: string;
+
     native: any;
+
     repeat: boolean;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
   }
 
   export interface SceneViewKeyUpEvent {
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
   }
 
   export interface SceneViewLayerviewCreateEvent {
+
     layer: Layer;
+
     layerView: LayerView;
   }
 
   export interface SceneViewLayerviewDestroyEvent {
+
     layer: Layer;
+
     layerView: LayerView;
   }
 
   export interface SceneViewMouseWheelEvent {
+
     deltaY: number;
+
     native: any;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface SceneViewPointerDownEvent {
+
     native: any;
+
     pointerId: number;
+
     pointerType: string;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
+    y: number;
+  }
+
+  export interface SceneViewPointerEnterEvent {
+
+    native: any;
+
+    pointerId: number;
+
+    pointerType: string;
+
+    stopPropagation: Function;
+
+    timestamp: number;
+
+    type: string;
+
+    x: number;
+
+    y: number;
+  }
+
+  export interface SceneViewPointerLeaveEvent {
+
+    native: any;
+
+    pointerId: number;
+
+    pointerType: string;
+
+    stopPropagation: Function;
+
+    timestamp: number;
+
+    type: string;
+
+    x: number;
+
     y: number;
   }
 
   export interface SceneViewPointerMoveEvent {
+
     native: any;
+
     pointerId: number;
+
     pointerType: string;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface SceneViewPointerUpEvent {
+
     native: any;
+
     pointerId: number;
+
     pointerType: string;
+
     stopPropagation: Function;
+
     timestamp: number;
+
     type: string;
+
     x: number;
+
     y: number;
   }
 
   export interface SceneViewResizeEvent {
+
     height: number;
+
     oldHeight: number;
+
     oldWidth: number;
+
     width: number;
   }
 
-  export interface SceneViewConstraintsProperties {
+
+  export interface SceneViewConstraintsProperties extends Object {
+    /**
+     * Specifies a constraint on the minimum and maximum allowed camera altitude. 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     altitude?: SceneViewConstraintsAltitudeProperties;
+    /**
+     * Specifies the near and far webgl clip distances.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     clipDistance?: SceneViewConstraintsClipDistanceProperties;
+    /**
+     * When enabled, prevents the user from navigating below the surface in a local SceneView.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     collision?: SceneViewConstraintsCollision;
+    /**
+     * Specifies a constraint on the amount of allowed tilting of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     tilt?: SceneViewConstraintsTiltProperties;
   }
-  export interface SceneViewConstraints extends Accessor {
+
+  export interface SceneViewConstraints extends AnonymousAccessor {
+    /**
+     * Specifies a constraint on the minimum and maximum allowed camera altitude. 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     altitude?: SceneViewConstraintsAltitude;
+    /**
+     * Specifies the near and far webgl clip distances.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     clipDistance?: SceneViewConstraintsClipDistance;
+    /**
+     * When enabled, prevents the user from navigating below the surface in a local SceneView.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     collision?: SceneViewConstraintsCollision;
+    /**
+     * Specifies a constraint on the amount of allowed tilting of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     tilt?: SceneViewConstraintsTilt;
   }
 
-  export interface SceneViewConstraintsAltitudeProperties {
-    min?: number;
-    max?: number;
-  }
-  export interface SceneViewConstraintsAltitude extends Accessor {
+
+  export interface SceneViewConstraintsAltitudeProperties extends Object {
+    /**
+     * The minimum allowed camera altitude (in meters).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default -∞
+     */
     min?: number;
+    /**
+     * The maximum allowed camera altitude (in meters).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default EARTH_RADIUS * 4
+     */
     max?: number;
   }
 
-  export interface SceneViewConstraintsClipDistanceProperties {
-    near?: number;
-    far?: number;
-    mode?: string;
+  export interface SceneViewConstraintsAltitude extends AnonymousAccessor {
+    /**
+     * The minimum allowed camera altitude (in meters).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default -∞
+     */
+    min?: number;
+    /**
+     * The maximum allowed camera altitude (in meters).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default EARTH_RADIUS * 4
+     */
+    max?: number;
   }
-  export interface SceneViewConstraintsClipDistance extends Accessor {
+
+
+  export interface SceneViewConstraintsClipDistanceProperties extends Object {
+    /**
+     * The near clip distance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     near?: number;
+    /**
+     * The far clip distance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     far?: number;
+    /**
+     * Specifies the mode of the constraint which is either `auto` or `manual`. In `auto` mode, the near and far clip distance values are automatically determined. In `manual` mode, the near and far clip distance values are user defined, constant values. Note that the mode automatically changes to `manual` whenever the `near` or `far` property is set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default auto
+     */
     mode?: string;
   }
 
-  export interface SceneViewConstraintsCollision {
+  export interface SceneViewConstraintsClipDistance extends AnonymousAccessor {
+    /**
+     * The near clip distance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
+    near?: number;
+    /**
+     * The far clip distance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
+    far?: number;
+    /**
+     * Specifies the mode of the constraint which is either `auto` or `manual`. In `auto` mode, the near and far clip distance values are automatically determined. In `manual` mode, the near and far clip distance values are user defined, constant values. Note that the mode automatically changes to `manual` whenever the `near` or `far` property is set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default auto
+     */
+    mode?: string;
+  }
+
+
+  export interface SceneViewConstraintsCollision extends Object {
+    /**
+     * Set to `false` to permit the user to navigate below the surface in a local SceneView.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default true
+     */
     enabled?: boolean;
   }
 
-  export interface SceneViewConstraintsTiltProperties {
-    max?: number;
-    mode?: string;
-  }
-  export interface SceneViewConstraintsTilt extends Accessor {
+
+  export interface SceneViewConstraintsTiltProperties extends Object {
+    /**
+     * Specifies the maximum amount of tilt (in degrees) allowed in the view and may range from 0.5 to 179.5 degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
     max?: number;
+    /**
+     * Specifies the mode of the constraint. There are two possible values: `auto` or `manual`. In `auto` mode, the maximum tilt value is automatically determined based on the altitude of the view camera. In `manual` mode, the maximum tilt value is a user defined, constant value. **Note:** The mode automatically changes to `manual` whenever the `max` property is set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default auto
+     */
     mode?: string;
   }
 
-  export interface SceneViewEnvironmentProperties {
+  export interface SceneViewConstraintsTilt extends AnonymousAccessor {
+    /**
+     * Specifies the maximum amount of tilt (in degrees) allowed in the view and may range from 0.5 to 179.5 degrees.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     */
+    max?: number;
+    /**
+     * Specifies the mode of the constraint. There are two possible values: `auto` or `manual`. In `auto` mode, the maximum tilt value is automatically determined based on the altitude of the view camera. In `manual` mode, the maximum tilt value is a user defined, constant value. **Note:** The mode automatically changes to `manual` whenever the `max` property is set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
+     * 
+     * @default auto
+     */
+    mode?: string;
+  }
+
+
+  export interface SceneViewEnvironmentProperties extends Object {
+    /**
+     * Lighting conditions of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     lighting?: SceneViewEnvironmentLightingProperties;
+    /**
+     * Indicates whether atmosphere visualization is enabled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     atmosphereEnabled?: boolean;
+    /**
+     * Atmosphere conditions of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     atmosphere?: SceneViewEnvironmentAtmosphereProperties;
+    /**
+     * Indicates whether stars visualization is enabled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default true
+     */
     starsEnabled?: boolean;
   }
-  export interface SceneViewEnvironment extends Accessor {
+
+  export interface SceneViewEnvironment extends AnonymousAccessor {
+    /**
+     * Lighting conditions of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     lighting?: SceneViewEnvironmentLighting;
+    /**
+     * Indicates whether atmosphere visualization is enabled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     atmosphereEnabled?: boolean;
+    /**
+     * Atmosphere conditions of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
     atmosphere?: SceneViewEnvironmentAtmosphere;
+    /**
+     * Indicates whether stars visualization is enabled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default true
+     */
     starsEnabled?: boolean;
   }
 
-  export interface SceneViewEnvironmentAtmosphereProperties {
-    quality?: string;
-  }
-  export interface SceneViewEnvironmentAtmosphere extends Accessor {
+
+  export interface SceneViewEnvironmentAtmosphereProperties extends Object {
+    /**
+     * Indicates the quality of the atmosphere visualization. The quality of the atmosphere may have a significant impact on performance. This setting does not have any effect in [local scenes](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode). 
+     * 
+     *   Known Value | Example
+     *   ------------|---------
+     *   low | ![scene-atmosphere](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-atmosphere.png)
+     *   high | ![scene-atmosphere](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-atmosphere-realistic.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default low
+     */
     quality?: string;
   }
 
-  export interface SceneViewEnvironmentLightingProperties {
+  export interface SceneViewEnvironmentAtmosphere extends AnonymousAccessor {
+    /**
+     * Indicates the quality of the atmosphere visualization. The quality of the atmosphere may have a significant impact on performance. This setting does not have any effect in [local scenes](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#viewingMode). 
+     * 
+     *   Known Value | Example
+     *   ------------|---------
+     *   low | ![scene-atmosphere](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-atmosphere.png)
+     *   high | ![scene-atmosphere](https://developers.arcgis.com/javascript/latest/assets/img/apiref/views/scene-atmosphere-realistic.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default low
+     */
+    quality?: string;
+  }
+
+
+  export interface SceneViewEnvironmentLightingProperties extends Object {
+    /**
+     * The current date and time of the simulated sun.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default new Date("March 15, 2015 12:00:00")
+     */
     date?: DateProperties;
+    /**
+     * Indicates whether to show shadows cast by the sun
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default false
+     */
     directShadowsEnabled?: boolean;
+    /**
+     * Indicates whether to show ambient occlusion shading.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default false
+     */
     ambientOcclusionEnabled?: boolean;
-    cameraTrackingEnabled?: boolean;
-  }
-  export interface SceneViewEnvironmentLighting extends Accessor {
-    date?: Date;
-    directShadowsEnabled?: boolean;
-    ambientOcclusionEnabled?: boolean;
+    /**
+     * Indicates whether the date and time of the simulated sun is automatically updated to maintain the current time of day while the camera changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default true
+     */
     cameraTrackingEnabled?: boolean;
   }
 
-  export interface SceneViewGoToOptions {
+  export interface SceneViewEnvironmentLighting extends AnonymousAccessor {
+    /**
+     * The current date and time of the simulated sun.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default new Date("March 15, 2015 12:00:00")
+     */
+    date?: Date;
+    /**
+     * Indicates whether to show shadows cast by the sun
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default false
+     */
+    directShadowsEnabled?: boolean;
+    /**
+     * Indicates whether to show ambient occlusion shading.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default false
+     */
+    ambientOcclusionEnabled?: boolean;
+    /**
+     * Indicates whether the date and time of the simulated sun is automatically updated to maintain the current time of day while the camera changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     * 
+     * @default true
+     */
+    cameraTrackingEnabled?: boolean;
+  }
+
+
+  export interface SceneViewGoToOptions extends Object {
+    /**
+     * Indicates if the transition to the new view should be animated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     * 
+     * @default true
+     */
     animate?: boolean;
+    /**
+     * Increases or decreases the animation speed by the specified factor. A speedFactor of 2 will make the animation twice as fast, while a speedFactor of 0.5 will make the animation half as fast. Setting the speed factor will automatically adapt the default maxDuration accordingly.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     * 
+     * @default 1
+     */
     speedFactor?: number;
+    /**
+     * Set the exact duration (in milliseconds) of the animation. Note that by default, animation duration is calculated based on the time required to reach the target at a constant speed. Setting duration overrides the speedFactor option. Note that the resulting duration is still limited to the maxDuration.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     duration?: number;
+    /**
+     * The maximum allowed duration (in milliseconds) of the animation. The default maxDuration value takes the specified speedFactor into account.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     * 
+     * @default 8000
+     */
     maxDuration?: number;
+    /**
+     * The easing function to use for the animation. This may either be a preset (named) function, or a user specified function. Supported named presets are: `linear`, `in-cubic`, `out-cubic`, `in-out-cubic`, `in-expo`, `out-expo`, `in-out-expo`  By default, animations that are less than 1000 ms use an out easing function; longer animations use an in-out function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     easing?: string | EasingFunction;
   }
 
-  export interface SceneViewGoToTarget {
+
+  export interface SceneViewGoToTarget extends Object {
+    /**
+     * The target of the animation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     target?: number[] | Geometry | Geometry[] | Graphic | Graphic[] | Viewpoint | Camera;
+    /**
+     * The [SceneView.center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#center) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     center?: number[];
+    /**
+     * The [SceneView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     scale?: number;
+    /**
+     * The final [zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom) value to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     zoom?: number;
+    /**
+     * The [Camera.heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     heading?: number;
+    /**
+     * The [Camera.tilt](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#position) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     tilt?: number;
+    /**
+     * The [Camera.position](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#position) to go to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
+     */
     position?: number;
   }
 
-  export interface SceneViewHighlightOptions {
-    color?: Color;
+
+  export interface SceneViewHighlightOptionsProperties extends Object {
+    /**
+     * The color of the highlight.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     * 
+     * @default #00ffff
+     */
+    color?: Color | number[] | string;
+    /**
+     * The opacity of the highlight halo. This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     * 
+     * @default 1
+     */
     haloOpacity?: number;
+    /**
+     * The opacity of the fill (area within the halo). This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     * 
+     * @default 0.25
+     */
     fillOpacity?: number;
   }
 
-  export interface SceneViewHitTestScreenPoint {
+  export interface SceneViewHighlightOptions extends AnonymousAccessor {
+    /**
+     * The color of the highlight.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     * 
+     * @default #00ffff
+     */
+    color?: Color;
+    /**
+     * The opacity of the highlight halo. This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     * 
+     * @default 1
+     */
+    haloOpacity?: number;
+    /**
+     * The opacity of the fill (area within the halo). This will be multiplied with the opacity specified in `color`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions)
+     * 
+     * @default 0.25
+     */
+    fillOpacity?: number;
+  }
+
+
+  export interface SceneViewHitTestScreenPoint extends Object {
+    /**
+     * The horizontal screen coordinate of the click on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#hitTest)
+     */
     x: number;
+    /**
+     * The vertical screen coordinate of the click on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#hitTest)
+     */
     y: number;
   }
 
-  export interface SceneViewToMapScreenPoint {
+
+  export interface SceneViewToMapScreenPoint extends Object {
+    /**
+     * The horizontal screen coordinate to convert.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#toMap)
+     */
     x: number;
+    /**
+     * The vertical screen coordinate to convert.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#toMap)
+     */
     y: number;
   }
 
-  export interface SceneViewDragEventOrigin {
+
+  export interface SceneViewDragEventOrigin extends Object {
+
     x: number;
+
     y: number;
   }
 
-  export interface SceneViewHitTestResultResults {
+
+  export interface SceneViewHitTestResultResults extends Object {
+    /**
+     * A graphic present in the view that intersects the input screen coordinates. If the graphic comes from a layer with an applied [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html), then the [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#symbol) property will be empty. Other properties will be empty based on the context in which the graphic is fetched.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#HitTestResult)
+     */
     graphic: Graphic;
+    /**
+     * The point geometry in the spatial reference of the view corresponding with the input screen coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#HitTestResult)
+     */
     mapPoint: Point;
   }
 
   interface DefaultUI extends UI {
+    /**
+     * An array of strings representing the default widgets visible when a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is created. The default widgets differ between MapView and SceneView.  The following are the default components in each view:  **MapView:** `["attribution", "zoom"]`  **SceneView:** `["attribution", "navigation-toggle", "compass", "zoom"]` 
+     * > Esri requires that when you use an ArcGIS Online basemap in your app, the map must include Esri attribution and you must be licensed to use the content. For detailed guidelines on working with attribution, please visit the official [attribution in your app](https://developers.arcgis.com/terms/attribution/) documentation. For information on terms of use, see the [Terms of Use FAQ](https://developers.arcgis.com/terms/faq/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html#components)
+     */
     components: string[];
   }
 
   interface DefaultUIConstructor {
+    /**
+     * The DefaultUI class exposes the default [widget](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html) [components](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html#components) available in either a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This class also provides a simple API for [adding](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html#add), [moving](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html#move) and [removing](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html#remove) [widgets](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html) and other HTML components from the view's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html)
+     */
+
     new(properties?: DefaultUIProperties): DefaultUI;
   }
 
   export const DefaultUI: DefaultUIConstructor;
 
   interface DefaultUIProperties extends UIProperties {
+    /**
+     * An array of strings representing the default widgets visible when a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is created. The default widgets differ between MapView and SceneView.  The following are the default components in each view:  **MapView:** `["attribution", "zoom"]`  **SceneView:** `["attribution", "navigation-toggle", "compass", "zoom"]` 
+     * > Esri requires that when you use an ArcGIS Online basemap in your app, the map must include Esri attribution and you must be licensed to use the content. For detailed guidelines on working with attribution, please visit the official [attribution in your app](https://developers.arcgis.com/terms/attribution/) documentation. For information on terms of use, see the [Terms of Use FAQ](https://developers.arcgis.com/terms/faq/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html#components)
+     */
     components?: string[];
   }
 
   interface UI extends Accessor {
+    /**
+     * The HTML Element that contains the the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#container)
+     */
     container: HTMLElement;
-    height: number;
+    /**
+     * The height of the UI container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#height)
+     */
+    readonly height: number;
+    /**
+     * Defines the padding for the UI from the top, left, right, and bottom sides of the container or [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). If the value is a number, it will be used to pad all sides of the container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#padding)
+     * 
+     * @default { left: 15, top: 15, right: 15, bottom: 15 }
+     */
     padding: any | number;
+    /**
+     * The view associated with the UI components.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#view)
+     */
     view: MapView | SceneView;
-    width: number;
+    /**
+     * The width of the UI container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#width)
+     */
+    readonly width: number;
 
+    /**
+     * Adds one or more HTML component(s) or [widgets](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html) to the UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#add)
+     * 
+     * @param component The component(s) to add to the UI. This can be a widget instance, HTML element, a string value representing a DOM node ID, or an array containing a combination of any of those types. See the example snippets below for code examples. Alternatively, you can pass an array of objects with the following specification.
+     * @param component.component The component to add to the UI. This can be a widget instance, HTML element, a string value representing a DOM node ID.
+     * @param component.position The position in the view at which to add the component. If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * @param component.index The placement index of the component. This index shows where to place the component relative to other components. For example a value of `0` would place it topmost when position is top-*, leftmost for bottom-left and right most for bottom-right.
+     * @param position The position in the view at which to add the component. If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * @param position.position The position in the view at which to add the component(s). If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * @param position.index The placement index of the component(s). This index shows where to place the component relative to other components. For example a value of `0` would place it topmost when position is top-*, leftmost for bottom-left and right most for bottom-right.
+     * 
+     */
     add(component: Widget | HTMLElement | string | any[] | UIAddComponent, position?: string | UIAddPosition): void;
+    /**
+     * Removes all components from a given position.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#empty)
+     * 
+     * @param position The position from which to remove all components. If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * 
+     */
     empty(position?: string): void;
+    /**
+     * Moves one or more UI component(s) to the specified position.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#move)
+     * 
+     * @param component The component(s) to move. This value can be a widget instance, HTML element, a string value representing a DOM node ID, or an array containing a combination of any of those types. See the example snippets below for code examples. Alternatively, you can pass an array of objects with the following specification.
+     * @param component.component The component to move. This can be a widget instance, HTML element, a string value representing a DOM node ID.
+     * @param component.position The destination position. The component will be placed in the UI [container](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#container) when not provided. If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * @param position The destination position. The component will be placed in the UI [container](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#container) when not provided. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * 
+     */
     move(component: Widget | HTMLElement | string | any[] | UIMoveComponent, position?: string): void;
+    /**
+     * Removes one or more HTML component(s) or [widgets](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html) from the UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#remove)
+     * 
+     * @param component The component(s) to remove from the UI. This can be a widget instance, HTML element, a string value representing a DOM node ID, or an array containing a combination of any of those types. See the example snippets below for code examples.
+     * 
+     */
     remove(component: Widget | HTMLElement | string | any[]): void;
   }
 
   interface UIConstructor {
+    /**
+     * This class provides a simple interface for [adding](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#add), [moving](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#move) and [removing](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#remove) components from a view's user interface (UI). In most cases, you will work with the view's [DefaultUI](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-DefaultUI.html) which places default [widgets](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html), such as [Zoom](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html) and [Attribution](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html) in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html)
+     */
+
     new(properties?: UIProperties): UI;
   }
 
   export const UI: UIConstructor;
 
   interface UIProperties {
+    /**
+     * The HTML Element that contains the the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#container)
+     */
     container?: HTMLElement;
-    height?: number;
+    /**
+     * Defines the padding for the UI from the top, left, right, and bottom sides of the container or [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html). If the value is a number, it will be used to pad all sides of the container.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#padding)
+     * 
+     * @default { left: 15, top: 15, right: 15, bottom: 15 }
+     */
     padding?: any | number;
+    /**
+     * The view associated with the UI components.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
-    width?: number;
   }
 
-  export interface UIAddComponent {
+
+  export interface UIAddComponent extends Object {
+    /**
+     * The component to add to the UI. This can be a widget instance, HTML element, a string value representing a DOM node ID.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#add)
+     */
     component: Widget | HTMLElement | string;
+    /**
+     * The position in the view at which to add the component. If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#add)
+     */
     position?: string;
+    /**
+     * The placement index of the component. This index shows where to place the component relative to other components. For example a value of `0` would place it topmost when position is top-*, leftmost for bottom-left and right most for bottom-right.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#add)
+     */
     index?: number;
   }
 
-  export interface UIAddPosition {
+
+  export interface UIAddPosition extends Object {
+    /**
+     * The position in the view at which to add the component(s). If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#add)
+     */
     position?: string;
+    /**
+     * The placement index of the component(s). This index shows where to place the component relative to other components. For example a value of `0` would place it topmost when position is top-*, leftmost for bottom-left and right most for bottom-right.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#add)
+     */
     index: number;
   }
 
-  export interface UIMoveComponent {
+
+  export interface UIMoveComponent extends Object {
+    /**
+     * The component to move. This can be a widget instance, HTML element, a string value representing a DOM node ID.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#move)
+     */
     component: Widget | HTMLElement | string;
+    /**
+     * The destination position. The component will be placed in the UI [container](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#container) when not provided. If not specified, `manual` is used by default. **Known Values:** top-left | top-right | bottom-left | bottom-right | manual
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ui-UI.html#move)
+     */
     position?: string;
   }
 
   interface View extends Accessor, corePromise, DOMContainer {
+    /**
+     * Collection containing a flat list of all the created [LayerViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) related to the basemap, operational layers, and group layers in this view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#allLayerViews)
+     */
     allLayerViews: Collection<LayerView>;
+    /**
+     * Represents an ongoing view animation initialized by [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo). You may [watch](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html#watch) this property to be notified when the view's extent changes .
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#animation)
+     */
     animation: ViewAnimation;
+    /**
+     * Allows for adding [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) directly to the default graphics in the View.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#graphics)
+     */
     graphics: Collection<Graphic>;
-    interacting: boolean;
+    /**
+     * Indication whether the view is being interacted with (for example when panning).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#interacting)
+     * 
+     * @default false
+     */
+    readonly interacting: boolean;
+    /**
+     * A collection containing a hierarchical list of all the created [LayerViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) of the [operational layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) in the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#layerViews)
+     */
     layerViews: Collection<LayerView>;
+    /**
+     * An instance of a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) object to display in the view. A view may only display one map at a time. On the other hand, one [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) may be viewed by multiple [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) and/or [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) simultaneously.  This property is typically set in the constructor of the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [class description](#) for examples demonstrating the relationship between the map and the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map)
+     */
     map: Map;
+    /**
+     * Use the padding property to make the [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center), and [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#extent), etc. work off a subsection of the full view. This is particularly useful when layering UI elements or semi-transparent content on top of portions of the view. See the [view padding sample](https://developers.arcgis.com/javascript/latest/sample-code/view-padding/index.html) for an example of how this works.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#padding)
+     * 
+     * @default {left: 0, top: 0, right: 0, bottom: 0}
+     */
     padding: ViewPadding;
-    ready: boolean;
+    /**
+     * When `true`, this property indicates whether the view successfully satisfied all dependencies, signaling that the following conditions are met. 
+     *   * The view has a [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map). If [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) is a [WebMap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html) or a [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html), then the map or scene must be [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#loaded).
+     *   * The view has a [container](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#container) with a size greater than `0`.
+     *   * The view has a [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#spatialReference).
+     *   
+     *   
+     * When a view becomes ready it will resolve itself and invoke the callback defined in [when()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#when) where code can execute on a working view. Subsequent changes to a view's readiness would typically be handled by watching `view.ready` and providing logic for cases where the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) or [container](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#container) change.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#ready)
+     * 
+     * @default false
+     */
+    readonly ready: boolean;
+    /**
+     * The spatial reference of the view. This indicates the [Projected Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) or the [Geographic Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) used to locate geographic features in the map. In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) the following [supported coordinate systems](esri-views-SceneView.html#supported-coordinate-systems) are available.  The spatial reference can either be set explicitly or automatically derived from the following: 
+     *   * In the case of a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), if the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#map) is a [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html) instance, the [WebScene.initialViewProperties.spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#initialViewProperties) is used.
+     *   * In all other cases, the spatial reference is derived from the first layer that loads in this order:
+     *   * [map.basemap.baseLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#baseLayers)
+     *   * [map.layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers)
+     *   * [map.ground.layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers)
+     *   
+     *   
+     * When using an [Esri basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap), the default spatial reference is Web Mercator Auxiliary Sphere.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#spatialReference)
+     * 
+     * @default null
+     */
     spatialReference: SpatialReference;
-    stationary: boolean;
-    type: string;
-    updating: boolean;
+    /**
+     * Indication whether the view is animating, being interacted with or resizing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#stationary)
+     * 
+     * @default true
+     */
+    readonly stationary: boolean;
+    /**
+     * The type of the view is either `2d` (indicating a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html)) or `3d` (indicating a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html)).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#type)
+     */
+    readonly type: string;
+    /**
+     * Indicates whether the view is being updated by additional data requests to the network, or by processing received data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#updating)
+     * 
+     * @default false
+     */
+    readonly updating: boolean;
 
+    /**
+     * Gets the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) created on the view for the given layer. The returned promise resolves when the layer view for the given layer has been created, or rejects with an error (for example if the layer is not part of the view, or if the layer type is not supported in this view).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#whenLayerView)
+     * 
+     * @param layer The layer for which to obtain its LayerView.
+     * 
+     */
     whenLayerView(layer: Layer): IPromise<LayerView>;
   }
 
   interface ViewConstructor {
+    /**
+     * A view provides the means of viewing and interacting with the components of a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html). The [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) is merely a container, storing the geographic information contained in base layers and operational layers. The View renders the [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) and its various [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers), making them visible to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html)
+     */
+
     new(properties?: ViewProperties): View;
   }
 
   export const View: ViewConstructor;
 
   interface ViewProperties extends DOMContainerProperties {
+    /**
+     * Collection containing a flat list of all the created [LayerViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) related to the basemap, operational layers, and group layers in this view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#allLayerViews)
+     */
     allLayerViews?: CollectionProperties<LayerViewProperties>;
+    /**
+     * Represents an ongoing view animation initialized by [goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo). You may [watch](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Accessor.html#watch) this property to be notified when the view's extent changes .
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#animation)
+     */
     animation?: ViewAnimationProperties;
+    /**
+     * Allows for adding [graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html) directly to the default graphics in the View.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#graphics)
+     */
     graphics?: CollectionProperties<GraphicProperties>;
-    interacting?: boolean;
+    /**
+     * A collection containing a hierarchical list of all the created [LayerViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) of the [operational layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers) in the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#layerViews)
+     */
     layerViews?: CollectionProperties<LayerViewProperties>;
+    /**
+     * An instance of a [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) object to display in the view. A view may only display one map at a time. On the other hand, one [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html) may be viewed by multiple [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) and/or [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) simultaneously.  This property is typically set in the constructor of the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). See the [class description](#) for examples demonstrating the relationship between the map and the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map)
+     */
     map?: MapProperties;
+    /**
+     * Use the padding property to make the [center](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#center), and [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#extent), etc. work off a subsection of the full view. This is particularly useful when layering UI elements or semi-transparent content on top of portions of the view. See the [view padding sample](https://developers.arcgis.com/javascript/latest/sample-code/view-padding/index.html) for an example of how this works.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#padding)
+     * 
+     * @default {left: 0, top: 0, right: 0, bottom: 0}
+     */
     padding?: ViewPadding;
-    ready?: boolean;
+    /**
+     * The spatial reference of the view. This indicates the [Projected Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) or the [Geographic Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) used to locate geographic features in the map. In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) the following [supported coordinate systems](esri-views-SceneView.html#supported-coordinate-systems) are available.  The spatial reference can either be set explicitly or automatically derived from the following: 
+     *   * In the case of a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), if the [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#map) is a [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html) instance, the [WebScene.initialViewProperties.spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#initialViewProperties) is used.
+     *   * In all other cases, the spatial reference is derived from the first layer that loads in this order:
+     *   * [map.basemap.baseLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#baseLayers)
+     *   * [map.layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#layers)
+     *   * [map.ground.layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers)
+     *   
+     *   
+     * When using an [Esri basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap), the default spatial reference is Web Mercator Auxiliary Sphere.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#spatialReference)
+     * 
+     * @default null
+     */
     spatialReference?: SpatialReferenceProperties;
-    stationary?: boolean;
-    type?: string;
-    updating?: boolean;
   }
 
-  export interface ViewPadding {
+
+  export interface ViewPadding extends Object {
+    /**
+     * The left padding (in pixels).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#padding)
+     */
     left?: number;
+    /**
+     * The top padding (in pixels).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#padding)
+     */
     top?: number;
+    /**
+     * The right padding (in pixels).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#padding)
+     */
     right?: number;
+    /**
+     * The bottom padding (in pixels).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#padding)
+     */
     bottom?: number;
   }
 
   interface ViewAnimation extends Accessor, corePromise {
-    state: string;
+    /**
+     * The state of the animation.  The animation terminates when the state is either `finished` or `stopped` and cannot transition again to `running`. The `finished` state indicates the animation has successfully ended, while the `stopped` state indicates that the animation was interrupted before it reached its final target.  **Known Values:** running | finished | stopped
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html#state)
+     * 
+     * @default running
+     */
+    readonly state: string;
+    /**
+     * The target of the animation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html#target)
+     */
     target: Viewpoint;
 
+    /**
+     * Finishes the view animation by immediately going to the target and sets the state of the animation to `finished`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html#finish)
+     * 
+     * 
+     */
     finish(): void;
+    /**
+     * Stops the view animation at its current state and sets the state of the animation to `stopped`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html#stop)
+     * 
+     * 
+     */
     stop(): void;
   }
 
   interface ViewAnimationConstructor {
+    /**
+     * Contains a [state](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html#state) property used for checking the state of the animation. The view animation is resolved when the animation has `finished` and is rejected if it is `stopped`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html)
+     */
+
     new(properties?: ViewAnimationProperties): ViewAnimation;
   }
 
   export const ViewAnimation: ViewAnimationConstructor;
 
   interface ViewAnimationProperties {
-    state?: string;
+    /**
+     * The target of the animation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html#target)
+     */
     target?: ViewpointProperties;
   }
 
   interface WebMap extends Map, corePromise {
+    /**
+     * Object responsible for containing the viewing and editing properties of the WebMap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#applicationProperties)
+     */
     applicationProperties: any;
+    /**
+     * An array of saved geographic extents that allow end users to quickly navigate to a particular area of interest.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#bookmarks)
+     */
     bookmarks: any[];
+    /**
+     * The initial view of the WebMap. This object contains properties such as [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#viewpoint), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#spatialReference), that should be applied to the view when the WebMap loads.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#initialViewProperties)
+     */
     initialViewProperties: InitialViewProperties;
-    loaded: boolean;
-    loadError: Error;
-    loadStatus: string;
+    /**
+     * Indicates whether the instance has loaded. When `true`, the properties of the object can be accessed. A WebMap is considered loaded when its [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#layers) and [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#basemap) are created, but not yet loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#loaded)
+     * 
+     * @default false
+     */
+    readonly loaded: boolean;
+    /**
+     * The Error object returned if an error occurred while loading.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#loadError)
+     * 
+     * @default null
+     */
+    readonly loadError: Error;
+    /**
+     * Represents the status of a [load](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#load) operation. 
+     * 
+     * Value | Description
+     * ------|------------
+     * not-loaded | The object's resources have not loaded.
+     * loading | The object's resources are currently loading.
+     * loaded | The object's resources have loaded without errors.
+     * failed | The object's resources failed to load. See [loadError](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#loadError) for more details.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#loadStatus)
+     * 
+     * @default not-loaded
+     */
+    readonly loadStatus: string;
+    /**
+     * The portal item from which the WebMap is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#portalItem)
+     */
     portalItem: PortalItem;
+    /**
+     * Provides multiple slides. Each slide has a different "title", "extent", "basemap", "layers" etc.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#presentation)
+     */
     presentation: any;
-    sourceVersion: WebMapSourceVersion;
+    /**
+     * The version of the source document from which the WebMap was read. The WebMap must be version 2.x to load into an app.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#sourceVersion)
+     */
+    readonly sourceVersion: WebMapSourceVersion;
+    /**
+     * An array of table objects in the WebMap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#tables)
+     */
     tables: any[];
+    /**
+     * The widgets object contains widgets that should be exposed to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#widgets)
+     */
     widgets: any;
 
+    /**
+     * Triggers the loading of the WebMap instance.  A WebMap is considered [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#loaded) when its [operational layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#layers) and [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#basemap) are fully created. When created with a [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#portalItem), `load()` will first fetch its data to create the content, otherwise it resolves immediately.  The [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) automatically calls the `load()` method when a WebMap instance is added to its [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#map) property so it can display in the view and load each individual layer. If the WebMap is used outside of a view, for example to preload it, you must call `load()` explicitly to interact with its resources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#load)
+     * 
+     * 
+     */
     load(): IPromise<any>;
   }
 
   interface WebMapConstructor {
+    /**
+     * Loads a [WebMap](https://doc.arcgis.com/en/arcgis-online/create-maps/make-your-first-map.htm) from [ArcGIS Online](https://www.arcgis.com/home/) or [Portal for ArcGIS](http://server.arcgis.com/en/portal/) into a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html)
+     */
+
     new(properties?: WebMapProperties): WebMap;
   }
 
   export const WebMap: WebMapConstructor;
 
   interface WebMapProperties extends MapProperties {
+    /**
+     * Object responsible for containing the viewing and editing properties of the WebMap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#applicationProperties)
+     */
     applicationProperties?: any;
+    /**
+     * An array of saved geographic extents that allow end users to quickly navigate to a particular area of interest.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#bookmarks)
+     */
     bookmarks?: any[];
+    /**
+     * The initial view of the WebMap. This object contains properties such as [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#viewpoint), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#spatialReference), that should be applied to the view when the WebMap loads.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#initialViewProperties)
+     */
     initialViewProperties?: InitialViewPropertiesProperties;
-    loaded?: boolean;
-    loadError?: Error;
-    loadStatus?: string;
+    /**
+     * The portal item from which the WebMap is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#portalItem)
+     */
     portalItem?: PortalItemProperties;
+    /**
+     * Provides multiple slides. Each slide has a different "title", "extent", "basemap", "layers" etc.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#presentation)
+     */
     presentation?: any;
-    sourceVersion?: WebMapSourceVersion;
+    /**
+     * An array of table objects in the WebMap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#tables)
+     */
     tables?: any[];
+    /**
+     * The widgets object contains widgets that should be exposed to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#widgets)
+     */
     widgets?: any;
   }
 
   interface InitialViewProperties extends Accessor, corePromise {
+    /**
+     * The spatial reference of the [WebMap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html). This indicates the [Projected Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) or the [Geographic Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) used to locate geographic features in the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#spatialReference)
+     */
     spatialReference: SpatialReference;
+    /**
+     * The initial viewpoint of the [WebMap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#viewpoint)
+     */
     viewpoint: Viewpoint;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#clone)
+     * 
+     * 
+     */
     clone(): InitialViewProperties;
   }
 
   interface InitialViewPropertiesConstructor {
+
+
     new(properties?: InitialViewPropertiesProperties): InitialViewProperties;
   }
 
   export const InitialViewProperties: InitialViewPropertiesConstructor;
 
   interface InitialViewPropertiesProperties {
+    /**
+     * The spatial reference of the [WebMap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html). This indicates the [Projected Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) or the [Geographic Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) used to locate geographic features in the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
+    /**
+     * The initial viewpoint of the [WebMap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webmap-InitialViewProperties.html#viewpoint)
+     */
     viewpoint?: ViewpointProperties;
   }
 
-  export interface WebMapSourceVersion {
+
+  export interface WebMapSourceVersion extends Object {
+    /**
+     * The major version of the WebMap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#sourceVersion)
+     */
     major: number;
+    /**
+     * The minor version of the WebMap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#sourceVersion)
+     */
     minor: number;
   }
 
   interface WebScene extends Map, corePromise {
+    /**
+     * *This property only applies to local scenes.* Represents an optional clipping area used to define the bounds or [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of a local scene. If defined, only data (including the basemap) within the area will be displayed.  Set the [clippingEnabled](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingEnabled) property to `true` to apply the specified clippingArea to the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingArea)
+     */
     clippingArea: Extent;
+    /**
+     * *This property only applies to local scenes.* Determines whether clipping using the [clippingArea](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingArea) is enabled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingEnabled)
+     * 
+     * @default false
+     */
     clippingEnabled: boolean;
+    /**
+     * The height model info of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html). This object defines the characteristics of the vertical coordinate system used by the scene. In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), the height model info is used to avoid combining layers that have incompatible vertical coordinate systems.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#heightModelInfo)
+     */
     heightModelInfo: HeightModelInfo;
+    /**
+     * The initial view of the WebScene. This object contains properties such as [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewpoint), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#spatialReference), [viewingMode](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewingMode), and [environment](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#environment) that should be applied to the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) when the scene loads.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#initialViewProperties)
+     */
     initialViewProperties: websceneInitialViewProperties;
-    loaded: boolean;
-    loadError: Error;
-    loadStatus: string;
+    /**
+     * Indicates whether the instance has loaded. When `true`, the properties of the object can be accessed. A WebScene is considered loaded when its [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#layers) and [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#basemap) are fully created, but not yet loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#loaded)
+     * 
+     * @default false
+     */
+    readonly loaded: boolean;
+    /**
+     * The Error object returned if an error occurred while loading.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#loadError)
+     * 
+     * @default null
+     */
+    readonly loadError: Error;
+    /**
+     * Represents the status of a [load](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#load) operation. 
+     * 
+     * Value | Description
+     * ------|------------
+     * not-loaded | The object's resources have not loaded.
+     * loading | The object's resources are currently loading.
+     * loaded | The object's resources have loaded without errors.
+     * failed | The object's resources failed to load. See [loadError](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#loadError) for more details.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#loadStatus)
+     * 
+     * @default not-loaded
+     */
+    readonly loadStatus: string;
+    /**
+     * The portal item from which the WebScene is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#portalItem)
+     */
     portalItem: PortalItem;
+    /**
+     * Provides a [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of slides that act as bookmarks for saving predefined [viewpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) and visible layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#presentation)
+     */
     presentation: Presentation;
-    sourceVersion: WebSceneSourceVersion;
+    /**
+     * The version of the source document from which the WebScene was read. The WebScene must be version 1.x to load into an app.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#sourceVersion)
+     */
+    readonly sourceVersion: WebSceneSourceVersion;
 
+    /**
+     * Triggers the loading of the WebScene instance.  A WebScene is considered [loaded](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#loaded) when its [operational layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#layers), [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#basemap) and [ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#ground) are fully created. When created with a [portalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#portalItem), `load()` will first fetch its data to create the content, otherwise it resolves immediately.  The [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) automatically calls the `load()` method when a WebScene instance is added to its [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#map) property so it can display in the view and load each individual layer. If the WebScene is used outside of a view, for example to preload it, you must call `load()` explicitly to interact with its resources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#load)
+     * 
+     * 
+     */
     load(): IPromise<any>;
+    /**
+     * Saves the webscene to its associated portal item. The portal item to save to must already exist and be valid. This is a convenience method that will use [PortalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#update) to store the webscene in the item. The web scene is saved according to [web scene specification](https://developers.arcgis.com/web-scene-specification/) standards.  Use [updateFrom](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#updateFrom) to store the current view properties in the webscene before saving it.  Note that this saves the webscene to its existing item. Depending on how the scene is shared, users that do not own the scene may modify it. To save an existing scene as a new item owned by the user signed into the portal instance, use [saveAs()](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#saveAs).  The webscene will be automatically loaded if it is not already before saving.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#save)
+     * 
+     * @param options Additional options.
+     * @param options.ignoreUnsupported When `true`, the scene will save even if it contains unsupported content (layers, renderers, symbols). Any content that is not supported will not be saved and the scene may appear different when reloaded from its portal item.
+     * 
+     */
     save(options?: WebSceneSaveOptions): IPromise<PortalItem>;
-    saveAs(portalItem: PortalItem, options?: WebSceneSaveAsOptions): IPromise<PortalItem>;
+    /**
+     * Saves the webscene to a new portal item. If saving has completed successfully, then the saved portal item will be set in the portalItem property of the WebScene. This is a convenience method that will create a new [PortalItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html) and use [PortalUser.addItem()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#addItem) to store the webscene in a [Portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html).  Use [updateFrom](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#updateFrom) to store the current view properties in the webscene before saving it.  Note that this always saves the webscene as a new portal item owned by the user performing the edits and executing the `saveAs()` method. If you want to modify the existing item without changing its ownership use [save()](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#save).  The webscene will be automatically loaded if it is not already before saving.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#saveAs)
+     * 
+     * @param portalItem The new portal item to which the scene will be saved.  Portal item properties such as the title or description need to be explicitly set on the item and will not be automatically copied from the current associated scene portal item (if any).
+     * @param options additional save options.
+     * @param options.folder the folder in which to save the item.
+     * @param options.ignoreUnsupported allow the scene to be saved even in the case it contains unsupported content (layers, renderers, symbols). Any content that is not supported will not be saved and the scene may appear different when reloaded from its portal item.
+     * 
+     */
+    saveAs(portalItem: PortalItem | PortalItemProperties, options?: WebSceneSaveAsOptions): IPromise<PortalItem>;
+    /**
+     * Converts an instance of [this class]() to its ArcGIS Portal JSON representation. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide and the [web scene specification](https://developers.arcgis.com/web-scene-specification/) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#toJSON)
+     * 
+     * 
+     */
     toJSON(): any;
+    /**
+     * Update properties of the WebScene related to the view. This should usually be called just before saving a scene. The following properties are updated from the view:  1. `initialViewProperties.spatialReference` 2. `initialViewProperties.viewingMode` 3. `clippingArea` 4. `heightModelInfo`  Depending on the provided options, the following properties are also updated:  1. `initialViewProperties.environment` 1. `initialViewProperties.viewpoint`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#updateFrom)
+     * 
+     * @param view the view to update from.
+     * @param options update options.
+     * @param options.environmentExcluded update the initial environment from the view, defaults to false.
+     * @param options.viewpointExcluded update the initial viewpoint from the view, defaults to false.
+     * 
+     */
     updateFrom(view: SceneView, options?: WebSceneUpdateFromOptions): void;
   }
 
   interface WebSceneConstructor {
+    /**
+     * The web scene is the core element of 3D mapping across the ArcGIS platform. It defines the content, style, environment, and slides of your scene and it can be shared across multiple ArcGIS web and desktop applications. Web scenes can be created, published, and consumed in [ArcGIS Pro](http://pro.arcgis.com/en/pro-app/help/mapping/map-authoring/author-a-web-scene.htm) and ArcGIS Online with the [Scene Viewer](http://server.arcgis.com/en/portal/latest/use/make-your-first-scene.htm). The web scene is saved as a JSON document that can be consumed by the ArcGIS API for JavaScript via the WebScene class to easily create compelling 3D applications. The JSON document is written according to the [web scene specification](https://developers.arcgis.com/web-scene-specification/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html)
+     */
+
     new(properties?: WebSceneProperties): WebScene;
 
 
+    /**
+     * Creates a new instance of [this class]() and initializes it with values from a JSON object generated from a product in the ArcGIS platform. The object passed into the input `json` parameter often comes from a response to a query operation in the REST API or a [toJSON()](http://pro.arcgis.com/en/pro-app/tool-reference/conversion/features-to-json.htm) method from another ArcGIS product. If the [WebScene]() is used outside of a view, you must call [load()](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#load) explicitly to interact with its resources. See the [Using fromJSON()](https://developers.arcgis.com/javascript/latest/guide/using-fromjson/index.html) topic in the Guide for details and examples of when and how to use this function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#fromJSON)
+     * 
+     * @param json A JSON representation of the instance in the ArcGIS format. See the [web scene specification](https://developers.arcgis.com/web-scene-specification/) for more detailed information on serializing web scenes to JSON.
+     * 
+     */
     fromJSON(json: any): any;
   }
 
   export const WebScene: WebSceneConstructor;
 
   interface WebSceneProperties extends MapProperties {
+    /**
+     * *This property only applies to local scenes.* Represents an optional clipping area used to define the bounds or [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) of a local scene. If defined, only data (including the basemap) within the area will be displayed.  Set the [clippingEnabled](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingEnabled) property to `true` to apply the specified clippingArea to the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingArea)
+     */
     clippingArea?: ExtentProperties;
+    /**
+     * *This property only applies to local scenes.* Determines whether clipping using the [clippingArea](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingArea) is enabled.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#clippingEnabled)
+     * 
+     * @default false
+     */
     clippingEnabled?: boolean;
+    /**
+     * The height model info of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html). This object defines the characteristics of the vertical coordinate system used by the scene. In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), the height model info is used to avoid combining layers that have incompatible vertical coordinate systems.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#heightModelInfo)
+     */
     heightModelInfo?: HeightModelInfoProperties;
+    /**
+     * The initial view of the WebScene. This object contains properties such as [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewpoint), [spatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#spatialReference), [viewingMode](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewingMode), and [environment](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#environment) that should be applied to the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) when the scene loads.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#initialViewProperties)
+     */
     initialViewProperties?: websceneInitialViewPropertiesProperties;
-    loaded?: boolean;
-    loadError?: Error;
-    loadStatus?: string;
+    /**
+     * The portal item from which the WebScene is loaded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#portalItem)
+     */
     portalItem?: PortalItemProperties;
+    /**
+     * Provides a [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of slides that act as bookmarks for saving predefined [viewpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) and visible layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#presentation)
+     */
     presentation?: PresentationProperties;
-    sourceVersion?: WebSceneSourceVersion;
   }
 
   interface Environment extends Accessor {
+    /**
+     * Settings for defining the lighting of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#lighting)
+     */
     lighting: Lighting;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#clone)
+     * 
+     * 
+     */
     clone(): Environment;
   }
 
   interface EnvironmentConstructor {
+
+
     new(properties?: EnvironmentProperties): Environment;
   }
 
   export const Environment: EnvironmentConstructor;
 
   interface EnvironmentProperties {
+    /**
+     * Settings for defining the lighting of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#lighting)
+     */
     lighting?: LightingProperties;
   }
 
   interface websceneInitialViewProperties extends Accessor, corePromise {
+    /**
+     * The initial environment settings of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#environment)
+     */
     environment: Environment;
+    /**
+     * The spatial reference of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html). This indicates the [Projected Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) or the [Geographic Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) used to locate geographic features in the map. In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) the following [supported coordinate systems](esri-views-SceneView.html#supported-coordinate-systems) are available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#spatialReference)
+     */
     spatialReference: SpatialReference;
+    /**
+     * The viewing mode of the scene. Global scenes allow the user to navigate the globe. Local scenes allow for navigation and feature display in a particular "localized" area. Users may also navigate the view's camera below the surface of a basemap in local scenes.  **Known Values:** global | local
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewingMode)
+     * 
+     * @default global
+     */
     viewingMode: string;
+    /**
+     * The initial viewpoint of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewpoint)
+     */
     viewpoint: Viewpoint;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#clone)
+     * 
+     * 
+     */
     clone(): websceneInitialViewProperties;
   }
 
   interface websceneInitialViewPropertiesConstructor {
+
+
     new(properties?: websceneInitialViewPropertiesProperties): websceneInitialViewProperties;
   }
 
   export const websceneInitialViewProperties: websceneInitialViewPropertiesConstructor;
 
   interface websceneInitialViewPropertiesProperties {
+    /**
+     * The initial environment settings of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#environment)
+     */
     environment?: EnvironmentProperties;
+    /**
+     * The spatial reference of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html). This indicates the [Projected Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Projected_coordinate_systems/02r3000000vt000000/) or the [Geographic Coordinate System](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Geographic_coordinate_systems/02r300000105000000/) used to locate geographic features in the map. In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) the following [supported coordinate systems](esri-views-SceneView.html#supported-coordinate-systems) are available.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#spatialReference)
+     */
     spatialReference?: SpatialReferenceProperties;
+    /**
+     * The viewing mode of the scene. Global scenes allow the user to navigate the globe. Local scenes allow for navigation and feature display in a particular "localized" area. Users may also navigate the view's camera below the surface of a basemap in local scenes.  **Known Values:** global | local
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewingMode)
+     * 
+     * @default global
+     */
     viewingMode?: string;
+    /**
+     * The initial viewpoint of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewpoint)
+     */
     viewpoint?: ViewpointProperties;
   }
 
   interface Lighting extends Accessor, corePromise {
+    /**
+     * The time and date for which the sun position and light direction is computed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#date)
+     * 
+     * @default null
+     */
     date: Date;
+    /**
+     * The type of direct shadows.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#directShadowsEnabled)
+     * 
+     * @default false
+     */
     directShadowsEnabled: boolean;
+    /**
+     * The UTC timezone offset in hours that should be displayed in the UI to represent the date. This value does not have an impact on the actual lighting of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#displayUTCOffset)
+     * 
+     * @default null
+     */
     displayUTCOffset: number;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#clone)
+     * 
+     * 
+     */
     clone(): Lighting;
   }
 
   interface LightingConstructor {
+
+
     new(properties?: LightingProperties): Lighting;
   }
 
   export const Lighting: LightingConstructor;
 
   interface LightingProperties {
+    /**
+     * The time and date for which the sun position and light direction is computed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#date)
+     * 
+     * @default null
+     */
     date?: DateProperties;
+    /**
+     * The type of direct shadows.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#directShadowsEnabled)
+     * 
+     * @default false
+     */
     directShadowsEnabled?: boolean;
+    /**
+     * The UTC timezone offset in hours that should be displayed in the UI to represent the date. This value does not have an impact on the actual lighting of the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#displayUTCOffset)
+     * 
+     * @default null
+     */
     displayUTCOffset?: number;
   }
 
   interface Presentation extends Accessor {
+    /**
+     * A collection of [slides](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html) that bookmark [viewpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html), visible layers, and other settings previously defined in a [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html#slides)
+     */
     slides: Collection<Slide>;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html#clone)
+     * 
+     * 
+     */
     clone(): Presentation;
   }
 
   interface PresentationConstructor {
+
+
     new(properties?: PresentationProperties): Presentation;
   }
 
   export const Presentation: PresentationConstructor;
 
   interface PresentationProperties {
+    /**
+     * A collection of [slides](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html) that bookmark [viewpoints](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html), visible layers, and other settings previously defined in a [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html#slides)
+     */
     slides?: CollectionProperties<SlideProperties>;
   }
 
   interface Slide extends Accessor {
-    basemap: Basemap | string;
+    /**
+     * The basemap of the scene. Only the [base](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#baseLayers) and [reference](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#referenceLayers) layers of the basemap are stored in a slide.  This value can be an instance of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) or one of the strings listed in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * streets | ![basemap-streets](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets.jpg)
+     * satellite | ![basemap-satellite](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/satellite.jpg)
+     * hybrid | ![basemap-hybrid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/hybrid.jpg)
+     * topo | ![basemap-topo](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/topo.jpg)
+     * gray | ![basemap-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/gray.jpg)
+     * dark-gray | ![basemap-dark-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/dark-gray.jpg)
+     * oceans | ![basemap-oceans](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/oceans.jpg)
+     * national-geographic | ![basemap-national-geographic](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/national-geographic.jpg)
+     * terrain | ![basemap-terrain](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/terrain.jpg)
+     * osm | ![basemap-osm](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/osm.jpg)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#basemap)
+     */
+    basemap: Basemap;
+    /**
+     * The description of the slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#description)
+     */
     description: SlideDescription;
+    /**
+     * Represents settings that affect the environment in which the WebScene is displayed (such as lighting).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#environment)
+     */
     environment: Environment;
+    /**
+     * The unique id of a slide within the [slides property](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html#slides) of a [Presentation](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#id)
+     */
     id: string;
+    /**
+     * A data URI encoded thumbnail.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#thumbnail)
+     */
     thumbnail: SlideThumbnail;
+    /**
+     * The title of the slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#title)
+     */
     title: SlideTitle;
+    /**
+     * The viewpoint of the slide. This acts like a bookmark, saving a predefined location or point of view from which to view the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#viewpoint)
+     */
     viewpoint: Viewpoint;
+    /**
+     * The visible layers of the scene. This is a collection of objects that stores references (by ID) to the [scene layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#layers) and [ground layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers) that are set as `visible` when a slide is applied to a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  When assigning visible layers, the following types of values will be automatically casted: 
+     *   * Array (or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html)) of [Layer instances](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html): `[layerInstance, layerInstance]`
+     *   * Array (or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html)) of [Layer IDs](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#id): `["layer-1", "layer-2"]`
+     *   
+     *   
+     * The specification for each object in the collection is outlined in the table below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#visibleLayers)
+     */
     visibleLayers: Collection<SlideVisibleLayers>;
 
+    /**
+     * Applies a slide's settings to a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#applyTo)
+     * 
+     * @param view The SceneView the slide should be applied to.
+     * @param options Animation options. See properties below for object specifications.
+     * @param options.animate Indicates whether to animate the slide transition.
+     * @param options.speedFactor Increases or decreases the animation speed by the specified factor. A speedFactor of 2 will make the animation twice as fast, while a speedFactor of 0.5 will make the animation half as fast. Setting the speed factor will automatically adapt the default maxDuration accordingly.
+     * @param options.duration Set the exact duration (in milliseconds) of the animation. Note that by default, animation duration is calculated based on the time required to reach the target at a constant speed. Setting duration overrides the speedFactor option. Note that the resulting duration is still limited to the maxDuration.
+     * @param options.maxDuration The maximum allowed duration (in milliseconds) of the animation. The default maxDuration value takes the specified speedFactor into account.
+     * @param options.easing The easing function to use for the animation. This may either be a preset (named) function, or a user specified function. Supported named presets are: `linear`, `in-cubic`, `out-cubic`, `in-out-cubic`, `in-expo`, `out-expo`, `in-out-expo` By default, animations that are less than 1000 ms use an out easing function; longer animations use an in-out function.
+     * 
+     */
     applyTo(view: SceneView, options?: SlideApplyToOptions): IPromise<Slide>;
+    /**
+     * Creates a deep clone of this object. Note that the basemap instance is cloned, but the layers within the basemap are copied.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#clone)
+     * 
+     * 
+     */
     clone(): Slide;
+    /**
+     * Updates a slide from a [WebScene's slides](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html#slides). Updating the slide is asynchronous and a snapshot of the view is only complete once the returned promise has resolved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#updateFrom)
+     * 
+     * @param view The SceneView from which the slide should update.
+     * @param options Update options. See properties below for object specifications.
+     * @param options.screenshot Screenshot options to use. See properties below for object specifications.
+     * 
+     */
     updateFrom(view: SceneView, options?: SlideUpdateFromOptions): IPromise<Slide>;
   }
 
   interface SlideConstructor {
+    /**
+     * A slide stores a snapshot of several pre-set properties of the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html) and [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), such as the [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#basemap), [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#viewpoint) and [visible layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#visibleLayers). The [visible layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#visibleLayers) may contain references (by [Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#id)) to both operational layers from the [scene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#layers) as well as elevation layers from the [ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers), which affect the surface elevation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html)
+     */
+
     new(properties?: SlideProperties): Slide;
 
 
+    /**
+     * Creates a slide from a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), which may be added to the [slides](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html#slides) in the WebScene's [presentation](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#presentation). Updating the slide is asynchronous and a snapshot of the view is only complete once the returned promise has resolved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#createFrom)
+     * 
+     * @param view The SceneView from which the slide should be created.
+     * @param options Creation options. See properties below for object specifications.
+     * @param options.screenshot Screenshot options to use. See properties below for object specifications.
+     * 
+     */
     createFrom(view: SceneView, options?: SlideCreateFromOptions): IPromise<Slide>;
   }
 
   export const Slide: SlideConstructor;
 
   interface SlideProperties {
+    /**
+     * The basemap of the scene. Only the [base](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#baseLayers) and [reference](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html#referenceLayers) layers of the basemap are stored in a slide.  This value can be an instance of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) or one of the strings listed in the table below. 
+     * 
+     * Value | Description
+     * ------|------------
+     * streets | ![basemap-streets](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/streets.jpg)
+     * satellite | ![basemap-satellite](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/satellite.jpg)
+     * hybrid | ![basemap-hybrid](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/hybrid.jpg)
+     * topo | ![basemap-topo](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/topo.jpg)
+     * gray | ![basemap-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/gray.jpg)
+     * dark-gray | ![basemap-dark-gray](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/dark-gray.jpg)
+     * oceans | ![basemap-oceans](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/oceans.jpg)
+     * national-geographic | ![basemap-national-geographic](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/national-geographic.jpg)
+     * terrain | ![basemap-terrain](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/terrain.jpg)
+     * osm | ![basemap-osm](https://developers.arcgis.com/javascript/latest/assets/img/apiref/basemap/osm.jpg)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#basemap)
+     */
     basemap?: BasemapProperties | string;
+    /**
+     * The description of the slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#description)
+     */
     description?: SlideDescriptionProperties;
+    /**
+     * Represents settings that affect the environment in which the WebScene is displayed (such as lighting).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#environment)
+     */
     environment?: EnvironmentProperties;
+    /**
+     * The unique id of a slide within the [slides property](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html#slides) of a [Presentation](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Presentation.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#id)
+     */
     id?: string;
+    /**
+     * A data URI encoded thumbnail.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#thumbnail)
+     */
     thumbnail?: SlideThumbnailProperties;
+    /**
+     * The title of the slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#title)
+     */
     title?: SlideTitleProperties;
+    /**
+     * The viewpoint of the slide. This acts like a bookmark, saving a predefined location or point of view from which to view the scene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#viewpoint)
+     */
     viewpoint?: ViewpointProperties;
+    /**
+     * The visible layers of the scene. This is a collection of objects that stores references (by ID) to the [scene layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#layers) and [ground layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers) that are set as `visible` when a slide is applied to a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).  When assigning visible layers, the following types of values will be automatically casted: 
+     *   * Array (or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html)) of [Layer instances](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html): `[layerInstance, layerInstance]`
+     *   * Array (or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html)) of [Layer IDs](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#id): `["layer-1", "layer-2"]`
+     *   
+     *   
+     * The specification for each object in the collection is outlined in the table below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#visibleLayers)
+     */
     visibleLayers?: CollectionProperties<SlideVisibleLayersProperties>;
   }
 
-  export interface SlideApplyToOptions {
-    animate: boolean;
+
+  export interface SlideApplyToOptions extends Object {
+    /**
+     * Indicates whether to animate the slide transition.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#applyTo)
+     * 
+     * @default true
+     */
+    animate?: boolean;
+    /**
+     * Increases or decreases the animation speed by the specified factor. A speedFactor of 2 will make the animation twice as fast, while a speedFactor of 0.5 will make the animation half as fast. Setting the speed factor will automatically adapt the default maxDuration accordingly.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#applyTo)
+     * 
+     * @default 1
+     */
     speedFactor?: number;
+    /**
+     * Set the exact duration (in milliseconds) of the animation. Note that by default, animation duration is calculated based on the time required to reach the target at a constant speed. Setting duration overrides the speedFactor option. Note that the resulting duration is still limited to the maxDuration.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#applyTo)
+     */
     duration?: number;
+    /**
+     * The maximum allowed duration (in milliseconds) of the animation. The default maxDuration value takes the specified speedFactor into account.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#applyTo)
+     * 
+     * @default 8000
+     */
     maxDuration?: number;
+    /**
+     * The easing function to use for the animation. This may either be a preset (named) function, or a user specified function. Supported named presets are: `linear`, `in-cubic`, `out-cubic`, `in-out-cubic`, `in-expo`, `out-expo`, `in-out-expo` By default, animations that are less than 1000 ms use an out easing function; longer animations use an in-out function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#applyTo)
+     */
     easing?: string | EasingFunction;
   }
 
-  export interface SlideCreateFromOptions {
-    screenshot: SlideCreateFromOptionsScreenshot;
+
+  export interface SlideCreateFromOptions extends Object {
+    /**
+     * Screenshot options to use. See properties below for object specifications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#createFrom)
+     */
+    screenshot?: SlideCreateFromOptionsScreenshot;
   }
 
-  export interface SlideCreateFromOptionsScreenshot {
-    format: string;
-    quality: number;
-    width: number;
-    height: number;
+
+  export interface SlideCreateFromOptionsScreenshot extends Object {
+    /**
+     * The image format.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#createFrom)
+     * 
+     * @default jpeg
+     */
+    format?: string;
+    /**
+     * The image quality (due to compression).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#createFrom)
+     * 
+     * @default 80
+     */
+    quality?: number;
+    /**
+     * The image width.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#createFrom)
+     * 
+     * @default 112
+     */
+    width?: number;
+    /**
+     * The image height.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#createFrom)
+     * 
+     * @default 61
+     */
+    height?: number;
   }
 
-  export interface SlideDescriptionProperties {
-    text?: string;
-  }
-  export interface SlideDescription extends Accessor {
+
+  export interface SlideDescriptionProperties extends Object {
+    /**
+     * The description.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#description)
+     */
     text?: string;
   }
 
-  export interface SlideThumbnailProperties {
-    url?: string;
+  export interface SlideDescription extends AnonymousAccessor {
+    /**
+     * The description.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#description)
+     */
+    text?: string;
   }
-  export interface SlideThumbnail extends Accessor {
+
+
+  export interface SlideThumbnailProperties extends Object {
+    /**
+     * The URI pointing to the thumbnail image representing the slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#thumbnail)
+     */
     url?: string;
   }
 
-  export interface SlideTitleProperties {
-    text?: string;
+  export interface SlideThumbnail extends AnonymousAccessor {
+    /**
+     * The URI pointing to the thumbnail image representing the slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#thumbnail)
+     */
+    url?: string;
   }
-  export interface SlideTitle extends Accessor {
+
+
+  export interface SlideTitleProperties extends Object {
+    /**
+     * The title.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#title)
+     */
     text?: string;
   }
 
-  export interface SlideUpdateFromOptions {
+  export interface SlideTitle extends AnonymousAccessor {
+    /**
+     * The title.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#title)
+     */
+    text?: string;
+  }
+
+
+  export interface SlideUpdateFromOptions extends Object {
+    /**
+     * Screenshot options to use. See properties below for object specifications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#updateFrom)
+     */
     screenshot: SlideUpdateFromOptionsScreenshot;
   }
 
-  export interface SlideUpdateFromOptionsScreenshot {
-    format: string;
-    quality: number;
-    width: number;
-    height: number;
+
+  export interface SlideUpdateFromOptionsScreenshot extends Object {
+    /**
+     * The image format.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#updateFrom)
+     * 
+     * @default jpeg
+     */
+    format?: string;
+    /**
+     * The image quality (due to compression).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#updateFrom)
+     * 
+     * @default 80
+     */
+    quality?: number;
+    /**
+     * The image width.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#updateFrom)
+     * 
+     * @default 120
+     */
+    width?: number;
+    /**
+     * The image height.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#updateFrom)
+     * 
+     * @default 75
+     */
+    height?: number;
   }
 
-  export interface SlideVisibleLayersProperties {
+
+  export interface SlideVisibleLayersProperties extends Object {
+    /**
+     * The ID of a [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#id) in the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#layers) or [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers) that is made `visible` in the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) when the slide is applied to the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#visibleLayers)
+     */
     id?: string;
   }
-  export interface SlideVisibleLayers extends Accessor {
+
+  export interface SlideVisibleLayers extends AnonymousAccessor {
+    /**
+     * The ID of a [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html#id) in the [WebScene](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#layers) or [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers) that is made `visible` in the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) when the slide is applied to the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#visibleLayers)
+     */
     id: string;
   }
 
-  export interface WebSceneSaveAsOptions {
+
+  export interface WebSceneSaveAsOptions extends Object {
+    /**
+     * the folder in which to save the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#saveAs)
+     */
     folder?: PortalFolder;
+    /**
+     * allow the scene to be saved even in the case it contains unsupported content (layers, renderers, symbols). Any content that is not supported will not be saved and the scene may appear different when reloaded from its portal item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#saveAs)
+     */
     ignoreUnsupported?: boolean;
   }
 
-  export interface WebSceneSaveOptions {
+
+  export interface WebSceneSaveOptions extends Object {
+    /**
+     * When `true`, the scene will save even if it contains unsupported content (layers, renderers, symbols). Any content that is not supported will not be saved and the scene may appear different when reloaded from its portal item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#save)
+     */
     ignoreUnsupported?: boolean;
   }
 
-  export interface WebSceneSourceVersion {
+
+  export interface WebSceneSourceVersion extends Object {
+    /**
+     * The major version of the WebScene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#sourceVersion)
+     */
     major: number;
+    /**
+     * The minor version of the WebScene.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#sourceVersion)
+     */
     minor: number;
   }
 
-  export interface WebSceneUpdateFromOptions {
+
+  export interface WebSceneUpdateFromOptions extends Object {
+    /**
+     * update the initial environment from the view, defaults to false.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#updateFrom)
+     */
     environmentExcluded?: boolean;
+    /**
+     * update the initial viewpoint from the view, defaults to false.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebScene.html#updateFrom)
+     */
     viewpointExcluded?: boolean;
   }
 
   interface Attribution extends Widget {
+    /**
+     * Full attribution text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#attributionText)
+     */
+    readonly attributionText: string;
+    /**
+     * Text used to split attribution by [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#itemDelimiter)
+     * 
+     * @default |
+     */
+    itemDelimiter: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [AttributionViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#viewModel)
+     */
     viewModel: AttributionViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#render)
+     * 
+     * 
+     */
     render(): any;
   }
 
   interface AttributionConstructor {
+    /**
+     * The Attribution displays attribution text for the layers in a map. The text displayed for the layers is either a list of data providers or sources as defined in the layer's custom attribution data, or the copyright text. This widget automatically updates based on layer visibility and map extent and displays a single line of attribution that can be expanded with a single click to view all data sources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html)
+     */
+
     new(properties?: AttributionProperties): Attribution;
   }
 
   export const Attribution: AttributionConstructor;
 
   interface AttributionProperties extends WidgetProperties {
+    /**
+     * Text used to split attribution by [layers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-Layer.html)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#itemDelimiter)
+     * 
+     * @default |
+     */
+    itemDelimiter?: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [AttributionViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#viewModel)
+     */
     viewModel?: AttributionViewModel;
   }
 
   interface AttributionViewModel {
-    attributionText: string;
-    itemDelimiter: string;
-    state: string;
+    /**
+     * Array of attribution items.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html#items)
+     */
+    readonly items: AttributionItem[];
+    /**
+     * The view model's state.  **Known Values:** ready | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view from which the view model will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html#view)
+     */
     view: MapView | SceneView;
   }
 
   interface AttributionViewModelConstructor {
+    /**
+     * Provides the logic for the [Attribution](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html) widget. Displays attribution text for the layers in a map. The text displayed for the layers is either a list of data providers or sources as defined in the layer's custom attribution data, or the copyright text. The attribution is automatically updated based on layer visibility and map extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html)
+     */
+
+
     new(properties?: any): AttributionViewModel;
   }
 
   export const AttributionViewModel: AttributionViewModelConstructor;
 
+  /**
+   * The following properties define an attribution item that contains the attribution text for a set of layers.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html#AttributionItem)
+   */
+  export interface AttributionItem extends Object {
+    /**
+     * The attribution text for one or more layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html#AttributionItem)
+     */
+    text: boolean;
+    /**
+     * The associated layers that share the attribution text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html#AttributionItem)
+     */
+    layers: Layer[];
+  }
+
   interface BasemapGallery extends Widget {
+    /**
+     * The map's [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#activeBasemap)
+     */
     activeBasemap: Basemap;
+    /**
+     * The source for basemaps that the widget will display. This property can be autocast with an array or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html)s, a [Portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html) instance, or a URL to a portal instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html) that points to the default portal instance set in [esriConfig.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#source)
+     */
     source: LocalBasemapsSource | PortalBasemapsSource;
+    /**
+     * The view from which the widget will operate. This view provides access to the active [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [BasemapGalleryViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#viewModel)
+     */
     viewModel: BasemapGalleryViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#render)
+     * 
+     * 
+     */
     render(): any;
   }
 
   interface BasemapGalleryConstructor {
+    /**
+     * The BasemapGallery widget displays a collection images representing basemaps from ArcGIS.com or a user-defined set of map or image services. When a new basemap is selected from the BasemapGallery, the map's basemap layers are removed and replaced with the basemap layers of the associated basemap selected in the gallery. By default, the BasemapGallery widget looks like the following image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html)
+     */
+
     new(properties?: BasemapGalleryProperties): BasemapGallery;
   }
 
   export const BasemapGallery: BasemapGalleryConstructor;
 
   interface BasemapGalleryProperties extends WidgetProperties {
+    /**
+     * The map's [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#activeBasemap)
+     */
     activeBasemap?: BasemapProperties;
-    source?: LocalBasemapsSource | PortalBasemapsSource;
+    /**
+     * The source for basemaps that the widget will display. This property can be autocast with an array or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html)s, a [Portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html) instance, or a URL to a portal instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html) that points to the default portal instance set in [esriConfig.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#source)
+     */
+    source?: LocalBasemapsSourceProperties | PortalBasemapsSourceProperties;
+    /**
+     * The view from which the widget will operate. This view provides access to the active [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [BasemapGalleryViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#viewModel)
+     */
     viewModel?: BasemapGalleryViewModelProperties;
   }
 
-  interface BasemapGalleryItem {
-    basemap: Basemap;
-    error: Error;
-    state: string;
-    view: MapView | SceneView;
-  }
-
-  export const BasemapGalleryItem: BasemapGalleryItem;
-
   interface BasemapGalleryViewModel extends Accessor {
+    /**
+     * The map's [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#activeBasemap)
+     */
     activeBasemap: Basemap;
+    /**
+     * A collection of [BasemapGalleryItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-BasemapGalleryItem.html)s representing basemaps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#items)
+     */
     items: Collection<BasemapGalleryItem>;
+    /**
+     * The source for basemaps that the widget will display. This property can be autocast with an array or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html)s, a [Portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html) instance or a URL to a portal instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html) that points to the default portal instance set in [esriConfig.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#source)
+     */
     source: LocalBasemapsSource | PortalBasemapsSource;
-    state: string;
+    /**
+     * The view model's state.  **Known Values:** ready | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view from which the widget will operate. This view provides access to the active [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#view)
+     */
     view: MapView | SceneView;
 
+    /**
+     * A convenience function to check basemap equality.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#basemapEquals)
+     * 
+     * @param basemap1 The basemap to compare against `basemap2`.
+     * @param basemap2 The basemap to compare against `basemap1`.
+     * 
+     */
     basemapEquals(basemap1: Basemap, basemap2: Basemap): boolean;
   }
 
   interface BasemapGalleryViewModelConstructor {
+
+
     new(properties?: BasemapGalleryViewModelProperties): BasemapGalleryViewModel;
   }
 
   export const BasemapGalleryViewModel: BasemapGalleryViewModelConstructor;
 
   interface BasemapGalleryViewModelProperties {
+    /**
+     * The map's [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#activeBasemap)
+     */
     activeBasemap?: BasemapProperties;
+    /**
+     * A collection of [BasemapGalleryItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-BasemapGalleryItem.html)s representing basemaps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#items)
+     */
     items?: CollectionProperties<BasemapGalleryItem>;
-    source?: LocalBasemapsSource | PortalBasemapsSource;
-    state?: string;
+    /**
+     * The source for basemaps that the widget will display. This property can be autocast with an array or [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html)s, a [Portal](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html) instance or a URL to a portal instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html) that points to the default portal instance set in [esriConfig.portalUrl](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#portalUrl).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#source)
+     */
+    source?: LocalBasemapsSourceProperties | PortalBasemapsSourceProperties;
+    /**
+     * The view from which the widget will operate. This view provides access to the active [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
-  interface LocalBasemapsSource {
-    basemaps: Collection<Basemap>;
-    state: string;
+
+  interface BasemapGalleryItem {
+    /**
+     * The item's associated basemap.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-BasemapGalleryItem.html#basemap)
+     */
+    basemap: Basemap;
+    /**
+     * The Error object returned if an error occurred.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-BasemapGalleryItem.html#error)
+     */
+    readonly error: Error;
+    /**
+     * The item's state.  **Known Values:** loading | ready | error
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-BasemapGalleryItem.html#state)
+     * 
+     * @default loading
+     */
+    readonly state: string;
+    /**
+     * The view associated with this item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-BasemapGalleryItem.html#view)
+     */
+    view: MapView | SceneView;
   }
 
-  export const LocalBasemapsSource: LocalBasemapsSource;
+  export const BasemapGalleryItem: BasemapGalleryItem;
 
-  interface PortalBasemapsSource {
+  interface LocalBasemapsSource extends Accessor {
+    /**
+     * A collection of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-LocalBasemapsSource.html#basemaps)
+     */
     basemaps: Collection<Basemap>;
+    /**
+     * The source's state. The state is always `ready`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-LocalBasemapsSource.html#state)
+     */
+    readonly state: string;
+
+    /**
+     * Refreshes the source basemaps. Note: `refresh` will not affect LocalBasemapsSource. Modify basemaps directly instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-LocalBasemapsSource.html#refresh)
+     * 
+     * 
+     */
+    refresh(): void;
+  }
+
+  interface LocalBasemapsSourceConstructor {
+
+
+    new(properties?: LocalBasemapsSourceProperties): LocalBasemapsSource;
+  }
+
+  export const LocalBasemapsSource: LocalBasemapsSourceConstructor;
+
+  interface LocalBasemapsSourceProperties {
+    /**
+     * A collection of [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-LocalBasemapsSource.html#basemaps)
+     */
+    basemaps?: CollectionProperties<BasemapProperties>;
+  }
+
+  interface PortalBasemapsSource extends LocalBasemapsSource {
+    /**
+     * Function used to filter basemaps after being fetched from the Portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#filterFunction)
+     */
     filterFunction: Function;
+    /**
+     * The Portal from which to fetch basemaps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#portal)
+     */
     portal: Portal;
+    /**
+     * An object with key-value pairs used to create a custom basemap gallery group query. Note that all parameters will be joined using the `AND` operator. A query string can also be provided for more advanced use cases.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#query)
+     */
     query: any | string;
-    state: string;
   }
 
-  export const PortalBasemapsSource: PortalBasemapsSource;
+  interface PortalBasemapsSourceConstructor {
+
+
+    new(properties?: PortalBasemapsSourceProperties): PortalBasemapsSource;
+  }
+
+  export const PortalBasemapsSource: PortalBasemapsSourceConstructor;
+
+  interface PortalBasemapsSourceProperties extends LocalBasemapsSourceProperties {
+    /**
+     * Function used to filter basemaps after being fetched from the Portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#filterFunction)
+     */
+    filterFunction?: Function;
+    /**
+     * The Portal from which to fetch basemaps.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#portal)
+     */
+    portal?: PortalProperties;
+    /**
+     * An object with key-value pairs used to create a custom basemap gallery group query. Note that all parameters will be joined using the `AND` operator. A query string can also be provided for more advanced use cases.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#query)
+     */
+    query?: any | string;
+  }
 
   interface BasemapToggle extends Widget {
-    activeBasemap: Basemap;
-    nextBasemap: Basemap | string;
+    /**
+     * The map's [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#activeBasemap)
+     */
+    readonly activeBasemap: Basemap;
+    /**
+     * The next basemap for toggling. One of the following values may be set to this property: 
+     *   * The [string ID](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of any Esri basemap.
+     *   * A custom [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) object. Since this property may be [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html), the [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) module does not need to be included in the `require()` function in most applications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#nextBasemap)
+     */
+    nextBasemap: Basemap;
+    /**
+     * Indicates if the title of the basemap is visible in the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#titleVisible)
+     * 
+     * @default false
+     */
     titleVisible: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This view provides the BasemapToggle widget with access to the initial [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) to toggle from via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [BasemapToggleViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#viewModel)
+     */
     viewModel: BasemapToggleViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * Toggles to the [next basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#nextBasemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#toggle)
+     * 
+     * 
+     */
     toggle(): void;
   }
 
   interface BasemapToggleConstructor {
+    /**
+     * The BasemapToggle provides a widget which allows an end-user to switch between two basemaps. The toggled basemap is set inside the [view's](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#view) [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html)
+     */
+
     new(properties?: BasemapToggleProperties): BasemapToggle;
   }
 
   export const BasemapToggle: BasemapToggleConstructor;
 
   interface BasemapToggleProperties extends WidgetProperties {
-    activeBasemap?: BasemapProperties;
+    /**
+     * The next basemap for toggling. One of the following values may be set to this property: 
+     *   * The [string ID](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of any Esri basemap.
+     *   * A custom [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) object. Since this property may be [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html), the [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) module does not need to be included in the `require()` function in most applications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#nextBasemap)
+     */
     nextBasemap?: BasemapProperties | string;
+    /**
+     * Indicates if the title of the basemap is visible in the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#titleVisible)
+     * 
+     * @default false
+     */
     titleVisible?: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). This view provides the BasemapToggle widget with access to the initial [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) to toggle from via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [BasemapToggleViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle.html#viewModel)
+     */
     viewModel?: BasemapToggleViewModelProperties;
   }
 
   interface BasemapToggleViewModel extends Accessor, Evented {
-    activeBasemap: Basemap;
-    nextBasemap: Basemap | string;
-    state: string;
+    /**
+     * The map's [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#activeBasemap)
+     */
+    readonly activeBasemap: Basemap;
+    /**
+     * The next basemap for toggling. One of the following values may be set to this property: 
+     *   * The [string ID](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of any Esri basemap.
+     *   * A custom [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) object. Since this property may be [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html), the [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) module does not need to be included in the `require()` function in most applications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#nextBasemap)
+     */
+    nextBasemap: Basemap;
+    /**
+     * The view model's state.  **Known Values:** ready | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view from which the widget will operate. This view provides access to the initial [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) to toggle from via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#view)
+     */
     view: MapView | SceneView;
 
+    /**
+     * Toggles to the [next basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#nextBasemap).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#toggle)
+     * 
+     * 
+     */
     toggle(): void;
   }
 
   interface BasemapToggleViewModelConstructor {
+
+
     new(properties?: BasemapToggleViewModelProperties): BasemapToggleViewModel;
 
 
+    /**
+     * Helper method to find a basemap's thumbnail URL.  If the basemap does not have a thumbnail URL defined, this utility will try to find a thumbnail URL from the best matching well-known basemap. If no match is found, a thumbnail URL from the basemap's base layers will be used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#getThumbnailUrl)
+     * 
+     * @param basemap The basemap used to retrieve the thumbnail URL.
+     * 
+     */
     getThumbnailUrl(basemap: Basemap): string;
   }
 
   export const BasemapToggleViewModel: BasemapToggleViewModelConstructor;
 
   interface BasemapToggleViewModelProperties {
-    activeBasemap?: BasemapProperties;
+    /**
+     * The next basemap for toggling. One of the following values may be set to this property: 
+     *   * The [string ID](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) of any Esri basemap.
+     *   * A custom [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) object. Since this property may be [autocast](https://developers.arcgis.com/javascript/latest/guide/autocasting/index.html), the [Basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Basemap.html) module does not need to be included in the `require()` function in most applications.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#nextBasemap)
+     */
     nextBasemap?: BasemapProperties | string;
-    state?: string;
+    /**
+     * The view from which the widget will operate. This view provides access to the initial [basemap](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html#basemap) to toggle from via the view's [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#map) property.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
   interface ColorSlider extends Accessor, Widgette {
+    /**
+     * Indicates whether to show the handles of the slider that may be dragged by the user. See the image in the [class description](#) to see where handles are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#handlesVisible)
+     * 
+     * @default true
+     */
     handlesVisible: boolean;
+    /**
+     * The histogram associated with the data represented on the slider. This may be generated using the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html) statistics function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogram)
+     */
     histogram: HistogramResult;
+    /**
+     * Indicates whether to show the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogram) in the slider UI. See the image in the [class description](#) to see where the histogram is typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogramVisible)
+     * 
+     * @default true
+     */
     histogramVisible: boolean;
+    /**
+     * The width of the histogram in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogramWidth)
+     * 
+     * @default 100
+     */
     histogramWidth: number;
+    /**
+     * Indicates whether to show labels in the slider UI. See the image in the [class description](#) to see where labels are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#labelsVisible)
+     * 
+     * @default true
+     */
     labelsVisible: boolean;
+    /**
+     * The maximum value or upper bound of the slider. This value overrides the `max` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics), but may not be less than the value of the maximum stop of the [color visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable).  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#maxValue)
+     */
     maxValue: number;
+    /**
+     * The minimum value or lower bound of the slider. This value overrides the `min` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics), but may not be greater than the value of the minimum stop of the [color visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable).  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#minValue)
+     */
     minValue: number;
+    /**
+     * Indicates the number of handles to show on the slider. Acceptable values are `2` or `3`. If `3` handles are specified, then the [syncedHandles](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#syncedHandles) property may be enabled to sync the movement of the outside handles with the middle, or primary, handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#numHandles)
+     * 
+     * @default {"value":2,"set":""}
+     */
     numHandles: number;
+    /**
+     * The summary statistics of the data represented in the slider. This is an object that may be generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) statistics function. The `min` and `max` values in this object determine the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#minValue) and [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#maxValue) of the slider if values for those properties are not already provided.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics)
+     */
     statistics: ColorSliderStatistics;
+    /**
+     * Indicates whether to show the average in the slider UI. See the image in the [class description](#) to see where this symbol is typically placed. Hover over this symbol to view the average in the tooltip.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statisticsVisible)
+     * 
+     * @default true
+     */
     statisticsVisible: boolean;
+    /**
+     * Only applicable when [numHandles](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#numHandles) is set to `3`. This property indicates whether the outside handles are synced with the middle, or primary, handle. If the primary handle is dragged then the outside handles are dragged while maintaining the same distance from the primary handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#syncedHandles)
+     * 
+     * @default false
+     */
     syncedHandles: boolean;
+    /**
+     * Indicates whether to show tick marks next to the slider handles. See the image in the [class description](#) to see where ticks are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#ticksVisible)
+     * 
+     * @default true
+     */
     ticksVisible: boolean;
-    values: ColorSliderValues[];
+    /**
+     * Each object in this array represents a stop in the [color visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable) associated with the slider. The properties of each object describe whether the stop has a slider handle, the value of the handle and its associated color.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#values)
+     */
+    readonly values: ColorSliderValues[];
+    /**
+     * The color visual variable represented by the slider. This must be set initially on the slider for it to render in the view. This may be created manually (see snippet below) or generated from the [colorRendererCreator](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html) helper methods. A new color visual variable is created each time the user slides handles or changes the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#minValue) or the [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#maxValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable)
+     */
     visualVariable: ColorVisualVariable;
   }
 
   interface ColorSliderConstructor {
+    /**
+     * The ColorSlider is a widget intended for authoring and exploring data-driven visualizations in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) using color. To display properly, this slider requires a [color visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable) and a [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics) object. Other optional properties may be used, including adding a [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogram). Most of the various options that affect the UI of the slider are labeled in the image below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html)
+     */
+
     new(properties?: ColorSliderProperties): ColorSlider;
   }
 
   export const ColorSlider: ColorSliderConstructor;
 
   interface ColorSliderProperties extends WidgetteProperties {
+    /**
+     * Indicates whether to show the handles of the slider that may be dragged by the user. See the image in the [class description](#) to see where handles are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#handlesVisible)
+     * 
+     * @default true
+     */
     handlesVisible?: boolean;
+    /**
+     * The histogram associated with the data represented on the slider. This may be generated using the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html) statistics function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogram)
+     */
     histogram?: HistogramResult;
+    /**
+     * Indicates whether to show the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogram) in the slider UI. See the image in the [class description](#) to see where the histogram is typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogramVisible)
+     * 
+     * @default true
+     */
     histogramVisible?: boolean;
+    /**
+     * The width of the histogram in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#histogramWidth)
+     * 
+     * @default 100
+     */
     histogramWidth?: number;
+    /**
+     * Indicates whether to show labels in the slider UI. See the image in the [class description](#) to see where labels are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#labelsVisible)
+     * 
+     * @default true
+     */
     labelsVisible?: boolean;
+    /**
+     * The maximum value or upper bound of the slider. This value overrides the `max` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics), but may not be less than the value of the maximum stop of the [color visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable).  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#maxValue)
+     */
     maxValue?: number;
+    /**
+     * The minimum value or lower bound of the slider. This value overrides the `min` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics), but may not be greater than the value of the minimum stop of the [color visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable).  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#minValue)
+     */
     minValue?: number;
+    /**
+     * Indicates the number of handles to show on the slider. Acceptable values are `2` or `3`. If `3` handles are specified, then the [syncedHandles](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#syncedHandles) property may be enabled to sync the movement of the outside handles with the middle, or primary, handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#numHandles)
+     * 
+     * @default {"value":2,"set":""}
+     */
     numHandles?: number;
+    /**
+     * The summary statistics of the data represented in the slider. This is an object that may be generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) statistics function. The `min` and `max` values in this object determine the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#minValue) and [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#maxValue) of the slider if values for those properties are not already provided.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics)
+     */
     statistics?: ColorSliderStatistics;
+    /**
+     * Indicates whether to show the average in the slider UI. See the image in the [class description](#) to see where this symbol is typically placed. Hover over this symbol to view the average in the tooltip.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statisticsVisible)
+     * 
+     * @default true
+     */
     statisticsVisible?: boolean;
+    /**
+     * Only applicable when [numHandles](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#numHandles) is set to `3`. This property indicates whether the outside handles are synced with the middle, or primary, handle. If the primary handle is dragged then the outside handles are dragged while maintaining the same distance from the primary handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#syncedHandles)
+     * 
+     * @default false
+     */
     syncedHandles?: boolean;
+    /**
+     * Indicates whether to show tick marks next to the slider handles. See the image in the [class description](#) to see where ticks are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#ticksVisible)
+     * 
+     * @default true
+     */
     ticksVisible?: boolean;
-    values?: ColorSliderValues[];
+    /**
+     * The color visual variable represented by the slider. This must be set initially on the slider for it to render in the view. This may be created manually (see snippet below) or generated from the [colorRendererCreator](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html) helper methods. A new color visual variable is created each time the user slides handles or changes the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#minValue) or the [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#maxValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#visualVariable)
+     */
     visualVariable?: ColorVisualVariable;
   }
 
-  export interface ColorSliderStatistics {
+
+  export interface ColorSliderStatistics extends Object {
+    /**
+     * The average of all data values represented in the color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics)
+     */
     avg: number;
+    /**
+     * The maximum of all data values represented in the color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics)
+     */
     max: number;
+    /**
+     * The minimum of all data values represented in the color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics)
+     */
     min: number;
+    /**
+     * The standard deviation calculated from all data values represented in the color visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#statistics)
+     */
     stddev: number;
   }
 
-  export interface ColorSliderValues {
+
+  export interface ColorSliderValues extends Object {
+    /**
+     * The color used to represent features with values at the associated stop.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#values)
+     */
     color: Color;
+    /**
+     * The value of the stop for the associated handle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#values)
+     */
     value: number;
+    /**
+     * The label used to display the value to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ColorSlider.html#values)
+     */
     label: string;
   }
 
   interface Compass extends Widget {
+    /**
+     * The view in which the Compass obtains and indicates camera [heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading), using a (SceneView) or rotation (MapView).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [CompassViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html#viewModel)
+     */
     viewModel: CompassViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * If working in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html), sets the view's [rotation](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#rotation) to `0`. If working in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), sets the camera's [heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading) to `0`. This method is executed each time the [Compass](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html) is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html#reset)
+     * 
+     * 
+     */
     reset(): void;
   }
 
   interface CompassConstructor {
+    /**
+     * The Compass widget indicates where north is in relation to the current view [rotation](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#rotation) or [camera heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading). Clicking the Compass widget rotates the view to face north (heading = 0). This widget is added to a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html)
+     */
+
     new(properties?: CompassProperties): Compass;
   }
 
   export const Compass: CompassConstructor;
 
   interface CompassProperties extends WidgetProperties {
+    /**
+     * The view in which the Compass obtains and indicates camera [heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading), using a (SceneView) or rotation (MapView).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [CompassViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html#viewModel)
+     */
     viewModel?: CompassViewModelProperties;
   }
 
   interface CompassViewModel extends Accessor {
+    /**
+     * The orientation axes (x, y, z).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html#orientation)
+     * 
+     * @default { x: 0, y: 0, z: 0 }
+     */
     orientation: any;
-    state: string;
+    /**
+     * The view model's state.  **Known Values:** compass | rotation | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view in which the Compass obtains and indicates camera [heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading), using a (SceneView) or rotation (MapView).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html#view)
+     */
     view: MapView | SceneView;
 
+    /**
+     * If working in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html), sets the view's [rotation](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#rotation) is to `0`. If working in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html), sets the camera's [heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading) to `0`.  This method is executed each time the [Compass](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html) is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html#reset)
+     * 
+     * 
+     */
     reset(): void;
   }
 
   interface CompassViewModelConstructor {
+    /**
+     * Provides the logic for the [Compass](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html) widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html)
+     */
+
     new(properties?: CompassViewModelProperties): CompassViewModel;
   }
 
   export const CompassViewModel: CompassViewModelConstructor;
 
   interface CompassViewModelProperties {
+    /**
+     * The orientation axes (x, y, z).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html#orientation)
+     * 
+     * @default { x: 0, y: 0, z: 0 }
+     */
     orientation?: any;
-    state?: string;
+    /**
+     * The view in which the Compass obtains and indicates camera [heading](https://developers.arcgis.com/javascript/latest/api-reference/esri-Camera.html#heading), using a (SceneView) or rotation (MapView).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
-  interface Expand extends Widget {
-    autoCollapse: boolean;
-    collapseIconClass: string;
-    collapseTooltip: string;
-    content: Node | string | Widget;
-    expanded: boolean;
-    expandIconClass: string;
-    expandTooltip: string;
-    iconNumber: string;
+  interface Directions extends Widget {
+    /**
+     * The maximum number of stops allowed for routing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#maxStops)
+     * 
+     * @default 50
+     */
+    maxStops: number;
+    /**
+     * The URL of the REST endpoint of the Route service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#routeServiceUrl)
+     * 
+     * @default "https://route.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World"
+     */
+    routeServiceUrl: string;
+    /**
+     * Defines the symbol used to draw the route on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#routeSymbol)
+     */
+    routeSymbol: SimpleLineSymbol;
+    /**
+     * This property controls the default properties for [Searching](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html). These properties can be configured per application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#searchProperties)
+     */
+    searchProperties: DirectionsSearchProperties;
+    /**
+     * The default stop symbols used to display locations between the origin and final destination.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#stopSymbols)
+     */
+    stopSymbols: DirectionsStopSymbols;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [DirectionsViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#viewModel)
+     */
+    viewModel: DirectionsViewModel;
+
+    /**
+     * Calculate the route to the input locations and display the list of directions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#getDirections)
+     * 
+     * 
+     */
+    getDirections(): IPromise<RouteResult>;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#render)
+     * 
+     * 
+     */
+    render(): any;
+    /**
+     * Zoom so that the full route is displayed within the current map extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#zoomToRoute)
+     * 
+     * 
+     */
+    zoomToRoute(): void;
+  }
+
+  interface DirectionsConstructor {
+    /**
+     * The Directions Widget provides a way to build driving and walking directions using ArcGIS online and custom Network Analysis Route services. Similar to how the [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html) works, this widget generates a route finding a least-cost path between multiple points using a specified network. The resulting directions are displayed with detailed turn-by-turn instructions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html)
+     */
+
+    new(properties?: DirectionsProperties): Directions;
+  }
+
+  export const Directions: DirectionsConstructor;
+
+  interface DirectionsProperties extends WidgetProperties {
+    /**
+     * The maximum number of stops allowed for routing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#maxStops)
+     * 
+     * @default 50
+     */
+    maxStops?: number;
+    /**
+     * The URL of the REST endpoint of the Route service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#routeServiceUrl)
+     * 
+     * @default "https://route.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World"
+     */
+    routeServiceUrl?: string;
+    /**
+     * Defines the symbol used to draw the route on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#routeSymbol)
+     */
+    routeSymbol?: SimpleLineSymbolProperties;
+    /**
+     * This property controls the default properties for [Searching](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html). These properties can be configured per application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#searchProperties)
+     */
+    searchProperties?: DirectionsSearchProperties;
+    /**
+     * The default stop symbols used to display locations between the origin and final destination.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#stopSymbols)
+     */
+    stopSymbols?: DirectionsStopSymbols;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#view)
+     */
+    view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [DirectionsViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#viewModel)
+     */
+    viewModel?: DirectionsViewModelProperties;
+  }
+
+  interface DirectionsViewModel extends Accessor {
+    /**
+     * The network attribute name to be used as the impedance attribute in the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset -> Network Attributes` as `Usage Type: esriNAUTCost`. You can also specify a value of `none` to indicate that no network attributes should be used for impedance. If you specify an empty array, it will default to the default of the service.  For example, set `impedanceAttribute = "Time"` for the quickest route and `impedanceAttribute = "Length"` for shortest drive, assuming the service has those two esriNAUTCost attributes.  For more information, see [Understanding the network attribute](http://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#impedanceAttribute)
+     */
+    impedanceAttribute: string;
+    /**
+     * The most recent route result. Returns an object containing properties for any barriers used when generating the route, messages that may arise when solving the route, and finally an array of returned [RouteResults](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     * 
+     * @default null
+     */
+    readonly lastRoute: DirectionsViewModelLastRoute;
+    /**
+     * The maximum number of stops allowed for routing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#maxStops)
+     * 
+     * @default 50
+     */
+    maxStops: number;
+    /**
+     * Route Parameters object used to call the service. Please refer to the [RouteParameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html) documentation for the list of available settings.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#routeParameters)
+     */
+    routeParameters: RouteParameters;
+    /**
+     * The URL of the REST endpoint of the Route service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#routeServiceUrl)
+     * 
+     * @default "https://route.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World"
+     */
+    routeServiceUrl: string;
+    /**
+     * Defines the symbol used to draw the route on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#routeSymbol)
+     */
+    routeSymbol: SimpleLineSymbol;
+    /**
+     * The selected travel mode. More information can be found in the [ArcGIS Online documentation](https://doc.arcgis.com/en/arcgis-online/reference/travel-modes.htm#GUID-96DF7F50-E0B2-4BF3-8271-EB515D3F0107).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#selectedTravelMode)
+     * 
+     * @default null | 'Driving Time'
+     */
+    readonly selectedTravelMode: DirectionsViewModelSelectedTravelMode;
+    /**
+     * The Service Description object returned by the Route REST Endpoint. This object contains service specific details like available Cost attributes, supported Restrictions, default Attribute Parameter Values, Service Limits (like maximum input stop count), default Impedance Attribute, etc. This information is useful when implementing complex logistics scenarios operating with limitations or preferences on vehicle or stop properties, for example avoiding toll roads, dealing with hazardous materials, working with stop service times, etc.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#serviceDescription)
+     * 
+     * @default null
+     */
+    readonly serviceDescription: any;
+    /**
+     * The current state of the view model.  **Possible Values:** disabled | ready
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * An array of graphics that define the stop locations along the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stops)
+     */
+    stops: Collection<Graphic>;
+    /**
+     * The default stop symbols used to display locations between the origin and final destination.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stopSymbols)
+     */
+    stopSymbols: DirectionsViewModelStopSymbols;
+    /**
+     * The name of the network attribute to use for the drive time when computing directions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#timeAttribute)
+     */
+    timeAttribute: DirectionsViewModelTimeAttribute;
+    /**
+     * Array of objects containing properties specific to either an ArcGIS service or organization's travel modes. More information can be found in the [ArcGIS Online documentation](https://doc.arcgis.com/en/arcgis-online/reference/travel-modes.htm#GUID-96DF7F50-E0B2-4BF3-8271-EB515D3F0107).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#travelModes)
+     */
+    readonly travelModes: TravelMode[];
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#view)
+     */
+    view: MapView | SceneView;
+
+    /**
+     * Centers the map at the specified maneuver or stop.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#centerAt)
+     * 
+     * @param stopOrManeuver The stop or maneuver where the map should be centered.
+     * 
+     */
+    centerAt(stopOrManeuver: Graphic): void;
+    /**
+     * Clears any highlighted route segments.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#clearHighlights)
+     * 
+     * 
+     */
+    clearHighlights(): void;
+    /**
+     * Removes the route directions from the directions list, leaving the inputs untouched. The route and locations persist on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#clearResults)
+     * 
+     * 
+     */
+    clearResults(): void;
+    /**
+     * Returns cost attribute name specific to a particular route service. This can be used as a [travel mode impedance](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#TravelMode).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#getCostAttribute)
+     * 
+     * @param attributeName The attribute name specifying the cost attribute used as an impedance.
+     * 
+     */
+    getCostAttribute(attributeName: string): string;
+    /**
+     * Calculate the route to the input locations and display the list of directions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#getDirections)
+     * 
+     * 
+     */
+    getDirections(): IPromise<RouteResult>;
+    /**
+     * Highlights the specified route segment on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#highlightSegment)
+     * 
+     * @param maneuver The route segment to highlight.
+     * 
+     */
+    highlightSegment(maneuver: Graphic): void;
+    /**
+     * Resets the state of the ViewModel, clearing off all the input stops, and results in the widget. The results persist in the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#reset)
+     * 
+     * 
+     */
+    reset(): void;
+    /**
+     * Zoom so that the full route is displayed within the current map extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#zoomToRoute)
+     * 
+     * 
+     */
+    zoomToRoute(): void;
+  }
+
+  interface DirectionsViewModelConstructor {
+    /**
+     * Provides the communication and data manipulation logic for the [Directions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html) widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html)
+     */
+
+    new(properties?: DirectionsViewModelProperties): DirectionsViewModel;
+  }
+
+  export const DirectionsViewModel: DirectionsViewModelConstructor;
+
+  interface DirectionsViewModelProperties {
+    /**
+     * The network attribute name to be used as the impedance attribute in the analysis. The default is as defined in the specific routing network layer used in your [RouteTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-RouteTask.html). You can specify any attribute names listed in the Service Directory under `Network Dataset -> Network Attributes` as `Usage Type: esriNAUTCost`. You can also specify a value of `none` to indicate that no network attributes should be used for impedance. If you specify an empty array, it will default to the default of the service.  For example, set `impedanceAttribute = "Time"` for the quickest route and `impedanceAttribute = "Length"` for shortest drive, assuming the service has those two esriNAUTCost attributes.  For more information, see [Understanding the network attribute](http://resources.arcgis.com/en/help/main/10.2/index.html#//00470000000m000000).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#impedanceAttribute)
+     */
+    impedanceAttribute?: string;
+    /**
+     * The maximum number of stops allowed for routing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#maxStops)
+     * 
+     * @default 50
+     */
+    maxStops?: number;
+    /**
+     * Route Parameters object used to call the service. Please refer to the [RouteParameters](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html) documentation for the list of available settings.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#routeParameters)
+     */
+    routeParameters?: RouteParametersProperties;
+    /**
+     * The URL of the REST endpoint of the Route service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#routeServiceUrl)
+     * 
+     * @default "https://route.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World"
+     */
+    routeServiceUrl?: string;
+    /**
+     * Defines the symbol used to draw the route on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#routeSymbol)
+     */
+    routeSymbol?: SimpleLineSymbolProperties;
+    /**
+     * An array of graphics that define the stop locations along the route.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stops)
+     */
+    stops?: CollectionProperties<GraphicProperties>;
+    /**
+     * The default stop symbols used to display locations between the origin and final destination.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stopSymbols)
+     */
+    stopSymbols?: DirectionsViewModelStopSymbols;
+    /**
+     * The name of the network attribute to use for the drive time when computing directions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#timeAttribute)
+     */
+    timeAttribute?: DirectionsViewModelTimeAttribute;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#view)
+     */
+    view?: MapViewProperties | SceneViewProperties;
+  }
+
+
+  export interface DirectionsViewModelLastRoute extends Object {
+    /**
+     * Array of graphics representing the point barriers. For a list of properties returned for each barrier, see the [barriers](https://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/barriers.htm) help documentation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     */
+    barriers: Graphic[];
+    /**
+     * An array of messages serialized to JSON.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     */
+    messages: DirectionsViewModelLastRouteMessages[];
+    /**
+     * Array of graphics representing the polygon barriers. For a list of properties returned for each barrier, see the [barriers](https://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/barriers.htm) help documentation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     */
+    polygonBarriers: Graphic[];
+    /**
+     * Array of graphics representing the polygon barriers. For a list of properties returned for each barrier, see the [barriers](https://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/barriers.htm) help documentation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     */
+    polylineBarriers: Graphic[];
+    /**
+     * An array of [RouteResults](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteResult.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     */
+    routeResults: RouteResult;
+  }
+
+
+  export interface DirectionsViewModelLastRouteMessages extends Object {
+    /**
+     * A descriptive message of the returned mesage.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     */
+    description: string;
+    /**
+     * Number indicating the message type returned from the service. This number correlates to one of the known values listed below.
+     * 
+     * Number | Value
+     * ------|------------
+     * 0 | informative
+     * 1 | process-definition
+     * 2 | process-start
+     * 3 | process-stop
+     * 50 | warning
+     * 100 | error
+     * 101 | empty
+     * 200 | abort
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#lastRoute)
+     */
+    type: number;
+  }
+
+
+  export interface DirectionsViewModelSelectedTravelMode extends TravelMode {
+    /**
+     * The description explaining the selected travel mode. A listing of these descriptions can be found in the [ArcGIS Online documentation](https://doc.arcgis.com/en/arcgis-online/reference/travel-modes.htm#GUID-96DF7F50-E0B2-4BF3-8271-EB515D3F0107).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#selectedTravelMode)
+     */
+    description: string;
+    /**
+     * The unique identifier specific for this travel mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#selectedTravelMode)
+     */
+    id: string;
+    /**
+     * The cost attribute on which to optimize the analysis. For example `Miles`, `Minutes`, `Travel Time`, `Kilometers`, `TimeAt1KPH`, `WalkTime`, and `TruckTravelTime`. Take note that attribute names are specific to the network dataset. They may be different if using another Network Analysis service besides the one hosted via ArcGIS Online.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#selectedTravelMode)
+     */
+    impedanceAttributeName: string;
+    /**
+     * Name of the travel mode. Users of ArcGIS Online or Portal for ArcGIS can define custom travel modes inside their Organization settings. Authors of stand alone Network Analysis Services can define their own travel modes inside a network dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#selectedTravelMode)
+     */
+    name: string;
+    /**
+     * The time-based cost attribute for reporting directions. For example, `Minutes`, `Travel Time`, `TimeAt1KPH`, `WalkTime`, and `TruckTravelTime`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#selectedTravelMode)
+     */
+    timeAttributeName: string;
+  }
+
+
+  export interface DirectionsViewModelStopSymbols extends Object {
+    /**
+     * The first stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stopSymbols)
+     */
+    first?: Symbol;
+    /**
+     * The middle stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stopSymbols)
+     */
+    middle?: Symbol;
+    /**
+     * The last stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stopSymbols)
+     */
+    last?: Symbol;
+    /**
+     * An unlocated stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stopSymbols)
+     */
+    unlocated?: Symbol;
+    /**
+     * A waypoint stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#stopSymbols)
+     */
+    waypoint?: Symbol;
+  }
+
+
+  export interface DirectionsViewModelTimeAttribute extends Object {
+    /**
+     * The name of the network attribute to use for the drive time when computing directions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#timeAttribute)
+     */
+    name: string;
+    /**
+     * The units to use when calculating drive time for directions.  **Possible Values:** feet | kilometers | meters | miles | nautical-miles | yards
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#timeAttribute)
+     */
+    units?: string;
+  }
+
+  /**
+   * Array of objects containing properties specific to either an ArcGIS service or organization's travel modes. More information can be found in the [ArcGIS Online documentation](https://doc.arcgis.com/en/arcgis-online/reference/travel-modes.htm#GUID-96DF7F50-E0B2-4BF3-8271-EB515D3F0107).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#TravelMode)
+   */
+  export interface TravelMode extends Object {
+    /**
+     * The description explaining the selected travel mode. A listing of these descriptions can be found in the [ArcGIS Online documentation](https://doc.arcgis.com/en/arcgis-online/reference/travel-modes.htm#GUID-96DF7F50-E0B2-4BF3-8271-EB515D3F0107).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#TravelMode)
+     */
+    description?: string;
+    /**
+     * The unique identifier specific for this travel mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#TravelMode)
+     */
+    id?: string;
+    /**
+     * The cost attribute on which to optimize the analysis. For example `Miles`, `Minutes`, `Travel Time`, `Kilometers`, `TimeAt1KPH`, `WalkTime`, and `TruckTravelTime`. Take note that attribute names are specific to the network dataset. They may be different if using another Network Analysis service besides the one hosted via ArcGIS Online.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#TravelMode)
+     */
+    impedanceAttributeName?: string;
+    /**
+     * Name of the travel mode. Users of ArcGIS Online or Portal for ArcGIS can define custom travel modes inside their Organization settings. Authors of stand alone Network Analysis Services can define their own travel modes inside a network dataset.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#TravelMode)
+     */
+    name?: string;
+    /**
+     * The time-based cost attribute for reporting directions. For example, `Minutes`, `Travel Time`, `TimeAt1KPH`, `WalkTime`, and `TruckTravelTime`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions-DirectionsViewModel.html#TravelMode)
+     */
+    timeAttributeName?: string;
+  }
+
+
+  export interface DirectionsStopSymbols extends Object {
+    /**
+     * The first stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#stopSymbols)
+     */
+    first?: Symbol;
+    /**
+     * The middle stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#stopSymbols)
+     */
+    middle?: Symbol;
+    /**
+     * The last stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#stopSymbols)
+     */
+    last?: Symbol;
+    /**
+     * An unlocated stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#stopSymbols)
+     */
+    unlocated?: Symbol;
+    /**
+     * A waypoint stop symbol.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#stopSymbols)
+     */
+    waypoint?: Symbol;
+  }
+
+  /**
+   * Configurable Search properties of the widget.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+   */
+  export interface DirectionsSearchProperties extends Object {
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    popupOpenOnSelect?: boolean;
+    /**
+     * Number index indicating the current selected source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    activeSourceIndex?: number;
+    /**
+     * Indicates whether to automatically navigate to the selected result once selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    autoNavigate?: boolean;
+    /**
+     * Indicates whether to automatically select and zoom to the first geocoded result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    autoSelect?: boolean;
+    /**
+     * Indicates the maximum number of search results to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    maxResults?: number;
+    /**
+     * Indicates the maximum number of suggestions to return for the widget's input.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    maxSuggestions?: number;
+    /**
+     * Indicates the minimum number of characters required before querying for a suggestion.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    minSuggestCharacters?: number;
+    /**
+     * Indicates whether to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a selected result is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    popupEnabled?: boolean;
+    /**
+     * String value used as a hint for input text when searching on multiple sources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    allPlaceholder?: string;
+    /**
+     * A customized PopupTemplate for the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    popupTemplate?: PopupTemplate;
+    /**
+     * Indicates whether to show a graphic on the map for the selected source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    resultGraphicEnabled?: boolean;
+    /**
+     * Indicates whether to display the option to search all sources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    searchAllEnabled?: boolean;
+    /**
+     * The value of the search box input text string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    searchTerm?: string;
+    /**
+     * Specifies the sources to search in the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#view).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    sources?: Collection<FeatureLayerSource | LocatorSource>;
+    /**
+     * Indicates whether to display suggestions as the user enters input text in the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    suggestionsEnabled?: boolean;
+    /**
+     * The view of the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    view?: MapView | SceneView;
+    /**
+     * The Search widget's view model.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     */
+    viewModel?: SearchViewModel;
+  }
+
+  interface DirectLineMeasurement3D extends Widget {
+    /**
+     * A reference to the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D.html#view)
+     */
+    view: SceneView;
+
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D.html#render)
+     * 
+     * 
+     */
+    render(): any;
+  }
+
+  interface DirectLineMeasurement3DConstructor {
+    /**
+     * The DirectLineMeasurement3D widget calculates and displays the 3D distance between two points. This widget can be used in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) to measure the vertical, horizontal, and direct distance between two points.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D.html)
+     */
+
+    new(properties?: DirectLineMeasurement3DProperties): DirectLineMeasurement3D;
+  }
+
+  export const DirectLineMeasurement3D: DirectLineMeasurement3DConstructor;
+
+  interface DirectLineMeasurement3DProperties extends WidgetProperties {
+    /**
+     * A reference to the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D.html#view)
+     */
+    view?: SceneViewProperties;
+  }
+
+  interface Expand extends Widget {
+    /**
+     * Automatically collapses the expand widget instance when the view's viewpoint updates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#autoCollapse)
+     * 
+     * @default false
+     */
+    autoCollapse: boolean;
+    /**
+     * Icon font used to style the Expand button.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#collapseIconClass)
+     */
+    collapseIconClass: string;
+    /**
+     * Tooltip to display to indicate Expand widget can be collapsed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#collapseTooltip)
+     * 
+     * @default "Collapse" (English locale)
+     */
+    collapseTooltip: string;
+    /**
+     * The content to display within the expanded Expand widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#content)
+     */
+    content: Node | string | Widget;
+    /**
+     * Whether the widget is currently expanded or not.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expanded)
+     * 
+     * @default false
+     */
+    readonly expanded: boolean;
+    /**
+     * Icon font used to style the Expand button.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expandIconClass)
+     */
+    expandIconClass: string;
+    /**
+     * Tooltip to display to indicate Expand widget can be expanded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expandTooltip)
+     * 
+     * @default "Expand" (English locale)
+     */
+    expandTooltip: string;
+    /**
+     * This value associates two or more Expand widget instances with each other, allowing one instance to auto collapse when another instance in the same group is expanded. For auto collapsing to take effect, all instances of the group must be included in the [view.ui](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#ui).  For example, if you place multiple Expand instances in the top-left of the view's ui, you can assign them to a group called `top-left`. If one Expand instance is expanded and the user clicks on a different instance in the `top-left` group, then the first instance is collapsed, allowing the content of the second instance to be fully visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#group)
+     */
+    group: string;
+    /**
+     * A number to display at the corner of the widget to indicate the number of, for example, open issues or unread notices.  ![expand widget icon number](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/expand-with-iconnumber.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#iconNumber)
+     */
+    iconNumber: number;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#view)
+     */
+    view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [ExpandViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#viewModel)
+     */
     viewModel: ExpandViewModel;
 
+    /**
+     * Collapse the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#collapse)
+     * 
+     * 
+     */
     collapse(): void;
+    /**
+     * Expand the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expand)
+     * 
+     * 
+     */
     expand(): void;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * Toggle the widget by expanding it if it's collapsed, or collapsing it if it's expanded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#toggle)
+     * 
+     * 
+     */
     toggle(): void;
   }
 
   interface ExpandConstructor {
+
+
     new(properties?: ExpandProperties): Expand;
   }
 
   export const Expand: ExpandConstructor;
 
   interface ExpandProperties extends WidgetProperties {
+    /**
+     * Automatically collapses the expand widget instance when the view's viewpoint updates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#autoCollapse)
+     * 
+     * @default false
+     */
     autoCollapse?: boolean;
+    /**
+     * Icon font used to style the Expand button.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#collapseIconClass)
+     */
     collapseIconClass?: string;
+    /**
+     * Tooltip to display to indicate Expand widget can be collapsed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#collapseTooltip)
+     * 
+     * @default "Collapse" (English locale)
+     */
     collapseTooltip?: string;
+    /**
+     * The content to display within the expanded Expand widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#content)
+     */
     content?: Node | string | WidgetProperties;
-    expanded?: boolean;
+    /**
+     * Icon font used to style the Expand button.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expandIconClass)
+     */
     expandIconClass?: string;
+    /**
+     * Tooltip to display to indicate Expand widget can be expanded.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expandTooltip)
+     * 
+     * @default "Expand" (English locale)
+     */
     expandTooltip?: string;
-    iconNumber?: string;
+    /**
+     * This value associates two or more Expand widget instances with each other, allowing one instance to auto collapse when another instance in the same group is expanded. For auto collapsing to take effect, all instances of the group must be included in the [view.ui](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#ui).  For example, if you place multiple Expand instances in the top-left of the view's ui, you can assign them to a group called `top-left`. If one Expand instance is expanded and the user clicks on a different instance in the `top-left` group, then the first instance is collapsed, allowing the content of the second instance to be fully visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#group)
+     */
+    group?: string;
+    /**
+     * A number to display at the corner of the widget to indicate the number of, for example, open issues or unread notices.  ![expand widget icon number](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/expand-with-iconnumber.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#iconNumber)
+     */
+    iconNumber?: number;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [ExpandViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#viewModel)
+     */
     viewModel?: ExpandViewModelProperties;
   }
 
   interface ExpandViewModel extends Accessor {
+    /**
+     * Automatically collapses the expand widget instance when the view's viewpoint updates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#autoCollapse)
+     * 
+     * @default false
+     */
     autoCollapse: boolean;
-    expanded: boolean;
-    state: string;
+    /**
+     * Whether the widget is currently expanded or not.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#expanded)
+     * 
+     * @default false
+     */
+    readonly expanded: boolean;
+    /**
+     * This value associates two or more Expand widget instances with each other, allowing one instance to auto collapse when another instance in the same group is expanded. For auto collapsing to take effect, all instances of the group must be included in the [view.ui](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#ui).  For example, if you place multiple Expand instances in the top-left of the view's ui, you can assign them to a group called `top-left`. If one Expand instance is expanded and the user clicks on a different instance in the `top-left` group, then the first instance is collapsed, allowing the content of the second instance to be fully visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#group)
+     */
+    group: string;
+    /**
+     * The view model's state.  **Known Values:** ready | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view in which the Expand is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#view)
+     */
     view: MapView | SceneView;
   }
 
   interface ExpandViewModelConstructor {
+
+
     new(properties?: ExpandViewModelProperties): ExpandViewModel;
   }
 
   export const ExpandViewModel: ExpandViewModelConstructor;
 
   interface ExpandViewModelProperties {
+    /**
+     * Automatically collapses the expand widget instance when the view's viewpoint updates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#autoCollapse)
+     * 
+     * @default false
+     */
     autoCollapse?: boolean;
-    expanded?: boolean;
-    state?: string;
+    /**
+     * This value associates two or more Expand widget instances with each other, allowing one instance to auto collapse when another instance in the same group is expanded. For auto collapsing to take effect, all instances of the group must be included in the [view.ui](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html#ui).  For example, if you place multiple Expand instances in the top-left of the view's ui, you can assign them to a group called `top-left`. If one Expand instance is expanded and the user clicks on a different instance in the `top-left` group, then the first instance is collapsed, allowing the content of the second instance to be fully visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#group)
+     */
+    group?: string;
+    /**
+     * The view in which the Expand is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#view)
+     */
+    view?: MapViewProperties | SceneViewProperties;
+  }
+
+  interface Fullscreen extends Widget {
+    /**
+     * The [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) to present in fullscreen mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html#element)
+     */
+    element: HTMLElement;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html#view)
+     */
+    view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [FullscreenViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html#viewModel)
+     */
+    viewModel: FullscreenViewModel;
+
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html#render)
+     * 
+     * 
+     */
+    render(): any;
+  }
+
+  interface FullscreenConstructor {
+    /**
+     * Provides a simple widget to present the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) or a user-defined [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) using the entire screen.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html)
+     */
+
+    new(properties?: FullscreenProperties): Fullscreen;
+  }
+
+  export const Fullscreen: FullscreenConstructor;
+
+  interface FullscreenProperties extends WidgetProperties {
+    /**
+     * The [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) to present in fullscreen mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html#element)
+     */
+    element?: HTMLElement;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html#view)
+     */
+    view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [FullscreenViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen.html#viewModel)
+     */
+    viewModel?: FullscreenViewModelProperties;
+  }
+
+  interface FullscreenViewModel extends Accessor {
+    /**
+     * The [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) to present in fullscreen mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#element)
+     */
+    element: HTMLElement;
+    /**
+     * The view model's state.  **Known Values:** active | ready | feature-unsupported | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view associated with the widget instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#view)
+     */
+    view: MapView | SceneView;
+
+    /**
+     * Enter fullscreen
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#enter)
+     * 
+     * 
+     */
+    enter(): void;
+    /**
+     * Exit fullscreen
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#exit)
+     * 
+     * 
+     */
+    exit(): void;
+    /**
+     * Toggle fullscreen
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#toggle)
+     * 
+     * 
+     */
+    toggle(): void;
+  }
+
+  interface FullscreenViewModelConstructor {
+
+
+    new(properties?: FullscreenViewModelProperties): FullscreenViewModel;
+  }
+
+  export const FullscreenViewModel: FullscreenViewModelConstructor;
+
+  interface FullscreenViewModelProperties {
+    /**
+     * The [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) to present in fullscreen mode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#element)
+     */
+    element?: HTMLElement;
+    /**
+     * The view associated with the widget instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
   interface Home extends Widget {
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [HomeViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#viewModel)
+     */
     viewModel: HomeViewModel;
+    /**
+     * The [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html), or point of view, to zoom to when going home. The initial value is determined a few different ways: 
+     *   * If no [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is provided, the value is `null`.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready, but the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is not defined, the  initial value of the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is determined when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) became ready.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready and the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is defined by the user, the initial viewpoint value is the user-defined [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#viewpoint)
+     */
     viewpoint: Viewpoint;
 
+    /**
+     * Animates the view to the initial Viewpoint of the view or the value of [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#viewpoint).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#go)
+     * 
+     * 
+     */
     go(): void;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#render)
+     * 
+     * 
+     */
     render(): any;
   }
 
   interface HomeConstructor {
+    /**
+     * Provides a simple widget that switches the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) to its initial [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) or a previously defined [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#viewpoint). By default this button looks like the following:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html)
+     */
+
     new(properties?: HomeProperties): Home;
   }
 
   export const Home: HomeConstructor;
 
   interface HomeProperties extends WidgetProperties {
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [HomeViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#viewModel)
+     */
     viewModel?: HomeViewModelProperties;
+    /**
+     * The [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html), or point of view, to zoom to when going home. The initial value is determined a few different ways: 
+     *   * If no [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is provided, the value is `null`.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready, but the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is not defined, the  initial value of the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is determined when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) became ready.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready and the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is defined by the user, the initial viewpoint value is the user-defined [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#viewpoint)
+     */
     viewpoint?: ViewpointProperties;
   }
 
   interface HomeViewModel extends Accessor, Evented {
-    state: string;
+    /**
+     * The current state of the widget.  **Possible Values:** disabled | ready | going-home
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view associated with the widget instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html), or point of view, to zoom to when going home. The initial value is determined a few different ways: 
+     *   * If no [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is provided, the value is `null`.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready, but the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is not defined, the  initial value of the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is determined when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) became ready.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready and the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is defined by the user, the initial viewpoint value is the user-defined [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html#viewpoint)
+     * 
+     * @default null
+     */
     viewpoint: Viewpoint;
 
+    /**
+     * Animates the view to the initial [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) of the view or the value of [viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html#viewpoint).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html#go)
+     * 
+     * 
+     */
     go(): void;
   }
 
   interface HomeViewModelConstructor {
+
+
     new(properties?: HomeViewModelProperties): HomeViewModel;
   }
 
   export const HomeViewModel: HomeViewModelConstructor;
 
   interface HomeViewModelProperties {
-    state?: string;
+    /**
+     * The view associated with the widget instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html), or point of view, to zoom to when going home. The initial value is determined a few different ways: 
+     *   * If no [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is provided, the value is `null`.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready, but the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is not defined, the  initial value of the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is determined when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) became ready.
+     *   * If the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) is ready and the [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) is defined by the user, the initial viewpoint value is the user-defined [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home-HomeViewModel.html#viewpoint)
+     * 
+     * @default null
+     */
     viewpoint?: ViewpointProperties;
   }
 
   interface LayerList extends Widget {
+    /**
+     * **Use [listItemCreatedFunction](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#listItemCreatedFunction) instead.**  Specify the function that will create actions for [ListItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Actions are defined with the properties listed in the [Action class](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html). This function must return a two-dimensional array of [Actions](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#createActionsFunction)
+     */
     createActionsFunction: Function;
+    /**
+     * Specifies a function that accesses each [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Each list item can be modified according to its modifiable propeties. Actions can be added to list items using the [actionsSections](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#actionsSections) property of the ListItem.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#listItemCreatedFunction)
+     */
     listItemCreatedFunction: Function;
+    /**
+     * A collection of [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html)s representing operational layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#operationalItems)
+     */
     operationalItems: Collection<ListItem>;
+    /**
+     * Option for enabling status indicators, which indicate whether or not each layer is loading resources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#statusIndicatorsVisible)
+     * 
+     * @default true
+     */
     statusIndicatorsVisible: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [LayerListViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#viewModel)
+     */
     viewModel: LayerListViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * Triggers the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#event:trigger-action) event and executes the given [action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#triggerAction)
+     * 
+     * @param action The action to execute.
+     * @param item An item associated with the action.
+     * 
+     */
     triggerAction(action: Action, item: ListItem): void;
   }
 
   interface LayerListConstructor {
+
+
     new(properties?: LayerListProperties): LayerList;
   }
 
   export const LayerList: LayerListConstructor;
 
   interface LayerListProperties extends WidgetProperties {
+    /**
+     * **Use [listItemCreatedFunction](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#listItemCreatedFunction) instead.**  Specify the function that will create actions for [ListItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Actions are defined with the properties listed in the [Action class](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html). This function must return a two-dimensional array of [Actions](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#createActionsFunction)
+     */
     createActionsFunction?: Function;
+    /**
+     * Specifies a function that accesses each [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Each list item can be modified according to its modifiable propeties. Actions can be added to list items using the [actionsSections](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#actionsSections) property of the ListItem.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#listItemCreatedFunction)
+     */
     listItemCreatedFunction?: Function;
+    /**
+     * A collection of [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html)s representing operational layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#operationalItems)
+     */
     operationalItems?: CollectionProperties<ListItem>;
+    /**
+     * Option for enabling status indicators, which indicate whether or not each layer is loading resources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#statusIndicatorsVisible)
+     * 
+     * @default true
+     */
     statusIndicatorsVisible?: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [LayerListViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#viewModel)
+     */
     viewModel?: LayerListViewModelProperties;
   }
 
   interface LayerListViewModel extends Accessor {
+    /**
+     * **Use [listItemCreatedFunction](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#listItemCreatedFunction) instead.**  Specify the function that will create actions for [ListItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Actions are defined with the properties listed in the [Action class](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#createActionsFunction)
+     */
     createActionsFunction: Function;
+    /**
+     * Specifies a function that accesses each [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Each list item can be modified according to its modifiable propeties. Actions can be added to list items using the [actionsSections](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#actionsSections) property of the ListItem.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#listItemCreatedFunction)
+     */
     listItemCreatedFunction: Function;
-    operationalItems: Collection<ListItem>;
-    state: string;
+    /**
+     * A collection of [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html)s representing operational layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#operationalItems)
+     */
+    readonly operationalItems: Collection<ListItem>;
+    /**
+     * The view model's state.  **Known Values:** ready | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#view)
+     */
     view: MapView | SceneView;
 
+    /**
+     * Triggers the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#event:trigger-action) event and executes the given [action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#triggerAction)
+     * 
+     * @param action The action to execute.
+     * @param item An item associated with the action.
+     * 
+     */
     triggerAction(action: Action, item: ListItem): void;
   }
 
   interface LayerListViewModelConstructor {
+
+
     new(properties?: LayerListViewModelProperties): LayerListViewModel;
   }
 
   export const LayerListViewModel: LayerListViewModelConstructor;
 
   interface LayerListViewModelProperties {
+    /**
+     * **Use [listItemCreatedFunction](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#listItemCreatedFunction) instead.**  Specify the function that will create actions for [ListItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Actions are defined with the properties listed in the [Action class](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#createActionsFunction)
+     */
     createActionsFunction?: Function;
+    /**
+     * Specifies a function that accesses each [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html). Each list item can be modified according to its modifiable propeties. Actions can be added to list items using the [actionsSections](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#actionsSections) property of the ListItem.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#listItemCreatedFunction)
+     */
     listItemCreatedFunction?: Function;
-    operationalItems?: CollectionProperties<ListItem>;
-    state?: string;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
   interface ListItem {
+    /**
+     * Whether the actional panel is open in the LayerList.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#actionsOpen)
+     * 
+     * @default false
+     */
     actionsOpen: boolean;
+    /**
+     * A nested 2-dimensional collection of actions that could be triggered on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#actionsSections)
+     */
     actionsSections: Collection<Collection<Action>>;
+    /**
+     * When a layer contains sublayers, this property is a Collection of ListItem objects belonging to the given layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#children)
+     */
     children: Collection<ListItem>;
-    error: Error;
+    /**
+     * The Error object returned if an error occurred.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#error)
+     */
+    readonly error: Error;
+    /**
+     * The layer associated with the triggered action.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#layer)
+     * 
+     * @default null
+     */
     layer: Layer;
-    layerView: LayerView;
+    /**
+     * The [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) displaying data for the associated [layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#layer).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#layerView)
+     */
+    readonly layerView: LayerView;
+    /**
+     * Whether the layer is open in the LayerList.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#open)
+     * 
+     * @default false
+     */
     open: boolean;
+    /**
+     * The parent of this item
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#parent)
+     * 
+     * @default null
+     */
     parent: ListItem;
+    /**
+     * The title of the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#title)
+     */
     title: string;
-    updating: boolean;
+    /**
+     * Value is `true` when the layer is updating; for example, if it is in the process of fetching data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#updating)
+     * 
+     * @default false
+     */
+    readonly updating: boolean;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#view)
+     */
     view: MapView | SceneView;
-    visibilityMode: string;
+    /**
+     * Indicates how to manage the visibility of the children layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#visibilityMode)
+     */
+    readonly visibilityMode: string;
+    /**
+     * Indicates if the ListItem is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#visible)
+     * 
+     * @default true
+     */
     visible: boolean;
-    visibleAtCurrentScale: boolean;
+    /**
+     * Whether the layer is visible at the current scale or not.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#visibleAtCurrentScale)
+     * 
+     * @default true
+     */
+    readonly visibleAtCurrentScale: boolean;
 
+    /**
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#clone)
+     * 
+     * 
+     */
     clone(): ListItem;
   }
 
   interface ListItemConstructor {
+
+
+
     new(): ListItem;
   }
 
   export const ListItem: ListItemConstructor;
 
   interface Legend extends Widget {
+    /**
+     * Specifies a subset of the layers to display in the legend. If this property is not set, all layers in the map will display in the legend. Objects in this array are defined with the properties listed below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#layerInfos)
+     */
     layerInfos: LegendLayerInfos[];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#view)
+     */
     view: MapView | SceneView;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#render)
+     * 
+     * 
+     */
     render(): any;
   }
 
   interface LegendConstructor {
+    /**
+     * The Legend widget displays labels and symbols for layers in a map. Labels and their corresponding symbols depend on the values set in the [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) of the layer. The legend will only display layers and sublayers that are visible in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html)
+     */
+
     new(properties?: LegendProperties): Legend;
   }
 
   export const Legend: LegendConstructor;
 
   interface LegendProperties extends WidgetProperties {
+    /**
+     * Specifies a subset of the layers to display in the legend. If this property is not set, all layers in the map will display in the legend. Objects in this array are defined with the properties listed below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#layerInfos)
+     */
     layerInfos?: LegendLayerInfos[];
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
-  export interface LegendLayerInfos {
+
+  export interface LegendLayerInfos extends Object {
+    /**
+     * Specifies a title for the layer to display above its symbols and descriptions. If no title is specified the service name is used.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#layerInfos)
+     */
     title?: string;
+    /**
+     * A layer to display in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#layerInfos)
+     */
     layer: Layer;
   }
 
   interface Locate extends Widget {
+    /**
+     * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#geolocationOptions)
+     * 
+     * @default { maximumAge: 0, timeout: 15000, enableHighAccuracy: true }
+     */
     geolocationOptions: any;
+    /**
+     * Indicates whether the widget should navigate the view to the position and scale of the geolocated result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#goToLocationEnabled)
+     * 
+     * @default true
+     */
     goToLocationEnabled: boolean;
+    /**
+     * The graphic used to show the user's location on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#graphic)
+     */
     graphic: Graphic;
+    /**
+     * Indicates whether the widget will automatically [rotate to user's direction](https://www.w3.org/TR/geolocation-API/#coordinates_interface). Set to `false` to disable this behavior.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#useHeadingEnabled)
+     * 
+     * @default true
+     */
+    useHeadingEnabled: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [LocateViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate-LocateViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#viewModel)
+     */
     viewModel: LocateViewModel;
 
+    /**
+     * Animates the view to the user's location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#locate)
+     * 
+     * 
+     */
     locate(): IPromise<any>;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#render)
+     * 
+     * 
+     */
     render(): any;
   }
 
   interface LocateConstructor {
+    /**
+     * Provides a simple widget that animates the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) to the user's current location. The view rotates according to the direction where the tracked device is heading towards. By default the widget looks like the following:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html)
+     */
+
     new(properties?: LocateProperties): Locate;
   }
 
   export const Locate: LocateConstructor;
 
   interface LocateProperties extends WidgetProperties {
+    /**
+     * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#geolocationOptions)
+     * 
+     * @default { maximumAge: 0, timeout: 15000, enableHighAccuracy: true }
+     */
     geolocationOptions?: any;
+    /**
+     * Indicates whether the widget should navigate the view to the position and scale of the geolocated result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#goToLocationEnabled)
+     * 
+     * @default true
+     */
     goToLocationEnabled?: boolean;
+    /**
+     * The graphic used to show the user's location on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#graphic)
+     */
     graphic?: GraphicProperties;
+    /**
+     * Indicates whether the widget will automatically [rotate to user's direction](https://www.w3.org/TR/geolocation-API/#coordinates_interface). Set to `false` to disable this behavior.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#useHeadingEnabled)
+     * 
+     * @default true
+     */
+    useHeadingEnabled?: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [LocateViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate-LocateViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#viewModel)
+     */
     viewModel?: LocateViewModelProperties;
   }
 
   interface LocateViewModel extends Accessor, Evented, GeolocationPositioning {
-    state: string;
+    /**
+     * The current state of the widget.  **Possible Values:** disabled | ready | locating
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate-LocateViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
 
+    /**
+     * Animates the view to the user's location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate-LocateViewModel.html#locate)
+     * 
+     * 
+     */
     locate(): IPromise<any>;
   }
 
   interface LocateViewModelConstructor {
+    /**
+     * Provides the logic for the [Locate](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html) widget, which animates the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) to the user's current location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate-LocateViewModel.html)
+     */
+
     new(properties?: LocateViewModelProperties): LocateViewModel;
   }
 
   export const LocateViewModel: LocateViewModelConstructor;
 
   interface LocateViewModelProperties extends GeolocationPositioningProperties {
-    state?: string;
+
   }
 
   interface NavigationToggle extends Widget {
+    /**
+     * Sets the layout of the widget to either `horizontal` or `vertical`. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Example
+     * ---------------|--------
+     * vertical | ![navigation-toggle](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/navigation-toggle.png)
+     * horizontal | ![navigation-toggle-horizontal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/navigation-toggle-horizontal.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#layout)
+     * 
+     * @default vertical
+     */
     layout: string;
+    /**
+     * A reference to the SceneView. Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#view)
+     */
     view: SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [NavigationToggleViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#viewModel)
+     */
     viewModel: NavigationToggleViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * Toggles the navigation mode of the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#view) from `pan` to `rotate` or vice versa.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#toggle)
+     * 
+     * 
+     */
     toggle(): void;
   }
 
   interface NavigationToggleConstructor {
+    /**
+     * Provides two simple buttons for toggling the [navigation mode](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#navigationMode) of a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Note that this widget is designed only for 3D mouse interaction in a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). It has no effect on touch navigation and it should not be used with 2D mouse interaction in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html)
+     */
+
     new(properties?: NavigationToggleProperties): NavigationToggle;
   }
 
   export const NavigationToggle: NavigationToggleConstructor;
 
   interface NavigationToggleProperties extends WidgetProperties {
+    /**
+     * Sets the layout of the widget to either `horizontal` or `vertical`. See the table below for a list of possible values. 
+     * 
+     * Possible Value | Example
+     * ---------------|--------
+     * vertical | ![navigation-toggle](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/navigation-toggle.png)
+     * horizontal | ![navigation-toggle-horizontal](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/navigation-toggle-horizontal.png)
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#layout)
+     * 
+     * @default vertical
+     */
     layout?: string;
+    /**
+     * A reference to the SceneView. Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#view)
+     */
     view?: SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [NavigationToggleViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#viewModel)
+     */
     viewModel?: NavigationToggleViewModelProperties;
   }
 
   interface NavigationToggleViewModel extends Accessor {
+    /**
+     * The navigation mode of the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#view). See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|-------------
+     * pan | The mouse drag gesture pans the view. Right-click + drag allows the user to perform a 3D rotate around the center of the view.
+     * rotate | The mouse drag gesture performs a 3D rotate around the center of the view and the right-click + drag gesture pans the view.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#navigationMode)
+     * 
+     * @default pan
+     */
     navigationMode: string;
-    state: string;
+    /**
+     * The state of the widget.  **Possible Values:** disabled | ready
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view associated with the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#view)
+     */
     view: SceneView;
 
+    /**
+     * Toggles the navigation mode of the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#view) from `pan` to `rotate` or vice versa.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#toggle)
+     * 
+     * 
+     */
     toggle(): void;
   }
 
   interface NavigationToggleViewModelConstructor {
+    /**
+     * Provides the logic for the [NavigationToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html) widget, which provides two simple buttons for toggling the [navigation mode](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#navigationMode) of a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Note that this is not designed for 2D mouse interaction in a [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html), nor for touch navigation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html)
+     */
+
     new(properties?: NavigationToggleViewModelProperties): NavigationToggleViewModel;
   }
 
   export const NavigationToggleViewModel: NavigationToggleViewModelConstructor;
 
   interface NavigationToggleViewModelProperties {
+    /**
+     * The navigation mode of the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#view). See the table below for a list of possible values. 
+     * 
+     * Possible Value | Description
+     * ---------------|-------------
+     * pan | The mouse drag gesture pans the view. Right-click + drag allows the user to perform a 3D rotate around the center of the view.
+     * rotate | The mouse drag gesture performs a 3D rotate around the center of the view and the right-click + drag gesture pans the view.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#navigationMode)
+     * 
+     * @default pan
+     */
     navigationMode?: string;
-    state?: string;
+    /**
+     * The view associated with the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle-NavigationToggleViewModel.html#view)
+     */
     view?: SceneViewProperties;
   }
 
   interface Popup extends Widget, Evented {
+    /**
+     * Defines actions that may be executed by clicking the icon or image symbolizing them in the popup. By default, every popup has a `zoom-to` action styled with a magnifying glass icon ![popupTemplate-zoom-action](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-zoom-action.png). When this icon is clicked, the view zooms in four LODs and centers on the selected feature.  You may override this action by removing it from the `actions` array or by setting the [overwriteActions](esri-PopupTemplate.html#overwriteActions) property to `true` in a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html). The order of each action in the popup is the order in which they appear in the array.  The [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event fires each time an action in the popup is clicked. This event should be used to execute custom code for each action clicked. For example, if you would like to add a `zoom-out` action to the popup that zooms the view out several LODs, you would define the zoom-out code in a separate function. Then you would call the custom `zoom-out` function in the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event handler. See the sample code snippet below for more details on how this works.  Actions are defined with the properties listed in the [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions)
+     */
     actions: Collection<Action>;
+    /**
+     * This closes the popup when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) camera or [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#autoCloseEnabled)
+     * 
+     * @default false
+     */
     autoCloseEnabled: boolean;
+    /**
+     * Indicates whether the popup displays its content. If `true`, only the header displays.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#collapsed)
+     * 
+     * @default false
+     */
     collapsed: boolean;
-    content: string | Node;
-    currentDockPosition: string;
+    /**
+     * Indicates whether to enable collapse functionality for the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#collapseEnabled)
+     * 
+     * @default true
+     */
+    collapseEnabled: boolean;
+    /**
+     * The content of the popup. When set directly on the Popup, this content is static and cannot use fields to set content templates. To set a template for the content based on field or attribute names, see [PopupTemplate.content](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#content).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content)
+     */
+    content: string | HTMLElement | Widget;
+    /**
+     * Dock position in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).  **Known Values:** top-left | top-center | top-right | bottom-left | bottom-center | bottom-right
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#currentDockPosition)
+     */
+    readonly currentDockPosition: string;
+    /**
+     * Indicates whether the placement of the popup is docked to the side of the view.  Docking the popup allows for a better user experience, particularly when opening popups in apps on mobile devices. When a popup is "dockEnabled" it means the popup no longer points to the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) or the [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) assigned to it. Rather it is attached to a side, the top, or the bottom of the view.  See [dockOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions) to override default options related to docking the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockEnabled)
+     * 
+     * @default false
+     */
     dockEnabled: boolean;
+    /**
+     * Docking the popup allows for a better user experience, particularly when opening popups in apps on mobile devices. When a popup is "dockEnabled" it means the popup no longer points to the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) or the [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) assigned to it. Rather it is placed in one of the corners of the view or to the top or bottom of it. This property allows the developer to set various options for docking the popup.  See the object specification table below to override default docking properties on the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions)
+     */
     dockOptions: PopupDockOptions;
-    featureCount: number;
+    /**
+     * The number of selected [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features) available to the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#featureCount)
+     * 
+     * @default 0
+     */
+    readonly featureCount: number;
+    /**
+     * An array of features associated with the popup. Each graphic in this array must have a valid [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) set. They may share the same [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) or have unique [PopupTemplates](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) depending on their attributes. The [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content) and [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#title) of the poup is set based on the `content` and `title` properties of each graphic's respective [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  When more than one graphic exists in this array, the current content of the Popup is set based on the value of the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature).  This value is `null` if no features are associated with the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features)
+     */
     features: Graphic[];
+    /**
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions) set on the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Currently highlight only works in 3D.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#highlightEnabled)
+     * 
+     * @default true
+     */
     highlightEnabled: boolean;
+    /**
+     * Point used to position the popup. This is automatically set when viewing the popup by selecting a feature. If using the Popup to display content not related to features in the map, such as the results from a task, then you must set this property before making the popup [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible) to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location)
+     */
     location: Point;
+    /**
+     * An array of pending Promises that have not yet been fulfilled. If there are no pending promises, the value is `null`. When the pending promises are resolved they are removed from this array and the features they return are pushed into the [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#promises)
+     */
     promises: IPromise<any>[];
-    selectedFeature: Graphic;
+    /**
+     * The selected feature accessed by the popup. The content of the Popup is determined based on the [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) assigned to this feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature)
+     */
+    readonly selectedFeature: Graphic;
+    /**
+     * Index of the feature that is [selected](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature). When [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features) are set, the first index is automatically selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeatureIndex)
+     */
     selectedFeatureIndex: number;
+    /**
+     * The title of the popup. This can be set generically on the popup no matter the features that are selected. If the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) has a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html), then the title set in the corresponding template is used here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#title)
+     */
     title: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [PopupViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#viewModel)
+     */
     viewModel: PopupViewModel;
+    /**
+     * Indicates whether the popup is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible)
+     */
     visible: boolean;
 
+    /**
+     * Use this method to remove focus from the Widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#blur)
+     * 
+     * 
+     */
+    blur(): void;
+    /**
+     * Removes [promises](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#promises), [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features), [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content), [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#title) and [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) from the Popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#clear)
+     * 
+     * 
+     */
     clear(): void;
+    /**
+     * Closes the popup by setting its [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible) property to `false`. Users can alternatively close the popup by directly setting the [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible) property to `false`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#close)
+     * 
+     * 
+     */
     close(): void;
+    /**
+     * Use this method to give focus to the Widget if the widget is able to be focused.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#focus)
+     * 
+     * 
+     */
+    focus(): void;
+    /**
+     * Selects the feature at the next index in relation to the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#next)
+     * 
+     * 
+     */
     next(): PopupViewModel;
+    /**
+     * Opens the popup at the given location with content defined either explicitly with `content` or driven from the [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) of input features. This method sets the popup's [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible) property to `true`. Users can alternatively open the popup by directly setting the [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible) property to `true`. The popup will only display if the view's size constraints in [dockOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions) are met or the [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) property is set to a geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     * 
+     * @param options Defines the location and content of the popup when opened.
+     * @param options.title Sets the [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#title) of the popup.
+     * @param options.content Sets the the [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content) of the popup.
+     * @param options.location Sets the popup's [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location), which is the geometry used to position the popup.
+     * @param options.features Sets the popup's [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features), which populate the title and content of the popup based on each graphic's [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).
+     * @param options.promises Sets pending [promises](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#promises) on the popup. The popup will display once the promises resolve. Each promise must resolve to an array of [Graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html).
+     * @param options.featureMenuOpen **Since:** 4.5    This property enables multiple features in a popup to display in a list rather than displaying the first selected feature. Setting this to `true` allows the user to scroll through the list of features returned from the query and choose the selection they want to display within the popup.
+     * @param options.updateLocationEnabled When `true` indicates the popup should update its [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) for each paginated feature based on the [selected feature's](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) geometry.
+     * @param options.collapsed **Since:** 4.5    When `true`, indicates that only the popup header will display.
+     * 
+     */
     open(options?: PopupOpenOptions): void;
+    /**
+     * Selects the feature at the previous index in relation to the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#previous)
+     * 
+     * 
+     */
     previous(): PopupViewModel;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * Positions the popup on the view. Moves the popup into the view's extent if the popup is partially or fully outside the view's extent.  If the popup is partially out of view, the view will move to fully show the popup. If the popup is fully out of view, the view will move to the popup's location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#reposition)
+     * 
+     * 
+     */
     reposition(): void;
+    /**
+     * Triggers the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event and executes the [action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions) at the specified index in the [actions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#triggerAction)
+     * 
+     * @param actionIndex The index of the [action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions) to execute.
+     * 
+     */
     triggerAction(actionIndex: number): void;
   }
 
   interface PopupConstructor {
+    /**
+     * The popup widget allows users to view content from feature attributes. Popups enhance web applications by providing users with a simple way to interact with and view attributes in a layer. They play an important role in relaying information to the user, which improves the storytelling capabilities of the application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html)
+     */
+
     new(properties?: PopupProperties): Popup;
   }
 
   export const Popup: PopupConstructor;
 
   interface PopupProperties extends WidgetProperties {
+    /**
+     * Defines actions that may be executed by clicking the icon or image symbolizing them in the popup. By default, every popup has a `zoom-to` action styled with a magnifying glass icon ![popupTemplate-zoom-action](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-zoom-action.png). When this icon is clicked, the view zooms in four LODs and centers on the selected feature.  You may override this action by removing it from the `actions` array or by setting the [overwriteActions](esri-PopupTemplate.html#overwriteActions) property to `true` in a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html). The order of each action in the popup is the order in which they appear in the array.  The [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event fires each time an action in the popup is clicked. This event should be used to execute custom code for each action clicked. For example, if you would like to add a `zoom-out` action to the popup that zooms the view out several LODs, you would define the zoom-out code in a separate function. Then you would call the custom `zoom-out` function in the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#event:trigger-action) event handler. See the sample code snippet below for more details on how this works.  Actions are defined with the properties listed in the [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions)
+     */
     actions?: CollectionProperties<ActionProperties>;
+    /**
+     * This closes the popup when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) camera or [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#autoCloseEnabled)
+     * 
+     * @default false
+     */
     autoCloseEnabled?: boolean;
+    /**
+     * Indicates whether the popup displays its content. If `true`, only the header displays.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#collapsed)
+     * 
+     * @default false
+     */
     collapsed?: boolean;
-    content?: string | Node;
-    currentDockPosition?: string;
+    /**
+     * Indicates whether to enable collapse functionality for the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#collapseEnabled)
+     * 
+     * @default true
+     */
+    collapseEnabled?: boolean;
+    /**
+     * The content of the popup. When set directly on the Popup, this content is static and cannot use fields to set content templates. To set a template for the content based on field or attribute names, see [PopupTemplate.content](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#content).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content)
+     */
+    content?: string | HTMLElement | WidgetProperties;
+    /**
+     * Indicates whether the placement of the popup is docked to the side of the view.  Docking the popup allows for a better user experience, particularly when opening popups in apps on mobile devices. When a popup is "dockEnabled" it means the popup no longer points to the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) or the [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) assigned to it. Rather it is attached to a side, the top, or the bottom of the view.  See [dockOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions) to override default options related to docking the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockEnabled)
+     * 
+     * @default false
+     */
     dockEnabled?: boolean;
+    /**
+     * Docking the popup allows for a better user experience, particularly when opening popups in apps on mobile devices. When a popup is "dockEnabled" it means the popup no longer points to the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) or the [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) assigned to it. Rather it is placed in one of the corners of the view or to the top or bottom of it. This property allows the developer to set various options for docking the popup.  See the object specification table below to override default docking properties on the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions)
+     */
     dockOptions?: PopupDockOptions;
-    featureCount?: number;
+    /**
+     * An array of features associated with the popup. Each graphic in this array must have a valid [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) set. They may share the same [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) or have unique [PopupTemplates](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) depending on their attributes. The [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content) and [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#title) of the poup is set based on the `content` and `title` properties of each graphic's respective [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  When more than one graphic exists in this array, the current content of the Popup is set based on the value of the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature).  This value is `null` if no features are associated with the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features)
+     */
     features?: GraphicProperties[];
+    /**
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions) set on the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Currently highlight only works in 3D.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#highlightEnabled)
+     * 
+     * @default true
+     */
     highlightEnabled?: boolean;
+    /**
+     * Point used to position the popup. This is automatically set when viewing the popup by selecting a feature. If using the Popup to display content not related to features in the map, such as the results from a task, then you must set this property before making the popup [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible) to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location)
+     */
     location?: PointProperties;
+    /**
+     * An array of pending Promises that have not yet been fulfilled. If there are no pending promises, the value is `null`. When the pending promises are resolved they are removed from this array and the features they return are pushed into the [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#promises)
+     */
     promises?: IPromise<any>[];
-    selectedFeature?: GraphicProperties;
+    /**
+     * Index of the feature that is [selected](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature). When [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features) are set, the first index is automatically selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeatureIndex)
+     */
     selectedFeatureIndex?: number;
+    /**
+     * The title of the popup. This can be set generically on the popup no matter the features that are selected. If the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) has a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html), then the title set in the corresponding template is used here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#title)
+     */
     title?: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [PopupViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#viewModel)
+     */
     viewModel?: PopupViewModelProperties;
+    /**
+     * Indicates whether the popup is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#visible)
+     */
     visible?: boolean;
   }
 
   interface PopupViewModel extends Accessor, Evented {
-    actions: Collection<Collection<Action>>;
+    /**
+     * [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) objects. Each action may be executed by clicking the icon or image symbolizing them in the popup. By default, every popup has a `zoom-to` action styled with a magnifying glass icon ![popupTemplate-zoom-action](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-zoom-action.png). When this icon is clicked, the view zooms in four LODs and centers on the selected feature.  You may override this action by removing it from the actions [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) or by setting the [overwriteActions](esri-PopupTemplate.html#overwriteActions) property to `true` in a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html). The order of each action in the popup is the order in which they appear in the actions [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html).  The [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#event:trigger-action) event fires each time an action in the popup is clicked. This event should be used to execute custom code for each action clicked. For example, if you would like to add a `zoom-out` action to the popup that zooms the view out several LODs, you would define the zoom-out code in a separate function. Then you would call the custom `zoom-out` function in the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#event:trigger-action) event handler. See the sample code snippet below for more details on how this works.  Actions are defined with the properties listed in the [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#actions)
+     */
+    actions: Collection<Action>;
+    /**
+     * This closes the popup when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) camera or [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#autoCloseEnabled)
+     * 
+     * @default false
+     */
     autoCloseEnabled: boolean;
-    content: string | Node;
-    featureCount: number;
+    /**
+     * The content of the popup. When set directly on the Popup, this content may only be static and cannot use fields to set content templates. To set a template for the content based on field or attribute names, see [PopupTemplate.content](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#content).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#content)
+     */
+    content: string | HTMLElement | Widget;
+    /**
+     * The number of selected [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features) available to the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#featureCount)
+     * 
+     * @default 0
+     */
+    readonly featureCount: number;
+    /**
+     * An array of features associated with the popup. Each graphic in this array must have a valid [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) set. They may share the same [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) or have unique [PopupTemplates](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) depending on their attributes. The [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#content) and [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#title) of the poup is set based on the `content` and `title` properties of each graphic's respective [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  When more than one graphic exists in this array, the current content of the Popup is set based on the value of the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeature).  This value is `null` if no features are associated with the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features)
+     */
     features: Graphic[];
+    /**
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions) set on the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Currently highlight only works in 3D.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#highlightEnabled)
+     * 
+     * @default true
+     */
     highlightEnabled: boolean;
+    /**
+     * Geometry used to position the popup. This is automatically set when viewing the popup by selecting a feature. If using the Popup to display content not related to features in the map, such as the results from a task, then you must set this property before making the popup [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#visible) to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#location)
+     */
     location: Point;
-    pendingPromisesCount: number;
-    promiseCount: number;
+    /**
+     * The number of [promises](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#promises) remaining to be resolved.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#pendingPromisesCount)
+     * 
+     * @default 0
+     */
+    readonly pendingPromisesCount: number;
+    /**
+     * The number of selected [promises](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#promises) available to the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#promiseCount)
+     * 
+     * @default 0
+     */
+    readonly promiseCount: number;
+    /**
+     * An array of pending Promises that have not yet been fulfilled. If there are no pending Promises, the value is `null`. When the pending Promises are resolved they are removed from this array and the features they return are pushed into the [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#promises)
+     */
     promises: IPromise<any>[];
-    selectedFeature: Graphic;
+    /**
+     * The selected feature accessed by the popup. The content of the Popup is determined based on the [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) assigned to this feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeature)
+     */
+    readonly selectedFeature: Graphic;
+    /**
+     * Index of the feature that is [selected](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeature). When [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features) are set, the first index is automatically selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeatureIndex)
+     */
     selectedFeatureIndex: number;
-    state: string;
+    /**
+     * The view model's state.  **Known Values:** ready | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The title of the popup. This can be set generically on the popup no matter the features that are selected. If the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeature) has a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html), then the title set in the corresponding template is used here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#title)
+     */
     title: string;
+    /**
+     * The view associated with the Popup instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * Indicates whether the popup is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#visible)
+     */
     visible: boolean;
 
+    /**
+     * Removes [promises](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#promises), [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features), [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#content), [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#title) and [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#location) from the Popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#clear)
+     * 
+     * 
+     */
     clear(): void;
+    /**
+     * Selects the feature at the next index in relation to the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#next)
+     * 
+     * 
+     */
     next(): PopupViewModel;
+    /**
+     * Selects the feature at the previous index in relation to the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#previous)
+     * 
+     * 
+     */
     previous(): PopupViewModel;
+    /**
+     * Triggers the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#event:trigger-action) event and executes the [action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#actions) at the specified index in the [actions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#actions) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#triggerAction)
+     * 
+     * @param actionIndex The index of the [action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#actions) to execute.
+     * 
+     */
     triggerAction(actionIndex: number): void;
+
+
+    on(name: "trigger-action", eventHandler: PopupViewModelTriggerActionEventHandler): IHandle;
+
+    on(name: "trigger-action", modifiers: string[], eventHandler: PopupViewModelTriggerActionEventHandler): IHandle;
   }
 
   interface PopupViewModelConstructor {
+    /**
+     * Provides the logic for the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) widget, which allows users to view content from feature attributes. Popups enhance web applications by providing users with a simple way to interact with and view attributes in a layer. They play an important role in relaying information to the user, which improves the storytelling capabilities of the application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html)
+     */
+
     new(properties?: PopupViewModelProperties): PopupViewModel;
   }
 
   export const PopupViewModel: PopupViewModelConstructor;
 
   interface PopupViewModelProperties {
-    actions?: CollectionProperties<CollectionProperties<ActionProperties>>;
+    /**
+     * [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) objects. Each action may be executed by clicking the icon or image symbolizing them in the popup. By default, every popup has a `zoom-to` action styled with a magnifying glass icon ![popupTemplate-zoom-action](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/popuptemplate-zoom-action.png). When this icon is clicked, the view zooms in four LODs and centers on the selected feature.  You may override this action by removing it from the actions [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) or by setting the [overwriteActions](esri-PopupTemplate.html#overwriteActions) property to `true` in a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html). The order of each action in the popup is the order in which they appear in the actions [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html).  The [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#event:trigger-action) event fires each time an action in the popup is clicked. This event should be used to execute custom code for each action clicked. For example, if you would like to add a `zoom-out` action to the popup that zooms the view out several LODs, you would define the zoom-out code in a separate function. Then you would call the custom `zoom-out` function in the [trigger-action](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#event:trigger-action) event handler. See the sample code snippet below for more details on how this works.  Actions are defined with the properties listed in the [Action](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html) class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#actions)
+     */
+    actions?: CollectionProperties<ActionProperties>;
+    /**
+     * This closes the popup when the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) camera or [Viewpoint](https://developers.arcgis.com/javascript/latest/api-reference/esri-Viewpoint.html) changes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#autoCloseEnabled)
+     * 
+     * @default false
+     */
     autoCloseEnabled?: boolean;
-    content?: string | Node;
-    featureCount?: number;
+    /**
+     * The content of the popup. When set directly on the Popup, this content may only be static and cannot use fields to set content templates. To set a template for the content based on field or attribute names, see [PopupTemplate.content](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#content).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#content)
+     */
+    content?: string | HTMLElement | WidgetProperties;
+    /**
+     * An array of features associated with the popup. Each graphic in this array must have a valid [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) set. They may share the same [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) or have unique [PopupTemplates](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html) depending on their attributes. The [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#content) and [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#title) of the poup is set based on the `content` and `title` properties of each graphic's respective [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).  When more than one graphic exists in this array, the current content of the Popup is set based on the value of the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeature).  This value is `null` if no features are associated with the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features)
+     */
     features?: GraphicProperties[];
+    /**
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#highlightOptions) set on the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Currently highlight only works in 3D.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#highlightEnabled)
+     * 
+     * @default true
+     */
     highlightEnabled?: boolean;
+    /**
+     * Geometry used to position the popup. This is automatically set when viewing the popup by selecting a feature. If using the Popup to display content not related to features in the map, such as the results from a task, then you must set this property before making the popup [visible](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#visible) to the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#location)
+     */
     location?: PointProperties;
-    pendingPromisesCount?: number;
-    promiseCount?: number;
+    /**
+     * An array of pending Promises that have not yet been fulfilled. If there are no pending Promises, the value is `null`. When the pending Promises are resolved they are removed from this array and the features they return are pushed into the [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features) array.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#promises)
+     */
     promises?: IPromise<any>[];
-    selectedFeature?: GraphicProperties;
+    /**
+     * Index of the feature that is [selected](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeature). When [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#features) are set, the first index is automatically selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeatureIndex)
+     */
     selectedFeatureIndex?: number;
-    state?: string;
+    /**
+     * The title of the popup. This can be set generically on the popup no matter the features that are selected. If the [selected feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#selectedFeature) has a [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html), then the title set in the corresponding template is used here.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#title)
+     */
     title?: string;
+    /**
+     * The view associated with the Popup instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * Indicates whether the popup is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#visible)
+     */
     visible?: boolean;
   }
 
-  export interface PopupDockOptions {
+  export interface PopupViewModelTriggerActionEvent {
+
+    action: Action;
+  }
+
+
+  export interface PopupDockOptions extends Object {
+    /**
+     * Defines the dimensions of the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) at which to dock the popup. Set to `false` to disable docking at a breakpoint.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions)
+     * 
+     * @default true
+     */
     breakpoint?: boolean | PopupDockOptionsBreakpoint;
+    /**
+     * If `true`, displays the dock button. If `false`, hides the dock button from the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions)
+     */
     buttonEnabled?: boolean;
+    /**
+     * The position in the view at which to dock the popup. Can be set as either a string or function. See the table below for known string values and their position in the view based on the view's size. 
+     * 
+     * Known Value | View size > breakpoint | View size < breakpoint
+     * --------------- | ------------------------------- | -------------
+     * auto | top-right | bottom 100%
+     * top-left | top-left | top 100%
+     * top-center | top-center | top 100%
+     * top-right | top-right | top 100%
+     * bottom-left | bottom-left | bottom 100%
+     * bottom-center | bottom-center | bottom 100%
+     * bottom-right | bottom-right | bottom 100%
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions)
+     * 
+     * @default auto
+     */
     position?: string | Function;
   }
 
-  export interface PopupDockOptionsBreakpoint {
+
+  export interface PopupDockOptionsBreakpoint extends Object {
+    /**
+     * The maximum width of the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) at which the popup will be set to dockEnabled automatically.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions)
+     * 
+     * @default 544
+     */
     width?: number;
+    /**
+     * The maximum height of the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) at which the popup will be set to dockEnabled automatically.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#dockOptions)
+     * 
+     * @default 544
+     */
     height?: number;
   }
 
-  export interface PopupOpenOptions {
+
+  export interface PopupOpenOptions extends Object {
+    /**
+     * Sets the [title](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#title) of the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     */
     title?: string;
+    /**
+     * Sets the the [content](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#content) of the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     */
     content?: string;
+    /**
+     * Sets the popup's [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location), which is the geometry used to position the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     */
     location?: Geometry;
+    /**
+     * Sets the popup's [features](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#features), which populate the title and content of the popup based on each graphic's [PopupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     */
     features?: Graphic[];
+    /**
+     * Sets pending [promises](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#promises) on the popup. The popup will display once the promises resolve. Each promise must resolve to an array of [Graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     */
     promises?: IPromise<any>[];
+    /**
+     * **Since:** 4.5    This property enables multiple features in a popup to display in a list rather than displaying the first selected feature. Setting this to `true` allows the user to scroll through the list of features returned from the query and choose the selection they want to display within the popup.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     * 
+     * @default false
+     */
     featureMenuOpen?: boolean;
+    /**
+     * When `true` indicates the popup should update its [location](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#location) for each paginated feature based on the [selected feature's](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#selectedFeature) geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     * 
+     * @default false
+     */
     updateLocationEnabled?: boolean;
+    /**
+     * **Since:** 4.5    When `true`, indicates that only the popup header will display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
+     * 
+     * @default false
+     */
     collapsed?: boolean;
   }
 
   interface Print extends Widget {
+    /**
+     * The URL of the REST endpoint of the Export Web Map Task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#printServiceUrl)
+     */
     printServiceUrl: string;
+    /**
+     * Defines the layout template options used by the [Print](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html) widget to generate the print page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#templateOptions)
+     */
+    templateOptions: TemplateOptions;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#view)
+     */
     view: MapView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [PrintViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#viewModel)
+     */
     viewModel: PrintViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#render)
+     * 
+     * 
+     */
     render(): any;
   }
 
   interface PrintConstructor {
+    /**
+     * The Print widget connects your application with a [printing service](https://server.arcgis.com/en/portal/latest/administer/windows/configure-the-portal-to-print-maps.htm) to allow the map to be printed. It takes advantage of server-side, high-quality, full cartographic print functionality using the ExportWebMap service of ArcGIS, which can be configured with custom layout templates. One is provided that shows the map only, while another provides a layout with legend, etc. The Print widget works with the [PrintTask](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-PrintTask.html) which generates a printer-ready version of the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html)
+     */
+
     new(properties?: PrintProperties): Print;
   }
 
   export const Print: PrintConstructor;
 
   interface PrintProperties extends WidgetProperties {
+    /**
+     * The URL of the REST endpoint of the Export Web Map Task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#printServiceUrl)
+     */
     printServiceUrl?: string;
+    /**
+     * Defines the layout template options used by the [Print](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html) widget to generate the print page.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#templateOptions)
+     */
+    templateOptions?: TemplateOptionsProperties;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#view)
+     */
     view?: MapViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [PrintViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#viewModel)
+     */
     viewModel?: PrintViewModelProperties;
   }
 
   interface PrintViewModel extends Accessor {
+    /**
+     * The URL of the REST endpoint of the Export Web Map Task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#printServiceUrl)
+     */
     printServiceUrl: string;
+    /**
+     * The time interval in milliseconds between each job status request sent to an asynchronous GP task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#updateDelay)
+     * 
+     * @default 1000
+     */
     updateDelay: number;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#view)
+     */
     view: MapView;
 
+    /**
+     * Prints (exports) the current MapView according to selected options.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#print)
+     * 
+     * @param printTemplate The [PrintTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html) is used to specify the layout template options which is then used by the PrintTask to generate the print page.
+     * 
+     */
     print(printTemplate: PrintTemplate): IPromise<any>;
   }
 
   interface PrintViewModelConstructor {
+
+
     new(properties?: PrintViewModelProperties): PrintViewModel;
   }
 
   export const PrintViewModel: PrintViewModelConstructor;
 
   interface PrintViewModelProperties {
+    /**
+     * The URL of the REST endpoint of the Export Web Map Task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#printServiceUrl)
+     */
     printServiceUrl?: string;
+    /**
+     * The time interval in milliseconds between each job status request sent to an asynchronous GP task.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#updateDelay)
+     * 
+     * @default 1000
+     */
     updateDelay?: number;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#view)
+     */
     view?: MapViewProperties;
   }
 
+  interface TemplateOptions extends Accessor {
+    /**
+     * When `false`, the attribution is not displayed on the printout. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout) value is `map-only`. Reference our policies on [Licensing & Attribution](https://developers.arcgis.com/javascript/latest/guide/licensing/) for specific attribution requirements.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#attributionEnabled)
+     * 
+     * @default true
+     */
+    attributionEnabled: boolean;
+    /**
+     * The text used for the author if the specified layout contains an author text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#author)
+     */
+    author: string;
+    /**
+     * The text used for the copyright if the specified layout contains an copyright text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#copyright)
+     */
+    copyright: string;
+    /**
+     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#format)
+     */
+    format: string;
+    /**
+     * Map height. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout) value is `map-only`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#height)
+     */
+    height: number;
+    /**
+     * The layout used for the print output. When the value is `map-only` or is empty, the output map does not contain any page layout surroundings (for example, title, legend, scale bar and so forth). The print service provides out-of-the-box templates listed in possible values. The server administrator can add additional templates to the print service.  Possible values are listed below:
+     * 
+     * Value | Description
+     * | --- | ---
+     * map-only | Map does not contain any layout elements. Only map image is printed.
+     * a3-landscape | 16.54 x 11.69 in
+     * a3-portrait | 11.69 x 16.54 in
+     * a4-landscape | 11.69 x 8.27 in
+     * a4-portrait | 8.27 × 11.69 in
+     * letter-ansi-a-landscape | 11.0 x 8.5 in
+     * letter-ansi-a-portrait | 8.5 x 11.0 in
+     * tabloid-ansi-b-landscape| 17.0 x 11.0 in
+     * tabloid-ansi-b-portrait | 11.0 x 17.0 in
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout)
+     */
+    layout: string;
+    /**
+     * When `false`, the legend is not displayed on the printout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#legendEnabled)
+     * 
+     * @default true
+     */
+    legendEnabled: boolean;
+    /**
+     * When `true`, scale is used in the printed map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#scaleEnabled)
+     * 
+     * @default false
+     */
+    scaleEnabled: boolean;
+    /**
+     * The text used for the map title if the specified layout contains a title text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#title)
+     */
+    title: string;
+    /**
+     * Map width. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout) value is `map-only`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#width)
+     */
+    width: number;
+  }
+
+  interface TemplateOptionsConstructor {
+
+
+    new(properties?: TemplateOptionsProperties): TemplateOptions;
+  }
+
+  export const TemplateOptions: TemplateOptionsConstructor;
+
+  interface TemplateOptionsProperties {
+    /**
+     * When `false`, the attribution is not displayed on the printout. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout) value is `map-only`. Reference our policies on [Licensing & Attribution](https://developers.arcgis.com/javascript/latest/guide/licensing/) for specific attribution requirements.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#attributionEnabled)
+     * 
+     * @default true
+     */
+    attributionEnabled?: boolean;
+    /**
+     * The text used for the author if the specified layout contains an author text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#author)
+     */
+    author?: string;
+    /**
+     * The text used for the copyright if the specified layout contains an copyright text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#copyright)
+     */
+    copyright?: string;
+    /**
+     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#format)
+     */
+    format?: string;
+    /**
+     * Map height. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout) value is `map-only`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#height)
+     */
+    height?: number;
+    /**
+     * The layout used for the print output. When the value is `map-only` or is empty, the output map does not contain any page layout surroundings (for example, title, legend, scale bar and so forth). The print service provides out-of-the-box templates listed in possible values. The server administrator can add additional templates to the print service.  Possible values are listed below:
+     * 
+     * Value | Description
+     * | --- | ---
+     * map-only | Map does not contain any layout elements. Only map image is printed.
+     * a3-landscape | 16.54 x 11.69 in
+     * a3-portrait | 11.69 x 16.54 in
+     * a4-landscape | 11.69 x 8.27 in
+     * a4-portrait | 8.27 × 11.69 in
+     * letter-ansi-a-landscape | 11.0 x 8.5 in
+     * letter-ansi-a-portrait | 8.5 x 11.0 in
+     * tabloid-ansi-b-landscape| 17.0 x 11.0 in
+     * tabloid-ansi-b-portrait | 11.0 x 17.0 in
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout)
+     */
+    layout?: string;
+    /**
+     * When `false`, the legend is not displayed on the printout.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#legendEnabled)
+     * 
+     * @default true
+     */
+    legendEnabled?: boolean;
+    /**
+     * When `true`, scale is used in the printed map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#scaleEnabled)
+     * 
+     * @default false
+     */
+    scaleEnabled?: boolean;
+    /**
+     * The text used for the map title if the specified layout contains a title text element.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#title)
+     */
+    title?: string;
+    /**
+     * Map width. This only applies when the [layout](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout) value is `map-only`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#width)
+     */
+    width?: number;
+  }
+
   interface ScaleBar extends Widget {
+    /**
+     * The style for the scale bar. Valid values are `ruler` or `line`. When `unit` is set to `dual`, the style will always be `line`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#style)
+     */
     style: string;
+    /**
+     * Units to use for the scale bar. Valid values are `non-metric`, `metric` or `dual`. When using `dual`, the scale bar displays both metric and non-metric units. Metric values shows either kilometers or meters depending on the scale, and similarly non-metric values shows miles and feet depending on the scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#unit)
+     * 
+     * @default non-metric (i.e. miles and feet)
+     */
     unit: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#view)
+     */
     view: MapView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [ScaleBarViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar-ScaleBarViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#viewModel)
+     */
     viewModel: ScaleBarViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#render)
+     * 
+     * 
+     */
     render(): any;
   }
 
   interface ScaleBarConstructor {
+    /**
+     * The ScaleBar widget displays a scale bar on the map or in a specified HTML node. The widget respects various coordinate systems and displays units in metric or non-metric values. Metric values shows either kilometers or meters depending on the scale, and likewise non-metric values shows miles and feet depending on the scale. When working with Web Mercator or geographic coordinate systems the scale bar takes into account projection distortion and dynamically adjusts the scale bar. The ScaleBar sample, which uses a map using the Web Mercator projection, shows this behavior. Open the sample and note that as you pan the map south towards the equator the scale bar gets shorter and as you pan north it gets longer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html)
+     */
+
     new(properties?: ScaleBarProperties): ScaleBar;
   }
 
   export const ScaleBar: ScaleBarConstructor;
 
   interface ScaleBarProperties extends WidgetProperties {
+    /**
+     * The style for the scale bar. Valid values are `ruler` or `line`. When `unit` is set to `dual`, the style will always be `line`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#style)
+     */
     style?: string;
+    /**
+     * Units to use for the scale bar. Valid values are `non-metric`, `metric` or `dual`. When using `dual`, the scale bar displays both metric and non-metric units. Metric values shows either kilometers or meters depending on the scale, and similarly non-metric values shows miles and feet depending on the scale.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#unit)
+     * 
+     * @default non-metric (i.e. miles and feet)
+     */
     unit?: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#view)
+     */
     view?: MapViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [ScaleBarViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar-ScaleBarViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#viewModel)
+     */
     viewModel?: ScaleBarViewModelProperties;
   }
 
   interface ScaleBarViewModel extends Accessor {
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar-ScaleBarViewModel.html#view)
+     */
     view: MapView;
   }
 
   interface ScaleBarViewModelConstructor {
+
+
     new(properties?: ScaleBarViewModelProperties): ScaleBarViewModel;
   }
 
   export const ScaleBarViewModel: ScaleBarViewModelConstructor;
 
   interface ScaleBarViewModelProperties {
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar-ScaleBarViewModel.html#view)
+     */
     view?: MapViewProperties;
   }
 
   interface Search extends Widget {
-    activeSource: FeatureLayer | Locator;
+    /**
+     * The [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources) object currently selected. Can be either a [feature layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or a [locator task](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#activeSource)
+     */
+    readonly activeSource: FeatureLayer | Locator;
+    /**
+     * The selected source's index. This value is `-1` when all sources are selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#activeSourceIndex)
+     * 
+     * @default 0
+     */
     activeSourceIndex: number;
+    /**
+     * String value used as a hint for input text when searching on multiple sources. See the image below to view the location and style of this text in the context of the widget.  ![search-allPlaceholder](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-allplaceholder.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#allPlaceholder)
+     * 
+     * @default "Find address or place"
+     */
     allPlaceholder: string;
+    /**
+     * Indicates whether to automatically select and zoom to the first geocoded result. If `false`, the [findAddressCandidates](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-find-address-candidates.htm) operation will still geocode the input string, but the top result will not be selected. To work with the geocoded results, you can set up a [search-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#event:search-complete) event handler and get the results through the event object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#autoSelect)
+     * 
+     * @default true
+     */
     autoSelect: boolean;
-    defaultSource: LocatorSource | FeatureLayerSource;
+    /**
+     * The default source used for the Search widget. These can range from a [Locator Source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource) to a [Feature Layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#defaultSource)
+     */
+    readonly defaultSource: LocatorSource | FeatureLayerSource;
+    /**
+     * Enables location services within the widget.  ![locationEnabled](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-locationEnabled.png) 
+     * > The use of this property is only supported on secure origins. To use it, switch your application to a secure origin, such as HTTPS. Note that localhost is considered "potentially secure" and can be used for easy testing in browsers that supports [Window.isSecureContext](https://developer.mozilla.org/en-US/docs/Web/API/Window/isSecureContext#Browser_compatibility) (currently Chrome and Firefox).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#locationEnabled)
+     * 
+     * @default true
+     */
+    locationEnabled: boolean;
+    /**
+     * The maximum number of results returned by the widget if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#maxResults)
+     * 
+     * @default 6
+     */
     maxResults: number;
+    /**
+     * The maximum number of suggestions returned by the widget if not specified by the source.  If working with the default [ArcGIS Online Geocoding service](https://developers.arcgis.com/rest/geocode/api-reference/overview-world-geocoding-service.htm), the default remains at `5`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#maxSuggestions)
+     * 
+     * @default 6
+     */
     maxSuggestions: number;
+    /**
+     * The minimum number of characters needed for the search if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#minSuggestCharacters)
+     * 
+     * @default 1
+     */
     minSuggestCharacters: number;
+    /**
+     * Indicates whether to display the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) on feature click. The graphic can be clicked to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html). This is not the same as using [popupOpenOnSelect](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupOpenOnSelect) which opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but it is not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected. Using `popupOpenOnSelect` opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupOpenOnSelect)
+     * 
+     * @default true
+     */
     popupOpenOnSelect: boolean;
+    /**
+     * A customized PopupTemplate for the selected feature. Note that specifying a wildcard {*} for the popupTemplate will return all fields in addition to search-specific fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
-    resultGraphic: Graphic;
+    /**
+     * The graphic used to highlight the resulting feature or location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultGraphic)
+     */
+    readonly resultGraphic: Graphic;
+    /**
+     * Indicates if the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultGraphic) will display at the location of the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultGraphicEnabled)
+     * 
+     * @default true
+     */
     resultGraphicEnabled: boolean;
+    /**
+     * An array of objects, each containing a [SearchResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResult) from the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#results)
+     */
     results: any[];
+    /**
+     * Indicates whether to display the option to search all sources. When `true`, the "All" option is displayed by default:  ![search-searchAllEnabled-true](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-true.png)  When `false`, no option to search all sources at once is available:  ![search-searchAllEnabled-false](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-false.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#searchAllEnabled)
+     * 
+     * @default true
+     */
     searchAllEnabled: boolean;
-    searching: boolean;
+    /**
+     * The value of the search box input text string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#searchTerm)
+     */
     searchTerm: string;
-    selectedResult: SearchResult;
+    /**
+     * The result selected from a search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#selectedResult)
+     */
+    readonly selectedResult: SearchResult;
+    /**
+     * The Search widget may be used to search features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or geocode locations with a [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html). The `sources` property defines the sources from which to search for the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#view) specified by the Search widget instance. There are two types of sources: 
+     *   * [LocatorSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     *   * [FeatureLayerSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     *   
+     *   
+     * Any combination of one or more [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource) and [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource) sources may be used together in the same instance of the Search widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources)
+     */
     sources: Collection<FeatureLayerSource | LocatorSource>;
-    suggestions: SuggestResult[];
+    /**
+     * The current state of the widget.  **Known Values:** ready | disabled | searching
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#state)
+     * 
+     * @default ready
+     */
+    readonly state: string;
+    /**
+     * An array of results from the [suggest method](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#suggest).  This is available if working with a 10.3 geocoding service that has [suggest capability loaded](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e. `supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#suggestions)
+     */
+    readonly suggestions: SuggestResult[];
+    /**
+     * Enable suggestions for the widget.  This is only available if working with a 10.3 geocoding service that has [suggest capability loaded](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e. `supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#suggestionsEnabled)
+     * 
+     * @default true
+     */
     suggestionsEnabled: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [SearchViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#viewModel)
+     */
     viewModel: SearchViewModel;
 
+    /**
+     * Unfocuses the widget's text input.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#blur)
+     * 
+     * 
+     */
     blur(): void;
+    /**
+     * Clears the current searchTerm, search results, suggest results, graphic, and graphics layer. It also hides any open menus.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#clear)
+     * 
+     * 
+     */
     clear(): void;
+    /**
+     * Brings focus to the widget's text input.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#focus)
+     * 
+     * 
+     */
     focus(): void;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * Depending on the sources specified, search() queries the feature layer(s) and/or performs address matching using any specified [Locator(s)](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html) and returns any applicable results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#search)
+     * 
+     * @param searchTerm This searchTerm can be a string, geometry, suggest candidate object, or an array of [longitude,latitude] coordinate pairs. If a geometry is supplied, then it will reverse geocode (locator) or findAddressCandidates with geometry instead of text.
+     * 
+     */
     search(searchTerm?: string | Geometry | SuggestResult | number[][]): IPromise<SearchResponse>;
+    /**
+     * Performs a suggest() request on the active Locator. It also uses the current value of the widget or one that is passed in.  Suggestions are available if working with a 10.3 geocoding service that has [suggest capability loaded](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e. `supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#suggest)
+     * 
+     * @param value The string value used to suggest() on an active Locator or feature layer. If nothing is passed in, takes the current value of the widget.
+     * 
+     */
     suggest(value?: string): IPromise<SuggestResponse>;
   }
 
   interface SearchConstructor {
+    /**
+     * The Search widget provides a way to perform search operations on [locator service(s)](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html) and/or [map](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html)/[feature](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) service feature layer(s). If using a locator with a geocoding service, the [findAddressCandidates](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-find-address-candidates.htm) operation is used, whereas [queries](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) are used on feature layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html)
+     */
+
     new(properties?: SearchProperties): Search;
   }
 
   export const Search: SearchConstructor;
 
   interface SearchProperties extends WidgetProperties {
-    activeSource?: FeatureLayerProperties | LocatorProperties;
+    /**
+     * The selected source's index. This value is `-1` when all sources are selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#activeSourceIndex)
+     * 
+     * @default 0
+     */
     activeSourceIndex?: number;
+    /**
+     * String value used as a hint for input text when searching on multiple sources. See the image below to view the location and style of this text in the context of the widget.  ![search-allPlaceholder](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-allplaceholder.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#allPlaceholder)
+     * 
+     * @default "Find address or place"
+     */
     allPlaceholder?: string;
+    /**
+     * Indicates whether to automatically select and zoom to the first geocoded result. If `false`, the [findAddressCandidates](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-find-address-candidates.htm) operation will still geocode the input string, but the top result will not be selected. To work with the geocoded results, you can set up a [search-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#event:search-complete) event handler and get the results through the event object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#autoSelect)
+     * 
+     * @default true
+     */
     autoSelect?: boolean;
-    defaultSource?: LocatorSource | FeatureLayerSource;
+    /**
+     * Enables location services within the widget.  ![locationEnabled](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-locationEnabled.png) 
+     * > The use of this property is only supported on secure origins. To use it, switch your application to a secure origin, such as HTTPS. Note that localhost is considered "potentially secure" and can be used for easy testing in browsers that supports [Window.isSecureContext](https://developer.mozilla.org/en-US/docs/Web/API/Window/isSecureContext#Browser_compatibility) (currently Chrome and Firefox).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#locationEnabled)
+     * 
+     * @default true
+     */
+    locationEnabled?: boolean;
+    /**
+     * The maximum number of results returned by the widget if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#maxResults)
+     * 
+     * @default 6
+     */
     maxResults?: number;
+    /**
+     * The maximum number of suggestions returned by the widget if not specified by the source.  If working with the default [ArcGIS Online Geocoding service](https://developers.arcgis.com/rest/geocode/api-reference/overview-world-geocoding-service.htm), the default remains at `5`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#maxSuggestions)
+     * 
+     * @default 6
+     */
     maxSuggestions?: number;
+    /**
+     * The minimum number of characters needed for the search if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#minSuggestCharacters)
+     * 
+     * @default 1
+     */
     minSuggestCharacters?: number;
+    /**
+     * Indicates whether to display the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) on feature click. The graphic can be clicked to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html). This is not the same as using [popupOpenOnSelect](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupOpenOnSelect) which opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but it is not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupEnabled)
+     * 
+     * @default true
+     */
     popupEnabled?: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected. Using `popupOpenOnSelect` opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupOpenOnSelect)
+     * 
+     * @default true
+     */
     popupOpenOnSelect?: boolean;
+    /**
+     * A customized PopupTemplate for the selected feature. Note that specifying a wildcard {*} for the popupTemplate will return all fields in addition to search-specific fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
-    resultGraphic?: GraphicProperties;
+    /**
+     * Indicates if the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultGraphic) will display at the location of the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultGraphicEnabled)
+     * 
+     * @default true
+     */
     resultGraphicEnabled?: boolean;
+    /**
+     * An array of objects, each containing a [SearchResult](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResult) from the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#results)
+     */
     results?: any[];
+    /**
+     * Indicates whether to display the option to search all sources. When `true`, the "All" option is displayed by default:  ![search-searchAllEnabled-true](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-true.png)  When `false`, no option to search all sources at once is available:  ![search-searchAllEnabled-false](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-false.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#searchAllEnabled)
+     * 
+     * @default true
+     */
     searchAllEnabled?: boolean;
-    searching?: boolean;
+    /**
+     * The value of the search box input text string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#searchTerm)
+     */
     searchTerm?: string;
-    selectedResult?: SearchResult;
+    /**
+     * The Search widget may be used to search features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or geocode locations with a [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html). The `sources` property defines the sources from which to search for the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#view) specified by the Search widget instance. There are two types of sources: 
+     *   * [LocatorSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     *   * [FeatureLayerSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     *   
+     *   
+     * Any combination of one or more [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource) and [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource) sources may be used together in the same instance of the Search widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources)
+     */
     sources?: CollectionProperties<FeatureLayerSource | LocatorSource>;
-    suggestions?: SuggestResult[];
+    /**
+     * Enable suggestions for the widget.  This is only available if working with a 10.3 geocoding service that has [suggest capability loaded](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e. `supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#suggestionsEnabled)
+     * 
+     * @default true
+     */
     suggestionsEnabled?: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [SearchViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#viewModel)
+     */
     viewModel?: SearchViewModelProperties;
   }
 
   interface SearchViewModel extends Accessor, Evented {
-    activeSource: FeatureLayer | Locator;
+    /**
+     * The [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources) object currently selected. Can be either a [feature layer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or a [locator task](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#activeSource)
+     */
+    readonly activeSource: FeatureLayer | Locator;
+    /**
+     * The selected source's index. This value is `-1` when all sources are selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#activeSourceIndex)
+     * 
+     * @default 0
+     */
     activeSourceIndex: number;
+    /**
+     * String value used as a hint for input text when searching on multiple sources. See the image below to view the location and style of this text in the context of the widget.  ![search-allPlaceholder](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-allplaceholder.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#allPlaceholder)
+     * 
+     * @default "Find address or place"
+     */
     allPlaceholder: string;
+    /**
+     * Indicates whether to automatically select and zoom to the first geocoded result. If `false`, the [findAddressCandidates](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-find-address-candidates.htm) operation will still geocode the input string, but the top result will not be selected. To work with the geocoded results, you can set up a [search-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#event:search-complete) event handler and get the results through the event object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#autoSelect)
+     */
     autoSelect: boolean;
-    defaultSource: SearchViewModelFeatureLayerSource | SearchViewModelLocatorSource;
+    /**
+     * The default source used for the Search widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSource)
+     */
+    readonly defaultSource: SearchViewModelFeatureLayerSource | SearchViewModelLocatorSource;
+    /**
+     * The maximum character length of the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxInputLength)
+     */
     maxInputLength: number;
+    /**
+     * The maximum number of results returned by the widget if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxResults)
+     */
     maxResults: number;
+    /**
+     * The maximum number of suggestions returned by the widget if not specified by the source.  If working with the default [ArcGIS Online Geocoding service](https://developers.arcgis.com/rest/geocode/api-reference/overview-world-geocoding-service.htm), the default remains at `5`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxSuggestions)
+     */
     maxSuggestions: number;
+    /**
+     * The minimum number of characters needed for the search if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#minSuggestCharacters)
+     */
     minSuggestCharacters: number;
-    placeholder: string;
+    /**
+     * The placeholder used by the [activeSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#activeSource).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#placeholder)
+     */
+    readonly placeholder: string;
+    /**
+     * Indicates whether to display the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) on feature click. The graphic can be clicked to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html). This is not the same as using [popupOpenOnSelect](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupOpenOnSelect) which opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but it is not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupEnabled)
+     */
     popupEnabled: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected. Using `popupOpenOnSelect` opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupOpenOnSelect)
+     */
     popupOpenOnSelect: boolean;
+    /**
+     * A customized PopupTemplate for the selected feature. Note that specifying a wildcard {*} for the popupTemplate will return all fields in addition to search-specific fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupTemplate)
+     */
     popupTemplate: PopupTemplate;
-    resultGraphic: Graphic;
+    /**
+     * The graphic used to highlight the resulting feature or location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultGraphic)
+     */
+    readonly resultGraphic: Graphic;
+    /**
+     * Indicates if the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultGraphic) will display at the location of the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultGraphicEnabled)
+     * 
+     * @default true
+     */
     resultGraphicEnabled: boolean;
+    /**
+     * An array of current results from the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#results)
+     */
     results: any[];
+    /**
+     * Indicates whether to display the option to search all sources. When `true`, the "All" option is displayed by default:  ![search-searchAllEnabled-true](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-true.png)  When `false`, no option to search all sources at once is available:  ![search-searchAllEnabled-true-false](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-false.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#searchAllEnabled)
+     */
     searchAllEnabled: boolean;
+    /**
+     * The value of the search box input text string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#searchTerm)
+     */
     searchTerm: string;
-    selectedResult: any;
+    /**
+     * The result selected from a search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#selectedResult)
+     */
+    readonly selectedResult: any;
+    /**
+     * The Search widget may be used to search features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or geocode locations with a [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html). The `sources` property defines the sources from which to search for the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#view) specified by the Search widget instance. There are two types of sources: 
+     *   * [LocatorSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     *   * [FeatureLayerSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     *   
+     *   
+     * Any combination of one or more [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource) and [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource) sources may be used together in the same instance of the Search widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources)
+     */
     sources: Collection<FeatureLayerSource | LocatorSource>;
+    /**
+     * The millisecond delay after keyup and before making a [suggest](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggest) network request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggestionDelay)
+     */
     suggestionDelay: number;
-    suggestions: SearchViewModelSuggestResult[];
+    /**
+     * An array of results from the [suggest method](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggest).  This is available if working with a 10.3 geocoding service that has [suggest capability loaded](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e. `supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggestions)
+     */
+    readonly suggestions: SearchViewModelSuggestResult[];
+    /**
+     * Enable suggestions for the widget.  This is only available if working with a 10.3 geocoding service that has [suggest capability loaded] (https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e. `supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggestionsEnabled)
+     */
     suggestionsEnabled: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#view)
+     */
     view: MapView | SceneView;
 
+    /**
+     * Clears the current value, search results, suggest results, graphic, and graphics layer. It also hides any open menus.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#clear)
+     * 
+     * 
+     */
     clear(): void;
+    /**
+     * Depending on the sources specified, `search()` queries the feature layer(s) and/or performs address matching using any specified [Locator(s)](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html) and returns the applicable results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#search)
+     * 
+     * @param searchTerm This searchTerm can be a string, geometry, suggest candidate object, or an array of [latitude,longitude]. If a geometry is supplied, then it will reverse geocode (locator) or findAddressCandidates with geometry instead of text (featurelayer).
+     * 
+     */
     search(searchTerm?: string | Geometry | SearchViewModelSuggestResult | number[][]): IPromise<SearchViewModelSearchResponse>;
+    /**
+     * Performs a suggest() request on the active Locator. It also uses the current value of the widget or one that is passed in.  Suggestions are available if working with a 10.3 geocoding service that has [suggest capability loaded](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e.`supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggest)
+     * 
+     * @param value The string value used to suggest() on an active Locator or feature layer. If nothing is passed in, takes the current value of the widget.
+     * 
+     */
     suggest(value?: string): IPromise<SearchViewModelSuggestResponse>;
 
+
     on(name: "search-clear", eventHandler: SearchViewModelSearchClearEventHandler): IHandle;
+
     on(name: "search-clear", modifiers: string[], eventHandler: SearchViewModelSearchClearEventHandler): IHandle;
+
     on(name: "search-start", eventHandler: SearchViewModelSearchStartEventHandler): IHandle;
+
     on(name: "search-start", modifiers: string[], eventHandler: SearchViewModelSearchStartEventHandler): IHandle;
+
     on(name: "suggest-start", eventHandler: SearchViewModelSuggestStartEventHandler): IHandle;
+
     on(name: "suggest-start", modifiers: string[], eventHandler: SearchViewModelSuggestStartEventHandler): IHandle;
-    on(name: "load", eventHandler: SearchViewModelLoadEventHandler): IHandle;
-    on(name: "load", modifiers: string[], eventHandler: SearchViewModelLoadEventHandler): IHandle;
+
     on(name: "search-complete", eventHandler: SearchViewModelSearchCompleteEventHandler): IHandle;
+
     on(name: "search-complete", modifiers: string[], eventHandler: SearchViewModelSearchCompleteEventHandler): IHandle;
+
     on(name: "select-result", eventHandler: SearchViewModelSelectResultEventHandler): IHandle;
+
     on(name: "select-result", modifiers: string[], eventHandler: SearchViewModelSelectResultEventHandler): IHandle;
+
     on(name: "suggest-complete", eventHandler: SearchViewModelSuggestCompleteEventHandler): IHandle;
+
     on(name: "suggest-complete", modifiers: string[], eventHandler: SearchViewModelSuggestCompleteEventHandler): IHandle;
   }
 
   interface SearchViewModelConstructor {
+
+
     new(properties?: SearchViewModelProperties): SearchViewModel;
   }
 
   export const SearchViewModel: SearchViewModelConstructor;
 
   interface SearchViewModelProperties {
-    activeSource?: FeatureLayerProperties | LocatorProperties;
+    /**
+     * The selected source's index. This value is `-1` when all sources are selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#activeSourceIndex)
+     * 
+     * @default 0
+     */
     activeSourceIndex?: number;
+    /**
+     * String value used as a hint for input text when searching on multiple sources. See the image below to view the location and style of this text in the context of the widget.  ![search-allPlaceholder](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-allplaceholder.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#allPlaceholder)
+     * 
+     * @default "Find address or place"
+     */
     allPlaceholder?: string;
+    /**
+     * Indicates whether to automatically select and zoom to the first geocoded result. If `false`, the [findAddressCandidates](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-find-address-candidates.htm) operation will still geocode the input string, but the top result will not be selected. To work with the geocoded results, you can set up a [search-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#event:search-complete) event handler and get the results through the event object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#autoSelect)
+     */
     autoSelect?: boolean;
-    defaultSource?: SearchViewModelFeatureLayerSource | SearchViewModelLocatorSource;
+    /**
+     * The maximum character length of the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxInputLength)
+     */
     maxInputLength?: number;
+    /**
+     * The maximum number of results returned by the widget if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxResults)
+     */
     maxResults?: number;
+    /**
+     * The maximum number of suggestions returned by the widget if not specified by the source.  If working with the default [ArcGIS Online Geocoding service](https://developers.arcgis.com/rest/geocode/api-reference/overview-world-geocoding-service.htm), the default remains at `5`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxSuggestions)
+     */
     maxSuggestions?: number;
+    /**
+     * The minimum number of characters needed for the search if not specified by the source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#minSuggestCharacters)
+     */
     minSuggestCharacters?: number;
-    placeholder?: string;
+    /**
+     * Indicates whether to display the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) on feature click. The graphic can be clicked to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html). This is not the same as using [popupOpenOnSelect](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupOpenOnSelect) which opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but it is not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupEnabled)
+     */
     popupEnabled?: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected. Using `popupOpenOnSelect` opens the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) any time a search is performed.  It is possible to have `popupOpenOnSelect=false` but `popupEnabled=true` so the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) can be opened by someone but not opened by default.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupOpenOnSelect)
+     */
     popupOpenOnSelect?: boolean;
+    /**
+     * A customized PopupTemplate for the selected feature. Note that specifying a wildcard {*} for the popupTemplate will return all fields in addition to search-specific fields.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#popupTemplate)
+     */
     popupTemplate?: PopupTemplateProperties;
-    resultGraphic?: GraphicProperties;
+    /**
+     * Indicates if the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultGraphic) will display at the location of the selected feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultGraphicEnabled)
+     * 
+     * @default true
+     */
     resultGraphicEnabled?: boolean;
+    /**
+     * An array of current results from the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#results)
+     */
     results?: any[];
+    /**
+     * Indicates whether to display the option to search all sources. When `true`, the "All" option is displayed by default:  ![search-searchAllEnabled-true](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-true.png)  When `false`, no option to search all sources at once is available:  ![search-searchAllEnabled-true-false](https://developers.arcgis.com/javascript/latest/assets/img/apiref/widgets/search-enablesearchingall-false.png)
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#searchAllEnabled)
+     */
     searchAllEnabled?: boolean;
+    /**
+     * The value of the search box input text string.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#searchTerm)
+     */
     searchTerm?: string;
-    selectedResult?: any;
+    /**
+     * The Search widget may be used to search features in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or geocode locations with a [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html). The `sources` property defines the sources from which to search for the [view](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#view) specified by the Search widget instance. There are two types of sources: 
+     *   * [LocatorSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     *   * [FeatureLayerSource](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     *   
+     *   
+     * Any combination of one or more [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource) and [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource) sources may be used together in the same instance of the Search widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources)
+     */
     sources?: CollectionProperties<FeatureLayerSource | LocatorSource>;
+    /**
+     * The millisecond delay after keyup and before making a [suggest](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggest) network request.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggestionDelay)
+     */
     suggestionDelay?: number;
-    suggestions?: SearchViewModelSuggestResult[];
+    /**
+     * Enable suggestions for the widget.  This is only available if working with a 10.3 geocoding service that has [suggest capability loaded] (https://developers.arcgis.com/rest/geocode/api-reference/geocoding-suggest.htm) or a 10.3 feature layer that supports pagination, i.e. `supportsPagination = true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggestionsEnabled)
+     */
     suggestionsEnabled?: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
-  export interface SearchViewModelFeatureLayerSource {
+  /**
+   * The following properties define a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html)-based [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources) whose features may be searched by the Search widget.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+   */
+  export interface SearchViewModelFeatureLayerSource extends Object {
+    /**
+     * The Popup instance used for the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     popup: Popup;
-    autoNavigate: boolean;
-    exactMatch: boolean;
+    /**
+     * Indicates whether to automatically navigate to the selected result once selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    autoNavigate?: boolean;
+    /**
+     * Indicates to only return results that match the search value exactly. This property only applies to `string` field searches. `exactMatch` is always `true` when searching fields of type `number`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    exactMatch?: boolean;
+    /**
+     * The feature layer queried in the search. This is **required**.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     featureLayer: FeatureLayer;
+    /**
+     * As of version 4.4, this property replaces the now deprecated `searchQueryParams`, `suggestQueryParams`, and `searchExtent` properties. Please see the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     filter: SearchViewModelFeatureLayerSourceFilter;
-    maxResults: number;
-    maxSuggestions: number;
-    minSuggestCharacters: number;
+    /**
+     * Indicates the maximum number of search results to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    maxResults?: number;
+    /**
+     * Indicates the maximum number of suggestions to return for the widget's input.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    maxSuggestions?: number;
+    /**
+     * Indicates the minimum number of characters required before querying for a suggestion.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    minSuggestCharacters?: number;
+    /**
+     * The name of the source for display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     name: string;
+    /**
+     * Specifies the fields returned with the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     outFields: string[];
+    /**
+     * Used as a hint for the source input text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     placeholder: string;
+    /**
+     * The results are displayed using this field. Defaults to the layer's `displayField` or the first string field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     displayField: string;
-    popupEnabled: boolean;
-    popupOpenOnSelect: boolean;
+    /**
+     * Indicates whether to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a selected result is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    popupEnabled?: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    popupOpenOnSelect?: boolean;
+    /**
+     * Specify this to prefix the input for the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     prefix: string;
-    resultGraphicEnabled: boolean;
+    /**
+     * Indicates whether to show a graphic on the map for the selected source using the [resultSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultSymbol).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
+    resultGraphicEnabled?: boolean;
+    /**
+     * The symbol used for the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultGraphic).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     resultSymbol: Symbol;
+    /**
+     * An array of string values representing the names of fields in the feature layer to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     searchFields: string[];
+    /**
+     * Specify this to suffix the input for the search value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     suffix: string;
+    /**
+     * Indicates whether to display suggestions as the user enters input text in the widget. The default value is `true`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     suggestionsEnabled: boolean;
+    /**
+     * A template string used to display multiple fields in a defined order when suggestions are displayed. This takes precedence over `displayField`. Field names in the template must have the following format: `{FieldName}`. An example suggestionTemplate could look something like: `Name: {OWNER}, Parcel: {PARCEL_ID}`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     suggestionTemplate: string;
+    /**
+     * Indicates whether to constrain the search results to the view's extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     withinViewEnabled: boolean;
+    /**
+     * Applicable to the specified source. If the result does not have an associated extent, specify this number to use as the zoom scale for the result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     zoomScale: number;
   }
 
-  export interface SearchViewModelLoadEvent {
-  }
-
-  export interface SearchViewModelLocatorSource {
+  /**
+   * The following properties define a [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources) pointing to a [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html) that may be used to geocode locations with the Search widget.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+   */
+  export interface SearchViewModelLocatorSource extends Object {
+    /**
+     * Used as a hint for the source input text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     placeholder: string;
-    autoNavigate: boolean;
+    /**
+     * Indicates whether to automatically navigate to the selected result once selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    autoNavigate?: boolean;
+    /**
+     * Constricts search results to a specified country code. For example, `US` for United States or `SE` for Sweden. Only applies to the World Geocode Service. View the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     countryCode: string;
+    /**
+     * As of version 4.4, this property replaces the now deprecated `searchQueryParams`, `suggestQueryParams`, and `searchExtent` properties. Please see the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     filter: SearchViewModelLocatorSourceFilter;
+    /**
+     * Sets the sources for local `distance` and `minScale` for searching. See the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     localSearchOptions: SearchViewModelLocatorSourceLocalSearchOptions;
-    locationToAddressDistance: number;
+    /**
+     * When reverse geocoding a result, use this distance in meters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    locationToAddressDistance?: number;
+    /**
+     * The locator task used to search. This is **required** and defaults to the [World Geocoding Service](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     locator: Locator;
-    maxResults: number;
-    maxSuggestions: number;
-    minSuggestCharacters: number;
+    /**
+     * Indicates the maximum number of search results to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    maxResults?: number;
+    /**
+     * Indicates the maximum number of suggestions to return for the widget's input.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    maxSuggestions?: number;
+    /**
+     * Indicates the minimum number of characters required before querying for a suggestion.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    minSuggestCharacters?: number;
+    /**
+     * The name of the source for display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     name: string;
+    /**
+     * Specifies the fields returned with the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     outFields: string[];
+    /**
+     * A string array which limits the results to one or more categories. For example "Populated Place" or "airport". Only applicable when using the World Geocode Service. View the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     categories: string[];
+    /**
+     * The Popup instance used for the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     popup: Popup;
-    popupEnabled: boolean;
-    popupOpenOnSelect: boolean;
+    /**
+     * Indicates whether to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a selected result is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    popupEnabled?: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    popupOpenOnSelect?: boolean;
+    /**
+     * Specify this to prefix the input for the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     prefix: string;
-    resultGraphicEnabled: boolean;
+    /**
+     * Indicates whether to show a graphic on the map for the selected source using the [resultSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultSymbol).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    resultGraphicEnabled?: boolean;
+    /**
+     * The symbol used for the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#resultGraphic).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     resultSymbol: Symbol;
+    /**
+     * A template string used to display multiple fields in a defined order when results are displayed, e.g. `"{Street}, {City}, {ZIP}"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     searchTemplate: string;
+    /**
+     * The field name of the Single Line Address Field in the REST services directory for the locator service. Common values are `SingleLine` and `SingleLineFieldName`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     singleLineFieldName: string;
-    suggestionsEnabled: boolean;
+    /**
+     * Indicates whether to display suggestions as the user enters input text in the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
+    suggestionsEnabled?: boolean;
+    /**
+     * Specify this to suffix the input for the search value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     suffix: string;
+    /**
+     * Indicates whether to constrain the search results to the view's extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     withinViewEnabled: boolean;
+    /**
+     * Applicable to the specified source. If the result does not have an associated extent, specify this number to use as the zoom scale for the result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     zoomScale: number;
   }
 
@@ -10547,24 +45492,79 @@ declare namespace __esri {
   }
 
   export interface SearchViewModelSearchCompleteEvent {
+
     activeSourceIndex: number;
+
     errors: Error[];
+
     numResults: number;
+
     results: SearchViewModelSearchCompleteEventResults[];
+
     searchTerm: string;
   }
 
-  export interface SearchViewModelSearchResponse {
+  /**
+   * When resolved, returns this response after calling [search](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#search).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+   */
+  export interface SearchViewModelSearchResponse extends Object {
+    /**
+     * The index of the source from which the search result was obtained.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     activeSourceIndex: number;
+    /**
+     * An array of error objects returned from the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     errors: Error[];
+    /**
+     * The number of search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     numResults: number;
+    /**
+     * The searched expression
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     searchTerm: string;
+    /**
+     * An array of objects representing the results of search. See object specification table below for more information about the result object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     results: SearchViewModelSearchResponseResults[];
   }
 
-  export interface SearchViewModelSearchResult {
+  /**
+   * The result object returned from the [search](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#search).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResult)
+   */
+  export interface SearchViewModelSearchResult extends Object {
+    /**
+     * The extent, or bounding box, of the returned feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResult)
+     */
     extent: Extent;
+    /**
+     * The resulting feature or location obtained from the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResult)
+     */
     feature: Graphic;
+    /**
+     * The name of the result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResult)
+     */
     name: string;
   }
 
@@ -10572,478 +45572,1959 @@ declare namespace __esri {
   }
 
   export interface SearchViewModelSelectResultEvent {
+
     result: SearchViewModelSelectResultEventResult;
+
     source: any;
+
     sourceIndex: number;
   }
 
   export interface SearchViewModelSuggestCompleteEvent {
+
     activeSourceIndex: number;
+
     errors: Error[];
+
     numResults: number;
+
     results: SearchViewModelSuggestCompleteEventResults[];
+
     searchTerm: string;
   }
 
-  export interface SearchViewModelSuggestResponse {
+  /**
+   * When resolved, returns this reponse after calling [suggest](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggest).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+   */
+  export interface SearchViewModelSuggestResponse extends Object {
+    /**
+     * The index of the source from which suggestions are obtained. This value is `-1` when all sources are selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     activeSourceIndex: number;
+    /**
+     * An array of error objects returned from the suggest results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     errors: Error[];
+    /**
+     * The number of suggest results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     numResults: number;
+    /**
+     * The search expression used for the suggest.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     searchTerm: string;
+    /**
+     * An array of objects representing the results of suggest. See object specification table below for more information about the result object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     results: SearchViewModelSuggestResponseResults[];
   }
 
-  export interface SearchViewModelSuggestResult {
+  /**
+   * The result object returned from a [suggest](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#suggest).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResult)
+   */
+  export interface SearchViewModelSuggestResult extends Object {
+    /**
+     * The key related to the suggest result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResult)
+     */
     key: string;
+    /**
+     * The string name of the suggested location to geocode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResult)
+     */
     text: string;
+    /**
+     * The index of the currently selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResult)
+     */
     sourceIndex: number;
   }
 
   export interface SearchViewModelSuggestStartEvent {
   }
 
-  export interface SearchViewModelFeatureLayerSourceFilter {
+
+  export interface SearchViewModelFeatureLayerSourceFilter extends Object {
+    /**
+     * The where clause specified for filtering suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     where: string;
+    /**
+     * The filter geometry for suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#FeatureLayerSource)
+     */
     geometry: Geometry;
   }
 
-  export interface SearchViewModelLocatorSourceFilter {
+
+  export interface SearchViewModelLocatorSourceFilter extends Object {
+    /**
+     * The where clause specified for filtering suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     where: string;
+    /**
+     * The filter geometry for suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     geometry: Geometry;
   }
 
-  export interface SearchViewModelLocatorSourceLocalSearchOptions {
+
+  export interface SearchViewModelLocatorSourceLocalSearchOptions extends Object {
+    /**
+     * The distance to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     distance: number;
+    /**
+     * The minimum scale used to search locally.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#LocatorSource)
+     */
     minScale: number;
   }
 
-  export interface SearchViewModelSearchCompleteEventResults {
+
+  export interface SearchViewModelSearchCompleteEventResults extends Object {
+
     results: SearchResult[];
+
     sourceIndex: number;
+
     source: any[];
   }
 
-  export interface SearchViewModelSearchResponseResults {
+
+  export interface SearchViewModelSearchResponseResults extends Object {
+    /**
+     * An array of search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     results: SearchViewModelSearchResult[];
+    /**
+     * The index of the currently selected source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     sourceIndex: number;
+    /**
+     * The [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources) of the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SearchResponse)
+     */
     source: any;
   }
 
-  export interface SearchViewModelSelectResultEventResult {
+
+  export interface SearchViewModelSelectResultEventResult extends Object {
+
     extent: Extent;
+
     feature: Graphic;
+
     name: string;
   }
 
-  export interface SearchViewModelSuggestCompleteEventResults {
+
+  export interface SearchViewModelSuggestCompleteEventResults extends Object {
+
     results: SearchViewModelSuggestResult[];
+
     sourceIndex: number;
+
     source: any;
   }
 
-  export interface SearchViewModelSuggestResponseResults {
+
+  export interface SearchViewModelSuggestResponseResults extends Object {
+    /**
+     * An array of suggest results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     results: SearchViewModelSuggestResult[];
+    /**
+     * The index of the currently selected source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     sourceIndex: number;
+    /**
+     * The [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources) of the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#SuggestResponse)
+     */
     source: any;
   }
 
-  export interface FeatureLayerSource {
+  /**
+   * The following properties define a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html)-based [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources) whose features may be searched by the Search widget.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+   */
+  export interface FeatureLayerSource extends Object {
+    /**
+     * The Popup instance used for the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     popup: Popup;
-    autoNavigate: boolean;
-    exactMatch: boolean;
+    /**
+     * Indicates whether to automatically navigate to the selected result once selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    autoNavigate?: boolean;
+    /**
+     * Indicates to only return results that match the search value exactly. This property only applies to `string` field searches. `exactMatch` is always `true` when searching fields of type `number`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    exactMatch?: boolean;
+    /**
+     * The feature layer queried in the search. This is **required**.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     featureLayer: FeatureLayer;
+    /**
+     * As of version 4.4, this property replaces the now deprecated `searchQueryParams`, `suggestQueryParams`, and `searchExtent` properties. Please see the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     filter: FeatureLayerSourceFilter;
-    maxResults: number;
-    maxSuggestions: number;
-    minSuggestCharacters: number;
+    /**
+     * Indicates the maximum number of search results to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    maxResults?: number;
+    /**
+     * Indicates the maximum number of suggestions to return for the widget's input.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    maxSuggestions?: number;
+    /**
+     * Indicates the minimum number of characters required before querying for a suggestion.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    minSuggestCharacters?: number;
+    /**
+     * The name of the source for display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     name: string;
+    /**
+     * Specifies the fields returned with the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     outFields: string[];
+    /**
+     * Used as a hint for the source input text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     placeholder: string;
+    /**
+     * The results are displayed using this field. Defaults to the layer's `displayField` or the first string field.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     displayField: string;
-    popupEnabled: boolean;
-    popupOpenOnSelect: boolean;
+    /**
+     * Indicates whether to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a selected result is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    popupEnabled?: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    popupOpenOnSelect?: boolean;
+    /**
+     * Specify this to prefix the input for the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     prefix: string;
-    resultGraphicEnabled: boolean;
+    /**
+     * Indicates whether to show a graphic on the map for the selected source using the [resultSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultSymbol).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    resultGraphicEnabled?: boolean;
+    /**
+     * The symbol used for the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultGraphic).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     resultSymbol: Symbol;
+    /**
+     * An array of string values representing the names of fields in the feature layer to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     searchFields: string[];
+    /**
+     * Specify this to suffix the input for the search value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     suffix: string;
-    suggestionsEnabled: boolean;
+    /**
+     * Indicates whether to display suggestions as the user enters input text in the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
+    suggestionsEnabled?: boolean;
+    /**
+     * A template string used to display multiple fields in a defined order when suggestions are displayed. This takes precedence over `displayField`. Field names in the template must have the following format: `{FieldName}`. An example suggestionTemplate could look something like: `Name: {OWNER}, Parcel: {PARCEL_ID}`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     suggestionTemplate: string;
+    /**
+     * Indicates whether to constrain the search results to the view's extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     withinViewEnabled: boolean;
+    /**
+     * The set zoom scale for the resulting search result. This scale is automatically honored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     zoomScale: number;
   }
 
-  export interface LocatorSource {
+  /**
+   * The following properties define a [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources) pointing to a [Locator](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-Locator.html) that may be used to geocode locations with the Search widget.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+   */
+  export interface LocatorSource extends Object {
+    /**
+     * Used as a hint for the source input text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     placeholder: string;
-    autoNavigate: boolean;
+    /**
+     * Indicates whether to automatically navigate to the selected result once selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    autoNavigate?: boolean;
+    /**
+     * Constricts search results to a specified country code. For example, `US` for United States or `SE` for Sweden. Only applies to the World Geocode Service. View the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     countryCode: string;
+    /**
+     * As of version 4.4, this property replaces the now deprecated `searchQueryParams`, `suggestQueryParams`, and `searchExtent` properties. Please see the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     filter: LocatorSourceFilter;
+    /**
+     * Sets the sources for local `distance` and `minScale` for searching. See the object specification table below for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     localSearchOptions: LocatorSourceLocalSearchOptions;
-    locationToAddressDistance: number;
+    /**
+     * When reverse geocoding a result, use this distance in meters.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    locationToAddressDistance?: number;
+    /**
+     * The locator task used to search. This is **required** and defaults to the [World Geocoding Service](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     locator: Locator;
-    maxResults: number;
-    maxSuggestions: number;
-    minSuggestCharacters: number;
+    /**
+     * Indicates the maximum number of search results to return.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    maxResults?: number;
+    /**
+     * Indicates the maximum number of suggestions to return for the widget's input.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    maxSuggestions?: number;
+    /**
+     * Indicates the minimum number of characters required before querying for a suggestion.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    minSuggestCharacters?: number;
+    /**
+     * The name of the source for display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     name: string;
+    /**
+     * Specifies the fields returned with the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     outFields: string[];
+    /**
+     * A string array which limits the results to one or more categories. For example "Populated Place" or "airport". Only applicable when using the World Geocode Service. View the [World Geocoding Service documentation](https://developers.arcgis.com/rest/geocode/api-reference/geocoding-category-filtering.htm) for more information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     categories: string[];
+    /**
+     * The Popup instance used for the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     popup: Popup;
-    popupEnabled: boolean;
-    popupOpenOnSelect: boolean;
+    /**
+     * Indicates whether to display a [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a selected result is clicked.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    popupEnabled?: boolean;
+    /**
+     * Indicates whether to show the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html) when a result is selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    popupOpenOnSelect?: boolean;
+    /**
+     * Specify this to prefix the input for the search text.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     prefix: string;
-    resultGraphicEnabled: boolean;
-    resultSymbol: Symbol;
-    searchTemplate: string;
+    /**
+     * Indicates whether to show a graphic on the map for the selected source using the [resultSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultSymbol).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    resultGraphicEnabled?: boolean;
+    /**
+     * The symbol used for the [resultGraphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#resultGraphic).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    resultSymbol?: Symbol;
+    /**
+     * A template string used to display multiple fields in a defined order when results are displayed, e.g. `"{Street}, {City}, {ZIP}"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    searchTemplate?: string;
+    /**
+     * The field name of the Single Line Address Field in the REST services directory for the locator service. Common values are `SingleLine` and `SingleLineFieldName`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     singleLineFieldName: string;
-    suggestionsEnabled: boolean;
-    suffix: string;
-    withinViewEnabled: boolean;
-    zoomScale: number;
+    /**
+     * Indicates whether to display suggestions as the user enters input text in the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    suggestionsEnabled?: boolean;
+    /**
+     * Specify this to suffix the input for the search value.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    suffix?: string;
+    /**
+     * Indicates whether to constrain the search results to the view's extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    withinViewEnabled?: boolean;
+    /**
+     * The set zoom scale for the resulting search result. This scale is automatically honored.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
+    zoomScale?: number;
   }
 
-  export interface SearchResponse {
+  /**
+   * When resolved, returns this response after calling [search](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#search).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+   */
+  export interface SearchResponse extends Object {
+    /**
+     * The index of the source from which the search result was obtained.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     activeSourceIndex: number;
+    /**
+     * An array of error objects returned from the search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     errors: Error[];
+    /**
+     * The number of search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     numResults: number;
+    /**
+     * The searched expression
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     searchTerm: string;
+    /**
+     * An array of objects representing the results of search. See object specification table below for more information about the result object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     results: SearchResponseResults[];
   }
 
-  export interface SearchResult {
+  /**
+   * The result object returned from a [search()](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#search).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResult)
+   */
+  export interface SearchResult extends Object {
+    /**
+     * The extent, or bounding box, of the returned feature.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResult)
+     */
     extent: Extent;
+    /**
+     * The resulting feature or location obtained from the search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResult)
+     */
     feature: Graphic;
+    /**
+     * The name of the result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResult)
+     */
     name: string;
   }
 
-  export interface SuggestResponse {
+  /**
+   * When resolved, returns this response after calling [suggest](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#suggest).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+   */
+  export interface SuggestResponse extends Object {
+    /**
+     * The index of the source from which suggestions are obtained. This value is `-1` when all sources are selected.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     activeSourceIndex: number;
+    /**
+     * An array of error objects returned from the suggest results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     errors: Error[];
+    /**
+     * The number of suggest results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     numResults: number;
+    /**
+     * The search expression used for the suggest.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     searchTerm: string;
+    /**
+     * An array of objects representing the results of suggest. See object specification table below for more information about the result object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     results: SuggestResponseResults[];
   }
 
-  export interface SuggestResult {
+  /**
+   * The result object returned from a [suggest()](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#suggest).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResult)
+   */
+  export interface SuggestResult extends Object {
+    /**
+     * The key related to the suggest result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResult)
+     */
     key: string;
+    /**
+     * The string name of the suggested location to geocode.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResult)
+     */
     text: string;
+    /**
+     * The index of the currently selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResult)
+     */
     sourceIndex: number;
   }
 
-  export interface FeatureLayerSourceFilter {
+
+  export interface FeatureLayerSourceFilter extends Object {
+    /**
+     * The where clause specified for filtering suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     where: string;
+    /**
+     * The filter geometry for suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource)
+     */
     geometry: Geometry;
   }
 
-  export interface LocatorSourceFilter {
+
+  export interface LocatorSourceFilter extends Object {
+    /**
+     * The where clause specified for filtering suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     where: string;
+    /**
+     * The filter geometry for suggests or search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     geometry: Geometry;
   }
 
-  export interface LocatorSourceLocalSearchOptions {
+
+  export interface LocatorSourceLocalSearchOptions extends Object {
+    /**
+     * The distance to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     distance: number;
+    /**
+     * The minimum scale used to search locally.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource)
+     */
     minScale: number;
   }
 
-  export interface SearchResponseResults {
+
+  export interface SearchResponseResults extends Object {
+    /**
+     * An array of search results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     results: SearchResult[];
+    /**
+     * The index of the currently selected source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     sourceIndex: number;
+    /**
+     * The [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources) of the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SearchResponse)
+     */
     source: any;
   }
 
-  export interface SuggestResponseResults {
+
+  export interface SuggestResponseResults extends Object {
+    /**
+     * An array of suggest results.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     results: SuggestResult[];
+    /**
+     * The index of the currently selected source.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     sourceIndex: number;
+    /**
+     * The [source](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources) of the selected result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#SuggestResponse)
+     */
     source: any;
   }
 
   interface SizeSlider extends Accessor, Widgette {
+    /**
+     * Indicates whether to show the handles of the slider that may be dragged by the user. See the image in the [class description](#) to see where handles are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#handlesVisible)
+     * 
+     * @default true
+     */
     handlesVisible: boolean;
+    /**
+     * The histogram associated with the data represented on the slider. This may be generated using the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html) statistics function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogram)
+     */
     histogram: HistogramResult;
+    /**
+     * Indicates whether to show the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogram) in the slider UI. See the image in the [class description](#) to see where the histogram is typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogramVisible)
+     * 
+     * @default true
+     */
     histogramVisible: boolean;
+    /**
+     * The width of the histogram in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogramWidth)
+     * 
+     * @default 100
+     */
     histogramWidth: number;
+    /**
+     * Indicates whether to show labels in the slider UI. See the image in the [class description](#) to see where labels are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#labelsVisible)
+     * 
+     * @default true
+     */
     labelsVisible: boolean;
-    maxSize: number;
+    /**
+     * The size in points or pixels with which features will be represented at or above the [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxSize)
+     */
+    readonly maxSize: number;
+    /**
+     * The maximum value or upper bound of the slider. This value overrides the `max` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics), but may not be smaller than the upper value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxValue)
+     */
     maxValue: number;
-    minSize: number;
+    /**
+     * The size in points or pixels with which features will be represented at or below the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minSize)
+     */
+    readonly minSize: number;
+    /**
+     * The minimum value or lower bound of the slider. This value overrides the `min` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics), but may not be greater than the lower value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minValue)
+     */
     minValue: number;
+    /**
+     * The summary statistics of the data represented in the slider. This is an object that may be generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) statistics function. The `min` and `max` values in this object determine the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minValue) and [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxValue) of the slider if values for those properties are not already provided.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics)
+     */
     statistics: SizeSliderStatistics;
+    /**
+     * Indicates whether to show the average value of features in the dataset in the slider UI. See the image in the [class description](#) to see where this symbol is typically placed. Hover over this symbol to view the average in the tooltip.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statisticsVisible)
+     * 
+     * @default true
+     */
     statisticsVisible: boolean;
+    /**
+     * The symbol on the slider representing the features in the view. This symbol type should match the symbol type of the appropriate features. This can be an instance of [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), which is the default value, or [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#symbol)
+     */
     symbol: SimpleMarkerSymbol | SimpleLineSymbol;
+    /**
+     * Indicates whether to show tick marks next to the slider handles. See the image in the [class description](#) to see where ticks are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#ticksVisible)
+     * 
+     * @default true
+     */
     ticksVisible: boolean;
-    values: number[];
+    /**
+     * Represents the data values corresponding to the handles on the slider. It is an array of numbers indicating the `minDataValue` and the `maxDataValue` of the [visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#SizeVisualVariable) represented by the slider.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#values)
+     */
+    readonly values: number[];
+    /**
+     * The size visual variable represented by the slider. This must be set initially on the slider for it to render in the view. This may be created manually (see snippet below) or generated from the sizeRendererCreator helper methods. A new size visual variable is created each time the user slides handles or changes the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minValue) or the [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#visualVariable)
+     */
     visualVariable: SizeVisualVariable;
   }
 
   interface SizeSliderConstructor {
+    /**
+     * The SizeSlider is a widget intended for authoring and exploring data-driven visualizations in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) or [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) using the size of marker symbols or 3D object symbol layers. To display properly, this slider requires a [size visual variable](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#visualVariable) and [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics) object. Other optional properties may be used including adding a [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogram). Most of the various options that affect the UI of the slider are labeled in the image below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html)
+     */
+
     new(properties?: SizeSliderProperties): SizeSlider;
   }
 
   export const SizeSlider: SizeSliderConstructor;
 
   interface SizeSliderProperties extends WidgetteProperties {
+    /**
+     * Indicates whether to show the handles of the slider that may be dragged by the user. See the image in the [class description](#) to see where handles are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#handlesVisible)
+     * 
+     * @default true
+     */
     handlesVisible?: boolean;
+    /**
+     * The histogram associated with the data represented on the slider. This may be generated using the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html) statistics function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogram)
+     */
     histogram?: HistogramResult;
+    /**
+     * Indicates whether to show the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogram) in the slider UI. See the image in the [class description](#) to see where the histogram is typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogramVisible)
+     * 
+     * @default true
+     */
     histogramVisible?: boolean;
+    /**
+     * The width of the histogram in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#histogramWidth)
+     * 
+     * @default 100
+     */
     histogramWidth?: number;
+    /**
+     * Indicates whether to show labels in the slider UI. See the image in the [class description](#) to see where labels are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#labelsVisible)
+     * 
+     * @default true
+     */
     labelsVisible?: boolean;
-    maxSize?: number;
+    /**
+     * The maximum value or upper bound of the slider. This value overrides the `max` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics), but may not be smaller than the upper value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxValue)
+     */
     maxValue?: number;
-    minSize?: number;
+    /**
+     * The minimum value or lower bound of the slider. This value overrides the `min` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics), but may not be greater than the lower value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minValue)
+     */
     minValue?: number;
+    /**
+     * The summary statistics of the data represented in the slider. This is an object that may be generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) statistics function. The `min` and `max` values in this object determine the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minValue) and [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxValue) of the slider if values for those properties are not already provided.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics)
+     */
     statistics?: SizeSliderStatistics;
+    /**
+     * Indicates whether to show the average value of features in the dataset in the slider UI. See the image in the [class description](#) to see where this symbol is typically placed. Hover over this symbol to view the average in the tooltip.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statisticsVisible)
+     * 
+     * @default true
+     */
     statisticsVisible?: boolean;
+    /**
+     * The symbol on the slider representing the features in the view. This symbol type should match the symbol type of the appropriate features. This can be an instance of [SimpleMarkerSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleMarkerSymbol.html), which is the default value, or [SimpleLineSymbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-SimpleLineSymbol.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#symbol)
+     */
     symbol?: SimpleMarkerSymbolProperties | SimpleLineSymbolProperties;
+    /**
+     * Indicates whether to show tick marks next to the slider handles. See the image in the [class description](#) to see where ticks are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#ticksVisible)
+     * 
+     * @default true
+     */
     ticksVisible?: boolean;
-    values?: number[];
+    /**
+     * The size visual variable represented by the slider. This must be set initially on the slider for it to render in the view. This may be created manually (see snippet below) or generated from the sizeRendererCreator helper methods. A new size visual variable is created each time the user slides handles or changes the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#minValue) or the [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#maxValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#visualVariable)
+     */
     visualVariable?: SizeVisualVariable;
   }
 
-  export interface SizeSliderStatistics {
+
+  export interface SizeSliderStatistics extends Object {
+    /**
+     * The average of all data values represented in the size visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics)
+     */
     avg?: number;
+    /**
+     * The maximum of all data values represented in the size visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics)
+     */
     max: number;
+    /**
+     * The minimum of all data values represented in the size visual variable.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-SizeSlider.html#statistics)
+     */
     min: number;
   }
 
   interface SketchViewModel extends Accessor, Evented {
+    /**
+     * Graphic representing the temporary geometry that is being drawn on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#graphic)
+     */
     graphic: Graphic;
+    /**
+     * GraphicsLayer associated with the SketchViewModel. It allows you to organize where temporary graphics are placed when the drawing is completed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#layer)
+     */
+    layer: GraphicsLayer;
+    /**
+     * A simple marker symbol used for drawing point geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#pointSymbol)
+     */
     pointSymbol: SimpleMarkerSymbol;
+    /**
+     * A simple fill symbol used for drawing polygon geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polygonSymbol)
+     */
     polygonSymbol: SimpleFillSymbol;
+    /**
+     * A simple line symbol used for drawing polyline geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polylineSymbol)
+     */
     polylineSymbol: SimpleLineSymbol;
-    state: string;
+    /**
+     * The view model's state.  **Known Values:** ready | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view in which geometries will be sketched by the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#view)
+     */
     view: MapView;
 
+    /**
+     * Completes the active drawing and fires the [draw-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#event:draw-complete) event. If called mid-drawing, `complete()` finishes the active drawing and keeps the valid geometry.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#complete)
+     * 
+     * 
+     */
+    complete(): void;
+    /**
+     * Creates an instance of the requested draw action type.  **Known Values:** point | multipoint | polyline | polygon
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#create)
+     * 
+     * @param drawAction Name of the draw action tool.
+     * 
+     */
     create(drawAction: string): void;
+    /**
+     * Resets SketchViewModel to prepare for another create operation. Reset discards the current drawing, if called mid drawing.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#reset)
+     * 
+     * 
+     */
     reset(): void;
   }
 
   interface SketchViewModelConstructor {
+    /**
+     * SketchViewModel simplifies the process of adding temporary geometries to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). It saves the effort of writing lots of code for sketching different geometry types. SketchViewModel is intended for basic usage, without advanced features such as preventing self-intersecting lines or overlapping polygons. If more control is required for creating temporary geometries, then use the [Draw](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html) class instead.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html)
+     */
+
     new(properties?: SketchViewModelProperties): SketchViewModel;
   }
 
   export const SketchViewModel: SketchViewModelConstructor;
 
   interface SketchViewModelProperties {
+    /**
+     * Graphic representing the temporary geometry that is being drawn on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#graphic)
+     */
     graphic?: GraphicProperties;
+    /**
+     * GraphicsLayer associated with the SketchViewModel. It allows you to organize where temporary graphics are placed when the drawing is completed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#layer)
+     */
+    layer?: GraphicsLayerProperties;
+    /**
+     * A simple marker symbol used for drawing point geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#pointSymbol)
+     */
     pointSymbol?: SimpleMarkerSymbolProperties;
+    /**
+     * A simple fill symbol used for drawing polygon geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polygonSymbol)
+     */
     polygonSymbol?: SimpleFillSymbolProperties;
+    /**
+     * A simple line symbol used for drawing polyline geometries.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polylineSymbol)
+     */
     polylineSymbol?: SimpleLineSymbolProperties;
-    state?: string;
+    /**
+     * The view in which geometries will be sketched by the user.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#view)
+     */
     view?: MapViewProperties;
   }
 
   interface GeolocationPositioning {
+    /**
+     * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#geolocationOptions)
+     * 
+     * @default { maximumAge: 0, timeout: 15000, enableHighAccuracy: true }
+     */
     geolocationOptions: any;
+    /**
+     * Indicates whether to navigate the view to the position and scale of the geolocated result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#goToLocationEnabled)
+     * 
+     * @default true
+     */
     goToLocationEnabled: boolean;
+    /**
+     * The graphic used to show the user's location on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#graphic)
+     */
     graphic: Graphic;
+    /**
+     * The view associated with the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#view)
+     */
     view: MapView | SceneView;
   }
 
   interface GeolocationPositioningConstructor {
+
+
     new(): GeolocationPositioning;
   }
 
   export const GeolocationPositioning: GeolocationPositioningConstructor;
 
   interface GeolocationPositioningProperties {
+    /**
+     * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#geolocationOptions)
+     * 
+     * @default { maximumAge: 0, timeout: 15000, enableHighAccuracy: true }
+     */
     geolocationOptions?: any;
+    /**
+     * Indicates whether to navigate the view to the position and scale of the geolocated result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#goToLocationEnabled)
+     * 
+     * @default true
+     */
     goToLocationEnabled?: boolean;
+    /**
+     * The graphic used to show the user's location on the map.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#graphic)
+     */
     graphic?: GraphicProperties;
+    /**
+     * The view associated with the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GeolocationPositioning.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
+
   interface widget {
+    /**
+     * This convenience decorator is used to help simplify accessibility within the widget keyboard events. For example, it can be used to execute a method when the `space` or `enter` keys are pressed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#accessibleHandler)
+     * 
+     * 
+     */
     accessibleHandler(): Function;
+    /**
+     * Utility method used for joining CSS classes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#join)
+     * 
+     * @param classNames The class names to join.
+     * 
+     */
     join(...classNames: string[]): string;
+    /**
+     * This convenience decorator marks a property for automatic rendering. It is useful when you want rendering to be scheduled whenever the decorated property changes. Many times this decorator is used in conjunction with the [@property](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-accessorSupport-decorators.html) decorator. Rendering on deep properties is also supported by providing a path to a property deeper in the instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#renderable)
+     * 
+     * @param propertyName Names of nested renderable properties.
+     * 
+     */
     renderable(propertyName?: string | string[]): Function;
+    /**
+     * This convenience method is used to assign an [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) DOM node reference to a variable. It does this by taking a [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) passed from either the [afterUpdate](https://developers.arcgis.com/javascript/latest/guide/custom-widget/index.html#widget-rendering) or [afterCreate](https://developers.arcgis.com/javascript/latest/guide/custom-widget/index.html#widget-rendering) callbacks. In order to use this, the element must have a set [data-node-ref](https://developers.arcgis.com/javascript/latest/guide/custom-widget/index.html#widget-rendering) attribute. In addition, it must also be bound to the widget instance, e.g. `bind={this}`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#storeNode)
+     * 
+     * @param node The referenced DOM node.
+     * 
+     */
+    storeNode(node: HTMLElement): void;
+    /**
+     * This convenience method is used to render the JSX in the [widget.render()](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#render) method. It is required to import `tsx` even though it is not explicitly called.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#tsx)
+     * 
+     * @param selector The element to create.
+     * @param properties The element's properties.
+     * @param children The element's children.
+     * 
+     */
     tsx(selector: string, properties?: any, children?: any): any;
+    /**
+     * This convenience decorator helps dispatch view model events on the widget instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#vmEvent)
+     * 
+     * @param eventNames The event names to re-dispatch.
+     * 
+     */
     vmEvent(eventNames: string | string[]): Function;
   }
 
   export const widget: widget;
 
   interface Track extends Widget {
+    /**
+     * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#geolocationOptions)
+     * 
+     * @default { maximumAge: 0, timeout: 15000, enableHighAccuracy: true }
+     */
     geolocationOptions: any;
+    /**
+     * Indicates whether the widget will automatically navigate the view to the user's position when a geolocation result is found. Set to `false` to disable this behavior, leaving full control to the developer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#goToLocationEnabled)
+     * 
+     * @default true
+     */
     goToLocationEnabled: boolean;
+    /**
+     * The graphic used to show the user's location in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#graphic)
+     */
     graphic: Graphic;
-    tracking: boolean;
+    /**
+     * Indicates whether the widget is watching for new positions.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#tracking)
+     * 
+     * @default false
+     */
+    readonly tracking: boolean;
+    /**
+     * Indicates whether the widget will automatically [rotate to user's direction](https://www.w3.org/TR/geolocation-API/#coordinates_interface). Set to `false` to disable this behavior.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#useHeadingEnabled)
+     * 
+     * @default true
+     */
+    useHeadingEnabled: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [TrackViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#viewModel)
+     */
     viewModel: TrackViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * When executed, the widget will start [tracking](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#tracking) the user's location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#start)
+     * 
+     * 
+     */
     start(): void;
+    /**
+     * Stops tracking the user's location when executed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#stop)
+     * 
+     * 
+     */
     stop(): void;
   }
 
   interface TrackConstructor {
+    /**
+     * Provides a simple button that animates the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) to the user's location when clicked. The view rotates according to the direction where the tracked device is heading towards. While tracking, the default button looks like the following:
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html)
+     */
+
     new(properties?: TrackProperties): Track;
   }
 
   export const Track: TrackConstructor;
 
   interface TrackProperties extends WidgetProperties {
+    /**
+     * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#geolocationOptions)
+     * 
+     * @default { maximumAge: 0, timeout: 15000, enableHighAccuracy: true }
+     */
     geolocationOptions?: any;
+    /**
+     * Indicates whether the widget will automatically navigate the view to the user's position when a geolocation result is found. Set to `false` to disable this behavior, leaving full control to the developer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#goToLocationEnabled)
+     * 
+     * @default true
+     */
     goToLocationEnabled?: boolean;
+    /**
+     * The graphic used to show the user's location in the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#graphic)
+     */
     graphic?: GraphicProperties;
-    tracking?: boolean;
+    /**
+     * Indicates whether the widget will automatically [rotate to user's direction](https://www.w3.org/TR/geolocation-API/#coordinates_interface). Set to `false` to disable this behavior.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#useHeadingEnabled)
+     * 
+     * @default true
+     */
+    useHeadingEnabled?: boolean;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [TrackViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#viewModel)
+     */
     viewModel?: TrackViewModelProperties;
   }
 
   interface TrackViewModel extends Accessor, Evented, GeolocationPositioning {
-    state: string;
-    tracking: boolean;
+    /**
+     * The current state of the widget.  **Possible Values:** disabled | ready | tracking | waiting
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * Indicates whether new positions are being watched.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html#tracking)
+     * 
+     * @default false
+     */
+    readonly tracking: boolean;
 
+    /**
+     * When executed, [tracking](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html#tracking) starts at the user's location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html#start)
+     * 
+     * 
+     */
     start(): void;
+    /**
+     * Stops tracking the user's location when executed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html#stop)
+     * 
+     * 
+     */
     stop(): void;
   }
 
   interface TrackViewModelConstructor {
+    /**
+     * Provides the logic for the [Track](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html) widget, which animates the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html) to the user's location when clicked and tracks it as the location is updated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track-TrackViewModel.html)
+     */
+
     new(properties?: TrackViewModelProperties): TrackViewModel;
   }
 
   export const TrackViewModel: TrackViewModelConstructor;
 
   interface TrackViewModelProperties extends GeolocationPositioningProperties {
-    state?: string;
-    tracking?: boolean;
+
   }
 
   interface UnivariateColorSizeSlider extends Accessor, Widgette {
+    /**
+     * Indicates whether to show the handles of the slider that may be dragged by the user. See the image in the [class description](#) to see where handles are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#handlesVisible)
+     * 
+     * @default true
+     */
     handlesVisible: boolean;
+    /**
+     * The histogram associated with the data represented on the slider. This may be generated using the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html) statistics function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogram)
+     */
     histogram: HistogramResult;
+    /**
+     * Indicates whether to show the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogram) in the slider UI. See the image in the [class description](#) to see where the histogram is typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogramVisible)
+     * 
+     * @default true
+     */
     histogramVisible: boolean;
+    /**
+     * The width of the histogram in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogramWidth)
+     * 
+     * @default 100
+     */
     histogramWidth: number;
+    /**
+     * Indicates whether to show labels in the slider UI. See the image in the [class description](#) to see where labels are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#labelsVisible)
+     * 
+     * @default true
+     */
     labelsVisible: boolean;
-    maxSize: number;
+    /**
+     * The size in points or pixels with which features will be represented at or above the [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#maxValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#maxSize)
+     */
+    readonly maxSize: number;
+    /**
+     * The maximum value or upper bound of the slider. This value overrides the `max` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics), but may not be smaller than the upper value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#maxValue)
+     */
     maxValue: number;
-    minSize: number;
+    /**
+     * The size in points or pixels with which features will be represented at or below the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#minValue).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#minSize)
+     */
+    readonly minSize: number;
+    /**
+     * The minimum value or lower bound of the slider. This value overrides the `min` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics), but may not be greater than the lower value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#minValue)
+     */
     minValue: number;
+    /**
+     * The summary statistics of the data represented in the slider. This is an object that may be generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) statistics function. The `min` and `max` values in this object determine the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#minValue) and [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#maxValue) of the slider if values for those properties are not already provided.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics)
+     */
     statistics: UnivariateColorSizeSliderStatistics;
+    /**
+     * Indicates whether to show the average of the dataset in the slider UI. See the image in the [class description](#) to see where this symbol is typically placed. Hover over this symbol to view the average in the tooltip.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statisticsVisible)
+     * 
+     * @default true
+     */
     statisticsVisible: boolean;
+    /**
+     * Indicates whether to show tick marks next to the slider handles. See the image in the [class description](#) to see where ticks are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#ticksVisible)
+     * 
+     * @default true
+     */
     ticksVisible: boolean;
-    values: number[];
+    /**
+     * Represents the data values corresponding to the handles on the slider. It is an array of numbers indicating the `minDataValue` and the `maxDataValue` of the visual variables represented by the slider.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#values)
+     */
+    readonly values: number[];
+    /**
+     * The size and color visual variables represented by the slider. Since this slider represents univariate visualizations, both color and size visual variables must represent data from the same field or expression and be conicident. In other words, the lower stop or bound of the color visual variable must match the lower bound (or `minDataValue`) of the size visual variable. The same is true of the upper bounds of both visual variables.  These must be set initially on the slider for it to render in the view. Both visual variables may be created manually (see snippet below) or generated from the [univariateColorSize](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html) helper methods. New coincident color and size visual variables are created each time the user slides the handles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#visualVariables)
+     */
     visualVariables: any[];
   }
 
   interface UnivariateColorSizeSliderConstructor {
+    /**
+     * The UnivariateColorSizeSlider is a widget intended for authoring and exploring data-driven univariate visualizations in a [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html)  or [SceneLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html) using color and size. To display properly, this slider requires [color and size visual variables](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#visualVariables) and a [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics) object. Other optional properties may be used including adding a [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogram). Most of the various options that affect the UI of the slider are labeled in the image below.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html)
+     */
+
     new(properties?: UnivariateColorSizeSliderProperties): UnivariateColorSizeSlider;
   }
 
   export const UnivariateColorSizeSlider: UnivariateColorSizeSliderConstructor;
 
   interface UnivariateColorSizeSliderProperties extends WidgetteProperties {
+    /**
+     * Indicates whether to show the handles of the slider that may be dragged by the user. See the image in the [class description](#) to see where handles are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#handlesVisible)
+     * 
+     * @default true
+     */
     handlesVisible?: boolean;
+    /**
+     * The histogram associated with the data represented on the slider. This may be generated using the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html) statistics function.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogram)
+     */
     histogram?: HistogramResult;
+    /**
+     * Indicates whether to show the [histogram](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogram) in the slider UI. See the image in the [class description](#) to see where the histogram is typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogramVisible)
+     * 
+     * @default true
+     */
     histogramVisible?: boolean;
+    /**
+     * The width of the histogram in pixels.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#histogramWidth)
+     * 
+     * @default 100
+     */
     histogramWidth?: number;
+    /**
+     * Indicates whether to show labels in the slider UI. See the image in the [class description](#) to see where labels are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#labelsVisible)
+     * 
+     * @default true
+     */
     labelsVisible?: boolean;
-    maxSize?: number;
+    /**
+     * The maximum value or upper bound of the slider. This value overrides the `max` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics), but may not be smaller than the upper value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#maxValue)
+     */
     maxValue?: number;
-    minSize?: number;
+    /**
+     * The minimum value or lower bound of the slider. This value overrides the `min` property of the [statistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics), but may not be greater than the lower value of the [values](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#values) array.  This property may be set programmatically or by the user in the widget's UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#minValue)
+     */
     minValue?: number;
+    /**
+     * The summary statistics of the data represented in the slider. This is an object that may be generated from the [summaryStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html) statistics function. The `min` and `max` values in this object determine the [minValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#minValue) and [maxValue](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#maxValue) of the slider if values for those properties are not already provided.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics)
+     */
     statistics?: UnivariateColorSizeSliderStatistics;
+    /**
+     * Indicates whether to show the average of the dataset in the slider UI. See the image in the [class description](#) to see where this symbol is typically placed. Hover over this symbol to view the average in the tooltip.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statisticsVisible)
+     * 
+     * @default true
+     */
     statisticsVisible?: boolean;
+    /**
+     * Indicates whether to show tick marks next to the slider handles. See the image in the [class description](#) to see where ticks are typically placed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#ticksVisible)
+     * 
+     * @default true
+     */
     ticksVisible?: boolean;
-    values?: number[];
+    /**
+     * The size and color visual variables represented by the slider. Since this slider represents univariate visualizations, both color and size visual variables must represent data from the same field or expression and be conicident. In other words, the lower stop or bound of the color visual variable must match the lower bound (or `minDataValue`) of the size visual variable. The same is true of the upper bounds of both visual variables.  These must be set initially on the slider for it to render in the view. Both visual variables may be created manually (see snippet below) or generated from the [univariateColorSize](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html) helper methods. New coincident color and size visual variables are created each time the user slides the handles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#visualVariables)
+     */
     visualVariables?: any[];
   }
 
-  export interface UnivariateColorSizeSliderStatistics {
+
+  export interface UnivariateColorSizeSliderStatistics extends Object {
+    /**
+     * The average of all data values represented in the size and color visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics)
+     */
     avg: number;
+    /**
+     * The maximum of all data values represented in the size and color visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics)
+     */
     max: number;
+    /**
+     * The minimum of all all data values represented in the size and color visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics)
+     */
     min: number;
+    /**
+     * The standard deviation calculated from all data values represented in the size and color visual variables.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-UnivariateColorSizeSlider.html#statistics)
+     */
     stddev: number;
   }
 
   interface Widget extends Accessor, Evented {
+    /**
+     * The ID or node representing the DOM element containing the widget. This property can only be set once.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#container)
+     */
     container: string | HTMLElement;
+    /**
+     * When `true`, this property indicates whether the widget has been destroyed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#destroyed)
+     */
     destroyed: boolean;
+    /**
+     * The unique ID assigned to the widget when the widget is created. If not set by the developer, it will default to the container ID, or if that is not present then it will be automatically generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#id)
+     */
     id: string;
 
+    /**
+     * Destroys the widget instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#destroy)
+     * 
+     * 
+     */
     destroy(): void;
+    /**
+     * Widget teardown helper. Any handles added to it will be automatically removed when the widget is destroyed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#own)
+     * 
+     * @param handles Handles marked for removal once the widget is destroyed.
+     * 
+     */
     own(handles: WatchHandle | WatchHandle[]): void;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* Executes after widget is ready for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#postInitialize)
+     * 
+     * 
+     */
     postInitialize(): void;
+    /**
+     * Renders widget to the DOM immediately.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#renderNow)
+     * 
+     * 
+     */
     renderNow(): void;
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* Schedules widget rendering. This method is useful for changes affecting the UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#scheduleRender)
+     * 
+     * 
+     */
     scheduleRender(): void;
+    /**
+     * Finalizes the creation of the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#startup)
+     * 
+     * 
+     */
     startup(): void;
   }
 
   interface WidgetConstructor {
+    /**
+     * The base class for widgets. Each widget's presentation is separate from its properties, methods, and data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html)
+     */
+
     new(properties?: WidgetProperties): Widget;
   }
 
   export const Widget: WidgetConstructor;
 
   interface WidgetProperties {
+    /**
+     * The ID or node representing the DOM element containing the widget. This property can only be set once.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#container)
+     */
     container?: string | HTMLElement;
+    /**
+     * When `true`, this property indicates whether the widget has been destroyed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#destroyed)
+     */
     destroyed?: boolean;
+    /**
+     * The unique ID assigned to the widget when the widget is created. If not set by the developer, it will default to the container ID, or if that is not present then it will be automatically generated.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widget.html#id)
+     */
     id?: string;
   }
 
   interface Widgette {
+    /**
+     * The ID or node representing the DOM element containing the widget.  Note that once set, this property cannot be modified afterwards.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widgette.html#container)
+     */
     container: string | HTMLElement;
+    /**
+     * Indicates whether the widget is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widgette.html#visible)
+     * 
+     * @default true
+     */
     visible: boolean;
 
+    /**
+     * Destroys the widget instance. Call this method when the widget is no longer needed by the application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widgette.html#destroy)
+     * 
+     * 
+     */
     destroy(): void;
+    /**
+     * Registers an event handler on the widget instance. Call this method to hook an event with a listener. See the [Events summary table](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widgette.html#events-summary) for a list of supported events.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widgette.html#on)
+     * 
+     * @param type The name of the event.
+     * @param listener The function to call when the event is fired.
+     * 
+     */
     on(type: string, listener: Function): any;
   }
 
   interface WidgetteConstructor {
+
+
     new(): Widgette;
   }
 
   export const Widgette: WidgetteConstructor;
 
   interface WidgetteProperties {
+    /**
+     * The ID or node representing the DOM element containing the widget.  Note that once set, this property cannot be modified afterwards.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widgette.html#container)
+     */
     container?: string | HTMLElement;
+    /**
+     * Indicates whether the widget is visible.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Widgette.html#visible)
+     * 
+     * @default true
+     */
     visible?: boolean;
   }
 
   interface Zoom extends Widget {
+    /**
+     * Determines the layout/orientation of the Zoom widget.  **Known Values:** vertical | horizontal
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#layout)
+     * 
+     * @default vertical
+     */
     layout: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#view)
+     */
     view: MapView | SceneView;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [ZoomViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#viewModel)
+     */
     viewModel: ZoomViewModel;
 
+    /**
+     * *This method is primarily used by developers when implementing custom widgets.* It must be implemented by subclasses for rendering.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#render)
+     * 
+     * 
+     */
     render(): any;
+    /**
+     * Zooms the view in by an LOD factor of 0.5.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#zoomIn)
+     * 
+     * 
+     */
     zoomIn(): void;
+    /**
+     * Zooms the view out by an LOD factor of 2.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#zoomOut)
+     * 
+     * 
+     */
     zoomOut(): void;
   }
 
   interface ZoomConstructor {
+    /**
+     * The Zoom widget allows users to zoom in/out within a view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html)
+     */
+
     new(properties?: ZoomProperties): Zoom;
   }
 
   export const Zoom: ZoomConstructor;
 
   interface ZoomProperties extends WidgetProperties {
+    /**
+     * Determines the layout/orientation of the Zoom widget.  **Known Values:** vertical | horizontal
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#layout)
+     * 
+     * @default vertical
+     */
     layout?: string;
+    /**
+     * A reference to the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). Set this to link the widget to a specific view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
+    /**
+     * The view model for this widget. This is a class that contains all the logic (properties and methods) that controls this widget's behavior. See the [ZoomViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#viewModel)
+     */
     viewModel?: ZoomViewModelProperties;
   }
 
   interface ZoomViewModel extends Accessor {
+    /**
+     * Indicates if the view can zoom in.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#canZoomIn)
+     */
     canZoomIn: boolean;
+    /**
+     * Indicates if the view can zoom out.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#canZoomOut)
+     */
     canZoomOut: boolean;
-    state: string;
+    /**
+     * The current state of the widget.  **Possible Values:** disabled | ready
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#state)
+     * 
+     * @default disabled
+     */
+    readonly state: string;
+    /**
+     * The view from which to operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#view)
+     */
     view: MapView | SceneView;
 
+    /**
+     * Zooms the view in by an LOD factor of 0.5.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#zoomIn)
+     * 
+     * 
+     */
     zoomIn(): void;
+    /**
+     * Zooms the view out by an LOD factor of 2.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#zoomOut)
+     * 
+     * 
+     */
     zoomOut(): void;
   }
 
   interface ZoomViewModelConstructor {
+
+
     new(properties?: ZoomViewModelProperties): ZoomViewModel;
   }
 
   export const ZoomViewModel: ZoomViewModelConstructor;
 
   interface ZoomViewModelProperties {
+    /**
+     * Indicates if the view can zoom in.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#canZoomIn)
+     */
     canZoomIn?: boolean;
+    /**
+     * Indicates if the view can zoom out.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#canZoomOut)
+     */
     canZoomOut?: boolean;
-    state?: string;
+    /**
+     * The view from which to operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom-ZoomViewModel.html#view)
+     */
     view?: MapViewProperties | SceneViewProperties;
   }
 
+  export type MultipointDrawActionCursorUpdateEventHandler = (event: MultipointDrawActionCursorUpdateEvent) => void;
+
+  export type MultipointDrawActionDrawCompleteEventHandler = (event: MultipointDrawActionDrawCompleteEvent) => void;
+
+  export type MultipointDrawActionVertexAddEventHandler = (event: MultipointDrawActionVertexAddEvent) => void;
+
+  export type MultipointDrawActionVertexRemoveEventHandler = (event: MultipointDrawActionVertexRemoveEvent) => void;
+
   export type OpenStreetMapLayerLayerviewCreateEventHandler = (event: OpenStreetMapLayerLayerviewCreateEvent) => void;
 
   export type OpenStreetMapLayerLayerviewDestroyEventHandler = (event: OpenStreetMapLayerLayerviewDestroyEvent) => void;
@@ -11072,6 +47553,8 @@ declare namespace __esri {
 
   export type PolylineDrawActionVertexRemoveEventHandler = (event: PolylineDrawActionVertexRemoveEvent) => void;
 
+  export type PopupViewModelTriggerActionEventHandler = (event: PopupViewModelTriggerActionEvent) => void;
+
   export type SceneLayerLayerviewCreateEventHandler = (event: SceneLayerLayerviewCreateEvent) => void;
 
   export type SceneLayerLayerviewDestroyEventHandler = (event: SceneLayerLayerviewDestroyEvent) => void;
@@ -11096,14 +47579,16 @@ declare namespace __esri {
 
   export type SceneViewPointerDownEventHandler = (event: SceneViewPointerDownEvent) => void;
 
+  export type SceneViewPointerEnterEventHandler = (event: SceneViewPointerEnterEvent) => void;
+
+  export type SceneViewPointerLeaveEventHandler = (event: SceneViewPointerLeaveEvent) => void;
+
   export type SceneViewPointerMoveEventHandler = (event: SceneViewPointerMoveEvent) => void;
 
   export type SceneViewPointerUpEventHandler = (event: SceneViewPointerUpEvent) => void;
 
   export type SceneViewResizeEventHandler = (event: SceneViewResizeEvent) => void;
 
-  export type SearchViewModelLoadEventHandler = (event: SearchViewModelLoadEvent) => void;
-
   export type SearchViewModelSearchClearEventHandler = (event: SearchViewModelSearchClearEvent) => void;
 
   export type SearchViewModelSearchCompleteEventHandler = (event: SearchViewModelSearchCompleteEvent) => void;
@@ -11616,6 +48101,16 @@ declare module "esri/renderers/PointCloudUniqueValueRenderer" {
   export = PointCloudUniqueValueRenderer;
 }
 
+declare module "esri/renderers/support/AuthoringInfo" {
+  import AuthoringInfo = __esri.AuthoringInfo;
+  export = AuthoringInfo;
+}
+
+declare module "esri/renderers/support/AuthoringInfoVisualVariable" {
+  import AuthoringInfoVisualVariable = __esri.AuthoringInfoVisualVariable;
+  export = AuthoringInfoVisualVariable;
+}
+
 declare module "esri/support/Action" {
   import Action = __esri.Action;
   export = Action;
@@ -12096,6 +48591,11 @@ declare module "esri/views/layers/ImageryLayerView" {
   export = ImageryLayerView;
 }
 
+declare module "esri/views/layers/KMLLayerView" {
+  import KMLLayerView = __esri.KMLLayerView;
+  export = KMLLayerView;
+}
+
 declare module "esri/views/layers/SceneLayerView" {
   import SceneLayerView = __esri.SceneLayerView;
   export = SceneLayerView;
@@ -12136,6 +48636,11 @@ declare module "esri/views/2d/draw/PolygonDrawAction" {
   export = PolygonDrawAction;
 }
 
+declare module "esri/views/2d/draw/MultipointDrawAction" {
+  import MultipointDrawAction = __esri.MultipointDrawAction;
+  export = MultipointDrawAction;
+}
+
 declare module "esri/webmap/InitialViewProperties" {
   import InitialViewProperties = __esri.InitialViewProperties;
   export = InitialViewProperties;
@@ -12191,11 +48696,26 @@ declare module "esri/widgets/Compass" {
   export = Compass;
 }
 
+declare module "esri/widgets/Directions" {
+  import Directions = __esri.Directions;
+  export = Directions;
+}
+
+declare module "esri/widgets/DirectLineMeasurement3D" {
+  import DirectLineMeasurement3D = __esri.DirectLineMeasurement3D;
+  export = DirectLineMeasurement3D;
+}
+
 declare module "esri/widgets/Expand" {
   import Expand = __esri.Expand;
   export = Expand;
 }
 
+declare module "esri/widgets/Fullscreen" {
+  import Fullscreen = __esri.Fullscreen;
+  export = Fullscreen;
+}
+
 declare module "esri/widgets/Home" {
   import Home = __esri.Home;
   export = Home;
@@ -12276,6 +48796,16 @@ declare module "esri/widgets/BasemapGallery/BasemapGalleryViewModel" {
   export = BasemapGalleryViewModel;
 }
 
+declare module "esri/widgets/BasemapGallery/support/LocalBasemapsSource" {
+  import LocalBasemapsSource = __esri.LocalBasemapsSource;
+  export = LocalBasemapsSource;
+}
+
+declare module "esri/widgets/BasemapGallery/support/PortalBasemapsSource" {
+  import PortalBasemapsSource = __esri.PortalBasemapsSource;
+  export = PortalBasemapsSource;
+}
+
 declare module "esri/widgets/BasemapToggle/BasemapToggleViewModel" {
   import BasemapToggleViewModel = __esri.BasemapToggleViewModel;
   export = BasemapToggleViewModel;
@@ -12286,11 +48816,21 @@ declare module "esri/widgets/Compass/CompassViewModel" {
   export = CompassViewModel;
 }
 
+declare module "esri/widgets/Directions/DirectionsViewModel" {
+  import DirectionsViewModel = __esri.DirectionsViewModel;
+  export = DirectionsViewModel;
+}
+
 declare module "esri/widgets/Expand/ExpandViewModel" {
   import ExpandViewModel = __esri.ExpandViewModel;
   export = ExpandViewModel;
 }
 
+declare module "esri/widgets/Fullscreen/FullscreenViewModel" {
+  import FullscreenViewModel = __esri.FullscreenViewModel;
+  export = FullscreenViewModel;
+}
+
 declare module "esri/widgets/Home/HomeViewModel" {
   import HomeViewModel = __esri.HomeViewModel;
   export = HomeViewModel;
@@ -12321,6 +48861,11 @@ declare module "esri/widgets/Print/PrintViewModel" {
   export = PrintViewModel;
 }
 
+declare module "esri/widgets/Print/TemplateOptions" {
+  import TemplateOptions = __esri.TemplateOptions;
+  export = TemplateOptions;
+}
+
 declare module "esri/widgets/Popup/PopupViewModel" {
   import PopupViewModel = __esri.PopupViewModel;
   export = PopupViewModel;
@@ -12406,6 +48951,11 @@ declare module "esri/layers/mixins/PortalLayer" {
   export = PortalLayer;
 }
 
+declare module "esri/layers/mixins/RefreshableLayer" {
+  import RefreshableLayer = __esri.RefreshableLayer;
+  export = RefreshableLayer;
+}
+
 declare module "esri/layers/mixins/ScaleRangeLayer" {
   import ScaleRangeLayer = __esri.ScaleRangeLayer;
   export = ScaleRangeLayer;
@@ -12491,16 +49041,16 @@ declare module "esri/core/watchUtils" {
   export = watchUtils;
 }
 
-declare module "esri/core/accessorSupport/decorators" {
-  import decorators = __esri.decorators;
-  export = decorators;
-}
-
 declare module "esri/core/workers" {
   import workers = __esri.workers;
   export = workers;
 }
 
+declare module "esri/core/accessorSupport/decorators" {
+  import decorators = __esri.decorators;
+  export = decorators;
+}
+
 declare module "esri/geometry/geometryEngine" {
   import geometryEngine = __esri.geometryEngine;
   export = geometryEngine;
@@ -12536,6 +49086,11 @@ declare module "esri/renderers/smartMapping/creators/location" {
   export = location;
 }
 
+declare module "esri/renderers/smartMapping/creators/opacity" {
+  import opacity = __esri.opacity;
+  export = opacity;
+}
+
 declare module "esri/renderers/smartMapping/creators/size" {
   import size = __esri.size;
   export = size;
@@ -12601,6 +49156,11 @@ declare module "esri/symbols/support/jsonUtils" {
   export = symbolsSupportJsonUtils;
 }
 
+declare module "esri/symbols/support/symbolPreview" {
+  import symbolPreview = __esri.symbolPreview;
+  export = symbolPreview;
+}
+
 declare module "esri/views/3d/externalRenderers" {
   import externalRenderers = __esri.externalRenderers;
   export = externalRenderers;
@@ -12611,17 +49171,20 @@ declare module "esri/widgets/support/widget" {
   export = widget;
 }
 
-declare module "esri/widgets/BasemapGallery/BasemapGalleryItem" {
+declare module "esri/widgets/BasemapGallery/support/BasemapGalleryItem" {
   import BasemapGalleryItem = __esri.BasemapGalleryItem;
   export = BasemapGalleryItem;
 }
 
-declare module "esri/widgets/BasemapGallery/support/LocalBasemapsSource" {
-  import LocalBasemapsSource = __esri.LocalBasemapsSource;
-  export = LocalBasemapsSource;
-}
 
-declare module "esri/widgets/BasemapGallery/support/PortalBasemapsSource" {
-  import PortalBasemapsSource = __esri.PortalBasemapsSource;
-  export = PortalBasemapsSource;
-}
\ No newline at end of file
+declare module "esri/geometry" {
+  export import Extent = __esri.Extent;
+  export import Multipoint = __esri.Multipoint;
+  export import Point = __esri.Point;
+  export import Polygon = __esri.Polygon;
+  export import Polyline = __esri.Polyline;
+  export import SpatialReference = __esri.SpatialReference;
+  export import ScreenPoint = __esri.ScreenPoint;
+
+  export type Geometry = Extent | Multipoint | Point | Polygon | Polyline;
+}
diff --git a/types/arcgis-js-api/tslint.json b/types/arcgis-js-api/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/arcgis-js-api/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/arcgis-js-api/v3/index.d.ts b/types/arcgis-js-api/v3/index.d.ts
index de4328a957..391dfb6e0a 100644
--- a/types/arcgis-js-api/v3/index.d.ts
+++ b/types/arcgis-js-api/v3/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ArcGIS API for JavaScript 3.22
+// Type definitions for ArcGIS API for JavaScript 3.23
 // Project: https://developers.arcgis.com/javascript/3/
 // Definitions by: Esri <https://github.com/Esri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -110,7 +110,10 @@ declare module "esri" {
     resourceInfo?: any;
     /** When true, the layer's attribution is displayed on the map. */
     showAttribution?: boolean;
-    /** By default, images are exported in MIME format, and the image is streamed to the client. */
+    /**
+     * By default, images are exported in MIME format, and the image is streamed to the client.
+     * @deprecated
+     */
     useMapImage?: boolean;
     /** When true, the layer will update its content based on the map's time extent. */
     useMapTime?: boolean;
@@ -478,6 +481,10 @@ declare module "esri" {
     zoomOptions?: any;
   }
   export interface ColorPickerOptions {
+    /** Indicates whether the widget displays collapsed. */
+    collapsed?: boolean;
+    /** Indicates whether the widget can be collapsed. */
+    collapsible?: boolean;
     /** The selected color. */
     color: Color;
     /** The row size of the palette. */
@@ -1830,8 +1837,10 @@ declare module "esri" {
     whereFields: any;
   }
   export interface QueryTaskOptions {
-    /** Specify the geodatabase version to display. */
+    /** The geodatabase version to display. */
     gdbVersion?: string;
+    /** The dynamic layer or table source. */
+    source?: LayerSource;
   }
   export interface RasterLayerOptions {
     /** Sets the layer's draw mode. */
@@ -2150,9 +2159,15 @@ declare module "esri" {
   export interface SymbolStylerOptions {
     /** Added at v. */
     portal?: string | any;
-    /** Self response of Portal used as symbol provider. */
+    /**
+     * Self response of Portal used as symbol provider.
+     * @deprecated
+     */
     portalSelf?: any;
-    /** URL to Portal used as symbol provider. */
+    /**
+     * URL to Portal used as symbol provider.
+     * @deprecated
+     */
     portalUrl?: string;
   }
   export interface TemplatePickerOptions {
@@ -3852,6 +3867,10 @@ declare module "esri/dijit/ColorPicker" {
 
   /** A widget to assist choosing a color from a color palette. */
   class ColorPicker {
+    /** Indicates whether the widget displays collapsed. */
+    collapsed: boolean;
+    /** Indicates whether the widget is collapsible. */
+    collapsible: boolean;
     /** The selected color. */
     color: Color;
     /** The set of available color options. */
@@ -3921,7 +3940,10 @@ declare module "esri/dijit/Directions" {
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
     constructor(options: esri.DirectionsOptions, srcNodeRef: Node | string);
-    /** Deprecated at v3.13. */
+    /**
+     * Deprecated at v3.13.
+     * @deprecated
+     */
     activate(): void;
     /**
      * Add a stop to the directions widget at the specified index location.
@@ -3942,7 +3964,10 @@ declare module "esri/dijit/Directions" {
     centerAtSegmentStart(index: number): void;
     /** Remove the route directions from the directions list. */
     clearDirections(): void;
-    /** Deprecated at v3.13. */
+    /**
+     * Deprecated at v3.13.
+     * @deprecated
+     */
     deactivate(): void;
     /** Destroy the Directions widget. */
     destroy(): void;
@@ -4106,7 +4131,10 @@ declare module "esri/dijit/FeatureTable" {
     featureLayer: FeatureLayer;
     /** An array of objects representing field information. */
     fieldInfos: any[];
-    /** Reference to the dGrid. */
+    /**
+     * Reference to the dGrid.
+     * @deprecated
+     */
     grid: any;
     /** Reference to the 'Options' drop-down menu. */
     gridMenu: any;
@@ -8158,9 +8186,9 @@ declare module "esri/geometry/geometryEngine" {
      */
     nearestVertices(geometry: Geometry, inputPoint: Point, searchRadius: number, maxVertexCountToReturn: number): any[];
     /**
-     * Creates offset version of the input geometry.
+     * The offset operation creates a geometry that is a constant planar distance from an input polyline or polygon.
      * @param geometry The geometries to offset.
-     * @param offsetDistance The offset distance for the Geometries.
+     * @param offsetDistance The planar distance to offset from the input geometry.
      * @param offsetUnit Measurement unit for the offset.
      * @param joinType The join type.
      * @param bevelRatio Applicable to MITER, bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
@@ -8401,9 +8429,9 @@ declare module "esri/geometry/geometryEngineAsync" {
      */
     nearestVertices(geometry: Geometry, inputPoint: Point, searchRadius: number, maxVertexCountToReturn: number): any;
     /**
-     * Creates offset version of the input geometry.
+     * The offset operation creates a geometry that is a constant planar distance from an input polyline or polygon.
      * @param geometry The geometries to offset.
-     * @param offsetDistance The offset distance for the Geometries.
+     * @param offsetDistance The planar distance to offset from the input geometry.
      * @param offsetUnit Measurement unit for the offset.
      * @param joinType The join type.
      * @param bevelRatio Applicable to MITER, bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
@@ -8583,6 +8611,7 @@ declare module "esri/geometry/screenUtils" {
      * @param width The current width of the map in screen units.
      * @param height The current height of the map in screen units.
      * @param screenPoint The screenPoint to convert from screen to map units.
+     * @deprecated
      */
     toMapPoint(extent: Extent, width: number, height: number, screenPoint: ScreenPoint): Point;
     /**
@@ -8599,6 +8628,7 @@ declare module "esri/geometry/screenUtils" {
      * @param width The current width of the map in screen units.
      * @param height The current height of the map in screen units.
      * @param mapPoint The point to convert from map to screen units.
+     * @deprecated
      */
     toScreenPoint(extent: Extent, width: number, height: number, mapPoint: Point): ScreenPoint;
   };
@@ -8691,14 +8721,14 @@ declare module "esri/graphic" {
     clone(): Graphic;
     /** Draws the graphic. */
     draw(): Graphic;
-    /**
-     * Returns the graphics summarized by the given aggregate graphic in a clustering or feature reduction visualization.
-     * @param aggregateGraphic A graphic representing the aggregation (or reduction) of several individual graphics in a layer.
-     */
-    getChildGraphics(aggregateGraphic: Graphic): Graphic[];
+    /** Returns the graphics summarized by an aggregate graphic in a clustering or feature reduction visualization. */
+    getChildGraphics(): Graphic[];
     /** Returns the content string based on attributes and infoTemplate values. */
     getContent(): string;
-    /** Returns the dojo/gfx/shape.Shape of the Esri graphic. */
+    /**
+     * Returns the dojo/gfx/shape.Shape of the Esri graphic.
+     * @deprecated
+     */
     getDojoShape(): any;
     /** Returns the info template associated with the graphic. */
     getInfoTemplate(): InfoTemplate;
@@ -8880,7 +8910,10 @@ declare module "esri/layers/ArcGISDynamicMapServiceLayer" {
     timeInfo: TimeInfo;
     /** Default units of the layer as defined by the service. */
     units: string;
-    /** When true, the image is saved to the server, and a JSON formatted response is sent to the client with the URL location of the image. */
+    /**
+     * When true, the image is saved to the server, and a JSON formatted response is sent to the client with the URL location of the image.
+     * @deprecated
+     */
     useMapImage: boolean;
     /** The version of ArcGIS Server where the map service is published. */
     version: number;
@@ -10836,7 +10869,10 @@ declare module "esri/layers/RasterDataSource" {
 declare module "esri/layers/RasterFunction" {
   /** Specifies the processing to be done to the image service. */
   class RasterFunction {
-    /** Deprecated at v3.10, use functionArguments instead. */
+    /**
+     * Deprecated at v3.10, use functionArguments instead.
+     * @deprecated
+     */
     arguments: any;
     /** The arguments for the raster function. */
     functionArguments: any;
@@ -12326,7 +12362,10 @@ declare module "esri/opsdashboard/ExtensionBase" {
     portalHelperServices: any;
     /** Read-only: The URL to the ArcGIS.com site or in-house portal that you are currently signed in to. */
     portalUrl: string;
-    /** Get the collection of data sources from the host application. */
+    /**
+     * Get the collection of data sources from the host application.
+     * @deprecated
+     */
     getDataSourceProxies(): any;
     /**
      * Get the data source corresponding to the data source id from the host application.
@@ -12954,7 +12993,10 @@ declare module "esri/renderers/ClassBreaksRenderer" {
     attributeField: string;
     /** To symbolize polygon features with graduated symbols, use backgroundFillSymbol to specify a simple fill symbol to represent polygon features, and use marker symbols of varying sizes in class breaks to indicate the quantity. */
     backgroundFillSymbol: FillSymbol;
-    /** Deprecated at v2.0, use infos instead. */
+    /**
+     * Deprecated at v2.0, use infos instead.
+     * @deprecated
+     */
     breaks: any[];
     /** The classification method used to generate class breaks. */
     classificationMethod: string;
@@ -13136,13 +13178,25 @@ declare module "esri/renderers/Renderer" {
 
   /** The base class for the renderers - SimpleRenderer, ClassBreaksRenderer, UniqueValueRenderer, DotDensityRenderer, ScaleDependentRenderer, TemporalRenderer, HeatmapRenderer, and VectorFieldRenderer used with a GraphicsLayer and FeatureLayer. */
   class Renderer {
-    /** Deprecated. */
+    /**
+     * Deprecated.
+     * @deprecated
+     */
     colorInfo: any;
-    /** Deprecated. */
+    /**
+     * Deprecated.
+     * @deprecated
+     */
     opacityInfo: any;
-    /** Deprecated. */
+    /**
+     * Deprecated.
+     * @deprecated
+     */
     rotationInfo: any;
-    /** Deprecated. */
+    /**
+     * Deprecated.
+     * @deprecated
+     */
     sizeInfo: any;
     /** This property allows you to define how to render values in a layer. */
     visualVariables: any[];
@@ -13185,21 +13239,25 @@ declare module "esri/renderers/Renderer" {
     /**
      * Deprecated.
      * @param info An info object that defines the color.
+     * @deprecated
      */
     setColorInfo(info: any): Renderer;
     /**
      * Deprecated.
      * @param info The info parameter is an object with the same properties as opacityInfo.
+     * @deprecated
      */
     setOpacityInfo(info: any): Renderer;
     /**
      * Deprecated.
      * @param info An object with the same properties as rotationInfo.
+     * @deprecated
      */
     setRotationInfo(info: any): Renderer;
     /**
      * Deprecated.
      * @param info An object with the same properties as sizeInfo.
+     * @deprecated
      */
     setSizeInfo(info: any): Renderer;
     /**
@@ -13417,7 +13475,10 @@ declare module "esri/renderers/UniqueValueRenderer" {
     valueExpression: string;
     /** The title identifying and describing the associated Arcade expression as defined in the valueExpression property. */
     valueExpressionTitle: string;
-    /** Deprecated at v2.0, use infos instead. */
+    /**
+     * Deprecated at v2.0, use infos instead.
+     * @deprecated
+     */
     values: string[];
     /**
      * Creates a new UniqueValueRenderer object.
@@ -13588,6 +13649,20 @@ declare module "esri/request" {
   export = request;
 }
 
+declare module "esri/support/expressionUtils" {
+  /** A utility module that allows you to enable geometry operations referenced inside Arcade expressions. */
+  var expressionUtils: {
+    /** Loads all geometry operations for use in any Arcade expression within the given application. */
+    enableGeometryOperations(): any;
+    /**
+     * Indicates if the given Arcade expression contains one or more geometry operations.
+     * @param expression The Arcade expression to evaluate for the presence of one or more geometry operations.
+     */
+    hasGeometryOperations(expression: string): boolean;
+  };
+  export = expressionUtils;
+}
+
 declare module "esri/symbols/CartographicLineSymbol" {
   import SimpleLineSymbol = require("esri/symbols/SimpleLineSymbol");
   import Color = require("esri/Color");
@@ -13718,7 +13793,10 @@ declare module "esri/symbols/Font" {
     size: number;
     /** Text style. */
     style: string;
-    /** Text variant. */
+    /**
+     * Text variant (deprecated).
+     * @deprecated
+     */
     variant: string;
     /** Text weight. */
     weight: string;
@@ -13759,8 +13837,9 @@ declare module "esri/symbols/Font" {
      */
     setStyle(style: string): Font;
     /**
-     * Sets the font variant.
+     * Sets the font variant (deprecated).
      * @param variant Font variant.
+     * @deprecated
      */
     setVariant(variant: string): Font;
     /**
@@ -14018,6 +14097,8 @@ declare module "esri/symbols/SimpleLineSymbol" {
     static STYLE_SHORTDOT: any;
     /** The line is solid. */
     static STYLE_SOLID: any;
+    /** Indicates marker symbols present at the beginning and/or end of a SimpleLineSymbol. */
+    marker: any;
     /** The line style. */
     style: string;
     /** Creates a new empty SimpleLineSymbol object. */
@@ -14034,6 +14115,11 @@ declare module "esri/symbols/SimpleLineSymbol" {
      * @param json JSON object representing the SimpleLineSymbol.
      */
     constructor(json: Object);
+    /**
+     * Sets marker symbols at the beginning and/or end of a SimpleLineSymbol.
+     * @param options The options defining the marker style and placement.
+     */
+    setMarker(options: any): void;
     /**
      * Sets the line symbol style.
      * @param style Line style.
@@ -14143,11 +14229,17 @@ declare module "esri/symbols/TextSymbol" {
     static DECORATION_OVERLINE: any;
     /** Text is underlined. */
     static DECORATION_UNDERLINE: any;
-    /** The text alignment in relation to the point. */
+    /**
+     * The text alignment in relation to the point.
+     * @deprecated
+     */
     align: string;
     /** Text angle. */
     angle: number;
-    /** The decoration on the text. */
+    /**
+     * The decoration on the text.
+     * @deprecated
+     */
     decoration: string;
     /** Font for displaying text. */
     font: Font;
@@ -14189,6 +14281,7 @@ declare module "esri/symbols/TextSymbol" {
     /**
      * Sets the alignment of the text.
      * @param align The text alignment.
+     * @deprecated
      */
     setAlign(align: string): TextSymbol;
     /**
@@ -14199,6 +14292,7 @@ declare module "esri/symbols/TextSymbol" {
     /**
      * Sets the decoration for the text.
      * @param decoration The decoration on the text.
+     * @deprecated
      */
     setDecoration(decoration: string): TextSymbol;
     /**
@@ -15038,7 +15132,7 @@ declare module "esri/tasks/GeometryService" {
      */
     lengths(lengthsParameter: LengthsParameters, callback?: Function, errback?: Function): any;
     /**
-     * Constructs the offset of the input geometries.
+     * Constructs the offset of the input geometries based on a planar distance.
      * @param params Set the geometries to offset, distance and units.
      * @param callback The function to call when the method has completed.
      * @param errback An error object is returned if an error occurs during task execution.
@@ -15150,7 +15244,10 @@ declare module "esri/tasks/Geoprocessor" {
 
   /** Represents a GP Task resource exposed by the ArcGIS Server REST API. */
   class Geoprocessor {
-    /** Deprecated at v2.0, use outSpatialReference instead. */
+    /**
+     * Deprecated at v2.0, use outSpatialReference instead.
+     * @deprecated
+     */
     outputSpatialReference: SpatialReference;
     /** The spatial reference of the output geometries. */
     outSpatialReference: SpatialReference;
@@ -15219,6 +15316,7 @@ declare module "esri/tasks/Geoprocessor" {
     /**
      * Deprecated at v2.0, use setOutSpatialReference instead.
      * @param spatialReference The well-known ID of a spatial reference.
+     * @deprecated
      */
     setOutputSpatialReference(spatialReference: SpatialReference): void;
     /**
@@ -15680,7 +15778,7 @@ declare module "esri/tasks/OffsetParameters" {
     bevelRatio: number;
     /** The array of geometries to be offset. */
     geometries: Geometry[];
-    /** Specifies the distance for constructing an offset based on the input geometries. */
+    /** Specifies the planar distance for constructing an offset based on the input geometries. */
     offsetDistance: number;
     /** Options that determine how the ends intersect. */
     offsetHow: string;
@@ -15806,12 +15904,17 @@ declare module "esri/tasks/ProjectParameters" {
 
 declare module "esri/tasks/QueryTask" {
   import esri = require("esri");
+  import LayerSource = require("esri/layers/LayerSource");
   import Query = require("esri/tasks/query");
   import RelationshipQuery = require("esri/tasks/RelationshipQuery");
   import FeatureSet = require("esri/tasks/FeatureSet");
 
   /** Executes a query operation on a layer resource of a map service exposed by the ArcGIS Server REST API. */
   class QueryTask {
+    /** The geodatabase version to display. */
+    gdbVersion: string;
+    /** The dynamic layer or table source. */
+    source: LayerSource;
     /** URL to the ArcGIS Server REST resource that represents a map service layer. */
     url: string;
     /**
diff --git a/types/arcgis-js-api/v3/tslint.json b/types/arcgis-js-api/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/arcgis-js-api/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/arcgis-to-geojson-utils/index.d.ts b/types/arcgis-to-geojson-utils/index.d.ts
index 65c78a4230..95ba8db949 100644
--- a/types/arcgis-to-geojson-utils/index.d.ts
+++ b/types/arcgis-to-geojson-utils/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Esri/arcgis-to-geojson-utils
 // Definitions by: Jeff Jacobson <https://github.com/JeffJacobson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="geojson" />
 
diff --git a/types/archy/tslint.json b/types/archy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/archy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/argon2-browser/argon2-browser-tests.ts b/types/argon2-browser/argon2-browser-tests.ts
new file mode 100644
index 0000000000..1c1d77032c
--- /dev/null
+++ b/types/argon2-browser/argon2-browser-tests.ts
@@ -0,0 +1,20 @@
+import { argon2 } from 'argon2-browser';
+
+const mandatoryOptions = {
+  pass: 'Qwerty12?',
+  salt: 'Salty'
+};
+
+(async () => {
+  (await argon2.hash(mandatoryOptions)).encoded; // string
+  (await argon2.hash(mandatoryOptions)).hash; // Uint8Array
+  (await argon2.hash(mandatoryOptions)).hashHex; // string
+
+  (await argon2.hash({ ...mandatoryOptions, distPath: 'path' })).encoded; // string
+  (await argon2.hash({ ...mandatoryOptions, hashLen: 24 })).encoded; // string
+  (await argon2.hash({ ...mandatoryOptions, mem: 1024 })).encoded; // string
+  (await argon2.hash({ ...mandatoryOptions, parallelism: 1 })).encoded; // string
+  (await argon2.hash({ ...mandatoryOptions, time: 1 })).encoded; // string
+  (await argon2.hash({ ...mandatoryOptions, type: argon2.ArgonType.Argon2d })).encoded; // string
+  (await argon2.hash({ ...mandatoryOptions, type: argon2.ArgonType.Argon2i })).encoded; // string
+})();
diff --git a/types/argon2-browser/index.d.ts b/types/argon2-browser/index.d.ts
new file mode 100644
index 0000000000..5e7a5b571b
--- /dev/null
+++ b/types/argon2-browser/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for argon2-browser 1.1
+// Project: https://github.com/antelle/argon2-browser#readme
+// Definitions by: Ivan Gabriele <https://github.com/ivangabriele>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export namespace argon2 {
+    function hash(options: Argon2BrowserHashOptions): Promise<Argon2BrowserHashResult>;
+
+    interface Argon2BrowserHashOptions {
+        distPath?: string;
+        hashLen?: number;
+        mem?: number;
+        parallelism?: number;
+        pass: string;
+        salt: string;
+        time?: number;
+        type?: ArgonType;
+    }
+
+    interface Argon2BrowserHashResult {
+        encoded: string;
+        hash: Uint8Array;
+        hashHex: string;
+    }
+
+    enum ArgonType {
+        Argon2d = 0,
+        Argon2i = 1
+    }
+}
diff --git a/types/argon2-browser/tsconfig.json b/types/argon2-browser/tsconfig.json
new file mode 100644
index 0000000000..a380778b29
--- /dev/null
+++ b/types/argon2-browser/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "argon2-browser-tests.ts"
+    ]
+}
diff --git a/types/expr-eval/tslint.json b/types/argon2-browser/tslint.json
similarity index 100%
rename from types/expr-eval/tslint.json
rename to types/argon2-browser/tslint.json
diff --git a/types/args/args-tests.ts b/types/args/args-tests.ts
new file mode 100644
index 0000000000..3430288cd3
--- /dev/null
+++ b/types/args/args-tests.ts
@@ -0,0 +1,67 @@
+import * as args from "args";
+
+args
+    .option("opt1", "desc")
+    .option("opt2", "desc", false, (value: any): any => value)
+    .options([
+        {
+            name: 'opt3',
+            description: 'desc',
+            defaultValue: 1,
+            init: (value: any) => { },
+        },
+        {
+            name: 'opt4',
+            description: 'desc',
+        },
+    ])
+    .command("cm1", "desc")
+    .command("cm2", "desc", (value: any): void => { }, ['a'])
+    .example("ex1", "desc")
+    .examples([
+        {
+            usage: "ex2",
+            description: "desc",
+        },
+    ]);
+
+args.parse(['~/bin/node', '~/dir', 'arg', '--param'], {
+    help: true,
+    name: "name",
+    version: true,
+    usageFilter: (a: any): any => a,
+    value: "value",
+    mri: {
+        args: ['a'],
+        alias: {
+            a: "b",
+            c: ['d'],
+        },
+        boolean: ['wat'],
+        default: {
+            foo: 'bar',
+        },
+        string: ['zulu'],
+        unknown: (param: string): boolean => true,
+    },
+    minimist: {
+        string: ['string'],
+        boolean: ['string'],
+        alias: {
+            bar: 'foo',
+            foo: ['bar1', 'bar2'],
+        },
+        default: {
+            foo: 'bar',
+        },
+        stopEarly: true,
+        "--": false,
+        unknown: (param: string): boolean => true,
+    },
+    mainColor: "yellow",
+    subColor: "dim"
+});
+
+args.showHelp();
+
+const x: string = args.sub[0];
diff --git a/types/args/index.d.ts b/types/args/index.d.ts
new file mode 100644
index 0000000000..70b784564d
--- /dev/null
+++ b/types/args/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for args 3.0
+// Project: https://github.com/leo/args#readme
+// Definitions by: Slessi <https://github.com/Slessi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const c: args;
+export = c;
+
+interface args {
+    sub: string[];
+
+    option(name: string | [string, string], description: string, defaultValue?: any, init?: OptionInitFunction): args;
+    options(list: Option[]): args;
+    command(name: string, description: string, init?: (name: string, sub: string[], options: ConfigurationOptions) => void, aliases?: string[]): args;
+    example(usage: string, description: string): args;
+    examples(list: Example[]): args;
+    parse(argv: string[], options?: ConfigurationOptions): { [key: string]: any };
+    showHelp(): void;
+}
+
+type OptionInitFunction = (value: any) => any;
+
+interface MriOptions {
+    args?: string[];
+    alias?: {
+        [key: string]: string | string[]
+    };
+    boolean?: string | string[];
+    default?: {
+        [key: string]: any
+    };
+    string?: string | string[];
+    unknown?: (param: string) => boolean;
+}
+
+interface MinimistOptions {
+    string?: string | string[];
+    boolean?: boolean | string | string[];
+    alias?: {
+        [key: string]: string | string[]
+    };
+    default?: {
+        [key: string]: any
+    };
+    stopEarly?: boolean;
+    "--"?: boolean;
+    unknown?: (param: string) => boolean;
+}
+
+interface ConfigurationOptions {
+    help?: boolean;
+    name?: string;
+    version?: boolean;
+    usageFilter?: (output: any) => any;
+    value?: string;
+    mri: MriOptions;
+    minimist?: MinimistOptions;
+    mainColor: string | string[];
+    subColor: string | string[];
+}
+
+interface Option {
+    name: string | [string, string];
+    description: string;
+    init?: OptionInitFunction;
+    defaultValue?: any;
+}
+
+interface Example {
+    usage: string;
+    description: string;
+}
diff --git a/types/args/tsconfig.json b/types/args/tsconfig.json
new file mode 100644
index 0000000000..d287417769
--- /dev/null
+++ b/types/args/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "args-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/fecha/tslint.json b/types/args/tslint.json
similarity index 100%
rename from types/fecha/tslint.json
rename to types/args/tslint.json
diff --git a/types/argv/tslint.json b/types/argv/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/argv/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/arr-union/arr-union-tests.ts b/types/arr-union/arr-union-tests.ts
new file mode 100644
index 0000000000..7e46a3787e
--- /dev/null
+++ b/types/arr-union/arr-union-tests.ts
@@ -0,0 +1,7 @@
+import union = require('arr-union');
+
+// $ExpectType string[]
+union(['a'], ['b', 'c'], ['d', 'e', 'f']);
+
+// $ExpectType number[]
+union([1, 1], [2, 3]);
diff --git a/types/arr-union/index.d.ts b/types/arr-union/index.d.ts
new file mode 100644
index 0000000000..5893a55361
--- /dev/null
+++ b/types/arr-union/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for arr-union 3.1
+// Project: https://github.com/jonschlinkert/arr-union
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function union<T>(...arrays: Array<ArrayLike<T>>): T[];
+
+export = union;
diff --git a/types/arr-union/tsconfig.json b/types/arr-union/tsconfig.json
new file mode 100644
index 0000000000..64a3b1efed
--- /dev/null
+++ b/types/arr-union/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "arr-union-tests.ts"
+    ]
+}
diff --git a/types/flatpickr/tslint.json b/types/arr-union/tslint.json
similarity index 100%
rename from types/flatpickr/tslint.json
rename to types/arr-union/tslint.json
diff --git a/types/array-foreach/tslint.json b/types/array-foreach/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/array-foreach/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/arrify/index.d.ts b/types/arrify/index.d.ts
index 896ee23224..a1dda1b9ec 100644
--- a/types/arrify/index.d.ts
+++ b/types/arrify/index.d.ts
@@ -12,7 +12,6 @@
  * arrify(1)         // returns [1]
  * @example
  * arrify([2, 3])    // returns [2, 3]
- * @param val
  */
 declare function arrify<T>(val: undefined | null | T | T[]): T[];
 export = arrify;
diff --git a/types/artillery/artillery-tests.ts b/types/artillery/artillery-tests.ts
new file mode 100644
index 0000000000..b79c3f1c52
--- /dev/null
+++ b/types/artillery/artillery-tests.ts
@@ -0,0 +1,13 @@
+import { ScenarioContext, Next } from 'artillery';
+
+const scenarioContext: ScenarioContext = {vars: {}};
+scenarioContext.vars = {};
+scenarioContext.vars.testing = "value";
+scenarioContext.vars.testing2 = 1;
+
+const next: Next = (error?: Error) => {
+    // do nothing.
+};
+
+next();
+next(new Error());
diff --git a/types/artillery/index.d.ts b/types/artillery/index.d.ts
new file mode 100644
index 0000000000..fbc5d41917
--- /dev/null
+++ b/types/artillery/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for artillery 1.6
+// Project: https://github.com/shoreditch-ops/artillery#readme
+// Definitions by: Kira McCoan <https://github.com/kmccoan-allocadia>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+import * as request from 'request';
+import * as events from 'events';
+
+export interface ScenarioContext { vars: {[key: string]: any}; }
+export type Next = (err?: Error) => void;
+export type ResponseRequest = request.ResponseRequest;
+export type RequestResponse = request.RequestResponse;
+export type EventEmitter = events.EventEmitter;
diff --git a/types/artillery/tsconfig.json b/types/artillery/tsconfig.json
new file mode 100644
index 0000000000..0ad4bae0ee
--- /dev/null
+++ b/types/artillery/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "artillery-tests.ts"
+    ]
+}
diff --git a/types/griddle-react/tslint.json b/types/artillery/tslint.json
similarity index 100%
rename from types/griddle-react/tslint.json
rename to types/artillery/tslint.json
diff --git a/types/artyom.js/artyom.js-tests.ts b/types/artyom.js/artyom.js-tests.ts
deleted file mode 100644
index d301c9a6f4..0000000000
--- a/types/artyom.js/artyom.js-tests.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import artyomjs = require('artyom.js');
-
-// Get an unique ArtyomJS instance
-const artyom = artyomjs.ArtyomBuilder.getInstance();
-
-// Add a command (not smart)
-artyom.addCommands({
-    description: 'Test command',
-    indexes: ['hello', 'hi'],
-    action: (i: number) => {
-        console.log('hello action');
-    }
-});
-
-// Add a smart command
-artyom.addCommands({
-    description: 'Test command 2',
-    smart: true,
-    indexes: ['test *'],
-    action: (i: number, wildcard: string) => {
-        console.log('wildcard: ', wildcard);
-    }
-});
-
-// Get the browser voices
-artyom.getVoices();
-
-// Get all supported languages for Artyom
-artyom.getLanguage();
-
-// Get the artyom.js version
-artyom.getVersion();
diff --git a/types/artyom.js/index.d.ts b/types/artyom.js/index.d.ts
deleted file mode 100644
index b4f85781c6..0000000000
--- a/types/artyom.js/index.d.ts
+++ /dev/null
@@ -1,511 +0,0 @@
-// Type definitions for artyom.js 1.0
-// Project: https://github.com/sdkcarlos/artyom.js
-// Definitions by: Sema García (José Manuel García) <https://github.com/semagarcia>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Extension of Window interface
- */
-interface ArtyomWindow extends Window {
-  webkitSpeechRecognition: any;
-  SpeechRecognition: any;
-  SpeechSynthesisUtterance: any;
-}
-
-interface SpeechRecognition extends EventTarget {
-    grammars: SpeechGrammarList;
-    lang: string;
-    continuous: boolean;
-    interimResults: boolean;
-    maxAlternatives: number;
-    serviceURI: string;
-    start(): void;
-    stop(): void;
-    abort(): void;
-    onaudiostart(ev: Event): any;
-    onsoundstart(ev: Event): any;
-    onspeechstart(ev: Event): any;
-    onspeechend(ev: Event): any;
-    onsoundend(ev: Event): any;
-    onresult(ev: SpeechRecognitionEvent): any;
-    onnomatch(ev: SpeechRecognitionEvent): any;
-    onerror(ev: SpeechRecognitionError): any;
-    onstart(ev: Event): any;
-    onend(ev: Event): any;
-}
-
-interface SpeechRecognitionStatic {
-    prototype: SpeechRecognition;
-    new (): SpeechRecognition;
-}
-
-declare var SpeechRecognition: SpeechRecognitionStatic;
-declare var webkitSpeechRecognition: SpeechRecognitionStatic;
-
-interface SpeechRecognitionError extends Event {
-    error: string;
-    message: string;
-}
-
-interface SpeechRecognitionAlternative {
-    transcript: string;
-    confidence: number;
-}
-
-interface SpeechRecognitionResult {
-    length: number;
-    item(index: number): SpeechRecognitionAlternative;
-    [index: number]: SpeechRecognitionAlternative;
-    isFinal: boolean;
-}
-
-interface SpeechRecognitionResultList {
-    length: number;
-    item(index: number): SpeechRecognitionResult;
-    [index: number]: SpeechRecognitionResult;
-}
-
-interface SpeechRecognitionEvent extends Event {
-    resultIndex: number;
-    results: SpeechRecognitionResultList;
-    interpretation: any;
-    emma: Document;
-}
-
-interface SpeechGrammar {
-    src: string;
-    weight: number;
-}
-
-interface SpeechGrammarStatic {
-    prototype: SpeechGrammar;
-    new (): SpeechGrammar;
-}
-
-declare var SpeechGrammar: SpeechGrammarStatic;
-declare var webkitSpeechGrammar: SpeechGrammarStatic;
-
-interface SpeechGrammarList {
-    length: number;
-    item(index: number): SpeechGrammar;
-    [index: number]: SpeechGrammar;
-    addFromURI(src: string, weight: number): void;
-    addFromString(string: string, weight: number): void;
-}
-
-interface SpeechGrammarListStatic {
-    prototype: SpeechGrammarList;
-    new (): SpeechGrammarList;
-}
-
-declare var SpeechGrammarList: SpeechGrammarListStatic;
-declare var webkitSpeechGrammarList: SpeechGrammarListStatic;
-
-interface SpeechSynthesis extends EventTarget {
-    pending: boolean;
-    speaking: boolean;
-    paused: boolean;
-
-    onvoiceschanged(ev: Event): any;
-    speak(utterance: SpeechSynthesisUtterance): void;
-    cancel(): void;
-    pause(): void;
-    resume(): void;
-    getVoices(): SpeechSynthesisVoice[];
-}
-
-interface SpeechSynthesisGetter {
-    speechSynthesis: SpeechSynthesis;
-}
-
-declare var speechSynthesis: SpeechSynthesis;
-
-interface SpeechSynthesisUtterance extends EventTarget {
-    text: string;
-    lang: string;
-    voice: SpeechSynthesisVoice;
-    volume: number;
-    rate: number;
-    pitch: number;
-
-    onstart(ev: SpeechSynthesisEvent): any;
-    onend(ev: SpeechSynthesisEvent): any;
-    onerror(ev: SpeechSynthesisErrorEvent): any;
-    onpause(ev: SpeechSynthesisEvent): any;
-    onresume(ev: SpeechSynthesisEvent): any;
-    onmark(ev: SpeechSynthesisEvent): any;
-    onboundary(ev: SpeechSynthesisEvent): any;
-}
-
-interface SpeechSynthesisUtteranceStatic {
-    prototype: SpeechSynthesisUtterance;
-    new (text?: string): SpeechSynthesisUtterance;
-}
-
-declare var SpeechSynthesisUtterance: SpeechSynthesisUtteranceStatic;
-
-interface SpeechSynthesisEvent extends Event {
-    utterance: SpeechSynthesisUtterance;
-    charIndex: number;
-    elapsedTime: number;
-    name: string;
-}
-
-interface SpeechSynthesisErrorEvent extends SpeechSynthesisEvent {
-    error: string;
-}
-
-interface SpeechSynthesisVoice {
-    voiceURI: string;
-    name: string;
-    lang: string;
-    localService: boolean;
-    default: boolean;
-}
-
-declare namespace Artyom {
-    interface ArtyomDevice {
-        isChrome(): boolean;
-        isMobile(): boolean;
-    }
-
-    interface ArtyomBrowserVoiceObject {
-        default: boolean;
-        lang: string;
-        localService: false;
-        name: string;
-        voiceURI: string;
-    }
-
-    interface ArtyomConfigProperties {
-        /** Set the default language of artyom with this property */
-        lang?: string;
-        recognizing?: boolean;
-        /** Choose if should listen one command and then stops, or listening forever */
-        continuous?: boolean;
-        /** Moderates the speed with which Artyom talks (0 ~ 1) */
-        speed?: number;
-        /** Adjust the volume of the voice of artyom */
-        volume?: number;
-        /** If listen is equal to true the voice recognition will be started otherwise this property can be ignored */
-        listen: boolean;
-        /** Recognition mode: normal, quick, remote */
-        mode?: string;
-        /** Displays all the grammars recognized in the console */
-        debug: boolean;
-        helpers?: {
-            redirectRecognizedTextOutput: any;
-            remoteProcessorHandler: any;
-            lastSay: any;
-        };
-        /** Set a keyword that allows your command to be executed immediately when you say this word (Useful in noisy environments) */
-        executionKeyword?: string;
-        /** Set a keyword that allows to enable the command recognition automatically if this word is recognized while artyom is paused (artyom.dontObey) */
-        obeyKeyword?: string;
-        speaking?: boolean;
-        obeying?: boolean;
-        soundex?: boolean;
-    }
-
-    interface ArtyomCommand {
-        /** Triggers of the command */
-        indexes: string[];
-        /** Logic to execute when the command is triggered */
-        action(i: number, wildcard?: string, full?: string): void;
-        /** Description of the command */
-        description?: string;
-        /** Flag to specify is a command is either normal or smart */
-        smart?: boolean;
-    }
-
-    interface ArtyomFlags {
-        restartRecognition: boolean;
-    }
-
-    interface ArtyomRecognizer {
-        lang: string;
-        continuous: boolean;
-        interimResults: boolean;
-        start(): void;
-        stop(): void;
-        onstart(): void;
-        onresult(event: any): void;
-        onerror(event: any): void;
-        onend(): void;
-    }
-
-    interface ArtyomJS {
-        /**
-         * Contains some basic information that artyom needs to know as the type of device and browser
-         * @see http://ourcodeworld.com/projects/projects-documentation/6/read-doc/artyom-device/artyom-js
-         */
-        device: ArtyomDevice;
-
-        /**
-         * Object which provides the speech interface, and set some of its attributes and event handlers
-         */
-        artyomWSR: ArtyomRecognizer;
-
-        /**
-         * Artyom can return inmediately the voices available in your browser.
-         * @see http://ourcodeworld.com/projects/projects-documentation/14/read-doc/artyom-getvoices/artyom-js
-         * @returns {Array}
-         */
-        getVoices(): SpeechSynthesisVoice[];
-
-        /**
-         * Returns an array with all the available commands for artyom.
-         * @see http://ourcodeworld.com/projects/projects-documentation/10/read-doc/artyom-getavailablecommands/artyom-js
-         * @returns {Array}
-         */
-        getAvailableCommands(): ArtyomCommand[];
-
-        /**
-         * Set up artyom for the application. This function will set the default language used by artyom
-         * or notice the user if artyom is not supported in the actual browser.
-         * @see http://ourcodeworld.com/projects/projects-documentation/15/read-doc/artyom-initialize/artyom-js
-         * @param {ArtyomConfigProperties} config
-         * @returns {Boolean}
-         */
-        initialize(config: ArtyomConfigProperties): boolean;
-
-        /**
-         * Force artyom to stop listen even if is in continuos mode.
-         * @see http://ourcodeworld.com/projects/projects-documentation/9/read-doc/artyom-fatality/artyom-js
-         * @returns {Boolean}
-         */
-        fatality(): boolean;
-
-        /**
-         * Add dinamically commands to artyom using. You can even add commands while artyom is active.
-         * @see http://ourcodeworld.com/projects/projects-documentation/4/read-doc/artyom-addcommands/artyom-js
-         * @param {ArtyomCommand | Array[ArtyomCommand]} newCommand
-         * @returns {Boolean}
-         */
-        addCommands(newCommand: ArtyomCommand | ArtyomCommand[]): boolean;
-
-        /**
-         * Remove the commands of artyom with indexes that matches with the given text.
-         * @see http://ourcodeworld.com/projects/projects-documentation/19/read-doc/artyom-removecommands/artyom-js
-         * @param {string} identifier
-         * @returns {Array}
-         */
-        removeCommands(identifier: string): number[];
-
-        /**
-         * Removes all the added commands of artyom.
-         * @see http://ourcodeworld.com/projects/projects-documentation/7/read-doc/artyom-emptycommands/artyom-js
-         * @returns {Array}
-         */
-        emptyCommands(): ArtyomCommand[];
-
-        /**
-         * Stops the actual and pendings messages that artyom have to say.
-         * @see http://ourcodeworld.com/projects/projects-documentation/23/read-doc/artyom-shutup/artyom-js
-         */
-        shutUp(): void;
-
-        /**
-         * Returns an object with the actual properties of artyom.
-         * @see http://ourcodeworld.com/projects/projects-documentation/12/read-doc/artyom-getproperties/artyom-js
-         * @returns {ArtyomConfigProperties}
-         */
-        getProperties(): ArtyomConfigProperties;
-
-        /**
-         * Create a listener when an artyom action is called.
-         * @see http://ourcodeworld.com/projects/projects-documentation/24/read-doc/artyom-when/artyom-js
-         */
-        when(event: any, action: any): any;
-
-        /**
-         * Returns the code language of artyom according to initialize function.
-         * @see http://ourcodeworld.com/projects/projects-documentation/11/read-doc/artyom-getlanguage/artyom-js
-         * @returns {String} Language
-         */
-        getLanguage(): string;
-
-        /**
-         * Talks a text according to the given parameters (private function).
-         * @param {String} text Text to be spoken
-         * @param {Int} actualChunk Number of chunk of the
-         * @param {Int} totalChunks
-         * @param {any} callbacks
-         */
-        artyomTalk(text: any, actualChunk: any, totalChunks: any, callbacks: any): any;
-
-        /**
-         * Splits a string into an array of strings with a limited size (chunk_length).
-         * @param {String} input text to split into chunks
-         * @param {Integer} chunk_length limit of characters in every chunk
-         */
-        splitStringByChunks(input: any, chunk_length: any): string[];
-
-        /**
-         * Process the given text into chunks and execute the private function artyom_talk.
-         * @param {String} message Text to be spoken
-         * @param {Object} callbacks { onStart, onEnd }
-         * @see http://ourcodeworld.com/projects/projects-documentation/20/read-doc/artyom-say/artyom-js
-         */
-        say(message: any, callbacks: any): void;
-
-        /**
-         * Repeats the last sentence that artyom said. Useful in noisy environments.
-         * @param {Boolean} returnObject If set to true, an object with the text and the timestamp when was executed will be returned.
-         * @see http://ourcodeworld.com/projects/projects-documentation/25/read-doc/artyom-repeatlastsay/artyom-js
-         */
-        repeatLastSay(returnObject: any): void;
-
-        /**
-         * Verify if the browser supports speechSynthesis.
-         * @see http://ourcodeworld.com/projects/projects-documentation/40/read-doc/artyom-speechsupported/artyom-js
-         * @returns {Boolean}
-         */
-        speechSupported(): boolean;
-
-        /**
-         * Verify if the browser supports webkitSpeechRecognition.
-         * @see http://ourcodeworld.com/projects/projects-documentation/39/read-doc/artyom-recognizingsupported/artyom-js
-         * @returns {Boolean}
-         */
-        recognizingSupported(): boolean;
-
-        /**
-         * Simulate a voice command via JS.
-         * @see http://ourcodeworld.com/projects/projects-documentation/22/read-doc/artyom-simulateinstruction/artyom-js
-         * @param {string} sentence
-         * @returns {Boolean}
-         */
-        simulateInstruction(sentence: string): boolean;
-
-        /**
-         * Returns an object with data of the matched element.
-         * @param {string} voiceCommand
-         * @returns {Object | Function}. There is a result field when the function should return a boolean value.
-         */
-        artyomExecute(voiceCommand: string): any;
-
-        /**
-         * Displays a message in the console if the artyom propery DEBUG is set to true.
-         * @param {string} error The error to be debugged
-         * @param {string} traceLevel Error level: { error | warn | info }
-         * @see http://ourcodeworld.com/projects/projects-documentation/38/read-doc/artyom-debug/artyom-js
-         */
-        debug(stringEvent: string, traceLevel: string): void;
-
-        /**
-         * Allows to retrieve the recognized spoken text of artyom and do something with it everytime something is recognized.
-         * @param {Function} action
-         * @returns {Boolean}
-         */
-        redirectRecognizedTextOutput(action: () => void): boolean;
-
-        /**
-         * Says a random quote and returns it's object.
-         * @param data
-         */
-        sayRandom(data: any): any;
-
-        /**
-         * Artyom provide an easy way to create a dictation for your user. Just create an instance and start and stop when you want.
-         */
-        newDictation(settings: any): any;
-
-        /**
-         * A voice prompt will be executed.
-         */
-        newPrompt(config: any): any;
-
-        /**
-         * Artyom awaits for orders when this function is executed. If artyom gets a first parameter the instance will be stopped.
-         */
-        artyomHey(): any;
-
-        /**
-         * This function will return the webkitSpeechRecognition object used by artyom retrieve it only to debug on it or get some
-         * values, do not make changes directly.
-         */
-        getNativeApi(): any;
-
-        /**
-         * This function returns a boolean according to the SpeechRecognition status if artyom is listening, will return true.
-         * Note: This is not a feature of SpeechRecognition, therefore this value hangs on the fiability of the onStart and onEnd
-         * events of the SpeechRecognition
-         * @returns {Boolean}
-         */
-        isRecognizing(): boolean;
-
-        /**
-         * This function returns a boolean according to the speechSynthesis status if artyom is speaking, will return true.
-         * Note: This is not a feature of speechSynthesis, therefore this value hangs on the fiability of the onStart and onEnd
-         * events of the speechSynthesis.
-         * @returns {Boolean}
-         */
-        isSpeaking(): boolean;
-
-        /**
-         * The SpeechSynthesisUtterance objects are stored in the artyom_garbage_collector variable to prevent the wrong behaviour
-         * of artyom.say. Use this method to clear all spoken SpeechSynthesisUtterance unused objects.
-         * @returns {Boolean}
-         */
-        clearGarbageCollection(): any;
-
-        /**
-         * Returns the SpeechSynthesisUtterance garbageobjects.
-         */
-        getGarbageCollection(): any;
-
-        /**
-         * Pause the processing of commands. Artyom still listening in the background and it can be resumed after a couple of seconds.
-         * @returns {Boolean}
-         */
-        dontObey(): any;
-
-        /**
-         * Allow artyom to obey commands again.
-         * @returns {Boolean}
-         */
-        obey(): any;
-
-        /**
-         * A boolean to check if artyom is obeying commands or not.
-         * @returns {Boolean}
-         */
-        isObeying(): boolean;
-
-        /**
-         * Process the recognized text if artyom is active in remote mode.
-         * @returns {Boolean}
-         */
-        remoteProcessorService(action: any): any;
-
-        /**
-         * Returns a string with the actual version of Artyom script.
-         * @returns {String}
-         */
-        getVersion(): string;
-
-        /**
-         * Add commands like an artisan. If you use artyom for simple
-         * tasks then probably you don't like to write a lot to achieve it.
-         * Use the artisan syntax to write less, but with the same accuracy.
-         * @disclaimer Not a promise-based implementation, just syntax.
-         * @returns {Object}
-         */
-        on(indexes: any, smart: any): any;
-    }
-
-    /**
-     * ArtyomBuilder bla, bla...
-     */
-    class ArtyomBuilder {
-        /**
-         * Method to bla, bla, bla...
-         */
-        static getInstance(): ArtyomJS;
-    }
-}
-
-// tslint:disable-next-line:export-just-namespace
-export = Artyom;
-export as namespace Artyom;
diff --git a/types/artyom.js/tsconfig.json b/types/artyom.js/tsconfig.json
deleted file mode 100644
index 1a10beb9c8..0000000000
--- a/types/artyom.js/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "noImplicitThis": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "artyom.js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/asana/tslint.json b/types/asana/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/asana/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ascii2mathml/ascii2mathml-tests.ts b/types/ascii2mathml/ascii2mathml-tests.ts
index 7280900922..cbd63e649f 100644
--- a/types/ascii2mathml/ascii2mathml-tests.ts
+++ b/types/ascii2mathml/ascii2mathml-tests.ts
@@ -1,6 +1,6 @@
 import * as ascii2mathml from 'ascii2mathml';
 
-const fn = ascii2mathml({}); // $ExpectType any
+const fn = ascii2mathml({}); // $ExpectType ascii2mathml
 fn(''); // $ExpectType string
 ascii2mathml('', {}); // $ExpectType string
 
diff --git a/types/ascii2mathml/index.d.ts b/types/ascii2mathml/index.d.ts
index 2b02dfea15..dcb9f7bb98 100644
--- a/types/ascii2mathml/index.d.ts
+++ b/types/ascii2mathml/index.d.ts
@@ -28,7 +28,7 @@ interface ascii2mathml {
 
     /**
      * Converts ASCIIMath expression to MathML markup.
-     * @param asciimath {string} ASCIIMath expression
+     * @param asciimath ASCIIMath expression
      * @param options Options
      */
     (asciimath: string, options?: Options): string;
diff --git a/types/asciify/tslint.json b/types/asciify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/asciify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/askmethat-rating/askmethat-rating-tests.ts b/types/askmethat-rating/askmethat-rating-tests.ts
deleted file mode 100644
index af985d6358..0000000000
--- a/types/askmethat-rating/askmethat-rating-tests.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { AskmethatRating, AskmethatRatingSteps } from "askmethat-rating";
-
-const options = {
-    backgroundColor: "#e5e500",
-    hoverColor: "#ffff66",
-    fontClass: "fa fa-star",
-    minRating: 1,
-    maxRating: 5,
-    readonly: false,
-    step: AskmethatRatingSteps["OnePerOneStep"],
-    inputName: "AskmethatRating"
-};
-
-const div = document.createElement("div");
-const amcRating = new AskmethatRating(div, 2 , options);
-
-options.readonly = true;
-amcRating.defaultOptions = options;
diff --git a/types/askmethat-rating/index.d.ts b/types/askmethat-rating/index.d.ts
deleted file mode 100644
index a183ecdc30..0000000000
--- a/types/askmethat-rating/index.d.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-// Type definitions for askmethat-rating 0.3
-// Project: https://alexteixeira.github.io/Askmethat-Rating/
-// Definitions by: Alexandre Teixeira <https://github.com/AlexTeixeira>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export enum AskmethatRatingSteps {
-    /**
-     * Step 0.1 per 0.1
-     */
-    DecimalStep = 0,
-    /**
-     * Step 0.5 per 0.5
-     */
-    HalfStep = 1,
-    /**
-     * Step 1 per 1
-     */
-    OnePerOneStep = 2,
-}
-export interface AskmethatRatingOptions {
-    hoverColor?: string;
-    /**
-     * Color when the rating is not hovered
-     */
-    backgroundColor?: string;
-    /**
-     * Mininmum rating that the user can set
-     */
-    minRating?: number;
-    /**
-     * Maximum rating that the plugin display
-     */
-    maxRating?: number;
-    /**
-     * Class to display as rating (FontAwesome or Rating for exemple)
-     */
-    fontClass: string;
-    /**
-     * Set the rating to readonly
-     */
-    readonly: boolean;
-    /**
-     * The stepping for the rating
-     */
-    step: AskmethatRatingSteps;
-    /**
-     * Input name (Default is AskmethatRating)
-     */
-    inputName: string;
-}
-export class AskmethatRating {
-    private parentElement;
-    private pValue;
-    private styleSheet;
-    private changeEvent;
-    private ratingClick;
-    private mouseMove;
-    /**
-     * @function get the current value for the rating
-     */
-    /**
-     * @function set a new value for the rating
-     *
-     * @param _value this is the new value you want to set to the rating
-     * @returns the current number
-     */
-    value: number;
-    /**
-     * Default option base on @type IAskmethatRatingOptions
-     */
-    private _defaultOptions;
-    /**
-     * @function get the default option for the rating
-     *
-     * @return  options based on @type AskmethatRatingOptions
-     */
-    /**
-     * @function set the default option for the rating
-     *
-     * @return  options based on @type AskmethatRatingOptions
-     */
-    defaultOptions: AskmethatRatingOptions;
-    /**
-     * constructor with div element, default rating value & default options
-     *
-     * @param element This is the html container for the rating elements
-     * @param defaultValue Default value set when the plugin render the rating
-     * @param options Default option base on AskmethatRatingOptions type
-     */
-    constructor(element: HTMLDivElement, defaultValue?: number, options?: any);
-    /**
-     * render a new rating, by default value is the minRating
-     *
-     * @param value this is the default value set when the plugin is rendered, by default IAskmethatRatingOptions.minRating
-     */
-    render(value?: number): void;
-    /**
-     * @function when a rating is clicked
-     * @param  {type} event : Event {event object}
-     */
-    private onRatingClick(event?);
-    /**
-     * @function Calculate the value according to the step provided in options
-     * @param  {Number} value:number the current value
-     * @return {Number} the new value according to step
-     */
-    protected getValueAccordingToStep(value: number): number;
-    /**
-     * @function mouse event enter in rating
-     * @param  {type} event?: Event {event}
-     */
-    private onMouseMove(event?);
-    /**
-     * @function mouse out event in rating
-     * @param  {type} event?: Event {event}
-     */
-    private onMouseLeave(event?);
-    /**
-     * @function set or unset the active class and color
-     * @param  {HTMLSpanElement} current :  current span element
-     * @param  {number} current :  value needed for the if
-     */
-    protected setOrUnsetActive(value: number): void;
-    /**
-     * Check if disabled attribute is added or removed from the input
-     * Update readonly status if needed for the rating
-     */
-    private mutationEvent();
-     /**
-      * This is fired by mutation observer when an attribute changed in the hidden input
-      * Is protected to have some unit tests
-      * @param {MutationRecord[]} mutations list of mutations record
-      */
-    protected mutationDisableEvent(mutations: MutationRecord[]): void;
-    /**
-     * @function static method to retrieve with identifier the value
-     * @param  {string} identifier: string container identifier
-     * @return {number} current rating
-     */
-    static value(identifier: string): number;
-}
diff --git a/types/askmethat-rating/tsconfig.json b/types/askmethat-rating/tsconfig.json
deleted file mode 100644
index a41db58d7a..0000000000
--- a/types/askmethat-rating/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "askmethat-rating-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/asn1js/tslint.json b/types/asn1js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/asn1js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/aspnet-identity-pw/tslint.json b/types/aspnet-identity-pw/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/aspnet-identity-pw/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/assertion-error/tslint.json b/types/assertion-error/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/assertion-error/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/assertsharp/tslint.json b/types/assertsharp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/assertsharp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/async-lock/tslint.json b/types/async-lock/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/async-lock/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/async-polling/tslint.json b/types/async-polling/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/async-polling/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/async-writer/tslint.json b/types/async-writer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/async-writer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/async/index.d.ts b/types/async/index.d.ts
index 80f2888a8b..17fecb467b 100644
--- a/types/async/index.d.ts
+++ b/types/async/index.d.ts
@@ -11,10 +11,11 @@ export interface Dictionary<T> { [key: string]: T; }
 export interface ErrorCallback<T> { (err?: T): void; }
 export interface AsyncBooleanResultCallback<E> { (err?: E, truthValue?: boolean): void; }
 export interface AsyncResultCallback<T, E> { (err?: E, result?: T): void; }
-export interface AsyncResultArrayCallback<T, E> { (err?: E, results?: (T | undefined)[]): void; }
+export interface AsyncResultArrayCallback<T, E> { (err?: E, results?: Array<T | undefined>): void; }
 export interface AsyncResultObjectCallback<T, E> { (err: E | undefined, results: Dictionary<T | undefined>): void; }
 
 export interface AsyncFunction<T, E> { (callback: (err?: E, result?: T) => void): void; }
+export interface AsyncFunctionEx<T, E> { (callback: (err?: E, ...results: T[]) => void): void; }
 export interface AsyncIterator<T, E> { (item: T, callback: ErrorCallback<E>): void; }
 export interface AsyncForEachOfIterator<T, E> { (item: T, key: number|string, callback: ErrorCallback<E>): void; }
 export interface AsyncResultIterator<T, R, E> { (item: T, callback: AsyncResultCallback<R, E>): void; }
@@ -115,8 +116,12 @@ export const eachOfLimit: typeof forEachOfLimit;
 export function map<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function map<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const mapSeries: typeof map;
-export function mapLimit<T, R, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function mapLimit<T, R, E>(arr: Dictionary<T>, limit: number, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function mapLimit<T, R, E>(
+    arr: T[] | Dictionary<T> | IterableIterator<T>,
+    limit: number,
+    iterator: AsyncResultIterator<T, R, E>,
+    callback?: AsyncResultArrayCallback<R, E>
+): void;
 export function mapValuesLimit<T, R, E>(obj: Dictionary<T>, limit: number, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export function mapValues<T, R, E>(obj: Dictionary<T>, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export const mapValuesSeries: typeof mapValues;
@@ -164,6 +169,8 @@ export const allLimit: typeof everyLimit;
 
 export function concat<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function concat<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concatLimit<T, R, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concatLimit<T, R, E>(arr: Dictionary<T>, limit: number,iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const concatSeries: typeof concat;
 
 // Control Flow
@@ -174,9 +181,9 @@ export function parallel<T, E>(tasks: Dictionary<AsyncFunction<T, E>>, callback?
 export function parallelLimit<T, E>(tasks: Array<AsyncFunction<T, E>>, limit: number, callback?: AsyncResultArrayCallback<T, E>): void;
 export function parallelLimit<T, E>(tasks: Dictionary<AsyncFunction<T, E>>, limit: number, callback?: AsyncResultObjectCallback<T, E>): void;
 export function whilst<E>(test: () => boolean, fn: AsyncVoidFunction<E>, callback: ErrorCallback<E>): void;
-export function doWhilst<E>(fn: AsyncVoidFunction<E>, test: () => boolean, callback: ErrorCallback<E>): void;
+export function doWhilst<T, E>(fn: AsyncFunctionEx<T, E>, test: (...results: T[]) => boolean, callback: ErrorCallback<E>): void;
 export function until<E>(test: () => boolean, fn: AsyncVoidFunction<E>, callback: ErrorCallback<E>): void;
-export function doUntil<E>(fn: AsyncVoidFunction<E>, test: () => boolean, callback: ErrorCallback<E>): void;
+export function doUntil<T, E>(fn: AsyncFunctionEx<T, E>, test: (...results: T[]) => boolean, callback: ErrorCallback<E>): void;
 export function during<E>(test: (testCallback : AsyncBooleanResultCallback<E>) => void, fn: AsyncVoidFunction<E>, callback: ErrorCallback<E>): void;
 export function doDuring<E>(fn: AsyncVoidFunction<E>, test: (testCallback: AsyncBooleanResultCallback<E>) => void, callback: ErrorCallback<E>): void;
 export function forever<E>(next: (next : ErrorCallback<E>) => void, errBack: ErrorCallback<E>) : void;
@@ -221,7 +228,7 @@ export function memoize(fn: Function, hasher?: Function): Function;
 export function unmemoize(fn: Function): Function;
 export function ensureAsync(fn: (... argsAndCallback: any[]) => void): Function;
 export function constant(...values: any[]): Function;
-export function asyncify(fn: Function): Function;
+export function asyncify(fn: Function): (...args: any[]) => any;
 export function wrapSync(fn: Function): Function;
 export function log(fn: Function, ...args: any[]): void;
 export function dir(fn: Function, ...args: any[]): void;
diff --git a/types/async/test/explicit.ts b/types/async/test/explicit.ts
index b9ea9c84ed..0c0e1a44ee 100644
--- a/types/async/test/explicit.ts
+++ b/types/async/test/explicit.ts
@@ -47,13 +47,13 @@ interface NumberCallback { (err?: Error, result?: number): void; }
 interface AsyncNumberGetter { (callback: NumberCallback): void; }
 
 var taskDict: Lookup<AsyncNumberGetter> = {
-    one: function(callback){
-        setTimeout(function(){
+    one: function(callback) {
+        setTimeout(function() {
             callback(undefined, 1);
         }, 200);
     },
-    two: function(callback){
-        setTimeout(function(){
+    two: function(callback) {
+        setTimeout(function() {
             callback(undefined, 2);
         }, 100);
     }
diff --git a/types/async/test/index.ts b/types/async/test/index.ts
index 821ccd0650..3c6c2f5dfe 100644
--- a/types/async/test/index.ts
+++ b/types/async/test/index.ts
@@ -239,16 +239,16 @@ async.parallelLimit({
 
 
 function whileFn(callback: any) {
-    count++;
-    setTimeout(callback, 1000);
+    setTimeout(() => callback(null, ++count), 1000);
 }
 
 function whileTest() { return count < 5; }
+function doWhileTest(count: number) { return count < 5; }
 var count = 0;
 async.whilst(whileTest, whileFn, function (err) { });
 async.until(whileTest, whileFn, function (err) { });
-async.doWhilst(whileFn, whileTest, function (err) { });
-async.doUntil(whileFn, whileTest, function (err) { });
+async.doWhilst(whileFn, doWhileTest, function (err) { });
+async.doUntil(whileFn, doWhileTest, function (err) { });
 
 async.during(function (testCallback) { testCallback(new Error(), false); }, function (callback) { callback() }, function (error) { console.log(error) });
 async.doDuring(function (callback) { callback() }, function (testCallback) { testCallback(new Error(), false); }, function (error) { console.log(error) });
diff --git a/types/async/tslint.json b/types/async/tslint.json
index b1ab4a96cc..9380375afa 100644
--- a/types/async/tslint.json
+++ b/types/async/tslint.json
@@ -16,6 +16,7 @@
         "no-void-expression": false,
         "object-literal-key-quotes": false,
         "object-literal-shorthand": false,
+        "one-line": false,
         "one-variable-per-declaration": false,
         "only-arrow-functions": false,
         "prefer-const": false,
diff --git a/types/asyncblock/asyncblock-tests.ts b/types/asyncblock/asyncblock-tests.ts
deleted file mode 100644
index d93c9fc07a..0000000000
--- a/types/asyncblock/asyncblock-tests.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-
-/// <reference types="node" />
-
-import asyncblock = require('asyncblock');
-import fs = require('fs');
-
-
-// Sleeping in series
-asyncblock((flow: asyncblock.IFlow) => {
-    console.time('time');
-
-    setTimeout(flow.add(), 1000);
-    flow.wait(); //Wait for the first setTimeout to finish
-
-    setTimeout(flow.add(), 2000);
-    flow.wait(); //Wait for the second setTimeout to finish
-
-    console.timeEnd('time'); //3 seconds
-});
-
-// Trapping results
-asyncblock((flow) => {
-    var path1 = '', path2 = '';
-    //Start two parallel file reads
-    fs.readFile(path1, 'utf8', flow.set('contents1'));
-    fs.readFile(path2, 'utf8', flow.set('contents2'));
-
-    //Print the concatenation of the results when both reads are finished
-    console.log(flow.get<string>('contents1') + flow.get<string>('contents2'));
-
-    var paths: string[] = [];
-    //Wait for a large number of tasks
-    for(var i = 0; i < 100; i++){
-        //Add each task in parallel with i as the key
-        fs.readFile(paths[i], 'utf8', flow.add(i));
-    }
-
-    //Wait for all the tasks to finish. Results is an object of the form {key1: value1, key2: value2, ...}
-    var results = flow.wait();
-
-    var path = '';
-    //One-liner syntax for waiting on a single task
-    var contents = flow.sync( fs.readFile(path, 'utf8', flow.callback()) );
-
-    //See overview & API docs for more extensive description of techniques
-});
-
-// Error handling
-var asyncTask = (callback: (err: any) => void) => {
-    asyncblock((flow) => {
-        flow.errorCallback = callback; //Setting the errorCallback is the easiest way to perform error handling. If erroCallback isn't set, and an error occurs, it will be thrown instead of returned to the callback
-
-        var path = '';
-        fs.readFile(path, 'utf8', flow.add()); //If readFile encountered an error, it would automatically get passed to the callback
-        var contents = flow.wait();
-
-        console.log(contents); //If an error occured above, this code won't run
-    });
-};
-
-// Returning results
-var asyncTask2 = (callback: (err: any, res: string) => void) => {
-    asyncblock((flow) => {
-        var path = '';
-        var contents = flow.sync( fs.readFile(path, 'utf8', flow.callback()) ); //If readFile encountered an error, it would automatically get passed to the callback
-
-        return contents; //Return the value you want to be passed to the callback
-    }, callback); //The callback can be specified as the 2nd arg to asyncblock. It will be called with the value returned from the asyncblock as the 2nd arg.
-                  //If an error occurs, the callback will be called with the error as the first argument.
-};
-
-
-// Sample
-asyncblock.nostack((flow) => {
-    fs.readFile('path1', 'utf8', flow.add('first'));
-    fs.readFile('path2', 'utf8', flow.add('second'));
-
-    //Wait until done reading the first and second files, then write them to another file
-    fs.writeFile('path3', flow.wait<string>('first') + flow.wait<string>('second'), flow.add());
-    flow.wait(); //Wait on all outstanding tasks
-
-    fs.readFile('path3', 'utf8', flow.add('data'));
-
-    console.log(flow.wait('data')); //Print the 3rd file's data
-    console.log('all done');
-});
-
-
-// Formatting results
-(function() {
-
-var asyncTask = function(callback: (err: any, res1: number, res2: number, res3: number) => void) {
-    process.nextTick(function() {
-        callback(null, 1, 2, 3);
-    });
-}
-
-asyncblock(function(flow) {
-    asyncTask(flow.add());
-
-    var result = flow.wait();
-    console.log(result); // Prints 1
-});
-
-asyncblock(function(flow) {
-    asyncTask(flow.add(['first', 'second', 'third']));
-
-    var result = flow.wait();
-    console.log(result); // Prints { first: 1, second: 2, third: 3 }
-
-    asyncTask(flow.add('key1', ['first', 'second', 'third']));
-    asyncTask(flow.add('key2', ['a', 'b', 'c']));
-    var result = flow.wait();
-    console.log(result); // Prints { key1: { first: 1, second: 2, third: 3 }, key2: { a: 1, b: 2, c: 3} }
-});
-
-})();
-
-
-// Parallel task rate limiting
-(function() {
-
-asyncblock(function(flow) {
-   flow.queue(function(callback: Function) {
-       setTimeout(callback, 1000);
-   });
-
-   flow.wait(); //This will wait for about a second
-});
-
-asyncblock(function(flow) {
-   flow.maxParallel = 2;
-
-   process.nextTick(function(){
-       flow.queue(function(callback: Function) {
-           setTimeout(callback, 1000);
-       });
-
-       flow.queue(function(callback: Function) {
-           setTimeout(callback, 2000);
-       });
-
-       flow.queue(function(callback: Function) {
-           setTimeout(callback, 3000);
-       });
-
-       flow.doneAdding();
-   });
-
-   flow.forceWait();
-});
-
-asyncblock(function(flow) {
-    setTimeout(flow.callback(), 1000);
-
-    flow.queue(function(callback: Function) {
-        setTimeout(callback, 1000);
-    });
-    flow.queue((callback: (err: any, res: string) => void) => {
-      callback(null, '');
-    });
-
-    flow.wait();
-});
-
-})();
-
-
-// Task timeouts
-(function() {
-
-asyncblock(function(flow){
-    setTimeout(flow.add({timeout: 1000, timeoutIsError: false}), 2000);
-    flow.wait(); //The fiber will yield here for 1 second, then continue
-
-    //Code here will run
-});
-
-asyncblock(function(flow){
-    flow.timeoutIsError = false;
-
-    setTimeout(flow.add({timeout: 1000}), 2000);
-    flow.wait(); //The fiber will yield here for 1 second, then continue
-
-    //Code here will run
-});
-
-})();
-
diff --git a/types/asyncblock/index.d.ts b/types/asyncblock/index.d.ts
deleted file mode 100644
index e848f509fb..0000000000
--- a/types/asyncblock/index.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-// Type definitions for asyncblock 2.1.23
-// Project: https://github.com/scriby/asyncblock
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
-declare function asyncblock<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
-
-declare namespace asyncblock {
-    export function nostack<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
-
-    export interface IFlow {
-        add(responseFormat?: string[]): IExecuteFunction;
-        add(key: string, responseFormat?: string[]): IExecuteFunction;
-        add(key: number, responseFormat?: string[]): IExecuteFunction;
-        add(options: IFlowOptions): IExecuteFunction;
-        callback(responseFormat?: string[]): IExecuteFunction;
-        callback(key: string, responseFormat?: string[]): IExecuteFunction;
-        callback(key: number, responseFormat?: string[]): IExecuteFunction;
-        callback(options: IFlowOptions): IExecuteFunction;
-        wait<T>(key?: string): T;
-        wait<T>(key?: number): T;
-
-        get<T>(key: string): T;
-        set(key: string, responseFormat?: string[]): IExecuteFunction;
-        set(options: IFlowOptions): IExecuteFunction;
-        del(key: string): void;
-
-        sync<T>(task: any): T;
-        queue(toExecute: IExecuteFunction): void;
-        queue(key: string, toExecute: IExecuteFunction): void;
-        queue(key: number, toExecute: IExecuteFunction): void;
-        queue(responseFormat: string[], toExecute: IExecuteFunction): void;
-        queue(key: string, responseFormat: string[], toExecute: IExecuteFunction): void;
-        queue(key: number, responseFormat: string[], toExecute: IExecuteFunction): void;
-        queue(options: IFlowOptions, toExecute: IExecuteFunction): void;
-        doneAdding(): void;
-        forceWait<T>(): T;
-
-        maxParallel: number;
-        errorCallback: (err: any) => void;
-        taskTimeout: number;
-        timeoutIsError: boolean;
-    }
-
-    export interface IFlowOptions {
-        ignoreError?: boolean;  // default false
-        key?: string;  // string | number
-        responseFormat?: string[];
-        timeout?: number;
-        timeoutIsError?: boolean;
-        dontWait?: boolean;
-        firstArgIsError?: boolean;  // default true
-    }
-
-    export interface IExecuteFunction {
-        <T1, T2, T3>(err: any, res1: T1, res2: T2, res3: T3): any;
-        <T1, T2>(err: any, res1: T1, res2: T2): any;
-        <T>(err: any, res: T): any;
-        (err: any): any;
-
-        // firstArgIsError === false
-        <T1, T2, T3>(res1: T1, res2: T2, res3: T3): any;
-        <T1, T2>(res1: T1, res2: T2): any;
-        <T>(res: T): any;
-    }
-
-}
-
-export = asyncblock;
diff --git a/types/asyncblock/tsconfig.json b/types/asyncblock/tsconfig.json
deleted file mode 100644
index c696706864..0000000000
--- a/types/asyncblock/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "asyncblock-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/asynciterator/asynciterator-tests.ts b/types/asynciterator/asynciterator-tests.ts
new file mode 100644
index 0000000000..bd4b62c0fe
--- /dev/null
+++ b/types/asynciterator/asynciterator-tests.ts
@@ -0,0 +1,135 @@
+import { ArrayIterator, AsyncIterator, BufferedIterator, ClonedIterator, EmptyIterator, IntegerIterator,
+  MultiTransformIterator, SingletonIterator, SimpleTransformIterator, TransformIterator } from "asynciterator";
+
+function test_asynciterator() {
+    // We can't instantiate an abstract class.
+    const it1: AsyncIterator<number> = <any> {};
+    const read1: number = it1.read();
+    it1.each((data: number) => console.log(data));
+    it1.each((data: number) => console.log(data), {});
+    it1.close();
+
+    const it2: AsyncIterator<string> = <any> {};
+    const read2: string = it2.read();
+    it2.each((data: string) => console.log(data));
+    it2.each((data: string) => console.log(data), {});
+    it2.close();
+
+    const it3: AsyncIterator<AsyncIterator<string>> = <any> {};
+    const read3: AsyncIterator<string> = it3.read();
+    it3.each((data: AsyncIterator<string>) => data.each((data: string) => console.log(data)));
+    it3.each((data: AsyncIterator<string>) => data.each((data: string) => console.log(data), {}), {});
+    it3.close();
+
+    const readable2: boolean = it1.readable;
+    const closed2: boolean = it1.closed;
+    const ended2: boolean = it1.ended;
+
+    it1.setProperty('name1', 123);
+    it2.setProperty('name2', 'someValue');
+    const p1: number = it1.getProperty('name1');
+    const p2: string = it1.getProperty('name2');
+    it1.getProperty('name1', (value: number) => console.log(value));
+    it1.getProperty('name2', (value: string) => console.log(value));
+    const ps1: {[id: string]: any} = it1.getProperties();
+    it1.setProperties({ name1: 1234, name2: 'someOtherValue' });
+    it1.copyProperties(it2, [ 'name1', 'name2' ]);
+
+    const str: string = it1.toString();
+
+    const stit1: SimpleTransformIterator<number, string> = it1.transform();
+    const stit2: SimpleTransformIterator<number, string> = it1.map((number: number) => 'i' + number);
+    const stit3: AsyncIterator<string> = it1.map((number: number) => 'i' + number);
+    const stit4: AsyncIterator<number> = it2.map(parseInt);
+    const stit5: AsyncIterator<number> = it1.map((number: number) => number + 1);
+    const stit6: AsyncIterator<number> = it1.filter((number: number) => number < 10);
+    const stit7: AsyncIterator<number> = it1.prepend([0, 1, 2]);
+    const stit8: AsyncIterator<number> = it1.append([0, 1, 2]);
+    const stit9: AsyncIterator<number> = it1.surround([0, 1, 2], [0, 1, 2]);
+    const stit10: AsyncIterator<number> = it1.skip(2);
+    const stit11: AsyncIterator<number> = it1.take(2);
+    const stit12: AsyncIterator<number> = it1.range(2, 20);
+    const stit13: AsyncIterator<number> = it1.clone();
+
+    const intit1: IntegerIterator = AsyncIterator.range(10, 100, 1);
+    const intit2: IntegerIterator = AsyncIterator.range(10, 100);
+    const intit3: IntegerIterator = AsyncIterator.range(10);
+    const intit4: IntegerIterator = AsyncIterator.range();
+}
+
+function test_emptyiterator() {
+    const it1: AsyncIterator<number> = new EmptyIterator();
+    const it2: AsyncIterator<string> = new EmptyIterator();
+}
+
+function test_singletoniterator() {
+    const it1: AsyncIterator<number> = new SingletonIterator(3);
+    const it2: AsyncIterator<string> = new SingletonIterator('a');
+}
+
+function test_arrayiterator() {
+    const it1: AsyncIterator<number> = new ArrayIterator([1, 2, 3]);
+    const it2: AsyncIterator<string> = new ArrayIterator(['a', 'b', 'c']);
+}
+
+function test_integeriterator() {
+    const it1: IntegerIterator = new IntegerIterator();
+    const it2: AsyncIterator<number> = new IntegerIterator({});
+    const it3: AsyncIterator<number> = new IntegerIterator({ start: 0 });
+    const it4: AsyncIterator<number> = new IntegerIterator({ end: 100 });
+    const it5: AsyncIterator<number> = new IntegerIterator({ step: 10 });
+}
+
+function test_bufferediterator() {
+    const it1: BufferedIterator<number> = new BufferedIterator();
+    const it2: AsyncIterator<number> = new BufferedIterator({});
+    const it3: AsyncIterator<number> = new BufferedIterator({ maxBufferSize: 10 });
+    const it4: AsyncIterator<number> = new BufferedIterator({ autoStart: true });
+}
+
+function test_transformiterator() {
+    const it1: TransformIterator<number, string> = new TransformIterator<number, string>();
+    const it2: AsyncIterator<string> = new TransformIterator<number, string>();
+    const it3: AsyncIterator<number> = new TransformIterator<string, number>(it1);
+    const it4: AsyncIterator<number> = new TransformIterator<string, number>(it1, {});
+    const it5: AsyncIterator<number> = new TransformIterator<string, number>(it1, { optional: true });
+    const it6: AsyncIterator<number> = new TransformIterator<string, number>({ source: it1 });
+
+    const source: AsyncIterator<number> = it1.source;
+}
+
+function test_simpletransformiterator() {
+    const it1: SimpleTransformIterator<number, string> = new SimpleTransformIterator<number, string>();
+    const it2: TransformIterator<number, string> = new SimpleTransformIterator<number, string>();
+    const it3: AsyncIterator<string> = new SimpleTransformIterator<number, string>();
+    const it4: AsyncIterator<number> = new SimpleTransformIterator<string, number>(it1);
+    const it5: AsyncIterator<number> = new SimpleTransformIterator<string, number>(it1, {});
+    const it6: AsyncIterator<number> = new SimpleTransformIterator<string, number>({});
+    const it7: AsyncIterator<number> = new SimpleTransformIterator<string, number>({ optional: true });
+    const it8: AsyncIterator<number> = new SimpleTransformIterator<string, number>({ source: it1 });
+    const it9: AsyncIterator<number> = new SimpleTransformIterator<string, number>({ offset: 2 });
+    const it10: AsyncIterator<number> = new SimpleTransformIterator<string, number>({ limit: 2 });
+    const it11: AsyncIterator<number> = new SimpleTransformIterator<string, number>({ prepend: [0, 1, 2] });
+    const it12: AsyncIterator<number> = new SimpleTransformIterator<string, number>({ append: [0, 1, 2] });
+    const it13: AsyncIterator<number> = new SimpleTransformIterator<number, number>(
+      { filter: (val: number) => val > 10 });
+    const it14: AsyncIterator<number> = new SimpleTransformIterator<number, number>({ map: (val: number) => val + 1 });
+    const it15: AsyncIterator<number> = new SimpleTransformIterator<number, number>(
+      { transform: (val: number, cb: (result: number) => void) => cb(val + 1) });
+}
+
+function test_multitransformiterator() {
+    const it1: MultiTransformIterator<number, string> = new MultiTransformIterator<number, string>();
+    const it2: TransformIterator<number, string> = new MultiTransformIterator<number, string>();
+    const it3: AsyncIterator<string> = new MultiTransformIterator<number, string>();
+    const it4: AsyncIterator<number> = new MultiTransformIterator<string, number>(it1);
+    const it5: AsyncIterator<number> = new MultiTransformIterator<string, number>(it1, {});
+    const it6: AsyncIterator<number> = new MultiTransformIterator<string, number>({});
+    const it7: AsyncIterator<number> = new MultiTransformIterator<string, number>({ optional: true });
+    const it8: AsyncIterator<number> = new MultiTransformIterator<string, number>({ source: it1 });
+}
+
+function test_clonediterator() {
+    const it1: ClonedIterator<number> = new ClonedIterator<number>();
+    const it2: ClonedIterator<number> = new ClonedIterator<number>(it1);
+}
diff --git a/types/asynciterator/index.d.ts b/types/asynciterator/index.d.ts
new file mode 100644
index 0000000000..950fb16bbd
--- /dev/null
+++ b/types/asynciterator/index.d.ts
@@ -0,0 +1,164 @@
+// Type definitions for asynciterator 1.1
+// Project: https://github.com/rubenverborgh/AsyncIterator#readme
+// Definitions by: Ruben Taelman <https://github.com/rubensworks>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+import { EventEmitter } from "events";
+
+export abstract class AsyncIterator<T> extends NodeJS.EventEmitter {
+    static STATES: ['INIT', 'OPEN', 'CLOSING', 'CLOSED', 'ENDED'];
+    static INIT: 0;
+    static OPEN: 1;
+    static CLOSING: 2;
+    static CLOSED: 3;
+    static ENDED: 4;
+
+    _state: number;
+    _readable: boolean;
+    _destination?: AsyncIterator<any>;
+
+    readable: boolean;
+    closed: boolean;
+    ended: boolean;
+
+    constructor();
+
+    read(): T;
+    each(callback: (data: T) => void, self?: any): void;
+    close(): void;
+
+    _changeState(newState: number, eventAsync?: boolean): void;
+    private _hasListeners(eventName: string | symbol): boolean;
+    // tslint:disable-next-line ban-types
+    private _addSingleListener(eventName: string | symbol, listener: Function): void;
+    _end(): void;
+
+    getProperty(propertyName: string, callback?: (value: any) => void): any;
+    setProperty(propertyName: string, value: any): void;
+    getProperties(): {[id: string]: any};
+    setProperties(properties: {[id: string]: any}): void;
+    copyProperties(source: AsyncIterator<any>, propertyNames: string[]): void;
+
+    toString(): string;
+    _toStringDetails(): string;
+
+    transform<T2>(options?: SimpleTransformIteratorOptions<T, T2>): SimpleTransformIterator<T, T2>;
+    map<T2>(mapper: (item: T) => T2, self?: object): SimpleTransformIterator<T, T2>;
+    filter(filter: (item: T) => boolean, self?: object): SimpleTransformIterator<T, T>;
+    prepend(items: T[]): SimpleTransformIterator<T, T>;
+    append<T>(items: T[]): SimpleTransformIterator<T, T>;
+    surround<T>(prepend: T[], append: T[]): SimpleTransformIterator<T, T>;
+    skip<T>(offset: number): SimpleTransformIterator<T, T>;
+    take<T>(limit: number): SimpleTransformIterator<T, T>;
+    range<T>(start: number, end: number): SimpleTransformIterator<T, T>;
+    clone(): ClonedIterator<T>;
+
+    static range(start?: number, end?: number, step?: number): IntegerIterator;
+}
+
+export class EmptyIterator<T> extends AsyncIterator<T> {
+    _state: 4;
+}
+
+export class SingletonIterator<T> extends AsyncIterator<T> {
+    constructor(item?: T);
+}
+
+export class ArrayIterator<T> extends AsyncIterator<T> {
+    constructor(items?: T[]);
+}
+
+export interface IntegerIteratorOptions {
+    step?: number;
+    end?: number;
+    start?: number;
+}
+
+export class IntegerIterator extends AsyncIterator<number> {
+    _step: number;
+    _last: number;
+    _next: number;
+
+    constructor(options?: IntegerIteratorOptions);
+}
+
+export interface BufferedIteratorOptions {
+    maxBufferSize?: number;
+    autoStart?: boolean;
+}
+
+export class BufferedIterator<T> extends AsyncIterator<T> {
+    maxBufferSize: number;
+    _pushedCount: number;
+    _buffer: T[];
+
+    _init(autoStart: boolean): void;
+    _begin(done: () => void): void;
+    _read(count: number, done: () => void): void;
+    _push(item: T): void;
+    _fillBuffer(): void;
+    _completeClose(): void;
+    _flush(done: () => void): void;
+
+    constructor(options?: BufferedIteratorOptions);
+}
+
+export interface TransformIteratorOptions<S> extends BufferedIteratorOptions {
+    optional?: boolean;
+    source?: AsyncIterator<S>;
+}
+
+export class TransformIterator<S, T> extends BufferedIterator<T> {
+    _optional: boolean;
+    source: AsyncIterator<S>;
+
+    _validateSource(source: AsyncIterator<S>, allowDestination?: boolean): void;
+    _transform(item: S, done: (result: T) => void): void;
+    _closeWhenDone(): void;
+
+    constructor(source?: AsyncIterator<S> | TransformIteratorOptions<S>, options?: TransformIteratorOptions<S>);
+}
+
+export interface SimpleTransformIteratorOptions<S, T> extends TransformIteratorOptions<S> {
+    offset?: number;
+    limit?: number;
+    prepend?: T[];
+    append?: T[];
+
+    filter?(item: S): boolean;
+    map?(item: S): T;
+    transform?(item: S, callback: (result: T) => void): void;
+}
+
+export class SimpleTransformIterator<S, T> extends TransformIterator<S, T> {
+    _offset: number;
+    _limit: number;
+    _prepender?: ArrayIterator<T>;
+    _appender?: ArrayIterator<T>;
+
+    _filter?(item: S): boolean;
+    _map?(item: S): T;
+    _transform(item: S, done: (result: T) => void): void;
+
+    _insert(inserter: AsyncIterator<S>, done: () => void): void;
+
+    constructor(source?: AsyncIterator<S> | SimpleTransformIteratorOptions<S, T>,
+                options?: SimpleTransformIteratorOptions<S, T>);
+}
+
+export class MultiTransformIterator<S, T> extends TransformIterator<S, T> {
+    _transformerQueue: S[];
+
+    _createTransformer(element: S): AsyncIterator<T>;
+
+    constructor(source?: AsyncIterator<S> | TransformIteratorOptions<S>, options?: TransformIteratorOptions<S>);
+}
+
+export class ClonedIterator<T> extends TransformIterator<T, T> {
+    _readPosition: number;
+
+    constructor(source?: AsyncIterator<T>);
+}
diff --git a/types/asynciterator/tsconfig.json b/types/asynciterator/tsconfig.json
new file mode 100644
index 0000000000..8b8b919abc
--- /dev/null
+++ b/types/asynciterator/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "asynciterator-tests.ts"
+    ]
+}
diff --git a/types/flatpickr/v2/tslint.json b/types/asynciterator/tslint.json
similarity index 100%
rename from types/flatpickr/v2/tslint.json
rename to types/asynciterator/tslint.json
diff --git a/types/atmosphere.js/tslint.json b/types/atmosphere.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/atmosphere.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/atmosphere/atmosphere-tests.ts b/types/atmosphere/atmosphere-tests.ts
deleted file mode 100644
index b353c2c947..0000000000
--- a/types/atmosphere/atmosphere-tests.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-var socket = atmosphere;
-
-var request1:Atmosphere.Request = new atmosphere.AtmosphereRequest();
-
-request1.url = document.location.toString() + 'chat';
-request1.contentType = "application/json";
-request1.transport = 'websocket';
-request1.fallbackTransport = 'long-polling';
-
-var request2:Atmosphere.Request = {
-    url: 'http://localhost:8080/chat',
-    contentType: "application/json",
-    logLevel: 'debug',
-    transport: 'websocket',
-    fallbackTransport: 'long-polling'
-};
-
-request1.onError = function (response?:Atmosphere.Response) {};
-request1.onClose = function (response?:Atmosphere.Response) {};
-request1.onOpen = function (response?:Atmosphere.Response) {};
-request1.onMessage = function (response:Atmosphere.Response) {};
-request1.onReopen = function (request?:Atmosphere.Request, response?:Atmosphere.Response) {};
-request1.onReconnect = function (request?:Atmosphere.Request, response?:Atmosphere.Response) {};
-request1.onMessagePublished = function (response?:Atmosphere.Response) {};
-request1.onTransportFailure = function (reason?:string, response?:Atmosphere.Response) {};
-request1.onLocalMessage = function (request?:Atmosphere.Request) {};
-request1.onFailureToReconnect = function (request?:Atmosphere.Request, response?:Atmosphere.Response) {};
-request1.onClientTimeout = function (request?:Atmosphere.Request) {};
-
-request1.subscribe = function (options:Atmosphere.Request) {};
-request1.execute = function () {};
-request1.close = function () {};
-request1.disconnect = function () {};
-request1.getUrl = function ():string { return "http://www.toedter.com" };
-request1.push = function (message:string, dispatchUrl?:string) {};
-request1.getUUID = function () {};
-request1.pushLocal = function (message:string) {};
-
-var subSocket:Atmosphere.Request = socket.subscribe(request1);
-var subSocket2:Atmosphere.Request = socket.subscribe('http://chat.com', function() {}, request2);
-subSocket2.close();
-
-subSocket.push("test");
-socket.unsubscribe();
\ No newline at end of file
diff --git a/types/atmosphere/index.d.ts b/types/atmosphere/index.d.ts
deleted file mode 100644
index 7b5565cb1d..0000000000
--- a/types/atmosphere/index.d.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-// Type definitions for Atmosphere v2.1.5
-// Project: https://github.com/Atmosphere/atmosphere-javascript
-// Definitions by: Kai Toedter <https://github.com/toedter> 
-//                 Fedor Kirpichev <https://github.com/Mory1879>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// This is deprecated due to module name change. Please use 'atmosphere.js' for future development..
-
-declare namespace Atmosphere {
-    interface Atmosphere {
-        /**
-         * The atmosphere API is a little bit special here: the first parameter can either be
-         * a URL string or a Request object. If it is a URL string, then the additional parameters are expected.
-         */
-        subscribe?: (requestOrUrl:any, callback?:Function, request?:Request) => Request;
-        unsubscribe?: () => void;
-
-        AtmosphereRequest?: AtmosphereRequest;
-    }
-
-    // needed to fit JavaScript "new atmosphere.AtmosphereRequest()"
-    // and compile with --noImplicitAny
-    interface AtmosphereRequest {
-        new(): Request;
-    }
-
-    interface Request {
-        timeout?: number;
-        method?: string;
-        headers?: any;
-        contentType?: string;
-        callback?: Function;
-        url?: string;
-        data?: string;
-        suspend?: boolean;
-        maxRequest?: number;
-        reconnect?: boolean;
-        maxStreamingLength?: number;
-        lastIndex?: number;
-        logLevel?: string;
-        requestCount?: number;
-        fallbackMethod?: string;
-        fallbackTransport?: string;
-        transport?: string;
-        webSocketImpl?: any;
-        webSocketBinaryType?: any;
-        dispatchUrl?: string;
-        webSocketPathDelimiter?: string;
-        enableXDR?: boolean;
-        rewriteURL?: boolean;
-        attachHeadersAsQueryString?: boolean;
-        executeCallbackBeforeReconnect?: boolean;
-        readyState?: number;
-        lastTimestamp?: number;
-        withCredentials?: boolean;
-        trackMessageLength?: boolean;
-        messageDelimiter?: string;
-        connectTimeout?: number;
-        reconnectInterval?: number;
-        dropHeaders?: boolean;
-        uuid?: string;
-        async?: boolean;
-        shared?: boolean;
-        readResponsesHeaders?: boolean;
-        maxReconnectOnClose?: number;
-        enableProtocol?: boolean;
-        pollingInterval?: number;
-
-        onError?: (response?:Response) => void;
-        onClose?:  (response?:Response)  => void;
-        onOpen?:  (response?:Response)  => void;
-        onMessage?:  (response:Response)  => void;
-        onReopen?:  (request?:Request, response?:Response) => void;
-        onReconnect?:  (request?:Request, response?:Response)  => void;
-        onMessagePublished?:  (response?:Response)  => void;
-        onTransportFailure?:  (reason?:string, response?:Response)  => void;
-        onLocalMessage?:  (request?:Request) => void;
-        onFailureToReconnect?:  (request?:Request, response?:Response) => void;
-        onClientTimeout?: (request?:Request) => void;
-
-        subscribe?: (options:Request) => void;
-        execute?: () => void;
-        close?: () => void;
-        disconnect?: () => void;
-        getUrl?: () => string;
-        push?: (message:string, dispatchUrl?:string) => void;
-        getUUID?: () => void;
-        pushLocal?: (message:string) => void;
-    }
-
-    interface Response {
-        status?: number;
-        reasonPhrase?: string;
-        responseBody?: string;
-        messages?: string[];
-        headers?: string[];
-        state?: string;
-        transport?: string;
-        error?: string;
-        request?: Request;
-        partialMessage?: string;
-        errorHandled?: boolean;
-        closedByClientTimeout?: boolean;
-    }
-}
-
-declare var atmosphere:Atmosphere.Atmosphere;
-declare module 'atmosphere' {
-    export = atmosphere;
-}
diff --git a/types/atmosphere/tsconfig.json b/types/atmosphere/tsconfig.json
deleted file mode 100644
index 2fb820bd91..0000000000
--- a/types/atmosphere/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "atmosphere-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/atom-keymap/README.md b/types/atom-keymap/README.md
index f900dc1a4c..4c58abab17 100644
--- a/types/atom-keymap/README.md
+++ b/types/atom-keymap/README.md
@@ -19,3 +19,19 @@ Many of the types used by Atom Keymap can be referenced from the AtomKeymap name
 ```ts
 function example(keybind: AtomKeymap.KeyBinding) {}
 ```
+
+### Exposing Private Methods and Properties
+
+[Declaration Merging](https://www.typescriptlang.org/docs/handbook/declaration-merging.html) can be used to augment any of the types used within Atom Keymap. As an example, if we wanted to reveal the private ```partialMatchTimeout``` property within the KeymapManager class, then we would create a file with the following contents:
+
+```ts
+// <<filename>>.d.ts
+
+declare namespace AtomKeymap {
+  interface KeymapManager {
+    partialMatchTimeout: number;
+  }
+}
+```
+
+Once this file is either referenced or included within your project, then this new property would be freely usable on instances of the KeymapManager class without TypeScript reporting errors.
diff --git a/types/atom-keymap/atom-keymap-tests.ts b/types/atom-keymap/atom-keymap-tests.ts
index 6c8871c737..ac013b07eb 100644
--- a/types/atom-keymap/atom-keymap-tests.ts
+++ b/types/atom-keymap/atom-keymap-tests.ts
@@ -1,8 +1,9 @@
+import { Disposable } from "event-kit";
 import KeymapManager = require("atom-keymap");
 import * as ImportTest from "atom-keymap";
 
 declare const element: HTMLElement;
-declare let sub: EventKit.Disposable;
+declare let sub: Disposable;
 declare const event: KeyboardEvent;
 
 // NPM Examples ===============================================================
@@ -11,17 +12,17 @@ keymaps.defaultTarget = document.body;
 
 // Pass all the window's keydown events to the KeymapManager
 document.addEventListener("keydown", (event): void => {
-	keymaps.handleKeyboardEvent(event);
+    keymaps.handleKeyboardEvent(event);
 });
 
 // Add some keymaps. It can also be a directory of json / cson files.
 keymaps.loadKeymap("/path/to/keymap-file.json");
 // OR
 keymaps.add("/key/for/these/keymaps", {
-	body: {
-		up: "core:move-up",
-		down: "core:move-down",
-	},
+    body: {
+        up: "core:move-up",
+        down: "core:move-down",
+    },
 });
 
 // When a keybinding is triggered, it will dispatch it on the node that was focused
@@ -31,17 +32,17 @@ window.addEventListener("core:move-down", (event) => console.log("down", event))
 // General Usage ==============================================================
 const manager = new KeymapManager();
 manager.add("some/unique/path", {
-	".workspace": {
-		"ctrl-x": "package:do-something",
-		"ctrl-y": "package:do-something-else",
-	},
-	".test": {
-		enter: "core:confirm",
-	},
+    ".workspace": {
+        "ctrl-x": "package:do-something",
+        "ctrl-y": "package:do-something-else",
+    },
+    ".test": {
+        enter: "core:confirm",
+    },
 });
 
 manager.onDidMatchBinding((event): void => {
-	console.log(event.binding.command);
+    console.log(event.binding.command);
 });
 
 manager.destroy();
@@ -84,8 +85,8 @@ manager.handleKeyboardEvent(event);
 manager.keystrokeForKeyboardEvent(event);
 
 sub = manager.addKeystrokeResolver((event): string => {
-	event.layoutName;
-	return "Test";
+    event.layoutName;
+    return "Test";
 });
 
 const num: number = manager.getPartialMatchTimeout();
diff --git a/types/atom-keymap/index.d.ts b/types/atom-keymap/index.d.ts
index 9472e75215..3660fff3f4 100644
--- a/types/atom-keymap/index.d.ts
+++ b/types/atom-keymap/index.d.ts
@@ -2,235 +2,245 @@
 // Project: https://github.com/atom/atom-keymap
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
-/// <reference types="event-kit" />
+import { Disposable } from "event-kit";
 
 declare global {
-	namespace AtomKeymap {
-		/** Objects that appear as parameters to callbacks. */
-		namespace Events {
-			interface FullKeybindingMatch {
-				/** The string of keystrokes that matched the binding. */
-				keystrokes: string;
+    namespace AtomKeymap {
+        /**
+         *  The event objects that are passed into the callbacks which the user provides to
+         *  specific API calls.
+         */
+        namespace Events {
+            /**
+             *  This custom subclass of CustomEvent exists to provide the ::abortKeyBinding
+             *  method, as well as versions of the ::stopPropagation methods that record the
+             *  intent to stop propagation so event bubbling can be properly simulated for
+             *  detached elements.
+             */
+            interface CommandEvent extends CustomEvent {
+                keyBindingAborted: boolean;
+                propagationStopped: boolean;
 
-				/** The KeyBinding that the keystrokes matched. */
-				binding: KeyBinding;
+                abortKeyBinding(): void;
+                stopPropagation(): CustomEvent;
+                stopImmediatePropagation(): CustomEvent;
+            }
 
-				/** The DOM element that was the target of the most recent keyboard event. */
-				keyboardEventTarget: Element;
-			}
+            interface FullKeybindingMatch {
+                /** The string of keystrokes that matched the binding. */
+                keystrokes: string;
 
-			interface PartialKeybindingMatch {
-				/** The string of keystrokes that matched the binding. */
-				keystrokes: string;
+                /** The KeyBinding that the keystrokes matched. */
+                binding: KeyBinding;
 
-				/** The KeyBindings that the keystrokes partially matched. */
-				partiallyMatchedBindings: KeyBinding[];
+                /** The DOM element that was the target of the most recent keyboard event. */
+                keyboardEventTarget: Element;
+            }
 
-				/** DOM element that was the target of the most recent keyboard event. */
-				keyboardEventTarget: Element;
-			}
+            interface PartialKeybindingMatch {
+                /** The string of keystrokes that matched the binding. */
+                keystrokes: string;
 
-			interface FailedKeybindingMatch {
-				/** The string of keystrokes that failed to match the binding. */
-				keystrokes: string;
+                /** The KeyBindings that the keystrokes partially matched. */
+                partiallyMatchedBindings: KeyBinding[];
 
-				/** The DOM element that was the target of the most recent keyboard event. */
-				keyboardEventTarget: Element;
-			}
+                /** DOM element that was the target of the most recent keyboard event. */
+                keyboardEventTarget: Element;
+            }
 
-			interface FailedKeymapFileRead {
-				/** The error message. */
-				message: string;
+            interface FailedKeybindingMatch {
+                /** The string of keystrokes that failed to match the binding. */
+                keystrokes: string;
 
-				/** The error stack trace. */
-				stack: string;
-			}
+                /** The DOM element that was the target of the most recent keyboard event. */
+                keyboardEventTarget: Element;
+            }
 
-			interface KeymapLoaded {
-				/** The path of the keymap file. */
-				path: string;
-			}
+            interface FailedKeymapFileRead {
+                /** The error message. */
+                message: string;
 
-			interface AddedKeystrokeResolver {
-				/** The currently resolved keystroke string. If your function returns a falsy
-				 *  value, this is how Atom will resolve your keystroke.
-				 */
-				keystroke: string;
+                /** The error stack trace. */
+                stack: string;
+            }
 
-				/** The raw DOM 3 `KeyboardEvent` being resolved. See the DOM API documentation
-				 *  for more details.
-				 */
-				event: KeyboardEvent;
+            interface KeymapLoaded {
+                /** The path of the keymap file. */
+                path: string;
+            }
 
-				/** The OS-specific name of the current keyboard layout. */
-				layoutName: string;
+            interface AddedKeystrokeResolver {
+                /**
+                 *  The currently resolved keystroke string. If your function returns a falsy
+                 *  value, this is how Atom will resolve your keystroke.
+                 */
+                keystroke: string;
 
-				/** An object mapping DOM 3 `KeyboardEvent.code` values to objects with the
-				 *  typed character for that key in each modifier state, based on the current
-				 *  operating system layout.
-				 */
-				keymap: object;
-			}
-		}
+                /**
+                 *  The raw DOM 3 `KeyboardEvent` being resolved. See the DOM API documentation
+                 *  for more details.
+                 */
+                event: KeyboardEvent;
 
-		/** Objects that appear as parameters to functions. */
-		namespace Options {
-			interface BuildKeyEvent {
-				ctrl?: boolean;
-				alt?: boolean;
-				shift?: boolean;
-				cmd?: boolean;
-				which?: number;
-				target?: Element;
-			}
-		}
+                /** The OS-specific name of the current keyboard layout. */
+                layoutName: string;
 
-		/** The static side to each exported class. Should generally only be used internally. */
-		namespace Statics {
-			/* tslint:disable:no-unnecessary-qualifier */
-			/** The static side to the KeymapManager class. */
-			interface KeymapManager {
-				/** Create a keydown DOM event. */
-				buildKeydownEvent(key: string, options?: AtomKeymap.Options.BuildKeyEvent): void;
+                /**
+                 *  An object mapping DOM 3 `KeyboardEvent.code` values to objects with the
+                 *  typed character for that key in each modifier state, based on the current
+                 *  operating system layout.
+                 */
+                keymap: object;
+            }
+        }
 
-				/** Create a keyup DOM event. */
-				buildKeyupEvent(key: string, options?: AtomKeymap.Options.BuildKeyEvent): void;
+        /**
+         *  The option objects that the user is expected to fill out and provide to
+         *  specific API calls.
+         */
+        namespace Options {
+            interface BuildKeyEvent {
+                ctrl?: boolean;
+                alt?: boolean;
+                shift?: boolean;
+                cmd?: boolean;
+                which?: number;
+                target?: Element;
+            }
+        }
 
-				/** Create a new KeymapManager. */
-				new (options?: { defaultTarget?: HTMLElement }): AtomKeymap.KeymapManager;
-			}
-			/* tslint:enable:no-unnecessary-qualifier */
-		}
+        interface KeyBinding {
+            // Properties
+            enabled: boolean;
+            source: string;
+            command: string;
+            keystrokes: string;
+            keystrokeArray: string[];
+            keystrokeCount: number;
+            selector: string;
+            specificity: number;
 
-		/** This custom subclass of CustomEvent exists to provide the ::abortKeyBinding
-		 *  method, as well as versions of the ::stopPropagation methods that record the
-		 *  intent to stop propagation so event bubbling can be properly simulated for
-		 *  detached elements.
-		 */
-		interface CommandEvent extends CustomEvent {
-			keyBindingAborted: boolean;
-			propagationStopped: boolean;
+            // Comparison
+            /** Determines whether the given keystroke matches any contained within this binding. */
+            matches(keystroke: string): boolean;
 
-			abortKeyBinding(): void;
-			stopPropagation(): CustomEvent;
-			stopImmediatePropagation(): CustomEvent;
-		}
+            /**
+             *  Compare another KeyBinding to this instance.
+             *  Returns <= -1 if the argument is considered lesser or of lower priority.
+             *  Returns 0 if this binding is equivalent to the argument.
+             *  Returns >= 1 if the argument is considered greater or of higher priority.
+             */
+            compare(other: KeyBinding): number;
+        }
 
-		interface KeyBinding {
-			// Properties
-			enabled: boolean;
-			source: string;
-			command: string;
-			keystrokes: string;
-			keystrokeArray: string[];
-			keystrokeCount: number;
-			selector: string;
-			specificity: number;
+        /**
+         *  Allows commands to be associated with keystrokes in a context-sensitive way.
+         *  In Atom, you can access a global instance of this object via `atom.keymaps`.
+         */
+        interface KeymapManager {
+            defaultTarget: HTMLElement;
 
-			// Comparison
-			/** Determines whether the given keystroke matches any contained within this binding. */
-			matches(keystroke: string): boolean;
+            partialMatchTimeout: number;
 
-			/** Compare another KeyBinding to this instance.
-			 *  Returns <= -1 if the argument is considered lesser or of lower priority.
-			 *  Returns 0 if this binding is equivalent to the argument.
-			 *  Returns >= 1 if the argument is considered greater or of higher priority.
-			 */
-			compare(other: KeyBinding): number;
-		}
+            /** Clear all registered key bindings and enqueued keystrokes. For use in tests. */
+            clear(): void;
 
-		/** Allows commands to be associated with keystrokes in a context-sensitive way.
-		 *  In Atom, you can access a global instance of this object via `atom.keymaps`.
-		 */
-		/** Instance side of KeymapManager class. */
-		interface KeymapManager {
-			defaultTarget: HTMLElement;
+            /** Unwatch all watched paths. */
+            destroy(): void;
 
-			partialMatchTimeout: number;
+            // Event Subscription
+            /**
+             *  Invoke the given callback when one or more keystrokes completely match a
+             *  key binding.
+             */
+            onDidMatchBinding(callback: (event: Events.FullKeybindingMatch) => void):
+                Disposable;
 
-			/** Clear all registered key bindings and enqueued keystrokes. For use in tests. */
-			clear(): void;
+            /** Invoke the given callback when one or more keystrokes partially match a binding. */
+            onDidPartiallyMatchBindings(callback: (event: Events.PartialKeybindingMatch) =>
+                void): Disposable;
 
-			/** Unwatch all watched paths. */
-			destroy(): void;
+            /** Invoke the given callback when one or more keystrokes fail to match any bindings. */
+            onDidFailToMatchBinding(callback: (event: Events.FailedKeybindingMatch) =>
+                void): Disposable;
 
-			// Event Subscription
-			/** Invoke the given callback when one or more keystrokes completely match a key binding. */
-			onDidMatchBinding(callback: (event: Events.FullKeybindingMatch) => void):
-				EventKit.Disposable;
+            /** Invoke the given callback when a keymap file is reloaded. */
+            onDidReloadKeymap(callback: (event: Events.KeymapLoaded) => void): Disposable;
 
-			/** Invoke the given callback when one or more keystrokes partially match a binding. */
-			onDidPartiallyMatchBindings(callback: (event: Events.PartialKeybindingMatch) =>
-				void): EventKit.Disposable;
+            /** Invoke the given callback when a keymap file is unloaded. */
+            onDidUnloadKeymap(callback: (event: Events.KeymapLoaded) => void): Disposable;
 
-			/** Invoke the given callback when one or more keystrokes fail to match any bindings. */
-			onDidFailToMatchBinding(callback: (event: Events.FailedKeybindingMatch) =>
-				void): EventKit.Disposable;
+            /** Invoke the given callback when a keymap file not able to be loaded. */
+            onDidFailToReadFile(callback: (error: Events.FailedKeymapFileRead) => void):
+                Disposable;
 
-			/** Invoke the given callback when a keymap file is reloaded. */
-			onDidReloadKeymap(callback: (event: Events.KeymapLoaded) => void):
-				EventKit.Disposable;
+            // Adding and Removing Bindings
+            /** Construct KeyBindings from an object grouping them by CSS selector. */
+            build(source: string, bindings: { [key: string]: { [key: string]: string }},
+                priority?: number): KeyBinding[];
 
-			/** Invoke the given callback when a keymap file is unloaded. */
-			onDidUnloadKeymap(callback: (event: Events.KeymapLoaded) => void):
-				EventKit.Disposable;
+            /** Add sets of key bindings grouped by CSS selector. */
+            add(source: string, bindings: { [key: string]: { [key: string]: string }},
+                priority?: number): Disposable;
 
-			/** Invoke the given callback when a keymap file not able to be loaded. */
-			onDidFailToReadFile(callback: (error: Events.FailedKeymapFileRead) => void):
-				EventKit.Disposable;
+            // Accessing Bindings
+            /** Get all current key bindings. */
+            getKeyBindings(): KeyBinding[];
 
-			// Adding and Removing Bindings
-			/** Construct KeyBindings from an object grouping them by CSS selector. */
-			build(source: string, bindings: { [key: string]: { [key: string]: string }},
-				priority?: number): KeyBinding[];
+            /** Get the key bindings for a given command and optional target. */
+            findKeyBindings(params?: {
+                keystrokes?: string, // e.g. 'ctrl-x ctrl-s'
+                command?: string, // e.g. 'editor:backspace'
+                target?: Element,
+            }): KeyBinding[];
 
-			/** Add sets of key bindings grouped by CSS selector. */
-			add(source: string, bindings: { [key: string]: { [key: string]: string }},
-				priority?: number): EventKit.Disposable;
+            // Managing Keymap Files
+            /** Load the key bindings from the given path. */
+            loadKeymap(bindingsPath: string, options?: { watch?: boolean, priority?: number }):
+                void;
 
-			// Accessing Bindings
-			/** Get all current key bindings. */
-			getKeyBindings(): KeyBinding[];
+            /**
+             *  Cause the keymap to reload the key bindings file at the given path whenever
+             *  it changes.
+             */
+            watchKeymap(filePath: string, options?: { priority: number }): void;
 
-			/** Get the key bindings for a given command and optional target. */
-			findKeyBindings(params?: {
-				keystrokes?: string, // e.g. 'ctrl-x ctrl-s'
-				command?: string, // e.g. 'editor:backspace'
-				target?: Element,
-			}): KeyBinding[];
+            // Managing Keyboard Events
+            /**
+             *  Dispatch a custom event associated with the matching key binding for the
+             *  given `KeyboardEvent` if one can be found.
+             */
+            handleKeyboardEvent(event: KeyboardEvent): void;
 
-			// Managing Keymap Files
-			/** Load the key bindings from the given path. */
-			loadKeymap(bindingsPath: string, options?: { watch?: boolean, priority?: number }):
-				void;
+            /** Translates a keydown event to a keystroke string. */
+            keystrokeForKeyboardEvent(event: KeyboardEvent): string;
 
-			/** Cause the keymap to reload the key bindings file at the given path whenever
-			 *  it changes.
-			 */
-			watchKeymap(filePath: string, options?: { priority: number }): void;
+            /** Customize translation of raw keyboard events to keystroke strings. */
+            addKeystrokeResolver(resolver: (event: Events.AddedKeystrokeResolver) => string):
+                Disposable;
 
-			// Managing Keyboard Events
-			/** Dispatch a custom event associated with the matching key binding for the
-			 *  given `KeyboardEvent` if one can be found.
-			 */
-			handleKeyboardEvent(event: KeyboardEvent): void;
+            /**
+             *  Get the number of milliseconds allowed before pending states caused by
+             *  partial matches of multi-keystroke bindings are terminated.
+             */
+            getPartialMatchTimeout(): number;
+        }
 
-			/** Translates a keydown event to a keystroke string. */
-			keystrokeForKeyboardEvent(event: KeyboardEvent): string;
+        /** The static side to the KeymapManager class. */
+        interface KeymapManagerStatic {
+            /** Create a keydown DOM event. */
+            buildKeydownEvent(key: string, options?: Options.BuildKeyEvent): void;
 
-			/** Customize translation of raw keyboard events to keystroke strings. */
-			addKeystrokeResolver(resolver: (event: Events.AddedKeystrokeResolver) => string):
-				EventKit.Disposable;
+            /** Create a keyup DOM event. */
+            buildKeyupEvent(key: string, options?: Options.BuildKeyEvent): void;
 
-			/** Get the number of milliseconds allowed before pending states caused by
-			 *  partial matches of multi-keystroke bindings are terminated.
-			 */
-			getPartialMatchTimeout(): number;
-		}
-	}
+            /** Create a new KeymapManager. */
+            new (options?: { defaultTarget?: HTMLElement }): KeymapManager;
+        }
+    }
 }
 
-declare const KeymapManager: AtomKeymap.Statics.KeymapManager;
+declare const KeymapManager: AtomKeymap.KeymapManagerStatic;
 export = KeymapManager;
diff --git a/types/atom-keymap/tsconfig.json b/types/atom-keymap/tsconfig.json
index f501df325f..8a17cc061c 100644
--- a/types/atom-keymap/tsconfig.json
+++ b/types/atom-keymap/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/atom-keymap/tslint.json b/types/atom-keymap/tslint.json
index 4b036f727a..e0508241c7 100644
--- a/types/atom-keymap/tslint.json
+++ b/types/atom-keymap/tslint.json
@@ -1,37 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Custom rules.
-        "class-name": true,
-        "indent": [true, "tabs"],
-        "jsdoc-format": true,
+        "indent": [true, "spaces", 4],
         "max-line-length": [true, 100],
-        "quotemark": [true, "double", "avoid-escape"],
-        "trailing-comma": [true, {
-            "multiline": { "objects": "always", "arrays": "always", "functions": "never" },
-            "singleline": { "objects": "never", "arrays": "never", "functions": "never" }
-        }],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-separator",
-            "check-type",
-            "check-typecast",
-            "check-rest-spread",
-            "check-preblock"
-        ],
-        // Soon to be defaults.
-        "arrow-return-shorthand": [true, "multiline"],
-        "no-any": true,
-        "no-floating-promises": true,
-        "no-unbound-method": true,
-        "no-unsafe-any": true,
-        "number-literal-format": true,
-        "restrict-plus-operands": true,
-        "return-undefined": true,
-        "switch-final-break": true
+        "no-any": true
     }
 }
diff --git a/types/atom-keymap/v5/.editorconfig b/types/atom-keymap/v5/.editorconfig
deleted file mode 100644
index 570211f898..0000000000
--- a/types/atom-keymap/v5/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.ts]
-indent_style = tab
-indent_size = 4
diff --git a/types/atom-keymap/v5/atom-keymap-tests.ts b/types/atom-keymap/v5/atom-keymap-tests.ts
deleted file mode 100644
index 1c92bff5c9..0000000000
--- a/types/atom-keymap/v5/atom-keymap-tests.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-import { KeymapManager, ICompleteMatchEvent } from "atom-keymap";
-
-var manager = new KeymapManager();
-manager.add('some/unique/path', {
-    '.workspace': {
-        'ctrl-x': 'package:do-something',
-        'ctrl-y': 'package:do-something-else'
-    },
-    '.mini.editor': {
-        'enter': 'core:confirm'
-    }
-});
-
-manager.onDidMatchBinding((event: ICompleteMatchEvent): void => {
-    console.log(event.binding.command);
-})
-
-manager.destroy();
diff --git a/types/atom-keymap/v5/index.d.ts b/types/atom-keymap/v5/index.d.ts
deleted file mode 100644
index 9ffa0a41d3..0000000000
--- a/types/atom-keymap/v5/index.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// Type definitions for atom-keymap v5.1.5
-// Project: https://github.com/atom/atom-keymap/
-// Definitions by: Vadim Macagon <https://github.com/enlight>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as AtomEventKit from 'event-kit';
-
-export = AtomKeymap;
-
-declare namespace AtomKeymap {
-	type Disposable = AtomEventKit.Disposable;
-
-	/** Instance side of KeyBinding class. */
-	interface KeyBinding {
-		enabled: boolean;
-		source: string;
-		command: string;
-		keystrokes: string;
-		keystrokeCount: number;
-		selector: string;
-		specificity: number;
-
-		matches(keystroke: string): boolean;
-		compare(keyBinding: KeyBinding): number;
-	}
-
-	interface ICompleteMatchEvent {
-		/** Keystrokes that matched the binding. */
-		keystrokes: string;
-		/** Binding that was matched to the keystrokes. */
-		binding: KeyBinding;
-		/** DOM element that was the target of the most recent `KeyboardEvent`. */
-		keyboardEventTarget: Element;
-	}
-
-	interface IPartialMatchEvent {
-		/** Keystrokes that matched the binding. */
-		keystrokes: string;
-		/** Bindings that were partially matched to the keystrokes. */
-		partiallyMatchedBindings: KeyBinding[];
-		/** DOM element that was the target of the most recent `KeyboardEvent`. */
-		keyboardEventTarget: Element;
-	}
-
-	interface IFailedMatchEvent {
-		/** Keystrokes that failed to match a binding. */
-		keystrokes: string;
-		/** DOM element that was the target of the most recent `KeyboardEvent`. */
-		keyboardEventTarget: Element;
-	}
-
-	interface IKeymapLoadEvent {
-		/** Path to a keymap file. */
-		path: string;
-	}
-
-  /** Static side of KeymapManager class. */
-  interface KeymapManagerStatic {
-    prototype: KeymapManager;
-    new (options?: { defaultTarget?: Element }): KeymapManager;
-  }
-
-	/** Instance side of KeymapManager class. */
-	interface KeymapManager {
-		constructor: KeymapManagerStatic;
-		/** Unwatches all watched paths. */
-		destroy(): void;
-
-		// Event Subscription
-
-		/** Sets callback to invoke when one or more keystrokes completely match a key binding. */
-		onDidMatchBinding(callback: (event: ICompleteMatchEvent) => void): Disposable;
-		/** Sets callback to invoke when one or more keystrokes partially match a binding. */
-		onDidPartiallyMatchBindings(callback: (event: IPartialMatchEvent) => void): Disposable;
-		/** Sets callback to invoke when one or more keystrokes fail to match any bindings. */
-		onDidFailToMatchBinding(callback: (event: IFailedMatchEvent) => void): Disposable;
-		/** Sets callback to invoke when a keymap file is reloaded. */
-		onDidReloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
-		/** Sets callback to invoke when a keymap file is unloaded. */
-		onDidUnloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
-		/** Sets callback to invoke when a keymap file could not to be loaded. */
-		onDidFailToReadFile(callback: (error: Error) => void): Disposable;
-
-		// Adding and Removing Bindings
-
-		/** Adds sets of key bindings grouped by CSS selector. */
-		add(source: string, keyBindingsBySelector: any): Disposable;
-
-		// Accessing Bindings
-
-		getKeyBindings(): KeyBinding[];
-		findKeyBindings(params?: {
-			keystrokes: string; // e.g. 'ctrl-x ctrl-s'
-			command: string; // e.g. 'editor:backspace'
-			target?: Element;
-		}): KeyBinding[];
-
-		// Managing Keymap Files
-
-		/**
-		 * Loads the key bindings from the given path.
-		 *
-		 * @param bindingsPath A path to a file or a directory. If the path is a directory all files
-		 *                     inside it will be loaded.
-		 */
-		loadKeymap(bindingsPath: string, options?: { watch: boolean }): void;
-		/**
-		 * Starts watching the given file/directory for changes, reloading any keymaps at that location
-		 * when changes are detected.
-		 *
-		 * @param filePath A path to a file or a directory.
-		 */
-		watchKeymap(filePath: string): void;
-
-		// Managing Keyboard Events
-
-		/**
-		 * Dispatches a custom event associated with the matching key binding for the given
-		 * `KeyboardEvent` if one can be found.
-		 */
-		handleKeyboardEvent(event: KeyboardEvent): void;
-		/** Translates a keydown event to a keystroke string. */
-		keystrokeForKeyboardEvent(event: KeyboardEvent): string;
-		/**
-		 * @return The number of milliseconds allowed before pending states caused by partial matches of
-		 *         multi-keystroke bindings are terminated.
-		 */
-		getPartialMatchTimeout(): number;
-	}
-
-	/** Allows commands to be associated with keystrokes in a context-sensitive way.*/
-	var KeymapManager: KeymapManagerStatic;
-}
diff --git a/types/atom-keymap/v5/tsconfig.json b/types/atom-keymap/v5/tsconfig.json
deleted file mode 100644
index 4995308609..0000000000
--- a/types/atom-keymap/v5/tsconfig.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "atom-keymap": [
-                "atom-keymap/v5"
-            ],
-            "event-kit": [
-                "event-kit/v1"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "atom-keymap-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/atom-mocha-test-runner/atom-mocha-test-runner-tests.ts b/types/atom-mocha-test-runner/atom-mocha-test-runner-tests.ts
index 434e48f261..0bc8205095 100644
--- a/types/atom-mocha-test-runner/atom-mocha-test-runner-tests.ts
+++ b/types/atom-mocha-test-runner/atom-mocha-test-runner-tests.ts
@@ -1,38 +1,39 @@
+import { AtomEnvironment, TestRunnerParams } from "atom";
 import { createRunner } from "atom-mocha-test-runner";
 import defaultMochaRunner = require("atom-mocha-test-runner");
 
 const extraOptions = {
-	testSuffixes: ["-spec.js", "-spec.coffee"],
+    testSuffixes: ["-spec.js", "-spec.coffee"],
 };
 
 function mochaSetup(mocha: Mocha) {
-	mocha.addFile("test.file");
+    mocha.addFile("test.file");
 }
 
 let testRunner = createRunner();
 testRunner = createRunner(extraOptions);
 testRunner = createRunner(extraOptions, mochaSetup);
 testRunner = createRunner({
-	colors: true,
-	globalAtom: true,
-	htmlTitle: "Test Title",
-	reporter: "dot",
-	testSuffixes: ["test.file"],
+    colors: true,
+    globalAtom: true,
+    htmlTitle: "Test Title",
+    reporter: "dot",
+    testSuffixes: ["test.file"],
 });
 
-declare const atom: Atom.AtomEnvironment;
+declare const atom: AtomEnvironment;
 declare const blob: object;
 declare let num: number;
 
 async function runTests(): Promise<number> {
-	const runnerArgs: Atom.Structures.TestRunnerArgs = {
-		testPaths: ["/var/test"],
-		logFile: "/var/log",
-		headless: false,
-		buildDefaultApplicationDelegate: () => blob,
-		buildAtomEnvironment: () => atom,
-	};
+    const runnerArgs: TestRunnerParams = {
+        testPaths: ["/var/test"],
+        logFile: "/var/log",
+        headless: false,
+        buildDefaultApplicationDelegate: () => blob,
+        buildAtomEnvironment: () => atom,
+    };
 
-	num = await defaultMochaRunner(runnerArgs);
-	return await testRunner(runnerArgs);
+    num = await defaultMochaRunner(runnerArgs);
+    return testRunner(runnerArgs);
 }
diff --git a/types/atom-mocha-test-runner/index.d.ts b/types/atom-mocha-test-runner/index.d.ts
index 432d91c71a..3a842f4a5c 100644
--- a/types/atom-mocha-test-runner/index.d.ts
+++ b/types/atom-mocha-test-runner/index.d.ts
@@ -4,24 +4,25 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="atom" />
 /// <reference types="mocha" />
 
+import { TestRunner } from "atom";
+
 interface AtomMochaOptions {
-	/** Which reporter to use on the terminal. */
-	reporter?: string;
+    /** Which reporter to use on the terminal. */
+    reporter?: string;
 
-	/** Whether or not to assign the created Atom environment to `global.atom`. */
-	globalAtom?: boolean;
+    /** Whether or not to assign the created Atom environment to `global.atom`. */
+    globalAtom?: boolean;
 
-	/** File extensions that indicate that the file contains tests. */
-	testSuffixes?: string[];
+    /** File extensions that indicate that the file contains tests. */
+    testSuffixes?: string[];
 
-	/** Whether or not to colorize output on the terminal. */
-	colors?: boolean;
+    /** Whether or not to colorize output on the terminal. */
+    colors?: boolean;
 
-	/** The string to use for the window title in the HTML reporter. */
-	htmlTitle?: string;
+    /** The string to use for the window title in the HTML reporter. */
+    htmlTitle?: string;
 }
 
 // The test runner function is augmented on export by:
@@ -30,9 +31,9 @@ interface AtomMochaOptions {
 //   module.exports = createRunner()
 //   module.exports.createRunner = createRunner
 // Which is what we're trying to model here.
-interface TestRunnerExport extends AtomCore.TestRunner {
-	createRunner(options?: AtomMochaOptions, mochaConfigFunction?:
-		(mocha: Mocha) => void): AtomCore.TestRunner;
+interface TestRunnerExport extends TestRunner {
+    createRunner(options?: AtomMochaOptions, mochaConfigFunction?:
+        (mocha: Mocha) => void): TestRunner;
 }
 
 declare const runner: TestRunnerExport;
diff --git a/types/atom-mocha-test-runner/tsconfig.json b/types/atom-mocha-test-runner/tsconfig.json
index 22df333ccd..c6e9fb20c0 100644
--- a/types/atom-mocha-test-runner/tsconfig.json
+++ b/types/atom-mocha-test-runner/tsconfig.json
@@ -9,7 +9,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/atom-mocha-test-runner/tslint.json b/types/atom-mocha-test-runner/tslint.json
index 4b036f727a..e0508241c7 100644
--- a/types/atom-mocha-test-runner/tslint.json
+++ b/types/atom-mocha-test-runner/tslint.json
@@ -1,37 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Custom rules.
-        "class-name": true,
-        "indent": [true, "tabs"],
-        "jsdoc-format": true,
+        "indent": [true, "spaces", 4],
         "max-line-length": [true, 100],
-        "quotemark": [true, "double", "avoid-escape"],
-        "trailing-comma": [true, {
-            "multiline": { "objects": "always", "arrays": "always", "functions": "never" },
-            "singleline": { "objects": "never", "arrays": "never", "functions": "never" }
-        }],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-separator",
-            "check-type",
-            "check-typecast",
-            "check-rest-spread",
-            "check-preblock"
-        ],
-        // Soon to be defaults.
-        "arrow-return-shorthand": [true, "multiline"],
-        "no-any": true,
-        "no-floating-promises": true,
-        "no-unbound-method": true,
-        "no-unsafe-any": true,
-        "number-literal-format": true,
-        "restrict-plus-operands": true,
-        "return-undefined": true,
-        "switch-final-break": true
+        "no-any": true
     }
 }
diff --git a/types/atom/README.md b/types/atom/README.md
deleted file mode 100644
index ba2d52a6f4..0000000000
--- a/types/atom/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-## Atom API Type Definitions
-
-TypeScript type definitions for the [Atom Text Editor](https://atom.io/) public API, which is used to develop packages for the editor. Documentation for the public API can be found [here](https://atom.io/docs/api/v1.21.0/).
-
-### Exports
-
-#### The "atom" Variable
-
-These definitions declare a global static variable named "atom" as ambient. Once these definitions have been referenced within your project, you will be able to access properties and member functions from the [AtomEnvironment](https://atom.io/docs/api/v1.21.0/AtomEnvironment) class off of this variable, as it is an instance of that class.
-
-```ts
-if (atom.inDevMode()) {}
-```
-
-#### The Atom Namespace
-
-All of the types used by or referenced by the Atom public API have been pulled into the Atom namespace, providing a consistent and easy way to access each of them, without having to care about where that type actually lives within the Atom codebase.
-
-```ts
-function example(buffer: Atom.TextBuffer) {}
-```
-
-#### The AtomCore Namespace
-
-All classes which are core to Atom itself have been provided under the AtomCore namespace.
-
-```ts
-function example(cursor: AtomCore.Cursor) {}
-```
-
-### Service Type Definitions
-
-There are many services provided by other Atom packages that you may want to use within your own Atom package. We bundle type definitions for several of these services with these type definitions.
-
-```ts
-/// <reference types="atom/services" />
-let completionProvider: Atom.Services.Autocomplete.Provider;
-```
-
-The currently supported services are:
-- [Autocomplete](https://github.com/atom/autocomplete-plus)
-- [Status Bar](https://github.com/atom/status-bar)
diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index 34f19e5f3e..5fc92880f4 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -1,5 +1,8 @@
+import * as Atom from "atom";
+
 declare let str: string;
 declare let num: number;
+declare let nums: number[];
 declare let bool: boolean;
 declare let strs: string[];
 declare let obj: object;
@@ -9,2144 +12,3305 @@ declare let regExp: RegExp;
 declare let element: HTMLElement;
 declare let elements: HTMLElement[];
 declare const div: HTMLDivElement;
+declare const event: KeyboardEvent;
+declare const mouseEvent: MouseEvent;
 
-declare let grammar: Atom.Grammar;
-declare let pos: Atom.Point;
-declare let posArr: Atom.Point[];
-declare let range: Atom.Range;
-declare let ranges: Atom.Range[];
-declare let marker: Atom.Marker;
+declare let buffer: Atom.TextBuffer;
+declare const color: Atom.Color;
+declare let cursor: Atom.Cursor;
+declare let cursors: Atom.Cursor[];
+declare let decoration: Atom.Decoration;
+declare let decorations: Atom.Decoration[];
+declare let decorationLayerProps: Atom.DecorationLayerOptions;
+declare let dir: Atom.Directory;
+declare let dirs: Atom.Directory[];
 declare let displayMarker: Atom.DisplayMarker;
 declare let displayMarkers: Atom.DisplayMarker[];
 declare let displayMarkerLayer: Atom.DisplayMarkerLayer;
-declare let sub: Atom.Disposable;
-declare let dir: Atom.Directory;
-declare let dirs: Atom.Directory[];
-
-declare let buffer: Atom.TextBuffer;
-declare let cursor: Atom.Cursor;
-declare let cursors: Atom.Cursor[];
+declare let dock: Atom.Dock;
 declare let editor: Atom.TextEditor;
 declare let editors: Atom.TextEditor[];
-declare let decoration: Atom.Decoration;
-declare let decorations: Atom.Decoration[];
+declare let emitter: Atom.Emitter;
+declare let file: Atom.File;
+declare let fileOrDir: Atom.File | Atom.Directory;
+declare let grammar: Atom.Grammar;
+declare let grammars: Atom.Grammar[];
+declare let gutter: Atom.Gutter;
+declare let gutters: Atom.Gutter[];
+declare let historyPaths: Atom.ProjectHistory[];
+declare let layerDecoration: Atom.LayerDecoration;
+declare let marker: Atom.Marker;
+declare let markers: Atom.Marker[];
+declare let markerLayer: Atom.MarkerLayer;
 declare let notification: Atom.Notification;
 declare let notifications: Atom.Notification[];
-declare let scopeDescriptor: Atom.ScopeDescriptor;
 declare let pack: Atom.Package;
 declare let packs: Atom.Package[];
 declare let pane: Atom.Pane;
 declare let panes: Atom.Pane[];
+declare let paneContainer: Atom.Dock|Atom.WorkspaceCenter;
 declare let panel: Atom.Panel;
 declare let panels: Atom.Panel[];
+declare let pos: Atom.Point;
+declare let posArr: Atom.Point[];
 declare let project: Atom.Project;
+declare let range: Atom.Range;
+declare let ranges: Atom.Range[];
+declare let registry: Atom.GrammarRegistry;
 declare let repository: Atom.GitRepository;
 declare let repositories: Atom.GitRepository[];
-declare let gutter: Atom.Gutter;
-declare let gutters: Atom.Gutter[];
-declare let historyPaths: Atom.HistoryProject[];
-declare let layerDecoration: Atom.LayerDecoration;
+declare let scopeDescriptor: Atom.ScopeDescriptor;
 declare let selection: Atom.Selection;
 declare let selections: Atom.Selection[];
 declare let styleManager: Atom.StyleManager;
+declare let subscription: Atom.Disposable;
+declare let subscriptions: Atom.CompositeDisposable;
 declare let tooltips: Atom.Tooltip[];
-declare let dock: Atom.Dock;
 declare let workspaceCenter: Atom.WorkspaceCenter;
-declare let paneContainer: Atom.Dock|Atom.WorkspaceCenter;
+declare let pixelPos: Atom.PixelPosition;
+declare let textEditorElement: Atom.TextEditorElement;
+declare let textEditorComponent: Atom.TextEditorComponent;
 
-// Exports Testing ============================================================
-import { BufferedNodeProcess, BufferedProcess, GitRepository, Notification,
-	TextBuffer, TextEditor, Point, Range, File, Directory, Emitter, Disposable,
-	CompositeDisposable, Task, watchPath } from "atom";
+// AtomEnvironment ============================================================
+function testAtomEnvironment() {
+    // Properties
+    subscription = atom.commands.add("test", { "execute-command": () => {}});
 
-const pathWatcher = watchPath("/var/test", {}, (events) => {
-	for (const event of events) {
-		str = event.path;
-		str = event.action;
-		if (event.oldPath) str = event.oldPath;
-	}
-});
+    str = atom.clipboard.read();
 
-// global "atom"
-atom.commands;
-atom.config;
-atom.clipboard;
-atom.contextMenu;
-atom.menu;
-atom.keymaps;
-atom.tooltips;
-atom.notifications;
-atom.project;
-atom.grammars;
-atom.history;
-atom.packages;
-atom.themes;
-atom.styles;
-atom.deserializers;
-atom.views;
-atom.workspace;
-atom.textEditors;
-atom.onDidBeep((): void => {});
-atom.onWillThrowError((): void => {});
-atom.onDidThrowError((): void => {});
-atom.whenShellEnvironmentLoaded((): void => {});
-atom.inDevMode();
-atom.inSafeMode();
-atom.inSpecMode();
-atom.getVersion();
-str = atom.getReleaseChannel();
-atom.isReleasedVersion();
-atom.getWindowLoadTime();
+    subscription = atom.contextMenu.add({
+        "atom-workspace": [{label: "Help", command: "application:open-documentation"}],
+        "atom-text-editor": [{
+            label: "History",
+            submenu: [
+                { label: "Undo", command: "core:undo" },
+                { label: "Redo", command: "core:redo" },
+            ],
+        }],
+    });
 
-const loadSettings = atom.getLoadSettings();
-const testValue = loadSettings.env["test"];
-if (testValue) str = testValue;
+    subscription = atom.menu.add([{
+        label: "Hello",
+        submenu : [{ label: "World!", command: "hello:world" }],
+    }]);
 
-atom.open({ devMode: false, newWindow: true, pathsToOpen: ["Test.file"],
-	safeMode: false });
-atom.close();
-atom.getSize();
-atom.setSize(42, 42);
-atom.getPosition();
-atom.setPosition(42, 42);
-atom.pickFolder((): void => {});
+    atom.keymaps.add("Test.Path", {
+        selector: {
+            a: "execute-something",
+        },
+    });
 
-obj = atom.getCurrentWindow();
+    subscription = atom.tooltips.add(div, { title: "Tooltip Test" });
 
-atom.center();
-atom.focus();
-atom.show();
-atom.hide();
-atom.reload();
-atom.restartApplication();
-atom.isMaximized();
-atom.isFullScreen();
-atom.setFullScreen(true);
-atom.toggleFullScreen();
-atom.beep();
-atom.confirm({ buttons: ["Test"], detailedMessage: "Test", message: "Test" });
+    notification = atom.notifications.addError("Error");
 
-async function toggleDevTools() {
-	await atom.openDevTools();
-	await atom.toggleDevTools();
+    atom.project.addPath("/var/test");
+
+    grammar = atom.grammars.loadGrammarSync("Test.file");
+
+    historyPaths = atom.history.getProjects();
+
+    subscription = atom.packages.onDidActivatePackage((atomPackage) => {
+        atomPackage.isCompatible();
+    });
+
+    subscription = atom.themes.onDidChangeActiveThemes(() => {});
+
+    subscription = atom.styles.onDidAddStyleElement((styleElement) => {});
+
+    const serializer = {
+        name: "Test",
+        deserialize: () => ({}),
+    };
+    atom.deserializers.add(serializer);
+
+    subscription = atom.views.addViewProvider(Atom.Range, (range): HTMLElement => {
+        range.start;
+        return div;
+    });
+
+    subscription = atom.workspace.observeTextEditors((editor) => {
+        subscription = editor.onDidStopChanging((event) => {
+            for (const change of event.changes) {
+                change.newExtent;
+            }
+        });
+
+        const text: string[] = editor.getBuffer().getLines();
+    });
+
+    atom.textEditors.add(editor);
+
+    // Event Subscription
+    subscription = atom.onDidBeep(() => {});
+    subscription = atom.onWillThrowError(event => event.message);
+    subscription = atom.onDidThrowError(event => event.line);
+    subscription = atom.whenShellEnvironmentLoaded(() => {});
+
+    // Atom Details
+    bool = atom.inDevMode();
+    bool = atom.inSafeMode();
+    bool = atom.inSpecMode();
+    str = atom.getVersion();
+    bool = atom.isReleasedVersion();
+    num = atom.getWindowLoadTime();
+    obj = atom.getLoadSettings();
+
+    // Managing The Atom Window
+    let dim: { width: number, height: number };
+    let v2: { x: number, y: number };
+
+    // atom.open(params);
+    atom.close();
+    dim = atom.getSize();
+    atom.setSize(42, 42);
+    v2 = atom.getPosition();
+    atom.setPosition(42, 42);
+
+    atom.pickFolder((paths) => {
+        if (paths) {
+            paths.length;
+        }
+    });
+
+    atom.getCurrentWindow();
+    atom.center();
+    atom.focus();
+    atom.show();
+    atom.hide();
+    atom.reload();
+    atom.restartApplication();
+    bool = atom.isMaximized();
+    bool = atom.isFullScreen();
+    atom.setFullScreen(true);
+    atom.toggleFullScreen();
+
+    // Messaging the User
+    atom.beep();
+
+    atom.confirm({ message: "Test" });
+    atom.confirm({ message: "Test", buttons: [ "a", "b" ], detailedMessage: "Test" });
+    num = atom.confirm({ message: "Test", detailedMessage: "Test", buttons: {
+        Test: () => { atom.beep(); },
+    }});
+
+    // Managing the Dev Tools
+    async function manageDevTools() {
+        await atom.openDevTools();
+        await atom.toggleDevTools();
+    }
+
+    atom.executeJavaScriptInDevTools("Test");
+
+    const path: string = atom.getConfigDirPath();
 }
 
-atom.executeJavaScriptInDevTools("Test");
+// BufferedNodeProcess ========================================================
+function testBufferedNodeProcess() {
+    const nodeProcess = new Atom.BufferedNodeProcess({
+        command: "File.path",
+    });
 
-// Usage Testing ==============================================================
-// Some examples taken from the Atom documentation.
-// .commands
-sub = atom.commands.add("test", { "execute-command": () => {}});
-
-// .clipboard
-str = atom.clipboard.read();
-
-// .contextMenu
-sub = atom.contextMenu.add({
-	"atom-workspace": [{label: "Help", command: "application:open-documentation"}],
-	"atom-text-editor": [{
-		label: "History",
-		submenu: [
-			{ label: "Undo", command: "core:undo" },
-			{ label: "Redo", command: "core:redo" },
-		],
-	}],
-});
-
-// .menu
-sub = atom.menu.add([{
-	label: "Hello",
-	submenu : [{ label: "World!", command: "hello:world" }],
-}]);
-
-// .keymaps
-atom.keymaps.add("Test.Path", {
-	selector: {
-		a: "execute-something",
-	},
-});
-
-// .tooltips
-sub = atom.tooltips.add(div, { title: "Tooltip Test" });
-
-// .notifications
-notification = atom.notifications.addError("Error");
-
-// .project
-atom.project.addPath("/var/test");
-
-// .grammars
-grammar = atom.grammars.loadGrammarSync("Test.file");
-
-// .history
-historyPaths = atom.history.getProjects();
-
-// .packages
-sub = atom.packages.onDidActivatePackage((atomPackage) => {
-	atomPackage.isCompatible();
-});
-
-// .themes
-sub = atom.themes.onDidChangeActiveThemes(() => {});
-
-// .styles
-sub = atom.styles.onDidAddStyleElement((styleElement) => {});
-
-// .deserializers
-const serializer = {
-	name: "Test",
-	deserialize: () => ({}),
-};
-atom.deserializers.add(serializer);
-
-// .views
-sub = atom.views.addViewProvider(Range, (range): HTMLElement => {
-	range.start;
-	return div;
-});
-
-// .workspace
-sub = atom.workspace.observeTextEditors((editor) => {
-	sub = editor.onDidStopChanging((event) => {
-		for (const change of event.changes) {
-			change.newExtent;
-		}
-	});
-
-	const text: string[] = editor.getBuffer().getLines();
-});
-
-// .textEditors
-atom.textEditors.add(editor);
-
-// Atom API Testing ===========================================================
-//// AtomEnvironment ==========================================================
-// Event Subscription
-sub = atom.onDidBeep(() => {});
-sub = atom.onWillThrowError(event => event.message);
-sub = atom.onDidThrowError(event => event.line);
-sub = atom.whenShellEnvironmentLoaded(() => {});
-
-// Atom Details
-bool = atom.inDevMode();
-bool = atom.inSafeMode();
-bool = atom.inSpecMode();
-str = atom.getVersion();
-bool = atom.isReleasedVersion();
-num = atom.getWindowLoadTime();
-obj = atom.getLoadSettings();
-
-// Managing The Atom Window
-declare let dim: { width: number, height: number };
-declare let v2: { x: number, y: number };
-
-// atom.open(params);
-atom.close();
-dim = atom.getSize();
-atom.setSize(42, 42);
-v2 = atom.getPosition();
-atom.setPosition(42, 42);
-
-atom.pickFolder((paths) => {
-	if (paths) {
-		paths.length;
-	}
-});
-
-atom.getCurrentWindow();
-atom.center();
-atom.focus();
-atom.show();
-atom.hide();
-atom.reload();
-atom.restartApplication();
-bool = atom.isMaximized();
-bool = atom.isFullScreen();
-atom.setFullScreen(true);
-atom.toggleFullScreen();
-
-// Messaging the User
-atom.beep();
-
-atom.confirm({ message: "Test" });
-atom.confirm({ message: "Test", buttons: [ "a", "b" ], detailedMessage: "Test" });
-num = atom.confirm({ message: "Test", detailedMessage: "Test", buttons: {
-	Test: () => { atom.beep(); },
-}});
-
-// Managing the Dev Tools
-async function manageDevTools() {
-	await atom.openDevTools();
-	await atom.toggleDevTools();
+    new Atom.BufferedNodeProcess({
+        command: "File.path",
+        args: [],
+        options: {
+            cwd: "/var/test",
+            detached: true,
+        },
+        exit: (): void => {},
+        stderr: (): void => {},
+        stdout: (): void => {},
+    });
 }
 
-atom.executeJavaScriptInDevTools("Test");
+// BufferedProcess ============================================================
+function testBufferedProcess() {
+    const process = new Atom.BufferedProcess({
+        command: "File.path",
+    });
 
-//// BufferedNodeProcess ======================================================
-const nodeProcess = new BufferedNodeProcess({
-	command: "File.path",
-});
+    new Atom.BufferedProcess({
+        command: "File.path",
+        args: [],
+        options: {},
+        exit: (): void => {},
+        stderr: (): void => {},
+        stdout: (): void => {},
+    });
 
-new BufferedNodeProcess({
-	command: "File.path",
-	args: [],
-	options: {
-		cwd: "/var/test",
-		detached: true,
-	},
-	exit: (): void => {},
-	stderr: (): void => {},
-	stdout: (): void => {},
-});
+    subscription = process.onWillThrowError((error) => {
+        error.error;
+        error.handle();
+    });
 
-//// BufferedProcess ==========================================================
-const process = new BufferedProcess({
-	command: "File.path",
-});
-
-new BufferedProcess({
-	command: "File.path",
-	args: [],
-	options: {},
-	exit: (): void => {},
-	stderr: (): void => {},
-	stdout: (): void => {},
-});
-
-sub = process.onWillThrowError((error) => {
-	error.error;
-	error.handle();
-});
-
-process.kill();
-
-//// Clipboard ================================================================
-atom.clipboard.read();
-atom.clipboard.write("Test");
-const clip = atom.clipboard.readWithMetadata();
-str = clip.text;
-obj = clip.metadata;
-
-//// Color ====================================================================
-declare const color: Atom.Color;
-str = color.toHexString();
-str = color.toRGBAString();
-
-//// CommandRegistry ==========================================================
-atom.commands.add("test", "test:function", (event) => {});
-atom.commands.add("test", {
-	"test-function": (event) => {},
-	"test-function2": (event) => {},
-});
-atom.commands.add("test", "test:function", {
-	didDispatch: (event) => event.stopImmediatePropagation(),
-	description: "A Command Test",
-	displayName: "Command: Test",
-});
-
-const commands = atom.commands.findCommands({ target: element });
-atom.commands.dispatch(element, "test:function");
-sub = atom.commands.onWillDispatch((event) => { event.stopPropagation(); });
-sub = atom.commands.onDidDispatch((event) => { event.cancelable; });
-
-//// CompositeDisposable -- See 'event-kit' testing.
-//// Config ===================================================================
-atom.config.observe("test", (event) => {});
-atom.config.observe("test", { scope: scopeDescriptor }, (value) => {});
-
-atom.config.onDidChange((event) => { event.newValue; });
-atom.config.onDidChange("test", (event) => { event.oldValue; });
-
-// Managing Settings
-atom.config.get("test");
-atom.config.get("test", { scope: scopeDescriptor });
-atom.config.get("test", { excludeSources: ["test.source"] });
-atom.config.get("test", { sources: ["test.source"] });
-atom.config.get("test", { scope: scopeDescriptor, excludeSources: ["a"],
-	sources: ["b"] });
-
-atom.config.set("test", 42);
-atom.config.set("test", 42, { scopeSelector: "test-selector" });
-atom.config.set("test", 42, { source: "test" });
-atom.config.set("test", 42, {scopeSelector: "test-selector", source: "test" });
-
-atom.config.unset("test");
-atom.config.unset("test", { scopeSelector: "test-selector" });
-atom.config.unset("test", { source: "test" });
-atom.config.unset("test", { scopeSelector: "test-selector", source: "test" });
-
-const allConfigValues = atom.config.getAll("test");
-for (const { scopeDescriptor, value } of allConfigValues) {
-	scopeDescriptor.scopes;
-}
-atom.config.getAll("test", { scope: scopeDescriptor });
-atom.config.getAll("test", { excludeSources: ["test"] });
-atom.config.getAll("test", { sources: ["test"] });
-atom.config.getAll("test", { scope: scopeDescriptor, excludeSources: ["a"],
-	sources: ["b"] });
-
-strs = atom.config.getSources();
-
-atom.config.getSchema("test");
-
-str = atom.config.getUserConfigPath();
-
-atom.config.transact(() => {});
-
-//// ContextMenuManager -- See above.
-//// Cursor ===================================================================
-// Event Subscription
-sub = cursor.onDidChangePosition((event) => { event.newBufferPosition; });
-sub = cursor.onDidDestroy(() => {});
-
-// Managing Cursor Position
-cursor.setScreenPosition(pos);
-cursor.setScreenPosition(pos, {});
-cursor.setScreenPosition(pos, { autoscroll: true });
-
-pos = cursor.getScreenPosition();
-
-cursor.setBufferPosition(pos);
-cursor.setBufferPosition(pos, {});
-cursor.setBufferPosition(pos, { autoscroll: true });
-
-pos = cursor.getBufferPosition();
-num = cursor.getScreenRow();
-num = cursor.getScreenColumn();
-num = cursor.getBufferRow();
-num = cursor.getBufferColumn();
-str = cursor.getCurrentBufferLine();
-bool = cursor.isAtBeginningOfLine();
-bool = cursor.isAtEndOfLine();
-
-// Cursor Position Details
-displayMarker = cursor.getMarker();
-bool = cursor.isSurroundedByWhitespace();
-bool = cursor.isBetweenWordAndNonWord();
-
-bool = cursor.isInsideWord();
-bool = cursor.isInsideWord({});
-bool = cursor.isInsideWord({ wordRegex: regExp });
-
-num = cursor.getIndentLevel();
-scopeDescriptor = cursor.getScopeDescriptor();
-bool = cursor.hasPrecedingCharactersOnLine();
-bool = cursor.isLastCursor();
-
-// Moving the Cursor
-cursor.moveUp();
-cursor.moveUp(42);
-cursor.moveUp(42, {});
-cursor.moveUp(42, { moveToEndOfSelection: true });
-
-cursor.moveDown();
-cursor.moveDown(42);
-cursor.moveDown(42, {});
-cursor.moveDown(42, { moveToEndOfSelection: true });
-
-cursor.moveLeft();
-cursor.moveLeft(42);
-cursor.moveLeft(42, {});
-cursor.moveLeft(42, { moveToEndOfSelection: true });
-
-cursor.moveRight();
-cursor.moveRight(42);
-cursor.moveRight(42, {});
-cursor.moveRight(42, { moveToEndOfSelection: true });
-
-cursor.moveToTop();
-cursor.moveToBottom();
-cursor.moveToBeginningOfScreenLine();
-cursor.moveToBeginningOfLine();
-cursor.moveToFirstCharacterOfLine();
-cursor.moveToEndOfScreenLine();
-cursor.moveToEndOfLine();
-cursor.moveToBeginningOfWord();
-cursor.moveToEndOfWord();
-cursor.moveToBeginningOfNextWord();
-cursor.moveToPreviousWordBoundary();
-cursor.moveToNextWordBoundary();
-cursor.moveToPreviousSubwordBoundary();
-cursor.moveToNextSubwordBoundary();
-cursor.skipLeadingWhitespace();
-cursor.moveToBeginningOfNextParagraph();
-cursor.moveToBeginningOfPreviousParagraph();
-
-// Local Positions and Ranges
-pos = cursor.getPreviousWordBoundaryBufferPosition();
-pos = cursor.getPreviousWordBoundaryBufferPosition({});
-pos = cursor.getPreviousWordBoundaryBufferPosition({ wordRegex: regExp });
-
-cursor.getNextWordBoundaryBufferPosition();
-cursor.getNextWordBoundaryBufferPosition({ wordRegex: regExp });
-
-cursor.getBeginningOfCurrentWordBufferPosition();
-cursor.getBeginningOfCurrentWordBufferPosition({});
-cursor.getBeginningOfCurrentWordBufferPosition({ wordRegex: regExp });
-cursor.getBeginningOfCurrentWordBufferPosition({ allowPrevious: true });
-cursor.getBeginningOfCurrentWordBufferPosition({ includeNonWordCharacters: true });
-cursor.getBeginningOfCurrentWordBufferPosition({ wordRegex: regExp,
-	allowPrevious: true, includeNonWordCharacters: true });
-
-cursor.getEndOfCurrentWordBufferPosition();
-cursor.getEndOfCurrentWordBufferPosition({});
-cursor.getEndOfCurrentWordBufferPosition({ wordRegex: regExp });
-cursor.getEndOfCurrentWordBufferPosition({ includeNonWordCharacters: true });
-cursor.getEndOfCurrentWordBufferPosition({ wordRegex: regExp, includeNonWordCharacters:
-	true });
-
-cursor.getBeginningOfNextWordBufferPosition();
-cursor.getBeginningOfNextWordBufferPosition({});
-cursor.getBeginningOfNextWordBufferPosition({ wordRegex: regExp });
-
-cursor.getCurrentWordBufferRange();
-cursor.getCurrentWordBufferRange({});
-cursor.getCurrentWordBufferRange({ wordRegex: regExp });
-
-cursor.getCurrentLineBufferRange();
-cursor.getCurrentLineBufferRange({});
-cursor.getCurrentLineBufferRange({ includeNewline: true });
-
-range = cursor.getCurrentParagraphBufferRange();
-str = cursor.getCurrentWordPrefix();
-
-// Comparing to another cursor
-num = cursor.compare(cursor);
-
-// Utilities
-cursor.clearSelection();
-
-regExp = cursor.wordRegExp();
-regExp = cursor.wordRegExp({});
-regExp = cursor.wordRegExp({ includeNonWordCharacters: true });
-
-regExp = cursor.subwordRegExp();
-regExp = cursor.subwordRegExp({});
-regExp = cursor.subwordRegExp({ backwards: true });
-
-//// CustomTestRunner =========================================================
-// http://flight-manual.atom.io/hacking-atom/sections/writing-specs/#customizing-your-test-runner
-const testRunner: Atom.TestRunner = (params) => {
-	const delegate = params.buildDefaultApplicationDelegate();
-	const environment = params.buildAtomEnvironment({
-		applicationDelegate: delegate,
-		configDirPath: "/var/test",
-		document,
-		enablePersistence: false,
-		window,
-	});
-	const { width, height } = environment.getSize();
-	return Promise.resolve(width + height);
-};
-
-//// Decoration ===============================================================
-// Construction and Destruction
-decoration.destroy();
-
-// Event Subscription
-sub = decoration.onDidChangeProperties(event => { event.oldProperties.gutterName; });
-sub = decoration.onDidDestroy(() => {});
-
-// Decoration Details
-num = decoration.getId();
-displayMarker = decoration.getMarker();
-
-// Properties
-const decorationProps = decoration.getProperties();
-
-decoration.setProperties(decorationProps);
-
-//// DeserializerManager ======================================================
-class StorableClass {
-	name: string;
-
-	constructor() {}
-	deserialize() { return {}; }
+    process.kill();
 }
 
-function isStorableClass(o: object): o is StorableClass {
-	if (typeof o === "object" && (<StorableClass> o).name &&
-		(<StorableClass> o).name === "test") {
-		return true;
-	} else {
-		return false;
-	}
+// Clipboard ==================================================================
+function testClipboard() {
+    atom.clipboard.read();
+    atom.clipboard.write("Test");
+    const clip = atom.clipboard.readWithMetadata();
+    str = clip.text;
+    obj = clip.metadata;
 }
 
-let serializable = new StorableClass();
-atom.deserializers.add(serializable);
-const blob = atom.deserializers.deserialize({ name: "test" });
-if (blob && isStorableClass(blob)) serializable = blob;
-
-//// Directory -- See 'pathwatcher' testing.
-//// DisplayMarker -- See 'text-buffer' testing.
-//// DisplayMarkerLayer -- See 'text-buffer' testing.
-//// Disposable -- See 'event-kit' testing.
-//// Dock =====================================================================
-// Methods
-dock.activate();
-dock.show();
-dock.hide();
-dock.toggle();
-bool = dock.isVisible();
-
-// Event Subscription
-sub = dock.observePaneItems(() => {});
-sub = dock.onDidChangeActivePaneItem(() => {});
-sub = dock.onDidStopChangingActivePaneItem(() => {});
-sub = dock.observeActivePaneItem(() => {});
-sub = dock.onDidAddPane(event => event.pane.activate());
-sub = dock.onWillDestroyPane(event => event.pane);
-sub = dock.onDidDestroyPane(event => event.pane);
-sub = dock.observePanes(pane => pane.activate());
-sub = dock.onDidChangeActivePane(pane => pane.activate());
-sub = dock.observeActivePane(pane => pane.activate());
-sub = dock.onDidAddPaneItem(event => event.index && event.item && event.pane);
-sub = dock.onWillDestroyPaneItem(event => event.index && event.item && event.pane);
-sub = dock.onDidDestroyPaneItem(event => event.index && event.item && event.pane);
-
-// Pane Items
-objs = dock.getPaneItems();
-obj = dock.getActivePaneItem();
-
-// Panes
-panes = dock.getPanes();
-pane = dock.getActivePane();
-bool = dock.activateNextPane();
-bool = dock.activatePreviousPane();
-
-//// Emitter -- See 'event-kit' testing.
-//// File -- See 'pathwatcher' testing.
-//// GitRepository ============================================================
-// Construction and Destruction
-repository = new GitRepository("Test");
-repository = new GitRepository("Test", {});
-repository = new GitRepository("Test", { refreshOnWindowFocus: true });
-repository = new GitRepository("Test", { config: atom.config });
-repository = new GitRepository("Test", { project: atom.project });
-repository = new GitRepository("Test", { refreshOnWindowFocus: false, config: atom.config,
-	project: atom.project });
-repository.destroy();
-bool = repository.isDestroyed();
-
-// Event Subscription
-sub = repository.onDidDestroy(() => {});
-sub = repository.onDidChangeStatus(event => event.path && event.pathStatus);
-sub = repository.onDidChangeStatuses(() => {});
-
-// Repository Details
-repository.getType();
-str = repository.getPath();
-str = repository.getWorkingDirectory();
-bool = repository.isProjectAtRoot();
-str = repository.relativize();
-bool = repository.hasBranch("master");
-
-str = repository.getShortHead();
-str = repository.getShortHead("test.path");
-
-bool = repository.isSubmodule("test.path");
-
-declare var aheadBehindCount: { ahead: number, behind: number };
-aheadBehindCount = repository.getAheadBehindCount("ref");
-aheadBehindCount = repository.getAheadBehindCount("ref", "test.path");
-
-aheadBehindCount = repository.getCachedUpstreamAheadBehindCount();
-aheadBehindCount = repository.getCachedUpstreamAheadBehindCount("test.path");
-
-str = repository.getConfigValue("username");
-str = repository.getConfigValue("username", "test.path");
-
-str = repository.getOriginURL();
-str = repository.getOriginURL("test.path");
-
-let upstreamBranch = repository.getUpstreamBranch();
-if (upstreamBranch) {
-	str = upstreamBranch;
+// Color ======================================================================
+function testColor() {
+    str = color.toHexString();
+    str = color.toRGBAString();
 }
 
-upstreamBranch = repository.getUpstreamBranch("test.path");
-if (upstreamBranch) {
-	str = upstreamBranch;
+// CommandRegistry ============================================================
+function testCommandRegistry() {
+    atom.commands.add("test", "test:function", (event) => {});
+    atom.commands.add("test", {
+        "test-function": (event) => {},
+        "test-function2": (event) => {},
+    });
+    atom.commands.add("test", "test:function", {
+        didDispatch: (event) => event.stopImmediatePropagation(),
+        description: "A Command Test",
+        displayName: "Command: Test",
+    });
+    atom.commands.add("atom-text-editor", {
+        "test-function": (event) => event.currentTarget.getModel(),
+        "test-function2": (event) => event.currentTarget.getComponent(),
+    });
+    atom.commands.add("atom-workspace", {
+        "test-command": {
+            didDispatch: (event) => {},
+            hiddenInCommandPalette: true
+        }
+    });
+
+    const commands = atom.commands.findCommands({ target: element });
+    atom.commands.dispatch(element, "test:function");
+    subscription = atom.commands.onWillDispatch((event) => { event.stopPropagation(); });
+    subscription = atom.commands.onDidDispatch((event) => { event.cancelable; });
 }
 
-declare var gitReferences: { heads: string[], remotes: string[], tags: string[] };
-gitReferences = repository.getReferences();
-gitReferences = repository.getReferences("test.path");
+// CompositeDisposable ========================================================
+function testCompositeDisposable() {
+    // Construction and Lifecycle
+    subscriptions = new Atom.CompositeDisposable();
+    new Atom.CompositeDisposable(subscription);
+    new Atom.CompositeDisposable(subscription, subscription);
+    new Atom.CompositeDisposable({ dispose() {} });
 
-str = repository.getReferenceTarget("ref");
-str = repository.getReferenceTarget("ref", "test.path");
+    subscriptions.dispose();
 
-// Reading Status
-bool = repository.isPathModified("file.path");
-bool = repository.isPathNew("file.path");
-bool = repository.isPathIgnored("file.path");
-num = repository.getDirectoryStatus("file.path");
-num = repository.getPathStatus("file.path");
+    // Managing Disposables
+    subscriptions.add(subscription);
+    subscriptions.add(
+        subscription,
+        { dispose() {} }
+    );
 
-const cachedPathStatus = repository.getCachedPathStatus("file.path");
-if (cachedPathStatus) {
-	num = cachedPathStatus;
+    subscriptions.remove(subscription);
+    subscriptions.remove({ dispose() {} });
+
+    subscriptions.delete(subscription);
+    subscriptions.delete({ dispose() {} });
+
+    subscriptions.clear();
 }
 
-bool = repository.isStatusModified(42);
-bool = repository.isStatusNew(42);
+// Config =====================================================================
+function testConfig() {
+    atom.config.observe("test", (event) => {});
+    atom.config.observe("test", { scope: scopeDescriptor }, (value) => {});
 
-// Retrieving Diffs
-declare var diffStats: { added: number, deleted: number };
-diffStats = repository.getDiffStats("file.path");
+    atom.config.onDidChange((event) => { event.newValue; });
+    atom.config.onDidChange("test", (event) => { event.oldValue; });
 
-declare var lineDiffs: Array<{ oldStart: number, newStart: number, oldLines: number,
-	newLines: number }>;
-lineDiffs = repository.getLineDiffs("file.path", "contents");
+    // Managing Settings
+    atom.config.get("test");
+    atom.config.get("test", { scope: scopeDescriptor });
+    atom.config.get("test", { excludeSources: ["test.source"] });
+    atom.config.get("test", { sources: ["test.source"] });
+    atom.config.get("test", { scope: scopeDescriptor, excludeSources: ["a"],
+        sources: ["b"] });
 
-// Checking Out
-bool = repository.checkoutHead("file.path");
-bool = repository.checkoutReference("ref", true);
+    atom.config.set("test", 42);
+    atom.config.set("test", 42, { scopeSelector: "test-selector" });
+    atom.config.set("test", 42, { source: "test" });
+    atom.config.set("test", 42, {scopeSelector: "test-selector", source: "test" });
 
-//// Grammar -- See 'first-mate' testing.
-//// GrammarRegistry -- See 'first-mate' testing.
-//// Gutter ===================================================================
-// Gutter Destruction
-gutter.destroy();
+    atom.config.unset("test");
+    atom.config.unset("test", { scopeSelector: "test-selector" });
+    atom.config.unset("test", { source: "test" });
+    atom.config.unset("test", { scopeSelector: "test-selector", source: "test" });
 
-// Event Subscription
-sub = gutter.onDidChangeVisible(gutter => gutter.isVisible());
-sub = gutter.onDidDestroy(() => {});
+    const allConfigValues = atom.config.getAll("test");
+    for (const { scopeDescriptor, value } of allConfigValues) {
+        scopeDescriptor.scopes;
+    }
+    atom.config.getAll("test", { scope: scopeDescriptor });
+    atom.config.getAll("test", { excludeSources: ["test"] });
+    atom.config.getAll("test", { sources: ["test"] });
+    atom.config.getAll("test", { scope: scopeDescriptor, excludeSources: ["a"],
+        sources: ["b"] });
 
-// Visibility
-gutter.hide();
-gutter.show();
-bool = gutter.isVisible();
-decoration = gutter.decorateMarker(displayMarker, { type: "line-number" });
+    strs = atom.config.getSources();
 
-//// HistoryManager ===========================================================
-historyPaths = atom.history.getProjects();
-atom.history.clearProjects();
-sub = atom.history.onDidChangeProjects(() => {});
+    atom.config.getSchema("test");
 
-//// KeymapManager -- See 'atom-keymap' testing.
-//// LayerDecoration ==========================================================
-layerDecoration.destroy();
-bool = layerDecoration.isDestroyed();
-layerDecoration.getProperties();
-declare let decorationLayerProps: Atom.Structures.DecorationLayerProps;
-layerDecoration.setProperties(decorationLayerProps);
-layerDecoration.setPropertiesForMarker(marker, { type: "line", class: "test-class" });
+    str = atom.config.getUserConfigPath();
 
-//// MarkerLayer -- See 'text-buffer' testing.
-//// MenuManager ==============================================================
-sub = atom.menu.add([
-	{
-		label: "Hello",
-		submenu : [{ label: "World!", command: "hello:world" }],
-	},
-]);
-atom.menu.update();
-
-//// Notification =============================================================
-notification = new Notification("fatal", "Test");
-notification = new Notification("success", "Test", {});
-notification = new Notification("info", "Test", {
-	buttons: [
-		{ className: "Test", text: "Test", onDidClick: () => {}},
-	],
-	description: "Test",
-	detail: "Test",
-	dismissable: false,
-	icon: "Test",
-});
-
-// Event Subscription
-sub = notification.onDidDismiss(notification => notification.dismissed);
-sub = notification.onDidDisplay(notification => notification.timestamp);
-
-// Methods
-str = notification.getType();
-str = notification.getMessage();
-
-// Extended Methods
-notification.dismiss();
-
-//// NotificationManager ======================================================
-// Events
-atom.notifications.onDidAddNotification(notification => notification.dismiss());
-
-// Adding Notifications
-atom.notifications.addSuccess("Test");
-atom.notifications.addSuccess("Test", {});
-atom.notifications.addSuccess("Test", {
-	description: "Desc",
-	detail: "Details",
-	dismissable: true,
-	icon: "Icon",
-	buttons: [{
-		text: "Button",
-		onDidClick: () => {},
-		className: "test-class",
-	}],
-});
-
-atom.notifications.addInfo("Test");
-atom.notifications.addInfo("Test", {});
-atom.notifications.addInfo("Test", { description: "Desc" });
-
-atom.notifications.addWarning("Test");
-atom.notifications.addWarning("Test", {});
-atom.notifications.addWarning("Test", { description: "Desc" });
-
-atom.notifications.addError("Test");
-atom.notifications.addError("Test", {});
-atom.notifications.addError("Test", { stack: "Stack" });
-
-atom.notifications.addFatalError("Test");
-atom.notifications.addFatalError("Test", {});
-atom.notifications.addFatalError("Test", { stack: "Stack" });
-
-// Getting Notifications
-notifications = atom.notifications.getNotifications();
-
-//// Package ==================================================================
-// Event Subscription
-pack.onDidDeactivate(() => {});
-
-// Native Module Compatibility
-bool = pack.isCompatible();
-declare let exitInfo: Promise<{ code: number, stderr: string, stdout: string }>;
-exitInfo = pack.rebuild();
-
-const buildFailureOutput = pack.getBuildFailureOutput();
-if (buildFailureOutput) {
-	str = buildFailureOutput;
+    atom.config.transact(() => {});
 }
 
-//// PackageManager ===========================================================\
-// Event Subscription
-sub = atom.packages.onDidLoadInitialPackages(() => {});
-sub = atom.packages.onDidActivateInitialPackages(() => {});
-sub = atom.packages.onDidActivatePackage(pack => pack.name);
-sub = atom.packages.onDidDeactivatePackage(pack => pack.path);
-sub = atom.packages.onDidLoadPackage(pack => pack.isCompatible());
-sub = atom.packages.onDidUnloadPackage(pack => pack.bundledPackage);
+// Cursor =====================================================================
+function testCursor() {
+    // Event Subscription
+    subscription = cursor.onDidChangePosition((event) => { event.newBufferPosition; });
+    subscription = cursor.onDidDestroy(() => {});
 
-// Package system data
-str = atom.packages.getApmPath();
-strs = atom.packages.getPackageDirPaths();
+    // Managing Cursor Position
+    cursor.setScreenPosition(pos);
+    cursor.setScreenPosition(pos, {});
+    cursor.setScreenPosition(pos, { autoscroll: true });
 
-// General package data
-const packagePath = atom.packages.resolvePackagePath("Test");
-if (packagePath) {
-	str = packagePath;
+    pos = cursor.getScreenPosition();
+
+    cursor.setBufferPosition(pos);
+    cursor.setBufferPosition(pos, {});
+    cursor.setBufferPosition(pos, { autoscroll: true });
+
+    pos = cursor.getBufferPosition();
+    num = cursor.getScreenRow();
+    num = cursor.getScreenColumn();
+    num = cursor.getBufferRow();
+    num = cursor.getBufferColumn();
+    str = cursor.getCurrentBufferLine();
+    bool = cursor.isAtBeginningOfLine();
+    bool = cursor.isAtEndOfLine();
+
+    // Cursor Position Details
+    displayMarker = cursor.getMarker();
+    bool = cursor.isSurroundedByWhitespace();
+    bool = cursor.isBetweenWordAndNonWord();
+
+    bool = cursor.isInsideWord();
+    bool = cursor.isInsideWord({});
+    bool = cursor.isInsideWord({ wordRegex: regExp });
+
+    num = cursor.getIndentLevel();
+    scopeDescriptor = cursor.getScopeDescriptor();
+    bool = cursor.hasPrecedingCharactersOnLine();
+    bool = cursor.isLastCursor();
+
+    // Moving the Cursor
+    cursor.moveUp();
+    cursor.moveUp(42);
+    cursor.moveUp(42, {});
+    cursor.moveUp(42, { moveToEndOfSelection: true });
+
+    cursor.moveDown();
+    cursor.moveDown(42);
+    cursor.moveDown(42, {});
+    cursor.moveDown(42, { moveToEndOfSelection: true });
+
+    cursor.moveLeft();
+    cursor.moveLeft(42);
+    cursor.moveLeft(42, {});
+    cursor.moveLeft(42, { moveToEndOfSelection: true });
+
+    cursor.moveRight();
+    cursor.moveRight(42);
+    cursor.moveRight(42, {});
+    cursor.moveRight(42, { moveToEndOfSelection: true });
+
+    cursor.moveToTop();
+    cursor.moveToBottom();
+    cursor.moveToBeginningOfScreenLine();
+    cursor.moveToBeginningOfLine();
+    cursor.moveToFirstCharacterOfLine();
+    cursor.moveToEndOfScreenLine();
+    cursor.moveToEndOfLine();
+    cursor.moveToBeginningOfWord();
+    cursor.moveToEndOfWord();
+    cursor.moveToBeginningOfNextWord();
+    cursor.moveToPreviousWordBoundary();
+    cursor.moveToNextWordBoundary();
+    cursor.moveToPreviousSubwordBoundary();
+    cursor.moveToNextSubwordBoundary();
+    cursor.skipLeadingWhitespace();
+    cursor.moveToBeginningOfNextParagraph();
+    cursor.moveToBeginningOfPreviousParagraph();
+
+    // Local Positions and Ranges
+    pos = cursor.getPreviousWordBoundaryBufferPosition();
+    pos = cursor.getPreviousWordBoundaryBufferPosition({});
+    pos = cursor.getPreviousWordBoundaryBufferPosition({ wordRegex: regExp });
+
+    cursor.getNextWordBoundaryBufferPosition();
+    cursor.getNextWordBoundaryBufferPosition({ wordRegex: regExp });
+
+    cursor.getBeginningOfCurrentWordBufferPosition();
+    cursor.getBeginningOfCurrentWordBufferPosition({});
+    cursor.getBeginningOfCurrentWordBufferPosition({ wordRegex: regExp });
+    cursor.getBeginningOfCurrentWordBufferPosition({ allowPrevious: true });
+    cursor.getBeginningOfCurrentWordBufferPosition({ includeNonWordCharacters: true });
+    cursor.getBeginningOfCurrentWordBufferPosition({ wordRegex: regExp,
+        allowPrevious: true, includeNonWordCharacters: true });
+
+    cursor.getEndOfCurrentWordBufferPosition();
+    cursor.getEndOfCurrentWordBufferPosition({});
+    cursor.getEndOfCurrentWordBufferPosition({ wordRegex: regExp });
+    cursor.getEndOfCurrentWordBufferPosition({ includeNonWordCharacters: true });
+    cursor.getEndOfCurrentWordBufferPosition({ wordRegex: regExp, includeNonWordCharacters:
+        true });
+
+    cursor.getBeginningOfNextWordBufferPosition();
+    cursor.getBeginningOfNextWordBufferPosition({});
+    cursor.getBeginningOfNextWordBufferPosition({ wordRegex: regExp });
+
+    cursor.getCurrentWordBufferRange();
+    cursor.getCurrentWordBufferRange({});
+    cursor.getCurrentWordBufferRange({ wordRegex: regExp });
+
+    cursor.getCurrentLineBufferRange();
+    cursor.getCurrentLineBufferRange({});
+    cursor.getCurrentLineBufferRange({ includeNewline: true });
+
+    range = cursor.getCurrentParagraphBufferRange();
+    str = cursor.getCurrentWordPrefix();
+
+    // Comparing to another cursor
+    num = cursor.compare(cursor);
+
+    // Utilities
+    cursor.clearSelection();
+
+    regExp = cursor.wordRegExp();
+    regExp = cursor.wordRegExp({});
+    regExp = cursor.wordRegExp({ includeNonWordCharacters: true });
+
+    regExp = cursor.subwordRegExp();
+    regExp = cursor.subwordRegExp({});
+    regExp = cursor.subwordRegExp({ backwards: true });
 }
 
-bool = atom.packages.isBundledPackage("Test");
-
-// Enabling and disabling packages
-let potentialPack = atom.packages.enablePackage("Test");
-if (potentialPack) {
-	pack = potentialPack;
+// TestRunner =================================================================
+function testTestRunner() {
+    const testRunner: Atom.TestRunner = (params) => {
+        const delegate = params.buildDefaultApplicationDelegate();
+        const environment = params.buildAtomEnvironment({
+            applicationDelegate: delegate,
+            configDirPath: "/var/test",
+            document,
+            enablePersistence: false,
+            window,
+        });
+        const { width, height } = environment.getSize();
+        return Promise.resolve(width + height);
+    };
 }
 
-potentialPack = atom.packages.disablePackage("Test");
-if (potentialPack) {
-	pack = potentialPack;
+// Decoration =================================================================
+function testDecoration() {
+    // Construction and Destruction
+    decoration.destroy();
+
+    // Event Subscription
+    subscription = decoration.onDidChangeProperties(event => { event.oldProperties.gutterName; });
+    subscription = decoration.onDidDestroy(() => {});
+
+    // Decoration Details
+    num = decoration.getId();
+    displayMarker = decoration.getMarker();
+    bool = decoration.isType("line-number");
+    bool = decoration.isType(["line-number", "line"]);
+
+    // Properties
+    const decorationProps = decoration.getProperties();
+
+    decoration.setProperties(decorationProps);
 }
 
-bool = atom.packages.isPackageDisabled("Test");
+// DeserializerManager ========================================================
+function testDesializerManager() {
+    class StorableClass {
+        name: string;
 
-// Accessing active packages
-packs = atom.packages.getActivePackages();
+        constructor() {}
+        deserialize() { return {}; }
+    }
 
-potentialPack = atom.packages.getActivePackage("Test");
-if (potentialPack) {
-	pack = potentialPack;
+    function isStorableClass(o: object): o is StorableClass {
+        if (typeof o === "object" && (<StorableClass> o).name &&
+            (<StorableClass> o).name === "test") {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    let serializable = new StorableClass();
+    atom.deserializers.add(serializable);
+    const blob = atom.deserializers.deserialize({ name: "test" });
+    if (blob && isStorableClass(blob)) serializable = blob;
 }
 
-bool = atom.packages.isPackageActive("Test");
-bool = atom.packages.hasActivatedInitialPackages();
+// Directory ==================================================================
+function testDirectory() {
+    // Construction
+    dir = new Atom.Directory("Test.file");
+    new Atom.Directory("Test.file", true);
 
-// Accessing loaded packages
-packs = atom.packages.getLoadedPackages();
+    async function createDirectory() {
+        bool = await dir.create();
+        bool = await dir.create(0o0777);
+    }
 
-potentialPack = atom.packages.getLoadedPackage("Test");
-if (potentialPack) {
-	pack = potentialPack;
+    // Event Subscription
+    subscription = dir.onDidChange(() => {});
+
+    // Directory Metadata
+    bool = dir.isFile();
+    bool = dir.isDirectory();
+    bool = dir.isSymbolicLink();
+
+    async function directoryExists() {
+        bool = await dir.exists();
+    }
+
+    bool = dir.existsSync();
+    bool = dir.isRoot();
+
+    // Managing Paths
+    str = dir.getPath();
+    str = dir.getRealPathSync();
+    str = dir.getBaseName();
+    dir.relativize("Test.file") ;
+
+    // Traversing
+    dir = dir.getParent();
+    file = dir.getFile("Test.file");
+    dir = dir.getSubdirectory("Test");
+    dir.getEntriesSync();
+    dir.getEntries((error, entries) => {});
+    bool = dir.contains("Test.file");
 }
 
-bool = atom.packages.isPackageLoaded("Test");
-bool = atom.packages.hasLoadedInitialPackages();
+// DisplayMarker ==============================================================
+function testDisplayMarker() {
+    // Construction and Destruction
+    displayMarker.destroy();
 
-// Accessing available packages
-strs = atom.packages.getAvailablePackagePaths();
-strs = atom.packages.getAvailablePackageNames();
-strs = atom.packages.getAvailablePackageMetadata();
+    displayMarker = displayMarker.copy();
+    displayMarker = displayMarker.copy({});
+    displayMarker = displayMarker.copy({
+        tailed: true,
+        reversed: false,
+        invalidate: "never",
+        exclusive: false,
+        properties: { deprecated: "property" },
+    });
 
-//// Pane =====================================================================
-// Event Subscription
-sub = pane.onDidChangeFlexScale(scale => num = scale);
-sub = pane.observeFlexScale(scale => num = scale);
-sub = pane.onDidActivate(() => {});
-sub = pane.onWillDestroy(() => {});
-sub = pane.onDidDestroy(() => {});
-sub = pane.onDidChangeActive(active => bool = active);
-sub = pane.observeActive(active => bool = active);
-sub = pane.onDidAddItem(event => event.index && event.item);
-sub = pane.onDidRemoveItem(event => event.index && event.item);
-sub = pane.onWillRemoveItem(event => event.index && event.item);
-sub = pane.onDidMoveItem(event => event.item && event.oldIndex && event.newIndex);
-sub = pane.observeItems((item) => {});
-sub = pane.onDidChangeActiveItem((item) => {});
-sub = pane.onChooseNextMRUItem((item) => {});
-sub = pane.onChooseLastMRUItem((item) => {});
-sub = pane.onDoneChoosingMRUItem(() => {});
-sub = pane.observeActiveItem((item) => {});
-sub = pane.onWillDestroyItem(event => event.index && event.item);
+    // Event Subscription
+    subscription = displayMarker.onDidChange((event) => { event.hasTail; });
+    subscription = displayMarker.onDidDestroy(() => {});
 
-// Items
-objs = pane.getItems();
-obj = pane.getActiveItem();
+    // TextEditorMarker Details
+    bool = displayMarker.isValid();
+    bool = displayMarker.isDestroyed();
+    bool = displayMarker.isReversed();
+    bool = displayMarker.isExclusive();
+    str = displayMarker.getInvalidationStrategy();
+    obj = displayMarker.getProperties();
+    displayMarker.setProperties(obj);
 
-let potentialItem = pane.itemAtIndex(42);
-if (potentialItem) {
-	obj = potentialItem;
+    bool = displayMarker.matchesProperties({
+        startBufferPosition: pos,
+        endBufferPosition: pos,
+        startScreenPosition: pos,
+        endScreenPosition: pos,
+        startsInBufferRange: range,
+        endsInBufferRange: range,
+        startsInScreenRange: range,
+        endsInScreenRange: range,
+        startBufferRow: num,
+        endBufferRow: num,
+        startScreenRow: num,
+        endScreenRow: num,
+        intersectsBufferRowRange: [num, num],
+        intersectsScreenRowRange: [num, num],
+        containsBufferRange: range,
+        containsBufferPosition: pos,
+        containedInBufferRange: range,
+        containedInScreenRange: range,
+        intersectsBufferRange: range,
+        intersectsScreenRange: range,
+    });
+    bool = displayMarker.matchesProperties({
+        intersectsBufferRange: [pos, pos],
+    });
+    bool = displayMarker.matchesProperties({
+        intersectsBufferRange: [pos, [0, 0]],
+    });
+    bool = displayMarker.matchesProperties({
+        intersectsBufferRange: [[0, 0], pos],
+    });
+    bool = displayMarker.matchesProperties({
+        intersectsBufferRange: [[0, 0], [0, 0]],
+    });
+
+    // Comparing to other markers
+    num = displayMarker.compare(displayMarker);
+    bool = displayMarker.isEqual(displayMarker);
+
+    // Managing the marker's range
+    range = displayMarker.getBufferRange();
+    range = displayMarker.getScreenRange();
+
+    displayMarker.setBufferRange(range);
+    displayMarker.setBufferRange([pos, pos]);
+    displayMarker.setBufferRange([pos, [0, 0]]);
+    displayMarker.setBufferRange([[0, 0], pos]);
+    displayMarker.setBufferRange([[0, 0], [0, 0]]);
+    displayMarker.setBufferRange(range, { reversed: true });
+
+    displayMarker.setScreenRange(range);
+    displayMarker.setScreenRange([pos, pos]);
+    displayMarker.setScreenRange([pos, [0, 0]]);
+    displayMarker.setScreenRange([[0, 0], pos]);
+    displayMarker.setScreenRange([[0, 0], [0, 0]]);
+    displayMarker.setScreenRange(range, { reversed: false });
+
+    pos = displayMarker.getStartScreenPosition();
+    pos = displayMarker.getStartScreenPosition({ clipDirection: "backward" });
+
+    pos = displayMarker.getEndScreenPosition();
+    pos = displayMarker.getEndScreenPosition({ clipDirection: "forward" });
+
+    // Extended Methods
+    pos = displayMarker.getHeadBufferPosition();
+    displayMarker.setHeadBufferPosition(pos);
+
+    displayMarker.getHeadScreenPosition();
+    displayMarker.getHeadScreenPosition({ clipDirection: "closest" });
+
+    displayMarker.setHeadScreenPosition(pos);
+    displayMarker.setHeadScreenPosition([0, 0]);
+    displayMarker.setHeadScreenPosition(pos, { clipDirection: "backward" });
+
+    pos = displayMarker.getTailBufferPosition();
+
+    displayMarker.setTailBufferPosition(pos);
+    displayMarker.setTailBufferPosition([0, 0]);
+
+    pos = displayMarker.getTailScreenPosition();
+    pos = displayMarker.getTailScreenPosition({ clipDirection: "forward" });
+
+    displayMarker.setTailScreenPosition(pos);
+    displayMarker.setTailScreenPosition([0, 0]);
+    displayMarker.setTailScreenPosition(pos, { clipDirection: "closest" });
+
+    pos = displayMarker.getStartBufferPosition();
+    pos = displayMarker.getEndBufferPosition();
+    bool = displayMarker.hasTail();
+    displayMarker.plantTail();
+    displayMarker.clearTail();
 }
 
-pane.activateNextItem();
-pane.activatePreviousItem();
-pane.moveItemRight();
-pane.moveItemLeft();
-num = pane.getActiveItemIndex();
-pane.activateItemAtIndex(42);
+// DisplayMarkerLayer =========================================================
+function testDisplayMarkerLayer() {
+    // Lifecycle
+    displayMarkerLayer.destroy();
+    displayMarkerLayer.clear();
+    bool = displayMarkerLayer.isDestroyed();
 
-pane.activateItem(element);
-pane.activateItem(element, { pending: true });
+    // Event Subscription
+    subscription = displayMarkerLayer.onDidDestroy(() => {});
+    subscription = displayMarkerLayer.onDidUpdate(() => {});
+    subscription = displayMarkerLayer.onDidCreateMarker((marker) => { marker.isReversed(); });
 
-obj = pane.addItem(element);
-obj = pane.addItem(element, {});
-obj = pane.addItem(element, { pending: true });
-obj = pane.addItem(element, { index: 42 });
-obj = pane.addItem(element, { pending: true, index: 42 });
+    // Marker creation
+    displayMarker = displayMarkerLayer.markScreenRange(range);
+    displayMarker = displayMarkerLayer.markScreenRange(range, {});
+    displayMarker = displayMarkerLayer.markScreenRange(range, { clipDirection: "forward" });
+    displayMarker = displayMarkerLayer.markScreenRange(range, { exclusive: true });
+    displayMarker = displayMarkerLayer.markScreenRange(range, { invalidate: "never" });
+    displayMarker = displayMarkerLayer.markScreenRange(range, { reversed: true });
+    displayMarker = displayMarkerLayer.markScreenRange(range, { clipDirection: "backward",
+        exclusive: false, invalidate: "overlap", reversed: false });
+    displayMarker = displayMarkerLayer.markScreenRange([pos, pos]);
+    displayMarker = displayMarkerLayer.markScreenRange([pos, [0, 0]]);
+    displayMarker = displayMarkerLayer.markScreenRange([[0, 0], pos]);
+    displayMarker = displayMarkerLayer.markScreenRange([[0, 0], [0, 0]]);
+    displayMarker = displayMarkerLayer.markScreenRange([[0, 0], pos], { reversed: true });
 
-objs = pane.addItems(objs);
-objs = pane.addItems(objs, 42);
+    displayMarker = displayMarkerLayer.markScreenPosition(pos);
+    displayMarker = displayMarkerLayer.markScreenPosition(pos, {});
+    displayMarker = displayMarkerLayer.markScreenPosition(pos, { clipDirection: "forward" });
+    displayMarker = displayMarkerLayer.markScreenPosition(pos, { exclusive: true });
+    displayMarker = displayMarkerLayer.markScreenPosition(pos, { invalidate: "never" });
+    displayMarker = displayMarkerLayer.markScreenPosition(pos, { clipDirection: "backward",
+        exclusive: false, invalidate: "overlap" });
+    displayMarker = displayMarkerLayer.markScreenPosition([0, 0]);
+    displayMarker = displayMarkerLayer.markScreenPosition([0, 0], { exclusive: false });
 
-pane.moveItem(element, 42);
-pane.moveItemToPane(element, pane, 42);
-pane.destroyActiveItem();
+    displayMarker = displayMarkerLayer.markBufferRange(range);
+    displayMarker = displayMarkerLayer.markBufferRange(range, {});
+    displayMarker = displayMarkerLayer.markBufferRange(range, { invalidate: "inside" });
+    displayMarker = displayMarkerLayer.markBufferRange(range, { exclusive: true });
+    displayMarker = displayMarkerLayer.markBufferRange(range, { reversed: true });
+    displayMarker = displayMarkerLayer.markBufferRange(range, { exclusive: false,
+        invalidate: "overlap", reversed: false });
+    displayMarker = displayMarkerLayer.markBufferRange([pos, pos]);
+    displayMarker = displayMarkerLayer.markBufferRange([pos, [0, 0]]);
+    displayMarker = displayMarkerLayer.markBufferRange([[0, 0], pos]);
+    displayMarker = displayMarkerLayer.markBufferRange([[0, 0], [0, 0]]);
+    displayMarker = displayMarkerLayer.markBufferRange([[0, 0], pos], { reversed: true });
 
-async function destroyAndWait() {
-	bool = await pane.destroyItem(element);
-	bool = await pane.destroyItem(element, true);
+    displayMarker = displayMarkerLayer.markBufferPosition(pos);
+    displayMarker = displayMarkerLayer.markBufferPosition(pos, {});
+    displayMarker = displayMarkerLayer.markBufferPosition(pos, { exclusive: true });
+    displayMarker = displayMarkerLayer.markBufferPosition(pos, { invalidate: "never" });
+    displayMarker = displayMarkerLayer.markBufferPosition(pos, { exclusive: false,
+        invalidate: "overlap" });
+    displayMarker = displayMarkerLayer.markBufferPosition([0, 0]);
+    displayMarker = displayMarkerLayer.markBufferPosition([0, 0], { exclusive: false });
+
+    // Querying
+    displayMarker = displayMarkerLayer.getMarker(42);
+    displayMarkers = displayMarkerLayer.getMarkers();
+    num = displayMarkerLayer.getMarkerCount();
+
+    displayMarkers = displayMarkerLayer.findMarkers({
+        startBufferPosition: pos,
+        endBufferPosition: pos,
+        startScreenPosition: pos,
+        endScreenPosition: pos,
+        startsInBufferRange: range,
+        endsInBufferRange: range,
+        startsInScreenRange: range,
+        endsInScreenRange: range,
+        startBufferRow: num,
+        endBufferRow: num,
+        startScreenRow: num,
+        endScreenRow: num,
+        intersectsBufferRowRange: [num, num],
+        intersectsScreenRowRange: [num, num],
+        containsBufferRange: range,
+        containsBufferPosition: pos,
+        containedInBufferRange: range,
+        containedInScreenRange: range,
+        intersectsBufferRange: range,
+        intersectsScreenRange: range,
+    });
+    displayMarkers = displayMarkerLayer.findMarkers({
+        intersectsScreenRange: [pos, pos],
+    });
+    displayMarkers = displayMarkerLayer.findMarkers({
+        intersectsScreenRange: [pos, [0, 0]],
+    });
+    displayMarkers = displayMarkerLayer.findMarkers({
+        intersectsScreenRange: [[0, 0], pos],
+    });
+    displayMarkers = displayMarkerLayer.findMarkers({
+        intersectsScreenRange: [[0, 0], [0, 0]],
+    });
 }
 
-pane.destroyItems();
-pane.destroyInactiveItems();
-
-async function savePaneItem() {
-	await pane.saveActiveItem();
-	let actionReturn = await pane.saveActiveItem(() => true);
-	if (actionReturn) bool = actionReturn;
-
-	await pane.saveActiveItemAs(() => {});
-	actionReturn = await pane.saveActiveItemAs(() => false);
-
-	await pane.saveItem(element, () => {});
-	let altActionReturn = await pane.saveItem(element, () => 42);
-	if (altActionReturn) num = altActionReturn;
-
-	await pane.saveItemAs(element, () => {});
-	altActionReturn = await pane.saveItemAs(element, () => 42);
+// Disposable =================================================================
+function testDisposable() {
+    if (subscription.disposalAction) subscription.disposalAction();
+    subscription.dispose();
 }
 
-pane.saveItems();
+// Dock =======================================================================
+function testDock() {
+    // Methods
+    dock.activate();
+    dock.show();
+    dock.hide();
+    dock.toggle();
+    bool = dock.isVisible();
 
-potentialItem = pane.itemForURI("https://test");
-if (potentialItem) {
-	obj = potentialItem;
+    // Event Subscription
+    subscription = dock.observePaneItems(() => {});
+    subscription = dock.onDidChangeActivePaneItem(() => {});
+    subscription = dock.onDidStopChangingActivePaneItem(() => {});
+    subscription = dock.observeActivePaneItem(() => {});
+    subscription = dock.onDidAddPane(event => event.pane.activate());
+    subscription = dock.onWillDestroyPane(event => event.pane);
+    subscription = dock.onDidDestroyPane(event => event.pane);
+    subscription = dock.observePanes(pane => pane.activate());
+    subscription = dock.onDidChangeActivePane(pane => pane.activate());
+    subscription = dock.observeActivePane(pane => pane.activate());
+    subscription = dock.onDidAddPaneItem(event => event.index && event.item && event.pane);
+    subscription = dock.onWillDestroyPaneItem(event => {
+        event.index && event.item && event.pane;
+    });
+    subscription = dock.onDidDestroyPaneItem(event => {
+        event.index && event.item && event.pane;
+    });
+
+    // Pane Items
+    objs = dock.getPaneItems();
+    obj = dock.getActivePaneItem();
+
+    // Panes
+    panes = dock.getPanes();
+    pane = dock.getActivePane();
+    bool = dock.activateNextPane();
+    bool = dock.activatePreviousPane();
 }
 
-bool = pane.activateItemForURI("https://test");
-
-// Lifecycle
-bool = pane.isActive();
-pane.activate();
-pane.destroy();
-bool = pane.isDestroyed();
-
-// Splitting
-pane = pane.splitLeft();
-pane = pane.splitLeft({});
-pane = pane.splitLeft({ copyActiveItem: true });
-pane = pane.splitLeft({ items: elements });
-pane = pane.splitLeft({ copyActiveItem: true, items: elements });
-
-pane = pane.splitRight();
-pane = pane.splitRight({});
-pane = pane.splitRight({ copyActiveItem: true });
-pane = pane.splitRight({ items: elements });
-pane = pane.splitRight({ copyActiveItem: true, items: elements });
-
-pane = pane.splitUp();
-pane = pane.splitUp({});
-pane = pane.splitUp({ copyActiveItem: true });
-pane = pane.splitUp({ items: elements });
-pane = pane.splitUp({ copyActiveItem: true, items: elements });
-
-pane = pane.splitDown();
-pane = pane.splitDown({});
-pane = pane.splitDown({ copyActiveItem: true });
-pane = pane.splitDown({ items: elements });
-pane = pane.splitDown({ copyActiveItem: true, items: elements });
-
-//// Panel ====================================================================
-// Methods
-panel.destroy();
-
-// Event Subscription
-sub = panel.onDidChangeVisible(visible => bool = visible);
-sub = panel.onDidDestroy(panel => bool = panel.isVisible());
-
-// Panel Details
-obj = panel.getItem();
-num = panel.getPriority();
-bool = panel.isVisible();
-panel.hide();
-panel.show();
-
-//// PathWatcher ==============================================================
-pathWatcher.dispose();
-sub = pathWatcher.onDidError((error) => str = error.name);
-
-async function waitForPathWatcher() {
-	await pathWatcher.getStartPromise();
+// Emitter ====================================================================
+interface TestEmissions {
+    "test-event": string;
 }
 
-//// Point -- See 'text-buffer' testing.
-//// Project ==================================================================
-// Event Subscription
-sub = project.onDidChangePaths(paths => paths.length);
+function testEmitter() {
+    emitter = new Atom.Emitter();
+    emitter.clear();
+    emitter.dispose();
 
-sub = project.onDidChangeFiles(events => {
-	for (const event of events) {
-		str = event.action;
-	}
-});
+    // Event Subscription
+    subscription = emitter.on("test-event", value => {});
+    emitter.once("test-event", value => {});
+    subscription = emitter.preempt("test-event", value => {});
 
-sub = project.onDidAddBuffer(buffer => buffer.id);
-sub = project.observeBuffers(buffer => buffer.file);
+    // Event Emission
+    emitter.emit("test-event");
+    emitter.emit("test-event", 42);
 
-// Accessing the git repository
-repositories = project.getRepositories();
+    // Optional Value Emitter
+    const optEmitter = new Atom.Emitter<{ "test-event": string }>();
+    optEmitter.emit("test-event");
+    optEmitter.emit("test-event", "test");
+    optEmitter.on("test-event", value => {
+        str = value ? value : "";
+    });
 
-async function getDirectoryRepo() {
-	const potentialRepo = await project.repositoryForDirectory(dir);
-	if (potentialRepo) repository = potentialRepo;
+    // Required Value Emitter
+    const reqEmitter = new Atom.Emitter<{}, TestEmissions>();
+    reqEmitter.on("test-event", value => {
+        str = value;
+    });
+    reqEmitter.emit("test-event", "test");
+
+    // Mixed Value Emitter
+    const mixedEmitter = new Atom.Emitter<{ "t1": "test" }, { "t2": "test" }>();
+    mixedEmitter.emit("t1");
+    mixedEmitter.emit("t1", "test");
+    mixedEmitter.emit("t2", "test");
 }
 
-// Managing Paths
-strs = project.getPaths();
-project.setPaths(["a", "b"]);
-project.addPath("Test");
+// File =======================================================================
+function testFile() {
+    // Construction
+    file = new Atom.File("Test.file");
+    new Atom.File("Test.file", false);
 
-async function initWatcher() {
-	await project.getWatcherPromise("/var/test");
+    async function fileCreation() {
+        bool = await file.create();
+    }
+
+    // Event Subscription
+    subscription = file.onDidChange(() => {});
+    subscription = file.onDidRename(() => {});
+    subscription = file.onDidDelete(() => {});
+    subscription = file.onWillThrowWatchError(() => {});
+
+    // File Metadata
+    bool = file.isFile();
+    bool = file.isDirectory();
+    bool = file.isSymbolicLink();
+
+    async function fileExists() {
+        bool = await file.exists();
+    }
+
+    bool = file.existsSync();
+
+    async function getFileDigest() {
+        str = await file.getDigest();
+    }
+
+    str = file.getDigestSync();
+    file.setEncoding("utf8");
+    str = file.getEncoding();
+
+    // Managing Paths
+    str = file.getPath();
+    str = file.getRealPathSync();
+
+    async function getFileRealPath() {
+        str = await file.getRealPath();
+    }
+
+    str = file.getBaseName();
+
+    // Traversing
+    dir = file.getParent();
+
+    // Reading and Writing
+    async function readFile() {
+        str = await file.read();
+    }
+
+    const stream = file.createReadStream();
+    stream.close();
+
+    async function writeFile() {
+        await file.write("Test");
+    }
+
+    file.createWriteStream();
+    file.writeSync("Test");
 }
 
-project.removePath("Test");
-dirs = project.getDirectories();
-
-const [projectPath, relativePath] = project.relativizePath("Test");
-if (projectPath) {
-	str = projectPath;
+// File/Directory Type Guarding ===============================================
+function testFileDirectoryTypeGuarding() {
+    if (fileOrDir.isFile()) {
+      file = fileOrDir;
+    }
+    if (fileOrDir.isDirectory()) {
+      dir = fileOrDir;
+    }
 }
-str = relativePath;
 
-bool = project.contains("Test");
+// GitRepository ==============================================================
+function testGitRepository() {
+    // Construction and Destruction
+    repository = new Atom.GitRepository("Test");
+    repository = new Atom.GitRepository("Test", {});
+    repository = new Atom.GitRepository("Test", { refreshOnWindowFocus: true });
+    repository = new Atom.GitRepository("Test", { config: atom.config });
+    repository = new Atom.GitRepository("Test", { project: atom.project });
+    repository = new Atom.GitRepository("Test", { refreshOnWindowFocus: false, config: atom.config,
+        project: atom.project });
+    repository.destroy();
+    bool = repository.isDestroyed();
 
-//// Range -- See 'text-buffer' testing.
-//// ScopeDescriptor ==========================================================
+    // Event Subscription
+    subscription = repository.onDidDestroy(() => {});
+    subscription = repository.onDidChangeStatus(event => event.path && event.pathStatus);
+    subscription = repository.onDidChangeStatuses(() => {});
+
+    // Repository Details
+    repository.getType();
+    str = repository.getPath();
+    str = repository.getWorkingDirectory();
+    bool = repository.isProjectAtRoot();
+    str = repository.relativize();
+    bool = repository.hasBranch("master");
+
+    str = repository.getShortHead();
+    str = repository.getShortHead("test.path");
+
+    bool = repository.isSubmodule("test.path");
+
+    let aheadBehindCount: { ahead: number, behind: number };
+    aheadBehindCount = repository.getAheadBehindCount("ref");
+    aheadBehindCount = repository.getAheadBehindCount("ref", "test.path");
+
+    aheadBehindCount = repository.getCachedUpstreamAheadBehindCount();
+    aheadBehindCount = repository.getCachedUpstreamAheadBehindCount("test.path");
+
+    str = repository.getConfigValue("username");
+    str = repository.getConfigValue("username", "test.path");
+
+    str = repository.getOriginURL();
+    str = repository.getOriginURL("test.path");
+
+    let upstreamBranch = repository.getUpstreamBranch();
+    if (upstreamBranch) {
+        str = upstreamBranch;
+    }
+
+    upstreamBranch = repository.getUpstreamBranch("test.path");
+    if (upstreamBranch) {
+        str = upstreamBranch;
+    }
+
+    let gitReferences: { heads: string[], remotes: string[], tags: string[] };
+    gitReferences = repository.getReferences();
+    gitReferences = repository.getReferences("test.path");
+
+    str = repository.getReferenceTarget("ref");
+    str = repository.getReferenceTarget("ref", "test.path");
+
+    // Reading Status
+    bool = repository.isPathModified("file.path");
+    bool = repository.isPathNew("file.path");
+    bool = repository.isPathIgnored("file.path");
+    num = repository.getDirectoryStatus("file.path");
+    num = repository.getPathStatus("file.path");
+
+    const cachedPathStatus = repository.getCachedPathStatus("file.path");
+    if (cachedPathStatus) {
+        num = cachedPathStatus;
+    }
+
+    bool = repository.isStatusModified(42);
+    bool = repository.isStatusNew(42);
+
+    // Retrieving Diffs
+    let diffStats: { added: number, deleted: number };
+    diffStats = repository.getDiffStats("file.path");
+
+    let lineDiffs: Array<{ oldStart: number, newStart: number, oldLines: number,
+        newLines: number }>;
+    lineDiffs = repository.getLineDiffs("file.path", "contents");
+
+    // Checking Out
+    bool = repository.checkoutHead("file.path");
+    bool = repository.checkoutReference("ref", true);
+}
+
+// Grammar ====================================================================
+function testGrammar() {
+    subscription = grammar.onDidUpdate(() => {});
+
+    const tokenizeLinesResult = grammar.tokenizeLines("Test String");
+    for (const tokenizedLine of tokenizeLinesResult) {
+        for (const token of tokenizedLine) {
+            token.scopes;
+            token.value;
+        }
+    }
+
+    grammar.tokenizeLine("Test String");
+    const tokenizeLineResult = grammar.tokenizeLine("Test String", null, false);
+    tokenizeLineResult.line;
+    tokenizeLineResult.tags;
+    tokenizeLineResult.tokens;
+    grammar.tokenizeLine("Test String", tokenizeLineResult.ruleStack);
+    grammar.tokenizeLine("Test String", tokenizeLineResult.ruleStack, false);
+
+    let str: string;
+    str = grammar.name;
+    str = grammar.scopeName;
+}
+
+// GrammarRegistry ============================================================
+function testGrammarRegistry() {
+    // Event Subscription
+    subscription = registry.onDidAddGrammar(grammar => grammar.name);
+    subscription = registry.onDidUpdateGrammar(grammar => grammar.name);
+    subscription = registry.onDidRemoveGrammar(grammar => grammar.name);
+
+    // Managing Grammars
+    grammars = registry.getGrammars();
+
+    let potentialGrammar = registry.grammarForScopeName("scope.test");
+    if (potentialGrammar) grammar = potentialGrammar;
+
+    subscription = registry.addGrammar(grammar);
+
+    potentialGrammar = registry.removeGrammarForScopeName("scope.test");
+
+    grammar = registry.readGrammarSync("/test/path");
+
+    registry.readGrammar("/test/path", (error, grammar) => {
+        if (grammar) {
+            grammar.name;
+        } else {
+            if (error) error.name;
+        }
+    });
+
+    grammar = registry.loadGrammarSync("/test/path");
+
+    registry.loadGrammar("/test/path", (error, grammar) => {
+        if (grammar) {
+            grammar.name;
+        } else {
+            if (error) error.name;
+        }
+    });
+}
+
+// Gutter =====================================================================
+function testGutter() {
+    // Gutter Destruction
+    gutter.destroy();
+
+    // Event Subscription
+    subscription = gutter.onDidChangeVisible(gutter => gutter.isVisible());
+    subscription = gutter.onDidDestroy(() => {});
+
+    // Visibility
+    gutter.hide();
+    gutter.show();
+    bool = gutter.isVisible();
+    decoration = gutter.decorateMarker(displayMarker, { type: "line-number" });
+}
+
+// HistoryManager =============================================================
+function testHistoryManager() {
+    historyPaths = atom.history.getProjects();
+    atom.history.clearProjects();
+    subscription = atom.history.onDidChangeProjects(() => {});
+}
+
+// KeymapManager ==============================================================
+function testKeymapManager() {
+    const manager = atom.keymaps;
+    manager.clear();
+    manager.destroy();
+
+    // Event Subscription
+    subscription = manager.onDidMatchBinding((event): void => { event.keystrokes; });
+    subscription = manager.onDidPartiallyMatchBindings((event): void => {
+        event.partiallyMatchedBindings; });
+    subscription = manager.onDidFailToMatchBinding((event): void => { event.keystrokes; });
+    subscription = manager.onDidFailToReadFile((event): void => { event.stack; });
+
+    // Adding and Removing Bindings
+    subscription = manager.add("a", {}, 0);
+
+    // Accessing Bindings
+    let bindings: Atom.KeyBinding[] = manager.getKeyBindings();
+    bindings = manager.findKeyBindings();
+    bindings = manager.findKeyBindings({ command: "a" });
+    bindings = manager.findKeyBindings({ keystrokes: "a" });
+    bindings = manager.findKeyBindings({ target: element });
+    bindings = manager.findKeyBindings({ command: "a", keystrokes: "b"});
+    bindings = manager.findKeyBindings({ command: "a", keystrokes: "b", target: element });
+
+    // Managing Keymap Files
+    manager.loadKeymap("Test.file");
+    manager.loadKeymap("Test.file", { watch: true });
+    manager.loadKeymap("Test.file", { watch: true, priority: 0});
+
+    // Managing Keyboard Events
+    manager.handleKeyboardEvent(event);
+    manager.keystrokeForKeyboardEvent(event);
+
+    subscription = manager.addKeystrokeResolver((event): string => {
+        event.layoutName;
+        return "Test";
+    });
+
+    const num: number = manager.getPartialMatchTimeout();
+}
+
+// LayerDecoration ============================================================
+function testLayerDecoration() {
+    layerDecoration.destroy();
+    bool = layerDecoration.isDestroyed();
+    layerDecoration.getProperties();
+    layerDecoration.setProperties(decorationLayerProps);
+    layerDecoration.setPropertiesForMarker(marker, { type: "line", class: "test-class" });
+}
+
+// Marker =====================================================================
+function testMarker() {
+    // Properties
+    num = marker.id;
+
+    // Lifecycle
+    marker = marker.copy({
+        tailed: true,
+        reversed: true,
+        invalidate: "surround",
+        exclusive: false,
+        properties: { custom: "prop" },
+    });
+
+    marker.destroy();
+
+    // Event Subscription
+    subscription = marker.onDidDestroy(() => {});
+
+    subscription = marker.onDidChange(event => {
+        event.oldHeadPosition;
+        event.newHeadPosition;
+        event.oldTailPosition;
+        event.newTailPosition;
+        event.wasValid;
+        event.isValid;
+        event.hadTail;
+        event.hasTail;
+        event.oldProperties;
+        event.newProperties;
+        event.textChanged;
+    });
+
+    // Marker Details
+    range = marker.getRange();
+    pos = marker.getHeadPosition();
+    pos = marker.getTailPosition();
+    pos = marker.getStartPosition();
+    pos = marker.getEndPosition();
+    bool = marker.isReversed();
+    bool = marker.hasTail();
+    bool = marker.isValid();
+    bool = marker.isDestroyed();
+    bool = marker.isExclusive();
+    str = marker.getInvalidationStrategy();
+
+    // Mutating Markers
+    bool = marker.setRange(range);
+    bool = marker.setRange([pos, pos]);
+    bool = marker.setRange([pos, [0, 0]]);
+    bool = marker.setRange([[0, 0], pos]);
+    bool = marker.setRange([[0, 0], [0, 0]]);
+    bool = marker.setRange([pos, pos], { exclusive: false });
+    bool = marker.setRange(range, { exclusive: true, reversed: false });
+
+    bool = marker.setHeadPosition(pos);
+    bool = marker.setHeadPosition([0, 0]);
+
+    bool = marker.setTailPosition(pos);
+    bool = marker.setTailPosition([0, 0]);
+
+    bool = marker.clearTail();
+    bool = marker.plantTail();
+
+    // Comparison
+    bool = marker.isEqual(marker);
+    num = marker.compare(marker);
+}
+
+// MarkerLayer ================================================================
+function testMarkerLayer() {
+    // Lifecycle
+    markerLayer = markerLayer.copy();
+    bool = markerLayer.destroy();
+    markerLayer.clear();
+    bool = markerLayer.isDestroyed();
+
+    // Querying
+    const potentialMarker = markerLayer.getMarker(42);
+    if (potentialMarker) marker = potentialMarker;
+
+    markers = markerLayer.getMarkers();
+    num = markerLayer.getMarkerCount();
+
+    markers = markerLayer.findMarkers({
+        startPosition: pos,
+        endPosition: pos,
+        startsInRange: range,
+        endsInRange: range,
+        containsPoint: pos,
+        containsRange: range,
+        startRow: num,
+        endRow: num,
+        intersectsRow: num,
+    });
+    markers = markerLayer.findMarkers({ containsRange: [pos, pos] });
+    markers = markerLayer.findMarkers({ containsRange: [pos, [0, 0]] });
+    markers = markerLayer.findMarkers({ containsRange: [[0, 0], pos] });
+    markers = markerLayer.findMarkers({ containsRange: [[0, 0], [0, 0]] });
+
+    // Marker creation
+    marker = markerLayer.markRange(range);
+    marker = markerLayer.markRange([pos, pos]);
+    marker = markerLayer.markRange([pos, [0, 0]]);
+    marker = markerLayer.markRange([[0, 0], pos]);
+    marker = markerLayer.markRange([[0, 0], [0, 0]]);
+    marker = markerLayer.markRange(range, { exclusive: true });
+    marker = markerLayer.markRange([pos, pos], { invalidate: "never" });
+    marker = markerLayer.markRange(range, {
+        exclusive: false, invalidate: "surround", reversed: false,
+    });
+
+    marker = markerLayer.markPosition(pos);
+    marker = markerLayer.markPosition([0, 0]);
+    marker = markerLayer.markPosition(pos, { exclusive: false });
+    marker = markerLayer.markPosition([0, 0], { invalidate: "inside" });
+    marker = markerLayer.markPosition(pos, { exclusive: true, invalidate: "surround" });
+
+    // Event subscription
+    subscription = markerLayer.onDidUpdate(() => {});
+    subscription = markerLayer.onDidCreateMarker(marker => marker.id);
+    subscription = markerLayer.onDidDestroy(() => {});
+}
+
+// MenuManager ================================================================
+function testMenuManager() {
+    subscription = atom.menu.add([
+        {
+            label: "Hello",
+            submenu : [{ label: "World!", command: "hello:world" }],
+        },
+    ]);
+    atom.menu.update();
+}
+
+// Notification ===============================================================
+function testNotification() {
+    notification = new Atom.Notification("fatal", "Test");
+    notification = new Atom.Notification("success", "Test", {});
+    notification = new Atom.Notification("info", "Test", {
+        buttons: [
+            { className: "Test", text: "Test", onDidClick: () => {}},
+        ],
+        description: "Test",
+        detail: "Test",
+        dismissable: false,
+        icon: "Test",
+    });
+
+    // Event Subscription
+    subscription = notification.onDidDismiss(notification => notification.getType());
+    subscription = notification.onDidDisplay(notification => notification.getMessage());
+
+    // Methods
+    str = notification.getType();
+    str = notification.getMessage();
+
+    // Extended Methods
+    notification.dismiss();
+}
+
+// NotificationManager ========================================================
+function testNotificationManager() {
+    // Events
+    atom.notifications.onDidAddNotification(notification => notification.dismiss());
+
+    // Adding Notifications
+    atom.notifications.addSuccess("Test");
+    atom.notifications.addSuccess("Test", {});
+    atom.notifications.addSuccess("Test", {
+        description: "Desc",
+        detail: "Details",
+        dismissable: true,
+        icon: "Icon",
+        buttons: [{
+            text: "Button",
+            onDidClick: () => {},
+            className: "test-class",
+        }],
+    });
+
+    atom.notifications.addInfo("Test");
+    atom.notifications.addInfo("Test", {});
+    atom.notifications.addInfo("Test", { description: "Desc" });
+
+    atom.notifications.addWarning("Test");
+    atom.notifications.addWarning("Test", {});
+    atom.notifications.addWarning("Test", { description: "Desc" });
+
+    atom.notifications.addError("Test");
+    atom.notifications.addError("Test", {});
+    atom.notifications.addError("Test", { stack: "Stack" });
+
+    atom.notifications.addFatalError("Test");
+    atom.notifications.addFatalError("Test", {});
+    atom.notifications.addFatalError("Test", { stack: "Stack" });
+
+    // Getting Notifications
+    notifications = atom.notifications.getNotifications();
+}
+
+// Package ====================================================================
+function testPackage() {
+    // Event Subscription
+    pack.onDidDeactivate(() => {});
+
+    // Native Module Compatibility
+    bool = pack.isCompatible();
+
+    let exitInfo: Promise<{ code: number, stderr: string, stdout: string }>;
+    exitInfo = pack.rebuild();
+
+    const buildFailureOutput = pack.getBuildFailureOutput();
+    if (buildFailureOutput) {
+        str = buildFailureOutput;
+    }
+}
+
+// PackageManager ===========================================================\==
+function testPackageManager() {
+    // Event Subscription
+    subscription = atom.packages.onDidLoadInitialPackages(() => {});
+    subscription = atom.packages.onDidActivateInitialPackages(() => {});
+    subscription = atom.packages.onDidActivatePackage(pack => pack.name);
+    subscription = atom.packages.onDidDeactivatePackage(pack => pack.path);
+    subscription = atom.packages.onDidLoadPackage(pack => pack.isCompatible());
+    subscription = atom.packages.onDidUnloadPackage(pack => pack.name);
+    subscription = atom.packages.onDidTriggerActivationHook(
+      'language-javascript:grammar-used', () => {}
+    );
+
+    // Package system data
+    str = atom.packages.getApmPath();
+    strs = atom.packages.getPackageDirPaths();
+
+    // General package data
+    const packagePath = atom.packages.resolvePackagePath("Test");
+    if (packagePath) {
+        str = packagePath;
+    }
+
+    bool = atom.packages.isBundledPackage("Test");
+
+    // Enabling and disabling packages
+    let potentialPack = atom.packages.enablePackage("Test");
+    if (potentialPack) {
+        pack = potentialPack;
+    }
+
+    potentialPack = atom.packages.disablePackage("Test");
+    if (potentialPack) {
+        pack = potentialPack;
+    }
+
+    bool = atom.packages.isPackageDisabled("Test");
+
+    // Accessing active packages
+    packs = atom.packages.getActivePackages();
+
+    potentialPack = atom.packages.getActivePackage("Test");
+    if (potentialPack) {
+        pack = potentialPack;
+    }
+
+    bool = atom.packages.isPackageActive("Test");
+    bool = atom.packages.hasActivatedInitialPackages();
+
+    // Accessing loaded packages
+    packs = atom.packages.getLoadedPackages();
+
+    potentialPack = atom.packages.getLoadedPackage("Test");
+    if (potentialPack) {
+        pack = potentialPack;
+    }
+
+    bool = atom.packages.isPackageLoaded("Test");
+    bool = atom.packages.hasLoadedInitialPackages();
+
+    // Accessing available packages
+    strs = atom.packages.getAvailablePackagePaths();
+    strs = atom.packages.getAvailablePackageNames();
+    strs = atom.packages.getAvailablePackageMetadata();
+}
+
+// Pane =======================================================================
+function testPane() {
+    // Event Subscription
+    subscription = pane.onDidChangeFlexScale(scale => num = scale);
+    subscription = pane.observeFlexScale(scale => num = scale);
+    subscription = pane.onDidActivate(() => {});
+    subscription = pane.onWillDestroy(() => {});
+    subscription = pane.onDidDestroy(() => {});
+    subscription = pane.onDidChangeActive(active => bool = active);
+    subscription = pane.observeActive(active => bool = active);
+    subscription = pane.onDidAddItem(event => event.index && event.item);
+    subscription = pane.onDidRemoveItem(event => event.index && event.item);
+    subscription = pane.onWillRemoveItem(event => event.index && event.item);
+    subscription = pane.onDidMoveItem(event => event.item && event.oldIndex && event.newIndex);
+    subscription = pane.observeItems((item) => {});
+    subscription = pane.onDidChangeActiveItem((item) => {});
+    subscription = pane.onChooseNextMRUItem((item) => {});
+    subscription = pane.onChooseLastMRUItem((item) => {});
+    subscription = pane.onDoneChoosingMRUItem(() => {});
+    subscription = pane.observeActiveItem((item) => {});
+    subscription = pane.onWillDestroyItem(event => event.index && event.item);
+
+    // Items
+    objs = pane.getItems();
+    obj = pane.getActiveItem();
+
+    let potentialItem = pane.itemAtIndex(42);
+    if (potentialItem) {
+        obj = potentialItem;
+    }
+
+    pane.activateNextItem();
+    pane.activatePreviousItem();
+    pane.moveItemRight();
+    pane.moveItemLeft();
+    num = pane.getActiveItemIndex();
+    pane.activateItemAtIndex(42);
+
+    pane.activateItem(element);
+    pane.activateItem(element, { pending: true });
+
+    obj = pane.addItem(element);
+    obj = pane.addItem(element, {});
+    obj = pane.addItem(element, { pending: true });
+    obj = pane.addItem(element, { index: 42 });
+    obj = pane.addItem(element, { pending: true, index: 42 });
+
+    objs = pane.addItems(objs);
+    objs = pane.addItems(objs, 42);
+
+    pane.moveItem(element, 42);
+    pane.moveItemToPane(element, pane, 42);
+    pane.destroyActiveItem();
+
+    async function destroyAndWait() {
+        bool = await pane.destroyItem(element);
+        bool = await pane.destroyItem(element, true);
+    }
+
+    pane.destroyItems();
+    pane.destroyInactiveItems();
+
+    async function savePaneItem() {
+        await pane.saveActiveItem();
+        let actionReturn = await pane.saveActiveItem(() => true);
+        if (actionReturn) bool = actionReturn;
+
+        await pane.saveActiveItemAs(() => {});
+        actionReturn = await pane.saveActiveItemAs(() => false);
+
+        await pane.saveItem(element, () => {});
+        let altActionReturn = await pane.saveItem(element, () => 42);
+        if (altActionReturn) num = altActionReturn;
+
+        await pane.saveItemAs(element, () => {});
+        altActionReturn = await pane.saveItemAs(element, () => 42);
+    }
+
+    pane.saveItems();
+
+    potentialItem = pane.itemForURI("https://test");
+    if (potentialItem) {
+        obj = potentialItem;
+    }
+
+    bool = pane.activateItemForURI("https://test");
+
+    // Lifecycle
+    bool = pane.isActive();
+    pane.activate();
+    pane.destroy();
+    bool = pane.isDestroyed();
+
+    // Splitting
+    pane = pane.splitLeft();
+    pane = pane.splitLeft({});
+    pane = pane.splitLeft({ copyActiveItem: true });
+    pane = pane.splitLeft({ items: elements });
+    pane = pane.splitLeft({ copyActiveItem: true, items: elements });
+
+    pane = pane.splitRight();
+    pane = pane.splitRight({});
+    pane = pane.splitRight({ copyActiveItem: true });
+    pane = pane.splitRight({ items: elements });
+    pane = pane.splitRight({ copyActiveItem: true, items: elements });
+
+    pane = pane.splitUp();
+    pane = pane.splitUp({});
+    pane = pane.splitUp({ copyActiveItem: true });
+    pane = pane.splitUp({ items: elements });
+    pane = pane.splitUp({ copyActiveItem: true, items: elements });
+
+    pane = pane.splitDown();
+    pane = pane.splitDown({});
+    pane = pane.splitDown({ copyActiveItem: true });
+    pane = pane.splitDown({ items: elements });
+    pane = pane.splitDown({ copyActiveItem: true, items: elements });
+}
+
+// Panel ======================================================================
+function testPanel() {
+    // Methods
+    panel.destroy();
+
+    // Event Subscription
+    subscription = panel.onDidChangeVisible(visible => bool = visible);
+    subscription = panel.onDidDestroy(panel => bool = panel.isVisible());
+
+    // Panel Details
+    obj = panel.getItem();
+    num = panel.getPriority();
+    bool = panel.isVisible();
+    panel.hide();
+    panel.show();
+}
+
+// PathWatcher ================================================================
+async function testPathWatcher() {
+    const pathWatcher = await pathWatcherPromise;
+    pathWatcher.dispose();
+    subscription = pathWatcher.onDidError((error) => str = error.name);
+
+    async function waitForPathWatcher() {
+        await pathWatcher.getStartPromise();
+    }
+}
+
+// Point ======================================================================
+function testPoint() {
+    let point = new Atom.Point(42, 42);
+    new Atom.Point();
+    new Atom.Point(42);
+
+    // Properties
+    num = point.row;
+    num = point.column;
+
+    // Construction
+    point = Atom.Point.fromObject({ row: 42, column: 42 }, true);
+    point = point.copy();
+    point = point.negate();
+
+    // Comparison
+    point = Atom.Point.min(point, point);
+    Atom.Point.min([0, 0], [0, 0]);
+    Atom.Point.min(point, [0, 0]);
+    Atom.Point.min([0, 0], point);
+
+    num = point.compare(point);
+    point.compare([0, 0]);
+
+    bool = point.isEqual(point);
+    point.isEqual([0, 0]);
+
+    bool = point.isLessThan(point);
+    point.isLessThan([0, 0]);
+
+    bool = point.isLessThanOrEqual(point);
+    point.isLessThanOrEqual([0, 0]);
+
+    bool = point.isGreaterThan(point);
+    point.isGreaterThan([0, 0]);
+
+    bool = point.isGreaterThanOrEqual(point);
+    point.isGreaterThanOrEqual([0, 0]);
+
+    // Operations
+    const frozenPoint: Readonly<Atom.Point> = point.freeze();
+
+    point = point.translate(point);
+    point.translate([0, 0]);
+
+    point = point.traverse(point);
+    point.traverse([0, 0]);
+
+    // Conversion
+    point.toArray();
+    point.serialize();
+    str = point.toString();
+}
+
+// Project ====================================================================
+function testProject() {
+    // Event Subscription
+    subscription = project.onDidChangePaths(paths => paths.length);
+
+    subscription = project.onDidChangeFiles(events => {
+        for (const event of events) {
+            str = event.action;
+        }
+    });
+
+    subscription = project.onDidAddBuffer(buffer => buffer.id);
+    subscription = project.observeBuffers(buffer => buffer.getUri());
+
+    // Accessing the git repository
+    repositories = project.getRepositories();
+
+    async function getDirectoryRepo() {
+        const potentialRepo = await project.repositoryForDirectory(dir);
+        if (potentialRepo) repository = potentialRepo;
+    }
+
+    // Managing Paths
+    strs = project.getPaths();
+    project.setPaths(["a", "b"]);
+    project.addPath("Test");
+
+    async function initWatcher() {
+        await project.getWatcherPromise("/var/test");
+    }
+
+    project.removePath("Test");
+    dirs = project.getDirectories();
+
+    const [projectPath, relativePath] = project.relativizePath("Test");
+    if (projectPath) {
+        str = projectPath;
+    }
+    str = relativePath;
+
+    bool = project.contains("Test");
+}
+
+// Range ======================================================================
+function testRange() {
+    let range = new Atom.Range(pos, pos);
+    new Atom.Range([0, 0], [0, 0]);
+    new Atom.Range(pos, [0, 0]);
+    new Atom.Range([0, 0], pos);
+
+    // Properties
+    range.start;
+    range.end;
+
+    // Construction
+    range = Atom.Range.fromObject({ start: pos, end: pos}, true);
+    Atom.Range.fromObject([pos, pos]);
+    Atom.Range.fromObject([[0, 0], [0, 0]]);
+    Atom.Range.fromObject([pos, [0, 0]]);
+    Atom.Range.fromObject([[0, 0], pos]);
+
+    range = range.copy();
+    range = range.negate();
+
+    // Serialization and Deserialization
+    range = Atom.Range.deserialize({});
+    range.serialize();
+
+    // TextBuffer.Range Details
+    bool = range.isEmpty();
+    bool = range.isSingleLine();
+    num = range.getRowCount();
+    nums = range.getRows();
+
+    // Operations
+    const frozenRange: Readonly<Atom.Range> = range.freeze();
+    range = range.union(range);
+
+    range = range.translate(pos);
+    range.translate([0, 0]);
+    range.translate(pos, pos);
+    range.translate([0, 0], pos);
+    range.translate(pos, [0, 0]);
+    range.translate([0, 0], [0, 0]);
+
+    range = range.traverse(pos);
+    range.traverse([0, 0]);
+
+    // Comparison
+    num = range.compare(range);
+    range.compare([pos, pos]);
+    range.compare([pos, [0, 0]]);
+    range.compare([[0, 0], pos]);
+    range.compare([[0, 0], [0, 0]]);
+
+    bool = range.isEqual(range);
+    range.isEqual([pos, pos]);
+    range.isEqual([pos, [0, 0]]);
+    range.isEqual([[0, 0], pos]);
+    range.isEqual([[0, 0], [0, 0]]);
+
+    bool = range.coversSameRows(range);
+
+    bool = range.intersectsWith(range);
+    range.intersectsWith(range, true);
+
+    bool = range.containsRange(range);
+    range.containsRange([pos, pos]);
+    range.containsRange([pos, [0, 0]]);
+    range.containsRange([[0, 0], pos]);
+    range.containsRange([[0, 0], [0, 0]]);
+    range.containsRange(range, true);
+    range.containsRange([pos, pos], false);
+    range.containsRange([pos, [0, 0]], false);
+    range.containsRange([[0, 0], pos], false);
+    range.containsRange([[0, 0], [0, 0]], false);
+
+    bool = range.containsPoint(pos);
+    range.containsPoint([0, 0]);
+    range.containsPoint(pos, true);
+    range.containsPoint([0, 0], false);
+
+    bool = range.intersectsRow(42);
+    bool = range.intersectsRowRange(42, 42);
+
+    // Conversion
+    str = range.toString();
+}
+
+// ScopeDescriptor ============================================================
 strs = scopeDescriptor.getScopesArray();
 
-//// Selection ================================================================
-// Event Subscription
-sub = selection.onDidChangeRange(event => event.newBufferRange && event.oldBufferRange &&
-	event.newScreenRange && event.oldScreenRange && event.selection);
-sub = selection.onDidDestroy(() => {});
+// Selection ==================================================================
+function testSelection() {
+    // Event Subscription
+    subscription = selection.onDidChangeRange(event => event.newBufferRange &&
+        event.oldBufferRange && event.newScreenRange && event.oldScreenRange &&
+        event.selection);
+    subscription = selection.onDidDestroy(() => {});
 
-// Managing the selection range
-range = selection.getScreenRange();
+    // Managing the selection range
+    range = selection.getScreenRange();
 
-selection.setScreenRange(range);
-selection.setScreenRange([pos, pos]);
-selection.setScreenRange([pos, [0, 0]]);
-selection.setScreenRange([[0, 0], pos]);
-selection.setScreenRange([[0, 0], [0, 0]]);
-selection.setScreenRange([[0, 0], [0, 0]], {});
-selection.setScreenRange(range, { autoscroll: true, preserveFolds: false });
-selection.setScreenRange([pos, pos], { autoscroll: true });
+    selection.setScreenRange(range);
+    selection.setScreenRange([pos, pos]);
+    selection.setScreenRange([pos, [0, 0]]);
+    selection.setScreenRange([[0, 0], pos]);
+    selection.setScreenRange([[0, 0], [0, 0]]);
+    selection.setScreenRange([[0, 0], [0, 0]], {});
+    selection.setScreenRange(range, { autoscroll: true, preserveFolds: false });
+    selection.setScreenRange([pos, pos], { autoscroll: true });
 
-range = selection.getBufferRange();
+    range = selection.getBufferRange();
 
-selection.setBufferRange(range);
-selection.setBufferRange([pos, pos]);
-selection.setBufferRange([pos, [0, 0]]);
-selection.setBufferRange([[0, 0], pos]);
-selection.setBufferRange([[0, 0], [0, 0]]);
-selection.setBufferRange([[0, 0], [0, 0]], {});
-selection.setBufferRange(range, { autoscroll: true, preserveFolds: false });
-selection.setBufferRange([pos, pos], { autoscroll: true });
+    selection.setBufferRange(range);
+    selection.setBufferRange([pos, pos]);
+    selection.setBufferRange([pos, [0, 0]]);
+    selection.setBufferRange([[0, 0], pos]);
+    selection.setBufferRange([[0, 0], [0, 0]]);
+    selection.setBufferRange([[0, 0], [0, 0]], {});
+    selection.setBufferRange(range, { autoscroll: true, preserveFolds: false });
+    selection.setBufferRange([pos, pos], { autoscroll: true });
 
-const [startingRow, endingRow ]: [number, number] = selection.getBufferRowRange();
+    const [startingRow, endingRow ]: [number, number] = selection.getBufferRowRange();
 
-// Info about the selection
-bool = selection.isEmpty();
-bool = selection.isReversed();
-bool = selection.isSingleScreenLine();
-str = selection.getText();
-bool = selection.intersectsBufferRange(range); // Not range-compatible.
-bool = selection.intersectsWith(selection);
+    // Info about the selection
+    bool = selection.isEmpty();
+    bool = selection.isReversed();
+    bool = selection.isSingleScreenLine();
+    str = selection.getText();
+    bool = selection.intersectsBufferRange(range); // Not range-compatible.
+    bool = selection.intersectsWith(selection);
 
-// Modifying the selected range
-selection.clear();
-selection.clear({});
-selection.clear({ autoscroll: false });
+    // Modifying the selected range
+    selection.clear();
+    selection.clear({});
+    selection.clear({ autoscroll: false });
 
-selection.selectToScreenPosition(pos);
-selection.selectToScreenPosition([0, 0]);
+    selection.selectToScreenPosition(pos);
+    selection.selectToScreenPosition([0, 0]);
 
-selection.selectToBufferPosition(pos);
-selection.selectToBufferPosition([0, 0]);
+    selection.selectToBufferPosition(pos);
+    selection.selectToBufferPosition([0, 0]);
 
-selection.selectRight();
-selection.selectRight(42);
+    selection.selectRight();
+    selection.selectRight(42);
 
-selection.selectLeft();
-selection.selectLeft(42);
+    selection.selectLeft();
+    selection.selectLeft(42);
 
-selection.selectUp();
-selection.selectUp(42);
+    selection.selectUp();
+    selection.selectUp(42);
 
-selection.selectDown();
-selection.selectDown(42);
+    selection.selectDown();
+    selection.selectDown(42);
 
-selection.selectToTop();
-selection.selectToBottom();
-selection.selectAll();
-selection.selectToBeginningOfLine();
-selection.selectToFirstCharacterOfLine();
-selection.selectToEndOfLine();
-selection.selectToEndOfBufferLine();
-selection.selectToBeginningOfWord();
-selection.selectToEndOfWord();
-selection.selectToBeginningOfNextWord();
-selection.selectToPreviousWordBoundary();
-selection.selectToNextWordBoundary();
-selection.selectToPreviousSubwordBoundary();
-selection.selectToNextSubwordBoundary();
-selection.selectToBeginningOfNextParagraph();
-selection.selectToBeginningOfPreviousParagraph();
-selection.selectWord();
-selection.expandOverWord();
-selection.selectLine(42);
-selection.expandOverLine();
+    selection.selectToTop();
+    selection.selectToBottom();
+    selection.selectAll();
+    selection.selectToBeginningOfLine();
+    selection.selectToFirstCharacterOfLine();
+    selection.selectToEndOfLine();
+    selection.selectToEndOfBufferLine();
+    selection.selectToBeginningOfWord();
+    selection.selectToEndOfWord();
+    selection.selectToBeginningOfNextWord();
+    selection.selectToPreviousWordBoundary();
+    selection.selectToNextWordBoundary();
+    selection.selectToPreviousSubwordBoundary();
+    selection.selectToNextSubwordBoundary();
+    selection.selectToBeginningOfNextParagraph();
+    selection.selectToBeginningOfPreviousParagraph();
+    selection.selectWord();
+    selection.expandOverWord();
+    selection.selectLine(42);
+    selection.expandOverLine();
 
-// Modifying the selected text
-selection.insertText("Replacement");
-selection.insertText("Replacement", {});
-selection.insertText("Replacement", { select: true });
-selection.insertText("Replacement", { autoIndent: true });
-selection.insertText("Replacement", { autoIndentNewline: true });
-selection.insertText("Replacement", { autoDecreaseIndent: true });
-selection.insertText("Replacement", { normalizeLineEndings: true });
-selection.insertText("Replacement", { undo: "skip" });
-selection.insertText("Replacement", { select: true, autoIndent: true,
-	autoIndentNewline: true, autoDecreaseIndent: true, normalizeLineEndings: true,
-	undo: "skip" });
+    // Modifying the selected text
+    selection.insertText("Replacement");
+    selection.insertText("Replacement", {});
+    selection.insertText("Replacement", { select: true });
+    selection.insertText("Replacement", { autoIndent: true });
+    selection.insertText("Replacement", { autoIndentNewline: true });
+    selection.insertText("Replacement", { autoDecreaseIndent: true });
+    selection.insertText("Replacement", { normalizeLineEndings: true });
+    selection.insertText("Replacement", { undo: "skip" });
+    selection.insertText("Replacement", { select: true, autoIndent: true,
+        autoIndentNewline: true, autoDecreaseIndent: true, normalizeLineEndings: true,
+        undo: "skip", preserveTrailingLineIndentation: false });
 
-selection.backspace();
-selection.deleteToPreviousWordBoundary();
-selection.deleteToNextWordBoundary();
-selection.deleteToBeginningOfWord();
-selection.deleteToBeginningOfLine();
-selection.delete();
-selection.deleteToEndOfLine();
-selection.deleteToEndOfWord();
-selection.deleteToBeginningOfSubword();
-selection.deleteToEndOfSubword();
-selection.deleteSelectedText();
-selection.deleteLine();
-selection.joinLines();
-selection.outdentSelectedRows();
-selection.autoIndentSelectedRows();
-selection.toggleLineComments();
-selection.cutToEndOfLine();
-selection.cutToEndOfBufferLine();
+    selection.backspace();
+    selection.deleteToPreviousWordBoundary();
+    selection.deleteToNextWordBoundary();
+    selection.deleteToBeginningOfWord();
+    selection.deleteToBeginningOfLine();
+    selection.delete();
+    selection.deleteToEndOfLine();
+    selection.deleteToEndOfWord();
+    selection.deleteToBeginningOfSubword();
+    selection.deleteToEndOfSubword();
+    selection.deleteSelectedText();
+    selection.deleteLine();
+    selection.joinLines();
+    selection.outdentSelectedRows();
+    selection.autoIndentSelectedRows();
+    selection.toggleLineComments();
+    selection.cutToEndOfLine();
+    selection.cutToEndOfBufferLine();
 
-selection.cut();
-selection.cut(true);
-selection.cut(true, true);
+    selection.cut();
+    selection.cut(true);
+    selection.cut(true, true);
 
-selection.copy();
-selection.copy(true);
-selection.copy(true, true);
+    selection.copy();
+    selection.copy(true);
+    selection.copy(true, true);
 
-selection.fold();
-selection.indentSelectedRows();
+    selection.fold();
+    selection.indentSelectedRows();
 
-// Managing multiple selections
-selection.addSelectionBelow();
-selection.addSelectionAbove();
+    // Managing multiple selections
+    selection.addSelectionBelow();
+    selection.addSelectionAbove();
 
-selection.merge(selection);
-selection.merge(selection, {});
-selection.merge(selection, { preserveFolds: true });
-selection.merge(selection, { autoscroll: true });
-selection.merge(selection, { preserveFolds: true, autoscroll: true });
+    selection.merge(selection);
+    selection.merge(selection, {});
+    selection.merge(selection, { preserveFolds: true });
+    selection.merge(selection, { autoscroll: true });
+    selection.merge(selection, { preserveFolds: true, autoscroll: true });
 
-// Comparing to other selections
-num = selection.compare(selection);
+    // Comparing to other selections
+    num = selection.compare(selection);
+}
 
-//// StyleManager =============================================================
-// Event Subscription
-sub = styleManager.observeStyleElements(styleElement => styleElement.context);
-sub = styleManager.onDidAddStyleElement(styleElement => styleElement.sourcePath);
-sub = styleManager.onDidRemoveStyleElement(styleElement => styleElement.onkeydown);
-sub = styleManager.onDidUpdateStyleElement(styleElement => styleElement.sourcePath);
+// StyleManager ===============================================================
+function testStyleManager() {
+    // Event Subscription
+    subscription = styleManager.observeStyleElements(styleElement => styleElement.context);
+    subscription = styleManager.onDidAddStyleElement(styleElement => styleElement.sourcePath);
+    subscription = styleManager.onDidRemoveStyleElement(styleElement => styleElement.onkeydown);
+    subscription = styleManager.onDidUpdateStyleElement(styleElement => styleElement.sourcePath);
 
-// Reading Style Elements
-const styleElements: HTMLStyleElement[] = styleManager.getStyleElements();
+    // Reading Style Elements
+    const styleElements: HTMLStyleElement[] = styleManager.getStyleElements();
 
-// Paths
-str = styleManager.getUserStyleSheetPath();
+    // Paths
+    str = styleManager.getUserStyleSheetPath();
+}
 
-//// Task =====================================================================
-let task: Atom.Task = Task.once("File.path", {}, () => {});
-task = new Task("File.path");
+// Task =======================================================================
+function testTask() {
+    let task: Atom.Task = Atom.Task.once("File.path", {}, () => {});
+    task = new Atom.Task("File.path");
 
-task.start({}, () => {});
-task.send("test-message");
-sub = task.on("test-message", () => {});
-task.terminate();
-task.cancel();
+    task.start({}, () => {});
+    task.send("test-message");
+    subscription = task.on("test-message", () => {});
+    task.terminate();
+    task.cancel();
+}
 
-//// TextBuffer -- See 'text-buffer' testing.
-//// TextEditor ===============================================================
-// Event Subscription
-sub = editor.onDidChangeTitle(title => str = title.charAt(0));
-sub = editor.onDidChangePath(path => str = path.charAt(0));
+// TextBuffer =================================================================
+function testTextBuffer() {
+    const shouldDestroyOnFileDelete = () => false;
 
-sub = editor.onDidChange(changes => {
-	for (const change of changes) {
-		change.newExtent;
-		change.oldExtent;
-		change.start;
-	}
+    buffer = new Atom.TextBuffer("test");
+    new Atom.TextBuffer();
+    new Atom.TextBuffer({ text: "Test" });
+    new Atom.TextBuffer({ shouldDestroyOnFileDelete });
+    new Atom.TextBuffer({ text: "Test", shouldDestroyOnFileDelete });
+
+    async function bufferLoadFile() {
+        buffer = await Atom.TextBuffer.load("Test.file");
+        buffer = await Atom.TextBuffer.load("Test.file", { encoding: "utf8" });
+        buffer = await Atom.TextBuffer.load("Test.file", { shouldDestroyOnFileDelete });
+        buffer = await Atom.TextBuffer.load("Test.file", { encoding: "utf8",
+            shouldDestroyOnFileDelete });
+    }
+
+    buffer = Atom.TextBuffer.loadSync("Test.file");
+    Atom.TextBuffer.loadSync("Test.file", { encoding: "utf8" });
+    Atom.TextBuffer.loadSync("Test.file", { shouldDestroyOnFileDelete });
+    Atom.TextBuffer.loadSync("Test.file", { encoding: "uft8", shouldDestroyOnFileDelete });
+
+    async function deserializeBuffer() {
+        buffer = await Atom.TextBuffer.deserialize({});
+    }
+
+    // Event Subscription
+    subscription = buffer.onWillChange(() => void {});
+
+    subscription = buffer.onDidChange((event): void => {
+        range = event.newRange;
+        for (const change of event.changes) {
+            range = change.newRange;
+        }
+    });
+
+    subscription = buffer.onDidChangeText(() => void {});
+
+    subscription = buffer.onDidStopChanging((event): void => {
+        for (const change of event.changes) {
+        change.newExtent;
+        }
+    });
+
+    subscription = buffer.onDidConflict(() => void {});
+    subscription = buffer.onDidChangeModified(() => void {});
+    subscription = buffer.onDidUpdateMarkers(() => void {});
+    subscription = buffer.onDidCreateMarker(() => void {});
+
+    subscription = buffer.onDidChangePath((path): void => {
+        str = path;
+    });
+
+    subscription = buffer.onDidChangeEncoding(() => void {});
+
+    subscription = buffer.onWillSave(() => void {});
+    subscription = buffer.onWillSave(() => Promise.resolve());
+
+    subscription = buffer.onDidSave(() => void {});
+    subscription = buffer.onDidDelete(() => void {});
+    subscription = buffer.onWillReload(() => void {});
+    subscription = buffer.onDidReload(() => void {});
+    subscription = buffer.onDidDestroy(() => void {});
+    subscription = buffer.onWillThrowWatchError(() => void {});
+
+    const stoppedChangingDelay = buffer.getStoppedChangingDelay();
+
+    // File Details
+    bool = buffer.isModified();
+    bool = buffer.isInConflict();
+
+    const path = buffer.getPath();
+    if (path) {
+        str = path.substr(0, 42);
+    }
+
+    buffer.setPath("Test.file");
+    buffer.setEncoding("utf8");
+    str = buffer.getEncoding();
+    str = buffer.getUri();
+
+    // Reading Text
+    bool = buffer.isEmpty();
+    str = buffer.getText();
+
+    str = buffer.getTextInRange(range);
+    str = buffer.getTextInRange([pos, pos]);
+    str = buffer.getTextInRange([[0, 0], [0, 0]]);
+    str = buffer.getTextInRange([pos, [0, 0]]);
+    str = buffer.getTextInRange([[0, 0], pos]);
+
+    strs = buffer.getLines();
+    str = buffer.getLastLine();
+
+    const rowText = buffer.lineForRow(42);
+    if (rowText) {
+        str = rowText;
+    }
+
+    const lineEnding = buffer.lineEndingForRow(42);
+    if (lineEnding) {
+        str = lineEnding;
+    }
+
+    num = buffer.lineLengthForRow(42);
+    bool = buffer.isRowBlank(42);
+
+    const prevRow = buffer.previousNonBlankRow(42);
+    if (prevRow) {
+        num = prevRow;
+    }
+
+    const nextRow = buffer.nextNonBlankRow(42);
+    if (nextRow) {
+        num = nextRow;
+    }
+
+    // Mutating Text
+    range = buffer.setText("Test");
+    buffer.setTextViaDiff("Test");
+
+    range = buffer.setTextInRange(range, "Test");
+    range = buffer.setTextInRange([pos, pos], "Test");
+    range = buffer.setTextInRange([[0, 0], [0, 0]], "Test");
+    range = buffer.setTextInRange([pos, [0, 0]], "Test");
+    range = buffer.setTextInRange([[0, 0], pos], "Test");
+    range = buffer.setTextInRange(range, "Test", { normalizeLineEndings: true });
+    range = buffer.setTextInRange(range, "Test", { undo: "skip" });
+    range = buffer.setTextInRange(range, "Test", { normalizeLineEndings: true, undo: "skip" });
+    range = buffer.setTextInRange([[0, 0], [0, 0]], "Test", { undo: "skip" });
+
+    range = buffer.insert(pos, "Test");
+    buffer.insert([0, 0], "Test");
+    buffer.insert(pos, "Test", { normalizeLineEndings: true });
+    buffer.insert(pos, "Test", { undo: "skip" });
+    buffer.insert(pos, "Test", { normalizeLineEndings: true, undo: "skip" });
+    buffer.insert([0, 0], "Test", { undo: "skip" });
+
+    range = buffer.append("Test");
+    buffer.append("Test", { normalizeLineEndings: true });
+    buffer.append("Test", { undo: "skip" });
+    buffer.append("Test", { normalizeLineEndings: true, undo: "skip" });
+
+    range = buffer.delete(range);
+    buffer.delete([pos, pos]);
+    buffer.delete([[0, 0], [0, 0]]);
+    buffer.delete([pos, [0, 0]]);
+    buffer.delete([[0, 0], pos]);
+
+    range = buffer.deleteRow(42);
+    range = buffer.deleteRows(42, 42);
+
+    // Markers
+    markerLayer = buffer.addMarkerLayer();
+    buffer.addMarkerLayer({ maintainHistory: true });
+    buffer.addMarkerLayer({ persistent: true });
+    buffer.addMarkerLayer({ maintainHistory: true, persistent: true });
+
+    const testMarkerLayer = buffer.getMarkerLayer("Test");
+    if (testMarkerLayer) {
+        markerLayer = testMarkerLayer;
+    }
+
+    markerLayer = buffer.getDefaultMarkerLayer();
+
+    marker = buffer.markRange(range);
+    buffer.markRange([pos, pos]);
+    buffer.markRange([[0, 0], [0, 0]]);
+    buffer.markRange([pos, [0, 0]]);
+    buffer.markRange([[0, 0], pos]);
+    buffer.markRange(range, { exclusive: true});
+    buffer.markRange(range, { invalidate: "surround" });
+    buffer.markRange(range, { reversed: true });
+    buffer.markRange(range, { exclusive: true, invalidate: "surround", reversed: true });
+    buffer.markRange([pos, pos], { exclusive: true });
+
+    marker = buffer.markPosition(pos);
+    buffer.markPosition([0, 0]);
+    buffer.markPosition(pos, { exclusive: true });
+    buffer.markPosition(pos, { invalidate: "never" });
+    buffer.markPosition(pos, { exclusive: true, invalidate: "surround" });
+    buffer.markPosition([0, 0], { exclusive: true });
+
+    markers = buffer.getMarkers();
+    marker = buffer.getMarker(42);
+
+    markers = buffer.findMarkers({
+        startPosition: pos,
+        endPosition: pos,
+        startsInRange: range,
+        endsInRange: range,
+        containsPoint: pos,
+        containsRange: range,
+        startRow: num,
+        endRow: num,
+        intersectsRow: num,
+    });
+    markers = buffer.findMarkers({ startsInRange: [pos, pos] });
+    markers = buffer.findMarkers({ startsInRange: [pos, [0, 0]] });
+    markers = buffer.findMarkers({ startsInRange: [[0, 0], pos] });
+    markers = buffer.findMarkers({ startsInRange: [[0, 0], [0, 0]] });
+
+    num = buffer.getMarkerCount();
+
+    // History
+    bool = buffer.undo();
+    bool = buffer.redo();
+
+    num = buffer.transact<number>(500, (): number => 42);
+
+    buffer.clearUndoStack();
+    num = buffer.createCheckpoint();
+    bool = buffer.revertToCheckpoint(42);
+    bool = buffer.groupChangesSinceCheckpoint(42);
+    buffer.getChangesSinceCheckpoint(42);
+
+    // Search And Replace
+    buffer.scan(/r^Test/, (): void => {});
+    buffer.scan(/r^Test/, (params) => {
+        num = params.match.index;
+        str = params.matchText;
+        range = params.range;
+        params.replace("Test");
+        params.stop();
+    });
+    buffer.scan(/r^Test/, {
+        leadingContextLineCount: 5,
+        trailingContextLineCount: 5,
+    }, (params) => {
+        strs = params.leadingContextLines;
+        strs = params.trailingContextLines;
+    });
+
+    buffer.backwardsScan(/r^Test/, (): void => {});
+    buffer.backwardsScan(/r^Test/, (params) => {
+        num = params.match.index;
+        str = params.matchText;
+        range = params.range;
+        params.replace("Test");
+        params.stop();
+    });
+    buffer.backwardsScan(/r^Test/, {
+        leadingContextLineCount: 5,
+        trailingContextLineCount: 5,
+    }, (params) => {
+        strs = params.leadingContextLines;
+        strs = params.trailingContextLines;
+    });
+
+    buffer.scanInRange(/r^Test/, range, (): void => {});
+    buffer.scanInRange(/r^Test/, range, (params) => {
+        num = params.match.index;
+        str = params.matchText;
+        range = params.range;
+        params.replace("Test");
+        params.stop();
+    });
+    buffer.scanInRange(/r^Test/, range, {
+        leadingContextLineCount: 5,
+        trailingContextLineCount: 5,
+    }, (params) => {
+        strs = params.leadingContextLines;
+        strs = params.trailingContextLines;
+    });
+    buffer.scanInRange(/r^Test/, [pos, pos], (): void => {});
+    buffer.scanInRange(/r^Test/, [[0, 0], [0, 0]], (): void => {});
+    buffer.scanInRange(/r^Test/, [pos, [0, 0]], (): void => {});
+    buffer.scanInRange(/r^Test/, [[0, 0], pos], (): void => {});
+    buffer.scanInRange(/r^Test/, [[0, 0], [0, 0]], { trailingContextLineCount: 42 },
+        (): void => {});
+
+    buffer.backwardsScanInRange(/r^Test/, range, (): void => {});
+    buffer.backwardsScanInRange(/r^Test/, range, (params) => {
+        num = params.match.index;
+        str = params.matchText;
+        range = params.range;
+        params.replace("Test");
+        params.stop();
+    });
+    buffer.backwardsScanInRange(/r^Test/, range, {
+        leadingContextLineCount: 5,
+        trailingContextLineCount: 5,
+    }, (params) => {
+        strs = params.leadingContextLines;
+        strs = params.trailingContextLines;
+    });
+    buffer.backwardsScanInRange(/r^Test/, [pos, pos], (): void => {});
+    buffer.backwardsScanInRange(/r^Test/, [[0, 0], [0, 0]], (): void => {});
+    buffer.backwardsScanInRange(/r^Test/, [pos, [0, 0]], (): void => {});
+    buffer.backwardsScanInRange(/r^Test/, [[0, 0], pos], (): void => {});
+    buffer.backwardsScanInRange(/r^Test/, [[0, 0], [0, 0]], { trailingContextLineCount: 42 },
+        (): void => {});
+
+    num = buffer.replace(/r^Test/, "Test");
+
+    // Buffer TextBuffer.Range Details
+    range = buffer.getRange();
+    num = buffer.getLineCount();
+    num = buffer.getLastRow();
+    pos = buffer.getFirstPosition();
+    pos = buffer.getEndPosition();
+    num = buffer.getMaxCharacterIndex();
+    range = buffer.rangeForRow(42, true);
+    num = buffer.characterIndexForPosition(pos);
+    pos = buffer.positionForCharacterIndex(42);
+
+    range = buffer.clipRange(range);
+    range = buffer.clipRange([pos, pos]);
+    range = buffer.clipRange([pos, [0, 0]]);
+    range = buffer.clipRange([[0, 0], pos]);
+    range = buffer.clipRange([[0, 0], [0, 0]]);
+
+    pos = buffer.clipPosition(pos);
+    pos = buffer.clipPosition([0, 0]);
+
+    // Buffer Operations
+    async function saveBuffer() {
+        await buffer.save();
+        await buffer.saveAs("Test.file");
+    }
+
+    buffer.reload();
+}
+
+// TextEditor =================================================================
+function testTextEditor() {
+    // Event Subscription
+    subscription = editor.onDidChangeTitle(title => str = title.charAt(0));
+    subscription = editor.onDidChangePath(path => str = path.charAt(0));
+
+    subscription = editor.onDidChange(changes => {
+        for (const change of changes) {
+            change.newExtent;
+            change.oldExtent;
+            change.start;
+        }
+    });
+
+    subscription = editor.onDidStopChanging(event => {
+        for (const change of event.changes) {
+            change.newExtent && change.oldExtent && change.newRange && change.oldRange &&
+            change.newText && change.oldText && change.start;
+        }
+    });
+
+    subscription = editor.onDidChangeCursorPosition(event => event.newBufferPosition);
+    subscription = editor.onDidChangeSelectionRange(event => event.selection);
+    subscription = editor.onDidSave(event => event.path);
+    subscription = editor.onDidDestroy(() => {});
+    subscription = editor.observeGutters(gutter => gutter.show());
+    subscription = editor.onDidAddGutter(gutter => gutter.hide());
+    subscription = editor.onDidRemoveGutter(name => name.length);
+    subscription = editor.onDidChangeSoftWrapped(softWrapped => {});
+    subscription = editor.onDidChangeEncoding(encoding => {});
+    subscription = editor.observeGrammar(grammar => grammar.name);
+    subscription = editor.onDidChangeGrammar(grammar => grammar.name);
+    subscription = editor.onDidChangeModified(modified => {});
+    subscription = editor.onDidConflict(() => {});
+    subscription = editor.onWillInsertText(event => event.cancel && event.text);
+    subscription = editor.onDidInsertText(event => event.text);
+    subscription = editor.observeCursors(cursor => cursor.moveToBottom());
+    subscription = editor.onDidAddCursor(cursor => cursor.getMarker());
+    subscription = editor.onDidRemoveCursor(cursor => cursor.compare(cursor));
+    subscription = editor.observeSelections(selection => selection.cutToEndOfBufferLine());
+    subscription = editor.onDidAddSelection(selection => selection.selectWord());
+    subscription = editor.onDidRemoveSelection(selection => selection.toggleLineComments());
+    subscription = editor.observeDecorations(decoration => decoration.getId());
+    subscription = editor.onDidAddDecoration(decoration => decoration.id);
+    subscription = editor.onDidRemoveDecoration(decoration => decoration.getId());
+    subscription = editor.onDidChangePlaceholderText(placeholderText =>
+        placeholderText.toLowerCase());
+    buffer = editor.getBuffer();
+
+    // File Details
+    str = editor.getTitle();
+    str = editor.getLongTitle();
+
+    const filePath = editor.getPath();
+    if (filePath) {
+        str = filePath;
+    }
+
+    bool = editor.isModified();
+    bool = editor.isEmpty();
+    str = editor.getEncoding();
+    editor.setEncoding("utf8");
+
+    // File Operations
+    async function saveEditor() {
+        await editor.save();
+        await editor.saveAs("test.file");
+    }
+
+    // Reading Text
+    str = editor.getText();
+    str = editor.getTextInBufferRange(range);
+    num = editor.getLineCount();
+    num = editor.getScreenLineCount();
+    num = editor.getLastBufferRow();
+    num = editor.getLastScreenRow();
+    str = editor.lineTextForBufferRow(42);
+    str = editor.lineTextForScreenRow(42);
+    range = editor.getCurrentParagraphBufferRange();
+
+    // Mutating Text
+    editor.setText("Test");
+
+    range = editor.setTextInBufferRange(range, "Test");
+    range = editor.setTextInBufferRange([pos, pos], "Test");
+    range = editor.setTextInBufferRange([pos, [0, 0]], "Test");
+    range = editor.setTextInBufferRange([[0, 0], pos], "Test");
+    range = editor.setTextInBufferRange([[0, 0], [0, 0]], "Test");
+    range = editor.setTextInBufferRange(range, "Test", {});
+    range = editor.setTextInBufferRange([pos, pos], "Test", { normalizeLineEndings: true });
+    range = editor.setTextInBufferRange(range, "Test", { normalizeLineEndings: true,
+        undo: "skip" });
+
+    editor.insertText("Test");
+    editor.insertText("Test", {});
+    editor.insertText("Test", { autoDecreaseIndent: true });
+    editor.insertText("Test", { autoIndent: true });
+    editor.insertText("Test", { autoIndentNewline: true });
+    editor.insertText("Test", { normalizeLineEndings: true });
+    editor.insertText("Test", { select: true });
+    editor.insertText("Test", { undo: "skip" });
+    editor.insertText("Text", { autoDecreaseIndent: false, autoIndent: false,
+        autoIndentNewline: false, normalizeLineEndings: false, select: false,
+        undo: "skip", preserveTrailingLineIndentation: true });
+
+    editor.insertNewline();
+    editor.delete();
+    editor.backspace();
+    editor.mutateSelectedText((selection, index) => { selection.clear(); });
+    editor.transpose();
+    editor.upperCase();
+    editor.lowerCase();
+    editor.toggleLineCommentsInSelection();
+    editor.insertNewlineBelow();
+    editor.insertNewlineAbove();
+    editor.deleteToBeginningOfWord();
+    editor.deleteToPreviousWordBoundary();
+    editor.deleteToNextWordBoundary();
+    editor.deleteToBeginningOfSubword();
+    editor.deleteToEndOfSubword();
+    editor.deleteToBeginningOfLine();
+    editor.deleteToEndOfLine();
+    editor.deleteToEndOfWord();
+    editor.deleteLine();
+
+    // History
+    editor.undo();
+    editor.redo();
+
+    editor.transact(() => {});
+    editor.transact(42, () => {});
+
+    editor.abortTransaction();
+    num = editor.createCheckpoint();
+    bool = editor.revertToCheckpoint(42);
+    bool = editor.groupChangesSinceCheckpoint(42);
+
+    // TextEditor Coordinates
+    pos = editor.screenPositionForBufferPosition(pos);
+    pos = editor.screenPositionForBufferPosition([0, 0]);
+    pos = editor.screenPositionForBufferPosition(pos, {});
+    pos = editor.screenPositionForBufferPosition(pos, { clipDirection: "backward" });
+    pos = editor.screenPositionForBufferPosition([0, 0], { clipDirection: "forward" });
+
+    pos = editor.bufferPositionForScreenPosition(pos);
+    pos = editor.bufferPositionForScreenPosition([0, 0]);
+    pos = editor.bufferPositionForScreenPosition(pos, {});
+    pos = editor.bufferPositionForScreenPosition(pos, { clipDirection: "backward" });
+    pos = editor.bufferPositionForScreenPosition([0, 0], { clipDirection: "forward" });
+
+    range = editor.screenRangeForBufferRange(range);
+    range = editor.screenRangeForBufferRange([pos, pos]);
+    range = editor.screenRangeForBufferRange([pos, [0, 0]]);
+    range = editor.screenRangeForBufferRange([[0, 0], pos]);
+    range = editor.screenRangeForBufferRange([[0, 0], [0, 0]]);
+
+    range = editor.bufferRangeForScreenRange(range);
+    range = editor.bufferRangeForScreenRange([pos, pos]);
+    range = editor.bufferRangeForScreenRange([pos, [0, 0]]);
+    range = editor.bufferRangeForScreenRange([[0, 0], pos]);
+    range = editor.bufferRangeForScreenRange([[0, 0], [0, 0]]);
+
+    pos = editor.clipBufferPosition(pos);
+    pos = editor.clipBufferPosition([0, 0]);
+
+    range = editor.clipBufferRange(range);
+    range = editor.clipBufferRange([pos, pos]);
+    range = editor.clipBufferRange([pos, [0, 0]]);
+    range = editor.clipBufferRange([[0, 0], pos]);
+    range = editor.clipBufferRange([[0, 0], [0, 0]]);
+
+    pos = editor.clipScreenPosition(pos);
+    pos = editor.clipScreenPosition([0, 0]);
+    pos = editor.clipScreenPosition(pos, {});
+    pos = editor.clipScreenPosition(pos, { clipDirection: "closest" });
+    pos = editor.clipScreenPosition([0, 0], { clipDirection: "closest" });
+
+    range = editor.clipScreenRange(range);
+    range = editor.clipScreenRange([pos, pos]);
+    range = editor.clipScreenRange([pos, [0, 0]]);
+    range = editor.clipScreenRange([[0, 0], pos]);
+    range = editor.clipScreenRange([[0, 0], [0, 0]]);
+    range = editor.clipScreenRange(range, {});
+    range = editor.clipScreenRange(range, { clipDirection: "closest" });
+    range = editor.clipScreenRange([pos, pos], { clipDirection: "closest" });
+
+    // Decorations
+    decoration = editor.decorateMarker(displayMarker, { type: "line" });
+    decoration = editor.decorateMarker(displayMarker, { type: "line", avoidOverflow: true,
+        class: "test-class", gutterName: "gutterName", item: element, onlyEmpty: true,
+        onlyHead: true, onlyNonEmpty: true, position: "before" });
+
+    layerDecoration = editor.decorateMarkerLayer(displayMarkerLayer, { type: "line-number" });
+    layerDecoration = editor.decorateMarkerLayer(displayMarkerLayer, { type: "line-number",
+        avoidOverflow: false, class: "test-class", item: element, onlyEmpty: false, onlyHead: false,
+        onlyNonEmpty: false, position: "after" });
+
+    decorations = editor.getDecorations();
+    decorations = editor.getDecorations({});
+    decorations = editor.getDecorations({ type: "line-number" });
+    decorations = editor.getDecorations({ type: "line", avoidOverflow: true,
+        class: "test-class", gutterName: "gutterName", item: element, onlyEmpty: true,
+        onlyHead: true, onlyNonEmpty: true, position: "before" });
+
+    decorations = editor.getLineDecorations();
+    decorations = editor.getLineDecorations({});
+    decorations = editor.getLineDecorations({ avoidOverflow: true });
+    decorations = editor.getLineDecorations({ avoidOverflow: true, class: "test-class",
+        item: element, onlyEmpty: true, onlyHead: true, onlyNonEmpty: true,
+        position: "before" });
+
+    decorations = editor.getLineNumberDecorations();
+    decorations = editor.getLineNumberDecorations({});
+    decorations = editor.getLineNumberDecorations({ onlyHead: true });
+    decorations = editor.getLineNumberDecorations({ avoidOverflow: true,
+        class: "test-class", gutterName: "gutterName", item: element, onlyEmpty: true,
+        onlyHead: true, onlyNonEmpty: true, position: "before" });
+
+    decorations = editor.getHighlightDecorations();
+    decorations = editor.getHighlightDecorations({});
+    decorations = editor.getHighlightDecorations({ onlyHead: true });
+    decorations = editor.getHighlightDecorations({ avoidOverflow: true,
+        class: "test-class", item: element, onlyEmpty: true, onlyHead: true, onlyNonEmpty: true,
+        position: "before" });
+
+    decorations = editor.getOverlayDecorations();
+    decorations = editor.getOverlayDecorations({});
+    decorations = editor.getOverlayDecorations({ onlyHead: true });
+    decorations = editor.getOverlayDecorations({ avoidOverflow: true,
+        class: "test-class", item: element, onlyEmpty: true, onlyHead: true, onlyNonEmpty: true,
+        position: "before" });
+
+    // Markers
+    displayMarker = editor.markBufferRange(range);
+    displayMarker = editor.markBufferRange([pos, pos]);
+    displayMarker = editor.markBufferRange([pos, [0, 0]]);
+    displayMarker = editor.markBufferRange([[0, 0], pos]);
+    displayMarker = editor.markBufferRange([[0, 0], [0, 0]]);
+    displayMarker = editor.markBufferRange(range, {});
+    displayMarker = editor.markBufferRange(range, { invalidate: "surround" });
+    displayMarker = editor.markBufferRange(range, { maintainHistory: true });
+    displayMarker = editor.markBufferRange(range, { reversed: true });
+    displayMarker = editor.markBufferRange([[0, 0], [0, 0]], { invalidate: "overlap" });
+    displayMarker = editor.markBufferRange(range, { invalidate: "surround",
+        maintainHistory: false, reversed: false });
+
+    displayMarker = editor.markBufferPosition(pos);
+    displayMarker = editor.markBufferPosition([0, 0]);
+    displayMarker = editor.markBufferPosition(pos, {});
+    displayMarker = editor.markBufferPosition(pos, { invalidate: "never" });
+    displayMarker = editor.markBufferPosition([0, 0], { invalidate: "surround" });
+
+    displayMarker = editor.markScreenPosition(pos);
+    displayMarker = editor.markScreenPosition([0, 0]);
+    displayMarker = editor.markScreenPosition(pos, {});
+    displayMarker = editor.markScreenPosition(pos, { invalidate: "never" });
+    displayMarker = editor.markScreenPosition(pos, { clipDirection: "forward" });
+    displayMarker = editor.markScreenPosition([0, 0], { invalidate: "surround",
+        clipDirection: "backward" });
+
+    displayMarkers = editor.findMarkers({ startBufferRow: 42 });
+    displayMarkers = editor.findMarkers({ endBufferRow: 42 });
+    displayMarkers = editor.findMarkers({ containsBufferRange: range });
+    displayMarkers = editor.findMarkers({ containsBufferRange: [pos, pos] });
+    displayMarkers = editor.findMarkers({ containsBufferRange: [pos, [0, 0]] });
+    displayMarkers = editor.findMarkers({ containsBufferRange: [[0, 0], pos] });
+    displayMarkers = editor.findMarkers({ containsBufferRange: [[0, 0], [0, 0]] });
+    displayMarkers = editor.findMarkers({ containsBufferPosition: pos });
+    displayMarkers = editor.findMarkers({ containsBufferPosition: [42, 42] });
+    displayMarkers = editor.findMarkers({
+        startBufferPosition: pos,
+        endBufferPosition: pos,
+        startScreenPosition: pos,
+        endScreenPosition: pos,
+        startsInBufferRange: range,
+        endsInBufferRange: range,
+        startsInScreenRange: range,
+        endsInScreenRange: range,
+        startBufferRow: 42,
+        endBufferRow: 42,
+        startScreenRow: 42,
+        endScreenRow: 42,
+        intersectsBufferRowRange: [42, 42],
+        intersectsScreenRowRange: [42, 42],
+        containsBufferRange: range,
+        containsBufferPosition: pos,
+        containedInBufferRange: range,
+        containedInScreenRange: range,
+        intersectsBufferRange: range,
+        intersectsScreenRange: range,
+    });
+
+    displayMarkerLayer = editor.addMarkerLayer();
+    displayMarkerLayer = editor.addMarkerLayer({});
+    displayMarkerLayer = editor.addMarkerLayer({ maintainHistory: true });
+    displayMarkerLayer = editor.addMarkerLayer({ persistent: true });
+    displayMarkerLayer = editor.addMarkerLayer({ maintainHistory: true, persistent: true });
+
+    const potentialMarkerLayer = editor.getMarkerLayer(42);
+    if (potentialMarkerLayer) {
+        displayMarkerLayer = potentialMarkerLayer;
+    }
+
+    displayMarkerLayer = editor.getDefaultMarkerLayer();
+    displayMarker = editor.getMarker(42);
+    displayMarkers = editor.getMarkers();
+    num = editor.getMarkerCount();
+
+    // Cursors
+    pos = editor.getCursorBufferPosition();
+    posArr = editor.getCursorBufferPositions();
+
+    editor.setCursorBufferPosition(pos);
+    editor.setCursorBufferPosition(pos, {});
+    editor.setCursorBufferPosition(pos, { autoscroll: true });
+    editor.setCursorBufferPosition([0, 0], { autoscroll: true });
+
+    let potentialCursor = editor.getCursorAtScreenPosition(pos);
+    if (potentialCursor) {
+        cursor = potentialCursor;
+    }
+
+    potentialCursor = editor.getCursorAtScreenPosition([0, 0]);
+    if (potentialCursor) {
+        cursor = potentialCursor;
+    }
+
+    pos = editor.getCursorScreenPosition();
+    posArr = editor.getCursorScreenPositions();
+
+    editor.setCursorScreenPosition(pos);
+    editor.setCursorScreenPosition([0, 0]);
+    editor.setCursorScreenPosition(pos, {});
+    editor.setCursorBufferPosition(pos, { autoscroll: true });
+
+    cursor = editor.addCursorAtBufferPosition(pos);
+    cursor = editor.addCursorAtBufferPosition([0, 0]);
+
+    cursor = editor.addCursorAtScreenPosition(pos);
+    cursor = editor.addCursorAtScreenPosition([0, 0]);
+
+    bool = editor.hasMultipleCursors();
+
+    editor.moveUp();
+    editor.moveUp(42);
+
+    editor.moveDown();
+    editor.moveDown(42);
+
+    editor.moveLeft();
+    editor.moveLeft(42);
+
+    editor.moveRight();
+    editor.moveRight(42);
+
+    editor.moveToBeginningOfLine();
+    editor.moveToBeginningOfScreenLine();
+    editor.moveToFirstCharacterOfLine();
+    editor.moveToEndOfLine();
+    editor.moveToEndOfScreenLine();
+    editor.moveToBeginningOfWord();
+    editor.moveToEndOfWord();
+    editor.moveToTop();
+    editor.moveToBottom();
+    editor.moveToBeginningOfNextWord();
+    editor.moveToPreviousWordBoundary();
+    editor.moveToNextWordBoundary();
+    editor.moveToPreviousSubwordBoundary();
+    editor.moveToNextSubwordBoundary();
+    editor.moveToBeginningOfNextParagraph();
+    editor.moveToBeginningOfPreviousParagraph();
+    cursor = editor.getLastCursor();
+
+    str = editor.getWordUnderCursor();
+    str = editor.getWordUnderCursor({});
+    str = editor.getWordUnderCursor({ allowPrevious: true });
+    str = editor.getWordUnderCursor({ includeNonWordCharacters: true });
+    str = editor.getWordUnderCursor({ wordRegex: /r/ });
+    str = editor.getWordUnderCursor({ allowPrevious: true, includeNonWordCharacters: true,
+        wordRegex: /r/ });
+
+    cursors = editor.getCursors();
+    cursors = editor.getCursorsOrderedByBufferPosition();
+
+    // Selections
+    str = editor.getSelectedText();
+    range = editor.getSelectedBufferRange();
+    ranges = editor.getSelectedBufferRanges();
+
+    editor.setSelectedBufferRange(range);
+    editor.setSelectedBufferRange(range, {});
+    editor.setSelectedBufferRange(range, { preserveFolds: true });
+    editor.setSelectedBufferRange(range, { reversed: true });
+    editor.setSelectedBufferRange(range, { preserveFolds: true, reversed: true });
+    editor.setSelectedBufferRange([pos, pos]);
+    editor.setSelectedBufferRange([pos, [0, 0]]);
+    editor.setSelectedBufferRange([[0, 0], pos]);
+    editor.setSelectedBufferRange([[0, 0], [0, 0]]);
+
+    editor.setSelectedBufferRanges(ranges);
+    editor.setSelectedBufferRanges([[pos, pos]]);
+    editor.setSelectedBufferRanges([[pos, [0, 0]]]);
+    editor.setSelectedBufferRanges([[[0, 0], pos]]);
+    editor.setSelectedBufferRanges([[[0, 0], [0, 0]]]);
+    editor.setSelectedBufferRanges(ranges, {});
+    editor.setSelectedBufferRanges([[pos, pos]], {});
+    editor.setSelectedBufferRanges(ranges, { reversed: true });
+    editor.setSelectedBufferRanges([[pos, pos]], { preserveFolds: true });
+    editor.setSelectedBufferRanges([[pos, pos]], { reversed: true, preserveFolds: true });
+
+    range = editor.getSelectedScreenRange();
+    ranges = editor.getSelectedScreenRanges();
+
+    editor.setSelectedScreenRange(range);
+    editor.setSelectedScreenRange([pos, pos]);
+    editor.setSelectedScreenRange([pos, [0, 0]]);
+    editor.setSelectedScreenRange([[0, 0], pos]);
+    editor.setSelectedScreenRange([[0, 0], [0, 0]]);
+    editor.setSelectedScreenRange(range, {});
+    editor.setSelectedScreenRange([pos, pos], {});
+    editor.setSelectedScreenRange(range, { reversed: true });
+    editor.setSelectedScreenRange([pos, pos], { reversed: true });
+
+    editor.setSelectedScreenRanges(ranges);
+    editor.setSelectedScreenRanges([[pos, pos]]);
+    editor.setSelectedScreenRanges([[pos, [0, 0]]]);
+    editor.setSelectedScreenRanges([[[0, 0], pos]]);
+    editor.setSelectedScreenRanges([[[0, 0], [0, 0]]]);
+    editor.setSelectedScreenRanges(ranges, {});
+    editor.setSelectedScreenRanges([[pos, pos]], {});
+    editor.setSelectedScreenRanges(ranges, { reversed: true });
+    editor.setSelectedScreenRanges([[pos, pos]], { reversed: true });
+
+    selection = editor.addSelectionForBufferRange(range);
+    selection = editor.addSelectionForBufferRange([pos, pos]);
+    selection = editor.addSelectionForBufferRange([pos, [0, 0]]);
+    selection = editor.addSelectionForBufferRange([[0, 0], pos]);
+    selection = editor.addSelectionForBufferRange([[0, 0], [0, 0]]);
+    selection = editor.addSelectionForBufferRange(range, {});
+    selection = editor.addSelectionForBufferRange(range, { preserveFolds: true });
+    selection = editor.addSelectionForBufferRange(range, { reversed: true });
+    selection = editor.addSelectionForBufferRange(range, { preserveFolds: false,
+        reversed: false });
+    selection = editor.addSelectionForBufferRange([pos, pos], { preserveFolds: false });
+
+    selection = editor.addSelectionForScreenRange(range);
+    selection = editor.addSelectionForScreenRange([pos, pos]);
+    selection = editor.addSelectionForScreenRange([pos, [0, 0]]);
+    selection = editor.addSelectionForScreenRange([[0, 0], pos]);
+    selection = editor.addSelectionForScreenRange([[0, 0], [0, 0]]);
+    selection = editor.addSelectionForScreenRange(range, {});
+    selection = editor.addSelectionForScreenRange(range, { preserveFolds: true });
+    selection = editor.addSelectionForScreenRange(range, { reversed: true });
+    selection = editor.addSelectionForScreenRange(range, { preserveFolds: false,
+        reversed: false });
+    selection = editor.addSelectionForScreenRange([pos, pos], { preserveFolds: false });
+
+    editor.selectToBufferPosition(pos);
+    editor.selectToScreenPosition(pos);
+
+    editor.selectUp();
+    editor.selectUp(42);
+
+    editor.selectDown();
+    editor.selectDown(42);
+
+    editor.selectLeft();
+    editor.selectLeft(42);
+
+    editor.selectRight();
+    editor.selectRight(42);
+
+    editor.selectToTop();
+    editor.selectToBottom();
+    editor.selectAll();
+    editor.selectToBeginningOfLine();
+    editor.selectToFirstCharacterOfLine();
+    editor.selectToEndOfLine();
+    editor.selectToBeginningOfWord();
+    editor.selectToEndOfWord();
+    editor.selectLinesContainingCursors();
+    editor.selectWordsContainingCursors();
+    editor.selectToPreviousSubwordBoundary();
+    editor.selectToNextSubwordBoundary();
+    editor.selectToPreviousWordBoundary();
+    editor.selectToNextWordBoundary();
+    editor.selectToBeginningOfNextWord();
+    editor.selectToBeginningOfNextParagraph();
+    editor.selectToBeginningOfPreviousParagraph();
+
+    const potentialRange = editor.selectMarker(displayMarker);
+    if (potentialRange) {
+        range = potentialRange;
+    }
+
+    selection = editor.getLastSelection();
+    selections = editor.getSelections();
+    selections = editor.getSelectionsOrderedByBufferPosition();
+    bool = editor.selectionIntersectsBufferRange(range); // not range-compatible
+
+    // Searching and Replacing
+    editor.scan(/r/, params => {
+        num = params.match.index;
+        str = params.matchText;
+        range = params.range;
+        params.replace("Test");
+        params.stop();
+    });
+
+    editor.scan(/r/, {}, () => {});
+    editor.scan(/r/, { leadingContextLineCount: 42 }, () => {});
+    editor.scan(/r/, { trailingContextLineCount: 42 }, () => {});
+    editor.scan(/r/, { leadingContextLineCount: 42, trailingContextLineCount: 42 },
+        () => {});
+
+    editor.scanInBufferRange(/r/, range, () => {});
+    editor.scanInBufferRange(/r/, [pos, pos], () => {});
+    editor.scanInBufferRange(/r/, [pos, [0, 0]], () => {});
+    editor.scanInBufferRange(/r/, [[0, 0], pos], () => {});
+    editor.scanInBufferRange(/r/, [[0, 0], [0, 0]], () => {});
+    editor.scanInBufferRange(/r/, range, params => {
+        num = params.match.index;
+        str = params.matchText;
+        range = params.range;
+        params.replace("Test");
+        params.stop();
+    });
+
+    editor.backwardsScanInBufferRange(/r/, range, () => {});
+    editor.backwardsScanInBufferRange(/r/, [pos, pos], () => {});
+    editor.backwardsScanInBufferRange(/r/, [pos, [0, 0]], () => {});
+    editor.backwardsScanInBufferRange(/r/, [[0, 0], pos], () => {});
+    editor.backwardsScanInBufferRange(/r/, [[0, 0], [0, 0]], () => {});
+    editor.backwardsScanInBufferRange(/r/, range, params => {
+        num = params.match.index;
+        str = params.matchText;
+        range = params.range;
+        params.replace("Test");
+        params.stop();
+    });
+
+    // Tab Behavior
+    bool = editor.getSoftTabs();
+    editor.setSoftTabs(true);
+    bool = editor.toggleSoftTabs();
+    num = editor.getTabLength();
+    editor.setTabLength(42);
+
+    const potentialBool = editor.usesSoftTabs();
+    if (potentialBool) {
+        bool = potentialBool;
+    }
+
+    str = editor.getTabText();
+
+    // Soft Wrap Behavior
+    bool = editor.isSoftWrapped();
+    editor.setSoftWrapped(true);
+    bool = editor.toggleSoftWrapped();
+    num = editor.getSoftWrapColumn();
+
+    // Indentation
+    num = editor.indentationForBufferRow(42);
+
+    editor.setIndentationForBufferRow(42, 42);
+    editor.setIndentationForBufferRow(42, 42, {});
+    editor.setIndentationForBufferRow(42, 42, { preserveLeadingWhitespace: true });
+
+    editor.indentSelectedRows();
+    editor.outdentSelectedRows();
+    num = editor.indentLevelForLine("Test");
+    editor.autoIndentSelectedRows();
+
+    // Grammars
+    grammar = editor.getGrammar();
+    editor.setGrammar(grammar);
+
+    // Managing Syntax Scopes
+    scopeDescriptor = editor.getRootScopeDescriptor();
+
+    scopeDescriptor = editor.scopeDescriptorForBufferPosition(pos);
+    scopeDescriptor = editor.scopeDescriptorForBufferPosition([0, 0]);
+
+    range = editor.bufferRangeForScopeAtCursor("selector");
+    bool = editor.isBufferRowCommented(42);
+
+    // Clipboard Operations
+    editor.copySelectedText();
+    editor.cutSelectedText();
+
+    editor.pasteText();
+    editor.pasteText({});
+    editor.pasteText({ autoIndentNewline: true });
+    editor.pasteText({ autoIndent: true });
+    editor.pasteText({ autoDecreaseIndent: true });
+    editor.pasteText({ normalizeLineEndings: true });
+    editor.pasteText({ select: true });
+    editor.pasteText({ undo: "skip" });
+    editor.pasteText({ autoIndentNewline: true, autoIndent: true, autoDecreaseIndent: true,
+        normalizeLineEndings: true, select: true, undo: "skip" });
+
+    editor.cutToEndOfLine();
+    editor.cutToEndOfBufferLine();
+
+    // Folds
+    editor.foldCurrentRow();
+    editor.unfoldCurrentRow();
+    editor.foldBufferRow(42);
+    editor.unfoldBufferRow(42);
+    editor.foldSelectedLines();
+    editor.foldAll();
+    editor.unfoldAll();
+    editor.foldAllAtIndentLevel(42);
+    editor.isFoldableAtBufferRow(42);
+    editor.isFoldableAtScreenRow(42);
+    editor.toggleFoldAtBufferRow(42);
+    editor.isFoldedAtCursorRow();
+    editor.isFoldedAtBufferRow(42);
+    editor.isFoldedAtScreenRow(42);
+
+    // Gutters
+    editor.addGutter({ name: "Test" });
+    editor.addGutter({ name: "Test", priority: 42 });
+    editor.addGutter({ name: "Test", visible: true });
+    editor.addGutter({ name: "Test", priority: 42, visible: true });
+
+    gutters = editor.getGutters();
+
+    const potentialGutter = editor.gutterWithName("test-gutter");
+    if (potentialGutter) {
+        gutter = potentialGutter;
+    }
+
+    editor.scrollToCursorPosition();
+    editor.scrollToCursorPosition({});
+    editor.scrollToCursorPosition({ center: true });
+
+    editor.scrollToBufferPosition(pos);
+    editor.scrollToBufferPosition([0, 0]);
+    editor.scrollToBufferPosition(pos, {});
+    editor.scrollToBufferPosition([0, 0], {});
+    editor.scrollToBufferPosition(pos, { center: true });
+    editor.scrollToBufferPosition([0, 0], { center: true });
+
+    editor.scrollToScreenPosition(pos);
+    editor.scrollToScreenPosition([0, 0]);
+    editor.scrollToScreenPosition(pos, {});
+    editor.scrollToScreenPosition([0, 0], {});
+    editor.scrollToScreenPosition(pos, { center: true });
+    editor.scrollToScreenPosition([0, 0], { center: true });
+
+    // TextEditor Rendering
+    str = editor.getPlaceholderText();
+    editor.setPlaceholderText("Test");
+
+    range = editor.bufferRangeForScopeAtPosition('source.js', [0, 0]);
+    range = editor.bufferRangeForScopeAtPosition('source.js', {row: 10, column: 11});
+    range = editor.bufferRangeForScopeAtPosition('source.js', pos);
+
+    let token: {value: string, scopes: string[]};
+    token = editor.tokenForBufferPosition([5, 6]);
+    token = editor.tokenForBufferPosition({row: 0, column: 1});
+    token = editor.tokenForBufferPosition(pos);
+}
+
+// ThemeManager ===============================================================
+function testThemeManager() {
+    // Event Subscription
+    subscription = atom.themes.onDidChangeActiveThemes(() => {});
+
+    // Accessing Loaded Themes
+    let potentialStrs = atom.themes.getLoadedThemeNames();
+    if (potentialStrs) {
+        strs = potentialStrs;
+    }
+
+    let potentialPacks = atom.themes.getLoadedThemes();
+    if (potentialPacks) {
+        packs = potentialPacks;
+    }
+
+    // Accessing Active Themes
+    potentialStrs = atom.themes.getActiveThemeNames();
+    if (potentialStrs) {
+        strs = potentialStrs;
+    }
+
+    potentialPacks = atom.themes.getActiveThemes();
+    if (potentialPacks) {
+        packs = potentialPacks;
+    }
+
+    // Managing Enabled Themes
+    strs = atom.themes.getEnabledThemeNames();
+}
+
+// TooltipManager =============================================================
+function testTooltipManager() {
+    subscription = atom.tooltips.add(element, { title: "Test"});
+    subscription = atom.tooltips.add(element, { title: "<p>Test</p>", html: true });
+    subscription = atom.tooltips.add(element, { item: element});
+    subscription = atom.tooltips.add(element, { class: "test-class" });
+    subscription = atom.tooltips.add(element, { placement: "top" });
+
+    subscription = atom.tooltips.add(element, { placement: () => "auto left" });
+
+    subscription = atom.tooltips.add(element, { trigger: "click" });
+    subscription = atom.tooltips.add(element, { delay: { hide: 42, show: 42 }});
+    subscription = atom.tooltips.add(element, { keyBindingCommand: "test-command",
+        keyBindingTarget: element });
+
+    tooltips = atom.tooltips.findTooltips(element);
+}
+
+// ViewRegistry ===============================================================
+function testViewRegistry() {
+    atom.views.addViewProvider(Atom.Point, (point) => {
+        point.column;
+        return element;
+    });
+
+    element = atom.views.getView(element);
+    textEditorElement = atom.views.getView(editor);
+}
+
+// Workspace ==================================================================
+function testWorkspace() {
+    // Event Subscription
+    subscription = atom.workspace.observeTextEditors(editor => editor.id);
+    subscription = atom.workspace.observePaneItems((item) => {});
+    subscription = atom.workspace.onDidChangeActivePaneItem((item) => {});
+    subscription = atom.workspace.onDidStopChangingActivePaneItem((item) => {});
+
+    subscription = atom.workspace.onDidChangeActiveTextEditor(editor => {
+        if (editor) {
+            editor.id;
+        }
+    });
+
+    subscription = atom.workspace.observeActivePaneItem((item) => {});
+
+    subscription = atom.workspace.observeActiveTextEditor(editor => {
+        if (editor) {
+            editor.id;
+        }
+    });
+
+    subscription = atom.workspace.onDidOpen(event => event.index && event.item &&
+        event.pane && event.uri);
+    subscription = atom.workspace.onDidAddPane(event => event.pane);
+    subscription = atom.workspace.onWillDestroyPane(event => event.pane);
+    subscription = atom.workspace.onDidDestroyPane(event => event.pane);
+    subscription = atom.workspace.observePanes(pane => pane.activate());
+    subscription = atom.workspace.onDidChangeActivePane(pane => pane.activate());
+    subscription = atom.workspace.observeActivePane(pane => pane.activate());
+    subscription = atom.workspace.onDidAddPaneItem(event => event.index && event.item &&
+        event.pane);
+    subscription = atom.workspace.onWillDestroyPaneItem(event => {
+        event.index && event.item && event.pane;
+    });
+    subscription = atom.workspace.onDidDestroyPaneItem(event => event.index &&
+        event.item && event.pane);
+    subscription = atom.workspace.onDidAddTextEditor(event => event.index && event.pane &&
+        event.textEditor);
+
+    // Opening
+    async function workspaceOpen() {
+        obj = await atom.workspace.open();
+        obj = await atom.workspace.open("https://test");
+        obj = await atom.workspace.open("https://test", { activateItem: true });
+        obj = await atom.workspace.open("https://test", { activatePane: true });
+        obj = await atom.workspace.open("https://test", { initialColumn: 42 });
+        obj = await atom.workspace.open("https://test", { initialLine: 42 });
+        obj = await atom.workspace.open("https://test", { location: "right" });
+        obj = await atom.workspace.open("https://test", { split: "up" });
+        obj = await atom.workspace.open("https://test", { pending: true });
+        obj = await atom.workspace.open("https://test", { searchAllPanes: true });
+        obj = await atom.workspace.open("https://test", {
+            activateItem: true,
+            activatePane: true,
+            initialColumn: 42,
+            initialLine: 42,
+            location: "left",
+            split: "left",
+            pending: true,
+            searchAllPanes: true,
+        });
+    }
+
+    bool = atom.workspace.hide("https://test");
+    bool = atom.workspace.hide(element);
+
+    async function workspaceToggle() {
+        await atom.workspace.toggle("https://test");
+        await atom.workspace.toggle(element);
+    }
+
+    obj = atom.workspace.createItemForURI("https://test");
+
+    if (atom.workspace.isTextEditor(obj)) {
+      const textEditor: Atom.TextEditor = obj;
+    }
+
+    async function workspaceReopen() {
+        const result = await atom.workspace.reopenItem();
+        if (result) obj = result;
+    }
+
+    atom.workspace.addOpener((uri) => {
+        if (uri === "test://") {
+            return {
+                getTitle: () => "Test Title",
+            };
+        }
+    });
+
+    atom.workspace.buildTextEditor(obj);
+
+    // Pane Items
+    objs = atom.workspace.getPaneItems();
+    obj = atom.workspace.getActivePaneItem();
+    editors = atom.workspace.getTextEditors();
+
+    const potentialEditor = atom.workspace.getActiveTextEditor();
+    if (potentialEditor) {
+        editor = potentialEditor;
+    }
+
+    // Panes
+    paneContainer = atom.workspace.getActivePaneContainer();
+    panes = atom.workspace.getPanes();
+    pane = atom.workspace.getActivePane();
+    bool = atom.workspace.activateNextPane();
+    bool = atom.workspace.activatePreviousPane();
+
+    let potentialPaneContainer = atom.workspace.paneContainerForURI("https://test");
+    if (potentialPaneContainer) {
+        paneContainer = potentialPaneContainer;
+    }
+
+    potentialPaneContainer = atom.workspace.paneContainerForItem(element);
+    if (potentialPaneContainer) {
+        paneContainer = potentialPaneContainer;
+    }
+
+    let potentialPane = atom.workspace.paneForURI("https://test");
+    if (potentialPane) {
+        pane = potentialPane;
+    }
+
+    potentialPane = atom.workspace.paneForItem(element);
+    if (potentialPane) {
+        pane = potentialPane;
+    }
+
+    // Pane Locations
+    workspaceCenter = atom.workspace.getCenter();
+    dock = atom.workspace.getLeftDock();
+    dock = atom.workspace.getRightDock();
+    dock = atom.workspace.getBottomDock();
+
+    // Panels
+    panels = atom.workspace.getBottomPanels();
+
+    panel = atom.workspace.addBottomPanel({ item: element });
+    panel = atom.workspace.addBottomPanel({ item: element, priority: 100, visible: true });
+
+    panels = atom.workspace.getLeftPanels();
+
+    panel = atom.workspace.addLeftPanel({ item: element });
+    panel = atom.workspace.addLeftPanel({ item: element, priority: 100, visible: true });
+
+    panels = atom.workspace.getRightPanels();
+
+    panel = atom.workspace.addRightPanel({ item: element });
+    panel = atom.workspace.addRightPanel({ item: element, priority: 100, visible: true });
+
+    panels = atom.workspace.getTopPanels();
+
+    panel = atom.workspace.addTopPanel({ item: element });
+    panel = atom.workspace.addTopPanel({ item: element, priority: 100, visible: true });
+
+    panels = atom.workspace.getHeaderPanels();
+
+    panel = atom.workspace.addHeaderPanel({ item: element });
+    panel = atom.workspace.addHeaderPanel({ item: element, priority: 100, visible: true });
+
+    panels = atom.workspace.getFooterPanels();
+
+    panel = atom.workspace.addFooterPanel({ item: element });
+    panel = atom.workspace.addFooterPanel({ item: element, priority: 100, visible: true });
+
+    panels = atom.workspace.getModalPanels();
+
+    panel = atom.workspace.addModalPanel({ item: element });
+    panel = atom.workspace.addModalPanel({ item: element, priority: 100, visible: true });
+
+    const potentialPanel = atom.workspace.panelForItem(element);
+    if (potentialPanel) {
+        panel = potentialPanel;
+    }
+
+    const scanResults = atom.workspace.scan(/r/, () => {});
+    scanResults.cancel();
+
+    // Searching and Replacing
+    async function workspaceScan() {
+        await scanResults;
+
+        const scanOptions = {
+            onPathsSearched: (pathsSearched: number) => {},
+            leadingContextLineCount: 5,
+            trailingContextLineCount: 5,
+            paths: ["a"],
+        };
+        await atom.workspace.scan(/r/, scanOptions, (results) => {
+            str = results.filePath;
+            for (const match of results.matches) {
+                range = Atom.Range.fromObject(match.range);
+                strs = match.leadingContextLines;
+                strs = match.trailingContextLines;
+            }
+        });
+    }
+
+    async function workspaceReplace() {
+        await atom.workspace.replace(/r/, "Test", ["a"], (options) => {});
+    }
+}
+
+// WorkspaceCenter ============================================================
+function testWorkspaceCenter() {
+    // Event Subscription
+    subscription = workspaceCenter.observeTextEditors(editor => editor.id);
+    subscription = workspaceCenter.observePaneItems(item => {});
+    subscription = workspaceCenter.onDidChangeActivePaneItem(item => {});
+    subscription = workspaceCenter.onDidStopChangingActivePaneItem(item => {});
+    subscription = workspaceCenter.observeActivePaneItem(item => {});
+
+    // Pane Items
+    objs = workspaceCenter.getPaneItems();
+    workspaceCenter.getActivePaneItem();
+    editors = workspaceCenter.getTextEditors();
+
+    const potentialEditor = workspaceCenter.getActiveTextEditor();
+    if (potentialEditor) {
+        editor = potentialEditor;
+    }
+
+    // Panes
+    panes = workspaceCenter.getPanes();
+    pane = workspaceCenter.getActivePane();
+    workspaceCenter.activateNextPane();
+    workspaceCenter.activatePreviousPane();
+}
+
+// watchPath ==================================================================
+const pathWatcherPromise = Atom.watchPath("/var/test", {}, (events) => {
+    for (const event of events) {
+        str = event.path;
+        str = event.action;
+        if (event.oldPath) str = event.oldPath;
+    }
 });
 
-sub = editor.onDidStopChanging(event => {
-	for (const change of event.changes) {
-		change.newExtent && change.oldExtent && change.newRange && change.oldRange &&
-		change.newText && change.oldText && change.start;
-	}
-});
+// TextEditorElement ==========================================================
+function testTextEditorElement() {
+  textEditorComponent = textEditorElement.getComponent();
+  editor = textEditorElement.getModel();
 
-sub = editor.onDidChangeCursorPosition(event => event.newBufferPosition);
-sub = editor.onDidChangeSelectionRange(event => event.selection);
-sub = editor.onDidSave(event => event.path);
-sub = editor.onDidDestroy(() => {});
-sub = editor.observeGutters(gutter => gutter.show());
-sub = editor.onDidAddGutter(gutter => gutter.hide());
-sub = editor.onDidRemoveGutter(name => name.length);
-sub = editor.onDidChangeSoftWrapped(softWrapped => {});
-sub = editor.onDidChangeEncoding(encoding => {});
-sub = editor.observeGrammar(grammar => grammar.name);
-sub = editor.onDidChangeGrammar(grammar => grammar.scopeName);
-sub = editor.onDidChangeModified(modified => {});
-sub = editor.onDidConflict(() => {});
-sub = editor.onWillInsertText(event => event.cancel && event.text);
-sub = editor.onDidInsertText(event => event.text);
-sub = editor.observeCursors(cursor => cursor.moveToBottom());
-sub = editor.onDidAddCursor(cursor => cursor.getMarker());
-sub = editor.onDidRemoveCursor(cursor => cursor.compare(cursor));
-sub = editor.observeSelections(selection => selection.cutToEndOfBufferLine());
-sub = editor.onDidAddSelection(selection => selection.selectWord());
-sub = editor.onDidRemoveSelection(selection => selection.toggleLineComments());
-sub = editor.observeDecorations(decoration => decoration.getId());
-sub = editor.onDidAddDecoration(decoration => decoration.id);
-sub = editor.onDidRemoveDecoration(decoration => decoration.getId());
-sub = editor.onDidChangePlaceholderText(placeholderText =>
-	placeholderText.toLowerCase());
-buffer = editor.getBuffer();
+  textEditorElement.getNextUpdatePromise().then(() => {});
+  let num: number = textEditorElement.getBaseCharacterWidth();
 
-// File Details
-str = editor.getTitle();
-str = editor.getLongTitle();
+  textEditorElement.scrollToTop();
+  textEditorElement.scrollToBottom();
+  textEditorElement.setScrollTop(num);
+  num = textEditorElement.getScrollTop();
+  textEditorElement.setScrollLeft(num);
+  num = textEditorElement.getScrollLeft();
+  num = textEditorElement.getScrollHeight();
 
-const filePath = editor.getPath();
-if (filePath) {
-	str = filePath;
+  pixelPos = textEditorElement.pixelPositionForBufferPosition(pos);
+  pixelPos = textEditorElement.pixelPositionForScreenPosition({row: 1, column: 2});
+  pixelPos = textEditorElement.pixelPositionForScreenPosition(pos);
+
+  subscription = textEditorElement.onDidChangeScrollTop((scrollTop: number) => {});
+  subscription = textEditorElement.onDidChangeScrollLeft((scrollLeft: number) => {});
+  subscription = textEditorElement.onDidAttach(() => {});
+  subscription = textEditorElement.onDidDetach(() => {});
+
+  textEditorElement = document.createElement('atom-text-editor');
 }
 
-bool = editor.isModified();
-bool = editor.isEmpty();
-str = editor.getEncoding();
-editor.setEncoding("utf8");
-
-// File Operations
-async function saveEditor() {
-	await editor.save();
-	await editor.saveAs("test.file");
+// TextEditorComponent ========================================================
+function testTextEditorComponent() {
+  pixelPos = textEditorComponent.pixelPositionForMouseEvent(mouseEvent);
+  pixelPos = textEditorComponent.pixelPositionForScreenPosition(pos);
+  pos = textEditorComponent.screenPositionForMouseEvent(mouseEvent);
+  pos = textEditorComponent.screenPositionForPixelPosition(pixelPos);
 }
-
-// Reading Text
-str = editor.getText();
-str = editor.getTextInBufferRange(range);
-num = editor.getLineCount();
-num = editor.getScreenLineCount();
-num = editor.getLastBufferRow();
-num = editor.getLastScreenRow();
-str = editor.lineTextForBufferRow(42);
-str = editor.lineTextForScreenRow(42);
-range = editor.getCurrentParagraphBufferRange();
-
-// Mutating Text
-editor.setText("Test");
-
-editor.setTextInBufferRange(range, "Test");
-editor.setTextInBufferRange([pos, pos], "Test");
-editor.setTextInBufferRange([pos, [0, 0]], "Test");
-editor.setTextInBufferRange([[0, 0], pos], "Test");
-editor.setTextInBufferRange([[0, 0], [0, 0]], "Test");
-editor.setTextInBufferRange(range, "Test", {});
-editor.setTextInBufferRange([pos, pos], "Test", { normalizeLineEndings: true });
-editor.setTextInBufferRange(range, "Test", { normalizeLineEndings: true,
-	undo: "skip" });
-
-editor.insertText("Test");
-editor.insertText("Test", {});
-editor.insertText("Test", { autoDecreaseIndent: true });
-editor.insertText("Test", { autoIndent: true });
-editor.insertText("Test", { autoIndentNewline: true });
-editor.insertText("Test", { normalizeLineEndings: true });
-editor.insertText("Test", { select: true });
-editor.insertText("Test", { undo: "skip" });
-editor.insertText("Text", { autoDecreaseIndent: false, autoIndent: false,
-	autoIndentNewline: false, normalizeLineEndings: false, select: false, undo: "skip" });
-
-editor.insertNewline();
-editor.delete();
-editor.backspace();
-editor.mutateSelectedText((selection, index) => { selection.clear(); });
-editor.transpose();
-editor.upperCase();
-editor.lowerCase();
-editor.toggleLineCommentsInSelection();
-editor.insertNewlineBelow();
-editor.insertNewlineAbove();
-editor.deleteToBeginningOfWord();
-editor.deleteToPreviousWordBoundary();
-editor.deleteToNextWordBoundary();
-editor.deleteToBeginningOfSubword();
-editor.deleteToEndOfSubword();
-editor.deleteToBeginningOfLine();
-editor.deleteToEndOfLine();
-editor.deleteToEndOfWord();
-editor.deleteLine();
-
-// History
-editor.undo();
-editor.redo();
-
-editor.transact(() => {});
-editor.transact(42, () => {});
-
-editor.abortTransaction();
-num = editor.createCheckpoint();
-bool = editor.revertToCheckpoint(42);
-bool = editor.groupChangesSinceCheckpoint(42);
-
-// TextEditor Coordinates
-pos = editor.screenPositionForBufferPosition(pos);
-pos = editor.screenPositionForBufferPosition([0, 0]);
-pos = editor.screenPositionForBufferPosition(pos, {});
-pos = editor.screenPositionForBufferPosition(pos, { clipDirection: "backward" });
-pos = editor.screenPositionForBufferPosition([0, 0], { clipDirection: "forward" });
-
-pos = editor.bufferPositionForScreenPosition(pos);
-pos = editor.bufferPositionForScreenPosition([0, 0]);
-pos = editor.bufferPositionForScreenPosition(pos, {});
-pos = editor.bufferPositionForScreenPosition(pos, { clipDirection: "backward" });
-pos = editor.bufferPositionForScreenPosition([0, 0], { clipDirection: "forward" });
-
-range = editor.screenRangeForBufferRange(range);
-range = editor.screenRangeForBufferRange([pos, pos]);
-range = editor.screenRangeForBufferRange([pos, [0, 0]]);
-range = editor.screenRangeForBufferRange([[0, 0], pos]);
-range = editor.screenRangeForBufferRange([[0, 0], [0, 0]]);
-
-range = editor.bufferRangeForScreenRange(range);
-range = editor.bufferRangeForScreenRange([pos, pos]);
-range = editor.bufferRangeForScreenRange([pos, [0, 0]]);
-range = editor.bufferRangeForScreenRange([[0, 0], pos]);
-range = editor.bufferRangeForScreenRange([[0, 0], [0, 0]]);
-
-pos = editor.clipBufferPosition(pos);
-pos = editor.clipBufferPosition([0, 0]);
-
-range = editor.clipBufferRange(range);
-range = editor.clipBufferRange([pos, pos]);
-range = editor.clipBufferRange([pos, [0, 0]]);
-range = editor.clipBufferRange([[0, 0], pos]);
-range = editor.clipBufferRange([[0, 0], [0, 0]]);
-
-pos = editor.clipScreenPosition(pos);
-pos = editor.clipScreenPosition([0, 0]);
-pos = editor.clipScreenPosition(pos, {});
-pos = editor.clipScreenPosition(pos, { clipDirection: "closest" });
-pos = editor.clipScreenPosition([0, 0], { clipDirection: "closest" });
-
-range = editor.clipScreenRange(range);
-range = editor.clipScreenRange([pos, pos]);
-range = editor.clipScreenRange([pos, [0, 0]]);
-range = editor.clipScreenRange([[0, 0], pos]);
-range = editor.clipScreenRange([[0, 0], [0, 0]]);
-range = editor.clipScreenRange(range, {});
-range = editor.clipScreenRange(range, { clipDirection: "closest" });
-range = editor.clipScreenRange([pos, pos], { clipDirection: "closest" });
-
-// Decorations
-decoration = editor.decorateMarker(displayMarker, { type: "line" });
-decoration = editor.decorateMarker(displayMarker, { type: "line", avoidOverflow: true,
-	class: "test-class", gutterName: "gutterName", item: element, onlyEmpty: true,
-	onlyHead: true, onlyNonEmpty: true, position: "before" });
-
-layerDecoration = editor.decorateMarkerLayer(displayMarkerLayer, { type: "line-number" });
-layerDecoration = editor.decorateMarkerLayer(displayMarkerLayer, { type: "line-number",
-	avoidOverflow: false, class: "test-class", item: element, onlyEmpty: false, onlyHead: false,
-	onlyNonEmpty: false, position: "after" });
-
-decorations = editor.getDecorations();
-decorations = editor.getDecorations({});
-decorations = editor.getDecorations({ type: "line-number" });
-decorations = editor.getDecorations({ type: "line", avoidOverflow: true,
-	class: "test-class", gutterName: "gutterName", item: element, onlyEmpty: true,
-	onlyHead: true, onlyNonEmpty: true, position: "before" });
-
-decorations = editor.getLineDecorations();
-decorations = editor.getLineDecorations({});
-decorations = editor.getLineDecorations({ avoidOverflow: true });
-decorations = editor.getLineDecorations({ avoidOverflow: true, class: "test-class",
-	item: element, onlyEmpty: true, onlyHead: true, onlyNonEmpty: true,
-	position: "before" });
-
-decorations = editor.getLineNumberDecorations();
-decorations = editor.getLineNumberDecorations({});
-decorations = editor.getLineNumberDecorations({ onlyHead: true });
-decorations = editor.getLineNumberDecorations({ avoidOverflow: true,
-	class: "test-class", gutterName: "gutterName", item: element, onlyEmpty: true,
-	onlyHead: true, onlyNonEmpty: true, position: "before" });
-
-decorations = editor.getHighlightDecorations();
-decorations = editor.getHighlightDecorations({});
-decorations = editor.getHighlightDecorations({ onlyHead: true });
-decorations = editor.getHighlightDecorations({ avoidOverflow: true,
-	class: "test-class", item: element, onlyEmpty: true, onlyHead: true, onlyNonEmpty: true,
-	position: "before" });
-
-decorations = editor.getOverlayDecorations();
-decorations = editor.getOverlayDecorations({});
-decorations = editor.getOverlayDecorations({ onlyHead: true });
-decorations = editor.getOverlayDecorations({ avoidOverflow: true,
-	class: "test-class", item: element, onlyEmpty: true, onlyHead: true, onlyNonEmpty: true,
-	position: "before" });
-
-// Markers
-displayMarker = editor.markBufferRange(range);
-displayMarker = editor.markBufferRange([pos, pos]);
-displayMarker = editor.markBufferRange([pos, [0, 0]]);
-displayMarker = editor.markBufferRange([[0, 0], pos]);
-displayMarker = editor.markBufferRange([[0, 0], [0, 0]]);
-displayMarker = editor.markBufferRange(range, {});
-displayMarker = editor.markBufferRange(range, { invalidate: "surround" });
-displayMarker = editor.markBufferRange(range, { maintainHistory: true });
-displayMarker = editor.markBufferRange(range, { reversed: true });
-displayMarker = editor.markBufferRange([[0, 0], [0, 0]], { invalidate: "overlap" });
-displayMarker = editor.markBufferRange(range, { invalidate: "surround",
-	maintainHistory: false, reversed: false });
-
-displayMarker = editor.markBufferPosition(pos);
-displayMarker = editor.markBufferPosition([0, 0]);
-displayMarker = editor.markBufferPosition(pos, {});
-displayMarker = editor.markBufferPosition(pos, { invalidate: "never" });
-displayMarker = editor.markBufferPosition([0, 0], { invalidate: "surround" });
-
-displayMarker = editor.markScreenPosition(pos);
-displayMarker = editor.markScreenPosition([0, 0]);
-displayMarker = editor.markScreenPosition(pos, {});
-displayMarker = editor.markScreenPosition(pos, { invalidate: "never" });
-displayMarker = editor.markScreenPosition(pos, { clipDirection: "forward" });
-displayMarker = editor.markScreenPosition([0, 0], { invalidate: "surround",
-	clipDirection: "backward" });
-
-displayMarkers = editor.findMarkers({ startBufferRow: 42 });
-displayMarkers = editor.findMarkers({ endBufferRow: 42 });
-displayMarkers = editor.findMarkers({ containsBufferRange: range });
-displayMarkers = editor.findMarkers({ containsBufferRange: [pos, pos] });
-displayMarkers = editor.findMarkers({ containsBufferRange: [pos, [0, 0]] });
-displayMarkers = editor.findMarkers({ containsBufferRange: [[0, 0], pos] });
-displayMarkers = editor.findMarkers({ containsBufferRange: [[0, 0], [0, 0]] });
-displayMarkers = editor.findMarkers({ containsBufferPosition: pos });
-displayMarkers = editor.findMarkers({ containsBufferPosition: [42, 42] });
-displayMarkers = editor.findMarkers({
-	startBufferPosition: pos,
-	endBufferPosition: pos,
-	startScreenPosition: pos,
-	endScreenPosition: pos,
-	startsInBufferRange: range,
-	endsInBufferRange: range,
-	startsInScreenRange: range,
-	endsInScreenRange: range,
-	startBufferRow: 42,
-	endBufferRow: 42,
-	startScreenRow: 42,
-	endScreenRow: 42,
-	intersectsBufferRowRange: [42, 42],
-	intersectsScreenRowRange: [42, 42],
-	containsBufferRange: range,
-	containsBufferPosition: pos,
-	containedInBufferRange: range,
-	containedInScreenRange: range,
-	intersectsBufferRange: range,
-	intersectsScreenRange: range,
-});
-
-displayMarkerLayer = editor.addMarkerLayer();
-displayMarkerLayer = editor.addMarkerLayer({});
-displayMarkerLayer = editor.addMarkerLayer({ maintainHistory: true });
-displayMarkerLayer = editor.addMarkerLayer({ persistent: true });
-displayMarkerLayer = editor.addMarkerLayer({ maintainHistory: true, persistent: true });
-
-const potentialMarkerLayer = editor.getMarkerLayer(42);
-if (potentialMarkerLayer) {
-	displayMarkerLayer = potentialMarkerLayer;
-}
-
-displayMarkerLayer = editor.getDefaultMarkerLayer();
-displayMarker = editor.getMarker(42);
-displayMarkers = editor.getMarkers();
-num = editor.getMarkerCount();
-
-// Cursors
-pos = editor.getCursorBufferPosition();
-posArr = editor.getCursorBufferPositions();
-
-editor.setCursorBufferPosition(pos);
-editor.setCursorBufferPosition(pos, {});
-editor.setCursorBufferPosition(pos, { autoscroll: true });
-editor.setCursorBufferPosition([0, 0], { autoscroll: true });
-
-let potentialCursor = editor.getCursorAtScreenPosition(pos);
-if (potentialCursor) {
-	cursor = potentialCursor;
-}
-
-potentialCursor = editor.getCursorAtScreenPosition([0, 0]);
-if (potentialCursor) {
-	cursor = potentialCursor;
-}
-
-pos = editor.getCursorScreenPosition();
-posArr = editor.getCursorScreenPositions();
-
-editor.setCursorScreenPosition(pos);
-editor.setCursorScreenPosition([0, 0]);
-editor.setCursorScreenPosition(pos, {});
-editor.setCursorBufferPosition(pos, { autoscroll: true });
-
-cursor = editor.addCursorAtBufferPosition(pos);
-cursor = editor.addCursorAtBufferPosition([0, 0]);
-
-cursor = editor.addCursorAtScreenPosition(pos);
-cursor = editor.addCursorAtScreenPosition([0, 0]);
-
-bool = editor.hasMultipleCursors();
-
-editor.moveUp();
-editor.moveUp(42);
-
-editor.moveDown();
-editor.moveDown(42);
-
-editor.moveLeft();
-editor.moveLeft(42);
-
-editor.moveRight();
-editor.moveRight(42);
-
-editor.moveToBeginningOfLine();
-editor.moveToBeginningOfScreenLine();
-editor.moveToFirstCharacterOfLine();
-editor.moveToEndOfLine();
-editor.moveToEndOfScreenLine();
-editor.moveToBeginningOfWord();
-editor.moveToEndOfWord();
-editor.moveToTop();
-editor.moveToBottom();
-editor.moveToBeginningOfNextWord();
-editor.moveToPreviousWordBoundary();
-editor.moveToNextWordBoundary();
-editor.moveToPreviousSubwordBoundary();
-editor.moveToNextSubwordBoundary();
-editor.moveToBeginningOfNextParagraph();
-editor.moveToBeginningOfPreviousParagraph();
-cursor = editor.getLastCursor();
-
-str = editor.getWordUnderCursor();
-str = editor.getWordUnderCursor({});
-str = editor.getWordUnderCursor({ allowPrevious: true });
-str = editor.getWordUnderCursor({ includeNonWordCharacters: true });
-str = editor.getWordUnderCursor({ wordRegex: /r/ });
-str = editor.getWordUnderCursor({ allowPrevious: true, includeNonWordCharacters: true,
-	wordRegex: /r/ });
-
-cursors = editor.getCursors();
-cursors = editor.getCursorsOrderedByBufferPosition();
-
-// Selections
-str = editor.getSelectedText();
-range = editor.getSelectedBufferRange();
-ranges = editor.getSelectedBufferRanges();
-
-editor.setSelectedBufferRange(range);
-editor.setSelectedBufferRange(range, {});
-editor.setSelectedBufferRange(range, { preserveFolds: true });
-editor.setSelectedBufferRange(range, { reversed: true });
-editor.setSelectedBufferRange(range, { preserveFolds: true, reversed: true });
-editor.setSelectedBufferRange([pos, pos]);
-editor.setSelectedBufferRange([pos, [0, 0]]);
-editor.setSelectedBufferRange([[0, 0], pos]);
-editor.setSelectedBufferRange([[0, 0], [0, 0]]);
-
-editor.setSelectedBufferRanges(ranges);
-editor.setSelectedBufferRanges([[pos, pos]]);
-editor.setSelectedBufferRanges([[pos, [0, 0]]]);
-editor.setSelectedBufferRanges([[[0, 0], pos]]);
-editor.setSelectedBufferRanges([[[0, 0], [0, 0]]]);
-editor.setSelectedBufferRanges(ranges, {});
-editor.setSelectedBufferRanges([[pos, pos]], {});
-editor.setSelectedBufferRanges(ranges, { reversed: true });
-editor.setSelectedBufferRanges([[pos, pos]], { preserveFolds: true });
-editor.setSelectedBufferRanges([[pos, pos]], { reversed: true, preserveFolds: true });
-
-range = editor.getSelectedScreenRange();
-ranges = editor.getSelectedScreenRanges();
-
-editor.setSelectedScreenRange(range);
-editor.setSelectedScreenRange([pos, pos]);
-editor.setSelectedScreenRange([pos, [0, 0]]);
-editor.setSelectedScreenRange([[0, 0], pos]);
-editor.setSelectedScreenRange([[0, 0], [0, 0]]);
-editor.setSelectedScreenRange(range, {});
-editor.setSelectedScreenRange([pos, pos], {});
-editor.setSelectedScreenRange(range, { reversed: true });
-editor.setSelectedScreenRange([pos, pos], { reversed: true });
-
-editor.setSelectedScreenRanges(ranges);
-editor.setSelectedScreenRanges([[pos, pos]]);
-editor.setSelectedScreenRanges([[pos, [0, 0]]]);
-editor.setSelectedScreenRanges([[[0, 0], pos]]);
-editor.setSelectedScreenRanges([[[0, 0], [0, 0]]]);
-editor.setSelectedScreenRanges(ranges, {});
-editor.setSelectedScreenRanges([[pos, pos]], {});
-editor.setSelectedScreenRanges(ranges, { reversed: true });
-editor.setSelectedScreenRanges([[pos, pos]], { reversed: true });
-
-selection = editor.addSelectionForBufferRange(range);
-selection = editor.addSelectionForBufferRange([pos, pos]);
-selection = editor.addSelectionForBufferRange([pos, [0, 0]]);
-selection = editor.addSelectionForBufferRange([[0, 0], pos]);
-selection = editor.addSelectionForBufferRange([[0, 0], [0, 0]]);
-selection = editor.addSelectionForBufferRange(range, {});
-selection = editor.addSelectionForBufferRange(range, { preserveFolds: true });
-selection = editor.addSelectionForBufferRange(range, { reversed: true });
-selection = editor.addSelectionForBufferRange(range, { preserveFolds: false,
-	reversed: false });
-selection = editor.addSelectionForBufferRange([pos, pos], { preserveFolds: false });
-
-selection = editor.addSelectionForScreenRange(range);
-selection = editor.addSelectionForScreenRange([pos, pos]);
-selection = editor.addSelectionForScreenRange([pos, [0, 0]]);
-selection = editor.addSelectionForScreenRange([[0, 0], pos]);
-selection = editor.addSelectionForScreenRange([[0, 0], [0, 0]]);
-selection = editor.addSelectionForScreenRange(range, {});
-selection = editor.addSelectionForScreenRange(range, { preserveFolds: true });
-selection = editor.addSelectionForScreenRange(range, { reversed: true });
-selection = editor.addSelectionForScreenRange(range, { preserveFolds: false,
-	reversed: false });
-selection = editor.addSelectionForScreenRange([pos, pos], { preserveFolds: false });
-
-editor.selectToBufferPosition(pos);
-editor.selectToScreenPosition(pos);
-
-editor.selectUp();
-editor.selectUp(42);
-
-editor.selectDown();
-editor.selectDown(42);
-
-editor.selectLeft();
-editor.selectLeft(42);
-
-editor.selectRight();
-editor.selectRight(42);
-
-editor.selectToTop();
-editor.selectToBottom();
-editor.selectAll();
-editor.selectToBeginningOfLine();
-editor.selectToFirstCharacterOfLine();
-editor.selectToEndOfLine();
-editor.selectToBeginningOfWord();
-editor.selectToEndOfWord();
-editor.selectLinesContainingCursors();
-editor.selectWordsContainingCursors();
-editor.selectToPreviousSubwordBoundary();
-editor.selectToNextSubwordBoundary();
-editor.selectToPreviousWordBoundary();
-editor.selectToNextWordBoundary();
-editor.selectToBeginningOfNextWord();
-editor.selectToBeginningOfNextParagraph();
-editor.selectToBeginningOfPreviousParagraph();
-
-const potentialRange = editor.selectMarker(displayMarker);
-if (potentialRange) {
-	range = potentialRange;
-}
-
-selection = editor.getLastSelection();
-selections = editor.getSelections();
-selections = editor.getSelectionsOrderedByBufferPosition();
-bool = editor.selectionIntersectsBufferRange(range); // not range-compatible
-
-// Searching and Replacing
-editor.scan(/r/, params => {
-	num = params.match.index;
-	str = params.matchText;
-	range = params.range;
-	params.replace("Test");
-	params.stop();
-});
-
-editor.scan(/r/, {}, () => {});
-editor.scan(/r/, { leadingContextLineCount: 42 }, () => {});
-editor.scan(/r/, { trailingContextLineCount: 42 }, () => {});
-editor.scan(/r/, { leadingContextLineCount: 42, trailingContextLineCount: 42 },
-	() => {});
-
-editor.scanInBufferRange(/r/, range, () => {});
-editor.scanInBufferRange(/r/, [pos, pos], () => {});
-editor.scanInBufferRange(/r/, [pos, [0, 0]], () => {});
-editor.scanInBufferRange(/r/, [[0, 0], pos], () => {});
-editor.scanInBufferRange(/r/, [[0, 0], [0, 0]], () => {});
-editor.scanInBufferRange(/r/, range, params => {
-	num = params.match.index;
-	str = params.matchText;
-	range = params.range;
-	params.replace("Test");
-	params.stop();
-});
-
-editor.backwardsScanInBufferRange(/r/, range, () => {});
-editor.backwardsScanInBufferRange(/r/, [pos, pos], () => {});
-editor.backwardsScanInBufferRange(/r/, [pos, [0, 0]], () => {});
-editor.backwardsScanInBufferRange(/r/, [[0, 0], pos], () => {});
-editor.backwardsScanInBufferRange(/r/, [[0, 0], [0, 0]], () => {});
-editor.backwardsScanInBufferRange(/r/, range, params => {
-	num = params.match.index;
-	str = params.matchText;
-	range = params.range;
-	params.replace("Test");
-	params.stop();
-});
-
-// Tab Behavior
-bool = editor.getSoftTabs();
-editor.setSoftTabs(true);
-bool = editor.toggleSoftTabs();
-num = editor.getTabLength();
-editor.setTabLength(42);
-
-const potentialBool = editor.usesSoftTabs();
-if (potentialBool) {
-	bool = potentialBool;
-}
-
-str = editor.getTabText();
-
-// Soft Wrap Behavior
-bool = editor.isSoftWrapped();
-editor.setSoftWrapped(true);
-bool = editor.toggleSoftWrapped();
-num = editor.getSoftWrapColumn();
-
-// Indentation
-num = editor.indentationForBufferRow(42);
-
-editor.setIndentationForBufferRow(42, 42);
-editor.setIndentationForBufferRow(42, 42, {});
-editor.setIndentationForBufferRow(42, 42, { preserveLeadingWhitespace: true });
-
-editor.indentSelectedRows();
-editor.outdentSelectedRows();
-num = editor.indentLevelForLine("Test");
-editor.autoIndentSelectedRows();
-
-// Grammars
-grammar = editor.getGrammar();
-editor.setGrammar(grammar);
-
-// Managing Syntax Scopes
-scopeDescriptor = editor.getRootScopeDescriptor();
-
-scopeDescriptor = editor.scopeDescriptorForBufferPosition(pos);
-scopeDescriptor = editor.scopeDescriptorForBufferPosition([0, 0]);
-
-range = editor.bufferRangeForScopeAtCursor("selector");
-bool = editor.isBufferRowCommented(42);
-
-// Clipboard Operations
-editor.copySelectedText();
-editor.cutSelectedText();
-
-editor.pasteText();
-editor.pasteText({});
-editor.pasteText({ autoIndentNewline: true });
-editor.pasteText({ autoIndent: true });
-editor.pasteText({ autoDecreaseIndent: true });
-editor.pasteText({ normalizeLineEndings: true });
-editor.pasteText({ select: true });
-editor.pasteText({ undo: "skip" });
-editor.pasteText({ autoIndentNewline: true, autoIndent: true, autoDecreaseIndent: true,
-	normalizeLineEndings: true, select: true, undo: "skip" });
-
-editor.cutToEndOfLine();
-editor.cutToEndOfBufferLine();
-
-// Folds
-editor.foldCurrentRow();
-editor.unfoldCurrentRow();
-editor.foldBufferRow(42);
-editor.unfoldBufferRow(42);
-editor.foldSelectedLines();
-editor.foldAll();
-editor.unfoldAll();
-editor.foldAllAtIndentLevel(42);
-editor.isFoldableAtBufferRow(42);
-editor.isFoldableAtScreenRow(42);
-editor.toggleFoldAtBufferRow(42);
-editor.isFoldedAtCursorRow();
-editor.isFoldedAtBufferRow(42);
-editor.isFoldedAtScreenRow(42);
-
-// Gutters
-editor.addGutter({ name: "Test" });
-editor.addGutter({ name: "Test", priority: 42 });
-editor.addGutter({ name: "Test", visible: true });
-editor.addGutter({ name: "Test", priority: 42, visible: true });
-
-gutters = editor.getGutters();
-
-const potentialGutter = editor.gutterWithName("test-gutter");
-if (potentialGutter) {
-	gutter = potentialGutter;
-}
-
-editor.scrollToCursorPosition();
-editor.scrollToCursorPosition({});
-editor.scrollToCursorPosition({ center: true });
-
-editor.scrollToBufferPosition(pos);
-editor.scrollToBufferPosition([0, 0]);
-editor.scrollToBufferPosition(pos, {});
-editor.scrollToBufferPosition([0, 0], {});
-editor.scrollToBufferPosition(pos, { center: true });
-editor.scrollToBufferPosition([0, 0], { center: true });
-
-editor.scrollToScreenPosition(pos);
-editor.scrollToScreenPosition([0, 0]);
-editor.scrollToScreenPosition(pos, {});
-editor.scrollToScreenPosition([0, 0], {});
-editor.scrollToScreenPosition(pos, { center: true });
-editor.scrollToScreenPosition([0, 0], { center: true });
-
-// TextEditor Rendering
-str = editor.getPlaceholderText();
-editor.setPlaceholderText("Test");
-
-//// ThemeManager =============================================================
-// Event Subscription
-sub = atom.themes.onDidChangeActiveThemes(() => {});
-
-// Accessing Loaded Themes
-let potentialStrs = atom.themes.getLoadedThemeNames();
-if (potentialStrs) {
-	strs = potentialStrs;
-}
-
-let potentialPacks = atom.themes.getLoadedThemes();
-if (potentialPacks) {
-	packs = potentialPacks;
-}
-
-// Accessing Active Themes
-potentialStrs = atom.themes.getActiveThemeNames();
-if (potentialStrs) {
-	strs = potentialStrs;
-}
-
-potentialPacks = atom.themes.getActiveThemes();
-if (potentialPacks) {
-	packs = potentialPacks;
-}
-
-// Managing Enabled Themes
-strs = atom.themes.getEnabledThemeNames();
-
-//// TooltipManager ===========================================================
-sub = atom.tooltips.add(element, { title: "Test"});
-sub = atom.tooltips.add(element, { title: "<p>Test</p>", html: true });
-sub = atom.tooltips.add(element, { item: element});
-sub = atom.tooltips.add(element, { class: "test-class" });
-sub = atom.tooltips.add(element, { placement: "top" });
-
-sub = atom.tooltips.add(element, { placement: () => "left" });
-
-sub = atom.tooltips.add(element, { trigger: "click" });
-sub = atom.tooltips.add(element, { delay: { hide: 42, show: 42 }});
-sub = atom.tooltips.add(element, { keyBindingCommand: "test-command",
-	keyBindingTarget: element });
-
-tooltips = atom.tooltips.findTooltips(element);
-
-//// ViewRegistry =============================================================
-atom.views.addViewProvider(Point, (point) => {
-	point.column;
-	return element;
-});
-
-element = atom.views.getView(element);
-
-//// Workspace ================================================================
-// Event Subscription
-sub = atom.workspace.observeTextEditors(editor => editor.id);
-sub = atom.workspace.observePaneItems((item) => {});
-sub = atom.workspace.onDidChangeActivePaneItem((item) => {});
-sub = atom.workspace.onDidStopChangingActivePaneItem((item) => {});
-
-sub = atom.workspace.onDidChangeActiveTextEditor(editor => {
-	if (editor) {
-		editor.id;
-	}
-});
-
-sub = atom.workspace.observeActivePaneItem((item) => {});
-
-sub = atom.workspace.observeActiveTextEditor(editor => {
-	if (editor) {
-		editor.id;
-	}
-});
-
-sub = atom.workspace.onDidOpen(event => event.index && event.item && event.pane &&
-	event.uri);
-sub = atom.workspace.onDidAddPane(event => event.pane);
-sub = atom.workspace.onWillDestroyPane(event => event.pane);
-sub = atom.workspace.onDidDestroyPane(event => event.pane);
-sub = atom.workspace.observePanes(pane => pane.activate());
-sub = atom.workspace.onDidChangeActivePane(pane => pane.activate());
-sub = atom.workspace.observeActivePane(pane => pane.activate());
-sub = atom.workspace.onDidAddPaneItem(event => event.index && event.item && event.pane);
-sub = atom.workspace.onWillDestroyPaneItem(event => event.index && event.item && event.pane);
-sub = atom.workspace.onDidDestroyPaneItem(event => event.index && event.item && event.pane);
-sub = atom.workspace.onDidAddTextEditor(event => event.index && event.pane &&
-	event.textEditor);
-
-// Opening
-async function workspaceOpen() {
-	obj = await atom.workspace.open();
-	obj = await atom.workspace.open("https://test");
-	obj = await atom.workspace.open("https://test", { activateItem: true });
-	obj = await atom.workspace.open("https://test", { activatePane: true });
-	obj = await atom.workspace.open("https://test", { initialColumn: 42 });
-	obj = await atom.workspace.open("https://test", { initialLine: 42 });
-	obj = await atom.workspace.open("https://test", { location: "right" });
-	obj = await atom.workspace.open("https://test", { split: "up" });
-	obj = await atom.workspace.open("https://test", { pending: true });
-	obj = await atom.workspace.open("https://test", { searchAllPanes: true });
-	obj = await atom.workspace.open("https://test", {
-		activateItem: true,
-		activatePane: true,
-		initialColumn: 42,
-		initialLine: 42,
-		location: "left",
-		split: "left",
-		pending: true,
-		searchAllPanes: true,
-	});
-}
-
-bool = atom.workspace.hide("https://test");
-bool = atom.workspace.hide(element);
-
-async function workspaceToggle() {
-	await atom.workspace.toggle("https://test");
-	await atom.workspace.toggle(element);
-}
-
-obj = atom.workspace.createItemForURI("https://test");
-
-bool = atom.workspace.isTextEditor(obj);
-
-async function workspaceReopen() {
-	const result = await atom.workspace.reopenItem();
-	if (result) obj = result;
-}
-
-atom.workspace.addOpener(() => element);
-
-atom.workspace.buildTextEditor(obj);
-
-// Pane Items
-objs = atom.workspace.getPaneItems();
-obj = atom.workspace.getActivePaneItem();
-editors = atom.workspace.getTextEditors();
-
-let potentialEditor = atom.workspace.getActiveTextEditor();
-if (potentialEditor) {
-	editor = potentialEditor;
-}
-
-// Panes
-paneContainer = atom.workspace.getActivePaneContainer();
-panes = atom.workspace.getPanes();
-pane = atom.workspace.getActivePane();
-bool = atom.workspace.activateNextPane();
-bool = atom.workspace.activatePreviousPane();
-
-let potentialPaneContainer = atom.workspace.paneContainerForURI("https://test");
-if (potentialPaneContainer) {
-	paneContainer = potentialPaneContainer;
-}
-
-potentialPaneContainer = atom.workspace.paneContainerForItem(element);
-if (potentialPaneContainer) {
-	paneContainer = potentialPaneContainer;
-}
-
-let potentialPane = atom.workspace.paneForURI("https://test");
-if (potentialPane) {
-	pane = potentialPane;
-}
-
-potentialPane = atom.workspace.paneForItem(element);
-if (potentialPane) {
-	pane = potentialPane;
-}
-
-// Pane Locations
-workspaceCenter = atom.workspace.getCenter();
-dock = atom.workspace.getLeftDock();
-dock = atom.workspace.getRightDock();
-dock = atom.workspace.getBottomDock();
-
-// Panels
-panels = atom.workspace.getBottomPanels();
-
-panel = atom.workspace.addBottomPanel({ item: element });
-panel = atom.workspace.addBottomPanel({ item: element, priority: 100, visible: true });
-
-panels = atom.workspace.getLeftPanels();
-
-panel = atom.workspace.addLeftPanel({ item: element });
-panel = atom.workspace.addLeftPanel({ item: element, priority: 100, visible: true });
-
-panels = atom.workspace.getRightPanels();
-
-panel = atom.workspace.addRightPanel({ item: element });
-panel = atom.workspace.addRightPanel({ item: element, priority: 100, visible: true });
-
-panels = atom.workspace.getTopPanels();
-
-panel = atom.workspace.addTopPanel({ item: element });
-panel = atom.workspace.addTopPanel({ item: element, priority: 100, visible: true });
-
-panels = atom.workspace.getHeaderPanels();
-
-panel = atom.workspace.addHeaderPanel({ item: element });
-panel = atom.workspace.addHeaderPanel({ item: element, priority: 100, visible: true });
-
-panels = atom.workspace.getFooterPanels();
-
-panel = atom.workspace.addFooterPanel({ item: element });
-panel = atom.workspace.addFooterPanel({ item: element, priority: 100, visible: true });
-
-panels = atom.workspace.getModalPanels();
-
-panel = atom.workspace.addModalPanel({ item: element });
-panel = atom.workspace.addModalPanel({ item: element, priority: 100, visible: true });
-
-const potentialPanel = atom.workspace.panelForItem(element);
-if (potentialPanel) {
-	panel = potentialPanel;
-}
-
-const scanResults = atom.workspace.scan(/r/, () => {});
-scanResults.cancel();
-
-// Searching and Replacing
-async function workspaceScan() {
-	await scanResults;
-
-	const scanOptions = {
-		onPathsSearched: (pathsSearched: number) => {},
-		leadingContextLineCount: 5,
-		trailingContextLineCount: 5,
-		paths: ["a"],
-	};
-	await atom.workspace.scan(/r/, scanOptions, (results) => {
-		str = results.filePath;
-		for (const match of results.matches) {
-			range = Range.fromObject(match.range);
-			strs = match.leadingContextLines;
-			strs = match.trailingContextLines;
-		}
-	});
-}
-
-async function workspaceReplace() {
-	await atom.workspace.replace(/r/, "Test", ["a"], (options) => {});
-}
-
-//// WorkspaceCenter ==========================================================
-// Event Subscription
-sub = workspaceCenter.observeTextEditors(editor => editor.id);
-sub = workspaceCenter.observePaneItems(item => {});
-sub = workspaceCenter.onDidChangeActivePaneItem(item => {});
-sub = workspaceCenter.onDidStopChangingActivePaneItem(item => {});
-sub = workspaceCenter.observeActivePaneItem(item => {});
-
-// Pane Items
-objs = workspaceCenter.getPaneItems();
-workspaceCenter.getActivePaneItem();
-editors = workspaceCenter.getTextEditors();
-
-potentialEditor = workspaceCenter.getActiveTextEditor();
-if (potentialEditor) {
-	editor = potentialEditor;
-}
-
-// Panes
-panes = workspaceCenter.getPanes();
-pane = workspaceCenter.getActivePane();
-workspaceCenter.activateNextPane();
-workspaceCenter.activatePreviousPane();
diff --git a/types/atom/autocomplete-plus/config.d.ts b/types/atom/autocomplete-plus/config.d.ts
new file mode 100644
index 0000000000..e4c9f3a2d4
--- /dev/null
+++ b/types/atom/autocomplete-plus/config.d.ts
@@ -0,0 +1,128 @@
+import "../index";
+
+declare module "atom" {
+    interface ConfigValues {
+        /**
+         *  Suggestions will show as you type if this preference is enabled. If it is
+         *  disabled, you can still see suggestions by using the keymapping for
+         *  'autocomplete-plus:activate' (shown below).
+         */
+        "autocomplete-plus.enableAutoActivation": boolean;
+
+        /**
+         *  If you are experiencing performance issues when typing, you should try
+         *  increasing this value to a non-zero number (e.g. 100).
+         */
+        "autocomplete-plus.autoActivationDelay": number;
+
+        /** The suggestion list will only show this many suggestions. */
+        "autocomplete-plus.maxVisibleSuggestions": number;
+
+        /**
+         *  You should use the key(s) indicated here to confirm a suggestion from the
+         *  suggestion list and have it inserted into the file.
+         */
+        "autocomplete-plus.confirmCompletion":
+            | "tab"
+            | "enter"
+            | "tab and enter"
+            | "tab always, enter when suggestion explicitly selected";
+
+        /**
+         *  Disable this if you want to bind your own keystrokes to move around the
+         *  suggestion list. You will also need to add definitions to your keymap.
+         */
+        "autocomplete-plus.useCoreMovementCommands": boolean;
+
+        /**
+         *  Suggestions will not be provided for files matching this list, e.g. *.md
+         *  for Markdown files. To blacklist more than one file extension, use comma
+         *  as a separator, e.g. ["*.md", "*.txt"] (both Markdown and text files).
+         */
+        "autocomplete-plus.fileBlacklist": string[];
+
+        /** Suggestions will not be provided for scopes matching this list. */
+        "autocomplete-plus.scopeBlacklist": string[];
+
+        /**
+         *  For grammars with no registered provider(s), the default provider will
+         *  include completions from all buffers, instead of just the buffer you are
+         *  currently editing.
+         */
+        "autocomplete-plus.includeCompletionsFromAllBuffers": boolean;
+
+        /**
+         *  Fuzzy searching is performed if this is disabled; if it is enabled, suggestions
+         *  must begin with the prefix from the current word.
+         */
+        "autocomplete-plus.strictMatching": boolean;
+
+        /**
+         *  Only autocomplete when you've typed at least this many characters.
+         *  Note: May not affect external providers.
+         */
+        "autocomplete-plus.minimumWordLength": number;
+
+        /**
+         *  The package comes with a built-in provider that will provide suggestions
+         *  using the words in your current buffer or all open buffers. You will get
+         *  better suggestions by installing additional autocomplete+ providers.
+         *  To stop using the built-in provider, disable this option.
+         */
+        "autocomplete-plus.enableBuiltinProvider": boolean;
+
+        /** Don't use the built-in provider for these selector(s). */
+        "autocomplete-plus.builtinProviderBlacklist": string;
+
+        /**
+         *  If enabled, typing `backspace` will show the suggestion list if suggestions
+         *  are available. If disabled, suggestions will not be shown while backspacing.
+         */
+        "autocomplete-plus.backspaceTriggersAutocomplete": boolean;
+
+        /**
+         *  If enabled, automatically insert suggestion on manual activation with
+         *  'autocomplete-plus:activate' when there is only one match.
+         */
+        "autocomplete-plus.enableAutoConfirmSingleSuggestion": boolean;
+
+        /**
+         *  With 'Cursor' the suggestion list appears at the cursor's position.
+         *  With 'Word' it appears at the beginning of the word that's being completed.
+         */
+        "autocomplete-plus.suggestionListFollows": "Word"|"Cursor";
+
+        /**
+         *  If you're having trouble with autocomplete, you may consider falling back
+         *  to the Symbol provider and filing an issue.
+         */
+        "autocomplete-plus.defaultProvider": "Subsequence"|"Symbol";
+
+        /** Don't auto-activate when any of these classes are present in the editor. */
+        "autocomplete-plus.suppressActivationForEditorClasses": string[];
+
+        /**
+         *  Completing a suggestion consumes text following the cursor matching the
+         *  suffix of the chosen suggestion.
+         */
+        "autocomplete-plus.consumeSuffix": boolean;
+
+        /**
+         *  -EXPERIMENTAL- Prefers runs of consecutive characters, acronyms and start
+         *  of words.
+         */
+        "autocomplete-plus.useAlternateScoring": boolean;
+
+        /** Gives words near the cursor position a higher score than those far away. */
+        "autocomplete-plus.useLocalityBonus": boolean;
+
+        /** Identifies non-latin alphabet characters as letters. */
+        "autocomplete-plus.enableExtendedUnicodeSupport": boolean;
+
+        /**
+         *  Should similar suggestions be removed from the list? If so how to determine
+         *  they are similar.
+         */
+        "autocomplete-plus.similarSuggestionRemoval": "none"|"textOrSnippet";
+    }
+}
diff --git a/types/atom/autocomplete-plus/index.d.ts b/types/atom/autocomplete-plus/index.d.ts
new file mode 100644
index 0000000000..2e91a81262
--- /dev/null
+++ b/types/atom/autocomplete-plus/index.d.ts
@@ -0,0 +1,157 @@
+// Autocomplete Plus 2.x
+// https://atom.io/packages/autocomplete-plus
+
+/// <reference path="./config.d.ts" />
+
+import { Point, ScopeDescriptor, TextEditor } from "../index";
+
+/** The parameters passed into getSuggestions by Autocomplete+. */
+export interface SuggestionsRequestedEvent {
+    /** The current TextEditor. */
+    editor: TextEditor;
+
+    /** The position of the cursor. */
+    bufferPosition: Point;
+
+    /** The scope descriptor for the current cursor position. */
+    scopeDescriptor: ScopeDescriptor;
+
+    /** The prefix for the word immediately preceding the current cursor position. */
+    prefix: string;
+
+    /** Whether the autocomplete request was initiated by the user. */
+    activatedManually: boolean;
+}
+
+/** The parameters passed into onDidInsertSuggestion by Autocomplete+. */
+export interface SuggestionInsertedEvent {
+    editor: TextEditor;
+    triggerPosition: Point;
+    suggestion: TextSuggestion|SnippetSuggestion;
+}
+
+/**
+ *  An autocompletion suggestion for the user.
+ *  Primary data type for the Atom Autocomplete+ service.
+ */
+export interface Suggestion<T extends { text: string }|{ snippet: string }> {
+    /**
+     *  A string that will show in the UI for this suggestion.
+     *  When not set, snippet || text is displayed.
+     */
+    displayText?: string;
+
+    /**
+     *  The text immediately preceding the cursor, which will be replaced by the text.
+     *  If not provided, the prefix passed into getSuggestions will be used.
+     */
+    replacementPrefix?: string;
+
+    /**
+     *  The suggestion type. It will be converted into an icon shown against the
+     *  suggestion.
+     */
+    type?: string;
+
+    /** This is shown before the suggestion. Useful for return values. */
+    leftLabel?: string;
+
+    /** Use this instead of leftLabel if you want to use html for the left label. */
+    leftLabelHTML?: string;
+
+    /**
+     *  An indicator (e.g. function, variable) denoting the "kind" of suggestion this
+     *  represents.
+     */
+    rightLabel?: string;
+
+    /** Use this instead of rightLabel if you want to use html for the right label. */
+    rightLabelHTML?: string;
+
+    /**
+     *  Class name for the suggestion in the suggestion list. Allows you to style your
+     *  suggestion via CSS, if desired.
+     */
+    className?: string;
+
+    /**
+     *  If you want complete control over the icon shown against the suggestion.
+     *  e.g. iconHTML: <i class="icon-move-right"></i>
+     */
+    iconHTML?: string;
+
+    /**
+     *  A doc-string summary or short description of the suggestion. When specified, it
+     *  will be displayed at the bottom of the suggestions list.
+     */
+    description?: string;
+
+    /**
+     *  A url to the documentation or more information about this suggestion.
+     *  When specified, a More.. link will be displayed in the description area.
+     */
+    descriptionMoreURL?: string;
+}
+
+export interface TextSuggestion extends Suggestion<TextSuggestion> {
+    /** The text which will be inserted into the editor, in place of the prefix. */
+    text: string;
+}
+
+export interface SnippetSuggestion extends Suggestion<SnippetSuggestion> {
+    /**
+     *  A snippet string. This will allow users to tab through function arguments
+     *  or other options.
+     */
+    snippet: string;
+}
+
+export type Suggestions = Array<TextSuggestion|SnippetSuggestion>;
+
+/** The interface that all Autocomplete+ providers must implement. */
+export interface AutocompleteProvider {
+    /**
+     *  Defines the scope selector(s) (can be comma-separated) for which your provider
+     *  should receive suggestion requests.
+     */
+    selector: string;
+
+    /**
+     *  Is called when a suggestion request has been dispatched by autocomplete+ to
+     *  your provider. Return an array of suggestions (if any) in the order you would
+     *  like them displayed to the user. Returning a Promise of an array of suggestions
+     *  is also supported.
+     */
+    getSuggestions(params: SuggestionsRequestedEvent): Suggestions|Promise<Suggestions>;
+
+    /**
+     *  Defines the scope selector(s) (can be comma-separated) for which your provider
+     *  should not be used.
+     */
+    disableForSelector?: string;
+
+    /**
+     *  A number to indicate its priority to be included in a suggestions request.
+     *  The default provider has an inclusion priority of 0. Higher priority providers
+     *  can suppress lower priority providers with excludeLowerPriority.
+     */
+    inclusionPriority?: number;
+
+    /** Will not use lower priority providers when this provider is used. */
+    excludeLowerPriority?: boolean;
+
+    /**
+     *  A number to determine the sort order of suggestions. The default provider has
+     *  an suggestion priority of 1.
+     */
+    suggestionPriority?: number;
+
+    /**
+     *  Function that is called when a suggestion from your provider was inserted
+     *  into the buffer.
+     */
+    onDidInsertSuggestion?(params: SuggestionInsertedEvent): void;
+
+    /** Will be called if your provider is being destroyed by autocomplete+ */
+    dispose?(): void;
+}
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 4a7f23cf60..53fa8d5749 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4262 +1,6722 @@
-// Type definitions for Atom 1.21
+// Type definitions for Atom 1.23
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
+//                 smhxx <https://github.com/smhxx>
+//                 lierdakil <https://github.com/lierdakil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="node" />
+// NOTE: only those classes exported within this file should be retain that status below.
+// https://github.com/atom/atom/blob/v1.23.0/exports/atom.js
+
 /// <reference types="jquery" />
-/// <reference types="atom-keymap" />
-/// <reference types="event-kit" />
-/// <reference types="first-mate" />
-/// <reference types="text-buffer" />
+/// <reference types="node" />
+
+import { ReadStream, WriteStream } from "fs";
+import { ChildProcess } from "child_process";
 
 declare global {
-	/** The core classes for the Atom Text Editor. */
-	namespace AtomCore {
-		/** Objects that appear as parameters to callbacks. */
-		namespace Events {
-			interface ExceptionThrown {
-				originalError: Error;
-				message: string;
-				url: string;
-				line: number;
-				column: number;
-			}
+    const atom: AtomEnvironment;
 
-			interface PreventableExceptionThrown extends ExceptionThrown {
-				preventDefault(): void;
-			}
-
-			interface SelectionChanged {
-				oldBufferRange: TextBuffer.Range;
-				oldScreenRange: TextBuffer.Range;
-				newBufferRange: TextBuffer.Range;
-				newScreenRange: TextBuffer.Range;
-				selection: Selection;
-			}
-
-			interface PaneItemObserved {
-				item: object;
-				pane: Pane;
-				index: number;
-			}
-
-			interface PaneItemOpened extends PaneItemObserved {
-				uri: string;
-			}
-
-			interface EditorChanged {
-				/** A Point representing where the change started. */
-				start: TextBuffer.Point;
-
-				/** A Point representing the replaced extent. */
-				oldExtent: TextBuffer.Point;
-
-				/** A Point representing the replacement extent. */
-				newExtent: TextBuffer.Point;
-			}
-
-			interface StyleElementObserved extends HTMLStyleElement {
-				sourcePath: string;
-				context: string;
-			}
-
-			interface TextEditorObserved {
-				textEditor: TextEditor;
-				pane: Pane;
-				index: number;
-			}
-
-			interface RepoStatusChanged {
-				path: string;
-
-				/** This value can be passed to ::isStatusModified or ::isStatusNew to get more
-				 *  information.
-				 */
-				pathStatus: number;
-			}
-
-			interface PaneListItemShifted {
-				/** The pane item that was added or removed. */
-				item: object;
-
-				/** A number indicating where the item is located. */
-				index: number;
-			}
-
-			interface PaneItemMoved {
-				/** The removed pane item. */
-				item: object;
-
-				/** A number indicating where the item was located. */
-				oldIndex: number;
-
-				/** A number indicating where the item is now located. */
-				newIndex: number;
-			}
-
-			interface CursorPositionChanged {
-				oldBufferPosition: TextBuffer.Point;
-				oldScreenPosition: TextBuffer.Point;
-				newBufferPosition: TextBuffer.Point;
-				newScreenPosition: TextBuffer.Point;
-				textChanged: boolean;
-				Cursor:	Cursor;
-			}
-
-			interface DecorationPropsChanged {
-				/** Object the old parameters the decoration used to have. */
-				oldProperties: Structures.DecorationProps;
-
-				/** Object the new parameters the decoration now has */
-				newProperties: Structures.DecorationProps;
-			}
-
-			type FilesystemChange = Array<{
-				/** A string describing the filesystem action that occurred. */
-				action: "created"|"modified"|"deleted"|"renamed";
-
-				/** The absolute path to the filesystem entry that was acted upon. */
-				path: string;
-
-				/** For rename events, a string containing the filesystem entry's former
-				 *  absolute path.
-				 */
-				oldPath?: string;
-			}>;
-		}
-
-		/** Objects that appear as parameters to functions. */
-		namespace Options {
-			interface TextInsertion {
-				select?: boolean;
-				autoIndent?: boolean;
-				autoIndentNewline?: boolean;
-				autoDecreaseIndent?: boolean;
-				normalizeLineEndings?: boolean;
-				undo?: "skip";
-			}
-
-			interface Menu {
-				/** The menu itme's label. */
-				label: string;
-
-				/** An array of sub menus. */
-				submenu?: ReadonlyArray<Menu>;
-
-				/** The command to trigger when the item is clicked. */
-				command?: string;
-			}
-
-			interface ContextMenu {
-				/** The menu item's label. */
-				label?: string;
-
-				/** The command to invoke on the target of the right click that invoked the
-				 *  context menu.
-				 */
-				command?: string;
-
-				/** Whether the menu item should be clickable. Disabled menu items typically
-				 *  appear grayed out. Defaults to true.
-				 */
-				enabled?: boolean;
-
-				/** An array of additional items. */
-				submenu?: ReadonlyArray<ContextMenu>;
-
-				/** If you want to create a separator, provide an item with type: 'separator'
-				 *  and no other keys.
-				 */
-				type?: "separator";
-
-				/** Whether the menu item should appear in the menu. Defaults to true. */
-				visible?: boolean;
-
-				/** A function that is called on the item each time a context menu is created
-				 *  via a right click.
-				 */
-				created?(event: Event): void;
-
-				/** A function that is called to determine whether to display this item on a
-				 *  given context menu deployment.
-				 */
-				shouldDisplay?(event: Event): void;
-			}
-
-			interface SpawnProcess {
-				/** Current working directory of the child process. */
-				cwd?: string;
-
-				/** Environment key-value pairs. */
-				env?: { [key: string]: string };
-
-				/** The child's stdio configuration. */
-				stdio?: string|Array<string|number>;
-
-				/** Prepare child to run independently of its parent process. */
-				detached?: boolean;
-
-				/** Sets the user identity of the process. */
-				uid?: number;
-
-				/** Sets the group identity of the process. */
-				gid?: number;
-
-				/** If true, runs command inside of a shell. Uses "/bin/sh" on UNIX, and process.env.ComSpec
-				 *  on Windows. A different shell can be specified as a string.
-				 */
-				shell?: boolean | string;
-			}
-
-			interface NodeProcess {
-				/** The command to execute. */
-				command: string;
-
-				/** The array of arguments to pass to the command. */
-				args?: ReadonlyArray<string>;
-
-				/** The options object to pass to Node's ChildProcess.spawn method. */
-				options?: SpawnProcess;
-
-				/** The callback that receives a single argument which contains the standard
-				 *  output from the command.
-				 */
-				stdout?(data: string): void;
-
-				/** The callback that receives a single argument which contains the standard
-				 *  error output from the command.
-				 */
-				stderr?(data: string): void;
-
-				/** The callback which receives a single argument containing the exit status. */
-				exit?(code: number): void;
-			}
-
-			interface Process extends NodeProcess {
-				/** Whether the command will automatically start when this BufferedProcess is
-				 *  created.
-				 */
-				autoStart?: boolean;
-			}
-
-			interface Notification {
-				buttons?: Array<{
-					className?: string;
-					onDidClick?(event: MouseEvent): void;
-					text?: string;
-				}>;
-				description?: string;
-				detail?: string;
-				dismissable?: boolean;
-				icon?: string;
-			}
-
-			interface ErrorNotification extends Notification {
-				stack?: string;
-			}
-
-			/** The options for a Bootstrap 3 Tooltip class, which Atom uses a variant of. */
-			interface Tooltip {
-				/** Apply a CSS fade transition to the tooltip. */
-				animation?: boolean;
-
-				/** Appends the tooltip to a specific element. */
-				container?: string|HTMLElement|false;
-
-				/** Delay showing and hiding the tooltip (ms) - does not apply to manual
-				 *  trigger type.
-				 */
-				delay?: number|{ show: number, hide: number };
-
-				/** Allow HTML in the tooltip. */
-				html?: boolean;
-
-				/** How to position the tooltip. */
-				placement?: "top"|"bottom"|"left"|"right"|"auto";
-
-				/** If a selector is provided, tooltip objects will be delegated to the
-				 *  specified targets.
-				 */
-				selector?: string;
-
-				/** Base HTML to use when creating the tooltip. */
-				template?: string;
-
-				/** Default title value if title attribute isn't present.
-				 *  If a function is given, it will be called with its this reference set to
-				 *  the element that the tooltip is attached to.
-				 */
-				title?: string|HTMLElement|(() => string);
-
-				/** How tooltip is triggered - click | hover | focus | manual.
-				 *  You may pass multiple triggers; separate them with a space.
-				 */
-				trigger?: string;
-			}
-
-			interface WorkspaceScan {
-				/** An array of glob patterns to search within. */
-				paths?: ReadonlyArray<string>;
-
-				/** A function to be periodically called with the number of paths searched. */
-				onPathsSearched?(pathsSearched: number): void;
-
-				/** The number of lines before the matched line to include in the results object. */
-				leadingContextLineCount?: number;
-
-				/** The number of lines after the matched line to include in the results object. */
-				trailingContextLineCount?: number;
-			}
-
-			interface BuildEnvironment {
-				/** An object responsible for Atom's interaction with the browser process and host OS.
-				 *  Use buildDefaultApplicationDelegate for a default instance.
-				 */
-				applicationDelegate?: object;
-
-				/** A window global. */
-				window?: Window;
-
-				/** A document global. */
-				document?: Document;
-
-				/** A path to the configuration directory (usually ~/.atom). */
-				configDirPath?: string;
-
-				/** A boolean indicating whether the Atom environment should save or load state
-				 *  from the file system. You probably want this to be false.
-				 */
-				enablePersistence?: boolean;
-			}
-		}
-
-		/** The static side to each exported class. Should generally only be used internally. */
-		namespace Statics {
-			/* tslint:disable:no-unnecessary-qualifier */
-			/** The static side to the BufferedProcess class. */
-			interface BufferedProcess {
-				new (options: AtomCore.Options.Process): AtomCore.BufferedProcess;
-			}
-
-			/** The static side to the BufferedNodeProcess class. */
-			interface BufferedNodeProcess {
-				/** Runs the given Node script by spawning a new child process. */
-				new (options: AtomCore.Options.NodeProcess): AtomCore.BufferedNodeProcess;
-			}
-
-			/** The static side to the GitRepository class. */
-			interface GitRepository {
-				/** Creates a new GitRepository instance. */
-				open(path: string, options?: { refreshOnWindowFocus?: boolean }): AtomCore.GitRepository;
-
-				new (path: string, options?: { refreshOnWindowFocus?: boolean, config?: AtomCore.Config,
-					project?: AtomCore.Project }): AtomCore.GitRepository;
-			}
-
-			/** The static side to the Notification class. */
-			interface Notification {
-				new (type: "warning"|"info"|"success", message: string, options?:
-					AtomCore.Options.Notification): AtomCore.Notification;
-				new (type: "fatal"|"error", message: string, options?:
-					AtomCore.Options.ErrorNotification): AtomCore.Notification;
-			}
-
-			/** The static side to the Task class. */
-			interface Task {
-				// NOTE: this is actually the best we can do here with the REST parameter for
-				// this appearing in the middle of the parameter list, which isn't aligned with
-				// the ES6 spec. Maybe when they rewrite it in JavaScript this will change.
-				/** A helper method to easily launch and run a task once. */
-				// tslint:disable-next-line:no-any
-				once(taskPath: string, ...args: any[]): AtomCore.Task;
-
-				/** Creates a task. You should probably use .once */
-				new (taskPath: string): AtomCore.Task;
-			}
-
-			/** The static side to the TextEditor class. */
-			type TextEditor = object;
-			/* tslint:enable:no-unnecessary-qualifier */
-		}
-
-		/** Data structures that are used within classes. */
-		namespace Structures {
-			interface SharedDecorationProps {
-				/** This CSS class will be applied to the decorated line number, line, highlight,
-				 *  or overlay.
-				 */
-				class?: string;
-
-				/** An HTMLElement or a model Object with a corresponding view registered. Only
-				 *  applicable to the gutter, overlay and block types.
-				 */
-				item?: HTMLElement;
-
-				/** If true, the decoration will only be applied to the head of the DisplayMarker.
-				 *  Only applicable to the line and line-number types.
-				 */
-				onlyHead?: boolean;
-
-				/** If true, the decoration will only be applied if the associated DisplayMarker
-				 *  is empty. Only applicable to the gutter, line, and line-number types.
-				 */
-				onlyEmpty?: boolean;
-
-				/** If true, the decoration will only be applied if the associated DisplayMarker
-				 *  is non-empty. Only applicable to the gutter, line, and line-number types.
-				 */
-				onlyNonEmpty?: boolean;
-
-				/** Only applicable to decorations of type overlay and block. Controls where the
-				 *  view is positioned relative to the TextEditorMarker. Values can be
-				 *  'head' (the default) or 'tail' for overlay decorations, and 'before' (the default)
-				 *  or 'after' for block decorations.
-				 */
-				position?: "head"|"tail"|"before"|"after";
-
-				/** Only applicable to decorations of type overlay. Determines whether the decoration
-				 *  adjusts its horizontal or vertical position to remain fully visible when it would
-				 *  otherwise overflow the editor. Defaults to true.
-				 */
-				avoidOverflow?: boolean;
-			}
-
-			interface DecorationProps extends SharedDecorationProps {
-				/** One of several supported decoration types. */
-				type?: "line"|"line-number"|"highlight"|"overlay"|"gutter"|"block";
-
-				/** The name of the gutter we're decorating, if type is "gutter". */
-				gutterName?: string;
-			}
-
-			interface DecorationLayerProps extends SharedDecorationProps {
-				/** One of several supported decoration types. */
-				type?: "line"|"line-number"|"highlight"|"block";
-			}
-
-			interface Invisibles {
-				tab?: string|false;
-				cr?: string|false;
-				eol?: string|false;
-				space?: string|false;
-			}
-
-			interface CancellablePromise<T> extends Promise<T> {
-				cancel(): void;
-			}
-
-			interface ScandalResult {
-				filePath: string;
-				matches: Array<{
-					matchText: string;
-					lineText: string;
-					lineTextOffset: number;
-					range: [[number, number], [number, number]];
-					leadingContextLines: string[];
-					trailingContextLines: string[];
-				}>;
-			}
-
-			interface WindowLoadSettings {
-				appVersion: string;
-				atomHome: string;
-				devMode: boolean;
-				env: { [key: string]: string|undefined };
-				profileStartup: boolean;
-				resourcePath: string;
-				safeMode: boolean;
-			}
-
-			interface TestRunnerArgs {
-				/** An array of paths to tests to run. Could be paths to files or directories. */
-				testPaths: string[];
-
-				/** A function that can be called to construct an instance of the atom global.
-				 *  No atom global will be explicitly assigned, but you can assign one in your
-				 *  runner if desired.
-				 */
-				buildAtomEnvironment(options: Options.BuildEnvironment): AtomEnvironment;
-
-				/** A function that builds a default instance of the application delegate, suitable
-				 *  to be passed as the applicationDelegate parameter to buildAtomEnvironment.
-				 */
-				buildDefaultApplicationDelegate(): object;
-
-				/** An optional path to a log file to which test output should be logged. */
-				logFile: string;
-
-				/** A boolean indicating whether or not the tests are being run from the command
-				 *  line via atom --test.
-				 */
-				headless: boolean;
-			}
-		}
-
-		/** Atom global for dealing with packages, themes, menus, and the window.
-		 *  An instance of this class is always available as the atom global.
-		 */
-		interface AtomEnvironment {
-			// Properties
-			/** A CommandRegistry instance. */
-			commands: CommandRegistry;
-
-			/** A Config instance. */
-			config: Config;
-
-			/** A Clipboard instance. */
-			clipboard: Clipboard;
-
-			/** A ContextMenuManager instance. */
-			contextMenu: ContextMenuManager;
-
-			/** A MenuManager instance. */
-			menu: MenuManager;
-
-			/** A KeymapManager instance. */
-			keymaps: AtomKeymap.KeymapManager;
-
-			/** A TooltipManager instance. */
-			tooltips: TooltipManager;
-
-			/** A NotificationManager instance. */
-			notifications: NotificationManager;
-
-			/** A Project instance. */
-			project: Project;
-
-			/** A GrammarRegistry instance. */
-			grammars: FirstMate.GrammarRegistry;
-
-			/** A HistoryManager instance. */
-			history: HistoryManager;
-
-			/** A PackageManager instance. */
-			packages: PackageManager;
-
-			/** A ThemeManager instance. */
-			themes: ThemeManager;
-
-			/** A StyleManager instance. */
-			styles: StyleManager;
-
-			/** A DeserializerManager instance. */
-			deserializers: DeserializerManager;
-
-			/** A ViewRegistry instance. */
-			views: ViewRegistry;
-
-			/** A Workspace instance. */
-			workspace: Workspace;
-
-			/** A TextEditorRegistry instance. */
-			textEditors: TextEditorRegistry;
-
-			// Event Subscription
-			/** Invoke the given callback whenever ::beep is called. */
-			onDidBeep(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when there is an unhandled error, but before
-			 *  the devtools pop open.
-			 */
-			onWillThrowError(callback: (event: Events.PreventableExceptionThrown) =>
-				void): EventKit.Disposable;
-
-			/** Invoke the given callback whenever there is an unhandled error. */
-			onDidThrowError(callback: (event: Events.ExceptionThrown) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback as soon as the shell environment is loaded (or
-			 *  immediately if it was already loaded).
-			 */
-			whenShellEnvironmentLoaded(callback: () => void): EventKit.Disposable;
-
-			// Atom Details
-			/** Returns a boolean that is true if the current window is in development mode. */
-			inDevMode(): boolean;
-
-			/** Returns a boolean that is true if the current window is in safe mode. */
-			inSafeMode(): boolean;
-
-			/** Returns a boolean that is true if the current window is running specs. */
-			inSpecMode(): boolean;
-
-			/** Get the version of the Atom application. */
-			getVersion(): string;
-
-			/** Gets the release channel of the Atom application.
-			 *  Returns the release channel, which can be 'dev', 'beta', or 'stable'.
-			 */
-			getReleaseChannel(): "dev"|"beta"|"stable";
-
-			/** Returns a boolean that is true if the current version is an official release. */
-			isReleasedVersion(): boolean;
-
-			/** Get the time taken to completely load the current window. */
-			getWindowLoadTime(): number;
-
-			/** Get the load settings for the current window. */
-			getLoadSettings(): Structures.WindowLoadSettings;
-
-			// Managing the Atom Window
-			/** Open a new Atom window using the given options. */
-			open(params: {
-				pathsToOpen: ReadonlyArray<string>,
-				newWindow: boolean,
-				devMode: boolean,
-				safeMode: boolean,
-			}): void;
-
-			/** Close the current window. */
-			close(): void;
-
-			/** Get the size of current window. */
-			getSize(): { width: number, height: number };
-
-			/** Set the size of current window. */
-			setSize(width: number, height: number): void;
-
-			/** Get the position of current window. */
-			getPosition(): { x: number, y: number };
-
-			/** Set the position of current window. */
-			setPosition(x: number, y: number): void;
-
-			/** Prompt the user to select one or more folders. */
-			pickFolder(callback: (paths: string[]|null) => void): void;
-
-			/** Get the current window. */
-			getCurrentWindow(): object; // Electron's BrowserWindow class.
-
-			/** Move current window to the center of the screen. */
-			center(): void;
-
-			/** Focus the current window. */
-			focus(): void;
-
-			/** Show the current window. */
-			show(): void;
-
-			/** Hide the current window. */
-			hide(): void;
-
-			/** Reload the current window. */
-			reload(): void;
-
-			/** Relaunch the entire application. */
-			restartApplication(): void;
-
-			/** Returns a boolean that is true if the current window is maximized. */
-			isMaximized(): boolean;
-
-			/** Returns a boolean that is true if the current window is in full screen mode. */
-			isFullScreen(): boolean;
-
-			/** Set the full screen state of the current window. */
-			setFullScreen(fullScreen: boolean): void;
-
-			/** Toggle the full screen state of the current window. */
-			toggleFullScreen(): void;
-
-			// Messaging the User
-			/** Visually and audibly trigger a beep. */
-			beep(): void;
-
-			/** A flexible way to open a dialog akin to an alert dialog.
-			 *  Returns the chosen button index number if the buttons option was an array.
-			 */
-			confirm(options: {
-				message: string,
-				detailedMessage?: string,
-				buttons?: ReadonlyArray<string>,
-			}): void;
-
-			/** A flexible way to open a dialog akin to an alert dialog.
-			 *  Returns the chosen button index number if the buttons option was an array.
-			 */
-			confirm(options: {
-				message: string,
-				detailedMessage?: string,
-				buttons?: {
-					[key: string]: () => void
-				},
-			}): number;
-
-			// Managing the Dev Tools
-			/** Open the dev tools for the current window. */
-			openDevTools(): Promise<undefined>;
-
-			/** Toggle the visibility of the dev tools for the current window. */
-			toggleDevTools(): Promise<undefined>;
-
-			/** Execute code in dev tools. */
-			executeJavaScriptInDevTools(code: string): void;
-		}
-
-		/** A wrapper which provides standard error/output line buffering for
-		 *  Node's ChildProcess.
-		 */
-		interface BufferedProcess {
-			// Properties
-			process: NodeJS.EventEmitter;
-
-			// Event Subscription
-			/** Will call your callback when an error will be raised by the process. Usually
-			 *  this is due to the command not being available or not on the PATH. You can
-			 *  call handle() on the object passed to your callback to indicate that you
-			 *  have handled this error.
-			 */
-			onWillThrowError(callback: (errorObject: { error: Error, handle(): void }) =>
-				void): EventKit.Disposable;
-
-			// Helper Methods
-			/** Terminate the process. */
-			kill(): void;
-
-			/** Runs the process. */
-			start(): void;
-		}
-
-		/** Like BufferedProcess, but accepts a Node script as the command to run.
-		 *  This is necessary on Windows since it doesn't support shebang #! lines.
-		 */
-		type BufferedNodeProcess = BufferedProcess;
-
-		/** Represents the clipboard used for copying and pasting in Atom. */
-		interface Clipboard {
-			/** Write the given text to the clipboard. */
-			write(text: string, metadata?: object): void;
-
-			/** Read the text from the clipboard. */
-			read(): string;
-
-			/** Read the text from the clipboard and return both the text and the associated
-			 *  metadata.
-			 */
-			readWithMetadata(): { text: string, metadata: object };
-		}
-
-		/** A simple color class returned from Config::get when the value at the key path is
-		 *  of type 'color'.
-		 */
-		interface Color {
-			/** Returns a string in the form '#abcdef'. */
-			toHexString(): string;
-
-			/** Returns a string in the form 'rgba(25, 50, 75, .9)'. */
-			toRGBAString(): string;
-		}
-
-		/** Used to access all of Atom's configuration details. */
-		interface Config {
-			// Config Subscription
-			/** Add a listener for changes to a given key path. This is different than ::onDidChange in
-			 *  that it will immediately call your callback with the current value of the config entry.
-			 */
-			// tslint:disable-next-line:no-any
-			observe(keyPath: string, callback: (value: any) => void):
-				EventKit.Disposable;
-			/** Add a listener for changes to a given key path. This is different than ::onDidChange in
-			 *  that it will immediately call your callback with the current value of the config entry.
-			 */
-			// tslint:disable:no-any
-			observe(keyPath: string, options: { scope: string[]|ScopeDescriptor },
-				callback: (value: any) => void): EventKit.Disposable;
-			// tslint:enable:no-any
-
-			/** Add a listener for changes to a given key path. If keyPath is not specified, your
-			 *  callback will be called on changes to any key.
-			 */
-			// tslint:disable-next-line:no-any
-			onDidChange<T = any>(callback: (values: { newValue: T, oldValue: T }) => void):
-				EventKit.Disposable;
-			/** Add a listener for changes to a given key path. If keyPath is not specified, your
-			 *  callback will be called on changes to any key.
-			 */
-			// tslint:disable-next-line:no-any
-			onDidChange<T = any>(keyPath: string, callback: (values: { newValue: T,
-				oldValue: T }) => void): EventKit.Disposable;
-			/** Add a listener for changes to a given key path. If keyPath is not specified, your
-			 *  callback will be called on changes to any key.
-			 */
-			// tslint:disable-next-line:no-any
-			onDidChange<T = any>(keyPath: string, options: { scope: string[]|ScopeDescriptor },
-				callback: (values: { newValue: T, oldValue: T }) => void): EventKit.Disposable;
-
-			// Managing Settings
-			/** Retrieves the setting for the given key. */
-			// tslint:disable:no-any
-			get(keyPath: string, options?: { sources?: string[], excludeSources?: string[],
-				scope?: string[]|ScopeDescriptor }): any;
-			// tslint:enable:no-any
-
-			/** Sets the value for a configuration setting.
-			 *  This value is stored in Atom's internal configuration file.
-			 */
-			// tslint:disable-next-line:no-any
-			set(keyPath: string, value: any, options?: { scopeSelector?: string, source?:
-				string }): void;
-
-			/** Restore the setting at keyPath to its default value. */
-			unset(keyPath: string, options?: { scopeSelector?: string, source?: string }): void;
-
-			/** Get all of the values for the given key-path, along with their associated
-			 *  scope selector.
-			 */
-			// tslint:disable:no-any
-			getAll(keyPath: string, options?: { sources?: string[], excludeSources?: string[],
-				scope?: ScopeDescriptor }): Array<{ scopeDescriptor: ScopeDescriptor, value: any}>;
-			// tslint:enable:no-any
-
-			/** Get an Array of all of the source Strings with which settings have been added
-			 *  via ::set.
-			 */
-			getSources(): string[];
-
-			/** Retrieve the schema for a specific key path. The schema will tell you what type
-			 *  the keyPath expects, and other metadata about the config option.
-			 */
-			getSchema(keyPath: string): object|null;
-
-			/** Get the string path to the config file being used. */
-			getUserConfigPath(): string;
-
-			/** Suppress calls to handler functions registered with ::onDidChange and ::observe
-			 *  for the duration of callback. After callback executes, handlers will be called
-			 *  once if the value for their key-path has changed.
-			 */
-			transact(callback: () => void): void;
-		}
-
-		/** Provides a registry for commands that you'd like to appear in the context menu. */
-		interface ContextMenuManager {
-			/** Add context menu items scoped by CSS selectors. */
-			add(itemsBySelector: {
-				[key: string]: ReadonlyArray<Options.ContextMenu>
-			}): EventKit.Disposable;
-		}
-
-		/** Associates listener functions with commands in a context-sensitive way
-		 *  using CSS selectors.
-		 */
-		interface CommandRegistry {
-			/** Register a single command. */
-			add(target: string|Node, commandName: string, listener: {
-				didDispatch(event: AtomKeymap.CommandEvent): void,
-				displayName?: string,
-				description?: string,
-			} | ((event: AtomKeymap.CommandEvent) => void)): EventKit.Disposable;
-
-			/** Register multiple commands. */
-			add(target: string|Node, commands: { [key: string]: (event:
-				AtomKeymap.CommandEvent) => void }): EventKit.CompositeDisposable;
-
-			/** Find all registered commands matching a query. */
-			findCommands(params: { target: Node }): Array<{
-				name: string,
-				displayName: string,
-				description?: string,
-				tags?: string[],
-			}>;
-
-			/** Simulate the dispatch of a command on a DOM node. */
-			dispatch(target: Node, commandName: string): void;
-
-			/** Invoke the given callback before dispatching a command event. */
-			onWillDispatch(callback: (event: AtomKeymap.CommandEvent) => void): EventKit.Disposable;
-
-			/** Invoke the given callback after dispatching a command event. */
-			onDidDispatch(callback: (event: AtomKeymap.CommandEvent) => void): EventKit.Disposable;
-		}
-
-		/** The Cursor class represents the little blinking line identifying where text
-		 *  can be inserted.
-		 */
-		interface Cursor {
-			// Event Subscription
-			/** Calls your callback when the cursor has been moved. */
-			onDidChangePosition(callback: (event: Events.CursorPositionChanged) => void):
-				EventKit.Disposable;
-
-			/** Calls your callback when the cursor is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Calls your callback when the cursor's visibility has changed. */
-			onDidChangeVisibility(callback: (visibility: boolean) => void):
-				EventKit.Disposable;
-
-			// Managing Cursor Position
-			/** Moves a cursor to a given screen position. */
-			setScreenPosition(screenPosition: TextBuffer.PointLike|[number, number],
-				options?: { autoscroll?: boolean }): void;
-
-			/** Returns the screen position of the cursor as a Point. */
-			getScreenPosition(): TextBuffer.Point;
-
-			/** Moves a cursor to a given buffer position. */
-			setBufferPosition(bufferPosition: TextBuffer.PointLike|[number, number],
-				options?: { autoscroll?: boolean }): void;
-
-			/** Returns the current buffer position as an Array. */
-			getBufferPosition(): TextBuffer.Point;
-
-			/** Returns the cursor's current screen row. */
-			getScreenRow(): number;
-
-			/** Returns the cursor's current screen column. */
-			getScreenColumn(): number;
-
-			/** Retrieves the cursor's current buffer row. */
-			getBufferRow(): number;
-
-			/** Returns the cursor's current buffer column. */
-			getBufferColumn(): number;
-
-			/** Returns the cursor's current buffer row of text excluding its line ending. */
-			getCurrentBufferLine(): string;
-
-			/** Returns whether the cursor is at the start of a line. */
-			isAtBeginningOfLine(): boolean;
-
-			/** Returns whether the cursor is on the line return character. */
-			isAtEndOfLine(): boolean;
-
-			// Cursor Position Details
-			/** Returns the underlying DisplayMarker for the cursor. Useful with overlay
-			 *  Decorations.
-			 */
-			getMarker(): TextBuffer.DisplayMarker;
-
-			/** Identifies if the cursor is surrounded by whitespace.
-			 *  "Surrounded" here means that the character directly before and after the cursor
-			 *  are both whitespace.
-			 */
-			isSurroundedByWhitespace(): boolean;
-
-			/** This method returns false if the character before or after the cursor is whitespace. */
-			isBetweenWordAndNonWord(): boolean;
-
-			/** Returns whether this cursor is between a word's start and end. */
-			isInsideWord(options?: { wordRegex?: RegExp }): boolean;
-
-			/** Returns the indentation level of the current line. */
-			getIndentLevel(): number;
-
-			/** Retrieves the scope descriptor for the cursor's current position. */
-			getScopeDescriptor(): ScopeDescriptor;
-
-			/** Returns true if this cursor has no non-whitespace characters before its
-			 *  current position.
-			 */
-			hasPrecedingCharactersOnLine(): boolean;
-
-			/** Identifies if this cursor is the last in the TextEditor.
-			 *  "Last" is defined as the most recently added cursor.
-			 */
-			isLastCursor(): boolean;
-
-			// Moving the Cursor
-			/** Moves the cursor up one screen row. */
-			moveUp(rowCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
-
-			/** Moves the cursor down one screen row. */
-			moveDown(rowCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
-
-			/** Moves the cursor left one screen column. */
-			moveLeft(columnCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
-
-			/** Moves the cursor right one screen column. */
-			moveRight(columnCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
-
-			/** Moves the cursor to the top of the buffer. */
-			moveToTop(): void;
-
-			/** Moves the cursor to the bottom of the buffer. */
-			moveToBottom(): void;
-
-			/** Moves the cursor to the beginning of the line. */
-			moveToBeginningOfScreenLine(): void;
-
-			/** Moves the cursor to the beginning of the buffer line. */
-			moveToBeginningOfLine(): void;
-
-			/** Moves the cursor to the beginning of the first character in the line. */
-			moveToFirstCharacterOfLine(): void;
-
-			/** Moves the cursor to the end of the line. */
-			moveToEndOfScreenLine(): void;
-
-			/** Moves the cursor to the end of the buffer line. */
-			moveToEndOfLine(): void;
-
-			/** Moves the cursor to the beginning of the word. */
-			moveToBeginningOfWord(): void;
-
-			/** Moves the cursor to the end of the word. */
-			moveToEndOfWord(): void;
-
-			/** Moves the cursor to the beginning of the next word. */
-			moveToBeginningOfNextWord(): void;
-
-			/** Moves the cursor to the previous word boundary. */
-			moveToPreviousWordBoundary(): void;
-
-			/** Moves the cursor to the next word boundary. */
-			moveToNextWordBoundary(): void;
-
-			/** Moves the cursor to the previous subword boundary. */
-			moveToPreviousSubwordBoundary(): void;
-
-			/** Moves the cursor to the next subword boundary. */
-			moveToNextSubwordBoundary(): void;
-
-			/** Moves the cursor to the beginning of the buffer line, skipping all whitespace. */
-			skipLeadingWhitespace(): void;
-
-			/** Moves the cursor to the beginning of the next paragraph. */
-			moveToBeginningOfNextParagraph(): void;
-
-			/** Moves the cursor to the beginning of the previous paragraph. */
-			moveToBeginningOfPreviousParagraph(): void;
-
-			// Local Positions and Ranges
-			/** Returns buffer position of previous word boundary. It might be on the current
-			 *  word, or the previous word.
-			 */
-			getPreviousWordBoundaryBufferPosition(options?: { wordRegex?: RegExp }):
-				TextBuffer.Point;
-
-			/** Returns buffer position of the next word boundary. It might be on the current
-			 *  word, or the previous word.
-			 */
-			getNextWordBoundaryBufferPosition(options?: { wordRegex?: RegExp }):
-				TextBuffer.Point;
-
-			/** Retrieves the buffer position of where the current word starts. */
-			getBeginningOfCurrentWordBufferPosition(options?: {
-				wordRegex?: RegExp,
-				includeNonWordCharacters?: boolean,
-				allowPrevious?: boolean
-			}): TextBuffer.Point;
-
-			/** Retrieves the buffer position of where the current word ends. */
-			getEndOfCurrentWordBufferPosition(options?: {
-				wordRegex?: RegExp,
-				includeNonWordCharacters?: boolean
-			}): TextBuffer.Point;
-
-			/** Retrieves the buffer position of where the next word starts. */
-			getBeginningOfNextWordBufferPosition(options?: { wordRegex?: RegExp }): TextBuffer.Point;
-
-			/** Returns the buffer Range occupied by the word located under the cursor. */
-			getCurrentWordBufferRange(options?: { wordRegex?: RegExp }): TextBuffer.Range;
-
-			/** Returns the buffer Range for the current line. */
-			getCurrentLineBufferRange(options?: { includeNewline?: boolean }): TextBuffer.Range;
-
-			/** Retrieves the range for the current paragraph.
-			 *  A paragraph is defined as a block of text surrounded by empty lines or comments.
-			 */
-			getCurrentParagraphBufferRange(): TextBuffer.Range;
-
-			/** Returns the characters preceding the cursor in the current word. */
-			getCurrentWordPrefix(): string;
-
-			// Visibility
-			/** Sets whether the cursor is visible. */
-			setVisible(visible: boolean): void;
-
-			/** Returns the visibility of the cursor. */
-			isVisible(): boolean;
-
-			// Comparing to another cursor
-			/** Compare this cursor's buffer position to another cursor's buffer position.
-			 *  See Point::compare for more details.
-			 */
-			compare(otherCursor: Cursor): number;
-
-			// Utilities
-			/** Prevents this cursor from causing scrolling. */
-			clearAutoscroll(): void;
-
-			/** Deselects the current selection. */
-			clearSelection(): void;
-
-			/** Get the RegExp used by the cursor to determine what a "word" is. */
-			wordRegExp(options?: { includeNonWordCharacters?: boolean }): RegExp;
-
-			/** Get the RegExp used by the cursor to determine what a "subword" is. */
-			subwordRegExp(options?: { backwards?: boolean }): RegExp;
-		}
-
-		/** Represents a decoration that follows a DisplayMarker. A decoration is basically
-		 *  a visual representation of a marker. It allows you to add CSS classes to line
-		 *  numbers in the gutter, lines, and add selection-line regions around marked ranges
-		 *  of text.
-		 */
-		interface Decoration {
-			id: number;
-
-			// Construction and Destruction
-			/** Destroy this marker decoration.
-			 *  You can also destroy the marker if you own it, which will destroy this decoration.
-			 */
-			destroy(): void;
-
-			// Event Subscription
-			/** When the Decoration is updated via Decoration::setProperties. */
-			onDidChangeProperties(callback: (event: Events.DecorationPropsChanged) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when the Decoration is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			// Decoration Details
-			/** An id unique across all Decoration objects. */
-			getId(): number;
-
-			/** Returns the marker associated with this Decoration. */
-			getMarker(): TextBuffer.DisplayMarker;
-
-			// Properties
-			/** Returns the Decoration's properties. */
-			getProperties(): Structures.DecorationProps;
-
-			/** Update the marker with new Properties. Allows you to change the decoration's
-			 *  class.
-			 */
-			setProperties(newProperties: Structures.DecorationProps): void;
-		}
-
-		interface Deserializer {
-			name: string;
-			deserialize(state: object): object;
-		}
-
-		/** Manages the deserializers used for serialized state. */
-		interface DeserializerManager {
-			/** Register the given class(es) as deserializers. */
-			add(...deserializers: Deserializer[]): EventKit.Disposable;
-
-			/** Deserialize the state and params. */
-			deserialize(state: object): object|undefined;
-		}
-
-		/** A container at the edges of the editor window capable of holding items. */
-		interface Dock {
-			// Methods
-			/** Show the dock and focus its active Pane. */
-			activate(): void;
-
-			/** Show the dock without focusing it. */
-			show(): void;
-
-			/** Hide the dock and activate the WorkspaceCenter if the dock was was previously focused. */
-			hide(): void;
-
-			/** Toggle the dock's visibility without changing the Workspace's active pane container. */
-			toggle(): void;
-
-			/** Check if the dock is visible. */
-			isVisible(): boolean;
-
-			// Event Subscription
-			/** Invoke the given callback when the visibility of the dock changes. */
-			onDidChangeVisible(callback: (visible: boolean) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current and all future visibilities of the dock. */
-			observeVisible(callback: (visible: boolean) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future panes items in the dock. */
-			observePaneItems(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane item changes.
-			 *
-			 *  Because observers are invoked synchronously, it's important not to perform any expensive
-			 *  operations via this method. Consider ::onDidStopChangingActivePaneItem to delay operations
-			 *  until after changes stop occurring.
-			 */
-			onDidChangeActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane item stops changing. */
-			onDidStopChangingActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current active pane item and with all future
-			 *  active pane items in the dock.
-			 */
-			observeActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane is added to the dock. */
-			onDidAddPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback before a pane is destroyed in the dock. */
-			onWillDestroyPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane is destroyed in the dock. */
-			onDidDestroyPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future panes in the dock. */
-			observePanes(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane changes. */
-			onDidChangeActivePane(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current active pane and when the active pane changes. */
-			observeActivePane(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is added to the dock. */
-			onDidAddPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is about to be destroyed, before the user is
-			 *  prompted to save it.
-			 */
-			onWillDestroyPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is destroyed. */
-			onDidDestroyPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			// Pane Items
-			/** Get all pane items in the dock. */
-			getPaneItems(): object[];
-
-			/** Get the active Pane's active item. */
-			getActivePaneItem(): object;
-
-			// Panes
-			/** Returns an Array of Panes. */
-			getPanes(): Pane[];
-
-			/** Get the active Pane. */
-			getActivePane(): Pane;
-
-			/** Make the next pane active. */
-			activateNextPane(): boolean;
-
-			/** Make the previous pane active. */
-			activatePreviousPane(): boolean;
-		}
-
-		/** Represents the underlying git operations performed by Atom. */
-		interface GitRepository {
-			// Lifecycle
-			/** Destroy this GitRepository object. */
-			destroy(): void;
-
-			/** Returns a boolean indicating if this repository has been destroyed. */
-			isDestroyed(): boolean;
-
-			// Event Subscription
-			/** Invoke the given callback when this GitRepository's destroy() method is
-			 *  invoked.
-			 */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a specific file's status has changed. When
-			 *  a file is updated, reloaded, etc, and the status changes, this will be fired.
-			 */
-			onDidChangeStatus(callback: (event: Events.RepoStatusChanged) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a multiple files' statuses have changed. */
-			onDidChangeStatuses(callback: () => void): EventKit.Disposable;
-
-			// Repository Details
-			/** A string indicating the type of version control system used by this repository. */
-			getType(): "git";
-
-			/** Returns the string path of the repository. */
-			getPath(): string;
-
-			/** Returns the string working directory path of the repository. */
-			getWorkingDirectory(): string;
-
-			/** Returns true if at the root, false if in a subfolder of the repository. */
-			isProjectAtRoot(): boolean;
-
-			/** Makes a path relative to the repository's working directory. */
-			relativize(): string;
-
-			/** Returns true if the given branch exists. */
-			hasBranch(branch: string): boolean;
-
-			/** Retrieves a shortened version of the HEAD reference value. */
-			getShortHead(path?: string): string;
-
-			/** Is the given path a submodule in the repository? */
-			isSubmodule(path: string): boolean;
-
-			/** Returns the number of commits behind the current branch is from the its
-			 *  upstream remote branch. The default reference is the HEAD.
-			 *  @param reference The branch reference name.
-			 *  @param path The path in the repository to get this ifnromation for, only
-			 *  needed if the repository contains submodules.
-			 *  @return Returns the number of commits behind the current branch is from its
-			 *  upstream remote branch.
-			 */
-			getAheadBehindCount(reference: string, path?: string): { ahead: number, behind: number };
-
-			/** Get the cached ahead/behind commit counts for the current branch's
-			 *  upstream branch.
-			 */
-			getCachedUpstreamAheadBehindCount(path?: string): { ahead: number, behind: number };
-
-			/** Returns the git configuration value specified by the key. */
-			getConfigValue(key: string, path?: string): string;
-
-			/** Returns the origin url of the repository. */
-			getOriginURL(path?: string): string;
-
-			/** Returns the upstream branch for the current HEAD, or null if there is no
-			 *  upstream branch for the current HEAD.
-			 */
-			getUpstreamBranch(path?: string): string|null;
-
-			/** Gets all the local and remote references. */
-			getReferences(path?: string): { heads: string[], remotes: string[], tags: string[] };
-
-			/** Returns the current string SHA for the given reference. */
-			getReferenceTarget(reference: string, path?: string): string;
-
-			// Reading Status
-			/** Returns true if the given path is modified. */
-			isPathModified(path: string): boolean;
-
-			/** Returns true if the given path is new. */
-			isPathNew(path: string): boolean;
-
-			/** Is the given path ignored? */
-			isPathIgnored(path: string): boolean;
-
-			/** Get the status of a directory in the repository's working directory. */
-			getDirectoryStatus(path: string): number;
-
-			/** Get the status of a single path in the repository. */
-			getPathStatus(path: string): number;
-
-			/** Get the cached status for the given path. */
-			getCachedPathStatus(path: string): number|null;
-
-			/** Returns true if the given status indicates modification. */
-			isStatusModified(status: number): boolean;
-
-			/** Returns true if the given status indicates a new path. */
-			isStatusNew(status: number): boolean;
-
-			// Retrieving Diffs
-			/** Retrieves the number of lines added and removed to a path.
-			 *  This compares the working directory contents of the path to the HEAD version.
-			 */
-			getDiffStats(path: string): { added: number, deleted: number };
-
-			/** Retrieves the line diffs comparing the HEAD version of the given path
-			 *  and the given text.
-			 */
-			getLineDiffs(path: string, text: string): Array<{ oldStart: number,
-				newStart: number, oldLines: number, newLines: number }>;
-
-			// Checking Out
-			/** Restore the contents of a path in the working directory and index to the
-			 *  version at HEAD.
-			 */
-			checkoutHead(path: string): boolean;
-
-			/** Checks out a branch in your repository. */
-			checkoutReference(reference: string, create: boolean): boolean;
-		}
-
-		/** Represents a gutter within a TextEditor. */
-		interface Gutter {
-			// Gutter Destruction
-			/** Destroys the gutter. */
-			destroy(): void;
-
-			// Event Subscription
-			/** Calls your callback when the gutter's visibility changes. */
-			onDidChangeVisible(callback: (gutter: Gutter) => void): EventKit.Disposable;
-
-			/** Calls your callback when the gutter is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			// Visibility
-			/** Hide the gutter. */
-			hide(): void;
-
-			/** Show the gutter. */
-			show(): void;
-
-			/** Determine whether the gutter is visible. */
-			isVisible(): boolean;
-
-			/** Add a decoration that tracks a DisplayMarker. When the marker moves, is
-			 *  invalidated, or is destroyed, the decoration will be updated to reflect
-			 *  the marker's state.
-			 */
-			decorateMarker(marker: TextBuffer.DisplayMarker, decorationParams:
-				Structures.DecorationProps): Decoration;
-		}
-
-		/** History manager for remembering which projects have been opened.
-		 *  An instance of this class is always available as the atom.history global.
-		 *  The project history is used to enable the 'Reopen Project' menu.
-		 */
-		interface HistoryManager {
-			/** Obtain a list of previously opened projects. */
-			getProjects(): HistoryProject[];
-
-			/** Clear all projects from the history.
-			 *  Note: This is not a privacy function - other traces will still exist, e.g.
-			 *  window state.
-			 */
-			clearProjects(): void;
-
-			/** Invoke the given callback when the list of projects changes. */
-			onDidChangeProjects(callback: (args: { reloaded: boolean }) => void): EventKit.Disposable;
-		}
-
-		interface HistoryProject {
-			paths: string[];
-			lastOpened: Date;
-		}
-
-		/** Represents a decoration that applies to every marker on a given layer. Created via
-		 *  TextEditor::decorateMarkerLayer.
-		 */
-		interface LayerDecoration {
-			/** Destroys the decoration. */
-			destroy(): void;
-
-			/** Determine whether this decoration is destroyed. */
-			isDestroyed(): boolean;
-
-			/** Get this decoration's properties. */
-			getProperties(): Structures.DecorationLayerProps;
-
-			/** Set this decoration's properties. */
-			setProperties(newProperties: Structures.DecorationLayerProps): void;
-
-			/** Override the decoration properties for a specific marker. */
-			setPropertiesForMarker(marker: TextBuffer.DisplayMarker|TextBuffer.Marker,
-				properties: Structures.DecorationLayerProps): void;
-		}
-
-		/** Provides a registry for menu items that you'd like to appear in the application menu. */
-		interface MenuManager {
-			/** Adds the given items to the application menu. */
-			add(items: ReadonlyArray<Options.Menu>): EventKit.Disposable;
-
-			/** Refreshes the currently visible menu. */
-			update(): void;
-		}
-
-		/** A notification to the user containing a message and type. */
-		interface Notification {
-			// Properties
-			dismissed: boolean;
-			displayed: boolean;
-			timestamp: Date;
-
-			// Event Subscription
-			/** Invoke the given callback when the notification is dismissed. */
-			onDidDismiss(callback: (notification: Notification) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the notification is displayed. */
-			onDidDisplay(callback: (notification: Notification) => void): EventKit.Disposable;
-
-			// Methods
-			/** Returns the Notification's type. */
-			getType(): string;
-
-			/** Returns the Notification's message. */
-			getMessage(): string;
-
-			/** Dismisses the notification, removing it from the UI. Calling this
-			 *  programmatically will call all callbacks added via onDidDismiss.
-			 */
-			dismiss(): void;
-		}
-
-		/** A notification manager used to create Notifications to be shown to the user. */
-		interface NotificationManager {
-			// Properties
-			notifications: Notification[];
-
-			// Events
-			/** Invoke the given callback after a notification has been added. */
-			onDidAddNotification(callback: (notification: Notification) => void):
-				EventKit.Disposable;
-
-			// Adding Notifications
-			/** Add a success notification. */
-			addSuccess(message: string, options?: Options.Notification): Notification;
-
-			/** Add an informational notification. */
-			addInfo(message: string, options?: Options.Notification): Notification;
-
-			/** Add a warning notification. */
-			addWarning(message: string, options?: Options.Notification): Notification;
-
-			/** Add an error notification. */
-			addError(message: string, options?: Options.ErrorNotification): Notification;
-
-			/** Add a fatal error notification. */
-			addFatalError(message: string, options?: Options.ErrorNotification): Notification;
-
-			// Getting Notifications
-			/** Get all the notifications. */
-			getNotifications(): Notification[];
-		}
-
-		/** Loads and activates a package's main module and resources such as stylesheets,
-		 *  keymaps, grammar, editor properties, and menus.
-		 */
-		interface Package {
-			// Properties
-			name: string;
-			bundledPackage: boolean;
-			path: string;
-
-			// Event Subscription
-			/** Invoke the given callback when all packages have been activated. */
-			onDidDeactivate(callback: () => void): EventKit.Disposable;
-
-			// Native Module Compatibility
-			/** Are all native modules depended on by this package correctly compiled
-			 *  against the current version of Atom?
-			 */
-			isCompatible(): boolean;
-
-			/** Rebuild native modules in this package's dependencies for the current
-			 *  version of Atom.
-			 */
-			rebuild(): Promise<{ code: number, stdout: string, stderr: string }>;
-
-			/** If a previous rebuild failed, get the contents of stderr. */
-			getBuildFailureOutput(): string|null;
-		}
-
-		/** Package manager for coordinating the lifecycle of Atom packages. */
-		interface PackageManager {
-			// Event Subscription
-			/** Invoke the given callback when all packages have been loaded. */
-			onDidLoadInitialPackages(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when all packages have been activated. */
-			onDidActivateInitialPackages(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a package is activated. */
-			onDidActivatePackage(callback: (package: Package) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a package is deactivated. */
-			onDidDeactivatePackage(callback: (package: Package) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a package is loaded. */
-			onDidLoadPackage(callback: (package: Package) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a package is unloaded. */
-			onDidUnloadPackage(callback: (package: Package) => void): EventKit.Disposable;
-
-			// Package System Data
-			/** Get the path to the apm command. */
-			getApmPath(): string;
-
-			/** Get the paths being used to look for packages. */
-			getPackageDirPaths(): string[];
-
-			// General Package Data
-			/** Resolve the given package name to a path on disk. */
-			resolvePackagePath(name: string): string|undefined;
-
-			/** Is the package with the given name bundled with Atom? */
-			isBundledPackage(name: string): boolean;
-
-			// Enabling and Disabling Packages
-			/** Enable the package with the given name. */
-			enablePackage(name: string): Package|undefined;
-
-			/** Disable the package with the given name. */
-			disablePackage(name: string): Package|undefined;
-
-			/** Is the package with the given name disabled? */
-			isPackageDisabled(name: string): boolean;
-
-			// Accessing Active Packages
-			/** Get an Array of all the active Packages. */
-			getActivePackages(): Package[];
-
-			/** Get the active Package with the given name. */
-			getActivePackage(name: string): Package|undefined;
-
-			/** Is the Package with the given name active? */
-			isPackageActive(name: string): boolean;
-
-			/** Returns a boolean indicating whether package activation has occurred. */
-			hasActivatedInitialPackages(): boolean;
-
-			// Accessing Loaded Packages
-			/** Get an Array of all the loaded Packages. */
-			getLoadedPackages(): Package[];
-
-			/** Get the loaded Package with the given name. */
-			getLoadedPackage(name: string): Package|undefined;
-
-			/** Is the package with the given name loaded? */
-			isPackageLoaded(name: string): boolean;
-
-			/** Returns a boolean indicating whether package loading has occurred. */
-			hasLoadedInitialPackages(): boolean;
-
-			// Accessing Available Packages
-			/** Returns an Array of strings of all the available package paths. */
-			getAvailablePackagePaths(): string[];
-
-			/** Returns an Array of strings of all the available package names.  */
-			getAvailablePackageNames(): string[];
-
-			/** Returns an Array of strings of all the available package metadata. */
-			getAvailablePackageMetadata(): string[];
-		}
-
-		/** A container for presenting content in the center of the workspace. */
-		interface Pane {
-			// Event Subscription
-			/** Invoke the given callback when the pane resizes. */
-			onDidChangeFlexScale(callback: (flexScale: number) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current and future values of ::getFlexScale. */
-			observeFlexScale(callback: (flexScale: number) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the pane is activated. */
-			onDidActivate(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback before the pane is destroyed. */
-			onWillDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the pane is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the value of the ::isActive property changes. */
-			onDidChangeActive(callback: (active: boolean) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current and future values of the ::isActive
-			 *  property.
-			 */
-			observeActive(callback: (active: boolean) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when an item is added to the pane. */
-			onDidAddItem(callback: (event: Events.PaneListItemShifted) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when an item is removed from the pane. */
-			onDidRemoveItem(callback: (event: Events.PaneListItemShifted) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback before an item is removed from the pane. */
-			onWillRemoveItem(callback: (event: Events.PaneListItemShifted) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when an item is moved within the pane. */
-			onDidMoveItem(callback: (event: Events.PaneItemMoved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future items. */
-			observeItems(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the value of ::getActiveItem changes. */
-			onDidChangeActiveItem(callback: (activeItem: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when ::activateNextRecentlyUsedItem has been called,
-			 *  either initiating or continuing a forward MRU traversal of pane items.
-			 */
-			onChooseNextMRUItem(callback: (nextRecentlyUsedItem: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when ::activatePreviousRecentlyUsedItem has been called,
-			 *  either initiating or continuing a reverse MRU traversal of pane items.
-			 */
-			onChooseLastMRUItem(callback: (previousRecentlyUsedItem: object) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when ::moveActiveItemToTopOfStack has been called,
-			 *  terminating an MRU traversal of pane items and moving the current active item
-			 *  to the top of the stack. Typically bound to a modifier (e.g. CTRL) key up event.
-			 */
-			onDoneChoosingMRUItem(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current and future values of ::getActiveItem. */
-			observeActiveItem(callback: (activeItem: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback before items are destroyed. */
-			onWillDestroyItem(callback: (event: Events.PaneListItemShifted) => void):
-				EventKit.Disposable;
-
-			// Items
-			/** Get the items in this pane. */
-			getItems(): object[];
-
-			/** Get the active pane item in this pane. */
-			getActiveItem(): object;
-
-			/** Return the item at the given index. */
-			itemAtIndex(index: number): object|undefined;
-
-			/** Makes the next item active. */
-			activateNextItem(): void;
-
-			/** Makes the previous item active. */
-			activatePreviousItem(): void;
-
-			/** Move the active tab to the right. */
-			moveItemRight(): void;
-
-			/** Move the active tab to the left. */
-			moveItemLeft(): void;
-
-			/** Get the index of the active item. */
-			getActiveItemIndex(): number;
-
-			/** Activate the item at the given index. */
-			activateItemAtIndex(index: number): void;
-
-			/** Make the given item active, causing it to be displayed by the pane's view. */
-			activateItem(item: object, options?: { pending: boolean }): void;
-
-			/** Add the given item to the pane. */
-			addItem(item: object, options?: { index?: number, pending?: boolean }): object;
-
-			/** Add the given items to the pane. */
-			addItems(items: object[], index?: number): object[];
-
-			/** Move the given item to the given index. */
-			moveItem(item: object, index: number): void;
-
-			/** Move the given item to the given index on another pane. */
-			moveItemToPane(item: object, pane: Pane, index: number): void;
-
-			/** Destroy the active item and activate the next item. */
-			destroyActiveItem(): void;
-
-			/** Destroy the given item. */
-			destroyItem(item: object, force?: boolean): Promise<boolean>;
-
-			/** Destroy all items. */
-			destroyItems(): void;
-
-			/** Destroy all items except for the active item. */
-			destroyInactiveItems(): void;
-
-			/** Save the active item. */
-			saveActiveItem<T = void>(nextAction?: (error?: Error) => T):
-				Promise<T>|undefined;
-
-			/** Prompt the user for a location and save the active item with the path
-			 *  they select.
-			 */
-			saveActiveItemAs<T = void>(nextAction?: (error?: Error) => T):
-				Promise<T>|undefined;
-
-			/** Save the given item. */
-			saveItem<T = void>(item: object, nextAction?: (error?: Error) => T):
-				Promise<T>|undefined;
-
-			/** Prompt the user for a location and save the active item with the path
-			 *  they select.
-			 */
-			saveItemAs<T = void>(item: object, nextAction?: (error?: Error) => T):
-				Promise<T>|undefined;
-
-			/** Save all items. */
-			saveItems(): void;
-
-			/** Return the first item that matches the given URI or undefined if none exists. */
-			itemForURI(uri: string): object|undefined;
-
-			/** Activate the first item that matches the given URI. */
-			activateItemForURI(uri: string): boolean;
-
-			// Lifecycle
-			/** Determine whether the pane is active. */
-			isActive(): boolean;
-
-			/** Makes this pane the active pane, causing it to gain focus. */
-			activate(): void;
-
-			/** Close the pane and destroy all its items. */
-			destroy(): void;
-
-			/** Determine whether this pane has been destroyed. */
-			isDestroyed(): boolean;
-
-			// Splitting
-			/** Create a new pane to the left of this pane. */
-			splitLeft(params?: {
-				items?: object[],
-				copyActiveItem?: boolean,
-			}): Pane;
-
-			/** Create a new pane to the right of this pane. */
-			splitRight(params?: {
-				items?: object[],
-				copyActiveItem?: boolean,
-			}): Pane;
-
-			/** Creates a new pane above the receiver. */
-			splitUp(params?: {
-				items?: object[],
-				copyActiveItem?: boolean,
-			}): Pane;
-
-			/** Creates a new pane below the receiver. */
-			splitDown(params?: {
-				items?: object[],
-				copyActiveItem?: boolean,
-			}): Pane;
-		}
-
-		/** A container representing a panel on the edges of the editor window. You
-		 *  should not create a Panel directly, instead use Workspace::addTopPanel and
-		 *  friends to add panels.
-		 */
-		interface Panel {
-			visible: boolean;
-
-			// Construction and Destruction
-			/** Destroy and remove this panel from the UI. */
-			destroy(): void;
-
-			// Event Subscription
-			/** Invoke the given callback when the pane hidden or shown. */
-			onDidChangeVisible(callback: (visible: boolean) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the pane is destroyed. */
-			onDidDestroy(callback: (panel: Panel) => void): EventKit.Disposable;
-
-			// Panel Details
-			/** Returns the panel's item. */
-			getItem(): object;
-
-			/** Returns a number indicating this panel's priority. */
-			getPriority(): number;
-
-			/** Returns a boolean true when the panel is visible. */
-			isVisible(): boolean;
-
-			/** Hide this panel. */
-			hide(): void;
-
-			/** Show this panel. */
-			show(): void;
-		}
-
-		/** Manage a subscription to filesystem events that occur beneath a root directory. */
-		interface PathWatcher extends EventKit.DisposableLike {
-			/** Return a Promise that will resolve when the underlying native watcher is
-			 *  ready to begin sending events.
-			 */
-			getStartPromise(): Promise<void>;
-
-			/** Invokes a function when any errors related to this watcher are reported. */
-			onDidError(callback: (error: Error) => void): EventKit.Disposable;
-
-			/** Unsubscribe all subscribers from filesystem events. Native resources will be
-			 *  release asynchronously, but this watcher will stop broadcasting events
-			 *  immediately.
-			 */
-			dispose(): void;
-		}
-
-		/** Represents a project that's opened in Atom. */
-		interface Project {
-			// Event Subscription
-			/** Invoke the given callback when the project paths change. */
-			onDidChangePaths(callback: (projectPaths: string[]) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a text buffer is added to the project. */
-			onDidAddBuffer(callback: (buffer: TextBuffer.TextBuffer) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future text buffers in
-			 *  the project.
-			 */
-			observeBuffers(callback: (buffer: TextBuffer.TextBuffer) => void): EventKit.Disposable;
-
-			/** Invoke a callback when a filesystem change occurs within any open project path. */
-			onDidChangeFiles(callback: (events: Events.FilesystemChange) => void): EventKit.Disposable;
-
-			// Accessing the Git Repository
-			/** Get an Array of GitRepositorys associated with the project's directories. */
-			getRepositories(): GitRepository[];
-
-			/** Get the repository for a given directory asynchronously. */
-			repositoryForDirectory(directory: PathWatcher.Directory): Promise<GitRepository|null>;
-
-			// Managing Paths
-			/** Get an Array of strings containing the paths of the project's directories. */
-			getPaths(): string[];
-
-			/** Set the paths of the project's directories. */
-			setPaths(projectPaths: string[]): void;
-
-			/** Add a path to the project's list of root paths. */
-			addPath(projectPath: string): void;
-
-			/** Access a promise that resolves when the filesystem watcher associated with a
-			 *  project root directory is ready to begin receiving events.
-			 */
-			getWatcherPromise(projectPath: string): Promise<PathWatcher>;
-
-			/** Remove a path from the project's list of root paths. */
-			removePath(projectPath: string): void;
-
-			/** Get an Array of Directorys associated with this project. */
-			getDirectories(): PathWatcher.Directory[];
-
-			/** Get the relative path from the project directory to the given path. */
-			relativize(fullPath: string): string;
-
-			/** Get the path to the project directory that contains the given path, and
-			 *  the relative path from that project directory to the given path.
-			 */
-			relativizePath(fullPath: string): [string|null, string];
-
-			/** Determines whether the given path (real or symbolic) is inside the
-			 *  project's directory.
-			 */
-			contains(pathToCheck: string): boolean;
-		}
-
-		/** Wraps an Array of Strings. The Array describes a path from the root of the
-		 *  syntax tree to a token including all scope names for the entire path.
-		 */
-		interface ScopeDescriptor {
-			scopes: string[];
-
-			/** Returns all scopes for this descriptor. */
-			getScopesArray(): string[];
-		}
-
-		/** Represents a selection in the TextEditor. */
-		interface Selection {
-			// Event Subscription
-			/** Calls your callback when the selection was moved. */
-			onDidChangeRange(callback: (event: Events.SelectionChanged) => void):
-				EventKit.Disposable;
-
-			/** Calls your callback when the selection was destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			// Managing the selection range
-			/** Returns the screen Range for the selection. */
-			getScreenRange(): TextBuffer.Range;
-
-			/** Modifies the screen range for the selection. */
-			setScreenRange(screenRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], options?:
-				{ preserveFolds?: boolean, autoscroll?: boolean }): void;
-
-			/** Returns the buffer Range for the selection. */
-			getBufferRange(): TextBuffer.Range;
-
-			/** Modifies the buffer Range for the selection. */
-			setBufferRange(bufferRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], options?:
-				{ preserveFolds?: boolean, autoscroll?: boolean }): void;
-
-			/** Returns the starting and ending buffer rows the selection is highlighting. */
-			getBufferRowRange(): [number, number];
-
-			// Info about the selection
-			/** Determines if the selection contains anything. */
-			isEmpty(): boolean;
-
-			/** Determines if the ending position of a marker is greater than the starting position.
-			 *  This can happen when, for example, you highlight text "up" in a TextBuffer.
-			 */
-			isReversed(): boolean;
-
-			/** Returns whether the selection is a single line or not. */
-			isSingleScreenLine(): boolean;
-
-			/** Returns the text in the selection. */
-			getText(): string;
-
-			// NOTE: this calls into Range.intersectsWith(), which is one of the few functions
-			//   that doesn't take a range-compatible range, despite what the API says.
-			/** Identifies if a selection intersects with a given buffer range. */
-			intersectsBufferRange(bufferRange: TextBuffer.RangeLike): boolean;
-
-			/** Identifies if a selection intersects with another selection. */
-			intersectsWith(otherSelection: Selection): boolean;
-
-			// Modifying the selected range
-			/** Clears the selection, moving the marker to the head. */
-			clear(options?: { autoscroll?: boolean }): void;
-
-			/** Selects the text from the current cursor position to a given screen position. */
-			selectToScreenPosition(position: TextBuffer.PointLike|[number, number]): void;
-
-			/** Selects the text from the current cursor position to a given buffer position. */
-			selectToBufferPosition(position: TextBuffer.PointLike|[number, number]): void;
-
-			/** Selects the text one position right of the cursor. */
-			selectRight(columnCount?: number): void;
-
-			/** Selects the text one position left of the cursor. */
-			selectLeft(columnCount?: number): void;
-
-			/** Selects all the text one position above the cursor. */
-			selectUp(rowCount?: number): void;
-
-			/** Selects all the text one position below the cursor. */
-			selectDown(rowCount?: number): void;
-
-			/** Selects all the text from the current cursor position to the top of the
-			 *  buffer.
-			 */
-			selectToTop(): void;
-
-			/** Selects all the text from the current cursor position to the bottom of
-			 *  the buffer.
-			 */
-			selectToBottom(): void;
-
-			/** Selects all the text in the buffer. */
-			selectAll(): void;
-
-			/** Selects all the text from the current cursor position to the beginning of
-			 *  the line.
-			 */
-			selectToBeginningOfLine(): void;
-
-			/** Selects all the text from the current cursor position to the first character
-			 *  of the line.
-			 */
-			selectToFirstCharacterOfLine(): void;
-
-			/** Selects all the text from the current cursor position to the end of the
-			 *  screen line.
-			 */
-			selectToEndOfLine(): void;
-
-			/** Selects all the text from the current cursor position to the end of the
-			 *  buffer line.
-			 */
-			selectToEndOfBufferLine(): void;
-
-			/** Selects all the text from the current cursor position to the beginning
-			 *  of the word.
-			 */
-			selectToBeginningOfWord(): void;
-
-			/** Selects all the text from the current cursor position to the end of the word. */
-			selectToEndOfWord(): void;
-
-			/** Selects all the text from the current cursor position to the beginning of
-			 *  the next word.
-			 */
-			selectToBeginningOfNextWord(): void;
-
-			/** Selects text to the previous word boundary. */
-			selectToPreviousWordBoundary(): void;
-
-			/** Selects text to the next word boundary. */
-			selectToNextWordBoundary(): void;
-
-			/** Selects text to the previous subword boundary. */
-			selectToPreviousSubwordBoundary(): void;
-
-			/** Selects text to the next subword boundary. */
-			selectToNextSubwordBoundary(): void;
-
-			/** Selects all the text from the current cursor position to the beginning of
-			 *  the next paragraph.
-			 */
-			selectToBeginningOfNextParagraph(): void;
-
-			/** Selects all the text from the current cursor position to the beginning of
-			 *  the previous paragraph.
-			 */
-			selectToBeginningOfPreviousParagraph(): void;
-
-			/** Modifies the selection to encompass the current word. */
-			selectWord(): void;
-
-			/** Expands the newest selection to include the entire word on which the
-			 *  cursors rests.
-			 */
-			expandOverWord(): void;
-
-			/** Selects an entire line in the buffer. */
-			selectLine(row: number): void;
-
-			/** Expands the newest selection to include the entire line on which the cursor
-			 *  currently rests.
-			 *  It also includes the newline character.
-			 */
-			expandOverLine(): void;
-
-			// Modifying the selected text
-			/** Replaces text at the current selection. */
-			insertText(text: string, options?: Options.TextInsertion): void;
-
-			/** Removes the first character before the selection if the selection is empty
-			 *  otherwise it deletes the selection.
-			 */
-			backspace(): void;
-
-			/** Removes the selection or, if nothing is selected, then all characters from
-			 *  the start of the selection back to the previous word boundary.
-			 */
-			deleteToPreviousWordBoundary(): void;
-
-			/** Removes the selection or, if nothing is selected, then all characters from
-			 *  the start of the selection up to the next word boundary.
-			 */
-			deleteToNextWordBoundary(): void;
-
-			/** Removes from the start of the selection to the beginning of the current
-			 *  word if the selection is empty otherwise it deletes the selection.
-			 */
-			deleteToBeginningOfWord(): void;
-
-			/** Removes from the beginning of the line which the selection begins on all
-			 *  the way through to the end of the selection.
-			 */
-			deleteToBeginningOfLine(): void;
-
-			/** Removes the selection or the next character after the start of the selection
-			 *  if the selection is empty.
-			 */
-			delete(): void;
-
-			/** If the selection is empty, removes all text from the cursor to the end of
-			 *  the line. If the cursor is already at the end of the line, it removes the following
-			 *  newline. If the selection isn't empty, only deletes the contents of the selection.
-			 */
-			deleteToEndOfLine(): void;
-
-			/** Removes the selection or all characters from the start of the selection to
-			 *  the end of the current word if nothing is selected.
-			 */
-			deleteToEndOfWord(): void;
-
-			/** Removes the selection or all characters from the start of the selection to
-			 *  the end of the current word if nothing is selected.
-			 */
-			deleteToBeginningOfSubword(): void;
-
-			/** Removes the selection or all characters from the start of the selection to
-			 *  the end of the current word if nothing is selected.
-			 */
-			deleteToEndOfSubword(): void;
-
-			/** Removes only the selected text. */
-			deleteSelectedText(): void;
-
-			/** Removes the line at the beginning of the selection if the selection is empty
-			 *  unless the selection spans multiple lines in which case all lines are removed.
-			 */
-			deleteLine(): void;
-
-			/** Joins the current line with the one below it. Lines will be separated by a single space.
-			 *  If there selection spans more than one line, all the lines are joined together.
-			 */
-			joinLines(): void;
-
-			/** Removes one level of indent from the currently selected rows. */
-			outdentSelectedRows(): void;
-
-			/** Sets the indentation level of all selected rows to values suggested by the
-			 *  relevant grammars.
-			 */
-			autoIndentSelectedRows(): void;
-
-			/** Wraps the selected lines in comments if they aren't currently part of a comment.
-			 *  Removes the comment if they are currently wrapped in a comment.
-			 */
-			toggleLineComments(): void;
-
-			/** Cuts the selection until the end of the screen line. */
-			cutToEndOfLine(): void;
-
-			/** Cuts the selection until the end of the buffer line. */
-			cutToEndOfBufferLine(): void;
-
-			/** Copies the selection to the clipboard and then deletes it. */
-			cut(maintainClipboard?: boolean, fullLine?: boolean): void;
-
-			/** Copies the current selection to the clipboard. */
-			copy(maintainClipboard?: boolean, fullLine?: boolean): void;
-
-			/** Creates a fold containing the current selection. */
-			fold(): void;
-
-			/** If the selection spans multiple rows, indent all of them. */
-			indentSelectedRows(): void;
-
-			// Managing multiple selections
-			/** Moves the selection down one row. */
-			addSelectionBelow(): void;
-
-			/** Moves the selection up one row. */
-			addSelectionAbove(): void;
-
-			/** Combines the given selection into this selection and then destroys the
-			 *  given selection.
-			 */
-			merge(otherSelection: Selection, options?: { preserveFolds?: boolean,
-				autoscroll?: boolean }): void;
-
-			// Comparing to other selections
-			/** Compare this selection's buffer range to another selection's buffer range.
-			 *  See Range::compare for more details.
-			 */
-			compare(otherSelection: Selection): number;
-		}
-
-		/** A singleton instance of this class available via atom.styles, which you can
-		 *  use to globally query and observe the set of active style sheets.
-		 */
-		interface StyleManager {
-			// Event Subscription
-			/** Invoke callback for all current and future style elements. */
-			observeStyleElements(callback: (styleElement: Events.StyleElementObserved) =>
-				void): EventKit.Disposable;
-
-			/** Invoke callback when a style element is added. */
-			onDidAddStyleElement(callback: (styleElement: Events.StyleElementObserved) =>
-				void): EventKit.Disposable;
-
-			/** Invoke callback when a style element is removed. */
-			onDidRemoveStyleElement(callback: (styleElement: HTMLStyleElement) => void):
-				EventKit.Disposable;
-
-			/** Invoke callback when an existing style element is updated. */
-			onDidUpdateStyleElement(callback: (styleElement: Events.StyleElementObserved) =>
-				void): EventKit.Disposable;
-
-			// Reading Style Elements
-			/** Get all loaded style elements. */
-			getStyleElements(): HTMLStyleElement[];
-
-			// Paths
-			/** Get the path of the user style sheet in ~/.atom. */
-			getUserStyleSheetPath(): string;
-		}
-
-		/** Run a node script in a separate process. */
-		interface Task {
-			// NOTE: this is actually the best we can do here with the REST parameter
-			// for this appearing in the beginning of the parameter list, which isn't
-			// aligned with the ES6 spec.
-			/** Starts the task.
-			 *  Throws an error if this task has already been terminated or if sending a
-			 *  message to the child process fails.
-			 */
-			// tslint:disable-next-line:no-any
-			start(...args: any[]): void;
-
-			/** Send message to the task.
-			 *  Throws an error if this task has already been terminated or if sending a
-			 *  message to the child process fails.
-			 */
-			send(message: string): void;
-
-			/** Call a function when an event is emitted by the child process. */
-			// tslint:disable-next-line:no-any
-			on(eventName: string, callback: (param: any) => void): EventKit.Disposable;
-
-			/** Forcefully stop the running task.
-			 *  No more events are emitted once this method is called.
-			 */
-			terminate(): void;
-
-			/** Cancel the running task and emit an event if it was canceled. */
-			cancel(): boolean;
-		}
-
-		/** An interface which all custom test runners should implement. */
-		type TestRunner = (params: Structures.TestRunnerArgs) => Promise<number>;
-
-		/** This class represents all essential editing state for a single TextBuffer,
-		 *  including cursor and selection positions, folds, and soft wraps.
-		 */
-		interface TextEditor {
-			// Properties
-			id: number;
-			buffer: TextBuffer.TextBuffer;
-			element: HTMLElement;
-
-			// Event Subscription
-			/** Calls your callback when the buffer's title has changed. */
-			onDidChangeTitle(callback: (title: string) => void): EventKit.Disposable;
-
-			/** Calls your callback when the buffer's path, and therefore title, has changed. */
-			onDidChangePath(callback: (path: string) => void): EventKit.Disposable;
-
-			/** Invoke the given callback synchronously when the content of the buffer
-			 *  changes.
-			 */
-			onDidChange(callback: (event: Events.EditorChanged[]) => void):
-				EventKit.Disposable;
-
-			/** Invoke callback when the buffer's contents change. It is emit
-			 *  asynchronously 300ms after the last buffer change. This is a good place
-			 *  to handle changes to the buffer without compromising typing performance.
-			 */
-			onDidStopChanging(callback: (event: TextBuffer.Events.BufferStoppedChanging) => void):
-				EventKit.Disposable;
-
-			/** Calls your callback when a Cursor is moved. If there are multiple cursors,
-			 *  your callback will be called for each cursor.
-			 */
-			onDidChangeCursorPosition(callback: (event: Events.CursorPositionChanged) => void):
-				EventKit.Disposable;
-
-			/** Calls your callback when a selection's screen range changes. */
-			onDidChangeSelectionRange(callback: (event: Events.SelectionChanged) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback after the buffer is saved to disk. */
-			onDidSave(callback: (event: { path: string }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the editor is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Retrieves the current TextBuffer. */
-			getBuffer(): TextBuffer.TextBuffer;
-
-			/** Calls your callback when a Gutter is added to the editor. Immediately calls
-			 *  your callback for each existing gutter.
-			 */
-			observeGutters(callback: (gutter: Gutter) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Gutter is added to the editor. */
-			onDidAddGutter(callback: (gutter: Gutter) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Gutter is removed from the editor. */
-			onDidRemoveGutter(callback: (name: string) => void): EventKit.Disposable;
-
-			/** Calls your callback when soft wrap was enabled or disabled. */
-			onDidChangeSoftWrapped(callback: (softWrapped: boolean) => void): EventKit.Disposable;
-
-			/** Calls your callback when the buffer's encoding has changed. */
-			onDidChangeEncoding(callback: (encoding: string) => void): EventKit.Disposable;
-
-			/** Calls your callback when the grammar that interprets and colorizes the text
-			 *  has been changed. Immediately calls your callback with the current grammar.
-			 */
-			observeGrammar(callback: (grammar: FirstMate.Grammar) => void): EventKit.Disposable;
-
-			/** Calls your callback when the grammar that interprets and colorizes the text
-			 *  has been changed.
-			 */
-			onDidChangeGrammar(callback: (grammar: FirstMate.Grammar) => void): EventKit.Disposable;
-
-			/** Calls your callback when the result of ::isModified changes. */
-			onDidChangeModified(callback: (modified: boolean) => void): EventKit.Disposable;
-
-			/** Calls your callback when the buffer's underlying file changes on disk at a
-			 *  moment when the result of ::isModified is true.
-			 */
-			onDidConflict(callback: () => void): EventKit.Disposable;
-
-			/** Calls your callback before text has been inserted. */
-			onWillInsertText(callback: (event: { text: string, cancel(): void }) => void):
-				EventKit.Disposable;
-
-			/** Calls your callback after text has been inserted. */
-			onDidInsertText(callback: (event: { text: string }) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Cursor is added to the editor. Immediately calls
-			 *  your callback for each existing cursor.
-			 */
-			observeCursors(callback: (cursor: Cursor) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Cursor is added to the editor. */
-			onDidAddCursor(callback: (cursor: Cursor) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Cursor is removed from the editor. */
-			onDidRemoveCursor(callback: (cursor: Cursor) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Selection is added to the editor. Immediately
-			 *  calls your callback for each existing selection.
-			 */
-			observeSelections(callback: (selection: Selection) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Selection is added to the editor. */
-			onDidAddSelection(callback: (selection: Selection) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Selection is removed from the editor. */
-			onDidRemoveSelection(callback: (selection: Selection) => void): EventKit.Disposable;
-
-			/** Calls your callback with each Decoration added to the editor. Calls your
-			 *  callback immediately for any existing decorations.
-			 */
-			observeDecorations(callback: (decoration: Decoration) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Decoration is added to the editor. */
-			onDidAddDecoration(callback: (decoration: Decoration) => void): EventKit.Disposable;
-
-			/** Calls your callback when a Decoration is removed from the editor. */
-			onDidRemoveDecoration(callback: (decoration: Decoration) => void): EventKit.Disposable;
-
-			/** Calls your callback when the placeholder text is changed. */
-			onDidChangePlaceholderText(callback: (placeholderText: string) => void): EventKit.Disposable;
-
-			// File Details
-			/** Get the editor's title for display in other parts of the UI such as the tabs.
-			 *  If the editor's buffer is saved, its title is the file name. If it is unsaved,
-			 *  its title is "untitled".
-			 */
-			getTitle(): string;
-
-			/** Get unique title for display in other parts of the UI, such as the window title.
-			 *  If the editor's buffer is unsaved, its title is "untitled" If the editor's
-			 *  buffer is saved, its unique title is formatted as one of the following,
-			 *
-			 *  "" when it is the only editing buffer with this file name.
-			 *  " — " when other buffers have this file name.
-			 */
-			getLongTitle(): string;
-
-			/** Returns the string path of this editor's text buffer. */
-			getPath(): string|undefined;
-
-			/** Returns boolean true if this editor has been modified. */
-			isModified(): boolean;
-
-			/** Returns boolean true if this editor has no content. */
-			isEmpty(): boolean;
-
-			/** Returns the string character set encoding of this editor's text buffer. */
-			getEncoding(): string;
-
-			/** Set the character set encoding to use in this editor's text buffer. */
-			setEncoding(encoding: string): void;
-
-			// File Operations
-			/** Saves the editor's text buffer.
-			 *  See TextBuffer::save for more details.
-			 */
-			save(): Promise<void>;
-
-			/** Saves the editor's text buffer as the given path.
-			 *  See TextBuffer::saveAs for more details.
-			 */
-			saveAs(filePath: string): Promise<void>;
-
-			// Reading Text
-			/** Returns a string representing the entire contents of the editor. */
-			getText(): string;
-
-			/** Get the text in the given range in buffer coordinates. */
-			getTextInBufferRange(range: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]]): string;
-
-			/** Returns a number representing the number of lines in the buffer. */
-			getLineCount(): number;
-
-			/** Returns a number representing the number of screen lines in the editor.
-			 *  This accounts for folds.
-			 */
-			getScreenLineCount(): number;
-
-			/** Returns a number representing the last zero-indexed buffer row number of
-			 *  the editor.
-			 */
-			getLastBufferRow(): number;
-
-			/** Returns a number representing the last zero-indexed screen row number of
-			 *  the editor.
-			 */
-			getLastScreenRow(): number;
-
-			/** Returns a string representing the contents of the line at the given
-			 *  buffer row.
-			 */
-			lineTextForBufferRow(bufferRow: number): string;
-
-			/** Returns a string representing the contents of the line at the given
-			 *  screen row.
-			 */
-			lineTextForScreenRow(screenRow: number): string;
-
-			/** Get the range of the paragraph surrounding the most recently added cursor. */
-			getCurrentParagraphBufferRange(): TextBuffer.Range;
-
-			// Mutating Text
-			/** Replaces the entire contents of the buffer with the given string. */
-			setText(text: string): void;
-
-			/** Set the text in the given Range in buffer coordinates. */
-			setTextInBufferRange(range: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], text: string,
-				options?: { normalizeLineEndings?: boolean, undo?: "skip" }): void;
-
-			/* For each selection, replace the selected text with the given text. */
-			insertText(text: string, options?: { select?: boolean, autoIndent?: boolean,
-				autoIndentNewline?: boolean, autoDecreaseIndent?: boolean,
-				normalizeLineEndings?: boolean, undo?: "skip" }): TextBuffer.Range|boolean;
-
-			/** For each selection, replace the selected text with a newline. */
-			insertNewline(): void;
-
-			/** For each selection, if the selection is empty, delete the character following
-			 *  the cursor. Otherwise delete the selected text.
-			 */
-			delete(): void;
-
-			/** For each selection, if the selection is empty, delete the character preceding
-			 *  the cursor. Otherwise delete the selected text.
-			 */
-			backspace(): void;
-
-			/** Mutate the text of all the selections in a single transaction.
-			 *  All the changes made inside the given function can be reverted with a single
-			 *  call to ::undo.
-			 */
-			mutateSelectedText(fn: (selection: Selection, index: number) => void): void;
-
-			/** For each selection, transpose the selected text.
-			 *  If the selection is empty, the characters preceding and following the cursor
-			 *  are swapped. Otherwise, the selected characters are reversed.
-			 */
-			transpose(): void;
-
-			/** Convert the selected text to upper case.
-			 *  For each selection, if the selection is empty, converts the containing word
-			 *  to upper case. Otherwise convert the selected text to upper case.
-			 */
-			upperCase(): void;
-
-			/** Convert the selected text to lower case.
-			 *  For each selection, if the selection is empty, converts the containing word
-			 *  to upper case. Otherwise convert the selected text to upper case.
-			 */
-			lowerCase(): void;
-
-			/** Toggle line comments for rows intersecting selections.
-			 *  If the current grammar doesn't support comments, does nothing.
-			 */
-			toggleLineCommentsInSelection(): void;
-
-			/** For each cursor, insert a newline at beginning the following line. */
-			insertNewlineBelow(): void;
-
-			/** For each cursor, insert a newline at the end of the preceding line. */
-			insertNewlineAbove(): void;
-
-			/** For each selection, if the selection is empty, delete all characters of the
-			 *  containing word that precede the cursor. Otherwise delete the selected text.
-			 */
-			deleteToBeginningOfWord(): void;
-
-			/** Similar to ::deleteToBeginningOfWord, but deletes only back to the previous
-			 *  word boundary.
-			 */
-			deleteToPreviousWordBoundary(): void;
-
-			/** Similar to ::deleteToEndOfWord, but deletes only up to the next word boundary. */
-			deleteToNextWordBoundary(): void;
-
-			/** For each selection, if the selection is empty, delete all characters of the
-			 *  containing subword following the cursor. Otherwise delete the selected text.
-			 */
-			deleteToBeginningOfSubword(): void;
-
-			/** For each selection, if the selection is empty, delete all characters of the
-			 *  containing subword following the cursor. Otherwise delete the selected text.
-			 */
-			deleteToEndOfSubword(): void;
-
-			/** For each selection, if the selection is empty, delete all characters of the
-			 *  containing line that precede the cursor. Otherwise delete the selected text.
-			 */
-			deleteToBeginningOfLine(): void;
-
-			/** For each selection, if the selection is not empty, deletes the selection
-			 *  otherwise, deletes all characters of the containing line following the cursor.
-			 *  If the cursor is already at the end of the line, deletes the following newline.
-			 */
-			deleteToEndOfLine(): void;
-
-			/** For each selection, if the selection is empty, delete all characters of the
-			 *  containing word following the cursor. Otherwise delete the selected text.
-			 */
-			deleteToEndOfWord(): void;
-
-			/** Delete all lines intersecting selections. */
-			deleteLine(): void;
-
-			// History
-			/** Undo the last change. */
-			undo(): void;
-
-			/** Redo the last change. */
-			redo(): void;
-
-			/** Batch multiple operations as a single undo/redo step.
-			 *  Any group of operations that are logically grouped from the perspective of undoing
-			 *  and redoing should be performed in a transaction. If you want to abort the transaction,
-			 *  call ::abortTransaction to terminate the function's execution and revert any changes
-			 *  performed up to the abortion.
-			 */
-			transact(fn: () => void): void;
-			/** Batch multiple operations as a single undo/redo step.
-			 *  Any group of operations that are logically grouped from the perspective of undoing
-			 *  and redoing should be performed in a transaction. If you want to abort the transaction,
-			 *  call ::abortTransaction to terminate the function's execution and revert any changes
-			 *  performed up to the abortion.
-			 */
-			transact(groupingInterval: number, fn: () => void): void;
-
-			/** Abort an open transaction, undoing any operations performed so far within the transaction. */
-			abortTransaction(): void;
-
-			/** Create a pointer to the current state of the buffer for use with ::revertToCheckpoint
-			 *  and ::groupChangesSinceCheckpoint.
-			 */
-			createCheckpoint(): number;
-
-			/** Revert the buffer to the state it was in when the given checkpoint was created.
-			 *  The redo stack will be empty following this operation, so changes since the checkpoint
-			 *  will be lost. If the given checkpoint is no longer present in the undo history, no
-			 *  changes will be made to the buffer and this method will return false.
-			 */
-			revertToCheckpoint(checkpoint: number): boolean;
-
-			/** Group all changes since the given checkpoint into a single transaction for purposes
-			 *  of undo/redo.
-			 *  If the given checkpoint is no longer present in the undo history, no grouping will be
-			 *  performed and this method will return false.
-			 */
-			groupChangesSinceCheckpoint(checkpoint: number): boolean;
-
-			// TextEditor Coordinates
-			/** Convert a position in buffer-coordinates to screen-coordinates. */
-			screenPositionForBufferPosition(bufferPosition: TextBuffer.PointLike|[number, number],
-				options?: { clipDirection?: "backward"|"forward"|"closest"}): TextBuffer.Point;
-
-			/** Convert a position in screen-coordinates to buffer-coordinates. */
-			bufferPositionForScreenPosition(bufferPosition: TextBuffer.PointLike|[number, number],
-				options?: { clipDirection?: "backward"|"forward"|"closest"}): TextBuffer.Point;
-
-			/** Convert a range in buffer-coordinates to screen-coordinates. */
-			screenRangeForBufferRange(bufferRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]]): TextBuffer.Range;
-
-			/** Convert a range in screen-coordinates to buffer-coordinates. */
-			bufferRangeForScreenRange(screenRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]]): TextBuffer.Range;
-
-			/** Clip the given Point to a valid position in the buffer. */
-			clipBufferPosition(bufferPosition: TextBuffer.PointLike|[number, number]):
-				TextBuffer.Point;
-
-			/** Clip the start and end of the given range to valid positions in the buffer.
-			 *  See ::clipBufferPosition for more information.
-			 */
-			clipBufferRange(range: TextBuffer.RangeLike|[TextBuffer.PointLike, TextBuffer.PointLike]|
-				[TextBuffer.PointLike, [number, number]]|[[number, number], TextBuffer.PointLike]|
-				[[number, number], [number, number]]): TextBuffer.Range;
-
-			/** Clip the given Point to a valid position on screen. */
-			clipScreenPosition(screenPosition: TextBuffer.PointLike|[number, number],
-				options?: { clipDirection?: "backward"|"forward"|"closest"}): TextBuffer.Point;
-
-			/** Clip the start and end of the given range to valid positions on screen.
-			 *  See ::clipScreenPosition for more information.
-			 */
-			clipScreenRange(range: TextBuffer.RangeLike|[TextBuffer.PointLike, TextBuffer.PointLike]|
-				[TextBuffer.PointLike, [number, number]]|[[number, number], TextBuffer.PointLike]|
-				[[number, number], [number, number]], options?: { clipDirection?:
-				"backward"|"forward"|"closest"}): TextBuffer.Range;
-
-			// Decorations
-			/** Add a decoration that tracks a DisplayMarker. When the marker moves, is
-			 *  invalidated, or is destroyed, the decoration will be updated to reflect
-			 *  the marker's state.
-			 */
-			decorateMarker(marker: TextBuffer.DisplayMarker, decorationParams:
-				Structures.DecorationProps): Decoration;
-
-			/** Add a decoration to every marker in the given marker layer. Can be used to
-			 *  decorate a large number of markers without having to create and manage many
-			 *  individual decorations.
-			 */
-			decorateMarkerLayer(markerLayer: TextBuffer.MarkerLayer|TextBuffer.DisplayMarkerLayer,
-				decorationParams: Structures.DecorationLayerProps): LayerDecoration;
-
-			/** Get all decorations. */
-			getDecorations(propertyFilter?: Structures.DecorationProps): Decoration[];
-
-			/** Get all decorations of type 'line'. */
-			getLineDecorations(propertyFilter?: Structures.DecorationProps): Decoration[];
-
-			/** Get all decorations of type 'line-number'. */
-			getLineNumberDecorations(propertyFilter?: Structures.DecorationProps): Decoration[];
-
-			/** Get all decorations of type 'highlight'. */
-			getHighlightDecorations(propertyFilter?: Structures.DecorationProps): Decoration[];
-
-			/** Get all decorations of type 'overlay'. */
-			getOverlayDecorations(propertyFilter?: Structures.DecorationProps): Decoration[];
-
-			// Markers
-			/** Create a marker on the default marker layer with the given range in buffer coordinates.
-			 *  This marker will maintain its logical location as the buffer is changed, so if you mark
-			 *  a particular word, the marker will remain over that word even if the word's location
-			 *  in the buffer changes.
-			 */
-			markBufferRange(range: TextBuffer.RangeLike|[TextBuffer.PointLike, TextBuffer.PointLike]|
-				[TextBuffer.PointLike, [number, number]]|[[number, number], TextBuffer.PointLike]|
-				[[number, number], [number, number]], properties?: { maintainHistory?: boolean,
-				reversed?: boolean, invalidate?: "never"|"surround"|"overlap"|"inside"|"touch" }):
-				TextBuffer.DisplayMarker;
-
-			/** Create a marker on the default marker layer with the given range in screen coordinates.
-			 *  This marker will maintain its logical location as the buffer is changed, so if you mark
-			 *  a particular word, the marker will remain over that word even if the word's location in
-			 *  the buffer changes.
-			 */
-			markScreenRange(range: TextBuffer.RangeLike|[TextBuffer.PointLike, TextBuffer.PointLike]|
-				[TextBuffer.PointLike, [number, number]]|[[number, number], TextBuffer.PointLike]|
-				[[number, number], [number, number]], properties?: { maintainHistory?: boolean,
-				reversed?: boolean, invalidate?: "never"|"surround"|"overlap"|"inside"|"touch" }):
-				TextBuffer.DisplayMarker;
-
-			/** Create a marker on the default marker layer with the given buffer position and no tail.
-			 *  To group multiple markers together in their own private layer, see ::addMarkerLayer.
-			 */
-			markBufferPosition(bufferPosition: TextBuffer.PointLike|[number, number], options?:
-				{ invalidate?: "never"|"surround"|"overlap"|"inside"|"touch" }):
-				TextBuffer.DisplayMarker;
-
-			/** Create a marker on the default marker layer with the given screen position and no tail.
-			 *  To group multiple markers together in their own private layer, see ::addMarkerLayer.
-			 */
-			markScreenPosition(screenPosition: TextBuffer.PointLike|[number, number], options?:
-				{ invalidate?: "never"|"surround"|"overlap"|"inside"|"touch", clipDirection?:
-				"backward"|"forward"|"closest" }): TextBuffer.DisplayMarker;
-
-			/** Find all DisplayMarkers on the default marker layer that match the given properties.
-			 *
-			 *  This method finds markers based on the given properties. Markers can be associated
-			 *  with custom properties that will be compared with basic equality. In addition, there
-			 *  are several special properties that will be compared with the range of the markers
-			 *  rather than their properties.
-			 */
-			findMarkers(properties: TextBuffer.Options.FindDisplayMarker): TextBuffer.DisplayMarker[];
-
-			/** Create a marker layer to group related markers. */
-			addMarkerLayer(options?: {
-				maintainHistory?: boolean,
-				persistent?: boolean,
-			}): TextBuffer.DisplayMarkerLayer;
-
-			/** Get a DisplayMarkerLayer by id. */
-			getMarkerLayer(id: number): TextBuffer.DisplayMarkerLayer|undefined;
-
-			/** Get the default DisplayMarkerLayer.
-			 *  All marker APIs not tied to an explicit layer interact with this default layer.
-			 */
-			getDefaultMarkerLayer(): TextBuffer.DisplayMarkerLayer;
-
-			/** Get the DisplayMarker on the default layer for the given marker id. */
-			getMarker(id: number): TextBuffer.DisplayMarker;
-
-			/** Get all DisplayMarkers on the default marker layer. Consider using ::findMarkers. */
-			getMarkers(): TextBuffer.DisplayMarker[];
-
-			/** Get the number of markers in the default marker layer. */
-			getMarkerCount(): number;
-
-			// Cursors
-			/** Get the position of the most recently added cursor in buffer coordinates. */
-			getCursorBufferPosition(): TextBuffer.Point;
-
-			/** Get the position of all the cursor positions in buffer coordinates. */
-			getCursorBufferPositions(): TextBuffer.Point[];
-
-			/** Move the cursor to the given position in buffer coordinates.
-			 *  If there are multiple cursors, they will be consolidated to a single cursor.
-			 */
-			setCursorBufferPosition(position: TextBuffer.PointLike|[number, number], options?:
-				{ autoscroll?: boolean }): void;
-
-			/** Get a Cursor at given screen coordinates Point. */
-			getCursorAtScreenPosition(position: TextBuffer.PointLike|[number, number]):
-				Cursor|undefined;
-
-			/** Get the position of the most recently added cursor in screen coordinates. */
-			getCursorScreenPosition(): TextBuffer.Point;
-
-			/** Get the position of all the cursor positions in screen coordinates. */
-			getCursorScreenPositions(): TextBuffer.Point[];
-
-			/** Move the cursor to the given position in screen coordinates.
-			 *  If there are multiple cursors, they will be consolidated to a single cursor.
-			 */
-			setCursorScreenPosition(position: TextBuffer.PointLike|[number, number],
-				options?: { autoscroll?: boolean }): void;
-
-			/** Add a cursor at the given position in buffer coordinates. */
-			addCursorAtBufferPosition(bufferPosition: TextBuffer.PointLike|[number, number]): Cursor;
-
-			/** Add a cursor at the position in screen coordinates. */
-			addCursorAtScreenPosition(screenPosition: TextBuffer.PointLike|[number, number]): Cursor;
-
-			/** Returns a boolean indicating whether or not there are multiple cursors. */
-			hasMultipleCursors(): boolean;
-
-			/** Move every cursor up one row in screen coordinates. */
-			moveUp(lineCount?: number): void;
-
-			/** Move every cursor down one row in screen coordinates. */
-			moveDown(lineCount?: number): void;
-
-			/** Move every cursor left one column. */
-			moveLeft(columnCount?: number): void;
-
-			/** Move every cursor right one column. */
-			moveRight(columnCount?: number): void;
-
-			/** Move every cursor to the beginning of its line in buffer coordinates. */
-			moveToBeginningOfLine(): void;
-
-			/** Move every cursor to the beginning of its line in screen coordinates. */
-			moveToBeginningOfScreenLine(): void;
-
-			/** Move every cursor to the first non-whitespace character of its line. */
-			moveToFirstCharacterOfLine(): void;
-
-			/** Move every cursor to the end of its line in buffer coordinates. */
-			moveToEndOfLine(): void;
-
-			/** Move every cursor to the end of its line in screen coordinates. */
-			moveToEndOfScreenLine(): void;
-
-			/** Move every cursor to the beginning of its surrounding word. */
-			moveToBeginningOfWord(): void;
-
-			/** Move every cursor to the end of its surrounding word. */
-			moveToEndOfWord(): void;
-
-			/** Move every cursor to the top of the buffer.
-			 *  If there are multiple cursors, they will be merged into a single cursor.
-			 */
-			moveToTop(): void;
-
-			/** Move every cursor to the bottom of the buffer.
-			 *  If there are multiple cursors, they will be merged into a single cursor.
-			 */
-			moveToBottom(): void;
-
-			/** Move every cursor to the beginning of the next word. */
-			moveToBeginningOfNextWord(): void;
-
-			/** Move every cursor to the previous word boundary. */
-			moveToPreviousWordBoundary(): void;
-
-			/** Move every cursor to the next word boundary. */
-			moveToNextWordBoundary(): void;
-
-			/** Move every cursor to the previous subword boundary. */
-			moveToPreviousSubwordBoundary(): void;
-
-			/** Move every cursor to the next subword boundary. */
-			moveToNextSubwordBoundary(): void;
-
-			/** Move every cursor to the beginning of the next paragraph. */
-			moveToBeginningOfNextParagraph(): void;
-
-			/** Move every cursor to the beginning of the previous paragraph. */
-			moveToBeginningOfPreviousParagraph(): void;
-
-			/** Returns the most recently added Cursor. */
-			getLastCursor(): Cursor;
-
-			/** Returns the word surrounding the most recently added cursor. */
-			getWordUnderCursor(options?: {
-				wordRegex?: RegExp,
-				includeNonWordCharacters?: boolean,
-				allowPrevious?: boolean,
-			}): string;
-
-			/** Get an Array of all Cursors. */
-			getCursors(): Cursor[];
-
-			/** Get all Cursorss, ordered by their position in the buffer instead of the
-			 *  order in which they were added.
-			 */
-			getCursorsOrderedByBufferPosition(): Cursor[];
-
-			// Selections
-			/** Get the selected text of the most recently added selection. */
-			getSelectedText(): string;
-
-			/** Get the Range of the most recently added selection in buffer coordinates. */
-			getSelectedBufferRange(): TextBuffer.Range;
-
-			/** Get the Ranges of all selections in buffer coordinates.
-			 *  The ranges are sorted by when the selections were added. Most recent at the end.
-			 */
-			getSelectedBufferRanges(): TextBuffer.Range[];
-
-			/** Set the selected range in buffer coordinates. If there are multiple selections,
-			 *  they are reduced to a single selection with the given range.
-			 */
-			setSelectedBufferRange(bufferRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], options?:
-				{ reversed?: boolean, preserveFolds?: boolean}): void;
-
-			/** Set the selected ranges in buffer coordinates. If there are multiple selections,
-			 *  they are replaced by new selections with the given ranges.
-			 */
-			setSelectedBufferRanges(bufferRanges: ReadonlyArray<TextBuffer.RangeLike|
-				[TextBuffer.PointLike, TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|
-				[[number, number], TextBuffer.PointLike]|[[number, number], [number, number]]>,
-				options?: { reversed?: boolean, preserveFolds?: boolean}): void;
-
-			/** Get the Range of the most recently added selection in screen coordinates. */
-			getSelectedScreenRange(): TextBuffer.Range;
-
-			/** Get the Ranges of all selections in screen coordinates.
-			 *  The ranges are sorted by when the selections were added. Most recent at the end.
-			 */
-			getSelectedScreenRanges(): TextBuffer.Range[];
-
-			/** Set the selected range in screen coordinates. If there are multiple selections,
-			 *  they are reduced to a single selection with the given range.
-			 */
-			setSelectedScreenRange(screenRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], options?:
-				{ reversed?: boolean }): void;
-
-			/** Set the selected ranges in screen coordinates. If there are multiple selections,
-			 *  they are replaced by new selections with the given ranges.
-			 */
-			setSelectedScreenRanges(screenRanges: ReadonlyArray<TextBuffer.RangeLike|
-				[TextBuffer.PointLike, TextBuffer.PointLike]|[TextBuffer.PointLike, [number,
-				number]]|[[number, number], TextBuffer.PointLike]|[[number, number], [number,
-				number]]>, options?: { reversed?: boolean }): void;
-
-			/** Add a selection for the given range in buffer coordinates. */
-			addSelectionForBufferRange(bufferRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], options?:
-				{ reversed?: boolean, preserveFolds?: boolean }): Selection;
-
-			/** Add a selection for the given range in screen coordinates. */
-			addSelectionForScreenRange(screenRange: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], options?:
-				{ reversed?: boolean, preserveFolds?: boolean }): Selection;
-
-			/** Select from the current cursor position to the given position in buffer coordinates.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToBufferPosition(position: TextBuffer.PointLike|[number, number]): void;
-
-			/** Select from the current cursor position to the given position in screen coordinates.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToScreenPosition(position: TextBuffer.PointLike|[number, number]): void;
-
-			/** Move the cursor of each selection one character upward while preserving the
-			 *  selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectUp(rowCount?: number): void;
-
-			/** Move the cursor of each selection one character downward while preserving
-			 *  the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectDown(rowCount?: number): void;
-
-			/** Move the cursor of each selection one character leftward while preserving
-			 *  the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectLeft(columnCount?: number): void;
-
-			/** Move the cursor of each selection one character rightward while preserving
-			 *  the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectRight(columnCount?: number): void;
-
-			/** Select from the top of the buffer to the end of the last selection in the buffer.
-			 *  This method merges multiple selections into a single selection.
-			 */
-			selectToTop(): void;
-
-			/** Selects from the top of the first selection in the buffer to the end of the buffer.
-			 *  This method merges multiple selections into a single selection.
-			 */
-			selectToBottom(): void;
-
-			/** Select all text in the buffer.
-			 *  This method merges multiple selections into a single selection.
-			 */
-			selectAll(): void;
-
-			/** Move the cursor of each selection to the beginning of its line while preserving
-			 *  the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToBeginningOfLine(): void;
-
-			/** Move the cursor of each selection to the first non-whitespace character of its
-			 *  line while preserving the selection's tail position. If the cursor is already
-			 *  on the first character of the line, move it to the beginning of the line.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToFirstCharacterOfLine(): void;
-
-			/** Move the cursor of each selection to the end of its line while preserving the
-			 *  selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToEndOfLine(): void;
-
-			/** Expand selections to the beginning of their containing word.
-			 *  Operates on all selections. Moves the cursor to the beginning of the containing
-			 *  word while preserving the selection's tail position.
-			 */
-			selectToBeginningOfWord(): void;
-
-			/** Expand selections to the end of their containing word.
-			 *  Operates on all selections. Moves the cursor to the end of the containing word
-			 *  while preserving the selection's tail position.
-			 */
-			selectToEndOfWord(): void;
-
-			/** For each cursor, select the containing line.
-			 *  This method merges selections on successive lines.
-			 */
-			selectLinesContainingCursors(): void;
-
-			/** Select the word surrounding each cursor. */
-			selectWordsContainingCursors(): void;
-
-			/** For each selection, move its cursor to the preceding subword boundary while
-			 *  maintaining the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToPreviousSubwordBoundary(): void;
-
-			/** For each selection, move its cursor to the next subword boundary while maintaining
-			 *  the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToNextSubwordBoundary(): void;
-
-			/** For each selection, move its cursor to the preceding word boundary while
-			 *  maintaining the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToPreviousWordBoundary(): void;
-
-			/** For each selection, move its cursor to the next word boundary while maintaining
-			 *  the selection's tail position.
-			 *  This method may merge selections that end up intersecting.
-			 */
-			selectToNextWordBoundary(): void;
-
-			/** Expand selections to the beginning of the next word.
-			 *  Operates on all selections. Moves the cursor to the beginning of the next word
-			 *  while preserving the selection's tail position.
-			 */
-			selectToBeginningOfNextWord(): void;
-
-			/** Expand selections to the beginning of the next paragraph.
-			 *  Operates on all selections. Moves the cursor to the beginning of the next
-			 *  paragraph while preserving the selection's tail position.
-			 */
-			selectToBeginningOfNextParagraph(): void;
-
-			/** Expand selections to the beginning of the next paragraph.
-			 *  Operates on all selections. Moves the cursor to the beginning of the next
-			 *  paragraph while preserving the selection's tail position.
-			 */
-			selectToBeginningOfPreviousParagraph(): void;
-
-			/** Select the range of the given marker if it is valid. */
-			selectMarker(marker: TextBuffer.DisplayMarker): TextBuffer.Range|undefined;
-
-			/** Get the most recently added Selection. */
-			getLastSelection(): Selection;
-
-			/** Get current Selections. */
-			getSelections(): Selection[];
-
-			/** Get all Selections, ordered by their position in the buffer instead of the
-			 *  order in which they were added.
-			 */
-			getSelectionsOrderedByBufferPosition(): Selection[];
-
-			// NOTE: this calls into Selection::intersectsBufferRange, which itself calls
-			// into Range::intersectsWith. Range::intersectsWith is one of the few functions
-			// which does NOT take a range-compatible array.
-			/** Determine if a given range in buffer coordinates intersects a selection. */
-			selectionIntersectsBufferRange(bufferRange: TextBuffer.RangeLike): boolean;
-
-			// Searching and Replacing
-			/** Scan regular expression matches in the entire buffer, calling the given
-			 *  iterator function on each match.
-			 *
-			 *  ::scan functions as the replace method as well via the replace.
-			 */
-			scan(regex: RegExp, options: TextBuffer.Options.ScanContext, iterator: (params:
-				TextBuffer.Structures.ContextualBufferScanResult) => void): void;
-			/** Scan regular expression matches in the entire buffer, calling the given
-			 *  iterator function on each match.
-			 *
-			 *  ::scan functions as the replace method as well via the replace.
-			 */
-			scan(regex: RegExp, iterator: (params: TextBuffer.Structures.BufferScanResult) => void):
-				void;
-
-			/** Scan regular expression matches in a given range, calling the given iterator.
-			 *  function on each match.
-			 */
-			scanInBufferRange(regex: RegExp, range: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], iterator: (params:
-				TextBuffer.Structures.BufferScanResult) => void): void;
-
-			/** Scan regular expression matches in a given range in reverse order, calling the
-			 *  given iterator function on each match.
-			 */
-			backwardsScanInBufferRange(regex: RegExp, range: TextBuffer.RangeLike|[TextBuffer.PointLike,
-				TextBuffer.PointLike]|[TextBuffer.PointLike, [number, number]]|[[number, number],
-				TextBuffer.PointLike]|[[number, number], [number, number]], iterator: (params:
-				TextBuffer.Structures.BufferScanResult) => void): void;
-
-			// Tab Behavior
-			/** Returns a boolean indicating whether softTabs are enabled for this editor. */
-			getSoftTabs(): boolean;
-
-			/** Enable or disable soft tabs for this editor. */
-			setSoftTabs(softTabs: boolean): void;
-
-			/** Toggle soft tabs for this editor. */
-			toggleSoftTabs(): boolean;
-
-			/** Get the on-screen length of tab characters. */
-			getTabLength(): number;
-
-			/** Set the on-screen length of tab characters. Setting this to a number will
-			 *  override the editor.tabLength setting.
-			 */
-			setTabLength(tabLength: number): void;
-
-			/** Determine if the buffer uses hard or soft tabs. */
-			usesSoftTabs(): boolean|undefined;
-
-			/** Get the text representing a single level of indent.
-			 *  If soft tabs are enabled, the text is composed of N spaces, where N is the
-			 *  tab length. Otherwise the text is a tab character (\t).
-			 */
-			getTabText(): string;
-
-			// Soft Wrap Behavior
-			/** Determine whether lines in this editor are soft-wrapped. */
-			isSoftWrapped(): boolean;
-
-			/** Enable or disable soft wrapping for this editor. */
-			setSoftWrapped(softWrapped: boolean): boolean;
-
-			/** Toggle soft wrapping for this editor. */
-			toggleSoftWrapped(): boolean;
-
-			/** Gets the column at which column will soft wrap. */
-			getSoftWrapColumn(): number;
-
-			// Indentation
-			/** Get the indentation level of the given buffer row.
-			 *  Determines how deeply the given row is indented based on the soft tabs and tab
-			 *  length settings of this editor. Note that if soft tabs are enabled and the tab
-			 *  length is 2, a row with 4 leading spaces would have an indentation level of 2.
-			 */
-			indentationForBufferRow(bufferRow: number): number;
-
-			/** Set the indentation level for the given buffer row.
-			 *  Inserts or removes hard tabs or spaces based on the soft tabs and tab length settings
-			 *  of this editor in order to bring it to the given indentation level. Note that if soft
-			 *  tabs are enabled and the tab length is 2, a row with 4 leading spaces would have an
-			 *  indentation level of 2.
-			 */
-			setIndentationForBufferRow(bufferRow: number, newLevel: number, options?:
-				{ preserveLeadingWhitespace?: boolean }): void;
-
-			/** Indent rows intersecting selections by one level. */
-			indentSelectedRows(): void;
-
-			/** Outdent rows intersecting selections by one level. */
-			outdentSelectedRows(): void;
-
-			/** Get the indentation level of the given line of text.
-			 *  Determines how deeply the given line is indented based on the soft tabs and tab length
-			 *  settings of this editor. Note that if soft tabs are enabled and the tab length is 2,
-			 *  a row with 4 leading spaces would have an indentation level of 2.
-			 */
-			indentLevelForLine(line: string): number;
-
-			/** Indent rows intersecting selections based on the grammar's suggested indent level. */
-			autoIndentSelectedRows(): void;
-
-			// Grammars
-			/** Get the current Grammar of this editor. */
-			getGrammar(): FirstMate.Grammar;
-
-			/** Set the current Grammar of this editor.
-			 *  Assigning a grammar will cause the editor to re-tokenize based on the new grammar.
-			 */
-			setGrammar(grammar: FirstMate.Grammar): void;
-
-			// Managing Syntax Scopes
-			/** Returns a ScopeDescriptor that includes this editor's language.
-			 *  e.g. [".source.ruby"], or [".source.coffee"].
-			 */
-			getRootScopeDescriptor(): ScopeDescriptor;
-
-			/** Get the syntactic scopeDescriptor for the given position in buffer coordinates. */
-			scopeDescriptorForBufferPosition(bufferPosition: TextBuffer.PointLike|[number, number]):
-				ScopeDescriptor;
-
-			/** Get the range in buffer coordinates of all tokens surrounding the cursor
-			 *  that match the given scope selector.
-			 */
-			bufferRangeForScopeAtCursor(scopeSelector: string): TextBuffer.Range;
-
-			/** Determine if the given row is entirely a comment. */
-			isBufferRowCommented(bufferRow: number): boolean;
-
-			// Clipboard Operations
-			/** For each selection, copy the selected text. */
-			copySelectedText(): void;
-
-			/** For each selection, cut the selected text. */
-			cutSelectedText(): void;
-
-			/** For each selection, replace the selected text with the contents of the clipboard.
-			 *  If the clipboard contains the same number of selections as the current editor,
-			 *  each selection will be replaced with the content of the corresponding clipboard
-			 *  selection text.
-			 */
-			pasteText(options?: Options.TextInsertion): void;
-
-			/** For each selection, if the selection is empty, cut all characters of the
-			 *  containing screen line following the cursor. Otherwise cut the selected text.
-			 */
-			cutToEndOfLine(): void;
-
-			/** For each selection, if the selection is empty, cut all characters of the
-			 *  containing buffer line following the cursor. Otherwise cut the selected text.
-			 */
-			cutToEndOfBufferLine(): void;
-
-			// Folds
-			/** Fold the most recent cursor's row based on its indentation level.
-			 *  The fold will extend from the nearest preceding line with a lower indentation
-			 *  level up to the nearest following row with a lower indentation level.
-			 */
-			foldCurrentRow(): void;
-
-			/** Unfold the most recent cursor's row by one level. */
-			unfoldCurrentRow(): void;
-
-			/** Fold the given row in buffer coordinates based on its indentation level.
-			 *  If the given row is foldable, the fold will begin there. Otherwise, it will
-			 *  begin at the first foldable row preceding the given row.
-			 */
-			foldBufferRow(bufferRow: number): void;
-
-			/** Unfold all folds containing the given row in buffer coordinates. */
-			unfoldBufferRow(bufferRow: number): void;
-
-			/** For each selection, fold the rows it intersects. */
-			foldSelectedLines(): void;
-
-			/** Fold all foldable lines. */
-			foldAll(): void;
-
-			/** Unfold all existing folds. */
-			unfoldAll(): void;
-
-			/** Fold all foldable lines at the given indent level. */
-			foldAllAtIndentLevel(level: number): void;
-
-			/** Determine whether the given row in buffer coordinates is foldable.
-			 *  A foldable row is a row that starts a row range that can be folded.
-			 */
-			isFoldableAtBufferRow(bufferRow: number): boolean;
-
-			/** Determine whether the given row in screen coordinates is foldable.
-			 *  A foldable row is a row that starts a row range that can be folded.
-			 */
-			isFoldableAtScreenRow(bufferRow: number): boolean;
-
-			/** Fold the given buffer row if it isn't currently folded, and unfold it otherwise. */
-			toggleFoldAtBufferRow(bufferRow: number): void;
-
-			/** Determine whether the most recently added cursor's row is folded. */
-			isFoldedAtCursorRow(): boolean;
-
-			/** Determine whether the given row in buffer coordinates is folded. */
-			isFoldedAtBufferRow(bufferRow: number): boolean;
-
-			/** Determine whether the given row in screen coordinates is folded. */
-			isFoldedAtScreenRow(screenRow: number): boolean;
-
-			// Gutters
-			/** Add a custom Gutter. */
-			addGutter(options: {
-				name: string,
-				priority?: number,
-				visible?: boolean,
-			}): Gutter;
-
-			/** Get this editor's gutters. */
-			getGutters(): Gutter[];
-
-			/** Get the gutter with the given name. */
-			gutterWithName(name: string): Gutter|null;
-
-			// Scrolling the TextEditor
-			/** Scroll the editor to reveal the most recently added cursor if it is off-screen. */
-			scrollToCursorPosition(options?: { center?: boolean }): void;
-
-			/** Scrolls the editor to the given buffer position. */
-			scrollToBufferPosition(bufferPosition: TextBuffer.PointLike|[number, number],
-				options?: { center?: boolean }): void;
-
-			/** Scrolls the editor to the given screen position. */
-			scrollToScreenPosition(screenPosition: TextBuffer.PointLike|[number, number],
-				options?: { center?: boolean }): void;
-
-			// TextEditor Rendering
-			/** Retrieves the rendered line height in pixels. */
-			getLineHeightInPixels(): number;
-
-			/** Retrieves the greyed out placeholder of a mini editor. */
-			getPlaceholderText(): string;
-
-			/** Set the greyed out placeholder of a mini editor. Placeholder text will be
-			 *  displayed when the editor has no content.
-			 */
-			setPlaceholderText(placeholderText: string): void;
-		}
-
-		/** Experimental: This global registry tracks registered TextEditors. */
-		interface TextEditorRegistry {
-			// Managing Text Editors
-			/** Remove all editors from the registry. */
-			clear(): void;
-
-			/** Register a TextEditor. */
-			add(editor: TextEditor): EventKit.Disposable;
-
-			/** Remove the given TextEditor from the registry. */
-			remove(editor: TextEditor): boolean;
-
-			/** Keep a TextEditor's configuration in sync with Atom's settings. */
-			maintainConfig(editor: TextEditor): EventKit.Disposable;
-
-			/** Set a TextEditor's grammar based on its path and content, and continue
-			 *  to update its grammar as gramamrs are added or updated, or the editor's
-			 *  file path changes.
-			 */
-			maintainGrammar(editor: TextEditor): EventKit.Disposable;
-
-			/** Force a TextEditor to use a different grammar than the one that would
-			 *  otherwise be selected for it.
-			 */
-			setGrammarOverride(editor: TextEditor, scopeName: string): void;
-
-			/** Retrieve the grammar scope name that has been set as a grammar override
-			 *  for the given TextEditor.
-			 */
-			getGrammarOverride(editor: TextEditor): string|null;
-
-			/** Remove any grammar override that has been set for the given {TextEditor}. */
-			clearGrammarOverride(editor: TextEditor): void;
-
-			// Event Subscription
-			/** Invoke the given callback with all the current and future registered TextEditors. */
-			observe(callback: (editor: TextEditor) => void): EventKit.Disposable;
-		}
-
-		/** Handles loading and activating available themes. */
-		interface ThemeManager {
-			// Event Subscription
-			/** Invoke callback when style sheet changes associated with updating the
-			 *  list of active themes have completed.
-			 */
-			onDidChangeActiveThemes(callback: () => void): EventKit.Disposable;
-
-			// Accessing Loaded Themes
-			/** Returns an Array of strings of all the loaded theme names. */
-			getLoadedThemeNames(): string[]|undefined;
-
-			/** Returns an Array of all the loaded themes. */
-			getLoadedThemes(): Package[]|undefined;
-
-			// Accessing Active Themes
-			/** Returns an Array of strings all the active theme names. */
-			getActiveThemeNames(): string[]|undefined;
-
-			/** Returns an Array of all the active themes. */
-			getActiveThemes(): Package[]|undefined;
-
-			// Managing Enabled Themes
-			/** Get the enabled theme names from the config. */
-			getEnabledThemeNames(): string[];
-		}
-
-		/** This tooltip class is derived from Bootstrap 3, but modified to not require
-		 *  jQuery, which is an expensive dependency we want to eliminate.
-		 */
-		interface Tooltip {
-			options: Options.Tooltip;
-			enabled: boolean;
-			timeout: number;
-			hoverState: "in"|"out"|null;
-			element: JQuery|HTMLElement;
-
-			getTitle(): string;
-			getTooltipElement(): HTMLElement;
-			getArrowElement(): HTMLElement;
-			enable(): void;
-			disable(): void;
-			toggleEnabled(): void;
-			toggle(): void;
-			recalculatePosition(): void;
-		}
-
-		/** Associates tooltips with HTML elements or selectors. */
-		interface TooltipManager {
-			/** Add a tooltip to the given element. */
-			add(target: JQuery|HTMLElement, options: {
-				title?: string,
-				html?: boolean,
-				item?: HTMLElement|{ element: HTMLElement },
-				class?: string,
-				placement?: "top"|"bottom"|"left"|"right"|"auto"|(() => string),
-				trigger?: "click"|"hover"|"focus"|"manual",
-				delay?: { show: number, hide: number },
-				keyBindingCommand?: string,
-				keyBindingTarget?: HTMLElement
-			} | {
-				title?: string|(() => string),
-				html?: boolean,
-				item?: HTMLElement|{ element: HTMLElement },
-				class?: string,
-				placement?: "top"|"bottom"|"left"|"right"|"auto"|(() => string),
-				trigger?: "click"|"hover"|"focus"|"manual",
-				delay?: { show: number, hide: number },
-			}): EventKit.Disposable;
-
-			/** Find the tooltips that have been applied to the given element. */
-			findTooltips(target: HTMLElement): Tooltip[];
-		}
-
-		/** ViewRegistry handles the association between model and view types in Atom.
-		 *  We call this association a View Provider. As in, for a given model, this class
-		 *  can provide a view via ::getView, as long as the model/view association was
-		 *  registered via ::addViewProvider.
-		 */
-		interface ViewRegistry {
-			/** Add a provider that will be used to construct views in the workspace's view
-			 *  layer based on model objects in its model layer.
-			 */
-			addViewProvider(createView: (model: object) => HTMLElement|undefined): EventKit.Disposable;
-			/** Add a provider that will be used to construct views in the workspace's view
-			 *  layer based on model objects in its model layer.
-			 */
-			// tslint:disable-next-line:no-any
-			addViewProvider<T>(modelConstructor: { new (...args: any[]): T }, createView:
-				(instance: T) => HTMLElement|undefined): EventKit.Disposable;
-
-			/** Get the view associated with an object in the workspace. */
-			getView(obj: object): HTMLElement;
-		}
-
-		/** Represents the state of the user interface for the entire window. */
-		interface Workspace {
-			// Event Subscription
-			/** Invoke the given callback with all current and future text editors in
-			 *  the workspace.
-			 */
-			observeTextEditors(callback: (editor: TextEditor) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future panes items in the
-			 *  workspace.
-			 */
-			observePaneItems(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane item changes. */
-			onDidChangeActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane item stops changing. */
-			onDidStopChangingActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a text editor becomes the active text editor and
-			 *  when there is no longer an active text editor.
-			 */
-			onDidChangeActiveTextEditor(callback: (editor?: TextEditor) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current active pane item and with all
-			 *  future active pane items in the workspace.
-			 */
-			observeActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current active text editor (if any), with all
-			 *  future active text editors, and when there is no longer an active text editor.
-			 */
-			observeActiveTextEditor(callback: (editor?: TextEditor) => void): EventKit.Disposable;
-
-			/** Invoke the given callback whenever an item is opened. Unlike ::onDidAddPaneItem,
-			 *  observers will be notified for items that are already present in the workspace
-			 *  when they are reopened.
-			 */
-			onDidOpen(callback: (event: Events.PaneItemOpened) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane is added to the workspace. */
-			onDidAddPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback before a pane is destroyed in the workspace. */
-			onWillDestroyPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane is destroyed in the workspace. */
-			onDidDestroyPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future panes in the workspace. */
-			observePanes(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane changes. */
-			onDidChangeActivePane(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current active pane and when the
-			 *  active pane changes.
-			 */
-			observeActivePane(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is added to the workspace. */
-			onDidAddPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is about to be destroyed,
-			 *  before the user is prompted to save it.
-			 */
-			onWillDestroyPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is destroyed. */
-			onDidDestroyPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a text editor is added to the workspace. */
-			onDidAddTextEditor(callback: (event: Events.TextEditorObserved) => void):
-				EventKit.Disposable;
-
-			// Opening
-			/** Opens the given URI in Atom asynchronously. If the URI is already open,
-			 *  the existing item for that URI will be activated. If no URI is given, or
-			 *  no registered opener can open the URI, a new empty TextEditor will be created.
-			 */
-			open(uri: string, options?: {
-				initialLine?: number,
-				initialColumn?: number,
-				split?: "left"|"right"|"up"|"down",
-				activatePane?: boolean,
-				activateItem?: boolean,
-				pending?: boolean,
-				searchAllPanes?: boolean,
-				location?: "left"|"right"|"bottom"|"center",
-			}): Promise<object>;
-			/** Opens the given URI in Atom asynchronously. If the URI is already open,
-			 *  the existing item for that URI will be activated. If no URI is given, or
-			 *  no registered opener can open the URI, a new empty TextEditor will be created.
-			 */
-			open(): Promise<TextEditor>;
-
-			/** Search the workspace for items matching the given URI and hide them.
-			 *  Returns a boolean indicating whether any items were found (and hidden).
-			 */
-			hide(itemOrURI: object|string): boolean;
-
-			/** Search the workspace for items matching the given URI. If any are found,
-			 *  hide them. Otherwise, open the URL.
-			 *  Returns a Promise that resolves when the item is shown or hidden.
-			 */
-			toggle(itemOrURI: object|string): Promise<void>;
-
-			/** Creates a new item that corresponds to the provided URI.
-			 *  If no URI is given, or no registered opener can open the URI, a new empty TextEditor
-			 *  will be created.
-			 */
-			createItemForURI(uri: string): Promise<object|TextEditor>;
-
-			/** Returns a boolean that is true if object is a TextEditor. */
-			isTextEditor(object: object): boolean;
-
-			/** Asynchronously reopens the last-closed item's URI if it hasn't already
-			 *  been reopened.
-			 */
-			reopenItem(): Promise<object|undefined>;
-
-			/** Register an opener for a URI. */
-			addOpener(opener: (uri: string) => HTMLElement|{ getTitle(): string }|undefined):
-				EventKit.Disposable;
-
-			/** Create a new text editor. */
-			buildTextEditor(params: object): TextEditor;
-
-			// Pane Items
-			/** Get all pane items in the workspace. */
-			getPaneItems(): object[];
-
-			/** Get the active Pane's active item. */
-			getActivePaneItem(): object;
-
-			/** Get all text editors in the workspace. */
-			getTextEditors(): TextEditor[];
-
-			/** Get the workspace center's active item if it is a TextEditor. */
-			getActiveTextEditor(): TextEditor|undefined;
-
-			// Panes
-			/** Get the most recently focused pane container. */
-			getActivePaneContainer(): Dock|WorkspaceCenter;
-
-			/** Get all panes in the workspace. */
-			getPanes(): Pane[];
-
-			/** Get the active Pane. */
-			getActivePane(): Pane;
-
-			/** Make the next pane active. */
-			activateNextPane(): boolean;
-
-			/** Make the previous pane active. */
-			activatePreviousPane(): boolean;
-
-			/** Get the first pane container that contains an item with the given URI. */
-			paneContainerForURI(uri: string): Dock|WorkspaceCenter|undefined;
-
-			/** Get the first pane container that contains the given item. */
-			paneContainerForItem(item: object): Dock|WorkspaceCenter|undefined;
-
-			/** Get the first Pane with an item for the given URI. */
-			paneForURI(uri: string): Pane|undefined;
-
-			/** Get the Pane containing the given item. */
-			paneForItem(item: object): Pane|undefined;
-
-			// Pane Locations
-			/** Get the WorkspaceCenter at the center of the editor window. */
-			getCenter(): WorkspaceCenter;
-
-			/** Get the Dock to the left of the editor window. */
-			getLeftDock(): Dock;
-
-			/** Get the Dock to the right of the editor window. */
-			getRightDock(): Dock;
-
-			/** Get the Dock below the editor window. */
-			getBottomDock(): Dock;
-
-			/** Returns all Pane containers. */
-			getPaneContainers(): [WorkspaceCenter, Dock, Dock, Dock];
-
-			// Panels
-			/** Get an Array of all the panel items at the bottom of the editor window. */
-			getBottomPanels(): Panel[];
-
-			/** Adds a panel item to the bottom of the editor window. */
-			addBottomPanel(options: {
-				item: object,
-				visible?: boolean,
-				priority?: number,
-			}): Panel;
-
-			/** Get an Array of all the panel items to the left of the editor window. */
-			getLeftPanels(): Panel[];
-
-			/** Adds a panel item to the left of the editor window. */
-			addLeftPanel(options: {
-				item: object,
-				visible?: boolean,
-				priority?: number,
-			}): Panel;
-
-			/** Get an Array of all the panel items to the right of the editor window. */
-			getRightPanels(): Panel[];
-
-			/** Adds a panel item to the right of the editor window. */
-			addRightPanel(options: {
-				item: object,
-				visible?: boolean,
-				priority?: number,
-			}): Panel;
-
-			/** Get an Array of all the panel items at the top of the editor window. */
-			getTopPanels(): Panel[];
-
-			/** Adds a panel item to the top of the editor window above the tabs. */
-			addTopPanel(options: {
-				item: object,
-				visible?: boolean,
-				priority?: number
-			}): Panel;
-
-			/** Get an Array of all the panel items in the header. */
-			getHeaderPanels(): Panel[];
-
-			/** Adds a panel item to the header. */
-			addHeaderPanel(options: {
-				item: object,
-				visible?: boolean,
-				priority?: number,
-			}): Panel;
-
-			/** Get an Array of all the panel items in the footer. */
-			getFooterPanels(): Panel[];
-
-			/** Adds a panel item to the footer. */
-			addFooterPanel(options: {
-				item: object,
-				visible?: boolean,
-				priority?: number,
-			}): Panel;
-
-			/** Get an Array of all the modal panel items. */
-			getModalPanels(): Panel[];
-
-			/** Adds a panel item as a modal dialog. */
-			addModalPanel(options: {
-				item: object,
-				visible?: boolean,
-				priority?: number,
-				autoFocus?: boolean,
-			}): Panel;
-
-			/** Returns the Panel associated with the given item or null when the item
-			 *  has no panel.
-			 */
-			panelForItem(item: object): Panel|null;
-
-			// Searching and Replacing
-			/** Performs a search across all files in the workspace. */
-			scan(regex: RegExp, iterator: (result: Structures.ScandalResult) => void):
-				Structures.CancellablePromise<string|null>;
-			/** Performs a search across all files in the workspace. */
-			scan(regex: RegExp, options: Options.WorkspaceScan, iterator:
-				(result: Structures.ScandalResult) => void): Structures.CancellablePromise<string|null>;
-
-			/** Performs a replace across all the specified files in the project. */
-			replace(regex: RegExp, replacementText: string, filePaths: ReadonlyArray<string>,
-				iterator: (result: { filePath: string|undefined, replacements: number }) => void):
-				Promise<void>;
-		}
-
-		// https://github.com/atom/atom/blob/master/src/workspace-center.js
-		/** The central container for the editor window capable of holding items. */
-		interface WorkspaceCenter {
-			// Event Subscription
-			/** Invoke the given callback with all current and future text editors in the
-			 *  workspace center.
-			 */
-			observeTextEditors(callback: (editor: TextEditor) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future panes items in the
-			 *  workspace center.
-			 */
-			observePaneItems(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane item changes. */
-			onDidChangeActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane item stops changing. */
-			onDidStopChangingActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current active pane item and with all future
-			 *  active pane items in the workspace center.
-			 */
-			observeActivePaneItem(callback: (item: object) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane is added to the workspace center. */
-			onDidAddPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback before a pane is destroyed in the workspace center. */
-			onWillDestroyPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane is destroyed in the workspace center. */
-			onDidDestroyPane(callback: (event: { pane: Pane }) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with all current and future panes in the workspace center. */
-			observePanes(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the active pane changes. */
-			onDidChangeActivePane(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback with the current active pane and when the active pane changes. */
-			observeActivePane(callback: (pane: Pane) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is added to the workspace center. */
-			onDidAddPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is about to be destroyed, before the user
-			 *  is prompted to save it.
-			 */
-			onWillDestroyPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a pane item is destroyed. */
-			onDidDestroyPaneItem(callback: (event: Events.PaneItemObserved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when a text editor is added to the workspace center. */
-			onDidAddTextEditor(callback: (event: Events.TextEditorObserved) => void):
-				EventKit.Disposable;
-
-			// Pane Items
-			/** Get all pane items in the workspace center. */
-			getPaneItems(): object[];
-
-			/** Get the active Pane's active item. */
-			getActivePaneItem(): object|undefined;
-
-			/** Get all text editors in the workspace center. */
-			getTextEditors(): TextEditor[];
-
-			/** Get the active item if it is an TextEditor. */
-			getActiveTextEditor(): TextEditor|undefined;
-
-			/** Save all pane items. */
-			saveAll(): void;
-
-			// Panes
-			/** Get all panes in the workspace center. */
-			getPanes(): Pane[];
-
-			/** Get the active Pane. */
-			getActivePane(): Pane;
-
-			/** Make the next pane active. */
-			activateNextPane(): void;
-
-			/** Make the previous pane active. */
-			activatePreviousPane(): void;
-
-			/** Retrieve the Pane associated with the given URI. */
-			paneForURI(uri: string): Pane|undefined;
-
-			/** Retrieve the Pane associated with the given item. */
-			paneForItem(item: object): Pane|undefined;
-
-			/** Destroy (close) the active pane. */
-			destroyActivePane(): void;
-		}
-	}
-
-	/** An amalgamation of all types used within the public Atom API. */
-	namespace Atom {
-		/** Objects that appear as parameters to callbacks. */
-		namespace Events {
-			// Atom Keymap ==========================================================
-			type FullKeybindingMatch = AtomKeymap.Events.FullKeybindingMatch;
-			type PartialKeybindingMatch = AtomKeymap.Events.PartialKeybindingMatch;
-			type FailedKeybindingMatch = AtomKeymap.Events.FailedKeybindingMatch;
-			type FailedKeymapFileRead = AtomKeymap.Events.FailedKeymapFileRead;
-			type KeymapLoaded = AtomKeymap.Events.KeymapLoaded;
-			type AddedKeystrokeResolver = AtomKeymap.Events.AddedKeystrokeResolver;
-
-			// Path Watcher =========================================================
-			type PathWatchErrorThrown = PathWatcher.Events.PathWatchErrorThrown;
-			type WatchedFilePathChanged = PathWatcher.Events.WatchedFilePathChanged;
-
-			// Text Buffer ==========================================================
-			type BufferWatchError = TextBuffer.Events.BufferWatchError;
-			type FileSaved = TextBuffer.Events.FileSaved;
-			type MarkerChanged = TextBuffer.Events.MarkerChanged;
-			type BufferChanging = TextBuffer.Events.BufferChanging;
-			type BufferChanged = TextBuffer.Events.BufferChanged;
-			type BufferStoppedChanging = TextBuffer.Events.BufferStoppedChanging;
-			type DisplayMarkerChanged = TextBuffer.Events.DisplayMarkerChanged;
-
-			// Core =================================================================
-			type ExceptionThrown = AtomCore.Events.ExceptionThrown;
-			type PreventableExceptionThrown = AtomCore.Events.PreventableExceptionThrown;
-			type SelectionChanged = AtomCore.Events.SelectionChanged;
-			type PaneItemObserved = AtomCore.Events.PaneItemObserved;
-			type PaneItemOpened = AtomCore.Events.PaneItemOpened;
-			type EditorChanged = AtomCore.Events.EditorChanged;
-			type StyleElementObserved = AtomCore.Events.StyleElementObserved;
-			type TextEditorObserved = AtomCore.Events.TextEditorObserved;
-			type RepoStatusChanged = AtomCore.Events.RepoStatusChanged;
-			type PaneListItemShifted = AtomCore.Events.PaneListItemShifted;
-			type PaneItemMoved = AtomCore.Events.PaneItemMoved;
-			type CursorPositionChanged = AtomCore.Events.CursorPositionChanged;
-			type DecorationPropsChanged = AtomCore.Events.DecorationPropsChanged;
-			type FilesystemChange = AtomCore.Events.FilesystemChange;
-		}
-
-		/** Objects that appear as parameters to functions. */
-		namespace Options {
-			// Atom Keymap ==========================================================
-			type BuildKeyEvent = AtomKeymap.Options.BuildKeyEvent;
-
-			// First Mate ===========================================================
-			type Grammar = FirstMate.Options.Grammar;
-
-			// Text Buffer ==========================================================
-			type BufferLoad = TextBuffer.Options.BufferLoad;
-			type CopyMarker = TextBuffer.Options.CopyMarker;
-			type FindMarker = TextBuffer.Options.FindMarker;
-			type FindDisplayMarker = TextBuffer.Options.FindDisplayMarker;
-			type ScanContext = TextBuffer.Options.ScanContext;
-
-			// Core =================================================================
-			type TextInsertion = AtomCore.Options.TextInsertion;
-			type Menu = AtomCore.Options.Menu;
-			type ContextMenu = AtomCore.Options.ContextMenu;
-			type SpawnProcess = AtomCore.Options.SpawnProcess;
-			type Process = AtomCore.Options.Process;
-			type NodeProcess = AtomCore.Options.NodeProcess;
-			type Notification = AtomCore.Options.Notification;
-			type ErrorNotification = AtomCore.Options.ErrorNotification;
-			type Tooltip = AtomCore.Options.Tooltip;
-			type WorkspaceScan = AtomCore.Options.WorkspaceScan;
-			type BuildEnvironment = AtomCore.Options.BuildEnvironment;
-		}
-
-		/** Data structures that are used within classes. */
-		namespace Structures {
-			// First Mate ===========================================================
-			type GrammarToken = FirstMate.Structures.GrammarToken;
-			type TokenizeLineResult = FirstMate.Structures.TokenizeLineResult;
-			type GrammarRule = FirstMate.Structures.GrammarRule;
-
-			// Text Buffer ==========================================================
-			type TextChange = TextBuffer.Structures.TextChange;
-			type BufferScanResult = TextBuffer.Structures.BufferScanResult;
-			type ContextualBufferScanResult = TextBuffer.Structures.ContextualBufferScanResult;
-
-			// Core =================================================================
-			type SharedDecorationProps = AtomCore.Structures.SharedDecorationProps;
-			type DecorationProps = AtomCore.Structures.DecorationProps;
-			type DecorationLayerProps = AtomCore.Structures.DecorationLayerProps;
-			type Invisibles = AtomCore.Structures.Invisibles;
-			type CancellablePromise<T> = AtomCore.Structures.CancellablePromise<T>;
-			type ScandalResult = AtomCore.Structures.ScandalResult;
-			type WindowLoadSettings = AtomCore.Structures.WindowLoadSettings;
-			type TestRunnerArgs = AtomCore.Structures.TestRunnerArgs;
-		}
-
-		// Atom Keymap ============================================================
-		/** This custom subclass of CustomEvent exists to provide the ::abortKeyBinding
-		 *  method, as well as versions of the ::stopPropagation methods that record the
-		 *  intent to stop propagation so event bubbling can be properly simulated for
-		 *  detached elements.
-		 */
-		type CommandEvent = AtomKeymap.CommandEvent;
-
-		type KeyBinding = AtomKeymap.KeyBinding;
-
-		/** Allows commands to be associated with keystrokes in a context-sensitive way.
-		 *  In Atom, you can access a global instance of this object via `atom.keymaps`.
-		 */
-		type KeymapManager = AtomKeymap.KeymapManager;
-
-		// Event Kit ==============================================================
-		/** An object that aggregates multiple Disposable instances together into a
-		 *  single disposable, so they can all be disposed as a group.
-		 */
-		type CompositeDisposable = EventKit.CompositeDisposable;
-
-		type DisposableLike = EventKit.DisposableLike;
-
-		/** A handle to a resource that can be disposed. */
-		type Disposable = EventKit.Disposable;
-
-		/** Utility class to be used when implementing event-based APIs that allows
-		 *  for handlers registered via ::on to be invoked with calls to ::emit.
-		 */
-		type Emitter = EventKit.Emitter;
-
-		// First Mate =============================================================
-		/** Grammar that tokenizes lines of text. */
-		type Grammar = FirstMate.Grammar;
-
-		/** Instance side of GrammarRegistry class. */
-		type GrammarRegistry = FirstMate.GrammarRegistry;
-
-		type ScopeSelector = FirstMate.ScopeSelector;
-
-		// Path Watcher ===========================================================
-		/** Represents a directory on disk that can be watched for changes. */
-		type Directory = PathWatcher.Directory;
-
-		/** Represents an individual file that can be watched, read from, and written to. */
-		type File = PathWatcher.File;
-
-		// Text Buffer ============================================================
-		/** The interface that should be implemented for all "point-compatible" objects. */
-		/** Represents a buffer annotation that remains logically stationary even as the
-		 *  buffer changes. This is used to represent cursors, folds, snippet targets,
-		 *  misspelled words, and anything else that needs to track a logical location
-		 *  in the buffer over time.
-		 */
-		type DisplayMarker = TextBuffer.DisplayMarker;
-
-		/** Experimental: A container for a related set of markers at the DisplayLayer level.
-		 *  Wraps an underlying MarkerLayer on the TextBuffer.
-		 *
-		 *  This API is experimental and subject to change on any release.
-		 */
-		type DisplayMarkerLayer = TextBuffer.DisplayMarkerLayer;
-
-		/** Represents a buffer annotation that remains logically stationary even as
-		 *  the buffer changes.
-		 */
-		type Marker = TextBuffer.Marker;
-
-		/** Experimental: A container for a related set of markers. */
-		type MarkerLayer = TextBuffer.MarkerLayer;
-
-		/** The interface that should be implemented for all "point-compatible" objects. */
-		type PointLike = TextBuffer.PointLike;
-
-		/** Represents a point in a buffer in row/column coordinates. */
-		type Point = TextBuffer.Point;
-
-		/** The interface that should be implemented for all "range-compatible" objects. */
-		type RangeLike = TextBuffer.RangeLike;
-
-		/** Represents a region in a buffer in row/column coordinates. */
-		type Range = TextBuffer.Range;
-
-		/** A mutable text container with undo/redo support and the ability to
-		 *  annotate logical regions in the text.
-		 */
-		type TextBuffer = TextBuffer.TextBuffer;
-
-		// Atom ===================================================================
-		/** Atom global for dealing with packages, themes, menus, and the window.
-		 *  An instance of this class is always available as the atom global.
-		 */
-		type AtomEnvironment = AtomCore.AtomEnvironment;
-
-		/** A wrapper which provides standard error/output line buffering for
-		 *  Node's ChildProcess.
-		 */
-		type BufferedProcess = AtomCore.BufferedProcess;
-
-		/** Like BufferedProcess, but accepts a Node script as the command to run.
-		 *  This is necessary on Windows since it doesn't support shebang #! lines.
-		 */
-		type BufferedNodeProcess = AtomCore.BufferedNodeProcess;
-
-		/** Represents the clipboard used for copying and pasting in Atom. */
-		type Clipboard = AtomCore.Clipboard;
-
-		/** A simple color class returned from Config::get when the value at the key path is
-		 *  of type 'color'.
-		 */
-		type Color = AtomCore.Color;
-
-		/** Used to access all of Atom's configuration details. */
-		type Config = AtomCore.Config;
-
-		/** Provides a registry for commands that you'd like to appear in the context menu. */
-		type ContextMenuManager = AtomCore.ContextMenuManager;
-
-		/** Associates listener functions with commands in a context-sensitive way
-		 *  using CSS selectors.
-		 */
-		type CommandRegistry = AtomCore.CommandRegistry;
-
-		/** The Cursor class represents the little blinking line identifying where text
-		 *  can be inserted.
-		 */
-		type Cursor = AtomCore.Cursor;
-
-		/** Represents a decoration that follows a DisplayMarker. A decoration is basically
-		 *  a visual representation of a marker. It allows you to add CSS classes to line
-		 *  numbers in the gutter, lines, and add selection-line regions around marked ranges
-		 *  of text.
-		 */
-		type Decoration = AtomCore.Decoration;
-
-		type Deserializer = AtomCore.Deserializer;
-
-		/** Manages the deserializers used for serialized state. */
-		type DeserializerManager = AtomCore.DeserializerManager;
-
-		/** A container at the edges of the editor window capable of holding items. */
-		type Dock = AtomCore.Dock;
-
-		/** Represents the underlying git operations performed by Atom. */
-		type GitRepository = AtomCore.GitRepository;
-
-		/** Represents a gutter within a TextEditor. */
-		type Gutter = AtomCore.Gutter;
-
-		/** History manager for remembering which projects have been opened.
-		 *  An instance of this class is always available as the atom.history global.
-		 *  The project history is used to enable the 'Reopen Project' menu.
-		 */
-		type HistoryManager = AtomCore.HistoryManager;
-
-		type HistoryProject = AtomCore.HistoryProject;
-
-		/** Represents a decoration that applies to every marker on a given layer. Created via
-		 *  TextEditor::decorateMarkerLayer.
-		 */
-		type LayerDecoration = AtomCore.LayerDecoration;
-
-		/** Provides a registry for menu items that you'd like to appear in the application menu. */
-		type MenuManager = AtomCore.MenuManager;
-
-		/** A notification to the user containing a message and type. */
-		type Notification = AtomCore.Notification;
-
-		/** A notification manager used to create Notifications to be shown to the user. */
-		type NotificationManager = AtomCore.NotificationManager;
-
-		/** Loads and activates a package's main module and resources such as stylesheets,
-		 *  keymaps, grammar, editor properties, and menus.
-		 */
-		type Package = AtomCore.Package;
-
-		/** Package manager for coordinating the lifecycle of Atom packages. */
-		type PackageManager = AtomCore.PackageManager;
-
-		/** A container for presenting content in the center of the workspace. */
-		type Pane = AtomCore.Pane;
-
-		/** A container representing a panel on the edges of the editor window. You
-		 *  should not create a Panel directly, instead use Workspace::addTopPanel and
-		 *  friends to add panels.
-		 */
-		type Panel = AtomCore.Panel;
-
-		/** Manage a subscription to filesystem events that occur beneath a root directory. */
-		type PathWatcher = AtomCore.PathWatcher;
-
-		/** Represents a project that's opened in Atom. */
-		type Project = AtomCore.Project;
-
-		/** Wraps an Array of Strings. The Array describes a path from the root of the
-		 *  syntax tree to a token including all scope names for the entire path.
-		 */
-		type ScopeDescriptor = AtomCore.ScopeDescriptor;
-
-		/** Represents a selection in the TextEditor. */
-		type Selection = AtomCore.Selection;
-
-		/** A singleton instance of this class available via atom.styles, which you can
-		 *  use to globally query and observe the set of active style sheets.
-		 */
-		type StyleManager = AtomCore.StyleManager;
-
-		/** Run a node script in a separate process. */
-		type Task = AtomCore.Task;
-
-		/** An interface which all custom test runners should implement. */
-		type TestRunner = AtomCore.TestRunner;
-
-		/** This class represents all essential editing state for a single TextBuffer,
-		 *  including cursor and selection positions, folds, and soft wraps.
-		 */
-		type TextEditor = AtomCore.TextEditor;
-
-		/** Experimental: This global registry tracks registered TextEditors. */
-		type TextEditorRegistry = AtomCore.TextEditorRegistry;
-
-		/** Handles loading and activating available themes. */
-		type ThemeManager = AtomCore.ThemeManager;
-
-		type Tooltip = AtomCore.Tooltip;
-
-		/** Associates tooltips with HTML elements or selectors. */
-		type TooltipManager = AtomCore.TooltipManager;
-
-		/** ViewRegistry handles the association between model and view types in Atom.
-		 *  We call this association a View Provider. As in, for a given model, this class
-		 *  can provide a view via ::getView, as long as the model/view association was
-		 *  registered via ::addViewProvider.
-		 */
-		type ViewRegistry = AtomCore.ViewRegistry;
-
-		/** Represents the state of the user interface for the entire window. */
-		type Workspace = AtomCore.Workspace;
-
-		// https://github.com/atom/atom/blob/master/src/workspace-center.js
-		/** The central container for the editor window capable of holding items. */
-		type WorkspaceCenter = AtomCore.WorkspaceCenter;
-	}
-
-	var atom: AtomCore.AtomEnvironment;
+    interface HTMLElementTagNameMap {
+      "atom-text-editor": TextEditorElement;
+    }
 }
 
-export { CompositeDisposable, Disposable, Emitter } from "event-kit";
-export { File, Directory } from "pathwatcher";
-
-/** A wrapper which provides standard error/output line buffering for
- *  Node's ChildProcess.
- */
-export const BufferedProcess: AtomCore.Statics.BufferedProcess;
-
-/** Like BufferedProcess, but accepts a Node script as the command to run.
- *  This is necessary on Windows since it doesn't support shebang #! lines.
- */
-export const BufferedNodeProcess: AtomCore.Statics.BufferedNodeProcess;
-
-/** Represents the underlying git operations performed by Atom. */
-export const GitRepository: AtomCore.Statics.GitRepository;
-
-/** A notification to the user containing a message and type. */
-export const Notification: AtomCore.Statics.Notification;
-
-/** Represents a point in a buffer in row/column coordinates. */
-export const Point: TextBuffer.Statics.Point;
-
-/** Represents a region in a buffer in row/column coordinates. */
-export const Range: TextBuffer.Statics.Range;
-
-/** Run a node script in a separate process. */
-export const Task: AtomCore.Statics.Task;
-
-/** A mutable text container with undo/redo support and the ability to annotate
- *  logical regions in the text.
- */
-export const TextBuffer: TextBuffer.Statics.TextBuffer;
-
-/** This class represents all essential editing state for a single TextBuffer,
- *  including cursor and selection positions, folds, and soft wraps.
- */
-export const TextEditor: AtomCore.Statics.TextEditor;
-
-/** Invoke a callback with each filesystem event that occurs beneath a specified path.
+/**
+ *  Invoke a callback with each filesystem event that occurs beneath a specified path.
  *  If you only need to watch events within the project's root paths, use
  *  Project::onDidChangeFiles instead.
  */
 export function watchPath(rootPath: string, options: {}, eventCallback: (events:
-	AtomCore.Events.FilesystemChange) => void): AtomCore.PathWatcher;
+    FilesystemChangeEvent) => void): Promise<PathWatcher>;
+
+// Essential Classes ==========================================================
+
+/**
+ *  Atom global for dealing with packages, themes, menus, and the window.
+ *  An instance of this class is always available as the atom global.
+ */
+export interface AtomEnvironment {
+    // Properties
+    /** A CommandRegistry instance. */
+    commands: CommandRegistry;
+
+    /** A Config instance. */
+    config: Config;
+
+    /** A Clipboard instance. */
+    clipboard: Clipboard;
+
+    /** A ContextMenuManager instance. */
+    contextMenu: ContextMenuManager;
+
+    /** A MenuManager instance. */
+    menu: MenuManager;
+
+    /** A KeymapManager instance. */
+    keymaps: KeymapManager;
+
+    /** A TooltipManager instance. */
+    tooltips: TooltipManager;
+
+    /** A NotificationManager instance. */
+    notifications: NotificationManager;
+
+    /** A Project instance. */
+    project: Project;
+
+    /** A GrammarRegistry instance. */
+    grammars: GrammarRegistry;
+
+    /** A HistoryManager instance. */
+    history: HistoryManager;
+
+    /** A PackageManager instance. */
+    packages: PackageManager;
+
+    /** A ThemeManager instance. */
+    themes: ThemeManager;
+
+    /** A StyleManager instance. */
+    styles: StyleManager;
+
+    /** A DeserializerManager instance. */
+    deserializers: DeserializerManager;
+
+    /** A ViewRegistry instance. */
+    views: ViewRegistry;
+
+    /** A Workspace instance. */
+    workspace: Workspace;
+
+    /** A TextEditorRegistry instance. */
+    textEditors: TextEditorRegistry;
+
+    // Event Subscription
+    /** Invoke the given callback whenever ::beep is called. */
+    onDidBeep(callback: () => void): Disposable;
+
+    /**
+     *  Invoke the given callback when there is an unhandled error, but before
+     *  the devtools pop open.
+     */
+    onWillThrowError(callback: (event: PreventableExceptionThrownEvent) => void): Disposable;
+
+    /** Invoke the given callback whenever there is an unhandled error. */
+    onDidThrowError(callback: (event: ExceptionThrownEvent) => void): Disposable;
+
+    /**
+     *  Invoke the given callback as soon as the shell environment is loaded (or
+     *  immediately if it was already loaded).
+     */
+    whenShellEnvironmentLoaded(callback: () => void): Disposable;
+
+    // Atom Details
+    /** Returns a boolean that is true if the current window is in development mode. */
+    inDevMode(): boolean;
+
+    /** Returns a boolean that is true if the current window is in safe mode. */
+    inSafeMode(): boolean;
+
+    /** Returns a boolean that is true if the current window is running specs. */
+    inSpecMode(): boolean;
+
+    /** Get the version of the Atom application. */
+    getVersion(): string;
+
+    /**
+     *  Gets the release channel of the Atom application.
+     *  Returns the release channel, which can be 'dev', 'beta', or 'stable'.
+     */
+    getReleaseChannel(): "dev"|"beta"|"stable";
+
+    /** Returns a boolean that is true if the current version is an official release. */
+    isReleasedVersion(): boolean;
+
+    /** Get the time taken to completely load the current window. */
+    getWindowLoadTime(): number;
+
+    /** Get the load settings for the current window. */
+    getLoadSettings(): WindowLoadSettings;
+
+    // Managing the Atom Window
+    /** Open a new Atom window using the given options. */
+    open(params?: {
+        pathsToOpen: ReadonlyArray<string>,
+        newWindow?: boolean,
+        devMode?: boolean,
+        safeMode?: boolean,
+    }): void;
+
+    /** Close the current window. */
+    close(): void;
+
+    /** Get the size of current window. */
+    getSize(): { width: number, height: number };
+
+    /** Set the size of current window. */
+    setSize(width: number, height: number): void;
+
+    /** Get the position of current window. */
+    getPosition(): { x: number, y: number };
+
+    /** Set the position of current window. */
+    setPosition(x: number, y: number): void;
+
+    /** Prompt the user to select one or more folders. */
+    pickFolder(callback: (paths: string[]|null) => void): void;
+
+    /** Get the current window. */
+    getCurrentWindow(): object;
+
+    /** Move current window to the center of the screen. */
+    center(): void;
+
+    /** Focus the current window. */
+    focus(): void;
+
+    /** Show the current window. */
+    show(): void;
+
+    /** Hide the current window. */
+    hide(): void;
+
+    /** Reload the current window. */
+    reload(): void;
+
+    /** Relaunch the entire application. */
+    restartApplication(): void;
+
+    /** Returns a boolean that is true if the current window is maximized. */
+    isMaximized(): boolean;
+
+    /** Returns a boolean that is true if the current window is in full screen mode. */
+    isFullScreen(): boolean;
+
+    /** Set the full screen state of the current window. */
+    setFullScreen(fullScreen: boolean): void;
+
+    /** Toggle the full screen state of the current window. */
+    toggleFullScreen(): void;
+
+    // Messaging the User
+    /** Visually and audibly trigger a beep. */
+    beep(): void;
+
+    /**
+     *  A flexible way to open a dialog akin to an alert dialog.
+     *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
+     *  selecting a button the first button will be clicked unless a "Cancel" or "No"
+     *  button is provided.
+     *
+     *  Returns the chosen button index number if the buttons option was an array.
+     */
+    confirm(options: {
+        message: string,
+        detailedMessage?: string,
+        buttons?: ReadonlyArray<string>,
+    }): void;
+
+    /**
+     *  A flexible way to open a dialog akin to an alert dialog.
+     *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
+     *  selecting a button the first button will be clicked unless a "Cancel" or "No"
+     *  button is provided.
+     *
+     *  Returns the chosen button index number if the buttons option was an array.
+     */
+    confirm(options: {
+        message: string,
+        detailedMessage?: string,
+        buttons?: {
+            [key: string]: () => void
+        },
+    }): number;
+
+    // Managing the Dev Tools
+    /** Open the dev tools for the current window. */
+    openDevTools(): Promise<null>;
+
+    /** Toggle the visibility of the dev tools for the current window. */
+    toggleDevTools(): Promise<null>;
+
+    /** Execute code in dev tools. */
+    executeJavaScriptInDevTools(code: string): void;
+
+    /** Undocumented: get Atom config directory path */
+    getConfigDirPath(): string;
+}
+
+/**
+ *  A simple color class returned from Config::get when the value at the key path is
+ *  of type 'color'.
+ */
+export interface Color {
+    /** Returns a string in the form '#abcdef'. */
+    toHexString(): string;
+
+    /** Returns a string in the form 'rgba(25, 50, 75, .9)'. */
+    toRGBAString(): string;
+}
+
+export interface CommandRegistryTargetMap extends HTMLElementTagNameMap {
+  [key: string]: EventTarget;
+}
+
+export type CommandRegistryListener<TargetType extends EventTarget> = {
+  didDispatch(event: CommandEvent<TargetType>): void,
+  displayName?: string,
+  description?: string,
+  hiddenInCommandPalette?: boolean,
+} | ((event: CommandEvent<TargetType>) => void);
+
+/**
+ *  Associates listener functions with commands in a context-sensitive way
+ *  using CSS selectors.
+ */
+export interface CommandRegistry {
+    /** Register a single command. */
+    add<T extends keyof CommandRegistryTargetMap>(
+        target: T, commandName: string,
+        listener: CommandRegistryListener<CommandRegistryTargetMap[T]>
+      ): Disposable;
+    /** Register a single command. */
+    add<T extends Node>(
+        target: T, commandName: string,
+        listener: CommandRegistryListener<T>
+      ): Disposable;
+
+    /** Register multiple commands. */
+    add<T extends keyof CommandRegistryTargetMap>(target: T, commands: {
+        [key: string]: CommandRegistryListener<CommandRegistryTargetMap[T]>
+    }): CompositeDisposable;
+    /** Register multiple commands. */
+    add<T extends Node>(target: T, commands: {
+        [key: string]: CommandRegistryListener<T>
+    }): CompositeDisposable;
+
+    /** Find all registered commands matching a query. */
+    findCommands(params: { target: string|Node }): Array<{
+        name: string,
+        displayName: string,
+        description?: string,
+        tags?: string[],
+    }>;
+
+    /**
+     *  Simulate the dispatch of a command on a DOM node.
+     *  @return Whether or not there was a matching command for the target.
+     */
+    dispatch(target: Node, commandName: string): boolean;
+
+    /** Invoke the given callback before dispatching a command event. */
+    onWillDispatch(callback: (event: CommandEvent) => void): Disposable;
+
+    /** Invoke the given callback after dispatching a command event. */
+    onDidDispatch(callback: (event: CommandEvent) => void): Disposable;
+}
+
+/**
+ *  An object that aggregates multiple Disposable instances together into a
+ *  single disposable, so they can all be disposed as a group.
+ */
+export class CompositeDisposable implements DisposableLike {
+    /** Construct an instance, optionally with one or more disposables. */
+    constructor(...disposables: DisposableLike[]);
+
+    /**
+     *  Dispose all disposables added to this composite disposable.
+     *  If this object has already been disposed, this method has no effect.
+     */
+    dispose(): void;
+
+    // Managing Disposables
+    /**
+     *  Add disposables to be disposed when the composite is disposed.
+     *  If this object has already been disposed, this method has no effect.
+     */
+    add(...disposables: DisposableLike[]): void;
+
+    /** Remove a previously added disposable. */
+    remove(disposable: DisposableLike): void;
+
+    /** Alias to CompositeDisposable::remove. */
+    delete(disposable: DisposableLike): void;
+
+    /**
+     *  Clear all disposables. They will not be disposed by the next call to
+     *  dispose.
+     */
+    clear(): void;
+}
+
+/** Used to access all of Atom's configuration details. */
+export interface Config {
+    // Config Subscription
+    /**
+     *  Add a listener for changes to a given key path. This is different than ::onDidChange in
+     *  that it will immediately call your callback with the current value of the config entry.
+     */
+    observe<T extends keyof ConfigValues>(keyPath: T, callback:
+        (value: ConfigValues[T]) => void): Disposable;
+    /**
+     *  Add a listener for changes to a given key path. This is different than ::onDidChange in
+     *  that it will immediately call your callback with the current value of the config entry.
+     */
+    observe<T extends keyof ConfigValues>(keyPath: T, options:
+        { scope: string[]|ScopeDescriptor }, callback: (value: ConfigValues[T]) => void):
+        Disposable;
+
+    /**
+     *  Add a listener for changes to a given key path. If keyPath is not specified, your
+     *  callback will be called on changes to any key.
+     */
+    // tslint:disable-next-line:no-any
+    onDidChange<T = any>(callback: (values: { newValue: T, oldValue: T }) => void):
+        Disposable;
+    /**
+     *  Add a listener for changes to a given key path. If keyPath is not specified, your
+     *  callback will be called on changes to any key.
+     */
+    onDidChange<T extends keyof ConfigValues>(keyPath: T, callback: (values: {
+        newValue: ConfigValues[T],
+        oldValue?: ConfigValues[T],
+    }) => void): Disposable;
+    /**
+     *  Add a listener for changes to a given key path. If keyPath is not specified, your
+     *  callback will be called on changes to any key.
+     */
+    onDidChange<T extends keyof ConfigValues>(keyPath: T, options:
+        { scope: string[]|ScopeDescriptor }, callback:
+        (values: { newValue: ConfigValues[T], oldValue?: ConfigValues[T] }) => void):
+        Disposable;
+
+    // Managing Settings
+    /** Retrieves the setting for the given key. */
+    get<T extends keyof ConfigValues>(keyPath: T, options?: { sources?: string[],
+        excludeSources?: string[], scope?: string[]|ScopeDescriptor }):
+        ConfigValues[T];
+
+    /**
+     *  Sets the value for a configuration setting.
+     *  This value is stored in Atom's internal configuration file.
+     */
+    set<T extends keyof ConfigValues>(keyPath: T, value: ConfigValues[T], options?:
+        { scopeSelector?: string, source?: string }): void;
+
+    /** Restore the setting at keyPath to its default value. */
+    unset(keyPath: string, options?: { scopeSelector?: string, source?: string }): void;
+
+    /**
+     *  Get all of the values for the given key-path, along with their associated
+     *  scope selector.
+     */
+    getAll<T extends keyof ConfigValues>(keyPath: T, options?: { sources?: string[],
+        excludeSources?: string[], scope?: ScopeDescriptor }):
+        Array<{ scopeDescriptor: ScopeDescriptor, value: ConfigValues[T] }>;
+
+    /**
+     *  Get an Array of all of the source Strings with which settings have been added
+     *  via ::set.
+     */
+    getSources(): string[];
+
+    /**
+     *  Retrieve the schema for a specific key path. The schema will tell you what type
+     *  the keyPath expects, and other metadata about the config option.
+     */
+    getSchema(keyPath: string): object|null;
+
+    /** Get the string path to the config file being used. */
+    getUserConfigPath(): string;
+
+    /**
+     *  Suppress calls to handler functions registered with ::onDidChange and ::observe
+     *  for the duration of callback. After callback executes, handlers will be called
+     *  once if the value for their key-path has changed.
+     */
+    transact(callback: () => void): void;
+}
+
+/**
+ *  Represents a decoration that follows a DisplayMarker. A decoration is basically
+ *  a visual representation of a marker. It allows you to add CSS classes to line
+ *  numbers in the gutter, lines, and add selection-line regions around marked ranges
+ *  of text.
+ */
+export interface Decoration {
+    /** The identifier for this Decoration. */
+    id: number;
+
+    // Construction and Destruction
+    /**
+     *  Destroy this marker decoration.
+     *  You can also destroy the marker if you own it, which will destroy this decoration.
+     */
+    destroy(): void;
+
+    // Event Subscription
+    /** When the Decoration is updated via Decoration::setProperties. */
+    onDidChangeProperties(callback: (event: DecorationPropsChangedEvent) => void): Disposable;
+
+    /** Invoke the given callback when the Decoration is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    // Decoration Details
+    /** An id unique across all Decoration objects. */
+    getId(): number;
+
+    /** Returns the marker associated with this Decoration. */
+    getMarker(): DisplayMarker;
+
+    /**
+     *  Check if this decoration is of the given type.
+     *  @param type A decoration type, such as `line-number` or `line`. This may also
+     *  be an array of decoration types, with isType returning true if the decoration's
+     *  type matches any in the array.
+     */
+    isType(type: string|string[]): boolean;
+
+    // Properties
+    /** Returns the Decoration's properties. */
+    getProperties(): DecorationOptions;
+
+    /**
+     *  Update the marker with new Properties. Allows you to change the decoration's
+     *  class.
+     */
+    setProperties(newProperties: DecorationOptions): void;
+}
+
+/**
+ *  Represents a buffer annotation that remains logically stationary even as the
+ *  buffer changes. This is used to represent cursors, folds, snippet targets,
+ *  misspelled words, and anything else that needs to track a logical location
+ *  in the buffer over time.
+ */
+export interface DisplayMarker {
+    // Construction and Destruction
+    /**
+     *  Destroys the marker, causing it to emit the 'destroyed' event. Once destroyed,
+     *  a marker cannot be restored by undo/redo operations.
+     */
+    destroy(): void;
+
+    /** Creates and returns a new DisplayMarker with the same properties as this marker. */
+    copy(options?: CopyMarkerOptions): DisplayMarker;
+
+    // Event Subscription
+    /** Invoke the given callback when the state of the marker changes. */
+    onDidChange(callback: (event: DisplayMarkerChangedEvent) => void): Disposable;
+
+    /** Invoke the given callback when the marker is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    // TextEditorMarker Details
+    /**
+     *  Returns a boolean indicating whether the marker is valid. Markers can be
+     *  invalidated when a region surrounding them in the buffer is changed.
+     */
+    isValid(): boolean;
+
+    /**
+     *  Returns a boolean indicating whether the marker has been destroyed. A marker
+     *  can be invalid without being destroyed, in which case undoing the invalidating
+     *  operation would restore the marker.
+     */
+    isDestroyed(): boolean;
+
+    /** Returns a boolean indicating whether the head precedes the tail. */
+    isReversed(): boolean;
+
+    /**
+     *  Returns a boolean indicating whether changes that occur exactly at the marker's
+     *  head or tail cause it to move.
+     */
+    isExclusive(): boolean;
+
+    /**
+     *  Get the invalidation strategy for this marker.
+     *  Valid values include: never, surround, overlap, inside, and touch.
+     */
+    getInvalidationStrategy(): string;
+
+    /** Returns an Object containing any custom properties associated with the marker. */
+    getProperties(): object;
+
+    /** Merges an Object containing new properties into the marker's existing properties. */
+    setProperties(properties: object): void;
+
+    /** Returns whether this marker matches the given parameters. */
+    matchesProperties(attributes: FindDisplayMarkerOptions): boolean;
+
+    // Comparing to other markers
+    /** Compares this marker to another based on their ranges. */
+    compare(other: DisplayMarker): number;
+
+    /**
+     *  Returns a boolean indicating whether this marker is equivalent to another
+     *  marker, meaning they have the same range and options.
+     */
+    isEqual(other: DisplayMarker): boolean;
+
+    // Managing the marker's range
+    /** Gets the buffer range of this marker. */
+    getBufferRange(): Range;
+
+    /** Gets the screen range of this marker. */
+    getScreenRange(): Range;
+
+    /** Modifies the buffer range of this marker. */
+    setBufferRange(bufferRange: RangeCompatible, properties?: { reversed: boolean }):
+        void;
+
+    /** Modifies the screen range of this marker. */
+    setScreenRange(screenRange: RangeCompatible, options?: { reversed?: boolean,
+        clipDirection?: "backward"|"forward"|"closest" }): void;
+
+    /**
+     *  Retrieves the screen position of the marker's start. This will always be
+     *  less than or equal to the result of DisplayMarker::getEndScreenPosition.
+     */
+    getStartScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+        Point;
+
+    /**
+     *  Retrieves the screen position of the marker's end. This will always be
+     *  greater than or equal to the result of DisplayMarker::getStartScreenPosition.
+     */
+    getEndScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+        Point;
+
+    /** Retrieves the buffer position of the marker's head. */
+    getHeadBufferPosition(): Point;
+
+    /** Sets the buffer position of the marker's head. */
+    setHeadBufferPosition(bufferPosition: PointCompatible): void;
+
+    /** Retrieves the screen position of the marker's head. */
+    getHeadScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+        Point;
+
+    /** Sets the screen position of the marker's head. */
+    setHeadScreenPosition(screenPosition: PointCompatible,
+        options?: { clipDirection: "backward"|"forward"|"closest" }): void;
+
+    /** Retrieves the buffer position of the marker's tail. */
+    getTailBufferPosition(): Point;
+
+    /** Sets the buffer position of the marker's tail. */
+    setTailBufferPosition(bufferPosition: PointCompatible): void;
+
+    /** Retrieves the screen position of the marker's tail. */
+    getTailScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+        Point;
+
+    /** Sets the screen position of the marker's tail. */
+    setTailScreenPosition(screenPosition: PointCompatible,
+        options?: { clipDirection: "backward"|"forward"|"closest" }): void;
+
+    /**
+     *  Retrieves the buffer position of the marker's start. This will always be less
+     *  than or equal to the result of DisplayMarker::getEndBufferPosition.
+     */
+    getStartBufferPosition(): Point;
+
+    /**
+     *  Retrieves the buffer position of the marker's end. This will always be greater
+     *  than or equal to the result of DisplayMarker::getStartBufferPosition.
+     */
+    getEndBufferPosition(): Point;
+
+    /** Returns a boolean indicating whether the marker has a tail. */
+    hasTail(): boolean;
+
+    /**
+     *  Plants the marker's tail at the current head position. After calling the
+     *  marker's tail position will be its head position at the time of the call,
+     *  regardless of where the marker's head is moved.
+     */
+    plantTail(): void;
+
+    /**
+     *  Removes the marker's tail. After calling the marker's head position will be
+     *  reported as its current tail position until the tail is planted again.
+     */
+    clearTail(): void;
+}
+
+/**
+ *  Experimental: A container for a related set of markers at the DisplayLayer level.
+ *  Wraps an underlying MarkerLayer on the TextBuffer.
+ *
+ *  This API is experimental and subject to change on any release.
+ */
+export interface DisplayMarkerLayer {
+    // Lifecycle
+    /** Destroy this layer. */
+    destroy(): void;
+
+    /** Destroy all markers in this layer. */
+    clear(): void;
+
+    /** Determine whether this layer has been destroyed. */
+    isDestroyed(): boolean;
+
+    // Event Subscription
+    /** Subscribe to be notified synchronously when this layer is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    /**
+     *  Subscribe to be notified asynchronously whenever markers are created, updated,
+     *  or destroyed on this layer. Prefer this method for optimal performance when
+     *  interacting with layers that could contain large numbers of markers.
+     */
+    onDidUpdate(callback: () => void): Disposable;
+
+    /**
+     *  Subscribe to be notified synchronously whenever markers are created on this
+     *  layer. Avoid this method for optimal performance when interacting with layers
+     *  that could contain large numbers of markers.
+     */
+    onDidCreateMarker(callback: (marker: DisplayMarker|Marker) => void): Disposable;
+
+    // Marker creation
+    /** Create a marker with the given screen range. */
+    markScreenRange(range: RangeCompatible, options?: { reversed?: boolean,
+        invalidate?: "never"|"surround"|"overlap"|"inside"|"touch", exclusive?:
+        boolean, clipDirection?: "backward"|"forward"|"closest" }): DisplayMarker;
+
+    /**
+     *  Create a marker on this layer with its head at the given screen position
+     *  and no tail.
+     */
+    markScreenPosition(screenPosition: PointCompatible, options?: { invalidate?:
+        "never"|"surround"|"overlap"|"inside"|"touch", exclusive?: boolean,
+        clipDirection?: "backward"|"forward"|"closest" }): DisplayMarker;
+
+    /** Create a marker with the given buffer range. */
+    markBufferRange(range: RangeCompatible, options?: {
+        reversed?: boolean, invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+        exclusive?: boolean }): DisplayMarker;
+
+    /**
+     *  Create a marker on this layer with its head at the given buffer position
+     *  and no tail.
+     */
+    markBufferPosition(bufferPosition: PointCompatible, options?: { invalidate?:
+        "never"|"surround"|"overlap"|"inside"|"touch", exclusive?: boolean }):
+        DisplayMarker;
+
+    // Querying
+    /** Get an existing marker by its id. */
+    getMarker(id: number): DisplayMarker;
+
+    /** Get all markers in the layer. */
+    getMarkers(): DisplayMarker[];
+
+    /** Get the number of markers in the marker layer. */
+    getMarkerCount(): number;
+
+    /**
+     *  Find markers in the layer conforming to the given parameters.
+     *
+     *  This method finds markers based on the given properties. Markers can be associated
+     *  with custom properties that will be compared with basic equality. In addition,
+     *  there are several special properties that will be compared with the range of the
+     *  markers rather than their properties.
+     */
+    findMarkers(properties: FindDisplayMarkerOptions): DisplayMarker[];
+}
+
+/** A handle to a resource that can be disposed. */
+export class Disposable implements DisposableLike {
+    /** Ensure that Object correctly implements the Disposable contract. */
+    static isDisposable(object: object): boolean;
+
+    /** Construct a Disposable. */
+    constructor(disposableAction?: () => void);
+
+    /** A callback which will be called within dispose(). */
+    disposalAction?(): void;
+
+    /**
+     *  Perform the disposal action, indicating that the resource associated
+     *  with this disposable is no longer needed.
+     */
+    dispose(): void;
+}
+
+/**
+ *  Utility class to be used when implementing event-based APIs that allows
+ *  for handlers registered via ::on to be invoked with calls to ::emit.
+ */
+// tslint:disable-next-line:no-any
+export class Emitter<OptionalEmissions = { [key: string]: any }, RequiredEmissions = {}>
+        implements DisposableLike {
+    /** Construct an emitter. */
+    constructor();
+
+    /** Clear out any existing subscribers. */
+    clear(): void;
+
+    /** Unsubscribe all handlers. */
+    dispose(): boolean;
+
+    // Event Subscription
+    /** Registers a handler to be invoked whenever the given event is emitted. */
+    on<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /** Registers a handler to be invoked whenever the given event is emitted. */
+    on<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
+
+    /**
+     *  Register the given handler function to be invoked the next time an event
+     *  with the given name is emitted via ::emit.
+     */
+    once<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /**
+     *  Register the given handler function to be invoked the next time an event
+     *  with the given name is emitted via ::emit.
+     */
+    once<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
+
+    /**
+     *  Register the given handler function to be invoked before all other
+     *  handlers existing at the time of subscription whenever events by the
+     *  given name are emitted via ::emit.
+     */
+    preempt<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /**
+     *  Register the given handler function to be invoked before all other
+     *  handlers existing at the time of subscription whenever events by the
+     *  given name are emitted via ::emit.
+     */
+    preempt<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
+
+    // Event Emission
+    /** Invoke the handlers registered via ::on for the given event name. */
+    emit<T extends keyof OptionalEmissions>(eventName: T, value?:
+        OptionalEmissions[T]): void;
+    /** Invoke the handlers registered via ::on for the given event name. */
+    emit<T extends keyof RequiredEmissions>(eventName: T, value:
+        RequiredEmissions[T]): void;
+}
+
+/**
+ *  Represents a decoration that applies to every marker on a given layer. Created via
+ *  TextEditor::decorateMarkerLayer.
+ */
+export interface LayerDecoration {
+    /** Destroys the decoration. */
+    destroy(): void;
+
+    /** Determine whether this decoration is destroyed. */
+    isDestroyed(): boolean;
+
+    /** Get this decoration's properties. */
+    getProperties(): DecorationLayerOptions;
+
+    /** Set this decoration's properties. */
+    setProperties(newProperties: DecorationLayerOptions): void;
+
+    /** Override the decoration properties for a specific marker. */
+    setPropertiesForMarker(marker: DisplayMarker|Marker, properties: DecorationLayerOptions):
+        void;
+}
+
+/**
+ *  Represents a buffer annotation that remains logically stationary even as
+ *  the buffer changes.
+ */
+export interface Marker {
+    /** The identifier for this Marker. */
+    id: number;
+
+    // Lifecycle
+    /**
+     *  Creates and returns a new Marker with the same properties as this
+     *  marker.
+     */
+    copy(options?: CopyMarkerOptions): Marker;
+
+    /** Destroys the marker, causing it to emit the "destroyed" event. */
+    destroy(): void;
+
+    // Event Subscription
+    /** Invoke the given callback when the marker is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the state of the marker changes. */
+    onDidChange(callback: (event: MarkerChangedEvent) => void): Disposable;
+
+    // Marker Details
+    /** Returns the current range of the marker. The range is immutable. */
+    getRange(): Range;
+
+    /** Returns a point representing the marker's current head position. */
+    getHeadPosition(): Point;
+
+    /** Returns a point representing the marker's current tail position. */
+    getTailPosition(): Point;
+
+    /**
+     *  Returns a point representing the start position of the marker, which
+     *  could be the head or tail position, depending on its orientation.
+     */
+    getStartPosition(): Point;
+
+    /**
+     *  Returns a point representing the end position of the marker, which
+     *  could be the head or tail position, depending on its orientation.
+     */
+    getEndPosition(): Point;
+
+    /** Returns a boolean indicating whether the head precedes the tail. */
+    isReversed(): boolean;
+
+    /** Returns a boolean indicating whether the marker has a tail. */
+    hasTail(): boolean;
+
+    /** Is the marker valid? */
+    isValid(): boolean;
+
+    /** Is the marker destroyed? */
+    isDestroyed(): boolean;
+
+    /**
+     *  Returns a boolean indicating whether changes that occur exactly at
+     *  the marker's head or tail cause it to move.
+     */
+    isExclusive(): boolean;
+
+    /** Get the invalidation strategy for this marker. */
+    getInvalidationStrategy(): string;
+
+    // Mutating Markers
+    /**
+     *  Sets the range of the marker.
+     *  Returns a boolean indicating whether or not the marker was updated.
+     */
+    setRange(range: RangeCompatible, params?: { reversed?: boolean, exclusive?:
+        boolean }): boolean;
+
+    /**
+     *  Sets the head position of the marker.
+     *  Returns a boolean indicating whether or not the marker was updated.
+     */
+    setHeadPosition(position: PointCompatible): boolean;
+
+    /**
+     *  Sets the tail position of the marker.
+     *  Returns a boolean indicating whether or not the marker was updated.
+     */
+    setTailPosition(position: PointCompatible): boolean;
+
+    /**
+     *  Removes the marker's tail.
+     *  Returns a boolean indicating whether or not the marker was updated.
+     */
+    clearTail(): boolean;
+
+    /**
+     *  Plants the marker's tail at the current head position.
+     *  Returns a boolean indicating whether or not the marker was updated.
+     */
+    plantTail(): boolean;
+
+    // Comparison
+    /**
+     *  Returns a boolean indicating whether this marker is equivalent to
+     *  another marker, meaning they have the same range and options.
+     */
+    isEqual(other: Marker): boolean;
+
+    /**
+     *  Compares this marker to another based on their ranges.
+     *  Returns "-1" if this marker precedes the argument.
+     *  Returns "0" if this marker is equivalent to the argument.
+     *  Returns "1" if this marker follows the argument.
+     */
+    compare(other: Marker): number;
+}
+
+/** Experimental: A container for a related set of markers. */
+export interface MarkerLayer {
+    // Lifecycle
+    /** Create a copy of this layer with markers in the same state and locations. */
+    copy(): MarkerLayer;
+
+    /** Destroy this layer. */
+    destroy(): boolean;
+
+    /** Remove all markers from this layer. */
+    clear(): void;
+
+    /** Determine whether this layer has been destroyed. */
+    isDestroyed(): boolean;
+
+    // Querying
+    /** Get an existing marker by its id. */
+    getMarker(id: number): Marker|undefined;
+
+    /** Get all existing markers on the marker layer. */
+    getMarkers(): Marker[];
+
+    /** Get the number of markers in the marker layer. */
+    getMarkerCount(): number;
+
+    /** Find markers in the layer conforming to the given parameters. */
+    findMarkers(params: FindMarkerOptions): Marker[];
+
+    // Marker Creation
+    /** Create a marker with the given range. */
+    markRange(range: RangeCompatible, options?: { reversed?: boolean, invalidate?:
+        "never"|"surround"|"overlap"|"inside"|"touch", exclusive?: boolean }): Marker;
+
+    /** Create a marker at with its head at the given position with no tail. */
+    markPosition(position: PointCompatible, options?: { invalidate?: "never"|"surround"
+        |"overlap"|"inside"|"touch", exclusive?: boolean }): Marker;
+
+    // Event Subscription
+    /**
+     *  Subscribe to be notified asynchronously whenever markers are created,
+     *  updated, or destroyed on this layer.
+     */
+    onDidUpdate(callback: () => void): Disposable;
+
+    /**
+     *  Subscribe to be notified synchronously whenever markers are created on
+     *  this layer.
+     */
+    onDidCreateMarker(callback: (marker: Marker) => void): Disposable;
+
+    /** Subscribe to be notified synchronously when this layer is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+}
+
+/** A notification to the user containing a message and type. */
+export class Notification {
+    constructor(type: "warning"|"info"|"success", message: string,
+        options?: NotificationOptions);
+    constructor(type: "fatal"|"error", message: string, options?: ErrorNotificationOptions);
+
+    // Event Subscription
+    /** Invoke the given callback when the notification is dismissed. */
+    onDidDismiss(callback: (notification: Notification) => void): Disposable;
+
+    /** Invoke the given callback when the notification is displayed. */
+    onDidDisplay(callback: (notification: Notification) => void): Disposable;
+
+    // Methods
+    /** Returns the Notification's type. */
+    getType(): string;
+
+    /** Returns the Notification's message. */
+    getMessage(): string;
+
+    /**
+     *  Dismisses the notification, removing it from the UI. Calling this
+     *  programmatically will call all callbacks added via onDidDismiss.
+     */
+    dismiss(): void;
+}
+
+/** A notification manager used to create Notifications to be shown to the user. */
+export interface NotificationManager {
+    // Properties
+    notifications: Notification[];
+
+    // Events
+    /** Invoke the given callback after a notification has been added. */
+    onDidAddNotification(callback: (notification: Notification) => void): Disposable;
+
+    // Adding Notifications
+    /** Add a success notification. */
+    addSuccess(message: string, options?: NotificationOptions): Notification;
+
+    /** Add an informational notification. */
+    addInfo(message: string, options?: NotificationOptions): Notification;
+
+    /** Add a warning notification. */
+    addWarning(message: string, options?: NotificationOptions): Notification;
+
+    /** Add an error notification. */
+    addError(message: string, options?: ErrorNotificationOptions): Notification;
+
+    /** Add a fatal error notification. */
+    addFatalError(message: string, options?: ErrorNotificationOptions): Notification;
+
+    // Getting Notifications
+    /** Get all the notifications. */
+    getNotifications(): Notification[];
+}
+
+/** Represents a point in a buffer in row/column coordinates. */
+export class Point {
+    // Properties
+    /** A zero-indexed number representing the row of the Point. */
+    row: number;
+
+    /** A zero-indexed number representing the column of the Point. */
+    column: number;
+
+    // Construction
+    /**
+     *  Create a Point from an array containing two numbers representing the
+     *  row and column.
+     */
+    static fromObject(object: PointCompatible, copy?: boolean): Point;
+
+    /** Construct a Point object */
+    constructor(row?: number, column?: number);
+
+    /** Returns a new Point with the same row and column. */
+    copy(): Point;
+
+    /** Returns a new Point with the row and column negated. */
+    negate(): Point;
+
+    // Comparison
+    /** Returns the given Point that is earlier in the buffer. */
+    static min(point1: PointCompatible, point2: PointCompatible): Point;
+
+    /**
+     *  Compare another Point to this Point instance.
+     *  Returns -1 if this point precedes the argument.
+     *  Returns 0 if this point is equivalent to the argument.
+     *  Returns 1 if this point follows the argument.
+     */
+    compare(other: PointCompatible): number;
+
+    /**
+     *  Returns a boolean indicating whether this point has the same row and
+     *  column as the given Point.
+     */
+    isEqual(other: PointCompatible): boolean;
+
+    /** Returns a Boolean indicating whether this point precedes the given Point. */
+    isLessThan(other: PointCompatible): boolean;
+
+    /**
+     *  Returns a Boolean indicating whether this point precedes or is equal to
+     *  the given Point.
+     */
+    isLessThanOrEqual(other: PointCompatible): boolean;
+
+    /** Returns a Boolean indicating whether this point follows the given Point. */
+    isGreaterThan(other: PointCompatible): boolean;
+
+    /**
+     *  Returns a Boolean indicating whether this point follows or is equal to
+     *  the given Point.
+     */
+    isGreaterThanOrEqual(other: PointCompatible): boolean;
+
+    // Operations
+    /** Makes this point immutable and returns itself. */
+    freeze(): Readonly<Point>;
+
+    /**
+     *  Build and return a new point by adding the rows and columns of the
+     *  given point.
+     */
+    translate(other: PointCompatible): Point;
+
+    /**
+     *  Build and return a new Point by traversing the rows and columns
+     *  specified by the given point.
+     */
+    traverse(other: PointCompatible): Point;
+
+    /** Returns an array of this point's row and column. */
+    toArray(): [number, number];
+
+    /** Returns an array of this point's row and column. */
+    serialize(): [number, number];
+
+    /** Returns a string representation of the point. */
+    toString(): string;
+}
+
+/** Represents a region in a buffer in row/column coordinates. */
+export class Range {
+    // Properties
+    /** A Point representing the start of the Range. */
+    start: Point;
+
+    /** A Point representing the end of the Range. */
+    end: Point;
+
+    // Construction
+    /** Convert any range-compatible object to a Range. */
+    static fromObject(object: RangeCompatible, copy?: boolean): Range;
+
+    /** Construct a Range object. */
+    constructor(pointA?: PointCompatible, pointB?: PointCompatible);
+
+    /** Call this with the result of Range::serialize to construct a new Range. */
+    static deserialize(array: object): Range;
+
+    /** Returns a new range with the same start and end positions. */
+    copy(): Range;
+
+    /** Returns a new range with the start and end positions negated. */
+    negate(): Range;
+
+    // Serialization and Deserialization
+    /** Returns a plain javascript object representation of the Range. */
+    serialize(): number[][];
+
+    // Range Details
+    /** Is the start position of this range equal to the end position? */
+    isEmpty(): boolean;
+
+    /**
+     *  Returns a boolean indicating whether this range starts and ends on the
+     *  same row.
+     */
+    isSingleLine(): boolean;
+
+    /** Get the number of rows in this range. */
+    getRowCount(): number;
+
+    /** Returns an array of all rows in the range. */
+    getRows(): number[];
+
+    // Operations
+    /**
+     *  Freezes the range and its start and end point so it becomes immutable
+     *  and returns itself.
+     */
+    freeze(): Readonly<Range>;
+
+    // NOTE: this function doesn't actually take a range-compatible parameter.
+    /** Returns a new range that contains this range and the given range. */
+    union(other: RangeLike): Range;
+
+    /**
+     *  Build and return a new range by translating this range's start and end
+     *  points by the given delta(s).
+     */
+    translate(startDelta: PointCompatible, endDelta?: PointCompatible): Range;
+
+    /**
+     *  Build and return a new range by traversing this range's start and end
+     *  points by the given delta.
+     */
+    traverse(delta: PointCompatible): Range;
+
+    // Comparison
+    /**
+     *  Compare two Ranges.
+     *  Returns -1 if this range starts before the argument or contains it.
+     *  Returns 0 if this range is equivalent to the argument.
+     *  Returns 1 if this range starts after the argument or is contained by it.
+     */
+    compare(otherRange: RangeCompatible): number;
+
+    /**
+     *  Returns a Boolean indicating whether this range has the same start and
+     *  end points as the given Range.
+     */
+    isEqual(otherRange: RangeCompatible): boolean;
+
+    // NOTE: this function doesn't actually take a range-compatible parameter.
+    /**
+     *  Returns a Boolean indicating whether this range starts and ends on the
+     *  same row as the argument.
+     */
+    coversSameRows(otherRange: RangeLike): boolean;
+
+    // NOTE: this function doesn't actually take a range-compatible parameter.
+    /** Determines whether this range intersects with the argument. */
+    intersectsWith(otherRange: RangeLike, exclusive?: boolean): boolean;
+
+    /** Returns a boolean indicating whether this range contains the given range. */
+    containsRange(otherRange: RangeCompatible, exclusive?: boolean): boolean;
+
+    /** Returns a boolean indicating whether this range contains the given point. */
+    containsPoint(point: PointCompatible, exclusive?: boolean): boolean;
+
+    /**
+     *  Returns a boolean indicating whether this range intersects the given
+     *  row number.
+     */
+    intersectsRow(row: number): boolean;
+
+    /**
+     *  Returns a boolean indicating whether this range intersects the row range
+     *  indicated by the given startRow and endRow numbers.
+     */
+    intersectsRowRange(startRow: number, endRow: number): boolean;
+
+    // Conversion
+    /** Returns a string representation of the range. */
+    toString(): string;
+}
+
+/**
+ *  This class represents all essential editing state for a single TextBuffer,
+ *  including cursor and selection positions, folds, and soft wraps.
+ */
+export class TextEditor {
+    id: number;
+    buffer: TextBuffer;
+
+    // NOTE: undocumented within the public API. Don't go down the rabbit hole.
+    constructor(options?: object);
+
+    // Event Subscription
+    /** Calls your callback when the buffer's title has changed. */
+    onDidChangeTitle(callback: (title: string) => void): Disposable;
+
+    /** Calls your callback when the buffer's path, and therefore title, has changed. */
+    onDidChangePath(callback: (path: string) => void): Disposable;
+
+    /**
+     *  Invoke the given callback synchronously when the content of the buffer
+     *  changes.
+     */
+    onDidChange(callback: (event: EditorChangedEvent[]) => void): Disposable;
+
+    /**
+     *  Invoke callback when the buffer's contents change. It is emit
+     *  asynchronously 300ms after the last buffer change. This is a good place
+     *  to handle changes to the buffer without compromising typing performance.
+     */
+    onDidStopChanging(callback: (event: BufferStoppedChangingEvent) => void): Disposable;
+
+    /**
+     *  Calls your callback when a Cursor is moved. If there are multiple cursors,
+     *  your callback will be called for each cursor.
+     */
+    onDidChangeCursorPosition(callback: (event: CursorPositionChangedEvent) => void):
+        Disposable;
+
+    /** Calls your callback when a selection's screen range changes. */
+    onDidChangeSelectionRange(callback: (event: SelectionChangedEvent) => void): Disposable;
+
+    /** Invoke the given callback after the buffer is saved to disk. */
+    onDidSave(callback: (event: { path: string }) => void): Disposable;
+
+    /** Invoke the given callback when the editor is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    /** Retrieves the current TextBuffer. */
+    getBuffer(): TextBuffer;
+
+    /**
+     *  Calls your callback when a Gutter is added to the editor. Immediately calls
+     *  your callback for each existing gutter.
+     */
+    observeGutters(callback: (gutter: Gutter) => void): Disposable;
+
+    /** Calls your callback when a Gutter is added to the editor. */
+    onDidAddGutter(callback: (gutter: Gutter) => void): Disposable;
+
+    /** Calls your callback when a Gutter is removed from the editor. */
+    onDidRemoveGutter(callback: (name: string) => void): Disposable;
+
+    /** Calls your callback when soft wrap was enabled or disabled. */
+    onDidChangeSoftWrapped(callback: (softWrapped: boolean) => void): Disposable;
+
+    /** Calls your callback when the buffer's encoding has changed. */
+    onDidChangeEncoding(callback: (encoding: string) => void): Disposable;
+
+    /**
+     *  Calls your callback when the grammar that interprets and colorizes the text
+     *  has been changed. Immediately calls your callback with the current grammar.
+     */
+    observeGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+    /**
+     *  Calls your callback when the grammar that interprets and colorizes the text
+     *  has been changed.
+     */
+    onDidChangeGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+    /** Calls your callback when the result of ::isModified changes. */
+    onDidChangeModified(callback: (modified: boolean) => void): Disposable;
+
+    /**
+     *  Calls your callback when the buffer's underlying file changes on disk at a
+     *  moment when the result of ::isModified is true.
+     */
+    onDidConflict(callback: () => void): Disposable;
+
+    /** Calls your callback before text has been inserted. */
+    onWillInsertText(callback: (event: { text: string, cancel(): void }) => void): Disposable;
+
+    /** Calls your callback after text has been inserted. */
+    onDidInsertText(callback: (event: { text: string }) => void): Disposable;
+
+    /**
+     *  Calls your callback when a Cursor is added to the editor. Immediately calls
+     *  your callback for each existing cursor.
+     */
+    observeCursors(callback: (cursor: Cursor) => void): Disposable;
+
+    /** Calls your callback when a Cursor is added to the editor. */
+    onDidAddCursor(callback: (cursor: Cursor) => void): Disposable;
+
+    /** Calls your callback when a Cursor is removed from the editor. */
+    onDidRemoveCursor(callback: (cursor: Cursor) => void): Disposable;
+
+    /**
+     *  Calls your callback when a Selection is added to the editor. Immediately
+     *  calls your callback for each existing selection.
+     */
+    observeSelections(callback: (selection: Selection) => void): Disposable;
+
+    /** Calls your callback when a Selection is added to the editor. */
+    onDidAddSelection(callback: (selection: Selection) => void): Disposable;
+
+    /** Calls your callback when a Selection is removed from the editor. */
+    onDidRemoveSelection(callback: (selection: Selection) => void): Disposable;
+
+    /**
+     *  Calls your callback with each Decoration added to the editor. Calls your
+     *  callback immediately for any existing decorations.
+     */
+    observeDecorations(callback: (decoration: Decoration) => void): Disposable;
+
+    /** Calls your callback when a Decoration is added to the editor. */
+    onDidAddDecoration(callback: (decoration: Decoration) => void): Disposable;
+
+    /** Calls your callback when a Decoration is removed from the editor. */
+    onDidRemoveDecoration(callback: (decoration: Decoration) => void): Disposable;
+
+    /** Calls your callback when the placeholder text is changed. */
+    onDidChangePlaceholderText(callback: (placeholderText: string) => void): Disposable;
+
+    // File Details
+    /**
+     *  Get the editor's title for display in other parts of the UI such as the tabs.
+     *  If the editor's buffer is saved, its title is the file name. If it is unsaved,
+     *  its title is "untitled".
+     */
+    getTitle(): string;
+
+    /**
+     *  Get unique title for display in other parts of the UI, such as the window title.
+     *  If the editor's buffer is unsaved, its title is "untitled" If the editor's
+     *  buffer is saved, its unique title is formatted as one of the following,
+     *
+     *  "" when it is the only editing buffer with this file name.
+     *  " — " when other buffers have this file name.
+     */
+    getLongTitle(): string;
+
+    /** Returns the string path of this editor's text buffer. */
+    getPath(): string|undefined;
+
+    /** Returns boolean true if this editor has been modified. */
+    isModified(): boolean;
+
+    /** Returns boolean true if this editor has no content. */
+    isEmpty(): boolean;
+
+    /** Returns the string character set encoding of this editor's text buffer. */
+    getEncoding(): string;
+
+    /** Set the character set encoding to use in this editor's text buffer. */
+    setEncoding(encoding: string): void;
+
+    // File Operations
+    /**
+     *  Saves the editor's text buffer.
+     *  See TextBuffer::save for more details.
+     */
+    save(): Promise<void>;
+
+    /**
+     *  Saves the editor's text buffer as the given path.
+     *  See TextBuffer::saveAs for more details.
+     */
+    saveAs(filePath: string): Promise<void>;
+
+    // Reading Text
+    /** Returns a string representing the entire contents of the editor. */
+    getText(): string;
+
+    /** Get the text in the given range in buffer coordinates. */
+    getTextInBufferRange(range: RangeCompatible): string;
+
+    /** Returns a number representing the number of lines in the buffer. */
+    getLineCount(): number;
+
+    /**
+     *  Returns a number representing the number of screen lines in the editor.
+     *  This accounts for folds.
+     */
+    getScreenLineCount(): number;
+
+    /**
+     *  Returns a number representing the last zero-indexed buffer row number of
+     *  the editor.
+     */
+    getLastBufferRow(): number;
+
+    /**
+     *  Returns a number representing the last zero-indexed screen row number of
+     *  the editor.
+     */
+    getLastScreenRow(): number;
+
+    /**
+     *  Returns a string representing the contents of the line at the given
+     *  buffer row.
+     */
+    lineTextForBufferRow(bufferRow: number): string;
+
+    /**
+     *  Returns a string representing the contents of the line at the given
+     *  screen row.
+     */
+    lineTextForScreenRow(screenRow: number): string;
+
+    /** Get the range of the paragraph surrounding the most recently added cursor. */
+    getCurrentParagraphBufferRange(): Range;
+
+    // Mutating Text
+    /** Replaces the entire contents of the buffer with the given string. */
+    setText(text: string): void;
+
+    /** Set the text in the given Range in buffer coordinates. */
+    setTextInBufferRange(range: RangeCompatible, text: string, options?:
+        { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+
+    /* For each selection, replace the selected text with the given text. */
+    insertText(text: string, options?: TextInsertionOptions): Range|false;
+
+    /** For each selection, replace the selected text with a newline. */
+    insertNewline(): void;
+
+    /**
+     *  For each selection, if the selection is empty, delete the character following
+     *  the cursor. Otherwise delete the selected text.
+     */
+    delete(): void;
+
+    /**
+     *  For each selection, if the selection is empty, delete the character preceding
+     *  the cursor. Otherwise delete the selected text.
+     */
+    backspace(): void;
+
+    /**
+     *  Mutate the text of all the selections in a single transaction.
+     *  All the changes made inside the given function can be reverted with a single
+     *  call to ::undo.
+     */
+    mutateSelectedText(fn: (selection: Selection, index: number) => void): void;
+
+    /**
+     *  For each selection, transpose the selected text.
+     *  If the selection is empty, the characters preceding and following the cursor
+     *  are swapped. Otherwise, the selected characters are reversed.
+     */
+    transpose(): void;
+
+    /**
+     *  Convert the selected text to upper case.
+     *  For each selection, if the selection is empty, converts the containing word
+     *  to upper case. Otherwise convert the selected text to upper case.
+     */
+    upperCase(): void;
+
+    /**
+     *  Convert the selected text to lower case.
+     *  For each selection, if the selection is empty, converts the containing word
+     *  to upper case. Otherwise convert the selected text to upper case.
+     */
+    lowerCase(): void;
+
+    /**
+     *  Toggle line comments for rows intersecting selections.
+     *  If the current grammar doesn't support comments, does nothing.
+     */
+    toggleLineCommentsInSelection(): void;
+
+    /** For each cursor, insert a newline at beginning the following line. */
+    insertNewlineBelow(): void;
+
+    /** For each cursor, insert a newline at the end of the preceding line. */
+    insertNewlineAbove(): void;
+
+    /**
+     *  For each selection, if the selection is empty, delete all characters of the
+     *  containing word that precede the cursor. Otherwise delete the selected text.
+     */
+    deleteToBeginningOfWord(): void;
+
+    /**
+     *  Similar to ::deleteToBeginningOfWord, but deletes only back to the previous
+     *  word boundary.
+     */
+    deleteToPreviousWordBoundary(): void;
+
+    /** Similar to ::deleteToEndOfWord, but deletes only up to the next word boundary. */
+    deleteToNextWordBoundary(): void;
+
+    /**
+     *  For each selection, if the selection is empty, delete all characters of the
+     *  containing subword following the cursor. Otherwise delete the selected text.
+     */
+    deleteToBeginningOfSubword(): void;
+
+    /**
+     *  For each selection, if the selection is empty, delete all characters of the
+     *  containing subword following the cursor. Otherwise delete the selected text.
+     */
+    deleteToEndOfSubword(): void;
+
+    /**
+     *  For each selection, if the selection is empty, delete all characters of the
+     *  containing line that precede the cursor. Otherwise delete the selected text.
+     */
+    deleteToBeginningOfLine(): void;
+
+    /**
+     *  For each selection, if the selection is not empty, deletes the selection
+     *  otherwise, deletes all characters of the containing line following the cursor.
+     *  If the cursor is already at the end of the line, deletes the following newline.
+     */
+    deleteToEndOfLine(): void;
+
+    /**
+     *  For each selection, if the selection is empty, delete all characters of the
+     *  containing word following the cursor. Otherwise delete the selected text.
+     */
+    deleteToEndOfWord(): void;
+
+    /** Delete all lines intersecting selections. */
+    deleteLine(): void;
+
+    // History
+    /** Undo the last change. */
+    undo(): void;
+
+    /** Redo the last change. */
+    redo(): void;
+
+    /**
+     *  Batch multiple operations as a single undo/redo step.
+     *  Any group of operations that are logically grouped from the perspective of undoing
+     *  and redoing should be performed in a transaction. If you want to abort the transaction,
+     *  call ::abortTransaction to terminate the function's execution and revert any changes
+     *  performed up to the abortion.
+     */
+    transact(fn: () => void): void;
+    /**
+     *  Batch multiple operations as a single undo/redo step.
+     *  Any group of operations that are logically grouped from the perspective of undoing
+     *  and redoing should be performed in a transaction. If you want to abort the transaction,
+     *  call ::abortTransaction to terminate the function's execution and revert any changes
+     *  performed up to the abortion.
+     */
+    transact(groupingInterval: number, fn: () => void): void;
+
+    /**
+     *  Abort an open transaction, undoing any operations performed so far within the
+     *  transaction.
+     */
+    abortTransaction(): void;
+
+    /**
+     *  Create a pointer to the current state of the buffer for use with ::revertToCheckpoint
+     *  and ::groupChangesSinceCheckpoint.
+     */
+    createCheckpoint(): number;
+
+    /**
+     *  Revert the buffer to the state it was in when the given checkpoint was created.
+     *  The redo stack will be empty following this operation, so changes since the checkpoint
+     *  will be lost. If the given checkpoint is no longer present in the undo history, no
+     *  changes will be made to the buffer and this method will return false.
+     */
+    revertToCheckpoint(checkpoint: number): boolean;
+
+    /**
+     *  Group all changes since the given checkpoint into a single transaction for purposes
+     *  of undo/redo.
+     *  If the given checkpoint is no longer present in the undo history, no grouping will be
+     *  performed and this method will return false.
+     */
+    groupChangesSinceCheckpoint(checkpoint: number): boolean;
+
+    // TextEditor Coordinates
+    /** Convert a position in buffer-coordinates to screen-coordinates. */
+    screenPositionForBufferPosition(bufferPosition: PointCompatible, options?:
+        { clipDirection?: "backward"|"forward"|"closest"}): Point;
+
+    /** Convert a position in screen-coordinates to buffer-coordinates. */
+    bufferPositionForScreenPosition(bufferPosition: PointCompatible, options?:
+        { clipDirection?: "backward"|"forward"|"closest"}): Point;
+
+    /** Convert a range in buffer-coordinates to screen-coordinates. */
+    screenRangeForBufferRange(bufferRange: RangeCompatible): Range;
+
+    /** Convert a range in screen-coordinates to buffer-coordinates. */
+    bufferRangeForScreenRange(screenRange: RangeCompatible): Range;
+
+    /** Clip the given Point to a valid position in the buffer. */
+    clipBufferPosition(bufferPosition: PointCompatible): Point;
+
+    /**
+     *  Clip the start and end of the given range to valid positions in the buffer.
+     *  See ::clipBufferPosition for more information.
+     */
+    clipBufferRange(range: RangeCompatible): Range;
+
+    /** Clip the given Point to a valid position on screen. */
+    clipScreenPosition(screenPosition: PointCompatible, options?:
+        { clipDirection?: "backward"|"forward"|"closest"}): Point;
+
+    /**
+     *  Clip the start and end of the given range to valid positions on screen.
+     *  See ::clipScreenPosition for more information.
+     */
+    clipScreenRange(range: RangeCompatible, options?: { clipDirection?:
+        "backward"|"forward"|"closest"}): Range;
+
+    // Decorations
+    /**
+     *  Add a decoration that tracks a DisplayMarker. When the marker moves, is
+     *  invalidated, or is destroyed, the decoration will be updated to reflect
+     *  the marker's state.
+     */
+    decorateMarker(marker: DisplayMarker, decorationParams: DecorationOptions): Decoration;
+
+    /**
+     *  Add a decoration to every marker in the given marker layer. Can be used to
+     *  decorate a large number of markers without having to create and manage many
+     *  individual decorations.
+     */
+    decorateMarkerLayer(markerLayer: MarkerLayer|DisplayMarkerLayer,
+        decorationParams: DecorationLayerOptions): LayerDecoration;
+
+    /** Get all decorations. */
+    getDecorations(propertyFilter?: DecorationOptions): Decoration[];
+
+    /** Get all decorations of type 'line'. */
+    getLineDecorations(propertyFilter?: DecorationOptions): Decoration[];
+
+    /** Get all decorations of type 'line-number'. */
+    getLineNumberDecorations(propertyFilter?: DecorationOptions): Decoration[];
+
+    /** Get all decorations of type 'highlight'. */
+    getHighlightDecorations(propertyFilter?: DecorationOptions): Decoration[];
+
+    /** Get all decorations of type 'overlay'. */
+    getOverlayDecorations(propertyFilter?: DecorationOptions): Decoration[];
+
+    // Markers
+    /**
+     *  Create a marker on the default marker layer with the given range in buffer coordinates.
+     *  This marker will maintain its logical location as the buffer is changed, so if you mark
+     *  a particular word, the marker will remain over that word even if the word's location
+     *  in the buffer changes.
+     */
+    markBufferRange(range: RangeCompatible, properties?: {
+        maintainHistory?: boolean,
+        reversed?: boolean,
+        invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+    }): DisplayMarker;
+
+    /**
+     *  Create a marker on the default marker layer with the given range in screen coordinates.
+     *  This marker will maintain its logical location as the buffer is changed, so if you mark
+     *  a particular word, the marker will remain over that word even if the word's location in
+     *  the buffer changes.
+     */
+    markScreenRange(range: RangeCompatible, properties?: {
+        maintainHistory?: boolean, reversed?: boolean,
+        invalidate?: "never"|"surround"|"overlap"|"inside" |"touch",
+    }): DisplayMarker;
+
+    /**
+     *  Create a marker on the default marker layer with the given buffer position and no tail.
+     *  To group multiple markers together in their own private layer, see ::addMarkerLayer.
+     */
+    markBufferPosition(bufferPosition: PointCompatible, options?: {
+        invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+    }): DisplayMarker;
+
+    /**
+     *  Create a marker on the default marker layer with the given screen position and no tail.
+     *  To group multiple markers together in their own private layer, see ::addMarkerLayer.
+     */
+    markScreenPosition(screenPosition: PointCompatible, options?: {
+        invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+        clipDirection?: "backward"|"forward"|"closest",
+    }): DisplayMarker;
+
+    /**
+     *  Find all DisplayMarkers on the default marker layer that match the given properties.
+     *
+     *  This method finds markers based on the given properties. Markers can be associated
+     *  with custom properties that will be compared with basic equality. In addition, there
+     *  are several special properties that will be compared with the range of the markers
+     *  rather than their properties.
+     */
+    findMarkers(properties: FindDisplayMarkerOptions): DisplayMarker[];
+
+    /** Create a marker layer to group related markers. */
+    addMarkerLayer(options?: { maintainHistory?: boolean, persistent?: boolean }):
+        DisplayMarkerLayer;
+
+    /** Get a DisplayMarkerLayer by id. */
+    getMarkerLayer(id: number): DisplayMarkerLayer|undefined;
+
+    /**
+     *  Get the default DisplayMarkerLayer.
+     *  All marker APIs not tied to an explicit layer interact with this default layer.
+     */
+    getDefaultMarkerLayer(): DisplayMarkerLayer;
+
+    /** Get the DisplayMarker on the default layer for the given marker id. */
+    getMarker(id: number): DisplayMarker;
+
+    /** Get all DisplayMarkers on the default marker layer. Consider using ::findMarkers. */
+    getMarkers(): DisplayMarker[];
+
+    /** Get the number of markers in the default marker layer. */
+    getMarkerCount(): number;
+
+    // Cursors
+    /** Get the position of the most recently added cursor in buffer coordinates. */
+    getCursorBufferPosition(): Point;
+
+    /** Get the position of all the cursor positions in buffer coordinates. */
+    getCursorBufferPositions(): Point[];
+
+    /**
+     *  Move the cursor to the given position in buffer coordinates.
+     *  If there are multiple cursors, they will be consolidated to a single cursor.
+     */
+    setCursorBufferPosition(position: PointCompatible, options?: { autoscroll?: boolean }):
+        void;
+
+    /** Get a Cursor at given screen coordinates Point. */
+    getCursorAtScreenPosition(position: PointCompatible): Cursor|undefined;
+
+    /** Get the position of the most recently added cursor in screen coordinates. */
+    getCursorScreenPosition(): Point;
+
+    /** Get the position of all the cursor positions in screen coordinates. */
+    getCursorScreenPositions(): Point[];
+
+    /**
+     *  Move the cursor to the given position in screen coordinates.
+     *  If there are multiple cursors, they will be consolidated to a single cursor.
+     */
+    setCursorScreenPosition(position: PointCompatible, options?: { autoscroll?: boolean }):
+        void;
+
+    /** Add a cursor at the given position in buffer coordinates. */
+    addCursorAtBufferPosition(bufferPosition: PointCompatible, options?:
+        { autoscroll?: boolean }): Cursor;
+
+    /** Add a cursor at the position in screen coordinates. */
+    addCursorAtScreenPosition(screenPosition: PointCompatible): Cursor;
+
+    /** Returns a boolean indicating whether or not there are multiple cursors. */
+    hasMultipleCursors(): boolean;
+
+    /** Move every cursor up one row in screen coordinates. */
+    moveUp(lineCount?: number): void;
+
+    /** Move every cursor down one row in screen coordinates. */
+    moveDown(lineCount?: number): void;
+
+    /** Move every cursor left one column. */
+    moveLeft(columnCount?: number): void;
+
+    /** Move every cursor right one column. */
+    moveRight(columnCount?: number): void;
+
+    /** Move every cursor to the beginning of its line in buffer coordinates. */
+    moveToBeginningOfLine(): void;
+
+    /** Move every cursor to the beginning of its line in screen coordinates. */
+    moveToBeginningOfScreenLine(): void;
+
+    /** Move every cursor to the first non-whitespace character of its line. */
+    moveToFirstCharacterOfLine(): void;
+
+    /** Move every cursor to the end of its line in buffer coordinates. */
+    moveToEndOfLine(): void;
+
+    /** Move every cursor to the end of its line in screen coordinates. */
+    moveToEndOfScreenLine(): void;
+
+    /** Move every cursor to the beginning of its surrounding word. */
+    moveToBeginningOfWord(): void;
+
+    /** Move every cursor to the end of its surrounding word. */
+    moveToEndOfWord(): void;
+
+    /**
+     *  Move every cursor to the top of the buffer.
+     *  If there are multiple cursors, they will be merged into a single cursor.
+     */
+    moveToTop(): void;
+
+    /**
+     *  Move every cursor to the bottom of the buffer.
+     *  If there are multiple cursors, they will be merged into a single cursor.
+     */
+    moveToBottom(): void;
+
+    /** Move every cursor to the beginning of the next word. */
+    moveToBeginningOfNextWord(): void;
+
+    /** Move every cursor to the previous word boundary. */
+    moveToPreviousWordBoundary(): void;
+
+    /** Move every cursor to the next word boundary. */
+    moveToNextWordBoundary(): void;
+
+    /** Move every cursor to the previous subword boundary. */
+    moveToPreviousSubwordBoundary(): void;
+
+    /** Move every cursor to the next subword boundary. */
+    moveToNextSubwordBoundary(): void;
+
+    /** Move every cursor to the beginning of the next paragraph. */
+    moveToBeginningOfNextParagraph(): void;
+
+    /** Move every cursor to the beginning of the previous paragraph. */
+    moveToBeginningOfPreviousParagraph(): void;
+
+    /** Returns the most recently added Cursor. */
+    getLastCursor(): Cursor;
+
+    /** Returns the word surrounding the most recently added cursor. */
+    getWordUnderCursor(options?: {
+        wordRegex?: RegExp,
+        includeNonWordCharacters?: boolean,
+        allowPrevious?: boolean,
+    }): string;
+
+    /** Get an Array of all Cursors. */
+    getCursors(): Cursor[];
+
+    /**
+     *  Get all Cursorss, ordered by their position in the buffer instead of the
+     *  order in which they were added.
+     */
+    getCursorsOrderedByBufferPosition(): Cursor[];
+
+    // Selections
+    /** Get the selected text of the most recently added selection. */
+    getSelectedText(): string;
+
+    /** Get the Range of the most recently added selection in buffer coordinates. */
+    getSelectedBufferRange(): Range;
+
+    /**
+     *  Get the Ranges of all selections in buffer coordinates.
+     *  The ranges are sorted by when the selections were added. Most recent at the end.
+     */
+    getSelectedBufferRanges(): Range[];
+
+    /**
+     *  Set the selected range in buffer coordinates. If there are multiple selections,
+     *  they are reduced to a single selection with the given range.
+     */
+    setSelectedBufferRange(bufferRange: RangeCompatible, options?:
+        { reversed?: boolean, preserveFolds?: boolean}): void;
+
+    /**
+     *  Set the selected ranges in buffer coordinates. If there are multiple selections,
+     *  they are replaced by new selections with the given ranges.
+     */
+    setSelectedBufferRanges(bufferRanges: ReadonlyArray<RangeCompatible>, options?:
+        { reversed?: boolean, preserveFolds?: boolean}): void;
+
+    /** Get the Range of the most recently added selection in screen coordinates. */
+    getSelectedScreenRange(): Range;
+
+    /**
+     *  Get the Ranges of all selections in screen coordinates.
+     *  The ranges are sorted by when the selections were added. Most recent at the end.
+     */
+    getSelectedScreenRanges(): Range[];
+
+    /**
+     *  Set the selected range in screen coordinates. If there are multiple selections,
+     *  they are reduced to a single selection with the given range.
+     */
+    setSelectedScreenRange(screenRange: RangeCompatible, options?: { reversed?: boolean }):
+        void;
+
+    /**
+     *  Set the selected ranges in screen coordinates. If there are multiple selections,
+     *  they are replaced by new selections with the given ranges.
+     */
+    setSelectedScreenRanges(screenRanges: ReadonlyArray<RangeCompatible>, options?:
+        { reversed?: boolean }): void;
+
+    /** Add a selection for the given range in buffer coordinates. */
+    addSelectionForBufferRange(bufferRange: RangeCompatible, options?:
+        { reversed?: boolean, preserveFolds?: boolean }): Selection;
+
+    /** Add a selection for the given range in screen coordinates. */
+    addSelectionForScreenRange(screenRange: RangeCompatible, options?:
+        { reversed?: boolean, preserveFolds?: boolean }): Selection;
+
+    /**
+     *  Select from the current cursor position to the given position in buffer coordinates.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToBufferPosition(position: PointCompatible): void;
+
+    /**
+     *  Select from the current cursor position to the given position in screen coordinates.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToScreenPosition(position: PointCompatible): void;
+
+    /**
+     *  Move the cursor of each selection one character upward while preserving the
+     *  selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectUp(rowCount?: number): void;
+
+    /**
+     *  Move the cursor of each selection one character downward while preserving
+     *  the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectDown(rowCount?: number): void;
+
+    /**
+     *  Move the cursor of each selection one character leftward while preserving
+     *  the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectLeft(columnCount?: number): void;
+
+    /**
+     *  Move the cursor of each selection one character rightward while preserving
+     *  the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectRight(columnCount?: number): void;
+
+    /**
+     *  Select from the top of the buffer to the end of the last selection in the buffer.
+     *  This method merges multiple selections into a single selection.
+     */
+    selectToTop(): void;
+
+    /**
+     *  Selects from the top of the first selection in the buffer to the end of the buffer.
+     *  This method merges multiple selections into a single selection.
+     */
+    selectToBottom(): void;
+
+    /**
+     *  Select all text in the buffer.
+     *  This method merges multiple selections into a single selection.
+     */
+    selectAll(): void;
+
+    /**
+     *  Move the cursor of each selection to the beginning of its line while preserving
+     *  the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToBeginningOfLine(): void;
+
+    /**
+     *  Move the cursor of each selection to the first non-whitespace character of its
+     *  line while preserving the selection's tail position. If the cursor is already
+     *  on the first character of the line, move it to the beginning of the line.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToFirstCharacterOfLine(): void;
+
+    /**
+     *  Move the cursor of each selection to the end of its line while preserving the
+     *  selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToEndOfLine(): void;
+
+    /**
+     *  Expand selections to the beginning of their containing word.
+     *  Operates on all selections. Moves the cursor to the beginning of the containing
+     *  word while preserving the selection's tail position.
+     */
+    selectToBeginningOfWord(): void;
+
+    /**
+     *  Expand selections to the end of their containing word.
+     *  Operates on all selections. Moves the cursor to the end of the containing word
+     *  while preserving the selection's tail position.
+     */
+    selectToEndOfWord(): void;
+
+    /**
+     *  For each cursor, select the containing line.
+     *  This method merges selections on successive lines.
+     */
+    selectLinesContainingCursors(): void;
+
+    /** Select the word surrounding each cursor. */
+    selectWordsContainingCursors(): void;
+
+    /**
+     *  For each selection, move its cursor to the preceding subword boundary while
+     *  maintaining the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToPreviousSubwordBoundary(): void;
+
+    /**
+     *  For each selection, move its cursor to the next subword boundary while maintaining
+     *  the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToNextSubwordBoundary(): void;
+
+    /**
+     *  For each selection, move its cursor to the preceding word boundary while
+     *  maintaining the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToPreviousWordBoundary(): void;
+
+    /**
+     *  For each selection, move its cursor to the next word boundary while maintaining
+     *  the selection's tail position.
+     *  This method may merge selections that end up intersecting.
+     */
+    selectToNextWordBoundary(): void;
+
+    /**
+     *  Expand selections to the beginning of the next word.
+     *  Operates on all selections. Moves the cursor to the beginning of the next word
+     *  while preserving the selection's tail position.
+     */
+    selectToBeginningOfNextWord(): void;
+
+    /**
+     *  Expand selections to the beginning of the next paragraph.
+     *  Operates on all selections. Moves the cursor to the beginning of the next
+     *  paragraph while preserving the selection's tail position.
+     */
+    selectToBeginningOfNextParagraph(): void;
+
+    /**
+     *  Expand selections to the beginning of the next paragraph.
+     *  Operates on all selections. Moves the cursor to the beginning of the next
+     *  paragraph while preserving the selection's tail position.
+     */
+    selectToBeginningOfPreviousParagraph(): void;
+
+    /** Select the range of the given marker if it is valid. */
+    selectMarker(marker: DisplayMarker): Range|undefined;
+
+    /** Get the most recently added Selection. */
+    getLastSelection(): Selection;
+
+    /** Get current Selections. */
+    getSelections(): Selection[];
+
+    /**
+     *  Get all Selections, ordered by their position in the buffer instead of the
+     *  order in which they were added.
+     */
+    getSelectionsOrderedByBufferPosition(): Selection[];
+
+    // NOTE: this calls into Selection::intersectsBufferRange, which itself calls
+    // into Range::intersectsWith. Range::intersectsWith is one of the few functions
+    // which does NOT take a range-compatible array.
+    /** Determine if a given range in buffer coordinates intersects a selection. */
+    selectionIntersectsBufferRange(bufferRange: RangeLike): boolean;
+
+    // Searching and Replacing
+    /**
+     *  Scan regular expression matches in the entire buffer, calling the given
+     *  iterator function on each match.
+     *
+     *  ::scan functions as the replace method as well via the replace.
+     */
+    scan(regex: RegExp, options: ScanContextOptions, iterator: (params:
+        ContextualBufferScanResult) => void): void;
+    /**
+     *  Scan regular expression matches in the entire buffer, calling the given
+     *  iterator function on each match.
+     *
+     *  ::scan functions as the replace method as well via the replace.
+     */
+    scan(regex: RegExp, iterator: (params: BufferScanResult) => void): void;
+
+    /**
+     *  Scan regular expression matches in a given range, calling the given iterator.
+     *  function on each match.
+     */
+    scanInBufferRange(regex: RegExp, range: RangeCompatible, iterator:
+        (params: BufferScanResult) => void): void;
+
+    /**
+     *  Scan regular expression matches in a given range in reverse order, calling the
+     *  given iterator function on each match.
+     */
+    backwardsScanInBufferRange(regex: RegExp, range: RangeCompatible,
+        iterator: (params: BufferScanResult) => void): void;
+
+    // Tab Behavior
+    /** Returns a boolean indicating whether softTabs are enabled for this editor. */
+    getSoftTabs(): boolean;
+
+    /** Enable or disable soft tabs for this editor. */
+    setSoftTabs(softTabs: boolean): void;
+
+    /** Toggle soft tabs for this editor. */
+    toggleSoftTabs(): boolean;
+
+    /** Get the on-screen length of tab characters. */
+    getTabLength(): number;
+
+    /**
+     *  Set the on-screen length of tab characters. Setting this to a number will
+     *  override the editor.tabLength setting.
+     */
+    setTabLength(tabLength: number): void;
+
+    /** Determine if the buffer uses hard or soft tabs. */
+    usesSoftTabs(): boolean|undefined;
+
+    /**
+     *  Get the text representing a single level of indent.
+     *  If soft tabs are enabled, the text is composed of N spaces, where N is the
+     *  tab length. Otherwise the text is a tab character (\t).
+     */
+    getTabText(): string;
+
+    // Soft Wrap Behavior
+    /** Determine whether lines in this editor are soft-wrapped. */
+    isSoftWrapped(): boolean;
+
+    /** Enable or disable soft wrapping for this editor. */
+    setSoftWrapped(softWrapped: boolean): boolean;
+
+    /** Toggle soft wrapping for this editor. */
+    toggleSoftWrapped(): boolean;
+
+    /** Gets the column at which column will soft wrap. */
+    getSoftWrapColumn(): number;
+
+    // Indentation
+    /**
+     *  Get the indentation level of the given buffer row.
+     *  Determines how deeply the given row is indented based on the soft tabs and tab
+     *  length settings of this editor. Note that if soft tabs are enabled and the tab
+     *  length is 2, a row with 4 leading spaces would have an indentation level of 2.
+     */
+    indentationForBufferRow(bufferRow: number): number;
+
+    /**
+     *  Set the indentation level for the given buffer row.
+     *  Inserts or removes hard tabs or spaces based on the soft tabs and tab length settings
+     *  of this editor in order to bring it to the given indentation level. Note that if soft
+     *  tabs are enabled and the tab length is 2, a row with 4 leading spaces would have an
+     *  indentation level of 2.
+     */
+    setIndentationForBufferRow(bufferRow: number, newLevel: number, options?:
+        { preserveLeadingWhitespace?: boolean }): void;
+
+    /** Indent rows intersecting selections by one level. */
+    indentSelectedRows(): void;
+
+    /** Outdent rows intersecting selections by one level. */
+    outdentSelectedRows(): void;
+
+    /**
+     *  Get the indentation level of the given line of text.
+     *  Determines how deeply the given line is indented based on the soft tabs and tab length
+     *  settings of this editor. Note that if soft tabs are enabled and the tab length is 2,
+     *  a row with 4 leading spaces would have an indentation level of 2.
+     */
+    indentLevelForLine(line: string): number;
+
+    /** Indent rows intersecting selections based on the grammar's suggested indent level. */
+    autoIndentSelectedRows(): void;
+
+    // Grammars
+    /** Get the current Grammar of this editor. */
+    getGrammar(): Grammar;
+
+    /**
+     *  Set the current Grammar of this editor.
+     *  Assigning a grammar will cause the editor to re-tokenize based on the new grammar.
+     */
+    setGrammar(grammar: Grammar): void;
+
+    // Managing Syntax Scopes
+    /**
+     *  Returns a ScopeDescriptor that includes this editor's language.
+     *  e.g. [".source.ruby"], or [".source.coffee"].
+     */
+    getRootScopeDescriptor(): ScopeDescriptor;
+
+    /** Get the syntactic scopeDescriptor for the given position in buffer coordinates. */
+    scopeDescriptorForBufferPosition(bufferPosition: PointCompatible): ScopeDescriptor;
+
+    /**
+     *  Get the range in buffer coordinates of all tokens surrounding the cursor
+     *  that match the given scope selector.
+     */
+    bufferRangeForScopeAtCursor(scopeSelector: string): Range;
+
+    /** Determine if the given row is entirely a comment. */
+    isBufferRowCommented(bufferRow: number): boolean;
+
+    // Clipboard Operations
+    /** For each selection, copy the selected text. */
+    copySelectedText(): void;
+
+    /** For each selection, cut the selected text. */
+    cutSelectedText(): void;
+
+    /**
+     *  For each selection, replace the selected text with the contents of the clipboard.
+     *  If the clipboard contains the same number of selections as the current editor,
+     *  each selection will be replaced with the content of the corresponding clipboard
+     *  selection text.
+     */
+    pasteText(options?: TextInsertionOptions): void;
+
+    /**
+     *  For each selection, if the selection is empty, cut all characters of the
+     *  containing screen line following the cursor. Otherwise cut the selected text.
+     */
+    cutToEndOfLine(): void;
+
+    /**
+     *  For each selection, if the selection is empty, cut all characters of the
+     *  containing buffer line following the cursor. Otherwise cut the selected text.
+     */
+    cutToEndOfBufferLine(): void;
+
+    // Folds
+    /**
+     *  Fold the most recent cursor's row based on its indentation level.
+     *  The fold will extend from the nearest preceding line with a lower indentation
+     *  level up to the nearest following row with a lower indentation level.
+     */
+    foldCurrentRow(): void;
+
+    /** Unfold the most recent cursor's row by one level. */
+    unfoldCurrentRow(): void;
+
+    /**
+     *  Fold the given row in buffer coordinates based on its indentation level.
+     *  If the given row is foldable, the fold will begin there. Otherwise, it will
+     *  begin at the first foldable row preceding the given row.
+     */
+    foldBufferRow(bufferRow: number): void;
+
+    /** Unfold all folds containing the given row in buffer coordinates. */
+    unfoldBufferRow(bufferRow: number): void;
+
+    /** For each selection, fold the rows it intersects. */
+    foldSelectedLines(): void;
+
+    /** Fold all foldable lines. */
+    foldAll(): void;
+
+    /** Unfold all existing folds. */
+    unfoldAll(): void;
+
+    /** Fold all foldable lines at the given indent level. */
+    foldAllAtIndentLevel(level: number): void;
+
+    /**
+     *  Determine whether the given row in buffer coordinates is foldable.
+     *  A foldable row is a row that starts a row range that can be folded.
+     */
+    isFoldableAtBufferRow(bufferRow: number): boolean;
+
+    /**
+     *  Determine whether the given row in screen coordinates is foldable.
+     *  A foldable row is a row that starts a row range that can be folded.
+     */
+    isFoldableAtScreenRow(bufferRow: number): boolean;
+
+    /** Fold the given buffer row if it isn't currently folded, and unfold it otherwise. */
+    toggleFoldAtBufferRow(bufferRow: number): void;
+
+    /** Determine whether the most recently added cursor's row is folded. */
+    isFoldedAtCursorRow(): boolean;
+
+    /** Determine whether the given row in buffer coordinates is folded. */
+    isFoldedAtBufferRow(bufferRow: number): boolean;
+
+    /** Determine whether the given row in screen coordinates is folded. */
+    isFoldedAtScreenRow(screenRow: number): boolean;
+
+    // Gutters
+    /** Add a custom Gutter. */
+    addGutter(options: {
+        name: string,
+        priority?: number,
+        visible?: boolean,
+    }): Gutter;
+
+    /** Get this editor's gutters. */
+    getGutters(): Gutter[];
+
+    /** Get the gutter with the given name. */
+    gutterWithName(name: string): Gutter|null;
+
+    // Scrolling the TextEditor
+    /** Scroll the editor to reveal the most recently added cursor if it is off-screen. */
+    scrollToCursorPosition(options?: { center?: boolean }): void;
+
+    /** Scrolls the editor to the given buffer position. */
+    scrollToBufferPosition(bufferPosition: PointCompatible, options?: { center?: boolean }):
+        void;
+
+    /** Scrolls the editor to the given screen position. */
+    scrollToScreenPosition(screenPosition: PointCompatible, options?: { center?: boolean }):
+        void;
+
+    // TextEditor Rendering
+    /** Retrieves the rendered line height in pixels. */
+    getLineHeightInPixels(): number;
+
+    /** Retrieves the greyed out placeholder of a mini editor. */
+    getPlaceholderText(): string;
+
+    /**
+     *  Set the greyed out placeholder of a mini editor. Placeholder text will be
+     *  displayed when the editor has no content.
+     */
+    setPlaceholderText(placeholderText: string): void;
+
+    /** Undocumented: Buffer range for syntax scope at position */
+    bufferRangeForScopeAtPosition(scope: string, point: PointCompatible): Range;
+
+    /** Undocumented: Get syntax token at buffer position */
+    tokenForBufferPosition(pos: PointCompatible): {value: string, scopes: string[]};
+}
+
+export interface PixelPosition {
+    left: number;
+    top: number;
+}
+
+/**
+ *  Undocumented: Rendering component for TextEditor
+ */
+export interface TextEditorComponent {
+  /** Does not clip screenPosition, unlike similar method on TextEditorElement */
+  pixelPositionForScreenPosition(screenPosition: PointLike): PixelPosition;
+  screenPositionForPixelPosition(pos: PixelPosition): Point;
+  pixelPositionForMouseEvent(event: {
+    clientX: number, clientY: number
+  }): PixelPosition;
+  screenPositionForMouseEvent(event: {clientX: number, clientY: number}): Point;
+}
+
+/**
+ *  Undocumented: Custom HTML elemnent for TextEditor, atom-text-editor
+ */
+export interface TextEditorElement extends HTMLElement {
+  getModel(): TextEditor;
+  getComponent(): TextEditorComponent;
+  /**
+   * Extended: Get a promise that resolves the next time the element's
+   * DOM is updated in any way.
+   */
+  getNextUpdatePromise(): Promise<void>;
+
+  /** Extended: get the width of an `x` character displayed in this element. */
+  getBaseCharacterWidth(): number;
+
+  /** Essential: Scrolls the editor to the top. */
+  scrollToTop(): void;
+
+  /** Essential: Scrolls the editor to the bottom. */
+  scrollToBottom(): void;
+
+  setScrollTop(scrollTop: number): void;
+  getScrollTop(): number;
+
+  setScrollLeft(scrollLeft: number): void;
+  getScrollLeft(): number;
+
+  getScrollHeight(): number;
+
+  /** Extended: Converts a buffer position to a pixel position. */
+  pixelPositionForBufferPosition(bufferPosition: PointLike): PixelPosition;
+
+  /** Extended: Converts a screen position to a pixel position. */
+  pixelPositionForScreenPosition(screenPosition: PointLike): PixelPosition;
+
+  // Event subscription
+  onDidChangeScrollTop(callback: (scrollTop: number) => void): Disposable;
+  onDidChangeScrollLeft(callback: (scrollLeft: number) => void): Disposable;
+  /** Called when the editor is attached to the DOM. */
+  onDidAttach(callback: () => void): Disposable;
+  /** Called when the editor is detached from the DOM. */
+  onDidDetach(callback: () => void): Disposable;
+}
+
+/** Experimental: This global registry tracks registered TextEditors. */
+export interface TextEditorRegistry {
+    // Managing Text Editors
+    /** Remove all editors from the registry. */
+    clear(): void;
+
+    /** Register a TextEditor. */
+    add(editor: TextEditor): Disposable;
+
+    /** Remove the given TextEditor from the registry. */
+    remove(editor: TextEditor): boolean;
+
+    /** Keep a TextEditor's configuration in sync with Atom's settings. */
+    maintainConfig(editor: TextEditor): Disposable;
+
+    /**
+     *  Set a TextEditor's grammar based on its path and content, and continue
+     *  to update its grammar as gramamrs are added or updated, or the editor's
+     *  file path changes.
+     */
+    maintainGrammar(editor: TextEditor): Disposable;
+
+    /**
+     *  Force a TextEditor to use a different grammar than the one that would
+     *  otherwise be selected for it.
+     */
+    setGrammarOverride(editor: TextEditor, scopeName: string): void;
+
+    /**
+     *  Retrieve the grammar scope name that has been set as a grammar override
+     *  for the given TextEditor.
+     */
+    getGrammarOverride(editor: TextEditor): string|null;
+
+    /** Remove any grammar override that has been set for the given TextEditor. */
+    clearGrammarOverride(editor: TextEditor): void;
+
+    // Event Subscription
+    /** Invoke the given callback with all the current and future registered TextEditors. */
+    observe(callback: (editor: TextEditor) => void): Disposable;
+}
+
+export type TooltipPlacement =
+    |"top"|"bottom"|"left"|"right"
+    |"auto"|"auto top"|"auto bottom"|"auto left"|"auto right";
+
+/** Associates tooltips with HTML elements or selectors. */
+export interface TooltipManager {
+    /** Add a tooltip to the given element. */
+    add(target: HTMLElement, options: {
+        item?: object,
+    } | {
+        title?: string|(() => string),
+        html?: boolean,
+        keyBindingCommand?: string,
+        keyBindingTarget?: HTMLElement
+    } & {
+        class?: string;
+        placement?: TooltipPlacement|(() => TooltipPlacement),
+        trigger?: "click"|"hover"|"focus"|"manual",
+        delay?: { show: number, hide: number }
+    }): Disposable;
+
+    /** Find the tooltips that have been applied to the given element. */
+    findTooltips(target: HTMLElement): Tooltip[];
+}
+
+/**
+ *  ViewRegistry handles the association between model and view types in Atom.
+ *  We call this association a View Provider. As in, for a given model, this class
+ *  can provide a view via ::getView, as long as the model/view association was
+ *  registered via ::addViewProvider.
+ */
+export interface ViewRegistry {
+    /**
+     *  Add a provider that will be used to construct views in the workspace's view
+     *  layer based on model objects in its model layer.
+     */
+    addViewProvider(createView: (model: object) => HTMLElement|undefined): Disposable;
+    /**
+     *  Add a provider that will be used to construct views in the workspace's view
+     *  layer based on model objects in its model layer.
+     */
+    // tslint:disable-next-line:no-any
+    addViewProvider<T>(modelConstructor: { new (...args: any[]): T }, createView:
+        (instance: T) => HTMLElement|undefined): Disposable;
+
+    /** Get the view associated with an object in the workspace. */
+    getView(obj: TextEditor): TextEditorElement;
+    getView(obj: object): HTMLElement;
+}
+
+/** Represents the state of the user interface for the entire window. */
+export interface Workspace {
+    // Event Subscription
+    /**
+     *  Invoke the given callback with all current and future text editors in
+     *  the workspace.
+     */
+    observeTextEditors(callback: (editor: TextEditor) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with all current and future panes items in the
+     *  workspace.
+     */
+    observePaneItems(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when the active pane item changes. */
+    onDidChangeActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when the active pane item stops changing. */
+    onDidStopChangingActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a text editor becomes the active text editor and
+     *  when there is no longer an active text editor.
+     */
+    onDidChangeActiveTextEditor(callback: (editor?: TextEditor) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current active pane item and with all
+     *  future active pane items in the workspace.
+     */
+    observeActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current active text editor (if any), with all
+     *  future active text editors, and when there is no longer an active text editor.
+     */
+    observeActiveTextEditor(callback: (editor?: TextEditor) => void): Disposable;
+
+    /**
+     *  Invoke the given callback whenever an item is opened. Unlike ::onDidAddPaneItem,
+     *  observers will be notified for items that are already present in the workspace
+     *  when they are reopened.
+     */
+    onDidOpen(callback: (event: PaneItemOpenedEvent) => void): Disposable;
+
+    /** Invoke the given callback when a pane is added to the workspace. */
+    onDidAddPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback before a pane is destroyed in the workspace. */
+    onWillDestroyPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback when a pane is destroyed in the workspace. */
+    onDidDestroyPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback with all current and future panes in the workspace. */
+    observePanes(callback: (pane: Pane) => void): Disposable;
+
+    /** Invoke the given callback when the active pane changes. */
+    onDidChangeActivePane(callback: (pane: Pane) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current active pane and when the
+     *  active pane changes.
+     */
+    observeActivePane(callback: (pane: Pane) => void): Disposable;
+
+    /** Invoke the given callback when a pane item is added to the workspace. */
+    onDidAddPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a pane item is about to be destroyed,
+     *  before the user is prompted to save it.
+     *  @param callback The function to be called before pane items are destroyed.
+     *      If this function returns a Promise, then the item will not be destroyed
+     *      until the promise resolves.
+     */
+    onWillDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void|Promise<void>):
+        Disposable;
+
+    /** Invoke the given callback when a pane item is destroyed. */
+    onDidDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
+
+    /** Invoke the given callback when a text editor is added to the workspace. */
+    onDidAddTextEditor(callback: (event: TextEditorObservedEvent) => void): Disposable;
+
+    // Opening
+    /**
+     *  Opens the given URI in Atom asynchronously. If the URI is already open,
+     *  the existing item for that URI will be activated. If no URI is given, or
+     *  no registered opener can open the URI, a new empty TextEditor will be created.
+     */
+    open(uri: string, options?: WorkspaceOpenOptions): Promise<object>;
+    /**
+     *  Opens the given item in Atom asynchronously. If the item is already open,
+     *  the existing item will be activated. If no item is given, a new empty TextEditor
+     *  will be created.
+     */
+    open<T extends ViewModel = ViewModel>(item: T, options?: WorkspaceOpenOptions):
+        Promise<T>;
+    /**
+     *  Opens the given URI in Atom asynchronously. If the URI is already open,
+     *  the existing item for that URI will be activated. If no URI is given, or
+     *  no registered opener can open the URI, a new empty TextEditor will be created.
+     */
+    open(): Promise<TextEditor>;
+
+    /**
+     *  Search the workspace for items matching the given URI and hide them.
+     *  Returns a boolean indicating whether any items were found (and hidden).
+     */
+    hide(itemOrURI: object|string): boolean;
+
+    /**
+     *  Search the workspace for items matching the given URI. If any are found,
+     *  hide them. Otherwise, open the URL.
+     *  Returns a Promise that resolves when the item is shown or hidden.
+     */
+    toggle(itemOrURI: object|string): Promise<void>;
+
+    /**
+     *  Creates a new item that corresponds to the provided URI.
+     *  If no URI is given, or no registered opener can open the URI, a new empty TextEditor
+     *  will be created.
+     */
+    createItemForURI(uri: string): Promise<object|TextEditor>;
+
+    /** Returns a boolean that is true if object is a TextEditor. */
+    isTextEditor(object: object): object is TextEditor;
+
+    /**
+     *  Asynchronously reopens the last-closed item's URI if it hasn't already
+     *  been reopened.
+     */
+    reopenItem(): Promise<object|undefined>;
+
+    /** Register an opener for a URI. */
+    addOpener(opener: (uri: string, options?: WorkspaceOpenOptions) =>
+        ViewModel|undefined): Disposable;
+
+    /** Create a new text editor. */
+    buildTextEditor(params: object): TextEditor;
+
+    // Pane Items
+    /** Get all pane items in the workspace. */
+    getPaneItems(): object[];
+
+    /** Get the active Pane's active item. */
+    getActivePaneItem(): object;
+
+    /** Get all text editors in the workspace. */
+    getTextEditors(): TextEditor[];
+
+    /** Get the workspace center's active item if it is a TextEditor. */
+    getActiveTextEditor(): TextEditor|undefined;
+
+    // Panes
+    /** Get the most recently focused pane container. */
+    getActivePaneContainer(): Dock|WorkspaceCenter;
+
+    /** Get all panes in the workspace. */
+    getPanes(): Pane[];
+
+    /** Get the active Pane. */
+    getActivePane(): Pane;
+
+    /** Make the next pane active. */
+    activateNextPane(): boolean;
+
+    /** Make the previous pane active. */
+    activatePreviousPane(): boolean;
+
+    /** Get the first pane container that contains an item with the given URI. */
+    paneContainerForURI(uri: string): Dock|WorkspaceCenter|undefined;
+
+    /** Get the first pane container that contains the given item. */
+    paneContainerForItem(item: object): Dock|WorkspaceCenter|undefined;
+
+    /** Get the first Pane with an item for the given URI. */
+    paneForURI(uri: string): Pane|undefined;
+
+    /** Get the Pane containing the given item. */
+    paneForItem(item: object): Pane|undefined;
+
+    // Pane Locations
+    /** Get the WorkspaceCenter at the center of the editor window. */
+    getCenter(): WorkspaceCenter;
+
+    /** Get the Dock to the left of the editor window. */
+    getLeftDock(): Dock;
+
+    /** Get the Dock to the right of the editor window. */
+    getRightDock(): Dock;
+
+    /** Get the Dock below the editor window. */
+    getBottomDock(): Dock;
+
+    /** Returns all Pane containers. */
+    getPaneContainers(): [WorkspaceCenter, Dock, Dock, Dock];
+
+    // Panels
+    /** Get an Array of all the panel items at the bottom of the editor window. */
+    getBottomPanels(): Panel[];
+
+    /** Adds a panel item to the bottom of the editor window. */
+    addBottomPanel<T>(options: {
+        item: T,
+        visible?: boolean,
+        priority?: number,
+    }): Panel<T>;
+
+    /** Get an Array of all the panel items to the left of the editor window. */
+    getLeftPanels(): Panel[];
+
+    /** Adds a panel item to the left of the editor window. */
+    addLeftPanel<T>(options: {
+        item: T,
+        visible?: boolean,
+        priority?: number,
+    }): Panel<T>;
+
+    /** Get an Array of all the panel items to the right of the editor window. */
+    getRightPanels(): Panel[];
+
+    /** Adds a panel item to the right of the editor window. */
+    addRightPanel<T>(options: {
+        item: T,
+        visible?: boolean,
+        priority?: number,
+    }): Panel<T>;
+
+    /** Get an Array of all the panel items at the top of the editor window. */
+    getTopPanels(): Panel[];
+
+    /** Adds a panel item to the top of the editor window above the tabs. */
+    addTopPanel<T>(options: {
+        item: T,
+        visible?: boolean,
+        priority?: number
+    }): Panel<T>;
+
+    /** Get an Array of all the panel items in the header. */
+    getHeaderPanels(): Panel[];
+
+    /** Adds a panel item to the header. */
+    addHeaderPanel<T>(options: {
+        item: T,
+        visible?: boolean,
+        priority?: number,
+    }): Panel<T>;
+
+    /** Get an Array of all the panel items in the footer. */
+    getFooterPanels(): Panel[];
+
+    /** Adds a panel item to the footer. */
+    addFooterPanel<T>(options: {
+        item: T,
+        visible?: boolean,
+        priority?: number,
+    }): Panel<T>;
+
+    /** Get an Array of all the modal panel items. */
+    getModalPanels(): Panel[];
+
+    /** Adds a panel item as a modal dialog. */
+    addModalPanel<T>(options: {
+        item: T,
+        visible?: boolean,
+        priority?: number,
+        autoFocus?: boolean,
+    }): Panel<T>;
+
+    /**
+     *  Returns the Panel associated with the given item or null when the item
+     *  has no panel.
+     */
+    panelForItem<T>(item: T): Panel<T>|null;
+
+    // Searching and Replacing
+    /** Performs a search across all files in the workspace. */
+    scan(regex: RegExp, iterator: (result: ScandalResult) => void):
+        CancellablePromise<string|null>;
+    /** Performs a search across all files in the workspace. */
+    scan(regex: RegExp, options: WorkspaceScanOptions, iterator:
+        (result: ScandalResult) => void): CancellablePromise<string|null>;
+
+    /** Performs a replace across all the specified files in the project. */
+    replace(regex: RegExp, replacementText: string, filePaths: ReadonlyArray<string>,
+        iterator: (result: { filePath: string|undefined, replacements: number }) => void):
+        Promise<void>;
+}
+
+// https://github.com/atom/atom/blob/master/src/workspace-center.js
+/** The central container for the editor window capable of holding items. */
+export interface WorkspaceCenter {
+    // Event Subscription
+    /**
+     *  Invoke the given callback with all current and future text editors in the
+     *  workspace center.
+     */
+    observeTextEditors(callback: (editor: TextEditor) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with all current and future panes items in the
+     *  workspace center.
+     */
+    observePaneItems(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when the active pane item changes. */
+    onDidChangeActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when the active pane item stops changing. */
+    onDidStopChangingActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current active pane item and with all future
+     *  active pane items in the workspace center.
+     */
+    observeActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when a pane is added to the workspace center. */
+    onDidAddPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback before a pane is destroyed in the workspace center. */
+    onWillDestroyPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback when a pane is destroyed in the workspace center. */
+    onDidDestroyPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback with all current and future panes in the workspace center. */
+    observePanes(callback: (pane: Pane) => void): Disposable;
+
+    /** Invoke the given callback when the active pane changes. */
+    onDidChangeActivePane(callback: (pane: Pane) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current active pane and when the active pane
+     *  changes.
+     */
+    observeActivePane(callback: (pane: Pane) => void): Disposable;
+
+    /** Invoke the given callback when a pane item is added to the workspace center. */
+    onDidAddPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a pane item is about to be destroyed, before the user
+     *  is prompted to save it.
+     *  @param callback The function to be called before pane items are destroyed.
+     *      If this function returns a Promise, then the item will not be destroyed
+     *      until the promise resolves.
+     */
+    onWillDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void|Promise<void>):
+        Disposable;
+
+    /** Invoke the given callback when a pane item is destroyed. */
+    onDidDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
+
+    /** Invoke the given callback when a text editor is added to the workspace center. */
+    onDidAddTextEditor(callback: (event: TextEditorObservedEvent) => void): Disposable;
+
+    // Pane Items
+    /** Get all pane items in the workspace center. */
+    getPaneItems(): object[];
+
+    /** Get the active Pane's active item. */
+    getActivePaneItem(): object|undefined;
+
+    /** Get all text editors in the workspace center. */
+    getTextEditors(): TextEditor[];
+
+    /** Get the active item if it is an TextEditor. */
+    getActiveTextEditor(): TextEditor|undefined;
+
+    /** Save all pane items. */
+    saveAll(): void;
+
+    // Panes
+    /** Get all panes in the workspace center. */
+    getPanes(): Pane[];
+
+    /** Get the active Pane. */
+    getActivePane(): Pane;
+
+    /** Make the next pane active. */
+    activateNextPane(): void;
+
+    /** Make the previous pane active. */
+    activatePreviousPane(): void;
+
+    /** Retrieve the Pane associated with the given URI. */
+    paneForURI(uri: string): Pane|undefined;
+
+    /** Retrieve the Pane associated with the given item. */
+    paneForItem(item: object): Pane|undefined;
+
+    /** Destroy (close) the active pane. */
+    destroyActivePane(): void;
+}
+
+// Extended Classes ===========================================================
+
+/**
+ *  A wrapper which provides standard error/output line buffering for
+ *  Node's ChildProcess.
+ */
+export class BufferedProcess {
+    process?: ChildProcess;
+
+    constructor(options: ProcessOptions);
+
+    // Event Subscription
+    /**
+     *  Will call your callback when an error will be raised by the process. Usually
+     *  this is due to the command not being available or not on the PATH. You can
+     *  call handle() on the object passed to your callback to indicate that you
+     *  have handled this error.
+     */
+    onWillThrowError(callback: (errorObject: HandleableErrorEvent) =>
+        void): Disposable;
+
+    // Helper Methods
+    /** Terminate the process. */
+    kill(): void;
+
+    /** Runs the process. */
+    start(): void;
+}
+
+/**
+ *  Like BufferedProcess, but accepts a Node script as the command to run.
+ *  This is necessary on Windows since it doesn't support shebang #! lines.
+ */
+export class BufferedNodeProcess extends BufferedProcess {
+    /** Runs the given Node script by spawning a new child process. */
+    constructor(options: NodeProcessOptions);
+}
+
+/** Represents the clipboard used for copying and pasting in Atom. */
+export interface Clipboard {
+    /** Write the given text to the clipboard. */
+    write(text: string, metadata?: object): void;
+
+    /** Read the text from the clipboard. */
+    read(): string;
+
+    /**
+     *  Read the text from the clipboard and return both the text and the associated
+     *  metadata.
+     */
+    readWithMetadata(): { text: string, metadata: object };
+}
+
+/** Provides a registry for commands that you'd like to appear in the context menu. */
+export interface ContextMenuManager {
+    /** Add context menu items scoped by CSS selectors. */
+    add(itemsBySelector: { [key: string]: ReadonlyArray<ContextMenuOptions> }): Disposable;
+}
+
+/**
+ *  The Cursor class represents the little blinking line identifying where text
+ *  can be inserted.
+ */
+export interface Cursor {
+    // Event Subscription
+    /** Calls your callback when the cursor has been moved. */
+    onDidChangePosition(callback: (event: CursorPositionChangedEvent) => void): Disposable;
+
+    /** Calls your callback when the cursor is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    /** Calls your callback when the cursor's visibility has changed. */
+    onDidChangeVisibility(callback: (visibility: boolean) => void): Disposable;
+
+    // Managing Cursor Position
+    /** Moves a cursor to a given screen position. */
+    setScreenPosition(screenPosition: PointCompatible, options?: { autoscroll?: boolean }):
+        void;
+
+    /** Returns the screen position of the cursor as a Point. */
+    getScreenPosition(): Point;
+
+    /** Moves a cursor to a given buffer position. */
+    setBufferPosition(bufferPosition: PointCompatible, options?: { autoscroll?: boolean }):
+        void;
+
+    /** Returns the current buffer position as an Array. */
+    getBufferPosition(): Point;
+
+    /** Returns the cursor's current screen row. */
+    getScreenRow(): number;
+
+    /** Returns the cursor's current screen column. */
+    getScreenColumn(): number;
+
+    /** Retrieves the cursor's current buffer row. */
+    getBufferRow(): number;
+
+    /** Returns the cursor's current buffer column. */
+    getBufferColumn(): number;
+
+    /** Returns the cursor's current buffer row of text excluding its line ending. */
+    getCurrentBufferLine(): string;
+
+    /** Returns whether the cursor is at the start of a line. */
+    isAtBeginningOfLine(): boolean;
+
+    /** Returns whether the cursor is on the line return character. */
+    isAtEndOfLine(): boolean;
+
+    // Cursor Position Details
+    /**
+     *  Returns the underlying DisplayMarker for the cursor. Useful with overlay
+     *  Decorations.
+     */
+    getMarker(): DisplayMarker;
+
+    /**
+     *  Identifies if the cursor is surrounded by whitespace.
+     *  "Surrounded" here means that the character directly before and after the cursor
+     *  are both whitespace.
+     */
+    isSurroundedByWhitespace(): boolean;
+
+    /** This method returns false if the character before or after the cursor is whitespace. */
+    isBetweenWordAndNonWord(): boolean;
+
+    /** Returns whether this cursor is between a word's start and end. */
+    isInsideWord(options?: { wordRegex?: RegExp }): boolean;
+
+    /** Returns the indentation level of the current line. */
+    getIndentLevel(): number;
+
+    /** Retrieves the scope descriptor for the cursor's current position. */
+    getScopeDescriptor(): ScopeDescriptor;
+
+    /**
+     *  Returns true if this cursor has no non-whitespace characters before its
+     *  current position.
+     */
+    hasPrecedingCharactersOnLine(): boolean;
+
+    /**
+     *  Identifies if this cursor is the last in the TextEditor.
+     *  "Last" is defined as the most recently added cursor.
+     */
+    isLastCursor(): boolean;
+
+    // Moving the Cursor
+    /** Moves the cursor up one screen row. */
+    moveUp(rowCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
+
+    /** Moves the cursor down one screen row. */
+    moveDown(rowCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
+
+    /** Moves the cursor left one screen column. */
+    moveLeft(columnCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
+
+    /** Moves the cursor right one screen column. */
+    moveRight(columnCount?: number, options?: { moveToEndOfSelection?: boolean }): void;
+
+    /** Moves the cursor to the top of the buffer. */
+    moveToTop(): void;
+
+    /** Moves the cursor to the bottom of the buffer. */
+    moveToBottom(): void;
+
+    /** Moves the cursor to the beginning of the line. */
+    moveToBeginningOfScreenLine(): void;
+
+    /** Moves the cursor to the beginning of the buffer line. */
+    moveToBeginningOfLine(): void;
+
+    /** Moves the cursor to the beginning of the first character in the line. */
+    moveToFirstCharacterOfLine(): void;
+
+    /** Moves the cursor to the end of the line. */
+    moveToEndOfScreenLine(): void;
+
+    /** Moves the cursor to the end of the buffer line. */
+    moveToEndOfLine(): void;
+
+    /** Moves the cursor to the beginning of the word. */
+    moveToBeginningOfWord(): void;
+
+    /** Moves the cursor to the end of the word. */
+    moveToEndOfWord(): void;
+
+    /** Moves the cursor to the beginning of the next word. */
+    moveToBeginningOfNextWord(): void;
+
+    /** Moves the cursor to the previous word boundary. */
+    moveToPreviousWordBoundary(): void;
+
+    /** Moves the cursor to the next word boundary. */
+    moveToNextWordBoundary(): void;
+
+    /** Moves the cursor to the previous subword boundary. */
+    moveToPreviousSubwordBoundary(): void;
+
+    /** Moves the cursor to the next subword boundary. */
+    moveToNextSubwordBoundary(): void;
+
+    /** Moves the cursor to the beginning of the buffer line, skipping all whitespace. */
+    skipLeadingWhitespace(): void;
+
+    /** Moves the cursor to the beginning of the next paragraph. */
+    moveToBeginningOfNextParagraph(): void;
+
+    /** Moves the cursor to the beginning of the previous paragraph. */
+    moveToBeginningOfPreviousParagraph(): void;
+
+    // Local Positions and Ranges
+    /**
+     *  Returns buffer position of previous word boundary. It might be on the current
+     *  word, or the previous word.
+     */
+    getPreviousWordBoundaryBufferPosition(options?: { wordRegex?: RegExp }): Point;
+
+    /**
+     *  Returns buffer position of the next word boundary. It might be on the current
+     *  word, or the previous word.
+     */
+    getNextWordBoundaryBufferPosition(options?: { wordRegex?: RegExp }): Point;
+
+    /** Retrieves the buffer position of where the current word starts. */
+    getBeginningOfCurrentWordBufferPosition(options?: {
+        wordRegex?: RegExp,
+        includeNonWordCharacters?: boolean,
+        allowPrevious?: boolean
+    }): Point;
+
+    /** Retrieves the buffer position of where the current word ends. */
+    getEndOfCurrentWordBufferPosition(options?: {
+        wordRegex?: RegExp,
+        includeNonWordCharacters?: boolean
+    }): Point;
+
+    /** Retrieves the buffer position of where the next word starts. */
+    getBeginningOfNextWordBufferPosition(options?: { wordRegex?: RegExp }): Point;
+
+    /** Returns the buffer Range occupied by the word located under the cursor. */
+    getCurrentWordBufferRange(options?: { wordRegex?: RegExp }): Range;
+
+    /** Returns the buffer Range for the current line. */
+    getCurrentLineBufferRange(options?: { includeNewline?: boolean }): Range;
+
+    /**
+     *  Retrieves the range for the current paragraph.
+     *  A paragraph is defined as a block of text surrounded by empty lines or comments.
+     */
+    getCurrentParagraphBufferRange(): Range;
+
+    /** Returns the characters preceding the cursor in the current word. */
+    getCurrentWordPrefix(): string;
+
+    // Visibility
+    /** Sets whether the cursor is visible. */
+    setVisible(visible: boolean): void;
+
+    /** Returns the visibility of the cursor. */
+    isVisible(): boolean;
+
+    // Comparing to another cursor
+    /**
+     *  Compare this cursor's buffer position to another cursor's buffer position.
+     *  See Point::compare for more details.
+     */
+    compare(otherCursor: Cursor): number;
+
+    // Utilities
+    /** Prevents this cursor from causing scrolling. */
+    clearAutoscroll(): void;
+
+    /** Deselects the current selection. */
+    clearSelection(): void;
+
+    /** Get the RegExp used by the cursor to determine what a "word" is. */
+    wordRegExp(options?: { includeNonWordCharacters?: boolean }): RegExp;
+
+    /** Get the RegExp used by the cursor to determine what a "subword" is. */
+    subwordRegExp(options?: { backwards?: boolean }): RegExp;
+}
+
+/** Manages the deserializers used for serialized state. */
+export interface DeserializerManager {
+    /** Register the given class(es) as deserializers. */
+    add(...deserializers: Deserializer[]): Disposable;
+
+    /** Deserialize the state and params. */
+    deserialize(state: object): object|undefined;
+}
+
+/** Represents a directory on disk that can be watched for changes. */
+export class Directory {
+    // Construction
+    /** Configures a new Directory instance, no files are accessed. */
+    constructor(directoryPath: string, symlink?: boolean);
+
+    /**
+     *  Creates the directory on disk that corresponds to ::getPath() if no such
+     *  directory already exists.
+     */
+    create(mode?: number): Promise<boolean>;
+
+    // Event Subscription
+    /** Invoke the given callback when the directory's contents change. */
+    onDidChange(callback: () => void): Disposable;
+
+    // Directory Metadata
+    /** Returns a boolean, always false. */
+    isFile(): this is File;
+
+    /** Returns a roolean, always true. */
+    isDirectory(): this is Directory;
+
+    /** Returns a boolean indicating whether or not this is a symbolic link. */
+    isSymbolicLink(): boolean;
+
+    /**
+     *  Returns a promise that resolves to a boolean, true if the directory
+     *  exists, false otherwise.
+     */
+    exists(): Promise<boolean>;
+
+    /** Returns a boolean, true if the directory exists, false otherwise. */
+    existsSync(): boolean;
+
+    /**
+     *  Return a boolean, true if this Directory is the root directory of the
+     *  filesystem, or false if it isn't.
+     */
+    isRoot(): boolean;
+
+    // Managing Paths
+    /**
+     *  This may include unfollowed symlinks or relative directory entries.
+     *  Or it may be fully resolved, it depends on what you give it.
+     */
+    getPath(): string;
+
+    /**
+     *  All relative directory entries are removed and symlinks are resolved to
+     *  their final destination.
+     */
+    getRealPathSync(): string;
+
+    /** Returns the string basename of the directory. */
+    getBaseName(): string;
+
+    /** Returns the relative string path to the given path from this directory. */
+    relativize(fullPath: string): string;
+
+    // Traversing
+    /** Traverse to the parent directory. */
+    getParent(): Directory;
+
+    /**
+     *  Traverse within this Directory to a child File. This method doesn't actually
+     *  check to see if the File exists, it just creates the File object.
+     */
+    getFile(filename: string): File;
+
+    /**
+     *  Traverse within this a Directory to a child Directory. This method doesn't actually
+     *  check to see if the Directory exists, it just creates the Directory object.
+     */
+    getSubdirectory(dirname: string): Directory;
+
+    /** Reads file entries in this directory from disk synchronously. */
+    getEntriesSync(): Array<File|Directory>;
+
+    /** Reads file entries in this directory from disk asynchronously. */
+    getEntries(callback: (error: Error, entries: Array<File|Directory>) => void): void;
+
+    /**
+     *  Determines if the given path (real or symbolic) is inside this directory. This
+     *  method does not actually check if the path exists, it just checks if the path
+     *  is under this directory.
+     */
+    contains(pathToCheck: string): boolean;
+}
+
+/** A container at the edges of the editor window capable of holding items. */
+export interface Dock {
+    // Methods
+    /** Show the dock and focus its active Pane. */
+    activate(): void;
+
+    /** Show the dock without focusing it. */
+    show(): void;
+
+    /**
+     *  Hide the dock and activate the WorkspaceCenter if the dock was was previously
+     *  focused.
+     */
+    hide(): void;
+
+    /**
+     *  Toggle the dock's visibility without changing the Workspace's active pane
+     *  container.
+     */
+    toggle(): void;
+
+    /** Check if the dock is visible. */
+    isVisible(): boolean;
+
+    // Event Subscription
+    /** Invoke the given callback when the visibility of the dock changes. */
+    onDidChangeVisible(callback: (visible: boolean) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current and all future visibilities of
+     *  the dock.
+     */
+    observeVisible(callback: (visible: boolean) => void): Disposable;
+
+    /** Invoke the given callback with all current and future panes items in the dock. */
+    observePaneItems(callback: (item: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when the active pane item changes.
+     *
+     *  Because observers are invoked synchronously, it's important not to perform any
+     *  expensive operations via this method. Consider ::onDidStopChangingActivePaneItem
+     *  to delay operations until after changes stop occurring.
+     */
+    onDidChangeActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when the active pane item stops changing. */
+    onDidStopChangingActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current active pane item and with all future
+     *  active pane items in the dock.
+     */
+    observeActivePaneItem(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when a pane is added to the dock. */
+    onDidAddPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback before a pane is destroyed in the dock. */
+    onWillDestroyPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback when a pane is destroyed in the dock. */
+    onDidDestroyPane(callback: (event: { pane: Pane }) => void): Disposable;
+
+    /** Invoke the given callback with all current and future panes in the dock. */
+    observePanes(callback: (pane: Pane) => void): Disposable;
+
+    /** Invoke the given callback when the active pane changes. */
+    onDidChangeActivePane(callback: (pane: Pane) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current active pane and when the active
+     *  pane changes.
+     */
+    observeActivePane(callback: (pane: Pane) => void): Disposable;
+
+    /** Invoke the given callback when a pane item is added to the dock. */
+    onDidAddPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a pane item is about to be destroyed, before the user is
+     *  prompted to save it.
+     *  @param callback The function to be called before pane items are destroyed.
+     *      If this function returns a Promise, then the item will not be destroyed
+     *      until the promise resolves.
+     */
+    onWillDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void|Promise<void>):
+        Disposable;
+
+    /** Invoke the given callback when a pane item is destroyed. */
+    onDidDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
+
+    // Pane Items
+    /** Get all pane items in the dock. */
+    getPaneItems(): object[];
+
+    /** Get the active Pane's active item. */
+    getActivePaneItem(): object;
+
+    // Panes
+    /** Returns an Array of Panes. */
+    getPanes(): Pane[];
+
+    /** Get the active Pane. */
+    getActivePane(): Pane;
+
+    /** Make the next pane active. */
+    activateNextPane(): boolean;
+
+    /** Make the previous pane active. */
+    activatePreviousPane(): boolean;
+}
+
+/** Represents an individual file that can be watched, read from, and written to. */
+export class File {
+    // Construction
+    /** Configures a new File instance, no files are accessed. */
+    constructor(filePath: string, symlink?: boolean);
+
+    /**
+     *  Creates the file on disk that corresponds to ::getPath() if no such file
+     *  already exists.
+     */
+    create(): Promise<boolean>;
+
+    // Event Subscription
+    /** Invoke the given callback when the file's contents change. */
+    onDidChange(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the file's path changes. */
+    onDidRename(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the file is deleted. */
+    onDidDelete(callback: () => void): Disposable;
+
+    /**
+     *  Invoke the given callback when there is an error with the watch. When
+     *  your callback has been invoked, the file will have unsubscribed from the
+     *  file watches.
+     */
+    onWillThrowWatchError(callback: (event: PathWatchErrorThrownEvent) =>
+        void): Disposable;
+
+    // File Metadata
+    /** Returns a boolean, always true. */
+    isFile(): this is File;
+
+    /** Returns a boolean, always false. */
+    isDirectory(): this is Directory;
+
+    /** Returns a boolean indicating whether or not this is a symbolic link. */
+    isSymbolicLink(): boolean;
+
+    /**
+     *  Returns a promise that resolves to a boolean, true if the file exists,
+     *  false otherwise.
+     */
+    exists(): Promise<boolean>;
+
+    /** Returns a boolean, true if the file exists, false otherwise. */
+    existsSync(): boolean;
+
+    /** Get the SHA-1 digest of this file. */
+    getDigest(): Promise<string>;
+
+    /** Get the SHA-1 digest of this file. */
+    getDigestSync(): string;
+
+    /** Sets the file's character set encoding name. */
+    setEncoding(encoding: string): void;
+
+    /** Returns the string encoding name for this file (default: "utf8"). */
+    getEncoding(): string;
+
+    // Managing Paths
+    /** Returns the string path for the file. */
+    getPath(): string;
+
+    /** Returns this file's completely resolved string path. */
+    getRealPathSync(): string;
+
+    /**
+     *  Returns a promise that resolves to the file's completely resolved
+     *  string path.
+     */
+    getRealPath(): Promise<string>;
+
+    /** Return the string filename without any directory information. */
+    getBaseName(): string;
+
+    // Traversing
+    /** Return the Directory that contains this file. */
+    getParent(): Directory;
+
+    // Reading and Writing
+    /** Reads the contents of the file. */
+    read(flushCache?: boolean): Promise<string>;
+
+    /** Returns a stream to read the content of the file. */
+    createReadStream(): ReadStream;
+
+    /** Overwrites the file with the given text. */
+    write(text: string): Promise<undefined>;
+
+    /** Returns a stream to write content to the file. */
+    createWriteStream(): WriteStream;
+
+    /** Overwrites the file with the given text. */
+    writeSync(text: string): undefined;
+}
+
+/** Represents the underlying git operations performed by Atom. */
+export class GitRepository {
+    // Construction
+    /** Creates a new GitRepository instance. */
+    static open(path: string, options?: { refreshOnWindowFocus?: boolean }): GitRepository;
+
+    constructor(path: string, options?: { refreshOnWindowFocus?: boolean, config?: Config,
+        project?: Project });
+
+    // Lifecycle
+    /** Destroy this GitRepository object. */
+    destroy(): void;
+
+    /** Returns a boolean indicating if this repository has been destroyed. */
+    isDestroyed(): boolean;
+
+    // Event Subscription
+    /**
+     *  Invoke the given callback when this GitRepository's destroy() method is
+     *  invoked.
+     */
+    onDidDestroy(callback: () => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a specific file's status has changed. When
+     *  a file is updated, reloaded, etc, and the status changes, this will be fired.
+     */
+    onDidChangeStatus(callback: (event: RepoStatusChangedEvent) => void): Disposable;
+
+    /** Invoke the given callback when a multiple files' statuses have changed. */
+    onDidChangeStatuses(callback: () => void): Disposable;
+
+    // Repository Details
+    /** A string indicating the type of version control system used by this repository. */
+    getType(): "git";
+
+    /** Returns the string path of the repository. */
+    getPath(): string;
+
+    /** Returns the string working directory path of the repository. */
+    getWorkingDirectory(): string;
+
+    /** Returns true if at the root, false if in a subfolder of the repository. */
+    isProjectAtRoot(): boolean;
+
+    /** Makes a path relative to the repository's working directory. */
+    relativize(): string;
+
+    /** Returns true if the given branch exists. */
+    hasBranch(branch: string): boolean;
+
+    /** Retrieves a shortened version of the HEAD reference value. */
+    getShortHead(path?: string): string;
+
+    /** Is the given path a submodule in the repository? */
+    isSubmodule(path: string): boolean;
+
+    /**
+     *  Returns the number of commits behind the current branch is from the its
+     *  upstream remote branch. The default reference is the HEAD.
+     *  @param reference The branch reference name.
+     *  @param path The path in the repository to get this ifnromation for, only
+     *  needed if the repository contains submodules.
+     *  @return Returns the number of commits behind the current branch is from its
+     *  upstream remote branch.
+     */
+    getAheadBehindCount(reference: string, path?: string): { ahead: number, behind: number };
+
+    /**
+     *  Get the cached ahead/behind commit counts for the current branch's
+     *  upstream branch.
+     */
+    getCachedUpstreamAheadBehindCount(path?: string): { ahead: number, behind: number };
+
+    /** Returns the git configuration value specified by the key. */
+    getConfigValue(key: string, path?: string): string;
+
+    /** Returns the origin url of the repository. */
+    getOriginURL(path?: string): string;
+
+    /**
+     *  Returns the upstream branch for the current HEAD, or null if there is no
+     *  upstream branch for the current HEAD.
+     */
+    getUpstreamBranch(path?: string): string|null;
+
+    /** Gets all the local and remote references. */
+    getReferences(path?: string): { heads: string[], remotes: string[], tags: string[] };
+
+    /** Returns the current string SHA for the given reference. */
+    getReferenceTarget(reference: string, path?: string): string;
+
+    // Reading Status
+    /** Returns true if the given path is modified. */
+    isPathModified(path: string): boolean;
+
+    /** Returns true if the given path is new. */
+    isPathNew(path: string): boolean;
+
+    /** Is the given path ignored? */
+    isPathIgnored(path: string): boolean;
+
+    /** Get the status of a directory in the repository's working directory. */
+    getDirectoryStatus(path: string): number;
+
+    /** Get the status of a single path in the repository. */
+    getPathStatus(path: string): number;
+
+    /** Get the cached status for the given path. */
+    getCachedPathStatus(path: string): number|null;
+
+    /** Returns true if the given status indicates modification. */
+    isStatusModified(status: number): boolean;
+
+    /** Returns true if the given status indicates a new path. */
+    isStatusNew(status: number): boolean;
+
+    // Retrieving Diffs
+    /**
+     *  Retrieves the number of lines added and removed to a path.
+     *  This compares the working directory contents of the path to the HEAD version.
+     */
+    getDiffStats(path: string): { added: number, deleted: number };
+
+    /**
+     *  Retrieves the line diffs comparing the HEAD version of the given path
+     *  and the given text.
+     */
+    getLineDiffs(path: string, text: string): Array<{ oldStart: number,
+        newStart: number, oldLines: number, newLines: number }>;
+
+    // Checking Out
+    /**
+     *  Restore the contents of a path in the working directory and index to the
+     *  version at HEAD.
+     */
+    checkoutHead(path: string): boolean;
+
+    /** Checks out a branch in your repository. */
+    checkoutReference(reference: string, create: boolean): boolean;
+}
+
+/** Grammar that tokenizes lines of text. */
+export interface Grammar {
+    /** The name of the Grammar. */
+    readonly name: string;
+
+    /** Undocumented: scope name of the Grammar. */
+    readonly scopeName: string;
+
+    // Event Subscription
+    onDidUpdate(callback: () => void): Disposable;
+
+    // Tokenizing
+    /**
+     *  Tokenize all lines in the given text.
+     *  @param text A string containing one or more lines.
+     *  @return An array of token arrays for each line tokenized.
+     */
+    tokenizeLines(text: string): GrammarToken[][];
+
+    /**
+     *  Tokenizes the line of text.
+     *  @param line A string of text to tokenize.
+     *  @param ruleStack An optional array of rules previously returned from this
+     *  method. This should be null when tokenizing the first line in the file.
+     *  @param firstLine A optional boolean denoting whether this is the first line
+     *  in the file which defaults to `false`.
+     *  @return An object representing the result of the tokenize.
+     */
+    tokenizeLine(line: string, ruleStack?: null, firstLine?: boolean): TokenizeLineResult;
+    /**
+     *  Tokenizes the line of text.
+     *  @param line A string of text to tokenize.
+     *  @param ruleStack An optional array of rules previously returned from this
+     *  method. This should be null when tokenizing the first line in the file.
+     *  @param firstLine A optional boolean denoting whether this is the first line
+     *  in the file which defaults to `false`.
+     *  @return An object representing the result of the tokenize.
+     */
+    tokenizeLine(line: string, ruleStack: GrammarRule[], firstLine?: false):
+        TokenizeLineResult;
+}
+
+/** Registry containing one or more grammars. */
+export interface GrammarRegistry {
+    // Event Subscription
+    /**
+     *  Invoke the given callback when a grammar is added to the registry.
+     *  @param callback The callback to be invoked whenever a grammar is added.
+     *  @return A Disposable on which `.dispose()` can be called to unsubscribe.
+     */
+    onDidAddGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a grammar is updated due to a grammar it
+     *  depends on being added or removed from the registry.
+     *  @param callback The callback to be invoked whenever a grammar is updated.
+     *  @return A Disposable on which `.dispose()` can be called to unsubscribe.
+     */
+    onDidUpdateGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a grammar is removed from the registry.
+     *  @param callback The callback to be invoked whenever a grammar is removed.
+     *  @return A Disposable on which `.dispose()` can be called to unsubscribe.
+     */
+    onDidRemoveGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+    // Managing Grammars
+    /**
+     *  Get all the grammars in this registry.
+     *  @return A non-empty array of Grammar instances.
+     */
+    getGrammars(): Grammar[];
+
+    /**
+     *  Get a grammar with the given scope name.
+     *  @param scopeName A string such as `source.js`.
+     *  @return A Grammar or undefined.
+     */
+    grammarForScopeName(scopeName: string): Grammar|undefined;
+
+    /**
+     *  Add a grammar to this registry.
+     *  A 'grammar-added' event is emitted after the grammar is added.
+     *  @param grammar The Grammar to add. This should be a value previously returned
+     *  from ::readGrammar or ::readGrammarSync.
+     *  @return Returns a Disposable on which `.dispose()` can be called to remove
+     *  the grammar.
+     */
+    addGrammar(grammar: Grammar): Disposable;
+
+    /**
+     *  Remove the given grammar from this registry.
+     *  @param grammar The grammar to remove. This should be a grammar previously
+     *  added to the registry from ::addGrammar.
+     */
+    removeGrammar(grammar: Grammar): void;
+
+    /**
+     *  Remove the grammar with the given scope name.
+     *  @param scopeName A string such as `source.js`.
+     *  @return Returns the removed Grammar or undefined.
+     */
+    removeGrammarForScopeName(scopeName: string): Grammar|undefined;
+
+    /**
+     *  Read a grammar synchronously but don't add it to the registry.
+     *  @param grammarPath The absolute file path to a grammar.
+     *  @return The newly loaded Grammar.
+     */
+    readGrammarSync(grammarPath: string): Grammar;
+
+    /**
+     *  Read a grammar asynchronously but don't add it to the registry.
+     *  @param grammarPath The absolute file path to the grammar.
+     *  @param callback The function to be invoked once the Grammar has been read in.
+     */
+    readGrammar(grammarPath: string, callback: (error: Error|null, grammar?: Grammar) =>
+        void): void;
+
+    /**
+     *  Read a grammar synchronously and add it to this registry.
+     *  @param grammarPath The absolute file path to the grammar.
+     *  @return The newly loaded Grammar.
+     */
+    loadGrammarSync(grammarPath: string): Grammar;
+
+    /**
+     *  Read a grammar asynchronously and add it to the registry.
+     *  @param grammarPath The absolute file path to the grammar.
+     *  @param callback The function to be invoked once the Grammar has been read in
+     *  and added to the registry.
+     */
+    loadGrammar(grammarPath: string, callback: (error: Error|null, grammar?: Grammar) =>
+        void): void;
+
+    /**
+     *  Convert compact tags representation into convenient, space-inefficient tokens.
+     *  @param lineText The text of the tokenized line.
+     *  @param tags The tags returned from a call to Grammar::tokenizeLine().
+     *  @return An array of Token instances decoded from the given tags.
+     */
+    decodeTokens(lineText: string, tags: Array<number|string>): GrammarToken[];
+}
+
+/** Represents a gutter within a TextEditor. */
+export interface Gutter {
+    // Gutter Destruction
+    /** Destroys the gutter. */
+    destroy(): void;
+
+    // Event Subscription
+    /** Calls your callback when the gutter's visibility changes. */
+    onDidChangeVisible(callback: (gutter: Gutter) => void): Disposable;
+
+    /** Calls your callback when the gutter is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    // Visibility
+    /** Hide the gutter. */
+    hide(): void;
+
+    /** Show the gutter. */
+    show(): void;
+
+    /** Determine whether the gutter is visible. */
+    isVisible(): boolean;
+
+    /**
+     *  Add a decoration that tracks a DisplayMarker. When the marker moves, is
+     *  invalidated, or is destroyed, the decoration will be updated to reflect
+     *  the marker's state.
+     */
+    decorateMarker(marker: DisplayMarker, decorationParams: DecorationOptions): Decoration;
+}
+
+/**
+ *  History manager for remembering which projects have been opened.
+ *  An instance of this class is always available as the atom.history global.
+ *  The project history is used to enable the 'Reopen Project' menu.
+ */
+export interface HistoryManager {
+    /** Obtain a list of previously opened projects. */
+    getProjects(): ProjectHistory[];
+
+    /**
+     *  Clear all projects from the history.
+     *  Note: This is not a privacy function - other traces will still exist, e.g.
+     *  window state.
+     */
+    clearProjects(): void;
+
+    /** Invoke the given callback when the list of projects changes. */
+    onDidChangeProjects(callback: (args: { reloaded: boolean }) => void): Disposable;
+}
+
+/**
+ *  Allows commands to be associated with keystrokes in a context-sensitive way.
+ *  In Atom, you can access a global instance of this object via `atom.keymaps`.
+ */
+export interface KeymapManager {
+    /** Clear all registered key bindings and enqueued keystrokes. For use in tests. */
+    clear(): void;
+
+    /** Unwatch all watched paths. */
+    destroy(): void;
+
+    // Event Subscription
+    /** Invoke the given callback when one or more keystrokes completely match a key binding. */
+    onDidMatchBinding(callback: (event: FullKeybindingMatchEvent) => void): Disposable;
+
+    /** Invoke the given callback when one or more keystrokes partially match a binding. */
+    onDidPartiallyMatchBindings(callback: (event: PartialKeybindingMatchEvent) =>
+        void): Disposable;
+
+    /** Invoke the given callback when one or more keystrokes fail to match any bindings. */
+    onDidFailToMatchBinding(callback: (event: FailedKeybindingMatchEvent) =>
+        void): Disposable;
+
+    /** Invoke the given callback when a keymap file is reloaded. */
+    onDidReloadKeymap(callback: (event: KeymapLoadedEvent) => void): Disposable;
+
+    /** Invoke the given callback when a keymap file is unloaded. */
+    onDidUnloadKeymap(callback: (event: KeymapLoadedEvent) => void): Disposable;
+
+    /** Invoke the given callback when a keymap file not able to be loaded. */
+    onDidFailToReadFile(callback: (error: FailedKeymapFileReadEvent) => void): Disposable;
+
+    // Adding and Removing Bindings
+    /** Construct KeyBindings from an object grouping them by CSS selector. */
+    build(source: string, bindings: { [key: string]: { [key: string]: string }},
+        priority?: number): KeyBinding[];
+
+    /** Add sets of key bindings grouped by CSS selector. */
+    add(source: string, bindings: { [key: string]: { [key: string]: string }},
+        priority?: number): Disposable;
+
+    // Accessing Bindings
+    /** Get all current key bindings. */
+    getKeyBindings(): KeyBinding[];
+
+    /** Get the key bindings for a given command and optional target. */
+    findKeyBindings(params?: {
+        keystrokes?: string, // e.g. 'ctrl-x ctrl-s'
+        command?: string, // e.g. 'editor:backspace'
+        target?: Element,
+    }): KeyBinding[];
+
+    // Managing Keymap Files
+    /** Load the key bindings from the given path. */
+    loadKeymap(bindingsPath: string, options?: { watch?: boolean, priority?: number }):
+        void;
+
+    /**
+     *  Cause the keymap to reload the key bindings file at the given path whenever
+     *  it changes.
+     */
+    watchKeymap(filePath: string, options?: { priority: number }): void;
+
+    // Managing Keyboard Events
+    /**
+     *  Dispatch a custom event associated with the matching key binding for the
+     *  given `KeyboardEvent` if one can be found.
+     */
+    handleKeyboardEvent(event: KeyboardEvent): void;
+
+    /** Translates a keydown event to a keystroke string. */
+    keystrokeForKeyboardEvent(event: KeyboardEvent): string;
+
+    /** Customize translation of raw keyboard events to keystroke strings. */
+    addKeystrokeResolver(resolver: (event: AddedKeystrokeResolverEvent) => string): Disposable;
+
+    /**
+     *  Get the number of milliseconds allowed before pending states caused by
+     *  partial matches of multi-keystroke bindings are terminated.
+     */
+    getPartialMatchTimeout(): number;
+}
+
+/** Provides a registry for menu items that you'd like to appear in the application menu. */
+export interface MenuManager {
+    /** Adds the given items to the application menu. */
+    add(items: ReadonlyArray<MenuOptions>): Disposable;
+
+    /** Refreshes the currently visible menu. */
+    update(): void;
+}
+
+/**
+ *  Loads and activates a package's main module and resources such as stylesheets,
+ *  keymaps, grammar, editor properties, and menus.
+ */
+export interface Package {
+    /** The name of the Package. */
+    name: string;
+
+    /** The path to the Package on disk. */
+    path: string;
+
+    // Event Subscription
+    /** Invoke the given callback when all packages have been activated. */
+    onDidDeactivate(callback: () => void): Disposable;
+
+    // Native Module Compatibility
+    /**
+     *  Are all native modules depended on by this package correctly compiled
+     *  against the current version of Atom?
+     */
+    isCompatible(): boolean;
+
+    /**
+     *  Rebuild native modules in this package's dependencies for the current
+     *  version of Atom.
+     */
+    rebuild(): Promise<{ code: number, stdout: string, stderr: string }>;
+
+    /** If a previous rebuild failed, get the contents of stderr. */
+    getBuildFailureOutput(): string|null;
+}
+
+/** Package manager for coordinating the lifecycle of Atom packages. */
+export interface PackageManager {
+    // Event Subscription
+    /** Invoke the given callback when all packages have been loaded. */
+    onDidLoadInitialPackages(callback: () => void): Disposable;
+
+    /** Invoke the given callback when all packages have been activated. */
+    onDidActivateInitialPackages(callback: () => void): Disposable;
+
+    /** Invoke the given callback when a package is activated. */
+    onDidActivatePackage(callback: (package: Package) => void): Disposable;
+
+    /** Invoke the given callback when a package is deactivated. */
+    onDidDeactivatePackage(callback: (package: Package) => void): Disposable;
+
+    /** Invoke the given callback when a package is loaded. */
+    onDidLoadPackage(callback: (package: Package) => void): Disposable;
+
+    /** Invoke the given callback when a package is unloaded. */
+    onDidUnloadPackage(callback: (package: Package) => void): Disposable;
+
+    /** Undocumented: invoke the given callback when an activation hook is triggered */
+    onDidTriggerActivationHook(hook: string, callback: () => void): Disposable;
+
+    // Package System Data
+    /** Get the path to the apm command. */
+    getApmPath(): string;
+
+    /** Get the paths being used to look for packages. */
+    getPackageDirPaths(): string[];
+
+    // General Package Data
+    /** Resolve the given package name to a path on disk. */
+    resolvePackagePath(name: string): string|undefined;
+
+    /** Is the package with the given name bundled with Atom? */
+    isBundledPackage(name: string): boolean;
+
+    // Enabling and Disabling Packages
+    /** Enable the package with the given name. */
+    enablePackage(name: string): Package|undefined;
+
+    /** Disable the package with the given name. */
+    disablePackage(name: string): Package|undefined;
+
+    /** Is the package with the given name disabled? */
+    isPackageDisabled(name: string): boolean;
+
+    // Accessing Active Packages
+    /** Get an Array of all the active Packages. */
+    getActivePackages(): Package[];
+
+    /** Get the active Package with the given name. */
+    getActivePackage(name: string): Package|undefined;
+
+    /** Is the Package with the given name active? */
+    isPackageActive(name: string): boolean;
+
+    /** Returns a boolean indicating whether package activation has occurred. */
+    hasActivatedInitialPackages(): boolean;
+
+    // Accessing Loaded Packages
+    /** Get an Array of all the loaded Packages. */
+    getLoadedPackages(): Package[];
+
+    /** Get the loaded Package with the given name. */
+    getLoadedPackage(name: string): Package|undefined;
+
+    /** Is the package with the given name loaded? */
+    isPackageLoaded(name: string): boolean;
+
+    /** Returns a boolean indicating whether package loading has occurred. */
+    hasLoadedInitialPackages(): boolean;
+
+    // Accessing Available Packages
+    /** Returns an Array of strings of all the available package paths. */
+    getAvailablePackagePaths(): string[];
+
+    /** Returns an Array of strings of all the available package names.  */
+    getAvailablePackageNames(): string[];
+
+    /** Returns an Array of strings of all the available package metadata. */
+    getAvailablePackageMetadata(): string[];
+
+    /** Activate a single package by name or path. */
+    activatePackage(nameOrPath: string): Promise<Package>;
+
+    /** Triggers the given package activation hook. */
+    triggerActivationHook(hook: string): void;
+
+    /** Trigger all queued activation hooks immediately. */
+    triggerDeferredActivationHooks(): void;
+}
+
+/** A container for presenting content in the center of the workspace. */
+export interface Pane {
+    // Event Subscription
+    /** Invoke the given callback when the pane resizes. */
+    onDidChangeFlexScale(callback: (flexScale: number) => void): Disposable;
+
+    /** Invoke the given callback with the current and future values of ::getFlexScale. */
+    observeFlexScale(callback: (flexScale: number) => void): Disposable;
+
+    /** Invoke the given callback when the pane is activated. */
+    onDidActivate(callback: () => void): Disposable;
+
+    /** Invoke the given callback before the pane is destroyed. */
+    onWillDestroy(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the pane is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the value of the ::isActive property changes. */
+    onDidChangeActive(callback: (active: boolean) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with the current and future values of the ::isActive
+     *  property.
+     */
+    observeActive(callback: (active: boolean) => void): Disposable;
+
+    /** Invoke the given callback when an item is added to the pane. */
+    onDidAddItem(callback: (event: PaneListItemShiftedEvent) => void): Disposable;
+
+    /** Invoke the given callback when an item is removed from the pane. */
+    onDidRemoveItem(callback: (event: PaneListItemShiftedEvent) => void): Disposable;
+
+    /** Invoke the given callback before an item is removed from the pane. */
+    onWillRemoveItem(callback: (event: PaneListItemShiftedEvent) => void): Disposable;
+
+    /** Invoke the given callback when an item is moved within the pane. */
+    onDidMoveItem(callback: (event: PaneItemMovedEvent) => void): Disposable;
+
+    /** Invoke the given callback with all current and future items. */
+    observeItems(callback: (item: object) => void): Disposable;
+
+    /** Invoke the given callback when the value of ::getActiveItem changes. */
+    onDidChangeActiveItem(callback: (activeItem: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when ::activateNextRecentlyUsedItem has been called,
+     *  either initiating or continuing a forward MRU traversal of pane items.
+     */
+    onChooseNextMRUItem(callback: (nextRecentlyUsedItem: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when ::activatePreviousRecentlyUsedItem has been called,
+     *  either initiating or continuing a reverse MRU traversal of pane items.
+     */
+    onChooseLastMRUItem(callback: (previousRecentlyUsedItem: object) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when ::moveActiveItemToTopOfStack has been called,
+     *  terminating an MRU traversal of pane items and moving the current active item
+     *  to the top of the stack. Typically bound to a modifier (e.g. CTRL) key up event.
+     */
+    onDoneChoosingMRUItem(callback: () => void): Disposable;
+
+    /** Invoke the given callback with the current and future values of ::getActiveItem. */
+    observeActiveItem(callback: (activeItem: object) => void): Disposable;
+
+    /** Invoke the given callback before items are destroyed. */
+    onWillDestroyItem(callback: (event: PaneListItemShiftedEvent) => void): Disposable;
+
+    // Items
+    /** Get the items in this pane. */
+    getItems(): object[];
+
+    /** Get the active pane item in this pane. */
+    getActiveItem(): object;
+
+    /** Return the item at the given index. */
+    itemAtIndex(index: number): object|undefined;
+
+    /** Makes the next item active. */
+    activateNextItem(): void;
+
+    /** Makes the previous item active. */
+    activatePreviousItem(): void;
+
+    /** Move the active tab to the right. */
+    moveItemRight(): void;
+
+    /** Move the active tab to the left. */
+    moveItemLeft(): void;
+
+    /** Get the index of the active item. */
+    getActiveItemIndex(): number;
+
+    /** Activate the item at the given index. */
+    activateItemAtIndex(index: number): void;
+
+    /** Make the given item active, causing it to be displayed by the pane's view. */
+    activateItem(item: object, options?: { pending: boolean }): void;
+
+    /** Add the given item to the pane. */
+    addItem(item: object, options?: { index?: number, pending?: boolean }): object;
+
+    /** Add the given items to the pane. */
+    addItems(items: object[], index?: number): object[];
+
+    /** Move the given item to the given index. */
+    moveItem(item: object, index: number): void;
+
+    /** Move the given item to the given index on another pane. */
+    moveItemToPane(item: object, pane: Pane, index: number): void;
+
+    /** Destroy the active item and activate the next item. */
+    destroyActiveItem(): Promise<boolean>;
+
+    /** Destroy the given item. */
+    destroyItem(item: object, force?: boolean): Promise<boolean>;
+
+    /** Destroy all items. */
+    destroyItems(): Promise<boolean[]>;
+
+    /** Destroy all items except for the active item. */
+    destroyInactiveItems(): Promise<boolean[]>;
+
+    /** Save the active item. */
+    saveActiveItem<T = void>(nextAction?: (error?: Error) => T):
+        Promise<T>|undefined;
+
+    /**
+     *  Prompt the user for a location and save the active item with the path
+     *  they select.
+     */
+    saveActiveItemAs<T = void>(nextAction?: (error?: Error) => T):
+        Promise<T>|undefined;
+
+    /** Save the given item. */
+    saveItem<T = void>(item: object, nextAction?: (error?: Error) => T):
+        Promise<T>|undefined;
+
+    /**
+     *  Prompt the user for a location and save the active item with the path
+     *  they select.
+     */
+    saveItemAs<T = void>(item: object, nextAction?: (error?: Error) => T):
+        Promise<T>|undefined;
+
+    /** Save all items. */
+    saveItems(): void;
+
+    /** Return the first item that matches the given URI or undefined if none exists. */
+    itemForURI(uri: string): object|undefined;
+
+    /** Activate the first item that matches the given URI. */
+    activateItemForURI(uri: string): boolean;
+
+    // Lifecycle
+    /** Determine whether the pane is active. */
+    isActive(): boolean;
+
+    /** Makes this pane the active pane, causing it to gain focus. */
+    activate(): void;
+
+    /** Close the pane and destroy all its items. */
+    destroy(): void;
+
+    /** Determine whether this pane has been destroyed. */
+    isDestroyed(): boolean;
+
+    // Splitting
+    /** Create a new pane to the left of this pane. */
+    splitLeft(params?: {
+        items?: object[],
+        copyActiveItem?: boolean,
+    }): Pane;
+
+    /** Create a new pane to the right of this pane. */
+    splitRight(params?: {
+        items?: object[],
+        copyActiveItem?: boolean,
+    }): Pane;
+
+    /** Creates a new pane above the receiver. */
+    splitUp(params?: {
+        items?: object[],
+        copyActiveItem?: boolean,
+    }): Pane;
+
+    /** Creates a new pane below the receiver. */
+    splitDown(params?: {
+        items?: object[],
+        copyActiveItem?: boolean,
+    }): Pane;
+}
+
+/**
+ *  A container representing a panel on the edges of the editor window. You
+ *  should not create a Panel directly, instead use Workspace::addTopPanel and
+ *  friends to add panels.
+ */
+export interface Panel<T = object> {
+    /** Whether or not the Panel is visible. */
+    visible: boolean;
+
+    // Construction and Destruction
+    /** Destroy and remove this panel from the UI. */
+    destroy(): void;
+
+    // Event Subscription
+    /** Invoke the given callback when the pane hidden or shown. */
+    onDidChangeVisible(callback: (visible: boolean) => void): Disposable;
+
+    /** Invoke the given callback when the pane is destroyed. */
+    onDidDestroy(callback: (panel: Panel<T>) => void): Disposable;
+
+    // Panel Details
+    /** Returns the panel's item. */
+    getItem(): T;
+
+    /** Returns a number indicating this panel's priority. */
+    getPriority(): number;
+
+    /** Returns a boolean true when the panel is visible. */
+    isVisible(): boolean;
+
+    /** Hide this panel. */
+    hide(): void;
+
+    /** Show this panel. */
+    show(): void;
+}
+
+/** Manage a subscription to filesystem events that occur beneath a root directory. */
+export interface PathWatcher extends DisposableLike {
+    /**
+     *  Return a Promise that will resolve when the underlying native watcher is
+     *  ready to begin sending events.
+     */
+    getStartPromise(): Promise<void>;
+
+    /** Invokes a function when any errors related to this watcher are reported. */
+    onDidError(callback: (error: Error) => void): Disposable;
+
+    /**
+     *  Unsubscribe all subscribers from filesystem events. Native resources will be
+     *  release asynchronously, but this watcher will stop broadcasting events
+     *  immediately.
+     */
+    dispose(): void;
+}
+
+/** Represents a project that's opened in Atom. */
+export interface Project {
+    // Event Subscription
+    /** Invoke the given callback when the project paths change. */
+    onDidChangePaths(callback: (projectPaths: string[]) => void): Disposable;
+
+    /** Invoke the given callback when a text buffer is added to the project. */
+    onDidAddBuffer(callback: (buffer: TextBuffer) => void): Disposable;
+
+    /**
+     *  Invoke the given callback with all current and future text buffers in
+     *  the project.
+     */
+    observeBuffers(callback: (buffer: TextBuffer) => void): Disposable;
+
+    /** Invoke a callback when a filesystem change occurs within any open project path. */
+    onDidChangeFiles(callback: (events: FilesystemChangeEvent) => void): Disposable;
+
+    // Accessing the Git Repository
+    /** Get an Array of GitRepositorys associated with the project's directories. */
+    getRepositories(): GitRepository[];
+
+    /** Get the repository for a given directory asynchronously. */
+    repositoryForDirectory(directory: Directory): Promise<GitRepository|null>;
+
+    // Managing Paths
+    /** Get an Array of strings containing the paths of the project's directories. */
+    getPaths(): string[];
+
+    /** Set the paths of the project's directories. */
+    setPaths(projectPaths: string[]): void;
+
+    /** Add a path to the project's list of root paths. */
+    addPath(projectPath: string): void;
+
+    /**
+     *  Access a promise that resolves when the filesystem watcher associated with a
+     *  project root directory is ready to begin receiving events.
+     */
+    getWatcherPromise(projectPath: string): Promise<PathWatcher>;
+
+    /** Remove a path from the project's list of root paths. */
+    removePath(projectPath: string): void;
+
+    /** Get an Array of Directorys associated with this project. */
+    getDirectories(): Directory[];
+
+    /** Get the relative path from the project directory to the given path. */
+    relativize(fullPath: string): string;
+
+    /**
+     *  Get the path to the project directory that contains the given path, and
+     *  the relative path from that project directory to the given path.
+     */
+    relativizePath(fullPath: string): [string|null, string];
+
+    /**
+     *  Determines whether the given path (real or symbolic) is inside the
+     *  project's directory.
+     */
+    contains(pathToCheck: string): boolean;
+}
+
+/**
+ *  Wraps an array of strings. The Array describes a path from the root of the
+ *  syntax tree to a token including all scope names for the entire path.
+ */
+export interface ScopeDescriptor {
+    scopes: string[];
+
+    /** Returns all scopes for this descriptor. */
+    getScopesArray(): string[];
+}
+
+/** Represents a selection in the TextEditor. */
+export interface Selection {
+    // Event Subscription
+    /** Calls your callback when the selection was moved. */
+    onDidChangeRange(callback: (event: SelectionChangedEvent) => void): Disposable;
+
+    /** Calls your callback when the selection was destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    // Managing the selection range
+    /** Returns the screen Range for the selection. */
+    getScreenRange(): Range;
+
+    /** Modifies the screen range for the selection. */
+    setScreenRange(screenRange: RangeCompatible, options?: {
+        preserveFolds?: boolean,
+        autoscroll?: boolean
+    }): void;
+
+    /** Returns the buffer Range for the selection. */
+    getBufferRange(): Range;
+
+    /** Modifies the buffer Range for the selection. */
+    setBufferRange(bufferRange: RangeCompatible, options?: {
+        preserveFolds?: boolean,
+        autoscroll?: boolean,
+    }): void;
+
+    /** Returns the starting and ending buffer rows the selection is highlighting. */
+    getBufferRowRange(): [number, number];
+
+    // Info about the selection
+    /** Determines if the selection contains anything. */
+    isEmpty(): boolean;
+
+    /**
+     *  Determines if the ending position of a marker is greater than the starting position.
+     *  This can happen when, for example, you highlight text "up" in a TextBuffer.
+     */
+    isReversed(): boolean;
+
+    /** Returns whether the selection is a single line or not. */
+    isSingleScreenLine(): boolean;
+
+    /** Returns the text in the selection. */
+    getText(): string;
+
+    // NOTE: this calls into Range.intersectsWith(), which is one of the few functions
+    //   that doesn't take a range-compatible range, despite what the API says.
+    /** Identifies if a selection intersects with a given buffer range. */
+    intersectsBufferRange(bufferRange: RangeLike): boolean;
+
+    /** Identifies if a selection intersects with another selection. */
+    intersectsWith(otherSelection: Selection): boolean;
+
+    // Modifying the selected range
+    /** Clears the selection, moving the marker to the head. */
+    clear(options?: { autoscroll?: boolean }): void;
+
+    /** Selects the text from the current cursor position to a given screen position. */
+    selectToScreenPosition(position: PointCompatible): void;
+
+    /** Selects the text from the current cursor position to a given buffer position. */
+    selectToBufferPosition(position: PointCompatible): void;
+
+    /** Selects the text one position right of the cursor. */
+    selectRight(columnCount?: number): void;
+
+    /** Selects the text one position left of the cursor. */
+    selectLeft(columnCount?: number): void;
+
+    /** Selects all the text one position above the cursor. */
+    selectUp(rowCount?: number): void;
+
+    /** Selects all the text one position below the cursor. */
+    selectDown(rowCount?: number): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the top of the
+     *  buffer.
+     */
+    selectToTop(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the bottom of
+     *  the buffer.
+     */
+    selectToBottom(): void;
+
+    /** Selects all the text in the buffer. */
+    selectAll(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the beginning of
+     *  the line.
+     */
+    selectToBeginningOfLine(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the first character
+     *  of the line.
+     */
+    selectToFirstCharacterOfLine(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the end of the
+     *  screen line.
+     */
+    selectToEndOfLine(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the end of the
+     *  buffer line.
+     */
+    selectToEndOfBufferLine(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the beginning
+     *  of the word.
+     */
+    selectToBeginningOfWord(): void;
+
+    /** Selects all the text from the current cursor position to the end of the word. */
+    selectToEndOfWord(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the beginning of
+     *  the next word.
+     */
+    selectToBeginningOfNextWord(): void;
+
+    /** Selects text to the previous word boundary. */
+    selectToPreviousWordBoundary(): void;
+
+    /** Selects text to the next word boundary. */
+    selectToNextWordBoundary(): void;
+
+    /** Selects text to the previous subword boundary. */
+    selectToPreviousSubwordBoundary(): void;
+
+    /** Selects text to the next subword boundary. */
+    selectToNextSubwordBoundary(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the beginning of
+     *  the next paragraph.
+     */
+    selectToBeginningOfNextParagraph(): void;
+
+    /**
+     *  Selects all the text from the current cursor position to the beginning of
+     *  the previous paragraph.
+     */
+    selectToBeginningOfPreviousParagraph(): void;
+
+    /** Modifies the selection to encompass the current word. */
+    selectWord(): void;
+
+    /**
+     *  Expands the newest selection to include the entire word on which the
+     *  cursors rests.
+     */
+    expandOverWord(): void;
+
+    /** Selects an entire line in the buffer. */
+    selectLine(row: number): void;
+
+    /**
+     *  Expands the newest selection to include the entire line on which the cursor
+     *  currently rests.
+     *  It also includes the newline character.
+     */
+    expandOverLine(): void;
+
+    // Modifying the selected text
+    /** Replaces text at the current selection. */
+    insertText(text: string, options?: TextInsertionOptions): void;
+
+    /**
+     *  Removes the first character before the selection if the selection is empty
+     *  otherwise it deletes the selection.
+     */
+    backspace(): void;
+
+    /**
+     *  Removes the selection or, if nothing is selected, then all characters from
+     *  the start of the selection back to the previous word boundary.
+     */
+    deleteToPreviousWordBoundary(): void;
+
+    /**
+     *  Removes the selection or, if nothing is selected, then all characters from
+     *  the start of the selection up to the next word boundary.
+     */
+    deleteToNextWordBoundary(): void;
+
+    /**
+     *  Removes from the start of the selection to the beginning of the current
+     *  word if the selection is empty otherwise it deletes the selection.
+     */
+    deleteToBeginningOfWord(): void;
+
+    /**
+     *  Removes from the beginning of the line which the selection begins on all
+     *  the way through to the end of the selection.
+     */
+    deleteToBeginningOfLine(): void;
+
+    /**
+     *  Removes the selection or the next character after the start of the selection
+     *  if the selection is empty.
+     */
+    delete(): void;
+
+    /**
+     *  If the selection is empty, removes all text from the cursor to the end of
+     *  the line. If the cursor is already at the end of the line, it removes the following
+     *  newline. If the selection isn't empty, only deletes the contents of the selection.
+     */
+    deleteToEndOfLine(): void;
+
+    /**
+     *  Removes the selection or all characters from the start of the selection to
+     *  the end of the current word if nothing is selected.
+     */
+    deleteToEndOfWord(): void;
+
+    /**
+     *  Removes the selection or all characters from the start of the selection to
+     *  the end of the current word if nothing is selected.
+     */
+    deleteToBeginningOfSubword(): void;
+
+    /**
+     *  Removes the selection or all characters from the start of the selection to
+     *  the end of the current word if nothing is selected.
+     */
+    deleteToEndOfSubword(): void;
+
+    /** Removes only the selected text. */
+    deleteSelectedText(): void;
+
+    /**
+     *  Removes the line at the beginning of the selection if the selection is empty
+     *  unless the selection spans multiple lines in which case all lines are removed.
+     */
+    deleteLine(): void;
+
+    /**
+     *  Joins the current line with the one below it. Lines will be separated by a single space.
+     *  If there selection spans more than one line, all the lines are joined together.
+     */
+    joinLines(): void;
+
+    /** Removes one level of indent from the currently selected rows. */
+    outdentSelectedRows(): void;
+
+    /**
+     *  Sets the indentation level of all selected rows to values suggested by the
+     *  relevant grammars.
+     */
+    autoIndentSelectedRows(): void;
+
+    /**
+     *  Wraps the selected lines in comments if they aren't currently part of a comment.
+     *  Removes the comment if they are currently wrapped in a comment.
+     */
+    toggleLineComments(): void;
+
+    /** Cuts the selection until the end of the screen line. */
+    cutToEndOfLine(): void;
+
+    /** Cuts the selection until the end of the buffer line. */
+    cutToEndOfBufferLine(): void;
+
+    /** Copies the selection to the clipboard and then deletes it. */
+    cut(maintainClipboard?: boolean, fullLine?: boolean): void;
+
+    /** Copies the current selection to the clipboard. */
+    copy(maintainClipboard?: boolean, fullLine?: boolean): void;
+
+    /** Creates a fold containing the current selection. */
+    fold(): void;
+
+    /** If the selection spans multiple rows, indent all of them. */
+    indentSelectedRows(): void;
+
+    // Managing multiple selections
+    /** Moves the selection down one row. */
+    addSelectionBelow(): void;
+
+    /** Moves the selection up one row. */
+    addSelectionAbove(): void;
+
+    /**
+     *  Combines the given selection into this selection and then destroys the
+     *  given selection.
+     */
+    merge(otherSelection: Selection, options?: { preserveFolds?: boolean,
+        autoscroll?: boolean }): void;
+
+    // Comparing to other selections
+    /**
+     *  Compare this selection's buffer range to another selection's buffer range.
+     *  See Range::compare for more details.
+     */
+    compare(otherSelection: Selection): number;
+}
+
+/**
+ *  A singleton instance of this class available via atom.styles, which you can
+ *  use to globally query and observe the set of active style sheets.
+ */
+export interface StyleManager {
+    // Event Subscription
+    /** Invoke callback for all current and future style elements. */
+    observeStyleElements(callback: (styleElement: StyleElementObservedEvent) =>
+        void): Disposable;
+
+    /** Invoke callback when a style element is added. */
+    onDidAddStyleElement(callback: (styleElement: StyleElementObservedEvent) =>
+        void): Disposable;
+
+    /** Invoke callback when a style element is removed. */
+    onDidRemoveStyleElement(callback: (styleElement: HTMLStyleElement) => void): Disposable;
+
+    /** Invoke callback when an existing style element is updated. */
+    onDidUpdateStyleElement(callback: (styleElement: StyleElementObservedEvent) =>
+        void): Disposable;
+
+    // Reading Style Elements
+    /** Get all loaded style elements. */
+    getStyleElements(): HTMLStyleElement[];
+
+    // Paths
+    /** Get the path of the user style sheet in ~/.atom. */
+    getUserStyleSheetPath(): string;
+}
+
+/** Run a node script in a separate process. */
+export class Task {
+    // NOTE: this is actually the best we can do here with the REST parameter for
+    // this appearing in the middle of the parameter list, which isn't aligned with
+    // the ES6 spec. Maybe when they rewrite it in JavaScript this will change.
+    /** A helper method to easily launch and run a task once. */
+    // tslint:disable-next-line:no-any
+    static once(taskPath: string, ...args: any[]): Task;
+
+    /** Creates a task. You should probably use .once */
+    constructor(taskPath: string);
+
+    // NOTE: this is actually the best we can do here with the REST parameter
+    // for this appearing in the beginning of the parameter list, which isn't
+    // aligned with the ES6 spec.
+    /**
+     *  Starts the task.
+     *  Throws an error if this task has already been terminated or if sending a
+     *  message to the child process fails.
+     */
+    // tslint:disable-next-line:no-any
+    start(...args: any[]): void;
+
+    /**
+     *  Send message to the task.
+     *  Throws an error if this task has already been terminated or if sending a
+     *  message to the child process fails.
+     */
+    send(message: string): void;
+
+    /** Call a function when an event is emitted by the child process. */
+    // tslint:disable-next-line:no-any
+    on(eventName: string, callback: (param: any) => void): Disposable;
+
+    /**
+     *  Forcefully stop the running task.
+     *  No more events are emitted once this method is called.
+     */
+    terminate(): void;
+
+    /** Cancel the running task and emit an event if it was canceled. */
+    cancel(): boolean;
+}
+
+/**
+ *  A mutable text container with undo/redo support and the ability to
+ *  annotate logical regions in the text.
+ */
+export class TextBuffer {
+    /** The unique identifier for this buffer. */
+    id: string;
+
+    /** The number of retainers for the buffer. */
+    refcount: number;
+
+    /** Whether or not the bufffer has been destroyed. */
+    destroyed: boolean;
+
+    /** Create a new buffer backed by the given file path. */
+    static load(filePath: string, params?: BufferLoadOptions): Promise<TextBuffer>;
+
+    /**
+     *  Create a new buffer backed by the given file path. For better performance,
+     *  use TextBuffer.load instead.
+     */
+    static loadSync(filePath: string, params?: BufferLoadOptions): TextBuffer;
+
+    /**
+     *  Restore a TextBuffer based on an earlier state created using the
+     *  TextBuffer::serialize method.
+     */
+    static deserialize(params: object): Promise<TextBuffer>;
+
+    /** Create a new buffer with the given starting text. */
+    constructor(text: string);
+    /** Create a new buffer with the given params. */
+    constructor(params?: {
+        /** The initial string text of the buffer. */
+        text?: string
+        /**
+         *  A function that returns a Boolean indicating whether the buffer should
+         *  be destroyed if its file is deleted.
+         */
+        shouldDestroyOnFileDelete?(): boolean
+    });
+
+    /** Returns a plain javascript object representation of the TextBuffer. */
+    serialize(options?: { markerLayers?: boolean, history?: boolean }): object;
+
+    /** Returns the unique identifier for this buffer. */
+    getId(): string;
+
+    // Event Subscription
+    /**
+     *  Invoke the given callback synchronously before the content of the buffer
+     *  changes.
+     */
+    onWillChange(callback: (event: BufferChangingEvent) => void): Disposable;
+
+    /**
+     *  Invoke the given callback synchronously when the content of the buffer
+     *  changes. You should probably not be using this in packages.
+     */
+    onDidChange(callback: (event: BufferChangedEvent) => void): Disposable;
+
+    /**
+     *  Invoke the given callback synchronously when a transaction finishes with
+     *  a list of all the changes in the transaction.
+     */
+    onDidChangeText(callback: (event: BufferStoppedChangingEvent) => void): Disposable;
+
+    /**
+     *  Invoke the given callback asynchronously following one or more changes after
+     *  ::getStoppedChangingDelay milliseconds elapse without an additional change.
+     */
+    onDidStopChanging(callback: (event: BufferStoppedChangingEvent) => void):
+        Disposable;
+
+    /**
+     *  Invoke the given callback when the in-memory contents of the buffer become
+     *  in conflict with the contents of the file on disk.
+     */
+    onDidConflict(callback: () => void): Disposable;
+
+    /** Invoke the given callback if the value of ::isModified changes. */
+    onDidChangeModified(callback: (modified: boolean) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when all marker ::onDidChange observers have been
+     *  notified following a change to the buffer.
+     */
+    onDidUpdateMarkers(callback: () => void): Disposable;
+
+    onDidCreateMarker(callback: (marker: Marker) => void): Disposable;
+
+    /** Invoke the given callback when the value of ::getPath changes. */
+    onDidChangePath(callback: (path: string) => void): Disposable;
+
+    /** Invoke the given callback when the value of ::getEncoding changes. */
+    onDidChangeEncoding(callback: (encoding: string) => void): Disposable;
+
+    /**
+     *  Invoke the given callback before the buffer is saved to disk. If the
+     *  given callback returns a promise, then the buffer will not be saved until
+     *  the promise resolves.
+     */
+    onWillSave(callback: () => Promise<void>|void): Disposable;
+
+    /** Invoke the given callback after the buffer is saved to disk. */
+    onDidSave(callback: (event: FileSavedEvent) => void): Disposable;
+
+    /** Invoke the given callback after the file backing the buffer is deleted. */
+    onDidDelete(callback: () => void): Disposable;
+
+    /**
+     *  Invoke the given callback before the buffer is reloaded from the contents
+     *  of its file on disk.
+     */
+    onWillReload(callback: () => void): Disposable;
+
+    /**
+     *  Invoke the given callback after the buffer is reloaded from the contents
+     *  of its file on disk.
+     */
+    onDidReload(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the buffer is destroyed. */
+    onDidDestroy(callback: () => void): Disposable;
+
+    /** Invoke the given callback when there is an error in watching the file. */
+    onWillThrowWatchError(callback: (errorObject: HandleableErrorEvent) => void):
+        Disposable;
+
+    /**
+     *  Get the number of milliseconds that will elapse without a change before
+     *  ::onDidStopChanging observers are invoked following a change.
+     */
+    getStoppedChangingDelay(): number;
+
+    // File Details
+    /**
+     *  Determine if the in-memory contents of the buffer differ from its contents
+     *  on disk.
+     *  If the buffer is unsaved, always returns true unless the buffer is empty.
+     */
+    isModified(): boolean;
+
+    /**
+     *  Determine if the in-memory contents of the buffer conflict with the on-disk
+     *  contents of its associated file.
+     */
+    isInConflict(): boolean;
+
+    /** Get the path of the associated file. */
+    getPath(): string|undefined;
+
+    /** Set the path for the buffer's associated file. */
+    setPath(filePath: string): void;
+
+    /** Sets the character set encoding for this buffer. */
+    setEncoding(encoding: string): void;
+
+    /** Returns the string encoding of this buffer. */
+    getEncoding(): string;
+
+    /** Get the path of the associated file. */
+    getUri(): string;
+
+    // Reading Text
+    /** Determine whether the buffer is empty. */
+    isEmpty(): boolean;
+
+    /** Get the entire text of the buffer. */
+    getText(): string;
+
+    /** Get the text in a range. */
+    getTextInRange(range: RangeCompatible): string;
+
+    /** Get the text of all lines in the buffer, without their line endings. */
+    getLines(): string[];
+
+    /** Get the text of the last line of the buffer, without its line ending. */
+    getLastLine(): string;
+
+    /** Get the text of the line at the given row, without its line ending. */
+    lineForRow(row: number): string|undefined;
+
+    /** Get the line ending for the given 0-indexed row. */
+    lineEndingForRow(row: number): string|undefined;
+
+    /**
+     *  Get the length of the line for the given 0-indexed row, without its line
+     *  ending.
+     */
+    lineLengthForRow(row: number): number;
+
+    /** Determine if the given row contains only whitespace. */
+    isRowBlank(row: number): boolean;
+
+    /**
+     *  Given a row, find the first preceding row that's not blank.
+     *  Returns a number or null if there's no preceding non-blank row.
+     */
+    previousNonBlankRow(startRow: number): number|null;
+
+    /**
+     *  Given a row, find the next row that's not blank.
+     *  Returns a number or null if there's no next non-blank row.
+     */
+    nextNonBlankRow(startRow: number): number|null;
+
+    // Mutating Text
+    /** Replace the entire contents of the buffer with the given text. */
+    setText(text: string): Range;
+
+    /**
+     *  Replace the current buffer contents by applying a diff based on the
+     *  given text.
+     */
+    setTextViaDiff(text: string): void;
+
+    /** Set the text in the given range. */
+    setTextInRange(range: RangeCompatible, text: string, options?:
+        { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+
+    /** Insert text at the given position. */
+    insert(position: PointCompatible, text: string, options?:
+        { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+
+    /** Append text to the end of the buffer. */
+    append(text: string, options?: { normalizeLineEndings?: boolean, undo?:
+        "skip" }): Range;
+
+    /** Delete the text in the given range. */
+    delete(range: RangeCompatible): Range;
+
+    /** Delete the line associated with a specified row. */
+    deleteRow(row: number): Range;
+
+    /** Delete the lines associated with the specified row range. */
+    deleteRows(startRow: number, endRow: number): Range;
+
+    // Markers
+    /** Create a layer to contain a set of related markers. */
+    addMarkerLayer(options?: { maintainHistory?: boolean, persistent?: boolean }):
+        MarkerLayer;
+
+    /**
+     *  Get a MarkerLayer by id.
+     *  Returns a MarkerLayer or `` if no layer exists with the given id.
+     */
+    getMarkerLayer(id: string): MarkerLayer|undefined;
+
+    /** Get the default MarkerLayer. */
+    getDefaultMarkerLayer(): MarkerLayer;
+
+    /** Create a marker with the given range in the default marker layer. */
+    markRange(range: RangeCompatible, properties?: { reversed?: boolean,
+        invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+        exclusive?: boolean }): Marker;
+
+    /** Create a marker at the given position with no tail in the default marker layer. */
+    markPosition(position: PointCompatible, options?: { invalidate?: "never"|"surround"
+        |"overlap"|"inside"|"touch", exclusive?: boolean }): Marker;
+
+    /** Get all existing markers on the default marker layer. */
+    getMarkers(): Marker[];
+
+    /** Get an existing marker by its id from the default marker layer. */
+    getMarker(id: number): Marker;
+
+    /** Find markers conforming to the given parameters in the default marker layer. */
+    findMarkers(params: FindMarkerOptions): Marker[];
+
+    /** Get the number of markers in the default marker layer. */
+    getMarkerCount(): number;
+
+    // History
+    /** Undo the last operation. If a transaction is in progress, aborts it. */
+    undo(): boolean;
+
+    /** Redo the last operation. */
+    redo(): boolean;
+
+    /** Batch multiple operations as a single undo/redo step. */
+    transact<T>(groupingInterval: number, fn: () => T): T;
+    transact<T>(fn: () => T): T;
+
+    /**
+     *  Call within a transaction to terminate the function's execution and
+     *  revert any changes performed up to the abortion.
+     */
+    abortTransaction(): void;
+
+    /**
+     *  Clear the undo stack. When calling this method within a transaction,
+     *  the ::onDidChangeText event will not be triggered because the information
+     *  describing the changes is lost.
+     */
+    clearUndoStack(): void;
+
+    /**
+     *  Create a pointer to the current state of the buffer for use with
+     *  ::revertToCheckpoint and ::groupChangesSinceCheckpoint.
+     */
+    createCheckpoint(): number;
+
+    /**
+     *  Revert the buffer to the state it was in when the given checkpoint was created.
+     *  Returns a boolean indicating whether the operation succeeded.
+     */
+    revertToCheckpoint(checkpoint: number): boolean;
+
+    /**
+     *  Group all changes since the given checkpoint into a single transaction for
+     *  purposes of undo/redo.
+     *  Returns a boolean indicating whether the operation succeeded.
+     */
+    groupChangesSinceCheckpoint(checkpoint: number): boolean;
+
+    /**
+     *  Returns a list of changes since the given checkpoint.
+     *  If the given checkpoint is no longer present in the undo history, this method
+     *  will return an empty Array.
+     */
+    getChangesSinceCheckpoint(checkpoint: number): Array<{
+        /** A Point representing where the change started. */
+        start: Point,
+
+        /** A Point representing the replaced extent. */
+        oldExtent: Point,
+
+        /** A Point representing the replacement extent. */
+        newExtent: Point,
+
+        /** A String representing the replacement text. */
+        newText: string
+    }>;
+
+    // Search and Replace
+    /**
+     *  Scan regular expression matches in the entire buffer, calling the given
+     *  iterator function on each match.
+     */
+    scan(regex: RegExp, iterator: (params: BufferScanResult) => void): void;
+    /**
+     *  Scan regular expression matches in the entire buffer, calling the given
+     *  iterator function on each match.
+     */
+    scan(regex: RegExp, options: ScanContextOptions, iterator: (params:
+        ContextualBufferScanResult) => void): void;
+
+    /**
+     *  Scan regular expression matches in the entire buffer in reverse order,
+     *  calling the given iterator function on each match.
+     */
+    backwardsScan(regex: RegExp, iterator: (params: BufferScanResult) => void): void;
+    /**
+     *  Scan regular expression matches in the entire buffer in reverse order,
+     *  calling the given iterator function on each match.
+     */
+    backwardsScan(regex: RegExp, options: ScanContextOptions, iterator: (params:
+        ContextualBufferScanResult) => void): void;
+
+    /**
+     *  Scan regular expression matches in a given range , calling the given
+     *  iterator function on each match.
+     */
+    scanInRange(regex: RegExp, range: RangeCompatible, iterator:
+        (params: BufferScanResult) => void): void;
+    /**
+     *  Scan regular expression matches in a given range , calling the given
+     *  iterator function on each match.
+     */
+    scanInRange(regex: RegExp, range: RangeCompatible, options: ScanContextOptions,
+        iterator: (params: ContextualBufferScanResult) => void): void;
+
+    /**
+     *  Scan regular expression matches in a given range in reverse order,
+     *  calling the given iterator function on each match.
+     */
+    backwardsScanInRange(regex: RegExp, range: RangeCompatible, iterator:
+        (params: BufferScanResult) => void): void;
+    /**
+     *  Scan regular expression matches in a given range in reverse order,
+     *  calling the given iterator function on each match.
+     */
+    backwardsScanInRange(regex: RegExp, range: RangeCompatible, options: ScanContextOptions,
+        iterator: (params: ContextualBufferScanResult) => void): void;
+
+    /** Replace all regular expression matches in the entire buffer. */
+    replace(regex: RegExp, replacementText: string): number;
+
+    // Buffer Range Details
+    /** Get the range spanning from [0, 0] to ::getEndPosition. */
+    getRange(): Range;
+
+    /** Get the number of lines in the buffer. */
+    getLineCount(): number;
+
+    /** Get the last 0-indexed row in the buffer. */
+    getLastRow(): number;
+
+    /** Get the first position in the buffer, which is always [0, 0]. */
+    getFirstPosition(): Point;
+
+    /** Get the maximal position in the buffer, where new text would be appended. */
+    getEndPosition(): Point;
+
+    /** Get the length of the buffer in characters. */
+    getMaxCharacterIndex(): number;
+
+    /** Get the range for the given row. */
+    rangeForRow(row: number, includeNewline: boolean): Range;
+
+    /**
+     *  Convert a position in the buffer in row/column coordinates to an absolute
+     *  character offset, inclusive of line ending characters.
+     */
+    characterIndexForPosition(position: Point|[number, number]): number;
+
+    /**
+     *  Convert an absolute character offset, inclusive of newlines, to a position
+     *  in the buffer in row/column coordinates.
+     */
+    positionForCharacterIndex(offset: number): Point;
+
+    /** Clip the given range so it starts and ends at valid positions. */
+    clipRange(range: RangeCompatible): Range;
+
+    /** Clip the given point so it is at a valid position in the buffer. */
+    clipPosition(position: PointCompatible): Point;
+
+    // Buffer Operations
+    /** Save the buffer. */
+    save(): Promise<void>;
+
+    /** Save the buffer at a specific path. */
+    saveAs(filePath: string): Promise<void>;
+
+    /** Reload the buffer's contents from disk. */
+    reload(): void;
+
+    /** Destroy the buffer, even if there are retainers for it. */
+    destroy(): void;
+
+    /** Returns whether or not this buffer is alive. */
+    isAlive(): boolean;
+
+    /** Returns whether or not this buffer has been destroyed. */
+    isDestroyed(): boolean;
+
+    /** Returns whether or not this buffer has a retainer. */
+    isRetained(): boolean;
+
+    /**
+     *  Places a retainer on the buffer, preventing its destruction until the
+     *  final retainer has called ::release().
+     */
+    retain(): TextBuffer;
+
+    /**
+     *  Releases a retainer on the buffer, destroying the buffer if there are
+     *  no additional retainers.
+     */
+    release(): TextBuffer;
+
+    /** Identifies if the buffer belongs to multiple editors. */
+    hasMultipleEditors(): boolean;
+}
+
+/** Handles loading and activating available themes. */
+export interface ThemeManager {
+    // Event Subscription
+    /**
+     *  Invoke callback when style sheet changes associated with updating the
+     *  list of active themes have completed.
+     */
+    onDidChangeActiveThemes(callback: () => void): Disposable;
+
+    // Accessing Loaded Themes
+    /** Returns an Array of strings of all the loaded theme names. */
+    getLoadedThemeNames(): string[]|undefined;
+
+    /** Returns an Array of all the loaded themes. */
+    getLoadedThemes(): Package[]|undefined;
+
+    // Accessing Active Themes
+    /** Returns an Array of strings all the active theme names. */
+    getActiveThemeNames(): string[]|undefined;
+
+    /** Returns an Array of all the active themes. */
+    getActiveThemes(): Package[]|undefined;
+
+    // Managing Enabled Themes
+    /** Get the enabled theme names from the config. */
+    getEnabledThemeNames(): string[];
+}
+
+// Events =====================================================================
+// The event objects that are passed into the callbacks which the user provides to
+// specific API calls.
+
+export interface AddedKeystrokeResolverEvent {
+    /**
+     *  The currently resolved keystroke string. If your function returns a falsy
+     *  value, this is how Atom will resolve your keystroke.
+     */
+    keystroke: string;
+
+    /**
+     *  The raw DOM 3 `KeyboardEvent` being resolved. See the DOM API documentation
+     *  for more details.
+     */
+    event: KeyboardEvent;
+
+    /** The OS-specific name of the current keyboard layout. */
+    layoutName: string;
+
+    /**
+     *  An object mapping DOM 3 `KeyboardEvent.code` values to objects with the
+     *  typed character for that key in each modifier state, based on the current
+     *  operating system layout.
+     */
+    keymap: object;
+}
+
+export interface BufferChangingEvent {
+    /** Range of the old text. */
+    oldRange: Range;
+}
+
+export interface BufferChangedEvent {
+    /**
+     *  An array of objects summarizing the aggregated changes that occurred
+     *  during the transaction.
+     */
+    changes: Array<{
+        /**
+         *  The Range of the deleted text in the contents of the buffer as it existed
+         *  before the batch of changes reported by this event.
+         */
+        oldRange: Range;
+
+        /** The Range of the inserted text in the current contents of the buffer. */
+        newRange: Range;
+    }>;
+
+    /** Range of the old text. */
+    oldRange: Range;
+
+    /** Range of the new text. */
+    newRange: Range;
+
+    /** String containing the text that was replaced. */
+    oldText: string;
+
+    /** String containing the text that was inserted. */
+    newText: string;
+}
+
+export interface BufferStoppedChangingEvent {
+    changes: TextChange[];
+}
+
+/**
+ *  This custom subclass of CustomEvent exists to provide the ::abortKeyBinding
+ *  method, as well as versions of the ::stopPropagation methods that record the
+ *  intent to stop propagation so event bubbling can be properly simulated for
+ *  detached elements.
+ */
+export interface CommandEvent<CurrentTarget extends EventTarget = EventTarget> extends CustomEvent {
+    keyBindingAborted: boolean;
+    propagationStopped: boolean;
+
+    abortKeyBinding(): void;
+    stopPropagation(): CustomEvent;
+    stopImmediatePropagation(): CustomEvent;
+    currentTarget: CurrentTarget;
+}
+
+export interface CursorPositionChangedEvent {
+    oldBufferPosition: Point;
+    oldScreenPosition: Point;
+    newBufferPosition: Point;
+    newScreenPosition: Point;
+    textChanged: boolean;
+    cursor:	Cursor;
+}
+
+export interface DecorationPropsChangedEvent {
+    /** Object the old parameters the decoration used to have. */
+    oldProperties: DecorationOptions;
+
+    /** Object the new parameters the decoration now has */
+    newProperties: DecorationOptions;
+}
+
+export interface DisplayMarkerChangedEvent {
+    /** Point representing the former head buffer position. */
+    oldHeadBufferPosition: Point;
+
+    /** Point representing the new head buffer position. */
+    newHeadBufferPosition: Point;
+
+    // Point representing the former tail buffer position. */
+    oldTailBufferPosition: Point;
+
+    /** Point representing the new tail buffer position. */
+    newTailBufferPosition: Point;
+
+    /** Point representing the former head screen position. */
+    oldHeadScreenPosition: Point;
+
+    /** Point representing the new head screen position. */
+    newHeadScreenPosition: Point;
+
+    /** Point representing the former tail screen position. */
+    oldTailScreenPosition: Point;
+
+    /** Point representing the new tail screen position. */
+    newTailScreenPosition: Point;
+
+    /** Boolean indicating whether the marker was valid before the change. */
+    wasValid: boolean;
+
+    /** Boolean indicating whether the marker is now valid. */
+    isValid: boolean;
+
+    /** Boolean indicating whether the marker had a tail before the change. */
+    hadTail: boolean;
+
+    /** Boolean indicating whether the marker now has a tail */
+    hasTail: boolean;
+
+    /**
+     *  -DEPRECATED- Object containing the marker's custom properties before the change.
+     *  @deprecated
+     */
+    oldProperties: object;
+
+    /**
+     *  -DEPRECATED- Object containing the marker's custom properties after the change.
+     *  @deprecated
+     */
+    newProperties: object;
+
+    /**
+     *  Boolean indicating whether this change was caused by a textual change to the
+     *  buffer or whether the marker was manipulated directly via its public API.
+     */
+    textChanged: boolean;
+}
+
+export interface EditorChangedEvent {
+    /** A Point representing where the change started. */
+    start: Point;
+
+    /** A Point representing the replaced extent. */
+    oldExtent: Point;
+
+    /** A Point representing the replacement extent. */
+    newExtent: Point;
+}
+
+export interface ExceptionThrownEvent {
+    originalError: Error;
+    message: string;
+    url: string;
+    line: number;
+    column: number;
+}
+
+export interface FailedKeybindingMatchEvent {
+    /** The string of keystrokes that failed to match the binding. */
+    keystrokes: string;
+
+    /** The DOM element that was the target of the most recent keyboard event. */
+    keyboardEventTarget: Element;
+}
+
+export interface FailedKeymapFileReadEvent {
+    /** The error message. */
+    message: string;
+
+    /** The error stack trace. */
+    stack: string;
+}
+
+export interface FileSavedEvent {
+    /** The path to which the buffer was saved. */
+    path: string;
+}
+
+export type FilesystemChangeEvent = Array<{
+    /** A string describing the filesystem action that occurred. */
+    action: "created"|"modified"|"deleted"|"renamed";
+
+    /** The absolute path to the filesystem entry that was acted upon. */
+    path: string;
+
+    /**
+     *  For rename events, a string containing the filesystem entry's former
+     *  absolute path.
+     */
+    oldPath?: string;
+}>;
+
+export interface FullKeybindingMatchEvent {
+  /** The string of keystrokes that matched the binding. */
+  keystrokes: string;
+
+  /** The KeyBinding that the keystrokes matched. */
+  binding: KeyBinding;
+
+  /** The DOM element that was the target of the most recent keyboard event. */
+  keyboardEventTarget: Element;
+}
+
+export interface HandleableErrorEvent {
+    /** The error object. */
+    error: Error;
+
+    /**
+     *  Call this function to indicate you have handled the error.
+     *  The error will not be thrown if this function is called.
+     */
+    handle(): void;
+}
+
+export interface KeymapLoadedEvent {
+    /** The path of the keymap file. */
+    path: string;
+}
+
+export interface MarkerChangedEvent {
+    /** Point representing the former head position. */
+    oldHeadPosition: Point;
+
+    /** Point representing the new head position. */
+    newHeadPosition: Point;
+
+    /** Point representing the former tail position. */
+    oldTailPosition: Point;
+
+    /** Point representing the new tail position. */
+    newTailPosition: Point;
+
+    /** Boolean indicating whether the marker was valid before the change. */
+    wasValid: boolean;
+
+    /** Boolean indicating whether the marker is now valid. */
+    isValid: boolean;
+
+    /** Boolean indicating whether the marker had a tail before the change. */
+    hadTail: boolean;
+
+    /** Boolean indicating whether the marker now has a tail. */
+    hasTail: boolean;
+
+    /**
+     *  -DEPRECATED- Object containing the marker's custom properties before the change.
+     *  @deprecated
+     */
+    oldProperties: object;
+
+    /**
+     *  -DEPRECATED- Object containing the marker's custom properties after the change.
+     *  @deprecated
+     */
+    newProperties: object;
+
+    /**
+     *  Boolean indicating whether this change was caused by a textual
+     *  change to the buffer or whether the marker was manipulated directly
+     *  via its public API.
+     */
+    textChanged: boolean;
+}
+
+export interface PaneItemObservedEvent {
+    item: object;
+    pane: Pane;
+    index: number;
+}
+
+export interface PaneListItemShiftedEvent {
+    /** The pane item that was added or removed. */
+    item: object;
+
+    /** A number indicating where the item is located. */
+    index: number;
+}
+
+export interface PaneItemMovedEvent {
+    /** The removed pane item. */
+    item: object;
+
+    /** A number indicating where the item was located. */
+    oldIndex: number;
+
+    /** A number indicating where the item is now located. */
+    newIndex: number;
+}
+
+export interface PaneItemOpenedEvent extends PaneItemObservedEvent {
+    uri: string;
+}
+
+export interface PartialKeybindingMatchEvent {
+    /** The string of keystrokes that matched the binding. */
+    keystrokes: string;
+
+    /** The KeyBindings that the keystrokes partially matched. */
+    partiallyMatchedBindings: KeyBinding[];
+
+    /** DOM element that was the target of the most recent keyboard event. */
+    keyboardEventTarget: Element;
+}
+
+export interface PathWatchErrorThrownEvent {
+    /** The error object. */
+    error: Error;
+
+    /**
+     *  Call this function to indicate you have handled the error.
+     *  The error will not be thrown if this function is called.
+     */
+    handle(): void;
+}
+
+export interface PreventableExceptionThrownEvent extends ExceptionThrownEvent {
+    preventDefault(): void;
+}
+
+export interface RepoStatusChangedEvent {
+    path: string;
+
+    /**
+     *  This value can be passed to ::isStatusModified or ::isStatusNew to get more
+     *  information.
+     */
+    pathStatus: number;
+}
+
+export interface SelectionChangedEvent {
+    oldBufferRange: Range;
+    oldScreenRange: Range;
+    newBufferRange: Range;
+    newScreenRange: Range;
+    selection: Selection;
+}
+
+export interface StyleElementObservedEvent extends HTMLStyleElement {
+    sourcePath: string;
+    context: string;
+}
+
+export interface TextEditorObservedEvent {
+    textEditor: TextEditor;
+    pane: Pane;
+    index: number;
+}
+
+// Extendables ================================================================
+// Interfaces which can be augmented in order to provide additional type
+// information under certain contexts.
+
+// NOTE: the config schema with these defaults can be found here:
+//   https://github.com/atom/atom/blob/v1.23.0/src/config-schema.js
+/**
+ *  Allows you to strongly type Atom configuration variables. Additional key:value
+ *  pairings merged into this interface will result in configuration values under
+ *  the value of each key being templated by the type of the associated value.
+ */
+export interface ConfigValues {
+    /**
+     *  List of glob patterns. Files and directories matching these patterns will be
+     *  ignored by some packages, such as the fuzzy finder and tree view. Individual
+     *  packages might have additional config settings for ignoring names.
+     */
+    "core.ignoredNames": string[];
+
+    /**
+     *  Files and directories ignored by the current project's VCS system will be ignored
+     *  by some packages, such as the fuzzy finder and find and replace. For example,
+     *  projects using Git have these paths defined in the .gitignore file. Individual
+     *  packages might have additional config settings for ignoring VCS ignored files and
+     *  folders.
+     */
+    "core.excludeVcsIgnoredPaths": boolean;
+
+    /**
+     *  Follow symbolic links when searching files and when opening files with the fuzzy
+     *  finder.
+     */
+    "core.followSymlinks": boolean;
+
+    /** List of names of installed packages which are not loaded at startup. */
+    "core.disabledPackages": string[];
+
+    /** List of names of installed packages which are not automatically updated. */
+    "core.versionPinnedPackages": string[];
+
+    /**
+     *  Associates scope names (e.g. "source.coffee") with arrays of file extensions
+     *  and file names (e.g. ["Cakefile", ".coffee2"]).
+     */
+    "core.customFileTypes": {
+        [key: string]: string[];
+    };
+
+    /** Names of UI and syntax themes which will be used when Atom starts. */
+    "core.themes": string[];
+
+    /**
+     *  Trigger the system's beep sound when certain actions cannot be executed or
+     *  there are no results.
+     */
+    "core.audioBeep": boolean;
+
+    /** Close corresponding editors when a file is deleted outside Atom. */
+    "core.closeDeletedFileTabs": boolean;
+
+    /** When the last tab of a pane is closed, remove that pane as well. */
+    "core.destroyEmptyPanes": boolean;
+
+    /**
+     *  When a window with no open tabs or panes is given the 'Close Tab' command,
+     *  close that window.
+     */
+    "core.closeEmptyWindows": boolean;
+
+    /** Default character set encoding to use when reading and writing files. */
+    "core.fileEncoding": FileEncoding;
+
+    /**
+     *  When checked opens an untitled editor when loading a blank environment (such as
+     *  with 'File > New Window' or when "Restore Previous Windows On Start" is unchecked);
+     *  otherwise, no editor is opened when loading a blank environment.
+     *  This setting has no effect when restoring a previous state.
+     */
+    "core.openEmptyEditorOnStart": boolean;
+
+    /**
+     *  When selected 'no', a blank environment is loaded. When selected 'yes' and Atom
+     *  is started from the icon or `atom` by itself from the command line, restores the
+     *  last state of all Atom windows; otherwise a blank environment is loaded. When
+     *  selected 'always', restores the last state of all Atom windows always, no matter
+     *  how Atom is started.
+     */
+    "core.restorePreviousWindowsOnStart": "no"|"yes"|"always";
+
+    /** How many recent projects to show in the Reopen Project menu. */
+    "core.reopenProjectMenuCount": number;
+
+    /** Automatically update Atom when a new release is available. */
+    "core.automaticallyUpdate": boolean;
+
+    /** Use detected proxy settings when calling the `apm` command-line tool. */
+    "core.useProxySettingsWhenCallingApm": boolean;
+
+    /**
+     *  Allow items to be previewed without adding them to a pane permanently, such as
+     *  when single clicking files in the tree view.
+     */
+    "core.allowPendingPaneItems": boolean;
+
+    /**
+     *  Allow usage statistics and exception reports to be sent to the Atom team to help
+     *  improve the product.
+     */
+    "core.telemetryConsent": "limited"|"no"|"undecided";
+
+    /** Warn before opening files larger than this number of megabytes. */
+    "core.warnOnLargeFileLimit": number;
+
+    /**
+     *  Choose the underlying implementation used to watch for filesystem changes. Emulating
+     *  changes will miss any events caused by applications other than Atom, but may help
+     *  prevent crashes or freezes.
+     */
+    "core.fileSystemWatcher": "native"|"atom";
+
+    "editor.commentStart": string|null;
+
+    "editor.commentEnd": string|null;
+
+    "editor.increaseIndentPattern": string|null;
+
+    "editor.decreaseIndentPattern": string|null;
+
+    "editor.foldEndPattern": string|null;
+
+    /** The name of the font family used for editor text. */
+    "editor.fontFamily": string;
+
+    /** Height in pixels of editor text. */
+    "editor.fontSize": number;
+
+    /** Height of editor lines, as a multiplier of font size. */
+    "editor.lineHeight": string|number;
+
+    /** Show cursor while there is a selection. */
+    "editor.showCursorOnSelection": boolean;
+
+    /** Render placeholders for invisible characters, such as tabs, spaces and newlines. */
+    "editor.showInvisibles": boolean;
+
+    /** Show indentation indicators in the editor. */
+    "editor.showIndentGuide": boolean;
+
+    /** Show line numbers in the editor's gutter. */
+    "editor.showLineNumbers": boolean;
+
+    /** Skip over tab-length runs of leading whitespace when moving the cursor. */
+    "editor.atomicSoftTabs": boolean;
+
+    /** Automatically indent the cursor when inserting a newline. */
+    "editor.autoIndent": boolean;
+
+    /** Automatically indent pasted text based on the indentation of the previous line. */
+    "editor.autoIndentOnPaste": boolean;
+
+    /** A string of non-word characters to define word boundaries. */
+    "editor.nonWordCharacters": string;
+
+    /**
+     *  Identifies the length of a line which is used when wrapping text with the
+     *  `Soft Wrap At Preferred Line Length` setting enabled, in number of characters.
+     */
+    "editor.preferredLineLength": number;
+
+    /**
+     * Defines the maximum width of the editor window before soft wrapping is enforced,
+     * in number of characters.
+     */
+    "editor.maxScreenLineLength": number;
+
+    /** Number of spaces used to represent a tab. */
+    "editor.tabLength": number;
+
+    /**
+     *  Wraps lines that exceed the width of the window. When `Soft Wrap At Preferred
+     *  Line Length` is set, it will wrap to the number of characters defined by the
+     *  `Preferred Line Length` setting.
+     */
+    "editor.softWrap": boolean;
+
+    /**
+     *  If the `Tab Type` config setting is set to "auto" and autodetection of tab type
+     *  from buffer content fails, then this config setting determines whether a soft tab
+     *  or a hard tab will be inserted when the Tab key is pressed.
+     */
+    "editor.softTabs": boolean;
+
+    /**
+     *  Determine character inserted when Tab key is pressed. Possible values: "auto",
+     *  "soft" and "hard". When set to "soft" or "hard", soft tabs (spaces) or hard tabs
+     *  (tab characters) are used. When set to "auto", the editor auto-detects the tab
+     *  type based on the contents of the buffer (it uses the first leading whitespace
+     *  on a non-comment line), or uses the value of the Soft Tabs config setting if
+     *  auto-detection fails.
+     */
+    "editor.tabType": "auto"|"soft"|"hard";
+
+    /**
+     *  Instead of wrapping lines to the window's width, wrap lines to the number of
+     *  characters defined by the `Preferred Line Length` setting. This will only take
+     *  effect when the soft wrap config setting is enabled globally or for the current
+     *  language.
+     *  **Note:** If you want to hide the wrap guide (the vertical line) you can disable
+     *  the `wrap-guide` package.
+     */
+    "editor.softWrapAtPreferredLineLength": boolean;
+
+    /**
+     *  When soft wrap is enabled, defines length of additional indentation applied to
+     *  wrapped lines, in number of characters.
+     */
+    "editor.softWrapHangingIndent": number;
+
+    /** Determines how fast the editor scrolls when using a mouse or trackpad. */
+    "editor.scrollSensitivity": number;
+
+    /** Allow the editor to be scrolled past the end of the last line. */
+    "editor.scrollPastEnd": boolean;
+
+    /**
+     *  Time interval in milliseconds within which text editing operations will be
+     *  grouped together in the undo history.
+     */
+    "editor.undoGroupingInterval": number;
+
+    /**
+     *  Show confirmation dialog when checking out the HEAD revision and discarding
+     *  changes to current file since last commit.
+     */
+    "editor.confirmCheckoutHeadRevision": boolean;
+
+    /**
+     *  A hash of characters Atom will use to render whitespace characters. Keys are
+     *  whitespace character types, values are rendered characters (use value false to
+     *  turn off individual whitespace character types).
+     */
+    "editor.invisibles": Invisibles;
+
+    /**
+     *  Change the editor font size when pressing the Ctrl key and scrolling the mouse
+     *  up/down.
+     */
+    "editor.zoomFontWhenCtrlScrolling": boolean;
+
+    // tslint:disable-next-line:no-any
+    [key: string]: any;
+}
+
+// Options ====================================================================
+// The option objects that the user is expected to fill out and provide to
+// specific API call.
+
+export interface BufferLoadOptions {
+    /** The file's encoding. */
+    encoding?: string;
+
+    /**
+     *  A function that returns a boolean indicating whether the buffer should
+     *  be destroyed if its file is deleted.
+     */
+    shouldDestroyOnFileDelete?(): boolean;
+}
+
+export interface BuildEnvironmentOptions {
+    /**
+     *  An object responsible for Atom's interaction with the browser process and host OS.
+     *  Use buildDefaultApplicationDelegate for a default instance.
+     */
+    applicationDelegate?: object;
+
+    /** A window global. */
+    window?: Window;
+
+    /** A document global. */
+    document?: Document;
+
+    /** A path to the configuration directory (usually ~/.atom). */
+    configDirPath?: string;
+
+    /**
+     *  A boolean indicating whether the Atom environment should save or load state
+     *  from the file system. You probably want this to be false.
+     */
+    enablePersistence?: boolean;
+}
+
+export interface ContextMenuOptions {
+    /** The menu item's label. */
+    label?: string;
+
+    /**
+     *  The command to invoke on the target of the right click that invoked the
+     *  context menu.
+     */
+    command?: string;
+
+    /**
+     *  Whether the menu item should be clickable. Disabled menu items typically
+     *  appear grayed out. Defaults to true.
+     */
+    enabled?: boolean;
+
+    /** An array of additional items. */
+    submenu?: ReadonlyArray<ContextMenuOptions>;
+
+    /**
+     *  If you want to create a separator, provide an item with type: 'separator'
+     *  and no other keys.
+     */
+    type?: "separator";
+
+    /** Whether the menu item should appear in the menu. Defaults to true. */
+    visible?: boolean;
+
+    /**
+     *  A function that is called on the item each time a context menu is created
+     *  via a right click.
+     */
+    created?(event: Event): void;
+
+    /**
+     *  A function that is called to determine whether to display this item on a
+     *  given context menu deployment.
+     */
+    shouldDisplay?(event: Event): void;
+}
+
+export interface CopyMarkerOptions {
+    /** Whether or not the marker should be tailed. */
+    tailed?: boolean;
+
+    /** Creates the marker in a reversed orientation. */
+    reversed?: boolean;
+
+    /** Determines the rules by which changes to the buffer invalidate the marker. */
+    invalidate?: "never"|"surround"|"overlap"|"inside"|"touch";
+
+    /**
+     *  Indicates whether insertions at the start or end of the marked range should
+     *  be interpreted as happening outside the marker.
+     */
+    exclusive?: boolean;
+
+    /** -DEPRECATED- Custom properties to be associated with the marker. */
+    properties?: object;
+}
+
+export interface DecorationLayerOptions extends SharedDecorationOptions {
+    /** One of several supported decoration types. */
+    type?: "line"|"line-number"|"highlight"|"block";
+}
+
+export interface DecorationOptions extends SharedDecorationOptions {
+    /** One of several supported decoration types. */
+    type?: "line"|"line-number"|"highlight"|"overlay"|"gutter"|"block";
+
+    /** The name of the gutter we're decorating, if type is "gutter". */
+    gutterName?: string;
+}
+
+export interface ErrorNotificationOptions extends NotificationOptions {
+    stack?: string;
+}
+
+export interface FindDisplayMarkerOptions {
+    /** Only include markers starting at this Point in buffer coordinates. */
+    startBufferPosition?: PointCompatible;
+
+    /** Only include markers ending at this Point in buffer coordinates. */
+    endBufferPosition?: PointCompatible;
+
+    /** Only include markers starting at this Point in screen coordinates. */
+    startScreenPosition?: PointCompatible;
+
+    /** Only include markers ending at this Point in screen coordinates. */
+    endScreenPosition?: PointCompatible;
+
+    /** Only include markers starting inside this Range in buffer coordinates. */
+    startsInBufferRange?: RangeCompatible;
+
+    /** Only include markers ending inside this Range in buffer coordinates. */
+    endsInBufferRange?: RangeCompatible;
+
+    /** Only include markers starting inside this Range in screen coordinates. */
+    startsInScreenRange?: RangeCompatible;
+
+    /** Only include markers ending inside this Range in screen coordinates. */
+    endsInScreenRange?: RangeCompatible;
+
+    /** Only include markers starting at this row in buffer coordinates. */
+    startBufferRow?: number;
+
+    /** Only include markers ending at this row in buffer coordinates. */
+    endBufferRow?: number;
+
+    /** Only include markers starting at this row in screen coordinates. */
+    startScreenRow?: number;
+
+    /** Only include markers ending at this row in screen coordinates. */
+    endScreenRow?: number;
+
+    /**
+     *  Only include markers intersecting this Array of [startRow, endRow] in
+     *  buffer coordinates.
+     */
+    intersectsBufferRowRange?: [number, number];
+
+    /**
+     *  Only include markers intersecting this Array of [startRow, endRow] in
+     *  screen coordinates.
+     */
+    intersectsScreenRowRange?: [number, number];
+
+    /** Only include markers containing this Range in buffer coordinates. */
+    containsBufferRange?: RangeCompatible;
+
+    /** Only include markers containing this Point in buffer coordinates. */
+    containsBufferPosition?: PointCompatible;
+
+    /** Only include markers contained in this Range in buffer coordinates. */
+    containedInBufferRange?: RangeCompatible;
+
+    /** Only include markers contained in this Range in screen coordinates. */
+    containedInScreenRange?: RangeCompatible;
+
+    /** Only include markers intersecting this Range in buffer coordinates. */
+    intersectsBufferRange?: RangeCompatible;
+
+    /** Only include markers intersecting this Range in screen coordinates. */
+    intersectsScreenRange?: RangeCompatible;
+}
+
+export interface FindMarkerOptions {
+    /** Only include markers that start at the given Point. */
+    startPosition?: PointCompatible;
+
+    /** Only include markers that end at the given Point. */
+    endPosition?: PointCompatible;
+
+    /** Only include markers that start inside the given Range. */
+    startsInRange?: RangeCompatible;
+
+    /** Only include markers that end inside the given Range. */
+    endsInRange?: RangeCompatible;
+
+    /** Only include markers that contain the given Point, inclusive. */
+    containsPoint?: PointCompatible;
+
+    /** Only include markers that contain the given Range, inclusive. */
+    containsRange?: RangeCompatible;
+
+    /** Only include markers that start at the given row number. */
+    startRow?: number;
+
+    /** Only include markers that end at the given row number. */
+    endRow?: number;
+
+    /** Only include markers that intersect the given row number. */
+    intersectsRow?: number;
+}
+
+export interface MenuOptions {
+    /** The menu itme's label. */
+    label: string;
+
+    /** An array of sub menus. */
+    submenu?: ReadonlyArray<MenuOptions>;
+
+    /** The command to trigger when the item is clicked. */
+    command?: string;
+}
+
+export interface NodeProcessOptions {
+    /** The command to execute. */
+    command: string;
+
+    /** The array of arguments to pass to the command. */
+    args?: ReadonlyArray<string>;
+
+    /** The options object to pass to Node's ChildProcess.spawn method. */
+    options?: SpawnProcessOptions;
+
+    /**
+     *  The callback that receives a single argument which contains the standard
+     *  output from the command.
+     */
+    stdout?(data: string): void;
+
+    /**
+     *  The callback that receives a single argument which contains the standard
+     *  error output from the command.
+     */
+    stderr?(data: string): void;
+
+    /** The callback which receives a single argument containing the exit status. */
+    exit?(code: number): void;
+}
+
+export interface NotificationOptions {
+    buttons?: Array<{
+        className?: string;
+        onDidClick?(event: MouseEvent): void;
+        text?: string;
+    }>;
+    description?: string;
+    detail?: string;
+    dismissable?: boolean;
+    icon?: string;
+}
+
+export interface ProcessOptions extends NodeProcessOptions {
+    /**
+     *  Whether the command will automatically start when this BufferedProcess is
+     *  created.
+     */
+    autoStart?: boolean;
+}
+
+export interface ScanContextOptions {
+    /** The number of lines before the matched line to include in the results object. */
+    leadingContextLineCount?: number;
+
+    /** The number of lines after the matched line to include in the results object. */
+    trailingContextLineCount?: number;
+}
+
+export interface SharedDecorationOptions {
+    /**
+     *  This CSS class will be applied to the decorated line number, line, highlight,
+     *  or overlay.
+     */
+    class?: string;
+
+    /**
+     *  An HTMLElement or a model Object with a corresponding view registered. Only
+     *  applicable to the gutter, overlay and block types.
+     */
+    item?: object;
+
+    /**
+     *  If true, the decoration will only be applied to the head of the DisplayMarker.
+     *  Only applicable to the line and line-number types.
+     */
+    onlyHead?: boolean;
+
+    /**
+     *  If true, the decoration will only be applied if the associated DisplayMarker
+     *  is empty. Only applicable to the gutter, line, and line-number types.
+     */
+    onlyEmpty?: boolean;
+
+    /**
+     *  If true, the decoration will only be applied if the associated DisplayMarker
+     *  is non-empty. Only applicable to the gutter, line, and line-number types.
+     */
+    onlyNonEmpty?: boolean;
+
+    /**
+     *  Only applicable to decorations of type overlay and block. Controls where the
+     *  view is positioned relative to the TextEditorMarker. Values can be
+     *  'head' (the default) or 'tail' for overlay decorations, and 'before' (the default)
+     *  or 'after' for block decorations.
+     */
+    position?: "head"|"tail"|"before"|"after";
+
+    /**
+     *  Only applicable to decorations of type overlay. Determines whether the decoration
+     *  adjusts its horizontal or vertical position to remain fully visible when it would
+     *  otherwise overflow the editor. Defaults to true.
+     */
+    avoidOverflow?: boolean;
+}
+
+export interface SpawnProcessOptions {
+    /** Current working directory of the child process. */
+    cwd?: string;
+
+    /** Environment key-value pairs. */
+    env?: { [key: string]: string };
+
+    /** The child's stdio configuration. */
+    stdio?: string|Array<string|number>;
+
+    /** Prepare child to run independently of its parent process. */
+    detached?: boolean;
+
+    /** Sets the user identity of the process. */
+    uid?: number;
+
+    /** Sets the group identity of the process. */
+    gid?: number;
+
+    /**
+     *  If true, runs command inside of a shell. Uses "/bin/sh" on UNIX, and process.env.ComSpec
+     *  on Windows. A different shell can be specified as a string.
+     */
+    shell?: boolean | string;
+}
+
+export interface TextInsertionOptions {
+    /** If true, selects the newly added text. */
+    select?: boolean;
+
+    /** If true, indents all inserted text appropriately. */
+    autoIndent?: boolean;
+
+    /** If true, indent newline appropriately. */
+    autoIndentNewline?: boolean;
+
+    /**
+     *  If true, decreases indent level appropriately (for example, when a closing
+     *  bracket is inserted).
+     */
+    autoDecreaseIndent?: boolean;
+
+    /**
+     *  By default, when pasting multiple lines, Atom attempts to preserve the relative
+     *  indent level between the first line and trailing lines, even if the indent
+     *  level of the first line has changed from the copied text. If this option is
+     *  true, this behavior is suppressed.
+     */
+    preserveTrailingLineIndentation?: boolean;
+
+    /** If true, all line endings will be normalized to match the editor's current mode. */
+    normalizeLineEndings?: boolean;
+
+    /** If skip, skips the undo stack for this operation. */
+    undo?: "skip";
+}
+
+/** The options for a Bootstrap 3 Tooltip class, which Atom uses a variant of. */
+export interface TooltipOptions {
+    /** Apply a CSS fade transition to the tooltip. */
+    animation?: boolean;
+
+    /** Appends the tooltip to a specific element. */
+    container?: string|HTMLElement|false;
+
+    /**
+     *  Delay showing and hiding the tooltip (ms) - does not apply to manual
+     *  trigger type.
+     */
+    delay?: number|{ show: number, hide: number };
+
+    /** Allow HTML in the tooltip. */
+    html?: boolean;
+
+    /** How to position the tooltip. */
+    placement?: "top"|"bottom"|"left"|"right"|"auto";
+
+    /**
+     *  If a selector is provided, tooltip objects will be delegated to the
+     *  specified targets.
+     */
+    selector?: string;
+
+    /** Base HTML to use when creating the tooltip. */
+    template?: string;
+
+    /**
+     *  Default title value if title attribute isn't present.
+     *  If a function is given, it will be called with its this reference set to
+     *  the element that the tooltip is attached to.
+     */
+    title?: string|HTMLElement|(() => string);
+
+    /**
+     *  How tooltip is triggered - click | hover | focus | manual.
+     *  You may pass multiple triggers; separate them with a space.
+     */
+    trigger?: string;
+}
+
+export interface WorkspaceOpenOptions {
+    /** A number indicating which row to move the cursor to initially. Defaults to 0. */
+    initialLine?: number;
+
+    /** A number indicating which column to move the cursor to initially. Defaults to 0. */
+    initialColumn?: number;
+
+    /**
+     *  Either 'left', 'right', 'up' or 'down'. If 'left', the item will be opened in
+     *  leftmost pane of the current active pane's row. If 'right', the item will be
+     *  opened in the rightmost pane of the current active pane's row. If only one pane
+     *  exists in the row, a new pane will be created. If 'up', the item will be opened
+     *  in topmost pane of the current active pane's column. If 'down', the item will be
+     *  opened in the bottommost pane of the current active pane's column. If only one pane
+     *  exists in the column, a new pane will be created.
+     */
+    split?: "left"|"right"|"up"|"down";
+
+    /**
+     *  A boolean indicating whether to call Pane::activate on containing pane.
+     *  Defaults to true.
+     */
+    activatePane?: boolean;
+
+    /**
+     *  A boolean indicating whether to call Pane::activateItem on containing pane.
+     *  Defaults to true.
+     */
+    activateItem?: boolean;
+
+    /**
+     *  A Boolean indicating whether or not the item should be opened in a pending state.
+     *  Existing pending items in a pane are replaced with new pending items when they
+     *  are opened.
+     */
+    pending?: boolean;
+
+    /**
+     *  A boolean. If true, the workspace will attempt to activate an existing item for
+     *  the given URI on any pane. If false, only the active pane will be searched for
+     *  an existing item for the same URI. Defaults to false.
+     */
+    searchAllPanes?: boolean;
+
+    /**
+     *  A String containing the name of the location in which this item should be opened.
+     *  If omitted, Atom will fall back to the last location in which a user has placed
+     *  an item with the same URI or, if this is a new URI, the default location specified
+     *  by the item.
+     *  NOTE: This option should almost always be omitted to honor user preference.
+     */
+    location?: "left"|"right"|"bottom"|"center";
+}
+
+export interface WorkspaceScanOptions {
+    /** An array of glob patterns to search within. */
+    paths?: ReadonlyArray<string>;
+
+    /** A function to be periodically called with the number of paths searched. */
+    onPathsSearched?(pathsSearched: number): void;
+
+    /** The number of lines before the matched line to include in the results object. */
+    leadingContextLineCount?: number;
+
+    /** The number of lines after the matched line to include in the results object. */
+    trailingContextLineCount?: number;
+}
+
+// Interfaces =================================================================
+// The requirements placed on object parameters for specific API calls.
+
+export interface Deserializer {
+    name: string;
+    deserialize(state: object): object;
+}
+
+export interface DisposableLike {
+    dispose(): void;
+}
+
+/** The types usable when constructing a point via the Point::fromObject method. */
+export type PointCompatible = PointLike|[number, number];
+
+/** The interface that should be implemented for all "point-compatible" objects. */
+export interface PointLike {
+    /** A zero-indexed number representing the row of the Point. */
+    row: number;
+
+    /** A zero-indexed number representing the column of the Point. */
+    column: number;
+}
+
+/** The types usable when constructing a range via the Range::fromObject method. */
+export type RangeCompatible =
+    | RangeLike
+    | [PointLike, PointLike]
+    | [PointLike, [number, number]]
+    | [[number, number], PointLike]
+    | [[number, number], [number, number]];
+
+/** The interface that should be implemented for all "range-compatible" objects. */
+export interface RangeLike {
+    /** A Point representing the start of the Range. */
+    start: PointLike;
+
+    /** A Point representing the end of the Range. */
+    end: PointLike;
+}
+
+/** An interface which all custom test runners should implement. */
+export type TestRunner = (params: TestRunnerParams) => Promise<number>;
+
+// Structures =================================================================
+// The structures that are passed to the user by Atom following specific API calls.
+
+export interface BufferScanResult {
+    buffer: TextBuffer;
+    lineText: string;
+    match: RegExpExecArray;
+    matchText: string;
+    range: Range;
+    replace(replacementText: string): void;
+    stop(): void;
+    stopped: boolean;
+}
+
+export interface CancellablePromise<T> extends Promise<T> {
+    cancel(): void;
+}
+
+export interface ContextualBufferScanResult extends BufferScanResult {
+    leadingContextLines: string[];
+    trailingContextLines: string[];
+}
+
+export type FileEncoding =
+    | "iso88596"       // Arabic (ISO 8859-6)
+    | "windows1256"    // Arabic (Windows 1256)
+    | "iso88594"       // Baltic (ISO 8859-4)
+    | "windows1257"    // Baltic (Windows 1257)
+    | "iso885914"      // Celtic (ISO 8859-14)
+    | "iso88592"       // Central European (ISO 8859-2)
+    | "windows1250"    // Central European (Windows 1250)
+    | "gb18030"        // Chinese (GB18030)
+    | "gbk"            // Chinese (GBK)
+    | "cp950"          // Traditional Chinese (Big5)
+    | "big5hkscs"      // Traditional Chinese (Big5-HKSCS)
+    | "cp866"          // Cyrillic (CP 866)
+    | "iso88595"       // Cyrillic (ISO 8859-5)
+    | "koi8r"          // Cyrillic (KOI8-R)
+    | "koi8u"          // Cyrillic (KOI8-U)
+    | "windows1251"    // Cyrillic (Windows 1251)
+    | "cp437"          // DOS (CP 437)
+    | "cp850"          // DOS (CP 850)
+    | "iso885913"      // Estonian (ISO 8859-13)
+    | "iso88597"       // Greek (ISO 8859-7)
+    | "windows1253"    // Greek (Windows 1253)
+    | "iso88598"       // Hebrew (ISO 8859-8)
+    | "windows1255"    // Hebrew (Windows 1255)
+    | "cp932"          // Japanese (CP 932)
+    | "eucjp"          // Japanese (EUC-JP)
+    | "shiftjis"       // Japanese (Shift JIS)
+    | "euckr"          // Korean (EUC-KR)
+    | "iso885910"      // Nordic (ISO 8859-10)
+    | "iso885916"      // Romanian (ISO 8859-16)
+    | "iso88599"       // Turkish (ISO 8859-9)
+    | "windows1254"    // Turkish (Windows 1254)
+    | "utf8"           // Unicode (UTF-8)
+    | "utf16le"        // Unicode (UTF-16 LE)
+    | "utf16be"        // Unicode (UTF-16 BE)
+    | "windows1258"    // Vietnamese (Windows 1258)
+    | "iso88591"       // Western (ISO 8859-1)
+    | "iso88593"       // Western (ISO 8859-3)
+    | "iso885915"      // Western (ISO 8859-15)
+    | "macroman"       // Western (Mac Roman)
+    | "windows1252";   // Western (Windows 1252)
+
+export interface GrammarRule {
+    // https://github.com/atom/first-mate/blob/v7.0.7/src/rule.coffee
+    // This is private. Don't go down the rabbit hole.
+    rule: object;
+    scopeName: string;
+    contentScopeName: string;
+}
+
+export interface GrammarToken {
+    value: string;
+    scopes: string[];
+}
+
+export interface Invisibles {
+    /**
+     *  Character used to render newline characters (\n) when the `Show Invisibles`
+     *  setting is enabled.
+     */
+    eol?: boolean|string;
+
+    /**
+     *  Character used to render leading and trailing space characters when the
+     *  `Show Invisibles` setting is enabled.
+     */
+    space?: boolean|string;
+
+    /**
+     *  Character used to render hard tab characters (\t) when the `Show Invisibles`
+     *  setting is enabled.
+     */
+    tab?: boolean|string;
+
+    /**
+     *  Character used to render carriage return characters (for Microsoft-style line
+     *  endings) when the `Show Invisibles` setting is enabled.
+     */
+    cr?: boolean|string;
+}
+
+export interface KeyBinding {
+    // Properties
+    enabled: boolean;
+    source: string;
+    command: string;
+    keystrokes: string;
+    keystrokeArray: string[];
+    keystrokeCount: number;
+    selector: string;
+    specificity: number;
+
+    // Comparison
+    /** Determines whether the given keystroke matches any contained within this binding. */
+    matches(keystroke: string): boolean;
+
+    /**
+     *  Compare another KeyBinding to this instance.
+     *  Returns <= -1 if the argument is considered lesser or of lower priority.
+     *  Returns 0 if this binding is equivalent to the argument.
+     *  Returns >= 1 if the argument is considered greater or of higher priority.
+     */
+    compare(other: KeyBinding): number;
+}
+
+export interface ProjectHistory {
+    paths: string[];
+    lastOpened: Date;
+}
+
+export interface ScandalResult {
+    filePath: string;
+    matches: Array<{
+        matchText: string;
+        lineText: string;
+        lineTextOffset: number;
+        range: [[number, number], [number, number]];
+        leadingContextLines: string[];
+        trailingContextLines: string[];
+    }>;
+}
+
+export interface TestRunnerParams {
+    /** An array of paths to tests to run. Could be paths to files or directories. */
+    testPaths: string[];
+
+    /**
+     *  A function that can be called to construct an instance of the atom global.
+     *  No atom global will be explicitly assigned, but you can assign one in your
+     *  runner if desired.
+     */
+    buildAtomEnvironment(options: BuildEnvironmentOptions): AtomEnvironment;
+
+    /**
+     *  A function that builds a default instance of the application delegate, suitable
+     *  to be passed as the applicationDelegate parameter to buildAtomEnvironment.
+     */
+    buildDefaultApplicationDelegate(): object;
+
+    /** An optional path to a log file to which test output should be logged. */
+    logFile: string;
+
+    /**
+     *  A boolean indicating whether or not the tests are being run from the command
+     *  line via atom --test.
+     */
+    headless: boolean;
+}
+
+export interface TextChange {
+    newExtent: Point;
+    oldExtent: Point;
+    newRange: Range;
+    oldRange: Range;
+    newText: string;
+    oldText: string;
+    start: Point;
+}
+
+/** Result returned by `Grammar.tokenizeLine`. */
+export interface TokenizeLineResult {
+    /** The string of text that was tokenized. */
+    line: string;
+
+    /**
+     *  An array of integer scope ids and strings. Positive ids indicate the
+     *  beginning of a scope, and negative tags indicate the end. To resolve ids
+     *  to scope names, call GrammarRegistry::scopeForId with the absolute
+     *  value of the id.
+     */
+    tags: Array<number|string>;
+
+    /**
+     *  This is a dynamic property. Invoking it will incur additional overhead,
+     *  but will automatically translate the `tags` into token objects with `value`
+     *  and `scopes` properties.
+     */
+    tokens: GrammarToken[];
+
+    /**
+     *  An array of rules representing the tokenized state at the end of the line.
+     *  These should be passed back into this method when tokenizing the next line
+     *  in the file.
+     */
+    ruleStack: GrammarRule[];
+}
+
+/**
+ *  This tooltip class is derived from Bootstrap 3, but modified to not require
+ *  jQuery, which is an expensive dependency we want to eliminate.
+ */
+export interface Tooltip {
+    options: TooltipOptions;
+    enabled: boolean;
+    timeout: number;
+    hoverState: "in"|"out"|null;
+    element: JQuery|HTMLElement;
+
+    getTitle(): string;
+    getTooltipElement(): HTMLElement;
+    getArrowElement(): HTMLElement;
+    enable(): void;
+    disable(): void;
+    toggleEnabled(): void;
+    toggle(): void;
+    recalculatePosition(): void;
+}
+
+export interface ViewModel {
+    getTitle: () => string;
+}
+
+export interface WindowLoadSettings {
+    appVersion: string;
+    atomHome: string;
+    devMode: boolean;
+    resourcePath: string;
+    safeMode: boolean;
+    env?: { [key: string]: string|undefined };
+    profileStartup?: boolean;
+}
diff --git a/types/atom/linter/config.d.ts b/types/atom/linter/config.d.ts
new file mode 100644
index 0000000000..c70728fff5
--- /dev/null
+++ b/types/atom/linter/config.d.ts
@@ -0,0 +1,26 @@
+import "../index";
+
+declare module "atom" {
+    interface ConfigValues {
+        /** Lint tabs while they are still in preview status. */
+        "linter.lintPreviewTabs": boolean;
+
+        /** Lint files automatically when they are opened. */
+        "linter.lintOnOpen": boolean;
+
+        /**
+         *  Lint files while typing, without the need to save (only for supported
+         *  providers).
+         */
+        "linter.lintOnChange": boolean;
+
+        /** Interval at which linting is done as you type (in ms). */
+        "linter.lintOnChangeInterval": number;
+
+        /** Ignore files matching this Glob. */
+        "linter.ignoreGlob": string;
+
+        /** Disabled providers. */
+        "linter.disabledProviders": string[];
+    }
+}
diff --git a/types/atom/linter/index.d.ts b/types/atom/linter/index.d.ts
new file mode 100644
index 0000000000..bf085d9859
--- /dev/null
+++ b/types/atom/linter/index.d.ts
@@ -0,0 +1,82 @@
+// Linter 2.x
+// https://atom.io/packages/linter
+
+/// <reference path="./config.d.ts" />
+
+import { Disposable, Point, Range, TextEditor } from "../index";
+
+export interface ReplacementSolution {
+    title?: string;
+    position: Range;
+    priority?: number;
+    currentText?: string;
+    replaceWith: string;
+}
+
+export interface CallbackSolution {
+    title?: string;
+    position: Range;
+    priority?: number;
+    // tslint:disable-next-line:no-any
+    apply(): any;
+}
+
+export interface Message {
+    /** The location of the issue (aka where to highlight). */
+    location: {
+        /** The path to the file to which the message applies. */
+        file: string;
+
+        /** The range of the message in the editor. */
+        position: Range;
+    };
+
+    /** A reference to a different location in the editor. */
+    reference?: {
+        /** The path to the file being referenced. */
+        file: string;
+
+        /** The point being referenced in that file. */
+        position?: Point;
+    };
+
+    /** An HTTP link to a resource explaining the issue. Default is a google search. */
+    url?: string;
+
+    /** The name of the octicon to show in the gutter. */
+    icon?: string;
+
+    /** The text for the message. */
+    excerpt: string;
+
+    /** The severity level for the message. */
+    severity: "error"|"warning"|"info";
+
+    /** Possible solutions (which the user can invoke at will). */
+    solutions?: Array<ReplacementSolution|CallbackSolution>;
+
+    /**
+     *  Markdown long description of the error. Accepts a callback so that you can
+     *  do things like HTTP requests.
+     */
+    description?: string|(() => Promise<string>|string);
+}
+
+export interface IndieDelegate {
+    name: string;
+    getMessages(): Message[];
+    clearMessages(): void;
+    setMessages(filePath: string, messages: Message[]): void;
+    setAllMessages(messages: Message[]): void;
+    onDidUpdate(callback: () => void): Disposable;
+    onDidDestroy(callback: () => void): Disposable;
+    dispose(): void;
+}
+
+export interface LinterProvider {
+    name: string;
+    scope: "file"|"project";
+    lintsOnChange: boolean;
+    grammarScopes: string[];
+    lint(textEditor: TextEditor): Message[]|void|Promise<Message[]|undefined>;
+}
diff --git a/types/atom/services/index.d.ts b/types/atom/services/index.d.ts
deleted file mode 100644
index 33b85ff511..0000000000
--- a/types/atom/services/index.d.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-/* tslint:disable:no-unnecessary-qualifier */
-declare namespace Atom {
-	namespace Services {
-		/** Type definitions for autocomplete+ 2 */
-		namespace Autocomplete {
-			/** Objects that appear as parameters to callbacks. */
-			namespace Events {
-				/** The parameters passed into getSuggestions by Autocomplete+. */
-				interface SuggestionsRequested {
-					/** The current TextEditor. */
-					editor: Atom.TextEditor;
-
-					/** The position of the cursor. */
-					bufferPosition: Atom.Point;
-
-					/** The scope descriptor for the current cursor position. */
-					scopeDescriptor: Atom.ScopeDescriptor;
-
-					/** The prefix for the word immediately preceding the current cursor position. */
-					prefix: string;
-
-					/** Whether the autocomplete request was initiated by the user. */
-					activatedManually: boolean;
-				}
-
-				/** The parameters passed into onDidInsertSuggestion by Autocomplete+. */
-				interface SuggestionInserted {
-					editor: Atom.TextEditor;
-					triggerPosition: Atom.Point;
-					suggestion: TextSuggestion|SnippetSuggestion;
-				}
-			}
-
-			/** An autocompletion suggestion for the user.
-			 *  Primary data type for the Atom Autocomplete+ service.
-			 */
-			interface Suggestion {
-				/** A string that will show in the UI for this suggestion.
-				 *  When not set, snippet || text is displayed.
-				 */
-				displayText?: string;
-
-				/** The text immediately preceding the cursor, which will be replaced by the text.
-				 *  If not provided, the prefix passed into getSuggestions will be used.
-				 */
-				replacementPrefix?: string;
-
-				/** The suggestion type. It will be converted into an icon shown against the suggestion. */
-				type?: string;
-
-				/** This is shown before the suggestion. Useful for return values. */
-				leftLabel?: string;
-
-				/** Use this instead of leftLabel if you want to use html for the left label. */
-				leftLabelHTML?: string;
-
-				/** An indicator (e.g. function, variable) denoting the "kind" of suggestion this represents. */
-				rightLabel?: string;
-
-				/** Use this instead of rightLabel if you want to use html for the right label. */
-				rightLabelHTML?: string;
-
-				/** Class name for the suggestion in the suggestion list. Allows you to style your suggestion
-				 *  via CSS, if desired.
-				 */
-				className?: string;
-
-				/** If you want complete control over the icon shown against the suggestion. e.g. iconHTML:
-				 *  <i class="icon-move-right"></i>
-				 */
-				iconHTML?: string;
-
-				/** A doc-string summary or short description of the suggestion. When specified, it will be
-				 *  displayed at the bottom of the suggestions list.
-				 */
-				description?: string;
-
-				/** A url to the documentation or more information about this suggestion. When specified,
-				 *  a More.. link will be displayed in the description area.
-				 */
-				descriptionMoreURL?: string;
-			}
-
-			interface TextSuggestion extends Suggestion {
-				/** The text which will be inserted into the editor, in place of the prefix. */
-				text: string;
-			}
-
-			interface SnippetSuggestion extends Suggestion {
-				/** A snippet string. This will allow users to tab through function arguments or other
-				 *  options.
-				 */
-				snippet: string;
-			}
-
-			type Suggestions = Array<TextSuggestion|SnippetSuggestion>;
-
-			interface Provider {
-				/** Defines the scope selector(s) (can be comma-separated) for which your provider
-				 *  should receive suggestion requests.
-				 */
-				selector: string;
-
-				/** Is called when a suggestion request has been dispatched by autocomplete+ to your
-				 *  provider. Return an array of suggestions (if any) in the order you would like them
-				 *  displayed to the user. Returning a Promise of an array of suggestions is also
-				 *  supported.
-				 */
-				getSuggestions(params: Events.SuggestionsRequested): Suggestions|Promise<Suggestions>;
-
-				/** Defines the scope selector(s) (can be comma-separated) for which your provider
-				 *  should not be used.
-				 */
-				disableForSelector?: string;
-
-				/** A number to indicate its priority to be included in a suggestions request.
-				 *  The default provider has an inclusion priority of 0. Higher priority providers
-				 *  can suppress lower priority providers with excludeLowerPriority.
-				 */
-				inclusionPriority?: number;
-
-				/** Will not use lower priority providers when this provider is used. */
-				excludeLowerPriority?: boolean;
-
-				/** A number to determine the sort order of suggestions. The default provider has
-				 *  an suggestion priority of 1.
-				 */
-				suggestionPriority?: number;
-
-				/** Function that is called when a suggestion from your provider was inserted
-				 *  into the buffer.
-				 */
-				onDidInsertSuggestion?(params: Events.SuggestionInserted): void;
-
-				/** Will be called if your provider is being destroyed by autocomplete+ */
-				dispose?(): void;
-			}
-		}
-
-		/** Type definitions for status-bar 1.8 */
-		namespace StatusBar {
-			/** Objects that appear as parameters to functions. */
-			namespace Options {
-				interface AddTile {
-					/** A DOM element, a jQuery object, or a model object for which a view provider
-					 *  has been registered in the the view registry.
-					 */
-					item: object;
-
-					/** Determines the placement of the tile within the status bar. Lower priority
-					 *  will result in closer placement to the anchor.
-					 */
-					priority: number;
-				}
-			}
-
-			interface Tile {
-				/** Retrieve the priority that was assigned to the Tile when it was created. */
-				getPriority(): number;
-
-				/** Retrieve the Tile's item. */
-				getItem(): object;
-
-				/** Remove the Tile from the status bar. */
-				destroy(): void;
-			}
-
-			interface StatusBar {
-				/** Add a tile to the left side of the status bar. Lower priority tiles are placed
-				 *  further to the left.
-				 */
-				addLeftTile(options: Options.AddTile): Tile;
-
-				/** Add a tile to the right side of the status bar. Lower priority tiles are placed
-				 *  further to the right.
-				 */
-				addRightTile(options: Options.AddTile): Tile;
-
-				/** Retrieve all of the tiles on the left side of the status bar. */
-				getLeftTiles(): Tile[];
-
-				/** Retrieve all of the tiles on the right side of the status bar. */
-				getRightTiles(): Tile[];
-			}
-
-			type Consumer = (statusBar: StatusBar) => void;
-		}
-	}
-}
-/* tslint:enable:no-unnecessary-qualifier */
diff --git a/types/atom/status-bar/config.d.ts b/types/atom/status-bar/config.d.ts
new file mode 100644
index 0000000000..1561030a84
--- /dev/null
+++ b/types/atom/status-bar/config.d.ts
@@ -0,0 +1,23 @@
+import "../index";
+
+declare module "atom" {
+    interface ConfigValues {
+        /** Show status bar at the bottom of the workspace. */
+        "status-bar.isVisible": boolean;
+
+        /** Fit the status-bar to the window's full-width. */
+        "status-bar.fullWidth": boolean;
+
+        /**
+         *  Format for the cursor position status bar element, where %L is the line
+         *  number and %C is the column number.
+         */
+        "status-bar.cursorPositionFormat": string;
+
+        /**
+         *  Format for the selection count status bar element, where %L is the line
+         *  count and %C is the character count.
+         */
+        "status-bar.selectionCountFormat": string;
+    }
+}
diff --git a/types/atom/status-bar/index.d.ts b/types/atom/status-bar/index.d.ts
new file mode 100644
index 0000000000..3cc4a99a59
--- /dev/null
+++ b/types/atom/status-bar/index.d.ts
@@ -0,0 +1,49 @@
+// Status Bar 1.x
+// https://atom.io/packages/status-bar
+
+/// <reference path="./config.d.ts" />
+
+export interface AddTileOptions {
+    /**
+     *  A DOM element, a jQuery object, or a model object for which a view provider
+     *  has been registered in the the view registry.
+     */
+    item: object;
+
+    /**
+     *  Determines the placement of the tile within the status bar. Lower priority
+     *  will result in closer placement to the anchor.
+     */
+    priority: number;
+}
+
+export interface Tile {
+    /** Retrieve the priority that was assigned to the Tile when it was created. */
+    getPriority(): number;
+
+    /** Retrieve the Tile's item. */
+    getItem(): object;
+
+    /** Remove the Tile from the status bar. */
+    destroy(): void;
+}
+
+export interface StatusBar {
+    /**
+     *  Add a tile to the left side of the status bar. Lower priority tiles are placed
+     *  further to the left.
+     */
+    addLeftTile(options: AddTileOptions): Tile;
+
+    /**
+     *  Add a tile to the right side of the status bar. Lower priority tiles are placed
+     *  further to the right.
+     */
+    addRightTile(options: AddTileOptions): Tile;
+
+    /** Retrieve all of the tiles on the left side of the status bar. */
+    getLeftTiles(): Tile[];
+
+    /** Retrieve all of the tiles on the right side of the status bar. */
+    getRightTiles(): Tile[];
+}
diff --git a/types/atom/tsconfig.json b/types/atom/tsconfig.json
index 794b99eadc..a58ec7b74c 100644
--- a/types/atom/tsconfig.json
+++ b/types/atom/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,6 +20,8 @@
     "files": [
         "index.d.ts",
         "atom-tests.ts",
-        "services/index.d.ts"
+        "autocomplete-plus/index.d.ts",
+        "linter/index.d.ts",
+        "status-bar/index.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/atom/tslint.json b/types/atom/tslint.json
index adbd6dcf49..4c3e6e9036 100644
--- a/types/atom/tslint.json
+++ b/types/atom/tslint.json
@@ -1,38 +1,9 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Custom rules.
         "await-promise": [true, "CancellablePromise"],
-        "class-name": true,
-        "indent": [true, "tabs"],
-        "jsdoc-format": true,
+        "indent": [true, "spaces", 4],
         "max-line-length": [true, 100],
-        "quotemark": [true, "double", "avoid-escape"],
-        "trailing-comma": [true, {
-            "multiline": { "objects": "always", "arrays": "always", "functions": "never" },
-            "singleline": { "objects": "never", "arrays": "never", "functions": "never" }
-        }],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-separator",
-            "check-type",
-            "check-typecast",
-            "check-rest-spread",
-            "check-preblock"
-        ],
-        // Soon to be defaults.
-        "arrow-return-shorthand": [true, "multiline"],
-        "no-any": true,
-        "no-floating-promises": true,
-        "no-unbound-method": true,
-        "no-unsafe-any": true,
-        "number-literal-format": true,
-        "restrict-plus-operands": true,
-        "return-undefined": true,
-        "switch-final-break": true
+        "no-any": true
     }
 }
diff --git a/types/atom/v0/api-docs.d.ts b/types/atom/v0/api-docs.d.ts
deleted file mode 100644
index 41ea32a277..0000000000
--- a/types/atom/v0/api-docs.d.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-// Type definitions for Atom API docs
-// Project: https://github.com/atom/atom/blob/master/build/tasks/docs-task.coffee
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
- How to generate.
- $ git clone git@github.com:atom/atom.git
- $ cd atom
- $ npm install
- $ cd build
- $ npm install
- $ grunt build-docs
- $ cd ../
- $ ls -la la docs/output/api.json
- api.json example https://gist.github.com/vvakame/10f8d2f3884affc32476
- */
-
-declare namespace AtomDocTypes {
-    interface Metadata {
-        classes: { [className: string]: ClassInfo; };
-    }
-
-    interface ClassInfo {
-        name: string;
-        superClass: string;
-        visibility: string;
-
-        filename: string;
-        srcUrl: string;
-        summary: string;
-        description: string;
-        examples: Example[];
-        sections: Section[];
-
-        classMethods: ClassMethod[];
-        classProperties: ClassProperty[];
-        instanceMethods: InstanceMethod[];
-        instanceProperties: InstanceProperty[];
-    }
-
-    interface Example {
-        description: string;
-        lang: string;
-        code: string;
-        raw: string;
-    }
-
-    interface Section {
-        name: string;
-        description: string;
-    }
-
-    interface ClassMethod {
-        name: string;
-        sectionName: string;
-        srcUrl: string;
-        visibility: string;
-        summary: string;
-        description: string;
-        arguments: Argument[];
-        returnValues: ReturnValue[];
-    }
-
-    interface ClassProperty {
-    }
-
-    interface InstanceMethod {
-        name: string;
-        sectionName: string;
-        srcUrl: string;
-        visibility: string;
-        summary: string;
-        description: string;
-        arguments: Argument[];
-        returnValues: ReturnValue[];
-        titledArguments: TitledArgument[];
-    }
-
-    interface InstanceProperty {
-        name: string;
-        sectionName: string;
-        srcUrl: string;
-        visibility: string;
-        summary: string;
-        description: string;
-    }
-
-    interface Argument {
-        name: string;
-        description: string;
-        type: string;
-        isOptional: boolean;
-        children: Argument[];
-    }
-
-    interface TitledArgument {
-        title: string;
-        description: string;
-        arguments: Argument[];
-    }
-
-    interface ReturnValue {
-        type: string;
-        description: string;
-    }
-}
diff --git a/types/atom/v0/atom-tests.ts b/types/atom/v0/atom-tests.ts
deleted file mode 100644
index 5987f4901d..0000000000
--- a/types/atom/v0/atom-tests.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import path = require("path");
-import _atom = require("atom");
-
-import PathWatcher = require("pathwatcher");
-var File = PathWatcher.File;
-
-const jq: JQuery = $("selector");
-
-class SampleView extends _atom.ScrollView {
-
-	editorId:string;
-	file:PathWatcher.IFile;
-	editor:AtomCore.IEditor;
-
-	static deserialize(state:any):SampleView {
-		return new SampleView(state);
-	}
-
-	static content():any {
-		return this.div({class: 'sample native-key-bindings', tabindex: -1});
-	}
-
-	constructor(params:{editorId?:string; filePath?:string;} = {}) {
-		super();
-
-		this.editorId = params.editorId;
-
-		if (this.editorId) {
-			this.resolveEditor(this.editorId);
-		} else {
-			this.file = new File(params.filePath);
-		}
-	}
-
-	serialize() {
-		return {
-			deserializer: 'SampleView',
-			editorId: this.editorId
-		};
-	}
-
-	destroy() {
-		this.unsubscribe();
-	}
-
-	resolveEditor(editorId:string) {
-		var resolve = ()=> {
-			if (this.editor) {
-				jq.trigger("title-changed");
-			} else {
-				var view = jq.parents('.pane').view();
-				if (view) {
-					view.destroyItem(this);
-				}
-			}
-		};
-
-		if (atom.workspace) {
-			resolve();
-		} else {
-			atom.packages.once("activated", ()=> {
-				resolve();
-			});
-		}
-	}
-}
-
-atom.deserializers.add(SampleView);
-
-export = SampleView;
diff --git a/types/atom/v0/index.d.ts b/types/atom/v0/index.d.ts
deleted file mode 100644
index 7dba05663c..0000000000
--- a/types/atom/v0/index.d.ts
+++ /dev/null
@@ -1,1977 +0,0 @@
-// Type definitions for Atom
-// Project: https://atom.io/
-// Definitions by: vvakame <https://github.com/vvakame>, smhxx <https://github.com/smhxx>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery" />
-/// <reference types="space-pen" />
-/// <reference types="emissary" />
-/// <reference types="pathwatcher/v0" />
-/// <reference types="text-buffer/v0" />
-/// <reference types="status-bar" />
-
-// Policy: this definition file only declare element related to `atom`.
-// if js file include to another npm package (e.g. "space-pen", "mixto" and "emissary").
-// you should create a separate file.
-
-// API documentation : https://atom.io/docs/api/v1.20.1
-
-interface Window {
-	atom: AtomCore.IAtom;
-	measure(description:string, fn:Function):any; // return fn result
-	profile(description:string, fn:Function):any; // return fn result
-}
-
-declare namespace AtomCore {
-
-	// https://atom.io/docs/v0.84.0/advanced/view-system
-	interface IWorkspaceViewStatic {
-		new ():IWorkspaceView;
-		version: number;
-		configDefaults:any;
-		content():any;
-	}
-
-	interface Decoration {
-		destroy(): void;
-	}
-
-	/**
-	 * Represents a buffer annotation that remains logically stationary even as the buffer changes. This is used
-	 * to represent cursors, folds, snippet targets, misspelled words, any anything else that needs to track a
-	 * logical location in the buffer over time.
-	 */
-	interface Marker {
-		/**
-		 * Destroys the marker, causing it to emit the 'destroyed' event. Once destroyed, a marker cannot be
-		 * restored by undo/redo operations.
-		 */
-		destroy(): void;
-
-		/**
-		 * Gets the screen range of the display marker.
-		 */
-		getScreenRange(): Range;
-	}
-
-	interface IWorkspaceView extends View {
-		// Delegator.includeInto(WorkspaceView);
-
-		// delegate to model property's property
-		fullScreen:boolean;
-
-		// delegate to model property's method
-		open(uri:string, options:any):Q.Promise<View>;
-		openSync(uri:string, options?:any):any;
-		saveActivePaneItem():any;
-		saveActivePaneItemAs():any;
-		saveAll():void;
-		destroyActivePaneItem():any;
-		destroyActivePane():any;
-		increaseFontSize():void;
-		decreaseFontSize():void;
-
-		// own property & methods
-		initialize(model:IWorkspace):any;
-		initialize(view:View, args:any):void; // do not use
-		model:IWorkspace;
-		panes: IPaneContainerView;
-		getModel():IWorkspace;
-		installShellCommands():any;
-		handleFocus():any;
-		afterAttach(onDom?:any):any;
-		confirmClose():boolean;
-		updateTitle():any;
-		setTitle(title:string):any;
-		getEditorViews():any[]; // atom.EditorView
-		prependToTop(element:any):any;
-		appendToTop(element:any):any;
-		prependToBottom(element:any):any;
-		appendToBottom(element:any):any;
-		prependToLeft(element:any):any;
-		appendToLeft(element:any):any;
-		prependToRight(element:any):any;
-		appendToRight(element:any):any;
-		getActivePaneView():IPaneView;
-		getActiveView():View;
-		focusPreviousPaneView():any;
-		focusNextPaneView():any;
-		focusPaneViewAbove():any;
-		focusPaneViewBelow():any;
-		focusPaneViewOnLeft():any;
-		focusPaneViewOnRight():any;
-		eachPaneView(callback:(paneView:IPaneView)=>any):{ off():any; };
-		getPaneViews():IPaneView[];
-		eachEditorView(callback:(editorView:any /* EditorView */)=>any):{ off():any; };
-		beforeRemove():any;
-
-		command(eventName:string, handler:Function):any;
-		command(eventName:string, selector:Function, handler:Function):any;
-		command(eventName:string, options:any, handler:Function):any;
-		command(eventName:string, selector:Function, options:any, handler:Function):any;
-
-		statusBar:StatusBar.IStatusBarView;
-	}
-
-	interface IPanes {
-		// TBD
-	}
-
-	interface IPaneView {
-		// TBD
-	}
-
-	interface IPaneContainerView {
-		// TBD
-	}
-
-	interface ITreeView {
-		// TBD
-	}
-
-	interface IGutterViewStatic {
-		new(): IGutterView;
-		content():any;
-	}
-
-	interface IGutterView extends View {
-		firstScreenRow:any;
-		lastScreenRow:any;
-		initialize():void;
-		initialize(view:View, args:any):void; // do not use
-		afterAttach(onDom?:any):any;
-		beforeRemove():any;
-		handleMouseEvents(e:JQueryMouseEventObject):any;
-		getEditorView():any; /* EditorView */
-		getEditor():IEditor;
-		getLineNumberElements():HTMLCollection;
-		getLineNumberElementsForClass(klass:string):NodeList;
-		getLineNumberElement(bufferRow:number):NodeList;
-		addClassToAllLines(klass:string):boolean;
-		removeClassFromAllLines(klass:string):boolean;
-		addClassToLine(bufferRow:number, klass:string):boolean;
-		removeClassFromLine(bufferRow:number, klass:string):boolean;
-		updateLineNumbers(changes:any[], startScreenRow?:number, endScreenRow?:number):any;
-		prependLineElements(lineElements:any):void;
-		appendLineElements(lineElements:any):void;
-		removeLineElements(numberOfElements:number):void;
-		buildLineElements(startScreenRow:any, endScreenRow:any):any;
-		buildLineElementsHtml(startScreenRow:any, endScreenRow:any):any;
-		updateFoldableClasses(changes:any[]):any;
-		removeLineHighlights():void;
-		addLineHighlight(row:number, emptySelection?:boolean):any;
-		highlightLines():boolean;
-	}
-
-	interface ICommandRegistry {
-		add(target: string, commandName: Object, callback?: (event: any) => void): any; // selector:'atom-editor'|'atom-workspace'
-		findCommands(params: Object): Object[];
-		dispatch(selector: any, name:string): void;
-	}
-
-	interface ICommandPanel {
-		// TBD
-	}
-
-	interface IDisplayBufferStatic {
-		new(_arg?:any):IDisplayBuffer;
-	}
-
-	interface IDisplayBuffer /* extends Theorist.Model */ {
-		// Serializable.includeInto(Editor);
-
-		constructor:IDisplayBufferStatic;
-
-		verticalScrollMargin:number;
-		horizontalScrollMargin:number;
-
-		declaredPropertyValues:any;
-		tokenizedBuffer: ITokenizedBuffer;
-		buffer: TextBuffer.ITextBuffer;
-		charWidthsByScope:any;
-		markers:{ [index:number]:IDisplayBufferMarker; };
-		foldsByMarkerId:any;
-		maxLineLength:number;
-		screenLines:ITokenizedLine[];
-		rowMap:any; // return type are RowMap
-		longestScreenRow:number;
-		subscriptions:Emissary.ISubscription[];
-		subscriptionsByObject:any; // return type are WeakMap
-		behaviors:any;
-		subscriptionCounts:any;
-		eventHandlersByEventName:any;
-		pendingChangeEvent:any;
-
-		softWrap:boolean;
-
-		serializeParams():{id:number; softWrap:boolean; editorWidthInChars: number; scrollTop: number; scrollLeft: number; tokenizedBuffer: any; };
-		deserializeParams(params:any):any;
-		copy():IDisplayBuffer;
-		updateAllScreenLines():any;
-		emitChanged(eventProperties:any, refreshMarkers?:boolean):any;
-		updateWrappedScreenLines():any;
-		setVisible(visible:any):any;
-		getVerticalScrollMargin():number;
-		setVerticalScrollMargin(verticalScrollMargin:number):number;
-		getHorizontalScrollMargin():number;
-		setHorizontalScrollMargin(horizontalScrollMargin:number):number;
-		getHeight():any;
-		setHeight(height:any):any;
-		getWidth():any;
-		setWidth(newWidth:any):any;
-		getScrollTop():number;
-		setScrollTop(scrollTop:number):number;
-		getScrollBottom():number;
-		setScrollBottom(scrollBottom:number):number;
-		getScrollLeft():number;
-		setScrollLeft(scrollLeft:number):number;
-		getScrollRight():number;
-		setScrollRight(scrollRight:number):number;
-		getLineHeight():any;
-		setLineHeight(lineHeight:any):any;
-		getDefaultCharWidth():any;
-		setDefaultCharWidth(defaultCharWidth:any):any;
-		getScopedCharWidth(scopeNames:any, char:any):any;
-		getScopedCharWidths(scopeNames:any):any;
-		setScopedCharWidth(scopeNames:any, char:any, width:any):any;
-		setScopedCharWidths(scopeNames:any, charWidths:any):any;
-		clearScopedCharWidths():any;
-		getScrollHeight():number;
-		getScrollWidth():number;
-		getVisibleRowRange():number[];
-		intersectsVisibleRowRange(startRow:any, endRow:any):any;
-		selectionIntersectsVisibleRowRange(selection:any):any;
-		scrollToScreenRange(screenRange:any):any;
-		scrollToScreenPosition(screenPosition:any):any;
-		scrollToBufferPosition(bufferPosition:any):any;
-		pixelRectForScreenRange(screenRange:TextBuffer.IRange):any;
-		getTabLength():number;
-		setTabLength(tabLength:number):any;
-		setSoftWrap(softWrap:boolean):boolean;
-		getSoftWrap():boolean;
-		setEditorWidthInChars(editorWidthInChars:number):any;
-		getEditorWidthInChars():number;
-		getSoftWrapColumn():number;
-		lineForRow(row:number):any;
-		linesForRows(startRow:number, endRow:number):any;
-		getLines():any[];
-		indentLevelForLine(line:any):any;
-		bufferRowsForScreenRows(startScreenRow:any, endScreenRow:any):any;
-		createFold(startRow:number, endRow:number):IFold;
-		isFoldedAtBufferRow(bufferRow:number):boolean;
-		isFoldedAtScreenRow(screenRow:number):boolean;
-		destroyFoldWithId(id:number):any;
-		unfoldBufferRow(bufferRow:number):any[];
-		largestFoldStartingAtBufferRow(bufferRow:number):any;
-		foldsStartingAtBufferRow(bufferRow:number):any;
-		largestFoldStartingAtScreenRow(screenRow:any):any;
-		largestFoldContainingBufferRow(bufferRow:any):any;
-		outermostFoldsInBufferRowRange(startRow:any, endRow:any):any[];
-		foldsContainingBufferRow(bufferRow:any):any[];
-		screenRowForBufferRow(bufferRow:number):number;
-		lastScreenRowForBufferRow(bufferRow:number):number;
-		bufferRowForScreenRow(screenRow:number):number;
-
-		screenRangeForBufferRange(bufferRange:TextBuffer.IPoint[]):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:TextBuffer.IRange):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: number[]; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: number[]}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: number[]; end: number[]}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: number[]}):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: number[]; end: {row:number; col:number;}}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:TextBuffer.IPoint[]):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:TextBuffer.IRange):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: number[]; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: number[]}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: number[]; end: number[]}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: number[]}):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: number[]; end: {row:number; col:number;}}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:TextBuffer.IPoint[], clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:TextBuffer.IRange, clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: number[]; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: number[]}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: number[]; end: number[]}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: number[]}, clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: number[]; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
-
-		pixelPositionForScreenPosition(screenPosition:TextBuffer.IPoint, clip?:boolean):TextBuffer.IPoint;
-		pixelPositionForScreenPosition(screenPosition:number[], clip?:boolean):TextBuffer.IPoint;
-		pixelPositionForScreenPosition(screenPosition:{row:number; col:number;}, clip?:boolean):TextBuffer.IPoint;
-
-		screenPositionForPixelPosition(pixelPosition:any):TextBuffer.IPoint;
-
-		pixelPositionForBufferPosition(bufferPosition:any):any;
-		getLineCount():number;
-		getLastRow():number;
-		getMaxLineLength():number;
-		screenPositionForBufferPosition(bufferPosition:any, options:any):any;
-		bufferPositionForScreenPosition(bufferPosition:any, options:any):any;
-		scopesForBufferPosition(bufferPosition:any):any;
-		bufferRangeForScopeAtPosition(selector:any, position:any):any;
-		tokenForBufferPosition(bufferPosition:any):any;
-		getGrammar():IGrammar;
-		setGrammar(grammar:IGrammar):any;
-		reloadGrammar():any;
-		clipScreenPosition(screenPosition:any, options:any):any;
-		findWrapColumn(line:any, softWrapColumn:any):any;
-		rangeForAllLines():TextBuffer.IRange;
-		getMarker(id:number):IDisplayBufferMarker;
-		getMarkers():IDisplayBufferMarker[];
-		getMarkerCount():number;
-		markScreenRange(range:TextBuffer.IRange, ...args:any[]):IDisplayBufferMarker;
-		markBufferRange(range:TextBuffer.IRange, options?:any):IDisplayBufferMarker;
-		markScreenPosition(screenPosition:TextBuffer.IPoint, options?:any):IDisplayBufferMarker;
-		markBufferPosition(bufferPosition:TextBuffer.IPoint, options?:any):IDisplayBufferMarker;
-		destroyMarker(id:number):any;
-		findMarker(params?:any):IDisplayBufferMarker;
-		findMarkers(params?:any):IDisplayBufferMarker[];
-		translateToBufferMarkerParams(params?:any):any;
-		findFoldMarker(attributes:any):IMarker;
-		findFoldMarkers(attributes:any):IMarker[];
-		getFoldMarkerAttributes(attributes?:any):any;
-		pauseMarkerObservers():any;
-		resumeMarkerObservers():any;
-		refreshMarkerScreenPositions():any;
-		destroy():any;
-		logLines(start:number, end:number):any[];
-		handleTokenizedBufferChange(tokenizedBufferChange:any):any;
-		updateScreenLines(startBufferRow:any, endBufferRow:any, bufferDelta?:number, options?:any):any;
-		buildScreenLines(startBufferRow:any, endBufferRow:any):any;
-		findMaxLineLength(startScreenRow:any, endScreenRow:any, newScreenLines:any):any;
-		handleBufferMarkersUpdated():any;
-		handleBufferMarkerCreated(marker:any):any;
-		createFoldForMarker(maker:any):IFold;
-		foldForMarker(marker:any):any;
-	}
-
-	interface IViewRegistry {
-		getView(selector:any):any;
-	}
-
-	interface ICursorStatic {
-		new (arg:{editor:IEditor; marker:IDisplayBufferMarker; id: number;}):ICursor;
-	}
-
-	interface ScopeDescriptor {
-		scopes: string[];
-	}
-
-	interface ICursor /* extends Theorist.Model */ {
-		getScopeDescriptor(): ScopeDescriptor;
-		screenPosition:any;
-		bufferPosition:any;
-		goalColumn:any;
-		visible:boolean;
-		needsAutoscroll:boolean;
-
-		editor:IEditor;
-		marker:IDisplayBufferMarker;
-		id: number;
-
-		destroy():any;
-		changePosition(options:any, fn:Function):any;
-		getPixelRect():any;
-		setScreenPosition(screenPosition:any, options?:any):any;
-		getScreenPosition():TextBuffer.IPoint;
-		getScreenRange():TextBuffer.IRange;
-		setBufferPosition(bufferPosition:any, options?:any):any;
-		getBufferPosition():TextBuffer.IPoint;
-		autoscroll():any;
-		updateVisibility():any;
-		setVisible(visible:boolean):any;
-		isVisible():boolean;
-		wordRegExp(arg?:any):any;
-		isLastCursor():boolean;
-		isSurroundedByWhitespace():boolean;
-		isBetweenWordAndNonWord():boolean;
-		isInsideWord():boolean;
-		clearAutoscroll():void;
-		clearSelection():void;
-		getScreenRow():number;
-		getScreenColumn():number;
-		getBufferRow():number;
-		getBufferColumn():number;
-		getCurrentBufferLine():string;
-		moveUp(rowCount:number, arg?:any):any;
-		moveDown(rowCount:number, arg?:any):any;
-		moveLeft(arg?:any):any;
-		moveRight(arg?:any):any;
-		moveToTop():any;
-		moveToBottom():void;
-		moveToBeginningOfScreenLine():void;
-		moveToBeginningOfLine():void;
-		moveToFirstCharacterOfLine():void;
-		moveToEndOfScreenLine():void;
-		moveToEndOfLine():void;
-		moveToBeginningOfWord():void;
-		moveToEndOfWord():void;
-		moveToBeginningOfNextWord():void;
-		moveToPreviousWordBoundary():void;
-		moveToNextWordBoundary():void;
-		getBeginningOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint;
-		getPreviousWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint;
-		getMoveNextWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint;
-		getEndOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint;
-		getBeginningOfNextWordBufferPosition(options?:any):TextBuffer.IPoint;
-		getCurrentWordBufferRange(options?:any):TextBuffer.IPoint;
-		getCurrentLineBufferRange(options?:any):TextBuffer.IPoint;
-		getCurrentParagraphBufferRange():any;
-		getCurrentWordPrefix():string;
-		isAtBeginningOfLine():boolean;
-		getIndentLevel():number;
-		isAtEndOfLine():boolean;
-		getScopes():string[];
-		hasPrecedingCharactersOnLine():boolean;
-		getMarker(): Marker;
-	}
-
-	interface ILanguageMode {
-		// TBD
-	}
-
-	interface ISelection {
-		// https://atom.io/docs/api/v1.7.3/Selection
-
-		// Event Subscription
-		onDidChangeRange(callback: (event: {
-			oldBufferRange: TextBuffer.IRange;
-			oldScreenRange: TextBuffer.IRange;
-			newBufferRange: TextBuffer.IRange;
-			newScreenRange: TextBuffer.IRange;
-			selection: ISelection;
-		}) => {}): Disposable;
-		onDidDestroy(callback: () => {}): Disposable;
-
-		// Managing the selection range
-		getScreenRange(): TextBuffer.IRange;
-		setScreenRange(screenRange: TextBuffer.IRange, options?: {
-			preserveFolds?: boolean;
-			autoscroll?: boolean;
-		}): void;
-		getBufferRange(): TextBuffer.IRange;
-		setBufferRange(bufferRange: TextBuffer.IRange, options?: {
-			preserveFolds?: boolean;
-			autoscroll?: boolean;
-		}): void;
-		getBufferRowRange(): [number];
-
-		// Info about the selection
-		isEmpty(): boolean;
-		isReversed(): boolean;
-		isSingleScreenLine(): boolean;
-		getText(): string;
-		intersectsBufferRange(bufferRange: TextBuffer.IRange): boolean;
-		intersectsWith(otherSelection: ISelection): boolean;
-
-		// Modifying the selected range
-		clear(options?: {autoscroll?: boolean}): void;
-		selectToScreenPosition(position: any): void;
-		selectToBufferPosition(position: any): void;
-		selectRight(columnCount?: number): void;
-		selectLeft(columnCount?: number): void;
-		selectUp(rowCount: number): void;
-		selectDown(rowCount: number): void;
-		selectToTop(): void;
-		selectToBottom(): void;
-		selectAll(): void;
-		selectToBeginningOfLine(): void;
-		selectToFirstCharacterOfLine(): void;
-		selectToEndOfLine(): void;
-		selectToEndOfBufferLine(): void;
-		selectToBeginningOfWord(): void;
-		selectToEndOfWord(): void;
-		selectToBeginningOfNextWord(): void;
-		selectToPreviousWordBoundary(): void;
-		selectToNextWordBoundary(): void;
-		selectToPreviousSubwordBoundary(): void;
-		selectToNextSubwordBoundary(): void;
-		selectToBeginningOfNextParagraph(): void;
-		selectToBeginningOfPreviousParagraph(): void;
-		selectWord(): TextBuffer.IRange;
-		expandOverWord(): void;
-		selectLine(row?: number): void;
-		expandOverLine(): void;
-
-		// Modifying the selected text
-		insertText(text: string, options?: {
-			select: boolean;
-			autoIndent: boolean;
-			autoIndentNewline: boolean;
-			autoDecreaseIndent: boolean;
-			normalizeLineEndings?: boolean;
-			undo?: 'skip';
-		}): void;
-		backspace(): void;
-		deleteToPreviousWordBoundary(): void;
-		deleteToNextWordBoundary(): void;
-		deleteToBeginningOfWord(): void;
-		deleteToBeginningOfLine(): void;
-		delete(): void;
-		deleteToEndOfLine(): void;
-		deleteToEndOfWord(): void;
-		deleteToBeginningOfSubword(): void;
-		deleteToEndOfSubword(): void;
-		deleteSelectedText(): void;
-		deleteLine(): void;
-		joinLines(): void;
-		outdentSelectedRows(): void;
-		autoIndentSelectedRows(): void;
-		toggleLineComments(): void;
-		cutToEndOfLine(): void;
-		cutToEndOfBufferLine(): void;
-		cut(maintainClipboard?: boolean, fullLine?: boolean): void;
-		copy(maintainClipboard?: boolean, fullLine?: boolean): void;
-		fold(): void;
-		indentSelectedRows(): void;
-
-		// Managing multiple selections
-		addSelectionBelow(): void;
-		addSelectionAbove(): void;
-		merge(otherSelection: ISelection, options?: {
-			preserveFolds?: boolean;
-			autoscroll?: boolean;
-		}): void;
-
-		// Comparing to other selections
-		compare(otherSelection: ISelection): any;
-	}
-
-	interface IDecorationParams {
-		id?: number;
-		class: string;
-		type: any /* string or string[] */;
-	}
-
-	interface IDecorationStatic {
-		isType(decorationParams:IDecorationParams, type:any /* string or string[] */):boolean;
-		new (marker:IDisplayBufferMarker, displayBuffer:IDisplayBuffer, params: IDecorationParams): IDecoration;
-	}
-
-	interface IDecoration extends Emissary.IEmitter {
-		marker: IDisplayBufferMarker;
-		displayBuffer: IDisplayBuffer;
-		params: IDecorationParams
-		id: number;
-		flashQueue: any[];
-		isDestroyed: boolean;
-
-		destroy():void;
-		update(newParams:IDecorationParams):void;
-		getMarker():IDisplayBufferMarker;
-		getParams():IDecorationParams;
-		isType(type:string):boolean;
-		matchesPattern(decorationPattern:{[key:string]:IDecorationParams;}):boolean;
-		flash(klass:string, duration?:number):void;
-		consumeNextFlash():any;
-	}
-
-	interface IEditor {
-		// Serializable.includeInto(Editor);
-		// Delegator.includeInto(Editor);
-
-		deserializing:boolean;
-		callDisplayBufferCreatedHook:boolean;
-		registerEditor:boolean;
-		buffer:TextBuffer.ITextBuffer;
-		languageMode: ILanguageMode;
-		cursors:ICursor[];
-		selections: ISelection[];
-		suppressSelectionMerging:boolean;
-		updateBatchDepth: number;
-		selectionFlashDuration: number;
-		softTabs: boolean;
-		displayBuffer: IDisplayBuffer;
-
-		id:number;
-		behaviors:any;
-		declaredPropertyValues: any;
-		eventHandlersByEventName: any;
-		eventHandlersByNamespace: any;
-		lastOpened: number;
-		subscriptionCounts: any;
-		subscriptionsByObject: any; /* WeakMap */
-		subscriptions: Emissary.ISubscription[];
-		destroy():void;
-
-		mini: any;
-
-		serializeParams():{id:number; softTabs:boolean; scrollTop:number; scrollLeft:number; displayBuffer:any;};
-		deserializeParams(params:any):any;
-		subscribeToBuffer():void;
-		subscribeToDisplayBuffer():void;
-		getViewClass():any; // return type are EditorView
-		destroyed():void;
-		isDestroyed():boolean;
-		copy():IEditor;
-		getTitle():string;
-		getLongTitle():string;
-		setVisible(visible:boolean):void;
-		setMini(mini:any):void;
-		setScrollTop(scrollTop:any):void;
-		getScrollTop():number;
-		setScrollLeft(scrollLeft:any):void;
-		getScrollLeft():number;
-		setEditorWidthInChars(editorWidthInChars:any):void;
-		getSoftWrapColumn():number;
-		getSoftTabs():boolean;
-		setSoftTabs(softTabs:boolean):void;
-		getSoftWrap():boolean;
-		setSoftWrap(softWrap:any):void;
-		getTabText():string;
-		getTabLength():number;
-		setTabLength(tabLength:any):void;
-		usesSoftTabs():boolean;
-		clipBufferPosition(bufferPosition:any):void;
-		clipBufferRange(range:any):void;
-		indentationForBufferRow(bufferRow:any):void;
-		setIndentationForBufferRow(bufferRow:any, newLevel:any, _arg:any):void;
-		indentLevelForLine(line:any):number;
-		buildIndentString(number:any):string;
-		save():void;
-		saveAs(filePath:any):void;
-		copyPathToClipboard():void;
-		getPath():string;
-		getText():string;
-		setText(text:any):void;
-		getTextInRange(range:any):any;
-		getLineCount():number;
-		getBuffer():TextBuffer.ITextBuffer;
-		getURI():string;
-		isBufferRowBlank(bufferRow:any):boolean;
-		isBufferRowCommented(bufferRow:any):void;
-		nextNonBlankBufferRow(bufferRow:any):void;
-		getEofBufferPosition():TextBuffer.IPoint;
-		getLastBufferRow():number;
-		bufferRangeForBufferRow(row:any, options:any):TextBuffer.IRange;
-		lineForBufferRow(row:number):string;
-		lineLengthForBufferRow(row:number):number;
-		scan():any;
-		scanInBufferRange():any;
-		backwardsScanInBufferRange():any;
-		isModified():boolean;
-		isEmpty():boolean;
-		shouldPromptToSave():boolean;
-		screenPositionForBufferPosition(bufferPosition:any, options?:any):TextBuffer.IPoint;
-		bufferPositionForScreenPosition(screenPosition:any, options?:any):TextBuffer.IPoint;
-		screenRangeForBufferRange(bufferRange:any):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:any):TextBuffer.IRange;
-		clipScreenPosition(screenPosition:any, options:any):TextBuffer.IRange;
-		lineForScreenRow(row:any):ITokenizedLine;
-		linesForScreenRows(start?:any, end?:any):ITokenizedLine[];
-		getScreenLineCount():number;
-		getMaxScreenLineLength():number;
-		getLastScreenRow():number;
-		bufferRowsForScreenRows(startRow:any, endRow:any):any[];
-		bufferRowForScreenRow(row:any):number;
-		scopesForBufferPosition(bufferPosition:any):string[];
-		bufferRangeForScopeAtCursor(selector:string):any;
-		tokenForBufferPosition(bufferPosition:any):IToken;
-		getCursorScopes():string[];
-		logCursorScope():void;
-		insertText(text:string, options?:any):TextBuffer.IRange[];
-		insertNewline():TextBuffer.IRange[];
-		insertNewlineBelow():TextBuffer.IRange[];
-		insertNewlineAbove():any;
-		indent(options?:any):any;
-		backspace():any[];
-		// deprecated backspaceToBeginningOfWord():any[];
-		// deprecated backspaceToBeginningOfLine():any[];
-		deleteToBeginningOfWord():any[];
-		deleteToBeginningOfLine():any[];
-		delete():any[];
-		deleteToEndOfLine():any[];
-		deleteToEndOfWord():any[];
-		deleteLine():TextBuffer.IRange[];
-		indentSelectedRows():TextBuffer.IRange[][];
-		outdentSelectedRows():TextBuffer.IRange[][];
-		toggleLineCommentsInSelection():TextBuffer.IRange[];
-		autoIndentSelectedRows():TextBuffer.IRange[][];
-		normalizeTabsInBufferRange(bufferRange:any):any;
-		cutToEndOfLine():boolean[];
-		cutSelectedText():boolean[];
-		copySelectedText():boolean[];
-		pasteText(options?:any):TextBuffer.IRange[];
-		undo():any[];
-		redo():any[];
-		foldCurrentRow():any;
-		unfoldCurrentRow():any[];
-		foldSelectedLines():any[];
-		foldAll():any[];
-		unfoldAll():any[];
-		foldAllAtIndentLevel(level:any):any;
-		foldBufferRow(bufferRow:any):any;
-		unfoldBufferRow(bufferRow:any):any;
-		isFoldableAtBufferRow(bufferRow:any):boolean;
-		isFoldableAtScreenRow(screenRow:any):boolean;
-		createFold(startRow:any, endRow:any):IFold;
-		destroyFoldWithId(id:any):any;
-		destroyFoldsIntersectingBufferRange(bufferRange:any):any;
-		toggleFoldAtBufferRow(bufferRow:any):any;
-		isFoldedAtCursorRow():boolean;
-		isFoldedAtBufferRow(bufferRow:any):boolean;
-		isFoldedAtScreenRow(screenRow:any):boolean;
-		largestFoldContainingBufferRow(bufferRow:any):boolean;
-		largestFoldStartingAtScreenRow(screenRow:any):any;
-		outermostFoldsInBufferRowRange(startRow:any, endRow:any):any[];
-		moveLineUp():ISelection[];
-		moveLineDown():ISelection[];
-		duplicateLines():any[][];
-		// duprecated duplicateLine():any[][];
-		mutateSelectedText(fn:(selection:ISelection)=>any):any;
-		replaceSelectedText(options:any, fn:(selection:string)=>any):any;
-		decorationsForScreenRowRange(startScreenRow:any, endScreenRow:any):{[id:number]: IDecoration[]};
-		decorateMarker(marker:IDisplayBufferMarker, decorationParams: {type:string; class: string;}):IDecoration;
-		decorationForId(id:number):IDecoration;
-		getMarker(id:number):IDisplayBufferMarker;
-		getMarkers():IDisplayBufferMarker[];
-		findMarkers(...args:any[]):IDisplayBufferMarker[];
-		markScreenRange(...args:any[]):IDisplayBufferMarker;
-		markBufferRange(...args:any[]):IDisplayBufferMarker;
-		markScreenPosition(...args:any[]):IDisplayBufferMarker;
-		markBufferPosition(...args:any[]):IDisplayBufferMarker;
-		destroyMarker(...args:any[]):boolean;
-		getMarkerCount():number;
-		hasMultipleCursors():boolean;
-		getCursors():ICursor[];
-		getCursor():ICursor;
-		addCursorAtScreenPosition(screenPosition:any):ICursor;
-		addCursorAtBufferPosition(bufferPosition:any):ICursor;
-		addCursor(marker:any):ICursor;
-		removeCursor(cursor:any):ICursor[];
-		addSelection(marker:any, options:any):ISelection;
-		addSelectionForBufferRange(bufferRange:any, options:any):ISelection;
-		setSelectedBufferRange(bufferRange:any, options:any):any;
-		setSelectedBufferRanges(bufferRanges:any, options:any):any;
-		removeSelection(selection:ISelection):any;
-		clearSelections():boolean;
-		consolidateSelections():boolean;
-		selectionScreenRangeChanged(selection:any):void;
-		getSelections():ISelection[];
-		getSelection(index?:number):ISelection;
-		getLastSelection():ISelection;
-		getSelectionsOrderedByBufferPosition():ISelection[];
-		getLastSelectionInBuffer():ISelection;
-		selectionIntersectsBufferRange(bufferRange:any):any;
-		setCursorScreenPosition(position:TextBuffer.IPoint, options?:any):any;
-		getCursorScreenPosition():TextBuffer.IPoint;
-		getCursorScreenRow():number;
-		setCursorBufferPosition(position:any, options?:any):any;
-		getCursorBufferPosition():TextBuffer.IPoint;
-		getSelectedScreenRange():TextBuffer.IRange;
-		getSelectedBufferRange():TextBuffer.IRange;
-		getSelectedBufferRanges():TextBuffer.IRange[];
-		getSelectedText():string;
-		getTextInBufferRange(range:TextBuffer.IRange):string;
-		setTextInBufferRange(range:TextBuffer.IRange | any[], text:string):any;
-		getCurrentParagraphBufferRange():TextBuffer.IRange;
-		getWordUnderCursor(options?:any):string;
-		moveCursorUp(lineCount?:number):void;
-		moveCursorDown(lineCount?:number):void;
-		moveCursorLeft():void;
-		moveCursorRight():void;
-		moveCursorToTop():void;
-		moveCursorToBottom():void;
-		moveCursorToBeginningOfScreenLine():void;
-		moveCursorToBeginningOfLine():void;
-		moveCursorToFirstCharacterOfLine():void;
-		moveCursorToEndOfScreenLine():void;
-		moveCursorToEndOfLine():void;
-		moveCursorToBeginningOfWord():void;
-		moveCursorToEndOfWord():void;
-		moveCursorToBeginningOfNextWord():void;
-		moveCursorToPreviousWordBoundary():void;
-		moveCursorToNextWordBoundary():void;
-		moveCursorToBeginningOfNextParagraph():void;
-		moveCursorToBeginningOfPreviousParagraph():void;
-		moveToBottom():void;
-		scrollToCursorPosition(options:any):any;
-		pageUp():void;
-		pageDown():void;
-		selectPageUp():void;
-		selectPageDown():void;
-		getRowsPerPage():number;
-		moveCursors(fn:(cursor:ICursor)=>any):any;
-		cursorMoved(event:any):void;
-		selectToScreenPosition(position:TextBuffer.IPoint):any;
-		selectRight():ISelection[];
-		selectLeft():ISelection[];
-		selectUp(rowCount?:number):ISelection[];
-		selectDown(rowCount?:number):ISelection[];
-		selectToTop():ISelection[];
-		selectAll():ISelection[];
-		selectToBottom():ISelection[];
-		selectToBeginningOfLine():ISelection[];
-		selectToFirstCharacterOfLine():ISelection[];
-		selectToEndOfLine():ISelection[];
-		selectToPreviousWordBoundary():ISelection[];
-		selectToNextWordBoundary():ISelection[];
-		selectLine():ISelection[];
-		selectLinesContainingCursors():ISelection[];
-		addSelectionBelow():ISelection[];
-		addSelectionAbove():ISelection[];
-		splitSelectionsIntoLines():any[];
-		transpose():TextBuffer.IRange[];
-		upperCase():boolean[];
-		lowerCase():boolean[];
-		joinLines():any[];
-		selectToBeginningOfWord():ISelection[];
-		selectToEndOfWord():ISelection[];
-		selectToBeginningOfNextWord():ISelection[];
-		selectWord():ISelection[];
-		selectToBeginningOfNextParagraph():ISelection[];
-		selectToBeginningOfPreviousParagraph():ISelection[];
-		selectMarker(marker:any):any;
-		mergeCursors():number[];
-		expandSelectionsForward():any;
-		expandSelectionsBackward(fn:(selection:ISelection)=>any):ISelection[];
-		finalizeSelections():boolean[];
-		mergeIntersectingSelections():any;
-		preserveCursorPositionOnBufferReload():Emissary.ISubscription;
-		getGrammar(): IGrammar;
-		setGrammar(grammer:IGrammar):void;
-		reloadGrammar():any;
-		shouldAutoIndent():boolean;
-		shouldShowInvisibles():boolean;
-		updateInvisibles():void;
-		transact(fn:Function):any;
-		beginTransaction():ITransaction;
-		commitTransaction():any;
-		abortTransaction():any[];
-		inspect():string;
-		logScreenLines(start:number, end:number):any[];
-		handleTokenization():void;
-		handleGrammarChange():void;
-		handleMarkerCreated(marker:any):any;
-		getSelectionMarkerAttributes():{type: string; editorId: number; invalidate: string; };
-		getVerticalScrollMargin():number;
-		setVerticalScrollMargin(verticalScrollMargin:number):void;
-		getHorizontalScrollMargin():number;
-		setHorizontalScrollMargin(horizontalScrollMargin:number):void;
-		getLineHeightInPixels():number;
-		setLineHeightInPixels(lineHeightInPixels:number):void;
-		batchCharacterMeasurement(fn:Function):void;
-		getScopedCharWidth(scopeNames:any, char:any):any;
-		setScopedCharWidth(scopeNames:any, char:any, width:any):any;
-		getScopedCharWidths(scopeNames:any):any;
-		clearScopedCharWidths():any;
-		getDefaultCharWidth():number;
-		setDefaultCharWidth(defaultCharWidth:number):void;
-		setHeight(height:number):void;
-		getHeight():number;
-		getClientHeight():number;
-		setWidth(width:number):void;
-		getWidth():number;
-		getScrollTop():number;
-		setScrollTop(scrollTop:number):void;
-		getScrollBottom():number;
-		setScrollBottom(scrollBottom:number):void;
-		getScrollLeft():number;
-		setScrollLeft(scrollLeft:number):void;
-		getScrollRight():number;
-		setScrollRight(scrollRight:number):void;
-		getScrollHeight():number;
-		getScrollWidth():number;
-		getVisibleRowRange():number;
-		intersectsVisibleRowRange(startRow:any, endRow:any):any;
-		selectionIntersectsVisibleRowRange(selection:any):any;
-		pixelPositionForScreenPosition(screenPosition:any):any;
-		pixelPositionForBufferPosition(bufferPosition:any):any;
-		screenPositionForPixelPosition(pixelPosition:any):any;
-		pixelRectForScreenRange(screenRange:any):any;
-		scrollToScreenRange(screenRange:any, options:any):any;
-		scrollToScreenPosition(screenPosition:any, options:any):any;
-		scrollToBufferPosition(bufferPosition:any, options:any):any;
-		horizontallyScrollable():any;
-		verticallyScrollable():any;
-		getHorizontalScrollbarHeight():any;
-		setHorizontalScrollbarHeight(height:any):any;
-		getVerticalScrollbarWidth():any;
-		setVerticalScrollbarWidth(width:any):any;
-		// deprecated joinLine():any;
-
-		onDidChange(callback: Function): Disposable;
-		onDidDestroy(callback: Function): Disposable;
-		onDidStopChanging(callback: Function): Disposable;
-		onDidChangeCursorPosition(callback: Function): Disposable;
-		onDidSave(callback: (event: { path: string }) => void): Disposable;
-
-		decorateMarker(marker: Marker, options: any): Decoration;
-		getLastCursor(): ICursor;
-	}
-
-	interface IGrammar {
-		bundledPackage: boolean;
-		emitter: any;
-		fileTypes: [string];
-		firstLineRegex: any;
-		foldingStopMarker: any;
-		includedGrammarScopes: [any];
-		initialRule: any;
-		injectionSelector: any;
-		injections: any;
-		maxTokensPerLine: Number;
-		name: string;
-		packageName: string;
-		path: string;
-		rawPatterns: [any];
-		rawRepository: any;
-		registration: Disposable;
-		registry: any;
-		repository: Object;
-		scopeName: string;
-		tokenizeLines: (text: string) => any;
-		// TBD
-
-	}
-
-	  interface IGrammars {
-    		grammarForScopeName(scope: string): IGrammar;
-  	}
-
-	interface IPane /* extends Theorist.Model */ {
-		itemForURI: (uri:string)=>IEditor;
-		items:any[];
-		activeItem:any;
-
-		serializeParams():any;
-		deserializeParams(params:any):any;
-		getViewClass():any; // return type are PaneView
-		isActive():boolean;
-		isDestroyed():boolean;
-		focus():void;
-		blur():void;
-		activate():void;
-		getPanes():IPane[];
-		getItems():any[];
-		getActiveItem():any;
-		getActiveEditor():any;
-		itemAtIndex(index:number):any;
-		activateNextItem():any;
-		activatePreviousItem():any;
-		getActiveItemIndex():number;
-		activateItemAtIndex(index:number):any;
-		activateItem(item:any):any;
-		addItem(item:any, index:number):any;
-		addItems(items:any[], index:number):any[];
-		removeItem(item:any, destroying:any):void;
-		moveItem(item:any, newIndex:number):void;
-		moveItemToPane(item:any, pane:IPane, index:number):void;
-		destroyActiveItem():boolean; // always return false
-		destroyItem(item:any):boolean;
-		destroyItems():any[];
-		destroyInactiveItems():any[];
-		destroy():void;
-		destroyed():any[];
-		promptToSaveItem(item:any):boolean;
-		saveActiveItem():void;
-		saveActiveItemAs():void;
-		saveItem(item:any, nextAction:Function):void;
-		saveItemAs(item:any, nextAction:Function):void;
-		saveItems():any[];
-		activateItemForURI(uri:any):any;
-		copyActiveItem():void;
-		splitLeft(params:any):IPane;
-		splitRight(params:any):IPane;
-		splitUp(params:any):IPane;
-		splitDown(params:any):IPane;
-		split(orientation:string, side:string, params:any):IPane;
-		findLeftmostSibling():IPane;
-		findOrCreateRightmostSibling():IPane;
-	}
-
-	// https://atom.io/docs/v0.84.0/advanced/serialization
-	interface ISerializationStatic<T> {
-		deserialize(data:ISerializationInfo):T;
-		new (data:T): ISerialization;
-	}
-
-	interface ISerialization {
-		serialize():ISerializationInfo;
-	}
-
-	interface ISerializationInfo {
-		deserializer: string;
-	}
-
-	interface IBrowserWindow {
-		getPosition():number[];
-		getSize():number[];
-	}
-
-	interface IAtomWindowDimentions {
-		x:number;
-		y:number;
-		width:number;
-		height:number;
-	}
-
-	interface IProjectStatic {
-		pathForRepositoryUrl(repoUrl:string):string;
-
-		new (arg?:{path:any; buffers:any[];}):IProject;
-	}
-
-	interface IProject /* extends Theorist.Model */ {
-		// Serializable.includeInto(Project);
-
-		path:string;
-		/** deprecated */
-		rootDirectory?:PathWatcher.IDirectory;
-		rootDirectories:PathWatcher.IDirectory[];
-
-		serializeParams():any;
-		deserializeParams(params:any):any;
-		destroyed():any;
-		destroyRepo():any;
-		destroyUnretainedBuffers():any;
-		getRepo():IGit;
-		getPath():string;
-		setPath(projectPath:string):any;
-		getRootDirectory():PathWatcher.IDirectory;
-		resolve(uri:string):string;
-		relativize(fullPath:string):string;
-		contains(pathToCheck:string):boolean;
-		open(filePath:string, options?:any):Q.Promise<IEditor>;
-		openSync(filePath:string, options?:any):IEditor;
-		getBuffers():TextBuffer.ITextBuffer;
-		isPathModified(filePath:string):boolean;
-		findBufferForPath(filePath:string):TextBuffer.ITextBuffer;
-		bufferForPathSync(filePath:string):TextBuffer.ITextBuffer;
-		bufferForPath(filePath:string):Q.Promise<TextBuffer.ITextBuffer>;
-		bufferForId(id:any):TextBuffer.ITextBuffer;
-		buildBufferSync(absoluteFilePath:string):TextBuffer.ITextBuffer;
-		buildBuffer(absoluteFilePath:string):Q.Promise<TextBuffer.ITextBuffer>;
-		addBuffer(buffer:TextBuffer.ITextBuffer, options?:any):any;
-		addBufferAtIndex(buffer:TextBuffer.ITextBuffer, index:number, options?:any):any;
-		scan(regex:any, options:any, iterator:any):Q.Promise<any>;
-		replace(regex:any, replacementText:any, filePaths:any, iterator:any):Q.Promise<any>;
-		buildEditorForBuffer(buffer:any, editorOptions:any):IEditor;
-		eachBuffer(...args:any[]):any;
-
-		onDidChangePaths(callback: Function): Disposable;
-	}
-
-	interface IWorkspaceStatic {
-		new():IWorkspace;
-	}
-
-	interface IWorkspacePanelOptions{
-		item:any;
-		visible?:boolean;
-		priority?:number;
-	}
-
-	interface Panel{
-		getItem():any;
-		getPriority():any;
-		isVisible():boolean;
-		show():void;
-		hide():void;
-	}
-
-	interface IWorkspace {
-		addBottomPanel(options:IWorkspacePanelOptions):Panel;
-		addLeftPanel(options:IWorkspacePanelOptions):Panel;
-		addRightPanel(options:IWorkspacePanelOptions):Panel;
-		addTopPanel(options:IWorkspacePanelOptions):Panel;
-		addModalPanel(options:IWorkspacePanelOptions):Panel;
-		addOpener(opener: Function): any;
-
-		deserializeParams(params:any):any;
-		serializeParams():{paneContainer:any;fullScreen:boolean;};
-		eachEditor(callback: Function): void;
-		getTextEditors():IEditor[];
-		open(uri:string, options:any):Q.Promise<View>;
-		openLicense():void;
-		openSync(uri:string, options:any):any;
-		openUriInPane(uri: string, pane: any, options: any): Q.Promise<View>;
-		observeTextEditors(callback: Function): Disposable;
-		reopenItemSync():any;
-		registerOpener(opener:(urlToOpen:string)=>any):void;
-		unregisterOpener(opener:Function):void;
-		getOpeners():any;
-		getActivePane(): IPane;
-		getActivePaneItem(): IPane;
-		getActiveTextEditor(): IEditor;
-		getPanes():any;
-		saveAll():void;
-		activateNextPane():any;
-		activatePreviousPane():any;
-		paneForURI: (uri:string) => IPane;
-		saveActivePaneItem():any;
-		saveActivePaneItemAs():any;
-		destroyActivePaneItem():any;
-		destroyActivePane():any;
-		getActiveEditor():IEditor;
-		increaseFontSize():void;
-		decreaseFontSize():void;
-		resetFontSize():void;
-		itemOpened(item:any):void;
-		onPaneItemDestroyed(item:any):void;
-		destroyed():void;
-		isTextEditor(object: any): boolean;
-
-		onDidChangeActivePaneItem(item:any):Disposable;
-	}
-
-	interface IAtomSettings {
-		appVersion: string;
-		bootstrapScript: string;
-		devMode: boolean;
-		initialPath: string;
-		pathToOpen: string;
-		resourcePath: string;
-		shellLoadTime: number;
-		windowState:string;
-	}
-
-	interface IAtomState {
-		mode:string;
-		packageStates:any;
-		project:any;
-		syntax:any;
-		version:number;
-		windowDimensions:any;
-		workspace:any;
-	}
-
-	interface IDeserializerManager {
-		deserializers:Function;
-		add:Function;
-		remove:Function;
-		deserialize:Function;
-		get:Function;
-	}
-
-	interface IColorlike {
-		red: number;
-		green: number;
-		blue: number;
-		alpha: number;
-	}
-
-	class Color {
-		public static parse(value:string): Color
-		public static parse(value:IColorlike): Color
-		public toHexString(): string
-		public toRGBAString(): string
-	}
-
-	interface IConfigGetOptions {
-		sources?:Array<string>;
-		excludeSources?:Array<string>;
-		scope?:ScopeDescriptor;
-	}
-
-	interface IConfigSetOptions {
-		scopeSelector?:string;
-		source?:string;
-	}
-
-	interface IConfigObserveOptions {
-		scope?:ScopeDescriptor;
-	}
-
-	interface IConfigChangeEvent<T extends ConfigSetting> {
-		newValue:T;
-		oldValue:T;
-	}
-
-	type ConfigSetting = string | number | boolean | Color | IConfigArray | IConfigObject
-
-	interface IConfigArray extends Array<ConfigSetting> { }
-
-	interface IConfigObject { [key: string]: ConfigSetting }
-
-	interface IConfig {
-		get(keyPath:string, options?:IConfigGetOptions):ConfigSetting;
-		set(keyPath:string, value:ConfigSetting, options?:IConfigSetOptions):boolean;
-		unset(keyPath:string, options?:IConfigSetOptions):void;
-		observe(keyPath:string, options?:IConfigObserveOptions, callback?:(value:ConfigSetting) => void):Disposable;
-		onDidChange(keyPath?:string, options?:IConfigObserveOptions, callback?:(event:IConfigChangeEvent<ConfigSetting>) => void):Disposable;
-	}
-
-	interface IKeymapManager {
-		defaultTarget:HTMLElement;
-		// TBD
-	}
-
-	interface IPackage {
-		mainModulePath: string;
-		mainModule: any;
-		enable(): void;
-		disable(): void;
-		isTheme(): boolean;
-		getType(): string;
-		getStylesheetType(): string;
-		load(): IPackage;
-		reset(): void;
-		activate(): Q.Promise<any[]>;
-		activateNow(): void;
-		// TBD
-	}
-
-	interface IPackageManager extends Emissary.IEmitter {
-		packageDirPaths:string[];
-		loadedPackages:any;
-		activePackages:any;
-		packageStates:any;
-		packageActivators:any[];
-
-		getApmPath():string;
-		getPackageDirPaths():string;
-		getPackageState(name:string):any;
-		setPackageState(name:string, state:any):void;
-		enablePackage(name:string):any;
-		disablePackage(name:string):any;
-		activate():void;
-		registerPackageActivator(activator:any, types:any):void;
-		activatePackages(packages:any):void;
-		activatePackage(name:string):Q.Promise<IPackage>;
-		deactivatePackages():void;
-		deactivatePackage(name:string):void;
-		getActivePackages():any;
-		getActivePackage(name:string):any;
-		isPackageActive(name:string):boolean;
-		unobserveDisabledPackages():void;
-		observeDisabledPackages():void;
-		loadPackages():void;
-		loadPackage(nameOrPath:string):void;
-		unloadPackages():void;
-		unloadPackage(name:string):void;
-		getLoadedPackage(name:string):any;
-		isPackageLoaded(name:string):boolean;
-		getLoadedPackages():any;
-		getLoadedPackagesForTypes(types:any):any[];
-		resolvePackagePath(name:string):string;
-		isPackageDisabled(name:string):boolean;
-		hasAtomEngine(packagePath:string):boolean;
-		isBundledPackage(name:string):boolean;
-		getPackageDependencies():any;
-		getAvailablePackagePaths():any[];
-		getAvailablePackageNames():any[];
-		getAvailablePackageMetadata():any[];
-	}
-
-	interface INotifications {
-		addInfo: Function;
-		addError: Function;
-		addSuccess: Function;
-		addWarning: Function;
-	}
-
-	interface IThemeManager {
-		// TBD
-	}
-
-	interface IContextMenuManager {
-		// TBD
-	}
-
-	interface IMenuManager {
-		// TBD
-	}
-
-	interface IClipboard {
-		write(text:string, metadata?:any):any;
-		read():string;
-	}
-
-	interface ISyntax {
-		// TBD
-	}
-
-	interface IWindowEventHandler {
-		// TBD
-	}
-
-	interface IAtomStatic extends ISerializationStatic<IAtom> {
-		version: number;
-		loadSettings: IAtomSettings;
-
-		/* Load or create the Atom environment in the given mode */
-		loadOrCreate(mode:'editor'):IAtom;
-		/* Load or create the Atom environment in the given mode */
-		loadOrCreate(mode:'spec'):IAtom;
-		/* Load or create the Atom environment in the given mode */
-		loadOrCreate(mode:string):IAtom;
-
-		loadState(mode:any):void;
-		getStatePath(mode:any):string;
-		getConfigDirPath():string;
-		getStorageDirPath():string;
-		getLoadSettings():IAtomSettings;
-		getCurrentWindow():IBrowserWindow;
-		getVersion():string;
-		isReleasedVersion():boolean;
-
-		new(state:IAtomState):IAtom;
-	}
-
-	class Disposable {
-		constructor(disposalAction:any)
-		static isDisposable(object: any): boolean
-		dispose():void
-	}
-
-	class CompositeDisposable {
-		constructor(... disposables: Array<Disposable>)
-		clear():void
-		dispose():void
-		add(... disposables: Array<Disposable>): void
-		remove(disposable: Disposable): void
-		delete(disposable: Disposable): void
-	}
-
-	// https://atom.io/docs/api/v0.106.0/api/classes/Atom.html
-	/* Global Atom class : instance members */
-	interface IAtom {
-		constructor:IAtomStatic;
-
-		state:IAtomState;
-		mode:string;
-		deserializers:IDeserializerManager;
-		config: IConfig;
-		commands: ICommandRegistry;
-		grammars: IGrammars;
-		keymaps: IKeymapManager;
-		keymap: IKeymapManager;
-		packages: IPackageManager;
-		themes: IThemeManager;
-		contextManu: IContextMenuManager;
-		menu: IMenuManager;
-		notifications: INotifications; // https://github.com/atom/notifications
-		clipboard:IClipboard;
-		syntax:ISyntax;
-		views: IViewRegistry;
-		windowEventHandler: IWindowEventHandler;
-
-		// really exists? start
-		subscribe:Function;
-		unsubscribe:Function;
-		loadTime:number;
-		workspaceViewParentSelector:string;
-
-		project: IProject;
-		workspaceView: IWorkspaceView;
-		workspace: IWorkspace;
-		// really exists? end
-
-		initialize:Function;
-		// registerRepresentationClass:Function;
-		// registerRepresentationClasses:Function;
-		setBodyPlatformClass:Function;
-		getCurrentWindow():IBrowserWindow;
-		getWindowDimensions:Function;
-		setWindowDimensions:Function;
-		restoreWindowDimensions:Function;
-		storeWindowDimensions:Function;
-		getLoadSettings:Function;
-		deserializeProject: Function;
-		deserializeWorkspaceView:Function;
-		deserializePackageStates:Function;
-		deserializeEditorWindow:Function;
-		startEditorWindow:Function;
-		unloadEditorWindow:Function;
-		loadThemes:Function;
-		watchThemes:Function;
-		open:Function;
-		confirm:Function;
-		showSaveDialog:Function;
-		showSaveDialogSync:Function;
-		openDevTools:Function;
-		toggleDevTools:Function;
-		executeJavaScriptInDevTools:Function;
-		reload:Function;
-		focus:Function;
-		show:Function;
-		hide:Function;
-		setSize:Function;
-		setPosition:Function;
-		center:Function;
-		displayWindow:Function;
-		close:Function;
-		exit:Function;
-		inDevMode:Function;
-		inSpecMode:Function;
-		toggleFullScreen:Function;
-		setFullScreen:Function;
-		isFullScreen:Function;
-		getVersion:Function;
-		isReleasedVersion:Function;
-		getGitHubAuthTokenName:Function;
-		setGitHubAuthToken:Function;
-		getGitHubAuthToken:Function;
-		getConfigDirPath:Function;
-		saveSync:Function;
-		getWindowLoadTime():number;
-		crashMainProcess:Function;
-		crashRenderProcess:Function;
-		beep:Function;
-		getUserInitScriptPath:Function;
-		requireUserInitScript:Function;
-		requireWithGlobals:Function;
-
-		services: any; // TODO: New services api
-	}
-
-	interface IBufferedNodeProcessStatic {
-		new (arg:any):IBufferedNodeProcess;
-	}
-
-	interface IBufferedNodeProcess extends IBufferedProcess {
-	}
-
-	interface IBufferedProcessStatic {
-		new (arg:any):IBufferedProcess;
-	}
-
-	interface IBufferedProcess {
-		process:Function;
-		killed:boolean;
-
-		bufferStream:Function;
-		kill:Function;
-	}
-
-	interface IGitStatic {
-		new(path:any, options:any):IGit;
-	}
-
-	interface IGit {
-	}
-
-	interface ITokenizedBuffer {
-		// TBD
-	}
-
-	interface ITokenizedLine {
-		// TBD
-	}
-
-	interface IToken {
-		// TBD
-	}
-
-	interface IFoldStatic {
-		new (displayBuffer:IDisplayBuffer, marker:IMarker):IFold;
-		// TBD
-	}
-
-	interface IFold {
-		id:number;
-		displayBuffer:IDisplayBuffer;
-		marker:IMarker;
-
-		// TBD
-	}
-
-	interface IDisplayBufferMarkerStatic {
-		new (_arg:{bufferMarker:IMarker; displayBuffer: IDisplayBuffer}):IDisplayBufferMarker;
-	}
-
-	interface IDisplayBufferMarker extends Emissary.IEmitter, Emissary.ISubscriber {
-		constructor:IDisplayBufferMarkerStatic;
-
-		id: number;
-
-		bufferMarkerSubscription:any;
-		oldHeadBufferPosition:TextBuffer.IPoint;
-		oldHeadScreenPosition:TextBuffer.IPoint;
-		oldTailBufferPosition:TextBuffer.IPoint;
-		oldTailScreenPosition:TextBuffer.IPoint;
-		wasValid:boolean;
-
-		bufferMarker: IMarker;
-		displayBuffer: IDisplayBuffer;
-		globalPauseCount:number;
-		globalQueuedEvents:any;
-
-		subscriptions:Emissary.ISubscription[];
-		subscriptionsByObject:any; // WeakMap
-
-		copy(attributes?:any /* maybe IMarker */):IDisplayBufferMarker;
-		getScreenRange():TextBuffer.IRange;
-		setScreenRange(screenRange:any, options:any):any;
-		getBufferRange():TextBuffer.IRange;
-		setBufferRange(bufferRange:any, options:any):any;
-		getPixelRange():any;
-		getHeadScreenPosition():TextBuffer.IPoint;
-		setHeadScreenPosition(screenPosition:any, options:any):any;
-		getHeadBufferPosition():TextBuffer.IPoint;
-		setHeadBufferPosition(bufferPosition:any):any;
-		getTailScreenPosition():TextBuffer.IPoint;
-		setTailScreenPosition(screenPosition:any, options:any):any;
-		getTailBufferPosition():TextBuffer.IPoint;
-		setTailBufferPosition(bufferPosition:any):any;
-		plantTail():boolean;
-		clearTail():boolean;
-		hasTail():boolean;
-		isReversed():boolean;
-		isValid():boolean;
-		isDestroyed():boolean;
-		getAttributes():any;
-		setAttributes(attributes:any):any;
-		matchesAttributes(attributes:any):any;
-		destroy():any;
-		isEqual(other:IDisplayBufferMarker):boolean;
-		compare(other:IDisplayBufferMarker):boolean;
-		inspect():string;
-		destroyed():any;
-		notifyObservers(_arg:any):any;
-	}
-
-	interface ITransaction {
-		// TBD
-	}
-
-	interface IMarker extends Emissary.IEmitter {
-		// Serializable.includeInto(Editor);
-		// Delegator.includeInto(Editor);
-
-		// TBD
-	}
-
-	interface ITaskStatic {
-		new(taskPath:any):ITask;
-	}
-
-	interface ITask {
-		// TBD
-	}
-}
-
-declare var atom:AtomCore.IAtom;
-
-declare module "atom" {
-	import spacePen = require("space-pen");
-	import Q = require("q");
-
-	var $:typeof spacePen.$;
-	var $$:typeof spacePen.$$;
-	var $$$:typeof spacePen.$$$;
-
-	var BufferedNodeProcess:AtomCore.IBufferedNodeProcessStatic;
-	var BufferedProcess:AtomCore.IBufferedProcessStatic;
-	var Git:AtomCore.IGitStatic;
-	var Point:TextBuffer.IPointStatic;
-	var Range:TextBuffer.IRangeStatic;
-
-	class View extends spacePen.View implements Emissary.ISubscriber {
-		// Subscriber.includeInto(spacePen.View);
-
-		// inherit from Subscriber
-		subscribeWith(eventEmitter:any, methodName:string, args:any):any;
-
-		addSubscription(subscription:any):any;
-
-		subscribe(eventEmitterOrSubscription:any, ...args:any[]):any;
-
-		subscribeToCommand(eventEmitter:any, ...args:any[]):any;
-
-		unsubscribe(object?:any):any;
-	}
-
-	class EditorView extends View {
-		static characterWidthCache:any;
-		static configDefaults:any;
-		static nextEditorId:number;
-
-		static content(params:any):void;
-
-		static classes(_arg?:{mini?:any}):string;
-
-		vScrollMargin:number;
-		hScrollMargin:number;
-		lineHeight:any;
-		charWidth:any;
-		charHeight:any;
-		cursorViews:any[];
-		selectionViews:any[];
-		lineCache:any[];
-		isFocused:any;
-		editor:AtomCore.IEditor;
-		attached:any;
-		lineOverdraw:number;
-		pendingChanges:any[];
-		newCursors:any[];
-		newSelections:any[];
-		redrawOnReattach:any;
-		bottomPaddingInLines:number;
-		active:boolean;
-
-		id:number;
-
-		gutter:AtomCore.IGutterView;
-		overlayer:JQuery;
-		scrollView:JQuery;
-		renderedLines:JQuery;
-		underlayer:JQuery;
-		hiddenInput:JQuery;
-		verticalScrollbar:JQuery;
-		verticalScrollbarContent:JQuery;
-
-		constructor(editor:AtomCore.IEditor);
-
-		initialize(editorOrOptions:AtomCore.IEditor):void; // return type are same as editor method.
-		initialize(editorOrOptions?:{editor: AtomCore.IEditor; mini:any; placeholderText:any}):void;
-
-		initialize(editorOrOptions:{}):void; // compatible for spacePen.View
-
-		bindKeys():void;
-
-		getEditor():AtomCore.IEditor;
-
-		getText():string;
-
-		setText(text:string):void;
-
-		insertText(text:string, options?:any):TextBuffer.IRange[];
-
-		setHeightInLines(heightInLines:number):number;
-
-		setWidthInChars(widthInChars:number):number;
-
-		pageDown():void;
-
-		pageUp():void;
-
-		getPageRows():number;
-
-		setShowInvisibles(showInvisibles:boolean):void;
-
-		setInvisibles(invisibles:{ eol:string; space: string; tab: string; cr: string; }):void;
-
-		setShowIndentGuide(showIndentGuide:boolean):void;
-
-		setPlaceholderText(placeholderText:string):void;
-
-		getPlaceholderText():string;
-
-		checkoutHead():boolean;
-
-		configure():Emissary.ISubscription;
-
-		handleEvents():void;
-
-		handleInputEvents():void;
-
-		bringHiddenInputIntoView():JQuery;
-
-		selectOnMousemoveUntilMouseup():any;
-
-		afterAttach(onDom:any):any;
-
-		edit(editor:AtomCore.IEditor):any;
-
-		getModel():AtomCore.IEditor;
-
-		setModel(editor:AtomCore.IEditor):any;
-
-		showBufferConflictAlert(editor:AtomCore.IEditor):any;
-
-		scrollTop(scrollTop:number, options?:any):any;
-
-		scrollBottom(scrollBottom?:number):any;
-
-		scrollLeft(scrollLeft?:number):number;
-
-		scrollRight(scrollRight?:number):any;
-
-		scrollToBottom():any;
-
-		scrollToCursorPosition():any;
-
-		scrollToBufferPosition(bufferPosition:any, options:any):any;
-
-		scrollToScreenPosition(screenPosition:any, options:any):any;
-
-		scrollToPixelPosition(pixelPosition:any, options:any):any;
-
-		highlightFoldsContainingBufferRange(bufferRange:any):any;
-
-		saveScrollPositionForEditor():any;
-
-		toggleSoftTabs():any;
-
-		toggleSoftWrap():any;
-
-		calculateWidthInChars():number;
-
-		calculateHeightInLines():number;
-
-		getScrollbarWidth():number;
-
-		setSoftWrap(softWrap:boolean):any;
-
-		setFontSize(fontSize:number):any;
-
-		getFontSize():number;
-
-		setFontFamily(fontFamily?:string):any;
-
-		getFontFamily():string;
-
-		setLineHeight(lineHeight:number):any;
-
-		redraw():any;
-
-		splitLeft():any;
-
-		splitRight():any;
-
-		splitUp():any;
-
-		splitDown():any;
-
-		getPane():any; // return type are PaneView
-
-		remove(selector:any, keepData:any):any;
-
-		beforeRemove():any;
-
-		getCursorView(index?:number):any; // return type are CursorView
-
-		getCursorViews():any[]; // return type are CursorView[]
-
-		addCursorView(cursor:any, options:any):any; // return type are CursorView
-
-		removeCursorView(cursorView:any):any;
-
-		getSelectionView(index?:number):any; // return type are SelectionView
-
-		getSelectionViews():any[]; // return type are SelectionView[]
-
-		addSelectionView(selection:any):any;
-
-		removeSelectionView(selectionView:any):any;
-
-		removeAllCursorAndSelectionViews():any[];
-
-		appendToLinesView(view:any):any;
-
-		scrollVertically(pixelPosition:any, _arg:any):any;
-
-		scrollHorizontally(pixelPosition:any):any;
-
-		calculateDimensions():number;
-
-		recalculateDimensions():any;
-
-		updateLayerDimensions():any;
-
-		isHidden():boolean;
-
-		clearRenderedLines():void;
-
-		resetDisplay():any;
-
-		requestDisplayUpdate():any;
-
-		updateDisplay(options?:any):any;
-
-		updateCursorViews():any;
-
-		shouldUpdateCursor(cursorView:any):any;
-
-		updateSelectionViews():any[];
-
-		shouldUpdateSelection(selectionView:any):any;
-
-		syncCursorAnimations():any[];
-
-		autoscroll(suppressAutoscroll?:any):any[];
-
-		updatePlaceholderText():any;
-
-		updateRenderedLines(scrollViewWidth:any):any;
-
-		computeSurroundingEmptyLineChanges(change:any):any;
-
-		computeIntactRanges(renderFrom:any, renderTo:any):any;
-
-		truncateIntactRanges(intactRanges:any, renderFrom:any, renderTo:any):any;
-
-		clearDirtyRanges(intactRanges:any):any;
-
-		clearLine(lineElement:any):any;
-
-		fillDirtyRanges(intactRanges:any, renderFrom:any, renderTo:any):any;
-
-		updatePaddingOfRenderedLines():any;
-
-		getFirstVisibleScreenRow():number;
-
-		getLastVisibleScreenRow():number;
-
-		isScreenRowVisible():boolean;
-
-		handleScreenLinesChange(change:any):any;
-
-		buildLineElementForScreenRow(screenRow:any):any;
-
-		buildLineElementsForScreenRows(startRow:any, endRow:any):any;
-
-		htmlForScreenRows(startRow:any, endRow:any):any;
-
-		htmlForScreenLine(screenLine:any, screenRow:any):any;
-
-		buildIndentation(screenRow:any, editor:any):any;
-
-		buildHtmlEndOfLineInvisibles(screenLine:any):any;
-
-		getEndOfLineInvisibles(screenLine:any):any;
-
-		lineElementForScreenRow(screenRow:any):any;
-
-		toggleLineCommentsInSelection():any;
-
-		pixelPositionForBufferPosition(position:any):any;
-
-		pixelPositionForScreenPosition(position:any):any;
-
-		positionLeftForLineAndColumn(lineElement:any, screenRow:any, screenColumn:any):any;
-
-		measureToColumn(lineElement:any, tokenizedLine:any, screenColumn:any):any;
-
-		getCharacterWidthCache(scopes:any, char:any):any;
-
-		setCharacterWidthCache(scopes:any, char:any, val:any):any;
-
-		clearCharacterWidthCache():any;
-
-		pixelOffsetForScreenPosition(position:any):any;
-
-		screenPositionFromMouseEvent(e:any):any;
-
-		highlightCursorLine():any;
-
-		copyPathToClipboard():any;
-
-		buildLineHtml(_arg:any):any;
-
-		updateScopeStack(line:any, scopeStack:any, desiredScopes:any):any;
-
-		pushScope(line:any, scopeStack:any, scope:any):any;
-
-		popScope(line:any, scopeStack:any):any;
-
-		buildEmptyLineHtml(showIndentGuide:any, eolInvisibles:any, htmlEolInvisibles:any, indentation:any, editor:any, mini:any):any;
-
-		replaceSelectedText(replaceFn:(str:string)=>string):any;
-
-		consolidateSelections(e:any):any;
-
-		logCursorScope():any;
-
-		logScreenLines(start:any, end:any):any;
-
-		logRenderedLines():any;
-	}
-
-	class ScrollView extends View {
-		// TBD
-	}
-
-	interface ISelectListItem {
-		/** e.g. application:about */
-		eventName:string;
-		/** e.g. Application: About */
-		eventDescription:string;
-	}
-
-	class SelectListView extends View {
-		static content():any;
-
-		maxItems:number;
-		scheduleTimeout:any;
-		inputThrottle:number;
-		cancelling:boolean;
-		items:any[];
-		list:JQuery;
-		filterEditorView: JQuery;
-
-		previouslyFocusedElement:JQuery;
-
-		initialize():any;
-
-		schedulePopulateList():number;
-
-		setItems(items:any[]):any;
-
-		setError(message?:string):any;
-
-		setLoading(message?:string):any;
-
-		getFilterQuery():string;
-
-		populateList():any;
-
-		getEmptyMessage(itemCount?:any, filteredItemCount?:any):string;
-
-		setMaxItems(maxItems:number):void;
-
-		selectPreviousItemView():any;
-
-		selectNextItemView():any;
-
-		selectItemView(view:any):any;
-
-		scrollToItemView(view:any):any;
-
-		getSelectedItemView():any;
-
-		getSelectedItem():any;
-
-		confirmSelection():any;
-
-		viewForItem(item:any):JQuery|string|HTMLElement|View; // You must override this method!
-		confirmed(item:any):any; // You must override this method!
-		getFilterKey():any;
-
-		focusFilterEditor():any;
-
-		storeFocusedElement():any;
-
-		restoreFocus():any;
-
-		cancelled():any;
-
-		cancel():any;
-	}
-
-	class Disposable extends AtomCore.Disposable { }
-	class CompositeDisposable extends AtomCore.CompositeDisposable { }
-
-	var WorkspaceView:AtomCore.IWorkspaceViewStatic;
-
-	var Task:AtomCore.ITaskStatic;
-	var Workspace:AtomCore.IWorkspaceStatic;
-}
diff --git a/types/atom/v0/tsconfig.json b/types/atom/v0/tsconfig.json
deleted file mode 100644
index 1330ba894b..0000000000
--- a/types/atom/v0/tsconfig.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "atom": [
-                "atom/v0"
-            ],
-            "pathwatcher": [
-                "pathwatcher/v0"
-            ],
-            "q": [
-                "q/v0"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "api-docs.d.ts",
-        "atom-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/atpl/tslint.json b/types/atpl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/atpl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/aurelia-knockout/aurelia-knockout-tests.ts b/types/aurelia-knockout/aurelia-knockout-tests.ts
deleted file mode 100644
index cf769d0dc2..0000000000
--- a/types/aurelia-knockout/aurelia-knockout-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export class ViewModel {
-    constructor(private knockoutBindable: KnockoutBindable) {
-    }
-
-    activate(settings: any): void {
-        this.knockoutBindable.applyBindableValues(settings, this);
-        this.knockoutBindable.applyBindableValues(settings, this, true);
-    }
-}
diff --git a/types/aurelia-knockout/index.d.ts b/types/aurelia-knockout/index.d.ts
deleted file mode 100644
index 6f04567a5f..0000000000
--- a/types/aurelia-knockout/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for aurelia-knockout 2.0
-// Project: https://github.com/code-chris/aurelia-knockout
-// Definitions by: Christian Kotzbauer <https://github.com/code-chris>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface KnockoutBindable {
-    /**
-     * Applys all values from a data object (usually the activation data) to the corresponding instance fields
-     * in the current view model if they are marked as @bindable. By default all matching values from the data object
-     * are applied. To only apply observable values set the last parameter to `true`. Subscriptions are created
-     * for all Knockout observables in the data object to update the view-model values respectively.
-     *
-     * @param data - the data object
-     * @param target - the target view model
-     * @param applyOnlyObservables - `true` if only observable values should be applied, false by default.
-     */
-  applyBindableValues(data: any, target: any, applyOnlyObservables?: boolean): void;
-}
diff --git a/types/aurelia-knockout/tsconfig.json b/types/aurelia-knockout/tsconfig.json
deleted file mode 100644
index ceb4710331..0000000000
--- a/types/aurelia-knockout/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "aurelia-knockout-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/auth0-angular/tslint.json b/types/auth0-angular/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/auth0-angular/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/auth0-js/auth0-js-tests.ts b/types/auth0-js/auth0-js-tests.ts
index b70ff8d688..d05ee2251e 100644
--- a/types/auth0-js/auth0-js-tests.ts
+++ b/types/auth0-js/auth0-js-tests.ts
@@ -109,7 +109,9 @@ webAuth.renewAuth({}, (err, authResult) => {});
 webAuth.renewAuth({
 	nonce: '123',
     state: '456',
-    postMessageDataType: 'auth0:silent-authentication'
+    postMessageDataType: 'auth0:silent-authentication',
+    usePostMessage: true,
+    timeout: 30 * 1000
 }, (err, authResult) => {
       // Renewed tokens or error
 });
@@ -151,7 +153,7 @@ webAuth.client.login({
 
 webAuth.popup.buildPopupHandler();
 webAuth.popup.preload({});
-webAuth.popup.authorize({}, (err, data) => {
+webAuth.popup.authorize({ domain: "", redirectUri: "", responseType: "code" }, (err, data) => {
     if (err) /* handle error */ return;
     // do something with data
 });
@@ -159,11 +161,11 @@ webAuth.popup.loginWithCredentials({}, (err, data) => {
     if (err) /* handle error */ return;
     // do something with data
 });
-webAuth.popup.passwordlessVerify({}, (err, data) => {
+webAuth.popup.passwordlessVerify({ type: "sms", phoneNumber: "", connection: "", verificationCode: "" }, (err, data) => {
     if (err) /* handle error */ return;
     // do something with data
 });
-webAuth.popup.signupAndLogin({}, (err, data) => {
+webAuth.popup.signupAndLogin({ email: "", password: "", connection: "" }, (err, data) => {
     if (err) /* handle error */ return;
     // do something with data
 });
@@ -172,6 +174,23 @@ webAuth.login({username: 'bar', password: 'foo'}, (err, data) => {});
 
 webAuth.crossOriginAuthenticationCallback();
 
+webAuth.checkSession({
+  audience: 'https://mystore.com/api/v2',
+  scope: 'read:order write:order',
+  redirectUri: 'https://example.com/auth/silent-callback'
+  }, (err, authResult) => {
+    // Authentication tokens or error
+});
+
+webAuth.checkSession({
+  audience: 'https://mystore.com/api/v2',
+  scope: 'read:order write:order',
+  redirectUri: 'https://example.com/auth/silent-callback',
+  usePostMessage: true
+  }, (err, authResult) => {
+    // Renewed tokens or error
+});
+
 const authentication = new auth0.Authentication({
     domain: 'me.auth0.com',
     clientID: '...',
diff --git a/types/auth0-js/index.d.ts b/types/auth0-js/index.d.ts
index 980ba162b5..6110f2fe52 100644
--- a/types/auth0-js/index.d.ts
+++ b/types/auth0-js/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Auth0.js 8.10
+// Type definitions for Auth0.js 8.11
 // Project: https://github.com/auth0/auth0.js
 // Definitions by: Adrian Chia <https://github.com/adrianchia>
 //                 Matt Durrant <https://github.com/mdurrant>
+//                 Peter Blazejewicz <https://github.com/peterblazejewicz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace auth0;
@@ -15,82 +16,68 @@ export class Authentication {
     /**
      * Builds and returns the `/authorize` url in order to initialize a new authN/authZ transaction
      *
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
+     * @param options: https://auth0.com/docs/api/authentication#!#get--authorize_db
      */
     buildAuthorizeUrl(options: any): string;
 
     /**
      * Builds and returns the Logout url in order to initialize a new authN/authZ transaction
      *
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--v2-logout
+     * @param options: https://auth0.com/docs/api/authentication#!#get--v2-logout
      */
     buildLogoutUrl(options?: LogoutOptions): string;
 
     /**
      * Makes a call to the `oauth/token` endpoint with `password` grant type
      *
-     * @param {DefaultDirectoryLoginOptions} options: https://auth0.com/docs/api-auth/grant/password
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api-auth/grant/password
      */
     loginWithDefaultDirectory(options: DefaultDirectoryLoginOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `/ro` endpoint
-     * @param {ResourceOwnerLoginOptions}      options
-     * @param {Function} callback
      * @deprecated `loginWithResourceOwner` will be soon deprecated, user `login` instead.
      */
     loginWithResourceOwner(options: ResourceOwnerLoginOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `oauth/token` endpoint with `password-realm` grant type
-     * @param {DefaultLoginOptions}     options
-     * @param {Function} callback
      */
     login(options: DefaultLoginOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `oauth/token` endpoint
-     * @param {any}      options
-     * @param {Function} callback
      */
     oauthToken(options: any, callback: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `/ssodata` endpoint
      *
-     * @param {Function} callback
      */
     getSSOData(callback?: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `/ssodata` endpoint
      *
-     * @param {Boolean} withActiveDirectories
-     * @param {Function} callback
      */
     getSSOData(withActiveDirectories: boolean, callback?: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `/userinfo` endpoint and returns the user profile
      *
-     * @param {String} accessToken
-     * @param {Function} callback
      */
     userInfo(accessToken: string, callback: Auth0Callback<Auth0UserProfile>): void;
 
     /**
      * Makes a call to the `/delegation` endpoint
      *
-     * @param {DelegationOptions} options: https://auth0.com/docs/api/authentication#!#post--delegation
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api/authentication#!#post--delegation
      */
     delegation(options: DelegationOptions, callback: Auth0Callback<Auth0DelegationToken>): any;
 
     /**
      * Fetches the user country based on the ip.
      *
-     * @param {Function} callback
      */
     getUserCountry(callback: Auth0Callback<{ countryCode: string }>): void;
 }
@@ -101,24 +88,19 @@ export class PasswordlessAuthentication {
     /**
      * Builds and returns the passwordless TOTP verify url in order to initialize a new authN/authZ transaction
      *
-     * @param {PasswordlessVerifyOptions} options
-     * @param {Function} callback
      */
     buildVerifyUrl(options: PasswordlessVerifyOptions): string;
 
     /**
      * Initializes a new passwordless authN/authZ transaction
      *
-     * @param {Object} options: https://auth0.com/docs/api/authentication#passwordless
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api/authentication#passwordless
      */
     start(options: PasswordlessStartOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Verifies the passwordless TOTP and returns an error if any.
      *
-     * @param {PasswordlessVerifyOptions} options
-     * @param {Function} callback
      */
     verify(options: PasswordlessVerifyOptions, callback: Auth0Callback<any>): void;
 }
@@ -129,16 +111,14 @@ export class DBConnection {
     /**
      * Signup a new user
      *
-     * @param {DbSignUpOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
-     * @param {Function} calback
+     * @param options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
      */
     signup(options: DbSignUpOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Initializes the change password flow
      *
-     * @param {ChangePasswordOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
      */
     changePassword(options: ChangePasswordOptions, callback: Auth0Callback<any>): void;
 }
@@ -146,15 +126,12 @@ export class DBConnection {
 export class Management {
     /**
      * Initialize your client class, by using a Non Interactive Client to fetch an access_token via the Client Credentials Grant.
-     * @param {ManagementOptions} options
      */
     constructor(options: ManagementOptions);
 
     /**
      * Returns the user profile. https://auth0.com/docs/api/management/v2#!/Users/get_users_by_id
      *
-     * @param {String} userId
-     * @param {Function} callback
      */
     getUser(userId: string, callback: Auth0Callback<Auth0UserProfile>): void;
 
@@ -162,18 +139,12 @@ export class Management {
      * Updates the user metdata. It will patch the user metdata with the attributes sent.
      * https://auth0.com/docs/api/management/v2#!/Users/patch_users_by_id
      *
-     * @param {String} userId
-     * @param {Object} userMetadata
-     * @param {Function} callback
      */
     patchUserMetadata(userId: string, userMetadata: any, callback: Auth0Callback<Auth0UserProfile>): void;
 
     /**
      * Link two users. https://auth0.com/docs/api/management/v2#!/Users/post_identities
      *
-     * @param {String} userId
-     * @param {String} secondaryUserToken
-     * @param {Function} callback
      */
     linkUser(userId: string, secondaryUserToken: string, callback: Auth0Callback<any>): void;
 }
@@ -188,7 +159,7 @@ export class WebAuth {
     /**
      * Redirects to the hosted login page (`/authorize`) in order to initialize a new authN/authZ transaction
      *
-     * @param {AuthorizeOptions} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
+     * @param options: https://auth0.com/docs/api/authentication#!#get--authorize_db
      */
     authorize(options?: AuthorizeOptions): void;
 
@@ -199,8 +170,7 @@ export class WebAuth {
      * by the `/.well-known/jwks.json` endpoint. Id tokens signed with other algorithms will not be
      * accepted.
      *
-     * @param {ParseHashOptions} options
-     * @param {Function} callback: any(err, token_payload)
+     * @param callback: any(err, token_payload)
      */
     parseHash(callback: Auth0Callback<Auth0DecodedHash>): void;
 
@@ -211,17 +181,14 @@ export class WebAuth {
      * by the `/.well-known/jwks.json` endpoint. Id tokens signed with other algorithms will not be
      * accepted.
      *
-     * @param {ParseHashOptions} options
-     * @param {Function} callback: any(err, token_payload)
+     * @param callback: any(err, token_payload)
      */
     parseHash(options: ParseHashOptions, callback: Auth0Callback<Auth0DecodedHash>): void;
 
     /**
      * Decodes the id_token and verifies  the nonce.
      *
-     * @param {String} token
-     * @param {String} nonce
-     * @param {Function} callback: function(err, {payload, transaction})
+     * @param callback: function(err, {payload, transaction})
      */
     validateToken(token: string, nonce: string, callback: Auth0Callback<any>): void;
 
@@ -231,24 +198,21 @@ export class WebAuth {
      * Watch out! If you're not using the hosted login page to do social logins, you have to use your own [social connection keys](https://manage.auth0.com/#/connections/social).
      * If you use Auth0's dev keys, you'll always get `login_required` as an error when calling this method.
      *
-     * @param {RenewAuthOptions} options: any valid oauth2 parameter to be sent to the `/authorize` endpoint
-     * @param {Function} callback
+     * @param options: any valid oauth2 parameter to be sent to the `/authorize` endpoint
      */
     renewAuth(options: RenewAuthOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Initialices a change password transaction
      *
-     * @param {ChangePasswordOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
      */
     changePassword(options: ChangePasswordOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Signs up a new user
      *
-     * @param {DbSignUpOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
      */
     signup(options: DbSignUpOptions, callback: Auth0Callback<any>): void;
 
@@ -256,8 +220,7 @@ export class WebAuth {
      * Signs up a new user, automatically logs the user in after the signup and returns the user token.
      * The login will be done using /oauth/token with password-realm grant type.
      *
-     * @param {DbSignUpOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
      */
     signupAndAuthorize(options: DbSignUpOptions, callback: Auth0Callback<any>): void;
 
@@ -268,8 +231,8 @@ export class WebAuth {
      * This only works when 3rd party cookies are enabled in the browser.
      * After the /co/authenticate call, you'll have to use the {@link parseHash} function at the `redirectUri` specified in the constructor.
      *
-     * @param {CrossOriginLoginOptions} options options used in the {@link authorize} call after the login_ticket is acquired
-     * @param {crossOriginLoginCallback} cb Callback function called only when an authentication error, like invalid username or password, occurs.
+     * @param options options used in the {@link authorize} call after the login_ticket is acquired
+     * @param cb Callback function called only when an authentication error, like invalid username or password, occurs.
      * For other types of errors, there will be a redirect to the `redirectUri`.
      */
     login(options: CrossOriginLoginOptions, callback: Auth0Callback<any>): void;
@@ -288,7 +251,6 @@ export class WebAuth {
      * - If the client_id parameter is included, the returnTo URL must be listed in the Allowed Logout URLs set at the client level (see Setting Allowed Logout URLs at the App Level).
      * - If the client_id parameter is NOT included, the returnTo URL must be listed in the Allowed Logout URLs set at the account level (see Setting Allowed Logout URLs at the Account Level).
      *
-     * @param {LogoutOptions} options
      * @see   {@link https://auth0.com/docs/api/authentication#logout}
      */
     logout(options: LogoutOptions): void;
@@ -296,19 +258,24 @@ export class WebAuth {
     /**
      * Initialices a passwordless authentication transaction
      *
-     * @param {PasswordlessStartOptions} options: https://auth0.com/docs/api/authentication#passwordless
-     * @param {Function} callback
+     * @param options: https://auth0.com/docs/api/authentication#passwordless
      */
     passwordlessStart(options: PasswordlessStartOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Verifies the passwordless TOTP and redirects to finish the passwordless transaction
      *
-     * @method passwordlessVerify
-     * @param {PasswordlessVerifyOptions} options:
-     * @param {Function} callback
+     * @param options:
      */
     passwordlessVerify(options: PasswordlessVerifyOptions, callback: Auth0Callback<any>): void;
+
+    /**
+     * Renews an existing session on Auth0's servers using `response_mode=web_message` (i.e. Auth0's hosted login page)
+     *
+     * @param options options used in {@link authorize} call
+     * @param callback: any(err, token_payload)
+     */
+    checkSession(options: CheckSessionOptions, callback: Auth0Callback<any>): void;
 }
 
 export class Redirect {
@@ -319,28 +286,35 @@ export class Redirect {
      *
      * This method is not compatible with API Auth so if you need to fetch API tokens with audience
      * you should use {@link authorize} or {@link login}.
-     *
-     * @method loginWithCredentials
-     * @param {Object} options
-     * @param {String} [options.redirectUri] url that the Auth0 will redirect after Auth with the Authorization Response
-     * @param {String} [options.responseType] type of the response used. It can be any of the values `code` and `token`
-     * @param {String} [options.responseMode] how the AuthN response is encoded and redirected back to the client. Supported values are `query` and `fragment`
-     * @param {String} [options.scope] scopes to be requested during AuthN. e.g. `openid email`
-     * @param {credentialsCallback} cb
      */
-    loginWithCredentials(options: any, callback: Auth0Callback<any>): void;
+    loginWithCredentials(
+        options: {
+            /** url that the Auth0 will redirect after Auth with the Authorization Response */
+            redirectUri?: string,
+            /** type of the response used. It can be any of the values `code` and `token` */
+            responseType?: string,
+            /** how the AuthN response is encoded and redirected back to the client. */
+            responseMode?: "query" | "fragment",
+            /** scopes to be requested during AuthN. e.g. `openid email` */
+            scope: string,
+        },
+        callback: Auth0Callback<any>,
+    ): void;
 
     /**
      * Signs up a new user and automatically logs the user in after the signup.
-     *
-     * @method signupAndLogin
-     * @param {Object} options
-     * @param {String} options.email user email address
-     * @param {String} options.password user password
-     * @param {String} options.connection name of the connection where the user will be created
-     * @param {credentialsCallback} cb
      */
-    signupAndLogin(options: any, callback: Auth0Callback<any>): void;
+    signupAndLogin(
+        options: {
+            /** user email address */
+            email: string,
+            /** user password */
+            password: string,
+            /** name of the connection where the user will be created */
+            connection: string,
+        },
+        callback: Auth0Callback<any>,
+    ): void;
 }
 
 export class Popup {
@@ -349,98 +323,141 @@ export class Popup {
     /**
      * Returns a new instance of the popup handler
      *
-     * @method buildPopupHandler
      */
     buildPopupHandler(): any;
 
     /**
      * Initializes the popup window and returns the instance to be used later in order to avoid being blocked by the browser.
      *
-     * @method preload
-     * @param {Object} options: receives the window height and width and any other window feature to be sent to window.open
+     * @param options: receives the window height and width and any other window feature to be sent to window.open
      */
     preload(options: any): any;
 
     /**
      * Handles the popup logic for the callback page.
-     *
-     * @method callback
-     * @param {Object} options
-     * @param {String} options.hash the url hash. If not provided it will extract from window.location.hash
-     * @param {String} [options.state] value originally sent in `state` parameter to {@link authorize} to mitigate XSRF
-     * @param {String} [options.nonce] value originally sent in `nonce` parameter to {@link authorize} to prevent replay attacks
-     * @param {String} [options._idTokenVerification] makes parseHash perform or skip `id_token` verification.
-     * We **strongly** recommend validating the `id_token` yourself if you disable the verification.
-     * @see   {@link parseHash}
+     * @see {@link parseHash}
      */
-    callback(options: any): void;
+    callback(options: {
+        /**
+         * the url hash.
+         * @default window.location.hash
+         */
+        hash: string,
+        /** value originally sent in `state` parameter to {@link authorize} to mitigate XSRF */
+        state?: string,
+        /** value originally sent in `nonce` parameter to {@link authorize} to prevent replay attacks */
+        nonce?: string,
+        /**
+         * makes parseHash perform or skip `id_token` verification.
+         * We **strongly** recommend validating the `id_token` yourself if you disable the verification.
+         */
+        _idTokenVerification?: string,
+    }): void;
 
     /**
      * Shows inside a new window the hosted login page (`/authorize`) in order to start a new authN/authZ transaction and post its result using `postMessage`.
-     *
-     * @method authorize
-     * @param {Object} options
-     * @param {String} [options.domain] your Auth0 domain
-     * @param {String} [options.clientID] your Auth0 client identifier obtained when creating the client in the Auth0 Dashboard
-     * @param {String} options.redirectUri url that the Auth0 will redirect after Auth with the Authorization Response
-     * @param {String} options.responseType type of the response used by OAuth 2.0 flow.
-     * It can be any space separated list of the values `code`, `token`, `id_token`. {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0}
-     * @param {String} [options.responseMode] how the Auth response is encoded and redirected back to the client.
-     * Supported values are `query`, `fragment` and `form_post`. {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes}
-     * @param {String} [options.state] value used to mitigate XSRF attacks. {@link https://auth0.com/docs/protocols/oauth2/oauth-state}
-     * @param {String} [options.nonce] value used to mitigate replay attacks when using Implicit Grant. {@link https://auth0.com/docs/api-auth/tutorials/nonce}
-     * @param {String} [options.scope] scopes to be requested during Auth. e.g. `openid email`
-     * @param {String} [options.audience] identifier of the resource server who will consume the access token issued after Auth
-     * @param {Boolean} [options.owp] determines if Auth0 should render the relay page or not and the caller is responsible of handling the response.
-     * @param {authorizeCallback} cb
      * @see {@link https://auth0.com/docs/api/authentication#authorize-client}
      */
-    authorize(options: any, callback: Auth0Callback<any>): void;
+    authorize(
+        options: {
+            /** your Auth0 domain */
+            domain: string,
+            /** your Auth0 client identifier obtained when creating the client in the Auth0 Dashboard */
+            clientId?: string,
+            /**
+             * identity provider whose login page will be displayed in the popup.
+             * If omitted the hosted login page is used.
+             * {@link https://auth0.com/docs/identityproviders}
+             */
+            connection?: string,
+            /** url that the Auth0 will redirect after Auth with the Authorization Response */
+            redirectUri: string,
+            /**
+             * type of the response used by OAuth 2.0 flow.
+             * It can be any space separated list of the values `code`, `token`, `id_token`.
+             * {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0}
+             */
+            responseType: string,
+            /**
+             * how the Auth response is encoded and redirected back to the client.
+             * {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes}
+             */
+            responseMode?: "query" | "fragment" | "form_post",
+            /**
+             * value used to mitigate XSRF attacks.
+             * {@link https://auth0.com/docs/protocols/oauth2/oauth-state}
+             */
+            state?: string,
+            /**
+             * value used to mitigate replay attacks when using Implicit Grant.
+             * {@link https://auth0.com/docs/api-auth/tutorials/nonce}
+             */
+            nonce?: string,
+            /** scopes to be requested during Auth. e.g. `openid email` */
+            scope?: string,
+            /** identifier of the resource server who will consume the access token issued after Auth */
+            audience?: string,
+            /** determines if Auth0 should render the relay page or not and the caller is responsible of handling the response. */
+            owp?: boolean,
+        },
+        callback: Auth0Callback<any>,
+    ): void;
 
     /**
      * Performs authentication with username/email and password with a database connection inside a new window
      *
      * This method is not compatible with API Auth so if you need to fetch API tokens with audience
      * you should use {@link authorize} or {@link login}.
-     *
-     * @method loginWithCredentials
-     * @param {Object} options
-     * @param {String} [options.redirectUri] url that the Auth0 will redirect after Auth with the Authorization Response
-     * @param {String} [options.responseType] type of the response used. It can be any of the values `code` and `token`
-     * @param {String} [options.responseMode] how the AuthN response is encoded and redirected back to the client. Supported values are `query` and `fragment`
-     * @param {String} [options.scope] scopes to be requested during AuthN. e.g. `openid email`
-     * @param {credentialsCallback} cb
      */
-    loginWithCredentials(options: any, callback: Auth0Callback<any>): void;
+    loginWithCredentials(
+        options: {
+            /** url that the Auth0 will redirect after Auth with the Authorization Response */
+            redirectUri?: string,
+            /** type of the response used. */
+            responseType?: "code" | "token",
+            /** how the AuthN response is encoded and redirected back to the client. */
+            responseMode?: "query" | "fragment",
+            /** scopes to be requested during AuthN. e.g. `openid email` */
+            scope?: string,
+        },
+        callback: Auth0Callback<any>,
+    ): void;
 
     /**
      * Verifies the passwordless TOTP and returns the requested token
-     *
-     * @method passwordlessVerify
-     * @param {Object} options:
-     * @param {Object} options.type: `sms` or `email`
-     * @param {Object} options.phoneNumber: only if type = sms
-     * @param {Object} options.email: only if type = email
-     * @param {Object} options.connection: the connection name
-     * @param {Object} options.verificationCode: the TOTP code
-     * @param {Function} callback
      */
-    passwordlessVerify(options: any, callback: Auth0Callback<any>): void;
+    passwordlessVerify(
+        options: {
+            type: "sms" | "email",
+            /**  only if type = sms */
+            phoneNumber?: string,
+            /** only if type = email */
+            email?: string,
+            /** the connection name */
+            connection: string,
+            /** the TOTP code */
+            verificationCode: string,
+        },
+        callback: Auth0Callback<any>,
+    ): void;
 
     /**
      * Signs up a new user and automatically logs the user in after the signup.
      *
      * This method is not compatible with API Auth so if you need to fetch API tokens with audience
      * you should use {@link authorize} or {@link signupAndAuthorize}.
-     *
-     * @method signupAndLogin
-     * @param {Object} options
-     * @param {String} options.email user email address
-     * @param {String} options.password user password
-     * @param {String} options.connection name of the connection where the user will be created
-     * @param {credentialsCallback} cb
      */
-    signupAndLogin(options: any, callback: Auth0Callback<any>): void;
+    signupAndLogin(
+        options: {
+            /** user email address */
+            email: string,
+            /** user password */
+            password: string,
+            /** name of the connection where the user will be created */
+            connection: string,
+        },
+        callback: Auth0Callback<any>,
+    ): void;
 }
 
 export class CrossOriginAuthentication {
@@ -452,8 +469,8 @@ export class CrossOriginAuthentication {
      * This only works when 3rd party cookies are enabled in the browser.
      * After the /co/authenticate call, you'll have to use the {@link parseHash} function at the `redirectUri` specified in the constructor.
      *
-     * @param {CrossOriginLoginOptions} options options used in the {@link authorize} call after the login_ticket is acquired
-     * @param {crossOriginLoginCallback} cb Callback function called only when an authentication error, like invalid username or password, occurs.
+     * @param options options used in the {@link authorize} call after the login_ticket is acquired
+     * @param cb Callback function called only when an authentication error, like invalid username or password, occurs.
      * For other types of errors, there will be a redirect to the `redirectUri`.
      */
     login(options: CrossOriginLoginOptions, callback: Auth0Callback<any>): void;
@@ -517,14 +534,19 @@ export interface Auth0Error {
     statusText?: string;
 }
 
+/**
+ * The contents of the authResult object returned by {@link WebAuth#parseHash }
+ */
 export interface Auth0DecodedHash {
     accessToken?: string;
     idToken?: string;
     idTokenPayload?: any;
+    appState?: any;
     refreshToken?: string;
     state?: string;
     expiresIn?: number;
     tokenType?: string;
+    scope?: string;
 }
 
 /** Represents the response from an API Token Delegation request. */
@@ -659,17 +681,72 @@ export interface ParseHashOptions {
 }
 
 export interface RenewAuthOptions {
+    /**
+     * your Auth0 domain
+     */
     domain?: string;
+    /**
+     * your Auth0 client identifier obtained when creating the client in the Auth0 Dashboard
+     */
     clientID?: string;
+    /**
+     * url that the Auth0 will redirect after Auth with the Authorization Response
+     */
     redirectUri?: string;
+    /**
+     * type of the response used by OAuth 2.0 flow. It can be any space separated
+     * list of the values `code`, `token`, `id_token`.
+     * {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0}
+     */
     responseType?: string;
+    /**
+     * how the Auth response is encoded and redirected back to the client.
+     * Supported values are `query`, `fragment` and `form_post`.
+     * The `query` value is only supported when `responseType` is `code`.
+     * {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes}
+     */
     responseMode?: string;
+    /**
+     * value used to mitigate XSRF attacks.
+     * {@link https://auth0.com/docs/protocols/oauth2/oauth-state}
+     */
     state?: string;
+    /**
+     * value used to mitigate replay attacks when using Implicit Grant.
+     * {@link https://auth0.com/docs/api-auth/tutorials/nonce}
+     */
     nonce?: string;
+    /**
+     * scopes to be requested during Auth. e.g. `openid email`
+     */
     scope?: string;
+    /**
+     * identifier of the resource server who will consume the access token issued after Auth
+     */
     audience?: string;
-    usePostMessage?: boolean;
+    /**
+     * identifier data type to look for in postMessage event data, where events are initiated
+     * from silent callback urls, before accepting a message event is the event expected.
+     * A value of false means any postMessage event will trigger a callback.
+     */
     postMessageDataType?: string;
+    /**
+     * origin of redirectUri to expect postMessage response from.
+     * Defaults to the origin of the receiving window. Only used if usePostMessage is truthy.
+     */
+    postMessageOrigin?: string;
+    /**
+     * value in milliseconds used to timeout when the `/authorize` call is failing
+     * as part of the silent authentication with postmessage enabled due to a configuration.
+     */
+    timeout?: number;
+    /**
+     * use postMessage to comunicate between the silent callback and the SPA.
+     * When false the SDK will attempt to parse the url hash should ignore the url hash
+     * and no extra behaviour is needed
+     * @default false
+     */
+    usePostMessage?: boolean;
 }
 
 export interface AuthorizeOptions {
@@ -684,3 +761,10 @@ export interface AuthorizeOptions {
     scope?: string;
     audience?: string;
 }
+
+export interface CheckSessionOptions extends AuthorizeOptions {
+	/**
+	 * optional parameter for auth0 to use postMessage to communicate between the silent callback and the SPA.
+	 */
+	usePostMessage?: boolean;
+}
diff --git a/types/auth0-js/v7/tslint.json b/types/auth0-js/v7/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/auth0-js/v7/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/auth0-lock/auth0-lock-tests.ts b/types/auth0-lock/auth0-lock-tests.ts
index 0642453a13..c2107b11e4 100644
--- a/types/auth0-lock/auth0-lock-tests.ts
+++ b/types/auth0-lock/auth0-lock-tests.ts
@@ -10,6 +10,17 @@ lock.show();
 lock.hide();
 lock.logout(() => {});
 
+lock.checkSession({}, function(error: auth0.Auth0Error, authResult: AuthResult): void {
+  if (error || !authResult) {
+    lock.show();
+  } else {
+    // user has an active session, so we can use the accessToken directly.
+    lock.getUserInfo(authResult.accessToken, function(error, profile) {
+      console.log(error, profile);
+    });
+  }
+});
+
 // Show supports UI arguments
 
 const showOptions : Auth0LockShowOptions = {
@@ -37,7 +48,7 @@ lock.show(showOptions);
 
 // "on" event-driven example
 
-lock.on("authenticated", function(authResult : any) {
+lock.on("authenticated", function(authResult: AuthResult) {
   lock.getProfile(authResult.idToken, function(error: auth0.Auth0Error, profile: auth0.Auth0UserProfile) {
     if (error) {
       // Handle error
@@ -49,7 +60,7 @@ lock.on("authenticated", function(authResult : any) {
   });
 });
 
-lock.on("authenticated", function(authResult : any) {
+lock.on("authenticated", function(authResult: AuthResult) {
   lock.getUserInfo(authResult.accessToken, function(error, profile) {
     if (error) {
       // Handle error
diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 0a57d988ce..8ed6b50c87 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -154,6 +154,7 @@ interface Auth0LockStatic {
     // deprecated
     getProfile(token: string, callback: (error: auth0.Auth0Error, profile: auth0.Auth0UserProfile) => void): void;
     getUserInfo(token: string, callback: (error: auth0.Auth0Error, profile: auth0.Auth0UserProfile) => void): void;
+    checkSession(options: any, callback: (error: auth0.Auth0Error, authResult: AuthResult | undefined) => void): void;
     // https://github.com/auth0/lock#resumeauthhash-callback
     resumeAuth(hash: string, callback: (error: auth0.Auth0Error, authResult: AuthResult) => void): void;
     show(options?: Auth0LockShowOptions): void;
diff --git a/types/auth0.widget/tslint.json b/types/auth0.widget/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/auth0.widget/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/auth0/auth0-tests.ts b/types/auth0/auth0-tests.ts
index 08a866e9b1..e9e347cc69 100644
--- a/types/auth0/auth0-tests.ts
+++ b/types/auth0/auth0-tests.ts
@@ -111,3 +111,23 @@ management
 // Update app metadata using callback
 management
   .updateAppMetadata({id: "user_id"}, {"key": "value"}, (err: Error, users: auth0.User) => {});
+
+
+management.getUsersByEmail('email@address.com', (err, users) => {
+  console.log(users);
+});
+
+management.getUsersByEmail('email@address.com').then((users) => {
+  console.log(users);
+});
+
+// Using different client settings.
+
+const retryableManagementClient = new auth0.ManagementClient({
+  clientId: '',
+  clientSecret: '',
+  domain: 'xxx.auth0.com',
+  retry: {
+    enabled : true
+  }
+});
diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index 353fa38559..479bf70c03 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for auth0 2.3
+// Type definitions for auth0 2.6
 // Project: https://github.com/auth0/node-auth0
 // Definitions by: Wilson Hobbs <https://github.com/wbhob>, Seth Westphal <https://github.com/westy92>, Amiram Korach <https://github.com/amiram>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -14,6 +14,7 @@ export interface ManagementClientOptions {
   audience?: string;
   scope?: string;
   tokenProvider?: TokenProvider;
+  retry?: RetryOptions;
 }
 
 export interface TokenProvider {
@@ -21,6 +22,17 @@ export interface TokenProvider {
   cacheTTLInSeconds?: number;
 }
 
+export interface RetryOptions {
+  /**
+   * Default value is `true`.
+   */
+  enabled?: boolean;
+  /**
+   * Default value is `10`.
+   */
+  maxRetries?: number;
+}
+
 export interface UserMetadata { }
 export interface AppMetadata { }
 
@@ -60,6 +72,191 @@ export interface GetUsersData {
   search_engine?: string;
 }
 
+export interface Rule {
+  /**
+   * The name of the rule.
+   */
+  name?: string;
+  /**
+   * The rule's identifier.
+   */
+  id?: string;
+  /**
+   * The code to be executed when the rule runs.
+   */
+  script?: string;
+  /**
+   * The rule's execution stage.
+   */
+  stage?: string;
+  /**
+   * `true` if the connection is enabled, `false` otherwise.
+   */
+  enabled?: boolean;
+  /**
+   * The rule's order in relation to other rules. A rule with a lower order than another rule executes first.
+   */
+  order?: number;
+}
+
+
+export interface Client {
+  /**
+   * The name of the client.
+   */
+  name?: string;
+  /**
+   * Free text description of the purpose of the Client. (Max character length: `140`).
+   */
+  description?: string;
+  /**
+   * The id of the client.
+   */
+  client_id?: string;
+  /**
+   * The client secret, it must not be public.
+   */
+  client_secret?: string;
+  /**
+   * The type of application this client represents.
+   */
+  app_type?: string;
+  /**
+   * The URL of the client logo (recommended size: 150x150).
+   */
+  logo_uri?: string;
+  /**
+   * Whether this client a first party client or not.
+   */
+  is_first_party?: boolean;
+  /**
+   * Whether this client will conform to strict OIDC specifications.
+   */
+  oidc_conformant?: boolean;
+  /**
+   * The URLs that Auth0 can use to as a callback for the client.
+   */
+  callbacks?: string[];
+  allowed_origins?: string[];
+  web_origins?: string[];
+  client_aliases?: string[];
+  allowed_clients?: string[];
+  allowed_logout_urls?: string[];
+  jwt_configuration?: any;
+  /**
+   * Client signing keys.
+   */
+  signing_keys?: string[];
+  encryption_key?: any;
+  sso?: boolean;
+  /**
+   * `true` to disable Single Sign On, `false` otherwise (default: `false`)
+   */
+  sso_disabled?: boolean;
+  /**
+   * `true` if this client can be used to make cross-origin authentication requests, `false` otherwise (default: `false`)
+   */
+  cross_origin_auth?: boolean;
+  /**
+   * Url fo the location in your site where the cross origin verification takes place for the cross-origin auth flow when performing Auth in your own domain instead of Auth0 hosted login page.
+   */
+  cross_origin_loc?: string;
+  /**
+   * `true` if the custom login page is to be used, `false` otherwise. (default: `true`)
+   */
+  custom_login_page_on?: boolean;
+  custom_login_page?: string;
+  custom_login_page_preview?: string;
+  form_template?: string;
+  addons?: any;
+  /**
+   * Defines the requested authentication method for the token endpoint. Possible values are 'none' (public client without a client secret), 'client_secret_post' (client uses HTTP POST parameters) or 'client_secret_basic' (client uses HTTP Basic) ['none' or 'client_secret_post' or 'client_secret_basic']
+   */
+  token_endpoint_auth_method?: string;
+  client_metadata?: any;
+  mobile?: any;
+}
+
+export interface ResourceServer {
+  /**
+   * The identifier of the resource server.
+   */
+  identifier?: string;
+  scopes?: { description: string, value: string }[];
+  /**
+   * The algorithm used to sign tokens.
+   */
+  signing_alg?: 'HS256' | 'RS256';
+  /**
+   * The secret used to sign tokens when using symmetric algorithms.
+   */
+  signing_secret?: string;
+  /**
+   * Allows issuance of refresh tokens for this entity.
+   */
+  allow_offline_access?: boolean;
+  /**
+   * Flag this entity as capable of skipping consent.
+   */
+  skip_consent_for_verifiable_first_party_clients?: boolean;
+  /**
+   * The amount of time (in seconds) that the token will be valid after being issued.
+   */
+  token_lifetime?: number;
+  /**
+   * The amount of time (in seconds) that the token will be valid after being issued from browser based flows. Value cannot be larger than token_lifetime..
+   */
+  token_lifetime_for_web?: number;
+  /**
+   * The ID of the resource server.
+   */
+  id?: string;
+  /**
+   * A friendly name for the resource server.
+   */
+  name?: string;
+}
+
+export interface CreateResourceServer extends ResourceServer {
+  /**
+   * The identifier of the client.
+   */
+  identifier: string;
+}
+
+export interface CreateClientGrant {
+  /**
+   * The identifier of the resource server.
+   */
+  client_id: string;
+  /**
+   * The audience.
+   */
+  audience: string;
+  scope: string[];
+}
+
+export type UpdateClientGrant = Pick<Partial<CreateClientGrant>, 'scope'>;
+
+export type ClientGrant = Partial<CreateClientGrant> & {
+  /**
+   * The id of the client grant.
+   */
+  id?: string;
+};
+
+export interface CreateClientGrant {
+  /**
+   * The identifier of the resource server.
+   */
+  client_id: string;
+  /**
+   * The audience.
+   */
+  audience: string;
+  scope: string[];
+}
+
 export interface User {
   email?: string;
   email_verified?: boolean;
@@ -311,33 +508,34 @@ export class ManagementClient {
 
 
   // Clients
-  getClients(): Promise<User>;
-  getClients(cb: (err: Error, data: any) => void): void;
+  getClients(): Promise<Client[]>;
+  getClients(cb: (err: Error, clients: Client[]) => void): void;
 
-  getClient(params: ClientParams): Promise<User>;
-  getClient(params: ClientParams, cb: (err: Error, data: any) => void): void;
+  getClient(params: ClientParams): Promise<Client>;
+  getClient(params: ClientParams, cb: (err: Error, client: Client) => void): void;
 
-  createClient(data: Data): Promise<User>;
-  createClient(data: Data, cb: (err: Error, data: any) => void): void;
+  createClient(data: Data): Promise<Client>;
+  createClient(data: Data, cb: (err: Error, client: Client) => void): void;
 
-  updateClient(params: ClientParams, data: Data): Promise<User>;
-  updateClient(params: ClientParams, data: Data, cb: (err: Error, data: any) => void): void;
+  updateClient(params: ClientParams, data: Data): Promise<Client>;
+  updateClient(params: ClientParams, data: Data, cb: (err: Error, client: Client) => void): void;
 
-  deleteClient(params: ClientParams): Promise<User>;
-  deleteClient(params: ClientParams, cb: (err: Error, data: any) => void): void;
+  deleteClient(params: ClientParams): Promise<void>;
+  deleteClient(params: ClientParams, cb: (err: Error) => void): void;
 
+                                              
   // Client Grants
-  getClientGrants(): Promise<User>;
-  getClientGrants(cb: (err: Error, data: any) => void): void;
+  getClientGrants(): Promise<ClientGrant[]>;
+  getClientGrants(cb: (err: Error, data: ClientGrant[]) => void): void;
 
-  createClientGrant(data: Data): Promise<User>;
-  createClientGrant(data: Data, cb: (err: Error, data: any) => void): void;
+  createClientGrant(data: CreateClientGrant): Promise<ClientGrant>;
+  createClientGrant(data: CreateClientGrant, cb: (err: Error, data: ClientGrant) => void): void;
 
-  updateClientGrant(params: ObjectWithId, data: Data): Promise<User>;
-  updateClientGrant(params: ObjectWithId, data: Data, cb: (err: Error, data: any) => void): void;
+  updateClientGrant(params: ObjectWithId, data: UpdateClientGrant): Promise<ClientGrant>;
+  updateClientGrant(params: ObjectWithId, data: UpdateClientGrant, cb: (err: Error, data: ClientGrant) => void): void;
 
-  deleteClientGrant(params: ObjectWithId): Promise<User>;
-  deleteClientGrant(params: ObjectWithId, cb: (err: Error, data: any) => void): void;
+  deleteClientGrant(params: ObjectWithId): Promise<void>;
+  deleteClientGrant(params: ObjectWithId, cb: (err: Error) => void): void;
 
 
   // Device Keys
@@ -352,20 +550,20 @@ export class ManagementClient {
 
 
   // Rules
-  getRules(): Promise<User>;
-  getRules(cb: (err: Error, data: any) => void): void;
+  getRules(): Promise<Rule[]>;
+  getRules(cb: (err: Error, rules: Rule[]) => void): void;
 
-  getRule(params: ClientParams): Promise<User>;
-  getRule(params: ClientParams, cb: (err: Error, data: any) => void): void;
+  getRule(params: ClientParams): Promise<Rule>;
+  getRule(params: ClientParams, cb: (err: Error, rule: Rule) => void): void;
 
-  createRules(data: Data): Promise<User>;
-  createRules(data: Data, cb: (err: Error, data: any) => void): void;
+  createRule(data: Data): Promise<Rule>;
+  createRule(data: Data, cb: (err: Error, rule: Rule) => void): void;
 
-  updateRule(params: ObjectWithId, data: Data): Promise<User>;
-  updateRule(params: ObjectWithId, data: Data, cb: (err: Error, data: any) => void): void;
+  updateRule(params: ObjectWithId, data: Data): Promise<Rule>;
+  updateRule(params: ObjectWithId, data: Data, cb: (err: Error, rule: Rule) => void): void;
 
-  deleteRule(params: ObjectWithId): Promise<User>;
-  deleteRule(params: ObjectWithId, cb: (err: Error, data: any) => void): void;
+  deleteRule(params: ObjectWithId): Promise<void>;
+  deleteRule(params: ObjectWithId, cb: (err: Error) => void): void;
 
 
   // Users
@@ -376,8 +574,11 @@ export class ManagementClient {
   getUser(params: ObjectWithId): Promise<User>;
   getUser(params: ObjectWithId, cb?: (err: Error, user: User) => void): void;
 
+  getUsersByEmail(email: string): Promise<User[]>;
+  getUsersByEmail(email: string, cb?: (err: Error, users: User[]) => void): void;
+
   createUser(data: CreateUserData): Promise<User>;
-  createUser(data: CreateUserData, cb: (err: Error, data: User) => void): void;
+  createUser(data: CreateUserData, cb: (err: Error, user: User) => void): void;
 
   updateUser(params: ObjectWithId, data: UpdateUserData): Promise<User>;
   updateUser(params: ObjectWithId, data: UpdateUserData, cb: (err: Error, data: User) => void): void;
@@ -423,8 +624,8 @@ export class ManagementClient {
   deleteEmailProvider(): Promise<any>;
   deleteEmailProvider(cb?: (err: Error, data: any) => void): void;
 
-  updateEmailProvider(data: Data): Promise<any>;
-  updateEmailProvider(data: Data, cb?: (err: Error, data: any) => void): void;
+  updateEmailProvider(params: {}, data: Data): Promise<any>;
+  updateEmailProvider(params: {}, data: Data, cb?: (err: Error, data: any) => void): void;
 
 
   // Statistics
@@ -469,22 +670,18 @@ export class ManagementClient {
 
 
   // Resource Server
-  createResourceServer(data: Data): Promise<any>;
-  createResourceServer(data: Data, cb?: (err: Error, data: any) => void): void;
-
-  getResourceServers(): Promise<any>;
-  getResourceServers(cb?: (err: Error, data: any) => void): void;
-
-  getResourceServer(data: ObjectWithId): Promise<any>;
-  getResourceServer(data: ObjectWithId, cb?: (err: Error, data: any) => void): void;
-
-  deleteResourceServer(params: ObjectWithId): Promise<any>;
-  deleteResourceServer(params: ObjectWithId, cb?: (err: Error, data: any) => void): void;
-
-  updateResourceServer(params: ObjectWithId, data: Data): Promise<any>;
-  updateResourceServer(params: ObjectWithId, data: Data, cb?: (err: Error, data: any) => void): void;
+  createResourceServer(data: CreateResourceServer): Promise<ResourceServer>;
+  createResourceServer(data: CreateResourceServer, cb?: (err: Error, data: ResourceServer) => void): void;
 
+  getResourceServers(): Promise<ResourceServer[]>;
+  getResourceServers(cb?: (err: Error, data: ResourceServer[]) => void): void;
 
+  getResourceServer(data: ObjectWithId): Promise<ResourceServer>;
+  getResourceServer(data: ObjectWithId, cb?: (err: Error, data: ResourceServer) => void): void;
 
+  deleteResourceServer(params: ObjectWithId): Promise<void>;
+  deleteResourceServer(params: ObjectWithId, cb?: (err: Error) => void): void;
 
+  updateResourceServer(params: ObjectWithId, data: ResourceServer): Promise<ResourceServer>;
+  updateResourceServer(params: ObjectWithId, data: ResourceServer, cb?: (err: Error, data: ResourceServer) => void): void;
 }
diff --git a/types/auth0/tslint.json b/types/auth0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/auth0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/autobahn/index.d.ts b/types/autobahn/index.d.ts
index 7f01a53e3a..969c703478 100644
--- a/types/autobahn/index.d.ts
+++ b/types/autobahn/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for AutobahnJS v0.9.7
 // Project: http://autobahn.ws/js/
-// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Wladimir Totino <https://github.com/valepu>
+// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Wladimir Totino <https://github.com/valepu>, Mathias Teier <https://github.com/glenroy37/,http://kagent.at>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="when" />
@@ -179,6 +179,7 @@ declare namespace autobahn {
 
     interface ISubscribeOptions {
         match?: string;
+        get_retained?: boolean;
     }
 
     interface IRegisterOptions {
diff --git a/types/autobahn/tslint.json b/types/autobahn/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/autobahn/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/autobind-decorator/autobind-decorator-tests.ts b/types/autobind-decorator/autobind-decorator-tests.ts
deleted file mode 100644
index f5a0c76328..0000000000
--- a/types/autobind-decorator/autobind-decorator-tests.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-
-import autobind = require('autobind-decorator');
-
-class Test {
-    public static what: string = 'static';
-
-    @autobind
-    public static test(): void {
-        console.log(this.what);
-    }
-
-    public constructor(public what: string) {
-        this.what = what;
-    }
-
-    @autobind
-    public test(): void {
-        console.warn(this.what);
-    }
-}
-
-const tester: Test = new Test('bind');
-const { test } = tester;
-tester.test(); // warns 'bind'.
-test(); // warns 'bind'.
-Test.test(); // logs 'static'.
-
-@autobind
-class Component {
-    public constructor(private someMember: string) {
-        this.someMember = someMember;
-    }
-
-    public someMethod(): void {
-        console.error(this.someMember);
-    }
-}
-
-const component: Component = new Component('React vs Angular2');
-const { someMethod } = component;
-component.someMethod(); // errors 'React vs Angular2'
-someMethod(); // errors 'React vs Angular2'
diff --git a/types/autobind-decorator/index.d.ts b/types/autobind-decorator/index.d.ts
deleted file mode 100644
index d8d74bbfec..0000000000
--- a/types/autobind-decorator/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for autobind-decorator v1.3.3
-// Project: https://github.com/andreypopp/autobind-decorator
-// Definitions by: Ivo Stratev <https://github.com/NoHomey>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'autobind-decorator' {
-    function autobind<TFunction extends Function>(target: TFunction): TFunction | void;
-    function autobind<T extends Function>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
-    export = autobind;
-}
diff --git a/types/autobind-decorator/tsconfig.json b/types/autobind-decorator/tsconfig.json
deleted file mode 100644
index 0b05ea04fb..0000000000
--- a/types/autobind-decorator/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "experimentalDecorators": true,
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "autobind-decorator-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/autolinker/tslint.json b/types/autolinker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/autolinker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/autoprefixer-core/tslint.json b/types/autoprefixer-core/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/autoprefixer-core/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/autosize/index.d.ts b/types/autosize/index.d.ts
index a189b32817..b66dcc2aae 100644
--- a/types/autosize/index.d.ts
+++ b/types/autosize/index.d.ts
@@ -8,17 +8,14 @@
 
 /**
  * Attach autosize to NodeList
- * @param elements
  */
 declare function autosize(elements: NodeList): NodeList;
 /**
  * Attach autosize to Element
- * @param element
  */
 declare function autosize(element: Element): Element;
 /**
  * Attach autosize to JQuery collection
- * @param collection
  */
 declare function autosize(collection: JQuery): JQuery;
 
@@ -27,37 +24,31 @@ declare namespace autosize {
      * Triggers the height adjustment for an assigned textarea element.
      * Autosize will automatically adjust the textarea height on keyboard and window resize events.
      * There is no efficient way for Autosize to monitor for when another script has changed the textarea value or for changes in layout that impact the textarea element.
-     * @param elements
      */
     function update(elements: NodeList): NodeList;
     /**
      * Triggers the height adjustment for an assigned textarea element.
      * Autosize will automatically adjust the textarea height on keyboard and window resize events.
      * There is no efficient way for Autosize to monitor for when another script has changed the textarea value or for changes in layout that impact the textarea element.
-     * @param element
      */
     function update(element: Element): Element;
     /**
      * Triggers the height adjustment for an assigned textarea element.
      * Autosize will automatically adjust the textarea height on keyboard and window resize events.
      * There is no efficient way for Autosize to monitor for when another script has changed the textarea value or for changes in layout that impact the textarea element.
-     * @param collection
      */
     function update(collection: JQuery): JQuery;
 
     /**
      * Removes Autosize and reverts any changes it made to the textarea element.
-     * @param elements
      */
     function destroy(elements: NodeList): NodeList;
     /**
      * Removes Autosize and reverts any changes it made to the textarea element.
-     * @param element
      */
     function destroy(element: Element): Element;
     /**
      * Removes Autosize and reverts any changes it made to the textarea element.
-     * @param collection
      */
     function destroy(collection: JQuery): JQuery;
 }
diff --git a/types/avoscloud-sdk/tslint.json b/types/avoscloud-sdk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/avoscloud-sdk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/aws-iot-device-sdk/index.d.ts b/types/aws-iot-device-sdk/index.d.ts
index 38cf00840d..f2bcab818c 100644
--- a/types/aws-iot-device-sdk/index.d.ts
+++ b/types/aws-iot-device-sdk/index.d.ts
@@ -32,19 +32,19 @@ export interface DeviceOptions extends mqtt.IClientOptions {
    * same as certPath, but can also accept a buffer containing client
    * certificate data
    */
-  clientCert?: string;
+  clientCert?: string | Buffer;
 
   /**
    * same as keyPath, but can also accept a buffer containing private key
    * data
    */
-  privateKey?: string;
+  privateKey?: string | Buffer;
 
   /**
    * same as caPath, but can also accept a buffer containing CA certificate
    * data
    */
-  caCert?: string;
+  caCert?: string | Buffer;
 
   /**
    * set to "true" to automatically re-subscribe to topics after
diff --git a/types/aws-iot-device-sdk/tslint.json b/types/aws-iot-device-sdk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/aws-iot-device-sdk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/aws-lambda-mock-context/index.d.ts b/types/aws-lambda-mock-context/index.d.ts
index 0ccd43c876..6fc5fda67a 100644
--- a/types/aws-lambda-mock-context/index.d.ts
+++ b/types/aws-lambda-mock-context/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/moskalyk/typed-aws-lambda-mock-context
 // Definitions by: Morgan Moskalyk <morgan.moskalyk@gmail.com>, Anand Nimkar <anand.a.nimkar@gmail.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare function context(options?: Options): Context;
 
diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 4e404fcd55..1d756f21e0 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -4,6 +4,7 @@ var anyObj: any = { abc: 123 };
 var num: number = 5;
 var error: Error = new Error();
 var b: boolean = true;
+var apiGwEvtReqCtx: AWSLambda.APIGatewayEventRequestContext;
 var apiGwEvt: AWSLambda.APIGatewayEvent;
 var customAuthorizerEvt: AWSLambda.CustomAuthorizerEvent;
 var clientCtx: AWSLambda.ClientContext;
@@ -22,33 +23,33 @@ var snsEvtRec: AWSLambda.SNSEventRecord;
 var snsMsg: AWSLambda.SNSMessage;
 var snsMsgAttr: AWSLambda.SNSMessageAttribute;
 var snsMsgAttrs: AWSLambda.SNSMessageAttributes;
-var S3EvtRec: AWSLambda.S3EventRecord = {  
+var S3EvtRec: AWSLambda.S3EventRecord = {
     eventVersion: '2.0',
     eventSource: 'aws:s3',
     awsRegion: 'us-east-1',
     eventTime: '1970-01-01T00:00:00.000Z',
     eventName: 'ObjectCreated:Put',
-    userIdentity: {  
+    userIdentity: {
         principalId: 'AIDAJDPLRKLG7UEXAMPLE'
     },
-    requestParameters:{  
+    requestParameters:{
         sourceIPAddress: '127.0.0.1'
     },
-    responseElements: {  
+    responseElements: {
         'x-amz-request-id': 'C3D13FE58DE4C810',
         'x-amz-id-2': 'FMyUVURIY8/IgAtTv8xRjskZQpcIZ9KG4V5Wp6S7S/JRWeUWerMUE5JgHvANOjpD'
     },
-    s3: {  
+    s3: {
         s3SchemaVersion: '1.0',
         configurationId: 'testConfigRule',
-        bucket: {  
+        bucket: {
             name: 'mybucket',
-            ownerIdentity: {  
+            ownerIdentity: {
                 principalId: 'A3NL1KOZZKExample'
             },
             arn: 'arn:aws:s3:::mybucket'
         },
-        object: {  
+        object: {
             key: 'HappyFace.jpg',
             size: 1024,
             eTag: 'd41d8cd98f00b204e9800998ecf8427e',
@@ -64,6 +65,30 @@ var S3CreateEvent: AWSLambda.S3CreateEvent = {
 var cognitoUserPoolEvent: AWSLambda.CognitoUserPoolEvent;
 var cloudformationCustomResourceEvent: AWSLambda.CloudFormationCustomResourceEvent;
 var cloudformationCustomResourceResponse: AWSLambda.CloudFormationCustomResourceResponse;
+var cloudwatchLogsEvent: AWSLambda.CloudWatchLogsEvent;
+var cloudwatchLogsDecodedData: AWSLambda.CloudWatchLogsDecodedData;
+
+/* API Gateway Event request context */
+str = apiGwEvtReqCtx.accountId;
+str = apiGwEvtReqCtx.apiId;
+authResponseContext = apiGwEvtReqCtx.authorizer;
+str = apiGwEvtReqCtx.httpMethod;
+str = apiGwEvtReqCtx.identity.accessKey;
+str = apiGwEvtReqCtx.identity.accountId;
+str = apiGwEvtReqCtx.identity.apiKey;
+str = apiGwEvtReqCtx.identity.caller;
+str = apiGwEvtReqCtx.identity.cognitoAuthenticationProvider;
+str = apiGwEvtReqCtx.identity.cognitoAuthenticationType;
+str = apiGwEvtReqCtx.identity.cognitoIdentityId;
+str = apiGwEvtReqCtx.identity.cognitoIdentityPoolId;
+str = apiGwEvtReqCtx.identity.sourceIp;
+str = apiGwEvtReqCtx.identity.user;
+str = apiGwEvtReqCtx.identity.userAgent;
+str = apiGwEvtReqCtx.identity.userArn;
+str = apiGwEvtReqCtx.stage;
+str = apiGwEvtReqCtx.requestId;
+str = apiGwEvtReqCtx.resourceId;
+str = apiGwEvtReqCtx.resourcePath;
 
 /* API Gateway Event */
 str = apiGwEvt.body;
@@ -74,31 +99,112 @@ str = apiGwEvt.path;
 str = apiGwEvt.pathParameters["example"];
 str = apiGwEvt.queryStringParameters["example"];
 str = apiGwEvt.stageVariables["example"];
-str = apiGwEvt.requestContext.accountId;
-str = apiGwEvt.requestContext.apiId;
-str = apiGwEvt.requestContext.httpMethod;
-str = apiGwEvt.requestContext.identity.accessKey;
-str = apiGwEvt.requestContext.identity.accountId;
-str = apiGwEvt.requestContext.identity.apiKey;
-str = apiGwEvt.requestContext.identity.caller;
-str = apiGwEvt.requestContext.identity.cognitoAuthenticationProvider;
-str = apiGwEvt.requestContext.identity.cognitoAuthenticationType;
-str = apiGwEvt.requestContext.identity.cognitoIdentityId;
-str = apiGwEvt.requestContext.identity.cognitoIdentityPoolId;
-str = apiGwEvt.requestContext.identity.sourceIp;
-str = apiGwEvt.requestContext.identity.user;
-str = apiGwEvt.requestContext.identity.userAgent;
-str = apiGwEvt.requestContext.identity.userArn;
-str = apiGwEvt.requestContext.stage;
-str = apiGwEvt.requestContext.requestId;
-str = apiGwEvt.requestContext.resourceId;
-str = apiGwEvt.requestContext.resourcePath;
+apiGwEvtReqCtx = apiGwEvt.requestContext;
 str = apiGwEvt.resource;
 
 /* API Gateway CustomAuthorizer Event */
 str = customAuthorizerEvt.type;
-str = customAuthorizerEvt.authorizationToken;
 str = customAuthorizerEvt.methodArn;
+str = customAuthorizerEvt.authorizationToken;
+str = apiGwEvt.pathParameters["example"];
+str = apiGwEvt.queryStringParameters["example"];
+str = apiGwEvt.stageVariables["example"];
+apiGwEvtReqCtx = apiGwEvt.requestContext;
+
+/* DynamoDB Stream Event */
+var dynamoDBStreamEvent: AWSLambda.DynamoDBStreamEvent = {
+    Records: [
+        {
+            eventID: '1',
+            eventVersion: '1.0',
+            dynamodb: {
+                Keys: {
+                    Id: {
+                        N: '101'
+                    }
+                },
+                NewImage: {
+                    Message: {
+                        S: 'New item!'
+                    },
+                    Id: {
+                        N: '101'
+                    }
+                },
+                StreamViewType: 'NEW_AND_OLD_IMAGES',
+                SequenceNumber: '111',
+                SizeBytes: 26
+            },
+            awsRegion: 'us-west-2',
+            eventName: 'INSERT',
+            eventSourceARN:
+                'arn:aws:dynamodb:us-west-2:account-id:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899',
+            eventSource: 'aws:dynamodb'
+        },
+        {
+            eventID: '2',
+            eventVersion: '1.0',
+            dynamodb: {
+                OldImage: {
+                    Message: {
+                        S: 'New item!'
+                    },
+                    Id: {
+                        N: '101'
+                    }
+                },
+                SequenceNumber: '222',
+                Keys: {
+                    Id: {
+                        N: '101'
+                    }
+                },
+                SizeBytes: 59,
+                NewImage: {
+                    Message: {
+                        S: 'This item has changed'
+                    },
+                    Id: {
+                        N: '101'
+                    }
+                },
+                StreamViewType: 'NEW_AND_OLD_IMAGES'
+            },
+            awsRegion: 'us-west-2',
+            eventName: 'MODIFY',
+            eventSourceARN:
+                'arn:aws:dynamodb:us-west-2:account-id:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899',
+            eventSource: 'aws:dynamodb'
+        },
+        {
+            eventID: '3',
+            eventVersion: '1.0',
+            dynamodb: {
+                Keys: {
+                    Id: {
+                        N: '101'
+                    }
+                },
+                SizeBytes: 38,
+                SequenceNumber: '333',
+                OldImage: {
+                    Message: {
+                        S: 'This item has changed'
+                    },
+                    Id: {
+                        N: '101'
+                    }
+                },
+                StreamViewType: 'NEW_AND_OLD_IMAGES'
+            },
+            awsRegion: 'us-west-2',
+            eventName: 'REMOVE',
+            eventSourceARN:
+                'arn:aws:dynamodb:us-west-2:account-id:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899',
+            eventSource: 'aws:dynamodb'
+        }
+    ]
+};
 
 /* SNS Event */
 snsEvtRecs = snsEvt.Records;
@@ -260,6 +366,18 @@ clientCtx = context.clientContext;
 str = identity.cognitoIdentityId;
 str = identity.cognitoIdentityPoolId;
 
+/* CloudWatch Logs */
+str = cloudwatchLogsEvent.awslogs.data;
+
+str = cloudwatchLogsDecodedData.owner;
+str = cloudwatchLogsDecodedData.logGroup;
+str = cloudwatchLogsDecodedData.logStream;
+str = cloudwatchLogsDecodedData.subscriptionFilters[0];
+str = cloudwatchLogsDecodedData.messageType;
+str = cloudwatchLogsDecodedData.logEvents[0].id;
+num = cloudwatchLogsDecodedData.logEvents[0].timestamp;
+str = cloudwatchLogsDecodedData.logEvents[0].message;
+
 /* ClientContext */
 clientContextClient = clientCtx.client;
 anyObj = clientCtx.Custom;
@@ -285,6 +403,9 @@ function callback(cb: AWSLambda.Callback) {
     cb(null);
     cb(error);
     cb(null, anyObj);
+    cb(null, b);
+    cb(null, str);
+    cb(null, num);
 }
 
 /* Proxy Callback */
@@ -303,6 +424,131 @@ function customAuthorizerCallback(cb: AWSLambda.CustomAuthorizerCallback) {
     cb(null, authResponse);
 }
 
+/* CloudFront events, see http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html */
+var CloudFrontRequestEvent: AWSLambda.CloudFrontRequestEvent = {
+  "Records": [
+    {
+      "cf": {
+        "config": {
+          "distributionId": "EDFDVBD6EXAMPLE",
+          "requestId": "MRVMF7KydIvxMWfJIglgwHQwZsbG2IhRJ07sn9AkKUFSHS9EXAMPLE=="
+        },
+        "request": {
+          "clientIp": "2001:0db8:85a3:0:0:8a2e:0370:7334",
+          "method": "GET",
+          "uri": "/picture.jpg",
+          "querystring": "size=large",
+          "headers": {
+            "host": [
+              {
+                "key": "Host",
+                "value": "d111111abcdef8.cloudfront.net"
+              }
+            ],
+            "user-agent": [
+              {
+                "key": "User-Agent",
+                "value": "curl/7.51.0"
+              }
+            ]
+          },
+          "origin": {
+            "custom": {
+              "customHeaders": {
+                "my-origin-custom-header": [
+                  {
+                    "key": "My-Origin-Custom-Header",
+                    "value": "Test"
+                  }
+                ]
+              },
+              "domainName": "example.com",
+              "keepaliveTimeout": 5,
+              "path": "/custom_path",
+              "port": 443,
+              "protocol": "https",
+              "readTimeout": 5,
+              "sslProtocols": [
+                "TLSv1",
+                "TLSv1.1"
+              ]
+            },
+            "s3": {
+              "authMethod": "origin-access-identity",
+              "customHeaders": {
+                "my-origin-custom-header": [
+                  {
+                    "key": "My-Origin-Custom-Header",
+                    "value": "Test"
+                  }
+                ]
+              },
+              "domainName": "my-bucket.s3.amazonaws.com",
+              "path": "/s3_path",
+              "region": "us-east-1"
+            }
+          }
+        }
+      }
+    }
+  ]
+};
+
+var CloudFrontResponseEvent: AWSLambda.CloudFrontResponseEvent = {
+    "Records": [
+        {
+            "cf": {
+                "config": {
+                    "distributionId": "EDFDVBD6EXAMPLE",
+                    "requestId": "xGN7KWpVEmB9Dp7ctcVFQC4E-nrcOcEKS3QyAez--06dV7TEXAMPLE=="
+                },
+                "request": {
+                    "clientIp": "2001:0db8:85a3:0:0:8a2e:0370:7334",
+                    "method": "GET",
+                    "uri": "/picture.jpg",
+                    "querystring": "size=large",
+                    "headers": {
+                        "host": [
+                            {
+                                "key": "Host",
+                                "value": "d111111abcdef8.cloudfront.net"
+                            }
+                        ],
+                        "user-agent": [
+                            {
+                                "key": "User-Agent",
+                                "value": "curl/7.18.1"
+                            }
+                        ]
+                    }
+                },
+                "response": {
+                    "status": "200",
+                    "statusDescription": "OK",
+                    "headers": {
+                        "server": [
+                            {
+                                "key": "Server",
+                                "value": "MyCustomOrigin"
+                            }
+                        ],
+                        "set-cookie": [
+                            {
+                                "key": "Set-Cookie",
+                                "value": "theme=light"
+                            },
+                            {
+                                "key": "Set-Cookie",
+                                "value": "sessionToken=abc123; Expires=Wed, 09 Jun 2021 10:18:14 GMT"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    ]
+};
+
 /* Compatibility functions */
 context.done();
 context.done(error);
@@ -315,5 +561,8 @@ context.fail(str);
 
 /* Handler */
 let handler: AWSLambda.Handler = (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
+let asyncHandler: AWSLambda.Handler = async (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
 let proxyHandler: AWSLambda.ProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
-let CustomAuthorizerHandler: AWSLambda.CustomAuthorizerHandler = (event: AWSLambda.CustomAuthorizerEvent, context: AWSLambda.Context, cb: AWSLambda.CustomAuthorizerCallback) => { };
+let asyncProxyHandler: AWSLambda.ProxyHandler = async (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
+let customAuthorizerHandler: AWSLambda.CustomAuthorizerHandler = (event: AWSLambda.CustomAuthorizerEvent, context: AWSLambda.Context, cb: AWSLambda.CustomAuthorizerCallback) => { };
+let asyncCustomAuthorizerHandler: AWSLambda.CustomAuthorizerHandler = async (event: AWSLambda.CustomAuthorizerEvent, context: AWSLambda.Context, cb: AWSLambda.CustomAuthorizerCallback) => { };
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index ee8790705e..320cf562f8 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -8,7 +8,38 @@
 //                 Yoriki Yamaguchi <https://github.com/y13i>
 //                 wwwy3y3 <https://github.com/wwwy3y3>
 //                 Ishaan Malhi <https://github.com/OrthoDex>
+//                 Michael Marner <https://github.com/MichaelMarner>
+//                 Daniel Cottone <https://github.com/daniel-cottone>
+//                 Kostya Misura <https://github.com/kostya-misura>
+//                 Markus Tacker <https://github.com/coderbyheart>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// API Gateway "event" request context
+interface APIGatewayEventRequestContext {
+    accountId: string;
+    apiId: string;
+    authorizer?: AuthResponseContext | null | undefined;
+    httpMethod: string;
+    identity: {
+        accessKey: string | null;
+        accountId: string | null;
+        apiKey: string | null;
+        caller: string | null;
+        cognitoAuthenticationProvider: string | null;
+        cognitoAuthenticationType: string | null;
+        cognitoIdentityId: string | null;
+        cognitoIdentityPoolId: string | null;
+        sourceIp: string;
+        user: string | null;
+        userAgent: string | null;
+        userArn: string | null;
+    },
+    stage: string;
+    requestId: string;
+    resourceId: string;
+    resourcePath: string;
+}
 
 // API Gateway "event"
 interface APIGatewayEvent {
@@ -20,37 +51,66 @@ interface APIGatewayEvent {
     pathParameters: { [name: string]: string } | null;
     queryStringParameters: { [name: string]: string } | null;
     stageVariables: { [name: string]: string } | null;
-    requestContext: {
-        accountId: string;
-        apiId: string;
-        httpMethod: string;
-        identity: {
-            accessKey: string | null;
-            accountId: string | null;
-            apiKey: string | null;
-            caller: string | null;
-            cognitoAuthenticationProvider: string | null;
-            cognitoAuthenticationType: string | null;
-            cognitoIdentityId: string | null;
-            cognitoIdentityPoolId: string | null;
-            sourceIp: string;
-            user: string | null;
-            userAgent: string | null;
-            userArn: string | null;
-        },
-        stage: string;
-        requestId: string;
-        resourceId: string;
-        resourcePath: string;
-    };
+    requestContext: APIGatewayEventRequestContext;
     resource: string;
 }
 
 // API Gateway CustomAuthorizer "event"
 interface CustomAuthorizerEvent {
     type: string;
-    authorizationToken: string;
     methodArn: string;
+    authorizationToken?: string;
+    headers?: { [name: string]: string };
+    pathParameters?: { [name: string]: string } | null;
+    queryStringParameters?: { [name: string]: string } | null;
+    requestContext?: APIGatewayEventRequestContext;
+}
+
+// Context
+// http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_AttributeValue.html
+interface AttributeValue {
+    B?: string;
+    BS?: Array<string>;
+    BOOL?: boolean;
+    L?: Array<AttributeValue>;
+    M?: { [id: string]: AttributeValue };
+    N?: string;
+    NS?: Array<string>;
+    NULL?: boolean;
+    S?: string;
+    SS?: Array<string>;
+}
+
+// Context
+// http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_StreamRecord.html
+interface StreamRecord {
+    ApproximateCreationTime?: number;
+    Keys?: { [key: string]: AttributeValue };
+    NewImage?: { [key: string]: AttributeValue };
+    OldImage?: { [key: string]: AttributeValue };
+    SequenceNumber?: string;
+    SizeBytes?: number;
+    StreamViewType?: 'KEYS_ONLY' | 'NEW_IMAGE' | 'OLD_IMAGE' | 'NEW_AND_OLD_IMAGES';
+}
+
+// Context
+// http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_Record.html
+interface DynamoDBRecord {
+    awsRegion?: string;
+    dynamodb?: StreamRecord;
+    eventID?: string;
+    eventName?: 'INSERT' | 'MODIFY' | 'REMOVE';
+    eventSource?: string;
+    eventSourceARN?: string;
+    eventVersion?: string;
+    userIdentity?: any;
+}
+
+// AWS Lambda Stream event
+// Context
+// http://docs.aws.amazon.com/lambda/latest/dg/eventsources.html#eventsources-ddb-update
+interface DynamoDBStreamEvent {
+    Records: Array<DynamoDBRecord>;
 }
 
 // SNS "event"
@@ -234,6 +294,37 @@ type CloudFormationCustomResourceFailedResponse = CloudFormationCustomResourceRe
 
 export type CloudFormationCustomResourceResponse = CloudFormationCustomResourceSuccessResponse | CloudFormationCustomResourceFailedResponse;
 
+/**
+ * See http://docs.aws.amazon.com/lambda/latest/dg/eventsources.html#eventsources-cloudwatch-logs
+ */
+interface CloudWatchLogsEvent {
+    awslogs: CloudWatchLogsEventData;
+}
+
+interface CloudWatchLogsEventData {
+    data: string;
+}
+
+interface CloudWatchLogsDecodedData {
+    owner: string;
+    logGroup: string;
+    logStream: string;
+    subscriptionFilters: string[];
+    messageType: string;
+    logEvents: CloudWatchLogsLogEvent[];
+}
+
+/**
+ * See http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/SubscriptionFilters.html#LambdaFunctionExample
+ */
+interface CloudWatchLogsLogEvent {
+    id: string;
+    timestamp: number;
+    message: string;
+}
+
+
+
 // Context
 // http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html
 interface Context {
@@ -322,9 +413,9 @@ interface PolicyDocument {
  * http://docs.aws.amazon.com/apigateway/latest/developerguide/use-custom-authorizer.html#api-gateway-custom-authorizer-output
  */
 interface Statement {
-    Action: string | [string];
+    Action: string | string[];
     Effect: string;
-    Resource: string | [string];
+    Resource: string | string[];
 }
 
 /**
@@ -335,6 +426,55 @@ interface AuthResponseContext {
     [name: string]: string | number | boolean;
 }
 
+/**
+ * CloudFront events
+ * http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html
+ */
+type CloudFrontHeaders = {
+        [name: string]: {
+            key: string;
+            value: string;
+        }[]
+};
+
+type CloudFrontResponse = {
+    status: string;
+    statusDescription: string;
+    headers: CloudFrontHeaders;
+};
+
+type CloudFrontRequest = {
+    clientIp: string;
+    method: string;
+    uri: string;
+    querystring: string;
+    headers: CloudFrontHeaders;
+};
+
+type CloudFrontEvent = {
+    config: {
+        distributionId: string;
+        requestId: string;
+    }
+}
+
+export type CloudFrontResponseEvent = {
+    Records: {
+        cf: CloudFrontEvent & {
+            request: CloudFrontRequest;
+            response: CloudFrontResponse;
+        }
+    }[]
+};
+
+export type CloudFrontRequestEvent = {
+    Records: {
+        cf: CloudFrontEvent & {
+            request: CloudFrontRequest;
+        }
+    }[]
+};
+
 /**
  * AWS Lambda handler function.
  * http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
@@ -343,9 +483,9 @@ interface AuthResponseContext {
  * @param context – runtime information of the Lambda function that is executing.
  * @param callback – optional callback to return information to the caller, otherwise return value is null.
  */
-export type Handler = (event: any, context: Context, callback?: Callback) => void;
-export type ProxyHandler = (event: APIGatewayEvent, context: Context, callback?: ProxyCallback) => void;
-export type CustomAuthorizerHandler = (event: CustomAuthorizerEvent, context: Context, callback?: CustomAuthorizerCallback) => void;
+export type Handler = (event: any, context: Context, callback?: Callback) => Promise<void> | void;
+export type ProxyHandler = (event: APIGatewayEvent, context: Context, callback?: ProxyCallback) => Promise<void> | void;
+export type CustomAuthorizerHandler = (event: CustomAuthorizerEvent, context: Context, callback?: CustomAuthorizerCallback) => Promise<void> | void;
 
 /**
  * Optional callback parameter.
@@ -354,7 +494,7 @@ export type CustomAuthorizerHandler = (event: CustomAuthorizerEvent, context: Co
  * @param error – an optional parameter that you can use to provide results of the failed Lambda function execution.
  * @param result – an optional parameter that you can use to provide the result of a successful function execution. The result provided must be JSON.stringify compatible.
  */
-export type Callback = (error?: Error | null, result?: object) => void;
+export type Callback = (error?: Error | null, result?: object | boolean | number | string) => void;
 export type ProxyCallback = (error?: Error | null, result?: ProxyResult) => void;
 export type CustomAuthorizerCallback = (error?: Error | null, result?: AuthResponse) => void;
 
diff --git a/types/aws-lambda/tslint.json b/types/aws-lambda/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/aws-lambda/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/aws-serverless-express/index.d.ts b/types/aws-serverless-express/index.d.ts
index e612d5d8d6..14569396db 100644
--- a/types/aws-serverless-express/index.d.ts
+++ b/types/aws-serverless-express/index.d.ts
@@ -1,14 +1,18 @@
-// Type definitions for aws-serverless-express 2.1
+// Type definitions for aws-serverless-express 3.0
 // Project: https://github.com/awslabs/aws-serverless-express
-// Definitions by: Ben Speakman <https://github.com/threesquared>, Josh Caffey <https://github.com/jcaffey>, Matthias Meyer <https://github.com/mattmeye>
+// Definitions by: Ben Speakman <https://github.com/threesquared>
+//                 Josh Caffey <https://github.com/jcaffey>
+//                 Matthias Meyer <https://github.com/mattmeye>
+//                 Alberto Vasquez <https://github.com/albertovasquez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 import * as http from 'http';
 import * as lambda from 'aws-lambda';
 
 export function createServer(
-    requestListener: (request: http.IncomingMessage, response: http.ServerResponse) => http.Server,
+    requestListener: (request: http.IncomingMessage, response: http.ServerResponse) => void,
     serverListenCallback?: () => any,
     binaryMimeTypes?: string[]
 ): http.Server;
diff --git a/types/aws4/tslint.json b/types/aws4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/aws4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/axel/tslint.json b/types/axel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/axel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/axios-mock-adapter/axios-mock-adapter-tests.ts b/types/axios-mock-adapter/axios-mock-adapter-tests.ts
deleted file mode 100644
index 83fb345cd0..0000000000
--- a/types/axios-mock-adapter/axios-mock-adapter-tests.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import axios from "axios";
-import MockAdapter = require("axios-mock-adapter");
-
-const instance = axios.create();
-const mock = new MockAdapter(instance);
-
-namespace AllowsConstructing {
-    new MockAdapter(instance);
-}
-
-namespace AllowsConstructingWithOptions {
-    new MockAdapter(instance, {
-        delayResponse: 2000,
-    });
-}
-
-namespace ExposesAdapter {
-    mock.adapter();
-}
-
-namespace SupportsReset {
-    mock.reset();
-}
-
-namespace SupportsRestore {
-    mock.restore();
-}
-
-namespace SupportsAllHttpVerbs {
-    mock.onGet;
-    mock.onPost;
-    mock.onPut;
-    mock.onHead;
-    mock.onDelete;
-    mock.onPatch;
-}
-
-namespace SupportsAnyVerb {
-    mock.onAny;
-}
-
-namespace AllowsVerbOnlyMatcher {
-    mock.onGet();
-}
-
-namespace AllowsUrlMatcher {
-    mock.onGet("/foo");
-}
-
-namespace AllowsUrlRegExpMatcher {
-    mock.onGet(/\/fo+/);
-}
-
-namespace AllowsStringBodyMatcher {
-    mock.onPatch("/foo", "bar");
-}
-
-namespace AllowsBodyMatcher {
-    mock.onGet("/foo", {
-        id: 4,
-        name: "foo",
-    });
-}
-
-namespace AllowsParameterMatcher {
-    mock.onGet("/foo", {
-        params: {
-            searchText: "John",
-        },
-    });
-}
-
-namespace AllowsReplyWithStatus {
-    mock.onGet().reply(200);
-}
-
-namespace SupportsReplyOnce {
-    mock.onGet().replyOnce(200);
-}
-
-namespace SupportsPassThrough {
-    mock.onGet().passThrough();
-}
-
-namespace SupportsTimeout {
-    mock.onGet().timeout();
-}
-
-namespace AllowsFunctionReply {
-    mock.onGet().reply((config) => {
-        return [
-            200,
-            { data: "foo" },
-            { RequestedURL: config.url },
-        ];
-    });
-}
-
-namespace AllowsPromiseReply {
-    mock.onGet().reply((config) => {
-        return Promise.resolve([
-            200,
-            { data: "bar" },
-            { RequestedURL: config.url },
-        ]);
-    });
-}
-
-namespace SupportsChanining {
-    mock
-        .onGet("/users").reply(200, [/* users */])
-        .onGet("/posts").reply(200, [/* posts */]);
-}
diff --git a/types/axios-mock-adapter/index.d.ts b/types/axios-mock-adapter/index.d.ts
deleted file mode 100644
index dbc37f1b80..0000000000
--- a/types/axios-mock-adapter/index.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// Type definitions for axios-mock-adapter 1.9
-// Project: https://github.com/ctimmerm/axios-mock-adapter
-// Definitions by: Tomasz Kryskiewicz <https://github.com/tkryskiewicz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version 2.1
-
-import { AxiosAdapter, AxiosInstance, AxiosRequestConfig } from "axios";
-
-type CallbackResponseSpecFunc = (config: AxiosRequestConfig) => any[] | Promise<any[]>;
-
-type ResponseSpecFunc = (statusOrCallback: number | CallbackResponseSpecFunc, data?: any, headers?: any) => MockAdapter;
-
-interface RequestHandler {
-    reply: ResponseSpecFunc;
-    replyOnce: ResponseSpecFunc;
-
-    passThrough(): void;
-    networkError(): void;
-    timeout(): void;
-}
-
-interface MockAdapterOptions {
-    delayResponse?: number;
-}
-
-interface RequestDataMatcher {
-    [index: string]: any;
-    params?: {
-        [index: string]: any,
-    };
-}
-
-type RequestMatcherFunc = (matcher?: string | RegExp, body?: string | RequestDataMatcher) => RequestHandler;
-
-declare class MockAdapter {
-    constructor(axiosInstance: AxiosInstance, options?: MockAdapterOptions);
-
-    adapter(): AxiosAdapter;
-    reset(): void;
-    restore(): void;
-
-    onGet: RequestMatcherFunc;
-    onPost: RequestMatcherFunc;
-    onPut: RequestMatcherFunc;
-    onHead: RequestMatcherFunc;
-    onDelete: RequestMatcherFunc;
-    onPatch: RequestMatcherFunc;
-    onAny: RequestMatcherFunc;
-}
-
-export = MockAdapter;
diff --git a/types/axios-mock-adapter/package.json b/types/axios-mock-adapter/package.json
deleted file mode 100644
index bd5a40b16d..0000000000
--- a/types/axios-mock-adapter/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "axios": "^0.16.2"
-    }
-}
diff --git a/types/axios-mock-adapter/tsconfig.json b/types/axios-mock-adapter/tsconfig.json
deleted file mode 100644
index 0de216c230..0000000000
--- a/types/axios-mock-adapter/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "baseUrl": "../",
-        "types": [],
-        "typeRoots": [
-            "../"
-        ],
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true
-    },
-    "files": [
-        "index.d.ts",
-        "axios-mock-adapter-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/axios-mock-adapter/tslint.json b/types/axios-mock-adapter/tslint.json
deleted file mode 100644
index 1f85ae1a3b..0000000000
--- a/types/axios-mock-adapter/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-namespace": false
-    }
-}
diff --git a/types/azure-mobile-services-client/tslint.json b/types/azure-mobile-services-client/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/azure-mobile-services-client/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/azure-sb/azure-sb-tests.ts b/types/azure-sb/azure-sb-tests.ts
index 68b0fc8df7..411862a3b2 100644
--- a/types/azure-sb/azure-sb-tests.ts
+++ b/types/azure-sb/azure-sb-tests.ts
@@ -1,16 +1,82 @@
+import { Azure } from 'azure-sb';
+import AzureSB = require('azure-sb');
 
+import Models = Azure.ServiceBus.Results.Models;
 
-var nh = new Azure.ServiceBus.NotificationHubService();
-nh.send('tag', '<payload></payload>', function (error, result) {});
-nh.send('tag', '<payload></payload>', { headers: {} }, function (error, result) {});
+function createResultCallback<T>() {
+    return (err: Error | null, result: T, response: Azure.ServiceBus.Response) => {
+    };
+}
 
-nh.apns.send('tag', { payload: { } }, function (error, result) {});
-nh.apns.send(['tag'], { payload: { } }, function (error, result) {});
-nh.gcm.send('tag', { }, function (error, result) {});
-nh.gcm.send(['tag'], { }, function (error, result) {});
-nh.wns.send('tag', '<payload></payload>', 'wns/toast', function (error, result) {});
-nh.wns.send(['tag'], '<payload></payload>', 'wns/toast', function (error, result) {});
-nh.wns.send('tag', '<payload></payload>', 'wns/toast', { headers: {} }, function (error, result) {});
-nh.wns.sendToastText01('tag', '<payload></payload>', function (error, result) {});
-nh.wns.sendToastText01(['tag'], '<payload></payload>', function (error, result) {});
-nh.wns.sendToastText01('tag', '<payload></payload>', { headers: {} }, function (error, result) {});
\ No newline at end of file
+function ResponseCallback(err: Error | null, response: Azure.ServiceBus.Response) {
+}
+
+const ServiceBus = AzureSB.createServiceBusService('connectionstring');
+
+// Queues
+ServiceBus.listQueues('', createResultCallback<Models.Queue[]>());
+ServiceBus.createQueue('test', createResultCallback<Models.Queue>());
+ServiceBus.createQueueIfNotExists('test', createResultCallback<boolean>());
+ServiceBus.getQueue('test', createResultCallback<Models.Queue>());
+ServiceBus.deleteQueue('test', ResponseCallback);
+
+// Topics
+ServiceBus.listTopics('', createResultCallback<Models.Topic[]>());
+ServiceBus.createTopic('test', createResultCallback<Models.Topic>());
+ServiceBus.createTopicIfNotExists('test', createResultCallback<boolean>());
+ServiceBus.getTopic('test', createResultCallback<Models.Topic>());
+ServiceBus.deleteTopic('test', ResponseCallback);
+
+// Subscriptions
+ServiceBus.listSubscriptions('test', createResultCallback<Models.Subscription[]>());
+ServiceBus.createSubscription('test', 'test', createResultCallback<Models.Subscription>());
+ServiceBus.createSubscription('test', 'test', {
+    DefaultMessageTimeToLive: 'PT10M'
+}, createResultCallback<Models.Subscription>());
+ServiceBus.getSubscription('test', 'test', createResultCallback<Models.Subscription>());
+ServiceBus.deleteSubscription('test', 'test', ResponseCallback);
+
+ServiceBus.listRules('testTopic', 'testSub', createResultCallback<Models.Rule[]>());
+ServiceBus.createRule('testTopic', 'testSub', 'testRule', createResultCallback<Models.Rule>());
+ServiceBus.getRule('testTopic', 'testSub', 'testRule', createResultCallback<Models.Rule>());
+ServiceBus.deleteRule('testTopic', 'testSub', 'testRule', ResponseCallback);
+
+// Messages
+ServiceBus.sendQueueMessage('testTopic', 'My data', ResponseCallback);
+ServiceBus.sendQueueMessage('testTopic', {
+    body: '{"data":"MyData"}',
+    contentType: 'application/json',
+    brokerProperties: {
+        CorrelationId: '123'
+    }
+}, ResponseCallback);
+ServiceBus.receiveQueueMessage('testQueue', createResultCallback<Azure.ServiceBus.Message>());
+
+ServiceBus.sendTopicMessage('testTopic', 'My data', ResponseCallback);
+ServiceBus.sendTopicMessage('testTopic', {
+    body: '{"data":"MyData"}',
+    contentType: 'application/json',
+    brokerProperties: {
+        CorrelationId: '123'
+    }
+}, ResponseCallback);
+ServiceBus.receiveSubscriptionMessage('testTopic', 'testSub', createResultCallback<Azure.ServiceBus.Message>());
+
+ServiceBus.renewLockForMessage('test', ResponseCallback);
+ServiceBus.unlockMessage('test', ResponseCallback);
+ServiceBus.deleteMessage('test', ResponseCallback);
+
+// NotificationHub
+const nh = AzureSB.createNotificationHubService('test');
+nh.send('tag', '<payload></payload>', ResponseCallback);
+nh.send('tag', '<payload></payload>', { headers: {} }, ResponseCallback);
+nh.apns.send('tag', { payload: {} }, ResponseCallback);
+nh.apns.send(['tag'], { payload: {} }, ResponseCallback);
+nh.gcm.send('tag', {}, ResponseCallback);
+nh.gcm.send(['tag'], {}, ResponseCallback);
+nh.wns.send('tag', '<payload></payload>', 'wns/toast', ResponseCallback);
+nh.wns.send(['tag'], '<payload></payload>', 'wns/toast', ResponseCallback);
+nh.wns.send('tag', '<payload></payload>', 'wns/toast', { headers: {} }, ResponseCallback);
+nh.wns.sendToastText01('tag', '<payload></payload>', ResponseCallback);
+nh.wns.sendToastText01(['tag'], '<payload></payload>', ResponseCallback);
+nh.wns.sendToastText01('tag', '<payload></payload>', { headers: {} }, ResponseCallback);
diff --git a/types/azure-sb/index.d.ts b/types/azure-sb/index.d.ts
index bae1af04a9..ba92395c0f 100644
--- a/types/azure-sb/index.d.ts
+++ b/types/azure-sb/index.d.ts
@@ -2,172 +2,322 @@
 // Project: https://github.com/Azure/azure-sdk-for-node/tree/master/lib/services/serviceBus
 // Definitions by: Microsoft Azure <https://github.com/Azure>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
-declare namespace Azure.ServiceBus {
-    interface Callback {
-        (error: any, response: any): void;
+export import ServiceBusService = require('./lib/servicebusservice');
+export import NotificationHubService = require('./lib/notificationhubservice');
+export import WrapService = require('./lib/wrapservice');
+
+export function createServiceBusService(namespaceOrConnectionString?: string,
+                                        accessKey?: string,
+                                        issuer?: string,
+                                        acsNamespace?: string,
+                                        host?: string,
+                                        authenticationProvider?: object): ServiceBusService;
+
+export function createNotificationHubService(hubName: string,
+                                             endpointOrConnectionString?: string,
+                                             sharedAccessKeyName?: string,
+                                             sharedAccessKeyValue?: string): NotificationHubService;
+
+export function createWrapService(acsHost: string,
+                                  issuer?: string,
+                                  accessKey?: string): WrapService;
+
+export namespace Azure.ServiceBus {
+    export type Duration = string;
+    export type DateString = string;
+
+    export interface Dictionary<T> {
+        [k: string]: T;
     }
 
-    interface NotificationHubRegistration {
-        RegistrationId: string;
+    export interface ReceiveQueueMessageOptions {
+        timeoutIntervalInS?: number;
+    }
+
+    export interface ReceiveSubscriptionMessageOptions extends ReceiveQueueMessageOptions {
+        isPeekLock?: boolean;
+    }
+
+    interface IBrokerPropertiesResponse {
+        readonly DeliveryCount: number;
+        readonly LockedUntil: DateString;
+        readonly LockToken: string;
+        readonly SequenceNumber: number;
+    }
+
+    interface IBrokerProperties {
+        CorrelationId: string;
+        Label: string;
+        MessageId: string;
+        PartitionKey: string;
+        ReplyTo: string;
+        ReplyToSessionId: string;
+        ScheduledEnqueueTimeUtc: string;
+        SessionId: string;
+        TimeToLive: string;
+        To: string;
+    }
+
+    export interface Message {
+        body: string;
+        brokerProperties?: BrokerProperties;
+        contentType?: string;
+        customProperties?: Dictionary<any>;
+    }
+
+    /*
+     * Options interfaces
+     */
+
+    interface CreateOptions {
+        DefaultMessageTimeToLive: string;
+        DuplicateDetectionHistoryTimeWindow: string;
+        EnablePartitioning: boolean;
+        MaxSizeInMegaBytes: number;
+        RequiresDuplicateDetection: boolean;
+    }
+
+    interface IQueueOptions extends CreateOptions {
+        AutoDeleteOnIdle: string;
+        DeadLetteringOnMessageExpiration: boolean;
+        LockDuration: string;
+        RequiresSession: boolean;
+    }
+
+    interface ICreateTopicOptions extends CreateOptions {
+        EnableBatchedOperations: boolean;
+        SizeInBytes: boolean;
+        SupportOrdering: boolean;
+    }
+
+    interface ICreateTopicIfNotExistsOptions extends ICreateTopicOptions {
+        EnableDeadLetteringOnFilterEvaluationExceptions: boolean;
+        EnableDeadLetteringOnMessageExpiration: boolean;
+        MaxCorrelationFiltersPerTopic: number;
+        MaxSqlFiltersPerTopic: number;
+        MaxSubscriptionsPerTopic: number;
+    }
+
+    interface ICreateSubscriptionOptions {
+        DefaultMessageTimeToLive: string;
+        EnableDeadLetteringOnFilterEvaluationExceptions: boolean;
+        EnableDeadLetteringOnMessageExpiration: boolean;
+        LockDuration: string;
+        RequiresSession: boolean;
+    }
+
+    interface PaginationOptions {
+        top: number;
+        skip: number;
+    }
+
+    interface ICreateRuleOptions {
+        trueFilter: string;
+        falseFilter: string;
+        sqlExpressionFilter: string;
+        correlationIdFilter: string;
+        sqlRuleAction: string;
+    }
+
+    interface ICreateNotificationHubOptions {
+        apns: Dictionary<string>;
+        gcm: Dictionary<string>;
+        mpns: Dictionary<string>;
+        wns: Dictionary<string>;
+    }
+
+    export interface NotificationHubRegistration {
+        BodyTemplate?: any;
         ChannelUri?: string;
         DeviceToken?: string;
-        gcmRegistrationId?: string;
-        Tags?: string;
-        BodyTemplate?: any;
-        WnsHeaders?: any;
-        MpnsHeaders?: any;
         Expiry?: Date;
+        gcmRegistrationId?: string;
+        MpnsHeaders?: any;
+        RegistrationId: string;
+        Tags?: string;
+        WnsHeaders?: any;
     }
 
-    export class NotificationHubService {
-        new(hubName: string, endpointOrConnectionString: string, sharedAccessKeyName?: string, sharedAccessKeyValue?: string): NotificationHubService;
-        hubName: string;
-        wns: Wns.Service;
-        apns: Apns.Service;
-        gcm: Gcm.Service;
-        mpns: Mpns.Service;
-        send(tags: string, payload: Object | string, optionsOrCallback?: { headers: Object } | Callback, callback?: Callback): void;
-
-        createOrUpdateInstallation(installation: string, options: any, callback?: Callback): void;
-        patchInstallation(installationId: string, partialUpdateOperations: any[], options: any, callback?: Callback): void;
-        deleteInstallation(installationId: string, options: any, callback?: Callback): void;
-        getInstallation(installationId: string, options: any, callback?: Callback): void;
-
-        /*
-        // old school?
-        createRegistrationId(callback?: Callback): void;
-        getRegistration(registrationId: string, options: any, callback?: Callback): void;
-        deleteRegistration(registrationId: string, options?: { etag: any }, callback?: Callback): void;
-        updateRegistration(registration: NotificationHubRegistration, options?: { etag: any }, callback?: Callback): void;
-        createOrUpdateRegistration(registration: NotificationHubRegistration, options?: { etag: any }, callback?: Callback): void;
-        listRegistrations(options?: { top: number, skip: number }, callback?: Callback): void;
-        listRegistrationsByTag(tag: string, options?: { top: number, skip: number }, callback?: Callback): void;
-        */
+    export interface Response {
+        body: Dictionary<string | object>;
+        headers: Dictionary<string>;
+        isSuccessful: boolean;
+        md5?: string;
+        statusCode: number;
     }
 
-    export module Apns {
-        interface Payload {
-            expiry?: Date;
-            aps?: Object;
-            badge?: number;
-            alert?: string;
-            sound?: string;
-            payload: Object;
+    export interface ErrorResponse extends Response {
+        body: {
+            Error: {
+                Code: string;
+                Detail: string;
+            };
+        };
+    }
+
+    export namespace Results.Models {
+        export enum EntityStatus {
+            Active = 'Active',
+            Creating = 'Creating',
+            Deleting = 'Deleting',
+            Disabled = 'Disabled',
+            ReceiveDisabled = 'ReceiveDisabled',
+            Renaming = 'Renaming',
+            Restoring = 'Restoring',
+            SendDisabled = 'SendDisabled',
+            Unknown = 'Unknown'
         }
 
-        interface Service {
-            new(service: NotificationHubService): Service;
-            send(tags: string | string[], payload: Apns.Payload, callback?: Callback): void;
-            createNativeRegistration(token: string, tags: string | string[], optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            createOrUpdateNativeRegistration(registrationId: string, token: string, tags: string | string[], optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            createTemplateRegistration(token: string, tags: string | string[], template: Apns.Payload, optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            createOrUpdateTemplateRegistration(registrationId: string, token: string, tags: string | string[], template: Apns.Payload, optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            updateTemplateRegistration(registrationId: string, token: string, tags: string | string[], template: Apns.Payload, optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            listRegistrationsByToken(token: string, optionsOrCallback?: { top: number, skip: number } | Callback, callback?: Callback): void;
+        export enum EntityAvailabilityStatus {
+            Available = 'Available',
+            Limited = 'Limited',
+            Renaming = 'Renaming',
+            Restoring = 'Restoring',
+            Unknown = 'Unknown'
         }
-    }
-    export module Gcm {
-        interface Service {
-            new(service: NotificationHubService): Service;
-            send(tags: string | string[], payload: any, callback?: Callback): void;
-            createNativeRegistration(gcmRegistrationId: string, tags: string | string[], optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            createOrUpdateNativeRegistration(registrationId: string, gcmRegistrationId: string, tags: string | string[], optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            createTemplateRegistration(gcmRegistrationId: string, tags: string | string[], template: any, optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            createOrUpdateTemplateRegistration(registrationId: string, gcmRegistrationId: string, tags: string | string[], template: any, optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            updateTemplateRegistration(registrationId: string, gcmRegistrationId: string, tags: string | string[], template: any, optionsOrCallback?: Object | Callback, callback?: Callback): void;
-            listRegistrationsByGcmRegistrationId(gcmRegistrationId: string, optionsOrCallback?: { top: number, skip: number } | Callback, callback?: Callback): void;
+
+        interface Base {
+            _: {
+                ContentRootElement: string;
+                id: string;
+                title: string;
+                published: DateString;
+                updated: DateString;
+                author?: {
+                    name: string;
+                };
+                link: string;
+            };
+            CreatedAt: DateString;
+        }
+
+        interface ExtendedBase extends Base {
+            AuthorizationRules: string;
+            AutoDeleteOnIdle: string;
+            DefaultMessageTimeToLive: string;
+            DuplicateDetectionHistoryTimeWindow: Duration;
+            EnableBatchedOperations: string;
+            EnableExpress: string;
+            EnablePartitioning: string;
+            EntityAvailabilityStatus: string;
+            IsAnonymousAccessible: string;
+            MaxSizeInMegabytes: string;
+            RequiresDuplicateDetection: string;
+            SizeInBytes: string;
+            Status: EntityStatus;
+            UpdatedAt: DateString;
+        }
+
+        // export interface Generic extends Base {
+        //   [x: string]: string | Dictionary<string | object>;
+        // }
+
+        export interface Topic extends ExtendedBase {
+            AccessedAt: DateString;
+            CountDetails: {
+                'd2p1:ActiveMessageCount': string;
+                'd2p1:DeadLetterMessageCount': string;
+                'd2p1:ScheduledMessageCount': string;
+                'd2p1:TransferMessageCount': string;
+                'd2p1:TransferDeadLetterMessageCount': string;
+            };
+            EnableSubscriptionPartitioning: string;
+            FilteringMessagesBeforePublishing: string;
+            IsExpress: string;
+            SubscriptionCount: string;
+            SupportOrdering: string;
+            TopicName: string;
+        }
+
+        export interface Queue extends ExtendedBase {
+            DeadLetteringOnMessageExpiration: string;
+            LockDuration: Duration;
+            MaxDeliveryCount: string;
+            MessageCount: string;
+            QueueName: string;
+            RequiresSession: string;
+            SupportOrdering: string;
+        }
+
+        export interface Subscription extends ExtendedBase {
+            CountDetails: {
+                'd3p1:ActiveMessageCount': string;
+                'd3p1:DeadLetterMessageCount': string;
+                'd3p1:ScheduledMessageCount': string;
+                'd3p1:TransferMessageCount': string;
+                'd3p1:TransferDeadLetterMessageCount': string;
+            };
+            DeadLetteringOnFilterEvaluationExceptions: string;
+            DeadLetteringOnMessageExpiration: string;
+            LockDuration: string;
+            MaxDeliveryCount: string;
+            MessageCount: string;
+            RequiresSession: string;
+            SubscriptionName: string;
+            TopicName: string;
+        }
+
+        /**
+         * @see https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-sql-filter
+         */
+        interface SqlFilter {
+            readonly CompatibilityLevel: string;
+            Parameters?: Dictionary<any>;
+            RequiresPreprocessing?: string;
+            SqlExpression: string;
+        }
+
+        type CorrelationFilter = Partial<{
+            ContentType: string;
+            CorrelationId: string;
+            Label: string;
+            Properties: string;
+            ReplyTo: string;
+            ReplyToSessionId: string;
+            RequiresPreprocessing: string;
+            SessionId: string;
+            To: string;
+        }>;
+
+        export interface Rule extends Base {
+            Action: string | SqlFilter;
+            Filter: SqlFilter | CorrelationFilter;
+            Name: string;
+            TopicName: string;
+            SubscriptionName: string;
+            RuleName: string;
         }
     }
 
-    export module Mpns { interface Service { } }
+    /*
+     * Callbacks
+     */
+    export type ResponseCallback = (error: Error | null, response: Response) => void;
 
-    export module Wns {
-        interface Payload {
-            text1?: string;
-            text2?: string;
-            text3?: string;
-            text4?: string;
-            image1src?: string;
-            image1alt?: string;
-            image2src?: string;
-            image2alt?: string;
-            image3src?: string;
-            image3alt?: string;
-            image4src?: string;
-            image4alt?: string;
-            lang?: string;
-            type?: string;
-        }
+    export type ResultAndResponseCallback = (error: Error | null,
+                                             result: boolean | Results.Models.Base | Results.Models.Base[],
+                                             response: Response) => void;
 
-        interface Options {
-            headers: Object;
-        }
+    export type TypedResultAndResponseCallback<T> = (error: Error | null,
+                                                     result: T,
+                                                     response: Response) => void;
 
-        interface Service {
-            new(service: NotificationHubService): Service;
-            sendTileSquareBlock(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquareText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquareText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquareText03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquareText04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText05(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText06(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText07(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText08(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText09(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText10(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideText11(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquareImage(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquarePeekImageAndText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquarePeekImageAndText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquarePeekImageAndText03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileSquarePeekImageAndText04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideImage(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideImageCollection(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideImageAndText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideImageAndText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideBlockAndText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideBlockAndText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideSmallImageAndText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideSmallImageAndText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideSmallImageAndText03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideSmallImageAndText04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWideSmallImageAndText05(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageCollection01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageCollection02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageCollection03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageCollection04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageCollection05(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageCollection06(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageAndText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImageAndText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImage01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImage02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImage03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImage04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImage05(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendTileWidePeekImage06(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastText03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastText04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastImageAndText01(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastImageAndText02(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastImageAndText03(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendToastImageAndText04(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            // badges = ['none','activity','alert','available','away','busy','newMessage','paused','playing','unavailable','error', 'attention']
-            sendBadge(tags: string | string[], value: string | number, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            sendRaw(tags: string | string[], payload: any, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            // types = ['wns/toast', 'wns/badge', 'wns/tile', 'wns/raw']
-            send(tags: string | string[], payload: string, type: string, optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            createNativeRegistration(channel: string, tags: string | string[], optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            createOrUpdateNativeRegistration(registrationId: string, channel: string, tags: string | string[], optionsOrCallback?: Options | Callback, callback?: Callback): void;
-            listRegistrationsByChannel(channel: string, optionsOrCallback?: { top: number, skip: number } | Callback, callback?: Callback): void;
-        }
-    }
+    /*
+     * Options interfaces with all properties as optional
+     */
+    export type BrokerProperties = Partial<IBrokerProperties>;
+    export type BrokerPropertiesResponse = IBrokerPropertiesResponse & Partial<IBrokerProperties>;
+    export type CreateQueueOptions = Partial<IQueueOptions>;
+    export type CreateTopicOptions = Partial<ICreateTopicOptions>;
+    export type CreateTopicIfNotExistsOptions = Partial<ICreateTopicIfNotExistsOptions>;
+    export type CreateSubscriptionOptions = Partial<ICreateSubscriptionOptions>;
+    export type ListSubscriptionsOptions = Partial<PaginationOptions>;
+    export type ListRulesOptions = Partial<PaginationOptions>;
+    export type CreateRuleOptions = Partial<ICreateRuleOptions>;
+    export type CreateNotificationHubOptions = Partial<ICreateNotificationHubOptions>;
+    export type ListNotificationHubsOptions = Partial<PaginationOptions>;
+
+    export type MessageOrName = Message | string;
 }
diff --git a/types/azure-sb/lib/apnsservice.d.ts b/types/azure-sb/lib/apnsservice.d.ts
new file mode 100644
index 0000000000..05ca2f7b43
--- /dev/null
+++ b/types/azure-sb/lib/apnsservice.d.ts
@@ -0,0 +1,83 @@
+import { Azure } from '../index';
+import NotificationHubService = require('azure-sb/lib/notificationhubservice');
+import ResponseCallback = Azure.ServiceBus.ResponseCallback;
+import NotificationHubRegistration = Azure.ServiceBus.NotificationHubRegistration;
+import ListNotificationHubsOptions = Azure.ServiceBus.ListNotificationHubsOptions;
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+type Template = Partial<{
+    expiry: Date;
+    aps: object;
+    badge: number;
+    alert: string;
+    sound: string;
+    payload: object;
+}>;
+
+declare class ApnsService {
+    constructor(notificationHubService: NotificationHubService);
+
+    public notificationHubService: NotificationHubService;
+
+    public send(tags: string | string[],
+                payload: object | string,
+                callback: ResponseCallback): void;
+
+    public send(tags: string | string[],
+                payload: object | string,
+                options: { headers: Dictionary<string> },
+                callback: ResponseCallback): void;
+
+    public createNativeRegistration(token: string,
+                                    tags: string | string[],
+                                    callback: ResponseCallback): void;
+
+    public createNativeRegistration(token: string,
+                                    tags: string | string[],
+                                    options: object,
+                                    callback: ResponseCallback): void;
+
+    public createOrUpdateNativeRegistration(registrationId: string,
+                                            token: string,
+                                            tags: string | string[],
+                                            callback: ResponseCallback): void;
+
+    public createOrUpdateNativeRegistration(registrationId: string,
+                                            token: string,
+                                            tags: string | string[],
+                                            options: object,
+                                            callback: ResponseCallback): void;
+
+    public createTemplateRegistration(token: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      callback: ResponseCallback): void;
+
+    public createTemplateRegistration(token: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      options: object,
+                                      callback: ResponseCallback): void;
+
+    public updateTemplateRegistration(registrationId: string,
+                                      token: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      callback: ResponseCallback): void;
+
+    public updateTemplateRegistration(registrationId: string,
+                                      token: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      options: { headers: Dictionary<string> },
+                                      callback: ResponseCallback): void;
+
+    public listRegistrationsByToken(token: string,
+                                    callback: ResponseCallback): void;
+
+    public listRegistrationsByToken(token: string,
+                                    options: ListNotificationHubsOptions,
+                                    callback: ResponseCallback): void;
+}
+
+export = ApnsService;
diff --git a/types/azure-sb/lib/gcmservice.d.ts b/types/azure-sb/lib/gcmservice.d.ts
new file mode 100644
index 0000000000..4d1c8f203c
--- /dev/null
+++ b/types/azure-sb/lib/gcmservice.d.ts
@@ -0,0 +1,71 @@
+import { Azure } from '../index';
+import NotificationHubService = require('azure-sb/lib/notificationhubservice');
+import ResponseCallback = Azure.ServiceBus.ResponseCallback;
+import NotificationHubRegistration = Azure.ServiceBus.NotificationHubRegistration;
+import ListNotificationHubsOptions = Azure.ServiceBus.ListNotificationHubsOptions;
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+type Template = Partial<{}>;
+
+declare class GcmService {
+    constructor(notificationHubService: NotificationHubService);
+
+    public notificationHubService: NotificationHubService;
+
+    public send(tags: string | string[],
+                payload: object | string,
+                callback: ResponseCallback): void;
+
+    public createNativeRegistration(gcmRegistrationId: string,
+                                    tags: string | string[],
+                                    callback: ResponseCallback): void;
+
+    public createNativeRegistration(token: string,
+                                    tags: string | string[],
+                                    options: object,
+                                    callback: ResponseCallback): void;
+
+    public createOrUpdateNativeRegistration(registrationId: string,
+                                            gcmRegistrationId: string,
+                                            tags: string | string[],
+                                            callback: ResponseCallback): void;
+
+    public createOrUpdateNativeRegistration(registrationId: string,
+                                            gcmRegistrationId: string,
+                                            tags: string | string[],
+                                            options: object,
+                                            callback: ResponseCallback): void;
+
+    public createTemplateRegistration(gcmRegistrationId: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      callback: ResponseCallback): void;
+
+    public createTemplateRegistration(gcmRegistrationId: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      options: object,
+                                      callback: ResponseCallback): void;
+
+    public updateTemplateRegistration(registrationId: string,
+                                      gcmRegistrationId: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      callback: ResponseCallback): void;
+
+    public updateTemplateRegistration(registrationId: string,
+                                      gcmRegistrationId: string,
+                                      tags: string | string[],
+                                      template: Template | string,
+                                      options: { headers: Dictionary<string> },
+                                      callback: ResponseCallback): void;
+
+    public listRegistrationsByGcmRegistrationId(gcmRegistrationId: string,
+                                                callback: ResponseCallback): void;
+
+    public listRegistrationsByGcmRegistrationId(gcmRegistrationId: string,
+                                                options: ListNotificationHubsOptions,
+                                                callback: ResponseCallback): void;
+}
+
+export = GcmService;
diff --git a/types/azure-sb/lib/models/acstokenresult.d.ts b/types/azure-sb/lib/models/acstokenresult.d.ts
new file mode 100644
index 0000000000..531c606de1
--- /dev/null
+++ b/types/azure-sb/lib/models/acstokenresult.d.ts
@@ -0,0 +1,29 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Azure } from 'azure-sb';
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+export namespace Azure.ServiceBus.Results {
+    export interface AcsTokenResponse extends Dictionary<string | Dictionary<string>> {
+        WrapAccessToken: Dictionary<string>;
+        WrapAccessTokenExpiresIn: Dictionary<string>;
+    }
+
+    export interface AcsTokenResult {
+        parse(acsTokenQueryString: string): AcsTokenResponse;
+    }
+}
diff --git a/types/azure-sb/lib/models/notificationhubresult.d.ts b/types/azure-sb/lib/models/notificationhubresult.d.ts
new file mode 100644
index 0000000000..1aef66c3d6
--- /dev/null
+++ b/types/azure-sb/lib/models/notificationhubresult.d.ts
@@ -0,0 +1,26 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Azure } from 'azure-sb';
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+export namespace Azure.ServiceBus.Results {
+    export interface NotificationHubResult {
+        serialize(resource: Azure.ServiceBus.CreateNotificationHubOptions): string;
+
+        parse(xml: object): object | object[];
+    }
+}
diff --git a/types/azure-sb/lib/models/queuemessageresult.d.ts b/types/azure-sb/lib/models/queuemessageresult.d.ts
new file mode 100644
index 0000000000..a50d0965cb
--- /dev/null
+++ b/types/azure-sb/lib/models/queuemessageresult.d.ts
@@ -0,0 +1,40 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Module dependencies.
+import { Azure } from 'azure-sb';
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+export namespace Azure.ServiceBus.Results {
+    export interface QueueResponse {
+        body: any;
+        headers: Dictionary<string>
+    }
+
+    export interface QueueMessageResponse {
+        body: any;
+        brokerProperties?: Azure.ServiceBus.BrokerProperties;
+        customProperties?: Dictionary<any>;
+        contentType?: string;
+        location?: string;
+    }
+
+    export interface QueueMessageResult {
+        parse(responseObject: object): QueueMessageResponse;
+
+        isRFC1123(value: string | any): boolean;
+    }
+}
diff --git a/types/azure-sb/lib/models/queueresult.d.ts b/types/azure-sb/lib/models/queueresult.d.ts
new file mode 100644
index 0000000000..abeed96dff
--- /dev/null
+++ b/types/azure-sb/lib/models/queueresult.d.ts
@@ -0,0 +1,41 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Azure } from 'azure-sb';
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+export namespace Azure.ServiceBus.Results {
+    export interface QueueProperties {
+        DeadLetteringOnMessageExpiration: string;
+        DefaultMessageTimeToLive: string;
+        DuplicateDetectionHistoryTimeWindow: string;
+        EnableBatchedOperations: boolean;
+        EnablePartitioning: boolean;
+        LockDuration: string;
+        MaxDeliveryCount: number;
+        MaxSizeInMegabytes: number;
+        MessageCount: number;
+        RequiresDuplicateDetection: boolean;
+        RequiresSession: boolean;
+        SizeInBytes: number;
+    }
+
+    export interface QueueResult {
+        serialize(resource: QueueProperties): string;
+
+        parse(xml: object): object | object[];
+    }
+}
diff --git a/types/azure-sb/lib/models/registrationresult.d.ts b/types/azure-sb/lib/models/registrationresult.d.ts
new file mode 100644
index 0000000000..81c1fdd824
--- /dev/null
+++ b/types/azure-sb/lib/models/registrationresult.d.ts
@@ -0,0 +1,26 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Azure } from 'azure-sb';
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+export namespace Azure.ServiceBus.Results {
+    export interface RegistrationResult {
+        serialize(type: string, resource: object, properties: string[]): string;
+
+        parse(xml: object): object | object[];
+    }
+}
diff --git a/types/azure-sb/lib/models/resourceresult.d.ts b/types/azure-sb/lib/models/resourceresult.d.ts
new file mode 100644
index 0000000000..b9654b0438
--- /dev/null
+++ b/types/azure-sb/lib/models/resourceresult.d.ts
@@ -0,0 +1,28 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Azure } from 'azure-sb';
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+export namespace Azure.ServiceBus.Results {
+    export interface ResourceResult {
+        setName(entry: Dictionary<any> | { _: { id: string } }, nameProperty: string): void;
+
+        serialize(resourceName: string, resource: object, properties: string[]): string;
+
+        parse(resourceName: string, nameProperty: string, xml: object): object | object[];
+    }
+}
diff --git a/types/azure-sb/lib/models/ruleresult.d.ts b/types/azure-sb/lib/models/ruleresult.d.ts
new file mode 100644
index 0000000000..369a4ddeb7
--- /dev/null
+++ b/types/azure-sb/lib/models/ruleresult.d.ts
@@ -0,0 +1,26 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Module dependencies.
+import { Azure } from 'azure-sb';
+
+export namespace Azure.ServiceBus.Results {
+    export interface RuleResult {
+        serialize(rule: Azure.ServiceBus.CreateRuleOptions): string;
+
+        parse(xml: object): object | object[];
+    }
+}
diff --git a/types/azure-sb/lib/models/subscriptionresult.d.ts b/types/azure-sb/lib/models/subscriptionresult.d.ts
new file mode 100644
index 0000000000..003c085da0
--- /dev/null
+++ b/types/azure-sb/lib/models/subscriptionresult.d.ts
@@ -0,0 +1,37 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Azure } from 'azure-sb';
+
+export namespace Azure.ServiceBus.Results {
+    export interface SubscriptionProperties {
+        LockDuration: string;
+        RequiresSession: boolean;
+        DefaultMessageTimeToLive: string;
+        DeadLetteringOnMessageExpiration: string;
+        DeadLetteringOnFilterEvaluationExceptions: string;
+        MessageCount: number;
+        MaxDeliveryCount: number;
+        EnableBatchedOperations: boolean;
+        AutoDeleteOnIdle: boolean;
+    }
+
+    export interface SubscriptionResult {
+        serialize(resource: SubscriptionProperties): string;
+
+        parse(xml: object): object | object[];
+    }
+}
diff --git a/types/azure-sb/lib/models/topicresult.d.ts b/types/azure-sb/lib/models/topicresult.d.ts
new file mode 100644
index 0000000000..7f20125b51
--- /dev/null
+++ b/types/azure-sb/lib/models/topicresult.d.ts
@@ -0,0 +1,32 @@
+//
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+export namespace Azure.ServiceBus.Results {
+    export interface TopicProperties {
+        DefaultMessageTimeToLive: string;
+        MaxSizeInMegabytes: number;
+        RequiresDuplicateDetection: boolean;
+        DuplicateDetectionHistoryTimeWindow: string;
+        EnableBatchedOperations: boolean;
+        SizeInBytes: number;
+        SupportOrdering: boolean;
+        EnablePartitioning: boolean;
+    }
+}
+
+export function serialize(resource: Azure.ServiceBus.Results.TopicProperties): string;
+
+export function parse(xml: object): object | object[];
diff --git a/types/azure-sb/lib/mpnservice.d.ts b/types/azure-sb/lib/mpnservice.d.ts
new file mode 100644
index 0000000000..d476f4d984
--- /dev/null
+++ b/types/azure-sb/lib/mpnservice.d.ts
@@ -0,0 +1,116 @@
+import { Azure } from '../index';
+import NotificationHubService = require('azure-sb/lib/notificationhubservice');
+import ResponseCallback = Azure.ServiceBus.ResponseCallback;
+import NotificationHubRegistration = Azure.ServiceBus.NotificationHubRegistration;
+import ListNotificationHubsOptions = Azure.ServiceBus.ListNotificationHubsOptions;
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+type Template = TileTemplate | FlipTileTemplate | ToastTemplate;
+
+interface TileTemplate {
+    backgroundImage: string;
+    count: string;
+    title: string;
+    backBackgroundImage: string;
+    backTitle: string;
+    backContent: string;
+    id: string;
+}
+
+interface FlipTileTemplate extends TileTemplate {
+    smallBackgroundImage: string;
+    wideBackgroundImage: string;
+    wideBackContent: string;
+    wideBackBackgroundImage: string;
+}
+
+interface ToastTemplate {
+    text1: string;
+    text2: string;
+    param?: string;
+}
+
+declare class MpnsService {
+    constructor(notificationHubService: NotificationHubService);
+
+    public notificationHubService: NotificationHubService;
+
+    public send(tags: string | string[],
+                payload: object | string,
+                targetName: string,
+                notificationClass: string,
+                callback: ResponseCallback): void;
+
+    public send(tags: string | string[],
+                payload: object | string,
+                targetName: string,
+                notificationClass: string,
+                options: { headers: Dictionary<string> },
+                callback: ResponseCallback): void;
+
+    public createNativeRegistration(channel: string,
+                                    tags: string | string[],
+                                    callback: ResponseCallback): void;
+
+    public createNativeRegistration(channel: string,
+                                    tags: string | string[],
+                                    options: object,
+                                    callback: ResponseCallback): void;
+
+    public createOrUpdateNativeRegistration(registrationId: string,
+                                            channel: string,
+                                            tags: string | string[],
+                                            callback: ResponseCallback): void;
+
+    public createOrUpdateNativeRegistration(registrationId: string,
+                                            channel: string,
+                                            tags: string | string[],
+                                            options: object,
+                                            callback: ResponseCallback): void;
+
+    public createRawTemplateRegistration(channel: string,
+                                         tags: string | string[],
+                                         template: Template | string,
+                                         callback: ResponseCallback): void;
+
+    public createRawTemplateRegistration(channel: string,
+                                         tags: string | string[],
+                                         template: Template | string,
+                                         options: object,
+                                         callback: ResponseCallback): void;
+
+    public createOrUpdateRawTemplateRegistration(registrationId: string,
+                                                 channel: string,
+                                                 tags: string | string[],
+                                                 template: Template | string,
+                                                 callback: ResponseCallback): void;
+
+    public createOrUpdateRawTemplateRegistration(registrationId: string,
+                                                 channel: string,
+                                                 tags: string | string[],
+                                                 template: Template | string,
+                                                 options: object,
+                                                 callback: ResponseCallback): void;
+
+    public updatesRawTemplateRegistration(registrationId: string,
+                                          channel: string,
+                                          tags: string | string[],
+                                          template: Template | string,
+                                          callback: ResponseCallback): void;
+
+    public updatesRawTemplateRegistration(registrationId: string,
+                                          channel: string,
+                                          tags: string | string[],
+                                          template: Template | string,
+                                          options: object,
+                                          callback: ResponseCallback): void;
+
+    public listRegistrationsByChannel(channel: string,
+                                      callback: ResponseCallback): void;
+
+    public listRegistrationsByChannel(channel: string,
+                                      options: ListNotificationHubsOptions,
+                                      callback: ResponseCallback): void;
+}
+
+export = MpnsService;
diff --git a/types/azure-sb/lib/notificationhubservice.d.ts b/types/azure-sb/lib/notificationhubservice.d.ts
new file mode 100644
index 0000000000..d56b53d9d5
--- /dev/null
+++ b/types/azure-sb/lib/notificationhubservice.d.ts
@@ -0,0 +1,102 @@
+import { Azure } from 'azure-sb';
+import Callback = Azure.ServiceBus.ResponseCallback;
+import NotificationHubRegistration = Azure.ServiceBus.NotificationHubRegistration;
+import ListNotificationHubsOptions = Azure.ServiceBus.ListNotificationHubsOptions;
+
+import ApnsService = require('./apnsservice');
+import GcmService = require('./gcmservice');
+import MpnsService = require('./mpnservice');
+import WnsService = require('./wnsservice');
+
+declare class NotificationHubService {
+    constructor(hubName: string,
+                endpointOrConnectionString: string,
+                sharedAccessKeyName: string,
+                sharedAccessKeyValue: string);
+
+    public hubName: string;
+    public wns: WnsService;
+    public apns: ApnsService;
+    public gcm: GcmService;
+    public mpns: MpnsService;
+
+    public send(tags: string,
+                payload: object | string,
+                callback: Callback): void;
+
+    public send(tags: string,
+                payload: object | string,
+                options: { headers: object },
+                callback: Callback): void;
+
+    public createOrUpdateInstallation(installation: string,
+                                      callback: Callback): void;
+
+    public createOrUpdateInstallation(installation: string,
+                                      options: any,
+                                      callback: Callback): void;
+
+    public patchInstallation(installationId: string,
+                             partialUpdateOperations: any[],
+                             callback: Callback): void;
+
+    public patchInstallation(installationId: string,
+                             partialUpdateOperations: any[],
+                             options: any,
+                             callback: Callback): void;
+
+    public deleteInstallation(installationId: string,
+                              callback: Callback): void;
+
+    public deleteInstallation(installationId: string,
+                              options: any,
+                              callback: Callback): void;
+
+    public getInstallation(installationId: string,
+                           callback: Callback): void;
+
+    public getInstallation(installationId: string,
+                           options: any,
+                           callback: Callback): void;
+
+    public createRegistrationId(callback: Callback): void;
+
+    public getRegistration(registrationId: string,
+                           callback: Callback): void;
+
+    public getRegistration(registrationId: string,
+                           options: any,
+                           callback: Callback): void;
+
+    public deleteRegistration(registrationId: string,
+                              callback: Callback): void;
+
+    public deleteRegistration(registrationId: string,
+                              options: { etag: any },
+                              callback: Callback): void;
+
+    public updateRegistration(registration: NotificationHubRegistration,
+                              callback: Callback): void;
+
+    public updateRegistration(registration: NotificationHubRegistration,
+                              options: { etag: any },
+                              callback: Callback): void;
+
+    public createOrUpdateRegistration(registration: NotificationHubRegistration,
+                                      options: { etag: any },
+                                      callback: Callback): void;
+
+    public listRegistrations(callback: Callback): void;
+
+    public listRegistrations(options: ListNotificationHubsOptions,
+                             callback: Callback): void;
+
+    public listRegistrationsByTag(tag: string,
+                                  callback: Callback): void;
+
+    public listRegistrationsByTag(tag: string,
+                                  options: ListNotificationHubsOptions,
+                                  callback: Callback): void;
+}
+
+export = NotificationHubService;
diff --git a/types/azure-sb/lib/servicebusservice.d.ts b/types/azure-sb/lib/servicebusservice.d.ts
new file mode 100644
index 0000000000..44f2b2c522
--- /dev/null
+++ b/types/azure-sb/lib/servicebusservice.d.ts
@@ -0,0 +1,206 @@
+import { Azure } from '../index';
+
+import ServiceBusServiceBase = require('./servicebusservicebase');
+
+import CreateNotificationHubOptions = Azure.ServiceBus.CreateNotificationHubOptions;
+import CreateQueueOptions = Azure.ServiceBus.CreateQueueOptions;
+import CreateRuleOptions = Azure.ServiceBus.CreateRuleOptions;
+import CreateSubscriptionOptions = Azure.ServiceBus.CreateSubscriptionOptions;
+import CreateTopicIfNotExistsOptions = Azure.ServiceBus.CreateTopicIfNotExistsOptions;
+import CreateTopicOptions = Azure.ServiceBus.CreateTopicOptions;
+import ListNotificationHubsOptions = Azure.ServiceBus.ListNotificationHubsOptions;
+import ListRulesOptions = Azure.ServiceBus.ListRulesOptions;
+import ListSubscriptionsOptions = Azure.ServiceBus.ListSubscriptionsOptions;
+import MessageOrName = Azure.ServiceBus.MessageOrName;
+import Queue = Azure.ServiceBus.Results.Models.Queue;
+import ReceiveQueueMessageOptions = Azure.ServiceBus.ReceiveQueueMessageOptions;
+import ReceiveSubscriptionMessageOptions = Azure.ServiceBus.ReceiveSubscriptionMessageOptions;
+import ResponseCallback = Azure.ServiceBus.ResponseCallback;
+import ResultAndResponseCallback = Azure.ServiceBus.ResultAndResponseCallback;
+import Rule = Azure.ServiceBus.Results.Models.Rule;
+import Subscription = Azure.ServiceBus.Results.Models.Subscription;
+import Topic = Azure.ServiceBus.Results.Models.Topic;
+import TypedResultAndResponseCallback = Azure.ServiceBus.TypedResultAndResponseCallback;
+import Message = Azure.ServiceBus.Message;
+
+declare class ServiceBusService extends ServiceBusServiceBase {
+    constructor(configOrNamespaceOrConnectionString?: string,
+                accessKey?: string,
+                issuer?: string,
+                acsNamespace?: string,
+                host?: string,
+                authenticationProvider?: object);
+
+    public receiveQueueMessage(queuePath: string,
+                               callback: TypedResultAndResponseCallback<Message>): void;
+
+    public receiveQueueMessage(queuePath: string,
+                               options: ReceiveQueueMessageOptions,
+                               callback: TypedResultAndResponseCallback<Message>): void;
+
+    public receiveSubscriptionMessage(topicPath: string,
+                                      subscriptionPath: string,
+                                      callback: TypedResultAndResponseCallback<Message>): void;
+
+    public receiveSubscriptionMessage(topicPath: string,
+                                      subscriptionPath: string,
+                                      options: ReceiveSubscriptionMessageOptions,
+                                      callback: TypedResultAndResponseCallback<Message>): void;
+
+    public deleteMessage(message: MessageOrName,
+                         callback: ResponseCallback): void;
+
+    public unlockMessage(message: MessageOrName,
+                         callback: ResponseCallback): void;
+
+    public renewLockForMessage(message: MessageOrName,
+                               callback: ResponseCallback): void;
+
+    public sendQueueMessage(queuePath: string,
+                            message: MessageOrName,
+                            callback: ResponseCallback): void;
+
+    public sendTopicMessage(topicPath: string,
+                            message: MessageOrName,
+                            callback: ResponseCallback): void;
+
+    /*
+     * Queue Management functions
+     */
+
+    public createQueue(queuePath: string,
+                       callback: TypedResultAndResponseCallback<Queue>): void;
+
+    public createQueue(queuePath: string,
+                       options: CreateQueueOptions,
+                       callback: TypedResultAndResponseCallback<Queue>): void;
+
+    public createQueueIfNotExists(queuePath: string,
+                                  callback: TypedResultAndResponseCallback<boolean>): void;
+
+    public createQueueIfNotExists(queuePath: string,
+                                  options: CreateQueueOptions,
+                                  callback: TypedResultAndResponseCallback<boolean>): void;
+
+    public deleteQueue(queuePath: string,
+                       callback: ResponseCallback): void;
+
+    public getQueue(queuePath: string,
+                    callback: TypedResultAndResponseCallback<Queue>): void;
+
+    public listQueues(queuePath: string,
+                      callback: TypedResultAndResponseCallback<Queue[]>): void;
+
+    /*
+     * Topic Management functions
+     */
+
+    public createTopic(topicPath: string,
+                       callback: TypedResultAndResponseCallback<Topic>): void;
+
+    public createTopic(topicPath: string,
+                       options: CreateTopicOptions,
+                       callback: TypedResultAndResponseCallback<Topic>): void;
+
+    public createTopicIfNotExists(topicPath: string,
+                                  callback: TypedResultAndResponseCallback<boolean>): void;
+
+    public createTopicIfNotExists(topicPath: string,
+                                  options: CreateTopicIfNotExistsOptions,
+                                  callback: TypedResultAndResponseCallback<boolean>): void;
+
+    public deleteTopic(topicPath: string,
+                       callback: ResponseCallback): void;
+
+    public getTopic(topicPath: string,
+                    callback: TypedResultAndResponseCallback<Topic>): void;
+
+    public listTopics(topicPath: string,
+                      callback: TypedResultAndResponseCallback<Topic[]>): void;
+
+    /*
+     * Subscription functions
+     */
+
+    public createSubscription(topicPath: string,
+                              subscriptionPath: string,
+                              callback: TypedResultAndResponseCallback<Subscription>): void;
+
+    public createSubscription(topicPath: string,
+                              subscriptionPath: string,
+                              options: CreateSubscriptionOptions,
+                              callback: TypedResultAndResponseCallback<Subscription>): void;
+
+    public deleteSubscription(topicPath: string,
+                              subscriptionPath: string,
+                              callback: ResponseCallback): void;
+
+    public getSubscription(topicPath: string,
+                           subscriptionPath: string,
+                           callback: TypedResultAndResponseCallback<Subscription>): void;
+
+    public listSubscriptions(topicPath: string,
+                             callback: TypedResultAndResponseCallback<Subscription[]>): void;
+
+    public listSubscriptions(topicPath: string,
+                             options: ListSubscriptionsOptions,
+                             callback: TypedResultAndResponseCallback<Subscription[]>): void;
+
+    /*
+     * Rule functions
+     */
+
+    public createRule(topicPath: string,
+                      subscriptionPath: string,
+                      rulePath: string,
+                      callback: TypedResultAndResponseCallback<Rule>): void;
+
+    public createRule(topicPath: string,
+                      subscriptionPath: string,
+                      rulePath: string,
+                      options: CreateRuleOptions,
+                      callback: TypedResultAndResponseCallback<Rule>): void;
+
+    public deleteRule(topicPath: string,
+                      subscriptionPath: string,
+                      rulePath: string,
+                      callback: ResponseCallback): void;
+
+    public getRule(topicPath: string,
+                   subscriptionPath: string,
+                   rulePath: string,
+                   callback: TypedResultAndResponseCallback<Rule>): void;
+
+    public listRules(topicPath: string,
+                     subscriptionPath: string,
+                     callback: TypedResultAndResponseCallback<Rule[]>): void;
+
+    public listRules(topicPath: string,
+                     subscriptionPath: string,
+                     options: ListRulesOptions,
+                     callback: TypedResultAndResponseCallback<Rule[]>): void;
+
+    /*
+     * NotificationHub functions
+     */
+
+    public createNotificationHub(hubPath: string,
+                                 callback: ResultAndResponseCallback): void;
+
+    public createNotificationHub(hubPath: string,
+                                 options: CreateNotificationHubOptions,
+                                 callback: ResultAndResponseCallback): void;
+
+    public getNotificationHub(hubPath: string,
+                              callback: ResultAndResponseCallback): void;
+
+    public listNotificationHubs(callback: ResultAndResponseCallback): void;
+
+    public listNotificationHubs(options: ListNotificationHubsOptions,
+                                callback: ResultAndResponseCallback): void;
+
+    public deleteNotificationHub(hubPath: string,
+                                 callback: ResponseCallback): void;
+}
+
+export = ServiceBusService;
diff --git a/types/azure-sb/lib/servicebusservicebase.d.ts b/types/azure-sb/lib/servicebusservicebase.d.ts
new file mode 100644
index 0000000000..c29ead478c
--- /dev/null
+++ b/types/azure-sb/lib/servicebusservicebase.d.ts
@@ -0,0 +1,12 @@
+import ServiceBusServiceClient = require('azure-sb/lib/servicebusserviceclient');
+
+declare class ServiceBusServiceBase extends ServiceBusServiceClient {
+    constructor(configOrNamespaceOrConnectionString: string,
+                accessKey?: string,
+                issuer?: string,
+                acsNamespace?: string,
+                host?: string,
+                authenticationProvider?: object);
+}
+
+export = ServiceBusServiceBase;
diff --git a/types/azure-sb/lib/servicebusserviceclient.d.ts b/types/azure-sb/lib/servicebusserviceclient.d.ts
new file mode 100644
index 0000000000..c97b1e3107
--- /dev/null
+++ b/types/azure-sb/lib/servicebusserviceclient.d.ts
@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import EventEmitter = NodeJS.EventEmitter;
+
+declare class ServiceBusServiceClient extends EventEmitter {
+    constructor(accessKey?: string,
+                issuer?: string,
+                sharedAccessKeyName?: string,
+                sharedAccessKeyValue?: string,
+                host?: string,
+                acsHost?: string,
+                authenticationProvider?: object);
+}
+
+export = ServiceBusServiceClient;
diff --git a/types/azure-sb/lib/wnsservice.d.ts b/types/azure-sb/lib/wnsservice.d.ts
new file mode 100644
index 0000000000..1fef2da042
--- /dev/null
+++ b/types/azure-sb/lib/wnsservice.d.ts
@@ -0,0 +1,377 @@
+import NotificationHubService = require('azure-sb/lib/notificationhubservice');
+import Callback = Azure.ServiceBus.ResponseCallback;
+import { Azure } from 'azure-sb';
+import ListNotificationHubsOptions = Azure.ServiceBus.ListNotificationHubsOptions;
+import Dictionary = Azure.ServiceBus.Dictionary;
+
+type Payload = Partial<{
+    text1: string;
+    text2: string;
+    text3: string;
+    text4: string;
+    image1src: string;
+    image1alt: string;
+    image2src: string;
+    image2alt: string;
+    image3src: string;
+    image3alt: string;
+    image4src: string;
+    image4alt: string;
+    lang: string;
+    type: string;
+}>;
+
+interface Options {
+    headers: Dictionary<string>;
+}
+
+type badges =
+    'none'
+    | 'activity'
+    | 'alert'
+    | 'available'
+    | 'away'
+    | 'busy'
+    | 'newMessage'
+    | 'paused'
+    | 'playing'
+    | 'unavailable'
+    | 'error'
+    | 'attention';
+
+type types = 'wns/toast' | 'wns/badge' | 'wns/tile' | 'wns/raw';
+
+declare class WnsService {
+    constructor(service: NotificationHubService);
+
+    public notificationHubService: NotificationHubService;
+
+    sendTileSquareBlock(tags: string | string[],
+                        payload: any,
+                        optionsOrCallback: Options | Callback,
+                        callback?: Callback): void;
+
+    sendTileSquareText01(tags: string | string[],
+                         payload: any,
+                         optionsOrCallback: Options | Callback,
+                         callback?: Callback): void;
+
+    sendTileSquareText02(tags: string | string[],
+                         payload: any,
+                         optionsOrCallback: Options | Callback,
+                         callback?: Callback): void;
+
+    sendTileSquareText03(tags: string | string[],
+                         payload: any,
+                         optionsOrCallback: Options | Callback,
+                         callback?: Callback): void;
+
+    sendTileSquareText04(tags: string | string[],
+                         payload: any,
+                         optionsOrCallback: Options | Callback,
+                         callback?: Callback): void;
+
+    sendTileWideText01(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText02(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText03(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText04(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText05(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText06(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText07(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText08(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText09(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText10(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileWideText11(tags: string | string[],
+                       payload: any,
+                       optionsOrCallback: Options | Callback,
+                       callback?: Callback): void;
+
+    sendTileSquareImage(tags: string | string[],
+                        payload: any,
+                        optionsOrCallback: Options | Callback,
+                        callback?: Callback): void;
+
+    sendTileSquarePeekImageAndText01(tags: string | string[],
+                                     payload: any,
+                                     optionsOrCallback: Options | Callback,
+                                     callback?: Callback): void;
+
+    sendTileSquarePeekImageAndText02(tags: string | string[],
+                                     payload: any,
+                                     optionsOrCallback: Options | Callback,
+                                     callback?: Callback): void;
+
+    sendTileSquarePeekImageAndText03(tags: string | string[],
+                                     payload: any,
+                                     optionsOrCallback: Options | Callback,
+                                     callback?: Callback): void;
+
+    sendTileSquarePeekImageAndText04(tags: string | string[],
+                                     payload: any,
+                                     optionsOrCallback: Options | Callback,
+                                     callback?: Callback): void;
+
+    sendTileWideImage(tags: string | string[],
+                      payload: any,
+                      optionsOrCallback: Options | Callback,
+                      callback?: Callback): void;
+
+    sendTileWideImageCollection(tags: string | string[],
+                                payload: any,
+                                optionsOrCallback: Options | Callback,
+                                callback?: Callback): void;
+
+    sendTileWideImageAndText01(tags: string | string[],
+                               payload: any,
+                               optionsOrCallback: Options | Callback,
+                               callback?: Callback): void;
+
+    sendTileWideImageAndText02(tags: string | string[],
+                               payload: any,
+                               optionsOrCallback: Options | Callback,
+                               callback?: Callback): void;
+
+    sendTileWideBlockAndText01(tags: string | string[],
+                               payload: any,
+                               optionsOrCallback: Options | Callback,
+                               callback?: Callback): void;
+
+    sendTileWideBlockAndText02(tags: string | string[],
+                               payload: any,
+                               optionsOrCallback: Options | Callback,
+                               callback?: Callback): void;
+
+    sendTileWideSmallImageAndText01(tags: string | string[],
+                                    payload: any,
+                                    optionsOrCallback: Options | Callback,
+                                    callback?: Callback): void;
+
+    sendTileWideSmallImageAndText02(tags: string | string[],
+                                    payload: any,
+                                    optionsOrCallback: Options | Callback,
+                                    callback?: Callback): void;
+
+    sendTileWideSmallImageAndText03(tags: string | string[],
+                                    payload: any,
+                                    optionsOrCallback: Options | Callback,
+                                    callback?: Callback): void;
+
+    sendTileWideSmallImageAndText04(tags: string | string[],
+                                    payload: any,
+                                    optionsOrCallback: Options | Callback,
+                                    callback?: Callback): void;
+
+    sendTileWideSmallImageAndText05(tags: string | string[],
+                                    payload: any,
+                                    optionsOrCallback: Options | Callback,
+                                    callback?: Callback): void;
+
+    sendTileWidePeekImageCollection01(tags: string | string[],
+                                      payload: any,
+                                      optionsOrCallback: Options | Callback,
+                                      callback?: Callback): void;
+
+    sendTileWidePeekImageCollection02(tags: string | string[],
+                                      payload: any,
+                                      optionsOrCallback: Options | Callback,
+                                      callback?: Callback): void;
+
+    sendTileWidePeekImageCollection03(tags: string | string[],
+                                      payload: any,
+                                      optionsOrCallback: Options | Callback,
+                                      callback?: Callback): void;
+
+    sendTileWidePeekImageCollection04(tags: string | string[],
+                                      payload: any,
+                                      optionsOrCallback: Options | Callback,
+                                      callback?: Callback): void;
+
+    sendTileWidePeekImageCollection05(tags: string | string[],
+                                      payload: any,
+                                      optionsOrCallback: Options | Callback,
+                                      callback?: Callback): void;
+
+    sendTileWidePeekImageCollection06(tags: string | string[],
+                                      payload: any,
+                                      optionsOrCallback: Options | Callback,
+                                      callback?: Callback): void;
+
+    sendTileWidePeekImageAndText01(tags: string | string[],
+                                   payload: any,
+                                   optionsOrCallback: Options | Callback,
+                                   callback?: Callback): void;
+
+    sendTileWidePeekImageAndText02(tags: string | string[],
+                                   payload: any,
+                                   optionsOrCallback: Options | Callback,
+                                   callback?: Callback): void;
+
+    sendTileWidePeekImage01(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendTileWidePeekImage02(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendTileWidePeekImage03(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendTileWidePeekImage04(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendTileWidePeekImage05(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendTileWidePeekImage06(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendToastText01(tags: string | string[],
+                    payload: any,
+                    optionsOrCallback: Options | Callback,
+                    callback?: Callback): void;
+
+    sendToastText02(tags: string | string[],
+                    payload: any,
+                    optionsOrCallback: Options | Callback,
+                    callback?: Callback): void;
+
+    sendToastText03(tags: string | string[],
+                    payload: any,
+                    optionsOrCallback: Options | Callback,
+                    callback?: Callback): void;
+
+    sendToastText04(tags: string | string[],
+                    payload: any,
+                    optionsOrCallback: Options | Callback,
+                    callback?: Callback): void;
+
+    sendToastImageAndText01(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendToastImageAndText02(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendToastImageAndText03(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendToastImageAndText04(tags: string | string[],
+                            payload: any,
+                            optionsOrCallback: Options | Callback,
+                            callback?: Callback): void;
+
+    sendBadge(tags: badges | badges[],
+              value: string | number,
+              callback?: Callback): void;
+
+    sendBadge(tags: badges | badges[],
+              value: string | number,
+              options: Options,
+              callback?: Callback): void;
+
+    sendRaw(tags: string | string[],
+            payload: any,
+            callback?: Callback): void;
+
+    sendRaw(tags: string | string[],
+            payload: any,
+            options: Options,
+            callback?: Callback): void;
+
+    send(tags: string | string[],
+         payload: string,
+         type: types,
+         callback?: Callback): void;
+
+    send(tags: string | string[],
+         payload: string,
+         type: types,
+         options: Options,
+         callback: Callback): void;
+
+    createNativeRegistration(channel: string,
+                             tags: string | string[],
+                             callback: Callback): void;
+
+    createNativeRegistration(channel: string,
+                             tags: string | string[],
+                             options: Options,
+                             callback: Callback): void;
+
+    createOrUpdateNativeRegistration(registrationId: string,
+                                     channel: string,
+                                     tags: string | string[],
+                                     callback: Callback): void;
+
+    createOrUpdateNativeRegistration(registrationId: string,
+                                     channel: string,
+                                     tags: string | string[],
+                                     options: Options,
+                                     callback: Callback): void;
+
+    listRegistrationsByChannel(channel: string,
+                               callback: Callback): void;
+
+    listRegistrationsByChannel(channel: string,
+                               options: ListNotificationHubsOptions,
+                               callback: Callback): void;
+
+}
+
+export = WnsService;
diff --git a/types/azure-sb/lib/wrapservice.d.ts b/types/azure-sb/lib/wrapservice.d.ts
new file mode 100644
index 0000000000..5fbbc87345
--- /dev/null
+++ b/types/azure-sb/lib/wrapservice.d.ts
@@ -0,0 +1,21 @@
+import { Azure } from 'azure-sb';
+
+declare class WrapService {
+    constructor(acsHost: string, issuer?: string, accessKey?: string);
+
+    public issuer?: string;
+    public accessKey?: string;
+    public authenticationProvider: {
+        signRequest(webResource: any, callback: () => void): void;
+    };
+    public strictSSL: boolean;
+
+    public wrapAccessToken(uri: string,
+                           callback: Azure.ServiceBus.ResponseCallback): void;
+
+    public wrapAccessToken(uri: string,
+                           options: object,
+                           callback: Azure.ServiceBus.ResponseCallback): void;
+}
+
+export = WrapService;
diff --git a/types/azure-sb/tsconfig.json b/types/azure-sb/tsconfig.json
index 525d24577e..09c9a2a9e4 100644
--- a/types/azure-sb/tsconfig.json
+++ b/types/azure-sb/tsconfig.json
@@ -17,7 +17,26 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts",
-        "azure-sb-tests.ts"
+        "lib/servicebusservice.d.ts",
+        "lib/wrapservice.d.ts",
+        "lib/servicebusservicebase.d.ts",
+        "lib/notificationhubservice.d.ts",
+        "lib/models/topicresult.d.ts",
+        "lib/models/queuemessageresult.d.ts",
+        "lib/models/acstokenresult.d.ts",
+        "lib/models/registrationresult.d.ts",
+        "lib/models/ruleresult.d.ts",
+        "lib/models/queueresult.d.ts",
+        "lib/models/subscriptionresult.d.ts",
+        "lib/models/notificationhubresult.d.ts",
+        "lib/models/resourceresult.d.ts",
+        "lib/servicebusserviceclient.d.ts",
+        "lib/gcmservice.d.ts",
+        "lib/wnsservice.d.ts",
+        "lib/mpnservice.d.ts",
+        "lib/apnsservice.d.ts",
+        "azure-sb-tests.ts",
+        "index.d.ts"
     ]
-}
\ No newline at end of file
+}
+
diff --git a/types/azure-sb/tslint.json b/types/azure-sb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/azure-sb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/azure/tslint.json b/types/azure/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/azure/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/babel-core/index.d.ts b/types/babel-core/index.d.ts
index a2476245c1..3a41d2d252 100644
--- a/types/babel-core/index.d.ts
+++ b/types/babel-core/index.d.ts
@@ -162,8 +162,9 @@ export interface TransformOptions {
     /** Indicate the mode the code should be parsed in. Can be either “script� or “module�. Default: "module" */
     sourceType?: "script" | "module";
 
-    /** An optional callback that can be used to wrap visitor methods.
-     *  NOTE: This is useful for things like introspection, and not really needed for implementing anything.
+    /**
+     * An optional callback that can be used to wrap visitor methods.
+     * NOTE: This is useful for things like introspection, and not really needed for implementing anything.
      */
     wrapPluginVisitorMethod?(pluginAlias: string, visitorType: 'enter' | 'exit', callback: (path: NodePath, state: any) => void): (path: NodePath, state: any) => void ;
 }
diff --git a/types/babel-generator/index.d.ts b/types/babel-generator/index.d.ts
index 3b3d8126e9..2e34d158fc 100644
--- a/types/babel-generator/index.d.ts
+++ b/types/babel-generator/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Johnny Estilles <https://github.com/johnnyestilles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as t from 'babel-types';
 
diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 682550b161..df420c17bd 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -600,185 +600,185 @@ export class NodePath<T = Node> {
     addComments(type: string, comments: any[]): void;
 
     // ------------------------- isXXX -------------------------
-    isArrayExpression(opts?: object): boolean;
-    isAssignmentExpression(opts?: object): boolean;
-    isBinaryExpression(opts?: object): boolean;
-    isDirective(opts?: object): boolean;
-    isDirectiveLiteral(opts?: object): boolean;
-    isBlockStatement(opts?: object): boolean;
-    isBreakStatement(opts?: object): boolean;
-    isCallExpression(opts?: object): boolean;
-    isCatchClause(opts?: object): boolean;
-    isConditionalExpression(opts?: object): boolean;
-    isContinueStatement(opts?: object): boolean;
-    isDebuggerStatement(opts?: object): boolean;
-    isDoWhileStatement(opts?: object): boolean;
-    isEmptyStatement(opts?: object): boolean;
-    isExpressionStatement(opts?: object): boolean;
-    isFile(opts?: object): boolean;
-    isForInStatement(opts?: object): boolean;
-    isForStatement(opts?: object): boolean;
-    isFunctionDeclaration(opts?: object): boolean;
-    isFunctionExpression(opts?: object): boolean;
-    isIdentifier(opts?: object): boolean;
-    isIfStatement(opts?: object): boolean;
-    isLabeledStatement(opts?: object): boolean;
-    isStringLiteral(opts?: object): boolean;
-    isNumericLiteral(opts?: object): boolean;
-    isNullLiteral(opts?: object): boolean;
-    isBooleanLiteral(opts?: object): boolean;
-    isRegExpLiteral(opts?: object): boolean;
-    isLogicalExpression(opts?: object): boolean;
-    isMemberExpression(opts?: object): boolean;
-    isNewExpression(opts?: object): boolean;
-    isProgram(opts?: object): boolean;
-    isObjectExpression(opts?: object): boolean;
-    isObjectMethod(opts?: object): boolean;
-    isObjectProperty(opts?: object): boolean;
-    isRestElement(opts?: object): boolean;
-    isReturnStatement(opts?: object): boolean;
-    isSequenceExpression(opts?: object): boolean;
-    isSwitchCase(opts?: object): boolean;
-    isSwitchStatement(opts?: object): boolean;
-    isThisExpression(opts?: object): boolean;
-    isThrowStatement(opts?: object): boolean;
-    isTryStatement(opts?: object): boolean;
-    isUnaryExpression(opts?: object): boolean;
-    isUpdateExpression(opts?: object): boolean;
-    isVariableDeclaration(opts?: object): boolean;
-    isVariableDeclarator(opts?: object): boolean;
-    isWhileStatement(opts?: object): boolean;
-    isWithStatement(opts?: object): boolean;
-    isAssignmentPattern(opts?: object): boolean;
-    isArrayPattern(opts?: object): boolean;
-    isArrowFunctionExpression(opts?: object): boolean;
-    isClassBody(opts?: object): boolean;
-    isClassDeclaration(opts?: object): boolean;
-    isClassExpression(opts?: object): boolean;
-    isExportAllDeclaration(opts?: object): boolean;
-    isExportDefaultDeclaration(opts?: object): boolean;
-    isExportNamedDeclaration(opts?: object): boolean;
-    isExportSpecifier(opts?: object): boolean;
-    isForOfStatement(opts?: object): boolean;
-    isImportDeclaration(opts?: object): boolean;
-    isImportDefaultSpecifier(opts?: object): boolean;
-    isImportNamespaceSpecifier(opts?: object): boolean;
-    isImportSpecifier(opts?: object): boolean;
-    isMetaProperty(opts?: object): boolean;
-    isClassMethod(opts?: object): boolean;
-    isObjectPattern(opts?: object): boolean;
-    isSpreadElement(opts?: object): boolean;
-    isSuper(opts?: object): boolean;
-    isTaggedTemplateExpression(opts?: object): boolean;
-    isTemplateElement(opts?: object): boolean;
-    isTemplateLiteral(opts?: object): boolean;
-    isYieldExpression(opts?: object): boolean;
-    isAnyTypeAnnotation(opts?: object): boolean;
-    isArrayTypeAnnotation(opts?: object): boolean;
-    isBooleanTypeAnnotation(opts?: object): boolean;
-    isBooleanLiteralTypeAnnotation(opts?: object): boolean;
-    isNullLiteralTypeAnnotation(opts?: object): boolean;
-    isClassImplements(opts?: object): boolean;
-    isClassProperty(opts?: object): boolean;
-    isDeclareClass(opts?: object): boolean;
-    isDeclareFunction(opts?: object): boolean;
-    isDeclareInterface(opts?: object): boolean;
-    isDeclareModule(opts?: object): boolean;
-    isDeclareTypeAlias(opts?: object): boolean;
-    isDeclareVariable(opts?: object): boolean;
-    isExistentialTypeParam(opts?: object): boolean;
-    isFunctionTypeAnnotation(opts?: object): boolean;
-    isFunctionTypeParam(opts?: object): boolean;
-    isGenericTypeAnnotation(opts?: object): boolean;
-    isInterfaceExtends(opts?: object): boolean;
-    isInterfaceDeclaration(opts?: object): boolean;
-    isIntersectionTypeAnnotation(opts?: object): boolean;
-    isMixedTypeAnnotation(opts?: object): boolean;
-    isNullableTypeAnnotation(opts?: object): boolean;
-    isNumericLiteralTypeAnnotation(opts?: object): boolean;
-    isNumberTypeAnnotation(opts?: object): boolean;
-    isStringLiteralTypeAnnotation(opts?: object): boolean;
-    isStringTypeAnnotation(opts?: object): boolean;
-    isThisTypeAnnotation(opts?: object): boolean;
-    isTupleTypeAnnotation(opts?: object): boolean;
-    isTypeofTypeAnnotation(opts?: object): boolean;
-    isTypeAlias(opts?: object): boolean;
-    isTypeAnnotation(opts?: object): boolean;
-    isTypeCastExpression(opts?: object): boolean;
-    isTypeParameterDeclaration(opts?: object): boolean;
-    isTypeParameterInstantiation(opts?: object): boolean;
-    isObjectTypeAnnotation(opts?: object): boolean;
-    isObjectTypeCallProperty(opts?: object): boolean;
-    isObjectTypeIndexer(opts?: object): boolean;
-    isObjectTypeProperty(opts?: object): boolean;
-    isQualifiedTypeIdentifier(opts?: object): boolean;
-    isUnionTypeAnnotation(opts?: object): boolean;
-    isVoidTypeAnnotation(opts?: object): boolean;
-    isJSXAttribute(opts?: object): boolean;
-    isJSXClosingElement(opts?: object): boolean;
-    isJSXElement(opts?: object): boolean;
-    isJSXEmptyExpression(opts?: object): boolean;
-    isJSXExpressionContainer(opts?: object): boolean;
-    isJSXIdentifier(opts?: object): boolean;
-    isJSXMemberExpression(opts?: object): boolean;
-    isJSXNamespacedName(opts?: object): boolean;
-    isJSXOpeningElement(opts?: object): boolean;
-    isJSXSpreadAttribute(opts?: object): boolean;
-    isJSXText(opts?: object): boolean;
-    isNoop(opts?: object): boolean;
-    isParenthesizedExpression(opts?: object): boolean;
-    isAwaitExpression(opts?: object): boolean;
-    isBindExpression(opts?: object): boolean;
-    isDecorator(opts?: object): boolean;
-    isDoExpression(opts?: object): boolean;
-    isExportDefaultSpecifier(opts?: object): boolean;
-    isExportNamespaceSpecifier(opts?: object): boolean;
-    isRestProperty(opts?: object): boolean;
-    isSpreadProperty(opts?: object): boolean;
-    isExpression(opts?: object): boolean;
-    isBinary(opts?: object): boolean;
-    isScopable(opts?: object): boolean;
-    isBlockParent(opts?: object): boolean;
-    isBlock(opts?: object): boolean;
-    isStatement(opts?: object): boolean;
-    isTerminatorless(opts?: object): boolean;
-    isCompletionStatement(opts?: object): boolean;
-    isConditional(opts?: object): boolean;
-    isLoop(opts?: object): boolean;
-    isWhile(opts?: object): boolean;
-    isExpressionWrapper(opts?: object): boolean;
-    isFor(opts?: object): boolean;
-    isForXStatement(opts?: object): boolean;
-    isFunction(opts?: object): boolean;
-    isFunctionParent(opts?: object): boolean;
-    isPureish(opts?: object): boolean;
-    isDeclaration(opts?: object): boolean;
-    isLVal(opts?: object): boolean;
-    isLiteral(opts?: object): boolean;
-    isImmutable(opts?: object): boolean;
-    isUserWhitespacable(opts?: object): boolean;
-    isMethod(opts?: object): boolean;
-    isObjectMember(opts?: object): boolean;
-    isProperty(opts?: object): boolean;
-    isUnaryLike(opts?: object): boolean;
-    isPattern(opts?: object): boolean;
-    isClass(opts?: object): boolean;
-    isModuleDeclaration(opts?: object): boolean;
-    isExportDeclaration(opts?: object): boolean;
-    isModuleSpecifier(opts?: object): boolean;
-    isFlow(opts?: object): boolean;
-    isFlowBaseAnnotation(opts?: object): boolean;
-    isFlowDeclaration(opts?: object): boolean;
-    isJSX(opts?: object): boolean;
-    isNumberLiteral(opts?: object): boolean;
-    isRegexLiteral(opts?: object): boolean;
-    isReferencedIdentifier(opts?: object): boolean;
-    isReferencedMemberExpression(opts?: object): boolean;
-    isBindingIdentifier(opts?: object): boolean;
-    isScope(opts?: object): boolean;
+    isArrayExpression(opts?: object): this is NodePath<t.ArrayExpression> ;
+    isAssignmentExpression(opts?: object): this is NodePath<t.AssignmentExpression>;
+    isBinaryExpression(opts?: object): this is NodePath<t.BinaryExpression>;
+    isDirective(opts?: object): this is NodePath<t.Directive>;
+    isDirectiveLiteral(opts?: object): this is NodePath<t.DirectiveLiteral>;
+    isBlockStatement(opts?: object): this is NodePath<t.BlockStatement>;
+    isBreakStatement(opts?: object): this is NodePath<t.BreakStatement>;
+    isCallExpression(opts?: object): this is NodePath<t.CallExpression>;
+    isCatchClause(opts?: object): this is NodePath<t.CatchClause>;
+    isConditionalExpression(opts?: object): this is NodePath<t.ConditionalExpression>;
+    isContinueStatement(opts?: object): this is NodePath<t.ContinueStatement>;
+    isDebuggerStatement(opts?: object): this is NodePath<t.DebuggerStatement>;
+    isDoWhileStatement(opts?: object): this is NodePath<t.DoWhileStatement>;
+    isEmptyStatement(opts?: object): this is NodePath<t.EmptyStatement>;
+    isExpressionStatement(opts?: object): this is NodePath<t.ExpressionStatement>;
+    isFile(opts?: object): this is NodePath<t.File>;
+    isForInStatement(opts?: object): this is NodePath<t.ForInStatement>;
+    isForStatement(opts?: object): this is NodePath<t.ForStatement>;
+    isFunctionDeclaration(opts?: object): this is NodePath<t.FunctionDeclaration>;
+    isFunctionExpression(opts?: object): this is NodePath<t.FunctionExpression>;
+    isIdentifier(opts?: object): this is NodePath<t.Identifier>;
+    isIfStatement(opts?: object): this is NodePath<t.IfStatement>;
+    isLabeledStatement(opts?: object): this is NodePath<t.LabeledStatement>;
+    isStringLiteral(opts?: object): this is NodePath<t.StringLiteral>;
+    isNumericLiteral(opts?: object): this is NodePath<t.NumericLiteral>;
+    isNullLiteral(opts?: object): this is NodePath<t.NullLiteral>;
+    isBooleanLiteral(opts?: object): this is NodePath<t.BooleanLiteral>;
+    isRegExpLiteral(opts?: object): this is NodePath<t.RegExpLiteral>;
+    isLogicalExpression(opts?: object): this is NodePath<t.LogicalExpression>;
+    isMemberExpression(opts?: object): this is NodePath<t.MemberExpression>;
+    isNewExpression(opts?: object): this is NodePath<t.NewExpression>;
+    isProgram(opts?: object): this is NodePath<t.Program>;
+    isObjectExpression(opts?: object): this is NodePath<t.ObjectExpression>;
+    isObjectMethod(opts?: object): this is NodePath<t.ObjectMethod>;
+    isObjectProperty(opts?: object): this is NodePath<t.ObjectProperty>;
+    isRestElement(opts?: object): this is NodePath<t.RestElement>;
+    isReturnStatement(opts?: object): this is NodePath<t.ReturnStatement>;
+    isSequenceExpression(opts?: object): this is NodePath<t.SequenceExpression>;
+    isSwitchCase(opts?: object): this is NodePath<t.SwitchCase>;
+    isSwitchStatement(opts?: object): this is NodePath<t.SwitchStatement>;
+    isThisExpression(opts?: object): this is NodePath<t.ThisExpression>;
+    isThrowStatement(opts?: object): this is NodePath<t.ThrowStatement>;
+    isTryStatement(opts?: object): this is NodePath<t.TryStatement>;
+    isUnaryExpression(opts?: object): this is NodePath<t.UnaryExpression>;
+    isUpdateExpression(opts?: object): this is NodePath<t.UpdateExpression>;
+    isVariableDeclaration(opts?: object): this is NodePath<t.VariableDeclaration>;
+    isVariableDeclarator(opts?: object): this is NodePath<t.VariableDeclarator>;
+    isWhileStatement(opts?: object): this is NodePath<t.WhileStatement>;
+    isWithStatement(opts?: object): this is NodePath<t.WithStatement>;
+    isAssignmentPattern(opts?: object): this is NodePath<t.AssignmentPattern>;
+    isArrayPattern(opts?: object): this is NodePath<t.ArrayPattern>;
+    isArrowFunctionExpression(opts?: object): this is NodePath<t.ArrowFunctionExpression>;
+    isClassBody(opts?: object): this is NodePath<t.ClassBody>;
+    isClassDeclaration(opts?: object): this is NodePath<t.ClassDeclaration>;
+    isClassExpression(opts?: object): this is NodePath<t.ClassExpression>;
+    isExportAllDeclaration(opts?: object): this is NodePath<t.ExportAllDeclaration>;
+    isExportDefaultDeclaration(opts?: object): this is NodePath<t.ExportDefaultDeclaration>;
+    isExportNamedDeclaration(opts?: object): this is NodePath<t.ExportNamedDeclaration>;
+    isExportSpecifier(opts?: object): this is NodePath<t.ExportSpecifier>;
+    isForOfStatement(opts?: object): this is NodePath<t.ForOfStatement>;
+    isImportDeclaration(opts?: object): this is NodePath<t.ImportDeclaration>;
+    isImportDefaultSpecifier(opts?: object): this is NodePath<t.ImportDefaultSpecifier>;
+    isImportNamespaceSpecifier(opts?: object): this is NodePath<t.ImportNamespaceSpecifier>;
+    isImportSpecifier(opts?: object): this is NodePath<t.ImportSpecifier>;
+    isMetaProperty(opts?: object): this is NodePath<t.MetaProperty>;
+    isClassMethod(opts?: object): this is NodePath<t.ClassMethod>;
+    isObjectPattern(opts?: object): this is NodePath<t.ObjectPattern>;
+    isSpreadElement(opts?: object): this is NodePath<t.SpreadElement>;
+    isSuper(opts?: object): this is NodePath<t.Super>;
+    isTaggedTemplateExpression(opts?: object): this is NodePath<t.TaggedTemplateExpression>;
+    isTemplateElement(opts?: object): this is NodePath<t.TemplateElement>;
+    isTemplateLiteral(opts?: object): this is NodePath<t.TemplateLiteral>;
+    isYieldExpression(opts?: object): this is NodePath<t.YieldExpression>;
+    isAnyTypeAnnotation(opts?: object): this is NodePath<t.AnyTypeAnnotation>;
+    isArrayTypeAnnotation(opts?: object): this is NodePath<t.ArrayTypeAnnotation>;
+    isBooleanTypeAnnotation(opts?: object): this is NodePath<t.BooleanTypeAnnotation>;
+    isBooleanLiteralTypeAnnotation(opts?: object): this is NodePath<t.BooleanLiteralTypeAnnotation>;
+    isNullLiteralTypeAnnotation(opts?: object): this is NodePath<t.NullLiteralTypeAnnotation>;
+    isClassImplements(opts?: object): this is NodePath<t.ClassImplements>;
+    isClassProperty(opts?: object): this is NodePath<t.ClassProperty>;
+    isDeclareClass(opts?: object): this is NodePath<t.DeclareClass>;
+    isDeclareFunction(opts?: object): this is NodePath<t.DeclareFunction>;
+    isDeclareInterface(opts?: object): this is NodePath<t.DeclareInterface>;
+    isDeclareModule(opts?: object): this is NodePath<t.DeclareModule>;
+    isDeclareTypeAlias(opts?: object): this is NodePath<t.DeclareTypeAlias>;
+    isDeclareVariable(opts?: object): this is NodePath<t.DeclareVariable>;
+    isExistentialTypeParam(opts?: object): this is NodePath<t.ExistentialTypeParam>;
+    isFunctionTypeAnnotation(opts?: object): this is NodePath<t.FunctionTypeAnnotation>;
+    isFunctionTypeParam(opts?: object): this is NodePath<t.FunctionTypeParam>;
+    isGenericTypeAnnotation(opts?: object): this is NodePath<t.GenericTypeAnnotation>;
+    isInterfaceExtends(opts?: object): this is NodePath<t.InterfaceExtends>;
+    isInterfaceDeclaration(opts?: object): this is NodePath<t.InterfaceDeclaration>;
+    isIntersectionTypeAnnotation(opts?: object): this is NodePath<t.IntersectionTypeAnnotation>;
+    isMixedTypeAnnotation(opts?: object): this is NodePath<t.MixedTypeAnnotation>;
+    isNullableTypeAnnotation(opts?: object): this is NodePath<t.NullableTypeAnnotation>;
+    isNumericLiteralTypeAnnotation(opts?: object): this is NodePath<t.NumericLiteralTypeAnnotation>;
+    isNumberTypeAnnotation(opts?: object): this is NodePath<t.NumberTypeAnnotation>;
+    isStringLiteralTypeAnnotation(opts?: object): this is NodePath<t.StringLiteralTypeAnnotation>;
+    isStringTypeAnnotation(opts?: object): this is NodePath<t.StringTypeAnnotation>;
+    isThisTypeAnnotation(opts?: object): this is NodePath<t.ThisTypeAnnotation>;
+    isTupleTypeAnnotation(opts?: object): this is NodePath<t.TupleTypeAnnotation>;
+    isTypeofTypeAnnotation(opts?: object): this is NodePath<t.TypeofTypeAnnotation>;
+    isTypeAlias(opts?: object): this is NodePath<t.TypeAlias>;
+    isTypeAnnotation(opts?: object): this is NodePath<t.TypeAnnotation>;
+    isTypeCastExpression(opts?: object): this is NodePath<t.TypeCastExpression>;
+    isTypeParameterDeclaration(opts?: object): this is NodePath<t.TypeParameterDeclaration>;
+    isTypeParameterInstantiation(opts?: object): this is NodePath<t.TypeParameterInstantiation>;
+    isObjectTypeAnnotation(opts?: object): this is NodePath<t.ObjectTypeAnnotation>;
+    isObjectTypeCallProperty(opts?: object): this is NodePath<t.ObjectTypeCallProperty>;
+    isObjectTypeIndexer(opts?: object): this is NodePath<t.ObjectTypeIndexer>;
+    isObjectTypeProperty(opts?: object): this is NodePath<t.ObjectTypeProperty>;
+    isQualifiedTypeIdentifier(opts?: object): this is NodePath<t.QualifiedTypeIdentifier>;
+    isUnionTypeAnnotation(opts?: object): this is NodePath<t.UnionTypeAnnotation>;
+    isVoidTypeAnnotation(opts?: object): this is NodePath<t.VoidTypeAnnotation>;
+    isJSXAttribute(opts?: object): this is NodePath<t.JSXAttribute>;
+    isJSXClosingElement(opts?: object): this is NodePath<t.JSXClosingElement>;
+    isJSXElement(opts?: object): this is NodePath<t.JSXElement>;
+    isJSXEmptyExpression(opts?: object): this is NodePath<t.JSXEmptyExpression>;
+    isJSXExpressionContainer(opts?: object): this is NodePath<t.JSXExpressionContainer>;
+    isJSXIdentifier(opts?: object): this is NodePath<t.JSXIdentifier>;
+    isJSXMemberExpression(opts?: object): this is NodePath<t.JSXMemberExpression>;
+    isJSXNamespacedName(opts?: object): this is NodePath<t.JSXNamespacedName>;
+    isJSXOpeningElement(opts?: object): this is NodePath<t.JSXOpeningElement>;
+    isJSXSpreadAttribute(opts?: object): this is NodePath<t.JSXSpreadAttribute>;
+    isJSXText(opts?: object): this is NodePath<t.JSXText>;
+    isNoop(opts?: object): this is NodePath<t.Noop>;
+    isParenthesizedExpression(opts?: object): this is NodePath<t.ParenthesizedExpression>;
+    isAwaitExpression(opts?: object): this is NodePath<t.AwaitExpression>;
+    isBindExpression(opts?: object): this is NodePath<t.BindExpression>;
+    isDecorator(opts?: object): this is NodePath<t.Decorator>;
+    isDoExpression(opts?: object): this is NodePath<t.DoExpression>;
+    isExportDefaultSpecifier(opts?: object): this is NodePath<t.ExportDefaultSpecifier>;
+    isExportNamespaceSpecifier(opts?: object): this is NodePath<t.ExportNamespaceSpecifier>;
+    isRestProperty(opts?: object): this is NodePath<t.RestProperty>;
+    isSpreadProperty(opts?: object): this is NodePath<t.SpreadProperty>;
+    isExpression(opts?: object): this is NodePath<t.Expression>;
+    isBinary(opts?: object): this is NodePath<t.Binary>;
+    isScopable(opts?: object): this is NodePath<t.Scopable>;
+    isBlockParent(opts?: object): this is NodePath<t.BlockParent>;
+    isBlock(opts?: object): this is NodePath<t.Block>;
+    isStatement(opts?: object): this is NodePath<t.Statement>;
+    isTerminatorless(opts?: object): this is NodePath<t.Terminatorless>;
+    isCompletionStatement(opts?: object): this is NodePath<t.CompletionStatement>;
+    isConditional(opts?: object): this is NodePath<t.Conditional>;
+    isLoop(opts?: object): this is NodePath<t.Loop>;
+    isWhile(opts?: object): this is NodePath<t.While>;
+    isExpressionWrapper(opts?: object): this is NodePath<t.ExpressionWrapper>;
+    isFor(opts?: object): this is NodePath<t.For>;
+    isForXStatement(opts?: object): this is NodePath<t.ForXStatement>;
+    isFunction(opts?: object): this is NodePath<t.Function>;
+    isFunctionParent(opts?: object): this is NodePath<t.FunctionParent>;
+    isPureish(opts?: object): this is NodePath<t.Pureish>;
+    isDeclaration(opts?: object): this is NodePath<t.Declaration>;
+    isLVal(opts?: object): this is NodePath<t.LVal>;
+    isLiteral(opts?: object): this is NodePath<t.Literal>;
+    isImmutable(opts?: object): this is NodePath<t.Immutable>;
+    isUserWhitespacable(opts?: object): this is NodePath<t.UserWhitespacable>;
+    isMethod(opts?: object): this is NodePath<t.Method>;
+    isObjectMember(opts?: object): this is NodePath<t.ObjectMember>;
+    isProperty(opts?: object): this is NodePath<t.Property>;
+    isUnaryLike(opts?: object): this is NodePath<t.UnaryLike>;
+    isPattern(opts?: object): this is NodePath<t.Pattern>;
+    isClass(opts?: object): this is NodePath<t.Class>;
+    isModuleDeclaration(opts?: object): this is NodePath<t.ModuleDeclaration>;
+    isExportDeclaration(opts?: object): this is NodePath<t.ExportDeclaration>;
+    isModuleSpecifier(opts?: object): this is NodePath<t.ModuleSpecifier>;
+    isFlow(opts?: object): this is NodePath<t.Flow>;
+    isFlowBaseAnnotation(opts?: object): this is NodePath<t.FlowBaseAnnotation>;
+    isFlowDeclaration(opts?: object): this is NodePath<t.FlowDeclaration>;
+    isJSX(opts?: object): this is NodePath<t.JSX>;
+    isNumberLiteral(opts?: object): this is NodePath<t.NumericLiteral>;
+    isRegexLiteral(opts?: object): this is NodePath<t.RegExpLiteral>;
+    isReferencedIdentifier(opts?: object): this is NodePath<t.Identifier | t.JSXIdentifier>;
+    isReferencedMemberExpression(opts?: object): this is NodePath<t.MemberExpression>;
+    isBindingIdentifier(opts?: object): this is NodePath<t.Identifier>;
+    isScope(opts?: object): this is NodePath<t.Scopable>;
     isReferenced(opts?: object): boolean;
-    isBlockScoped(opts?: object): boolean;
-    isVar(opts?: object): boolean;
+    isBlockScoped(opts?: object): this is NodePath<t.FunctionDeclaration | t.ClassDeclaration | t.VariableDeclaration>;
+    isVar(opts?: object): this is NodePath<t.VariableDeclaration>;
     isUser(opts?: object): boolean;
     isGenerated(opts?: object): boolean;
     isPure(opts?: object): boolean;
diff --git a/types/babel-types/babel-types-tests.ts b/types/babel-types/babel-types-tests.ts
index af8ab2d0b7..8ffb1b32de 100644
--- a/types/babel-types/babel-types-tests.ts
+++ b/types/babel-types/babel-types-tests.ts
@@ -52,3 +52,64 @@ traverse(ast, {
         }
     }
 });
+
+// TypeScript Types
+// TODO: Test all variants of these functions' signatures
+
+const id = t.identifier("id");
+const tparam = t.typeParameterDeclaration([id]);
+
+const any = t.TSAnyKeyword();
+t.TSArrayType(any);
+t.TSAsExpression(exp, any);
+t.TSBooleanKeyword();
+t.TSCallSignatureDeclaration(tparam);
+t.TSConstructSignatureDeclaration();
+t.TSConstructorType();
+t.TSDeclareFunction(id, t.noop(), [id], t.noop());
+t.TSDeclareMethod([t.decorator(exp)], exp, t.noop(), [id]);
+t.TSEnumDeclaration(id, [t.TSEnumMember(id)]);
+t.TSEnumMember(id);
+const expo = t.TSExportAssignment(exp);
+t.TSExpressionWithTypeArguments(id);
+const ext = t.TSExternalModuleReference(t.stringLiteral());
+t.TSFunctionType();
+t.TSImportEqualsDeclaration(id, ext);
+const sig = t.TSIndexSignature([id]);
+t.TSIndexedAccessType(any, any);
+t.TSInterfaceBody([sig]);
+t.TSInterfaceDeclaration(id, null, null, t.TSInterfaceBody([sig]));
+t.TSIntersectionType([any]);
+t.TSLiteralType(t.stringLiteral("a"));
+t.TSMappedType(t.typeParameter());
+t.TSMethodSignature(id);
+const block = t.TSModuleBlock([expo]);
+t.TSModuleDeclaration(id, block);
+t.TSNamespaceExportDeclaration(id);
+t.TSNeverKeyword();
+t.TSNonNullExpression(exp);
+t.TSNullKeyword();
+t.TSNumberKeyword();
+t.TSObjectKeyword();
+t.TSParameterProperty(id);
+t.TSParenthesizedType(any);
+t.TSPropertySignature(id);
+t.TSQualifiedName(id, id);
+t.TSStringKeyword();
+t.TSSymbolKeyword();
+t.TSThisType();
+t.TSTupleType([any, any]);
+t.TSTypeAliasDeclaration(id, tparam, any);
+t.TSTypeAnnotation(any);
+t.TSTypeAssertion(any, exp);
+t.TSTypeLiteral([sig]);
+t.TSTypeOperator(any);
+const param = t.TSTypeParameter();
+t.TSTypeParameterDeclaration([param]);
+t.TSTypeParameterInstantiation([any]);
+t.TSTypePredicate(id, t.TSTypeAnnotation(any));
+t.TSTypeQuery(id);
+t.TSTypeReference(id);
+t.TSUndefinedKeyword();
+t.TSUnionType([any]);
+t.TSVoidKeyword();
diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index 1879c81e85..cbed3e076c 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for babel-types 6.25
+// Type definitions for babel-types 7.0
 // Project: https://github.com/babel/babel/tree/master/packages/babel-types
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Sam Baxter <https://github.com/baxtersa>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
+//                 Boris Cherny <https://github.com/bcherny>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -711,6 +712,13 @@ export interface TypeCastExpression extends Node {
     typeAnnotation: FlowTypeAnnotation;
 }
 
+export interface TypeParameter extends Node {
+    type: "TypeParameterDeclaration";
+    bound: TypeAnnotation | null;
+    default: Flow | null;
+    name: string | null;
+}
+
 export interface TypeParameterDeclaration extends Node {
     type: "TypeParameterDeclaration";
     params: Identifier[];
@@ -873,13 +881,344 @@ export interface SpreadProperty extends Node {
     argument: Expression;
 }
 
+export interface TSAnyKeyword extends Node {
+    type: "TSAnyKeyword";
+}
+
+export interface TSArrayType extends Node {
+    type: "TSArrayType";
+    elementType: TSType;
+}
+
+export interface TSAsExpression extends Node {
+    type: "TSAsExpression";
+    expression: Expression;
+    typeAnnotation: TSType;
+}
+
+export interface TSBooleanKeyword extends Node {
+    type: "TSBooleanKeyword";
+}
+
+export interface TSCallSignatureDeclaration extends Node {
+    type: "TSCallSignatureDeclaration";
+    typeParameters: TypeParameterDeclaration | null;
+    parameters: Array<Identifier | RestElement> | null;
+    typeAnnotation: TSTypeAnnotation | null;
+}
+
+export interface TSConstructSignatureDeclaration extends Node {
+    type: "TSConstructSignatureDeclaration";
+    typeParameters: TypeParameterDeclaration | null;
+    parameters: Array<Identifier | RestElement> | null;
+    typeAnnotation: TSTypeAnnotation | null;
+}
+
+export interface TSConstructorType extends Node {
+    type: "TSConstructorType";
+    typeParameters: TypeParameterDeclaration | null;
+    typeAnnotation: TSTypeAnnotation | null;
+    parameters: Array<Identifier | RestElement> | null;
+}
+
+export interface TSDeclareFunction extends Node {
+    type: "TSDeclareFunction";
+    id: Identifier | null;
+    typeParameters: TypeParameterDeclaration | Noop | null;
+    params: LVal[];
+    returnType: TypeAnnotation | TSTypeAnnotation | Noop | null;
+    async: boolean;
+    declare: boolean | null;
+    generator: boolean;
+}
+
+export interface TSDeclareMethod extends Node {
+    type: "TSDeclareMethod";
+    decorators: Decorator[] | null;
+    key: Expression;
+    typeParameters: TypeParameterDeclaration | Noop | null;
+    params: LVal[];
+    returnType: TypeAnnotation | TSTypeAnnotation | Noop | null;
+    abstract: boolean | null;
+    access: "public" | "private" | "protected" | null;
+    accessibility: "public" | "private" | "protected" | null;
+    async: boolean;
+    computed: boolean;
+    generator: boolean;
+    kind: "get" | "set" | "method" | "constructor";
+    optional: boolean | null;
+    static: boolean | null;
+}
+
+export interface TSEnumDeclaration extends Node {
+    type: "TSEnumDeclaration";
+    id: Identifier;
+    members: TSEnumMember[];
+    const: boolean | null;
+    declare: boolean | null;
+    initializer: Expression | null;
+}
+
+export interface TSEnumMember extends Node {
+    type: "TSEnumMember";
+    id: Identifier | StringLiteral;
+    initializer: Expression | null;
+}
+
+export interface TSExportAssignment extends Node {
+    type: "TSExportAssignment";
+    expression: Expression;
+}
+
+export interface TSExpressionWithTypeArguments extends Node {
+    type: "TSExpressionWithTypeArguments";
+    expression: TSEntityName;
+    typeParameters: TypeParameterInstantiation | null;
+}
+
+export interface TSExternalModuleReference extends Node {
+    type: "TSExternalModuleReference";
+    expression: StringLiteral;
+}
+
+export interface TSFunctionType extends Node {
+    type: "TSFunctionType";
+    typeParameters: TypeParameterDeclaration | null;
+    typeAnnotation: TSTypeAnnotation | null;
+    parameters: Array<Identifier | RestElement> | null;
+}
+
+export interface TSImportEqualsDeclaration extends Node {
+    type: "TSImportEqualsDeclaration";
+    id: Identifier;
+    moduleReference: TSEntityName | TSExternalModuleReference;
+    isExport: boolean | null;
+}
+
+export interface TSIndexSignature extends Node {
+    type: "TSIndexSignature";
+    parameters: Identifier[];
+    typeAnnotation: TSTypeAnnotation | null;
+    readonly: boolean | null;
+}
+
+export interface TSIndexedAccessType extends Node {
+    type: "TSIndexedAccessType";
+    objectType: TSType;
+    indexType: TSType;
+}
+
+export interface TSInterfaceBody extends Node {
+    type: "TSInterfaceBody";
+    body: TSTypeElement[];
+}
+
+export interface TSInterfaceDeclaration extends Node {
+    type: "TSInterfaceDeclaration";
+    id: Identifier;
+    typeParameters: TypeParameterDeclaration | null;
+    extends: TSExpressionWithTypeArguments[] | null;
+    body: TSInterfaceBody;
+    declare: boolean | null;
+}
+
+export interface TSIntersectionType extends Node {
+    type: "TSIntersectionType";
+    types: TSType[];
+}
+
+export interface TSLiteralType extends Node {
+    type: "TSLiteralType";
+    literal: NumericLiteral | StringLiteral | BooleanLiteral;
+}
+
+export interface TSMappedType extends Node {
+    type: "TSMappedType";
+    typeParameter: TypeParameter;
+    typeAnnotation: TSType | null;
+    optional: boolean | null;
+    readonly: boolean | null;
+}
+
+export interface TSMethodSignature extends Node {
+    type: "TSMethodSignature";
+    key: Expression;
+    typeParameters: TypeParameterDeclaration | null;
+    parameters: Array<Identifier | RestElement> | null;
+    typeAnnotation: TSTypeAnnotation | null;
+    computed: boolean | null;
+    optional: boolean | null;
+}
+
+export interface TSModuleBlock extends Node {
+    type: "TSModuleBlock";
+    body: Statement[];
+}
+
+export interface TSModuleDeclaration extends Node {
+    type: "TSModuleDeclaration";
+    id: Identifier | StringLiteral;
+    body: TSModuleBlock | TSModuleDeclaration;
+    declare: boolean | null;
+    global: boolean | null;
+}
+
+export interface TSNamespaceExportDeclaration extends Node {
+    type: "TSNamespaceExportDeclaration";
+    id: Identifier;
+}
+
+export interface TSNeverKeyword extends Node {
+    type: "TSNeverKeyword";
+}
+
+export interface TSNonNullExpression extends Node {
+    type: "TSNonNullExpression";
+    expression: Expression;
+}
+
+export interface TSNullKeyword extends Node {
+    type: "TSNullKeyword";
+}
+
+export interface TSNumberKeyword extends Node {
+    type: "TSNumberKeyword";
+}
+
+export interface TSObjectKeyword extends Node {
+    type: "TSObjectKeyword";
+}
+
+export interface TSParameterProperty extends Node {
+    type: "TSParameterProperty";
+    parameter: Identifier | AssignmentPattern;
+    accessibility: 'public' | 'private' | 'protected' | null;
+    readonly: boolean | null;
+}
+
+export interface TSParenthesizedType extends Node {
+    type: "TSParenthesizedType";
+    typeAnnotation: TSType;
+}
+
+export interface TSPropertySignature extends Node {
+    type: "TSPropertySignature";
+    key: Expression;
+    typeAnnotation: TSTypeAnnotation | null;
+    initializer: Expression | null;
+    computed: boolean | null;
+    optional: boolean | null;
+    readonly: boolean | null;
+}
+
+export interface TSQualifiedName extends Node {
+    type: "TSQualifiedName";
+    left: TSEntityName;
+    right: Identifier;
+}
+
+export interface TSStringKeyword extends Node {
+    type: "TSStringKeyword";
+}
+
+export interface TSSymbolKeyword extends Node {
+    type: "TSSymbolKeyword";
+}
+
+export interface TSThisType extends Node {
+    type: "TSThisType";
+}
+
+export interface TSTupleType extends Node {
+    type: "TSTupleType";
+    elementTypes: TSType[];
+}
+
+export interface TSTypeAliasDeclaration extends Node {
+    type: "TSTypeAliasDeclaration";
+    id: Identifier;
+    typeParameters: TypeParameterDeclaration | null;
+    typeAnnotation: TSType;
+    declare: boolean | null;
+}
+
+export interface TSTypeAnnotation extends Node {
+    type: "TSTypeAnnotation";
+    typeAnnotation: TSType;
+}
+
+export interface TSTypeAssertion extends Node {
+    type: "TSTypeAssertion";
+    typeAnnotation: TSType;
+    expression: Expression;
+}
+
+export interface TSTypeLiteral extends Node {
+    type: "TSTypeLiteral";
+    members: TSTypeElement[];
+}
+
+export interface TSTypeOperator extends Node {
+    type: "TSTypeOperator";
+    typeAnnotation: TSType;
+    operator: string | null;
+}
+
+export interface TSTypeParameter extends Node {
+    type: "TSTypeParameter";
+    constraint: TSType | null;
+    default: TSType | null;
+    name: string | null;
+}
+
+export interface TSTypeParameterDeclaration extends Node {
+    type: "TSTypeParameterDeclaration";
+    params: TSTypeParameter[];
+}
+
+export interface TSTypeParameterInstantiation extends Node {
+    type: "TSTypeParameterInstantiation";
+    params: TSType[];
+}
+
+export interface TSTypePredicate extends Node {
+    type: "TSTypePredicate";
+    parameterName: Identifier | TSThisType;
+    typeAnnotation: TSTypeAnnotation;
+}
+
+export interface TSTypeQuery extends Node {
+    type: "TSTypeQuery";
+    exprName: TSEntityName;
+}
+
+export interface TSTypeReference extends Node {
+    type: "TSTypeReference";
+    typeName: TSEntityName;
+    typeParameters: TypeParameterInstantiation | null;
+}
+
+export interface TSUndefinedKeyword extends Node {
+    type: "TSUndefinedKeyword";
+}
+
+export interface TSUnionType extends Node {
+    type: "TSUnionType";
+    types: TSType[];
+}
+
+export interface TSVoidKeyword extends Node {
+    type: "TSVoidKeyword";
+}
+
 export type Expression = ArrayExpression | AssignmentExpression | BinaryExpression | CallExpression
     | ConditionalExpression | FunctionExpression | Identifier | StringLiteral | NumericLiteral | BooleanLiteral
     | NullLiteral | RegExpLiteral | LogicalExpression | MemberExpression | NewExpression | ObjectExpression
     | SequenceExpression | ThisExpression | UnaryExpression | UpdateExpression | ArrowFunctionExpression
     | ClassExpression | MetaProperty | Super | TaggedTemplateExpression | TemplateLiteral | YieldExpression
     | TypeCastExpression | JSXElement | JSXEmptyExpression | JSXIdentifier | JSXMemberExpression
-    | ParenthesizedExpression | AwaitExpression | BindExpression | DoExpression;
+    | ParenthesizedExpression | AwaitExpression | BindExpression | DoExpression | TSAsExpression
+    | TSNonNullExpression | TSTypeAssertion;
 
 export type Binary = BinaryExpression | LogicalExpression;
 
@@ -898,7 +1237,9 @@ export type Statement = BlockStatement | BreakStatement | ContinueStatement | De
     | LabeledStatement | ReturnStatement | SwitchStatement | ThrowStatement | TryStatement | VariableDeclaration
     | WhileStatement | WithStatement | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration
     | ExportNamedDeclaration | ForOfStatement | ImportDeclaration | DeclareClass | DeclareFunction | DeclareInterface
-    | DeclareModule | DeclareTypeAlias | DeclareVariable | InterfaceDeclaration | TypeAlias;
+    | DeclareModule | DeclareTypeAlias | DeclareVariable | InterfaceDeclaration | TypeAlias | TSDeclareFunction
+    | TSEnumDeclaration | TSExportAssignment | TSImportEqualsDeclaration | TSInterfaceDeclaration
+    | TSModuleDeclaration | TSNamespaceExportDeclaration | TSTypeAliasDeclaration;
 
 export type Terminatorless = BreakStatement | ContinueStatement | ReturnStatement | ThrowStatement | YieldExpression | AwaitExpression;
 export type CompletionStatement = BreakStatement | ContinueStatement | ReturnStatement | ThrowStatement;
@@ -914,9 +1255,11 @@ export type Pureish = FunctionDeclaration | FunctionExpression | StringLiteral |
 
 export type Declaration = FunctionDeclaration | VariableDeclaration | ClassDeclaration | ExportAllDeclaration
     | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration | DeclareClass | DeclareFunction
-    | DeclareInterface | DeclareModule | DeclareTypeAlias | DeclareVariable | InterfaceDeclaration | TypeAlias;
+    | DeclareInterface | DeclareModule | DeclareTypeAlias | DeclareVariable | InterfaceDeclaration | TypeAlias
+    | TSDeclareFunction | TSEnumDeclaration | TSInterfaceDeclaration | TSModuleDeclaration | TSTypeAliasDeclaration;
 
-export type LVal = Identifier | MemberExpression | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern;
+export type LVal = Identifier | MemberExpression | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern
+    | TSParameterProperty;
 export type Literal = StringLiteral | NumericLiteral | BooleanLiteral | NullLiteral | RegExpLiteral | TemplateLiteral;
 export type Immutable = StringLiteral | NumericLiteral | BooleanLiteral | NullLiteral | JSXAttribute | JSXClosingElement | JSXElement | JSXExpressionContainer | JSXOpeningElement;
 export type UserWhitespacable = ObjectMethod | ObjectProperty | ObjectTypeCallProperty | ObjectTypeIndexer | ObjectTypeProperty;
@@ -952,6 +1295,17 @@ export type FlowDeclaration = DeclareClass | DeclareFunction | DeclareInterface
 export type JSX = JSXAttribute | JSXClosingElement | JSXElement | JSXEmptyExpression | JSXExpressionContainer
     | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXSpreadAttribute | JSXText;
 
+export type TSType = TSAnyKeyword | TSArrayType | TSBooleanKeyword | TSConstructorType | TSExpressionWithTypeArguments
+    | TSFunctionType | TSIndexedAccessType | TSIntersectionType | TSLiteralType | TSMappedType | TSNeverKeyword
+    | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSParenthesizedType | TSStringKeyword | TSSymbolKeyword
+    | TSThisType | TSTupleType | TSTypeLiteral | TSTypeOperator | TSTypePredicate | TSTypeQuery | TSTypeReference
+    | TSUndefinedKeyword | TSUnionType | TSVoidKeyword;
+
+export type TSEntityName = Identifier | TSQualifiedName;
+
+export type TSTypeElement = TSCallSignatureDeclaration | TSConstructSignatureDeclaration | TSIndexSignature
+    | TSMethodSignature | TSPropertySignature;
+
 export function arrayExpression(elements?: Array<Expression | SpreadElement>): ArrayExpression;
 export function assignmentExpression(operator?: string, left?: LVal, right?: Expression): AssignmentExpression;
 export function binaryExpression(
@@ -1060,6 +1414,7 @@ export function typeofTypeAnnotation(argument?: FlowTypeAnnotation): TypeofTypeA
 export function typeAlias(id?: Identifier, typeParameters?: TypeParameterDeclaration, right?: FlowTypeAnnotation): TypeAlias;
 export function typeAnnotation(typeAnnotation?: FlowTypeAnnotation): TypeAnnotation;
 export function typeCastExpression(expression?: Expression, typeAnnotation?: FlowTypeAnnotation): TypeCastExpression;
+export function typeParameter(bound?: TypeAnnotation, default_?: Flow): TypeParameter;
 export function typeParameterDeclaration(params?: Identifier[]): TypeParameterDeclaration;
 export function typeParameterInstantiation(params?: FlowTypeAnnotation[]): TypeParameterInstantiation;
 export function objectTypeAnnotation(properties?: ObjectTypeProperty[], indexers?: ObjectTypeIndexer[], callProperties?: ObjectTypeCallProperty[]): ObjectTypeAnnotation;
@@ -1091,6 +1446,74 @@ export function exportNamespaceSpecifier(exported?: Identifier): ExportNamespace
 export function restProperty(argument?: LVal): RestProperty;
 export function spreadProperty(argument?: Expression): SpreadProperty;
 
+export function TSAnyKeyword(): TSAnyKeyword;
+export function TSArrayType(elementType: TSType): TSArrayType;
+export function TSAsExpression(expression: Expression, typeAnnotation: TSType): TSAsExpression;
+export function TSBooleanKeyword(): TSBooleanKeyword;
+export function TSCallSignatureDeclaration(typeParameters?: TypeParameterDeclaration, parameters?: Array<Identifier | RestElement>, typeAnnotation?: TSTypeAnnotation): TSCallSignatureDeclaration;
+export function TSConstructSignatureDeclaration(typeParameters?: TypeParameterDeclaration, parameters?: Array<Identifier | RestElement>, typeAnnotation?: TSTypeAnnotation): TSTypeElement;
+export function TSConstructorType(typeParameters?: TypeParameterDeclaration, typeAnnotation?: TSTypeAnnotation): TSConstructorType;
+export function TSDeclareFunction(
+    id: Identifier | undefined | null,
+    typeParameters: TypeParameterDeclaration | Noop | undefined | null,
+    params: LVal[],
+    returnType: TypeAnnotation | TSTypeAnnotation | Noop | undefined | null): TSDeclareFunction;
+export function TSDeclareMethod(
+    decorators: Decorator[] | undefined | null,
+    key: Expression,
+    typeParameters: TypeParameterDeclaration | Noop | undefined | null,
+    params: LVal[],
+    returnType?: TypeAnnotation | TSTypeAnnotation | Noop): TSDeclareMethod;
+export function TSEnumDeclaration(id: Identifier, members: TSEnumMember[]): TSEnumDeclaration;
+export function TSEnumMember(id: Identifier | StringLiteral, initializer?: Expression): TSEnumMember;
+export function TSExportAssignment(expression: Expression): TSExportAssignment;
+export function TSExpressionWithTypeArguments(expression: TSEntityName, typeParameters?: TypeParameterInstantiation): TSExpressionWithTypeArguments;
+export function TSExternalModuleReference(expression: StringLiteral): TSExternalModuleReference;
+export function TSFunctionType(typeParameters?: TypeParameterDeclaration, typeAnnotation?: TSTypeAnnotation): TSFunctionType;
+export function TSImportEqualsDeclaration(id: Identifier, moduleReference: TSEntityName | TSExternalModuleReference): TSImportEqualsDeclaration;
+export function TSIndexSignature(parameters: Identifier[], typeAnnotation?: TSTypeAnnotation): TSIndexSignature;
+export function TSIndexedAccessType(objectType: TSType, indexType: TSType): TSIndexedAccessType;
+export function TSInterfaceBody(body: TSTypeElement[]): TSInterfaceBody;
+export function TSInterfaceDeclaration(
+    id: Identifier,
+    typeParameters: TypeParameterDeclaration | undefined | null,
+    extends_: TSExpressionWithTypeArguments[] | undefined | null,
+    body: TSInterfaceBody): TSInterfaceDeclaration;
+export function TSIntersectionType(types: TSType[]): TSIntersectionType;
+export function TSLiteralType(literal: NumericLiteral | StringLiteral | BooleanLiteral): TSLiteralType;
+export function TSMappedType(typeParameter: TypeParameter, typeAnnotation?: TSType): TSMappedType;
+export function TSMethodSignature(key: Expression, typeParameters?: TypeParameterDeclaration, parameters?: Array<Identifier | RestElement>, typeAnnotation?: TSTypeAnnotation): TSMethodSignature;
+export function TSModuleBlock(body: Statement[]): TSModuleBlock;
+export function TSModuleDeclaration(id: Identifier | StringLiteral, body: TSModuleBlock | TSModuleDeclaration): TSModuleDeclaration;
+export function TSNamespaceExportDeclaration(id: Identifier): TSNamespaceExportDeclaration;
+export function TSNeverKeyword(): TSNeverKeyword;
+export function TSNonNullExpression(expression: Expression): TSNonNullExpression;
+export function TSNullKeyword(): TSNullKeyword;
+export function TSNumberKeyword(): TSNumberKeyword;
+export function TSObjectKeyword(): TSObjectKeyword;
+export function TSParameterProperty(parameter: Identifier | AssignmentPattern): TSParameterProperty;
+export function TSParenthesizedType(typeAnnotation: TSType): TSParenthesizedType;
+export function TSPropertySignature(key: Expression, typeAnnotation?: TSTypeAnnotation, initializer?: Expression): TSPropertySignature;
+export function TSQualifiedName(left: TSEntityName, right: Identifier): TSQualifiedName;
+export function TSStringKeyword(): TSStringKeyword;
+export function TSSymbolKeyword(): TSSymbolKeyword;
+export function TSThisType(): TSThisType;
+export function TSTupleType(elementTypes: TSType[]): TSTupleType;
+export function TSTypeAliasDeclaration(id: Identifier, typeParameters: TypeParameterDeclaration | undefined | null, typeAnnotation: TSType): TSTypeAliasDeclaration;
+export function TSTypeAnnotation(typeAnnotation: TSType): TSTypeAnnotation;
+export function TSTypeAssertion(typeAnnotation: TSType, expression: Expression): TSTypeAssertion;
+export function TSTypeLiteral(members: TSTypeElement[]): TSTypeLiteral;
+export function TSTypeOperator(typeAnnotation: TSType): TSTypeOperator;
+export function TSTypeParameter(constraint?: TSType, default_?: TSType): TSTypeParameter;
+export function TSTypeParameterDeclaration(params: TSTypeParameter[]): TSTypeParameterDeclaration;
+export function TSTypeParameterInstantiation(params: TSType[]): TSTypeParameterInstantiation;
+export function TSTypePredicate(parameterName: Identifier | TSThisType, typeAnnotation: TSTypeAnnotation): TSTypePredicate;
+export function TSTypeQuery(exprName: TSEntityName): TSTypeQuery;
+export function TSTypeReference(typeName: TSEntityName, typeParameters?: TypeParameterInstantiation): TSTypeReference;
+export function TSUndefinedKeyword(): TSUndefinedKeyword;
+export function TSUnionType(types: TSType[]): TSUnionType;
+export function TSVoidKeyword(): TSVoidKeyword;
+
 export function isArrayExpression(node: object, opts?: object): node is ArrayExpression;
 export function isAssignmentExpression(node: object, opts?: object): node is AssignmentExpression;
 export function isBinaryExpression(node: object, opts?: object): node is BinaryExpression;
@@ -1196,6 +1619,7 @@ export function isTypeofTypeAnnotation(node: object, opts?: object): node is Typ
 export function isTypeAlias(node: object, opts?: object): node is TypeAlias;
 export function isTypeAnnotation(node: object, opts?: object): node is TypeAnnotation;
 export function isTypeCastExpression(node: object, opts?: object): node is TypeCastExpression;
+export function isTypeParameter(node: object, opts?: object): node is TypeParameter;
 export function isTypeParameterDeclaration(node: object, opts?: object): node is TypeParameterDeclaration;
 export function isTypeParameterInstantiation(node: object, opts?: object): node is TypeParameterInstantiation;
 export function isObjectTypeAnnotation(node: object, opts?: object): node is ObjectTypeAnnotation;
@@ -1265,17 +1689,72 @@ export function isJSX(node: object, opts?: object): node is JSX;
 export function isNumberLiteral(node: object, opts?: object): node is NumericLiteral;
 export function isRegexLiteral(node: object, opts?: object): node is RegExpLiteral;
 
-export function isReferencedIdentifier(node: object, opts?: object): boolean;
-export function isReferencedMemberExpression(node: object, opts?: object): boolean;
-export function isBindingIdentifier(node: object, opts?: object): boolean;
-export function isScope(node: object, opts?: object): boolean;
+export function isReferencedIdentifier(node: object, opts?: object): node is Identifier | JSXIdentifier;
+export function isReferencedMemberExpression(node: object, opts?: object): node is MemberExpression;
+export function isBindingIdentifier(node: object, opts?: object): node is Identifier;
+export function isScope(node: object, opts?: object): node is Scopable;
 export function isReferenced(node: object, opts?: object): boolean;
-export function isBlockScoped(node: object, opts?: object): boolean;
-export function isVar(node: object, opts?: object): boolean;
+export function isBlockScoped(node: object, opts?: object): node is FunctionDeclaration | ClassDeclaration | VariableDeclaration;
+export function isVar(node: object, opts?: object): node is VariableDeclaration;
 export function isUser(node: object, opts?: object): boolean;
 export function isGenerated(node: object, opts?: object): boolean;
 export function isPure(node: object, opts?: object): boolean;
 
+export function isTSAnyKeyword(node: object, opts?: object): node is TSAnyKeyword;
+export function isTSArrayType(node: object, opts?: object): node is TSArrayType;
+export function isTSAsExpression(node: object, opts?: object): node is TSAsExpression;
+export function isTSBooleanKeyword(node: object, opts?: object): node is TSBooleanKeyword;
+export function isTSCallSignatureDeclaration(node: object, opts?: object): node is TSCallSignatureDeclaration;
+export function isTSConstructSignatureDeclaration(node: object, opts?: object): node is TSTypeElement;
+export function isTSConstructorType(node: object, opts?: object): node is TSConstructorType;
+export function isTSDeclareFunction(node: object, opts?: object): node is TSDeclareFunction;
+export function isTSDeclareMethod(node: object, opts?: object): node is TSDeclareMethod;
+export function isTSEnumDeclaration(node: object, opts?: object): node is TSEnumDeclaration;
+export function isTSEnumMember(node: object, opts?: object): node is TSEnumMember;
+export function isTSExportAssignment(node: object, opts?: object): node is TSExportAssignment;
+export function isTSExpressionWithTypeArguments(node: object, opts?: object): node is TSExpressionWithTypeArguments;
+export function isTSExternalModuleReference(node: object, opts?: object): node is TSExternalModuleReference;
+export function isTSFunctionType(node: object, opts?: object): node is TSFunctionType;
+export function isTSImportEqualsDeclaration(node: object, opts?: object): node is TSImportEqualsDeclaration;
+export function isTSIndexSignature(node: object, opts?: object): node is TSIndexSignature;
+export function isTSIndexedAccessType(node: object, opts?: object): node is TSIndexedAccessType;
+export function isTSInterfaceBody(node: object, opts?: object): node is TSInterfaceBody;
+export function isTSInterfaceDeclaration(node: object, opts?: object): node is TSInterfaceDeclaration;
+export function isTSIntersectionType(node: object, opts?: object): node is TSIntersectionType;
+export function isTSLiteralType(node: object, opts?: object): node is TSLiteralType;
+export function isTSMappedType(node: object, opts?: object): node is TSMappedType;
+export function isTSMethodSignature(node: object, opts?: object): node is TSMethodSignature;
+export function isTSModuleBlock(node: object, opts?: object): node is TSModuleBlock;
+export function isTSModuleDeclaration(node: object, opts?: object): node is TSModuleDeclaration;
+export function isTSNamespaceExportDeclaration(node: object, opts?: object): node is TSNamespaceExportDeclaration;
+export function isTSNeverKeyword(node: object, opts?: object): node is TSNeverKeyword;
+export function isTSNonNullExpression(node: object, opts?: object): node is TSNonNullExpression;
+export function isTSNullKeyword(node: object, opts?: object): node is TSNullKeyword;
+export function isTSNumberKeyword(node: object, opts?: object): node is TSNumberKeyword;
+export function isTSObjectKeyword(node: object, opts?: object): node is TSObjectKeyword;
+export function isTSParameterProperty(node: object, opts?: object): node is TSParameterProperty;
+export function isTSParenthesizedType(node: object, opts?: object): node is TSParenthesizedType;
+export function isTSPropertySignature(node: object, opts?: object): node is TSPropertySignature;
+export function isTSQualifiedName(node: object, opts?: object): node is TSQualifiedName;
+export function isTSStringKeyword(node: object, opts?: object): node is TSStringKeyword;
+export function isTSSymbolKeyword(node: object, opts?: object): node is TSSymbolKeyword;
+export function isTSThisType(node: object, opts?: object): node is TSThisType;
+export function isTSTupleType(node: object, opts?: object): node is TSTupleType;
+export function isTSTypeAliasDeclaration(node: object, opts?: object): node is TSTypeAliasDeclaration;
+export function isTSTypeAnnotation(node: object, opts?: object): node is TSTypeAnnotation;
+export function isTSTypeAssertion(node: object, opts?: object): node is TSTypeAssertion;
+export function isTSTypeLiteral(node: object, opts?: object): node is TSTypeLiteral;
+export function isTSTypeOperator(node: object, opts?: object): node is TSTypeOperator;
+export function isTSTypeParameter(node: object, opts?: object): node is TSTypeParameter;
+export function isTSTypeParameterDeclaration(node: object, opts?: object): node is TSTypeParameterDeclaration;
+export function isTSTypeParameterInstantiation(node: object, opts?: object): node is TSTypeParameterInstantiation;
+export function isTSTypePredicate(node: object, opts?: object): node is TSTypePredicate;
+export function isTSTypeQuery(node: object, opts?: object): node is TSTypeQuery;
+export function isTSTypeReference(node: object, opts?: object): node is TSTypeReference;
+export function isTSUndefinedKeyword(node: object, opts?: object): node is TSUndefinedKeyword;
+export function isTSUnionType(node: object, opts?: object): node is TSUnionType;
+export function isTSVoidKeyword(node: object, opts?: object): node is TSVoidKeyword;
+
 // React specific
 export interface ReactHelpers {
     isCompatTag(tagName?: string): boolean;
@@ -1388,6 +1867,7 @@ export function assertTypeofTypeAnnotation(node: object, opts?: object): void;
 export function assertTypeAlias(node: object, opts?: object): void;
 export function assertTypeAnnotation(node: object, opts?: object): void;
 export function assertTypeCastExpression(node: object, opts?: object): void;
+export function assertTypeParameter(node: object, opts?: object): void;
 export function assertTypeParameterDeclaration(node: object, opts?: object): void;
 export function assertTypeParameterInstantiation(node: object, opts?: object): void;
 export function assertObjectTypeAnnotation(node: object, opts?: object): void;
@@ -1455,3 +1935,58 @@ export function assertFlowDeclaration(node: object, opts?: object): void;
 export function assertJSX(node: object, opts?: object): void;
 export function assertNumberLiteral(node: object, opts?: object): void;
 export function assertRegexLiteral(node: object, opts?: object): void;
+
+export function assertTSAnyKeyword(node: object, opts?: object): void;
+export function assertTSArrayType(node: object, opts?: object): void;
+export function assertTSAsExpression(node: object, opts?: object): void;
+export function assertTSBooleanKeyword(node: object, opts?: object): void;
+export function assertTSCallSignatureDeclaration(node: object, opts?: object): void;
+export function assertTSConstructSignatureDeclaration(node: object, opts?: object): void;
+export function assertTSConstructorType(node: object, opts?: object): void;
+export function assertTSDeclareFunction(node: object, opts?: object): void;
+export function assertTSDeclareMethod(node: object, opts?: object): void;
+export function assertTSEnumDeclaration(node: object, opts?: object): void;
+export function assertTSEnumMember(node: object, opts?: object): void;
+export function assertTSExportAssignment(node: object, opts?: object): void;
+export function assertTSExpressionWithTypeArguments(node: object, opts?: object): void;
+export function assertTSExternalModuleReference(node: object, opts?: object): void;
+export function assertTSFunctionType(node: object, opts?: object): void;
+export function assertTSImportEqualsDeclaration(node: object, opts?: object): void;
+export function assertTSIndexSignature(node: object, opts?: object): void;
+export function assertTSIndexedAccessType(node: object, opts?: object): void;
+export function assertTSInterfaceBody(node: object, opts?: object): void;
+export function assertTSInterfaceDeclaration(node: object, opts?: object): void;
+export function assertTSIntersectionType(node: object, opts?: object): void;
+export function assertTSLiteralType(node: object, opts?: object): void;
+export function assertTSMappedType(node: object, opts?: object): void;
+export function assertTSMethodSignature(node: object, opts?: object): void;
+export function assertTSModuleBlock(node: object, opts?: object): void;
+export function assertTSModuleDeclaration(node: object, opts?: object): void;
+export function assertTSNamespaceExportDeclaration(node: object, opts?: object): void;
+export function assertTSNeverKeyword(node: object, opts?: object): void;
+export function assertTSNonNullExpression(node: object, opts?: object): void;
+export function assertTSNullKeyword(node: object, opts?: object): void;
+export function assertTSNumberKeyword(node: object, opts?: object): void;
+export function assertTSObjectKeyword(node: object, opts?: object): void;
+export function assertTSParameterProperty(node: object, opts?: object): void;
+export function assertTSParenthesizedType(node: object, opts?: object): void;
+export function assertTSPropertySignature(node: object, opts?: object): void;
+export function assertTSQualifiedName(node: object, opts?: object): void;
+export function assertTSStringKeyword(node: object, opts?: object): void;
+export function assertTSSymbolKeyword(node: object, opts?: object): void;
+export function assertTSThisType(node: object, opts?: object): void;
+export function assertTSTupleType(node: object, opts?: object): void;
+export function assertTSTypeAliasDeclaration(node: object, opts?: object): void;
+export function assertTSTypeAnnotation(node: object, opts?: object): void;
+export function assertTSTypeAssertion(node: object, opts?: object): void;
+export function assertTSTypeLiteral(node: object, opts?: object): void;
+export function assertTSTypeOperator(node: object, opts?: object): void;
+export function assertTSTypeParameter(node: object, opts?: object): void;
+export function assertTSTypeParameterDeclaration(node: object, opts?: object): void;
+export function assertTSTypeParameterInstantiation(node: object, opts?: object): void;
+export function assertTSTypePredicate(node: object, opts?: object): void;
+export function assertTSTypeQuery(node: object, opts?: object): void;
+export function assertTSTypeReference(node: object, opts?: object): void;
+export function assertTSUndefinedKeyword(node: object, opts?: object): void;
+export function assertTSUnionType(node: object, opts?: object): void;
+export function assertTSVoidKeyword(node: object, opts?: object): void;
diff --git a/types/babel-webpack-plugin/babel-webpack-plugin-tests.ts b/types/babel-webpack-plugin/babel-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..89b8efc6e6
--- /dev/null
+++ b/types/babel-webpack-plugin/babel-webpack-plugin-tests.ts
@@ -0,0 +1,10 @@
+import BabelWebpackPlugin = require('babel-webpack-plugin');
+
+new BabelWebpackPlugin();
+new BabelWebpackPlugin({});
+new BabelWebpackPlugin({
+	test: /\.js$/,
+	presets: ['es2015'],
+	sourceMaps: false,
+	compact: false
+});
diff --git a/types/babel-webpack-plugin/index.d.ts b/types/babel-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..3f16d154ac
--- /dev/null
+++ b/types/babel-webpack-plugin/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for babel-webpack-plugin 0.1
+// Project: https://github.com/simlrh/babel-webpack-plugin
+// Definitions by: Jed Fox <https://github.com/j-f1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Plugin } from 'webpack';
+import { TransformOptions } from 'babel-core';
+
+export = BabelWebpackPlugin;
+
+declare class BabelWebpackPlugin extends Plugin {
+    constructor(options?: BabelWebpackPlugin.Options);
+}
+
+declare namespace BabelWebpackPlugin {
+    type Matcher = RegExp | string | Array<RegExp | string>;
+    interface Options extends TransformOptions {
+        test?: Matcher;
+        include?: Matcher;
+        exclude?: Matcher;
+    }
+}
diff --git a/types/babel-webpack-plugin/tsconfig.json b/types/babel-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..3e73343283
--- /dev/null
+++ b/types/babel-webpack-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "babel-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/jimp/tslint.json b/types/babel-webpack-plugin/tslint.json
similarity index 100%
rename from types/jimp/tslint.json
rename to types/babel-webpack-plugin/tslint.json
diff --git a/types/babelify/tslint.json b/types/babelify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/babelify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/babylon-walk/babylon-walk-tests.ts b/types/babylon-walk/babylon-walk-tests.ts
new file mode 100644
index 0000000000..f9489941df
--- /dev/null
+++ b/types/babylon-walk/babylon-walk-tests.ts
@@ -0,0 +1,37 @@
+import * as babelTypes from "babel-types";
+import * as walk from "babylon-walk";
+declare function assert(expr: boolean): void;
+
+const simpleVisitors: walk.visitors<walk.SimpleVisitor> = {
+    File: (node: babelTypes.Node, state: any) => {
+        state.out = 1;
+    },
+};
+
+const ancestorVisitors: walk.visitors<walk.AncestorVisitor> = {
+    File: (node: babelTypes.Node, state: any, ancestors: babelTypes.Node[]) => {
+        state.out = 2;
+    },
+};
+
+const recursiveVisitors: walk.visitors<walk.RecursiveVisitor> = {
+    File: (node: babelTypes.Node, state: any, next: (node: babelTypes.Node) => void) => {
+        state.out = 3;
+    },
+};
+
+const node: any = {
+    type: "File",
+};
+
+const state: any = {
+    out: 0,
+};
+walk.simple(node, simpleVisitors, state);
+assert(state.out === 1);
+
+walk.ancestor(node, ancestorVisitors, state);
+assert(state.out === 2);
+
+walk.recursive(node, recursiveVisitors, state);
+assert(state.out === 3);
diff --git a/types/babylon-walk/index.d.ts b/types/babylon-walk/index.d.ts
new file mode 100644
index 0000000000..02c3f39d10
--- /dev/null
+++ b/types/babylon-walk/index.d.ts
@@ -0,0 +1,118 @@
+// Type definitions for babylon-walk 3.10
+// Project: https://github.com/pugjs/babylon-walk
+// Definitions by: Marek Buchar <https://github.com/czbuchi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as babelTypes from 'babel-types';
+
+export type coreTypes = babelTypes.ArrayExpression | babelTypes.AssignmentExpression | babelTypes.BinaryExpression |
+    babelTypes.Directive | babelTypes.DirectiveLiteral | babelTypes.BlockStatement | babelTypes.BreakStatement |
+    babelTypes.CallExpression | babelTypes.CatchClause | babelTypes.ConditionalExpression |
+    babelTypes.ContinueStatement | babelTypes.DebuggerStatement | babelTypes.DoWhileStatement |
+    babelTypes.EmptyStatement | babelTypes.ExpressionStatement | babelTypes.File | babelTypes.ForInStatement |
+    babelTypes.ForStatement | babelTypes.FunctionDeclaration | babelTypes.FunctionExpression | babelTypes.Identifier |
+    babelTypes.IfStatement | babelTypes.LabeledStatement | babelTypes.StringLiteral | babelTypes.NumericLiteral |
+    babelTypes.NullLiteral | babelTypes.BooleanLiteral | babelTypes.RegExpLiteral | babelTypes.LogicalExpression |
+    babelTypes.MemberExpression | babelTypes.NewExpression | babelTypes.Program | babelTypes.ObjectExpression |
+    babelTypes.ObjectMethod | babelTypes.ObjectProperty | babelTypes.RestElement | babelTypes.ReturnStatement |
+    babelTypes.SequenceExpression | babelTypes.SwitchCase | babelTypes.SwitchStatement | babelTypes.ThisExpression |
+    babelTypes.ThrowStatement | babelTypes.TryStatement | babelTypes.UnaryExpression | babelTypes.UpdateExpression |
+    babelTypes.VariableDeclaration | babelTypes.VariableDeclarator | babelTypes.WhileStatement |
+    babelTypes.WithStatement;
+
+export type es2015Types = babelTypes.AssignmentPattern | babelTypes.ArrayPattern | babelTypes.ArrowFunctionExpression |
+    babelTypes.ClassBody | babelTypes.ClassDeclaration | babelTypes.ClassExpression |
+    babelTypes.ExportAllDeclaration | babelTypes.ExportDefaultDeclaration | babelTypes.ExportNamedDeclaration |
+    babelTypes.ExportSpecifier | babelTypes.ForOfStatement | babelTypes.ImportDeclaration |
+    babelTypes.ImportDefaultSpecifier | babelTypes.ImportNamespaceSpecifier | babelTypes.ImportSpecifier |
+    babelTypes.MetaProperty | babelTypes.ClassMethod | babelTypes.ObjectPattern | babelTypes.SpreadElement |
+    babelTypes.Super | babelTypes.TaggedTemplateExpression | babelTypes.TemplateElement | babelTypes.TemplateLiteral |
+    babelTypes.YieldExpression | babelTypes.AwaitExpression | babelTypes.BindExpression | babelTypes.ClassProperty |
+    babelTypes.Decorator | babelTypes.DoExpression | babelTypes.ExportDefaultSpecifier |
+    babelTypes.ExportNamespaceSpecifier;
+
+export type flowTypes = babelTypes.AnyTypeAnnotation | babelTypes.ArrayTypeAnnotation | babelTypes.BooleanTypeAnnotation |
+    babelTypes.BooleanLiteralTypeAnnotation | babelTypes.NullLiteralTypeAnnotation | babelTypes.ClassImplements |
+    babelTypes.DeclareClass | babelTypes.DeclareFunction | babelTypes.DeclareInterface | babelTypes.DeclareModule |
+    babelTypes.DeclareTypeAlias | babelTypes.DeclareVariable | babelTypes.FunctionTypeAnnotation |
+    babelTypes.FunctionTypeParam | babelTypes.GenericTypeAnnotation | babelTypes.InterfaceExtends |
+    babelTypes.InterfaceDeclaration | babelTypes.IntersectionTypeAnnotation | babelTypes.MixedTypeAnnotation |
+    babelTypes.NullableTypeAnnotation | babelTypes.NumberTypeAnnotation | babelTypes.ObjectTypeAnnotation |
+    babelTypes.ObjectTypeCallProperty | babelTypes.ObjectTypeIndexer | babelTypes.ObjectTypeProperty |
+    babelTypes.QualifiedTypeIdentifier | babelTypes.StringLiteralTypeAnnotation | babelTypes.StringTypeAnnotation |
+    babelTypes.ThisTypeAnnotation | babelTypes.TupleTypeAnnotation | babelTypes.TypeofTypeAnnotation |
+    babelTypes.TypeAlias | babelTypes.TypeAnnotation | babelTypes.TypeCastExpression |
+    babelTypes.TypeParameterDeclaration | babelTypes.TypeParameterInstantiation | babelTypes.UnionTypeAnnotation |
+    babelTypes.VoidTypeAnnotation;
+
+export type jsxTypes = babelTypes.JSXAttribute | babelTypes.JSXClosingElement | babelTypes.JSXElement |
+    babelTypes.JSXEmptyExpression | babelTypes.JSXExpressionContainer | babelTypes.JSXIdentifier |
+    babelTypes.JSXMemberExpression | babelTypes.JSXNamespacedName | babelTypes.JSXOpeningElement |
+    babelTypes.JSXSpreadAttribute | babelTypes.JSXText;
+
+export type miscTypes = babelTypes.Noop | babelTypes.ParenthesizedExpression;
+
+export type NodeTypes = coreTypes | es2015Types | flowTypes | jsxTypes | miscTypes;
+
+export interface coreVisitors<V> {
+    ArrayExpression?: V; AssignmentExpression?: V; BinaryExpression?: V; Directive?: V; DirectiveLiteral?: V;
+    BlockStatement?: V; BreakStatement?: V; CallExpression?: V; CatchClause?: V; ConditionalExpression?: V;
+    ContinueStatement?: V; DebuggerStatement?: V; DoWhileStatement?: V; EmptyStatement?: V; ExpressionStatement?: V;
+    File?: V; ForInStatement?: V; ForStatement?: V; FunctionDeclaration?: V; FunctionExpression?: V; Identifier?: V;
+    IfStatement?: V; LabeledStatement?: V; StringLiteral?: V; NumericLiteral?: V; NullLiteral?: V; BooleanLiteral?: V;
+    RegExpLiteral?: V; LogicalExpression?: V; MemberExpression?: V; NewExpression?: V; Program?: V;
+    ObjectExpression?: V; ObjectMethod?: V; ObjectProperty?: V; RestElement?: V; ReturnStatement?: V;
+    SequenceExpression?: V; SwitchCase?: V; SwitchStatement?: V; ThisExpression?: V; ThrowStatement?: V;
+    TryStatement?: V; UnaryExpression?: V; UpdateExpression?: V; VariableDeclaration?: V; VariableDeclarator?: V;
+    WhileStatement?: V; WithStatement?: V;
+}
+
+export interface es2015Visitors<V> {
+    AssignmentPattern?: V; ArrayPattern?: V; ArrowFunctionExpression?: V; ClassBody?: V; ClassDeclaration?: V;
+    ClassExpression?: V; ExportAllDeclaration?: V; ExportDefaultDeclaration?: V; ExportNamedDeclaration?: V;
+    ExportSpecifier?: V; ForOfStatement?: V; ImportDeclaration?: V; ImportDefaultSpecifier?: V;
+    ImportNamespaceSpecifier?: V; ImportSpecifier?: V; MetaProperty?: V; ClassMethod?: V; ObjectPattern?: V;
+    SpreadElement?: V; Super?: V; TaggedTemplateExpression?: V; TemplateElement?: V; TemplateLiteral?: V;
+    YieldExpression?: V; AwaitExpression?: V; BindExpression?: V; ClassProperty?: V; Decorator?: V; DoExpression?: V;
+    ExportDefaultSpecifier?: V; ExportNamespaceSpecifier?: V;
+}
+
+export interface flowVisitors<V> {
+    AnyTypeAnnotation?: V; ArrayTypeAnnotation?: V; BooleanTypeAnnotation?: V; BooleanLiteralTypeAnnotation?: V;
+    NullLiteralTypeAnnotation?: V; ClassImplements?: V; DeclareClass?: V; DeclareFunction?: V; DeclareInterface?: V;
+    DeclareModule?: V; DeclareTypeAlias?: V; DeclareVariable?: V; FunctionTypeAnnotation?: V; FunctionTypeParam?: V;
+    GenericTypeAnnotation?: V; InterfaceExtends?: V; InterfaceDeclaration?: V; IntersectionTypeAnnotation?: V;
+    MixedTypeAnnotation?: V; NullableTypeAnnotation?: V; NumberTypeAnnotation?: V; ObjectTypeAnnotation?: V;
+    ObjectTypeCallProperty?: V; ObjectTypeIndexer?: V; ObjectTypeProperty?: V; QualifiedTypeIdentifier?: V;
+    StringLiteralTypeAnnotation?: V; StringTypeAnnotation?: V; ThisTypeAnnotation?: V; TupleTypeAnnotation?: V;
+    TypeofTypeAnnotation?: V; TypeAlias?: V; TypeAnnotation?: V; TypeCastExpression?: V; TypeParameterDeclaration?: V;
+    TypeParameterInstantiation?: V; UnionTypeAnnotation?: V; VoidTypeAnnotation?: V;
+}
+
+export interface jsxVisitors<V> {
+    JSXAttribute?: V; JSXClosingElement?: V; JSXElement?: V; JSXEmptyExpression?: V; JSXExpressionContainer?: V;
+    JSXIdentifier?: V; JSXMemberExpression?: V; JSXNamespacedName?: V; JSXOpeningElement?: V; JSXSpreadAttribute?: V;
+    JSXText?: V;
+}
+
+export interface miscVisitors<V> {
+    Noop?: V; ParenthesizedExpression?: V;
+}
+
+export interface visitors<V> extends coreVisitors<V>, es2015Visitors<V>, flowVisitors<V>, jsxVisitors<V>, miscVisitors<V> {
+}
+
+export type Visitor = (commentBlock: NodeTypes, state: any) => void;
+
+export type SimpleVisitor = (node: NodeTypes, state: any) => void;
+
+export type AncestorVisitor = (node: NodeTypes, state: any, ancestors: babelTypes.Node[]) => void;
+
+export type AncestorStatelessVisitor = (node: NodeTypes, state: any, ancestors: babelTypes.Node[]) => void;
+
+export type RecursiveVisitor = (node: NodeTypes, state: any, next: (node: babelTypes.Node) => void) => void;
+
+export function simple(node: NodeTypes, visitors: visitors<SimpleVisitor>, state: any): void;
+export function ancestor(node: NodeTypes, visitors: visitors<AncestorVisitor>, state: any): void;
+export function recursive(node: NodeTypes, visitors: visitors<RecursiveVisitor>, state: any): void;
diff --git a/types/babylon-walk/tsconfig.json b/types/babylon-walk/tsconfig.json
new file mode 100644
index 0000000000..9e1d7c33b7
--- /dev/null
+++ b/types/babylon-walk/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "babylon-walk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/babylon-walk/tslint.json b/types/babylon-walk/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/babylon-walk/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/babyparse/tslint.json b/types/babyparse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/babyparse/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone-associations/tslint.json b/types/backbone-associations/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone-associations/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone-fetch-cache/tslint.json b/types/backbone-fetch-cache/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone-fetch-cache/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone-relational/tslint.json b/types/backbone-relational/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone-relational/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone.layoutmanager/tslint.json b/types/backbone.layoutmanager/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone.layoutmanager/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone.localstorage/tslint.json b/types/backbone.localstorage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone.localstorage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index be3dfd8582..cd8ccd3821 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -691,7 +691,7 @@ export class Region extends Object implements DomMixin {
  * Render a template with data by passing in the template selector and the
  * data to render. This is the default renderer that is used by Marionette.
  */
-export class Renderer {
+export namespace Renderer {
     /**
      *  This method returns a string containing the result of applying the
      * template using the data object as the context.
@@ -703,7 +703,7 @@ export class Renderer {
      * that returns valid HTML as a string from the data parameter passed to
      * the function.
      */
-    static render(template: any, data: any): string;
+    function render(template: any, data: any): string;
 }
 
 export interface ViewOptions<TModel extends Backbone.Model> extends Backbone.ViewOptions<TModel>, ViewMixinOptions {
@@ -1614,11 +1614,11 @@ export class Behavior extends Object {
 /**
  * DEPRECATED
  */
-export class Behaviors {
+export namespace Behaviors {
     /**
      * This method defines where your behavior classes are stored. Override this to provide another lookup.
      */
-    static behaviorsLookup(): any;
+    function behaviorsLookup(): any;
 
     /**
      * This method has a default implementation that is simple to override. It
@@ -1626,5 +1626,5 @@ export class Behaviors {
      * Behaviors.behaviorsLookup or elsewhere. Note that it should return the type of the
      * class to instantiate, not an instance of that class.
      */
-    static getBehaviorClass(options: any, key: string): any;
+    function getBehaviorClass(options: any, key: string): any;
 }
diff --git a/types/backbone.paginator/tslint.json b/types/backbone.paginator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone.paginator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone.radio/tslint.json b/types/backbone.radio/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone.radio/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backbone/backbone-tests.ts b/types/backbone/backbone-tests.ts
index c074ac57e5..7b6fad9b56 100644
--- a/types/backbone/backbone-tests.ts
+++ b/types/backbone/backbone-tests.ts
@@ -115,6 +115,8 @@ class Employee extends Backbone.Model {
         super(options);
         this.reports = new EmployeeCollection();
         this.reports.url = '../api/employees/' + this.id + '/reports';
+        // Test that collection url property can be set as a function returning a string.
+        this.reports.url = () => { return ""; };
     }
 
     more() {
@@ -157,6 +159,9 @@ function test_collection() {
     var book1: Book = new Book({ title: "Title 1", author: "Mike" });
     books.add(book1);
 
+    // Test adding sort option to add.
+    books.add(new Book(), { sort: true });
+
     // Objects can be added to collection by casting to model type.
     // Compiler will check if object properties are valid for the cast.
     // This gives better type checking than declaring an `any` overload.
@@ -178,6 +183,8 @@ function test_collection() {
 
     var alphabetical = books.sortBy((book: Book): number => null);
 
+    var copy = books.clone();
+
     let one: Book;
     let models: Book[];
     let bool: boolean;
@@ -186,6 +193,7 @@ function test_collection() {
     let modelsDict: _.Dictionary<Book[]>;
     let num: number;
 
+    models = books.slice();
     models = books.slice(1);
     models = books.slice(1, 3);
 
@@ -401,6 +409,12 @@ namespace v1Changes {
                 validate: false
             });
         }
+
+        function test_set() {
+            var collection = new EmployeeCollection();
+            var model = new Employee();
+            collection.set([model], { add: false, remove: true, merge: false });
+        }
     }
 
     namespace Router {
@@ -411,4 +425,10 @@ namespace v1Changes {
             router.navigate('/employees', true);
         }
     }
+
+    namespace Sync {
+        // Test for Backbone.sync override.
+        Backbone.sync('create', new Employee());
+        Backbone.sync('read', new EmployeeCollection());
+    }
 }
diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index 42a322e4c2..3d4c90d369 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -16,6 +16,13 @@ declare namespace Backbone {
     interface AddOptions extends Silenceable {
         at?: number;
         merge?: boolean;
+        sort?: boolean;
+    }
+
+    interface CollectionSetOptions extends Silenceable {
+        add?: boolean;
+        remove?: boolean;
+        merge?: boolean;
     }
 
     interface HistoryOptions extends Silenceable {
@@ -100,7 +107,6 @@ declare namespace Backbone {
     }
 
     class ModelBase extends Events {
-        url: any;
         parse(response: any, options?: any): any;
         toJSON(options?: any): any;
         sync(...arg: any[]): JQueryXHR;
@@ -133,6 +139,13 @@ declare namespace Backbone {
         id: any;
         idAttribute: string;
         validationError: any;
+
+        /**
+         * Returns the relative URL where the model's resource would be located on the server.
+         * @memberof Model
+         */
+        url: () => string;
+
         urlRoot: any;
 
         constructor(attributes?: any, options?: any);
@@ -229,6 +242,7 @@ declare namespace Backbone {
          **/
         get(id: number|string|Model): TModel;
         has(key: number|string|Model): boolean;
+        clone(): this;
         create(attributes: any, options?: ModelSaveOptions): TModel;
         pluck(attribute: string): any[];
         push(model: TModel, options?: AddOptions): TModel;
@@ -236,7 +250,19 @@ declare namespace Backbone {
         remove(model: {}|TModel, options?: Silenceable): TModel;
         remove(models: ({}|TModel)[], options?: Silenceable): TModel[];
         reset(models?: TModel[], options?: Silenceable): TModel[];
-        set(models?: TModel[], options?: Silenceable): TModel[];
+
+        /**
+         *
+         * The set method performs a "smart" update of the collection with the passed list of models.
+         * If a model in the list isn't yet in the collection it will be added; if the model is already in the
+         * collection its attributes will be merged; and if the collection contains any models that aren't present
+         * in the list, they'll be removed. All of the appropriate "add", "remove", and "change" events are fired as
+         * this happens. Returns the touched models in the collection. If you'd like to customize the behavior, you can
+         * disable it with options: {add: false}, {remove: false}, or {merge: false}.
+         * @param models
+         * @param options
+         */
+        set(models?: TModel[], options?: CollectionSetOptions): TModel[];
         shift(options?: Silenceable): TModel;
         sort(options?: Silenceable): Collection<TModel>;
         unshift(model: TModel, options?: AddOptions): TModel;
@@ -252,7 +278,7 @@ declare namespace Backbone {
         /**
          * Return a shallow copy of this collection's models, using the same options as native Array#slice.
          */
-        slice(min: number, max?: number): TModel[];
+        slice(min?: number, max?: number): TModel[];
 
         // mixins from underscore
 
@@ -314,6 +340,14 @@ declare namespace Backbone {
         take(): TModel;
         take(n: number): TModel[];
         toArray(): TModel[];
+
+        /**
+         * Sets the url property (or function) on a collection to reference its location on the server.
+         *
+         * @memberof Collection
+         */
+        url: string | (() => string);
+
         without(...values: TModel[]): TModel[];
     }
 
@@ -358,7 +392,7 @@ declare namespace Backbone {
         decodeFragment(fragment: string): string;
         getSearch(): string;
         stop(): void;
-        route(route: string, callback: Function): number;
+        route(route: string|RegExp, callback: Function): number;
         checkUrl(e?: any): void;
         getPath(): string;
         matchRoot(): boolean;
@@ -426,7 +460,7 @@ declare namespace Backbone {
     }
 
     // SYNC
-    function sync(method: string, model: Model, options?: JQueryAjaxSettings): any;
+    function sync(method: string, model: Model | Collection<Model>, options?: JQueryAjaxSettings): any;
     function ajax(options?: JQueryAjaxSettings): JQueryXHR;
     var emulateHTTP: boolean;
     var emulateJSON: boolean;
diff --git a/types/backbone/tslint.json b/types/backbone/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backbone/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backgrid/tslint.json b/types/backgrid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backgrid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/backlog-js/tslint.json b/types/backlog-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/backlog-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/baconjs/baconjs-tests.ts b/types/baconjs/baconjs-tests.ts
index 75560d4e42..2755bec595 100644
--- a/types/baconjs/baconjs-tests.ts
+++ b/types/baconjs/baconjs-tests.ts
@@ -165,7 +165,12 @@ function CommonMethodsInEventStreamsAndProperties() {
 
     {
         // Calculator for grouped consecutive values until group is cancelled:
-        var events = [
+        interface Event {
+            id:number;
+            type:string;
+            val?:number;
+        }
+        var events: Event[] = [
                 {id: 1, type: "add", val: 3},
                 {id: 2, type: "add", val: -1},
                 {id: 1, type: "add", val: 2},
@@ -177,16 +182,16 @@ function CommonMethodsInEventStreamsAndProperties() {
                 {id: 1, type: "cancel"}
             ],
             keyF = (event:{id:number}) => event.id,
-            limitF = (groupedStream:Bacon.EventStream<string, {id:number; type:string; val?:number}>) => {
+            limitF = (groupedStream:Bacon.EventStream<string, Event>) => {
                 var cancel = groupedStream.filter(x => x.type === "cancel").take(1),
                     adds = groupedStream.filter(x => x.type === "add");
                 return adds.takeUntil(cancel).map(x => x.val);
             };
 
-        Bacon.sequentially(2, events)
+        Bacon.sequentially<string, {id:number; type:string; val?:number}>(2, events)
             .groupBy(keyF, limitF)
             .flatMap(groupedStream => groupedStream.fold(0, (acc, x) => acc + x))
-            .onValue(sum => {
+            .onValue((sum: number) => {
                 console.log(sum); // returns [-1, 2, 8] in an order
             });
     }
diff --git a/types/baconjs/tslint.json b/types/baconjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/baconjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bagpipes/index.d.ts b/types/bagpipes/index.d.ts
index ec1d0cceb7..309ae38318 100755
--- a/types/bagpipes/index.d.ts
+++ b/types/bagpipes/index.d.ts
@@ -4,7 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export interface FittingContext {
-    /** The input defined in the fitting definition
+    /**
+     * The input defined in the fitting definition
      * (string, number, object, array)
      */
     input: any;
@@ -56,7 +57,7 @@ export type Fitting = (
  * Executed during parsing
  * @see {@link https://github.com/apigee-127/bagpipes#fittings|Docs}
  *
- * @param {Object} fittingDef Fitting Definition
+ * @param fittingDef Fitting Definition
  */
 export type FittingFactory = (fittingDef: FittingDef, bagpipes: any) => Fitting;
 
diff --git a/types/barcode/tslint.json b/types/barcode/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/barcode/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bardjs/bardjs-tests.ts b/types/bardjs/bardjs-tests.ts
index 52f5ab1d3f..de656bc22e 100644
--- a/types/bardjs/bardjs-tests.ts
+++ b/types/bardjs/bardjs-tests.ts
@@ -5,7 +5,7 @@ var expect = chai.expect,
     assert = chai.assert;
 
 class MyService {
-    constructor(private $q: angular.IQService) {}
+    constructor(private readonly $q: angular.IQService) {}
 
     remoteCall(): angular.IPromise<string[]> {
         return new this.$q((resolve, reject) => {
diff --git a/types/bardjs/tslint.json b/types/bardjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bardjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/base-x/tslint.json b/types/base-x/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/base-x/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/base16/tslint.json b/types/base16/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/base16/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bases/tslint.json b/types/bases/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bases/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bash-glob/bash-glob-tests.ts b/types/bash-glob/bash-glob-tests.ts
new file mode 100644
index 0000000000..cf63412653
--- /dev/null
+++ b/types/bash-glob/bash-glob-tests.ts
@@ -0,0 +1,21 @@
+import bashGlob = require('bash-glob');
+
+bashGlob('pattern', (err, files) => {});
+bashGlob(['pattern'], (err, files) => {});
+bashGlob(['pattern'], {}, (err, files) => {});
+bashGlob(['pattern'], { cwd: 'cwd' }, (err, files) => { });
+
+bashGlob.on('match', (match, cwd) => {});
+bashGlob.on('files', (files, cwd) => {});
+bashGlob.on('end', (files) => {});
+
+bashGlob.each('pattern', (err, files) => {});
+bashGlob.each(['pattern'], (err, files) => {});
+bashGlob.each(['pattern'], {}, (err, files) => {});
+bashGlob.each(['pattern'], { cwd: 'cwd' }, (err, files) => {});
+
+// $ExpectType string[]
+bashGlob.sync('pattern');
+bashGlob.sync(['pattern']);
+bashGlob.sync(['pattern'], {});
+bashGlob.sync(['pattern'], { cwd: 'cwd' });
diff --git a/types/bash-glob/index.d.ts b/types/bash-glob/index.d.ts
new file mode 100644
index 0000000000..29582ea9bd
--- /dev/null
+++ b/types/bash-glob/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for bash-glob 2.0
+// Project: https://github.com/micromatch/bash-glob
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Patterns = string | string[];
+type Callback = (err: Error, files: string[]) => void;
+
+declare function bashGlob(pattern: Patterns, callback: Callback): void;
+declare function bashGlob(pattern: Patterns, options: bashGlob.Options, callback: Callback): void;
+
+declare namespace bashGlob {
+    interface Options {
+        cwd?: string;
+        dot?: boolean;
+        dotglob?: boolean;
+        extglob?: boolean;
+        failglob?: boolean;
+        globstar?: boolean;
+        nocase?: boolean;
+        nocaseglob?: boolean;
+        nullglob?: boolean;
+    }
+
+    function on(event: 'match' | 'files', callback: (files: string, cwd: string) => void): void;
+    function on(event: 'end', callback: (files: string) => void): void;
+
+    function each(patterns: Patterns, callback: Callback): void;
+    function each(patterns: Patterns, options: Options, callback: Callback): void;
+
+    function promise(patterns: Patterns, options?: Options): Promise<string[]>;
+
+    function sync(patterns: Patterns, options?: Options): string[];
+}
+
+export = bashGlob;
diff --git a/types/bash-glob/tsconfig.json b/types/bash-glob/tsconfig.json
new file mode 100644
index 0000000000..6a45a2d74d
--- /dev/null
+++ b/types/bash-glob/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bash-glob-tests.ts"
+    ]
+}
diff --git a/types/koa-jwt/tslint.json b/types/bash-glob/tslint.json
similarity index 100%
rename from types/koa-jwt/tslint.json
rename to types/bash-glob/tslint.json
diff --git a/types/batch-stream/tslint.json b/types/batch-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/batch-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bazinga-translator/tslint.json b/types/bazinga-translator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bazinga-translator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bcrypt-nodejs/tslint.json b/types/bcrypt-nodejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bcrypt-nodejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bcrypt/tslint.json b/types/bcrypt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bcrypt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bcryptjs/tslint.json b/types/bcryptjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bcryptjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/beats/beats-tests.ts b/types/beats/beats-tests.ts
new file mode 100644
index 0000000000..00659af2e5
--- /dev/null
+++ b/types/beats/beats-tests.ts
@@ -0,0 +1,11 @@
+import beats = require('beats');
+
+const bins: beats.Bin[] = [
+    { lo: 0, hi: 512, threshold: 0, decay: 0.005 },
+    { lo: 512, hi: 1024, threshold: 0, decay: 0.005 },
+];
+
+const detect = beats(bins, 1);
+
+const frequencies = new Uint8Array(1024);
+const result = detect(frequencies);
diff --git a/types/beats/index.d.ts b/types/beats/index.d.ts
new file mode 100644
index 0000000000..e95f008c1f
--- /dev/null
+++ b/types/beats/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for beats 0.0
+// Project: https://github.com/hughsk/beats/
+// Definitions by: Uri Shaked <https://github.com/urish>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = beats;
+
+declare function beats(bins: ReadonlyArray<beats.Bin>, minSeparation?: number): (frequencies: Uint8Array | Float32Array | ReadonlyArray<number>, dt?: number) => Float32Array;
+
+declare namespace beats {
+    interface Bin {
+        lo: number;
+        hi: number;
+        threshold: number;
+        decay: number;
+    }
+}
diff --git a/types/beats/tsconfig.json b/types/beats/tsconfig.json
new file mode 100644
index 0000000000..89bd0b5995
--- /dev/null
+++ b/types/beats/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "beats-tests.ts"
+    ]
+}
diff --git a/types/left-pad/tslint.json b/types/beats/tslint.json
similarity index 100%
rename from types/left-pad/tslint.json
rename to types/beats/tslint.json
diff --git a/types/bech32/bech32-tests.ts b/types/bech32/bech32-tests.ts
new file mode 100644
index 0000000000..7fd04abe56
--- /dev/null
+++ b/types/bech32/bech32-tests.ts
@@ -0,0 +1,19 @@
+import * as bech32 from 'bech32';
+
+// Test decode
+const testString = 'abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw';
+const decoded = bech32.decode(testString);
+// Test decode with limit
+bech32.decode(testString, testString.length);
+decoded.prefix;
+decoded.words;
+
+// Test convert from/to words
+const words: Buffer = bech32.toWords(Buffer.from('foobar', 'utf8'));
+bech32.fromWords(words);
+
+// Test encode
+const testPrefix = 'foo';
+bech32.encode(testPrefix, words);
+// Test encode with limit
+bech32.encode(testPrefix, words, testPrefix.length + 7 + words.length);
diff --git a/types/bech32/index.d.ts b/types/bech32/index.d.ts
new file mode 100644
index 0000000000..878d56a6a6
--- /dev/null
+++ b/types/bech32/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for bech32 1.1
+// Project: https://github.com/bitcoinjs/bech32
+// Definitions by: Satana Charuwichitratana <https://github.com/micksatana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export function decode(str: string, LIMIT?: number): { prefix: string, words: Buffer };
+
+export function encode(prefix: string, words: Buffer, LIMIT?: number): string;
+
+export function fromWords(words: Buffer): Buffer;
+
+export function toWords(bytes: Buffer): Buffer;
diff --git a/types/bech32/tsconfig.json b/types/bech32/tsconfig.json
new file mode 100644
index 0000000000..886ec79796
--- /dev/null
+++ b/types/bech32/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bech32-tests.ts"
+    ]
+}
diff --git a/types/bech32/tslint.json b/types/bech32/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/bech32/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/benchmark/benchmark-tests.ts b/types/benchmark/benchmark-tests.ts
index 8fbe2b1d92..cb02940b37 100644
--- a/types/benchmark/benchmark-tests.ts
+++ b/types/benchmark/benchmark-tests.ts
@@ -229,6 +229,27 @@ suite.add({
   'onComplete': onComplete
 });
 
+// unregister a listener for an event type
+suite.off('cycle', listener) as Benchmark.Suite;
+
+// unregister a listener for multiple event types
+suite.off('start cycle', listener) as Benchmark.Suite;
+
+// unregister all listeners for an event type
+suite.off('cycle') as Benchmark.Suite;
+
+// unregister all listeners for multiple event types
+suite.off('start cycle complete') as Benchmark.Suite;
+
+// unregister all listeners for all event types
+suite.off() as Benchmark.Suite;
+
+// register a listener for an event type
+suite.on('cycle', listener) as Benchmark.Suite;
+
+// register a listener for multiple event types
+suite.on('start cycle', listener) as Benchmark.Suite;
+
 // basic usage
 suite.run();
 
diff --git a/types/benchmark/index.d.ts b/types/benchmark/index.d.ts
index 01bb379a48..d8c72aef68 100644
--- a/types/benchmark/index.d.ts
+++ b/types/benchmark/index.d.ts
@@ -170,10 +170,10 @@ declare namespace Benchmark {
         join(separator?: string): string;
         listeners(type: string): Function[];
         map(callback: Function): any[];
-        off(type?: string, callback?: Function): Benchmark;
-        off(types: string[]): Benchmark;
-        on(type?: string, callback?: Function): Benchmark;
-        on(types: string[]): Benchmark;
+        off(type?: string, callback?: Function): Suite;
+        off(types: string[]): Suite;
+        on(type?: string, callback?: Function): Suite;
+        on(types: string[]): Suite;
         pluck(property: string): any[];
         pop(): Function;
         push(benchmark: Benchmark): number;
diff --git a/types/benchmark/tslint.json b/types/benchmark/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/benchmark/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/better-curry/tslint.json b/types/better-curry/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/better-curry/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bezier-easing/bezier-easing-tests.ts b/types/bezier-easing/bezier-easing-tests.ts
index 6cf2b28bf2..bf3e12bcc9 100644
--- a/types/bezier-easing/bezier-easing-tests.ts
+++ b/types/bezier-easing/bezier-easing-tests.ts
@@ -1,10 +1,4 @@
+import BezierEasing = require("bezier-easing");
 
-
-function get_easing() {
-    let easing: Easing = BezierEasing(0, 0, 1, 0.5);
-}
-
-function use_easing() {
-    let easing: Easing = BezierEasing(0, 0, 1, 0.5);
-    let eased: number = easing(1);
-}
\ No newline at end of file
+const easing: BezierEasing.Easing = BezierEasing(0, 0, 1, 0.5);
+const eased: number = easing(1);
diff --git a/types/bezier-easing/index.d.ts b/types/bezier-easing/index.d.ts
index e714e55535..d63eea8081 100644
--- a/types/bezier-easing/index.d.ts
+++ b/types/bezier-easing/index.d.ts
@@ -1,10 +1,12 @@
-// Type definitions for bezier-easing
+// Type definitions for bezier-easing 2.0
 // Project: https://github.com/gre/bezier-easing
 // Definitions by: brian ridley <https://github.com/ptlis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare interface Easing {
-    (x: number): number;
+declare namespace BezierEasing {
+    type Easing = (x: number) => number;
 }
 
-declare function BezierEasing(mX1: number, mY1: number, mX2: number, mY2: number): Easing;
+declare function BezierEasing(mX1: number, mY1: number, mX2: number, mY2: number): BezierEasing.Easing;
+export = BezierEasing;
+export as namespace BezierEasing;
diff --git a/types/bezier-easing/tslint.json b/types/bezier-easing/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/bezier-easing/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/bezier-js/index.d.ts b/types/bezier-js/index.d.ts
index 7706a46472..b44b027dc2 100644
--- a/types/bezier-js/index.d.ts
+++ b/types/bezier-js/index.d.ts
@@ -203,5 +203,5 @@ declare namespace BezierJs {
 }
 
 declare module "bezier-js" {
-  export = BezierJs;
+  export = BezierJs.Bezier;
 }
diff --git a/types/bezier-js/tslint.json b/types/bezier-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bezier-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bgiframe/tslint.json b/types/bgiframe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bgiframe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/big.js/index.d.ts b/types/big.js/index.d.ts
index cf197e8cfc..37f51a54bd 100644
--- a/types/big.js/index.d.ts
+++ b/types/big.js/index.d.ts
@@ -275,16 +275,26 @@ export interface Big {
      * the value of Big.E_POS and Big.E_NEG. By default, Big numbers correspond to Javascript's number type in this regard.
      */
     toJSON(): string;
+    /**
+     * Returns an array of single digits
+     */
+    c: number[];
+    /**
+     * Returns the exponent, Integer, -1e+6 to 1e+6 inclusive
+     */
+    e: number;
+    /**
+     * Returns the sign, -1 or 1
+     */
+    s: number;
 }
 
 export const Big: BigConstructor;
 
 // Helpers to allow referencing Big and BigConstructor from inside the global declaration without creating a self reference
-/* tslint:disable:strict-export-declare-modifiers */
-type Big_ = Big;
-type BigConstructor_ = BigConstructor;
-type BigSource_ = BigSource;
-/* tslint:enable:strict-export-declare-modifiers */
+export type Big_ = Big;
+export type BigConstructor_ = BigConstructor;
+export type BigSource_ = BigSource;
 
 declare global {
     namespace BigJs {
diff --git a/types/big.js/test/big.js-global-tests.ts b/types/big.js/test/big.js-global-tests.ts
index ef57a3880d..578391de7b 100644
--- a/types/big.js/test/big.js-global-tests.ts
+++ b/types/big.js/test/big.js-global-tests.ts
@@ -197,6 +197,24 @@ function toJSONTests() {
     JSON.parse(str, (k, v)  => k === '' ? v : new Big(v)); // Returns an array of three Big numbers.
 }
 
+// test Big.c
+function coefficientTests() {
+    const x = new Big('123');
+    x.c; // [1,2,3]
+}
+
+// test Big.e
+function exponentTests() {
+    const x = new Big('123e+20');
+    x.e; // 22
+}
+
+// test Big.s
+function signTests() {
+    const x = new Big('-123');
+    x.s; // -1
+}
+
 // see http://mikemcl.github.io/big.js/#faq
 // "How can I simultaneously use different decimal places and/or rounding mode settings for different Big numbers?"
 function testMultipleConstructors() {
diff --git a/types/big.js/test/big.js-module-tests.ts b/types/big.js/test/big.js-module-tests.ts
index 7cd246ffd4..056d41727b 100644
--- a/types/big.js/test/big.js-module-tests.ts
+++ b/types/big.js/test/big.js-module-tests.ts
@@ -199,6 +199,24 @@ function toJSONTests() {
     JSON.parse(str, (k, v)  => k === '' ? v : new Big(v)); // Returns an array of three Big numbers.
 }
 
+// test Big.c
+function coefficientTests() {
+    const x = new Big('123');
+    x.c; // [1, 2, 3]
+}
+
+// test Big.e
+function exponentTests() {
+    const x = new Big('123e+20');
+    x.e; // 22
+}
+
+// test Big.s
+function signTests() {
+    const x = new Big('-123');
+    x.s; // -1
+}
+
 // see http://mikemcl.github.io/big.js/#faq
 // "How can I simultaneously use different decimal places and/or rounding mode settings for different Big numbers?"
 function testMultipleConstructors() {
diff --git a/types/bigint/tslint.json b/types/bigint/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bigint/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bignum/tslint.json b/types/bignum/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bignum/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bignumber.js/bignumber.js-tests.ts b/types/bignumber.js/bignumber.js-tests.ts
deleted file mode 100644
index 424665d8ba..0000000000
--- a/types/bignumber.js/bignumber.js-tests.ts
+++ /dev/null
@@ -1,443 +0,0 @@
-let x: BigNumber.BigNumber = new BigNumber(9);
-let y = new BigNumber(x);
-
-BigNumber(435.345);
-
-new BigNumber('5032485723458348569331745.33434346346912144534543');
-new BigNumber('4.321e+4');
-new BigNumber('-735.0918e-430');
-new BigNumber(Infinity);
-new BigNumber(NaN);
-new BigNumber('.5');
-new BigNumber('+2');
-new BigNumber(-10110100.1, 2);
-new BigNumber(-0b10110100);
-new BigNumber('123412421.234324', 5);
-new BigNumber('ff.8', 16);
-new BigNumber('0xff.8');
-
-new BigNumber(9, 2);
-
-new BigNumber(96517860459076817.4395);
-
-new BigNumber('blurgh');
-
-BigNumber.config({ DECIMAL_PLACES: 5 });
-new BigNumber(1.23456789);
-new BigNumber(1.23456789, 10);
-
-BigNumber.config({ DECIMAL_PLACES: 5 });
-let BN = BigNumber.another({ DECIMAL_PLACES: 9 });
-
-x = new BigNumber(1);
-y = new BN(1);
-
-x.div(3);
-y.div(3);
-
-BN = BigNumber.another();
-BN.config({ DECIMAL_PLACES: 9 });
-
-BigNumber.config({ DECIMAL_PLACES: 5 });
-BigNumber.set({ DECIMAL_PLACES: 5 });
-BigNumber.config(5);
-
-BigNumber.config({ ROUNDING_MODE: 0 });
-BigNumber.config(undefined, BigNumber.ROUND_UP);
-
-BigNumber.config({ EXPONENTIAL_AT: 2 });
-new BigNumber(12.3);
-new BigNumber(123);
-new BigNumber(0.123);
-new BigNumber(0.0123);
-
-BigNumber.config({ EXPONENTIAL_AT: [-7, 20] });
-new BigNumber(123456789);
-new BigNumber(0.000000123);
-
-BigNumber.config({ EXPONENTIAL_AT: 1e+9 });
-
-BigNumber.config({ EXPONENTIAL_AT: 0 });
-
-BigNumber.config({ RANGE: 500 });
-BigNumber.config().RANGE;
-new BigNumber('9.999e499');
-new BigNumber('1e500');
-new BigNumber('1e-499');
-new BigNumber('1e-500');
-
-BigNumber.config({ RANGE: [-3, 4] });
-new BigNumber(99999);
-new BigNumber(100000);
-new BigNumber(0.001);
-new BigNumber(0.0001);
-
-BigNumber.config({ ERRORS: false });
-
-BigNumber.config({ CRYPTO: true });
-BigNumber.config().CRYPTO;
-BigNumber.random();
-
-BigNumber.config({ MODULO_MODE: BigNumber.EUCLID });
-BigNumber.config({ MODULO_MODE: 9 });
-
-BigNumber.config({ POW_PRECISION: 100 });
-
-BigNumber.config({
-    FORMAT: {
-        decimalSeparator: '.',
-        groupSeparator: ',',
-        groupSize: 3,
-        secondaryGroupSize: 0,
-        fractionGroupSeparator: ' ',
-        fractionGroupSize: 0
-    }
-});
-
-BigNumber.config({
-    DECIMAL_PLACES: 40,
-    ROUNDING_MODE: BigNumber.ROUND_HALF_CEIL,
-    EXPONENTIAL_AT: [-10, 20],
-    RANGE: [-500, 500],
-    ERRORS: true,
-    CRYPTO: true,
-    MODULO_MODE: BigNumber.ROUND_FLOOR,
-    POW_PRECISION: 80,
-    FORMAT: {
-        groupSize: 3,
-        groupSeparator: ' ',
-        decimalSeparator: ','
-    }
-});
-
-BigNumber.config(40, 7, [-10, 20], 500, 1, 1, 3, 80);
-
-const obj = BigNumber.config();
-obj.ERRORS;
-obj.RANGE;
-
-x = new BigNumber('3257869345.0378653');
-BigNumber.max(4e9, x, '123456789.9');
-
-let arr = [12, '13', new BigNumber(14)];
-BigNumber.max(arr);
-
-x = new BigNumber('3257869345.0378653');
-BigNumber.min(4e9, x, '123456789.9');
-
-arr = [2, new BigNumber(-14), '-15.9999', -12];
-BigNumber.min(arr);
-
-BigNumber.config({ DECIMAL_PLACES: 10 });
-BigNumber.random();
-BigNumber.random(20);
-
-BigNumber.config({ ROUNDING_MODE: BigNumber.ROUND_CEIL });
-BigNumber.config({ ROUNDING_MODE: 2 });
-
-x = new BigNumber(-0.8);
-y = x.absoluteValue();
-let z = y.abs();
-
-x = new BigNumber(1.3);
-x.ceil();
-y = new BigNumber(-1.8);
-y.ceil();
-
-x = new BigNumber(Infinity);
-y = new BigNumber(5);
-x.comparedTo(y);
-x.comparedTo(x.minus(1));
-y.cmp(NaN);
-y.cmp('110', 2);
-
-x = new BigNumber(123.45);
-x.decimalPlaces();
-y = new BigNumber('9.9e-101');
-y.dp();
-
-x = new BigNumber(355);
-y = new BigNumber(113);
-x.dividedBy(y);
-x.div(5);
-x.div(47, 16);
-
-x = new BigNumber(5);
-y = new BigNumber(3);
-x.dividedToIntegerBy(y);
-x.divToInt(0.7);
-x.divToInt('0.f', 16);
-
-0 === 1e-324;
-x = new BigNumber(0);
-x.equals('1e-324');
-BigNumber(-0).eq(x);
-BigNumber(255).eq('ff', 16);
-
-y = new BigNumber(NaN);
-y.equals(NaN);
-
-x = new BigNumber(1.8);
-x.floor();
-y = new BigNumber(-1.3);
-y.floor();
-
-0.1 > (0.3 - 0.2); // tslint:disable-line binary-expression-operand-order
-x = new BigNumber(0.1);
-x.greaterThan(BigNumber(0.3).minus(0.2));
-BigNumber(0).gt(x);
-BigNumber(11, 3).gt(11.1, 2);
-
-x = new BigNumber(0.3).minus(0.2);
-x.greaterThanOrEqualTo(0.1);
-BigNumber(1).gte(x);
-BigNumber(10, 18).gte('i', 36);
-
-x = new BigNumber(1);
-x.isFinite();
-y = new BigNumber(Infinity);
-y.isFinite();
-
-x = new BigNumber(1);
-x.isInteger();
-y = new BigNumber(123.456);
-y.isInt();
-
-x = new BigNumber(NaN);
-x.isNaN();
-y = new BigNumber('Infinity');
-y.isNaN();
-
-x = new BigNumber(-0);
-x.isNegative();
-y = new BigNumber(2);
-y.isNeg();
-
-x = new BigNumber(-0);
-x.isZero() && x.isNeg();
-y = new BigNumber(Infinity);
-y.isZero();
-
-x = new BigNumber(0.3).minus(0.2);
-x.lessThan(0.1);
-BigNumber(0).lt(x);
-BigNumber(11.1, 2).lt(11, 3);
-
-x = new BigNumber(0.1);
-x.lessThanOrEqualTo(BigNumber(0.3).minus(0.2));
-BigNumber(-1).lte(x);
-BigNumber(10, 18).lte('i', 36);
-
-x = new BigNumber(0.3);
-x.minus(0.1);
-x.sub(0.6, 20);
-
-x = new BigNumber(1);
-x.modulo(0.9);
-y = new BigNumber(33);
-y.mod('a', 33);
-
-x = new BigNumber(1.8);
-x.negated();
-y = new BigNumber(-1.3);
-y.neg();
-
-x = new BigNumber(0.1);
-y = x.plus(0.2);
-BigNumber(0.7).plus(x).add(y);
-x.plus('0.1', 8);
-
-x = new BigNumber(1.234);
-x.precision();
-y = new BigNumber(987000);
-y.sd();
-y.sd(true);
-
-y = new BigNumber(x);
-y.round();
-y.round(1);
-y.round(2);
-y.round(10);
-y.round(0, 1);
-y.round(0, 6);
-y.round(1, 1);
-y.round(1, BigNumber.ROUND_HALF_EVEN);
-
-x = new BigNumber(1.23);
-x.shift(3);
-x.shift(-3);
-
-x = new BigNumber(16);
-x.squareRoot();
-y = new BigNumber(3);
-y.sqrt();
-
-x = new BigNumber(0.6);
-y = x.times(3);
-BigNumber('7e+500').times(y);
-x.times('-a', 16);
-
-BigNumber.config({ DECIMAL_PLACES: 5, ROUNDING_MODE: 4 });
-x = new BigNumber(9876.54321);
-
-x.toDigits();
-x.toDigits(6);
-x.toDigits(6, BigNumber.ROUND_UP);
-x.toDigits(2);
-x.toDigits(2, 1);
-
-y = new BigNumber(45.6);
-y.toExponential();
-y.toExponential(0);
-y.toExponential(1);
-y.toExponential(1, 1);
-y.toExponential(3);
-
-y = new BigNumber(3.456);
-y.toFixed();
-y.toFixed(0);
-y.toFixed(2);
-y.toFixed(2, 1);
-y.toFixed(5);
-
-const format = {
-    decimalSeparator: '.',
-    groupSeparator: ',',
-    groupSize: 3,
-    secondaryGroupSize: 0,
-    fractionGroupSeparator: ' ',
-    fractionGroupSize: 0
-};
-BigNumber.config({ FORMAT: format });
-
-x = new BigNumber('123456789.123456789');
-x.toFormat();
-x.toFormat(1);
-
-format.groupSeparator = ' ';
-format.fractionGroupSize = 5;
-x.toFormat();
-
-BigNumber.config({
-    FORMAT: {
-        decimalSeparator: ',',
-        groupSeparator: '.',
-        groupSize: 3,
-        secondaryGroupSize: 2
-    }
-});
-
-x.toFormat(6);
-
-x = new BigNumber(1.75);
-x.toFraction();
-
-const pi = new BigNumber('3.14159265358');
-pi.toFraction();
-pi.toFraction(100000);
-pi.toFraction(10000);
-pi.toFraction(100);
-pi.toFraction(10);
-pi.toFraction(1);
-
-x = new BigNumber('177.7e+457');
-y = new BigNumber(235.4325);
-z = new BigNumber('0.0098074');
-
-const str = JSON.stringify([x, y, z]);
-
-JSON.parse(str, (key, val) => key === '' ? val : new BigNumber(val));
-
-x = new BigNumber(456.789);
-x.toNumber();
-{ +x; }
-
-y = new BigNumber('45987349857634085409857349856430985');
-y.toNumber();
-
-z = new BigNumber(-0);
-1 / +z;
-1 / z.toNumber();
-
-x = new BigNumber(0.7);
-x.toPower(2);
-BigNumber(3).pow(-2);
-
-y = new BigNumber(45.6);
-x.toPrecision();
-y.toPrecision();
-x.toPrecision(1);
-y.toPrecision(1);
-y.toPrecision(2, 0);
-y.toPrecision(2, 1);
-x.toPrecision(5);
-y.toPrecision(5);
-
-x = new BigNumber(750000);
-x.toString();
-BigNumber.config({ EXPONENTIAL_AT: 5 });
-x.toString();
-
-y = new BigNumber(362.875);
-y.toString(2);
-y.toString(9);
-y.toString(32);
-
-BigNumber.config({ DECIMAL_PLACES: 4 });
-z = new BigNumber('1.23456789');
-z.toString();
-z.toString(10);
-
-x = new BigNumber(123.456);
-x.truncated();
-y = new BigNumber(-12.3);
-y.trunc();
-
-x = new BigNumber('-0');
-x.toString();
-x.valueOf();
-y = new BigNumber('1.777e+457');
-y.valueOf();
-
-x = new BigNumber(0.123);
-x.toExponential();
-x.c;
-x.e;
-x.s;
-
-z = new BigNumber('-123.4567000e+2');
-z.toExponential();
-z.c;
-z.e;
-z.s;
-
-x = new BigNumber(3);
-x instanceof BigNumber;
-x.isBigNumber;
-
-BN = BigNumber.another();
-
-y = new BN(3);
-y instanceof BigNumber;
-y.isBigNumber;
-
-y = new BigNumber(-0);
-y.c;
-y.e;
-y.s;
-
-try {
-    // ...
-} catch (e) {
-    if (e instanceof Error && e.name === 'BigNumber Error') {
-        // ...
-    }
-}
-
-x = new BigNumber("1.0");
-y = new BigNumber("1.1000");
-z = x.add(y);
-
-x = new BigNumber("1.20");
-y = new BigNumber("3.45000");
-z = x.mul(y);
diff --git a/types/bignumber.js/index.d.ts b/types/bignumber.js/index.d.ts
deleted file mode 100644
index ae7ec5b6f7..0000000000
--- a/types/bignumber.js/index.d.ts
+++ /dev/null
@@ -1,676 +0,0 @@
-// Type definitions for bignumber.js 4.0
-// Project: https://github.com/MikeMcl/bignumber.js/
-// Definitions by: Viktor Smirnov <https://github.com/LaserUnicorns>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-declare var BigNumber: BigNumber.BigNumberStatic;
-
-export as namespace BigNumber;
-export = BigNumber;
-
-declare namespace BigNumber {
-    interface FormatConfig {
-        /**
-         * The decimal separator.
-         */
-        decimalSeparator: string;
-
-        /**
-         * The grouping separator of the integer part.
-         */
-        groupSeparator: string;
-
-        /**
-         * The primary grouping size of the integer part.
-         */
-        groupSize: number;
-
-        /**
-         * The secondary grouping size of the integer part.
-         */
-        secondaryGroupSize: number;
-
-        /**
-         * The grouping separator of the fraction part.
-         */
-        fractionGroupSeparator: string;
-
-        /**
-         * The grouping size of the fraction part.
-         */
-        fractionGroupSize: number;
-    }
-
-    interface BigNumberConfig {
-        /**
-         * The maximum number of decimal places of the results of operations involving division,
-         * i.e. division, square root and base conversion operations, and power operations with negative exponents.
-         */
-        DECIMAL_PLACES: number;
-
-        /**
-         * The rounding mode used in the above operations and the default rounding mode of round, `toExponential`, `toFixed`, `toFormat` and `toPrecision`.
-         */
-        ROUNDING_MODE: RoundingMode;
-
-        /**
-         * The exponent value(s) at which `toString` returns exponential notation.
-         *
-         * If a single number is assigned, the value is the exponent magnitude.
-         *
-         * If an array of two numbers is assigned then the first number is the negative exponent value at and beneath which exponential notation is used,
-         * and the second number is the positive exponent value at and above which the same.
-         */
-        EXPONENTIAL_AT: number | number[];
-
-        /**
-         * The exponent value(s) beyond which overflow to `Infinity` and underflow to zero occurs.
-         *
-         * If a single number is assigned, it is the maximum exponent magnitude:
-         * values wth a positive exponent of greater magnitude become `Infinity`
-         * and those with a negative exponent of greater magnitude become zero.
-         *
-         * If an array of two numbers is assigned then the first number is the negative exponent limit and the second number is the positive exponent limit.
-         */
-        RANGE: number | number[];
-
-        /**
-         * The value that determines whether BigNumber Errors are thrown.
-         *
-         * If `ERRORS` is false, no errors will be thrown.
-         */
-        ERRORS: boolean | 0 | 1;
-
-        /**
-         * The value that determines whether cryptographically-secure pseudo-random number generation is used.
-         *
-         * If `CRYPTO` is set to `true` then the `random` method will generate random digits using `crypto.getRandomValues` in browsers that support it,
-         * or `crypto.randomBytes` if using a version of Node.js that supports it.
-         *
-         * If neither function is supported by the host environment then attempting to set `CRYPTO` to `true` will fail, and if `ERRORS` is `true` an exception will be thrown.
-         *
-         * If `CRYPTO` is `false` then the source of randomness used will be `Math.random` (which is assumed to generate at least `30` bits of randomness).
-         */
-        CRYPTO: boolean | 0 | 1;
-
-        /**
-         * The modulo mode used when calculating the modulus: `a mod n`.
-         *
-         * The quotient, `q = a / n`, is calculated according to the `ROUNDING_MODE` that corresponds to the chosen `MODULO_MODE`.
-         *
-         * The remainder, `r`, is calculated as: `r = a - n * q`.
-         */
-        MODULO_MODE: ModuloMode;
-
-        /**
-         * The maximum number of significant digits of the result of the power operation (unless a modulus is specified).
-         *
-         * If set to `0`, the number of signifcant digits will not be limited.
-         */
-        POW_PRECISION: number;
-
-        /**
-         * The `FORMAT` object configures the format of the string returned by the toFormat method.
-         */
-        FORMAT: Partial<FormatConfig>;
-    }
-
-    type NumberLike = number | string | BigNumber;
-    type RoundingMode = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8;
-    type ModuloMode = RoundingMode | 9;
-
-    interface BigNumberStatic {
-        /**
-         * Returns a new instance of a BigNumber object.
-         */
-        (value: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a new instance of a BigNumber object.
-         */
-        new (value: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a new independent BigNumber constructor with configuration as described by obj, or with the default configuration if obj is null or undefined.
-         */
-        another(obj?: Partial<BigNumberConfig>): BigNumberStatic;
-
-        /**
-         * Configures the settings for this particular BigNumber constructor.
-         *
-         */
-        config(obj?: Partial<BigNumberConfig>): BigNumberConfig;
-
-        /**
-         * Configures the settings for this particular BigNumber constructor.
-         */
-        config(
-            DECIMAL_PLACES?: number,
-            ROUNDING_MODE?: RoundingMode,
-            EXPONENTIAL_AT?: number | number[],
-            RANGE?: number | number[],
-            ERRORS?: boolean | 0 | 1,
-            CRYPTO?: boolean | 0 | 1,
-            MODULO_MODE?: ModuloMode,
-            POW_PRECISION?: number
-        ): BigNumberConfig;
-
-        /**
-         * Configures the settings for this particular BigNumber constructor.
-         */
-        set(obj?: Partial<BigNumberConfig>): BigNumberConfig;
-
-        /**
-         * Configures the settings for this particular BigNumber constructor.
-         */
-        set(
-            DECIMAL_PLACES?: number,
-            ROUNDING_MODE?: RoundingMode,
-            EXPONENTIAL_AT?: number | number[],
-            RANGE?: number | number[],
-            ERRORS?: boolean | 0 | 1,
-            CRYPTO?: boolean | 0 | 1,
-            MODULO_MODE?: ModuloMode,
-            POW_PRECISION?: number
-        ): BigNumberConfig;
-
-        /**
-         * Returns a BigNumber whose value is the maximum of `args`.
-         */
-        max(...args: NumberLike[]): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the maximum of `args`.
-         */
-        max(args: NumberLike[]): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the minimum of `args`.
-         */
-        min(...args: NumberLike[]): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the minimum of `args`.
-         */
-        min(args: NumberLike[]): BigNumber;
-
-        /**
-         * Returns a new BigNumber with a pseudo-random value equal to or greater than `0` and less than `1`.
-         *
-         * The return value will have `dp` decimal places (or less if trailing zeros are produced).
-         * If `dp` is omitted then the number of decimal places will default to the current `DECIMAL_PLACES` setting.
-         *
-         * Depending on the value of this BigNumber constructor's `CRYPTO` setting and the support for the `crypto` object in the host environment,
-         * the random digits of the return value are generated by either
-         * `Math.random` (fastest),
-         * `crypto.getRandomValues` (Web Cryptography API in recent browsers)
-         * or `crypto.randomBytes` (Node.js).
-         *
-         * If `CRYPTO` is `true`, i.e. one of the `crypto` methods is to be used,
-         * the value of a returned BigNumber should be cryptographically-secure and statistically indistinguishable from a random value.
-         */
-        random(dp?: number): BigNumber;
-
-        /**
-         * Rounds away from zero
-         */
-        ROUND_UP: 0;
-
-        /**
-         * Rounds towards zero
-         */
-        ROUND_DOWN: 1;
-
-        /**
-         * Rounds towards `Infinity`
-         */
-        ROUND_CEIL: 2;
-
-        /**
-         * Rounds towards `-Infinity`
-         */
-        ROUND_FLOOR: 3;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds away from zero.
-         */
-        ROUND_HALF_UP: 4;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards zero.
-         */
-        ROUND_HALF_DOWN: 5;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards even neighbour.
-         */
-        ROUND_HALF_EVEN: 6;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards `Infinity`.
-         */
-        ROUND_HALF_CEIL: 7;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards `-Infinity`.
-         */
-        ROUND_HALF_FLOOR: 8;
-
-        /**
-         * The remainder is always positive.
-         *
-         * Euclidian division: `q = sign(n) * floor(a / abs(n))`
-         */
-        EUCLID: 9;
-    }
-
-    interface BigNumber {
-        /**
-         * Returns a BigNumber whose value is the absolute value, i.e. the magnitude, of the value of this BigNumber.
-         */
-        absoluteValue(): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the absolute value, i.e. the magnitude, of the value of this BigNumber.
-         */
-        abs(): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber rounded to a whole number in the direction of positive Infinity.
-         */
-        ceil(): BigNumber;
-
-        /**
-         * Returns
-         *
-         *  `1` if the value of this BigNumber is greater than the value of `n`
-         *
-         * `-1` if the value of this BigNumber is less than the value of `n`
-         *
-         * `0` if this BigNumber and `n` have the same value
-         *
-         * `null` if the value of either this BigNumber or `n` is `NaN`
-         */
-        comparedTo(n: NumberLike, base?: number): 1 | -1 | 0 | null;
-
-        /**
-         * Returns
-         *
-         *  `1` if the value of this BigNumber is greater than the value of `n`
-         *
-         * `-1` if the value of this BigNumber is less than the value of `n`
-         *
-         * `0` if this BigNumber and `n` have the same value
-         *
-         * `null` if the value of either this BigNumber or `n` is `NaN`
-         */
-        cmp(n: NumberLike, base?: number): 1 | -1 | 0 | null;
-
-        /**
-         * Return the number of decimal places of the value of this BigNumber, or `null` if the value of this BigNumber is `±Infinity` or `NaN`.
-         */
-        decimalPlaces(): number;
-
-        /**
-         * Return the number of decimal places of the value of this BigNumber, or `null` if the value of this BigNumber is `±Infinity` or `NaN`.
-         */
-        dp(): number;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber divided by `n`, rounded according to the current `DECIMAL_PLACES` and `ROUNDING_MODE` configuration.
-         */
-        dividedBy(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber divided by `n`, rounded according to the current `DECIMAL_PLACES` and `ROUNDING_MODE` configuration.
-         */
-        div(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Return a BigNumber whose value is the integer part of dividing the value of this BigNumber by `n`.
-         */
-        dividedToIntegerBy(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Return a BigNumber whose value is the integer part of dividing the value of this BigNumber by `n`.
-         */
-        divToInt(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns `true` if the value of this BigNumber equals the value of `n`, otherwise returns `false`.
-         *
-         * As with JavaScript, `NaN` does not equal `NaN`.
-         */
-        equals(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber equals the value of `n`, otherwise returns `false`.
-         *
-         * As with JavaScript, `NaN` does not equal `NaN`.
-         */
-        eq(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber rounded to a whole number in the direction of negative `Infinity`.
-         */
-        floor(): BigNumber;
-
-        /**
-         * Returns `true` if the value of this BigNumber is greater than the value of `n`, otherwise returns `false`.
-         */
-        greaterThan(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is greater than the value of `n`, otherwise returns `false`.
-         */
-        gt(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is greater than or equal to the value of `n`, otherwise returns `false`.
-         */
-        greaterThanOrEqualTo(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is greater than or equal to the value of `n`, otherwise returns `false`.
-         */
-        gte(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is a finite number, otherwise returns `false`.
-         *
-         * The only possible non-finite values of a BigNumber are `NaN`, `Infinity` and `-Infinity`.
-         */
-        isFinite(): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is a whole number, otherwise returns `false`.
-         */
-        isInteger(): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is a whole number, otherwise returns `false`.
-         */
-        isInt(): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is NaN, otherwise returns `false`.
-         */
-        isNaN(): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is negative, otherwise returns `false`.
-         */
-        isNegative(): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is negative, otherwise returns `false`.
-         */
-        isNeg(): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is zero or minus zero, otherwise returns `false`.
-         */
-        isZero(): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is less than the value of `n`, otherwise returns `false`.
-         */
-        lessThan(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is less than the value of `n`, otherwise returns `false`.
-         */
-        lt(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is less than or equal to the value of `n`, otherwise returns
-         */
-        lessThanOrEqualTo(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns `true` if the value of this BigNumber is less than or equal to the value of `n`, otherwise returns
-         */
-        lte(n: NumberLike, base?: number): boolean;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber minus `n`.
-         */
-        minus(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber minus `n`.
-         */
-        sub(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber modulo `n`, i.e. the integer remainder of dividing this BigNumber by `n`.
-         *
-         * The value returned, and in particular its sign, is dependent on the value of the `MODULO_MODE` setting of this BigNumber constructor.
-         * If it is `1` (default value), the result will have the same sign as this BigNumber,
-         * and it will match that of Javascript's `%` operator (within the limits of double precision) and BigDecimal's `remainder` method.
-         */
-        modulo(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber modulo `n`, i.e. the integer remainder of dividing this BigNumber by `n`.
-         *
-         * The value returned, and in particular its sign, is dependent on the value of the `MODULO_MODE` setting of this BigNumber constructor.
-         * If it is `1` (default value), the result will have the same sign as this BigNumber,
-         * and it will match that of Javascript's `%` operator (within the limits of double precision) and BigDecimal's `remainder` method.
-         */
-        mod(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber negated, i.e. multiplied by `-1`.
-         */
-        negated(): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber negated, i.e. multiplied by `-1`.
-         */
-        neg(): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber plus `n`.
-         */
-        plus(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber plus `n`.
-         */
-        add(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns the number of significant digits of the value of this BigNumber.
-         *
-         * If `z` is `true` or `1` then any trailing zeros of the integer part of a number are counted as significant digits, otherwise they are not.
-         */
-        precision(z?: boolean | 0 | 1): number;
-
-        /**
-         * Returns the number of significant digits of the value of this BigNumber.
-         *
-         * If `z` is `true` or `1` then any trailing zeros of the integer part of a number are counted as significant digits, otherwise they are not.
-         */
-        sd(z?: boolean | 0 | 1): number;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber rounded by rounding mode `rm` to a maximum of `dp` decimal places.
-         *
-         * If `dp` is omitted, or is `null` or `undefined`, the return value is `n` rounded to a whole number.
-         *
-         * If `rm` is omitted, or is `null` or `undefined`, `ROUNDING_MODE` is used.
-         */
-        round(dp?: number, rm?: RoundingMode): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber shifted `n` places.
-         *
-         * The shift is of the decimal point, i.e. of powers of ten, and is to the left if `n` is negative or to the right if `n` is positive.
-         */
-        shift(n: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the square root of the value of this BigNumber, rounded according to the current `DECIMAL_PLACES` and `ROUNDING_MODE` configuration.
-         *
-         * The return value will be correctly rounded, i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
-         */
-        squareRoot(): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the square root of the value of this BigNumber, rounded according to the current `DECIMAL_PLACES` and `ROUNDING_MODE` configuration.
-         *
-         * The return value will be correctly rounded, i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
-         */
-        sqrt(): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber times `n`.
-         */
-        times(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber times `n`.
-         */
-        mul(n: NumberLike, base?: number): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber rounded to `sd` significant digits using rounding mode `rm`.
-         *
-         * If `sd` is omitted or is `null` or `undefined`, the return value will not be rounded.
-         *
-         * If `rm` is omitted or is `null` or `undefined`, ROUNDING_MODE will be used.
-         */
-        toDigits(sd?: number, rm?: RoundingMode): BigNumber;
-
-        /**
-         * Returns a string representing the value of this BigNumber in exponential notation rounded using rounding mode `rm` to `dp` decimal places,
-         * i.e with one digit before the decimal point and `dp` digits after it.
-         *
-         * If the value of this BigNumber in exponential notation has fewer than `dp` fraction digits, the return value will be appended with zeros accordingly.
-         *
-         * If `dp` is omitted, or is `null` or `undefined`, the number of digits after the decimal point defaults to the minimum number of digits necessary to represent the value exactly.
-         *
-         * If `rm` is omitted or is `null` or `undefined`, `ROUNDING_MODE` is used.
-         */
-        toExponential(dp?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a string representing the value of this BigNumber in normal (fixed-point) notation rounded to `dp` decimal places using rounding mode `rm`.
-         *
-         * If the value of this BigNumber in normal notation has fewer than `dp` fraction digits, the return value will be appended with zeros accordingly.
-         *
-         * Unlike `Number.prototype.toFixed`, which returns exponential notation if a number is greater or equal to `10e21`, this method will always return normal notation.
-         *
-         * If `dp` is omitted or is `null` or `undefined`, the return value will be unrounded and in normal notation.
-         * This is also unlike `Number.prototype.toFixed`, which returns the value to zero decimal places.
-         * It is useful when fixed-point notation is required and the current `EXPONENTIAL_AT` setting causes `toString` to return exponential notation.
-         *
-         * If `rm` is omitted or is `null` or `undefined`, `ROUNDING_MODE` is used.
-         */
-        toFixed(dp?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a string representing the value of this BigNumber in normal (fixed-point) notation rounded to `dp` decimal places using rounding mode `rm`,
-         *  and formatted according to the properties of the `FORMAT` object.
-         *
-         * If `dp` is omitted or is `null` or `undefined`, then the return value is not rounded to a fixed number of decimal places.
-         *
-         * If `rm` is omitted or is `null` or `undefined`, `ROUNDING_MODE` is used.
-         */
-        toFormat(dp?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a string array representing the value of this BigNumber as a simple fraction with an integer numerator and an integer denominator.
-         * The denominator will be a positive non-zero value less than or equal to `max`.
-         *
-         * If a maximum denominator, `max`, is not specified, or is `null` or `undefined`, the denominator will be the lowest value necessary to represent the number exactly.
-         */
-        toFraction(max?: NumberLike): [string, string];
-
-        /**
-         * As `valueOf`.
-         */
-        toJSON(): string;
-
-        /**
-         * Returns the value of this BigNumber as a JavaScript number primitive.
-         *
-         * Type coercion with, for example, the unary plus operator will also work, except that a BigNumber with the value minus zero will be converted to positive zero.
-         */
-        toNumber(): number;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber raised to the power `n`, and optionally modulo a modulus `m`.
-         *
-         * If `n` is negative the result is rounded according to the current `DECIMAL_PLACES` and `ROUNDING_MODE` configuration.
-         */
-        toPower(n: number, m?: NumberLike): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber raised to the power `n`, and optionally modulo a modulus `m`.
-         *
-         * If `n` is negative the result is rounded according to the current `DECIMAL_PLACES` and `ROUNDING_MODE` configuration.
-         */
-        pow(n: number, m?: NumberLike): BigNumber;
-
-        /**
-         * Returns a string representing the value of this BigNumber rounded to `sd` significant digits using rounding mode `rm`.
-         *
-         * If `sd` is less than the number of digits necessary to represent the integer part of the value in normal (fixed-point) notation, then exponential notation is used.
-         *
-         * If `sd` is omitted, or is `null` or `undefined`, then the return value is the same as `n.toString()`.
-         *
-         * If `rm` is omitted or is `null` or `undefined`, `ROUNDING_MODE` is used.
-         */
-        toPrecision(sd?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a string representing the value of this BigNumber in the specified base, or base `10` if `base` is omitted or is `null` or `undefined`.
-         */
-        toString(base?: number): string;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber truncated to a whole number.
-         */
-        truncated(): BigNumber;
-
-        /**
-         * Returns a BigNumber whose value is the value of this BigNumber truncated to a whole number.
-         */
-        trunc(): BigNumber;
-
-        /**
-         * As `toString`, but does not accept a base argument and includes the minus sign for negative zero.
-         */
-        valueOf(): string;
-
-        /**
-         * coefficient
-         * @description Array of base 1e14 numbers
-         */
-        c: number[] | null;
-
-        /**
-         * exponent
-         * @description Integer, -1000000000 to 1000000000 inclusive
-         */
-        e: number | null;
-
-        /**
-         * sign
-         */
-        s: -1 | 1 | null;
-
-        /**
-         * type identifier
-         */
-        isBigNumber: true;
-    }
-}
diff --git a/types/bignumber.js/tsconfig.json b/types/bignumber.js/tsconfig.json
deleted file mode 100644
index 6355540e00..0000000000
--- a/types/bignumber.js/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "bignumber.js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/bigscreen/tslint.json b/types/bigscreen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bigscreen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/binary-parser/binary-parser-tests.ts b/types/binary-parser/binary-parser-tests.ts
new file mode 100644
index 0000000000..d0d09e5ef7
--- /dev/null
+++ b/types/binary-parser/binary-parser-tests.ts
@@ -0,0 +1,95 @@
+import { Parser } from "binary-parser";
+
+// Build an IP packet header Parser
+const ipHeader = new Parser()
+    .endianess('big')
+    .bit4('version')
+    .bit4('headerLength')
+    .uint8('tos')
+    .uint16('packetLength')
+    .uint16('id')
+    .bit3('offset')
+    .bit13('fragOffset')
+    .uint8('ttl')
+    .uint8('protocol')
+    .uint16('checksum')
+    .array('src', {
+        type: 'uint8',
+        length: 4
+    })
+    .array('dst', {
+        type: 'uint8',
+        length: 4
+    });
+
+// Prepare buffer to parse.
+const buf = new Buffer('450002c5939900002c06ef98adc24f6c850186d1', 'hex');
+
+// Parse buffer and show result
+ipHeader.parse(buf);
+
+const parser2 = new Parser()
+    // Signed 32-bit integer (little endian)
+    .int32le('a')
+    // Unsigned 8-bit integer
+    .uint8('b')
+    // Signed 16-bit integer (big endian)
+    .int16be('c');
+
+const parser3 = new Parser()
+    // 32-bit floating value (big endian)
+    .floatbe('a')
+    // 64-bit floating value (little endian)
+    .doublele('b');
+
+const parser4 = new Parser()
+    // Statically sized array
+    .array('data', {
+        type: 'int32',
+        length: 8
+    })
+
+    // Dynamically sized array (references another variable)
+    .uint8('dataLength')
+    .array('data2', {
+        type: 'int32',
+        length: 'dataLength'
+    })
+
+    // Dynamically sized array (with some calculation)
+    .array('data3', {
+        type: 'int32',
+        length: () => 4 // other fields are available through this
+    })
+
+    // Statically sized array
+    .array('data4', {
+        type: 'int32',
+        lengthInBytes: 16
+    })
+
+    // Dynamically sized array (references another variable)
+    .uint8('dataLengthInBytes')
+    .array('data5', {
+        type: 'int32',
+        lengthInBytes: 'dataLengthInBytes'
+    })
+
+    // Dynamically sized array (with some calculation)
+    .array('data6', {
+        type: 'int32',
+        lengthInBytes: () => 4, // other fields are available through this
+    })
+
+    // Dynamically sized array (with stop-check on parsed item)
+    .array('data7', {
+        type: 'int32',
+        readUntil: (item, buffer) => true // stop when specific item is parsed. buffer can be used to perform a read-ahead.
+    });
+
+const parser5 = new Parser()
+    .array('ipv4', {
+        type: 'uint8',
+        length: '4',
+        formatter: (arr) => { }
+    });
diff --git a/types/binary-parser/index.d.ts b/types/binary-parser/index.d.ts
new file mode 100644
index 0000000000..657996bd8d
--- /dev/null
+++ b/types/binary-parser/index.d.ts
@@ -0,0 +1,147 @@
+// Type definitions for binary-parser 1.3
+// Project: https://github.com/keichi/binary-parser
+// Definitions by: Benjamin Riggs <https://github.com/riggs>, Dolan Miu <https://github.com/dolanmiu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface Parser {
+    parse(buffer: Buffer, callback?: (err?: Error, result?: any) => void): Parser.Parsed;
+
+    create(constructorFunction: ObjectConstructor): Parser;
+
+    int8(name: string, options?: Parser.Options): Parser;
+    uint8(name: string, options?: Parser.Options): Parser;
+
+    int16(name: string, options?: Parser.Options): Parser;
+    uint16(name: string, options?: Parser.Options): Parser;
+    int16le(name: string, options?: Parser.Options): Parser;
+    int16be(name: string, options?: Parser.Options): Parser;
+    uint16le(name: string, options?: Parser.Options): Parser;
+    uint16be(name: string, options?: Parser.Options): Parser;
+
+    int32(name: string, options?: Parser.Options): Parser;
+    uint32(name: string, options?: Parser.Options): Parser;
+    int32le(name: string, options?: Parser.Options): Parser;
+    int32be(name: string, options?: Parser.Options): Parser;
+    uint32le(name: string, options?: Parser.Options): Parser;
+    uint32be(name: string, options?: Parser.Options): Parser;
+
+    bit1(name: string, options?: Parser.Options): Parser;
+    bit2(name: string, options?: Parser.Options): Parser;
+    bit3(name: string, options?: Parser.Options): Parser;
+    bit4(name: string, options?: Parser.Options): Parser;
+    bit5(name: string, options?: Parser.Options): Parser;
+    bit6(name: string, options?: Parser.Options): Parser;
+    bit7(name: string, options?: Parser.Options): Parser;
+    bit8(name: string, options?: Parser.Options): Parser;
+    bit9(name: string, options?: Parser.Options): Parser;
+    bit10(name: string, options?: Parser.Options): Parser;
+    bit11(name: string, options?: Parser.Options): Parser;
+    bit12(name: string, options?: Parser.Options): Parser;
+    bit13(name: string, options?: Parser.Options): Parser;
+    bit14(name: string, options?: Parser.Options): Parser;
+    bit15(name: string, options?: Parser.Options): Parser;
+    bit16(name: string, options?: Parser.Options): Parser;
+    bit17(name: string, options?: Parser.Options): Parser;
+    bit18(name: string, options?: Parser.Options): Parser;
+    bit19(name: string, options?: Parser.Options): Parser;
+    bit20(name: string, options?: Parser.Options): Parser;
+    bit21(name: string, options?: Parser.Options): Parser;
+    bit22(name: string, options?: Parser.Options): Parser;
+    bit23(name: string, options?: Parser.Options): Parser;
+    bit24(name: string, options?: Parser.Options): Parser;
+    bit25(name: string, options?: Parser.Options): Parser;
+    bit26(name: string, options?: Parser.Options): Parser;
+    bit27(name: string, options?: Parser.Options): Parser;
+    bit28(name: string, options?: Parser.Options): Parser;
+    bit29(name: string, options?: Parser.Options): Parser;
+    bit30(name: string, options?: Parser.Options): Parser;
+    bit31(name: string, options?: Parser.Options): Parser;
+    bit32(name: string, options?: Parser.Options): Parser;
+
+    float(name: string, options?: Parser.Options): Parser;
+    floatle(name: string, options?: Parser.Options): Parser;
+    floatbe(name: string, options?: Parser.Options): Parser;
+
+    double(name: string, options?: Parser.Options): Parser;
+    doublele(name: string, options?: Parser.Options): Parser;
+    doublebe(name: string, options?: Parser.Options): Parser;
+
+    string(name: string, options?: Parser.StringOptions): Parser;
+
+    buffer(name: string, options: Parser.BufferOptions): Parser;
+
+    array(name: string, options: Parser.ArrayOptions): Parser;
+
+    choice(name: string, options: Parser.ChoiceOptions): Parser;
+
+    nest(name: string, options: Parser.NestOptions): Parser;
+
+    skip(length: number): Parser;
+
+    endianess(endianess: Parser.Endianness): Parser;   /* [sic] */
+
+    namely(alias: string): Parser;
+
+    compile(): void;
+
+    getCode(): string;
+}
+
+export interface ParserConstructor {
+    new(): Parser;
+}
+
+export const Parser: ParserConstructor;
+
+export namespace Parser {
+    type Data = number | string | Array<number | Parsed> | Parsed | Buffer;
+    interface Parsed {
+        [name: string]: Data;
+    }
+
+    interface Options {
+        formatter?: ((value: Data) => any);
+        assert?: string | number | ((value: Data) => boolean);
+    }
+
+    interface StringOptions extends Options {
+        encoding?: string;
+        length?: number | string | ((this: Parsed) => number);
+        zeroTerminated?: boolean;
+        greedy?: boolean;
+        stripNull?: boolean;
+    }
+
+    interface BufferOptions extends Options {
+        clone?: boolean;
+        length?: number | string | ((this: Parsed) => number);
+        readUntil?: string | ((item: number, buffer: Buffer) => boolean);
+    }
+
+    interface ArrayOptions extends Options {
+        type: string | Parser;
+        length?: number | string | ((this: Parsed) => number);
+        lengthInBytes?: number | string | ((this: Parsed) => number);
+        readUntil?: string | ((item: number, buffer: Buffer) => boolean);
+    }
+
+    interface ChoiceOptions extends Options {
+        tag: string | ((this: Parsed) => number);
+        choices: { [item: number]: Parser | string };
+        defaultChoice?: Parser | string;
+    }
+
+    interface NestOptions extends Options {
+        type: Parser | string;
+    }
+
+    type Endianness =
+        'little' |
+        'big';
+
+    interface Context {
+        [name: string]: Parsed;
+    }
+}
diff --git a/types/binary-parser/tsconfig.json b/types/binary-parser/tsconfig.json
new file mode 100644
index 0000000000..cb361f52c5
--- /dev/null
+++ b/types/binary-parser/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "binary-parser-tests.ts"
+    ]
+}
diff --git a/types/passport-client-cert/tslint.json b/types/binary-parser/tslint.json
similarity index 100%
rename from types/passport-client-cert/tslint.json
rename to types/binary-parser/tslint.json
diff --git a/types/bind-ponyfill/tslint.json b/types/bind-ponyfill/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bind-ponyfill/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bindings/bindings-tests.ts b/types/bindings/bindings-tests.ts
new file mode 100644
index 0000000000..e66ab51353
--- /dev/null
+++ b/types/bindings/bindings-tests.ts
@@ -0,0 +1,4 @@
+import bindings = require('bindings');
+
+// Use your bindings defined in your C files
+const result = bindings('binding.node').your_c_function();
diff --git a/types/bindings/index.d.ts b/types/bindings/index.d.ts
new file mode 100644
index 0000000000..9403a7a92b
--- /dev/null
+++ b/types/bindings/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for bindings 1.3
+// Project: https://github.com/TooTallNate/node-bindings
+// Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * The main `bindings()` function loads the compiled bindings for a given module.
+ * It uses V8's Error API to determine the parent filename that this function is
+ * being invoked from, which is then used to find the root directory.
+ */
+declare function bindings(mod: string): any;
+
+export = bindings;
diff --git a/types/bindings/tsconfig.json b/types/bindings/tsconfig.json
new file mode 100644
index 0000000000..fb9350642a
--- /dev/null
+++ b/types/bindings/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bindings-tests.ts"
+    ]
+}
diff --git a/types/pg-connection-string/tslint.json b/types/bindings/tslint.json
similarity index 100%
rename from types/pg-connection-string/tslint.json
rename to types/bindings/tslint.json
diff --git a/types/bingmaps/Autosuggest.d.ts b/types/bingmaps/Autosuggest.d.ts
index 4ccfcc9270..7d83ca6e4b 100644
--- a/types/bingmaps/Autosuggest.d.ts
+++ b/types/bingmaps/Autosuggest.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps {
     /** Options used to customize the autosuggest functionality. */
     export interface IAutosuggestOptions {
diff --git a/types/bingmaps/Clustering.d.ts b/types/bingmaps/Clustering.d.ts
index a936653d3b..17c9425933 100644
--- a/types/bingmaps/Clustering.d.ts
+++ b/types/bingmaps/Clustering.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps {
     /** The options used to customize how the ClusterLayer functions. */
     export interface IClusterLayerOptions {
diff --git a/types/bingmaps/Contour.d.ts b/types/bingmaps/Contour.d.ts
index 8bc80e70b9..cd2d9767c7 100644
--- a/types/bingmaps/Contour.d.ts
+++ b/types/bingmaps/Contour.d.ts
@@ -1,13 +1,6 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps {
 
-    /** 
+    /**
      * The contour layer options
      */
     interface IContourLayerOptions {
diff --git a/types/bingmaps/DataBinning.d.ts b/types/bingmaps/DataBinning.d.ts
index 548a9cc681..e33b2d5113 100644
--- a/types/bingmaps/DataBinning.d.ts
+++ b/types/bingmaps/DataBinning.d.ts
@@ -1,9 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
 /// <reference path="SpatialMath.d.ts"/>
 
 declare module Microsoft.Maps {
@@ -96,7 +90,7 @@ declare module Microsoft.Maps {
     }
 
     /**
-     *  A polygon which represents a data bin on the map and contains the data bin information. 
+     *  A polygon which represents a data bin on the map and contains the data bin information.
      */
 
     export class DataBinPolygon extends Polygon {
diff --git a/types/bingmaps/Directions.d.ts b/types/bingmaps/Directions.d.ts
index 80a3bd5a07..3663fc8c21 100644
--- a/types/bingmaps/Directions.d.ts
+++ b/types/bingmaps/Directions.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps.Directions {
     /////////////////////////////////////
     /// Enumerations
@@ -309,7 +302,7 @@ declare module Microsoft.Maps.Directions {
         timeWithTraffic: number;
     }
 
-    /** Contains information about a transit line. */ 
+    /** Contains information about a transit line. */
     export interface ITransitLine {
         /** The short name for the transit line. */
         abbreviatedName: string;
@@ -338,12 +331,12 @@ declare module Microsoft.Maps.Directions {
 
     /** Options that can be used to define a waypoint. */
     export interface IWaypointOptions {
-        /** 
+        /**
         * The address string of the waypoint. For example, the following strings are valid for this parameter: "Seattle", "1 Microsoft Way, Redmond, WA". Either the address or location property must be specified.
         */
         address?: string;
 
-        /** 
+        /**
         * A boolean indicating whether the waypoint is a via point. A via point is a point along the route that is not a stop point. Set this property to
         * true if you just want the route to pass through this location. Default: false
         */
@@ -495,7 +488,7 @@ declare module Microsoft.Maps.Directions {
         public addWaypoint(waypoint: Waypoint, index?: number): void;
 
         /**
-         * Calculates directions based on request and render options set 
+         * Calculates directions based on request and render options set
          */
         public calculateDirections(): void;
 
@@ -503,8 +496,8 @@ declare module Microsoft.Maps.Directions {
         public clearAll(): void;
 
         /**
-         * Clears the directions displayed and removes the route line from the map. 
-         * This method does not remove waypoints from the route and retains all calculated direction information and option settings. 
+         * Clears the directions displayed and removes the route line from the map.
+         * This method does not remove waypoints from the route and retains all calculated direction information and option settings.
          */
         public clearDisplay(): void;
 
@@ -534,7 +527,7 @@ declare module Microsoft.Maps.Directions {
          * @returns The directions request options.
          */
         public getRequestOptions(): IDirectionsRequestOptions;
-        
+
         /**
          * Gets the current calculated route(s)
          * @returns The current calculated route(s). If the route was not successfully calculated, null is returned.
@@ -542,7 +535,7 @@ declare module Microsoft.Maps.Directions {
         public getRouteResult(): IRoute[];
 
         /**
-        * Removes the given waypoint or the waypoint identified by the given index from the route. 
+        * Removes the given waypoint or the waypoint identified by the given index from the route.
         * @param waypointOrIndex A Waypoint object to be removed or the index of the waypoint to be removed
         */
         public removeWaypoint(waypointOrIndex: Waypoint | number): void;
@@ -563,7 +556,7 @@ declare module Microsoft.Maps.Directions {
         * Displays an input panel for calculating directions in the specified container. Provides autosuggest for location inputs.
         * @param inputContainerId The id name of the HTML container in which to render the directions input panel.
         */
-        public showInputPanel(inputContainerId: string): void;        
+        public showInputPanel(inputContainerId: string): void;
     }
 }
 
@@ -580,7 +573,7 @@ declare module Microsoft.Maps {
         * @param eventName The type of event to attach. Supported Events:
         * • directionsError
         * • directionsUpdated
-        * @param handler The callback function to handle the event when triggered. 
+        * @param handler The callback function to handle the event when triggered.
         * @returns The handler id.
         */
         export function addHandler(target: Directions.DirectionsManager, eventName: string, handler: (eventArg?: Directions.IDirectionsEventArgs | Directions.IDirectionsErrorEventArgs) => void): IHandlerId;
diff --git a/types/bingmaps/DrawingTools.d.ts b/types/bingmaps/DrawingTools.d.ts
index 8bdc7e8b21..bd5c938e4e 100644
--- a/types/bingmaps/DrawingTools.d.ts
+++ b/types/bingmaps/DrawingTools.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps {
     /** An object that contains the event arguments for when the drawing mode changes in the drawing tools. **/
     export interface IDrawingModeChangedData {
@@ -28,7 +21,7 @@ declare module Microsoft.Maps {
         • @param index The index at which to insert the shape into the layer.
         */
         add(data: IPrimitive | IPrimitive[], index?: number): void;
-   
+
         /**
         * Disposes the drawing manager instance.
         */
@@ -122,7 +115,7 @@ declare module Microsoft.Maps {
 
         /**
         * Creates a drawing manager which allows multi-shape editing and displays the toolbar.
-        * @param callback A callback function that is triggered after the DrawingTools have loaded. 
+        * @param callback A callback function that is triggered after the DrawingTools have loaded.
         */
         public showDrawingManager(callback?: (manager: DrawingManager) => void): void;
     }
@@ -137,7 +130,7 @@ declare module Microsoft.Maps {
         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
         * @param eventName The type of event to attach. Supported Events:
         * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered. 
+        * @param handler The callback function to handle the event when triggered.
         * @returns The handler id.
         */
         export function addHandler(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): IHandlerId;
@@ -147,7 +140,7 @@ declare module Microsoft.Maps {
         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
         * @param eventName The type of event to attach. Supported Events:
         * disposed, drawingChanged, drawingChanging, drawingEnded, drawingErased, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered. 
+        * @param handler The callback function to handle the event when triggered.
         * @returns The handler id.
         */
         export function addHandler(target: DrawingManager, eventName: string, handler: (eventArg?: IPrimitive | DrawingTools.DrawingMode) => void): IHandlerId;
@@ -161,7 +154,7 @@ declare module Microsoft.Maps {
         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
         * @param eventName The type of event to attach. Supported Events:
         * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered. 
+        * @param handler The callback function to handle the event when triggered.
         */
         export function addOne(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): void;
 
@@ -183,7 +176,7 @@ declare module Microsoft.Maps {
         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
         * @param eventName The type of event to attach. Supported Events:
         * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered. 
+        * @param handler The callback function to handle the event when triggered.
         * @returns The handler id.
         */
         export function addThrottledHandler(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): IHandlerId;
diff --git a/types/bingmaps/GeoJson.d.ts b/types/bingmaps/GeoJson.d.ts
index c68ce2e80f..94726ab542 100644
--- a/types/bingmaps/GeoJson.d.ts
+++ b/types/bingmaps/GeoJson.d.ts
@@ -1,17 +1,10 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps {
 
     /** GeoJSON object definition */
     export interface IGeoJsonObject {
-        /** 
-         * Type of the object 
-         * could be one of the following: 
+        /**
+         * Type of the object
+         * could be one of the following:
          * Point
          * LineString
          * Polygon
@@ -20,7 +13,7 @@ declare module Microsoft.Maps {
          * MultiPolygon
          * GeometryCollection
          * Feature
-         * FeatureCollection 
+         * FeatureCollection
          */
         type: string;
 
diff --git a/types/bingmaps/HeatMapLayer.d.ts b/types/bingmaps/HeatMapLayer.d.ts
index c012e06422..c90813b00d 100644
--- a/types/bingmaps/HeatMapLayer.d.ts
+++ b/types/bingmaps/HeatMapLayer.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps {
     /** A standard dictionary object (associative array). */
     export interface IDictionary<T> {
@@ -34,15 +27,15 @@ declare module Microsoft.Maps {
         * The opacity of the HeatMapLayer canvas. Value should be a decimal between 0 and 1. Default: 1
         */
         opacity?: number;
-        
+
         /**
         * The radius to draw each data point on the map. Default: 10
         */
         radius?: number;
-        
+
         /**
         * The distance units of the radius. Possible values are:
-        * 
+        *
         * • 'pixels' (defualt)
         * • 'meters'
         *
@@ -73,14 +66,14 @@ declare module Microsoft.Maps {
 
         /** Disposes the heat map layer. */
         public dispose(): void;
-        
+
         /**
          * Gets a boolean indicating if the heat map layer is visible or not.
          * @returns A boolean indicating if the heat map layer is visible or not.
          */
         public getVisible(): boolean;
 
-        /** 
+        /**
         * @deprecated
         * Hides the heat map layer.
         */
@@ -104,10 +97,10 @@ declare module Microsoft.Maps {
         */
         public setVisible(visible: boolean): void;
 
-        /** 
+        /**
         * @deprecated
         * Shows the heat map layer.
         */
-        public show(): void;        
+        public show(): void;
     }
 }
\ No newline at end of file
diff --git a/types/bingmaps/Search.d.ts b/types/bingmaps/Search.d.ts
index eea087480c..0d799c7078 100644
--- a/types/bingmaps/Search.d.ts
+++ b/types/bingmaps/Search.d.ts
@@ -1,16 +1,9 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 /**
  * Provides an easy method for geocoding address and searching for points of interest from JavaScript.
  * @requires The Microsoft.Maps.Search module.
  */
 declare module Microsoft.Maps.Search {
-    /** 
+    /**
      * Defines the match precision of a geocdoed result.
      * @requires The Microsoft.Maps.Search module.
      */
@@ -31,7 +24,7 @@ declare module Microsoft.Maps.Search {
         rooftop
     }
 
-    /** 
+    /**
      * Defines the geocoding level of the location match found by the geocoder.
      * @requires The Microsoft.Maps.Search module.
      */
@@ -52,7 +45,7 @@ declare module Microsoft.Maps.Search {
         modified
     }
 
-    /** 
+    /**
      * Defines the confidence of the location match found by the geocoding service.
      * @requires The Microsoft.Maps.Search module.
      */
@@ -117,16 +110,16 @@ declare module Microsoft.Maps.Search {
 
     /** The options for a geocode request. */
     export interface IGeocodeRequestOptions {
-        /** 
-         * A location rectangle that defines the boundaries of the area in which to search for 
-         * location results. The default is the bounds of the map view associated with this 
+        /**
+         * A location rectangle that defines the boundaries of the area in which to search for
+         * location results. The default is the bounds of the map view associated with this
          * instance of the SearchManager, which is usually the current map view.
          */
         bounds?: LocationRect;
 
         /**
-         * The name of the function to call when a successful result is returned from the 
-         * geocode request. The callback function must accept two parameters: result, which is 
+         * The name of the function to call when a successful result is returned from the
+         * geocode request. The callback function must accept two parameters: result, which is
          * a GeocodeResult type, and a userData object.
          */
         callback: (geocodeResult: IGeocodeResult, userData: any) => void;
@@ -135,7 +128,7 @@ declare module Microsoft.Maps.Search {
         count?: number;
 
         /**
-         * The name of the function to call when the request is returned with an error. The 
+         * The name of the function to call when the request is returned with an error. The
          * error callback function must accept an IGeocodeRequestOptions object.
          */
         errorCallback?: (geocodeRequestOptions: IGeocodeRequestOptions) => void;
@@ -218,15 +211,15 @@ declare module Microsoft.Maps.Search {
         constructor(map: Map);
 
         /**
-         * Matches the address or place query in the specified request 
-         * options to a location and returns the results to the request 
+         * Matches the address or place query in the specified request
+         * options to a location and returns the results to the request
          * options callback function.
          * @param request Options for sending geocode request
          */
         public geocode(request: IGeocodeRequestOptions): void;
 
         /**
-         * Matches the specified location to an address and returns the 
+         * Matches the specified location to an address and returns the
          * address results to the specified request options callback function.
          * @param request Options for sending reverse geocode request
          */
diff --git a/types/bingmaps/SpatialDataService.d.ts b/types/bingmaps/SpatialDataService.d.ts
index f31642cc04..627ab7cbad 100644
--- a/types/bingmaps/SpatialDataService.d.ts
+++ b/types/bingmaps/SpatialDataService.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 /**
  * This module wraps the Query and GeoData REST API’s in the Bing Spatial Dara Services and expose them as an easy to use JavaScript library.
  * @requires The Microsoft.Maps.SpatialDataService module.
@@ -123,10 +116,10 @@ declare module Microsoft.Maps.SpatialDataService {
 
         /** The culture associated with this entity. Example: en */
         OfficialCulture: string;
-    
+
         /** The approximate population within this entity. Example: PopClass20000to99999 */
         PopulationClass: string;
-    
+
         /** The regional culture associated with this entity. */
         RegionalCulture: string;
     }
@@ -246,7 +239,7 @@ declare module Microsoft.Maps.SpatialDataService {
     /**
     * A Fitler object that defines the logic behind a filter expression that can be executed against a JSON object or generate
     * a filter string that can be used with the Bing Spatial Data Services.
-    */ 
+    */
     export interface IFilter {
         /**
         * Executes the filter logic against a JSON object and returns a boolean indicating if the object meets the requirements of the Filter.
@@ -319,7 +312,7 @@ declare module Microsoft.Maps.SpatialDataService {
 
     /** Options for find near route query API. */
     export interface ISpatialFilterOptions {
-        /** 
+        /**
          * One of the following values:
          * • nearby – Searches in a radius around a location.
          * • nearRoute – Searches for results that are within 1 mile of a route.
@@ -331,7 +324,7 @@ declare module Microsoft.Maps.SpatialDataService {
         /** Location at which the filter should be applied (only for nearby filter). */
         location?: string | Location;
 
-        /** 
+        /**
          * Radius to use when performing a nearby search. The distance in kilometers and must be between 0.16 and 1000 kilometers
          * (only for nearby filter).
          */
@@ -346,26 +339,26 @@ declare module Microsoft.Maps.SpatialDataService {
         /** Intersection object. Can be a well known text string or a LocationRect object (only for intersects filter). */
         intersects?: string | LocationRect | IPrimitive;
     }
-    
+
     /** Options for find near route query API. */
     export interface IFindNearRouteOptions extends ISpatialFilterOptions {
-        /** 
+        /**
          * One of the following values:
          *  • Driving [default]
          *  • Walking
          */
         travelMode?: string;
 
-        /** 
-         * An integer value between 0 and 359 that represents degrees from north 
-         * where north is 0 degrees and the heading is specified clockwise from north. 
-         * For example, setting the heading of 270 degrees creates a route that initially heads west 
+        /**
+         * An integer value between 0 and 359 that represents degrees from north
+         * where north is 0 degrees and the heading is specified clockwise from north.
+         * For example, setting the heading of 270 degrees creates a route that initially heads west
          */
         heading?: number;
 
         /**
          * An integer distance specified in meters.
-         * Use this parameter to make sure that the moving vehicle has enough distance 
+         * Use this parameter to make sure that the moving vehicle has enough distance
          * to make the first turn
          */
         distanceBeforeFirstTurn?: number;
@@ -404,7 +397,7 @@ declare module Microsoft.Maps.SpatialDataService {
         isStaging?: boolean;
 
         /**
-         * Specifies one or more properties to use to sort the results of a query. 
+         * Specifies one or more properties to use to sort the results of a query.
          * You can specify up to three (3) properties. Results are sorted in ascending order.
          * Note: You cannot use the latitude and longitude properties to sort results. You can use the elevation property.
          */
diff --git a/types/bingmaps/SpatialMath.d.ts b/types/bingmaps/SpatialMath.d.ts
index 94c4ceab61..4fe3b4ea12 100644
--- a/types/bingmaps/SpatialMath.d.ts
+++ b/types/bingmaps/SpatialMath.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 //////////////////////////////////////////////
 /// Core Library
 //////////////////////////////////////////////
@@ -80,7 +73,7 @@ declare module Microsoft.Maps.SpatialMath {
     export function convertArea(area: number, fromUnits: AreaUnits, toUnits: AreaUnits): number;
 
     /**
-     * Converts a distance from one distance units to another. 
+     * Converts a distance from one distance units to another.
      * @param distance A number that represents a distance to convert.
      * @param fromUnits The distance units the original distance is in.
      * @param toUnits The disired distance units to convert to.
@@ -119,7 +112,7 @@ declare module Microsoft.Maps.SpatialMath {
     export function getDistanceTo(origin: Location, destination: Location, units?: DistanceUnits, highAccuracy?: boolean): number;
 
     /**
-     * Retrieves the radius of the earth in a specific distance unit for WGS84. 
+     * Retrieves the radius of the earth in a specific distance unit for WGS84.
      * @param units Unit of distance measurement. Default: Meters
      * @returns A number that represents the radius of the earth in a specific distance unit.
      **/
@@ -145,13 +138,13 @@ declare module Microsoft.Maps.SpatialMath {
      * Calculates the distance between all Location objects in an array.
      * @param path The array of Location objects that make up the path to calculate the length of.
      * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used. 
+     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
      * @returns The distance between all Locations in between all Location objects in an array on the surface of a earth in the specifed units.
      **/
     export function getLengthOfPath(path: Location[], units?: DistanceUnits, highAccuracy?: boolean): number;
 
     /**
-     * Calculates the Location object on a path that is a specified distance away from the start of the path. If the specified distance is longer 
+     * Calculates the Location object on a path that is a specified distance away from the start of the path. If the specified distance is longer
      * than the length of the path, the last Location of the path will be returned.
      * @param path A polyline or array of Location coordinates that form a path.
      * @param distance The distance along the path (from the start) to calculate the location for.
@@ -197,7 +190,7 @@ declare module Microsoft.Maps.SpatialMath {
     /**
      * Tries to parse the given string that is in Degree Minute Seconds format. For Example: 35° 26′ 31″ E or 40° 26′ 46″ N 79° 58′ 56″ W
      * @param input A string in Degree Minute Seconds format to parse.
-     * @returns Returns a decimal degree value if only a single angle is provided. If two angles provided in the string, then a 
+     * @returns Returns a decimal degree value if only a single angle is provided. If two angles provided in the string, then a
      * Location object is returned. If string is in an invalid format, null is returned.
      */
     export function tryParseDegMinSec(input: string): number | Location;
@@ -233,7 +226,7 @@ declare module Microsoft.Maps.SpatialMath.Tiles {
     export function groundResolution(latitude: number, zoom: number, units?: SpatialMath.DistanceUnits): number;
 
     /**
-     * Converts a Pixel coordinate into a Geospatial Location at a specified zoom level. 
+     * Converts a Pixel coordinate into a Geospatial Location at a specified zoom level.
      * Global Pixel coordinates are relative to the top left corner of the map (90, -180)
      * @param point Pixel coordinate.
      * @param zoom Zoom level.
@@ -346,22 +339,22 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
     export function centroid(shape: IPrimitive | IPrimitive[]): Location;
 
     /**
-     * Calculates an approximate concave hull that best fits the data. 
+     * Calculates an approximate concave hull that best fits the data.
      * A concave hull is a shape that represents that a possible concave geometry that encloses all shapes in the specified data set.
-     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned. 
+     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned.
      * If 3 or more unique Locations are in the data set a Polygon, or array of Polygons will be returned.
      * @param shapes Shape(s) whose Location(s) or Location(s) are to be used to generate a concave hull.
      * @param allowMultiPolygons A boolean indicating if the resulting concave hull can be a MultiPolygon. Default: false
      * @param allowHoles A boolean indicating if the polygons in the resulting concave hull can have holes in them. Default: false
      * @param options A set of polygon options to apply to the generated shape.
-     * @returns An approximate concave hull that best fits the data. 
-     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned. 
+     * @returns An approximate concave hull that best fits the data.
+     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned.
      * If 3 or more unique Locations are in the data set a Polygon, or array of Polygons will be returned.
      */
     export function concaveHull(shapes: Location | IPrimitive | (Location | IPrimitive)[], allowMultiPolygons?: boolean, allowHoles?: boolean, options?: IPolygonOptions): IPrimitive | IPrimitive[];
 
     /**
-     * Given two shapes, determines if the first one contains the second one 
+     * Given two shapes, determines if the first one contains the second one
      * (or, the second shape is a subset of the first shape) or not.
      * @param shapeA The first shape to test against the second.
      * @param shapeB The second shape to test against the first.
@@ -386,7 +379,7 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
     export function delaunayTriangles(shapes: Location | IPrimitive | (Location | IPrimitive)[], options?: IPolygonOptions): Polygon[];
 
     /**
-     * Returns an object that represents area of an initial shape subtracted by the overlapping area of a second shape. 
+     * Returns an object that represents area of an initial shape subtracted by the overlapping area of a second shape.
      * @param shapeA The first shape.
      * @param shapeB The second shape to subtract from the first.
      * @returns A set of shapes that represent the area of the first shape that is not overlapped by the second shape.
@@ -394,17 +387,17 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
     export function difference(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
 
     /**
-     * Calculates the approximate shortest distance between any two shapes. 
+     * Calculates the approximate shortest distance between any two shapes.
      * @param shapeA The first shape to calculate the distance from.
      * @param shapeB The second shape to calculate the distance to.
      * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used. 
+     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
      * @returns The shorested distance between the shapes in the specified units.
      */
     export function distance(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[], units?: DistanceUnits, highAccuracy?: boolean): number;
 
     /**
-     * Returns an object that represents the area where two shapes intersect. 
+     * Returns an object that represents the area where two shapes intersect.
      * @param shapeA The first shape.
      * @param shapeB The second shape.
      * @returns A set of shapes that represents the area where two shapes intersect.
@@ -420,10 +413,10 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
     export function intersects(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): boolean;
 
     /**
-     * Tests to see if the shape is valid and meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons, 
+     * Tests to see if the shape is valid and meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons,
      * coordinates in an exterior rings have a counter-clockwise orientation, while holes have a clockwise orientation.
      * @param shape The shape to test for validity.
-     * @returns Returns a boolean indicting if the specified shape(s) is valid or not. 
+     * @returns Returns a boolean indicting if the specified shape(s) is valid or not.
      */
     export function isValid(shape: IPrimitive | IPrimitive[]): boolean;
 
@@ -431,13 +424,13 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
      * Calculates the distance between all Locations in a shape. If the shape is a polygon, the length of the perimeter of all rings is calculated.
      * @param shape The shape to calculate the length of.
      * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used. 
+     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
      * @returns The distance between all Locations in a polyline or the perimeter of a ploygon on the surface of a earth in the specifed units.
      */
     export function calculateLength(shape: IPrimitive | IPrimitive[], units ?: DistanceUnits, highAccuracy ?: boolean): number;
 
     /**
-     * Takes a shape and returns a copy of it that meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons, 
+     * Takes a shape and returns a copy of it that meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons,
      * coordinates in an exterior rings have a counter-clockwise orientation, while holes have a clockwise orientation.
      * @param shape The shape to make valid.
      * @returns Valiated version of the provided shape. May be a different shape type than what was provided. i.e. A polygon may be broken up into an array of polygons (MultiPolygon).
@@ -446,12 +439,12 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
 
     /**
      * Calculates the nearest Location objects between to shapes that lie on the shapes.
-     * If the shapes do not overlap, this calculates a location on each shape that is closest to the other shape. 
+     * If the shapes do not overlap, this calculates a location on each shape that is closest to the other shape.
      * If the shapes overlap, a location that is within the intersection area of the shapes will be added twice to an array, once for each shape, and returned.
      * @param shapeA The first shape.
      * @param shapeB The second shape.
-     * @returns An array of two Location objects that represent the nearest points between two shapes. 
-     * The Location objects are in the same order as the input shapes. 
+     * @returns An array of two Location objects that represent the nearest points between two shapes.
+     * The Location objects are in the same order as the input shapes.
      * Returns null if nearest points were unable to be computed.
      */
     export function nearestLocations(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): Location[];
@@ -460,7 +453,7 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
      * Reduces the resolution of a shape using the Douglas-Peucker algorithm.
      * @param shape The shape to reduce the resolution of.
      * @param tolerance A tolerance distance in meters used by the reduction algorithms.
-     * @returns A version of the specified shape that has been reduced. 
+     * @returns A version of the specified shape that has been reduced.
      */
     export function reduce(shape: IPrimitive | IPrimitive[], tolerance: number): IPrimitive | IPrimitive[];
 
@@ -502,7 +495,7 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
 
     /**
      * Returns an object that represents all points that are either in one shape instance or another, but not those points that lie in both instances.
-     * "Sym" stands for Symmetric. symDifference is an OGC standard name for this calculation used in most spatial math libraries, including SQL. 
+     * "Sym" stands for Symmetric. symDifference is an OGC standard name for this calculation used in most spatial math libraries, including SQL.
      * @param shapeA The first shape.
      * @param shapeB The second shape.
      * @returns A shape that represents the symetric difference between two shapes.
@@ -518,7 +511,7 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
     export function union(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
 
     /**
-     * Performs a union operation on a set of shapes. 
+     * Performs a union operation on a set of shapes.
      * If a shape doesn't overlap with the rest, the returned result will be an array of shapes containing this shape and the union of the rest.
      * @param shapes An array of shapes to union together.
      * @returns A shape that represents the union of all specified shapes.
@@ -526,10 +519,10 @@ declare module Microsoft.Maps.SpatialMath.Geometry {
     export function unionAggregate(shapes: IPrimitive[]): IPrimitive | IPrimitive[];
 
     /**
-     * Creates a Voronoi diagram from the Location objects of the provided shapes. The diagram is returned as an array of Polygons. 
+     * Creates a Voronoi diagram from the Location objects of the provided shapes. The diagram is returned as an array of Polygons.
      * If a clip region is specified, the diagram will be clipped accordingly.
      * @param shapes Location(s) of shape(s) or Location(s) to generate a Voronoi diagram.
-     * @param clipRegion A region to clip the voronoi diagram to. 
+     * @param clipRegion A region to clip the voronoi diagram to.
      * @param options A set of polygon options to apply to the generated shape.
      * @returns An array of polygons that form a Voronoi diagram.
      */
diff --git a/types/bingmaps/Traffic.d.ts b/types/bingmaps/Traffic.d.ts
index 46f508128f..1c78256053 100644
--- a/types/bingmaps/Traffic.d.ts
+++ b/types/bingmaps/Traffic.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 /**
  * Adds a traffic incident and flow data to the map.
  * @requires The Microsoft.Maps.Traffic module.
diff --git a/types/bingmaps/UNUSED_FILES.txt b/types/bingmaps/UNUSED_FILES.txt
deleted file mode 100644
index b0c81f8c63..0000000000
--- a/types/bingmaps/UNUSED_FILES.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Autosuggest.d.ts
-Clustering.d.ts
-Contour.d.ts
-DataBinning.d.ts
-Directions.d.ts
-DrawingTools.d.ts
-GeoJson.d.ts
-HeatMapLayer.d.ts
-Search.d.ts
-SpatialDataService.d.ts
-SpatialMath.d.ts
-Traffic.d.ts
-WellKnownText.d.ts
\ No newline at end of file
diff --git a/types/bingmaps/WellKnownText.d.ts b/types/bingmaps/WellKnownText.d.ts
index 1a0670ae1c..51c42203ce 100644
--- a/types/bingmaps/WellKnownText.d.ts
+++ b/types/bingmaps/WellKnownText.d.ts
@@ -1,10 +1,3 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../Microsoft.Maps.d.ts"/>
-
 declare module Microsoft.Maps {
     /**
      * Class responsible for readon/writing geo data in well known text format
diff --git a/types/bingmaps/index.d.ts b/types/bingmaps/index.d.ts
index 919b7df62f..b629e3b903 100644
--- a/types/bingmaps/index.d.ts
+++ b/types/bingmaps/index.d.ts
@@ -3,15 +3,29 @@
 // Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference path="Autosuggest.d.ts" />
+/// <reference path="Clustering.d.ts" />
+/// <reference path="Contour.d.ts" />
+/// <reference path="DataBinning.d.ts" />
+/// <reference path="Directions.d.ts" />
+/// <reference path="DrawingTools.d.ts" />
+/// <reference path="GeoJson.d.ts" />
+/// <reference path="HeatMapLayer.d.ts" />
+/// <reference path="Search.d.ts" />
+/// <reference path="SpatialDataService.d.ts" />
+/// <reference path="SpatialMath.d.ts" />
+/// <reference path="Traffic.d.ts" />
+/// <reference path="WellKnownText.d.ts" />
+
 /**
  *  The Bing Maps V8 developer API.
  */
 declare module Microsoft.Maps {
-	
+
 	//////////////////////////////////////////////
     /// Custom Map Styles
     //////////////////////////////////////////////
-	
+
 	 /** The styles options that can be applied to map elements. */
     export interface IMapElementStyle {
         /**
@@ -67,7 +81,7 @@ declare module Microsoft.Maps {
     export interface ISettingsStyle {
         /** A hex color value that all land is first flushed to before things are drawn on it. */
         landColor?: string;
-		
+
 		/** Specifies whether or not to draw elevation shading on the map. */
 		shadedReliefVisible?: boolean;
     }
@@ -123,7 +137,7 @@ declare module Microsoft.Maps {
         /** A school or other educational building. */
         educationBuilding?: IMapElementStyle;
 
-        /** Restaurant, café, etc. */
+        /** Restaurant, caf�, etc. */
         foodPoint?: IMapElementStyle;
 
         /** Area of forest land. */
@@ -155,7 +169,7 @@ declare module Microsoft.Maps {
 
         /** A building which provides medical services. */
         medicalBuilding?: IMapElementStyle;
-	
+
 		/** A military area. */
         military?: IMapElementStyle;
 
@@ -218,7 +232,7 @@ declare module Microsoft.Maps {
 
 		/** Area of a stadium. */
 		stadium?: IMapElementStyle;
-		
+
         /** A street. */
         street?: IMapElementStyle;
 
@@ -270,7 +284,7 @@ declare module Microsoft.Maps {
         /** The version of the style syntax used. */
         version: string;
     }
-	
+
     //////////////////////////////////////////////
     /// Enumerations
     //////////////////////////////////////////////
@@ -361,7 +375,7 @@ declare module Microsoft.Maps {
 
     /** Contains enum to show how pixels are defined. */
     export enum PixelReference {
-        /** The pixel is defined relative to the map control’s root element, where the top left corner of the map control is (0, 0). */
+        /** The pixel is defined relative to the map control�s root element, where the top left corner of the map control is (0, 0). */
         control,
 
         /** The pixel is defined relative to the page, where the top left corner of the HTML page is (0, 0). */
@@ -385,7 +399,7 @@ declare module Microsoft.Maps {
 
         /**
         * The subdivision name within the country or region for an address. This element is also commonly treated as the first order administrative
-        * subdivision. An example is a US state, such as “Oregon”.
+        * subdivision. An example is a US state, such as �Oregon�.
         */
         adminDistrict: string;
 
@@ -395,16 +409,16 @@ declare module Microsoft.Maps {
         /** A string specifying the two-letter ISO country code. */
         countryRegionISO2: string;
 
-        /** The second, third, or fourth order subdivision within a country, dependency, or region. An example is a US county, such as “King”. */
+        /** The second, third, or fourth order subdivision within a country, dependency, or region. An example is a US county, such as �King�. */
         district: string;
 
         /** A nicely formatted address string for the result. */
         formattedAddress: string;
 
-        /** The locality, such as the primary city, that corresponds to an address. An example is “Seattle”. */
+        /** The locality, such as the primary city, that corresponds to an address. An example is �Seattle�. */
         locality: string;
 
-        /** The post code, postal code, or ZIP code of an address. An example is a US ZIP code, such as “98152”. */
+        /** The post code, postal code, or ZIP code of an address. An example is a US ZIP code, such as �98152�. */
         postalCode: string;
     }
 
@@ -470,14 +484,14 @@ declare module Microsoft.Maps {
     export interface ILayer {
     }
 
-    /** 
+    /**
      * @deprecated use IMouseEventArgs
-	 * A LayerMouseEventArgs object is returned by many the mouse event handlers attached to a Layer. 
+	 * A LayerMouseEventArgs object is returned by many the mouse event handlers attached to a Layer.
 	 */
     export interface ILayerMouseEventArgs {
-        /** 
+        /**
 		* @deprecated use target
-		* The IPrimitive shape (pushpin, polyline, polygon) that the event occurred on. 
+		* The IPrimitive shape (pushpin, polyline, polygon) that the event occurred on.
 		*/
         primitive: IPrimitive;
     }
@@ -498,13 +512,13 @@ declare module Microsoft.Maps {
         */
         htmlContent?: string;
 
-        /** The location on the map where the infobox’s anchor is attached. */
+        /** The location on the map where the infobox�s anchor is attached. */
         location?: Location;
 
-        /** The maximium size that the infobox height can expand to based on it’s content. Default: 126 **/
+        /** The maximium size that the infobox height can expand to based on it�s content. Default: 126 **/
         maxHeight?: number;
 
-        /** The maximium size that the infobox width can expand to based on it’s content. Default: 256 **/
+        /** The maximium size that the infobox width can expand to based on it�s content. Default: 256 **/
         maxWidth?: number;
 
         /**
@@ -599,7 +613,7 @@ declare module Microsoft.Maps {
         /** Custom map styles used to modify the look and feel of the base map. */
         customMapStyle?: ICustomMapStyle;
 
-        /** A boolean value indicating whether to disable the user’s ability to control the using the keyboard. Default: false */
+        /** A boolean value indicating whether to disable the user�s ability to control the using the keyboard. Default: false */
         disableKeyboardInput?: boolean;
 
         /** A boolean value indicating if mousing over the map type selector should open it or not. Default: true */
@@ -670,14 +684,14 @@ declare module Microsoft.Maps {
         navigationBarOrientation?: NavigationBarOrientation;
 
         /**
-        * A boolean value indicating whether to display the “breadcrumb control”. The breadcrumb control shows the current center location’s geography hierarchy.
+        * A boolean value indicating whether to display the �breadcrumb control�. The breadcrumb control shows the current center location�s geography hierarchy.
         * The default value is false. Requires the showLocateMeButton map option to be set to true. The breadcrumb control displays best when the width of the map
         * is at least 400 pixels.
         */
         showBreadcrumb?: boolean;
 
         /**
-        * A boolean value indicating whether to show the map navigation control. Default: true This property can only be set when using the Map constructor.
+        * A boolean value indicating whether to show the map navigation control. Default: true�This property can only be set when using the Map constructor.
         */
         showDashboard?: boolean;
 
@@ -783,7 +797,7 @@ declare module Microsoft.Maps {
         /** The object that triggered the event. */
         target: Map | IPrimitive;
 
-        /** The type of the object that the event is attached to. Valid values include the following: ‘map’, 'layer', ‘polygon’, ‘polyline’, or ‘pushpin’ */
+        /** The type of the object that the event is attached to. Valid values include the following: �map�, 'layer', �polygon�, �polyline�, or �pushpin� */
         targetType: string;
 
         /**
@@ -1034,7 +1048,7 @@ declare module Microsoft.Maps {
         * When using a string, the uriConstructor will allow you to specify placeholders that will be replaced with the tiles value (i.e. {quadkey}).
         * See the Tile URL Parameters section for a list of supported parameters.
         * Besides using formatted tile URLs, you can also specify a callback function as the uriConstructor. This is useful if you need to be able to
-        * build custom tile URL’s that may require some additional calculations for a tile.
+        * build custom tile URL�s that may require some additional calculations for a tile.
         */
         uriConstructor: string | ((tile: PyramidTileId) => string);
     }
@@ -1109,7 +1123,7 @@ declare module Microsoft.Maps {
     export class AnimatedTileLayer {
         /**
          * @contstructor
-         * @param options Options that define how to animate between the specified tile layers. 
+         * @param options Options that define how to animate between the specified tile layers.
          */
         constructor(options?: IAnimatedTileLayerOptions);
 
@@ -1351,7 +1365,7 @@ declare module Microsoft.Maps {
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach. Supported events:
          * click, dblclick, maptypechanged, mousedown, mousemove, mouseout, mouseover, mouseup, mousewheel, rightclick, viewchange, viewchangeend, viewchangestart
-         * @param handler The callback function to handle the event when triggered. 
+         * @param handler The callback function to handle the event when triggered.
          * @returns The handler id.
          */
         export function addHandler(target: Map, eventName: string, handler: (eventArg?: IMouseEventArgs | IMapTypeChangeEventArgs) => void): IHandlerId;
@@ -1361,7 +1375,7 @@ declare module Microsoft.Maps {
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach. Supported Events:
          * changed, click, dblclick, drag, dragend, dragstart, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered. 
+         * @param handler The callback function to handle the event when triggered.
          * @returns The handler id.
          */
         export function addHandler(target: Pushpin, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): IHandlerId;
@@ -1371,7 +1385,7 @@ declare module Microsoft.Maps {
         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
         * @param eventName The type of event to attach. Supported Events:
         * changed, click, dblclick, mousedown, mouseout, mouseover, mouseup
-        * @param handler The callback function to handle the event when triggered. 
+        * @param handler The callback function to handle the event when triggered.
         * @returns The handler id.
         */
         export function addHandler(target: Polyline | Polygon, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): IHandlerId;
@@ -1381,7 +1395,7 @@ declare module Microsoft.Maps {
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach. Supported Events:
          * click, infoboxChanged, mouseenter, mouseleave
-         * @param handler The callback function to handle the event when triggered. 
+         * @param handler The callback function to handle the event when triggered.
          * @returns The handler id.
          */
         export function addHandler(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): IHandlerId;
@@ -1391,7 +1405,7 @@ declare module Microsoft.Maps {
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach. Supported Events:
          * click, dblclick, mousedown, mouseout, mouseover, mouseup, rightclick
-         * @param handler The callback function to handle the event when triggered. 
+         * @param handler The callback function to handle the event when triggered.
          * @returns The handler id.
          */
         export function addHandler(target: Layer, eventName: string, handler: (eventArg?: IMouseEventArgs) => void): IHandlerId;
@@ -1400,9 +1414,9 @@ declare module Microsoft.Maps {
         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
         * @param eventName The type of event to attach. Supported Events:
-        * • entityadded
-        * • entityremoved
-        * @param handler The callback function to handle the event when triggered. 
+        * � entityadded
+        * � entityremoved
+        * @param handler The callback function to handle the event when triggered.
         * @returns The handler id.
         */
         export function addHandler(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void): IHandlerId;
@@ -1411,7 +1425,7 @@ declare module Microsoft.Maps {
          * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach.
-         * @param handler The callback function to handle the event when triggered. 
+         * @param handler The callback function to handle the event when triggered.
          * @returns The handler id.
          */
         export function addHandler(target: any, eventName: string, handler: (eventArg?: any) => void): IHandlerId;
@@ -1452,7 +1466,7 @@ declare module Microsoft.Maps {
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach. Supported Events:
          * click, infoboxChanged, mouseenter, mouseleave
-         * @param handler The callback function to handle the event when triggered. 
+         * @param handler The callback function to handle the event when triggered.
          */
         export function addOne(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): void;
 
@@ -1469,8 +1483,8 @@ declare module Microsoft.Maps {
          * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach. Supported Events:
-         * • entityadded
-         * • entityremoved
+         * � entityadded
+         * � entityremoved
          * @param handler The callback function to handle the event when triggered.
          */
         export function addOne(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void): void;
@@ -1525,7 +1539,7 @@ declare module Microsoft.Maps {
         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
         * @param eventName The type of event to attach. Supported Events:
         * click, infoboxChanged, mouseenter, mouseleave
-        * @param handler The callback function to handle the event when triggered. 
+        * @param handler The callback function to handle the event when triggered.
         * @returns The handler id.
         */
         export function addThrottledHandler(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): IHandlerId;
@@ -1545,8 +1559,8 @@ declare module Microsoft.Maps {
          * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
          * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
          * @param eventName The type of event to attach. Supported Events:
-         * • entityadded
-         * • entityremoved
+         * � entityadded
+         * � entityremoved
          * @param handler The callback function to handle the event when triggered.
          * @param throttleInterval throttle interval (in ms)
          * @returns The handler id.
@@ -1569,7 +1583,7 @@ declare module Microsoft.Maps {
 
         /**
          * Checks if the target has any attached event handler.
-         * @param target The object to check if an event is attached to it. 
+         * @param target The object to check if an event is attached to it.
          * @param eventName The name of the event to check to see is attached.
          * @returns A boolean indicating if the specified event type is attached to the object.
          */
@@ -1650,7 +1664,7 @@ declare module Microsoft.Maps {
         public getHtmlContent(): string;
 
         /**
-        * Gets the location on the map where the infobox’s anchor is attached.
+        * Gets the location on the map where the infobox�s anchor is attached.
         * @returns The location of the infobox.
         */
         public getLocation(): Location;
@@ -1783,7 +1797,7 @@ declare module Microsoft.Maps {
 
         /**
         * Gets an array of shapes that are in the layer. This can be used to iterate over the individual shapes.
-        * @returns An array of shapes that are in the layer. 
+        * @returns An array of shapes that are in the layer.
         */
         public getPrimitives(): IPrimitive[];
 
@@ -1871,7 +1885,7 @@ declare module Microsoft.Maps {
         public remove(layer: ILayer): void;
 
         /**
-        * Removes a layer from the map at the specified index in the collection.        
+        * Removes a layer from the map at the specified index in the collection.
         * @param idx The index of the layer to remove.
         */
         public removeAt(idx: number): void;
@@ -2093,7 +2107,7 @@ declare module Microsoft.Maps {
         constructor(parentElement: string | HTMLElement, options: IMapLoadOptions);
 
 		/**
-		* Gets the streetside panorama information closest to the specified bounding box and returns using a success callback function. 
+		* Gets the streetside panorama information closest to the specified bounding box and returns using a success callback function.
 		* This information can then be used to set the map view to that streetside panorama.
 		*/
         public static getClosestPanorama(bounds: LocationRect, success: (panoramaInfo: IPanoramaInfo) => void, missingCoverage: () => void): void;
@@ -2336,7 +2350,7 @@ declare module Microsoft.Maps {
         /**
         * Decodes a collection of locations from a compressed string.
         * @param value Compressed string to decode.
-        * @returns An array of locations that have been decoded from the compressed string. 
+        * @returns An array of locations that have been decoded from the compressed string.
         */
         public static decode(value: string): Location[];
 
@@ -2632,7 +2646,7 @@ declare module Microsoft.Maps {
     }
 
     /**
-    * Used to represent the location of a map tile in the quadkey tile pyramid system used by the map. 
+    * Used to represent the location of a map tile in the quadkey tile pyramid system used by the map.
     * If using a tile source where the uriConstructor property is set to a callback function, that callback function will recieve
     * an instance of the PyramidTileId class.
     */
@@ -2674,7 +2688,7 @@ declare module Microsoft.Maps {
         public static areEqual(tileId1: PyramidTileId, tileId2: PyramidTileId): boolean;
 
         /**
-         * Generates a PyramidTileId from a quadkey tile id string. 
+         * Generates a PyramidTileId from a quadkey tile id string.
          * @param quadkey The quadkey tile id string to convert into a PyramidTileId object.
          * @param width The tile's width in pixels. Default value: 256
          * @param height The tile's height in pixels. Default value: 256
@@ -2685,7 +2699,7 @@ declare module Microsoft.Maps {
     /** Provides static functions for generating random test data. */
     export class TestDataGenerator {
         /**
-        * Generates a random hex or rgba color string. 
+        * Generates a random hex or rgba color string.
         * @param withAlpha A boolean indicating if the color should have an alpha value or not. if set to true, a rgba value will be returned with an alpha value of 0.5.
         * @returns A css color string, hex or rgba.
         */
diff --git a/types/bingmaps/tsconfig.json b/types/bingmaps/tsconfig.json
index ecb179959d..421876221b 100644
--- a/types/bingmaps/tsconfig.json
+++ b/types/bingmaps/tsconfig.json
@@ -19,6 +19,19 @@
     },
     "files": [
         "index.d.ts",
+        "Autosuggest.d.ts",
+        "Clustering.d.ts",
+        "Contour.d.ts",
+        "DataBinning.d.ts",
+        "Directions.d.ts",
+        "DrawingTools.d.ts",
+        "GeoJson.d.ts",
+        "HeatMapLayer.d.ts",
+        "Search.d.ts",
+        "SpatialDataService.d.ts",
+        "SpatialMath.d.ts",
+        "Traffic.d.ts",
+        "WellKnownText.d.ts",
         "bingmaps-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/bingmaps/tslint.json b/types/bingmaps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bingmaps/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bintrees/tslint.json b/types/bintrees/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bintrees/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bip21/tslint.json b/types/bip21/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bip21/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bip38/bip38-tests.ts b/types/bip38/bip38-tests.ts
new file mode 100644
index 0000000000..c48fc9597b
--- /dev/null
+++ b/types/bip38/bip38-tests.ts
@@ -0,0 +1,30 @@
+import * as bip38 from 'bip38';
+
+const myWifString = '5KN7MzqK5wt2TP1fQCYyHBtDrXdJuXbUzm4A9rKAteGu3Qi5CVR';
+
+// Result from wif.decode for testing
+const decoded = {
+    version: 48,
+    privateKey: Buffer.from('12345678901234567890123456789012'),
+    compressed: true
+};
+
+// Test encrypt without progressCallback
+const encryptedKey = bip38.encrypt(decoded.privateKey, decoded.compressed, 'TestingOneTwoThree');
+
+// Test encrypt with progressCallback
+bip38.encrypt(decoded.privateKey, decoded.compressed, 'TestingOneTwoThree', (status: bip38.ProgressStatus) => {
+    status.current;
+    status.total;
+    status.percent;
+});
+
+// Test decrypt without progressCallback
+const decryptedKey = bip38.decrypt(encryptedKey, 'TestingOneTwoThree');
+
+// Test decrypt with progressCallback
+bip38.decrypt(encryptedKey, 'TestingOneTwoThree', (status: bip38.ProgressStatus) => {
+    status.current;
+    status.total;
+    status.percent;
+});
diff --git a/types/bip38/index.d.ts b/types/bip38/index.d.ts
new file mode 100644
index 0000000000..8842c6a241
--- /dev/null
+++ b/types/bip38/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for bip38 2.0
+// Project: https://github.com/bitcoinjs/bip38
+// Definitions by: Satana Charuwichitratana <https://github.com/micksatana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+// Note: When there is @types/scryptsy, ProgressStatus and ScryptParams should be referred from the definition instead
+export interface ProgressStatus {
+    current: number;
+    total: number;
+    percent: number;
+}
+export interface ScryptParams {
+    N: number;
+    r: number;
+    p: number;
+}
+
+export function decrypt(string: string, passphrase: string,
+                        progressCallback?: (status: ProgressStatus) => void,
+                        scryptParams?: ScryptParams): { privateKey: Buffer, compressed: boolean };
+
+export function decryptECMult(buffer: Buffer, passphrase: string,
+                              progressCallback?: (status: ProgressStatus) => void,
+                              scryptParams?: ScryptParams): { privateKey: Buffer, compressed: boolean };
+
+export function decryptRaw(buffer: Buffer, passphrase: string,
+                           progressCallback?: (status: ProgressStatus) => void,
+                           scryptParams?: ScryptParams): { privateKey: Buffer, compressed: boolean };
+
+export function encrypt(buffer: Buffer, compressed: boolean, passphrase: string,
+                        progressCallback?: (status: ProgressStatus) => void,
+                        scryptParams?: ScryptParams): string;
+
+export function encryptRaw(buffer: Buffer, compressed: boolean, passphrase: string,
+                           progressCallback?: (status: ProgressStatus) => void,
+                           scryptParams?: ScryptParams): Buffer;
+
+export function verify(string: string): boolean;
diff --git a/types/bip38/tsconfig.json b/types/bip38/tsconfig.json
new file mode 100644
index 0000000000..6ce875b1d1
--- /dev/null
+++ b/types/bip38/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bip38-tests.ts"
+    ]
+}
diff --git a/types/bip38/tslint.json b/types/bip38/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/bip38/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/bip39/bip39-tests.ts b/types/bip39/bip39-tests.ts
new file mode 100644
index 0000000000..1ec9611bb8
--- /dev/null
+++ b/types/bip39/bip39-tests.ts
@@ -0,0 +1,14 @@
+import * as bip39 from 'bip39';
+
+// Test generate a random mnemonic
+const mnemonic: string = bip39.generateMnemonic();
+
+// Test generate a random mnemonic with strength
+bip39.generateMnemonic(64);
+
+// Test mnemonic to seed
+const seedHex: string = bip39.mnemonicToSeedHex('basket actual');
+const seed: Buffer = bip39.mnemonicToSeed('basket actual');
+
+// Test validation
+bip39.validateMnemonic(mnemonic);
diff --git a/types/bip39/index.d.ts b/types/bip39/index.d.ts
new file mode 100644
index 0000000000..a5d58cf961
--- /dev/null
+++ b/types/bip39/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for bip39 2.4
+// Project: https://github.com/bitcoinjs/bip39
+// Definitions by: Satana Charuwichitratana <https://github.com/micksatana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export const wordlists: {
+    EN: string[];
+    JA: string[];
+    chinese_simplified: string[];
+    chinese_traditional: string[];
+    english: string[];
+    french: string[];
+    italian: string[];
+    japanese: string[];
+    spanish: string[];
+};
+
+export function entropyToMnemonic(entropyHex: string, wordlist?: string[]): string;
+
+export function generateMnemonic(strength?: number, rng?: (size: number) => Buffer, wordlist?: string[]): string;
+
+export function mnemonicToEntropy(mnemonic: string, wordlist?: string[]): string;
+
+export function mnemonicToSeed(mnemonic: string, password?: string): Buffer;
+
+export function mnemonicToSeedHex(mnemonic: string, password?: string): string;
+
+export function validateMnemonic(mnemonic: string, wordlist?: string[]): boolean;
diff --git a/types/bip39/tsconfig.json b/types/bip39/tsconfig.json
new file mode 100644
index 0000000000..d44c1197ad
--- /dev/null
+++ b/types/bip39/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bip39-tests.ts"
+    ]
+}
diff --git a/types/bip39/tslint.json b/types/bip39/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/bip39/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/bit-array/tslint.json b/types/bit-array/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bit-array/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
index 868659e6b6..669c00d77a 100644
--- a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
+++ b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
@@ -1,62 +1,43 @@
 import bigi = require('bigi');
 import bitcoin = require('bitcoinjs-lib');
 
-declare const it: any;
-declare const describe: any;
-declare const assert: any;
+// For testing only
+function rng() {
+    return new Buffer('12345678901234567890123456789012');
+}
 
-describe('bitcoinjs-lib (basic)', () => {
-  it('can generate a random bitcoin address', () => {
-    // for testing only
-    function rng() { return new Buffer('zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'); }
+// Generate a random bitcoin address
+const keyPair1 = bitcoin.ECPair.makeRandom({rng});
+const address = keyPair1.getAddress();
+keyPair1.toWIF();
 
-    // generate random keyPair
-    const keyPair = bitcoin.ECPair.makeRandom({ rng });
-    const address = keyPair.getAddress();
+// Generate an address from a SHA256 hash
+const hash = bitcoin.crypto.sha256(Buffer.from('correct horse battery staple', 'utf8'));
+const d = bigi.fromBuffer(hash);
+const keyPair2 = new bitcoin.ECPair(d);
 
-    assert.strictEqual(address, '1F5VhMHukdnUES9kfXqzPzMeF1GPHKiF64');
-  });
+// Generate a random keypair for alternative networks
+const keyPair3 = bitcoin.ECPair.makeRandom({network: bitcoin.networks.litecoin, rng});
+keyPair3.toWIF();
+keyPair3.getAddress();
+const network = keyPair3.getNetwork();
 
-  it('can generate an address from a SHA256 hash', () => {
-    const hash = bitcoin.crypto.sha256(Buffer.from('correct horse battery staple', 'utf8'));
-    const d = bigi.fromBuffer(hash);
+// Test TransactionBuilder and Transaction
+const txb = new bitcoin.TransactionBuilder();
+txb.addInput('aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31', 0);
+txb.addOutput(Buffer.from('1Gokm82v6DmtwKEB8AiVhm82hyFSsEvBDK', 'utf8'), 15000);
+txb.sign(0, keyPair1);
+const tx = txb.build();
+tx.toHex();
+tx.hasWitnesses();
+tx.hashForWitnessV0(1, new Buffer('12345678901234567890123456789012'), 2, 3);
 
-    const keyPair = new bitcoin.ECPair(d);
-    const address = keyPair.getAddress();
-
-    assert.strictEqual(address, '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8');
-  });
-
-  it('can generate a random keypair for alternative networks', () => {
-    // for testing only
-    function rng() { return new Buffer('zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'); }
-
-    const litecoin = bitcoin.networks.litecoin;
-
-    const keyPair = bitcoin.ECPair.makeRandom({ network: litecoin, rng });
-    const wif = keyPair.toWIF();
-    const address = keyPair.getAddress();
-
-    assert.strictEqual(address, 'LZJSxZbjqJ2XVEquqfqHg1RQTDdfST5PTn');
-    assert.strictEqual(wif, 'T7A4PUSgTDHecBxW1ZiYFrDNRih2o7M8Gf9xpoCgudPF9gDiNvuS');
-  });
-
-  it('can import an address via WIF', () => {
-    const keyPair = bitcoin.ECPair.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct', bitcoin.networks.testnet);
-    const address = keyPair.getAddress();
-
-    assert.strictEqual(address, '19AAjaTUbRjQCMuVczepkoPswiZRhjtg31');
-  });
-
-  it('can create a Transaction', () => {
-    const keyPair = bitcoin.ECPair.fromWIF('L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy', bitcoin.networks.testnet);
-    const tx = new bitcoin.TransactionBuilder();
-
-    tx.addInput('aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31', 0);
-    tx.addOutput(Buffer.from('1Gokm82v6DmtwKEB8AiVhm82hyFSsEvBDK', 'utf8'), 15000);
-    tx.sign(0, keyPair);
-
-    // tslint:disable-next-line:max-line-length
-    assert.strictEqual(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006b483045022100aefbcf847900b01dd3e3debe054d3b6d03d715d50aea8525f5ea3396f168a1fb022013d181d05b15b90111808b22ef4f9ebe701caf2ab48db269691fdf4e9048f4f60121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000');
-  });
-});
+// Test functions in address
+const rsBase58Check = bitcoin.address.fromBase58Check(address);
+const rsBech32 = bitcoin.address.fromBech32(address);
+const rsOutputScript = bitcoin.address.fromOutputScript(new Buffer('12345678901234567890123456789012'));
+const rsOutputScriptWithNetwork = bitcoin.address.fromOutputScript(new Buffer('12345678901234567890123456789012'), network);
+bitcoin.address.toBase58Check(rsBase58Check.hash, rsBase58Check.version);
+bitcoin.address.toBech32(rsBech32.data, rsBech32.version, rsBech32.prefix);
+bitcoin.address.toOutputScript(address);
+bitcoin.address.toOutputScript(address, network);
diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index 796758715d..c7d1acc899 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -1,21 +1,24 @@
-// Type definitions for bitcoinjs-lib 3.0
+// Type definitions for bitcoinjs-lib 3.3
 // Project: https://github.com/bitcoinjs/bitcoinjs-lib
 // Definitions by:  Mohamed Hegazy <https://github.com/mhegazy>
 //                  Daniel <https://github.com/dlebrecht>
 //                  Ron Buckton <https://github.com/rbuckton>
+//                  Satana Charuwichitratana <https://github.com/micksatana>
+//                  Youssef GHOUBACH <https://github.com/youssefgh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Declaration file initially generated by dts-gen for bitcoinjs-lib 3.0.3
 // based on the flow version found at https://github.com/flowtype/flow-typed/blob/master/definitions/npm/bitcoinjs-lib_v2.x.x/flow_v0.17.x-/bitcoinjs-lib_v2.x.x.js
 
 /// <reference types="node" />
-import BigInteger = require("bigi");
 
-export interface Output {
+import BigInteger = require('bigi');
+
+export interface Out {
     script: Buffer;
     value: number;
 }
 
-export interface Input {
+export interface In {
     script: Buffer;
     hash: Buffer;
     index: number;
@@ -62,10 +65,12 @@ export class Block {
 }
 
 export class ECPair {
-    constructor(d: BigInteger, Q?: null | undefined, options?: { compressed?: boolean, network?: Network });
+    constructor(d: BigInteger, Q?: null, options?: { compressed?: boolean, network?: Network });
 
     constructor(d: null | undefined, Q: any, options?: { compressed?: boolean, network?: Network }); // Q should be ECPoint, but not sure how to define such type
 
+    d: BigInteger;
+
     getAddress(): string;
 
     getNetwork(): Network;
@@ -150,8 +155,8 @@ export class HDNode {
 export class Transaction {
     version: number;
     locktime: number;
-    ins: Input[];
-    outs: Output[];
+    ins: In[];
+    outs: Out[];
     constructor();
 
     addInput(hash: Buffer, index: number, sequence?: number, scriptSig?: Buffer): number;
@@ -166,22 +171,32 @@ export class Transaction {
 
     getId(): string;
 
+    /** @since 3.0.0 */
     hasWitnesses(): boolean;
 
     hashForSignature(inIndex: number, prevOutScript: Buffer, hashType: number): Buffer;
 
+    /** @since 3.0.0 */
     hashForWitnessV0(inIndex: number, prevOutScript: Buffer, value: number, hashType: number): Buffer;
 
     isCoinbase(): boolean;
 
     setInputScript(index: number, scriptSig: Buffer): void;
 
+    /** @since 3.0.0 */
     setWitness(index: number, witness: any, ...args: any[]): void;
 
+    /** @since 3.0.0 */
     toBuffer(buffer?: Buffer, initialOffset?: number): Buffer;
 
     toHex(): string;
 
+    /** @since 3.1.0 */
+    virtualSize(): number;
+
+    /** @since 3.1.0 */
+    weight(): number;
+
     static ADVANCED_TRANSACTION_FLAG: number;
 
     static ADVANCED_TRANSACTION_MARKER: number;
@@ -203,21 +218,25 @@ export class Transaction {
     static isCoinbaseHash(buffer: Buffer): boolean;
 }
 
+export interface Input {
+    pubKeys: Buffer[];
+    signatures: Buffer[];
+    prevOutScript: Buffer;
+    prevOutType: string;
+    signType: string;
+    signScript: Buffer;
+    witness: boolean;
+}
+
 export class TransactionBuilder {
     tx: Transaction;
-    inputs: Array<{ pubKeys: Buffer[],
-                   signatures: Buffer[],
-                   prevOutScript: Buffer,
-                   prevOutType: string,
-                   signType: string,
-                   signScript: Buffer,
-                   witness: boolean} >;
+    inputs: Input[];
 
     constructor(network?: Network, maximumFeeRate?: number);
 
     addInput(txhash: Buffer | string | Transaction, vout: number, sequence?: number, prevOutScript?: Buffer): number;
 
-    addOutput(scriptPubKey: Buffer, value: number): number;
+    addOutput(scriptPubKey: Buffer | string, value: number): number;
 
     build(): Transaction;
 
@@ -227,6 +246,7 @@ export class TransactionBuilder {
 
     setVersion(version: number): void;
 
+    /** @since 3.0.0 */
     sign(vin: number, keyPair: ECPair, redeemScript?: Buffer, hashType?: number, witnessValue?: number, witnessScript?: Buffer): void;
 
     static fromTransaction(transaction: Transaction, network: Network): TransactionBuilder;
@@ -361,10 +381,16 @@ export const opcodes: {
 export namespace address {
     function fromBase58Check(address: string): { hash: Buffer, version: number };
 
-    function fromOutputScript(outputScript: Buffer, network?: Network): Buffer;
+    /** @since 3.2.0 */
+    function fromBech32(address: string): { data: Buffer, prefix: string, version: number };
+
+    function fromOutputScript(outputScript: Buffer, network?: Network): string;
 
     function toBase58Check(hash: Buffer, version: number): string;
 
+    /** @since 3.2.0 */
+    function toBech32(data: Buffer, version: number, prefix: string): string;
+
     function toOutputScript(address: string, network?: Network): Buffer;
 }
 
@@ -535,7 +561,7 @@ export namespace script {
         output: {
             check(script: Buffer): boolean;
             decode(buffer: Buffer): Buffer;
-            encode(data: Buffer[]): Buffer;
+            encode(data: Buffer): Buffer;
         };
     };
 }
diff --git a/types/bitcoinjs-lib/tslint.json b/types/bitcoinjs-lib/tslint.json
index 3db14f85ea..f93cf8562a 100644
--- a/types/bitcoinjs-lib/tslint.json
+++ b/types/bitcoinjs-lib/tslint.json
@@ -1 +1,3 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/bitwise-xor/tslint.json b/types/bitwise-xor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bitwise-xor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bl/tslint.json b/types/bl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/blazy/tslint.json b/types/blazy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/blazy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/blessed/blessed-tests.ts b/types/blessed/blessed-tests.ts
index b143703b18..c5f857146f 100644
--- a/types/blessed/blessed-tests.ts
+++ b/types/blessed/blessed-tests.ts
@@ -1,150 +1,138 @@
-import * as blessed from 'blessed'
+import * as blessed from "blessed";
+import { readFileSync } from "fs";
 
 let screen: blessed.Widgets.Screen = null;
 
 // https://github.com/chjj/blessed/blob/master/test/widget-autopad.js
 
 screen = blessed.screen({
-  dump: __dirname + '/logs/autopad.log',
+  dump: __dirname + "/logs/autopad.log",
   smartCSR: true,
   autoPadding: true,
   warnings: true
 });
 
-var box1 = blessed.box({
+const box1 = blessed.box({
   parent: screen,
-  top: 'center',
-  left: 'center',
+  top: "center",
+  left: "center",
   width: 20,
   height: 10,
-  border: 'line'
+  border: "line"
 });
 
-var box2 = blessed.box({
+const box2 = blessed.box({
   parent: box1,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line'
+  border: "line"
 });
 
-screen.key('q', function() {
-  return screen.destroy();
-});
+screen.key("q", () => screen.destroy());
 
 screen.render();
 
 // https://github.com/chjj/blessed/blob/master/test/widget-bigtext.js
 
 screen = blessed.screen({
-  dump: __dirname + '/logs/bigtext.log',
+  dump: __dirname + "/logs/bigtext.log",
   smartCSR: true,
   warnings: true
 });
 
-var box = blessed.bigtext({
+const box3 = blessed.bigtext({
   parent: screen,
-  content: 'Hello',
+  content: "Hello",
   shrink: true,
-  width: '80%',
+  width: "80%",
   // height: '80%',
-  height: 'shrink',
+  height: "shrink",
   // width: 'shrink',
-  border: 'line',
-  fch: ' ',
-  ch: '\u2592',
+  border: "line",
+  fch: " ",
+  ch: "\u2592",
   style: {
-    fg: 'red',
-    bg: 'blue',
+    fg: "red",
+    bg: "blue",
     bold: false
   }
 });
 
-screen.key('q', function() {
-  return screen.destroy();
-});
+screen.key("q", () => screen.destroy());
 
 screen.render();
 
 // https://github.com/chjj/blessed/blob/master/test/widget-csr.js
 
 screen = blessed.screen({
-  dump: __dirname + '/logs/csr.log',
+  dump: __dirname + "/logs/csr.log",
   smartCSR: true,
   warnings: true
 });
+const lorem = readFileSync(__dirname + "/git.diff", "utf8");
 
-var lorem = require('fs').readFileSync(__dirname + '/git.diff', 'utf8');
-
-var cleanSides = screen.cleanSides;
+const cleanSides = screen.cleanSides;
 function expectClean(value: any) {
-  screen.cleanSides = function(el: blessed.widget.Element) {
-    var ret = cleanSides.apply(this, arguments);
+  screen.cleanSides = function(el: blessed.Widgets.BlessedElement) {
+    const ret = cleanSides.apply(this, arguments);
     if (ret !== value) {
-      throw new Error('Failed. Expected '
-        + value + ' from cleanSides. Got '
-        + ret + '.');
+      throw new Error(`Failed. Expected ${value} from cleanSides. Got ${ret}.`);
     }
     return ret;
   };
 }
-var btext = blessed.box({
+const btext = blessed.box({
   parent: screen,
-  left: 'center',
-  top: 'center',
-  width: '80%',
-  height: '80%',
+  left: "center",
+  top: "center",
+  width: "80%",
+  height: "80%",
   style: {
-    bg: 'green'
+    bg: "green"
   },
-  border: 'line',
-  content: 'CSR should still work.'
+  border: "line",
+  content: "CSR should still work."
 });
-let _oscroll = btext.scroll;
-btext.scroll = function(offset, always) {
+btext.scroll = (offset, always) => {
   expectClean(true);
-  return _oscroll(offset, always);
 };
 
-var text = blessed.scrollabletext({
+const text = blessed.scrollabletext({
   parent: screen,
   content: lorem,
-  border: 'line',
-  left: 'center',
-  top: 'center',
+  border: "line",
+  left: "center",
+  top: "center",
   draggable: true,
-  width: '50%',
-  height: '50%',
+  width: "50%",
+  height: "50%",
   mouse: true,
   keys: true,
   vi: true
 });
 
-_oscroll = text.scroll;
 text.scroll = function(offset, always) {
-  var el = this;
-  var value = true;
+  const el = this;
+  let value = true;
   if (el.left < 0) value = true;
   if (el.top < 0) value = false;
   if (el.left + el.width > screen.width) value = true;
   if (el.top + el.height > screen.height) value = false;
   expectClean(value);
-  return _oscroll(offset, always);
 };
 
 text.focus();
 
-screen.key('q', function() {
-  return screen.destroy();
-});
+screen.key("q", () => screen.destroy());
 
 screen.render();
 
 // https://github.com/chjj/blessed/blob/master/test/widget-dock-noborder.js
 
 screen = blessed.screen({
-  dump: __dirname + '/logs/dock.log',
+  dump: __dirname + "/logs/dock.log",
   smartCSR: true,
   dockBorders: true,
   warnings: true
@@ -154,85 +142,85 @@ blessed.box({
   parent: screen,
   left: -1,
   top: -1,
-  width: '50%+1',
-  height: '50%+1',
-  border: 'line',
-  content: 'Foo'
+  width: "50%+1",
+  height: "50%+1",
+  border: "line",
+  content: "Foo"
 });
 
 blessed.box({
   parent: screen,
-  left: '50%-1',
+  left: "50%-1",
   top: -1,
-  width: '50%+3',
-  height: '50%+1',
-  content: 'Bar',
-  border: 'line'
+  width: "50%+3",
+  height: "50%+1",
+  content: "Bar",
+  border: "line"
 });
 
 blessed.box({
   parent: screen,
   left: -1,
-  top: '50%-1',
-  width: '50%+1',
-  height: '50%+3',
-  border: 'line',
-  content: 'Foo'
+  top: "50%-1",
+  width: "50%+1",
+  height: "50%+3",
+  border: "line",
+  content: "Foo"
 });
 
-blessed.listtable({
-  parent: screen,
-  left: '50%-1',
-  top: '50%-1',
-  width: '50%+3',
-  height: '50%+3',
-  border: 'line',
-  align: 'center',
-  tags: true,
-  keys: true,
-  vi: true,
-  mouse: true,
-  style: {
-    header: {
-      fg: 'blue',
-      bold: true
-    },
-    cell: {
-      fg: 'magenta',
-      selected: {
-        bg: 'blue'
+blessed
+  .listtable({
+    parent: screen,
+    left: "50%-1",
+    top: "50%-1",
+    width: "50%+3",
+    height: "50%+3",
+    border: "line",
+    align: "center",
+    tags: true,
+    keys: true,
+    vi: true,
+    mouse: true,
+    style: {
+      header: {
+        fg: "blue",
+        bold: true
+      },
+      cell: {
+        fg: "magenta",
+        selected: {
+          bg: "blue"
+        }
       }
-    }
-  },
-  data: [
-    [ 'Animals',  'Foods',  'Times',   'Numbers' ],
-    [ 'Elephant', 'Apple',  '1:00am',  'One'     ],
-    [ 'Bird',     'Orange', '2:15pm',  'Two'     ],
-    [ 'T-Rex',    'Taco',   '8:45am',  'Three'   ],
-    [ 'Mouse',    'Cheese', '9:05am',  'Four'    ]
-  ]
-}).focus();
+    },
+    data: [
+      ["Animals", "Foods", "Times", "Numbers"],
+      ["Elephant", "Apple", "1:00am", "One"],
+      ["Bird", "Orange", "2:15pm", "Two"],
+      ["T-Rex", "Taco", "8:45am", "Three"],
+      ["Mouse", "Cheese", "9:05am", "Four"]
+    ]
+  })
+  .focus();
 
-screen.key('q', function() {
-  return screen.destroy();
-});
+screen.key("q", () => screen.destroy());
 
 screen.render();
 
 // https://raw.githubusercontent.com/chjj/blessed/master/example/simple-form.js
 
-var form = blessed.form({
+const form = blessed.form({
   parent: screen,
   keys: true,
   left: 0,
   top: 0,
   width: 30,
   height: 4,
-  bg: 'green',
-  content: 'Submit or cancel?'
+  bg: "green",
+  content: "Submit or cancel?"
 });
 
-var submit = blessed.button({
+const submit = blessed.button({
   parent: form,
   mouse: true,
   keys: true,
@@ -243,20 +231,20 @@ var submit = blessed.button({
   left: 10,
   top: 2,
   shrink: true,
-  name: 'submit',
-  content: 'submit',
+  name: "submit",
+  content: "submit",
   style: {
-    bg: 'blue',
+    bg: "blue",
     focus: {
-      bg: 'red'
+      bg: "red"
     },
     hover: {
-      bg: 'red'
+      bg: "red"
     }
   }
 });
 
-var cancel = blessed.button({
+const cancel = blessed.button({
   parent: form,
   mouse: true,
   keys: true,
@@ -267,15 +255,15 @@ var cancel = blessed.button({
   left: 20,
   top: 2,
   shrink: true,
-  name: 'cancel',
-  content: 'cancel',
+  name: "cancel",
+  content: "cancel",
   style: {
-    bg: 'blue',
+    bg: "blue",
     focus: {
-      bg: 'red'
+      bg: "red"
     },
     hover: {
-      bg: 'red'
+      bg: "red"
     }
   }
 });
@@ -283,314 +271,306 @@ var cancel = blessed.button({
 // https://github.com/chjj/blessed/blob/master/test/widget-layout.js
 
 screen = blessed.screen({
-  dump: __dirname + '/logs/layout.log',
+  dump: __dirname + "/logs/layout.log",
   smartCSR: true,
   autoPadding: true,
   warnings: true
 });
 
-var layout = blessed.layout({
+const layout = blessed.layout({
   parent: screen,
-  top: 'center',
-  left: 'center',
-  width: '50%',
-  height: '50%',
-  border: 'line',
-  layout: process.argv[2] === 'grid' ? 'grid' : 'inline',
+  top: "center",
+  left: "center",
+  width: "50%",
+  height: "50%",
+  border: "line",
+  layout: process.argv[2] === "grid" ? "grid" : "inline",
   style: {
-    bg: 'red',
+    bg: "red",
     border: {
-      fg: 'blue'
+      fg: "blue"
     }
   }
 });
 
-var box1 = blessed.box({
+blessed.box({
   parent: layout,
-  top: 'center',
-  left: 'center',
+  top: "center",
+  left: "center",
   width: 20,
   height: 10,
-  border: 'line',
-  content: '1'
+  border: "line",
+  content: "1"
 });
 
-var box2 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '2'
+  border: "line",
+  content: "2"
 });
 
-var box3 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '3'
+  border: "line",
+  content: "3"
 });
 
-var box4 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '4'
+  border: "line",
+  content: "4"
 });
 
-var box5 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '5'
+  border: "line",
+  content: "5"
 });
 
-var box6 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '6'
+  border: "line",
+  content: "6"
 });
 
-var box7 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '7'
+  border: "line",
+  content: "7"
 });
 
-var box8 = blessed.box({
+blessed.box({
   parent: layout,
-  top: 'center',
-  left: 'center',
+  top: "center",
+  left: "center",
   width: 20,
   height: 10,
-  border: 'line',
-  content: '8'
+  border: "line",
+  content: "8"
 });
 
-var box9 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '9'
+  border: "line",
+  content: "9"
 });
 
-var box10 = blessed.box({
+blessed.box({
   parent: layout,
-  top: 'center',
-  left: 'center',
+  top: "center",
+  left: "center",
   width: 20,
   height: 10,
-  border: 'line',
-  content: '10'
+  border: "line",
+  content: "10"
 });
 
-var box11 = blessed.box({
+blessed.box({
   parent: layout,
   top: 0,
   left: 0,
   width: 10,
   height: 5,
-  border: 'line',
-  content: '11'
+  border: "line",
+  content: "11"
 });
 
-var box12 = blessed.box({
+const box12 = blessed.box({
   parent: layout,
-  top: 'center',
-  left: 'center',
+  top: "center",
+  left: "center",
   width: 20,
   height: 10,
-  border: 'line',
-  content: '12'
+  border: "line",
+  content: "12"
 });
 
-if (process.argv[2] !== 'grid') {
-  for (var i = 0; i < 10; i++) {
+if (process.argv[2] !== "grid") {
+  for (let i = 0; i < 10; i++) {
     blessed.box({
       parent: layout,
       // width: i % 2 === 0 ? 10 : 20,
       // height: i % 2 === 0 ? 5 : 10,
       width: Math.random() > 0.5 ? 10 : 20,
       height: Math.random() > 0.5 ? 5 : 10,
-      border: 'line',
-      content: (i + 1 + 12) + ''
+      border: "line",
+      content: String(i + 1 + 12)
     });
   }
 }
 
-screen.key('q', function() {
-  return screen.destroy();
-});
+screen.key("q", () => screen.destroy());
 
 screen.render();
 
 // https://github.com/chjj/blessed/blob/master/test/widget-form.js
 
 screen = blessed.screen({
-  dump: __dirname + '/logs/form.log',
+  dump: __dirname + "/logs/form.log",
   warnings: true
 });
 
-type FormData = {
-    radio1: boolean;
-    radio2: boolean;
-    text: string;
-    check: boolean;
-};
+interface FormData {
+  radio1: boolean;
+  radio2: boolean;
+  text: string;
+  check: boolean;
+}
 
-var form2 = blessed.form<FormData>({
+const form2 = blessed.form<FormData>({
   parent: screen,
   mouse: true,
   keys: true,
   vi: true,
   left: 0,
   top: 0,
-  width: '100%',
-  //height: 12,
+  width: "100%",
   style: {
-    bg: 'green',
+    bg: "green",
     border: {
-       inverse: true
+      inverse: true
     },
     scrollbar: {
       inverse: true
     }
   },
-  content: 'foobar',
+  content: "foobar",
   scrollable: true,
   scrollbar: {
-    ch: ' '
+    ch: " "
   }
-  //alwaysScroll: true
 });
 
-form2.on('submit', (data) => {
+form2.on("submit", data => {
   output.setContent(JSON.stringify(data, null, 2));
   screen.render();
 });
 
-form2.key('d', function() {
+form2.key("d", () => {
   form2.scroll(1, true);
   screen.render();
 });
 
-form2.key('u', function() {
+form2.key("u", () => {
   form2.scroll(-1, true);
   screen.render();
 });
 
-var set = blessed.radioset({
+const set = blessed.radioset({
   parent: form2,
   left: 1,
   top: 1,
   shrink: true,
-  //padding: 1,
-  //content: 'f',
   style: {
-    bg: 'magenta'
+    bg: "magenta"
   }
 });
 
-var radio1 = blessed.radiobutton({
+const radio1 = blessed.radiobutton({
   parent: set,
   mouse: true,
   keys: true,
   shrink: true,
   style: {
-    bg: 'magenta'
+    bg: "magenta"
   },
   height: 1,
   left: 0,
   top: 0,
-  name: 'radio1',
-  content: 'radio1'
+  name: "radio1",
+  content: "radio1"
 });
 
-var radio2 = blessed.radiobutton({
+const radio2 = blessed.radiobutton({
   parent: set,
   mouse: true,
   keys: true,
   shrink: true,
   style: {
-    bg: 'magenta'
+    bg: "magenta"
   },
   height: 1,
   left: 15,
   top: 0,
-  name: 'radio2',
-  content: 'radio2'
+  name: "radio2",
+  content: "radio2"
 });
 
-var text2 = blessed.textbox({
+const text2 = blessed.textbox({
   parent: form2,
   mouse: true,
   keys: true,
   style: {
-    bg: 'blue'
+    bg: "blue"
   },
   height: 1,
   width: 20,
   left: 1,
   top: 3,
-  name: 'text'
+  name: "text"
 });
 
-text2.on('focus', function() {
-  text2.readInput();
-});
+text2.on("focus", () => text2.readInput());
 
-var check = blessed.checkbox({
+const check = blessed.checkbox({
   parent: form2,
   mouse: true,
   keys: true,
   shrink: true,
   style: {
-    bg: 'magenta'
+    bg: "magenta"
   },
   height: 1,
   left: 28,
   top: 1,
-  name: 'check',
-  content: 'check'
+  name: "check",
+  content: "check"
 });
 
-var check2 = blessed.checkbox({
+const check2 = blessed.checkbox({
   parent: form2,
   mouse: true,
   keys: true,
   shrink: true,
   style: {
-    bg: 'magenta'
+    bg: "magenta"
   },
   height: 1,
   left: 28,
   top: 14,
-  name: 'foooooooo2',
-  content: 'foooooooo2'
+  name: "foooooooo2",
+  content: "foooooooo2"
 });
 
-var submit = blessed.button({
+const submit2 = blessed.button({
   parent: form2,
   mouse: true,
   keys: true,
@@ -601,69 +581,67 @@ var submit = blessed.button({
   },
   left: 29,
   top: 3,
-  name: 'submit',
-  content: 'submit',
+  name: "submit",
+  content: "submit",
   style: {
-    bg: 'blue',
+    bg: "blue",
     focus: {
-      bg: 'red'
+      bg: "red"
     }
   }
 });
 
-submit.on('press', function() {
-  form2.submit();
-});
+submit.on("press", () => form2.submit());
 
-var box1 = blessed.box({
+const box5 = blessed.box({
   parent: form2,
   left: 1,
   top: 10,
   height: 10,
   width: 10,
-  content: 'one',
+  content: "one",
   style: {
-    bg: 'cyan'
+    bg: "cyan"
   }
 });
 
-var box2 = blessed.box({
-  parent: box1,
+const box6 = blessed.box({
+  parent: box5,
   left: 1,
   top: 2,
   height: 8,
   width: 9,
-  content: 'two',
+  content: "two",
   style: {
-    bg: 'magenta'
+    bg: "magenta"
   }
 });
 
-var box3 = blessed.box({
-  parent: box2,
+const box7 = blessed.box({
+  parent: box6,
   left: 1,
   top: 2,
   height: 6,
   width: 8,
-  content: 'three',
+  content: "three",
   style: {
-    bg: 'yellow'
+    bg: "yellow"
   }
 });
 
-var box4 = blessed.box({
-  parent: box3,
+blessed.box({
+  parent: box7,
   left: 1,
   top: 2,
   height: 4,
   width: 7,
-  content: 'four',
+  content: "four",
   style: {
-    bg: 'blue'
+    bg: "blue"
   }
 });
 
-var output = blessed.scrollabletext({
+const output = blessed.scrollabletext({
   parent: form2,
   mouse: true,
   keys: true,
@@ -672,26 +650,24 @@ var output = blessed.scrollabletext({
   height: 5,
   right: 0,
   style: {
-    bg: 'red'
+    bg: "red"
   },
-  content: 'foobar'
+  content: "foobar"
 });
 
-var bottom = blessed.line({
+const bottom = blessed.line({
   parent: form2,
-  type: 'line',
-  orientation: 'horizontal',
+  type: "line",
+  orientation: "horizontal",
   left: 0,
   right: 0,
   top: 50,
   style: {
-    fg: 'blue'
+    fg: "blue"
   }
 });
 
-screen.key('q', function() {
-  return screen.destroy();
-});
+screen.key("q", () => screen.destroy());
 
 form2.focus();
 
@@ -702,70 +678,68 @@ screen.render();
 // https://github.com/chjj/blessed/blob/master/test/widget-table.js
 
 screen = blessed.screen({
-  dump: __dirname + '/logs/table.log',
+  dump: __dirname + "/logs/table.log",
   autoPadding: false,
   fullUnicode: true,
   warnings: true
 });
 
-var DU = '�';
-var JUAN = '鹃';
+const DU = "�";
+const JUAN = "鹃";
 
-var table = blessed.table({
-  //parent: screen,
-  top: 'center',
-  left: 'center',
+const table = blessed.table({
+  // parent: screen,
+  top: "center",
+  left: "center",
   data: null,
-  border: 'line',
-  align: 'center',
+  border: "line",
+  align: "center",
   tags: true,
-  //width: '80%',
-  width: 'shrink',
+  // width: '80%',
+  width: "shrink",
   style: {
     border: {
-      fg: 'red'
+      fg: "red"
     },
     header: {
-      fg: 'blue',
+      fg: "blue",
       bold: true
     },
     cell: {
-      fg: 'magenta'
+      fg: "magenta"
     }
   }
 });
 
-var data1 = [
-  [ 'Animals',  'Foods',  'Times'  ],
-  [ 'Elephant', 'Apple',  '1:00am' ],
-  [ 'Bird',     'Orange', '2:15pm' ],
-  [ 'T-Rex',    'Taco',   '8:45am' ],
-  [ 'Mouse',    'Cheese', '9:05am' ]
+const data1 = [
+  ["Animals", "Foods", "Times"],
+  ["Elephant", "Apple", "1:00am"],
+  ["Bird", "Orange", "2:15pm"],
+  ["T-Rex", "Taco", "8:45am"],
+  ["Mouse", "Cheese", "9:05am"]
 ];
 
-data1[1][0] = '{red-fg}' + data1[1][0] + '{/red-fg}';
-data1[2][0] += ' (' + DU + JUAN + ')';
+data1[1][0] = `{red-fg} ${data1[1][0]} {/red-fg}`;
+data1[2][0] += ` (${DU}${JUAN})`;
 
-var data2 = [
-  [ 'Animals',  'Foods',  'Times',   'Numbers' ],
-  [ 'Elephant', 'Apple',  '1:00am',  'One'     ],
-  [ 'Bird',     'Orange', '2:15pm',  'Two'     ],
-  [ 'T-Rex',    'Taco',   '8:45am',  'Three'   ],
-  [ 'Mouse',    'Cheese', '9:05am',  'Four'    ]
+const data2 = [
+  ["Animals", "Foods", "Times", "Numbers"],
+  ["Elephant", "Apple", "1:00am", "One"],
+  ["Bird", "Orange", "2:15pm", "Two"],
+  ["T-Rex", "Taco", "8:45am", "Three"],
+  ["Mouse", "Cheese", "9:05am", "Four"]
 ];
 
-data2[1][0] = '{red-fg}' + data2[1][0] + '{/red-fg}';
-data2[2][0] += ' (' + DU + JUAN + ')';
+data2[1][0] = `{red-fg} ${data2[1][0]} {/red-fg}`;
+data2[2][0] += ` (${DU}${JUAN})`;
 
-screen.key('q', function() {
-  return screen.destroy();
-});
+screen.key("q", () => screen.destroy());
 
 table.setData(data2);
 screen.append(table);
 screen.render();
 
-setTimeout(function() {
+setTimeout(() => {
   table.setData(data1);
   screen.render();
 }, 3000);
diff --git a/types/blessed/index.d.ts b/types/blessed/index.d.ts
index abbc31d295..9098648240 100644
--- a/types/blessed/index.d.ts
+++ b/types/blessed/index.d.ts
@@ -1,2836 +1,3033 @@
-// Type definitions for blessed 0.1.5
+// Type definitions for blessed 0.1
 // Project: https://github.com/chjj/blessed
-// Definitions by: bryn austin bellomy <https://github.com/brynbellomy>
+// Definitions by: Bryn Austin Bellomy <https://github.com/brynbellomy>, Steve Kellock <https://github.com/skellock>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.1
 
-///<reference types="node"/>
+/// <reference types="node" />
 
-import { EventEmitter } from 'events';
+import { EventEmitter } from "events";
 import * as stream from "stream";
 import * as child_process from "child_process";
 
-declare namespace Blessed {
-    export class BlessedProgram {
-        hideCursor: () => void;
-        move: any;
-        showCursor: any;
-    }
+export class BlessedProgram {
+    hideCursor: () => void;
+    move: any;
+    showCursor: any;
+}
 
-    export module Widgets {
+export namespace Widgets {
+    namespace Types {
+        type TTopLeft = string | number | "center";
 
-        export module Types {
+        type TPosition = string | number;
 
-            export type TTopLeft = string | number | "center";
+        type TMouseAction = "mousedown" | "mouseup" | "mousemove";
 
-            export type TPosition = string | number;
-
-            export type TMouseAction = "mousedown" | "mouseup" | "mousemove";
-
-            export type TStyle = {
-                type?: string;
-                bg?: string;
-                fg?: string;
-                ch?: string;
-                bold?: boolean;
-                underline?: boolean;
-                blink?: boolean;
-                inverse?: boolean;
-                invisible?: boolean;
-                transparent?: boolean;
-                border?: "line" | "bg" | TBorder;
-                hover?: boolean;
-                focus?: boolean;
-                label?: string;
-                track?: {bg?: string; fg?: string;};
-                scrollbar?: {bg?: string; fg?: string;};
-            }
-
-            export type TBorder = {
-                /**
-                 * Type of border (line or bg). bg by default.
-                */
-                type?: "line" | "bg";
-                /**
-                 * Character to use if bg type, default is space.
-                */
-                ch?: string;
-                /**
-                 * Border foreground and background, must be numbers (-1 for default).
-                */
-                bg?: number;
-                fg?: number;
-                /**
-                 * Border attributes.
-                */
-                bold?: string;
-                underline?: string;
-            }
-
-            export type TCursor = {
-                /**
-                 * Have blessed draw a custom cursor and hide the terminal cursor (experimental).
-                */
-                artificial: boolean;
-                /**
-                 * Shape of the cursor. Can be: block, underline, or line.
-                */
-                shape: boolean;
-                /**
-                 * Whether the cursor blinks.
-                */
-                blink: boolean;
-                /**
-                 * Color of the color. Accepts any valid color value (null is default).
-                */
-                color: string;
-            }
-
-            export type TAlign = "left" | "center" | "right";
-
-            export type ListbarCommand = {
-                key: string;
-                callback: () => void;
-            };
-
-            export type TImage = {
-                /**
-                 * Pixel width.
-                */
-                width: number;
-                /**
-                 * Pixel height.
-                */
-                height: number;
-                /**
-                 * Image bitmap.
-                 * */
-                bmp: any;
-                /**
-                 * Image cellmap (bitmap scaled down to cell size).
-                */
-                cellmap: any;
-            };
-
-            export type Cursor = {
-                /**
-                 * Have blessed draw a custom cursor and hide the terminal cursor (experimental).
-                */
-                artificial: boolean;
-                /**
-                 * Shape of the cursor. Can be: block, underline, or line.
-                */
-                shape: boolean;
-                /**
-                 * Whether the cursor blinks.
-                */
-                blink: boolean;
-                /**
-                 * Color of the color. Accepts any valid color value (null is default).
-                */
-                color: string;
-            }
-        }
-
-        export module Events {
-
-            export interface IMouseEventArg {
-                x: number;
-                y: number;
-                action: Types.TMouseAction;
-            }
-
-            export interface IKeyEventArg {
-                full: string;
-                name: string;
-                shift: boolean;
-                ctrl: boolean;
-                meta: boolean;
-                sequence: string;
-            }
-        }
-
-        export interface NodeChildProcessExecOptions {
-            cwd?: string;
-            stdio?: any;
-            customFds?: any;
-            env?: any;
-            encoding?: string;
-            timeout?: number;
-            maxBuffer?: number;
-            killSignal?: string;
-        }
-
-        export interface IDestroyable {
-            destroy(): void;
-        }
-
-        export interface IOptions {
-        }
-
-        export interface IHasOptions<T extends IOptions> {
-            options: T;
-        }
-
-        export interface TputsOptions extends IOptions {
-            terminal?: string;
-            extended?: boolean;
-            debug?: boolean;
-            termcap?: string;
-            terminfoFile?: string;
-            terminfoPrefix?: string;
-            termcapFile?: string;
-        }
-
-        export class Tput implements IHasOptions<TputsOptions> {
-            constructor(opts: TputsOptions);
-
-            // ** properties ** //
-
-            /**
-             * Original options object.
-            */
-            options: TputsOptions;
-
-            debug: boolean;
-            padding: boolean;
-            extended: boolean;
-            printf: boolean;
-            termcap: string;
-            terminfoPrefix: string;
-            terminfoFile: string;
-            termcapFile: string;
-            error: Error;
-            terminal: string;
-
-            setup(): void;
-            term(is: any): boolean;
-            readTerminfo(term: string): string;
-            parseTerminfo(data: any, file: string): {
-                header: {
-                    dataSize: number;
-                    headerSize: number;
-                    magicNumber: boolean;
-                    namesSize: number;
-                    boolCount: number;
-                    numCount: number;
-                    strCount: number;
-                    strTableSize: number;
-                    extended: {
-                        dataSize: number;
-                        headerSize: number;
-                        boolCount: number;
-                        numCount: number;
-                        strCount: number;
-                        strTableSize: number;
-                        lastStrTableOffset: number;
-                    }
-                }
-                name: string;
-                names: string[];
-                desc: string;
-                bools: Object;
-                numbers: Object;
-                strings: Object;
-            };
-        }
-
-        export interface IDestroyable {
-            destroy(): void;
-        }
-
-        export interface INodeOptions extends IOptions {
-            name?: string;
-            screen?: Screen;
-            parent?: Node;
-            children?: Node[];
-            focusable?: boolean;
-        }
-
-        export abstract class Node extends EventEmitter implements IHasOptions<INodeOptions>, IDestroyable {
-            constructor(options: INodeOptions);
-
-            // ** properties ** //
-
-            focusable: boolean;
-
-            /**
-             * Original options object.
-            */
-            options: INodeOptions;
-
-            /**
-             * An object for any miscellanous user data.
-            */
-            data: {[index: string]: any;};
-            /**
-             * An object for any miscellanous user data.
-            */
-            _: {[index: string]: any;};
-            /**
-             * An object for any miscellanous user data.
-            */
-            $: {[index: string]: any;};
-            /**
-             * Type of the node (e.g. box).
-            */
-            type: string;
-            /**
-             * Render index (document order index) of the last render call.
-            */
-            index: number;
-            /**
-             * Parent screen.
-            */
-            screen: Screen;
-            /**
-             * Parent node.
-            */
-            parent: Node;
-            /**
-             * Array of node's children.
-            */
-            children: Node[];
-
-            // ** methods ** //
-
-            /**
-             * Prepend a node to this node's children.
-            */
-            prepend(node: Node): void;
-            /**
-             * Append a node to this node's children.
-            */
-            append(node: Node): void;
-            /**
-             * Remove child node from node.
-            */
-            remove(node: Node): void;
-            /**
-             * Insert a node to this node's children at index i.
-            */
-            insert(node: Node, index: number): void;
-            /**
-             * Insert a node to this node's children before the reference node.
-            */
-            insertBefore(node: Node, refNode: Node): void;
-            /**
-             * Insert a node from node after the reference node.
-            */
-            insertAfter(node: Node, refNode: Node): void;
-            /**
-             * Remove node from its parent.
-            */
-            detach(): void;
-            /**
-             * Remove node from its parent.
-            */
-            free(): void;
-            /**
-             * Remove node from its parent.
-            */
-            forDescendants(iter: Function, s: any): void;
-            /**
-             * Remove node from its parent.
-            */
-            forAncestors(iter: Function, s: any): void;
-            /**
-             * Remove node from its parent.
-            */
-            collectDescendants(s: any): void;
-            /**
-             * Remove node from its parent.
-            */
-            collectAncestors(s: any): void;
-            /**
-             * Remove node from its parent.
-            */
-            emitDescendants(): void;
-            /**
-             * Remove node from its parent.
-            */
-            emitAncestors(): void;
-            /**
-             * Remove node from its parent.
-            */
-            hasDescendant(target: Node): void;
-            /**
-             * Remove node from its parent.
-            */
-            hasAncestor(target: Node): boolean;
-            /**
-             * Remove node from its parent.
-            */
-            destroy(): void;
-            /**
-             * Emit event for element, and recursively emit same event for all descendants.
-            */
-            emitDescendants(type: string, ...args: any[]): void;
-            /**
-             * Get user property with a potential default value.
-            */
-            get<T>(name: string, def: T): T;
-            /**
-             * Set user property to value.
-            */
-            set<T>(name: string, value: T): void;
-
-            // ** events ** //
-
-            on(event: string, listener: Function): this;
-            /**
-             * Received when node is added to a parent.
-            */
-            on(event: "adopt", callback: (arg: Node) => void): this;
-            /**
-             * Received when node is removed from it's current parent.
-            */
-            on(event: "remove", callback: (arg: Node) => void): this;
-            /**
-             * Received when node gains a new parent.
-            */
-            on(event: "reparent", callback: (arg: Node) => void): this;
-            /**
-             * Received when node is attached to the screen directly or somewhere in its ancestry.
-            */
-            on(event: "attach", callback: (arg: Node) => void): this;
-            /**
-             * Received when node is detached from the screen directly or somewhere in its ancestry.
-            */
-            on(event: "detach", callback: (arg: Node) => void): this;
-        }
-
-        export class NodeWithEvents extends Node {
-            // ** methods ** //
-
-            /**
-             * Bind a keypress listener for a specific key.
-            */
-            key(name: string | string[], listener: Function): void;
-            /**
-             * Bind a keypress listener for a specific key once.
-            */
-            onceKey(name: string, listener: Function): void;
-            /**
-             * Remove a keypress listener for a specific key.
-            */
-            unkey(name: string, listener: Function): void;
-            removeKey(name: string, listener: Function): void;
-
-            // ** events ** //
-
-            on(event: string, listener: Function): this;
-            /**
-             * Received on screen resize.
-            */
-            on(event: "resize", callback: () => void): this;
-            /**
-             * Received on mouse events.
-            */
-            on(event: "mouse", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "mouseout", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "mouseover", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "mousedown", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "mouseup", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "mousewheel", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "wheeldown", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "wheelup", callback: (arg: Events.IMouseEventArg) => void): this;
-            on(event: "mousemove", callback: (arg: Events.IMouseEventArg) => void): this;
-            /**
-             * Received on key events.
-            */
-            on(event: "keypress", callback: (ch: string, key: Events.IKeyEventArg) => void): this;
-            /**
-             * Global events received for all elements.
-            */
-            on(event: "element click", callback: (arg: Screen) => void): this;
-            on(event: "element mouseover", callback: (arg: Screen) => void): this;
-            on(event: "element mouseout", callback: (arg: Screen) => void): this;
-            on(event: "element mouseup", callback: (arg: Screen) => void): this;
-            /**
-             * Received on key event for [name].
-            */
-            //on(event: "key", callback: (arg: BlessedScreen) => void): this;
-            /**
-             * Received when the terminal window focuses/blurs. Requires a terminal supporting the
-             * focus protocol and focus needs to be passed to program.enableMouse().
-            */
-            on(event: "focus", callback: (arg: Screen) => void): this;
-            /**
-             * Received when the terminal window focuses/blurs. Requires a terminal supporting the
-             * focus protocol and focus needs to be passed to program.enableMouse().
-            */
-            on(event: "blur", callback: (arg: Screen) => void): this;
-            /**
-             * Received before render.
-            */
-            on(event: "prerender", callback: () => void): this;
-            /**
-             * Received on render.
-            */
-            on(event: "render", callback: () => void): this;
-            /**
-             * Received when blessed notices something untoward (output is not a tty, terminfo not found, etc).
-            */
-            on(event: "warning", callback: (text: string) => void): this;
-            /**
-             * Received when the screen is destroyed (only useful when using multiple screens).
-            */
-            on(event: "destroy", callback: () => void): this;
-            /**
-             * Received when the element is moved.
-            */
-            on(event: "move", callback: () => void): this;
-            /**
-             * Element was clicked (slightly smarter than mouseup).
-            */
-            on(event: "click", callback: (arg: Screen) => void): this;
-            /**
-             * Received when element is shown.
-            */
-            on(event: "show", callback: () => void): this;
-            /**
-             * Received when element becomes hidden.
-            */
-            on(event: "hide", callback: () => void): this;
-
-            on(event: "set content", callback: () => void): this;
-            on(event: "parsed content", callback: () => void): this;
-        }
-
-        export interface IScreenOptions extends INodeOptions {
-            /**
-             * The blessed Program to be associated with. Will be automatically instantiated if none is provided.
-            */
-            program?: BlessedProgram;
-            /**
-             * Attempt to perform CSR optimization on all possible elements (not just full-width ones, elements with
-             * uniform cells to their sides). This is known to cause flickering with elements that are not full-width,
-             * however, it is more optimal for terminal rendering.
-            */
-            smartCSR?: boolean;
-            /**
-             * Do CSR on any element within 20 cols of the screen edge on either side. Faster than smartCSR,
-             * but may cause flickering depending on what is on each side of the element.
-            */
-            fastCSR?: boolean;
-            /**
-             * Attempt to perform back_color_erase optimizations for terminals that support it. It will also work
-             * with terminals that don't support it, but only on lines with the default background color. As it
-             * stands with the current implementation, it's uncertain how much terminal performance this adds at
-             * the cost of overhead within node.
-            */
-            useBCE?: boolean;
-            /**
-             * Amount of time (in ms) to redraw the screen after the terminal is resized (Default: 300).
-            */
-            resizeTimeout?: number;
-            /**
-             * The width of tabs within an element's content.
-            */
-            tabSize?: number;
-            /**
-             * Automatically position child elements with border and padding in mind (NOTE: this is a recommended
-             * option. It may become default in the future).
-            */
-            autoPadding?: boolean;
-
-            cursor?: Types.TCursor;
-
-            /**
-             * Create a log file. See log method.
-            */
-            log?: (...msg: any[]) => void;
-            /**
-             * Dump all output and input to desired file. Can be used together with log option if set as a boolean.
-            */
-            dump?: string;
-            /**
-             * Debug mode. Enables usage of the debug method. Also creates a debug console which will display when
-             * pressing F12. It will display all log and debug messages.
-            */
-            debug?: (...msg: string[]) => void;
-            /**
-             * Array of keys in their full format (e.g. C-c) to ignore when keys are locked or grabbed. Useful
-             * for creating a key that will always exit no matter whether the keys are locked.
-            */
-            ignoreLocked?: boolean;
-            /**
-             * Automatically "dock" borders with other elements instead of overlapping, depending on position
-             * (experimental). For example: These border-overlapped elements:
-            */
-            dockBorders?: boolean;
-            /**
-             * Normally, dockable borders will not dock if the colors or attributes are different. This option
-             * will allow them to dock regardless. It may produce some odd looking multi-colored borders though.
-            */
-            ignoreDockContrast?: boolean;
-            /**
-             * Allow for rendering of East Asian double-width characters, utf-16 surrogate pairs, and unicode
-             * combining characters. This allows you to display text above the basic multilingual plane. This
-             * is behind an option because it may affect performance slightly negatively. Without this option
-             * enabled, all double-width, surrogate pair, and combining characters will be replaced by '??',
-             * '?', '' respectively. (NOTE: iTerm2 cannot display combining characters properly. Blessed simply
-             * removes them from an element's content if iTerm2 is detected).
-            */
-            fullUnicode?: boolean;
-            /**
-             * Send focus events after mouse is enabled.
-            */
-            sendFocus?: boolean;
-            /**
-             * Display warnings (such as the output not being a TTY, similar to ncurses).
-            */
-            warnings?: boolean;
-            /**
-             * Force blessed to use unicode even if it is not detected via terminfo, env variables, or windows code page.
-             * If value is true unicode is forced. If value is false non-unicode is forced (default: null).
-            */
-            forceUnicode?: boolean;
-            /**
-             * Input and output streams. process.stdin/process.stdout by default, however, it could be a
-             * net.Socket if you want to make a program that runs over telnet or something of that nature.
-             * */
-            input?: stream.Writable;
-            /**
-             * Input and output streams. process.stdin/process.stdout by default, however, it could be a
-             * net.Socket if you want to make a program that runs over telnet or something of that nature.
-             * */
-            output?: stream.Readable;
-            /**
-             * The blessed Tput object (only available if you passed tput: true to the Program constructor.)
-            */
-            tput?: Tput;
-            /**
-             * Top of the focus history stack.
-            */
-            focused?: BlessedElement;
-            /**
-             * Width of the screen (same as program.cols).
-            */
-            width?: Types.TPosition;
-            /**
-             * Height of the screen (same as program.rows).
-            */
-            height?: Types.TPosition;
-            /**
-             * Same as screen.width.
-            */
-            cols?: number;
-            /**
-             * Same as screen.height.
-            */
-            rows?: number;
-            /**
-             * Relative top offset, always zero.
-            */
-            top?: Types.TTopLeft;
-            /**
-             * Relative left offset, always zero.
-            */
-            left?: Types.TTopLeft;
-            /**
-             * Relative right offset, always zero.
-            */
-            right?: Types.TPosition;
-            /**
-             * Relative bottom offset, always zero.
-            */
-            bottom?: Types.TPosition;
-            /**
-             * Absolute top offset, always zero.
-            */
-            atop?: Types.TTopLeft;
-            /**
-             * Absolute left offset, always zero.
-            */
-            aleft?: Types.TTopLeft;
-            /**
-             * Absolute right offset, always zero.
-            */
-            aright?: Types.TPosition;
-            /**
-             * Absolute bottom offset, always zero.
-            */
-            abottom?: Types.TPosition;
-            /**
-             * Whether the focused element grabs all keypresses.
-            */
-            grabKeys?: any;
-            /**
-             * Prevent keypresses from being received by any element.
-            */
-            lockKeys?: boolean;
-            /**
-             * The currently hovered element. Only set if mouse events are bound.
-            */
-            hover?: any;
-            /**
-             * Set or get terminal name. Set calls screen.setTerminal() internally.
-            */
-            terminal?: string;
-            /**
-             * Set or get window title.
-            */
-            title?: string;
-        }
-
-        export class Screen extends NodeWithEvents implements IHasOptions<IScreenOptions> {
-            constructor(opts: IScreenOptions);
-
-            // ** properties ** //
-            cleanSides: any;
-
-            /**
-             * Original options object.
-            */
-            options: IScreenOptions;
-
-            /**
-             * The blessed Program to be associated with. Will be automatically instantiated if none is provided.
-            */
-            program: BlessedProgram;
-            /**
-             * Attempt to perform CSR optimization on all possible elements (not just full-width ones, elements with
-             * uniform cells to their sides). This is known to cause flickering with elements that are not full-width,
-             * however, it is more optimal for terminal rendering.
-            */
-            smartCSR: boolean;
-            /**
-             * Do CSR on any element within 20 cols of the screen edge on either side. Faster than smartCSR,
-             * but may cause flickering depending on what is on each side of the element.
-            */
-            fastCSR: boolean;
-            /**
-             * Attempt to perform back_color_erase optimizations for terminals that support it. It will also work
-             * with terminals that don't support it, but only on lines with the default background color. As it
-             * stands with the current implementation, it's uncertain how much terminal performance this adds at
-             * the cost of overhead within node.
-            */
-            useBCE: boolean;
-            /**
-             * Amount of time (in ms) to redraw the screen after the terminal is resized (Default: 300).
-            */
-            resizeTimeout: number;
-            /**
-             * The width of tabs within an element's content.
-            */
-            tabSize: number;
-            /**
-             * Automatically position child elements with border and padding in mind (NOTE: this is a recommended
-             * option. It may become default in the future).
-            */
-            autoPadding: boolean;
-
-            cursor: Types.TCursor;
-
-            /**
-             * Dump all output and input to desired file. Can be used together with log option if set as a boolean.
-            */
-            dump: string;
-            /**
-             * Array of keys in their full format (e.g. C-c) to ignore when keys are locked or grabbed. Useful
-             * for creating a key that will always exit no matter whether the keys are locked.
-            */
-            ignoreLocked: boolean;
-            /**
-             * Automatically "dock" borders with other elements instead of overlapping, depending on position
-             * (experimental). For example: These border-overlapped elements:
-            */
-            dockBorders: boolean;
-            /**
-             * Normally, dockable borders will not dock if the colors or attributes are different. This option
-             * will allow them to dock regardless. It may produce some odd looking multi-colored borders though.
-            */
-            ignoreDockContrast: boolean;
-            /**
-             * Allow for rendering of East Asian double-width characters, utf-16 surrogate pairs, and unicode
-             * combining characters. This allows you to display text above the basic multilingual plane. This
-             * is behind an option because it may affect performance slightly negatively. Without this option
-             * enabled, all double-width, surrogate pair, and combining characters will be replaced by '??',
-             * '?', '' respectively. (NOTE: iTerm2 cannot display combining characters properly. Blessed simply
-             * removes them from an element's content if iTerm2 is detected).
-            */
-            fullUnicode: boolean;
-            /**
-             * Send focus events after mouse is enabled.
-            */
-            sendFocus: boolean;
-            /**
-             * Display warnings (such as the output not being a TTY, similar to ncurses).
-            */
-            warnings: boolean;
-            /**
-             * Force blessed to use unicode even if it is not detected via terminfo, env variables, or windows code page.
-             * If value is true unicode is forced. If value is false non-unicode is forced (default: null).
-            */
-            forceUnicode: boolean;
-            /**
-             * Input and output streams. process.stdin/process.stdout by default, however, it could be a
-             * net.Socket if you want to make a program that runs over telnet or something of that nature.
-             * */
-            input: stream.Writable;
-            /**
-             * Input and output streams. process.stdin/process.stdout by default, however, it could be a
-             * net.Socket if you want to make a program that runs over telnet or something of that nature.
-             * */
-            output: stream.Readable;
-            /**
-             * The blessed Tput object (only available if you passed tput: true to the Program constructor.)
-            */
-            tput: Tput;
-            /**
-             * Top of the focus history stack.
-            */
-            focused: BlessedElement;
-            /**
-             * Width of the screen (same as program.cols).
-            */
-            width: Types.TPosition;
-            /**
-             * Height of the screen (same as program.rows).
-            */
-            height: Types.TPosition;
-            /**
-             * Same as screen.width.
-            */
-            cols: number;
-            /**
-             * Same as screen.height.
-            */
-            rows: number;
-            /**
-             * Relative top offset, always zero.
-            */
-            top: Types.TTopLeft;
-            /**
-             * Relative left offset, always zero.
-            */
-            left: Types.TTopLeft;
-            /**
-             * Relative right offset, always zero.
-            */
-            right: Types.TPosition;
-            /**
-             * Relative bottom offset, always zero.
-            */
-            bottom: Types.TPosition;
-            /**
-             * Absolute top offset, always zero.
-            */
-            atop: Types.TTopLeft;
-            /**
-             * Absolute left offset, always zero.
-            */
-            aleft: Types.TTopLeft;
-            /**
-             * Absolute right offset, always zero.
-            */
-            aright: Types.TPosition;
-            /**
-             * Absolute bottom offset, always zero.
-            */
-            abottom: Types.TPosition;
-            /**
-             * Whether the focused element grabs all keypresses.
-            */
-            grabKeys: any;
-            /**
-             * Prevent keypresses from being received by any element.
-            */
-            lockKeys: boolean;
-            /**
-             * The currently hovered element. Only set if mouse events are bound.
-            */
-            hover: any;
-            /**
-             * Set or get terminal name. Set calls screen.setTerminal() internally.
-            */
-            terminal: string;
-            /**
-             * Set or get window title.
-            */
-            title: string;
-
-            // ** methods ** //
-
-            /**
-             * Write string to the log file if one was created.
-            */
-            log(...msg: any[]): void;
-            /**
-             * Same as the log method, but only gets called if the debug option was set.
-            */
-            debug(...msg: string[]): void;
-            /**
-             * Allocate a new pending screen buffer and a new output screen buffer.
-            */
-            alloc(): void;
-            /**
-             * Reallocate the screen buffers and clear the screen.
-            */
-            realloc(): void;
-            /**
-             * Draw the screen based on the contents of the screen buffer.
-            */
-            draw(start: number, end: number): void;
-            /**
-             * Render all child elements, writing all data to the screen buffer and drawing the screen.
-            */
-            render(): void;
-            /**
-             * Clear any region on the screen.
-            */
-            clearRegion(x1: number, x2: number, y1: number, y2: number): void;
-            /**
-             * Fill any region with a character of a certain attribute.
-            */
-            fillRegion(attr: string, ch: string, x1: number, x2: number, y1: number, y2: number): void;
-            /**
-             * Focus element by offset of focusable elements.
-            */
-            focusOffset(offset: number): any;
-            /**
-             * Focus previous element in the index.
-            */
-            focusPrevious(): void;
-            /**
-             * Focus next element in the index.
-            */
-            focusNext(): void;
-            /**
-             * Push element on the focus stack (equivalent to screen.focused = el).
-            */
-            focusPush(element: BlessedElement): void;
-            /**
-             * Pop element off the focus stack.
-            */
-            focusPop(): BlessedElement;
-            /**
-             * Save the focused element.
-            */
-            saveFocus(): BlessedElement;
-            /**
-             * Restore the saved focused element.
-            */
-            restoreFocus(): BlessedElement;
-            /**
-             * "Rewind" focus to the last visible and attached element.
-            */
-            rewindFocus(): BlessedElement;
-            /**
-             * Spawn a process in the foreground, return to blessed app after exit.
-            */
-            spawn(file: string, args: string[], options: NodeChildProcessExecOptions): child_process.ChildProcess;
-            /**
-             * Spawn a process in the foreground, return to blessed app after exit. Executes callback on error or exit.
-            */
-            exec(file: string, args: string[], options: NodeChildProcessExecOptions, callback: Function): child_process.ChildProcess;
-            /**
-             * Read data from text editor.
-            */
-            readEditor(options: any, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-            readEditor(callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-            /**
-             * Set effects based on two events and attributes.
-            */
-            setEffects(el: BlessedElement, fel: BlessedElement, over: any, out: any, effects: any, temp: any): void;
-            /**
-             * Insert a line into the screen (using csr: this bypasses the output buffer).
-            */
-            insertLine(n: number, y: number, top: number, bottom: number): void;
-            /**
-             * Delete a line from the screen (using csr: this bypasses the output buffer).
-            */
-            deleteLine(n: number, y: number, top: number, bottom: number): void;
-            /**
-             * Insert a line at the bottom of the screen.
-            */
-            insertBottom(top: number, bottom: number): void;
-            /**
-             * Insert a line at the top of the screen.
-            */
-            insertTop(top: number, bottom: number): void;
-            /**
-             * Delete a line at the bottom of the screen.
-            */
-            deleteBottom(top: number, bottom: number): void;
-            /**
-             * Delete a line at the top of the screen.
-            */
-            deleteTop(top: number, bottom: number): void;
-            /**
-             * Enable mouse events for the screen and optionally an element (automatically called when a form of
-             * on('mouse') is bound).
-            */
-            enableMouse(el: BlessedElement): void;
-            enableMouse(): void;
-            /**
-             * Enable keypress events for the screen and optionally an element (automatically called when a form of
-             * on('keypress') is bound).
-            */
-            enableKeys(el: BlessedElement): void;
-            enableKeys(): void;
-            /**
-             * Enable key and mouse events. Calls bot enableMouse and enableKeys.
-            */
-            enableInput(el: BlessedElement): void;
-            enableInput(): void;
-            /**
-             * Attempt to copy text to clipboard using iTerm2's proprietary sequence. Returns true if successful.
-            */
-            copyToClipboard(text: string): void;
-            /**
-             * Attempt to change cursor shape. Will not work in all terminals (see artificial cursors for a solution
-             * to this). Returns true if successful.
-            */
-            cursorShape(shape: boolean, blink: boolean): any;
-            /**
-             * Attempt to change cursor color. Returns true if successful.
-            */
-            cursorColor(color: string): void;
-            /**
-             * Attempt to reset cursor. Returns true if successful.
-            */
-            cursorReset(): void;
-            /**
-             * Take an SGR screenshot of the screen within the region. Returns a string containing only
-             * characters and SGR codes. Can be displayed by simply echoing it in a terminal.
-            */
-            screenshot(xi: number, xl: number, yi: number, yl: number): string;
-            screenshot(): void;
-            /**
-             * Destroy the screen object and remove it from the global list. Also remove all global events relevant
-             * to the screen object. If all screen objects are destroyed, the node process is essentially reset
-             * to its initial state.
-            */
-            destroy(): void;
-            /**
-             * Reset the terminal to term. Reloads terminfo.
-            */
-            setTerminal(term: string): void;
-        }
-
-        export interface Padding {
-            left?: number;
-            right?: number;
-            top?: number;
-            bottom?: number;
-        }
-
-        export class PositionCoords {
-            xi: number;
-            xl: number;
-            yi: number;
-            yl: number;
-        }
-
-        export interface Position {
-            left: number | string;
-            right: number | string;
-            top: number | string;
-            bottom: number | string;
-        }
-
-        export interface Border {
-            /**
-             * Type of border (line or bg). bg by default.
-            */
-            type?: "line" | "bg";
-            /**
-             * Character to use if bg type, default is space.
-            */
-            ch?: string;
-            /**
-             * Border foreground and background, must be numbers (-1 for default).
-            */
-            bg?: number;
-            fg?: number;
-            /**
-             * Border attributes.
-            */
-            bold?: string;
-            underline?: string;
-        }
-
-        export interface ElementOptions extends INodeOptions {
-            tags?: boolean;
-
-            fg?: string;
-            bg?: string;
-            bold?: string;
-            underline?: string;
-
-            style?: any;
-            /**
-             * Border object, see below.
-            */
-            border?: Border | "line" | "bg";
-            /**
-             * Element's text content.
-            */
-            content?: string;
-            /**
-             * Element is clickable.
-            */
-            clickable?: boolean;
-            /**
-             * Element is focusable and can receive key input.
-            */
-            input?: boolean;
-            keyable?: boolean;
-            /**
-             * Element is focused.
-            */
-            focused?: BlessedElement;
-            /**
-             * Whether the element is hidden.
-            */
-            hidden?: boolean;
-            /**
-             * A simple text label for the element.
-            */
-            label?: string;
-            /**
-             * A floating text label for the element which appears on mouseover.
-            */
-            hoverText?: string;
-            /**
-             * Text alignment: left, center, or right.
-            */
-            align?: "left" | "center" | "right";
-            /**
-             * Vertical text alignment: top, middle, or bottom.
-            */
-            valign?: "top" | "middle" | "bottom";
-            /**
-             * Shrink/flex/grow to content and child elements. Width/height during render.
-            */
-            shrink?: boolean;
-            /**
-             * Amount of padding on the inside of the element. Can be a number or an object containing
-             * the properties: left, right, top, and bottom.
-            */
-            padding?: number | Padding;
-
-            top?: Types.TTopLeft;
-            left?: Types.TTopLeft;
-            right?: Types.TPosition;
-            bottom?: Types.TPosition;
-
-            /**
-             * Width/height of the element, can be a number, percentage (0-100%), or keyword (half or shrink).
-             * Percentages can also have offsets (50%+1, 50%-1).
-            */
-            width?: number | string;
-            /**
-             * Offsets of the element relative to its parent. Can be a number, percentage (0-100%), or
-             * keyword (center). right and bottom do not accept keywords. Percentages can also have
-             * offsets (50%+1, 50%-1).
-            */
-            height?: number | string;
-            /**
-             * Can contain the above options.
-            */
-            position?: Position;
-            /**
-             * Whether the element is scrollable or not.
-            */
-            scrollable?: boolean;
-            /**
-             * Background character (default is whitespace ).
-            */
-            ch?: string;
-            /**
-             * Allow the element to be dragged with the mouse.
-            */
-            draggable?: boolean;
-            /**
-             * Draw a translucent offset shadow behind the element.
-            */
-            shadow?: boolean;
-        }
-
-        export interface Coords {
-            xl: number;
-            xi: number;
-            yl: number;
-            yi: number;
-            base: number;
-            _contentEnd: {x: number; y: number;};
-            notop: Types.TTopLeft;
-            noleft: Types.TTopLeft;
-            noright: Types.TPosition;
-            nobot: Types.TPosition;
-        }
-
-        export interface LabelOptions {
-            text: string;
-            side: Types.TAlign;
-        }
-
-        // TODO: scrollable - Note: If the scrollable option is enabled, Element inherits all methods from ScrollableBox.
-        export abstract class BlessedElement extends NodeWithEvents implements IHasOptions<ElementOptions> {
-            constructor(opts: ElementOptions);
-
-            // ** properties ** //
-
-            /**
-             * Original options object.
-            */
-            options: ElementOptions;
-            /**
-             * Name of the element. Useful for form submission.
-            */
-            name: string;
-            /**
-             * Border object.
-            */
-            border: Border;
-
-            style: any;
-            position: Position;
-            content: string;
-            hidden: boolean;
-            visible: boolean;
-            detached: boolean;
-            /**
-             * Border foreground and background, must be numbers (-1 for default).
-            */
-            bg: number;
-            fg: number;
-            /**
-             * Border attributes.
-            */
-            bold: string;
-            underline: string;
-            /**
-             * Calculated width.
-            */
-            width: number | string;
-            /**
-             * Calculated height.
-            */
-            height: number | string;
-            /**
-             * Calculated relative top offset.*/
-            top: Types.TTopLeft;
-            /**
-             * Calculated relative left offset.
-            */
-            left: Types.TTopLeft;
-            /**
-             * Calculated relative right offset.
-            */
-            right: Types.TPosition;
-            /**
-             * Calculated relative bottom offset.
-            */
-            bottom: Types.TPosition;
-            /**
-             * Calculated absolute top offset.
-            */
-            atop: Types.TTopLeft;
-            /**
-             * Calculated absolute left offset.
-            */
-            aleft: Types.TTopLeft;
-            /**
-             * Calculated absolute right offset.
-            */
-            aright: Types.TPosition;
-            /**
-             * Calculated absolute bottom offset.
-            */
-            abottom: Types.TPosition;
-
-            /**
-             * Whether the element is draggable. Set to true to allow dragging.
-            */
-            draggable: boolean;
-
-            itop: Types.TTopLeft;
-            ileft: Types.TTopLeft;
-            iheight: Types.TPosition;
-            iwidth: Types.TPosition;
-
-            /**
-             * Calculated relative top offset.
-            */
-            rtop: Types.TTopLeft;
-            /**
-             * Calculated relative left offset.
-            */
-            rleft: Types.TTopLeft;
-            /**
-             * Calculated relative right offset.
-            */
-            rright: Types.TPosition;
-            /**
-             * Calculated relative bottom offset.
-            */
-            rbottom: Types.TPosition;
-
-            lpos: PositionCoords;
-
-            // ** methods ** //
-
-            /**
-             * Write content and children to the screen buffer.
-            */
-            render(): Coords;
-            /**
-             * Hide element.*/
-            hide(): void;
-            /**
-             * Show element.
-            */
-            show(): void;
-            /**
-             * Toggle hidden/shown.
-            */
-            toggle(): void;
-            /**
-             * Focus element.
-            */
-            focus(): void;
-            /**
-             * Same asel.on('screen', ...) except this will automatically keep track of which listeners
-             * are bound to the screen object. For use with removeScreenEvent(), free(), and destroy().
-            */
-            onScreenEvent(type: string, handler: Function): void;
-            /**
-             * Same asel.removeListener('screen', ...) except this will automatically keep track of which
-             * listeners are bound to the screen object. For use with onScreenEvent(), free(), and destroy().
-            */
-            removeScreenEvent(type: string, handler: Function): void;
-            /**
-             * Free up the element. Automatically unbind all events that may have been bound to the screen
-             * object. This prevents memory leaks. For use with onScreenEvent(), removeScreenEvent(),
-             * and destroy().
-            */
-            free(): void;
-            /**
-             * Same as the detach() method, except this will automatically call free() and unbind any screen
-             * events to prevent memory leaks. for use with onScreenEvent(), removeScreenEvent(), and free().
-            */
-            destroy(): void;
-            /**
-             * Set the z-index of the element (changes rendering order).
-            */
-            setIndex(z: number): void;
-            /**
-             * Put the element in front of its siblings.*/
-            setFront(): void;
-            /**
-             * Put the element in back of its siblings.
-            */
-            setBack(): void;
-            /**
-             * text/options - Set the label text for the top-left corner. Example options: {text:'foo',side:'left'}
-            */
-            setLabel(arg: string | LabelOptions): void;
-            /**
-             * Remove the label completely.
-            */
-            removeLabel(): any;
-            /**
-             * text/options - Set a hover text box to follow the cursor. Similar to the "title" DOM attribute
-             * in the browser. Example options: {text:'foo'}
-            */
-            setHover(arg: string | LabelOptions): void;
-            /**
-             * Remove the hover label completely.
-            */
-            removeHover(): void;
-            /**
-             * Enable mouse events for the element (automatically called when a form of on('mouse') is bound).
-            */
-            enableMouse(): void;
-            /**
-             * Enable keypress events for the element (automatically called when a form of on('keypress') is bound).
-            */
-            enableKeys(): void;
-            /**
-             * Enable key and mouse events. Calls bot enableMouse and enableKeys.
-            */
-            enableInput(): void;
-            /**
-             * Enable dragging of the element.
-            */
-            enableDrag(): void;
-            /**
-             * Disable dragging of the element.
-            */
-            disableDrag(): void;
-            /**
-             * Take an SGR screenshot of the screen within the region. Returns a string containing only
-             * characters and SGR codes. Can be displayed by simply echoing it in a terminal.
-            */
-            screenshot(xi: number, xl: number, yi: number, yl: number): string;
-            screenshot(): void;
-
-            /*
-                Content Methods
-
-                Methods for dealing with text content, line by line. Useful for writing a text editor,
-                irc client, etc.
-
-                Note: All of these methods deal with pre-aligned, pre-wrapped text. If you use deleteTop()
-                on a box with a wrapped line at the top, it may remove 3-4 "real" lines (rows) depending
-                on how long the original line was.
-
-                The lines parameter can be a string or an array of strings. The line parameter must
-                be a string.
-            */
-
-            /**
-             * Set the content. Note: When text is input, it will be stripped of all non-SGR
-             * escape codes, tabs will be replaced with 8 spaces, and tags will be replaced
-             * with SGR codes (if enabled).
-            */
-            setContent(text: string): void;
-            /**
-             * Return content, slightly different from el.content. Assume the above formatting.
-            */
-            getContent(): string;
-            /**
-             * Similar to setContent, but ignore tags and remove escape codes.
-            */
-            setText(text: string): void;
-            /**
-             * Similar to getContent, but return content with tags and escape codes removed.
-            */
-            getText(): string;
-            /**
-             * Insert a line into the box's content.
-            */
-            insertLine(i: number, lines: string | string[]): void;
-            /**
-             * Delete a line from the box's content.
-            */
-            deleteLine(i: number): void;
-            /**
-             * Get a line from the box's content.
-            */
-            getLine(i: number): string;
-            /**
-             * Get a line from the box's content from the visible top.
-            */
-            getBaseLine(i: number): string;
-            /**
-             * Set a line in the box's content.
-            */
-            setLine(i: number, line: string | string[]): void;
-            /**
-             * Set a line in the box's content from the visible top.
-            */
-            setBaseLine(i: number, line: string | string[]): void;
-            /**
-             * Clear a line from the box's content.
-            */
-            clearLine(i: number): void;
-            /**
-             * Clear a line from the box's content from the visible top.
-            */
-            clearBaseLine(i: number): void;
-            /**
-             * Insert a line at the top of the box.
-            */
-            insertTop(lines: string | string[]): void;
-            /**
-             * Insert a line at the bottom of the box.
-            */
-            insertBottom(lines: string | string[]): void;
-            /**
-             * Delete a line at the top of the box.
-            */
-            deleteTop(): void;
-            /**
-             * Delete a line at the bottom of the box.
-            */
-            deleteBottom(): void;
-            /**
-             * Unshift a line onto the top of the content.
-            */
-            unshiftLine(lines: string | string[]): void;
-            /**
-             * Shift a line off the top of the content.
-            */
-            shiftLine(i: number): void;
-            /**
-             * Push a line onto the bottom of the content.
-            */
-            pushLine(lines: string | string[]): void;
-            /**
-             * Pop a line off the bottom of the content.
-            */
-            popLine(i: number): string;
-            /**
-             * An array containing the content lines.
-            */
-            getLines(): string[];
-            /**
-             * An array containing the lines as they are displayed on the screen.
-            */
-            getScreenLines(): string[];
-            /**
-             * Get a string's displayed width, taking into account double-width, surrogate pairs,
-             * combining characters, tags, and SGR escape codes.
-            */
-            strWidth(text: string): string;
-
-            // ** events ** //
-        }
-
-        export interface ScrollableBoxOptions extends ElementOptions {
-            /**
-             * A limit to the childBase. Default is Infinity.
-            */
-            baseLimit?: number;
-            /**
-             * A option which causes the ignoring of childOffset. This in turn causes the
-             * childBase to change every time the element is scrolled.
-            */
-            alwaysScroll?: boolean;
-            /**
-             * Object enabling a scrollbar.
-             * Style of the scrollbar track if present (takes regular style options).
-            */
-            scrollbar?: { style?: any; track?: any; ch?: string; }
-        }
-
-        export interface ScrollableTextOptions extends ScrollableBoxOptions {
-            /**
-             * Whether to enable automatic mouse support for this element.
-             * Use pre-defined mouse events (right-click for editor).
-            */
-            mouse?: boolean | (() => void);
-            /**
-             * Use pre-defined keys (i or enter for insert, e for editor, C-e for editor while inserting).
-            */
-            keys?: string | string[] | boolean;
-            /**
-             * Use vi keys with the keys option.
-            */
-            vi?: boolean;
-        }
-
-        export interface BoxOptions extends ScrollableTextOptions {
-            bindings?: any;
-        }
-
-        /**
-         * DEPRECATED - Use Box with the scrollable option instead. A box with scrollable content.
-        */
-        export class ScrollableBoxElement extends BlessedElement {
-            /**
-             * The offset of the top of the scroll content.
-            */
-            childBase: number;
-            /**
-             * The offset of the chosen item/line.
-            */
-            childOffset: number;
-
-            /**
-             * Scroll the content by a relative offset.
-            */
-            scroll(offset: number, always?: boolean): void;
-            /**
-             * Scroll the content to an absolute index.
-            */
-            scrollTo(index: number): void;
-            /**
-             * Same as scrollTo.
-            */
-            setScroll(index: number): void;
-            /**
-             * Set the current scroll index in percentage (0-100).
-            */
-            setScrollPerc(perc: number): void;
-            /**
-             * Get the current scroll index in lines.
-            */
-            getScroll(): number;
-            /**
-             * Get the actual height of the scrolling area.
-            */
-            getScrollHeight(): number;
-            /**
-             * Get the current scroll index in percentage.
-            */
-            getScrollPerc(): number;
-            /**
-             * Reset the scroll index to its initial state.
-            */
-            resetScroll(): void;
-
-            on(event: string, listener: Function): this;
-            /**
-             * Received when the element is scrolled.
-            */
-            on(event: "scroll", callback: () => void): this;
-        }
-
-        /**
-         * DEPRECATED - Use Box with the scrollable and alwaysScroll options instead.
-         * A scrollable text box which can display and scroll text, as well as handle
-         * pre-existing newlines and escape codes.
-        */
-        export class ScrollableTextElement extends ScrollableBoxElement {
-        }
-
-        /**
-         * A box element which draws a simple box containing content or other elements.
-        */
-        export class BoxElement extends ScrollableTextElement implements IHasOptions<BoxOptions> {
-            constructor(opts: BoxOptions);
-
-            /**
-             * Original options object.
-            */
-            options: BoxOptions;
-        }
-
-        export interface TextOptions extends ElementOptions {
-            /**
-             * Fill the entire line with chosen bg until parent bg ends, even if there
-             * is not enough text to fill the entire width.
-            */
-            fill?: boolean;
-            /**
-             * Text alignment: left, center, or right.
-            */
-            align?: Types.TAlign;
-        }
-
-        /**
-         * An element similar to Box, but geared towards rendering simple text elements.
-        */
-        export class TextElement extends BlessedElement implements IHasOptions<TextOptions> {
-            constructor(opts: TextOptions);
-
-            /**
-             * Original options object.
-            */
-            options: TextOptions;
-        }
-
-        /**
-         * A simple line which can be line or bg styled.
-        */
-        export interface LineOptions extends BoxOptions {
-            /**
-             * Can be vertical or horizontal.
-            */
-            orientation?: "vertical" | "horizontal";
-            /**
-             * Treated the same as a border object. (attributes can be contained in style).
-            */
+        interface TStyle {
             type?: string;
             bg?: string;
             fg?: string;
             ch?: string;
+            bold?: boolean;
+            underline?: boolean;
+            blink?: boolean;
+            inverse?: boolean;
+            invisible?: boolean;
+            transparent?: boolean;
+            border?: "line" | "bg" | TBorder;
+            hover?: boolean;
+            focus?: boolean;
+            label?: string;
+            track?: { bg?: string; fg?: string };
+            scrollbar?: { bg?: string; fg?: string };
         }
 
-        /**
-         * A simple line which can be line or bg styled.
-        */
-        export class LineElement extends BoxElement implements IHasOptions<LineOptions> {
-            constructor(opts: LineOptions);
+        interface TBorder {
+            /**
+             * Type of border (line or bg). bg by default.
+             */
+            type?: "line" | "bg";
 
             /**
-             * Original options object.
-            */
-            options: LineOptions;
+             * Character to use if bg type, default is space.
+             */
+            ch?: string;
+
+            /**
+             * Border foreground and background, must be numbers (-1 for default).
+             */
+            bg?: number;
+            fg?: number;
+
+            /**
+             * Border attributes.
+             */
+            bold?: string;
+            underline?: string;
         }
 
-        export interface BigTextOptions extends BoxOptions {
+        interface TCursor {
             /**
-             * bdf->json font file to use (see ttystudio for instructions on compiling BDFs to JSON).
-            */
-            font?: string;
+             * Have blessed draw a custom cursor and hide the terminal cursor (experimental).
+             */
+            artificial: boolean;
+
             /**
-             * bdf->json bold font file to use (see ttystudio for instructions on compiling BDFs to JSON).
-            */
-            fontBold?: string;
+             * Shape of the cursor. Can be: block, underline, or line.
+             */
+            shape: "block" | "underline" | "line";
+
             /**
-             * foreground character. (default: ' ')
-            */
-            fch?: string;
+             * Whether the cursor blinks.
+             */
+            blink: boolean;
+
+            /**
+             * Color of the color. Accepts any valid color value (null is default).
+             */
+            color: string;
         }
 
-        /**
-         * A box which can render content drawn as 8x14 cell characters using the terminus font.
-        */
-        export class BigTextElement extends BoxElement implements IHasOptions<BigTextOptions> {
-            constructor(opts: BigTextOptions);
+        type TAlign = "left" | "center" | "right";
 
-            /**
-             * Original options object.
-            */
-            options: BigTextOptions;
+        interface ListbarCommand {
+            key: string;
+            callback(): void;
         }
 
-        export interface ListElementStyle {
-            selected?: any;
-            item?: any;
+        interface TImage {
+            /**
+             * Pixel width.
+             */
+            width: number;
+
+            /**
+             * Pixel height.
+             */
+            height: number;
+
+            /**
+             * Image bitmap.
+             */
+            bmp: any;
+
+            /**
+             * Image cellmap (bitmap scaled down to cell size).
+             */
+            cellmap: any;
         }
 
-        export interface ListOptions<TStyle extends ListElementStyle> extends BoxOptions {
+        interface Cursor {
             /**
-             * Style for a selected item. Style for an unselected item.
-            */
-            style?: TStyle;
-            /**
-             * An array of strings which become the list's items.
-            */
-            items?: string[];
-            /**
-             * A function that is called when vi mode is enabled and the key / is pressed. This function accepts a
-             * callback function which should be called with the search string. The search string is then used to
-             * jump to an item that is found in items.
-            */
-            search?: () => void;
-            /**
-             * Whether the list is interactive and can have items selected (Default: true).
-            */
-            interactive?: boolean;
-            /**
-             * Whether to automatically override tags and invert fg of item when selected (Default: true).
-            */
-            invertSelected?: boolean;
-        }
-
-        export class ListElement extends BoxElement implements IHasOptions<ListOptions<ListElementStyle>> {
-            constructor(opts: ListOptions<ListElementStyle>);
-
-            /**
-             * Original options object.
-            */
-            options: ListOptions<ListElementStyle>;
-
-            /**
-             * Add an item based on a string.
-            */
-            add(text: string): void;
-            /**
-             * Add an item based on a string.
-            */
-            addItem(text: string): void;
-            /**
-             * Removes an item from the list. Child can be an element, index, or string.
-            */
-            removeItem(child: BlessedElement): BlessedElement;
-            /**
-             * Push an item onto the list.
-             * */
-            pushItem(child: BlessedElement): number;
-            /**
-             * Pop an item off the list.
-             * */
-            popItem(): BlessedElement;
-            /**
-             * Unshift an item onto the list.
-            */
-            unshiftItem(child: BlessedElement): number;
-            /**
-             * Shift an item off the list.
-             * */
-            shiftItem(): BlessedElement;
-            /**
-             * Inserts an item to the list. Child can be an element, index, or string.
-            */
-            insertItem(i: number, child: BlessedElement): void;
-            /**
-             * Returns the item element. Child can be an element, index, or string.
-            */
-            getItem(child: BlessedElement): BlessedElement;
-            /**
-             * Set item to content.
-            */
-            setItem(child: BlessedElement, content: BlessedElement | string): void;
-            /**
-             * Remove and insert items to the list.
-             * */
-            spliceItem(i: number, n: number, ...items: BlessedElement[]): void;
-            /**
-             * Clears all items from the list.
-             * */
-            clearItems(): void;
-            /**
-             * Sets the list items to multiple strings.
-            */
-            setItems(items: BlessedElement[]): void;
-            /**
-             * Returns the item index from the list. Child can be an element, index, or string.
-            */
-            getItemIndex(child: BlessedElement): number;
-            /**
-             * Select an index of an item.
-             * */
-            select(index: number): void;
-            /**
-             * Select item based on current offset.
-             * */
-            move(offset: number): void;
-            /**
-             * Select item above selected.
-             * */
-            up(amount: number): void;
-            /**
-             * Select item below selected.
-            */
-            down(amount: number): void;
-            /**
-             * Show/focus list and pick an item. The callback is executed with the result.
-            */
-            pick(callback: () => void): void;
-            /**
-             * Find an item based on its text content.
-            */
-            fuzzyFind(arg: string | RegExp | (() => void)): void;
-
-            // ** events ** //
+             * Have blessed draw a custom cursor and hide the terminal cursor (experimental).
+             */
+            artificial: boolean;
 
-            on(event: string, listener: Function): this;
-            /**
-             * Received when an item is selected.
-            */
-            on(event: "select", callback: (item: BoxElement, index: number) => void): this;
-            /**
-             * List was canceled (when esc is pressed with the keys option).
-            */
-            on(event: "cancel", callback: () => void): this;
-            /**
-             * Either a select or a cancel event was received.
-            */
-            on(event: "action", callback: () => void): this;
-
-            on(event: "create item", callback: () => void): this;
-            on(event: "add item", callback: () => void): this;
-            on(event: "remove item", callback: () => void): this;
-            on(event: "insert item", callback: () => void): this;
-            on(event: "set items", callback: () => void): this;
-            on(event: "select item", callback: (item: BlessedElement, index: number) => void): this;
-        }
-
-        export interface FileManagerOptions extends ListOptions<ListElementStyle> {
-            /**
-             * Current working directory.
-            */
-            cwd?: string;
-        }
-
-        export class FileManagerElement extends ListElement implements IHasOptions<FileManagerOptions> {
-            constructor(opts: FileManagerOptions);
-
-            /**
-             * Original options object.
-            */
-            options: FileManagerOptions;
             /**
-             * Current working directory.
-            */
-            cwd: string;
+             * Shape of the cursor. Can be: block, underline, or line.
+             */
+            shape: boolean;
 
             /**
-             * Refresh the file list (perform a readdir on cwd and update the list items).
-            */
-            refresh(cwd:string, callback: () => void): void;
-            refresh(callback: () => void): void;
-            refresh(): void;
-            /**
-             * Pick a single file and return the path in the callback.
-            */
-            pick(cwd:string, callback: () => void): void;
-            pick(callback: () => void): void;
-            /**
-             * Reset back to original cwd.
-            */
-            reset(cwd:string, callback: () => void): void;
-            reset(callback: () => void): void;
-            reset(): void;
-
-            // ** events ** //
-
-            on(event: string, listener: Function): this;
-            /**
-             * Received when an item is selected.
-            */
-            on(event: "cd", callback: (file: string, cwd: string) => void): this;
-            /**
-             * Received when an item is selected.
-            */
-            on(event: "file", callback: (file: string) => void): this;
-
-            on(event: "error", callback: (err: any, file: string) => void): this;
-            on(event: "refresh", callback: () => void): this;
-        }
-
-        export interface StyleListTable extends ListElementStyle {
-            /**
-             * Header style.
-            */
-            header?: any;
-            /**
-             * Cell style.
-            */
-            cell?: any;
-        }
-
-        export interface ListTableOptions extends ListOptions<StyleListTable> {
-            /**
-             * Array of array of strings representing rows.
-            */
-            rows?: string[];
-            data?: string[][];
-            /**
-             * Spaces to attempt to pad on the sides of each cell. 2 by default: one space on each side
-             * (only useful if the width is shrunken).
-            */
-            pad?: number;
-            /**
-             * Do not draw inner cells.
-            */
-            noCellBorders?: boolean;
-
-            style?: StyleListTable;
-        }
-
-        export class ListTableElement extends ListElement implements IHasOptions<ListTableOptions> {
-            constructor(opts: ListTableOptions);
-
-            /**
-             * Original options object.
-            */
-            options: ListTableOptions;
-
-            /**
-             * Set rows in table. Array of arrays of strings.
-             * @example:
-             *
-             * table.setData([
-                    [ 'Animals',  'Foods'  ],
-                    [ 'Elephant', 'Apple'  ],
-                    [ 'Bird',     'Orange' ]
-                ]);
-            */
-            setRows(rows: string[][]): void;
-            /**
-             * Set rows in table. Array of arrays of strings.
-             * @example:
-             *
-             * table.setData([
-                    [ 'Animals',  'Foods'  ],
-                    [ 'Elephant', 'Apple'  ],
-                    [ 'Bird',     'Orange' ]
-                ]);
-            */
-            setData(rows: string[][]): void;
-        }
-
-        export interface ListbarOptions extends BoxOptions {
-            style?: ListElementStyle;
-            /**
-             * Set buttons using an object with keys as titles of buttons, containing of objects
-             * containing keys of keys and callback.
-            */
-            commands: Types.ListbarCommand[];
-            items: Types.ListbarCommand[];
-            /**
-             * Automatically bind list buttons to keys 0-9.
-            */
-            autoCommandKeys: boolean;
-        }
-
-        export class ListbarElement extends BoxElement implements IHasOptions<ListbarOptions> {
-            constructor(opts: ListbarOptions);
-
-            /**
-             * Original options object.
-            */
-            options: ListbarOptions;
-
-            /**
-             * Set commands (see commands option above).
-            */
-            setItems(commands: Types.ListbarCommand[]): void;
-            /**
-             * Append an item to the bar.
-            */
-            add(item: Types.ListbarCommand, callback: () => void): void;
-            /**
-             * Append an item to the bar.
-            */
-            addItem(item: Types.ListbarCommand, callback: () => void): void;
-            /**
-             * Append an item to the bar.
-            */
-            appendItem(item: Types.ListbarCommand, callback: () => void): void;
-            /**
-             * Select an item on the bar.
-            */
-            select(offset: number): void;
-            /**
-             * Remove item from the bar.
-            */
-            removeItem(child: BlessedElement): void;
-            /**
-             * Move relatively across the bar.
-            */
-            move(offset: number): void;
-            /**
-             * Move left relatively across the bar.
-            */
-            moveLeft(offset: number): void;
-            /**
-             * Move right relatively across the bar.
-            */
-            moveRight(offset: number): void;
-            /**
-             * Select button and execute its callback.
-            */
-            selectTab(index: number): void;
-
-            // ** events ** //
-
-            on(event: string, listener: Function): this;
-
-            on(event: "set items", callback: () => void): this;
-            on(event: "remove item", callback: () => void): this;
-            on(event: "select tab", callback: () => void): this;
-        }
-
-        export interface FormOptions extends BoxOptions {
-            /**
-             * Allow default keys (tab, vi keys, enter).
-            */
-            keys?: any;
-            /**
-             * Allow vi keys.
-            */
-            vi?: boolean;
-        }
-
-        export class FormElement<TFormData> extends BoxElement implements IHasOptions<FormOptions> {
-            constructor(opts: FormOptions);
-
-            /**
-             * Original options object.
-            */
-            options: FormOptions;
-            /**
-             * Last submitted data.
-            */
-            submission: TFormData;
-
-            /**
-             * Focus next form element.
-            */
-            focusNext(): void;
-            /**
-             * Focus previous form element.
-            */
-            focusPrevious(): void;
-            /**
-             * Submit the form.
-            */
-            submit(): void;
-            /**
-             * Discard the form.
-            */
-            cancel(): void;
-            /**
-             * Clear the form.
-            */
-            reset(): void;
-
-            // ** events ** //
-
-            on(event: string, listener: Function): this;
-            /**
-             * Form is submitted. Receives a data object.
-            */
-            on(event: "submit", callback: (out: TFormData) => void): this;
-            /**
-             * Form is discarded.
-            */
-            on(event: "cancel", callback: () => void): this;
-            /**
-             * Form is cleared.
-            */
-            on(event: "reset", callback: () => void): this;
-        }
-
-        export interface InputOptions extends BoxOptions { }
-
-        export abstract class InputElement extends BoxElement {
-            constructor(opts: InputOptions);
-        }
-
-        /**
-         * A box which allows multiline text input.
-        */
-        export interface TextareaOptions extends InputOptions {
-            /**
-             * Call readInput() when the element is focused. Automatically unfocus.
-            */
-            inputOnFocus?: boolean;
-        }
-
-        export class TextareaElement extends InputElement implements IHasOptions<TextareaOptions> {
-            constructor(opts: TextareaOptions);
-
-            /**
-             * Original options object.
-            */
-            options: TextareaOptions;
-
-            /**
-             * The input text. read-only.
-            */
-            value: string;
-
-            /**
-             * Submit the textarea (emits submit).
-            */
-            submit(): void;
-            /**
-             * Cancel the textarea (emits cancel).
-            */
-            cancel(): void;
-            /**
-             * Grab key events and start reading text from the keyboard. Takes a callback which receives
-             * the final value.
-            */
-            readInput(callback?: (err: any, value?: string) => void): void;
-            /**
-             * Grab key events and start reading text from the keyboard. Takes a callback which receives
-             * the final value.
-            */
-            input(callback: (err: any, value?: string) => void): void;
-            /**
-             * Grab key events and start reading text from the keyboard. Takes a callback which receives
-             * the final value.
-            */
-            setInput(callback: (err: any, value?: string) => void): void;
-            /**
-             * Open text editor in $EDITOR, read the output from the resulting file. Takes a callback which
-             * receives the final value.
-            */
-            readEditor(callback: (err: any, value?: string) => void): void;
-            /**
-             * Open text editor in $EDITOR, read the output from the resulting file. Takes a callback which
-             * receives the final value.
-            */
-            editor(callback: (err: any, value?: string) => void): void;
-            /**
-             * Open text editor in $EDITOR, read the output from the resulting file. Takes a callback which
-             * receives the final value.
-            */
-            setEditor(callback: (err: any, value?: string) => void): void;
-            /**
-             * The same as this.value, for now.
-            */
-            getValue(): string;
-            /**
-             * Clear input.
-            */
-            clearValue(): void;
-            /**
-             * Set value.
-            */
-            setValue(text: string): void;
-
-            // ** events ** //
-
-            on(event: string, listener: Function): this;
-
-            on(event: "error", callback: (err: any) => void): this;
-
-            /**
-             * Value is submitted (enter).
-            */
-            on(event: "submit", callback: (value: any) => void): this;
-            /**
-             * Value is discared (escape).
-            */
-            on(event: "cancel", callback: (value: any) => void): this;
-            /**
-             * Either submit or cancel.
-            */
-            on(event: "action", callback: (value: any) => void): this;
-        }
-
-        export interface TextboxOptions extends TextareaOptions {
-            /**
-             * Completely hide text.
-            */
-            secret?: boolean;
-            /**
-             * Replace text with asterisks (*).
-            */
-            censor?: boolean;
-        }
-
-        export class TextboxElement extends TextareaElement implements IHasOptions<TextboxOptions> {
-            constructor(opts: TextboxOptions);
-
-            /**
-             * Original options object.
-            */
-            options: TextboxOptions;
-
-            /**
-             * Completely hide text.
-            */
-            secret: boolean;
-            /**
-             * Replace text with asterisks (*).
-            */
-            censor: boolean;
-        }
-
-        export interface ButtonOptions extends BoxOptions { }
-
-        export class ButtonElement extends InputElement implements IHasOptions<ButtonOptions> {
-            constructor(opts: ButtonOptions);
-
-            /**
-             * Original options object.
-            */
-            options: ButtonOptions;
-
-            /**
-             * Press button. Emits press.
-            */
-            press(): void;
-
-            on(event: string, listener: Function): this;
-
-            on(event: "press", callback: () => void): this;
-        }
-
-        export interface CheckboxOptions extends BoxOptions {
-            /**
-             * whether the element is checked or not.
-             * */
-            checked?: boolean;
-            /**
-             * enable mouse support.
-             * */
-            mouse?: boolean;
-        }
-
-        /**
-         * A checkbox which can be used in a form element.
-         * */
-        export class CheckboxElement extends InputElement implements IHasOptions<CheckboxOptions> {
-            constructor(options?: CheckboxOptions);
-
-            /**
-             * Original options object.
-            */
-            options: CheckboxOptions;
-
-            /**
-             * the text next to the checkbox (do not use setcontent, use `check.text = ''`).
-             * */
-            text: string;
-            /**
-             * whether the element is checked or not.
-             * */
-            checked: boolean;
-            /**
-             * same as `checked`.
-             * */
-            value: boolean;
-
-            /**
-             * check the element.
-             * */
-            check(): void;
-            /**
-             * uncheck the element.
-             * */
-            uncheck(): void;
-            /**
-             * toggle checked state.
-             * */
-            toggle(): void;
-        }
-
-        export interface RadioSetOptions extends BoxOptions { }
-
-        /**
-         * An element wrapping RadioButtons. RadioButtons within this element will be mutually exclusive
-         * with each other.
-         * */
-        export abstract class RadioSetElement extends BoxElement {
-            constructor(opts: RadioSetOptions);
-        }
-
-        export interface RadioButtonOptions extends BoxOptions { }
-
-        /**
-         * A radio button which can be used in a form element.
-        */
-        export abstract class RadioButtonElement extends CheckboxElement {
-            constructor(opts: RadioButtonOptions);
-        }
-
-        export interface PromptOptions extends BoxOptions { }
-
-        /**
-         * A prompt box containing a text input, okay, and cancel buttons (automatically hidden).
-        */
-        export class PromptElement extends BoxElement implements IHasOptions<PromptOptions> {
-            constructor(opts: PromptOptions);
-
-            options: PromptOptions;
-
-            /**
-             * Show the prompt and wait for the result of the textbox. Set text and initial value.
-            */
-            input(text: string, value: string, callback: (err: any, value: string) => void): void;
-            setInput(text: string, value: string, callback: (err: any, value: string) => void): void;
-            readInput(text: string, value: string, callback: (err: any, value: string) => void): void;
-        }
-
-        export interface QuestionOptions extends BoxOptions { }
-
-        /**
-         * A question box containing okay and cancel buttons (automatically hidden).
-        */
-        export class QuestionElement extends BoxElement implements IHasOptions<QuestionOptions> {
-            constructor(opts: QuestionOptions);
-
-            options: QuestionOptions;
-
-            /**
-             * Ask a question. callback will yield the result.
-            */
-            ask(question: string, callback: (err: any, value: string) => void): void;
-        }
-
-        export interface MessageOptions extends BoxOptions { }
-
-        /**
-         * A box containing a message to be displayed (automatically hidden).
-        */
-        export class MessageElement extends BoxElement implements IHasOptions<MessageOptions> {
-            constructor(opts: MessageOptions);
-
-            options: MessageOptions;
-
-            /**
-             * Display a message for a time (default is 3 seconds). Set time to 0 for a perpetual message that is dismissed on keypress.
-            */
-            log(text: string, time: number, callback: (err: any) => void): void;
-            log(text: string, callback: (err: any) => void): void;
-            display(text: string, time: number, callback: (err: any) => void): void;
-            display(text: string, callback: (err: any) => void): void;
-
-            /**
-             * Display an error in the same way.
-            */
-            error(text: string, time: number, callback: () => void): void;
-            error(text: string, callback: () => void): void;
-        }
-
-        export interface LoadingOptions extends BoxOptions { }
-
-        /**
-         * A box with a spinning line to denote loading (automatically hidden).
-        */
-        export class LoadingElement extends BoxElement implements IHasOptions<LoadingOptions> {
-            constructor(opts: LoadingOptions);
-
-            options: LoadingOptions;
-
-            /**
-             * Display the loading box with a message. Will lock keys until stop is called.
-            */
-            load(text: string): void;
-            /**
-             * Hide loading box. Unlock keys.
-            */
-            stop(): void;
-        }
-
-        export interface ProgressBarOptions extends BoxOptions {
-            /**
-             * can be `horizontal` or `vertical`.
-             * */
-            orientation: string;
-            /**
-             * the character to fill the bar with (default is space).
-             * */
-            pch: string;
-            /**
-             * the amount filled (0 - 100).
-             * */
-            filled: number;
-            /**
-             * same as `filled`.
-             * */
-            value: number;
-            /**
-             * enable key support.
-             * */
-            keys: boolean;
-            /**
-             * enable mouse support.
-             * */
-            mouse: boolean;
-        }
-
-        /**
-         * A progress bar allowing various styles. This can also be used as a form input.
-        */
-        export class ProgressBarElement extends InputElement implements IHasOptions<ProgressBarOptions> {
-            constructor(options?: ProgressBarOptions);
-
-            options: ProgressBarOptions;
-
-            /**
-             * progress the bar by a fill amount.
-             * */
-            progress(amount:number): void;
-            /**
-             * set progress to specific amount.
-             * */
-            setProgress(amount:number): void;
-            /**
-             * reset the bar.
-             * */
-            reset(): void;
-
-            on(event: string, listener: Function): this;
-            /**
-             * Bar was reset.
-            */
-            on(event: "reset", callback: () => void): this;
-            /**
-             * Bar has completely filled.
-            */
-            on(event: "complete", callback: () => void): this;
-        }
-
-        export interface LogOptions extends ScrollableTextOptions {
-            /**
-             * amount of scrollback allowed. default: Infinity.
-             * */
-            scrollback?: number;
-            /**
-             * scroll to bottom on input even if the user has scrolled up. default: false.
-             * */
-            scrollOnInput?: boolean;
-        }
-
-        /**
-         * A log permanently scrolled to the bottom.
-         * */
-        export class Log extends ScrollableTextElement implements IHasOptions<LogOptions> {
-            constructor(options?: LogOptions);
-
-            options: LogOptions;
-
-            /**
-             * amount of scrollback allowed. default: Infinity.
-             * */
-            scrollback: number;
-            /**
-             * scroll to bottom on input even if the user has scrolled up. default: false.
-             * */
-            scrollOnInput: boolean;
-
-            /**
-             * add a log line.
-             * */
-            log(text:string): void;
-            /**
-             * add a log line.
-             * */
-            add(text:string): void;
-        }
-
-        export interface TableOptions extends BoxOptions {
-            /**
-             * array of array of strings representing rows (same as `data`).
-             * */
-            rows?: string[][];
-            /**
-             * array of array of strings representing rows (same as `rows`).
-             * */
-            data?: string[][];
-            /**
-             * spaces to attempt to pad on the sides of each cell. `2` by default: one space on each side (only useful if the width is shrunken).
-             * */
-            pad?: number;
-            /**
-             * do not draw inner cells.
-             * */
-            noCellBorders?: boolean;
-            /**
-             * fill cell borders with the adjacent background color.
-             * */
-            fillCellBorders?: boolean;
-        }
-
-        /**
-         * A stylized table of text elements.
-         * */
-        export class TableElement extends BoxElement implements IHasOptions<TableOptions> {
-            constructor(opts: TableOptions);
-
-            options: TableOptions;
-
-            /**
-             * set rows in table. array of arrays of strings.
-             * */
-            setData(rows: string[][]): void;
-            /**
-             * set rows in table. array of arrays of strings.
-             * */
-            setRows(rows: string[][]): void;
-        }
-
-        export interface TerminalOptions extends BoxOptions {
-            /**
-             * handler for input data.
-             * */
-            handler?: (userInput:Buffer) => void;
-            /**
-             * name of shell. $SHELL by default.
-             * */
-            shell?:string;
-            /**
-             * args for shell.
-             * */
-            args?:any;
-            /**
-             * can be line, underline, and block.
-             * */
-            cursor?: 'line'|'underline'|'block';
-
-            terminal?: string;
-
-            /**
-             * Object for process env.
-            */
-            env?: any;
-        }
-
-        export class TerminalElement extends BoxElement implements IHasOptions<TerminalOptions> {
-            constructor(opts: TerminalOptions);
-
-            options: TerminalOptions;
-
-            /**
-             * reference to the headless term.js terminal.
-             * */
-            term: any;
-            /**
-             * reference to the pty.js pseudo terminal.
-             * */
-            pty: any;
-
-            /**
-             * write data to the terminal.
-             * */
-            write(data:string): void;
-
-            /**
-             * nearly identical to `element.screenshot`, however, the specified region includes the terminal's _entire_ scrollback, rather than just what is visible on the screen.
-             * */
-            screenshot(xi?:number, xl?:number, yi?:number, yl?:number): string;
-        }
-
-        export interface ImageOptions extends BoxOptions {
-            /**
-             * path to image.
-             * */
-            file: string;
-            /**
-             * path to w3mimgdisplay. if a proper w3mimgdisplay path is not given, blessed will search the entire disk for the binary.
-             * */
-            type: "ansi" | "overlay" | "w3m";
-        }
-
-        /**
-         * Display an image in the terminal (jpeg, png, gif) using w3mimgdisplay. Requires w3m to be installed. X11 required: works in xterm, urxvt, and possibly other terminals.
-         * */
-        export class ImageElement extends BoxElement implements IHasOptions<ImageOptions> {
-            constructor(options?: ImageOptions);
-
-            options: ImageOptions;
-        }
-
-        export interface ANSIImageOptions extends BoxOptions {
-            /**
-             * URL or path to PNG/GIF file. Can also be a buffer.
-             * */
-            file: string;
-            /**
-             * Scale cellmap down (0-1.0) from its original pixel width/height (Default: 1.0).
-             * */
-            scale: number;
-
-            /**
-             * This differs from other element's width or height in that only one of them is needed: blessed will maintain the aspect ratio of the image as it scales down to the proper number of cells. NOTE: PNG/GIF's are always automatically shrunken to size (based on scale) if a width or height is not given.
-             * */
-            width: number | string;
-            height: number | string;
-
-            /**
-             * Add various "density" ASCII characters over the rendering to give the image more detail, similar to libcaca/libcucul (the library mplayer uses to display videos in the terminal).
-            */
-            ascii: string;
-
-            /**
-             * Whether to animate if the image is an APNG/animating GIF. If false, only display the first frame or IDAT (Default: true).
-            */
-            animate: boolean;
-
-            /**
-             * Set the speed of animation. Slower: 0.0-1.0. Faster: 1-1000. It cannot go faster than 1 frame per millisecond, so 1000 is the fastest. (Default: 1.0)
-            */
-            speed: number;
-
-            /**
-             * mem or cpu. If optimizing for memory, animation frames will be rendered to bitmaps as the animation plays, using less memory. Optimizing for cpu will precompile all bitmaps beforehand, which may be faster, but might also OOM the process on large images. (Default: mem).
-            */
-            optimization: "mem" | "cpu";
-        }
-
-        /**
-         * Convert any .png file (or .gif, see below) to an ANSI image and display it as an element.
-         * */
-        export class ANSIImageElement extends BoxElement implements IHasOptions<ANSIImageOptions> {
-            constructor(options?:ANSIImageOptions);
-
-            options: ANSIImageOptions;
-
-            /**
-             * Image object from the png reader.
-            */
-            img: Types.TImage;
-
-            /**
-             * set the image in the box to a new path.
-             * */
-            setImage(img: string, callback: () => void): void;
-            /**
-             * clear the current image.
-             * */
-            clearImage(callback: () => void): void;
-            /**
-             * Play animation if it has been paused or stopped.
-            */
-            play(): void;
-            /**
-             * Pause animation.
-            */
-            pause(): void;
-            /**
-             * Stop animation.
-            */
-            stop(): void;
-        }
-
-        export interface OverlayImageOptions extends BoxOptions {
-            /**
-             * Path to image.
-            */
-            file: string;
-            /**
-             * Render the file as ANSI art instead of using w3m to overlay Internally uses the ANSIImage element. See the ANSIImage element for more information/options. (Default: true).
-            */
-            ansi: boolean;
-            /**
-             * Path to w3mimgdisplay. If a proper w3mimgdisplay path is not given, blessed will search the entire disk for the binary.
-            */
-            w3m: string;
-            /**
-             * Whether to search /usr, /bin, and /lib for w3mimgdisplay (Default: true).
-            */
-            search: string;
-        }
-
-        /**
-         * Convert any .png file (or .gif, see below) to an ANSI image and display it as an element.
-         * */
-        export class OverlayImageElement extends BoxElement implements IHasOptions<OverlayImageOptions> {
-            constructor(options?: OverlayImageOptions);
-
-            options: OverlayImageOptions;
-
-            /**
-             * set the image in the box to a new path.
-             * */
-            setImage(img: string, callback: () => void): void;
-            /**
-             * clear the current image.
-             * */
-            clearImage(callback: () => void): void;
-            /**
-             * get the size of an image file in pixels.
-             * */
-            imageSize(img:string, callback: () => void): void;
-            /**
-             * get the size of the terminal in pixels.
-             * */
-            termSize(callback: () => void): void;
-            /**
-             * get the pixel to cell ratio for the terminal.
-             * */
-            getPixelRatio(callback: () => void): void;
-        }
-
-        export interface VideoOptions extends BoxOptions {
-            /**
-             * Video to play.
-            */
-            file: string;
-            /**
-             * Start time in seconds.
-            */
-            start: number;
-        }
-
-        export class VideoElement extends BoxElement implements IHasOptions<VideoOptions> {
-            constructor(options?: VideoOptions);
-
-            options: VideoOptions;
-
-            /**
-             * The terminal element running mplayer or mpv.
-            */
-            tty: any;
-        }
-
-        export interface LayoutOptions extends ElementOptions {
-            /**
-             * A callback which is called right before the children are iterated over to be rendered. Should return an
-             * iterator callback which is called on each child element: iterator(el, i).
-            */
-            renderer?: () => void;
-
-            /**
-             * Using the default renderer, it provides two layouts: inline, and grid. inline is the default and will render
-             * akin to inline-block. grid will create an automatic grid based on element dimensions. The grid cells'
-             * width and height are always determined by the largest children in the layout.
-            */
-            layout: "inline" | "inline-block" | "grid";
-        }
-
-        export class LayoutElement extends BlessedElement implements IHasOptions<LayoutOptions> {
-            constructor(options?: LayoutOptions);
-
-            options: LayoutOptions;
-
-            /**
-             * A callback which is called right before the children are iterated over to be rendered. Should return an
-             * iterator callback which is called on each child element: iterator(el, i).
-            */
-            renderer(coords: PositionCoords): void;
-            /**
-             * Check to see if a previous child element has been rendered and is visible on screen. This is only useful
-             * for checking child elements that have already been attempted to be rendered! see the example below.
-            */
-            isRendered(el: BlessedElement): boolean;
-            /**
-             * Get the last rendered and visible child element based on an index. This is useful for basing the position
-             * of the current child element on the position of the last child element.
-            */
-            getLast(i: number): Element;
-            /**
-             * Get the last rendered and visible child element coords based on an index. This is useful for basing the position
-             * of the current child element on the position of the last child element. See the example below.
-            */
-            getLastCoords(i: number): PositionCoords;
-        }
+             * Whether the cursor blinks.
+             */
+            blink: boolean;
 
-        export class Program {
             /**
-                Wrap the given text in terminal formatting codes corresponding to the given attribute
-                name. The `attr` string can be of the form `red fg` or `52 bg` where `52` is a 0-255
-                integer color number.
-            */
-            text (text:string, attr:string): string;
+             * Color of the color. Accepts any valid color value (null is default).
+             */
+            color: string;
         }
     }
 
-    export module widget {
-        export class Element extends Widgets.BlessedElement { }
-        export class Node extends Widgets.Node { }
-        export class Screen extends Widgets.Screen { }
+    namespace Events {
+        interface IMouseEventArg {
+            x: number;
+            y: number;
+            action: Types.TMouseAction;
+        }
 
-        export class Box extends Widgets.BoxElement { }
-        export class ScrollableBox  extends Widgets.ScrollableBoxElement { }
-        export class ScrollableText  extends Widgets.ScrollableTextElement { }
-        export class Text extends Widgets.BoxElement { }
-        export class Line extends Widgets.LineElement { }
-        export class BigText extends Widgets.BigTextElement { }
-        export class List extends Widgets.ListElement { }
-        export class FileManager extends Widgets.FileManagerElement { }
-        export class ListTable extends Widgets.ListTableElement { }
-        export class ListBar extends Widgets.ListbarElement { }
-        export class Form<TFormData> extends Widgets.FormElement<TFormData> { }
-        export class Textarea extends Widgets.TextareaElement { }
-        export class Button extends Widgets.ButtonElement { }
-        export class Checkbox extends Widgets.CheckboxElement { }
-        export class RadioSet extends Widgets.RadioSetElement { }
-        export class RadioButton extends Widgets.RadioButtonElement { }
-
-        export class Prompt extends Widgets.PromptElement { }
-        export class question extends Widgets.QuestionElement { }
-        export class Message extends Widgets.MessageElement { }
-        export class Loading extends Widgets.LoadingElement { }
-
-        export class ProgressBar extends Widgets.ProgressBarElement { }
-        export class Terminal extends Widgets.TerminalElement { }
+        interface IKeyEventArg {
+            full: string;
+            name: string;
+            shift: boolean;
+            ctrl: boolean;
+            meta: boolean;
+            sequence: string;
+        }
     }
 
-    export function screen(options?: Widgets.IScreenOptions): Widgets.Screen;
+    interface NodeChildProcessExecOptions {
+        cwd?: string;
+        stdio?: any;
+        customFds?: any;
+        env?: any;
+        encoding?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+    }
 
-    export function box(options?: Widgets.BoxOptions): Widgets.BoxElement;
-    export function text(options?: Widgets.TextOptions): Widgets.TextElement;
-    export function line(options?: Widgets.LineOptions): Widgets.LineElement;
-    export function scrollablebox(options?: Widgets.BoxOptions): Widgets.BoxElement;
-    export function scrollabletext(options?: Widgets.BoxOptions): Widgets.BoxElement;
-    export function bigtext(options?: Widgets.BigTextOptions): Widgets.BigTextElement;
-    export function list(options?: Widgets.ListOptions<Widgets.ListElementStyle>): Widgets.ListElement;
-    export function filemanager(options?: Widgets.FileManagerOptions): Widgets.FileManagerElement;
-    export function listtable(options?: Widgets.ListTableOptions): Widgets.ListTableElement;
-    export function listbar(options?: Widgets.ListbarOptions): Widgets.ListbarElement;
-    export function form<TFormData>(options?: Widgets.FormOptions): Widgets.FormElement<TFormData>;
-    export function input(options?: Widgets.InputOptions): Widgets.InputElement;
-    export function textarea(options?: Widgets.TextareaOptions): Widgets.TextareaElement;
-    export function textbox(options?: Widgets.TextboxOptions): Widgets.TextboxElement;
-    export function button(options?: Widgets.ButtonOptions): Widgets.ButtonElement;
-    export function checkbox(options?: Widgets.CheckboxOptions): Widgets.CheckboxElement;
-    export function radioset(options?: Widgets.RadioSetOptions): Widgets.RadioSetElement;
-    export function radiobutton(options?: Widgets.RadioButtonOptions): Widgets.RadioButtonElement;
+    interface IDestroyable {
+        destroy(): void;
+    }
 
-    export function table(options?: Widgets.TableOptions): Widgets.TableElement;
+    interface IOptions {}
 
-    export function prompt(options?: Widgets.PromptOptions): Widgets.PromptElement;
-    export function question(options?: Widgets.QuestionOptions): Widgets.QuestionElement;
-    export function message(options?: Widgets.MessageOptions): Widgets.MessageElement;
-    export function loading(options?: Widgets.LoadingOptions): Widgets.LoadingElement;
+    interface IHasOptions<T extends IOptions> {
+        options: T;
+    }
 
-    export function progressbar(options?: Widgets.ProgressBarOptions): Widgets.ProgressBarElement;
-    export function terminal(options?: Widgets.TerminalOptions): Widgets.TerminalElement;
+    interface TputsOptions extends IOptions {
+        terminal?: string;
+        extended?: boolean;
+        debug?: boolean;
+        termcap?: string;
+        terminfoFile?: string;
+        terminfoPrefix?: string;
+        termcapFile?: string;
+    }
 
-    export function layout(options?: Widgets.LayoutOptions): Widgets.LayoutElement;
+    class Tput implements IHasOptions<TputsOptions> {
+        constructor(opts: TputsOptions);
 
-    export function escape(item: any): any;
-    export const colors: {
-        match: (hexColor: string) => string
+        /**
+         * Original options object.
+         */
+        options: TputsOptions;
+
+        debug: boolean;
+        padding: boolean;
+        extended: boolean;
+        printf: boolean;
+        termcap: string;
+        terminfoPrefix: string;
+        terminfoFile: string;
+        termcapFile: string;
+        error: Error;
+        terminal: string;
+
+        setup(): void;
+        term(is: any): boolean;
+        readTerminfo(term: string): string;
+        parseTerminfo(
+            data: any,
+            file: string
+        ): {
+            header: {
+                dataSize: number;
+                headerSize: number;
+                magicNumber: boolean;
+                namesSize: number;
+                boolCount: number;
+                numCount: number;
+                strCount: number;
+                strTableSize: number;
+                extended: {
+                    dataSize: number;
+                    headerSize: number;
+                    boolCount: number;
+                    numCount: number;
+                    strCount: number;
+                    strTableSize: number;
+                    lastStrTableOffset: number;
+                };
+            };
+            name: string;
+            names: string[];
+            desc: string;
+            bools: any;
+            numbers: any;
+            strings: any;
+        };
+    }
+
+    interface IDestroyable {
+        destroy(): void;
+    }
+
+    interface INodeOptions extends IOptions {
+        name?: string;
+        screen?: Screen;
+        parent?: Node;
+        children?: Node[];
+        focusable?: boolean;
+    }
+
+    type NodeEventType =
+        /** Received when node is added to a parent. */
+        | "adopt"
+        /** Received when node is removed from it's current parent. */
+        | "remove"
+        /** Received when node gains a new parent. */
+        | "reparent"
+        /** Received when node is attached to the screen directly or somewhere in its ancestry. */
+        | "attach"
+        /** Received when node is detached from the screen directly or somewhere in its ancestry. */
+        | "detach";
+
+    abstract class Node extends EventEmitter implements IHasOptions<INodeOptions>, IDestroyable {
+        constructor(options: INodeOptions);
+
+        focusable: boolean;
+
+        /**
+         * Original options object.
+         */
+        options: INodeOptions;
+
+        /**
+         * An object for any miscellanous user data.
+         */
+        data: { [index: string]: any };
+
+        /**
+         * An object for any miscellanous user data.
+         */
+        _: { [index: string]: any };
+
+        /**
+         * An object for any miscellanous user data.
+         */
+        $: { [index: string]: any };
+
+        /**
+         * Type of the node (e.g. box).
+         */
+        type: string;
+
+        /**
+         * Render index (document order index) of the last render call.
+         */
+        index: number;
+
+        /**
+         * Parent screen.
+         */
+        screen: Screen;
+
+        /**
+         * Parent node.
+         */
+        parent: Node;
+
+        /**
+         * Array of node's children.
+         */
+        children: Node[];
+
+        /**
+         * Prepend a node to this node's children.
+         */
+        prepend(node: Node): void;
+
+        /**
+         * Append a node to this node's children.
+         */
+        append(node: Node): void;
+
+        /**
+         * Remove child node from node.
+         */
+        remove(node: Node): void;
+
+        /**
+         * Insert a node to this node's children at index i.
+         */
+        insert(node: Node, index: number): void;
+
+        /**
+         * Insert a node to this node's children before the reference node.
+         */
+        insertBefore(node: Node, refNode: Node): void;
+
+        /**
+         * Insert a node from node after the reference node.
+         */
+        insertAfter(node: Node, refNode: Node): void;
+
+        /**
+         * Remove node from its parent.
+         */
+        detach(): void;
+        free(): void;
+        forDescendants(iter: (node: Node) => void, s: any): void;
+        forAncestors(iter: (node: Node) => void, s: any): void;
+        collectDescendants(s: any): void;
+        collectAncestors(s: any): void;
+
+        /**
+         * Emit event for element, and recursively emit same event for all descendants.
+         */
+        emitDescendants(type?: string, ...args: any[]): void;
+        emitAncestors(): void;
+        hasDescendant(target: Node): void;
+        hasAncestor(target: Node): boolean;
+        destroy(): void;
+
+        /**
+         * Get user property with a potential default value.
+         */
+        get<T>(name: string, def: T): T;
+
+        /**
+         * Set user property to value.
+         */
+        set(name: string, value: any): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: NodeEventType, callback: (arg: Node) => void): this;
+    }
+
+    type NodeScreenEventType =
+        /**
+         * Received when the terminal window focuses/blurs. Requires a terminal supporting the
+         * focus protocol and focus needs to be passed to program.enableMouse().
+         */
+        | "focus"
+        /**
+         * Received when the terminal window focuses/blurs. Requires a terminal supporting the
+         * focus protocol and focus needs to be passed to program.enableMouse().
+         */
+        | "blur"
+        /**
+         * Element was clicked (slightly smarter than mouseup).
+         */
+        | "click"
+        | "element click"
+        | "element mouseover"
+        | "element mouseout"
+        | "element mouseup";
+
+    type NodeMouseEventType =
+        | "mouse"
+        | "mouseout"
+        | "mouseover"
+        | "mousedown"
+        | "mouseup"
+        | "mousewheel"
+        | "wheeldown"
+        | "wheelup"
+        | "mousemove";
+
+    type NodeGenericEventType =
+        /** Received on screen resize. */
+        | "resize"
+        /** Received before render. */
+        | "prerender"
+        /** Received on render. */
+        | "render"
+        /** Received when the screen is destroyed (only useful when using multiple screens). */
+        | "destroy"
+        /** Received when the element is moved. */
+        | "move"
+        /** Received when element is shown. */
+        | "show"
+        /** Received when element becomes hidden. */
+        | "hide"
+        | "set content"
+        | "parsed content";
+
+    class NodeWithEvents extends Node {
+        /**
+         * Bind a keypress listener for a specific key.
+         */
+        key(name: string | string[], listener: (ch: any, key: Events.IKeyEventArg) => void): void;
+
+        /**
+         * Bind a keypress listener for a specific key once.
+         */
+        onceKey(name: string, listener: (ch: any, key: Events.IKeyEventArg) => void): void;
+
+        /**
+         * Remove a keypress listener for a specific key.
+         */
+        unkey(name: string, listener: (ch: any, key: Events.IKeyEventArg) => void): void;
+        removeKey(name: string, listener: (ch: any, key: Events.IKeyEventArg) => void): void;
+
+        on(event: string, listener: (ch: any, key: Events.IKeyEventArg) => void): this;
+        /** Received on mouse events. */
+        on(event: NodeMouseEventType, callback: (arg: Events.IMouseEventArg) => void): this;
+        /** Received on key events. */
+        on(event: "keypress", callback: (ch: string, key: Events.IKeyEventArg) => void): this;
+        on(event: NodeScreenEventType, callback: (arg: Screen) => void): this;
+        /** Received when blessed notices something untoward (output is not a tty, terminfo not found, etc). */
+        on(event: "warning", callback: (text: string) => void): this;
+        on(event: NodeGenericEventType, callback: () => void): this;
+    }
+
+    interface IScreenOptions extends INodeOptions {
+        /**
+         * The blessed Program to be associated with. Will be automatically instantiated if none is provided.
+         */
+        program?: BlessedProgram;
+
+        /**
+         * Attempt to perform CSR optimization on all possible elements (not just full-width ones, elements with
+         * uniform cells to their sides). This is known to cause flickering with elements that are not full-width,
+         * however, it is more optimal for terminal rendering.
+         */
+        smartCSR?: boolean;
+
+        /**
+         * Do CSR on any element within 20 cols of the screen edge on either side. Faster than smartCSR,
+         * but may cause flickering depending on what is on each side of the element.
+         */
+        fastCSR?: boolean;
+
+        /**
+         * Attempt to perform back_color_erase optimizations for terminals that support it. It will also work
+         * with terminals that don't support it, but only on lines with the default background color. As it
+         * stands with the current implementation, it's uncertain how much terminal performance this adds at
+         * the cost of overhead within node.
+         */
+        useBCE?: boolean;
+
+        /**
+         * Amount of time (in ms) to redraw the screen after the terminal is resized (Default: 300).
+         */
+        resizeTimeout?: number;
+
+        /**
+         * The width of tabs within an element's content.
+         */
+        tabSize?: number;
+
+        /**
+         * Automatically position child elements with border and padding in mind (NOTE: this is a recommended
+         * option. It may become default in the future).
+         */
+        autoPadding?: boolean;
+
+        cursor?: Types.TCursor;
+
+        /**
+         * Create a log file. See log method.
+         */
+        log?(...msg: any[]): void;
+
+        /**
+         * Dump all output and input to desired file. Can be used together with log option if set as a boolean.
+         */
+        dump?: string;
+
+        /**
+         * Debug mode. Enables usage of the debug method. Also creates a debug console which will display when
+         * pressing F12. It will display all log and debug messages.
+         */
+        debug?(...msg: string[]): void;
+
+        /**
+         * Array of keys in their full format (e.g. C-c) to ignore when keys are locked or grabbed. Useful
+         * for creating a key that will always exit no matter whether the keys are locked.
+         */
+        ignoreLocked?: boolean;
+
+        /**
+         * Automatically "dock" borders with other elements instead of overlapping, depending on position
+         * (experimental). For example: These border-overlapped elements:
+         */
+        dockBorders?: boolean;
+
+        /**
+         * Normally, dockable borders will not dock if the colors or attributes are different. This option
+         * will allow them to dock regardless. It may produce some odd looking multi-colored borders though.
+         */
+        ignoreDockContrast?: boolean;
+
+        /**
+         * Allow for rendering of East Asian double-width characters, utf-16 surrogate pairs, and unicode
+         * combining characters. This allows you to display text above the basic multilingual plane. This
+         * is behind an option because it may affect performance slightly negatively. Without this option
+         * enabled, all double-width, surrogate pair, and combining characters will be replaced by '??',
+         * '?', '' respectively. (NOTE: iTerm2 cannot display combining characters properly. Blessed simply
+         * removes them from an element's content if iTerm2 is detected).
+         */
+        fullUnicode?: boolean;
+
+        /**
+         * Send focus events after mouse is enabled.
+         */
+        sendFocus?: boolean;
+
+        /**
+         * Display warnings (such as the output not being a TTY, similar to ncurses).
+         */
+        warnings?: boolean;
+
+        /**
+         * Force blessed to use unicode even if it is not detected via terminfo, env variables, or windows code page.
+         * If value is true unicode is forced. If value is false non-unicode is forced (default: null).
+         */
+        forceUnicode?: boolean;
+
+        /**
+         * Input and output streams. process.stdin/process.stdout by default, however, it could be a
+         * net.Socket if you want to make a program that runs over telnet or something of that nature.
+         */
+        input?: stream.Writable;
+
+        /**
+         * Input and output streams. process.stdin/process.stdout by default, however, it could be a
+         * net.Socket if you want to make a program that runs over telnet or something of that nature.
+         */
+        output?: stream.Readable;
+
+        /**
+         * The blessed Tput object (only available if you passed tput: true to the Program constructor.)
+         */
+        tput?: Tput;
+
+        /**
+         * Top of the focus history stack.
+         */
+        focused?: BlessedElement;
+
+        /**
+         * Width of the screen (same as program.cols).
+         */
+        width?: Types.TPosition;
+
+        /**
+         * Height of the screen (same as program.rows).
+         */
+        height?: Types.TPosition;
+
+        /**
+         * Same as screen.width.
+         */
+        cols?: number;
+
+        /**
+         * Same as screen.height.
+         */
+        rows?: number;
+
+        /**
+         * Relative top offset, always zero.
+         */
+        top?: Types.TTopLeft;
+
+        /**
+         * Relative left offset, always zero.
+         */
+        left?: Types.TTopLeft;
+
+        /**
+         * Relative right offset, always zero.
+         */
+        right?: Types.TPosition;
+
+        /**
+         * Relative bottom offset, always zero.
+         */
+        bottom?: Types.TPosition;
+
+        /**
+         * Absolute top offset, always zero.
+         */
+        atop?: Types.TTopLeft;
+
+        /**
+         * Absolute left offset, always zero.
+         */
+        aleft?: Types.TTopLeft;
+
+        /**
+         * Absolute right offset, always zero.
+         */
+        aright?: Types.TPosition;
+
+        /**
+         * Absolute bottom offset, always zero.
+         */
+        abottom?: Types.TPosition;
+
+        /**
+         * Whether the focused element grabs all keypresses.
+         */
+        grabKeys?: any;
+
+        /**
+         * Prevent keypresses from being received by any element.
+         */
+        lockKeys?: boolean;
+
+        /**
+         * The currently hovered element. Only set if mouse events are bound.
+         */
+        hover?: any;
+
+        /**
+         * Set or get terminal name. Set calls screen.setTerminal() internally.
+         */
+        terminal?: string;
+
+        /**
+         * Set or get window title.
+         */
+        title?: string;
+    }
+
+    class Screen extends NodeWithEvents implements IHasOptions<IScreenOptions> {
+        constructor(opts: IScreenOptions);
+
+        cleanSides: any;
+
+        /**
+         * Original options object.
+         */
+        options: IScreenOptions;
+
+        /**
+         * The blessed Program to be associated with. Will be automatically instantiated if none is provided.
+         */
+        program: BlessedProgram;
+
+        /**
+         * Attempt to perform CSR optimization on all possible elements (not just full-width ones, elements with
+         * uniform cells to their sides). This is known to cause flickering with elements that are not full-width,
+         * however, it is more optimal for terminal rendering.
+         */
+        smartCSR: boolean;
+
+        /**
+         * Do CSR on any element within 20 cols of the screen edge on either side. Faster than smartCSR,
+         * but may cause flickering depending on what is on each side of the element.
+         */
+        fastCSR: boolean;
+
+        /**
+         * Attempt to perform back_color_erase optimizations for terminals that support it. It will also work
+         * with terminals that don't support it, but only on lines with the default background color. As it
+         * stands with the current implementation, it's uncertain how much terminal performance this adds at
+         * the cost of overhead within node.
+         */
+        useBCE: boolean;
+
+        /**
+         * Amount of time (in ms) to redraw the screen after the terminal is resized (Default: 300).
+         */
+        resizeTimeout: number;
+
+        /**
+         * The width of tabs within an element's content.
+         */
+        tabSize: number;
+
+        /**
+         * Automatically position child elements with border and padding in mind (NOTE: this is a recommended
+         * option. It may become default in the future).
+         */
+        autoPadding: boolean;
+
+        cursor: Types.TCursor;
+
+        /**
+         * Dump all output and input to desired file. Can be used together with log option if set as a boolean.
+         */
+        dump: string;
+
+        /**
+         * Array of keys in their full format (e.g. C-c) to ignore when keys are locked or grabbed. Useful
+         * for creating a key that will always exit no matter whether the keys are locked.
+         */
+        ignoreLocked: boolean;
+
+        /**
+         * Automatically "dock" borders with other elements instead of overlapping, depending on position
+         * (experimental). For example: These border-overlapped elements:
+         */
+        dockBorders: boolean;
+
+        /**
+         * Normally, dockable borders will not dock if the colors or attributes are different. This option
+         * will allow them to dock regardless. It may produce some odd looking multi-colored borders though.
+         */
+        ignoreDockContrast: boolean;
+
+        /**
+         * Allow for rendering of East Asian double-width characters, utf-16 surrogate pairs, and unicode
+         * combining characters. This allows you to display text above the basic multilingual plane. This
+         * is behind an option because it may affect performance slightly negatively. Without this option
+         * enabled, all double-width, surrogate pair, and combining characters will be replaced by '??',
+         * '?', '' respectively. (NOTE: iTerm2 cannot display combining characters properly. Blessed simply
+         * removes them from an element's content if iTerm2 is detected).
+         */
+        fullUnicode: boolean;
+
+        /**
+         * Send focus events after mouse is enabled.
+         */
+        sendFocus: boolean;
+
+        /**
+         * Display warnings (such as the output not being a TTY, similar to ncurses).
+         */
+        warnings: boolean;
+
+        /**
+         * Force blessed to use unicode even if it is not detected via terminfo, env variables, or windows code page.
+         * If value is true unicode is forced. If value is false non-unicode is forced (default: null).
+         */
+        forceUnicode: boolean;
+
+        /**
+         * Input and output streams. process.stdin/process.stdout by default, however, it could be a
+         * net.Socket if you want to make a program that runs over telnet or something of that nature.
+         */
+        input: stream.Writable;
+
+        /**
+         * Input and output streams. process.stdin/process.stdout by default, however, it could be a
+         * net.Socket if you want to make a program that runs over telnet or something of that nature.
+         */
+        output: stream.Readable;
+
+        /**
+         * The blessed Tput object (only available if you passed tput: true to the Program constructor.)
+         */
+        tput: Tput;
+
+        /**
+         * Top of the focus history stack.
+         */
+        focused: BlessedElement;
+
+        /**
+         * Width of the screen (same as program.cols).
+         */
+        width: Types.TPosition;
+
+        /**
+         * Height of the screen (same as program.rows).
+         */
+        height: Types.TPosition;
+
+        /**
+         * Same as screen.width.
+         */
+        cols: number;
+
+        /**
+         * Same as screen.height.
+         */
+        rows: number;
+
+        /**
+         * Relative top offset, always zero.
+         */
+        top: Types.TTopLeft;
+
+        /**
+         * Relative left offset, always zero.
+         */
+        left: Types.TTopLeft;
+
+        /**
+         * Relative right offset, always zero.
+         */
+        right: Types.TPosition;
+
+        /**
+         * Relative bottom offset, always zero.
+         */
+        bottom: Types.TPosition;
+
+        /**
+         * Absolute top offset, always zero.
+         */
+        atop: Types.TTopLeft;
+
+        /**
+         * Absolute left offset, always zero.
+         */
+        aleft: Types.TTopLeft;
+
+        /**
+         * Absolute right offset, always zero.
+         */
+        aright: Types.TPosition;
+
+        /**
+         * Absolute bottom offset, always zero.
+         */
+        abottom: Types.TPosition;
+
+        /**
+         * Whether the focused element grabs all keypresses.
+         */
+        grabKeys: any;
+
+        /**
+         * Prevent keypresses from being received by any element.
+         */
+        lockKeys: boolean;
+
+        /**
+         * The currently hovered element. Only set if mouse events are bound.
+         */
+        hover: any;
+
+        /**
+         * Set or get terminal name. Set calls screen.setTerminal() internally.
+         */
+        terminal: string;
+
+        /**
+         * Set or get window title.
+         */
+        title: string;
+
+        /**
+         * Write string to the log file if one was created.
+         */
+        log(...msg: any[]): void;
+
+        /**
+         * Same as the log method, but only gets called if the debug option was set.
+         */
+        debug(...msg: string[]): void;
+
+        /**
+         * Allocate a new pending screen buffer and a new output screen buffer.
+         */
+        alloc(): void;
+
+        /**
+         * Reallocate the screen buffers and clear the screen.
+         */
+        realloc(): void;
+
+        /**
+         * Draw the screen based on the contents of the screen buffer.
+         */
+        draw(start: number, end: number): void;
+
+        /**
+         * Render all child elements, writing all data to the screen buffer and drawing the screen.
+         */
+        render(): void;
+
+        /**
+         * Clear any region on the screen.
+         */
+        clearRegion(x1: number, x2: number, y1: number, y2: number): void;
+
+        /**
+         * Fill any region with a character of a certain attribute.
+         */
+        fillRegion(attr: string, ch: string, x1: number, x2: number, y1: number, y2: number): void;
+
+        /**
+         * Focus element by offset of focusable elements.
+         */
+        focusOffset(offset: number): any;
+
+        /**
+         * Focus previous element in the index.
+         */
+        focusPrevious(): void;
+
+        /**
+         * Focus next element in the index.
+         */
+        focusNext(): void;
+
+        /**
+         * Push element on the focus stack (equivalent to screen.focused = el).
+         */
+        focusPush(element: BlessedElement): void;
+
+        /**
+         * Pop element off the focus stack.
+         */
+        focusPop(): BlessedElement;
+
+        /**
+         * Save the focused element.
+         */
+        saveFocus(): BlessedElement;
+
+        /**
+         * Restore the saved focused element.
+         */
+        restoreFocus(): BlessedElement;
+
+        /**
+         * "Rewind" focus to the last visible and attached element.
+         */
+        rewindFocus(): BlessedElement;
+
+        /**
+         * Spawn a process in the foreground, return to blessed app after exit.
+         */
+        spawn(file: string, args: string[], options: NodeChildProcessExecOptions): child_process.ChildProcess;
+
+        /**
+         * Spawn a process in the foreground, return to blessed app after exit. Executes callback on error or exit.
+         */
+        exec(
+            file: string,
+            args: string[],
+            options: NodeChildProcessExecOptions,
+            callback: (...args: any[]) => void
+        ): child_process.ChildProcess;
+
+        /**
+         * Read data from text editor.
+         */
+        readEditor(options: any, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+        readEditor(callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+        /**
+         * Set effects based on two events and attributes.
+         */
+        setEffects(el: BlessedElement, fel: BlessedElement, over: any, out: any, effects: any, temp: any): void;
+
+        /**
+         * Insert a line into the screen (using csr: this bypasses the output buffer).
+         */
+        insertLine(n: number, y: number, top: number, bottom: number): void;
+
+        /**
+         * Delete a line from the screen (using csr: this bypasses the output buffer).
+         */
+        deleteLine(n: number, y: number, top: number, bottom: number): void;
+
+        /**
+         * Insert a line at the bottom of the screen.
+         */
+        insertBottom(top: number, bottom: number): void;
+
+        /**
+         * Insert a line at the top of the screen.
+         */
+        insertTop(top: number, bottom: number): void;
+
+        /**
+         * Delete a line at the bottom of the screen.
+         */
+        deleteBottom(top: number, bottom: number): void;
+
+        /**
+         * Delete a line at the top of the screen.
+         */
+        deleteTop(top: number, bottom: number): void;
+
+        /**
+         * Enable mouse events for the screen and optionally an element (automatically called when a form of
+         * on('mouse') is bound).
+         */
+        enableMouse(el?: BlessedElement): void;
+
+        /**
+         * Enable keypress events for the screen and optionally an element (automatically called when a form of
+         * on('keypress') is bound).
+         */
+        enableKeys(el?: BlessedElement): void;
+
+        /**
+         * Enable key and mouse events. Calls bot enableMouse and enableKeys.
+         */
+        enableInput(el?: BlessedElement): void;
+
+        /**
+         * Attempt to copy text to clipboard using iTerm2's proprietary sequence. Returns true if successful.
+         */
+        copyToClipboard(text: string): void;
+
+        /**
+         * Attempt to change cursor shape. Will not work in all terminals (see artificial cursors for a solution
+         * to this). Returns true if successful.
+         */
+        cursorShape(shape: boolean, blink: boolean): any;
+
+        /**
+         * Attempt to change cursor color. Returns true if successful.
+         */
+        cursorColor(color: string): void;
+
+        /**
+         * Attempt to reset cursor. Returns true if successful.
+         */
+        cursorReset(): void;
+
+        /**
+         * Take an SGR screenshot of the screen within the region. Returns a string containing only
+         * characters and SGR codes. Can be displayed by simply echoing it in a terminal.
+         */
+        screenshot(xi: number, xl: number, yi: number, yl: number): string;
+        screenshot(): void;
+
+        /**
+         * Destroy the screen object and remove it from the global list. Also remove all global events relevant
+         * to the screen object. If all screen objects are destroyed, the node process is essentially reset
+         * to its initial state.
+         */
+        destroy(): void;
+
+        /**
+         * Reset the terminal to term. Reloads terminfo.
+         */
+        setTerminal(term: string): void;
+    }
+
+    interface Padding {
+        left?: number;
+        right?: number;
+        top?: number;
+        bottom?: number;
+    }
+
+    class PositionCoords {
+        xi: number;
+        xl: number;
+        yi: number;
+        yl: number;
+    }
+
+    interface Position {
+        left: number | string;
+        right: number | string;
+        top: number | string;
+        bottom: number | string;
+    }
+
+    interface Border {
+        /**
+         * Type of border (line or bg). bg by default.
+         */
+        type?: "line" | "bg";
+
+        /**
+         * Character to use if bg type, default is space.
+         */
+        ch?: string;
+
+        /**
+         * Border foreground and background, must be numbers (-1 for default).
+         */
+        bg?: number;
+        fg?: number;
+
+        /**
+         * Border attributes.
+         */
+        bold?: string;
+        underline?: string;
+    }
+
+    interface ElementOptions extends INodeOptions {
+        tags?: boolean;
+
+        fg?: string;
+        bg?: string;
+        bold?: string;
+        underline?: string;
+
+        style?: any;
+
+        /**
+         * Border object, see below.
+         */
+        border?: Border | "line" | "bg";
+
+        /**
+         * Element's text content.
+         */
+        content?: string;
+
+        /**
+         * Element is clickable.
+         */
+        clickable?: boolean;
+
+        /**
+         * Element is focusable and can receive key input.
+         */
+        input?: boolean;
+        keyable?: boolean;
+
+        /**
+         * Element is focused.
+         */
+        focused?: BlessedElement;
+
+        /**
+         * Whether the element is hidden.
+         */
+        hidden?: boolean;
+
+        /**
+         * A simple text label for the element.
+         */
+        label?: string;
+
+        /**
+         * A floating text label for the element which appears on mouseover.
+         */
+        hoverText?: string;
+
+        /**
+         * Text alignment: left, center, or right.
+         */
+        align?: "left" | "center" | "right";
+
+        /**
+         * Vertical text alignment: top, middle, or bottom.
+         */
+        valign?: "top" | "middle" | "bottom";
+
+        /**
+         * Shrink/flex/grow to content and child elements. Width/height during render.
+         */
+        shrink?: boolean;
+
+        /**
+         * Amount of padding on the inside of the element. Can be a number or an object containing
+         * the properties: left, right, top, and bottom.
+         */
+        padding?: number | Padding;
+
+        top?: Types.TTopLeft;
+        left?: Types.TTopLeft;
+        right?: Types.TPosition;
+        bottom?: Types.TPosition;
+
+        /**
+         * Width/height of the element, can be a number, percentage (0-100%), or keyword (half or shrink).
+         * Percentages can also have offsets (50%+1, 50%-1).
+         */
+        width?: number | string;
+
+        /**
+         * Offsets of the element relative to its parent. Can be a number, percentage (0-100%), or
+         * keyword (center). right and bottom do not accept keywords. Percentages can also have
+         * offsets (50%+1, 50%-1).
+         */
+        height?: number | string;
+
+        /**
+         * Can contain the above options.
+         */
+        position?: Position;
+
+        /**
+         * Whether the element is scrollable or not.
+         */
+        scrollable?: boolean;
+
+        /**
+         * Background character (default is whitespace ).
+         */
+        ch?: string;
+
+        /**
+         * Allow the element to be dragged with the mouse.
+         */
+        draggable?: boolean;
+
+        /**
+         * Draw a translucent offset shadow behind the element.
+         */
+        shadow?: boolean;
+    }
+
+    interface Coords {
+        xl: number;
+        xi: number;
+        yl: number;
+        yi: number;
+        base: number;
+        _contentEnd: { x: number; y: number };
+        notop: Types.TTopLeft;
+        noleft: Types.TTopLeft;
+        noright: Types.TPosition;
+        nobot: Types.TPosition;
+    }
+
+    interface LabelOptions {
+        text: string;
+        side: Types.TAlign;
+    }
+
+    // TODO: scrollable - Note: If the scrollable option is enabled, Element inherits all methods from ScrollableBox.
+    abstract class BlessedElement extends NodeWithEvents implements IHasOptions<ElementOptions> {
+        constructor(opts: ElementOptions);
+
+        /**
+         * Original options object.
+         */
+        options: ElementOptions;
+
+        /**
+         * Name of the element. Useful for form submission.
+         */
+        name: string;
+
+        /**
+         * Border object.
+         */
+        border: Border;
+
+        style: any;
+        position: Position;
+        content: string;
+        hidden: boolean;
+        visible: boolean;
+        detached: boolean;
+
+        /**
+         * Border foreground and background, must be numbers (-1 for default).
+         */
+        bg: number;
+        fg: number;
+
+        /**
+         * Border attributes.
+         */
+        bold: string;
+        underline: string;
+
+        /**
+         * Calculated width.
+         */
+        width: number | string;
+
+        /**
+         * Calculated height.
+         */
+        height: number | string;
+
+        /**
+         * Calculated relative top offset.
+         */
+        top: Types.TTopLeft;
+
+        /**
+         * Calculated relative left offset.
+         */
+        left: Types.TTopLeft;
+
+        /**
+         * Calculated relative right offset.
+         */
+        right: Types.TPosition;
+
+        /**
+         * Calculated relative bottom offset.
+         */
+        bottom: Types.TPosition;
+
+        /**
+         * Calculated absolute top offset.
+         */
+        atop: Types.TTopLeft;
+
+        /**
+         * Calculated absolute left offset.
+         */
+        aleft: Types.TTopLeft;
+
+        /**
+         * Calculated absolute right offset.
+         */
+        aright: Types.TPosition;
+
+        /**
+         * Calculated absolute bottom offset.
+         */
+        abottom: Types.TPosition;
+
+        /**
+         * Whether the element is draggable. Set to true to allow dragging.
+         */
+        draggable: boolean;
+
+        itop: Types.TTopLeft;
+        ileft: Types.TTopLeft;
+        iheight: Types.TPosition;
+        iwidth: Types.TPosition;
+
+        /**
+         * Calculated relative top offset.
+         */
+        rtop: Types.TTopLeft;
+
+        /**
+         * Calculated relative left offset.
+         */
+        rleft: Types.TTopLeft;
+
+        /**
+         * Calculated relative right offset.
+         */
+        rright: Types.TPosition;
+
+        /**
+         * Calculated relative bottom offset.
+         */
+        rbottom: Types.TPosition;
+
+        lpos: PositionCoords;
+
+        /**
+         * Write content and children to the screen buffer.
+         */
+        render(): Coords;
+
+        /**
+         * Hide element.
+         */
+        hide(): void;
+
+        /**
+         * Show element.
+         */
+        show(): void;
+
+        /**
+         * Toggle hidden/shown.
+         */
+        toggle(): void;
+
+        /**
+         * Focus element.
+         */
+        focus(): void;
+
+        /**
+         * Same asel.on('screen', ...) except this will automatically keep track of which listeners
+         * are bound to the screen object. For use with removeScreenEvent(), free(), and destroy().
+         */
+        onScreenEvent(type: string, handler: (...args: any[]) => void): void;
+
+        /**
+         * Same asel.removeListener('screen', ...) except this will automatically keep track of which
+         * listeners are bound to the screen object. For use with onScreenEvent(), free(), and destroy().
+         */
+        removeScreenEvent(type: string, handler: (...args: any[]) => void): void;
+
+        /**
+         * Free up the element. Automatically unbind all events that may have been bound to the screen
+         * object. This prevents memory leaks. For use with onScreenEvent(), removeScreenEvent(),
+         * and destroy().
+         */
+        free(): void;
+
+        /**
+         * Same as the detach() method, except this will automatically call free() and unbind any screen
+         * events to prevent memory leaks. for use with onScreenEvent(), removeScreenEvent(), and free().
+         */
+        destroy(): void;
+
+        /**
+         * Set the z-index of the element (changes rendering order).
+         */
+        setIndex(z: number): void;
+
+        /**
+         * Put the element in front of its siblings.
+         */
+        setFront(): void;
+
+        /**
+         * Put the element in back of its siblings.
+         */
+        setBack(): void;
+
+        /**
+         * text/options - Set the label text for the top-left corner. Example options: {text:'foo',side:'left'}
+         */
+        setLabel(arg: string | LabelOptions): void;
+
+        /**
+         * Remove the label completely.
+         */
+        removeLabel(): any;
+
+        /**
+         * text/options - Set a hover text box to follow the cursor. Similar to the "title" DOM attribute
+         * in the browser. Example options: {text:'foo'}
+         */
+        setHover(arg: string | LabelOptions): void;
+
+        /**
+         * Remove the hover label completely.
+         */
+        removeHover(): void;
+
+        /**
+         * Enable mouse events for the element (automatically called when a form of on('mouse') is bound).
+         */
+        enableMouse(): void;
+
+        /**
+         * Enable keypress events for the element (automatically called when a form of on('keypress') is bound).
+         */
+        enableKeys(): void;
+
+        /**
+         * Enable key and mouse events. Calls bot enableMouse and enableKeys.
+         */
+        enableInput(): void;
+
+        /**
+         * Enable dragging of the element.
+         */
+        enableDrag(): void;
+
+        /**
+         * Disable dragging of the element.
+         */
+        disableDrag(): void;
+
+        /**
+         * Take an SGR screenshot of the screen within the region. Returns a string containing only
+         * characters and SGR codes. Can be displayed by simply echoing it in a terminal.
+         */
+        screenshot(xi: number, xl: number, yi: number, yl: number): string;
+        screenshot(): void;
+
+        /*
+            Content Methods
+
+            Methods for dealing with text content, line by line. Useful for writing a text editor,
+            irc client, etc.
+
+            Note: All of these methods deal with pre-aligned, pre-wrapped text. If you use deleteTop()
+            on a box with a wrapped line at the top, it may remove 3-4 "real" lines (rows) depending
+            on how long the original line was.
+
+            The lines parameter can be a string or an array of strings. The line parameter must
+            be a string.
+        */
+
+        /**
+         * Set the content. Note: When text is input, it will be stripped of all non-SGR
+         * escape codes, tabs will be replaced with 8 spaces, and tags will be replaced
+         * with SGR codes (if enabled).
+         */
+        setContent(text: string): void;
+
+        /**
+         * Return content, slightly different from el.content. Assume the above formatting.
+         */
+        getContent(): string;
+
+        /**
+         * Similar to setContent, but ignore tags and remove escape codes.
+         */
+        setText(text: string): void;
+
+        /**
+         * Similar to getContent, but return content with tags and escape codes removed.
+         */
+        getText(): string;
+
+        /**
+         * Insert a line into the box's content.
+         */
+        insertLine(i: number, lines: string | string[]): void;
+
+        /**
+         * Delete a line from the box's content.
+         */
+        deleteLine(i: number): void;
+
+        /**
+         * Get a line from the box's content.
+         */
+        getLine(i: number): string;
+
+        /**
+         * Get a line from the box's content from the visible top.
+         */
+        getBaseLine(i: number): string;
+
+        /**
+         * Set a line in the box's content.
+         */
+        setLine(i: number, line: string | string[]): void;
+
+        /**
+         * Set a line in the box's content from the visible top.
+         */
+        setBaseLine(i: number, line: string | string[]): void;
+
+        /**
+         * Clear a line from the box's content.
+         */
+        clearLine(i: number): void;
+
+        /**
+         * Clear a line from the box's content from the visible top.
+         */
+        clearBaseLine(i: number): void;
+
+        /**
+         * Insert a line at the top of the box.
+         */
+        insertTop(lines: string | string[]): void;
+
+        /**
+         * Insert a line at the bottom of the box.
+         */
+        insertBottom(lines: string | string[]): void;
+
+        /**
+         * Delete a line at the top of the box.
+         */
+        deleteTop(): void;
+
+        /**
+         * Delete a line at the bottom of the box.
+         */
+        deleteBottom(): void;
+
+        /**
+         * Unshift a line onto the top of the content.
+         */
+        unshiftLine(lines: string | string[]): void;
+
+        /**
+         * Shift a line off the top of the content.
+         */
+        shiftLine(i: number): void;
+
+        /**
+         * Push a line onto the bottom of the content.
+         */
+        pushLine(lines: string | string[]): void;
+
+        /**
+         * Pop a line off the bottom of the content.
+         */
+        popLine(i: number): string;
+
+        /**
+         * An array containing the content lines.
+         */
+        getLines(): string[];
+
+        /**
+         * An array containing the lines as they are displayed on the screen.
+         */
+        getScreenLines(): string[];
+
+        /**
+         * Get a string's displayed width, taking into account double-width, surrogate pairs,
+         * combining characters, tags, and SGR escape codes.
+         */
+        strWidth(text: string): string;
+    }
+
+    interface ScrollableBoxOptions extends ElementOptions {
+        /**
+         * A limit to the childBase. Default is Infinity.
+         */
+        baseLimit?: number;
+
+        /**
+         * A option which causes the ignoring of childOffset. This in turn causes the
+         * childBase to change every time the element is scrolled.
+         */
+        alwaysScroll?: boolean;
+
+        /**
+         * Object enabling a scrollbar.
+         * Style of the scrollbar track if present (takes regular style options).
+         */
+        scrollbar?: { style?: any; track?: any; ch?: string };
+    }
+
+    interface ScrollableTextOptions extends ScrollableBoxOptions {
+        /**
+         * Whether to enable automatic mouse support for this element.
+         * Use pre-defined mouse events (right-click for editor).
+         */
+        mouse?: boolean | (() => void);
+
+        /**
+         * Use pre-defined keys (i or enter for insert, e for editor, C-e for editor while inserting).
+         */
+        keys?: string | string[] | boolean;
+
+        /**
+         * Use vi keys with the keys option.
+         */
+        vi?: boolean;
+    }
+
+    interface BoxOptions extends ScrollableTextOptions {
+        bindings?: any;
+    }
+
+    /**
+     * DEPRECATED - Use Box with the scrollable option instead. A box with scrollable content.
+     */
+    class ScrollableBoxElement extends BlessedElement {
+        /**
+         * The offset of the top of the scroll content.
+         */
+        childBase: number;
+
+        /**
+         * The offset of the chosen item/line.
+         */
+        childOffset: number;
+
+        /**
+         * Scroll the content by a relative offset.
+         */
+        scroll(offset: number, always?: boolean): void;
+
+        /**
+         * Scroll the content to an absolute index.
+         */
+        scrollTo(index: number): void;
+
+        /**
+         * Same as scrollTo.
+         */
+        setScroll(index: number): void;
+
+        /**
+         * Set the current scroll index in percentage (0-100).
+         */
+        setScrollPerc(perc: number): void;
+
+        /**
+         * Get the current scroll index in lines.
+         */
+        getScroll(): number;
+
+        /**
+         * Get the actual height of the scrolling area.
+         */
+        getScrollHeight(): number;
+
+        /**
+         * Get the current scroll index in percentage.
+         */
+        getScrollPerc(): number;
+
+        /**
+         * Reset the scroll index to its initial state.
+         */
+        resetScroll(): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Received when the element is scrolled.
+         */
+        on(event: "scroll", callback: () => void): this;
+    }
+
+    /**
+     * DEPRECATED - Use Box with the scrollable and alwaysScroll options instead.
+     * A scrollable text box which can display and scroll text, as well as handle
+     * pre-existing newlines and escape codes.
+     */
+    class ScrollableTextElement extends ScrollableBoxElement {}
+
+    /**
+     * A box element which draws a simple box containing content or other elements.
+     */
+    class BoxElement extends ScrollableTextElement implements IHasOptions<BoxOptions> {
+        constructor(opts: BoxOptions);
+
+        /**
+         * Original options object.
+         */
+        options: BoxOptions;
+    }
+
+    interface TextOptions extends ElementOptions {
+        /**
+         * Fill the entire line with chosen bg until parent bg ends, even if there
+         * is not enough text to fill the entire width.
+         */
+        fill?: boolean;
+
+        /**
+         * Text alignment: left, center, or right.
+         */
+        align?: Types.TAlign;
+    }
+
+    /**
+     * An element similar to Box, but geared towards rendering simple text elements.
+     */
+    class TextElement extends BlessedElement implements IHasOptions<TextOptions> {
+        constructor(opts: TextOptions);
+
+        /**
+         * Original options object.
+         */
+        options: TextOptions;
+    }
+
+    /**
+     * A simple line which can be line or bg styled.
+     */
+    interface LineOptions extends BoxOptions {
+        /**
+         * Can be vertical or horizontal.
+         */
+        orientation?: "vertical" | "horizontal";
+
+        /**
+         * Treated the same as a border object. (attributes can be contained in style).
+         */
+        type?: string;
+        bg?: string;
+        fg?: string;
+        ch?: string;
+    }
+
+    /**
+     * A simple line which can be line or bg styled.
+     */
+    class LineElement extends BoxElement implements IHasOptions<LineOptions> {
+        constructor(opts: LineOptions);
+
+        /**
+         * Original options object.
+         */
+        options: LineOptions;
+    }
+
+    interface BigTextOptions extends BoxOptions {
+        /**
+         * bdf->json font file to use (see ttystudio for instructions on compiling BDFs to JSON).
+         */
+        font?: string;
+
+        /**
+         * bdf->json bold font file to use (see ttystudio for instructions on compiling BDFs to JSON).
+         */
+        fontBold?: string;
+
+        /**
+         * foreground character. (default: ' ')
+         */
+        fch?: string;
+    }
+
+    /**
+     * A box which can render content drawn as 8x14 cell characters using the terminus font.
+     */
+    class BigTextElement extends BoxElement implements IHasOptions<BigTextOptions> {
+        constructor(opts: BigTextOptions);
+
+        /**
+         * Original options object.
+         */
+        options: BigTextOptions;
+    }
+
+    interface ListElementStyle {
+        selected?: any;
+        item?: any;
+    }
+
+    interface ListOptions<TStyle extends ListElementStyle> extends BoxOptions {
+        /**
+         * Style for a selected item. Style for an unselected item.
+         */
+        style?: TStyle;
+
+        /**
+         * An array of strings which become the list's items.
+         */
+        items?: string[];
+
+        /**
+         * A function that is called when vi mode is enabled and the key / is pressed. This function accepts a
+         * callback function which should be called with the search string. The search string is then used to
+         * jump to an item that is found in items.
+         */
+        search?(err: any, value?: string): void;
+
+        /**
+         * Whether the list is interactive and can have items selected (Default: true).
+         */
+        interactive?: boolean;
+
+        /**
+         * Whether to automatically override tags and invert fg of item when selected (Default: true).
+         */
+        invertSelected?: boolean;
+    }
+
+    type ListElementEventType =
+        /** List was canceled (when esc is pressed with the keys option). */
+        | "cancel"
+        /** Either a select or a cancel event was received. */
+        | "action"
+        | "create item"
+        | "add item"
+        | "remove item"
+        | "insert item"
+        | "set items";
+
+    class ListElement extends BoxElement implements IHasOptions<ListOptions<ListElementStyle>> {
+        constructor(opts: ListOptions<ListElementStyle>);
+
+        /**
+         * Original options object.
+         */
+        options: ListOptions<ListElementStyle>;
+
+        /**
+         * Add an item based on a string.
+         */
+        add(text: string): void;
+
+        /**
+         * Add an item based on a string.
+         */
+        addItem(text: string): void;
+
+        /**
+         * Removes an item from the list. Child can be an element, index, or string.
+         */
+        removeItem(child: BlessedElement): BlessedElement;
+
+        /**
+         * Push an item onto the list.
+         */
+        pushItem(child: BlessedElement): number;
+
+        /**
+         * Pop an item off the list.
+         */
+        popItem(): BlessedElement;
+
+        /**
+         * Unshift an item onto the list.
+         */
+        unshiftItem(child: BlessedElement): number;
+
+        /**
+         * Shift an item off the list.
+         */
+        shiftItem(): BlessedElement;
+
+        /**
+         * Inserts an item to the list. Child can be an element, index, or string.
+         */
+        insertItem(i: number, child: BlessedElement): void;
+
+        /**
+         * Returns the item element. Child can be an element, index, or string.
+         */
+        getItem(child: BlessedElement): BlessedElement;
+
+        /**
+         * Set item to content.
+         */
+        setItem(child: BlessedElement, content: BlessedElement | string): void;
+
+        /**
+         * Remove and insert items to the list.
+         */
+        spliceItem(i: number, n: number, ...items: BlessedElement[]): void;
+
+        /**
+         * Clears all items from the list.
+         */
+        clearItems(): void;
+
+        /**
+         * Sets the list items to multiple strings.
+         */
+        setItems(items: BlessedElement[]): void;
+
+        /**
+         * Returns the item index from the list. Child can be an element, index, or string.
+         */
+        getItemIndex(child: BlessedElement): number;
+
+        /**
+         * Select an index of an item.
+         */
+        select(index: number): void;
+
+        /**
+         * Select item based on current offset.
+         */
+        move(offset: number): void;
+
+        /**
+         * Select item above selected.
+         */
+        up(amount: number): void;
+
+        /**
+         * Select item below selected.
+         */
+        down(amount: number): void;
+
+        /**
+         * Show/focus list and pick an item. The callback is executed with the result.
+         */
+        pick(callback: () => void): void;
+
+        /**
+         * Find an item based on its text content.
+         */
+        fuzzyFind(arg: string | RegExp | (() => void)): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        /** Received when an item is selected. */
+        on(event: "select", callback: (item: BoxElement, index: number) => void): this;
+        on(event: ListElementEventType, callback: () => void): this;
+        on(event: "select item", callback: (item: BlessedElement, index: number) => void): this;
+    }
+
+    interface FileManagerOptions extends ListOptions<ListElementStyle> {
+        /**
+         * Current working directory.
+         */
+        cwd?: string;
+    }
+
+    class FileManagerElement extends ListElement implements IHasOptions<FileManagerOptions> {
+        constructor(opts: FileManagerOptions);
+
+        /**
+         * Original options object.
+         */
+        options: FileManagerOptions;
+
+        /**
+         * Current working directory.
+         */
+        cwd: string;
+
+        /**
+         * Refresh the file list (perform a readdir on cwd and update the list items).
+         */
+        refresh(cwd: string, callback: () => void): void;
+        refresh(callback?: () => void): void;
+
+        /**
+         * Pick a single file and return the path in the callback.
+         */
+        pick(cwd: string, callback: () => void): void;
+        pick(callback: () => void): void;
+
+        /**
+         * Reset back to original cwd.
+         */
+        reset(cwd: string, callback: () => void): void;
+        reset(callback?: () => void): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        /** Received when an item is selected. */
+        on(event: "cd", callback: (file: string, cwd: string) => void): this;
+        /** Received when an item is selected. */
+        on(event: "file", callback: (file: string) => void): this;
+        on(event: "error", callback: (err: any, file: string) => void): this;
+        on(event: "refresh", callback: () => void): this;
+    }
+
+    interface StyleListTable extends ListElementStyle {
+        /**
+         * Header style.
+         */
+        header?: any;
+
+        /**
+         * Cell style.
+         */
+        cell?: any;
+    }
+
+    interface ListTableOptions extends ListOptions<StyleListTable> {
+        /**
+         * Array of array of strings representing rows.
+         */
+        rows?: string[];
+        data?: string[][];
+
+        /**
+         * Spaces to attempt to pad on the sides of each cell. 2 by default: one space on each side
+         * (only useful if the width is shrunken).
+         */
+        pad?: number;
+
+        /**
+         * Do not draw inner cells.
+         */
+        noCellBorders?: boolean;
+
+        style?: StyleListTable;
+    }
+
+    class ListTableElement extends ListElement implements IHasOptions<ListTableOptions> {
+        constructor(opts: ListTableOptions);
+
+        /**
+         * Original options object.
+         */
+        options: ListTableOptions;
+
+        /**
+         * Set rows in table. Array of arrays of strings.
+         * @example:
+         *
+         * table.setData([
+         *      [ 'Animals',  'Foods'  ],
+         *      [ 'Elephant', 'Apple'  ],
+         *      [ 'Bird',     'Orange' ]
+         *  ]);
+         */
+        setRows(rows: string[][]): void;
+
+        /**
+         * Set rows in table. Array of arrays of strings.
+         * @example:
+         *
+         * table.setData([
+         *      [ 'Animals',  'Foods'  ],
+         *      [ 'Elephant', 'Apple'  ],
+         *      [ 'Bird',     'Orange' ]
+         *  ]);
+         */
+        setData(rows: string[][]): void;
+    }
+
+    interface ListbarOptions extends BoxOptions {
+        style?: ListElementStyle;
+
+        /**
+         * Set buttons using an object with keys as titles of buttons, containing of objects
+         * containing keys of keys and callback.
+         */
+        commands: Types.ListbarCommand[];
+        items: Types.ListbarCommand[];
+
+        /**
+         * Automatically bind list buttons to keys 0-9.
+         */
+        autoCommandKeys: boolean;
+    }
+
+    class ListbarElement extends BoxElement implements IHasOptions<ListbarOptions> {
+        constructor(opts: ListbarOptions);
+
+        /**
+         * Original options object.
+         */
+        options: ListbarOptions;
+
+        /**
+         * Set commands (see commands option above).
+         */
+        setItems(commands: Types.ListbarCommand[]): void;
+
+        /**
+         * Append an item to the bar.
+         */
+        add(item: Types.ListbarCommand, callback: () => void): void;
+
+        /**
+         * Append an item to the bar.
+         */
+        addItem(item: Types.ListbarCommand, callback: () => void): void;
+
+        /**
+         * Append an item to the bar.
+         */
+        appendItem(item: Types.ListbarCommand, callback: () => void): void;
+
+        /**
+         * Select an item on the bar.
+         */
+        select(offset: number): void;
+
+        /**
+         * Remove item from the bar.
+         */
+        removeItem(child: BlessedElement): void;
+
+        /**
+         * Move relatively across the bar.
+         */
+        move(offset: number): void;
+
+        /**
+         * Move left relatively across the bar.
+         */
+        moveLeft(offset: number): void;
+
+        /**
+         * Move right relatively across the bar.
+         */
+        moveRight(offset: number): void;
+
+        /**
+         * Select button and execute its callback.
+         */
+        selectTab(index: number): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "set items" | "remove item" | "select tab", callback: () => void): this;
+    }
+
+    interface FormOptions extends BoxOptions {
+        /**
+         * Allow default keys (tab, vi keys, enter).
+         */
+        keys?: any;
+
+        /**
+         * Allow vi keys.
+         */
+        vi?: boolean;
+    }
+
+    class FormElement<TFormData> extends BoxElement implements IHasOptions<FormOptions> {
+        constructor(opts: FormOptions);
+
+        /**
+         * Original options object.
+         */
+        options: FormOptions;
+
+        /**
+         * Last submitted data.
+         */
+        submission: TFormData;
+
+        /**
+         * Focus next form element.
+         */
+        focusNext(): void;
+
+        /**
+         * Focus previous form element.
+         */
+        focusPrevious(): void;
+
+        /**
+         * Submit the form.
+         */
+        submit(): void;
+
+        /**
+         * Discard the form.
+         */
+        cancel(): void;
+
+        /**
+         * Clear the form.
+         */
+        reset(): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        /** Form is submitted. Receives a data object. */
+        on(event: "submit", callback: (out: TFormData) => void): this;
+        on(event: "cancel" | "reset", callback: () => void): this;
+    }
+
+    interface InputOptions extends BoxOptions {}
+
+    abstract class InputElement extends BoxElement {
+        constructor(opts: InputOptions);
+    }
+
+    /**
+     * A box which allows multiline text input.
+     */
+    interface TextareaOptions extends InputOptions {
+        /**
+         * Call readInput() when the element is focused. Automatically unfocus.
+         */
+        inputOnFocus?: boolean;
+    }
+
+    type TextareaElementEventType =
+        /** Value is an error. */
+        | "error"
+        /** Value is submitted (enter). */
+        | "submit"
+        /** Value is discared (escape). */
+        | "cancel"
+        /** Either submit or cancel. */
+        | "action";
+
+    class TextareaElement extends InputElement implements IHasOptions<TextareaOptions> {
+        constructor(opts: TextareaOptions);
+
+        /**
+         * Original options object.
+         */
+        options: TextareaOptions;
+
+        /**
+         * The input text. read-only.
+         */
+        value: string;
+
+        /**
+         * Submit the textarea (emits submit).
+         */
+        submit(): void;
+
+        /**
+         * Cancel the textarea (emits cancel).
+         */
+        cancel(): void;
+
+        /**
+         * Grab key events and start reading text from the keyboard. Takes a callback which receives
+         * the final value.
+         */
+        readInput(callback?: (err: any, value?: string) => void): void;
+
+        /**
+         * Grab key events and start reading text from the keyboard. Takes a callback which receives
+         * the final value.
+         */
+        input(callback: (err: any, value?: string) => void): void;
+
+        /**
+         * Grab key events and start reading text from the keyboard. Takes a callback which receives
+         * the final value.
+         */
+        setInput(callback: (err: any, value?: string) => void): void;
+
+        /**
+         * Open text editor in $EDITOR, read the output from the resulting file. Takes a callback which
+         * receives the final value.
+         */
+        readEditor(callback: (err: any, value?: string) => void): void;
+
+        /**
+         * Open text editor in $EDITOR, read the output from the resulting file. Takes a callback which
+         * receives the final value.
+         */
+        editor(callback: (err: any, value?: string) => void): void;
+
+        /**
+         * Open text editor in $EDITOR, read the output from the resulting file. Takes a callback which
+         * receives the final value.
+         */
+        setEditor(callback: (err: any, value?: string) => void): void;
+
+        /**
+         * The same as this.value, for now.
+         */
+        getValue(): string;
+
+        /**
+         * Clear input.
+         */
+        clearValue(): void;
+
+        /**
+         * Set value.
+         */
+        setValue(text: string): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: TextareaElementEventType, callback: (err: any) => void): this;
+    }
+
+    interface TextboxOptions extends TextareaOptions {
+        /**
+         * Completely hide text.
+         */
+        secret?: boolean;
+
+        /**
+         * Replace text with asterisks (*).
+         */
+        censor?: boolean;
+    }
+
+    class TextboxElement extends TextareaElement implements IHasOptions<TextboxOptions> {
+        constructor(opts: TextboxOptions);
+
+        /**
+         * Original options object.
+         */
+        options: TextboxOptions;
+
+        /**
+         * Completely hide text.
+         */
+        secret: boolean;
+
+        /**
+         * Replace text with asterisks (*).
+         */
+        censor: boolean;
+    }
+
+    interface ButtonOptions extends BoxOptions {}
+
+    class ButtonElement extends InputElement implements IHasOptions<ButtonOptions> {
+        constructor(opts: ButtonOptions);
+
+        /**
+         * Original options object.
+         */
+        options: ButtonOptions;
+
+        /**
+         * Press button. Emits press.
+         */
+        press(): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "press", callback: () => void): this;
+    }
+
+    interface CheckboxOptions extends BoxOptions {
+        /**
+         * whether the element is checked or not.
+         */
+        checked?: boolean;
+
+        /**
+         * enable mouse support.
+         */
+        mouse?: boolean;
+    }
+
+    /**
+     * A checkbox which can be used in a form element.
+     */
+    class CheckboxElement extends InputElement implements IHasOptions<CheckboxOptions> {
+        constructor(options?: CheckboxOptions);
+
+        /**
+         * Original options object.
+         */
+        options: CheckboxOptions;
+
+        /**
+         * the text next to the checkbox (do not use setcontent, use `check.text = ''`).
+         */
+        text: string;
+
+        /**
+         * whether the element is checked or not.
+         */
+        checked: boolean;
+
+        /**
+         * same as `checked`.
+         */
+        value: boolean;
+
+        /**
+         * check the element.
+         */
+        check(): void;
+
+        /**
+         * uncheck the element.
+         */
+        uncheck(): void;
+
+        /**
+         * toggle checked state.
+         */
+        toggle(): void;
+    }
+
+    interface RadioSetOptions extends BoxOptions {}
+
+    /**
+     * An element wrapping RadioButtons. RadioButtons within this element will be mutually exclusive
+     * with each other.
+     */
+    abstract class RadioSetElement extends BoxElement {
+        constructor(opts: RadioSetOptions);
+    }
+
+    interface RadioButtonOptions extends BoxOptions {}
+
+    /**
+     * A radio button which can be used in a form element.
+     */
+    abstract class RadioButtonElement extends CheckboxElement {
+        constructor(opts: RadioButtonOptions);
+    }
+
+    interface PromptOptions extends BoxOptions {}
+
+    /**
+     * A prompt box containing a text input, okay, and cancel buttons (automatically hidden).
+     */
+    class PromptElement extends BoxElement implements IHasOptions<PromptOptions> {
+        constructor(opts: PromptOptions);
+
+        options: PromptOptions;
+
+        /**
+         * Show the prompt and wait for the result of the textbox. Set text and initial value.
+         */
+        input(text: string, value: string, callback: (err: any, value: string) => void): void;
+        setInput(text: string, value: string, callback: (err: any, value: string) => void): void;
+        readInput(text: string, value: string, callback: (err: any, value: string) => void): void;
+    }
+
+    interface QuestionOptions extends BoxOptions {}
+
+    /**
+     * A question box containing okay and cancel buttons (automatically hidden).
+     */
+    class QuestionElement extends BoxElement implements IHasOptions<QuestionOptions> {
+        constructor(opts: QuestionOptions);
+
+        options: QuestionOptions;
+
+        /**
+         * Ask a question. callback will yield the result.
+         */
+        ask(question: string, callback: (err: any, value: string) => void): void;
+    }
+
+    interface MessageOptions extends BoxOptions {}
+
+    /**
+     * A box containing a message to be displayed (automatically hidden).
+     */
+    class MessageElement extends BoxElement implements IHasOptions<MessageOptions> {
+        constructor(opts: MessageOptions);
+
+        options: MessageOptions;
+
+        /**
+         * Display a message for a time (default is 3 seconds). Set time to 0 for a
+         * perpetual message that is dismissed on keypress.
+         */
+        log(text: string, time: number, callback: (err: any) => void): void;
+        log(text: string, callback: (err: any) => void): void;
+        display(text: string, time: number, callback: (err: any) => void): void;
+        display(text: string, callback: (err: any) => void): void;
+
+        /**
+         * Display an error in the same way.
+         */
+        error(text: string, time: number, callback: () => void): void;
+        error(text: string, callback: () => void): void;
+    }
+
+    interface LoadingOptions extends BoxOptions {}
+
+    /**
+     * A box with a spinning line to denote loading (automatically hidden).
+     */
+    class LoadingElement extends BoxElement implements IHasOptions<LoadingOptions> {
+        constructor(opts: LoadingOptions);
+
+        options: LoadingOptions;
+
+        /**
+         * Display the loading box with a message. Will lock keys until stop is called.
+         */
+        load(text: string): void;
+
+        /**
+         * Hide loading box. Unlock keys.
+         */
+        stop(): void;
+    }
+
+    interface ProgressBarOptions extends BoxOptions {
+        /**
+         * can be `horizontal` or `vertical`.
+         */
+        orientation: string;
+
+        /**
+         * the character to fill the bar with (default is space).
+         */
+        pch: string;
+
+        /**
+         * the amount filled (0 - 100).
+         */
+        filled: number;
+
+        /**
+         * same as `filled`.
+         */
+        value: number;
+
+        /**
+         * enable key support.
+         */
+        keys: boolean;
+
+        /**
+         * enable mouse support.
+         */
+        mouse: boolean;
+    }
+
+    /**
+     * A progress bar allowing various styles. This can also be used as a form input.
+     */
+    class ProgressBarElement extends InputElement implements IHasOptions<ProgressBarOptions> {
+        constructor(options?: ProgressBarOptions);
+
+        options: ProgressBarOptions;
+
+        /**
+         * progress the bar by a fill amount.
+         */
+        progress(amount: number): void;
+
+        /**
+         * set progress to specific amount.
+         */
+        setProgress(amount: number): void;
+
+        /**
+         * reset the bar.
+         */
+        reset(): void;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "reset" | "complete", callback: () => void): this;
+    }
+
+    interface LogOptions extends ScrollableTextOptions {
+        /**
+         * amount of scrollback allowed. default: Infinity.
+         */
+        scrollback?: number;
+
+        /**
+         * scroll to bottom on input even if the user has scrolled up. default: false.
+         */
+        scrollOnInput?: boolean;
+    }
+
+    /**
+     * A log permanently scrolled to the bottom.
+     */
+    class Log extends ScrollableTextElement implements IHasOptions<LogOptions> {
+        constructor(options?: LogOptions);
+
+        options: LogOptions;
+
+        /**
+         * amount of scrollback allowed. default: Infinity.
+         */
+        scrollback: number;
+
+        /**
+         * scroll to bottom on input even if the user has scrolled up. default: false.
+         */
+        scrollOnInput: boolean;
+
+        /**
+         * add a log line.
+         */
+        log(text: string): void;
+
+        /**
+         * add a log line.
+         */
+        add(text: string): void;
+    }
+
+    interface TableOptions extends BoxOptions {
+        /**
+         * array of array of strings representing rows (same as `data`).
+         */
+        rows?: string[][];
+
+        /**
+         * array of array of strings representing rows (same as `rows`).
+         */
+        data?: string[][];
+
+        /**
+         * spaces to attempt to pad on the sides of each cell. `2` by default: one space on each side (only useful if the width is shrunken).
+         */
+        pad?: number;
+
+        /**
+         * do not draw inner cells.
+         */
+        noCellBorders?: boolean;
+
+        /**
+         * fill cell borders with the adjacent background color.
+         */
+        fillCellBorders?: boolean;
+    }
+
+    /**
+     * A stylized table of text elements.
+     */
+    class TableElement extends BoxElement implements IHasOptions<TableOptions> {
+        constructor(opts: TableOptions);
+
+        options: TableOptions;
+
+        /**
+         * set rows in table. array of arrays of strings.
+         */
+        setData(rows: string[][]): void;
+
+        /**
+         * set rows in table. array of arrays of strings.
+         */
+        setRows(rows: string[][]): void;
+    }
+
+    interface TerminalOptions extends BoxOptions {
+        /**
+         * handler for input data.
+         */
+        handler?(userInput: Buffer): void;
+
+        /**
+         * name of shell. $SHELL by default.
+         */
+        shell?: string;
+
+        /**
+         * args for shell.
+         */
+        args?: any;
+
+        /**
+         * can be line, underline, and block.
+         */
+        cursor?: "line" | "underline" | "block";
+
+        terminal?: string;
+
+        /**
+         * Object for process env.
+         */
+        env?: any;
+    }
+
+    class TerminalElement extends BoxElement implements IHasOptions<TerminalOptions> {
+        constructor(opts: TerminalOptions);
+
+        options: TerminalOptions;
+
+        /**
+         * reference to the headless term.js terminal.
+         */
+        term: any;
+
+        /**
+         * reference to the pty.js pseudo terminal.
+         */
+        pty: any;
+
+        /**
+         * write data to the terminal.
+         */
+        write(data: string): void;
+
+        /**
+         * nearly identical to `element.screenshot`, however, the specified region includes the terminal's
+         * _entire_ scrollback, rather than just what is visible on the screen.
+         */
+        screenshot(xi?: number, xl?: number, yi?: number, yl?: number): string;
+    }
+
+    interface ImageOptions extends BoxOptions {
+        /**
+         * path to image.
+         */
+        file: string;
+
+        /**
+         * path to w3mimgdisplay. if a proper w3mimgdisplay path is not given, blessed will search the
+         * entire disk for the binary.
+         */
+        type: "ansi" | "overlay" | "w3m";
+    }
+
+    /**
+     * Display an image in the terminal (jpeg, png, gif) using w3mimgdisplay. Requires w3m to be installed.
+     * X11 required: works in xterm, urxvt, and possibly other terminals.
+     */
+    class ImageElement extends BoxElement implements IHasOptions<ImageOptions> {
+        constructor(options?: ImageOptions);
+
+        options: ImageOptions;
+    }
+
+    interface ANSIImageOptions extends BoxOptions {
+        /**
+         * URL or path to PNG/GIF file. Can also be a buffer.
+         */
+        file: string;
+
+        /**
+         * Scale cellmap down (0-1.0) from its original pixel width/height (Default: 1.0).
+         */
+        scale: number;
+
+        /**
+         * This differs from other element's width or height in that only one
+         * of them is needed: blessed will maintain the aspect ratio of the image
+         * as it scales down to the proper number of cells. NOTE: PNG/GIF's are
+         * always automatically shrunken to size (based on scale) if a width or
+         * height is not given.
+         */
+        width: number | string;
+        height: number | string;
+
+        /**
+         * Add various "density" ASCII characters over the rendering to give the
+         * image more detail, similar to libcaca/libcucul (the library mplayer uses
+         * to display videos in the terminal).
+         */
+        ascii: string;
+
+        /**
+         * Whether to animate if the image is an APNG/animating GIF. If false, only
+         * display the first frame or IDAT (Default: true).
+         */
+        animate: boolean;
+
+        /**
+         * Set the speed of animation. Slower: 0.0-1.0. Faster: 1-1000. It cannot go
+         * faster than 1 frame per millisecond, so 1000 is the fastest. (Default: 1.0)
+         */
+        speed: number;
+
+        /**
+         * mem or cpu. If optimizing for memory, animation frames will be rendered to
+         * bitmaps as the animation plays, using less memory. Optimizing for cpu will
+         * precompile all bitmaps beforehand, which may be faster, but might also OOM
+         * the process on large images. (Default: mem).
+         */
+        optimization: "mem" | "cpu";
+    }
+
+    /**
+     * Convert any .png file (or .gif, see below) to an ANSI image and display it as an element.
+     */
+    class ANSIImageElement extends BoxElement implements IHasOptions<ANSIImageOptions> {
+        constructor(options?: ANSIImageOptions);
+
+        options: ANSIImageOptions;
+
+        /**
+         * Image object from the png reader.
+         */
+        img: Types.TImage;
+
+        /**
+         * set the image in the box to a new path.
+         */
+        setImage(img: string, callback: () => void): void;
+
+        /**
+         * clear the current image.
+         */
+        clearImage(callback: () => void): void;
+
+        /**
+         * Play animation if it has been paused or stopped.
+         */
+        play(): void;
+
+        /**
+         * Pause animation.
+         */
+        pause(): void;
+
+        /**
+         * Stop animation.
+         */
+        stop(): void;
+    }
+
+    interface OverlayImageOptions extends BoxOptions {
+        /**
+         * Path to image.
+         */
+        file: string;
+
+        /**
+         * Render the file as ANSI art instead of using w3m to overlay Internally uses the
+         * ANSIImage element. See the ANSIImage element for more information/options. (Default: true).
+         */
+        ansi: boolean;
+
+        /**
+         * Path to w3mimgdisplay. If a proper w3mimgdisplay path is not given, blessed will
+         * search the entire disk for the binary.
+         */
+        w3m: string;
+
+        /**
+         * Whether to search /usr, /bin, and /lib for w3mimgdisplay (Default: true).
+         */
+        search: string;
+    }
+
+    /**
+     * Convert any .png file (or .gif, see below) to an ANSI image and display it as an element.
+     */
+    class OverlayImageElement extends BoxElement implements IHasOptions<OverlayImageOptions> {
+        constructor(options?: OverlayImageOptions);
+
+        options: OverlayImageOptions;
+
+        /**
+         * set the image in the box to a new path.
+         */
+        setImage(img: string, callback: () => void): void;
+
+        /**
+         * clear the current image.
+         */
+        clearImage(callback: () => void): void;
+
+        /**
+         * get the size of an image file in pixels.
+         */
+        imageSize(img: string, callback: () => void): void;
+
+        /**
+         * get the size of the terminal in pixels.
+         */
+        termSize(callback: () => void): void;
+
+        /**
+         * get the pixel to cell ratio for the terminal.
+         */
+        getPixelRatio(callback: () => void): void;
+    }
+
+    interface VideoOptions extends BoxOptions {
+        /**
+         * Video to play.
+         */
+        file: string;
+
+        /**
+         * Start time in seconds.
+         */
+        start: number;
+    }
+
+    class VideoElement extends BoxElement implements IHasOptions<VideoOptions> {
+        constructor(options?: VideoOptions);
+
+        options: VideoOptions;
+
+        /**
+         * The terminal element running mplayer or mpv.
+         */
+        tty: any;
+    }
+
+    interface LayoutOptions extends ElementOptions {
+        /**
+         * A callback which is called right before the children are iterated over to be rendered. Should return an
+         * iterator callback which is called on each child element: iterator(el, i).
+         */
+        renderer?(): void;
+
+        /**
+         * Using the default renderer, it provides two layouts: inline, and grid. inline is the default and will render
+         * akin to inline-block. grid will create an automatic grid based on element dimensions. The grid cells'
+         * width and height are always determined by the largest children in the layout.
+         */
+        layout: "inline" | "inline-block" | "grid";
+    }
+
+    class LayoutElement extends BlessedElement implements IHasOptions<LayoutOptions> {
+        constructor(options?: LayoutOptions);
+
+        options: LayoutOptions;
+
+        /**
+         * A callback which is called right before the children are iterated over to be rendered. Should return an
+         * iterator callback which is called on each child element: iterator(el, i).
+         */
+        renderer(coords: PositionCoords): void;
+
+        /**
+         * Check to see if a previous child element has been rendered and is visible on screen. This is only useful
+         * for checking child elements that have already been attempted to be rendered! see the example below.
+         */
+        isRendered(el: BlessedElement): boolean;
+
+        /**
+         * Get the last rendered and visible child element based on an index. This is useful for basing the position
+         * of the current child element on the position of the last child element.
+         */
+        getLast(i: number): BlessedElement;
+
+        /**
+         * Get the last rendered and visible child element coords based on an index. This is useful for basing the position
+         * of the current child element on the position of the last child element. See the example below.
+         */
+        getLastCoords(i: number): PositionCoords;
+    }
+
+    class Program {
+        /**
+         * Wrap the given text in terminal formatting codes corresponding to the given attribute
+         * name. The `attr` string can be of the form `red fg` or `52 bg` where `52` is a 0-255
+         * integer color number.
+         */
+        text(text: string, attr: string): string;
     }
 }
 
-export = Blessed;
+export namespace widget {
+    class Terminal extends Widgets.TerminalElement {}
+}
+
+export function screen(options?: Widgets.IScreenOptions): Widgets.Screen;
+export function box(options?: Widgets.BoxOptions): Widgets.BoxElement;
+export function text(options?: Widgets.TextOptions): Widgets.TextElement;
+export function line(options?: Widgets.LineOptions): Widgets.LineElement;
+export function scrollablebox(options?: Widgets.BoxOptions): Widgets.BoxElement;
+export function scrollabletext(options?: Widgets.BoxOptions): Widgets.BoxElement;
+export function bigtext(options?: Widgets.BigTextOptions): Widgets.BigTextElement;
+export function list(options?: Widgets.ListOptions<Widgets.ListElementStyle>): Widgets.ListElement;
+export function filemanager(options?: Widgets.FileManagerOptions): Widgets.FileManagerElement;
+export function listtable(options?: Widgets.ListTableOptions): Widgets.ListTableElement;
+export function listbar(options?: Widgets.ListbarOptions): Widgets.ListbarElement;
+export function form<TFormData>(options?: Widgets.FormOptions): Widgets.FormElement<TFormData>;
+export function input(options?: Widgets.InputOptions): Widgets.InputElement;
+export function textarea(options?: Widgets.TextareaOptions): Widgets.TextareaElement;
+export function textbox(options?: Widgets.TextboxOptions): Widgets.TextboxElement;
+export function button(options?: Widgets.ButtonOptions): Widgets.ButtonElement;
+export function checkbox(options?: Widgets.CheckboxOptions): Widgets.CheckboxElement;
+export function radioset(options?: Widgets.RadioSetOptions): Widgets.RadioSetElement;
+export function radiobutton(options?: Widgets.RadioButtonOptions): Widgets.RadioButtonElement;
+export function table(options?: Widgets.TableOptions): Widgets.TableElement;
+export function prompt(options?: Widgets.PromptOptions): Widgets.PromptElement;
+export function question(options?: Widgets.QuestionOptions): Widgets.QuestionElement;
+export function message(options?: Widgets.MessageOptions): Widgets.MessageElement;
+export function loading(options?: Widgets.LoadingOptions): Widgets.LoadingElement;
+export function log(options?: Widgets.LogOptions): Widgets.Log;
+export function progressbar(options?: Widgets.ProgressBarOptions): Widgets.ProgressBarElement;
+export function terminal(options?: Widgets.TerminalOptions): Widgets.TerminalElement;
+export function layout(options?: Widgets.LayoutOptions): Widgets.LayoutElement;
+export function escape(item: any): any;
+
+export const colors: {
+    match(hexColor: string): string;
+};
diff --git a/types/blessed/tslint.json b/types/blessed/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/blessed/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/blissfuljs/tslint.json b/types/blissfuljs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/blissfuljs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/blob-stream/tslint.json b/types/blob-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/blob-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/blob-to-buffer/blob-to-buffer-tests.ts b/types/blob-to-buffer/blob-to-buffer-tests.ts
new file mode 100644
index 0000000000..21d9508469
--- /dev/null
+++ b/types/blob-to-buffer/blob-to-buffer-tests.ts
@@ -0,0 +1,6 @@
+import blobToBuffer = require("blob-to-buffer");
+
+blobToBuffer(new Blob(), (error, buffer) => {
+    console.log(error);
+    console.log(buffer);
+});
diff --git a/types/blob-to-buffer/index.d.ts b/types/blob-to-buffer/index.d.ts
new file mode 100644
index 0000000000..8c8156963e
--- /dev/null
+++ b/types/blob-to-buffer/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for blob-to-buffer 1.2
+// Project: https://github.com/feross/blob-to-buffer
+// Definitions by: nrlquaker <https://github.com/nrlquaker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+declare function blobToBuffer(blob: Blob, callback: (error: any, buffer: Buffer) => void): void;
+declare namespace blobToBuffer {}
+export = blobToBuffer;
diff --git a/types/blob-to-buffer/tsconfig.json b/types/blob-to-buffer/tsconfig.json
new file mode 100644
index 0000000000..2421ce2493
--- /dev/null
+++ b/types/blob-to-buffer/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "blob-to-buffer-tests.ts"
+    ]
+}
diff --git a/types/blob-to-buffer/tslint.json b/types/blob-to-buffer/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/blob-to-buffer/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/blob-util/index.d.ts b/types/blob-util/index.d.ts
index 9ab6cb4b5f..7710734bf2 100644
--- a/types/blob-util/index.d.ts
+++ b/types/blob-util/index.d.ts
@@ -14,59 +14,43 @@ export function createBlob(parts: any[], options?: { type: string }): Blob;
 
 /**
  * Shim for URL.createObjectURL() to support browsers that only have the prefixed webkitURL (e.g. Android <4.4).
- *
- * @param blob
  */
 export function createObjectURL(blob: Blob): string;
 
 /**
  * Shim for URL.revokeObjectURL() to support browsers that only have the prefixed webkitURL (e.g. Android <4.4).
- *
- * @param url
  */
 export function revokeObjectURL(url: string): void;
 
 /**
  * Convert a Blob to a binary string.
- *
- * @param blob
  */
 export function blobToBinaryString(blob: Blob): Promise<string>;
 
 /**
  * Convert a binary string to a Blob.
- *
- * @param binary
  * @param type the content type
  */
 export function binaryStringToBlob(binary: string, type?: string): Promise<Blob>;
 
 /**
  * Convert a Blob to a base-64 string.
- *
- * @param blob
  */
 export function blobToBase64String(blob: Blob): Promise<string>;
 
 /**
  * Convert a base-64 string to a Blob.
- *
- * @param base64
  * @param type the content type
  */
 export function base64StringToBlob(base64: string, type?: string): Promise<Blob>;
 
 /**
  * Convert a data URL string (e.g. `'data:image/png;base64,iVBORw0KG...'`) to a Blob.
- *
- * @param dataURL
  */
 export function dataURLToBlob(dataURL: string): Promise<Blob>;
 
 /**
  * Convert a Blob to a data URL string (e.g. `'data:image/png;base64,iVBORw0KG...'`).
- *
- * @param blob
  */
 export function blobToDataURL(blob: Blob): Promise<string>;
 
@@ -75,7 +59,6 @@ export function blobToDataURL(blob: Blob): Promise<string>;
  *
  * Note: this will coerce the image to the desired content type, and it will only paint the first frame of an animated GIF.
  *
- * @param src
  * @param type the content type (optional, defaults to 'image/png')
  * @param crossOrigin for CORS-enabled images, set this to 'Anonymous' to avoid "tainted canvas" errors
  * @param quality a number between 0 and 1 indicating image quality if the requested type is 'image/jpeg' or 'image/webp'
@@ -85,7 +68,6 @@ export function imgSrcToDataURL(src: string, type?: string, crossOrigin?: string
 /**
  * Convert a canvas to a Blob.
  *
- * @param src
  * @param type the content type (optional, defaults to 'image/png')
  * @param quality a number between 0 and 1 indicating image quality if the requested type is 'image/jpeg' or 'image/webp'
  */
@@ -96,7 +78,6 @@ export function canvasToBlob(canvas: HTMLCanvasElement, type?: string, quality?:
  *
  * Note: this will coerce the image to the desired content type, and it will only paint the first frame of an animated GIF.
  *
- * @param src
  * @param type the content type (optional, defaults to 'image/png')
  * @param crossOrigin for CORS-enabled images, set this to 'Anonymous' to avoid "tainted canvas" errors
  * @param quality a number between 0 and 1 indicating image quality if the requested type is 'image/jpeg' or 'image/webp'
@@ -106,14 +87,11 @@ export function imgSrcToBlob(src: string, type?: string, crossOrigin?: string, q
 /**
  * Convert an ArrayBuffer to a Blob.
  *
- * @param arrayBuff
  * @param type the content type
  */
 export function arrayBufferToBlob(arrayBuff: ArrayBuffer, type?: string): Promise<Blob>;
 
 /**
  * Convert a Blob to an ArrayBuffer.
- *
- * @param blob
  */
 export function blobToArrayBuffer(blob: Blob): Promise<ArrayBuffer>;
diff --git a/types/blocks/tslint.json b/types/blocks/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/blocks/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/blue-tape/tslint.json b/types/blue-tape/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/blue-tape/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bluebird-global/tslint.json b/types/bluebird-global/tslint.json
index 1d81af2349..31bf31d881 100644
--- a/types/bluebird-global/tslint.json
+++ b/types/bluebird-global/tslint.json
@@ -6,6 +6,7 @@
         "array-type": false,
         "unified-signatures": false,
         "ban-types": false,
+        "no-redundant-undefined": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/bluebird-retry/bluebird-retry-tests.ts b/types/bluebird-retry/bluebird-retry-tests.ts
index eb3260a007..e9beaf5562 100644
--- a/types/bluebird-retry/bluebird-retry-tests.ts
+++ b/types/bluebird-retry/bluebird-retry-tests.ts
@@ -1,13 +1,13 @@
 import Promise = require('bluebird');
 import retry = require('bluebird-retry');
 
-function promiseSuccess(text:string) {
+function promiseSuccess(text: string) {
     return Promise.resolve(text);
-};
+}
 
-var count = 0;
+let count = 0;
 function myfunc() {
-    console.log('myfunc called ' + (++count) + ' times');
+    console.log(`myfunc called ${++count} times`);
     if (count < 3) {
         throw new Error('i fail the first two times');
     } else {
@@ -16,18 +16,17 @@ function myfunc() {
 }
 
 retry(myfunc)
-    .done(function(result) { console.log(result); } );
+    .done(result => { console.log(result); });
 
-
-//Options example
+// Options example
 function logFail() {
     console.log(new Date().toISOString());
     throw new Error('bail');
 }
 
-var options:retry.Options = {
+const options: retry.Options = {
     max_tries: 4,
     interval: 500
 };
 
-retry(logFail, options);
\ No newline at end of file
+retry(logFail, options);
diff --git a/types/bluebird-retry/index.d.ts b/types/bluebird-retry/index.d.ts
index 97d756524b..358c75936d 100644
--- a/types/bluebird-retry/index.d.ts
+++ b/types/bluebird-retry/index.d.ts
@@ -1,17 +1,15 @@
-// Type definitions for bluebird-retry
+// Type definitions for bluebird-retry 0.11
 // Project: https://github.com/jut-io/bluebird-retry
 // Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="bluebird" />
-
 import Promise = require('bluebird');
 
 declare function retry<T>(func: (param: T) => void, options?: retry.Options): Promise<T>;
 
 declare namespace retry {
-    export interface Options {
+    interface Options {
         interval?: number;
         backoff?: number;
         max_interval?: number;
@@ -22,7 +20,6 @@ declare namespace retry {
         context?: any;
         args?: any;
     }
-
 }
 
 export = retry;
diff --git a/types/react-chartjs-2/tslint.json b/types/bluebird-retry/tslint.json
similarity index 100%
rename from types/react-chartjs-2/tslint.json
rename to types/bluebird-retry/tslint.json
diff --git a/types/bluebird/bluebird-tests.ts b/types/bluebird/bluebird-tests.ts
index 4a5ce00e15..c9c09221e8 100644
--- a/types/bluebird/bluebird-tests.ts
+++ b/types/bluebird/bluebird-tests.ts
@@ -20,7 +20,6 @@ let exp: RegExp;
 let anyArr: any[];
 let strArr: string[];
 let numArr: number[];
-let voidVar: void;
 
 // - - - - - - - - - - - - - - - - -
 
@@ -80,8 +79,7 @@ let voidProm: Promise<void>;
 
 let fooProm: Promise<Foo>;
 let barProm: Promise<Bar>;
-let barOrVoidProm: Promise<Bar | void>;
-let fooOrBarProm: Promise<Foo|Bar>;
+let fooOrBarProm: Promise<Foo | Bar>;
 let bazProm: Promise<Baz>;
 
 // - - - - - - - - - - - - - - - - -
@@ -220,12 +218,14 @@ barProm = fooProm.then((value: Foo) => {
 }, (reason: any) => {
 	return barProm;
 });
-barOrVoidProm = fooProm.then((value: Foo) => {
+// $ExpectType Bluebird<void | Bar>
+fooProm.then((value: Foo) => {
 	return bar;
 }, (reason: any) => {
 	return;
 });
-barOrVoidProm = fooProm.then((value: Foo) => {
+// $ExpectType Bluebird<void | Bar>
+fooProm.then((value: Foo) => {
 	return bar;
 }, (reason: any) => {
 	return voidProm;
@@ -241,43 +241,51 @@ barProm = barProm.then((value: Bar) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-fooProm = fooProm.catch((reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch((reason: any) => {
 	return;
 });
 
-fooProm = fooProm.caught((reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.caught((reason: any) => {
 	return;
 });
-fooProm = fooProm.catch((error: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch((error: any) => {
 	return true;
 }, (reason: any) => {
 	return;
 });
-fooProm = fooProm.caught((error: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.caught((error: any) => {
 	return true;
 }, (reason: any) => {
 	return;
 });
 
-fooProm = fooProm.catch((reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch((reason: any) => {
 	return voidProm;
 });
-
-fooProm = fooProm.caught((reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.caught((reason: any) => {
 	return voidProm;
 });
-fooProm = fooProm.catch((error: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch((error: any) => {
 	return true;
 }, (reason: any) => {
 	return voidProm;
 });
-fooProm = fooProm.caught((error: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.caught((error: any) => {
 	return true;
 }, (reason: any) => {
 	return voidProm;
 });
 
-fooProm = fooProm.catch((reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch<void | Foo>((reason: any) => { // tslint:disable-line:void-return
 	// handle multiple valid return types simultaneously
 	if (foo === null) {
 		return;
@@ -308,16 +316,20 @@ fooOrBarProm = fooProm.caught((error: any) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-fooProm = fooProm.catch(Error, (reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(Error, (reason: any) => {
 	return;
 });
-fooProm = fooProm.catch(Promise.CancellationError, (reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(Promise.CancellationError, (reason: any) => {
 	return;
 });
-fooProm = fooProm.caught(Error, (reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.caught(Error, (reason: any) => {
 	return;
 });
-fooProm = fooProm.caught(Promise.CancellationError, (reason: any) => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.caught(Promise.CancellationError, (reason: any) => {
 	return;
 });
 
@@ -339,61 +351,78 @@ fooOrBarProm = fooProm.caught(Promise.CancellationError, (reason: any) => {
 class CustomError extends Error {
 	customField: number;
 }
-fooProm = fooProm.catch(CustomError, reason => {
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(CustomError, reason => {
 	let a: number = reason.customField;
 });
 
-{
-	class CustomErrorWithConstructor extends Error {
-		constructor(public arg1: boolean, public arg2: number) {
-			super();
-		}
+class CustomErrorWithConstructor extends Error {
+	arg1: boolean;
+	arg2: number;
+	constructor(arg1: boolean, arg2: number) {
+		super();
+		this.arg1 = arg1;
+		this.arg2 = arg2;
 	}
-	fooProm = fooProm.catch(CustomErrorWithConstructor, reason => {
-		let a: boolean = reason.arg1;
-		let b: number = reason.arg2;
-	});
 }
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(CustomErrorWithConstructor, reason => {
+	let a: boolean = reason.arg1;
+	let b: number = reason.arg2;
+});
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-{
-	class CustomError1 extends Error {}
-	class CustomError2 extends Error {}
-	class CustomError3 extends Error {}
-	class CustomError4 extends Error {}
-	class CustomError5 extends Error {}
+class CustomError1 extends Error {}
+class CustomError2 extends Error {}
+class CustomError3 extends Error {}
+class CustomError4 extends Error {}
+class CustomError5 extends Error {}
 
-	fooProm = fooProm.catch(CustomError1, error => {});
-	fooProm = fooProm.catch(CustomError1, CustomError2, error => {});
-	fooProm = fooProm.catch(CustomError1, CustomError2, CustomError3, error => {});
-	fooProm = fooProm.catch(CustomError1, CustomError2, CustomError3, CustomError4, error => {});
-	fooProm = fooProm.catch(CustomError1, CustomError2, CustomError3, CustomError4, CustomError5, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(CustomError1, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(CustomError1, CustomError2, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(CustomError1, CustomError2, CustomError3, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(CustomError1, CustomError2, CustomError3, CustomError4, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(CustomError1, CustomError2, CustomError3, CustomError4, CustomError5, error => {});
 
-	const booPredicate1 = (error: CustomError1) => true;
-	const booPredicate2 = (error: [number]) => true;
-	const booPredicate3 = (error: string) => true;
-	const booPredicate4 = (error: object) => true;
-	const booPredicate5 = (error: any) => true;
+const booPredicate1 = (error: CustomError1) => true;
+const booPredicate2 = (error: [number]) => true;
+const booPredicate3 = (error: string) => true;
+const booPredicate4 = (error: object) => true;
+const booPredicate5 = (error: any) => true;
 
-	fooProm = fooProm.catch(booPredicate1, error => {});
-	fooProm = fooProm.catch(booPredicate1, booPredicate2, error => {});
-	fooProm = fooProm.catch(booPredicate1, booPredicate2, booPredicate3, error => {});
-	fooProm = fooProm.catch(booPredicate1, booPredicate2, booPredicate3, booPredicate4, error => {});
-	fooProm = fooProm.catch(booPredicate1, booPredicate2, booPredicate3, booPredicate4, booPredicate5, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booPredicate1, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booPredicate1, booPredicate2, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booPredicate1, booPredicate2, booPredicate3, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booPredicate1, booPredicate2, booPredicate3, booPredicate4, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booPredicate1, booPredicate2, booPredicate3, booPredicate4, booPredicate5, error => {});
 
-	const booObject1 = new CustomError1();
-	const booObject2 = [400, 500];
-	const booObject3 = ["Error1", "Error2"];
-	const booObject4 = {code: 400};
-	const booObject5: any = null;
+const booObject1 = new CustomError1();
+const booObject2 = [400, 500];
+const booObject3 = ["Error1", "Error2"];
+const booObject4 = {code: 400};
+const booObject5: any = null;
 
-	fooProm = fooProm.catch(booObject1, error => {});
-	fooProm = fooProm.catch(booObject1, booObject2, error => {});
-	fooProm = fooProm.catch(booObject1, booObject2, booObject3, error => {});
-	fooProm = fooProm.catch(booObject1, booObject2, booObject3, booObject4, error => {});
-	fooProm = fooProm.catch(booObject1, booObject2, booObject3, booObject4, booObject5, error => {});
-}
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booObject1, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booObject1, booObject2, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booObject1, booObject2, booObject3, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booObject1, booObject2, booObject3, booObject4, error => {});
+// $ExpectType Bluebird<void | Foo>
+fooProm.catch(booObject1, booObject2, booObject3, booObject4, booObject5, error => {});
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -433,23 +462,27 @@ fooProm = fooProm.bind(obj);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-voidVar = fooProm.done((value: Foo) => {
+// $ExpectType void
+fooProm.done((value: Foo) => {
 	return bar;
 }, (reason: any) => {
 	return bar;
 });
-voidVar = fooProm.done((value: Foo) => {
+// $ExpectType void
+fooProm.done((value: Foo) => {
 	return bar;
 });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-voidVar = fooProm.done((value: Foo) => {
+// $ExpectType void
+fooProm.done((value: Foo) => {
 	return barThen;
 }, (reason: any) => {
 	return barThen;
 });
-voidVar = fooProm.done((value: Foo) => {
+// $ExpectType void
+fooProm.done((value: Foo) => {
 	return barThen;
 });
 
@@ -508,7 +541,8 @@ fooProm = fooProm.nodeify((err: any, foo?: Foo) => { }, { spread: true });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-voidVar = fooProm.cancel();
+// $ExpectType void
+fooProm.cancel();
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -520,11 +554,10 @@ bool = fooProm.isResolved();
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-anyProm = fooProm.call(str);
-anyProm = fooProm.call(str, 1, 2, 3);
+anyProm = fooProm.call("foo");
+anyProm = fooProm.call("foo", 1, 2, 3);
 
-// TODO enable get() test when implemented
-// barProm = fooProm.get(str);
+voidProm = fooProm.get("foo").then((method) => { str = method(); });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -542,7 +575,7 @@ fooProm = fooProm.thenThrow(err);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barProm = fooProm.catchReturn(bar);
+fooOrBarProm = fooProm.return(foo).catchReturn(bar);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -790,15 +823,15 @@ asyncfunc = Promise.promisify(f);
 asyncfunc = Promise.promisify(f, obj);
 
 obj = Promise.promisifyAll(obj);
-anyProm = Promise.fromNode(callback => nodeCallbackFunc(callback));
-anyProm = Promise.fromNode(callback => nodeCallbackFuncErrorOnly(callback));
-anyProm = Promise.fromNode(callback => nodeCallbackFunc(callback), {multiArgs : true});
-anyProm = Promise.fromNode(callback => nodeCallbackFuncErrorOnly(callback), {multiArgs : true});
+anyProm = Promise.fromNode(nodeCallbackFunc);
+anyProm = Promise.fromNode(nodeCallbackFuncErrorOnly);
+anyProm = Promise.fromNode(nodeCallbackFunc, {multiArgs : true});
+anyProm = Promise.fromNode(nodeCallbackFuncErrorOnly, {multiArgs : true});
 
-anyProm = Promise.fromCallback(callback => nodeCallbackFunc(callback));
-anyProm = Promise.fromCallback(callback => nodeCallbackFuncErrorOnly(callback));
-anyProm = Promise.fromCallback(callback => nodeCallbackFunc(callback), {multiArgs : true});
-anyProm = Promise.fromCallback(callback => nodeCallbackFuncErrorOnly(callback), {multiArgs : true});
+anyProm = Promise.fromCallback(nodeCallbackFunc);
+anyProm = Promise.fromCallback(nodeCallbackFuncErrorOnly);
+anyProm = Promise.fromCallback(nodeCallbackFunc, {multiArgs : true});
+anyProm = Promise.fromCallback(nodeCallbackFuncErrorOnly, {multiArgs : true});
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -812,14 +845,11 @@ function defaultFilter(name: string, func: (...args: any[]) => any) {
 
 function DOMPromisifier(originalMethod: (...args: any[]) => any) {
     // return a function
-    return function promisified() {
-        let args = [].slice.call(arguments);
-        // Needed so that the original method can be called with the correct receiver
-        let self = this;
+    return function promisified(this: object, ...args: any[]) {
         // which returns a promise
         return new Promise((resolve, reject) => {
             args.push(resolve, reject);
-            originalMethod.apply(self, args);
+            originalMethod.apply(this, args);
         });
     };
 }
diff --git a/types/bluebird/index.d.ts b/types/bluebird/index.d.ts
index d88d4d704b..b28f821e12 100644
--- a/types/bluebird/index.d.ts
+++ b/types/bluebird/index.d.ts
@@ -35,6 +35,8 @@
  *   THE SOFTWARE.
  */
 
+type CatchFilter<E> = (new (...args: any[]) => E) | ((error: E) => boolean) | (object & E);
+
 declare class Bluebird<R> implements PromiseLike<R>, Bluebird.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.
@@ -43,283 +45,124 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   constructor(callback: (resolve: (thenableOrResult?: R | PromiseLike<R>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void);
 
   /**
-   * Promises/A+ `.then()`. 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.
+   * Promises/A+ `.then()`. 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.
    */
   // Based on PromiseLike.then, but returns a Bluebird instance.
   then<U>(onFulfill?: (value: R) => U | PromiseLike<U>, onReject?: (error: any) => U | PromiseLike<U>): Bluebird<U>; // For simpler signature help.
-  then<TResult1 = R, TResult2 = never>(onfulfilled?: ((value: R) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Bluebird<TResult1 | TResult2>;
+  then<TResult1 = R, TResult2 = never>(
+      onfulfilled?: ((value: R) => TResult1 | PromiseLike<TResult1>) | null,
+      onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
+    ): Bluebird<TResult1 | TResult2>;
 
   /**
-   * 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.
+   * 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(onReject?: (error: any) => R | PromiseLike<R> | void | PromiseLike<void>): Bluebird<R>;
-  caught(onReject?: (error: any) => R | PromiseLike<R> | void | PromiseLike<void>): Bluebird<R>;
-  catch<U>(onReject?: (error: any) => U | PromiseLike<U>): Bluebird<U | R>;
-  caught<U>(onReject?: (error: any) => U | PromiseLike<U>): Bluebird<U | R>;
+  catch(onReject: (error: any) => R | PromiseLike<R>): Bluebird<R>;
+  catch<U>(onReject: ((error: any) => U | PromiseLike<U>) | undefined | null): Bluebird<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.
+   * This extends `.catch` to work more like catch-clauses in languages like Java or C#.
    *
-   * This method also supports predicate-based filters. If you pass a predicate function instead of an error constructor, the predicate will receive the error as an argument. The return result of the predicate will be used determine whether the error handler should be called.
+   * 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.
+   *
+   * This method also supports predicate-based filters.
+   * If you pass a predicate function instead of an error constructor, the predicate will receive the error as an argument.
+   * The return result of the predicate will be used determine whether the error handler should be called.
    *
    * Alias `.caught();` for compatibility with earlier ECMAScript version.
-   *
-   * TODO: disallow non-objects
    */
-  catch<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    filter5: (new (...args: any[]) => E5),
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
   catch<E1, E2, E3, E4, E5>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
-    filter5: ((error: E5) => boolean) | (E5 & object),
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
+    filter3: CatchFilter<E3>,
+    filter4: CatchFilter<E4>,
+    filter5: CatchFilter<E5>,
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R>,
   ): Bluebird<R>;
-  caught<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    filter5: (new (...args: any[]) => E5),
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  caught<E1, E2, E3, E4, E5>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
-    filter5: ((error: E5) => boolean) | (E5 & object),
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  catch<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    filter5: (new (...args: any[]) => E5),
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U> | void | PromiseLike<void>,
-  ): Bluebird<U | R>;
   catch<U, E1, E2, E3, E4, E5>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
-    filter5: ((error: E5) => boolean) | (E5 & object),
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    filter5: (new (...args: any[]) => E5),
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1, E2, E3, E4, E5>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
-    filter5: ((error: E5) => boolean) | (E5 & object),
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
+    filter3: CatchFilter<E3>,
+    filter4: CatchFilter<E4>,
+    filter5: CatchFilter<E5>,
     onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
   ): Bluebird<U | R>;
 
-  catch<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
   catch<E1, E2, E3, E4>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
-    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
+    filter3: CatchFilter<E3>,
+    filter4: CatchFilter<E4>,
+    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R>,
   ): Bluebird<R>;
-  caught<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  caught<E1, E2, E3, E4>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
-    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  catch<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
+
   catch<U, E1, E2, E3, E4>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
-    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    filter4: (new (...args: any[]) => E4),
-    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1, E2, E3, E4>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    filter4: ((error: E4) => boolean) | (E4 & object),
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
+    filter3: CatchFilter<E3>,
+    filter4: CatchFilter<E4>,
     onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
   ): Bluebird<U | R>;
 
-  catch<E1 extends Error, E2 extends Error, E3 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
   catch<E1, E2, E3>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
+    filter3: CatchFilter<E3>,
+    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R>,
   ): Bluebird<R>;
-  caught<E1 extends Error, E2 extends Error, E3 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  caught<E1, E2, E3>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  catch<U, E1 extends Error, E2 extends Error, E3 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
   catch<U, E1, E2, E3>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
-    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1 extends Error, E2 extends Error, E3 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    filter3: (new (...args: any[]) => E3),
-    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1, E2, E3>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
+    filter3: CatchFilter<E3>,
     onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
   ): Bluebird<U | R>;
 
-  catch<E1 extends Error, E2 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
   catch<E1, E2>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
+    onReject: (error: E1 | E2) => R | PromiseLike<R>,
   ): Bluebird<R>;
-  caught<E1 extends Error, E2 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  caught<E1, E2>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  catch<U, E1 extends Error, E2 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    onReject: (error: E1 | E2) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
   catch<U, E1, E2>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
-    onReject: (error: E1 | E2) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1 extends Error, E2 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    filter2: (new (...args: any[]) => E2),
-    onReject: (error: E1 | E2) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1, E2>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter1: CatchFilter<E1>,
+    filter2: CatchFilter<E2>,
     onReject: (error: E1 | E2) => U | PromiseLike<U>,
   ): Bluebird<U | R>;
 
-  catch<E1 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
   catch<E1>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
+    filter1: CatchFilter<E1>,
+    onReject: (error: E1) => R | PromiseLike<R>,
   ): Bluebird<R>;
-  caught<E1 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  caught<E1>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
-  ): Bluebird<R>;
-  catch<U, E1 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    onReject: (error: E1) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
   catch<U, E1>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
-    onReject: (error: E1) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1 extends Error>(
-    filter1: (new (...args: any[]) => E1),
-    onReject: (error: E1) => U | PromiseLike<U>,
-  ): Bluebird<U | R>;
-  caught<U, E1>(
-    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter1: CatchFilter<E1>,
     onReject: (error: E1) => U | PromiseLike<U>,
   ): Bluebird<U | R>;
 
+  /**
+   * 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.
+   */
+  caught: Bluebird<R>["catch"];
+
   /**
    * 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.
    */
   error<U>(onReject: (reason: any) => U | PromiseLike<U>): Bluebird<U>;
 
   /**
-   * Pass a handler that will be called regardless of this promise's fate. Returns a new promise chained from this promise. There are special semantics for `.finally()` in that the final value cannot be modified from the handler.
+   * Pass a handler that will be called regardless of this promise's fate. Returns a new promise chained from this promise.
+   *
+   * There are special semantics for `.finally()` in that the final value cannot be modified from the handler.
    *
    * Alias `.lastly();` for compatibility with earlier ECMAScript version.
    */
@@ -328,7 +171,9 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   lastly<U>(handler: () => U | PromiseLike<U>): Bluebird<R>;
 
   /**
-   * Create a promise that follows this promise, but is bound to the given `thisArg` value. A bound promise will call its handlers with the bound value set to `this`. Additionally promises derived from a bound promise will also be bound promises with the same `thisArg` binding as the original promise.
+   * Create a promise that follows this promise, but is bound to the given `thisArg` value. A bound promise will call its handlers with the bound value set to `this`.
+   *
+   * Additionally promises derived from a bound promise will also be bound promises with the same `thisArg` binding as the original promise.
    */
   bind(thisArg: any): Bluebird<R>;
 
@@ -344,7 +189,6 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
 
   /**
    * Like `.catch()` but rethrows the error
-   * TODO: disallow non-objects
    */
   tapCatch<U>(onReject: (error?: any) => U | PromiseLike<U>): Bluebird<R>;
 
@@ -394,7 +238,11 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   timeout(ms: number, message?: string | Error): Bluebird<R>;
 
   /**
-   * Register a node-style callback on this promise. When this promise is is either fulfilled or rejected, the node callback will be called back with the node.js convention where error reason is the first argument and success value is the second argument. The error argument will be `null` in case of success.
+   * Register a node-style callback on this promise.
+   *
+   * When this promise is is either fulfilled or rejected,
+   * the node callback will be called back with the node.js convention where error reason is the first argument and success value is the second argument.
+   * The error argument will be `null` in case of success.
    * If the `callback` argument is not a function, this method does not do anything.
    */
   nodeify(callback: (err: any, value?: R) => void, options?: Bluebird.SpreadOption): this;
@@ -457,7 +305,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * });
    * </code>
    */
-  call(propertyName: string, ...args: any[]): Bluebird<any>;
+  call(propertyName: keyof R, ...args: any[]): Bluebird<any>;
 
   /**
    * This is a convenience method for doing:
@@ -468,9 +316,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * });
    * </code>
    */
-  // TODO: Use "type property type" once it's there
-  // @see https://github.com/Microsoft/TypeScript/issues/1295
-  get<U>(key: string | number): Bluebird<U>;
+  get<U extends keyof R>(key: U): Bluebird<R[U]>;
 
   /**
    * Convenience method for:
@@ -486,8 +332,8 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * Alias `.thenReturn();` for compatibility with earlier ECMAScript version.
    */
   return(): Bluebird<void>;
-  thenReturn(): Bluebird<void>;
   return<U>(value: U): Bluebird<U>;
+  thenReturn(): Bluebird<void>;
   thenReturn<U>(value: U): Bluebird<U>;
 
   /**
@@ -502,8 +348,8 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    *
    * Alias `.thenThrow();` for compatibility with earlier ECMAScript version.
    */
-  throw(reason: Error): Bluebird<R>;
-  thenThrow(reason: Error): Bluebird<R>;
+  throw(reason: Error): Bluebird<never>;
+  thenThrow(reason: Error): Bluebird<never>;
 
   /**
    * Convenience method for:
@@ -515,40 +361,39 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * </code>
    *
    * in the case where `value` doesn't change its value. That means `value` is bound at the time of calling `.catchReturn()`
-   * TODO: disallow non-objects
    */
-  catchReturn<U>(value: U): Bluebird<U>;
+  catchReturn<U>(value: U): Bluebird<R | U>;
 
-  catchReturn<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
-    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | object,
-    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | object,
-    filter5: (new (...args: any[]) => E5) | ((error: any) => boolean) | object,
+  catchReturn<U>(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter3: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter4: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter5: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     value: U,
-  ): Bluebird<U>;
-  catchReturn<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
-    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | object,
-    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | object,
+  ): Bluebird<R | U>;
+  catchReturn<U>(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter3: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter4: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     value: U,
-  ): Bluebird<U>;
-  catchReturn<U, E1 extends Error, E2 extends Error, E3 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
-    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | object,
+  ): Bluebird<R | U>;
+  catchReturn<U>(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter3: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     value: U,
-  ): Bluebird<U>;
-  catchReturn<U, E1 extends Error, E2 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
+  ): Bluebird<R | U>;
+  catchReturn<U>(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     value: U,
-  ): Bluebird<U>;
-  catchReturn<U, E1 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
+  ): Bluebird<R | U>;
+  catchReturn<U>(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     value: U,
-  ): Bluebird<U>;
+  ): Bluebird<R | U>;
 
   /**
    * Convenience method for:
@@ -559,38 +404,37 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * });
    * </code>
    * Same limitations apply as with `.catchReturn()`.
-   * TODO: disallow non-objects
    */
   catchThrow(reason: Error): Bluebird<R>;
 
-  catchThrow<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
-    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | object,
-    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | object,
-    filter5: (new (...args: any[]) => E5) | ((error: any) => boolean) | object,
+  catchThrow(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter3: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter4: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter5: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     reason: Error,
   ): Bluebird<R>;
-  catchThrow<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
-    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | object,
-    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | object,
+  catchThrow(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter3: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter4: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     reason: Error,
   ): Bluebird<R>;
-  catchThrow<E1 extends Error, E2 extends Error, E3 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
-    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | object,
+  catchThrow(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter3: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     reason: Error,
   ): Bluebird<R>;
-  catchThrow<E1 extends Error, E2 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
-    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | object,
+  catchThrow(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
+    filter2: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     reason: Error,
   ): Bluebird<R>;
-  catchThrow<E1 extends Error>(
-    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | object,
+  catchThrow(
+    filter1: (new (...args: any[]) => Error) | ((error: any) => boolean) | object,
     reason: Error,
   ): Bluebird<R>;
 
@@ -683,7 +527,8 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   /**
    * Start the chain of promises with `Promise.try`. Any synchronous exceptions will be turned into rejections on the returned promise.
    *
-   * Note about second argument: if it's specifically a true array, its values become respective arguments for the function call. Otherwise it is passed as is as the first argument for the function call.
+   * Note about second argument: if it's specifically a true array, its values become respective arguments for the function call.
+   * Otherwise it is passed as is as the first argument for the function call.
    *
    * Alias for `attempt();` for compatibility with earlier ECMAScript version.
    */
@@ -691,7 +536,8 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static attempt<R>(fn: () => R | PromiseLike<R>): Bluebird<R>;
 
   /**
-   * Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.
+   * Returns a new function that wraps the given function `fn`.
+   * The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.
    * This method is convenient when a function can sometimes return synchronously or throw synchronously.
    */
   static method<R, A1>(fn: (arg1: A1) => R | PromiseLike<R>): (arg1: A1) => Bluebird<R>;
@@ -710,8 +556,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   /**
    * Create a promise that is rejected with the given `reason`.
    */
-  static reject(reason: any): Bluebird<any>;
-  static reject<R>(reason: any): Bluebird<R>;
+  static reject(reason: any): Bluebird<never>;
 
   /**
    * Create a promise with undecided fate and return a `PromiseResolver` to control it. See resolution?: Promise(#promise-resolution).
@@ -719,7 +564,10 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static defer<R>(): Bluebird.Resolver<R>;
 
   /**
-   * Cast the given `value` to a trusted promise. If `value` is already a trusted `Promise`, it is returned as is. If `value` is not a thenable, a fulfilled is: Promise returned with `value` as its fulfillment value. If `value` is a thenable (Promise-like object, like those returned by jQuery's `$.ajax`), returns a trusted that: Promise assimilates the state of the thenable.
+   * Cast the given `value` to a trusted promise.
+   *
+   * If `value` is already a trusted `Promise`, it is returned as is. If `value` is not a thenable, a fulfilled is: Promise returned with `value` as its fulfillment value.
+   * If `value` is a thenable (Promise-like object, like those returned by jQuery's `$.ajax`), returns a trusted that: Promise assimilates the state of the thenable.
    */
   static cast<R>(value: R | PromiseLike<R>): Bluebird<R>;
 
@@ -734,7 +582,10 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static is(value: any): boolean;
 
   /**
-   * Call this right after the library is loaded to enabled long stack traces. Long stack traces cannot be disabled after being enabled, and cannot be enabled after promises have already been created. Long stack traces imply a substantial performance penalty, around 4-5x for throughput and 0.5x for latency.
+   * Call this right after the library is loaded to enabled long stack traces.
+   *
+   * Long stack traces cannot be disabled after being enabled, and cannot be enabled after promises have already been created.
+   * Long stack traces imply a substantial performance penalty, around 4-5x for throughput and 0.5x for latency.
    */
   static longStackTraces(): void;
 
@@ -747,27 +598,52 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static delay(ms: number): Bluebird<void>;
 
   /**
-   * Returns a function that will wrap the given `nodeFunction`. Instead of taking a callback, the returned function will return a promise whose fate is decided by the callback behavior of the given node function. The node function should conform to node.js convention of accepting a callback as last argument and calling that callback with error as the first argument and success value on the second argument.
+   * Returns a function that will wrap the given `nodeFunction`.
+   *
+   * Instead of taking a callback, the returned function will return a promise whose fate is decided by the callback behavior of the given node function.
+   * The node function should conform to node.js convention of accepting a callback as last argument and
+   * calling that callback with error as the first argument and success value on the second argument.
    *
    * If the `nodeFunction` calls its callback with multiple success values, the fulfillment value will be an array of them.
    *
    * If you pass a `receiver`, the `nodeFunction` will be called as a method on the `receiver`.
    */
-  static promisify<T>(func: (callback: (err: any, result?: T) => void) => void, options?: Bluebird.PromisifyOptions): () => Bluebird<T>;
-  static promisify<T, A1>(func: (arg1: A1, callback: (err: any, result?: T) => void) => void, options?: Bluebird.PromisifyOptions): (arg1: A1) => Bluebird<T>;
-  static promisify<T, A1, A2>(func: (arg1: A1, arg2: A2, callback: (err: any, result?: T) => void) => void, options?: Bluebird.PromisifyOptions): (arg1: A1, arg2: A2) => Bluebird<T>;
-  static promisify<T, A1, A2, A3>(func: (arg1: A1, arg2: A2, arg3: A3, callback: (err: any, result?: T) => void) => void, options?: Bluebird.PromisifyOptions): (arg1: A1, arg2: A2, arg3: A3) => Bluebird<T>;
-  static promisify<T, A1, A2, A3, A4>(func: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, callback: (err: any, result?: T) => void) => void, options?: Bluebird.PromisifyOptions): (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => Bluebird<T>;
-  static promisify<T, A1, A2, A3, A4, A5>(func: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5, callback: (err: any, result?: T) => void) => void, options?: Bluebird.PromisifyOptions): (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => Bluebird<T>;
+  static promisify<T>(
+      func: (callback: (err: any, result?: T) => void) => void,
+      options?: Bluebird.PromisifyOptions
+    ): () => Bluebird<T>;
+  static promisify<T, A1>(
+      func: (arg1: A1, callback: (err: any, result?: T) => void) => void,
+      options?: Bluebird.PromisifyOptions
+    ): (arg1: A1) => Bluebird<T>;
+  static promisify<T, A1, A2>(
+      func: (arg1: A1, arg2: A2, callback: (err: any, result?: T) => void) => void,
+      options?: Bluebird.PromisifyOptions
+    ): (arg1: A1, arg2: A2) => Bluebird<T>;
+  static promisify<T, A1, A2, A3>(
+      func: (arg1: A1, arg2: A2, arg3: A3, callback: (err: any, result?: T) => void) => void,
+      options?: Bluebird.PromisifyOptions
+    ): (arg1: A1, arg2: A2, arg3: A3) => Bluebird<T>;
+  static promisify<T, A1, A2, A3, A4>(
+      func: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, callback: (err: any, result?: T) => void) => void,
+      options?: Bluebird.PromisifyOptions
+    ): (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => Bluebird<T>;
+  static promisify<T, A1, A2, A3, A4, A5>(
+      func: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5, callback: (err: any, result?: T) => void) => void,
+      options?: Bluebird.PromisifyOptions
+    ): (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => Bluebird<T>;
   static promisify(nodeFunction: (...args: any[]) => void, options?: Bluebird.PromisifyOptions): (...args: any[]) => Bluebird<any>;
 
   /**
-   * Promisifies the entire object by going through the object's properties and creating an async equivalent of each function on the object and its prototype chain. The promisified method name will be the original method name postfixed with `Async`. Returns the input object.
+   * Promisifies the entire object by going through the object's properties and creating an async equivalent of each function on the object and its prototype chain.
    *
-   * Note that the original methods on the object are not overwritten but new methods are created with the `Async`-postfix. For example, if you `promisifyAll()` the node.js `fs` object use `fs.statAsync()` to call the promisified `stat` method.
+   * The promisified method name will be the original method name postfixed with `Async`. Returns the input object.
+   *
+   * Note that the original methods on the object are not overwritten but new methods are created with the `Async`-postfix. For example,
+   * if you `promisifyAll()` the node.js `fs` object use `fs.statAsync()` to call the promisified `stat` method.
    */
   // TODO how to model promisifyAll?
-  static promisifyAll(target: object, options?: Bluebird.PromisifyAllOptions): object;
+  static promisifyAll<T extends object>(target: T, options?: Bluebird.PromisifyAllOptions<T>): T;
 
   /**
    * Returns a promise that is resolved by a node style callback function.
@@ -778,19 +654,50 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static fromCallback<T>(resolver: (callback: (err: any, result?: T) => void) => void, options?: Bluebird.FromNodeOptions): Bluebird<T>;
 
   /**
-   * 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.
+   * 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.
    */
   // TODO: After https://github.com/Microsoft/TypeScript/issues/2983 is implemented, we can use
   // the return type propagation of generators to automatically infer the return type T.
-  static coroutine<T>(generatorFunction: () => IterableIterator<any>, options?: Bluebird.CoroutineOptions): () => Bluebird<T>;
-  static coroutine<T, A1>(generatorFunction: (a1: A1) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1) => Bluebird<T>;
-  static coroutine<T, A1, A2>(generatorFunction: (a1: A1, a2: A2) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1, a2: A2) => Bluebird<T>;
-  static coroutine<T, A1, A2, A3>(generatorFunction: (a1: A1, a2: A2, a3: A3) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1, a2: A2, a3: A3) => Bluebird<T>;
-  static coroutine<T, A1, A2, A3, A4>(generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1, a2: A2, a3: A3, a4: A4) => Bluebird<T>;
-  static coroutine<T, A1, A2, A3, A4, A5>(generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5) => Bluebird<T>;
-  static coroutine<T, A1, A2, A3, A4, A5, A6>(generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6) => Bluebird<T>;
-  static coroutine<T, A1, A2, A3, A4, A5, A6, A7>(generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7) => Bluebird<T>;
-  static coroutine<T, A1, A2, A3, A4, A5, A6, A7, A8>(generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8) => IterableIterator<any>, options?: Bluebird.CoroutineOptions): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8) => Bluebird<T>;
+  static coroutine<T>(
+      generatorFunction: () => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): () => Bluebird<T>;
+  static coroutine<T, A1>(
+      generatorFunction: (a1: A1) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1) => Bluebird<T>;
+  static coroutine<T, A1, A2>(
+      generatorFunction: (a1: A1, a2: A2) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1, a2: A2) => Bluebird<T>;
+  static coroutine<T, A1, A2, A3>(
+      generatorFunction: (a1: A1, a2: A2, a3: A3) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1, a2: A2, a3: A3) => Bluebird<T>;
+  static coroutine<T, A1, A2, A3, A4>(
+      generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1, a2: A2, a3: A3, a4: A4) => Bluebird<T>;
+  static coroutine<T, A1, A2, A3, A4, A5>(
+      generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5) => Bluebird<T>;
+  static coroutine<T, A1, A2, A3, A4, A5, A6>(
+      generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6) => Bluebird<T>;
+  static coroutine<T, A1, A2, A3, A4, A5, A6, A7>(
+      generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7) => Bluebird<T>;
+  static coroutine<T, A1, A2, A3, A4, A5, A6, A7, A8>(
+      generatorFunction: (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8) => IterableIterator<any>,
+      options?: Bluebird.CoroutineOptions
+    ): (a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8) => Bluebird<T>;
+
   /**
    * Add `handler` as the handler to call when there is a possibly unhandled rejection. The default handler logs the error stack to stderr or `console.error` in browsers.
    *
@@ -799,7 +706,19 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static onPossiblyUnhandledRejection(handler: (reason: any) => any): void;
 
   /**
-   * Given an array, or a promise of an array, which contains promises (or a mix of promises and values) return a promise that is fulfilled when all the items in the array are fulfilled. The promise's fulfillment value is an array with fulfillment values at respective positions to the original array. If any promise in the array rejects, the returned promise is rejected with the rejection reason.
+   * Add handler as the handler to call when there is a possibly unhandled rejection.
+   * The default handler logs the error stack to stderr or console.error in browsers.
+   *
+   * Passing no value or a non-function will have the effect of removing any kind of handling for possibly unhandled rejections.
+   *
+   * Note: this hook is specific to the bluebird instance its called on, application developers should use global rejection events.
+   */
+  static onPossiblyUnhandledRejection(handler?: (error: Error, promise: Bluebird<any>) => void): void;
+
+  /**
+   * Given an array, or a promise of an array, which contains promises (or a mix of promises and values) return a promise that is fulfilled when all the items in the array are fulfilled.
+   * The promise's fulfillment value is an array with fulfillment values at respective positions to the original array.
+   * If any promise in the array rejects, the returned promise is rejected with the rejection reason.
    */
   // TODO enable more overloads
   // array with promises of different types
@@ -809,44 +728,47 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static all<T1, T2>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2]): Bluebird<[T1, T2]>;
   static all<T1>(values: [PromiseLike<T1> | T1]): Bluebird<[T1]>;
   // array with values
-  static all<R>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>): Bluebird<R[]>;
+  static all<R>(values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>): Bluebird<R[]>;
 
   /**
-   * Like ``Promise.all`` but for object properties instead of array items. Returns a promise that is fulfilled when all the properties of the object are fulfilled. The promise's fulfillment value is an object with fulfillment values at respective keys to the original object. If any promise in the object rejects, the returned promise is rejected with the rejection reason.
+   * Like ``Promise.all`` but for object properties instead of array items. Returns a promise that is fulfilled when all the properties of the object are fulfilled.
    *
-   * If `object` is a trusted `Promise`, then it will be treated as a promise for object rather than for its properties. All other objects are treated for their properties as is returned by `Object.keys` - the object's own enumerable properties.
+   * The promise's fulfillment value is an object with fulfillment values at respective keys to the original object.
+   * If any promise in the object rejects, the returned promise is rejected with the rejection reason.
+   *
+   * If `object` is a trusted `Promise`, then it will be treated as a promise for object rather than for its properties.
+   * All other objects are treated for their properties as is returned by `Object.keys` - the object's own enumerable properties.
    *
    * *The original object is not modified.*
    */
-  // trusted promise for map
-  static props<K, V>(map: PromiseLike<Map<K, PromiseLike<V> | V>>): Bluebird<Map<K, V>>;
+  // map
+  static props<K, V>(map: PromiseLike<Map<K, PromiseLike<V> | V>> | Map<K, PromiseLike<V> | V>): Bluebird<Map<K, V>>;
   // trusted promise for object
   static props<T>(object: PromiseLike<Bluebird.ResolvableProps<T>>): Bluebird<T>; // tslint:disable-line:unified-signatures
-  // map
-  static props<K, V>(map: Map<K, PromiseLike<V> | V>): Bluebird<Map<K, V>>; // tslint:disable-line:unified-signatures
   // object
   static props<T>(object: Bluebird.ResolvableProps<T>): Bluebird<T>; // tslint:disable-line:unified-signatures
 
   /**
    * Like `Promise.some()`, with 1 as `count`. However, if the promise fulfills, the fulfillment value is not an array of 1 but the value directly.
    */
-  static any<R>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>): Bluebird<R>;
+  static any<R>(values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>): Bluebird<R>;
 
   /**
    * Given an array, or a promise of an array, which contains promises (or a mix of promises and values) return a promise that is fulfilled or rejected as soon as a promise in the array is fulfilled or rejected with the respective rejection reason or fulfillment value.
    *
    * **Note** If you pass empty array or a sparse array with no values, or a promise/thenable for such, it will be forever pending.
    */
-  static race<R>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>): Bluebird<R>;
+  static race<R>(values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>): Bluebird<R>;
 
   /**
-   * Initiate a competetive race between multiple promises or values (values will become immediately fulfilled promises). When `count` amount of promises have been fulfilled, the returned promise is fulfilled with an array that contains the fulfillment values of the winners in order of resolution.
+   * Initiate a competetive race between multiple promises or values (values will become immediately fulfilled promises).
+   * When `count` amount of promises have been fulfilled, the returned promise is fulfilled with an array that contains the fulfillment values of the winners in order of resolution.
    *
    * If too many promises are rejected so that the promise can never become fulfilled, it will be immediately rejected with an array of rejection reasons in the order they were thrown in.
    *
    * *The original array is not modified.*
    */
-  static some<R>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>, count: number): Bluebird<R[]>;
+  static some<R>(values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>, count: number): Bluebird<R[]>;
 
   /**
    * Promise.join(
@@ -855,60 +777,112 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * ) -> Promise
    * For coordinating multiple concurrent discrete promises.
    *
-   * Note: In 1.x and 0.x Promise.join used to be a Promise.all that took the values in as arguments instead in an array. This behavior has been deprecated but is still supported partially - when the last argument is an immediate function value the new semantics will apply
+   * Note: In 1.x and 0.x Promise.join used to be a Promise.all that took the values in as arguments instead in an array.
+   * This behavior has been deprecated but is still supported partially - when the last argument is an immediate function value the new semantics will apply
    */
-  static join<R, A1>(arg1: A1 | PromiseLike<A1>, handler: (arg1: A1) => R | PromiseLike<R>): Bluebird<R>;
-  static join<R, A1, A2>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, handler: (arg1: A1, arg2: A2) => R | PromiseLike<R>): Bluebird<R>;
-  static join<R, A1, A2, A3>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, arg3: A3 | PromiseLike<A3>, handler: (arg1: A1, arg2: A2, arg3: A3) => R | PromiseLike<R>): Bluebird<R>;
-  static join<R, A1, A2, A3, A4>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, arg3: A3 | PromiseLike<A3>, arg4: A4 | PromiseLike<A4>, handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => R | PromiseLike<R>): Bluebird<R>;
-  static join<R, A1, A2, A3, A4, A5>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, arg3: A3 | PromiseLike<A3>, arg4: A4 | PromiseLike<A4>, arg5: A5 | PromiseLike<A5>, handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => R | PromiseLike<R>): Bluebird<R>;
+  static join<R, A1>(
+      arg1: A1 | PromiseLike<A1>,
+      handler: (arg1: A1) => R | PromiseLike<R>
+    ): Bluebird<R>;
+  static join<R, A1, A2>(
+      arg1: A1 | PromiseLike<A1>,
+      arg2: A2 | PromiseLike<A2>,
+      handler: (arg1: A1, arg2: A2) => R | PromiseLike<R>
+    ): Bluebird<R>;
+  static join<R, A1, A2, A3>(
+      arg1: A1 | PromiseLike<A1>,
+      arg2: A2 | PromiseLike<A2>,
+      arg3: A3 | PromiseLike<A3>,
+      handler: (arg1: A1, arg2: A2, arg3: A3) => R | PromiseLike<R>
+    ): Bluebird<R>;
+  static join<R, A1, A2, A3, A4>(
+      arg1: A1 | PromiseLike<A1>,
+      arg2: A2 | PromiseLike<A2>,
+      arg3: A3 | PromiseLike<A3>,
+      arg4: A4 | PromiseLike<A4>,
+      handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => R | PromiseLike<R>
+    ): Bluebird<R>;
+  static join<R, A1, A2, A3, A4, A5>(
+      arg1: A1 | PromiseLike<A1>,
+      arg2: A2 | PromiseLike<A2>,
+      arg3: A3 | PromiseLike<A3>,
+      arg4: A4 | PromiseLike<A4>,
+      arg5: A5 | PromiseLike<A5>,
+      handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => R | PromiseLike<R>
+    ): Bluebird<R>;
 
   // variadic array
   /** @deprecated use .all instead */
   static join<R>(...values: Array<R | PromiseLike<R>>): Bluebird<R[]>;
 
   /**
-   * Map an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `mapper` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well.
+   * Map an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `mapper` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array.
+   * If any promise in the input array is rejected the returned promise is rejected as well.
    *
    * If the `mapper` function returns promises or thenables, the returned promise will wait for all the mapped results to be resolved as well.
    *
    * *The original array is not modified.*
    */
-  static map<R, U>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>, mapper: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  static map<R, U>(
+      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
+      mapper: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>,
+      options?: Bluebird.ConcurrencyOption
+    ): Bluebird<U[]>;
 
   /**
-   * Reduce an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `reducer` function with the signature `(total, current, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well.
+   * Reduce an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `reducer` function with the signature `(total, current, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array.
+   * If any promise in the input array is rejected the returned promise is rejected as well.
    *
    * If the reducer function returns a promise or a thenable, the result for the promise is awaited for before continuing with next iteration.
    *
-   * *The original array is not modified. If no `intialValue` is given and the array doesn't contain at least 2 items, the callback will not be called and `undefined` is returned. If `initialValue` is given and the array doesn't have at least 1 item, `initialValue` is returned.*
+   * *The original array is not modified. If no `intialValue` is given and the array doesn't contain at least 2 items, the callback will not be called and `undefined` is returned.
+   * If `initialValue` is given and the array doesn't have at least 1 item, `initialValue` is returned.*
    */
-  static reduce<R, U>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>, reducer: (total: U, current: R, index: number, arrayLength: number) => U | PromiseLike<U>, initialValue?: U): Bluebird<U>;
+  static reduce<R, U>(
+      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
+      reducer: (total: U, current: R, index: number, arrayLength: number) => U | PromiseLike<U>,
+      initialValue?: U
+    ): Bluebird<U>;
 
   /**
-   * Filter an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `filterer` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well.
+   * Filter an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `filterer` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array.
+   * If any promise in the input array is rejected the returned promise is rejected as well.
    *
    * The return values from the filtered functions are coerced to booleans, with the exception of promises and thenables which are awaited for their eventual result.
    *
    * *The original array is not modified.
    */
-  static filter<R>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>, filterer: (item: R, index: number, arrayLength: number) => boolean | PromiseLike<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
+  static filter<R>(
+      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
+      filterer: (item: R, index: number, arrayLength: number) => boolean | PromiseLike<boolean>,
+      option?: Bluebird.ConcurrencyOption
+    ): Bluebird<R[]>;
 
   /**
-   * Iterate over an array, or a promise of an array, which contains promises (or a mix of promises and values) with the given iterator function with the signature (item, index, value) where item is the resolved value of a respective promise in the input array. Iteration happens serially. If any promise in the input array is rejected the returned promise is rejected as well.
+   * Iterate over an array, or a promise of an array, which contains promises (or a mix of promises and values) with the given iterator function with the signature (item, index, value) where item is the resolved value of a respective promise in the input array.
+   * Iteration happens serially. If any promise in the input array is rejected the returned promise is rejected as well.
    *
-   * Resolves to the original array unmodified, this method is meant to be used for side effects. If the iterator function returns a promise or a thenable, the result for the promise is awaited for before continuing with next iteration.
+   * Resolves to the original array unmodified, this method is meant to be used for side effects.
+   * If the iterator function returns a promise or a thenable, the result for the promise is awaited for before continuing with next iteration.
    */
-  static each<R, U>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>, iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<R[]>;
+  static each<R, U>(
+      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
+      iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>
+    ): Bluebird<R[]>;
 
   /**
    * Given an Iterable(arrays are Iterable), or a promise of an Iterable, which produces promises (or a mix of promises and values), iterate over all the values in the Iterable into an array and iterate over the array serially, in-order.
    *
-   * Returns a promise for an array that contains the values returned by the iterator function in their respective positions. The iterator won't be called for an item until its previous item, and the promise returned by the iterator for that item are fulfilled. This results in a mapSeries kind of utility but it can also be used simply as a side effect iterator similar to Array#forEach.
+   * Returns a promise for an array that contains the values returned by the iterator function in their respective positions.
+   * The iterator won't be called for an item until its previous item, and the promise returned by the iterator for that item are fulfilled.
+   * This results in a mapSeries kind of utility but it can also be used simply as a side effect iterator similar to Array#forEach.
    *
    * If any promise in the input array is rejected or any promise returned by the iterator function is rejected, the result will be rejected as well.
    */
-  static mapSeries<R, U>(values: PromiseLike<Array<PromiseLike<R> | R>> | Array<PromiseLike<R> | R>, iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<U[]>;
+  static mapSeries<R, U>(
+      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
+      iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>
+    ): Bluebird<U[]>;
 
   /**
    * A meta method used to specify the disposer method that cleans up a resource when using `Promise.using`.
@@ -927,19 +901,21 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    *  will be called when the promise returned by the callback passed to using has settled. The disposer is
    *  necessary because there is no standard interface in node for disposing resources.
    */
-  static using<R, T>(disposer: Bluebird.Disposer<R>, executor: (transaction: R) => PromiseLike<T>): Bluebird<T>;
-  static using<R1, R2, T>(disposer: Bluebird.Disposer<R1>, disposer2: Bluebird.Disposer<R2>, executor: (transaction1: R1, transaction2: R2) => PromiseLike<T>): Bluebird<T>;
-  static using<R1, R2, R3, T>(disposer: Bluebird.Disposer<R1>, disposer2: Bluebird.Disposer<R2>, disposer3: Bluebird.Disposer<R3>, executor: (transaction1: R1, transaction2: R2, transaction3: R3) => PromiseLike<T>): Bluebird<T>;
-
-  /**
-   * Add handler as the handler to call when there is a possibly unhandled rejection.
-   * The default handler logs the error stack to stderr or console.error in browsers.
-   *
-   * Passing no value or a non-function will have the effect of removing any kind of handling for possibly unhandled rejections.
-   *
-   * Note: this hook is specific to the bluebird instance its called on, application developers should use global rejection events.
-   */
-  static onPossiblyUnhandledRejection(handler?: (error: Error, promise: Bluebird<any>) => void): void;
+  static using<R, T>(
+      disposer: Bluebird.Disposer<R>,
+      executor: (transaction: R) => PromiseLike<T>
+    ): Bluebird<T>;
+  static using<R1, R2, T>(
+      disposer: Bluebird.Disposer<R1>,
+      disposer2: Bluebird.Disposer<R2>,
+      executor: (transaction1: R1, transaction2: R2
+    ) => PromiseLike<T>): Bluebird<T>;
+  static using<R1, R2, R3, T>(
+      disposer: Bluebird.Disposer<R1>,
+      disposer2: Bluebird.Disposer<R2>,
+      disposer3: Bluebird.Disposer<R3>,
+      executor: (transaction1: R1, transaction2: R2, transaction3: R3) => PromiseLike<T>
+    ): Bluebird<T>;
 
   /**
    * Configure long stack traces, warnings, monitoring and cancellation.
@@ -986,11 +962,11 @@ declare namespace Bluebird {
     context?: any;
     multiArgs?: boolean;
   }
-  interface PromisifyAllOptions extends PromisifyOptions {
+  interface PromisifyAllOptions<T> extends PromisifyOptions {
     suffix?: string;
     filter?(name: string, func: (...args: any[]) => any, target?: any, passesDefaultFilter?: boolean): boolean;
     // The promisifier gets a reference to the original method and should return a function which returns a promise
-    promisifier?(originalMethod: (...args: any[]) => any, defaultPromisifer: (...args: any[]) => (...args: any[]) => Bluebird<any>): () => PromiseLike<any>;
+    promisifier?(this: T, originalMethod: (...args: any[]) => any, defaultPromisifer: (...args: any[]) => (...args: any[]) => Bluebird<any>): () => PromiseLike<any>;
   }
   interface CoroutineOptions {
     yieldHandler(value: any): any;
@@ -1014,7 +990,7 @@ declare namespace Bluebird {
   /**
    * Signals that an operation has been aborted or cancelled. The default reason used by `.cancel`.
    */
-  class CancellationError extends Error {}
+  class CancellationError extends Error { }
 
   /**
    * A collection of errors. `AggregateError` is an array-like object, with numeric indices and a `.length` property.
@@ -1049,12 +1025,12 @@ declare namespace Bluebird {
   /**
    * returned by `Bluebird.disposer()`.
    */
-  class Disposer<R> {}
+  class Disposer<R> { }
 
   /** @deprecated Use PromiseLike<T> directly. */
   type Thenable<T> = PromiseLike<T>;
 
-  type ResolvableProps<T> = object & { [K in keyof T]: PromiseLike<T[K]> | T[K] };
+  type ResolvableProps<T> = object & {[K in keyof T]: PromiseLike<T[K]> | T[K]};
 
   interface Resolver<R> {
     /**
@@ -1074,7 +1050,8 @@ declare namespace Bluebird {
     reject(reason: any): void;
 
     /**
-     * Gives you a callback representation of the `PromiseResolver`. Note that this is not a method but a property. The callback accepts error object in first argument and success values on the 2nd parameter and the rest, I.E. node js conventions.
+     * Gives you a callback representation of the `PromiseResolver`. Note that this is not a method but a property.
+     * The callback accepts error object in first argument and success values on the 2nd parameter and the rest, I.E. node js conventions.
      *
      * If the the callback is called with multiple success values, the resolver fullfills its promise with an array of the values.
      */
diff --git a/types/bluebird/tsconfig.json b/types/bluebird/tsconfig.json
index 94fc104c8f..909dae3771 100644
--- a/types/bluebird/tsconfig.json
+++ b/types/bluebird/tsconfig.json
@@ -9,9 +9,9 @@
             "es6"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
+        "noImplicitThis": true,
         "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
\ No newline at end of file
+}
diff --git a/types/bluebird/tslint.json b/types/bluebird/tslint.json
index 44da6a5d92..6abaaba4e3 100644
--- a/types/bluebird/tslint.json
+++ b/types/bluebird/tslint.json
@@ -1,12 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "max-line-length": [true, 490],
-        "no-unnecessary-callback-wrapper": false,
+        "max-line-length": [true, 280],
         "no-unnecessary-generics": false,
-        "no-void-expression": false,
-        "prefer-const": false,
-        "void-return": false
+        "prefer-const": false
     }
 }
diff --git a/types/bluebird/v1/tslint.json b/types/bluebird/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bluebird/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bluebird/v2/tslint.json b/types/bluebird/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bluebird/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/blueimp-md5/tslint.json b/types/blueimp-md5/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/blueimp-md5/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/body-parser/index.d.ts b/types/body-parser/index.d.ts
index 2056c89b22..b1485770a1 100644
--- a/types/body-parser/index.d.ts
+++ b/types/body-parser/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/expressjs/body-parser
 // Definitions by: Santi Albo <https://github.com/santialbo>, Vilic Vane <https://github.com/vilic>, Jonathan Häberle <https://github.com/dreampulse>, Gevik Babakhani <https://github.com/blendsdk>, Tomasz �aziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/bookshelf/index.d.ts b/types/bookshelf/index.d.ts
index bb817d3074..dca8d5fad2 100644
--- a/types/bookshelf/index.d.ts
+++ b/types/bookshelf/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bookshelfjs v0.9.3
+// Type definitions for bookshelfjs v0.9.4
 // Project: http://bookshelfjs.org/
 // Definitions by: Andrew Schurman <https://github.com/arcticwaters>, Vesa Poikajärvi <https://github.com/vesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -17,7 +17,7 @@ interface Bookshelf extends Bookshelf.Events<any> {
 	Collection: typeof Bookshelf.Collection;
 
 	plugin(name: string | string[] | Function, options?: any): Bookshelf;
-	transaction<T>(callback: (transaction: knex.Transaction) => BlueBird<T>): BlueBird<T>;
+	transaction<T>(callback: (transaction: knex.Transaction) => PromiseLike<T>): BlueBird<T>;
 }
 
 declare function Bookshelf(knex: knex): Bookshelf;
diff --git a/types/bookshelf/tslint.json b/types/bookshelf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bookshelf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/boolify-string/tslint.json b/types/boolify-string/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/boolify-string/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/boom/boom-tests.ts b/types/boom/boom-tests.ts
index 1819be25cb..f989128b4e 100644
--- a/types/boom/boom-tests.ts
+++ b/types/boom/boom-tests.ts
@@ -1,11 +1,10 @@
 import Boom = require('boom');
-import * as Hapi from 'hapi';
 
 // 4xx and data type
 
 const badRequestError = Boom.badRequest('message', {some: 'data'});
 badRequestError.data.some;
-const badRequestError2: Boom.BoomError = Boom.badImplementation('message');
+const badRequestError2: Boom.Boom = Boom.badImplementation('message');
 
 const unauthorizedError1 = Boom.unauthorized('message', 'scheme', {some: 'attribute'});
 unauthorizedError1.output.payload.attributes === { some: 'attribute', error: 'message' };
@@ -25,125 +24,131 @@ unauthorizedError4.output.headers === { 'WWW-Authenticate': 'scheme some="attrib
 
 const paymentRequiredError = Boom.paymentRequired('message', {some: 'data'});
 paymentRequiredError.data.some;
-const paymentRequiredError2: Boom.BoomError = Boom.paymentRequired('message');
+const paymentRequiredError2: Boom.Boom = Boom.paymentRequired('message');
 
 const forbiddenError = Boom.forbidden('message', {some: 'data'});
 forbiddenError.data.some;
-const forbiddenError2: Boom.BoomError = Boom.forbidden('message');
+const forbiddenError2: Boom.Boom = Boom.forbidden('message');
 
 const notFoundError = Boom.notFound('message', {some: 'data'});
 notFoundError.data.some;
-const notFoundError2: Boom.BoomError = Boom.notFound('message');
+const notFoundError2: Boom.Boom = Boom.notFound('message');
 
 const methodNotAllowedError = Boom.methodNotAllowed('message', {some: 'data'});
 methodNotAllowedError.data.some;
-const methodNotAllowedError2: Boom.BoomError = Boom.methodNotAllowed('message');
+const methodNotAllowedError2: Boom.Boom = Boom.methodNotAllowed('message');
 
 const notAcceptableError = Boom.notAcceptable('message', {some: 'data'});
 notAcceptableError.data.some;
-const notAcceptableError2: Boom.BoomError = Boom.notAcceptable('message');
+const notAcceptableError2: Boom.Boom = Boom.notAcceptable('message');
 
 const proxyAuthRequiredError = Boom.proxyAuthRequired('message', {some: 'data'});
 proxyAuthRequiredError.data.some;
-const proxyAuthRequiredError2: Boom.BoomError = Boom.proxyAuthRequired('message');
+const proxyAuthRequiredError2: Boom.Boom = Boom.proxyAuthRequired('message');
 
 const clientTimeoutError = Boom.clientTimeout('message', {some: 'data'});
 clientTimeoutError.data.some;
-const clientTimeoutError2: Boom.BoomError = Boom.clientTimeout('message');
+const clientTimeoutError2: Boom.Boom = Boom.clientTimeout('message');
 
 const conflictError = Boom.conflict('message', {some: 'data'});
 conflictError.data.some;
 
 const resourceGoneError = Boom.resourceGone('message', {some: 'data'});
 resourceGoneError.data.some;
-const resourceGoneError2: Boom.BoomError = Boom.resourceGone('message');
+const resourceGoneError2: Boom.Boom = Boom.resourceGone('message');
 
 const lengthRequiredError = Boom.lengthRequired('message', {some: 'data'});
 lengthRequiredError.data.some;
-const lengthRequiredError2: Boom.BoomError = Boom.lengthRequired('message');
+const lengthRequiredError2: Boom.Boom = Boom.lengthRequired('message');
 
 const preconditionFailedError = Boom.preconditionFailed('message', {some: 'data'});
 preconditionFailedError.data.some;
-const preconditionFailedError2: Boom.BoomError = Boom.preconditionFailed('message');
+const preconditionFailedError2: Boom.Boom = Boom.preconditionFailed('message');
 
 const entityTooLargeError = Boom.entityTooLarge('message', {some: 'data'});
 entityTooLargeError.data.some;
-const entityTooLargeError2: Boom.BoomError = Boom.lengthRequired('message');
+const entityTooLargeError2: Boom.Boom = Boom.lengthRequired('message');
 
 const uriTooLongError = Boom.uriTooLong('message', {some: 'data'});
 uriTooLongError.data.some;
-const uriTooLongError2: Boom.BoomError = Boom.uriTooLong('message');
+const uriTooLongError2: Boom.Boom = Boom.uriTooLong('message');
 
 const unsupportedMediaTypeError = Boom.unsupportedMediaType('message', {some: 'data'});
 unsupportedMediaTypeError.data.some;
-const unsupportedMediaTypeError2: Boom.BoomError = Boom.unsupportedMediaType('message');
+const unsupportedMediaTypeError2: Boom.Boom = Boom.unsupportedMediaType('message');
 
 const rangeNotSatisfiableError = Boom.rangeNotSatisfiable('message', {some: 'data'});
 rangeNotSatisfiableError.data.some;
-const rangeNotSatisfiableError2: Boom.BoomError = Boom.rangeNotSatisfiable('message');
+const rangeNotSatisfiableError2: Boom.Boom = Boom.rangeNotSatisfiable('message');
 
 const expectationFailedError = Boom.expectationFailed('message', {some: 'data'});
 expectationFailedError.data.some;
-const expectationFailedError2: Boom.BoomError = Boom.expectationFailed('message');
+const expectationFailedError2: Boom.Boom = Boom.expectationFailed('message');
 
 const teapotError = Boom.teapot('message', {some: 'data'});
 teapotError.data.some;
-const teapotError2: Boom.BoomError = Boom.teapot('message');
+const teapotError2: Boom.Boom = Boom.teapot('message');
 
 const badDataError = Boom.badData('message', {some: 'data'});
 badDataError.data.some;
-const badDataError2: Boom.BoomError = Boom.badData('message');
+const badDataError2: Boom.Boom = Boom.badData('message');
 
 const lockedError = Boom.locked('message', {some: 'data'});
 lockedError.data.some;
-const lockedError2: Boom.BoomError = Boom.locked('message');
+const lockedError2: Boom.Boom = Boom.locked('message');
 
 const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
 preconditionRequiredError.data.some;
-const preconditionRequiredError2: Boom.BoomError = Boom.preconditionRequired('message');
+const preconditionRequiredError2: Boom.Boom = Boom.preconditionRequired('message');
 
 const tooManyRequestsError = Boom.tooManyRequests('message', {some: 'data'});
 tooManyRequestsError.data.some;
-const tooManyRequestsError2: Boom.BoomError = Boom.tooManyRequests('message');
+const tooManyRequestsError2: Boom.Boom = Boom.tooManyRequests('message');
 
 const illegalError = Boom.illegal('message', {some: 'data'});
 illegalError.data.some;
-const illegalError2: Boom.BoomError = Boom.illegal('message');
+const illegalError2: Boom.Boom = Boom.illegal('message');
 
 // 5xx and data type
 
 const badImplementationError = Boom.badImplementation('message', {some: 'data'});
 badImplementationError.data.some;
-const badImplementationError2: Boom.BoomError = Boom.badImplementation('message');
+const badImplementationError2: Boom.Boom = Boom.badImplementation('message');
 
 const internalError = Boom.internal('message', {some: 'data'});
 internalError.data.some;
-const internalError2: Boom.BoomError = Boom.internal('message');
+const internalError2: Boom.Boom = Boom.internal('message');
 
 const notImplementedError = Boom.notImplemented('message', {some: 'data'});
 notImplementedError.data.some;
-const notImplementedError2: Boom.BoomError = Boom.notImplemented('message');
+const notImplementedError2: Boom.Boom = Boom.notImplemented('message');
 
 const badGatewayError = Boom.badGateway('message', {some: 'data'});
 badGatewayError.data.some;
-const badGatewayError2: Boom.BoomError = Boom.badGateway('message');
+const badGatewayError2: Boom.Boom = Boom.badGateway('message');
 
 const serverUnavailableError = Boom.serverUnavailable('message', {some: 'data'});
 serverUnavailableError.data.some;
-const serverUnavailableError2: Boom.BoomError = Boom.serverUnavailable('message');
+const serverUnavailableError2: Boom.Boom = Boom.serverUnavailable('message');
 
 const gatewayTimeoutError = Boom.gatewayTimeout('message', {some: 'data'});
 gatewayTimeoutError.data.some;
-const gatewayTimeoutError2: Boom.BoomError = Boom.gatewayTimeout('message');
+const gatewayTimeoutError2: Boom.Boom = Boom.gatewayTimeout('message');
 
-// boomify, wrap, and create
-const boomifiedError = Boom.boomify(new Error('test'), { statusCode: 400, message: 'some message' })
+// boomify
+const boomifiedError = Boom.boomify(new Error('test'), { statusCode: 400, message: 'some message' });
 
-const wrappedError = Boom.wrap(new Error('test'), 400, 'some message');
+// isBoom
 
-const error1 = Boom.create(500, 'Internal server error', { timestamp: Date.now() });
-error1.data.timestamp;
-const error2: Boom.BoomError = Boom.create(500, 'Internal server error');
+const isBoomError = new Boom.Boom('test')
+
+Boom.isBoom(isBoomError);
+
+// constructor
+
+const constructorError: Boom.Boom = new Boom.Boom('test');
+
+constructorError.message;
 
 // type widen asserting
 
@@ -169,11 +174,11 @@ interface CustomPayload extends Boom.Payload {
  * Test assignment of custom error data:
  */
 const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: 'Custom1', isCustom: true } as CustomData1);
-const errorWithNoExplicitDataType: Boom.BoomError = errorWithData; // can assign to error without explicit data type
-const errorWithExplicitType: Boom.BoomError<CustomData> = errorWithData; // can assign to union data type
-const errorWithConcreteCustomData: Boom.BoomError<CustomData1> = errorWithData; // can assign to concrete data type
+const errorWithNoExplicitDataType: Boom.Boom = errorWithData; // can assign to error without explicit data type
+const errorWithExplicitType: Boom.Boom<CustomData> = errorWithData; // can assign to union data type
+const errorWithConcreteCustomData: Boom.Boom<CustomData1> = errorWithData; // can assign to concrete data type
 // assignment to CustomData2 would not be possible
-// const errorWithConcreteCustomData2: Boom.BoomError<CustomData2> = errorWithData;
+// const errorWithConcreteCustomData2: Boom.Boom<CustomData2> = errorWithData;
 
 // Some complex error data types for testing purposes:
 interface CustomDataBase {
diff --git a/types/boom/index.d.ts b/types/boom/index.d.ts
index 8025a7ddab..89ca580561 100644
--- a/types/boom/index.d.ts
+++ b/types/boom/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for boom 4.3
+// Type definitions for boom 7.1.1
 // Project: https://github.com/hapijs/boom
 // Definitions by: Igor Rogatty <https://github.com/rogatty>
 //                 AJP <https://github.com/AJamesPhillips>
 //                 Jinesh Shah <https://github.com/jineshshah36>
+//                 Timon van Spronsen <https://github.com/TimonVS>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 export = Boom;
 
@@ -14,7 +15,9 @@ declare namespace 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:
      * @see {@link https://github.com/hapijs/boom#boom}
      */
-    export interface BoomError<Data = any> extends Error {
+    export class Boom<Data = any> extends Error {
+        /** Creates a new Boom object using the provided message and then calling boomify() to decorate the error with the Boom properties. */
+        constructor(message?: string | Error, options?: Options<Data>);
         /** isBoom - if true, indicates this is a Boom object instance. */
         isBoom: boolean;
         /** isServer - convenience bool indicating status code >= 500. */
@@ -31,6 +34,21 @@ declare namespace Boom {
         data: Data;
     }
 
+    interface Options<Data> {
+        /** statusCode - the HTTP status code. Defaults to 500 if no status code is already set. */
+        statusCode?: number;
+        /** data - additional error information (assigned to error.data). */
+        data?: Data;
+        /** decorate - an option with extra properties to set on the error object. */
+        decorate?: object;
+        /** ctor - constructor reference used to crop the exception call stack output. */
+        ctor?: any;
+        /** message - error message string. If the error already has a message, the provided message is added as a prefix. Defaults to no message. */
+        message?: string;
+        /** override - if false, the err provided is a Boom object, and a statusCode or message are provided, the values are ignored. Defaults to true (apply the provided statusCode and message options to the error regardless of its type, Error or Boom object). */
+        override?: boolean;
+    }
+
     export interface Output {
         /** statusCode - the HTTP status code (typically 4xx or 5xx). */
         statusCode: number;
@@ -55,32 +73,20 @@ declare namespace Boom {
         // Excluded this to aid typing of the other values.  See tests for example casting to a custom interface to manipulate the payload
         // [anyContent: string]: any;
     }
-                               
+
     /**
      * Decorates an error with the boom properties
      * @param error the error object to wrap. If error is already a boom object, it defaults to overriding the object with the new status code and message.
      * @param options optional additional options
      * @see {@link https://github.com/hapijs/boom#boomifyerror-options}
      */
-    export function boomify(error: Error, options?: { statusCode?: number, message?: string, override?: boolean }): BoomError<null>;
+    export function boomify(error: Error, options?: { statusCode?: number, message?: string, override?: boolean }): Boom<null>;
 
     /**
-     * Decorates an error with the boom properties
-     * @param error the error object to wrap. If error is already a boom object, returns back the same object.
-     * @param statusCode optional HTTP status code. Defaults to 500.
-     * @param message optional message string. If the error already has a message, it adds the message as a prefix. Defaults to no message.
-     * @see {@link https://github.com/hapijs/boom#wraperror-statuscode-message}
+     * Identifies whether an error is a Boom object. Same as calling instanceof Boom.
+     * @param error the error object to identify.
      */
-    export function wrap(error: Error, statusCode?: number, message?: string): BoomError<null>;
-
-    /**
-     * Generates an Error object with the boom decorations
-     * @param statusCode an HTTP error code number. Must be greater or equal 400.
-     * @param message optional message string.
-     * @param data additional error data set to error.data property.
-     * @see {@link https://github.com/hapijs/boom#createstatuscode-message-data}
-     */
-    export function create<Data = null>(statusCode: number, message?: string, data?: Data): BoomError<Data>;
+    export function isBoom(error: Error): boolean
 
     // 4xx
     /**
@@ -89,7 +95,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadrequestmessage-data}
      */
-    export function badRequest<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function badRequest<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 401 Unauthorized error
@@ -100,10 +106,10 @@ declare namespace Boom {
      * @param attributes an object of values to use while setting the 'WWW-Authenticate' header. This value is only used when scheme is a string, otherwise it is ignored. Every key/value pair will be included in the 'WWW-Authenticate' in the format of 'key="value"' as well as in the response payload under the attributes key. Alternatively value can be a string which is use to set the value of the scheme, for example setting the token value for negotiate header. If string is used message parameter must be null. null and undefined will be replaced with an empty string. If attributes is set, message will be used as the 'error' segment of the 'WWW-Authenticate' header. If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object.
      * @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes}
      */
-    export function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): BoomError<null>;
-    export function unauthorized(message?: string, scheme?: string[]): BoomError<null>;
-    export function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): BoomError<null>;
-    export function unauthorized(message?: null, scheme?: string[]): BoomError<null>;
+    export function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): Boom<null>;
+    export function unauthorized(message?: string, scheme?: string[]): Boom<null>;
+    export function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): Boom<null>;
+    export function unauthorized(message?: null, scheme?: string[]): Boom<null>;
 
     /**
      * Returns a 402 Payment Required error
@@ -111,7 +117,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompaymentrequiredmessage-data}
      */
-    export function paymentRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function paymentRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 403 Forbidden error
@@ -119,7 +125,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomforbiddenmessage-data}
      */
-    export function forbidden<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function forbidden<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 404 Not Found error
@@ -127,7 +133,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotfoundmessage-data}
      */
-    export function notFound<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function notFound<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 405 Method Not Allowed error
@@ -136,7 +142,7 @@ declare namespace Boom {
      * @param allow optional string or array of strings (to be combined and separated by ', ') which is set to the 'Allow' header.
      * @see {@link https://github.com/hapijs/boom#boommethodnotallowedmessage-data-allow}
      */
-    export function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): BoomError<Data>;
+    export function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): Boom<Data>;
 
     /**
      * Returns a 406 Not Acceptable error
@@ -144,7 +150,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotacceptablemessage-data}
      */
-    export function notAcceptable<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function notAcceptable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 407 Proxy Authentication Required error
@@ -152,7 +158,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomproxyauthrequiredmessage-data}
      */
-    export function proxyAuthRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function proxyAuthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 408 Request Time-out error
@@ -160,7 +166,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomclienttimeoutmessage-data}
      */
-    export function clientTimeout<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function clientTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 409 Conflict error
@@ -168,7 +174,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomconflictmessage-data}
      */
-    export function conflict<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function conflict<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 410 Gone error
@@ -176,7 +182,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomresourcegonemessage-data}
      */
-    export function resourceGone<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function resourceGone<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 411 Length Required error
@@ -184,7 +190,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlengthrequiredmessage-data}
      */
-    export function lengthRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function lengthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 412 Precondition Failed error
@@ -192,7 +198,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionfailedmessage-data}
      */
-    export function preconditionFailed<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function preconditionFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 413 Request Entity Too Large error
@@ -200,7 +206,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomentitytoolargemessage-data}
      */
-    export function entityTooLarge<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function entityTooLarge<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 414 Request-URI Too Large error
@@ -208,7 +214,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomuritoolongmessage-data}
      */
-    export function uriTooLong<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function uriTooLong<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 415 Unsupported Media Type error
@@ -216,7 +222,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomunsupportedmediatypemessage-data}
      */
-    export function unsupportedMediaType<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function unsupportedMediaType<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 416 Requested Range Not Satisfiable error
@@ -224,7 +230,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomrangenotsatisfiablemessage-data}
      */
-    export function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 417 Expectation Failed error
@@ -232,7 +238,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomexpectationfailedmessage-data}
      */
-    export function expectationFailed<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function expectationFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 418 I'm a Teapot error
@@ -240,7 +246,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomteapotmessage-data}
      */
-    export function teapot<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function teapot<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 422 Unprocessable Entity error
@@ -248,7 +254,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombaddatamessage-data}
      */
-    export function badData<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function badData<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 423 Locked error
@@ -256,7 +262,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlockedmessage-data}
      */
-    export function locked<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function locked<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 428 Precondition Required error
@@ -264,7 +270,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionrequiredmessage-data}
      */
-    export function preconditionRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function preconditionRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 429 Too Many Requests error
@@ -272,7 +278,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomtoomanyrequestsmessage-data}
      */
-    export function tooManyRequests<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function tooManyRequests<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 451 Unavailable For Legal Reasons error
@@ -280,7 +286,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomillegalmessage-data}
      */
-    export function illegal<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function illegal<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     // 5xx
     /**
@@ -290,7 +296,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
      */
-    export function badImplementation<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function badImplementation<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 500 Internal Server Error error
@@ -299,7 +305,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
      */
-    export function internal<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function internal<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 501 Not Implemented error with your error message to the user
@@ -307,7 +313,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotimplementedmessage-data}
      */
-    export function notImplemented<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function notImplemented<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 502 Bad Gateway error with your error message to the user
@@ -315,7 +321,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadgatewaymessage-data}
      */
-    export function badGateway<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function badGateway<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 503 Service Unavailable error with your error message to the user
@@ -323,7 +329,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomserverunavailablemessage-data}
      */
-    export function serverUnavailable<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function serverUnavailable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 504 Gateway Time-out error with your error message to the user
@@ -331,5 +337,5 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomgatewaytimeoutmessage-data}
      */
-    export function gatewayTimeout<Data = null>(message?: string, data?: Data): BoomError<Data>;
+    export function gatewayTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
 }
diff --git a/types/boom/tslint.json b/types/boom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/boom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/boom/v3/tslint.json b/types/boom/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/boom/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/boom/v4/boom-tests.ts b/types/boom/v4/boom-tests.ts
new file mode 100644
index 0000000000..1819be25cb
--- /dev/null
+++ b/types/boom/v4/boom-tests.ts
@@ -0,0 +1,193 @@
+import Boom = require('boom');
+import * as Hapi from 'hapi';
+
+// 4xx and data type
+
+const badRequestError = Boom.badRequest('message', {some: 'data'});
+badRequestError.data.some;
+const badRequestError2: Boom.BoomError = Boom.badImplementation('message');
+
+const unauthorizedError1 = Boom.unauthorized('message', 'scheme', {some: 'attribute'});
+unauthorizedError1.output.payload.attributes === { some: 'attribute', error: 'message' };
+unauthorizedError1.output.headers === { 'WWW-Authenticate': 'scheme some="attribute", error="message"' };
+
+const unauthorizedError2 = Boom.unauthorized('message', ['scheme']);
+unauthorizedError2.output.payload.attributes === undefined;
+unauthorizedError2.output.headers === { 'WWW-Authenticate': 'scheme' };
+
+const unauthorizedError3 = Boom.unauthorized(null, 'scheme', 'attribute');
+unauthorizedError3.output.payload.attributes === 'attribute';
+unauthorizedError3.output.headers === { 'WWW-Authenticate': 'scheme attribute' };
+
+const unauthorizedError4 = Boom.unauthorized(null, 'scheme', {some: 'attribute'});
+unauthorizedError4.output.payload.attributes === { some: 'attribute' };
+unauthorizedError4.output.headers === { 'WWW-Authenticate': 'scheme some="attribute"' };
+
+const paymentRequiredError = Boom.paymentRequired('message', {some: 'data'});
+paymentRequiredError.data.some;
+const paymentRequiredError2: Boom.BoomError = Boom.paymentRequired('message');
+
+const forbiddenError = Boom.forbidden('message', {some: 'data'});
+forbiddenError.data.some;
+const forbiddenError2: Boom.BoomError = Boom.forbidden('message');
+
+const notFoundError = Boom.notFound('message', {some: 'data'});
+notFoundError.data.some;
+const notFoundError2: Boom.BoomError = Boom.notFound('message');
+
+const methodNotAllowedError = Boom.methodNotAllowed('message', {some: 'data'});
+methodNotAllowedError.data.some;
+const methodNotAllowedError2: Boom.BoomError = Boom.methodNotAllowed('message');
+
+const notAcceptableError = Boom.notAcceptable('message', {some: 'data'});
+notAcceptableError.data.some;
+const notAcceptableError2: Boom.BoomError = Boom.notAcceptable('message');
+
+const proxyAuthRequiredError = Boom.proxyAuthRequired('message', {some: 'data'});
+proxyAuthRequiredError.data.some;
+const proxyAuthRequiredError2: Boom.BoomError = Boom.proxyAuthRequired('message');
+
+const clientTimeoutError = Boom.clientTimeout('message', {some: 'data'});
+clientTimeoutError.data.some;
+const clientTimeoutError2: Boom.BoomError = Boom.clientTimeout('message');
+
+const conflictError = Boom.conflict('message', {some: 'data'});
+conflictError.data.some;
+
+const resourceGoneError = Boom.resourceGone('message', {some: 'data'});
+resourceGoneError.data.some;
+const resourceGoneError2: Boom.BoomError = Boom.resourceGone('message');
+
+const lengthRequiredError = Boom.lengthRequired('message', {some: 'data'});
+lengthRequiredError.data.some;
+const lengthRequiredError2: Boom.BoomError = Boom.lengthRequired('message');
+
+const preconditionFailedError = Boom.preconditionFailed('message', {some: 'data'});
+preconditionFailedError.data.some;
+const preconditionFailedError2: Boom.BoomError = Boom.preconditionFailed('message');
+
+const entityTooLargeError = Boom.entityTooLarge('message', {some: 'data'});
+entityTooLargeError.data.some;
+const entityTooLargeError2: Boom.BoomError = Boom.lengthRequired('message');
+
+const uriTooLongError = Boom.uriTooLong('message', {some: 'data'});
+uriTooLongError.data.some;
+const uriTooLongError2: Boom.BoomError = Boom.uriTooLong('message');
+
+const unsupportedMediaTypeError = Boom.unsupportedMediaType('message', {some: 'data'});
+unsupportedMediaTypeError.data.some;
+const unsupportedMediaTypeError2: Boom.BoomError = Boom.unsupportedMediaType('message');
+
+const rangeNotSatisfiableError = Boom.rangeNotSatisfiable('message', {some: 'data'});
+rangeNotSatisfiableError.data.some;
+const rangeNotSatisfiableError2: Boom.BoomError = Boom.rangeNotSatisfiable('message');
+
+const expectationFailedError = Boom.expectationFailed('message', {some: 'data'});
+expectationFailedError.data.some;
+const expectationFailedError2: Boom.BoomError = Boom.expectationFailed('message');
+
+const teapotError = Boom.teapot('message', {some: 'data'});
+teapotError.data.some;
+const teapotError2: Boom.BoomError = Boom.teapot('message');
+
+const badDataError = Boom.badData('message', {some: 'data'});
+badDataError.data.some;
+const badDataError2: Boom.BoomError = Boom.badData('message');
+
+const lockedError = Boom.locked('message', {some: 'data'});
+lockedError.data.some;
+const lockedError2: Boom.BoomError = Boom.locked('message');
+
+const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
+preconditionRequiredError.data.some;
+const preconditionRequiredError2: Boom.BoomError = Boom.preconditionRequired('message');
+
+const tooManyRequestsError = Boom.tooManyRequests('message', {some: 'data'});
+tooManyRequestsError.data.some;
+const tooManyRequestsError2: Boom.BoomError = Boom.tooManyRequests('message');
+
+const illegalError = Boom.illegal('message', {some: 'data'});
+illegalError.data.some;
+const illegalError2: Boom.BoomError = Boom.illegal('message');
+
+// 5xx and data type
+
+const badImplementationError = Boom.badImplementation('message', {some: 'data'});
+badImplementationError.data.some;
+const badImplementationError2: Boom.BoomError = Boom.badImplementation('message');
+
+const internalError = Boom.internal('message', {some: 'data'});
+internalError.data.some;
+const internalError2: Boom.BoomError = Boom.internal('message');
+
+const notImplementedError = Boom.notImplemented('message', {some: 'data'});
+notImplementedError.data.some;
+const notImplementedError2: Boom.BoomError = Boom.notImplemented('message');
+
+const badGatewayError = Boom.badGateway('message', {some: 'data'});
+badGatewayError.data.some;
+const badGatewayError2: Boom.BoomError = Boom.badGateway('message');
+
+const serverUnavailableError = Boom.serverUnavailable('message', {some: 'data'});
+serverUnavailableError.data.some;
+const serverUnavailableError2: Boom.BoomError = Boom.serverUnavailable('message');
+
+const gatewayTimeoutError = Boom.gatewayTimeout('message', {some: 'data'});
+gatewayTimeoutError.data.some;
+const gatewayTimeoutError2: Boom.BoomError = Boom.gatewayTimeout('message');
+
+// boomify, wrap, and create
+const boomifiedError = Boom.boomify(new Error('test'), { statusCode: 400, message: 'some message' })
+
+const wrappedError = Boom.wrap(new Error('test'), 400, 'some message');
+
+const error1 = Boom.create(500, 'Internal server error', { timestamp: Date.now() });
+error1.data.timestamp;
+const error2: Boom.BoomError = Boom.create(500, 'Internal server error');
+
+// type widen asserting
+
+const unauthorizedError = Boom.unauthorized() as Error;
+
+// status code and reformat
+
+const error = Boom.badRequest('Cannot feed after midnight');
+error.output.statusCode = 499;    // Assign a custom error code
+error.reformat();
+
+/**
+ * Add a custom key to the payload
+ */
+
+interface CustomPayload extends Boom.Payload {
+    custom: string;
+}
+
+(error.output.payload as CustomPayload).custom = 'abc_123';
+
+/**
+ * Test assignment of custom error data:
+ */
+const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: 'Custom1', isCustom: true } as CustomData1);
+const errorWithNoExplicitDataType: Boom.BoomError = errorWithData; // can assign to error without explicit data type
+const errorWithExplicitType: Boom.BoomError<CustomData> = errorWithData; // can assign to union data type
+const errorWithConcreteCustomData: Boom.BoomError<CustomData1> = errorWithData; // can assign to concrete data type
+// assignment to CustomData2 would not be possible
+// const errorWithConcreteCustomData2: Boom.BoomError<CustomData2> = errorWithData;
+
+// Some complex error data types for testing purposes:
+interface CustomDataBase {
+    isCustom: true;
+}
+
+interface CustomData1 extends CustomDataBase {
+    customType: 'Custom1';
+    custom1: string;
+}
+
+interface CustomData2 extends CustomDataBase {
+    customType: 'Custom2';
+    custom2: string;
+}
+
+type CustomData = CustomData1 | CustomData2;
diff --git a/types/boom/v4/index.d.ts b/types/boom/v4/index.d.ts
new file mode 100644
index 0000000000..76cd2d6b46
--- /dev/null
+++ b/types/boom/v4/index.d.ts
@@ -0,0 +1,335 @@
+// Type definitions for boom 4.3
+// Project: https://github.com/hapijs/boom
+// Definitions by: Igor Rogatty <https://github.com/rogatty>
+//                 AJP <https://github.com/AJamesPhillips>
+//                 Jinesh Shah <https://github.com/jineshshah36>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export = Boom;
+
+declare namespace 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:
+     * @see {@link https://github.com/hapijs/boom#boom}
+     */
+    export interface BoomError<Data = any> extends Error {
+        /** isBoom - if true, indicates this is a Boom object instance. */
+        isBoom: boolean;
+        /** isServer - convenience bool indicating status code >= 500. */
+        isServer: boolean;
+        /** message - the error message. */
+        message: string;
+        /** output - the formatted response. Can be directly manipulated after object construction to return a custom error response. Allowed root keys: */
+        output: Output;
+        /** reformat() - rebuilds error.output using the other object properties. */
+        reformat: () => string;
+        /** "If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object." mentioned in @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes} */
+        isMissing?: boolean;
+        /** https://github.com/hapijs/boom#createstatuscode-message-data and https://github.com/hapijs/boom/blob/v4.3.0/lib/index.js#L99 */
+        data: Data;
+    }
+
+    export interface Output {
+        /** statusCode - the HTTP status code (typically 4xx or 5xx). */
+        statusCode: number;
+        /** headers - an object containing any HTTP headers where each key is a header name and value is the header content. (Limited value type to string https://github.com/hapijs/boom/issues/151 ) */
+        headers: {[index: string]: string};
+        /** payload - the formatted object used as the response payload (stringified). Can be directly manipulated but any changes will be lost if reformat() is called. Any content allowed and by default includes the following content: */
+        payload: Payload;
+    }
+
+    export interface Payload {
+        /** statusCode - the HTTP status code, derived from error.output.statusCode. */
+        statusCode: number;
+        /** error - the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode. */
+        error: string;
+        /** message - the error message derived from error.message. */
+        message: string;
+        /**
+         * "Every key/value pair will be included ... in the response payload under the attributes key."
+         * [see docs](https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes)
+         */
+        attributes?: any;
+        // Excluded this to aid typing of the other values.  See tests for example casting to a custom interface to manipulate the payload
+        // [anyContent: string]: any;
+    }
+
+    /**
+     * Decorates an error with the boom properties
+     * @param error the error object to wrap. If error is already a boom object, it defaults to overriding the object with the new status code and message.
+     * @param options optional additional options
+     * @see {@link https://github.com/hapijs/boom#boomifyerror-options}
+     */
+    export function boomify(error: Error, options?: { statusCode?: number, message?: string, override?: boolean }): BoomError<null>;
+
+    /**
+     * Decorates an error with the boom properties
+     * @param error the error object to wrap. If error is already a boom object, returns back the same object.
+     * @param statusCode optional HTTP status code. Defaults to 500.
+     * @param message optional message string. If the error already has a message, it adds the message as a prefix. Defaults to no message.
+     * @see {@link https://github.com/hapijs/boom#wraperror-statuscode-message}
+     */
+    export function wrap(error: Error, statusCode?: number, message?: string): BoomError<null>;
+
+    /**
+     * Generates an Error object with the boom decorations
+     * @param statusCode an HTTP error code number. Must be greater or equal 400.
+     * @param message optional message string.
+     * @param data additional error data set to error.data property.
+     * @see {@link https://github.com/hapijs/boom#createstatuscode-message-data}
+     */
+    export function create<Data = null>(statusCode: number, message?: string, data?: Data): BoomError<Data>;
+
+    // 4xx
+    /**
+     * Returns a 400 Bad Request error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boombadrequestmessage-data}
+     */
+    export function badRequest<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 401 Unauthorized error
+     * @param message optional message.
+     * @param scheme can be one of the following:
+     *      * an authentication scheme name
+     *      * an array of string values. These values will be separated by ', ' and set to the 'WWW-Authenticate' header.
+     * @param attributes an object of values to use while setting the 'WWW-Authenticate' header. This value is only used when scheme is a string, otherwise it is ignored. Every key/value pair will be included in the 'WWW-Authenticate' in the format of 'key="value"' as well as in the response payload under the attributes key. Alternatively value can be a string which is use to set the value of the scheme, for example setting the token value for negotiate header. If string is used message parameter must be null. null and undefined will be replaced with an empty string. If attributes is set, message will be used as the 'error' segment of the 'WWW-Authenticate' header. If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object.
+     * @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes}
+     */
+    export function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): BoomError<null>;
+    export function unauthorized(message?: string, scheme?: string[]): BoomError<null>;
+    export function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): BoomError<null>;
+    export function unauthorized(message?: null, scheme?: string[]): BoomError<null>;
+
+    /**
+     * Returns a 402 Payment Required error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boompaymentrequiredmessage-data}
+     */
+    export function paymentRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 403 Forbidden error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomforbiddenmessage-data}
+     */
+    export function forbidden<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 404 Not Found error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomnotfoundmessage-data}
+     */
+    export function notFound<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 405 Method Not Allowed error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @param allow optional string or array of strings (to be combined and separated by ', ') which is set to the 'Allow' header.
+     * @see {@link https://github.com/hapijs/boom#boommethodnotallowedmessage-data-allow}
+     */
+    export function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): BoomError<Data>;
+
+    /**
+     * Returns a 406 Not Acceptable error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomnotacceptablemessage-data}
+     */
+    export function notAcceptable<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 407 Proxy Authentication Required error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomproxyauthrequiredmessage-data}
+     */
+    export function proxyAuthRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 408 Request Time-out error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomclienttimeoutmessage-data}
+     */
+    export function clientTimeout<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 409 Conflict error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomconflictmessage-data}
+     */
+    export function conflict<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 410 Gone error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomresourcegonemessage-data}
+     */
+    export function resourceGone<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 411 Length Required error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomlengthrequiredmessage-data}
+     */
+    export function lengthRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 412 Precondition Failed error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boompreconditionfailedmessage-data}
+     */
+    export function preconditionFailed<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 413 Request Entity Too Large error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomentitytoolargemessage-data}
+     */
+    export function entityTooLarge<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 414 Request-URI Too Large error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomuritoolongmessage-data}
+     */
+    export function uriTooLong<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 415 Unsupported Media Type error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomunsupportedmediatypemessage-data}
+     */
+    export function unsupportedMediaType<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 416 Requested Range Not Satisfiable error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomrangenotsatisfiablemessage-data}
+     */
+    export function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 417 Expectation Failed error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomexpectationfailedmessage-data}
+     */
+    export function expectationFailed<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 418 I'm a Teapot error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomteapotmessage-data}
+     */
+    export function teapot<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 422 Unprocessable Entity error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boombaddatamessage-data}
+     */
+    export function badData<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 423 Locked error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomlockedmessage-data}
+     */
+    export function locked<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 428 Precondition Required error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boompreconditionrequiredmessage-data}
+     */
+    export function preconditionRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 429 Too Many Requests error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomtoomanyrequestsmessage-data}
+     */
+    export function tooManyRequests<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 451 Unavailable For Legal Reasons error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomillegalmessage-data}
+     */
+    export function illegal<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    // 5xx
+    /**
+     * Returns a 500 Internal Server Error error
+     * Only 500 errors will hide your message from the end user. Your message is recorded in the server log.
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
+     */
+    export function badImplementation<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 500 Internal Server Error error
+     * Only 500 errors will hide your message from the end user. Your message is recorded in the server log.
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
+     */
+    export function internal<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 501 Not Implemented error with your error message to the user
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomnotimplementedmessage-data}
+     */
+    export function notImplemented<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 502 Bad Gateway error with your error message to the user
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boombadgatewaymessage-data}
+     */
+    export function badGateway<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 503 Service Unavailable error with your error message to the user
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomserverunavailablemessage-data}
+     */
+    export function serverUnavailable<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 504 Gateway Time-out error with your error message to the user
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomgatewaytimeoutmessage-data}
+     */
+    export function gatewayTimeout<Data = null>(message?: string, data?: Data): BoomError<Data>;
+}
diff --git a/types/boom/v4/tsconfig.json b/types/boom/v4/tsconfig.json
new file mode 100644
index 0000000000..58f1109eee
--- /dev/null
+++ b/types/boom/v4/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "boom": [
+                "boom/v4"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "boom-tests.ts"
+    ]
+}
diff --git a/types/boom/v4/tslint.json b/types/boom/v4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/boom/v4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootbox/index.d.ts b/types/bootbox/index.d.ts
index 850eb18c25..dfdf0de871 100644
--- a/types/bootbox/index.d.ts
+++ b/types/bootbox/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Bootbox 4.4.0
 // Project: https://github.com/makeusabrew/bootbox
-// Definitions by: Vincent Bortone <https://github.com/vbortone>, Kon Pik <https://github.com/konpikwastaken>, Anup Kattel <https://github.com/kanup>, Dominik Schroeter <https://github.com/icereed>, Troy McKinnon <https://github.com/trodi>, Stanny Nuytkens <https://github.com/stannynuytkens>
+// Definitions by: Vincent Bortone <https://github.com/vbortone>, Kon Pik <https://github.com/konpikwastaken>, Anup Kattel <https://github.com/kanup>, Dominik Schroeter <https://github.com/icereed>, Troy McKinnon <https://github.com/trodi>, Stanny Nuytkens <https://github.com/stannynuytkens>, Soner Köksal <https://github.com/renjfk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -23,7 +23,7 @@ interface BootboxBaseOptions<T = any> {
 
 /** Bootbox options available for custom modals */
 interface BootboxDialogOptions<T = any> extends BootboxBaseOptions<T> {
-	message: string | Element;
+	message: JQuery|any[]|Element|DocumentFragment|Text|string|((index: number, html: string) => string|Element|JQuery);
 }
 
 /** Bootbox options available for alert modals */
diff --git a/types/bootbox/tslint.json b/types/bootbox/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootbox/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootpag/tslint.json b/types/bootpag/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootpag/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-datepicker/tslint.json b/types/bootstrap-datepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-datepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-fileinput/index.d.ts b/types/bootstrap-fileinput/index.d.ts
index 8a7df2dbbc..61a53b12bb 100644
--- a/types/bootstrap-fileinput/index.d.ts
+++ b/types/bootstrap-fileinput/index.d.ts
@@ -6,10 +6,14 @@
 
 /// <reference types="jquery" />
 
-interface JQuery {
-    fileinput: (options?: BootstrapFileInput.FileInputOptions) => JQuery;
-}
+export = BootstrapFileInput;
+export as namespace BootstrapFileInput;
 
+declare global {
+   interface JQuery {
+        fileinput: (options?: BootstrapFileInput.FileInputOptions) => JQuery;
+    }
+}
 
 declare module BootstrapFileInput {
     interface FileInputOptions {
@@ -19,6 +23,11 @@ declare module BootstrapFileInput {
         The locale JS file for the language code must be defined as mentioned in the translations section: http://plugins.krajee.com/file-input#translations
         */
         language?: string;
+
+        /**
+         * Theming
+         */
+        theme?: string;
         /**
         Whether to display the file caption.
         Defaults to true.
diff --git a/types/bootstrap-fileinput/tslint.json b/types/bootstrap-fileinput/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-fileinput/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-maxlength/tslint.json b/types/bootstrap-maxlength/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-maxlength/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-notify/index.d.ts b/types/bootstrap-notify/index.d.ts
index 0517b62cf8..540f200d9c 100644
--- a/types/bootstrap-notify/index.d.ts
+++ b/types/bootstrap-notify/index.d.ts
@@ -6,10 +6,7 @@
 
 /// <reference types="jquery" />
 
-/* tslint:disable: interface-name no-any */
-
 interface JQueryStatic {
-	/* tslint:enable: interface-name */
     notify(message: string): NotifyReturn;
 	notify(opts: NotifyOptions, settings?: NotifySettings): NotifyReturn;
 	notifyDefaults(settings: NotifySettings): void;
diff --git a/types/bootstrap-notify/tslint.json b/types/bootstrap-notify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-notify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-select/tslint.json b/types/bootstrap-select/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-select/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-slider/bootstrap-slider-tests.ts b/types/bootstrap-slider/bootstrap-slider-tests.ts
index 2073a3de9d..9b2a1a2014 100644
--- a/types/bootstrap-slider/bootstrap-slider-tests.ts
+++ b/types/bootstrap-slider/bootstrap-slider-tests.ts
@@ -90,6 +90,56 @@ $(() => {
     $('#ex16a').slider({ min: 0, max: 10, value: 0, focus: true });
     $('#ex16b').slider({ min: 0, max: 10, value: [0, 10], focus: true });
 
+    $("#ex17a").slider({
+        min: 0,
+        max: 10,
+        value: 0,
+        tooltip_position: 'bottom'
+    });
+    $("#ex17b").slider({
+        min: 0,
+        max: 10,
+        value: 0,
+        orientation: 'vertical',
+        tooltip_position: 'left'
+    });
+
+    $("#ex18a").slider({
+        min: 0,
+        max: 10,
+        value: 5,
+        labelledby: 'ex18-label-1'
+    });
+    $("#ex18b").slider({
+        min: 0,
+        max: 10,
+        value: [3, 6],
+        labelledby: ['ex18-label-2a', 'ex18-label-2b']
+    });
+
+    $('#ex22').slider({
+        id: 'slider22',
+        min: 0,
+        max: 20,
+        step: 1,
+        value: 14,
+        rangeHighlights: [{ start: 2, end: 5, class: "category1" },
+                          { start: 7, end: 8, class: "category2" },
+                          { start: 17, end: 19 },
+                          { start: 17, end: 24 },
+                          { start: -3, end: 19 }]});
+
+    $("#ex23").slider({
+        ticks: [0, 1, 2, 3, 4],
+        ticks_positions: [0, 30, 60, 70, 90, 100],
+        ticks_snap_bounds: 200,
+        formatter(value) {
+            return 'Current value: ' + value;
+        },
+        ticks_tooltip: true,
+        step: 0.01
+    });
+
     // examples from https://github.com/seiyria/bootstrap-slider/blob/master/README.md
 
     {
diff --git a/types/bootstrap-slider/index.d.ts b/types/bootstrap-slider/index.d.ts
index 557c7aa5ad..5559e12f12 100644
--- a/types/bootstrap-slider/index.d.ts
+++ b/types/bootstrap-slider/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bootstrap-slider.js 9.8
+// Type definitions for bootstrap-slider.js 9.9
 // Project: https://github.com/seiyria/bootstrap-slider
 // Definitions by: Daniel Beckwith <https://github.com/dbeckwith>
 //                 Leonard Thieu <https://github.com/leonard-thieu>
@@ -7,6 +7,19 @@
 
 /// <reference types="jquery" />
 
+interface RangeHighlight {
+    class?: string;
+    start?: number;
+    end?: number;
+}
+
+type SliderEventType =  'slide' |
+                        'slideStart' |
+                        'slideStop' |
+                        'change' |
+                        'slideEnabled' |
+                        'slideDisabled';
+
 interface SliderOptions {
     /**
      * Default: ''
@@ -63,6 +76,14 @@ interface SliderOptions {
      * if false show one tootip if true show two tooltips one for each handler
      */
     tooltip_split?: boolean;
+    /**
+     * Default: null
+     * Position of tooltip, relative to slider. Accepts 'top'/'bottom' for
+     * horizontal sliders and 'left'/'right' for vertically orientated sliders.
+     * Default positions are 'top' for horizontal and 'right' for vertical
+     * slider.
+     */
+    tooltip_position?: 'top' | 'bottom' | 'left' | 'right';
     /**
      * Default: 'round'
      * handle shape. Accepts: 'round', 'square', 'triangle' or 'custom'
@@ -73,6 +94,10 @@ interface SliderOptions {
      * whether or not the slider should be reversed
      */
     reversed?: boolean;
+    /**
+     * Default: 'auto'
+     */
+    rtl?: boolean | 'auto';
     /**
      * Default: true
      * whether or not the slider is initially enabled
@@ -111,16 +136,34 @@ interface SliderOptions {
      * Used to define the snap bounds of a tick. Snaps to the tick if value is within these bounds.
      */
     ticks_snap_bounds?: number;
+    /**
+     * Default: false
+     * Used to allow for a user to hover over a given tick to see it's value.
+     * Useful if custom formatter passed in
+     */
+    ticks_tooltip?: boolean;
     /**
      * Default: 'linear'
      * Set to 'logarithmic' to use a logarithmic scale.
      */
-    scale?: string;
+    scale?: 'linear' | 'logarithmic';
     /**
      * Default: false
      * Focus the appropriate slider handle after a value change.
      */
     focus?: boolean;
+    /**
+     * Default: null
+     * ARIA labels for the slider handle's, Use array for multiple values in a
+     * range slider.
+     */
+    labelledby?: string | string[];
+    /**
+     * Default: []
+     * Defines a range array that you want to highlight, for example:
+     * [{'start':val1, 'end': val2, 'class': 'optionalAdditionalClassName'}].
+     */
+    rangeHighlights?: RangeHighlight[];
 }
 
 interface JQuery {
@@ -134,7 +177,6 @@ interface SliderPlugin<TJQuery> {
     (methodName: string, ...args: any[]): TJQuery;
     /**
      * Creates a slider from the current element.
-     * @param options
      */
     (options?: SliderOptions): TJQuery;
 }
@@ -163,11 +205,12 @@ declare class Slider {
     /**
      * Set a new value for the slider. If optional triggerSlideEvent parameter is true, 'slide' events will be triggered.
      * If optional triggerChangeEvent parameter is true, 'change' events will be triggered.
-     * @param newValue
-     * @param triggerSlideEvent
-     * @param triggerChangeEvent
      */
     setValue(newValue: number, triggerSlideEvent?: boolean, triggerChangeEvent?: boolean): this;
+    /**
+     * Get the div slider element
+     */
+    getElement(): HTMLDivElement;
     /**
      * Properly clean up and remove the slider instance
      */
@@ -180,25 +223,34 @@ declare class Slider {
      * Enables the slider
      */
     enable(): this;
+    /**
+     * Toggles the slider between enabled and disabled
+     */
+    toggle(): this;
     /**
      * Returns true if enabled, false if disabled
      */
     isEnabled(): boolean;
     /**
      * Updates the slider's attributes
-     * @param attribute
-     * @param value
      */
     setAttribute(attribute: string, value: any): this;
     /**
      * Get the slider's attributes
-     * @param attribute
      */
     getAttribute(attribute: string): any;
     /**
      * Refreshes the current slider
      */
     refresh(): this;
+    /**
+     * When the slider event eventType is triggered, the callback function will be invoked
+     */
+    on(eventType: SliderEventType, callback: (val: number | undefined) => void): this;
+    /**
+     * Removes the callback function from the slider event eventType
+     */
+    off(eventType: SliderEventType, callback: (val: number | undefined) => void): void;
     /**
      * Renders the tooltip again, after initialization. Useful in situations when the slider and tooltip are initially hidden.
      */
diff --git a/types/bootstrap-switch/tslint.json b/types/bootstrap-switch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-switch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-table/tslint.json b/types/bootstrap-table/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-table/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap-touchspin/tslint.json b/types/bootstrap-touchspin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap-touchspin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap.paginator/tslint.json b/types/bootstrap.paginator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap.paginator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap.timepicker/tslint.json b/types/bootstrap.timepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap.timepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap.v3.datetimepicker/index.d.ts b/types/bootstrap.v3.datetimepicker/index.d.ts
index 7b1d3877ba..c588943afd 100644
--- a/types/bootstrap.v3.datetimepicker/index.d.ts
+++ b/types/bootstrap.v3.datetimepicker/index.d.ts
@@ -24,7 +24,8 @@ export interface Datetimepicker {
 	clear(): void;
 	/** Returns the component's model current date, a moment object or null if not set. */
 	date(): moment.Moment;
-	/** Takes string, Date, moment, null parameter and sets the components model current moment to it.
+	/**
+	 * Takes string, Date, moment, null parameter and sets the components model current moment to it.
 	 * Passing a null value unsets the components model current moment.
 	 * Parsing of the newDate parameter is made using moment library with the options.format and options.useStrict components configuration.
 	 * Throws:
@@ -36,14 +37,16 @@ export interface Datetimepicker {
 	date(date: moment.Moment | Date | string | null): void;
 	/** Destroys the widget and removes all attached event listeners */
 	destroy(): void;
-	/** Disables the input element, the component is attached to, by adding a disabled="true" attribute to it. If the widget was visible before that call it is hidden.
+	/**
+	 * Disables the input element, the component is attached to, by adding a disabled="true" attribute to it. If the widget was visible before that call it is hidden.
 	 * Emits:
 	 * - dp.hide - if the widget was visible before that call
 	 */
 	disable(): void;
 	/** Enables the input element, the component is attached to, by removing disabled attribute from it. */
 	enable(): void;
-	/** Hides the widget
+	/**
+	 * Hides the widget
 	 * Emits:
 	 * - dp.hide - if the widget was visible before that call
 	 */
@@ -55,13 +58,15 @@ export interface Datetimepicker {
 	options(): DatetimepickerOptions;
 	/** Takes an object variable with option key:value properties and configures the component. Use this to update multiple options on the component. */
 	options(options: DatetimepickerOptions): void;
-	/** Shows the widget
+	/**
+	 * Shows the widget
 	 * Emits:
 	 * - dp.show - if the widget was hidden before that call
 	 * - dp.change - if the widget is opened for the first time and the useCurrent is set to true or to a granularity value and the input element the component is attached to has an empty value
 	 */
 	show(): void;
-	/** Shows or hides the widget
+	/**
+	 * Shows or hides the widget
 	 * Emits:
 	 * - dp.hide - if the widget is hidden after the toggle call
 	 * - dp.show - if the widget is show after the toggle call
@@ -90,7 +95,8 @@ export interface Datetimepicker {
 	 * IMPORTANT! Throws exception if not set explicitly https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1459
 	 */
 	daysOfWeekDisabled(): number[];
-	/** Takes an [ Number:0 to 6 ] and disallow the user to select weekdays that exist in this array.
+	/**
+	 * Takes an [ Number:0 to 6 ] and disallow the user to select weekdays that exist in this array.
 	 * This has lower priority over the options.minDate, options.maxDate, options.disabledDates and options.enabledDates configuration settings.
 	 * Emits:
 	 * - dp.change - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
@@ -133,13 +139,15 @@ export interface Datetimepicker {
 	 * Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false.
 	 */
 	disabledHours(value: boolean | number[]): void;
-	/** Returns the options.disabledTimeIntervals option, or... not exactly
+	/**
+	 * Returns the options.disabledTimeIntervals option, or... not exactly
 	 * IMPORTANT! Creates an object from the options.disabledTimeIntervals with the keys being numbers, the values being the moment arrays.
 	 * eg { "0": [<moment.Moment1>, <moment.Moment2>], "1": [...] }
 	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1498
 	 */
 	disabledTimeIntervals(): boolean | moment.Moment[][];
-	/** Disables time selection between the given moments
+	/**
+	 * Disables time selection between the given moments
 	 * eg: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
 	 */
 	disabledTimeIntervals(value: boolean | moment.Moment[][]): void;
@@ -148,7 +156,8 @@ export interface Datetimepicker {
 	 * NOTES: probably should be: enabledDates(): boolean | Array<moment.Moment>; see: DatetimepickerOptions
 	 */
 	enabledDates(): boolean | any;
-	/** Takes an array of values and allows the user to select only from those days.
+	/**
+	 * Takes an array of values and allows the user to select only from those days.
 	 * Setting this takes precedence over options.minDate, options.maxDate configuration.
 	 * Also calling this function removes the configuration of options.disabledDates if such exist.
 	 * Note: These values are matched with Day granularity.
@@ -174,7 +183,8 @@ export interface Datetimepicker {
 	focusOnShow(value: boolean): void;
 	/** Returns the component's options.format string */
 	format(): boolean | string | moment.MomentBuiltinFormat;
-	/** Takes a moment.js format string and sets the components options.format.
+	/**
+	 * Takes a moment.js format string and sets the components options.format.
 	 * This is used for displaying and also for parsing input strings either from the input element the component is attached to or the date() function.
 	 * The parameter can also be a boolean:false in which case the format is set to the locale's L LT.
 	 * Note: this is also used to determine if the TimePicker sub component will display the hours in 12 or 24 format. (if "a" or "h" exists in the passed string then a 12 hour mode is set)
@@ -184,7 +194,8 @@ export interface Datetimepicker {
 	format(format: boolean | string | moment.MomentBuiltinFormat): void;
 	/** Returns options.icons */
 	icons(): Icons;
-	/** Takes an Object of strings.
+	/**
+	 * Takes an Object of strings.
 	 * Throws:
 	 * - TypeError - if icons parameter is not an Object
 	 */
@@ -209,14 +220,16 @@ export interface Datetimepicker {
 	keyBinds(value: any): void;
 	/** Returns the currently set locale of the options.locale */
 	locale(): string;
-	/** Takes a string of any valid moment locale e.g. de for German.
+	/**
+	 * Takes a string of any valid moment locale e.g. de for German.
 	 * Throws:
 	 * - TypeError - if the locale is not loaded via a separate script or moment-with-locale
 	 */
 	locale(newLocale: string): void;
 	/** Returns the currently set moment of the options.maxDate or false if not set */
 	maxDate(): moment.Moment | boolean;
-	/** Takes a parameter and disallows the user to select a moment that is after that moment.
+	/**
+	 * Takes a parameter and disallows the user to select a moment that is after that moment.
 	 * If a boolean:false value is passed options.maxDate is cleared and there is no restriction to the maximum moment the user can select.
 	 * Note: If the parameter is before the currently selected moment the currently selected moment changes to maxDate
 	 * Throws:
@@ -230,7 +243,8 @@ export interface Datetimepicker {
 	maxDate(date: moment.Moment | Date | string | boolean): void;
 	/** Returns the currently set moment of the options.minDate or false if not set */
 	minDate(): moment.Moment | boolean;
-	/** Takes a parameter and disallows the user to select a moment that is before that moment.
+	/**
+	 * Takes a parameter and disallows the user to select a moment that is before that moment.
 	 * If a boolean:false value is passed the options.minDate parameter is cleared and there is no restriction to the miminum moment the user can select.
 	 * Note: If the parameter is after the currently selected moment the currently selected moment changes to minDate parameter
 	 * Throws:
@@ -244,7 +258,8 @@ export interface Datetimepicker {
 	minDate(date: moment.Moment | Date | string | boolean): void;
 	/** Returns the options.parseInputDate option */
 	parseInputDate(): InputParser | undefined;
-	/** Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
+	/**
+	 * Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
 	 * {@link http://eonasdan.github.io/bootstrap-datetimepicker/Functions/#parseinputdate}
 	 */
 	parseInputDate(value: InputParser): void;
@@ -270,14 +285,16 @@ export interface Datetimepicker {
 	stepping(step: number): void;
 	/** Returns a string of options.timeZone */
 	timeZone(): string | null;
-	/** Takes a null or a string of a valid timezone.
+	/**
+	 * Takes a null or a string of a valid timezone.
 	 * Throws:
 	 * - TypeError - if tooltips parameter is not a string or null
 	 */
 	timeZone(timeZone: string | null): void;
 	/** Returns the options.toolbarplacement option. */
 	toolbarPlacement(): string;
-	/** Changes the placement of the toolbar where the today, clear, component switch icon are located.
+	/**
+	 * Changes the placement of the toolbar where the today, clear, component switch icon are located.
 	 * See valid values at DatetimepickerOptions.toolbarplacement
 	 * Throws:
 	 * - TypeError - if the parameter is not a valid value
@@ -285,14 +302,16 @@ export interface Datetimepicker {
 	toolbarPlacement(value: string): void;
 	/** Returns the options.tooltips option */
 	tooltips(): Tooltips;
-	/** Sets the tooltips for icons.
+	/**
+	 * Sets the tooltips for icons.
 	 * Throws:
 	 * - TypeError - if tooltips parameter is not an Object
 	 */
 	tooltips(value: Tooltips): void;
 	/** Returns the options.useCurrent option configuration */
 	useCurrent(): boolean | string;
-	/** Takes a boolean or string.
+	/**
+	 * Takes a boolean or string.
 	 * If a boolean true is passed and the components model moment is not set (either through setDate or through a valid value on the input element the component is attached to)
 	 * then the first time the user opens the datetimepicker widget the value is initialized to the current moment of the action.
 	 * If a false boolean is passed then no initialization happens on the input element.
@@ -312,7 +331,8 @@ export interface Datetimepicker {
 	viewDate(value: string | Date | moment.Moment | boolean): void;
 	/** Returns the options.viewMode. */
 	viewMode(): string;
-	/** Takes a string. See valid values at DatetimepickerOptions.viewMode
+	/**
+	 * Takes a string. See valid values at DatetimepickerOptions.viewMode
 	 * Throws:
 	 * - TypeError - if the parameter is not a string or not a valid value
 	 */
@@ -323,7 +343,8 @@ export interface Datetimepicker {
 	widgetParent(widgetParent: string | JQuery | null): void;
 	/** Returns the options.widgetPositioning object */
 	widgetPositioning(): WidgetPositioningOptions;
-	/** WidgetPositioning defines where the dropdown with the widget will appear relative to the input element the component is attached to.
+	/**
+	 * WidgetPositioning defines where the dropdown with the widget will appear relative to the input element the component is attached to.
 	 * "auto" is the default value for both horizontal and vertical keys and it tries to automatically place the dropdown in a position that is visible to the user.
 	 * Usually you should not override those options unless you have a special need in your layout.
 	 */
@@ -331,7 +352,6 @@ export interface Datetimepicker {
 
 	/**
 	 * JQuery plugin function.
-	 * @param {DatetimepickerOptions} options
 	 */
 	(options?: DatetimepickerOptions): JQuery;
 
@@ -343,91 +363,109 @@ export interface Datetimepicker {
 }
 
 export interface DatetimepickerOptions {
-	/** If true, the picker will show on textbox focus and icon click when used in a button group
+	/**
+	 * If true, the picker will show on textbox focus and icon click when used in a button group
 	 * @default: false
 	 */
 	allowInputToggle?: boolean;
-	/** Shows the week of the year to the left of first day of the week.
+	/**
+	 * Shows the week of the year to the left of first day of the week.
 	 * @default: false
 	 */
 	calendarWeeks?: boolean;
-	/** Using a Bootstraps collapse to switch between date/time pickers.
+	/**
+	 * Using a Bootstraps collapse to switch between date/time pickers.
 	 * @default: true
 	 */
 	collapse?: boolean;
-	/** Disables the section of days of the week, e.g. weekends.
+	/**
+	 * Disables the section of days of the week, e.g. weekends.
 	 * Accepts: array of numbers from 0-6
 	 * @default: false
 	 */
 	daysOfWeekDisabled?: number[] | boolean;
-	/** Changes the heading of the datepicker when in "days" view.
+	/**
+	 * Changes the heading of the datepicker when in "days" view.
 	 * @default: "MMMM YYYY"
 	 */
 	dayViewHeaderFormat?: string;
-	/** Will cause the date picker to stay open after a blur event.
+	/**
+	 * Will cause the date picker to stay open after a blur event.
 	 * @default: false
 	 */
 	debug?: boolean;
-	/** Sets the picker default date/time. Overrides useCurrent
+	/**
+	 * Sets the picker default date/time. Overrides useCurrent
 	 * @default: false
 	 */
 	defaultDate?: boolean | moment.Moment | Date | string;
-	/** Disables selection of dates in the array, e.g. holidays
+	/**
+	 * Disables selection of dates in the array, e.g. holidays
 	 * @default: false
 	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
 	 * eg disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
 	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
 	 */
 	disabledDates?: boolean | Array<moment.Moment | Date | string> | any;
-	/** Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
+	/**
+	 * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
 	 * @default: false
 	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
 	 * eg disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
 	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
 	 */
 	disabledHours?: boolean | number[] | any;
-	/** Disables time selection between the given moments
+	/**
+	 * Disables time selection between the given moments
 	 * eg: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
 	 * @default: false
 	 */
 	disabledTimeIntervals?: boolean | moment.Moment[][];
-	/** Disables selection of dates NOT in the array, e.g. holidays
+	/**
+	 * Disables selection of dates NOT in the array, e.g. holidays
 	 * @default: false
 	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
 	 * eg enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
 	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
 	 */
 	enabledDates?: boolean | Array<moment.Moment | Date | string> | any;
-	/** Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
+	/**
+	 * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
 	 * @default: false
 	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
 	 * eg enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
 	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
 	 */
 	enabledHours?: boolean | number[];
-	/** Allows for several input formats to be valid. See: https://github.com/Eonasdan/bootstrap-datetimepicker/pull/666
+	/**
+	 * Allows for several input formats to be valid. See: https://github.com/Eonasdan/bootstrap-datetimepicker/pull/666
 	 * @default: false
 	 */
 	extraFormats?: boolean | Array<string | moment.MomentBuiltinFormat>;
-	/** If false, the textbox will not be given focus when the picker is shown
+	/**
+	 * If false, the textbox will not be given focus when the picker is shown
 	 * @default: true
 	 */
 	focusOnShow?: boolean;
-	/** See momentjs' docs for valid formats. Format also dictates what components are shown, e.g. MM/dd/YYYY will not display the time picker.
+	/**
+	 * See momentjs' docs for valid formats. Format also dictates what components are shown, e.g. MM/dd/YYYY will not display the time picker.
 	 * @default: false
 	 */
 	format?: boolean | string | moment.MomentBuiltinFormat;
 	/** Change the default icons for the pickers functions. */
 	icons?: Icons;
-	/** Allow date picker show event to fire even when the associated input element has the readonly="readonly"property.
+	/**
+	 * Allow date picker show event to fire even when the associated input element has the readonly="readonly"property.
 	 * @default: false
 	 */
 	ignoreReadonly?: boolean;
-	/** Will display the picker inline without the need of a input field. This will also hide borders and shadows.
+	/**
+	 * Will display the picker inline without the need of a input field. This will also hide borders and shadows.
 	 * @default: false
 	 */
 	inline?: boolean;
-	/** Allows for custom events to fire on keyboard press.
+	/**
+	 * Allows for custom events to fire on keyboard press.
 	 * eg: keybinds: {
 	 * 		up: (widget) => console.log(widget),
 	 * 		"control up": (widget) => console.log(widget)
@@ -435,52 +473,63 @@ export interface DatetimepickerOptions {
 	 * The widget parameter is false, if the datepicker is closed.
 	 */
 	keyBinds?: { [key: string]: (widget: boolean | JQuery) => void };
-	/** Will cause the date picker to not revert or overwrite invalid dates.
+	/**
+	 * Will cause the date picker to not revert or overwrite invalid dates.
 	 * @default: false
 	 */
 	keepInvalid?: boolean;
-	/** Will cause the date picker to stay open after selecting a date if no time components are being used.
+	/**
+	 * Will cause the date picker to stay open after selecting a date if no time components are being used.
 	 * @default: false
 	 */
 	keepOpen?: boolean;
-	/** See momentjs for valid locales. You must include moment-with-locales.js or a local js file.
+	/**
+	 * See momentjs for valid locales. You must include moment-with-locales.js or a local js file.
 	 * @default: moment.locale()
 	 */
 	locale?: string;
-	/** Prevents date/time selections after this date.
+	/**
+	 * Prevents date/time selections after this date.
 	 * maxDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
 	 * @default: false
 	 */
 	maxDate?: boolean | moment.Moment | Date | string;
-	/** Prevents date/time selections before this date.
+	/**
+	 * Prevents date/time selections before this date.
 	 * minDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
 	 * @default: false
 	 */
 	minDate?: boolean | moment.Moment | Date | string;
-	/** Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
+	/**
+	 * Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
 	 * {@link http://eonasdan.github.io/bootstrap-datetimepicker/Functions/#parseinputdate}
 	 */
 	parseInputDate?: InputParser;
-	/** Show the "Clear" button in the icon toolbar.
+	/**
+	 * Show the "Clear" button in the icon toolbar.
 	 * Clicking the "Clear" button will set the calendar to null.
 	 * @default: false
 	 */
 	showClear?: boolean;
-	/** Show the "Close" button in the icon toolbar.
+	/**
+	 * Show the "Close" button in the icon toolbar.
 	 * Clicking the "Close" button will call hide()
 	 * @default: false
 	 */
 	showClose?: boolean;
-	/** Show the "Today" button in the icon toolbar.
+	/**
+	 * Show the "Today" button in the icon toolbar.
 	 * Clicking the "Today" button will set the calendar view and set the date to now.
 	 * @default: false
 	 */
 	showTodayButton?: boolean;
-	/** Shows the picker side by side when using the time and date together.
+	/**
+	 * Shows the picker side by side when using the time and date together.
 	 * @default: false
 	 */
 	sideBySide?: boolean;
-	/** Number of minutes the up/down arrow's will move the minutes value in the time picker
+	/**
+	 * Number of minutes the up/down arrow's will move the minutes value in the time picker
 	 * @default: 1
 	 */
 	stepping?: number;
@@ -489,30 +538,36 @@ export interface DatetimepickerOptions {
 	 * @default: ""
 	 */
 	timeZone?: string | null;
-	/** Changes the placement of the icon toolbar.
+	/**
+	 * Changes the placement of the icon toolbar.
 	 * @default: "default"
 	 */
 	toolbarPlacement?: "default" | "top" | "bottom";
 	/** This will change the tooltips over each icon to a custom string */
 	tooltips?: Tooltips;
-	/** On show, will set the picker to the current date/time
+	/**
+	 * On show, will set the picker to the current date/time
 	 * @default: true
 	 */
 	useCurrent?: boolean;
-	/** Defines if moment should use strict date parsing when considering a date to be valid
+	/**
+	 * Defines if moment should use strict date parsing when considering a date to be valid
 	 * @default: false
 	 */
 	useStrict?: boolean;
-	/** This will change the viewDate without changing or setting the selected date.
+	/**
+	 * This will change the viewDate without changing or setting the selected date.
 	 * @default: false
 	 */
 	viewDate?: boolean | moment.Moment | Date | string;
-	/** The default view to display when the picker is shown.
+	/**
+	 * The default view to display when the picker is shown.
 	 * Note: To limit the picker to selecting, for instance the year and month, use format: MM/YYYY
 	 * @default: "days"
 	 */
 	viewMode?: "decades" | "years" | "months" | "days";
-	/** On picker show, places the widget at the identifier (string) or jQuery object if the element has css position: "relative"
+	/**
+	 * On picker show, places the widget at the identifier (string) or jQuery object if the element has css position: "relative"
 	 * @default: null
 	 */
 	widgetParent?: string | JQuery | null;
diff --git a/types/bootstrap.v3.datetimepicker/package.json b/types/bootstrap.v3.datetimepicker/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/bootstrap.v3.datetimepicker/package.json
+++ b/types/bootstrap.v3.datetimepicker/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/bootstrap.v3.datetimepicker/v3/package.json b/types/bootstrap.v3.datetimepicker/v3/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/bootstrap.v3.datetimepicker/v3/package.json
+++ b/types/bootstrap.v3.datetimepicker/v3/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/bootstrap.v3.datetimepicker/v3/tslint.json b/types/bootstrap.v3.datetimepicker/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap.v3.datetimepicker/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bootstrap/tslint.json b/types/bootstrap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bootstrap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/botvs/botvs-tests.ts b/types/botvs/botvs-tests.ts
deleted file mode 100644
index 96c424c164..0000000000
--- a/types/botvs/botvs-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-_N(0, 1);
-_C(() => void 0);
-Sleep(1e3);
-const data: botvs.Record | undefined = void 0;
-console.log(data);
-TA.Alligator([]);
-talib.help('XML');
diff --git a/types/botvs/index.d.ts b/types/botvs/index.d.ts
deleted file mode 100644
index 2eabcb98da..0000000000
--- a/types/botvs/index.d.ts
+++ /dev/null
@@ -1,4106 +0,0 @@
-// Type definitions for botvs 0.1
-// Project: https://www.botvs.com/
-// Definitions by: acrazing <https://github.com/acrazing>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="node" />
-
-import Highstock = require('highcharts/highstock');
-
-declare global {
-    namespace botvs {
-        /**
-         * 订�的状�
-         */
-        type VOrderState = object;
-
-        /**
-         * 订�的类型
-         */
-        type VOrderType = object;
-
-        /**
-         * 仓�的类型
-         */
-        type VPositionType = object;
-
-        /**
-         * K线周期
-         */
-        type VPeriod = object;
-
-        /**
-         * 日志类型
-         */
-        type VLogType = object;
-
-        interface ChartOptions extends Highstock.Options {
-            __isStock?: boolean;
-        }
-
-        interface RChart {
-            add(series?: number, data?: number, index?: number): void;
-            reset(): void;
-        }
-
-        interface Socket {
-            write(data: string, timeout?: number): number;
-            read(size?: number): Buffer | null;
-            close(): void;
-        }
-
-        /**
-         * 标准OHLC结构, 用�画K线和指标分�用的，由GetRecords函数返回此结构数组
-         */
-        interface Record {
-            /**
-             * 一个时间戳, 精确到毫秒，与Javascript的 new Date().getTime() 得到的结果格�一样
-             */
-            Time: number;
-            /**
-             * 开盘价
-             */
-            Open: number;
-            /**
-             * 最高价
-             */
-            High: number;
-            /**
-             * 最低价
-             */
-            Low: number;
-            /**
-             * 收盘价
-             */
-            Close: number;
-            /**
-             * �交�
-             */
-            Volume: number;
-        }
-
-        /**
-         * 市场深度�
-         */
-        interface MarketOrder {
-            /**
-             * ä»·æ ¼
-             */
-            Price: number;
-            /**
-             * 数�
-             */
-            Amount: number;
-        }
-
-        /**
-         * 市场行情
-         */
-        interface Ticker {
-            /**
-             * 最高价
-             */
-            High: number;
-            /**
-             * 最低价
-             */
-            Low: number;
-            /**
-             * �一价
-             */
-            Sell: number;
-            /**
-             * 买一价
-             */
-            Buy: number;
-            /**
-             * 最��交价
-             */
-            Last: number;
-            /**
-             * 最近�交�
-             */
-            Volume: number;
-        }
-
-        /**
-         * 订�结构, 由GetOrder函数返回
-         */
-        interface Order {
-            /**
-             * 交易�唯一标识
-             */
-            Id: string;
-            /**
-             * 下�价格
-             */
-            Price: number;
-            /**
-             * 下�数�
-             */
-            Amount: number;
-            /**
-             * �交数�
-             */
-            DealAmount: number;
-            /**
-             * 订�状�, �考常�里的订�状�
-             */
-            Status: VOrderState;
-            /**
-             * 订�类型, �考常�里的订�类型
-             */
-            Type: VOrderType;
-        }
-
-        /**
-         * 市场深度,由GetDepth函数返回
-         */
-        interface Depth {
-            /**
-             * ��数组, MarketOrder数组, 按价格从低�高排�
-             */
-            Asks: MarketOrder[];
-            /**
-             * 买�数组, MarketOrder数组, 按价格从高�低排�
-             */
-            Bids: MarketOrder[];
-        }
-
-        /**
-         * 获�所有交易历�(�自己),由GetTrades函数返回
-         */
-        interface Trade {
-            /**
-             * Id(交易所返回的此Trade的唯一Id)
-             */
-            Id: string;
-            /**
-             * 时间(Unix timestamp 毫秒)
-             */
-            Time: number;
-            /**
-             * ä»·æ ¼
-             */
-            Price: number;
-            /**
-             * 数�
-             */
-            Amount: number;
-            /**
-             * 订�类型, �考常�里的订�类型
-             */
-            Type: VOrderType;
-        }
-
-        /**
-         * 手续费结构, 由GetFee函数返回(如国外平�bitfinex买入�出手续费跟账户交易�相关)
-         */
-        interface Fee {
-            /**
-             * �出手续费, 为一个浮点数, 如0.2表示0.2%的手续费
-             */
-            Sell: number;
-            /**
-             * 买入手续费, 格��上
-             */
-            Buy: number;
-        }
-
-        /**
-         * 账户信�, 由GetAccount函数返回
-         */
-        interface Account {
-            /**
-             * 余�(人民�或者美元, 在Poloniex交易所里BTC_ETC这样的��, Balance就指的是BTC的数�,
-             * Stocks指的是ETC数�, BTC38的ETC_BTC相当于Poloniex的BTC_ETC, 指的是以BTC计价)
-             */
-            Balance: number;
-            /**
-             * 冻结的余�
-             */
-            FrozenBalance: number;
-            /**
-             * BTC/LTC数�, 现货为当���作�的余�(去掉冻结的�),
-             * 期货的�为�约当��用��金(传统期货为此属性)
-             */
-            Stocks: number;
-            /**
-             * 冻结的BTC/LTC数�(传统期货无此属性)
-             */
-            FrozenStocks: number;
-        }
-
-        /**
-         * 期货交易中的�有仓�信�, 由GetPosition()函数返回此结构数组
-         */
-        interface Position {
-            /**
-             * ��大�, 796期货有�能为5, 10, 20三个�数, OKCoin为10或者20,
-             * BitVC期货和OK期货的全仓模�返回为固定的10, 因为原生API�支�
-             */
-            MarginLevel: number;
-            /**
-             * �仓�, 796期货表示��的数�, BitVC指�仓的总金�(100的�数),
-             * OKCoin表示�约的份数(整数且大于1)
-             */
-            Amount: number;
-            /**
-             * �平�, �有股票有此选项, 表示�以平仓的数�(股票为T+1)今日仓�能平
-             */
-            CanCover: number;
-            /**
-             * 仓�冻结�
-             */
-            FrozenAmount: number;
-            /**
-             * �仓�价
-             */
-            Price: number;
-            /**
-             * �仓浮动盈�(数�货���：BTC/LTC, 传统期货��:RMB, 股票�支�此字段,
-             * 注: OKCoin期货全仓情况下指实现盈余, 并��仓盈�, �仓下指�仓盈�)
-             */
-            Profit: number;
-            /**
-             * PD_LONG为多头仓�(CTP中用closebuy_today平仓), PD_SHORT为空头仓�(CTP用closesell_today)平仓,
-             * (CTP期货中)PD_LONG_YD为咋日多头仓�(用closebuy平), PD_SHORT_YD为咋日空头仓�(用closesell平)
-             */
-            Type: VPositionType;
-            /**
-             * 商�期货为�约代�, 股票为'交易所代�_股票代�', 具体�数SetContractType的传入类型
-             */
-            ContractType: string;
-        }
-
-        interface AsyncJob<T> {
-            wait(timeout?: number): T | null | undefined;
-        }
-
-        interface Exchange {
-            /**
-             * 返回交易所�称(string)
-             *
-             * @return {string}
-             */
-            GetName(): string;
-
-            /**
-             * 返回交易所自定义的标签(string)
-             *
-             * @return {string}
-             */
-            GetLabel(): string;
-
-            /**
-             * 返回交易所使用的美元的汇率, OKCoin期货返回官方�供的汇率, 该值��SetRate影�
-             *
-             * @return {number}
-             */
-            GetUSDCNY(): number;
-
-            /**
-             * 返回交易所使用的�通货�与人民�的汇率, 返回1表示�用汇率转�
-             *
-             * 汇率接�调用雅虎�供的接�, 5分钟更新一次
-             * 所有函数自动�过汇率转�,如果为1指�用汇率转�
-             *
-             * @return {number}
-             */
-            GetRate(): number;
-
-            /**
-             * 设置交易所的�通货�的汇率, 返回设置�的汇率, 设置为1指�用汇率转�
-             *
-             * 比如796期货设置SetRate(6.13), 就是设定USD/EUR对CNY的汇率为6.13, 程�所有价格会自动用这个汇率计算
-             * SetRate(), 如果�加�数，则��系统内置汇率
-             * SetRate(1), 就是�用汇率转�
-             *
-             * @param {number} rate
-             */
-            SetRate(rate?: number): void;
-
-            /**
-             * 设置价格与��下��的�数�精度, 设置�会自动截断
-             *
-             * exchange.SetPrecision(2, 3); // 设置价格�数�精度为2�, ��下���数�精度为3�
-             *
-             * @param {number} PricePrecision
-             * @param {number} AmountPrecision
-             */
-            SetPrecision(PricePrecision: number, AmountPrecision: number): void;
-
-            /**
-             * 返回交易所�作的货��称(string), 传统期货CTP返回的固定为STOCK
-             *
-             * @return {string}
-             */
-            GetCurrency(): string;
-
-            /**
-             * 返回交易所�作的基础货��称(string), BTC_CNY就返回CNY, ETH_BTC就返回BTC
-             *
-             * @return {string}
-             */
-            GetBaseCurrency(): string;
-
-            /**
-             * 返回一个Ticker结构
-             *
-             * @return {botvs.Ticker}
-             */
-            GetTicker(): Ticker;
-
-            /**
-             * 返回一个Depth结构
-             *
-             * @return {botvs.Depth}
-             */
-            GetDepth(): Depth;
-
-            /**
-             * 返回一个Trade数组, 按时间从低到高的顺�, �支�数字货�(BTC/LTC)
-             *
-             * @return {botvs.Trade[]}
-             */
-            GetTrades(): Trade[];
-
-            /**
-             * 返回一个K线历�, K线周期在创建机器人时指定, Record数组结构
-             *
-             * �加�数, 默认返回添加机器人时时指�的K线周期, 但也�以自定义K线周期
-             * 支�: PERIOD_M1 指1分钟, PERIOD_M5 指5分钟, PERIOD_M15 指15分钟,
-             * PERIOD_M30 指30分钟, PERIOD_H1 指1�时, PERIOD_D1 指一天
-             *
-             * @param {number} Period
-             * @return {botvs.Record[]}
-             */
-            GetRecords(Period?: VPeriod): Record[];
-
-            /**
-             * 返回一个Account结构, 如exchange.GetAccount(), 将返回主交易所账户信�
-             *
-             * @return {botvs.Account}
-             */
-            GetAccount(): Account;
-
-            /**
-             * 下买�, Price为买�价格,Amount为数�, 返回一个订�ID
-             *
-             * �以跟多余的�数�为附加消�显示到日志, 如exchange.Buy(1000,0.1, "OK", 123)
-             * 支�现货(��/BitVC/OKCoin/OKCoin国际/OKCoin期货/BTCChina/BitYes)市价�, 市价�价格指定为-1
-             * exchange.Buy(1000), 指买市价1000元的�, BTCChina例外exchange.Buy(0.3)指市价买0.3个�
-             *
-             * @param {number} Price
-             * @param {number} Amount
-             * @param {*[]} args
-             * @return {string} - 订�ID
-             */
-            Buy(Price: number, Amount: number, ...args: any[]): string;
-
-            /**
-             * 跟Buy函数一样的调用方法和场景 {@see Exchange#Buy}
-             *
-             * @param {number} Price
-             * @param {number} Amount
-             * @return {string}
-             */
-            Sell(Price: number, Amount: number): string;
-
-            /**
-             * 获�所有未完�的订�, 返回一个Order数组结构
-             *
-             * @return {botvs.Order[]}
-             */
-            GetOrders(): Order[];
-
-            /**
-             * 根�订��获�订�详情, 返回一个Order结构
-             *
-             * @param {string} orderId
-             * @return {botvs.Order}
-             */
-            GetOrder(orderId: string): Order;
-
-            /**
-             * 根�订���消一个订�, 返回true或者false
-             *
-             * @param {string} orderId
-             * @return {boolean}
-             */
-            CancelOrder(orderId: string): boolean;
-
-            /**
-             * �下�, �记录交易信�, logType�为LOG_TYPE_BUY/LOG_TYPE_SELL/LOG_TYPE_CANCEL
-             *
-             * @param {VLogType} logType
-             * @param {string} orderId
-             * @param {number} price
-             * @param {number} amount
-             */
-            Log(logType: VLogType, orderId: string, price: number, amount: number): void;
-
-            /**
-             * 返回�最�交易数�
-             *
-             * @return {number}
-             */
-            GetMinStock(): number;
-
-            /**
-             * 返回一笔订��求的最�金�(价格*数�)
-             *
-             * Bitstamp�求5美元(程�会根�汇率自动转�为人民�), 其它没有�制
-             *
-             * @return {number}
-             */
-            GetMinPrice(): number;
-
-            /**
-             * 返回一个Fee结构
-             *
-             * @return {botvs.Fee}
-             */
-            GetFee(): Fee;
-
-            /**
-             * 返回最�一次REST API请求返回的原始内容(字符串), 用户�以用�自己解�扩展信�
-             *
-             * 注: 模拟测试的�，会一直返回一个空字符串, �在真实环境下有效
-             * exchange.GetAccount();
-             * var obj = JSON.parse(exchange.GetRawJSON());
-             *
-             * 传统商�期货API获�更多信�
-             * exchange.GetAccount();
-             * Log(exchange.GetRawJSON());//在GetAccount�功�调用, 获�更详细的账户信�, �以用JSON.parse解�
-             * 也支�GetTicker, GetDepth�的exchange.GetRawJSON(), 以�GetPosition与GetOrders,GetOrder这三个调用�的详细�馈数�
-             *
-             * @return {string}
-             */
-            GetRawJSON(): string;
-
-            /**
-             * 多线程异步支�函数, �以把所有支�的函数的�作��异步并�的.(�支�数字货�交易平�)
-             *
-             * Support: GetTicker, GetDepth, GetTrades, GetRecords, GetAccount, GetOrders, GetOrder, CancelOrder, Buy,
-             * Sell, GetPosition var a = exchange.Go("GetTicker"); // GetTicker 异步多线程执行 var b =
-             * exchange.Go("GetDepth"); var c = exchange.Go("Buy", 1000, 0.1); var d = exchange.Go("GetRecords",
-             * PERIOD_H1);
-             *
-             * // 上�四��作是并�多线程异步执行, �会耗时, 立�返回的
-             *
-             * var ticker = a.wait(); // 调用wait方法等待返回异步获�ticker结果
-             * var depth = b.wait(); // 返回深度, 如果获�失败也是有�能返回null的
-             * var orderId = c.wait(1000); // 返回订��, �定1秒超时, 超时返回undefined, 此对��以继续调用wait等待如果上次wait超时
-             * // 注�: 判断undefiend�用typeof(xx) === "undefined", 因为null==undefined在JavaScript里是�立的
-             *
-             * var records = d.wait(); // 等待K线结果
-             * var ret = d.wait(); // 这里wait了一个已�wait过且结�的异步�作, 会返回null, 并记录出错信�.
-             * // Python与Javascript的区别, Python的wait返回两个�数, 第一个是异步的api返回的结果, 第二个表示是异步调用是�完�
-             * ret, ok = d.wait() // ok是一定返回True的, 除�策略被�止
-             * ret, ok = d.wait(100) // ok返回False, 如果等待超时, 或者wait了一个已�结�的实例
-             *
-             * @param {keyof botvs.Exchange} Method
-             * @param Args
-             * @return {botvs.AsyncJob<T>}
-             */
-            Go<T>(Method: keyof Exchange, ...Args: any[]): AsyncJob<T>;
-
-            /**
-             * 调用交易所其它功能接�
-             *
-             * 支�所有数字货�交易所
-             * exchange.IO("api", "cancel_borrow", "symbol=cny&borrow_id=123"); // no need api & sign
-             * Detail: {@link https://www.botvs.com/bbs-topic/146}
-             *
-             * // �支�Websocket模�(huobi, okcoin.cn, BTCC支�)与商�期货CTP�议
-             *
-             * exchange.IO("websocket"); // 切�行情通信�议到websocket(默认为rest), Ticker,
-             * Depth会切�为websocket�议�更新, 商�期货CTP无需切�
-             *
-             *
-             * // 切�GetTicker, GetDepth数�更新模�
-             *
-             * exchange.IO("mode", 0); // 立�返回模�, 如果当�还没有接收到交易所最新的行情数�推�, 就立�返回旧的行情数�,
-             * 如果有新的数�就返回新的数�
-             *
-             * exchange.IO("mode", 1); // 缓存模�(默认模�),
-             * 如果当�还没有收到交易所最新的行情数�(�上一次api获�的数�比较), 就等待接收然��返回, 如果调用该函数之�收到了最新的行情数�,
-             * 就立�返回最新的数�
-             *
-             * exchange.IO("mode", 2); // 强制更新模�, 进入等待一直到接收到交易所下一次的最新推�数��返回
-             *
-             *
-             *
-             * // 如果想第一时间获�最新的行情�以切�到websocket��Sleep的立�检测数�, GetTicker, GetDepth用缓存模�进行工作
-             *
-             * exchange.IO("websocket");
-             *
-             * while (true) {
-             * Log(exchange.GetTicker());
-             * }
-             *
-             * 传统商�期货扩展的IO功能
-             * exchange.IO("status"); // 返回true�明与CTP�务器行情与数�的两��务器都连接正常
-             * exchange.IO("instruments"); // 返回交易所所有的�约列表{�约�: 详情}字典形�, �支�实盘
-             * exchange.IO("products"); // 返回交易所所有的产�列表{产��: 详情}字典形�, �支�实盘
-             * exchange.IO("subscribed"); // 返回已订阅行情的�约, 格��上, �支�实盘
-             * exchange.IO("settlement"); // 结算�查询, �加第二个�数默认返回之�一个交易日的,
-             * 加�数如"20170317"指返回20170317的结算�, �支�实盘
-             * exchange.IO("wait"); // 有任何��更新行情信�时�返回, �带第二个�数(毫秒数)指定超时,
-             * 超时返回-1, 正常返回事件接收的时间(nano级), �支�实盘
-             * exchange.IO("wait_instrument"); // 有任何��更新行情信�时�返回, �带第二个�数(毫秒数)
-             * 指定超时, 超时返回空字符串, 正常返回触�事件的���称, �支�实盘
-             *
-             * @param {"api" | "usd" | "cny" | "currency" | string} Api
-             * @param {string} ApiName
-             * @param {string} Args
-             * @return {T}
-             */
-            IO<T = any>(Api: 'api' | 'usd' | 'cny' | 'currency' | string, ApiName?: string, Args?: string): T;
-
-            /**
-             * 获�当��仓信�
-             *
-             * 返回一个Position数组, (BitVC和OKCoin)�以传入一个�数, 指定�获�的�约类型
-             *
-             * @return {botvs.Position[]}
-             */
-            GetPosition(): Position[];
-
-            /**
-             * 设置��大�
-             *
-             * 设置Buy(多�)或者Sell(空�)的��大�, MarginLevel有5, 10, 20 三个�选�数
-             * 796支�5,10,20,50三个选项, BitVC的LTC�支�20���, OKCoin支�10�和20�
-             * 如: exchange.SetMarginLevel(5)
-             *
-             * @param {number} MarginLevel
-             */
-            SetMarginLevel(MarginLevel: number): void;
-
-            /**
-             * 设置Buy或者Sell下�类型
-             *
-             * Direction�以�buy, closebuy, sell, closesell四个�数, 传统期货多出closebuy_today,与closesell_today, 指平今仓,
-             * 默认为closebuy/closesell为平咋仓 对于CTP传统期货, �以设置第二个�数"1"或者"2"或者"3", 分别指"投机", "套利", "套�",
-             * �设置默认为投机 股票�支�buy与closebuy,
-             * 因为股票�能买跟平仓 exchange.SetMarginLevel(5); exchange.SetDirection("buy"); exchange.Buy(1000, 2);
-             * exchange.SetMarginLevel(5); exchange.SetDirection("closebuy"); exchange.Sell(1000, 2);
-             *
-             * 期货交易中Buy, Sell, CancelOrder和现货交易的区别
-             * Buy或Sell之�需�调用SetMarginLevel和SetDirection明确�作类型
-             * 数字货�796的CancelOrder之�需�调用SetDirection明确订�类型
-             * 如:
-             * exchange.SetDirection("sell");
-             * exchange.Sell(1000, 2);
-             * 如:
-             * exchange.SetDirection("buy");
-             * exchange.CancelOrder(123);
-             *
-             * 数字货�BitVC期货交易中Buy, Sell, GetOrder, SetMarginLevel与796的区别
-             * GetOrder里�的Amount为订�总金�, DealAmount为订�完�的金�, �是�的个数
-             * 数字货�796的CancelOrder之�需�调用SetDirection明确订�类型
-             * Buy或Sell第二个�数�是�的数�而是订�的总金�(100的�数)
-             * SetMarginLevel LTC�支�20���
-             * 如:
-             * exchange.SetContractType("week"); exchange.SetDirection("sell");
-             * exchange.Sell(1000, 100), 就是以1000元一个�的价格开100元的空头
-             *
-             * 数字货�OKCoin期货交易中Buy, Sell, GetOrder, SetMarginLevel与796的区别
-             * GetOrder里�的Amount为�约数(一份�约为10$), DealAmount为订�完�的�约数, �是�的个数
-             * Buy或Sell第二个�数�是�的数�而是�约的份数(整数且大于0)
-             * SetMarginLevel �支�10�和20�的��
-             * 如: 以1000元一个�的价格�空一份�约(10$的LTC或者100$的BTC):
-             * exchange.SetContractType("this_week");
-             * exchange.SetDirection("sell");
-             * exchange.Sell(1000, 1);
-             *
-             * @param {"buy" | "closebuy" | "sell" | "closesell" | "closebuy_today" | "closesell_today"} Direction
-             * @constructor
-             */
-            SetDirection(Direction: 'buy' | 'closebuy' | 'sell' | 'closesell' | 'closebuy_today' | 'closesell_today'): void;
-
-            /**
-             * 设置�约类型
-             *
-             * 传统的CTP期货的ContractType就是指的�约ID,  如SetContractType("au1506") 返回�约的详细信�, 如最少一次买多少, 手续费,
-             * 交割时间等,
-             * 主力连续�约为代�为000如MA000, �支�回测, �支�实盘 股票�约格�为 股票代�.(SH/SZ), SH指上交所, SZ指深交所,
-             * 如000001.SZ就是指深交所的平安银行 商�期货与股票�消订阅�约,
-             * 在�约��加上"-"�缀�新调用��, 如SetContractType("-au1506"); �功返回true 数字货�796支�: "week", "weekcny",
-             * 默认为�账户A, �指定�账户是A还是B,
-             * 在�约�加"@A"或"@B", 如: "day@A" 为日�约A�账户 BitVC有week和quarter和next_week三个�选�数, OKCoin期货有this_week,
-             * next_week, quarter三个�数 exchange.SetContractType("week");
-             *
-             * @param {string} ContractType
-             */
-            SetContractType(ContractType: string): void;
-        }
-    }
-
-    namespace TA {
-        /**
-         * 指数平滑异�平�线
-         *
-         * MACD(数�, 快周期, 慢周期, 信�周期), 默认�数为(12, 26, 9), 返回二维数组, 分别是[DIF, DEA, MACD]
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} LongPeriod
-         * @param {number} ShortPeriod
-         * @param {number} SignalPeriod
-         * @return {[number[] , number[] , number[]]}
-         */
-        function MACD(
-            Records: botvs.Record[],
-            LongPeriod?: number,
-            ShortPeriod?: number,
-            SignalPeriod?: number,
-        ): [number[], number[], number[]];
-
-        /**
-         * �机指标
-         *
-         * KDJ(数�, 周期1, 周期2, 周期3), 默认�数为(9, 3, 3), 返回二维数组, 分别是[K, D, J]
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} FirstPeriod
-         * @param {number} SecondPeriod
-         * @param {number} ThirdPeriod
-         * @return {[number[] , number[] , number[]]}
-         */
-        function KDJ(
-            Records: botvs.Record[],
-            FirstPeriod?: number,
-            SecondPeriod?: number,
-            ThirdPeriod?: number,
-        ): [number[], number[], number[]];
-
-        /**
-         * 强弱指标
-         *
-         * RSI(数�, 周期), 默认�数为14, 返回一个一维数组
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} Period
-         * @return {number[]}
-         */
-        function RSI(Records: botvs.Record[], Period?: number): number[];
-
-        /**
-         * 平�真实波幅
-         *
-         * ATR(数�, 周期), 默认�数为14, 返回一个一维数组
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} Period
-         * @return {number[]}
-         */
-        function ATR(Records: botvs.Record[], Period?: number): number[];
-
-        /**
-         * 能�潮
-         *
-         * OBV(数�), 返回一个一维数组
-         *
-         * @param {botvs.Record[]} Records
-         * @return {[number[] , number[]]}
-         */
-        function OBV(Records: botvs.Record[]): [number[], number[]];
-
-        /**
-         * 移动平�线
-         *
-         * MA(数�, 周期), 默认�数为9, 返回一个一维数组
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} Period
-         * @return {number[]}
-         */
-        function MA(Records: botvs.Record[], Period?: number): number[];
-
-        /**
-         * 指数平�数指标
-         * EMA(数�, 周期), 默认�数为9, 返回一个一维数组
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} Period
-         * @return {number[]}
-         */
-        function EMA(Records: botvs.Record[], Period?: number): number[];
-
-        /**
-         * Alligator Indicator
-         *
-         * Alligator(数�, 下颚周期,牙齿周期,上唇周期), 鳄鱼线指标, 默认�数为(13,8,5) 返回一个二维数组[下颚,牙齿,上唇]
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} JawPeriod
-         * @param {number} TeethPeriod
-         * @param {number} LibsPeriod
-         * @return {[number[] , number[] , number[]]}
-         */
-        function Alligator(
-            Records: botvs.Record[],
-            JawPeriod?: number,
-            TeethPeriod?: number,
-            LibsPeriod?: number,
-        ): [number[], number[], number[]];
-
-        /**
-         * Chaikin Money Flow
-         *
-         * CMF(数�, 周期), 默认周期�数为20, 返回一个一维数组
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} Period
-         * @return {number[]}
-         */
-        function CMF(Records: botvs.Record[], Period?: number): number[];
-
-        /**
-         * 周期最高价
-         *
-         * Highest(数�, 周期, 属性), 返回最近周期内的最大值(�包�当�Bar),
-         * 如TA.Highest(records, 30, 'High'), 如果周期为0指所有, 如属性�指定则视数�为普通数组
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} Period
-         * @param {keyof botvs.Record} Property
-         * @return {number}
-         * @constructor
-         */
-        function Highest(Records: botvs.Record[], Period?: number, Property?: keyof botvs.Record): number;
-
-        /**
-         * 周期最低价
-         *
-         * Lowest(数�, 周期, 属性), �上, 求最�值
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number} Period
-         * @param {keyof botvs.Record} Property
-         * @return {number}
-         */
-        function Lowest(Records: botvs.Record[], Period?: number, Property?: keyof botvs.Record): number;
-    }
-
-    namespace talib {
-        /**
-         * 查询指标调用格�
-         *
-         * Log(talib.help('MACD')); // 在回测环境下调用
-         *
-         * @param {string} Func
-         * @return {string}
-         */
-        function help(Func: string): string;
-
-        /**
-         * Vector Trigonometric ACos (�余弦函数)
-         *
-         * ACOS(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function ACOS(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Chaikin A/D Line (线�机指标)
-         *
-         * AD(Records[High,Low,Close,Volume]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function AD(Records: botvs.Record[]): number[];
-        /**
-         * Chaikin A/D Line (线�机指标)
-         *
-         * AD(Records[High,Low,Close,Volume]) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number[]} Volume
-         * @return {number[]}
-         */
-        function AD(High: number[], Low: number[], Close: number[], Volume: number[]): number[];
-
-        /**
-         * Chaikin A/D Oscillator (佳庆指标)
-         *
-         * ADOSC(Records[High,Low,Close,Volume],Fast Period = 3,Slow Period = 10) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=3} FastPeriod
-         * @param {number=10} SlowPeriod
-         * @return {number[]}
-         */
-        function ADOSC(Records: botvs.Record[], FastPeriod: number, SlowPeriod: number): number[];
-        /**
-         * Chaikin A/D Oscillator (佳庆指标)
-         *
-         * ADOSC(Records[High,Low,Close,Volume],Fast Period = 3,Slow Period = 10) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number[]} Volume
-         * @param {number=3} FastPeriod
-         * @param {number=10} SlowPeriod
-         * @return {number[]}
-         */
-        function ADOSC(
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Volume: number[],
-            FastPeriod: number,
-            SlowPeriod: number,
-        ): number[];
-
-        /**
-         * Average Directional Movement Index (平�趋�指数)
-         *
-         * ADX(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function ADX(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Average Directional Movement Index (平�趋�指数)
-         *
-         * ADX(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function ADX(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Average Directional Movement Index Rating (评估指数)
-         *
-         * ADXR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function ADXR(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Average Directional Movement Index Rating (评估指数)
-         *
-         * ADXR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function ADXR(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Absolute Price Oscillator (�对价格振�指数)
-         *
-         * APO(Records[Close],Fast Period = 12,Slow Period = 26,MA Type = 0) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=12} FastPeriod
-         * @param {number=26} SlowPeriod
-         * @param {number=0} MAType
-         * @return {number[]}
-         */
-        function APO(
-            Records: botvs.Record[] | number[],
-            FastPeriod: number,
-            SlowPeriod: number,
-            MAType: number,
-        ): number[];
-
-        /**
-         * Aroon (阿隆指标)
-         *
-         * AROON(Records[High,Low],Time Period = 14) = [Array(outAroonDown),Array(outAroonUp)]
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {[number[], number[]]}
-         */
-        function AROON(Records: botvs.Record[], TimePeriod: number): [number[], number[]];
-        /**
-         * Aroon (阿隆指标)
-         *
-         * AROON(Records[High,Low],Time Period = 14) = [Array(outAroonDown),Array(outAroonUp)]
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number=14} TimePeriod
-         * @return {[number[], number[]]}
-         */
-        function AROON(High: number[], Low: number[], TimePeriod: number): [number[], number[]];
-
-        /**
-         * Aroon Oscillator (阿隆震�线)
-         *
-         * AROONOSC(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function AROONOSC(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Aroon Oscillator (阿隆震�线)
-         *
-         * AROONOSC(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function AROONOSC(High: number[], Low: number[], TimePeriod: number): number[];
-
-        /**
-         * Vector Trigonometric ASin (�正弦函数)
-         *
-         * ASIN(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function ASIN(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Vector Trigonometric ATan (�正切函数)
-         *
-         * ATAN(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function ATAN(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Average True Range (平�真实波幅)
-         *
-         * ATR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function ATR(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Average True Range (平�真实波幅)
-         *
-         * ATR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function ATR(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Average Price (平�价格)
-         *
-         * AVGPRICE(Records[Open,High,Low,Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function AVGPRICE(Records: botvs.Record[]): number[];
-        /**
-         * Average Price (平�价格)
-         *
-         * AVGPRICE(Records[Open,High,Low,Close]) = Array(outReal)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function AVGPRICE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Bollinger Bands (布林带)
-         *
-         * BBANDS(Records[Close],Time Period = 5,Deviations up = 2,Deviations down = 2,MA Type = 0) =
-         * [Array(outRealUpperBand),Array(outRealMiddleBand),Array(outRealLowerBand)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=5} TimePeriod
-         * @param {number=2} Deviationsup
-         * @param {number=2} Deviationsdown
-         * @param {number=0} MAType
-         * @return {[number[], number[], number[]]}
-         */
-        function BBANDS(
-            Records: botvs.Record[] | number[],
-            TimePeriod: number,
-            Deviationsup: number,
-            Deviationsdown: number,
-            MAType: number,
-        ): [number[], number[], number[]];
-
-        /**
-         * Balance Of Power (�势指标)
-         *
-         * BOP(Records[Open,High,Low,Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function BOP(Records: botvs.Record[]): number[];
-        /**
-         * Balance Of Power (�势指标)
-         *
-         * BOP(Records[Open,High,Low,Close]) = Array(outReal)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function BOP(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Commodity Channel Index (顺势指标)
-         *
-         * CCI(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function CCI(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Commodity Channel Index (顺势指标)
-         *
-         * CCI(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function CCI(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Two Crows (K线图--两�乌鸦)
-         *
-         * CDL2CROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDL2CROWS(Records: botvs.Record[]): number[];
-        /**
-         * Two Crows (K线图--两�乌鸦)
-         *
-         * CDL2CROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDL2CROWS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Three Black Crows (K线图--3�黑乌鸦)
-         *
-         * CDL3BLACKCROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDL3BLACKCROWS(Records: botvs.Record[]): number[];
-        /**
-         * Three Black Crows (K线图--3�黑乌鸦)
-         *
-         * CDL3BLACKCROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDL3BLACKCROWS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Three Inside Up/Down (K线图:3内上下震�)
-         *
-         * CDL3INSIDE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDL3INSIDE(Records: botvs.Record[]): number[];
-        /**
-         * Three Inside Up/Down (K线图:3内上下震�)
-         *
-         * CDL3INSIDE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDL3INSIDE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Three-Line Strike  (K线图:3线震�)
-         *
-         * CDL3LINESTRIKE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDL3LINESTRIKE(Records: botvs.Record[]): number[];
-        /**
-         * Three-Line Strike  (K线图:3线震�)
-         *
-         * CDL3LINESTRIKE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDL3LINESTRIKE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Three Outside Up/Down (K线图:3外下震�)
-         *
-         * CDL3OUTSIDE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDL3OUTSIDE(Records: botvs.Record[]): number[];
-        /**
-         * Three Outside Up/Down (K线图:3外下震�)
-         *
-         * CDL3OUTSIDE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDL3OUTSIDE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Three Stars In The South (K线图:�方三星)
-         *
-         * CDL3STARSINSOUTH(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDL3STARSINSOUTH(Records: botvs.Record[]): number[];
-        /**
-         * Three Stars In The South (K线图:�方三星)
-         *
-         * CDL3STARSINSOUTH(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDL3STARSINSOUTH(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Three Advancing White Soldiers (K线图:三白兵)
-         *
-         * CDL3WHITESOLDIERS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDL3WHITESOLDIERS(Records: botvs.Record[]): number[];
-        /**
-         * Three Advancing White Soldiers (K线图:三白兵)
-         *
-         * CDL3WHITESOLDIERS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDL3WHITESOLDIERS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Abandoned Baby (K线图:弃婴)
-         *
-         * CDLABANDONEDBABY(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLABANDONEDBABY(Records: botvs.Record[], Penetration: number): number[];
-        /**
-         * Abandoned Baby (K线图:弃婴)
-         *
-         * CDLABANDONEDBABY(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLABANDONEDBABY(
-            Open: number[],
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Penetration: number,
-        ): number[];
-
-        /**
-         * Advance Block (K线图:推进)
-         *
-         * CDLADVANCEBLOCK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLADVANCEBLOCK(Records: botvs.Record[]): number[];
-        /**
-         * Advance Block (K线图:推进)
-         *
-         * CDLADVANCEBLOCK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLADVANCEBLOCK(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Belt-hold (K线图:带�)
-         *
-         * CDLBELTHOLD(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLBELTHOLD(Records: botvs.Record[]): number[];
-        /**
-         * Belt-hold (K线图:带�)
-         *
-         * CDLBELTHOLD(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLBELTHOLD(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Breakaway (K线图:分离)
-         *
-         * CDLBREAKAWAY(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLBREAKAWAY(Records: botvs.Record[]): number[];
-        /**
-         * Breakaway (K线图:分离)
-         *
-         * CDLBREAKAWAY(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLBREAKAWAY(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Closing Marubozu (K线图:收盘光头光脚)
-         *
-         * CDLCLOSINGMARUBOZU(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLCLOSINGMARUBOZU(Records: botvs.Record[]): number[];
-        /**
-         * Closing Marubozu (K线图:收盘光头光脚)
-         *
-         * CDLCLOSINGMARUBOZU(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLCLOSINGMARUBOZU(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Concealing Baby Swallow (K线图:�婴�没形�)
-         *
-         * CDLCONCEALBABYSWALL(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLCONCEALBABYSWALL(Records: botvs.Record[]): number[];
-        /**
-         * Concealing Baby Swallow (K线图:�婴�没形�)
-         *
-         * CDLCONCEALBABYSWALL(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLCONCEALBABYSWALL(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Counterattack (K线图:�击)
-         *
-         * CDLCOUNTERATTACK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLCOUNTERATTACK(Records: botvs.Record[]): number[];
-        /**
-         * Counterattack (K线图:�击)
-         *
-         * CDLCOUNTERATTACK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLCOUNTERATTACK(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Dark Cloud Cover (K线图:乌云盖)
-         *
-         * CDLDARKCLOUDCOVER(Records[Open,High,Low,Close],Penetration = 0.5) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.5} Penetration
-         * @return {number[]}
-         */
-        function CDLDARKCLOUDCOVER(Records: botvs.Record[], Penetration: number): number[];
-        /**
-         * Dark Cloud Cover (K线图:乌云盖)
-         *
-         * CDLDARKCLOUDCOVER(Records[Open,High,Low,Close],Penetration = 0.5) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=0.5} Penetration
-         * @return {number[]}
-         */
-        function CDLDARKCLOUDCOVER(
-            Open: number[],
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Penetration: number,
-        ): number[];
-
-        /**
-         * Doji (K线图:�字星 )
-         *
-         * CDLDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLDOJI(Records: botvs.Record[]): number[];
-        /**
-         * Doji (K线图:�字星 )
-         *
-         * CDLDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLDOJI(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Doji Star (K线图:�字星)
-         *
-         * CDLDOJISTAR(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLDOJISTAR(Records: botvs.Record[]): number[];
-        /**
-         * Doji Star (K线图:�字星)
-         *
-         * CDLDOJISTAR(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLDOJISTAR(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Dragonfly Doji (K线图:蜻蜓�字星)
-         *
-         * CDLDRAGONFLYDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLDRAGONFLYDOJI(Records: botvs.Record[]): number[];
-        /**
-         * Dragonfly Doji (K线图:蜻蜓�字星)
-         *
-         * CDLDRAGONFLYDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLDRAGONFLYDOJI(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Engulfing Pattern (K线图:�没)
-         *
-         * CDLENGULFING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLENGULFING(Records: botvs.Record[]): number[];
-        /**
-         * Engulfing Pattern (K线图:�没)
-         *
-         * CDLENGULFING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLENGULFING(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Evening Doji Star (K线图:黄��字星)
-         *
-         * CDLEVENINGDOJISTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLEVENINGDOJISTAR(Records: botvs.Record[], Penetration: number): number[];
-        /**
-         * Evening Doji Star (K线图:黄��字星)
-         *
-         * CDLEVENINGDOJISTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLEVENINGDOJISTAR(
-            Open: number[],
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Penetration: number,
-        ): number[];
-
-        /**
-         * Evening Star (K线图:黄�之星)
-         *
-         * CDLEVENINGSTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLEVENINGSTAR(Records: botvs.Record[], Penetration: number): number[];
-        /**
-         * Evening Star (K线图:黄�之星)
-         *
-         * CDLEVENINGSTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLEVENINGSTAR(
-            Open: number[],
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Penetration: number,
-        ): number[];
-
-        /**
-         * Up/Down-gap side-by-side white lines (K线图:上/下间隙并排的白色线�)
-         *
-         * CDLGAPSIDESIDEWHITE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLGAPSIDESIDEWHITE(Records: botvs.Record[]): number[];
-        /**
-         * Up/Down-gap side-by-side white lines (K线图:上/下间隙并排的白色线�)
-         *
-         * CDLGAPSIDESIDEWHITE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLGAPSIDESIDEWHITE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Gravestone Doji (K线图:墓碑�字线)
-         *
-         * CDLGRAVESTONEDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLGRAVESTONEDOJI(Records: botvs.Record[]): number[];
-        /**
-         * Gravestone Doji (K线图:墓碑�字线)
-         *
-         * CDLGRAVESTONEDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLGRAVESTONEDOJI(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Hammer (K线图:锤)
-         *
-         * CDLHAMMER(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHAMMER(Records: botvs.Record[]): number[];
-        /**
-         * Hammer (K线图:锤)
-         *
-         * CDLHAMMER(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHAMMER(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Hanging Man (K线图:�人)
-         *
-         * CDLHANGINGMAN(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHANGINGMAN(Records: botvs.Record[]): number[];
-        /**
-         * Hanging Man (K线图:�人)
-         *
-         * CDLHANGINGMAN(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHANGINGMAN(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Harami Pattern (K线图:阴阳线)
-         *
-         * CDLHARAMI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHARAMI(Records: botvs.Record[]): number[];
-        /**
-         * Harami Pattern (K线图:阴阳线)
-         *
-         * CDLHARAMI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHARAMI(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Harami Cross Pattern (K线图:交�阴阳线)
-         *
-         * CDLHARAMICROSS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHARAMICROSS(Records: botvs.Record[]): number[];
-        /**
-         * Harami Cross Pattern (K线图:交�阴阳线)
-         *
-         * CDLHARAMICROSS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHARAMICROSS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * High-Wave Candle (K线图:长脚�字线 )
-         *
-         * CDLHIGHWAVE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHIGHWAVE(Records: botvs.Record[]): number[];
-        /**
-         * High-Wave Candle (K线图:长脚�字线 )
-         *
-         * CDLHIGHWAVE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHIGHWAVE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Hikkake Pattern (K线图:陷阱)
-         *
-         * CDLHIKKAKE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHIKKAKE(Records: botvs.Record[]): number[];
-        /**
-         * Hikkake Pattern (K线图:陷阱)
-         *
-         * CDLHIKKAKE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHIKKAKE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Modified Hikkake Pattern (K线图:改良的陷阱)
-         *
-         * CDLHIKKAKEMOD(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHIKKAKEMOD(Records: botvs.Record[]): number[];
-        /**
-         * Modified Hikkake Pattern (K线图:改良的陷阱)
-         *
-         * CDLHIKKAKEMOD(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHIKKAKEMOD(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Homing Pigeon (K线图:信鸽)
-         *
-         * CDLHOMINGPIGEON(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLHOMINGPIGEON(Records: botvs.Record[]): number[];
-        /**
-         * Homing Pigeon (K线图:信鸽)
-         *
-         * CDLHOMINGPIGEON(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLHOMINGPIGEON(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Identical Three Crows (K线图:相�的三�乌鸦)
-         *
-         * CDLIDENTICAL3CROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLIDENTICAL3CROWS(Records: botvs.Record[]): number[];
-        /**
-         * Identical Three Crows (K线图:相�的三�乌鸦)
-         *
-         * CDLIDENTICAL3CROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLIDENTICAL3CROWS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * In-Neck Pattern (K线图:颈纹)
-         *
-         * CDLINNECK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLINNECK(Records: botvs.Record[]): number[];
-        /**
-         * In-Neck Pattern (K线图:颈纹)
-         *
-         * CDLINNECK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLINNECK(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Inverted Hammer (K线图:倒锤)
-         *
-         * CDLINVERTEDHAMMER(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLINVERTEDHAMMER(Records: botvs.Record[]): number[];
-        /**
-         * Inverted Hammer (K线图:倒锤)
-         *
-         * CDLINVERTEDHAMMER(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLINVERTEDHAMMER(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Kicking (K线图:踢)
-         *
-         * CDLKICKING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLKICKING(Records: botvs.Record[]): number[];
-        /**
-         * Kicking (K线图:踢)
-         *
-         * CDLKICKING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLKICKING(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Kicking - bull/bear determined by the longer marubozu (K线图:踢牛/踢熊)
-         *
-         * CDLKICKINGBYLENGTH(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLKICKINGBYLENGTH(Records: botvs.Record[]): number[];
-        /**
-         * Kicking - bull/bear determined by the longer marubozu (K线图:踢牛/踢熊)
-         *
-         * CDLKICKINGBYLENGTH(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLKICKINGBYLENGTH(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Ladder Bottom (K线图:梯底)
-         *
-         * CDLLADDERBOTTOM(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLLADDERBOTTOM(Records: botvs.Record[]): number[];
-        /**
-         * Ladder Bottom (K线图:梯底)
-         *
-         * CDLLADDERBOTTOM(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLLADDERBOTTOM(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Long Legged Doji (K线图:长腿�字线)
-         *
-         * CDLLONGLEGGEDDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLLONGLEGGEDDOJI(Records: botvs.Record[]): number[];
-        /**
-         * Long Legged Doji (K线图:长腿�字线)
-         *
-         * CDLLONGLEGGEDDOJI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLLONGLEGGEDDOJI(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Long Line Candle (K线图:长线)
-         *
-         * CDLLONGLINE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLLONGLINE(Records: botvs.Record[]): number[];
-        /**
-         * Long Line Candle (K线图:长线)
-         *
-         * CDLLONGLINE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLLONGLINE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Marubozu (K线图:光头光脚 )
-         *
-         * CDLMARUBOZU(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLMARUBOZU(Records: botvs.Record[]): number[];
-        /**
-         * Marubozu (K线图:光头光脚 )
-         *
-         * CDLMARUBOZU(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLMARUBOZU(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Matching Low (K线图:匹�低)
-         *
-         * CDLMATCHINGLOW(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLMATCHINGLOW(Records: botvs.Record[]): number[];
-        /**
-         * Matching Low (K线图:匹�低)
-         *
-         * CDLMATCHINGLOW(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLMATCHINGLOW(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Mat Hold (K线图:垫�)
-         *
-         * CDLMATHOLD(Records[Open,High,Low,Close],Penetration = 0.5) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.5} Penetration
-         * @return {number[]}
-         */
-        function CDLMATHOLD(Records: botvs.Record[], Penetration: number): number[];
-        /**
-         * Mat Hold (K线图:垫�)
-         *
-         * CDLMATHOLD(Records[Open,High,Low,Close],Penetration = 0.5) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=0.5} Penetration
-         * @return {number[]}
-         */
-        function CDLMATHOLD(
-            Open: number[],
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Penetration: number,
-        ): number[];
-
-        /**
-         * Morning Doji Star (K线图:早晨�字星)
-         *
-         * CDLMORNINGDOJISTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLMORNINGDOJISTAR(Records: botvs.Record[], Penetration: number): number[];
-        /**
-         * Morning Doji Star (K线图:早晨�字星)
-         *
-         * CDLMORNINGDOJISTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLMORNINGDOJISTAR(
-            Open: number[],
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Penetration: number,
-        ): number[];
-
-        /**
-         * Morning Star (K线图:晨星)
-         *
-         * CDLMORNINGSTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLMORNINGSTAR(Records: botvs.Record[], Penetration: number): number[];
-        /**
-         * Morning Star (K线图:晨星)
-         *
-         * CDLMORNINGSTAR(Records[Open,High,Low,Close],Penetration = 0.3) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=0.3} Penetration
-         * @return {number[]}
-         */
-        function CDLMORNINGSTAR(
-            Open: number[],
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Penetration: number,
-        ): number[];
-
-        /**
-         * On-Neck Pattern (K线图:颈型)
-         *
-         * CDLONNECK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLONNECK(Records: botvs.Record[]): number[];
-        /**
-         * On-Neck Pattern (K线图:颈型)
-         *
-         * CDLONNECK(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLONNECK(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Piercing Pattern (K线图:穿孔模�)
-         *
-         * CDLPIERCING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLPIERCING(Records: botvs.Record[]): number[];
-        /**
-         * Piercing Pattern (K线图:穿孔模�)
-         *
-         * CDLPIERCING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLPIERCING(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Rickshaw Man (K线图:车夫)
-         *
-         * CDLRICKSHAWMAN(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLRICKSHAWMAN(Records: botvs.Record[]): number[];
-        /**
-         * Rickshaw Man (K线图:车夫)
-         *
-         * CDLRICKSHAWMAN(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLRICKSHAWMAN(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Rising/Falling Three Methods (K线图:上�/下�三法)
-         *
-         * CDLRISEFALL3METHODS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLRISEFALL3METHODS(Records: botvs.Record[]): number[];
-        /**
-         * Rising/Falling Three Methods (K线图:上�/下�三法)
-         *
-         * CDLRISEFALL3METHODS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLRISEFALL3METHODS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Separating Lines (K线图:分割线)
-         *
-         * CDLSEPARATINGLINES(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLSEPARATINGLINES(Records: botvs.Record[]): number[];
-        /**
-         * Separating Lines (K线图:分割线)
-         *
-         * CDLSEPARATINGLINES(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLSEPARATINGLINES(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Shooting Star (K线图:�星)
-         *
-         * CDLSHOOTINGSTAR(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLSHOOTINGSTAR(Records: botvs.Record[]): number[];
-        /**
-         * Shooting Star (K线图:�星)
-         *
-         * CDLSHOOTINGSTAR(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLSHOOTINGSTAR(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Short Line Candle (K线图:短线)
-         *
-         * CDLSHORTLINE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLSHORTLINE(Records: botvs.Record[]): number[];
-        /**
-         * Short Line Candle (K线图:短线)
-         *
-         * CDLSHORTLINE(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLSHORTLINE(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Spinning Top (K线图:陀螺)
-         *
-         * CDLSPINNINGTOP(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLSPINNINGTOP(Records: botvs.Record[]): number[];
-        /**
-         * Spinning Top (K线图:陀螺)
-         *
-         * CDLSPINNINGTOP(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLSPINNINGTOP(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Stalled Pattern (K线图:�滞模�)
-         *
-         * CDLSTALLEDPATTERN(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLSTALLEDPATTERN(Records: botvs.Record[]): number[];
-        /**
-         * Stalled Pattern (K线图:�滞模�)
-         *
-         * CDLSTALLEDPATTERN(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLSTALLEDPATTERN(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Stick Sandwich (K线图:��三明治)
-         *
-         * CDLSTICKSANDWICH(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLSTICKSANDWICH(Records: botvs.Record[]): number[];
-        /**
-         * Stick Sandwich (K线图:��三明治)
-         *
-         * CDLSTICKSANDWICH(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLSTICKSANDWICH(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Takuri (Dragonfly Doji with very long lower shadow) (K线图:托里)
-         *
-         * CDLTAKURI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLTAKURI(Records: botvs.Record[]): number[];
-        /**
-         * Takuri (Dragonfly Doji with very long lower shadow) (K线图:托里)
-         *
-         * CDLTAKURI(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLTAKURI(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Tasuki Gap (K线图:翼隙)
-         *
-         * CDLTASUKIGAP(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLTASUKIGAP(Records: botvs.Record[]): number[];
-        /**
-         * Tasuki Gap (K线图:翼隙)
-         *
-         * CDLTASUKIGAP(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLTASUKIGAP(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Thrusting Pattern (K线图:推模�)
-         *
-         * CDLTHRUSTING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLTHRUSTING(Records: botvs.Record[]): number[];
-        /**
-         * Thrusting Pattern (K线图:推模�)
-         *
-         * CDLTHRUSTING(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLTHRUSTING(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Tristar Pattern (K线图:三星模�)
-         *
-         * CDLTRISTAR(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLTRISTAR(Records: botvs.Record[]): number[];
-        /**
-         * Tristar Pattern (K线图:三星模�)
-         *
-         * CDLTRISTAR(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLTRISTAR(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Unique 3 River (K线图:独特的3河)
-         *
-         * CDLUNIQUE3RIVER(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLUNIQUE3RIVER(Records: botvs.Record[]): number[];
-        /**
-         * Unique 3 River (K线图:独特的3河)
-         *
-         * CDLUNIQUE3RIVER(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLUNIQUE3RIVER(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Upside Gap Two Crows (K线图:�飞乌鸦)
-         *
-         * CDLUPSIDEGAP2CROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLUPSIDEGAP2CROWS(Records: botvs.Record[]): number[];
-        /**
-         * Upside Gap Two Crows (K线图:�飞乌鸦)
-         *
-         * CDLUPSIDEGAP2CROWS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLUPSIDEGAP2CROWS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Upside/Downside Gap Three Methods (K线图:上行/下行缺�三方法)
-         *
-         * CDLXSIDEGAP3METHODS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function CDLXSIDEGAP3METHODS(Records: botvs.Record[]): number[];
-        /**
-         * Upside/Downside Gap Three Methods (K线图:上行/下行缺�三方法)
-         *
-         * CDLXSIDEGAP3METHODS(Records[Open,High,Low,Close]) = Array(outInteger)
-         *
-         * @param {number[]} Open
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function CDLXSIDEGAP3METHODS(Open: number[], High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Vector Ceil (�整函数)
-         *
-         * CEIL(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function CEIL(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Chande Momentum Oscillator (钱德动�摆动指标)
-         *
-         * CMO(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function CMO(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Vector Trigonometric Cos (余弦函数)
-         *
-         * COS(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function COS(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Vector Trigonometric Cosh (�曲余弦值)
-         *
-         * COSH(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function COSH(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Double Exponential Moving Average (�指数移动平�线)
-         *
-         * DEMA(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function DEMA(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Directional Movement Index (动�指数)
-         *
-         * DX(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function DX(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Directional Movement Index (动�指数)
-         *
-         * DX(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function DX(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Exponential Moving Average (指数移动平�线)
-         *
-         * EMA(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function EMA(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Vector Arithmetic Exp (指数函数)
-         *
-         * EXP(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function EXP(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Vector Floor (�下�整)
-         *
-         * FLOOR(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function FLOOR(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Hilbert Transform - Dominant Cycle Period (希尔伯特��, 主周期)
-         *
-         * HT_DCPERIOD(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function HT_DCPERIOD(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Hilbert Transform - Dominant Cycle Phase (希尔伯特��,主阶段)
-         *
-         * HT_DCPHASE(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function HT_DCPHASE(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Hilbert Transform - Phasor Components (希尔伯特��,相�分)
-         *
-         * HT_PHASOR(Records[Close]) = [Array(outInPhase),Array(outQuadrature)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {[number[], number[]]}
-         */
-        function HT_PHASOR(Records: botvs.Record[] | number[]): [number[], number[]];
-
-        /**
-         * Hilbert Transform - SineWave (希尔伯特��,正弦波)
-         *
-         * HT_SINE(Records[Close]) = [Array(outSine),Array(outLeadSine)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {[number[], number[]]}
-         */
-        function HT_SINE(Records: botvs.Record[] | number[]): [number[], number[]];
-
-        /**
-         * Hilbert Transform - Instantaneous Trendline (希尔伯特��,瞬时趋势)
-         *
-         * HT_TRENDLINE(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function HT_TRENDLINE(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Hilbert Transform - Trend vs Cycle Mode (希尔伯特��-趋势与周期模�)
-         *
-         * HT_TRENDMODE(Records[Close]) = Array(outInteger)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function HT_TRENDMODE(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Kaufman Adaptive Moving Average (适应性移动平�线)
-         *
-         * KAMA(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function KAMA(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Linear Regression (线性回归)
-         *
-         * LINEARREG(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function LINEARREG(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Linear Regression Angle (线性回归的角度)
-         *
-         * LINEARREG_ANGLE(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function LINEARREG_ANGLE(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Linear Regression Intercept (线性回归截�)
-         *
-         * LINEARREG_INTERCEPT(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function LINEARREG_INTERCEPT(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Linear Regression Slope (线性回归斜率)
-         *
-         * LINEARREG_SLOPE(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function LINEARREG_SLOPE(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Vector Log Natural (自然对数)
-         *
-         * LN(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function LN(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Vector Log10 (对数函数)
-         *
-         * LOG10(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function LOG10(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Moving average (移动平�线)
-         *
-         * MA(Records[Close],Time Period = 30,MA Type = 0) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @param {number=0} MAType
-         * @return {number[]}
-         */
-        function MA(Records: botvs.Record[] | number[], TimePeriod: number, MAType: number): number[];
-
-        /**
-         * Moving Average Convergence/Divergence (指数平滑移动平�线)
-         *
-         * MACD(Records[Close],Fast Period = 12,Slow Period = 26,Signal Period = 9) =
-         * [Array(outMACD),Array(outMACDSignal),Array(outMACDHist)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=12} FastPeriod
-         * @param {number=26} SlowPeriod
-         * @param {number=9} SignalPeriod
-         * @return {[number[], number[], number[]]}
-         */
-        function MACD(
-            Records: botvs.Record[] | number[],
-            FastPeriod: number,
-            SlowPeriod: number,
-            SignalPeriod: number,
-        ): [number[], number[], number[]];
-
-        /**
-         * MACD with controllable MA type (MA型�控 MACD)
-         *
-         * MACDEXT(Records[Close],Fast Period = 12,Fast MA = 0,Slow Period = 26,Slow MA = 0,Signal Period = 9,Signal MA
-         * =
-         * 0) = [Array(outMACD),Array(outMACDSignal),Array(outMACDHist)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=12} FastPeriod
-         * @param {number=0} FastMA
-         * @param {number=26} SlowPeriod
-         * @param {number=0} SlowMA
-         * @param {number=9} SignalPeriod
-         * @param {number=0} SignalMA
-         * @return {[number[], number[], number[]]}
-         */
-        function MACDEXT(
-            Records: botvs.Record[] | number[],
-            FastPeriod: number,
-            FastMA: number,
-            SlowPeriod: number,
-            SlowMA: number,
-            SignalPeriod: number,
-            SignalMA: number,
-        ): [number[], number[], number[]];
-
-        /**
-         * Moving Average Convergence/Divergence Fix 12/26 (移动平�收敛/�散修�12/26)
-         *
-         * MACDFIX(Records[Close],Signal Period = 9) = [Array(outMACD),Array(outMACDSignal),Array(outMACDHist)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=9} SignalPeriod
-         * @return {[number[], number[], number[]]}
-         */
-        function MACDFIX(Records: botvs.Record[] | number[], SignalPeriod: number): [number[], number[], number[]];
-
-        /**
-         * MESA Adaptive Moving Average (MESA 移动平�线)
-         *
-         * MAMA(Records[Close],Fast Limit = 0.5,Slow Limit = 0.05) = [Array(outMAMA),Array(outFAMA)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=0.5} FastLimit
-         * @param {number=0.05} SlowLimit
-         * @return {[number[], number[]]}
-         */
-        function MAMA(Records: botvs.Record[] | number[], FastLimit: number, SlowLimit: number): [number[], number[]];
-
-        /**
-         * Highest value over a specified period (最大值)
-         *
-         * MAX(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function MAX(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Index of highest value over a specified period (最大值索引)
-         *
-         * MAXINDEX(Records[Close],Time Period = 30) = Array(outInteger)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function MAXINDEX(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Median Price (中�数价格)
-         *
-         * MEDPRICE(Records[High,Low]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function MEDPRICE(Records: botvs.Record[]): number[];
-        /**
-         * Median Price (中�数价格)
-         *
-         * MEDPRICE(Records[High,Low]) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @return {number[]}
-         */
-        function MEDPRICE(High: number[], Low: number[]): number[];
-
-        /**
-         * Money Flow Index (货���指数)
-         *
-         * MFI(Records[High,Low,Close,Volume],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MFI(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Money Flow Index (货���指数)
-         *
-         * MFI(Records[High,Low,Close,Volume],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number[]} Volume
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MFI(High: number[], Low: number[], Close: number[], Volume: number[], TimePeriod: number): number[];
-
-        /**
-         * MidPoint over period (中点)
-         *
-         * MIDPOINT(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MIDPOINT(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Midpoint Price over period (中点价格)
-         *
-         * MIDPRICE(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MIDPRICE(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Midpoint Price over period (中点价格)
-         *
-         * MIDPRICE(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MIDPRICE(High: number[], Low: number[], TimePeriod: number): number[];
-
-        /**
-         * Lowest value over a specified period (最�值)
-         *
-         * MIN(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function MIN(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Index of lowest value over a specified period (最�值索引)
-         *
-         * MININDEX(Records[Close],Time Period = 30) = Array(outInteger)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function MININDEX(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Lowest and highest values over a specified period (最�最大值)
-         *
-         * MINMAX(Records[Close],Time Period = 30) = [Array(outMin),Array(outMax)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {[number[], number[]]}
-         */
-        function MINMAX(Records: botvs.Record[] | number[], TimePeriod: number): [number[], number[]];
-
-        /**
-         * Indexes of lowest and highest values over a specified period (最�最大值索引)
-         *
-         * MINMAXINDEX(Records[Close],Time Period = 30) = [Array(outMinIdx),Array(outMaxIdx)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {[number[], number[]]}
-         */
-        function MINMAXINDEX(Records: botvs.Record[] | number[], TimePeriod: number): [number[], number[]];
-
-        /**
-         * Minus Directional Indicator (负�指标)
-         *
-         * MINUS_DI(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MINUS_DI(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Minus Directional Indicator (负�指标)
-         *
-         * MINUS_DI(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MINUS_DI(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Minus Directional Movement (负��动)
-         *
-         * MINUS_DM(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MINUS_DM(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Minus Directional Movement (负��动)
-         *
-         * MINUS_DM(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function MINUS_DM(High: number[], Low: number[], TimePeriod: number): number[];
-
-        /**
-         * Momentum (动�)
-         *
-         * MOM(Records[Close],Time Period = 10) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=10} TimePeriod
-         * @return {number[]}
-         */
-        function MOM(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Normalized Average True Range (归一化平�值范围)
-         *
-         * NATR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function NATR(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Normalized Average True Range (归一化平�值范围)
-         *
-         * NATR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function NATR(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * On Balance Volume (能�潮)
-         *
-         * OBV(Records[Close],Records[Volume]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function OBV(Records: botvs.Record[]): number[];
-
-        /**
-         * On Balance Volume (能�潮)
-         *
-         * OBV(Records[Close],Records[Volume]) = Array(outReal)
-         *
-         * @param {number[]} Close
-         * @param {number[]} Volume
-         * @return {number[]}
-         */
-        function OBV(Close: number[], Volume: number[]): number[];
-
-        /**
-         * Plus Directional Indicator (更�指示器)
-         *
-         * PLUS_DI(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function PLUS_DI(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Plus Directional Indicator (更�指示器)
-         *
-         * PLUS_DI(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function PLUS_DI(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Plus Directional Movement (定��动)
-         *
-         * PLUS_DM(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function PLUS_DM(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Plus Directional Movement (定��动)
-         *
-         * PLUS_DM(Records[High,Low],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function PLUS_DM(High: number[], Low: number[], TimePeriod: number): number[];
-
-        /**
-         * Percentage Price Oscillator (价格振�百分比)
-         *
-         * PPO(Records[Close],Fast Period = 12,Slow Period = 26,MA Type = 0) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=12} FastPeriod
-         * @param {number=26} SlowPeriod
-         * @param {number=0} MAType
-         * @return {number[]}
-         */
-        function PPO(
-            Records: botvs.Record[] | number[],
-            FastPeriod: number,
-            SlowPeriod: number,
-            MAType: number,
-        ): number[];
-
-        /**
-         * Rate of change : ((price/prevPrice)-1)*100 (�动率指标)
-         *
-         * ROC(Records[Close],Time Period = 10) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=10} TimePeriod
-         * @return {number[]}
-         */
-        function ROC(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Rate of change Percentage: (price-prevPrice)/prevPrice (价格�化率)
-         *
-         * ROCP(Records[Close],Time Period = 10) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=10} TimePeriod
-         * @return {number[]}
-         */
-        function ROCP(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Rate of change ratio: (price/prevPrice) (价格�化率)
-         *
-         * ROCR(Records[Close],Time Period = 10) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=10} TimePeriod
-         * @return {number[]}
-         */
-        function ROCR(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Rate of change ratio 100 scale: (price/prevPrice)*100 (价格�化率)
-         *
-         * ROCR100(Records[Close],Time Period = 10) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=10} TimePeriod
-         * @return {number[]}
-         */
-        function ROCR100(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Relative Strength Index (相对强弱指标)
-         *
-         * RSI(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function RSI(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Parabolic SAR (抛物线转�)
-         *
-         * SAR(Records[High,Low],Acceleration Factor = 0.02,AF Maximum = 0.2) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0.02} AccelerationFactor
-         * @param {number=0.2} AFMaximum
-         * @return {number[]}
-         */
-        function SAR(Records: botvs.Record[], AccelerationFactor: number, AFMaximum: number): number[];
-        /**
-         * Parabolic SAR (抛物线转�)
-         *
-         * SAR(Records[High,Low],Acceleration Factor = 0.02,AF Maximum = 0.2) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number=0.02} AccelerationFactor
-         * @param {number=0.2} AFMaximum
-         * @return {number[]}
-         */
-        function SAR(High: number[], Low: number[], AccelerationFactor: number, AFMaximum: number): number[];
-
-        /**
-         * Parabolic SAR - Extended (增强型抛物线转�)
-         *
-         * SAREXT(Records[High,Low],Start Value = 0,Offset on Reverse = 0,AF Init Long = 0.02,AF Long = 0.02,AF Max
-         * Long =
-         * 0.2,AF Init Short = 0.02,AF Short = 0.02,AF Max Short = 0.2) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=0} StartValue
-         * @param {number=0} OffsetonReverse
-         * @param {number=0.02} AFInitLong
-         * @param {number=0.02} AFLong
-         * @param {number=0.2} AFMaxLong
-         * @param {number=0.02} AFInitShort
-         * @param {number=0.02} AFShort
-         * @param {number=0.2} AFMaxShort
-         * @return {number[]}
-         */
-        function SAREXT(
-            Records: botvs.Record[],
-            StartValue: number,
-            OffsetonReverse: number,
-            AFInitLong: number,
-            AFLong: number,
-            AFMaxLong: number,
-            AFInitShort: number,
-            AFShort: number,
-            AFMaxShort: number,
-        ): number[];
-        /**
-         * Parabolic SAR - Extended (增强型抛物线转�)
-         *
-         * SAREXT(Records[High,Low],Start Value = 0,Offset on Reverse = 0,AF Init Long = 0.02,AF Long = 0.02,AF Max
-         * Long =
-         * 0.2,AF Init Short = 0.02,AF Short = 0.02,AF Max Short = 0.2) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number=0} StartValue
-         * @param {number=0} OffsetonReverse
-         * @param {number=0.02} AFInitLong
-         * @param {number=0.02} AFLong
-         * @param {number=0.2} AFMaxLong
-         * @param {number=0.02} AFInitShort
-         * @param {number=0.02} AFShort
-         * @param {number=0.2} AFMaxShort
-         * @return {number[]}
-         */
-        function SAREXT(
-            High: number[],
-            Low: number[],
-            StartValue: number,
-            OffsetonReverse: number,
-            AFInitLong: number,
-            AFLong: number,
-            AFMaxLong: number,
-            AFInitShort: number,
-            AFShort: number,
-            AFMaxShort: number,
-        ): number[];
-
-        /**
-         * Vector Trigonometric Sin (正弦值)
-         *
-         * SIN(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function SIN(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Vector Trigonometric Sinh (�曲正弦函数)
-         *
-         * SINH(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function SINH(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Simple Moving Average (简�移动平�)
-         *
-         * SMA(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function SMA(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Vector Square Root (平方根)
-         *
-         * SQRT(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function SQRT(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Standard Deviation (标准�差)
-         *
-         * STDDEV(Records[Close],Time Period = 5,Deviations = 1) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=5} TimePeriod
-         * @param {number=1} Deviations
-         * @return {number[]}
-         */
-        function STDDEV(Records: botvs.Record[] | number[], TimePeriod: number, Deviations: number): number[];
-
-        /**
-         * Stochastic (STOCH指标)
-         *
-         * STOCH(Records[High,Low,Close],Fast-K Period = 5,Slow-K Period = 3,Slow-K MA = 0,Slow-D Period = 3,Slow-D MA
-         * = 0)
-         * = [Array(outSlowK),Array(outSlowD)]
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=5} Fast_KPeriod
-         * @param {number=3} Slow_KPeriod
-         * @param {number=0} Slow_KMA
-         * @param {number=3} Slow_DPeriod
-         * @param {number=0} Slow_DMA
-         * @return {[number[], number[]]}
-         */
-        function STOCH(
-            Records: botvs.Record[],
-            Fast_KPeriod: number,
-            Slow_KPeriod: number,
-            Slow_KMA: number,
-            Slow_DPeriod: number,
-            Slow_DMA: number,
-        ): [number[], number[]];
-        /**
-         * Stochastic (STOCH指标)
-         *
-         * STOCH(Records[High,Low,Close],Fast-K Period = 5,Slow-K Period = 3,Slow-K MA = 0,Slow-D Period = 3,Slow-D MA
-         * = 0)
-         * = [Array(outSlowK),Array(outSlowD)]
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=5} Fast_KPeriod
-         * @param {number=3} Slow_KPeriod
-         * @param {number=0} Slow_KMA
-         * @param {number=3} Slow_DPeriod
-         * @param {number=0} Slow_DMA
-         * @return {[number[], number[]]}
-         */
-        function STOCH(
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Fast_KPeriod: number,
-            Slow_KPeriod: number,
-            Slow_KMA: number,
-            Slow_DPeriod: number,
-            Slow_DMA: number,
-        ): [number[], number[]];
-
-        /**
-         * Stochastic Fast (快速STOCH指标)
-         *
-         * STOCHF(Records[High,Low,Close],Fast-K Period = 5,Fast-D Period = 3,Fast-D MA = 0) =
-         * [Array(outFastK),Array(outFastD)]
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=5} Fast_KPeriod
-         * @param {number=3} Fast_DPeriod
-         * @param {number=0} Fast_DMA
-         * @return {[number[], number[]]}
-         */
-        function STOCHF(
-            Records: botvs.Record[],
-            Fast_KPeriod: number,
-            Fast_DPeriod: number,
-            Fast_DMA: number,
-        ): [number[], number[]];
-        /**
-         * Stochastic Fast (快速STOCH指标)
-         *
-         * STOCHF(Records[High,Low,Close],Fast-K Period = 5,Fast-D Period = 3,Fast-D MA = 0) =
-         * [Array(outFastK),Array(outFastD)]
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=5} Fast_KPeriod
-         * @param {number=3} Fast_DPeriod
-         * @param {number=0} Fast_DMA
-         * @return {[number[], number[]]}
-         */
-        function STOCHF(
-            High: number[],
-            Low: number[],
-            Close: number[],
-            Fast_KPeriod: number,
-            Fast_DPeriod: number,
-            Fast_DMA: number,
-        ): [number[], number[]];
-
-        /**
-         * Stochastic Relative Strength Index (�机强弱指数)
-         *
-         * STOCHRSI(Records[Close],Time Period = 14,Fast-K Period = 5,Fast-D Period = 3,Fast-D MA = 0) =
-         * [Array(outFastK),Array(outFastD)]
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @param {number=5} Fast_KPeriod
-         * @param {number=3} Fast_DPeriod
-         * @param {number=0} Fast_DMA
-         * @return {[number[], number[]]}
-         */
-        function STOCHRSI(
-            Records: botvs.Record[] | number[],
-            TimePeriod: number,
-            Fast_KPeriod: number,
-            Fast_DPeriod: number,
-            Fast_DMA: number,
-        ): [number[], number[]];
-
-        /**
-         * Summation (求和)
-         *
-         * SUM(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function SUM(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Triple Exponential Moving Average (T3) (三指数移动平�)
-         *
-         * T3(Records[Close],Time Period = 5,Volume Factor = 0.7) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=5} TimePeriod
-         * @param {number=0.7} VolumeFactor
-         * @return {number[]}
-         */
-        function T3(Records: botvs.Record[] | number[], TimePeriod: number, VolumeFactor: number): number[];
-
-        /**
-         * Vector Trigonometric Tan (正切)
-         *
-         * TAN(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function TAN(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Vector Trigonometric Tanh (�曲正切函数)
-         *
-         * TANH(Records[Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @return {number[]}
-         */
-        function TANH(Records: botvs.Record[] | number[]): number[];
-
-        /**
-         * Triple Exponential Moving Average (三指数移动平�)
-         *
-         * TEMA(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function TEMA(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * True Range (真实范围)
-         *
-         * TRANGE(Records[High,Low,Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function TRANGE(Records: botvs.Record[]): number[];
-        /**
-         * True Range (真实范围)
-         *
-         * TRANGE(Records[High,Low,Close]) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function TRANGE(High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Triangular Moving Average (三指数移动平�)
-         *
-         * TRIMA(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function TRIMA(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * 1-day Rate-Of-Change (ROC) of a Triple Smooth EMA (三�指数平滑平�线)
-         *
-         * TRIX(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function TRIX(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Time Series Forecast (时间�列预测)
-         *
-         * TSF(Records[Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function TSF(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-
-        /**
-         * Typical Price (典型价格)
-         *
-         * TYPPRICE(Records[High,Low,Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function TYPPRICE(Records: botvs.Record[]): number[];
-        /**
-         * Typical Price (典型价格)
-         *
-         * TYPPRICE(Records[High,Low,Close]) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function TYPPRICE(High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Ultimate Oscillator (��振�)
-         *
-         * ULTOSC(Records[High,Low,Close],First Period = 7,Second Period = 14,Third Period = 28) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=7} FirstPeriod
-         * @param {number=14} SecondPeriod
-         * @param {number=28} ThirdPeriod
-         * @return {number[]}
-         */
-        function ULTOSC(
-            Records: botvs.Record[],
-            FirstPeriod: number,
-            SecondPeriod: number,
-            ThirdPeriod: number,
-        ): number[];
-        /**
-         * Ultimate Oscillator (��振�)
-         *
-         * ULTOSC(Records[High,Low,Close],First Period = 7,Second Period = 14,Third Period = 28) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=7} FirstPeriod
-         * @param {number=14} SecondPeriod
-         * @param {number=28} ThirdPeriod
-         * @return {number[]}
-         */
-        function ULTOSC(
-            High: number[],
-            Low: number[],
-            Close: number[],
-            FirstPeriod: number,
-            SecondPeriod: number,
-            ThirdPeriod: number,
-        ): number[];
-
-        /**
-         * Variance (��定义)
-         *
-         * VAR(Records[Close],Time Period = 5,Deviations = 1) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=5} TimePeriod
-         * @param {number=1} Deviations
-         * @return {number[]}
-         */
-        function VAR(Records: botvs.Record[] | number[], TimePeriod: number, Deviations: number): number[];
-
-        /**
-         * Weighted Close Price (加�收盘价)
-         *
-         * WCLPRICE(Records[High,Low,Close]) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @return {number[]}
-         */
-        function WCLPRICE(Records: botvs.Record[]): number[];
-        /**
-         * Weighted Close Price (加�收盘价)
-         *
-         * WCLPRICE(Records[High,Low,Close]) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @return {number[]}
-         */
-        function WCLPRICE(High: number[], Low: number[], Close: number[]): number[];
-
-        /**
-         * Williams' %R (�廉指标)
-         *
-         * WILLR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {botvs.Record[]} Records
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function WILLR(Records: botvs.Record[], TimePeriod: number): number[];
-        /**
-         * Williams' %R (�廉指标)
-         *
-         * WILLR(Records[High,Low,Close],Time Period = 14) = Array(outReal)
-         *
-         * @param {number[]} High
-         * @param {number[]} Low
-         * @param {number[]} Close
-         * @param {number=14} TimePeriod
-         * @return {number[]}
-         */
-        function WILLR(High: number[], Low: number[], Close: number[], TimePeriod: number): number[];
-
-        /**
-         * Weighted Moving Average (加�移动平�)
-         *
-         * WMA(Records[Close],Time Period = 30) = Array(outReal)
-         *
-         * @param {botvs.Record[]|number[]} Records
-         * @param {number=30} TimePeriod
-         * @return {number[]}
-         */
-        function WMA(Records: botvs.Record[] | number[], TimePeriod: number): number[];
-    }
-
-    /**
-     * 订�的状�: 未完�
-     */
-    const ORDER_STATE_PENDING: botvs.VOrderState;
-
-    /**
-     * 订�的状�: 已关闭
-     */
-    const ORDER_STATE_CLOSED: botvs.VOrderState;
-
-    /**
-     * 订�的状�: 已�消
-     */
-    const ORDER_STATE_CANCELED: botvs.VOrderState;
-
-    /**
-     * 订�的类型: 买�
-     */
-    const ORDER_TYPE_BUY: botvs.VOrderType;
-
-    /**
-     * 订�的类型: ��
-     */
-    const ORDER_TYPE_SELL: botvs.VOrderType;
-
-    /**
-     * 多头仓�(CTP中用closebuy_today平仓)
-     */
-    const PD_LONG: botvs.VPositionType;
-
-    /**
-     * 空头仓�(CTP用closesell_today)平仓
-     */
-    const PD_SHORT: botvs.VPositionType;
-
-    /**
-     * (CTP期货中)PD_LONG_YD为咋日多头仓�(用closebuy平
-     */
-    const PD_LONG_YD: botvs.VPositionType;
-
-    /**
-     * 咋日空头仓�(用closesell平)
-     */
-    const PD_SHORT_YD: botvs.VPositionType;
-
-    /**
-     * 1分钟
-     */
-    const PERIOD_M1: botvs.VPeriod;
-
-    /**
-     * 5分钟
-     */
-    const PERIOD_M5: botvs.VPeriod;
-
-    /**
-     * 15分钟
-     */
-    const PERIOD_M15: botvs.VPeriod;
-
-    /**
-     * 30分钟
-     */
-    const PERIOD_M30: botvs.VPeriod;
-
-    /**
-     * 1�时
-     */
-    const PERIOD_H1: botvs.VPeriod;
-
-    /**
-     * 1天
-     */
-    const PERIOD_D1: botvs.VPeriod;
-
-    /**
-     * 买�日志
-     */
-    const LOG_TYPE_BUY: botvs.VLogType;
-
-    /**
-     * ��日志
-     */
-    const LOG_TYPE_SELL: botvs.VLogType;
-
-    /**
-     * �消日志
-     */
-    const LOG_TYPE_CANCEL: botvs.VLogType;
-
-    /**
-     * 默认主交易所对�, 添加交易平�时排列第一的交易所
-     */
-    const exchange: botvs.Exchange;
-
-    /**
-     * 交易所数组, 如果添加多个交易所, �以访问此��获�交易所对�
-     */
-    const exchanges: botvs.Exchange[];
-
-    /**
-     * �存一�信�到日志列表
-     *
-     * 如果在字符串��加上@字符则消�会进入推�队列, 推�到使用绑定的微信账�上(账户安全里绑定)(50�/�时, 1�/5秒 �制)
-     * 如: Log("微信你好 !@"); 或Log("微信你好, #ff0000@");
-     * Log支�打�base64编��的图片, 以"`"开头, 以"`"结尾, 如Log("`data:image/png;base64,AAAA`")
-     * Log支�直接打�Python的matplotlib.pyplot对象, ��对象包�savefig方法就�以直接Log打�, 如:
-     * import matplotlib.pyplot as plt
-     * def main():
-     * plt.plot([3,6,2,4,7,1])
-     * Log(plt)
-     *
-     * @param {string} arg
-     */
-    function Log(arg: string): void;
-
-    /**
-     * 休眠函数
-     *
-     * �数为毫秒数,如Sleep(1000)为休眠一秒
-     *
-     * @param {number} Millisecond
-     */
-    function Sleep(Millisecond: number): void;
-
-    /**
-     * 判断是�是模拟回测
-     *
-     * 模拟回测状�返回true,实盘返回false
-     *
-     * @return {boolean}
-     */
-    function IsVirtual(): boolean;
-
-    /**
-     * 记录盈利值,这个为总盈利的值,�数类型为浮点数
-     *
-     * @param {number} Profit
-     */
-    function LogProfit(Profit: number): void;
-
-    /**
-     * 清空所有收益日志, �以带一个数字�数, 指定�留的�数
-     *
-     * @param {number} reserve
-     */
-    function LogProfitReset(reserve?: number): void;
-
-    /**
-     * 清空所有日志, �以带一个数字�数, 指定�留的�数
-     *
-     * @param {number} reserve
-     */
-    function LogReset(reserve?: number): void;
-
-    /**
-     * 此信���存到日志列表里, �更新当�机器人的状�信�, 在日志上方显示, �多次调用, 更新状�
-     *
-     * * LogStatus('这是一个普通的状��示');
-     * LogStatus('这是一个红色字体的状��示 #ff0000');
-     * LogStatus('这是一个多行的状�信�\n我是第二行');
-     * LogStatus支�打�base64编��的图片, 以"`"开头, 以"`"结尾, 如LogStatus("`data:image/png;base64,AAAA`")
-     * LogStatus支�直接传入Python的matplotlib.pyplot对象, ��对象包�savefig方法就�以传入LogStatus, 如:
-     * import matplotlib.pyplot as plt
-     * def main():
-     * plt.plot([3,6,2,4,7,1])
-     * LogStatus(plt)
-     * var table = {type: 'table', title: '�仓信�', cols: ['列1', '列2'], rows: [ ['abc', 'def'], ['ABC', 'support color
-     * #ff0000']]}; LogStatus('`' + JSON.stringify(table)+'`'); // JSON�列化�两边加上`字符, 视为一个��消�格�(当�支�表格)
-     * LogStatus('第一行消�\n`' + JSON.stringify(table)+'`\n第三行消�');
-     * // 表格信�也�以在多行中出现 LogStatus('`' + JSON.stringify([table,
-     * table])+'`'); // 支�多个表格�时显示, 将以TAB显示到一组里
-     * // 也�以构造一个按钮在表格中, 策略用GetCommand接收cmd属性的内容
-     * var table = {
-     *  type: 'table',
-     *  title: '�仓�作',
-     *  cols: ['列1', '列2', 'Action'],
-     *  rows: [
-     *      ['abc', 'def', {'type':'button', 'cmd': 'coverAll', 'name': '平仓'}],
-     *  ]
-     * };
-     * LogStatus('`' + JSON.stringify(table) + '`')
-     * // 或者构造一�独的按钮
-     * LogStatus('`' + JSON.stringify({'type':'button', 'cmd': 'coverAll', 'name': '平仓'}) + '`')
-     * // �以自定义按钮风格(bootstrap的按钮属性)
-     * LogStatus('`' + JSON.stringify({'type':'button', 'class': 'btn btn-xs btn-danger', 'cmd': 'coverAll', 'name':
-     * '平仓'}) + '`')
-     *
-     * @param {string} Msg
-     */
-    function LogStatus(Msg: string): void;
-
-    /**
-     * 打开或者关闭定�和出错信�的日志记录
-     *
-     * @param {boolean} IsEnable
-     */
-    function EnableLog(IsEnable: boolean): void;
-
-    /**
-     * 图表绘图函数
-     *
-     * �数为�以JSON�列化的HighStocks的Highcharts.StockChart�数, 比原生的�数增加一个
-     * __isStock属性, 如果指定__isStock: false, 则显示为普通图表
-     * 返回对��以调用add([series索引(如0), 数�])�指定索引的series添加数�, 调用reset()
-     * 清空图表数�, reset�以带一个数字�数, 指定�留的�数
-     * �以调用add([series索引(如0), 数�, 此数�在series中的索引])�更改数�
-     * �以为负数, -1指最�一个, -2是倒数第二个, 如:
-     * chart.add([0, 13.5, -1]), 更改series[0].data的倒数第一个点的数�
-     * 支�显示多个图表, �置时�需传入数组�数��如: var chart = Chart([{...}, {...}, {...}]),
-     * 比如图表一有两个series, 图表二有一个series, 图表三有一个series,
-     * 那么add时指定0与1�列ID代表更新图表1的两个�列的数�, add时指定�列ID为2指图表2的第一个
-     * series的数�, 指定�列3指的是图表3的第一个series的数� HighStocks:
-     * http://api.highcharts.com/highstock
-     *
-     * @param {botvs.ChartOptions} options
-     * @return {botvs.RChart}
-     */
-    function Chart(...options: botvs.ChartOptions[]): botvs.RChart;
-
-    /**
-     * ��邮件函数
-     *
-     * Mail(smtpServer, smtpUsername, smtpPassword, mailTo, title, body); ret true or false
-     * Mail("smtp.163.com", "asdf@163.com", "password", "111@163.com", "title", "body")
-     *
-     * @param {string} smtpServer
-     * @param {string} smtpUsername
-     * @param {string} smtpPassword
-     * @param {string} mailTo
-     * @param {string} title
-     * @param {string} body
-     * @return {boolean}
-     */
-    function Mail(
-        smtpServer: string,
-        smtpUsername: string,
-        smtpPassword: string,
-        mailTo: string,
-        title: string,
-        body: string,
-    ): boolean;
-
-    /**
-     * 错误信�过滤
-     *
-     * 被此正则表达�匹�的错误将�上传到日志系统, �多次调用设置多个
-     * SetErrorFilter("502:|503:|tcp|character|unexpected|network|timeout|WSARecv|Connect|GetAddr|no
-     * such|reset|http|received|EOF|reused");
-     *
-     * @param {string} RegEx
-     */
-    function SetErrorFilter(RegEx: string): void;
-
-    /**
-     * 返回机器人进程ID
-     *
-     * @return {number}
-     */
-    function GetPid(): number;
-
-    /**
-     * 获�最近一次出错信�,一般无需使用,因为程�会把出错信�自动上传到日志系统
-     *
-     * @return {string}
-     */
-    function GetLastError(): string;
-
-    /**
-     * ��存的全局字典表
-     *
-     * KV表, 永久�存在本地文件, �个机器人�独一个数�库, ��或者托管者退出�一直存在
-     * K必须为数字或者字符串, �区分大�写, V�以为任何�以JSON�列化的内容
-     * _G("num", 1); // 设置一个全局��num, 值为1
-     * _G("num", "ok"); // 更改一个全局��num, 值为字符串ok
-     * _G("num", null); // 删除全局�� num
-     * _G("num"); // 返回全局��num的值
-     * _G(); // 返回当�机器人的ID
-     * _G(null); // 删除所有全局��
-     *
-     * @param {string} K
-     * @param {T} V
-     */
-    function _G<T>(K: string, V: T): void;
-
-    /**
-     * 获�交互命令(utf-8)
-     *
-     * 获�策略交互界���的命令并清空, 没有命令则返回null, 返回的命令格�为 "按钮�称:�数", 如果没有�数, 则命令就是按钮�称
-     * while (true) {
-     * var cmd = GetCommand();
-     * if (cmd) {
-     *   Log(cmd);
-     * }
-     * Sleep(1000);
-     * }
-     *
-     * @return {string}
-     */
-    function GetCommand(): string | null;
-
-    /**
-     * 原始的Socket访问, 支�tcp, udp, tls, unix �议
-     *
-     * @example
-     *
-     * ```
-     * var client = Dial("tls://www.baidu.com:443"); // Dial支�tcp://, udp://, tls://, unix:// �议, �加一个�数指定超时的秒数
-     * if (client) {
-     *  client.write("GET / HTTP/1.1\nConnection: Closed\n\n"); // write��跟一个数字�数指定超时, write返回�功��的字节数
-     *  while (true) {
-     *      var buf = client.read();// read��跟一个数字�数指定超时, 返回null指出错或者超时或者socket已�关闭
-     *      if (!buf) {
-     *          break;
-     *      }
-     *      Log(buf);
-     *  }
-     *  client.close();
-     * }
-     * ```
-     *
-     * @param {string} Address
-     * @param {number} Timeout
-     * @return {botvs.Socket}
-     */
-    function Dial(Address: string, Timeout?: number): botvs.Socket | void;
-
-    /**
-     * 网络URL访问
-     *
-     * HttpQuery(Url, PostData, Cookies, Headers, IsReturnHeader)
-     * 获�一个Url的返回内容, 如果第二个�数PostData为字符串就以POST方��交
-     * 第二个�数PostData�以自定义方法比如HttpQuery('http://www.abc.com', {method:'PUT', data:'xx'})
-     * 传递Cookie字符串需�第三个�数, 但�需�POST请将第二个�数置为null
-     * 模拟测试的时候因为无法模拟访问URL, 函数就返回固定字符串 Dummy Data
-     * �以用此接���短信, 或者与其它API进行交互
-     * HttpQuery("http://www.baidu.com/"); // Get
-     * HttpQuery("http://www.163.com", "xxx"); // Post
-     * HttpQuery("http://www.baidu.com/", null, "a=10; b=20", "User-Agent: Mobile\nContent-Type: text/html", true);
-     * // will return {Header: HTTP Header, Body: HTML}
-     *
-     * @param {string} Url
-     * @param {string | null | {method: string; data?: string}} PostData
-     * @param {string} Cookies
-     * @param {string} Headers
-     * @return {string}
-     */
-    function HttpQuery(
-        Url: string,
-        PostData: string | null | { method: string, data?: string },
-        Cookies: string,
-        Headers: string,
-    ): string;
-    function HttpQuery(
-        Url: string,
-        PostData: string | null | { method: string, data?: string },
-        Cookies: string,
-        Headers: string,
-        IsReturnHeader: true,
-    ): { Header: string, Body: string };
-
-    /**
-     * 支� md5/sha256/sha512/sha1 的哈希计算, �支�实盘
-     *
-     * 第二个�数�设置为raw/hex/base64, 分别指输出加密�的 原始内容/hex编�过的/base64编�过的
-     * Log(Hash('md5', 'hex', 'hello'));
-     * Log(Hash('sha512', 'base64', 'hello'));
-     *
-     * @param {"md5" | "sha256" | "sha512" | "sha1"} Algo
-     * @param {"hex" | "base64"} OutputAlgo
-     * @param {string} Data
-     * @return {string}
-     */
-    function Hash(
-        Algo: 'md5' | 'sha256' | 'sha512' | 'sha1',
-        OutputAlgo: 'hex' | 'base64' | 'raw',
-        Data: string,
-    ): string;
-
-    /**
-     * 支� md5/sha256/sha512/sha1 的HMAC加密计算, �支�实盘
-     *
-     * 第二个�数�设置为raw/hex/base64, 分别指输出加密�的 原始内容/hex编�过的/base64编�过的
-     * Log(HMAC('md5', 'hex', 'hello', 'pass'));
-     * Log(HMAC('sha512', 'base64', 'hello', 'pass'));
-     *
-     * @param {"md5" | "sha256" | "sha512" | "sha1"} Algo
-     * @param {"hex" | "base64" | "raw"} OutputAlgo
-     * @param {string} Data
-     * @param {string} password
-     * @return {string}
-     */
-    function HMAC(
-        Algo: 'md5' | 'sha256' | 'sha512' | 'sha1',
-        OutputAlgo: 'hex' | 'base64' | 'raw',
-        Data: string,
-        password: string,
-    ): string;
-
-    /**
-     * 返回指定时间戳(ms)字符串, �传任何�数就返回当�时间,
-     * 如_D(),或者_D(1478570053241), 默认格�为yyyy-MM-dd hh:mm:ss
-     *
-     * @param {string} timestamp
-     * @param {string} format
-     * @return {string}
-     */
-    function _D(timestamp: string, format: string): string;
-
-    /**
-     * 格�化一个浮点函数
-     *
-     * @param {number} num
-     * @param {number=4} precision
-     * @return {string}
-     */
-    function _N(num: number, precision?: number): string;
-
-    /**
-     * �试函数, 会一直调用指定函数到�功返回(函数返回null或者false会�试),
-     * 比如_C(exchange.GetTicker), 默认�试间隔为3秒, �以调用_CDelay函数�控制�试间隔
-     * 比如_CDelay(1000), 指改�_C函数�试间隔为1秒
-     *
-     * @param {(...args: any[]) => T} func
-     * @param args
-     * @return {T}
-     */
-    function _C<T>(func: (...args: any[]) => T, ...args: any[]): T;
-
-    /**
-     * 比如_CDelay(1000), 指改�_C函数�试间隔为1秒, 默认为3秒
-     *
-     * @param {number} delay
-     */
-    function _CDelay(delay: number): void;
-}
diff --git a/types/botvs/tsconfig.json b/types/botvs/tsconfig.json
deleted file mode 100644
index 6ec444ef28..0000000000
--- a/types/botvs/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "botvs-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/botvs/tslint.json b/types/botvs/tslint.json
deleted file mode 100644
index 71ee04c4e1..0000000000
--- a/types/botvs/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-generics": false
-    }
-}
diff --git a/types/bounce.js/tslint.json b/types/bounce.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bounce.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bowser/bowser-tests.ts b/types/bowser/bowser-tests.ts
deleted file mode 100644
index 490d02a254..0000000000
--- a/types/bowser/bowser-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-bowser.msedge === true;
-bowser.test(['msie']) === true;
-bowser.a === bowser.c;
-bowser.osversion > 10;
-bowser.osversion === '10.1A';
-bowser.compareVersions(['9.0', '10']);
-
-bowser() === {android: true, x: true};
-bowser.check({msie: "11"}, window.navigator.userAgent);
-bowser.isUnsupportedBrowser({msie: "10"}, window.navigator.userAgent);
\ No newline at end of file
diff --git a/types/bowser/index.d.ts b/types/bowser/index.d.ts
deleted file mode 100644
index 163342a631..0000000000
--- a/types/bowser/index.d.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// Type definitions for Bowser 1.x
-// Project: https://github.com/ded/bowser
-// Definitions by: Paulo Cesar <https://github.com/pocesar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare const bowser: bowser.IBowser;
-export = bowser;
-export as namespace bowser;
-
-declare namespace bowser {
-
-    export interface IBowserOS {
-        mac: boolean;
-        /**other than Windows Phone */
-        windows: boolean;
-        windowsphone: boolean;
-        /**other than android, chromeos, webos, tizen, and sailfish */
-        linux: boolean;
-        chromeos: boolean;
-        android: boolean;
-        /** also sets one of iphone/ipad/ipod */
-        ios: boolean;
-        blackberry: boolean;
-        firefoxos: boolean;
-        /** may also set touchpad */
-        webos: boolean;
-        bada: boolean;
-        tizen: boolean;
-        sailfish: boolean;
-    }
-
-    export interface IBowserVersions {
-        chrome: boolean;
-        firefox: boolean;
-        msie: boolean;
-        msedge: boolean;
-        safari: boolean;
-        android: boolean;
-        ios: boolean;
-        opera: boolean;
-        phantom: boolean;
-        blackberry: boolean;
-        webos: boolean;
-        silk: boolean;
-        bada: boolean;
-        tizen: boolean;
-        seamonkey: boolean;
-        sailfish: boolean;
-        ucbrowser: boolean;
-        qupzilla: boolean;
-        vivaldi: boolean;
-        sleipnir: boolean;
-        kMeleon: boolean;
-    }
-
-    export interface IBowserEngines {
-        /** IE <= 11 */
-        msie: boolean;
-        /**Chrome 0-27, Android <4.4, iOs, BB, etc. */
-        webkit: boolean;
-        /**Chrome >=28, Android >=4.4, Opera, etc. */
-        blink: boolean;
-        /**Firefox, etc. */
-        gecko: boolean;
-        /** IE > 11 */
-        msedge: boolean;
-        /** If a tablet device is detected, the flag tablet is set instead of mobile. */
-        tablet: boolean;
-        /** All detected mobile OSes are additionally flagged mobile, unless it's a tablet */
-        mobile: boolean;
-
-    }
-
-    export interface IBowserGrade {
-        /** Grade A browser */
-        a: boolean;
-        /** Grade C browser */
-        c: boolean;
-        /** Grade X browser */
-        x: boolean;
-        /**A human readable name for this browser. E.g. 'Chrome', '' */
-        name: string;
-        /**Version number for the browser. E.g. '32.0' */
-        version: string|number;
-        osversion: string|number;
-    }
-
-    export interface IBowserDetection extends IBowserGrade, IBowserEngines, IBowserOS, IBowserVersions { }
-
-    export interface IBowserMinVersions {
-        // { msie: "11", "firefox": "4" }
-        [index: string]: string;
-    }
-
-    export interface IBowser extends IBowserDetection {
-        (): IBowserDetection;
-        test(browserList: string[]): boolean;
-        _detect(ua: string): IBowser;
-        compareVersions(versions: string[]): number;
-        check(minVersions: IBowserMinVersions, strictMode?: boolean|string, ua?: string): Boolean;
-        isUnsupportedBrowser(minVersions: IBowserMinVersions, strictMode?: boolean|string, ua?: string): boolean;
-    }
-
-}
diff --git a/types/bowser/tsconfig.json b/types/bowser/tsconfig.json
deleted file mode 100644
index 533b285bb0..0000000000
--- a/types/bowser/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "bowser-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/box2d/index.d.ts b/types/box2d/index.d.ts
index 77a132592e..d17eb2c8f6 100644
--- a/types/box2d/index.d.ts
+++ b/types/box2d/index.d.ts
@@ -5147,7 +5147,7 @@ declare namespace Box2D.Dynamics.Joints {
 	/**
 	* The pulley joint is connected to two bodies and two fixed ground points. The pulley supports a ratio such that: length1 + ratio length2 <= constant Yes, the force transmitted is scaled by the ratio. The pulley also enforces a maximum length limit on both sides. This is useful to prevent one side of the pulley hitting the top.
 	**/
-	export class b2PullyJoint extends b2Joint {
+	export class b2PulleyJoint extends b2Joint {
 
 		/**
 		* Get the anchor point on bodyA in world coordinates.
@@ -5207,7 +5207,7 @@ declare namespace Box2D.Dynamics.Joints {
 	/**
 	* Pulley joint definition. This requires two ground anchors, two dynamic body anchor points, max lengths for each side, and a pulley ratio.
 	**/
-	export class b2PullyJointDef extends b2JointDef {
+	export class b2PulleyJointDef extends b2JointDef {
 
 		/**
 		* The first ground anchor in world coordinates. This point never moves.
diff --git a/types/box2d/tslint.json b/types/box2d/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/box2d/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/braces/braces-tests.ts b/types/braces/braces-tests.ts
new file mode 100644
index 0000000000..f6a7ccd0ed
--- /dev/null
+++ b/types/braces/braces-tests.ts
@@ -0,0 +1,10 @@
+import braces = require("braces");
+
+const bracesOpts: braces.Options = {
+    expand: true,
+};
+
+let strArrResult: string[];
+
+strArrResult = braces.expand('a/{x,y,z}/b');
+strArrResult = braces('a/{x,y,z}/b', bracesOpts);
diff --git a/types/braces/index.d.ts b/types/braces/index.d.ts
new file mode 100644
index 0000000000..880738806e
--- /dev/null
+++ b/types/braces/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for braces 2.3
+// Project: https://github.com/micromatch/braces
+// Definitions by: vemoo <https://github.com/vemoo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace braces {
+    interface Options {
+        /**
+         * Generate an "expanded" brace pattern (this option is unncessary with the `.expand` method, which does the same thing).
+         *
+         * ```js
+         * console.log(braces('a/{b,c}/d', {expand: true}));
+         * //=> [ 'a/b/d', 'a/c/d' ]
+         * ```
+         *
+         * @default undefined
+         */
+        expand?: boolean;
+        /**
+         * Enabled by default.
+         *
+         * ```js
+         * console.log(braces('a/{b,c}/d'));
+         * //=> [ 'a/(b|c)/d' ]
+         * ```
+         *
+         * @default true
+         */
+        optimize?: boolean;
+        /**
+         * Duplicates are removed by default. To keep duplicates, pass `{nodupes: false}` on the options
+         *
+         * @default true
+         */
+        nodupes?: boolean;
+        /**
+         * When `braces.expand()` is used, or `options.expand` is true, brace patterns will automatically be [optimized](#optionsoptimize)
+         * when the difference between the range minimum and range maximum exceeds the `rangeLimit`.
+         * This is to prevent huge ranges from freezing your application.
+         *
+         * You can set this to any number, or change `options.rangeLimit` to `Inifinity` to disable this altogether.
+         *
+         * @default 250
+         *
+         * @example
+         * ```js
+         * // pattern exceeds the "rangeLimit", so it's optimized automatically
+         * console.log(braces.expand('{1..1000}'));
+         * //=> ['([1-9]|[1-9][0-9]{1,2}|1000)']
+         *
+         * // pattern does not exceed "rangeLimit", so it's NOT optimized
+         * console.log(braces.expand('{1..100}'));
+         * //=> ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11' ... '89', 90', '91', '92', '93', '94', '95', '96', '97', '98', '99', '100']
+         * ```
+         */
+        rangeLimit?: number;
+        /**
+         * Customize range expansion.
+         *
+         * ```js
+         * var range = braces.expand('x{a..e}y', {
+         *   transform: function(str) {
+         *     return 'foo' + str;
+         *   }
+         * });
+         *
+         * console.log(range);
+         * //=> [ 'xfooay', 'xfooby', 'xfoocy', 'xfoody', 'xfooey' ]
+         * ```
+         *
+         * @default undefined
+         */
+        transform?: (str: string) => string;
+        /**
+         * In regular expressions, quanitifiers can be used to specify how many times a token can be repeated. For example, `a{1,3}` will match the letter `a` one to three times.
+         *
+         * Unfortunately, regex quantifiers happen to share the same syntax as [Bash lists](#lists)
+         *
+         * The `quantifiers` option tells braces to detect when [regex quantifiers](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#quantifiers)
+         * are defined in the given pattern, and not to try to expand them as lists.
+         *
+         * @default undefined
+         *
+         * @example
+         * ```js
+         * var braces = require('braces');
+         * console.log(braces('a/b{1,3}/{x,y,z}'));
+         * //=> [ 'a/b(1|3)/(x|y|z)' ]
+         * console.log(braces('a/b{1,3}/{x,y,z}', {quantifiers: true}));
+         * //=> [ 'a/b{1,3}/(x|y|z)' ]
+         * console.log(braces('a/b{1,3}/{x,y,z}', {quantifiers: true, expand: true}));
+         * //=> [ 'a/b{1,3}/x', 'a/b{1,3}/y', 'a/b{1,3}/z' ]
+         * ```
+         */
+        quantifiers?: boolean;
+        /**
+         * Strip backslashes that were used for escaping from the result.
+         *
+         * @default undefined
+         */
+        unescape?: boolean;
+    }
+}
+interface Braces {
+    (pattern: string, options?: braces.Options): string[];
+    expand(pattern: string): string[];
+}
+declare const braces: Braces;
+export as namespace braces;
+export = braces;
diff --git a/types/braces/tsconfig.json b/types/braces/tsconfig.json
new file mode 100644
index 0000000000..bdacb750ad
--- /dev/null
+++ b/types/braces/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "braces-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/braces/tslint.json b/types/braces/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/braces/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/braft-editor/braft-editor-tests.tsx b/types/braft-editor/braft-editor-tests.tsx
new file mode 100644
index 0000000000..584927e0bd
--- /dev/null
+++ b/types/braft-editor/braft-editor-tests.tsx
@@ -0,0 +1,31 @@
+import * as React from "react";
+import * as BraftEditor from "braft-editor";
+import {
+	RawDraftContentState,
+} from 'draft-js';
+class BraftEditorTest extends React.Component<BraftEditor.editorProps> {
+    state = {
+        content: null
+    };
+    render() {
+        const editorProps = {
+            height: 500,
+            initialContent: this.state.content,
+            onChange: this.handleChange,
+            onHTMLChange: this.handleHTMLChange
+        };
+        return (
+            <div>
+                <BraftEditor
+                    {...editorProps}
+                />
+            </div>
+          );
+    }
+    private readonly handleChange = (content: RawDraftContentState) => {
+        console.log(content);
+    }
+    private readonly handleHTMLChange = (html: string) => {
+        console.log(html);
+    }
+}
diff --git a/types/braft-editor/index.d.ts b/types/braft-editor/index.d.ts
new file mode 100644
index 0000000000..225d32722d
--- /dev/null
+++ b/types/braft-editor/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for braft-editor 1.1
+// Project: https://github.com/margox/braft#readme
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+import { RawDraftContentState } from 'draft-js';
+export as namespace BraftEditor;
+export = BraftEditor;
+declare namespace BraftEditor {
+	interface fontFamiliesRange {
+		name: string;
+		family: string;
+	}
+	interface editorProps {
+		editorState?: any;
+		contentFormat?: RawDraftContentState;
+		initialContent?: RawDraftContentState | null;
+		onChange?: (content: RawDraftContentState) => void;
+		onRawChange?: (content: RawDraftContentState) => void;
+		onHTMLChange?: (content: string) => void;
+		controls?: string[];
+		extendControls?: any[];
+		height?: number;
+		language?: string;
+		placeholder?: string;
+		viewWrapper?: string;
+		colors?: string[];
+		fontSizes?: number[];
+		fontFamilies?: fontFamiliesRange[];
+		media?: { [key: string]: any };
+		getContent?: (format?: string) => RawDraftContentState;
+		setContent?: (content: RawDraftContentState, format?: string) => void;
+		toggleSelectionBlockType?: (blockquote: string) => any;
+		toggleSelectionInlineStyle?: (style: string, stylesToBeRemoved?: string[]) => any;
+		insertMedias?: (medias: Array<{ type: string, name: string, url: string }>) => void;
+		insertText?: (text: string, replace?: boolean) => void;
+		toggleSelectionLink?: (href: string, target: string) => void;
+		toggleSelectionAlignment?: (alignment: string) => any;
+		toggleSelectionColor?: (hexColor: string) => void;
+		toggleSelectionBackgroundColor?: (hexColor: string) => void;
+		toggleSelectionFontSize?: (fontSize: number) => void;
+		toggleSelectionFontFamily?: (fontFamily: string) => void;
+		selectionCollapsed?: () => boolean;
+		selectionHasInlineStyle?: () => boolean;
+		getSelectionBlockType?: () => string;
+		getEditorState?: () => void;
+		forceRender?: () => void;
+		getDraftInstance?: () => any;
+		getMediaLibraryInstance?: () => any;
+		getSelectionInlineStyle?: () => any;
+		undo?: () => any;
+		redo?: () => any;
+		focus?: () => void;
+		blur?: () => void;
+	}
+}
+declare class BraftEditor extends React.Component<BraftEditor.editorProps> { }
diff --git a/types/braft-editor/tsconfig.json b/types/braft-editor/tsconfig.json
new file mode 100644
index 0000000000..f04b8febfe
--- /dev/null
+++ b/types/braft-editor/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "braft-editor-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-flip-move/tslint.json b/types/braft-editor/tslint.json
similarity index 100%
rename from types/react-flip-move/tslint.json
rename to types/braft-editor/tslint.json
diff --git a/types/braintree-web/index.d.ts b/types/braintree-web/index.d.ts
index 46f16e072b..bc5ca0b01f 100644
--- a/types/braintree-web/index.d.ts
+++ b/types/braintree-web/index.d.ts
@@ -611,12 +611,14 @@ declare namespace braintree {
    * @property {object} details Additional account details.
    * @property {string} details.cardType Type of card, ex: Visa, MasterCard.
    * @property {string} details.lastTwo Last two digits of card number.
+   * @property {string} details.lastFour Last four digits of card number.
    * @property {string} description A human-readable description.
    * @property {string} type The payment method type, always `CreditCard`.
    */
   interface HostedFieldsAccountDetails {
     cardType: string;
     lastTwo: string;
+    lastFour: string;
   }
 
   interface HostedFieldsTokenizePayload {
diff --git a/types/braintree-web/tslint.json b/types/braintree-web/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/braintree-web/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/breeze/tslint.json b/types/breeze/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/breeze/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/brorand/tslint.json b/types/brorand/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/brorand/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/browser-bunyan/index.d.ts b/types/browser-bunyan/index.d.ts
index 7edabdca26..4fedbcd780 100644
--- a/types/browser-bunyan/index.d.ts
+++ b/types/browser-bunyan/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Paul Lockwood <https://github.com/PaulLockwood>
 //                 Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/browser-harness/tslint.json b/types/browser-harness/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/browser-harness/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/browser-pack/tslint.json b/types/browser-pack/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/browser-pack/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/browser-report/tslint.json b/types/browser-report/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/browser-report/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/browser-resolve/tslint.json b/types/browser-resolve/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/browser-resolve/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/browser-sync/browser-sync-tests.ts b/types/browser-sync/browser-sync-tests.ts
index c20f27236a..85cd464a21 100644
--- a/types/browser-sync/browser-sync-tests.ts
+++ b/types/browser-sync/browser-sync-tests.ts
@@ -24,6 +24,46 @@ browserSync({
     proxy: "yourlocal.dev"
 });
 
+browserSync({
+    proxy: {
+        target: "http://yourlocal.dev",
+        proxyReq: function(proxyReq) {
+           console.log(proxyReq);
+        }
+    }
+});
+
+browserSync({
+    proxy: {
+        target: "http://yourlocal.dev",
+        proxyReq: [
+            function(proxyReq) {
+                console.log(proxyReq);
+            }
+        ]
+    }
+});
+
+browserSync({
+    proxy: {
+        target: "http://yourlocal.dev",
+        proxyRes: function(proxyRes, req, res) {
+            console.log(proxyRes);
+        }
+    }
+});
+
+browserSync({
+    proxy: {
+        target: "http://yourlocal.dev",
+        proxyRes: [
+            function(proxyRes, req, res) {
+                console.log(proxyRes);
+            }
+        ]
+    }
+});
+
 var config = {
     server: {
         baseDir: "./"
diff --git a/types/browser-sync/index.d.ts b/types/browser-sync/index.d.ts
index ade12d3cb6..b22054c367 100644
--- a/types/browser-sync/index.d.ts
+++ b/types/browser-sync/index.d.ts
@@ -48,6 +48,7 @@ declare namespace browserSync {
          * middleware - Default: undefined
          * reqHeaders - Default: undefined
          * proxyRes - Default: undefined
+         * proxyReq - Default: undefined
          */
         proxy?: string | boolean | ProxyOptions;
         /**
@@ -291,9 +292,10 @@ declare namespace browserSync {
     interface ProxyOptions {
         target?: string;
         middleware?: MiddlewareHandler;
-        ws: boolean;
-        reqHeaders: (config: any) => Hash<any>;
-        proxyRes: (res: http.ServerResponse, req: http.IncomingMessage, next: Function) => any;
+        ws?: boolean;
+        reqHeaders?: (config: any) => Hash<any>;
+        proxyRes?: ((res: http.ServerResponse, req: http.IncomingMessage, next: Function) => any)[] | ((res: http.ServerResponse, req: http.IncomingMessage, next: Function) => any);
+        proxyReq?: ((res: http.ServerRequest) => any)[] | ((res: http.ServerRequest) => any);
     }
 
     interface MiddlewareHandler {
diff --git a/types/browser-sync/tsconfig.json b/types/browser-sync/tsconfig.json
index 98204d433a..830268a3a6 100644
--- a/types/browser-sync/tsconfig.json
+++ b/types/browser-sync/tsconfig.json
@@ -9,6 +9,11 @@
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
+        "paths": {
+            "micromatch": [
+                "micromatch/v2"
+            ]
+        },
         "typeRoots": [
             "../"
         ],
diff --git a/types/browser-sync/tslint.json b/types/browser-sync/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/browser-sync/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/browserify/tslint.json b/types/browserify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/browserify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bs58/tslint.json b/types/bs58/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bs58/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index 2b6a636e89..380e6e380c 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -39,6 +39,9 @@ export class Binary {
 
     constructor(buffer: Buffer, subType?: number);
 
+    /** The underlying Buffer which stores the binary data. */
+    readonly buffer: Buffer;
+
     /** The length of the binary. */
     length(): number;
     /** Updates this binary with byte_value */
@@ -55,6 +58,9 @@ export class Code {
 }
 export class DBRef {
     constructor(namespace: string, oid: ObjectID, db?: string);
+    namespace: string;
+    oid: ObjectID;
+    db?: string;
 }
 export class Double {
     constructor(value: number);
diff --git a/types/bson/tslint.json b/types/bson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bucks/tslint.json b/types/bucks/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bucks/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/buffer-compare/tslint.json b/types/buffer-compare/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/buffer-compare/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/buffer-equal/tslint.json b/types/buffer-equal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/buffer-equal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/buffers/tslint.json b/types/buffers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/buffers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 5754236da8..28070ad44f 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -1,11 +1,15 @@
-// Type definitions for bull 3.0
+// Type definitions for bull 3.3
 // Project: https://github.com/OptimalBits/bull
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 //                 Cameron Crothers <https://github.com/JProgrammer>
 //                 Marshall Cottrell <https://github.com/marshall007>
+//                 Weeco <https://github.com/weeco>
+//                 Gabriel Terwesten <https://github.com/blaugold>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Redis from "ioredis";
+import * as Promise from "bluebird";
 
 /**
  * This is the Queue constructor.
@@ -13,407 +17,585 @@ import * as Redis from "ioredis";
  * Everytime the same queue is instantiated it tries to process all the old jobs that may exist from a previous unfinished session.
  */
 declare const Bull: {
-    // tslint:disable:unified-signatures
-    (queueName: string, opts?: Bull.QueueOptions): Bull.Queue;
-    (queueName: string, url?: string): Bull.Queue;
-    new (queueName: string, opts?: Bull.QueueOptions): Bull.Queue;
-    new (queueName: string, url?: string): Bull.Queue;
-    // tslint:enable:unified-signatures
+  (queueName: string, opts?: Bull.QueueOptions): Bull.Queue;
+  (queueName: string, url?: string): Bull.Queue; // tslint:disable-line unified-signatures
+  new (queueName: string, opts?: Bull.QueueOptions): Bull.Queue;
+  new (queueName: string, url?: string): Bull.Queue; // tslint:disable-line unified-signatures
 };
 
 declare namespace Bull {
-    interface QueueOptions {
-        /**
-         * Options passed directly to the `ioredis` constructor
-         */
-        redis?: Redis.RedisOptions;
-
-        /**
-         * When specified, the `Queue` will use this function to create new `ioredis` client connections.
-         * This is useful if you want to re-use connections.
-         */
-        createClient?(type: 'client' | 'subscriber', redisOpts?: Redis.RedisOptions): Redis.Redis;
-
-        /**
-         * Prefix to use for all redis keys
-         */
-        prefix?: string;
-
-        settings?: AdvancedSettings;
-    }
-
-    interface AdvancedSettings {
-        /**
-         * Key expiration time for job locks
-         */
-        lockDuration?: number;
-
-        /**
-         * How often check for stalled jobs (use 0 for never checking)
-         */
-        stalledInterval?: number;
-
-        /**
-         * Max amount of times a stalled job will be re-processed
-         */
-        maxStalledCount?: number;
-
-        /**
-         * Poll interval for delayed jobs and added jobs
-         */
-        guardInterval?: number;
-
-        /**
-         * Delay before processing next job in case of internal error
-         */
-        retryProcessDelay?: number;
-    }
-
-    type DoneCallback = (error?: Error | null, value?: any) => void;
-
-    type JobId = number | string;
-
-    interface Job {
-        id: JobId;
-
-        /**
-         * The custom data passed when the job was created
-         */
-        data: any;
-
-        /**
-         * Report progress on a job
-         */
-        progress(value: any): Promise<void>;
-
-        /**
-         * Removes a job from the queue and from any lists it may be included in.
-         * @returns {Promise} A promise that resolves when the job is removed.
-         */
-        remove(): Promise<void>;
-
-        /**
-         * Re-run a job that has failed.
-         * @returns {Promise} A promise that resolves when the job is scheduled for retry.
-         */
-        retry(): Promise<void>;
-
-        /**
-         * Returns a promise the resolves when the job has been finished.
-         * TODO: Add a watchdog to check if the job has finished periodically.
-         * since pubsub does not give any guarantees.
-         */
-        finished(): Promise<void>;
-
-        /**
-         * Promotes a job that is currently "delayed" to the "waiting" state and executed as soon as possible.
-         */
-        promote(): Promise<void>;
-    }
-
-    type JobStatus = 'completed' | 'waiting' | 'active' | 'delayed' | 'failed';
-
-    interface BackoffOptions {
-        /**
-         * Backoff type, which can be either `fixed` or `exponential`
-         */
-        type: 'fixed' | 'exponential';
-
-        /**
-         * Backoff delay, in milliseconds
-         */
-        delay: number;
-    }
-
-    interface RepeatOptions {
-        /**
-         * Cron pattern specifying when the job should execute
-         */
-        cron: string;
-
-        /**
-         * Timezone
-         */
-        tz?: string;
-
-        /**
-         * End date when the repeat job should stop repeating
-         */
-        endDate?: Date | string | number;
-    }
-
-    interface JobOptions {
-        /**
-         * Optional priority value. ranges from 1 (highest priority) to MAX_INT  (lowest priority).
-         * Note that using priorities has a slight impact on performance, so do not use it if not required
-         */
-        priority?: number;
-
-        /**
-         * An amount of miliseconds to wait until this job can be processed.
-         * Note that for accurate delays, both server and clients should have their clocks synchronized. [optional]
-         */
-        delay?: number;
-
-        /**
-         * The total number of attempts to try the job until it completes
-         */
-        attempts?: number;
-
-        /**
-         * Repeat job according to a cron specification
-         */
-        repeat?: RepeatOptions;
-
-        /**
-         * Backoff setting for automatic retries if the job fails
-         */
-        backoff?: number | BackoffOptions;
-
-        /**
-         * A boolean which, if true, adds the job to the right
-         * of the queue instead of the left (default false)
-         */
-        lifo?: boolean;
-
-        /**
-         *  The number of milliseconds after which the job should be fail with a timeout error
-         */
-        timeout?: number;
-
-        /**
-         * Override the job ID - by default, the job ID is a unique
-         * integer, but you can use this setting to override it.
-         * If you use this option, it is up to you to ensure the
-         * jobId is unique. If you attempt to add a job with an id that
-         * already exists, it will not be added.
-         */
-        jobId?: JobId;
-
-        /**
-         * A boolean which, if true, removes the job when it successfully completes.
-         * Default behavior is to keep the job in the completed set.
-         */
-        removeOnComplete?: boolean;
-
-        /**
-         * A boolean which, if true, removes the job when it fails after all attempts
-         * Default behavior is to keep the job in the completed set.
-         */
-        removeOnFail?: boolean;
-    }
-
-    interface JobCounts {
-        wait: number;
-        active: number;
-        completed: number;
-        failed: number;
-        delayed: number;
-    }
-
-    interface Queue {
-        /**
-         * Returns a promise that resolves when Redis is connected and the queue is ready to accept jobs.
-         * This replaces the `ready` event emitted on Queue in previous verisons.
-         */
-        isReady(): Promise<this>;
-
-        /**
-         * Defines a processing function for the jobs placed into a given Queue.
-         *
-         * The callback is called everytime a job is placed in the queue.
-         * It is passed an instance of the job as first argument.
-         *
-         * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-         * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-         * Errors will be passed as a second argument to the "failed" event;
-         * results, as a second argument to the "completed" event.
-         *
-         * concurrency: Bull will then call you handler in parallel respecting this max number.
-         */
-        process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
-
-        /**
-         * Defines a processing function for the jobs placed into a given Queue.
-         *
-         * The callback is called everytime a job is placed in the queue.
-         * It is passed an instance of the job as first argument.
-         *
-         * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-         * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-         * Errors will be passed as a second argument to the "failed" event;
-         * results, as a second argument to the "completed" event.
-         */
-        process(callback: (job: Job, done: DoneCallback) => void): void;
-
-        /**
-         * Defines a processing function for the jobs placed into a given Queue.
-         *
-         * The callback is called everytime a job is placed in the queue.
-         * It is passed an instance of the job as first argument.
-         *
-         * A promise must be returned to signal job completion.
-         * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-         * If it is resolved, its value will be the "completed" event's second argument.
-         *
-         * concurrency: Bull will then call you handler in parallel respecting this max number.
-         */
-        process(concurrency: number, callback: (job: Job) => void): Promise<any>;
-
-        /**
-         * Defines a processing function for the jobs placed into a given Queue.
-         *
-         * The callback is called everytime a job is placed in the queue.
-         * It is passed an instance of the job as first argument.
-         *
-         * A promise must be returned to signal job completion.
-         * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-         * If it is resolved, its value will be the "completed" event's second argument.
-         */
-        process(callback: (job: Job) => void): Promise<any>;
-
-        /**
-         * Creates a new job and adds it to the queue.
-         * If the queue is empty the job will be executed directly,
-         * otherwise it will be placed in the queue and executed as soon as possible.
-         */
-        add(data: any, opts?: JobOptions): Promise<Job>;
-
-        /**
-         * Returns a promise that resolves when the queue is paused.
-         * The pause is global, meaning that all workers in all queue instances for a given queue will be paused.
-         * A paused queue will not process new jobs until resumed,
-         * but current jobs being processed will continue until they are finalized.
-         *
-         * Pausing a queue that is already paused does nothing.
-         */
-        pause(): Promise<void>;
-
-        /**
-         * Returns a promise that resolves when the queue is resumed after being paused.
-         * The resume is global, meaning that all workers in all queue instances for a given queue will be resumed.
-         *
-         * Resuming a queue that is not paused does nothing.
-         */
-        resume(): Promise<void>;
-
-        /**
-         * Returns a promise that returns the number of jobs in the queue, waiting or paused.
-         * Since there may be other processes adding or processing jobs, this value may be true only for a very small amount of time.
-         */
-        count(): Promise<number>;
-
-        /**
-         * Empties a queue deleting all the input lists and associated jobs.
-         */
-        empty(): Promise<void>;
-
-        /**
-         * Closes the underlying redis client. Use this to perform a graceful shutdown.
-         *
-         * `close` can be called from anywhere, with one caveat:
-         * if called from within a job handler the queue won't close until after the job has been processed
-         */
-        close(): Promise<void>;
-
-        /**
-         * Returns a promise that will return the job instance associated with the jobId parameter.
-         * If the specified job cannot be located, the promise callback parameter will be set to null.
-         */
-        getJob(jobId: JobId): Promise<Job>;
-
-        /**
-         * Returns a promise that resolves with the job counts for the given queue
-         */
-        getJobCounts(): Promise<JobCounts>;
-
-        /**
-         * Tells the queue remove all jobs created outside of a grace period in milliseconds.
-         * You can clean the jobs with the following states: completed, waiting, active, delayed, and failed.
-         */
-        clean(grace: number, status?: JobStatus, limit?: number): Promise<Job[]>;
-
-        // tslint:disable:unified-signatures
-
-        /**
-         * Listens to queue events
-         */
-        on(event: string, callback: (...args: any[]) => void): this;
-
-        /**
-         * An error occured
-         */
-        on(event: 'error', callback: ErrorEventCallback): this;
-
-        /**
-         * A job has started. You can use `jobPromise.cancel()` to abort it
-         */
-        on(event: 'active', callback: ActiveEventCallback): this;
-
-        /**
-         * A job has been marked as stalled.
-         * This is useful for debugging job workers that crash or pause the event loop.
-         */
-        on(event: 'stalled', callback: StalledEventCallback): this;
-
-        /**
-         * A job's progress was updated
-         */
-        on(event: 'progress', callback: ProgressEventCallback): this;
-
-        /**
-         * A job successfully completed with a `result`
-         */
-        on(event: 'completed', callback: CompletedEventCallback): this;
-
-        /**
-         * A job failed with `err` as the reason
-         */
-        on(event: 'failed', callback: FailedEventCallback): this;
-
-        /**
-         * The queue has been paused
-         */
-        on(event: 'paused', callback: EventCallback): this;
-
-        /**
-         * The queue has been resumed
-         */
-        on(event: 'resumed', callback: EventCallback): this;
-
-        /**
-         * Old jobs have been cleaned from the queue.
-         * `jobs` is an array of jobs that were removed, and `type` is the type of those jobs.
-         *
-         * @see Queue#clean() for details
-         */
-        on(event: 'cleaned', callback: CleanedEventCallback): this;
-
-        // tslint:enable:unified-signatures
-    }
-
-    type EventCallback = () => void;
-
-    type ErrorEventCallback = (error: Error) => void;
-
-    interface JobPromise {
-        /**
-         * Abort this job
-         */
-        cancel(): void;
-    }
-
-    type ActiveEventCallback = (job: Job, jobPromise?: JobPromise) => void;
-
-    type StalledEventCallback = (job: Job) => void;
-
-    type ProgressEventCallback = (job: Job, progress: any) => void;
-
-    type CompletedEventCallback = (job: Job, result: any) => void;
-
-    type FailedEventCallback = (job: Job, error: Error) => void;
-
-    type CleanedEventCallback = (jobs: Job[], status: JobStatus) => void;
+  interface RateLimiter {
+    /** Max numbers of jobs processed */
+    max: number;
+    /** Per duration in milliseconds */
+    duration: number;
+  }
+
+  interface QueueOptions {
+    /**
+     * Options passed directly to the `ioredis` constructor
+     */
+    redis?: Redis.RedisOptions;
+
+    /**
+     * When specified, the `Queue` will use this function to create new `ioredis` client connections.
+     * This is useful if you want to re-use connections.
+     */
+    createClient?(type: 'client' | 'subscriber', redisOpts?: Redis.RedisOptions): Redis.Redis;
+
+    /**
+     * Prefix to use for all redis keys
+     */
+    prefix?: string;
+
+    settings?: AdvancedSettings;
+
+    limiter?: RateLimiter;
+  }
+
+  interface AdvancedSettings {
+    /**
+     * Key expiration time for job locks
+     */
+    lockDuration?: number;
+
+    /**
+     * How often check for stalled jobs (use 0 for never checking)
+     */
+    stalledInterval?: number;
+
+    /**
+     * Max amount of times a stalled job will be re-processed
+     */
+    maxStalledCount?: number;
+
+    /**
+     * Poll interval for delayed jobs and added jobs
+     */
+    guardInterval?: number;
+
+    /**
+     * Delay before processing next job in case of internal error
+     */
+    retryProcessDelay?: number;
+  }
+
+  type DoneCallback = (error?: Error | null, value?: any) => void;
+
+  type JobId = number | string;
+
+  interface Job {
+    id: JobId;
+
+    /**
+     * The custom data passed when the job was created
+     */
+    data: any;
+
+    /**
+     * Report progress on a job
+     */
+    progress(value: any): Promise<void>;
+
+    /**
+     * Returns a promise resolving to the current job's status.
+     * Please take note that the implementation of this method is not very efficient, nor is
+     * it atomic. If your queue does have a very large quantity of jobs, you may want to
+     * avoid using this method.
+     */
+    getState(): Promise<JobStatus>;
+
+    /**
+     * Update a specific job's data. Promise resolves when the job has been updated.
+     */
+    update(data: any): Promise<void>;
+
+    /**
+     * Removes a job from the queue and from any lists it may be included in.
+     * The returned promise resolves when the job has been removed.
+     */
+    remove(): Promise<void>;
+
+    /**
+     * Re-run a job that has failed. The returned promise resolves when the job
+     * has been scheduled for retry.
+     */
+    retry(): Promise<void>;
+
+    /**
+     * Returns a promise that resolves to the returned data when the job has been finished.
+     * TODO: Add a watchdog to check if the job has finished periodically.
+     * since pubsub does not give any guarantees.
+     */
+    finished(): Promise<any>;
+
+    /**
+     * Promotes a job that is currently "delayed" to the "waiting" state and executed as soon as possible.
+     */
+    promote(): Promise<void>;
+  }
+
+  type JobStatus = 'completed' | 'wait' | 'active' | 'delayed' | 'failed';
+
+  interface BackoffOptions {
+    /**
+     * Backoff type, which can be either `fixed` or `exponential`
+     */
+    type: 'fixed' | 'exponential';
+
+    /**
+     * Backoff delay, in milliseconds
+     */
+    delay: number;
+  }
+
+  interface RepeatOptions {
+    /**
+     * Cron pattern specifying when the job should execute
+     */
+    cron: string;
+
+    /**
+     * Timezone
+     */
+    tz?: string;
+
+    /**
+     * End date when the repeat job should stop repeating
+     */
+    endDate?: Date | string | number;
+  }
+
+  interface JobOptions {
+    /**
+     * Optional priority value. ranges from 1 (highest priority) to MAX_INT  (lowest priority).
+     * Note that using priorities has a slight impact on performance, so do not use it if not required
+     */
+    priority?: number;
+
+    /**
+     * An amount of miliseconds to wait until this job can be processed.
+     * Note that for accurate delays, both server and clients should have their clocks synchronized. [optional]
+     */
+    delay?: number;
+
+    /**
+     * The total number of attempts to try the job until it completes
+     */
+    attempts?: number;
+
+    /**
+     * Repeat job according to a cron specification
+     */
+    repeat?: RepeatOptions;
+
+    /**
+     * Backoff setting for automatic retries if the job fails
+     */
+    backoff?: number | BackoffOptions;
+
+    /**
+     * A boolean which, if true, adds the job to the right
+     * of the queue instead of the left (default false)
+     */
+    lifo?: boolean;
+
+    /**
+     *  The number of milliseconds after which the job should be fail with a timeout error
+     */
+    timeout?: number;
+
+    /**
+     * Override the job ID - by default, the job ID is a unique
+     * integer, but you can use this setting to override it.
+     * If you use this option, it is up to you to ensure the
+     * jobId is unique. If you attempt to add a job with an id that
+     * already exists, it will not be added.
+     */
+    jobId?: JobId;
+
+    /**
+     * A boolean which, if true, removes the job when it successfully completes.
+     * Default behavior is to keep the job in the completed set.
+     */
+    removeOnComplete?: boolean;
+
+    /**
+     * A boolean which, if true, removes the job when it fails after all attempts
+     * Default behavior is to keep the job in the completed set.
+     */
+    removeOnFail?: boolean;
+  }
+
+  interface JobCounts {
+    wait: number;
+    active: number;
+    completed: number;
+    failed: number;
+    delayed: number;
+  }
+
+  interface JobInformation {
+    key: string;
+    name: string;
+    id?: string;
+    endDate?: number;
+    tz?: string;
+    cron: string;
+    next: number;
+  }
+
+  interface Queue {
+    /**
+     * Returns a promise that resolves when Redis is connected and the queue is ready to accept jobs.
+     * This replaces the `ready` event emitted on Queue in previous verisons.
+     */
+    isReady(): Promise<this>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event;
+     * results, as a second argument to the "completed" event.
+     */
+    process(callback: (job: Job, done: DoneCallback) => void): void;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     */
+    process(callback: (job: Job) => void): Promise<any>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     *
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(concurrency: number, callback: (job: Job) => void): Promise<any>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event;
+     * results, as a second argument to the "completed" event.
+     *
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+
+    /**
+     * Defines a named processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     *
+     * @param name Bull will only call the handler if the job name matches
+     */
+    // tslint:disable-next-line:unified-signatures
+    process(name: string, callback: (job: Job) => void): Promise<any>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event;
+     * results, as a second argument to the "completed" event.
+     *
+     * @param name Bull will only call the handler if the job name matches
+     */
+    // tslint:disable-next-line:unified-signatures
+    process(name: string, callback: (job: Job, done: DoneCallback) => void): void;
+
+    /**
+     * Defines a named processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     *
+     * @param name Bull will only call the handler if the job name matches
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(name: string, concurrency: number, callback: (job: Job) => void): Promise<any>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
+     * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event;
+     * results, as a second argument to the "completed" event.
+     *
+     * @param name Bull will only call the handler if the job name matches
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(name: string, concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+
+    /**
+     * Creates a new job and adds it to the queue.
+     * If the queue is empty the job will be executed directly,
+     * otherwise it will be placed in the queue and executed as soon as possible.
+     */
+    add(data: any, opts?: JobOptions): Promise<Job>;
+
+    /**
+     * Creates a new named job and adds it to the queue.
+     * If the queue is empty the job will be executed directly,
+     * otherwise it will be placed in the queue and executed as soon as possible.
+     */
+    add(name: string, data: any, opts?: JobOptions): Promise<Job>;
+
+    /**
+     * Returns a promise that resolves when the queue is paused.
+     * The pause is global, meaning that all workers in all queue instances for a given queue will be paused.
+     * A paused queue will not process new jobs until resumed,
+     * but current jobs being processed will continue until they are finalized.
+     *
+     * Pausing a queue that is already paused does nothing.
+     */
+    pause(): Promise<void>;
+
+    /**
+     * Returns a promise that resolves when the queue is resumed after being paused.
+     * The resume is global, meaning that all workers in all queue instances for a given queue will be resumed.
+     *
+     * Resuming a queue that is not paused does nothing.
+     */
+    resume(): Promise<void>;
+
+    /**
+     * Returns a promise that returns the number of jobs in the queue, waiting or paused.
+     * Since there may be other processes adding or processing jobs, this value may be true only for a very small amount of time.
+     */
+    count(): Promise<number>;
+
+    /**
+     * Empties a queue deleting all the input lists and associated jobs.
+     */
+    empty(): Promise<void>;
+
+    /**
+     * Closes the underlying redis client. Use this to perform a graceful shutdown.
+     *
+     * `close` can be called from anywhere, with one caveat:
+     * if called from within a job handler the queue won't close until after the job has been processed
+     */
+    close(): Promise<void>;
+
+    /**
+     * Returns a promise that will return the job instance associated with the jobId parameter.
+     * If the specified job cannot be located, the promise callback parameter will be set to null.
+     */
+    getJob(jobId: JobId): Promise<Job>;
+
+    /**
+     * Returns a promise that will return an array with the active jobs between start and end.
+     */
+    getActive(start?: number, end?: number): Promise<Job[]>;
+
+    /**
+     * Returns a promise that will return an array with the delayed jobs between start and end.
+     */
+    getDelayed(start?: number, end?: number): Promise<Job[]>;
+
+    /**
+     * Returns a promise that will return an array with the completed jobs between start and end.
+     */
+    getCompleted(start?: number, end?: number): Promise<Job[]>;
+
+    /**
+     * Returns a promise that will return an array with the failed jobs between start and end.
+     */
+    getFailed(start?: number, end?: number): Promise<Job[]>;
+
+    /**
+     * Returns JobInformation of repeatable jobs (ordered descending). Provide a start and/or an end
+     * index to limit the number of results. Start defaults to 0, end to -1 and asc to false.
+     */
+    getRepeatableJobs(start?: number, end?: number, asc?: boolean): Promise<JobInformation[]>;
+
+    /**
+     * ???
+     */
+    nextRepeatableJob(name: string, data: any, opts: JobOptions): Promise<Job>;
+
+    /**
+     * Removes a given repeatable job. The RepeatOptions and JobId needs to be the same as the ones
+     * used for the job when it was added.
+     */
+    removeRepeatable(repeat: RepeatOptions & { jobId?: JobId }): Promise<void>;
+
+    /**
+     * Removes a given repeatable job. The RepeatOptions and JobId needs to be the same as the ones
+     * used for the job when it was added.
+     *
+     * name: The name of the to be removed job
+     */
+    removeRepeatable(name: string, repeat: RepeatOptions & { jobId?: JobId }): Promise<void>;
+
+    /**
+     * Returns a promise that resolves with the job counts for the given queue.
+     */
+    getJobCounts(): Promise<JobCounts>;
+
+    /**
+     * Returns a promise that resolves with the quantity of completed jobs.
+     */
+    getCompletedCount(): Promise<number>;
+
+    /**
+     * Returns a promise that resolves with the quantity of failed jobs.
+     */
+    getFailedCount(): Promise<number>;
+
+    /**
+     * Returns a promise that resolves with the quantity of delayed jobs.
+     */
+    getDelayedCount(): Promise<number>;
+
+    /**
+     * Returns a promise that resolves with the quantity of waiting jobs.
+     */
+    getWaitingCount(): Promise<number>;
+
+    /**
+     * Returns a promise that resolves with the quantity of paused jobs.
+     */
+    getPausedCount(): Promise<number>;
+
+    /**
+     * Returns a promise that resolves with the quantity of active jobs.
+     */
+    getActiveCount(): Promise<number>;
+
+    /**
+     * Returns a promise that resolves to the quantity of repeatable jobs.
+     */
+    getRepeatableCount(): Promise<number>;
+
+    /**
+     * Tells the queue remove all jobs created outside of a grace period in milliseconds.
+     * You can clean the jobs with the following states: completed, waiting, active, delayed, and failed.
+     * @param grace Grace period in milliseconds.
+     * @param status Status of the job to clean. Values are completed, wait, active, delayed, and failed. Defaults to completed.
+     * @param limit Maximum amount of jobs to clean per call. If not provided will clean all matching jobs.
+     */
+    clean(grace: number, status?: JobStatus, limit?: number): Promise<Job[]>;
+
+    /**
+     * Listens to queue events
+     */
+    on(event: string, callback: (...args: any[]) => void): this;
+
+    /**
+     * An error occured
+     */
+    on(event: 'error', callback: ErrorEventCallback): this;
+
+    /**
+     * A job has started. You can use `jobPromise.cancel()` to abort it
+     */
+    on(event: 'active', callback: ActiveEventCallback): this;
+
+    /**
+     * A job has been marked as stalled.
+     * This is useful for debugging job workers that crash or pause the event loop.
+     */
+    on(event: 'stalled', callback: StalledEventCallback): this;
+
+    /**
+     * A job's progress was updated
+     */
+    on(event: 'progress', callback: ProgressEventCallback): this;
+
+    /**
+     * A job successfully completed with a `result`
+     */
+    on(event: 'completed', callback: CompletedEventCallback): this;
+
+    /**
+     * A job failed with `err` as the reason
+     */
+    on(event: 'failed', callback: FailedEventCallback): this;
+
+    /**
+     * The queue has been paused
+     */
+    on(event: 'paused', callback: EventCallback): this;
+
+    /**
+     * The queue has been resumed
+     */
+    on(event: 'resumed', callback: EventCallback): this; // tslint:disable-line unified-signatures
+
+    /**
+     * Old jobs have been cleaned from the queue.
+     * `jobs` is an array of jobs that were removed, and `type` is the type of those jobs.
+     *
+     * @see Queue#clean() for details
+     */
+    on(event: 'cleaned', callback: CleanedEventCallback): this;
+  }
+
+  type EventCallback = () => void;
+
+  type ErrorEventCallback = (error: Error) => void;
+
+  interface JobPromise {
+    /**
+     * Abort this job
+     */
+    cancel(): void;
+  }
+
+  type ActiveEventCallback = (job: Job, jobPromise?: JobPromise) => void;
+
+  type StalledEventCallback = (job: Job) => void;
+
+  type ProgressEventCallback = (job: Job, progress: any) => void;
+
+  type CompletedEventCallback = (job: Job, result: any) => void;
+
+  type FailedEventCallback = (job: Job, error: Error) => void;
+
+  type CleanedEventCallback = (jobs: Job[], status: JobStatus) => void;
 }
 
 export = Bull;
diff --git a/types/bull/v2/tslint.json b/types/bull/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bull/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bump-regex/bump-regex-tests.ts b/types/bump-regex/bump-regex-tests.ts
new file mode 100644
index 0000000000..e7a54ada8e
--- /dev/null
+++ b/types/bump-regex/bump-regex-tests.ts
@@ -0,0 +1,22 @@
+import * as bump from 'bump-regex';
+
+bump({}, (err, res) => {
+  if (err) {}
+  if (res) {
+    res.new;
+    res.prev;
+  }
+});
+
+bump('1.0.0', (err, res) => {});
+
+bump({type: 'major', str: '1.0.0'}, (err, res) => {});
+bump({type: 'minor', str: '1.0.0'}, (err, res) => {});
+bump({type: 'patch', str: '1.0.0'}, (err, res) => {});
+bump({type: 'prerelease', str: '1.0.0'}, (err, res) => {});
+
+bump({regex: /^.+$/, str: '1.0.0'}, (err, res) => {});
+
+bump({regex: /^.+$/, global: true, str: '1.0.0'}, (err, res) => {});
+
+bump({regex: /^.+$/, case: true, str: '1.0.0'}, (err, res) => {});
diff --git a/types/bump-regex/index.d.ts b/types/bump-regex/index.d.ts
new file mode 100644
index 0000000000..47910b9517
--- /dev/null
+++ b/types/bump-regex/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for bump-regex 2.9
+// Project: https://github.com/stevelacy/bump-regex
+// Definitions by: silkentrance <https://github.com/silkentrance>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function BumpRegex(opts: string|BumpRegex.Options, cb: BumpRegex.Callback): any;
+
+declare namespace BumpRegex {
+    type Callback = (err: string|Error|null, opts?: Result) => void;
+
+    interface Options {
+        key?: string;
+        type?: 'major' | 'minor' | 'patch' | 'prerelease';
+        case?: boolean;
+        keys?: string[];
+        global?: boolean;
+        version?: string;
+        preid?: string;
+        regex?: RegExp;
+        str?: string;
+    }
+
+    interface Result extends Options {
+        prev: string;
+        new: string;
+    }
+}
+
+export = BumpRegex;
diff --git a/types/bump-regex/tsconfig.json b/types/bump-regex/tsconfig.json
new file mode 100644
index 0000000000..001effea6a
--- /dev/null
+++ b/types/bump-regex/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bump-regex-tests.ts"
+    ]
+}
diff --git a/types/bump-regex/tslint.json b/types/bump-regex/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/bump-regex/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/bunnymq/index.d.ts b/types/bunnymq/index.d.ts
index c4c0a770e1..1adb125697 100644
--- a/types/bunnymq/index.d.ts
+++ b/types/bunnymq/index.d.ts
@@ -17,8 +17,8 @@ declare namespace bunnymq {
         /**
          * Handle messages from a named queue.
          *
-         * @param {string}           queue      A named queue.
-         * @param {ConsumerCallback} callback   A callback.
+         * @param queue A named queue.
+         * @param callback A callback.
          */
         consume<T>(queue: string, callback: ConsumerCallback<T>): void;
     }
@@ -31,16 +31,15 @@ declare namespace bunnymq {
         /**
          * Subscriber to handle messages from a named queue.
          *
-         * @param {string}           queue      A named queue.
-         * @param {ConsumerCallback} callback   A callback.
+         * @param queue A named queue.
+         * @param callback A callback.
          */
         subscribe<T>(queueName: string, callback: ConsumerCallback<T>): void;
 
         /**
          * Publisher to send messages to a named queue.
          *
-         * @type {Producer}
-         * @return {Promise} The consumer response.
+         * @return The consumer response.
          */
         publish<T>(queueName: string, message: any, options?: ProducerOptions): Promise<T>;
     }
@@ -61,14 +60,12 @@ declare namespace bunnymq {
         /**
          * Number of fetched messages at once on the channel.
          *
-         * @type {number}
          */
         prefetch?: number;
 
         /**
          * Requeue put back message into the broker if consumer crashes/trigger exception.
          *
-         * @type {boolean}
          */
         requeue?: boolean;
         rpcTimeout?: number;
@@ -80,9 +77,9 @@ declare namespace bunnymq {
         /**
          * Send messages to a named queue.
          *
-         * @param {string}  queue   A named queue.
-         * @param {any}     message A message.
-         * @return {Promise} The consumer response.
+         * @param queue A named queue.
+         * @param message A message.
+         * @return The consumer response.
          */
         produce<T>(queue: string, message: any, options?: ProducerOptions): Promise<T>;
     }
diff --git a/types/bunyan-blackhole/index.d.ts b/types/bunyan-blackhole/index.d.ts
index f8be6fc730..80b4a33fcf 100644
--- a/types/bunyan-blackhole/index.d.ts
+++ b/types/bunyan-blackhole/index.d.ts
@@ -2,13 +2,14 @@
 // Project: https://github.com/Floby/node-bunyan-blackhole
 // Definitions by: Olivier Chevet <https://github.com/olivr70>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import * as Logger from "bunyan";
 
 /**
  * Constructor.
- * @param {string} [name] name of the blackhole Logger
- * @return {Logger} A bunyan logger .
+ * @param name name of the blackhole Logger
+ * @return A bunyan logger .
  */
 declare function bunyanBlackHole(name: string): Logger;
 export = bunyanBlackHole;
diff --git a/types/bunyan-bugsnag/index.d.ts b/types/bunyan-bugsnag/index.d.ts
index 9716238aab..06e13714b7 100644
--- a/types/bunyan-bugsnag/index.d.ts
+++ b/types/bunyan-bugsnag/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/marnusw/bunyan-bugsnag
 // Definitions by: Pasi Eronen <https://github.com/pasieronen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import * as Logger from 'bunyan';
 
diff --git a/types/bunyan-config/tslint.json b/types/bunyan-config/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bunyan-config/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bunyan-format/bunyan-format-tests.ts b/types/bunyan-format/bunyan-format-tests.ts
new file mode 100644
index 0000000000..3f4c2a658d
--- /dev/null
+++ b/types/bunyan-format/bunyan-format-tests.ts
@@ -0,0 +1,5 @@
+import BunyanFormatWritable = require('bunyan-format');
+
+const formatOut = new BunyanFormatWritable({ outputMode: 'short' });
+
+const formatOut2 = new BunyanFormatWritable({ outputMode: 'bunyan', levelInString: true });
diff --git a/types/bunyan-format/index.d.ts b/types/bunyan-format/index.d.ts
new file mode 100644
index 0000000000..06a37ba2e5
--- /dev/null
+++ b/types/bunyan-format/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for bunyan-format 0.2
+// Project: https://github.com/thlorenz/bunyan-format
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Writable } from 'stream';
+
+declare namespace BunyanFormatWritable {
+    interface ColorFromLevel {
+        [level: number]: string;
+    }
+
+    interface Options {
+        outputMode?: 'short' | 'long' | 'simple' | 'json' | 'bunyan';
+        color?: boolean;
+        colorFromLevel?: ColorFromLevel;
+        levelInString?: boolean;
+        jsonIndent?: string | number;
+    }
+}
+
+declare class BunyanFormatWritable extends Writable {
+    /** Creates a writable stream that formats bunyan records written to it. */
+    constructor(options: BunyanFormatWritable.Options, output?: Writable);
+}
+
+export = BunyanFormatWritable;
diff --git a/types/bunyan-format/tsconfig.json b/types/bunyan-format/tsconfig.json
new file mode 100644
index 0000000000..c26359cdb6
--- /dev/null
+++ b/types/bunyan-format/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bunyan-format-tests.ts"
+    ]
+}
diff --git a/types/react-native-elements/tslint.json b/types/bunyan-format/tslint.json
similarity index 100%
rename from types/react-native-elements/tslint.json
rename to types/bunyan-format/tslint.json
diff --git a/types/bunyan-logentries/tslint.json b/types/bunyan-logentries/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bunyan-logentries/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bunyan-prettystream/tslint.json b/types/bunyan-prettystream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bunyan-prettystream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bunyan-winston-adapter/index.d.ts b/types/bunyan-winston-adapter/index.d.ts
index e0c4f835d9..6798b8f1c9 100644
--- a/types/bunyan-winston-adapter/index.d.ts
+++ b/types/bunyan-winston-adapter/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/gluwer/bunyan-winston-adapter
 // Definitions by: Steve Hipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import * as bunyan from "bunyan";
 import { LoggerInstance } from "winston";
diff --git a/types/bunyan/index.d.ts b/types/bunyan/index.d.ts
index 0a0c648220..4ee972d29c 100644
--- a/types/bunyan/index.d.ts
+++ b/types/bunyan/index.d.ts
@@ -24,8 +24,6 @@ declare class Logger extends EventEmitter {
     fields: any;
     src: boolean;
 
-    /* tslint:disable:unified-signatures */
-
     /**
      * Returns a boolean: is the `trace` level enabled?
      *
@@ -199,8 +197,6 @@ declare class Logger extends EventEmitter {
      * Uses `util.format` for msg formatting.
      */
     fatal(format: any, ...params: any[]): void;
-
-    /* tslint:enable:unified-signatures */
 }
 
 declare namespace Logger {
diff --git a/types/bunyan/tslint.json b/types/bunyan/tslint.json
index 09f94cd344..2204f23ff3 100644
--- a/types/bunyan/tslint.json
+++ b/types/bunyan/tslint.json
@@ -2,6 +2,7 @@
   "extends": "dtslint/dt.json",
   "rules": {
     // ban-types needs to be disabled to support TypeScript <2.2
-    "ban-types": false
+    "ban-types": false,
+    "unified-signatures": false
   }
 }
diff --git a/types/busboy/tslint.json b/types/busboy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/busboy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/business-rules-engine/index.d.ts b/types/business-rules-engine/index.d.ts
index a74bcf180d..d85cd49c81 100644
--- a/types/business-rules-engine/index.d.ts
+++ b/types/business-rules-engine/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/rsamec/form
 // Definitions by: Roman Samec <https://github.com/rsamec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Source: typings/business-rules-engine/Validation.d.ts
 
diff --git a/types/business-rules-engine/package.json b/types/business-rules-engine/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/business-rules-engine/package.json
+++ b/types/business-rules-engine/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/business-rules-engine/tslint.json b/types/business-rules-engine/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/business-rules-engine/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bwip-js/tslint.json b/types/bwip-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bwip-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/byline/tslint.json b/types/byline/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/byline/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bytebuffer/index.d.ts b/types/bytebuffer/index.d.ts
index 8456f28182..fca26b439f 100644
--- a/types/bytebuffer/index.d.ts
+++ b/types/bytebuffer/index.d.ts
@@ -120,12 +120,17 @@ declare class ByteBuffer
     /**
      * Calculates the number of UTF8 bytes of a string.
      */
-    static calculateUTF8Byte( str: string ): number;
+    static calculateUTF8Bytes( 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;
+    static calculateUTF8Chars( str: string ): number;
+    
+    /**
+     * Calculates the number of UTF8 bytes of a string. This is an alias of ByteBuffer#calculateUTF8Bytes.
+     */
+    static calculateString( str: string ): number;
 
     /**
      * Calculates the actual number of bytes required to store a 32bit base 128 variable-length integer.
@@ -409,7 +414,7 @@ declare class ByteBuffer
     /**
      * Reads a zig-zag encoded 32bit base 128 variable-length integer.
      */
-    readVarint32ZiZag( offset?: number ): number;
+    readVarint32ZigZag( offset?: number ): number;
 
     /**
      * Reads a 64bit base 128 variable-length integer. Requires Long.js.
diff --git a/types/bytebuffer/tslint.json b/types/bytebuffer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bytebuffer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/bytes/tslint.json b/types/bytes/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/bytes/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/c3/c3-tests.ts b/types/c3/c3-tests.ts
index 509678636b..8ac8a4b93e 100644
--- a/types/c3/c3-tests.ts
+++ b/types/c3/c3-tests.ts
@@ -619,7 +619,8 @@ function chart_bar() {
             width: {
                 ratio: 0.5, // this makes bar width 50% of length between ticks
                 max: 50 // this limits maximum width of bar to 50px
-            }
+            },
+            space: 10 // this adds space between bars in bar charts
             // or
             // width: 100 // this makes bar width 100px
         }
diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index 00d1cf1840..96ecc8c488 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -8,1107 +8,1106 @@
 
 import * as d3 from "d3";
 
-/* tslint:disable:export-just-namespace */
-
-export = c3;
 export as namespace c3;
 
-declare namespace c3 {
-    type PrimitiveArray = Array<string | boolean | number | null>;
-    type FormatFunction = (v: any, id: string, i: number, j: number) => void;
+export type PrimitiveArray = Array<string | boolean | number | null>;
+export type FormatFunction = (v: any, id: string, i: number, j: number) => void;
 
-    interface TargetIds {
-        ids: ArrayOrString;
-    }
+export interface TargetIds {
+    ids: ArrayOrString;
+}
 
-    type ArrayOrString = string[] | string;
+export type ArrayOrString = string[] | string;
 
-    interface ChartConfiguration {
+export interface ChartConfiguration {
+    /**
+     * The CSS selector or the element which the chart will be set to. D3 selection object can be specified. If other chart is set already, it will be replaced with the new one (only one chart
+     * can be set in one element).
+     * If this option is not specified, the chart will be generated but not be set. Instead, we can access the element by chart.element and set it by ourselves.
+     * Note: When chart is not binded, c3 starts observing if chart.element is binded by MutationObserver. In this case, polyfill is required in IE9 and IE10 becuase they do not support
+     * MutationObserver. On the other hand, if chart always will be binded, polyfill will not be required because MutationObserver will never be called.
+     */
+    bindto?: string | HTMLElement | d3.Selection<any> | null;
+    size?: {
         /**
-         * The CSS selector or the element which the chart will be set to. D3 selection object can be specified. If other chart is set already, it will be replaced with the new one (only one chart
-         * can be set in one element).
-         * If this option is not specified, the chart will be generated but not be set. Instead, we can access the element by chart.element and set it by ourselves.
-         * Note: When chart is not binded, c3 starts observing if chart.element is binded by MutationObserver. In this case, polyfill is required in IE9 and IE10 becuase they do not support
-         * MutationObserver. On the other hand, if chart always will be binded, polyfill will not be required because MutationObserver will never be called.
+         * The desired width of the chart element.
+         * If this option is not specified, the width of the chart will be calculated by the size of the parent element it's appended to.
+         * Note: This option should be specified if possible because it can improve its performance because some size calculations will be skipped by an explicit value.
          */
-        bindto?: string | HTMLElement | d3.Selection<any> | null;
-        size?: {
-            /**
-             * The desired width of the chart element.
-             * If this option is not specified, the width of the chart will be calculated by the size of the parent element it's appended to.
-             * Note: This option should be specified if possible because it can improve its performance because some size calculations will be skipped by an explicit value.
-             */
-            width?: number;
-            /**
-             * The desired height of the chart element.
-             * If this option is not specified, the height of the chart will be calculated by the size of the parent element it's appended to.
-             */
-            height?: number;
-        };
-
-        padding?: {
-            /**
-             * The padding on the top of the chart.
-             */
-            top?: number;
-            /**
-             * The padding on the right of the chart.
-             */
-            right?: number;
-            /**
-             * The padding on the bottom of the chart.
-             */
-            bottom?: number;
-            /**
-             * The padding on the left of the chart.
-             */
-            left?: number;
-        };
-
-        color?: {
-            /**
-             * Set custom color pattern.
-             */
-            pattern?: string[];
-            threshold?: any; // Undocumented
-        };
-
-        interaction?: {
-            /**
-             * Indicate if the chart should have interactions.
-             * If false is set, all of interactions (showing/hiding tooltip, selection, mouse events, etc) will be disabled.
-             */
-            enabled?: boolean;
-        };
-
-        transition?: {
-            /**
-             * Set duration of transition (in milliseconds) for chart animation.
-             * Note: If 0 or null set, transition will be skipped. So, this makes initial rendering faster especially in case you have a lot of data.
-             */
-            duration?: number;
-        };
-
+        width?: number;
         /**
-         * Set a callback to execute when the chart is initialized.
-         */
-        oninit?(): void;
-
-        /**
-         * Set a callback which is executed when the chart is rendered. Basically, this callback will be called in each time when the chart is redrawed.
-         */
-        onrendered?(): void;
-
-        /**
-         * Set a callback to execute when mouse enters the chart.
-         */
-        onmouseover?(): void;
-
-        /**
-         * Set a callback to execute when mouse leaves the chart.
-         */
-        onmouseout?(): void;
-
-        /**
-         * Set a callback to execute when user resizes the screen.
-         */
-        onresize?(): void;
-
-        /**
-         * Set a callback to execute when screen resize finished.
-         */
-        onresized?(): void;
-
-        data: Data;
-
-        axis?: Axis;
-
-        grid?: Grid;
-
-        /**
-         * Show rectangles inside the chart.
-         * This option accepts array including object that has axis, start, end and class. The keys start, end and class are optional.
-         * axis must be x, y or y2. start and end should be the value where regions start and end. If not specified, the edge values will be used. If timeseries x axis, date string, Date object and
-         * unixtime integer can be used. If class is set, the region element will have it as class.
-         */
-        regions?: RegionOptions[];
-
-        legend?: LegendOptions;
-
-        tooltip?: TooltipOptions;
-
-        subchart?: SubchartOptions;
-
-        zoom?: ZoomOptions;
-
-        point?: PointOptions;
-
-        line?: {
-            /**
-             * Set if null data point will be connected or not.
-             * If true set, the region of null data will be connected without any data point. If false set, the region of null data will not be connected and get empty.
-             */
-            connectNull?: boolean;
-            /**
-             * Change step type for step chart. 'step', 'step-before' and 'step-after' can be used.
-             */
-            step?: {
-                type: string;
-            };
-        };
-
-        area?: {
-            /**
-             * Set if min or max value will be 0 on area chart.
-             */
-            zerobased?: boolean;
-        };
-
-        bar?: {
-            /**
-             * Change the width of bar chart. If ratio is specified, change the width of bar chart by ratio.
-             */
-            width?: number | {
-                /**
-                 * Set the width of each bar by ratio
-                 */
-                ratio: number,
-                /**
-                 * Set max width of each bar
-                 */
-                max?: number
-            };
-            /**
-             * Set if min or max value will be 0 on bar chart.
-             */
-            zerobased?: boolean;
-        };
-
-        pie?: {
-            label?: {
-                /**
-                 * Show or hide label on each pie piece.
-                 */
-                show?: boolean;
-                /**
-                 * Set formatter for the label on each pie piece.
-                 */
-                format?(value: number, ratio: number, id: string): string;
-                /**
-                 * Set threshold to show/hide labels.
-                 */
-                threshold?: number
-            };
-            /**
-             * Enable or disable expanding pie pieces.
-             */
-            expand?: boolean;
-        };
-
-        donut?: {
-            label?: {
-                /**
-                 * Show or hide label on each donut piece.
-                 */
-                show?: boolean;
-                /**
-                 * Set formatter for the label on each donut piece.
-                 */
-                format?(value: number, ratio: number, id: string): string;
-                /**
-                 * Set threshold to show/hide labels.
-                 */
-                threshold?: number
-            };
-            /**
-             * Enable or disable expanding pie pieces.
-             */
-            expand?: boolean;
-            /**
-             * Set width of donut chart.
-             */
-            width?: number;
-            /**
-             * Set title of donut chart.
-             */
-            title?: string;
-        };
-
-        gauge?: {
-            label?: {
-                /**
-                 * Show or hide label on gauge.
-                 */
-                show?: boolean;
-                /**
-                 * Set formatter for the label on gauge.
-                 */
-                format?(value: any, ratio: number): string;
-            };
-            /**
-             * Enable or disable expanding gauge.
-             */
-            expand?: boolean;
-            /**
-             * Set min value of the gauge.
-             */
-            min?: number;
-            /**
-             * Set max value of the gauge.
-             */
-            max?: number;
-            /**
-             * Set units of the gauge.
-             */
-            units?: string;
-            /**
-             * Set width of gauge chart.
-             */
-            width?: number;
-        };
-
-        spline?: {
-            interpolation?: {
-                /**
-                 * Set custom spline interpolation
-                 */
-                type?: 'linear' | 'linear-closed' | 'basis' | 'basis-open' | 'basis-closed' | 'bundle' | 'cardinal' | 'cardinal-open' | 'cardinal-closed' | 'monotone';
-            };
-        };
-    }
-
-    interface Data {
-        /**
-         * Load a CSV or JSON file from a URL. Note that this will not work if loading via the "file://" protocol as most browsers with block XMLHTTPRequests.
-         */
-        url?: string;
-        /**
-         * Parse a JSON object for data.
-         */
-        json?: {};
-        /**
-         * Load data from a multidimensional array, with the first element containing the data names, the following containing related data in that order.
-         */
-        rows?: PrimitiveArray[];
-        /*
-         * Load data from a multidimensional array, with each element containing an array consisting of a datum name and associated data values.
-         */
-        columns?: PrimitiveArray[];
-        /**
-         * Used if loading JSON via data.url
-         */
-        mimeType?: string;
-        /**
-         * Choose which JSON object keys correspond to desired data.
-         */
-        keys?: { x?: string; value: string[]; };
-        /**
-         * Specify the key of x values in the data.
-         * We can show the data with non-index x values by this option. This option is required when the type of x axis is timeseries. If this option is set on category axis, the values of the data
-         * on the key will be used for category names.
-         */
-        x?: string;
-        /**
-         * Specify the keys of the x values for each data.
-         * This option can be used if we want to show the data that has different x values.
-         */
-        xs?: { [key: string]: string };
-        /**
-         * Set a format to parse string specifed as x.
-         * Default is %Y-%m-%d
-         */
-        xFormat?: string;
-        // xLocaltime?: any;
-        // xSort?: any;
-        /**
-         * Set custom data name.
-         */
-        names?: { [key: string]: string };
-        /**
-         * Set custom data class.
-         * If this option is specified, the element g for the data has an additional class that has the prefix c3-target- (e.g. c3-target-additional-data1-class).
-         */
-        classes?: { [key: string]: string };
-        /**
-         * Set groups for the data for stacking.
-         */
-        groups?: string[][];
-        /**
-         * Set y axis the data related to. y and y2 can be used.
-         */
-        axes?: { [key: string]: string };
-        /**
-         * Set chart type at once.
-         * If this option is specified, the type will be applied to every data. This setting can be overwritten by data.types.
-         * Available Values: line, spline, step, area, area-spline, area-step, bar, scatter, pie, donut, gauge
-         */
-        type?: string;
-        /**
-         * Set chart type for each data.
-         * This setting overwrites data.type setting.
-         */
-        types?: { [key: string]: string };
-        /**
-         * Show labels on each data points or set formatter function for data labels.
-         * The formatter function receives 4 arguments such as v, id, i, j and it must return a string that will be shown as the label. The arguments are:
-         * - v is the value of the data point where the label is shown.
-         * - id is the id of the data where the label is shown.
-         * - i is the index of the data point where the label is shown.
-         * - j is the sub index of the data point where the label is shown.
-         * Formatter function can be defined for each data by specifying as an object and D3 formatter function can be set (e.g. d3.format('$'))
-         */
-        labels?: boolean |
-        { format: FormatFunction } |
-        { format: { [key: string]: FormatFunction } };
-        /**
-         * Define the order of the data.
-         * This option changes the order of stacking the data and pieces of pie/donut. If null specified, it will be the order the data loaded. If function specified, it will be used to sort the data
-         * and it will recieve the data as argument.
-         * Available Values: desc, asc, function (data1, data2) { ... }, null
-         */
-        order?: string | ((...data: string[]) => void);
-        /**
-         * Define regions for each data.
-         * The values must be an array for each data and it should include an object that has start, end, style. If start is not set, the start will be the first data point. If end is not set, the
-         * end will be the last data point.
-         * Currently this option supports only line chart and dashed style. If this option specified, the line will be dashed only in the regions.
-         */
-        regions?: { [key: string]: any };
-        /**
-         * Set color converter function.
-         * This option should a function and the specified function receives color (e.g. '#ff0000') and d that has data parameters like id, value, index, etc. And it must return a string that
-         * represents color (e.g. '#00ff00').
-         */
-        color?(color: string, d: any): string | d3.Rgb;
-        /**
-         * Set color for each data.
-         */
-        colors?: { [key: string]: string | d3.Rgb | ((d: any) => string | d3.Rgb) };
-        /**
-         * Hide each data when the chart appears.
-         * If true specified, all of data will be hidden. If multiple ids specified as an array, those will be hidden.
-         */
-        hide?: boolean | string[];
-        /**
-         * Set text displayed when empty data.
-         */
-        empty?: { label: { text: string } };
-
-        selection?: {
-            enabled?: boolean;
-            grouped?: boolean;
-            multiple?: boolean;
-            draggable?: boolean;
-            isselectable?(d?: any): boolean;
-        };
-        /**
-         * Set a callback for click event on each data point.
-         * This callback will be called when each data point clicked and will receive d and element as the arguments.
-         * - d is the data clicked and element is the element clicked. In this callback, this will be the Chart object.
-         */
-        onclick?(d: any, element: any): void;
-        /**
-         * Set a callback for mouseover event on each data point.
-         * This callback will be called when mouse cursor moves onto each data point and will receive d as the argument.
-         * - d is the data where mouse cursor moves onto. In this callback, this will be the Chart object.
-         */
-        onmouseover?(d: any, element?: any): void;
-        /**
-         * Set a callback for mouseout event on each data point.
-         * This callback will be called when mouse cursor moves out each data point and will receive d as the argument.
-         * - d is the data where mouse cursor moves out. In this callback, this will be the Chart object.
-         */
-        onmouseout?(d: any, element?: any): void;
-
-        onselected?(d: any, element?: any): void;
-
-        onunselected?(d: any, element?: any): void;
-    }
-
-    interface Axis {
-        /**
-         * Switch x and y axis position.
-         */
-        rotated?: boolean;
-        x?: XAxisConfiguration;
-        y?: YAxisConfiguration;
-        y2?: YAxisConfiguration;
-    }
-
-    interface XAxisConfiguration {
-        /**
-         * Show or hide x axis.
-         */
-        show?: boolean;
-        /**
-         * Set type of x axis (timeseries, category, indexed)
-         */
-        type?: string;
-        /**
-         * Set how to treat the timezone of x values.
-         * If true, treat x value as localtime. If false, convert to UTC internally.
-         */
-        localtime?: boolean;
-        /**
-         * Set category names on category axis.
-         * This must be an array that includes category names in string. If category names are included in the date by data.x option, this is not required.
-         */
-        categories?: string[];
-
-        tick?: XTickConfiguration;
-        /**
-         * Set max value of x axis range.
-         */
-        max?: number;
-        /**
-         * Set min value of x axis range.
-         */
-        min?: number;
-        /**
-         * Set padding for x axis.
-         * If this option is set, the range of x axis will increase/decrease according to the values. If no padding is needed in the ragen of x axis, 0 should be set. On category axis, this option
-         * will be ignored.
-         */
-        padding?: {
-            left?: number;
-            right?: number;
-        };
-        /**
-         * Set height of x axis.
-         * The height of x axis can be set manually by this option. If you need more space for x axis, please use this option for that. The unit is pixel.
+         * The desired height of the chart element.
+         * If this option is not specified, the height of the chart will be calculated by the size of the parent element it's appended to.
          */
         height?: number;
-        /**
-         * Set default extent for subchart and zoom. This can be an array or function that returns an array.
-         */
-        extent?: number[] | (() => number[]);
-        /**
-         * Set label on x axis.
-         * You can set x axis label and change its position by this option. string and object can be passed and we can change the poisiton by passing object that has position key. Available position
-         * differs according to the axis direction (vertical or horizontal). If string set, the position will be the default.
-         * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
-         * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
-         */
-        label?: string | { text: string; position: string };
-    }
+    };
 
-    interface YAxisConfiguration {
+    padding?: {
         /**
-         * Show or hide y axis.
+         * The padding on the top of the chart.
          */
-        show?: boolean;
+        top?: number;
         /**
-         * Show y axis inside of the chart.
+         * The padding on the right of the chart.
          */
-        inner?: boolean;
+        right?: number;
         /**
-         * Set max value of y axis.
+         * The padding on the bottom of the chart.
          */
-        max?: number;
+        bottom?: number;
         /**
-         * Set min value of y axis.
+         * The padding on the left of the chart.
+         */
+        left?: number;
+    };
+
+    color?: {
+        /**
+         * Set custom color pattern.
+         */
+        pattern?: string[];
+        threshold?: any; // Undocumented
+    };
+
+    interaction?: {
+        /**
+         * Indicate if the chart should have interactions.
+         * If false is set, all of interactions (showing/hiding tooltip, selection, mouse events, etc) will be disabled.
+         */
+        enabled?: boolean;
+    };
+
+    transition?: {
+        /**
+         * Set duration of transition (in milliseconds) for chart animation.
+         * Note: If 0 or null set, transition will be skipped. So, this makes initial rendering faster especially in case you have a lot of data.
+         */
+        duration?: number;
+    };
+
+    /**
+     * Set a callback to execute when the chart is initialized.
+     */
+    oninit?(): void;
+
+    /**
+     * Set a callback which is executed when the chart is rendered. Basically, this callback will be called in each time when the chart is redrawed.
+     */
+    onrendered?(): void;
+
+    /**
+     * Set a callback to execute when mouse enters the chart.
+     */
+    onmouseover?(): void;
+
+    /**
+     * Set a callback to execute when mouse leaves the chart.
+     */
+    onmouseout?(): void;
+
+    /**
+     * Set a callback to execute when user resizes the screen.
+     */
+    onresize?(): void;
+
+    /**
+     * Set a callback to execute when screen resize finished.
+     */
+    onresized?(): void;
+
+    data: Data;
+
+    axis?: Axis;
+
+    grid?: Grid;
+
+    /**
+     * Show rectangles inside the chart.
+     * This option accepts array including object that has axis, start, end and class. The keys start, end and class are optional.
+     * axis must be x, y or y2. start and end should be the value where regions start and end. If not specified, the edge values will be used. If timeseries x axis, date string, Date object and
+     * unixtime integer can be used. If class is set, the region element will have it as class.
+     */
+    regions?: RegionOptions[];
+
+    legend?: LegendOptions;
+
+    tooltip?: TooltipOptions;
+
+    subchart?: SubchartOptions;
+
+    zoom?: ZoomOptions;
+
+    point?: PointOptions;
+
+    line?: {
+        /**
+         * Set if null data point will be connected or not.
+         * If true set, the region of null data will be connected without any data point. If false set, the region of null data will not be connected and get empty.
+         */
+        connectNull?: boolean;
+        /**
+         * Change step type for step chart. 'step', 'step-before' and 'step-after' can be used.
+         */
+        step?: {
+            type: string;
+        };
+    };
+
+    area?: {
+        /**
+         * Set if min or max value will be 0 on area chart.
+         */
+        zerobased?: boolean;
+    };
+
+    bar?: {
+        /**
+         * Change the width of bar chart. If ratio is specified, change the width of bar chart by ratio.
+         */
+        width?: number | {
+            /**
+             * Set the width of each bar by ratio
+             */
+            ratio: number,
+            /**
+             * Set max width of each bar
+             */
+            max?: number
+        };
+        /**
+         * Set if min or max value will be 0 on bar chart.
+         */
+        zerobased?: boolean;
+        /**
+         * Set space between bars in bar charts
+         */
+        space?: number;
+    };
+
+    pie?: {
+        label?: {
+            /**
+             * Show or hide label on each pie piece.
+             */
+            show?: boolean;
+            /**
+             * Set formatter for the label on each pie piece.
+             */
+            format?(value: number, ratio: number, id: string): string;
+            /**
+             * Set threshold to show/hide labels.
+             */
+            threshold?: number
+        };
+        /**
+         * Enable or disable expanding pie pieces.
+         */
+        expand?: boolean;
+    };
+
+    donut?: {
+        label?: {
+            /**
+             * Show or hide label on each donut piece.
+             */
+            show?: boolean;
+            /**
+             * Set formatter for the label on each donut piece.
+             */
+            format?(value: number, ratio: number, id: string): string;
+            /**
+             * Set threshold to show/hide labels.
+             */
+            threshold?: number
+        };
+        /**
+         * Enable or disable expanding pie pieces.
+         */
+        expand?: boolean;
+        /**
+         * Set width of donut chart.
+         */
+        width?: number;
+        /**
+         * Set title of donut chart.
+         */
+        title?: string;
+    };
+
+    gauge?: {
+        label?: {
+            /**
+             * Show or hide label on gauge.
+             */
+            show?: boolean;
+            /**
+             * Set formatter for the label on gauge.
+             */
+            format?(value: any, ratio: number): string;
+        };
+        /**
+         * Enable or disable expanding gauge.
+         */
+        expand?: boolean;
+        /**
+         * Set min value of the gauge.
          */
         min?: number;
         /**
-         * Change the direction of y axis.
-         * If true set, the direction will be from the top to the bottom.
+         * Set max value of the gauge.
          */
-        inverted?: boolean;
+        max?: number;
         /**
-         * Set center value of y axis.
+         * Set units of the gauge.
          */
-        center?: number;
+        units?: string;
         /**
-         * Set label on y axis. This option works in the same way as axis.x.label.
-         * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
-         * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
+         * Set width of gauge chart.
          */
-        label?: string | { text: string; position: string };
-        tick?: YTickConfiguration;
-        /**
-         * Set padding for y axis.
-         * You can set padding for y axis to create more space on the edge of the axis. This option accepts object and it can include top and bottom. top, bottom will be treated as pixels.
-         */
-        padding?: {
-            top?: number;
-            bottom?: number;
+        width?: number;
+    };
+
+    spline?: {
+        interpolation?: {
+            /**
+             * Set custom spline interpolation
+             */
+            type?: 'linear' | 'linear-closed' | 'basis' | 'basis-open' | 'basis-closed' | 'bundle' | 'cardinal' | 'cardinal-open' | 'cardinal-closed' | 'monotone';
         };
-        /**
-         * Set default range of y axis. This option set the default value for y axis when there is no data on init.
-         */
-        default?: number[];
-    }
-
-    interface XTickConfiguration {
-        /**
-         * Centerise ticks on category axis
-         */
-        centered?: boolean;
-        /**
-         * A function to format tick value. Format string is also available for timeseries data.
-         */
-        format?: string | ((x: number | Date) => string | number);
-        /**
-         * Setting for culling ticks.
-         * If true is set, the ticks will be culled, then only limitted tick text will be shown. This option does not hide the tick lines. If false is set, all of ticks will be shown.
-         */
-        culling?: boolean | CullingConfiguration;
-        /**
-         * The number of x axis ticks to show.
-         * This option hides tick lines together with tick text. If this option is used on timeseries axis, the ticks position will be determined precisely and not nicely positioned (e.g. it will
-         * have rough second value).
-         */
-        count?: number;
-        /**
-         * Fit x axis ticks.
-         * If true set, the ticks will be positioned nicely. If false set, the ticks will be positioned according to x value of the data points.
-         */
-        fit?: boolean;
-        /**
-         * Set the x values of ticks manually.
-         * If this option is provided, the position of the ticks will be determined based on those values. This option works with timeseries data and the x values will be parsed accoding to the type
-         * of the value and data.xFormat option.
-         */
-        values?: number[] | string[];
-        /**
-         * Rotate x axis tick text. If you set negative value, it will rotate to opposite direction.
-         */
-        rotate?: number;
-        /**
-         * Show x axis outer tick.
-         */
-        outer?: boolean;
-        multiline?: boolean; // Undocumented
-    }
-
-    interface YTickConfiguration {
-        /**
-         * Set formatter for y axis tick text.
-         * This option accepts d3.format object as well as a function you define.
-         */
-        format?(x: number): string;
-        /**
-         * Show or hide outer tick.
-         */
-        outer?: boolean;
-        /**
-         * Set the y values of ticks manually.
-         */
-        values?: number[];
-        /**
-         * The number of y axis ticks to show.
-         * The position of the ticks will be calculated precisely, so the values on the ticks will not be rounded nicely. In the case, axis.y.tick.format or axis.y.tick.values will be helpful.
-         */
-        count?: number;
-    }
-
-    interface CullingConfiguration {
-        /**
-         * The number of tick texts will be adjusted to less than this value.
-         */
-        max: number;
-    }
-
-    interface Grid {
-        x?: {
-            /**
-             * Show grids along x axis.
-             */
-            show?: boolean;
-            /**
-             * Show additional grid lines along x axis.
-             * This option accepts array including object that has value, text, position and class. text, position and class are optional. For position, start, middle and end (default) are available.
-             * If x axis is category axis, value can be category name. If x axis is timeseries axis, value can be date string, Date object and unixtime integer.
-             */
-            lines?: LineOptions[];
-        };
-        y?: {
-            /**
-             * Show grids along y axis.
-             */
-            show?: boolean;
-            /**
-             * Show additional grid lines along y axis.
-             * This option accepts array including object that has value, text, position and class.
-             */
-            lines?: LineOptions[];
-        };
-    }
-
-    interface LineOptions {
-        value: number;
-        text?: string;
-        axis?: string;
-        position?: string;
-        class?: string;
-    }
-
-    interface RegionOptions {
-        axis?: string;
-        start?: string | number | Date;
-        end?: string | number | Date;
-        class?: string;
-    }
-
-    interface LegendOptions {
-        /**
-         * Show or hide legend.
-         */
-        show?: boolean;
-        /**
-         * Hide legend
-         * If true given, all legend will be hidden. If string or array given, only the legend that has the id will be hidden.
-         */
-        hide?: boolean | ArrayOrString;
-        /**
-         * Change the position of legend.
-         * Currently bottom, right and inset are supported.
-         */
-        position?: string;
-        /**
-         * Change inset legend attributes.
-         * This option accepts object that has the keys anchor, x, y and step.
-         * anchor decides the position of the legend. These anchors are available: top-left, top-right, bottom-left, bottom-right
-         * x and y set the position of the legend based on the anchor.
-         * step defines the max step the lagend has (e.g. If 2 set and legend has 3 legend item, the legend 2 columns).
-         */
-        inset?: {
-            anchor?: string;
-            x?: number;
-            y?: number;
-            step?: number;
-        };
-
-        item?: {
-            /**
-             * Set click event handler to the legend item.
-             */
-            onclick?(id: any): void;
-            /**
-             * Set mouseover event handler to the legend item.
-             */
-            onmouseover?(id: any): void;
-            /**
-             * Set mouseout event handler to the legend item.
-             */
-            onmouseout?(id: any): void;
-        };
-    }
-
-    interface TooltipOptions {
-        /**
-         * Show or hide tooltip.
-         */
-        show?: boolean;
-        /**
-         * Set if tooltip is grouped or not for the data points.
-         */
-        grouped?: boolean;
-        format?: {
-            /**
-             * Set format for the title of tooltip. Specified function receives x of the data point to show.
-             */
-            title?(x: any): string;
-            /**
-             * Set format for the name of each data in tooltip. Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not
-             * donut/pie/gauge.
-             */
-            name?(name: string, ratio: number, id: string, index: number): string;
-            /**
-             * Set format for the value of each data in tooltip.
-             * Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
-             * If undefined returned, the row of that value will be skipped.
-             */
-            value?(value: any, ratio: number, id: string, index: number): string;
-        };
-        /**
-         * Set custom position for the tooltip. This option can be used to modify the tooltip position by returning object that has top and left.
-         */
-        position?(data: any, width: number, height: number, element: any): { top: number; left: number };
-        /**
-         * Set custom HTML for the tooltip.
-         * Specified function receives data, defaultTitleFormat, defaultValueFormat and color of the data point to show. If tooltip.grouped is true, data includes multiple data points.
-         */
-        contents?(data: any, defaultTitleFormat: string, defaultValueFormat: string, color: any): string;
-    }
-
-    interface SubchartOptions {
-        /**
-         * Show sub chart on the bottom of the chart.
-         */
-        show?: boolean;
-        size?: {
-            /**
-             * Change the height of the subchart.
-             */
-            height: number;
-        };
-        /**
-         * Set callback for brush event.
-         * Specified function receives the current zoomed x domain.
-         */
-        onbrush?(domain: any): void;
-    }
-
-    interface ZoomOptions {
-        /**
-         * Enable zooming.
-         */
-        enabled?: boolean;
-        /**
-         * Enable to rescale after zooming. If true set, y domain will be updated according to the zoomed region.
-         */
-        rescale?: boolean;
-        /**
-         * Change zoom extent.
-         */
-        extent?: [number, number];
-        /**
-         * Set callback that is called when the chart is zooming. Specified function receives the zoomed domain.
-         */
-        onzoom?(domain: any): void;
-        /**
-         * Set callback that is called when zooming starts. Specified function receives the zoom event.
-         */
-        onzoomstart?(event: Event): void;
-        /**
-         * Set callback that is called when zooming ends. Specified function receives the zoomed domain.
-         */
-        onzoomend?(domain: any): void;
-    }
-
-    interface PointOptions {
-        /**
-         * Whether to show each point in line.
-         */
-        show?: boolean;
-        /**
-         * The radius size of each point.
-         */
-        r?: number | ((d: any) => number);
-
-        focus?: {
-            expand: {
-                /**
-                 * Whether to expand each point on focus.
-                 */
-                enabled?: boolean;
-                /**
-                 * The radius size of each point on focus.
-                 */
-                r?: number
-            };
-        };
-
-        select?: {
-            /**
-             * The radius size of each point on selected.
-             */
-            r?: number;
-        };
-    }
-
-    interface ChartAPI {
-        /**
-         * This API highlights specified targets and fade out the others.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be highlighted.
-         */
-        focus(targetIds?: ArrayOrString): void;
-        /**
-         * This API fades out specified targets and reverts the others.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be faded out.
-         */
-        defocus(targetIds?: ArrayOrString): void;
-        /**
-         * This API reverts specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be reverted.
-         */
-        revert(targetIds?: ArrayOrString): void;
-
-        /**
-         * This API shows specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be shown.
-         * If withLegend is set true, legend will be shown together with the specified data.
-         */
-        show(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
-        /**
-         * This API hides specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be hidden.
-         * If withLegend is set true, legend will be hidden together with the specified data.
-         */
-        hide(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
-        /**
-         * This API toggles (shows or hides) specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
-         * If withLegend is set true, legend will be toggled together with the specified data.
-         */
-        toggle(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
-        /**
-         * Load data to the chart.
-         * If url, json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be updated. Otherwise, new target will be added.
-         * If classes given, the classes specifed by data.classes will be updated. classes must be Object that has target id as keys.
-         * If categories given, the categories specifed by axis.x.categories or data.x will be updated. categories must be Array.
-         * If axes given, the axes specifed by data.axes will be updated. axes must be Object that has target id as keys.
-         * If colors given, the colors specifed by data.colors will be updated. colors must be Object that has target id as keys.
-         * If type or types given, the type of targets will be updated. type must be String and types must be Object.
-         * If unload given, data will be unloaded before loading new data. If true given, all of data will be unloaded. If target ids given as String or Array, specified targets will be unloaded.
-         * If done given, the specified function will be called after data loded.
-         * NOTE: unload should be used if some data needs to be unloaded simultaneously. If you call unload API soon after/before load instead of unload param, chart will not be rendered properly
-         * because of cancel of animation.
-         * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
-         */
-        load(args: {
-            url?: string;
-            json?: {};
-            keys?: { x?: string; value: string[]; }
-            rows?: PrimitiveArray[];
-            columns?: PrimitiveArray[];
-            names?: { [key: string]: string };
-            classes?: { [key: string]: string };
-            categories?: string[];
-            axes?: { [key: string]: string };
-            colors?: { [key: string]: string | d3.Rgb };
-            type?: string;
-            types?: { [key: string]: string };
-            unload?: boolean | ArrayOrString;
-            done?(): any;
-        }): void;
-        /**
-         * Unload data to the chart.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
-         * If ids given, the data that has specified target id will be unloaded. ids should be String or Array. If ids is not specified, all data will be unloaded.
-         * If done given, the specified function will be called after data loded.
-         * NOTE: If you call load API soon after/before unload, unload param of load should be used. Otherwise chart will not be rendered properly because of cancel of animation.
-         * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
-         */
-        unload(targetIds?: TargetIds, done?: () => any): any;
-        /**
-         * Flow data to the chart. By this API, you can append new data points to the chart.
-         * If json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be appended. Otherwise, new target will be added. One of these is
-         * required when calling. If json specified, keys is required as well as data.json
-         * If to is given, the lower x edge will move to that point. If not given, the lower x edge will move by the number of given data points.
-         * If length is given, the lower x edge will move by the number of this argument.
-         * If duration is given, the duration of the transition will be specified value. If not given, transition.duration will be used as default.
-         * If done is given, the specified function will be called when flow ends.
-         */
-        flow(args: {
-            json?: {};
-            keys?: { x?: string; value: string[]; }
-            rows?: PrimitiveArray[];
-            columns?: PrimitiveArray[];
-            to?: any;
-            length?: number;
-            duration?: number;
-            done?(): any;
-        }): void;
-        /**
-         * Change data point state to selected. By this API, you can select data points. To use this API, data.selection.enabled needs to be set true.
-         * @param ids Specify target ids to be selected. If this argument is not given, all targets will be the candidate.
-         * @param indices Specify indices to be selected. If this argument is not given, all data points will be the candidate.
-         * @param resetOthers If this argument is set true, the data points that are not specified by ids, indices will be unselected.
-         */
-        select(ids?: string[], indices?: number[], resetOthers?: boolean): void;
-        /**
-         * Change data point state to unselected. By this API, you can unselect data points. To use this API, data.selection.enabled needs to be set true.
-         * @param ids Specify target ids to be unselected. If this argument is not given, all targets will be the candidate.
-         * @param indices Specify indices to be unselected. If this argument is not given, all data points will be the candidate.
-         */
-        unselect(ids?: string[], indices?: number[]): void;
-        /**
-         * Get selected data points. By this API, you can get selected data points information. To use this API, data.selection.enabled needs to be set true.
-         * @param targetId You can filter the result by giving target id that you want to get. If not given, all of data points will be returned.
-         */
-        selected(targetId?: string): Data;
-        /**
-         * Change the type of the chart.
-         * @param type Specify the type to be transformed. The types listed in data.type can be used.
-         * @param targetIds Specify targets to be transformed. If not given, all targets will be the candidate.
-         */
-        transform(type: string, targetIds?: ArrayOrString): void;
-        /**
-         * Update groups for the targets.
-         * @param groups This argument needs to be an Array that includes one or more Array that includes target ids to be grouped.
-         */
-        groups(groups: string[][]): void;
-
-        xgrids: GridOperations;
-
-        ygrids: GridOperations;
-
-        regions: {
-            /**
-             * Update regions.
-             * @param regions Regions will be replaced with this argument. The format of this argument is the same as regions.
-             */
-            (regions: any[]): void;
-            /**
-             * Add new region. This API adds new region instead of replacing like regions.
-             * @param grids New region will be added. The format of this argument is the same as regions and it's possible to give an Object if only one region will be added.
-             */
-            add(regions: any[] | {}): void;
-            /**
-             * Remove regions. This API removes regions.
-             * @param args This argument should include classes. If classes is given, the regions that have one of the specified classes will be removed. If args is not given, all of regions will be
-             * removed.
-             */
-            remove(args?: { value?: number | string; class?: string }): void;
-        };
-
-        data: {
-            /**
-             * Get data loaded in the chart.
-             * @param targetIds If this argument is given, this API returns the specified target data. If this argument is not given, all of data will be returned.
-             */
-            (targetIds?: ArrayOrString): Data;
-            /**
-             * Get data shown in the chart.
-             * @param targetIds If this argument is given, this API filters the data with specified target ids. If this argument is not given, all shown data will be returned.
-             */
-            shown(targetIds?: ArrayOrString): Data;
-            /**
-             * Get values of the data loaded in the chart.
-             * @param targetIds This API returns the values of specified target. If this argument is not given, null will be retruned.
-             */
-            values(targetIds?: ArrayOrString): any[];
-            /**
-             * Get and set names of the data loaded in the chart.
-             * @param names If this argument is given, the names of data will be updated. If not given, the current names will be returned. The format of this argument is the same as data.names.
-             */
-            names(names?: { [key: string]: string }): { [key: string]: string };
-            /**
-             * Get and set colors of the data loaded in the chart.
-             * @param colors If this argument is given, the colors of data will be updated. If not given, the current colors will be returned. The format of this argument is the same as data.colors.
-             */
-            colors(colors?: { [key: string]: string | d3.Rgb }): { [key: string]: string };
-            /**
-             * Get and set axes of the data loaded in the chart.
-             * @param axes If this argument is given, the axes of data will be updated. If not given, the current axes will be returned. The format of this argument is the same as data.axes.
-             */
-            axes(axes?: { [key: string]: string }): { [key: string]: string };
-        };
-
-        /**
-         * Gets and sets the value a category
-         * @param index Index of the category to get or set
-         * @param category: Value of the category to update
-         */
-        category(index: number, category?: string): string;
-
-        /**
-         * Get and set the categories
-         * @param categories: Value of the categories to update
-         */
-        categories(categories?: string[]): string[];
-
-        /**
-         * Get the color for the specified targetId
-         */
-        color(targetId: string): string;
-
-        /**
-         * Get and set x values for the chart.
-         * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
-         */
-        x(x?: PrimitiveArray): PrimitiveArray;
-
-        /**
-         * Get and set x values for the chart.
-         * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
-         */
-        xs(xs?: { [key: string]: PrimitiveArray }): { [key: string]: PrimitiveArray };
-
-        axis: {
-            /**
-             * Get and set axis labels.
-             * @param labels If labels is given, specified axis' label will be updated.
-             */
-            labels(labels?: { [key: string]: string }): { [key: string]: string }
-            /**
-             * Get and set axis min value.
-             * @param min If min is given, specified axis' min value will be updated. If no argument is given, the current min values for each axis will be returned.
-             */
-            min(min?: number | { [key: string]: number }): number | { [key: string]: number }
-            /**
-             * Get and set axis max value.
-             * @param max If max is given, specified axis' max value will be updated. If no argument is given, the current max values for each axis will be returned.
-             */
-            max(max?: number | { [key: string]: number }): number | { [key: string]: number }
-            /**
-             * Get and set axis min and max value.
-             * @param range If range is given, specified axis' min and max value will be updated. If no argument is given, the current min and max values for each axis will be returned.
-             */
-            range(range?: { min?: number | { [key: string]: number }; max?: number | { [key: string]: number } }): { min: number | { [key: string]: number }; max: number | { [key: string]: number } }
-        };
-
-        legend: {
-            /**
-             * Show legend for each target.
-             * @param targetIds If targetIds is given, specified target's legend will be shown. If only one target is the candidate, String can be passed. If no argument is given, all of target's
-             * legend will be shown.
-             */
-            show(targetIds?: ArrayOrString): void;
-            /**
-             * Hide legend for each target.
-             * @param targetIds If targetIds is given, specified target's legend will be hidden. If only one target is the candidate, String can be passed. If no argument is given, all of target's
-             * legend will be hidden.
-             */
-            hide(targetIds?: ArrayOrString): void;
-        };
-
-        zoom: {
-            /**
-             * Zoom by giving x domain.
-             * @param domain If domain is given, the chart will be zoomed to the given domain. If no argument is given, the current zoomed domain will be returned.
-             */
-            (domain?: number[]): number[];
-
-            /**
-             * Enable and disable zooming.
-             * @param enabled If enabled is true, the feature of zooming will be enabled. If false is given, it will be disabled.
-             */
-            enable(enabled: boolean): void;
-        };
-
-        /**
-         * Unzoom to the original domain.
-         */
-        unzoom(): void;
-
-        /**
-         * Resize the chart. If no size is specified it will resize to fit.
-         * @param size This argument should include width and height in pixels.
-         */
-        resize(size?: { width?: number; height?: number }): void;
-
-        /**
-         * Force to redraw.
-         */
-        flush(): void;
-
-        /**
-         * Reset the chart object and remove element and events completely.
-         */
-        destroy(): void;
-    }
-
-    interface GridOperations {
-        /**
-         * Update the x/y grid lines.
-         * @param grids X/Y grid lines will be replaced with this argument. The format of this argument is the same as grid.x.lines or grid.y.lines.
-         */
-        (grids: any[]): void;
-        /**
-         * Add x/y grid lines. This API adds new x/y grid lines instead of replacing like xgrids.
-         * @param grids New x/y grid lines will be added. The format of this argument is the same as grid.x.lines or grid.y.lines and it's possible to give an Object if only one line will be added.
-         */
-        add(grids: any[] | {}): void;
-        /**
-         * Remove x/y grid lines. This API removes x/y grid lines.
-         * @param args This argument should include value or class. If value is given, the x/y grid lines that have specified x/y value will be removed. If class is given, the x/y grid lines that
-         * have specified class will be removed. If args is not given, all of x/y grid lines will be removed.
-         */
-        remove(args?: { class?: string; value?: number | string }): void;
-    }
-
-    function generate(config: ChartConfiguration): ChartAPI;
+    };
 }
+
+export interface Data {
+    /**
+     * Load a CSV or JSON file from a URL. Note that this will not work if loading via the "file://" protocol as most browsers with block XMLHTTPRequests.
+     */
+    url?: string;
+    /**
+     * Parse a JSON object for data.
+     */
+    json?: {};
+    /**
+     * Load data from a multidimensional array, with the first element containing the data names, the following containing related data in that order.
+     */
+    rows?: PrimitiveArray[];
+    /*
+        * Load data from a multidimensional array, with each element containing an array consisting of a datum name and associated data values.
+        */
+    columns?: PrimitiveArray[];
+    /**
+     * Used if loading JSON via data.url
+     */
+    mimeType?: string;
+    /**
+     * Choose which JSON object keys correspond to desired data.
+     */
+    keys?: { x?: string; value: string[]; };
+    /**
+     * Specify the key of x values in the data.
+     * We can show the data with non-index x values by this option. This option is required when the type of x axis is timeseries. If this option is set on category axis, the values of the data
+     * on the key will be used for category names.
+     */
+    x?: string;
+    /**
+     * Specify the keys of the x values for each data.
+     * This option can be used if we want to show the data that has different x values.
+     */
+    xs?: { [key: string]: string };
+    /**
+     * Set a format to parse string specifed as x.
+     * Default is %Y-%m-%d
+     */
+    xFormat?: string;
+    // xLocaltime?: any;
+    // xSort?: any;
+    /**
+     * Set custom data name.
+     */
+    names?: { [key: string]: string };
+    /**
+     * Set custom data class.
+     * If this option is specified, the element g for the data has an additional class that has the prefix c3-target- (e.g. c3-target-additional-data1-class).
+     */
+    classes?: { [key: string]: string };
+    /**
+     * Set groups for the data for stacking.
+     */
+    groups?: string[][];
+    /**
+     * Set y axis the data related to. y and y2 can be used.
+     */
+    axes?: { [key: string]: string };
+    /**
+     * Set chart type at once.
+     * If this option is specified, the type will be applied to every data. This setting can be overwritten by data.types.
+     * Available Values: line, spline, step, area, area-spline, area-step, bar, scatter, pie, donut, gauge
+     */
+    type?: string;
+    /**
+     * Set chart type for each data.
+     * This setting overwrites data.type setting.
+     */
+    types?: { [key: string]: string };
+    /**
+     * Show labels on each data points or set formatter function for data labels.
+     * The formatter function receives 4 arguments such as v, id, i, j and it must return a string that will be shown as the label. The arguments are:
+     * - v is the value of the data point where the label is shown.
+     * - id is the id of the data where the label is shown.
+     * - i is the index of the data point where the label is shown.
+     * - j is the sub index of the data point where the label is shown.
+     * Formatter function can be defined for each data by specifying as an object and D3 formatter function can be set (e.g. d3.format('$'))
+     */
+    labels?: boolean |
+    { format: FormatFunction } |
+    { format: { [key: string]: FormatFunction } };
+    /**
+     * Define the order of the data.
+     * This option changes the order of stacking the data and pieces of pie/donut. If null specified, it will be the order the data loaded. If function specified, it will be used to sort the data
+     * and it will recieve the data as argument.
+     * Available Values: desc, asc, function (data1, data2) { ... }, null
+     */
+    order?: string | ((...data: string[]) => void) | null;
+    /**
+     * Define regions for each data.
+     * The values must be an array for each data and it should include an object that has start, end, style. If start is not set, the start will be the first data point. If end is not set, the
+     * end will be the last data point.
+     * Currently this option supports only line chart and dashed style. If this option specified, the line will be dashed only in the regions.
+     */
+    regions?: { [key: string]: any };
+    /**
+     * Set color converter function.
+     * This option should a function and the specified function receives color (e.g. '#ff0000') and d that has data parameters like id, value, index, etc. And it must return a string that
+     * represents color (e.g. '#00ff00').
+     */
+    color?(color: string, d: any): string | d3.Rgb;
+    /**
+     * Set color for each data.
+     */
+    colors?: { [key: string]: string | d3.Rgb | ((d: any) => string | d3.Rgb) };
+    /**
+     * Hide each data when the chart appears.
+     * If true specified, all of data will be hidden. If multiple ids specified as an array, those will be hidden.
+     */
+    hide?: boolean | string[];
+    /**
+     * Set text displayed when empty data.
+     */
+    empty?: { label: { text: string } };
+
+    selection?: {
+        enabled?: boolean;
+        grouped?: boolean;
+        multiple?: boolean;
+        draggable?: boolean;
+        isselectable?(d?: any): boolean;
+    };
+    /**
+     * Set a callback for click event on each data point.
+     * This callback will be called when each data point clicked and will receive d and element as the arguments.
+     * - d is the data clicked and element is the element clicked. In this callback, this will be the Chart object.
+     */
+    onclick?(d: any, element: any): void;
+    /**
+     * Set a callback for mouseover event on each data point.
+     * This callback will be called when mouse cursor moves onto each data point and will receive d as the argument.
+     * - d is the data where mouse cursor moves onto. In this callback, this will be the Chart object.
+     */
+    onmouseover?(d: any, element?: any): void;
+    /**
+     * Set a callback for mouseout event on each data point.
+     * This callback will be called when mouse cursor moves out each data point and will receive d as the argument.
+     * - d is the data where mouse cursor moves out. In this callback, this will be the Chart object.
+     */
+    onmouseout?(d: any, element?: any): void;
+
+    onselected?(d: any, element?: any): void;
+
+    onunselected?(d: any, element?: any): void;
+}
+
+export interface Axis {
+    /**
+     * Switch x and y axis position.
+     */
+    rotated?: boolean;
+    x?: XAxisConfiguration;
+    y?: YAxisConfiguration;
+    y2?: YAxisConfiguration;
+}
+
+export interface XAxisConfiguration {
+    /**
+     * Show or hide x axis.
+     */
+    show?: boolean;
+    /**
+     * Set type of x axis (timeseries, category, indexed)
+     */
+    type?: string;
+    /**
+     * Set how to treat the timezone of x values.
+     * If true, treat x value as localtime. If false, convert to UTC internally.
+     */
+    localtime?: boolean;
+    /**
+     * Set category names on category axis.
+     * This must be an array that includes category names in string. If category names are included in the date by data.x option, this is not required.
+     */
+    categories?: string[];
+
+    tick?: XTickConfiguration;
+    /**
+     * Set max value of x axis range.
+     */
+    max?: string | number | Date;
+    /**
+     * Set min value of x axis range.
+     */
+    min?: string | number | Date;
+    /**
+     * Set padding for x axis.
+     * If this option is set, the range of x axis will increase/decrease according to the values. If no padding is needed in the ragen of x axis, 0 should be set. On category axis, this option
+     * will be ignored.
+     */
+    padding?: {
+        left?: number;
+        right?: number;
+    };
+    /**
+     * Set height of x axis.
+     * The height of x axis can be set manually by this option. If you need more space for x axis, please use this option for that. The unit is pixel.
+     */
+    height?: number;
+    /**
+     * Set default extent for subchart and zoom. This can be an array or function that returns an array.
+     */
+    extent?: number[] | (() => number[]);
+    /**
+     * Set label on x axis.
+     * You can set x axis label and change its position by this option. string and object can be passed and we can change the poisiton by passing object that has position key. Available position
+     * differs according to the axis direction (vertical or horizontal). If string set, the position will be the default.
+     * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
+     * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
+     */
+    label?: string | { text: string; position: string };
+}
+
+export interface YAxisConfiguration {
+    /**
+     * Show or hide y axis.
+     */
+    show?: boolean;
+    /**
+     * Show y axis inside of the chart.
+     */
+    inner?: boolean;
+    /**
+     * Set max value of y axis.
+     */
+    max?: number;
+    /**
+     * Set min value of y axis.
+     */
+    min?: number;
+    /**
+     * Change the direction of y axis.
+     * If true set, the direction will be from the top to the bottom.
+     */
+    inverted?: boolean;
+    /**
+     * Set center value of y axis.
+     */
+    center?: number;
+    /**
+     * Set label on y axis. This option works in the same way as axis.x.label.
+     * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
+     * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
+     */
+    label?: string | { text: string; position: string };
+    tick?: YTickConfiguration;
+    /**
+     * Set padding for y axis.
+     * You can set padding for y axis to create more space on the edge of the axis. This option accepts object and it can include top and bottom. top, bottom will be treated as pixels.
+     */
+    padding?: {
+        top?: number;
+        bottom?: number;
+    };
+    /**
+     * Set default range of y axis. This option set the default value for y axis when there is no data on init.
+     */
+    default?: number[];
+}
+
+export interface XTickConfiguration {
+    /**
+     * Centerise ticks on category axis
+     */
+    centered?: boolean;
+    /**
+     * A function to format tick value. Format string is also available for timeseries data.
+     */
+    format?: string | ((x: number | Date) => string | number);
+    /**
+     * Setting for culling ticks.
+     * If true is set, the ticks will be culled, then only limitted tick text will be shown. This option does not hide the tick lines. If false is set, all of ticks will be shown.
+     */
+    culling?: boolean | CullingConfiguration;
+    /**
+     * The number of x axis ticks to show.
+     * This option hides tick lines together with tick text. If this option is used on timeseries axis, the ticks position will be determined precisely and not nicely positioned (e.g. it will
+     * have rough second value).
+     */
+    count?: number;
+    /**
+     * Fit x axis ticks.
+     * If true set, the ticks will be positioned nicely. If false set, the ticks will be positioned according to x value of the data points.
+     */
+    fit?: boolean;
+    /**
+     * Set the x values of ticks manually.
+     * If this option is provided, the position of the ticks will be determined based on those values. This option works with timeseries data and the x values will be parsed accoding to the type
+     * of the value and data.xFormat option.
+     */
+    values?: number[] | string[];
+    /**
+     * Rotate x axis tick text. If you set negative value, it will rotate to opposite direction.
+     */
+    rotate?: number;
+    /**
+     * Show x axis outer tick.
+     */
+    outer?: boolean;
+    multiline?: boolean; // Undocumented
+}
+
+export interface YTickConfiguration {
+    /**
+     * Set formatter for y axis tick text.
+     * This option accepts d3.format object as well as a function you define.
+     */
+    format?(x: number): string;
+    /**
+     * Show or hide outer tick.
+     */
+    outer?: boolean;
+    /**
+     * Set the y values of ticks manually.
+     */
+    values?: number[];
+    /**
+     * The number of y axis ticks to show.
+     * The position of the ticks will be calculated precisely, so the values on the ticks will not be rounded nicely. In the case, axis.y.tick.format or axis.y.tick.values will be helpful.
+     */
+    count?: number;
+}
+
+export interface CullingConfiguration {
+    /**
+     * The number of tick texts will be adjusted to less than this value.
+     */
+    max: number;
+}
+
+export interface Grid {
+    x?: {
+        /**
+         * Show grids along x axis.
+         */
+        show?: boolean;
+        /**
+         * Show additional grid lines along x axis.
+         * This option accepts array including object that has value, text, position and class. text, position and class are optional. For position, start, middle and end (default) are available.
+         * If x axis is category axis, value can be category name. If x axis is timeseries axis, value can be date string, Date object and unixtime integer.
+         */
+        lines?: LineOptions[];
+    };
+    y?: {
+        /**
+         * Show grids along y axis.
+         */
+        show?: boolean;
+        /**
+         * Show additional grid lines along y axis.
+         * This option accepts array including object that has value, text, position and class.
+         */
+        lines?: LineOptions[];
+    };
+}
+
+export interface LineOptions {
+    value: string | number | Date;
+    text?: string;
+    axis?: string;
+    position?: string;
+    class?: string;
+}
+
+export interface RegionOptions {
+    axis?: string;
+    start?: string | number | Date;
+    end?: string | number | Date;
+    class?: string;
+}
+
+export interface LegendOptions {
+    /**
+     * Show or hide legend.
+     */
+    show?: boolean;
+    /**
+     * Hide legend
+     * If true given, all legend will be hidden. If string or array given, only the legend that has the id will be hidden.
+     */
+    hide?: boolean | ArrayOrString;
+    /**
+     * Change the position of legend.
+     * Currently bottom, right and inset are supported.
+     */
+    position?: string;
+    /**
+     * Change inset legend attributes.
+     * This option accepts object that has the keys anchor, x, y and step.
+     * anchor decides the position of the legend. These anchors are available: top-left, top-right, bottom-left, bottom-right
+     * x and y set the position of the legend based on the anchor.
+     * step defines the max step the lagend has (e.g. If 2 set and legend has 3 legend item, the legend 2 columns).
+     */
+    inset?: {
+        anchor?: string;
+        x?: number;
+        y?: number;
+        step?: number;
+    };
+
+    item?: {
+        /**
+         * Set click event handler to the legend item.
+         */
+        onclick?(id: any): void;
+        /**
+         * Set mouseover event handler to the legend item.
+         */
+        onmouseover?(id: any): void;
+        /**
+         * Set mouseout event handler to the legend item.
+         */
+        onmouseout?(id: any): void;
+    };
+}
+
+export interface TooltipOptions {
+    /**
+     * Show or hide tooltip.
+     */
+    show?: boolean;
+    /**
+     * Set if tooltip is grouped or not for the data points.
+     */
+    grouped?: boolean;
+    format?: {
+        /**
+         * Set format for the title of tooltip. Specified function receives x of the data point to show.
+         */
+        title?(x: any): string;
+        /**
+         * Set format for the name of each data in tooltip. Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not
+         * donut/pie/gauge.
+         */
+        name?(name: string, ratio: number, id: string, index: number): string;
+        /**
+         * Set format for the value of each data in tooltip.
+         * Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
+         * If undefined returned, the row of that value will be skipped.
+         */
+        value?(value: any, ratio: number, id: string, index: number): string;
+    };
+    /**
+     * Set custom position for the tooltip. This option can be used to modify the tooltip position by returning object that has top and left.
+     */
+    position?(data: any, width: number, height: number, element: any): { top: number; left: number };
+    /**
+     * Set custom HTML for the tooltip.
+     * Specified function receives data, defaultTitleFormat, defaultValueFormat and color of the data point to show. If tooltip.grouped is true, data includes multiple data points.
+     */
+    contents?(data: any, defaultTitleFormat: string, defaultValueFormat: string, color: any): string;
+}
+
+export interface SubchartOptions {
+    /**
+     * Show sub chart on the bottom of the chart.
+     */
+    show?: boolean;
+    size?: {
+        /**
+         * Change the height of the subchart.
+         */
+        height: number;
+    };
+    /**
+     * Set callback for brush event.
+     * Specified function receives the current zoomed x domain.
+     */
+    onbrush?(domain: any): void;
+}
+
+export interface ZoomOptions {
+    /**
+     * Enable zooming.
+     */
+    enabled?: boolean;
+    /**
+     * Enable to rescale after zooming. If true set, y domain will be updated according to the zoomed region.
+     */
+    rescale?: boolean;
+    /**
+     * Change zoom extent.
+     */
+    extent?: [number, number];
+    /**
+     * Set callback that is called when the chart is zooming. Specified function receives the zoomed domain.
+     */
+    onzoom?(domain: any): void;
+    /**
+     * Set callback that is called when zooming starts. Specified function receives the zoom event.
+     */
+    onzoomstart?(event: Event): void;
+    /**
+     * Set callback that is called when zooming ends. Specified function receives the zoomed domain.
+     */
+    onzoomend?(domain: any): void;
+}
+
+export interface PointOptions {
+    /**
+     * Whether to show each point in line.
+     */
+    show?: boolean;
+    /**
+     * The radius size of each point.
+     */
+    r?: number | ((d: any) => number);
+
+    focus?: {
+        expand: {
+            /**
+             * Whether to expand each point on focus.
+             */
+            enabled?: boolean;
+            /**
+             * The radius size of each point on focus.
+             */
+            r?: number
+        };
+    };
+
+    select?: {
+        /**
+         * The radius size of each point on selected.
+         */
+        r?: number;
+    };
+}
+
+export interface ChartAPI {
+    /**
+     * This API highlights specified targets and fade out the others.
+     * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be highlighted.
+     */
+    focus(targetIds?: ArrayOrString): void;
+    /**
+     * This API fades out specified targets and reverts the others.
+     * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be faded out.
+     */
+    defocus(targetIds?: ArrayOrString): void;
+    /**
+     * This API reverts specified targets.
+     * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be reverted.
+     */
+    revert(targetIds?: ArrayOrString): void;
+
+    /**
+     * This API shows specified targets.
+     * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be shown.
+     * If withLegend is set true, legend will be shown together with the specified data.
+     */
+    show(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
+    /**
+     * This API hides specified targets.
+     * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be hidden.
+     * If withLegend is set true, legend will be hidden together with the specified data.
+     */
+    hide(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
+    /**
+     * This API toggles (shows or hides) specified targets.
+     * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
+     * If withLegend is set true, legend will be toggled together with the specified data.
+     */
+    toggle(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
+    /**
+     * Load data to the chart.
+     * If url, json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be updated. Otherwise, new target will be added.
+     * If classes given, the classes specifed by data.classes will be updated. classes must be Object that has target id as keys.
+     * If categories given, the categories specifed by axis.x.categories or data.x will be updated. categories must be Array.
+     * If axes given, the axes specifed by data.axes will be updated. axes must be Object that has target id as keys.
+     * If colors given, the colors specifed by data.colors will be updated. colors must be Object that has target id as keys.
+     * If type or types given, the type of targets will be updated. type must be String and types must be Object.
+     * If unload given, data will be unloaded before loading new data. If true given, all of data will be unloaded. If target ids given as String or Array, specified targets will be unloaded.
+     * If done given, the specified function will be called after data loded.
+     * NOTE: unload should be used if some data needs to be unloaded simultaneously. If you call unload API soon after/before load instead of unload param, chart will not be rendered properly
+     * because of cancel of animation.
+     * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
+     */
+    load(args: {
+        url?: string;
+        json?: {};
+        keys?: { x?: string; value: string[]; }
+        rows?: PrimitiveArray[];
+        columns?: PrimitiveArray[];
+        names?: { [key: string]: string };
+        classes?: { [key: string]: string };
+        categories?: string[];
+        axes?: { [key: string]: string };
+        colors?: { [key: string]: string | d3.Rgb };
+        type?: string;
+        types?: { [key: string]: string };
+        unload?: boolean | ArrayOrString;
+        done?(): any;
+    }): void;
+    /**
+     * Unload data to the chart.
+     * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
+     * If ids given, the data that has specified target id will be unloaded. ids should be String or Array. If ids is not specified, all data will be unloaded.
+     * If done given, the specified function will be called after data loded.
+     * NOTE: If you call load API soon after/before unload, unload param of load should be used. Otherwise chart will not be rendered properly because of cancel of animation.
+     * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
+     */
+    unload(targetIds?: TargetIds, done?: () => any): any;
+    /**
+     * Flow data to the chart. By this API, you can append new data points to the chart.
+     * If json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be appended. Otherwise, new target will be added. One of these is
+     * required when calling. If json specified, keys is required as well as data.json
+     * If to is given, the lower x edge will move to that point. If not given, the lower x edge will move by the number of given data points.
+     * If length is given, the lower x edge will move by the number of this argument.
+     * If duration is given, the duration of the transition will be specified value. If not given, transition.duration will be used as default.
+     * If done is given, the specified function will be called when flow ends.
+     */
+    flow(args: {
+        json?: {};
+        keys?: { x?: string; value: string[]; }
+        rows?: PrimitiveArray[];
+        columns?: PrimitiveArray[];
+        to?: any;
+        length?: number;
+        duration?: number;
+        done?(): any;
+    }): void;
+    /**
+     * Change data point state to selected. By this API, you can select data points. To use this API, data.selection.enabled needs to be set true.
+     * @param ids Specify target ids to be selected. If this argument is not given, all targets will be the candidate.
+     * @param indices Specify indices to be selected. If this argument is not given, all data points will be the candidate.
+     * @param resetOthers If this argument is set true, the data points that are not specified by ids, indices will be unselected.
+     */
+    select(ids?: string[], indices?: number[], resetOthers?: boolean): void;
+    /**
+     * Change data point state to unselected. By this API, you can unselect data points. To use this API, data.selection.enabled needs to be set true.
+     * @param ids Specify target ids to be unselected. If this argument is not given, all targets will be the candidate.
+     * @param indices Specify indices to be unselected. If this argument is not given, all data points will be the candidate.
+     */
+    unselect(ids?: string[], indices?: number[]): void;
+    /**
+     * Get selected data points. By this API, you can get selected data points information. To use this API, data.selection.enabled needs to be set true.
+     * @param targetId You can filter the result by giving target id that you want to get. If not given, all of data points will be returned.
+     */
+    selected(targetId?: string): Data;
+    /**
+     * Change the type of the chart.
+     * @param type Specify the type to be transformed. The types listed in data.type can be used.
+     * @param targetIds Specify targets to be transformed. If not given, all targets will be the candidate.
+     */
+    transform(type: string, targetIds?: ArrayOrString): void;
+    /**
+     * Update groups for the targets.
+     * @param groups This argument needs to be an Array that includes one or more Array that includes target ids to be grouped.
+     */
+    groups(groups: string[][]): void;
+
+    xgrids: GridOperations;
+
+    ygrids: GridOperations;
+
+    regions: {
+        /**
+         * Update regions.
+         * @param regions Regions will be replaced with this argument. The format of this argument is the same as regions.
+         */
+        (regions: any[]): void;
+        /**
+         * Add new region. This API adds new region instead of replacing like regions.
+         * @param grids New region will be added. The format of this argument is the same as regions and it's possible to give an Object if only one region will be added.
+         */
+        add(regions: any[] | {}): void;
+        /**
+         * Remove regions. This API removes regions.
+         * @param args This argument should include classes. If classes is given, the regions that have one of the specified classes will be removed. If args is not given, all of regions will be
+         * removed.
+         */
+        remove(args?: { value?: number | string; class?: string }): void;
+    };
+
+    data: {
+        /**
+         * Get data loaded in the chart.
+         * @param targetIds If this argument is given, this API returns the specified target data. If this argument is not given, all of data will be returned.
+         */
+        (targetIds?: ArrayOrString): Data;
+        /**
+         * Get data shown in the chart.
+         * @param targetIds If this argument is given, this API filters the data with specified target ids. If this argument is not given, all shown data will be returned.
+         */
+        shown(targetIds?: ArrayOrString): Data;
+        /**
+         * Get values of the data loaded in the chart.
+         * @param targetIds This API returns the values of specified target. If this argument is not given, null will be retruned.
+         */
+        values(targetIds?: ArrayOrString): any[];
+        /**
+         * Get and set names of the data loaded in the chart.
+         * @param names If this argument is given, the names of data will be updated. If not given, the current names will be returned. The format of this argument is the same as data.names.
+         */
+        names(names?: { [key: string]: string }): { [key: string]: string };
+        /**
+         * Get and set colors of the data loaded in the chart.
+         * @param colors If this argument is given, the colors of data will be updated. If not given, the current colors will be returned. The format of this argument is the same as data.colors.
+         */
+        colors(colors?: { [key: string]: string | d3.Rgb }): { [key: string]: string };
+        /**
+         * Get and set axes of the data loaded in the chart.
+         * @param axes If this argument is given, the axes of data will be updated. If not given, the current axes will be returned. The format of this argument is the same as data.axes.
+         */
+        axes(axes?: { [key: string]: string }): { [key: string]: string };
+    };
+
+    /**
+     * Gets and sets the value a category
+     * @param index Index of the category to get or set
+     * @param category: Value of the category to update
+     */
+    category(index: number, category?: string): string;
+
+    /**
+     * Get and set the categories
+     * @param categories: Value of the categories to update
+     */
+    categories(categories?: string[]): string[];
+
+    /**
+     * Get the color for the specified targetId
+     */
+    color(targetId: string): string;
+
+    /**
+     * Get and set x values for the chart.
+     * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
+     */
+    x(x?: PrimitiveArray): PrimitiveArray;
+
+    /**
+     * Get and set x values for the chart.
+     * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
+     */
+    xs(xs?: { [key: string]: PrimitiveArray }): { [key: string]: PrimitiveArray };
+
+    axis: {
+        /**
+         * Get and set axis labels.
+         * @param labels If labels is given, specified axis' label will be updated.
+         */
+        labels(labels?: { [key: string]: string }): { [key: string]: string }
+        /**
+         * Get and set axis min value.
+         * @param min If min is given, specified axis' min value will be updated. If no argument is given, the current min values for each axis will be returned.
+         */
+        min(min?: number | { [key: string]: number }): number | { [key: string]: number }
+        /**
+         * Get and set axis max value.
+         * @param max If max is given, specified axis' max value will be updated. If no argument is given, the current max values for each axis will be returned.
+         */
+        max(max?: number | { [key: string]: number }): number | { [key: string]: number }
+        /**
+         * Get and set axis min and max value.
+         * @param range If range is given, specified axis' min and max value will be updated. If no argument is given, the current min and max values for each axis will be returned.
+         */
+        range(range?: { min?: number | { [key: string]: number }; max?: number | { [key: string]: number } }): { min: number | { [key: string]: number }; max: number | { [key: string]: number } }
+    };
+
+    legend: {
+        /**
+         * Show legend for each target.
+         * @param targetIds If targetIds is given, specified target's legend will be shown. If only one target is the candidate, String can be passed. If no argument is given, all of target's
+         * legend will be shown.
+         */
+        show(targetIds?: ArrayOrString): void;
+        /**
+         * Hide legend for each target.
+         * @param targetIds If targetIds is given, specified target's legend will be hidden. If only one target is the candidate, String can be passed. If no argument is given, all of target's
+         * legend will be hidden.
+         */
+        hide(targetIds?: ArrayOrString): void;
+    };
+
+    zoom: {
+        /**
+         * Zoom by giving x domain.
+         * @param domain If domain is given, the chart will be zoomed to the given domain. If no argument is given, the current zoomed domain will be returned.
+         */
+        (domain?: number[]): number[];
+
+        /**
+         * Enable and disable zooming.
+         * @param enabled If enabled is true, the feature of zooming will be enabled. If false is given, it will be disabled.
+         */
+        enable(enabled: boolean): void;
+    };
+
+    /**
+     * Unzoom to the original domain.
+     */
+    unzoom(): void;
+
+    /**
+     * Resize the chart. If no size is specified it will resize to fit.
+     * @param size This argument should include width and height in pixels.
+     */
+    resize(size?: { width?: number; height?: number }): void;
+
+    /**
+     * Force to redraw.
+     */
+    flush(): void;
+
+    /**
+     * Reset the chart object and remove element and events completely.
+     */
+    destroy(): void;
+}
+
+export interface GridOperations {
+    /**
+     * Update the x/y grid lines.
+     * @param grids X/Y grid lines will be replaced with this argument. The format of this argument is the same as grid.x.lines or grid.y.lines.
+     */
+    (grids: any[]): void;
+    /**
+     * Add x/y grid lines. This API adds new x/y grid lines instead of replacing like xgrids.
+     * @param grids New x/y grid lines will be added. The format of this argument is the same as grid.x.lines or grid.y.lines and it's possible to give an Object if only one line will be added.
+     */
+    add(grids: any[] | {}): void;
+    /**
+     * Remove x/y grid lines. This API removes x/y grid lines.
+     * @param args This argument should include value or class. If value is given, the x/y grid lines that have specified x/y value will be removed. If class is given, the x/y grid lines that
+     * have specified class will be removed. If args is not given, all of x/y grid lines will be removed.
+     */
+    remove(args?: { class?: string; value?: number | string }): void;
+}
+
+export function generate(config: ChartConfiguration): ChartAPI;
diff --git a/types/cache-manager/index.d.ts b/types/cache-manager/index.d.ts
index 40d644b546..fcd4458767 100644
--- a/types/cache-manager/index.d.ts
+++ b/types/cache-manager/index.d.ts
@@ -16,13 +16,19 @@ interface StoreConfig extends CachingConfig {
 interface Cache {
     set<T>(key: string, value: T, options: CachingConfig, callback?: (error: any) => void): void;
     set<T>(key: string, value: T, ttl: number, callback?: (error: any) => void): void;
+    set<T>(key: string, value: T, options: CachingConfig): Promise<any>;
+    set<T>(key: string, value: T, ttl: number): Promise<any>;
 
     wrap<T>(key: string, wrapper: (callback: (error: any, result: T) => void) => void, options: CachingConfig, callback: (error: any, result: T) => void): void;
     wrap<T>(key: string, wrapper: (callback: (error: any, result: T) => void) => void, callback: (error: any, result: T) => void): void;
+    wrap<T>(key: string, wrapper: (callback: (error: any, result: T) => void) => any, options: CachingConfig): Promise<any>;
+    wrap<T>(key: string, wrapper: (callback: (error: any, result: T) => void) => void): Promise<any>;
 
     get<T>(key: string, callback: (error: any, result: T) => void): void;
+    get<T>(key: string): Promise<any>;
 
-    del(key: string, callback?: (error: any) => void): void;
+    del(key: string, callback: (error: any) => void): void;
+    del(key: string): Promise<any>;
 }
 
 
diff --git a/types/cache-manager/tslint.json b/types/cache-manager/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cache-manager/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cachefactory/cachefactory-tests.ts b/types/cachefactory/cachefactory-tests.ts
deleted file mode 100644
index 32eeb63257..0000000000
--- a/types/cachefactory/cachefactory-tests.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-CacheFactory.get('test');
-
-CacheFactory.createCache('test', {
-	deleteOnExpire: 'aggressive',
-	recycleFreq: 60000
-});
-
-let testCache = CacheFactory.get('test');
-
-testCache.put('testOne', {title: 'testOne', id: 1});
-
-let item = testCache.get('testOne');
-
-
-let profileCache = CacheFactory('profileCache', {
-	maxAge: 60 * 60 * 1000,
-	deleteOnExpire: 'aggressive'
-});
-
-let localStoragePolyfill = {
-	getItem: (key: string) => { return ""; },
-	setItem: (key: string, value: string) => { },
-	removeItem: (key: string) => { }
-};
-
-let myAwesomeCache = CacheFactory('myAwesomeCache', {
-	maxAge: 15 * 60 * 1000,
-	cacheFlushInterval: 60 * 60 * 1000,
-	deleteOnExpire: 'aggressive',
-	storageMode: 'localStorage',
-	storageImpl: localStoragePolyfill
-});
\ No newline at end of file
diff --git a/types/cachefactory/index.d.ts b/types/cachefactory/index.d.ts
deleted file mode 100644
index 658a2660f4..0000000000
--- a/types/cachefactory/index.d.ts
+++ /dev/null
@@ -1,441 +0,0 @@
-// Type definitions for CacheFactory 1.4.0
-// Project: https://github.com/jmdobry/CacheFactory
-// Definitions by: Vaggelis Mparmpas <https://github.com/vag1830>, Daniel Massa <https://github.com/danielmassa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace CacheFactory {
-	export interface IStoreImplementation {
-		getItem(key: string): string;
-
-		setItem(key: string, value: string): void;
-
-		removeItem(key: string): void;
-	}
-
-	export interface CacheGetOptions {
-		/*
-		 * A callback function to be executed whenever an expired item is removed from a cache when the cache is in passive
-		 * or aggressive mode. Will be passed the key and value of the expired item.
-		 *
-		 * Will be passed a third done argument if the cache is in passive mode. This allows you to synchronously access the
-		 * key and value of the expired item when you make the cache#get(key[, options]) call that is the reason the expired
-		 * item is being removed in the first place. Default: null.
-		 */
-		onExpire?(key: string, value: any): any;
-	}
-
-	export interface CachePutOptions {
-		/*
-		 * The number of milliseconds until a newly inserted item expires. Default: Number.MAX_VALUE.
-		 */
-		maxAge?: number;
-
-		/*
-		 * If inserting a promise into a cache, also insert the rejection value if the promise rejects. Default: false.
-		 */
-		storeOnReject?: boolean;
-
-		/*
-		 * If inserting a promise into a cache, also insert the resolved value if the promise resolves. Default: false.
-		 */
-		storeOnResolve?: boolean;
-
-		created?: Date;
-		access?: Date;
-		expires?: Date;
-	}
-
-	export interface CacheTouchOptions extends CachePutOptions { }
-
-	export interface CacheOptions {
-		/*
-		 * If set, remove all items from a cache on an interval after the given number of milliseconds. Default: null.
-		 */
-		cacheFlushInterval?: number;
-
-		/*
-		 * Maximum number of items a cache can hold. Adding more items than the capacity will cause the cache to operate
-		 * like an LRU cache, removing the least recently used items to stay under capacity. Default: Number.MAX_VALUE.
-		 */
-
-		capacity?: number;
-
-		/*
-		 * Determines the behavior of a cache when an item expires. Default: none.
-		 *
-		 * Possible values:
-		 *
-		 * none - cache will do nothing when an item expires.
-		 * passive - cache will do nothing when an item expires. Expired items will remain in the cache until requested,
-		 *           at which point they are removed, and undefined is returned.
-		 * aggressive - cache will remove expired items as soon as they are discovered.
-		 */
-		deleteOnExpire?: string;
-
-		/*
-		 * Determines whether a cache is disabled. Default: false.
-		 */
-		disabled?: boolean;
-
-		/*
-		 * The number of milliseconds until a newly inserted item expires. Default: Number.MAX_VALUE.
-		 */
-		maxAge?: number;
-
-		/*
-		 * Determines how often a cache will scan for expired items when in aggressive mode. Default: 1000 (milliseconds).
-		 */
-		recycleFreq?: number;
-
-		/*
-		 * If inserting a promise into a cache, also insert the rejection value if the promise rejects. Default: false.
-		 */
-		storeOnReject?: boolean;
-
-		/*
-		 * If inserting a promise into a cache, also insert the resolved value if the promise resolves. Default: false.
-		 */
-		storeOnResolve?: boolean;
-
-		/*
-		 * Provide a custom storage medium, e.g. a polyfill for localStorage. Default: null.
-		 *
-		 * Must implement:
-		 *
-		 * setItem - Same API as localStorage.setItem(key, value)
-		 * getItem - Same API as localStorage.getItem(key)
-		 * removeItem - Same API as localStorage.removeItem(key)
-		 */
-		storageImpl?: IStoreImplementation;
-
-		/*
-		 * Determines the storage medium used by a cache. Default: memory.
-		 *
-		 * Possible values:
-		 *
-		 * memory - cache will hold data in memory. Data is cleared when the page is refreshed.
-		 * localStorage - cache will hold data in localStorage if available. Data is not cleared when the page is refreshed.
-		 * sessionStorage - cache will hold data in sessionStorage if available. Data is not cleared when the page is refreshed.
-		 */
-		storageMode?: string;
-
-		/*
-		 * Determines the namespace of a cache when storageMode is set to localStorage or sessionStorage. Make it a shorter
-		 * string to save space. Default: angular-cache.caches.
-		 */
-		storagePrefix?: string;
-
-		/*
-		 * A callback function to be executed whenever an expired item is removed from a cache when the cache is in passive
-		 * or aggressive mode. Will be passed the key and value of the expired item.
-		 *
-		 * Will be passed a third done argument if the cache is in passive mode. This allows you to synchronously access the
-		 * key and value of the expired item when you make the cache#get(key[, options]) call that is the reason the expired
-		 * item is being removed in the first place. Default: null.
-		 */
-		onExpire?(key: string, value: any): any;
-	}
-
-	export interface ICache {
-
-		$$id: string;
-
-		/**
-		 * Return the item with the given key.options, if provided, must be an object.
-		 *
-		 * If the cache is in passive mode, then options.onExpire can be a function that will be called with the key
-		 * and value of the requested item if the requested item is expired, with the get call itself returning undefined.
-		 * @param key
-		 * @returns {}
-		 */
-		get<T>(key: string, options?: CacheGetOptions): T;
-
-		/**
-		 * Insert the item with the given key and value into the cache.options, if provided, must be an object.
-		 *
-		 * If inserting a promise, options.storeOnReject determines whether to insert the rejection value if the promise
-		 * rejects (overriding the default storeOnReject setting for the cache). If inserting a promise, options.storeOnResolve
-		 * determines whether to insert the resolved value if the promise resolves (overriding the default storeOnResolve setting for the cache).
-		 *
-		 * @param key
-		 * @param value
-		 * @param options
-		 */
-		put<T>(key: string, value: T, options?: CachePutOptions): void;
-
-		/**
-		 * Remove and return the item with the given key, if it is in the cache.
-		 * @param key
-		 * @returns {}
-		 */
-		remove<T>(key: string): T;
-
-		/**
-		 * Remove all items in the cache.
-		 */
-		removeAll(): void;
-
-		/**
-		 * Remove and return all expired items in the cache.
-		 * @returns {}
-		 */
-		removeExpired(): { [key: string]: any };
-
-		/**
-		 * Completely destroy this cache and its data.
-		 * @returns {}
-		 */
-		destroy(): void;
-
-		/**
-		 * Returns an object containing information about the cache.
-		 *
-		 * @param key
-		 */
-		info(): CacheInfo;
-
-		/**
-		 * Returns an object containing information about the item with the given key, if the item is in the cache.
-		 *
-		 * @param key
-		 */
-		info(key: string): CacheItemInfo;
-
-		/**
-		 * Return the keys of all items in the cache as an object.
-		 * @returns {}
-		 */
-		keySet(): any;
-
-		/**
-		 * Return the keys of all items in the cache as an array.
-		 * @returns []
-		 */
-		keys(): Array<string>;
-
-		/**
-		 * Enable the cache.
-		 */
-		enable(): void;
-
-		/**
-		 * Disable the cache.
-		 */
-		disable(): void;
-
-		/**
-		 * cache#touch() will "touch" all items in the cache.
-		 * cache#touch(key) will "touch" the item with the given key.
-		 *
-		 * @param key
-		 */
-		touch(key?: string, options?: CacheTouchOptions): void;
-
-		/**
-		 * Set the cacheFlushInterval for the cache.
-		 * @param cacheFlushInterval
-		 */
-		setCacheFlushInterval(cacheFlushInterval: number): void;
-
-		/**
-		 * Set the capacity for the cache.Setting this lower than the current item count will result in those items being removed.
-		 * @param capacity
-		 */
-		setCapacity(capacity: number): void;
-
-		/**
-		 * Set the deleteOnExpire for the cache.
-		 * @param deleteOnExpire
-		 */
-		setDeleteOnExpire(deleteOnExpire: string): void;
-
-		/**
-		 * Set the maxAge for the cache.
-		 */
-		setMaxAge(maxAge: number): void;
-
-		/**
-		 * Set the onExpire for the cache.
-		 * @param onExpire
-		 */
-		setOnExpire(onExpire: Function): void;
-
-		/**
-		 * Set the recycleFreq for the cache.
-		 * @param recycleFreq
-		 */
-		setRecycleFreq(recycleFreq: number): void;
-
-		/**
-		 * Set the storageMode for the cache.This will move data from the current storage medium to the new one.
-		 * @param storageMode
-		 */
-		setStorageMode(storageMode: string): void;
-
-		/**
-		 * Set multiple options for the cache at a time.Setting strict to true will reset options for the cache
-		 * that are not specifically set in the options hash to CacheFactoryProvider.defaults.
-		 * @param options
-		 */
-		setOptions(options: CacheOptions, strict?: boolean): void;
-
-		/**
-		 * Return the values of all items in the cache as an array.
-		 * @returns Array<any>
-		 */
-		values(): Array<any>
-	}
-
-	export interface ICacheFactory {
-
-		BinaryHeap: IBinaryHeap;
-		utils: IUtils;
-		defaults: CacheOptions;
-
-		/**
-		 * Create a cache. cache must not already exist. cacheId must be a string. options is an optional argument and must be an object.
-		 * Any options you pass here will override any default options.
-		 * @param cacheId
-		 * @param options
-		 * @returns ICache
-		 */
-		(cacheId: string, options?: CacheOptions): ICache;
-
-		/**
-		 * Create a cache. cache must not already exist. cacheId must be a string. options is an optional argument and must be an object.
-		 * Any options you pass here will override any default options.
-		 * @param cacheId
-		 * @param options
-		 * @returns ICache
-		 */
-		createCache(cacheId: string, options?: CacheOptions): ICache;
-
-		/**
-		 * Return the cache with the given cacheId.
-		 * @param cacheId The id of the cache storage.
-		 * @returns ICache
-		 */
-		get(cacheId: string, options?: CacheOptions): ICache;
-
-		/**
-		 * Return an object of key- value pairs, the keys being cache ids and the values being the result of .info() being called on each cache.
-		 * @returns CacheInfo
-		 */
-		info(): CacheInfo;
-
-		/**
-		 * Return the ids of all registered caches as an object.
-		 * @returns {[key: string]: ICache}
-		 */
-		keySet(): { [key: string]: ICache };
-
-		/**
-		 * Return the ids of all registered caches as an array.
-		 * @returns Array<string>
-		 */
-		keys(): Array<string>;
-
-		/**
-		 * Destroy the cache with the given cacheId.
-		 * @param cacheId
-		 */
-		destroy(cacheId: string): void;
-
-		/**
-		 * Destroy all registered caches.
-		 */
-		destroyAll(): void;
-
-		/**
-		 * Remove all data from all registered caches.
-		 */
-		clearAll(): void;
-
-		/**
-		 * Enable all registered caches.
-		 */
-		enableAll(): void;
-
-		/**
-		 * Disable all registered caches.
-		 */
-		disableAll(): void;
-
-		/**
-		 * Call.touch() on all registered caches.
-		 */
-		touchAll(): void;
-
-		/**
-		 * Call.removeExpired() on all registered caches.Returns a hash of any expired items, keyed by cache id.
-		 * @returns {}
-		 */
-		removeExpiredFromAll(): Array<{ [key: string]: Array<{ [key: string]: any }> }>;
-	}
-
-	export interface IUtils {
-		isNumber(value: any): boolean;
-		isString(value: any): boolean;
-		isObject(value: any): boolean;
-		isFunction(value: any): boolean;
-		equals(a: any, b: any): boolean;
-		fromJson(value: any): {}
-		Promise: any;
-	}
-
-	export interface HeapItem {
-		key: string;
-		accessed: Date;
-	}
-
-	export interface IBinaryHeap {
-		(w?: IWeightFunc, c?: ICompareFunc): void;
-
-		heap: Array<HeapItem>;
-		weightFunc: IWeightFunc;
-		compareFunc: ICompareFunc;
-
-		push(node: HeapItem): void;
-		pop(): HeapItem;
-		peek(): HeapItem;
-		remove(node: HeapItem): HeapItem;
-		removeAll(): void;
-		size(): Number;
-	}
-
-	export interface IWeightFunc {
-		<T>(x: T): T;
-	}
-
-	export interface ICompareFunc {
-		<T>(x: T, y: T): boolean;
-	}
-
-	export interface CacheInfo {
-		size: Number;
-		caches: { [key: string]: any };
-		capacity: Number;
-		maxAge: Number;
-		deleteOnExpire: string;
-		onExpire: Function;
-		cacheFlushInterval: Number;
-		recycleFreq: Number;
-		storageMode: string;
-		storageImpl: IStoreImplementation;
-		disabled: boolean;
-		storagePrefix: string;
-		storeOnResolve: boolean;
-		storeOnReject: boolean;
-	}
-
-	export interface CacheItemInfo {
-		created: Date;
-		accessed: Date;
-		expires: Date;
-		isExpired: boolean;
-	}
-}
-
-declare const CacheFactory: CacheFactory.ICacheFactory;
-export = CacheFactory;
-export as namespace CacheFactory;
diff --git a/types/cachefactory/tsconfig.json b/types/cachefactory/tsconfig.json
deleted file mode 100644
index 2008da5619..0000000000
--- a/types/cachefactory/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cachefactory-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cal-heatmap/tslint.json b/types/cal-heatmap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cal-heatmap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/callsite/tslint.json b/types/callsite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/callsite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/calq/tslint.json b/types/calq/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/calq/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/camljs/tslint.json b/types/camljs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/camljs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/camo/camo-tests.ts b/types/camo/camo-tests.ts
index 6830133f8f..b88f7007f6 100644
--- a/types/camo/camo-tests.ts
+++ b/types/camo/camo-tests.ts
@@ -16,10 +16,10 @@ connect("mongodb://user:password@localhost:27017/database?authSource=admin").the
 	}
 
 	class User extends CamoDocument<UserSchema> {
-		private name: SchemaTypeExtended = String;
-		private password: SchemaTypeExtended = String;
-		private friends: SchemaTypeExtended = [String];
-		private dateCreated: SchemaTypeExtended = {
+		private readonly name: SchemaTypeExtended = String;
+		private readonly password: SchemaTypeExtended = String;
+		private readonly friends: SchemaTypeExtended = [String];
+		private readonly dateCreated: SchemaTypeExtended = {
 			type: Date,
 			default: Date.now
 		};
diff --git a/types/camo/tslint.json b/types/camo/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/camo/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cancan/cancan-tests.ts b/types/cancan/cancan-tests.ts
new file mode 100644
index 0000000000..0d6ab3e9a7
--- /dev/null
+++ b/types/cancan/cancan-tests.ts
@@ -0,0 +1,32 @@
+import CanCan = require('cancan');
+
+const cancan = new CanCan();
+
+// $ExpectType void
+cancan.allow('admin', 'manage', 'all');
+
+// $ExpectType void
+cancan.allow('user', 'read', 'post', {public: true});
+
+// $ExpectType boolean
+cancan.can('user', 'read', 'post');
+
+// $ExpectType boolean
+cancan.cannot('user', 'delete', 'post');
+
+// $ExpectType void
+cancan.authorize('user', 'delete', 'post');
+
+// $ExpectType boolean
+cancan.can('user', 'read', 'post', {fields: ['title']});
+
+// $ExpectType boolean
+cancan.cannot('user', 'delete', 'post', {fields: ['title']});
+
+// $ExpectType void
+cancan.authorize('user', 'delete', 'post', {fields: ['title']});
+
+const cancanWithOption = new CanCan({
+    instanceOf: (_instance, _model) => true,
+    createError: () => true
+});
diff --git a/types/cancan/index.d.ts b/types/cancan/index.d.ts
new file mode 100644
index 0000000000..e739af1ef5
--- /dev/null
+++ b/types/cancan/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for cancan 3.1
+// Project: https://github.com/vadimdemedes/cancan
+// Definitions by: Vincent Pang <https://github.com/Vincent-Pang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare namespace CanCan {
+    interface Option {
+        instanceOf?: (instance: any, model: any) => boolean;
+        createError?: () => any;
+    }
+}
+
+declare class CanCan {
+    constructor(options?: CanCan.Option);
+
+    allow<T>(model: any,
+             actions: string | ReadonlyArray<string>,
+             targets: T | ReadonlyArray<T> | string | ReadonlyArray<string>,
+             condition?: object | ((performer: any, target: any, options?: any) => boolean)): void;
+
+    can(performer: any, action: string, target: any, options?: any): boolean;
+
+    cannot(performer: any, action: string, target: any, options?: any): boolean;
+
+    authorize(performer: any, action: string, target: any, options?: any): void;
+}
+
+export = CanCan;
diff --git a/types/cancan/tsconfig.json b/types/cancan/tsconfig.json
new file mode 100644
index 0000000000..8aace9dd52
--- /dev/null
+++ b/types/cancan/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cancan-tests.ts"
+    ]
+}
diff --git a/types/react-native-modal/tslint.json b/types/cancan/tslint.json
similarity index 100%
rename from types/react-native-modal/tslint.json
rename to types/cancan/tslint.json
diff --git a/types/cannon/index.d.ts b/types/cannon/index.d.ts
index 45e005d53d..56272a6b1f 100644
--- a/types/cannon/index.d.ts
+++ b/types/cannon/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for cannon 0.1
 // Project: https://github.com/clark-stevenson/cannon.d.ts
 // Definitions by: Clark Stevenson <https://github.com/clark-stevenson>
+//                 Grzegorz Rozdzialik <https://github.com/Gelio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -20,10 +21,14 @@ declare module CANNON {
 
         constructor(options?: IAABBOptions);
 
-        setFromPoints(points: Vec3[], position?: Vec3, quaternion?: Quaternion, skinSize?: number): void;
+        clone(): AABB;
         copy(aabb: AABB): void;
         extend(aabb: AABB): void;
+        getCorners(a: Vec3, b: Vec3, c: Vec3, d: Vec3, e: Vec3, f: Vec3, g: Vec3, h: Vec3): void;
         overlaps(aabb: AABB): boolean;
+        setFromPoints(points: Vec3[], position?: Vec3, quaternion?: Quaternion, skinSize?: number): AABB;
+        toLocalFrame(frame: Transform, target: AABB): AABB;
+        toWorldFrame(frame: Transform, target: AABB): AABB;
 
     }
 
@@ -32,7 +37,7 @@ declare module CANNON {
         matrix: Mat3[];
 
         get(i: number, j: number): number;
-        set(i: number, j: number, value?: number): void;
+        set(i: number, j: number, value: number): void;
         reset(): void;
         setNumObjects(n: number): void;
 
@@ -148,6 +153,8 @@ declare module CANNON {
         constructor(bodyA: Body, bodyB: Body, options?: IConstraintOptions);
 
         update(): void;
+        disable(): void;
+        enable(): void;
 
     }
 
@@ -188,9 +195,24 @@ declare module CANNON {
 
     }
 
+    export interface ILockConstraintOptions {
+        maxForce?: number;
+    }
 
     export class LockConstraint extends Constraint {
-        constructor(bodyA: Body, bodyB: Body, options?:any);
+        constructor(bodyA: Body, bodyB: Body, options?: ILockConstraintOptions);
+    }
+
+    export interface IConeTwistConstraintOptions {
+        pivotA?: Vec3;
+        pivotB?: Vec3;
+        axisA?: Vec3;
+        axisB?: Vec3;
+        maxForce?: number;
+    }
+
+    export class ConeTwistConstraint extends Constraint {
+        constructor(bodyA: Body, bodyB: Body, options?: IConeTwistConstraintOptions);
     }
 
 
@@ -428,7 +450,7 @@ declare module CANNON {
         angularVelocity?: Vec3;
         quaternion?: Quaternion;
         mass?: number;
-        material?: number;
+        material?: Material;
         type?: number;
         linearDamping?: number;
         angularDamping?: number;
@@ -478,7 +500,7 @@ declare module CANNON {
         interpolatedQuaternion: Quaternion;
         shapes: Shape[];
         shapeOffsets: any[];
-        shapeOrentiations: any[];
+        shapeOrientations: any[];
         inertia: Vec3;
         invInertia: Vec3;
         invInertiaWorld: Mat3;
@@ -735,7 +757,7 @@ declare module CANNON {
         vertices: Vec3[];
         worldVertices: Vec3[];
         worldVerticesNeedsUpdate: boolean;
-        faces: number[];
+        faces: number[][];
         faceNormals: Vec3[];
         uniqueEdges: Vec3[];
 
@@ -776,7 +798,7 @@ declare module CANNON {
 
     export class Heightfield extends Shape {
 
-        data: number[];
+        data: number[][];
         maxValue: number;
         minValue: number;
         elementSize: number;
@@ -930,7 +952,7 @@ declare module CANNON {
     }
 
     export class World extends EventTarget {
-
+        iterations: number;
         dt: number;
         allowSleep: boolean;
         contacts: ContactEquation[];
@@ -992,6 +1014,10 @@ declare module CANNON {
 
     }
 
+    export interface ICollisionEvent extends IBodyEvent {
+        contact: any;
+    }
+
 }
 
 
diff --git a/types/cannon/tslint.json b/types/cannon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cannon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/canvas-gauges/tslint.json b/types/canvas-gauges/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/canvas-gauges/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/case-sensitive-paths-webpack-plugin/case-sensitive-paths-webpack-plugin-tests.ts b/types/case-sensitive-paths-webpack-plugin/case-sensitive-paths-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..a4370cff73
--- /dev/null
+++ b/types/case-sensitive-paths-webpack-plugin/case-sensitive-paths-webpack-plugin-tests.ts
@@ -0,0 +1,15 @@
+import { Configuration } from 'webpack';
+import CaseSensitivePathsWebpackPlugin = require('case-sensitive-paths-webpack-plugin');
+
+const options: CaseSensitivePathsWebpackPlugin.Options = {
+    debug: true,
+};
+
+const c: Configuration = {
+    plugins: [
+        new CaseSensitivePathsWebpackPlugin(),
+        new CaseSensitivePathsWebpackPlugin({
+            debug: true
+        }),
+    ],
+};
diff --git a/types/case-sensitive-paths-webpack-plugin/index.d.ts b/types/case-sensitive-paths-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..360d3d6d08
--- /dev/null
+++ b/types/case-sensitive-paths-webpack-plugin/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for case-sensitive-paths-webpack-plugin 2.1
+// Project: https://github.com/Urthen/case-sensitive-paths-webpack-plugin#readme
+// Definitions by: Andrew Makarov <https://github.com/r3nya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'webpack';
+
+export = CaseSensitivePathsWebpackPlugin;
+
+declare class CaseSensitivePathsWebpackPlugin extends Plugin {
+    constructor(options?: CaseSensitivePathsWebpackPlugin.Options);
+}
+
+declare namespace CaseSensitivePathsWebpackPlugin {
+    interface Options {
+        /**
+         * Show more information
+         */
+        debug?: boolean;
+    }
+}
diff --git a/types/case-sensitive-paths-webpack-plugin/tsconfig.json b/types/case-sensitive-paths-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..b8cb05390a
--- /dev/null
+++ b/types/case-sensitive-paths-webpack-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "case-sensitive-paths-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/redux-saga-routines/tslint.json b/types/case-sensitive-paths-webpack-plugin/tslint.json
similarity index 100%
rename from types/redux-saga-routines/tslint.json
rename to types/case-sensitive-paths-webpack-plugin/tslint.json
diff --git a/types/caseless/caseless-tests.ts b/types/caseless/caseless-tests.ts
new file mode 100644
index 0000000000..2fb16afaad
--- /dev/null
+++ b/types/caseless/caseless-tests.ts
@@ -0,0 +1,40 @@
+import caseless, { Caseless, httpify } from "caseless";
+
+new Caseless(); // $ExpectError
+
+// tslint:disable-next-line: prefer-const
+let c1: Caseless;
+
+caseless(); // $ExpectType Caseless
+caseless({}); // $ExpectType Caseless
+caseless(null); // $ExpectError
+caseless(1); // $ExpectError
+caseless("2"); // $ExpectError
+
+const c2 = caseless();
+
+c2.set({}); // $ExpectType void
+c2.set('foo', 'bar'); // $ExpectType string | false
+c2.set('foo', 'bar', false); // $ExpectType string | false
+c2.set('foo', new Date()); // $ExpectType string | false
+c2.set(10, 'bar'); // $ExpectError
+
+c2.get('foo'); // $ExpectType any
+c2.get(10); // $ExpectError
+
+c2.has('foo'); // $ExpectType string | false
+c2.has(10); // $ExpectError
+
+c2.swap('foo'); // $ExpectType void
+c2.swap(10); // $ExpectError
+
+c2.del('foo'); // $ExpectType boolean
+
+httpify(null, {}); // $ExpectError
+httpify(1, {}); // $ExpectError
+httpify("2", {}); // $ExpectError
+httpify({}, null); // $ExpectError
+httpify({}, 1); // $ExpectError
+httpify({}, "2"); // $ExpectError
+
+httpify({}, {}); // $ExpectType Caseless
diff --git a/types/caseless/index.d.ts b/types/caseless/index.d.ts
new file mode 100644
index 0000000000..db295a8f89
--- /dev/null
+++ b/types/caseless/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for caseless 0.12
+// Project: https://github.com/mikeal/caseless
+// Definitions by: downace <https://github.com/downace>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+type KeyType = string;
+type ValueType = any;
+type RawDict = object;
+
+export interface Caseless {
+    set(name: KeyType, value: ValueType, clobber?: boolean): KeyType | false;
+    set(dict: RawDict): void;
+    has(name: KeyType): KeyType | false;
+    get(name: KeyType): ValueType | undefined;
+    swap(name: KeyType): void;
+    del(name: KeyType): boolean;
+}
+
+export function httpify(resp: object, headers: RawDict): Caseless;
+
+declare function caseless(dict?: RawDict): Caseless;
+
+export default caseless;
diff --git a/types/caseless/tsconfig.json b/types/caseless/tsconfig.json
new file mode 100644
index 0000000000..c7dace4424
--- /dev/null
+++ b/types/caseless/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "caseless-tests.ts"
+    ]
+}
diff --git a/types/smooth-scrollbar/tslint.json b/types/caseless/tslint.json
similarity index 100%
rename from types/smooth-scrollbar/tslint.json
rename to types/caseless/tslint.json
diff --git a/types/cash/tslint.json b/types/cash/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cash/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/casperjs/index.d.ts b/types/casperjs/index.d.ts
index e8388d17c7..f2378f1f97 100644
--- a/types/casperjs/index.d.ts
+++ b/types/casperjs/index.d.ts
@@ -1,17 +1,17 @@
-// Type definitions for CasperJS v1.0.29
+// Type definitions for CasperJS 1.1
 // Project: http://casperjs.org/
 // Definitions by: Jed Mao <https://github.com/jedmao>
+//                 Uriel Chemouni <https://github.com/urielch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="phantomjs" />
 
-
 export function create(options?: CasperOptions): Casper;
 
-export function selectXPath(expression: string): Object;
+export function selectXPath(expression: string): object;
 
 export class Casper {
-
 	constructor(options: CasperOptions);
 
 	test: Tester;
@@ -23,23 +23,23 @@ export class Casper {
 	// Methods
 	back(): Casper;
 	base64encode(url: string, method?: string, data?: any): string;
-	bypass(nb: number): any;
-	click(selector: string): boolean;
+	bypass(nb: number): Casper;
+	click(selector: string, X?: number | string, Y?: number | string): boolean;
 	clickLabel(label: string, tag?: string): boolean;
-	capture(targetFilePath: string, clipRect: ClipRect): Casper;
-	captureBase64(format: string): string;
-	captureBase64(format: string, area: string): string;
-	captureBase64(format: string, area: ClipRect): string;
-	captureBase64(format: string, area: any): string;
-	captureSelector(targetFile: string, selector: string): Casper;
+	capture(targetFilePath: string, clipRect?: ClipRect, imgOptions?: ImgOptions): Casper;
+	captureBase64(format: string, area?: string | ClipRect | CasperSelector): string;
+	captureSelector(targetFile: string, selector: string, imgOptions?: ImgOptions): Casper;
 	clear(): Casper;
+	clearCache(): Casper;
+	clearMemoryCache(): Casper;
 	debugHTML(selector?: string, outer?: boolean): Casper;
 	debugPage(): Casper;
 	die(message: string, status?: number): Casper;
-	download(url: string, target?: string, method?: string, data?: any): Casper;
+	download(url: string, target: string, method?: string, data?: any): Casper;
 	each<T>(array: T[], fn: (this: Casper, item: T, index: number) => void): Casper;
+	eachThen(array: any[], then?: FunctionThen): Casper;
 	echo(message: string, style?: string): Casper;
-	evaluate<T>(fn: (...args: any[]) => T, ...args: any[]): T
+	evaluate<T>(fn: (...args: any[]) => T, ...args: any[]): T;
 	evaluateOrDie(fn: () => any, message?: string, status?: number): Casper;
 	exit(status?: number): Casper;
 	exists(selector: string): boolean;
@@ -52,7 +52,7 @@ export class Casper {
 	getCurrentUrl(): string;
 	getElementAttribute(selector: string, attribute: string): string;
 	getElementsAttribute(selector: string, attribute: string): string;
-	getElementBounds(selector: string): ElementBounds;
+	getElementBounds(selector: string, page?: boolean): ElementBounds | null;
 	getElementsBounds(selector: string): ElementBounds[];
 	getElementInfo(selector: string): ElementInfo;
 	getElementsInfo(selector: string): ElementInfo;
@@ -61,83 +61,125 @@ export class Casper {
 	getHTML(selector?: string, outer?: boolean): string;
 	getPageContent(): string;
 	getTitle(): string;
-	mouseEvent(type: string, selector: string): boolean;
+	mouseEvent(type: string, selector: string, X?: number|string, Y?: number|string): boolean;
+	newPage(): any;
 	open(location: string, settings: OpenSettings): Casper;
-	reload(then?: (response: HttpResponse) => void): Casper;
-	repeat(times: number, then: Function): Casper;
-	resourceExists(test: Function): boolean;
-	resourceExists(test: string): boolean;
-	run(onComplete: Function, time?: number): Casper;
+	reload(then?: FunctionThen): Casper;
+	repeat(times: number, then: FunctionThen): Casper;
+	resourceExists(test: string | Function | RegExp): boolean;
+	run(onComplete?: Function, time?: number): Casper;
 	scrollTo(x: number, y: number): Casper;
 	scrollToBottom(): Casper;
-	sendKeys(selector: string, keys: string, options?: any): Casper;
+	sendKeys(selector: string, keys: string, options?: KeyOptions): Casper;
 	setHttpAuth(username: string, password: string): Casper;
-	start(url?: string, then?: (response: HttpResponse) => void): Casper;
-	status(asString: boolean): any;
+	setMaxListeners(maxListeners: number): Casper;
+	start(url?: string, then?: FunctionThen): Casper;
+	status(asString?: false): number;
+	status(asString: true): string;
+	switchToFrame(frameInfo: string | number): Casper;
+	switchToMainFrame(): Casper;
+	switchToParentFrame(): Casper;
 	then(fn: (this: Casper) => void): Casper;
 	thenBypass(nb: number): Casper;
 	thenBypassIf(condition: any, nb: number): Casper;
 	thenBypassUnless(condition: any, nb: number): Casper;
-	thenClick(selector: string): Casper;
+	thenClick(selector: string, then?: FunctionThen): Casper;
 	thenEvaluate(fn: () => any, ...args: any[]): Casper;
 	thenOpen(location: string, then?: (response: HttpResponse) => void): Casper;
 	thenOpen(location: string, options?: OpenSettings, then?: (response: HttpResponse) => void): Casper;
-	thenOpenAndEvaluate(location: string, then?: Function, ...args: any[]): Casper;
+	thenOpenAndEvaluate(location: string, then?: FunctionThen, ...args: any[]): Casper;
 	toString(): string;
 	unwait(): Casper;
-	userAgent(agent: string): string;
-	viewport(width: number, height: number): Casper;
+	// 2017-10-19 Doc said returning String but code return Casper object.
+	userAgent(agent: string): Casper;
+	viewport(width: number, height: number, then?: FunctionThen): Casper;
 	visible(selector: string): boolean;
-	wait(timeout: number, then?: Function): Casper;
-	waitFor(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForAlert(then: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForPopup(urlPattern: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForPopup(urlPattern: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForUrl(url: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForUrl(url: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitWhileSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForResource(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForText(pattern: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForText(pattern: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitUntilVisible(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitWhileVisible(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	wait(timeout: number, then?: FunctionThen): Casper;
+	waitFor(testFx: Function, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number, details?: any): Casper;
+	waitForAlert(then: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitForExec(command: string | null, parameter: string[], then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitForPopup(urlPattern: RegExp | string | number | FindByUrlNameTitle, then?: FunctionThen, onTimeout?: Function, timeout?: number): Casper;
+	waitForResource(testFx: RegExp | string | ((resource: {url: string}) => boolean), then?: FunctionThen, onTimeout?: Function, timeout?: number): Casper;
+	waitForUrl(url: RegExp | string, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitForSelector(selector: string, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitWhileSelector(selector: string, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitForSelectorTextChange(selectors: string, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitForText(pattern: RegExp | string, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitUntilVisible(selector: string, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
+	waitWhileVisible(selector: string, then?: FunctionThen, onTimeout?: FunctionOnTimeout, timeout?: number): Casper;
 	warn(message: string): Casper;
-	withFrame(frameInfo: string, then: Function): Casper;
-	withFrame(frameInfo: number, then: Function): Casper;
-	withPopup(popupInfo: string, step: Function): Casper;
-	withPopup(popupInfo: RegExp, step: Function): Casper;
+	withFrame(frameInfo: string | number, then: FunctionThen): Casper;
+	withPopup(popupInfo: RegExp | string | number | FindByUrlNameTitle, step: FunctionThen): Casper;
+	withSelectorScope(selector: string, then: FunctionThen): Casper;
 	zoom(factor: number): Casper;
-	removeAllFilters(filter: string): Casper;
-	setFilter(filter: string, cb: Function): boolean;
+	// do not exists anymore
+	// removeAllFilters(filter: string): Casper;
+	// do not exists anymore
+	// setFilter(filter: string, cb: Function): boolean;
 }
 
-interface HttpResponse {
+export type FunctionThen = (this: Casper, response: HttpResponse) => void;
+export type FunctionOnTimeout  = (this: Casper, timeout: number, details: any) => void;
+// not visible in doc
+// interface QtRuntimeObject {id?: any; url?: string;}
+// see modules/pagestack.js in casperjs
+
+export interface ImgOptions {
+	// format to set the image format manually, avoiding relying on the filename
+	format?: string;
+	// quality to set the image quality, from 1 to 100
+	quality?: number;
+}
+
+export interface FindByUrlNameTitle {
+	url?: string;
+	title?: string;
+	windowName?: string;
+}
+
+export interface Header {
+	name: string;
+	value: string;
+}
+
+export interface CasperSelector {
+	type?: 'xpath' | 'css';
+	path: string;
+}
+
+export interface KeyOptions {
+	reset?: boolean;
+	keepFocus?: boolean;
+	modifiers?: string; // combinaison of 'ctrl+alt+shift+meta+keypad'
+}
+
+export interface HttpResponse {
 	contentType: string;
-	headers: any[];
+	headers: Header[];
 	id: number;
-	redirectURL: string;
+	redirectURL: string | null;
 	stage: string;
 	status: number;
 	statusText: string;
 	time: string;
 	url: string;
+	data: any;
 }
 
-interface OpenSettings {
+export interface OpenSettings {
 	method: string;
 	data: any;
 	headers: any;
 }
 
-interface ElementBounds {
+export interface ElementBounds {
 	top: number;
 	left: number;
 	width: number;
 	height: number;
 }
 
-interface ElementInfo {
+export interface ElementInfo {
 	nodeName: string;
 	attributes: any;
 	tag: string;
@@ -150,7 +192,7 @@ interface ElementInfo {
 	visible: boolean;
 }
 
-interface CasperOptions {
+export interface CasperOptions {
 	clientScripts?: any[];
 	exitOnError?: boolean;
 	httpStatusHandlers?: any;
@@ -179,7 +221,7 @@ interface CasperOptions {
 	waitTimeout?: number;
 }
 
-interface ClientUtils {
+export interface ClientUtils {
 	echo(message: string): void;
 	encode(contents: string): void;
 	exists(selector: string): void;
@@ -200,12 +242,12 @@ interface ClientUtils {
 	visible(selector: string): void;
 }
 
-interface Colorizer {
+export interface Colorizer {
 	colorize(text: string, styleName: string): void;
 	format(text: string, style: any): void;
 }
 
-interface Tester {
+export interface Tester {
 	assert(condition: boolean, message?: string): any;
 	assertDoesntExist(selector: string, message?: string): any;
 	assertElementCount(selctor: string, expected: number, message?: string): any;
@@ -235,15 +277,14 @@ interface Tester {
 	assertTruthy(subject: any, message?: string): any;
 	assertType(input: any, type: string, message?: string): any;
 	assertInstanceOf(input: any, ctor: Function, message?: string): any;
-	assertUrlMatch(pattern: string, message?: string): any;
-	assertUrlMatch(pattern: RegExp, message?: string): any;
+	assertUrlMatch(pattern: RegExp | string, message?: string): any;
 	assertVisible(selector: string, message?: string): any;
 
 	/* since 1.1 */
 	begin(description: string, planned: number, suite: Function): any;
 	begin(description: string, suite: Function): any;
-	begin(description: string, planned: number, config: Object): any;
-	begin(description: string, config: Object): any;
+	begin(description: string, planned: number, config: object): any;
+	begin(description: string, config: object): any;
 
 	colorize(message: string, style: string): any;
 	comment(message: string): any;
@@ -262,12 +303,12 @@ interface Tester {
 	tearDown(fn: Function): any;
 }
 
-interface Cases {
+export interface Cases {
 	length: number;
 	cases: Case[];
 }
 
-interface Case {
+export interface Case {
 	success: boolean;
 	type: string;
 	standard: string;
@@ -275,12 +316,12 @@ interface Case {
 	values: CaseValues;
 }
 
-interface CaseValues {
+export interface CaseValues {
 	subject: boolean;
 	expected: boolean;
 }
 
-interface Utils {
+export interface Utils {
 	betterTypeOf(input: any): any;
 	dump(value: any): any;
 	fileExt(file: string): any;
diff --git a/types/casperjs/tslint.json b/types/casperjs/tslint.json
new file mode 100644
index 0000000000..c2a140228c
--- /dev/null
+++ b/types/casperjs/tslint.json
@@ -0,0 +1,12 @@
+{
+	"extends": "dtslint/dt.json",
+    "rules": {
+        // need to fix some Function type
+        "ban-types": false,
+        // can not merge
+        // begin(description: string, planned: number, suite: Function): any;
+        // and
+        // begin(description: string, planned: number, config: object): any;
+        "unified-signatures": false
+    }
+}
diff --git a/types/cassandra-driver/cassandra-driver-tests.ts b/types/cassandra-driver/cassandra-driver-tests.ts
index 40971c7183..891c5a0167 100644
--- a/types/cassandra-driver/cassandra-driver-tests.ts
+++ b/types/cassandra-driver/cassandra-driver-tests.ts
@@ -1,9 +1,16 @@
 import * as cassandra from 'cassandra-driver';
 import * as util from 'util';
+import * as fs from 'fs';
 
-var client = new cassandra.Client({ contactPoints: ['h1', 'h2'], keyspace: 'ks1'});
+const client = new cassandra.Client({
+    contactPoints: ['h1', 'h2'],
+    keyspace: 'ks1',
+    sslOptions: {
+        cert: fs.readFileSync('certFilePath')
+    }
+});
 
-var query = 'SELECT email, last_name FROM user_profiles WHERE key=?';
+const query = 'SELECT email, last_name FROM user_profiles WHERE key=?';
 client.execute(query, ['guy'], function(err, result) {
   console.log('got user profile with email ' + result.rows[0].email);
 });
diff --git a/types/cassandra-driver/index.d.ts b/types/cassandra-driver/index.d.ts
index a581071dfb..5c0578ccf2 100644
--- a/types/cassandra-driver/index.d.ts
+++ b/types/cassandra-driver/index.d.ts
@@ -12,11 +12,12 @@ export type ResultCallback = (err: Error, result: types.ResultSet) => void;
 
 import * as events from "events";
 import * as stream from "stream";
+import * as tls from "tls";
 import _Long = require("long");
 
 export namespace policies {
   namespace addressResolution {
-    var EC2MultiRegionTranslator: EC2MultiRegionTranslatorStatic;
+    let EC2MultiRegionTranslator: EC2MultiRegionTranslatorStatic;
 
     interface AddressTranslator {
       translate(address: string, port: number, callback: Callback): void;
@@ -32,10 +33,10 @@ export namespace policies {
   }
 
   namespace loadBalancing {
-    var DCAwareRoundRobinPolicy: DCAwareRoundRobinPolicyStatic;
-    var RoundRobinPolicy: RoundRobinPolicyStatic;
-    var TokenAwarePolicy: TokenAwarePolicyStatic;
-    var WhiteListPolicy: WhiteListPolicyStatic;
+    let DCAwareRoundRobinPolicy: DCAwareRoundRobinPolicyStatic;
+    let RoundRobinPolicy: RoundRobinPolicyStatic;
+    let TokenAwarePolicy: TokenAwarePolicyStatic;
+    let WhiteListPolicy: WhiteListPolicyStatic;
 
     interface LoadBalancingPolicy {
       init(client: Client, hosts: HostMap, callback: Callback): void;
@@ -72,8 +73,8 @@ export namespace policies {
   }
 
   namespace reconnection {
-    var ConstantReconnectionPolicy: ConstantReconnectionPolicyStatic;
-    var ExponentialReconnectionPolicy: ExponentialReconnectionPolicyStatic;
+    let ConstantReconnectionPolicy: ConstantReconnectionPolicyStatic;
+    let ExponentialReconnectionPolicy: ExponentialReconnectionPolicyStatic;
 
     interface ReconnectionPolicy {
       newSchedule(): { next: Function };
@@ -93,7 +94,7 @@ export namespace policies {
   }
 
   namespace retry {
-    var RetryPolicy: RetryPolicyStatic;
+    let RetryPolicy: RetryPolicyStatic;
 
     interface DecisionInfo {
       decision: number;
@@ -128,18 +129,18 @@ export namespace policies {
 }
 
 export namespace types {
-  var BigDecimal: BigDecimalStatic;
-  var InetAddress: InetAddressStatic;
-  var Integer: IntegerStatic;
-  var LocalDate: LocalDateStatic;
-  var LocalTime: LocalTimeStatic;
-  var Long: _Long;
-  var ResultSet: ResultSetStatic;
-  // var ResultStream: ResultStreamStatic;
-  var Row: RowStatic;
-  var TimeUuid: TimeUuidStatic;
-  var Tuple: TupleStatic;
-  var Uuid: UuidStatic;
+  let BigDecimal: BigDecimalStatic;
+  let InetAddress: InetAddressStatic;
+  let Integer: IntegerStatic;
+  let LocalDate: LocalDateStatic;
+  let LocalTime: LocalTimeStatic;
+  let Long: _Long;
+  let ResultSet: ResultSetStatic;
+  // let ResultStream: ResultStreamStatic;
+  let Row: RowStatic;
+  let TimeUuid: TimeUuidStatic;
+  let Tuple: TupleStatic;
+  let Uuid: UuidStatic;
 
   enum consistencies {
     any = 0,
@@ -433,10 +434,10 @@ export namespace types {
   }
 }
 
-export var Client: ClientStatic;
-export var Host: HostStatic;
-export var HostMap: HostMapStatic;
-export var Encoder: EncoderStatic;
+export let Client: ClientStatic;
+export let Host: HostStatic;
+export let HostMap: HostMapStatic;
+export let Encoder: EncoderStatic;
 
 export interface ClientOptions {
   contactPoints: Array<string>,
@@ -468,7 +469,7 @@ export interface ClientOptions {
     coalescingThreshold: number
   },
   authProvider?: auth.AuthProvider,
-  sslOptions?: any,
+  sslOptions?: tls.ConnectionOptions,
   encoding?: {
     map: Function,
     set: Function,
@@ -512,6 +513,7 @@ export interface Client extends events.EventEmitter {
   batch(queries: Array<string> | Array<{ query: string, params?: any }>, options?: QueryOptions): Promise<types.ResultSet>;
 
   connect(callback: Callback): void;
+  connect(): Promise<void>;
   eachRow(query: string, params?: any, options?: QueryOptions, rowCallback?: Callback, callback?: Callback): void;
   execute(query: string, params: any, options: QueryOptions, callback: ResultCallback): void;
   execute(query: string, params: any, callback: ResultCallback): void;
@@ -519,6 +521,7 @@ export interface Client extends events.EventEmitter {
   execute(query: string, params?: any, options?: QueryOptions): Promise<types.ResultSet>;
   getReplicas(keyspace: string, token: Buffer): Array<any>; // TODO: Should this be a more explicit return?
   shutdown(callback?: Callback): void;
+  shutdown(): Promise<void>;
   stream(query: string, params?: any, options?: QueryOptions, callback?: Callback): NodeJS.ReadableStream;
 }
 
@@ -564,8 +567,8 @@ export interface Encoder {
 }
 
 export namespace auth {
-  var Authenticator: AuthenticatorStatic;
-  var PlainTextAuthProvider: PlainTextAuthProviderStatic;
+  let Authenticator: AuthenticatorStatic;
+  let PlainTextAuthProvider: PlainTextAuthProviderStatic;
 
   interface AuthenticatorStatic {
     new (): Authenticator;
@@ -623,12 +626,12 @@ export namespace errors {
 }
 
 export namespace metadata {
-  var Aggregate: AggregateStatic;
-  var Index: IndexStatic;
-  var MaterializedView: MaterializedViewStatic;
-  var Metadata: MetadataStatic;
-  var SchemaFunction: SchemaFunctionStatic;
-  var TableMetadata: TableMetadataStatic;
+  let Aggregate: AggregateStatic;
+  let Index: IndexStatic;
+  let MaterializedView: MaterializedViewStatic;
+  let Metadata: MetadataStatic;
+  let SchemaFunction: SchemaFunctionStatic;
+  let TableMetadata: TableMetadataStatic;
 
   type caching = "all" | "keys_only" | "rows_only" | "none";
 
diff --git a/types/cassandra-driver/tslint.json b/types/cassandra-driver/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cassandra-driver/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index 7bc691abdc..826f1f7369 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/catbox
 // Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as Boom from 'boom';
 
diff --git a/types/catbox/tsconfig.json b/types/catbox/tsconfig.json
index feb19f81dc..16f6fb780e 100644
--- a/types/catbox/tsconfig.json
+++ b/types/catbox/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "catbox-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/cbor/tslint.json b/types/cbor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cbor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-as-promised/tslint.json b/types/chai-as-promised/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-as-promised/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-datetime/tslint.json b/types/chai-datetime/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-datetime/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-dom/tslint.json b/types/chai-dom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-dom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-enzyme/tslint.json b/types/chai-enzyme/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-enzyme/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-fuzzy/tslint.json b/types/chai-fuzzy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-fuzzy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts b/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts
index 05cf190765..c93c4a1d04 100644
--- a/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts
+++ b/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts
@@ -16,7 +16,7 @@ const mockContext: Mocha.IBeforeAndAfterContext = <any> {
     }
 };
 
-chaiJestSnapshot.setFileName("filename");
+chaiJestSnapshot.setFilename("filename");
 chaiJestSnapshot.setTestName("testname");
 chaiJestSnapshot.configureUsingMochaContext(mockContext);
 chaiJestSnapshot.resetSnapshotRegistry();
diff --git a/types/chai-jest-snapshot/index.d.ts b/types/chai-jest-snapshot/index.d.ts
index f19158e282..862da8cd16 100644
--- a/types/chai-jest-snapshot/index.d.ts
+++ b/types/chai-jest-snapshot/index.d.ts
@@ -9,12 +9,7 @@
 declare global {
     namespace Chai {
         interface Assertion {
-            /**
-             * Assert that the object matches the snapshot
-             * @param snapshotFilename
-             * @param snapshotName
-             * @param update
-             */
+            /** Assert that the object matches the snapshot */
             matchSnapshot(snapshotFilename?: string, snapshotName?: string, update?: boolean): Assertion;
             matchSnapshot(update: boolean): Assertion;
         }
@@ -22,40 +17,24 @@ declare global {
 }
 
 interface ChaiJestSnapshot {
-    /**
-     * Chai bootstrapper
-     * @param chai
-     * @param utils
-     */
+    /** Chai bootstrapper */
     (chai: any, utils: any): void;
 
-    /**
-     * Set snapshot file name
-     * @param filename
-     */
-    setFileName(filename: string): void;
+    /** Set snapshot file name */
+    setFilename(filename: string): void;
 
     /**
      * Set snapshot test name
-     * @param testname
      */
     setTestName(testname: string): void;
 
-    /**
-     * Configure snapshot name using mocha context
-     * @param context
-     */
+    /** Configure snapshot name using mocha context */
     configureUsingMochaContext(context: Mocha.IBeforeAndAfterContext): void;
 
-    /**
-     * Reset snapshot registry
-     */
+    /** Reset snapshot registry */
     resetSnapshotRegistry(): void;
 
-    /**
-     * Add a serializer plugin
-     * @param serializer
-     */
+    /** Add a serializer plugin */
     addSerializer(serializer: any): void;
 }
 
diff --git a/types/chai-jquery/index.d.ts b/types/chai-jquery/index.d.ts
index e1628f1743..e84a1ec272 100644
--- a/types/chai-jquery/index.d.ts
+++ b/types/chai-jquery/index.d.ts
@@ -10,21 +10,21 @@
 declare namespace Chai {
 
     interface Assertion {
-        attr: (name: string, value?: string) => Assertion;
-        prop: (name: string, value?: any) => Assertion;
-        css: (name: string, value?: string) => Assertion;
-        data: (name: string, value?: string) => Assertion;
+        attr(name: string, value?: string): Assertion;
+        prop(name: string, value?: any): Assertion;
+        css(name: string, value?: string): Assertion;
+        data(name: string, value?: string): Assertion;
         class(className: string): Assertion;
         id(id: string): Assertion;
         html(html: string): Assertion;
         text(text: string): Assertion;
         value(text: string): Assertion;
         descendants(selector: string): Assertion;
-        visible: Assertion;
-        hidden: Assertion;
-        selected: Assertion;
-        checked: Assertion;
-        disabled: Assertion;
+        visible(): Assertion;
+        hidden(): Assertion;
+        selected(): Assertion;
+        checked(): Assertion;
+        disabled(): Assertion;
         (selector: string): Assertion;
     }
 }
diff --git a/types/chai-jquery/tslint.json b/types/chai-jquery/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-jquery/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-spies/tslint.json b/types/chai-spies/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-spies/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-string/tslint.json b/types/chai-string/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-string/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-things/tslint.json b/types/chai-things/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai-things/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chai-webdriverio/chai-webdriverio-tests.ts b/types/chai-webdriverio/chai-webdriverio-tests.ts
new file mode 100644
index 0000000000..989eb64960
--- /dev/null
+++ b/types/chai-webdriverio/chai-webdriverio-tests.ts
@@ -0,0 +1,30 @@
+import chai = require('chai');
+import webdriverio = require('webdriverio');
+import chaiWebdriverio = require('chai-webdriverio');
+
+const options = {
+    desiredCapabilities: {
+        browserName: 'firefox'
+    }
+};
+
+const browser = webdriverio.remote(options);
+chai.use(chaiWebdriverio(browser));
+
+const selector = 'Hello, World!';
+
+chai.expect(selector).to.be.there();
+
+chai.expect(selector).to.be.visible();
+
+chai.expect(selector).to.have.text(selector);
+
+chai.expect(selector).to.have.text(/regex/);
+
+chai.expect(selector).to.have.count(10);
+
+chai.expect(selector).to.have.value('x');
+
+chai.expect(selector).to.have.value(/regex/);
+
+chai.expect(selector).to.have.focus();
diff --git a/types/chai-webdriverio/index.d.ts b/types/chai-webdriverio/index.d.ts
new file mode 100644
index 0000000000..d0b958dad5
--- /dev/null
+++ b/types/chai-webdriverio/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for chai-webdriverio 0.4
+// Project: https://github.com/marcodejongh/chai-webdriverio
+// Definitions by: Nikolai Orekhov <https://github.com/sherlock1982>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="webdriverio" />
+/// <reference types="chai" />
+
+declare namespace Chai {
+    interface Assertion {
+        count: (count: number) => void;
+        focus: () => void;
+        text: (expected: string|number|RegExp) => void;
+        there: () => void;
+        value: (expected: string|number|RegExp) => void;
+        visible: () => void;
+        immediately: Assertion;
+    }
+}
+
+declare module 'chai-webdriverio' {
+    function chaiWebdriverIO(client: WebdriverIO.Client<void>, options?: any): (chai: any, utils: any) => void;
+    export = chaiWebdriverIO;
+}
diff --git a/types/chai-webdriverio/tsconfig.json b/types/chai-webdriverio/tsconfig.json
new file mode 100644
index 0000000000..c44958af89
--- /dev/null
+++ b/types/chai-webdriverio/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-webdriverio-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/chai-webdriverio/tslint.json b/types/chai-webdriverio/tslint.json
new file mode 100644
index 0000000000..1be28efd2f
--- /dev/null
+++ b/types/chai-webdriverio/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-single-declare-module" : false,
+        "no-declare-current-package": false
+    }
+}
diff --git a/types/chai/chai-tests.ts b/types/chai/chai-tests.ts
index 31802ca303..57b7d127ac 100644
--- a/types/chai/chai-tests.ts
+++ b/types/chai/chai-tests.ts
@@ -1,4 +1,5 @@
-import * as chai from "chai";
+/// <reference types="node" />
+import * as chai from 'chai';
 
 const expect = chai.expect;
 const assert = chai.assert;
@@ -88,10 +89,10 @@ function _undefined() {
 function _NaN() {
     expect(NaN).to.be.NaN;
     expect(12).to.be.not.NaN;
-    expect("NaN").to.be.not.NaN;
+    expect('NaN').to.be.not.NaN;
     (NaN).should.be.NaN;
     (12).should.be.not.NaN;
-    ("NaN").should.be.not.NaN;
+    ('NaN').should.be.not.NaN;
 }
 
 function exist() {
@@ -132,7 +133,9 @@ function _typeof() {
     expect(5).to.be.a('number');
     (5).should.be.a('number');
 
+    // tslint:disable-next-line:no-construct
     expect(new Number(1)).to.be.a('number');
+    // tslint:disable-next-line:no-construct
     (new Number(1)).should.be.a('number');
     expect(Number(1)).to.be.a('number');
     Number(1).should.be.a('number');
@@ -146,8 +149,10 @@ function _typeof() {
     ({}).should.be.a('object');
     expect([]).to.be.a('array');
     [].should.be.a('array');
-    expect(() => { }).to.be.a('function');
-    (() => { }).should.be.a('function');
+    expect(() => {
+    }).to.be.a('function');
+    (() => {
+    }).should.be.a('function');
     expect(null).to.be.a('null');
     // N.B. previous line has no should equivalent
 
@@ -155,7 +160,9 @@ function _typeof() {
     (5).should.not.be.a('number', 'blah');
 }
 
-class Foo { }
+class Foo {
+}
+
 function _instanceof() {
     expect(new Foo()).to.be.an.instanceof(Foo);
     (new Foo()).should.be.an.instanceof(Foo);
@@ -337,8 +344,8 @@ function length2() {
 function eql() {
     expect('test').to.eql('test');
     'test'.should.eql('test');
-    expect({ foo: 'bar' }).to.eql({ foo: 'bar' });
-    ({ foo: 'bar' }).should.eql({ foo: 'bar' });
+    expect({foo: 'bar'}).to.eql({foo: 'bar'});
+    ({foo: 'bar'}).should.eql({foo: 'bar'});
     expect(1).to.eql(1);
     (1).should.eql(1);
     expect('4').to.not.eql(4);
@@ -348,10 +355,6 @@ function eql() {
     (4).should.eql(3, 'blah');
 }
 
-class Buffer {
-    constructor(arr: number[]) {
-    }
-}
 function buffer() {
     expect(new Buffer([1])).to.eql(new Buffer([1]));
     (new Buffer([1])).should.eql(new Buffer([1]));
@@ -378,9 +381,9 @@ function equal2() {
 }
 
 function deepEqual() {
-    expect({ foo: 'bar' }).to.deep.equal({ foo: 'bar' });
-    ({ foo: 'bar' }).should.deep.equal({ foo: 'bar' });
-    expect({ foo: 'bar' }).not.to.deep.equal({ foo: 'baz' });
+    expect({foo: 'bar'}).to.deep.equal({foo: 'bar'});
+    ({foo: 'bar'}).should.deep.equal({foo: 'bar'});
+    expect({foo: 'bar'}).not.to.deep.equal({foo: 'baz'});
 }
 
 function deepEqual2() {
@@ -435,12 +438,12 @@ function empty() {
     ['foo'].should.not.be.empty;
     expect(new FakeArgs).to.be.empty;
     (new FakeArgs).should.be.empty;
-    expect({ arguments: 0 }).not.to.be.empty;
-    ({ arguments: 0 }).should.not.be.empty;
+    expect({arguments: 0}).not.to.be.empty;
+    ({arguments: 0}).should.not.be.empty;
     expect({}).to.be.empty;
     ({}).should.be.empty;
-    expect({ foo: 'bar' }).not.to.be.empty;
-    ({ foo: 'bar' }).should.not.be.empty;
+    expect({foo: 'bar'}).not.to.be.empty;
+    ({foo: 'bar'}).should.not.be.empty;
 
     expect('').not.to.be.empty;
     ''.should.not.be.empty;
@@ -458,14 +461,14 @@ function empty() {
     expect(new FakeArgs).not.to.be.empty;
     (new FakeArgs).should.not.be.empty;
 
-    expect({ arguments: 0 }).to.be.empty;
-    ({ arguments: 0 }).should.be.empty;
+    expect({arguments: 0}).to.be.empty;
+    ({arguments: 0}).should.be.empty;
 
     expect({}).not.to.be.empty;
     ({}).should.not.be.empty;
 
-    expect({ foo: 'bar' }).to.be.empty;
-    ({ foo: 'bar' }).should.be.empty;
+    expect({foo: 'bar'}).to.be.empty;
+    ({foo: 'bar'}).should.be.empty;
 }
 
 function property() {
@@ -474,35 +477,35 @@ function property() {
     expect(4).to.not.have.property('length');
     (4).should.not.have.property('length');
 
-    expect({ 'foo.bar': 'baz' })
+    expect({'foo.bar': 'baz'})
         .to.have.property('foo.bar');
-    ({ 'foo.bar': 'baz' }).should.have.property('foo.bar');
-    expect({ foo: { bar: 'baz' } })
+    ({'foo.bar': 'baz'}).should.have.property('foo.bar');
+    expect({foo: {bar: 'baz'}})
         .to.not.have.property('foo.bar');
-    ({ foo: { bar: 'baz' } }).should.not.have.property('foo.bar');
+    ({foo: {bar: 'baz'}}).should.not.have.property('foo.bar');
 
     expect('asd').to.have.property('foo');
     'asd'.should.have.property('foo');
 
-    expect({ foo: { bar: 'baz' } })
+    expect({foo: {bar: 'baz'}})
         .to.have.property('foo.bar');
 
-    ({ foo: { bar: 'baz' } }).should.have.property('foo.bar');
+    ({foo: {bar: 'baz'}}).should.have.property('foo.bar');
 }
 
 function nestedProperty() {
-    expect({ 'foo.bar': 'baz' })
+    expect({'foo.bar': 'baz'})
         .to.not.have.nested.property('foo.bar');
-    ({ 'foo.bar': 'baz' }).should
+    ({'foo.bar': 'baz'}).should
         .not.have.nested.property('foo.bar');
-    expect({ foo: { bar: 'baz' } })
+    expect({foo: {bar: 'baz'}})
         .to.have.nested.property('foo.bar');
-    ({ foo: { bar: 'baz' } }).should
+    ({foo: {bar: 'baz'}}).should
         .have.nested.property('foo.bar');
 
-    expect({ 'foo.bar': 'baz' })
+    expect({'foo.bar': 'baz'})
         .to.have.nested.property('foo.bar');
-    ({ 'foo.bar': 'baz' }).should
+    ({'foo.bar': 'baz'}).should
         .have.nested.property('foo.bar');
 }
 
@@ -526,22 +529,22 @@ function property2() {
 }
 
 function nestedProperty2() {
-    expect({ foo: { bar: 'baz' } })
+    expect({foo: {bar: 'baz'}})
         .to.have.nested.property('foo.bar', 'baz');
-    ({ foo: { bar: 'baz' } }).should
+    ({foo: {bar: 'baz'}}).should
         .have.nested.property('foo.bar', 'baz');
 
-    expect({ foo: { bar: 'baz' } })
+    expect({foo: {bar: 'baz'}})
         .to.have.nested.property('foo.bar', 'quux', 'blah');
-    ({ foo: { bar: 'baz' } }).should
+    ({foo: {bar: 'baz'}}).should
         .have.nested.property('foo.bar', 'quux', 'blah');
-    expect({ foo: { bar: 'baz' } })
+    expect({foo: {bar: 'baz'}})
         .to.not.have.nested.property('foo.bar', 'baz', 'blah');
-    ({ foo: { bar: 'baz' } }).should
+    ({foo: {bar: 'baz'}}).should
         .not.have.nested.property('foo.bar', 'baz', 'blah');
-    expect({ foo: 5 })
+    expect({foo: 5})
         .to.not.have.nested.property('foo.bar', 'baz', 'blah');
-    ({ foo: 5 }).should
+    ({foo: 5}).should
         .not.have.nested.property('foo.bar', 'baz', 'blah');
 }
 
@@ -550,23 +553,43 @@ function ownProperty() {
     'test'.should.have.ownProperty('length');
     expect('test').to.haveOwnProperty('length');
     'test'.should.haveOwnProperty('length');
-    expect({ length: 12 }).to.have.ownProperty('length');
-    ({ length: 12 }).should.have.ownProperty('length');
+    expect({length: 12}).to.have.ownProperty('length');
+    ({length: 12}).should.have.ownProperty('length');
 
-    expect({ length: 12 }).to.not.have.ownProperty('length', 'blah');
-    ({ length: 12 }).should.not.have.ownProperty('length', 'blah');
+    expect({length: 12}).to.not.have.ownProperty('length', 'blah');
+    ({length: 12}).should.not.have.ownProperty('length', 'blah');
 }
 
 function ownPropertyDescriptor() {
     expect('test').to.have.ownPropertyDescriptor('length');
-    expect('test').to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 4 });
-    expect('test').not.to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 3 });
+    expect('test').to.have.ownPropertyDescriptor('length', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: 4
+    });
+    expect('test').not.to.have.ownPropertyDescriptor('length', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: 3
+    });
     expect('test').to.haveOwnPropertyDescriptor('length').to.have.property('enumerable', false);
     expect('test').to.haveOwnPropertyDescriptor('length').to.contain.keys('value');
 
     'test'.should.have.ownPropertyDescriptor('length');
-    'test'.should.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 4 });
-    'test'.should.not.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 3 });
+    'test'.should.have.ownPropertyDescriptor('length', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: 4
+    });
+    'test'.should.not.have.ownPropertyDescriptor('length', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: 3
+    });
     'test'.should.haveOwnPropertyDescriptor('length').to.have.property('enumerable', false);
     'test'.should.haveOwnPropertyDescriptor('length').to.contain.keys('value');
 }
@@ -614,88 +637,88 @@ function include() {
 }
 
 function keys() {
-    expect({ foo: 1 }).to.have.keys(['foo']);
-    ({ foo: 1 }).should.have.keys(['foo']);
-    expect({ foo: 1, bar: 2 }).to.have.keys(['foo', 'bar']);
-    ({ foo: 1, bar: 2 }).should.have.keys(['foo', 'bar']);
-    expect({ foo: 1, bar: 2 }).to.have.keys('foo', 'bar');
-    ({ foo: 1, bar: 2 }).should.have.keys('foo', 'bar');
-    expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('foo', 'bar');
-    ({ foo: 1, bar: 2, baz: 3 }).should.contain.keys('foo', 'bar');
-    expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('bar', 'foo');
-    ({ foo: 1, bar: 2, baz: 3 }).should.contain.keys('bar', 'foo');
-    expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('baz');
-    ({ foo: 1, bar: 2, baz: 3 }).should.contain.keys('baz');
+    expect({foo: 1}).to.have.keys(['foo']);
+    ({foo: 1}).should.have.keys(['foo']);
+    expect({foo: 1, bar: 2}).to.have.keys(['foo', 'bar']);
+    ({foo: 1, bar: 2}).should.have.keys(['foo', 'bar']);
+    expect({foo: 1, bar: 2}).to.have.keys('foo', 'bar');
+    ({foo: 1, bar: 2}).should.have.keys('foo', 'bar');
+    expect({foo: 1, bar: 2, baz: 3}).to.contain.keys('foo', 'bar');
+    ({foo: 1, bar: 2, baz: 3}).should.contain.keys('foo', 'bar');
+    expect({foo: 1, bar: 2, baz: 3}).to.contain.keys('bar', 'foo');
+    ({foo: 1, bar: 2, baz: 3}).should.contain.keys('bar', 'foo');
+    expect({foo: 1, bar: 2, baz: 3}).to.contain.keys('baz');
+    ({foo: 1, bar: 2, baz: 3}).should.contain.keys('baz');
     // alias
 
-    expect({ foo: 1, bar: 2, baz: 3 }).contains.keys('baz');
+    expect({foo: 1, bar: 2, baz: 3}).contains.keys('baz');
 
-    expect({ foo: 1, bar: 2 }).to.have.all.keys(['foo', 'bar']);
-    expect({ foo: 1, bar: 2 }).to.have.any.keys(['foo', 'bar']);
-    ({ foo: 1, bar: 2, baz: 3 }).should.contain.all.keys('baz');
-    ({ foo: 1, bar: 2, baz: 3 }).should.contain.any.keys('baz');
+    expect({foo: 1, bar: 2}).to.have.all.keys(['foo', 'bar']);
+    expect({foo: 1, bar: 2}).to.have.any.keys(['foo', 'bar']);
+    ({foo: 1, bar: 2, baz: 3}).should.contain.all.keys('baz');
+    ({foo: 1, bar: 2, baz: 3}).should.contain.any.keys('baz');
 
-    expect({ foo: 1, bar: 2 }).to.contain.keys('foo');
-    ({ foo: 1, bar: 2 }).should.contain.keys('foo');
-    expect({ foo: 1, bar: 2 }).to.contain.keys('bar', 'foo');
-    ({ foo: 1, bar: 2 }).should.contain.keys('bar', 'foo');
-    expect({ foo: 1, bar: 2 }).to.contain.keys(['foo']);
-    ({ foo: 1, bar: 2 }).should.contain.keys(['foo']);
-    expect({ foo: 1, bar: 2 }).to.contain.keys(['bar']);
-    ({ foo: 1, bar: 2 }).should.contain.keys(['bar']);
-    expect({ foo: 1, bar: 2 }).to.contain.keys(['bar', 'foo']);
-    ({ foo: 1, bar: 2 }).should.contain.keys(['bar', 'foo']);
+    expect({foo: 1, bar: 2}).to.contain.keys('foo');
+    ({foo: 1, bar: 2}).should.contain.keys('foo');
+    expect({foo: 1, bar: 2}).to.contain.keys('bar', 'foo');
+    ({foo: 1, bar: 2}).should.contain.keys('bar', 'foo');
+    expect({foo: 1, bar: 2}).to.contain.keys(['foo']);
+    ({foo: 1, bar: 2}).should.contain.keys(['foo']);
+    expect({foo: 1, bar: 2}).to.contain.keys(['bar']);
+    ({foo: 1, bar: 2}).should.contain.keys(['bar']);
+    expect({foo: 1, bar: 2}).to.contain.keys(['bar', 'foo']);
+    ({foo: 1, bar: 2}).should.contain.keys(['bar', 'foo']);
 
-    expect({ foo: 1, bar: 2 }).to.not.have.keys('baz');
-    ({ foo: 1, bar: 2 }).should.not.have.keys('baz');
-    expect({ foo: 1, bar: 2 }).to.not.have.keys('foo', 'baz');
-    ({ foo: 1, bar: 2 }).should.not.have.keys('foo', 'baz');
-    expect({ foo: 1, bar: 2 }).to.not.contain.keys('baz');
-    ({ foo: 1, bar: 2 }).should.not.contain.keys('baz');
-    expect({ foo: 1, bar: 2 }).to.not.contain.keys('foo', 'baz');
-    ({ foo: 1, bar: 2 }).should.not.contain.keys('foo', 'baz');
-    expect({ foo: 1, bar: 2 }).to.not.contain.keys('baz', 'foo');
-    ({ foo: 1, bar: 2 }).should.not.contain.keys('baz', 'foo');
+    expect({foo: 1, bar: 2}).to.not.have.keys('baz');
+    ({foo: 1, bar: 2}).should.not.have.keys('baz');
+    expect({foo: 1, bar: 2}).to.not.have.keys('foo', 'baz');
+    ({foo: 1, bar: 2}).should.not.have.keys('foo', 'baz');
+    expect({foo: 1, bar: 2}).to.not.contain.keys('baz');
+    ({foo: 1, bar: 2}).should.not.contain.keys('baz');
+    expect({foo: 1, bar: 2}).to.not.contain.keys('foo', 'baz');
+    ({foo: 1, bar: 2}).should.not.contain.keys('foo', 'baz');
+    expect({foo: 1, bar: 2}).to.not.contain.keys('baz', 'foo');
+    ({foo: 1, bar: 2}).should.not.contain.keys('baz', 'foo');
 
-    expect({ foo: 1 }).to.have.keys();
-    ({ foo: 1 }).should.have.keys();
+    expect({foo: 1}).to.have.keys();
+    ({foo: 1}).should.have.keys();
 
-    expect({ foo: 1 }).to.have.keys([]);
-    ({ foo: 1 }).should.have.keys([]);
+    expect({foo: 1}).to.have.keys([]);
+    ({foo: 1}).should.have.keys([]);
 
-    expect({ foo: 1 }).to.not.have.keys([]);
-    ({ foo: 1 }).should.not.have.keys([]);
+    expect({foo: 1}).to.not.have.keys([]);
+    ({foo: 1}).should.not.have.keys([]);
 
-    expect({ foo: 1 }).to.contain.keys([]);
-    ({ foo: 1 }).should.contain.keys([]);
+    expect({foo: 1}).to.contain.keys([]);
+    ({foo: 1}).should.contain.keys([]);
 
-    expect({ foo: 1 }).to.have.keys(['bar']);
-    ({ foo: 1 }).should.have.keys(['bar']);
+    expect({foo: 1}).to.have.keys(['bar']);
+    ({foo: 1}).should.have.keys(['bar']);
 
-    expect({ foo: 1 }).to.have.keys(['bar', 'baz']);
-    ({ foo: 1 }).should.have.keys(['bar', 'baz']);
+    expect({foo: 1}).to.have.keys(['bar', 'baz']);
+    ({foo: 1}).should.have.keys(['bar', 'baz']);
 
-    expect({ foo: 1 }).to.have.keys(['foo', 'bar', 'baz']);
-    ({ foo: 1 }).should.have.keys(['foo', 'bar', 'baz']);
+    expect({foo: 1}).to.have.keys(['foo', 'bar', 'baz']);
+    ({foo: 1}).should.have.keys(['foo', 'bar', 'baz']);
 
-    expect({ foo: 1 }).to.not.have.keys(['foo']);
-    ({ foo: 1 }).should.not.have.keys(['foo']);
+    expect({foo: 1}).to.not.have.keys(['foo']);
+    ({foo: 1}).should.not.have.keys(['foo']);
 
-    expect({ foo: 1 }).to.not.have.keys(['foo']);
-    ({ foo: 1 }).should.not.have.keys(['foo']);
+    expect({foo: 1}).to.not.have.keys(['foo']);
+    ({foo: 1}).should.not.have.keys(['foo']);
 
-    expect({ foo: 1, bar: 2 }).to.not.have.keys(['foo', 'bar']);
-    ({ foo: 1, bar: 2 }).should.not.have.keys(['foo', 'bar']);
+    expect({foo: 1, bar: 2}).to.not.have.keys(['foo', 'bar']);
+    ({foo: 1, bar: 2}).should.not.have.keys(['foo', 'bar']);
 
-    expect({ foo: 1 }).to.not.contain.keys(['foo']);
-    ({ foo: 1 }).should.not.contain.keys(['foo']);
+    expect({foo: 1}).to.not.contain.keys(['foo']);
+    ({foo: 1}).should.not.contain.keys(['foo']);
 
-    expect({ foo: 1 }).to.contain.keys('foo', 'bar');
-    ({ foo: 1 }).should.contain.keys('foo', 'bar');
+    expect({foo: 1}).to.contain.keys('foo', 'bar');
+    ({foo: 1}).should.contain.keys('foo', 'bar');
 }
 
 function chaining() {
-    const tea = { name: 'chai', extras: ['milk', 'sugar', 'smile'] };
+    const tea = {name: 'chai', extras: ['milk', 'sugar', 'smile']};
     expect(tea).to.have.property('extras').with.lengthOf(3);
     tea.should.have.property('extras').with.lengthOf(3);
 
@@ -712,6 +735,7 @@ function exxtensible() {
     ({}).should.be.extensible;
     Object.preventExtensions({}).should.not.be.extensible;
 }
+
 function sealed() {
     expect({}).to.be.not.sealed;
     expect(Object.seal({})).to.be.sealed;
@@ -726,8 +750,9 @@ function frozen() {
     Object.freeze({}).should.be.frozen;
 }
 
+class PoorlyConstructedError {
+}
 
-class PoorlyConstructedError { }
 function _throw() {
     // See GH-45: some poorly-constructed custom errors don't have useful names
     // on either their constructor or their constructor prototype, but instead
@@ -736,11 +761,20 @@ function _throw() {
 
     const specificError = new RangeError('boo');
 
-    const goodFn = () => { }
-        , badFn = () => { throw new Error('testing'); }
-        , refErrFn = () => { throw new ReferenceError('hello'); }
-        , ickyErrFn = () => { throw new PoorlyConstructedError(); }
-        , specificErrFn = () => { throw specificError; };
+    const goodFn = () => {
+    };
+    const badFn = () => {
+        throw new Error('testing');
+    };
+    const refErrFn = () => {
+        throw new ReferenceError('hello');
+    };
+    const ickyErrFn = () => {
+        throw new PoorlyConstructedError();
+    };
+    const specificErrFn = () => {
+        throw specificError;
+    };
 
     expect(goodFn).to.not.throw();
     goodFn.should.not.throw();
@@ -891,18 +925,26 @@ function use() {
         _chai.can.use.any();
     });
 
-    let expect = chai
-        .use((_chai, util) => {})
-        .use((_chai, util) => {})
+    const expect = chai
+        .use((_chai, util) => {
+        })
+        .use((_chai, util) => {
+        })
         .expect;
 }
 
 class Klass {
     val: number;
-    constructor() { this.val = 0; }
-    bar() { }
 
-    static baz() { }
+    constructor() {
+        this.val = 0;
+    }
+
+    bar() {
+    }
+
+    static baz() {
+    }
 }
 
 function respondTo() {
@@ -1001,20 +1043,21 @@ function sameMembers() {
 
     assert.sameMembers([5, 4], [4, 5]);
 }
+
 function sameDeepMembers() {
-    expect([{ id: 5 }, { id: 4 }]).to.have.same.deep.members([{ id: 4 }, { id: 5 }]);
-    [{ id: 5 }, { id: 4 }].should.have.same.deep.members([{ id: 4 }, { id: 5 }]);
-    expect([{ id: 5 }, { id: 4 }]).to.have.same.members([{ id: 5 }, { id: 4 }]);
-    [{ id: 5 }, { id: 4 }].should.have.same.members([{ id: 5 }, { id: 4 }]);
+    expect([{id: 5}, {id: 4}]).to.have.same.deep.members([{id: 4}, {id: 5}]);
+    [{id: 5}, {id: 4}].should.have.same.deep.members([{id: 4}, {id: 5}]);
+    expect([{id: 5}, {id: 4}]).to.have.same.members([{id: 5}, {id: 4}]);
+    [{id: 5}, {id: 4}].should.have.same.members([{id: 5}, {id: 4}]);
 
-    expect([{ id: 5 }, { id: 4 }]).to.not.have.same.members([]);
-    [{ id: 5 }, { id: 4 }].should.not.have.same.members([]);
-    expect([{ id: 5 }, { id: 4 }]).to.not.have.same.members([{ id: 6 }, { id: 3 }]);
-    [{ id: 5 }, { id: 4 }].should.not.have.same.members([{ id: 6 }, { id: 3 }]);
-    expect([{ id: 5 }, { id: 4 }]).to.not.have.same.members([{ id: 5 }, { id: 4 }, { id: 2 }]);
-    [{ id: 5 }, { id: 4 }].should.not.have.same.members([{ id: 5 }, { id: 4 }, { id: 2 }]);
+    expect([{id: 5}, {id: 4}]).to.not.have.same.members([]);
+    [{id: 5}, {id: 4}].should.not.have.same.members([]);
+    expect([{id: 5}, {id: 4}]).to.not.have.same.members([{id: 6}, {id: 3}]);
+    [{id: 5}, {id: 4}].should.not.have.same.members([{id: 6}, {id: 3}]);
+    expect([{id: 5}, {id: 4}]).to.not.have.same.members([{id: 5}, {id: 4}, {id: 2}]);
+    [{id: 5}, {id: 4}].should.not.have.same.members([{id: 5}, {id: 4}, {id: 2}]);
 
-    assert.sameDeepMembers([{ id: 5 }, { id: 4 }], [{ id: 4 }, { id: 5 }]);
+    assert.sameDeepMembers([{id: 5}, {id: 4}], [{id: 4}, {id: 5}]);
 }
 
 function orderedMembers() {
@@ -1024,15 +1067,15 @@ function orderedMembers() {
     expect([1, 2, 3]).to.have.members([2, 1, 3]).but.not.ordered.members([2, 1, 3]);
     expect([{a: 1}, {b: 2}, {c: 3}]).to.include.deep.ordered.members([{a: 1}, {b: 2}]).but.not.include.deep.ordered.members([{b: 2}, {c: 3}]);
 
-    assert.sameOrderedMembers([ 1, 2, 3 ], [ 1, 2, 3 ], 'same ordered members');
-    assert.notSameOrderedMembers([ 1, 2, 3 ], [ 2, 1, 3 ], 'not same ordered members');
-    assert.sameDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { a: 1 }, { b: 2 }, { c: 3 } ], 'same deep ordered members');
-    assert.notSameDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { b: 2 }, { a: 1 }, { c: 3 } ], 'not same deep ordered members');
+    assert.sameOrderedMembers([1, 2, 3], [1, 2, 3], 'same ordered members');
+    assert.notSameOrderedMembers([1, 2, 3], [2, 1, 3], 'not same ordered members');
+    assert.sameDeepOrderedMembers([{a: 1}, {b: 2}, {c: 3}], [{a: 1}, {b: 2}, {c: 3}], 'same deep ordered members');
+    assert.notSameDeepOrderedMembers([{a: 1}, {b: 2}, {c: 3}], [{b: 2}, {a: 1}, {c: 3}], 'not same deep ordered members');
 
-    assert.includeOrderedMembers([ 1, 2, 3 ], [ 1, 2 ], 'include ordered members');
-    assert.notIncludeOrderedMembers([ 1, 2, 3 ], [ 2, 1 ], 'not include ordered members');
-    assert.includeDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { a: 1 }, { b: 2 } ], 'include deep ordered members');
-    assert.notIncludeDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { b: 2 }, { c: 3 } ], 'not include deep ordered members');
+    assert.includeOrderedMembers([1, 2, 3], [1, 2], 'include ordered members');
+    assert.notIncludeOrderedMembers([1, 2, 3], [2, 1], 'not include ordered members');
+    assert.includeDeepOrderedMembers([{a: 1}, {b: 2}, {c: 3}], [{a: 1}, {b: 2}], 'include deep ordered members');
+    assert.notIncludeDeepOrderedMembers([{a: 1}, {b: 2}, {c: 3}], [{b: 2}, {c: 3}], 'not include deep ordered members');
 }
 
 function members() {
@@ -1045,39 +1088,44 @@ function members() {
 }
 
 function increaseDecreaseChange() {
-    const obj = { val: 10 };
-    const inc = () => { obj.val++; };
-    const dec = () => { obj.val--; };
-    const same = () => { };
+    const obj = {val: 10};
+    const inc = () => {
+        obj.val++;
+    };
+    const dec = () => {
+        obj.val--;
+    };
+    const same = () => {
+    };
 
-    expect(inc).to.increase(obj, "val");
-    expect(inc).increases(obj, "val");
-    expect(inc).to.change(obj, "val");
+    expect(inc).to.increase(obj, 'val');
+    expect(inc).increases(obj, 'val');
+    expect(inc).to.change(obj, 'val');
 
-    expect(dec).to.decrease(obj, "val");
-    expect(dec).decreases(obj, "val");
-    expect(dec).to.change(obj, "val");
-    expect(dec).changes(obj, "val");
+    expect(dec).to.decrease(obj, 'val');
+    expect(dec).decreases(obj, 'val');
+    expect(dec).to.change(obj, 'val');
+    expect(dec).changes(obj, 'val');
 
-    expect(inc).to.not.decrease(obj, "val");
-    expect(dec).to.not.increase(obj, "val");
-    expect(same).to.not.increase(obj, "val");
-    expect(same).to.not.decrease(obj, "val");
-    expect(same).to.not.change(obj, "val");
+    expect(inc).to.not.decrease(obj, 'val');
+    expect(dec).to.not.increase(obj, 'val');
+    expect(same).to.not.increase(obj, 'val');
+    expect(same).to.not.decrease(obj, 'val');
+    expect(same).to.not.change(obj, 'val');
 
-    inc.should.increase(obj, "val");
-    inc.should.change(obj, "val");
+    inc.should.increase(obj, 'val');
+    inc.should.change(obj, 'val');
 
-    dec.should.decrease(obj, "val");
-    dec.should.change(obj, "val");
+    dec.should.decrease(obj, 'val');
+    dec.should.change(obj, 'val');
 
-    inc.should.not.decrease(obj, "val");
-    dec.should.not.increase(obj, "val");
-    same.should.not.change(obj, "val");
+    inc.should.not.decrease(obj, 'val');
+    dec.should.not.increase(obj, 'val');
+    same.should.not.change(obj, 'val');
 }
 
 function oneOf() {
-    const obj = { z: 3 };
+    const obj = {z: 3};
 
     expect(5).to.be.oneOf([1, 5, 4]);
     expect('z').to.be.oneOf(['x', 'y', 'z']);
@@ -1087,11 +1135,12 @@ function oneOf() {
     expect(5).to.not.be.oneOf([1, [5], 4]);
     expect('z').to.not.be.oneOf(['w', 'x', 'y']);
     expect('z').to.not.be.oneOf(['x', 'y', ['z']]);
-    expect(obj).to.not.be.oneOf([{ z: 3 }]);
+    expect(obj).to.not.be.oneOf([{z: 3}]);
 }
 
-//tdd
+// tdd
 declare function suite(description: string, action: Function): void;
+
 declare function test(description: string, action: Function): void;
 
 interface FieldObj {
@@ -1105,9 +1154,8 @@ class CrashyObject {
 }
 
 suite('assert', () => {
-
     test('assert', () => {
-        const foo: string = 'bar';
+        const foo = 'bar' as string;
         assert(foo === 'bar', 'expected foo to equal `bar`');
 
         assert(foo === 'baz', 'expected foo to equal `bar`');
@@ -1204,29 +1252,29 @@ suite('assert', () => {
     });
 
     test('deepEqual', () => {
-        assert.deepEqual({ tea: 'chai' }, { tea: 'chai' });
-        assert.deepEqual({ tea: 'chai' }, { tea: 'black' });
+        assert.deepEqual({tea: 'chai'}, {tea: 'chai'});
+        assert.deepEqual({tea: 'chai'}, {tea: 'black'});
 
-        const obja = Object.create({ tea: 'chai' })
-            , objb = Object.create({ tea: 'chai' });
+        const obja = Object.create({tea: 'chai'});
+        const objb = Object.create({tea: 'chai'});
 
         assert.deepEqual(obja, objb);
 
-        const obj1 = Object.create({ tea: 'chai' })
-            , obj2 = Object.create({ tea: 'black' });
+        const obj1 = Object.create({tea: 'chai'});
+        const obj2 = Object.create({tea: 'black'});
 
         assert.deepEqual(obj1, obj2);
     });
 
     test('deepEqual (ordering)', () => {
-        const a = { a: 'b', c: 'd' }
-            , b = { c: 'd', a: 'b' };
+        const a = {a: 'b', c: 'd'};
+        const b = {c: 'd', a: 'b'};
         assert.deepEqual(a, b);
     });
 
     test('deepEqual (circular)', () => {
-        const circularObject: any = {}
-            , secondCircularObject: any = {};
+        const circularObject: any = {};
+        const secondCircularObject: any = {};
         circularObject.field = circularObject;
         secondCircularObject.field = secondCircularObject;
 
@@ -1237,13 +1285,13 @@ suite('assert', () => {
     });
 
     test('notDeepEqual', () => {
-        assert.notDeepEqual({ tea: 'jasmine' }, { tea: 'chai' });
-        assert.notDeepEqual({ tea: 'chai' }, { tea: 'chai' });
+        assert.notDeepEqual({tea: 'jasmine'}, {tea: 'chai'});
+        assert.notDeepEqual({tea: 'chai'}, {tea: 'chai'});
     });
 
     test('notDeepEqual (circular)', () => {
-        const circularObject: any = {}
-            , secondCircularObject: any = { tea: 'jasmine' };
+        const circularObject: any = {};
+        const secondCircularObject: any = {tea: 'jasmine'};
         circularObject.field = circularObject;
         secondCircularObject.field = secondCircularObject;
 
@@ -1292,7 +1340,8 @@ suite('assert', () => {
 
     test('isNotFunction', () => {
         assert.isNotFunction(5);
-        assert.isNotFunction(() => {});
+        assert.isNotFunction(() => {
+        });
     });
 
     test('isArray', () => {
@@ -1309,6 +1358,7 @@ suite('assert', () => {
 
     test('isString', () => {
         assert.isString('Foo');
+        // tslint:disable-next-line:no-construct
         assert.isString(new String('foo'));
         assert.isString(1);
     });
@@ -1357,11 +1407,61 @@ suite('assert', () => {
         assert.notInclude(undefined, 'bar');
     });
 
+    test('deepInclude', () => {
+        assert.deepInclude('foobar', 'bar');
+        assert.deepInclude([1, 2, 3], 3);
+        assert.deepInclude('foobar', 'baz');
+        assert.deepInclude(undefined, 'bar');
+    });
+
+    test('notDeepInclude', () => {
+        assert.notDeepInclude('foobar', 'baz');
+        assert.notDeepInclude([1, 2, 3], 4);
+        assert.notDeepInclude('foobar', 'bar');
+        assert.notDeepInclude(undefined, 'bar');
+    });
+
+    test('nestedInclude', () => {
+        assert.nestedInclude({'.a': {b: 'x'}}, {'\\.a.[b]': 'x'});
+        assert.nestedInclude({a: {'[b]': 'x'}}, {'a.\\[b\\]': 'x'});
+    });
+
+    test('notNestedInclude', () => {
+        assert.notNestedInclude({'.a': {b: 'x'}}, {'\\.a.b': 'y'});
+        assert.notNestedInclude({a: {'[b]': 'x'}}, {'a.\\[b\\]': 'y'});
+    });
+
+    test('deepNestedInclude', () => {
+        assert.deepNestedInclude({a: {b: [{x: 1}]}}, {'a.b[0]': {x: 1}});
+        assert.deepNestedInclude({'.a': {'[b]': {x: 1}}}, {'\\.a.\\[b\\]': {x: 1}});
+    });
+
+    test('notDeepNestedInclude', () => {
+        assert.notDeepNestedInclude({a: {b: [{x: 1}]}}, {'a.b[0]': {y: 1}});
+        assert.notDeepNestedInclude({'.a': {'[b]': {x: 1}}}, {'\\.a.\\[b\\]': {y: 2}});
+    });
+
+    test('ownInclude', () => {
+        assert.ownInclude({a: 1}, {a: 1});
+    });
+
+    test('notOwnInclude', () => {
+        assert.notOwnInclude({a: 1}, {a: 1});
+    });
+
+    test('deepOwnInclude', () => {
+        assert.deepOwnInclude({a: {b: 2}}, {a: {b: 2}});
+    });
+
+    test('notDeepOwnInclude', () => {
+        assert.notDeepOwnInclude({a: {b: 2}}, {a: {c: 3}});
+    });
+
     test('lengthOf', () => {
         assert.lengthOf([1, 2, 3], 3);
         assert.lengthOf('foobar', 6);
         assert.lengthOf('foobar', 5);
-        assert.lengthOf({ length: 1 }, 5);
+        assert.lengthOf({length: 1}, 5);
     });
 
     test('match', () => {
@@ -1372,8 +1472,8 @@ suite('assert', () => {
     });
 
     test('property', () => {
-        const obj = { foo: { bar: 'baz' } };
-        const simpleObj = { foo: 'bar' } as any;
+        const obj = {foo: {bar: 'baz'}};
+        const simpleObj = {foo: 'bar'} as any;
         assert.property(obj, 'foo');
         assert.deepProperty(obj, 'foo.bar');
         assert.notDeepProperty(obj, 'foo.baz');
@@ -1422,7 +1522,8 @@ suite('assert', () => {
             throw new Error('foo');
         }, TypeError, 'bar');
 
-        assert.throws(() => {});
+        assert.throws(() => {
+        });
 
         assert.throws(() => {
             throw new Error('');
@@ -1434,8 +1535,10 @@ suite('assert', () => {
     });
 
     test('doesNotThrow', () => {
-        assert.doesNotThrow(() => { });
-        assert.doesNotThrow(() => { }, 'foo');
+        assert.doesNotThrow(() => {
+        });
+        assert.doesNotThrow(() => {
+        }, 'foo');
 
         assert.doesNotThrow(() => {
             throw new Error('foo');
@@ -1498,7 +1601,6 @@ suite('assert', () => {
         assert.sameMembers([1, 54], [6, 1, 54]);
     });
 
-
     test('isAbove', () => {
         assert.isAbove(10, 5);
         assert.isAbove(1, 5);
@@ -1511,20 +1613,44 @@ suite('assert', () => {
         assert.isBelow(5, 5);
     });
 
-    test('extensible', () => { assert.extensible({}); });
-    test('isExtensible', () => { assert.isExtensible({}); });
-    test('notExtensible', () => { assert.notExtensible(Object.preventExtensions({})); });
-    test('isNotExtensible', () => { assert.isNotExtensible(Object.preventExtensions({})); });
+    test('extensible', () => {
+        assert.extensible({});
+    });
+    test('isExtensible', () => {
+        assert.isExtensible({});
+    });
+    test('notExtensible', () => {
+        assert.notExtensible(Object.preventExtensions({}));
+    });
+    test('isNotExtensible', () => {
+        assert.isNotExtensible(Object.preventExtensions({}));
+    });
 
-    test('sealed', () => { assert.sealed(Object.seal({})); });
-    test('isSealed', () => { assert.isSealed(Object.seal({})); });
-    test('notSealed', () => { assert.notSealed({}); });
-    test('isNotSealed', () => { assert.isNotSealed({}); });
+    test('sealed', () => {
+        assert.sealed(Object.seal({}));
+    });
+    test('isSealed', () => {
+        assert.isSealed(Object.seal({}));
+    });
+    test('notSealed', () => {
+        assert.notSealed({});
+    });
+    test('isNotSealed', () => {
+        assert.isNotSealed({});
+    });
 
-    test('frozen', () => { assert.frozen(Object.freeze({})); });
-    test('isFrozen', () => { assert.isFrozen(Object.freeze({})); });
-    test('notFrozen', () => { assert.notFrozen({}); });
-    test('isNotFrozen', () => { assert.isNotFrozen({}); });
+    test('frozen', () => {
+        assert.frozen(Object.freeze({}));
+    });
+    test('isFrozen', () => {
+        assert.isFrozen(Object.freeze({}));
+    });
+    test('notFrozen', () => {
+        assert.notFrozen({});
+    });
+    test('isNotFrozen', () => {
+        assert.isNotFrozen({});
+    });
 
     test('isNotTrue', () => {
         assert.isNotTrue(false);
@@ -1549,132 +1675,256 @@ suite('assert', () => {
     });
 
     test('oneOf', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.oneOf(5, [1, 5, 4]);
         assert.oneOf('z', ['x', 'y', 'z']);
         assert.oneOf(obj, [obj]);
         assert.oneOf(5, [1, [5], 4]);
         assert.oneOf('z', ['w', 'x', 'y']);
-        assert.oneOf(obj, [{ z: 3 }]);
+        assert.oneOf(obj, [{z: 3}]);
     });
 
     test('changes', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
-        assert.changes(() => {}, obj, 'z');
-        assert.changes(() => {}, obj, 'z', 'message');
+        assert.changes(() => {
+        }, obj, 'z');
+        assert.changes(() => {
+        }, obj, 'z', 'message');
     });
 
     test('doesNotChange', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
-        assert.doesNotChange(() => {}, obj, 'z');
-        assert.doesNotChange(() => {}, obj, 'z', 'message');
+        assert.doesNotChange(() => {
+        }, obj, 'z');
+        assert.doesNotChange(() => {
+        }, obj, 'z', 'message');
     });
 
     test('increases', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
-        assert.increases(() => {}, obj, 'z');
-        assert.increases(() => {}, obj, 'z', 'message');
+        assert.increases(() => {
+        }, obj, 'z');
+        assert.increases(() => {
+        }, obj, 'z', 'message');
     });
 
     test('doesNotIncrease', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
-        assert.doesNotIncrease(() => {}, obj, 'z');
-        assert.doesNotIncrease(() => {}, obj, 'z', 'message');
+        assert.doesNotIncrease(() => {
+        }, obj, 'z');
+        assert.doesNotIncrease(() => {
+        }, obj, 'z', 'message');
     });
 
     test('decreases', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
-        assert.decreases(() => {}, obj, 'z');
-        assert.decreases(() => {}, obj, 'z', 'message');
+        assert.decreases(() => {
+        }, obj, 'z');
+        assert.decreases(() => {
+        }, obj, 'z', 'message');
     });
 
     test('doesNotDecrease', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
-        assert.doesNotDecrease(() => {}, obj, 'z');
-        assert.doesNotDecrease(() => {}, obj, 'z', 'message');
+        assert.doesNotDecrease(() => {
+        }, obj, 'z');
+        assert.doesNotDecrease(() => {
+        }, obj, 'z', 'message');
     });
 
     test('ifError', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.ifError(obj);
         assert.ifError(obj, 'message');
     });
 
     test('extensible', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.extensible(obj);
         assert.extensible(obj, 'message');
     });
 
     test('isNotExtensible', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.isNotExtensible(obj);
         assert.isNotExtensible(obj, 'message');
     });
 
     test('isSealed', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.isSealed(obj);
         assert.isSealed(obj, 'message');
     });
 
     test('sealed', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.sealed(obj);
         assert.sealed(obj, 'message');
     });
 
     test('isNotSealed', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.isNotSealed(obj);
         assert.isNotSealed(obj, 'message');
     });
 
     test('notSealed', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.notSealed(obj);
         assert.notSealed(obj, 'message');
     });
 
     test('isFrozen', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.isFrozen(obj);
         assert.isFrozen(obj, 'message');
     });
 
     test('frozen', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.frozen(obj);
         assert.frozen(obj, 'message');
     });
 
     test('isNotFrozen', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.isNotFrozen(obj);
         assert.isNotFrozen(obj, 'message');
     });
 
     test('notFrozen', () => {
-        const obj = { z: 3 };
+        const obj = {z: 3};
 
         assert.notFrozen(obj);
         assert.notFrozen(obj, 'message');
     });
+
+    test('hasAnyKeys', () => {
+        assert.hasAnyKeys({foo: 1, bar: 2, baz: 3}, ['foo', 'iDontExist', 'baz']);
+        assert.hasAnyKeys({foo: 1, bar: 2, baz: 3}, {foo: 30, iDontExist: 99, baz: 1337});
+        assert.hasAnyKeys(new Map<any, any>([[{foo: 1}, 'bar'], ['key', 'value']]), [{foo: 1}, 'key']);
+        assert.hasAnyKeys(new Set([{foo: 'bar'}, 'anotherKey']), [{foo: 'bar'}, 'anotherKey']);
+    });
+
+    test('hasAllKeys', () => {
+        assert.hasAllKeys({foo: 1, bar: 2, baz: 3}, ['foo', 'bar', 'baz']);
+        assert.hasAllKeys({foo: 1, bar: 2, baz: 3}, {foo: 30, bar: 99, baz: 1337});
+        assert.hasAllKeys(new Map<any, any>([[{foo: 1}, 'bar'], ['key', 'value']]), [{foo: 1}, 'key']);
+        assert.hasAllKeys(new Set([{foo: 'bar'}, 'anotherKey']), [{foo: 'bar'}, 'anotherKey']);
+    });
+
+    test('containsAllKeys', () => {
+        assert.containsAllKeys({foo: 1, bar: 2, baz: 3}, ['foo', 'baz']);
+        assert.containsAllKeys({foo: 1, bar: 2, baz: 3}, ['foo', 'bar', 'baz']);
+        assert.containsAllKeys({foo: 1, bar: 2, baz: 3}, {foo: 30, baz: 1337});
+        assert.containsAllKeys({foo: 1, bar: 2, baz: 3}, {foo: 30, bar: 99, baz: 1337});
+        assert.containsAllKeys(new Map<any, any>([[{foo: 1}, 'bar'], ['key', 'value']]), [{foo: 1}]);
+        assert.containsAllKeys(new Map<any, any>([[{foo: 1}, 'bar'], ['key', 'value']]), [{foo: 1}, 'key']);
+        assert.containsAllKeys(new Set([{foo: 'bar'}, 'anotherKey']), [{foo: 'bar'}]);
+        assert.containsAllKeys(new Set([{foo: 'bar'}, 'anotherKey']), [{foo: 'bar'}, 'anotherKey']);
+    });
+
+    test('doesNotHaveAnyKeys', () => {
+        assert.doesNotHaveAnyKeys({foo: 1, bar: 2, baz: 3}, ['one', 'two', 'example']);
+        assert.doesNotHaveAnyKeys({foo: 1, bar: 2, baz: 3}, {one: 1, two: 2, example: 'foo'});
+        assert.doesNotHaveAnyKeys(new Map<any, any>([[{foo: 1}, 'bar'], ['key', 'value']]), [{one: 'two'}, 'example']);
+        assert.doesNotHaveAnyKeys(new Set([{foo: 'bar'}, 'anotherKey']), [{one: 'two'}, 'example']);
+    });
+
+    test('doesNotHaveAllKeys', () => {
+        assert.doesNotHaveAllKeys({foo: 1, bar: 2, baz: 3}, ['one', 'two', 'example']);
+        assert.doesNotHaveAllKeys({foo: 1, bar: 2, baz: 3}, {one: 1, two: 2, example: 'foo'});
+        assert.doesNotHaveAllKeys(new Map<any, any>([[{foo: 1}, 'bar'], ['key', 'value']]), [{one: 'two'}, 'example']);
+        assert.doesNotHaveAllKeys(new Set([{foo: 'bar'}, 'anotherKey']), [{one: 'two'}, 'example']);
+    });
+
+    test('hasAnyDeepKeys', () => {
+        assert.hasAnyDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [1, 2]]), {one: 'one'});
+        assert.hasAnyDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [1, 2]]), [{one: 'one'}, {two: 'two'}]);
+        assert.hasAnyDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [{two: 'two'}, 'valueTwo']]), [{one: 'one'}, {two: 'two'}]);
+        assert.hasAnyDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), {one: 'one'});
+        assert.hasAnyDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), [{one: 'one'}, {three: 'three'}]);
+        assert.hasAnyDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), [{one: 'one'}, {two: 'two'}]);
+    });
+
+    test('hasAllDeepKeys', () => {
+        assert.hasAllDeepKeys(new Map([[{one: 'one'}, 'valueOne']]), {one: 'one'});
+        assert.hasAllDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [{two: 'two'}, 'valueTwo']]), [{one: 'one'}, {two: 'two'}]);
+        assert.hasAllDeepKeys(new Set([{one: 'one'}]), {one: 'one'});
+        assert.hasAllDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), [{one: 'one'}, {two: 'two'}]);
+    });
+
+    test('containsAllDeepKeys', () => {
+        assert.containsAllDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [1, 2]]), {one: 'one'});
+        assert.containsAllDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [{two: 'two'}, 'valueTwo']]), [{one: 'one'}, {two: 'two'}]);
+        assert.containsAllDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), {one: 'one'});
+        assert.containsAllDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), [{one: 'one'}, {two: 'two'}]);
+    });
+
+    test('doesNotHaveAnyDeepKeys', () => {
+        assert.doesNotHaveAnyDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [1, 2]]), {thisDoesNot: 'exist'});
+        assert.doesNotHaveAnyDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [{two: 'two'}, 'valueTwo']]), [{twenty: 'twenty'}, {fifty: 'fifty'}]);
+        assert.doesNotHaveAnyDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), {twenty: 'twenty'});
+        assert.doesNotHaveAnyDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), [{twenty: 'twenty'}, {fifty: 'fifty'}]);
+    });
+
+    test('doesNotHaveAllDeepKeys', () => {
+        assert.doesNotHaveAllDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [1, 2]]), {thisDoesNot: 'exist'});
+        assert.doesNotHaveAllDeepKeys(new Map<any, any>([[{one: 'one'}, 'valueOne'], [{two: 'two'}, 'valueTwo']]), [{twenty: 'twenty'}, {one: 'one'}]);
+        assert.doesNotHaveAllDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), {twenty: 'twenty'});
+        assert.doesNotHaveAllDeepKeys(new Set([{one: 'one'}, {two: 'two'}]), [{one: 'one'}, {fifty: 'fifty'}]);
+    });
+
+    test('nestedProperty', () => {
+        assert.nestedProperty({ tea: { green: 'matcha' }}, 'tea.green');
+        assert.nestedProperty({ tea: { green: 'matcha' }}, 'tea.green', 'Should have tea.green nested property');
+    });
+
+    test('notNestedProperty', () => {
+        assert.notNestedProperty({ tea: { green: 'matcha' }}, 'tea.oolong');
+        assert.notNestedProperty({ tea: { green: 'matcha' }}, 'tea.oolong', 'Should not have tea.oolong nested property');
+    });
+
+    test('nestedPropertyVal', () => {
+        assert.nestedPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'matcha');
+        assert.nestedPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'matcha', 'Should have tea.green nested property');
+    });
+
+    test('notNestedPropertyVal', () => {
+        assert.notNestedPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'konacha');
+        assert.notNestedPropertyVal({ tea: { green: 'matcha' }}, 'coffee.green', 'matcha');
+        assert.notNestedPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'konacha', 'Should not have konacha as value');
+        assert.notNestedPropertyVal({ tea: { green: 'matcha' }}, 'coffee.green', 'matcha', 'Should not have matcha as value');
+    });
+
+    test('deepNestedPropertyVal', () => {
+        assert.deepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.green', { matcha: 'yum' });
+        assert.deepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.green', { matcha: 'yum' }, 'Should have correct value of the property');
+    });
+
+    test('notDeepNestedPropertyVal', () => {
+        assert.notDeepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.green', { oolong: 'yum' });
+        assert.notDeepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.green', { matcha: 'yuck' });
+        assert.notDeepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.black', { matcha: 'yum' });
+        assert.notDeepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.green', { oolong: 'yum' }, 'Should have correct value of the property');
+        assert.notDeepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.green', { matcha: 'yuck' }, 'Should have correct value of the property');
+        assert.notDeepNestedPropertyVal({ tea: { green: { matcha: 'yum' } } }, 'tea.black', { matcha: 'yum' }, 'Should have correct value of the property');
+    });
 });
diff --git a/types/chai/index.d.ts b/types/chai/index.d.ts
index bb730fe598..70bc0f2b67 100644
--- a/types/chai/index.d.ts
+++ b/types/chai/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for chai 4.0.0
+// Type definitions for chai 4.1
 // Project: http://chaijs.com/
 // Definitions by: Jed Mao <https://github.com/jedmao>,
 //                 Bart van der Schoor <https://github.com/Bartvds>,
@@ -7,12 +7,13 @@
 //                 Matt Wistrand <https://github.com/mwistrand>,
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Shaun Luttin <https://github.com/shaunluttin>
+//                 Gintautas Miselis <https://github.com/Naktibalda>
+//                 Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // <reference types="assertion-error"/>
 
 declare namespace Chai {
-
     interface ChaiStatic {
         expect: ExpectStatic;
         should(): Should;
@@ -54,8 +55,7 @@ declare namespace Chai {
     }
 
     interface ShouldThrow {
-        (actual: Function): void;
-        (actual: Function, expected: string|RegExp, message?: string): void;
+        (actual: Function, expected?: string|RegExp, message?: string): void;
         (actual: Function, constructor: Error|Function, expected?: string|RegExp, message?: string): void;
     }
 
@@ -218,9 +218,7 @@ declare namespace Chai {
     }
 
     interface Include {
-        (value: Object, message?: string): Assertion;
-        (value: string, message?: string): Assertion;
-        (value: number, message?: string): Assertion;
+        (value: Object | string | number, message?: string): Assertion;
         keys: Keys;
         deep: Deep;
         ordered: Ordered;
@@ -235,18 +233,12 @@ declare namespace Chai {
 
     interface Keys {
         (...keys: string[]): Assertion;
-        (keys: any[]): Assertion;
-        (keys: Object): Assertion;
+        (keys: any[]|Object): Assertion;
     }
 
     interface Throw {
-        (): Assertion;
-        (expected: string, message?: string): Assertion;
-        (expected: RegExp, message?: string): Assertion;
-        (constructor: Error, expected?: string, message?: string): Assertion;
-        (constructor: Error, expected?: RegExp, message?: string): Assertion;
-        (constructor: Function, expected?: string, message?: string): Assertion;
-        (constructor: Function, expected?: RegExp, message?: string): Assertion;
+        (expected?: string|RegExp, message?: string): Assertion;
+        (constructor: Error|Function, expected?: string|RegExp, message?: string): Assertion;
     }
 
     interface RespondTo {
@@ -697,21 +689,134 @@ declare namespace Chai {
         /**
          * Asserts that haystack does not include needle.
          *
+         * @param haystack   Container string or array.
+         * @param needle   Potential expected substring of haystack.
+         * @param message   Message to display on error.
+         */
+        notInclude(haystack: string | any[], needle: any, message?: string): void;
+
+        /**
+         * Asserts that haystack includes needle. Can be used to assert the inclusion of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
          * @param haystack   Container string.
          * @param needle   Potential expected substring of haystack.
          * @param message   Message to display on error.
          */
-        notInclude(haystack: string, needle: any, message?: string): void;
+        deepInclude(haystack: string, needle: string, message?: string): void;
 
         /**
-         * Asserts that haystack does not include needle.
+         * Asserts that haystack includes needle. Can be used to assert the inclusion of a value in an array or a subset of properties in an object. Deep equality is used.
          *
-         * @type T   Type of values in haystack.
-         * @param haystack   Container array.
-         * @param needle   Potential value contained in haystack.
+         * @param haystack
+         * @param needle
          * @param message   Message to display on error.
          */
-        notInclude(haystack: any[], needle: any, message?: string): void;
+        deepInclude<T>(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that haystack does not include needle. Can be used to assert the absence of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack   Container string or array.
+         * @param needle   Potential expected substring of haystack.
+         * @param message   Message to display on error.
+         */
+        notDeepInclude(haystack: string | any[], needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        nestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ does not include ‘needle’. Can be used to assert the absence of a subset of properties in an object.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while checking for deep equality
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ does not include ‘needle’. Can be used to assert the absence of a subset of properties in an object while checking for deep equality.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while ignoring inherited properties.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        ownInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the absence of a subset of properties in an object while ignoring inherited properties.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notOwnInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while ignoring inherited properties and checking for deep
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepOwnInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the absence of a subset of properties in an object while ignoring inherited properties and checking for deep equality.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepOwnInclude(haystack: any, needle: any, message?: string): void;
 
         /**
          * Asserts that value matches the regular expression regexp.
@@ -881,19 +986,10 @@ declare namespace Chai {
          * Asserts that function will throw an error with message matching regexp.
          *
          * @param fn   Function that may throw.
-         * @param regExp   Potential expected message match.
+         * @param errType  Potential expected message match or error constructor.
          * @param message   Message to display on error.
          */
-        throws(fn: Function, regExp: RegExp, message?: string): void;
-
-        /**
-         * Asserts that function will throw an error that is an instance of constructor.
-         *
-         * @param fn   Function that may throw.
-         * @param constructor   Potential expected error constructor.
-         * @param message   Message to display on error.
-         */
-        throws(fn: Function, errType: Function, message?: string): void;
+        throws(fn: Function, errType: RegExp|Function, message?: string): void;
 
         /**
          * Asserts that function will throw an error that is an instance of constructor
@@ -1156,7 +1252,7 @@ declare namespace Chai {
          * @param property   Property of object expected to be modified.
          * @param message   Message to display on error.
          */
-        changes<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void
+        changes<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void;
 
         /**
          * Asserts that a function does not change the value of a property.
@@ -1167,7 +1263,7 @@ declare namespace Chai {
          * @param property   Property of object expected not to be modified.
          * @param message   Message to display on error.
          */
-        doesNotChange<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void
+        doesNotChange<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void;
 
         /**
          * Asserts that a function increases an object property.
@@ -1178,7 +1274,7 @@ declare namespace Chai {
          * @param property   Property of object expected to be increased.
          * @param message   Message to display on error.
          */
-        increases<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void
+        increases<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void;
 
         /**
          * Asserts that a function does not increase an object property.
@@ -1189,7 +1285,7 @@ declare namespace Chai {
          * @param property   Property of object expected not to be increased.
          * @param message   Message to display on error.
          */
-        doesNotIncrease<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void
+        doesNotIncrease<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void;
 
         /**
          * Asserts that a function decreases an object property.
@@ -1200,7 +1296,7 @@ declare namespace Chai {
          * @param property   Property of object expected to be decreased.
          * @param message   Message to display on error.
          */
-        decreases<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void
+        decreases<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void;
 
         /**
          * Asserts that a function does not decrease an object property.
@@ -1211,7 +1307,7 @@ declare namespace Chai {
          * @param property   Property of object expected not to be decreased.
          * @param message   Message to display on error.
          */
-        doesNotDecrease<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void
+        doesNotDecrease<T>(modifier: Function, object: T, property: string /* keyof T */, message?: string): void;
 
         /**
          * Asserts if value is not a false value, and throws if it is a true value.
@@ -1360,6 +1456,207 @@ declare namespace Chai {
          * @param message    Message to display on error.
          */
         isNotEmpty<T>(object: T, message?: string): void;
+
+        /**
+         * Asserts that `object` has at least one of the `keys` provided.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        hasAnyKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` has all and only all of the `keys` provided.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        hasAllKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` has all of the `keys` provided but may have more keys not listed.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        containsAllKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` has none of the `keys` provided.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        doesNotHaveAnyKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` does not have at least one of the `keys` provided.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        doesNotHaveAllKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` has at least one of the `keys` provided.
+         * Since Sets and Maps can have objects as keys you can use this assertion to perform
+         * a deep comparison.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        hasAnyDeepKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` has all and only all of the `keys` provided.
+         * Since Sets and Maps can have objects as keys you can use this assertion to perform
+         * a deep comparison.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        hasAllDeepKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` contains all of the `keys` provided.
+         * Since Sets and Maps can have objects as keys you can use this assertion to perform
+         * a deep comparison.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        containsAllDeepKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` contains all of the `keys` provided.
+         * Since Sets and Maps can have objects as keys you can use this assertion to perform
+         * a deep comparison.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        doesNotHaveAnyDeepKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that `object` contains all of the `keys` provided.
+         * Since Sets and Maps can have objects as keys you can use this assertion to perform
+         * a deep comparison.
+         * You can also provide a single object instead of a `keys` array and its keys
+         * will be used as the expected set of keys.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param keys   Keys to check
+         * @param message    Message to display on error.
+         */
+        doesNotHaveAllDeepKeys<T>(object: T, keys: Array<Object | string> | { [key: string]: any }, message?: string): void;
+
+        /**
+         * Asserts that object has a direct or inherited property named by property,
+         * which can be a string using dot- and bracket-notation for nested reference.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param property    Property to test.
+         * @param message    Message to display on error.
+         */
+        nestedProperty<T>(object: T, property: string, message?: string): void;
+
+        /**
+         * Asserts that object does not have a property named by property,
+         * which can be a string using dot- and bracket-notation for nested reference.
+         * The property cannot exist on the object nor anywhere in its prototype chain.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param property    Property to test.
+         * @param message    Message to display on error.
+         */
+        notNestedProperty<T>(object: T, property: string, message?: string): void;
+
+        /**
+         * Asserts that object has a property named by property with value given by value.
+         * property can use dot- and bracket-notation for nested reference. Uses a strict equality check (===).
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param property    Property to test.
+         * @param value    Value to test.
+         * @param message    Message to display on error.
+         */
+        nestedPropertyVal<T>(object: T, property: string, value: any, message?: string): void;
+
+        /**
+         * Asserts that object does not have a property named by property with value given by value.
+         * property can use dot- and bracket-notation for nested reference. Uses a strict equality check (===).
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param property    Property to test.
+         * @param value    Value to test.
+         * @param message    Message to display on error.
+         */
+        notNestedPropertyVal<T>(object: T, property: string, value: any, message?: string): void;
+
+        /**
+         * Asserts that object has a property named by property with a value given by value.
+         * property can use dot- and bracket-notation for nested reference. Uses a deep equality check.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param property    Property to test.
+         * @param value    Value to test.
+         * @param message    Message to display on error.
+         */
+        deepNestedPropertyVal<T>(object: T, property: string, value: any, message?: string): void;
+
+        /**
+         * Asserts that object does not have a property named by property with value given by value.
+         * property can use dot- and bracket-notation for nested reference. Uses a deep equality check.
+         *
+         * @type T   Type of object.
+         * @param object   Object to test.
+         * @param property    Property to test.
+         * @param value    Value to test.
+         * @param message    Message to display on error.
+         */
+        notDeepNestedPropertyVal<T>(object: T, property: string, value: any, message?: string): void;
     }
 
     export interface Config {
diff --git a/types/chai/tslint.json b/types/chai/tslint.json
new file mode 100644
index 0000000000..f99183c97d
--- /dev/null
+++ b/types/chai/tslint.json
@@ -0,0 +1,14 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false,
+        "callable-types": false,
+        "new-parens": false,
+        "no-declare-current-package": false,
+        "no-empty-interface": false,
+        "no-redundant-jsdoc-2": false,
+        "no-single-declare-module": false,
+        "no-unnecessary-generics": false,
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/chai/v2/tslint.json b/types/chai/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chai/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chalk/chalk-tests.ts b/types/chalk/chalk-tests.ts
deleted file mode 100644
index 20bdd9382c..0000000000
--- a/types/chalk/chalk-tests.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import chalk = require('chalk');
-
-var str = '';
-var bool = false;
-var chain: chalk.ChalkChain;
-
-chalk.enabled = bool;
-str = chalk.stripColor(str);
-
-bool = chalk.supportsColor;
-bool = chalk.hasColor(str);
-
-// style a string
-console.log(  chalk.blue('Hello world!')  );
-
-// combine styled and normal strings
-console.log(  chalk.blue('Hello'), 'World' + chalk.red('!')  );
-
-// compose multiple styles using the chainable API
-console.log(  chalk.blue.bgRed.bold('Hello world!')  );
-
-// pass in multiple arguments
-console.log(  chalk.blue('Hello', 'World!', 'Foo', 'bar', 'biz', 'baz')  );
-
-// nest styles
-console.log(  chalk.red('Hello', chalk.underline.bgBlue('world') + '!')  );
-
-// nest styles of the same type even (color, underline, background)
-console.log(  chalk.green('I am a green line ' + chalk.blue('with a blue substring') + ' that becomes green again!')  );
-
-chain = chalk.green;
-chain = chain.underline;
-str = chain('someString');
-
-chalk.enabled = chalk.supportsColor = bool;
-
-var chalkObj = new chalk.constructor({enabled: false});
-
-chain = chalkObj.green;
-chain = chalkObj.underline;
-chalkObj.enabled = true;
-str = chain('foo');
diff --git a/types/chalk/index.d.ts b/types/chalk/index.d.ts
deleted file mode 100644
index 3651e8077d..0000000000
--- a/types/chalk/index.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// Type definitions for chalk v0.4.0
-// Project: https://github.com/sindresorhus/chalk
-// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = Chalk;
-
-declare namespace Chalk {
-    export var enabled: boolean;
-    export var supportsColor: boolean;
-    export var styles: ChalkStyleMap;
-
-    export function stripColor(value: string): any;
-    export function hasColor(str: string): boolean;
-
-    export interface ChalkChain extends ChalkStyle {
-        (): boolean;
-        (...text: string[]): string;
-    }
-
-    export interface ChalkStyleElement {
-        open: string;
-        close: string;
-    }
-
-    // General
-    export var reset: ChalkChain;
-    export var bold: ChalkChain;
-    export var dim: ChalkChain;
-    export var italic: ChalkChain;
-    export var underline: ChalkChain;
-    export var inverse: ChalkChain;
-    export var hidden: ChalkChain;
-    export var strikethrough: ChalkChain;
-
-    // Text colors
-    export var black: ChalkChain;
-    export var red: ChalkChain;
-    export var green: ChalkChain;
-    export var yellow: ChalkChain;
-    export var blue: ChalkChain;
-    export var magenta: ChalkChain;
-    export var cyan: ChalkChain;
-    export var white: ChalkChain;
-    export var gray: ChalkChain;
-    export var grey: ChalkChain;
-
-    // Background colors
-    export var bgBlack: ChalkChain;
-    export var bgRed: ChalkChain;
-    export var bgGreen: ChalkChain;
-    export var bgYellow: ChalkChain;
-    export var bgBlue: ChalkChain;
-    export var bgMagenta: ChalkChain;
-    export var bgCyan: ChalkChain;
-    export var bgWhite: ChalkChain;
-
-
-    export interface ChalkStyle {
-        // General
-        reset: ChalkChain;
-        bold: ChalkChain;
-        dim: ChalkChain;
-        italic: ChalkChain;
-        underline: ChalkChain;
-        inverse: ChalkChain;
-        hidden: ChalkChain;
-        strikethrough: ChalkChain;
-
-        // Text colors
-        black: ChalkChain;
-        red: ChalkChain;
-        green: ChalkChain;
-        yellow: ChalkChain;
-        blue: ChalkChain;
-        magenta: ChalkChain;
-        cyan: ChalkChain;
-        white: ChalkChain;
-        gray: ChalkChain;
-        grey: ChalkChain;
-
-        // Background colors
-        bgBlack: ChalkChain;
-        bgRed: ChalkChain;
-        bgGreen: ChalkChain;
-        bgYellow: ChalkChain;
-        bgBlue: ChalkChain;
-        bgMagenta: ChalkChain;
-        bgCyan: ChalkChain;
-        bgWhite: ChalkChain;
-    }
-
-    export interface ChalkStyleMap {
-        // General
-        reset: ChalkStyleElement;
-        bold: ChalkStyleElement;
-        dim: ChalkStyleElement;
-        italic: ChalkStyleElement;
-        underline: ChalkStyleElement;
-        inverse: ChalkStyleElement;
-        hidden: ChalkStyleElement;
-        strikethrough: ChalkStyleElement;
-
-        // Text colors
-        black: ChalkStyleElement;
-        red: ChalkStyleElement;
-        green: ChalkStyleElement;
-        yellow: ChalkStyleElement;
-        blue: ChalkStyleElement;
-        magenta: ChalkStyleElement;
-        cyan: ChalkStyleElement;
-        white: ChalkStyleElement;
-        gray: ChalkStyleElement;
-
-        // Background colors
-        bgBlack: ChalkStyleElement;
-        bgRed: ChalkStyleElement;
-        bgGreen: ChalkStyleElement;
-        bgYellow: ChalkStyleElement;
-        bgBlue: ChalkStyleElement;
-        bgMagenta: ChalkStyleElement;
-        bgCyan: ChalkStyleElement;
-        bgWhite: ChalkStyleElement;
-    }
-
-    export const constructor: {
-        new (options: {enabled: boolean}): Chalk;
-    }
-
-    export interface Chalk extends ChalkStyle {
-        enabled: boolean;
-    }
-}
diff --git a/types/chalk/tsconfig.json b/types/chalk/tsconfig.json
deleted file mode 100644
index 13ab93883b..0000000000
--- a/types/chalk/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "chalk-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/chance/chance-tests.ts b/types/chance/chance-tests.ts
index dfb942f5c5..8e89d8227e 100644
--- a/types/chance/chance-tests.ts
+++ b/types/chance/chance-tests.ts
@@ -1,22 +1,24 @@
-
-
 // Instantiation
-var globalInstance: Chance.Chance = chance;
-var createYourOwn = new Chance(Math.random);
+let globalInstance: Chance.Chance = chance;
+let createYourOwn = new Chance(Math.random);
 
 // Basic usage
-var randBool: boolean = chance.bool();
+let randBool: boolean = chance.bool();
 
-var birthday: Date = chance.birthday();
-var birthdayStr: Date|string = chance.birthday({ string: true });
+let birthday: Date = chance.birthday();
+let birthdayStr: Date | string = chance.birthday({ string: true });
 
-var strArr: string[] = chance.n(chance.string, 42);
+let guid = chance.guid();
+guid = chance.guid({ version: 4 });
+guid = chance.guid({ version: 5 });
 
-var uniqInts: number[] = chance.unique(chance.integer, 99);
+let strArr: string[] = chance.n(chance.string, 42);
 
-var currencyPair = chance.currency_pair();
-var firstCurrency = currencyPair[0];
-var secondCurrency = currencyPair[1];
+let uniqInts: number[] = chance.unique(chance.integer, 99);
+
+let currencyPair = chance.currency_pair();
+let firstCurrency = currencyPair[0];
+let secondCurrency = currencyPair[1];
 
 // Mixins can be used with on-the-fly type declaration
 declare namespace Chance {
@@ -26,15 +28,15 @@ declare namespace Chance {
 }
 
 chance.mixin({
-    time: function () {
-        var h = chance.hour({ twentyfour: true }),
-            m = chance.minute();
+    time() {
+        const h = chance.hour({ twentyfour: true });
+        const m = chance.minute();
         return `${h}:${m}`;
-    }
+    },
 });
 
-var timeString: string = chance.time();
+let timeString: string = chance.time();
 
-var chanceConstructedWithSeed100 = new Chance(100);
-var chanceCalledWithSeed100 = Chance()
-var chanceConstructedWithStringSeed = new Chance("test")
+let chanceConstructedWithSeed100 = new Chance(100);
+let chanceCalledWithSeed100 = Chance();
+let chanceConstructedWithStringSeed = new Chance("test");
diff --git a/types/chance/index.d.ts b/types/chance/index.d.ts
index 3b477c4bce..212e90dfe2 100644
--- a/types/chance/index.d.ts
+++ b/types/chance/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for Chance 0.7.3
+// Type definitions for Chance 0.7.4
 // Project: http://chancejs.com
 // Definitions by: Chris Bowdon <https://github.com/cbowdon>
+//                 Brice BERNARD <https://github.com/brikou>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Chance {
@@ -13,17 +14,16 @@ declare namespace Chance {
     type SeededChance = Chance & Seeded;
 
     interface ChanceStatic {
-        (): Chance
-        (seed: Seed): SeededChance
-        (generator: () => any): Chance
+        (): Chance;
+        (seed: Seed): SeededChance;
+        (generator: () => any): Chance;
 
-        new(): Chance;
-        new(seed: Seed): SeededChance;
-        new(generator: () => any): Chance;
+        new (): Chance;
+        new (seed: Seed): SeededChance;
+        new (generator: () => any): Chance;
     }
 
     interface Chance {
-
         // Basics
         bool(opts?: Options): boolean;
         character(opts?: Options): string;
@@ -42,7 +42,7 @@ declare namespace Chance {
         age(opts?: Options): number;
         gender(): string;
         birthday(): Date;
-        birthday(opts?: Options): Date|string;
+        birthday(opts?: Options): Date | string;
         cpf(): string;
         first(opts?: Options): string;
         last(opts?: Options): string;
@@ -95,7 +95,7 @@ declare namespace Chance {
         // Time
         ampm(): string;
         date(): Date;
-        date(opts: DateOptions): Date|string;
+        date(opts: DateOptions): Date | string;
         hammertime(): number;
         hour(opts?: Options): number;
         millisecond(): number;
@@ -109,12 +109,12 @@ declare namespace Chance {
         // Finance
         cc(opts?: Options): string;
         cc_type(): string;
-        cc_type(opts: Options): string|CreditCardType;
+        cc_type(opts: Options): string | CreditCardType;
         currency(): Currency;
-        currency_pair(): [ Currency, Currency ];
+        currency_pair(): [Currency, Currency];
         dollar(opts?: Options): string;
         exp(): string;
-        exp(opts: Options): string|CreditCardExpiration;
+        exp(opts: Options): string | CreditCardExpiration;
         exp_month(opts?: Options): string;
         exp_year(opts?: Options): string;
 
@@ -124,11 +124,11 @@ declare namespace Chance {
         pad(num: number, width: number, padChar?: string): string;
         /**
          * @deprecated Use pickone
-        */
+         */
         pick<T>(arr: T[]): T;
         pickone<T>(arr: T[]): T;
         /**
-         * @deprecated Use pickset 
+         * @deprecated Use pickset
          */
         pick<T>(arr: T[], count: number): T[];
         pickset<T>(arr: T[], count?: number): T[];
@@ -144,13 +144,13 @@ declare namespace Chance {
         d20(): number;
         d30(): number;
         d100(): number;
-        guid(): string;
+        guid(options?: { version: 4 | 5 }): string;
         hash(opts?: Options): string;
         n<T>(generator: () => T, count: number, opts?: Options): T[];
         normal(opts?: Options): number;
         radio(opts?: Options): string;
         rpg(dice: string): number[];
-        rpg(dice: string, opts?: Options): number[]|number;
+        rpg(dice: string, opts?: Options): number[] | number;
         tv(opts?: Options): string;
         unique<T>(generator: () => T, count: number, opts?: Options): T[];
         weighted<T>(values: T[], weights: number[]): T;
@@ -168,7 +168,9 @@ declare namespace Chance {
 
     // A more rigorous approach might be to produce
     // the correct options interfaces for each method
-    interface Options { [id: string]: any; }
+    interface Options {
+        [id: string]: any;
+    }
 
     interface DateOptions {
         string?: boolean;
@@ -201,19 +203,21 @@ declare namespace Chance {
         year: string;
     }
 
-    interface MixinDescriptor { [id: string]: () => any; }
+    interface MixinDescriptor {
+        [id: string]: () => any;
+    }
 
     interface Setter {
-        (key: 'firstNames', values: string[]): any;
-        (key: 'lastNames', values: string[]): any;
-        (key: 'provinces', values: string[]): any;
-        (key: 'us_states_and_dc', values: string[]): any;
-        (key: 'territories', values: string[]): any;
-        (key: 'armed_forces', values: string[]): any;
-        (key: 'street_suffixes', values: string[]): any;
-        (key: 'months', values: string[]): any;
-        (key: 'cc_types', values: string[]): any;
-        (key: 'currency_types', values: string[]): any;
+        (key: "firstNames", values: string[]): any;
+        (key: "lastNames", values: string[]): any;
+        (key: "provinces", values: string[]): any;
+        (key: "us_states_and_dc", values: string[]): any;
+        (key: "territories", values: string[]): any;
+        (key: "armed_forces", values: string[]): any;
+        (key: "street_suffixes", values: string[]): any;
+        (key: "months", values: string[]): any;
+        (key: "cc_types", values: string[]): any;
+        (key: "currency_types", values: string[]): any;
         <T>(key: string, values: T[]): any;
     }
 
@@ -228,7 +232,7 @@ declare var chance: Chance.Chance;
 declare var Chance: Chance.ChanceStatic;
 
 // import Chance = require('chance');
-declare module 'chance' {
+declare module "chance" {
     interface ExportedChance extends Chance.ChanceStatic {
         Chance: ExportedChance;
     }
diff --git a/types/chance/tslint.json b/types/chance/tslint.json
new file mode 100644
index 0000000000..2ef6444ebb
--- /dev/null
+++ b/types/chance/tslint.json
@@ -0,0 +1,12 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "dt-header": false,
+        "no-declare-current-package": false,
+        "no-single-declare-module": false,
+        "no-unnecessary-generics": false,
+        "no-var-keyword": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/change-emitter/tslint.json b/types/change-emitter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/change-emitter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/charset/charset-tests.ts b/types/charset/charset-tests.ts
new file mode 100644
index 0000000000..d9ecd5b24b
--- /dev/null
+++ b/types/charset/charset-tests.ts
@@ -0,0 +1,11 @@
+import charset = require('charset');
+import http = require('http');
+
+http.get('http://nodejs.org', (res) => {
+  res.on('data', (chunk: Buffer) => {
+    console.log(charset(res.headers, chunk));
+    console.log(charset(res, chunk));
+    console.log(charset('content-type header, for example charset=utf8', chunk));
+    res.destroy();
+  });
+});
diff --git a/types/charset/index.d.ts b/types/charset/index.d.ts
new file mode 100644
index 0000000000..da8d086868
--- /dev/null
+++ b/types/charset/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for charset 1.0
+// Project: https://github.com/node-modules/charset
+// Definitions by: Andrew Bradley <https://github.com/cspotcode>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+import { ClientResponse, IncomingHttpHeaders } from 'http';
+
+/**
+ * guess data charset from req.headers, xml, html content-type meta tag
+ *
+ * headers:
+ *
+ *    'content-type': 'text/html;charset=gbk'
+ *
+ * meta tag:
+ *
+ *    <meta http-equiv="Content-Type" content="text/html; charset=xxxx"/>
+ *
+ * xml file:
+ *
+ *    <?xml version="1.0" encoding="UTF-8"?>
+ *
+ * @param obj `Content-Type` String, or `res.headers`, or `res` Object
+ * @param data content buffer
+ * @param peekSize max content peek size, default is 512
+ * @return charset, lower case, e.g.: utf8, gbk, gb2312, .... If can\'t guess, return null
+ */
+// tslint:disable-next-line strict-export-declare-modifiers
+declare function charset(obj: string | IncomingHttpHeaders | ClientResponse, data?: Buffer, peekSize?: number): string | null;
+
+// tslint:disable-next-line strict-export-declare-modifiers
+export = charset;
diff --git a/types/charset/tsconfig.json b/types/charset/tsconfig.json
new file mode 100644
index 0000000000..52652c8e44
--- /dev/null
+++ b/types/charset/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "charset-tests.ts"
+    ]
+}
diff --git a/types/charset/tslint.json b/types/charset/tslint.json
new file mode 100644
index 0000000000..ca595ee830
--- /dev/null
+++ b/types/charset/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-redundant-jsdoc-2": false
+    }
+}
diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index a4cccb0bae..d1e86fd317 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -36,9 +36,16 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
                 ticks: {
                     callback: Math.floor
                 },
-                gridLines: { display: false }
+                gridLines: {
+                    display: false,
+                    borderDash: [5, 15],
+                    borderDashOffset: 2,
+                    zeroLineBorderDash: [5, 15],
+                    zeroLineBorderDashOffset: 2
+                }
             }]
-        }
+        },
+        plugins: { arbitraryPlugin: {option: "value"} }
     }
 });
 chart.update();
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 78f1aa6142..614fbe26ef 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Chart.js 2.6
+// Type definitions for Chart.js 2.7
 // Project: https://github.com/nnnick/Chart.js
 // Definitions by: Alberto Nuti <https://github.com/anuti>
 //                 Fabien Lavocat <https://github.com/FabienLavocat>
@@ -6,6 +6,7 @@
 //                 Larry Bahr <https://github.com/larrybahr>
 //                 Daniel Luz <https://github.com/mernen>
 //                 Joseph Page <https://github.com/josefpaij>
+//                 Dan Manastireanu <https://github.com/danmana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -77,7 +78,7 @@ interface Size {
 }
 
 declare namespace Chart {
-    type ChartType = 'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble';
+    type ChartType = 'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble' | 'pie';
 
     type TimeUnit = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year';
 
@@ -113,18 +114,25 @@ declare namespace Chart {
         index?: number;
     }
 
+    interface ChartTooltipLabelColor {
+        borderColor: ChartColor;
+        backgroundColor: ChartColor;
+    }
+
     interface ChartTooltipCallback {
-        beforeTitle?(item?: ChartTooltipItem[], data?: any): void;
-        title?(item?: ChartTooltipItem[], data?: any): void;
-        afterTitle?(item?: ChartTooltipItem[], data?: any): void;
-        beforeBody?(item?: ChartTooltipItem[], data?: any): void;
-        beforeLabel?(tooltipItem?: ChartTooltipItem, data?: any): void;
-        label?(tooltipItem?: ChartTooltipItem, data?: any): void;
-        afterLabel?(tooltipItem?: ChartTooltipItem, data?: any): void;
-        afterBody?(item?: ChartTooltipItem[], data?: any): void;
-        beforeFooter?(item?: ChartTooltipItem[], data?: any): void;
-        footer?(item?: ChartTooltipItem[], data?: any): void;
-        afterFooter?(item?: ChartTooltipItem[], data?: any): void;
+        beforeTitle?(item: ChartTooltipItem[], data: ChartData): string | string[];
+        title?(item: ChartTooltipItem[], data: ChartData): string | string[];
+        afterTitle?(item: ChartTooltipItem[], data: ChartData): string | string[];
+        beforeBody?(item: ChartTooltipItem[], data: ChartData): string | string[];
+        beforeLabel?(tooltipItem: ChartTooltipItem, data: ChartData): string | string[];
+        label?(tooltipItem: ChartTooltipItem, data: ChartData): string | string[];
+        labelColor?(tooltipItem: ChartTooltipItem, chart: Chart): ChartTooltipLabelColor;
+        labelTextColor?(tooltipItem: ChartTooltipItem, chart: Chart): string;
+        afterLabel?(tooltipItem: ChartTooltipItem, data: ChartData): string | string[];
+        afterBody?(item: ChartTooltipItem[], data: ChartData): string | string[];
+        beforeFooter?(item: ChartTooltipItem[], data: ChartData): string | string[];
+        footer?(item: ChartTooltipItem[], data: ChartData): string | string[];
+        afterFooter?(item: ChartTooltipItem[], data: ChartData): string | string[];
     }
 
     interface ChartAnimationParameter {
@@ -151,21 +159,25 @@ declare namespace Chart {
     interface ChartOptions {
         responsive?: boolean;
         responsiveAnimationDuration?: number;
+        aspectRatio?: number;
         maintainAspectRatio?: boolean;
         events?: string[];
-        onClick?(any?: any): any;
+        onClick?(event?: MouseEvent, activeElements?: Array<{}>): any;
         title?: ChartTitleOptions;
         legend?: ChartLegendOptions;
         tooltips?: ChartTooltipOptions;
         hover?: ChartHoverOptions;
         animation?: ChartAnimationOptions;
         elements?: ChartElementsOptions;
+        layout?: ChartLayoutOptions;
         scales?: ChartScales;
         showLines?: boolean;
         spanGaps?: boolean;
         cutoutPercentage?: number;
         circumference?: number;
         rotation?: number;
+        // Plugins can require any options
+        plugins?: any;
     }
 
     interface ChartFontOptions {
@@ -312,9 +324,23 @@ declare namespace Chart {
         borderColor?: ChartColor;
         borderSkipped?: string;
     }
+
+    interface ChartLayoutOptions {
+      padding?: ChartLayoutPaddingObject | number;
+    }
+
+    interface ChartLayoutPaddingObject {
+      top?: number;
+      right?: number;
+      bottom?: number;
+      left?: number;
+    }
+
     interface GridLineOptions {
         display?: boolean;
         color?: ChartColor;
+        borderDash?: number[];
+        borderDashOffset?: number;
         lineWidth?: number;
         drawBorder?: boolean;
         drawOnChartArea?: boolean;
@@ -322,6 +348,8 @@ declare namespace Chart {
         tickMarkLength?: number;
         zeroLineWidth?: number;
         zeroLineColor?: ChartColor;
+        zeroLineBorderDash?: number[];
+        zeroLineBorderDashOffset?: number;
         offsetGridLines?: boolean;
     }
 
@@ -336,7 +364,7 @@ declare namespace Chart {
 
     interface TickOptions {
         autoSkip?: boolean;
-        autoSkipPadding?: boolean;
+        autoSkipPadding?: number;
         callback?(value: any, index: any, values: any): string|number;
         display?: boolean;
         fontColor?: ChartColor;
@@ -393,8 +421,8 @@ declare namespace Chart {
     interface ChartDataSets {
         cubicInterpolationMode?: 'default' | 'monotone';
         backgroundColor?: ChartColor | ChartColor[];
-        borderWidth?: number;
-        borderColor?: ChartColor;
+        borderWidth?: number | number[];
+        borderColor?: ChartColor | ChartColor[];
         borderCapStyle?: string;
         borderDash?: number[];
         borderDashOffset?: number;
diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index 6bdb7ebfe3..93918a5eeb 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Chartist v0.9.8
+// Type definitions for Chartist v0.9.81
 // Project: https://github.com/gionkunz/chartist-js
 // Definitions by: Matt Gibbs <https://github.com/mtgibbs>, Simon Pfeifer <https://github.com/psimonski>, Cassey Lottman <https://github.com/clottman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -78,7 +78,7 @@ declare namespace Chartist {
   // TODO: come in and tidy this up and make it fit better
   interface IChartistData {
     labels?: Array<string> | Array<number> | Array<Date>;
-    series: Array<IChartistSeriesData> | Array<number> |  Array<Array<number>>;
+    series: Array<IChartistSeriesData> | Array<Array<IChartistData>> | Array<number> |  Array<Array<number>>;
   }
 
   interface IChartistSeriesData {
diff --git a/types/chartist/tslint.json b/types/chartist/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chartist/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chartjs/chartjs-tests.ts b/types/chartjs/chartjs-tests.ts
deleted file mode 100644
index ef50da1b40..0000000000
--- a/types/chartjs/chartjs-tests.ts
+++ /dev/null
@@ -1,393 +0,0 @@
-
-
-var canvas = <HTMLCanvasElement>document.getElementById('example-chart');
-var ctx = canvas.getContext('2d');
-
-Chart.defaults.global = {
-    animation: true,
-    animationSteps: 60,
-    animationEasing: "easeOutQuart",
-    showScale: true,
-    scaleOverride: false,
-    scaleSteps: null,
-    scaleStepWidth: null,
-    scaleStartValue: null,
-    scaleLineColor: "rgba(0,0,0,.1)",
-    scaleLineWidth: 1,
-    scaleShowLabels: true,
-    scaleLabel: "<%=value%>",
-    scaleIntegersOnly: true,
-    scaleBeginAtZero: false,
-    scaleFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
-    scaleFontSize: 12,
-    scaleFontStyle: "normal",
-    scaleFontColor: "#666",
-    responsive: false,
-    maintainAspectRatio: true,
-    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 %>",
-    multiTooltipTemplate: "<%= value %>",
-    onAnimationProgress: function () { },
-    onAnimationComplete: function () { }
-}
-
-var lineData: LinearChartData = {
-    labels: ['03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00'],
-    datasets: [
-        {
-            label: 'Accepted',
-            type: 'bar',
-            fillColor: 'rgba(220,220,220,0.2)',
-            strokeColor: 'rgba(220,220,220,1)',
-            pointColor: 'rgba(220,220,220,1)',
-            pointStrokeColor: '#fff',
-            pointHighlightFill: '#fff',
-            pointHighlightStroke: 'rgba(220,220,220,1)',
-            borderColor: "#9b0391",
-            data: [65, 59, 80, 81, 56, 55, 40]
-        },
-        {
-            label: 'Quarantined',
-            fillColor: 'rgba(151,187,205,0.2)',
-            strokeColor: 'rgba(151,187,205,1)',
-            pointColor: 'rgba(151,187,205,1)',
-            pointStrokeColor: '#fff',
-            pointHighlightFill: '#fff',
-            pointHighlightStroke: 'rgba(151,187,205,1)',
-            data: [28, 48, 40, 19, 86, 27, 90],
-            yAxisID: 'quarantined'
-        }
-    ]
-};
-
-var myLineChart = new Chart(ctx).Line(lineData, {
-    scaleShowGridLines: true,
-    scaleGridLineColor: "rgba(0,0,0,.05)",
-    scaleGridLineWidth: 1,
-    bezierCurve: true,
-    bezierCurveTension: 0.4,
-    pointDot: true,
-    pointDotRadius: 4,
-    pointDotStrokeWidth: 1,
-    pointHitDetectionRadius: 20,
-    datasetStroke: true,
-    datasetStrokeWidth: 2,
-    datasetFill: true,
-    scales: {
-      xAxes: [{
-        stacked: true,
-      }],
-      yAxes: [{
-        position: "left",
-        "id": "users"
-      }, {
-        position: "right",
-        "id": "ratio",
-        ticks: {
-          min: -13
-        }
-      }]
-    },
-    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
-});
-
-var myLineChartLegend: string = myLineChart.generateLegend();
-var myLineChartImage: string = myLineChart.toBase64Image();
-myLineChart.addData([1, 2, 3, 4, 5, 6, 7], 'new');
-myLineChart.clear();
-myLineChart.removeData();
-myLineChart.resize();
-myLineChart.update();
-myLineChart.stop();
-myLineChart.destroy();
-
-var barData: LinearChartData = {
-    labels: ["January", "February", "March", "April", "May", "June", "July"],
-    datasets: [
-        {
-            label: "My First dataset",
-            fillColor: "rgba(220,220,220,0.5)",
-            strokeColor: "rgba(220,220,220,0.8)",
-            highlightFill: "rgba(220,220,220,0.75)",
-            highlightStroke: "rgba(220,220,220,1)",
-            data: [65, 59, 80, 81, 56, 55, 40]
-        },
-        {
-            label: "My Second dataset",
-            fillColor: "rgba(151,187,205,0.5)",
-            strokeColor: "rgba(151,187,205,0.8)",
-            highlightFill: "rgba(151,187,205,0.75)",
-            highlightStroke: "rgba(151,187,205,1)",
-            data: [28, 48, 40, 19, 86, 27, 90]
-        }
-    ]
-};
-
-var myBarChart = new Chart(ctx).Bar(barData, {
-    scaleBeginAtZero: true,
-    scaleShowGridLines: true,
-    scaleGridLineColor: "rgba(0,0,0,.05)",
-    scaleGridLineWidth: 1,
-    barShowStroke: true,
-    barStrokeWidth: 2,
-    barValueSpacing: 5,
-    barDatasetSpacing: 1,
-    legend: {
-      display: true,
-      position: 'bottom'
-    },
-    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
-});
-
-var myBarChartLegend: string = myBarChart.generateLegend();
-var myBarChartImage: string = myBarChart.toBase64Image();
-myBarChart.addData([1, 2, 3, 4, 5, 6, 7], 'new');
-myBarChart.clear();
-myBarChart.removeData();
-myBarChart.resize();
-myBarChart.update();
-myBarChart.stop();
-myBarChart.destroy();
-
-var radarData: LinearChartData = {
-    labels: ["Eating", "Drinking", "Sleeping", "Designing", "Coding", "Cycling", "Running"],
-    datasets: [
-        {
-            label: "My First dataset",
-            fillColor: "rgba(220,220,220,0.2)",
-            strokeColor: "rgba(220,220,220,1)",
-            pointColor: "rgba(220,220,220,1)",
-            pointStrokeColor: "#fff",
-            pointHighlightFill: "#fff",
-            pointHighlightStroke: "rgba(220,220,220,1)",
-            data: [65, 59, 90, 81, 56, 55, 40]
-        },
-        {
-            label: "My Second dataset",
-            fillColor: "rgba(151,187,205,0.2)",
-            strokeColor: "rgba(151,187,205,1)",
-            pointColor: "rgba(151,187,205,1)",
-            pointStrokeColor: "#fff",
-            pointHighlightFill: "#fff",
-            pointHighlightStroke: "rgba(151,187,205,1)",
-            data: [28, 48, 40, 19, 96, 27, 100]
-        }
-    ]
-};
-
-var myRadarChart = new Chart(ctx).Radar(radarData, {
-    scaleShowLine: true,
-    angleShowLineOut: true,
-    scaleShowLabels: false,
-    scaleBeginAtZero: true,
-    angleLineColor: "rgba(0,0,0,.1)",
-    angleLineWidth: 1,
-    pointLabelFontFamily: "'Arial'",
-    pointLabelFontStyle: "normal",
-    pointLabelFontSize: 10,
-    pointLabelFontColor: "#666",
-    pointDot: true,
-    pointDotRadius: 3,
-    pointDotStrokeWidth: 1,
-    pointHitDetectionRadius: 20,
-    datasetStroke: true,
-    datasetStrokeWidth: 2,
-    datasetFill: true,
-    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
-});
-
-var myRadarChartLegend: string = myRadarChart.generateLegend();
-var myRadarChartImage: string = myRadarChart.toBase64Image();
-myRadarChart.addData([1, 2, 3, 4, 5, 6, 7], 'new');
-myRadarChart.clear();
-myRadarChart.removeData();
-myRadarChart.resize();
-myRadarChart.update();
-myRadarChart.stop();
-myRadarChart.destroy();
-
-var polarAreaData: CircularChartData[] = [
-    {
-        value: 300,
-        color: "#F7464A",
-        highlight: "#FF5A5E",
-        label: "Red"
-    },
-    {
-        value: 50,
-        color: "#46BFBD",
-        highlight: "#5AD3D1",
-        label: "Green"
-    },
-    {
-        value: 100,
-        color: "#FDB45C",
-        highlight: "#FFC870",
-        label: "Yellow"
-    },
-    {
-        value: 40,
-        color: "#949FB1",
-        highlight: "#A8B3C5",
-        label: "Grey"
-    },
-    {
-        value: 120,
-        color: "#4D5360",
-        highlight: "#616774",
-        label: "Dark Grey"
-    }
-
-];
-
-var myPolarAreaChart = new Chart(ctx).PolarArea(polarAreaData, {
-    scaleShowLabelBackdrop: true,
-    scaleBackdropColor: "rgba(255,255,255,0.75)",
-    scaleBeginAtZero: true,
-    scaleBackdropPaddingY: 2,
-    scaleBackdropPaddingX: 2,
-    scaleShowLine: true,
-    segmentShowStroke: true,
-    segmentStrokeColor: "#fff",
-    segmentStrokeWidth: 2,
-    animationSteps: 100,
-    animationEasing: "easeOutBounce",
-    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 myPolarAreaChartLegend: string = myPolarAreaChart.generateLegend();
-var myPolarAreaChartImage: string = myPolarAreaChart.toBase64Image();
-myPolarAreaChart.addData({
-    value: 120,
-    color: "#4D5360",
-    highlight: "#616774",
-    label: "Dark Grey"
-}, 0);
-myPolarAreaChart.clear();
-myPolarAreaChart.removeData(0);
-myPolarAreaChart.resize();
-myPolarAreaChart.update();
-myPolarAreaChart.stop();
-myPolarAreaChart.destroy();
-
-var pieData: CircularChartData[] = [
-    {
-        value: 300,
-        color: "#F7464A",
-        highlight: "#FF5A5E",
-        label: "Red"
-    },
-    {
-        value: 50,
-        color: "#46BFBD",
-        highlight: "#5AD3D1",
-        label: "Green"
-    },
-    {
-        value: 100,
-        color: "#FDB45C",
-        highlight: "#FFC870",
-        label: "Yellow"
-    }
-];
-
-// For a pie chart
-var myPieChart = new Chart(ctx).Pie(pieData, {
-    segmentShowStroke: true,
-    segmentStrokeColor: "#fff",
-    segmentStrokeWidth: 2,
-    percentageInnerCutout: 0,
-    animationSteps: 100,
-    animationEasing: "easeOutBounce",
-    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 myPieChartLegend: string = myPieChart.generateLegend();
-var myPieChartImage: string = myPieChart.toBase64Image();
-myPieChart.addData({
-    value: 120,
-    color: "#4D5360",
-    highlight: "#616774",
-    label: "Dark Grey"
-}, 0);
-myPieChart.clear();
-myPieChart.removeData(0);
-myPieChart.resize();
-myPieChart.update();
-myPieChart.stop();
-myPieChart.destroy();
-
-// And for a doughnut chart
-var myDoughnutChart = new Chart(ctx).Doughnut(pieData, {
-    segmentShowStroke: true,
-    segmentStrokeColor: "#fff",
-    segmentStrokeWidth: 2,
-    percentageInnerCutout: 50,
-    animationSteps: 100,
-    animationEasing: "easeOutBounce",
-    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();
-myPieChart.addData({
-    value: 120,
-    color: "#4D5360",
-    highlight: "#616774",
-    label: "Dark Grey"
-}, 0);
-myDoughnutChart.clear();
-myDoughnutChart.removeData(0);
-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/types/chartjs/index.d.ts b/types/chartjs/index.d.ts
deleted file mode 100644
index 4caaef4981..0000000000
--- a/types/chartjs/index.d.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-// Type definitions for Chart.js
-// Project: https://github.com/nnnick/Chart.js
-// Definitions by: Steve Fenton <https://github.com/Steve-Fenton>
-//                 Alessio Fanelli <https://github.com/FanaHOVA>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface ChartDataSet {
-    label: string;
-    fillColor: string;
-    strokeColor: string;
-    type?: string;
-    yAxisID?: string;
-    xAxisID?: string;
-
-    borderColor?: string;
-    /* Line, Radar */
-    pointColor?: string;
-    pointStrokeColor?: string;
-    pointHighlightFill?: string;
-    pointHighlightStroke?: string;
-
-    /* Bar */
-    highlightFill?: string;
-    highlightStroke?: string;
-    backgroundColorHover?: string;
-
-    data: number[];
-}
-
-interface LinearChartData {
-    labels: string[];
-    datasets: ChartDataSet[];
-}
-
-interface CircularChartData {
-    value: number;
-    color?: string;
-    highlight?: string;
-    label?: string;
-}
-
-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;
-}
-
-interface ChartOptions extends ChartSettings {
-    scaleShowGridLines?: boolean;
-    scaleGridLineColor?: string;
-    scaleGridLineWidth?: number;
-    scaleShowHorizontalLines?: boolean;
-    scaleShowVerticalLines?: boolean;
-    legendTemplate?: string;
-    tooltips?: ChartTooltips;
-    legend?: ChartLegend;
-    scales?: ChartScales;
-    title?: ChartTitle;
-}
-
-interface ChartTooltips {
-    mode?: string;
-    intersect?: boolean;
-}
-
-interface ChartLegend {
-    display?: boolean;
-    position?: string;
-}
-
-interface ChartScales {
-    xAxes?: Array<ChartScalesOptions>;
-    yAxes?: Array<ChartScalesOptions>;
-}
-
-interface ChartScalesOptions {
-    stacked?: boolean;
-    position?: string;
-    id?: string;
-    ticks?: ScaleTicksOptions;
-}
-
-interface ScaleTicksOptions {
-    min?: number;
-    max?: number;
-    maxTicksLimit?: number;
-    suggestedMin?: number;
-    suggestedMax?: number;
-    stepSize?: number;
-}
-
-interface ChartTitle {
-    display?: boolean;
-    text?: string;
-}
-
-interface PointsAtEvent {
-    value: number;
-    label: string;
-    datasetLabel: string;
-    strokeColor: string;
-    fillColor: string;
-    highlightFill: string;
-    highlightStroke: string;
-    x: number;
-    y: number;
-}
-
-interface ChartInstance {
-    clear: () => void;
-    stop: () => void;
-    resize: () => void;
-    destroy: () => void;
-    toBase64Image: () => string;
-    generateLegend: () => string;
-}
-
-interface LinearInstance extends ChartInstance {
-    getPointsAtEvent: (event: Event) => PointsAtEvent[];
-    update: () => void;
-    addData: (valuesArray: number[], label: string) => void;
-    removeData: (index?: number) => void;
-}
-
-interface CircularInstance extends ChartInstance {
-    getSegmentsAtEvent: (event: Event) => {}[];
-    update: () => void;
-    addData: (valuesArray: CircularChartData, index?: number) => void;
-    removeData: (index: number) => void;
-    segments: Array<CircularChartData>;
-}
-
-interface LineChartOptions extends ChartOptions {
-    bezierCurve?: boolean;
-    bezierCurveTension?: number;
-    pointDot?: boolean;
-    pointDotRadius?: number;
-    pointDotStrokeWidth?: number;
-    pointHitDetectionRadius?: number;
-    datasetStroke?: boolean;
-    datasetStrokeWidth?: number;
-    datasetFill?: boolean;
-}
-
-interface BarChartOptions extends ChartOptions {
-    scaleBeginAtZero?: boolean;
-    barShowStroke?: boolean;
-    barStrokeWidth?: number;
-    barValueSpacing?: number;
-    barDatasetSpacing?: number;
-}
-
-interface RadarChartOptions extends ChartSettings {
-    scaleShowLine?: boolean;
-    angleShowLineOut?: boolean;
-    scaleShowLabels?: boolean;
-    scaleBeginAtZero?: boolean;
-    angleLineColor?: string;
-    angleLineWidth?: number;
-    pointLabelFontFamily?: string;
-    pointLabelFontStyle?: string;
-    pointLabelFontSize?: number;
-    pointLabelFontColor?: string;
-    pointDot?: boolean;
-    pointDotRadius?: number;
-    pointDotStrokeWidth?: number;
-    pointHitDetectionRadius?: number;
-    datasetStroke?: boolean;
-    datasetStrokeWidth?: number;
-    datasetFill?: boolean;
-    legendTemplate?: string;
-}
-
-interface PolarAreaChartOptions extends ChartSettings {
-    scaleShowLabelBackdrop?: boolean;
-    scaleBackdropColor?: string;
-    scaleBeginAtZero?: boolean;
-    scaleBackdropPaddingY?: number;
-    scaleBackdropPaddingX?: number;
-    scaleShowLine?: boolean;
-    segmentShowStroke?: boolean;
-    segmentStrokeColor?: string;
-    segmentStrokeWidth?: number;
-    animationSteps?: number;
-    animationEasing?: string;
-    animateRotate?: boolean;
-    animateScale?: boolean;
-    legendTemplate?: string;
-}
-
-interface PieChartOptions extends ChartSettings {
-    segmentShowStroke?: boolean;
-    segmentStrokeColor?: string;
-    segmentStrokeWidth?: number;
-    percentageInnerCutout?: number;
-    animationSteps?: number;
-    animationEasing?: string;
-    animateRotate?: boolean;
-    animateScale?: boolean;
-    legendTemplate?: string;
-}
-
-interface Chart {
-    Line(data: LinearChartData, options?: LineChartOptions): LinearInstance;
-    Bar(data: LinearChartData, options?: BarChartOptions): LinearInstance;
-    Radar(data: LinearChartData, options?: RadarChartOptions): LinearInstance;
-
-    PolarArea(data: CircularChartData[], options?: PolarAreaChartOptions): CircularInstance;
-    Pie(data: CircularChartData[], options?: PieChartOptions): CircularInstance;
-    Doughnut(data: CircularChartData[], options?: PieChartOptions): CircularInstance;
-}
-
-declare var Chart: {
-    new (context: CanvasRenderingContext2D): Chart;
-    defaults: {
-        global: ChartSettings;
-    }
-};
diff --git a/types/chartjs/tsconfig.json b/types/chartjs/tsconfig.json
deleted file mode 100644
index 17d7edaf2a..0000000000
--- a/types/chartjs/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "chartjs-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/check-types/check-types-tests.ts b/types/check-types/check-types-tests.ts
new file mode 100644
index 0000000000..1f0fc31c98
--- /dev/null
+++ b/types/check-types/check-types-tests.ts
@@ -0,0 +1,57 @@
+import * as check from "check-types";
+
+const a: boolean = check.number(2);
+
+const b: any = 2;
+
+if (check.string(b)) {
+  const c = b.slice(0, 1);
+}
+
+check.map({ val: 1, val2: 2 }, { val: check.number, val2: check.string });
+
+check.even(3);
+
+check.not.even(3);
+
+check.maybe.even(2);
+
+check.assert.like({ foo: 'bar' }, { baz: 'qux' });
+
+check.assert(false, "msg", Error);
+
+check.assert.not.like({ foo: 'bar' }, { baz: 'qux' });
+
+check.assert.maybe.like(undefined, { foo: 'bar' });
+
+check.assert(function a(): any { return {}; }, 'Something went wrong', Error);
+
+check.apply([ 'foo', 'bar', '' ], check.nonEmptyString);
+
+check.any(
+  check.apply(
+      [ 1, 2, 3, '' ],
+      check.string
+  )
+);
+
+check.any(
+  check.map(
+    { foo: 0, bar: '' },
+    { foo: check.number, bar: check.string }
+  )
+);
+
+check.all(
+  check.map(
+      { foo: 0, bar: '' },
+      { foo: check.number, bar: check.string }
+  )
+);
+
+check.all(
+  check.apply(
+    [ 1, 2, 3, '' ],
+    check.string
+  )
+);
diff --git a/types/check-types/index.d.ts b/types/check-types/index.d.ts
new file mode 100644
index 0000000000..fad987692f
--- /dev/null
+++ b/types/check-types/index.d.ts
@@ -0,0 +1,162 @@
+// Type definitions for check-types 7.3
+// Project: https://github.com/philbooth/check-types.js
+// Definitions by: idchlife <https://github.com/idchlife>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+// TypeScript Version: 2.2
+
+type NegationFunction = (val: any) => boolean;
+
+type MaybeFunction = <T>(val: T) => boolean | T;
+
+interface ArrayFunction {
+  (a: any): a is any[];
+
+  // TODO: Maybe there is a way to create type guards for array type checks
+  // Since syntax is like check.array.of.number(2) - it's not yet clear to me how this even works, so...
+  // I might use of: CheckType, but it will just return type guards for primitives and object type
+  // and will make variable simply non array type in conditionals.
+  of: {
+    [method: string]: boolean;
+  };
+}
+
+interface ArrayLikeFunction {
+  (a: any): a is ArrayLike<any>;
+
+  // See in array explanation of this type
+  of: {
+    [method: string]: boolean;
+  };
+}
+
+interface IterableFunction {
+  (a: any): a is Iterable<any>;
+
+  // See in array explanation of this type
+  of: {
+    [method: string]: boolean;
+  };
+}
+
+interface ObjectFunction {
+  (a: any): a is object;
+
+  // See in array explanation of this type
+  of: {
+    [method: string]: boolean;
+  };
+}
+
+interface AssertFunction extends CheckType {
+  <T>(possibleFalsy: T, message?: string, errorType?: { new(...args: any[]): any }): T;
+}
+
+interface CheckType {
+  /* General predicates */
+
+  equal(a: any, b: any): boolean;
+  null(a: any): a is null;
+  undefined(a: any): a is undefined;
+  assigned(a: any): boolean;
+  primitive(a: any): a is number | string | boolean | null | undefined | symbol;
+  hasLength(a: any, length: number): boolean;
+
+  /* String predicates */
+
+  string(a: any): a is string;
+  emptyString(a: string): boolean;
+  nonEmptyString(a: string): boolean;
+  contains(a: string, substring: string): boolean;
+  match(a: string, b: RegExp): boolean;
+
+  /* Number predicates */
+
+  number(a: any): a is number;
+  integer(a: any): a is number;
+  zero(a: any): boolean;
+  infinity(a: any): boolean;
+  greater(num: number, greaterThan: number): boolean;
+  greaterOrEqual(num: number, greaterOrEqual: number): boolean;
+  less(num: number, lessThan: number): boolean;
+  lessOrEqual(num: number, lessOrEqual: number): boolean;
+  /**
+   * Excluding a and b. Any order of a, b
+   */
+  between(num: number, a: number, b: number): boolean;
+  /**
+   * Including a, b. Any order of a, b
+   */
+  inRange(num: number, a: number, b: number): boolean;
+  positive(num: number): boolean;
+  negative(num: number): boolean;
+  odd(num: number): boolean;
+  even(num: number): boolean;
+
+  /* Boolean predicates */
+
+  boolean(a: any): a is boolean;
+
+  /* Object predicates */
+
+  object: ObjectFunction;
+  emptyObject(a: object): boolean;
+  nonEmptyObject(a: object): boolean;
+  /**
+   * Checking via instanceof
+   */
+  instanceStrict<T extends object>(a: any, prototype: T): a is T;
+  /**
+   * Checking via instanceof, fallback constructor.name and .toString()
+   */
+  instance<T extends object>(a: any, prototype: T): a is T;
+  /**
+   * Duck type checking. Structural in other words. Checking if a has all properties of duck
+   */
+  like<T extends object>(a: any, duck: T): a is T;
+
+  /* Array predicates */
+
+  array: ArrayFunction;
+  emptyArray(a: any[]): boolean;
+  nonEmptyArray(a: any[]): boolean;
+  arrayLike: ArrayLikeFunction;
+  iterable: IterableFunction;
+  includes(a: any[], value: any): boolean;
+
+  /* Date predicates */
+
+  date(a: any): a is Date;
+
+  /* Function predicates */
+
+  function(a: any): a is (...args: any[]) => any;
+
+  /* Modifiers (some of them in their respected sections) */
+  not: CheckType & NegationFunction;
+  maybe: CheckType & MaybeFunction;
+  assert: AssertFunction;
+
+  /* Batch operations */
+
+  /**
+   * Applying predicate to every element of array and returning resulting array
+   *
+   * Example: apply([2, 3, "four"], check.number) => [true, true, false]
+   */
+  apply<T>(arr: any[], predicate: (...args: any[]) => T): T[];
+
+  // Also some difficulties with returning object with only defined in predicates object propertis.
+  // Will gladly accept help or ideas. Now using any for returned object
+  map<T extends { [k: string]: any }>(
+    arr: T,
+    predicates: Partial<{ [k in keyof T]: (...args: any[]) => boolean }>
+  ): Partial<{ [k in keyof T]: any }>;
+
+  all(arr: boolean[] | { [k: string]: boolean }): boolean;
+
+  any(arr: boolean[] | { [k: string]: boolean }): boolean;
+}
+
+declare const check: CheckType;
+
+export = check;
diff --git a/types/check-types/tsconfig.json b/types/check-types/tsconfig.json
new file mode 100644
index 0000000000..d3c89a7ac7
--- /dev/null
+++ b/types/check-types/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "check-types-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/check-types/tslint.json b/types/check-types/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/check-types/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/checksum/tslint.json b/types/checksum/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/checksum/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 2037e83c7a..42bcae6eff 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Cheerio v0.22.0
 // Project: https://github.com/cheeriojs/cheerio
-// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>, Umar Nizamani <https://github.com/umarniz>
+// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>, Umar Nizamani <https://github.com/umarniz>, LiJinyao <https://github.com/LiJinyao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Cheerio {
@@ -172,7 +172,7 @@ interface Cheerio {
 
     empty(): Cheerio;
 
-    html(): string;
+    html(): string | null;
     html(html: string): Cheerio;
 
     text(): string;
@@ -255,6 +255,7 @@ interface CheerioElement {
     children: CheerioElement[];
     childNodes: CheerioElement[];
     lastChild: CheerioElement;
+    firstChild: CheerioElement;
     next: CheerioElement;
     nextSibling: CheerioElement;
     prev: CheerioElement;
@@ -262,6 +263,7 @@ interface CheerioElement {
     parent: CheerioElement;
     parentNode: CheerioElement;
     nodeValue: string;
+    data?: string;
 }
 
 interface CheerioAPI extends CheerioSelector, CheerioStatic {
@@ -269,6 +271,8 @@ interface CheerioAPI extends CheerioSelector, CheerioStatic {
   load(element: CheerioElement, options?: CheerioOptionsInterface): CheerioStatic;
 }
 
+interface Document { }
+
 declare var cheerio:CheerioAPI;
 
 declare module "cheerio" {
diff --git a/types/cheerio/tslint.json b/types/cheerio/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cheerio/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chocolatechipjs/index.d.ts b/types/chocolatechipjs/index.d.ts
index 4c1d49f6d1..2b53368f08 100644
--- a/types/chocolatechipjs/index.d.ts
+++ b/types/chocolatechipjs/index.d.ts
@@ -10,7 +10,6 @@ interface ChocolateChipStatic {
    *
    * @param selector A string containing a selector expression
    * @param context A DOM HTMLElement to use as context
-   * @return HTMLElement[]
    */
   (selector: string | HTMLElement | Document, context?: HTMLElement | ChocolateChipElementArray): ChocolateChipElementArray;
 
@@ -18,7 +17,6 @@ interface ChocolateChipStatic {
    * Binds a function to be executed when the DOM has finished loading.
    *
    * @param callback A function to execute after the DOM is ready.
-   * @return void
    */
   (callback: () => any): void;
 
@@ -26,7 +24,6 @@ interface ChocolateChipStatic {
    * Accepts a string containing a CSS selector which is then used to match a set of elements.
    *
    * @param element A DOM element to wrap in an array.
-   * @return HTMLElement[]
    */
   (element: HTMLElement): ChocolateChipElementArray;
 
@@ -34,7 +31,6 @@ interface ChocolateChipStatic {
    * Accepts a string containing a CSS selector which is then used to match a set of elements.
    *
    * @param elementArray An array of DOM elements to convert into a ChocolateChip Collection.
-   * @return HTMLElement[]
    */
   (elementArray: ChocolateChipElementArray): ChocolateChipElementArray;
 
@@ -42,13 +38,11 @@ interface ChocolateChipStatic {
    * Accepts the document element and returns it wrapped in an array.
    *
    * @param document The document object.
-   * @return document[]
    */
   (document: Document): Document[];
 
   /**
    * If no argument is provided, return the document as a ChocolateChipElementArray.
-   * @return Document[]
    */
   (): Document[];
 
@@ -94,8 +88,6 @@ interface ChocolateChipStatic {
 
   /**
    * An empty function.
-   *
-   * @return void.
    */
   noop(): void;
 
@@ -106,40 +98,27 @@ interface ChocolateChipStatic {
 
   /**
    * Create a random number to use as a uuid.
-   *
-   * @return number.
    */
   uuidNum(): number;
 
   /**
    * Creates a uuid using uuidNum().
-   *
-   * @return A string.
    */
   makeUuid(): string;
 
   /**
    * Create a ChocolateChip collection object by creating elements from an HTML string.
-   *
-   * @param selector
-   * @return any
    */
   make(selector: string): ChocolateChipElementArray;
 
   /**
    * Create a ChocolateChip collection object by creating elements from an HTML string. This is an alias for $.make.
-   *
-   * @param selector
-   * @return any
    */
   html(selector: string): ChocolateChipElementArray;
 
   /**
    * Replace one element with another.
-   *
-   * @param new HTMLElement
-   * @param old HTMLElement
-   * @return HTMLElement[]
+   * @return {HTMLElement[]}
    */
   replace(newElement: ChocolateChipElementArray, oldElement: ChocolateChipElementArray): void;
 
@@ -148,7 +127,7 @@ interface ChocolateChipStatic {
    *
    * @param url A string containing the URL where the script resides.
    * @param callback A callback function that is executed after the script loads.
-   * @return void
+   * @return {void}
    */
   require(url: string, callback: Function): Function;
 
@@ -157,7 +136,7 @@ interface ChocolateChipStatic {
    *
    * @param url A string containing the URL where the script resides.
    * @param callback A callback function that is executed after the script loads.
-   * @return Function
+   * @return {Function}
    */
   processJSON(json: string, name?: string): any;
 
@@ -173,7 +152,6 @@ interface ChocolateChipStatic {
    * Parse the data in a Promise response as JSON.
    *
    * @param response The response from a Promise.
-   * @result
    */
   json(reponse: Response): JSON;
 
@@ -182,7 +160,6 @@ interface ChocolateChipStatic {
    *
    * @param callback A function to execute.
    * @param duration The number of milliseconds to delay execution.
-   * @return any
    */
   delay(callback: Function, duration?: number): any;
 
@@ -190,7 +167,6 @@ interface ChocolateChipStatic {
    * The method will defer the execution of its callback until the call stack is clear.
    *
    * @param callback A callback to execute after a delay.
-   * @return    Function.
    */
   defer(callback: Function): Function;
 
@@ -215,16 +191,14 @@ interface ChocolateChipStatic {
   /**
    * This method will concatenate strings or values as a cleaner alternative to using the '+' operator.
    *
-   * @param string or number A comma separated series of strings to concatenate.
-   * @return string
+   * @param {string | number} A comma separated series of strings to concatenate.
    */
   concat(...string: string[]): string;
 
   /**
    * This method takes a space-delimited string of words and returns it as an array where the individual words are indices.
    *
-   * @param string Any string with values separated by spaces.
-   * @return string[]
+   * @param Any string with values separated by spaces.
    */
   w(string: string): string[];
 
@@ -232,7 +206,6 @@ interface ChocolateChipStatic {
    * This method converts a string of hyphenated tokens into a camel cased string.
    *
    * @param string A string of hyphenated tokens.
-   * @return string
    */
   camelize(string: string): string;
 
@@ -240,16 +213,11 @@ interface ChocolateChipStatic {
    * This method converts a camel case string into lowercase with hyphens.
    *
    * @param string A camel case string.
-   * @return string
    */
   deCamelize(string: string): string;
 
   /**
    * This method capitalizes the first letter of a string.
-   *
-   * @param string A string.
-   * @param boolean A boolean value.
-   * @return string
    */
   capitalize(string: string, boolean?: boolean): string;
 
@@ -257,7 +225,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is a string.
    *
    * @param obj Object to test whether or not it is a string.
-   * @return boolean
    */
   isString(obj: any): boolean;
 
@@ -265,7 +232,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is an array.
    *
    * @param obj Object to test whether or not it is an array.
-   * @return boolean
    */
   isArray(obj: any): boolean;
 
@@ -273,7 +239,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is a function.
    *
    * @param obj Object to test whether or not it is an function.
-   * @return boolean
    */
   isFunction(obj: any): boolean;
 
@@ -281,7 +246,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is an object.
    *
    * @param obj Object to test whether or not it is an object.
-   * @return boolean
    */
   isObject(obj: any): boolean;
 
@@ -297,7 +261,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is an empty object.
    *
    * @param obj Object to test whether or not it is an empty object.
-   * @return boolean
    */
   isEmptyObject(obj: any): boolean;
 
@@ -305,7 +268,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is a number.
    *
    * @param obj Object to test whether or not it is a number.
-   * @return boolean
    */
   isNumber(obj: any): boolean;
 
@@ -313,7 +275,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is an integer.
    *
    * @param obj Object to test whether or not it is an integer.
-   * @return boolean
    */
   isInteger(obj: any): boolean;
 
@@ -321,7 +282,6 @@ interface ChocolateChipStatic {
    * Determine whether the argument is a float.
    *
    * @param obj Object to test whether or not it is a float.
-   * @return boolean
    */
   isFloat(obj: any): boolean;
 
@@ -443,8 +403,8 @@ interface ChocolateChipStatic {
   /**
    * Grabs values from a form and converts them into a JSON object.
    *
-   * @param rootNode: string | HTMLElement A form whose values you want to convert to JSON.
-   * @param delimiter string A delimiter to namespace your form values. The default is "."
+   * @param rootNode: A form whose values you want to convert to JSON.
+   * @param delimiter A delimiter to namespace your form values. The default is "."
    * You use the form input's name to set up the namespace structure for your JSON, e.g. name="newUser.name.first".
    */
   form2JSON(rootNode: string | HTMLElement, delimiter: string): Object;
@@ -453,35 +413,33 @@ interface ChocolateChipStatic {
    * Subscribe to a publication. You provide the topic you want to subscribe to, as well as a callback to execute when a publication occurs.
    * Any data passed by the publisher is exposed to the callback as its second parameter. The callback's first parameter is the published topic.
    *
-   * @param topic string A topic to subscribe to. This can be a single term, or any type of namespaced term with delimiters.
-   * @data any You can receive any type: string, number, array, object, etc.
-   * @return any
+   * @param topic A topic to subscribe to. This can be a single term, or any type of namespaced term with delimiters.
+   * @param callback You can receive any type: string, number, array, object, etc.
    */
   subscribe(topic: string, callback: (topic: string, data: any) => any): boolean;
 
   /**
    * Unsubscribe from a topic. Pass this the topic you wish to unsubscribe from. The subscription will be terminated immediately.
    *
-   * @param topic string The name of the topic to unsubscribe from.
-   * @return void
+   * @param topic The name of the topic to unsubscribe from.
    */
   unsubscribe(topic: string): void;
 
   /**
    *    Publish a topic with data for the topic's subscribers to receive.
    *
-   * @param topic string The topic you wish to publish.
+   * @param topic The topic you wish to publish.
    * @param data The data to send with the publication. This can be of any type: string, number, array, object, etc.
-   * @return void
+   * @return {void}
    */
   publish(topic: string, data: any): string;
 
   /**
    * Object used to store string templates and parsed templates.
    *
-   * @param string A string defining the template.
-   * @param string A label used to access an object's properties in the template. If none is provided it defaults to "data": [[= data.name]].
-   * @return void
+   * @param {strin} A string defining the template.
+   * @param {string} A label used to access an object's properties in the template. If none is provided it defaults to "data": [[= data.name]].
+   * @return {void}
    */
   templates: Object;
 
@@ -495,7 +453,6 @@ interface ChocolateChipStatic {
      *
      * @param template A string of markup to use as a template.
      * @param variable An option name to use in the template. If it were "myData": [[= myData.name]]. Otherwise it defaults to "data": [[= data.name]].
-     * @return A function.
      */
     (template: string, variable?: string): Function;
 
@@ -514,7 +471,6 @@ interface ChocolateChipStatic {
        * @param element The target container into which the content will be inserted.
        * @param template A string of markup.
        * @param data The iterable data the template will consume.
-       * @return void.
        */
       (element: ChocolateChipElementArray, template: string, data: any): void;
     }
@@ -523,7 +479,6 @@ interface ChocolateChipStatic {
      * An object that holds the reference to the controller for a repeater.
      * This is used to cache the data that a repeater uses. After the repeater is rendered, the reference is deleted from this object.
      * Example: $.template.data["myRepeater"] = [{name: "Joe"}, {name: "Sue"}];
-     *
      */
     data: any;
 
@@ -567,16 +522,11 @@ interface ChocolateChipStatic {
 interface ChocolateChipElementArray extends Array<HTMLElement> {
   /**
    * Iterate over an Array object, executing a function for each matched element.
-   *
-   * @param Function
-   * @return void
    */
   each(func: (ctx: any, idx: number) => void): void;
 
   /**
    * Sorts an array and removes duplicates before returning it.
-   *
-   * @return Array
    */
   unique(): ChocolateChipElementArray;
 
@@ -585,16 +535,13 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * When dealing with document nodes, this allows you to cherry pick a node from its collection based on its
    * position amongst its siblings.
    *
-   * @param number Index value indicating the node you wish to access from a collection. This is zero-based.
-   * @return HTMLElement
+   * @param index Value indicating the node you wish to access from a collection. This is zero-based.
    */
   eq(index: number): ChocolateChipElementArray;
 
   /**
    * Search for a given element from among the matched elements on a collection.
    * This method returns the index value as an integer.
-   *
-   * @return number
    */
   index(): number;
 
@@ -603,7 +550,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * This method returns the index value as an integer.
    *
    * @param selector A selector representing an element to look for in a collection of elements.
-   * @return number
    */
   index(selector: string | HTMLElement[]): number;
 
@@ -612,7 +558,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * if it matches the given arguments.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
    */
   is(selector: string): ChocolateChipElementArray;
 
@@ -621,7 +566,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * if it matches the given arguments.
    *
    * @param elements One or more elements to match the current set of elements against.
-   * @ return HTMLElement[]
    */
   is(element: any): ChocolateChipElementArray;
 
@@ -630,7 +574,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * if it does not match the given arguments.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @ return HTMLElement[]
    */
   isnt(selector: string): ChocolateChipElementArray;
 
@@ -639,7 +582,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * if it does not match the given arguments.
    *
    * @param elements One or more elements to match the current set of elements against.
-   * @ return HTMLElement[]
    */
   isnt(element: any): ChocolateChipElementArray;
 
@@ -647,7 +589,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @ return HTMLElement[]
    */
   has(selector: string): ChocolateChipElementArray;
 
@@ -655,7 +596,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
    *
    * @param contained A DOM element to match elements against.
-   * @ return HTMLElement[]
    */
   has(contained: HTMLElement): ChocolateChipElementArray;
 
@@ -671,7 +611,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Reduce the set of matched elements to those that have a descendant that does not match the selector or DOM element.
    *
    * @param contained A DOM element to match elements against.
-   * @ return HTMLElement[]
    */
   hasnt(contained: HTMLElement): ChocolateChipElementArray;
 
@@ -684,7 +623,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Get the descendants of each element in the current set of matched elements, filtered by a selector or element.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @ return HTMLElement[]
    */
   find(selector: string): ChocolateChipElementArray;
 
@@ -692,21 +630,16 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Get the descendants of each element in the current set of matched elements, filtered by a selector or element.
    *
    * @param element An element to match elements against.
-   * @ return HTMLElement[]
    */
   find(element: HTMLElement): ChocolateChipElementArray;
 
   /**
    * Get the immediately preceding sibling of each element in the set of matched elements.
-   *
-   * @ return HTMLElement[]
    */
   prev(): ChocolateChipElementArray;
 
   /**
    * Get the immediately following sibling of each element in the set of matched elements.
-   *
-   * @ return HTMLElement[]
    */
   next(): ChocolateChipElementArray;
 
@@ -717,8 +650,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
 
   /**
    * Reduce the set of matched elements to the last in the set.
-   *
-   * @return HTMLElement[]
    */
   last(): ChocolateChipElementArray;
 
@@ -726,7 +657,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Get the children of each element in the set of matched elements, optionally filtered by a selector.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
    */
   children(selector?: string): ChocolateChipElementArray;
 
@@ -735,7 +665,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * If multiple elements have the same parent, only one instance of the parent is returned.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
    */
   parent(selector?: string): ChocolateChipElementArray;
 
@@ -745,7 +674,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * retrieving that ancestor based on its distance from the element.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
    */
   ancestor(selector: string | number): ChocolateChipElementArray;
 
@@ -754,7 +682,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * itself and traversing up through its ancestors in the DOM tree.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
    */
   closest(selector: string | number): ChocolateChipElementArray;
 
@@ -762,14 +689,11 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
    *
    * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
    */
   siblings(selector?: string): ChocolateChipElementArray;
 
   /**
    * Get the HTML contents of the first element in the set of matched elements.
-   *
-   * @return HTMLElement[]
    */
   html(): ChocolateChipElementArray;
 
@@ -777,7 +701,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Set the HTML contents of each element in the set of matched elements.
    *
    * @param htmlString A string of HTML to set as the content of each matched element.
-   * @return HTMLElement[]
    */
   html(htmlString: string): ChocolateChipElementArray;
 
@@ -785,7 +708,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Get the value of style properties for the first element in the set of matched elements.
    *
    * @param propertyName A CSS property.
-   * @return string
    */
   css(propertyName: string): string;
 
@@ -794,7 +716,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param propertyName A CSS property name.
    * @param value A value to set for the property.
-   * @return HTMLElement[]
    */
   css(propertyName: string, value: string): ChocolateChipElementArray;
 
@@ -802,7 +723,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Set one or more CSS properties for the set of matched elements.
    *
    * @param properties An object of property-value pairs to set.
-   * @return HTMLElement[]
    */
   css(properties: Object): ChocolateChipElementArray;
 
@@ -819,7 +739,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param attributeName A string indicating the attribute to set.
    * @param value A string indicating the value to set the attribute to.
-   * @return HTMLElement[]
    */
   attr(attributeName: string, value: string): ChocolateChipElementArray;
 
@@ -827,7 +746,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Remove an attribute from a node.
    *
    * @param attributeName A string indicating the attribute to remove.
-   * @return HTMLElement[]
    */
   removeAttr(attributeName: string): ChocolateChipElementArray;
 
@@ -835,7 +753,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Return any of the matched elements that have the given attribute.
    *
    * @param className The class name to search for.
-   * @return HTMLElement[]
    */
   hasAttr(attributeName: string): ChocolateChipElementArray;
 
@@ -843,7 +760,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Test whether an attribute exists on the first element in the set of matched elements. The value returned is a boolean.
    *
    * @param attributeName The name of the attribute to get.
-   * @return boolean
    */
   prop(propertyName: string): boolean;
 
@@ -852,7 +768,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param propertyName A string indicating the property to set.
    * @param value A string indicating the value to set the property to.
-   * @return HTMLElement[]
    */
   prop(propertyName: string, value: any | boolean): ChocolateChipElementArray;
 
@@ -860,7 +775,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Remove an element property.
    *
    * @param property The property to remove.
-   * @return HTMLElement[]
    */
   removeProp(property: string): ChocolateChipElementArray;
 
@@ -868,7 +782,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Adds the specified class(es) to each of the set of matched elements.
    *
    * @param className One or more space-separated classes to be added to the class attribute of each matched element.
-   * @return HTMLElement[]
    */
   addClass(className: string): ChocolateChipElementArray;
 
@@ -876,7 +789,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Remove a single class or multiple classes from each element in the set of matched elements.
    *
    * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
-   * @return HTMLElement[]
    */
   removeClass(className?: string): ChocolateChipElementArray;
 
@@ -884,7 +796,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Add or remove a classe from each element in the set of matched elements, depending on whether the class is present or not.
    *
    * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
-   * @return HTMLElement[]
    */
   toggleClass(className: string, swtch?: boolean): ChocolateChipElementArray;
 
@@ -892,7 +803,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Return any of the matched elements that have the given class.
    *
    * @param className The class name to search for.
-   * @return HTMLElement[]
    */
   hasClass(className: string): ChocolateChipElementArray;
 
@@ -901,7 +811,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param key A string naming the piece of data to set.
    * @param value The new data value; it can be any Javascript type including Array or Object.
-   * @return HTMLElement[]
    */
   data(key: string, value: any): ChocolateChipElementArray;
 
@@ -910,7 +819,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * data(name).
    *
    * @param key Name of the data stored.
-   * @return any
    */
   data(key: string): any;
 
@@ -918,7 +826,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Remove the value at the named data store for the first element in the element collection, as set by data(name, value).
    *
    * @param key Name of the data stored.
-   * @return any
    */
   removeData(key?: string): any;
 
@@ -927,7 +834,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param key A string naming the piece of data to set.
    * @param value The new data value; it must be a string. You can convert JSON into a string to use with this.
-   * @return HTMLElement[]
    */
   dataset(key: string, value: any): ChocolateChipElementArray;
 
@@ -935,7 +841,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Retrieve a dataset key's value for the first element in the element collection.
    *
    * @param key A string naming the piece of data to set.
-   * @return HTMLElement[]
    */
   dataset(key: string): ChocolateChipElementArray;
 
@@ -943,7 +848,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Return the value at the named data store for the first element in the element collection, as set by data(name, value).
    *
    * @param key Name of the data stored.
-   * @return any
    */
   data(key: string): any;
 
@@ -952,7 +856,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param key A string naming the piece of data to set.
    * @param value The new data value; it can be any Javascript type including Array or Object.
-   * @return HTMLElement[]
    */
   data(key: string, value?: any): ChocolateChipElementArray;
 
@@ -966,21 +869,16 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param value A string of text or an array of strings corresponding to the value of each matched element
    * to set as selected/checked.
-   * @return any
    */
   val(value: string): ChocolateChipElementArray;
 
   /**
    * Set the property of an element to enabled by removing the "disabled" attribute.
-   *
-   * @return HTMLElement[]
    */
   enable(): ChocolateChipElementArray;
 
   /**
    * Set the property of an element to "disabled".
-   *
-   * @return HTMLElement[]
    */
   disable(): ChocolateChipElementArray;
 
@@ -989,7 +887,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param speed A string or number determining how long the animation will run.
    * @param callback A function to call once the animation is complete.
-   * @return HTMLElement[]
    */
   show(duration?: number | string, callback?: Function): ChocolateChipElementArray;
 
@@ -998,7 +895,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param duration A string or number determining how long the animation will run.
    * @param callback A function to call once the animation is complete.
-   * @return HTMLElement[]
    */
   hide(duration?: number | string, callback?: Function): ChocolateChipElementArray;
 
@@ -1006,7 +902,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Insert content, specified by the parameter, before each element in the set of matched elements.
    *
    * @param content HTML string, DOM element, array of elements to insert before each element in the set of matched elements.
-   * @return HTMLElement[]
    */
   before(content: ChocolateChipElementArray | HTMLElement | string): ChocolateChipElementArray;
 
@@ -1014,7 +909,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Insert content, specified by the parameter, after each element in the set of matched elements.
    *
    * @param content HTML string, DOM element, array of elements to insert after each element in the set of matched elements.
-   * @return HTMLElement[]
    */
   after(content: ChocolateChipElementArray | HTMLElement | string): ChocolateChipElementArray;
 
@@ -1023,7 +917,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param content DOM element, array of elements, or HTML string to insert at the end of each element in the set
    * of matched elements.
-   * @return HTMLElement[]
    */
   append(content: ChocolateChipElementArray | HTMLElement | Text | string): ChocolateChipElementArray;
 
@@ -1031,7 +924,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Insert content, specified by the parameter, at the beginning of each element in the set of matched elements.
    *
    * @param content DOM element, array of elements, or HTML string to insert at the beginning of each element in the set of matched elements.
-   * @return HTMLElement[]
    */
   prepend(content: ChocolateChipElementArray | HTMLElement | Text | string): ChocolateChipElementArray;
 
@@ -1039,7 +931,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Insert every element in the set of matched elements to the beginning of the target.
    *
    * @param target A selector, element, or HTML string. The matched set of elements will be inserted at the beginning of the element specified by this parameter.
-   * @return HTMLElement[]
    */
   prependTo(target: any[] | HTMLElement | string): ChocolateChipElementArray;
 
@@ -1048,14 +939,11 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *
    * @param target A selector, element, or HTML string. The matched set of elements will be inserted at the end of the element specified by this parameter.
    * If no position value is provided it will simply append the content to the target.
-   * @return HTMLElement[]
    */
   appendTo(target: any[] | HTMLElement | string): ChocolateChipElementArray;
 
   /**
    * Insert element(s) into the target element.
-   *
-   * @return HTMLElement[]
    */
   insert(content: string, position?: number | string): ChocolateChipElementArray;
 
@@ -1063,7 +951,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Create a copy of the set of matched elements.
    *
    * @param value A Boolean indicating whether to copy the element(s) with their children. A true value copies the children.
-   * @return HTMLElement[]
    */
   clone(value?: boolean): ChocolateChipElementArray;
 
@@ -1071,14 +958,11 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Wrap an HTML structure around each element in the set of matched elements.
    *
    * @param wrappingElement A selector or HTML string specifying the structure to wrap around the matched elements.
-   * @return HTMLElement[]
    */
   wrap(wrappingElement: string): ChocolateChipElementArray;
 
   /**
    * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
-   *
-   * @return HTMLElement[]
    */
   unwrap(): ChocolateChipElementArray;
 
@@ -1086,21 +970,17 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Remove the set of matched elements from the DOM. If there are any attached events, this will remove them to prevent memory leaks.
    *
    * @param selector A selector expression that filters the set of matched elements to be removed.
-   * @return HTMLElement[]
    */
   remove(selector?: string): ChocolateChipElementArray;
 
   /**
    * Remove all child nodes of the set of matched elements from the DOM.
-   *
-   * @return HTMLElement[]
    */
   empty(): ChocolateChipElementArray;
 
   /**
    * Get an object of the current coordinates of the first element in the set of matched elements, relative to the document.
    * These are: top, left, bottom and right. The values are numbers representing pixel values.
-   * @return Object
    */
   offset(): {
     top: number;
@@ -1112,23 +992,17 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
   /**
    * Get the current computed width for the first element in the set of matched elements,
    * including padding but excluding borders.
-   *
-   * @return number
    */
   width(): number;
 
   /**
    * Get the current computed height for the first element in the set of matched elements,
    * including padding but excluding borders.
-   *
-   * @return number
    */
   height(): number;
 
   /**
-   * Get the combined text contents of each element in the set of matched elements, including their descendants.
-   *
-   * @return string
+   * Get the combined text contents of each element in the set of matched elements, including their descendants
    */
   text(): string;
 
@@ -1139,7 +1013,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    *        The text to set as the content of each matched element.
    *        When Number is supplied, it will be converted to a String representation.
    *        To delete text, use ChocolateChipElementArray.empty() or ChocolateChipElementArray.remove().
-   * @return HTMLElement
    */
   text(text: string | number): HTMLElement;
 
@@ -1149,7 +1022,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param options And object of key value pairs define the CSS properties and values to animate.
    * @param duration A string representing the time. Should have a time identifier: "200s", "200ms", etc.
    * @param easing A string indicating the easing for the animation, such as "ease-out", "ease-in", "ease-in-out".
-   * @return void
    */
   animate(options: Object, duration?: string, easing?: string): void;
 
@@ -1159,7 +1031,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
    * @param handler A function to execute each time the event is triggered.
    * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
    */
   bind(eventType: string, handler: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
 
@@ -1169,7 +1040,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
    * @param handler A function to execute each time the event is triggered.
    * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
    */
   unbind(eventType?: string, handler?: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
 
@@ -1181,7 +1051,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param handler A function to execute each time the event is triggered. The keyword "this" will refer
    * to the element receiving the event.
    * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
    */
   delegate(selector: any, eventType: string, handler: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
 
@@ -1192,7 +1061,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
    * @param handler A function handler assigned to this event.
    * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
    */
   undelegate(selector?: any, eventType?: string, handler?: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
 
@@ -1203,7 +1071,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param selector A string defining the descendant elements are listening for the event.
    * @param handler A function handler assigned to this event.
    * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
    */
   on(eventType: string, selector: any, handler?: (eventObject: Event) => any, capturePhase?: boolean): ChocolateChipStatic;
 
@@ -1215,7 +1082,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param selector A string defining the descendant elements are listening for the event.
    * @param handler A function handler assigned to this event.
    * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
    */
   off(eventType?: string, selector?: any, handler?: (eventObject: Event) => any, capturePhase?: boolean): ChocolateChipStatic;
 
@@ -1223,7 +1089,6 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * Trigger an event on an element.
    *
    * @param eventType The event to trigger.
-   * @return void
    */
   trigger(eventType: string): void;
 }
diff --git a/types/chocolatechipjs/tslint.json b/types/chocolatechipjs/tslint.json
index ce367ade18..9969e961d1 100644
--- a/types/chocolatechipjs/tslint.json
+++ b/types/chocolatechipjs/tslint.json
@@ -7,6 +7,10 @@
         "dt-header": false,
         "no-any-union": false,
         "unified-signatures": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: left in redundant jsdoc that conflicts with type declarations
+        // Need to go over each and decide whether the jsdoc or type is correct
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false
     }
 }
diff --git a/types/chokidar/index.d.ts b/types/chokidar/index.d.ts
index 229ffb556f..396ad10e0a 100644
--- a/types/chokidar/index.d.ts
+++ b/types/chokidar/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for chokidar 1.7.1
+// Type definitions for chokidar 1.7
 // Project: https://github.com/paulmillr/chokidar
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 //                 Felix Becker <https://github.com/felixfbecker>
@@ -19,7 +19,6 @@ export interface WatchedPaths {
 }
 
 export class FSWatcher extends EventEmitter implements fs.FSWatcher {
-
     /**
      * Constructs a new FSWatcher instance with optional WatchOptions parameter.
      */
@@ -52,7 +51,6 @@ export class FSWatcher extends EventEmitter implements fs.FSWatcher {
 }
 
 export interface WatchOptions {
-
     /**
      * Indicates whether the process should continue to run as long as files are being watched. If
      * set to `false` when using `fsevents` to watch, no more events will be emitted after `ready`,
@@ -86,7 +84,7 @@ export interface WatchOptions {
      * be relative to this.
      */
     cwd?: string;
-    
+
     /**
      *  If set to true then the strings passed to .watch() and .add() are treated as literal path
      *  names, even if they look like globs. Default: false.
@@ -155,7 +153,6 @@ export interface WatchOptions {
 }
 
 export interface AwaitWriteFinishOptions {
-
     /**
      * Amount of time in milliseconds for a file size to remain constant before emitting its event.
      */
diff --git a/types/zetapush-js/tslint.json b/types/chokidar/tslint.json
similarity index 100%
rename from types/zetapush-js/tslint.json
rename to types/chokidar/tslint.json
diff --git a/types/chosen-js/tslint.json b/types/chosen-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chosen-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chroma-js/index.d.ts b/types/chroma-js/index.d.ts
index f826c8f254..c18484dc1f 100644
--- a/types/chroma-js/index.d.ts
+++ b/types/chroma-js/index.d.ts
@@ -34,9 +34,6 @@ declare namespace chroma {
         /**
          * Create a color in the specified color space using a, b and c as values.
          *
-         * @param a
-         * @param b
-         * @param c
          * @param colorSpace The color space to use. Defaults to "rgb".
          * @return the color object.
          */
diff --git a/types/chroma-js/v0/tslint.json b/types/chroma-js/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chroma-js/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chrome/chrome-app.d.ts b/types/chrome/chrome-app.d.ts
index f80b335125..4ecf1d344a 100644
--- a/types/chrome/chrome-app.d.ts
+++ b/types/chrome/chrome-app.d.ts
@@ -1,59 +1,86 @@
 // Type definitions for Chrome packaged application development
 // Project: http://developer.chrome.com/apps/
-// Definitions by: Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>
+// Definitions by: Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>, Nikolai Ommundsen <https://github.com/niikoo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="index.d.ts"/>
+/// <reference types="chrome"/>
 /// <reference types="filesystem"/>
 
 ////////////////////
 // App
 ////////////////////
 declare namespace chrome.app {
-	interface AppDetails extends chrome.runtime.Manifest {
-		id: string;
-	}
+    export interface AppDetails extends chrome.runtime.Manifest {
+        id: string;
+    }
 
-	export function getDetails(): AppDetails;
+    export function getDetails(): AppDetails;
 }
 
 ////////////////////
 // App Runtime
 ////////////////////
 declare namespace chrome.app.runtime {
+    enum LaunchSource {
+        "untracked" = "untracked",
+        "app_launcher" = "app_launcher",
+        "new_tab_page" = "new_tab_page",
+        "reload" = "reload",
+        "restart" = "restart",
+        "load_and_launch" = "load_and_launch",
+        "command_line" = "command_line",
+        "file_handler" = "file_handler",
+        "url_handler" = "url_handler",
+        "system_tray" = "system_tray",
+        "about_page" = "about_page",
+        "keyboard" = "keyboard",
+        "extensions_page" = "extensions_page",
+        "management_api" = "management_api",
+        "ephemeral_app" = "ephemeral_app",
+        "background" = "background",
+        "kiosk" = "kiosk",
+        "chrome_internal" = "chrome_internal",
+        "test" = "test",
+        "installed_notification" = "installed_notification",
+        "context_menu" = "context_menu",
+    }
+
     interface LaunchData {
         id?: string;
         items?: LaunchDataItem[];
         url?: string;
         referrerUrl?: string;
         isKioskSession?: boolean;
+        isPublicSession?: boolean;
+        source?: LaunchSource;
+        actionData?: {};
     }
 
-    interface LaunchDataItem {
+    export interface LaunchDataItem {
         entry: FileEntry;
         type: string;
     }
 
-    interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> {}
+    export interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
 
-    interface RestartedEvent extends chrome.events.Event<() => void> {}
+    export interface RestartedEvent extends chrome.events.Event<() => void> { }
 
-    var onLaunched: LaunchedEvent;
-    var onRestarted: RestartedEvent;
+    export var onLaunched: LaunchedEvent;
+    export var onRestarted: RestartedEvent;
 }
 
 ////////////////////
 // App Window
 ////////////////////
 declare namespace chrome.app.window {
-    interface ContentBounds {
+    export interface ContentBounds {
         left?: number;
         top?: number;
         width?: number;
         height?: number;
     }
 
-    interface BoundsSpecification {
+    export interface BoundsSpecification {
         left?: number;
         top?: number;
         width?: number;
@@ -64,7 +91,7 @@ declare namespace chrome.app.window {
         maxHeight?: number;
     }
 
-    interface Bounds {
+    export interface Bounds {
         left: number;
         top: number;
         width: number;
@@ -78,14 +105,14 @@ declare namespace chrome.app.window {
         setMinimumSize(minWidth: number, minHeight: number): void;
         setMaximumSize(maxWidth: number, maxHeight: number): void;
     }
-    interface FrameOptions {
+    export interface FrameOptions {
         type?: string;
         color?: string;
         activeColor?: string;
         inactiveColor?: string;
     }
 
-    interface CreateWindowOptions {
+    export interface CreateWindowOptions {
         id?: string;
         innerBounds?: BoundsSpecification;
         outerBounds?: BoundsSpecification;
@@ -93,10 +120,20 @@ declare namespace chrome.app.window {
         minHeight?: number;
         maxWidth?: number;
         maxHeight?: number;
-        frame?: any; // string ("none", "chrome") or FrameOptions
+        /**
+         * @description
+         * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
+         * @memberof CreateWindowOptions
+         */
+        frame?: string | FrameOptions;
         bounds?: ContentBounds;
         alphaEnabled?: boolean;
-        state?: string; // "normal", "fullscreen", "maximized", "minimized"
+        /**
+         * @description
+         * @type {string} "normal", "fullscreen", "maximized", "minimized"
+         * @memberof CreateWindowOptions
+         */
+        state?: string;
         hidden?: boolean;
         resizable?: boolean;
         singleton?: boolean;
@@ -105,7 +142,7 @@ declare namespace chrome.app.window {
         visibleOnAllWorkspaces?: boolean;
     }
 
-    interface AppWindow {
+    export interface AppWindow {
         focus: () => void;
         fullscreen: () => void;
         isFullscreen: () => boolean;
@@ -144,14 +181,14 @@ declare namespace chrome.app.window {
     export function getAll(): AppWindow[];
     export function canSetVisibleOnAllWorkspaces(): boolean;
 
-    interface WindowEvent extends chrome.events.Event<() => void> {}
+    export interface WindowEvent extends chrome.events.Event<() => void> { }
 
-    var onBoundsChanged: WindowEvent;
-    var onClosed: WindowEvent;
-    var onFullscreened: WindowEvent;
-    var onMaximized: WindowEvent;
-    var onMinimized: WindowEvent;
-    var onRestored: WindowEvent;
+    export var onBoundsChanged: WindowEvent;
+    export var onClosed: WindowEvent;
+    export var onFullscreened: WindowEvent;
+    export var onMaximized: WindowEvent;
+    export var onMinimized: WindowEvent;
+    export var onRestored: WindowEvent;
 }
 
 ////////////////////
@@ -159,13 +196,13 @@ declare namespace chrome.app.window {
 ////////////////////
 declare namespace chrome.fileSystem {
 
-    interface AcceptOptions {
+    export interface AcceptOptions {
         description?: string;
         mimeTypes?: string[];
         extensions?: string[];
     }
 
-    interface ChooseEntryOptions {
+    export interface ChooseEntryOptions {
         type?: string;
         suggestedName?: string;
         accepts?: AcceptOptions[];
@@ -189,11 +226,11 @@ declare namespace chrome.fileSystem {
 // Media Galleries
 ////////////////////
 declare namespace chrome.mediaGalleries {
-    interface MediaFileSystemsOptions {
+    export interface MediaFileSystemsOptions {
         interactive?: 'no' | 'yes' | 'if_needed';
     }
 
-    interface MediaFileSystemMetadata {
+    export interface MediaFileSystemMetadata {
         name: string;
         galleryId: string;
         deviceId?: string;
@@ -202,16 +239,16 @@ declare namespace chrome.mediaGalleries {
         isAvailable: boolean;
     }
 
-    interface MetadataOptions {
+    export interface MetadataOptions {
         metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
     }
 
-    interface RawTag {
+    export interface RawTag {
         type: string;
         tags: { [name: string]: string; };
     }
 
-    interface Metadata {
+    export interface Metadata {
         // The browser sniffed mime type.
         mimeType: string;
         // Defined for images and video. In pixels.
@@ -248,17 +285,17 @@ declare namespace chrome.mediaGalleries {
         attachedImages: Blob[];
     }
 
-    interface GalleryWatchResult {
+    export interface GalleryWatchResult {
         galleryId: string;
         success: boolean;
     }
 
-    interface GalleryChangedEventArgs {
+    export interface GalleryChangedEventArgs {
         type: 'contents_changed' | 'watch_dropped';
         galleryId: string;
     }
 
-    interface ScanProgressEventArgs {
+    export interface ScanProgressEventArgs {
         // The type of progress event, i.e. start, finish, etc.
         type: 'start' | 'cancel' | 'finish' | 'error';
         // The number of Galleries found.
@@ -285,40 +322,40 @@ declare namespace chrome.mediaGalleries {
     export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
     export function removeAllGalleryWatch(): void;
 
-    var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
-    var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
+    export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
+    export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
 }
 
 ////////////////////
 // Sockets
 ////////////////////
 declare namespace chrome.sockets.tcp {
-    interface CreateInfo {
+    export interface CreateInfo {
         socketId: number;
     }
 
-    interface SendInfo {
+    export interface SendInfo {
         resultCode: number;
         bytesSent?: number;
     }
 
-    interface ReceiveEventArgs {
+    export interface ReceiveEventArgs {
         socketId: number;
         data: ArrayBuffer;
     }
 
-    interface ReceiveErrorEventArgs {
+    export interface ReceiveErrorEventArgs {
         socketId: number;
         resultCode: number;
     }
 
-    interface SocketProperties {
+    export interface SocketProperties {
         persistent?: boolean;
         name?: string;
         bufferSize?: number;
     }
 
-    interface SocketInfo {
+    export interface SocketInfo {
         socketId: number;
         persistent: boolean;
         name?: string;
@@ -351,8 +388,8 @@ declare namespace chrome.sockets.tcp {
     export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
     export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
-    var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
-    var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
 /**
@@ -364,23 +401,23 @@ declare namespace chrome.sockets.tcp {
  * @see https://developer.chrome.com/apps/sockets_udp
  */
 declare namespace chrome.sockets.udp {
-    interface CreateInfo {
+    export interface CreateInfo {
         socketId: number;
     }
 
-    interface SendInfo {
+    export interface SendInfo {
         resultCode: number;
         bytesSent?: number;
     }
 
-    interface ReceiveEventArgs {
+    export interface ReceiveEventArgs {
         socketId: number;
         data: ArrayBuffer;
         remoteAddress: string;
         remotePort: number;
     }
 
-    interface ReceiveErrorEventArgs {
+    export interface ReceiveErrorEventArgs {
         socketId: number;
         resultCode: number;
     }
@@ -388,7 +425,7 @@ declare namespace chrome.sockets.udp {
     /**
      * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
      */
-    interface SocketProperties {
+    export interface SocketProperties {
         /**
          * Flag indicating if the socket is left open when the event page of the
          * application is unloaded. The default value is "false." When the
@@ -412,7 +449,7 @@ declare namespace chrome.sockets.udp {
     /**
      * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
      */
-    interface SocketInfo {
+    export interface SocketInfo {
         /** The socket identifier. */
         socketId: number;
 
@@ -636,7 +673,7 @@ declare namespace chrome.sockets.udp {
      *
      * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
      */
-    var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
 
     /**
      * Event raised when a network error occured while the runtime was waiting
@@ -646,7 +683,7 @@ declare namespace chrome.sockets.udp {
      *
      * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
      */
-    var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
 /**
@@ -658,16 +695,16 @@ declare namespace chrome.sockets.udp {
  * @see https://developer.chrome.com/apps/sockets_tcpServer
  */
 declare namespace chrome.sockets.tcpServer {
-    interface CreateInfo {
+    export interface CreateInfo {
         socketId: number;
     }
 
-    interface AcceptEventArgs {
+    export interface AcceptEventArgs {
         socketId: number;
         clientSocketId: number;
     }
 
-    interface AcceptErrorEventArgs {
+    export interface AcceptErrorEventArgs {
         socketId: number;
         resultCode: number;
     }
@@ -675,7 +712,7 @@ declare namespace chrome.sockets.tcpServer {
     /**
      * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
      */
-    interface SocketProperties {
+    export interface SocketProperties {
         /**
          * Flag indicating if the socket remains open when the event page of the
          * application is unloaded. The default value is "false." When the
@@ -693,7 +730,7 @@ declare namespace chrome.sockets.tcpServer {
     /**
      * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
      */
-    interface SocketInfo {
+    export interface SocketInfo {
         /** The socket identifier. */
         socketId: number;
 
@@ -836,7 +873,7 @@ declare namespace chrome.sockets.tcpServer {
      *
      * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
      */
-    var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
+    export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
 
     /**
      * Event raised when a network error occured while the runtime was waiting
@@ -846,7 +883,7 @@ declare namespace chrome.sockets.tcpServer {
      *
      * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
      */
-    var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
+    export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
 }
 
 ////////////////////
@@ -858,7 +895,7 @@ declare namespace chrome.sockets.tcpServer {
  * @since Chrome 30.
  */
 declare namespace chrome.system.display {
-    interface Bounds {
+    export interface Bounds {
         /**  The x-coordinate of the upper-left corner. */
         left: number;
         /**  The y-coordinate of the upper-left corner. */
@@ -869,7 +906,7 @@ declare namespace chrome.system.display {
         height: number;
     }
 
-    interface Insets {
+    export interface Insets {
         /** The x-axis distance from the left bound. */
         left: number;
         /** The y-axis distance from the top bound. */
@@ -880,7 +917,141 @@ declare namespace chrome.system.display {
         bottom: number;
     }
 
-    interface DisplayInfo {
+    /**
+     * @since Chrome 57
+     */
+    export interface Point {
+        /** The x-coordinate of the point. */
+        x: number;
+        /** The y-coordinate of the point. */
+        y: number;
+    }
+
+    /**
+     * @since Chrome 57
+     */
+    export interface TouchCalibrationPair {
+        /**	The coordinates of the display point. */
+        displayPoint: Point;
+        /** The coordinates of the touch point corresponding to the display point. */
+        touchPoint: Point;
+    }
+
+    /**
+     * @since Chrome 52
+     */
+    export interface DisplayMode {
+        /** The display mode width in device independent (user visible) pixels. */
+        width: number;
+
+        /** The display mode height in device independent (user visible) pixels. */
+        height: number;
+
+        /** The display mode width in native pixels. */
+        widthInNativePixels: number;
+
+        /** The display mode height in native pixels. */
+        heightInNativePixels: number;
+
+        /** The display mode UI scale factor. */
+        uiScale: number;
+
+        /** The display mode device scale factor. */
+        deviceScaleFactor: number;
+
+        /** True if the mode is the display's native mode. */
+        isNative: boolean;
+
+        /** True if the display mode is currently selected. */
+        isSelected: boolean;
+    }
+
+    /**
+     * @since Chrome 53
+     */
+    export interface DisplayLayout {
+        /** The unique identifier of the display. */
+        id: string;
+        /** The unique identifier of the parent display. Empty if this is the root. */
+        parentId: string;
+        /** The layout position of this display relative to the parent. This will be ignored for the root. */
+        position: 'top' | 'right' | 'bottom' | 'left';
+        /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
+        offset: number;
+    }
+
+    /**
+     * @description The pairs of point used to calibrate the display.
+     * @export
+     * @interface TouchCalibrationPairs
+     */
+    export interface TouchCalibrationPairs {
+        /** First pair of touch and display point required for touch calibration. */
+        pair1: TouchCalibrationPair,
+        /** Second pair of touch and display point required for touch calibration. */
+        pair2: TouchCalibrationPair,
+        /** Third pair of touch and display point required for touch calibration. */
+        pair3: TouchCalibrationPair,
+        /** Fourth pair of touch and display point required for touch calibration. */
+        pair4: TouchCalibrationPair
+    }
+
+    /**
+     * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
+     * @export
+     * @interface DisplayPropertiesInfo
+     */
+    export interface DisplayPropertiesInfo {
+        /**
+         * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
+         * @since Chrome 59
+         * */
+        isUnified?: boolean;
+
+        /**
+         * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
+         */
+        mirroringSourceId?: string;
+
+        /** If set to true, makes the display primary. No-op if set to false. */
+        isPrimary?: boolean;
+
+        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+        overscan?: Insets;
+
+        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+        rotation?: 0 | 90 | 180 | 270;
+
+        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+        boundsOriginX?: number;
+
+        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+        boundsOriginY: number;
+
+        /**
+         * @since Chrome 52
+         * @description If set, updates the display mode to the mode matching this value.
+         */
+        displayMode?: DisplayMode;
+    }
+
+    /**
+     * @description Options affecting how the information is returned.
+     * @since Chrome 59
+     * @export
+     * @interface DisplayInfoFlags
+     */
+    export interface DisplayInfoFlags {
+        /**
+         * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
+         * @type {boolean}
+         * @memberof DisplayInfoFlags
+         */
+        singleUnified?: boolean;
+    }
+
+    /** Information about display properties. */
+    export interface DisplayInfo {
         /** The unique identifier of the display. */
         id: string;
         /** The user-friendly name (e.g. "HP LCD monitor"). */
@@ -908,7 +1079,7 @@ declare namespace chrome.system.display {
     }
 
     /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
-    interface DisplayProps {
+    export interface DisplayProps {
         /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
         mirroringSourceId?: string;
         /** If set to true, makes the display primary. No-op if set to false. */
@@ -923,14 +1094,131 @@ declare namespace chrome.system.display {
         boundsOriginY?: number;
     }
 
-    interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
+    /**
+     * @description Fired when anything changes to the display configuration.
+     * @export
+     * @interface DisplayChangedEvent
+     * @extends {chrome.events.Event<() => void>}
+     */
+    export interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
 
-    /** Queries basic CPU information of the system. */
+    /**
+     * @description Requests the information for all attached display devices.
+     * @export
+     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+     */
     export function getInfo(callback: (info: DisplayInfo[]) => void): void;
+    /**
+     * @description Requests the information for all attached display devices.
+     * @export
+     * @since Chrome 59
+     * @param {DisplayInfoFlags} [flags] Options affecting how the information is returned.
+     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+     */
+    export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
 
-    /** Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. */
-    export function setDisplayProperties(id: string, info: DisplayInfo, callback?: () => void): void;
+    /**
+     * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @since Chrome 53
+     * @export
+     * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
+     */
+    export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
 
+    /**
+     * @description Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @export
+     * @param {string} id The display's unique identifier.
+     * @param {DisplayPropertiesInfo} info The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|.
+     * @param {() => void} [callback] Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+     */
+    export function setDisplayProperties(id: string, info: DisplayPropertiesInfo, callback?: () => void): void;
+
+    /**
+     * @description Set the layout for all displays. Any display not included will use the default layout. If a layout would overlap or be otherwise invalid it will be adjusted to a valid layout. After layout is resolved, an onDisplayChanged event will be triggered. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @since Chrome 53
+     * @export
+     * @param {DisplayLayout[]} layouts The layout information, required for all displays except the primary display.
+     * @param {() => void} callback Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+     */
+    export function setDisplayLayout(layouts: DisplayLayout[], callback?: () => void): void;
+
+    /**
+     * @description Enables/disables the unified desktop feature. Note that this simply enables the feature, but will not change the actual desktop mode. (That is, if the desktop is in mirror mode, it will stay in mirror mode) NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @since Chrome 46
+     * @export
+     * @param {boolean} enabled True if unified desktop should be enabled.
+     */
+    export function enableUnifiedDesktop(enabled: boolean): void;
+    /**
+     * @description Starts overscan calibration for a display. This will show an overlay on the screen indicating the current overscan insets. If overscan calibration for display |id| is in progress this will reset calibration.
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function overscanCalibrationStart(id: string): void;
+    /**
+     * @description Adjusts the current overscan insets for a display. Typically this should etiher move the display along an axis (e.g. left+right have the same value) or scale it along an axis (e.g. top+bottom have opposite values). Each Adjust call is cumulative with previous calls since Start.
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     * @param {Insets} delta The amount to change the overscan insets.
+     */
+    export function overscanCalibrationAdjust(id: string, delta: Insets): void;
+
+    /**
+     * @description Resets the overscan insets for a display to the last saved value (i.e before Start was called).
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function overscanCalibrationReset(id: string): void;
+
+    /**
+     * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function overscanCalibrationComplete(id: string): void;
+
+    /**
+     * @description Displays the native touch calibration UX for the display with |id| as display id. This will show an overlay on the screen with required instructions on how to proceed. The callback will be invoked in case of successful calibraion only. If the calibration fails, this will throw an error.
+     * @since Chrome 57
+     * @export
+     * @param {string} id The display's unique identifier.
+     * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
+     */
+    export function showNativeTouchCalibration(id: string, callback: (success) => void): void;
+
+    /**
+     * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.
+     * @since Chrome 57
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function startCustomTouchCalibration(id: string): void;
+
+    /**
+     * @description Sets the touch calibration pairs for a display. These |pairs| would be used to calibrate the touch screen for display with |id| called in startCustomTouchCalibration(). Always call |startCustomTouchCalibration| before calling this method. If another touch calibration is already in progress this will throw an error.
+     * @since Chrome 57
+     * @export
+     * @param {TouchCalibrationPairs} pairs The pairs of point used to calibrate the display.
+     * @param {Bounds} bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
+     */
+    export function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
+    /**
+     * @description Resets the touch calibration for the display and brings it back to its default state by clearing any touch calibration data associated with the display.
+     * @since Chrome 57
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function clearTouchCalibration(id: string): void;
+
+    /**
+     * @description Fired when anything changes to the display configuration.
+     * @export
+     */
     export var onDisplayChanged: DisplayChangedEvent;
 }
 
@@ -938,7 +1226,7 @@ declare namespace chrome.system.display {
 // System - Network
 ////////////////////
 declare namespace chrome.system.network {
-    interface NetworkInterface {
+    export interface NetworkInterface {
         name: string;
         address: string;
         prefixLength: number;
@@ -948,159 +1236,268 @@ declare namespace chrome.system.network {
 }
 
 declare namespace chrome.runtime {
-	interface Manifest {
-		app?: {
-			background?: {
-				scripts?: string[];
-			}
-		},
-		bluetooth?: {
-			uuids?: string[];
-			socket?: boolean;
-			low_energy?: boolean;
-			peripheral?: boolean;
-		},
-		file_handlers?: {
-			[name: string]: {
-				types?: string[];
-				extensions?: string[];
-				title?: string;
-			}
-		},
-		kiosk_enabled?: boolean,
-		kiosk_only?: boolean,
-		url_handlers?: {
-			[name: string]: {
-				matches: string[];
-				title?: string;
-			}
-		},
-		usb_printers?: {
-			filters: {
-				vendorId?: number;
-				productId?: number;
-				interfaceClass?: number;
-				interfaceSubclass?: number;
-				interfaceProtocol?: number;
-			}[]
-		},
-		webview?: {
-			partitions?: {
-				name: string;
-				accessible_resources: string[];
-			}[]
-		}
-	}
+    export interface Manifest {
+        app?: {
+            background?: {
+                scripts?: string[];
+            }
+        },
+        bluetooth?: {
+            uuids?: string[];
+            socket?: boolean;
+            low_energy?: boolean;
+            peripheral?: boolean;
+        },
+        file_handlers?: {
+            [name: string]: {
+                types?: string[];
+                extensions?: string[];
+                title?: string;
+            }
+        },
+        kiosk_enabled?: boolean,
+        kiosk_only?: boolean,
+        url_handlers?: {
+            [name: string]: {
+                matches: string[];
+                title?: string;
+            }
+        },
+        usb_printers?: {
+            filters: {
+                vendorId?: number;
+                productId?: number;
+                interfaceClass?: number;
+                interfaceSubclass?: number;
+                interfaceProtocol?: number;
+            }[]
+        },
+        webview?: {
+            partitions?: {
+                name: string;
+                accessible_resources: string[];
+            }[]
+        }
+    }
 }
 
 ////////////////////
 // USB
 ////////////////////
 declare namespace chrome.usb {
-	type Direction = 'in' | 'out';
+    type Direction = 'in' | 'out';
 
-	interface Device {
-		device: number,
-		vendorId: number,
-		productId: number,
-		productName: string,
-		manufacturerName: string,
-		serialNumber: string
-	}
+    export interface Device {
+        device: number,
+        vendorId: number,
+        productId: number,
+        productName: string,
+        manufacturerName: string,
+        serialNumber: string
+    }
 
-	interface ConnectionHandle {
-		handle: number,
-		vendorId: number,
-		productId: number
-	}
+    export interface ConnectionHandle {
+        handle: number,
+        vendorId: number,
+        productId: number
+    }
 
-	interface EndpointDescriptor {
-		address: number,
-		type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
-		direction: Direction,
-		maximumPacketSize: number,
-		synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
-		usage?: 'data' | 'feedback' | 'explicitFeedback',
-		pollingInterval?: number,
-		extra_data: ArrayBuffer
-	}
+    export interface EndpointDescriptor {
+        address: number,
+        type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
+        direction: Direction,
+        maximumPacketSize: number,
+        synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
+        usage?: 'data' | 'feedback' | 'explicitFeedback',
+        pollingInterval?: number,
+        extra_data: ArrayBuffer
+    }
 
-	interface InterfaceDescriptor {
-		interfaceNumber: number,
-		alternateSetting: number,
-		interfaceClass: number,
-		interfaceSubclass: number,
-		interfaceProtocol: number,
-		description?: string,
-		endpoints: EndpointDescriptor[],
-		extra_data: ArrayBuffer
-	}
+    export interface InterfaceDescriptor {
+        interfaceNumber: number,
+        alternateSetting: number,
+        interfaceClass: number,
+        interfaceSubclass: number,
+        interfaceProtocol: number,
+        description?: string,
+        endpoints: EndpointDescriptor[],
+        extra_data: ArrayBuffer
+    }
 
-	interface ConfigDescriptor {
-		active: boolean,
-		configurationValue: number,
-		description?: string,
-		selfPowered: boolean,
-		remoteWakeup: boolean,
-		maxPower: number,
-		interfaces: InterfaceDescriptor[],
-		extra_data: ArrayBuffer
-	}
+    export interface ConfigDescriptor {
+        active: boolean,
+        configurationValue: number,
+        description?: string,
+        selfPowered: boolean,
+        remoteWakeup: boolean,
+        maxPower: number,
+        interfaces: InterfaceDescriptor[],
+        extra_data: ArrayBuffer
+    }
 
-	interface GenericTransferInfo {
-		direction: Direction,
-		endpoint: number,
-		length?: number,
-		data?: ArrayBuffer,
-		timeout?: number
-	}
+    export interface GenericTransferInfo {
+        direction: Direction,
+        endpoint: number,
+        length?: number,
+        data?: ArrayBuffer,
+        timeout?: number
+    }
 
-	interface TransferResultInfo {
-		resultCode: number,
-		data?: ArrayBuffer
-	}
+    export interface TransferResultInfo {
+        resultCode: number,
+        data?: ArrayBuffer
+    }
 
-	interface DeviceFilter {
-		vendorId?: number,
-		productId?: number,
-		interfaceClass?: number,
-		interfaceSubclass?: number,
-		interfaceProtocol?: number
-	}
+    export interface DeviceFilter {
+        vendorId?: number,
+        productId?: number,
+        interfaceClass?: number,
+        interfaceSubclass?: number,
+        interfaceProtocol?: number
+    }
 
-	interface TransferInfo {
-		direction: Direction;
-		recipient: 'device' | 'interface' | 'endpoint' | 'other';
-		requestType: 'standard' | 'class' | 'vendor' | 'reserved';
-		request: number;
-		value: number;
-		index: number;
-		length?: number;
-		data?: ArrayBuffer;
-		timeout?: number;
-	}
+    export interface TransferInfo {
+        direction: Direction;
+        recipient: 'device' | 'interface' | 'endpoint' | 'other';
+        requestType: 'standard' | 'class' | 'vendor' | 'reserved';
+        request: number;
+        value: number;
+        index: number;
+        length?: number;
+        data?: ArrayBuffer;
+        timeout?: number;
+    }
 
-	interface DeviceEvent extends chrome.events.Event<(device: Device) => void> {}
+    export interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
 
-	export var onDeviceAdded: DeviceEvent;
-	export var onDeviceRemoved: DeviceEvent;
+    export var onDeviceAdded: DeviceEvent;
+    export var onDeviceRemoved: DeviceEvent;
 
-	export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-	export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-	export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
-	export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
-	export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
-	export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
-	export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
-	export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
-	export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
-	export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
-	export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-	export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-	export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
-	export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
-	export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-	export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-	export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
-	export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
+    export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+    export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+    export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
+    export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
+    export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
+    export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
+    export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
+    export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
+    export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
+    export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
+    export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+    export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+    export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
+    export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
+    export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+    export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+    export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
+    export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
+}
+
+declare namespace chrome.networking.onc {
+    export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
+    export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
+    export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
+    export type IPConfigType = 'DHCP' | 'Static';
+    export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
+    export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
+    export interface ManagedBoolean {
+        /**
+         * @description The active value currently used by the network configuration manager (e.g. Shill).
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        Active?: boolean,
+        /**
+         * @description The source from which the effective property value was determined.
+         * @type {string}
+         * @memberof ManagedBoolean
+         */
+        Effective?: string,
+        /**
+         * @description The property value provided by the user policy.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserPolicy?: boolean,
+        /**
+         * @description The property value provided by the device policy.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        DevicePolicy?: boolean,
+        /**
+         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserSettings?: boolean,
+        /**
+         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        SharedSettings?: boolean,
+        /**
+         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserEditable?: boolean,
+        /**
+         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        DeviceEditable?: boolean
+    }
+    export interface ManagedLong {
+        /**
+         * @description The active value currently used by the network configuration manager (e.g. Shill).
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        Active?: number,
+        /**
+         * @description The source from which the effective property value was determined.
+         * @type {string}
+         * @memberof ManagedLong
+         */
+        Effective?: string,
+        /**
+         * @description The property value provided by the user policy.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        UserPolicy?: number,
+        /**
+         * @description The property value provided by the device policy.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        DevicePolicy?: number,
+        /**
+         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        UserSettings?: number,
+        /**
+         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        SharedSettings?: number,
+        /**
+         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedLong
+         */
+        UserEditable?: boolean,
+        /**
+         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedLong
+         */
+        DeviceEditable?: boolean
+    }
 }
diff --git a/types/chrome/chrome-cast.d.ts b/types/chrome/chrome-cast.d.ts
index 081d3de1bf..5c240ff25c 100644
--- a/types/chrome/chrome-cast.d.ts
+++ b/types/chrome/chrome-cast.d.ts
@@ -12,7 +12,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.AutoJoinPolicy
      */
-    interface AutoJoinPolicy {
+    export interface AutoJoinPolicy {
         TAB_AND_ORIGIN_SCOPED: string;
         ORIGIN_SCOPED: string;
         PAGE_SCOPED: string;
@@ -22,7 +22,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.DefaultActionPolicy
      */
-    interface DefaultActionPolicy {
+    export interface DefaultActionPolicy {
         CREATE_SESSION: string;
         CAST_THIS_TAB: string;
     }
@@ -31,7 +31,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.Capability
      */
-    interface Capability {
+    export interface Capability {
         VIDEO_OUT: string;
         AUDIO_OUT: string;
         VIDEO_IN: string;
@@ -42,7 +42,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ErrorCode
      */
-    interface ErrorCode {
+    export interface ErrorCode {
         CANCEL: string;
         TIMEOUT: string;
         API_NOT_INITIALIZED: string;
@@ -59,7 +59,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverAvailability
      */
-    interface ReceiverAvailability {
+    export interface ReceiverAvailability {
         AVAILABLE: string;
         UNAVAILABLE: string;
     }
@@ -68,7 +68,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SenderPlatform
      */
-    interface SenderPlatform {
+    export interface SenderPlatform {
         CHROME: string;
         IOS: string;
         ANDROID: string;
@@ -78,7 +78,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverType
      */
-    interface ReceiverType {
+    export interface ReceiverType {
         CAST: string;
         HANGOUT: string;
         CUSTOM: string;
@@ -88,7 +88,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverAction
      */
-    interface ReceiverAction {
+    export interface ReceiverAction {
         CAST: string;
         STOP: string;
     }
@@ -99,7 +99,7 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SessionStatus
      */
-    interface SessionStatus {
+    export interface SessionStatus {
         CONNECTED: string;
         DISCONNECTED: string;
         STOPPED: string;
@@ -109,13 +109,13 @@ declare namespace chrome.cast {
      * @const {!Array<number>}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.VERSION
      */
-    var VERSION: Array<number>;
+    export var VERSION: Array<number>;
 
     /**
      * @type {boolean}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.isAvailable
      */
-    var isAvailable: boolean;
+    export var isAvailable: boolean;
 
     /**
      * @param {!chrome.cast.ApiConfig} apiConfig
@@ -191,7 +191,7 @@ declare namespace chrome.cast {
         errorCallback: (error: chrome.cast.Error) => void
     ): void
 
-    interface ApiConfig {
+    export interface ApiConfig {
         /**
          * @param {!chrome.cast.SessionRequest} sessionRequest
          * @param {function(!chrome.cast.Session)} sessionListener
@@ -217,7 +217,7 @@ declare namespace chrome.cast {
         defaultActionPolicy: chrome.cast.DefaultActionPolicy;
     }
 
-    interface Error {
+    export interface Error {
         /**
          * @param {!chrome.cast.ErrorCode} code
          * @param {string=} opt_description
@@ -237,7 +237,7 @@ declare namespace chrome.cast {
 
     }
 
-    interface Image {
+    export interface Image {
         /**
          * @param {string} url
          * @constructor
@@ -252,7 +252,7 @@ declare namespace chrome.cast {
         width?: number;
     }
 
-    interface SenderApplication {
+    export interface SenderApplication {
         /**
          * @param {!chrome.cast.SenderPlatform} platform
          * @constructor
@@ -267,7 +267,7 @@ declare namespace chrome.cast {
         packageId?: string;
     }
 
-    interface SessionRequest {
+    export interface SessionRequest {
         /**
          * @param {string} appId
          * @param {!Array<chrome.cast.Capability>=} opt_capabilities
@@ -287,7 +287,7 @@ declare namespace chrome.cast {
         language?: string;
     }
 
-    interface Session {
+    export interface Session {
         /**
          * @param {string} sessionId
          * @param {string} appId
@@ -437,7 +437,7 @@ declare namespace chrome.cast {
         ):void
     }
 
-    interface Receiver {
+    export interface Receiver {
         /**
          * @param {string} label
          * @param {string} friendlyName
@@ -461,7 +461,7 @@ declare namespace chrome.cast {
         displayStatus: chrome.cast.ReceiverDisplayStatus;
     }
 
-    interface ReceiverDisplayStatus {
+    export interface ReceiverDisplayStatus {
         /**
          * @param {string} statusText
          * @param {!Array<chrome.cast.Image>} appImages
@@ -477,7 +477,7 @@ declare namespace chrome.cast {
         appImages: Array<chrome.cast.Image>;
     }
 
-    interface Volume {
+    export interface Volume {
         /**
          * @param {?number=} opt_level
          * @param {?boolean=} opt_muted
@@ -496,13 +496,13 @@ declare namespace chrome.cast {
 
 declare namespace chrome.cast.media {
 
-    var DEFAULT_MEDIA_RECEIVER_APP_ID: string;
+    export var DEFAULT_MEDIA_RECEIVER_APP_ID: string;
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MediaCommand
      */
-    interface MediaCommand {
+    export interface MediaCommand {
         PAUSE: string;
         SEEK: string;
         STREAM_VOLUME: string;
@@ -513,7 +513,7 @@ declare namespace chrome.cast.media {
      * @enum {number}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MetadataType
      */
-    interface MetadataType {
+    export interface MetadataType {
         GENERIC: number;
         TV_SHOW: number;
         MOVIE: number;
@@ -525,7 +525,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PlayerState
      */
-    interface PlayerState {
+    export interface PlayerState {
         IDLE: string;
         PLAYING: string;
         PAUSED: string;
@@ -536,7 +536,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.ResumeState
      */
-    interface ResumeState {
+    export interface ResumeState {
         PLAYBACK_START: string;
         PLAYBACK_PAUSE: string;
     }
@@ -545,7 +545,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.StreamType
      */
-    interface StreamType {
+    export interface StreamType {
         BUFFERED: string;
         LIVE: string;
         OTHER: string;
@@ -555,7 +555,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.IdleReason
      */
-    interface IdleReason {
+    export interface IdleReason {
         CANCELLED: string;
         INTERRUPTED: string;
         FINISHED: string;
@@ -566,14 +566,14 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.RepeatMode
      */
-    interface RepeatMode {
+    export interface RepeatMode {
         OFF:string;
         ALL:string;
         SINGLE:string;
         ALL_AND_SHUFFLE:string;
     }
 
-    interface QueueItem {
+    export interface QueueItem {
         /**
          * @param {!chrome.cast.media.MediaInfo} mediaInfo
          * @constructor
@@ -592,7 +592,7 @@ declare namespace chrome.cast.media {
         startTime: number;
     }
 
-    interface QueueLoadRequest {
+    export interface QueueLoadRequest {
         /**
          * @param {!Array<chrome.cast.media.QueueItem>} items
          * @constructor
@@ -608,7 +608,7 @@ declare namespace chrome.cast.media {
         startIndex: number;
     }
 
-    interface QueueInsertItemsRequest {
+    export interface QueueInsertItemsRequest {
         /**
          * @param {!Array<chrome.cast.media.QueueItem>}
          * @constructor
@@ -623,7 +623,7 @@ declare namespace chrome.cast.media {
         items: Array<chrome.cast.media.QueueItem>;
     }
 
-    interface QueueRemoveItemsRequest {
+    export interface QueueRemoveItemsRequest {
         /**
          * @param {!Array<number>}
          * @constructor
@@ -637,7 +637,7 @@ declare namespace chrome.cast.media {
         itemIds: Array<number>;
     }
 
-    interface QueueReorderItemsRequest {
+    export interface QueueReorderItemsRequest {
         /**
          * @param {!Array<number>}
          * @constructor
@@ -652,7 +652,7 @@ declare namespace chrome.cast.media {
         itemIds: Array<number>;
     }
 
-    interface QueueUpdateItemsRequest {
+    export interface QueueUpdateItemsRequest {
         /**
          * @param {!Array<chrome.cast.media.QueueItem>}
          * @constructor
@@ -670,7 +670,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TrackType
      */
-    interface TrackType {
+    export interface TrackType {
         TEXT: string;
         AUDIO: string;
         VIDEO: string;
@@ -680,7 +680,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackType
      */
-    interface TextTrackType {
+    export interface TextTrackType {
         SUBTITLES: string;
         CAPTIONS: string;
         DESCRIPTIONS: string;
@@ -692,7 +692,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackEdgeType
      */
-    interface TextTrackEdgeType {
+    export interface TextTrackEdgeType {
         NONE: string;
         OUTLINE: string;
         DROP_SHADOW: string;
@@ -704,7 +704,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackWindowType
      */
-    interface TextTrackWindowType {
+    export interface TextTrackWindowType {
         NONE: string;
         NORMAL: string;
         ROUNDED_CORNERS: string;
@@ -714,7 +714,7 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackFontGenericFamily
      */
-    interface TextTrackFontGenericFamily {
+    export interface TextTrackFontGenericFamily {
         SANS_SERIF: string;
         MONOSPACED_SANS_SERIF: string;
         SERIF: string;
@@ -728,14 +728,14 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackFontStyle
      */
-    interface TextTrackFontStyle {
+    export interface TextTrackFontStyle {
         NORMAL: string;
         BOLD: string;
         BOLD_ITALIC: string;
         ITALIC: string;
     }
 
-    interface GetStatusRequest {
+    export interface GetStatusRequest {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.GetStatusRequest
@@ -745,7 +745,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface PauseRequest {
+    export interface PauseRequest {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PauseRequest
@@ -755,7 +755,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface PlayRequest {
+    export interface PlayRequest {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PlayRequest
@@ -765,7 +765,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface SeekRequest {
+    export interface SeekRequest {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.SeekRequest
@@ -777,7 +777,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface StopRequest {
+    export interface StopRequest {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.StopRequest
@@ -787,7 +787,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface VolumeRequest {
+    export interface VolumeRequest {
         /**
          * @param {!chrome.cast.Volume} volume
          * @constructor
@@ -801,7 +801,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface LoadRequest {
+    export interface LoadRequest {
         /**
          * @param {!chrome.cast.media.MediaInfo} mediaInfo
          * @constructor
@@ -818,7 +818,7 @@ declare namespace chrome.cast.media {
         media: chrome.cast.media.MediaInfo;
     }
 
-    interface EditTracksInfoRequest {
+    export interface EditTracksInfoRequest {
         /**
          * @param {Array<number>=} opt_activeTrackIds
          * @param {chrome.cast.media.TextTrackStyle=} opt_textTrackStyle
@@ -834,7 +834,7 @@ declare namespace chrome.cast.media {
         textTrackStyle: chrome.cast.media.TextTrackStyle;
     }
 
-    interface GenericMediaMetadata {
+    export interface GenericMediaMetadata {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.GenericMediaMetadata
@@ -852,7 +852,7 @@ declare namespace chrome.cast.media {
         type: chrome.cast.media.MetadataType;
     }
 
-    interface MovieMediaMetadata {
+    export interface MovieMediaMetadata {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MovieMediaMetadata
@@ -871,7 +871,7 @@ declare namespace chrome.cast.media {
         type: chrome.cast.media.MetadataType;
     }
 
-    interface TvShowMediaMetadata {
+    export interface TvShowMediaMetadata {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TvShowMediaMetadata
@@ -898,7 +898,7 @@ declare namespace chrome.cast.media {
         releaseYear: number;
     }
 
-    interface MusicTrackMediaMetadata  {
+    export interface MusicTrackMediaMetadata  {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MusicTrackMediaMetadata
@@ -925,7 +925,7 @@ declare namespace chrome.cast.media {
         releaseYear: number;
     }
 
-    interface PhotoMediaMetadata {
+    export interface PhotoMediaMetadata {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PhotoMediaMetadata
@@ -947,7 +947,7 @@ declare namespace chrome.cast.media {
         type: chrome.cast.media.MetadataType;
     }
 
-    interface MediaInfo {
+    export interface MediaInfo {
         /**
          * @param {string} contentId
          * @param {string} contentType
@@ -969,7 +969,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface Media {
+    export interface Media {
         /**
          * @param {string} sessionId
          * @param {number} mediaSessionId
@@ -1215,7 +1215,7 @@ declare namespace chrome.cast.media {
 
     }
 
-    interface Track {
+    export interface Track {
         /**
          * @param {number} trackId
          * @param {!chrome.cast.media.TrackType} trackType
@@ -1237,7 +1237,7 @@ declare namespace chrome.cast.media {
         customData: Object;
     }
 
-    interface TextTrackStyle {
+    export interface TextTrackStyle {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackStyle
@@ -1264,17 +1264,17 @@ declare namespace chrome.cast.media {
  * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.timeout
  */
 declare namespace chrome.cast.media.timeout {
-    var load: number;
-    var getStatus: number;
-    var play: number;
-    var pause: number;
-    var seek: number;
-    var stop: number;
-    var setVolume: number;
-    var editTracksInfo: number;
-    var queueInsert: number;
-    var queueLoad: number;
-    var queueRemove: number;
-    var queueReorder: number;
-    var queueUpdate: number;
+    export var load: number;
+    export var getStatus: number;
+    export var play: number;
+    export var pause: number;
+    export var seek: number;
+    export var stop: number;
+    export var setVolume: number;
+    export var editTracksInfo: number;
+    export var queueInsert: number;
+    export var queueLoad: number;
+    export var queueRemove: number;
+    export var queueReorder: number;
+    export var queueUpdate: number;
 }
diff --git a/types/chrome/chrome-webview.d.ts b/types/chrome/chrome-webview.d.ts
new file mode 100644
index 0000000000..e2e0b7c429
--- /dev/null
+++ b/types/chrome/chrome-webview.d.ts
@@ -0,0 +1,109 @@
+/// <reference path="chrome-app.d.ts" />
+
+// Project: http://developer.chrome.com/apps/
+// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+//
+// WebView ref: https://chromium.googlesource.com/chromium/src/+/64.0.3274.2/chrome/common/extensions/api/webview_tag.json
+//
+
+
+///////////////////
+// <webview> Tag
+///////////////////
+/**
+ * Use the <code>webview</code> tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
+ */
+declare namespace chrome.webviewTag {
+    /** Options that determine what data should be cleared by `clearData`. */
+    export interface ClearDataOptions {
+        /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
+        since: number;
+    }
+    export interface WindowEvent extends chrome.events.Event<() => void> {}
+
+    export interface ConsoleEvent extends Event {
+        /**
+         * @description The severity level of the log message. Ranges from 0 to 4.
+         * @type {number}
+         * @memberof ConsoleEvent
+         */
+        level: number,
+        /**
+         * @description The logged message contents.
+         * @type {string}
+         * @memberof ConsoleEvent
+         */
+        message: string,
+        /**
+         * @description The line number of the message source.
+         * @type {number}
+         * @memberof ConsoleEvent
+         */
+        line: number,
+        /**
+         * @description A string identifying the resource which logged the message.
+         * @type {string}
+         * @memberof ConsoleEvent
+         */
+        sourceId: string
+    }
+
+    /** Description of a declarative rule for handling events. */
+    export interface Rule {
+        /** Optional priority of this rule. Defaults to 100.  */
+        priority?: number;
+        /** List of conditions that can trigger the actions. */
+        conditions: any[];
+        /** Optional. Optional identifier that allows referencing this rule.  */
+        id?: string;
+        /** List of actions that are triggered if one of the condtions is fulfilled. */
+        actions: any[];
+        /**
+         * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
+         * @since Chrome 28
+         * @type {string[]}
+         * @memberof Rule
+         */
+        tags?: string[];
+    }
+
+    /**
+     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+     * @export
+     * @interface InjectDetails
+     */
+    export interface InjectDetails {
+        /**
+         * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        code?: string,
+        /**
+         * @description JavaScript or CSS file to inject.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        file?: string
+    }
+
+    export interface WebViewElementEventMap extends ElementEventMap {
+        'message': ConsoleEvent
+    }
+
+    /**
+     * @description
+     * @export
+     * @interface HTMLWebViewElement
+     * @extends {Element}
+     */
+    export interface HTMLWebViewElement extends Element {
+        executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void,
+        src: string,
+        contentWindow: Window
+        addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
+        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    }
+}
diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index 5104ab7ca1..3d85d3be14 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://developer.chrome.com/extensions/
 // Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>, RReverser <https://github.com/rreverser>, sreimer15 <https://github.com/sreimer15>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="filesystem" />
 
@@ -23,12 +23,12 @@ interface Window {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.accessibilityFeatures {
-    interface AccessibilityFeaturesGetArg {
+    export interface AccessibilityFeaturesGetArg {
         /** Optional. Whether to return the value that applies to the incognito session (default false).  */
         incognito?: boolean;
     }
 
-    interface AccessibilityFeaturesCallbackArg {
+    export interface AccessibilityFeaturesCallbackArg {
         /** The value of the setting. */
         value: any;
         /**
@@ -43,7 +43,7 @@ declare namespace chrome.accessibilityFeatures {
         incognitoSpecific?: boolean;
     }
 
-    interface AccessibilityFeaturesSetArg {
+    export interface AccessibilityFeaturesSetArg {
         /**
          * The value of the setting.
          * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
@@ -60,7 +60,7 @@ declare namespace chrome.accessibilityFeatures {
         scope?: string;
     }
 
-    interface AccessibilityFeaturesClearArg {
+    export interface AccessibilityFeaturesClearArg {
         /**
          * Optional.
           * The scope of the ChromeSetting. One of
@@ -72,7 +72,7 @@ declare namespace chrome.accessibilityFeatures {
         scope?: string;
     }
 
-    interface AccessibilityFeaturesSetting {
+    export interface AccessibilityFeaturesSetting {
         /**
          * Gets the value of a setting.
          * @param details Which setting to consider.
@@ -98,14 +98,14 @@ declare namespace chrome.accessibilityFeatures {
         clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
     }
 
-    var spokenFeedback: AccessibilityFeaturesSetting;
-    var largeCursor: AccessibilityFeaturesSetting;
-    var stickyKeys: AccessibilityFeaturesSetting;
-    var highContrast: AccessibilityFeaturesSetting;
-    var screenMagnifier: AccessibilityFeaturesSetting;
-    var autoclick: AccessibilityFeaturesSetting;
-    var virtualKeyboard: AccessibilityFeaturesSetting;
-    var animationPolicy: AccessibilityFeaturesSetting;
+    export var spokenFeedback: AccessibilityFeaturesSetting;
+    export var largeCursor: AccessibilityFeaturesSetting;
+    export var stickyKeys: AccessibilityFeaturesSetting;
+    export var highContrast: AccessibilityFeaturesSetting;
+    export var screenMagnifier: AccessibilityFeaturesSetting;
+    export var autoclick: AccessibilityFeaturesSetting;
+    export var virtualKeyboard: AccessibilityFeaturesSetting;
+    export var animationPolicy: AccessibilityFeaturesSetting;
 }
 
 ////////////////////
@@ -117,7 +117,7 @@ declare namespace chrome.accessibilityFeatures {
  * Permissions:  "alarms"
  */
 declare namespace chrome.alarms {
-    interface AlarmCreateInfo {
+    export interface AlarmCreateInfo {
         /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
         delayInMinutes?: number;
         /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
@@ -126,7 +126,7 @@ declare namespace chrome.alarms {
         when?: number;
     }
 
-    interface Alarm {
+    export interface Alarm {
         /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
         periodInMinutes?: number;
         /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
@@ -135,7 +135,7 @@ declare namespace chrome.alarms {
         name: string;
     }
 
-    interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> {}
+    export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> {}
 
     /**
      * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
@@ -192,15 +192,16 @@ declare namespace chrome.alarms {
     export function get(name: string, callback: (alarm: Alarm) => void): void;
 
     /** Fired when an alarm has elapsed. Useful for event pages. */
-    var onAlarm: AlarmEvent;
+    export var onAlarm: AlarmEvent;
 }
 
+
 /**
  * Use the chrome.browser API to interact with the Chrome browser associated with
  * the current application and Chrome profile.
  */
 declare namespace chrome.browser {
-    interface Options {
+    export interface Options {
         /** The URL to navigate to when the new tab is initially opened. */
         url: string;
     }
@@ -234,7 +235,7 @@ declare namespace chrome.browser {
  */
 declare namespace chrome.bookmarks {
     /** A node (either a bookmark or a folder) in the bookmark tree. Child nodes are ordered within their parent folder. */
-    interface BookmarkTreeNode {
+    export interface BookmarkTreeNode {
         /** Optional. The 0-based position of this node within its parent folder.  */
         index?: number;
         /** Optional. When this node was created, in milliseconds since the epoch (new Date(dateAdded)).  */
@@ -259,48 +260,48 @@ declare namespace chrome.bookmarks {
         unmodifiable?: any;
     }
 
-    interface BookmarkRemoveInfo {
+    export interface BookmarkRemoveInfo {
         index: number;
         parentId: string;
     }
 
-    interface BookmarkMoveInfo {
+    export interface BookmarkMoveInfo {
         index: number;
         oldIndex: number;
         parentId: string;
         oldParentId: string;
     }
 
-    interface BookmarkChangeInfo {
+    export interface BookmarkChangeInfo {
         url?: string;
         title: string;
     }
 
-    interface BookmarkReorderInfo {
+    export interface BookmarkReorderInfo {
         childIds: string[];
     }
 
-    interface BookmarkRemovedEvent extends chrome.events.Event<(id: string, removeInfo: BookmarkRemoveInfo) => void> {}
+    export interface BookmarkRemovedEvent extends chrome.events.Event<(id: string, removeInfo: BookmarkRemoveInfo) => void> {}
 
-    interface BookmarkImportEndedEvent extends chrome.events.Event<() => void> {}
+    export interface BookmarkImportEndedEvent extends chrome.events.Event<() => void> {}
 
-    interface BookmarkMovedEvent extends chrome.events.Event<(id: string, moveInfo: BookmarkMoveInfo) => void> {}
+    export interface BookmarkMovedEvent extends chrome.events.Event<(id: string, moveInfo: BookmarkMoveInfo) => void> {}
 
-    interface BookmarkImportBeganEvent extends chrome.events.Event<() => void> {}
+    export interface BookmarkImportBeganEvent extends chrome.events.Event<() => void> {}
 
-    interface BookmarkChangedEvent extends chrome.events.Event<(id: string, changeInfo: BookmarkChangeInfo) => void> {}
+    export interface BookmarkChangedEvent extends chrome.events.Event<(id: string, changeInfo: BookmarkChangeInfo) => void> {}
 
-    interface BookmarkCreatedEvent extends chrome.events.Event<(id: string, bookmark: BookmarkTreeNode) => void> {}
+    export interface BookmarkCreatedEvent extends chrome.events.Event<(id: string, bookmark: BookmarkTreeNode) => void> {}
 
-    interface BookmarkChildrenReordered extends chrome.events.Event<(id: string, reorderInfo: BookmarkReorderInfo) => void> {}
+    export interface BookmarkChildrenReordered extends chrome.events.Event<(id: string, reorderInfo: BookmarkReorderInfo) => void> {}
 
-    interface BookmarkSearchQuery {
+    export interface BookmarkSearchQuery {
         query?: string;
         url?: string;
         title?: string;
     }
 
-    interface BookmarkCreateArg {
+    export interface BookmarkCreateArg {
         /** Optional. Defaults to the Other Bookmarks folder.  */
         parentId?: string;
         index?: number;
@@ -308,20 +309,20 @@ declare namespace chrome.bookmarks {
         url?: string;
     }
 
-    interface BookmarkDestinationArg {
+    export interface BookmarkDestinationArg {
         parentId?: string;
         index?: number;
     }
 
-    interface BookmarkChangesArg {
+    export interface BookmarkChangesArg {
         title?: string;
         url?: string;
     }
 
     /** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
-    var MAX_WRITE_OPERATIONS_PER_HOUR: number;
+    export var MAX_WRITE_OPERATIONS_PER_HOUR: number;
     /** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
-    var MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+    export var MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
 
     /**
      * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
@@ -410,19 +411,19 @@ declare namespace chrome.bookmarks {
     export function removeTree(id: string, callback?: Function): void;
 
     /** Fired when a bookmark or folder is removed. When a folder is removed recursively, a single notification is fired for the folder, and none for its contents. */
-    var onRemoved: BookmarkRemovedEvent;
+    export var onRemoved: BookmarkRemovedEvent;
     /** Fired when a bookmark import session is ended. */
-    var onImportEnded: BookmarkImportEndedEvent;
+    export var onImportEnded: BookmarkImportEndedEvent;
     /** Fired when a bookmark import session is begun. Expensive observers should ignore onCreated updates until onImportEnded is fired. Observers should still handle other notifications immediately. */
-    var onImportBegan: BookmarkImportBeganEvent;
+    export var onImportBegan: BookmarkImportBeganEvent;
     /** Fired when a bookmark or folder changes. Note: Currently, only title and url changes trigger this. */
-    var onChanged: BookmarkChangedEvent;
+    export var onChanged: BookmarkChangedEvent;
     /** Fired when a bookmark or folder is moved to a different parent folder. */
-    var onMoved: BookmarkMovedEvent;
+    export var onMoved: BookmarkMovedEvent;
     /** Fired when a bookmark or folder is created. */
-    var onCreated: BookmarkCreatedEvent;
+    export var onCreated: BookmarkCreatedEvent;
     /** Fired when the children of a folder have changed their order due to the order being sorted in the UI. This is not called as a result of a move(). */
-    var onChildrenReordered: BookmarkChildrenReordered;
+    export var onChildrenReordered: BookmarkChildrenReordered;
 }
 
 ////////////////////
@@ -434,51 +435,51 @@ declare namespace chrome.bookmarks {
  * Manifest:  "browser_action": {...}
  */
 declare namespace chrome.browserAction {
-    interface BadgeBackgroundColorDetails {
+    export interface BadgeBackgroundColorDetails {
         /** An array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is [255, 0, 0, 255]. Can also be a string with a CSS value, with opaque red being #FF0000 or #F00. */
         color: string | ColorArray;
         /** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
         tabId?: number;
     }
 
-    interface BadgeTextDetails {
+    export interface BadgeTextDetails {
         /** Any number of characters can be passed, but only about four can fit in the space. */
         text: string;
         /** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
         tabId?: number;
     }
 
-    type ColorArray = [number, number, number, number];
+    export type ColorArray = [number, number, number, number];
 
-    interface TitleDetails {
+    export interface TitleDetails {
         /** The string the browser action should display when moused over. */
         title: string;
         /** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
         tabId?: number;
     }
 
-    interface TabDetails {
+    export interface TabDetails {
         /** Optional. Specify the tab to get the information. If no tab is specified, the non-tab-specific information is returned.  */
         tabId?: number;
     }
 
-    interface TabIconDetails {
+    export interface TabIconDetails {
         /** Optional. Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'  */
         path?: any;
         /** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
         tabId?: number;
         /** Optional. Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'  */
-        imageData?: ImageData;
+        imageData?: ImageData | { [index: number]: ImageData };
     }
 
-    interface PopupDetails {
+    export interface PopupDetails {
         /** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
         tabId?: number;
         /** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
         popup: string;
     }
 
-    interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+    export interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
 
     /**
      * Since Chrome 22.
@@ -536,7 +537,7 @@ declare namespace chrome.browserAction {
     export function setIcon(details: TabIconDetails, callback?: Function): void;
 
     /** Fired when a browser action icon is clicked. This event will not fire if the browser action has a popup. */
-    var onClicked: BrowserClickedEvent;
+    export var onClicked: BrowserClickedEvent;
 }
 
 ////////////////////
@@ -548,7 +549,7 @@ declare namespace chrome.browserAction {
  * Permissions:  "browsingData"
  */
 declare namespace chrome.browsingData {
-    interface OriginTypes {
+    export interface OriginTypes {
         /** Optional. Websites that have been installed as hosted applications (be careful!).  */
         protectedWeb?: boolean;
         /** Optional. Extensions and packaged applications a user has installed (be _really_ careful!).  */
@@ -558,7 +559,7 @@ declare namespace chrome.browsingData {
     }
 
     /** Options that determine exactly what data will be removed. */
-    interface RemovalOptions {
+    export interface RemovalOptions {
         /**
          * Optional.
           * Since Chrome 21.
@@ -573,7 +574,7 @@ declare namespace chrome.browsingData {
      * Since Chrome 27.
      * A set of data types. Missing data types are interpreted as false.
      */
-    interface DataTypeSet {
+    export interface DataTypeSet {
         /** Optional. Websites' WebSQL data.  */
         webSQL?: boolean;
         /** Optional. Websites' IndexedDB data.  */
@@ -608,7 +609,7 @@ declare namespace chrome.browsingData {
         serviceWorkers?: boolean;
     }
 
-    interface SettingsCallback {
+    export interface SettingsCallback {
         options: RemovalOptions;
         /** All of the types will be present in the result, with values of true if they are both selected to be removed and permitted to be removed, otherwise false. */
         dataToRemove: DataTypeSet;
@@ -726,7 +727,7 @@ declare namespace chrome.browsingData {
  * Manifest:  "commands": {...}
  */
 declare namespace chrome.commands {
-    interface Command {
+    export interface Command {
         /** Optional. The name of the Extension Command  */
         name?: string;
         /** Optional. The Extension Command description  */
@@ -735,7 +736,7 @@ declare namespace chrome.commands {
         shortcut?: string;
     }
 
-    interface CommandEvent extends chrome.events.Event<(command: string) => void> {}
+    export interface CommandEvent extends chrome.events.Event<(command: string) => void> {}
 
     /**
      * Returns all the registered extension commands for this extension and their shortcut (if active).
@@ -746,7 +747,7 @@ declare namespace chrome.commands {
     export function getAll(callback: (commands: Command[]) => void): void;
 
     /** Fired when a registered command is activated using a keyboard shortcut. */
-    var onCommand: CommandEvent;
+    export var onCommand: CommandEvent;
 }
 
 ////////////////////
@@ -758,7 +759,7 @@ declare namespace chrome.commands {
  * Permissions:  "contentSettings"
  */
 declare namespace chrome.contentSettings {
-    interface ClearDetails {
+    export interface ClearDetails {
         /**
          * Optional.
           * Where to clear the setting (default: regular).
@@ -769,7 +770,7 @@ declare namespace chrome.contentSettings {
         scope?: string;
     }
 
-    interface SetDetails {
+    export interface SetDetails {
         /** Optional. The resource identifier for the content type.  */
         resourceIdentifier?: ResourceIdentifier;
         /** The setting applied by this rule. See the description of the individual ContentSetting objects for the possible values. */
@@ -782,7 +783,7 @@ declare namespace chrome.contentSettings {
         primaryPattern: string;
     }
 
-    interface GetDetails {
+    export interface GetDetails {
         /** Optional. The secondary URL for which the content setting should be retrieved. Defaults to the primary URL. Note that the meaning of a secondary URL depends on the content type, and not all content types use secondary URLs.  */
         secondaryUrl?: string;
         /** Optional. A more specific identifier of the type of content for which the settings should be retrieved.  */
@@ -793,12 +794,12 @@ declare namespace chrome.contentSettings {
         primaryUrl: string;
     }
 
-    interface ReturnedDetails {
+    export interface ReturnedDetails {
         /** The content setting. See the description of the individual ContentSetting objects for the possible values. */
         setting: any;
     }
 
-    interface ContentSetting {
+    export interface ContentSetting {
         /**
          * Clear all content setting rules set by this extension.
          * @param callback If you specify the callback parameter, it should be a function that looks like this:
@@ -826,7 +827,7 @@ declare namespace chrome.contentSettings {
     }
 
     /** The only content type using resource identifiers is contentSettings.plugins. For more information, see Resource Identifiers. */
-    interface ResourceIdentifier {
+    export interface ResourceIdentifier {
         /** The resource identifier for the given content type. */
         id: string;
         /** Optional. A human readable description of the resource.  */
@@ -841,7 +842,7 @@ declare namespace chrome.contentSettings {
      * Default is allow.
      * The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.
      */
-    var cookies: ContentSetting;
+    export var cookies: ContentSetting;
     /**
      * Whether to allow sites to show pop-ups. One of
      * allow: Allow sites to show pop-ups,
@@ -849,7 +850,7 @@ declare namespace chrome.contentSettings {
      * Default is block.
      * The primary URL is the URL of the top-level frame. The secondary URL is not used.
      */
-    var popups: ContentSetting;
+    export var popups: ContentSetting;
     /**
      * Whether to run JavaScript. One of
      * allow: Run JavaScript,
@@ -857,7 +858,7 @@ declare namespace chrome.contentSettings {
      * Default is allow.
      * The primary URL is the URL of the top-level frame. The secondary URL is not used.
      */
-    var javascript: ContentSetting;
+    export var javascript: ContentSetting;
     /**
      * Whether to allow sites to show desktop notifications. One of
      * allow: Allow sites to show desktop notifications,
@@ -866,7 +867,7 @@ declare namespace chrome.contentSettings {
      * Default is ask.
      * The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used.
      */
-    var notifications: ContentSetting;
+    export var notifications: ContentSetting;
     /**
      * Whether to run plugins. One of
      * allow: Run plugins automatically,
@@ -875,7 +876,7 @@ declare namespace chrome.contentSettings {
      * Default is allow.
      * The primary URL is the URL of the top-level frame. The secondary URL is not used.
      */
-    var plugins: ContentSetting;
+    export var plugins: ContentSetting;
     /**
      * Whether to show images. One of
      * allow: Show images,
@@ -883,7 +884,7 @@ declare namespace chrome.contentSettings {
      * Default is allow.
      * The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image.
      */
-    var images: ContentSetting;
+    export var images: ContentSetting;
     /**
      * Since Chrome 42.
      * Whether to allow Geolocation. One of
@@ -893,7 +894,7 @@ declare namespace chrome.contentSettings {
      * Default is ask.
      * The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
      */
-    var location: ContentSetting;
+    export var location: ContentSetting;
     /**
      * Since Chrome 42.
      * Whether to allow sites to toggle the fullscreen mode. One of
@@ -902,7 +903,7 @@ declare namespace chrome.contentSettings {
      * Default is ask.
      * The primary URL is the URL of the document which requested to toggle the fullscreen mode. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
      */
-    var fullscreen: ContentSetting;
+    export var fullscreen: ContentSetting;
     /**
      * Since Chrome 42.
      * Whether to allow sites to disable the mouse cursor. One of
@@ -912,7 +913,7 @@ declare namespace chrome.contentSettings {
      * Default is ask.
      * The primary URL is the URL of the top-level frame. The secondary URL is not used.
      */
-    var mouselock: ContentSetting;
+    export var mouselock: ContentSetting;
     /**
      * Since Chrome 42.
      * Whether to allow sites to run plugins unsandboxed. One of
@@ -922,7 +923,7 @@ declare namespace chrome.contentSettings {
      * Default is ask.
      * The primary URL is the URL of the top-level frame. The secondary URL is not used.
      */
-    var unsandboxedPlugins: ContentSetting;
+    export var unsandboxedPlugins: ContentSetting;
     /**
      * Since Chrome 42.
      * Whether to allow sites to download multiple files automatically. One of
@@ -932,7 +933,7 @@ declare namespace chrome.contentSettings {
      * Default is ask.
      * The primary URL is the URL of the top-level frame. The secondary URL is not used.
      */
-    var automaticDownloads: ContentSetting;
+    export var automaticDownloads: ContentSetting;
 }
 
 ////////////////////
@@ -944,7 +945,7 @@ declare namespace chrome.contentSettings {
  * Permissions:  "contextMenus"
  */
 declare namespace chrome.contextMenus {
-    interface OnClickData {
+    export interface OnClickData {
         /**
          * Optional.
           * Since Chrome 35.
@@ -1010,7 +1011,7 @@ declare namespace chrome.contextMenus {
         srcUrl?: string;
     }
 
-    interface CreateProperties {
+    export interface CreateProperties {
         /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
         documentUrlPatterns?: string[];
         /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
@@ -1046,7 +1047,7 @@ declare namespace chrome.contextMenus {
         id?: string;
     }
 
-    interface UpdateProperties {
+    export interface UpdateProperties {
         documentUrlPatterns?: string[];
         checked?: boolean;
         title?: string;
@@ -1060,13 +1061,13 @@ declare namespace chrome.contextMenus {
         type?: string;
     }
 
-    interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> {}
+    export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> {}
 
     /**
      * Since Chrome 38.
      * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
      */
-    var ACTION_MENU_TOP_LEVEL_LIMIT: number;
+    export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
 
     /**
      * Removes all context menu items added by this extension.
@@ -1121,7 +1122,7 @@ declare namespace chrome.contextMenus {
      * Since Chrome 21.
      * Fired when a context menu item is clicked.
      */
-    var onClicked: MenuClickedEvent;
+    export var onClicked: MenuClickedEvent;
 }
 
 ////////////////////
@@ -1134,7 +1135,7 @@ declare namespace chrome.contextMenus {
  */
 declare namespace chrome.cookies {
     /** Represents information about an HTTP cookie. */
-    interface Cookie {
+    export interface Cookie {
         /** The domain of the cookie (e.g. "www.google.com", "example.com"). */
         domain: string;
         /** The name of the cookie. */
@@ -1158,14 +1159,14 @@ declare namespace chrome.cookies {
     }
 
     /** Represents a cookie store in the browser. An incognito mode window, for instance, uses a separate cookie store from a non-incognito window. */
-    interface CookieStore {
+    export interface CookieStore {
         /** The unique identifier for the cookie store. */
         id: string;
         /** Identifiers of all the browser tabs that share this cookie store. */
         tabIds: number[];
     }
 
-    interface GetAllDetails {
+    export interface GetAllDetails {
         /** Optional. Restricts the retrieved cookies to those whose domains match or are subdomains of this one.  */
         domain?: string;
         /** Optional. Filters the cookies by name.  */
@@ -1182,7 +1183,7 @@ declare namespace chrome.cookies {
         secure?: boolean;
     }
 
-    interface SetDetails {
+    export interface SetDetails {
         /** Optional. The domain of the cookie. If omitted, the cookie becomes a host-only cookie.  */
         domain?: string;
         /** Optional. The name of the cookie. Empty by default if omitted.  */
@@ -1203,13 +1204,13 @@ declare namespace chrome.cookies {
         secure?: boolean;
     }
 
-    interface Details {
+    export interface Details {
         name: string;
         url: string;
         storeId?: string;
     }
 
-    interface CookieChangeInfo {
+    export interface CookieChangeInfo {
         /** Information about the cookie that was set or removed. */
         cookie: Cookie;
         /** True if a cookie was removed. */
@@ -1221,7 +1222,7 @@ declare namespace chrome.cookies {
         cause: string;
     }
 
-    interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> {}
+    export interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> {}
 
     /**
      * Lists all existing cookie stores.
@@ -1263,7 +1264,7 @@ declare namespace chrome.cookies {
     export function get(details: Details, callback: (cookie: Cookie | null) => void): void;
 
     /** Fired when a cookie is set or removed. As a special case, note that updating a cookie's properties is implemented as a two step process: the cookie to be updated is first removed entirely, generating a notification with "cause" of "overwrite" . Afterwards, a new cookie is written with the updated values, generating a second notification with "cause" "explicit". */
-    var onChanged: CookieChangedEvent;
+    export var onChanged: CookieChangedEvent;
 }
 
 ////////////////////
@@ -1274,104 +1275,106 @@ declare namespace chrome.cookies {
  * Availability: Since Chrome 18.
  * Permissions:  "debugger"
  */
-// TODO: Uncomment when Microsoft/TypeScript#8312 is merged in
-// declare module chrome.debugger {
-//     /** Debuggee identifier. Either tabId or extensionId must be specified */
-//     interface Debuggee {
-//         /** Optional. The id of the tab which you intend to debug.  */
-//         tabId?: number;
-//         /**
-//          * Optional.
-//           * Since Chrome 27.
-//          * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser.
-//          */
-//         extensionId?: string;
-//         /**
-//          * Optional.
-//           * Since Chrome 28.
-//          * The opaque id of the debug target.
-//          */
-//         targetId?: string;
-//     }
-//
-//     /**
-//      * Since Chrome 28.
-//      * Debug target information
-//      */
-//     interface TargetInfo {
-//         /** Target type. */
-//         type: string;
-//         /** Target id. */
-//         id: string;
-//         /**
-//          * Optional.
-//           * Since Chrome 30.
-//          * The tab id, defined if type == 'page'.
-//          */
-//         tabId?: number;
-//         /**
-//          * Optional.
-//           * Since Chrome 30.
-//          * The extension id, defined if type = 'background_page'.
-//          */
-//         extensionId?: string;
-//         /** True if debugger is already attached. */
-//         attached: boolean;
-//         /** Target page title. */
-//         title: string;
-//         /** Target URL. */
-//         url: string;
-//         /** Optional. Target favicon URL.  */
-//         faviconUrl?: string;
-//     }
-//
-//     interface DebuggerDetachedEvent extends chrome.events.Event<(source: Debuggee, reason: string) => void> {}
-//
-//     interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> {}
-//
-//     /**
-//      * Attaches debugger to the given target.
-//      * @param target Debugging target to which you want to attach.
-//      * @param requiredVersion Required debugging protocol version ("0.1"). One can only attach to the debuggee with matching major version and greater or equal minor version. List of the protocol versions can be obtained in the documentation pages.
-//      * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message.
-//      * If you specify the callback parameter, it should be a function that looks like this:
-//      * function() {...};
-//      */
-//     export function attach(target: Debuggee, requiredVersion: string, callback?: () => void): void;
-//     /**
-//      * Detaches debugger from the given target.
-//      * @param target Debugging target from which you want to detach.
-//      * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message.
-//      * If you specify the callback parameter, it should be a function that looks like this:
-//      * function() {...};
-//      */
-//     export function detach(target: Debuggee, callback?: () => void): void;
-//     /**
-//      * Sends given command to the debugging target.
-//      * @param target Debugging target to which you want to send the command.
-//      * @param method Method name. Should be one of the methods defined by the remote debugging protocol.
-//      * @param commandParams Since Chrome 22.
-//      * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method.
-//      * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-//      * If you specify the callback parameter, it should be a function that looks like this:
-//      * function(object result) {...};
-//      */
-//     export function sendCommand(target: Debuggee, method: string, commandParams?: Object, callback?: (result?: Object) => void): void;
-//     /**
-//      * Since Chrome 28.
-//      * Returns the list of available debug targets.
-//      * @param callback The callback parameter should be a function that looks like this:
-//      * function(array of TargetInfo result) {...};
-//      * Parameter result: Array of TargetInfo objects corresponding to the available debug targets.
-//      */
-//     export function getTargets(callback: (result: TargetInfo[]) => void): void;
-//
-//     /** Fired when browser terminates debugging session for the tab. This happens when either the tab is being closed or Chrome DevTools is being invoked for the attached tab. */
-//     var onDetach: DebuggerDetachedEvent;
-//     /** Fired whenever debugging target issues instrumentation event. */
-//     var onEvent: DebuggerEventEvent;
-// }
+declare module chrome {
+    namespace _debugger {
+        /** Debuggee identifier. Either tabId or extensionId must be specified */
+        export interface Debuggee {
+            /** Optional. The id of the tab which you intend to debug.  */
+            tabId?: number;
+            /**
+             * Optional.
+             * Since Chrome 27.
+             * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser.
+             */
+            extensionId?: string;
+            /**
+             * Optional.
+             * Since Chrome 28.
+             * The opaque id of the debug target.
+             */
+            targetId?: string;
+        }
 
+        /**
+         * Since Chrome 28.
+         * Debug target information
+         */
+        export interface TargetInfo {
+            /** Target type. */
+            type: string;
+            /** Target id. */
+            id: string;
+            /**
+             * Optional.
+             * Since Chrome 30.
+             * The tab id, defined if type == 'page'.
+             */
+            tabId?: number;
+            /**
+             * Optional.
+             * Since Chrome 30.
+             * The extension id, defined if type = 'background_page'.
+             */
+            extensionId?: string;
+            /** True if debugger is already attached. */
+            attached: boolean;
+            /** Target page title. */
+            title: string;
+            /** Target URL. */
+            url: string;
+            /** Optional. Target favicon URL.  */
+            faviconUrl?: string;
+        }
+
+        export interface DebuggerDetachedEvent extends chrome.events.Event<(source: Debuggee, reason: string) => void> {}
+
+        export interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> {}
+
+        /**
+         * Attaches debugger to the given target.
+         * @param target Debugging target to which you want to attach.
+         * @param requiredVersion Required debugging protocol version ("0.1"). One can only attach to the debuggee with matching major version and greater or equal minor version. List of the protocol versions can be obtained in the documentation pages.
+         * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function attach(target: Debuggee, requiredVersion: string, callback?: () => void): void;
+        /**
+         * Detaches debugger from the given target.
+         * @param target Debugging target from which you want to detach.
+         * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function detach(target: Debuggee, callback?: () => void): void;
+        /**
+         * Sends given command to the debugging target.
+         * @param target Debugging target to which you want to send the command.
+         * @param method Method name. Should be one of the methods defined by the remote debugging protocol.
+         * @param commandParams Since Chrome 22.
+         * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method.
+         * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(object result) {...};
+         */
+        export function sendCommand(target: Debuggee, method: string, commandParams?: Object, callback?: (result?: Object) => void): void;
+        /**
+         * Since Chrome 28.
+         * Returns the list of available debug targets.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function(array of TargetInfo result) {...};
+         * Parameter result: Array of TargetInfo objects corresponding to the available debug targets.
+         */
+        export function getTargets(callback: (result: TargetInfo[]) => void): void;
+
+        /** Fired when browser terminates debugging session for the tab. This happens when either the tab is being closed or Chrome DevTools is being invoked for the attached tab. */
+        export var onDetach: DebuggerDetachedEvent;
+        /** Fired whenever debugging target issues instrumentation event. */
+        export var onEvent: DebuggerEventEvent;
+    }
+
+    export {_debugger as debugger}
+}
 ////////////////////
 // Declarative Content
 ////////////////////
@@ -1381,7 +1384,7 @@ declare namespace chrome.cookies {
  * Permissions:  "declarativeContent"
  */
 declare namespace chrome.declarativeContent {
-    interface PageStateUrlDetails {
+    export interface PageStateUrlDetails {
         /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
         hostContains?: string;
         /** Optional. Matches if the host name of the URL is equal to a specified string.  */
@@ -1424,8 +1427,7 @@ declare namespace chrome.declarativeContent {
         ports?: (number | number[])[];
     }
 
-    /** Matches the state of a web page by various criteria. */
-    interface PageStateMatcher {
+    export class PageStateMatcherProperties {
         /** Optional. Filters URLs for various criteria. See event filtering. All criteria are case sensitive.  */
         pageUrl?: PageStateUrlDetails;
         /** Optional. Matches if all of the CSS selectors in the array match displayed elements in a frame with the same origin as the page's main frame. All selectors in this array must be compound selectors to speed up matching. Note that listing hundreds of CSS selectors or CSS selectors that match hundreds of times per page can still slow down web sites.  */
@@ -1437,13 +1439,26 @@ declare namespace chrome.declarativeContent {
          */
         isBookmarked?: boolean;
     }
+
+    /** Matches the state of a web page by various criteria. */
+    export class PageStateMatcher {
+        constructor(options: PageStateMatcherProperties);
+    }
+
+    /** Declarative event action that shows the extension's page action while the corresponding conditions are met. */
+    export class ShowPageAction {}
+
+    /** Provides the Declarative Event API consisting of addRules, removeRules, and getRules. */
+    export interface PageChangedEvent extends chrome.events.Event<() => void> {}
+
+    export var onPageChanged: PageChangedEvent;
 }
 
 ////////////////////
 // Declarative Web Request
 ////////////////////
 declare namespace chrome.declarativeWebRequest {
-    interface HeaderFilter {
+    export interface HeaderFilter {
         nameEquals?: string;
         valueContains?: any;
         nameSuffix?: string;
@@ -1454,21 +1469,21 @@ declare namespace chrome.declarativeWebRequest {
         namePrefix?: string;
     }
 
-    interface AddResponseHeader {
+    export interface AddResponseHeader {
         name: string;
         value: string;
     }
 
-    interface RemoveResponseCookie {
+    export interface RemoveResponseCookie {
         filter: ResponseCookie;
     }
 
-    interface RemoveResponseHeader {
+    export interface RemoveResponseHeader {
         name: string;
         value?: string;
     }
 
-    interface RequestMatcher {
+    export interface RequestMatcher {
         contentType?: string[];
         url?: chrome.events.UrlFilter;
         excludeContentType?: string[];
@@ -1477,17 +1492,17 @@ declare namespace chrome.declarativeWebRequest {
         responseHeaders?: HeaderFilter[];
     }
 
-    interface IgnoreRules {
+    export interface IgnoreRules {
         lowerPriorityThan: number;
     }
 
-    interface RedirectToEmptyDocument { }
+    export interface RedirectToEmptyDocument { }
 
-    interface RedirectRequest {
+    export interface RedirectRequest {
         redirectUrl: string;
     }
 
-    interface ResponseCookie {
+    export interface ResponseCookie {
         domain?: string;
         name?: string;
         expires?: string;
@@ -1498,54 +1513,54 @@ declare namespace chrome.declarativeWebRequest {
         secure?: string;
     }
 
-    interface AddResponseCookie {
+    export interface AddResponseCookie {
         cookie: ResponseCookie;
     }
 
-    interface EditResponseCookie {
+    export interface EditResponseCookie {
         filter: ResponseCookie;
         modification: ResponseCookie;
     }
 
-    interface CancelRequest { }
+    export interface CancelRequest { }
 
-    interface RemoveRequestHeader {
+    export interface RemoveRequestHeader {
         name: string;
     }
 
-    interface EditRequestCookie {
+    export interface EditRequestCookie {
         filter: RequestCookie;
         modification: RequestCookie;
     }
 
-    interface SetRequestHeader {
+    export interface SetRequestHeader {
         name: string;
         value: string;
     }
 
-    interface RequestCookie {
+    export interface RequestCookie {
         name?: string;
         value?: string;
     }
 
-    interface RedirectByRegEx {
+    export interface RedirectByRegEx {
         to: string;
         from: string;
     }
 
-    interface RedirectToTransparentImage { }
+    export interface RedirectToTransparentImage { }
 
-    interface AddRequestCookie {
+    export interface AddRequestCookie {
         cookie: RequestCookie;
     }
 
-    interface RemoveRequestCookie {
+    export interface RemoveRequestCookie {
         filter: RequestCookie;
     }
 
-    interface RequestedEvent extends chrome.events.Event<Function> {}
+    export interface RequestedEvent extends chrome.events.Event<Function> {}
 
-    var onRequest: RequestedEvent;
+    export var onRequest: RequestedEvent;
 }
 
 ////////////////////
@@ -1590,7 +1605,7 @@ declare namespace chrome.desktopCapture {
  */
 declare namespace chrome.devtools.inspectedWindow {
     /** A resource within the inspected page, such as a document, a script, or an image. */
-    interface Resource {
+    export interface Resource {
         /** The URL of the resource. */
         url: string;
         /**
@@ -1614,7 +1629,7 @@ declare namespace chrome.devtools.inspectedWindow {
         setContent(content: string, commit: boolean, callback?: (error: Object) => void): void;
     }
 
-    interface ReloadOptions {
+    export interface ReloadOptions {
         /** Optional. If specified, the string will override the value of the User-Agent HTTP header that's sent while loading the resources of the inspected page. The string will also override the value of the navigator.userAgent property that's returned to any scripts that are running within the inspected page.  */
         userAgent?: string;
         /** Optional. When true, the loader will ignore the cache for all inspected page resources loaded before the load event is fired. The effect is similar to pressing Ctrl+Shift+R in the inspected window or within the Developer Tools window.  */
@@ -1629,7 +1644,7 @@ declare namespace chrome.devtools.inspectedWindow {
         preprocessorScript?: string;
     }
 
-    interface EvaluationExceptionInfo {
+    export interface EvaluationExceptionInfo {
         /** Set if the error occurred on the DevTools side before the expression is evaluated. */
         isError: boolean;
         /** Set if the error occurred on the DevTools side before the expression is evaluated. */
@@ -1644,12 +1659,12 @@ declare namespace chrome.devtools.inspectedWindow {
         value: string;
     }
 
-    interface ResourceAddedEvent extends chrome.events.Event<(resource: Resource) => void> {}
+    export interface ResourceAddedEvent extends chrome.events.Event<(resource: Resource) => void> {}
 
-    interface ResourceContentCommittedEvent extends chrome.events.Event<(resource: Resource, content: string) => void> {}
+    export interface ResourceContentCommittedEvent extends chrome.events.Event<(resource: Resource, content: string) => void> {}
 
     /** The ID of the tab being inspected. This ID may be used with chrome.tabs.* API. */
-    var tabId: number;
+    export var tabId: number;
 
     /** Reloads the inspected page. */
     export function reload(reloadOptions: ReloadOptions): void;
@@ -1662,7 +1677,7 @@ declare namespace chrome.devtools.inspectedWindow {
      * Parameter result: The result of evaluation.
      * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression.
      */
-    export function eval(expression: string, callback?: (result: Object, exceptionInfo: EvaluationExceptionInfo) => void): void;
+    export function eval<T>(expression: string, callback?: (result: T, exceptionInfo: EvaluationExceptionInfo) => void): void;
     /**
      * Retrieves the list of resources from the inspected page.
      * @param callback A function that receives the list of resources when the request completes.
@@ -1672,9 +1687,9 @@ declare namespace chrome.devtools.inspectedWindow {
     export function getResources(callback: (resources: Resource[]) => void): void;
 
     /** Fired when a new resource is added to the inspected page. */
-    var onResourceAdded: ResourceAddedEvent;
+    export var onResourceAdded: ResourceAddedEvent;
     /** Fired when a new revision of the resource is committed (e.g. user saves an edited version of the resource in the Developer Tools). */
-    var onResourceContentCommitted: ResourceContentCommittedEvent;
+    export var onResourceContentCommitted: ResourceContentCommittedEvent;
 }
 
 ////////////////////
@@ -1686,7 +1701,7 @@ declare namespace chrome.devtools.inspectedWindow {
  */
 declare namespace chrome.devtools.network {
     /** Represents a network request for a document resource (script, image and so on). See HAR Specification for reference. */
-    interface Request {
+    export interface Request {
         /**
          * Returns content of the response body.
          * @param callback A function that receives the response body when the request completes.
@@ -1698,9 +1713,9 @@ declare namespace chrome.devtools.network {
         getContent(callback: (content: string, encoding: string) => void): void;
     }
 
-    interface RequestFinishedEvent extends chrome.events.Event<(request: Request) => void> {}
+    export interface RequestFinishedEvent extends chrome.events.Event<(request: Request) => void> {}
 
-    interface NavigatedEvent extends chrome.events.Event<(url: string) => void> {}
+    export interface NavigatedEvent extends chrome.events.Event<(url: string) => void> {}
 
     /**
      * Returns HAR log that contains all known network requests.
@@ -1712,9 +1727,9 @@ declare namespace chrome.devtools.network {
     export function getHAR(callback: (harLog: Object) => void): void;
 
     /** Fired when a network request is finished and all request data are available. */
-    var onRequestFinished: RequestFinishedEvent;
+    export var onRequestFinished: RequestFinishedEvent;
     /** Fired when the inspected window navigates to a new page. */
-    var onNavigated: NavigatedEvent;
+    export var onNavigated: NavigatedEvent;
 }
 
 ////////////////////
@@ -1725,14 +1740,14 @@ declare namespace chrome.devtools.network {
  * Availability: Since Chrome 18.
  */
 declare namespace chrome.devtools.panels {
-    interface PanelShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
+    export interface PanelShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
 
-    interface PanelHiddenEvent extends chrome.events.Event<() => void> {}
+    export interface PanelHiddenEvent extends chrome.events.Event<() => void> {}
 
-    interface PanelSearchEvent extends chrome.events.Event<(action: string, queryString?: string) => void> {}
+    export interface PanelSearchEvent extends chrome.events.Event<(action: string, queryString?: string) => void> {}
 
     /** Represents a panel created by extension. */
-    interface ExtensionPanel {
+    export interface ExtensionPanel {
         /**
          * Appends a button to the status bar of the panel.
          * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two 32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the button is pressed.
@@ -1748,10 +1763,10 @@ declare namespace chrome.devtools.panels {
         onSearch: PanelSearchEvent;
     }
 
-    interface ButtonClickedEvent extends chrome.events.Event<() => void> {}
+    export interface ButtonClickedEvent extends chrome.events.Event<() => void> {}
 
     /** A button created by the extension. */
-    interface Button {
+    export interface Button {
         /**
          * Updates the attributes of the button. If some of the arguments are omitted or null, the corresponding attributes are not updated.
          * @param iconPath Path to the new icon of the button.
@@ -1763,10 +1778,10 @@ declare namespace chrome.devtools.panels {
         onClicked: ButtonClickedEvent;
     }
 
-    interface SelectionChangedEvent extends chrome.events.Event<() => void> {}
+    export interface SelectionChangedEvent extends chrome.events.Event<() => void> {}
 
     /** Represents the Elements panel. */
-    interface ElementsPanel {
+    export interface ElementsPanel {
         /**
          * Creates a pane within panel's sidebar.
          * @param title Text that is displayed in sidebar caption.
@@ -1784,7 +1799,7 @@ declare namespace chrome.devtools.panels {
      * Since Chrome 41.
      * Represents the Sources panel.
      */
-    interface SourcesPanel {
+    export interface SourcesPanel {
         /**
          * Creates a pane within panel's sidebar.
          * @param title Text that is displayed in sidebar caption.
@@ -1798,12 +1813,12 @@ declare namespace chrome.devtools.panels {
         onSelectionChanged: SelectionChangedEvent;
     }
 
-    interface ExtensionSidebarPaneShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
+    export interface ExtensionSidebarPaneShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
 
-    interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event<() => void> {}
+    export interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event<() => void> {}
 
     /** A sidebar created by the extension. */
-    interface ExtensionSidebarPane {
+    export interface ExtensionSidebarPane {
         /**
          * Sets the height of the sidebar.
          * @param height A CSS-like size specification, such as '100px' or '12ex'.
@@ -1855,12 +1870,12 @@ declare namespace chrome.devtools.panels {
     }
 
     /** Elements panel. */
-    var elements: ElementsPanel;
+    export var elements: ElementsPanel;
     /**
      * Since Chrome 38.
      * Sources panel.
      */
-    var sources: SourcesPanel;
+    export var sources: SourcesPanel;
 
     /**
      * Creates an extension panel.
@@ -1903,14 +1918,14 @@ declare namespace chrome.devtools.panels {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.documentScan {
-    interface DocumentScanOptions {
+    export interface DocumentScanOptions {
         /** Optional. The MIME types that are accepted by the caller.  */
         mimeTypes?: string[];
         /** Optional. The number of scanned images allowed (defaults to 1).  */
         maxImages?: number;
     }
 
-    interface DocumentScanCallbackArg {
+    export interface DocumentScanCallbackArg {
         /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
         dataUrls: string[];
         /** The MIME type of dataUrls. */
@@ -1936,14 +1951,14 @@ declare namespace chrome.documentScan {
  * Permissions:  "downloads"
  */
 declare namespace chrome.downloads {
-    interface HeaderNameValuePair {
+    export interface HeaderNameValuePair {
         /** Name of the HTTP header. */
         name: string;
         /** Value of the HTTP header. */
         value: string;
     }
 
-    interface DownloadOptions {
+    export interface DownloadOptions {
         /** Optional. Post body.  */
         body?: string;
         /** Optional. Use a file-chooser to allow the user to select a filename regardless of whether filename is set or already exists.  */
@@ -1960,7 +1975,7 @@ declare namespace chrome.downloads {
         conflictAction?: string;
     }
 
-    interface DownloadDelta {
+    export interface DownloadDelta {
         /** Optional. The change in danger, if any.  */
         danger?: StringDelta;
         /** Optional. The change in url, if any.  */
@@ -1991,23 +2006,23 @@ declare namespace chrome.downloads {
         exists?: BooleanDelta;
     }
 
-    interface BooleanDelta {
+    export interface BooleanDelta {
         current?: boolean;
         previous?: boolean;
     }
 
     /** Since Chrome 34. */
-    interface DoubleDelta {
+    export interface DoubleDelta {
         current?: number;
         previous?: number;
     }
 
-    interface StringDelta {
+    export interface StringDelta {
         current?: string;
         previous?: string;
     }
 
-    interface DownloadItem {
+    export interface DownloadItem {
         /** Number of bytes received so far from the host, without considering file compression. */
         bytesReceived: number;
         /** Indication of whether this download is thought to be safe or known to be suspicious. */
@@ -2050,13 +2065,13 @@ declare namespace chrome.downloads {
         byExtensionName?: string;
     }
 
-    interface GetFileIconOptions {
+    export interface GetFileIconOptions {
         /** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size.
  */
         size?: number;
     }
 
-    interface DownloadQuery {
+    export interface DownloadQuery {
         /** Optional. Set elements of this array to DownloadItem properties in order to sort search results. For example, setting orderBy=['startTime'] sorts the DownloadItem by their start time in ascending order. To specify descending order, prefix with a hyphen: '-startTime'.  */
         orderBy?: string[];
         /** Optional. Limits results to DownloadItem whose url matches the given regular expression.  */
@@ -2109,20 +2124,20 @@ declare namespace chrome.downloads {
         exists?: boolean;
     }
 
-    interface DownloadFilenameSuggestion {
+    export interface DownloadFilenameSuggestion {
         /** The DownloadItem's new target DownloadItem.filename, as a path relative to the user's default Downloads directory, possibly containing subdirectories. Absolute paths, empty paths, and paths containing back-references ".." will be ignored. */
         filename: string;
         /** Optional. The action to take if filename already exists.  */
         conflictAction?: string;
     }
 
-    interface DownloadChangedEvent extends chrome.events.Event<(downloadDelta: DownloadDelta) => void> {}
+    export interface DownloadChangedEvent extends chrome.events.Event<(downloadDelta: DownloadDelta) => void> {}
 
-    interface DownloadCreatedEvent extends chrome.events.Event<(downloadItem: DownloadItem) => void> {}
+    export interface DownloadCreatedEvent extends chrome.events.Event<(downloadItem: DownloadItem) => void> {}
 
-    interface DownloadErasedEvent extends chrome.events.Event<(downloadId: number) => void> {}
+    export interface DownloadErasedEvent extends chrome.events.Event<(downloadId: number) => void> {}
 
-    interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> {}
+    export interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> {}
 
     /**
      * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page.
@@ -2216,13 +2231,13 @@ declare namespace chrome.downloads {
     export function setShelfEnabled(enabled: boolean): void;
 
     /** When any of a DownloadItem's properties except bytesReceived and estimatedEndTime changes, this event fires with the downloadId and an object containing the properties that changed. */
-    var onChanged: DownloadChangedEvent;
+    export var onChanged: DownloadChangedEvent;
     /** This event fires with the DownloadItem object when a download begins. */
-    var onCreated: DownloadCreatedEvent;
+    export var onCreated: DownloadCreatedEvent;
     /** Fires with the downloadId when a download is erased from history. */
-    var onErased: DownloadErasedEvent;
+    export var onErased: DownloadErasedEvent;
     /** During the filename determination process, extensions will be given the opportunity to override the target DownloadItem.filename. Each extension may not register more than one listener for this event. Each listener must call suggest exactly once, either synchronously or asynchronously. If the listener calls suggest asynchronously, then it must return true. If the listener neither calls suggest synchronously nor returns true, then suggest will be called automatically. The DownloadItem will not complete until all listeners have called suggest. Listeners may call suggest without any arguments in order to allow the download to use downloadItem.filename for its filename, or pass a suggestion object to suggest in order to override the target filename. If more than one extension overrides the filename, then the last extension installed whose listener passes a suggestion object to suggest wins. In order to avoid confusion regarding which extension will win, users should not install extensions that may conflict. If the download is initiated by download and the target filename is known before the MIME type and tentative filename have been determined, pass filename to download instead. */
-    var onDeterminingFilename: DownloadDeterminingFilenameEvent;
+    export var onDeterminingFilename: DownloadDeterminingFilenameEvent;
 }
 
 ////////////////////
@@ -2236,7 +2251,7 @@ declare namespace chrome.downloads {
  * Note:  This API is only for extensions pre-installed by policy.
  */
 declare namespace chrome.enterprise.platformKeys {
-    interface Token {
+    export interface Token {
         /**
          * Uniquely identifies this Token.
          * Static IDs are "user" and "system", referring to the platform's user-specific and the system-wide hardware token, respectively. Any other tokens (with other identifiers) might be returned by enterprise.platformKeys.getTokens.
@@ -2287,6 +2302,27 @@ declare namespace chrome.enterprise.platformKeys {
     export function removeCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
 }
 
+////////////////////
+// Enterprise Device Attributes
+////////////////////
+/**
+ * Use the <code>chrome.enterprise.deviceAttributes</code> API to read device attributes.
+ * Permissions:  "enterprise.deviceAttributes"
+ * Since: Chrome 46
+ * Important: This API works only on Chrome OS.
+ * Note: This API is only for extensions pre-installed by policy.
+ */
+declare namespace chrome.enterprise.deviceAttributes {
+    /**
+     * @description Fetches the value of the device identifier of the directory API, that is generated by the server and identifies the cloud record of the device for querying in the cloud directory API.
+     * @export
+     * @param callback Called with the device identifier of the directory API when received.
+     * The callback parameter should be a function that looks like this:
+     * function(string deviceId) {...};
+     */
+    export function getDirectoryDeviceId(callback: (deviceId: string) => void): void;
+}
+
 ////////////////////
 // Events
 ////////////////////
@@ -2296,7 +2332,7 @@ declare namespace chrome.enterprise.platformKeys {
  */
 declare namespace chrome.events {
     /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
-    interface UrlFilter {
+    export interface UrlFilter {
         /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
         schemes?: string[];
         /**
@@ -2348,7 +2384,7 @@ declare namespace chrome.events {
     }
 
     /** An object which allows the addition and removal of listeners for a Chrome event. */
-    interface Event<T extends Function> {
+    export interface Event<T extends Function> {
         /**
          * Registers an event listener callback to an event.
          * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
@@ -2412,7 +2448,7 @@ declare namespace chrome.events {
     }
 
     /** Description of a declarative rule for handling events. */
-    interface Rule {
+    export interface Rule {
         /** Optional. Optional priority of this rule. Defaults to 100.  */
         priority?: number;
         /** List of conditions that can trigger the actions. */
@@ -2438,27 +2474,27 @@ declare namespace chrome.events {
  * Availability: Since Chrome 5.
  */
 declare namespace chrome.extension {
-    interface FetchProperties {
+    export interface FetchProperties {
         /** Optional. The window to restrict the search to. If omitted, returns all views.  */
         windowId?: number;
         /** Optional. The type of view to get. If omitted, returns all views (including background pages and tabs). Valid values: 'tab', 'notification', 'popup'.  */
         type?: string;
     }
 
-    interface LastError {
+    export interface LastError {
         /** Description of the error that has taken place. */
         message: string;
     }
 
-    interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> {}
+    export interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> {}
 
     /**
      * Since Chrome 7.
      * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito process. The latter only applies to extensions with 'split' incognito_behavior.
      */
-    var inIncognitoContext: boolean;
+    export var inIncognitoContext: boolean;
     /** Set for the lifetime of a callback if an ansychronous extension api has resulted in an error. If no error has occured lastError will be undefined. */
-    var lastError: LastError;
+    export var lastError: LastError;
 
     /** Returns the JavaScript 'window' object for the background page running inside the current extension. Returns null if the extension has no background page. */
     export function getBackgroundPage(): Window | null;
@@ -2517,12 +2553,12 @@ declare namespace chrome.extension {
      * Fired when a request is sent from either an extension process or a content script.
      * @deprecated Deprecated since Chrome 33. Please use runtime.onMessage.
      */
-    var onRequest: OnRequestEvent;
+    export var onRequest: OnRequestEvent;
     /**
      * Fired when a request is sent from another extension.
      * @deprecated Deprecated since Chrome 33. Please use runtime.onMessageExternal.
      */
-    var onRequestExternal: OnRequestEvent;
+    export var onRequestExternal: OnRequestEvent;
 }
 
 ////////////////////
@@ -2535,7 +2571,7 @@ declare namespace chrome.extension {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.fileBrowserHandler {
-    interface SelectionParams {
+    export interface SelectionParams {
         /**
          * Optional.
           * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png']
@@ -2546,7 +2582,7 @@ declare namespace chrome.fileBrowserHandler {
         suggestedName: string;
     }
 
-    interface SelectionResult {
+    export interface SelectionResult {
         /** Optional. Selected file entry. It will be null if a file hasn't been selected.  */
         entry?: Object | null;
         /** Whether the file has been selected. */
@@ -2554,14 +2590,14 @@ declare namespace chrome.fileBrowserHandler {
     }
 
     /** Event details payload for fileBrowserHandler.onExecute event. */
-    interface FileHandlerExecuteEventDetails {
+    export interface FileHandlerExecuteEventDetails {
         /** Optional. The ID of the tab that raised this event. Tab IDs are unique within a browser session.  */
         tab_id?: number;
         /** Array of Entry instances representing files that are targets of this action (selected in ChromeOS file browser). */
         entries: any[];
     }
 
-    interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> {}
+    export interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> {}
 
     /**
      * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture.
@@ -2575,7 +2611,7 @@ declare namespace chrome.fileBrowserHandler {
     export function selectFile(selectionParams: SelectionParams, callback: (result: SelectionResult) => void): void;
 
     /** Fired when file system action is executed from ChromeOS file browser. */
-    var onExecute: FileBrowserHandlerExecuteEvent;
+    export var onExecute: FileBrowserHandlerExecuteEvent;
 }
 
 ////////////////////
@@ -2588,7 +2624,7 @@ declare namespace chrome.fileBrowserHandler {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.fileSystemProvider {
-    interface OpenedFileInfo {
+    export interface OpenedFileInfo {
         /** A request ID to be be used by consecutive read/write and close requests. */
         openRequestId: number;
         /** The path of the opened file. */
@@ -2597,7 +2633,7 @@ declare namespace chrome.fileSystemProvider {
         mode: string;
     }
 
-    interface FileWatchersInfo {
+    export interface FileWatchersInfo {
         /** The path of the entry being observed. */
         entryPath: string;
         /** Whether watching should include all child entries recursively. It can be true for directories only. */
@@ -2606,7 +2642,7 @@ declare namespace chrome.fileSystemProvider {
         lastTag?: string;
     }
 
-    interface EntryMetadata {
+    export interface EntryMetadata {
         /** True if it is a directory. */
         isDirectory: boolean;
         /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
@@ -2621,7 +2657,7 @@ declare namespace chrome.fileSystemProvider {
         thumbnail?: string;
     }
 
-    interface FileSystemInfo {
+    export interface FileSystemInfo {
         /** The identifier of the file system. */
         fileSystemId: string;
         /** A human-readable name for the file system. */
@@ -2652,7 +2688,7 @@ declare namespace chrome.fileSystemProvider {
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    interface GetActionsRequestedOptions {
+    export interface GetActionsRequestedOptions {
         /** The identifier of the file system related to this operation. */
         fileSystemId: string;
         /** The unique identifier of this request. */
@@ -2662,7 +2698,7 @@ declare namespace chrome.fileSystemProvider {
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    interface Action {
+    export interface Action {
         /** The identifier of the action. Any string or CommonActionId for common actions. */
         id: string;
         /** Optional. The title of the action. It may be ignored for common actions.  */
@@ -2670,7 +2706,7 @@ declare namespace chrome.fileSystemProvider {
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    interface ExecuteActionRequestedOptions {
+    export interface ExecuteActionRequestedOptions {
         /** The identifier of the file system related to this operation. */
         fileSystemId: string;
         /** The unique identifier of this request. */
@@ -2681,7 +2717,7 @@ declare namespace chrome.fileSystemProvider {
         actionId: string;
     }
 
-    interface MountOptions {
+    export interface MountOptions {
         /** The string indentifier of the file system. Must be unique per each extension. */
         fileSystemId: string;
         /** A human-readable name for the file system. */
@@ -2702,19 +2738,19 @@ declare namespace chrome.fileSystemProvider {
         supportsNotifyTag?: boolean;
     }
 
-    interface UnmountOptions {
+    export interface UnmountOptions {
         /** The identifier of the file system to be unmounted. */
         fileSystemId: string;
     }
 
-    interface NotificationChange {
+    export interface NotificationChange {
         /** The path of the changed entry. */
         entryPath: string;
         /** The type of the change which happened to the entry. */
         changeType: string;
     }
 
-    interface NotificationOptions {
+    export interface NotificationOptions {
         /** The identifier of the file system related to this change. */
         fileSystemId: string;
         /** The path of the observed entry. */
@@ -2729,111 +2765,111 @@ declare namespace chrome.fileSystemProvider {
         tag?: string;
     }
 
-    interface RequestedEventOptions {
+    export interface RequestedEventOptions {
         /** The identifier of the file system related to this operation. */
         fileSystemId: string;
         /** The unique identifier of this request. */
         requestId: number;
     }
 
-    interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+    export interface EntryPathRequestedEventOptions extends RequestedEventOptions {
         /** The path of the entry to which this operation is related to. */
         entryPath: string;
     }
 
-    interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
+    export interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
         /** Set to true if the thumbnail is requested. */
         thumbnail: boolean;
     }
 
-    interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+    export interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
         /** The path of the directory which is to be operated on. */
         directoryPath: string;
     }
 
-    interface FilePathRequestedEventOptions extends RequestedEventOptions {
+    export interface FilePathRequestedEventOptions extends RequestedEventOptions {
         /** The path of the entry for the operation */
         filePath: string;
     }
 
-    interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
+    export interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
         /** Whether the file will be used for reading or writing. */
         mode: string;
     }
 
-    interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+    export interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
         /** A request ID used to open the file. */
         openRequestId: number;
     }
 
-    interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+    export interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
         /** Position in the file (in bytes) to start reading from. */
         offset: number;
         /** Number of bytes to be returned. */
         length: number;
     }
 
-    interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+    export interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
         /** Whether the operation is recursive (for directories only). */
         recursive: boolean;
     }
 
-    interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+    export interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
         /** Whether the operation is recursive (for directories only). */
         recursive: boolean;
     }
 
-    interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+    export interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
         /** The source path for the operation. */
         sourcePath: string;
         /** The destination path for the operation. */
         targetPath: string;
     }
 
-    interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
+    export interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
         /** Number of bytes to be retained after the operation completes. */
         length: number;
     }
 
-    interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+    export interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
         /** Position in the file (in bytes) to start operating from. */
         offset: number;
         /** Buffer of bytes to be operated on the file. */
         data: ArrayBuffer;
     }
 
-    interface OperationRequestedEventOptions extends RequestedEventOptions {
+    export interface OperationRequestedEventOptions extends RequestedEventOptions {
         /** An ID of the request to which this operation is related. */
         operationRequestId: number;
     }
 
-    interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> {}
+    export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> {}
 
-    interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
+    export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
 
-    interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
+    export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
 
-    interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-    interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
     /**
      * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
@@ -2881,53 +2917,53 @@ declare namespace chrome.fileSystemProvider {
     export function notify(options: NotificationOptions, callback: () => void): void;
 
     /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
-    var onUnmountRequested: RequestedEvent;
+    export var onUnmountRequested: RequestedEvent;
     /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
-    var onGetMetadataRequested: MetadataRequestedEvent;
+    export var onGetMetadataRequested: MetadataRequestedEvent;
     /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
-    var onReadDirectoryRequested: DirectoryPathRequestedEvent;
+    export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
     /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
-    var onOpenFileRequested: OpenFileRequestedEvent;
+    export var onOpenFileRequested: OpenFileRequestedEvent;
     /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
-    var onCloseFileRequested: OpenedFileRequestedEvent;
+    export var onCloseFileRequested: OpenedFileRequestedEvent;
     /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
-    var onReadFileRequested: OpenedFileOffsetRequestedEvent;
+    export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
     /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
-    var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
+    export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
     /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
-    var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
+    export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
     /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
-    var onCreateFileRequested: FilePathRequestedEvent;
+    export var onCreateFileRequested: FilePathRequestedEvent;
     /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-    var onCopyEntryRequested: SourceTargetPathRequestedEvent;
+    export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
     /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-    var onMoveEntryRequested: SourceTargetPathRequestedEvent;
+    export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
     /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
-    var onTruncateRequested: FilePathLengthRequestedEvent;
+    export var onTruncateRequested: FilePathLengthRequestedEvent;
     /** Raised when writing contents to a file opened previously with openRequestId is requested. */
-    var onWriteFileRequested: OpenedFileIoRequestedEvent;
+    export var onWriteFileRequested: OpenedFileIoRequestedEvent;
     /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
-    var onAbortRequested: OperationRequestedEvent;
+    export var onAbortRequested: OperationRequestedEvent;
     /**
      * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
      * @since Since Chrome 44.
      */
-    var onConfigureRequested: RequestedEvent;
+    export var onConfigureRequested: RequestedEvent;
     /**
      * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
      * @since Since Chrome 44.
      */
-    var onMountRequested: OptionlessRequestedEvent;
+    export var onMountRequested: OptionlessRequestedEvent;
     /**
      * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
      * @since Since Chrome 45. Warning: this is the current Beta channel.
      */
-    var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
+    export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
     /**
      * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
      * @since Since Chrome 45. Warning: this is the current Beta channel.
      */
-    var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
+    export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
 }
 
 ////////////////////
@@ -2940,26 +2976,26 @@ declare namespace chrome.fileSystemProvider {
  */
 declare namespace chrome.fontSettings {
     /** Represents a font name. */
-    interface FontName {
+    export interface FontName {
         /** The display name of the font. */
         displayName: string;
         /** The font ID. */
         fontId: string;
     }
 
-    interface DefaultFontSizeDetails {
+    export interface DefaultFontSizeDetails {
         /** The font size in pixels. */
         pixelSize: number;
     }
 
-    interface FontDetails {
+    export interface FontDetails {
         /** The generic font family for the font. */
         genericFamily: string;
         /** Optional. The script for the font. If omitted, the global script font setting is affected.  */
         script?: string;
     }
 
-    interface FullFontDetails {
+    export interface FullFontDetails {
         /** The generic font family for which the font setting has changed. */
         genericFamily: string;
         /** The level of control this extension has over the setting. */
@@ -2970,37 +3006,37 @@ declare namespace chrome.fontSettings {
         fontId: string;
     }
 
-    interface FontDetailsResult {
+    export interface FontDetailsResult {
         /** The level of control this extension has over the setting. */
         levelOfControl: string;
         /** The font ID. Rather than the literal font ID preference value, this may be the ID of the font that the system resolves the preference value to. So, fontId can differ from the font passed to setFont, if, for example, the font is not available on the system. The empty string signifies fallback to the global script font setting. */
         fontId: string;
     }
 
-    interface FontSizeDetails {
+    export interface FontSizeDetails {
         /** The font size in pixels. */
         pixelSize: number;
         /** The level of control this extension has over the setting. */
         levelOfControl: string;
     }
 
-    interface SetFontSizeDetails {
+    export interface SetFontSizeDetails {
         /** The font size in pixels. */
         pixelSize: number;
     }
 
-    interface SetFontDetails extends FontDetails {
+    export interface SetFontDetails extends FontDetails {
         /** The font ID. The empty string means to fallback to the global script font setting. */
         fontId: string;
     }
 
-    interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+    export interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
 
-    interface DefaultFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+    export interface DefaultFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
 
-    interface MinimumFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+    export interface MinimumFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
 
-    interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> {}
+    export interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> {}
 
     /**
      * Sets the default font size.
@@ -3088,13 +3124,13 @@ declare namespace chrome.fontSettings {
     export function clearDefaultFixedFontSize(details: Object, callback?: Function): void;
 
     /** Fired when the default fixed font size setting changes. */
-    var onDefaultFixedFontSizeChanged: DefaultFixedFontSizeChangedEvent;
+    export var onDefaultFixedFontSizeChanged: DefaultFixedFontSizeChangedEvent;
     /** Fired when the default font size setting changes. */
-    var onDefaultFontSizeChanged: DefaultFontSizeChangedEvent;
+    export var onDefaultFontSizeChanged: DefaultFontSizeChangedEvent;
     /** Fired when the minimum font size setting changes. */
-    var onMinimumFontSizeChanged: MinimumFontSizeChangedEvent;
+    export var onMinimumFontSizeChanged: MinimumFontSizeChangedEvent;
     /** Fired when a font setting changes. */
-    var onFontChanged: FontChangedEvent;
+    export var onFontChanged: FontChangedEvent;
 }
 
 ////////////////////
@@ -3106,7 +3142,7 @@ declare namespace chrome.fontSettings {
  * Permissions:  "gcm"
  */
 declare namespace chrome.gcm {
-    interface OutgoingMessage {
+    export interface OutgoingMessage {
         /** The ID of the server to send the message to as assigned by Google API Console. */
         destinationId: string;
         /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
@@ -3117,7 +3153,7 @@ declare namespace chrome.gcm {
         data: Object;
     }
 
-    interface IncomingMessage {
+    export interface IncomingMessage {
         /** The message data. */
         data: Object;
         /**
@@ -3133,7 +3169,7 @@ declare namespace chrome.gcm {
         collapseKey?: string;
     }
 
-    interface GcmError {
+    export interface GcmError {
         /** The error message describing the problem. */
         errorMessage: string;
         /** Optional. The ID of the message with this error, if error is related to a specific message. */
@@ -3142,14 +3178,14 @@ declare namespace chrome.gcm {
         detail: Object;
     }
 
-    interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> {}
+    export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> {}
 
-    interface MessageDeletionEvent extends chrome.events.Event<() => void> {}
+    export interface MessageDeletionEvent extends chrome.events.Event<() => void> {}
 
-    interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> {}
+    export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> {}
 
     /** The maximum size (in bytes) of all key/value pairs in a message. */
-    var MAX_MESSAGE_SIZE: number;
+    export var MAX_MESSAGE_SIZE: number;
 
     /**
      * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
@@ -3178,11 +3214,11 @@ declare namespace chrome.gcm {
     export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
 
     /** Fired when a message is received through GCM. */
-    var onMessage: MessageReceptionEvent;
+    export var onMessage: MessageReceptionEvent;
     /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
-    var onMessagesDeleted: MessageDeletionEvent;
+    export var onMessagesDeleted: MessageDeletionEvent;
     /** Fired when it was not possible to send a message to the GCM server. */
-    var onSendError: GcmErrorEvent;
+    export var onSendError: GcmErrorEvent;
 }
 
 ////////////////////
@@ -3195,7 +3231,7 @@ declare namespace chrome.gcm {
  */
 declare namespace chrome.history {
     /** An object encapsulating one visit to a URL. */
-    interface VisitItem {
+    export interface VisitItem {
         /** The transition type for this visit from its referrer. */
         transition: string;
         /** Optional. When this visit occurred, represented in milliseconds since the epoch. */
@@ -3209,7 +3245,7 @@ declare namespace chrome.history {
     }
 
     /** An object encapsulating one result of a history query. */
-    interface HistoryItem {
+    export interface HistoryItem {
         /** Optional. The number of times the user has navigated to this page by typing in the address. */
         typedCount?: number;
         /** Optional. The title of the page when it was last loaded. */
@@ -3224,7 +3260,7 @@ declare namespace chrome.history {
         id: string;
     }
 
-    interface HistoryQuery {
+    export interface HistoryQuery {
         /** A free-text query to the history service. Leave empty to retrieve all pages. */
         text: string;
         /** Optional. The maximum number of results to retrieve. Defaults to 100. */
@@ -3235,28 +3271,28 @@ declare namespace chrome.history {
         endTime?: number;
     }
 
-    interface Url {
+    export interface Url {
         /** The URL for the operation. It must be in the format as returned from a call to history.search. */
         url: string;
     }
 
-    interface Range {
+    export interface Range {
         /** Items added to history before this date, represented in milliseconds since the epoch. */
         endTime: number;
         /** Items added to history after this date, represented in milliseconds since the epoch. */
         startTime: number;
     }
 
-    interface RemovedResult {
+    export interface RemovedResult {
         /** True if all history was removed. If true, then urls will be empty. */
         allHistory: boolean;
         /** Optional. */
         urls?: string[];
     }
 
-    interface HistoryVisitedEvent extends chrome.events.Event<(result: HistoryItem) => void> {}
+    export interface HistoryVisitedEvent extends chrome.events.Event<(result: HistoryItem) => void> {}
 
-    interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> {}
+    export interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> {}
 
     /**
      * Searches the history for the last visit time of each page matching the query.
@@ -3296,9 +3332,9 @@ declare namespace chrome.history {
     export function deleteUrl(details: Url, callback?: () => void): void;
 
     /** Fired when a URL is visited, providing the HistoryItem data for that URL. This event fires before the page has loaded. */
-    var onVisited: HistoryVisitedEvent;
+    export var onVisited: HistoryVisitedEvent;
     /** Fired when one or more URLs are removed from the history service. When all visits have been removed the URL is purged from history. */
-    var onVisitRemoved: HistoryVisitRemovedEvent;
+    export var onVisitRemoved: HistoryVisitRemovedEvent;
 }
 
 ////////////////////
@@ -3310,25 +3346,25 @@ declare namespace chrome.history {
  */
 declare namespace chrome.i18n {
     /** Holds detected ISO language code and its percentage in the input string */
-    interface DetectedLanguage {
-        /** An ISO language code such as 'en' or 'fr'. 
-         * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}. 
+    export interface DetectedLanguage {
+        /** An ISO language code such as 'en' or 'fr'.
+         * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
          * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
         language: string;
 
         /** The percentage of the detected language */
-        percentage: number; 
+        percentage: number;
     }
 
     /** Holds detected language reliability and array of DetectedLanguage */
-    interface LanguageDetectionResult {
+    export interface LanguageDetectionResult {
         /** CLD detected language reliability */
         isReliable: boolean;
 
         /** Array of detectedLanguage */
         languages: DetectedLanguage[];
     }
-    
+
     /**
      * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
      * @param callback The callback parameter should be a function that looks like this:
@@ -3347,7 +3383,7 @@ declare namespace chrome.i18n {
      * @since Chrome 35.
      */
     export function getUILanguage(): string;
-    
+
     /** Detects the language of the provided text using CLD.
      * @param text User input string to be translated.
      * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
@@ -3365,12 +3401,12 @@ declare namespace chrome.i18n {
  */
 declare namespace chrome.identity {
     /** @since Chrome 32. */
-    interface AccountInfo {
+    export interface AccountInfo {
         /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
         id: string;
     }
 
-    interface TokenDetails {
+    export interface TokenDetails {
         /**
          * Optional.
          * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
@@ -3392,19 +3428,19 @@ declare namespace chrome.identity {
         scopes?: string[];
     }
 
-    interface UserInfo {
+    export interface UserInfo {
         /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
         email: string;
         /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
         id: string;
     }
 
-    interface TokenInformation {
+    export interface TokenInformation {
         /** The specific token that should be removed from the cache. */
         token: string;
     }
 
-    interface WebAuthFlowOptions {
+    export interface WebAuthFlowOptions {
         /** The URL that initiates the auth flow. */
         url: string;
         /**
@@ -3416,7 +3452,7 @@ declare namespace chrome.identity {
         interactive?: boolean;
     }
 
-    interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> {}
+    export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> {}
 
     /**
      * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
@@ -3471,7 +3507,7 @@ declare namespace chrome.identity {
      * Fired when signin state changes for an account on the user's profile.
      * @since Chrome 33.
      */
-    var onSignInChanged: SignInChangeEvent;
+    export var onSignInChanged: SignInChangeEvent;
 }
 
 ////////////////////
@@ -3483,7 +3519,7 @@ declare namespace chrome.identity {
  * @since Chrome 6.
  */
 declare namespace chrome.idle {
-    interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> {}
+    export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> {}
 
     /**
      * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
@@ -3501,7 +3537,7 @@ declare namespace chrome.idle {
     export function setDetectionInterval(intervalInSeconds: number): void;
 
     /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
-    var onStateChanged: IdleStateChangedEvent;
+    export var onStateChanged: IdleStateChangedEvent;
 }
 
 ////////////////////
@@ -3514,7 +3550,7 @@ declare namespace chrome.idle {
  */
 declare namespace chrome.input.ime {
     /** See http://www.w3.org/TR/DOM-Level-3-Events/#events-KeyboardEvent */
-    interface KeyboardEvent {
+    export interface KeyboardEvent {
         /**
          * Optional.
          * Whether or not the SHIFT key is pressed.
@@ -3563,7 +3599,7 @@ declare namespace chrome.input.ime {
     }
 
     /** Describes an input Context */
-    interface InputContext {
+    export interface InputContext {
         /** This is used to specify targets of text field operations. This ID becomes invalid as soon as onBlur is called. */
         contextID: number;
         /** Type of value this text field edits, (Text, Number, URL, etc) */
@@ -3589,7 +3625,7 @@ declare namespace chrome.input.ime {
      * A menu item used by an input method to interact with the user from the language menu.
      * @since Chrome 30.
      */
-    interface MenuItem {
+    export interface MenuItem {
         /** String that will be passed to callbacks referencing this MenuItem. */
         id: string;
         /** Optional. Text displayed in the menu for this item. */
@@ -3604,28 +3640,28 @@ declare namespace chrome.input.ime {
         enabled?: boolean;
     }
 
-    interface ImeParameters {
+    export interface ImeParameters {
         /** MenuItems to use. */
         items: MenuItem[];
         /** ID of the engine to use */
         engineID: string;
     }
 
-    interface CommitTextParameters {
+    export interface CommitTextParameters {
         /** The text to commit */
         text: string;
         /** ID of the context where the text will be committed */
         contextID: number;
     }
 
-    interface CandidateUsage {
+    export interface CandidateUsage {
         /** The title string of details description. */
         title: string;
         /** The body string of detail description. */
         body: string;
     }
 
-    interface CandidateTemplate {
+    export interface CandidateTemplate {
         /** The candidate */
         candidate: string;
         /** The candidate's id */
@@ -3652,14 +3688,14 @@ declare namespace chrome.input.ime {
         usage?: CandidateUsage;
     }
 
-    interface CandidatesParameters {
+    export interface CandidatesParameters {
         /** ID of the context that owns the candidate window. */
         contextID: number;
         /** List of candidates to show in the candidate window */
         candidates: CandidateTemplate[];
     }
 
-    interface CompositionParameterSegment {
+    export interface CompositionParameterSegment {
         /** Index of the character to start this segment at */
         start: number;
         /** Index of the character to end this segment after. */
@@ -3668,7 +3704,7 @@ declare namespace chrome.input.ime {
         style: string;
     }
 
-    interface CompositionParameters {
+    export interface CompositionParameters {
         /** ID of the context where the composition text will be set */
         contextID: number;
         /** Text to set */
@@ -3683,12 +3719,12 @@ declare namespace chrome.input.ime {
         selectionEnd?: number;
     }
 
-    interface MenuItemParameters {
+    export interface MenuItemParameters {
         items: Object[];
         engineId: string;
     }
 
-    interface CandidateWindowParameterProperties {
+    export interface CandidateWindowParameterProperties {
         /**
          * Optional.
          * True to show the cursor, false to hide it.
@@ -3727,32 +3763,32 @@ declare namespace chrome.input.ime {
         windowPosition?: string;
     }
 
-    interface CandidateWindowParameter {
+    export interface CandidateWindowParameter {
         /** ID of the engine to set properties on. */
         engineID: string;
         properties: CandidateWindowParameterProperties;
     }
 
-    interface ClearCompositionParameters {
+    export interface ClearCompositionParameters {
         /** ID of the context where the composition will be cleared */
         contextID: number;
     }
 
-    interface CursorPositionParameters {
+    export interface CursorPositionParameters {
         /** ID of the candidate to select. */
         candidateID: number;
         /** ID of the context that owns the candidate window. */
         contextID: number;
     }
 
-    interface SendKeyEventParameters {
+    export interface SendKeyEventParameters {
         /** ID of the context where the key events will be sent, or zero to send key events to non-input field. */
         contextID: number;
         /** Data on the key event. */
         keyData: KeyboardEvent[];
     }
 
-    interface DeleteSurroundingTextParameters {
+    export interface DeleteSurroundingTextParameters {
         /** ID of the engine receiving the event. */
         engineID: string;
         /** ID of the context where the surrounding text will be deleted. */
@@ -3763,7 +3799,7 @@ declare namespace chrome.input.ime {
         length: number;
     }
 
-    interface SurroundingTextInfo {
+    export interface SurroundingTextInfo {
         /** The text around cursor. */
         text: string;
         /** The ending position of the selection. This value indicates caret position if there is no selection. */
@@ -3772,25 +3808,25 @@ declare namespace chrome.input.ime {
         anchor: number;
     }
 
-    interface BlurEvent extends chrome.events.Event<(contextID: number) => void> {}
+    export interface BlurEvent extends chrome.events.Event<(contextID: number) => void> {}
 
-    interface CandidateClickedEvent extends chrome.events.Event<(engineID: string, candidateID: number, button: string) => void> {}
+    export interface CandidateClickedEvent extends chrome.events.Event<(engineID: string, candidateID: number, button: string) => void> {}
 
-    interface KeyEventEvent extends chrome.events.Event<(engineID: string, keyData: KeyboardEvent) => void> {}
+    export interface KeyEventEvent extends chrome.events.Event<(engineID: string, keyData: KeyboardEvent) => void> {}
 
-    interface DeactivatedEvent extends chrome.events.Event<(engineID: string) => void> {}
+    export interface DeactivatedEvent extends chrome.events.Event<(engineID: string) => void> {}
 
-    interface InputContextUpdateEvent extends chrome.events.Event<(context: InputContext) => void> {}
+    export interface InputContextUpdateEvent extends chrome.events.Event<(context: InputContext) => void> {}
 
-    interface ActivateEvent extends chrome.events.Event<(engineID: string, screen: string) => void> {}
+    export interface ActivateEvent extends chrome.events.Event<(engineID: string, screen: string) => void> {}
 
-    interface FocusEvent extends chrome.events.Event<(context: InputContext) => void> {}
+    export interface FocusEvent extends chrome.events.Event<(context: InputContext) => void> {}
 
-    interface MenuItemActivatedEvent extends chrome.events.Event<(engineID: string, name: string) => void> {}
+    export interface MenuItemActivatedEvent extends chrome.events.Event<(engineID: string, name: string) => void> {}
 
-    interface SurroundingTextChangedEvent extends chrome.events.Event<(engineID: string, surroundingInfo: SurroundingTextInfo) => void> {}
+    export interface SurroundingTextChangedEvent extends chrome.events.Event<(engineID: string, surroundingInfo: SurroundingTextInfo) => void> {}
 
-    interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> {}
+    export interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> {}
 
     /**
      * Adds the provided menu items to the language menu when this IME is active.
@@ -3874,31 +3910,31 @@ declare namespace chrome.input.ime {
     export function keyEventHandled(requestId: string, response: boolean): void;
 
     /** This event is sent when focus leaves a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
-    var onBlur: BlurEvent;
+    export var onBlur: BlurEvent;
     /** This event is sent if this extension owns the active IME. */
-    var onCandidateClicked: CandidateClickedEvent;
+    export var onCandidateClicked: CandidateClickedEvent;
     /** This event is sent if this extension owns the active IME. */
-    var onKeyEvent: KeyEventEvent;
+    export var onKeyEvent: KeyEventEvent;
     /** This event is sent when an IME is deactivated. It signals that the IME will no longer be receiving onKeyPress events. */
-    var onDeactivated: DeactivatedEvent;
+    export var onDeactivated: DeactivatedEvent;
     /** This event is sent when the properties of the current InputContext change, such as the the type. It is sent to all extensions that are listening to this event, and enabled by the user. */
-    var onInputContextUpdate: InputContextUpdateEvent;
+    export var onInputContextUpdate: InputContextUpdateEvent;
     /** This event is sent when an IME is activated. It signals that the IME will be receiving onKeyPress events. */
-    var onActivate: ActivateEvent;
+    export var onActivate: ActivateEvent;
     /** This event is sent when focus enters a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
-    var onFocus: FocusEvent;
+    export var onFocus: FocusEvent;
     /** Called when the user selects a menu item */
-    var onMenuItemActivated: MenuItemActivatedEvent;
+    export var onMenuItemActivated: MenuItemActivatedEvent;
     /**
      * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction.
      * @since Chrome 27.
      */
-    var onSurroundingTextChanged: SurroundingTextChangedEvent;
+    export var onSurroundingTextChanged: SurroundingTextChangedEvent;
     /**
      * This event is sent when chrome terminates ongoing text input session.
      * @since Chrome 29.
      */
-    var onReset: InputResetEvent;
+    export var onReset: InputResetEvent;
 }
 
 ////////////////////
@@ -3911,7 +3947,7 @@ declare namespace chrome.input.ime {
  */
 declare namespace chrome.management {
     /** Information about an installed extension, app, or theme. */
-    interface ExtensionInfo {
+    export interface ExtensionInfo {
         /**
          * Optional.
          * A reason the item is disabled.
@@ -4007,14 +4043,14 @@ declare namespace chrome.management {
     }
 
     /** Information about an icon belonging to an extension, app, or theme. */
-    interface IconInfo {
+    export interface IconInfo {
         /** The URL for this icon image. To display a grayscale version of the icon (to indicate that an extension is disabled, for example), append ?grayscale=true to the URL. */
         url: string;
         /** A number representing the width and height of the icon. Likely values include (but are not limited to) 128, 48, 24, and 16. */
         size: number;
     }
 
-    interface UninstallOptions {
+    export interface UninstallOptions {
         /**
          * Optional.
          * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown.
@@ -4022,13 +4058,13 @@ declare namespace chrome.management {
         showConfirmDialog?: boolean;
     }
 
-    interface ManagementDisabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+    export interface ManagementDisabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
 
-    interface ManagementUninstalledEvent extends chrome.events.Event<(id: string) => void> {}
+    export interface ManagementUninstalledEvent extends chrome.events.Event<(id: string) => void> {}
 
-    interface ManagementInstalledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+    export interface ManagementInstalledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
 
-    interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+    export interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
 
     /**
      * Enables or disables an app or extension.
@@ -4141,13 +4177,13 @@ declare namespace chrome.management {
     export function generateAppForLink(url: string, title: string, callback?: (result: ExtensionInfo) => void): void;
 
     /** Fired when an app or extension has been disabled. */
-    var onDisabled: ManagementDisabledEvent;
+    export var onDisabled: ManagementDisabledEvent;
     /** Fired when an app or extension has been uninstalled. */
-    var onUninstalled: ManagementUninstalledEvent;
+    export var onUninstalled: ManagementUninstalledEvent;
     /** Fired when an app or extension has been installed. */
-    var onInstalled: ManagementInstalledEvent;
+    export var onInstalled: ManagementInstalledEvent;
     /** Fired when an app or extension has been enabled. */
-    var onEnabled: ManagementEnabledEvent;
+    export var onEnabled: ManagementEnabledEvent;
 }
 
 ////////////////////
@@ -4160,7 +4196,7 @@ declare namespace chrome.management {
  * @since Chrome 43.
  */
 declare namespace chrome.networking.config {
-    interface NetworkInfo {
+    export interface NetworkInfo {
         /** Currently only WiFi supported. */
         Type: string;
         /** Optional. A unique identifier of the network. */
@@ -4175,7 +4211,7 @@ declare namespace chrome.networking.config {
         Security?: string;
     }
 
-    interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> {}
+    export interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> {}
 
     /**
      * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list.
@@ -4200,7 +4236,7 @@ declare namespace chrome.networking.config {
     export function finishAuthentication(GUID: string, result: string, callback?: () => void): void;
 
     /** This event fires everytime a captive portal is detected on a network matching any of the currently registered network filters and the user consents to use the extension for authentication. Network filters may be set using the setNetworkFilter. Upon receiving this event the extension should start its authentication attempt with the captive portal. When the extension finishes its attempt, it must call finishAuthentication with the GUID received with this event and the appropriate authentication result. */
-    var onCaptivePortalDetected: CaptivePorttalDetectedEvent;
+    export var onCaptivePortalDetected: CaptivePorttalDetectedEvent;
 }
 
 ////////////////////
@@ -4213,19 +4249,19 @@ declare namespace chrome.networking.config {
  * @since Chrome 28.
  */
 declare namespace chrome.notifications {
-    interface ButtonOptions {
+    export interface ButtonOptions {
         title: string;
         iconUrl?: string;
     }
 
-    interface ItemOptions {
+    export interface ItemOptions {
         /** Title of one item of a list notification. */
         title: string;
         /** Additional details about this item. */
         message: string;
     }
 
-    interface NotificationOptions {
+    export interface NotificationOptions {
         /** Optional. Which type of notification to display. Required for notifications.create method. */
         type?: string;
         /**
@@ -4280,15 +4316,15 @@ declare namespace chrome.notifications {
         requireInteraction?: boolean;
     }
 
-    interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> {}
+    export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> {}
 
-    interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> {}
+    export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> {}
 
-    interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> {}
+    export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> {}
 
-    interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> {}
+    export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> {}
 
-    interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> {}
+    export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> {}
 
     /** The notification closed, either by the system or by user action. */
     export var onClosed: NotificationClosedEvent;
@@ -4376,25 +4412,25 @@ declare namespace chrome.notifications {
  */
 declare namespace chrome.omnibox {
     /** A suggest result. */
-    interface SuggestResult {
+    export interface SuggestResult {
         /** The text that is put into the URL bar, and that is sent to the extension when the user chooses this entry. */
         content: string;
         /** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. You must escape the five predefined entities to display them as text: stackoverflow.com/a/1091953/89484 */
         description: string;
     }
 
-    interface Suggestion {
+    export interface Suggestion {
         /** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. */
         description: string;
     }
 
-    interface OmniboxInputEnteredEvent extends chrome.events.Event<(text: string) => void> {}
+    export interface OmniboxInputEnteredEvent extends chrome.events.Event<(text: string) => void> {}
 
-    interface OmniboxInputChangedEvent extends chrome.events.Event<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void> {}
+    export interface OmniboxInputChangedEvent extends chrome.events.Event<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void> {}
 
-    interface OmniboxInputStartedEvent extends chrome.events.Event<() => void> {}
+    export interface OmniboxInputStartedEvent extends chrome.events.Event<() => void> {}
 
-    interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> {}
+    export interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> {}
 
     /**
      * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar.
@@ -4403,13 +4439,13 @@ declare namespace chrome.omnibox {
     export function setDefaultSuggestion(suggestion: Suggestion): void;
 
     /** User has accepted what is typed into the omnibox. */
-    var onInputEntered: OmniboxInputEnteredEvent;
+    export var onInputEntered: OmniboxInputEnteredEvent;
     /** User has changed what is typed into the omnibox. */
-    var onInputChanged: OmniboxInputChangedEvent;
+    export var onInputChanged: OmniboxInputChangedEvent;
     /** User has started a keyword input session by typing the extension's keyword. This is guaranteed to be sent exactly once per input session, and before any onInputChanged events. */
-    var onInputStarted: OmniboxInputStartedEvent;
+    export var onInputStarted: OmniboxInputStartedEvent;
     /** User has ended the keyword input session without accepting the input. */
-    var onInputCancelled: OmniboxInputCancelledEvent;
+    export var onInputCancelled: OmniboxInputCancelledEvent;
 }
 
 ////////////////////
@@ -4421,28 +4457,28 @@ declare namespace chrome.omnibox {
  * @since Chrome 5.
  */
 declare namespace chrome.pageAction {
-    interface PageActionClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+    export interface PageActionClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
 
-    interface TitleDetails {
+    export interface TitleDetails {
         /** The id of the tab for which you want to modify the page action. */
         tabId: number;
         /** The tooltip string. */
         title: string;
     }
 
-    interface GetDetails {
+    export interface GetDetails {
         /** Specify the tab to get the title from. */
         tabId: number;
     }
 
-    interface PopupDetails {
+    export interface PopupDetails {
         /** The id of the tab for which you want to modify the page action. */
         tabId: number;
         /** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
         popup: string;
     }
 
-    interface IconDetails {
+    export interface IconDetails {
         /** The id of the tab for which you want to modify the page action. */
         tabId: number;
         /**
@@ -4454,7 +4490,7 @@ declare namespace chrome.pageAction {
          * Optional.
          * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
          */
-        imageData?: ImageData;
+        imageData?: ImageData | { [index: number]: ImageData };
         /**
          * Optional.
          * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
@@ -4498,7 +4534,7 @@ declare namespace chrome.pageAction {
     export function setIcon(details: IconDetails, callback?: () => void): void;
 
     /** Fired when a page action icon is clicked. This event will not fire if the page action has a popup. */
-    var onClicked: PageActionClickedEvent;
+    export var onClicked: PageActionClickedEvent;
 }
 
 ////////////////////
@@ -4510,7 +4546,7 @@ declare namespace chrome.pageAction {
  * @since Chrome 18.
  */
 declare namespace chrome.pageCapture {
-    interface SaveDetails {
+    export interface SaveDetails {
         /** The id of the tab to save as MHTML. */
         tabId: number;
     }
@@ -4533,7 +4569,7 @@ declare namespace chrome.pageCapture {
  * @since Chrome 16.
  */
 declare namespace chrome.permissions {
-    interface Permissions {
+    export interface Permissions {
         /**
          * Optional.
          * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
@@ -4546,7 +4582,7 @@ declare namespace chrome.permissions {
         permissions?: string[];
     }
 
-    interface PermissionsRemovedEvent {
+    export interface PermissionsRemovedEvent {
         /**
          * @param callback The callback parameter should be a function that looks like this:
          * function( Permissions permissions) {...};
@@ -4555,7 +4591,7 @@ declare namespace chrome.permissions {
         addListener(callback: (permissions: Permissions) => void): void;
     }
 
-    interface PermissionsAddedEvent {
+    export interface PermissionsAddedEvent {
         /**
          * @param callback The callback parameter should be a function that looks like this:
          * function( Permissions permissions) {...};
@@ -4594,9 +4630,9 @@ declare namespace chrome.permissions {
     export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
 
     /** Fired when access to permissions has been removed from the extension. */
-    var onRemoved: PermissionsRemovedEvent;
+    export var onRemoved: PermissionsRemovedEvent;
     /** Fired when the extension acquires new permissions. */
-    var onAdded: PermissionsAddedEvent;
+    export var onAdded: PermissionsAddedEvent;
 }
 
 ////////////////////
@@ -4609,21 +4645,21 @@ declare namespace chrome.permissions {
  * @since Chrome 45.
  */
 declare namespace chrome.platformKeys {
-    interface Match {
+    export interface Match {
         /** The DER encoding of a X.509 certificate. */
         certificate: ArrayBuffer;
         /** The  KeyAlgorithm of the certified key. This contains algorithm parameters that are inherent to the key of the certificate (e.g. the key length). Other parameters like the hash function used by the sign function are not included. */
         keyAlgorithm: KeyAlgorithm;
     }
 
-    interface ClientCertificateSelectRequestDetails {
+    export interface ClientCertificateSelectRequestDetails {
         /** This field is a list of the types of certificates requested, sorted in order of the server's preference. Only certificates of a type contained in this list will be retrieved. If certificateTypes is the empty list, however, certificates of any type will be returned. */
         certificateTypes: string[];
         /** List of distinguished names of certificate authorities allowed by the server. Each entry must be a DER-encoded X.509 DistinguishedName. */
         certificateAuthorities: ArrayBuffer[];
     }
 
-    interface ClientCertificateSelectDetails {
+    export interface ClientCertificateSelectDetails {
         /** Only certificates that match this request will be returned. */
         request: ClientCertificateSelectRequestDetails;
         /**
@@ -4635,14 +4671,14 @@ declare namespace chrome.platformKeys {
         interactive: boolean;
     }
 
-    interface ServerCertificateVerificationDetails {
+    export interface ServerCertificateVerificationDetails {
         /** Each chain entry must be the DER encoding of a X.509 certificate, the first entry must be the server certificate and each entry must certify the entry preceding it. */
         serverCertificateChain: ArrayBuffer[];
         /** The hostname of the server to verify the certificate for, e.g. the server that presented the serverCertificateChain. */
         hostname: string;
     }
 
-    interface ServerCertificateVerificationResult {
+    export interface ServerCertificateVerificationResult {
         /** The result of the trust verification: true if trust for the given verification details could be established and false if trust is rejected for any reason. */
         trusted: boolean;
         /**
@@ -4703,7 +4739,7 @@ declare namespace chrome.power {
  * @since Chrome 44.
  */
 declare namespace chrome.printerProvider {
-    interface PrinterInfo {
+    export interface PrinterInfo {
         /** Unique printer ID. */
         id: string;
         /** Printer's human readable name. */
@@ -4712,12 +4748,12 @@ declare namespace chrome.printerProvider {
         description?: string;
     }
 
-    interface PrinterCapabilities {
+    export interface PrinterCapabilities {
         /** Device capabilities in CDD format. */
         capabilities: any;
     }
 
-    interface PrintJob {
+    export interface PrintJob {
         /** ID of the printer which should handle the job. */
         printerId: string;
         /** The print job title. */
@@ -4730,13 +4766,13 @@ declare namespace chrome.printerProvider {
         document: Blob;
     }
 
-    interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> {}
+    export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> {}
 
-    interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> {}
+    export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> {}
 
-    interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> {}
+    export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> {}
 
-    interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> {}
+    export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> {}
 
     /** Event fired when print manager requests printers provided by extensions. */
     export var onGetPrintersRequested: PrinterRequestedEvent;
@@ -4762,7 +4798,7 @@ declare namespace chrome.printerProvider {
  * @since Chrome 18.
  */
 declare namespace chrome.privacy {
-    interface Services {
+    export interface Services {
         /** since Chrome 20. */
         spellingServiceEnabled: chrome.types.ChromeSetting;
         searchSuggestEnabled: chrome.types.ChromeSetting;
@@ -4779,7 +4815,7 @@ declare namespace chrome.privacy {
         safeBrowsingExtendedReportingEnabled: chrome.types.ChromeSetting;
     }
 
-    interface Network {
+    export interface Network {
         networkPredictionEnabled: chrome.types.ChromeSetting;
         /** @since Chrome 42. */
         webRTCMultipleRoutesEnabled: chrome.types.ChromeSetting;
@@ -4787,7 +4823,7 @@ declare namespace chrome.privacy {
         webRTCNonProxiedUdpEnabled: chrome.types.ChromeSetting;
     }
 
-    interface Websites {
+    export interface Websites {
         thirdPartyCookiesAllowed: chrome.types.ChromeSetting;
         referrersEnabled: chrome.types.ChromeSetting;
         hyperlinkAuditingEnabled: chrome.types.ChromeSetting;
@@ -4796,11 +4832,11 @@ declare namespace chrome.privacy {
     }
 
     /** Settings that enable or disable features that require third-party network services provided by Google and your default search provider. */
-    var services: Services;
+    export var services: Services;
     /** Settings that influence Chrome's handling of network connections in general. */
-    var network: Network;
+    export var network: Network;
     /** Settings that determine what information Chrome makes available to websites. */
-    var websites: Websites;
+    export var websites: Websites;
 }
 
 ////////////////////
@@ -4813,7 +4849,7 @@ declare namespace chrome.privacy {
  */
 declare namespace chrome.proxy {
     /** An object holding proxy auto-config information. Exactly one of the fields should be non-empty. */
-    interface PacScript {
+    export interface PacScript {
         /** Optional. URL of the PAC file to be used. */
         url?: string;
         /** Optional. If true, an invalid PAC script will prevent the network stack from falling back to direct connections. Defaults to false. */
@@ -4823,7 +4859,7 @@ declare namespace chrome.proxy {
     }
 
     /** An object encapsulating a complete proxy configuration. */
-    interface ProxyConfig {
+    export interface ProxyConfig {
         /** Optional. The proxy rules describing this configuration. Use this for 'fixed_servers' mode. */
         rules?: ProxyRules;
         /** Optional. The proxy auto-config (PAC) script for this configuration. Use this for 'pac_script' mode. */
@@ -4839,7 +4875,7 @@ declare namespace chrome.proxy {
     }
 
     /** An object encapsulating a single proxy server's specification. */
-    interface ProxyServer {
+    export interface ProxyServer {
         /** The URI of the proxy server. This must be an ASCII hostname (in Punycode format). IDNA is not supported, yet. */
         host: string;
         /** Optional. The scheme (protocol) of the proxy server itself. Defaults to 'http'. */
@@ -4849,7 +4885,7 @@ declare namespace chrome.proxy {
     }
 
     /** An object encapsulating the set of proxy rules for all protocols. Use either 'singleProxy' or (a subset of) 'proxyForHttp', 'proxyForHttps', 'proxyForFtp' and 'fallbackProxy'. */
-    interface ProxyRules {
+    export interface ProxyRules {
         /** Optional. The proxy server to be used for FTP requests. */
         proxyForFtp?: ProxyServer;
         /** Optional. The proxy server to be used for HTTP requests. */
@@ -4864,7 +4900,7 @@ declare namespace chrome.proxy {
         bypassList?: string[];
     }
 
-    interface ErrorDetails {
+    export interface ErrorDetails {
         /** Additional details about the error such as a JavaScript runtime error. */
         details: string;
         /** The error description. */
@@ -4873,11 +4909,11 @@ declare namespace chrome.proxy {
         fatal: boolean;
     }
 
-    interface ProxyErrorEvent extends chrome.events.Event<(details: ErrorDetails) => void> {}
+    export interface ProxyErrorEvent extends chrome.events.Event<(details: ErrorDetails) => void> {}
 
-    var settings: chrome.types.ChromeSetting;
+    export var settings: chrome.types.ChromeSetting;
     /** Notifies about proxy errors. */
-    var onProxyError: ProxyErrorEvent;
+    export var onProxyError: ProxyErrorEvent;
 }
 
 ////////////////////
@@ -4889,20 +4925,20 @@ declare namespace chrome.proxy {
  */
 declare namespace chrome.runtime {
     /** This will be defined during an API method callback if there was an error */
-    var lastError: LastError | undefined;
+    export var lastError: LastError | undefined;
     /** The ID of the extension/app. */
-    var id: string;
+    export var id: string;
 
-    interface LastError {
+    export interface LastError {
         /** Optional. Details about the error which occurred.  */
         message?: string;
     }
 
-    interface ConnectInfo {
+    export interface ConnectInfo {
         name?: string;
     }
 
-    interface InstalledDetails {
+    export interface InstalledDetails {
         /**
          * The reason that this event is being dispatched.
          * One of: "install", "update", "chrome_update", or "shared_module_update"
@@ -4921,7 +4957,7 @@ declare namespace chrome.runtime {
         id?: string;
     }
 
-    interface MessageOptions {
+    export interface MessageOptions {
         /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
         includeTlsChannelId?: boolean;
     }
@@ -4930,7 +4966,7 @@ declare namespace chrome.runtime {
      * An object containing information about the script context that sent a message or request.
      * @since Chrome 26.
      */
-    interface MessageSender {
+    export interface MessageSender {
         /** The ID of the extension or app that opened the connection, if any. */
         id?: string;
         /** The tabs.Tab which opened the connection, if any. This property will only be present when the connection was opened from a tab (including content scripts), and only if the receiver is an extension, not an app. */
@@ -4956,7 +4992,7 @@ declare namespace chrome.runtime {
      * An object containing information about the current platform.
      * @since Chrome 36.
      */
-    interface PlatformInfo {
+    export interface PlatformInfo {
         /**
          * The operating system chrome is running on.
          * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
@@ -4978,7 +5014,7 @@ declare namespace chrome.runtime {
      * An object which allows two way communication with other pages.
      * @since Chrome 26.
      */
-    interface Port {
+    export interface Port {
         postMessage: (message: Object) => void;
         disconnect: () => void;
         /**
@@ -4993,43 +5029,43 @@ declare namespace chrome.runtime {
         name: string;
     }
 
-    interface UpdateAvailableDetails {
+    export interface UpdateAvailableDetails {
         /** The version number of the available update. */
         version: string;
     }
 
-    interface UpdateCheckDetails {
+    export interface UpdateCheckDetails {
         /** The version of the available update. */
         version: string;
     }
 
-    interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> {}
+    export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> {}
 
-    interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
+    export interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
 
-    interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
+    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
 
-    interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> {}
+    export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> {}
 
-    interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> {}
+    export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> {}
 
-    interface RuntimeEvent extends chrome.events.Event<() => void> {}
+    export interface RuntimeEvent extends chrome.events.Event<() => void> {}
 
-    interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> {}
+    export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> {}
 
-    interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> {}
+    export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> {}
 
-    interface ManifestIcons {
+    export interface ManifestIcons {
         [size: number]: string;
     }
 
-    interface ManifestAction {
+    export interface ManifestAction {
         default_icon?: ManifestIcons;
         default_title?: string;
         default_popup?: string;
     }
 
-    interface SearchProvider {
+    export interface SearchProvider {
         name?: string;
         keyword?: string;
         favicon_url?: string;
@@ -5047,7 +5083,7 @@ declare namespace chrome.runtime {
         is_default?: boolean;
     }
 
-    interface Manifest {
+    export interface Manifest {
         // Required
         manifest_version: number;
         name: string;
@@ -5124,7 +5160,7 @@ declare namespace chrome.runtime {
             actions?: {
                 type: string;
             }[];
-            conditions?: chrome.declarativeContent.PageStateMatcher[]
+            conditions?: chrome.declarativeContent.PageStateMatcherProperties[]
         }[];
         externally_connectable?: {
             ids?: string[];
@@ -5344,74 +5380,74 @@ declare namespace chrome.runtime {
      * Fired when a connection is made from either an extension process or a content script.
      * @since Chrome 26.
      */
-    var onConnect: ExtensionConnectEvent;
+    export var onConnect: ExtensionConnectEvent;
     /**
      * Fired when a connection is made from another extension.
      * @since Chrome 26.
      */
-    var onConnectExternal: ExtensionConnectEvent;
+    export var onConnectExternal: ExtensionConnectEvent;
     /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
-    var onSuspend: RuntimeEvent;
+    export var onSuspend: RuntimeEvent;
     /**
      * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
      * @since Chrome 23.
      */
-    var onStartup: RuntimeEvent;
+    export var onStartup: RuntimeEvent;
     /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
-    var onInstalled: RuntimeInstalledEvent;
+    export var onInstalled: RuntimeInstalledEvent;
     /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
-    var onSuspendCanceled: RuntimeEvent;
+    export var onSuspendCanceled: RuntimeEvent;
     /**
      * Fired when a message is sent from either an extension process or a content script.
      * @since Chrome 26.
      */
-    var onMessage: ExtensionMessageEvent;
+    export var onMessage: ExtensionMessageEvent;
     /**
      * Fired when a message is sent from another extension/app. Cannot be used in a content script.
      * @since Chrome 26.
      */
-    var onMessageExternal: ExtensionMessageEvent;
+    export var onMessageExternal: ExtensionMessageEvent;
     /**
      * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
      * @since Chrome 29.
      */
-    var onRestartRequired: RuntimeRestartRequiredEvent;
+    export var onRestartRequired: RuntimeRestartRequiredEvent;
     /**
      * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
      * @since Chrome 25.
      */
-    var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+    export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
     /**
      * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
      * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
      */
-    var onBrowserUpdateAvailable: RuntimeEvent;
+    export var onBrowserUpdateAvailable: RuntimeEvent;
 }
 
 ////////////////////
 // Script Badge
 ////////////////////
 declare namespace chrome.scriptBadge {
-    interface GetPopupDetails {
+    export interface GetPopupDetails {
         tabId: number;
     }
 
-    interface AttentionDetails {
+    export interface AttentionDetails {
         tabId: number;
     }
 
-    interface SetPopupDetails {
+    export interface SetPopupDetails {
         tabId: number;
         popup: string;
     }
 
-    interface ScriptBadgeClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+    export interface ScriptBadgeClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
 
     export function getPopup(details: GetPopupDetails, callback: Function): void;
     export function getAttention(details: AttentionDetails): void;
     export function setPopup(details: SetPopupDetails): void;
 
-    var onClicked: ScriptBadgeClickedEvent;
+    export var onClicked: ScriptBadgeClickedEvent;
 }
 
 ////////////////////
@@ -5423,7 +5459,7 @@ declare namespace chrome.scriptBadge {
  * @since Chrome 37.
  */
 declare namespace chrome.sessions {
-    interface Filter {
+    export interface Filter {
         /**
          * Optional.
          * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum number of entries (sessions.MAX_SESSION_RESULTS).
@@ -5431,7 +5467,7 @@ declare namespace chrome.sessions {
         maxResults?: number;
     }
 
-    interface Session {
+    export interface Session {
         /** The time when the window or tab was closed or modified, represented in milliseconds since the epoch. */
         lastModified: number;
         /**
@@ -5446,14 +5482,14 @@ declare namespace chrome.sessions {
         window?: windows.Window;
     }
 
-    interface Device {
+    export interface Device {
         /** The name of the foreign device. */
         deviceName: string;
         /** A list of open window sessions for the foreign device, sorted from most recently to least recently modified session. */
         sessions: Session[];
     }
 
-    interface SessionChangedEvent extends chrome.events.Event<() => void> {}
+    export interface SessionChangedEvent extends chrome.events.Event<() => void> {}
 
     /** The maximum number of sessions.Session that will be included in a requested list. */
     export var MAX_SESSION_RESULTS: number;
@@ -5504,7 +5540,7 @@ declare namespace chrome.sessions {
  * @since Chrome 20.
  */
 declare namespace chrome.storage {
-    interface StorageArea {
+    export interface StorageArea {
         /**
          * Gets the amount of space (in bytes) being used by one or more items.
          * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
@@ -5533,19 +5569,12 @@ declare namespace chrome.storage {
          */
         set(items: Object, callback?: () => void): void;
         /**
-         * Removes one item from storage.
-         * @param key A single key for items to remove.
+         * Removes one or more items from storage.
+         * @param A single key or a list of keys for items to remove.
          * @param callback Optional.
          * Callback on success, or on failure (in which case runtime.lastError will be set).
          */
-        remove(key: string, callback?: () => void): void;
-        /**
-         * Removes items from storage.
-         * @param keys A list of keys for items to remove.
-         * @param callback Optional.
-         * Callback on success, or on failure (in which case runtime.lastError will be set).
-         */
-        remove(keys: string[], callback?: () => void): void;
+        remove(keys: string | string[], callback?: () => void): void;
         /**
          * Gets one or more items from storage.
          * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
@@ -5562,19 +5591,19 @@ declare namespace chrome.storage {
         get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
     }
 
-    interface StorageChange {
+    export interface StorageChange {
         /** Optional. The new value of the item, if there is a new value. */
         newValue?: any;
         /** Optional. The old value of the item, if there was an old value. */
         oldValue?: any;
     }
 
-    interface LocalStorageArea extends StorageArea {
+    export interface LocalStorageArea extends StorageArea {
         /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
         QUOTA_BYTES: number;
     }
 
-    interface SyncStorageArea extends StorageArea {
+    export interface SyncStorageArea extends StorageArea {
         /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
         MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
         /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
@@ -5596,53 +5625,53 @@ declare namespace chrome.storage {
         MAX_WRITE_OPERATIONS_PER_MINUTE: number;
     }
 
-    interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> {}
+    export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> {}
 
     /** Items in the local storage area are local to each machine. */
-    var local: LocalStorageArea;
+    export var local: LocalStorageArea;
     /** Items in the sync storage area are synced using Chrome Sync. */
-    var sync: SyncStorageArea;
+    export var sync: SyncStorageArea;
 
     /**
      * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error.
      * @since Chrome 33.
      */
-    var managed: StorageArea;
+    export var managed: StorageArea;
 
     /** Fired when one or more items change. */
-    var onChanged: StorageChangedEvent;
+    export var onChanged: StorageChangedEvent;
 }
 
 ////////////////////
 // Socket
 ////////////////////
 declare namespace chrome.socket {
-    interface CreateInfo {
+    export interface CreateInfo {
         socketId: number;
     }
 
-    interface AcceptInfo {
+    export interface AcceptInfo {
         resultCode: number;
         socketId?: number;
     }
 
-    interface ReadInfo {
+    export interface ReadInfo {
         resultCode: number;
         data: ArrayBuffer;
     }
 
-    interface WriteInfo {
+    export interface WriteInfo {
         bytesWritten: number;
     }
 
-    interface RecvFromInfo {
+    export interface RecvFromInfo {
         resultCode: number;
         data: ArrayBuffer;
         port: number;
         address: string;
     }
 
-    interface SocketInfo {
+    export interface SocketInfo {
         socketType: string;
         localPort?: number;
         peerAddress?: string;
@@ -5651,7 +5680,7 @@ declare namespace chrome.socket {
         connected: boolean;
     }
 
-    interface NetworkInterface {
+    export interface NetworkInterface {
         name: string;
         address: string;
     }
@@ -5682,7 +5711,7 @@ declare namespace chrome.socket {
  * @since Chrome 32.
  */
 declare namespace chrome.system.cpu {
-    interface ProcessorUsage {
+    export interface ProcessorUsage {
         /** The cumulative time used by userspace programs on this processor. */
         user: number;
         /** The cumulative time used by kernel programs on this processor. */
@@ -5693,12 +5722,12 @@ declare namespace chrome.system.cpu {
         total: number;
     }
 
-    interface ProcessorInfo {
+    export interface ProcessorInfo {
         /** Cumulative usage info for this logical processor. */
         usage: ProcessorUsage;
     }
 
-    interface CpuInfo {
+    export interface CpuInfo {
         /** The number of logical processors. */
         numOfProcessors: number;
         /** The architecture name of the processors. */
@@ -5727,7 +5756,7 @@ declare namespace chrome.system.cpu {
  * @since Chrome 32.
  */
 declare namespace chrome.system.memory {
-    interface MemoryInfo {
+    export interface MemoryInfo {
         /** The total amount of physical memory capacity, in bytes. */
         capacity: number;
         /** The amount of available capacity, in bytes. */
@@ -5747,7 +5776,7 @@ declare namespace chrome.system.memory {
  * @since Chrome 30.
  */
 declare namespace chrome.system.storage {
-    interface StorageUnitInfo {
+    export interface StorageUnitInfo {
         /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
         id: string;
         /** The name of the storage unit. */
@@ -5763,16 +5792,16 @@ declare namespace chrome.system.storage {
         capacity: number;
     }
 
-    interface StorageCapacityInfo {
+    export interface StorageCapacityInfo {
         /** A copied |id| of getAvailableCapacity function parameter |id|. */
         id: string;
         /** The available capacity of the storage device, in bytes. */
         availableCapacity: number;
     }
 
-    interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> {}
+    export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> {}
 
-    interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> {}
+    export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> {}
 
     /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
     export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
@@ -5803,7 +5832,7 @@ declare namespace chrome.system.storage {
  * @since Chrome 31.
  */
 declare namespace chrome.tabCapture {
-    interface CaptureInfo {
+    export interface CaptureInfo {
         /** The id of the tab whose status changed. */
         tabId: number;
         /**
@@ -5815,7 +5844,7 @@ declare namespace chrome.tabCapture {
         fullscreen: boolean;
     }
 
-    interface CaptureOptions {
+    export interface CaptureOptions {
         /** Optional. */
         audio?: boolean;
         /** Optional. */
@@ -5826,7 +5855,7 @@ declare namespace chrome.tabCapture {
         videoConstraints?: MediaStreamConstraints;
     }
 
-    interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> {}
+    export interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> {}
 
     /**
      * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension.
@@ -5841,7 +5870,7 @@ declare namespace chrome.tabCapture {
     export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
 
     /** Event fired when the capture status of a tab changes. This allows extension authors to keep track of the capture status of tabs to keep UI elements like page actions in sync. */
-    var onStatusChanged: CaptureStatusChangedEvent;
+    export var onStatusChanged: CaptureStatusChangedEvent;
 }
 
 ////////////////////
@@ -5857,7 +5886,7 @@ declare namespace chrome.tabs {
      * Tab muted state and the reason for the last state change.
      * @since Chrome 46. Warning: this is the current Beta channel.
      */
-    interface MutedInfo {
+    export interface MutedInfo {
         /** Whether the tab is prevented from playing sound (but hasn't necessarily recently produced sound). Equivalent to whether the muted audio indicator is showing. */
         muted: boolean;
         /**
@@ -5875,7 +5904,7 @@ declare namespace chrome.tabs {
         extensionId?: string;
     }
 
-    interface Tab {
+    export interface Tab {
         /**
          * Optional.
          * Either loading or complete.
@@ -5966,7 +5995,7 @@ declare namespace chrome.tabs {
      * Defines how zoom changes in a tab are handled and at what scope.
      * @since Chrome 38.
      */
-    interface ZoomSettings {
+    export interface ZoomSettings {
         /**
          * Optional.
          * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page; defaults to "automatic".
@@ -5990,7 +6019,7 @@ declare namespace chrome.tabs {
         defaultZoomFactor?: number;
     }
 
-    interface InjectDetails {
+    export interface InjectDetails {
         /**
          * Optional.
          * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame.
@@ -6023,7 +6052,7 @@ declare namespace chrome.tabs {
         matchAboutBlank?: boolean;
     }
 
-    interface CreateProperties {
+    export interface CreateProperties {
         /** Optional. The position the tab should take in the window. The provided value will be clamped to between zero and the number of tabs in the window. */
         index?: number;
         /**
@@ -6057,14 +6086,14 @@ declare namespace chrome.tabs {
         selected?: boolean;
     }
 
-    interface MoveProperties {
+    export interface MoveProperties {
         /** The position to move the window to. -1 will place the tab at the end of the window. */
         index: number;
         /** Optional. Defaults to the window the tab is currently in. */
         windowId?: number;
     }
 
-    interface UpdateProperties {
+    export interface UpdateProperties {
         /**
          * Optional. Whether the tab should be pinned.
          * @since Chrome 9.
@@ -6099,7 +6128,7 @@ declare namespace chrome.tabs {
         muted?: boolean;
     }
 
-    interface CaptureVisibleTabOptions {
+    export interface CaptureVisibleTabOptions {
         /**
          * Optional.
          * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
@@ -6112,12 +6141,12 @@ declare namespace chrome.tabs {
         format?: string;
     }
 
-    interface ReloadProperties {
+    export interface ReloadProperties {
         /** Optional. Whether using any local cache. Default is false. */
         bypassCache?: boolean;
     }
 
-    interface ConnectInfo {
+    export interface ConnectInfo {
         /** Optional. Will be passed into onConnect for content scripts that are listening for the connection event. */
         name?: string;
         /**
@@ -6127,19 +6156,19 @@ declare namespace chrome.tabs {
         frameId?: number;
     }
 
-    interface MessageSendOptions {
+    export interface MessageSendOptions {
         /** Optional. Send a message to a specific frame identified by frameId instead of all frames in the tab. */
         frameId?: number;
     }
 
-    interface HighlightInfo {
+    export interface HighlightInfo {
         /** One or more tab indices to highlight. */
         tabs: number | number[];
         /** Optional. The window that contains the tabs. */
         windowId?: number;
     }
 
-    interface QueryInfo {
+    export interface QueryInfo {
         /**
          * Optional. Whether the tabs have completed loading.
          * One of: "loading", or "complete"
@@ -6189,12 +6218,12 @@ declare namespace chrome.tabs {
         muted?: boolean;
     }
 
-    interface TabHighlightInfo {
+    export interface TabHighlightInfo {
         windowId: number;
         tabIds: number[];
     }
 
-    interface TabRemoveInfo {
+    export interface TabRemoveInfo {
         /**
          * The window whose tab is closed.
          * @since Chrome 25.
@@ -6204,12 +6233,12 @@ declare namespace chrome.tabs {
         isWindowClosing: boolean;
     }
 
-    interface TabAttachInfo {
+    export interface TabAttachInfo {
         newPosition: number;
         newWindowId: number;
     }
 
-    interface TabChangeInfo {
+    export interface TabChangeInfo {
         /** Optional. The status of the tab. Can be either loading or complete. */
         status?: string;
         /**
@@ -6241,57 +6270,57 @@ declare namespace chrome.tabs {
         title?: string;
     }
 
-    interface TabMoveInfo {
+    export interface TabMoveInfo {
         toIndex: number;
         windowId: number;
         fromIndex: number;
     }
 
-    interface TabDetachInfo {
+    export interface TabDetachInfo {
         oldWindowId: number;
         oldPosition: number;
     }
 
-    interface TabActiveInfo {
+    export interface TabActiveInfo {
         /** The ID of the tab that has become active. */
         tabId: number;
         /** The ID of the window the active tab changed inside of. */
         windowId: number;
     }
 
-    interface TabWindowInfo {
+    export interface TabWindowInfo {
         /** The ID of the window of where the tab is located. */
         windowId: number;
     }
 
-    interface ZoomChangeInfo {
+    export interface ZoomChangeInfo {
         tabId: number;
         oldZoomFactor: number;
         newZoomFactor: number;
         zoomSettings: ZoomSettings;
     }
 
-    interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> {}
+    export interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> {}
 
-    interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> {}
+    export interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> {}
 
-    interface TabUpdatedEvent extends chrome.events.Event<(tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void> {}
+    export interface TabUpdatedEvent extends chrome.events.Event<(tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void> {}
 
-    interface TabAttachedEvent extends chrome.events.Event<(tabId: number, attachInfo: TabAttachInfo) => void> {}
+    export interface TabAttachedEvent extends chrome.events.Event<(tabId: number, attachInfo: TabAttachInfo) => void> {}
 
-    interface TabMovedEvent extends chrome.events.Event<(tabId: number, moveInfo: TabMoveInfo) => void> {}
+    export interface TabMovedEvent extends chrome.events.Event<(tabId: number, moveInfo: TabMoveInfo) => void> {}
 
-    interface TabDetachedEvent extends chrome.events.Event<(tabId: number, detachInfo: TabDetachInfo) => void> {}
+    export interface TabDetachedEvent extends chrome.events.Event<(tabId: number, detachInfo: TabDetachInfo) => void> {}
 
-    interface TabCreatedEvent extends chrome.events.Event<(tab: Tab) => void> {}
+    export interface TabCreatedEvent extends chrome.events.Event<(tab: Tab) => void> {}
 
-    interface TabActivatedEvent extends chrome.events.Event<(activeInfo: TabActiveInfo) => void> {}
+    export interface TabActivatedEvent extends chrome.events.Event<(activeInfo: TabActiveInfo) => void> {}
 
-    interface TabReplacedEvent extends chrome.events.Event<(addedTabId: number, removedTabId: number) => void> {}
+    export interface TabReplacedEvent extends chrome.events.Event<(addedTabId: number, removedTabId: number) => void> {}
 
-    interface TabSelectedEvent extends chrome.events.Event<(tabId: number, selectInfo: TabWindowInfo) => void> {}
+    export interface TabSelectedEvent extends chrome.events.Event<(tabId: number, selectInfo: TabWindowInfo) => void> {}
 
-    interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> {}
+    export interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> {}
 
     /**
      * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
@@ -6553,57 +6582,57 @@ declare namespace chrome.tabs {
      * Fired when the highlighted or selected tabs in a window changes.
      * @since Chrome 18.
      */
-    var onHighlighted: TabHighlightedEvent;
+    export var onHighlighted: TabHighlightedEvent;
     /** Fired when a tab is closed. */
-    var onRemoved: TabRemovedEvent;
+    export var onRemoved: TabRemovedEvent;
     /** Fired when a tab is updated. */
-    var onUpdated: TabUpdatedEvent;
+    export var onUpdated: TabUpdatedEvent;
     /** Fired when a tab is attached to a window, for example because it was moved between windows. */
-    var onAttached: TabAttachedEvent;
+    export var onAttached: TabAttachedEvent;
     /**
      * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached.
      */
-    var onMoved: TabMovedEvent;
+    export var onMoved: TabMovedEvent;
     /** Fired when a tab is detached from a window, for example because it is being moved between windows. */
-    var onDetached: TabDetachedEvent;
+    export var onDetached: TabDetachedEvent;
     /** Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. */
-    var onCreated: TabCreatedEvent;
+    export var onCreated: TabCreatedEvent;
     /**
      * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set.
      * @since Chrome 18.
      */
-    var onActivated: TabActivatedEvent;
+    export var onActivated: TabActivatedEvent;
     /**
      * Fired when a tab is replaced with another tab due to prerendering or instant.
      * @since Chrome 26.
      */
-    var onReplaced: TabReplacedEvent;
+    export var onReplaced: TabReplacedEvent;
     /**
      * @deprecated since Chrome 33. Please use tabs.onActivated.
      * Fires when the selected tab in a window changes.
      */
-    var onSelectionChanged: TabSelectedEvent;
+    export var onSelectionChanged: TabSelectedEvent;
     /**
      * @deprecated since Chrome 33. Please use tabs.onActivated.
      * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to tabs.onUpdated events to be notified when a URL is set.
      */
-    var onActiveChanged: TabSelectedEvent;
+    export var onActiveChanged: TabSelectedEvent;
     /**
      * @deprecated since Chrome 33. Please use tabs.onHighlighted.
      * Fired when the highlighted or selected tabs in a window changes.
      */
-    var onHighlightChanged: TabHighlightedEvent;
+    export var onHighlightChanged: TabHighlightedEvent;
     /**
      * Fired when a tab is zoomed.
      * @since Chrome 38.
      */
-    var onZoomChange: TabZoomChangeEvent;
-    
+    export var onZoomChange: TabZoomChangeEvent;
+
     /**
      * An ID which represents the absence of a browser tab.
      * @since Chrome 46.
      */
-    var TAB_ID_NONE: -1;
+    export var TAB_ID_NONE: -1;
 }
 
 ////////////////////
@@ -6616,7 +6645,7 @@ declare namespace chrome.tabs {
  */
 declare namespace chrome.topSites {
     /** An object encapsulating a most visited URL, such as the URLs on the new tab page. */
-    interface MostVisitedURL {
+    export interface MostVisitedURL {
         /** The most visited URL. */
         url: string;
         /** The title of the page */
@@ -6637,7 +6666,7 @@ declare namespace chrome.topSites {
  */
 declare namespace chrome.tts {
     /** An event from the TTS engine to communicate the status of an utterance. */
-    interface TtsEvent {
+    export interface TtsEvent {
         /** Optional. The index of the current character in the utterance. */
         charIndex?: number;
         /** Optional. The error description, if the event type is 'error'. */
@@ -6650,7 +6679,7 @@ declare namespace chrome.tts {
     }
 
     /** A description of a voice available for speech synthesis. */
-    interface TtsVoice {
+    export interface TtsVoice {
         /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
         lang?: string;
         /**
@@ -6671,7 +6700,7 @@ declare namespace chrome.tts {
         remote?: boolean;
     }
 
-    interface SpeakOptions {
+    export interface SpeakOptions {
         /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
         volume?: number;
         /**
@@ -6751,7 +6780,7 @@ declare namespace chrome.tts {
  * @since Chrome 14.
  */
 declare namespace chrome.ttsEngine {
-    interface SpeakOptions {
+    export interface SpeakOptions {
         /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
         lang?: string;
         /** Optional. The name of the voice to use for synthesis. */
@@ -6772,22 +6801,22 @@ declare namespace chrome.ttsEngine {
         pitch?: number;
     }
 
-    interface TtsEngineSpeakEvent extends chrome.events.Event<(utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void> {}
+    export interface TtsEngineSpeakEvent extends chrome.events.Event<(utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void> {}
 
     /** Called when the user makes a call to tts.speak() and one of the voices from this extension's manifest is the first to match the options object. */
-    var onSpeak: TtsEngineSpeakEvent;
+    export var onSpeak: TtsEngineSpeakEvent;
     /** Fired when a call is made to tts.stop and this extension may be in the middle of speaking. If an extension receives a call to onStop and speech is already stopped, it should do nothing (not raise an error). If speech is in the paused state, this should cancel the paused state. */
-    var onStop: chrome.events.Event<() => void>;
+    export var onStop: chrome.events.Event<() => void>;
     /**
      * Optional: if an engine supports the pause event, it should pause the current utterance being spoken, if any, until it receives a resume event or stop event. Note that a stop event should also clear the paused state.
      * @since Chrome 29.
      */
-    var onPause: chrome.events.Event<() => void>;
+    export var onPause: chrome.events.Event<() => void>;
     /**
      * Optional: if an engine supports the pause event, it should also support the resume event, to continue speaking the current utterance, if any. Note that a stop event should also clear the paused state.
      * @since Chrome 29.
      */
-    var onResume: chrome.events.Event<() => void>;
+    export var onResume: chrome.events.Event<() => void>;
 }
 
 ////////////////////
@@ -6798,7 +6827,7 @@ declare namespace chrome.ttsEngine {
  * @since Chrome 13.
  */
 declare namespace chrome.types {
-    interface ChromeSettingClearDetails {
+    export interface ChromeSettingClearDetails {
         /**
          * Optional.
          * The scope of the ChromeSetting. One of
@@ -6810,7 +6839,7 @@ declare namespace chrome.types {
         scope?: string;
     }
 
-    interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+    export interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
         /**
          * The value of the setting.
          * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
@@ -6827,7 +6856,7 @@ declare namespace chrome.types {
         scope?: string;
     }
 
-    interface ChromeSettingGetDetails {
+    export interface ChromeSettingGetDetails {
         /** Optional. Whether to return the value that applies to the incognito session (default false). */
         incognito?: boolean;
     }
@@ -6835,9 +6864,9 @@ declare namespace chrome.types {
     /**
      * @param details Details of the currently effective value.
      */
-    type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+    export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
-    interface ChromeSettingGetResultDetails {
+    export interface ChromeSettingGetResultDetails {
         /**
          * One of
          * • not_controllable: cannot be controlled by any extension
@@ -6856,10 +6885,10 @@ declare namespace chrome.types {
         incognitoSpecific?: boolean;
     }
 
-    interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> {}
+    export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> {}
 
     /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
-    interface ChromeSetting {
+    export interface ChromeSetting {
         /**
          * Sets the value of a setting.
          * @param details Which setting to change.
@@ -6892,7 +6921,7 @@ declare namespace chrome.types {
  * @since Chrome 43.
  */
 declare namespace chrome.vpnProvider {
-    interface VpnSessionParameters {
+    export interface VpnSessionParameters {
         /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
         address: string;
         /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
@@ -6913,15 +6942,15 @@ declare namespace chrome.vpnProvider {
         dnsServer: string[];
     }
 
-    interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> {}
+    export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> {}
 
-    interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> {}
+    export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> {}
 
-    interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> {}
+    export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> {}
 
-    interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> {}
+    export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> {}
 
-    interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> {}
+    export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> {}
 
     /**
      * Creates a new VPN configuration that persists across multiple login sessions of the user.
@@ -6958,15 +6987,15 @@ declare namespace chrome.vpnProvider {
     export function notifyConnectionStateChanged(state: string, callback?: Function): void;
 
     /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
-    var onPlatformMessage: VpnPlatformMessageEvent;
+    export var onPlatformMessage: VpnPlatformMessageEvent;
     /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
-    var onPacketReceived: VpnPacketReceptionEvent;
+    export var onPacketReceived: VpnPacketReceptionEvent;
     /** Triggered when a configuration created by the extension is removed by the platform. */
-    var onConfigRemoved: VpnConfigRemovalEvent;
+    export var onConfigRemoved: VpnConfigRemovalEvent;
     /** Triggered when a configuration is created by the platform for the extension. */
-    var onConfigCreated: VpnConfigCreationEvent;
+    export var onConfigCreated: VpnConfigCreationEvent;
     /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
-    var onUIEvent: VpnUiEvent;
+    export var onUIEvent: VpnUiEvent;
 }
 
 ////////////////////
@@ -6979,7 +7008,7 @@ declare namespace chrome.vpnProvider {
  * @since Chrome 43.
  */
 declare namespace chrome.wallpaper {
-    interface WallpaperDetails {
+    export interface WallpaperDetails {
         /** Optional. The jpeg or png encoded wallpaper image. */
         data?: any;
         /** Optional. The URL of the wallpaper to be set. */
@@ -7012,19 +7041,20 @@ declare namespace chrome.wallpaper {
  * @since Chrome 16.
  */
 declare namespace chrome.webNavigation {
-    interface GetFrameDetails {
+    export interface GetFrameDetails {
         /**
          * The ID of the process runs the renderer for this tab.
          * @since Chrome 22.
+         * @deprecated since Chrome 49. Frames are now uniquely identified by their tab ID and frame ID; the process ID is no longer needed and therefore ignored.
          */
-        processId: number;
+        processId?: number;
         /** The ID of the tab in which the frame is. */
         tabId: number;
         /** The ID of the frame in the given tab. */
         frameId: number;
     }
 
-    interface GetFrameResultDetails {
+    export interface GetFrameResultDetails {
         /** The URL currently associated with this frame, if the frame identified by the frameId existed at one point in the given tab. The fact that an URL is associated with a given frameId does not imply that the corresponding frame still exists. */
         url: string;
         /** True if the last navigation in this frame was interrupted by an error, i.e. the onErrorOccurred event fired. */
@@ -7033,35 +7063,35 @@ declare namespace chrome.webNavigation {
         parentFrameId: number;
     }
 
-    interface GetAllFrameDetails {
+    export interface GetAllFrameDetails {
         /** The ID of the tab. */
         tabId: number;
     }
 
-    interface GetAllFrameResultDetails extends GetFrameResultDetails {
+    export interface GetAllFrameResultDetails extends GetFrameResultDetails {
         /** The ID of the process runs the renderer for this tab. */
         processId: number;
         /** The ID of the frame. 0 indicates that this is the main frame; a positive value indicates the ID of a subframe. */
         frameId: number;
     }
 
-    interface WebNavigationCallbackDetails {
+    export interface WebNavigationCallbackDetails {
         /** The ID of the tab in which the navigation is about to occur. */
         tabId: number;
         /** The time when the browser was about to start the navigation, in milliseconds since the epoch. */
         timeStamp: number;
     }
 
-    interface WebNavigationUrlCallbackDetails extends WebNavigationCallbackDetails {
+    export interface WebNavigationUrlCallbackDetails extends WebNavigationCallbackDetails {
         url: string;
     }
 
-    interface WebNavigationReplacementCallbackDetails extends WebNavigationCallbackDetails {
+    export interface WebNavigationReplacementCallbackDetails extends WebNavigationCallbackDetails {
         /** The ID of the tab that was replaced. */
         replacedTabId: number;
     }
 
-    interface WebNavigationFramedCallbackDetails extends WebNavigationUrlCallbackDetails {
+    export interface WebNavigationFramedCallbackDetails extends WebNavigationUrlCallbackDetails {
         /** 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique for a given tab and process. */
         frameId: number;
         /**
@@ -7071,12 +7101,12 @@ declare namespace chrome.webNavigation {
         processId: number;
     }
 
-    interface WebNavigationFramedErrorCallbackDetails extends WebNavigationFramedCallbackDetails {
+    export interface WebNavigationFramedErrorCallbackDetails extends WebNavigationFramedCallbackDetails {
         /** The error description. */
         error: string;
     }
 
-    interface WebNavigationSourceCallbackDetails extends WebNavigationUrlCallbackDetails {
+    export interface WebNavigationSourceCallbackDetails extends WebNavigationUrlCallbackDetails {
         /** The ID of the tab in which the navigation is triggered. */
         sourceTabId: number;
         /**
@@ -7088,7 +7118,7 @@ declare namespace chrome.webNavigation {
         sourceFrameId: number;
     }
 
-    interface WebNavigationParentedCallbackDetails extends WebNavigationFramedCallbackDetails {
+    export interface WebNavigationParentedCallbackDetails extends WebNavigationFramedCallbackDetails {
         /**
          * ID of frame that wraps the frame. Set to -1 of no parent frame exists.
          * @since Chrome 24.
@@ -7096,7 +7126,7 @@ declare namespace chrome.webNavigation {
         parentFrameId: number;
     }
 
-    interface WebNavigationTransitionCallbackDetails extends WebNavigationFramedCallbackDetails {
+    export interface WebNavigationTransitionCallbackDetails extends WebNavigationFramedCallbackDetails {
         /**
          * Cause of the navigation.
          * One of: "link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", or "keyword_generated"
@@ -7109,26 +7139,26 @@ declare namespace chrome.webNavigation {
         transitionQualifiers: string[];
     }
 
-    interface WebNavigationEventFilter {
+    export interface WebNavigationEventFilter {
         /** Conditions that the URL being navigated to must satisfy. The 'schemes' and 'ports' fields of UrlFilter are ignored for this event. */
         url: chrome.events.UrlFilter[];
     }
 
-    interface WebNavigationEvent<T extends WebNavigationCallbackDetails> extends chrome.events.Event<(details: T) => void> {
+    export interface WebNavigationEvent<T extends WebNavigationCallbackDetails> extends chrome.events.Event<(details: T) => void> {
         addListener(callback: (details: T) => void, filters?: WebNavigationEventFilter): void;
     }
 
-    interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> {}
+    export interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> {}
 
-    interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> {}
+    export interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> {}
 
-    interface WebNavigationSourceEvent extends WebNavigationEvent<WebNavigationSourceCallbackDetails> {}
+    export interface WebNavigationSourceEvent extends WebNavigationEvent<WebNavigationSourceCallbackDetails> {}
 
-    interface WebNavigationParentedEvent extends WebNavigationEvent<WebNavigationParentedCallbackDetails> {}
+    export interface WebNavigationParentedEvent extends WebNavigationEvent<WebNavigationParentedCallbackDetails> {}
 
-    interface WebNavigationTransitionalEvent extends WebNavigationEvent<WebNavigationTransitionCallbackDetails> {}
+    export interface WebNavigationTransitionalEvent extends WebNavigationEvent<WebNavigationTransitionCallbackDetails> {}
 
-    interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> {}
+    export interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> {}
 
     /**
      * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID.
@@ -7146,29 +7176,29 @@ declare namespace chrome.webNavigation {
     export function getAllFrames(details: GetAllFrameDetails, callback: (details: GetAllFrameResultDetails[] | null) => void): void;
 
     /** Fired when the reference fragment of a frame was updated. All future events for that frame will use the updated URL. */
-    var onReferenceFragmentUpdated: WebNavigationTransitionalEvent;
+    export var onReferenceFragmentUpdated: WebNavigationTransitionalEvent;
     /** Fired when a document, including the resources it refers to, is completely loaded and initialized. */
-    var onCompleted: WebNavigationFramedEvent;
+    export var onCompleted: WebNavigationFramedEvent;
     /**
      * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated URL.
      * @since Chrome 22.
      */
-    var onHistoryStateUpdated: WebNavigationTransitionalEvent;
+    export var onHistoryStateUpdated: WebNavigationTransitionalEvent;
     /** Fired when a new window, or a new tab in an existing window, is created to host a navigation. */
-    var onCreatedNavigationTarget: WebNavigationSourceEvent;
+    export var onCreatedNavigationTarget: WebNavigationSourceEvent;
     /**
      * Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab.
      * @since Chrome 22.
      */
-    var onTabReplaced: WebNavigationReplacementEvent;
+    export var onTabReplaced: WebNavigationReplacementEvent;
     /** Fired when a navigation is about to occur. */
-    var onBeforeNavigate: WebNavigationParentedEvent;
+    export var onBeforeNavigate: WebNavigationParentedEvent;
     /** Fired when a navigation is committed. The document (and the resources it refers to, such as images and subframes) might still be downloading, but at least part of the document has been received from the server and the browser has decided to switch to the new document. */
-    var onCommitted: WebNavigationTransitionalEvent;
+    export var onCommitted: WebNavigationTransitionalEvent;
     /** Fired when the page's DOM is fully constructed, but the referenced resources may not finish loading. */
-    var onDOMContentLoaded: WebNavigationFramedEvent;
+    export var onDOMContentLoaded: WebNavigationFramedEvent;
     /** Fired when an error occurs and the navigation is aborted. This can happen if either a network error occurred, or the user aborted the navigation. */
-    var onErrorOccurred: WebNavigationFramedErrorEvent;
+    export var onErrorOccurred: WebNavigationFramedErrorEvent;
 }
 
 ////////////////////
@@ -7180,20 +7210,20 @@ declare namespace chrome.webNavigation {
  * @since Chrome 17.
  */
 declare namespace chrome.webRequest {
-    interface AuthCredentials {
+    export interface AuthCredentials {
         username: string;
         password: string;
     }
 
     /** An HTTP Header, represented as an object containing a key and either a value or a binaryValue. */
-    interface HttpHeader {
+    export interface HttpHeader {
         name: string;
         value?: string;
         binaryValue?: ArrayBuffer;
     }
 
     /** Returns value for event handlers that have the 'blocking' extraInfoSpec applied. Allows the event handler to modify network requests. */
-    interface BlockingResponse {
+    export interface BlockingResponse {
         /** Optional. If true, the request is cancelled. Used in onBeforeRequest, this prevents the request from being sent. */
         cancel?: boolean;
         /**
@@ -7216,7 +7246,7 @@ declare namespace chrome.webRequest {
     }
 
     /** An object describing filters to apply to webRequest events. */
-    interface RequestFilter {
+    export interface RequestFilter {
         /** Optional. */
         tabId?: number;
         /**
@@ -7226,7 +7256,7 @@ declare namespace chrome.webRequest {
         types?: string[];
         /** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
         urls: string[];
- 
+
         /** Optional. */
         windowId?: number;
     }
@@ -7235,14 +7265,14 @@ declare namespace chrome.webRequest {
      * Contains data uploaded in a URL request.
      * @since Chrome 23.
      */
-    interface UploadData {
+    export interface UploadData {
         /** Optional. An ArrayBuffer with a copy of the data. */
         bytes?: ArrayBuffer;
         /** Optional. A string with the file's path and name. */
         file?: string;
     }
 
-    interface WebRequestBody {
+    export interface WebRequestBody {
         /** Optional. Errors when obtaining request body data. */
         error?: string;
         /**
@@ -7257,12 +7287,12 @@ declare namespace chrome.webRequest {
         raw?: UploadData[];
     }
 
-    interface WebAuthChallenger {
+    export interface WebAuthChallenger {
         host: string;
         port: number;
     }
 
-    interface ResourceRequest {
+    export interface ResourceRequest {
         url: string;
         /** The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to relate different events of the same request. */
         requestId: string;
@@ -7281,17 +7311,17 @@ declare namespace chrome.webRequest {
         timeStamp: number;
     }
 
-    interface WebRequestDetails extends ResourceRequest {
+    export interface WebRequestDetails extends ResourceRequest {
         /** Standard HTTP method. */
         method: string;
     }
 
-    interface WebRequestHeadersDetails extends WebRequestDetails {
+    export interface WebRequestHeadersDetails extends WebRequestDetails {
         /** Optional. The HTTP request headers that are going to be sent out with this request. */
         requestHeaders?: HttpHeader[];
     }
 
-    interface WebRequestBodyDetails extends WebRequestDetails {
+    export interface WebRequestBodyDetails extends WebRequestDetails {
         /**
          * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'.
          * @since Chrome 23.
@@ -7299,10 +7329,10 @@ declare namespace chrome.webRequest {
         requestBody: WebRequestBody;
     }
 
-    interface WebRequestFullDetails extends WebRequestHeadersDetails, WebRequestBodyDetails {
+    export interface WebRequestFullDetails extends WebRequestHeadersDetails, WebRequestBodyDetails {
     }
 
-    interface WebResponseDetails extends ResourceRequest {
+    export interface WebResponseDetails extends ResourceRequest {
         /** HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses that lack a status line). */
         statusLine: string;
         /**
@@ -7312,13 +7342,13 @@ declare namespace chrome.webRequest {
         statusCode: number;
     }
 
-    interface WebResponseHeadersDetails extends WebResponseDetails {
+    export interface WebResponseHeadersDetails extends WebResponseDetails {
         /** Optional. The HTTP response headers that have been received with this response. */
         responseHeaders?: HttpHeader[];
         method: string; /** standard HTTP method i.e. GET, POST, PUT, etc. */
     }
 
-    interface WebResponseCacheDetails extends WebResponseHeadersDetails {
+    export interface WebResponseCacheDetails extends WebResponseHeadersDetails {
         /**
          * Optional.
          * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
@@ -7328,12 +7358,12 @@ declare namespace chrome.webRequest {
         fromCache: boolean;
     }
 
-    interface WebRedirectionResponseDetails extends WebResponseCacheDetails {
+    export interface WebRedirectionResponseDetails extends WebResponseCacheDetails {
         /** The new URL. */
         redirectUrl: string;
     }
 
-    interface WebAuthenticationChallengeDetails extends WebResponseHeadersDetails {
+    export interface WebAuthenticationChallengeDetails extends WebResponseHeadersDetails {
         /** The authentication scheme, e.g. Basic or Digest. */
         scheme: string;
         /** The authentication realm provided by the server, if there is one. */
@@ -7344,62 +7374,62 @@ declare namespace chrome.webRequest {
         isProxy: boolean;
     }
 
-    interface WebResponseErrorDetails extends WebResponseCacheDetails {
+    export interface WebResponseErrorDetails extends WebResponseCacheDetails {
         /** The error description. This string is not guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. */
         error: string;
     }
 
-    interface WebRequestBodyEvent extends chrome.events.Event<(details: WebRequestBodyDetails) => void> {
+    export interface WebRequestBodyEvent extends chrome.events.Event<(details: WebRequestBodyDetails) => void> {
         addListener(callback: (details: WebRequestBodyDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-    interface WebRequestHeadersEvent extends chrome.events.Event<(details: WebRequestHeadersDetails) => void> {
+    export interface WebRequestHeadersEvent extends chrome.events.Event<(details: WebRequestHeadersDetails) => void> {
         addListener(callback: (details: WebRequestHeadersDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-    interface _WebResponseHeadersEvent<T extends WebResponseHeadersDetails> extends chrome.events.Event<(details: T) => void> {
+    export interface _WebResponseHeadersEvent<T extends WebResponseHeadersDetails> extends chrome.events.Event<(details: T) => void> {
         addListener(callback: (details: T) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-    interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> {}
+    export interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> {}
 
-    interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> {}
+    export interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> {}
 
-    interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> {}
+    export interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> {}
 
-    interface WebAuthenticationChallengeEvent extends chrome.events.Event<(details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void> {
+    export interface WebAuthenticationChallengeEvent extends chrome.events.Event<(details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void> {
         addListener(callback: (details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-    interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> {}
+    export interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> {}
 
     /**
      * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often.
      * @since Chrome 23.
      */
-    var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
+    export var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
 
     /** Needs to be called when the behavior of the webRequest handlers has changed to prevent incorrect handling due to caching. This function call is expensive. Don't call it often. */
     export function handlerBehaviorChanged(callback?: Function): void;
 
     /** Fired when a request is about to occur. */
-    var onBeforeRequest: WebRequestBodyEvent;
+    export var onBeforeRequest: WebRequestBodyEvent;
     /** Fired before sending an HTTP request, once the request headers are available. This may occur after a TCP connection is made to the server, but before any HTTP data is sent. */
-    var onBeforeSendHeaders: WebRequestHeadersEvent;
+    export var onBeforeSendHeaders: WebRequestHeadersEvent;
     /** Fired just before a request is going to be sent to the server (modifications of previous onBeforeSendHeaders callbacks are visible by the time onSendHeaders is fired). */
-    var onSendHeaders: WebRequestHeadersEvent;
+    export var onSendHeaders: WebRequestHeadersEvent;
     /** Fired when HTTP response headers of a request have been received. */
-    var onHeadersReceived: WebResponseHeadersEvent;
+    export var onHeadersReceived: WebResponseHeadersEvent;
     /** Fired when an authentication failure is received. The listener has three options: it can provide authentication credentials, it can cancel the request and display the error page, or it can take no action on the challenge. If bad user credentials are provided, this may be called multiple times for the same request. */
-    var onAuthRequired: WebAuthenticationChallengeEvent;
+    export var onAuthRequired: WebAuthenticationChallengeEvent;
     /** Fired when the first byte of the response body is received. For HTTP requests, this means that the status line and response headers are available. */
-    var onResponseStarted: WebResponseCacheEvent;
+    export var onResponseStarted: WebResponseCacheEvent;
     /** Fired when a server-initiated redirect is about to occur. */
-    var onBeforeRedirect: WebRedirectionResponseEvent;
+    export var onBeforeRedirect: WebRedirectionResponseEvent;
     /** Fired when a request is completed. */
-    var onCompleted: WebResponseCacheEvent;
+    export var onCompleted: WebResponseCacheEvent;
     /** Fired when an error occurs. */
-    var onErrorOccurred: WebResponseErrorEvent;
+    export var onErrorOccurred: WebResponseErrorEvent;
 }
 
 ////////////////////
@@ -7486,20 +7516,20 @@ declare namespace chrome.webstore {
      */
     export function install(failureCallback?: (error: string, errorCode?: string) => void): void;
 
-    interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> {}
+    export interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> {}
 
-    interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> {}
+    export interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> {}
 
     /**
      * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
      * @since Chrome 35.
      */
-    var onInstallStageChanged: InstallationStageEvent;
+    export var onInstallStageChanged: InstallationStageEvent;
     /**
      * Fired periodically with the download progress of an inline install. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
      * @since Chrome 35.
      */
-    var onDownloadProgress: DownloadProgressEvent;
+    export var onDownloadProgress: DownloadProgressEvent;
 }
 
 ////////////////////
@@ -7511,7 +7541,7 @@ declare namespace chrome.webstore {
  * @since Chrome 5.
  */
 declare namespace chrome.windows {
-    interface Window {
+    export interface Window {
         /** Array of tabs.Tab objects representing the current tabs in the window. */
         tabs?: chrome.tabs.Tab[];
         /** Optional. The offset of the window from the top edge of the screen in pixels. Under some circumstances a Window may not be assigned top property, for example when querying closed windows from the sessions API. */
@@ -7551,7 +7581,7 @@ declare namespace chrome.windows {
         sessionId?: string;
     }
 
-    interface GetInfo {
+    export interface GetInfo {
         /**
          * Optional.
          * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission.
@@ -7565,7 +7595,7 @@ declare namespace chrome.windows {
         windowTypes?: string[];
     }
 
-    interface CreateData {
+    export interface CreateData {
         /**
          * Optional. The id of the tab for which you want to adopt to the new window.
          * @since Chrome 10.
@@ -7616,7 +7646,7 @@ declare namespace chrome.windows {
         state?: string;
     }
 
-    interface UpdateInfo {
+    export interface UpdateInfo {
         /** Optional. The offset from the top edge of the screen to move the window to in pixels. This value is ignored for panels. */
         top?: number;
         /**
@@ -7643,7 +7673,7 @@ declare namespace chrome.windows {
         left?: number;
     }
 
-    interface WindowEventFilter {
+    export interface WindowEventFilter {
         /**
          * Conditions that the window's type being created must satisfy. By default it will satisfy ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
          * Each one of: "normal", "popup", "panel", "app", or "devtools"
@@ -7651,20 +7681,20 @@ declare namespace chrome.windows {
         windowTypes: string[];
     }
 
-    interface WindowIdEvent extends chrome.events.Event<(windowId: number, filters?: WindowEventFilter) => void> {}
+    export interface WindowIdEvent extends chrome.events.Event<(windowId: number, filters?: WindowEventFilter) => void> {}
 
-    interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> {}
+    export interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> {}
 
     /**
      * The windowId value that represents the current window.
      * @since Chrome 18.
      */
-    var WINDOW_ID_CURRENT: number;
+    export var WINDOW_ID_CURRENT: number;
     /**
      * The windowId value that represents the absence of a chrome browser window.
      * @since Chrome 6.
      */
-    var WINDOW_ID_NONE: number;
+    export var WINDOW_ID_NONE: number;
 
     /** Gets details about a window. */
     export function get(windowId: number, callback: (window: chrome.windows.Window) => void): void;
@@ -7718,12 +7748,12 @@ declare namespace chrome.windows {
     export function getLastFocused(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 
     /** Fired when a window is removed (closed). */
-    var onRemoved: WindowIdEvent;
+    export var onRemoved: WindowIdEvent;
     /** Fired when a window is created. */
-    var onCreated: WindowReferenceEvent;
+    export var onCreated: WindowReferenceEvent;
     /**
      * Fired when the currently focused window changes. Will be chrome.windows.WINDOW_ID_NONE if all chrome windows have lost focus.
      * Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one chrome window to another.
      */
-    var onFocusChanged: WindowIdEvent;
+    export var onFocusChanged: WindowIdEvent;
 }
diff --git a/types/chrome/test/chrome-webview.ts b/types/chrome/test/chrome-webview.ts
new file mode 100644
index 0000000000..87ac8d606c
--- /dev/null
+++ b/types/chrome/test/chrome-webview.ts
@@ -0,0 +1,4 @@
+import webview = chrome.webviewTag;
+
+let element: webview.HTMLWebViewElement;
+
diff --git a/types/chrome/test/index.ts b/types/chrome/test/index.ts
index b7b7868ba3..7b37e548b5 100644
--- a/types/chrome/test/index.ts
+++ b/types/chrome/test/index.ts
@@ -188,18 +188,18 @@ function beforeRedditNavigation() {
 
 // for chrome.tabs.InjectDetails.frameId
 function executeScriptFramed () {
-    
+
     const tabId = 123;
     const frameId = 0;
-    
+
     const code = "alert('hi');";
-    
+
     chrome.tabs.executeScript({frameId, code});
     chrome.tabs.insertCSS({frameId, code});
-    
+
     chrome.tabs.executeScript(tabId, {frameId, code});
     chrome.tabs.insertCSS(tabId, {frameId, code});
-    
+
 }
 
 // for chrome.tabs.TAB_ID_NONE
@@ -298,6 +298,42 @@ function testOptionsPage() {
   });
 }
 
+// https://developer.chrome.com/extensions/debugger
+function testDebugger() {
+	chrome.debugger.attach({tabId: 123}, '1.23', () => {
+		console.log('This is a callback!');
+	});
+
+	chrome.debugger.detach({tabId: 123}, () => {
+		console.log('This is a callback!');
+	});
+
+	chrome.debugger.sendCommand(
+		{targetId: 'abc'}, 'Debugger.Cmd', {param1: 'x'}, (result) => {
+			console.log('Do something with the result.' + result);
+	});
+
+	chrome.debugger.getTargets((results) => {
+		for (let result of results) {
+			if (result.tabId == 123) {
+			// Do Something.
+			}
+		}
+	});
+
+	chrome.debugger.onEvent.addListener((source, methodName, params) => {
+		if (source.tabId == 123) {
+			console.log('Hello World.');
+		}
+	});
+
+	chrome.debugger.onDetach.addListener((source, reason) => {
+		if (source.tabId == 123) {
+			console.log('Hello World.');
+		}
+	});
+}
+
 // https://developer.chrome.com/extensions/storage#type-StorageArea
 function testStorage() {
     function getCallback(loadedData: { [key: string]: any; }) {
diff --git a/types/chrome/tsconfig.json b/types/chrome/tsconfig.json
index de1fde90ca..57e4524e5a 100644
--- a/types/chrome/tsconfig.json
+++ b/types/chrome/tsconfig.json
@@ -21,7 +21,9 @@
         "index.d.ts",
         "chrome-app.d.ts",
         "chrome-cast.d.ts",
+        "chrome-webview.d.ts",
         "test/index.ts",
-        "test/chrome-app.ts"
+        "test/chrome-app.ts",
+        "test/chrome-webview.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/chrome/tslint.json b/types/chrome/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chrome/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chui/index.d.ts b/types/chui/index.d.ts
index 7042edd4bd..f80aaa3e5d 100644
--- a/types/chui/index.d.ts
+++ b/types/chui/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/chocolatechipui/chocolatechip-ui
 // Definitions by: Robert Biggs <http://chocolatechip-ui.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
 // ChocolateChip-UI 3.9.1
 /**
  These TypeScript delcarations for ChocolateChip-UI contain interfaces for both ChocolateChipJS and jQuery. Depending on which library you are using, you will get the type interfaces appropriate for it.
@@ -1078,7 +1080,7 @@ interface JQueryStatic {
     data: {
         repeaterName?: any;
     };
-  
+
     /**
      * Use this value to output an index value in a template repeater.
      */
diff --git a/types/chui/tslint.json b/types/chui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/chunked-dc/chunked-dc-tests.ts b/types/chunked-dc/chunked-dc-tests.ts
deleted file mode 100644
index 1bedf11c5a..0000000000
--- a/types/chunked-dc/chunked-dc-tests.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Chunker
-
-let chunker = new Chunker(1337, Uint8Array.of(1, 2, 3), 2);
-for (const chunk of chunker) {
-    // Do smoething with chunk
-}
-while (chunker.hasNext) {
-    const chunk = chunker.next().value;
-}
-
-// Unchunker
-
-let unchunker = new Unchunker();
-unchunker.onMessage = (message: Uint8Array, context: any[]) => {
-    // Do something with the received message
-};
-let chunk = Uint8Array.of(1, 2).buffer;
-unchunker.add(chunk);
-unchunker.gc(1024);
diff --git a/types/chunked-dc/index.d.ts b/types/chunked-dc/index.d.ts
deleted file mode 100644
index 5e57953621..0000000000
--- a/types/chunked-dc/index.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for chunked-dc 0.1
-// Project: https://github.com/saltyrtc/chunked-dc-js
-// Definitions by: Danilo Bargen <https://github.com/dbrgn>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Interfaces
-declare namespace chunkedDc {
-    /** common.ts */
-
-    interface CommonStatic {
-        HEADER_LENGTH: number;
-    }
-
-    /** chunker.ts */
-
-    interface Chunker extends IterableIterator<Uint8Array> {
-        hasNext: boolean;
-        next(): IteratorResult<Uint8Array>;
-        [Symbol.iterator](): IterableIterator<Uint8Array>;
-    }
-
-    interface ChunkerStatic {
-        new(id: number, message: Uint8Array, chunkSize: number): Chunker;
-    }
-
-    /** unchunker.ts */
-
-    type MessageListener = (message: Uint8Array, context?: any) => void;
-
-    interface Unchunker {
-        onMessage: MessageListener;
-        add(chunk: ArrayBuffer, context?: any): void;
-        gc(maxAge: number): number;
-    }
-
-    interface UnchunkerStatic {
-        new(): Unchunker;
-    }
-
-    /** main.ts */
-
-    interface Standalone {
-        Chunker: ChunkerStatic;
-        Unchunker: UnchunkerStatic;
-    }
-}
-
-// Entry point for the packed ES5 version:
-declare var chunkedDc: chunkedDc.Standalone;
-
-// Entry point for the ES2015 version:
-declare var Chunker: chunkedDc.ChunkerStatic;
-declare var Unchunker: chunkedDc.UnchunkerStatic;
diff --git a/types/chunked-dc/tsconfig.json b/types/chunked-dc/tsconfig.json
deleted file mode 100644
index 28dc51c3c3..0000000000
--- a/types/chunked-dc/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "chunked-dc-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/circular-json/circular-json-tests.ts b/types/circular-json/circular-json-tests.ts
index 41ec8f0a36..786ec5cec6 100644
--- a/types/circular-json/circular-json-tests.ts
+++ b/types/circular-json/circular-json-tests.ts
@@ -1,14 +1,10 @@
-
 import CircularJSON = require('circular-json');
 
-var replacer = (key: any, val: any) => {
+const replacer = (key: any, val: any) => {
   return val;
-}
+};
 
-var replacerArray = ['a', 'x'];
-
-// implements JSON interface
-var json_obj: JSON = CircularJSON;
+const replacerArray = ['a', 'x'];
 
 CircularJSON.parse('{"a":"b"}');
 
diff --git a/types/circular-json/index.d.ts b/types/circular-json/index.d.ts
index 1b4e5c1d2b..ce94972de4 100644
--- a/types/circular-json/index.d.ts
+++ b/types/circular-json/index.d.ts
@@ -1,14 +1,7 @@
-// Type definitions for circular-json v0.1.6
+// Type definitions for circular-json 0.4
 // Project: https://github.com/WebReflection/circular-json
 // Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-interface ICircularJSON extends JSON {
-    parse(text: string, reviver?: (key: any, value: any) => any): any;
-    stringify(value: any, replacer?: ((key: string, value: any) => any) | any[], space?: any, placeholder?: boolean): string;
-}
-
-declare var CircularJSON: ICircularJSON;
-
-export = CircularJSON;
+export function parse(text: string, reviver?: (key: any, value: any) => any): any;
+export function stringify(value: any, replacer?: ((key: string, value: any) => any) | Array<number | string> | null, space?: any, placeholder?: boolean): string;
diff --git a/types/circular-json/tslint.json b/types/circular-json/tslint.json
new file mode 100644
index 0000000000..b4b47a0378
--- /dev/null
+++ b/types/circular-json/tslint.json
@@ -0,0 +1,3 @@
+{
+	"extends": "dtslint/dt.json"
+}
diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index b6471ddab6..dd0ec92164 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -52,6 +52,23 @@ function test_config() {
             [ 'list', 'indent', 'blocks', 'align', 'bidi' ],
         ],
     };
+    var config3: CKEDITOR.config = {
+        toolbarGroups: [
+            { name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
+		    { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
+		    { name: 'links', groups: [ 'links' ] },
+		    { name: 'insert', groups: [ 'insert' ] },
+		    { name: 'tools', groups: [ 'tools' ] },
+		    { name: 'document', groups: [ 'mode' ] },
+		    { name: 'about', groups: [ 'about' ] },
+		    '/',
+		    { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+		    { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'paragraph' ] },
+		    '/',
+		    { name: 'styles', groups: [ 'styles' ] },
+		    { name: 'colors', groups: [ 'colors' ] },
+        ],
+    }
 }
 
 function test_dom_comment() {
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 24ff341b38..20882269fd 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for CKEditor
 // Project: http://ckeditor.com/
-// Definitions by: Ondrej Sevcik <https://github.com/ondrejsevcik>
+// Definitions by: Thomas Wittwer <https://github.com/wittwert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // WORK-IN-PROGRESS: Any contribution support welcomed.
@@ -602,13 +602,17 @@ declare namespace CKEDITOR {
         browserContextMenuOnCtrl?: boolean;
 
         clipboard_defaultContentType?: string; // html | text
+        clipboard_notificationDuration?: number;
         codeSnippet_codeClass?: string;
         codeSnippet_languages?: Object;
         coceSnippet_theme?: string;
         colorButton_backStyle?: config.styleObject;
         colorButton_colors?: string;
+        colorButton_colorsPerRow?: number;
+        colorButton_enableAutomatic?: boolean;
         colorButton_enableMore?: boolean;
         colorButton_foreStyle?: config.styleObject;
+        colorButton_normalizeBackground?: boolean;
         contentsCss?: string | string[];
         contentsLangDirection?: string;
         contentsLanguage?: string;
@@ -727,7 +731,7 @@ declare namespace CKEDITOR {
         magicline_holdDistance?: number;
         magicline_keystrokeNext?: number;
         magicline_keystrokePrevious?: number;
-        magicline_tabuList?: number;
+        magicline_tabuList?: string[];
         magicline_triggerOffset?: number;
         mathJaxLib?: string;
         menu_groups?: string;
@@ -814,7 +818,7 @@ declare namespace CKEDITOR {
         toolbar?: string | (string | string[])[];
         toolbarCanCollapse?: boolean;
         toolbarGroupCycling?: boolean;
-        toolbarGroups?: toolbarGroups[];
+        toolbarGroups?: (toolbarGroups | string)[];
         toolbarLocation?: string;
         toolbarStartupExpanded?: boolean;
 
diff --git a/types/ckeditor/tslint.json b/types/ckeditor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ckeditor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/clamp-js-main/clamp-js-main-tests.ts b/types/clamp-js-main/clamp-js-main-tests.ts
new file mode 100644
index 0000000000..f903b82a06
--- /dev/null
+++ b/types/clamp-js-main/clamp-js-main-tests.ts
@@ -0,0 +1,22 @@
+import clamp, { ClampOptions, ClampResponse } from 'clamp-js-main';
+
+const element: HTMLElement = document.createElement('div');
+element.style.setProperty('width', '5px');
+element.style.setProperty('height', '5px');
+element.style.setProperty('font-size', '12px');
+
+const span: HTMLSpanElement = document.createElement('span');
+span.textContent = "Lorem ipsum. Lorem ipsum";
+element.appendChild(span);
+
+const simpleClamp: ClampResponse = clamp(element);
+
+const options: ClampOptions = {
+  clamp: 2,
+  useNativeClamp: false,
+  splitOnChars: ['.'],
+  animate: true,
+  truncationChar: '--',
+  truncationHTML: '<span></span>'
+};
+const clampWithOptions: ClampResponse = clamp(element, options);
diff --git a/types/clamp-js-main/index.d.ts b/types/clamp-js-main/index.d.ts
new file mode 100644
index 0000000000..75286172cb
--- /dev/null
+++ b/types/clamp-js-main/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for clamp-js-main 0.11
+// Project: https://github.com/jmenglis/clamp-js-main#readme
+// Definitions by: Sinziana Nicolae <https://github.com/sinziananicolae>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface ClampOptions {
+    clamp?: number|string;
+    useNativeClamp?: boolean;
+    splitOnChars?: string[];
+    animate?: boolean;
+    truncationChar?: string;
+    truncationHTML?: string | null;
+}
+
+export interface ClampResponse {
+    original: string;
+    clamped: string;
+}
+
+export default function clamp(element: HTMLElement, options?: ClampOptions): ClampResponse;
diff --git a/types/clamp-js-main/tsconfig.json b/types/clamp-js-main/tsconfig.json
new file mode 100644
index 0000000000..5c05321afc
--- /dev/null
+++ b/types/clamp-js-main/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clamp-js-main-tests.ts"
+    ]
+}
diff --git a/types/clamp-js-main/tslint.json b/types/clamp-js-main/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/clamp-js-main/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cldrjs/tslint.json b/types/cldrjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cldrjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/clean-css/tslint.json b/types/clean-css/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/clean-css/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/clean-webpack-plugin/clean-webpack-plugin-tests.ts b/types/clean-webpack-plugin/clean-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..6d60f36d51
--- /dev/null
+++ b/types/clean-webpack-plugin/clean-webpack-plugin-tests.ts
@@ -0,0 +1,17 @@
+import CleanWebpackPlugin = require('clean-webpack-plugin');
+
+const paths = [
+	'path',
+	'glob/**/*.js',
+];
+
+new CleanWebpackPlugin(paths);
+new CleanWebpackPlugin(paths, 'root-directory');
+new CleanWebpackPlugin(paths, {});
+new CleanWebpackPlugin(paths, {
+	root: 'root-directory',
+	verbose: true,
+	dry: true,
+	watch: true,
+	exclude: ['a, b'],
+});
diff --git a/types/clean-webpack-plugin/index.d.ts b/types/clean-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..7fc45cc3e4
--- /dev/null
+++ b/types/clean-webpack-plugin/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for clean-webpack-plugin 0.1
+// Project: https://github.com/johnagan/clean-webpack-plugin
+// Definitions by: Jed Fox <https://github.com/j-f1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'webpack';
+
+export = CleanWebpackPlugin;
+
+declare class CleanWebpackPlugin extends Plugin {
+    /**
+     * @param paths A glob or array of globs to delete
+     */
+    constructor(paths: string | ReadonlyArray<string>, options?: string | CleanWebpackPlugin.Options);
+}
+
+declare namespace CleanWebpackPlugin {
+    interface Options {
+        /**
+         * Absolute path to your webpack root folder (paths appended to this)
+         * Default: root of your package
+         */
+        root?: string;
+        /**
+         * Write logs to the console.
+         */
+        verbose?: boolean;
+        /**
+         * Set to `true` to emulate deletion without actually removing any files.
+         */
+        dry?: boolean;
+        /**
+         * If true, remove files on recompile.
+         */
+        watch?: boolean;
+        /**
+         * Instead of removing whole path recursively,
+         * remove all path's content with exclusion of provided immediate children.
+         * Good for not removing shared files from build directories.
+         */
+        exclude?: ReadonlyArray<string>;
+        /**
+         * Allow the plugin to clean folders outside of the webpack root
+         */
+        allowExternal?: boolean;
+    }
+}
diff --git a/types/clean-webpack-plugin/tsconfig.json b/types/clean-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..2f342b4d42
--- /dev/null
+++ b/types/clean-webpack-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clean-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/clean-webpack-plugin/tslint.json b/types/clean-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/clean-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cleave.js/cleave.js-tests.tsx b/types/cleave.js/cleave.js-tests.tsx
new file mode 100644
index 0000000000..3bbc6570a3
--- /dev/null
+++ b/types/cleave.js/cleave.js-tests.tsx
@@ -0,0 +1,17 @@
+import * as React from "react";
+import Cleave = require("cleave.js");
+import CleaveReact = require("cleave.js/react");
+
+const Example1 = () => {
+    Cleave("#my-input", { phone: true });
+};
+
+const ExampleReact1 = (props: any) => {
+    return (
+        <CleaveReact
+            value="test"
+            className="form-control"
+            options={{ phone: true }}
+        />
+    );
+};
diff --git a/types/cleave.js/index.d.ts b/types/cleave.js/index.d.ts
new file mode 100644
index 0000000000..17e8c1c512
--- /dev/null
+++ b/types/cleave.js/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for cleave.js 1.0
+// Project: https://github.com/nosir/cleave.js
+// Definitions by: C Lentfort <https://github.com/clentfort>, J Giancono <https://github.com/jasongi-at-sportsbet>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { CleaveOptions } from './options';
+
+declare function Cleave(selector: string, options: CleaveOptions): void;
+export = Cleave;
diff --git a/types/cleave.js/options.d.ts b/types/cleave.js/options.d.ts
new file mode 100644
index 0000000000..81757fe097
--- /dev/null
+++ b/types/cleave.js/options.d.ts
@@ -0,0 +1,63 @@
+// Credit Card Options
+export type CreditCardType =
+    | "amex"
+    | "dankort"
+    | "diners"
+    | "discover"
+    | "instapayment"
+    | "jcb"
+    | "maestro"
+    | "mastercard"
+    | "uatp"
+    | "unknown"
+    | "unionPay"
+    | "mir"
+    | "visa";
+export type CreditCardTypeChangeHandler = (owner: HTMLInputElement, type: CreditCardType) => void;
+
+export interface CleaveOptions {
+    creditCard?: boolean;
+    creditCardStrictMode?: boolean;
+    creditCardType?: string;
+    onCreditCardTypeChanged?: CreditCardTypeChangeHandler;
+}
+
+// Phone Options
+export interface CleaveOptions {
+    phone?: boolean;
+    phoneRegionCode?: string;
+}
+
+// Date Options
+export interface CleaveOptions {
+    date?: boolean;
+    datePattern?: ReadonlyArray<string>;
+}
+
+// Numeral Options
+export type NumeralThousandsGroupStyleType = "lakh" | "thousand" | "wan" | "none";
+
+export interface CleaveOptions {
+    numeral?: boolean;
+    numeralDecimalMark?: string;
+    numeralDecimalScale?: number;
+    numeralIntegerScale?: number;
+    numeralPositiveOnly?: boolean;
+    numeralThousandsGroupStyle?: NumeralThousandsGroupStyleType;
+    stripLeadingZeroes?: boolean;
+}
+
+// Extra Options
+export interface CleaveOptions {
+    blocks?: ReadonlyArray<number>;
+    copyDelimiter?: boolean;
+    delimiter?: string;
+    delimiters?: ReadonlyArray<string>;
+    initValue?: any;
+    lowercase?: boolean;
+    numericOnly?: boolean;
+    prefix?: string;
+    noImmediatePrefix?: boolean;
+    rawValueTrimPrefix?: boolean;
+    uppercase?: boolean;
+}
diff --git a/types/cleave.js/react/index.d.ts b/types/cleave.js/react/index.d.ts
new file mode 100644
index 0000000000..6d40ea4ed5
--- /dev/null
+++ b/types/cleave.js/react/index.d.ts
@@ -0,0 +1,12 @@
+import * as React from "react";
+import { CleaveOptions } from "../options";
+
+type InitHandler = (owner: React.ReactInstance) => void;
+
+interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
+    onInit?: InitHandler;
+    options: CleaveOptions;
+}
+
+declare var Cleave: React.ComponentClass<Props>;
+export = Cleave;
diff --git a/types/cleave.js/tsconfig.json b/types/cleave.js/tsconfig.json
new file mode 100644
index 0000000000..40e69541bc
--- /dev/null
+++ b/types/cleave.js/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "cleave.js-tests.tsx",
+        "index.d.ts",
+        "options.d.ts",
+        "react/index.d.ts"
+    ]
+}
diff --git a/types/cleave.js/tslint.json b/types/cleave.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cleave.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cli-color/tslint.json b/types/cli-color/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cli-color/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cli-spinner/cli-spinner-tests.ts b/types/cli-spinner/cli-spinner-tests.ts
new file mode 100644
index 0000000000..a574a334fd
--- /dev/null
+++ b/types/cli-spinner/cli-spinner-tests.ts
@@ -0,0 +1,27 @@
+import { Spinner } from 'cli-spinner';
+
+let spinner: Spinner = new Spinner();
+spinner.setSpinnerString('|/-\\');
+spinner.start();
+
+spinner = new Spinner('processing.. %s');
+
+spinner = new Spinner({
+    text: 'processing.. %s',
+    stream: process.stderr,
+    onTick(msg) {
+        this.clearLine(this.stream);
+        this.stream.write(msg);
+    },
+});
+
+spinner = spinner.start();
+spinner = spinner.stop().stop(true).stop(false);
+spinner = spinner.clearLine(process.stdout);
+spinner = spinner.setSpinnerDelay(100);
+spinner = spinner.setSpinnerString('My spinner string');
+spinner = spinner.setSpinnerTitle('My spinner title');
+
+const isSpinning: boolean = spinner.isSpinning();
+
+const Spinner2: typeof Spinner = Spinner.setDefaultSpinnerDelay(100).setDefaultSpinnerString('Other spinner string');
diff --git a/types/cli-spinner/index.d.ts b/types/cli-spinner/index.d.ts
new file mode 100644
index 0000000000..dad05fb8ac
--- /dev/null
+++ b/types/cli-spinner/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for cli-spinner 0.2
+// Project: https://github.com/helloIAmPau/node-spinner
+// Definitions by: Jay Anslow <https://github.com/janslow>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface Options {
+    text?: string;
+    stream?: NodeJS.WritableStream;
+    onTick?(this: Spinner, msg: string): void;
+}
+
+export class Spinner {
+    static setDefaultSpinnerString(spinnerString: string | number): typeof Spinner;
+    static setDefaultSpinnerDelay(spinnerDelay: number): typeof Spinner;
+
+    readonly stream: NodeJS.WritableStream;
+
+    constructor(titleOrOptions?: string | Options);
+
+    start(): this;
+    stop(clear?: boolean): this;
+    isSpinning(): boolean;
+    clearLine(stream: NodeJS.WritableStream): this;
+    setSpinnerString(spinnerString: string | number): this;
+    setSpinnerTitle(title: string): this;
+    setSpinnerDelay(spinnerDelay: number): this;
+}
diff --git a/types/cli-spinner/tsconfig.json b/types/cli-spinner/tsconfig.json
new file mode 100644
index 0000000000..61c966becc
--- /dev/null
+++ b/types/cli-spinner/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cli-spinner-tests.ts"
+    ]
+}
diff --git a/types/cli-spinner/tslint.json b/types/cli-spinner/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cli-spinner/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cli/cli-tests.ts b/types/cli/cli-tests.ts
index 294cb7dd8b..2a88a216db 100644
--- a/types/cli/cli-tests.ts
+++ b/types/cli/cli-tests.ts
@@ -52,7 +52,8 @@ cli.main(function (args, options) {
                 }
                 return str;
             }
-            for (i = 0, l = this.argc; i < l; i++) {
+            var l: number = this.argc;
+            for (i = 0; i < l; i++) {
                 args[i] = escape(args[i]);
             }
             options.separator = escape(options.separator);
diff --git a/types/cli/tslint.json b/types/cli/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cli/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cliff/tslint.json b/types/cliff/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cliff/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/clipboard-js/tslint.json b/types/clipboard-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/clipboard-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/clipboard/index.d.ts b/types/clipboard/index.d.ts
index 0aa51518dd..76d28674d6 100644
--- a/types/clipboard/index.d.ts
+++ b/types/clipboard/index.d.ts
@@ -8,7 +8,7 @@ declare class Clipboard {
 
     /**
      * Subscribes to events that indicate the result of a copy/cut operation.
-     * @param type {"success" | "error"} Event type ('success' or 'error').
+     * @param type Event type ('success' or 'error').
      * @param handler Callback function.
      */
     on(type: "success" | "error", handler: (e: Clipboard.Event) => void): this;
@@ -29,22 +29,21 @@ declare namespace Clipboard {
     interface Options {
         /**
          * Overwrites default command ('cut' or 'copy').
-         * @param {Element} elem Current element
-         * @returns {String} Only 'cut' or 'copy'.
+         * @param elem Current element
          */
-        action?(elem: Element): string;
+        action?(elem: Element): "cut" | "copy";
 
         /**
          * Overwrites default target input element.
-         * @param {Element} elem Current element
-         * @returns {Element} <input> element to use.
+         * @param elem Current element
+         * @returns <input> element to use.
          */
         target?(elem: Element): Element;
 
         /**
          * Returns the explicit text to copy.
-         * @param {Element} elem Current element
-         * @returns {String} Text to be copied.
+         * @param elem Current element
+         * @returns Text to be copied.
          */
         text?(elem: Element): string;
     }
diff --git a/types/clndr/package.json b/types/clndr/package.json
index 770614d9be..eaacac663e 100644
--- a/types/clndr/package.json
+++ b/types/clndr/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.8.3"
     }
-}
\ No newline at end of file
+}
diff --git a/types/clone/tslint.json b/types/clone/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/clone/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/closure-compiler/tslint.json b/types/closure-compiler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/closure-compiler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cloud-env/tslint.json b/types/cloud-env/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cloud-env/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/clusterize.js/clusterize.js-tests.ts b/types/clusterize.js/clusterize.js-tests.ts
new file mode 100644
index 0000000000..acbfbc36f8
--- /dev/null
+++ b/types/clusterize.js/clusterize.js-tests.ts
@@ -0,0 +1,20 @@
+import Clusterize = require('clusterize.js');
+
+const options: Clusterize.Options = { contentId: '', scrollId: '' };
+const clusterize = new Clusterize(options);
+
+clusterize.append(['<li></li>']);
+
+clusterize.prepend(['<li></li>']);
+
+clusterize.getRowsAmount();
+
+clusterize.update(['<li></li>']);
+
+clusterize.getScrollProgress();
+
+clusterize.refresh();
+
+clusterize.clear();
+
+clusterize.destroy();
diff --git a/types/clusterize.js/index.d.ts b/types/clusterize.js/index.d.ts
new file mode 100644
index 0000000000..7c549761d6
--- /dev/null
+++ b/types/clusterize.js/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for clusterize.js 0.17
+// Project: https://github.com/NeXTs/Clusterize.js
+// Definitions by: Pr1st0n <https://github.com/Pr1st0n>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Clusterize {
+    constructor(options: Clusterize.Options);
+
+    destroy(clean?: boolean): void;
+    refresh(force?: boolean): void;
+    clear(): void;
+    getRowsAmount(): number;
+    getScrollProgress(): number;
+    update(data?: string[]): void;
+    append(rows: string[]): void;
+    prepend(rows: string[]): void;
+}
+
+declare namespace Clusterize {
+    interface Options {
+        scrollId: string;
+        contentId: string;
+        rows?: string[];
+        tag?: string;
+        rows_in_block?: number;
+        blocks_in_cluster?: number;
+        show_no_data_row?: boolean;
+        no_data_text?: string;
+        no_data_class?: string;
+        keep_parity?: boolean;
+        callbacks?: Callbacks;
+    }
+
+    interface Callbacks {
+        clusterWillChange?(cb: () => void): void;
+        clusterChanged?(cb: () => void): void;
+        scrollingProgress?(cb: (progress: number) => void): void;
+    }
+}
+
+export = Clusterize;
diff --git a/types/clusterize.js/tsconfig.json b/types/clusterize.js/tsconfig.json
new file mode 100644
index 0000000000..10ca5c2a1a
--- /dev/null
+++ b/types/clusterize.js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clusterize.js-tests.ts"
+    ]
+}
diff --git a/types/clusterize.js/tslint.json b/types/clusterize.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/clusterize.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cmd-shim/cmd-shim-tests.ts b/types/cmd-shim/cmd-shim-tests.ts
new file mode 100644
index 0000000000..aa022b087f
--- /dev/null
+++ b/types/cmd-shim/cmd-shim-tests.ts
@@ -0,0 +1,8 @@
+import cmdShim = require('cmd-shim');
+
+cmdShim('./whatever/bin.js', './.bin/my-bin', (err) => {
+    if (err) throw err;
+});
+cmdShim.ifExists('./whatever/bin.js', './.bin/my-bin', (err) => {
+    if (err) throw err;
+});
diff --git a/types/cmd-shim/index.d.ts b/types/cmd-shim/index.d.ts
new file mode 100644
index 0000000000..2360cd9f9e
--- /dev/null
+++ b/types/cmd-shim/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for cmd-shim 2.0
+// Project: https://github.com/ForbesLindesay/cmd-shim
+// Definitions by: Andrew Bradley <https://github.com/cspotcode>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ *
+ * Create a cmd shim at `to` for the command line program at `from`. e.g.
+ *
+ *     var cmdShim = require('cmd-shim');
+ *     cmdShim(__dirname + '/cli.js', '/usr/bin/command-name', function (err) {
+ *         if (err) throw err;
+ *     });
+ */
+// tslint:disable-next-line strict-export-declare-modifiers
+declare function cmdShim(from: string, to: string, cb: (err: any) => void): undefined;
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare namespace cmdShim {
+    /**
+     * Create a cmd shim at `to` for the command line program at `from`, but will just
+     * continue if the file does not exist.
+     *
+     *     var cmdShim = require('cmd-shim');
+     *     cmdShim.ifExists(__dirname + '/cli.js', '/usr/bin/command-name', function (err) {
+     *         if (err) throw err;
+     *     });
+     */
+    function ifExists(from: string, to: string, cb: (err: any) => void): undefined;
+}
+
+// tslint:disable-next-line strict-export-declare-modifiers
+export = cmdShim;
diff --git a/types/cmd-shim/tsconfig.json b/types/cmd-shim/tsconfig.json
new file mode 100644
index 0000000000..753e3b8c58
--- /dev/null
+++ b/types/cmd-shim/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cmd-shim-tests.ts"
+    ]
+}
diff --git a/types/cmd-shim/tslint.json b/types/cmd-shim/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cmd-shim/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/co-body/index.d.ts b/types/co-body/index.d.ts
index 0393db0a94..7906f38e81 100644
--- a/types/co-body/index.d.ts
+++ b/types/co-body/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/cojs/co-body
 // Definitions by: Joshua DeVinney <https://github.com/geoffreak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 /// <reference types="koa"/>
@@ -26,6 +27,7 @@ declare namespace CoBody {
         strict?: boolean;
         queryString?: qs.IParseOptions;
         jsonTypes?: string[];
+        returnRawBody?: boolean;
         formTypes?: string[];
         textTypes?: string[];
         encoding?: string;
diff --git a/types/co-body/tslint.json b/types/co-body/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/co-body/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 88989b2ef2..ef075b9d45 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/marijnh/CodeMirror
 // Definitions by: mihailik <https://github.com/mihailik>
 //                 nrbernard <https://github.com/nrbernard>
+//                 Pr1st0n <https://github.com/Pr1st0n>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = CodeMirror;
@@ -105,6 +106,8 @@ declare namespace CodeMirror {
 
     type DOMEvent = 'mousedown' | 'dblclick' | 'touchstart' | 'contextmenu' | 'keydown' | 'keypress' | 'keyup' | 'cut' | 'copy' | 'paste' | 'dragstart' | 'dragenter' | 'dragover' | 'dragleave' | 'drop';
 
+    type CoordsMode = 'window' | 'page' | 'local';
+
     interface Token {
         /** The character(on the given line) at which the token starts. */
         start: number;
@@ -196,12 +199,15 @@ declare namespace CodeMirror {
         class can be left off to remove all classes for the specified node, or be a string to remove only a specific class. */
         removeLineClass(line: any, where: string, class_?: string): CodeMirror.LineHandle;
 
-        /**
-         * Compute the line at the given pixel height.
-         *
-         * `mode` is the relative element to use to compute this line - defaults to 'page' if not specified
-         */
-        lineAtHeight(height: number, mode?: 'window' | 'page' | 'local'): number
+        /** Compute the line at the given pixel height. mode is the relative element
+        to use to compute this line, it may be "window", "page" (the default), or "local" */
+        lineAtHeight(height: number, mode?: CoordsMode): number;
+
+        /** Computes the height of the top of a line, in the coordinate system specified by mode, it may be "window",
+        "page" (the default), or "local". When a line below the bottom of the document is specified, the returned value
+        is the bottom of the last line in the document. By default, the position of the actual text is returned.
+        If includeWidgets is true and the line has line widgets, the position above the first line widget is returned. */
+        heightAtLine(line: any, mode?: CoordsMode, includeWidgets?: boolean): number;
 
         /** Returns the line number, text content, and marker status of the given line, which can be either a number or a line handle. */
         lineInfo(line: any): {
@@ -267,25 +273,28 @@ declare namespace CodeMirror {
         scrollIntoView(pos: { from: CodeMirror.Position, to: CodeMirror.Position }, margin: number): void;
 
         /** Returns an { left , top , bottom } object containing the coordinates of the cursor position.
-        If mode is "local" , they will be relative to the top-left corner of the editable document.
+        If mode is "local", they will be relative to the top-left corner of the editable document.
         If it is "page" or not given, they are relative to the top-left corner of the page.
         where is a boolean indicating whether you want the start(true) or the end(false) of the selection. */
-        cursorCoords(where: boolean, mode: string): { left: number; top: number; bottom: number; };
+        cursorCoords(where: boolean, mode?: CoordsMode): { left: number; top: number; bottom: number; };
 
         /** Returns an { left , top , bottom } object containing the coordinates of the cursor position.
-        If mode is "local" , they will be relative to the top-left corner of the editable document.
+        If mode is "local", they will be relative to the top-left corner of the editable document.
         If it is "page" or not given, they are relative to the top-left corner of the page.
         where specifies the precise position at which you want to measure. */
-        cursorCoords(where: CodeMirror.Position, mode: string): { left: number; top: number; bottom: number; };
+        cursorCoords(where: CodeMirror.Position, mode?: CoordsMode): { left: number; top: number; bottom: number; };
 
-        /** Returns the position and dimensions of an arbitrary character.pos should be a { line , ch } object.
+        /** Returns the position and dimensions of an arbitrary character. pos should be a { line , ch } object.
+        If mode is "local", they will be relative to the top-left corner of the editable document.
+        If it is "page" or not given, they are relative to the top-left corner of the page.
         This differs from cursorCoords in that it'll give the size of the whole character,
         rather than just the position that the cursor would have when it would sit at that position. */
-        charCoords(pos: CodeMirror.Position, mode: string): { left: number; right: number; top: number; bottom: number; };
+        charCoords(pos: CodeMirror.Position, mode?: CoordsMode): { left: number; right: number; top: number; bottom: number; };
 
         /** Given an { left , top } object , returns the { line , ch } position that corresponds to it.
-        The optional mode parameter determines relative to what the coordinates are interpreted. It may be "window" , "page"(the default) , or "local". */
-        coordsChar(object: { left: number; top: number; }, mode?: string): CodeMirror.Position;
+        The optional mode parameter determines relative to what the coordinates are interpreted.
+        It may be "window", "page" (the default), or "local". */
+        coordsChar(object: { left: number; top: number; }, mode?: CoordsMode): CodeMirror.Position;
 
         /** Returns the line height of the default font for the editor. */
         defaultTextHeight(): number;
@@ -304,7 +313,7 @@ declare namespace CodeMirror {
         refresh(): void;
 
         /** Retrieves information about the token the current mode found before the given position (a {line, ch} object). */
-        getTokenAt(pos: CodeMirror.Position): Token;
+        getTokenAt(pos: CodeMirror.Position, precise?: boolean): Token;
 
         /** This is similar to getTokenAt, but collects all tokens for a given line into an array. */
         getLineTokens(line: number, precise?: boolean): Token[];
@@ -328,6 +337,11 @@ declare namespace CodeMirror {
         "subtract" Reduce the indentation of the line. */
         indentLine(line: number, dir?: string): void;
 
+        /** Tells you whether the editor's content can be edited by the user. */
+        isReadOnly(): boolean;
+
+        /** Runs the command with the given name on the editor. */
+        execCommand(name: string): void;
 
         /** Give the editor focus. */
         focus(): void;
@@ -487,18 +501,24 @@ declare namespace CodeMirror {
         Note that line handles have a text property containing the line's content (as a string). */
         eachLine(start: number, end: number, f: (line: CodeMirror.LineHandle) => void ): void;
 
-        /** Set the editor content as 'clean', a flag that it will retain until it is edited, and which will be set again when such an edit is undone again.
-        Useful to track whether the content needs to be saved. */
+        /** Set the editor content as 'clean', a flag that it will retain until it is edited, and which will be set again 
+        when such an edit is undone again. Useful to track whether the content needs to be saved. This function is deprecated 
+        in favor of changeGeneration, which allows multiple subsystems to track different notions of cleanness without interfering.*/
         markClean(): void;
+        
+        /** Returns a number that can later be passed to isClean to test whether any edits were made (and not undone) in the 
+        meantime. If closeEvent is true, the current history event will be ‘closed’, meaning it can't be combined with further 
+        changes (rapid typing or deleting events are typically combined).*/
+        changeGeneration(closeEvent?: boolean): number;
 
-        /** Returns whether the document is currently clean (not modified since initialization or the last call to markClean). */
-        isClean(): boolean;
-
-
+        /** Returns whether the document is currently clean — not modified since initialization or the last call to markClean if 
+        no argument is passed, or since the matching call to changeGeneration if a generation value is given. */
+        isClean(generation?: number): boolean;
+        
 
         /** Get the currently selected code. */
         getSelection(): string;
-        
+
         /** Returns an array containing a string for each selection, representing the content of the selections. */
         getSelections(lineSep?: string): Array<string>;
 
@@ -521,8 +541,14 @@ declare namespace CodeMirror {
         /** Set the cursor position.You can either pass a single { line , ch } object , or the line and the character as two separate parameters. */
         setCursor(pos: CodeMirror.Position): void;
 
-        /** Set the selection range.anchor and head should be { line , ch } objects.head defaults to anchor when not given. */
-        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position): void;
+        /** Set a single selection range. anchor and head should be {line, ch} objects. head defaults to anchor when not given. */
+        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position, options?: { bias?: number, origin?: string, scroll?: boolean }): void;
+
+        /** Sets a new set of selections. There must be at least one selection in the given array. When primary is a
+        number, it determines which selection is the primary one. When it is not given, the primary index is taken from
+        the previous selection, or set to the last range if the previous selection had less ranges than the new one.
+        Supports the same options as setSelection. */
+        setSelections(ranges: Array<{ anchor: CodeMirror.Position, head: CodeMirror.Position }>, primary?: number, options?: { bias?: number, origin?: string, scroll?: boolean }): void;
 
         /** Similar to setSelection , but will, if shift is held or the extending flag is set,
         move the head of the selection while leaving the anchor at its current place.
@@ -678,7 +704,7 @@ declare namespace CodeMirror {
 
     interface EditorChangeCancellable extends CodeMirror.EditorChange {
         /** may be used to modify the change. All three arguments to update are optional, and can be left off to leave the existing value for that field intact. */
-        update(from?: CodeMirror.Position, to?: CodeMirror.Position, text?: string): void;
+        update(from?: CodeMirror.Position, to?: CodeMirror.Position, text?: string[]): void;
 
         cancel(): void;
     }
@@ -762,10 +788,13 @@ declare namespace CodeMirror {
         (it will default to be to the right of all other gutters). These class names are the keys passed to setGutterMarker. */
         gutters?: string[];
 
+        /** Provides an option foldGutter, which can be used to create a gutter with markers indicating the blocks that can be folded. */
+        foldGutter?: boolean;
+
         /** Determines whether the gutter scrolls along with the content horizontally (false)
         or whether it stays fixed during horizontal scrolling (true, the default). */
         fixedGutter?: boolean;
-        
+
         /**
          * Chooses a scrollbar implementation. The default is "native", showing native scrollbars. The core library also
          * provides the "null" style, which completely hides the scrollbars. Addons can implement additional scrollbar models.
@@ -1127,6 +1156,7 @@ declare namespace CodeMirror {
     interface LintStateOptions {
         async: boolean;
         hasGutters: boolean;
+        onUpdateLinting?: (annotationsNotSorted: Annotation[], annotations: Annotation[], codeMirror: Editor) => void;
     }
 
     /**
@@ -1239,14 +1269,14 @@ declare namespace CodeMirror {
            * Left side of the merge view.
            */
           left: DiffView;
-          leftChunks(): MergeViewDiffChunk;
+          leftChunks(): MergeViewDiffChunk[];
           leftOriginal(): Editor;
 
           /**
            * Right side of the merge view.
            */
           right: DiffView;
-          rightChunks(): MergeViewDiffChunk;
+          rightChunks(): MergeViewDiffChunk[];
           rightOriginal(): Editor;
 
           /**
diff --git a/types/codemirror/test/index.ts b/types/codemirror/test/index.ts
index e283abe974..39c601f159 100644
--- a/types/codemirror/test/index.ts
+++ b/types/codemirror/test/index.ts
@@ -68,3 +68,6 @@ myCodeMirror.on(
 );
 
 CodeMirror.registerHelper("lint", "javascript", {});
+
+myCodeMirror.isReadOnly();
+myCodeMirror.execCommand('selectAll');
diff --git a/types/codemirror/tslint.json b/types/codemirror/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/codemirror/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/coffeeify/tslint.json b/types/coffeeify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/coffeeify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/coinbase/coinbase-tests.ts b/types/coinbase/coinbase-tests.ts
new file mode 100644
index 0000000000..793833355e
--- /dev/null
+++ b/types/coinbase/coinbase-tests.ts
@@ -0,0 +1,108 @@
+import * as coinbase from "coinbase";
+
+const client = new coinbase.Client({ apiKey: "key", apiSecret: "secret", version: "2017-10-22" });
+
+client.getAccounts({}, (error: Error, result: coinbase.Account[]): void => undefined);
+
+client.getAccount("abcdef", (error: Error, account: coinbase.Account): void => {
+    account.buy({ amount: "1", commit: false, currency: "BTC", payment_method: "abcdef" }, (error: Error, buy: coinbase.Buy): void => {
+        buy.commit((error: Error, buy: coinbase.Buy): void => undefined);
+    });
+
+    account.createAddress({ name: "foo" }, (error: Error, address: coinbase.Address): void => {
+        address.getTransactions({}, (error: Error, transactions: coinbase.Transaction[]): void => undefined);
+    });
+
+    account.delete((error: Error): void => undefined);
+
+    account.deposit({ amount: "1", commit: false, currency: "USD", payment_method: "abcdef" }, (error: Error, deposit: coinbase.Deposit): void => {
+        deposit.commit((error: Error, deposit: coinbase.Deposit): void => undefined);
+    });
+
+    account.getAddress("abcdef", (error: Error, address: coinbase.Address): void => undefined);
+
+    account.getAddresses((error: Error, address: coinbase.Address[]): void => undefined);
+
+    account.getBuy("abcdef", (error: Error, buy: coinbase.Buy): void => undefined);
+
+    account.getBuys((error: Error, buy: coinbase.Buy[]): void => undefined);
+
+    account.getDeposit("abcdef", (error: Error, deposit: coinbase.Deposit): void => undefined);
+
+    account.getDeposits((error: Error, deposit: coinbase.Deposit[]): void => undefined);
+
+    account.getSell("abcdef", (error: Error, deposit: coinbase.Sell): void => undefined);
+
+    account.getSells((error: Error, deposit: coinbase.Sell[]): void => undefined);
+
+    account.getTransaction("abcdef", (error: Error, deposit: coinbase.Transaction): void => undefined);
+
+    account.getTransactions((error: Error, deposit: coinbase.Transaction[]): void => undefined);
+
+    account.getWithdrawal("abcdef", (error: Error, deposit: coinbase.Withdrawal): void => undefined);
+
+    account.getWithdrawals((error: Error, deposit: coinbase.Withdrawal[]): void => undefined);
+
+    account.requestMoney(
+        { amount: "1", currency: "EUR", description: "foo", to: "bar", type: "request" },
+        (error: Error, result: coinbase.Transaction) => undefined
+    );
+    account.requestMoney({ amount: "1", currency: "EUR", to: "bar", type: "request" }, (error: Error, tx: coinbase.Transaction) => {
+        tx.cancel((error: Error, tx: coinbase.Transaction): void => undefined);
+        tx.complete((error: Error, tx: coinbase.Transaction): void => undefined);
+        tx.resend((error: Error, tx: coinbase.Transaction): void => undefined);
+    });
+
+    account.sell(
+        { agree_btc_amount_varies: true, amount: "1", commit: true, currency: "BTC", payment_method: "abcdef", quote: true},
+        (error: Error, sell: coinbase.Sell): void => {
+            sell.commit((error: Error, sell: coinbase.Sell): void => undefined);
+        }
+    );
+    account.sell(
+        { currency: "BTC", payment_method: "abcdef", total: "3"},
+        (error: Error, sell: coinbase.Sell): void => {
+            sell.commit((error: Error, sell: coinbase.Sell): void => undefined);
+        }
+    );
+
+    account.sendMoney(
+        { amount: "1", currency: "EUR", description: "foo", fee: "2", idem: "bar", to: "baz", type: "send" },
+        (error: Error, result: coinbase.Transaction) => undefined
+    );
+
+    account.setPrimary((error: Error, result: coinbase.Account): void => undefined);
+
+    account.transferMoney(
+        { amount: "1", currency: "USD", description: "foo", to: "bar", type: "transfer" },
+        (error: Error, tx: coinbase.Transaction): void => undefined
+    );
+
+    account.update({ name: "foo" }, (error: Error, result: coinbase.Account): void => undefined);
+
+    account.withdraw({ amount: "1", commit: false, currency: "ETH", payment_method: "abcdef"}, (error: Error, result: coinbase.Withdrawal): void => {
+        result.commit((error: Error, result: coinbase.Withdrawal): void => undefined);
+    });
+});
+
+client.getBuyPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+
+client.getCurrencies((error: Error, result: coinbase.Currency[]): void => undefined);
+
+client.getExchangeRates({currency: "ETC"}, (error: Error, result: coinbase.ExchangeRate): void => undefined);
+
+client.getPaymentMethod("foo", (error: Error, result: coinbase.PaymentMethod): void => undefined);
+
+client.getPaymentMethods((error: Error, result: coinbase.PaymentMethod[]): void => undefined);
+
+client.getSellPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+
+client.getSpotPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+client.getSpotPrice({ currencyPair: "USD-BTC", date: "2017-22-01" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+
+client.getTime((error: Error, result: coinbase.Time): void => undefined);
+
+client.getUser("abcdef", (error: Error, user: coinbase.User): void => {
+    user.showAuth((error: Error, auth: coinbase.Auth): void => undefined);
+    user.update({ name: "foo", time_zone: "bar", native_currency: "USD" }, (error: Error, user: coinbase.User): void => undefined);
+});
diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
new file mode 100644
index 0000000000..ae1e041203
--- /dev/null
+++ b/types/coinbase/index.d.ts
@@ -0,0 +1,1333 @@
+// Type definitions for coinbase 2.0
+// Project: https://github.com/coinbase/coinbase-node
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface ClientConstructOpts {
+    /**
+     * API key (obtain this from the coinbase website)
+     */
+    apiKey?: string;
+    /**
+     * API key secret (obtain this from the coinbase website)
+     */
+    apiSecret?: string;
+    /**
+     * OAuth2 access token
+     */
+    accessToken?: string;
+    /**
+     * API version in 'yyyy-mm-dd' format, see https://developers.coinbase.com/api/v2#changelog
+     */
+    version?: string;
+}
+
+export interface CreateAccountOpts {
+    /**
+     * Account name
+     */
+    name?: string;
+}
+
+export interface GetExchangeRateOpts {
+    /**
+     * Base currency, default USD
+     */
+    currency?: string;
+}
+
+export interface GetBuyPriceOpts {
+    /**
+     * Currency pair, e.g. 'BTC-USD'
+     */
+    currencyPair: string;
+}
+
+export interface GetSellPriceOpts {
+    /**
+     * Currency pair, e.g. 'BTC-USD'
+     */
+    currencyPair: string;
+}
+
+export interface GetSpotPriceOpts {
+    /**
+     * Currency pair, e.g. 'BTC-USD'
+     */
+    currencyPair: string;
+    /**
+     * Specify date for historic spot price in format YYYY-MM-DD (UTC)
+     */
+    date?: string;
+}
+
+export interface UpdateAccountOpts {
+    /**
+     * Account name
+     */
+    name?: string;
+}
+
+export interface CreateAddressOpts {
+    /**
+     * Address label
+     */
+    name?: string;
+}
+
+export interface SendMoneyOpts {
+    /**
+     * Type send is required when sending money
+     */
+    type: "send";
+    /**
+     * A bitcoin address, litecoin address, ethereum address, or an email of the recipient
+     */
+    to: string;
+    /**
+     * Amount to be sent
+     */
+    amount: string;
+    /**
+     * Currency for the amount (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+    /**
+     * Notes to be included in the email that the recipient receives
+     */
+    description?: string;
+    /**
+     * Don’t send notification emails for small amounts (e.g. tips)
+     */
+    skip_notifications?: boolean;
+    /**
+     * Transaction fee in BTC/ETH/LTC if you would like to pay it. Fees can be added as a string, such as 0.0005
+     */
+    fee?: string;
+    /**
+     * *Recommended* A token to ensure idempotence. If a previous transaction with the same idem parameter already exists for this sender,
+     * that previous transaction will be returned and a new one will not be created. Max length 100 characters
+     */
+    idem?: string;
+    /**
+     * Whether this send is to another financial institution or exchange. Required if this send is to an address and is valued at over USD$3000.
+     */
+    to_financial_institution?: boolean;
+    /**
+     * The website of the financial institution or exchange. Required if to_financial_institution is true.
+     */
+    financial_institution_website?: string;
+}
+
+export interface TransferMoneyOpts {
+    /**
+     * Type transfer is required when transferring bitcoin or ethereum between accounts
+     */
+    type: "transfer";
+    /**
+     * ID of the receiving account
+     */
+    to: string;
+    /**
+     * Amount to be transferred
+     */
+    amount: string;
+    /**
+     * Currency for the amount (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+    /**
+     * Notes to be included in the transfer
+     */
+    description?: string;
+}
+
+export interface RequestMoneyOpts {
+    /**
+     * Type request is required when sending money
+     */
+    type: "request";
+    /**
+     * An email of the recipient
+     */
+    to: string;
+    /**
+     * Amount to be transferred
+     */
+    amount: string;
+    /**
+     * Currency for the amount (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+    /**
+     * Notes to be included in the email that the recipient receives
+     */
+    description?: string;
+}
+
+export interface UpdateUserOpts {
+    /**
+     * User’s name
+     */
+    name?: string;
+    /**
+     * Time zone
+     */
+    time_zone?: string;
+    /**
+     * Local currency used to display amounts converted from BTC
+     */
+    native_currency?: string;
+}
+
+export interface BuyOpts {
+    /**
+     * Buy amount without fees (alternative to total)
+     */
+    amount?: string;
+    /**
+     * Buy amount with fees (alternative to amount)
+     */
+    total?: string;
+    /**
+     * Currency for the amount (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+    /**
+     * The ID of the payment method that should be used for the buy. (todo get payment methods)
+     */
+    payment_method?: string;
+    /**
+     * Whether or not you would still like to buy if you have to wait for your money to arrive to lock in a price
+     */
+    agree_btc_amount_varies?: boolean;
+    /**
+     * If set to false, this buy will not be immediately completed. Use the commit call to complete it. Default value: true
+     */
+    commit?: boolean;
+    /**
+     * If set to true, response will return an unsave buy for detailed price quote. Default value: false
+     */
+    quote?: boolean;
+}
+
+export interface SellOpts {
+    /**
+     * Sell amount without fees (alternative to total)
+     */
+    amount?: string;
+    /**
+     * Sell amount with fees (alternative to amount)
+     */
+    total?: string;
+    /**
+     * Currency for the amount (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+    /**
+     * The ID of the payment method that should be used for the sell.
+     */
+    payment_method?: string;
+    /**
+     * Whether or not you would still like to sell if you have to wait for your money to arrive to lock in a price
+     */
+    agree_btc_amount_varies?: boolean;
+    /**
+     * If set to false, this sell will not be immediately completed. Use the commit call to complete it. Default value: true
+     */
+    commit?: boolean;
+    /**
+     * If set to true, response will return an unsave sell for detailed price quote. Default value: false
+     */
+    quote?: boolean;
+}
+
+export interface DepositOpts {
+    /**
+     * Deposit amount
+     */
+    amount: string;
+    /**
+     * Currency for the amount (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+    /**
+     * The ID of the payment method that should be used for the buy. (todo get payment methods)
+     */
+    payment_method?: string;
+    /**
+     * If set to false, this deposit will not be immediately completed. Use the commit call to complete it. Default value: true
+     */
+    commit?: boolean;
+}
+
+export interface WithdrawOpts {
+    /**
+     * Withdrawal amount
+     */
+    amount: string;
+    /**
+     * Currency for the amount (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+    /**
+     * The ID of the payment method that should be used for the buy. (todo get payment methods)
+     */
+    payment_method?: string;
+    /**
+     * If set to false, this withdrawal will not be immediately completed. Use the commit call to complete it. Default value: true
+     */
+    commit?: boolean;
+}
+
+/**
+ * Combination of an amount and a currency
+ */
+export interface MoneyHash {
+    /**
+     * Amount as floating-point in a string
+     */
+    amount: string;
+    /**
+     * Currency e.g. "BTC" (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+}
+
+export type ResourceType = "account" | "transaction" | "address" | "user" | "buy" | "sell" | "deposit" | "withdrawal" | "payment_method";
+
+/**
+ * Base interface for all resources
+ */
+export interface Resource {
+    /**
+     * Resource type
+     */
+    resource: ResourceType;
+}
+
+export class User implements Resource {
+    /**
+     * Resource type, constant "user"
+     */
+    resource: "user";
+
+    /**
+     * Resource ID
+     */
+    id: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    created_at?: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    updated_at?: string;
+
+    /**
+     * REST endpoint
+     */
+    resource_path: string;
+
+    /**
+     * User’s name
+     */
+    name?: string;
+
+    /**
+     * <undocumented>
+     */
+    username?: string;
+
+    /**
+     * Location for user’s profile
+     */
+    profile_location?: string;
+
+    /**
+     * Bio for user’s profile
+     */
+    profile_bio?: string;
+
+    /**
+     * profile location if user has one
+     */
+    profile_url?: string;
+
+    /**
+     * User’s avatar url
+     */
+    avatar_url: string;
+
+    /**
+     * Time zone (needs wallet:user:read permission)
+     */
+    time_zone?: string;
+
+    /**
+     * Native currency (needs wallet:user:read permission)
+     */
+    native_currency?: string;
+
+    /**
+     * (needs wallet:user:read permission)
+     */
+    bitcoin_unit?: string;
+
+    /**
+     * (needs wallet:user:read permission)
+     */
+    country?: Country;
+
+    /**
+     * Email address (needs wallet:user:email permission)
+     */
+    email?: string;
+
+    /**
+     * Get current user’s authorization information including granted scopes and send limits when using OAuth2 authentication
+     * No permission required
+     */
+    showAuth(cb: (error: Error, result: Auth) => void): void;
+
+    /**
+     * Change user properties
+     * Scope: wallet:user:update
+     */
+    update(opts: UpdateUserOpts, cb: (error: Error, result: User) => void): void;
+}
+
+export interface Auth {
+    /**
+     * Authentication method e.g. "oauth"
+     */
+    method: string;
+    /**
+     * Permissions for this user e.g. "wallet:user:read"
+     */
+    scopes: string[];
+
+    oauth_meta?: any;
+}
+
+export interface Country {
+    /**
+     * 2-letter country code
+     */
+    code: string;
+    /**
+     * Country name
+     */
+    name: string;
+}
+
+/**
+ * Bitcoin, Litecoin or Ethereum address
+ */
+export class Address implements Resource {
+    /**
+     * Type of resource, constant string "address"
+     */
+    resource: "address";
+
+    /**
+     * Bitcoin, Litecoin or Ethereum address
+     */
+    address: string;
+
+    /**
+     * User defined label for the address
+     */
+    name?: string;
+
+    /**
+     * List transactions that have been sent to a specific address.
+     * Scope: wallet:transactions:read
+     */
+    getTransactions(opts: {}, cb: (error: Error, result: Transaction[]) => void): void;
+}
+
+export type AccountType = "wallet" | "fiat" | "multisig" | "vault" | "multisig_vault";
+
+/**
+ * Account resource represents all of a user’s accounts, including bitcoin, litecoin and ethereum wallets, fiat currency accounts,
+ * and vaults. This is represented in the type field. It’s important to note that new types can be added over time so you want to
+ * make sure this won’t break your implementation.
+ * User can only have one primary account and it’s type can only be wallet.
+ */
+export class Account implements Resource {
+    /**
+     * Type of resource, constant string "account"
+     */
+    resource: "account";
+
+    /**
+     * Resource ID
+     */
+    id: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    created_at?: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    updated_at?: string;
+
+    /**
+     * REST endpoint
+     */
+    resource_path: string;
+
+    /**
+     * User or system defined name
+     */
+    name: string;
+
+    /**
+     * Primary account
+     */
+    primary: boolean;
+
+    /**
+     * Account’s type
+     */
+    type: AccountType;
+
+    /**
+     * Account’s currency (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+
+    /**
+     * Balance
+     */
+    balance: MoneyHash;
+
+    /**
+     * Promote an account as primary account.
+     * Scope: wallet:accounts:update
+     */
+    setPrimary(cb: (error: Error, result: Account) => void): void;
+
+    /**
+     * Modifies user’s account.
+     * Scope: wallet:accounts:update
+     */
+    update(opts: UpdateAccountOpts, cb: (error: Error, result: Account) => void): void;
+
+    /**
+     * Removes user’s account. In order to remove an account it can’t be:
+     * - Primary account
+     * - Account with non-zero balance
+     * - Fiat account
+     * - Vault with a pending withdrawal
+     * Scope: wallet:accounts:delete
+     */
+    delete(cb: (error: Error) => void): void;
+
+    /**
+     * Lists addresses for an account. Important: Addresses should be considered one time use only. Create new addresses.
+     * Scope: wallet:addresses:read
+     */
+    getAddresses(cb: (error: Error, result: Address[]) => void): void;
+
+    /**
+     * Show an individual address for an account. A regular bitcoin, litecoin or ethereum address can be used in place of `id` but the
+     * address has to be associated to the correct account. Important: Addresses should be considered one time use only. Create new addresses.
+     * Scope: wallet:addresses:read
+     * @param id resource id or a regular bitcoin, litecoin or ethereum address
+     */
+    getAddress(id: string, cb: (error: Error, result: Address) => void): void;
+
+    /**
+     * Creates a new address for an account. As all the arguments are optinal, it’s possible just to do a empty POST which will create a new
+     * address. This is handy if you need to create new receive addresses for an account on-demand.
+     * Addresses can be created for all account types. With fiat accounts, funds will be received with Instant Exchange
+     * Scope: wallet:addresses:create
+     * @param opts can be null, optional address name
+     */
+    createAddress(opts: CreateAddressOpts | null, cb: (error: Error, result: Address) => void): void;
+
+    /**
+     * Lists account’s transactions.
+     * Scope: wallet:transactions:read
+     */
+    getTransactions(cb: (error: Error, result: Transaction[]) => void): void;
+
+    /**
+     * Show an individual transaction for an account
+     * Scope: wallet:transactions:read
+     * @param id resource id
+     */
+    getTransaction(id: string, cb: (error: Error, result: Transaction) => void): void;
+
+    /**
+     * Send funds to a bitcoin address, litecoin address, ethereum address, or email address. No transaction fees are required for off
+     * blockchain bitcoin transactions.
+     *
+     * It’s recommended to always supply a unique `idem` field for each transaction. This prevents you from sending the same transaction
+     * twice if there has been an unexpected network outage or other issue.
+     *
+     * When used with OAuth2 authentication, this endpoint requires two factor authentication unless used with
+     * wallet:transactions:send:bypass-2fa scope.
+     *
+     * If the user is able to buy bitcoin, they can send funds from their fiat account using instant exchange feature.
+     * Buy fees will be included in the created transaction and the recipient will receive the user defined amount.
+     * To create a multisig transaction, visit Multisig documentation.
+     *
+     * Scope: wallet:transactions:send, wallet:transactions:send:bypass-2fa
+     */
+    sendMoney(opts: SendMoneyOpts, cb: (error: Error, result: Transaction) => void): void;
+
+    /**
+     * Transfer bitcoin, litecoin or ethereum between two of a user’s accounts. Following transfers are allowed:
+     * - wallet to wallet
+     * - wallet to vault
+     * Scope: wallet:transactions:transfer
+     */
+    transferMoney(opts: TransferMoneyOpts, cb: (error: Error, result: Transaction) => void): void;
+
+    /**
+     * Requests money from an email address.
+     * Scope: wallet:transactions:request
+     */
+    requestMoney(opts: RequestMoneyOpts, cb: (error: Error, result: Transaction) => void): void;
+
+    /**
+     * Lists buys for an account.
+     * Scope: wallet:buys:read
+     */
+    getBuys(cb: (error: Error, result: Buy[]) => void): void;
+
+    /**
+     * Show an individual buy.
+     * Scope: wallet:buys:read
+     * @param id resource id
+     */
+    getBuy(id: string, cb: (error: Error, result: Buy) => void): void;
+
+    /**
+     * Buys a user-defined amount of bitcoin, litecoin or ethereum.
+     * There are two ways to define buy amounts–you can use either the amount or the total parameter:
+     * - When supplying amount, you’ll get the amount of bitcoin, litecoin or ethereum defined. With amount it’s recommended to use BTC or
+     *   ETH as the currency value, but you can always specify a fiat currency and and the amount will be converted to BTC or ETH respectively.
+     * - When supplying total, your payment method will be debited the total amount and you’ll get the amount in BTC or ETH after fees have
+     *   been reduced from the total. With total it’s recommended to use the currency of the payment method as the currency parameter,
+     *   but you can always specify a different currency and it will be converted.
+     * Given the price of digital currency depends on the time of the call and on the amount of purchase, it’s recommended to use the
+     * commit: false parameter to create an uncommitted buy to show the confirmation for the user or get the final quote, and commit that
+     * with a separate request.
+     * If you need to query the buy price without locking in the buy, you can use quote: true option. This returns an unsaved buy and
+     * unlike commit: false, this buy can’t be completed. This option is useful when you need to show the detailed buy price quote
+     * for the user when they are filling a form or similar situation.
+     * Scope: wallet:buys:create
+     * @param opts indicates what to buy
+     * @param cb receives transaction that you can use to commit the buy
+     */
+    buy(opts: BuyOpts, cb: (error: Error, result: Buy) => void): void;
+
+    /**
+     * Lists sells for an account.
+     * Scope: wallet:sells:read
+     */
+    getSells(cb: (error: Error, result: Sell[]) => void): void;
+
+    /**
+     * Show an individual sell.
+     * Scope: wallet:sells:read
+     * @param id resource id
+     */
+    getSell(id: string, cb: (error: Error, result: Sell) => void): void;
+
+    /**
+     * Sells a user-defined amount of bitcoin, litecoin or ethereum.
+     *
+     * There are two ways to define sell amounts–you can use either the amount or the total parameter:
+     * - When supplying amount, you’ll get the amount of bitcoin, litecoin or ethereum defined. With amount it’s recommended to use BTC or
+     *   ETH as the currency value, but you can always specify a fiat currency and the amount will be converted to BTC or ETH respectively.
+     * - When supplying total, your payment method will be credited the total amount and you’ll get the amount in BTC or ETH after fees
+     *   have been reduced from the subtotal. With total it’s recommended to use the currency of the payment method as the currency parameter,
+     *   but you can always specify a different currency and it will be converted.
+     *
+     * Given the price of digital currency depends on the time of the call and amount of the sell, it’s recommended to use the commit: false
+     * parameter to create an uncommitted sell to get a quote and then to commit that with a separate request.
+     *
+     * If you need to query the sell price without locking in the sell, you can use quote: true option. This returns an unsaved sell and
+     * unlike commit: false, this sell can’t be completed. This option is useful when you need to show the detailed sell price quote for
+     * the user when they are filling a form or similar situation.
+     * Scope: wallet:sells:create
+     */
+    sell(opts: SellOpts, cb: (error: Error, result: Sell) => void): void;
+
+    /**
+     * Lists deposits for an account.
+     * Scope: wallet:deposits:read
+     */
+    getDeposits(cb: (error: Error, result: Deposit[]) => void): void;
+
+    /**
+     * Show an individual deposit.
+     * Scope: wallet:deposits:read
+     * @param id resource id
+     */
+    getDeposit(id: string, cb: (error: Error, result: Deposit) => void): void;
+
+    /**
+     * Deposits user-defined amount of funds to a fiat account.
+     * Scope: wallet:deposits:create
+     */
+    deposit(opts: DepositOpts, cb: (error: Error, result: Deposit) => void): void;
+
+    /**
+     * Lists withdrawals for an account.
+     * Scope: wallet:withdrawals:read
+     */
+    getWithdrawals(cb: (error: Error, result: Withdrawal[]) => void): void;
+
+    /**
+     * Show an individual withdrawal.
+     * Scope: wallet:withdrawals:read
+     * @param id resource id
+     */
+    getWithdrawal(id: string, cb: (error: Error, result: Withdrawal) => void): void;
+
+    /**
+     * Withdraws user-defined amount of funds from a fiat account.
+     * Scope: wallet:withdrawals:create
+     */
+    withdraw(opts: WithdrawOpts, cb: (error: Error, result: Withdrawal) => void): void;
+}
+
+/**
+ * Reference to any resource
+ */
+export interface ResourceRef {
+    id: string;
+    resource: ResourceType;
+    resource_path: string;
+}
+
+export type TransactionType = "send" | "request" | "transfer" | "buy" | "sell" | "fiat_deposit" | "fiat_withdrawal" | "exchange_deposit"
+    | "exchange_withdrawal" | "vault_withdrawal";
+
+export type TransactionStatus = "pending" | "completed" | "failed" | "expired" | "canceled" | "waiting_for_signature" | "waiting_for_clearing";
+
+export class Transaction implements Resource {
+    /**
+     * Constant "transaction"
+     */
+    resource: "transaction";
+
+    /**
+     * Transaction type
+     */
+    type: TransactionType;
+
+    /**
+     * Transaction status
+     */
+    status: TransactionStatus;
+
+    /**
+     * Amount in bitcoin, litecoin or ethereum
+     */
+    amount: MoneyHash;
+
+    /**
+     * Amount in user's native currency
+     */
+    native_amount: MoneyHash;
+
+    /**
+     * Account associated with the transaction
+     */
+    account: Account;
+
+    /**
+     * User defined description
+     */
+    description: string;
+
+    /**
+     * Indicator if the transaction was instant exchanged (received into a bitcoin address for a fiat account)
+     */
+    instant_exchange: boolean;
+
+    /**
+     * Detailed information about the transaction
+     */
+    details: any;
+
+    /**
+     * Information about bitcoin, litecoin or ethereum network including network transaction hash if transaction was on-blockchain.
+     * Only available for certain types of transactions
+     */
+    network?: any;
+
+    /**
+     * The receiving party of a debit transaction. Usually another resource but can also be another type like email.
+     * Only available for certain types of transactions
+     */
+    to?: ResourceRef | string;
+
+    /**
+     * The originating party of a credit transaction. Usually another resource but can also be another type like bitcoin network.
+     * Only available for certain types of transactions
+     */
+    from?: ResourceRef | string;
+
+    /**
+     * Associated bitcoin, litecoin or ethereum address for received payment
+     */
+    address?: Address;
+
+    /**
+     * Associated OAuth2 application
+     */
+    application?: any;
+
+    /**
+     * Lets the recipient of a money request complete the request by sending money to the user who requested the money.
+     * This can only be completed by the user to whom the request was made, not the user who sent the request.
+     * Scope: wallet:transactions:request
+     */
+    complete(cb: (error: Error, result: Transaction) => void): void;
+
+    /**
+     * Lets the user resend a money request. This will notify recipient with a new email.
+     * Scope: wallet:transactions:request
+     */
+    resend(cb: (error: Error, result: Transaction) => void): void;
+
+    /**
+     * Lets a user cancel a money request. Money requests can be canceled by the sender or the recipient.
+     * Scope: wallet:transactions:request
+     */
+    cancel(cb: (error: Error, result: Transaction) => void): void;
+}
+
+export type BuyStatus = "created" | "completed" | "canceled";
+
+/**
+ * Buy resource
+ */
+export class Buy implements Resource {
+    /**
+     * Constant "buy"
+     */
+    resource: "buy";
+
+    /**
+     * Status
+     */
+    status: BuyStatus;
+
+    /**
+     * Associated payment method (e.g. a bank, fiat account)
+     */
+    payment_method: ResourceRef;
+
+    /**
+     * Associated transaction (e.g. a bank, fiat account)
+     */
+    transaction: ResourceRef;
+
+    /**
+     * Amount in bitcoin, litecoin or ethereum
+     */
+    amount: MoneyHash;
+
+    /**
+     * Fiat amount with fees
+     */
+    total: MoneyHash;
+
+    /**
+     * Fiat amount without fees
+     */
+    subtotal: MoneyHash;
+
+    /**
+     * Fee associated to this buy
+     */
+    fee: MoneyHash;
+
+    /**
+     * Has this buy been committed?
+     */
+    committed: boolean;
+
+    /**
+     * Was this buy executed instantly?
+     */
+    instant: boolean;
+
+    /**
+     * When a buy isn’t executed instantly, it will receive a payout date for the time it will be executed. ISO timestamp
+     */
+    payout_at?: string;
+
+    /**
+     * Completes a buy that is created in commit: false state.
+     * If the exchange rate has changed since the buy was created, this call will fail with the error “The exchange rate updated while you
+     * were waiting. The new total is shown below�. The buy’s total will also be updated. You can repeat the `commit` call to accept the new
+     * values and start the buy at the new rates.
+     * Scope: wallet:buys:create
+     */
+    commit(cb: (error: Error, transaction: Buy) => void): void;
+}
+
+export type SellStatus = "created" | "completed" | "canceled";
+
+/**
+ * Sell resource
+ */
+export class Sell implements Resource {
+    /**
+     * Constant "sell"
+     */
+    resource: "sell";
+
+    /**
+     * Status of the sell. Currently available values: created, completed, canceled
+     */
+    status: BuyStatus;
+
+    /**
+     * Associated payment method (e.g. a bank, fiat account)
+     */
+    payment_method: ResourceRef;
+
+    /**
+     * Associated transaction (e.g. a bank, fiat account)
+     */
+    transaction: ResourceRef;
+
+    /**
+     * Amount in bitcoin, litecoin or ethereum
+     */
+    amount: MoneyHash;
+
+    /**
+     * Fiat amount with fees
+     */
+    total: MoneyHash;
+
+    /**
+     * Fiat amount without fees
+     */
+    subtotal: MoneyHash;
+
+    /**
+     * Fee associated to this sell
+     */
+    fee: MoneyHash;
+
+    /**
+     * Has this sell been committed?
+     */
+    committed: boolean;
+
+    /**
+     * Was this sell executed instantly?
+     */
+    instant: boolean;
+
+    /**
+     * When a sell isn’t executed instantly, it will receive a payout date for the time it will be executed. ISO timestamp
+     */
+    payout_at?: string;
+
+    /**
+     * Completes a sell that is created in commit: false state.
+     * If the exchange rate has changed since the sell was created, this call will fail with the error “The exchange rate updated while you
+     * were waiting. The new total is shown below�. The buy’s total will also be updated. You can repeat the `commit` call to accept the new
+     * values and start the buy at the new rates.
+     * Scope: wallet:sells:create
+     */
+    commit(cb: (error: Error, transaction: Sell) => void): void;
+}
+
+export type DepositStatus = "created" | "completed" | "canceled";
+
+/**
+ * Deposit resource represents a deposit of funds using a payment method (e.g. a bank). Each committed deposit also has an associated transaction.
+ * Deposits can be started with commit: false which is useful when displaying the confirmation for a deposit.
+ * These deposits will never complete and receive an associated transaction unless they are committed separately.
+ */
+export class Deposit implements Resource {
+    resource: "deposit";
+
+    /**
+     * Resource ID
+     */
+    id: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    created_at?: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    updated_at?: string;
+
+    /**
+     * REST endpoint
+     */
+    resource_path: string;
+
+    /**
+     * Status of the deposit. Currently available values: created, completed, canceled
+     */
+    status: DepositStatus;
+
+    /**
+     * Associated payment method (e.g. a bank)
+     */
+    payment_method: ResourceRef;
+
+    /**
+     * Associated transaction (e.g. a bank, fiat account)
+     */
+    transaction: ResourceRef;
+
+    /**
+     * Amount
+     */
+    amount: MoneyHash;
+
+    /**
+     * Amount without fees
+     */
+    subtotal: MoneyHash;
+
+    /**
+     * Fee associated to this deposit
+     */
+    fee: MoneyHash;
+
+    /**
+     * Has this deposit been committed?
+     */
+    committed: boolean;
+
+    /**
+     * When a deposit isn’t executed instantly, it will receive a payout date for the time it will be executed. ISO timestamp
+     */
+    payout_at?: string;
+
+    /**
+     * Completes a deposit that is created in commit: false state.
+     * Scope: wallet:deposits:create
+     */
+    commit(cb: (error: Error, result: Deposit) => void): void;
+}
+
+export type WithdrawalStatus = "created" | "completed" | "canceled";
+
+/**
+ * Withdrawal resource represents a withdrawal of funds using a payment method (e.g. a bank). Each committed withdrawal also has a associated
+ * transaction.
+ * Withdrawal can be started with commit: false which is useful when displaying the confirmation for a withdrawal. These withdrawals will
+ * never complete and receive an associated transaction unless they are committed separately.
+ */
+export class Withdrawal implements Resource {
+    resource: "deposit";
+
+    /**
+     * Resource ID
+     */
+    id: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    created_at?: string;
+
+    /**
+     * ISO timestamp (sometimes needs additional permissions)
+     */
+    updated_at?: string;
+
+    /**
+     * REST endpoint
+     */
+    resource_path: string;
+
+    /**
+     * Status of the deposit. Currently available values: created, completed, canceled
+     */
+    status: WithdrawalStatus;
+
+    /**
+     * Associated payment method (e.g. a bank)
+     */
+    payment_method: ResourceRef;
+
+    /**
+     * Associated transaction (e.g. a bank, fiat account)
+     */
+    transaction: ResourceRef;
+
+    /**
+     * Amount
+     */
+    amount: MoneyHash;
+
+    /**
+     * Amount without fees
+     */
+    subtotal: MoneyHash;
+
+    /**
+     * Fee associated to this withdrawal
+     */
+    fee: MoneyHash;
+
+    /**
+     * Has this withdrawal been committed?
+     */
+    committed: boolean;
+
+    /**
+     * When a withdrawal isn’t executed instantly, it will receive a payout date for the time it will be executed. ISO timestamp
+     */
+    payout_at?: string;
+
+    /**
+     * Completes a withdrawal that is created in commit: false state.
+     * Scope: wallet:withdrawals:create
+     */
+    commit(cb: (error: Error, result: Withdrawal) => void): void;
+}
+
+export type PaymentMethodType = "ach_bank_account" | "sepa_bank_account" | "ideal_bank_account" | "fiat_account" | "bank_wire"
+    | "credit_card" | "secure3d_card" | "eft_bank_account" | "interac";
+
+/**
+ * Payment method resource represents the different kinds of payment methods that can be used when buying and selling bitcoin, litecoin or
+ * ethereum.
+ * As fiat accounts can be used for buying and selling, they have an associated payment method. This type of a payment method will also have
+ * a fiat_account reference to the actual account.
+ *
+ * Currently available type values:
+ * - ach_bank_account - Regular US bank account
+ * - sepa_bank_account - European SEPA bank account
+ * - ideal_bank_account - iDeal bank account (Europe)
+ * - fiat_account - Fiat nominated Coinbase account
+ * - bank_wire - Bank wire (US only)
+ * - credit_card - Credit card (can’t be used for buying/selling)
+ * - secure3d_card - Secure3D verified payment card
+ * - eft_bank_account - Canadian EFT bank account
+ * - interac - Interac Online for Canadian bank accounts
+ */
+export interface PaymentMethod extends Resource {
+    /**
+     * Resource type, constant "payment_method"
+     */
+    resource: "payment_method";
+
+    /**
+     * Payment method type
+     */
+    type: PaymentMethodType;
+
+    /**
+     * Method name
+     */
+    name: string;
+
+    /**
+     * Payment method’s native currency (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+
+    /**
+     * Is primary buying method?
+     */
+    primary_buy: boolean;
+
+    /**
+     * Is primary selling method?
+     */
+    primary_sell: boolean;
+
+    /**
+     * Is buying allowed with this method?
+     */
+    allow_buy: boolean;
+
+    /**
+     * Is selling allowed with this method?
+     */
+    allow_sell: boolean;
+
+    /**
+     * Does this method allow for instant buys?
+     */
+    instant_buy: boolean;
+
+    /**
+     * Does this method allow for instant sells?
+     */
+    instant_sell: boolean;
+
+    /**
+     * If the user has obtained optional wallet:payment-methods:limits permission, an additional field, limits, will be embedded into payment
+     * method data. It will contain information about buy, instant buy, sell and deposit limits (there’s no limits for withdrawals at this time).
+     * As each one of these can have several limits you should always look for the lowest remaining value when performing the relevant action.
+     */
+    limits?: PaymentMethodLimits;
+}
+
+/**
+ * This contains information about buy, instant buy, sell and deposit limits (there’s no limits for withdrawals at this time).
+ * As each one of these can have several limits you should always look for the lowest remaining value when performing the relevant action.
+ */
+export interface PaymentMethodLimits {
+    buy: PaymentMethodLimit[];
+    instant_buy: PaymentMethodLimit[];
+    sell: PaymentMethodLimit[];
+    deposit: PaymentMethodLimit[];
+}
+
+export interface PaymentMethodLimit {
+    period_in_days: number;
+    total: MoneyHash;
+    remaining: MoneyHash;
+}
+
+/**
+ * Information about one supported currency.  Currency codes will conform to the ISO 4217 standard where possible.
+ * Currencies which have or had no representation in ISO 4217 may use a custom code (e.g. BTC).
+ */
+export interface Currency {
+    /**
+     * Abbreviation e.g. "USD" or "BTC"
+     */
+    id: string;
+    /**
+     * Full name e.g. "United Arab Emirates Dirham"
+     */
+    name: string;
+    /**
+     * Floating-point number in a string
+     */
+    min_size: string;
+}
+
+export interface ExchangeRate {
+    /**
+     * Base currency
+     */
+    currency: string;
+    /**
+     * Rates as floating points in strings; indexed by currency id
+     */
+    rates: { [index: string]: string };
+}
+
+export interface Time {
+    iso: string;
+    epoch: number;
+}
+
+export class Client {
+    constructor(opts: ClientConstructOpts);
+
+    /**
+     * Get any user’s information with their ID.
+     * Scopes: none
+     * @param id resource id
+     */
+    getUser(id: string, cb: (error: Error, result: User) => void): void;
+
+    /**
+     * Get the current user. To get user’s email or private information, use permissions wallet:user:email and wallet:user:read. If current
+     * request has a wallet:transactions:send scope, then the response will contain a boolean sends_disabled field that indicates
+     * if the user’s send functionality has been disabled.
+     */
+    getCurrentUser(cb: (error: Error, result: User) => void): void;
+
+    /**
+     * Returns all accounts for the current user
+     * Scope: wallet:accounts:read
+     */
+    getAccounts(opts: {}, cb: (error: Error, result: Account[]) => void): void;
+
+    /**
+     * Get one account by its Resource ID
+     * Scope: wallet:accounts:read
+     * @param id resource ID or "primary"
+     */
+    getAccount(id: string, cb: (error: Error, result: Account) => void): void;
+
+    /**
+     * Creates a new account for user.
+     * Scopes: wallet:accounts:create
+     */
+    createAccount(opts: CreateAccountOpts, cb: (error: Error, result: Account) => void): void;
+
+    /**
+     * Lists current user’s payment methods
+     * Scope: wallet:payment-methods:read
+     */
+    getPaymentMethods(cb: (error: Error, result: PaymentMethod[]) => void): void;
+
+    /**
+     * Show current user’s payment method.
+     * Scope: wallet:payment-methods:read
+     */
+    getPaymentMethod(id: string, cb: (error: Error, result: PaymentMethod) => void): void;
+
+    /**
+     * List known currencies. Currency codes will conform to the ISO 4217 standard where possible. Currencies which have or had no
+     * representation in ISO 4217 may use a custom code (e.g. BTC).
+     * Scope: none
+     */
+    getCurrencies(cb: (error: Error, result: Currency[]) => void): void;
+
+    /**
+     * Get current exchange rates. Default base currency is USD but it can be defined as any supported currency.
+     * Returned rates will define the exchange rate for one unit of the base currency.
+     * Scope: none
+     */
+    getExchangeRates(opts: GetExchangeRateOpts, cb: (error: Error, result: ExchangeRate) => void): void;
+
+    /**
+     * Get the total price to buy one bitcoin or ether. Note that exchange rates fluctuates so the price is only correct for seconds at the time.
+     * This buy price includes standard Coinbase fee (1%) but excludes any other fees including bank fees.
+     * If you need more accurate price estimate for a specific payment method or amount, @see Account#buy() and `quote: true` option.
+     * Scope: none
+     */
+    getBuyPrice(opts: GetBuyPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+
+    /**
+     * Get the total price to sell one bitcoin or ether. Note that exchange rates fluctuates so the price is only correct for seconds at the time.
+     * This sell price includes standard Coinbase fee (1%) but excludes any other fees including bank fees. If you need more accurate price
+     * estimate for a specific payment method or amount, see sell bitcoin endpoint and quote: true option.
+     * Scope: none
+     */
+    getSellPrice(opts: GetSellPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+
+    /**
+     * Get the current market price for bitcoin. This is usually somewhere in between the buy and sell price.
+     * Note that exchange rates fluctuates so the price is only correct for seconds at the time.
+     * You can also get historic prices with date parameter.
+     * Scope: none
+     */
+    getSpotPrice(opts: GetSpotPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+
+    /**
+     * Get the API server time.
+     */
+    getTime(cb: (error: Error, result: Time) => void): void;
+}
diff --git a/types/coinbase/tsconfig.json b/types/coinbase/tsconfig.json
new file mode 100644
index 0000000000..6f8b261d27
--- /dev/null
+++ b/types/coinbase/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "coinbase-tests.ts"
+    ]
+}
diff --git a/types/coinbase/tslint.json b/types/coinbase/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/coinbase/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/collections/tslint.json b/types/collections/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/collections/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/color/v0/tslint.json b/types/color/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/color/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/color/v1/tslint.json b/types/color/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/color/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/colorbrewer/tslint.json b/types/colorbrewer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/colorbrewer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/colors/tsconfig.json b/types/colors/tsconfig.json
index d935a49e18..99d78ad72d 100644
--- a/types/colors/tsconfig.json
+++ b/types/colors/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/com.darktalker.cordova.screenshot/tslint.json b/types/com.darktalker.cordova.screenshot/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/com.darktalker.cordova.screenshot/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/combine-source-map/index.d.ts b/types/combine-source-map/index.d.ts
index 43f1c994b0..3855942092 100644
--- a/types/combine-source-map/index.d.ts
+++ b/types/combine-source-map/index.d.ts
@@ -3,13 +3,15 @@
 // Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/** Add source maps of multiple files, offset them and then combine them into one source map.
+/**
+ * Add source maps of multiple files, offset them and then combine them into one source map.
  * (documentation based on project's README file)
  */
 declare class Combiner {
     constructor(file?: string, sourceRoot?: string);
 
-    /** Adds map to underlying source map.
+    /**
+     * Adds map to underlying source map.
      * If source contains a source map comment that has the source of the original file inlined it will offset these
      * mappings and include them.
      * If no source map comment is found or it has no source inlined, mappings for the file will be generated and included
@@ -18,12 +20,14 @@ declare class Combiner {
      */
     addFile(opts: { sourceFile: string; source: string }, offset?: Combiner.Offset): Combiner;
 
-    /** output the combined source map in base64 format
+    /**
+     * output the combined source map in base64 format
      * @return base64 encoded combined source map
      */
     base64(): string;
 
-    /** generate a base64 encoded sourceMappingURL comment
+    /**
+     * generate a base64 encoded sourceMappingURL comment
      * @return base64 encoded sourceMappingUrl comment of the combined source map
      */
     comment(): string;
@@ -40,15 +44,15 @@ declare namespace Combiner {
         column?: number;
     }
 
-    /** Create a source map combiner that accepts multiple files, offsets them and then combines them into one source map.
+    /**
+     * Create a source map combiner that accepts multiple files, offsets them and then combines them into one source map.
      * @param file optional name of the generated file
      * @param sourceRoot optional sourceRoot of the map to be generated
      * @return Combiner instance to which source maps can be added and later combined
      */
     function create(file?: string, sourceRoot?: string): Combiner;
 
-    /** removeComments
-     * @param src
+    /**
      * @return src with all sourceMappingUrl comments removed
      */
     function removeComments(src: string): string;
diff --git a/types/combokeys/index.d.ts b/types/combokeys/index.d.ts
index f7e1e5b035..24f3313582 100644
--- a/types/combokeys/index.d.ts
+++ b/types/combokeys/index.d.ts
@@ -35,7 +35,7 @@ declare namespace Combokeys {
          * @param {handler} optional - one of "keypress", "keydown", or "keyup"
          * @returns void
          */
-        bind(keys: string | string[], callback: () => void, action?: string): void;
+        bind(keys: string | string[], callback: (event: KeyboardEvent) => void, action?: string): void;
 
 
         /**
diff --git a/types/combokeys/tslint.json b/types/combokeys/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/combokeys/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cometd/tslint.json b/types/cometd/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cometd/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/command-line-args/index.d.ts b/types/command-line-args/index.d.ts
index 442ee5cb93..332368d827 100644
--- a/types/command-line-args/index.d.ts
+++ b/types/command-line-args/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for command-line-args 4.0.6
+// Type definitions for command-line-args 4.0.7
 // Project: https://github.com/75lb/command-line-args
 // Definitions by: CzBuCHi <https://github.com/CzBuCHi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -25,50 +25,63 @@
  */
 declare function commandLineArgs(optionDefinitions: commandLineArgs.OptionDefinition[], options?: commandLineArgs.Options): any;
 
-declare module commandLineArgs { 
+declare module commandLineArgs {
 
-    export interface OptionDefinition {
-        /**
-         * The only required definition property is name, the value of each option will be either a Boolean or string.
-         */
-        name: string,
-        /**
-         * The type value is a setter function (you receive the output from this), enabling you to be specific about the type and value received.
-         */
-        type?: (arg: string) => any,
-        /**
-         * getopt-style short option names. Can be any single character (unicode included) except a digit or hypen.
-         */
-        alias?: string,
-        /**
-         * Set this flag if the option takes a list of values. You will receive an array of values, each passed through the type function (if specified).
-         */
-        multiple?: boolean,
-        /**
-         * Any unclaimed command-line args will be set on this option. This flag is typically set on the most commonly-used option to make for more concise usage (i.e. $ myapp *.js instead of $ myapp --files *.js).
-         */
-        defaultOption?: boolean,
-        /**
-         * An initial value for the option.
-         */
-        defaultValue?: any,
-        /**
-         * When your app has a large amount of options it makes sense to organise them in groups.
-         * There are two automatic groups: _all (contains all options) and _none (contains options without a group specified in their definition).
-         */
-        group?: string | string[],
-    }
+  export interface OptionDefinition {
+    /**
+     * The only required definition property is name, the value of each option will be either a Boolean or string.
+     */
+    name: string,
+    /**
+     * The type value is a setter function (you receive the output from this),
+     * enabling you to be specific about the type and value received.
+     */
+    type?: (arg: string) => any,
+    /**
+     * getopt-style short option names. Can be any single character (unicode included) except a digit or hypen.
+     */
+    alias?: string,
+    /**
+     * Set this flag if the option takes a list of values. You will receive an array of values, each passed
+     * through the type function (if specified).
+     */
+    multiple?: boolean,
+    /**
+     * Any unclaimed command-line args will be set on this option. This flag is typically set on
+     * the most commonly-used option to make for more concise usage
+     * (i.e. $ myapp *.js instead of $ myapp --files *.js).
+     */
+    defaultOption?: boolean,
+    /**
+     * An initial value for the option.
+     */
+    defaultValue?: any,
+    /**
+     * When your app has a large amount of options it makes sense to organise them in groups.
+     * There are two automatic groups: _all (contains all options) and _none (contains options
+     * without a group specified in their definition).
+     */
+    group?: string | string[],
+    /**
+     * Describes the option.
+     */
+    description?: string,
+    /**
+     * A label for the type, e.g. <ms>.
+     */
+    typeLabel?: string;
+  }
 
-    export interface Options {
-        /**
-         * An array of strings, which if passed will be parsed instead  of `process.argv`.
-         */
-        argv?: string[];
-        /**
-         * If `true`, an array of unknown arguments is returned in the `_unknown` property of the output.
-         */
-        partial?: boolean;
-    }
+  export interface Options {
+    /**
+     * An array of strings, which if passed will be parsed instead  of `process.argv`.
+     */
+    argv?: string[];
+    /**
+     * If `true`, an array of unknown arguments is returned in the `_unknown` property of the output.
+     */
+    partial?: boolean;
+  }
 }
 
 export = commandLineArgs;
diff --git a/types/command-line-args/tslint.json b/types/command-line-args/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/command-line-args/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/command-line-commands/tslint.json b/types/command-line-commands/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/command-line-commands/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/commander/commander-tests.ts b/types/commander/commander-tests.ts
deleted file mode 100644
index 46aa77d92c..0000000000
--- a/types/commander/commander-tests.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import * as program from 'commander';
-
-interface ExtendedOptions extends program.CommandOptions {
-    isNew: any;
-}
-
-const commandInstance = new program.Command('-f');
-const optionsInstance = new program.Option('-f');
-
-const name = program.name();
-
-program
-    .name('set name')
-    .version('0.0.1')
-    .option('-p, --peppers', 'Add peppers')
-    .option('-P, --pineapple', 'Add pineapple')
-    .option('-b, --bbq', 'Add bbq sauce')
-    .option('-c, --cheese [type]', 'Add the specified type of cheese [marble]', 'marble')
-    .parse(process.argv);
-
-console.log('you ordered a pizza with:');
-if (program['peppers']) console.log('  - peppers');
-if (program['pineapple']) console.log('  - pineapple');
-if (program['bbq']) console.log('  - bbq');
-console.log('  - %s cheese', program['cheese']);
-
-function range(val: string) {
-    return val.split('..').map(Number);
-}
-
-function list(val: string) {
-    return val.split(',');
-}
-
-function collect(val: string, memo: string[]) {
-    memo.push(val);
-    return memo;
-}
-
-function increaseVerbosity(v: any, total: number) {
-    return total + 1;
-}
-
-program
-    .version('0.0.1')
-    .usage('[options] <file ...>')
-    .option('-i, --integer <n>', 'An integer argument', parseInt)
-    .option('-f, --float <n>', 'A float argument', parseFloat)
-    .option('-r, --range <a>..<b>', 'A range', range)
-    .option('-l, --list <items>', 'A list', list)
-    .option('-o, --optional [value]', 'An optional value')
-    .option('-c, --collect [value]', 'A repeatable value', collect, [])
-    .option('-v, --verbose', 'A value that can be increased', increaseVerbosity, 0)
-    .parse(process.argv);
-
-console.log(' int: %j', program['integer']);
-console.log(' float: %j', program['float']);
-console.log(' optional: %j', program['optional']);
-program['range'] = program['range'] || [];
-console.log(' range: %j..%j', program['range'][0], program['range'][1]);
-console.log(' list: %j', program['list']);
-console.log(' collect: %j', program['collect']);
-console.log(' verbosity: %j', program['verbose']);
-console.log(' args: %j', program['args']);
-
-program
-    .version('0.0.1')
-    .option('-f, --foo', 'enable some foo')
-    .option('-b, --bar', 'enable some bar')
-    .option('-B, --baz', 'enable some baz');
-
-// must be before .parse() since
-// node's emit() is immediate
-
-program.on('--help', () => {
-    console.log('  Examples:');
-    console.log('');
-    console.log('    $ custom-help --help');
-    console.log('    $ custom-help -h');
-    console.log('');
-});
-
-program
-    .command('allow-unknown-option')
-    .allowUnknownOption()
-    .action(() => {
-        console.log('unknown option is allowed');
-    });
-
-program
-    .version('0.0.1')
-    .arguments('<cmd> [env]')
-    .action((cmd, env) => {
-        console.log(cmd, env);
-    });
-
-program.parse(process.argv);
-
-console.log('stuff');
diff --git a/types/commander/index.d.ts b/types/commander/index.d.ts
deleted file mode 100644
index c732d43c7c..0000000000
--- a/types/commander/index.d.ts
+++ /dev/null
@@ -1,299 +0,0 @@
-// Type definitions for commander 2.11
-// Project: https://github.com/visionmedia/commander.js
-// Definitions by: Alan Agius <https://github.com/alan-agius4>, Marcelo Dezem <https://github.com/mdezem>, vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-declare class Option {
-    flags: string;
-    required: boolean;
-    optional: boolean;
-    bool: boolean;
-    short?: string;
-    long: string;
-    description: string;
-
-    /**
-     * Initialize a new `Option` with the given `flags` and `description`.
-     *
-     * @param {string} flags
-     * @param {string} [description]
-     */
-    constructor(flags: string, description?: string);
-}
-
-declare class Command extends NodeJS.EventEmitter {
-    [key: string]: any;
-
-    args: string[];
-
-    /**
-     * Initialize a new `Command`.
-     *
-     * @param {string} [name]
-     */
-    constructor(name?: string);
-
-    /**
-     * Set the program version to `str`.
-     *
-     * This method auto-registers the "-V, --version" flag
-     * which will print the version number when passed.
-     *
-     * @param {string} str
-     * @param {string} [flags]
-     * @returns {Command} for chaining
-     */
-    version(str: string, flags?: string): Command;
-
-    /**
-     * Add command `name`.
-     *
-     * The `.action()` callback is invoked when the
-     * command `name` is specified via __ARGV__,
-     * and the remaining arguments are applied to the
-     * function for access.
-     *
-     * When the `name` is "*" an un-matched command
-     * will be passed as the first arg, followed by
-     * the rest of __ARGV__ remaining.
-     *
-     * @example
-     *      program
-     *        .version('0.0.1')
-     *        .option('-C, --chdir <path>', 'change the working directory')
-     *        .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
-     *        .option('-T, --no-tests', 'ignore test hook')
-     *
-     *      program
-     *        .command('setup')
-     *        .description('run remote setup commands')
-     *        .action(function() {
-     *          console.log('setup');
-     *        });
-     *
-     *      program
-     *        .command('exec <cmd>')
-     *        .description('run the given remote command')
-     *        .action(function(cmd) {
-     *          console.log('exec "%s"', cmd);
-     *        });
-     *
-     *      program
-     *        .command('teardown <dir> [otherDirs...]')
-     *        .description('run teardown commands')
-     *        .action(function(dir, otherDirs) {
-     *          console.log('dir "%s"', dir);
-     *          if (otherDirs) {
-     *            otherDirs.forEach(function (oDir) {
-     *              console.log('dir "%s"', oDir);
-     *            });
-     *          }
-     *        });
-     *
-     *      program
-     *        .command('*')
-     *        .description('deploy the given env')
-     *        .action(function(env) {
-     *          console.log('deploying "%s"', env);
-     *        });
-     *
-     *      program.parse(process.argv);
-     *
-     * @param {string} name
-     * @param {string} [desc] for git-style sub-commands
-     * @param {CommandOptions} [opts] command options
-     * @returns {Command} the new command
-     */
-    command(name: string, desc?: string, opts?: commander.CommandOptions): Command;
-
-    /**
-     * Define argument syntax for the top-level command.
-     *
-     * @param {string} desc
-     * @returns {Command} for chaining
-     */
-    arguments(desc: string): Command;
-
-    /**
-     * Parse expected `args`.
-     *
-     * For example `["[type]"]` becomes `[{ required: false, name: 'type' }]`.
-     *
-     * @param {string[]} args
-     * @returns {Command} for chaining
-     */
-    parseExpectedArgs(args: string[]): Command;
-    /**
-     * Register callback `fn` for the command.
-     *
-     * @example
-     *      program
-     *        .command('help')
-     *        .description('display verbose help')
-     *        .action(function() {
-     *           // output help here
-     *        });
-     *
-     * @param {(...args: any[]) => void} fn
-     * @returns {Command} for chaining
-     */
-    action(fn: (...args: any[]) => void): Command;
-
-    /**
-     * Define option with `flags`, `description` and optional
-     * coercion `fn`.
-     *
-     * The `flags` string should contain both the short and long flags,
-     * separated by comma, a pipe or space. The following are all valid
-     * all will output this way when `--help` is used.
-     *
-     *    "-p, --pepper"
-     *    "-p|--pepper"
-     *    "-p --pepper"
-     *
-     * @example
-     *     // simple boolean defaulting to false
-     *     program.option('-p, --pepper', 'add pepper');
-     *
-     *     --pepper
-     *     program.pepper
-     *     // => Boolean
-     *
-     *     // simple boolean defaulting to true
-     *     program.option('-C, --no-cheese', 'remove cheese');
-     *
-     *     program.cheese
-     *     // => true
-     *
-     *     --no-cheese
-     *     program.cheese
-     *     // => false
-     *
-     *     // required argument
-     *     program.option('-C, --chdir <path>', 'change the working directory');
-     *
-     *     --chdir /tmp
-     *     program.chdir
-     *     // => "/tmp"
-     *
-     *     // optional argument
-     *     program.option('-c, --cheese [type]', 'add cheese [marble]');
-     *
-     * @param {string} flags
-     * @param {string} [description]
-     * @param {((arg1: any, arg2: any) => void) | RegExp} [fn] function or default
-     * @param {*} [defaultValue]
-     * @returns {Command} for chaining
-     */
-    option(flags: string, description?: string, fn?: ((arg1: any, arg2: any) => void) | RegExp, defaultValue?: any): Command;
-    option(flags: string, description?: string, defaultValue?: any): Command;
-
-    /**
-     * Allow unknown options on the command line.
-     *
-     * @param {boolean} [arg] if `true` or omitted, no error will be thrown for unknown options.
-     * @returns {Command} for chaining
-     */
-    allowUnknownOption(arg?: boolean): Command;
-
-    /**
-     * Parse `argv`, settings options and invoking commands when defined.
-     *
-     * @param {string[]} argv
-     * @returns {Command} for chaining
-     */
-    parse(argv: string[]): Command;
-
-    /**
-     * Parse options from `argv` returning `argv` void of these options.
-     *
-     * @param {string[]} argv
-     * @returns {ParseOptionsResult}
-     */
-    parseOptions(argv: string[]): commander.ParseOptionsResult;
-
-    /**
-     * Return an object containing options as key-value pairs
-     *
-     * @returns {{[key: string]: string}}
-     */
-    opts(): { [key: string]: string };
-
-    /**
-     * Set the description to `str`.
-     *
-     * @param {string} str
-     * @return {(Command | string)}
-     */
-    description(str: string): Command;
-    description(): string;
-
-    /**
-     * Set an alias for the command.
-     *
-     * @param {string} alias
-     * @return {(Command | string)}
-     */
-    alias(alias: string): Command;
-    alias(): string;
-
-    /**
-     * Set or get the command usage.
-     *
-     * @param {string} str
-     * @return {(Command | string)}
-     */
-    usage(str: string): Command;
-    usage(): string;
-
-    /**
-     * Set the name of the command.
-     *
-     * @param {string} str
-     * @return {Command}
-     */
-    name(str: string): Command;
-
-    /**
-     * Get the name of the command.
-     *
-     * @return {string}
-     */
-    name(): string;
-
-    /**
-     * Output help information for this command.
-     *
-     * @param {(str: string) => string} [cb]
-     */
-    outputHelp(cb?: (str: string) => string): void;
-
-    /** Output help information and exit. */
-    help(): void;
-}
-
-declare namespace commander {
-
-    interface CommandOptions {
-        noHelp?: boolean;
-        isDefault?: boolean;
-    }
-
-    interface ParseOptionsResult {
-        args: string[];
-        unknown: string[];
-    }
-
-    interface CommanderStatic extends Command {
-        Command: typeof Command;
-        Option: typeof Option;
-        CommandOptions: CommandOptions;
-        ParseOptionsResult: ParseOptionsResult;
-    }
-
-}
-
-declare const commander: commander.CommanderStatic;
-export = commander;
diff --git a/types/commander/tsconfig.json b/types/commander/tsconfig.json
deleted file mode 100644
index dcb92cc920..0000000000
--- a/types/commander/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "commander-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/commangular/tslint.json b/types/commangular/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/commangular/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/common-tags/tslint.json b/types/common-tags/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/common-tags/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/compare-version/tslint.json b/types/compare-version/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/compare-version/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/complex/tslint.json b/types/complex/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/complex/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/component-emitter/tslint.json b/types/component-emitter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/component-emitter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/compose-function/tslint.json b/types/compose-function/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/compose-function/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/compression/index.d.ts b/types/compression/index.d.ts
index 75c37d4374..68d687a9c4 100644
--- a/types/compression/index.d.ts
+++ b/types/compression/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/expressjs/compression
 // Definitions by: Santi Albo <https://github.com/santialbo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as express from 'express';
 
diff --git a/types/compression/tslint.json b/types/compression/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/compression/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/compute-stdev/compute-stdev-tests.ts b/types/compute-stdev/compute-stdev-tests.ts
new file mode 100644
index 0000000000..72b9869ded
--- /dev/null
+++ b/types/compute-stdev/compute-stdev-tests.ts
@@ -0,0 +1,4 @@
+import stdev = require('compute-stdev');
+
+// $ExpectType number
+stdev([1, 2, 3]);
diff --git a/types/compute-stdev/index.d.ts b/types/compute-stdev/index.d.ts
new file mode 100644
index 0000000000..7e981ae529
--- /dev/null
+++ b/types/compute-stdev/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for compute-stdev 1.0
+// Project: https://github.com/compute-io/stdev
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function stdev(data: ArrayLike<number>): number;
+
+export = stdev;
diff --git a/types/compute-stdev/tsconfig.json b/types/compute-stdev/tsconfig.json
new file mode 100644
index 0000000000..f622c386a3
--- /dev/null
+++ b/types/compute-stdev/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "compute-stdev-tests.ts"
+    ]
+}
diff --git a/types/compute-stdev/tslint.json b/types/compute-stdev/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/compute-stdev/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/concaveman/concaveman-tests.ts b/types/concaveman/concaveman-tests.ts
index 736d616ad9..1d951b5448 100644
--- a/types/concaveman/concaveman-tests.ts
+++ b/types/concaveman/concaveman-tests.ts
@@ -1,4 +1,4 @@
 import * as concaveman from 'concaveman';
 
 var points = [[10, 20], [30, 12.5]];
-var polygon = concaveman(points);
\ No newline at end of file
+var polygon = concaveman(points);
diff --git a/types/concaveman/index.d.ts b/types/concaveman/index.d.ts
index a5b55c8fa3..ed5da84fc9 100644
--- a/types/concaveman/index.d.ts
+++ b/types/concaveman/index.d.ts
@@ -3,10 +3,11 @@
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+
 declare module "concaveman" {
     /**
      * A very fast 2D concave hull algorithm in JavaScript (generates a general outline of a point set).
-     * 
+     *
      * @name concaveman
      * @param {Array<Array<number>>} points is an array of [x, y] points.
      * @param {number} [concavity=2] is a relative measure of concavity. 1 results in a relatively detailed shape, Infinity results in a convex hull. You can use values lower than 1, but they can produce pretty crazy shapes.
@@ -15,7 +16,7 @@ declare module "concaveman" {
      * @example
      * var points = [[10, 20], [30, 12.5], ...];
      * var polygon = concaveman(points);
-     * 
+     *
      * //=hull
      */
     function concaveman(points: number[][], concavity?: number, lengthThreshold?: number): number[][];
diff --git a/types/concaveman/tslint.json b/types/concaveman/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/concaveman/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/confidence/tslint.json b/types/confidence/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/confidence/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/config/tslint.json b/types/config/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/config/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/confit/tslint.json b/types/confit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/confit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect-busboy/connect-busboy-tests.ts b/types/connect-busboy/connect-busboy-tests.ts
new file mode 100644
index 0000000000..2bbb832070
--- /dev/null
+++ b/types/connect-busboy/connect-busboy-tests.ts
@@ -0,0 +1,6 @@
+import * as connectBusboy from 'connect-busboy';
+
+import * as express from 'express';
+
+const options: connectBusboy.ConnectBusboyOptions = { immediate: true };
+const result: express.RequestHandler = connectBusboy(options);
diff --git a/types/connect-busboy/index.d.ts b/types/connect-busboy/index.d.ts
new file mode 100644
index 0000000000..cb6a3e8702
--- /dev/null
+++ b/types/connect-busboy/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for connect-busboy 0.0
+// Project: https://github.com/mscdex/connect-busboy
+// Definitions by: Pinguet62 <https://github.com/pinguet62>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as busboy from 'busboy';
+import { RequestHandler } from 'express';
+
+declare function connectBusboy(options?: connectBusboy.ConnectBusboyOptions): RequestHandler;
+
+declare namespace connectBusboy {
+    interface ConnectBusboyOptions extends busboy.BusboyConfig {
+        immediate?: boolean;
+    }
+}
+
+export = connectBusboy;
diff --git a/types/connect-busboy/tsconfig.json b/types/connect-busboy/tsconfig.json
new file mode 100644
index 0000000000..112c160f2b
--- /dev/null
+++ b/types/connect-busboy/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-busboy-tests.ts"
+    ]
+}
diff --git a/types/connect-busboy/tslint.json b/types/connect-busboy/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/connect-busboy/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/connect-ensure-login/index.d.ts b/types/connect-ensure-login/index.d.ts
index 9158255c40..6c91101ab5 100644
--- a/types/connect-ensure-login/index.d.ts
+++ b/types/connect-ensure-login/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/connect-ensure-login
 // Definitions by: Pavel Puchkov <https://github.com/0x6368656174>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { RequestHandler } from "express";
 
diff --git a/types/connect-flash/index.d.ts b/types/connect-flash/index.d.ts
index cb7d460623..90540da3ed 100644
--- a/types/connect-flash/index.d.ts
+++ b/types/connect-flash/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/connect-flash
 // Definitions by: Andreas Gassmann <https://github.com/AndreasGassmann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="express" />
 
diff --git a/types/connect-flash/tslint.json b/types/connect-flash/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect-flash/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect-history-api-fallback/index.d.ts b/types/connect-history-api-fallback/index.d.ts
index 9cd77ac174..a39fbfdbd6 100644
--- a/types/connect-history-api-fallback/index.d.ts
+++ b/types/connect-history-api-fallback/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bripkens/connect-history-api-fallback#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/connect-livereload/tslint.json b/types/connect-livereload/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect-livereload/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect-modrewrite/index.d.ts b/types/connect-modrewrite/index.d.ts
index 41372046d1..910d56f9af 100644
--- a/types/connect-modrewrite/index.d.ts
+++ b/types/connect-modrewrite/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tinganho/connect-modrewrite
 // Definitions by: Tingan Ho <https://github.com/tinganho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
diff --git a/types/connect-modrewrite/tslint.json b/types/connect-modrewrite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect-modrewrite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect-mongo/tsconfig.json b/types/connect-mongo/tsconfig.json
index c352be5580..ca12068b57 100644
--- a/types/connect-mongo/tsconfig.json
+++ b/types/connect-mongo/tsconfig.json
@@ -4,6 +4,11 @@
         "lib": [
             "es6"
         ],
+        "paths": {
+            "mongodb": [
+                "mongodb/v2"
+            ]
+        },
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
diff --git a/types/connect-mongo/tslint.json b/types/connect-mongo/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect-mongo/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect-redis/index.d.ts b/types/connect-redis/index.d.ts
index b5084609a2..5675512795 100644
--- a/types/connect-redis/index.d.ts
+++ b/types/connect-redis/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Xavier Stouder <https://github.com/xstoudi>
 //                 Albert Kurniawan <https://github.com/morcerf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="express" />
 /// <reference types="express-session" />
diff --git a/types/connect-redis/tslint.json b/types/connect-redis/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect-redis/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect-slashes/index.d.ts b/types/connect-slashes/index.d.ts
index ccb7eb82c3..440f54372c 100644
--- a/types/connect-slashes/index.d.ts
+++ b/types/connect-slashes/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/avinoamr/connect-slashes
 // Definitions by: Sam Herrmann <https://github.com/samherrmann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /* =================== USAGE ===================
 
diff --git a/types/connect-slashes/tslint.json b/types/connect-slashes/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect-slashes/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect-timeout/index.d.ts b/types/connect-timeout/index.d.ts
index 0ec4963306..93114c1469 100644
--- a/types/connect-timeout/index.d.ts
+++ b/types/connect-timeout/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/expressjs/timeout
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 
diff --git a/types/connect-timeout/tslint.json b/types/connect-timeout/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect-timeout/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/connect/tslint.json b/types/connect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/connect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/console-stamp/tslint.json b/types/console-stamp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/console-stamp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/consolidate/tslint.json b/types/consolidate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/consolidate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/consul/tslint.json b/types/consul/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/consul/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/content-type/index.d.ts b/types/content-type/index.d.ts
index 5ff4ae7ff1..c81c78c966 100644
--- a/types/content-type/index.d.ts
+++ b/types/content-type/index.d.ts
@@ -18,7 +18,7 @@ export interface MediaType {
 }
 
 export interface RequestLike {
-    headers: {[header: string]: string | string[]};
+    headers: {[header: string]: string | string[] | undefined};
 }
 
 export interface ResponseLike {
diff --git a/types/contentful-resolve-response/tslint.json b/types/contentful-resolve-response/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/contentful-resolve-response/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/contextjs/tslint.json b/types/contextjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/contextjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/convert-source-map/convert-source-map-tests.ts b/types/convert-source-map/convert-source-map-tests.ts
index c591f124c6..a95138d657 100644
--- a/types/convert-source-map/convert-source-map-tests.ts
+++ b/types/convert-source-map/convert-source-map-tests.ts
@@ -1,12 +1,12 @@
 import convert = require("convert-source-map");
 
-// tslint:disable:max-line-length
-
 const json = convert
+	// tslint:disable-next-line max-line-length
 	.fromComment('//@ sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vLmpzIiwic291cmNlcyI6WyJjb25zb2xlLmxvZyhcImhpXCIpOyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSIsInNvdXJjZVJvb3QiOiIvIn0=')
 	.toJSON();
 
 const modified = convert
+	// tslint:disable-next-line max-line-length
 	.fromComment('//@ sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vLmpzIiwic291cmNlcyI6WyJjb25zb2xlLmxvZyhcImhpXCIpOyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSIsInNvdXJjZVJvb3QiOiIvIn0=')
 	.setProperty('sources', ['CONSOLE.LOG("HI");'])
 	.toJSON();
diff --git a/types/convert-source-map/index.d.ts b/types/convert-source-map/index.d.ts
index 6b1346b61f..6950445a6c 100644
--- a/types/convert-source-map/index.d.ts
+++ b/types/convert-source-map/index.d.ts
@@ -3,7 +3,8 @@
 // Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar>, Melvin Groenhoff <https://github.com/mgroenhoff>, TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/** Converts a source-map from/to different formats and allows adding/changing properties.
+/**
+ * Converts a source-map from/to different formats and allows adding/changing properties.
  * (documentation based on project's README file)
  */
 export interface SourceMapConverter {
@@ -19,7 +20,8 @@ export interface SourceMapConverter {
     /** Converts source map to base64 encoded json string */
     toBase64(): string;
 
-    /** Converts source map to an inline comment that can be appended to the source-file.
+    /**
+     * Converts source map to an inline comment that can be appended to the source-file.
      * By default, the comment is formatted like: //# sourceMappingURL=..., which you would normally see in a JS source file.
      * When options.multiline == true, the comment is formatted like: /*# sourceMappingURL=... *\/, which you would find in a CSS source file
      */
@@ -47,16 +49,19 @@ export function fromBase64(base64: string): SourceMapConverter;
 /** Returns source map converter from given base64 encoded json string prefixed with //# sourceMappingURL=... */
 export function fromComment(comment: string): SourceMapConverter;
 
-/** Returns source map converter from given filename by parsing //# sourceMappingURL=filename.
+/**
+ * Returns source map converter from given filename by parsing //# sourceMappingURL=filename.
  * filename must point to a file that is found inside the mapFileDir. Most tools store this file right next to the generated file, i.e. the one containing the source map.
  */
 export function fromMapFileComment(comment: string, commentFileDir: string): SourceMapConverter;
 
-/** Finds last sourcemap comment in file and returns source map converter or returns null if no source map comment was found.
+/**
+ * Finds last sourcemap comment in file and returns source map converter or returns null if no source map comment was found.
  */
 export function fromSource(content: string): SourceMapConverter | null;
 
-/** Finds last sourcemap comment in file and returns source map converter or returns null if no source map comment was found.
+/**
+ * Finds last sourcemap comment in file and returns source map converter or returns null if no source map comment was found.
  * The sourcemap will be read from the map file found by parsing # sourceMappingURL=file comment. For more info see fromMapFileComment.
  */
 export function fromMapFileSource(content: string, commentFileDir: string): SourceMapConverter | null;
@@ -73,7 +78,8 @@ export const commentRegex: RegExp;
 /** Returns a new regex used to find source map comments pointing to map files */
 export const mapFileCommentRegex: RegExp;
 
-/** Returns a comment that links to an external source map via file.
+/**
+ * Returns a comment that links to an external source map via file.
  * By default, the comment is formatted like: //# sourceMappingURL=..., which you would normally see in a JS source file.
  * When options.multiline == true, the comment is formatted like: /*# sourceMappingURL=... *\/, which you would find in a CSS source file.
  */
diff --git a/types/convict/index.d.ts b/types/convict/index.d.ts
index 5aac427dd0..544cb9b3f3 100644
--- a/types/convict/index.d.ts
+++ b/types/convict/index.d.ts
@@ -27,27 +27,33 @@ declare namespace convict {
         coerce?(val: any): any;
     }
 
+    interface SchemaObj {
+        default: any;
+        doc?: string;
+        /**
+         * From the implementation:
+         *
+         *  format can be a:
+         *   - predefined type, as seen below
+         *   - an array of enumerated values, e.g. ["production", "development", "testing"]
+         *   - built-in JavaScript type, i.e. Object, Array, String, Number, Boolean
+         *   - function that performs validation and throws an Error on failure
+         *
+         * If omitted, format will be set to the value of Object.prototype.toString.call
+         * for the default value
+         */
+        format?: string | any[] | ((val: any) => void);
+        env?: string;
+        arg?: string;
+        sensitive?: boolean;
+    }
+
     interface Schema {
-        [name: string]: Schema | {
-            default: any;
-            doc?: string;
-            /**
-             * From the implementation:
-             *
-             *  format can be a:
-             *   - predefined type, as seen below
-             *   - an array of enumerated values, e.g. ["production", "development", "testing"]
-             *   - built-in JavaScript type, i.e. Object, Array, String, Number, Boolean
-             *   - function that performs validation and throws an Error on failure
-             *
-             * If omitted, format will be set to the value of Object.prototype.toString.call
-             * for the default value
-             */
-            format?: string | any[] | ((val: any) => void);
-            env?: string;
-            arg?: string;
-            sensitive?: boolean;
-        };
+        [name: string]: Schema | SchemaObj;
+    }
+
+    interface InternalSchema {
+        properties: Schema;
     }
 
     interface Config {
@@ -69,48 +75,40 @@ declare namespace convict {
          * Sets the value of name to value. name can use dot notation to reference
          * nested values, e.g. "database.port". If objects in the chain don't yet
          * exist, they will be initialized to empty objects
-         *
-         * @return {Config} instance
          */
         set(name: string, value: any): Config;
         /**
          * Loads and merges a JavaScript object into config
-         *
-         * @return {Config} instance
          */
         load(conf: Object): Config;
         /**
          * Loads and merges JSON configuration file(s) into config
-         *
-         * @return {Config} instance
          */
         loadFile(files: string | string[]): Config;
         /**
          * Validates config against the schema used to initialize it
-         *
-         * @param options
          */
         validate(options?: ValidateOptions): Config;
         /**
          * Exports all the properties (that is the keys and their current values) as a {JSON} {Object}
-         * @returns {Object} A {JSON} compliant {Object}
+         * @returns A {JSON} compliant {Object}
          */
         getProperties(): Object;
         /**
          * Exports the schema as a {JSON} {Object}
-         * @returns {Object} A {JSON} compliant {Object}
+         * @returns A {JSON} compliant {Object}
          */
-        getSchema(): Object;
+        getSchema(): InternalSchema;
 
         /**
          * Exports all the properties (that is the keys and their current values) as a JSON string.
-         * @returns {String} a string representing this object
+         * @returns A string representing this object
          */
         toString(): string;
 
         /**
          * Exports the schema as a JSON string.
-         * @returns {String} a string representing the schema of this {Config}
+         * @returns A string representing the schema of this {Config}
          */
         getSchemaString(): string;
     }
diff --git a/types/cookie-session/index.d.ts b/types/cookie-session/index.d.ts
index 29562d0320..001ba646d5 100644
--- a/types/cookie-session/index.d.ts
+++ b/types/cookie-session/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/expressjs/cookie-session
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="express" />
 
diff --git a/types/cookie-session/tslint.json b/types/cookie-session/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cookie-session/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cookie-signature/index.d.ts b/types/cookie-signature/index.d.ts
index b9b29911a6..cb044f4636 100644
--- a/types/cookie-signature/index.d.ts
+++ b/types/cookie-signature/index.d.ts
@@ -3,19 +3,11 @@
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * Sign the given `val` with `secret`.
- * @param {string} val
- * @param {string} secret
- * @return {string}
- */
+/** Sign the given `val` with `secret`. */
 export function sign(value: string, secret: string): string;
 
 /**
  * Unsign and decode the given `val` with `secret`,
  * returning `false` if the signature is invalid.
- * @param {string} val
- * @param {string} secret
- * @return {string|boolean}
  */
 export function unsign(value: string, secret: string): string | boolean;
diff --git a/types/cookie_js/tslint.json b/types/cookie_js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cookie_js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cookies/index.d.ts b/types/cookies/index.d.ts
index 8a897cfeae..380ce03b7d 100644
--- a/types/cookies/index.d.ts
+++ b/types/cookies/index.d.ts
@@ -4,6 +4,7 @@
 //                 jKey Lu <https://github.com/jkeylu>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
diff --git a/types/copy-paste/tslint.json b/types/copy-paste/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/copy-paste/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/copy-webpack-plugin/tslint.json b/types/copy-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/copy-webpack-plugin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-ionic/tslint.json b/types/cordova-ionic/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-ionic/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-app-version/tslint.json b/types/cordova-plugin-app-version/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-app-version/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-background-mode/tslint.json b/types/cordova-plugin-background-mode/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-background-mode/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts b/types/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
deleted file mode 100644
index dbad990b8d..0000000000
--- a/types/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-function eventCallBack(ev: BatteryStatusEvent) {
-    console.log('Battery level is ' + ev.level);
-}
-window.addEventListener('batterystatus', (ev: BatteryStatusEvent) => { console.log('Battery level is ' + ev.level); });
-window.addEventListener('batterystatus', (ev) => { console.log('Battery level is ' + ev.level); });
-window.addEventListener('batterycritical', (ev) => { console.log('Battery is critical: ' + ev.level); });
-window.addEventListener('batterylow', (ev) => { console.log('Battery is low: ' + ev.level); });
-
-window.addEventListener('baterystatus', eventCallBack);
-window.addEventListener('batterycritical', eventCallBack);
-window.addEventListener('batterylow', eventCallBack);
-
-window.removeEventListener('batterystatus', eventCallBack);
-window.removeEventListener('batterycritical', eventCallBack);
-window.removeEventListener('batterylow', eventCallBack);
-
-window.addEventListener('batterycritical', () => { alert('Battery is critical low!'); });
-window.addEventListener('batterylow', () => { alert('Battery is low!'); });
-
-function batteryCriticalCallback() {
-    alert('Battery is critical low!');
-}
-
-function batteryLowCallback() {
-    alert('Battery is critical low!');
-}
-
-window.addEventListener('batterycritical', batteryCriticalCallback);
-window.addEventListener('batterylow', batteryLowCallback);
\ No newline at end of file
diff --git a/types/cordova-plugin-battery-status/index.d.ts b/types/cordova-plugin-battery-status/index.d.ts
deleted file mode 100644
index 0cdf729d30..0000000000
--- a/types/cordova-plugin-battery-status/index.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for Apache Cordova BatteryStatus plugin
-// Project: https://github.com/apache/cordova-plugin-battery-status
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-// TypeScript Version: 2.3
-
-interface WindowEventMap {
-    /**
-     * batterystatus: event fires when the percentage of battery charge changes by at least 1 percent, or if the device is plugged in or unplugged.
-     */
-    "batterystatus" : BatteryStatusEvent;
-    /**
-     * batterycritical: event fires when the percentage of battery charge has reached the critical battery threshold. The value is device-specific.
-     */
-    "batterycritical": BatteryStatusEvent;
-    /**
-     * batterylow: event fires when the percentage of battery charge has reached the low battery threshold, device-specific value.
-     */
-    "batterylow": BatteryStatusEvent;
-}
-
-interface Window {
-    onbatterystatus: (type: BatteryStatusEvent) => void;
-    onbatterycritical: (type: BatteryStatusEvent) => void;
-    onbatterylow: (type: BatteryStatusEvent) => void;
-}
-
-/** Object, that passed into battery event listener */
-interface BatteryStatusEvent extends Event {
-	/* The percentage of battery charge (0-100). */
-    level: number;
-	/* A boolean that indicates whether the device is plugged in. */
-    isPlugged: boolean;
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-battery-status/tsconfig.json b/types/cordova-plugin-battery-status/tsconfig.json
deleted file mode 100644
index 0149bb419c..0000000000
--- a/types/cordova-plugin-battery-status/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-battery-status-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-ble-central/tslint.json b/types/cordova-plugin-ble-central/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-ble-central/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-camera/cordova-plugin-camera-tests.ts b/types/cordova-plugin-camera/cordova-plugin-camera-tests.ts
deleted file mode 100644
index 2f1b661775..0000000000
--- a/types/cordova-plugin-camera/cordova-plugin-camera-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-navigator.camera.getPicture(
-    (data: string) => { alert('Got photo!'); },
-    (message: string)=> { alert('Failed!: ' + message); },
-    {
-        allowEdit: true,
-        cameraDirection: Camera.Direction.BACK,
-        destinationType: Camera.DestinationType.FILE_URI,
-        encodingType: Camera.EncodingType.JPEG,
-        sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
-        quality: 80
-    });
diff --git a/types/cordova-plugin-camera/index.d.ts b/types/cordova-plugin-camera/index.d.ts
deleted file mode 100644
index 48c8f8ae5c..0000000000
--- a/types/cordova-plugin-camera/index.d.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-// Type definitions for Apache Cordova Camera plugin
-// Project: https://github.com/apache/cordova-plugin-camera
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-
-interface Navigator {
-    /**
-     * This plugin provides an API for taking pictures and for choosing images from the system's image library.
-     */
-    camera: Camera;
-}
-
-/**
- * This plugin provides an API for taking pictures and for choosing images from the system's image library.
- */
-interface Camera {
-    /**
-     * Removes intermediate photos taken by the camera from temporary storage.
-     * @param onSuccess Success callback, that called when cleanup succeeds.
-     * @param onError Error callback, that get an error message.
-     */
-    cleanup(
-        onSuccess: () => void,
-        onError: (message: string) => void): void;
-    /**
-     * Takes a photo using the camera, or retrieves a photo from the device's image gallery.
-     * @param cameraSuccess Success callback, that get the image
-     * as a base64-encoded String, or as the URI for the image file.
-     * @param cameraError Error callback, that get an error message.
-     * @param cameraOptions Optional parameters to customize the camera settings.
-     */
-    getPicture(
-        cameraSuccess: (data: string) => void,
-        cameraError: (message: string) => void,
-        cameraOptions?: CameraOptions): void;
-    // Next will work only on iOS
-    //getPicture(
-    //    cameraSuccess: (data: string) => void,
-    //    cameraError: (message: string) => void,
-    //    cameraOptions?: CameraOptions): CameraPopoverHandle;
-}
-
-interface CameraOptions {
-    /** Picture quality in range 0-100. Default is 50 */
-    quality?: number;
-    /**
-     * Choose the format of the return value.
-     * Defined in navigator.camera.DestinationType. Default is FILE_URI.
-     *      DATA_URL : 0,   Return image as base64-encoded string
-     *      FILE_URI : 1,   Return image file URI
-     *      NATIVE_URI : 2  Return image native URI
-     *          (e.g., assets-library:// on iOS or content:// on Android)
-     */
-    destinationType?: number;
-    /**
-     * Set the source of the picture.
-     * Defined in navigator.camera.PictureSourceType. Default is CAMERA.
-     *      PHOTOLIBRARY : 0,
-     *      CAMERA : 1,
-     *      SAVEDPHOTOALBUM : 2
-     */
-    sourceType?: number;
-    /** Allow simple editing of image before selection. */
-    allowEdit?: boolean;
-    /**
-     * Choose the returned image file's encoding.
-     * Defined in navigator.camera.EncodingType. Default is JPEG
-     *      JPEG : 0    Return JPEG encoded image
-     *      PNG : 1     Return PNG encoded image
-     */
-    encodingType?: number;
-    /**
-     * Width in pixels to scale image. Must be used with targetHeight.
-     * Aspect ratio remains constant.
-    */
-    targetWidth?: number;
-    /**
-     * Height in pixels to scale image. Must be used with targetWidth.
-     * Aspect ratio remains constant.
-     */
-    targetHeight?: number;
-    /**
-     * Set the type of media to select from. Only works when PictureSourceType
-     * is PHOTOLIBRARY or SAVEDPHOTOALBUM. Defined in nagivator.camera.MediaType
-     *      PICTURE: 0      allow selection of still pictures only. DEFAULT.
-     *          Will return format specified via DestinationType
-     *      VIDEO: 1        allow selection of video only, WILL ALWAYS RETURN FILE_URI
-     *      ALLMEDIA : 2    allow selection from all media types
-     */
-    mediaType?: number;
-    /** Rotate the image to correct for the orientation of the device during capture. */
-    correctOrientation?: boolean;
-    /** Save the image to the photo album on the device after capture. */
-    saveToPhotoAlbum?: boolean;
-    /**
-     * Choose the camera to use (front- or back-facing).
-     * Defined in navigator.camera.Direction. Default is BACK.
-     *      FRONT: 0
-     *      BACK: 1
-     */
-    cameraDirection?: number;
-    /** iOS-only options that specify popover location in iPad. Defined in CameraPopoverOptions. */
-    popoverOptions?: CameraPopoverOptions;
-}
-
-/**
- * A handle to the popover dialog created by navigator.camera.getPicture. Used on iOS only.
- */
-interface CameraPopoverHandle {
-    /**
-     * Set the position of the popover.
-     * @param popoverOptions the CameraPopoverOptions that specify the new position.
-     */
-    setPosition(popoverOptions: CameraPopoverOptions): void;
-}
-
-/**
- * iOS-only parameters that specify the anchor element location and arrow direction
- * of the popover when selecting images from an iPad's library or album.
- */
-interface CameraPopoverOptions {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-    /**
-     * Direction the arrow on the popover should point. Defined in Camera.PopoverArrowDirection
-     * Matches iOS UIPopoverArrowDirection constants.
-     *      ARROW_UP : 1,        
-     *      ARROW_DOWN : 2,
-     *      ARROW_LEFT : 4,
-     *      ARROW_RIGHT : 8,
-     *      ARROW_ANY : 15
-     */
-    arrowDir : number;
-}
-
-declare var Camera: {
-    // Camera constants, defined in Camera plugin
-    DestinationType: {
-        DATA_URL: number;
-        FILE_URI: number;
-        NATIVE_URI: number
-    }
-    Direction: {
-        BACK: number;
-        FRONT: number;
-    }
-    EncodingType: {
-        JPEG: number;
-        PNG: number;
-    }
-    MediaType: {
-        PICTURE: number;
-        VIDEO: number;
-        ALLMEDIA: number;
-    }
-    PictureSourceType: {
-        PHOTOLIBRARY: number;
-        CAMERA: number;
-        SAVEDPHOTOALBUM: number;
-    }
-    // Used only on iOS
-    PopoverArrowDirection: {
-        ARROW_UP: number;
-        ARROW_DOWN: number;
-        ARROW_LEFT: number;
-        ARROW_RIGHT: number;
-        ARROW_ANY: number;
-    }
-};
\ No newline at end of file
diff --git a/types/cordova-plugin-camera/tsconfig.json b/types/cordova-plugin-camera/tsconfig.json
deleted file mode 100644
index 267426a6fa..0000000000
--- a/types/cordova-plugin-camera/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-camera-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-contacts/cordova-plugin-contacts-tests.ts b/types/cordova-plugin-contacts/cordova-plugin-contacts-tests.ts
deleted file mode 100644
index 26243ab43a..0000000000
--- a/types/cordova-plugin-contacts/cordova-plugin-contacts-tests.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-var contact: Contact = navigator.contacts.create({
-    nickname: 'John Smith',
-    displayName: 'John Smith',
-    phoneNumbers: [{ pref: true, type: "work", value: "+185642556856" }]
-});
-
-navigator.contacts.find(["phoneNumbers"],
-    (contacts: Contact[])=> { alert('Find ' + contacts.length + ' contacts'); },
-    (error: ContactError) => { alert('Error: ' + error.message); },
-    new ContactFindOptions("+1", true)
-);
-
-navigator.contacts.pickContact(
-    (contact: Contact)=> { console.log(contact); },
-    (err: ContactError)=> { console.log(err.message); }
-);
diff --git a/types/cordova-plugin-contacts/index.d.ts b/types/cordova-plugin-contacts/index.d.ts
deleted file mode 100644
index f0979ba6c2..0000000000
--- a/types/cordova-plugin-contacts/index.d.ts
+++ /dev/null
@@ -1,337 +0,0 @@
-// Type definitions for Apache Cordova Contacts plugin
-// Project: https://github.com/apache/cordova-plugin-contacts
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
-// Copyright (c) Microsoft Open Technologies, Inc.
-// Licensed under the MIT license.
-
-interface Navigator {
-    /** Provides access to the device contacts database. */
-    contacts: Contacts;
-}
-
-interface Contacts {
-    /**
-     * The navigator.contacts.create method is synchronous, and returns a new Contact object.
-     * This method does not retain the Contact object in the device contacts database,
-     * for which you need to invoke the Contact.save method.
-     * @param  properties Object with contact fields
-     */
-    create(properties?: ContactProperties): Contact;
-    /**
-     * The navigator.contacts.find method executes asynchronously, querying the device contacts database
-     * and returning an array of Contact objects. The resulting objects are passed to the onSuccess
-     * callback function specified by the onSuccess parameter.
-     * @param fields The fields parameter specifies the fields to be used as a search qualifier,
-     * and only those results are passed to the onSuccess callback function. A zero-length fields parameter
-     * is invalid and results in ContactError.INVALID_ARGUMENT_ERROR. A contactFields value of "*" returns all contact fields.
-     * @param onSuccess Success callback function invoked with the array of Contact objects returned from the database
-     * @param onError Error callback function, invoked when an error occurs.
-     * @param options Search options to filter navigator.contacts.
-     */
-    find(fields: string[],
-        onSuccess: (contacts: Contact[]) => void,
-        onError?: (error: ContactError) => void,
-        options?: ContactFindOptions): void;
-    /**
-     * The navigator.contacts.pickContact method launches the Contact Picker to select a single contact.
-     * The resulting object is passed to the contactSuccess callback function specified by the contactSuccess parameter.
-     * @param onSuccess Success callback function invoked with the array of Contact objects returned from the database
-     * @param onError Error callback function, invoked when an error occurs.
-     */
-    pickContact(onSuccess: (contact: Contact) => void,
-        onError: (error: ContactError) => void): void
-
-    /**
-     * This allows us to use an enumeration when setting the desired fields for the ContactFindOptions.
-     * The values will correspond to the type of string literals in ContactFieldType.
-     */
-    fieldType: {
-        addresses: "addresses",
-        birthday: "birthday",
-        categories: "categories",
-        country: "country",
-        department: "department",
-        displayName: "displayName",
-        emails: "emails",
-        familyName: "familyName",
-        formatted: "formatted",
-        givenName: "givenName",
-        honorificPrefix: "honorificPrefix",
-        honorificSuffix: "honorificSuffix",
-        id: "id",
-        ims: "ims",
-        locality: "locality",
-        middleName: "middleName",
-        name: "name",
-        nickname: "nickname",
-        note: "note",
-        organizations: "organizations",
-        phoneNumbers: "phoneNumbers",
-        photos: "photos",
-        postalCode: "postalCode",
-        region: "region",
-        streetAddress: "streetAddress",
-        title: "title",
-        urls: "urls"
-    }
-}
-
-interface ContactProperties {
-    /** A globally unique identifier. */
-    id?: string;
-    /** The name of this Contact, suitable for display to end users. */
-    displayName?: string;
-    /** An object containing all components of a persons name. */
-    name?: ContactName;
-    /** A casual name by which to address the contact. */
-    nickname?: string;
-    /** An array of all the contact's phone numbers. */
-    phoneNumbers?: ContactField[];
-    /** An array of all the contact's email addresses. */
-    emails?: ContactField[];
-    /** An array of all the contact's addresses. */
-    addresses?: ContactAddress[];
-    /** An array of all the contact's IM addresses. */
-    ims?: ContactField[];
-    /** An array of all the contact's organizations. */
-    organizations?: ContactOrganization[];
-    /** The birthday of the contact. */
-    birthday?: Date;
-    /** A note about the contact. */
-    note?: string;
-    /** An array of the contact's photos. */
-    photos?: ContactField[];
-    /** An array of all the user-defined categories associated with the contact. */
-    categories?: ContactField[];
-    /** An array of web pages associated with the contact. */
-    urls?: ContactField[];
-}
-
-/**
- * The Contact object represents a user's contact. Contacts can be created, stored, or removed
- * from the device contacts database. Contacts can also be retrieved (individually or in bulk)
- * from the database by invoking the navigator.contacts.find method.
- */
-interface Contact extends ContactProperties {
-    /**
-     * Returns a new Contact object that is a deep copy of the calling object, with the id property set to null
-     */
-    clone(): Contact;
-    /**
-     * Removes the contact from the device contacts database, otherwise executes an error callback with a ContactError object.
-     * @param onSuccess Success callback function invoked on success operation.
-     * @param onError Error callback function, invoked when an error occurs.
-     */
-    remove(
-        onSuccess: () => void,
-        onError: (error: Error) => void): void;
-    /**
-     * Saves a new contact to the device contacts database, or updates an existing contact if a contact with the same id already exists.
-     * @param onSuccess Success callback function invoked on success operation with che Contact object.
-     * @param onError Error callback function, invoked when an error occurs.
-     */
-    save(
-        onSuccess: (contact: Contact) => void,
-        onError: (error: Error) => void): void;
-}
-
-declare var Contact: {
-    /** Constructor of Contact object */
-    new (id?: string,
-        displayName?: string,
-        name?: ContactName,
-        nickname?: string,
-        phoneNumbers?: ContactField[],
-        emails?: ContactField[],
-        addresses?: ContactAddress[],
-        ims?: ContactField[],
-        organizations?: ContactOrganization[],
-        birthday?: Date,
-        note?: string,
-        photos?: ContactField[],
-        categories?: ContactField,
-        urls?: ContactField[]): Contact
-};
-
-/** The ContactError object is returned to the user through the contactError callback function when an error occurs. */
-interface ContactError {
-    /** Error code */
-    code: number;
-    /** Error message */
-    message: string;
-}
-
-declare var ContactError: {
-    new (code: number): ContactError;
-    UNKNOWN_ERROR: number;
-    INVALID_ARGUMENT_ERROR: number;
-    TIMEOUT_ERROR: number;
-    PENDING_OPERATION_ERROR: number;
-    IO_ERROR: number;
-    NOT_SUPPORTED_ERROR: number;
-    PERMISSION_DENIED_ERROR: number
-};
-
-/** Contains different kinds of information about a Contact object's name. */
-interface ContactName {
-    /** The complete name of the contact. */
-    formatted?: string;
-    /** The contact's family name. */
-    familyName?: string;
-    /** The contact's given name. */
-    givenName?: string;
-    /** The contact's middle name. */
-    middleName?: string;
-    /** The contact's prefix (example Mr. or Dr.) */
-    honorificPrefix?: string;
-    /** The contact's suffix (example Esq.). */
-    honorificSuffix?: string;
-}
-
-declare var ContactName: {
-    /** Constructor for ContactName object */
-    new (formatted?: string,
-        familyName?: string,
-        givenName?: string,
-        middleName?: string,
-        honorificPrefix?: string,
-        honorificSuffix?: string): ContactName
-};
-
-/**
- * The ContactField object is a reusable component that represents contact fields generically.
- * Each ContactField object contains a value, type, and pref property. A Contact object stores
- * several properties in ContactField[] arrays, such as phone numbers and email addresses.
- *
- * In most instances, there are no pre-determined values for a ContactField object's type attribute.
- * For example, a phone number can specify type values of home, work, mobile, iPhone,
- * or any other value that is supported by a particular device platform's contact database.
- * However, for the Contact photos field, the type field indicates the format of the returned image:
- * url when the value attribute contains a URL to the photo image, or base64 when the value
- * contains a base64-encoded image string.
- */
-interface ContactField {
-    /** A string that indicates what type of field this is, home for example. */
-    type: string;
-    /** The value of the field, such as a phone number or email address. */
-    value: string;
-    /** Set to true if this ContactField contains the user's preferred value. */
-    pref: boolean;
-}
-
-declare var ContactField: {
-    /** Constructor for ContactField object */
-    new (type?: string,
-        value?: string,
-        pref?: boolean): ContactField
-};
-
-/**
- * The ContactAddress object stores the properties of a single address of a contact.
- * A Contact object may include more than one address in a ContactAddress[] array.
- */
-interface ContactAddress {
-    /** Set to true if this ContactAddress contains the user's preferred value. */
-    pref?: boolean;
-    /** A string indicating what type of field this is, home for example. */
-    type?: string;
-    /** The full address formatted for display. */
-    formatted?: string;
-    /** The full street address. */
-    streetAddress?: string;
-    /** The city or locality. */
-    locality?: string;
-    /** The state or region. */
-    region?: string;
-    /** The zip code or postal code. */
-    postalCode?: string;
-    /** The country name. */
-    country?: string;
-}
-
-declare var ContactAddress: {
-    /** Constructor of ContactAddress object */
-    new (pref?: boolean,
-        type?: string,
-        formatted?: string,
-        streetAddress?: string,
-        locality?: string,
-        region?: string,
-        postalCode?: string,
-        country?: string): ContactAddress
-};
-
-/**
- * The ContactOrganization object stores a contact's organization properties. A Contact object stores
- * one or more ContactOrganization objects in an array.
- */
-interface ContactOrganization {
-    /** Set to true if this ContactOrganization contains the user's preferred value. */
-    pref?: boolean;
-    /** A string that indicates what type of field this is, home for example. */
-    type?: string;
-    /** The name of the organization. */
-    name?: string;
-    /** The department the contract works for. */
-    department?: string;
-    /** The contact's title at the organization. */
-    title?: string;
-}
-
-declare var ContactOrganization: {
-    /** Constructor for ContactOrganization object */
-    new (pref?: boolean,
-        type?: string,
-        name?: string,
-        department?: string,
-        title?: string): ContactOrganization
-};
-
-/** Search options to filter navigator.contacts.  */
-interface ContactFindOptions {
-    /** The search string used to find navigator.contacts. */
-    filter?: string;
-    /** Determines if the find operation returns multiple navigator.contacts. */
-    multiple?: boolean;
-    /* Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields. */
-    desiredFields?: ContactFieldType[];
-}
-
-/** these are the string values that are valid for the desired fields in ContactFindOptions */
-declare type ContactFieldType =
-    "addresses"
-    | "birthday"
-    | "categories"
-    | "country"
-    | "department"
-    | "displayName"
-    | "emails"
-    | "familyName"
-    | "formatted"
-    | "givenName"
-    | "honorificPrefix"
-    | "honorificSuffix"
-    | "id"
-    | "ims"
-    | "locality"
-    | "middleName"
-    | "name"
-    | "nickname"
-    | "note"
-    | "organizations"
-    | "phoneNumbers"
-    | "photos"
-    | "postalCode"
-    | "region"
-    | "streetAddress"
-    | "title"
-    | "urls";
-
-declare var ContactFindOptions: {
-    /** Constructor for ContactFindOptions object */
-    new (filter?: string,
-        multiple?: boolean,
-        desiredFields?: ContactFieldType[]): ContactFindOptions
-};
diff --git a/types/cordova-plugin-contacts/tsconfig.json b/types/cordova-plugin-contacts/tsconfig.json
deleted file mode 100644
index 6217f6ac02..0000000000
--- a/types/cordova-plugin-contacts/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-contacts-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-device-motion/cordova-plugin-device-motion-tests.ts b/types/cordova-plugin-device-motion/cordova-plugin-device-motion-tests.ts
deleted file mode 100644
index 1b335beaf7..0000000000
--- a/types/cordova-plugin-device-motion/cordova-plugin-device-motion-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-navigator.accelerometer.getCurrentAcceleration(
-    (acc: Acceleration) => { console.log('X: ' + acc.x + 'Y: ' + acc.y + 'Z: ' + acc.z); },
-    () => { alert('Error!'); });
-
-var acchandle: WatchHandle = navigator.accelerometer.watchAcceleration(
-    (acc: Acceleration)=> { console.log('X: ' + acc.x + 'Y: ' + acc.y + 'Z: ' + acc.z); },
-    () => { alert('Error!'); },
-    { frequency: 10 });
-
-navigator.accelerometer.clearWatch(acchandle);
diff --git a/types/cordova-plugin-device-motion/index.d.ts b/types/cordova-plugin-device-motion/index.d.ts
deleted file mode 100644
index ae38803fd2..0000000000
--- a/types/cordova-plugin-device-motion/index.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// Type definitions for Apache Cordova Device Motion plugin
-// Project: https://github.com/apache/cordova-plugin-device-motion
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-
-interface Navigator {
-    /**
-     * This plugin provides access to the device's accelerometer. The accelerometer is a motion sensor
-     * that detects the change (delta) in movement relative to the current device orientation,
-     * in three dimensions along the x, y, and z axis.
-     */
-    accelerometer: Accelerometer;
-}
-
-/**
- * This plugin provides access to the device's accelerometer. The accelerometer is a motion sensor
- * that detects the change (delta) in movement relative to the current device orientation,
- * in three dimensions along the x, y, and z axis.
- */
-interface Accelerometer {
-    /**
-     * Stop watching the Acceleration referenced by the watchID parameter.
-     * @param watchID The ID returned by navigator.accelerometer.watchAcceleration.
-     */
-    clearWatch(watchID: WatchHandle): void;
-    /**
-     * Get the current acceleration along the x, y, and z axes.
-     * These acceleration values are returned to the accelerometerSuccess callback function.
-     * @param accelerometerSuccess Success callback that gets the Acceleration object.
-     * @param accelerometerError Success callback
-     */
-    getCurrentAcceleration(
-        accelerometerSuccess: (acceleration: Acceleration) => void,
-        accelerometerError: () => void): void;
-    /**
-     * Retrieves the device's current Acceleration at a regular interval, executing the
-     * accelerometerSuccess callback function each time. Specify the interval in milliseconds
-     * via the acceleratorOptions object's frequency parameter.
-     * The returned watch ID references the accelerometer's watch interval, and can be used
-     * with navigator.accelerometer.clearWatch to stop watching the accelerometer.
-     * @param  accelerometerSuccess Callback, that called at every time interval and passes an Acceleration object.
-     * @param  accelerometerError   Error callback.
-     * @param  accelerometerOptions Object with options for watchAcceleration
-     */
-    watchAcceleration(
-        accelerometerSuccess: (acceleration: Acceleration) => void,
-        accelerometerError: () => void,
-        accelerometerOptions?: AccelerometerOptions): WatchHandle;
-}
-
-/**
- * Contains Accelerometer data captured at a specific point in time. Acceleration values include
- * the effect of gravity (9.81 m/s^2), so that when a device lies flat and facing up, x, y, and z
- * values returned should be 0, 0, and 9.81.
- */
-interface Acceleration {
-    /** Amount of acceleration on the x-axis. (in m/s^2) */
-    x: number;
-    /** Amount of acceleration on the y-axis. (in m/s^2) */
-    y: number;
-    /** Amount of acceleration on the z-axis. (in m/s^2) */
-    z: number;
-    /** Creation timestamp in milliseconds. */
-    timestamp: number;
-}
-
-/** Object with options for watchAcceleration */
-interface AccelerometerOptions {
-    /** How often to retrieve the Acceleration in milliseconds. (Default: 10000) */
-    frequency?: number;
-}
-
-/** Abstract type for watch IDs used by Accelerometer. Values of these type are actually `number` at runtime.*/
-interface WatchHandle { }
\ No newline at end of file
diff --git a/types/cordova-plugin-device-motion/tsconfig.json b/types/cordova-plugin-device-motion/tsconfig.json
deleted file mode 100644
index ac897b5d8b..0000000000
--- a/types/cordova-plugin-device-motion/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-device-motion-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-device-name/tslint.json b/types/cordova-plugin-device-name/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-device-name/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-device-orientation/cordova-plugin-device-orientation-tests.ts b/types/cordova-plugin-device-orientation/cordova-plugin-device-orientation-tests.ts
deleted file mode 100644
index ab025d5fbf..0000000000
--- a/types/cordova-plugin-device-orientation/cordova-plugin-device-orientation-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-navigator.compass.getCurrentHeading(
-    (heading: CompassHeading)=> { console.log('Got heading to ' + heading.magneticHeading); },
-    (error: CompassError)=> { alert('Error! ' + error.code); },
-    { frequency: 10 });
-
-var accelhandle = navigator.compass.watchHeading(
-    (heading: CompassHeading) => { console.log('Got heading to ' + heading.magneticHeading); },
-    (error: CompassError) => { alert('Error! ' + error.code); },
-    { frequency: 10 });
-
-navigator.compass.clearWatch(accelhandle);
diff --git a/types/cordova-plugin-device-orientation/index.d.ts b/types/cordova-plugin-device-orientation/index.d.ts
deleted file mode 100644
index dcd9654efa..0000000000
--- a/types/cordova-plugin-device-orientation/index.d.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-// Type definitions for Apache Cordova Device Orientation plugin
-// Project: https://github.com/apache/cordova-plugin-device-orientation
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license. 
-
-interface Navigator {
-    /** 
-     * This plugin provides access to the device's compass. The compass is a sensor that detects
-     * the direction or heading that the device is pointed, typically from the top of the device.
-     * It measures the heading in degrees from 0 to 359.99, where 0 is north.
-     */
-    compass: Compass;
-}
-
-/** 
- * This plugin provides access to the device's compass. The compass is a sensor that detects
- * the direction or heading that the device is pointed, typically from the top of the device.
- * It measures the heading in degrees from 0 to 359.99, where 0 is north.
- */
-interface Compass {
-    /**
-     * Get the current compass heading. The compass heading is returned via a CompassHeading
-     * object using the onSuccess callback function.
-     * @param onSuccess Success callback that passes CompassHeading object.
-     * @param onError Error callback that passes CompassError object.
-     */
-    getCurrentHeading(
-        onSuccess: (heading: CompassHeading) => void,
-        onError: (error: CompassError) => void,
-        options?: CompassOptions): void;
-    /**
-     * Gets the device's current heading at a regular interval. Each time the heading is retrieved,
-     * the headingSuccess callback function is executed. The returned watch ID references the compass
-     * watch interval. The watch ID can be used with navigator.compass.clearWatch to stop watching
-     * the navigator.compass.
-     * @param onSuccess Success callback that passes CompassHeading object.
-     * @param onError   Error callback that passes CompassError object.
-     * @param options   CompassOptions object
-     */
-    watchHeading(
-        onSuccess: (heading: CompassHeading) => void,
-        onError: (error: CompassError) => void,
-        options?: CompassOptions): number;
-    /**
-     * Stop watching the compass referenced by the watch ID parameter.
-     * @param id The ID returned by navigator.compass.watchHeading.
-     */
-    clearWatch(id: number): void;
-}
-
-/** A CompassHeading object is returned to the compassSuccess callback function. */
-interface CompassHeading {
-    /** The heading in degrees from 0-359.99 at a single moment in time. */
-    magneticHeading: number;
-    /** The heading relative to the geographic North Pole in degrees 0-359.99 at a single moment in time. A negative value indicates that the true heading can't be determined. */
-    trueHeading: number;
-    /** The deviation in degrees between the reported heading and the true heading. */
-    headingAccuracy: number;
-    /** The time at which this heading was determined. */
-    timestamp: number;
-}
-
-interface CompassOptions {
-    filter?: number;
-    frequency?: number;
-}
-
-/** A CompassError object is returned to the onError callback function when an error occurs. */
-interface CompassError {
-    /**
-     * One of the predefined error codes
-     *     CompassError.COMPASS_INTERNAL_ERR
-     *     CompassError.COMPASS_NOT_SUPPORTED
-     */
-    code: number;
-}
-
-declare var CompassError: {
-    /** Constructor for CompassError object */
-    new(code: number): CompassError;
-    COMPASS_INTERNAL_ERR: number;
-    COMPASS_NOT_SUPPORTED: number
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-device-orientation/tsconfig.json b/types/cordova-plugin-device-orientation/tsconfig.json
deleted file mode 100644
index 9b5d7a2f53..0000000000
--- a/types/cordova-plugin-device-orientation/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-device-orientation-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-device/cordova-plugin-device-tests.ts b/types/cordova-plugin-device/cordova-plugin-device-tests.ts
deleted file mode 100644
index cb894785c2..0000000000
--- a/types/cordova-plugin-device/cordova-plugin-device-tests.ts
+++ /dev/null
@@ -1 +0,0 @@
-console.log(JSON.stringify(device));
\ No newline at end of file
diff --git a/types/cordova-plugin-device/index.d.ts b/types/cordova-plugin-device/index.d.ts
deleted file mode 100644
index cb75703d1a..0000000000
--- a/types/cordova-plugin-device/index.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for Apache Cordova Device plugin
-// Project: https://github.com/apache/cordova-plugin-device
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license 
-
-/**
- * This plugin defines a global device object, which describes the device's hardware and software.
- * Although the object is in the global scope, it is not available until after the deviceready event.
- */
-interface Device {
-    /** Get the version of Cordova running on the device. */
-    cordova: string;
-    /** Indicates that Cordova initialize successfully. */
-    available: boolean;
-    /**
-     * The device.model returns the name of the device's model or product. The value is set
-     * by the device manufacturer and may be different across versions of the same product.
-     */
-    model: string;
-    /** Get the device's operating system name. */
-    platform: string;
-    /** Get the device's Universally Unique Identifier (UUID). */
-    uuid: string;
-    /** Get the operating system version. */
-    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;
diff --git a/types/cordova-plugin-device/tsconfig.json b/types/cordova-plugin-device/tsconfig.json
deleted file mode 100644
index 43170b45db..0000000000
--- a/types/cordova-plugin-device/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-device-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-dialogs/cordova-plugin-dialogs-tests.ts b/types/cordova-plugin-dialogs/cordova-plugin-dialogs-tests.ts
deleted file mode 100644
index 498d7d1000..0000000000
--- a/types/cordova-plugin-dialogs/cordova-plugin-dialogs-tests.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-navigator.notification.alert('Alert!', () => { alert('You\'re alerted'); }, 'Alert', 'Ok');
-navigator.notification.confirm('Are you ok?', (choice: number) => { alert('Your choice is ' + choice); });
diff --git a/types/cordova-plugin-dialogs/index.d.ts b/types/cordova-plugin-dialogs/index.d.ts
deleted file mode 100644
index 8a4035bf01..0000000000
--- a/types/cordova-plugin-dialogs/index.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Type definitions for Apache Cordova Dialogs plugin
-// Project: https://github.com/apache/cordova-plugin-dialogs
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license. 
-
-interface Navigator {
-    /** This plugin provides access to some native dialog UI elements. */
-    notification: Notification
-}
-
-/** This plugin provides access to some native dialog UI elements. */
-interface Notification {
-    /**
-     * Shows a custom alert or dialog box. Most Cordova implementations use a native dialog box for this feature,
-     * but some platforms use the browser's alert function, which is typically less customizable.
-     * @param message       Dialog message.
-     * @param alertCallback Callback to invoke when alert dialog is dismissed.
-     * @param title         Dialog title, defaults to 'Alert'.
-     * @param buttonName    Button name, defaults to OK.
-     */
-    alert(message: string,
-        alertCallback: () => void,
-        title?: string,
-        buttonName?: string): void;
-    /**
-     * The device plays a beep sound.
-     * @param times The number of times to repeat the beep. 
-     */
-    beep(times: number): void;
-    /**
-     * Displays a customizable confirmation dialog box.
-     * @param message           Dialog message.
-     * @param confirmCallback   Callback to invoke with index of button pressed (1, 2, or 3)
-     *                                   or when the dialog is dismissed without a button press (0).
-     * @param title             Dialog title, defaults to Confirm.
-     * @param buttonLabels      Array of strings specifying button labels, defaults to [OK,Cancel].
-     */
-    confirm(message: string,
-        confirmCallback: (choice: number) => void,
-        title?: string,
-        buttonLabels?: string[]): void;
-    /**
-     * Displays a native dialog box that is more customizable than the browser's prompt function.
-     * @param message           Dialog message.
-     * @param promptCallback    Callback to invoke when a button is pressed.
-     * @param title             Dialog title, defaults to "Prompt".
-     * @param buttonLabels      Array of strings specifying button labels, defaults to ["OK","Cancel"].
-     * @param defaultText       Default textbox input value, default: "".
-     */
-    prompt(message: string,
-        promptCallback: (result: NotificationPromptResult) => void,
-        title?: string,
-        buttonLabels?: string[],
-        defaultText?: string): void;
-}
-
-/** Object, passed to promptCallback */
-interface NotificationPromptResult {
-    /**
-     * The index of the pressed button. Note that the index uses one-based indexing, so the value is 1, 2, 3, etc.
-     * 0 is the result when the dialog is dismissed without a button press.
-     */
-    buttonIndex: number;
-    /** The text entered in the prompt dialog box. */
-    input1: string;
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-dialogs/tsconfig.json b/types/cordova-plugin-dialogs/tsconfig.json
deleted file mode 100644
index 0f12ab4850..0000000000
--- a/types/cordova-plugin-dialogs/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-dialogs-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-email-composer/tslint.json b/types/cordova-plugin-email-composer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-email-composer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-file-transfer/cordova-plugin-file-transfer-tests.ts b/types/cordova-plugin-file-transfer/cordova-plugin-file-transfer-tests.ts
deleted file mode 100644
index eec24db2e0..0000000000
--- a/types/cordova-plugin-file-transfer/cordova-plugin-file-transfer-tests.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-var file = new FileTransfer();
-
-file.onprogress = (ev: ProgressEvent) => {
-    if (ev.lengthComputable) {
-        console.log(ev.loaded + '/' + ev.total);
-    }
-};
-
-file.download('http://some.server.com/download.php',
-    'cdvfile://localhost/persistent/path/to/downloads/',
-    (file: FileEntry)=> { console.log('File Downloaded to ' + file.fullPath); },
-    (err: FileTransferError) => {
-        console.error('Error ' + err.code);
-        if (err.exception) {
-            console.error('Failed with exception ' + err.exception);
-        }
-    },
-    true,
-    {
-      headers: {
-        "Authorization": "Basic dGVzdHVzZXJuYW1lOnRlc3RwYXNzd29yZA=="
-      }
-    });
-
-file.upload('cdvfile://localhost/persistent/path/to/downloads/',
-    'http://some.server.com/download.php',
-    (result: FileUploadResult)=> { console.log('File uploaded. Bytes uploaded: ' + result.bytesSent); },
-    (err: FileTransferError) => {
-        console.error('Error ' + err.code);
-        if (err.exception) {
-            console.error('Failed with exception ' + err.exception);
-        }
-    },
-    { headers: {"X-Email": "user@mail.com", 'X-Token': "asdf3w234"}, httpMethod: "PUT" },
-    true);
-
-file.abort();
diff --git a/types/cordova-plugin-file-transfer/index.d.ts b/types/cordova-plugin-file-transfer/index.d.ts
deleted file mode 100644
index ad8d9945f5..0000000000
--- a/types/cordova-plugin-file-transfer/index.d.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Type definitions for Apache Cordova FileTransfer plugin
-// Project: https://github.com/apache/cordova-plugin-file-transfer
-// Definitions by: Microsoft Open Technologies Inc. <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license
-
-/// <reference types="cordova-plugin-file" />
-
-/**
- * The FileTransfer object provides a way to upload files using an HTTP multi-part POST request,
- * and to download files as well.
- */
-interface FileTransfer {
-    /** Called with a ProgressEvent whenever a new chunk of data is transferred.  */
-    onprogress: (event: ProgressEvent) => void;
-    /**
-     * Sends a file to a server.
-     * @param fileURL           Filesystem URL representing the file on the device. For backwards compatibility,
-     *                                this can also be the full path of the file on the device.
-     * @param server            URL of the server to receive the file, as encoded by encodeURI().
-     * @param successCallback   A callback that is passed a FileUploadResult object.
-     * @param errorCallback     A callback that executes if an error occurs retrieving the FileUploadResult.
-     *                               Invoked with a FileTransferError object.
-     * @param options           Optional parameters.
-     * @param trustAllHosts     Optional parameter, defaults to false. If set to true, it accepts all security certificates.
-     *                               This is useful since Android rejects self-signed security certificates.
-     *                               Not recommended for production use. Supported on Android and iOS.
-     */
-    upload(
-        fileURL: string,
-        server: string,
-        successCallback: (result: FileUploadResult) => void,
-        errorCallback: (error: FileTransferError) => void,
-        options?: FileUploadOptions,
-        trustAllHosts?: boolean): void;
-    /**
-     * downloads a file from server.
-     * @param source            URL of the server to download the file, as encoded by encodeURI().
-     * @param target            Filesystem url representing the file on the device. For backwards compatibility,
-     *                               this can also be the full path of the file on the device.
-     * @param successCallback   A callback that is passed a FileEntry object. (Function)
-     * @param errorCallback     A callback that executes if an error occurs when retrieving the fileEntry.
-     *                               Invoked with a FileTransferError object.
-     * @param options           Optional parameters.
-     * @param trustAllHosts     Optional parameter, defaults to false. If set to true, it accepts all security certificates.
-     *                               This is useful since Android rejects self-signed security certificates.
-     *                               Not recommended for production use. Supported on Android and iOS.
-     */
-    download(
-        source: string,
-        target: string,
-        successCallback: (fileEntry: FileEntry) => void,
-        errorCallback: (error: FileTransferError) => void,
-        trustAllHosts?: boolean,
-        options?: FileDownloadOptions): void;
-    /**
-     * Aborts an in-progress transfer. The onerror callback is passed a FileTransferError object
-     * which has an error code of FileTransferError.ABORT_ERR.
-     */
-    abort(): void;
-}
-
-declare var FileTransfer: {
-    new (): FileTransfer;
-};
-
-/** A FileUploadResult object is passed to the success callback of the FileTransfer object's upload() method. */
-interface FileUploadResult {
-    /** The number of bytes sent to the server as part of the upload. */
-    bytesSent: number;
-    /** The HTTP response code returned by the server. */
-    responseCode: number;
-    /** The HTTP response returned by the server. */
-    response: string;
-    /** The HTTP response headers by the server. Currently supported on iOS only.*/
-    headers: any;
-}
-
-/** Optional parameters for upload method. */
-interface FileUploadOptions {
-    /** The name of the form element. Defaults to file. */
-    fileKey?: string;
-    /** The file name to use when saving the file on the server. Defaults to image.jpg. */
-    fileName?: string;
-    /** The HTTP method to use - either `PUT` or `POST`. Defaults to `POST`. */
-    httpMethod?: string;
-    /** The mime type of the data to upload. Defaults to image/jpeg. */
-    mimeType?: string;
-    /** A set of optional key/value pairs to pass in the HTTP request. */
-    params?: Object;
-    /** Whether to upload the data in chunked streaming mode. Defaults to true. */
-    chunkedMode?: boolean;
-    /** A map of header name/header values. Use an array to specify more than one value. */
-    headers?: Object;
-}
-
-/** Optional parameters for download method. */
-interface FileDownloadOptions {
-    /** A map of header name/header values. */
-    headers?: {};
-}
-
-/** A FileTransferError object is passed to an error callback when an error occurs. */
-interface FileTransferError {
-    /**
-     * One of the predefined error codes listed below.
-     *     FileTransferError.FILE_NOT_FOUND_ERR
-     *     FileTransferError.INVALID_URL_ERR
-     *     FileTransferError.CONNECTION_ERR
-     *     FileTransferError.ABORT_ERR
-     *     FileTransferError.NOT_MODIFIED_ERR
-     */
-    code: number;
-    /** URL to the source. */
-    source: string;
-    /** URL to the target. */
-    target: string;
-    /** HTTP status code. This attribute is only available when a response code is received from the HTTP connection. */
-    http_status: number;
-    /* Response body. This attribute is only available when a response is received from the HTTP connection. */
-    body: string;
-    /* Exception that is thrown by native code */
-    exception: any;
-}
-
-declare var FileTransferError: {
-    /** Constructor for FileTransferError object */
-    new (code?: number, source?: string, target?: string, status?: number, body?: any, exception?: any): FileTransferError;
-    FILE_NOT_FOUND_ERR: number;
-    INVALID_URL_ERR: number;
-    CONNECTION_ERR: number;
-    ABORT_ERR: number;
-    NOT_MODIFIED_ERR: number;
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-file-transfer/tsconfig.json b/types/cordova-plugin-file-transfer/tsconfig.json
deleted file mode 100644
index eaa8a05e18..0000000000
--- a/types/cordova-plugin-file-transfer/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-file-transfer-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-file/cordova-plugin-file-tests.ts b/types/cordova-plugin-file/cordova-plugin-file-tests.ts
deleted file mode 100644
index 37538434e3..0000000000
--- a/types/cordova-plugin-file/cordova-plugin-file-tests.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/// <reference types="cordova"/>
-
-function fsaccessor(fs: FileSystem) {
-    console.log('FS root is: ' + fs.root.name);
-    var fsreader: DirectoryReader = fs.root.createReader();
-    fsreader.readEntries(
-        (entries: Entry[]) => { console.log(fs.root.name + ' has ' + entries.length + ' child elements'); },
-        (err: FileError)=> { alert('Error: ' + err.code); });
-}
-
-window.requestFileSystem(
-    LocalFileSystem.TEMPORARY,
-    1024 * 1024 * 5,
-    fsaccessor,
-    (err: FileError) => { alert('Error: ' + err.code); }
-);
-
-window.requestFileSystem(
-    LocalFileSystem.PERSISTENT,
-    1024 * 1024 * 5,
-    fsaccessor,
-    (err: FileError) => { alert('Error: ' + err.code); }
-);
-
-window.resolveLocalFileSystemURI(cordova.file.applicationDirectory,
-    (entry: Entry)=> {
-        if (entry.isDirectory) {
-            console.log('successfully resolved ' + entry.fullPath + 'directory');
-            console.log(entry.toURL());
-            console.log(entry.toInternalURL());
-        } else {
-            var fentry = <FileEntry>entry;
-            fentry.file((f: File) => { console.log(f.slice(f.size - 10, f.size)); });
-            fentry.createWriter((writer: FileWriter)=> {
-                if (writer.readyState == FileWriter.INIT) {
-                    console.log('Init FileWriter');
-                    writer.write(new Blob(['sdfdsfsdf']));
-                    writer.onprogress = function(ev: ProgressEvent) {
-                        console.log('Writing ' + ev.target);
-                    };
-                }
-            });
-        }
-    },
-    (error: FileError) => { console.log(error.code); }
-);
\ No newline at end of file
diff --git a/types/cordova-plugin-file/index.d.ts b/types/cordova-plugin-file/index.d.ts
deleted file mode 100644
index 6aadbf6fad..0000000000
--- a/types/cordova-plugin-file/index.d.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-// Type definitions for Apache Cordova File System plugin
-// Project: https://github.com/apache/cordova-plugin-file
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
-// Copyright (c) Microsoft Open Technologies, Inc.
-// Licensed under the MIT license.
-
-interface Window {
-    /**
-     * Requests a filesystem in which to store application data.
-     * @param type              Whether the filesystem requested should be persistent, as defined above. Use one of TEMPORARY or PERSISTENT.
-     * @param size              This is an indicator of how much storage space, in bytes, the application expects to need.
-     * @param successCallback   The callback that is called when the user agent provides a filesystem.
-     * @param errorCallback     A callback that is called when errors happen, or when the request to obtain the filesystem is denied.
-     */
-    requestFileSystem(
-        type: LocalFileSystem,
-        size: number,
-        successCallback: (fileSystem: FileSystem) => void,
-        errorCallback?: (fileError: FileError) => void): void;
-    /**
-     * Look up file system Entry referred to by local URL.
-     * @param string url       URL referring to a local file or directory
-     * @param successCallback  invoked with Entry object corresponding to URL
-     * @param errorCallback    invoked if error occurs retrieving file system entry
-     */
-    resolveLocalFileSystemURL(url: string,
-        successCallback: (entry: Entry) => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Look up file system Entry referred to by local URI.
-     * @param string uri       URI referring to a local file or directory
-     * @param successCallback  invoked with Entry object corresponding to URI
-     * @param errorCallback    invoked if error occurs retrieving file system entry
-     */
-    resolveLocalFileSystemURI(uri: string,
-        successCallback: (entry: Entry) => void,
-        errorCallback?: (error: FileError) => void): void;
-    TEMPORARY: number;
-    PERSISTENT: number;
-}
-
-/** This interface represents a file system. */
-interface FileSystem {
-    /* The name of the file system, unique across the list of exposed file systems. */
-    name: string;
-    /** The root directory of the file system. */
-    root: DirectoryEntry;
-}
-
-/**
- * An abstract interface representing entries in a file system,
- * each of which may be a File or DirectoryEntry.
- */
-interface Entry {
-    /** Entry is a file. */
-    isFile: boolean;
-    /** Entry is a directory. */
-    isDirectory: boolean;
-    /** The name of the entry, excluding the path leading to it. */
-    name: string;
-    /** The full absolute path from the root to the entry. */
-    fullPath: string;
-    /** The file system on which the entry resides. */
-    fileSystem: FileSystem;
-    nativeURL: string;
-    /**
-     * Look up metadata about this entry.
-     * @param successCallback A callback that is called with the time of the last modification.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    getMetadata(
-        successCallback: (metadata: Metadata) => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Move an entry to a different location on the file system. It is an error to try to:
-     *     move a directory inside itself or to any child at any depth;move an entry into its parent if a name different from its current one isn't provided;
-     *     move a file to a path occupied by a directory;
-     *     move a directory to a path occupied by a file;
-     *     move any element to a path occupied by a directory which is not empty.
-     * A move of a file on top of an existing file must attempt to delete and replace that file.
-     * A move of a directory on top of an existing empty directory must attempt to delete and replace that directory.
-     * @param parent  The directory to which to move the entry.
-     * @param newName The new name of the entry. Defaults to the Entry's current name if unspecified.
-     * @param successCallback A callback that is called with the Entry for the new location.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    moveTo(parent: DirectoryEntry,
-        newName?: string,
-        successCallback?: (entry: Entry) => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Copy an entry to a different location on the file system. It is an error to try to:
-     *     copy a directory inside itself or to any child at any depth;
-     *     copy an entry into its parent if a name different from its current one isn't provided;
-     *     copy a file to a path occupied by a directory;
-     *     copy a directory to a path occupied by a file;
-     *     copy any element to a path occupied by a directory which is not empty.
-     *     A copy of a file on top of an existing file must attempt to delete and replace that file.
-     *     A copy of a directory on top of an existing empty directory must attempt to delete and replace that directory.
-     * Directory copies are always recursive--that is, they copy all contents of the directory.
-     * @param parent The directory to which to move the entry.
-     * @param newName The new name of the entry. Defaults to the Entry's current name if unspecified.
-     * @param successCallback A callback that is called with the Entry for the new object.
-     * @param errorCallback A callback that is called when errors happen.
-     */
-    copyTo(parent: DirectoryEntry,
-        newName?: string,
-        successCallback?: (entry: Entry) => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Returns a URL that can be used as the src attribute of a <video> or <audio> tag.
-     * If that is not possible, construct a cdvfile:// URL.
-     * @return string URL
-     */
-    toURL(): string;
-    /**
-     * Return a URL that can be passed across the bridge to identify this entry.
-     * @return string URL that can be passed across the bridge to identify this entry
-     */
-    toInternalURL(): string;
-    /**
-     * Deletes a file or directory. It is an error to attempt to delete a directory that is not empty. It is an error to attempt to delete the root directory of a filesystem.
-     * @param successCallback A callback that is called on success.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    remove(successCallback: () => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Look up the parent DirectoryEntry containing this Entry. If this Entry is the root of its filesystem, its parent is itself.
-     * @param successCallback A callback that is called with the time of the last modification.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    getParent(successCallback: (entry: Entry) => void,
-        errorCallback?: (error: FileError) => void): void;
-}
-
-/** This interface supplies information about the state of a file or directory. */
-interface Metadata {
-    /** This is the time at which the file or directory was last modified. */
-    modificationTime: Date;
-    /** The size of the file, in bytes. This must return 0 for directories. */
-    size: number;
-}
-
-/** This interface represents a directory on a file system. */
-interface DirectoryEntry extends Entry {
-    /**
-     * Creates a new DirectoryReader to read Entries from this Directory.
-     */
-    createReader(): DirectoryReader;
-    /**
-     * Creates or looks up a file.
-     * @param path    Either an absolute path or a relative path from this DirectoryEntry
-     *                to the file to be looked up or created.
-     *                It is an error to attempt to create a file whose immediate parent does not yet exist.
-     * @param options If create and exclusive are both true, and the path already exists, getFile must fail.
-     *                If create is true, the path doesn't exist, and no other error occurs, getFile must create it as a zero-length file and return a corresponding FileEntry.
-     *                If create is not true and the path doesn't exist, getFile must fail.
-     *                If create is not true and the path exists, but is a directory, getFile must fail.
-     *                Otherwise, if no other error occurs, getFile must return a FileEntry corresponding to path.
-     * @param successCallback A callback that is called to return the File selected or created.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    getFile(path: string, options?: Flags,
-        successCallback?: (entry: FileEntry) => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Creates or looks up a directory.
-     * @param path    Either an absolute path or a relative path from this DirectoryEntry
-     *                to the directory to be looked up or created.
-     *                It is an error to attempt to create a directory whose immediate parent does not yet exist.
-     * @param options If create and exclusive are both true and the path already exists, getDirectory must fail.
-     *                If create is true, the path doesn't exist, and no other error occurs, getDirectory must create and return a corresponding DirectoryEntry.
-     *                If create is not true and the path doesn't exist, getDirectory must fail.
-     *                If create is not true and the path exists, but is a file, getDirectory must fail.
-     *                Otherwise, if no other error occurs, getDirectory must return a DirectoryEntry corresponding to path.
-     * @param successCallback A callback that is called to return the Directory selected or created.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    getDirectory(path: string, options?: Flags,
-        successCallback?: (entry: DirectoryEntry) => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Deletes a directory and all of its contents, if any. In the event of an error (e.g. trying
-     * to delete a directory that contains a file that cannot be removed), some of the contents
-     * of the directory may be deleted. It is an error to attempt to delete the root directory of a filesystem.
-     * @param successCallback A callback that is called on success.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    removeRecursively(successCallback: () => void,
-        errorCallback?: (error: FileError) => void): void;
-}
-
-/**
- * This dictionary is used to supply arguments to methods
- * that look up or create files or directories.
- */
-interface Flags {
-    /** Used to indicate that the user wants to create a file or directory if it was not previously there. */
-    create?: boolean;
-    /** By itself, exclusive must have no effect. Used with create, it must cause getFile and getDirectory to fail if the target path already exists. */
-    exclusive?: boolean;
-}
-
-/**
- * This interface lets a user list files and directories in a directory. If there are
- * no additions to or deletions from a directory between the first and last call to
- * readEntries, and no errors occur, then:
- *     A series of calls to readEntries must return each entry in the directory exactly once.
- *     Once all entries have been returned, the next call to readEntries must produce an empty array.
- *     If not all entries have been returned, the array produced by readEntries must not be empty.
- *     The entries produced by readEntries must not include the directory itself ["."] or its parent [".."].
- */
-interface DirectoryReader {
-    /**
-     * Read the next block of entries from this directory.
-     * @param successCallback Called once per successful call to readEntries to deliver the next
-     *                        previously-unreported set of Entries in the associated Directory.
-     *                        If all Entries have already been returned from previous invocations
-     *                        of readEntries, successCallback must be called with a zero-length array as an argument.
-     * @param errorCallback   A callback indicating that there was an error reading from the Directory.
-     */
-    readEntries(
-        successCallback: (entries: Entry[]) => void,
-        errorCallback?: (error: FileError) => void): void;
-}
-
-/** This interface represents a file on a file system. */
-interface FileEntry extends Entry {
-    /**
-     * Creates a new FileWriter associated with the file that this FileEntry represents.
-     * @param successCallback A callback that is called with the new FileWriter.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    createWriter(successCallback: (
-        writer: FileWriter) => void,
-        errorCallback?: (error: FileError) => void): void;
-    /**
-     * Returns a File that represents the current state of the file that this FileEntry represents.
-     * @param successCallback A callback that is called with the File.
-     * @param errorCallback   A callback that is called when errors happen.
-     */
-    file(successCallback: (file: File) => void,
-        errorCallback?: (error: FileError) => void): void;
-}
-
-/**
- * This interface provides methods to monitor the asynchronous writing of blobs
- * to disk using progress events and event handler attributes.
- */
-interface FileSaver extends EventTarget {
-    /** Terminate file operation */
-    abort(): void;
-    /**
-     * The FileSaver object can be in one of 3 states. The readyState attribute, on getting,
-     * must return the current state, which must be one of the following values:
-     *     INIT
-     *     WRITING
-     *     DONE
-     */
-    readyState: number;
-    /** Handler for writestart events. */
-    onwritestart: (event: ProgressEvent) => void;
-    /** Handler for progress events. */
-    onprogress: (event: ProgressEvent) => void;
-    /** Handler for write events. */
-    onwrite: (event: ProgressEvent) => void;
-    /** Handler for abort events. */
-    onabort: (event: ProgressEvent) => void;
-    /** Handler for error events. */
-    onerror: (event: ProgressEvent) => void;
-    /** Handler for writeend events. */
-    onwriteend: (event: ProgressEvent) => void;
-    /** The last error that occurred on the FileSaver. */
-    error: Error;
-}
-
-/**
- * This interface expands on the FileSaver interface to allow for multiple write
- * actions, rather than just saving a single Blob.
- */
-interface FileWriter extends FileSaver {
-    /**
-     * The byte offset at which the next write to the file will occur. This always less or equal than length.
-     * A newly-created FileWriter will have position set to 0.
-     */
-    position: number;
-    /**
-     * The length of the file. If the user does not have read access to the file,
-     * this will be the highest byte offset at which the user has written.
-     */
-    length: number;
-    /**
-     * Write the supplied data to the file at position.
-     * @param {Blob} data The blob to write.
-     */
-    write(data: Blob): void;
-    /**
-     * The file position at which the next write will occur.
-     * @param offset If nonnegative, an absolute byte offset into the file.
-     *               If negative, an offset back from the end of the file.
-     */
-    seek(offset: number): void;
-    /**
-     * Changes the length of the file to that specified. If shortening the file, data beyond the new length
-     * will be discarded. If extending the file, the existing data will be zero-padded up to the new length.
-     * @param size The size to which the length of the file is to be adjusted, measured in bytes.
-     */
-    truncate(size: number): void;
-}
-
-/* FileWriter states */
-declare var FileWriter: {
-    INIT: number;
-    WRITING: number;
-    DONE: number
-};
-
-interface FileError {
-    /** Error code */
-    code: number;
-}
-
-declare var FileError: {
-    new (code: number): FileError;
-    NOT_FOUND_ERR: number;
-    SECURITY_ERR: number;
-    ABORT_ERR: number;
-    NOT_READABLE_ERR: number;
-    ENCODING_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    INVALID_STATE_ERR: number;
-    SYNTAX_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    PATH_EXISTS_ERR: number;
-};
-
-/*
- * Constants defined in fileSystemPaths
- */
-interface Cordova {
-    file: {
-        /* Read-only directory where the application is installed. */
-        applicationDirectory: string;
-        /* Root of app's private writable storage */
-        applicationStorageDirectory: string;
-        /* Where to put app-specific data files. */
-        dataDirectory: string;
-        /* Cached files that should survive app restarts. Apps should not rely on the OS to delete files in here. */
-        cacheDirectory: string;
-        /* Android: the application space on external storage. */
-        externalApplicationStorageDirectory: string;
-        /* Android: Where to put app-specific data files on external storage. */
-        externalDataDirectory: string;
-        /* Android: the application cache on external storage. */
-        externalCacheDirectory: string;
-        /* Android: the external storage (SD card) root. */
-        externalRootDirectory: string;
-        /* iOS: Temp directory that the OS can clear at will. */
-        tempDirectory: string;
-        /* iOS: Holds app-specific files that should be synced (e.g. to iCloud). */
-        syncedDataDirectory: string;
-        /* iOS: Files private to the app, but that are meaningful to other applciations (e.g. Office files) */
-        documentsDirectory: string;
-        /* BlackBerry10: Files globally available to all apps */
-        sharedDirectory: string
-    }
-}
-
-
-declare enum LocalFileSystem {
-    PERSISTENT=0,
-    TEMPORARY=1
-}
diff --git a/types/cordova-plugin-file/tsconfig.json b/types/cordova-plugin-file/tsconfig.json
deleted file mode 100644
index f855076e2a..0000000000
--- a/types/cordova-plugin-file/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-file-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-globalization/cordova-plugin-globalization-tests.ts b/types/cordova-plugin-globalization/cordova-plugin-globalization-tests.ts
deleted file mode 100644
index 4b80f2ff72..0000000000
--- a/types/cordova-plugin-globalization/cordova-plugin-globalization-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-navigator.globalization.dateToString(new Date(),
-    (date) => { console.log(JSON.stringify(date)); },
-    (error) => { alert(error.message); },
-    { formatLength: "short", selector: "date" });
-
-navigator.globalization.getDateNames(
-    (names) => {
-        names.value.forEach((name) => { console.log(name); });
-    },
-    (error) => { alert(error.message); },
-    { item: "months", type: "wide" });
\ No newline at end of file
diff --git a/types/cordova-plugin-globalization/index.d.ts b/types/cordova-plugin-globalization/index.d.ts
deleted file mode 100644
index 5894bd27d0..0000000000
--- a/types/cordova-plugin-globalization/index.d.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-// Type definitions for Apache Cordova Globalization plugin
-// Project: https://github.com/apache/cordova-plugin-globalization
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-
-interface Navigator {
-    /** This plugin obtains information and performs operations specific to the user's locale and timezone. */
-    globalization: Globalization
-}
-
-/** This plugin obtains information and performs operations specific to the user's locale and timezone. */
-interface Globalization {
-    /**
-     * Get the string identifier for the client's current language.
-     * @param onSuccess Called on success getting the language with a properties object,
-     *                  that should have a value property with a String value.
-     * @param onError   Called on error getting the language with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.UNKNOWN_ERROR.
-     */
-    getPreferredLanguage(
-        onSuccess: (language: { value: string; }) => void,
-        onError: (error: GlobalizationError) => void): void;
-    /**
-     * Get the string identifier for the client's current locale setting.
-     * @param onSuccess Called on success getting the locale identifier with a properties object,
-     *                  that should have a value property with a String value.
-     * @param onError   Called on error getting the locale identifier with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.UNKNOWN\_ERROR.
-     */
-    getLocaleName(
-        onSuccess: (locale: { value: string; }) => void,
-        onError: (error: GlobalizationError) => void): void;
-    /**
-     * Returns a date formatted as a string according to the client's locale and timezone.
-     * @param date      Date to format.
-     * @param onSuccess Called on success with a properties object,
-     *                  that should have a value property with a String value.
-     * @param onError   Called on error with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.FORMATTING_ERROR.
-     * @param options   Optional format parameters. Default {formatLength:'short', selector:'date and time'}
-     *                      - 'formatLength' can be "short", "medium", "long", or "full".
-     *                      - 'selector' can be "date", "time", or "date and time".
-     */
-    dateToString(
-        date: Date,
-        onSuccess: (date: { value: string; }) => void,
-        onError: (error: GlobalizationError) => void,
-        options?: {
-            formatLength?: string; // "short" | "medium" | "long" | "full"
-            selector?: string; // "date" | "time" | "date and time"
-        }): void;
-    /**
-     * Parses a date formatted as a string, according to the client's user preferences
-     * and calendar using the time zone of the client, and returns the corresponding date object.
-     * @param dateString  String to parse
-     * @param onSuccess   Called on success with GlobalizationDate object
-     * @param onError     Called on error getting the language with a GlobalizationError object.
-     *                    The error's expected code is GlobalizationError.PARSING_ERROR.
-     * @param options     Optional parse parameters. Default {formatLength:'short', selector:'date and time'}
-     */
-    stringToDate(
-        dateString: string,
-        onSuccess: (date: GlobalizationDate) => void,
-        onError: (error: GlobalizationError) => void,
-        options?: { type?: string; item?: string; }): void;
-    /**
-     * Returns a pattern string to format and parse dates according to the client's user preferences.
-     * @param onSuccess Called on success getting pattern with a GlobalizationDatePattern object
-     * @param onError   Called on error getting pattern with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.PATTERN_ERROR.
-     * @param options   Optional format parameters. Default {formatLength:'short', selector:'date and time'}
-     */
-    getDatePattern(
-        onSuccess: (datePattern: GlobalizationDatePattern) => void,
-        onError: (error: GlobalizationError) => void,
-        options?: { type?: string; item?: string; }): void;
-    /**
-     * Returns an array of the names of the months or days of the week, depending on the client's user preferences and calendar.
-     * @param onSuccess Called on success getting names with a properties object,
-     *                  that should have a value property with a String[] value.
-     * @param onError   Called on error getting the language with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.UNKNOWN_ERROR.
-     * @param options   Optional parameters. Default: {type:'wide', item:'months'}
-     */
-    getDateNames(
-        onSuccess: (names: { value: string[]; }) => void,
-        onError: (error: GlobalizationError) => void,
-        options?: { type?: string; item?: string; }): void;
-    /**
-     * Indicates whether daylight savings time is in effect for a given date using the client's time zone and calendar.
-     * @param {Date}                   date Date to check
-     * @param onSuccess Called on success with a properties object,
-     *                  that should have a dst property with a boolean value.
-     * @param onError   Called on error with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.UNKNOWN_ERROR.
-     */
-    isDaylightSavingsTime(
-        date: Date,
-        onSuccess: (result: { dst: boolean; }) => void,
-        onError: (error: GlobalizationError) => void): void;
-    /**
-     * Returns the first day of the week according to the client's user preferences and calendar.
-     * @param onSuccess Called on success with a day object,
-     *                  that should have a value property with a number value.
-     * @param onError   Called on error with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.UNKNOWN_ERROR.
-     */
-    getFirstDayOfWeek(
-        onSuccess: (day: { value: number; }) => void,
-        onError: (error: GlobalizationError) => void): void;
-    /**
-     * Returns a number formatted as a string according to the client's user preferences.
-     * @param value     Number to format
-     * @param onSuccess Called on success with a result object,
-     *                  that should have a value property with a String value.
-     * @param onError   Called on error with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.FORMATTING_ERROR.
-     * @param format    Optional format parameters. Default: {type:'decimal'}
-     */
-    nubmerToString(
-        value: number,
-        onSuccess: (result: { value: string; }) => void,
-        onError: (error: GlobalizationError) => void,
-        format?: { type?: string; }): void;
-    /**
-     * Parses a number formatted as a string according to the client's user preferences and returns the corresponding number.
-     * @param value     String to parse
-     * @param onSuccess Called on success with a result object,
-     *                  that should have a value property with a number value.
-     * @param onError   Called on error with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.FORMATTING_ERROR.
-     * @param format    Optional format parameters. Default: {type:'decimal'}
-     */
-    stringToNumber(
-        value: string,
-        onSuccess: (result: { value: number; }) => void,
-        onError: (error: GlobalizationError) => void,
-        format?: { type?: string; }): void;
-    /**
-     * Returns a pattern string to format and parse numbers according to the client's user preferences.
-     * @param onSuccess Called on success getting pattern with a GlobalizationNumberPattern object
-     * @param onError   Called on error getting the language with a GlobalizationError object.
-     *                  The error's expected code is GlobalizationError.PATTERN_ERROR.
-     * @param options   Optional format parameters. Default {type:'decimal'}.
-     */
-    getNumberPattern(
-        onSuccess: (result: GlobalizationNumberPattern) => void,
-        onError: (error: GlobalizationError) => void,
-        format?: { type?: string; }): void;
-    /**
-     * Returns a pattern string to format and parse currency values according to the client's user preferences and ISO 4217 currency code.
-     * @param currencyCode Should be a String of one of the ISO 4217 currency codes, for example 'USD'.
-     * @param onSuccess     Called on success getting pattern with a GlobalizatioCurrencyPattern object
-     * @param onError       Called on error getting pattern with a GlobalizationError object.
-     *                      The error's expected code is GlobalizationError.FORMATTING_ERROR.
-     * @param options       Optional format parameters. Default {type:'decimal'}.
-     */
-    getCurrencyPattern(
-        currencyCode: string,
-        onSuccess: (result: GlobalizationCurrencyPattern) => void,
-        onError: (error: GlobalizationError) => void): void;
-}
-
-/** Date returned by stringToDate */
-interface GlobalizationDate {
-    /* The four digit year. */
-    year: number;
-    /* The month from (0-11). */
-    month: number;
-    /* The day from (1-31). */
-    day: number;
-    /* The hour from (0-23). */
-    hour: number;
-    /* The minute from (0-59). */
-    minute: number;
-    /* The second from (0-59). */
-    second: number;
-    /* The milliseconds (from 0-999), not available on all platforms. */
-    millisecond: number;
-}
-
-/** Pattern to format and parse dates according to the client's user preferences.*/
-interface GlobalizationDatePattern {
-    /* The date and time pattern to format and parse dates. The patterns follow Unicode Technical Standard #35. */
-    pattern: string;
-    /* The abbreviated name of the time zone on the client. */
-    timezone: string;
-    /* The current difference in seconds between the client's time zone and coordinated universal time. */
-    utc_offset: number;
-    /* The current daylight saving time offset in seconds between the client's non-daylight saving's time zone and the client's daylight saving's time zone. */
-    dst_offset: number;
-}
-
-interface GlobalizationDateNameOptions {
-    type?: string;
-    item?: string;
-}
-
-/** Pattern to format and parse numbers according to the client's user preferences. */
-interface GlobalizationNumberPattern {
-    /* The number pattern to format and parse numbers. The patterns follow Unicode Technical Standard #35. */
-    pattern: string;
-    /* The symbol to use when formatting and parsing, such as a percent or currency symbol. */
-    symbol: string;
-    /* The number of fractional digits to use when parsing and formatting numbers. */
-    fraction: number;
-    /* The rounding increment to use when parsing and formatting. */
-    rounding: number;
-    /* The symbol to use for positive numbers when parsing and formatting. */
-    positive: string;
-    /* The symbol to use for negative numbers when parsing and formatting. */
-    negative: string;
-    /* The decimal symbol to use for parsing and formatting. */
-    decimal: string;
-    /* The grouping symbol to use for parsing and formatting. */
-    grouping: string;
-}
-
-/**
- * Pattern to format and parse currency values according
- * to the client's user preferences and ISO 4217 currency code.
- */
-interface GlobalizationCurrencyPattern {
-    /** The currency pattern to format and parse currency values. The patterns follow Unicode Technical Standard #35. */
-    pattern: string;
-    /** The ISO 4217 currency code for the pattern. */
-    code: string;
-    /** The number of fractional digits to use when parsing and formatting currency. */
-    fraction: number;
-    /** The rounding increment to use when parsing and formatting. */
-    rounding: number;
-    /** The decimal symbol to use for parsing and formatting. */
-    decimal: string;
-    /** The grouping symbol to use for parsing and formatting. */
-    grouping: string;
-}
-
-/** An object representing a error from the Globalization API. */
-interface GlobalizationError {
-    /** One of the following codes representing the error type:
-      * GlobalizationError.UNKNOWN_ERROR: 0
-      * GlobalizationError.FORMATTING_ERROR: 1
-      * GlobalizationError.PARSING_ERROR: 2
-      * GlobalizationError.PATTERN_ERROR: 3
-      */
-    code: number;
-    /** A text message that includes the error's explanation and/or details */
-    message: string;
-}
-
-/** An object representing a error from the Globalization API. */
-declare var GlobalizationError: {
-    UNKNOWN_ERROR: number;
-    FORMATTING_ERROR: number;
-    PARSING_ERROR: number;
-    PATTERN_ERROR: number;
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-globalization/tsconfig.json b/types/cordova-plugin-globalization/tsconfig.json
deleted file mode 100644
index 8455c229c3..0000000000
--- a/types/cordova-plugin-globalization/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-globalization-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-ibeacon/index.d.ts b/types/cordova-plugin-ibeacon/index.d.ts
index eb2115448d..20d5733ea9 100644
--- a/types/cordova-plugin-ibeacon/index.d.ts
+++ b/types/cordova-plugin-ibeacon/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/petermetz/cordova-plugin-ibeacon
 // Definitions by: Markus Wagner <https://github.com/Ritzlgrmft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Q from "q";
 
diff --git a/types/cordova-plugin-ibeacon/tslint.json b/types/cordova-plugin-ibeacon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-ibeacon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts b/types/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
deleted file mode 100644
index 2506df887d..0000000000
--- a/types/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// InAppBrowser plugin
-// ----------------------------------------------------------------------
-
-// signature of window.open() added by InAppBrowser plugin
-// is similar to native window.open signature, so the compiler can's
-// select proper overload, but we cast result to InAppBrowser manually.
-const iab = window.open('google.com', '_self');
-
-iab.addEventListener('loadstart', (ev: InAppBrowserEvent) => { console.log('Start opening ' + ev.url); });
-iab.addEventListener('loadstart', (ev) => { console.log('loadstart' + ev.url); });
-iab.addEventListener('loadstop', (ev) => { console.log('loadstop' + ev.code); });
-iab.addEventListener('loaderror', (ev) => { console.log('loaderror' + ev.code); });
-iab.addEventListener('exit', (ev) => { console.log('exit' + ev.code); });
-
-function inAppBrowserCallBack(ev: InAppBrowserEvent) {
-    console.log('InAppBrowser callback ' + ev.url);
-}
-
-iab.addEventListener('loadstart', inAppBrowserCallBack);
-iab.addEventListener('loadstart', inAppBrowserCallBack);
-iab.addEventListener('loadstop', inAppBrowserCallBack);
-iab.addEventListener('loaderror', inAppBrowserCallBack);
-iab.addEventListener('exit', inAppBrowserCallBack);
-
-iab.removeEventListener('loadstart', inAppBrowserCallBack);
-iab.removeEventListener('loadstop', inAppBrowserCallBack);
-iab.removeEventListener('loaderror', inAppBrowserCallBack);
-iab.removeEventListener('exit', inAppBrowserCallBack);
-
-iab.show();
-iab.executeScript(
-    { code: "console.log('Injected script in action')" },
-    () => { console.log('Script is executed'); }
-);
diff --git a/types/cordova-plugin-inappbrowser/index.d.ts b/types/cordova-plugin-inappbrowser/index.d.ts
deleted file mode 100644
index 1cf2c67642..0000000000
--- a/types/cordova-plugin-inappbrowser/index.d.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-// Type definitions for Apache Cordova InAppBrowser plugin 1.7
-// Project: https://github.com/apache/cordova-plugin-inappbrowser
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-// TypeScript Version: 2.3
-type channel = "loadstart" | "loadstop" | "loaderror" | "exit";
-
-interface Window {
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: string, options?: string, replace?: boolean): InAppBrowser;
-}
-
-/**
- * The object returned from a call to window.open.
- * NOTE: The InAppBrowser window behaves like a standard web browser, and can't access Cordova APIs.
- */
-interface InAppBrowser extends Window {
-    onloadstart(type: Event): void;
-    onloadstop(type: InAppBrowserEvent): void;
-    onloaderror(type: InAppBrowserEvent): void;
-    onexit(type: InAppBrowserEvent): void;
-    // addEventListener overloads
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: channel, callback: (event: InAppBrowserEvent) => void): void;
-    // removeEventListener overloads
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: channel, callback: (event: InAppBrowserEvent) => void): void;
-    /** Closes the InAppBrowser window. */
-    close(): void;
-    /** Hides the InAppBrowser window. Calling this has no effect if the InAppBrowser was already hidden. */
-    hide(): void;
-    /**
-     * Displays an InAppBrowser window that was opened hidden. Calling this has no effect
-     * if the InAppBrowser was already visible.
-     */
-    show(): void;
-    /**
-     * Injects JavaScript code into the InAppBrowser window.
-     * @param script    Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the JavaScript code is injected.
-     *                  If the injected script is of type code, the callback executes with
-     *                  a single parameter, which is the return value of the script, wrapped in an Array.
-     *                  For multi-line scripts, this is the return value of the last statement,
-     *                  or the last expression evaluated.
-     */
-    executeScript(script: { code: string } | { file: string }, callback: (result: any) => void): void;
-    /**
-     * Injects CSS into the InAppBrowser window.
-     * @param css       Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the CSS is injected.
-     */
-    insertCSS(css: { code: string } | { file: string }, callback: () => void): void;
-}
-
-interface InAppBrowserEvent extends Event {
-    /** the eventname, either loadstart, loadstop, loaderror, or exit. */
-    type: string;
-    /** the URL that was loaded. */
-    url: string;
-    /** the error code, only in the case of loaderror. */
-    code: number;
-    /** the error message, only in the case of loaderror. */
-    message: string;
-}
-
-interface Cordova {
-    InAppBrowser: InAppBrowser;
-}
diff --git a/types/cordova-plugin-inappbrowser/tsconfig.json b/types/cordova-plugin-inappbrowser/tsconfig.json
deleted file mode 100644
index ff0151160c..0000000000
--- a/types/cordova-plugin-inappbrowser/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-inappbrowser-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-inappbrowser/tslint.json b/types/cordova-plugin-inappbrowser/tslint.json
deleted file mode 100644
index 946c3b6691..0000000000
--- a/types/cordova-plugin-inappbrowser/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODO
-		"dt-header": false
-	}
-}
diff --git a/types/cordova-plugin-insomnia/tslint.json b/types/cordova-plugin-insomnia/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-insomnia/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts b/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
index 767eaa6ed2..fa5cf72a30 100644
--- a/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
+++ b/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
@@ -1,23 +1,31 @@
 Keyboard.shrinkView(true);
 Keyboard.shrinkView(false);
+Keyboard.shrinkView(null, (currentValue) => console.log(currentValue));
+
 Keyboard.hideFormAccessoryBar(true);
 Keyboard.hideFormAccessoryBar(false);
+Keyboard.hideFormAccessoryBar(null, (currentValue) => console.log(currentValue));
+
 Keyboard.disableScrollingInShrinkView(true);
 Keyboard.disableScrollingInShrinkView(false);
+Keyboard.disableScrollingInShrinkView(null, (currentValue) => console.log(currentValue));
+
+Keyboard.hide();
+
+Keyboard.show();
+
 if (Keyboard.isVisible) {
     console.log('Keyboard is visible');
 }
-Keyboard.automaticScrollToTopOnHiding = true;
-Keyboard.onshow = function () {
-    console.log('onshow');
-};
-Keyboard.onhide = function () {
-    console.log('onhide');
-};
-Keyboard.onshowing = function () {
-    console.log('onshowing');
-};
-Keyboard.onhiding= function () {
-    console.log('onhiding');
-};
 
+Keyboard.automaticScrollToTopOnHiding = true;
+
+window.addEventListener('keyboardDidShow', () => console.log('keyboardDidShow'));
+
+window.addEventListener('keyboardDidHide', () => console.log('keyboardDidHide'));
+
+window.addEventListener('keyboardWillShow', () => console.log('keyboardWillShow'));
+
+window.addEventListener('keyboardWillHide', () => console.log('keyboardWillHide'));
+
+window.addEventListener('keyboardHeightWillChange', (event: CordovaKeyboardEvent) => console.log(`keyboardHeightWillChange - keyboard height: ${event.keyboardHeight}`));
diff --git a/types/cordova-plugin-keyboard/index.d.ts b/types/cordova-plugin-keyboard/index.d.ts
index 427a5425e5..af880d732a 100644
--- a/types/cordova-plugin-keyboard/index.d.ts
+++ b/types/cordova-plugin-keyboard/index.d.ts
@@ -1,32 +1,9 @@
-// Type definitions for Apache Cordova Keyboard plugin v0.1.2
-// Project: https://github.com/apache/cordova-plugins/tree/master/keyboard
-// Definitions by: Dan Manastireanu <https://github.com/danmana>
+// Type definitions for Apache Cordova Keyboard plugin v1.2.0
+// Project: https://github.com/cjpearson/cordova-plugin-keyboard
+// Definitions by:  Dan Manastireanu <https://github.com/danmana>
+//                  Jochen Becker <https://github.com/jkfb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * The Keyboard object provides some functions to customize the iOS keyboard.
- *
- * <i>Supported Platforms: iOS</i>
- *
- * This plugin has only been tested in Cordova 3.2 or greater,
- * and its use in previous Cordova versions is not recommended
- * (potential conflict with keyboard customization code present in the core in previous Cordova versions).
- *
- * If you do use this plugin in an older Cordova version (again, not recommended),
- * you have to make sure the HideKeyboardFormAccessoryBar and KeyboardShrinksView preference values are always false,
- * and only use the API functions to turn things on/off.
- *
- * This plugin supports the HideKeyboardFormAccessoryBar (boolean)
- * and KeyboardShrinksView (boolean) preferences in config.xml.
- *
- * Permissions in config.xml
- * <code>
- *     <feature name="Keyboard">
- *         <param name="ios-package" value="CDVKeyboard" onload="true" />
- *     </feature>
- * </code>
- *
- */
 interface Keyboard {
 
     // Methods
@@ -39,15 +16,20 @@ interface Keyboard {
      * This applies to apps that position their elements relative to the bottom of the WebView.
      * This is the default behaviour on Android, and makes a lot of sense when building apps as opposed to webpages.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.shrinkView(true);
      * Keyboard.shrinkView(false);
+     * Keyboard.shrinkView(null, function (currentValue) { console.log(currentValue); });
      * </code>
      *
      * @param shrink
+     * @param successCallback A success callbackfunction
      */
-    shrinkView(shrink:boolean): void,
+    shrinkView(shrink: boolean, successCallback?: (currentValue: any) => void): void,
 
     /**
      * Hide the keyboard toolbar.
@@ -55,21 +37,29 @@ interface Keyboard {
      * Set to true to hide the additional toolbar that is on top of the keyboard.
      * This toolbar features the Prev, Next, and Done buttons.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.hideFormAccessoryBar(true);
      * Keyboard.hideFormAccessoryBar(false);
+     * Keyboard.hideFormAccessoryBar(null, function (currentValue) { console.log(currentValue); });
      * </code>
      *
      * @param hide
+     * @param successCallback A success callbackfunction
      */
-    hideFormAccessoryBar(hide:boolean): void,
+    hideFormAccessoryBar(hide: boolean, successCallback?: (currentValue: any) => void): void,
 
     /**
      * Disable scrolling when the the WebView is shrunk.
      *
      * Set to true to disable scrolling when the WebView is shrunk.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.disableScrollingInShrinkView(true);
@@ -77,8 +67,40 @@ interface Keyboard {
      * </code>
      *
      * @param disable
+     * @param successCallback A success callbackfunction
      */
-    disableScrollingInShrinkView(disable:boolean): void,
+    disableScrollingInShrinkView(disable: boolean, successCallback?: (currentValue: any) => void): void,
+
+    /**
+     * Hide the keyboard
+     *
+     * Call this method to hide the keyboard
+     *
+     * Supported Platforms:
+     *  - iOS
+     *  - Android
+     *
+     * Example:
+     * <code>
+     * Keyboard.hide();
+     * </code>
+     */
+    hide(): void,
+
+    /**
+     * Show the keyboard
+     *
+     * Call this method to show the keyboard.
+     *
+     * Supported Platforms:
+     *  - Android
+     *
+     * Example:
+     * <code>
+     * Keyboard.show();
+     * </code>
+     */
+    show(): void,
 
     // Properties
 
@@ -87,6 +109,9 @@ interface Keyboard {
      *
      * Read this property to determine if the keyboard is visible.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * if (Keyboard.isVisible) {
@@ -102,6 +127,9 @@ interface Keyboard {
      * Set this to true if you need that page scroll to beginning when keyboard is hiding.
      * This is allows to fix issue with elements declared with position: fixed, after keyboard is hiding.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      *     Keyboard.automaticScrollToTopOnHiding = true;
@@ -110,65 +138,48 @@ interface Keyboard {
      */
     automaticScrollToTopOnHiding: boolean,
 
-    // Events
+    /**
+     * Deprecated Events
+     */
+    onshow(): void,
 
-    /**
-     * If defined, this function is fired when keyboard fully shown.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is shown.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onshow = function () {
-     *     // Describe your logic which will be run each time keyboard is shown.
-     * }
-     * </code>
-     *
-     */
-    onshow():void,
-    /**
-     * If defined, this function is fired when keyboard fully closed.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is closed.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onhide = function () {
-     *     // Describe your logic which will be run each time keyboard is closed.
-     * }
-     * </code>
-     *
-     */
-    onhide():void,
-    /**
-     * If defined, this function is fired before keyboard will be shown.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is about to be shown on the screen.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onshowing = function () {
-     *     // Describe your logic which will be run each time when keyboard is about to be shown.
-     * }
-     * </code>
-     *
-     */
-    onshowing():void,
-    /**
-     * If defined, this function is fired when keyboard is about to be closed.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is about to be closed.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onhiding = function () {
-     *     // Describe your logic which will be run each time when keyboard is about to be closed.
-     * }
-     * </code>
-     *
-     */
-    onhiding():void,
+    onhide(): void,
 
+    onhiding(): void,
+
+    onshowing(): void
 }
 
-declare var Keyboard:Keyboard;
+interface CordovaKeyboardEvent extends Event {
+    /** The height of the keyboard */
+    keyboardHeight: number;
+}
+
+interface WindowEventMap {
+    /**
+     * This event is fired when keyboard fully shown.
+     */
+    'keyboardDidShow': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardDidHide': Event,
+
+    /**
+     * This event fires before keyboard will be shown.
+     */
+    'keyboardWillShow': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardWillHide': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardHeightWillChange': CordovaKeyboardEvent
+  }
+
+declare var Keyboard: Keyboard;
diff --git a/types/cordova-plugin-keyboard/tslint.json b/types/cordova-plugin-keyboard/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-keyboard/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-mapsforge/tslint.json b/types/cordova-plugin-mapsforge/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-mapsforge/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-media-capture/cordova-plugin-media-capture-tests.ts b/types/cordova-plugin-media-capture/cordova-plugin-media-capture-tests.ts
deleted file mode 100644
index 91fdefa74f..0000000000
--- a/types/cordova-plugin-media-capture/cordova-plugin-media-capture-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-console.log('Supported audio modes are: ' + JSON.stringify(navigator.device.capture.supportedAudioModes));
-
-navigator.device.capture.captureAudio(
-    (captures: MediaFile[]) => { console.log(captures.length + ' captured'); },
-    (err: CaptureError) => { alert('Error ' + err.message); },
-    {
-        limit: 3,
-        duration: 10
-    }
-);
-
diff --git a/types/cordova-plugin-media-capture/index.d.ts b/types/cordova-plugin-media-capture/index.d.ts
deleted file mode 100644
index 726c5dac88..0000000000
--- a/types/cordova-plugin-media-capture/index.d.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-// Type definitions for Apache Cordova MediaCapture plugin
-// Project: https://github.com/apache/cordova-plugin-media-capture
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license
-
-interface Navigator {
-    device: Device;
-}
-
-interface Device {
-    capture: Capture;
-}
-
-/** This plugin provides access to the device's audio, image, and video capture capabilities. */
-interface Capture {
-    /**
-     * Start the audio recorder application and return information about captured audio clip files.
-     * @param onSuccess Executes when the capture operation finishes with an array
-     *                  of MediaFile objects describing each captured audio clip file.
-     * @param onError   Executes, if the user terminates the operation before an audio clip is captured,
-     *                  with a CaptureError object, featuring the CaptureError.CAPTURE_NO_MEDIA_FILES error code.
-     * @param options   Encapsulates audio capture configuration options.
-     */
-    captureAudio(
-            onSuccess: (mediaFiles: MediaFile[]) => void,
-            onError: (error: CaptureError) => void,
-            options?: AudioOptions): void ;
-    /**
-     * Start the camera application and return information about captured image files.
-     * @param onSuccess Executes when the capture operation finishes with an array
-     *                  of MediaFile objects describing each captured image clip file.
-     * @param onError   Executes, if the user terminates the operation before an audio clip is captured,
-     *                  with a CaptureError object, featuring the CaptureError.CAPTURE_NO_MEDIA_FILES error code.
-     * @param options   Encapsulates audio capture configuration options.
-     */
-    captureImage(
-            onSuccess: (mediaFiles: MediaFile[]) => void,
-            onError: (error: CaptureError) => void,
-            options?: ImageOptions): void ;
-    /**
-     * Start the video recorder application and return information about captured video clip files.
-     * @param onSuccess Executes when the capture operation finishes with an array
-     *                  of MediaFile objects describing each captured video clip file.
-     * @param onError   Executes, if the user terminates the operation before an audio clip is captured,
-     *                  with a CaptureError object, featuring the CaptureError.CAPTURE_NO_MEDIA_FILES error code.
-     * @param options   Encapsulates audio capture configuration options.
-     */
-    captureVideo(
-            onSuccess: (mediaFiles: MediaFile[]) => void,
-            onError: (error: CaptureError) => void,
-            options?: VideoOptions): void ;
-    /** The audio recording formats supported by the device. */
-    supportedAudioModes: ConfigurationData[];
-    /** The recording image sizes and formats supported by the device. */
-    supportedImageModes: ConfigurationData[];
-    /** The recording video resolutions and formats supported by the device. */
-    supportedVideoModes: ConfigurationData[];
-}
-
-/** Encapsulates properties of a media capture file. */
-interface MediaFile {
-    /** The name of the file, without path information. */
-    name: string;
-    /** The full path of the file, including the name. */
-    fullPath: string;
-    /** The file's mime type */
-    type: string;
-    /** The date and time when the file was last modified. */
-    lastModifiedDate: Date;
-    /** The size of the file, in bytes. */
-    size: number;
-    /**
-     * Retrieves format information about the media capture file.
-     * @param successCallback Invoked with a MediaFileData object when successful.
-     * @param errorCallback   Invoked if the attempt fails, this function. 
-     */
-    getFormatData(
-        successCallback: (data: MediaFileData) => void,
-        errorCallback?: () => void): void;
-}
-
-/** Encapsulates format information about a media file. */
-interface MediaFileData {
-    /** The actual format of the audio and video content. */
-    codecs: string;
-    /** The average bitrate of the content. The value is zero for images. */
-    bitrate: number;
-    /** The height of the image or video in pixels. The value is zero for audio clips. */
-    height: number;
-    /** The width of the image or video in pixels. The value is zero for audio clips. */
-    width: number;
-    /** The length of the video or sound clip in seconds. The value is zero for images. */
-    duration: number;
-}
-
-/** Encapsulates the error code resulting from a failed media capture operation. */
-interface CaptureError {
-    /**
-     * One of the pre-defined error codes listed below.
-     *     CaptureError.CAPTURE_INTERNAL_ERR
-     *         The camera or microphone failed to capture image or sound.
-     *     CaptureError.CAPTURE_APPLICATION_BUSY
-     *         The camera or audio capture application is currently serving another capture request.
-     *     CaptureError.CAPTURE_INVALID_ARGUMENT
-     *         Invalid use of the API (e.g., the value of limit is less than one).
-     *     CaptureError.CAPTURE_NO_MEDIA_FILES
-     *         The user exits the camera or audio capture application before capturing anything.
-     *     CaptureError.CAPTURE_NOT_SUPPORTED
-     *         The requested capture operation is not supported.
-     */
-    code: number;
-    message: string;
-}
-
-declare var CaptureError: {
-    /** Constructor for CaptureError  */
-    new (code: number, message: string): CaptureError;
-    CAPTURE_INTERNAL_ERR: number;
-    CAPTURE_APPLICATION_BUSY: number;
-    CAPTURE_INVALID_ARGUMENT: number;
-    CAPTURE_NO_MEDIA_FILES: number;
-    CAPTURE_NOT_SUPPORTED: number;
-}
-
-/** Encapsulates audio capture configuration options. */
-interface AudioOptions {
-    /**
-     * The maximum number of audio clips the device's user can capture in a single
-     * capture operation. The value must be greater than or equal to 1.
-     */
-    limit?: number;
-    /** The maximum duration of a audio clip, in seconds. */
-    duration?: number;
-}
-
-/** Encapsulates image capture configuration options. */
-interface ImageOptions {
-    /**
-     * The maximum number of images the user can capture in a single capture operation.
-     * The value must be greater than or equal to 1 (defaults to 1).
-     */
-    limit?: number;
-}
-
-/** Encapsulates video capture configuration options. */
-interface VideoOptions {
-    /**
-     * The maximum number of video clips the device's user can capture in a single
-     * capture operation. The value must be greater than or equal to 1.
-     */
-    limit?: number;
-    /** The maximum duration of a video clip, in seconds. */
-    duration?: number;
-}
-
-/** Encapsulates a set of media capture parameters that a device supports. */
-interface ConfigurationData {
-    /** The ASCII-encoded lowercase string representing the media type. */
-    type: string;
-    /** The height of the image or video in pixels. The value is zero for sound clips. */
-    height: number;
-    /** The width of the image or video in pixels. The value is zero for sound clips. */
-    width: number;
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-media-capture/tsconfig.json b/types/cordova-plugin-media-capture/tsconfig.json
deleted file mode 100644
index 5f87c5709a..0000000000
--- a/types/cordova-plugin-media-capture/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-media-capture-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-media/cordova-plugin-media-tests.ts b/types/cordova-plugin-media/cordova-plugin-media-tests.ts
deleted file mode 100644
index 1c00c850e5..0000000000
--- a/types/cordova-plugin-media/cordova-plugin-media-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Media and Media Capture
-//----------------------------------------------------------------------
-
-var media = new Media('',
-    () => { console.log('Media opened'); },
-    (err: MediaError) => { alert('Error: ' + err.code); });
-media.play();
-media.setVolume(10);
-
diff --git a/types/cordova-plugin-media/index.d.ts b/types/cordova-plugin-media/index.d.ts
deleted file mode 100644
index 77f14d4e0b..0000000000
--- a/types/cordova-plugin-media/index.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for Apache Cordova Media plugin
-// Project: https://github.com/apache/cordova-plugin-media
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license
-
-declare var Media: {
-    new (
-        src: string,
-        mediaSuccess: () => void,
-        mediaError?: (error: MediaError) => any,
-        mediaStatus?: (status: number) => void): Media;
-        //Media statuses
-        MEDIA_NONE: number;
-        MEDIA_STARTING: number;
-        MEDIA_RUNNING: number;
-        MEDIA_PAUSED: number;
-        MEDIA_STOPPED: number
-};
-
-/**
- * This plugin provides the ability to record and play back audio files on a device.
- * NOTE: The current implementation does not adhere to a W3C specification for media capture,
- * and is provided for convenience only. A future implementation will adhere to the latest
- * W3C specification and may deprecate the current APIs.
- */
-interface Media {
-    /**
-     * Returns the current position within an audio file. Also updates the Media object's position parameter.
-     * @param mediaSuccess The callback that is passed the current position in seconds.
-     * @param mediaError   The callback to execute if an error occurs.
-     */
-    getCurrentPosition(
-        mediaSuccess: (position: number) => void,
-        mediaError?: (error: MediaError) => void): void;
-    /** Returns the duration of an audio file in seconds. If the duration is unknown, it returns a value of -1. */
-    getDuration(): number;
-    /** 
-     * Starts or resumes playing an audio file.
-     * @param iosPlayOptions: iOS options quirks
-     */
-    play(iosPlayOptions?: IosPlayOptions): void;
-    /** Pauses playing an audio file. */
-    pause(): void;
-    /**
-     * Releases the underlying operating system's audio resources. This is particularly important
-     * for Android, since there are a finite amount of OpenCore instances for media playback.
-     * Applications should call the release function for any Media resource that is no longer needed.
-     */
-    release(): void;
-    /**
-     * Sets the current position within an audio file.
-     * @param position Position in milliseconds.
-     */
-    seekTo(position: number): void;
-    /**
-     * Set the volume for an audio file.
-     * @param volume The volume to set for playback. The value must be within the range of 0.0 to 1.0.
-     */
-    setVolume(volume: number): void;
-    /** Starts recording an audio file. */
-    startRecord(): void;
-    /** Stops recording an audio file. */
-    stopRecord(): void;
-    /** Stops playing an audio file. */
-    stop(): void;
-    /**
-     * The position within the audio playback, in seconds.
-     * Not automatically updated during play; call getCurrentPosition to update.
-     */
-    position: number;
-    /** The duration of the media, in seconds. */
-    duration: number;
-}
-/**
- *  iOS optional parameters for media.play
- *  See https://github.com/apache/cordova-plugin-media#ios-quirks
- */
-interface IosPlayOptions {
-    numberOfLoops?: number;
-    playAudioWhenScreenIsLocked?: boolean;
-}
diff --git a/types/cordova-plugin-media/tsconfig.json b/types/cordova-plugin-media/tsconfig.json
deleted file mode 100644
index 8399ccf964..0000000000
--- a/types/cordova-plugin-media/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-media-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-ms-adal/tslint.json b/types/cordova-plugin-ms-adal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-ms-adal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-native-keyboard/index.d.ts b/types/cordova-plugin-native-keyboard/index.d.ts
index 0f64199bd1..9acc3d0be5 100644
--- a/types/cordova-plugin-native-keyboard/index.d.ts
+++ b/types/cordova-plugin-native-keyboard/index.d.ts
@@ -6,7 +6,6 @@ interface NativeKeyboard {
     /**
      * Show the messenger, the bare minimum which has to be passed to the function is
      * the onSubmit callback
-     * @param options
      */
     showMessenger(
         options: NativeKeyboardShowOptions
@@ -16,10 +15,6 @@ interface NativeKeyboard {
      * It's likely your app only has 1 one page where you want to show the messenger,
      * so you want to hide it when the user navigates away. You can choose to do this
      * either animated (a quick slide down animation) or not.
-     *
-     * @param options
-     * @param onSuccess
-     * @param onError
      */
     hideMessenger(
         options?: NativeKeyboardHideOptions,
@@ -29,9 +24,6 @@ interface NativeKeyboard {
 
     /**
      * Show a previously hidden keyboard
-     *
-     * @param onSuccess
-     * @param onError
      */
     showMessengerKeyboard(
         onSuccess?: () => void,
@@ -40,9 +32,6 @@ interface NativeKeyboard {
 
     /**
      * Hide the keyboard, but not the messenger bar
-     *
-     * @param onSuccess
-     * @param onError
      */
     hideMessengerKeyboard(
         onSuccess?: () => void,
@@ -53,10 +42,6 @@ interface NativeKeyboard {
      * Manipulate the messenger while it's open. For instance if you want to
      * update the text programmatically based on what the user typed (by responding to
      * onTextChanged events).
-     *
-     * @param options
-     * @param onSuccess
-     * @param onError
      */
     updateMessenger(
         options: NativeKeyboardUpdateOptions,
@@ -92,7 +77,6 @@ interface NativeKeyboardHideOptions {
 interface NativeKeyboardShowOptions {
     /**
      * Callback function, which is being called as soon as the user submits
-     * @param text
      */
     onSubmit(text: string): void;
 
@@ -119,8 +103,6 @@ interface NativeKeyboardShowOptions {
     /**
      * Callback function which is being executed as soon as the entered text changes. Will
      * return the new text
-     *
-     * @param text
      */
     onTextChanged?(text: string): void;
 
diff --git a/types/cordova-plugin-network-information/cordova-plugin-network-information-tests.ts b/types/cordova-plugin-network-information/cordova-plugin-network-information-tests.ts
deleted file mode 100644
index 0c4bfd7a2d..0000000000
--- a/types/cordova-plugin-network-information/cordova-plugin-network-information-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-var connType = navigator.connection.type;
-if (connType == Connection.WIFI) {
-    console.log('Congratulations, you\'re with fast Internet!');
-}
-
-document.addEventListener('offline', () => { alert('You\'re offline!'); });
diff --git a/types/cordova-plugin-network-information/index.d.ts b/types/cordova-plugin-network-information/index.d.ts
deleted file mode 100644
index 4e9457efbd..0000000000
--- a/types/cordova-plugin-network-information/index.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for Apache Cordova Network Information plugin
-// Project: https://github.com/apache/cordova-plugin-network-information
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license
-
-interface Navigator {
-    /**
-     * This plugin provides an implementation of an old version of the Network Information API.
-     * It provides information about the device's cellular and wifi connection, and whether the device has an internet connection.
-     */
-    connection: Connection;
-    // see https://github.com/apache/cordova-plugin-network-information/blob/dev/doc/index.md#api-change
-    // for 
-    network: {
-        /**
-         * This plugin provides an implementation of an old version of the Network Information API.
-         * It provides information about the device's cellular and wifi connection, and whether the device has an internet connection.
-         */
-        connection: Connection
-    }
-}
-
-interface Document {
-    addEventListener(type: "online", connectionStateCallback: () => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", connectionStateCallback: () => any, useCapture?: boolean): void;
-}
-
-/**
- * The connection object, exposed via navigator.connection, provides information
- * about the device's cellular and wifi connection.
- */
-interface Connection {
-    /**
-     * This property offers a fast way to determine the device's network connection state, and type of connection.
-     * One of:
-     *     Connection.UNKNOWN
-     *     Connection.ETHERNET
-     *     Connection.WIFI
-     *     Connection.CELL_2G
-     *     Connection.CELL_3G
-     *     Connection.CELL_4G
-     *     Connection.CELL
-     *     Connection.NONE
-     */
-    type: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var Connection: {
-    UNKNOWN: string;
-    ETHERNET: string;
-    WIFI: string;
-    CELL_2G: string;
-    CELL_3G: string;
-    CELL_4G: string;
-    CELL: string;
-    NONE: string;
-}
diff --git a/types/cordova-plugin-network-information/tsconfig.json b/types/cordova-plugin-network-information/tsconfig.json
deleted file mode 100644
index 2ffebf9678..0000000000
--- a/types/cordova-plugin-network-information/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-network-information-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-ouralabs/tslint.json b/types/cordova-plugin-ouralabs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-ouralabs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-qrscanner/tslint.json b/types/cordova-plugin-qrscanner/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-qrscanner/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-spinner/tslint.json b/types/cordova-plugin-spinner/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-spinner/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-splashscreen/cordova-plugin-splashscreen-tests.ts b/types/cordova-plugin-splashscreen/cordova-plugin-splashscreen-tests.ts
deleted file mode 100644
index 5938396ad4..0000000000
--- a/types/cordova-plugin-splashscreen/cordova-plugin-splashscreen-tests.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-navigator.splashscreen.show();
-navigator.splashscreen.hide();
\ No newline at end of file
diff --git a/types/cordova-plugin-splashscreen/index.d.ts b/types/cordova-plugin-splashscreen/index.d.ts
deleted file mode 100644
index 968b340067..0000000000
--- a/types/cordova-plugin-splashscreen/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for Apache Cordova Splashscreen plugin
-// Project: https://github.com/apache/cordova-plugin-splashscreen
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-
-interface Navigator {
-    /** This plugin displays and hides a splash screen during application launch. */
-    splashscreen: {
-        /** Dismiss the splash screen. */
-        hide(): void;
-        /** Displays the splash screen. */
-        show(): void;
-    }
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-splashscreen/tsconfig.json b/types/cordova-plugin-splashscreen/tsconfig.json
deleted file mode 100644
index cc4a7f28c5..0000000000
--- a/types/cordova-plugin-splashscreen/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-splashscreen-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-statusbar/cordova-plugin-statusbar-tests.ts b/types/cordova-plugin-statusbar/cordova-plugin-statusbar-tests.ts
deleted file mode 100644
index 623211d6c6..0000000000
--- a/types/cordova-plugin-statusbar/cordova-plugin-statusbar-tests.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-var statusBar: StatusBar = window.StatusBar;
-statusBar.overlaysWebView(true);
-statusBar.overlaysWebView(false);
-statusBar.styleDefault();
-statusBar.styleLightContent();
-statusBar.styleBlackTranslucent();
-statusBar.styleBlackOpaque();
-statusBar.backgroundColorByName("red");
-statusBar.backgroundColorByHexString("#aaa");
-statusBar.hide();
-statusBar.show();
-var visible: boolean = statusBar.isVisible;
diff --git a/types/cordova-plugin-statusbar/index.d.ts b/types/cordova-plugin-statusbar/index.d.ts
deleted file mode 100644
index 8e211f3530..0000000000
--- a/types/cordova-plugin-statusbar/index.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// Type definitions for Apache Cordova StatusBar plugin
-// Project: https://github.com/apache/cordova-plugin-statusbar
-// Definitions by: Xinkai Chen <https://github.com/Xinkai>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
-* Global object StatusBar.
-*/
-interface Window {
-    StatusBar: StatusBar;
-}
-
-
-/**
-* The StatusBar object provides some functions to customize the iOS and Android StatusBar.
-*/
-interface StatusBar {
-    /**
-    * On iOS 7, make the statusbar overlay or not overlay the WebView.
-    * @param isOverlay         On iOS 7, set to false to make the statusbar appear like iOS 6.
-    *                              Set the style and background color to suit using the other functions.
-    */
-    overlaysWebView: (isOverlay: boolean) => void;
-
-    /**
-    * Use the default statusbar (dark text, for light backgrounds).
-    */
-    styleDefault: () => void;
-
-    /**
-    * Use the lightContent statusbar (light text, for dark backgrounds).
-    */
-    styleLightContent: () => void;
-
-    /**
-    * Use the blackTranslucent statusbar (light text, for dark backgrounds).
-    */
-    styleBlackTranslucent: () => void;
-
-    /**
-    * Use the blackOpaque statusbar (light text, for dark backgrounds).
-    */
-    styleBlackOpaque: () => void;
-
-    /**
-    * On iOS 7, when you set StatusBar.statusBarOverlaysWebView to false,
-    * you can set the background color of the statusbar by color name.
-    * @param color             Supported color names are:
-    *                              black, darkGray, lightGray, white, gray, red, green, blue, cyan, yellow, magenta, orange, purple, brown
-    */
-    backgroundColorByName: (color: string) => void;
-
-    /**
-    * Sets the background color of the statusbar by a hex string.
-    * @param color             CSS shorthand properties are also supported.
-    *                              On iOS 7, when you set StatusBar.statusBarOverlaysWebView to false, you can set the background color of the statusbar by a hex string (#RRGGBB).
-    *                              On WP7 and WP8 you can also specify values as #AARRGGBB, where AA is an alpha value
-    */
-    backgroundColorByHexString: (color: string) => void;
-
-    /**
-    * Hide the statusbar.
-    */
-    hide: () => void;
-
-    /**
-    * Show the statusbar.
-    */
-    show: () => void;
-
-    /**
-    * Read this property to see if the statusbar is visible or not.
-    */
-    isVisible: boolean;
-}
-
-declare var StatusBar: StatusBar;
diff --git a/types/cordova-plugin-statusbar/tsconfig.json b/types/cordova-plugin-statusbar/tsconfig.json
deleted file mode 100644
index 2b6c772083..0000000000
--- a/types/cordova-plugin-statusbar/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-statusbar-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-vibration/cordova-plugin-vibration-tests.ts b/types/cordova-plugin-vibration/cordova-plugin-vibration-tests.ts
deleted file mode 100644
index 33cdb43436..0000000000
--- a/types/cordova-plugin-vibration/cordova-plugin-vibration-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-var notification: Notification;
-
-notification.vibrate(100);
-notification.vibrateWithPattern([100, 200, 200, 150, 50], 3);
-setTimeout(notification.cancelVibration, 1000);
-
diff --git a/types/cordova-plugin-vibration/index.d.ts b/types/cordova-plugin-vibration/index.d.ts
deleted file mode 100644
index 317576a523..0000000000
--- a/types/cordova-plugin-vibration/index.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for Apache Cordova Vibration plugin
-// Project: https://github.com/apache/cordova-plugin-vibration
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>, Louis Lagrange <https://github.com/Minishlink>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-
-interface Navigator {
-	/**
-	 * Vibrates the device for the specified amount of time.
-	 * @param time Milliseconds to vibrate the device. 0 cancels the vibration. Ignored on iOS.
-	 */
-    vibrate(time: number): void;
-
-    /**
-	 * Vibrates the device with a given pattern.
-	 * @param time Sequence of durations (in milliseconds) for which to turn on or off the vibrator. Ignored on iOS.
-	 */
-    vibrate(time: number[]): void;
-}
-
-interface Notification {
-	/**
-	 * Vibrates the device for the specified amount of time.
-	 * @param time Milliseconds to vibrate the device. Ignored on iOS.
-     * @deprecated
-	 */
-    vibrate(time: number): void;
-    /**
-     * Vibrates the device with a given pattern.
-     * @param number[] pattern Pattern with which to vibrate the device.
-     *                         The first value - number of milliseconds to wait before turning the vibrator on.
-     *                         The next value - the number of milliseconds for which to keep the vibrator on before turning it off.
-     * @param number  repeat   Optional index into the pattern array at which to start repeating (will repeat until canceled),
-     *                         or -1 for no repetition (default).
-     * @deprecated
-     */
-    vibrateWithPattern(pattern: number[], repeat: number): void;
-    /**
-     * Immediately cancels any currently running vibration.
-     * @deprecated
-     */
-    cancelVibration(): void;
-}
diff --git a/types/cordova-plugin-vibration/tsconfig.json b/types/cordova-plugin-vibration/tsconfig.json
deleted file mode 100644
index 679fc97d2d..0000000000
--- a/types/cordova-plugin-vibration/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova-plugin-vibration-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova-plugin-websql/tslint.json b/types/cordova-plugin-websql/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-websql/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-plugin-x-socialsharing/tslint.json b/types/cordova-plugin-x-socialsharing/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova-plugin-x-socialsharing/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova-universal-links-plugin/cordova-universal-links-plugin-tests.ts b/types/cordova-universal-links-plugin/cordova-universal-links-plugin-tests.ts
new file mode 100644
index 0000000000..1a6981b2e9
--- /dev/null
+++ b/types/cordova-universal-links-plugin/cordova-universal-links-plugin-tests.ts
@@ -0,0 +1,16 @@
+const newsEventname = 'openNewsListPage';
+universalLinks.subscribe(newsEventname, onNewsListPageRequested);
+
+function onNewsListPageRequested(eventData: universalLinks.EventData) {
+  alert('Did launch application with news link: ' + eventData.url);
+}
+
+universalLinks.unsubscribe('openNewsListPage');
+
+universalLinks.subscribe(null, onOtherLinkRequested);
+
+function onOtherLinkRequested(eventData: universalLinks.EventData) {
+  alert('Did launch application with other link: ' + eventData.url);
+}
+
+universalLinks.unsubscribe(null);
diff --git a/types/cordova-universal-links-plugin/index.d.ts b/types/cordova-universal-links-plugin/index.d.ts
new file mode 100644
index 0000000000..98217a1b0a
--- /dev/null
+++ b/types/cordova-universal-links-plugin/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for cordova-universal-links-plugin 1.2
+// Project: https://github.com/nordnet/cordova-universal-links-plugin#readme
+// Definitions by: David Broder-Rodgers <https://github.com/broder>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace universalLinks {
+    function subscribe(eventName: string | null, callback: (data: EventData) => void): void;
+    function unsubscribe(eventName: string | null): void;
+
+    interface EventData {
+        url: string;
+        scheme: string;
+        host: string;
+        path: string;
+        params: { [key: string]: string };
+        hash: string;
+    }
+}
diff --git a/types/cordova-universal-links-plugin/tsconfig.json b/types/cordova-universal-links-plugin/tsconfig.json
new file mode 100644
index 0000000000..69322a9265
--- /dev/null
+++ b/types/cordova-universal-links-plugin/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-universal-links-plugin-tests.ts"
+    ]
+}
diff --git a/types/sharp-timer/tslint.json b/types/cordova-universal-links-plugin/tslint.json
similarity index 100%
rename from types/sharp-timer/tslint.json
rename to types/cordova-universal-links-plugin/tslint.json
diff --git a/types/cordova.plugins.diagnostic/cordova.plugins.diagnostic-tests.ts b/types/cordova.plugins.diagnostic/cordova.plugins.diagnostic-tests.ts
deleted file mode 100644
index 35c1e03d58..0000000000
--- a/types/cordova.plugins.diagnostic/cordova.plugins.diagnostic-tests.ts
+++ /dev/null
@@ -1,584 +0,0 @@
-/// <reference types="cordova-plugin-device" />
-
-cordova.plugins.diagnostic.isLocationAvailable(function(available){
-    console.log("Location is " + (available ? "available" : "not available"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isWifiAvailable(function(available){
-    console.log("WiFi is " + (available ? "available" : "not available"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isCameraAvailable(function(available){
-    console.log("Camera is " + (available ? "available" : "not available"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isBluetoothAvailable(function(available){
-    console.log("Bluetooth is " + (available ? "available" : "not available"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.switchToLocationSettings();
-cordova.plugins.diagnostic.switchToMobileDataSettings();
-cordova.plugins.diagnostic.switchToBluetoothSettings();
-cordova.plugins.diagnostic.switchToWifiSettings();
-
-cordova.plugins.diagnostic.isWifiEnabled(function(enabled){
-    console.log("WiFi is " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.setWifiState(function(){
-        console.log("Wifi was enabled");
-    }, function(error){
-        console.error("The following error occurred: "+error);
-    }, true
-);
-
-cordova.plugins.diagnostic.setBluetoothState(function(){
-        console.log("Bluetooth was enabled");
-    }, function(error){
-        console.error("The following error occurred: "+error);
-    }, true
-);
-
-cordova.plugins.diagnostic.isLocationEnabled(function(enabled){
-    console.log("Location setting is " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isLocationAuthorized(function(enabled){
-    console.log("Location authorization is " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getLocationAuthorizationStatus(function(status){
-    switch(status){
-        case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-            console.log("Permission not requested");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.DENIED:
-            console.log("Permission denied");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-            console.log("Permission granted always");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.GRANTED_WHEN_IN_USE:
-            console.log("Permission granted only when in use");
-            break;
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestLocationAuthorization(function(status){
-    switch(status){
-        case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-            console.log("Permission not requested");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.DENIED:
-            console.log("Permission denied");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-            console.log("Permission granted always");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.GRANTED_WHEN_IN_USE:
-            console.log("Permission granted only when in use");
-            break;
-    }
-}, function(error){
-    console.error(error);
-}, cordova.plugins.diagnostic.locationAuthorizationMode.ALWAYS);
-
-cordova.plugins.diagnostic.isCameraPresent(function(present){
-    console.log("Camera is " + (present ? "present" : "absent"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isCameraAuthorized(function(authorized){
-    console.log("App is " + (authorized ? "authorized" : "denied") + " access to the camera");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getCameraAuthorizationStatus(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Camera use is authorized");
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestCameraAuthorization(function(status){
-    console.log("Authorization request for camera use was " + (status == cordova.plugins.diagnostic.permissionStatus.GRANTED ? "granted" : "denied"));
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isMicrophoneAuthorized(function(authorized){
-    console.log("App is " + (authorized ? "authorized" : "denied") + " access to the microphone");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getMicrophoneAuthorizationStatus(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Microphone use is authorized");
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestMicrophoneAuthorization(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Microphone use is authorized");
-    }
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isContactsAuthorized(function(authorized){
-    console.log("App is " + (authorized ? "authorized" : "denied") + " access to contacts");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getContactsAuthorizationStatus(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Contacts use is authorized");
-    }
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.requestContactsAuthorization(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Contacts use is authorized");
-    }
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isCalendarAuthorized(function(authorized){
-    console.log("App is " + (authorized ? "authorized" : "denied") + " access to calendar");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getCalendarAuthorizationStatus(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Calendar use is authorized");
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestCalendarAuthorization(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Calendar use is authorized");
-    }
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.switchToSettings(function(){
-    console.log("Successfully switched to Settings app");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getBluetoothState(function(state){
-    if(state === cordova.plugins.diagnostic.bluetoothState.POWERED_ON){
-        console.log("Bluetooth is able to connect");
-    }
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.registerBluetoothStateChangeHandler(function(state){
-    if(state === cordova.plugins.diagnostic.bluetoothState.POWERED_ON){
-        console.log("Bluetooth is able to connect");
-    }
-});
-
-cordova.plugins.diagnostic.registerLocationStateChangeHandler(function(state){
-    if((device.platform === "Android" && state !== cordova.plugins.diagnostic.locationMode.LOCATION_OFF)
-        || (device.platform === "iOS") && ( state === cordova.plugins.diagnostic.permissionStatus.GRANTED
-            || state === cordova.plugins.diagnostic.permissionStatus.GRANTED_WHEN_IN_USE
-        )){
-        console.log("Location is available");
-    }
-});
-
-cordova.plugins.diagnostic.getLocationMode(function(locationMode){
-    switch(locationMode){
-        case cordova.plugins.diagnostic.locationMode.HIGH_ACCURACY:
-            console.log("High accuracy");
-            break;
-        case cordova.plugins.diagnostic.locationMode.BATTERY_SAVING:
-            console.log("Battery saving");
-            break;
-        case cordova.plugins.diagnostic.locationMode.DEVICE_ONLY:
-            console.log("Device only");
-            break;
-        case cordova.plugins.diagnostic.locationMode.LOCATION_OFF:
-            console.log("Location off");
-            break;
-    }
-},function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isGpsLocationAvailable(function(available){
-    console.log("GPS location is " + (available ? "available" : "not available"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isGpsLocationEnabled(function(enabled){
-    console.log("GPS location is " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isNetworkLocationAvailable(function(available){
-    console.log("Network location is " + (available ? "available" : "not available"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isNetworkLocationEnabled(function(enabled){
-    console.log("Network location is " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getLocationMode(function(locationMode){
-    switch(locationMode){
-        case cordova.plugins.diagnostic.locationMode.HIGH_ACCURACY:
-            console.log("High accuracy");
-            break;
-        case cordova.plugins.diagnostic.locationMode.BATTERY_SAVING:
-            console.log("Battery saving");
-            break;
-        case cordova.plugins.diagnostic.locationMode.DEVICE_ONLY:
-            console.log("Device only");
-            break;
-        case cordova.plugins.diagnostic.locationMode.LOCATION_OFF:
-            console.log("Location off");
-            break;
-    }
-},function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getPermissionAuthorizationStatus(function(status){
-    switch(status){
-        case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-            console.log("Permission granted to use the camera");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-            console.log("Permission to use the camera has not been requested yet");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.DENIED:
-            console.log("Permission denied to use the camera - ask again?");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.DENIED_ALWAYS:
-            console.log("Permission permanently denied to use the camera - guess we won't be using it then!");
-            break;
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-}, cordova.plugins.diagnostic.permission.CAMERA);
-
-cordova.plugins.diagnostic.getPermissionsAuthorizationStatus(function(statuses){
-    for (var permission in statuses){
-        switch(statuses[permission]){
-            case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-                console.log("Permission granted to use "+permission);
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-                console.log("Permission to use "+permission+" has not been requested yet");
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.DENIED:
-                console.log("Permission denied to use "+permission+" - ask again?");
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.DENIED_ALWAYS:
-                console.log("Permission permanently denied to use "+permission+" - guess we won't be using it then!");
-                break;
-        }
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-},[
-    cordova.plugins.diagnostic.permission.ACCESS_FINE_LOCATION,
-    cordova.plugins.diagnostic.permission.ACCESS_COARSE_LOCATION
-]);
-
-cordova.plugins.diagnostic.requestRuntimePermission(function(status){
-    switch(status){
-        case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-            console.log("Permission granted to use the camera");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-            console.log("Permission to use the camera has not been requested yet");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.DENIED:
-            console.log("Permission denied to use the camera - ask again?");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.DENIED_ALWAYS:
-            console.log("Permission permanently denied to use the camera - guess we won't be using it then!");
-            break;
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-}, cordova.plugins.diagnostic.permission.CAMERA);
-
-cordova.plugins.diagnostic.requestRuntimePermissions(function(statuses){
-    for (var permission in statuses){
-        switch(statuses[permission]){
-            case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-                console.log("Permission granted to use "+permission);
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-                console.log("Permission to use "+permission+" has not been requested yet");
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.DENIED:
-                console.log("Permission denied to use "+permission+" - ask again?");
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.DENIED_ALWAYS:
-                console.log("Permission permanently denied to use "+permission+" - guess we won't be using it then!");
-                break;
-        }
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-},[
-    cordova.plugins.diagnostic.permission.ACCESS_FINE_LOCATION,
-    cordova.plugins.diagnostic.permission.ACCESS_COARSE_LOCATION
-]);
-
-if(!cordova.plugins.diagnostic.isRequestingPermission()){
-    console.log("Request some permissions");
-}else{
-    cordova.plugins.diagnostic.registerPermissionRequestCompleteHandler(function(statuses){
-        cordova.plugins.diagnostic.registerPermissionRequestCompleteHandler(null); // de-register handler after single call
-        console.log("Request some permissions");
-    });
-}
-
-function onPermissionRequestComplete(statuses:any){
-    console.info("Permission request complete");
-    for (var permission in statuses){
-        switch(statuses[permission]){
-            case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-                console.log("Permission granted to use "+permission);
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-                console.log("Permission to use "+permission+" has not been requested yet");
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.DENIED:
-                console.log("Permission denied to use "+permission);
-                break;
-            case cordova.plugins.diagnostic.permissionStatus.DENIED_ALWAYS:
-                console.log("Permission permanently denied to use "+permission);
-                break;
-        }
-    }
-    cordova.plugins.diagnostic.registerPermissionRequestCompleteHandler(null); // de-register handler
-}
-cordova.plugins.diagnostic.registerPermissionRequestCompleteHandler(onPermissionRequestComplete)
-
-cordova.plugins.diagnostic.isBluetoothEnabled(function(enabled){
-    console.log("Bluetooth is " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.hasBluetoothSupport(function(supported){
-    console.log("Bluetooth is " + (supported ? "supported" : "unsupported"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.hasBluetoothLESupport(function(supported){
-    console.log("Bluetooth LE is " + (supported ? "supported" : "unsupported"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.hasBluetoothLEPeripheralSupport(function(supported){
-    console.log("Bluetooth LE Peripheral Mode is " + (supported ? "supported" : "unsupported"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isCameraRollAuthorized(function(authorized){
-    console.log("App is " + (authorized ? "authorized" : "denied") + " access to the camera roll");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getCameraRollAuthorizationStatus(function(status){
-    switch(status){
-        case cordova.plugins.diagnostic.permissionStatus.NOT_REQUESTED:
-            console.log("Permission not requested");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.DENIED:
-            console.log("Permission denied");
-            break;
-        case cordova.plugins.diagnostic.permissionStatus.GRANTED:
-            console.log("Permission granted");
-            break;
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestCameraRollAuthorization(function(status){
-    console.log("Authorization request for camera roll was " + (status == cordova.plugins.diagnostic.permissionStatus.GRANTED ? "granted" : "denied"));
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isRemoteNotificationsEnabled(function(enabled){
-    console.log("Remote notifications are " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isRegisteredForRemoteNotifications(function(registered){
-    console.log("Device " + (registered ? "is" : "isn't") + " registered for remote notifications");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getRemoteNotificationTypes(function(types){
-    for(var type in types){
-        console.log(type + " is " + (types[type] ? "enabled" : "disabled"));
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isRemindersAuthorized(function(authorized){
-    console.log("App is " + (authorized ? "authorized" : "denied") + " access to reminders");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getRemindersAuthorizationStatus(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Reminders authorization allowed");
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestRemindersAuthorization(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Reminders authorization allowed");
-    }
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isBackgroundRefreshAuthorized(function(authorized){
-    console.log("App is " + (authorized ? "authorized" : "not authorized") + " to perform background refresh");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getBackgroundRefreshStatus(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("Background refresh is allowed");
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestBluetoothAuthorization(function(){
-    console.log("Bluetooth authorization requested");
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isMotionAvailable(function(available){
-    console.log("Motion tracking is " + (available ? "available" : "not available") + " on this device");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isMotionRequestOutcomeAvailable(function(available){
-    console.log("Motion tracking request outcome is " + (available ? "available" : "not available") + " on this device");
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestAndCheckMotionAuthorization(function(status){
-    console.log("Motion authorization is " +status);
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isExternalStorageAuthorized(function(authorized){
-    console.log("Location authorization is " + (authorized ? "authorized" : "unauthorized"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.getExternalStorageAuthorizationStatus(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("External storage authorization allowed");
-    }
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.requestExternalStorageAuthorization(function(status){
-    if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-        console.log("External storage authorization allowed");
-    }
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.getExternalSdCardDetails(function(details){
-    console.log("External SD card details: " + JSON.stringify(details));
-}, function(error){
-    console.error(error);
-});
-
-cordova.plugins.diagnostic.isNFCPresent(function(present){
-    console.log("NFC hardware is " + (present ? "present" : "absent"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isNFCEnabled(function(enabled){
-    console.log("NFC is " + (enabled ? "enabled" : "disabled"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.isNFCAvailable(function(available){
-    console.log("NFC is " + (available ? "available" : "not available"));
-}, function(error){
-    console.error("The following error occurred: "+error);
-});
-
-cordova.plugins.diagnostic.registerNFCStateChangeHandler(function(state){
-    if(state === cordova.plugins.diagnostic.NFCState.POWERED_ON){
-        console.log("NFC is ready to use");
-    }
-});
\ No newline at end of file
diff --git a/types/cordova.plugins.diagnostic/index.d.ts b/types/cordova.plugins.diagnostic/index.d.ts
deleted file mode 100644
index e9ad96deb2..0000000000
--- a/types/cordova.plugins.diagnostic/index.d.ts
+++ /dev/null
@@ -1,833 +0,0 @@
-// Type definitions for cordova.plugins.diagnostic v3.4.x
-// Project: https://github.com/dpa99c/cordova-diagnostic-plugin
-// Definitions by: Dave Alden <https://github.com/dpa99c>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="cordova" />
-
-/**
- * Checks whether device hardware features are enabled or available to the app, e.g. camera, GPS, wifi
- */
-interface Diagnostic {
-
-    /**
-     * ANDROID ONLY
-     * "Dangerous" permissions that need to be requested at run-time (Android 6.0/API 23 and above)
-     * See http://developer.android.com/guide/topics/security/permissions.html#perm-groups
-     * @type {Object}
-     */
-    permission?: any;
-
-    /**
-     * ANDROID ONLY
-     * Permission groups indicate which associated permissions will also be requested if a given permission is requested.
-     * See http://developer.android.com/guide/topics/security/permissions.html#perm-groups
-     * @type {Object}
-     */
-    permissionGroups?: any;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Constants for requesting and reporting the various permission states.
-     * @type {Object}
-     */
-    permissionStatus?: any;
-
-    /**
-     * iOS ONLY
-     * Location authorization mode
-     * @type {Object}
-     */
-    locationAuthorizationMode?: any;
-
-
-    /**
-     * ANDROID ONLY
-     * Constants for the various location modes on Android.
-     * @type {Object}
-     */
-    locationMode?: any;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Constants for the various Bluetooth hardware states.
-     * @type {Object}
-     */
-    bluetoothState?: any;
-
-
-    /**
-     * ANDROID ONLY
-     * Constants for the various NFC power states.
-     * @type {Object}
-     */
-    NFCState?: any;
-
-
-    /**
-     * Checks if app is able to access device location.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isLocationAvailable: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * Checks if Wifi is available.
-     * On iOS this returns true if the device is connected to a network by WiFi.
-     * On Android and Windows 10 Mobile this returns true if the WiFi setting is set to enabled, and is the same as isWifiEnabled()
-     * @param successCallback
-     * @param errorCallback
-     */
-    isWifiAvailable: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * Checks if camera is available.
-     * On Android & iOS this returns true if the device has a camera AND the application is authorized to use it.
-     * On Windows 10 Mobile this returns true if the device has a rear-facing camera.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isCameraAvailable: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * Checks if Bluetooth is available to the app.
-     * Returns true if the device has Bluetooth capabilities AND if Bluetooth setting is switched on (same on Android, iOS and Windows 10 Mobile)
-     * @param successCallback
-     * @param errorCallback
-     */
-    isBluetoothAvailable: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and WINDOWS ONLY
-     * Displays the device location settings to allow user to enable location services/change location mode.
-     */
-    switchToLocationSettings?: () => void;
-
-    /**
-     * ANDROID and WINDOWS ONLY
-     * Displays mobile settings to allow user to enable mobile data.
-     */
-    switchToMobileDataSettings?: () => void;
-
-    /**
-     * ANDROID and WINDOWS ONLY
-     * Displays Bluetooth settings to allow user to enable Bluetooth.
-     */
-    switchToBluetoothSettings?: () => void;
-
-    /**
-     * ANDROID and WINDOWS ONLY
-     * Displays WiFi settings to allow user to enable WiFi.
-     */
-    switchToWifiSettings?: () => void;
-
-    /**
-     * ANDROID and WINDOWS ONLY
-     * Returns true if the WiFi setting is set to enabled, and is the same as isWifiAvailable()
-     * @param successCallback
-     * @param errorCallback
-     */
-    isWifiEnabled?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and WINDOWS ONLY
-     * Enables/disables WiFi on the device.
-     * @param successCallback
-     * @param errorCallback
-     * @param state
-     */
-    setWifiState?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void,
-        state: boolean
-    ) => void;
-
-    /**
-     * ANDROID and WINDOWS ONLY
-     * Enables/disables Bluetooth on the device.
-     * @param successCallback
-     * @param errorCallback
-     * @param state
-     */
-    setBluetoothState?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void,
-        state: boolean
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Returns true if the device setting for location is on. 
-     * On Android this returns true if Location Mode is switched on. 
-     * On iOS this returns true if Location Services is switched on.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isLocationEnabled?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Checks if the application is authorized to use location.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isLocationAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Returns the location authorization status for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getLocationAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Requests location authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     * @param mode - (iOS-only / optional) location authorization mode specified as a locationAuthorizationMode constant. If not specified, defaults to WHEN_IN_USE.
-     */
-    requestLocationAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void,
-        mode?: string
-    ) => void;
-
-
-    /**
-     * ANDROID and iOS ONLY
-     * Checks if camera hardware is present on device.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isCameraPresent?: (
-        successCallback: (present: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Checks if the application is authorized to use the camera.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isCameraAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Returns the camera authorization status for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getCameraAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Requests camera authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestCameraAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Checks if the application is authorized to use the microphone.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isMicrophoneAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Returns the microphone authorization status for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getMicrophoneAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Requests microphone authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestMicrophoneAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Checks if the application is authorized to use contacts (address book).
-     * @param successCallback
-     * @param errorCallback
-     */
-    isContactsAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Returns the contacts authorization status for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getContactsAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Requests contacts authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestContactsAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Checks if the application is authorized to use the calendar.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isCalendarAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Returns the calendar authorization status for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getCalendarAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Requests calendar authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestCalendarAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Opens settings page for this app.
-     * On Android, this opens the "App Info" page in the Settings app.
-     * On iOS, this opens the app settings page in the Settings app. This works only on iOS 8+ - iOS 7 and below will invoke the errorCallback.
-     */
-    switchToSettings?: (
-        successCallback: () => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Returns the state of Bluetooth on the device.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getBluetoothState?: (
-        successCallback: (state: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Registers a function to be called when a change in Bluetooth state occurs. Pass in a falsey value to de-register the currently registered function.
-     * @param successCallback
-     */
-    registerBluetoothStateChangeHandler?: (
-        successCallback: (state: string) => void
-    ) => void;
-
-    /**
-     * ANDROID and iOS ONLY
-     * Registers a function to be called when a change in Location state occurs. Pass in a falsey value to de-register the currently registered function.
-     * On Android, this occurs when the Location Mode is changed.
-     * On iOS, this occurs when location authorization status is changed. This can be triggered either by the user's response to a location permission authorization dialog, by the user turning on/off Location Services, or by the user changing the Location authorization state specifically for your app.
-     * @param successCallback
-     */
-    registerLocationStateChangeHandler?: (
-        successCallback: (state: string) => void
-    ) => void;
-
-
-    /**
-     * ANDROID ONLY
-     * Checks if high-accuracy locations are available to the app from GPS hardware.
-     * Returns true if Location mode is enabled and is set to "Device only" or "High accuracy" AND if the app is authorised to use location.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isGpsLocationAvailable?: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the device location setting is set to return high-accuracy locations from GPS hardware.
-     * Returns true if Location mode is enabled and is set to either Device only or High accuracy
-     * @param successCallback
-     * @param errorCallback
-     */
-    isGpsLocationEnabled?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if low-accuracy locations are available to the app from network triangulation/WiFi access points.
-     * Returns true if Location mode is enabled and is set to "Battery saving" or "High accuracy" AND if the app is authorised to use location.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isNetworkLocationAvailable?: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the device location setting is set to return high-accuracy locations from GPS hardware.
-     * Returns true if Location mode is enabled and is set to either Battery saving or High accuracy
-     * @param successCallback
-     * @param errorCallback
-     */
-    isNetworkLocationEnabled?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Returns the current location mode setting for the device.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getLocationMode?: (
-        successCallback: (mode: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Returns the current authorisation status for a given permission.
-     * @param successCallback
-     * @param errorCallback
-     * @param permission
-     */
-    getPermissionAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void,
-        permission: string
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Returns the current authorisation status for multiple permissions.
-     * @param successCallback
-     * @param errorCallback
-     * @param permissions
-     */
-    getPermissionsAuthorizationStatus?: (
-        successCallback: (status: string[]) => void,
-        errorCallback: (error: string) => void,
-        permissions: string[]
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Requests app to be granted authorisation for a runtime permission.
-     * @param successCallback
-     * @param errorCallback
-     * @param permission
-     */
-    requestRuntimePermission?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void,
-        permission: string
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Requests app to be granted authorisation for multiple runtime permissions.
-     * @param successCallback
-     * @param errorCallback
-     * @param permissions
-     */
-    requestRuntimePermissions?: (
-        successCallback: (status: string[]) => void,
-        errorCallback: (error: string) => void,
-        permissions: string[]
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Indicates if the plugin is currently requesting a runtime permission via the native API.
-     */
-    isRequestingPermission?: () => boolean;
-
-    /**
-     * ANDROID ONLY
-     * Registers a function to be called when a runtime permission request has completed. Pass in a falsey value to de-register the currently registered function.
-     * @param successCallback
-     */
-    registerPermissionRequestCompleteHandler?: (
-        successCallback: (statuses: any) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the device setting for Bluetooth is switched on.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isBluetoothEnabled?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the device has Bluetooth capabilities.
-     * @param successCallback
-     * @param errorCallback
-     */
-    hasBluetoothSupport?: (
-        successCallback: (supported: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the device has Bluetooth Low Energy (LE) capabilities.
-     * @param successCallback
-     * @param errorCallback
-     */
-    hasBluetoothLESupport?: (
-        successCallback: (supported: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the device supports Bluetooth Low Energy (LE) Peripheral mode.
-     * @param successCallback
-     * @param errorCallback
-     */
-    hasBluetoothLEPeripheralSupport?: (
-        successCallback: (supported: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the application is authorized to use external storage.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isExternalStorageAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Returns the authorisation status for runtime permission to use the external storage.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getExternalStorageAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Requests authorisation for runtime permission to use the external storage.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestExternalStorageAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Returns details of external SD card(s): absolute path, is writable, free space
-     * @param successCallback
-     * @param errorCallback
-     */
-    getExternalSdCardDetails?: (
-        successCallback: (status: any) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if NFC hardware is present on device.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isNFCPresent?: (
-        successCallback: (present: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Checks if the device setting for NFC is switched on.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isNFCEnabled?: (
-        successCallback: (present: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     *  Checks if NFC is available to the app.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isNFCAvailable?: (
-        successCallback: (present: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * ANDROID ONLY
-     * Registers a function to be called when a change in NFC state occurs.
-     * Pass in a falsey value to de-register the currently registered function.
-     * @param successCallback
-     */
-    registerNFCStateChangeHandler?: (
-        successCallback: (state: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Checks if the application is authorized to use the Camera Roll in Photos app.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isCameraRollAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Returns the authorization status for the application to use the Camera Roll in Photos app.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getCameraRollAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Requests camera roll authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestCameraRollAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Checks if remote (push) notifications are enabled.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isRemoteNotificationsEnabled?: (
-        successCallback: (enabled: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Indicates if the app is registered for remote (push) notifications on the device.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isRegisteredForRemoteNotifications?: (
-        successCallback: (registered: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Indicates the current setting of notification types for the app in the Settings app.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getRemoteNotificationTypes?: (
-        successCallback: (types: any) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Checks if the application is authorized to use reminders.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isRemindersAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Returns the reminders authorization status for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getRemindersAuthorizationStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Requests reminders authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestRemindersAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Checks if the application is authorized for background refresh.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isBackgroundRefreshAuthorized?: (
-        successCallback: (authorized: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Returns the background refresh authorization status for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    getBackgroundRefreshStatus?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Requests Bluetooth authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestBluetoothAuthorization?: (
-        successCallback: () => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Checks if motion tracking is available on the current device.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isMotionAvailable?: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Checks if it's possible to determine the outcome of a motion authorization request on the current device.
-     * @param successCallback
-     * @param errorCallback
-     */
-    isMotionRequestOutcomeAvailable?: (
-        successCallback: (available: boolean) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-
-    /**
-     * iOS ONLY
-     * Requests and checks motion authorization for the application.
-     * @param successCallback
-     * @param errorCallback
-     */
-    requestAndCheckMotionAuthorization?: (
-        successCallback: (status: string) => void,
-        errorCallback: (error: string) => void
-    ) => void;
-}
-
-interface CordovaPlugins {
-    diagnostic: Diagnostic
-}
\ No newline at end of file
diff --git a/types/cordova.plugins.diagnostic/tsconfig.json b/types/cordova.plugins.diagnostic/tsconfig.json
deleted file mode 100644
index bb2cdc4dfd..0000000000
--- a/types/cordova.plugins.diagnostic/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cordova.plugins.diagnostic-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cordova/tslint.json b/types/cordova/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordova_app_version_plugin/tslint.json b/types/cordova_app_version_plugin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordova_app_version_plugin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cordovarduino/tslint.json b/types/cordovarduino/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cordovarduino/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/core-decorators/core-decorators-tests.ts b/types/core-decorators/core-decorators-tests.ts
deleted file mode 100644
index c617de5fcc..0000000000
--- a/types/core-decorators/core-decorators-tests.ts
+++ /dev/null
@@ -1,295 +0,0 @@
-//
-// @autobind
-//
-
-import { autobind } from 'core-decorators';
-
-@autobind
-class Person {
-    @autobind
-    getPerson() {
-        return this;
-    }
-
-    getPersonAgain() {
-        return this;
-    }
-}
-
-const person = new Person();
-const { getPerson, getPersonAgain } = person;
-
-getPerson() === person;
-
-getPersonAgain() === person;
-
-//
-// @readonly
-//
-
-import { readonly } from 'core-decorators';
-
-class Meal {
-    @readonly
-    entree = 'steak';
-}
-
-const dinner = new Meal();
-dinner.entree = 'salmon';
-
-//
-// @override
-//
-
-import { override } from 'core-decorators';
-
-class Parent {
-    speak(first: string, second: string) {}
-}
-
-class Child extends Parent {
-    @override
-    speak() {}
-    // SyntaxError: Child#speak() does not properly override Parent#speak(first, second)
-}
-
-// or
-
-class Child2 extends Parent {
-    @override
-    speaks() {}
-    // SyntaxError: No descriptor matching Child#speaks() was found on the prototype chain.
-    //
-    //   Did you mean "speak"?
-}
-
-//
-// @deprecate (alias: @deprecated)
-//
-
-import { deprecate, deprecated } from 'core-decorators';
-
-class Person2 {
-    @deprecate
-    facepalm() {}
-
-    @deprecate('We stopped facepalming')
-    facepalmHard() {}
-
-    @deprecate('We stopped facepalming', { url: 'http://knowyourmeme.com/memes/facepalm' })
-    facepalmHarder() {}
-}
-
-const person2 = new Person2();
-
-person2.facepalm();
-// DEPRECATION Person#facepalm: This function will be removed in future versions.
-
-person2.facepalmHard();
-// DEPRECATION Person#facepalmHard: We stopped facepalming
-
-person2.facepalmHarder();
-// DEPRECATION Person#facepalmHarder: We stopped facepalming
-//
-//     See http://knowyourmeme.com/memes/facepalm for more details.
-//
-
-//
-// @debounce
-//
-
-import { debounce } from 'core-decorators';
-
-class Editor {
-    content = '';
-
-    @debounce(500)
-    updateContent(content: string) {
-        this.content = content;
-    }
-}
-
-//
-// @throttle
-//
-
-import { throttle } from 'core-decorators';
-
-class Editor2 {
-    content = '';
-
-    @throttle(500, {leading: false})
-    updateContent(content: string) {
-        this.content = content;
-    }
-}
-
-//
-// @suppressWarnings
-//
-
-import { suppressWarnings } from 'core-decorators';
-
-class Person3 {
-    @deprecated
-    facepalm() {}
-
-    @suppressWarnings
-    facepalmWithoutWarning() {
-        this.facepalm();
-    }
-}
-
-const person3 = new Person3();
-
-person3.facepalmWithoutWarning();
-// no warning is logged
-
-//
-// @nonenumerable
-//
-
-import { nonenumerable } from 'core-decorators';
-
-class Meal2 {
-    entree = 'steak';
-
-    @nonenumerable
-    cost = 4.44;
-}
-
-const dinner2 = new Meal2();
-for (const key in dinner2) {
-    key;
-    // "entree" only, not "cost"
-}
-
-Object.keys(dinner2);
-// ["entree"]
-
-//
-// @nonconfigurable
-//
-
-import { nonconfigurable } from 'core-decorators';
-
-class Meal3 {
-    @nonconfigurable
-    entree = 'steak';
-}
-
-const dinner3 = new Meal3();
-
-Object.defineProperty(dinner3, 'entree', {
-    enumerable: false
-});
-// Cannot redefine property: entree
-
-//
-// @decorate
-//
-
-declare function memoize<T extends Function>(func: T): T;
-import { decorate } from 'core-decorators';
-
-let count = 0;
-
-class Task {
-    @decorate(memoize)
-    doSomethingExpensive(data: any) {
-        count++;
-        // something expensive;
-        return data;
-    }
-}
-
-const task = new Task();
-const data = [1, 2, 3];
-
-task.doSomethingExpensive(data);
-task.doSomethingExpensive(data);
-
-count === 1;
-// true
-
-//
-// @lazyInitialize
-//
-
-import { lazyInitialize } from 'core-decorators';
-
-function createHugeBuffer() {
-    console.log('huge buffer created');
-    return new Array(1000000);
-}
-
-class Editor3 {
-    @lazyInitialize
-    hugeBuffer = createHugeBuffer();
-}
-
-const editor = new Editor3();
-// createHugeBuffer() has not been called yet
-
-editor.hugeBuffer;
-// logs 'huge buffer created', now it has been called
-
-editor.hugeBuffer;
-// already initialized and equals our buffer, so
-// createHugeBuffer() is not called again
-
-// TODO: For @mixin, I don't know how we can make it work for TypeScript...
-//
-// @mixin (alias: @mixins)
-//
-
-import { mixin } from 'core-decorators';
-
-const SingerMixin = {
-    sing(sound: string) {
-        alert(sound);
-    }
-};
-
-const FlyMixin = {
-    // All types of property descriptors are supported
-    get speed(): number { return 42; },
-    fly() {},
-    land() {}
-};
-
-@mixin(SingerMixin, FlyMixin)
-class Bird {
-    singMatingCall() {
-        // TODO: For @mixin, I don't know how we can make it work for TypeScript...
-        // this.sing('tweet tweet');
-    }
-}
-
-const bird = new Bird();
-bird.singMatingCall();
-// alerts "tweet tweet"
-
-//
-// @time
-//
-
-import { time } from 'core-decorators';
-
-const myConsole = {
-    time(label: string) { /* custom time() method */ },
-    timeEnd(label: string) { /* custom timeEnd method */ },
-    log(str: any) { /* custom log method */ }
-};
-
-class Bird2 {
-    @time('sing')
-    sing() {}
-
-    @time('sing2', myConsole)
-    sing2() {}
-}
-
-const bird2 = new Bird2();
-bird2.sing(); // console.time label will be 'sing-0'
-bird2.sing(); // console.time label will be 'sing-1'
diff --git a/types/core-decorators/index.d.ts b/types/core-decorators/index.d.ts
deleted file mode 100644
index 4af9fd5fa5..0000000000
--- a/types/core-decorators/index.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for core-decorators.js 0.10
-// Project: https://github.com/jayphelps/core-decorators.js
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-export interface ClassDecorator {
-    <TFunction extends Function>(target: TFunction): TFunction | void;
-}
-
-export interface ParameterDecorator {
-    (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
-}
-
-export interface PropertyDecorator {
-    (target: Object, propertyKey: string | symbol): void;
-}
-
-export interface MethodDecorator {
-    <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
-}
-
-export interface PropertyOrMethodDecorator extends MethodDecorator, PropertyDecorator {
-    (target: Object, propertyKey: string | symbol): void;
-}
-
-export interface Deprecate extends MethodDecorator {
-    (message?: string, option?: DeprecateOption): MethodDecorator;
-}
-
-export interface DeprecateOption {
-    url: string;
-}
-
-export interface ThrottleOptions {
-    /** allows to trigger function on the leading. */
-    leading?: boolean;
-    /** allows to trigger function on the trailing edge of the wait interval. */
-    trailing?: boolean;
-}
-
-export interface Console {
-    log(message?: any, ...optionalParams: any[]): void;
-    time(timerName?: string): void;
-    timeEnd(timerName?: string): void;
-}
-
-/**
- * Forces invocations of this function to always have this refer to the class instance,
- * even if the function is passed around or would otherwise lose its this context. e.g. var fn = context.method;
- */
-export const autobind: Function;
-/**
- * Marks a property or method as not being writable.
- */
-export const readonly: PropertyOrMethodDecorator;
-/**
- * Checks that the marked method indeed overrides a function with the same signature somewhere on the prototype chain.
- */
-export const override: MethodDecorator;
-/**
- * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
- */
-export const deprecate: Deprecate;
-/**
- * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
- */
-export const deprecated: Deprecate;
-/**
- * Creates a new debounced function which will be invoked after wait milliseconds since the time it was invoked. Default timeout is 300 ms.
- */
-export function debounce(wait: number): MethodDecorator;
-/**
- * Creates a new throttled function which will be invoked in every wait milliseconds. Default timeout is 300 ms.
- */
-export function throttle(wait: number, options?: ThrottleOptions): MethodDecorator;
-/**
- * Suppresses any JavaScript console.warn() call while the decorated function is called. (i.e. on the stack)
- */
-export const suppressWarnings: MethodDecorator;
-/**
- * Marks a property or method as not being enumerable.
- */
-export const nonenumerable: PropertyOrMethodDecorator;
-/**
- * Marks a property or method as not being writable.
- */
-export const nonconfigurable: PropertyOrMethodDecorator;
-/**
- * Initial implementation included, likely slow. WIP.
- */
-export const memoize: MethodDecorator;
-/**
- * Immediately applies the provided function and arguments to the method, allowing you to wrap methods with arbitrary helpers like those provided by lodash.
- * The first argument is the function to apply, all further arguments will be passed to that decorating function.
- */
-export function decorate(func: Function, ...args: any[]): MethodDecorator;
-/**
- * Prevents a property initializer from running until the decorated property is actually looked up.
- * Useful to prevent excess allocations that might otherwise not be used, but be careful not to over-optimize things.
- */
-export const lazyInitialize: PropertyDecorator;
-/**
- * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
- * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
- */
-export function mixin(...mixins: any[]): ClassDecorator;
-/**
- * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
- * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
- */
-export function mixins(...mixins: any[]): ClassDecorator;
-/**
- * Uses console.time and console.timeEnd to provide function timings with a unique label whose default prefix is ClassName.method. Supply a first argument to override the prefix:
- */
-export function time(label: string, console?: Console): MethodDecorator;
diff --git a/types/core-decorators/tsconfig.json b/types/core-decorators/tsconfig.json
deleted file mode 100644
index af573cbe86..0000000000
--- a/types/core-decorators/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "experimentalDecorators": true,
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "core-decorators-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/core-decorators/tslint.json b/types/core-decorators/tslint.json
deleted file mode 100644
index bade6d465f..0000000000
--- a/types/core-decorators/tslint.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODOs
-        "callable-types": false,
-        "ban-types": false,
-        "no-duplicate-imports": false
-    }
-}
diff --git a/types/core-js/index.d.ts b/types/core-js/index.d.ts
index 5fb9400d75..5916ad55c1 100644
--- a/types/core-js/index.d.ts
+++ b/types/core-js/index.d.ts
@@ -58,6 +58,8 @@ declare function $for<T>(iterable: Iterable<T>): $for<T>;
 
 interface String {
     at(index: number): string;
+    padStart(length: number, fillStr?: string): string;
+    padEnd(length: number, fillStr?: string): string;
 }
 
 interface Object {
diff --git a/types/cors/cors-tests.ts b/types/cors/cors-tests.ts
index f43b9ee153..83975549c7 100644
--- a/types/cors/cors-tests.ts
+++ b/types/cors/cors-tests.ts
@@ -2,7 +2,7 @@
 import express = require('express');
 import cors = require('cors');
 
-var app = express();
+const app = express();
 app.use(cors());
 app.use(cors({
     maxAge: 100,
@@ -28,6 +28,9 @@ app.use(cors({
 app.use(cors({
     origin: /example\.com$/
 }));
+app.use(cors({
+    origin: [/example\.com$/, 'http://example.com']
+}));
 app.use(cors({
     origin: ['http://example.com', 'http://fakeurl.com']
 }));
@@ -37,7 +40,7 @@ app.use(cors({
 app.use(cors({
     origin: (requestOrigin, cb) => {
         try {
-            var allow = requestOrigin.indexOf('.edu') !== -1;
+            const allow = requestOrigin.indexOf('.edu') !== -1;
             cb(null, allow);
         } catch (err) {
             cb(err);
diff --git a/types/cors/index.d.ts b/types/cors/index.d.ts
index 6c1fc3e4c3..ab8ba2ed2d 100644
--- a/types/cors/index.d.ts
+++ b/types/cors/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/troygoode/node-cors/
 // Definitions by: Mihhail Lapushkin <https://github.com/mihhail-lapushkin/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
@@ -15,7 +16,7 @@ type CustomOrigin = (
 
 declare namespace e {
     interface CorsOptions {
-        origin?: boolean | string | RegExp | string[] | RegExp[] | CustomOrigin;
+        origin?: boolean | string | RegExp | (string | RegExp)[] | CustomOrigin;
         methods?: string | string[];
         allowedHeaders?: string | string[];
         exposedHeaders?: string | string[];
diff --git a/types/cors/tslint.json b/types/cors/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cors/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cote/package.json b/types/cote/package.json
index 951fb5721e..43f5ba51cf 100644
--- a/types/cote/package.json
+++ b/types/cote/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "eventemitter2": "^4.1.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/couchbase/tslint.json b/types/couchbase/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/couchbase/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/countdown/tslint.json b/types/countdown/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/countdown/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/coverup/coverup-tests.ts b/types/coverup/coverup-tests.ts
new file mode 100644
index 0000000000..dc9ab7022f
--- /dev/null
+++ b/types/coverup/coverup-tests.ts
@@ -0,0 +1,38 @@
+import coverup = require("coverup");
+
+coverup("4242-4242-4242-4242"); // $ExpectType string
+// => *******************
+
+coverup("4242-4242-4242-4242", { char: "%" }); // $ExpectType string
+// => %%%%%%%%%%%%%%%%%%%
+
+coverup("4242-4242-4242-4242", { keepSymbols: true }); // $ExpectType string
+// => ****-****-****-****
+
+coverup("4242-4242-4242-4242", { keepLeft: 1, keepRight: 1, compactTo: 4 }); // $ExpectType string
+// => 4****2
+
+coverup("4242-4242-4242-4242", { keepLeft: 4 }); // $ExpectType string
+// => 4242***************
+
+coverup("4242-4242-4242-4242", { keepRight: 4 }); // $ExpectType string
+// => ***************4242
+
+let options: coverup.Options = {
+    char: "x",
+    keepLeft: 3,
+    keepRight: 3,
+};
+
+coverup("4242-4242-4242-4242", options); // $ExpectType string
+// => 424xxxxxxxxxxxxx242
+
+options = {
+    keepLeft: 1,
+    keepRight: 1,
+    compactTo: 4,
+    keepSymbols: true,
+};
+
+coverup("4242-4242-4242-4242", options); // $ExpectError "you cannot define both compactTo and keepSymbols"
+// => Error: you cannot define both compactTo and keepSymbols
diff --git a/types/coverup/index.d.ts b/types/coverup/index.d.ts
new file mode 100644
index 0000000000..d813984799
--- /dev/null
+++ b/types/coverup/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for coverup 0.1
+// Project: https://github.com/jsonmaur/coverup
+// Definitions by: Vadim Belorussov <https://github.com/bevalorous>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace Coverup;
+
+export = coverup;
+
+declare function coverup(value: string, options?: coverup.Options): string;
+
+declare namespace coverup {
+    interface Options {
+        char?: string;
+        keepLeft?: number;
+        keepRight?: number;
+        compactTo?: number;
+        keepSymbols?: boolean;
+    }
+}
diff --git a/types/coverup/tsconfig.json b/types/coverup/tsconfig.json
new file mode 100644
index 0000000000..6102ad61b3
--- /dev/null
+++ b/types/coverup/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "coverup-tests.ts"
+    ]
+}
diff --git a/types/coverup/tslint.json b/types/coverup/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/coverup/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cpx/cpx-tests.ts b/types/cpx/cpx-tests.ts
new file mode 100644
index 0000000000..dc92643fcc
--- /dev/null
+++ b/types/cpx/cpx-tests.ts
@@ -0,0 +1,21 @@
+import * as cpx from "cpx";
+
+const SRC = "**/.js";
+const DEST = ".tmp/";
+const callback = (error: Error | null) => { };
+const ASYNC_OPTIONS: cpx.AsyncOptions = { includeEmptyDirs: true };
+const SYNC_OPTIONS: cpx.SyncOptions = { preserve: true };
+const WATCH_OPTIONS: cpx.WatchOptions = { initialCopy: true };
+
+cpx.copy(SRC, DEST);
+cpx.copy(SRC, DEST, callback);
+cpx.copy(SRC, DEST, ASYNC_OPTIONS);
+cpx.copy(SRC, DEST, ASYNC_OPTIONS, callback);
+
+cpx.copySync(SRC, DEST, SYNC_OPTIONS);
+cpx.copySync(SRC, DEST);
+
+const watch = cpx.watch(SRC, DEST, WATCH_OPTIONS);
+watch.close();
+watch.open();
+watch.on("copy", (x) => x);
diff --git a/types/cpx/index.d.ts b/types/cpx/index.d.ts
new file mode 100644
index 0000000000..9a04cf1242
--- /dev/null
+++ b/types/cpx/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for cpx 1.5
+// Project: https://github.com/mysticatea/cpx
+// Definitions by: Alan Agius <https://github.com/alan-agius4>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+
+export interface SyncOptions {
+    /** remove files that copied on past before copy. */
+    clean?: boolean;
+    /** Follow symbolic links when copying from them. */
+    dereference?: boolean;
+    /** Copy empty directories which is matched with the glob. */
+    includeEmptyDirs?: boolean;
+    /** Preserve UID, GID, ATIME, and MTIME of files. */
+    preserve?: boolean;
+    /** Do not overwrite files on destination if the source file is older. */
+    update?: boolean;
+}
+
+export interface AsyncOptions extends SyncOptions {
+    /** Function that creates a `stream.Transform` object to transform each copying file. */
+    transform?(filepath: string): stream.Transform[];
+}
+
+export interface WatchOptions extends AsyncOptions, SyncOptions {
+    /** Flag to not copy at the initial time of watch. */
+    initialCopy?: boolean;
+}
+
+export class Watcher extends NodeJS.EventEmitter {
+    constructor(options: WatchOptions);
+    open(): void;
+    close(): void;
+}
+
+export function copy(source: string, dest: string, options?: AsyncOptions, callback?: (error: Error | null) => void): void;
+export function copy(source: string, dest: string, callback?: (error: Error | null) => void): void;
+
+export function copySync(source: string, dest: string, options?: SyncOptions): void;
+
+export function watch(source: string, dest: string, options?: WatchOptions): Watcher;
diff --git a/types/cpx/tsconfig.json b/types/cpx/tsconfig.json
new file mode 100644
index 0000000000..d22546d432
--- /dev/null
+++ b/types/cpx/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cpx-tests.ts"
+    ]
+}
diff --git a/types/cpx/tslint.json b/types/cpx/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cpx/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cqrs-domain/cqrs-domain-tests.ts b/types/cqrs-domain/cqrs-domain-tests.ts
new file mode 100644
index 0000000000..9276ab18a4
--- /dev/null
+++ b/types/cqrs-domain/cqrs-domain-tests.ts
@@ -0,0 +1,32 @@
+import createDomain = require("cqrs-domain");
+
+const domain = createDomain({
+	domainPath: "/domain",
+	eventStore: {
+		type: "mongodb",
+		dbName: "db1"
+	}
+});
+
+domain.defineCommand({
+	id: "id",
+	name: "command",
+	aggregateId: "aggregate.id",
+	aggregate: "aggregate.name",
+	payload: "payload",
+	revision: "revision"
+});
+
+domain.defineEvent({
+	correlationId: "commandId",
+	id: "id",
+	name: "event",
+	context: "context.name",
+	aggregateId: "aggregate.id",
+	aggregate: 'aggregate.name',
+	payload: "payload",
+	revision: "revision",
+	version: "version",
+	meta: "meta",
+	commitStamp: "occurredAt"
+});
diff --git a/types/cqrs-domain/index.d.ts b/types/cqrs-domain/index.d.ts
new file mode 100644
index 0000000000..f826b45ffd
--- /dev/null
+++ b/types/cqrs-domain/index.d.ts
@@ -0,0 +1,703 @@
+// Type definitions for cqrs-domain 2.10
+// Project: https://github.com/adrai/node-cqrs-domain
+// Definitions by: Steven Weiß <https://github.com/blissi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Domain {
+    // region AggregateModel and Command
+
+    interface AggregateModel {
+        id: string;
+        attributes: any;
+        uncommittedEvents: any[];
+
+        apply(event: any, data?: any, version?: number): void;
+
+        /**
+         * Sets attributes for the aggregate.
+         *
+         * @example:
+         *     aggregate.set('firstname', 'Jack');
+         *     // or
+         *     aggregate.set({
+         *          firstname: 'Jack',
+         *          lastname: 'X-Man'
+         *     });
+         */
+        set(attribute: any, value?: any): void;
+
+        /**
+         * Gets an attribute of the vm.
+         * @param attr The attribute name.
+         * @return The result value.
+         *
+         * @example:
+         *     aggregate.get('firstname'); // returns 'Jack'
+         */
+        get(attr: string): any;
+
+        /**
+         * Returns `true` if the attribute contains a value that is not null
+         * or undefined.
+         * @param attr The attribute name.
+         * @return The result value.
+         *
+         * @example:
+         *     aggregate.has('firstname'); // returns true or false
+         */
+        has(attr: string): boolean;
+
+        /**
+         * Resets the attributes for the aggregate.
+         */
+        reset(data: any): void;
+
+        /**
+         * Marks this aggregate as destroyed.
+         */
+        destroy(): void;
+
+        /**
+         * Returns true if this aggregate is destroyed.
+         */
+        isDestroyed(): boolean;
+
+        /**
+         * Sets the revision for this aggregate.
+         * @param streamInfo The stream info.
+         * @param rev        The revision number.
+         */
+        setRevision(streamInfo: any, rev: number): void;
+
+        /**
+         * Returns the revision of this aggregate.
+         * @param streamInfo The stream info.
+         */
+        getRevision(streamInfo: any): number;
+
+        /**
+         * Returns all uncommitted events.
+         */
+        getUncommittedEvents(): any[];
+
+        /**
+         * Adds/Saves an uncommitted event.
+         * @param evt The event object.
+         */
+        addUncommittedEvent(evt: any): void;
+
+        /**
+         * Clears the internal uncomitted event list.
+         */
+        clearUncommittedEvents(): void;
+
+        /**
+         * The toJSON function will be called when JSON.stringify().
+         * @return A clean Javascript object containing all attributes.
+         */
+        toJSON(): any;
+    }
+
+    interface Command {
+        id: string;
+    }
+
+    // endregion
+
+    // region defineContext
+
+    interface DefineContextOptions {
+        /**
+         * optional, default is the directory name
+         */
+        name?: string;
+    }
+
+    function defineContext(options: DefineAggregateOptions): void;
+
+    // endregion
+
+    // region defineAggregate
+
+    interface DefineAggregateOptions {
+        /**
+         * optional, default is last part of path name
+         */
+        name?: string;
+
+        /**
+         * optional, default 0
+         */
+        version?: number;
+
+        /**
+         * optional, default ''
+         */
+        defaultCommandPayload?: string;
+
+        /**
+         * optional, default ''
+         */
+        defaultEventPayload?: string;
+
+        /**
+         * optional, default ''
+         */
+        defaultPreConditionPayload?: string;
+
+        /**
+         * optional, default false
+         * by skipping the history, only the last event will be loaded and defaultly not applyed (just to ensure the revision number increment)
+         */
+        skipHistory?: boolean;
+
+        /**
+         * optional, default false
+         * only optionally needed when skipHistory is set to true, only the last event will be loaded and applyed
+         */
+        applyLastEvent?: boolean;
+
+        /**
+         * optional, default false
+         * will publish the events but will not commit them to the eventstore
+         */
+        disablePersistence?: boolean;
+    }
+
+    /**
+     * @param loadingTime is the loading time in ms of the eventstore data
+     * @param events are all loaded events in an array
+     * @param aggregateData represents the aggregateData after applying the resulting events
+     */
+    type defineSnapshotNeedHandler = (loadingTime: number, events: any[], aggregateData: any) => boolean;
+
+    interface AggregateVersion {
+        version: number;
+    }
+
+    interface DefineAggregateResult {
+        /**
+         * optionally, define snapshot need algorithm...
+         */
+        defineSnapshotNeed(cb: defineSnapshotNeedHandler): DefineAggregateResult;
+
+        /**
+         * optionally, define if snapshot should be ignored
+         * if true, the whole event stream will be loaded
+         */
+        defineIgnoreSnapshot(version: AggregateVersion, cb?: ((data: any) => boolean) |
+            boolean): DefineAggregateResult;
+
+        /**
+         * optionally, define conversion algorithm for older snapshots
+         * always convert directly to newest version...
+         * when loaded a snapshot and it's an older snapshot, a new snapshot with same revision but with newer aggregate version will be created
+         */
+        defineSnapshotConversion(version: AggregateVersion, cb: (data: any, aggregate: AggregateModel) => void): DefineAggregateResult;
+
+        /**
+         * optionally, define idGenerator function for new aggregate ids
+         */
+        defineAggregateIdGenerator(cb: (() => string) |
+            ((callback: generateIdCallback) => string)): DefineAggregateResult;
+
+        /**
+         * optionally, define idGenerator function for new aggregate ids that are command aware
+         * if you define it that way, the normal defineAggregateIdGenerator function will be replaced
+         */
+        defineCommandAwareAggregateIdGenerator(cb: (cmd: Command, callback?: generateIdCallback) => string): DefineAggregateResult;
+    }
+
+    function defineAggregate(options: DefineAggregateOptions, initializationData?: any): DefineAggregateResult;
+
+    // endregion
+
+    // region extendValidator
+
+    function extendValidator(cb: (validator: any) => void): void;
+
+    // endregion
+
+    // region definePreCondition
+
+    interface DefinePreLoadConditionOptions {
+        /**
+         * the command name
+         * optional, default is file name without extension,
+         * if name is '' it will handle all commands that matches the appropriate aggregate
+         * if name is an array of strings it will handle all commands that matches the appropriate name
+         */
+        name?: string;
+
+        /**
+         * optional, default 0
+         */
+        version?: number;
+
+        /**
+         * optional, if not defined it will use what is defined as default in aggregate or pass the whole command
+         */
+        payload?: string;
+
+        /**
+         * optional
+         */
+        description?: string;
+
+        /**
+         * optional, default Infinity, all pre-conditions will be sorted by this value
+         */
+        priority?: number;
+    }
+
+    /**
+     * @param data is the command data
+     * @callback callback is optional, if not defined as function argument you can throw errors or return errors here (sync way)
+     */
+    type preLoadConditionHandler = (data: any, callback?: (err: string | Error) => string | Error) => void | string | Error;
+
+    function definePreLoadCondition(options: DefinePreLoadConditionOptions, handler: preLoadConditionHandler): void;
+
+    // endregion
+
+    // region definePreCondition
+
+    interface DefinePreConditionOptions {
+        /**
+         * the command name
+         * optional, default is file name without extension,
+         * if name is '' it will handle all commands that matches the appropriate aggregate
+         * if name is an array of strings it will handle all commands that matches the appropriate name
+         */
+        name?: string;
+
+        /**
+         * optional, default 0
+         */
+        version?: number;
+
+        /**
+         * optional, if not defined it will use what is defined as default in aggregate or pass the whole command
+         */
+        payload?: string;
+
+        /**
+         * optional
+         */
+        description?: string;
+
+        /**
+         * optional, default Infinity, all pre-conditions will be sorted by this value
+         */
+        priority?: number;
+    }
+
+    /**
+     * @param data is the command data
+     * @param aggregate is the aggregate object
+     * @callback callback is optional, if not defined as function argument you can throw errors or return errors here (sync way)
+     */
+    type preConditionHandler = (data: any, aggregate: AggregateModel, callback?: (err: string | Error) => string | Error) => void | string | Error;
+
+    function definePreCondition(options: DefinePreConditionOptions, handler: preConditionHandler): void;
+
+    // endregion
+
+    // region defineCommand
+
+    interface DefineCommandOptions {
+        name?: string;
+        version?: number;
+        payload?: string;
+        existing?: boolean;
+    }
+
+    type commandHandler = (data: any, aggregate: AggregateModel) => void;
+    type defineEventStreamsToLoadHandler = (cmd: any) => Array<{
+        context: string;
+        aggregate: string;
+        aggregateId: string;
+    }>;
+
+    interface DefineCommandResult {
+        defineEventStreamsToLoad(cb: defineEventStreamsToLoadHandler): void;
+    }
+
+    function defineCommand(options: DefineCommandOptions, handler: commandHandler): DefineCommandResult;
+
+    // endregion
+
+    // region defineEvent
+
+    interface DefineEventOptions {
+        name?: string;
+        version?: number;
+        payload?: string;
+    }
+
+    type eventHandler = (data: any, aggregate: AggregateModel) => void;
+
+    function defineEvent(options: DefineEventOptions, handler: eventHandler): void;
+
+    // endregion
+
+    // region defineBusinessRule
+
+    interface DefineBusinessRuleOptions {
+        /**
+         * optional, default is file name without extension
+         */
+        name?: string;
+
+        /**
+         * optional
+         */
+        description?: string;
+
+        /**
+         * optional, default Infinity, all business rules will be sorted by this value
+         */
+        priority?: number;
+    }
+
+    /**
+     * @param changed is the new aggregate object
+     * @param previous is the old aggregate object
+     * @param events is the array with the resulting events
+     * @param command the handling command
+     * @param callback is optional, if not defined as function argument you can throw errors or return errors here (sync way)
+     */
+    type businessRuleHandler = (changed: AggregateModel, previous: AggregateModel, command: any, callback?: (err: string | Error) => string | Error) => void | string | Error;
+
+    function defineBusinessRule(options: DefineBusinessRuleOptions, handler: businessRuleHandler): void;
+
+    // endregion
+
+    // region defineCommandHandler
+
+    interface DefineCommandHandlerOptions {
+        /**
+         * optional, default is file name without extension
+         */
+        name?: string;
+
+        /**
+         * optional, default 0
+         */
+        version?: number;
+
+        /**
+         * optional, if not defined it will pass the whole command...
+         */
+        payload?: string;
+    }
+
+    /**
+     * @param aggId is the aggregate id
+     * @param cmd is the command data
+     * @param callback is optional, if not defined as function argument you can throw errors or return errors here (sync way)
+     */
+    type commandHandlerHandler = (aggId: string, cmd: any, commandHandler: any, callback?: (err: string | Error) => string | Error) => void | string | Error;
+
+    function defineCommandHandler(options: DefineCommandHandlerOptions, handler: commandHandlerHandler): void;
+
+    // endregion
+
+    // region Domain itself
+
+    interface CommandDefinition {
+        /**
+         * optional, default is 'id'
+         */
+        id?: string;
+
+        /**
+         * optional, default is 'name'
+         */
+        name?: string;
+
+        /**
+         * optional, default is 'aggregate.id'
+         * if an aggregate id is not defined in the command, the command handler will create a new aggregate instance
+         */
+        aggregateId?: string;
+
+        /**
+         * optional, only makes sense if contexts are defined in the 'domainPath' structure
+         */
+        context?: string;
+
+        /**
+         * optional, only makes sense if aggregates with names are defined in the 'domainPath' structure
+         */
+        aggregate?: string;
+
+        /**
+         * optional, but recommended
+         */
+        payload?: string;
+
+        /**
+         * optional, if defined the command handler will check if the command can be handled
+         * if you want the command to be handled in a secure/transactional way pass a revision value that matches the current aggregate revision
+         */
+        revision?: string;
+
+        /**
+         * optional, if defined the command handler will search for a handle that matches command name and version number
+         */
+        version?: string;
+
+        /**
+         * optional, if defined theses values will be copied to the event (can be used to transport information like userId, etc..)
+         */
+        meta?: string;
+    }
+
+    interface EventDefinition {
+        /**
+         * optional, default is 'correlationId'
+         * will use the command id as correlationId, so you can match it in the sender
+         */
+        correlationId?: string;
+
+        /**
+         * optional, default is 'id'
+         */
+        id?: string;
+
+        /**
+         * optional, default is 'name'
+         */
+        name?: string;
+
+        /**
+         * optional, default is 'aggregate.id'
+         */
+        aggregateId?: string;
+
+        /**
+         * optional, only makes sense if contexts are defined in the 'domainPath' structure
+         */
+        context?: string;
+
+        /**
+         * optional, only makes sense if aggregates with names are defined in the 'domainPath' structure
+         */
+        aggregate?: string;
+
+        /**
+         * optional, default is 'payload'
+         */
+        payload?: string;
+
+        /**
+         * optional, default is 'revision'
+         * will represent the aggregate revision, can be used in next command
+         */
+        revision?: string;
+
+        /**
+         * optional
+         */
+        version?: string;
+
+        /**
+         * optional, if defined the values of the command will be copied to the event (can be used to transport information like userId, etc..)
+         */
+        meta?: string;
+
+        /**
+         * optional, if defined the commit date of the eventstore will be saved in this value
+         */
+        commitStamp?: string;
+    }
+
+    type generateIdCallback = (err: any, id: string) => void;
+
+    interface HandleMetaInfos {
+        aggregateId: string;
+        aggregate: string;
+        context: string;
+    }
+
+    interface CqrsDomain {
+        /**
+         * Inject definition for command structure.
+         * @param definition the definition to be injected
+         * @returns to be able to chain...
+         */
+        defineCommand(definition: CommandDefinition): CqrsDomain;
+
+        /**
+         * Inject definition for event structure.
+         * @param definition the definition to be injected
+         * @returns to be able to chain...
+         */
+        defineEvent(definition: EventDefinition): CqrsDomain;
+
+        /**
+         * Call this function to initialize the domain.
+         * @param callback the function that will be called when this action has finished [optional]
+         *                            `function(err, warnings){}`
+         */
+        init(cb: (err: Error, warnings: Error[]) => void): void;
+
+        /**
+         * Call this function to let the domain handle it.
+         * @param cmd      the command object
+         * @param callback the function that will be called when this action has finished [optional]
+         *                            `function(err, evts, aggregateData, meta){}` evts is of type Array, aggregateData and meta are an object
+         */
+        handle(cmd: any,
+            cb?: ((err: Error) => void) |
+                ((err: Error, events: any[], aggregateData: any, metaInfos: HandleMetaInfos) => void)): void;
+
+        /**
+         * Returns the domain information.
+         */
+        getInfo(): any;
+
+        /**
+         * Inject function for for event notification.
+         * @param fn the function to be injected
+         * @returns to be able to chain...
+         */
+        onEvent(cb: ((evt: any) => void) |
+            ((evt: any, callback: () => void) => void)): CqrsDomain;
+
+        /**
+         * Inject idGenerator function.
+         * @param fn The function to be injected.
+         * @returns to be able to chain...
+         */
+        idGenerator(cb: (() => string) |
+            ((callback: generateIdCallback) => string)): CqrsDomain;
+
+        /**
+         * Inject idGenerator function for aggregate id.
+         * @param fn The function to be injected.
+         * @returns to be able to chain...
+         */
+        aggregateIdGenerator(cb: (() => string) |
+            ((callback: generateIdCallback) => string)): CqrsDomain;
+
+        /**
+         * Converts an error to the commandRejected event
+         * @param cmd The command that was handled.
+         * @param err The error that occurs.
+         * @returns The resulting event.
+         */
+        createCommandRejectedEvent(cmd: any, err: Error): any;
+
+        /**
+         * Is called when dispatched a command.
+         * @param cmd              the command object
+         * @param err              the error
+         * @param eventsToDispatch the events to dispatch
+         * @param aggregateData    the aggregate data
+         * @param meta             the meta infos
+         * @param callback         the function that will be called when this action has finished [optional]
+         *                                    `function(err, evts, aggregateData, meta){}` evts is of type Array, aggregateData and meta are an object
+         */
+        onDispatched(cmd: any, err: Error, eventsToDispatch: any[], aggregateData: any, meta: any, callback: (err: Error, evts: any[], aggregateData: any, meta: any) => void): void;
+    }
+
+    type SupportedDBTypes = "mongodb" | "redis" | "tingodb" | "azuretable" | "inmemory";
+
+    interface CreateDomainOptions {
+        /**
+         * the path to the "working directory"
+         * can be structured like
+         * [set 1](https://github.com/adrai/node-cqrs-domain/tree/master/test/integration/fixture/set1) or
+         * [set 2](https://github.com/adrai/node-cqrs-domain/tree/master/test/integration/fixture/set2)
+         */
+        domainPath: string;
+
+        /**
+         * optional, default is 'commandRejected'
+         * will be used if an error occurs and an event should be generated
+         */
+        commandRejectedEventName?: string;
+
+        /**
+         * optional, default is 800
+         * if using in scaled systems and not guaranteeing that each command for an aggregate instance
+         * dispatches to the same worker process, this module tries to catch the concurrency issues and
+         * retries to handle the command after a timeout between 0 and the defined value
+         */
+        retryOnConcurrencyTimeout?: number;
+
+        /**
+         * optional, default is 100
+         * global snapshot threshold value for all aggregates
+         * defines the amount of loaded events, if there are more events to load, it will do a snapshot, so next loading is faster
+         * an individual snapshot threshold defining algorithm can be defined per aggregate (scroll down)
+         */
+        snapshotThreshold?: number;
+
+        /**
+         * optional, default is in-memory
+         * currently supports: mongodb, redis, tingodb, azuretable and inmemory
+         * hint: [eventstore](https://github.com/adrai/node-eventstore#provide-implementation-for-storage)
+         */
+        eventStore?: {
+            type: SupportedDBTypes,
+            host?: string;
+            port?: number,
+            dbName?: string;
+            eventsCollectionName?: string;
+            snapshotsCollectionName?: string;
+            transactionsCollectionName?: string;
+            timeout?: number;
+            authSource?: string;
+            username?: string;
+            password?: string;
+            url?: string;
+        };
+
+        /**
+         * optional, default is in-memory
+         * currently supports: mongodb, redis, tingodb, couchdb, azuretable, dynamodb and inmemory
+         * hint settings like: [eventstore](https://github.com/adrai/node-eventstore#provide-implementation-for-storage)
+         */
+        aggregateLock?: {
+            type: SupportedDBTypes,
+            host?: string;
+            port?: number;
+            db: number;
+            prefix?: string;
+            timeout?: number;
+            password?: string;
+        };
+
+        /**
+         * optional, default is not set
+         * checks if command was already seen in the last time -> ttl
+         * currently supports: mongodb, redis, tingodb and inmemory
+         * hint settings like: [eventstore](https://github.com/adrai/node-eventstore#provide-implementation-for-storage)
+         */
+        deduplication?: {
+            type: "mongodb" | "redis" | "tingodb" | "inmemory",
+            ttl?: number;
+            host?: string;
+            port?: number;
+            db?: number;
+            prefix?: string;
+            timeout?: number;
+            password?: string;
+        };
+
+        /**
+         * optional, default false
+         * resolves valid file types from loader extensions instead of default values while parsing definition files
+         */
+        useLoaderExtensions?: true;
+    }
+
+    // endregion
+}
+
+declare function Domain(options: Domain.CreateDomainOptions): Domain.CqrsDomain;
+
+export = Domain;
diff --git a/types/cqrs-domain/tsconfig.json b/types/cqrs-domain/tsconfig.json
new file mode 100644
index 0000000000..7ea1caa8ec
--- /dev/null
+++ b/types/cqrs-domain/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cqrs-domain-tests.ts"
+    ]
+}
diff --git a/types/cqrs-domain/tslint.json b/types/cqrs-domain/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cqrs-domain/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cradle/tslint.json b/types/cradle/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cradle/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/create-error/tslint.json b/types/create-error/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/create-error/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/create-react-class/create-react-class-tests.ts b/types/create-react-class/create-react-class-tests.ts
new file mode 100644
index 0000000000..c3f7c620ef
--- /dev/null
+++ b/types/create-react-class/create-react-class-tests.ts
@@ -0,0 +1,106 @@
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import * as DOM from "react-dom-factories";
+import * as createReactClass from "create-react-class";
+
+interface Props {
+    foo: string;
+}
+
+interface State {
+    bar: number;
+}
+
+const props: Props & React.ClassAttributes<{}> = {
+    foo: "foo"
+};
+
+const container: Element = document.createElement("div");
+
+//
+// Top-Level API
+// --------------------------------------------------------------------------
+
+const ClassicComponent: React.ClassicComponentClass<Props> = createReactClass<Props, State>({
+    childContextTypes: {},
+    componentDidCatch(err, errorInfo) {
+        const msg: string = err.message;
+        const name: string = err.name;
+        const stack: string | undefined = err.stack;
+        const componentStack: string = errorInfo.componentStack;
+    },
+    componentDidMount() {},
+    componentDidUpdate(props, state) {
+        const foo: string = props.foo;
+        const bar: number = state.bar;
+    },
+    componentWillMount() {},
+    componentWillReceiveProps(nextProps) {
+        const oldFoo: string = nextProps.foo;
+    },
+    componentWillUnmount() {},
+    componentWillUpdate(props, state) {
+        const foo: string = props.foo;
+        const bar: number = state.bar;
+    },
+    contextTypes: {},
+    displayName: "Test",
+    getDefaultProps() {
+        return { foo: "f" };
+    },
+    getInitialState() {
+        return { bar: 1 };
+    },
+    mixins: [],
+    propTypes: {},
+    shouldComponentUpdate(this: React.ClassicComponent<Props, State>, nextProps, nextState) {
+        const newFoo: string = nextProps.foo;
+        const newBar: number = nextState.bar;
+        return newFoo !== this.props.foo && newBar !== this.state.bar;
+    },
+    statics: {
+        test: 1
+    },
+    reset() {
+        this.replaceState(this.getInitialState!());
+    },
+    render() {
+        return DOM.div(null,
+            DOM.input({
+                ref: input => this._input = input,
+                value: this.state.bar
+            }));
+    }
+});
+
+// React.createFactory
+const classicFactory: React.ClassicFactory<Props> =
+    React.createFactory(ClassicComponent);
+const classicFactoryElement: React.ClassicElement<Props> =
+    classicFactory(props);
+
+// React.createElement
+const classicElement: React.ClassicElement<Props> = React.createElement(ClassicComponent, props);
+
+// React.cloneElement
+const clonedClassicElement: React.ClassicElement<Props> =
+    React.cloneElement(classicElement, props);
+
+// ReactDOM.render
+const classicComponent: React.ClassicComponent<Props> = ReactDOM.render(classicElement, container);
+
+//
+// React Components
+// --------------------------------------------------------------------------
+
+const displayName: string | undefined = ClassicComponent.displayName;
+const defaultProps: Props = ClassicComponent.getDefaultProps ? ClassicComponent.getDefaultProps() : {} as Props;
+const propTypes: React.ValidationMap<Props> | undefined = ClassicComponent.propTypes;
+
+//
+// Component API
+// --------------------------------------------------------------------------
+
+// classic
+const isMounted: boolean = classicComponent.isMounted();
+classicComponent.replaceState({ inputValue: "???", seconds: 60 });
diff --git a/types/create-react-class/index.d.ts b/types/create-react-class/index.d.ts
new file mode 100644
index 0000000000..211474ac16
--- /dev/null
+++ b/types/create-react-class/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for create-react-class 15.6
+// Project: https://facebook.github.io/react/
+// Definitions by: John Gozde <https://github.com/jgoz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ComponentSpec, ClassicComponentClass } from "react";
+
+declare namespace createReactClass {}
+declare function createReactClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
+
+export as namespace createReactClass;
+export = createReactClass;
diff --git a/types/create-react-class/tsconfig.json b/types/create-react-class/tsconfig.json
new file mode 100644
index 0000000000..b003c69e53
--- /dev/null
+++ b/types/create-react-class/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "preserve"
+    },
+    "files": [
+        "index.d.ts",
+        "create-react-class-tests.ts"
+    ]
+}
diff --git a/types/create-react-class/tslint.json b/types/create-react-class/tslint.json
new file mode 100644
index 0000000000..08337e85f7
--- /dev/null
+++ b/types/create-react-class/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-object-literal-type-assertion": false,
+        "no-unnecessary-generics": false
+    }
+}
diff --git a/types/createjs-lib/tslint.json b/types/createjs-lib/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/createjs-lib/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/createjs/tslint.json b/types/createjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/createjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/credential/tslint.json b/types/credential/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/credential/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/credit-card-type/tslint.json b/types/credit-card-type/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/credit-card-type/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cron/tslint.json b/types/cron/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cron/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cropperjs/cropperjs-tests.ts b/types/cropperjs/cropperjs-tests.ts
index 2c57656b78..4895c3052c 100644
--- a/types/cropperjs/cropperjs-tests.ts
+++ b/types/cropperjs/cropperjs-tests.ts
@@ -1,9 +1,9 @@
 import * as Cropper from 'cropperjs';
 
-var image = <HTMLImageElement>document.getElementById('image');
-var cropper = new Cropper(image, {
+const image = <HTMLImageElement> document.getElementById('image');
+const cropper = new Cropper(image, {
   aspectRatio: 16 / 9,
-  crop: function(e) {
+  crop(e) {
     console.log(e.detail.x);
     console.log(e.detail.y);
     console.log(e.detail.width);
diff --git a/types/cropperjs/index.d.ts b/types/cropperjs/index.d.ts
index ca957ccc3f..cca1d6a39b 100644
--- a/types/cropperjs/index.d.ts
+++ b/types/cropperjs/index.d.ts
@@ -1,259 +1,260 @@
-// Type definitions for cropperjs
+// Type definitions for cropperjs 1.1
 // Project: https://github.com/fengyuanchen/cropperjs
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare namespace cropperjs {
-    export enum CropperViewMods {
+    enum CropperViewMods {
         CropBoxIsJustWithInTheContainer = 0,
         CropBoxShouldBeWithInTheCanvas = 1,
         CanvasShouldNotBeWithInTheContainer = 2,
         ContainerSshouldBeWithInTheCanvas = 3
     }
-    export interface CropperReadyEvent extends CustomEvent { }
-    export interface CropperCropEvent extends CustomEvent {
+    type CropperReadyEvent = CustomEvent;
+    interface CropperCropEvent extends CustomEvent {
         detail: Data;
     }
-    export interface CropperCropStepEvent extends CustomEvent {
+    interface CropperCropStepEvent extends CustomEvent {
         detail: CropStepData;
     }
-    export interface CropperZoomEvent extends CustomEvent {
+    interface CropperZoomEvent extends CustomEvent {
         detail: ZoomData;
     }
-    export interface CropperOptions {
+    interface CropperOptions {
         /**
-        * Function called when crop box is ready
-        */
-        ready?: (event: CropperReadyEvent) => void;
+         * Function called when crop box is ready
+         */
+        ready?(event: CropperReadyEvent): void;
         /**
-        * Function called when crop box is moved or resized
-        */
-        crop?: (event: CropperCropEvent) => void;
+         * Function called when crop box is moved or resized
+         */
+        crop?(event: CropperCropEvent): void;
         /**
-        * Function called at start of crop box being moved or resized
-        */
-        cropstart?: (event: CropperCropStepEvent) => void;
+         * Function called at start of crop box being moved or resized
+         */
+        cropstart?(event: CropperCropStepEvent): void;
         /**
-        * Function called when crop box is moved
-        */
-        cropmove?: (event: CropperCropStepEvent) => void;
+         * Function called when crop box is moved
+         */
+        cropmove?(event: CropperCropStepEvent): void;
         /**
-        * Function called when crop box is finished being moved or resized
-        */
-        cropend?: (event: CropperCropStepEvent) => void;
+         * Function called when crop box is finished being moved or resized
+         */
+        cropend?(event: CropperCropStepEvent): void;
         /**
          * Function called when a cropper instance starts to zoom in or zoom out its canvas (image wrapper).
          */
-        zoom?: (event: CropperZoomEvent) => void;
+        zoom?(event: CropperZoomEvent): void;
         /**
-        * Define the view mode of the cropper.
-        * @default 0
-        */
+         * Define the view mode of the cropper.
+         * @default 0
+         */
         viewMode?: CropperViewMods;
         /**
-        * Define the dragging mode of the cropper.
-        * 'crop': create a new crop box
-        * 'move': move the canvas
-        * 'none': do nothing
-        */
+         * Define the dragging mode of the cropper.
+         * 'crop': create a new crop box
+         * 'move': move the canvas
+         * 'none': do nothing
+         */
         dragMode?: string;
         /**
-        * Set the aspect ratio of the crop box. By default, the crop box is free ratio.
-        * @default Nan
-        */
+         * Set the aspect ratio of the crop box. By default, the crop box is free ratio.
+         * @default Nan
+         */
         aspectRatio?: number;
         /**
-        * The previous cropped data if you had stored, will be passed to setData method automatically.
-        * @default null
-        */
-        data?: Object;
+         * The previous cropped data if you had stored, will be passed to setData method automatically.
+         * @default null
+         */
+        data?: object;
         /**
-        * Add extra elements (containers) for previewing.
-        * Valid selector for Document.querySelectorAll
-        * @default ''
-        */
+         * Add extra elements (containers) for previewing.
+         * Valid selector for Document.querySelectorAll
+         * @default ''
+         */
         preview?: string;
         /**
-        * Rebuild the cropper when resize the window.
-        * @default true
-        */
+         * Rebuild the cropper when resize the window.
+         * @default true
+         */
         responsive?: boolean;
         /**
-        * By default, the plugin will check the image origin, and if it is a cross-origin image,
-        * a crossOrigin attribute will be added to the image element and a timestamp will be added to the image url to reload the image for "getCroppedCanvas".
-        * By adding crossOrigin attribute to image will stop adding timestamp to image url, and stop reload of image.
-        * @default true
-        */
+         * By default, the plugin will check the image origin, and if it is a cross-origin image,
+         * a crossOrigin attribute will be added to the image element and a timestamp will be added to the image url to reload the image for "getCroppedCanvas".
+         * By adding crossOrigin attribute to image will stop adding timestamp to image url, and stop reload of image.
+         * @default true
+         */
         checkCrossOrigin?: boolean;
         /**
-        * Check the current image's Exif Orientation information.
-        * More exactly, read the Orientation value for rotating or flipping the image, and then override the Orientation
-        * value with 1 (the default value) to avoid some issues (1, 2) on iOS devices.
-        * Requires to set both the rotatable and scalable options to true at the same time.
-        * Note: Don't trust this all the time as some JPG images have incorrect (not standard) Orientation values.
-        * @default true
-        */
+         * Check the current image's Exif Orientation information.
+         * More exactly, read the Orientation value for rotating or flipping the image, and then override the Orientation
+         * value with 1 (the default value) to avoid some issues (1, 2) on iOS devices.
+         * Requires to set both the rotatable and scalable options to true at the same time.
+         * Note: Don't trust this all the time as some JPG images have incorrect (not standard) Orientation values.
+         * @default true
+         */
         checkOrientation?: boolean;
         /**
-        * Show the black modal above the image and under the crop box.
-        * @default true
-        */
+         * Show the black modal above the image and under the crop box.
+         * @default true
+         */
         modal?: boolean;
         /**
-        * Show the dashed lines above the crop box.
-        * @default true
-        */
+         * Show the dashed lines above the crop box.
+         * @default true
+         */
         guides?: boolean;
         /**
-        * Show the center indicator above the crop box.
-        * @default true
-        */
+         * Show the center indicator above the crop box.
+         * @default true
+         */
         center?: boolean;
         /**
-        * Show the white modal above the crop box (highlight the crop box).
-        * @default true
-        */
+         * Show the white modal above the crop box (highlight the crop box).
+         * @default true
+         */
         highlight?: boolean;
         /**
-        * Show the grid background of the container.
-        * @default true
-        */
+         * Show the grid background of the container.
+         * @default true
+         */
         background?: boolean;
         /**
-        * Enable to crop the image automatically when initialize.
-        * @default true
-        */
+         * Enable to crop the image automatically when initialize.
+         * @default true
+         */
         autoCrop?: boolean;
         /**
-        * A number between 0 and 1. Define the automatic cropping area size (percentage).
-        * @default 0.8 (80% of the image)
-        */
+         * A number between 0 and 1. Define the automatic cropping area size (percentage).
+         * @default 0.8 (80% of the image)
+         */
         autoCropArea?: number;
         /**
-        * Enable to move the image.
-        * @default true
-        */
+         * Enable to move the image.
+         * @default true
+         */
         movable?: boolean;
         /**
-        * Enable to rotate the image.
-        * @default true
-        */
+         * Enable to rotate the image.
+         * @default true
+         */
         rotatable?: boolean;
         /**
-        * Enable to restore the cropped area after resizing the window.
-        * @default true
-        */
+         * Enable to restore the cropped area after resizing the window.
+         * @default true
+         */
         restore?: boolean;
         /**
-        * Enable to scale the image.
-        * @default true
-        */
+         * Enable to scale the image.
+         * @default true
+         */
         scalable?: boolean;
         /**
-        * Enable to zoom the image.
-        * @default true
-        */
+         * Enable to zoom the image.
+         * @default true
+         */
         zoomable?: boolean;
         /**
-        * Enable to zoom the image by dragging touch.
-        * @default true
-        */
+         * Enable to zoom the image by dragging touch.
+         * @default true
+         */
         zoomOnTouch?: boolean;
         /**
-        * Enable to zoom the image by wheeling mouse.
-        * @default true
-        */
+         * Enable to zoom the image by wheeling mouse.
+         * @default true
+         */
         zoomOnWheel?: boolean;
         /**
-        * Define zoom ratio when zoom the image by wheeling mouse.
-        * @default 0.1
-        */
+         * Define zoom ratio when zoom the image by wheeling mouse.
+         * @default 0.1
+         */
         wheelZoomRatio?: number;
         /**
-        * Enable to move the crop box.
-        * @default true
-        */
+         * Enable to move the crop box.
+         * @default true
+         */
         cropBoxMovable?: boolean;
         /**
-        * Enable to resize the crop box.
-        * @default true
-        */
+         * Enable to resize the crop box.
+         * @default true
+         */
         cropBoxResizable?: boolean;
         /**
-        * Enable to toggle drag mode between "crop" and "move" when click twice on the cropper.
-        * @default true
-        */
+         * Enable to toggle drag mode between "crop" and "move" when click twice on the cropper.
+         * @default true
+         */
         toggleDragModeOnDblclick?: boolean;
         /**
-        * The minimum width of the container
-        * @default 200
-        */
+         * The minimum width of the container
+         * @default 200
+         */
         minContainerWidth?: number;
         /**
-        * The minimum height of the container.
-        * @default 100
-        */
+         * The minimum height of the container.
+         * @default 100
+         */
         minContainerHeight?: number;
         /**
-        * The minimum width of the canvas (image wrapper).
-        * @default 0
-        */
+         * The minimum width of the canvas (image wrapper).
+         * @default 0
+         */
         minCanvasWidth?: number;
         /**
-        * The minimum height of the canvas (image wrapper).
-        * @default 0
-        */
+         * The minimum height of the canvas (image wrapper).
+         * @default 0
+         */
         minCanvasHeight?: number;
         /**
-        * The minimum width of the crop box.
-        * @default 0
-        */
+         * The minimum width of the crop box.
+         * @default 0
+         */
         minCropBoxWidth?: number;
         /**
-        * The minimum height of the crop box.
-        * @default 0
-        */
+         * The minimum height of the crop box.
+         * @default 0
+         */
         minCropBoxHeight?: number;
         /**
-        * This function will be called when a cropper instance starts to load an image.
-        * Return false to prevent to build
-        * @default null
-        */
-        build?: () => boolean;
+         * This function will be called when a cropper instance starts to load an image.
+         * Return false to prevent to build
+         * @default null
+         */
+        build?(): boolean;
         /**
-        * This function will be called when a cropper instance has built completely.
-        * @default null
-        */
-        built?: () => void;
+         * This function will be called when a cropper instance has built completely.
+         * @default null
+         */
+        built?(): void;
     }
     interface Data {
         /**
-        * the offset left of the cropped area
-        */
+         * the offset left of the cropped area
+         */
         x: number;
         /**
-        * the offset top of the cropped area
-        */
+         * the offset top of the cropped area
+         */
         y: number;
         /**
-        * the width of the cropped area
-        */
+         * the width of the cropped area
+         */
         width: number;
         /**
-        * the height of the cropped area
-        */
+         * the height of the cropped area
+         */
         height: number;
         /**
-        * the rotated degrees of the image
-        */
+         * the rotated degrees of the image
+         */
         rotate: number;
         /**
-        * the scaling factor to apply on the abscissa of the image
-        */
+         * the scaling factor to apply on the abscissa of the image
+         */
         scaleX: number;
         /**
-        * the scaling factor to apply on the ordinate of the image
-        */
+         * the scaling factor to apply on the ordinate of the image
+         */
         scaleY: number;
     }
     interface CropStepData {
@@ -284,7 +285,7 @@ declare namespace cropperjs {
     }
     interface ZoomData {
         /**
-         * The original event that was triggered 
+         * The original event that was triggered
          * Options: wheel, touchmove
          */
         originalEvent: Event;
@@ -299,105 +300,114 @@ declare namespace cropperjs {
     }
     interface ContainerData {
         /**
-        * The current width of the container
-        */
+         * The current width of the container
+         */
         width: number;
         /**
-        * The current height of the container
-        */
+         * The current height of the container
+         */
         height: number;
     }
     interface CropBoxData {
         /**
-        * the offset left of the crop box
-        */
-        left: number;
+         * the offset left of the crop box
+         */
+        left?: number;
         /**
-        * the offset top of the crop box
-        */
-        top: number;
+         * the offset top of the crop box
+         */
+        top?: number;
         /**
-        * the width of the crop box
-        */
-        width: number;
+         * the width of the crop box
+         */
+        width?: number;
         /**
-        * the height of the crop box
-        */
-        height: number;
+         * the height of the crop box
+         */
+        height?: number;
     }
     interface CanvasData {
         /**
-        * offset left of the canvas
-        */
+         * offset left of the canvas
+         */
         left: number;
         /**
-        * new offset top of the canvas
-        */
+         * new offset top of the canvas
+         */
         top: number;
         /**
-        * new width of the canvas
-        */
+         * new width of the canvas
+         */
         width: number;
         /**
-        * new height of the canvas
-        */
+         * new height of the canvas
+         */
         height: number;
     }
     interface ImageData {
         /**
-        * the offset left of the image
-        */
+         * the offset left of the image
+         */
         left: number;
         /**
-        * the offset top of the image
-        */
+         * the offset top of the image
+         */
         top: number;
         /**
-        * the width of the image
-        */
+         * the width of the image
+         */
         width: number;
         /**
-        * the height of the image
-        */
+         * the height of the image
+         */
         height: number;
         /**
-        * the natural width of the image
-        */
+         * the natural width of the image
+         */
         naturalWidth: number;
         /**
-        * the natural height of the image
-        */
+         * the natural height of the image
+         */
         naturalHeight: number;
         /**
-        * the aspect ratio of the image
-        */
+         * the aspect ratio of the image
+         */
         aspectRatio: number;
         /**
-        * the rotated degrees of the image if rotated
-        */
+         * the rotated degrees of the image if rotated
+         */
         rotate: number;
         /**
-        * the scaling factor to apply on the abscissa of the image if scaled
-        */
+         * the scaling factor to apply on the abscissa of the image if scaled
+         */
         scaleX: number;
         /**
-        * the scaling factor to apply on the ordinate of the image if scaled
-        */
+         * the scaling factor to apply on the ordinate of the image if scaled
+         */
         scaleY: number;
     }
     interface CroppedCanvasOptions {
         /**
-        * the destination width of the output canvas
-        */
+         * the destination width of the output canvas
+         */
         width?: number;
+        minWidth?: number;
+        maxWidth?: number;
         /**
-        * the destination height of the output canvas
-        */
+         * the destination height of the output canvas
+         */
         height?: number;
+        minHeight?: number;
+        maxHeight?: number;
         /**
-        * a color to fill any alpha values in the output canvas
-        */
+         * a color to fill any alpha values in the output canvas
+         */
         fillColor?: string;
+        /**
+         * image smoothing
+         */
+        imageSmoothingEnabled?: boolean;
+        imageSmoothingQuality?: 'low' | 'medium' | 'high';
     }
 }
 
@@ -409,144 +419,143 @@ declare class cropperjs {
     crop(): void;
 
     /**
-    * Clear the crop box.
-    */
+     * Clear the crop box.
+     */
     reset(): void;
 
     /**
-    * Replace the image's src and rebuild the cropper.
-    * @param url A new image url
-    */
+     * Replace the image's src and rebuild the cropper.
+     * @param url A new image url
+     */
     replace(url: string): void;
 
     /**
-    * Enable (unfreeze) the cropper.
-    */
+     * Enable (unfreeze) the cropper.
+     */
     enable(): void;
 
     /**
-    * Disable (freeze) the cropper
-    */
+     * Disable (freeze) the cropper
+     */
     disable(): void;
 
     /**
-    * Destroy the cropper and remove the instance from the image.
-    */
+     * Destroy the cropper and remove the instance from the image.
+     */
     destroy(): void;
 
     /**
-    * Move the canvas (image wrapper) with relative offsets.
-    * @param offsetX Moving size (px) in the horizontal direction.
-    * @param offsetY Moving size (px) in the vertical direction.
-    * If not present, its default value is offsetX.
-    */
+     * Move the canvas (image wrapper) with relative offsets.
+     * @param offsetX Moving size (px) in the horizontal direction.
+     * @param offsetY Moving size (px) in the vertical direction.
+     * If not present, its default value is offsetX.
+     */
     move(offsetX: number, offsetY?: number): void;
 
     /**
-    * Move the canvas (image wrapper) to an absolute point.
-    * @param x The left value of the canvas
-    * @param y The top value of the canvas
-    * If not present, its default value is x.
-    */
+     * Move the canvas (image wrapper) to an absolute point.
+     * @param x The left value of the canvas
+     * @param y The top value of the canvas
+     * If not present, its default value is x.
+     */
     moveTo(x: number, y?: number): void;
 
     /**
-    * Zoom the canvas (image wrapper) with a relative ratio.
-    * Zoom in: requires a positive number (ratio > 0)
-    * Zoom out: requires a negative number (ratio < 0)
-    */
+     * Zoom the canvas (image wrapper) with a relative ratio.
+     * Zoom in: requires a positive number (ratio > 0)
+     * Zoom out: requires a negative number (ratio < 0)
+     */
     zoom(ratio: number): void;
 
     /**
-    * Zoom the canvas (image wrapper) to an absolute ratio.
-    * Zoom in: requires a positive number (ratio > 0)
-    * Zoom out: requires a negative number (ratio < 0)
-    */
+     * Zoom the canvas (image wrapper) to an absolute ratio.
+     * Zoom in: requires a positive number (ratio > 0)
+     * Zoom out: requires a negative number (ratio < 0)
+     */
     zoomTo(ratio: number): void;
 
     /**
-    * Rotate the canvas (image wrapper) with a relative degree.
-    * Rotate right: requires a positive number (degree > 0)
-    * Rotate left: requires a negative number (degree < 0)
-    */
+     * Rotate the canvas (image wrapper) with a relative degree.
+     * Rotate right: requires a positive number (degree > 0)
+     * Rotate left: requires a negative number (degree < 0)
+     */
     rotate(degree: number): void;
 
     /**
-    * Rotate the canvas (image wrapper) to an absolute degree.
-    * Rotate right: requires a positive number (degree > 0)
-    * Rotate left: requires a negative number (degree < 0)
-    */
+     * Rotate the canvas (image wrapper) to an absolute degree.
+     * Rotate right: requires a positive number (degree > 0)
+     * Rotate left: requires a negative number (degree < 0)
+     */
     rotateTo(degree: number): void;
 
     /**
-    * Clear the crop box.
-    */
+     * Clear the crop box.
+     */
     clear(): void;
 
     /**
-    * Output the cropped area position and size data (base on the original image).
-    */
+     * Output the cropped area position and size data (base on the original image).
+     */
     getData(rounded?: boolean): cropperjs.Data;
 
     /**
-    * Change the cropped area position and size with new data (base on the original image).
-    */
+     * Change the cropped area position and size with new data (base on the original image).
+     */
     setData(data: cropperjs.Data): void;
 
     /**
-    * Output the container size data.
-    */
+     * Output the container size data.
+     */
     getContainerData(): cropperjs.ContainerData;
 
     /**
-    * Output the image position, size and other related data.
-    */
+     * Output the image position, size and other related data.
+     */
     getImageData(): cropperjs.ImageData;
 
     /**
-    * Output the canvas (image wrapper) position and size data.
-    */
+     * Output the canvas (image wrapper) position and size data.
+     */
     getCanvasData(): cropperjs.CanvasData & {
         /**
-        * the natural width of the canvas (read only)
-        */
+         * the natural width of the canvas (read only)
+         */
         naturalWidth: number;
         /**
-        * the natural height of the canvas (read only)
-        */
+         * the natural height of the canvas (read only)
+         */
         naturalHeight: number;
     };
 
     /**
-    * Change the canvas (image wrapper) position and size with new data.
-    */
+     * Change the canvas (image wrapper) position and size with new data.
+     */
     setCanvasData(data: cropperjs.CanvasData): void;
 
     /**
-    * Output the crop box position and size data.
-    */
+     * Output the crop box position and size data.
+     */
     getCropBoxData(): cropperjs.CropBoxData;
 
     /**
-    * Change the crop box position and size with new data.
-    */
+     * Change the crop box position and size with new data.
+     */
     setCropBoxData(data: cropperjs.CropBoxData): void;
 
     /**
-    * Get a canvas drawn the cropped image.
-    */
+     * Get a canvas drawn the cropped image.
+     */
     getCroppedCanvas(options?: cropperjs.CroppedCanvasOptions): HTMLCanvasElement;
 
     /**
-    * Change the aspect ratio of the crop box.
-    */
+     * Change the aspect ratio of the crop box.
+     */
     setAspectRatio(aspectRatio: number): void;
 
     /**
-    * Change the drag mode.
-    */
+     * Change the drag mode.
+     */
     setDragMode(mode?: 'none' | 'crop' | 'move'): void;
-
 }
 
 export = cropperjs;
diff --git a/types/cropperjs/tslint.json b/types/cropperjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cropperjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/croppie/croppie-tests.ts b/types/croppie/croppie-tests.ts
index 26b2449408..581d01435d 100644
--- a/types/croppie/croppie-tests.ts
+++ b/types/croppie/croppie-tests.ts
@@ -1,4 +1,4 @@
-import Croppie from 'croppie';
+import * as Croppie from 'croppie';
 
 const c = new Croppie(document.getElementById('item'), {
     boundary: { width: 300, height: 300 },
diff --git a/types/croppie/index.d.ts b/types/croppie/index.d.ts
index 78ab07ad61..97f53f84c8 100644
--- a/types/croppie/index.d.ts
+++ b/types/croppie/index.d.ts
@@ -1,10 +1,16 @@
-// Type definitions for croppie 2.4
+// Type definitions for croppie 2.5
 // Project: https://github.com/Foliotek/Croppie
 // Definitions by: Connor Peet <https://github.com/connor4312>
+//                 dklmuc <https://github.com/dklmuc>
+//                 Sarun Intaralawan <https://github.com/sarunint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default class Croppie {
-    constructor(container: HTMLElement, options?: CroppieOptions);
+export as namespace Croppie;
+
+export = Croppie;
+
+declare class Croppie {
+    constructor(container: HTMLElement, options?: Croppie.CroppieOptions);
 
     bind(options: {
         url: string,
@@ -14,11 +20,11 @@ export default class Croppie {
         useCanvas?: boolean,
     }): Promise<void>;
 
-    result(options: ResultOptions & { type: 'base64' }): Promise<string>;
-    result(options: ResultOptions & { type: 'html' }): Promise<HTMLElement>;
-    result(options: ResultOptions & { type: 'blob' }): Promise<Blob>;
-    result(options: ResultOptions & { type: 'canvas' }): Promise<HTMLCanvasElement>;
-    result(options?: ResultOptions): Promise<HTMLCanvasElement>;
+    result(options: Croppie.ResultOptions & { type: 'base64' | 'canvas' }): Promise<string>;
+    result(options: Croppie.ResultOptions & { type: 'html' }): Promise<HTMLElement>;
+    result(options: Croppie.ResultOptions & { type: 'blob' }): Promise<Blob>;
+    result(options: Croppie.ResultOptions & { type: 'rawcanvas' }): Promise<HTMLCanvasElement>;
+    result(options?: Croppie.ResultOptions): Promise<HTMLCanvasElement>;
 
     rotate(degrees: 90 | 180 | 270 | -90 | -180 | -270): void;
 
@@ -27,25 +33,30 @@ export default class Croppie {
     destroy(): void;
 }
 
-export type CropType = 'square' | 'circle';
+declare namespace Croppie {
+    type CropType = 'square' | 'circle';
 
-export type Format = 'jpeg' | 'png' | 'webp';
+    type Format = 'jpeg' | 'png' | 'webp';
 
-export interface ResultOptions {
-    size?: 'viewport' | 'original' | { width: number, height: number };
-    format?: Format;
-    quality?: number;
-    circle?: boolean;
-}
+    type Type = 'canvas' | 'base64' | 'html' | 'blob' | 'rawcanvas';
 
-export interface CroppieOptions {
-    boundary?: { width: number, height: number };
-    customClass?: string;
-    enableExif?: boolean;
-    enableOrientation?: boolean;
-    enableZoom?: boolean;
-    enforceBoundary?: boolean;
-    mouseWheelZoom?: boolean;
-    showZoomer?: boolean;
-    viewport?: { width: number, height: number, type?: CropType };
+    interface ResultOptions {
+        type?: Type;
+        size?: 'viewport' | 'original' | { width: number, height: number };
+        format?: Format;
+        quality?: number;
+        circle?: boolean;
+    }
+
+    interface CroppieOptions {
+        boundary?: { width: number, height: number };
+        customClass?: string;
+        enableExif?: boolean;
+        enableOrientation?: boolean;
+        enableZoom?: boolean;
+        enforceBoundary?: boolean;
+        mouseWheelZoom?: boolean;
+        showZoomer?: boolean;
+        viewport?: { width: number, height: number, type?: CropType };
+    }
 }
diff --git a/types/cross-storage/tslint.json b/types/cross-storage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cross-storage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/crossfilter/crossfilter-tests.ts b/types/crossfilter/crossfilter-tests.ts
index 813ddae2b9..5d9981b6d1 100644
--- a/types/crossfilter/crossfilter-tests.ts
+++ b/types/crossfilter/crossfilter-tests.ts
@@ -118,10 +118,10 @@ var types = paymentCountByType.all();
 paymentsByTotal.dispose();
 
 crossfilter.bisect([], null, 0, 0);
-var bisectBy = crossfilter.bisect.by(t => t);
-bisectBy([], null, 0, 0);
-bisectBy.left([], null, 0, 0);
-bisectBy.right([], null, 0, 0);
+var bisectBy = crossfilter.bisect.by<{value: string}, string>(t => t.value);
+bisectBy([{value: 'a'}, {value: 'b'}], 'c', 0, 0); // 2
+bisectBy.left([], 'string', 0, 0); // 0
+bisectBy.right([], 'string', 0, 0); // 0
 
 crossfilter.heap([], 0, 0);
 var heapBy = crossfilter.heap.by(t => t);
diff --git a/types/crossfilter/index.d.ts b/types/crossfilter/index.d.ts
index ed888f6959..a009e920dd 100644
--- a/types/crossfilter/index.d.ts
+++ b/types/crossfilter/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for CrossFilter
 // Project: https://github.com/square/crossfilter
-// Definitions by: Schmulik Raskin <https://github.com/schmuli>, Izaak Baker <https://github.com/iebaker>
+// Definitions by: Schmulik Raskin <https://github.com/schmuli>, Izaak Baker <https://github.com/iebaker>, Einar Norðfjörð <https://github.com/nordfjord>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace CrossFilter {
@@ -15,7 +15,7 @@ declare namespace CrossFilter {
         permute<T>(array: T[], index: number[]): T[];
         bisect: {
             <T>(array: T[], value: T, lo: number, hi: number): number;
-            by<T>(value: Selector<T>): Bisector<T>;
+            by<T,U>(accessor: (x: T)=> U): Bisector<T,U>;
         }
         heap: {
             <T>(array: T[], lo: number, hi: number): T[];
@@ -36,13 +36,13 @@ declare namespace CrossFilter {
         }
     }
 
-    export interface Bisection<T> {
-        (array: T[], value: T, lo: number, hi: number): number;
+    export interface Bisection<T,U> {
+        (array: T[], value: U, lo: number, hi: number): number;
     }
 
-    export interface Bisector<T> extends Bisection<T> {
-        left: Bisection<T>
-        right: Bisection<T>
+    export interface Bisector<T,U> extends Bisection<T,U> {
+        left: Bisection<T,U>
+        right: Bisection<T,U>
     }
 
     export interface Heap<T> {
diff --git a/types/crossfilter/tslint.json b/types/crossfilter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/crossfilter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/crossroads/index.d.ts b/types/crossroads/index.d.ts
index 42a631599e..ef93fe86a5 100644
--- a/types/crossroads/index.d.ts
+++ b/types/crossroads/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://millermedeiros.github.io/crossroads.js/
 // Definitions by: Diullei Gomes <https://github.com/diullei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="signals" />
 
diff --git a/types/crossroads/tslint.json b/types/crossroads/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/crossroads/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/crypto-js/index.d.ts b/types/crypto-js/index.d.ts
index c3dad4637b..c066204df2 100644
--- a/types/crypto-js/index.d.ts
+++ b/types/crypto-js/index.d.ts
@@ -8,7 +8,7 @@ export as namespace CryptoJS;
 
 declare var CryptoJS: CryptoJS.Hashes;
 declare namespace CryptoJS {
-	type Hash = (message: string | LibWordArray, key?: string, ...options: any[]) => WordArray;
+	type Hash = (message: string | LibWordArray, key?: string | WordArray, ...options: any[]) => WordArray;
 	interface Cipher {
 		encrypt(message: string, secretPassphrase: string | WordArray, option?: CipherOption): WordArray;
 		decrypt(encryptedMessage: string | WordArray, secretPassphrase: string | WordArray, option?: CipherOption): DecryptedMessage;
diff --git a/types/crypto-js/tslint.json b/types/crypto-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/crypto-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cryptojs/tslint.json b/types/cryptojs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cryptojs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cson/cson-tests.ts b/types/cson/cson-tests.ts
index e5bdc67069..8d196e33c7 100644
--- a/types/cson/cson-tests.ts
+++ b/types/cson/cson-tests.ts
@@ -13,7 +13,7 @@ console.log('cson.createJSONString => %s', data);
 data = cson.createCSONString({hello: 'world'});
 console.log('cson.createCSONString => %s', data);
 
-var obj: Object = cson.parse(data);
+var obj = cson.parse(data);
 console.log('cson.parse => %s', JSON.stringify(obj));
 
 obj = cson.parseCSONString(data);
diff --git a/types/cson/index.d.ts b/types/cson/index.d.ts
index 72b985a82d..3366283721 100644
--- a/types/cson/index.d.ts
+++ b/types/cson/index.d.ts
@@ -5,27 +5,27 @@
 
 
 // Create Strings
-export declare function stringify(data: Object, opts?: Object, indent?: any): string;
-export declare function createCSONString(data: Object, opts?: Object, next?: any): string;
-export declare function createJSONString(data: Object, opts?: Object, next?: any): string;
-export declare function createString(data: Object, opts?: Object, next?: any): string;
+export declare function stringify(data: any, opts?: Object, indent?: any): string;
+export declare function createCSONString(data: any, opts?: Object, next?: any): string;
+export declare function createJSONString(data: any, opts?: Object, next?: any): string;
+export declare function createString(data: any, opts?: Object, next?: any): string;
 
 // Parse Strings
-export declare function parse(data: string, opts?: Object, next?: any): Object;
-export declare function parseCSONString(data: string, opts?: Object, next?: any): Object;
-export declare function parseJSONString(data: string, opts?: Object, next?: any): Object;
-export declare function parseCSString(data: string, opts?: Object, next?: any): Object;
-export declare function parseJSString(data: string, opts?: Object, next?: any): Object;
-export declare function parseString(data: string, opts?: Object, next?: any): Object;
+export declare function parse(data: string, opts?: Object, next?: any): any;
+export declare function parseCSONString(data: string, opts?: Object, next?: any): any;
+export declare function parseJSONString(data: string, opts?: Object, next?: any): any;
+export declare function parseCSString(data: string, opts?: Object, next?: any): any;
+export declare function parseJSString(data: string, opts?: Object, next?: any): any;
+export declare function parseString(data: string, opts?: Object, next?: any): any;
 
 // Parse Files
-export declare function load(filePath: string, opts?: Object, next?: any): Object;
-export declare function parseCSONFile(filePath: string, opts?: Object, next?: any): Object;
-export declare function parseJSONFile(filePath: string, opts?: Object, next?: any): Object;
-export declare function parseCSFile(filePath: string, opts?: Object, next?: any): Object;
-export declare function parseJSFile(filePath: string, opts?: Object, next?: any): Object;
+export declare function load(filePath: string, opts?: Object, next?: any): any;
+export declare function parseCSONFile(filePath: string, opts?: Object, next?: any): any;
+export declare function parseJSONFile(filePath: string, opts?: Object, next?: any): any;
+export declare function parseCSFile(filePath: string, opts?: Object, next?: any): any;
+export declare function parseJSFile(filePath: string, opts?: Object, next?: any): any;
 
 // Require Files
-export declare function requireCSFile(filePath: string, opts?: Object, next?: any): Object;
-export declare function requireJSFile(filePath: string, opts?: Object, next?: any): Object;
-export declare function requireFile(filePath: string, opts?: Object, next?: any): Object;
+export declare function requireCSFile(filePath: string, opts?: Object, next?: any): any;
+export declare function requireJSFile(filePath: string, opts?: Object, next?: any): any;
+export declare function requireFile(filePath: string, opts?: Object, next?: any): any;
diff --git a/types/cson/tslint.json b/types/cson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/csrf/index.d.ts b/types/csrf/index.d.ts
index df1e455eb8..27e1c7929c 100644
--- a/types/csrf/index.d.ts
+++ b/types/csrf/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for b_ 1.3
+// Type definitions for csrf 1.3
 // Project: https://github.com/pillarjs/csrf
 // Definitions by: Markis Taylor <https://github.com/markis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -17,44 +17,27 @@ interface TokensOptions {
 }
 
 declare class Tokens {
-    /**
-     * Token generation/verification class.
-     *
-     * @param {object} [options]
-     * @param {number} [options.saltLength=8] The string length of the salt
-     * @param {number} [options.secretLength=18] The byte length of the secret key
-     * @public
-     */
+    /** Token generation/verification class. */
     constructor(options?: TokensOptions)
 
     /**
      * Create a new CSRF token.
      *
-     * @param {string} secret The secret for the token.
-     * @public
+     * @param secret The secret for the token.
      */
     create(secret: string): string;
 
-    /**
-     * Create a new secret key.
-     *
-     * @param {function} [callback]
-     * @public
-     */
+    /** Create a new secret key. */
     secret(callback?: SecretCallback): Promise<string>;
 
     /**
      * Create a new secret key synchronously.
-     * @public
      */
     secretSync(): string;
 
     /**
      * Verify if a given token is valid for a given secret.
      *
-     * @param {string} secret
-     * @param {string} token
-     * @public
      */
     verify(secret: string, token: string): boolean;
 }
diff --git a/types/css-modules-require-hook/tslint.json b/types/css-modules-require-hook/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/css-modules-require-hook/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/css-modules/css-modules-tests.ts b/types/css-modules/css-modules-tests.ts
index e6479ba2d5..685e322703 100644
--- a/types/css-modules/css-modules-tests.ts
+++ b/types/css-modules/css-modules-tests.ts
@@ -2,7 +2,7 @@ import styles from './main.sass';
 import * as classNames from 'classnames';
 
 class App {
-    private theme: string;
+    private readonly theme: string;
     constructor(theme: string) {
         this.theme = theme;
     }
diff --git a/types/css/index.d.ts b/types/css/index.d.ts
index c892d5c3a2..be8f1323a0 100644
--- a/types/css/index.d.ts
+++ b/types/css/index.d.ts
@@ -112,7 +112,7 @@ export interface Comment extends Node {
 /** 
  * The @charset at-rule. 
  */
-export interface Charset {
+export interface Charset extends Node {
     /** The part following @charset. */
     charset?: string;
 }
@@ -120,7 +120,7 @@ export interface Charset {
 /**
  * The @custom-media at-rule 
  */
-export interface CustomMedia {
+export interface CustomMedia extends Node {
     /** The ---prefixed name. */
     name?: string;
     /** The part following the name. */
@@ -130,7 +130,7 @@ export interface CustomMedia {
 /**
  * The @document at-rule.
  */
-export interface Document {
+export interface Document extends Node {
     /** The part following @document. */
     document?: string;
     /** The vendor prefix in @document, or undefined if there is none. */
@@ -142,7 +142,7 @@ export interface Document {
 /**
  * The @font-face at-rule.
  */
-export interface FontFace {
+export interface FontFace extends Node {
     /** Array of nodes with the types declaration and comment. */
     declarations?: Array<Declaration | Comment>;
 }
@@ -150,7 +150,7 @@ export interface FontFace {
 /**
  * The @host at-rule.
  */
-export interface Host {
+export interface Host extends Node {
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
     rules?: Array<Rule | Comment | AtRule>;
 }
@@ -158,7 +158,7 @@ export interface Host {
 /**
  * The @import at-rule.
  */
-export interface Import {
+export interface Import extends Node {
     /** The part following @import. */
     import?: string;
 }
@@ -166,7 +166,7 @@ export interface Import {
 /**
  * The @keyframes at-rule.
  */
-export interface KeyFrames {
+export interface KeyFrames extends Node {
     /** The name of the keyframes rule. */
     name?: string;
     /** The vendor prefix in @keyframes, or undefined if there is none. */
@@ -175,7 +175,7 @@ export interface KeyFrames {
     keyframes?: Array<KeyFrame | Comment>;
 }
 
-export interface KeyFrame {
+export interface KeyFrame extends Node {
     /** 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. */
@@ -185,7 +185,7 @@ export interface KeyFrame {
 /**
  * The @media at-rule.
  */
-export interface Media {
+export interface Media extends Node {
     /** The part following @media. */
     media?: string;
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
@@ -195,7 +195,7 @@ export interface Media {
 /**
  * The @namespace at-rule.
  */
-export interface Namespace {
+export interface Namespace extends Node {
     /** The part following @namespace. */
     namespace?: string;
 }
@@ -203,7 +203,7 @@ export interface Namespace {
 /**
  * The @page at-rule.
  */
-export interface Page {
+export interface Page 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. */
@@ -213,7 +213,7 @@ export interface Page {
 /**
  * The @supports at-rule.
  */
-export interface Supports {
+export interface Supports extends Node {
     /** The part following @supports. */
     supports?: string;
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
@@ -223,16 +223,21 @@ export interface Supports {
 /** All at-rules. */
 export type AtRule = Charset | CustomMedia | Document | FontFace | Host | Import | KeyFrames | Media | Namespace | Page | Supports;
 
+/**
+ * A collection of rules
+ */
+export interface StyleRules {
+    /** 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>
+}
+
 /** 
  * The root node returned by css.parse. 
  */
 export 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>
-    };
+    stylesheet?: StyleRules;
 }
 
 // ---------------------------------------------------------------------------------
diff --git a/types/css/tslint.json b/types/css/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/css/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cssbeautify/tslint.json b/types/cssbeautify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cssbeautify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/csurf/index.d.ts b/types/csurf/index.d.ts
index 362b4c6e8e..2a626d227b 100644
--- a/types/csurf/index.d.ts
+++ b/types/csurf/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.npmjs.org/package/csurf
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 
diff --git a/types/csurf/tslint.json b/types/csurf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/csurf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/csvrow/csvrow-tests.ts b/types/csvrow/csvrow-tests.ts
new file mode 100644
index 0000000000..133eab5937
--- /dev/null
+++ b/types/csvrow/csvrow-tests.ts
@@ -0,0 +1,10 @@
+import csvrow = require("csvrow");
+
+let row = "a,b,c";
+let columns: string[];
+
+columns = csvrow.parse(row);
+
+row = csvrow.stringify(columns);
+
+row = csvrow.normalize(row);
diff --git a/types/csvrow/index.d.ts b/types/csvrow/index.d.ts
new file mode 100644
index 0000000000..53df54a249
--- /dev/null
+++ b/types/csvrow/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for csvrow 0.1
+// Project: https://github.com/trentm/node-csvrow
+// Definitions by: Peter Harris <https://github.com/codeanimal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Parse a CSV row (i.e. a single row) into an array of strings.
+ *
+ * c.f. http://en.wikipedia.org/wiki/Comma-separated_values
+ *
+ * Limitations/Opinions:
+ * - don't support elements with line-breaks
+ * - leading a trailing spaces are trimmed, unless the entry is quoted
+ *
+ * @throws {TypeError} if the given CSV row is invalid
+ *
+ * @summary Parse a CSV row into an array of strings.
+ */
+export function parse(row: string): string[];
+
+/**
+ * Serialize the given array to a CSV row.
+ */
+export function stringify(columns: string[]): string;
+
+/**
+ * Normalize the given CSV line.
+ */
+export function normalize(row: string): string;
diff --git a/types/csvrow/tsconfig.json b/types/csvrow/tsconfig.json
new file mode 100644
index 0000000000..7fc1637725
--- /dev/null
+++ b/types/csvrow/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes" : true
+    },
+    "files": [
+        "index.d.ts",
+        "csvrow-tests.ts"
+    ]
+}
diff --git a/types/csvrow/tslint.json b/types/csvrow/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/csvrow/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/csvtojson/index.d.ts b/types/csvtojson/index.d.ts
index 832a4acb6a..6d77c48c4f 100644
--- a/types/csvtojson/index.d.ts
+++ b/types/csvtojson/index.d.ts
@@ -179,50 +179,50 @@ declare namespace csvtojson {
     class Converter extends stream.Transform {
         /**
          * Initializes a new instance of a Converter
-         * @param {ConverterOptions} options       converter options
-         * @param {StreamOptions}    streamOptions stream options
+         * @param options       converter options
+         * @param    streamOptions stream options
          */
         constructor(options?: ConverterOptions, streamOptions?: StreamOptions);
 
         /**
          * Reads in a CSV from a string.
-         * @param {string} str the string to convert
-         * @return {Converter} returns this object for chaining
+         * @param str the string to convert
+         * @return returns this object for chaining
          */
         fromString(str: string): this;
 
         /**
          * Reads in a CSV from a string.
-         * @param {string}             str      the string to convert
-         * @param {ParseResultHandler} callback callback function to handle result or error
+         * @param             str      the string to convert
+         * @param callback callback function to handle result or error
          */
         fromString(str: string, callback: ParseResultHandler): void;
 
         /**
          * Reads in a CSV from a file.
-         * @param {string} filePath the path to the CSV file
-         * @return {Converter} returns this object for chaining
+         * @param filePath the path to the CSV file
+         * @return returns this object for chaining
          */
         fromFile(filePath: string): this;
 
         /**
          * Reads in a CSV from a file.
-         * @param {string}             filePath the path to the CSV file
-         * @param {ParseResultHandler} callback callback function to handle result or error
+         * @param             filePath the path to the CSV file
+         * @param callback callback function to handle result or error
          */
         fromFile(filePath: string, callback: ParseResultHandler): void;
 
         /**
          * Reads in a CSV from a stream.
-         * @param {Stream} stream the stream
-         * @return {Converter} returns this object for chaining
+         * @param stream the stream
+         * @return returns this object for chaining
          */
         fromStream(stream: NodeJS.ReadableStream): this;
 
         /**
          * Reads in a CSV from a stream.
-         * @param {Stream}             stream   the stream
-         * @param {ParseResultHandler} callback callback function to handle result or error
+         * @param             stream   the stream
+         * @param callback callback function to handle result or error
          */
         fromStream(stream: stream.Stream, callback: ParseResultHandler): void;
 
@@ -237,9 +237,9 @@ declare namespace csvtojson {
          * - end
          * - end_parsed
          * - done
-         * @param  {Event}   event    name of event
-         * @param  {Function} listener listener function
-         * @return {this} returns this object for chaining
+         * @param    event    name of event
+         * @param  listener listener function
+         * @return returns this object for chaining
          */
         // tslint:disable-next-line ban-types
         on(event: string, listener: Function | JsonEventHandler | CsvEventHandler | DataEventHandler | ErrorEventHandler
@@ -247,22 +247,22 @@ declare namespace csvtojson {
 
         /**
          * Transform objects after CSV parsing but before result being emitted or pushed downstream.
-         * @param  {Function} callback transform function
-         * @return {this} returns this object for chaining
+         * @param  callback transform function
+         * @return returns this object for chaining
          */
         transf(callback: (jsonObj: any, csvRow: string[], rowNumber: number) => void): this;
 
         /**
          * The function in preRawData will be called directly with the string from upper stream.
-         * @param  {Function} callback callback function
-         * @return {this} returns this object for chaining
+         * @param  callback callback function
+         * @return returns this object for chaining
          */
         preRawData(callback: (csvRawData: string, cb: (newData: any) => void) => void): this;
 
         /**
          * The function is called each time a file line being found in csv stream.
-         * @param  {Function} callback callback function
-         * @return {this} returns this object for chaining
+         * @param  callback callback function
+         * @return returns this object for chaining
          */
         preFileLine(callback: (line: string, rowNumber: number) => string): this;
     }
@@ -270,9 +270,9 @@ declare namespace csvtojson {
 
 /**
  * Factory function which creates an instance of a Converter object.
- * @param {ConverterOptions} options       converter options
- * @param {StreamOptions}    streamOptions stream options
- * @return {csvtojson.Converter} Converter object
+ * @param options       converter options
+ * @param    streamOptions stream options
+ * @return Converter object
  */
 declare function csvtojson(options?: csvtojson.ConverterOptions, streamOptions?: csvtojson.StreamOptions): csvtojson.Converter;
 
diff --git a/types/cucumber/cucumber-tests.ts b/types/cucumber/cucumber-tests.ts
index 77760bd5ac..f2aed9aec4 100644
--- a/types/cucumber/cucumber-tests.ts
+++ b/types/cucumber/cucumber-tests.ts
@@ -12,8 +12,9 @@ function StepSample() {
     type Callback = cucumber.CallbackStepDefinition;
     type Table = cucumber.TableDefinition;
     type HookScenarioResult = cucumber.HookScenarioResult;
+    const Status = cucumber.Status;
 
-    cucumber.defineSupportCode(({setWorldConstructor, defineParameterType, After, Around, Before, registerHandler, Given, When, Then}) => {
+    cucumber.defineSupportCode(({setWorldConstructor, defineParameterType, After, AfterAll, Around, Before, BeforeAll, registerHandler, Given, When, Then}) => {
         setWorldConstructor(function({attach, parameters}) {
             this.attach = attach;
             this.parameters = parameters;
@@ -23,17 +24,37 @@ function StepSample() {
         });
 
         Before((scenarioResult: HookScenarioResult, callback: Callback) => {
-            console.log(scenarioResult.status === "failed");
+            console.log(scenarioResult.result.status === Status.FAILED);
             callback();
         });
 
         Before({ timeout: 1000 }, (scenarioResult: HookScenarioResult, callback: Callback) => {
-            console.log(scenarioResult.status === "failed");
+            console.log(scenarioResult.result.status === Status.FAILED);
+            callback();
+        });
+
+        Before('@tag', (scenarioResult: HookScenarioResult, callback: Callback) => {
+            console.log(scenarioResult.result.status === Status.FAILED);
+            callback();
+        });
+
+        BeforeAll((callback: Callback) => {
+            console.log("Before all");
+            callback();
+        });
+
+        BeforeAll({ timeout: 1000 }, (callback: Callback) => {
+            console.log("Before all");
+            callback();
+        });
+
+        BeforeAll('@tag', (callback: Callback) => {
+            console.log("Before all");
             callback();
         });
 
         Around((scenarioResult: HookScenarioResult, runScenario: (error: string | null, callback?: () => void) => void) => {
-            if (scenarioResult.status === "failed") {
+            if (scenarioResult.result.status === Status.FAILED) {
                 runScenario(null, () => {
                     console.log('finish tasks');
                 });
@@ -50,6 +71,26 @@ function StepSample() {
             callback();
         });
 
+        After('@tag', (scenarioResult: HookScenarioResult, callback: Callback) => {
+            console.log("After");
+            callback();
+        });
+
+        AfterAll((callback: Callback) => {
+            console.log("After all");
+            callback();
+        });
+
+        AfterAll({ timeout: 1000 }, (callback: Callback) => {
+            console.log("After all");
+            callback();
+        });
+
+        AfterAll('@tag', (callback: Callback) => {
+            console.log("After all");
+            callback();
+        });
+
         registerHandler('AfterFeatures', (event: any, callback: () => void) => {
             callback();
         });
@@ -124,7 +165,13 @@ function StepSample() {
         defineParameterType({
             regexp: /particular/,
             transformer: s => s.toUpperCase(),
-            typeName: 'param'
+            typeName: 'param'  // deprecated but still supported
+        });
+
+        defineParameterType({
+            regexp: /particularly/,
+            transformer: s => s.toUpperCase(),
+            name: 'param'
         });
 
         Given('a {param} step', param => {
diff --git a/types/cucumber/index.d.ts b/types/cucumber/index.d.ts
index d72b3ee4ac..8c2ad7020e 100644
--- a/types/cucumber/index.d.ts
+++ b/types/cucumber/index.d.ts
@@ -1,11 +1,21 @@
-// Type definitions for cucumber-js 2.0
+// Type definitions for cucumber-js 3.2
 // Project: https://github.com/cucumber/cucumber-js
 // Definitions by: Abraão Alves <https://github.com/abraaoalves>
 //                 Jan Molak <https://github.com/jan-molak>
 //                 Isaiah Soung <https://github.com/isoung>
 //                 BendingBender <https://github.com/BendingBender>
+//                 ErikSchierboom <https://github.com/ErikSchierboom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
+
+export enum Status {
+    AMBIGUOUS = "ambiguous",
+    FAILED = "failed",
+    PASSED = "passed",
+    PENDING = "pending",
+    SKIPPED = "skipped",
+    UNDEFINED = "undefined"
+}
 
 export interface World {
     [key: string]: any;
@@ -23,9 +33,7 @@ export interface TableDefinition {
     hashes(): Array<{ [colName: string]: string }>;
 }
 
-export type StepDefinitionParam = string | number | CallbackStepDefinition | TableDefinition;
-
-export type StepDefinitionCode = (this: World, ...stepArgs: StepDefinitionParam[]) => PromiseLike<any> | any | void;
+export type StepDefinitionCode = (this: World, ...stepArgs: any[]) => any;
 
 export interface StepDefinitionOptions {
     timeout?: number;
@@ -42,14 +50,53 @@ export interface StepDefinitions {
 }
 
 export interface HookScenarioResult {
+    sourceLocation: SourceLocation;
+    result: ScenarioResult;
+    pickle: pickle.Pickle;
+}
+
+export interface SourceLocation {
+    line: number;
+    url: string;
+}
+
+export interface ScenarioResult {
     duration: number;
-    failureException: Error;
-    scenario: Scenario;
-    status: string;
-    stepsResults: any;
+    status: Status;
+}
+
+export namespace pickle {
+    interface Pickle {
+        language: string;
+        locations: Location[];
+        name: string;
+        steps: Step[];
+        tags: string[];
+    }
+
+    interface Location {
+        column: number;
+        line: number;
+    }
+
+    interface Step {
+        arguments: Argument[];
+        locations: Location[];
+        text: string;
+    }
+
+    interface Argument {
+        rows: Cell[];
+    }
+
+    interface Cell {
+        location: Location;
+        value: string;
+    }
 }
 
 export type HookCode = (this: World, scenario: HookScenarioResult, callback?: CallbackStepDefinition) => void;
+export type GlobalHookCode = (callback?: CallbackStepDefinition) => void;
 
 // tslint:disable-next-line ban-types
 export type AroundCode = (scenario: HookScenarioResult, runScenario?: (error: string, callback?: Function) => void) => void;
@@ -57,7 +104,8 @@ export type AroundCode = (scenario: HookScenarioResult, runScenario?: (error: st
 export interface Transform {
     regexp: RegExp;
     transformer(arg: string): any;
-    typeName: string;
+    name?: string;
+    typeName?: string; // deprecated
 }
 
 export interface HookOptions {
@@ -67,9 +115,13 @@ export interface HookOptions {
 
 export interface Hooks {
     Before(code: HookCode): void;
-    Before(options: HookOptions, code: HookCode): void;
+    Before(options: HookOptions | string, code: HookCode): void;
+    BeforeAll(code: GlobalHookCode): void;
+    BeforeAll(options: HookOptions | string, code: GlobalHookCode): void;
     After(code: HookCode): void;
-    After(options: HookOptions, code: HookCode): void;
+    After(options: HookOptions | string, code: HookCode): void;
+    AfterAll(code: GlobalHookCode): void;
+    AfterAll(options: HookOptions | string, code: GlobalHookCode): void;
     Around(code: AroundCode): void;
     setDefaultTimeout(time: number): void;
     // tslint:disable-next-line ban-types
@@ -139,7 +191,7 @@ export namespace events {
         duration: any;
         failureException: Error;
         scenario: Scenario;
-        status: string;
+        status: Status;
         stepResults: any[];
     }
 
@@ -161,7 +213,7 @@ export namespace events {
         failureException: Error;
         step: Step;
         stepDefinition: StepDefinition;
-        status: string;
+        status: Status;
     }
 }
 
diff --git a/types/cuid/tslint.json b/types/cuid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cuid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/currency-formatter/currency-formatter-tests.ts b/types/currency-formatter/currency-formatter-tests.ts
index f06f53ce05..83617a6404 100644
--- a/types/currency-formatter/currency-formatter-tests.ts
+++ b/types/currency-formatter/currency-formatter-tests.ts
@@ -3,12 +3,21 @@ import currencyFormatter = require('currency-formatter');
 currencyFormatter.format(1000000, { code: 'USD' });
 // => '$1,000,000.00'
 
+currencyFormatter.unformat('$1,000,000.00', { code: 'USD' });
+// => 1000000
+
 currencyFormatter.format(1000000, { code: 'GBP' });
 // => '£1,000,000.00'
 
+currencyFormatter.unformat('£1,000,000.00', { code: 'GBP' });
+// => 1000000
+
 currencyFormatter.format(1000000, { code: 'EUR' });
 // => '1 000 000,00 €'
 
+currencyFormatter.unformat('1 000 000,00 €', { code: 'EUR' });
+// => 1000000
+
 currencyFormatter.findCurrency('USD');
 // returns:
 // {
diff --git a/types/currency-formatter/index.d.ts b/types/currency-formatter/index.d.ts
index 67591738ab..d88f18ea7c 100644
--- a/types/currency-formatter/index.d.ts
+++ b/types/currency-formatter/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for currency-formatter 1.0
+// Type definitions for currency-formatter 1.3
 // Project: https://github.com/smirzaei/currency-formatter#readme
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
+//                 David Paz <https://github.com/davidmpaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export interface Currency {
@@ -18,6 +19,7 @@ export const defaultCurrency: Currency;
 export function findCurrency(currencyCode: string): Currency;
 export function format(value: number, options: {
     code?: string,
+    locale?: string,
     symbol?: string,
     decimal?: string,
     thousand?: string,
@@ -28,3 +30,17 @@ export function format(value: number, options: {
         zero: string
     }
 }): string;
+
+export function unformat(value: string, options: {
+    code?: string,
+    locale?: string,
+    symbol?: string,
+    decimal?: string,
+    thousand?: string,
+    precision?: number,
+    format?: string | {
+        pos: string,
+        neg: string,
+        zero: string
+    }
+}): number;
diff --git a/types/custom-error-generator/tslint.json b/types/custom-error-generator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/custom-error-generator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cybozulabs-md5/tslint.json b/types/cybozulabs-md5/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/cybozulabs-md5/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/cypress/cypress-tests.ts b/types/cypress/cypress-tests.ts
deleted file mode 100644
index ac987e757a..0000000000
--- a/types/cypress/cypress-tests.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Samples taken from the cypress kitchen sink example (https://github.com/cypress-io/cypress-example-kitchensink)
-cy.title().should('include', 'Kitchen Sink');
-
-cy
-  .get('.query-list')
-  .contains('bananas').should('have.class', 'third')
-  .contains(/^b\w+/).should('have.class', 'third')
-  .get('.query-list')
-  .contains('apples').should('have.class', 'first')
-  .get('#querying')
-  .contains('ul', 'oranges').should('have.class', 'query-list')
-  .get('.query-button')
-  .contains('Save Form').should('have.class', 'btn');
-
-cy
-  .get('form')
-  .find('input')
-  .then($input => $input.click());
-
-cy
-  .wrap({ sum: (a: number, b: number, c: number) => a + b + c })
-  .invoke('sum', 2, 4, 6);
-
-cy
-  .get('ul>li')
-  .each(($el, index, $list) => {
-      // $el is wrapped jquery element
-      if ($el.someMethod() === "something") {
-        // wrap this element so we can
-        // use cypress commands on it
-        cy.wrap($el).click();
-      } else {
-        // do something else
-      }
-    })
-    .spread((x , y, z) => {
-        x + y + z;
-    });
diff --git a/types/cypress/index.d.ts b/types/cypress/index.d.ts
deleted file mode 100644
index e7f2a59447..0000000000
--- a/types/cypress/index.d.ts
+++ /dev/null
@@ -1,561 +0,0 @@
-// Type definitions for cypress 0.1
-// Project: https://cypress.io
-// Definitions by: Gert Hengeveld <https://github.com/ghengeveld>
-//                 Mike Woudenberg <https://github.com/mikewoudenberg>
-//                 Robbert van Markus <https://github.com/rvanmarkus>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-declare namespace Cypress {
-  type FileContents = string | any[] | object;
-  type HistoryDirection = "back" | "forward";
-  type HttpMethod = "GET" | "POST" | "PUT" | "DELETE" | "OPTIONS" | "HEAD" | "TRACE" | "CONNECT";
-  type RequestBody = string | object;
-  type ViewportOrientation = "portrait" | "landscape";
-
-  interface Core {
-    /**
-     * @see https://on.cypress.io/api/config
-     */
-    config(): object;
-    config(key: string): any;
-    config(key: string, value: any): void;
-    config(Object: object): void;
-
-    /**
-     * @see https://on.cypress.io/api/env
-     */
-    env(): object;
-    env(key: string): any;
-    env(key: string, value: any): void;
-    env(Object: object): void;
-
-    /**
-     * @see https://on.cypress.io/api/commands
-     */
-    addChildCommand(name: string, fn: (...args: any[]) => void): void;
-    addDualCommand(name: string, fn: (...args: any[]) => void): void;
-    addParentCommand(name: string, fn: (...args: any[]) => void): void;
-
-    _: any;
-    $: any;
-    minimatch: any;
-    moment: any;
-    Blob: any;
-    Promise: any;
-    Log: any;
-
-    /**
-     * @see https://on.cypress.io/api/cookies
-     */
-    Cookies: {
-      debug(enabled: boolean, options?: DebugOptions): void;
-      preserveOnce(...names: string[]): void;
-      defaults(options: CookieDefaults): void;
-    };
-
-    /**
-     * @see https://on.cypress.io/api/dom
-     */
-    Dom: {
-      isHidden(element: object): boolean;
-    };
-
-    /**
-     * @see https://on.cypress.io/api/api-server
-     */
-    Server: {
-      defaults(options: ServerOptions): void;
-    };
-  }
-
-  interface Chainable {
-    /**
-     * @see https://on.cypress.io/api/and
-     */
-    and(chainers: string, value?: any): Chainable;
-    and(chainers: string, method: string, value: any): Chainable;
-    and(fn: (currentSubject?: any) => void): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/as
-     */
-    as(alias: string): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/blur
-     */
-    blur(options?: BlurOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/check
-     */
-    check(options?: CheckOptions): Chainable;
-    check(value: string|string[]): Chainable; // no options
-
-    /**
-     * @see https://on.cypress.io/api/children
-     */
-    children(options?: LoggableTimeoutable): Chainable;
-    children(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/clear
-     */
-    clear(options?: ClearOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/clearcookie
-     */
-    clearCookie(name: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/clearcookies
-     */
-    clearCookies(options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/clearlocalstorage
-     */
-    clearLocalStorage(key?: string): Chainable;
-    clearLocalStorage(re: RegExp): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/click
-     */
-    click(options?: ClickOptions): Chainable;
-    click(position: string, options?: ClickOptions): Chainable;
-    click(x: number, y: number, options?: ClickOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/closest
-     */
-    closest(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/contains
-     */
-    contains(text: string, options?: LoggableTimeoutable): Chainable;
-    contains(num: number|RegExp): Chainable;
-    contains(selector: string, text: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/dblclick
-     */
-    dblclick(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/debug
-     */
-    debug(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/document
-     */
-    document(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/each
-     */
-    each(fn: (element?: any, index?: number, $list?: any) => void): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/end
-     */
-    end(): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/eq
-     */
-    eq(index: number, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/exec
-     */
-    exec(command: string, options?: ExecOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/filter
-     */
-    filter(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/find
-     */
-    find(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/first
-     */
-    first(options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/fixture
-     */
-    fixture(path: string, options?: Timeoutable): Chainable; // no log?
-    fixture(path: string, encoding: string, options?: Timeoutable): Chainable; // no log?
-
-    /**
-     * @see https://on.cypress.io/api/focus
-     */
-    focus(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/focused
-     */
-    focused(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/get
-     */
-    get(selector: string, options?: LoggableTimeoutable): Chainable;
-    get(alias: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/getcookie
-     */
-    getCookie(name: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/getcookies
-     */
-    getCookies(options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/go
-     */
-    go(direction: HistoryDirection|number, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/hash
-     */
-    hash(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/invoke
-     */
-    invoke(functionName: string, ...args: any[]): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/its
-     */
-    its(propertyName: string): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/last
-     */
-    last(options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/location
-     */
-    location(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/log
-     */
-    log(message: string, args: any): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/next
-     */
-    next(options?: LoggableTimeoutable): Chainable;
-    next(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/not
-     */
-    not(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/parent
-     */
-    parent(options?: LoggableTimeoutable): Chainable;
-    parent(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/parents
-     */
-    parents(options?: LoggableTimeoutable): Chainable;
-    parents(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/pause
-     */
-    pause(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/prev
-     */
-    prev(options?: LoggableTimeoutable): Chainable;
-    prev(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/readfile
-     */
-    readFile(filePath: string, options?: Timeoutable): Chainable; // no log?
-    readFile(filePath: string, encoding: string, options?: Timeoutable): Chainable; // no log?
-
-    /**
-     * @see https://on.cypress.io/api/reload
-     */
-    reload(options?: LoggableTimeoutable): Chainable;
-    reload(forceReload: boolean): Chainable; // no options?
-
-    /**
-     * @see https://on.cypress.io/api/request
-     */
-    request(url: string, body?: RequestBody): Chainable;
-    request(method: HttpMethod, url: string, body?: RequestBody): Chainable;
-    request(options: RequestOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/root
-     */
-    root(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/route
-     */
-    route(url: string, response?: any): Chainable;
-    route(method: string, url: string, response?: any): Chainable;
-    route(fn: () => RouteOptions | RouteOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/screenshot
-     */
-    screenshot(options?: LoggableTimeoutable): Chainable;
-    screenshot(fileName: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/select
-     */
-    select(text: string|string[], options?: SelectOptions): Chainable;
-    select(value: string|string[], options?: SelectOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/server
-     */
-    server(options?: ServerOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/setcookie
-     */
-    setCookie(name: string, value: string, options?: SetCookieOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/should
-     */
-    should(chainers: string, value?: any): Chainable;
-    should(chainers: string, method: string, value: any): Chainable;
-    should(fn: (currentSubject?: any) => void): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/siblings
-     */
-    siblings(options?: LoggableTimeoutable): Chainable;
-    siblings(selector: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/spread
-     */
-    spread(fn: (...args: any[]) => any): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/submit
-     */
-    submit(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/then
-     */
-    then(fn: (currentSubject: any) => any): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/title
-     */
-    title(options?: Loggable): Chainable;
-
-    /**
-     * @description Trigger an event on a DOM element.
-     * @see https://docs.cypress.io/api/commands/trigger.html
-     */
-    trigger(eventName: string, position?: PositionType, x?: number, y?: number, options?: TriggerOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/type
-     */
-    type(text: string, options?: TypeOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/uncheck
-     */
-    uncheck(options?: CheckOptions): Chainable;
-    uncheck(values: string[]): Chainable; // no options? missing single value variant
-
-    /**
-     * @see https://on.cypress.io/api/url
-     */
-    url(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/viewport
-     */
-    viewport(width: number, height: number, options?: Loggable): Chainable;
-    viewport(preset: string, orientation: ViewportOrientation, options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/visit
-     */
-    visit(url: string, options?: VisitOptions): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/wait
-     */
-    wait(ms: number|string[]): Chainable; // no options?
-    wait(alias: string, options?: LoggableTimeoutable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/window
-     */
-    window(options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/within
-     */
-    within(fn: (currentSubject?: any) => void): Chainable;
-    within(options: Loggable, fn: (currentSubject?: any) => void): Chainable; // inconsistent argument order
-
-    /**
-     * @see https://on.cypress.io/api/wrap
-     */
-    wrap(Object: object, options?: Loggable): Chainable;
-
-    /**
-     * @see https://on.cypress.io/api/writefile
-     */
-    writeFile(filePath: string, contents: FileContents, options?: Timeoutable): Chainable;
-    writeFile(filePath: string, contents: FileContents, encoding: string, options?: Timeoutable): Chainable;
-  }
-
-  interface DebugOptions {
-    verbose?: boolean;
-  }
-
-  interface CookieDefaults {
-    whitelist?: string | string[] | RegExp | ((cookie: any) => boolean);
-  }
-
-  interface Loggable {
-    log?: boolean;
-  }
-
-  interface Timeoutable {
-    timeout?: number;
-  }
-
-  interface LoggableTimeoutable extends Loggable, Timeoutable {}
-
-  interface BlurOptions extends Loggable {
-    force?: boolean;
-  }
-
-  interface CheckOptions extends Loggable, Timeoutable {
-    interval?: number;
-    force?: boolean;
-  }
-
-  interface ClearOptions extends Loggable, Timeoutable {
-    force?: boolean;
-    interval?: number;
-  }
-
-  interface ClickOptions extends Loggable, Timeoutable {
-    force?: boolean;
-    multiple?: boolean;
-    interval?: number;
-  }
-
-  interface ExecOptions extends Loggable, Timeoutable {
-    failOnNonZeroExit?: boolean;
-    env?: object;
-  }
-
-  interface RequestOptions extends Loggable, Timeoutable {
-    auth?: object;
-    body?: RequestBody;
-    failOnStatusCode?: boolean;
-    followRedirect?: boolean;
-    form?: boolean;
-    gzip?: boolean;
-    headers?: object;
-    method?: HttpMethod;
-    qs?: string;
-    url: string;
-  }
-
-  interface RouteOptions {
-    method?: HttpMethod;
-    url?: string | RegExp;
-    response?: any;
-    status?: number;
-    delay?: number;
-    headers?: object;
-    force404?: boolean;
-    onRequest?(...args: any[]): void;
-    onResponse?(...args: any[]): void;
-    onAbort?(...args: any[]): void;
-  }
-
-  interface SelectOptions extends Loggable, Timeoutable {
-    force?: boolean;
-    interval?: number;
-  }
-
-  interface ServerOptions {
-    delay?: number;
-    method?: HttpMethod;
-    status?: number;
-    headers?: object;
-    response?: any;
-    onRequest?(...args: any[]): void;
-    onResponse?(...args: any[]): void;
-    onAbort?(...args: any[]): void;
-    enable?: boolean;
-    force404?: boolean;
-    urlMatchingOptions?: object;
-    whitelist?(...args: any[]): void;
-  }
-
-  interface SetCookieOptions extends Loggable, Timeoutable {
-    path?: string;
-    domain?: string;
-    secure?: boolean;
-    httpOnly?: boolean;
-    expiry?: number;
-  }
-
-  interface TypeOptions extends Loggable, Timeoutable {
-    delay?: number;
-    force?: boolean;
-    release?: boolean;
-    interval?: number;
-  }
-
-  interface VisitOptions extends Loggable, Timeoutable {
-    onBeforeLoad?(args: any[]): void;
-    onLoad?(args: any[]): void;
-  }
-
-  interface TriggerOptions {
-    log?: boolean;
-    force?: boolean;
-    bubbles?: boolean;
-    cancable?: boolean;
-    timeout?: number;
-  }
-
-  type PositionType = "topLeft" | "top" | "topRight" | "left" | "center" | "right" | "bottomLeft" | "bottom" | "bottomRight";
-}
-
-declare const cy: Cypress.Chainable;
diff --git a/types/cypress/tsconfig.json b/types/cypress/tsconfig.json
deleted file mode 100644
index 93fcd9f8c2..0000000000
--- a/types/cypress/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cypress-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cytoscape/cytoscape-tests.ts b/types/cytoscape/cytoscape-tests.ts
new file mode 100644
index 0000000000..0b7bac436e
--- /dev/null
+++ b/types/cytoscape/cytoscape-tests.ts
@@ -0,0 +1,82 @@
+'use strict';
+import cytoscape = require('cytoscape');
+
+const parentCSS = {
+  'padding-top': '10px',
+  'padding-left': '10px',
+  'padding-bottom': '10px',
+  'padding-right': '10px',
+  'text-valign': 'top',
+  'text-halign': 'center',
+  'background-color': '#CCC',
+  'font-size': 40,
+  'min-zoomed-font-size': 15
+};
+
+const showAllStyle: cytoscape.Stylesheet[] = [
+  {
+    selector: 'node',
+    css: {
+      content: 'data(id)',
+      'text-valign': 'center',
+      'text-halign': 'center',
+      shape: 'rectangle',
+      'min-zoomed-font-size': 20,
+      opacity: 1
+    }
+  },
+  {
+    selector: '$node > node',
+    css: parentCSS
+  },
+  {
+    selector: 'edge',
+    css: {
+      'target-arrow-shape': 'triangle'
+    }
+  },
+  {
+    selector: ':selected',
+    css: {
+      'background-color': 'black',
+      'line-color': 'black',
+      'target-arrow-color': 'black',
+      'source-arrow-color': 'black'
+    }
+  }
+];
+
+const cy = cytoscape({
+  container: document.getElementById('cy'),
+
+  boxSelectionEnabled: false,
+  autounselectify: true,
+
+  style: showAllStyle,
+
+  elements: {
+    nodes: [
+      { data: { id: 'a', parent: 'b' }, position: { x: 215, y: 85 } },
+      { data: { id: 'b' } },
+      { data: { id: 'c', parent: 'b' }, position: { x: 300, y: 85 } },
+      { data: { id: 'd' }, position: { x: 215, y: 175 } },
+      { data: { id: 'e' } },
+      { data: { id: 'f', parent: 'e' }, position: { x: 300, y: 175 } }
+    ],
+    edges: [
+      { data: { id: 'ad', source: 'a', target: 'd' } },
+      { data: { id: 'eb', source: 'e', target: 'b' } }
+    ]
+  },
+
+  layout: {
+    name: 'preset',
+    padding: 5
+  }
+});
+
+cy.on('zoom', (event) => {
+  if (cy.zoom() <= 1) {
+    cy.nodes('$node > node').style('opacity', 0);
+  }
+});
diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
new file mode 100644
index 0000000000..bf3439324b
--- /dev/null
+++ b/types/cytoscape/index.d.ts
@@ -0,0 +1,4529 @@
+// Type definitions for Cytoscape.js 3.1
+// Project: http://js.cytoscape.org/
+// Definitions by:  Fabian Schmidt and Fred Eisele <https://github.com/phreed>
+//                  Shenghan Gao <https://github.com/wy193777>
+//                  Yuri Pereira Constante <https://github.com/ypconstante>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+//
+// Translation from Objects in help to Typescript interface.
+// http://js.cytoscape.org/#notation/functions
+//
+
+/**
+ * cy   --> Cy.Core
+ *  the core
+ *
+ * eles --> Cy.Collection
+ *  a collection of one or more elements (nodes and edges)
+ *
+ * ele  --> Cy.Singular
+ *  a collection of a single element (node or edge)
+ *
+ * node --> Cy.NodeSingular
+ *  a collection of a single node
+ *
+ * nodes -> Cy.NodeCollection
+ *  a collection of one or more nodes
+ *
+ * edge --> Cy.EdgeSingular
+ *  a collection of a single edge
+ *
+ * edges -> Cy.EdgeCollection
+ *  a collection of one or more edges
+ *
+ * The library makes a distinction between input and output parameters
+ *  due to the dynamic behaviour of the Cytoscape library.
+ *
+ * For a input parameter it will always expect:
+ *  - Cy.Collection
+ *      The input can be any element (node and edge) collection.
+ *  - Cy.NodeCollection
+ *      The input must be a node collection.
+ *  - Cy.EdgeCollection
+ *      The input must be a edge collection.
+ *  - Cy.Singular
+ *      The input must be a single element.
+ *  - Cy.NodeSingular
+ *      The inut must be a single node.
+ *  - Cy.EdgeSingular
+ *      The input must be a single edge.
+ *
+ * For a output of a function it will always give:
+ *  - Cy.CollectionElements
+ *      The output is a collection of node and edge elements OR single element.
+ *  - Cy.EdgeCollection
+ *      The output is a collection of edge elements OR single edge.
+ *  - Cy.NodeCollection
+ *      The output is a collection of node elements OR single node.
+ *
+ * A number of interfaces contain nothing as they server to collect interfaces.
+ *
+ */
+export = cytoscape;
+export as namespace cytoscape;
+
+declare function cytoscape(options?: cytoscape.CytoscapeOptions): cytoscape.Core;
+declare function cytoscape(extensionName: string, foo: string, bar: any): cytoscape.Core;
+
+declare namespace cytoscape {
+    interface Position {
+        x: number;
+        y: number;
+    }
+
+    type CssStyleDeclaration = any;
+
+    interface ElementDefinition {
+        group?: ElementGroup;
+        data: NodeDataDefinition | EdgeDataDefinition;
+        /**
+         * Scratchpad data (usually temp or nonserialisable data)
+         */
+        scatch?: Scratchpad;
+        /**
+         * The model position of the node (optional on init, mandatory after)
+         */
+        position?: Position;
+        /**
+         * can alternatively specify position in rendered on-screen pixels
+         */
+        renderedPosition?: Position;
+        /**
+         * Whether the element is selected (default false)
+         */
+        selected?: boolean;
+        /**
+         * Whether the selection state is mutable (default true)
+         */
+        selectable?: boolean;
+        /**
+         * When locked a node's position is immutable (default false)
+         */
+        locked?: boolean;
+        /**
+         * Wether the node can be grabbed and moved by the user
+         */
+        grabbable?: boolean;
+        /**
+         * a space separated list of class names that the element has
+         */
+        classes?: string;
+        /**
+         *  CssStyleDeclaration;
+         */
+        style?: CssStyleDeclaration;
+        /**
+         * you should only use `style`/`css` for very special cases; use classes instead
+         */
+        css?: Css.Node | Css.Edge;
+    }
+
+    interface ElementDataDefinition {
+        /**
+         * elided id => autogenerated id
+         */
+        id?: string;
+        position?: Position;
+    }
+
+    interface EdgeDefinition extends ElementDefinition {
+        data: EdgeDataDefinition;
+    }
+
+    interface EdgeDataDefinition extends ElementDataDefinition {
+        /**
+         * the source node id (edge comes from this node)
+         */
+        source: string;
+        /**
+         * the target node id (edge goes to this node)
+         */
+        target: string;
+    }
+
+    interface NodeDefinition extends ElementDefinition {
+        data: NodeDataDefinition;
+    }
+
+    interface NodeDataDefinition extends ElementDataDefinition {
+        parent?: string;
+    }
+
+    interface CytoscapeOptions {
+        ///////////////////////////////////////
+        // very commonly used options:
+        /**
+         * A HTML DOM element in which the graph should be rendered.
+         * This is optional if Cytoscape.js is run headlessly or if you initialise using jQuery (in which case your jQuery object already has an associated DOM element).
+         *
+         * The default is undefined.
+         */
+        container?: HTMLElement | null;
+
+        /**
+         * An array of [[Elements]] specified as plain objects. For convenience, this option can alternatively be specified as a promise that resolves to the elements JSON.
+         */
+        elements?: ElementsDefinition | ElementDefinition[] | Promise<ElementsDefinition> | Promise<ElementDefinition[]>;
+        /**
+         * The [[Stylesheet]] used to style the graph. For convenience, this option can alternatively be specified as a promise that resolves to the stylesheet.
+         */
+        style?: Stylesheet[] | Promise<Stylesheet[]>;
+        /**
+         * A plain object that specifies layout options.
+         * Which layout is initially run is specified by the name field.
+         * Refer to a layout's documentation for the options it supports.
+         * If you want to specify your node positions yourself in your elements JSON,
+         * you can use the preset layout — by default it does not set any positions,
+         * leaving your nodes in their current positions
+         * (e.g. specified in options.elements at initialisation time)
+         */
+        layout?: LayoutOptions;
+
+        ///////////////////////////////////////
+        // initial viewport state:
+        /**
+         * The initial zoom level of the graph.
+         * Make sure to disable viewport manipulation options, such as fit, in your layout so that it is not overridden when the layout is applied.
+         * You can set options.minZoom and options.maxZoom to set restrictions on the zoom level.
+         *
+         * The default value is 1.
+         */
+        zoom?: number;
+        /**
+         * The initial panning position of the graph. Make sure to disable viewport manipulation options, such as fit,
+         * in your layout so that it is not overridden when the layout is applied.
+         */
+        pan?: Position;
+
+        ///////////////////////////////////////
+        // interaction options?:
+        /**
+         * A minimum bound on the zoom level of the graph. The viewport can not be scaled smaller than this zoom level.
+         *
+         * The default value is 1e-50.
+         */
+        minZoom?: number;
+        /**
+         * A maximum bound on the zoom level of the graph. The viewport can not be scaled larger than this zoom level.
+         *
+         * The default value is 1e50.
+         */
+        maxZoom?: number;
+        /**
+         * Whether zooming the graph is enabled, both by user events and programmatically.
+         *
+         * The default value is true.
+         */
+        zoomingEnabled?: boolean;
+        /**
+         * Whether user events (e.g. mouse wheel, pinch-to-zoom) are allowed to zoom the graph. Programmatic changes to zoom are unaffected by this option.
+         *
+         * The default value is true.
+         */
+        userZoomingEnabled?: boolean;
+        /**
+         * Whether panning the graph is enabled, both by user events and programmatically.
+         *
+         * The default value is true.
+         */
+        panningEnabled?: boolean;
+        /**
+         * Whether user events (e.g. dragging the graph background) are allowed to pan the graph. Programmatic changes to pan are unaffected by this option.
+         *
+         * The default value is true.
+         */
+        userPanningEnabled?: boolean;
+        /**
+         * Whether box selection (i.e. drag a box overlay around, and release it to select) is enabled. If enabled, the user must taphold to pan the graph.
+         *
+         * The default value is false.
+         */
+        boxSelectionEnabled?: boolean;
+        /**
+         * A string indicating the selection behaviour from user input.
+         * By default, this is set automatically for you based on the type of input device detected.
+         * On touch devices, 'additive' is default — a new selection made by the user adds to the set of currenly selected elements.
+         * On mouse-input devices, 'single' is default — a new selection made by the user becomes the entire set of currently selected elements (i.e. the previous elements are unselected).
+         *
+         * The default value is (isTouchDevice ? 'additive' : 'single').
+         */
+        selectionType?: SelectionType;
+        /**
+         * A nonnegative integer that indicates the maximum allowable distance that a user may move during a tap gesture,
+         * on touch devices and desktop devices respectively.
+         *
+         * This makes tapping easier for users.
+         * These values have sane defaults, so it is not advised to change these options unless you have very good reason for doing so.
+         * Larger values will almost certainly have undesirable consequences.
+         *
+         * The default value is is 8.
+         */
+        touchTapThreshold?: number;
+        /**
+         * A nonnegative integer that indicates the maximum allowable distance that a user may move during a tap gesture,
+         * on touch devices and desktop devices respectively.
+         *
+         * This makes tapping easier for users.
+         * These values have sane defaults,
+         * so it is not advised to change these options unless you have very good reason for doing so.
+         * Larger values will almost certainly have undesirable consequences.
+         *
+         * The default value is 4.
+         */
+        desktopTapThreshold?: number;
+        /**
+         * Whether nodes should be locked (not draggable at all) by default (if true, overrides individual node state).
+         *
+         * The default value is false.
+         */
+        autolock?: boolean;
+        /**
+         * Whether nodes should be ungrabified (not grabbable by user) by default (if true, overrides individual node state).
+         *
+         * The default value is false.
+         */
+        autoungrabify?: boolean;
+        /**
+         * Whether nodes should be unselectified (immutable selection state) by default (if true, overrides individual element state).
+         *
+         * The default value is false.
+         */
+        autounselectify?: boolean;
+
+        ///////////////////////////////////////
+        // rendering options:
+        /**
+         * A convenience option that initialises the Core to run headlessly.
+         * You do not need to set this in environments that are implicitly headless (e.g. Node.js).
+         * However, it is handy to set headless: true if you want a headless Core in a browser.
+         *
+         * The default value is false.
+         */
+        headless?: boolean;
+        /**
+         * A boolean that indicates whether styling should be used.
+         * For headless (i.e. outside the browser) environments,
+         * display is not necessary and so neither is styling necessary — thereby speeding up your code.
+         * You can manually enable styling in headless environments if you require it for a special case.
+         * Note that it does not make sense to disable style if you plan on rendering the graph.
+         *
+         * The default value is true.
+         */
+        styleEnabled?: boolean;
+        /**
+         * When set to true, the renderer does not render edges while the viewport is being manipulated.
+         * This makes panning, zooming, dragging, et cetera more responsive for large graphs.
+         *
+         * The default value is false.
+         */
+        hideEdgesOnViewport?: boolean;
+        /**
+         * when set to true, the renderer does not render labels while the viewport is being manipulated.
+         * This makes panning, zooming, dragging, et cetera more responsive for large graphs.
+         *
+         * The default value is false.
+         */
+        hideLabelsOnViewport?: boolean;
+        /**
+         * When set to true, the renderer uses a texture (if supported) during panning and zooming instead of drawing the elements,
+         * making large graphs more responsive.
+         *
+         * The default value is false.
+         */
+        textureOnViewport?: boolean;
+        /**
+         * When set to true, the renderer will use a motion blur effect to make the transition between frames seem smoother.
+         * This can significantly increase the perceived performance for a large graphs.
+         *
+         * The default value is false.
+         */
+        motionBlur?: boolean;
+        /**
+         * When motionBlur: true, this value controls the opacity of motion blur frames.
+         * Higher values make the motion blur effect more pronounced.
+         *
+         * The default value is 0.2.
+         */
+        motionBlurOpacity?: number;
+        /**
+         * Changes the scroll wheel sensitivity when zooming. This is a multiplicative modifier.
+         * So, a value between 0 and 1 reduces the sensitivity (zooms slower), and a value greater than 1 increases the sensitivity (zooms faster).
+         *
+         * The default value is 1.
+         */
+        wheelSensitivity?: number;
+        /**
+         * Overrides the screen pixel ratio with a manually set value (1.0 or 0.666 recommended, if set).
+         * This can be used to increase performance on high density displays by reducing the effective area that needs to be rendered.
+         * If you want to use the hardware's actual pixel ratio at the expense of performance, you can set pixelRatio: 'auto'.
+         *
+         * The default value is 1.
+         */
+        pixelRatio?: number;
+    }
+
+    /**
+     *  cy   --> Cy.Core
+     *   The core object is your interface to a graph.
+     *
+     * It is your entry point to Cytoscape.js:
+     * All of the library’s features are accessed through this object.
+     * http://js.cytoscape.org/#core
+     */
+    interface Core extends
+        CoreGraphManipulation, CoreGraphManipulationExt,
+        CoreEvents, CoreViewportManipulation, CoreAnimation,
+        CoreLayout, CoreStyle, CoreExport { }
+
+    /**
+     * These are the principle functions used to interact with the graph model.
+     *
+     * http://js.cytoscape.org/#core/graph-manipulation
+     */
+    interface CoreGraphManipulation {
+        /**
+         * Add elements to the graph and return them.
+         */
+        add(eles: ElementDefinition | ElementDefinition[] | Collection): CollectionElements;
+
+        /**
+         * Remove elements in collecion or match the selector from the graph and return them.
+         */
+        remove(eles: Collection | Selector): CollectionElements;
+
+        /**
+         * Get a collection from elements in the graph matching the specified selector or from an array of elements.
+         * If no parameter specified, an empty collection will be returned
+         */
+        collection(eles?: Selector | CollectionElements[]): CollectionElements;
+
+        /**
+         * Get an element from its ID in a very performant way.
+         */
+        getElementById(id: string): CollectionElements;
+
+        /**
+         * Get elements in the graph matching the specified selector.
+         * http://js.cytoscape.org/#cy.$
+         */
+        $(selector: Selector): CollectionElements;
+
+        /**
+         * Get elements in the graph matching the specified selector.
+         * http://js.cytoscape.org/#cy.$
+         */
+        elements(selector?: Selector): CollectionElements;
+
+        /**
+         * Get nodes in the graph matching the specified selector.
+         */
+        nodes(selector?: Selector): NodeCollection;
+
+        /**
+         * Get edges in the graph matching the specified selector.
+         */
+        edges(selector?: Selector): EdgeCollection;
+        /**
+         * Get elements in the graph matching the specified selector or filter function.
+         */
+        filter(selector: Selector | ((i: number, ele: Singular) => boolean)): CollectionElements;
+
+        /**
+         * Allow for manipulation of elements without triggering multiple style calculations or multiple redraws.
+         * http://js.cytoscape.org/#cy.batch
+         *  A callback within which you can make batch updates to elements.
+         */
+        batch(callback: () => void): void;
+        /**
+         * Allow for manipulation of elements without triggering multiple style calculations or multiple redraws.
+         * http://js.cytoscape.org/#cy.batch
+         *
+         * Starts batching manually (useful for asynchronous cases).
+         */
+        startBatch(): void;
+        /**
+         * Allow for manipulation of elements without triggering multiple style calculations or multiple redraws.
+         * http://js.cytoscape.org/#cy.batch
+         *
+         * Ends batching manually (useful for asynchronous cases).
+         */
+        endBatch(): void;
+
+        /**
+         * A convenience function to explicitly destroy the Core.
+         * http://js.cytoscape.org/#cy.destroy
+         */
+        destroy(): void;
+    }
+
+    /**
+     * http://js.cytoscape.org/#core/graph-manipulation
+     * http://js.cytoscape.org/#extensions
+     * These functions are intended for use in extensions.
+     */
+    interface CoreGraphManipulationExt {
+        /**
+         * Set the scratchpad at a particular namespace,
+         * where temporary or non-JSON data can be stored.
+         * App-level scratchpad data should use namespaces prefixed with underscore, like '_foo'.
+         *
+         * If no parameter provided, the entire scratchpad will be returned.
+         * If only namespace provided, the scratchpad with the namespace will be returned.
+         *
+         * @param namespace A namespace string.
+         * @param value The value to set at the specified namespace.
+         */
+        scratch(namespace?: string, value?: any): Scratchpad;
+
+        /**
+         * Remove scratchpad data. You should remove scratchpad data only at your own namespaces.
+         * http://js.cytoscape.org/#cy.removeScratch
+         *
+         * @param namespace A namespace string.
+         */
+        removeScratch(namespace: string): void;
+    }
+
+    /**
+     * The principle events from the graph model.
+     *  http://js.cytoscape.org/#core/events
+     */
+    interface CoreEvents {
+        /**
+         * Bind to events that occur in the graph.
+         *
+         * @param events A space separated list of event names.
+         * @param handler The handler function that is called when one of the specified events occurs.
+         * @param selector A selector to specify elements for which the handler is triggered.
+         * @param data A plain object which is passed to the handler in the event object argument.
+         * @param eventsMap A map of event names to handler functions.
+         */
+
+        on(events: EventNames, handler: EventHandler): void;
+        on(events: EventNames, selector: Selector, handler: EventHandler): void;
+        on(events: EventNames, selector: Selector, data: any, handler: EventHandler): void;
+        on(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): void;
+
+        bind(events: EventNames, handler: EventHandler): void;
+        bind(events: EventNames, selector: Selector, handler: EventHandler): void;
+        bind(events: EventNames, selector: Selector, data: any, handler: EventHandler): void;
+        bind(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): void;
+
+        listen(events: EventNames, handler: EventHandler): void;
+        listen(events: EventNames, selector: Selector, handler: EventHandler): void;
+        listen(events: EventNames, selector: Selector, data: any, handler: EventHandler): void;
+        listen(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): void;
+
+        addListener(events: EventNames, handler: EventHandler): void;
+        addListener(events: EventNames, selector: Selector, handler: EventHandler): void;
+        addListener(events: EventNames, selector: Selector, data: any, handler: EventHandler): void;
+        addListener(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): void;
+
+        /**
+         * Get a promise that is resolved with the first
+         * of any of the specified events triggered on the graph.
+         * @param events A space separated list of event names.
+         * @param selector [optional] A selector to specify elements for which the handler is triggered.
+         */
+        promiseOn(events: EventNames, selector?: Selector): Promise<EventHandler>;
+        pon(events: EventNames, selector?: Selector): Promise<EventHandler>;
+        /**
+         * Bind to events that occur in the graph, and trigger the handler only once.
+         *
+         * @param events A space separated list of event names.
+         * @param handler The handler function that is called when one of the specified events occurs.
+         */
+        one(events: EventNames, handler: EventHandler): void;
+        /**
+         * Bind to events that occur in the graph, and trigger the handler only once.
+         *
+         * @param events A space separated list of event names.
+         * @param handler The handler function that is called when one of the specified events occurs.
+         * @param selector A selector to specify elements for which the handler is triggered.
+         */
+        one(events: EventNames, selector: Selector, handler: EventHandler): void;
+        /**
+         * Bind to events that occur in the graph, and trigger the handler only once.
+         *
+         * @param events A space separated list of event names.
+         * @param handler The handler function that is called when one of the specified events occurs.
+         * @param selector A selector to specify elements for which the handler is triggered.
+         * @param data A plain object which is passed to the handler in the event object argument.
+         */
+        one(events: EventNames, selector: Selector, data: any, handler: EventHandler): void;
+        /**
+         * Bind to events that occur in the graph, and trigger the handler only once.
+         *
+         * @param eventsMap A map of event names to handler functions.
+         * @param selector A selector to specify elements for which the handler is triggered.
+         * @param data A plain object which is passed to the handler in the event object argument.
+         */
+        one(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): void;
+
+        /**
+         * Remove event handlers.
+         *  http://js.cytoscape.org/#cy.off
+         *
+         * @param events A space separated list of event names.
+         * @param selector [optional] The same selector used to bind to the events.
+         * @param handler [optional] A reference to the handler function to remove.
+         * @param eventsMap A map of event names to handler functions to remove.
+         */
+        off(events: EventNames, selector?: Selector, handler?: EventHandler): void;
+        off(eventsMap: { [value: string]: EventHandler }, selector?: Selector): void;
+
+        unbind(events: EventNames, selector?: Selector, handler?: EventHandler): void;
+        unbind(eventsMap: { [value: string]: EventHandler }, selector?: Selector): void;
+
+        unlisten(events: EventNames, selector?: Selector, handler?: EventHandler): void;
+        unlisten(eventsMap: { [value: string]: EventHandler }, selector?: Selector): void;
+
+        removeListener(events: EventNames, selector?: Selector, handler?: EventHandler): void;
+        removeListener(eventsMap: { [value: string]: EventHandler }, selector?: Selector): void;
+
+        /**
+         * Trigger one or more events.
+         *
+         * @param events A space separated list of event names to trigger.
+         * @param extraParams [optional] An array of additional parameters to pass to the handler.
+         */
+        trigger(events: EventNames, extraParams?: any[]): void;
+        emit(events: EventNames, extraParams?: any[]): void;
+
+        /**
+         * Run a callback as soon as the graph becomes ready. If the graph is already ready, then the callback is called immediately.
+         * @param fn The callback run as soon as the graph is ready, inside which this refers to the core (cy).
+         */
+        ready(fn: EventHandler): void;
+    }
+
+    interface ZoomOptions {
+        /** The zoom level to set. */
+        level: number;
+        /** The position about which to zoom. */
+        position: Position;
+        /** The rendered position about which to zoom. */
+        renderedPosition: Position;
+    }
+    /**
+     * http://js.cytoscape.org/#core/viewport-manipulation
+     */
+    interface CoreViewportManipulation {
+        /**
+         * Get the HTML DOM element in which the graph is visualised.
+         * A null value is returned if the Core is headless.
+         */
+        container(): any;
+
+        /**
+         * Pan the graph to the centre of a collection.
+         *
+         * @param eles The collection to centre upon.
+         */
+        center(eles?: Collection): CollectionElements;
+
+        /**
+         * Pan and zooms the graph to fit to a collection.
+         * http://js.cytoscape.org/#cy.fit
+         *
+         * @param eles [optional] The collection to fit to.
+         * @param padding [optional] An amount of padding (in pixels) to have around the graph
+         */
+        fit(eles?: Collection, padding?: number): CollectionElements;
+
+        /**
+         * Reset the graph to the default zoom level and panning position.
+         * http://js.cytoscape.org/#cy.reset
+         */
+        reset(): CollectionElements;
+
+        /**
+         * Get the panning position of the graph.
+         * http://js.cytoscape.org/#cy.pan
+         */
+        pan(): Position;
+
+        /**
+         * Set the panning position of the graph.
+         * http://js.cytoscape.org/#cy.pan
+         *
+         * @param renderedPosition The rendered position to pan the graph to.
+         */
+        pan(renderedPosition?: Position): void;
+
+        /**
+         * Relatively pan the graph by a specified rendered position vector.
+         * http://js.cytoscape.org/#cy.panBy
+         *
+         * @param renderedPosition The rendered position vector to pan the graph by.
+         */
+        panBy(renderedPosition: Position): void;
+
+        /**
+         * Get whether panning is enabled.
+         * If cy.boxSelectionEnabled() === true, then the user
+         * must taphold to initiate panning.
+         * http://js.cytoscape.org/#cy.panningEnabled
+         */
+        panningEnabled(): boolean;
+
+        /**
+         * Set whether panning is enabled. If cy.boxSelectionEnabled() === true, then the user must taphold to initiate panning.
+         * http://js.cytoscape.org/#cy.panningEnabled
+         *
+         * @param bool A truthy value enables panning; a falsey value disables it.
+         */
+        panningEnabled(bool: boolean): void;
+
+        /**
+         * Get whether panning by user events (e.g. dragging the graph background) is enabled. If cy.boxSelectionEnabled() === true, then the user must taphold to initiate panning.
+         * http://js.cytoscape.org/#cy.userPanningEnabled
+         */
+        userPanningEnabled(): boolean;
+
+        /**
+         * Set whether panning by user events (e.g. dragging the graph background) is enabled. If cy.boxSelectionEnabled() === true, then the user must taphold to initiate panning.
+         * http://js.cytoscape.org/#cy.userPanningEnabled
+         *
+         * @param bool A truthy value enables user panning; a falsey value disables it.
+         */
+        userPanningEnabled(bool: boolean): void;
+        /**
+         * Get the zoom level.
+         * http://js.cytoscape.org/#cy.zoom
+         */
+        zoom(): number;
+        /**
+         * Set the zoom level.
+         * http://js.cytoscape.org/#cy.zoom
+         *
+         * @param level The zoom level to set.
+         * @param options The options for zooming.
+         */
+        zoom(level?: number | ZoomOptions): void;
+
+        /**
+         * Set or get whether zooming is enabled. Get if no parameter provided.
+         * http://js.cytoscape.org/#cy.zoomingEnabled
+         *
+         * @param bool A truthy value enables zooming; a falsey value disables it.
+         */
+        zoomingEnabled(bool?: boolean): void;
+
+        /**
+         * Get whether zooming by user events (e.g. mouse wheel, pinch-to-zoom)
+         * is enabled.
+         * http://js.cytoscape.org/#cy.userZoomingEnabled
+         */
+        userZoomingEnabled(): boolean;
+        /**
+         * Get or set whether zooming by user events get if no parameter provided
+         * (e.g. mouse wheel, pinch-to-zoom) is enabled.
+         * http://js.cytoscape.org/#cy.userZoomingEnabled
+         *
+         * @param bool A truthy value enables user zooming; a falsey value disables it.
+         */
+        userZoomingEnabled(bool?: boolean): void;
+
+        /**
+         * Get the minimum zoom level.
+         * http://js.cytoscape.org/#cy.minZoom
+         */
+        minZoom(): number;
+        /**
+         * Set the minimum zoom level.
+         * http://js.cytoscape.org/#cy.minZoom
+         *
+         * @param zoom The new minimum zoom level to use.
+         */
+        minZoom(zoom: number): void;
+
+        /**
+         * Get the maximum zoom level.
+         * http://js.cytoscape.org/#cy.maxZoom
+         */
+        maxZoom(): number;
+        /**
+         * Set the maximum zoom level.
+         * http://js.cytoscape.org/#cy.maxZoom
+         *
+         * @param zoom The new maximum zoom level to use.
+         */
+        maxZoom(zoom: number): void;
+
+        /**
+         * Set the viewport state (pan & zoom) in one call.
+         * http://js.cytoscape.org/#cy.viewport
+         *
+         * @param zoom The zoom level to set.
+         * @param pan The pan to set (a rendered position).
+         */
+        viewport(zoom: number, pan: Position): void;
+
+        /**
+         * Get whether box selection is enabled.
+         * If enabled, the user must hold left-click to initiate panning.
+         * http://js.cytoscape.org/#cy.boxSelectionEnabled
+         */
+        boxSelectionEnabled(): boolean;
+        /**
+         * Set whether box selection is enabled.
+         * If enabled, the user must hold left-click to initiate panning.
+         * http://js.cytoscape.org/#cy.boxSelectionEnabled
+         *
+         * @param bool A truthy value enables box selection; a falsey value disables it.
+         */
+        boxSelectionEnabled(bool: boolean): void;
+
+        /**
+         * Get the on-screen width of the viewport in pixels.
+         * http://js.cytoscape.org/#cy.width
+         */
+        width(): number;
+
+        /**
+         * Get the on-screen height of the viewport in pixels.
+         * http://js.cytoscape.org/#cy.height
+         */
+        height(): number;
+
+        /**
+         * Get the extent of the viewport, a bounding box in model
+         * coordinates that lets you know what model
+         * positions are visible in the viewport.
+         * http://js.cytoscape.org/#cy.extent
+         */
+        extent(): {
+            x1: number, y1: number, x2: number, y2: number, w: number, h: number
+        };
+
+        /**
+         * Get whether nodes are automatically locked
+         * (i.e. if true, nodes are locked despite their individual state).
+         * http://js.cytoscape.org/#cy.autolock
+         */
+        autolock(): boolean;
+        /**
+         * Set whether nodes are automatically locked
+         * (i.e. if true, nodes are locked despite their individual state).
+         * http://js.cytoscape.org/#cy.autolock
+         *
+         * @param bool A truthy value enables autolocking; a falsey value disables it.
+         */
+        autolock(bool: boolean): void;
+
+        /**
+         * Get whether nodes are automatically ungrabified
+         * (i.e. if true, nodes are ungrabbale despite their individual state).
+         * http://js.cytoscape.org/#cy.autoungrabify
+         */
+        autoungrabify(): boolean;
+        /**
+         * Set whether nodes are automatically ungrabified
+         * (i.e. if true, nodes are ungrabbale despite their individual state).
+         * http://js.cytoscape.org/#cy.autoungrabify
+         *
+         * @param bool A truthy value enables autolocking; a falsey value disables it.
+         */
+        autoungrabify(bool: boolean): void;
+
+        /**
+         * Get whether nodes are automatically unselectified
+         * (i.e. if true, nodes are unselectable despite their individual state).
+         * http://js.cytoscape.org/#cy.autounselectify
+         */
+        autounselectify(): boolean;
+        /**
+         * Set whether nodes are automatically unselectified
+         * (i.e. if true, nodes are unselectable despite their individual state).
+         * http://js.cytoscape.org/#cy.autounselectify
+         *
+         * @param bool A truthy value enables autolocking; a falsey value disables it.
+         */
+        autounselectify(bool: boolean): void;
+
+        /**
+         * Force the renderer to redraw (i.e. draw a new frame).
+         *
+         * This function forces the renderer to draw a new frame.
+         * It is useful for very specific edgecases, such as in certain UI plugins,
+         * but it should not be needed for most developers.
+         * http://js.cytoscape.org/#cy.forceRender
+         */
+        forceRender(): void;
+
+        /**
+         * Force the renderer to recalculate the viewport bounds.
+         *
+         * If your code resizes the graph's dimensions or position
+         * (i.e. by changing the style of the HTML DOM element that holds the graph),
+         * you will want to call cy.resize() to have the graph resize and redraw itself.
+         *
+         * Cytoscape.js can not automatically monitor the bounding box of the viewport,
+         * as querying the DOM for those dimensions can be expensive.
+         * Although cy.resize() is automatically called for you on the window's resize event,
+         * there is no resize or style event for arbitrary DOM elements.
+         * http://js.cytoscape.org/#cy.resize
+         */
+        resize(): CollectionElements;
+    }
+
+    /**
+     * http://js.cytoscape.org/#core/animation
+     *
+     */
+    interface AnimationFitOptions {
+        eles: CollectionElements | Selector; // to which the viewport will be fitted.
+        padding: number; //  Padding to use with the fitting.
+    }
+    interface CenterOptions {
+        eles: CollectionElements | Selector; // to which the viewport will be selected.
+    }
+    interface AnimateOptionsCommon {
+        /** A zoom level to which the graph will be animated. */
+        zoom?: number;
+        /** A panning position to which the graph will be animated. */
+        pan?: Position;
+        /** A relative panning position to which the graph will be animated. */
+        panBy?: Position;
+        /** An object containing fitting options from which the graph will be animated. */
+        fit?: AnimationFitOptions;
+        /** An object containing centring options from which the graph will be animated. */
+        center?: CenterOptions;
+
+        /** duration - The duration of the animation in milliseconds. */
+        duration?: number;
+    }
+    interface AnimateOptions extends AnimateOptionsCommon {
+        /** queue - A boolean indicating whether to queue the animation. */
+        queue?: boolean;
+        /** complete - A function to call when the animation is done. */
+        complete?(): void;
+        /** step - A function to call each time the animation steps. */
+        step(): void;
+    }
+    interface AnimationOptions extends AnimateOptionsCommon {
+        /** queue - A transition-timing-function easing style string that shapes the animation progress curve. */
+        easing?: boolean;
+        /** complete - A function to call when the animation is done. */
+        complete?(): void;
+        /** step - A function to call each time the animation steps. */
+        step?(): void;
+    }
+
+    interface CoreAnimation {
+        /**
+         * Get whether the viewport is currently being animated.
+         * http://js.cytoscape.org/#cy.animated
+         */
+        animated(): boolean;
+
+        /**
+         * Animate the viewport.
+         * http://js.cytoscape.org/#cy.animate
+         *
+         * @param anis An object containing the details of the animation.
+         *
+         * @param options An object containing animation options.
+         */
+        animate(anis: AnimateOptions, options?: AnimateOptions): Core;
+
+        /**
+         * Get an animation of the viewport.
+         * http://js.cytoscape.org/#cy.animation
+         */
+        animation(options: AnimationOptions): any;
+
+        /**
+         * Add a delay between animations for the viewport.
+         *
+         * @param duration How long the delay should be in milliseconds.
+         * @param complete A function to call when the delay is complete.
+         */
+        delay(duration: number, complete?: () => void): Core;
+
+        /**
+         * Get a delay animation of the viewport.
+         * http://js.cytoscape.org/#cy.delayAnimation
+         */
+        delayAnimation(duration: number): void;
+
+        /**
+         * Stop all viewport animations that are currently running.
+         * http://js.cytoscape.org/#cy.stop
+         *
+         * @param clearQueue A boolean, indicating whether the queue of animations should be emptied.
+         * @param jumpToEnd A boolean, indicating whether the currently-running animations should jump to their ends rather than just stopping midway.
+         */
+        stop(clearQueue?: boolean, jumpToEnd?: boolean): Core;
+
+        /**
+         * Remove all queued animations for the viewport.
+         * http://js.cytoscape.org/#cy.clearQueue
+         */
+        clearQueue(): Core;
+    }
+
+    /**
+     * http://js.cytoscape.org/#core/layout
+     */
+    interface CoreLayout {
+        /**
+         * Run a layout, which algorithmically positions the nodes in the graph.
+         * For layouts included with Cytoscape.js, you can find their
+         * options documented in the Layouts section.
+         * For external layouts, please refer to their accompanying documentation.
+         *
+         * An analogue to run a layout on a subset of the graph exists as eles.layout().
+         * http://js.cytoscape.org/#cy.layout
+         */
+        layout(layout: LayoutOptions): LayoutManipulation;
+        /**
+         * Get a new layout, which can be used to algorithmically
+         * position the nodes in the graph.
+         *
+         * You must specify options.name with the name of the layout you wish to use.
+         *
+         * This function creates and returns a layout object.
+         * You may want to keep a reference to the layout for more advanced usecases,
+         * such as running multiple layouts simultaneously.
+         * Note that you must call layout.run() in order for it to affect the graph.
+         * An analogue to make a layout on a subset of the graph exists as eles.makeLayout().
+         */
+        makeLayout(options: LayoutOptions): LayoutManipulation;
+    }
+
+    /**
+     * Get the entry point to modify the visual style of the graph after initialisation.
+     * http://js.cytoscape.org/#core/style
+     */
+    interface ElementStylesheet extends StylesheetStyle {
+        json(): any;
+    }
+
+    interface CoreStyle {
+        /**
+         * Get the current style object.
+         */
+        style(): ElementStylesheet | string;
+        /**
+         * Assign a new stylesheet to replace the existing one.
+         */
+        style(sheet: Stylesheet): Stylesheet;
+    }
+
+    /**
+     * http://js.cytoscape.org/#cy.style
+     */
+    type Stylesheet = StylesheetStyle | StylesheetCSS;
+
+    interface StylesheetStyle {
+        selector: string;
+        style: Css.Node | Css.Edge;
+    }
+
+    /**
+     * http://js.cytoscape.org/#cy.style
+     */
+    interface StylesheetCSS {
+        selector: string;
+        css: Css.Node | Css.Edge;
+    }
+
+    /**
+     * http://js.cytoscape.org/#core/export
+     */
+    interface ExportOptions {
+        /**
+         * output Whether the output should be 'base64uri' (default), 'base64', or 'blob'.
+         */
+        output?: "base64uri" | "base64" | "blob";
+        /**
+         * The background colour of the image (transparent by default).
+         */
+        bg?: string;
+        /**
+         * Whether to export the current viewport view (false, default) or the entire graph (true).
+         */
+        full?: boolean;
+        /**
+         * This value specifies a positive number that scales the size of the resultant image.
+         */
+        scale?: number;
+        /**
+         * Specifies the scale automatically in combination with maxHeight such that the resultant image is no wider than maxWidth.
+         */
+        maxWidth?: number;
+        /**
+         * Specifies the scale automatically in combination with maxWidth such that the resultant image is no taller than maxHeight.
+         */
+        maxHeight?: number;
+    }
+
+    interface ExportJpgOptions extends ExportOptions {
+        /**
+         * quality Specifies the quality of the image from 0
+         * (low quality, low filesize) to 1 (high quality, high filesize).
+         * If not set, the browser's default quality value is used.
+         */
+        quality?: number;
+    }
+
+    interface CoreExport {
+        /**
+         * Export the current graph view as a PNG image in Base64 representation.
+         */
+        png(options?: ExportOptions): string;
+
+        /**
+         * Export the current graph view as a JPG image in Base64 representation.
+         */
+        jpg(options?: ExportOptions): string;
+
+        /**
+         * Export the current graph view as a JPG image in Base64 representation.
+         */
+        jpeg(options?: ExportOptions): string;
+
+        /**
+         * Export the graph as JSON, the same format used at initialisation.
+         */
+        json(): string;
+    }
+
+    /**
+     * eles --> Cy.Collection
+     *  a collection of one or more elements (nodes and edges)
+     *
+     * The input can be any element (node and edge) collection.
+     * http://js.cytoscape.org/#collection
+     */
+    interface Collection extends Singular,
+        CollectionGraphManipulation, CollectionEvents,
+        CollectionData, CollectionPosition,
+        CollectionLayout,
+        CollectionSelection, CollectionStyle, CollectionAnimation,
+        CollectionComparision, CollectionIteration,
+        CollectionBuildingUnion, CollectionAlgorithms { }
+
+    /**
+     * ele  --> Cy.Singular
+     * a collection of a single element (node or edge)
+     */
+    interface Singular extends
+        SingularGraphManipulation,
+        SingularData, SingularPosition,
+        SingularSelection, SingularStyle, SingularAnimation { }
+
+    interface ElementsDefinition {
+        nodes: NodeDefinition[];
+        edges: EdgeDefinition[];
+    }
+
+    type EventHandler = (event: EventObject) => void;
+
+    /**
+     * The output is a collection of node and edge elements OR single element.
+     */
+    interface CollectionElements extends
+        EdgeCollection, NodeCollection, SingularElement { }
+
+    /**
+     * edges -> Cy.EdgeCollection
+     *  a collection of one or more edges
+     *
+     * The output is a collection of edge elements OR single edge.
+     */
+    interface EdgeCollection extends Collection, EdgeSingular,
+        EdgeCollectionTraversing { }
+    /**
+     *  nodes -> Cy.NodeCollection
+     *  a collection of one or more nodes
+     *
+     * The output is a collection of node elements OR single node.
+     */
+    interface NodeCollection extends Collection, NodeSingular,
+        NodeCollectionMetadata, NodeCollectionPosition, NodeCollectionTraversing,
+        NodeCollectionCompound { }
+
+    interface SingularElement extends EdgeSingular, NodeSingular {
+        // Intentionally empty.
+    }
+    /**
+     *  edge --> Cy.EdgeSingular
+     *  a collection of a single edge
+     */
+    interface EdgeSingular extends Singular,
+        EdgeSingularData, EdgeSingularTraversing { }
+
+    /**
+     *  node --> Cy.NodeSingular
+     *  a collection of a single node
+     */
+    interface NodeSingular extends Singular,
+        NodeSingularMetadata, NodeSingularPosition, NodeSingularCompound { }
+
+    /**
+     * http://js.cytoscape.org/#collection/graph-manipulation
+     */
+    interface CollectionGraphManipulation {
+        /**
+         * Remove the elements from the graph.
+         * http://js.cytoscape.org/#eles.remove
+         */
+        remove(): CollectionElements;
+
+        /**
+         * Put removed elements back into the graph.
+         * http://js.cytoscape.org/#eles.restore
+         */
+        restore(): CollectionElements;
+
+        /**
+         * Get a new collection containing clones (i.e. copies) of the elements in the calling collection.
+         * http://js.cytoscape.org/#eles.clone
+         */
+        clone(): CollectionElements;
+        /**
+         * Get a new collection containing clones (i.e. copies) of the elements in the calling collection.
+         * http://js.cytoscape.org/#eles.clone
+         */
+        copy(): CollectionElements;
+
+        /**
+         * Effectively move edges to different nodes. The modified (actually new) elements are returned.
+         * http://js.cytoscape.org/#eles.move
+         */
+        move(location: { source?: string, target?: string }): EdgeCollection;
+        /**
+         * Effectively move nodes to different parent node. The modified (actually new) elements are returned.
+         * http://js.cytoscape.org/#eles.move
+         */
+        move(location: { parent: string }): NodeCollection;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/graph-manipulation
+     */
+    interface SingularGraphManipulation {
+        /**
+         * Get whether the element has been removed from the graph.
+         * http://js.cytoscape.org/#ele.removed
+         */
+        removed(): boolean;
+        /**
+         * Get whether the element is inside the graph (i.e. not removed).
+         * http://js.cytoscape.org/#ele.inside
+         */
+        inside(): boolean;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/events
+     */
+    interface CollectionEvents {
+        /**
+         * http://js.cytoscape.org/#eles.on
+         */
+        on(events: EventNames, selector: string, data: any, handler: EventHandler): void;
+        on(events: EventNames, selector: string, handler: EventHandler): void;
+        on(events: EventNames, handler: EventHandler): void;
+        /**
+         * http://js.cytoscape.org/#eles.promiseOn
+         * alias: pon
+         */
+        promiseOn(events: EventNames, selector?: string): Promise<EventHandler>;
+        pon(events: EventNames, selector?: string): Promise<EventHandler>;
+
+        /**
+         * @param events A space separated list of event names.
+         * @param selector [optional] A delegate selector to specify child elements for which the handler is triggered.
+         * @param data [optional] A plain object which is passed to the handler in the event object argument.
+         * @param function(event) The handler function that is called when one of the specified events occurs.
+         * @param event The event object.
+         * http://js.cytoscape.org/#eles.one
+         */
+        one(events: EventNames, selector: string, data: any, handler: EventHandler): void;
+        one(events: EventNames, selector: string, handler: EventHandler): void;
+        one(events: EventNames, handler: EventHandler): void;
+        /**
+         * http://js.cytoscape.org/#eles.once
+         */
+        once(events: EventNames, selector: string, data: any, handler: EventHandler): void;
+        once(events: EventNames, selector: string, handler: EventHandler): void;
+        once(events: EventNames, handler: EventHandler): void;
+        /**
+         * http://js.cytoscape.org/#eles.off
+         * alias unbind, unlisten, removeListener
+         */
+        off(events: EventNames, selector?: string, handler?: EventHandler): void;
+        /**
+         * http://js.cytoscape.org/#eles.trigger
+         * alias: emit
+         */
+        trigger(events: EventNames, extra?: string[]): void;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/data
+     *
+     * The following fields are immutable:
+     * id: The id field is used to uniquely identify an element in the graph.
+     * source & target : These fields define an edge's relationship to nodes, and this relationship can not be changed after creation.
+     * parent: The parent field defines the parent (compound) node.
+     */
+    interface CollectionData {
+        /**
+         * Remove developer-defined data associated with the elements.
+         * http://js.cytoscape.org/#eles.removeData
+         * @param names A space-separated list of fields to delete.
+         */
+        removeData(names?: string): CollectionElements;
+        removeAttr(names?: string): CollectionElements;
+
+        /**
+         * Get an array of the plain JavaScript object
+         * representation of all elements in the collection.
+         */
+        jsons(): string[];
+    }
+    /**
+     * http://js.cytoscape.org/#collection/data
+     */
+    interface SingularData {
+        /**
+         * Read and write developer-defined data associated with the elements
+         * http://js.cytoscape.org/#eles.data
+         */
+
+        /**
+         * Get a particular data field for the element.
+         * @param name The name of the field to get.
+         */
+        data(name?: string): any;
+        /**
+         * Set a particular data field for the element.
+         * @param name The name of the field to set.
+         * @param value The value to set for the field.
+         */
+        data(name: string, value: any): void;
+        /**
+         * Update multiple data fields at once via an object.
+         * @param obj The object containing name- value pairs to update data fields.
+         */
+        data(obj: any): void;
+
+        /**
+         * Get or set the scratchpad at a particular namespace,
+         * where temporary or non-JSON data can be stored.
+         * Get scratchpad if one or no parameter provided.
+         * App-level scratchpad data should use namespaces
+         * prefixed with underscore, like '_foo'.
+         * http://js.cytoscape.org/#ele.scratch
+         * @param namespace A namespace string.
+         * @param value The value to set at the specified namespace.
+         */
+        scratch(namespace?: string, value?: any): Scratchpad;
+
+        /**
+         * Remove scratchpad data.
+         * You should remove scratchpad data only at your own namespaces.
+         * http://js.cytoscape.org/#ele.removeScratch
+         * @param namespace A namespace string.
+         */
+        removeScratch(namespace: string): void;
+
+        /**
+         * A shortcut to get the ID of an element.
+         * http://js.cytoscape.org/#ele.id
+         */
+        id(): string;
+
+        /**
+         * Get the element's plain JavaScript object representation.
+         * http://js.cytoscape.org/#ele.json
+         */
+        json(): string;
+
+        /**
+         * Get the group string that defines the type of the element.
+         *
+         * The group strings are 'nodes' for nodes and 'edges' for edges.
+         * In general, you should be using ele.isEdge()
+         * and ele.isNode() instead of ele.group().
+         * http://js.cytoscape.org/#ele.group
+         */
+        group(): ElementGroup;
+
+        /**
+         * Get whether the element is a node.
+         * http://js.cytoscape.org/#ele.isNode
+         */
+        isNode(): boolean;
+
+        /**
+         * Get whether the element is an edge.
+         * http://js.cytoscape.org/#ele.isEdge
+         */
+        isEdge(): boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#collection/data
+     */
+    interface EdgeSingularData {
+        /**
+         * Get whether the edge is a loop (i.e. source same as target).
+         * http://js.cytoscape.org/#edge.isLoop
+         */
+        isLoop(): boolean;
+
+        /**
+         * Get whether the edge is simple (i.e. source different than target).
+         * http://js.cytoscape.org/#edge.isSimple
+         */
+        isSimple(): boolean;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/metadata
+     */
+    interface NodeSingularMetadata {
+        /**
+         * Get the degree of a node.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        degree(includeLoops: boolean): number;
+        /**
+         * Get the indegree of a node.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        indegree(includeLoops: boolean): number;
+        /**
+         * Get the outdegree of a node.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        outdegree(includeLoops: boolean): number;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/metadata
+     */
+    interface NodeCollectionMetadata {
+        /**
+         * Get the total degree of a collection of nodes.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        totalDegree(includeLoops: boolean): number;
+
+        /**
+         * Get the minimum degree of the nodes in the collection.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        minDegree(includeLoops: boolean): number;
+
+        /**
+         * Get the maximum degree of the nodes in the collection.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        maxDegree(includeLoops: boolean): number;
+
+        /**
+         * Get the minimum indegree of the nodes in the collection.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        minIndegree(includeLoops: boolean): number;
+
+        /**
+         * Get the maximum indegree of the nodes in the collection.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        maxIndegree(includeLoops: boolean): number;
+
+        /**
+         * Get the minimum outdegree of the nodes in the collection.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        minOutdegree(includeLoops: boolean): number;
+
+        /**
+         * Get the maximum outdegree of the nodes in the collection.
+         * @param includeLoops A boolean, indicating whether loops are to be included in degree calculations.
+         */
+        maxOutdegree(includeLoops: boolean): number;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/position--dimensions
+     */
+    interface NodeSingularPosition {
+        /**
+         * Get the (model) position of a node.
+         */
+        position(): Position;
+        /**
+         * Set the value of a specified position dimension.
+         * @param dimension The position dimension to set.
+         * @param value The value to set to the dimension.
+         */
+        position(dimension: PositionDimension, value?: Position): void;
+        /**
+         * Set the position using name-value pairs in the specified object.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         */
+        position(pos: Position): void;
+
+        /**
+         * Get or set the rendered (on-screen) position of a node.
+         * http://js.cytoscape.org/#node.renderedPosition
+         */
+        /**
+         * Get the value of a specified rendered position dimension.
+         * @param dimension The position dimension to get.
+         * @param value The value to set to the dimension.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         */
+        renderedPosition(dimension?: PositionDimension): Position;
+        renderedPosition(dimension: PositionDimension, value: Position): void;
+        renderedPosition(pos: { [name: string]: number }): void;
+
+        /**
+         * Set the value of a specified rendered position dimension.
+         * @param dimension The position dimension to set.
+         * @param value The value to set to the dimension.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         */
+        renderedPoint(dimension?: PositionDimension): Position;
+        renderedPoint(dimension: PositionDimension, value: Position): void;
+        renderedPoint(pos: { [name: string]: number }): void;
+
+        /**
+         *
+         * http://js.cytoscape.org/#node.relativePosition
+         */
+        /**
+         * Get the value of a specified relative position dimension.
+         * @param dimension The position dimension to get.
+         * @param value The value to set to the dimension.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         */
+        relativePosition(dimension?: PositionDimension): Position;
+        relativePosition(dimension: PositionDimension, value: Position): void;
+        relativePosition(pos: { [name: string]: number }): void;
+
+        /**
+         * Get the value of a specified relative position dimension.
+         * @param dimension The position dimension to get.
+         * @param value The value to set to the dimension.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         */
+        relativePoint(dimension?: PositionDimension): Position;
+        relativePoint(dimension: PositionDimension, value: Position): void;
+        relativePoint(pos: { [name: string]: number }): void;
+
+        /**
+         * Get whether a node is currently grabbed, meaning the user has hold of the node.
+         * http://js.cytoscape.org/#node.grabbed
+         */
+        grabbed(): boolean;
+        /**
+         * Get whether the user can grab a node.
+         * http://js.cytoscape.org/#node.grabbable
+         */
+        grabbable(): boolean;
+        /**
+         * Get whether a node is locked, meaning that its position can not be changed.
+         * http://js.cytoscape.org/#node.locked
+         */
+        locked(): boolean;
+    }
+
+    /**
+     * @param ele The element being iterated over for which the function should return a position to set.
+     * @param ix The index of the element when iterating over the elements in the collection.
+     */
+    type ElementPositionFunction = (ele: CollectionElements, ix: number) => void;
+    type ElementCollectionFunction = (ele: CollectionElements, ix: number, eles: CollectionElements) => void;
+
+    /**
+     * http://js.cytoscape.org/#collection/position--dimensions
+     */
+    interface NodeCollectionPosition {
+        /**
+         * Set the positions via a function.
+         * @param handler A callback function that returns the position to set for each element.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         * http://js.cytoscape.org/#nodes.positions
+         */
+        positions(handler: ElementPositionFunction | Position): void;
+
+        modelPositions(handler: ElementPositionFunction | Position): void;
+
+        points(handler: ElementPositionFunction | Position): void;
+
+        /**
+         * Allow the user to grab the nodes.
+         * http://js.cytoscape.org/#nodes.grabify
+         */
+        grabify(): void;
+        /**
+         * Disallow the user to grab the nodes.
+         * http://js.cytoscape.org/#nodes.ungrabify
+         */
+        ungrabify(): void;
+        /**
+         * Lock the nodes such that their positions can not be changed.
+         * http://js.cytoscape.org/#nodes.lock
+         */
+        lock(): void;
+        /**
+         * Unlock the nodes such that their positions can be changed.
+         * http://js.cytoscape.org/#nodes.unlock
+         */
+        unlock(): void;
+    }
+    /**
+     * http://js.cytoscape.org/#collection/position--dimensions
+     */
+    interface SingularPosition {
+        /**
+         * Get the width of the element.
+         */
+        width(): number;
+        /**
+         * Get the outer width of the element (includes width, padding, & border).
+         */
+        outerWidth(): number;
+
+        /**
+         * Get the width of the element in rendered dimensions.
+         */
+        renderedWidth(): number;
+
+        /**
+         * Get the outer width of the element (includes width, padding, & border) in rendered dimensions.
+         */
+        renderedOuterWidth(): number;
+
+        /**
+         * Get the height of the element.
+         */
+        height(): number;
+        /**
+         * Get the outer height of the element (includes height, padding, & border).
+         */
+        outerHeight(): number;
+        /**
+         * Get the height of the element in rendered dimensions.
+         */
+        renderedHeight(): number;
+
+        /**
+         * Get the outer height of the element (includes height, padding, & border) in rendered dimensions.
+         */
+        renderedOuterHeight(): number;
+        /**
+         * Gets whether the element is active (e.g. on user tap, grab, etc).
+         * http://js.cytoscape.org/#ele.active
+         */
+        active(): boolean;
+    }
+
+    interface BoundingBoxOptions {
+        /** A boolean indicating whether to include nodes in the bounding box (default true). */
+        includeNodes?: boolean;
+        /** A boolean indicating whether to include edges in the bounding box (default true). */
+        includeEdges?: boolean;
+        /** A boolean indicating whether to include labels in the bounding box (default true). */
+        includeLabels?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#collection/position--dimensions
+     */
+    interface CollectionPosition {
+        /**
+         * Get the bounding box of the elements in model coordinates.
+         * @param options An object containing options for the function.
+         * http://js.cytoscape.org/#eles.boundingBox
+         */
+        boundingBox(options: BoundingBoxOptions): BoundingBox12 | BoundingBoxWH;
+        /**
+         * Get the bounding box of the elements in rendered coordinates.
+         * @param options An object containing options for the function.
+         */
+        renderedBoundingBox(options: BoundingBoxOptions): BoundingBox12 | BoundingBoxWH;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/layout
+     */
+    interface CollectionLayout {
+        /**
+         * Get a new layout, which can be used to algorithmically position the nodes in the collection.
+         * This function is useful for running a layout on a subset of the elements in the graph, perhaps in parallel to other layouts.
+         *
+         * You must specify options.name with the name of the layout you wish to use.
+         *
+         * Note: that you must call layout.run() in order for it to affect the graph.
+         *
+         * @param options The layout options.
+         */
+        layout(options: LayoutOptions): CollectionElements;
+        makeLayout(options: LayoutOptions): CoreLayout;
+        createLayout(options: LayoutOptions): CoreLayout;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/layout
+     */
+    interface LayoutPositionOptions {
+        // whether to animate changes to the layout
+        animate?: boolean;
+        // duration of animation in ms, if enabled
+        animationDuration?: number;
+        // easing of animation, if enabled
+        animationEasing?: number;
+        // collection of elements involved in the layout; set by cy.layout() or eles.layout()
+        eles: CollectionElements;
+        // whether to fit the viewport to the graph
+        fit?: boolean;
+        // padding to leave between graph and viewport
+        padding?: number;
+        // pan the graph to the provided position, given as { x, y }
+        pan?: Position;
+        // callback for the layoutready event
+        ready?: undefined;
+        // callback for the layoutstop event
+        stop?: undefined;
+        // a positive value which adjusts spacing between nodes (>1 means greater than usual spacing)
+        spacingFactor?: number;
+        // zoom level as a positive number to set after animation
+        zoom?: number;
+    }
+    interface NodeCollectionLayout {
+        /**
+         * Position the nodes for a discrete/synchronous layout.
+         * http://js.cytoscape.org/#nodes.layoutPositions
+         * @param layout The layout.
+         * @param options The layout options object.
+         */
+        layoutPositions(layout: string, options: LayoutPositionOptions, handler: ElementPositionFunction): void;
+    }
+    /**
+     * http://js.cytoscape.org/#collection/layout
+     */
+    interface LayoutDimensionOptions {
+        // Boolean which changes whether label dimensions are included when calculating node dimensions
+        nodeDimensionsIncludeLabels: boolean;
+    }
+    interface NodeSingularLayout {
+        /**
+         * Returns the node width and height.
+         * Meant for use in layout positioning to do overlap detection.
+         * @param options The layout options object.
+         */
+        layoutDimensions(options: LayoutDimensionOptions): { x: number; y: number };
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/selection
+     */
+    interface SingularSelection {
+        /**
+         * Get whether the element is selected.
+         * http://js.cytoscape.org/#ele.selected
+         */
+        selected(): boolean;
+
+        /**
+         * Get whether the element's selection state is mutable.
+         * http://js.cytoscape.org/#ele.selectable
+         */
+        selectable(): boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#collection/layout
+     */
+    interface CollectionSelection {
+        /**
+         * Make the elements selected (NB other elements outside the collection are not affected).
+         * http://js.cytoscape.org/#eles.select
+         */
+        select(): void;
+        /**
+         * Make the elements not selected (NB other elements outside the collection are not affected).
+         * http://js.cytoscape.org/#eles.unselect
+         */
+        unselect(): void;
+        deselect(): void;
+        /**
+         * Make the selection states of the elements mutable.
+         * http://js.cytoscape.org/#eles.selectify
+         */
+        selectify(): void;
+        /**
+         * Make the selection states of the elements immutable.
+         * http://js.cytoscape.org/#eles.unselectify
+         */
+        unselectify(): void;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/style
+     */
+    type ClassName = string;
+    /** A space-separated list of class names */
+    type ClassNames = string;
+
+    interface CollectionStyle {
+        /**
+         * Add classes to elements.
+         * http://js.cytoscape.org/#eles.addClass
+         * @param classes A space-separated list of class names to add to the elements.
+         */
+        addClass(classes: ClassNames): void;
+        /**
+         * Remove classes from elements.
+         * @param classes A space-separated list of class names to remove from the elements.
+         * http://js.cytoscape.org/#eles.removeClass
+         */
+        removeClass(classes: ClassNames): void;
+        /**
+         * Toggle whether the elements have the specified classes.
+         * @param classes A space-separated list of class names to toggle on the elements.
+         * @param toggle [optional] Instead of automatically toggling, adds the classes on truthy values or removes them on falsey values.
+         * http://js.cytoscape.org/#eles.toggleClass
+         */
+        toggleClass(classes: ClassNames, toggle?: boolean): void;
+        /**
+         * Replace the current list of classes on the elements with the specified list.
+         * @param classes A space-separated list of class names that replaces the current class list.
+         * http://js.cytoscape.org/#eles.classes
+         * Note: can be used to clear all classes (no arguments).
+         */
+        classes(classes?: ClassNames): void;
+        /**
+         * Add classes to the elements, and then remove the classes after a specified duration.
+         * @param classes A space-separated list of class names to flash on the elements.
+         * @param duration [optional] The duration in milliseconds that the classes should be added on the elements. After the duration, the classes are removed.
+         * http://js.cytoscape.org/#eles.flashClass
+         */
+        flashClass(classes: ClassNames, duration?: number): void;
+
+        /**
+         * Get or set a particular style property value.
+         * @param name The name of the visual style property to get.
+         * @param value The value to which the property is set.
+         */
+        style(name?: string, value?: any): any;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/style
+     */
+    interface SingularStyle {
+        /**
+         * Get whether an element has a particular class.
+         * @param className The name of the class to test for.
+         * http://js.cytoscape.org/#ele.hasClass
+         */
+        hasClass(className: ClassName): boolean;
+
+        /**
+         * Get a name-value pair object containing rendered visual
+         * style properties and their values for the element.
+         * @param name The name of the visual style property to get.
+         */
+        renderedStyle(): { [name: string]: any };
+        renderedStyle(name: string): any;
+
+        renderedCss(): { [name: string]: any };
+        renderedCss(name: string): any;
+
+        /**
+         * Get the numeric value of a style property in
+         * preferred units that can be used for calculations.
+         * @param name The name of the style property to get.
+         * http://js.cytoscape.org/#ele.numericStyle
+         */
+        numericStyle(name: string): any;
+
+        /**
+         * Get the units that ele.numericStyle() is expressed in, for a particular property.
+         * @param name The name of the style property to get.
+         * http://js.cytoscape.org/#ele.numericStyleUnits
+         */
+        numericStyleUnits(name: string): any;
+        /**
+         * Get whether the element is visible.
+         * http://js.cytoscape.org/#ele.visible
+         */
+        visible(): boolean;
+        /**
+         * Get whether the element is hidden.
+         * http://js.cytoscape.org/#ele.visible
+         */
+        hidden(): boolean;
+        /**
+         * Get the effective opacity of the element
+         *  (i.e. on-screen opacity),
+         * which takes into consideration parent node opacity.
+         * http://js.cytoscape.org/#ele.effectiveOpacity
+         */
+        effectiveOpacity(): number;
+        /**
+         * Get whether the element's effective opacity is completely transparent,
+         * which takes into consideration parent node opacity.
+         * http://js.cytoscape.org/#ele.transparent
+         */
+        transparent(): number;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/animation
+     */
+    interface ElementAnimateOptionsBase {
+        /** An object containing name-value pairs of style properties to animate. */
+        style?: { [name: string]: any };
+        /** The duration of the animation in milliseconds. */
+        duration?: number;
+        /** A boolean indicating whether to queue the animation. */
+        queue?: boolean;
+        /** A function to call when the animation is done. */
+        complete?(): void;
+        /** A function to call each time the animation steps. */
+        step?(): void;
+        /** A transition-timing-function easing style string that shapes the animation progress curve. */
+        easing?(): void;
+    }
+    interface ElementAnimateOptionPos {
+        /** A position to which the elements will be animated. */
+        position?: Position;
+        /** A rendered position to which the elements will be animated. */
+        renderedPosition?: Position;
+    }
+    interface ElementAnimateOptionRen {
+        /** A position to which the elements will be animated. */
+        position?: Position;
+        /** A rendered position to which the elements will be animated. */
+        renderedPosition?: Position;
+    }
+    interface CollectionAnimation {
+        /**
+         * Animate the elements.
+         * @param options An object containing the details of the animation.
+         * http://js.cytoscape.org/#eles.animate
+         */
+        animate(options: ElementAnimateOptionPos | ElementAnimateOptionRen): void;
+        /**
+         * Add a delay between animations for the elements.
+         * @param duration How long the delay should be in milliseconds.
+         * @param complete A function to call when the delay is complete.
+         * http://js.cytoscape.org/#eles.delay
+         */
+        delay(duration: number, complete: () => void): void;
+        /**
+         * Stop all animations that are currently running.
+         * @param clearQueue A boolean, indicating whether the queue of animations should be emptied.
+         * @param jumpToEnd A boolean, indicating whether the currently-running animations should jump to their ends rather than just stopping midway.
+         * http://js.cytoscape.org/#eles.stop
+         */
+        stop(clearQueue: boolean, jumpToEnd: boolean): void;
+        /**
+         * Remove all queued animations for the elements.
+         * http://js.cytoscape.org/#eles.clearQueue
+         */
+        clearQueue(): void;
+    }
+    interface SingularAnimationOptions {
+        /** A position to which the elements will be animated. */
+        position: Position;
+        /** A rendered position to which the elements will be animated. */
+        renderedPosition: Position;
+        /** An object containing name-value pairs of style properties to animate. */
+        style: any;
+        /** The duration of the animation in milliseconds. */
+        duration: number;
+        /** A transition-timing-function easing style string that shapes the animation progress curve. */
+        easing(): void;
+    }
+    interface SingularAnimation {
+        /**
+         * Get whether the element is currently being animated.
+         */
+        animated(): boolean;
+        /**
+         *  Get an animation for the element.
+         * @param options An object containing the details of the animation.
+         */
+        animation(options: SingularAnimationOptions): void;
+
+        /**
+         * Get a delay animation for the element.
+         * @param duration How long the delay should be in milliseconds.
+         * http://js.cytoscape.org/#ele.delayAnimation
+         */
+        delayAnimation(duration: number): void;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/comparison
+     */
+    interface CollectionComparision {
+        // http://js.cytoscape.org/#collection/comparison
+
+        /**
+         * Determine whether this collection contains exactly the same elements as another collection.
+         *
+         * @param eles The other elements to compare to.
+         */
+        same(eles: Collection): boolean;
+
+        /**
+         * Determine whether this collection contains any of the same elements as another collection.
+         *
+         * @param eles The other elements to compare to.
+         */
+        anySame(eles: Collection): boolean;
+
+        /**
+         * Determine whether all elements in the specified collection are in the neighbourhood of the calling collection.
+         *
+         * @param eles The other elements to compare to.
+         */
+        allAreNeighbors(eles: Collection): boolean;
+        /**
+         * Determine whether all elements in the specified collection are in the neighbourhood of the calling collection.
+         *
+         * @param eles The other elements to compare to.
+         */
+        allAreNeighbours(eles: Collection): boolean;
+
+        /**
+         * Determine whether any element in this collection matches a selector.
+         *
+         * @param selector The selector to match against.
+         */
+        is(selector: Selector): boolean;
+
+        /**
+         * Determine whether all elements in the collection match a selector.
+         * @param selector The selector to match against.
+         */
+        allAre(selector: Selector): boolean;
+
+        /**
+         * Determine whether any element in this collection satisfies the specified test function.
+         *
+         * @param test The test function that returns truthy values for elements that satisfy the test and falsey values for elements that do not satisfy the test.
+         * ele - The current element.
+         * i - The index of the current element.
+         * eles - The collection of elements being tested.
+         * @param thisArg [optional] The value for this within the test function.
+         */
+        some(test: (ele: CollectionElements, i: number, eles: CollectionElements) => boolean, thisArg?: any): boolean;
+
+        /**
+         * Determine whether all elements in this collection satisfy the specified test function.
+         *
+         * @param test The test function that returns truthy values for elements that satisfy the test and falsey values for elements that do not satisfy the test.
+         * ele - The current element.
+         * i - The index of the current element.
+         * eles - The collection of elements being tested.
+         * @param thisArg [optional] The value for this within the test function.
+         */
+        every(test: (ele: CollectionElements, i: number, eles: CollectionElements) => boolean, thisArg?: any): boolean;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/iteration
+     */
+    interface CollectionIteration {
+        /**
+         * Get the number of elements in the collection.
+         */
+        size(): number;
+        /**
+         * Get the number of elements in the collection.
+         */
+        length: number;
+
+        /**
+         * Get whether the collection is empty, meaning it has no elements.
+         */
+        empty(): boolean;
+        /**
+         * Get whether the collection is nonempty, meaning it has elements.
+         */
+        nonempty(): boolean;
+
+        /**
+         * Iterate over the elements in the collection using an implementation like the native array function namesake.
+         *
+         * This function behaves like Array.prototype.forEach() with minor changes for convenience:
+         * You can exit the iteration early by returning false in the iterating function.
+         * The Array.prototype.forEach() implementation does not support this, but it is included anyway on account of its utility.
+         *
+         * @param each The function executed each iteration.
+         * ele - The current element.
+         * i - The index of the current element.
+         * eles - The collection of elements being iterated.
+         * @param thisArg [optional] The value for this within the iterating function.
+         */
+        each(each: (ele: CollectionElements, i: number, eles: CollectionElements) => void | boolean, thisArg?: any): void;
+        forEach(each: (ele: CollectionElements, i: number, eles: CollectionElements) => void | boolean, thisArg?: any): void;
+
+        /**
+         * Get an element at a particular index in the collection.
+         *
+         * You may use eles[i] in place of eles.eq(i) as a more performant alternative.
+         *
+         * @param index The index of the element to get.
+         */
+        eq(index: number): CollectionElements;
+        /**
+         * Get an element at a particular index in the collection.
+         *
+         * @param index The index of the element to get.
+         */
+        [index: number]: CollectionElements;
+        /**
+         * Get the first element in the collection.
+         */
+        first(): CollectionElements;
+        /**
+         * Get the last element in the collection.
+         */
+        last(): CollectionElements;
+
+        /**
+         * Get a subset of the elements in the collection based on specified indices.
+         *
+         * @param start [optional] An integer that specifies where to start the selection.
+         *              The first element has an index of 0.
+         *              Use negative numbers to select from the end of an array.
+         * @param end [optional] An integer that specifies where to end the selection.
+         *            If omitted, all elements from the start position and to the end of the array will be selected.
+         *            Use negative numbers to select from the end of an array.
+         */
+        slice(start?: number, end?: number): CollectionElements;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/building--filtering
+     */
+    /**
+     * Get a new collection, resulting from adding the collection with another one
+     *
+     * @param eles The elements or array of elements to add or elements in the graph matching the selector.
+     * http://js.cytoscape.org/#eles.union
+     */
+    type CollectionBuildingUnionFunc = (eles: Collection | Collection[] | Selector) => CollectionElements;
+
+    /**
+     * Get a new collection, resulting from the collection without some specified elements.
+     * http://js.cytoscape.org/#eles.difference
+     * @param eles The elements that will not be in the resultant collection.
+     *             Elements from the calling collection matching this selector will not be in the resultant collection.
+     */
+    type CollectionBuildingDifferenceFunc = (eles: Collection | Selector) => CollectionElements;
+
+    /**
+     * Get the elements in both this collection and another specified collection.
+     * http://js.cytoscape.org/#eles.intersection
+     * @param eles The elements to intersect with.
+     *             A selector representing the elements to intersect with.
+     *             All elements in the graph matching the selector are used as the passed collection.
+     */
+    type CollectionBuildingIntersectionFunc = (eles: Collection | Selector) => CollectionElements;
+
+    /**
+     * Get the elements that are in the calling collection or the passed collection but not in both.
+     * http://js.cytoscape.org/#eles.symmetricDifference
+     * @param eles The elements to apply the symmetric difference with.
+     *             A selector representing the elements to apply the symmetric difference with.
+     *             All elements in the graph matching the selector are used as the passed collection.
+     */
+    type CollectionSymmetricDifferenceFunc = (eles: Collection | Selector) => CollectionElements;
+    /**
+     * http://js.cytoscape.org/#collection/building--filtering
+     */
+    interface CollectionBuildingUnion {
+        /**
+         * Get a new collection, resulting from adding the collection with another one
+         * http://js.cytoscape.org/#eles.union
+         */
+        union: CollectionBuildingUnionFunc;
+        // [index: "u"]: CollectionBuildingUnionFunc;
+        add: CollectionBuildingUnionFunc;
+        // [index: "+"]: CollectionBuildingUnionFunc;
+        or: CollectionBuildingUnionFunc;
+        // [index: "|"]: CollectionBuildingUnionFunc;
+
+        /**
+         * Get a new collection, resulting from the collection without some specified elements.
+         * http://js.cytoscape.org/#eles.difference
+         */
+        difference: CollectionBuildingDifferenceFunc;
+        // [index: "\\"]: CollectionBuildingDifferenceFunc;
+        not: CollectionBuildingDifferenceFunc;
+        // [index: "!"]: CollectionBuildingDifferenceFunc;
+        relativeComplement: CollectionBuildingDifferenceFunc;
+        // [index: "-"]: CollectionBuildingDifferenceFunc;
+
+        /**
+         * Get all elements in the graph that are not in the calling collection.
+         * http://js.cytoscape.org/#eles.absoluteComplement
+         */
+        absoluteComplement(): CollectionElements;
+        abscomp(): CollectionElements;
+        complement(): CollectionElements;
+
+        /**
+         * Get the elements in both this collection and another specified collection.
+         * http://js.cytoscape.org/#eles.intersection
+         */
+        intersection: CollectionSymmetricDifferenceFunc;
+        intersect: CollectionSymmetricDifferenceFunc;
+        and: CollectionSymmetricDifferenceFunc;
+        // [index: "n"]: CollectionSymmetricDifferenceFunc;
+        // [index: "&"]: CollectionSymmetricDifferenceFunc;
+        // [index: "."]: CollectionSymmetricDifferenceFunc;
+
+        /**
+         * Get the elements that are in the calling collection
+         * or the passed collection but not in both.
+         * http://js.cytoscape.org/#eles.symmetricDifference
+         */
+        symmetricDifference: CollectionSymmetricDifferenceFunc;
+        symdiff: CollectionSymmetricDifferenceFunc;
+        xor: CollectionSymmetricDifferenceFunc;
+        // [index: "^"]: CollectionSymmetricDifferenceFunc;
+        // [index: "(+)"]: CollectionSymmetricDifferenceFunc;
+        // [index: "(-)"]: CollectionSymmetricDifferenceFunc;
+
+        // [index: string]: CollectionBuildingDifferenceFunc |CollectionBuildingUnionFunc | CollectionBuildingDifferenceFunc | CollectionSymmetricDifferenceFunc;
+
+        /**
+         * Perform a traditional left/right diff on the two collections.
+         *
+         * @param selector
+         *    A selector representing the elements on the right side of the diff. All elements in the graph matching the selector are used as the passed collection.
+         *    The elements on the right side of the diff.
+         * @return This function returns a plain object of the form { left, right, both } where
+         * left - is the set of elements only in the calling (i.e. left) collection,
+         * right - is the set of elements only in the passed (i.e. right) collection, and
+         * both - is the set of elements in both collections.
+         * http://js.cytoscape.org/#eles.diff
+         */
+        diff(selector: Selector | Collection): {
+            left: CollectionElements,
+            right: CollectionElements,
+            both: CollectionElements
+        };
+
+        /**
+         * Get a new collection containing elements that are accepted by the specified filter.
+         *
+         * @param selector The selector to match against.
+         * @param filter selector The filter function that returns true for elements to include.
+         * i - The index of the current element being considered.
+         * ele - The element being considered.
+         * http://js.cytoscape.org/#eles.filter
+         */
+        filter(selector: Selector | ((i: number, ele: CollectionElements) => boolean)): CollectionElements;
+        /**
+         * Get the nodes that match the specified selector.
+         *
+         * @param selector The selector to match against.
+         * http://js.cytoscape.org/#eles.filter
+         */
+        nodes(selector: Selector): NodeCollection;
+        /**
+         * Get the edges that match the specified selector.
+         *
+         * @param selector The selector to match against.
+         * http://js.cytoscape.org/#eles.filter
+         */
+        edges(selector: Selector): EdgeCollection;
+
+        /**
+         * Get a new collection containing the elements sorted by the
+         * specified comparison function.
+         *
+         * @param sort The sorting comparison function that returns a negative number
+         * for ele1 before ele2, 0 for ele1 same as ele2,
+         * or a positive number for ele1 after ele2.
+         *
+         * http://js.cytoscape.org/#eles.sort
+         */
+        sort(sort: (ele1: CollectionElements, ele2: CollectionElements) => number): CollectionElements;
+
+        /**
+         * Get an array containing values mapped from the collection.
+         *
+         * @param fn The function that returns the mapped value for each element.
+         * ele - The current element.
+         * i - The index of the current element.
+         * eles - The collection of elements being mapped.
+         * @param thisArg [optional] The value for this within the iterating function.
+         *
+         * http://js.cytoscape.org/#eles.map
+         */
+        map(fn: (ele: CollectionElements, i: number, eles: CollectionElements) => any, thisArg?: any): any[];
+
+        /**
+         * Reduce a single value by applying a
+         * function against an accumulator and each value of the collection.
+         *
+         * @param fn The function that returns the accumulated value
+         * given the previous value and the current element.
+         * prevVal The value accumulated from previous elements.
+         * ele The current element.
+         * ix The index of the current element.
+         * eles The collection of elements being reduced.
+         *
+         * http://js.cytoscape.org/#eles.reduce
+         */
+        reduce(fn: (prevVal: any, ele: CollectionElements,
+            ix: number, eles: CollectionElements) => any): number[];
+
+        /**
+         * Find a minimum value in a collection.
+         *
+         * @param fn The function that returns the value to compare for each element.
+         * ele - The current element.
+         * i - The index of the current element.
+         * eles - The collection of elements being mapped.
+         * @param thisArg [optional] The value for this within the iterating function.
+         *
+         * http://js.cytoscape.org/#eles.min
+         */
+        min(fn: (ele: CollectionElements, i: number, eles: CollectionElements) => any, thisArg?: any): {
+            /**
+             * The minimum value found.
+             */
+            value: any,
+            /**
+             * The element that corresponds to the minimum value.
+             */
+            ele: CollectionElements
+        };
+
+        /**
+         * Find a maximum value and the corresponding element.
+         *
+         * @param fn The function that returns the value to compare for each element.
+         * ele - The current element.
+         * i - The index of the current element.
+         * eles - The collection of elements being mapped.
+         * @param thisArg [optional] The value for this within the iterating function.
+         *
+         * http://js.cytoscape.org/#eles.max
+         */
+        max(fn: (ele: CollectionElements, i: number, eles: CollectionElements) => any, thisArg?: any): {
+            /**
+             * The maximum value found.
+             */
+            value: any,
+            /**
+             * The element that corresponds to the maximum value.
+             */
+            ele: CollectionElements
+        };
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/traversing
+     */
+
+    type MinumumSpanningTree = any;
+
+    interface CollectionTraversing {
+        // http://js.cytoscape.org/#collection/traversing
+
+        /**
+         * Get the open neighbourhood of the elements.
+         *
+         * The neighbourhood returned by this function is a bit different than the traditional definition of a "neighbourhood":
+         * This returned neighbourhood includes the edges connecting the collection to the neighbourhood. This gives you more flexibility.
+         * An open neighbourhood is one that does not include the original set of elements. If unspecified, a neighbourhood is open by default.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        neighborhood(selector?: Selector): CollectionElements;
+
+        /**
+         * Get the open neighbourhood of the elements.
+         *
+         * The neighbourhood returned by this function is a bit different than the traditional definition of a "neighbourhood":
+         * This returned neighbourhood includes the edges connecting the collection to the neighbourhood. This gives you more flexibility.
+         * An open neighbourhood is one that does not include the original set of elements. If unspecified, a neighbourhood is open by default.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        openNeighborhood(selector?: Selector): CollectionElements;
+        /**
+         * Get the closed neighbourhood of the elements.
+         *
+         * The neighbourhood returned by this function is a bit different than the traditional definition of a "neighbourhood":
+         * This returned neighbourhood includes the edges connecting the collection to the neighbourhood. This gives you more flexibility.
+         * A closed neighbourhood is one that does include the original set of elements.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        closedNeighborhood(selector?: Selector): CollectionElements;
+
+        /**
+         * Get the connected components, considering only the elements in the calling collection.
+         * An array of collections is returned, with each collection representing a component.
+         */
+        components(): Collection;
+    }
+    interface EdgeSingularTraversing {
+        /**
+         * Get source node of this edge.
+         * @param selector An optional selector that is used to filter the resultant collection.
+         * http://js.cytoscape.org/#edge.source
+         */
+        source(selector?: Selector): NodeCollection;
+
+        /**
+         * Get target node of this edge.
+         * @param selector An optional selector that is used to filter the resultant collection.
+         * http://js.cytoscape.org/#edge.target
+         */
+        target(selector?: Selector): NodeCollection;
+    }
+    interface EdgeCollectionTraversing {
+        // http://js.cytoscape.org/#collection/traversing
+
+        /**
+         * Get the nodes connected to the edges in the collection
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        connectedNodes(selector?: Selector): NodeCollection;
+
+        /**
+         * Get source nodes connected to the edges in the collection.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        sources(selector?: Selector): NodeCollection;
+
+        /**
+         * Get target nodes connected to the edges in the collection.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        targets(selector?: Selector): NodeCollection;
+
+        /**
+         * Get edges parallel to those in the collection.
+         *
+         * Two edges are said to be parallel if they connect the same two nodes.
+         * Any two parallel edges may connect nodes in the same direction, in which case the edges share the same source and target.
+         * They may alternatively connect nodes in the opposite direction, in which case the source and target are reversed in the second edge.
+         * That is:
+         * - edge1.source().id() === edge2.source().id()
+         *   && edge1.target().id() === edge2.target().id()
+         * OR
+         * - edge1.source().id() === edge2.target().id()
+         *   && edge1.target().id() === edge2.source().id()
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        parallelEdges(selector?: Selector): EdgeCollection;
+
+        /**
+         * Get edges codirected to those in the collection.
+         *
+         * Two edges are said to be codirected if they connect the same two nodes in the same direction: The edges have the same source and target.
+         * That is:
+         * - edge1.source().id() === edge2.source().id()
+         *   && edge1.target().id() === edge2.target().id()
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        codirectedEdges(selector?: Selector): EdgeCollection;
+    }
+    interface NodeCollectionTraversing {
+        // http://js.cytoscape.org/#collection/traversing
+
+        /**
+         * Get the edges connecting the collection to another collection. Direction of the edges does not matter.
+         *
+         * @param eles The other collection.
+         * @param selector The other collection, specified as a selector which is matched against all elements in the graph.
+         */
+        edgesWith(eles: Collection | Selector): EdgeCollection;
+
+        /**
+         * Get the edges coming from the collection (i.e. the source) going to another collection (i.e. the target).
+         *
+         * @param eles The other collection.
+         * @param selector The other collection, specified as a selector which is matched against all elements in the graph.
+         */
+        edgesTo(eles: Collection | Selector): EdgeCollection;
+
+        /**
+         * Get the edges connected to the nodes in the collection.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        connectedEdges(selector?: Selector): EdgeCollection;
+
+        /**
+         * From the set of calling nodes, get the nodes which are roots (i.e. no incoming edges, as in a directed acyclic graph).
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        roots(selector?: Selector): NodeCollection;
+
+        /**
+         * From the set of calling nodes, get the nodes which are leaves (i.e. no outgoing edges, as in a directed acyclic graph).
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        leaves(selector?: Selector): NodeCollection;
+
+        /**
+         * Get edges (and their targets) coming out of the nodes in the collection.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        outgoers(selector?: Selector): EdgeCollection;
+
+        /**
+         * Recursively get edges (and their targets) coming out of the nodes in the collection (i.e. the outgoers, the outgoers' outgoers, ...).
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        successors(selector?: Selector): EdgeCollection;
+
+        /**
+         * Get edges (and their sources) coming into the nodes in the collection.
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        incomers(selector?: Selector): EdgeCollection;
+
+        /**
+         * Recursively get edges (and their sources) coming into the nodes in the collection (i.e. the incomers, the incomers' incomers, ...).
+         *
+         * @param selector [optional] An optional selector that is used to filter the resultant collection.
+         */
+        predecessors(selector?: Selector): EdgeCollection;
+    }
+
+    /**
+     *
+     * http://js.cytoscape.org/#collection/algorithms
+     */
+
+    type WeightFn = (edge: EdgeCollection) => number;
+
+    /**
+     * The handler returns true when it finds the desired node, and it returns false to cancel the search.
+     * i - The index indicating this node is the ith visited node.
+     * depth - How many edge hops away this node is from the root nodes.
+     * v - The current node.
+     * e - The edge connecting the previous node to the current node.
+     * u - The previous node.
+     */
+    type SearchVisitFunction = (i: number, depth: number, v: NodeCollection, e: EdgeCollection, u: NodeCollection) => boolean;
+    interface SearchFirstOptions {
+        /**
+         * The root nodes (selector or collection) to start the search from.
+         */
+        roots: Selector | Collection;
+        /**
+         * A handler function that is called when a node is visited in the search.
+         */
+        visit?: SearchVisitFunction;
+        /**
+         * A boolean indicating whether the algorithm should only go along edges from source to target (default false).
+         */
+        directed?: boolean;
+    }
+    interface SearchFirstResult {
+        /**
+         * The path of the search.
+         * - The path returned includes edges such that if path[i] is a node, then path[i - 1] is the edge used to get to that node.
+         */
+        path: CollectionElements;
+        /**
+         * The node found by the search
+         * - If no node was found, then found is empty.
+         * - If your handler function returns false, then the only the path up to that point is returned.
+         */
+        found: NodeCollection;
+    }
+
+    /**
+     * http://js.cytoscape.org/#eles.dijkstra
+     */
+    interface SearchDijkstraOptions {
+        /**
+         * The root node (selector or collection) where the algorithm starts.
+         */
+        root: Selector | Collection;
+
+        /**
+         * A function that returns the positive numeric weight for this edge.
+         *
+         * If no weight function is defined, a constant weight of 1 is used for each edge.
+         */
+        weight?: WeightFn;
+
+        /**
+         * A boolean indicating whether the algorithm should only go along edges from source to target (default false).
+         */
+        directed?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.dijkstra
+     */
+    interface SearchDijkstraResult {
+        /**
+         * Returns the distance from the source node to node.
+         */
+        distanceTo(node: NodeSingular): number;
+
+        /**
+         * Returns a collection containing the shortest path from the source node to node.
+         * The path starts with the source node and includes the edges between the nodes in the path such that if pathTo(node)[i] is an edge,
+         * then pathTo(node)[i-1] is the previous node in the path and pathTo(node)[i+1] is the next node in the path.
+         */
+        pathTo(node: NodeSingular): Collection;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.aStar
+     */
+    interface SearchAStarOptions {
+        root: Selector | Collection;
+        goal: Selector | Collection;
+        weight?: WeightFn;
+        heuristic?(node: NodeCollection): number;
+        directed?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.aStar
+     */
+    interface SearchAStarResult {
+        found: boolean;
+        distance: number;
+        path: Collection;
+    }
+
+    /**
+     * http://js.cytoscape.org/#eles.floydWarshall
+     */
+    interface SearchFloydWarshallOptions {
+        weight: WeightFn;
+        directed?: boolean;
+    }
+
+    /**
+     * http://js.cytoscape.org/#eles.floydWarshall
+     */
+    interface SearchFloydWarshallResult {
+        /**
+         * Returns the distance from the source node to node.
+         */
+        distance(fromNode: NodeSingular | CollectionSelection, toNode: NodeSingular | Selector): number;
+
+        /**
+         * Returns a collection containing the shortest path from the source node to node.
+         * The path starts with the source node and includes the edges
+         * between the nodes in the path such that if pathTo(node)[i] is an edge,
+         * then pathTo(node)[i-1] is the previous node in the path and pathTo(node)[i+1]
+         * is the next node in the path.
+         */
+        path(fromNode: NodeSingular | CollectionSelection, toNode: NodeSingular | Selector): Collection;
+    }
+
+    /**
+     * http://js.cytoscape.org/#eles.bellmanFord
+     */
+    interface SearchBellmanFordOptions {
+        /**
+         * The root node (selector or collection) where the search starts.
+         */
+        "root": any;
+        /**
+         * A function that returns the positive numeric weight for this edge.
+         */
+        "weight"?: WeightFn;
+        /**
+         * Indicating whether the algorithm should only go along
+         * edges from source to target (default false).
+         */
+        "directed": boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.bellmanFord
+     */
+    interface SearchBellmanFordResult {
+        /**
+         * function that computes the shortest path from root node to the argument node
+         * (either objects or selector string)
+         */
+        pathTo(node: NodeSingular | Selector): Collection;
+
+        /**
+         *  function that computes the shortest distance from root node to argument node
+         * (either objects or selector string)
+         *
+         */
+        distanceTo(node: NodeSingular | Selector): number;
+
+        /* true/false. If true, pathTo and distanceTo will be undefined */
+        hasNegativeWeightCycle: boolean;
+    }
+
+    /**
+     * http://js.cytoscape.org/#eles.kruskal
+     * trivial so implemented in the function
+     */
+
+    /**
+     * http://js.cytoscape.org/#eles.pageRank
+     */
+    interface SearchPageRankOptions {
+        /** Numeric parameter for the algorithm. */
+        dampingFactor?: number;
+        /** Numeric parameter that represents the required precision. */
+        precision?: number;
+        /** Maximum number of iterations to perform. */
+        iterations?: number;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.pageRank
+     */
+    interface SearchPageRankResult {
+        /** function that computes the rank of a given node (either object or selector string) */
+        rank(node: NodeCollection): void;
+    }
+
+    /**
+     * http://js.cytoscape.org/#eles.degreeCentrality
+     */
+    interface SearchDegreeCentralityOptions {
+        /**
+         * The root node (selector or collection) for which the
+         * centrality calculation is made.
+         */
+        root: NodeSingular | Selector;
+        /**  A function that returns the weight for the edge. */
+        weight?(edge: EdgeSingular): number;
+        /**
+         * The alpha value for the centrality calculation, ranging on [0, 1].
+         * With value 0 (default), disregards edge weights and solely uses
+         * number of edges in the centrality calculation. With value 1,
+         * disregards number of edges and solely uses the edge weights
+         * in the centrality calculation.
+         */
+        alpha?: number;
+        /**
+         * Whether the directed indegree and outdegree centrality is calculated (true) or
+         * whether the undirected centrality is calculated (false, default).
+         */
+        directed?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.degreeCentrality
+     */
+    interface SearchDegreeCentralityResultUndirected {
+        /** the degree centrality of the root node */
+        degree: number;
+    }
+    interface SearchDegreeCentralityResultDirected {
+        /* the indegree centrality of the root node */
+        indegree: number;
+        /* the outdegree centrality of the root node */
+        outdegree: number;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.degreeCentralityNormalized
+     */
+    interface SearchDegreeCentralityNormalizedOptions {
+        /**  A function that returns the weight for the edge. */
+        weight(edge: EdgeSingular): number;
+        /**
+         * The alpha value for the centrality calculation, ranging on [0, 1].
+         * With value 0 (default), disregards edge weights and solely uses
+         * number of edges in the centrality calculation. With value 1,
+         * disregards number of edges and solely uses the edge weights
+         * in the centrality calculation.
+         */
+        alpha?: number;
+        /**
+         * A boolean indicating whether the directed indegree and outdegree centrality is calculated (true) or
+         * whether the undirected centrality is calculated (false, default).
+         */
+        directed?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.degreeCentralityNormalized
+     */
+    interface SearchDegreeCentralityNormalizedResultUndirected {
+        /** the normalised degree centrality of the specified node */
+        degree(node: NodeSingular): any;
+    }
+    interface SearchDegreeCentralityNormalizedResultDirected {
+        /** the normalised indegree centrality of the specified node */
+        indegree(node: NodeSingular): any;
+
+        /** the normalised outdegree centrality of the specified node */
+        outdegree(node: NodeSingular): any;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.closenessCentrality
+     */
+    interface SearchClosenessCentralityOptions {
+        /**
+         * The root node (selector or collection) for which the
+         * centrality calculation is made.
+         */
+        root: NodeSingular | Selector;
+        /**  A function that returns the weight for the edge. */
+        weight?(edge: EdgeSingular): number;
+
+        /**
+         * A boolean indicating whether the directed indegree and outdegree centrality is calculated (true) or
+         * whether the undirected centrality is calculated (false, default).
+         */
+        directed?: boolean;
+        /**
+         * A boolean indicating whether the algorithm calculates the
+         * harmonic mean (true, default) or the arithmetic mean (false) of distances.
+         * The harmonic mean is very useful for graphs that are not strongly connected.
+         */
+        harmonic?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.closenessCentrality
+     * trivial
+     */
+
+    /**
+     * http://js.cytoscape.org/#eles.closenessCentralityNormalized
+     */
+    interface SearchClosenessCentralityNormalizedOptions {
+        /**  A function that returns the weight for the edge. */
+        weight?(edge: EdgeSingular): number;
+        directed?: boolean;
+        /**
+         * A boolean indicating whether the algorithm calculates the
+         * harmonic mean (true, default) or the arithmetic mean (false) of distances.
+         * The harmonic mean is very useful for graphs that are not strongly connected.
+         */
+        harmonic?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.closenessCentralityNormalized
+     * trivial
+     */
+
+    /**
+     * http://js.cytoscape.org/#eles.betweennessCentrality
+     */
+    interface SearchBetweennessOptions {
+        /**  A function that returns the weight for the edge. */
+        weight?(edge: EdgeSingular): number;
+
+        /**
+         * A boolean indicating whether the directed indegree and outdegree centrality is calculated (true) or
+         * whether the undirected centrality is calculated (false, default).
+         */
+        directed?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.betweennessCentrality
+     */
+    interface SearchBetweennessResult {
+        /** returns the betweenness centrality of the specified node */
+        betweenness(node: NodeSingular): number;
+
+        /** returns the normalised betweenness centrality of the specified node */
+        betweennessNormalized(node: NodeSingular): number;
+        betweennessNormalised(node: NodeSingular): number;
+    }
+
+    /**
+     * http://js.cytoscape.org/#eles.closenessCentralityNormalized
+     */
+    interface SearchClosenessCentralityNormalizedOptions {
+        /**  A function that returns the weight for the edge. */
+        weight?(edge: EdgeSingular): number;
+        directed?: boolean;
+        /**
+         * A boolean indicating whether the algorithm calculates the
+         * harmonic mean (true, default) or the arithmetic mean (false) of distances.
+         * The harmonic mean is very useful for graphs that are not strongly connected.
+         */
+        harmonic?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#eles.closenessCentralityNormalized
+     * trivial
+     */
+
+    interface CollectionAlgorithms {
+        /**
+         * Perform a breadth-first search within the elements in the collection.
+         * @param options
+         * http://js.cytoscape.org/#eles.breadthFirstSearch
+         */
+        breadthFirstSearch(options: SearchFirstOptions): SearchFirstResult;
+        /**
+         * Perform a depth-first search within the elements in the collection.
+         * http://js.cytoscape.org/#eles.depthFirstSearch
+         */
+        depthFirstSearch(options: SearchFirstOptions): SearchFirstResult;
+
+        /**
+         * Perform Dijkstra's algorithm on the elements in the collection.
+         * This finds the shortest paths to all other nodes in the collection from the root node.
+         * http://js.cytoscape.org/#eles.dijkstra
+         */
+        dijkstra(options: SearchDijkstraOptions): SearchDijkstraResult;
+
+        /**
+         * Perform the A* search algorithm on the elements in the collection.
+         * This finds the shortest path from the root node to the goal node.
+         * http://js.cytoscape.org/#eles.aStar
+         */
+        aStar(options: SearchAStarOptions): SearchAStarResult;
+        /**
+         * Perform the Floyd Warshall search algorithm on the elements in the collection.
+         * This finds the shortest path between all pairs of nodes.
+         * http://js.cytoscape.org/#eles.floydWarshall
+         */
+        aStar(options: SearchFloydWarshallOptions): SearchFloydWarshallResult;
+        /**
+         * Perform the Bellman-Ford search algorithm on the elements in the collection.
+         * This finds the shortest path from the starting node to all other nodes in the collection.
+         * http://js.cytoscape.org/#eles.bellmanFord
+         */
+        bellmanFort(options: SearchBellmanFordOptions): SearchBellmanFordResult;
+        /**
+         * Perform Kruskal's algorithm on the elements in the collection,
+         * returning the minimum spanning tree, assuming undirected edges.
+         * http://js.cytoscape.org/#eles.kruskal
+         */
+        kruskal(handler: (edge: EdgeCollection) => number): void;
+        /**
+         * Finds the minimum cut in a graph using the Karger-Stein algorithm.
+         * The optimal result is found with a high probability, but without guarantee.
+         * http://js.cytoscape.org/#eles.kargerStein
+         */
+        kargerStein(): { cut: EdgeCollection; partitionFirst: NodeCollection; partitionSecond: NodeCollection; };
+        /**
+         * Rank the nodes in the collection using the Page Rank algorithm.
+         * http://js.cytoscape.org/#eles.pageRank
+         */
+        pageRank(options: SearchPageRankOptions): SearchPageRankResult;
+        /**
+         * Considering only the elements in the calling collection,
+         * calculate the degree centrality of the specified root node.
+         * http://js.cytoscape.org/#eles.degreeCentrality
+         */
+        degreeCentrality(options: SearchDegreeCentralityOptions):
+            SearchDegreeCentralityResultDirected | SearchDegreeCentralityResultUndirected;
+
+        /**
+         * Considering only the elements in the calling collection,
+         * calculate the normalised degree centrality of the nodes.
+         * http://js.cytoscape.org/#eles.degreeCentralityNormalized
+         */
+        degreeCentralityNormalized(options: SearchDegreeCentralityNormalizedOptions):
+            SearchDegreeCentralityNormalizedResultDirected | SearchDegreeCentralityNormalizedResultUndirected;
+
+        /**
+         * Considering only the elements in the calling collection,
+         * calculate the closeness centrality of the specified root node.
+         * http://js.cytoscape.org/#eles.closenessCentrality
+         */
+        closenessCentrality(options: SearchClosenessCentralityOptions): number;
+        /**
+         * Considering only the elements in the calling collection,
+         * calculate the closeness centrality of the nodes.
+         * http://js.cytoscape.org/#eles.closenessCentralityNormalized
+         */
+        closenessCentralityNormalized(options: SearchClosenessCentralityNormalizedOptions):
+            SearchDegreeCentralityNormalizedResultDirected |
+            SearchDegreeCentralityNormalizedResultUndirected;
+        /**
+         * Considering only the elements in the calling collection,
+         * calculate the betweenness centrality of the nodes.
+         * http://js.cytoscape.org/#eles.betweennessCentrality
+         */
+        betweennessCentrality(options: SearchBetweennessOptions): SearchBetweennessResult;
+    }
+
+    /**
+     * http://js.cytoscape.org/#collection/compound-nodes
+     */
+    interface NodeSingularCompound {
+        /**
+         * Get whether the node is a compound parent
+         * (i.e. a node containing one or more child nodes)
+         * http://js.cytoscape.org/#node.isParent
+         */
+        isParent(): boolean;
+        /**
+         * Get whether the node is childless (i.e. a node with no child nodes)
+         * http://js.cytoscape.org/#node.isChildless
+         */
+        isChildless(): boolean;
+        /**
+         * Get whether the node is a compound child (i.e. contained within a node)
+         *  http://js.cytoscape.org/#node.isChild
+         */
+        isChild(): boolean;
+        /**
+         * Get whether the node is an orphan (i.e. a node with no parent)
+         * http://js.cytoscape.org/#node.isOrphan
+         */
+        isOrphan(): boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#collection/compound-nodes
+     */
+    interface NodeCollectionCompound {
+        /**
+         * Get the compound parent node of each node in the collection.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.parent
+         */
+        parent(selector?: Selector): NodeCollection;
+        /**
+         * Get all compound ancestor nodes
+         * (i.e. parents, parents' parents, etc.) of each node in the collection.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.ancestors
+         */
+        ancestors(selector?: Selector): NodeCollection;
+        parents(selector?: Selector): NodeCollection;
+        /**
+         * Get all compound ancestors common to all the nodes in the collection,
+         * starting with the closest and getting progressively farther.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.commonAncestors
+         */
+        commonAncestors(selector?: Selector): NodeCollection;
+        /**
+         * Get all orphan (i.e. has no compound parent) nodes in the calling collection.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.orphans
+         */
+        orphans(selector?: Selector): NodeCollection;
+        /**
+         * Get all nonorphan (i.e. has a compound parent) nodes in the calling collection.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.nonorphans
+         */
+        nonorphans(selector?: Selector): NodeCollection;
+        /**
+         * Get all compound child (i.e. direct descendant) nodes of each node in the collection.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.children
+         */
+        children(selector?: Selector): NodeCollection;
+        /**
+         * Get all compound descendant (i.e. children, children's children, etc.)
+         * nodes of each node in the collection.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.descendants
+         */
+        descendants(selector?: Selector): NodeCollection;
+        /**
+         * Get all sibling (i.e. same compound parent)
+         * nodes of each node in the collection.
+         * @param selector A selector used to filter the resultant collection.
+         * http://js.cytoscape.org/#nodes.siblings
+         */
+        siblings(selector?: Selector): NodeCollection;
+    }
+
+    /**
+     * A selector functions similar to a CSS selector on DOM elements,
+     * but selectors in Cytoscape.js instead work on
+     * collections of graph elements.
+     * Note that wherever a selector may be specified
+     * as the argument to a function,
+     * a eles.filter()-style filter function may be
+     * used in place of the selector.
+     *
+     * See http://js.cytoscape.org/#selectors for
+     * details about writing selectors.
+     * Selectors are an island grammar.
+     */
+    type Selector = string;
+
+    /**
+     * A space separated list of event names.
+     * http://js.cytoscape.org/#cy.promiseOn
+     */
+    type EventNames = string;
+
+    /**
+     * A string indicating the selection behaviour from user input.
+     * http://js.cytoscape.org/#core/initialisation
+     *
+     * 'additive' : a new selection made by the user adds to the set of currently selected elements.
+     * 'single' : a new selection made by the user becomes the entire set of currently
+     *            selected elements (i.e. the previous elements are unselected)
+     */
+    type SelectionType = "additive" | "single";
+
+    /**
+     * http://js.cytoscape.org/#ele.group
+     * http://js.cytoscape.org/#notation/elements-json
+     *
+     * 'nodes'
+     * 'edges'
+     */
+    type ElementGroup = "nodes" | "edges";
+
+    /**
+     * 'x' : x coordinate
+     * 'y' : y coordinate
+     */
+    type PositionDimension = "x" | "y";
+
+    /**
+     * Usually temp or nonserialisable data can be stored.
+     * http://js.cytoscape.org/#notation/elements-json
+     * http://js.cytoscape.org/#cy.scratch
+     * http://js.cytoscape.org/#ele.scratch
+     */
+    type Scratchpad = any;
+
+    /**
+     * Style in Cytoscape.js follows CSS conventions as closely as possible.
+     * In most cases, a property has the same name and behaviour as its corresponding CSS namesake.
+     * However, the properties in CSS are not sufficient to specify the style of some parts of the graph.
+     * In that case, additional properties are introduced that are unique to Cytoscape.js.
+     *
+     * For simplicity and ease of use, specificity rules are completely ignored in stylesheets.
+     * For a given style property for a given element, the last matching selector wins.
+     *
+     * http://js.cytoscape.org/#style
+     */
+    namespace Css {
+        type Colour = string;
+
+        /**
+         * The shape of the node’s body.
+         * Note that each shape fits within the specified width and height,
+         * and so you may have to adjust width and height
+         * if you desire an equilateral shape
+         * (i.e. width !== height for several equilateral shapes).
+         * 'polygon' is a custom polygon specified via shape-polygon-points.
+         */
+        type NodeShape = 'rectangle' | 'roundrectangle' | 'ellipse' | 'triangle'
+            | "pentagon" | "hexagon" | "heptagon" | "octagon" | "star"
+            | "diamond" | "vee" | "rhomboid" | "polygon";
+
+        /**
+         * A space-separated list of numbers ranging on [-1, 1],
+         * representing alternating x and y values (i.e. x1 y1 x2 y2, x3 y3 ...).
+         * This represents the points in the polygon for the node’s shape.
+         * The bounding box of the node is given by (-1, -1), (1, -1), (1, 1), (-1, 1).
+         */
+        type ShapePolygonPoints = string;
+
+        /**
+         * The line style; may be solid, dotted, dashed, or double
+         */
+        type LineStyle = "solid" | "dotted" | "dashed" | "double";
+
+        /**
+         * http://js.cytoscape.org/#style/node-body
+         */
+        interface Node extends PaddingNode {
+            "label"?: string;
+            /**
+             * The width of the node’s body.
+             * This property can take on the special value label
+             * so the width is automatically based on the node’s label.
+             */
+            "width"?: number | "label";
+            /**
+             * The height of the node’s body.
+             * This property can take on the special value label
+             * so the height is automatically based on the node’s label.
+             */
+            "height"?: number | "label";
+            /**
+             * The shape of the node’s body.
+             */
+            "shape"?: NodeShape;
+            "shape-polygon-points"?: ShapePolygonPoints;
+
+            "opacity"?: number;
+
+            "backgroundColor"?: Colour;
+            /**
+             * The colour of the node’s body.
+             */
+            "background-color"?: Colour;
+            /**
+             * Blackens the node’s body for values from 0 to 1;
+             * whitens the node’s body for values from 0 to -1.
+             */
+            "background-blacken"?: number;
+            /**
+             * The opacity level of the node’s background colour.
+             */
+            "background-opacity"?: number;
+            /**
+             * The size of the node’s border.
+             */
+            "border-width"?: number;
+            /**
+             * The style of the node’s border.
+             */
+            "border-style"?: LineStyle;
+            /**
+             * The colour of the node’s border.
+             */
+            "border-color"?: Colour;
+            /**
+             * The opacity of the node’s border.
+             * A value between [0 1].
+             */
+            "border-opacity"?: number;
+
+            "text-opacity"?: number;
+        }
+
+        /**
+         * A padding defines an addition to a node’s dimension.
+         * For example, padding-left adds to a node’s outer (i.e. total) width.
+         * This can be used to add spacing around the label of width: label; height: label; nodes,
+         * or it can be used to add spacing between a compound node parent and its children.
+         */
+        interface PaddingNode {
+            "padding-left"?: string;
+            "padding-right"?: string;
+            "padding-top"?: string;
+            "padding-bottom"?: string;
+        }
+
+        interface Dictionary { [key: string]: any; }
+
+        // export interface ElementCss extends CSSStyleDeclaration { }
+        /**
+         * A background image may be applied to a node’s body:
+         *
+         * http://js.cytoscape.org/#style/background-image
+         */
+        interface BackgroundImage {
+            /**
+             * The URL that points to the image that should be used as the node’s background.
+             * PNG, JPG, and SVG are supported formats.
+             * You may use a data URI to use embedded images,
+             * thereby saving a HTTP request.
+             */
+            "background-image"?: string;
+            /**
+             * The opacity of the background image. [0 1]
+             */
+            "background-image-opacity"?: number;
+            /**
+             * Specifies the width of the image.
+             * A percent value (e.g. 50%) may be used to set
+             * the image width relative to the node width.
+             * If used in combination with background- fit,
+             * then this value overrides the width of the image
+             * in calculating the fitting — thereby overriding the aspect ratio.
+             * The auto value is used by default, which uses the width of the image.
+             */
+            "background-width"?: number | string;
+            /**
+             * Specifies the height of the image.
+             * A percent value (e.g. 50%) may be used to set the image
+             * height relative to the node height.
+             * If used in combination with background- fit,
+             * then this value overrides the height of the image in calculating
+             * the fitting — thereby overriding the aspect ratio.
+             * The auto value is used by default, which uses the height of the image.
+             */
+            "background-height"?: number | string;
+            /**
+             * How the background image is fit to the node;
+             * may be none for original size,
+             * contain to fit inside node,
+             * or cover to cover the node.
+             */
+            "background-fit"?: "none" | "contain" | "cover";
+            /**
+             * Whether to repeat the background image;
+             * may be no-repeat, repeat-x, repeat-y, or repeat.
+             */
+            "background-repeat"?: "no-repeat" | "repeat-x" | "repeat-y" | "repeat";
+            /**
+             * The x position of the background image,
+             * measured in percent(e.g. 50%) or pixels (e.g. 10px).
+             */
+            "background-position-x"?: number | string;
+            /**
+             * The y position of the background image,
+             * measured in percent(e.g. 50%) or pixels (e.g. 10px).
+             */
+            "background-position-y"?: number | string;
+            /**
+             * How background image clipping is handled;
+             * may be node for clipped to node shape or none for no clipping.
+             */
+            "background-clip"?: "clipped" | "none";
+        }
+
+        /**
+         * These properties allow you to create pie chart backgrounds on nodes.
+         * Note that 16 slices maximum are supported per node,
+         * so in the properties 1 <= i <= 16.
+         * Of course, you must specify a numerical value for each property in place of i.
+         * Each nonzero sized slice is placed in order of i,
+         * starting from the 12 o’clock position and working clockwise.
+         *
+         * You may find it useful to reserve a number to a particular
+         * colour for all nodes in your stylesheet.
+         * Then you can specify values for pie-i-background-size
+         * accordingly for each node via a mapper.
+         * This would allow you to create consistently coloured
+         * pie charts in each node of the graph based on element data.
+         *
+         * http://js.cytoscape.org/#style/pie-chart-background
+         */
+        interface PieChartBackground {
+            /**
+             * The diameter of the pie, measured as a percent of node size (e.g. 100%) or an absolute length (e.g. 25px).
+             */
+            "pie-size": string;
+            /**
+             * The colour of the node’s ith pie chart slice.
+             */
+            "pie-i-background-color": Colour;
+            /**
+             * The size of the node’s ith pie chart slice, measured in percent (e.g. 25% or 25).
+             */
+            "pie-i-background-size": number;
+            /**
+             * The opacity of the node’s ith pie chart slice.
+             */
+            "pie-i-background-opacity": number;
+        }
+
+        interface Edge extends EdgeLine, EdgeArror { }
+
+        /**
+         * These properties affect the styling of an edge’s line:
+         *
+         * http://js.cytoscape.org/#style/edge-line
+         */
+        interface EdgeLine {
+            /**
+             * The width of an edge’s line.
+             */
+            "width"?: number | "label";
+            /**
+             * The curving method used to separate two or more edges between two nodes;
+             * may be
+             *  - haystack (default, very fast, bundled straight edges for which loops and compounds are unsupported),
+             *  - bezier(bundled curved edges),
+             *  - unbundled - bezier(curved edges for use with manual control points), or
+             *  - segments (a series of straight lines).
+             * Note that haystack edges work best with ellipse, rectangle, or similar nodes.
+             * Smaller node shapes, like triangle, will not be as aesthetically pleasing.
+             * Also note that edge arrows are unsupported for haystack edges.
+             */
+            "curve-style"?: "haystack" | "bezier" | "unbundled" | "segments";
+            /**
+             * The colour of the edge’s line.
+             */
+            "line-color"?: Colour;
+            /**
+             * The style of the edge’s line.
+             */
+            "line-style"?: LineStyle;
+        }
+
+        /**
+         * For automatic, bundled bezier edges (curve - style: bezier):
+         *
+         * http://js.cytoscape.org/#style/bezier-edges
+         */
+        interface BezierEdges {
+            /**
+             * From the line perpendicular from source to target,
+             * this value specifies the distance between successive bezier edges.
+             */
+            "control-point-step-size": number;
+            /**
+             * A single value that overrides "control-point-step-size" with a manual value.
+             * Because it overrides the step size, bezier edges with the same value will overlap.
+             * Thus, it’s best to use this as a one- off value for particular edges if need be.
+             */
+            "control-point-distance": number;
+            /**
+             * A single value that weights control points along the line from source to target.
+             * The value usually ranges on [0, 1], with
+             * 0 towards the source node and
+             * 1 towards the target node —
+             * but larger or smaller values can also be used.
+             */
+            "control-point-weight": number;
+            /**
+             * With value intersection (default),
+             * the line from source to target for "control-point-weight" is
+             * from the outside of the source node’s shape to the outside of
+             * the target node’s shape.With value node- position,
+             * the line is from the source position to the target position.
+             * The "node-position" option makes calculating edge points easier
+             * — but it should be used carefully because you can create invalid
+             * points that intersection would have automatically corrected.
+             */
+            "edge-distances": number;
+        }
+        /**
+         * Unbundled bezier edges
+         * For bezier edges with manual control points (curve - style: unbundled - bezier):
+         *
+         * http://js.cytoscape.org/#style/unbundled-bezier-edges
+         */
+        interface UnbundledBezierEdges {
+            /**
+             * A series of values that specify for each control point the
+             * distance perpendicular to a line formed
+             * from source to target, e.g. -20 20 - 20.
+             */
+            "control-point-distances": string;
+            /**
+             * A series of values that weights control points along
+             * a line from source to target, e.g. 0.25 0.5 0.75.
+             * A value usually ranges on [0, 1], with
+             * 0 towards the source node and
+             * 1 towards the target node
+             * — but larger or smaller values can also be used.
+             */
+            "control-point-weights": string;
+            /**
+             * With value intersection (default),
+             * the line from source to target for "control-point-weights"
+             * is from the outside of the source node’s shape to the
+             * outside of the target node’s shape.
+             * With value
+             * "node-position", the line is from the source position to the target position.
+             * The "node-position" option makes calculating edge points easier
+             * — but it should be used carefully because you can create
+             * invalid points that intersection would have automatically corrected.
+             */
+            "edge-distances": number;
+        }
+        /**
+         * Haystack edges
+         * Loop edges and compound parent nodes are not supported by haystack edges.
+         * Haystack edges are a more performant replacement for plain, straight line edges.
+         *
+         * For fast, straight line edges (curve - style: haystack):
+         * http://js.cytoscape.org/#style/haystack-edges
+         */
+        interface HaystackEdges {
+            /**
+             * A value between 0 and 1 inclusive that indicates the relative radius used to position haystack edges on their connected nodes.
+             * The outside of the node is at 1, and the centre of the node is at 0.
+             */
+            "haystack-radius": number;
+        }
+        /**
+         * Segments edges
+         * For edges made of several straight lines (curve - style: segments):
+         * http://js.cytoscape.org/#style/segments-edges
+         */
+        interface SegmentsEdges {
+            /**
+             * A series of values that specify for each segment point the distance perpendicular to a line formed from source to target, e.g. -20 20 - 20.
+             */
+            "segment-distances": string;
+            /**
+             * A series of values that weights segment points along a line from source to target,
+             * e.g. 0.25 0.5 0.75.A value usually ranges on [0, 1],
+             * with 0 towards the source node and 1 towards the target node — but larger or smaller values can also be used.
+             */
+            "segment-weights": string;
+            /**
+             * With value
+             *  * "intersection" (default), the line from source to target
+             *  * for "segment-weights" is from the outside of the source node’s shape to the outside of the target node’s shape.
+             *  * With value "node-position", the line is from the source position to the target position.
+             * The "node-position" option makes calculating edge points easier
+             * — but it should be used carefully because you can create
+             * invalid points that intersection would have automatically corrected.
+             */
+            "edge-distances": "intersection" | "segment-weights" | "node-position";
+        }
+        type ArrowShape = "tee" | "triangle" | "triangle-tee" | "triangle-backcurve" | "square" | "circle" | "diamond" | "none";
+
+        type ArrowFill = "filled" | "hollow";
+
+        /**
+         * Edge arrow
+         *  * <pos>-arrow-color : The colour of the edge’s source arrow.
+         *  * <pos>-arrow-shape : The shape of the edge’s source arrow.
+         *  * <pos>-arrow-fill : The fill state of the edge’s source arrow.
+         *
+         * For each edge arrow property above, replace <pos> with one of
+         *  * source : Pointing towards the source node, at the end of the edge.
+         *  * mid-source : Pointing towards the source node, at the middle of the edge.
+         *  * target : Pointing towards the target node, at the end of the edge.
+         *  * mid-target: Pointing towards the target node, at the middle of the edge.
+         *
+         * Only mid arrows are supported on haystack edges.
+         * http://js.cytoscape.org/#style/edge-arrow
+         */
+        interface EdgeArror {
+            /** The colour of the edge’s source arrow. */
+            "source-arrow-color"?: Colour;
+            /** The colour of the edge’s "mid-source" arrow. */
+            "mid-source-arrow-color"?: Colour;
+            /** The colour of the edge’s target arrow. */
+            "target-arrow-color"?: Colour;
+            /** The colour of the edge’s "mid-target" arrow. */
+            "mid-target-arrow-color"?: Colour;
+
+            /** The shape of the edge’s source arrow. */
+            "source-arrow-shape"?: ArrowShape;
+            /** The shape of the edge’s mid-source arrow. */
+            "mid-source-arrow-shape"?: ArrowShape;
+            /** The shape of the edge’s target arrow. */
+            "target-arrow-shape"?: ArrowShape;
+            /** The shape of the edge’s mid-target arrow. */
+            "mid-target-arrow-shape"?: ArrowShape;
+
+            /** The fill state of the edge’s source arrow. */
+            "source-arrow-fill"?: ArrowFill;
+            /** The fill state of the edge’s mid-source arrow. */
+            "mid-source-arrow-fill"?: ArrowFill;
+            /** The fill state of the edge’s target arrow. */
+            "target-arrow-fill"?: ArrowFill;
+            /** The fill state of the edge’s mid-target arrow. */
+            "mid-target-arrow-fill"?: ArrowFill;
+        }
+
+        /**
+         * http://js.cytoscape.org/#style/visibility
+         */
+        interface Visibility {
+            /**
+             * Whether to display the element; may be element for displayed or none for not displayed.
+             * Note that a "display: none" bezier edge does not take up space in its bundle.
+             */
+            "display": "none" | "displayed";
+            /**
+             * Whether the element is visible; may be visible or hidden.
+             * Note that a "visibility : hidden" bezier edge still takes up space in its bundle.
+             */
+            "visibility": "none" | "visible";
+            /**
+             * The opacity of the element, ranging from 0 to 1.
+             * Note that the opacity of a compound node parent affects the effective opacity of its children.
+             */
+            "opacity": number;
+            /**
+             * An integer value that affects the relative draw order of elements.
+             * In general, an element with a higher "z-index" will be drawn on top of an element with a lower "z-index".
+             * Note that edges are under nodes despite "z-index", except when necessary for compound nodes.
+             */
+            "z-index": number;
+        }
+
+        /** https://developer.mozilla.org/en-US/docs/Web/CSS/font-style */
+        type FontStyle = "normal" | "italic" | "oblique";
+
+        /** https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight */
+        type FontWeight = number | "normal" | "bold" | "lighter" | "bolder";
+
+        /** http://js.cytoscape.org/#style/labels */
+        type TextTranformation = "none" | "uppercase" | "lowercase";
+
+        /**
+         * Labels
+         * Label text:
+         *
+         * http://js.cytoscape.org/#style/labels
+         */
+        interface Labels {
+            /**
+             * The text to display for an element’s label.
+             */
+            "label": string;
+            /**
+             * The text to display for an edge’s source label.
+             */
+            "source-label": string;
+            /**
+             * The text to display for an edge’s target label.
+             */
+            "target-label": string;
+            /**
+             * Basic font styling:
+             */
+            /**
+             * The colour of the element’s label.
+             */
+            "color": Colour;
+            /**
+             * The opacity of the label text, including its outline.
+             */
+            "text-opacity": number;
+            /**
+             * A comma-separated list of font names to use on the label text.
+             */
+            "font-family": string;
+            /**
+             * The size of the label text.
+             * https://developer.mozilla.org/en-US/docs/Web/CSS/font-family
+             */
+            "font-size": number;
+            /**
+             * A CSS font style to be applied to the label text.
+             * https://developer.mozilla.org/en-US/docs/Web/CSS/font-style
+             */
+            "font-style": FontStyle;
+            /**
+             * A CSS font weight to be applied to the label text.
+             */
+            "font-weight": FontWeight;
+            /**
+             * A transformation to apply to the label text.
+             */
+            "text-transform": TextTranformation;
+
+            /**
+             * Wrapping text:
+             */
+
+            /**
+             * A wrapping style to apply to the label text; may be
+             *  * "none" for no wrapping (including manual newlines ) or
+             *  * "wrap" for manual and/ or autowrapping.
+             */
+            "text-wrap": "none" | "wrap";
+            /**
+             * The maximum width for wrapped text,
+             * applied when "text-wrap" is set to wrap.
+             * For only manual newlines (i.e.\n), set a very large
+             * value like 1000px such that only your newline characters would apply.
+             */
+            "text-max-width": string;
+
+            /**
+             * Node label alignment:
+             */
+
+            /**
+             * The vertical alignment of a node’s label.
+             */
+            "text-halign": "left" | "center" | "right";
+            /**
+             * The vertical alignment of a node’s label.
+             */
+            "text-valign": "top" | "center" | "bottom";
+
+            /**
+             * Edge label alignment:
+             */
+
+            /**
+             * For the source label of an edge, how far from the source node the label should be placed.
+             */
+            "source-text-offset": number;
+            /**
+             * For the target label of an edge, how far from the target node the label should be placed.
+             */
+            "target-text-offset": number;
+            /**
+             * Margins:
+             */
+
+            /**
+             * A margin that shifts the label along the x- axis.
+             */
+            "text-margin-x": number;
+            /**
+             * A margin that shifts the label along the y- axis.
+             */
+            "text-margin-y": number;
+            /**
+             * (For the source label of an edge.)
+             */
+            "source-text-margin-x": number;
+            /**
+             * (For the source label of an edge.)
+             */
+            "source-text-margin-y": number;
+            /**
+             * (For the target label of an edge.)
+             */
+            "target-text-margin-x": number;
+            /**
+             * (For the target label of an edge.)
+             */
+            "target-text-margin-y": number;
+            /**
+             * Rotating text:
+             */
+
+            /**
+             * A rotation angle that is applied to the label.
+             *  * For edges, the special value autorotate can be used to align the label to the edge.
+             *  * For nodes, the label is rotated along its anchor point on the node, so a label margin may help for some usecases.
+             *  * The special value none can be used to denote 0deg.
+             *  * Rotations works best with left- to - right text.
+             */
+            "text-rotation": number;
+
+            /**
+             * (For the source label of an edge.)
+             */
+            "source-text-rotation": number;
+            /**
+             * (For the target label of an edge.)
+             */
+            "target-text-rotation": number;
+
+            /**
+             * Outline:
+             */
+
+            /**
+             * The colour of the outline around the element’s label text.
+             */
+            "text-outline-color": Colour;
+            /**
+             * The opacity of the outline on label text.
+             */
+            "text-outline-opacity": number;
+            /**
+             * The size of the outline on label text.
+             */
+            "text-outline-width": number;
+            /**
+             * Shadow:
+             */
+            /**
+             * The shadow blur distance.
+             */
+            "text-shadow-blur": number;
+            /**
+             * The colour of the shadow.
+             */
+            "text-shadow-color": Colour;
+            /**
+             * The x offset relative to the text where the shadow will be displayed, can be negative.
+             * If you set blur to 0, add an offset to view your shadow.
+             */
+            "text-shadow-offset-x": number;
+            /**
+             * The y offset relative to the text where the shadow will be displayed, can be negative.
+             * If you set blur to 0, add an offset to view your shadow.
+             */
+            "text-shadow-offset-y": number;
+            /**
+             * The opacity of the shadow on the text; the shadow is disabled for 0 (default value).
+             */
+            "text-shadow-opacity": number;
+
+            /**
+             * Background:
+             */
+
+            /**
+             * A colour to apply on the text background.
+             */
+            "text-background-color": Colour;
+            /**
+             * The opacity of the label background; the background is disabled for 0 (default value).
+             */
+            "text-background-opacity": number;
+            /**
+             * The shape to use for the label background.
+             */
+            "text-background-shape": "ractangle" | "roundrectangle";
+
+            /**
+             * Border:
+             */
+
+            /**
+             * The width of the border around the label; the border is disabled for 0 (default value).
+             */
+            "text-border-opacity": number;
+            /**
+             * The width of the border around the label.
+             */
+            "text-border-width": number;
+            /**
+             * The style of the border around the label.
+             */
+            "text-border-style": LineStyle;
+            /**
+             * The colour of the border around the label.
+             */
+            "text-border-color": Colour;
+
+            /**
+             * Interactivity:
+             */
+
+            /**
+             * If zooming makes the effective font size of the label smaller than this,
+             * then no label is shown.Note that because of performance optimisations,
+             * the label may be shown at font sizes slightly smaller than this value.
+             *
+             * This effect is more pronounced at larger screen pixel ratios.However,
+             * it is guaranteed that the label will be shown at sizes equal to or greater than the value specified.
+             */
+            "min-zoomed-font-size": number;
+            /**
+             * Whether events should occur on an element if the label receives an event.
+             * You may want a style applied to the text onactive so you know the text is activatable.
+             */
+            "text-events": "yes" | "no";
+        }
+
+        /**
+         * http://js.cytoscape.org/#style/events
+         */
+        interface Events {
+            /**
+             * Whether events should occur on an element (e.g.tap, mouseover, etc.).
+             *  * For "no", the element receives no events and events simply pass through to the core/viewport.
+             */
+            "events": "yes" | "no";
+            /**
+             *  Whether events should occur on an element if the label receives an event.
+             * You may want a style applied to the text on active so you know the text is activatable.
+             */
+            "text-events": "yes" | "no";
+        }
+
+        /**
+         * These properties allow for the creation of overlays on top of nodes or edges,
+         * and are often used in the :active state.
+         * http://js.cytoscape.org/#style/overlay
+         */
+        interface Overlay {
+            /**
+             * The colour of the overlay.
+             */
+            "overlay-color": Colour;
+            /**
+             * The area outside of the element within which the overlay is shown.
+             */
+            "overlay-padding": number;
+            /**
+             * The opacity of the overlay.
+             */
+            "overlay-opacity": number;
+        }
+        /**
+         * These properties allow for the creation of shadows on nodes or edges.
+         * Note that shadow-blur could seriously impact performance on large graph.
+         * http://js.cytoscape.org/#style/shadow
+         */
+        interface Shadow {
+            /**
+             * The shadow blur, note that if greater than 0, this could impact performance.
+             */
+            "shadow-blur": number;
+            /**
+             * The colour of the shadow.
+             */
+            "shadow-color": Colour;
+            /**
+             * The x offset relative to the node/edge where the shadow will be displayed, can be negative. If you set blur to 0, add an offset to view your shadow.
+             */
+            "shadow-offset-x": number;
+            /**
+             * The y offset relative to the node/edge where the shadow will be displayed, can be negative. If you set blur to 0, add an offset to view your shadow.
+             */
+            "shadow-offset-y": number;
+            /**
+             * The opacity of the shadow.
+             */
+            "shadow-opacity": number;
+        }
+
+        /**
+         * Transition animation
+         */
+        type TransitionTimingFunction = "linear" | "spring" | "cubic-bezier" | "ease" | "ease-in" | "ease-out" |
+            "ease-in-out" | "ease-in-sine" | "ease-out-sine" | "ease-in-out-sine" | "ease-in-quad" |
+            "ease-out-quad" | "ease-in-out-quad" | "ease-in-cubic" | "ease-out-cubic" |
+            "ease-in-out-cubic" | "ease-in-quart" | "ease-out-quart" | "ease-in-out-quart" |
+            "ease-in-quint" | "ease-out-quint" | "ease-in-out-quint" | "ease-in-expo" |
+            "ease-out-expo" | "ease-in-out-expo" | "ease-in-circ" | "ease-out-circ" | "ease-in-out-circ";
+
+        /**
+         * http://js.cytoscape.org/#style/transition-animation
+         */
+        interface TransitionAnimation {
+            /**
+             * A comma separated list of style properties to animate in this state.
+             */
+            "transition-property": string;
+            /**
+             * The length of the transition in seconds(e.g. 0.5s).
+             */
+            "transition-duration": number;
+            /**
+             * The length of the delay in seconds before the transition occurs (e.g. 250ms).
+             */
+            "transition-delay": number;
+            /**
+             * An easing function that controls the animation progress curve (a visualisation of easings serves as a reference).
+             */
+            "transition-timing-function": TransitionTimingFunction;
+        }
+
+        /**
+         * Core
+         * These properties affect UI global to the graph, and apply only to the core.
+         * You can use the special core selector string to set these properties.
+         * http://js.cytoscape.org/#style/core
+         */
+        interface Core {
+            /**
+             * Indicator:
+             */
+
+            /**
+             * The colour of the indicator shown when the background is grabbed by the user.
+             */
+            "active-bg-color": Colour;
+            /**
+             * The opacity of the active background indicator.
+             */
+            "active-bg-opacity": number;
+            /**
+             * The size of the active background indicator.
+             */
+            "active-bg-size": number;
+            /**
+             * Selection box:
+             */
+            /**
+             * The background colour of the selection box used for drag selection.
+             */
+            "selection-box-color": Colour;
+            /**
+             * The colour of the border on the selection box.
+             */
+            "selection-box-border-color": Colour;
+            /**
+             * The size of the border on the selection box.
+             */
+            "selection-box-border-width": number;
+            /**
+             * The opacity of the selection box.
+             */
+            "selection-box-opacity": number;
+            /**
+             * Texture during viewport gestures:
+             */
+            /**
+             * The colour of the area outside the viewport texture when initOptions.textureOnViewport === true.
+             */
+            "outside-texture-bg-color": Colour;
+            /**
+             * The opacity of the area outside the viewport texture.
+             */
+            "outside-texture-bg-opacity": number;
+        }
+    }
+
+    /**
+     * Events passed to handler callbacks are similar to
+     * jQuery event objects in that they wrap native event objects,
+     * mimicking their API.
+     *
+     * http://js.cytoscape.org/#events
+     */
+    interface EventObject extends InputEventObject, LayoutEventObject { }
+
+    /**
+     * http://js.cytoscape.org/#events/event-object
+     */
+    interface AbstractEventObject {
+        /** a reference to the corresponding core Core */
+        cy: Core;
+        /** indicates the element or core that first caused the event */
+        target?: any;
+        /** the event type string (e.g. "tap") */
+        type: UserInputDeviceEventName | UserInputDeviceEventNameExt;
+        /** the event namespace string (e.g. "foo" for "foo.tap") */
+        namespace: string;
+        /** Unix epoch time of event in milliseconds */
+        timeStamp: number;
+    }
+    interface InputEventObject extends AbstractEventObject {
+        /** position : indicates the model position of the event */
+        position: Position;
+        /** renderedPosition : indicates the rendered position of the event */
+        renderedPosition: Position;
+        /** originalEvent : the original user input device event object */
+        originalEvent: EventObject;
+    }
+    interface LayoutEventObject extends AbstractEventObject {
+        /**
+         * layout : indicates the corresponding layout that triggered the event
+         * (useful if running multiple layouts simultaneously)
+         */
+        layout: any;
+    }
+
+    /**
+     * These are normal browser events that you can bind to via Cytoscape.js.
+     * You can bind these events to the core and to collections.
+     * http://js.cytoscape.org/#events/user-input-device-events
+     */
+    type UserInputDeviceEventName =
+        // when the mouse button is pressed
+        "mousedown" |
+        // when the mouse button is released
+        "mouseup" |
+        // after mousedown then mouseup
+        "click" |
+        // when the cursor is put on top of the target
+        "mouseover" |
+        // when the cursor is moved off of the target
+        "mouseout" |
+        // when the cursor is moved somewhere on top of the target
+        "mousemove" |
+        // when one or more fingers starts to touch the screen
+        "touchstart" |
+        // when one or more fingers are moved on the screen
+        "touchmove" |
+        // when one or more fingers are removed from the screen
+        "touchend";
+
+    /**
+     * There are also some higher level events that you can use
+     * so you don’t have to bind to different events for
+     * mouse-input devices and for touch devices.
+     * http://js.cytoscape.org/#events/user-input-device-events
+     */
+    type UserInputDeviceEventNameExt =
+        // normalised tap start event (either mousedown or touchstart)
+        "tapstart" | "vmousedown" |
+        // normalised move event (either touchmove or mousemove)
+        "tapdrag" | "vmousemove" |
+        // normalised over element event (either touchmove or mousemove/mouseover)
+        "tapdragover" |
+        // normalised off of element event (either touchmove or mousemove/mouseout)
+        "tapdragout" |
+        // normalised tap end event (either mouseup or touchend)
+        "tapend" | "vmouseup" |
+        // normalised tap event (either click, or touchstart followed by touchend without touchmove)
+        "tap" | "vclick" |
+        // normalised tap hold event
+        "taphold" |
+        // normalised right-click mousedown or two-finger tapstart
+        "cxttapstart" |
+        // normalised right-click mouseup or two-finger tapend
+        "cxttapend" |
+        // normalised right-click or two-finger tap
+        "cxttap" |
+        // normalised mousemove or two-finger drag after cxttapstart but before cxttapend
+        "cxtdrag" |
+        // when going over a node via cxtdrag
+        "cxtdragover" |
+        // when going off a node via cxtdrag
+        "cxtdragout" |
+        // when starting box selection
+        "boxstart" |
+        // when ending box selection
+        "boxend" |
+        // triggered on elements when selected by box selection
+        "boxselect" |
+        // triggered on elements when inside the box on boxend
+        "box";
+
+    /**
+     * These events are custom to Cytoscape.js. You can bind to these events for collections.
+     * http://js.cytoscape.org/#events/collection-events
+     */
+    type CollectionEventName =
+        // when an element is added to the graph
+        "add" |
+        // when an element is removed from the graph
+        "remove" |
+        // when an element is selected
+        "select" |
+        // when an element is unselected
+        "unselect" |
+        // when an element is locked
+        "lock" |
+        // when an element is unlocked
+        "unlock" |
+        // when an element is grabbed directly (including only the one node directly under the cursor or the user’s finger)
+        "grabon" |
+        // when an element is grabbed (including all elements that would be dragged)
+        "grab" |
+        // when an element is grabbed and then moved
+        "drag" |
+        // when an element is freed (i.e. let go from being grabbed)
+        "free" |
+        // when an element changes position
+        "position" |
+        // when an element’s data is changed
+        "data" |
+        // when an element’s scratchpad data is changed
+        "scratch" |
+        // when an element’s style is changed
+        "style";
+
+    /**
+     * These events are custom to Cytoscape.js, and they occur on the core.
+     * http://js.cytoscape.org/#events/graph-events
+     */
+    type GraphEventName =
+        // when a layout starts running
+        "layoutstart" |
+        // when a layout has set initial positions for all the nodes (but perhaps not final positions)
+        "layoutready" |
+        // when a layout has finished running completely or otherwise stopped running
+        "layoutstop" |
+        // when a new Core of Cytoscape.js is ready to be interacted with
+        "ready" |
+        // when the Core of Cytoscape.js was explicitly destroyed by calling .destroy().
+        "destroy" |
+        // when the viewport is (re)rendered
+        "render" |
+        // when the viewport is panned
+        "pan" |
+        // when the viewport is zoomed
+        "zoom" |
+        // when the viewport is resized (usually by calling cy.resize(), a window resize, or toggling a class on the Cytoscape.js div)
+        "resize";
+
+    /**
+     * Layouts
+     * http://js.cytoscape.org/#layouts
+     *
+     * The function of a layout is to set the positions on the nodes in the graph.
+     * Layouts are extensions of Cytoscape.js such that it is possible for
+     * anyone to write a layout without modifying the library itself.
+     * Several layouts are included with Cytoscape.js by default,
+     * and their options are described in the sections that follow
+     * with the default values specified.
+     * Note that you must set options.name to the name of the
+     * layout to specify which one you want to run.
+     * Each layout has its own algorithm for setting the position for each node.
+     * This algorithm influences the overall shape of the graph and the lengths of the edges.
+     * A layout’s algorithm can be customised by setting its options.
+     * Therefore, edge lengths can be controlled by setting the layout options appropriately.
+     * For force-directed (physics) layouts,
+     * there is generally an option to set a weight to each edge
+     * to affect the relative edge lengths.
+     * Edge length can also be affected by options like spacing
+     * factors, angles, and overlap avoidance.
+     * Setting edge length depends on the particular layout,
+     * and some layouts will allow for more precise edge lengths than others.
+     */
+
+    interface Layouts extends LayoutManipulation, LayoutEvents { }
+
+    type LayoutOptions =
+        NullLayoutOptions | RandomLayoutOptions | PresetLayoutOptions |
+        GridLayoutOptions | CircleLayoutOptions | ConcentricLayoutOptions |
+        BreadthFirstLayoutOptions | CoseLayoutOptions | BaseLayoutOptions;
+
+    type LayoutHandler = (e: LayoutEventObject) => void;
+
+    interface BaseLayoutOptions {
+        name: string;
+        // on layoutready event
+        ready?: LayoutHandler;
+        // on layoutstop event
+        stop?: LayoutHandler;
+    }
+    /**
+     * http://js.cytoscape.org/#layouts/null
+     */
+    interface NullLayoutOptions {
+        name: "null";
+    }
+    interface BoundingBox12 {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+    }
+    interface BoundingBoxWH {
+        x1: number;
+        y1: number;
+        w: number;
+        h: number;
+    }
+    interface AnimatedLayoutOptions {
+        // whether to transition the node positions
+        animate?: boolean;
+        // duration of animation in ms if enabled
+        animationDuration?: number;
+        // easing of animation if enabled
+        animationEasing?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#layouts/random
+     */
+    interface RandomLayoutOptions extends BaseLayoutOptions, AnimatedLayoutOptions {
+        name: "random";
+        // whether to fit to viewport
+        fit: boolean;
+        // fit padding
+        padding?: number;
+        // constrain layout bounds
+        boundingBox: undefined | BoundingBox12 | BoundingBoxWH;
+    }
+
+    /**
+     * http://js.cytoscape.org/#layouts/preset
+     */
+    interface NodePositionMap { [nodeid: string]: Position; }
+    type NodePositionFunction = (nodeid: string) => Position;
+    interface PresetLayoutOptions extends BaseLayoutOptions, AnimatedLayoutOptions {
+        name: "preset";
+        // map of (node id) => (position obj); or function(node){ return somPos; }
+        positions?: NodePositionMap | NodePositionFunction;
+        // the zoom level to set (prob want fit = false if set)
+        zoom?: number;
+        // the pan level to set (prob want fit = false if set)
+        pan?: number;
+        // whether to fit to viewport
+        fit?: boolean;
+        // padding on fit
+        padding?: number;
+    }
+
+    interface SortableNode {
+        data: { weight: number; };
+    }
+
+    // function(a, b){ return a.data('weight') - b.data('weight') }
+    type SortingFunction = (a: SortableNode, b: SortableNode) => number;
+
+    interface ShapedLayoutOptions extends BaseLayoutOptions, AnimatedLayoutOptions {
+        // whether to fit to viewport
+        fit: boolean;
+        // padding used on fit
+        padding?: number;
+        // constrain layout bounds
+        boundingBox?: BoundingBox12 | BoundingBoxWH;
+
+        // prevents node overlap, may overflow boundingBox if not enough space
+        avoidOverlap?: boolean;
+
+        // Excludes the label when calculating node bounding boxes for the layout algorithm
+        nodeDimensionsIncludeLabels: boolean;
+        // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up
+        spacingFactor?: number;
+
+        // a sorting function to order the nodes
+        sort?: SortingFunction;
+    }
+    /**
+     * http://js.cytoscape.org/#layouts/grid
+     */
+    interface GridLayoutOptions extends ShapedLayoutOptions {
+        name: "grid";
+
+        // extra spacing around nodes when avoidOverlap: true
+        avoidOverlapPadding?: number;
+
+        // uses all available space on false, uses minimal space on true
+        condense: boolean;
+        // force num of rows in the grid
+        rows?: number;
+        // force num of columns in the grid
+        cols?: number;
+        // returns { row, col } for element
+        position(nodeid: string): { row: number; col: number; };
+    }
+
+    /**
+     * http://js.cytoscape.org/#layouts/circle
+     */
+    interface CircleLayoutOptions extends ShapedLayoutOptions {
+        name: "circle";
+
+        // the radius of the circle
+        radius?: number;
+
+        // where nodes start in radians, e.g. 3 / 2 * Math.PI,
+        startAngle: number;
+        // how many radians should be between the first and last node (defaults to full circle)
+        sweep?: number;
+        // whether the layout should go clockwise (true) or counterclockwise/anticlockwise (false)
+        clockwise?: boolean;
+    }
+    /**
+     * http://js.cytoscape.org/#layouts/concentric
+     */
+    interface ConcentricLayoutOptions extends ShapedLayoutOptions {
+        name: "concentric";
+
+        // where nodes start in radians, e.g. 3 / 2 * Math.PI,
+        startAngle: number;
+        // how many radians should be between the first and last node (defaults to full circle)
+        sweep?: number;
+        // whether the layout should go clockwise (true) or counterclockwise/anticlockwise (false)
+        clockwise?: boolean;
+
+        // whether levels have an equal radial distance betwen them, may cause bounding box overflow
+        equidistant: false;
+        minNodeSpacing: 10; // min spacing between outside of nodes (used for radius adjustment)
+        // height of layout area (overrides container height)
+        height: undefined;
+        // width of layout area (overrides container width)
+        width: undefined;
+        // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up
+        spacingFactor: undefined;
+        // returns numeric value for each node, placing higher nodes in levels towards the centre
+        concentric(node: { degree(): number; }): number;
+        // the variation of concentric values in each level
+        levelWidth(node: { maxDegree(): number; }): number;
+    }
+
+    /**
+     * http://js.cytoscape.org/#layouts/breadthfirst
+     */
+    interface BreadthFirstLayoutOptions extends ShapedLayoutOptions {
+        name: "breadthfirst";
+
+        // whether the tree is directed downwards (or edges can point in any direction if false)
+        directed: boolean;
+        // put depths in concentric circles if true, put depths top down if false
+        circle: boolean;
+        // the roots of the trees
+        roots?: string;
+        // how many times to try to position the nodes in a maximal way (i.e. no backtracking)
+        maximalAdjustments: number;
+    }
+
+    /**
+     * http://js.cytoscape.org/#layouts/cose
+     */
+    interface CoseLayoutOptions extends ShapedLayoutOptions {
+        name: "cose";
+
+        // Number of iterations between consecutive screen positions update
+        // (0 -> only updated on the end)
+        refresh: number;
+        // Randomize the initial positions of the nodes (true) or use existing positions (false)
+        randomize: boolean;
+        // Extra spacing between components in non-compound graphs
+        componentSpacing: number;
+        // Node repulsion (non overlapping) multiplier
+        nodeRepulsion(node: any): number;
+
+        // Node repulsion (overlapping) multiplier
+        nodeOverlap: number;
+        // Ideal edge (non nested) length
+        idealEdgeLength(edge: any): number;
+        // Divisor to compute edge forces
+        edgeElasticity(edge: any): number;
+
+        // Nesting factor (multiplier) to compute ideal edge length for nested edges
+        nestingFactor: number;
+        // Gravity force (constant)
+        gravity: number;
+        // Maximum number of iterations to perform
+        numIter: number;
+        // Initial temperature (maximum node displacement)
+        initialTemp: number;
+        // Cooling factor (how the temperature is reduced between consecutive iterations
+        coolingFactor: number;
+        // Lower temperature threshold (below this point the layout will end)
+        minTemp: number;
+        // Pass a reference to weaver to use threads for calculations
+        weaver: boolean;
+    }
+
+    /**
+     * http://js.cytoscape.org/#layouts/layout-manipulation
+     * Layouts have a set of functions available to them,
+     * which allow for more complex behaviour than the primary run-one-layout-at-a-time usecase.
+     * A new, developer accessible layout can be made via cy.makeLayout().
+     */
+    interface LayoutManipulation {
+        /**
+         * Start running the layout
+         * http://js.cytoscape.org/#layout.run
+         */
+        run(): void;
+        start(): void;
+        /**
+         * Stop running the (asynchronous/discrete) layout
+         * http://js.cytoscape.org/#layout.stop
+         */
+        stop(): void;
+    }
+    interface LayoutEvents {
+        /**
+         * http://js.cytoscape.org/#layouts/layout-events
+         */
+        /**
+         * @param events A space separated list of event names.
+         * @param data [optional] A plain object which is passed to the
+         * handler in the event object argument.
+         * @param handler  The handler function that is called
+         * when one of the specified events occurs.
+         */
+        on(events: EventNames, data: any, handler: EventHandler): void;
+        bind(events: EventNames, data: any, handler: EventHandler): void;
+        listen(events: EventNames, data: any, handler: EventHandler): void;
+        addListener(events: EventNames, data: any, handler: EventHandler): void;
+
+        /**
+         * Get a promise that is resolved with the first of any of
+         * the specified events triggered on the layout.
+         * http://js.cytoscape.org/#layout.promiseOn
+         */
+        promiseOn(events: EventNames): Promise<EventObject>;
+        pon(events: EventNames): Promise<EventObject>;
+
+        /**
+         * Bind to events that are emitted by the layout, and trigger the handler only once.
+         * @param events A space separated list of event names.
+         * @param data [optional] A plain object which is passed to the handler in the event object argument.
+         * @param handler The handler function that is called when one of the specified events occurs.
+         */
+        one(events: EventNames, handler: EventHandler): void;
+        one(events: EventNames, data: any, handler: EventHandler): void;
+
+        /**
+         * Remove event handlers on the layout.
+         * http://js.cytoscape.org/#layout.off
+         *
+         * @param events A space separated list of event names.
+         * @param handler [optional] A reference to the handler function to remove.
+         */
+        off(events: EventNames, handler?: EventHandler): void;
+        unbind(events: EventNames, handler?: EventHandler): void;
+        unlisten(events: EventNames, handler?: EventHandler): void;
+        removeListener(events: EventNames, handler?: EventHandler): void;
+
+        /**
+         * Trigger one or more events on the layout.
+         * http://js.cytoscape.org/#layout.trigger
+         * @param events A space separated list of event names to trigger.
+         * @param extraParams [optional] An array of additional parameters to pass to the handler.
+         */
+        trigger(events: EventNames, extraParams?: any[]): void;
+    }
+
+    /**
+     * An animation represents a visible change in state over
+     * a duration of time for a single element.
+     * Animations can be generated via cy.animation()
+     * (for animations on the viewport) and ele.animation()
+     * (for animations on graph elements).
+     * http://js.cytoscape.org/#animations
+     */
+
+    /**
+     * http://js.cytoscape.org/#animations/animation-manipulation
+     */
+    interface AnimationManipulation {
+        /**
+         * Requests that the animation be played, starting on the next frame.
+         * If the animation is complete, it restarts from the beginning.
+         * http://js.cytoscape.org/#ani.play
+         */
+        play(): void;
+        /**
+         * Get whether the animation is currently playing.
+         * http://js.cytoscape.org/#ani.playing
+         */
+        playing(): boolean;
+        /**
+         * Get or set how far along the animation has progressed.
+         * http://js.cytoscape.org/#ani.progress
+         */
+        /**
+         * Get the progress of the animation in percent.
+         */
+        progress(): number;
+        /**
+         * Set the progress of the animation in percent.
+         * @param progress The progress in percent (i.e. between 0 and 1 inclusive) to set to the animation.
+         */
+        progress(progress: number): AnimationManipulation;
+        /**
+         * Get the progress of the animation in milliseconds.
+         */
+        time(): number;
+        /**
+         * Set the progress of the animation in milliseconds.
+         * @param time The progress in milliseconds
+         * (i.e. between 0 and the duration inclusive) to set to the animation.
+         */
+        time(time: number): AnimationManipulation;
+        /**
+         * Rewind the animation to the beginning.
+         */
+        rewind(): AnimationManipulation;
+        /**
+         * Fastforward the animation to the end.
+         */
+        fastforward(): AnimationManipulation;
+
+        /**
+         * Pause the animation, maintaining the current progress.
+         * http://js.cytoscape.org/#ani.pause
+         */
+        pause(): AnimationManipulation;
+        /**
+         * Stop the animation, maintaining the current progress
+         * and removing the animation from any associated queues.
+         * http://js.cytoscape.org/#ani.stop
+         */
+        stop(): AnimationManipulation;
+        /**
+         * Get whether the animation has progressed to the end.
+         * http://js.cytoscape.org/#ani.completed
+         */
+        completed(): AnimationManipulation;
+        complete(): AnimationManipulation;
+        /**
+         * Apply the animation at its current progress.
+         * http://js.cytoscape.org/#ani.apply
+         */
+        apply(): AnimationManipulation;
+        /**
+         * Get whether the animation is currently applying.
+         * http://js.cytoscape.org/#ani.applying
+         */
+        applying(): AnimationManipulation;
+        /**
+         * Reverse the animation such that its starting
+         * conditions and ending conditions are reversed.
+         * http://js.cytoscape.org/#ani.reverse
+         */
+        reverse(): AnimationManipulation;
+        /**
+         * Get a promise that is fulfilled with the specified animation event.
+         * @param animationEvent A string for the event name; completed or complete for
+         * completing the animation or frame for the next frame of the animation.
+         * http://js.cytoscape.org/#ani.promise
+         */
+        promise(animationEvent?: "completed" | "complete" | "frame"): Promise<EventObject>;
+    }
+}
diff --git a/types/cytoscape/tsconfig.json b/types/cytoscape/tsconfig.json
new file mode 100644
index 0000000000..348734c733
--- /dev/null
+++ b/types/cytoscape/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cytoscape-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/cytoscape/tslint.json b/types/cytoscape/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cytoscape/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/d3-box/tslint.json b/types/d3-box/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3-box/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3-contour/d3-contour-tests.ts b/types/d3-contour/d3-contour-tests.ts
index 2a7444ab19..2879e71e79 100644
--- a/types/d3-contour/d3-contour-tests.ts
+++ b/types/d3-contour/d3-contour-tests.ts
@@ -26,8 +26,9 @@ const n = 256;
 const m = 256;
 const values: number[] = new Array(n * m);
 for (let j = 0.5, k = 0; j < m; ++j) {
-    for (let i = 0.5; i < n; ++i, ++k) {
+    for (let i = 0.5; i < n; i++) {
         values[k] = goldsteinPrice(i / n * 4 - 2, 1 - j / m * 3);
+        k++;
     }
 }
 
diff --git a/types/d3-contour/index.d.ts b/types/d3-contour/index.d.ts
index 789ff32a5f..1d82faae40 100644
--- a/types/d3-contour/index.d.ts
+++ b/types/d3-contour/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://d3js.org/d3-contour/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Hugues Stefanski <https://github.com/Ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Last module patch version validated against: 1.1.0
 
diff --git a/types/d3-dsv/d3-dsv-tests.ts b/types/d3-dsv/d3-dsv-tests.ts
index 51127b7266..459fa7291b 100644
--- a/types/d3-dsv/d3-dsv-tests.ts
+++ b/types/d3-dsv/d3-dsv-tests.ts
@@ -21,7 +21,7 @@ const tsvTestStringWithHeader = 'Year\tMake\tModel\tLength\n1997\tFord\tE350\t2.
 const pipedTestStringWithHeader = 'Year|Make|Model|Length\n1997|Ford|E350|2.34\n2000|Mercury|Cougar|2.38';
 
 interface ParsedTestObject {
-    year: Date;
+    year: Date | null;
     make: string;
     model: string;
     length: number;
@@ -35,8 +35,9 @@ let parseRowsMappedArray: ParsedTestObject[];
 
 let columns: string[];
 let num: number;
-let date: Date;
+let dateNull: Date | null;
 let str: string;
+let strMaybe: string | undefined;
 
 // ------------------------------------------------------------------------------------------
 // Test CSV
@@ -50,7 +51,7 @@ parseArray = d3Dsv.csvParse(csvTestStringWithHeader);
 
 columns = parseArray.columns;
 
-str = parseArray[0]['Year'];
+strMaybe = parseArray[0]['Year'];
 // date = parseArray[0]['Year']; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
@@ -60,19 +61,39 @@ parseMappedArray = d3Dsv.csvParse(csvTestStringWithHeader, (rawRow, index, colum
     const i: number = index;
     const c: string[] = columns;
     const pr: ParsedTestObject = {
-        year: new Date(+rr['Year'], 0, 1),
-        make: rr['Make'],
-        model: rr['Model'],
-        length: +rr['Length']
+        year: rr['Year'] ? new Date(+rr['Year']!, 0, 1) : null,
+        make: rr['Make'] ? rr['Make']! : "Missing Value",
+        model: rr['Model'] ? rr['Model']! : "Missing Value",
+        length: ['Length'] ? +rr['Length']! : NaN
     };
     return pr;
 });
 
+parseMappedArray = d3Dsv.csvParse(csvTestStringWithHeader, (rawRow, index, columns) => {
+    const rr: d3Dsv.DSVRowString = rawRow;
+    const i: number = index;
+    const c: string[] = columns;
+    const d: number | null = rr['Year'] ? +rr['Year']! : null;
+    const pr: ParsedTestObject | null | undefined = d !== null
+        ? (
+            d > 1997
+                ? {
+                    year: new Date(d, 0, 1),
+                    make: rr['Make'] ? rr['Make']! : "Missing Value",
+                    model: rr['Model'] ? rr['Model']! : "Missing Value",
+                    length: ['Length'] ? +rr['Length']! : NaN
+                }
+                : undefined
+        )
+        : null;
+    return pr;
+});
+
 columns = parseMappedArray.columns;
 
-date = parseMappedArray[0].year;
-str = parseMappedArray[0].make;
-str = parseMappedArray[0].model;
+dateNull = parseMappedArray[0].year;
+strMaybe = parseMappedArray[0].make;
+strMaybe = parseMappedArray[0].model;
 num = parseMappedArray[0].length;
 
 // csvParseRows(...) ============================================================================
@@ -81,7 +102,7 @@ num = parseMappedArray[0].length;
 
 parseRowsArray = d3Dsv.csvParseRows(csvTestString);
 
-str = parseRowsArray[0][0]; // 'Year' of first row
+strMaybe = parseRowsArray[0][0]; // 'Year' of first row
 // date = parseRowsArray[0][0]; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
@@ -89,18 +110,25 @@ str = parseRowsArray[0][0]; // 'Year' of first row
 parseRowsMappedArray = d3Dsv.csvParseRows(csvTestString, (rawRow, index) => {
     const rr: string[] = rawRow;
     const i: number = index;
-    const pr: ParsedTestObject = {
-        year: new Date(+rr[0], 0, 1),
-        make: rr[1],
-        model: rr[2],
-        length: +rr[3]
-    };
+    const d: number | null = rr[0].length ? +rr[0] : null;
+    const pr: ParsedTestObject | null | undefined = d !== null
+        ? (
+            d > 1997
+                ? {
+                    year: new Date(d, 0, 1),
+                    make: rr[1].length ? rr[1] : "Missing Value",
+                    model: rr[2].length ? rr[2] : "Missing Value",
+                    length: rr[3].length ? +rr[3] : NaN
+                }
+                : undefined
+        )
+        : null;
     return pr;
 });
 
-date = parseRowsMappedArray[0].year;
-str = parseRowsMappedArray[0].make;
-str = parseRowsMappedArray[0].model;
+dateNull = parseRowsMappedArray[0].year;
+strMaybe = parseRowsMappedArray[0].make;
+strMaybe = parseRowsMappedArray[0].model;
 num = parseRowsMappedArray[0].length;
 
 // csvFormat(...) ============================================================================
@@ -111,7 +139,7 @@ str = d3Dsv.csvFormat(parseRowsMappedArray, columns);
 // csvFormatRows(...) ========================================================================
 
 str = d3Dsv.csvFormatRows(parseRowsMappedArray.map((d, i) => [
-    d.year.getFullYear().toString(),
+    d.year ? d.year.getFullYear().toString() : '',
     d.make,
     d.model,
     d.length.toString()
@@ -129,7 +157,7 @@ parseArray = d3Dsv.tsvParse(tsvTestStringWithHeader);
 
 columns = parseArray.columns;
 
-str = parseArray[0]['Year'];
+strMaybe = parseArray[0]['Year'];
 // date = parseArray[0]['Year']; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
@@ -138,20 +166,27 @@ parseMappedArray = d3Dsv.tsvParse(tsvTestStringWithHeader, (rawRow, index, colum
     const rr: d3Dsv.DSVRowString = rawRow;
     const i: number = index;
     const c: string[] = columns;
-    const pr: ParsedTestObject = {
-        year: new Date(+rr['Year'], 0, 1),
-        make: rr['Make'],
-        model: rr['Model'],
-        length: +rr['Length']
-    };
+    const d: number | null = rr['Year'] ? +rr['Year']! : null;
+    const pr: ParsedTestObject | null | undefined = d !== null
+        ? (
+            d > 1997
+                ? {
+                    year: new Date(d, 0, 1),
+                    make: rr['Make'] ? rr['Make']! : "Missing Value",
+                    model: rr['Model'] ? rr['Model']! : "Missing Value",
+                    length: ['Length'] ? +rr['Length']! : NaN
+                }
+                : undefined
+        )
+        : null;
     return pr;
 });
 
 columns = parseMappedArray.columns;
 
-date = parseMappedArray[0].year;
-str = parseMappedArray[0].make;
-str = parseMappedArray[0].model;
+dateNull = parseMappedArray[0].year;
+strMaybe = parseMappedArray[0].make;
+strMaybe = parseMappedArray[0].model;
 num = parseMappedArray[0].length;
 
 // tsvParseRows(...) ============================================================================
@@ -160,7 +195,7 @@ num = parseMappedArray[0].length;
 
 parseRowsArray = d3Dsv.tsvParseRows(tsvTestString);
 
-str = parseRowsArray[0][0]; // 'Year' of first row
+strMaybe = parseRowsArray[0][0]; // 'Year' of first row
 // date = parseRowsArray[0][0]; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
@@ -168,18 +203,25 @@ str = parseRowsArray[0][0]; // 'Year' of first row
 parseRowsMappedArray = d3Dsv.tsvParseRows(tsvTestString, (rawRow, index) => {
     const rr: string[] = rawRow;
     const i: number = index;
-    const pr: ParsedTestObject = {
-        year: new Date(+rr[0], 0, 1),
-        make: rr[1],
-        model: rr[2],
-        length: +rr[3]
-    };
+    const d: number | null = rr[0].length ? +rr[0] : null;
+    const pr: ParsedTestObject | null | undefined = d !== null
+        ? (
+            d > 1997
+                ? {
+                    year: new Date(d, 0, 1),
+                    make: rr[1].length ? rr[1] : "Missing Value",
+                    model: rr[2].length ? rr[2] : "Missing Value",
+                    length: rr[3].length ? +rr[3] : NaN
+                }
+                : undefined
+        )
+        : null;
     return pr;
 });
 
-date = parseRowsMappedArray[0].year;
-str = parseRowsMappedArray[0].make;
-str = parseRowsMappedArray[0].model;
+dateNull = parseRowsMappedArray[0].year;
+strMaybe = parseRowsMappedArray[0].make;
+strMaybe = parseRowsMappedArray[0].model;
 num = parseRowsMappedArray[0].length;
 
 // tsvFormat(...) ============================================================================
@@ -190,7 +232,7 @@ str = d3Dsv.tsvFormat(parseRowsMappedArray, columns);
 // tsvFormatRows(...) ========================================================================
 
 str = d3Dsv.tsvFormatRows(parseRowsMappedArray.map((d, i) => [
-    d.year.getFullYear().toString(),
+    d.year ? d.year.getFullYear().toString() : '',
     d.make,
     d.model,
     d.length.toString()
@@ -213,7 +255,7 @@ parseArray = dsv.parse(pipedTestStringWithHeader);
 
 columns = parseArray.columns;
 
-str = parseArray[0]['Year'];
+strMaybe = parseArray[0]['Year'];
 // date = parseArray[0]['Year']; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
@@ -222,20 +264,27 @@ parseMappedArray = dsv.parse(pipedTestStringWithHeader, (rawRow, index, columns)
     const rr: d3Dsv.DSVRowString = rawRow;
     const i: number = index;
     const c: string[] = columns;
-    const pr: ParsedTestObject = {
-        year: new Date(+rr['Year'], 0, 1),
-        make: rr['Make'],
-        model: rr['Model'],
-        length: +rr['Length']
-    };
+    const d: number | null = rr['Year'] ? +rr['Year']! : null;
+    const pr: ParsedTestObject | null | undefined = d !== null
+        ? (
+            d > 1997
+                ? {
+                    year: new Date(d, 0, 1),
+                    make: rr['Make'] ? rr['Make']! : "Missing Value",
+                    model: rr['Model'] ? rr['Model']! : "Missing Value",
+                    length: ['Length'] ? +rr['Length']! : NaN
+                }
+                : undefined
+        )
+        : null;
     return pr;
 });
 
 columns = parseMappedArray.columns;
 
-date = parseMappedArray[0].year;
-str = parseMappedArray[0].make;
-str = parseMappedArray[0].model;
+dateNull = parseMappedArray[0].year;
+strMaybe = parseMappedArray[0].make;
+strMaybe = parseMappedArray[0].model;
 num = parseMappedArray[0].length;
 
 // parseRows(...) ============================================================================
@@ -244,7 +293,7 @@ num = parseMappedArray[0].length;
 
 parseRowsArray = dsv.parseRows(pipedTestString);
 
-str = parseRowsArray[0][0]; // 'Year' of first row
+strMaybe = parseRowsArray[0][0]; // 'Year' of first row
 // date = parseRowsArray[0][0]; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
@@ -252,18 +301,25 @@ str = parseRowsArray[0][0]; // 'Year' of first row
 parseRowsMappedArray = dsv.parseRows(pipedTestString, (rawRow, index) => {
     const rr: string[] = rawRow;
     const i: number = index;
-    const pr: ParsedTestObject = {
-        year: new Date(+rr[0], 0, 1),
-        make: rr[1],
-        model: rr[2],
-        length: +rr[3]
-    };
+    const d: number | null = rr[0].length ? +rr[0] : null;
+    const pr: ParsedTestObject | null | undefined = d !== null
+        ? (
+            d > 1997
+                ? {
+                    year: new Date(d, 0, 1),
+                    make: rr[1].length ? rr[1] : "Missing Value",
+                    model: rr[2].length ? rr[2] : "Missing Value",
+                    length: rr[3].length ? +rr[3] : NaN
+                }
+                : undefined
+        )
+        : null;
     return pr;
 });
 
-date = parseRowsMappedArray[0].year;
-str = parseRowsMappedArray[0].make;
-str = parseRowsMappedArray[0].model;
+dateNull = parseRowsMappedArray[0].year;
+strMaybe = parseRowsMappedArray[0].make;
+strMaybe = parseRowsMappedArray[0].model;
 num = parseRowsMappedArray[0].length;
 
 // format(...) ============================================================================
@@ -274,7 +330,7 @@ str = dsv.format(parseRowsMappedArray, columns);
 // formatRows(...) ========================================================================
 
 str = dsv.formatRows(parseRowsMappedArray.map((d, i) => [
-    d.year.getFullYear().toString(),
+    d.year ? d.year.getFullYear().toString() : '',
     d.make,
     d.model,
     d.length.toString()
diff --git a/types/d3-dsv/index.d.ts b/types/d3-dsv/index.d.ts
index eaf9797b02..80b2ebc54e 100644
--- a/types/d3-dsv/index.d.ts
+++ b/types/d3-dsv/index.d.ts
@@ -3,19 +3,35 @@
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// Last module patch version validated against: 1.0.30
+
 // ------------------------------------------------------------------------------------------
 // Shared Types and Interfaces
 // ------------------------------------------------------------------------------------------
 
+/**
+ * An object representing a DSV parsed row with values represented as strings.
+ */
 export interface DSVRowString {
-    [key: string]: string;
+    [key: string]: string | undefined;
 }
 
+/**
+ * An object representing a DSV parsed row with values represented as an arbitrary datatype, depending
+ * on the performed parsed row mapping.
+ */
 export interface DSVRowAny {
     [key: string]: any;
 }
 
+/**
+ * An array object representing all parsed rows. The array is enhanced with a property listing
+ * the names of the parsed columns.
+ */
 export interface DSVParsedArray<T> extends Array<T> {
+    /**
+     * List of column names.
+     */
     columns: string[];
 }
 
@@ -25,20 +41,108 @@ export interface DSVParsedArray<T> extends Array<T> {
 
 // csvParse(...) ============================================================================
 
+/**
+ * Parses the specified string, which must be in the comma-separated values format, returning an array of objects representing the parsed rows.
+ *
+ * Unlike csvParseRows, this method requires that the first line of the CSV content contains a comma-separated list of column names;
+ * these column names become the attributes on the returned objects.
+ *
+ * The returned array also exposes a columns property containing the column names in input order (in contrast to Object.keys, whose iteration order is arbitrary).
+ *
+ * Equivalent to dsvFormat(",").parse.
+ *
+ * @param csvString A string, which must be in the comma-separated values format.
+ */
 export function csvParse(csvString: string): DSVParsedArray<DSVRowString>;
-export function csvParse<ParsedRow extends DSVRowAny>(csvString: string, row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow): DSVParsedArray<ParsedRow>;
+/**
+ * Parses the specified string, which must be in the comma-separated values format, returning an array of objects representing the parsed rows.
+ *
+ * Unlike csvParseRows, this method requires that the first line of the CSV content contains a comma-separated list of column names;
+ * these column names become the attributes on the returned objects.
+ *
+ * The returned array also exposes a columns property containing the column names in input order (in contrast to Object.keys, whose iteration order is arbitrary).
+ *
+ * Equivalent to dsvFormat(",").parse.
+ *
+ * @param csvString A string, which must be in the comma-separated values format.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function csvParse<ParsedRow extends DSVRowAny>(
+    csvString: string,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
+): DSVParsedArray<ParsedRow>;
 
 // csvParseRows(...) ========================================================================
 
+/**
+ * Parses the specified string, which must be in the comma-separated values format, returning an array of arrays representing the parsed rows.
+ *
+ * Unlike csvParse, this method treats the header line as a standard row, and should be used whenever CSV content does not contain a header.
+ * Each row is represented as an array rather than an object. Rows may have variable length.
+ *
+ * If a row conversion function is not specified, field values are strings. For safety, there is no automatic conversion to numbers, dates, or other types.
+ * In some cases, JavaScript may coerce strings to numbers for you automatically (for example, using the + operator), but better is to specify a row conversion function.
+ *
+ * Equivalent to dsvFormat(",").parseRows.
+ *
+ * @param csvString A string, which must be in the comma-separated values format.
+ */
 export function csvParseRows(csvString: string): string[][];
-export function csvParseRows<ParsedRow extends DSVRowAny>(csvString: string, row: (rawRow: string[], index: number) => ParsedRow): ParsedRow[];
+/**
+ * Parses the specified string, which must be in the comma-separated values format, returning an array of arrays representing the parsed rows.
+ *
+ * Unlike csvParse, this method treats the header line as a standard row, and should be used whenever CSV content does not contain a header.
+ * Each row is represented as an array rather than an object. Rows may have variable length.
+ *
+ * Equivalent to dsvFormat(",").parseRows.
+ *
+ * @param csvString A string, which must be in the comma-separated values format.
+ * @param row A row conversion function which is invoked for each row, being passed an array representing the current row (d), the index (i)
+ * starting at zero for the first row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function csvParseRows<ParsedRow extends DSVRowAny>(
+    csvString: string,
+    row: (rawRow: string[], index: number) => ParsedRow | undefined | null
+): ParsedRow[];
 
 // csvFormat(...) ============================================================================
 
+/**
+ * Formats the specified array of object rows as comma-separated values, returning a string.
+ * This operation is the inverse of csvParse. Each row will be separated by a newline (\n),
+ * and each column within each row will be separated by the comma-delimiter.
+ * Values that contain either the comma-delimiter, a double-quote (") or a newline will be escaped using double-quotes.
+ *
+ * If columns is not specified, the list of column names that forms the header row is determined by the union of all properties on all objects in rows;
+ * the order of columns is nondeterministic.
+ *
+ * Equivalent to dsvFormat(",").format.
+ *
+ * @param rows Array of object rows.
+ * @param columns An array of strings representing the column names.
+ */
 export function csvFormat(rows: DSVRowAny[], columns?: string[]): string;
 
 // csvFormatRows(...) ========================================================================
 
+/**
+ * Formats the specified array of array of string rows as comma-separated values, returning a string.
+ * This operation is the reverse of csvParseRows. Each row will be separated by a newline (\n),
+ * and each column within each row will be separated by the comma-delimiter.
+ * Values that contain either the comma-delimiter, a double-quote (") or a newline will be escaped using double-quotes.
+ *
+ * To convert an array of objects to an array of arrays while explicitly specifying the columns, use array.map.
+ * If you like, you can also array.concat this result with an array of column names to generate the first row.
+ *
+ * Equivalent to dsvFormat(",").formatRows.
+ *
+ * @param rows An array of array of string rows.
+ */
 export function csvFormatRows(rows: string[][]): string;
 
 // ------------------------------------------------------------------------------------------
@@ -47,33 +151,209 @@ export function csvFormatRows(rows: string[][]): string;
 
 // tsvParse(...) ============================================================================
 
+/**
+ * Parses the specified string, which must be in the tab-separated values format, returning an array of objects representing the parsed rows.
+ *
+ * Unlike tsvParseRows, this method requires that the first line of the TSV content contains a tab-separated list of column names;
+ * these column names become the attributes on the returned objects.
+ *
+ * The returned array also exposes a columns property containing the column names in input order (in contrast to Object.keys, whose iteration order is arbitrary).
+ *
+ * Equivalent to dsvFormat("\t").parse.
+ *
+ * @param tsvString A string, which must be in the tab-separated values format.
+ */
 export function tsvParse(tsvString: string): DSVParsedArray<DSVRowString>;
-export function tsvParse<MappedRow extends DSVRowAny>(tsvString: string, row: (rawRow: DSVRowString, index: number, columns: string[]) => MappedRow): DSVParsedArray<MappedRow>;
+/**
+ * Parses the specified string, which must be in the tab-separated values format, returning an array of objects representing the parsed rows.
+ *
+ * Unlike tsvParseRows, this method requires that the first line of the TSV content contains a tab-separated list of column names;
+ * these column names become the attributes on the returned objects.
+ *
+ * The returned array also exposes a columns property containing the column names in input order (in contrast to Object.keys, whose iteration order is arbitrary).
+ *
+ * Equivalent to dsvFormat("\t").parse.
+ *
+ * @param tsvString A string, which must be in the tab-separated values format.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function tsvParse<MappedRow extends DSVRowAny>(
+    tsvString: string,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => MappedRow | undefined | null
+): DSVParsedArray<MappedRow>;
 
 // tsvParseRows(...) ========================================================================
 
+/**
+ * Parses the specified string, which must be in the tab-separated values format, returning an array of arrays representing the parsed rows.
+ *
+ * Unlike tsvParse, this method treats the header line as a standard row, and should be used whenever TSV content does not contain a header.
+ * Each row is represented as an array rather than an object. Rows may have variable length.
+ *
+ * If a row conversion function is not specified, field values are strings. For safety, there is no automatic conversion to numbers, dates, or other types.
+ * In some cases, JavaScript may coerce strings to numbers for you automatically (for example, using the + operator), but better is to specify a row conversion function.
+ *
+ * Equivalent to dsvFormat("\t").parseRows.
+ *
+ * @param tsvString A string, which must be in the tab-separated values format.
+ */
 export function tsvParseRows(tsvString: string): string[][];
-export function tsvParseRows<MappedRow extends DSVRowAny>(tsvString: string, row: (rawRow: string[], index: number) => MappedRow): MappedRow[];
+/**
+ * Parses the specified string, which must be in the tab-separated values format, returning an array of arrays representing the parsed rows.
+ *
+ * Unlike tsvParse, this method treats the header line as a standard row, and should be used whenever TSV content does not contain a header.
+ * Each row is represented as an array rather than an object. Rows may have variable length.
+ *
+ * Equivalent to dsvFormat("\t").parseRows.
+ *
+ * @param tsvString A string, which must be in the tab-separated values format.
+ * @param row A row conversion function which is invoked for each row, being passed an array representing the current row (d), the index (i)
+ * starting at zero for the first row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function tsvParseRows<MappedRow extends DSVRowAny>(
+    tsvString: string,
+    row: (rawRow: string[], index: number) => MappedRow | undefined | null
+): MappedRow[];
 
 // tsvFormat(...) ============================================================================
 
+/**
+ * Formats the specified array of object rows as tab-separated values, returning a string.
+ * This operation is the inverse of tsvParse. Each row will be separated by a newline (\n),
+ * and each column within each row will be separated by the tab-delimiter.
+ * Values that contain either the tab-delimiter, a double-quote (") or a newline will be escaped using double-quotes.
+ *
+ * If columns is not specified, the list of column names that forms the header row is determined by the union of all properties on all objects in rows;
+ * the order of columns is nondeterministic.
+ *
+ * Equivalent to dsvFormat("\t").format.
+ *
+ * @param rows Array of object rows.
+ * @param columns An array of strings representing the column names.
+ */
 export function tsvFormat(rows: DSVRowAny[], columns?: string[]): string;
 
 // tsvFormatRows(...) ========================================================================
 
+/**
+ * Formats the specified array of array of string rows as tab-separated values, returning a string.
+ * This operation is the reverse of tsvParseRows. Each row will be separated by a newline (\n),
+ * and each column within each row will be separated by the tab-delimiter.
+ * Values that contain either the tab-delimiter, a double-quote (") or a newline will be escaped using double-quotes.
+ *
+ * To convert an array of objects to an array of arrays while explicitly specifying the columns, use array.map.
+ * If you like, you can also array.concat this result with an array of column names to generate the first row.
+ *
+ * Equivalent to dsvFormat("\t").formatRows.
+ *
+ * @param rows An array of array of string rows.
+ */
 export function tsvFormatRows(rows: string[][]): string;
 
 // ------------------------------------------------------------------------------------------
 // DSV Generalized Parsers and Formatters
 // ------------------------------------------------------------------------------------------
 
+/**
+ * A DSV parser and formatter
+ */
 export interface DSV {
+    /**
+     * Parses the specified string, which must be in the delimiter-separated values format with the appropriate delimiter, returning an array of objects representing the parsed rows.
+     *
+     * Unlike dsv.parseRows, this method requires that the first line of the DSV content contains a delimiter-separated list of column names;
+     * these column names become the attributes on the returned objects.
+     *
+     * The returned array also exposes a columns property containing the column names in input order (in contrast to Object.keys, whose iteration order is arbitrary).
+     *
+     * @param dsvString A string, which must be in the delimiter-separated values format with the appropriate delimiter.
+     */
     parse(dsvString: string): DSVParsedArray<DSVRowString>;
-    parse<ParsedRow extends DSVRowAny>(dsvString: string, row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow): DSVParsedArray<ParsedRow>;
+    /**
+     * Parses the specified string, which must be in the delimiter-separated values format with the appropriate delimiter, returning an array of objects representing the parsed rows.
+     *
+     * Unlike dsv.parseRows, this method requires that the first line of the DSV content contains a delimiter-separated list of column names;
+     * these column names become the attributes on the returned objects.
+     *
+     * The returned array also exposes a columns property containing the column names in input order (in contrast to Object.keys, whose iteration order is arbitrary).
+     *
+     * @param dsvString A string, which must be in the delimiter-separated values format with the appropriate delimiter.
+     * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+     * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+     * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+     * In effect, row is similar to applying a map and filter operator to the returned rows.
+     */
+    parse<ParsedRow extends DSVRowAny>(
+        dsvString: string,
+        row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
+    ): DSVParsedArray<ParsedRow>;
+
+    /**
+     * Parses the specified string, which must be in the delimiter-separated values format with the appropriate delimiter, returning an array of arrays representing the parsed rows.
+     *
+     * Unlike dsv.parse, this method treats the header line as a standard row, and should be used whenever DSV content does not contain a header.
+     * Each row is represented as an array rather than an object. Rows may have variable length.
+     *
+     * If a row conversion function is not specified, field values are strings. For safety, there is no automatic conversion to numbers, dates, or other types.
+     * In some cases, JavaScript may coerce strings to numbers for you automatically (for example, using the + operator), but better is to specify a row conversion function.
+     *
+     * @param dsvString A string, which must be in the delimiter-separated values format with the appropriate delimiter.
+     */
     parseRows(dsvString: string): string[][];
-    parseRows<ParsedRow extends DSVRowAny>(dsvString: string, row: (rawRow: string[], index: number) => ParsedRow): ParsedRow[];
+    /**
+     * Parses the specified string, which must be in the delimiter-separated values format with the appropriate delimiter, returning an array of arrays representing the parsed rows.
+     *
+     * Unlike dsv.parse, this method treats the header line as a standard row, and should be used whenever DSV content does not contain a header.
+     * Each row is represented as an array rather than an object. Rows may have variable length.
+     *
+     * @param dsvString A string, which must be in the delimiter-separated values format with the appropriate delimiter.
+     * @param row A row conversion function which is invoked for each row, being passed an array representing the current row (d), the index (i)
+     * starting at zero for the first row, and the array of column names. If the returned value is null or undefined,
+     * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+     * In effect, row is similar to applying a map and filter operator to the returned rows.
+     */
+    parseRows<ParsedRow extends DSVRowAny>(
+        dsvString: string,
+        row: (rawRow: string[], index: number) => ParsedRow | undefined | null
+    ): ParsedRow[];
+
+    /**
+     * Formats the specified array of object rows as delimiter-separated values, returning a string.
+     * This operation is the inverse of dsv.parse. Each row will be separated by a newline (\n),
+     * and each column within each row will be separated by the delimiter (such as a comma, ,).
+     * Values that contain either the delimiter, a double-quote (") or a newline will be escaped using double-quotes.
+     *
+     * If columns is not specified, the list of column names that forms the header row is determined by the union of all properties on all objects in rows;
+     * the order of columns is nondeterministic.
+     *
+     * @param rows Array of object rows.
+     * @param columns An array of strings representing the column names.
+     */
     format(rows: DSVRowAny[], columns?: string[]): string;
+
+    /**
+     * Formats the specified array of array of string rows as delimiter-separated values, returning a string.
+     * This operation is the reverse of dsv.parseRows. Each row will be separated by a newline (\n),
+     * and each column within each row will be separated by the delimiter (such as a comma, ,).
+     * Values that contain either the delimiter, a double-quote (") or a newline will be escaped using double-quotes.
+     *
+     * To convert an array of objects to an array of arrays while explicitly specifying the columns, use array.map.
+     * If you like, you can also array.concat this result with an array of column names to generate the first row.
+     *
+     * @param rows An array of array of string rows.
+     */
     formatRows(rows: string[][]): string;
 }
 
+/**
+ * Constructs a new DSV parser and formatter for the specified delimiter.
+ *
+ * @param delimiter A delimiter character. The delimiter must be a single character (i.e., a single 16-bit code unit);
+ * so, ASCII delimiters are fine, but emoji delimiters are not.
+ */
 export function dsvFormat(delimiter: string): DSV;
diff --git a/types/d3-dsv/tsconfig.json b/types/d3-dsv/tsconfig.json
index 82e3ef399f..400095c38d 100644
--- a/types/d3-dsv/tsconfig.json
+++ b/types/d3-dsv/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "d3-dsv-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/d3-geo/d3-geo-tests.ts b/types/d3-geo/d3-geo-tests.ts
index 876461e3e9..c4508351a0 100644
--- a/types/d3-geo/d3-geo-tests.ts
+++ b/types/d3-geo/d3-geo-tests.ts
@@ -205,9 +205,9 @@ class Circulator {
                 return d ? d : [0, 0];
             });
     }
-    private r: number;
-    private p: number;
-    private circleGenerator: d3Geo.GeoCircleGenerator<Circulator, [number, number] | undefined>;
+    private readonly r: number;
+    private readonly p: number;
+    private readonly circleGenerator: d3Geo.GeoCircleGenerator<Circulator, [number, number] | undefined>;
 
     getCirclePolygon(center?: [number, number]): GeoJSON.Polygon {
         if (center && center.length === 2 && typeof center[0] === 'number' && typeof center[1] === 'number') {
diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 231a2b3fe4..7efbb72010 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/d3/d3-geo/
 // Definitions by: Hugues Stefanski <https://github.com/Ledragon>, Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Last module patch version validated against: 1.9.0
 
@@ -35,7 +36,10 @@ export type GeoGeometryObjects = GeoJSON.GeometryObject | GeoSphere;
 export interface ExtendedGeometryCollection<GeometryType extends GeoGeometryObjects> {
     type: string;
     bbox?: number[];
-    crs?: GeoJSON.CoordinateReferenceSystem;
+    crs?: {
+        type: string;
+        properties: any;
+    };
     geometries: GeometryType[];
 }
 
@@ -540,7 +544,7 @@ export interface GeoStream {
  * Streams the specified GeoJSON object to the specified projection stream. While both features and geometry objects are supported as input,
  * the stream interface only describes the geometry, and thus additional feature properties are not visible to streams.
  *
- * @param object
+ * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
  * @param stream A projection stream.
  */
 export function geoStream(object: ExtendedFeature<GeoGeometryObjects, any>, stream: GeoStream): void;
@@ -549,7 +553,7 @@ export function geoStream(object: ExtendedFeature<GeoGeometryObjects, any>, stre
  * Streams the specified GeoJSON object to the specified projection stream. While both features and geometry objects are supported as input,
  * the stream interface only describes the geometry, and thus additional feature properties are not visible to streams.
  *
- * @param object
+ * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature).
  * @param stream A projection stream.
  */
 export function geoStream(object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>, stream: GeoStream): void;
@@ -558,7 +562,7 @@ export function geoStream(object: ExtendedFeatureCollection<ExtendedFeature<GeoG
  * Streams the specified GeoJSON object to the specified projection stream. While both features and geometry objects are supported as input,
  * the stream interface only describes the geometry, and thus additional feature properties are not visible to streams.
  *
- * @param object
+ * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
  * @param stream A projection stream.
  */
 export function geoStream(object: GeoGeometryObjects, stream: GeoStream): void;
@@ -567,7 +571,7 @@ export function geoStream(object: GeoGeometryObjects, stream: GeoStream): void;
  * Streams the specified GeoJSON object to the specified projection stream. While both features and geometry objects are supported as input,
  * the stream interface only describes the geometry, and thus additional feature properties are not visible to streams.
  *
- * @param object
+ * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
  * @param stream A projection stream.
  */
 export function geoStream(object: ExtendedGeometryCollection<GeoGeometryObjects>, stream: GeoStream): void;
@@ -1659,7 +1663,7 @@ export const geoClipAntimeridian: ((stream: GeoStream) => GeoStream);
  * Generates a clipping function transforming a stream such that geometries are bounded by a small circle of radius angle around the projection’s center.
  * Typically used for pre-clipping.
  *
- * @param angle
+ * @param angle A clipping angle.
  */
 export function geoClipCircle(angle: number): (stream: GeoStream) => GeoStream;
 
diff --git a/types/d3-hexbin/tslint.json b/types/d3-hexbin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3-hexbin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3-hierarchy/tslint.json b/types/d3-hierarchy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3-hierarchy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3-sankey/index.d.ts b/types/d3-sankey/index.d.ts
index a0ed07b615..237eb60f15 100644
--- a/types/d3-sankey/index.d.ts
+++ b/types/d3-sankey/index.d.ts
@@ -208,7 +208,7 @@ export interface SankeyLayout<Data, N extends SankeyExtraProperties, L extends S
      *
      * This method is intended to be called after computing the initial Sankey layout, for example when the diagram is repositioned interactively.
      *
-     * @param graph
+     * @param graph A previously initialized Sankey graph for which the link positions should be re-calculated
      */
     update(graph: SankeyGraph<N, L>): SankeyGraph<N, L>;
 
diff --git a/types/d3-scale/index.d.ts b/types/d3-scale/index.d.ts
index 38e204a6ea..d6cccdedfc 100644
--- a/types/d3-scale/index.d.ts
+++ b/types/d3-scale/index.d.ts
@@ -152,7 +152,7 @@ export interface ScaleContinuousNumeric<Range, Output> {
      * Nicing a scale only modifies the current domain; it does not automatically nice domains that are subsequently set using continuous.domain.
      * You must re-nice the scale after setting the new domain, if desired.
      *
-     * @param count An optional number of ticks expexted to be used.
+     * @param count An optional number of ticks expected to be used.
      */
     nice(count?: number): this;
 
@@ -664,7 +664,7 @@ export interface ScaleIdentity {
      * Nicing a scale only modifies the current domain; it does not automatically nice domains that are subsequently set using continuous.domain.
      * You must re-nice the scale after setting the new domain, if desired.
      *
-     * @param count An optional number of ticks expexted to be used.
+     * @param count An optional number of ticks expected to be used.
      */
     nice(count?: number): this;
 
@@ -1231,7 +1231,7 @@ export interface ScaleQuantize<Range> {
      * Nicing a scale only modifies the current domain; it does not automatically nice domains that are subsequently set using continuous.domain.
      * You must re-nice the scale after setting the new domain, if desired.
      *
-     * @param count An optional number of ticks expexted to be used.
+     * @param count An optional number of ticks expected to be used.
      */
     nice(count?: number): this;
 
diff --git a/types/d3-selection-multi/d3-selection-multi-tests.ts b/types/d3-selection-multi/d3-selection-multi-tests.ts
index 515dd8e92e..4f835e368b 100644
--- a/types/d3-selection-multi/d3-selection-multi-tests.ts
+++ b/types/d3-selection-multi/d3-selection-multi-tests.ts
@@ -1,4 +1,3 @@
-// tslint:disable:object-literal-shorthand
 /**
  * Typescript definition tests for d3/d3-selection-multi module
  *
@@ -28,13 +27,13 @@ selection = selection.attrs({
     foo: () => 1,
     bar: (d) => d,
     baz: (d, i) => i !== 0,
-    bat: function() {
+    bat() {
         return this.href;
     },
 });
 
 // Function that returns a map
-selection = selection.attrs(function(d, i, g) {
+selection = selection.attrs(function(d, i, g): {} | { id: string } {
     const that: HTMLAnchorElement = this;
     const index: number = i;
     const group: HTMLAnchorElement[] | ArrayLike<HTMLAnchorElement> = g;
@@ -89,7 +88,7 @@ selection = selection.properties({
 });
 
 // Function that returns an object
-selection = selection.properties(function(d, i, g) {
+selection = selection.properties(function(d, i, g): {} | { href: string } {
     const that: HTMLAnchorElement = this;
     const index: number = i;
     const group: HTMLAnchorElement[] | ArrayLike<HTMLAnchorElement> = g;
@@ -118,7 +117,7 @@ transition = transition.attrs({
 });
 
 // Function that returns a map
-transition = transition.attrs(function(d, i, g) {
+transition = transition.attrs(function(d, i, g): {} | { id: string } {
     const that: HTMLAnchorElement = this;
     const index: number = i;
     const group: HTMLAnchorElement[] | ArrayLike<HTMLAnchorElement> = g;
diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts
index e2a4d6ffd9..6019084be2 100644
--- a/types/d3-selection/d3-selection-tests.ts
+++ b/types/d3-selection/d3-selection-tests.ts
@@ -325,7 +325,7 @@ let filterdGElements2: d3Selection.Selection<SVGGElement, any, HTMLElement, any>
 filterdGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter<SVGGElement>('g');
 // filterdGElements2 = d3Selection.selectAll('.any-type').filter('g'); // fails without using narrowing generic on filter method
 
-filterdGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter<SVGGElement>(function(){
+filterdGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter<SVGGElement>(function() {
     const that: SVGElement = this;
     return that.tagName === 'g' || that.tagName === 'G';
 });
@@ -1036,6 +1036,19 @@ positions = d3Selection.touches(svg, changedTouches);
 positions = d3Selection.touches(g, changedTouches);
 positions = d3Selection.touches(h, changedTouches);
 
+// clientPoint() ---------------------------------------------------------------------
+
+let clientPoint: [number, number];
+declare let mEvt: MouseEvent;
+declare let tEvt: Touch;
+declare let msgEvt: MSGestureEvent;
+declare let customEvt: {clientX: number, clientY: number}; // minimally conforming  object
+
+clientPoint = d3Selection.clientPoint(svg, mEvt);
+clientPoint = d3Selection.clientPoint(g, tEvt);
+clientPoint = d3Selection.clientPoint(h, msgEvt);
+clientPoint = d3Selection.clientPoint(h, customEvt);
+
 // ---------------------------------------------------------------------------------------
 // Tests of style
 // ---------------------------------------------------------------------------------------
diff --git a/types/d3-selection/index.d.ts b/types/d3-selection/index.d.ts
index abbb14db0f..b5231f37c2 100644
--- a/types/d3-selection/index.d.ts
+++ b/types/d3-selection/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for D3JS d3-selection module 1.1
+// Type definitions for D3JS d3-selection module 1.2
 // Project: https://github.com/d3/d3-selection/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.1
+// Last module patch version validated against: 1.2.0
 
 // --------------------------------------------------------------------------
 // Shared Type Definitions and Interfaces
@@ -44,6 +44,14 @@ export interface EnterElement {
  */
 export type ContainerElement = HTMLElement | SVGSVGElement | SVGGElement;
 
+/**
+ * A User interface event (e.g. mouse event, touch or MSGestureEvent) with captured clientX and clientY properties.
+ */
+export interface ClientPointEvent {
+    clientX: number;
+    clientY: number;
+}
+
 /**
  * Interface for optional parameters map, when dispatching custom events
  * on a selection
@@ -670,7 +678,8 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      *
      * If a key function is not specified, then the first datum in data is assigned to the first selected element,
      * the second datum to the second selected element, and so on.
-     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index.
+     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index,
+     * by computing a string identifier for each datum and element.
      *
      * The update and enter selections are returned in data order, while the exit selection preserves the selection
      * order prior to the join. If a key function is specified, the order of elements in the selection may not match
@@ -684,9 +693,9 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      *
      * @param data The specified data is an array of arbitrary values (e.g., numbers or objects).
      * @param key An optional key function which is evaluated for each selected element, in order, being passed the
-     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]).
+     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]); the returned string is the element’s key.
      * The key function is then also evaluated for each new datum in data, being passed the current datum (d),
-     * the current index (i), and the group’s new data, with this as the group’s parent DOM element (nodes[i]).
+     * the current index (i), and the group’s new data, with this as the group’s parent DOM element (nodes[i]); the returned string is the datum’s key.
      * The datum for a given key is assigned to the element with the matching key. If multiple elements have the same key,
      * the duplicate elements are put into the exit selection; if multiple data have the same key, the duplicate data are put into the enter selection.
      */
@@ -700,7 +709,8 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      *
      * If a key function is not specified, then the first datum in data is assigned to the first selected element,
      * the second datum to the second selected element, and so on.
-     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index.
+     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index,
+     * by computing a string identifier for each datum and element.
      *
      * The update and enter selections are returned in data order, while the exit selection preserves the selection
      * order prior to the join. If a key function is specified, the order of elements in the selection may not match
@@ -716,9 +726,9 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      * (d, which may be undefined), the group index (i), and the selection’s parent nodes (nodes),
      * with this as the group’s parent element. The function returns an array of values for each group.
      * @param key An optional key function which is evaluated for each selected element, in order, being passed the
-     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]).
+     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]); the returned string is the element’s key.
      * The key function is then also evaluated for each new datum in data, being passed the current datum (d),
-     * the current index (i), and the group’s new data, with this as the group’s parent DOM element.
+     * the current index (i), and the group’s new data, with this as the group’s parent DOM element (nodes[i]); the returned string is the datum’s key.
      * The datum for a given key is assigned to the element with the matching key. If multiple elements have the same key,
      * the duplicate elements are put into the exit selection; if multiple data have the same key, the duplicate data are put into the enter selection.
      */
@@ -726,16 +736,13 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
 
     /**
      * Return the enter selection: placeholder nodes for each datum that had no corresponding DOM element
-     * in the selection. The enter selection is determined by selection.data, and is empty on a selection that
-     * is not joined to data.
+     * in the selection. (The enter selection is empty for selections not returned by selection.data.)
      */
     enter(): Selection<EnterElement, Datum, PElement, PDatum>;
 
     /**
-     * Return the exit selection: existing DOM elements in the selection for which no new datum was found.
-     * The exit selection is determined by the previous selection.data, and is thus empty until the selection is
-     * joined to data. If the exit selection is retrieved more than once after a data join, subsequent calls return
-     * the empty selection.
+     * Returns the exit selection: existing DOM elements in the selection for which no new datum was found.
+     * (The exit selection is empty for selections not returned by selection.data.)
      *
      * IMPORTANT: The generic refers to the type of the old datum associated with the exit selection elements.
      * Ensure you set the generic to the correct type, if you need to access the data on the exit selection in
@@ -972,6 +979,16 @@ export function touch(container: ContainerElement, touches: TouchList, identifie
  */
 export function touches(container: ContainerElement, touches?: TouchList): Array<[number, number]>;
 
+/**
+ * Returns the x and y coordinates of the specified event relative to the specified container.
+ * (The event may also be a touch.) The container may be an HTML or SVG container element, such as a G element or an SVG element.
+ * The coordinates are returned as a two-element array of numbers [x, y].
+ *
+ * @param container Container element relative to which coordinates are calculated.
+ * @param event A User interface event (e.g. mouse event, touch or MSGestureEvent) with captured clientX and clientY properties.
+ */
+export function clientPoint(container: ContainerElement, event: ClientPointEvent): [number, number];
+
 // ---------------------------------------------------------------------------
 // style
 // ---------------------------------------------------------------------------
diff --git a/types/d3-shape/d3-shape-tests.ts b/types/d3-shape/d3-shape-tests.ts
index 4199d2f170..687da79188 100644
--- a/types/d3-shape/d3-shape-tests.ts
+++ b/types/d3-shape/d3-shape-tests.ts
@@ -200,14 +200,14 @@ class Arcer {
             .endAngle(this.endAngle)
             .padAngle(this.padAngle);
     }
-    private startAngle: number;
-    private endAngle: number;
-    private padAngle: number;
-    private innerRadius: number;
-    private outerRadius: number;
-    private cornerRadius: number;
+    private readonly startAngle: number;
+    private readonly endAngle: number;
+    private readonly padAngle: number;
+    private readonly innerRadius: number;
+    private readonly outerRadius: number;
+    private readonly cornerRadius: number;
 
-    private arc: d3Shape.Arc<Arcer, ArcerDatum>;
+    private readonly arc: d3Shape.Arc<Arcer, ArcerDatum>;
 
     getPathString(d?: ArcerDatum) {
         return d ? this.arc(d) : this.arc({ innerRadius: this.innerRadius, outerRadius: this.outerRadius });
@@ -1292,9 +1292,9 @@ class Symbolizer {
                 return type;
             });
     }
-    private size: number;
-    private type: d3Shape.SymbolType;
-    private symbol: d3Shape.Symbol<Symbolizer, SymbolDatum>;
+    private readonly size: number;
+    private readonly type: d3Shape.SymbolType;
+    private readonly symbol: d3Shape.Symbol<Symbolizer, SymbolDatum>;
 
     getPathString(d?: SymbolDatum) {
         return d ? this.symbol(d) : this.symbol();
diff --git a/types/d3-tip/tslint.json b/types/d3-tip/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3-tip/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3-transition/index.d.ts b/types/d3-transition/index.d.ts
index 1ff8d46d04..eb60cec49f 100644
--- a/types/d3-transition/index.d.ts
+++ b/types/d3-transition/index.d.ts
@@ -569,7 +569,7 @@ export interface Transition<GElement extends BaseType, Datum, PElement extends B
  *
  * @param name Name of the transition.
  */
-export function transition<OldDatum>(name: string): Transition<HTMLElement, OldDatum, null, undefined>;
+export function transition<OldDatum>(name?: string): Transition<HTMLElement, OldDatum, null, undefined>;
 
 /**
  * Returns a new transition from an existing transition.
diff --git a/types/d3-zoom/d3-zoom-tests.ts b/types/d3-zoom/d3-zoom-tests.ts
index 8ff3f566f5..669b4af8ff 100644
--- a/types/d3-zoom/d3-zoom-tests.ts
+++ b/types/d3-zoom/d3-zoom-tests.ts
@@ -121,6 +121,26 @@ let svgZoom: d3Zoom.ZoomBehavior<SVGRectElement, SVGDatum>;
 
 svgZoom = d3Zoom.zoom<SVGRectElement, SVGDatum>();
 
+// constrain() -------------------------------------------------------------
+
+// chainable
+svgZoom = svgZoom.constrain((transform, extent, translateExtent) => {
+    const t: d3Zoom.ZoomTransform = transform;
+    const ve: [[number, number], [number, number]] = extent;
+    const te: [[number, number], [number, number]] = translateExtent;
+    const dx0 = t.invertX(ve[0][0]) - te[0][0];
+    const dx1 = t.invertX(ve[1][0]) - te[1][0];
+    const dy0 = transform.invertY(ve[0][1]) - te[0][1];
+    const dy1 = transform.invertY(ve[1][1]) - te[1][1];
+    return t.translate(
+        dx1 > dx0 ? (dx0 + dx1) / 2 : Math.min(0, dx0) || Math.max(0, dx1),
+        dy1 > dy0 ? (dy0 + dy1) / 2 : Math.min(0, dy0) || Math.max(0, dy1)
+    );
+});
+
+let constraintFn: (transform: d3Zoom.ZoomTransform, extent: [[number, number], [number, number]], translateExtent: [[number, number], [number, number]]) => d3Zoom.ZoomTransform;
+constraintFn = svgZoom.constrain();
+
 // filter() ----------------------------------------------------------------
 
 // chainable
diff --git a/types/d3-zoom/index.d.ts b/types/d3-zoom/index.d.ts
index 1ca39261a5..cf9b1ac89d 100644
--- a/types/d3-zoom/index.d.ts
+++ b/types/d3-zoom/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for d3JS d3-zoom module 1.6
+// Type definitions for d3JS d3-zoom module 1.7
 // Project: https://github.com/d3/d3-zoom/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.6.0
+// Last module patch version validated against: 1.7.0
 
 import { ArrayLike, Selection, TransitionLike, ValueFn } from 'd3-selection';
 import { ZoomView, ZoomInterpolator } from 'd3-interpolate';
@@ -499,6 +499,19 @@ export interface ZoomBehavior<ZoomRefElement extends ZoomedElementBaseType, Datu
      */
     scaleTo(transition: TransitionLike<ZoomRefElement, Datum>, k: ValueFn<ZoomRefElement, Datum, number>): void;
 
+    /**
+     * Returns the current constraint function.
+     * The default implementation attempts to ensure that the viewport extent does not go outside the translate extent.
+     */
+    constrain(): (transform: ZoomTransform, extent: [[number, number], [number, number]], translateExtent: [[number, number], [number, number]]) => ZoomTransform;
+    /**
+     * Sets the transform constraint function to the specified function and returns the zoom behavior.
+     *
+     * @param constraint A constraint function which returns a transform given the current transform, viewport extent and translate extent.
+     * The default implementation attempts to ensure that the viewport extent does not go outside the translate extent.
+     */
+    constrain(constraint: ((transform: ZoomTransform, extent: [[number, number], [number, number]], translateExtent: [[number, number], [number, number]]) => ZoomTransform)): this;
+
     /**
      * Returns the current filter function.
      */
@@ -647,7 +660,7 @@ export interface ZoomBehavior<ZoomRefElement extends ZoomedElementBaseType, Datu
     /**
      * Set the maximum distance that the mouse can move between mousedown and mouseup that will trigger
      * a subsequent click event. If at any point between mousedown and mouseup the mouse is greater than or equal to
-     * distance from its position on mousedown, the click event follwing mouseup will be suppressed.
+     * distance from its position on mousedown, the click event following mouseup will be suppressed.
      *
      * @param distance The distance threshold between mousedown and mouseup measured in client coordinates (event.clientX and event.clientY).
      * The default is zero.
diff --git a/types/d3.cloud.layout/tslint.json b/types/d3.cloud.layout/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3.cloud.layout/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3.slider/tslint.json b/types/d3.slider/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3.slider/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3/index.d.ts b/types/d3/index.d.ts
index 6cfb1aa493..de522828ff 100644
--- a/types/d3/index.d.ts
+++ b/types/d3/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for D3JS d3 standard bundle 4.11
+// Type definitions for D3JS d3 standard bundle 4.12
 // Project: https://github.com/d3/d3
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 export as namespace d3;
 
diff --git a/types/d3/v3/d3-tests.ts b/types/d3/v3/d3-tests.ts
index 87b57e8261..8704448c9b 100644
--- a/types/d3/v3/d3-tests.ts
+++ b/types/d3/v3/d3-tests.ts
@@ -1051,7 +1051,7 @@ namespace forceCollapsable {
     var force = d3.layout.force<Node>()
         .on("tick", tick)
         .charge(function (d) { return d._children ? -d.size / 100 : -30; } )
-        .linkDistance(function (d) { return d.target._children ? 80 : 30; } )
+        .linkDistance(function (d) { return (d.target as Node)._children ? 80 : 30; } )
         .size([w, h - 160]);
 
     var vis = d3.select("body").append("svg:svg")
@@ -1083,10 +1083,10 @@ namespace forceCollapsable {
         // Enter any new links.
         link.enter().insert("svg:line", ".node")
             .attr("class", "link")
-            .attr("x1", function (d) { return d.source.x; } )
-            .attr("y1", function (d) { return d.source.y; } )
-            .attr("x2", function (d) { return d.target.x; } )
-            .attr("y2", function (d) { return d.target.y; } );
+            .attr("x1", function (d) { return (d.source as Node).x; } )
+            .attr("y1", function (d) { return (d.source as Node).y; } )
+            .attr("x2", function (d) { return (d.target as Node).x; } )
+            .attr("y2", function (d) { return (d.target as Node).y; } );
 
         // Exit any old links.
         link.exit().remove();
@@ -1114,10 +1114,10 @@ namespace forceCollapsable {
     }
 
     function tick() {
-        link.attr("x1", function (d) { return d.source.x; } )
-            .attr("y1", function (d) { return d.source.y; } )
-            .attr("x2", function (d) { return d.target.x; } )
-            .attr("y2", function (d) { return d.target.y; } );
+        link.attr("x1", function (d) { return (d.source as Node).x; } )
+            .attr("y1", function (d) { return (d.source as Node).y; } )
+            .attr("x2", function (d) { return (d.target as Node).x; } )
+            .attr("y2", function (d) { return (d.target as Node).y; } );
 
         node.attr("cx", function (d) { return d.x; } )
             .attr("cy", function (d) { return d.y; } );
@@ -1738,7 +1738,7 @@ namespace forceCollapsable2 {
     var force = d3.layout.force<Node>()
         .on("tick", tick)
         .charge(function (d) { return d._children ? -d.size / 100 : -30; } )
-        .linkDistance(function (d) { return d.target._children ? 80 : 30; } )
+        .linkDistance(function (d) { return (d.target as Node)._children ? 80 : 30; } )
         .size([w, h - 160]);
 
     var vis = d3.select("body").append("svg:svg")
@@ -1770,10 +1770,10 @@ namespace forceCollapsable2 {
         // Enter any new links.
         link.enter().insert("svg:line", ".node")
             .attr("class", "link")
-            .attr("x1", function (d) { return d.source.x; } )
-            .attr("y1", function (d) { return d.source.y; } )
-            .attr("x2", function (d) { return d.target.x; } )
-            .attr("y2", function (d) { return d.target.y; } );
+            .attr("x1", function (d) { return (d.source as Node).x; } )
+            .attr("y1", function (d) { return (d.source as Node).y; } )
+            .attr("x2", function (d) { return (d.target as Node).x; } )
+            .attr("y2", function (d) { return (d.target as Node).y; } );
 
         // Exit any old links.
         link.exit().remove();
@@ -1801,11 +1801,11 @@ namespace forceCollapsable2 {
     }
 
     function tick() {
-        link.attr("x1", function (d) { return d.source.x; } )
-            .attr("y1", function (d) { return d.source.y; } )
-            .attr("x2", function (d) { return d.target.x; } )
-            .attr("y2", function (d) { return d.target.y; } );
-
+        link.attr("x1", function (d) { return (d.source as Node).x; } )
+            .attr("y1", function (d) { return (d.source as Node).y; } )
+            .attr("x2", function (d) { return (d.target as Node).x; } )
+            .attr("y2", function (d) { return (d.target as Node).y; } );
+        
         node.attr("cx", function (d) { return d.x; } )
             .attr("cy", function (d) { return d.y; } );
     }
@@ -2720,3 +2720,34 @@ function testEnterSizeEmpty() {
     selectionSize = newNodes.size();
 
 }
+
+// Example from Matthias Jobst http://github.com/MatthiasJobst
+// Checks the brush with different Axis types
+class BrushAxisTest {
+    brush: d3.svg.Brush<any,Date,Date>;
+    constructor() {
+        let scale = d3.time.scale<Date,Date>();
+        this.brush = d3.svg.brush<any,Date>()
+            .x(scale) // the x accessor accepts time scales
+            .y(scale); // as does y
+    }
+    brushes = () => {
+        let extent = this.brush.extent();
+        let brush = d3.svg.brush();
+        brush.x(d3.scale.linear()); // Linear scale
+        brush.y(d3.scale.log());    // Logarithmic scale
+        // Does not work:
+        // brush.extent(this.brush.extent());
+        // From https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md#ordinal_rangePoints
+        let ordinalScale = d3.scale.ordinal<number,number>()
+            .domain([1, 2, 3, 4])
+            .rangePoints([0, 100]);
+        let ordinalBrush = d3.svg.brush()
+            .x(ordinalScale) // Ordinal scale
+            .y(d3.scale.linear());
+        let colorScale = d3.scale.category10();
+        let colorBrush = d3.svg.brush<any,string,number>()
+            .x(colorScale) // Color scale
+            .y(d3.scale.pow());
+    }
+}
\ No newline at end of file
diff --git a/types/d3/v3/index.d.ts b/types/d3/v3/index.d.ts
index 90afdd3938..9a2f9ae34a 100644
--- a/types/d3/v3/index.d.ts
+++ b/types/d3/v3/index.d.ts
@@ -1,10 +1,10 @@
 // Type definitions for d3JS 3.5
 // Project: http://d3js.org/
-// Definitions by: Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
+// Definitions by: Alex Ford <https://github.com/gustavderdrache>
+//                 Boris Yankov <https://github.com/borisyankov>
+//                 Matthias Jobst <https://github.com/MatthiasJobst>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/* tslint:disable */
-
 // Latest patch version of module validated against: 3.5.17
 
 export = d3;
@@ -235,28 +235,30 @@ declare namespace d3 {
              * @param name the element name to append. May be prefixed (see d3.ns.prefix).
              * @param before the selector to determine position (e.g., ":first-child")
              */
-            insert(name: string, before: string): Update<Datum>;
+            // https://github.com/d3/d3-3.x-api-reference/blob/master/Selections.md#insert 
+            insert(name: string, before?: string): Update<Datum>;
 
             /**
              * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
              * @param name the element name to append. May be prefixed (see d3.ns.prefix).
              * @param before a function to determine the node to use as the next sibling
              */
-            insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
+            // https://github.com/d3/d3-3.x-api-reference/blob/master/Selections.md#insert
+            insert(name: string, before?: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
 
             /**
              * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
              * @param name the function to compute a new child
              * @param before the selector to determine position (e.g., ":first-child")
              */
-            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: string): Update<Datum>;
+            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before?: string): Update<Datum>;
 
             /**
              * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
              * @param name the function to compute a new child
              * @param before a function to determine the node to use as the next sibling
              */
-            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
+            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before?: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
 
             /**
              * Removes the elements from the DOM. They are in a detached state and may be re-added (though there is currently no dedicated API for doing so).
@@ -431,7 +433,7 @@ declare namespace d3 {
     /**
      * Administrivia: JavaScript primitive types, or "things that toString() predictably".
      */
-    export type Primitive = number | string | boolean;
+    export type Primitive = number | string | boolean ;
 
     /**
      * Administrivia: anything with a valueOf(): number method is comparable, so we allow it in numeric operations
@@ -628,28 +630,28 @@ declare namespace d3 {
          * @param name the element name to append. May be prefixed (see d3.ns.prefix).
          * @param before the selector to determine position (e.g., ":first-child")
          */
-        insert(name: string, before: string): Selection<Datum>;
+        insert(name: string, before?: string): Selection<Datum>;
 
         /**
          * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
          * @param name the element name to append. May be prefixed (see d3.ns.prefix).
          * @param before a function to determine the node to use as the next sibling
          */
-        insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+        insert(name: string, before?: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
 
         /**
          * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
          * @param name the function to compute a new child
          * @param before the selector to determine position (e.g., ":first-child")
          */
-        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: string): Selection<Datum>;
+        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before?: string): Selection<Datum>;
 
         /**
          * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
          * @param name the function to compute a new child
          * @param before a function to determine the node to use as the next sibling
          */
-        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before?: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
 
         /**
          * Removes the elements from the DOM. They are in a detached state and may be re-added (though there is currently no dedicated API for doing so).
@@ -930,28 +932,28 @@ declare namespace d3 {
         export function flush(): void;
     }
 
-	 interface BaseEvent {
-		 type: string;
-		 sourceEvent?: Event;
-	 }
+    interface BaseEvent {
+        type: string;
+        sourceEvent?: Event;
+    }
 
-	 /**
-	  * Define a D3-specific ZoomEvent per https://github.com/mbostock/d3/wiki/Zoom-Behavior#event
-	  */
-	 interface ZoomEvent extends BaseEvent {
-		 scale: number;
-		 translate: [number, number];
-	 }
+    /**
+     * Define a D3-specific ZoomEvent per https://github.com/mbostock/d3/wiki/Zoom-Behavior#event
+     */
+    interface ZoomEvent extends BaseEvent {
+        scale: number;
+        translate: [number, number];
+    }
 
-	 /**
-	  * Define a D3-specific DragEvent per https://github.com/mbostock/d3/wiki/Drag-Behavior#on
-	  */
-	 interface DragEvent extends BaseEvent {
-		 x: number;
-		 y: number;
-		 dx: number;
-		 dy: number;
-	 }
+    /**
+     * Define a D3-specific DragEvent per https://github.com/mbostock/d3/wiki/Drag-Behavior#on
+     */
+    interface DragEvent extends BaseEvent {
+        x: number;
+        y: number;
+        dx: number;
+        dy: number;
+    }
 
     /**
      * The current event's value. Use this variable in a handler registered with `selection.on`.
@@ -1389,8 +1391,8 @@ declare namespace d3 {
     export function requote(string: string): string;
 
     export var rgb: {
-        new (r: number, g: number, b: number): Rgb;
-        new (color: string): Rgb;
+        new(r: number, g: number, b: number): Rgb;
+        new(color: string): Rgb;
 
         (r: number, g: number, b: number): Rgb;
         (color: string): Rgb;
@@ -1410,8 +1412,8 @@ declare namespace d3 {
     }
 
     export var hsl: {
-        new (h: number, s: number, l: number): Hsl;
-        new (color: string): Hsl;
+        new(h: number, s: number, l: number): Hsl;
+        new(color: string): Hsl;
 
         (h: number, s: number, l: number): Hsl;
         (color: string): Hsl;
@@ -1431,8 +1433,8 @@ declare namespace d3 {
     }
 
     export var hcl: {
-        new (h: number, c: number, l: number): Hcl;
-        new (color: string): Hcl;
+        new(h: number, c: number, l: number): Hcl;
+        new(color: string): Hcl;
 
         (h: number, c: number, l: number): Hcl;
         (color: string): Hcl;
@@ -1448,8 +1450,8 @@ declare namespace d3 {
     }
 
     export var lab: {
-        new (l: number, a: number, b: number): Lab;
-        new (color: string): Lab;
+        new(l: number, a: number, b: number): Lab;
+        new(color: string): Lab;
 
         (l: number, a: number, b: number): Lab;
         (color: string): Lab;
@@ -1469,7 +1471,7 @@ declare namespace d3 {
 
     export var color: {
         (): Color;
-        new (): Color;
+        new(): Color;
     };
 
     interface Color {
@@ -1683,7 +1685,7 @@ declare namespace d3 {
         export function category20<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
         export function category20b(): Ordinal<string, string>;
         export function category20b<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
-        export function category20c(): Ordinal<string,string>;
+        export function category20c(): Ordinal<string, string>;
         export function category20c<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
 
         interface Ordinal<Domain extends { toString(): string }, Range> {
@@ -1820,10 +1822,10 @@ declare namespace d3 {
         export function format(specifier: string): Format;
 
         export module format {
-            export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
+            export function multi(formats: Array<[string, (d: Date) => boolean | number]>): Format;
             export function utc(specifier: string): Format;
             namespace utc {
-                export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
+                export function multi(formats: Array<[string, (d: Date) => boolean | number]>): Format;
             }
 
             export var iso: Format;
@@ -2576,42 +2578,47 @@ declare namespace d3 {
 
             tickFormat(): (t: any) => string;
             tickFormat(format: (t: any) => string): Axis;
-            tickFormat(format:string): Axis;
+            tickFormat(format: string): Axis;
         }
 
-        export function brush(): Brush<any>;
-        export function brush<T>(): Brush<T>;
+        export function brush(): Brush<any, number, number>;
+        export function brush<T>(): Brush<T, number, number>;
+        export function brush<T,X>(): Brush<T, X, X>;
+        export function brush<T, X, Y>(): Brush<T, X, Y>;
 
         namespace brush {
-            interface Scale {
-                domain(): number[];
-                domain(domain: number[]): Scale;
+            interface Scale<S> {
+                domain(): S[];
+                domain(domain: S[]): Scale<S>;
 
-                range(): number[];
-                range(range: number[]): Scale;
+                range(): S[];
+                range(range: number[]): Scale<S>;
 
-                invert?(y: number): number;
+                invert?(y: number): S;
             }
         }
 
-        interface Brush<T> {
+        interface Brush<T, X, Y> {
             (selection: Selection<T>): void;
             (selection: Transition<T>): void;
 
             event(selection: Selection<T>): void;
             event(selection: Transition<T>): void;
 
-            x(): brush.Scale;
-            x(x: brush.Scale): Brush<T>;
+            x(): brush.Scale<X>;
+            x(x: brush.Scale<X>): Brush<T, X, Y>;
+            x<A, B extends X>(x: d3.scale.Ordinal<A, B> | d3.time.Scale<A, B>): Brush<T, X, Y>;
 
-            y(): brush.Scale;
-            y(y: brush.Scale): Brush<T>;
+            y(): brush.Scale<Y>;
+            y(y: brush.Scale<Y>): Brush<T, X, Y>;
+            y<A, B extends Y>(x: d3.scale.Ordinal<A, B> | d3.time.Scale<A, B>): Brush<T, X, Y>;
 
-            extent(): [number, number] | [[number, number], [number, number]];
-            extent(extent: [number, number] | [[number, number], [number, number]]): Brush<T>;
+            // https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Controls.md#brush_extent
+            extent(): [X, X] | [Y, Y] | [[X, Y], [X, Y]] | null;
+            extent(extent: [X, X] | [Y, Y] | [[X, Y], [X, Y]]): Brush<T, X, Y>;
 
             clamp(): boolean | [boolean, boolean];
-            clamp(clamp: boolean | [boolean, boolean]): Brush<T>;
+            clamp(clamp: boolean | [boolean, boolean]): Brush<T, X, Y>;
 
             clear(): void;
 
@@ -2622,10 +2629,10 @@ declare namespace d3 {
             on(type: 'brushend'): (datum: T, index: number) => void;
             on(type: string): (datum: T, index: number) => void;
 
-            on(type: 'brushstart', listener: (datum: T, index: number) => void): Brush<T>;
-            on(type: 'brush', listener: (datum: T, index: number) => void): Brush<T>;
-            on(type: 'brushend', listener: (datum: T, index: number) => void): Brush<T>;
-            on(type: string, listener: (datum: T, index: number) => void): Brush<T>;
+            on(type: 'brushstart', listener: (datum: T, index: number) => void): Brush<T, X, Y>;
+            on(type: 'brush', listener: (datum: T, index: number) => void): Brush<T, X ,Y>;
+            on(type: 'brushend', listener: (datum: T, index: number) => void): Brush<T, X, Y>;
+            on(type: string, listener: (datum: T, index: number) => void): Brush<T, X, Y>;
         }
     }
 
@@ -2761,7 +2768,7 @@ declare namespace d3 {
         timeFormat: {
             (specifier: string): time.Format;
             utc(specifier: string): time.Format;
-            multi(formats: Array<[string, (d: Date) => boolean|number]>): time.Format;
+            multi(formats: Array<[string, (d: Date) => boolean | number]>): time.Format;
         }
     }
 
@@ -2876,10 +2883,12 @@ declare namespace d3 {
         export function force<Node extends force.Node>(): Force<force.Link<Node>, Node>;
         export function force<Link extends force.Link<force.Node>, Node extends force.Node>(): Force<Link, Node>;
 
+        // https://github.com/d3/d3-3.x-api-reference/blob/master/Force-Layout.md#links
+        // Read the note at the end of the section where it talks about initial numbering
         namespace force {
             interface Link<T extends Node> {
-                source: T;
-                target: T;
+                source: T | number;
+                target: T | number;
             }
 
             interface Node {
diff --git a/types/d3/v3/tslint.json b/types/d3/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3kit/index.d.ts b/types/d3kit/index.d.ts
index c374a59501..5a07821700 100644
--- a/types/d3kit/index.d.ts
+++ b/types/d3kit/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/twitter/d3kit
 // Definitions by: Morgan Benton <https://github.com/morphatic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="d3" />
 
diff --git a/types/d3kit/v1/tslint.json b/types/d3kit/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3kit/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/d3pie/tslint.json b/types/d3pie/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/d3pie/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dagre-d3/index.d.ts b/types/dagre-d3/index.d.ts
index 9a14ecbae4..dc0d8ad639 100644
--- a/types/dagre-d3/index.d.ts
+++ b/types/dagre-d3/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/cpettitt/dagre-d3
 // Definitions by: Mark Wong Siang Kai <https://github.com/markwongsk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as d3 from "d3";
 import * as dagre from "dagre";
diff --git a/types/dagre/dagre-tests.ts b/types/dagre/dagre-tests.ts
index ae81c2c896..a29cf0128a 100644
--- a/types/dagre/dagre-tests.ts
+++ b/types/dagre/dagre-tests.ts
@@ -1,8 +1,39 @@
-const gDagre = new dagre.graphlib.Graph();
+const gDagre = new dagre.graphlib.Graph({compound: true, multigraph: false});
 gDagre.setGraph({})
   .setDefaultEdgeLabel(() => ({}))
+  .setDefaultNodeLabel(() => ({}))
   .setNode("a", {})
   .setEdge("b", "c")
   .setEdge("c", "d", {class: "class"});
 
 dagre.layout(gDagre);
+
+gDagre.edge({v: 'b', w: 'c'});
+gDagre.hasEdge({v: 'b', w: 'c'});
+gDagre.inEdges('c');
+gDagre.outEdges('c');
+
+gDagre.setParent('a', 'b');
+gDagre.children('b');
+gDagre.hasNode('d');
+gDagre.neighbors('c');
+gDagre.node({});
+gDagre.parent('a');
+gDagre.predecessors('d');
+gDagre.successors('b');
+
+gDagre.removeEdge('c', 'd').removeNode('d');
+
+dagre.graphlib.json.read(dagre.graphlib.json.write(gDagre));
+
+dagre.graphlib.alg.components(gDagre);
+dagre.graphlib.alg.dijkstra(gDagre, 'a', (edge) => 5);
+dagre.graphlib.alg.dijkstraAll(gDagre);
+dagre.graphlib.alg.findCycles(gDagre);
+dagre.graphlib.alg.floydWarchall(gDagre);
+dagre.graphlib.alg.isAcyclic(gDagre);
+dagre.graphlib.alg.postorder(gDagre, 'a');
+dagre.graphlib.alg.preorder(gDagre, ['b', 'c']);
+dagre.graphlib.alg.prim(gDagre);
+dagre.graphlib.alg.tarjam(gDagre);
+dagre.graphlib.alg.topsort(gDagre);
diff --git a/types/dagre/index.d.ts b/types/dagre/index.d.ts
index 55d98b0535..6c5e5e00ec 100644
--- a/types/dagre/index.d.ts
+++ b/types/dagre/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Qinfeng Chen <https://github.com/qinfchen>
 //                 Lisa Vallfors <https://github.com/Frankrike>
 //                 Pete Vilter <https://github.com/vilterp>
+//                 David Newell <https://github.com/rustedgrail>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -10,24 +11,69 @@ export as namespace dagre;
 
 export namespace graphlib {
     class Graph {
-        edges(): Edge[];
-        edge(id: any): any;
-        nodes(): string[];
-        node(id: any): any;
-        setDefaultEdgeLabel(callback: string|(() => string|object)): Graph;
-        setDefaultNodeLabel(callback: string|(() => string|object)): Graph;
-        setEdge(sourceId: string, targetId: string, options?: { [key: string]: any }, value?: string): Graph;
-        setEdge(params: {v: string, w: string, name?: string}, value?: string): Graph;
-        setGraph(label: GraphLabel): Graph;
-        setNode(id: string, node: { [key: string]: any }): Graph;
-        graph(): GraphLabel;
-
         constructor(opt?: {directed?: boolean, multigraph?: boolean, compound?: boolean});
-        setParent(name: string, parentName: string): void;
+
+        graph(): GraphLabel;
+        isDirected(): boolean;
+        isMultiGraph(): boolean;
+        setGraph(label: GraphLabel): Graph;
+
+        edge(edgeObj: Edge): GraphEdge;
+        edge(outNodeName: string, inNodeName: string, name?: string): GraphEdge;
+        edgeCount(): number;
+        edges(): Edge[];
+        hasEdge(edgeObj: Edge): boolean;
+        hasEdge(outNodeName: string, inNodeName: string, name?: string): boolean;
+        inEdges(inNodeName: string, outNodeName?: string): Edge[]|undefined;
+        outEdges(outNodeName: string, inNodeName?: string): Edge[]|undefined;
+        removeEdge(outNodeName: string, inNodeName: string): Graph;
+        setDefaultEdgeLabel(callback: string|((edge: Edge) => string|Label)): Graph;
+        setEdge(params: Edge, value?: string|{[key: string]: any}): Graph;
+        setEdge(sourceId: string, targetId: string, value?: string|Label, name?: string): Graph;
+
+        children(parentName: string): string|undefined;
         hasNode(name: string): boolean;
+        neighbors(name: string): Node[]|undefined;
+        node(id: string|Label): Node;
+        nodeCount(): number;
+        nodes(): string[];
+        parent(childName: string): string|undefined;
+        predecessors(name: string): Node[]|undefined;
+        removeNode(name: string): Graph;
+        setDefaultNodeLabel(callback: string|((nodeId: string) => string|Label)): Graph;
+        setNode(name: string, label: string|Label): Graph;
+        setParent(childName: string, parentName: string): void;
+        sinks(): Node[];
+        sources(): Node[];
+        successors(name: string): Node[]|undefined;
+    }
+
+    namespace json {
+        function read(graph: any): Graph;
+        function write(graph: Graph): any;
+    }
+
+    namespace alg {
+        function components(graph: Graph): string[][];
+        function dijkstra(graph: Graph, source: string, weightFn?: WeightFn, edgeFn?: EdgeFn): any;
+        function dijkstraAll(graph: Graph, weightFn?: WeightFn, edgeFn?: EdgeFn): any;
+        function findCycles(graph: Graph): string[][];
+        function floydWarchall(graph: Graph, weightFn?: WeightFn, edgeFn?: EdgeFn): any;
+        function isAcyclic(graph: Graph): boolean;
+        function postorder(graph: Graph, nodeNames: string|string[]): string[];
+        function preorder(graph: Graph, nodeNames: string|string[]): string[];
+        function prim(graph: Graph, weightFn?: WeightFn): Graph;
+        function tarjam(graph: Graph): string[][];
+        function topsort(graph: Graph): string[];
     }
 }
 
+export interface Label {
+  [key: string]: any;
+}
+export type WeightFn = (edge: Edge) => number;
+export type EdgeFn = (outNodeName: string) => GraphEdge[];
+
 export interface GraphLabel {
     width?: number;
     height?: number;
@@ -43,10 +89,37 @@ export interface GraphLabel {
     ranker?: string;
 }
 
-export function layout(graph: graphlib.Graph): void;
+export interface NodeConfig {
+    width?: number;
+    height?: number;
+}
+
+export interface EdgeConfig {
+    minlen: number;
+    weight: number;
+    width: number;
+    height: number;
+    lablepos: 'l'|'c'|'r';
+    labeloffest: number;
+}
+
+export function layout(graph: graphlib.Graph, layout?: GraphLabel&NodeConfig&EdgeConfig): void;
 
 export interface Edge {
     v: string;
     w: string;
     name?: string;
 }
+
+export interface GraphEdge {
+    points: Array<{x: number, y: number}>;
+    [key: string]: any;
+}
+
+export interface Node {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    [key: string]: any;
+}
diff --git a/types/dat-gui/tslint.json b/types/dat-gui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dat-gui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/data-driven/tslint.json b/types/data-driven/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/data-driven/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/datadog-metrics/datadog-metrics-tests.ts b/types/datadog-metrics/datadog-metrics-tests.ts
index f783e22b8e..ffbeccda89 100644
--- a/types/datadog-metrics/datadog-metrics-tests.ts
+++ b/types/datadog-metrics/datadog-metrics-tests.ts
@@ -1,9 +1,12 @@
 import metrics = require('datadog-metrics');
 metrics.init({ host: 'myhost', prefix: 'myapp.' });
 metrics.gauge('mygauge', 42);
+metrics.gauge('mykey', 11, ['a', 'b', 'c'], Date.now());
 metrics.increment('test.requests_served');
 metrics.increment('test.awesomeness_factor', 10);
-metrics.histogram('test.service_time', 0.248);
+metrics.increment('test.service_time', 0.248);
+metrics.histogram('mykey', 11, ['a', 'b', 'c'], Date.now());
+metrics.histogram('mykey', 11, ['a', 'b', 'c'], Date.now());
 metrics.flush();
 metrics.flush(() => {});
 metrics.flush(() => {}, err => {});
@@ -16,9 +19,12 @@ const metricsLogger = new metrics.BufferedMetricsLogger({
     defaultTags: ['env:staging', 'region:us-east-1']
 });
 metricsLogger.gauge('mygauge', 42);
+metricsLogger.gauge('mykey', 11, ['a', 'b', 'c'], Date.now());
 metricsLogger.increment('test.requests_served');
 metricsLogger.increment('test.awesomeness_factor', 10);
+metricsLogger.increment('mykey', 11, ['a', 'b', 'c'], Date.now());
 metricsLogger.histogram('test.service_time', 0.248);
+metricsLogger.histogram('mykey', 11, ['a', 'b', 'c'], Date.now());
 metricsLogger.flush();
 metricsLogger.flush(() => {});
 metricsLogger.flush(() => {}, err => {});
diff --git a/types/datadog-metrics/index.d.ts b/types/datadog-metrics/index.d.ts
index 43ab6f440a..2d7c910eba 100644
--- a/types/datadog-metrics/index.d.ts
+++ b/types/datadog-metrics/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for datadog-metrics 0.4
+// Type definitions for datadog-metrics 0.6
 // Project: https://github.com/dbader/node-datadog-metrics
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -44,21 +44,21 @@ export class BufferedMetricsLogger {
      * the metric. This should be used for sum values such as total hard disk space,
      * process uptime, total number of active users, or number of rows in a database table.
      */
-    gauge(key: string, value: number, ...tags: string[]): void;
+    gauge(key: string, value: number, tags?: string[], timestamp?: number): void;
 
     /**
      * Increment the counter by the given value (or 1 by default). Optionally, specify a
      * list of tags to associate with the metric. This is useful for counting things such
      * as incrementing a counter each time a page is requested.
      */
-    increment(key: string, value?: number, ...tags: string[]): void;
+    increment(key: string, value?: number, tags?: string[], timestamp?: number): void;
 
     /**
      * Sample a histogram value. Histograms will produce metrics that describe the distribution
      * of the recorded values, namely the minimum, maximum, average, count and the 75th, 85th,
      * 95th and 99th percentiles. Optionally, specify a list of tags to associate with the metric.
      */
-    histogram(key: string, value: number, ...tags: string[]): void;
+    histogram(key: string, value: number, tags?: string[], timestamp?: number): void;
 
     /**
      * Calling flush sends any buffered metrics to DataDog. Unless you set flushIntervalSeconds
@@ -77,21 +77,21 @@ export function init(options: BufferedMetricsLoggerOptions): void;
  * the metric. This should be used for sum values such as total hard disk space,
  * process uptime, total number of active users, or number of rows in a database table.
  */
-export function gauge(key: string, value: number, ...tags: string[]): void;
+export function gauge(key: string, value: number, tags?: string[], timestamp?: number): void;
 
 /**
  * Increment the counter by the given value (or 1 by default). Optionally, specify a
  * list of tags to associate with the metric. This is useful for counting things such
  * as incrementing a counter each time a page is requested.
  */
-export function increment(key: string, value?: number, ...tags: string[]): void;
+export function increment(key: string, value?: number, tags?: string[], timestamp?: number): void;
 
 /**
  * Sample a histogram value. Histograms will produce metrics that describe the distribution
  * of the recorded values, namely the minimum, maximum, average, count and the 75th, 85th,
  * 95th and 99th percentiles. Optionally, specify a list of tags to associate with the metric.
  */
-export function histogram(key: string, value: number, ...tags: string[]): void;
+export function histogram(key: string, value: number, tags?: string[], timestamp?: number): void;
 
 /**
  * Calling flush sends any buffered metrics to DataDog. Unless you set flushIntervalSeconds
diff --git a/types/datatables.net-buttons/datatables.net-buttons-tests.ts b/types/datatables.net-buttons/datatables.net-buttons-tests.ts
index 3323f6fdb9..46a2069ad7 100644
--- a/types/datatables.net-buttons/datatables.net-buttons-tests.ts
+++ b/types/datatables.net-buttons/datatables.net-buttons-tests.ts
@@ -1,40 +1,187 @@
-$(document).ready(function () {
-
-    var config: DataTables.Settings =
-        {
-            // Buttons extension options
-            buttons: [
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    className: 'class',
-                    filename: "exported_file.csv",
-                    exportOptions: {
-                        columns: ':visible'
-                    }
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    className: 'class',
-                    filename: "exported_file.csv",
-                    exportOptions: {
-                        columns: [1, 6, 2, 3, 4]
-                    }
-                },
-                {
-                    action: function (e, dt, node, config) { },
-                    available: function (dt, config) { return true; },
-                    destroy: function (dt, node, config) { },
-                    enabled: true,
-                    init: function (dt, node, config) { },
-                    key: 'a',
-                    name: 'name',
-                    namespace: 'namespace',
-                    titleAttr: 'title',
-                    title: 'title'
-                }
-            ],
+const config_1: DataTables.Settings = {
+    // Buttons extension options
+    buttons: [{
+        extend: 'excel',
+        text: 'Excel',
+        className: 'class',
+        filename: "exported_file.csv",
+        exportOptions: {
+            columns: ':visible'
         }
+    },
+    {
+        extend: 'excel',
+        text: 'Excel',
+        className: 'class',
+        filename: "exported_file.csv",
+        exportOptions: {
+            columns: [1, 6, 2, 3, 4]
+        }
+    },
+    {
+        action(e, dt, node, config) { },
+        available(dt, config) { return true; },
+        destroy(dt, node, config) { },
+        enabled: true,
+        init(dt, node, config) { },
+        key: 'a',
+        name: 'name',
+        namespace: 'namespace',
+        titleAttr: 'title',
+        title: 'title'
+    }],
+};
 
-});
\ No newline at end of file
+const config_2: DataTables.Settings = {
+    // Buttons extension options
+    buttons: {
+        buttons: [
+            "csv",
+            {
+                extend: "csv",
+                name: "CSV-Export",
+                className: "test-class"
+            },
+            (dt) => {
+                return {
+                    extend: "csv",
+                    name: "CSV-Function",
+                    className: "test-class"
+                };
+            }
+        ],
+    }
+};
+
+const config_3: DataTables.ButtonsSettings = {
+    name: "Test",
+    tabIndex: 1,
+    buttons: [
+        "copy",
+        {
+            extend: "csv",
+            name: "CSV-Export",
+            className: "test-class"
+        },
+        (dt) => {
+            return {
+                extend: "csv",
+                name: "CSV-Function",
+                className: "test-class"
+            };
+        },
+        {
+            extend: 'colvis',
+            columnText(dt, idx, title) {
+                return (idx + 1) + title;
+            }
+        },
+        {
+            extend: 'colvis',
+            columns: ':gt(0)'
+        },
+        {
+            extend: 'copy',
+            text: 'Copy current page',
+            exportOptions: {
+                modifier: {
+                    page: 'current'
+                }
+            }
+        },
+        {
+            extend: 'csv',
+            // Name the CSV
+            filename: 'file_name',
+            text: 'Customized CSV',
+            exportOptions: {
+                columns: [0, 1, $("#name_column"), $("#test_column"), $("#height_column"), $("#area_column")]
+            },
+            // Function which customize the CSV (input : csv is the object that you can preprocesss)
+            customize(csv) {
+                if (typeof (csv) !== "string") {
+                    return;
+                }
+                // Split the csv to get the rows
+                const split_csv = csv.split("\n");
+
+                // Remove the row one to personnalize the headers
+                split_csv[0] = '"Latitude","Longitude","Site Name","Description","Antenna Height","Antenna gain","Env loss","Candidate"';
+
+                // For each row except the first one (header)
+                $.each(split_csv.slice(1), (index, csv_row) => {
+                    // Split on quotes and comma to get each cell
+                    const csv_cell_array = csv_row.split('","');
+
+                    // Remove replace the two quotes which are left at the beginning and the end (first and last cell)
+                    csv_cell_array[0] = csv_cell_array[0].replace(/"/g, '');
+                    csv_cell_array[5] = csv_cell_array[5].replace(/"/g, '');
+
+                    // RANDOM EXAMPLE : Make some test, special cutomizing depending of the value of the cell (if cell 5 is equal to a certain value, give a value to row 6)
+                    if (csv_cell_array[5].toLowerCase().trim() === "a certain value") {
+                        csv_cell_array[6] = "2";
+                    } else if (csv_cell_array[5].toLowerCase() === "another value") {
+                        csv_cell_array[6] = "5";
+                    } else {
+                        csv_cell_array[6] = "";
+                    }
+
+                    // RANDOM EXAMPLE : Empty the 5th cell and set the 7th to true
+                    csv_cell_array[5] = "";
+                    csv_cell_array[7] = "true";
+
+                    // Join the table on the quotes and comma; add back the quotes at the beginning and end
+                    const csv_cell_array_quotes = `"${csv_cell_array.join('","')}"`;
+
+                    // Insert the new row into the rows array at the previous index (index +1 because the header was sliced)
+                    split_csv[index + 1] = csv_cell_array_quotes;
+                });
+
+                // Join the rows with line breck and return the final csv (datatables will take the returned csv and process it)
+                csv = split_csv.join("\n");
+                return csv;
+            }
+        }
+    ],
+    dom: {
+        button: {
+            active: "active"
+        }
+    }
+};
+
+// Statics
+const buttons = new $.fn.dataTable.Buttons($("selector").DataTable(), config_3);
+const version = $.fn.dataTable.Buttons.version;
+
+$.fn.dataTable.Buttons.defaults = {
+    buttons: []
+};
+
+$.fn.dataTable.ext.buttons.collection.className += ' dropdown-toggle';
+
+// API
+let dt = $("selector").DataTable();
+
+const export_1 = dt.buttons.exportData({
+    columns: '',
+});
+
+dt.buttons.resize();
+
+dt.button(0).action((e, dt, button, config) => {
+    console.log('Button activated');
+});
+
+dt.button().add(0, {
+    action: (e, dt, button, config) => {
+        dt.ajax.reload();
+    },
+    text: 'Reload table'
+});
+
+dt.button(0)
+    .nodes()
+    .css('background', 'blue');
+
+dt.buttons().destroy();
diff --git a/types/datatables.net-buttons/index.d.ts b/types/datatables.net-buttons/index.d.ts
index 1bdf212b03..e084a50c8d 100644
--- a/types/datatables.net-buttons/index.d.ts
+++ b/types/datatables.net-buttons/index.d.ts
@@ -1,109 +1,272 @@
-// Type definitions for JQuery DataTables Buttons extension 1.1.0
+// Type definitions for JQuery DataTables Buttons extension 1.4
 // Project: http://datatables.net/extensions/buttons/
-// Definitions by: Sam Germano <https://github.com/SammyG4Free>, Jim Hartford <https://github.com/jimhartford>
+// Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection>, Sam Germano <https://github.com/SammyG4Free>, Jim Hartford <https://github.com/jimhartford>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="jquery" />
 /// <reference types="datatables.net"/>
 
 declare namespace DataTables {
-    export interface Settings {
+    interface Settings {
         /**
          * Buttons extension options
          */
-        buttons?: boolean | string[] | ButtonSettings[];
+        buttons?: boolean | string[] | ButtonsSettings | ButtonSettings[];
     }
 
-    //#region "button-settings"
+    interface StaticFunctions {
+        Buttons: ButtonStaticFunctions;
+    }
+
+    interface ButtonStaticFunctions {
+        new (dt: Api, settings: boolean | string[] | ButtonsSettings | ButtonSettings[]): undefined;
+        version: string;
+        defaults: ButtonsSettings;
+    }
+
+    interface ExtSettings {
+        buttons: ExtButtonsSettings;
+    }
+
+    interface Api {
+        button(groupSelector?: any, buttonSelector?: any): ButtonApi;
+        buttons: ButtonsGlobalApi;
+    }
+
+    interface ButtonsGlobalApi {
+        (groupSelector?: any, buttonSelector?: any): ButtonsApi;
 
-    /**
-    * Buttons extension options
-    */
-    export interface ButtonSettings {
         /**
-        * Action to take when the button is activated
-        */
+         * Resize the Flash movie clips to take account of the current button dimensions.
+         */
+        resize(): Api;
+
+        /**
+         * Display / hide an information message to the end user to indicate that something has happened.
+         */
+        info(title: string, message?: string, time?: number): Api;
+
+        /**
+         * Get meta information that is common to many different button types.
+         */
+        exportInfo(options?: ButtonsApiExportInfoParameter): ButtonsApiExportInfoReturn;
+
+        /**
+         * Obtain data from a DataTable that is suitable for exporting by saving into a file or copying to clipboard.
+         */
+        exportData(options?: ButtonsApiExportDataParameter): ButtonsApiExportDataReturn;
+    }
+
+    interface ButtonApi {
+        /**
+         * Get the action function for the selected button.
+         */
+        action(): FunctionButtonAction;
+
+        /**
+         * Set the action function for the selected button.
+         */
+        action(set: FunctionButtonAction): Api;
+
+        /**
+         * Get the active state for the selected button.
+         */
+        active(): boolean;
+
+        /**
+         * Set the active state for the selected button.
+         */
+        active(state: boolean): Api;
+
+        /**
+         * Create a new button, adding it to the selected button instance and inserting immediately into the document.
+         */
+        add(index: number | string, config: string|FunctionButtom|ButtonSettings): Api;
+
+        /**
+         * Disable the selected buttons.
+         */
+        disable(): Api;
+
+        /**
+         * Set the enabled state for the selected button.
+         */
+        enable(state?: boolean): Api;
+
+        /**
+         * Get a jQuery object that contains a reference to the node for the selected button.
+         */
+        node(): JQuery;
+        nodes(): JQuery;
+
+        /**
+         * Determine if a button is currently in the processing state or not.
+         */
+        processing(): boolean;
+
+        /**
+         * Set the processing state for the selected button.
+         */
+        processing(set: boolean): Api;
+
+        /**
+         * Set the processing state for the selected button.
+         */
+        processing(set: boolean): Api;
+
+        /**
+         * Remove the selected button from the display. The button is destroyed and can no longer be used once removed.
+         */
+        remove(): Api;
+
+        /**
+         * Get / Set the display text for the selected button
+         */
+        text(title?: string | FunctionButtonText): Api;
+
+        /**
+         * Programmatically trigger the action of the selected button.
+         */
+        trigger(): Api;
+    }
+
+    interface ButtonsApi extends ButtonApi {
+        /**
+         * Get a jQuery instance that contains a reference to the button container instance.
+         */
+        container(): JQuery;
+        containers(): JQuery;
+
+        /**
+         * Destroy the selected button instances, removing the container and all button elements from the document.
+         */
+        destroy(): Api;
+    }
+
+    interface ButtonsApiExportInfoParameter {
+        extension?: string | (() => string);
+        filename?: string | (() => string);
+        messageBottom?: null | string | (() => string);
+        messageTop?: null | string | (() => string);
+        title?: null | string | (() => string);
+    }
+
+    interface ButtonsApiExportInfoReturn {
+        filename: string;
+        messageTop: string;
+        messageBottom: string;
+        title: string;
+    }
+
+    interface ButtonsApiExportDataParameter {
+        rows?: any;
+        columns?: any;
+        modifier?: any;
+        orthogonal?: string;
+        stripHtml?: boolean;
+        stripNewlines?: boolean;
+        decodeEntities?: boolean;
+        trim?: boolean;
+        format?: any;
+    }
+
+    interface ButtonsApiExportDataReturn {
+        header: string[];
+        footer: string[];
+        body: string[];
+    }
+
+    //#region "Button Settings"
+
+    interface ButtonsSettings {
+        name?: string;
+        tabIndex?: number;
+        buttons: Array<string|FunctionButtom|ButtonSettings>;
+        dom?: ButtonDomSettings;
+    }
+
+    interface ButtonDomSettings {
+        button?: ButtonDomButtomButton;
+        buttonContainer?: ButtonDomButtomCommon;
+        buttonLiner?: ButtonDomButtomCommon;
+        collection?: ButtonDomButtomCommon;
+        container?: ButtonDomButtomCommon;
+    }
+
+    interface ButtonDomButtomCommon {
+        className?: string;
+        tag?: string;
+    }
+
+    interface ButtonDomButtomButton extends ButtonDomButtomCommon {
+        active?: string;
+        disabled?: string;
+    }
+
+    interface ButtomSettingsCommon {
+        /**
+         * Action to take when the button is activated
+         */
         action?: FunctionButtonAction;
 
         /**
-        * Ensure that any requirements have been satisfied before initialising a button
-        */
+         * Ensure that any requirements have been satisfied before initialising a button
+         */
         available?: FunctionButtonAvailable;
 
         /**
-        * Set the class name for the button
-        */
+         * Set the class name for the button
+         */
         className?: string;
 
         /**
-        * Function that is called when the button is destroyed
-        */
+         * Function that is called when the button is destroyed
+         */
         destroy?: FunctionButtonInit;
 
         /**
-        * Set a button's initial enabled state
-        */
+         * Set a button's initial enabled state
+         */
         enabled?: boolean;
 
         /**
-        * Define which button type the button should be based on
-        */
+         * Define which button type the button should be based on
+         */
         extend?: string;
 
         /**
-        * Initialisation function that can be used to add events specific to this button
-        */
+         * Initialisation function that can be used to add events specific to this button
+         */
         init?: FunctionButtonInit;
 
         /**
-        * Define an activation key for a button
-        */
+         * Define an activation key for a button
+         */
         key?: string | ButtonKey;
 
         /**
-        * Set a name for each selection
-        */
+         * Set a name for each selection
+         */
         name?: string;
 
         /**
-        * Unique namespace for every button
-        */
+         * Unique namespace for every button
+         */
         namespace?: string;
 
         /**
-        * The text to show in the button
-        */
-        text?: string | ButtonText;
+         * The text to show in the button
+         */
+        text?: string | FunctionButtonText;
 
         /**
-        * Button 'title' attribute text
-        */
+         * Button 'title' attribute text
+         */
         titleAttr?: string;
-
-        /**
-         * Button 'title' text
-         */
-        title?: string;
-
-        /**
-         * Define what the exported filename should be
-         */
-        filename?: string;
-
-        exportOptions?: ButtonExportOptions;
-        autoPrint?: boolean;
-        customize?: FunctionButtonCustomize;
     }
 
-    export interface FunctionButtonAvailable {
-        (dt: DataTables.Api, config: any): boolean
-    }
-    export interface ButtonExportOptions {
-        columns?: string | number | string[] | number[];
-    }
-
-    export interface ButtonKey {
+    interface ButtonKey {
         key?: string;
         shiftKey?: boolean;
         altKey?: boolean;
@@ -111,19 +274,176 @@ declare namespace DataTables {
         metaKey?: boolean;
     }
 
-    export interface ButtonText {
-        (dt: DataTables.Api, node: JQuery, config: any): string
-    }
-    export interface FunctionButtonInit {
-        (dt: DataTables.Api, node: JQuery, config: any): void
-    }
-    // api object?
-    export interface FunctionButtonAction {
-        (e: any, dt: DataTables.Api, node: JQuery, config: any): void
+    /**
+     * A function that will be executed upon creation of the buttons.
+     */
+    type FunctionButtom = (dt: Api) => ButtomSettingsCommon;
+
+    type FunctionButtonText = (dt: Api, node: JQuery, config: any) => string;
+
+    type FunctionButtonAvailable = (dt: Api, config: any) => boolean;
+
+    type FunctionButtonInit = (dt: Api, node: JQuery, config: any) => void;
+
+    type FunctionButtonAction = (e: any, dt: Api, node: JQuery, config: ButtonSettings) => void;
+
+    type FunctionButtonCustomize = (win: Window|string) => void;
+
+    type FunctionExtButtonsCollectionText = (a: any) => string;
+
+    interface ExtButtonsSettings {
+        collection: ExtButtonsCollectionSettings;
     }
 
-    export interface FunctionButtonCustomize {
-        (win: Window): void
+    interface ExtButtonsCollectionSettings {
+        action: FunctionButtonAction;
+        autoClose: boolean;
+        background: boolean;
+        backgroundClassName: string;
+        className: string;
+        collectionLayout: string;
+        fade: number;
+        text: FunctionExtButtonsCollectionText;
     }
+
+    //#endregion "Button Defaults"
+
+    //#region "Add-Ons"
+
+    /**
+     * Buttons extension options
+     */
+    interface ButtonSettings extends ButtomSettingsCommon {
+        //#region (HTML-)File-Export
+
+        /**
+         * CSV / EXCEL: Define what the exported filename should be
+         */
+        filename?: string;
+
+        /**
+         * COPY / CSV: field separator
+         */
+        fieldSeparator?: string;
+
+        /**
+         * COPY / CSV: field boundary
+         */
+        fieldBoundary?: string;
+
+        /**
+         * COPY / CSV: field separator
+         */
+        newLine?: string;
+
+        /**
+         * CSV / EXCEL / PDF: file extension
+         */
+        extension?: string;
+
+        /**
+         * CSV: UTF-8 boom
+         */
+        bom?: boolean;
+
+        /**
+         * CSV: charset
+         */
+        charset?: string|boolean;
+
+        /**
+         * CSV: escape char
+         */
+        escapeChar?: string;
+
+        /**
+         * EXCEL
+         */
+        customizeData?: FunctionButtonCustomizeData;
+
+        /**
+         * PDF: portrait / landscape
+         */
+        orientation?: string;
+
+        /**
+         * PDF: A3 / A4 / A5 / LEGAL / LETTER / TABLOID
+         */
+        pageSize?: string;
+
+        //#endregion (HTML-)File-Export
+
+        //#region Export and Print
+
+        /**
+         * COPY / CSV / EXCEL / PDF / PRINT: show header
+         */
+        exportOptions?: ButtonExportOptions | object;
+
+        /**
+         * COPY / CSV / EXCEL / PDF / PRINT: show header
+         */
+        customize?: FunctionButtonCustomize;
+
+        /**
+         * COPY / CSV / EXCEL / PDF / PRINT: show header
+         */
+        header?: boolean;
+
+        /**
+         * COPY / CSV / EXCEL / PDF / PRINT: show footer
+         */
+        footer?: boolean;
+
+        /**
+         * COPY / PRINT: title
+         */
+        title?: string;
+
+        /**
+         * COPY / EXCEL / PDF / PRINT: field separator
+         */
+        messageTop?: string;
+
+        /**
+         * COPY / EXCEL / PDF / PRINT: field separator
+         */
+        messageBottom?: string;
+
+        /**
+         * PDF / PRINT: Extra message
+         */
+        message?: string|Api|JQuery|object;
+
+        /**
+         * PRINT: Show print dialoge on click
+         */
+        autoPrint?: boolean;
+
+        //#endregion Export and Print
+
+        //#region ColVis
+
+        /**
+         * COLVIS: Column selector
+         */
+        columns?: any;
+
+        /**
+         * COLVIS:
+         */
+        columnText?: FunctionButtonColvisColumnText;
+
+        //#endregion ColVis
+    }
+
+    interface ButtonExportOptions {
+        columns?: string | number | string[] | number[];
+    }
+
+    type FunctionButtonCustomizeData = (content: any) => void;
+
+    type FunctionButtonColvisColumnText = (dt: Api, i: number, title: string) => string;
+
     //#endregion "button-settings
 }
diff --git a/types/datatables.net-buttons/tslint.json b/types/datatables.net-buttons/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/datatables.net-buttons/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts b/types/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts
index 72d8665838..4f3e2bfd30 100644
--- a/types/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts
+++ b/types/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts
@@ -1,11 +1,34 @@
-$(document).ready(() => {
-    const config: DataTables.Settings = {
-        // FixedHeader extension options
-        fixedHeader: {
-            footer: true,
-            footerOffset: 4,
-            header: true,
-            headerOffset: 3
-        }
-    };
+let config_1: DataTables.Settings = {
+    // FixedHeader extension options
+    fixedHeader: {
+        footer: true,
+        footerOffset: 4,
+        header: true,
+        headerOffset: 3
+    }
+};
+
+let dt: DataTables.Api = $("selector").DataTable({
+    fixedHeader: true
 });
+
+// Statics
+let fixed_1 = new $.fn.dataTable.FixedHeader(dt, {
+    footer: true,
+});
+
+let fixed_2 = new $.fn.dataTable.FixedHeader(dt, true);
+
+let version = $.fn.dataTable.FixedHeader.version;
+
+$.fn.dataTable.FixedHeader.defaults.footer = false;
+
+// API
+dt.fixedHeader.adjust();
+dt.fixedHeader.disable();
+dt.fixedHeader.enable(true);
+
+// Chaining
+dt
+    .fixedHeader.footerOffset(10)
+    .fixedHeader.headerOffset(10);
diff --git a/types/datatables.net-fixedheader/index.d.ts b/types/datatables.net-fixedheader/index.d.ts
index cb0b363b65..aa6f87f3b7 100644
--- a/types/datatables.net-fixedheader/index.d.ts
+++ b/types/datatables.net-fixedheader/index.d.ts
@@ -1,7 +1,9 @@
 // Type definitions for datatables.net-fixedheader 3.1
 // Project: https://datatables.net/extensions/fixedheader/
-// Definitions by: Jared Szechy <https://github.com/szechyjs>
+// Definitions by: Jared Szechy <https://github.com/szechyjs>, Kiarash Ghiaseddin <https://github.com/Silver-Connection>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
 /// <reference types="jquery" />
 /// <reference types="datatables.net"/>
 
@@ -13,6 +15,47 @@ declare namespace DataTables {
         fixedHeader?: boolean | FixedHeaderSettings;
     }
 
+    interface StaticFunctions {
+        FixedHeader: FixedHeaderStaticFunctions;
+    }
+
+    interface FixedHeaderStaticFunctions {
+        new (dt: Api, settings: boolean | FixedHeaderSettings): undefined;
+        version: string;
+        defaults: FixedHeaderSettings;
+    }
+
+    interface Api {
+        fixedHeader: FixedHeaderApi;
+    }
+
+    interface FixedHeaderApi {
+        /**
+         * Recalculate the position of the DataTable on the page and adjust the fixed element as appropriate.
+         */
+        adjust(): Api;
+
+        /**
+         * Disable the fixed elements
+         */
+        disable(): Api;
+
+        /**
+         * Enable / disable the fixed elements
+         */
+        enable(enable: boolean): Api;
+
+        /**
+         * Get the fixed footer's offset.
+         */
+        footerOffset(offset: number): Api;
+
+        /**
+         * Get the fixed header's offset.
+         */
+        headerOffset(offset: number): Api;
+    }
+
     /*
      * FixedHeader extension options
      */
diff --git a/types/datatables.net-rowreorder/index.d.ts b/types/datatables.net-rowreorder/index.d.ts
index 110da7a747..c95c7a1fb9 100644
--- a/types/datatables.net-rowreorder/index.d.ts
+++ b/types/datatables.net-rowreorder/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://datatables.net/extensions/rowreorder/
 // Definitions by: Vincent Biret <https://github.com/baywet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="jquery" />
 /// <reference types="datatables.net"/>
diff --git a/types/datatables.net-select/index.d.ts b/types/datatables.net-select/index.d.ts
index 201d00ba27..e24f6b8ab6 100644
--- a/types/datatables.net-select/index.d.ts
+++ b/types/datatables.net-select/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://datatables.net/extensions/select/
 // Definitions by: Jared Szechy <https://github.com/szechyjs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
 /// <reference types="jquery" />
 /// <reference types="datatables.net"/>
 
diff --git a/types/datatables.net/datatables.net-tests.ts b/types/datatables.net/datatables.net-tests.ts
index f4e322dcfc..e5cb5184fd 100644
--- a/types/datatables.net/datatables.net-tests.ts
+++ b/types/datatables.net/datatables.net-tests.ts
@@ -1,972 +1,1063 @@
-$(document).ready(function () {
-    //#region "Language"
+//#region "Language"
 
-    var lang: DataTables.LanguageSettings = {
-        "emptyTable": "No data available in table",
-        "info": "Showing _START_ to _END_ of _TOTAL_ entries",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "(filtered from _MAX_ total entries)",
-        "infoPostFix": "",
-        "thousands": ",",
-        "lengthMenu": "Show _MENU_ entries",
-        "loadingRecords": "Loading...",
-        "processing": "Processing...",
-        "search": "Search:",
-        "searchPlaceholder": "Default text",
-        "zeroRecords": "No matching records found",
-        "paginate": {
-            "first": "First",
-            "last": "Last",
-            "next": "Next",
-            "previous": "Previous"
+const lang: DataTables.LanguageSettings = {
+    emptyTable: "No data available in table",
+    info: "Showing _START_ to _END_ of _TOTAL_ entries",
+    infoEmpty: "Showing 0 to 0 of 0 entries",
+    infoFiltered: "(filtered from _MAX_ total entries)",
+    infoPostFix: "",
+    thousands: ",",
+    lengthMenu: "Show _MENU_ entries",
+    loadingRecords: "Loading...",
+    processing: "Processing...",
+    search: "Search:",
+    searchPlaceholder: "Default text",
+    zeroRecords: "No matching records found",
+    paginate: {
+        first: "First",
+        last: "Last",
+        next: "Next",
+        previous: "Previous"
+    },
+    aria: {
+        sortAscending: ": activate to sort column ascending",
+        sortDescending: ": activate to sort column descending",
+        paginate: {
+            first: "First",
+            last: "Last",
+            next: "Next",
+            previous: "Previous"
+        }
+    }
+};
+
+//#endregion "Language"
+
+//#region "Column"
+
+const colCreatedCellFunc: DataTables.FunctionColumnCreatedCell = (cell, cellData, rowData, rowIndex, colIndex) => {};
+
+const colDataObject: DataTables.ObjectColumnData = {
+    _: "phone",
+    filter: "phone_filter",
+    display: "phone_display",
+    sort: "asc"
+};
+
+const colDataFunc: DataTables.FunctionColumnData = (row: any, type: 'set' | 'display' | 'sort' | 'filter' | 'type', set: any, meta: DataTables.CellMetaSettings) => {
+    meta.col;
+    meta.row;
+    meta.settings;
+    switch (type) {
+        case 'set':
+            row.value = set;
+            return;
+        default:
+            return row.value;
+    }
+};
+
+const colRenderObject: DataTables.ObjectColumnData = {
+    _: "phone",
+    filter: "phone_filter",
+    display: "phone_display",
+    sort: "asc"
+};
+
+const colRenderFunc: DataTables.FunctionColumnRender = (data: any, type: any, row: any, meta: DataTables.CellMetaSettings): any => {
+    meta.col;
+    meta.row;
+    meta.settings;
+    switch (type) {
+        case undefined:
+            return data.value;
+        case 'filter':
+            return data.filterValue;
+        case 'display':
+            return data.displayValue;
+        case 'type':
+            return data.typeValue;
+        case 'sort':
+            return data.sortValue;
+        default:
+            // Extensibility: the render type can be a custom value, useful for plugins that require custom rendering.
+            // Custom values are declared as any.
+            return data.valueForPlugin;
+    }
+};
+
+colRenderFunc({}, 'filter', {}, null);
+colRenderFunc({}, 'display', {}, null);
+colRenderFunc({}, 'type', {}, null);
+colRenderFunc({}, 'sort', {}, null);
+colRenderFunc({}, undefined, {}, null);
+colRenderFunc({}, 'custom value', {}, null);
+
+let col: DataTables.ColumnSettings = {
+    cellType: "th",
+    className: "css",
+    contentPadding: "mmmm",
+    createdCell: colCreatedCellFunc,
+    data: 1,
+    defaultContent: "edit",
+    name: "name",
+    orderable: true,
+    orderData: 10,
+    orderDataType: "dom-checkbox",
+    orderFixed: [[0, 'asc'], [1, 'desc']],
+    orderSequence: ['asc', 'desc'],
+    render: 1,
+    searchable: true,
+    title: "title",
+    visible: true,
+    width: "200px"
+};
+col = {
+    data: "",
+    orderData: [10, 11, 20],
+    render: "",
+};
+col = {
+    data: colDataObject,
+    render: colRenderObject,
+};
+col = {
+    data: colDataFunc,
+    render: colRenderFunc,
+};
+col = {
+    data: "salary",
+    render: $.fn.dataTable.render.number('\'', '.', 0, '$'),
+};
+col = {
+    data: "url",
+    render: $.fn.dataTable.render.text(),
+};
+col = {
+    orderFixed: {
+        pre: [[0, 'asc'], [1, 'desc']],
+        post: [[0, 'asc'], [1, 'desc']]
+    }
+};
+
+//#endregion "Column"
+
+//#region "ColumnDef"
+
+let colDef: DataTables.ColumnDefsSettings = {
+        targets: 1,
+        cellType: "th",
+        className: "css",
+        contentPadding: "mmmm",
+        createdCell: colCreatedCellFunc,
+        data: 1,
+        defaultContent: "edit",
+        name: "name",
+        orderable: true,
+        orderData: 10,
+        orderDataType: "dom-checkbox",
+        orderFixed: [[0, 'asc'], [1, 'desc']],
+        orderSequence: ['asc', 'desc'],
+        render: 1,
+        searchable: true,
+        title: "title",
+        visible: true,
+        width: "200px"
+    };
+
+colDef = {
+        targets: "2",
+        cellType: "th",
+    };
+
+colDef = {
+        targets: ["2", 5],
+        cellType: "th",
+    };
+
+//#endregion "ColumnDef"
+
+//#region "Callbacks"
+
+const createRowFunc: DataTables.FunctionCreateRow = (row, data, dataIndex) => { };
+const drawCallbackFunc: DataTables.FunctionDrawCallback = (settings) => { };
+const footerCallbackFunc: DataTables.FunctionFooterCallback = (tfoot, data, start, end, display) => { };
+const formatNumberFunc: DataTables.FunctionFormatNumber = (toForm) => { };
+const headerCallbackFunc: DataTables.FunctionHeaderCallback = (thead, data, start, end, display) => { };
+const infoCallbackFunc: DataTables.FunctionInfoCallback = (settings, start, end, total, pre) => { };
+const initCallbackFunc: DataTables.FunctionInitComplete = (settings, json) => { };
+const preDrawFunc: DataTables.FunctionPreDrawCallback = (settings) => { };
+const rowCallbackFunc: DataTables.FunctionRowCallback = (row, data, index) => { };
+const stateLoadCallbackFunc: DataTables.FunctionStateLoadCallback = (settings) => { };
+const stateLoadedCallbackFunc: DataTables.FunctionStateLoaded = (settings, data) => { };
+const stateSaveCallbackFunc: DataTables.FunctionStateSaveCallback = (settings, data) => { };
+const stateSaveParamsFunc: DataTables.FunctionStateSaveParams = (settings, data) => { };
+
+//#endregion "Callbacks
+
+//#region "Ajax"
+
+const ajaxFunc: DataTables.FunctionAjax = (data, callback, settings) => { };
+
+let ajaxDataFunc: DataTables.FunctionAjaxData = (data, settings) => data;
+
+ajaxDataFunc = (data) => "";
+
+//#endregion "Ajax"
+
+//#region "Settings"
+
+let config: DataTables.Settings = {
+        // columns
+        columns: [
+            col,
+            null,
+            col,
+            null,
+            col,
+            col
+        ],
+        columnDefs: [
+            null,
+            colDef,
+            colDef,
+            null,
+        ],
+        // Data
+        ajax: "url",
+        data: {},
+        // Features
+        autoWidth: true,
+        deferRender: true,
+        info: true,
+        jQueryUI: false,
+        lengthChange: true,
+        ordering: true,
+        paging: true,
+        scrollX: true,
+        scrollY: "200px",
+        searching: true,
+        serverSide: true,
+        stateSave: true,
+        // Options
+        deferLoading: 10,
+        destroy: true,
+        displayStart: 1,
+        dom: "lrtip",
+        lengthMenu: [1, 2, 3, 4],
+        orderCellsTop: true,
+        orderClasses: true,
+        order: [[0, 'asc'], [1, 'asc']],
+        orderFixed: [[0, 'asc'], [1, 'asc']],
+        orderMulti: true,
+        pageLength: 10,
+        pagingType: "simple",
+        retrieve: true,
+        renderer: "bootstrap",
+        rowId: "custId",
+        scrollCollapse: true,
+        search: true,
+        searchCols: [{ search: "", smart: true, regex: false, caseInsensitive: true }],
+        searchDelay: 10,
+        stateDuration: 10,
+        tabIndex: 10,
+    };
+
+config = {
+        ajax: ajaxFunc,
+        deferLoading: [10, 100],
+        lengthMenu: [[10, 25, 50, -1], [10, 25, 50, "All"]],
+        order: [0, 'asc'],
+        orderFixed: [[0, 'asc'], [1, 'asc']],
+        renderer: {
+            header: "bootstrap",
+            pageButton: "jqueryui"
         },
-        "aria": {
-            "sortAscending": ": activate to sort column ascending",
-            "sortDescending": ": activate to sort column descending"
-        }
+        search: { search: "", smart: true, regex: false, caseInsensitive: true },
+        searchCols: [
+            null,
+            { search: "", smart: true, regex: false, caseInsensitive: true },
+            { search: "" },
+            { search: "", smart: true },
+            null
+        ],
     };
 
-    //#endregion "Language"
-
-    //#region "Column"
-
-    var colCreatedCellFunc: DataTables.FunctionColumnCreatedCell = function (cell, cellData, rowData, rowIndex, colIndex) {
-
-    }
-
-    var colDataObject: DataTables.ObjectColumnData = {
-        _: "phone",
-        filter: "phone_filter",
-        display: "phone_display",
-        sort: "asc"
-    };
-
-    var colDataFunc: DataTables.FunctionColumnData = (row: any, type: 'set' | 'display' | 'sort' | 'filter' | 'type', set: any, meta: DataTables.CellMetaSettings) => {
-        meta.col;
-        meta.row;
-        meta.settings;
-        switch (type) {
-            case 'set':
-                row.value = set;
-                return;
-            default:
-                return row.value;
-        }
-    };
-
-    var colRenderObject: DataTables.ObjectColumnRender = {
-        _: "phone",
-        filter: "phone_filter",
-        display: "phone_display",
-        sort: "asc"
-    };
-
-    var colRenderFunc: DataTables.FunctionColumnRender = (data: any, type: 'filter' | 'display' | 'type' | 'sort' | undefined | any, row: any, meta: DataTables.CellMetaSettings): any => {
-        meta.col;
-        meta.row;
-        meta.settings;
-        switch (type) {
-            case undefined:
-                return data.value;
-            case 'filter':
-                return data.filterValue;
-            case 'display':
-                return data.displayValue;
-            case 'type':
-                return data.typeValue;
-            case 'sort':
-                return data.sortValue;
-            default:
-                // Extensibility: the render type can be a custom value, useful for plugins that require custom rendering.
-                // Custom values are declared as any.
-                return data.valueForPlugin;
-        }
-    };
-
-    colRenderFunc({}, 'filter', {}, null);
-    colRenderFunc({}, 'display', {}, null);
-    colRenderFunc({}, 'type', {}, null);
-    colRenderFunc({}, 'sort', {}, null);
-    colRenderFunc({}, undefined, {}, null);
-    colRenderFunc({}, 'custom value', {}, null);
-
-    var col: DataTables.ColumnSettings =
-        {
-            cellType: "th",
-            className: "css",
-            contentPadding: "mmmm",
-            createdCell: colCreatedCellFunc,
-            data: 1,
-            defaultContent: "edit",
-            name: "name",
-            orderable: true,
-            orderData: 10,
-            orderDataType: "dom-checkbox",
-            orderSequence: ['asc', 'desc'],
-            render: 1,
-            searchable: true,
-            title: "title",
-            visible: true,
-            width: "200px"
-        }
-    col =
-        {
-            data: "",
-            orderData: [10, 11, 20],
-            render: "",
-        }
-    col =
-        {
-            data: colDataObject,
-            render: colRenderObject,
-        }
-    col =
-        {
-            data: colDataFunc,
-            render: colRenderFunc,
-        }
-
-    //#endregion "Column"
-
-    //#region "ColumnDef"
-
-    var colDef: DataTables.ColumnDefsSettings =
-        {
-            targets: 1,
-            cellType: "th",
-            className: "css",
-            contentPadding: "mmmm",
-            createdCell: colCreatedCellFunc,
-            data: 1,
-            defaultContent: "edit",
-            name: "name",
-            orderable: true,
-            orderData: 10,
-            orderDataType: "dom-checkbox",
-            orderSequence: ['asc', 'desc'],
-            render: 1,
-            searchable: true,
-            title: "title",
-            visible: true,
-            width: "200px"
-        };
-
-    colDef =
-        {
-            targets: "2",
-            cellType: "th",
-        };
-
-    colDef =
-        {
-            targets: ["2", 5],
-            cellType: "th",
-        };
-
-    //#endregion "ColumnDef"
-
-    //#region "Callbacks"
-
-    var createRowFunc: DataTables.FunctionCreateRow = function (row, data, dataIndex) { };
-    var drawCallbackFunc: DataTables.FunctionDrawCallback = function (settings) { };
-    var footerCallbackFunc: DataTables.FunctionFooterCallback = function (tfoot, data, start, end, display) { };
-    var formatNumberFunc: DataTables.FunctionFormatNumber = function (toForm) { };
-    var headerCallbackFunc: DataTables.FunctionHeaderCallback = function (thead, data, start, end, display) { };
-    var infoCallbackFunc: DataTables.FunctionInfoCallback = function (settings, start, end, total, pre) { };
-    var initCallbackFunc: DataTables.FunctionInitComplete = function (settings, json) { };
-    var preDrawFunc: DataTables.FunctionPreDrawCallback = function (settings) { };
-    var rowCallbackFunc: DataTables.FunctionRowCallback = function (row, data, index) { };
-    var stateLoadCallbackFunc: DataTables.FunctionStateLoadCallback = function (settings) { };
-    var stateLoadedCallbackFunc: DataTables.FunctionStateLoaded = function (settings, data) { };
-    var stateSaveCallbackFunc: DataTables.FunctionStateSaveCallback = function (settings, data) { };
-    var stateSaveParamsFunc: DataTables.FunctionStateSaveParams = function (settings, data) { };
-
-    //#endregion "Callbacks
-
-    //#region "Ajax"
-
-    var ajaxFunc: DataTables.FunctionAjax = function (data, callback, settings) { };
-
-    var ajaxDataFunc: DataTables.FunctionAjaxData = function (data, settings) {
-        return data;
-    };
-
-    ajaxDataFunc = function (data) {
-        return "";
-    };
-
-    //#endregion "Ajax"
-
-    //#region "Settings"
-
-    var config: DataTables.Settings =
-        {
-            // columns
-            columns: [
-                col,
-                null,
-                col,
-                null,
-                col,
-                col
-            ],
-            columnDefs: [
-                null,
-                colDef,
-                colDef,
-                null,
-            ],
-            // Data
-            ajax: "url",
+config = {
+        ajax: {
             data: {},
-            // Features
-            autoWidth: true,
-            deferRender: true,
-            info: true,
-            jQueryUI: false,
-            lengthChange: true,
-            ordering: true,
-            paging: true,
-            scrollX: true,
-            scrollY: "200px",
-            searching: true,
-            serverSide: true,
-            stateSave: true,
-            // Options
-            deferLoading: 10,
-            destroy: true,
-            displayStart: 1,
-            dom: "lrtip",
-            lengthMenu: [1, 2, 3, 4],
-            orderCellsTop: true,
-            orderClasses: true,
-            order: [[0, 'asc'], [1, 'asc']],
-            orderFixed: [[0, 'asc'], [1, 'asc']],
-            orderMulti: true,
-            pageLength: 10,
-            pagingType: "simple",
-            retrieve: true,
-            renderer: "bootstrap",
-            rowId: "custId",
-            scrollCollapse: true,
-            search: true,
-            searchCols: [{ "search": "", "smart": true, "regex": false, "caseInsensitive": true }],
-            searchDelay: 10,
-            stateDuration: 10,
-            tabIndex: 10,
-        };
-
-
-    config =
-        {
-            ajax: ajaxFunc,
-            deferLoading: [10, 100],
-            lengthMenu: [[10, 25, 50, -1], [10, 25, 50, "All"]],
-            order: [0, 'asc'],
-            orderFixed: [[0, 'asc'], [1, 'asc']],
-            renderer: {
-                header: "bootstrap",
-                pageButton: "jqueryui"
-            },
-            search: { "search": "", "smart": true, "regex": false, "caseInsensitive": true },
-            searchCols: [
-                null,
-                { "search": "", "smart": true, "regex": false, "caseInsensitive": true },
-                { "search": "" },
-                { "search": "", "smart": true },
-                null
-            ],
-        };
-
-    config =
-        {
-            ajax: {
-                data: {},
-                dataSrc: "",
-            },
-        };
-
-    config =
-        {
-            ajax: {
-                data: ajaxDataFunc,
-                dataSrc: function (data: any) { },
-            },
-        };
-
-    //#endregion "Settings"
-
-    //#region "Settings-Legacy"
-
-    var browserLegacy: DataTables.BrowserLegacy = {
-        barWidth: 10,
-        bBounding: true,
-        bScrollbarLeft: true,
-        bScrollOversize: true
-    }
-
-    //#endregion
-
-    //#region "Init"
-
-    var dt = $('#example').DataTable();
-    dt = $('#example1').DataTable(config);
-    dt = $('#example1').DataTable(config);
-    dt.$('tr:odd').css('backgroundColor', 'blue');
-
-    //#endregion "Init"
-
-    //#region "Methods-Ajax"
-
-    var json = dt.ajax.json();
-
-    var params = dt.ajax.params();
-
-    var reload = dt.ajax.reload();
-    reload = dt.ajax.reload(function () { });
-    reload = dt.ajax.reload(function () { }, true);
-    var test = reload.$("");
-
-    var url = dt.ajax.url();
-    dt.ajax.url("url");
-    dt.ajax.url("url").load();
-
-    //#endregion "Methods-Ajax"
-
-    //#region "Methods-Core"
-
-    var clear = dt.clear();
-    clear.$("");
-
-    var data = dt.data();
-    data.$("");
-
-    var destroy = dt.destroy();
-    destroy = dt.destroy(true);
-    destroy.$("");
-
-    var draw: DataTables.Api = dt.draw();
-    draw = dt.draw(true);
-    draw = dt.draw("page");
-    draw.$("");
-
-    var initSettings = dt.init();
-
-    var i18n: string = dt.i18n('buttons.copy', 'Copy to clipboard');
-    i18n = dt.i18n('select.rows', { _: '%d rows selected', 1: '1 row selected' }, 0);
-
-    var off = dt.off("event");
-    off = dt.off("event", function () { });
-    off.$("");
-
-    var on = dt.on("event", function () { });
-    on.$("");
-
-    var one = dt.one("event", function () { });
-    one.$("");
-
-    var order_get = dt.order();
-    var order_set = dt.order([0, "asc"]);
-    order_set = dt.order([0, "asc"], [1, "desc"]);  // TODO: Fíx that
-    order_set = dt.order([[0, "asc"], [1, "desc"]]);
-
-    var orderListerner = order_set.order.listener("node", 1, function () { });
-
-    var page_get = dt.page();
-    var page_set = dt.page(1);
-    page_set = dt.page("next");
-
-    var page = dt.page.info();
-    page = {
-        "page": 1,
-        "pages": 6,
-        "start": 10,
-        "end": 20,
-        "length": 10,
-        "recordsTotal": 57,
-        "recordsDisplay": 57,
-        "serverSide": false
+            dataSrc: "",
+        },
     };
 
-    var page_len_get = dt.page.len();
-    var page_len_set = dt.page.len(10);
-
-    var search_get = dt.search();
-    var search_set = dt.search("searchStr");
-    search_set = dt.search("searchStr", true);
-    search_set = dt.search("searchStr", true, false);
-    search_set = dt.search("searchStr", true, false, false);
-
-    var settings = dt.settings();
-
-    var state = dt.state();
-    state = { "time": 1423772610230, "start": 0, "length": 25, "order": [[0, "asc"]], "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true }, "columns": [{ "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }, { "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }, { "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }, { "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }, { "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }, { "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }, { "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }, { "visible": true, "search": { "search": "", "smart": true, "regex": false, "caseInsensitive": true } }] };
-    state = dt.state.loaded();
-
-    var state_clear = dt.state.clear();
-    state_clear.$("");
-
-    var state_save = dt.state.save();
-    state_save.$("");
-
-    //#endregion "Methods-Core"
-
-    var modifier: DataTables.ObjectSelectorModifier = {
-        order: "current",
-        search: "none",
-        searchPlaceholder: "Default text",
-        page: "all",
+config = {
+        ajax: {
+            data: ajaxDataFunc,
+            dataSrc() {
+                return [];
+            },
+        },
     };
 
-    //#region "Methods-Cell"
+//#endregion "Settings"
 
-    var cells = dt.cells();
-    cells = dt.cells(":contains('Not shipped')");
-    cells = dt.cells(function () { });
-    cells = dt.cells($(""));
-    cells = dt.cells({});
-    cells = dt.cells(":contains('Not shipped')r", modifier);
-    cells = dt.cells("row-selector", "cells-selector", modifier);
+//#region "Settings-Legacy"
 
-    var cells_cache = cells.cache("search");
-    // Create the select list and search operation
-    var select = $('<select />')
-        .appendTo('body')
-        .on('change', function () {
-            dt
-                .column(0)
-                .search($(this).val() as string)
-                .draw();
-        });
-    // Get the search data for the first column and add to the select list
-    var data = dt
-        .cells('', 0)
-        .cache('search')
-        .sort()
-        .unique()
-        .each(function (d: any) {
-            select.append($('<option value="' + d + '">' + d + '</option>'));
-        });
+const browserLegacy: DataTables.BrowserLegacy = {
+    barWidth: 10,
+    bBounding: true,
+    bScrollbarLeft: true,
+    bScrollOversize: true
+};
 
-    var cells_data = cells.data();
-    var data = dt
-        .cells(".info")
-        .data();
+//#endregion
+
+//#region "Init"
+
+let dt = $('#example').DataTable();
+dt = $('#example1').DataTable(config);
+dt = $('#example1').DataTable(config);
+dt.$('tr:odd').css('backgroundColor', 'blue');
+
+//#endregion "Init"
+
+//#region "Methods-Ajax"
+
+const json = dt.ajax.json();
+
+const params = dt.ajax.params();
+
+let reload = dt.ajax.reload();
+reload = dt.ajax.reload(() => { });
+reload = dt.ajax.reload(() => { }, true);
+const test = reload.$("");
+
+const url = dt.ajax.url();
+dt.ajax.url("url");
+dt.ajax.url("url").load();
+
+//#endregion "Methods-Ajax"
+
+//#region "Methods-Core"
+
+const clear = dt.clear();
+clear.$("");
+
+const data_2 = dt.data();
+data_2.$("");
+
+let destroy = dt.destroy();
+destroy = dt.destroy(true);
+destroy.$("");
+
+let draw: DataTables.Api = dt.draw();
+draw = dt.draw(true);
+draw = dt.draw("page");
+draw.$("");
+
+const initSettings = dt.init();
+
+let i18n: string = dt.i18n('buttons.copy', 'Copy to clipboard');
+i18n = dt.i18n('select.rows', { _: '%d rows selected', 1: '1 row selected' }, 0);
+
+let off = dt.off("event");
+off = dt.off("event", () => { });
+off.$("");
+
+const on = dt.on("event", () => { });
+on.$("");
+
+const one = dt.one("event", () => { });
+one.$("");
+
+const order_get = dt.order();
+let order_set = dt.order([0, "asc"]);
+order_set = dt.order([0, "asc"], [1, "desc"]);  // TODO: Fíx that
+order_set = dt.order([[0, "asc"], [1, "desc"]]);
+
+const fixed_get: DataTables.ObjectOrderFixed = dt.order.fixed();
+const fixed_set: DataTables.Api = dt.order.fixed({pre: [0, "asc"], post: [1, "desc"]});
+
+const orderListerner = order_set.order.listener("node", 1, () => { });
+
+const page_get = dt.page();
+let page_set = dt.page(1);
+page_set = dt.page("next");
+
+let page = dt.page.info();
+page = {
+    page: 1,
+    pages: 6,
+    start: 10,
+    end: 20,
+    length: 10,
+    recordsTotal: 57,
+    recordsDisplay: 57,
+    serverSide: false
+};
+
+const page_len_get = dt.page.len();
+const page_len_set = dt.page.len(10);
+
+const search_get = dt.search();
+let search_set = dt.search("searchStr");
+search_set = dt.search("searchStr", true);
+search_set = dt.search("searchStr", true, false);
+search_set = dt.search("searchStr", true, false, false);
+
+const settings = dt.settings();
+
+let state = dt.state();
+state = {
+    time: 1423772610230,
+    start: 0,
+    length: 25,
+    order: [[0, "asc"]],
+    search: {
+        search: "",
+        smart: true,
+        regex: false,
+        caseInsensitive: true
+    },
+    columns: [{
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }, {
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }, {
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }, {
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }, {
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }, {
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }, {
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }, {
+        visible: true,
+        search: { search: "", smart: true, regex: false, caseInsensitive: true }
+    }]
+};
+state = dt.state.loaded();
+
+const state_clear = dt.state.clear();
+state_clear.$("");
+
+const state_save = dt.state.save();
+state_save.$("");
+
+//#endregion "Methods-Core"
+
+const modifier: DataTables.ObjectSelectorModifier = {
+    order: "current",
+    search: "none",
+    searchPlaceholder: "Default text",
+    page: "all",
+};
+
+//#region "Methods-Cell"
+
+let cells = dt.cells();
+cells = dt.cells(":contains('Not shipped')");
+cells = dt.cells(() => { });
+cells = dt.cells($(""));
+cells = dt.cells({});
+cells = dt.cells(":contains('Not shipped')r", modifier);
+cells = dt.cells("row-selector", "cells-selector", modifier);
+
+const cells_cache = cells.cache("search");
+// Create the select list and search operation
+const select_2 = $('<select />')
+    .appendTo('body')
+    .on('change', () => {
+        dt
+            .column(0)
+            .search($(this).val() as string)
+            .draw();
+    });
+// Get the search data for the first column and add to the select list
+const data_3 = dt
+    .cells('', 0)
+    .cache('search')
+    .sort()
+    .unique()
+    .each((d: any) => {
+        const tag = `<option value="${d}">${d}</option>`;
+        select.append($(tag));
+    });
+
+const cells_data = cells.data();
+const data_4 = dt
+    .cells(".info")
+    .data();
+
+console.log(data_4);
+
+const cells_indexes = cells.indexes();
+const columns_d = dt
+    .cells(':contains("21")')
+    .indexes()
+    .pluck('column')
+    .sort()
+    .unique();
+
+alert('Columns containing 21: ' + columns_d.join(', '));
+
+const cells_invalidate_1 = cells.invalidate();
+const cells_invalidate_2 = cells.invalidate("data");
+const td = $('#example tbody td:eq(0)');
+td.html('Updated');
+dt.cell(td).invalidate().draw();
+
+const cells_nodes = cells.nodes();
+const cells_d = dt
+    .cells(":contains('Not shipped')")
+    .nodes();
+
+$(cells_d).addClass('warning');
+
+const cells_render = cells.render("display");
+$('#example').on('click', 'tbody td', () => {
+    const idx = dt.cell(this).index().row;
+    const data = dt.cells(idx, '').render('display');
 
     console.log(data);
+});
 
-    var cells_indexes = cells.indexes();
-    var columns_d = dt
-        .cells(':contains("21")')
-        .indexes()
-        .pluck('column')
-        .sort()
-        .unique();
+cells.every(() => { });
+cells.every((cellRowIdx, cellColIdx, tableLoop, cellLoop) => { });
 
-    alert('Columns containing 21: ' + columns_d.join(', '));
+let cell = dt.cell(":contains('Not shipped')");
+cell = dt.cell(() => { });
+cell = dt.cell($(""));
+cell = dt.cell({});
+cell = dt.cell(":contains('Not shipped')r", modifier);
+cell = dt.cell("row-selector", "cells-selector", modifier);
 
-    var cells_invalidate = cells.invalidate();
-    var cells_invalidate = cells.invalidate("data");
-    var td = $('#example tbody td:eq(0)');
-    td.html('Updated');
-    dt.cell(td).invalidate().draw();
+const cell_cache = cell.cache("search");
+$('#example tbody').on('click', 'td', () => {
+    alert(dt.cell(this).cache('order'));
+});
 
-    var cells_nodes = cells.nodes();
-    var cells_d = dt
-        .cells(":contains('Not shipped')")
-        .nodes();
+const cell_data_get = cell.data();
+$('#example tbody').on('click', 'td', () => {
+    alert(dt.cell(this).data());
+});
 
-    $(cells_d).addClass('warning');
+let cell_data_set = cell.data("string");
+cell_data_set = cell.data(1);
+$('#example tbody').on('click', 'td', () => {
+    const cell = dt.cell(this);
+    cell.data(cell.data() + 1).draw();
+});
 
-    var cells_render = cells.render("display");
-    $('#example').on('click', 'tbody td', function () {
-        var idx = dt.cell(this).index().row;
-        var data = dt.cells(idx, '').render('display');
+const cell_index = cell.index();
+$('#example tbody').on('click', 'td', () => {
+    alert('Clicked on cell in visible column: ' + dt.cell(this).index().columnVisible);
+});
+$('#example tbody').on('click', 'td', () => {
+    const rowIdx = dt
+        .cell(this)
+        .index().row;
 
-        console.log(data);
-    });
-
-    cells.every(function () { });
-    cells.every(function (cellRowIdx, cellColIdx, tableLoop, cellLoop) { });
-
-    var cell = dt.cell(":contains('Not shipped')");
-    cell = dt.cell(function () { });
-    cell = dt.cell($(""));
-    cell = dt.cell({});
-    cell = dt.cell(":contains('Not shipped')r", modifier);
-    cell = dt.cell("row-selector", "cells-selector", modifier);
-
-    var cell_cache = cell.cache("search");
-    $('#example tbody').on('click', 'td', function () {
-        alert(dt.cell(this).cache('order'));
-    });
-
-    var cell_data_get = cell.data();
-    $('#example tbody').on('click', 'td', function () {
-        alert(dt.cell(this).data());
-    });
-
-    var cell_data_set = cell.data("string");
-    cell_data_set = cell.data(1);
-    $('#example tbody').on('click', 'td', function () {
-        var cell = dt.cell(this);
-        cell.data(cell.data() + 1).draw();
-    });
-
-    var cell_index = cell.index();
-    $('#example tbody').on('click', 'td', function () {
-        alert('Clicked on cell in visible column: ' + dt.cell(this).index().columnVisible);
-    });
-    $('#example tbody').on('click', 'td', function () {
-        var rowIdx = dt
-            .cell(this)
-            .index().row;
-
-        dt.rows(rowIdx)
-            .nodes()
-            .to$()
-            .addClass('clicked');
-    });
-
-    var cell_invalidate = cell.invalidate();
-    var cell_invalidate = cell.invalidate("data");
-    $('#example tbody').on('click', 'td', function () {
-        this.innerHTML = (parseInt(this.innerHTML) + 1).toString();
-        dt.cell(this).invalidate().draw();
-    });
-
-    var cell_nodes = cell.node();
-    var cell_n = dt
-        .cell("#importantCell")
-        .node();
-
-    $(cell_n).addClass('warning');
-
-    var cell_render = cell.render("display");
-    $('#example').on('click', 'tbody td', function () {
-        var data = dt.cell(this).render('display');
-
-        console.log(data);
-    });
-    $('#example').on('click', 'tbody td', function () {
-        var data = dt.cell(this).render('sort');
-
-        console.log(data);
-    });
-
-    //#endregion "Methods-Cell"
-
-    //#region "Methods-Column"
-
-    var columns = dt.columns();
-    columns = dt.columns("selector");
-    columns = dt.columns("selector", modifier);
-
-    var columns_cache = columns.cache("order");
-    dt.columns('.select-filter').eq(0).each(function (colIdx: any) {
-        // Create the select list and search operation
-        var select = $('<select />')
-            .appendTo(
-            dt.column(colIdx).footer()
-            )
-            .on('change', function () {
-                dt
-                    .column(colIdx)
-                    .search($(this).val() as string)
-                    .draw();
-            });
-
-        // Get the search data for the first column and add to the select list
-        dt
-            .column(colIdx)
-            .cache('search')
-            .sort()
-            .unique()
-            .each(function (d: any) {
-                select.append($('<option value="' + d + '">' + d + '</option>'));
-            });
-    });
-
-    var columns_data = columns.data();
-    $('#listData').html(
-        dt
-            .columns(0)
-            .data()
-            .eq(0)      // Reduce the 2D array into a 1D array of data
-            .sort()       // Sort data alphabetically
-            .unique()     // Reduce to unique values
-            .join('<br>')
-    );
-
-    //var idx = dt
-    //    .columns('.check')
-    //    .data()
-    //    .eq(0) // Reduce the 2D array into a 1D array of data
-    //    .indexOf('Yes');
-
-    var columns_dataSrc = columns.dataSrc();
-    //alert('Data source: ' + dt.columns([0, 1]).dataSrc().join(' '));
-
-    var columns_footer = columns.footer();
-    var columns_header = columns.header();
-    var columns_indexes = columns.indexes();
-    columns_indexes = columns.indexes("visibile");
-    var columns_nodes = columns.nodes();
-    dt
-        .columns('.ready')
+    dt.rows(rowIdx)
         .nodes()
-    //.flatten()  // Reduce to a 1D array
-    //.to$()      // Convert to a jQuery object
-    //.addClass('highlight');
+        .to$()
+        .addClass('clicked');
+});
 
-    var columns_search_get = columns.search();
-    var columns_search_set = columns.search("string");
-    columns_search_set = columns.search("string", true);
-    columns_search_set = columns.search("string", true, false);
-    columns_search_set = columns.search("string", true, false, true);
+const cell_invalidate_1 = cell.invalidate();
+const cell_invalidate_2 = cell.invalidate("data");
+$('#example tbody').on('click', 'td', () => {
+    this.innerHTML = (parseInt(this.innerHTML, 10) + 1).toString();
+    dt.cell(this).invalidate().draw();
+});
 
-    var columns_visible_get = columns.visible();
-    var columns_visible_set = columns.visible(false);
-    columns_visible_set = columns.visible(false, true);
-    // Hide a column
-    dt.column(1).visible(false);
-    dt.columns([0, 1, 2, 3]).visible(false, false);
-    dt.columns.adjust().draw(false); // adjust column sizing and redraw
+const cell_nodes = cell.node();
+const cell_n = dt
+    .cell("#importantCell")
+    .node();
 
-    var columns_adjust = dt.columns.adjust();
+$(cell_n).addClass('warning');
 
-    var column = dt.column("selector");
-    column = dt.column("selector", modifier);
+const cell_render = cell.render("display");
+$('#example').on('click', 'tbody td', () => {
+    const data = dt.cell(this).render('display');
 
-    dt.column(0).visible(false);
+    console.log(data);
+});
+$('#example').on('click', 'tbody td', () => {
+    const data = dt.cell(this).render('sort');
 
-    $('#example tbody').on('click', 'td', function () {
-        var visIdx = $(this).index();
-        var dataIdx = dt.column.index('fromVisible', visIdx);
+    console.log(data);
+});
 
-        alert('Column data index: ' + dataIdx + ', and visible index: ' + visIdx);
-    });
+//#endregion "Methods-Cell"
 
-    var column_cache = column.cache("order");
+//#region "Methods-Column"
+
+let columns = dt.columns();
+columns = dt.columns("selector");
+columns = dt.columns("selector", modifier);
+
+const columns_cache = columns.cache("order");
+dt.columns('.select-filter').eq(0).each((colIdx: any) => {
     // Create the select list and search operation
-    var select = $('<select />')
+    const select = $('<select />')
         .appendTo(
-        dt.column(0).footer()
+        dt.column(colIdx).footer()
         )
-        .on('change', function () {
+        .on('change', () => {
             dt
-                .column(0)
+                .column(colIdx)
                 .search($(this).val() as string)
                 .draw();
         });
 
     // Get the search data for the first column and add to the select list
     dt
-        .column(0)
+        .column(colIdx)
         .cache('search')
         .sort()
         .unique()
-        .each(function (d: any) {
-            select.append($('<option value="' + d + '">' + d + '</option>'));
+        .each((d: any) => {
+            const tag = `<option value="${d}">${d}</option>`;
+            select.append($(tag));
         });
+});
 
-    var column_data = column.data();
-    alert('Column 4 sum: ' +
+const columns_data = columns.data();
+$('#listData').html(
+    dt
+        .columns(0)
+        .data()
+        .eq(0)      // Reduce the 2D array into a 1D array of data
+        .sort()       // Sort data alphabetically
+        .unique()     // Reduce to unique values
+        .join('<br>')
+);
+
+// const idx = dt
+//    .columns('.check')
+//    .data()
+//    .eq(0) // Reduce the 2D array into a 1D array of data
+//    .indexOf('Yes');
+
+const columns_dataSrc = columns.dataSrc();
+// alert('Data source: ' + dt.columns([0, 1]).dataSrc().join(' '));
+
+const columns_footer = columns.footer();
+const columns_header = columns.header();
+let columns_indexes = columns.indexes();
+columns_indexes = columns.indexes("visibile");
+const columns_nodes = columns.nodes();
+dt
+    .columns('.ready')
+    .nodes();
+// .flatten()  // Reduce to a 1D array
+// .to$()      // Convert to a jQuery object
+// .addClass('highlight');
+
+const columns_search_get = columns.search();
+let columns_search_set = columns.search("string");
+columns_search_set = columns.search("string", true);
+columns_search_set = columns.search("string", true, false);
+columns_search_set = columns.search("string", true, false, true);
+
+const columns_visible_get = columns.visible();
+let columns_visible_set = columns.visible(false);
+columns_visible_set = columns.visible(false, true);
+// Hide a column
+dt.column(1).visible(false);
+dt.columns([0, 1, 2, 3]).visible(false, false);
+dt.columns.adjust().draw(false); // adjust column sizing and redraw
+
+const columns_adjust = dt.columns.adjust();
+
+let column = dt.column("selector");
+column = dt.column("selector", modifier);
+
+dt.column(0).visible(false);
+
+$('#example tbody').on('click', 'td', () => {
+    const visIdx = $(this).index();
+    const dataIdx = dt.column.index('fromVisible', visIdx);
+    alert('Column data index:');
+});
+
+const column_cache = column.cache("order");
+// Create the select list and search operation
+const select = $('<select />')
+    .appendTo(
+    dt.column(0).footer()
+    )
+    .on('change', () => {
         dt
-            .column(4)
-            .data()
-            .reduce(function (a: any, b: any) {
-                return a + b;
-            })
-    );
-
-    var column_dataSrc = column.dataSrc();
-    $('#example').on('click', 'tbody td', function () {
-        var idx = dt.cell(this).index().column;
-        alert('Data source: ' + dt.column(idx).dataSrc());
-    });
-
-    var column_footer = column.footer();
-    var column_p = dt.column(0);
-    //$(column.footer()).html(
-    //    column_p
-    //        .data()
-    //        .reduce(function (a, b) {
-    //        return a + b;
-    //    })
-    //    );
-
-    var column_header = column.header();
-    $('#example tbody').on('click', 'td', function () {
-        var idx = dt.cell(this).index().column;
-        var title = dt.column(idx).header();
-
-        alert('Column title clicked on: ' + $(title).html());
-    });
-
-    var column_index = column.index();
-    column_index = column.index("visibile");
-    dt.column(0).visible(false);
-
-    var idx = dt.column(1).index('visible');
-    alert(idx); // will show 0
-
-    dt.column('0:visible').order('asc');
-
-    var column_nodes = column.nodes();
-    dt.column(-1)
-        .nodes()
-    //.to$()      // Convert to a jQuery object
-    //.addClass('ready');
-
-    var column_search_get = column.search();
-    var column_search_set = column.search("string");
-    column_search_set = column.search("string", true);
-    column_search_set = column.search("string", true, false);
-    column_search_set = column.search("string", true, false, true);
-    $('#column3_search').on('keyup', function () {
-        dt
-            .columns(3)
-            .search((this as HTMLInputElement).value)
+            .column(0)
+            .search($(this).val() as string)
             .draw();
     });
 
-    dt.columns('.select-filter').eq(0).each(function (colIdx: any) {
-        // Create the select list and search operation
-        var select = $('<select />')
-            .appendTo(
-            dt.column(colIdx).footer()
-            )
-            .on('change', function () {
-                dt
-                    .column(colIdx)
-                    .search($(this).val() as string)
-                    .draw();
-            });
-
-        // Get the search data for the first column and add to the select list
-        dt
-            .column(colIdx)
-            .cache('search')
-            .sort()
-            .unique()
-            .each(function (d: any) {
-                select.append($('<option value="' + d + '">' + d + '</option>'));
-            });
+// Get the search data for the first column and add to the select list
+dt
+    .column(0)
+    .cache('search')
+    .sort()
+    .unique()
+    .each((d: any) => {
+        const tag = `<option value="${d}">${d}</option>`;
+        select.append($(tag));
     });
 
-    var column_visible_get = column.visible();
-    var column_visible_set = column.visible(false);
-    column_visible_set = column.visible(false, true);
-    alert('Column index 0 is ' +
-        (dt.column(0).visible() === true ? 'visible' : 'not visible')
-    );
-    for (var i = 0; i < 4; i++) {
-        dt.column(i).visible(false, false);
-    }
-    dt.columns.adjust().draw(false); // adjust column sizing and redraw
+const column_data = column.data();
+alert('Column 4 sum: ' +
+    dt
+        .column(4)
+        .data()
+        .reduce((a: any, b: any) => {
+            return a + b;
+        })
+);
 
-    dt.columns().every(function () { });
-    dt.columns().every(function (colIdx, tableLoop, colLoop) { });
-
-    //#endregion "Methods-Column"
-
-    //#region "Methods-Row"
-
-    var row_1 = dt.row("selector");
-    var row_2 = dt.row("selector").child.hide();
-    var row_3 = dt.row("selector").child.isShown();
-    var row_4 = dt.row("selector").child.remove();
-    var row_5 = dt.row("selector").child.show();
-    var row_6 = dt.row("selector").child();
-    var row_7 = dt.row("selector").child(false);
-    var row_8 = dt.row("selector").child(false).hide();
-    var row_9 = dt.row("selector").child("data");
-    var row_10 = dt.row("selector").child("data").remove();
-    var row_11 = dt.row("selector").child("data", "css").show();
-    var row_12 = dt.row("selector").child.remove();
-    var row_13 = dt.row("selector").child.show();
-    var row_14 = dt.row.add({});
-    var row_15 = dt.row("selector").invalidate();
-    var row_16 = dt.row("selector").invalidate("auto");
-    var row_17 = dt.row("selector").data();
-    var row_18 = dt.row("selector").data({});
-    var row_19 = dt.row("selector").index();
-    var row_20 = dt.row("selector").node();
-    var row_21 = dt.row("selector").remove();
-    var row_22: string = dt.row("selector").id();
-    var row_23: string = dt.row("selector").id(false);
-
-    var rows_1 = dt.rows();
-    var rows_2 = dt.rows().remove();
-    var rows_3 = dt.rows("selector");
-    var rows_4 = dt.rows("selector").cache("type");
-    var rows_5 = dt.rows("selector").data();
-    var rows_6 = dt.rows("selector").data({});
-    var rows_7 = dt.rows("selector").indexes();
-    var rows_8 = dt.rows("selector").invalidate();
-    var rows_9 = dt.rows("selector").invalidate("auto");
-    var rows_10 = dt.rows("selector").indexes();
-    var rows_11 = dt.rows("selector").remove();
-    var rows_12 = dt.rows("selector").nodes();
-    var rows_13 = dt.rows.add([{}, {}]);
-    dt.rows().every(function () { });
-    dt.rows().every(function (rowIdx, tableLoop, rowLoop) { });
-    var rows_14: DataTables.Api = dt.rows("selector").ids();
-    var rows_15: DataTables.Api = dt.rows("selector").ids(false);
-
-    var table3 = $('#example').DataTable();
-    table3.row.add({
-        "name": "Tiger Nixon",
-        "position": "System Architect",
-        "salary": "$3,120",
-        "start_date": "2011/04/25",
-        "office": "Edinburgh",
-        "extn": "5421"
-    }).draw();
-
-    var table4 = $('#example').DataTable();
-    table4.row.add([{
-        "name": "Tiger Nixon",
-        "position": "System Architect",
-        "salary": "$3,120",
-        "start_date": "2011/04/25",
-        "office": "Edinburgh",
-        "extn": "5421"
-    }, {
-        "name": "Garrett Winters",
-        "position": "Director",
-        "salary": "$5,300",
-        "start_date": "2011/07/25",
-        "office": "Edinburgh",
-        "extn": "8422"
-    }])
-        .draw();
-
-    var pupil: any;
-    var table5 = $('#example').DataTable();
-    table5.rows.add([
-        pupil,
-        pupil,
-        pupil,
-    ])
-        .draw();
-    //.nodes()
-    //.to$()
-    //.addClass('new');
-
-    $('#example tbody').on('click', 'td.details-control', function () {
-        var tr = $(this).parents('tr');
-        var row = dt.row(tr);
-
-        if (row.child.isShown()) {
-            // This row is already open - close it
-            row.child.hide();
-            tr.removeClass('shown');
-        }
-        else {
-            // Open this row (the format() function would return the data to be shown)
-            row.child("").show();
-            tr.addClass('shown');
-        }
-    });
-
-    dt.row(':eq(0)').child([
-        'First child row',
-        'Second child row',
-        'Third child row'
-    ])
-        .show();
-
-    dt.rows().eq(0).each(function (rowIdx: any) {
-        dt
-            .row(rowIdx)
-            .child(
-            $(
-                '<tr>' +
-                '<td>' + rowIdx + '.1</td>' +
-                '<td>' + rowIdx + '.2</td>' +
-                '<td>' + rowIdx + '.3</td>' +
-                '<td>' + rowIdx + '.4</td>' +
-                '</tr>'
-            )
-            )
-            .show();
-    });
-
-    $('#example tbody').on('click', 'td.details-control', function () {
-        var tr = $(this).parents('tr');
-        var row = dt.row(tr);
-
-        if (row.child.isShown()) {
-            // This row is already open - close it
-            row.child.hide();
-            tr.removeClass('shown');
-        }
-        else {
-            // Open this row (the format() function would return the data to be shown)
-            row.child("").show();
-            tr.addClass('shown');
-        }
-    });
-
-    $('#example tbody').on('click', 'td.details-control', function () {
-        var tr = $(this).parents('tr');
-        var row = dt.row(tr);
-
-        if (row.child.isShown()) {
-            // This row is already open - remove it
-            row.child.remove();
-            tr.removeClass('shown');
-        }
-        else {
-            // Open this row (the format() function would return the data to be shown)
-            row.child("").show();
-            tr.addClass('shown');
-        }
-    });
-
-    //#endregion "Methods-Row"
-
-    //#region "Methods-Static"
-
-    // Variable is a stand-in for $.fn.dataTable. See extension of JQueryStatic at the top of index.d.ts.
-    var staticFn: DataTables.StaticFunctions;
-
-    // With boolean parameter type, always returns DataTables.DataTable[].
-    var static_1: DataTables.Api[] = <DataTables.Api[]>staticFn.tables(true);
-    // With object parameter type, returns DataTables.DataTable[] when "api" property is false.
-    static_1 = <DataTables.Api[]>staticFn.tables({ "visible": true, "api": false });
-    // With object parameter type, returns DataTables.DataTable when "api" property is true.
-    var static_2: DataTables.Api = <DataTables.Api>staticFn.tables({ "visible": true, "api": true });
-
-    //#endregion "Methods-Static"
-
-    //#region "Methods-Table"
-
-    var tables = dt.tables();
-    tables = dt.tables("selector");
-
-    var tables_body = tables.body();
-    var tables_containers = tables.containers();
-    var tables_footer = tables.footer();
-    var tables_header = tables.header();
-    var tables_nodes = tables.nodes();
-
-    var table = dt.table("selector");
-
-    var table_body = table.body();
-    var table_container = table.container();
-    var table_footer = table.footer();
-    var table_header = table.header();
-    var table_node = table.node();
-
-    //#endregion "Methods-Table"
-
-    //#region "Methods-Util"
-
-    var util_1: boolean = dt.any();
-    var util_2: number = dt.count();
-
-    //#endregion "Methods-Util"
+const column_dataSrc = column.dataSrc();
+$('#example').on('click', 'tbody td', () => {
+    const idx = dt.cell(this).index().column;
+    alert('Data source: ' + dt.column(idx).dataSrc());
 });
+
+const column_footer = column.footer();
+const column_p = dt.column(0);
+// $(column.footer()).html(
+//    column_p
+//        .data()
+//        .reduce(function(a, b) {
+//        return a + b;
+//    })
+//    );
+
+const column_header = column.header();
+$('#example tbody').on('click', 'td', function() {
+    const idx = dt.cell(this).index().column;
+    const title = dt.column(idx).header();
+
+    alert('Column title clicked on: ' + $(title).html());
+});
+
+let column_index = column.index();
+column_index = column.index("visibile");
+dt.column(0).visible(false);
+
+const idx = dt.column(1).index('visible');
+alert(idx); // will show 0
+
+dt.column('0:visible').order('asc');
+
+const column_nodes = column.nodes();
+dt.column(-1)
+    .nodes();
+// .to$()      // Convert to a jQuery object
+// .addClass('ready');
+
+const column_search_get = column.search();
+let column_search_set = column.search("string");
+column_search_set = column.search("string", true);
+column_search_set = column.search("string", true, false);
+column_search_set = column.search("string", true, false, true);
+$('#column3_search').on('keyup', () => {
+    dt
+        .columns(3)
+        .search((this as HTMLInputElement).value)
+        .draw();
+});
+
+dt.columns('.select-filter').eq(0).each((colIdx: any) => {
+    // Create the select list and search operation
+    const select = $('<select />')
+        .appendTo(
+        dt.column(colIdx).footer()
+        )
+        .on('change', function() {
+            dt
+                .column(colIdx)
+                .search($(this).val() as string)
+                .draw();
+        });
+
+    // Get the search data for the first column and add to the select list
+    dt
+        .column(colIdx)
+        .cache('search')
+        .sort()
+        .unique()
+        .each((d: any) => {
+            const tag = `<option value="${d}">${d}</option>`;
+            select.append($(tag));
+        });
+});
+
+const column_visible_get = column.visible();
+let column_visible_set = column.visible(false);
+column_visible_set = column.visible(false, true);
+alert('Column index 0 is ' +
+    (dt.column(0).visible() ? 'visible' : 'not visible')
+);
+for (let i = 0; i < 4; i++) {
+    dt.column(i).visible(false, false);
+}
+dt.columns.adjust().draw(false); // adjust column sizing and redraw
+
+dt.columns().every(() => { });
+dt.columns().every((colIdx, tableLoop, colLoop) => { });
+
+$('#example').on('column-visibility.dt', (e: object, settings: DataTables.Settings, column: number, state: boolean, recalc: boolean | undefined) => {
+    const widthRecalced = (recalc || recalc === undefined);
+    console.log(`Column ${column} has changed to ${(state ? 'visible' : 'hidden')} and width ${(widthRecalced) ? 'was' : 'was not'} recalculated.`);
+});
+
+//#endregion "Methods-Column"
+
+//#region "Methods-Row"
+
+const row_1 = dt.row("selector");
+const row_2 = dt.row("selector").child.hide();
+const row_3 = dt.row("selector").child.isShown();
+const row_4 = dt.row("selector").child.remove();
+const row_5 = dt.row("selector").child.show();
+const row_6 = dt.row("selector").child();
+const row_7 = dt.row("selector").child(false);
+const row_8 = dt.row("selector").child(false).hide();
+const row_9 = dt.row("selector").child("data");
+const row_10 = dt.row("selector").child("data").remove();
+const row_11 = dt.row("selector").child("data", "css").show();
+const row_12 = dt.row("selector").child.remove();
+const row_13 = dt.row("selector").child.show();
+const row_14 = dt.row.add({});
+const row_15 = dt.row("selector").invalidate();
+const row_16 = dt.row("selector").invalidate("auto");
+const row_17 = dt.row("selector").data();
+const row_18 = dt.row("selector").data({});
+const row_19 = dt.row("selector").index();
+const row_20 = dt.row("selector").node();
+const row_21 = dt.row("selector").remove();
+const row_22: string = dt.row("selector").id();
+const row_23: string = dt.row("selector").id(false);
+
+const rows_1 = dt.rows();
+const rows_2 = dt.rows().remove();
+const rows_3 = dt.rows("selector");
+const rows_4 = dt.rows("selector").cache("type");
+const rows_5 = dt.rows("selector").data();
+const rows_6 = dt.rows("selector").data({});
+const rows_7 = dt.rows("selector").indexes();
+const rows_8 = dt.rows("selector").invalidate();
+const rows_9 = dt.rows("selector").invalidate("auto");
+const rows_10 = dt.rows("selector").indexes();
+const rows_11 = dt.rows("selector").remove();
+const rows_12 = dt.rows("selector").nodes();
+const rows_13 = dt.rows.add([{}, {}]);
+dt.rows().every(() => { });
+dt.rows().every((rowIdx, tableLoop, rowLoop) => { });
+const rows_14: DataTables.Api = dt.rows("selector").ids();
+const rows_15: DataTables.Api = dt.rows("selector").ids(false);
+
+const table3 = $('#example').DataTable();
+table3.row.add({
+    name: "Tiger Nixon",
+    position: "System Architect",
+    salary: "$3,120",
+    start_date: "2011/04/25",
+    office: "Edinburgh",
+    extn: "5421"
+}).draw();
+
+const table4 = $('#example').DataTable();
+table4.row.add([{
+    name: "Tiger Nixon",
+    position: "System Architect",
+    salary: "$3,120",
+    start_date: "2011/04/25",
+    office: "Edinburgh",
+    extn: "5421"
+}, {
+    name: "Garrett Winters",
+    position: "Director",
+    salary: "$5,300",
+    start_date: "2011/07/25",
+    office: "Edinburgh",
+    extn: "8422"
+}])
+    .draw();
+
+let pupil: any;
+const table5 = $('#example').DataTable();
+table5.rows.add([
+    pupil,
+    pupil,
+    pupil,
+])
+    .draw();
+// .nodes()
+// .to$()
+// .addClass('new');
+
+$('#example tbody').on('click', 'td.details-control', () => {
+    const tr = $(this).parents('tr');
+    const row = dt.row(tr);
+
+    if (row.child.isShown()) {
+        // This row is already open - close it
+        row.child.hide();
+        tr.removeClass('shown');
+    } else {
+        // Open this row (the format() function would return the data to be shown)
+        row.child("").show();
+        tr.addClass('shown');
+    }
+});
+
+dt.row(':eq(0)').child([
+    'First child row',
+    'Second child row',
+    'Third child row'
+])
+    .show();
+
+dt.rows().eq(0).each((rowIdx: any) => {
+    const tag = `<tr><td>${rowIdx}.1</td><td>${rowIdx}.2</td><td>${rowIdx}.3</td><td>${rowIdx}.4</td></tr>`;
+    dt
+        .row(rowIdx)
+        .child(
+            $(tag)
+        )
+        .show();
+});
+
+$('#example tbody').on('click', 'td.details-control', () => {
+    const tr = $(this).parents('tr');
+    const row = dt.row(tr);
+
+    if (row.child.isShown()) {
+        // This row is already open - close it
+        row.child.hide();
+        tr.removeClass('shown');
+    } else {
+        // Open this row (the format() function would return the data to be shown)
+        row.child("").show();
+        tr.addClass('shown');
+    }
+});
+
+$('#example tbody').on('click', 'td.details-control', () => {
+    const tr = $(this).parents('tr');
+    const row = dt.row(tr);
+
+    if (row.child.isShown()) {
+        // This row is already open - remove it
+        row.child.remove();
+        tr.removeClass('shown');
+    } else {
+        // Open this row (the format() function would return the data to be shown)
+        row.child("").show();
+        tr.addClass('shown');
+    }
+});
+
+//#endregion "Methods-Row"
+
+//#region "Methods-Static"
+
+// Variable is a stand-in for $.fn.dataTable. See extension of JQueryStatic at the top of index.d.ts.
+let staticFn: DataTables.StaticFunctions;
+
+// With boolean parameter type, always returns DataTables.DataTable[].
+let static_1: DataTables.Api[] = <DataTables.Api[]> staticFn.tables(true);
+
+// With object parameter type, returns DataTables.DataTable[] when "api" property is false.
+static_1 = <DataTables.Api[]> staticFn.tables({ visible: true, api: false });
+
+// With object parameter type, returns DataTables.DataTable when "api" property is true.
+const static_2: DataTables.Api = <DataTables.Api> staticFn.tables({ visible: true, api: true });
+
+const static_3: DataTables.Api = $("selector").DataTable();
+const static_4: DataTables.JQueryDataTables = $("selector").dataTable();
+const static_5: DataTables.Api = $("selector").dataTable().api();
+
+const static_6 = new $.fn.dataTable.Api("selector");
+
+const version: boolean = $.fn.dataTable.versionCheck("1.10.0");
+const isDataTable: boolean = $.fn.dataTable.isDataTable("selector");
+const escapeRegex: string = $.fn.dataTable.util.escapeRegex("");
+
+const throttle_1 = $.fn.dataTable.util.throttle((data) => {
+    table.search(data).draw();
+});
+
+const throttle_2 = $.fn.dataTable.util.throttle((data) => {
+    table.search(data).draw();
+}, 100);
+
+const defaults_1 = $.fn.dataTable.defaults;
+
+//#endregion "Methods-Static"
+
+//#region "Default Overwrite"
+
+/* Default table settings */
+const defaults_2: DataTables.Settings = {
+    dom: "<'row'<'col-lg-5'f><'col-lg-7'Bl>>"
+    + "<'row'<'col-lg-12't>>"
+    + "<'row'<'col-lg-5'i><'col-lg-7'p>>Ox",
+    paging: true,
+    pagingType: "bootstrap",
+    stateSave: true,
+    language: {
+        infoEmpty: "Empty"
+    }
+};
+
+/* Default class names */
+const default_classes: DataTables.ExtClassesSettings = {
+    sWrapper: "dataTables_wrapper dt-bootstrap4",
+    sFilterInput: "form-control",
+    sLength: "dataTables_length",
+    sLengthSelect: "form-control custom-select",
+    sProcessing: "dataTables_processing panel panel-default",
+    sPageButton: "paginate_button page-item",
+};
+
+//#endregion "Default Overwrite"
+
+//#region "Methods-Table"
+
+let tables = dt.tables();
+tables = dt.tables("selector");
+
+const tables_body = tables.body();
+const tables_containers = tables.containers();
+const tables_footer = tables.footer();
+const tables_header = tables.header();
+const tables_nodes = tables.nodes();
+
+const table = dt.table("selector");
+
+const table_body = table.body();
+const table_container = table.container();
+const table_footer = table.footer();
+const table_header = table.header();
+const table_node = table.node();
+
+//#endregion "Methods-Table"
+
+//#region "Methods-Util"
+
+const util_1: boolean = dt.any();
+const util_2: number = dt.count();
+
+//#endregion "Methods-Util"
diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index 85f6d05857..cdddc98789 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1,91 +1,104 @@
-// Type definitions for JQuery DataTables 1.10.9
+// Type definitions for JQuery DataTables 1.10
 // Project: http://www.datatables.net
-// Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>, Omid Rad <https://github.com/omidkrad>, Armin Sander <https://github.com/pragmatrix>, Denise Mauldin <https://github.com/denisemauldin>
+// Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection>
+//                 Omid Rad <https://github.com/omidkrad>
+//                 Armin Sander <https://github.com/pragmatrix>
+//                 Craig Boland <https://github.com/CNBoland>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 // missing:
-// - Static methods that are defined in JQueryStatic.fn are not typed.
-// - Plugin and extension definitions are not typed.
 // - Some return types are not fully working
 
 /// <reference types="jquery" />
 
 interface JQuery {
     DataTable(opts?: DataTables.Settings): DataTables.Api;
+    dataTable: DataTables.StaticFunctions;
 }
 
-//TODO: Wrong, as jquery.d.ts has no interface for fn
-//interface JQueryStatic {
-//    dataTable: DataTables.StaticFunctions;
-//}
-
 declare namespace DataTables {
-    export interface Api extends CoreMethods {
+    interface JQueryDataTables extends JQuery {
         /**
-        * Get the data for the whole table.
-        */
+         * Returns DataTables API instance
+         * Usage:
+         * $( selector ).dataTable().api();
+         */
+        api(): Api;
+    }
+
+    interface Api extends CoreMethods {
+        /**
+         * Returns DataTables API instance
+         *
+         * @param table Selector string for table
+         */
+        (selector: string | Node | Node[] | JQuery): Api;
+
+        /**
+         * Get the data for the whole table.
+         */
         data(): Api;
 
         /**
-        * Order Methods / Object
-        */
+         * Order Methods / object
+         */
         order: OrderMethods;
 
         //#region "Cell/Cells"
 
         /**
-        * Select the cell found by a cell selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cell(cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellMethods;
+         * Select the cell found by a cell selector
+         *
+         * @param cellSelector Cell selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering
+         */
+        cell(cellSelector: any, modifier?: ObjectSelectorModifier): CellMethods;
 
         /**
-        * Select the cell found by a cell selector
-        *
-        * @param rowSelector Row selector.
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cell(rowSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellMethods;
+         * Select the cell found by a cell selector
+         *
+         * @param rowSelector Row selector.
+         * @param cellSelector Cell selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering
+         */
+        cell(rowSelector: any, cellSelector: any, modifier?: ObjectSelectorModifier): CellMethods;
 
         /**
-        * Select all cells
-        *
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
+         * Select all cells
+         *
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering
+         */
         cells(modifier?: ObjectSelectorModifier): CellsMethods;
 
         /**
-        * Select cells found by a cell selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cells(cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellsMethods;
+         * Select cells found by a cell selector
+         *
+         * @param cellSelector Cell selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering
+         */
+        cells(cellSelector: any, modifier?: ObjectSelectorModifier): CellsMethods;
 
         /**
-        * Select cells found by both row and column selectors
-        *
-        * @param rowSelector Row selector.
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cells(rowSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellsMethods;
+         * Select cells found by both row and column selectors
+         *
+         * @param rowSelector Row selector.
+         * @param cellSelector Cell selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering
+         */
+        cells(rowSelector: any, cellSelector: any, modifier?: ObjectSelectorModifier): CellsMethods;
         //#endregion "Cell/Cells"
 
         //#region "Column/Columns"
 
         /**
-        * Column Methods / Object
-        */
+         * Column Methods / object
+         */
         column: ColumnMethodsModel;
 
         /**
-        * Columns Methods / Object
-        */
+         * Columns Methods / object
+         */
         columns: ColumnsMethodsModel;
 
         //#endregion "Column/Columns"
@@ -93,67 +106,62 @@ declare namespace DataTables {
         //#region "Row/Rows"
 
         /**
-        * Row Methode / Object
-        */
-        row: RowMethodsModel
+         * Row Methode / object
+         */
+        row: RowMethodsModel;
 
         /**
-        * Rows Methods / Object
-        */
-        rows: RowsMethodsModel
+         * Rows Methods / object
+         */
+        rows: RowsMethodsModel;
 
         //#endregion "Row/Rows"
 
         //#region "Table/Tables"
 
         /**
-        * Select a table based on a selector from the API's context
-        *
-        * @param tableSelector Table selector.
-        */
-        table(tableSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[]): TableMethods;
+         * Select a table based on a selector from the API's context
+         *
+         * @param tableSelector Table selector.
+         */
+        table(tableSelector: any): TableMethods;
 
         /**
-        * Select all tables
-        */
-        tables(): TablesMethods;
-
-        /**
-        * Select tables based on the given selector
-        *
-        * @param tableSelector Table selector.
-        */
-        tables(tableSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[]): TablesMethods;
+         * Select tables based on the given selector
+         *
+         * @param tableSelector Table selector.
+         */
+        tables(tableSelector?: any): TablesMethods;
 
         //#endregion "Table/Tables"
     }
 
-    export interface DataTables extends CoreMethods {
+    interface DataTables extends CoreMethods {
         [index: number]: Api;
     }
 
     interface ObjectSelectorModifier {
         /**
-        * The order modifier provides the ability to control which order the rows are processed in.
-        * Values: 'current', 'applied', 'index',  'original'
-        */
+         * The order modifier provides the ability to control which order the rows are processed in.
+         * Values: 'current', 'applied', 'index',  'original'
+         */
         order?: string;
 
         /**
-        * The search modifier provides the ability to govern which rows are used by the selector using the search options that are applied to the table.
-        * Values: 'none', 'applied', 'removed'
-        */
+         * The search modifier provides the ability to govern which rows are used by the selector using the search options that are applied to the table.
+         * Values: 'none', 'applied', 'removed'
+         */
         search?: string;
 
         /**
-        * The searchPlaceholder modifier provides the ability to provide informational text for an input control when it has no value.
-        */
+         * The searchPlaceholder modifier provides the ability to provide informational text for an input control when it has no value.
+         */
         searchPlaceholder?: string;
 
         /**
-        * The page modifier allows you to control if the selector should consider all data in the table, regardless of paging, or if only the rows in the currently disabled page should be used.
-        * Values: 'all', 'current'
-        */
+         * The page modifier allows you to control if the selector should consider all data in the table, regardless of paging, or if only the rows in the currently disabled page should be used.
+         * Values: 'all', 'current'
+         */
         page?: string;
     }
 
@@ -163,105 +171,102 @@ declare namespace DataTables {
 
     interface CoreMethods extends UtilityMethods {
         /**
-        * Get jquery object
-        */
+         * Get jquery object
+         */
         $(selector: string | Node | Node[] | JQuery, modifier?: ObjectSelectorModifier): JQuery;
 
-        ///// Almost identical to $ in operation, but in this case returns the data for the matched rows.
-        //_(selector: string | Node | Node[] | JQuery, modifier?: ObjectSelectorModifier): JQuery;
-
         /**
-        * Ajax Methods
-        */
+         * Ajax Methods
+         */
         ajax: AjaxMethodModel;
 
         /**
-        * Clear the table of all data.
-        */
+         * Clear the table of all data.
+         */
         clear(): Api;
 
         /**
-        * Destroy the DataTables in the current context.
-        *
-        * @param remove Completely remove the table from the DOM (true) or leave it in the DOM in its original plain un-enhanced HTML state (default, false).
-        */
+         * Destroy the DataTables in the current context.
+         *
+         * @param remove Completely remove the table from the DOM (true) or leave it in the DOM in its original plain un-enhanced HTML state (default, false).
+         */
         destroy(remove?: boolean): Api;
 
         /**
-        * Redraw the DataTables in the current context, optionally updating ordering, searching and paging as required.
-        *
-        * @param paging This parameter is used to determine what kind of draw DataTables will perform.
-        */
+         * Redraw the DataTables in the current context, optionally updating ordering, searching and paging as required.
+         *
+         * @param paging This parameter is used to determine what kind of draw DataTables will perform.
+         */
         draw(paging?: boolean | string): Api;
 
         /*
-        * Look up a language token that was defined in the DataTables' language initialisation object.
-        *
-        * @param token The language token to lookup from the language object.
-        * @param def The default value to use if the DataTables initialisation has not specified a value.
-        * @param numeric If handling numeric output, the number to be presented should be given in this parameter. If not numeric operator is required (for example button label text) this parameter is not required.
-        *
-        * @returns Resulting internationalised string.
-        */
-        i18n(token: string, def: any | string, numeric?: number): string;
+         * Look up a language token that was defined in the DataTables' language initialisation object.
+         *
+         * @param token The language token to lookup from the language object.
+         * @param def The default value to use if the DataTables initialisation has not specified a value.
+         * @param numeric If handling numeric output, the number to be presented should be given in this parameter.
+         *
+         * @returns Resulting internationalised string.
+         */
+        i18n(token: string, def: any, numeric?: number): string;
 
         /*
-        * Get the initialisation options used for the table. Since: DataTables 1.10.6
-        */
+         * Get the initialisation options used for the table. Since: DataTables 1.10.6
+         */
         init(): Settings;
 
         /**
-        * Table events removal.
-        *
-        * @param event Event name to remove.
-        * @param callback Specific callback function to remove if you want to unbind a single event listener.
-        */
-        off(event: string, callback?: Function): Api;
+         * Table events removal.
+         *
+         * @param event Event name to remove.
+         * @param callback Specific callback function to remove if you want to unbind a single event listener.
+         */
+        off(event: string, callback?: ((e: Event, settings: Settings, json: any) => void)): Api;
 
         /**
-        * Table events listener.
-        *
-        * @param event Event to listen for.
-        * @param callback Specific callback function to remove if you want to unbind a single event listener.
-        */
-        on(event: string, callback: Function): Api;
+         * Table events listener.
+         *
+         * @param event Event to listen for.
+         * @param callback Specific callback function to remove if you want to unbind a single event listener.
+         */
+        on(event: string, callback: ((e: Event, settings: Settings, json: any) => void)): Api;
 
         /**
-        * Listen for a table event once and then remove the listener.
-        *
-        * @param event Event to listen for.
-        * @param callback Specific callback function to remove if you want to unbind a single event listener.
-        */
-        one(event: string, callback: Function): Api;
+         * Listen for a table event once and then remove the listener.
+         *
+         * @param event Event to listen for.
+         * @param callback Specific callback function to remove if you want to unbind a single event listener.
+         */
+        one(event: string, callback: ((e: Event, settings: Settings, json: any) => void)): Api;
 
         /**
-        * Page Methods / Object
-        */
+         * Page Methods / object
+         */
         page: PageMethods;
 
         /**
-        * Get current search
-        */
+         * Get current search
+         */
         search(): string;
 
         /**
-        * Search for data in the table.
-        *
-        * @param input Search string to apply to the table.
-        * @param regex Treat as a regular expression (true) or not (default, false).
-        * @param smart Perform smart search.
-        * @param caseInsen Do case-insensitive matching (default, true) or not (false).
-        */
+         * Search for data in the table.
+         *
+         * @param input Search string to apply to the table.
+         * @param regex Treat as a regular expression (true) or not (default, false).
+         * @param smart Perform smart search.
+         * @param caseInsen Do case-insensitive matching (default, true) or not (false).
+         */
         search(input: string, regex?: boolean, smart?: boolean, caseInsen?: boolean): Api;
 
         /**
-        * Obtain the table's settings object
-        */
+         * Obtain the table's settings object
+         */
         settings(): Api;
 
         /**
-        * Page Methods / Object
-        */
+         * Page Methods / object
+         */
         state: StateMethods;
     }
 
@@ -269,43 +274,43 @@ declare namespace DataTables {
 
     interface AjaxMethods extends Api {
         /**
-        * Reload the table data from the Ajax data source.
-        *
-        * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
-        * @param resetPaging Reset (default action or true) or hold the current paging position (false).
-        */
-        load(callback?: Function, resetPaging?: boolean): Api;
+         * Reload the table data from the Ajax data source.
+         *
+         * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
+         * @param resetPaging Reset (default action or true) or hold the current paging position (false).
+         */
+        load(callback?: ((json: any) => void), resetPaging?: boolean): Api;
     }
 
     interface AjaxMethodModel {
         /**
-        * Get the latest JSON data obtained from the last Ajax request DataTables made
-        */
-        json(): Object;
+         * Get the latest JSON data obtained from the last Ajax request DataTables made
+         */
+        json(): object;
 
         /**
-        * Get the data submitted by DataTables to the server in the last Ajax request
-        */
-        params(): Object;
+         * Get the data submitted by DataTables to the server in the last Ajax request
+         */
+        params(): object;
 
         /**
-        * Reload the table data from the Ajax data source.
-        *
-        * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
-        * @param resetPaging Reset (default action or true) or hold the current paging position (false).
-        */
-        reload(callback?: Function, resetPaging?: boolean): Api;
+         * Reload the table data from the Ajax data source.
+         *
+         * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
+         * @param resetPaging Reset (default action or true) or hold the current paging position (false).
+         */
+        reload(callback?: ((json: any) => void), resetPaging?: boolean): Api;
 
         /**
-        * Reload the table data from the Ajax data source
-        */
+         * Reload the table data from the Ajax data source
+         */
         url(): string;
 
         /**
-        * Reload the table data from the Ajax data source
-        *
-        * @param url URL to set to be the Ajax data source for the table.
-        */
+         * Reload the table data from the Ajax data source
+         *
+         * @param url URL to set to be the Ajax data source for the table.
+         */
         url(url: string): AjaxMethods;
     }
 
@@ -315,27 +320,36 @@ declare namespace DataTables {
 
     interface OrderMethods {
         /**
-        * Get the ordering applied to the table.
-        */
-        (): (string | number)[][];
+         * Get the ordering applied to the table.
+         */
+        (): Array<Array<(string | number)>>;
 
         /**
-        * Set the ordering applied to the table.
-        *
-        * @param order Order Model
-        */
-        (order?: (string | number)[]): Api;
-        (order?: (string | number)[][]): Api;
-        (order: (string | number)[], ...args: any[]): Api;
+         * Set the ordering applied to the table.
+         *
+         * @param order Order Model
+         */
+        (order?: Array<(string | number)> | Array<Array<(string | number)>>): Api;
+        (order: Array<(string | number)>, ...args: any[]): Api;
 
         /**
-        * Add an ordering listener to an element, for a given column.
-        *
-        * @param node Selector
-        * @param column Column index
-        * @param callback Callback function
-        */
-        listener(node: string | Node | JQuery, column: number, callback: Function): Api;
+         * Get the fixed ordering that is applied to the table. If there is more than one table in the API's context,
+         * the ordering of the first table will be returned only (use table() if you require the ordering of a different table in the API's context).
+         */
+        fixed(): ObjectOrderFixed;
+        /**
+         * Set the table's fixed ordering. Note this doesn't actually perform the order, but rather queues it up - use draw() to perform the ordering.
+         */
+        fixed(order: ObjectOrderFixed): Api;
+
+        /**
+         * Add an ordering listener to an element, for a given column.
+         *
+         * @param node Selector
+         * @param column Column index
+         * @param callback Callback function
+         */
+        listener(node: string | Node | JQuery, column: number, callback: (() => void)): Api;
     }
     //#endregion "order-methods"
 
@@ -343,32 +357,32 @@ declare namespace DataTables {
 
     interface PageMethods {
         /**
-        * Get the current page of the table.
-        */
+         * Get the current page of the table.
+         */
         (): number;
 
         /**
-        * Set the current page of the table.
-        *
-        * @param page Index or 'first', 'next', 'previous', 'last'
-        */
+         * Set the current page of the table.
+         *
+         * @param page Index or 'first', 'next', 'previous', 'last'
+         */
         (page: number | string): Api;
 
         /**
-        * Get paging information about the table
-        */
+         * Get paging information about the table
+         */
         info(): PageMethodeModelInfoReturn;
 
         /**
-        * Get the table's page length.
-        */
+         * Get the table's page length.
+         */
         len(): number;
 
         /**
-        * Set the table's page length.
-        *
-        * @param length Page length to set. use -1 to show all records.
-        */
+         * Set the table's page length.
+         *
+         * @param length Page length to set. use -1 to show all records.
+         */
         len(length: number): Api;
     }
 
@@ -380,7 +394,7 @@ declare namespace DataTables {
         length: number;
         recordsTotal: number;
         recordsDisplay: number;
-        serverSide: boolean
+        serverSide: boolean;
     }
 
     //#endregion "page-methods"
@@ -389,23 +403,23 @@ declare namespace DataTables {
 
     interface StateMethods {
         /**
-        * Get the last saved state of the table
-        */
+         * Get the last saved state of the table
+         */
         (): StateReturnModel;
 
         /**
-        * Clear the saved state of the table.
-        */
+         * Clear the saved state of the table.
+         */
         clear(): Api;
 
         /**
-        * Get the table state that was loaded during initialisation.
-        */
+         * Get the table state that was loaded during initialisation.
+         */
         loaded(): StateReturnModel;
 
         /**
-        * Trigger a state save.
-        */
+         * Trigger a state save.
+         */
         save(): Api;
     }
 
@@ -413,7 +427,7 @@ declare namespace DataTables {
         time: number;
         start: number;
         length: number;
-        order: (string | number)[][];
+        order: Array<Array<(string | number)>>;
         search: SearchSettings;
         columns: StateReturnModelColumns[];
     }
@@ -431,179 +445,179 @@ declare namespace DataTables {
 
     interface UtilityMethods {
         /*
-        * Get a boolean value to indicate if there are any entries in the API instance's result set (i.e. any data, selected rows, etc).
-        */
+         * Get a boolean value to indicate if there are any entries in the API instance's result set (i.e. any data, selected rows, etc).
+         */
         any(): boolean;
 
         /**
-        * Concatenate two or more API instances together
-        *
-        * @param a API instance to concatenate to the initial instance.
-        * @param b Additional API instance(s) to concatenate to the initial instance.
-        */
-        concat(a: Object, ...b: Object[]): Api;
+         * Concatenate two or more API instances together
+         *
+         * @param a API instance to concatenate to the initial instance.
+         * @param b Additional API instance(s) to concatenate to the initial instance.
+         */
+        concat(a: object, ...b: object[]): Api;
 
         /**
-        * Get the number of entries in an API instance's result set, regardless of multi-table grouping (e.g. any data, selected rows, etc). Since: 1.10.8
-        */
+         * Get the number of entries in an API instance's result set, regardless of multi-table grouping (e.g. any data, selected rows, etc). Since: 1.10.8
+         */
         count(): number;
 
         /**
-        * Iterate over the contents of the API result set.
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters
-        */
-        each(fn: Function): Api;
+         * Iterate over the contents of the API result set.
+         *
+         * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters
+         */
+        each(fn: ((value: any, index: number, dt: Api) => void)): Api;
 
         /**
-        * Reduce an Api instance to a single context and result set.
-        *
-        * @param idx Index to select
-        */
+         * Reduce an Api instance to a single context and result set.
+         *
+         * @param idx Index to select
+         */
         eq(idx: number): Api;
 
         /**
-        * Iterate over the result set of an API instance and test each item, creating a new instance from those items which pass.
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
-        */
-        filter(fn: Function): Api;
+         * Iterate over the result set of an API instance and test each item, creating a new instance from those items which pass.
+         *
+         * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
+         */
+        filter(fn: ((value: any, index: number, dt: Api) => boolean)): Api;
 
         /**
-        * Flatten a 2D array structured API instance to a 1D array structure.
-        */
+         * Flatten a 2D array structured API instance to a 1D array structure.
+         */
         flatten(): Api;
 
         /**
-        * Find the first instance of a value in the API instance's result set.
-        *
-        * @param value Value to find in the instance's result set.
-        */
+         * Find the first instance of a value in the API instance's result set.
+         *
+         * @param value Value to find in the instance's result set.
+         */
         indexOf(value: any): number;
 
         /**
-        * Join the elements in the result set into a string.
-        *
-        * @param separator The string that will be used to separate each element of the result set.
-        */
+         * Join the elements in the result set into a string.
+         *
+         * @param separator The string that will be used to separate each element of the result set.
+         */
         join(separator: string): string;
 
         /**
-        * Find the last instance of a value in the API instance's result set.
-        *
-        * @param value Value to find in the instance's result set.
-        */
+         * Find the last instance of a value in the API instance's result set.
+         *
+         * @param value Value to find in the instance's result set.
+         */
         lastIndexOf(value: any): number;
 
         /**
-        * Number of elements in an API instance's result set.
-        */
+         * Number of elements in an API instance's result set.
+         */
         length: number;
 
         /**
-        * Iterate over the result set of an API instance, creating a new API instance from the values returned by the callback.
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
-        */
-        map(fn: Function): Api;
+         * Iterate over the result set of an API instance, creating a new API instance from the values returned by the callback.
+         *
+         * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
+         */
+        map(fn: ((value: any, index: number, dt: Api) => any)): Api;
 
         /**
-        * Iterate over the result set of an API instance, creating a new API instance from the values retrieved from the original elements.
-        *
-        * @param property Object property name to use from the element in the original result set for the new result set.
-        */
+         * Iterate over the result set of an API instance, creating a new API instance from the values retrieved from the original elements.
+         *
+         * @param property object property name to use from the element in the original result set for the new result set.
+         */
         pluck(property: number | string): Api;
 
         /**
-        * Remove the last item from an API instance's result set.
-        */
+         * Remove the last item from an API instance's result set.
+         */
         pop(): any;
 
         /**
-        * Add one or more items to the end of an API instance's result set.
-        *
-        * @param value_1 Item to add to the API instance's result set.
-        */
-        push(value_1: any | any[], ...value_2: any[]): number;
+         * Add one or more items to the end of an API instance's result set.
+         *
+         * @param value_1 Item to add to the API instance's result set.
+         */
+        push(value_1: any, ...value_2: any[]): number;
 
         /**
-        * Apply a callback function against and accumulator and each element in the Api's result set (left-to-right).
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
-        * @param initialValue Value to use as the first argument of the first call to the fn callback.
-        */
-        reduce(fn: Function, initialValue?: any): any;
+         * Apply a callback function against and accumulator and each element in the Api's result set (left-to-right).
+         *
+         * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
+         * @param initialValue Value to use as the first argument of the first call to the fn callback.
+         */
+        reduce(fn: ((current: number, value: any, index: number, dt: Api) => number), initialValue?: any): any;
 
         /**
-        * Apply a callback function against and accumulator and each element in the Api's result set (right-to-left).
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
-        * @param initialValue Value to use as the first argument of the first call to the fn callback.
-        */
-        reduceRight(fn: Function, initialValue?: any): any;
+         * Apply a callback function against and accumulator and each element in the Api's result set (right-to-left).
+         *
+         * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
+         * @param initialValue Value to use as the first argument of the first call to the fn callback.
+         */
+        reduceRight(fn: ((current: number, value: any, index: number, dt: Api) => number), initialValue?: any): any;
 
         /**
-        * Reverse the result set of the API instance and return the original array.
-        */
+         * Reverse the result set of the API instance and return the original array.
+         */
         reverse(): Api;
 
         /**
-        * Remove the first item from an API instance's result set.
-        */
+         * Remove the first item from an API instance's result set.
+         */
         shift(): any;
 
         /**
-        * Sort the elements of the API instance's result set.
-        *
-        * @param fn This is a standard Javascript sort comparison function. It accepts two parameters.
-        */
-        sort(fn?: Function): Api;
+         * Sort the elements of the API instance's result set.
+         *
+         * @param fn This is a standard Javascript sort comparison function. It accepts two parameters.
+         */
+        sort(fn?: ((value1: any, value2: any) => number)): Api;
 
         /**
-        * Modify the contents of an Api instance's result set, adding or removing items from it as required.
-        *
-        * @param index Index at which to start modifying the Api instance's result set.
-        * @param howMany Number of elements to remove from the result set.
-        * @param value_1 Item to add to the result set at the index specified by the first parameter.
-        */
-        splice(index: number, howMany: number, value_1?: any | any[], ...value_2: any[]): any[];
+         * Modify the contents of an Api instance's result set, adding or removing items from it as required.
+         *
+         * @param index Index at which to start modifying the Api instance's result set.
+         * @param howMany Number of elements to remove from the result set.
+         * @param value_1 Item to add to the result set at the index specified by the first parameter.
+         */
+        splice(index: number, howMany: number, value_1?: any, ...value_2: any[]): any[];
 
         /**
-        * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
-        */
+         * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
+         */
         to$(): JQuery;
 
         /**
-        * Create a native Javascript array object from an API instance.
-        */
+         * Create a native Javascript array object from an API instance.
+         */
         toArray(): any[];
 
         /**
-        * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
-        */
+         * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
+         */
         toJQuery(): JQuery;
 
         /**
-        * Create a new API instance containing only the unique items from a the elements in an instance's result set.
-        */
+         * Create a new API instance containing only the unique items from a the elements in an instance's result set.
+         */
         unique(): Api;
 
         /**
-        * Add one or more items to the start of an API instance's result set.
-        *
-        * @param value_1 Item to add to the API instance's result set.
-        */
-        unshift(value_1: any | any[], ...value_2: any[]): number;
+         * Add one or more items to the start of an API instance's result set.
+         *
+         * @param value_1 Item to add to the API instance's result set.
+         */
+        unshift(value_1: any, ...value_2: any[]): number;
     }
 
     //#endregion "util-methods"
 
     interface CommonSubMethods {
         /**
-        * Get the DataTables cached data for the selected cell
-        *
-        * @param t Specify which cache the data should be read from. Can take one of two values: search or order
-        */
+         * Get the DataTables cached data for the selected cell
+         *
+         * @param t Specify which cache the data should be read from. Can take one of two values: search or order
+         */
         cache(t: string): Api;
     }
 
@@ -611,41 +625,41 @@ declare namespace DataTables {
 
     interface CommonCellMethods extends CommonSubMethods {
         /**
-        * Invalidate the data held in DataTables for the selected cells
-        *
-        * @param source Data source to read the new data from.
-        */
+         * Invalidate the data held in DataTables for the selected cells
+         *
+         * @param source Data source to read the new data from.
+         */
         invalidate(source?: string): Api;
 
         /**
-        * Get data for the selected cell
-        *
-        * @param f Data type to get. This can be one of: 'display', 'filter', 'sort', 'type'
-        */
+         * Get data for the selected cell
+         *
+         * @param f Data type to get. This can be one of: 'display', 'filter', 'sort', 'type'
+         */
         render(t: string): any;
     }
 
     interface CellMethods extends CoreMethods, CommonCellMethods {
         /**
-        * Get data for the selected cell
-        */
+         * Get data for the selected cell
+         */
         data(): any;
 
         /**
-        * Get data for the selected cell
-        *
-        * @param data Value to assign to the data for the cell
-        */
+         * Get data for the selected cell
+         *
+         * @param data Value to assign to the data for the cell
+         */
         data(data: any): Api;
 
         /**
-        * Get index information about the selected cell
-        */
+         * Get index information about the selected cell
+         */
         index(): CellIndexReturn;
 
         /**
-        * Get the DOM element for the selected cell
-        */
+         * Get the DOM element for the selected cell
+         */
         node(): Node;
     }
 
@@ -657,25 +671,25 @@ declare namespace DataTables {
 
     interface CellsMethods extends CoreMethods, CommonCellMethods {
         /**
-        * Get data for the selected cells
-        */
+         * Get data for the selected cells
+         */
         data(): Api;
 
         /**
-        * Iterate over each selected cell, with the function context set to be the cell in question. Since: DataTables 1.10.6
-        *
-        * @param fn Function to execute for every cell selected.
-        */
+         * Iterate over each selected cell, with the function context set to be the cell in question. Since: DataTables 1.10.6
+         *
+         * @param fn Function to execute for every cell selected.
+         */
         every(fn: (cellRowIdx: number, cellColIdx: number, tableLoop: number, cellLoop: number) => void): Api;
 
         /**
-        * Get index information about the selected cells
-        */
+         * Get index information about the selected cells
+         */
         indexes(): Api;
 
         /**
-        * Get the DOM elements for the selected cells
-        */
+         * Get the DOM elements for the selected cells
+         */
         nodes(): Api;
     }
     //#endregion "cell-methods"
@@ -684,128 +698,128 @@ declare namespace DataTables {
 
     interface CommonColumnMethod extends CommonSubMethods {
         /**
-        * Get the footer th / td cell for the selected column.
-        */
+         * Get the footer th / td cell for the selected column.
+         */
         footer(): any;
 
         /**
-        * Get the header th / td cell for a column.
-        */
+         * Get the header th / td cell for a column.
+         */
         header(): Node;
 
         /**
-        * Order the table, in the direction specified, by the column selected by the column()DT selector.
-        *
-        * @param direction Direction of sort to apply to the selected column - desc (descending) or asc (ascending).
-        */
+         * Order the table, in the direction specified, by the column selected by the column()DT selector.
+         *
+         * @param direction Direction of sort to apply to the selected column - desc (descending) or asc (ascending).
+         */
         order(direction: string): Api;
 
         /**
-        * Get the visibility of the selected column.
-        */
+         * Get the visibility of the selected column.
+         */
         visible(): boolean;
 
         /**
-        * Set the visibility of the selected column.
-        *
-        * @param show Specify if the column should be visible (true) or not (false).
-        * @param redrawCalculations Indicate if DataTables should recalculate the column layout (true - default) or not (false). Typically this would be left as the default value, but it can be useful to disable when using the method in a loop - so the calculations are performed on every call as they can hamper performance.
-        */
+         * Set the visibility of the selected column.
+         *
+         * @param show Specify if the column should be visible (true) or not (false).
+         * @param redrawCalculations Indicate if DataTables should recalculate the column layout (true - default) or not (false).
+         */
         visible(show: boolean, redrawCalculations?: boolean): Api;
     }
 
     interface ColumnMethodsModel {
         /**
-        * Select the column found by a column selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
+         * Select the column found by a column selector
+         *
+         * @param cellSelector Cell selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+         */
         (columnSelector: any, modifier?: ObjectSelectorModifier): ColumnMethods;
 
         /**
-        * Convert from the input column index type to that required.
-        *
-        * @param t The type on conversion that should take place: 'fromVisible', 'toData', 'fromData', 'toVisible'
-        * @param index The index to be converted
-        */
+         * Convert from the input column index type to that required.
+         *
+         * @param t The type on conversion that should take place: 'fromVisible', 'toData', 'fromData', 'toVisible'
+         * @param index The index to be converted
+         */
         index(t: string, index: number): number;
     }
 
     interface ColumnMethods extends CoreMethods, CommonColumnMethod {
         /**
-        * Get the data for the cells in the selected column.
-        */
+         * Get the data for the cells in the selected column.
+         */
         data(): Api;
 
         /**
-        * Get the data source property for the selected column
-        */
-        dataSrc(): number | string | Function;
+         * Get the data source property for the selected column
+         */
+        dataSrc(): number | string | (() => string);
 
         /**
-        * Get index information about the selected cell
-        *
-        * @param t Specify if you want to get the column data index (default) or the visible index (visible).
-        */
+         * Get index information about the selected cell
+         *
+         * @param t Specify if you want to get the column data index (default) or the visible index (visible).
+         */
         index(t?: string): Api;
 
         /**
-        * Obtain the th / td nodes for the selected column
-        */
+         * Obtain the th / td nodes for the selected column
+         */
         nodes(): Api[];
     }
 
     interface ColumnsMethodsModel {
         /**
-        * Select all columns
-        *
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
+         * Select all columns
+         *
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+         */
         (modifier?: ObjectSelectorModifier): ColumnsMethods;
 
         /**
-        * Select columns found by a cell selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
+         * Select columns found by a cell selector
+         *
+         * @param cellSelector Cell selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+         */
         (columnSelector: any, modifier?: ObjectSelectorModifier): ColumnsMethods;
 
         /**
-        * Recalculate the column widths for layout.
-        */
+         * Recalculate the column widths for layout.
+         */
         adjust(): Api;
     }
 
     interface ColumnsMethods extends CoreMethods, CommonColumnMethod {
         /**
-        * Obtain the data for the columns from the selector
-        */
+         * Obtain the data for the columns from the selector
+         */
         data(): Api;
 
         /**
-        * Get the data source property for the selected columns.
-        */
+         * Get the data source property for the selected columns.
+         */
         dataSrc(): Api;
 
         /**
-        * Iterate over each selected column, with the function context set to be the column in question. Since: DataTables 1.10.6
-        *
-        * @param fn Function to execute for every column selected.
-        */
+         * Iterate over each selected column, with the function context set to be the column in question. Since: DataTables 1.10.6
+         *
+         * @param fn Function to execute for every column selected.
+         */
         every(fn: (colIdx: number, tableLoop: number, colLoop: number) => void): Api;
 
         /**
-        * Get the column indexes of the selected columns.
-        *
-        * @param t Specify if you want to get the column data index (default) or the visible index (visible).
-        */
+         * Get the column indexes of the selected columns.
+         *
+         * @param t Specify if you want to get the column data index (default) or the visible index (visible).
+         */
         indexes(t?: string): Api;
 
         /**
-        * Obtain the th / td nodes for the selected columns
-        */
+         * Obtain the th / td nodes for the selected columns
+         */
         nodes(): Api[][];
     }
     //#endregion "column-methods"
@@ -814,199 +828,193 @@ declare namespace DataTables {
 
     interface CommonRowMethod extends CommonSubMethods {
         /**
-        * Obtain the th / td nodes for the selected column
-        *
-        * @param source Data source to read the new data from. Values: 'auto', 'data', 'dom'
-        */
+         * Obtain the th / td nodes for the selected column
+         *
+         * @param source Data source to read the new data from. Values: 'auto', 'data', 'dom'
+         */
         invalidate(source?: string): Api;
     }
 
     interface RowChildMethodModel {
         /**
-        * Get the child row(s) that have been set for a parent row
-        */
+         * Get the child row(s) that have been set for a parent row
+         */
         (): JQuery;
 
         /**
-        * Get the child row(s) that have been set for a parent row
-        *
-        * @param showRemove This parameter can be given as true or false
-        */
+         * Get the child row(s) that have been set for a parent row
+         *
+         * @param showRemove This parameter can be given as true or false
+         */
         (showRemove: boolean): RowChildMethods;
 
         /**
-        * Set the data to show in the child row(s). Note that calling this method will replace any child rows which are already attached to the parent row.
-        *
-        * @param data The data to be shown in the child row can be given in multiple different ways.
-        * @param className Class name that is added to the td cell node(s) of the child row(s). As of 1.10.1 it is also added to the tr row node of the child row(s).
-        */
-        (data: (string | Node | JQuery) | (string | Node | JQuery)[], className?: string): RowChildMethods;
+         * Set the data to show in the child row(s). Note that calling this method will replace any child rows which are already attached to the parent row.
+         *
+         * @param data The data to be shown in the child row can be given in multiple different ways.
+         * @param className Class name that is added to the td cell node(s) of the child row(s). As of 1.10.1 it is also added to the tr row node of the child row(s).
+         */
+        (data: (string | Node | JQuery) | Array<(string | number | JQuery)>, className?: string): RowChildMethods;
 
         /**
-        * Hide the child row(s) of a parent row
-        */
+         * Hide the child row(s) of a parent row
+         */
         hide(): Api;
 
         /**
-        * Check if the child rows of a parent row are visible
-        */
+         * Check if the child rows of a parent row are visible
+         */
         isShown(): Api;
 
         /**
-        * Remove child row(s) from display and release any allocated memory
-        */
+         * Remove child row(s) from display and release any allocated memory
+         */
         remove(): Api;
 
         /**
-        * Show the child row(s) of a parent row
-        */
+         * Show the child row(s) of a parent row
+         */
         show(): Api;
     }
 
     interface RowChildMethods extends CoreMethods {
         /**
-        * Hide the child row(s) of a parent row
-        */
+         * Hide the child row(s) of a parent row
+         */
         hide(): Api;
 
         /**
-        * Remove child row(s) from display and release any allocated memory
-        */
+         * Remove child row(s) from display and release any allocated memory
+         */
         remove(): Api;
 
         /**
-        * Make newly defined child rows visible
-        */
+         * Make newly defined child rows visible
+         */
         show(): Api;
     }
 
     interface RowMethodsModel {
         /**
-        * Select a row found by a row selector
-        *
-        * @param rowSelector Row selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
+         * Select a row found by a row selector
+         *
+         * @param rowSelector Row selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+         */
         (rowSelector: any, modifier?: ObjectSelectorModifier): RowMethods;
 
         /**
-        * Add a new row to the table using the given data
-        *
-        * @param data Data to use for the new row. This may be an array, object or Javascript object instance, but must be in the same format as the other data in the table
-        */
-        add(data: any[] | Object): Api;
+         * Add a new row to the table using the given data
+         *
+         * @param data Data to use for the new row. This may be an array, object or Javascript object instance, but must be in the same format as the other data in the table
+         */
+        add(data: any[] | object): Api;
     }
 
     interface RowMethods extends CoreMethods, CommonRowMethod {
         /**
-        * Order Methods / Object
-        */
+         * Order Methods / object
+         */
         child: RowChildMethodModel;
 
         /**
-        * Get the data for the selected row
-        */
-        data(): any[] | Object;
+         * Get the data for the selected row
+         */
+        data(): any[] | object;
 
         /**
-        * Set the data for the selected row
-        *
-        * @param d Data to use for the row.
-        */
-        data(d: any[] | Object): Api;
+         * Set the data for the selected row
+         *
+         * @param d Data to use for the row.
+         */
+        data(d: any[] | object): Api;
 
         /**
-
-        * Get the id of the selected row. Since: 1.10.8
-        *
-        * @param hash true - Append a hash (#) to the start of the row id. This can be useful for then using the id as a selector
-        * false - Do not modify the id value.
-        * @returns Row id. If the row does not have an id available 'undefined' will be returned.
-        */
+         * Get the id of the selected row. Since: 1.10.8
+         *
+         * @param hash true - Append a hash (#) to the start of the row id. This can be useful for then using the id as a selector
+         * false - Do not modify the id value.
+         * @returns Row id. If the row does not have an id available 'undefined' will be returned.
+         */
         id(hash?: boolean): string;
 
         /**
-        * Get the row index of the row column.
-        */
+         * Get the row index of the row column.
+         */
         index(): number;
 
         /**
-        * Obtain the tr node for the selected row
-        */
+         * Obtain the tr node for the selected row
+         */
         node(): Node;
 
         /**
-        * Delete the selected row from the DataTable.
-        */
+         * Delete the selected row from the DataTable.
+         */
         remove(): Node;
     }
 
     interface RowsMethodsModel {
         /**
-        * Select all rows
-        *
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
+         * Select all rows
+         *
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+         */
         (modifier?: ObjectSelectorModifier): RowsMethods;
 
         /**
-        * Select rows found by a row selector
-        *
-        * @param cellSelector Row selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
+         * Select rows found by a row selector
+         *
+         * @param cellSelector Row selector.
+         * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+         */
         (rowSelector: any, modifier?: ObjectSelectorModifier): RowsMethods;
 
         /**
-        * Add new rows to the table using the data given
-        *
-        * @param data Array of data elements, with each one describing a new row to be added to the table
-        */
+         * Add new rows to the table using the data given
+         *
+         * @param data Array of data elements, with each one describing a new row to be added to the table
+         */
         add(data: any[]): Api;
     }
 
     interface RowsMethods extends CoreMethods, CommonRowMethod {
         /**
-        * Get the data for the rows from the selector
-        */
-        data(): Api;
+         * Get / Set the data for the selected row
+         *
+         * @param d Data to use for the row.
+         */
+        data(d?: any[] | object): Api;
 
         /**
-        * Set the data for the selected row
-        *
-        * @param d Data to use for the row.
-        */
-        data(d: any[] | Object): Api;
-
-        /**
-        * Iterate over each selected row, with the function context set to be the row in question. Since: DataTables 1.10.6
-        *
-        * @param fn Function to execute for every row selected.
-        */
+         * Iterate over each selected row, with the function context set to be the row in question. Since: DataTables 1.10.6
+         *
+         * @param fn Function to execute for every row selected.
+         */
         every(fn: (rowIdx: number, tableLoop: number, rowLoop: number) => void): Api;
 
         /**
-        * Get the ids of the selected rows. Since: 1.10.8
-        *
-        * @param hash true - Append a hash (#) to the start of each row id. This can be useful for then using the ids as selectors
-        * false - Do not modify the id value.
-        * @returns Api instance with the selected rows in its result set. If a row does not have an id available 'undefined' will be returned as the value.
-        */
+         * Get the ids of the selected rows. Since: 1.10.8
+         *
+         * @param hash true - Append a hash (#) to the start of each row id. This can be useful for then using the ids as selectors
+         * false - Do not modify the id value.
+         * @returns Api instance with the selected rows in its result set. If a row does not have an id available 'undefined' will be returned as the value.
+         */
         ids(hash?: boolean): Api;
 
         /**
-        * Get the row indexes of the selected rows.
-        */
+         * Get the row indexes of the selected rows.
+         */
         indexes(): Api;
 
         /**
-        * Obtain the tr nodes for the selected rows
-        */
+         * Obtain the tr nodes for the selected rows
+         */
         nodes(): Api;
 
         /**
-        * Delete the selected rows from the DataTable.
-        */
+         * Delete the selected rows from the DataTable.
+         */
         remove(): Api;
     }
     //#endregion "row-methods"
@@ -1015,55 +1023,55 @@ declare namespace DataTables {
 
     interface TableMethods extends CoreMethods {
         /**
-        * Get the tfoot node for the table in the API's context
-        */
+         * Get the tfoot node for the table in the API's context
+         */
         footer(): Node;
 
         /**
-        * Get the thead node for the table in the API's context
-        */
+         * Get the thead node for the table in the API's context
+         */
         header(): Node;
 
         /**
-        * Get the tbody node for the table in the API's context
-        */
+         * Get the tbody node for the table in the API's context
+         */
         body(): Node;
 
         /**
-        * Get the div container node for the table in the API's context
-        */
+         * Get the div container node for the table in the API's context
+         */
         container(): Node;
 
         /**
-        * Get the table node for the table in the API's context
-        */
+         * Get the table node for the table in the API's context
+         */
         node(): Node;
     }
 
     interface TablesMethods extends CoreMethods {
         /**
-        * Get the tfoot nodes for the tables in the API's context
-        */
+         * Get the tfoot nodes for the tables in the API's context
+         */
         footer(): Api;
 
         /**
-        * Get the thead nodes for the tables in the API's context
-        */
+         * Get the thead nodes for the tables in the API's context
+         */
         header(): Api;
 
         /**
-        * Get the tbody nodes for the tables in the API's context
-        */
+         * Get the tbody nodes for the tables in the API's context
+         */
         body(): Api;
 
         /**
-        * Get the div container nodes for the tables in the API's context
-        */
+         * Get the div container nodes for the tables in the API's context
+         */
         containers(): Api;
 
         /**
-        * Get the table nodes for the tables in the API's context
-        */
+         * Get the table nodes for the tables in the API's context
+         */
         nodes(): Api;
     }
     //#endregion "table-methods"
@@ -1072,142 +1080,209 @@ declare namespace DataTables {
 
     //#region "Static-Methods"
 
-    export interface StaticFunctions {
+    interface StaticFunctions {
         /**
-        * Check is a table node is a DataTable or not
-        *
-        * @param table Selector string for table
-        */
+         * Returns JQuery object
+         *
+         * Usage:
+         * $( selector ).dataTable();
+         */
+        (): JQueryDataTables;
+
+        /**
+         * Check is a table node is a DataTable or not
+         *
+         * Usage:
+         * $.fn.dataTable.isDataTable("selector");
+         * @param table Selector string for table
+         */
         isDataTable(table: string): boolean;
 
         /**
-        * Get all DataTable tables that have been initialised - optionally you can select to get only currently visible tables and / or retrieve the tables as API instances.
-        *
-        * @param visible As a boolean value this options is used to indicate if you want all tables on the page should be returned (false), or visible tables only (true).
-        * Since 1.10.8 this option can also be given as an object.
-        */
-        tables(visible?: boolean | ObjectTablesStatic): DataTables.Api[] | DataTables.Api;
+         * Helpers for `columns.render`.
+         *
+         * The options defined here can be used with the `columns.render` initialisation
+         * option to provide a display renderer.
+         */
+        render: StaticRenderFunctions;
 
         /**
-        * Version number compatibility check function
-        *
-        * @param version Version string
-        */
+         * Get all DataTable tables that have been initialised - optionally you can select to get only currently visible tables and / or retrieve the tables as API instances.
+         *
+         * @param visible As a boolean value this options is used to indicate if you want all tables on the page should be returned (false), or visible tables only (true).
+         * Since 1.10.8 this option can also be given as an object.
+         */
+        tables(visible?: boolean | objectTablesStatic): Api[] | Api;
+
+        /**
+         * Version number compatibility check function
+         *
+         * Usage:
+         * $.fn.dataTable.versionCheck("1.10.0");
+         * @param version Version string
+         */
         versionCheck(version: string): boolean;
 
         /**
-        * Utils
-        */
+         * Utils
+         */
         util: StaticUtilFunctions;
 
         /**
-        * Check is a table node is a DataTable or not
-        *
-        * @param table Selector string for table
-        */
-        Api(selector: string | Node | Node[] | JQuery): DataTables.Api;
+         * Get DataTable API instance
+         *
+         * @param table Selector string for table
+         */
+        Api: new (selector: string | Node | Node[] | JQuery) => Api;
+
+        /**
+         * Default Settings
+         */
+        defaults: Settings;
+
+        /**
+         * Default Settings
+         */
+        ext: ExtSettings;
     }
 
-    export interface StaticUtilFunctions {
+    interface ObjectColumnRender {
+        display(d?: number | string | object): string | object;
+    }
+
+    interface ObjectOrderFixed {
         /**
-        * Escape special characters in a regular expression string. Since: 1.10.4
-        *
-        * @param str String to escape
-        */
+         * Two-element array:
+         * 0: Column index to order upon.
+         * 1: Direction so order to apply ("asc" for ascending order or "desc" for descending order).
+         */
+        pre?: any[];
+        /**
+         * Two-element array:
+         * 0: Column index to order upon.
+         * 1: Direction so order to apply ("asc" for ascending order or "desc" for descending order).
+         */
+        post?: any[];
+    }
+
+    interface StaticRenderFunctions {
+        /**
+         * Will format numeric data (defined by `columns.data`) for display, retaining the original unformatted data for sorting and filtering.
+         *
+         * @param thousands Thousands grouping separator.
+         * @param decimal Decimal point indicator.
+         * @param precision Integer number of decimal points to show.
+         * @param prefix Prefix (optional).
+         * @param postfix Postfix (/suffix) (optional).
+         */
+        number(thousands: string, decimal: string, precision: number, prefix?: string, postfix?: string): ObjectColumnRender;
+        /**
+         * Escape HTML to help prevent XSS attacks. It has no optional parameters.
+         */
+        text(): ObjectColumnRender;
+    }
+
+    interface StaticUtilFunctions {
+        /**
+         * Escape special characters in a regular expression string. Since: 1.10.4
+         *
+         * @param str String to escape
+         */
         escapeRegex(str: string): string;
 
         /**
-        * Throttle the calls to a method to reduce call frequency. Since: 1.10.3
-        *
-        * @param fn Function
-        * @param period ms
-        */
-        throttle(fn: Function, period?: number): Function;
+         * Throttle the calls to a method to reduce call frequency. Since: 1.10.3
+         *
+         * @param fn Function
+         * @param period ms
+         */
+        throttle(fn: FunctionThrottle, period?: number): (() => void);
     }
 
-    interface ObjectTablesStatic {
+    type FunctionThrottle = (data: any) => void;
+
+    interface objectTablesStatic {
         /**
-        * Get only visible tables (true) or all tables regardless of visibility (false).
-        */
-        visible: boolean
+         * Get only visible tables (true) or all tables regardless of visibility (false).
+         */
+        visible: boolean;
 
         /**
-        * Return a DataTables API instance for the selected tables (true) or an array (false).
-        */
-        api: boolean
+         * Return a DataTables API instance for the selected tables (true) or an array (false).
+         */
+        api: boolean;
     }
 
     //#endregion "Static-Methods"
 
     //#region "Settings"
 
-    export interface Settings {
-
+    interface Settings {
         //#region "Features"
 
         /**
-        * Feature control DataTables' smart column width handling. Since: 1.10
-        */
+         * Feature control DataTables' smart column width handling. Since: 1.10
+         */
         autoWidth?: boolean;
 
         /**
-        * Feature control deferred rendering for additional speed of initialisation. Since: 1.10
-        */
+         * Feature control deferred rendering for additional speed of initialisation. Since: 1.10
+         */
         deferRender?: boolean;
 
         /**
-        * Feature control table information display field. Since: 1.10
-        */
+         * Feature control table information display field. Since: 1.10
+         */
         info?: boolean;
 
         /**
-        * Use markup and classes for the table to be themed by jQuery UI ThemeRoller. Since: 1.10
-        */
+         * Use markup and classes for the table to be themed by jQuery UI ThemeRoller. Since: 1.10
+         */
         jQueryUI?: boolean;
 
         /**
-        * Feature control the end user's ability to change the paging display length of the table. Since: 1.10
-        */
+         * Feature control the end user's ability to change the paging display length of the table. Since: 1.10
+         */
         lengthChange?: boolean;
 
         /**
-        * Feature control ordering (sorting) abilities in DataTables. Since: 1.10
-        */
+         * Feature control ordering (sorting) abilities in DataTables. Since: 1.10
+         */
         ordering?: boolean;
 
         /**
-        * Enable or disable table pagination. Since: 1.10
-        */
+         * Enable or disable table pagination. Since: 1.10
+         */
         paging?: boolean;
 
         /**
-        * Feature control the processing indicator. Since: 1.10
-        */
+         * Feature control the processing indicator. Since: 1.10
+         */
         processing?: boolean;
 
         /**
-        * Horizontal scrolling. Since: 1.10
-        */
+         * Horizontal scrolling. Since: 1.10
+         */
         scrollX?: boolean;
 
         /**
-        * Vertical scrolling. Since: 1.10 Exp: "200px"
-        */
+         * Vertical scrolling. Since: 1.10 Exp: "200px"
+         */
         scrollY?: string;
 
         /**
-        * Feature control search (filtering) abilities Since: 1.10
-        */
+         * Feature control search (filtering) abilities Since: 1.10
+         */
         searching?: boolean;
 
         /**
-        * Feature control DataTables' server-side processing mode. Since: 1.10
-        */
+         * Feature control DataTables' server-side processing mode. Since: 1.10
+         */
         serverSide?: boolean;
 
         /**
-        * State saving - restore table state on page reload. Since: 1.10
-        */
+         * State saving - restore table state on page reload. Since: 1.10
+         */
         stateSave?: boolean;
 
         //#endregion "Features"
@@ -1215,142 +1290,142 @@ declare namespace DataTables {
         //#region "Data"
 
         /**
-        * Load data for the table's content from an Ajax source. Since: 1.10
-        */
+         * Load data for the table's content from an Ajax source. Since: 1.10
+         */
         ajax?: string | AjaxSettings | FunctionAjax;
 
         /**
-        * Data to use as the display data for the table. Since: 1.10
-        */
-        data?: Object;
+         * Data to use as the display data for the table. Since: 1.10
+         */
+        data?: object;
 
         //#endregion "Data"
 
         //#region "Options"
 
         /**
-        * Data to use as the display data for the table. Since: 1.10
-        */
+         * Data to use as the display data for the table. Since: 1.10
+         */
         columns?: ColumnSettings[];
 
         /**
-        * Assign a column definition to one or more columns.. Since: 1.10
-        */
+         * Assign a column definition to one or more columns.. Since: 1.10
+         */
         columnDefs?: ColumnDefsSettings[];
 
         /**
-        * Delay the loading of server-side data until second draw
-        */
+         * Delay the loading of server-side data until second draw
+         */
         deferLoading?: number | number[];
 
         /**
-        * Destroy any existing table matching the selector and replace with the new options. Since: 1.10
-        */
+         * Destroy any existing table matching the selector and replace with the new options. Since: 1.10
+         */
         destroy?: boolean;
 
         /**
-        * Initial paging start point. Since: 1.10
-        */
+         * Initial paging start point. Since: 1.10
+         */
         displayStart?: number;
 
         /**
-        * Define the table control elements to appear on the page and in what order. Since: 1.10
-        */
+         * Define the table control elements to appear on the page and in what order. Since: 1.10
+         */
         dom?: string;
 
         /**
-        * Change the options in the page length select list. Since: 1.10
-        */
-        lengthMenu?: (number | string)[] | (number | string)[][];
+         * Change the options in the page length select list. Since: 1.10
+         */
+        lengthMenu?: Array<(number | string)> | Array<Array<(number | string)>>;
 
         /**
-        * Control which cell the order event handler will be applied to in a column. Since: 1.10
-        */
+         * Control which cell the order event handler will be applied to in a column. Since: 1.10
+         */
         orderCellsTop?: boolean;
 
         /**
-        * Highlight the columns being ordered in the table's body. Since: 1.10
-        */
+         * Highlight the columns being ordered in the table's body. Since: 1.10
+         */
         orderClasses?: boolean;
 
         /**
-        * Initial order (sort) to apply to the table. Since: 1.10
-        */
-        order?: (string | number)[] | (string | number)[][];
+         * Initial order (sort) to apply to the table. Since: 1.10
+         */
+        order?: Array<(number | string)> | Array<Array<(number | string)>>;
 
         /**
-        * Ordering to always be applied to the table. Since: 1.10
-        */
-        orderFixed?: (string | number)[] | (string | number)[][] | Object;
+         * Ordering to always be applied to the table. Since: 1.10
+         */
+        orderFixed?: Array<(number | string)> | Array<Array<(number | string)>> | object;
 
         /**
-        * Multiple column ordering ability control. Since: 1.10
-        */
+         * Multiple column ordering ability control. Since: 1.10
+         */
         orderMulti?: boolean;
 
         /**
-        * Change the initial page length (number of rows per page). Since: 1.10
-        */
+         * Change the initial page length (number of rows per page). Since: 1.10
+         */
         pageLength?: number;
 
         /**
-        * Pagination button display options. Basic Types: numbers (1.10.8) simple, simple_numbers, full, full_numbers
-        */
+         * Pagination button display options. Basic Types: numbers (1.10.8) simple, simple_numbers, full, full_numbers
+         */
         pagingType?: string;
 
         /**
-        * Retrieve an existing DataTables instance. Since: 1.10
-        */
-        retrieve?: boolean
+         * Retrieve an existing DataTables instance. Since: 1.10
+         */
+        retrieve?: boolean;
 
         /**
-        * Display component renderer types. Since: 1.10
-        */
+         * Display component renderer types. Since: 1.10
+         */
         renderer?: string | RendererSettings;
 
         /**
-        * Data property name that DataTables will use to set <tr> element DOM IDs. Since: 1.10.8
-        */
+         * Data property name that DataTables will use to set <tr> element DOM IDs. Since: 1.10.8
+         */
         rowId?: string;
 
         /**
-        * Allow the table to reduce in height when a limited number of rows are shown. Since: 1.10
-        */
+         * Allow the table to reduce in height when a limited number of rows are shown. Since: 1.10
+         */
         scrollCollapse?: boolean;
 
         /**
-        * Set an initial filter in DataTables and / or filtering options. Since: 1.10
-        */
+         * Set an initial filter in DataTables and / or filtering options. Since: 1.10
+         */
         search?: SearchSettings | boolean;
 
         /**
-        * Set placeholder attribute for input type="text" tag elements. Since: 1.10
-        */
+         * Set placeholder attribute for input type="text" tag elements. Since: 1.10
+         */
         searchPlaceholder?: SearchSettings;
 
         /**
-        * Define an initial search for individual columns. Since: 1.10
-        */
+         * Define an initial search for individual columns. Since: 1.10
+         */
         searchCols?: SearchSettings[];
 
         /**
-        * Set a throttle frequency for searching. Since: 1.10
-        */
+         * Set a throttle frequency for searching. Since: 1.10
+         */
         searchDelay?: number;
 
         /**
-        * Saved state validity duration. Since: 1.10
-        */
+         * Saved state validity duration. Since: 1.10
+         */
         stateDuration?: number;
 
         /**
-        * Set the zebra stripe class names for the rows in the table. Since: 1.10
-        */
+         * Set the zebra stripe class names for the rows in the table. Since: 1.10
+         */
         stripeClasses?: string[];
 
         /**
-        * Tab index control for keyboard navigation. Since: 1.10
-        */
+         * Tab index control for keyboard navigation. Since: 1.10
+         */
         tabIndex?: number;
 
         //#endregion "Options"
@@ -1358,73 +1433,73 @@ declare namespace DataTables {
         //#region "Callbacks"
 
         /**
-        * Callback for whenever a TR element is created for the table's body. Since: 1.10
-        */
+         * Callback for whenever a TR element is created for the table's body. Since: 1.10
+         */
         createdRow?: FunctionCreateRow;
 
         /**
-        * Function that is called every time DataTables performs a draw. Since: 1.10
-        */
+         * Function that is called every time DataTables performs a draw. Since: 1.10
+         */
         drawCallback?: FunctionDrawCallback;
 
         /**
-        * Footer display callback function. Since: 1.10
-        */
+         * Footer display callback function. Since: 1.10
+         */
         footerCallback?: FunctionFooterCallback;
 
         /**
-        * Number formatting callback function. Since: 1.10
-        */
+         * Number formatting callback function. Since: 1.10
+         */
         formatNumber?: FunctionFormatNumber;
 
         /**
-        * Header display callback function. Since: 1.10
-        */
+         * Header display callback function. Since: 1.10
+         */
         headerCallback?: FunctionHeaderCallback;
 
         /**
-        * Table summary information display callback. Since: 1.10
-        */
+         * Table summary information display callback. Since: 1.10
+         */
         infoCallback?: FunctionInfoCallback;
 
         /**
-        * Initialisation complete callback. Since: 1.10
-        */
+         * Initialisation complete callback. Since: 1.10
+         */
         initComplete?: FunctionInitComplete;
 
         /**
-        * Pre-draw callback. Since: 1.10
-        */
+         * Pre-draw callback. Since: 1.10
+         */
         preDrawCallback?: FunctionPreDrawCallback;
 
         /**
-        * Row draw callback.. Since: 1.10
-        */
+         * Row draw callback.. Since: 1.10
+         */
         rowCallback?: FunctionRowCallback;
 
         /**
-        * Callback that defines where and how a saved state should be loaded. Since: 1.10
-        */
+         * Callback that defines where and how a saved state should be loaded. Since: 1.10
+         */
         stateLoadCallback?: FunctionStateLoadCallback;
 
         /**
-        * State loaded callback. Since: 1.10
-        */
+         * State loaded callback. Since: 1.10
+         */
         stateLoaded?: FunctionStateLoaded;
 
         /**
-        * State loaded - data manipulation callback. Since: 1.10
-        */
+         * State loaded - data manipulation callback. Since: 1.10
+         */
         stateLoadParams?: FunctionStateLoadParams;
 
         /**
-        * Callback that defines how the table state is stored and where. Since: 1.10
-        */
+         * Callback that defines how the table state is stored and where. Since: 1.10
+         */
         stateSaveCallback?: FunctionStateSaveCallback;
 
         /**
-        * State save - data manipulation callback. Since: 1.10
-        */
+         * State save - data manipulation callback. Since: 1.10
+         */
         stateSaveParams?: FunctionStateSaveParams;
 
         //#endregion "Callbacks"
@@ -1438,7 +1513,7 @@ declare namespace DataTables {
 
     //#region "ajax-settings"
 
-    export interface AjaxDataRequest {
+    interface AjaxDataRequest {
         draw: number;
         start: number;
         length: number;
@@ -1448,17 +1523,17 @@ declare namespace DataTables {
         search: AjaxDataRequestSearch;
     }
 
-    export interface AjaxDataRequestSearch {
+    interface AjaxDataRequestSearch {
         value: string;
         regex: boolean;
     }
 
-    export interface AjaxDataRequestOrder {
+    interface AjaxDataRequestOrder {
         column: number;
         dir: string;
     }
 
-    export interface AjaxDataRequestColumn {
+    interface AjaxDataRequestColumn {
         data: string | number;
         name: string;
         searchable: boolean;
@@ -1466,7 +1541,7 @@ declare namespace DataTables {
         search: AjaxDataRequestSearch;
     }
 
-    export interface AjaxData {
+    interface AjaxData {
         draw?: number;
         recordsTotal?: number;
         recordsFiltered?: number;
@@ -1476,126 +1551,125 @@ declare namespace DataTables {
 
     interface AjaxSettings extends JQueryAjaxSettings {
         /**
-        * Add or modify data submitted to the server upon an Ajax request. Since: 1.10
-        */
-        data?: Object | FunctionAjaxData;
+         * Add or modify data submitted to the server upon an Ajax request. Since: 1.10
+         */
+        data?: object | FunctionAjaxData;
 
         /**
-        * Data property or manipulation method for table data. Since: 1.10
-        */
-        dataSrc?: string | Function;
+         * Data property or manipulation method for table data. Since: 1.10
+         */
+        dataSrc?: string | ((data: any) => any[]);
     }
 
-    interface FunctionAjax {
-        (data: Object, callback: Function, settings: SettingsLegacy): void;
-    }
+    type FunctionAjax = (data: object, callback: ((data: any) => void), settings: SettingsLegacy) => void;
 
-    interface FunctionAjaxData {
-        /*
-        * @param data Data that DataTables has constructed for the request.
-        * @param settings DataTables settings object. Since 1.10.6
-        */
-        (data: Object, settings: Settings): string | Object;
-    }
+    type FunctionAjaxData = (data: object, settings: Settings) => string | object;
 
     //#endregion "ajax-settings"
 
     //#region "colunm-settings"
 
-    export interface ColumnSettings {
+    interface ColumnSettings {
         /**
-        * Cell type to be created for a column. th/td Since: 1.10
-        */
+         * Cell type to be created for a column. th/td Since: 1.10
+         */
         cellType?: string;
 
         /**
-        * Class to assign to each cell in the column. Since: 1.10
-        */
+         * Class to assign to each cell in the column. Since: 1.10
+         */
         className?: string;
 
         /**
-        * Add padding to the text content used when calculating the optimal with for a table. Since: 1.10
-        */
+         * Add padding to the text content used when calculating the optimal with for a table. Since: 1.10
+         */
         contentPadding?: string;
 
         /**
-        * Cell created callback to allow DOM manipulation. Since: 1.10
-        */
+         * Cell created callback to allow DOM manipulation. Since: 1.10
+         */
         createdCell?: FunctionColumnCreatedCell;
 
         /**
-        * Class to assign to each cell in the column. Since: 1.10
-        */
+         * Class to assign to each cell in the column. Since: 1.10
+         */
         data?: number | string | ObjectColumnData | FunctionColumnData;
 
         /**
-        * Set default, static, content for a column. Since: 1.10
-        */
+         * Set default, static, content for a column. Since: 1.10
+         */
         defaultContent?: string;
 
         /**
-        * Set a descriptive name for a column. Since: 1.10
-        */
+         * Set a descriptive name for a column. Since: 1.10
+         */
         name?: string;
 
         /**
-        * Enable or disable ordering on this column. Since: 1.10
-        */
+         * Enable or disable ordering on this column. Since: 1.10
+         */
         orderable?: boolean;
 
         /**
-        * Define multiple column ordering as the default order for a column. Since: 1.10
-        */
+         * Define multiple column ordering as the default order for a column. Since: 1.10
+         */
         orderData?: number | number[];
 
         /**
-        * Live DOM sorting type assignment. Since: 1.10
-        */
+         * Live DOM sorting type assignment. Since: 1.10
+         */
         orderDataType?: string;
 
         /**
-        * Order direction application sequence. Since: 1.10
-        */
+         * Ordering to always be applied to the table. Since 1.10
+         *
+         * Array type is prefix ordering only and is a two-element array:
+         * 0: Column index to order upon.
+         * 1: Direction so order to apply ("asc" for ascending order or "desc" for descending order).
+         */
+        orderFixed?: any[] | ObjectOrderFixed;
+
+        /**
+         * Order direction application sequence. Since: 1.10
+         */
         orderSequence?: string[];
 
         /**
-        * Render (process) the data for use in the table. Since: 1.10
-        */
-        render?: number | string | ObjectColumnRender | FunctionColumnRender;
+         * Render (process) the data for use in the table. Since: 1.10
+         */
+        render?: number | string | ObjectColumnData | FunctionColumnRender | ObjectColumnRender;
 
         /**
-        * Enable or disable filtering on the data in this column. Since: 1.10
-        */
+         * Enable or disable filtering on the data in this column. Since: 1.10
+         */
         searchable?: boolean;
 
         /**
-        * Set the column title. Since: 1.10
-        */
+         * Set the column title. Since: 1.10
+         */
         title?: string;
 
         /**
-        * Set the column type - used for filtering and sorting string processing. Since: 1.10
-        */
+         * Set the column type - used for filtering and sorting string processing. Since: 1.10
+         */
         type?: string;
 
         /**
-        * Enable or disable the display of this column. Since: 1.10
-        */
+         * Enable or disable the display of this column. Since: 1.10
+         */
         visible?: boolean;
 
         /**
-        * Column width assignment. Since: 1.10
-        */
+         * Column width assignment. Since: 1.10
+         */
         width?: string;
     }
 
     interface ColumnDefsSettings extends ColumnSettings {
-        targets: string | number | (number | string)[]
+        targets: string | number | Array<(number | string)>;
     }
 
-    interface FunctionColumnCreatedCell {
-        (cell: Node, cellData: any, rowData: any, row: number, col: number): void;
-    }
+    type FunctionColumnCreatedCell = (cell: Node, cellData: any, rowData: any, row: number, col: number) => void;
 
     interface FunctionColumnData {
         (row: any, t: 'set', s: any, meta: CellMetaSettings): void;
@@ -1610,52 +1684,47 @@ declare namespace DataTables {
         sort?: string;
     }
 
-    interface ObjectColumnRender extends ObjectColumnData {
-    }
-
-    interface FunctionColumnRender {
-        (data: any, type: 'filter' | 'display' | 'type' | 'sort' | undefined | any, row: any, meta: CellMetaSettings): any;
-    }
+    type FunctionColumnRender = (data: any, type: any, row: any, meta: CellMetaSettings) => any;
 
     interface CellMetaSettings {
         row: number;
         col: number;
-        settings: DataTables.Settings;
+        settings: Settings;
     }
 
     //#endregion "colunm-settings"
 
     //#region "other-settings"
 
-    export interface RendererSettings {
+    interface RendererSettings {
         header?: string;
         pageButton?: string;
     }
 
-    export interface SearchSettings {
+    interface SearchSettings {
         /**
-        * Control case-sensitive filtering option. Since: 1.10
-        */
+         * Control case-sensitive filtering option. Since: 1.10
+         */
         caseInsensitive?: boolean;
 
         /**
-        * Enable / disable escaping of regular expression characters in the search term. Since: 1.10
-        */
+         * Enable / disable escaping of regular expression characters in the search term. Since: 1.10
+         */
         regex?: boolean;
 
         /**
-        * Enable / disable DataTables' smart filtering. Since: 1.10
-        */
+         * Enable / disable DataTables' smart filtering. Since: 1.10
+         */
         smart?: boolean;
 
         /**
-        * Set an initial filtering condition on the table. Since: 1.10
-        */
+         * Set an initial filtering condition on the table. Since: 1.10
+         */
         search?: string;
 
         /**
-        * Set a placeholder attribute for input type="text" tag elements. Since: 1.10.1
-        */
+         * Set a placeholder attribute for input type="text" tag elements. Since: 1.10.1
+         */
         searchPlaceholder?: string;
     }
 
@@ -1663,61 +1732,33 @@ declare namespace DataTables {
 
     //#region "callback-functions"
 
-    interface FunctionCreateRow {
-        (row: Node, data: any[] | Object, dataIndex: number): void;
-    }
+    type FunctionCreateRow = (row: Node, data: any[] | object, dataIndex: number) => void;
 
-    interface FunctionDrawCallback {
-        (settings: SettingsLegacy): void;
-    }
+    type FunctionDrawCallback = (settings: SettingsLegacy) => void;
 
-    interface FunctionFooterCallback {
-        (tfoot: Node, data: any[], start: number, end: number, display: any[]): void;
-    }
+    type FunctionFooterCallback = (tfoot: Node, data: any[], start: number, end: number, display: any[]) => void;
 
-    interface FunctionFormatNumber {
-        (formatNumber: number): void;
-    }
+    type FunctionFormatNumber = (formatNumber: number) => void;
 
-    interface FunctionHeaderCallback {
-        (thead: Node, data: any[], start: number, end: number, display: any[]): void;
-    }
+    type FunctionHeaderCallback = (thead: Node, data: any[], start: number, end: number, display: any[]) => void;
 
-    interface FunctionInfoCallback {
-        (settings: SettingsLegacy, start: number, end: number, mnax: number, total: number, pre: string): void;
-    }
+    type FunctionInfoCallback = (settings: SettingsLegacy, start: number, end: number, mnax: number, total: number, pre: string) => void;
 
-    interface FunctionInitComplete {
-        (settings: SettingsLegacy, json: Object): void;
-    }
+    type FunctionInitComplete = (settings: SettingsLegacy, json: object) => void;
 
-    interface FunctionPreDrawCallback {
-        (settings: SettingsLegacy): void;
-    }
+    type FunctionPreDrawCallback = (settings: SettingsLegacy) => void;
 
-    interface FunctionRowCallback {
-        (row: Node, data: any[] | Object, index: number): void;
-    }
+    type FunctionRowCallback = (row: Node, data: any[] | object, index: number) => void;
 
-    interface FunctionStateLoadCallback {
-        (settings: SettingsLegacy): void;
-    }
+    type FunctionStateLoadCallback = (settings: SettingsLegacy) => void;
 
-    interface FunctionStateLoaded {
-        (settings: SettingsLegacy, data: Object): void;
-    }
+    type FunctionStateLoaded = (settings: SettingsLegacy, data: object) => void;
 
-    interface FunctionStateLoadParams {
-        (settings: SettingsLegacy, data: Object): void;
-    }
+    type FunctionStateLoadParams = (settings: SettingsLegacy, data: object) => void;
 
-    interface FunctionStateSaveCallback {
-        (settings: SettingsLegacy, data: Object): void;
-    }
+    type FunctionStateSaveCallback = (settings: SettingsLegacy, data: object) => void;
 
-    interface FunctionStateSaveParams {
-        (settings: SettingsLegacy, data: Object): void;
-    }
+    type FunctionStateSaveParams = (settings: SettingsLegacy, data: object) => void;
 
     //#endregion "callback-functions"
 
@@ -1752,6 +1793,7 @@ declare namespace DataTables {
     interface LanguageAriaSettings {
         sortAscending: string;
         sortDescending: string;
+        paginate?: LanguagePaginateSettings;
     }
 
     //#endregion "language-settings"
@@ -1764,7 +1806,7 @@ declare namespace DataTables {
         [index: string]: Node;
     }
 
-    export interface SettingsLegacy {
+    interface SettingsLegacy {
         ajax: any;
         oApi: any;
         oFeatures: FeaturesLegacy;
@@ -1838,25 +1880,25 @@ declare namespace DataTables {
         bSortCellsTop: boolean;
         oInit: any;
         aoDestroyCallback: any[];
-        fnRecordsTotal: () => number;
-        fnRecordsDisplay: () => number;
-        fnDisplayEnd: () => number;
+        fnRecordsTotal(): number;
+        fnRecordsDisplay(): number;
+        fnDisplayEnd(): number;
         oInstance: any;
         sInstance: string;
         iTabIndex: number;
         nScrollHead: Node;
         nScrollFoot: Node;
-        rowIdFn: (mSource: string | number | Function) => Function;
+        rowIdFn(mSource: string | number | (() => void)): (() => void);
     }
 
-    export interface BrowserLegacy {
-        barWidth: number,
-        bBounding: boolean,
-        bScrollbarLeft: boolean,
-        bScrollOversize: boolean
+    interface BrowserLegacy {
+        barWidth: number;
+        bBounding: boolean;
+        bScrollbarLeft: boolean;
+        bScrollOversize: boolean;
     }
 
-    export interface FeaturesLegacy {
+    interface FeaturesLegacy {
         bAutoWidth: boolean;
         bDeferRender: boolean;
         bFilter: boolean;
@@ -1870,7 +1912,7 @@ declare namespace DataTables {
         bStateSave: boolean;
     }
 
-    export interface ScrollingLegacy {
+    interface ScrollingLegacy {
         bAutoCss: boolean;
         bCollapse: boolean;
         bInfinite: boolean;
@@ -1880,7 +1922,7 @@ declare namespace DataTables {
         sY: string;
     }
 
-    export interface RowLegacy {
+    interface RowLegacy {
         nTr: Node;
         _aData: any;
         _aSortData: any[];
@@ -1888,7 +1930,7 @@ declare namespace DataTables {
         _sRowStripe: string;
     }
 
-    export interface ColumnLegacy {
+    interface ColumnLegacy {
         aDataSort: any;
         asSorting: string[];
         bSearchable: boolean;
@@ -1896,8 +1938,8 @@ declare namespace DataTables {
         bVisible: boolean;
         _bAutoType: boolean;
         fnCreatedCell: FunctionColumnCreatedCell;
-        fnGetData: (data: any, specific: string) => any;
-        fnSetData: (data: any, value: any) => void;
+        fnGetData(data: any, specific: string): any;
+        fnSetData(data: any, value: any): void;
         mData: any;
         mRender: any;
         nTh: Node;
@@ -1915,11 +1957,9 @@ declare namespace DataTables {
         sWidthOrig: string;
     }
 
-    export interface CookieCallbackLegacy {
-        (name: string, data: any, expires: string, path: string, cookie: string): void;
-    }
+    type CookieCallbackLegacy = (name: string, data: any, expires: string, path: string, cookie: string) => void;
 
-    export interface LanguageLegacy {
+    interface LanguageLegacy {
         oAria?: LanguageAriaLegacy;
         oPaginate?: LanguagePaginateLegacy;
         sEmptyTable?: string;
@@ -1936,12 +1976,12 @@ declare namespace DataTables {
         sZeroRecords?: string;
     }
 
-    export interface LanguageAriaLegacy {
+    interface LanguageAriaLegacy {
         sSortAscending?: string;
         sSortDescending?: string;
     }
 
-    export interface LanguagePaginateLegacy {
+    interface LanguagePaginateLegacy {
         sFirst?: string;
         sLast?: string;
         sNext?: string;
@@ -1949,4 +1989,213 @@ declare namespace DataTables {
     }
     //#endregion "SettingsLegacy"
 
+    //#region "ext internal"
+
+    interface ExtSettings {
+        aTypes: any[];
+        afnFiltering: any[];
+        afnSortData: object;
+        aoFeatures: any[];
+        builder: string;
+        classes: ExtClassesSettings;
+        errMode: string;
+        feature: any[];
+        fnVersionCheck(version: string): string;
+        iApiIndex: number;
+        internal: object;
+        legacy: object;
+        oApi: object;
+        oJUIClasses: object;
+        oPagination: object;
+        oSort: object;
+        oStdClasses: ExtClassesSettings;
+        ofnSearch: object;
+        order: object;
+        pager: object;
+        renderer: object;
+        sVersion: string;
+        search: any[];
+        selector: object;
+        type: object;
+    }
+
+    interface ExtClassesSettings {
+        /**
+         * Default Value:
+         * dataTable
+         */
+        sTable?: string;
+
+        /**
+         * Default Value:
+         * no-footer
+         */
+        sNoFooter?: string;
+
+        /**
+         * Default Value:
+         * paginate_button
+         */
+        sPageButton?: string;
+
+        /**
+         * Default Value:
+         * current
+         */
+        sPageButtonActive?: string;
+
+        /**
+         * Default Value:
+         * disabled
+         */
+        sPageButtonDisabled?: string;
+
+        /**
+         * Default Value:
+         * odd
+         */
+        sStripeOdd?: string;
+
+        /**
+         * Default Value:
+         * even
+         */
+        sStripeEven?: string;
+
+        /**
+         * Default Value:
+         * dataTables_empty
+         */
+        sRowEmpty?: string;
+
+        /**
+         * Default Value:
+         * dataTables_wrapper
+         */
+        sWrapper?: string;
+
+        /**
+         * Default Value:
+         * dataTables_filter
+         */
+        sFilter?: string;
+
+        /**
+         * Default Value:
+         * dataTables_info
+         */
+        sInfo?: string;
+
+        /**
+         * Default Value:
+         * dataTables_paginate paging_
+         */
+        sPaging?: string;
+
+        /**
+         * Default Value:
+         * dataTables_length
+         */
+        sLength?: string;
+
+        /**
+         * Default Value:
+         * dataTables_processing
+         */
+        sProcessing?: string;
+
+        /**
+         * Default Value:
+         * sorting_asc
+         */
+        sSortAsc?: string;
+
+        /**
+         * Default Value:
+         * sorting_desc
+         */
+        sSortDesc?: string;
+
+        /**
+         * Default Value:
+         * sorting
+         */
+        sSortable?: string;
+
+        /**
+         * Default Value:
+         * sorting_asc_disabled
+         */
+        sSortableAsc?: string;
+
+        /**
+         * Default Value:
+         * sorting_desc_disabled
+         */
+        sSortableDesc?: string;
+
+        /**
+         * Default Value:
+         * sorting_disabled
+         */
+        sSortableNone?: string;
+
+        /**
+         * Default Value:
+         * sorting_
+         */
+        sSortColumn?: string;
+
+        sFilterInput?: string;
+        sLengthSelect?: string;
+
+        /**
+         * Default Value:
+         * dataTables_scroll
+         */
+        sScrollWrapper?: string;
+
+        /**
+         * Default Value:
+         * dataTables_scrollHead
+         */
+        sScrollHead?: string;
+
+        /**
+         * Default Value:
+         * dataTables_scrollHeadInner
+         */
+        sScrollHeadInner?: string;
+
+        /**
+         * Default Value:
+         * dataTables_scrollBody
+         */
+        sScrollBody?: string;
+
+        /**
+         * Default Value:
+         * dataTables_scrollFoot
+         */
+        sScrollFoot?: string;
+
+        /**
+         * Default Value:
+         * dataTables_scrollFootInner
+         */
+        sScrollFootInner?: string;
+
+        sHeaderTH?: string;
+        sFooterTH?: string;
+        sSortJUIAsc?: string;
+        sSortJUIDesc?: string;
+        sSortJUI?: string;
+        sSortJUIAscAllowed?: string;
+        sSortJUIDescAllowed?: string;
+        sSortJUIWrapper?: string;
+        sSortIcon?: string;
+        sJUIHeader?: string;
+        sJUIFooter?: string;
+    }
+    //#endregion "ext internal"
 }
diff --git a/types/datatables.net/tslint.json b/types/datatables.net/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/datatables.net/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/date-arithmetic/date-arithmetic-tests.ts b/types/date-arithmetic/date-arithmetic-tests.ts
new file mode 100644
index 0000000000..509551dd92
--- /dev/null
+++ b/types/date-arithmetic/date-arithmetic-tests.ts
@@ -0,0 +1,21 @@
+import dateArithmetic = require('dateArithmetic');
+
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'second');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'minutes');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'hours');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'day');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'week');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'month');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'year');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'decade');
+dateArithmetic.add(new Date(2010, 7, 23), 2, 'century');
+
+dateArithmetic.subtract(new Date(2010, 7, 30), 1, 'second');
+dateArithmetic.subtract(new Date(2010, 7, 29), 2, 'minutes');
+dateArithmetic.subtract(new Date(2010, 7, 28), 3, 'hours');
+dateArithmetic.subtract(new Date(2010, 7, 27), 4, 'day');
+dateArithmetic.subtract(new Date(2010, 7, 26), 5, 'week');
+dateArithmetic.subtract(new Date(2010, 7, 24), 6, 'month');
+dateArithmetic.subtract(new Date(2010, 7, 23), 7, 'year');
+dateArithmetic.subtract(new Date(2010, 7, 22), 8, 'decade');
+dateArithmetic.subtract(new Date(2010, 7, 21), 9, 'century');
diff --git a/types/date-arithmetic/index.d.ts b/types/date-arithmetic/index.d.ts
new file mode 100644
index 0000000000..ad669fd523
--- /dev/null
+++ b/types/date-arithmetic/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for date-arithmetic v3.1.0
+// Project: https://github.com/jquense/date-math
+// Definitions by: Sergii Paryzhskyi <https://github.com/HeeL>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Unit = 'second' | 'minutes' | 'hours' | 'day' | 'week' | 'month' | 'year' | 'decade' | 'century';
+
+/** dateArithmetic Public Instance Methods */
+interface dateArithmeticStatic {
+    /** Add specified amount of units to a provided date and return new date as a result */
+    add(date: Date, num: number, unit: Unit): Date;
+
+    /** Subtract specified amount of units from a provided date and return new date as a result */
+    subtract(date: Date, num: number, unit: Unit): Date;
+}
+
+declare module 'dateArithmetic' {
+    const dateArithmetic: dateArithmeticStatic;
+    export = dateArithmetic;
+}
diff --git a/types/date-arithmetic/tsconfig.json b/types/date-arithmetic/tsconfig.json
new file mode 100644
index 0000000000..d8942e343c
--- /dev/null
+++ b/types/date-arithmetic/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "date-arithmetic-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/date-arithmetic/tslint.json b/types/date-arithmetic/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/date-arithmetic/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/date.format.js/tslint.json b/types/date.format.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/date.format.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dateformat/tslint.json b/types/dateformat/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dateformat/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/datejs/tslint.json b/types/datejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/datejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/daterangepicker/daterangepicker-tests.ts b/types/daterangepicker/daterangepicker-tests.ts
index dc305bf1da..db79671721 100644
--- a/types/daterangepicker/daterangepicker-tests.ts
+++ b/types/daterangepicker/daterangepicker-tests.ts
@@ -34,7 +34,7 @@ function tests_simple() {
     $('#demo').daterangepicker({
         "startDate": "05/06/2016",
         "endDate": "05/12/2016"
-    }, function (start: string, end: string, label: string) {
+    }, function (start: moment.Moment, end: moment.Moment, label: string) {
         console.log("New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')");
     });
 
diff --git a/types/daterangepicker/index.d.ts b/types/daterangepicker/index.d.ts
index f01ffd59a3..4d777b17b6 100644
--- a/types/daterangepicker/index.d.ts
+++ b/types/daterangepicker/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Date Range Picker v2.1.25
+// Type definitions for Date Range Picker v2.1.30
 // Project: http://www.daterangepicker.com/
 // Definitions by: SirMartin <https://github.com/SirMartin>
 //                 Steven Masala <https://github.com/smasala>
+//                 Grant Hutchins <https://github.com/nertzy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -18,14 +19,15 @@ declare global {
 declare const daterangepicker: daterangepicker.DateRangePicker;
 
 declare namespace daterangepicker {
-    type DataRangePickerCallback = (start?: string | Date | moment.Moment, end?: string | Date | moment.Moment, label?: string) => any;
+    type DataRangePickerCallback = (start: moment.Moment, end: moment.Moment, label: string | null) => any;
 
     interface DateRangePicker {
         new (element: HTMLElement, settings?: daterangepicker.Settings, callback?: DataRangePickerCallback): DateRangePicker;
 
         startDate: moment.Moment;
         endDate: moment.Moment;
-        
+        container: JQuery;
+
         setStartDate(date: Date | moment.Moment | string): void;
         setEndDate(date: Date | moment.Moment | string): void;
         remove(): void;
diff --git a/types/daterangepicker/package.json b/types/daterangepicker/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/daterangepicker/package.json
+++ b/types/daterangepicker/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/daterangepicker/tslint.json b/types/daterangepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/daterangepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/db-migrate-base/tslint.json b/types/db-migrate-base/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/db-migrate-base/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/db-migrate-pg/tslint.json b/types/db-migrate-pg/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/db-migrate-pg/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/db.js/tslint.json b/types/db.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/db.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dc/index.d.ts b/types/dc/index.d.ts
index 7d893baf3e..69ee20a93e 100644
--- a/types/dc/index.d.ts
+++ b/types/dc/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for DCJS
 // Project: https://github.com/dc-js/dc.js
-// Definitions by: hans windhoff <https://github.com/hansrwindhoff>, matt traynham <https://github.com/mtraynham>
+// Definitions by: hans windhoff <https://github.com/hansrwindhoff>
+//                 matt traynham <https://github.com/mtraynham>
+//                 matthias jobst <https://github.com/MatthiasJobst>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // this makes only sense together with d3 and crossfilter so you need the d3.d.ts and crossfilter.d.ts files
@@ -49,8 +51,9 @@ declare namespace dc {
         format: Accessor<any, string>;
     }
 
+    // http://dc-js.github.io/dc.js/docs/html/dc.units.html
     export interface UnitFunction {
-        (start: number, end: number, domain?: Array<any>): number|Array<any>;
+        (start: number|Date, end: number|Date, domain?: number|Array<string>): number | Array<number|Date|string>;
     }
 
     export interface FloatPointUnits {
@@ -135,12 +138,13 @@ declare namespace dc {
         minHeight: IGetSet<number, T>;
         dimension: IGetSet<any, T>;
         data: IGetSetComputed<(group: any) => Array<any>, Array<any>, T>;
-        group: IGetSet<any, T>;
+        // http://dc-js.github.io/dc.js/docs/html/dc.baseMixin.html#group__anchor
+        group: IBiGetSet<any, string, T>;
         ordering: IGetSet<Accessor<any, any>, T>;
         filterAll(): void;
-        select(selector: d3.Selection<any>|string): d3.Selection<any>;
-        selectAll(selector: d3.Selection<any>|string): d3.Selection<any>;
-        anchor(anchor: BaseMixin<any>|d3.Selection<any>|string, chartGroup?: string): d3.Selection<any>;
+        select(selector: d3.Selection<any> | string): d3.Selection<any>;
+        selectAll(selector: d3.Selection<any> | string): d3.Selection<any>;
+        anchor(anchor: BaseMixin<any> | d3.Selection<any> | string, chartGroup?: string): d3.Selection<any>;
         anchorName(): string;
         svg: IGetSet<d3.Selection<any>, d3.Selection<any>>;
         resetSvg(): void;
@@ -196,10 +200,11 @@ declare namespace dc {
     }
 
     export interface ColorMixin<T> {
-        colors: IGetSet<Array<string> | Scale<string | d3.Color>, T>;
-        ordinalColors(r: Array<string>): void;
-        linearColors(r: Array<string>): void;
-        colorAccessor: IGetSet<Accessor<any, string>, T>;
+        // http://dc-js.github.io/dc.js/docs/html/dc.colorMixin.html
+        colors: IGetSet<Array<string> | Scale<string | d3.Color> | string, T>;
+        ordinalColors(r: Array<string>): T;
+        linearColors(r: Array<string>): T;
+        colorAccessor: IGetSet<Accessor<any, number>, T>;
         colorDomain: IGetSet<Array<any>, T>;
         calculateColorDomain(): void;
         getColor(datum: any, index?: number): string;
@@ -291,7 +296,7 @@ declare namespace dc {
         dashStyle: IGetSet<Array<number>, LineChart>;
         renderArea: IGetSet<boolean, LineChart>;
         dotRadius: IGetSet<number, LineChart>;
-        renderDataPoints: IGetSet<RenderDataPointOptions|any, LineChart>;
+        renderDataPoints: IGetSet<RenderDataPointOptions | any, LineChart>;
     }
 
     export interface DataCountWidgetHTML {
@@ -307,7 +312,7 @@ declare namespace dc {
     export interface DataTableWidget extends BaseMixin<DataTableWidget> {
         size: IGetSet<number, DataTableWidget>;
         showGroups: IGetSet<boolean, DataTableWidget>;
-        columns: IGetSet<Array<string|Accessor<any, any>|Columns>, DataTableWidget>;
+        columns: IGetSet<Array<string | Accessor<any, any> | Columns>, DataTableWidget>;
         sortBy: IGetSet<Accessor<any, any>, DataTableWidget>;
         order: IGetSet<(a: any, b: any) => number, DataTableWidget>;
     }
@@ -336,7 +341,7 @@ declare namespace dc {
         rightYAxis: IGetSet<d3.svg.Axis, ICompositeChart<T>>;
     }
 
-    export interface CompositeChart extends ICompositeChart<CompositeChart> {}
+    export interface CompositeChart extends ICompositeChart<CompositeChart> { }
 
     export interface SeriesChart extends ICompositeChart<SeriesChart> {
         chart: IGetSet<(c: any) => BaseMixin<any>, SeriesChart>;
@@ -412,6 +417,16 @@ declare namespace dc {
         tickFormat: IGetSet<Accessor<number, string>, BoxPlot>;
     }
 
+    // https://github.com/dc-js/dc.js/blob/master/src/select-menu.js
+    export interface SelectMenu extends BaseMixin<SelectMenu> {
+        order: IGetSet<(a: any, b: any) => number, SelectMenu>;
+        promptText: IGetSet<string, SelectMenu>;
+        filterDisplayed: IGetSet<(a: {value: any, key: any}, index: number) => boolean, SelectMenu>;
+        multiple: IGetSet<boolean, SelectMenu>;
+        promptValue: IGetSet<any, SelectMenu>;
+        numberVisible: IGetSet<number, SelectMenu>;
+    }
+
     export interface ChartRegistry {
         has(chart: BaseMixin<any>): boolean;
         register(chart: BaseMixin<any>, group?: string): void;
@@ -444,11 +459,16 @@ declare namespace dc {
         round: Round;
         utils: Utils;
 
+        // http://dc-js.github.io/dc.js/docs/html/core.js.html, Line 20
+        version: string;
+
         legend(): Legend;
 
         pieChart(parent: string, chartGroup?: string): PieChart;
-        barChart(parent: string, chartGroup?: string): BarChart;
-        lineChart(parent: string, chartGroup?: string): LineChart;
+        // http://dc-js.github.io/dc.js/docs/html/dc.barChart.html
+        barChart(parent: string | CompositeChart, chartGroup?: string): BarChart;
+        // http://dc-js.github.io/dc.js/docs/html/dc.lineChart.html
+        lineChart(parent: string | CompositeChart, chartGroup?: string): LineChart;
         dataCount(parent: string, chartGroup?: string): DataCountWidget;
         dataTable(parent: string, chartGroup?: string): DataTableWidget;
         dataGrid(parent: string, chartGroup?: string): DataGridWidget;
@@ -462,6 +482,6 @@ declare namespace dc {
         numberDisplay(parent: string, chartGroup?: string): NumberDisplayWidget;
         heatMap(parent: string, chartGroup?: string): HeatMap;
         boxPlot(parent: string, chartGroup?: string): BoxPlot;
+        selectMenu(parent: string, chartGroup?: string): SelectMenu;
     }
-}
-
+}
\ No newline at end of file
diff --git a/types/dc/tslint.json b/types/dc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/debug/tslint.json b/types/debug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/debug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/decimal.js/decimal.js-tests.ts b/types/decimal.js/decimal.js-tests.ts
deleted file mode 100644
index f05434a72f..0000000000
--- a/types/decimal.js/decimal.js-tests.ts
+++ /dev/null
@@ -1,401 +0,0 @@
-
-var x = new Decimal(9)
-var y = new Decimal(x)
-
-Decimal(435.345)
-
-new Decimal('5032485723458348569331745.33434346346912144534543')
-new Decimal('4.321e+4')
-new Decimal('-735.0918e-430')
-new Decimal('5.6700000')
-new Decimal(Infinity)
-new Decimal(NaN)
-new Decimal('.5')
-new Decimal('+2')
-new Decimal(-10110100.1, 2)
-new Decimal('123412421.234324', 5)
-new Decimal('ff.8', 16)
-
-Decimal.config({ precision: 5 })
-new Decimal(1.23456789)
-new Decimal(1.23456789, 10)
-
-
-Decimal.config({
-    precision: 20,
-    rounding: 4,
-    toExpNeg: -7,
-    toExpPos: 21,
-    minE: -9e15,
-    maxE: 9e15,
-    errors: true,
-    crypto: false,
-    modulo: 1,
-    format: {
-        decimalSeparator: '.',
-        groupSeparator: ',',
-        groupSize: 3,
-        secondaryGroupSize: 0,
-        fractionGroupSeparator: '\xA0',
-        fractionGroupSize: 0
-    }
-});
-
-Decimal.config({
-    format: {
-
-        decimalSeparator: '.',
-
-        groupSeparator: ',',
-
-        groupSize: 3,
-
-        secondaryGroupSize: 0,
-
-        fractionGroupSeparator: ' ',
-
-        fractionGroupSize: 0
-    }
-});
-Decimal.config({ rounding: Decimal.ROUND_CEIL })
-Decimal.config({ rounding: 2 })
-Decimal.rounding
-
-x = new Decimal(1.3)
-x.ceil()
-y = new Decimal(-1.8)
-y.ceil()
-
-x.comparedTo(y)
-x.comparedTo(x.minus(1))
-y.cmp(NaN)
-y.cmp('110', 2)
-
-x.decimalPlaces()
-y.dp()
-
-x.dividedBy(y)
-x.div(5)
-x.div(47, 16)
-
-x.dividedToIntegerBy(y)
-x.divToInt(0.7)
-x.divToInt('0.f', 16)
-
-x.equals('1e-324')
-new Decimal(-0).eq(x)
-new Decimal(255).eq('ff', 16)
-
-y = new Decimal(NaN)
-y.equals(NaN)
-
-x = new Decimal(1)
-x.exponential()
-y = new Decimal(2)
-y.exp()
-
-x = new Decimal(1.8)
-x.floor()
-y = new Decimal(-1.3)
-y.floor()
-
-x.greaterThan(Decimal(0.3).minus(0.2))
-new Decimal(0).gt(x)
-new Decimal(11, 3).gt(11.1, 2)
-
-
-x = new Decimal(0.3).minus(0.2)
-x.greaterThanOrEqualTo(0.1)
-new Decimal(1).gte(x)
-new Decimal(10, 18).gte('i', 36)
-
-x = new Decimal(1)
-x.isFinite()
-y = new Decimal(Infinity)
-y.isFinite()
-
-x = new Decimal(1)
-x.isInteger()
-y = new Decimal(123.456)
-y.isInt()
-
-x = new Decimal(NaN)
-x.isNaN()
-y = new Decimal('Infinity')
-y.isNaN()
-
-x = new Decimal(-0)
-x.isNegative()
-y = new Decimal(2)
-y.isNeg
-
-x = new Decimal(-0)
-x.isZero() && x.isNeg()
-y = new Decimal(Infinity)
-y.isZero()
-
-x.lessThan(0.1)
-new Decimal(0).lt(x)
-new Decimal(11.1, 2).lt(11, 3)
-
-x.lessThan(0.1)
-new Decimal(0).lt(x)
-new Decimal(11.1, 2).lt(11, 3)
-
-x = new Decimal(0.1)
-x.lessThanOrEqualTo(Decimal(0.3).minus(0.2))
-new Decimal(-1).lte(x)
-new Decimal(10, 18).lte('i', 36)
-
-x = new Decimal(1000)
-x.logarithm()
-y = new Decimal(256)
-y.log(2)
-
-x = new Decimal(0.3)
-x.minus(0.1)
-x.minus(0.6, 20)
-
-x = new Decimal(1)
-x.modulo(0.9)
-
-y = new Decimal(33)
-y.mod('a', 33)
-
-x = new Decimal(8)
-y = new Decimal(-3)
-Decimal.modulo = 1
-x.mod(y)
-Decimal.modulo = 3
-x.mod(y)
-
-x = new Decimal(10)
-x.naturalLogarithm()
-y = new Decimal('1.23e+30')
-y.ln()
-
-x = new Decimal(1.8)
-x.negated()
-y = new Decimal(-1.3)
-y.neg()
-
-x = new Decimal(0.1)
-y = x.plus(0.2)
-new Decimal(0.7).plus(x).plus(y)
-x.plus('0.1', 8)
-
-x = new Decimal(1.234)
-x.precision()
-y = new Decimal(987000)
-y.sd()
-y.sd(true)
-
-Decimal.config({ rounding: 4 })
-x.round()
-
-Decimal.rounding = Decimal.ROUND_DOWN
-x.round()
-x
-
-x = new Decimal(16)
-x.squareRoot()
-y = new Decimal(3)
-y.sqrt()
-y.sqrt().eq(y.pow(0.5))
-
-x = new Decimal(0.6)
-y = x.times(3)
-new Decimal('7e+500').times(y)
-x.times('-a', 16)
-
-x = new Decimal(12.24567)
-x.toDecimalPlaces(0)
-x.toDecimalPlaces(1, 0)
-
-y = new Decimal(9876.54321)
-y.toDP(3)
-y.toDP(1, 0)
-y.toDP(1, Decimal.ROUND_DOWN)
-
-y = new Decimal(x)
-x.toExponential()
-y.toExponential()
-x.toExponential(0)
-y.toExponential(0)
-x.toExponential(1)
-y.toExponential(1)
-y.toExponential(1, 1)
-x.toExponential(3)
-y.toExponential(3)
-
-y = new Decimal(x)
-x.toFixed()
-y.toFixed()
-y.toFixed(0)
-x.toFixed(2)
-y.toFixed(2)
-y.toFixed(2, 1)
-x.toFixed(5)
-y.toFixed(5)
-
-Decimal.config({
-    format: {
-        decimalSeparator: '.',
-        groupSeparator: ',',
-        groupSize: 3,
-        secondaryGroupSize: 0,
-        fractionGroupSeparator: ' ',
-        fractionGroupSize: 0
-    }
-});
-
-x = new Decimal('123456789.123456789')
-x.toFormat()
-x.toFormat(1)
-
-
-Decimal.format.groupSeparator = ' ';
-Decimal.format.fractionGroupSize = 5;
-x.toFormat()
-
-
-Decimal.format = {
-    decimalSeparator: ',',
-    groupSeparator: '.',
-    groupSize: 3,
-    secondaryGroupSize: 2
-}
-
-x.toFormat()
-
-x.toFraction()
-
-var pi = new Decimal('3.14159265358')
-pi.toFraction()
-pi.toFraction(100000)
-pi.toFraction(10000)
-pi.toFraction(100)
-pi.toFraction(10)
-pi.toFraction(1)
-
-
-
-x = new Decimal('177.7e+457')
-y = new Decimal(235.4325)
-var z = new Decimal('0.0098074')
-
-// Serialize an array of three Decimals
-var str = JSON.stringify([x, y, z])
-// "["1.777e+459","235.4325","0.0098074"]"
-
-// Return an array of three Decimals
-JSON.parse(str, function(key, val) {
-    return key === '' ? val : new Decimal(val)
-})
-
-x = new Decimal(1.39)
-x.toNearest(0.25)
-
-y = new Decimal(0.75)
-y.toNearest(0.5, 0)
-y.toNearest(0.5, 1)
-
-x = new Decimal(456.789)
-x.toNumber()
-
-y = new Decimal('45987349857634085409857349856430985')
-y.toNumber()
-
-z = new Decimal(-0)
-1 / +z
-1 / z.toNumber()
-
-Math.pow(0.7, 2)
-x = new Decimal(0.7)
-x.toPower(2)
-new Decimal(3).pow(-2)
-
-new Decimal(1217652.23).pow('98765.489305603941')
-y = new Decimal(x)
-x.toPrecision()
-y.toPrecision()
-x.toPrecision(1)
-y.toPrecision(1)
-y.toPrecision(2, 0)
-y.toPrecision(2, 1)
-x.toPrecision(5)
-y.toPrecision(5)
-
-Decimal.config({ precision: 5, rounding: 4 })
-x = new Decimal(9876.54321)
-
-x.toSignificantDigits()
-x.toSignificantDigits(6)
-x.toSignificantDigits(6, Decimal.ROUND_UP)
-x.toSD(2)
-x.toSD(2, 1)
-
-x = new Decimal(750000)
-x.toString()
-Decimal.config({ toExpPos: 5 })
-x.toString()
-
-y = new Decimal(362.875)
-y.toString(2)
-y.toString(9)
-y.toString(32)
-
-Decimal.config({ precision: 4 });
-z = new Decimal('1.23456789')
-z.toString()
-z.toString(10)
-
-x = new Decimal(123.456)
-x.truncated()
-y = new Decimal(-12.3)
-y.trunc()
-
-x = new Decimal('1.777e+457')
-x.valueOf()
-
-x = Decimal.exp(3)
-y = new Decimal(3).exp()
-x.equals(y)
-
-x = Decimal.ln(4.321)
-y = new Decimal(4.321).ln()
-x.equals(y)
-
-x = Decimal.log(100, 2.5)
-y = new Decimal(100).log(2.5)
-x.equals(y)
-
-x = new Decimal('3257869345.0378653')
-Decimal.max(4e9, x, '123456789.9')
-
-var arr = [12, '13', new Decimal(14)]
-Decimal.max(arr)
-
-x = new Decimal('3257869345.0378653')
-Decimal.min(4e9, x, '123456789.9')
-
-arr = [2, new Decimal(-14), '-15.9999', -12]
-Decimal.min(arr)
-
-x = new Decimal(2)
-var D = Decimal.noConflict()
-Decimal
-y = new D(3)
-
-x = Decimal.pow(3257.4, 17.01)
-y = new Decimal(3257.4).pow(17.01)
-x.equals(y)
-
-Decimal.config({ precision: 10 })
-Decimal.random()
-
-Decimal.random(20)
-
-x = Decimal.sqrt('987654321.123456789')
-y = new Decimal('987654321.123456789').sqrt()
-x.equals(y)
diff --git a/types/decimal.js/index.d.ts b/types/decimal.js/index.d.ts
deleted file mode 100644
index 27f4213612..0000000000
--- a/types/decimal.js/index.d.ts
+++ /dev/null
@@ -1,767 +0,0 @@
-// Type definitions for decimal.js
-// Project: http://mikemcl.github.io/decimal.js
-// Definitions by: Joseph Rossi <https://github.com/musicist288>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var Decimal: decimal.IDecimalStatic;
-
-// Support AMD require
-declare module 'decimal.js' {
-    export = Decimal;
-}
-
-declare namespace decimal {
-
-    enum RoundingMode {
-        /**
-         * Rounds away from zero
-         */
-        ROUND_UP = 0,
-
-        /**
-         * Rounds towards zero
-         */
-        ROUND_DOWN = 1,
-
-        /**
-         * Rounds towards Infinity
-         */
-        ROUND_CEIL = 2,
-
-        /**
-         * Rounds towards -Infinity
-         */
-        ROUND_FLOOR = 3,
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds away from zero
-         */
-        ROUND_HALF_UP = 4,
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards zero
-         */
-        ROUND_HALF_DOWN = 5,
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards even neighbour
-         */
-        ROUND_HALF_EVEN = 6,
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards Infinity
-         */
-        ROUND_HALF_CEIL = 7,
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards -Infinity
-         */
-        ROUND_HALF_FLOOR = 8,
-
-        /**
-         * Not a rounding mode, see modulo
-         */
-        EUCLID = 9,
-    }
-
-    interface IFormatConfig {
-        decimalSeparator?: string;
-        groupSeparator?: string;
-        groupSize?: number;
-        secondaryGroupSize?: number;
-        fractionGroupSeparator?: string;
-        fractionGroupSize?: number;
-    }
-
-    interface IDecimalConfig {
-        /**
-         * number: integer, 1 to 1e+9 inclusive
-         * Default value: 20
-         *
-         * The maximum number of significant digits of the result of a calculation or base conversion.
-         *
-         * All methods which return a Decimal will round the return value to precision significant digits except absoluteValue, ceil, floor, negated, round, toDecimalPlaces, toNearest and truncated.
-         *
-         * A Decimal constructor will also not round to precision unless a base is specified.
-         */
-        precision?: number;
-
-        /**
-         * number: integer, 0 to 8 inclusive
-         * Default value: 4 (ROUND_HALF_UP)
-         *
-         * The default rounding mode used when rounding the result of a calculation or base conversion to precision significant digits, and when rounding the return value of the round, toDecimalPlaces, toExponential, toFixed, toFormat, toNearest, toPrecision and toSignificantDigits methods.
-         *
-         * The rounding modes are available as enumerated properties of the constructor.
-         */
-        rounding?: RoundingMode;
-
-        /**
-         * number: integer, -9e15 to 0 inclusive
-         * Default value: -7
-         *
-         * The negative exponent value at and below which toString returns exponential notation.
-         * @type {[type]}
-         */
-        toExpNeg?: number;
-
-        /**
-         * number: integer, 0 to 9e15 inclusive
-         * Default value: 20
-         *
-         * The positive exponent value at and above which toString returns exponential notation.
-         */
-        toExpPos?: number;
-
-        /**
-         * number: integer, -9e15 to 0 inclusive
-         * Default value: -9e15
-         *
-         * The negative exponent limit, i.e. the exponent value below which underflow to zero occurs.
-         *
-         * If the Decimal to be returned by a calculation would have an exponent lower than minE then its value becomes zero.
-         *
-         * JavaScript numbers underflow to zero for exponents below -324.
-         */
-        minE?: number;
-
-        /**
-         * number: integer, 0 to 9e15 inclusive
-         * Default value: 9e15
-         *
-         * The positive exponent limit, i.e. the exponent value above which overflow to Infinity occurs.
-         *
-         * If the Decimal to be returned by a calculation would have an exponent higher than maxE then its value becomes Infinity.
-         *
-         * JavaScript numbers overflow to Infinity for exponents above 308.
-         */
-        maxE?: number;
-
-        /**
-         * boolean/number: true, false, 1 or 0
-         * Default value: true
-         *
-         * The value that determines whether Decimal Errors are thrown. If errors is false, this library will not throw errors.
-         */
-        errors?: boolean | number;
-
-        /**
-         * boolean/number: true, false, 1 or 0
-         * Default value: false
-         *
-         * The value that determines whether cryptographically-secure pseudo-random number generation is used.
-         *
-         * If crypto is truthy then the random method will generate random digits using crypto.getRandomValues in browsers that support it, or crypto.randomBytes if using a version of Node.js that supports it.
-         *
-         * If neither function is supported by the host environment or if crypto is falsey then the source of randomness will be Math.random. If the crypto property is set directly (i.e. without using config) to true, then at the time the random method is called, if errors is true, an error will be thrown if the crypto methods are unavailable.
-         */
-        crypto?: boolean | number;
-
-        /**
-         * number: integer, 0 to 9 inclusive
-         * Default value: 1 (ROUND_DOWN)
-         *
-         * The modulo mode used when calculating the modulus: a mod n.
-         *
-         * The quotient, q = a / n, is calculated according to the rounding mode that corresponds to the chosen modulo mode.
-         *
-         * The remainder, r, is calculated as: r = a - n * q.
-         *
-         * The modes that are most commonly used for the modulus/remainder operation are ROUND_UP, ROUND_DOWN, ROUND_FLOOR, ROUND_HALF_EVEN, and EUCLID. Although the other rounding modes can be used, they may not give useful results.
-         */
-        modulo?: RoundingMode;
-
-        /**
-         * The format object configures the format of the string returned by the toFormat method.
-         *
-         * The example below shows the properties of the format object that are recognised, and their default values.
-         *
-         * Unlike setting other properties using config, the values of the properties of the format object will not be checked for validity. The existing format object will simply be replaced by the object that is passed in. Only the toFormat method ever references a Decimal constructor's format object property.
-         *
-         * See toFormat for examples of usage, and of setting format properties individually and directly without using config.
-         */
-        format?: IFormatConfig;
-    }
-
-    interface IDecimalStatic extends IDecimalConfig {
-        default: IDecimalStatic;
-
-        (value: number | string | Decimal, base?: number): Decimal;
-
-        new(value: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Configures the 'global' settings for this particular Decimal constructor.
-         *
-         * Returns this Decimal constructor.
-         */
-        config(object: IDecimalConfig): IDecimalStatic;
-
-        /**
-         * Returns a new independent Decimal constructor with configuration settings as described by object
-         */
-        constructor(object: IDecimalConfig): IDecimalStatic;
-
-        /**
-         * Returns a new Decimal whose value is the base e (Euler's number, the base of the natural logarithm) exponential of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         */
-        exp(n: number | string | Decimal): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the natural logarithm of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The natual logarithm is the inverse of the exponential function.
-         */
-        ln(n: number | string | Decimal): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the base n logarithm of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         *
-         * If n is null or undefined, then the base 10 logarithm of the value of this Decimal will be returned.
-         */
-        log(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the maximum of arg1, arg2,... .
-         */
-        max(...args: any[]): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the minimum of arg1, arg2,... .
-         */
-        min(...args: any[]): Decimal;
-
-        /**
-         * Reverts the Decimal variable to the value it had before this library was loaded and returns a reference to the original Decimal constructor so it can be assigned to a variable with a different name.
-         */
-        noConflict(): IDecimalStatic;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal raised to the power n, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The performance of this method degrades exponentially with increasing digits. For non-integer exponents in particular, the performance of this method may not be adequate.
-         */
-        pow(base: number | string | Decimal, exponent: number | string | Decimal): Decimal;
-
-        /**
-         * Returns a new Decimal with a pseudo-random value equal to or greater than 0 and less than 1. The return value will have dp decimal places (or less if trailing zeros are produced). If dp is omitted then the number of decimal places will default to the current precision setting.
-         *
-         * Depending on the value of a Decimal constructor's crypto property and the support for the crypto object in the host environment, the random digits of the return value are generated by either Math.random (fastest), crypto.getRandomValues (Web Cryptography API in recent browsers) or crypto.randomBytes (Node.js).
-         *
-         * If crypto is true, i.e. one of the crypto methods is to be used, the value of a returned Decimal should be cryptographically-secure and statistically indistinguishable from a random value.
-         */
-        random(dp?: number): Decimal;
-
-        /**
-         * The return value will be correctly rounded, i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
-         *
-         * This method is much faster than using the toPower method with an exponent of 0.5.
-         */
-        sqrt(arg: number | string | Decimal): Decimal;
-
-        /**
-         * A Decimal instance with value one.
-         */
-        ONE: number;
-
-         /**
-         * Rounds away from zero
-         */
-        ROUND_UP: number;
-
-        /**
-         * Rounds towards zero
-         */
-        ROUND_DOWN: number;
-
-        /**
-         * Rounds towards Infinity
-         */
-        ROUND_CEIL: number;
-
-        /**
-         * Rounds towards -Infinity
-         */
-        ROUND_FLOOR: number;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds away from zero
-         */
-        ROUND_HALF_UP: number;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards zero
-         */
-        ROUND_HALF_DOWN: number;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards even neighbour
-         */
-        ROUND_HALF_EVEN: number;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards Infinity
-         */
-        ROUND_HALF_CEIL: number;
-
-        /**
-         * Rounds towards nearest neighbour.
-         * If equidistant, rounds towards -Infinity
-         */
-        ROUND_HALF_FLOOR: number;
-
-        /**
-         * Not a rounding mode, see modulo
-         */
-        EUCLID: number;
-    }
-
-    interface Decimal {
-
-        /**
-         * Returns a new Decimal whose value is the absolute value, i.e. the magnitude, of the value of this Decimal.
-         *
-         * The return value is not rounded.
-         */
-        absoluteValue(): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the absolute value, i.e. the magnitude, of the value of this Decimal.
-         *
-         * The return value is not rounded.
-         */
-        abs(): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal rounded to a whole number in the direction of positive Infinity.
-         *
-         * The return value is not rounded to precision.
-         */
-        ceil(): Decimal;
-
-        /**
-         * @return 1, -1, 0, or null
-         *         1   If the value of this Decimal is greater than the
-         *             value of n
-         *        -1   If the value of this Decimal is less than the value
-         *             of n
-         *         0   If this Decimal and n have the same value
-         *      null   If the value of either this Decimal or n is NaN
-         */
-        comparedTo(n: number | string | Decimal, base?: number): number;
-
-        /**
-         * Returns 1, -1, 0, or null
-         *         1   If the value of this Decimal is greater than the value
-         *             of n
-         *        -1   If the value of this Decimal is less than the value
-         *             of n
-         *         0   If this Decimal and n have the same value
-         *      null   If the value of either this Decimal or n is NaN
-         */
-        cmp(n: number | string | Decimal, base?: number): number;
-
-        /**
-         * Returns the number of decimal places, i.e. the number of digits after the decimal point, of the value of this Decimal.
-         */
-        decimalPlaces(): number;
-
-        /**
-         * Returns the number of decimal places, i.e. the number of digits after the decimal point, of the value of this Decimal.
-         */
-        dp(): number;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal divided by n, rounded to precision significant digits using rounding mode rounding.
-         */
-        dividedBy(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal divided by n, rounded to precision significant digits using rounding mode rounding.
-         */
-        div(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Return a new Decimal whose value is the integer part of dividing this Decimal by n, rounded to precision significant digits using rounding mode rounding.
-         */
-        dividedToIntegerBy(n: number | string| Decimal, base?: number): Decimal;
-
-        /**
-         * Return a new Decimal whose value is the integer part of dividing this Decimal by n, rounded to precision significant digits using rounding mode rounding.
-         */
-        divToInt(n: number | string| Decimal, base?: number): Decimal;
-
-        /**
-         * Returns true if the value of this Decimal equals the value of n, otherwise returns false.
-         *
-         * As with JavaScript, NaN does not equal NaN.
-         *
-         * Note: This method uses the cmp method internally.
-         */
-        equals(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Returns true if the value of this Decimal equals the value of n, otherwise returns false.
-         *
-         * As with JavaScript, NaN does not equal NaN.
-         *
-         * Note: This method uses the cmp method internally.
-         */
-        eq(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Returns a new Decimal whose value is the base e (Euler's number, the base of the natural logarithm) exponential of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         */
-        exponential(): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the base e (Euler's number, the base of the natural logarithm) exponential of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         */
-        exp(): Decimal;
-
-        /**
-         * The return value is not rounded to precision.
-         */
-        floor(): Decimal;
-
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        greaterThan(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        gt(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        greaterThanOrEqualTo(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        gte(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * The only possible non-finite values of a Decimal are NaN, Infinity and -Infinity.
-         */
-        isFinite(): boolean;
-
-        isInteger(): boolean;
-
-        isInt(): boolean;
-
-        isNaN(): boolean;
-
-        isNegative(): boolean;
-
-        isNeg(): boolean;
-
-        isZero(): boolean;
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        lessThan(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        lt(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        lessThanOrEqualTo(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Note: This method uses cmp method internally.
-         */
-        lte(n: number | string | Decimal, base?: number): boolean;
-
-        /**
-         * Returns a new Decimal whose value is the base n logarithm of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         *
-         * If n is null or undefined, then the base 10 logarithm of the value of this Decimal will be returned.
-         */
-        logarithm(n?: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the base n logarithm of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         *
-         * If n is null or undefined, then the base 10 logarithm of the value of this Decimal will be returned.
-         */
-        log(n?: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal minus n, rounded to precision significant digits using rounding mode rounding.
-         */
-        minus(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal modulo n, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The value returned, and in particular its sign, is dependent on the value of the modulo property of this Decimal's constructor. If it is 1 (default value), the result will have the same sign as this Decimal, and it will match that of Javascript's % operator (within the limits of double precision) and BigDecimal's remainder method.
-         */
-        modulo(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal modulo n, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The value returned, and in particular its sign, is dependent on the value of the modulo property of this Decimal's constructor. If it is 1 (default value), the result will have the same sign as this Decimal, and it will match that of Javascript's % operator (within the limits of double precision) and BigDecimal's remainder method.
-         */
-        mod(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the natural logarithm of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The natual logarithm is the inverse of the exponential function.
-         */
-        naturalLogarithm(): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the natural logarithm of the value of this Decimal, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The natual logarithm is the inverse of the exponential function.
-         */
-        ln(): Decimal;
-
-        /**
-         * The return value is not rounded.
-         */
-        negated(): Decimal;
-
-        /**
-         * The return value is not rounded.
-         */
-        neg(): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal plus n, rounded to precision significant digits using rounding mode rounding.
-         */
-        plus(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * If include_zeros is true or 1 then any trailing zeros of the integer part of a number are counted as significant digits, otherwise they are not.
-         */
-        precision(include_leading_zeros?: boolean | number): number;
-
-        /**
-         * If include_zeros is true or 1 then any trailing zeros of the integer part of a number are counted as significant digits, otherwise they are not.
-         */
-        sd(include_leading_zeros?: boolean | number): number;
-
-        round(): Decimal;
-
-        /**
-         * The return value will be correctly rounded, i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
-         *
-         * This method is much faster than using the toPower method with an exponent of 0.5.
-         */
-        squareRoot(): Decimal;
-
-        /**
-         * The return value will be correctly rounded, i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
-         *
-         * This method is much faster than using the toPower method with an exponent of 0.5.
-         */
-        sqrt(): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal times n, rounded to precision significant digits using rounding mode rounding.
-         */
-        times(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal rounded to dp decimal places using rounding mode rm.
-         *
-         * If dp is omitted or is null or undefined, the return value will have the same value as this Decimal.
-         *
-         * If rm is omitted or is null or undefined, rounding mode rounding is used.
-         */
-        toDecimalPlaces(dp?: number, rm?: RoundingMode): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal rounded to dp decimal places using rounding mode rm.
-         *
-         * If dp is omitted or is null or undefined, the return value will have the same value as this Decimal.
-         *
-         * If rm is omitted or is null or undefined, rounding mode rounding is used.
-         */
-        toDP(dp?: number, rm?: RoundingMode): Decimal;
-
-        /**
-         * Returns a string representing the value of this Decimal in exponential notation rounded using rounding mode rm to dp decimal places, i.e with one digit before the decimal point and dp digits after it.
-         *
-         * If the value of this Decimal in exponential notation has fewer than dp fraction digits, the return value will be appended with zeros accordingly.
-         *
-         * If dp is omitted, or is null or undefined, the number of digits after the decimal point defaults to the minimum number of digits necessary to represent the value exactly.
-         *
-         * If rm is omitted or is null or undefined, rounding mode rounding is used.
-         */
-        toExponential(dp?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a string representing the value of this Decimal in normal (fixed-point) notation rounded to dp decimal places using rounding mode rm.
-         *
-         * If the value of this Decimal in normal notation has fewer than dp fraction digits , the return value will be appended with zeros accordingly.
-         *
-         * Unlike Number.prototype.toFixed, which returns exponential notation if a number is greater or equal to 1021, this method will always return normal notation.
-         *
-         * If dp is omitted or is null or undefined, then the return value will be unrounded and in normal notation. This is unlike Number.prototype.toFixed, which returns the value to zero decimal places, but is useful when because of the current toExpNeg or toExpNeg values, toString returns exponential notation
-         *
-         * if rm is omitted or is null or undefined, rounding mode rounding is used.
-         */
-        toFixed(dp?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a string representing the value of this Decimal in fixed-point notation rounded to dp decimal places using rounding mode rm (as toFixed), and formatted according to the properties of this Decimal's constructor's format object property.
-         *
-         * See the examples below for the properties of the format object, their types and their usage.
-         *
-         * If dp is omitted or is null or undefined, then the return value is not rounded to a fixed number of decimal places.
-         *
-         * if rm is omitted or is null or undefined, rounding mode rounding is used.
-         */
-        toFormat(dp?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a string array representing the value of this Decimal as a simple fraction with an integer numerator and an integer denominator. The denominator will be a positive non-zero value less than or equal to max_denominator.
-         *
-         * If a maximum denominator is not specified, or is null or undefined, the denominator will be the lowest value necessary to represent the number exactly.
-         */
-        toFraction(max_denominator?: number | string | Decimal): string[];
-
-        toJSON(): string;
-
-        /**
-         * Returns a new Decimal whose value is the nearest multiple of n to the value of this Decimal.
-         *
-         * If the value of this Decimal is equidistant from two multiples of n, the rounding mode rm, or rounding if rm is omitted or is null or undefined, determines the direction of the nearest.
-         *
-         * In this context, rounding mode ROUND_HALF_UP is interpreted the same as rounding mode ROUND_UP, and so on. I.e. the rounding is either up, own, to ceil, to floor or to even.
-         *
-         * The return value will always have the same sign as this Decimal, unless either this Decimal or n is NaN, in which case the return value will be also be NaN.
-         *
-         * The return value is not rounded to precision.
-         */
-        toNearest(n: number | string | Decimal, rm?: RoundingMode): Decimal;
-
-        /**
-         * Returns the value of this Decimal converted to a number primitive.
-         *
-         * Type coercion with, for example, JavaScript's unary plus operator will also work, except that a Decimal with the value minus zero will convert to positive zero.
-         */
-        toNumber(): number;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal raised to the power n, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The performance of this method degrades exponentially with increasing digits. For non-integer exponents in particular, the performance of this method may not be adequate.
-         */
-        toPower(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal raised to the power n, rounded to precision significant digits using rounding mode rounding.
-         *
-         * The performance of this method degrades exponentially with increasing digits. For non-integer exponents in particular, the performance of this method may not be adequate.
-         */
-        pow(n: number | string | Decimal, base?: number): Decimal;
-
-        /**
-         * Returns a string representing the value of this Decimal rounded to sd significant digits using rounding mode rm.
-         *
-         * If sd is less than the number of digits necessary to represent the integer part of the value in normal (fixed-point) notation, then exponential notation is used.
-         *
-         * If sd is omitted or is null or undefined, then the return value is the same as toString.
-         *
-         * if rm is omitted or is null or undefined, rounding mode rounding is used.
-         */
-        toPrecision(sd?: number, rm?: RoundingMode): string;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal rounded to sd significant digits using rounding mode rm.
-         *
-         * If sd is omitted or is null or undefined, the return value will be rounded to precision significant digits.
-         *
-         * if rm is omitted or is null or undefined, rounding mode rounding will be used.
-         */
-        toSignificantDigits(sd?: number, rm?: RoundingMode): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal rounded to sd significant digits using rounding mode rm.
-         *
-         * If sd is omitted or is null or undefined, the return value will be rounded to precision significant digits.
-         *
-         * if rm is omitted or is null or undefined, rounding mode rounding will be used.
-         */
-        toSD(sd?: number, rm?: RoundingMode): Decimal;
-
-        /**
-         * base: number: integer, 2 to 64 inclusive
-         *
-         * Returns a string representing the value of this Decimal in the specified base, or base 10 if base is omitted or is null or undefined.
-         *
-         * For bases above 10, values from 10 to 35 are represented by a-z (as with Number.prototype.toString), 36 to 61 by A-Z, and 62 and 63 by $ and _ respectively.
-         *
-         * If a base is specified the value is rounded to precision significant digits using rounding mode rounding.
-         *
-         * If a base is not specified and this Decimal has a positive exponent that is equal to or greater than toExpPos, or a negative exponent equal to or less than toExpNeg, then exponential notation is returned.
-         *
-         * If base is null or undefined it is ignored.
-         */
-        toString(base?: number): string;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal truncated to a whole number.
-         *
-         * The return value is not rounded to precision.
-         */
-        truncated(): Decimal;
-
-        /**
-         * Returns a new Decimal whose value is the value of this Decimal truncated to a whole number.
-         *
-         * The return value is not rounded to precision.
-         */
-        trunc(): Decimal;
-
-        /**
-         * As toString, but does not accept a base argument.
-         */
-        valueOf(): string;
-
-        /**
-         * coefficient
-         *
-         * Array of integers, each 0 - 1e7
-         */
-        c: number[];
-
-        /**
-         * exponent
-         *
-         * Integer, -9e15 to 9e15 inclusive
-         */
-        e: number;
-
-        /**
-         * sign
-         *
-         * -1 or 1
-         */
-        s: number;
-    }
-}
diff --git a/types/decimal.js/tsconfig.json b/types/decimal.js/tsconfig.json
deleted file mode 100644
index e2474fecd5..0000000000
--- a/types/decimal.js/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "decimal.js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/decorum/tslint.json b/types/decorum/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/decorum/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/deep-assign/index.d.ts b/types/deep-assign/index.d.ts
index 46d4cf09f2..e03eb76323 100644
--- a/types/deep-assign/index.d.ts
+++ b/types/deep-assign/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for clone 0.1.11
+// Type definitions for deep-assign 0.1
 // Project: https://github.com/sindresorhus/deep-assign
 // Definitions by: Ionut Costica <https://github.com/souldreamer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/deep-assign/tslint.json b/types/deep-assign/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/deep-assign/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/deep-diff/tslint.json b/types/deep-diff/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/deep-diff/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/deep-extend/deep-extend-tests.ts b/types/deep-extend/deep-extend-tests.ts
index 7c909e74c8..f6db47b8d0 100644
--- a/types/deep-extend/deep-extend-tests.ts
+++ b/types/deep-extend/deep-extend-tests.ts
@@ -1,6 +1,5 @@
-
 import * as deepExtend from 'deep-extend';
-var obj1 = {
+const obj1 = {
   a: 1,
   b: 2,
   d: {
@@ -13,7 +12,7 @@ var obj1 = {
   i: 321,
   j: [1, 2]
 };
-var obj2 = {
+const obj2 = {
   b: 3,
   c: 5,
   d: {
@@ -22,14 +21,12 @@ var obj2 = {
   },
   e: { one: 1, two: 2 },
   f: [42],
-  g: function(){},
+  g() {},
   h: /abc/g,
-  i: null as {aaa: boolean},
+  i: null,
   j: [3, 4]
 };
 
 deepExtend(obj1, obj2);
 deepExtend(obj1, obj2, {ccc: 3});
 deepExtend(obj1, obj2, {ccc: 3}, {ddd: 4});
-
-
diff --git a/types/deep-extend/index.d.ts b/types/deep-extend/index.d.ts
index 8c03cb9d10..b3b183682f 100644
--- a/types/deep-extend/index.d.ts
+++ b/types/deep-extend/index.d.ts
@@ -1,12 +1,9 @@
-// Type definitions for open 0.4.1
+// Type definitions for deep-extend 0.4
 // Project: https://github.com/unclechu/node-deep-extend
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-/*
- * Recursive object extending.
- */
+/** Recursive object extending. */
 declare function deepExtend<T, U>(target: T, source: U): T & U;
 declare function deepExtend<T, U, V>(target: T, source1: U, source2: V): T & U & V;
 declare function deepExtend<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
diff --git a/types/deep-extend/tsconfig.json b/types/deep-extend/tsconfig.json
index c41646d000..768b1ac92d 100644
--- a/types/deep-extend/tsconfig.json
+++ b/types/deep-extend/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/deep-extend/tslint.json b/types/deep-extend/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/deep-extend/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/deepmerge/index.d.ts b/types/deepmerge/index.d.ts
index 797e52c8a5..05f5c96d2e 100644
--- a/types/deepmerge/index.d.ts
+++ b/types/deepmerge/index.d.ts
@@ -18,3 +18,10 @@ declare namespace deepmerge {
 
     function all<T>(objects: Array<Partial<T>>, options?: Options): T;
 }
+
+declare global {
+    interface Window {
+        deepmerge<T>(x: Partial<T>, y: Partial<T>, options?: deepmerge.Options): T;
+        deepmerge<T1, T2>(x: T1, y: T2, options?: deepmerge.Options): T1 & T2;
+    }
+}
diff --git a/types/defaults/tslint.json b/types/defaults/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/defaults/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/defer-promise/defer-promise-tests.ts b/types/defer-promise/defer-promise-tests.ts
new file mode 100644
index 0000000000..cdf80657f9
--- /dev/null
+++ b/types/defer-promise/defer-promise-tests.ts
@@ -0,0 +1,23 @@
+import defer = require('defer-promise');
+
+// $ExpectType Deferred<number>
+const a = defer<number>();
+// $ExpectType void
+a.resolve(5);
+// $ExpectError
+a.resolve('foo');
+// $ExpectError
+a.resolve();
+
+// $ExpectType Deferred<void>
+const b = defer<void>();
+// $ExpectType void
+b.resolve();
+// $ExpectError
+b.resolve(5);
+
+const c: DeferPromise.Deferred<string> = defer();
+// $ExpectType void
+c.resolve('foo');
+// $ExpectType Promise<string>
+c.promise;
diff --git a/types/defer-promise/index.d.ts b/types/defer-promise/index.d.ts
new file mode 100644
index 0000000000..8516e63b30
--- /dev/null
+++ b/types/defer-promise/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for defer-promise 1.0
+// Project: https://github.com/75lb/defer-promise#readme
+// Definitions by: Niklas Fiekas <https://github.com/niklasf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+// tslint:disable-next-line no-unnecessary-generics
+declare function defer<T>(): DeferPromise.Deferred<T>;
+
+export = defer;
+
+declare global {
+    namespace DeferPromise {
+        interface Deferred<T> {
+            promise: Promise<T>;
+            resolve(value: T | PromiseLike<T>): void;
+            resolve(this: Deferred<void>): void;
+            reject(reason?: any): void;
+        }
+    }
+}
diff --git a/types/defer-promise/tsconfig.json b/types/defer-promise/tsconfig.json
new file mode 100644
index 0000000000..1aaa667626
--- /dev/null
+++ b/types/defer-promise/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5",
+            "es2015.Promise"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "defer-promise-tests.ts"
+    ]
+}
diff --git a/types/defer-promise/tslint.json b/types/defer-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/defer-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/deku/tslint.json b/types/deku/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/deku/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/delay/index.d.ts b/types/delay/index.d.ts
index f84c7ab5e4..0ec894f1e1 100644
--- a/types/delay/index.d.ts
+++ b/types/delay/index.d.ts
@@ -22,9 +22,9 @@ declare namespace delay {
     type PDelayedPassThroughThunk<TValue> = ((value: TValue) => DelayedPromiseLike<TValue>) & DelayedPromiseLike<void>;
 
     interface DelayedPromiseLike<T> {
-        then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
-                                             onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-        catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<T | TResult>;
+        then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
+                                             onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
+        catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null): Promise<T | TResult>;
         cancel(): void;
     }
 }
diff --git a/types/denodeify/tslint.json b/types/denodeify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/denodeify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/deoxxa-content-type/tslint.json b/types/deoxxa-content-type/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/deoxxa-content-type/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/depcheck/depcheck-tests.ts b/types/depcheck/depcheck-tests.ts
new file mode 100644
index 0000000000..4bc811a669
--- /dev/null
+++ b/types/depcheck/depcheck-tests.ts
@@ -0,0 +1,29 @@
+import depcheck = require('depcheck');
+
+const options: depcheck.Options = {
+    withoutDev: false,
+    ignoreBinPackage: false,
+    ignoreDirs: ['sandbox', 'dist', 'bower_components'],
+    ignoreMatches: ['grunt-*'],
+    parsers: {
+        '*.js': depcheck.parser.es6,
+        '*.jsx': depcheck.parser.jsx,
+    },
+    detectors: [
+        depcheck.detector.requireCallExpression,
+        depcheck.detector.importDeclaration,
+    ],
+    specials: [depcheck.special.eslint, depcheck.special.webpack],
+};
+
+// $ExpectType Promise<Results>
+depcheck('/', options);
+
+depcheck('/', options, unused => {
+    const dependencies: string[] = unused.dependencies;
+    const devDependencies: string[] = unused.devDependencies;
+    const missing: string[] = unused.missing;
+    const using: string[] = unused.using;
+    const invalidFiles: string[] = unused.invalidFiles;
+    const invalidDirs: string[] = unused.invalidDirs;
+});
diff --git a/types/depcheck/index.d.ts b/types/depcheck/index.d.ts
new file mode 100644
index 0000000000..c512ae5067
--- /dev/null
+++ b/types/depcheck/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for depcheck 0.6
+// Project: https://github.com/depcheck/depcheck
+// Definitions by: ark120202 <https://github.com/ark120202>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function depcheck(
+    rootDir: string,
+    options: depcheck.Options,
+): Promise<depcheck.Results>;
+
+declare function depcheck<T>(
+    rootDir: string,
+    options: depcheck.Options,
+    callback: (results: depcheck.Results) => T,
+): Promise<T>;
+
+declare namespace depcheck {
+    interface Node {
+        [key: string]: any;
+    }
+
+    type Parser = (
+        content: string,
+        filePath: string,
+        deps: ReadonlyArray<string>,
+        rootDir: string,
+    ) => Node;
+
+    type Detector = (node: Node) => ReadonlyArray<string> | string;
+
+    interface Options {
+        withoutDev?: boolean;
+        ignoreBinPackage?: boolean;
+        ignoreDirs?: ReadonlyArray<string>;
+        ignoreMatches?: ReadonlyArray<string>;
+        parsers?: {
+            [match: string]: Parser;
+        };
+        detectors?: ReadonlyArray<Detector>;
+        specials?: ReadonlyArray<Parser>;
+    }
+
+    interface Results {
+        dependencies: string[];
+        devDependencies: string[];
+        missing: string[];
+        using: string[];
+        invalidFiles: string[];
+        invalidDirs: string[];
+    }
+
+    const parser: {
+        coffee: Parser;
+        es6: Parser;
+        es7: Parser;
+        jsx: Parser;
+        sass: Parser;
+        typescript: Parser;
+    };
+
+    const detector: {
+        expressViewEngine: Detector;
+        gruntLoadTaskCallExpression: Detector;
+        importDeclaration: Detector;
+        requireCallExpression: Detector;
+        requireResolveCallExpression: Detector;
+    };
+
+    const special: {
+        babel: Parser;
+        bin: Parser;
+        commitizen: Parser;
+        eslint: Parser;
+        'feross-standard': Parser;
+        'gulp-load-plugins': Parser;
+        mocha: Parser;
+        webpack: Parser;
+    };
+}
+
+export = depcheck;
diff --git a/types/depcheck/tsconfig.json b/types/depcheck/tsconfig.json
new file mode 100644
index 0000000000..f3a0a7df65
--- /dev/null
+++ b/types/depcheck/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "depcheck-tests.ts"
+    ]
+}
diff --git a/types/depcheck/tslint.json b/types/depcheck/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/depcheck/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/deployjava/tslint.json b/types/deployjava/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/deployjava/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/detect-browser/detect-browser-tests.ts b/types/detect-browser/detect-browser-tests.ts
index 336da5150a..48abb964f8 100644
--- a/types/detect-browser/detect-browser-tests.ts
+++ b/types/detect-browser/detect-browser-tests.ts
@@ -1,5 +1,7 @@
+import { detect } from 'detect-browser';
+const browser = detect();
 
-import detectBrowser = require("detect-browser");
-
-const n: string = detectBrowser.name;
-const v: string = detectBrowser.version;
+if (browser) {
+    const name: string = browser.name;
+    const version: string = browser.version;
+}
diff --git a/types/detect-browser/index.d.ts b/types/detect-browser/index.d.ts
index 57ed80c411..351067ff59 100644
--- a/types/detect-browser/index.d.ts
+++ b/types/detect-browser/index.d.ts
@@ -1,14 +1,27 @@
-// Type definitions for detect-browser v1.6.2
+// Type definitions for detect-browser 2.0
 // Project: https://github.com/DamonOehlman/detect-browser
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-/**
- * Browser name
- */
-export const name: "edge" | "yandexbrowser" | "chrome" | "crios" | "firefox" | "opera" | "ie" | "bb10" | "android" | "ios" | "safari";
+export type BrowserName =
+    "android" |
+    "bb10" |
+    "chrome" |
+    "crios" |
+    "edge" |
+    "firefox" |
+    "fxios" |
+    "ie" |
+    "ios" |
+    "kakaotalk" |
+    "opera" |
+    "phantomjs" |
+    "safari" |
+    "vivaldi" |
+    "yandexbrowser";
 
-/**
- * Browser version
- */
-export const version: string;
+export function detect(): null | {
+    name: BrowserName | "node";
+    version: string;
+    os: string;
+};
diff --git a/types/detect-browser/tsconfig.json b/types/detect-browser/tsconfig.json
index 076582077e..b1319407fc 100644
--- a/types/detect-browser/tsconfig.json
+++ b/types/detect-browser/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/detect-browser/tslint.json b/types/detect-browser/tslint.json
new file mode 100644
index 0000000000..dc8ddaa586
--- /dev/null
+++ b/types/detect-browser/tslint.json
@@ -0,0 +1,10 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "indent": [
+            true,
+            "spaces",
+            4
+        ]
+    }
+}
diff --git a/types/devexpress-web/tslint.json b/types/devexpress-web/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/devexpress-web/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/devexpress-web/v161/tslint.json b/types/devexpress-web/v161/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/devexpress-web/v161/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/devexpress-web/v162/tslint.json b/types/devexpress-web/v162/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/devexpress-web/v162/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/devtools-detect/tslint.json b/types/devtools-detect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/devtools-detect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/df-visible/tslint.json b/types/df-visible/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/df-visible/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dhtmlxgantt/tslint.json b/types/dhtmlxgantt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dhtmlxgantt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dhtmlxscheduler/index.d.ts b/types/dhtmlxscheduler/index.d.ts
index 96c9670a4d..007a049623 100644
--- a/types/dhtmlxscheduler/index.d.ts
+++ b/types/dhtmlxscheduler/index.d.ts
@@ -1212,6 +1212,14 @@ interface SchedulerStatic {
 	 * @param config the configuration object of the timespan to mark/block
 	*/
 	addMarkedTimespan(config: any): number;
+	
+	/**
+	 * adds a new keyboard shortcut
+	 * @param shortcut the key name or the name of keys combination for a shortcut (shortcut syntax)
+	 * @param handler the handler of the shortcut call
+	 * @param scope the name of the context element to attach the handler function to (list of scopes)
+	 */
+	addShortcut(shortcut: string, handler: () => void, scope?: any): void;
 
 	/**
 	 * adds a section to the currently active view (if the opened view isn't Timeline in the 'Tree' mode - the method will be ignored)
@@ -1558,6 +1566,13 @@ interface SchedulerStatic {
 	 * @param type (<i>'json', 'xml', 'ical'</i>) the data type. The default value - <i>'xml'</i>
 	*/
 	parse(data: any, type?: string): void;
+	
+	/**
+	 * removes a keyboard shortcut
+	 * @param shortcut the key name or the name of keys combination for a shortcut (shortcut syntax)
+	 * @param scope the element to which the shortcut is attached (list of scopes)
+	 */
+	removeShortcut(shortcut: string, scope: any): void;
 
 	/**
 	 * creates a mini calendar
diff --git a/types/dhtmlxscheduler/tslint.json b/types/dhtmlxscheduler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dhtmlxscheduler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/di-lite/tslint.json b/types/di-lite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/di-lite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/diff2html/tslint.json b/types/diff2html/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/diff2html/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/disposable-email-domains/tslint.json b/types/disposable-email-domains/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/disposable-email-domains/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/doccookies/tslint.json b/types/doccookies/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/doccookies/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dock-spawn/tslint.json b/types/dock-spawn/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dock-spawn/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index ac569b2d32..094584dfec 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -400,10 +400,10 @@ declare namespace Dockerode {
       LinkLocalIPv6Address: string;
       LinkLocalIPv6PrefixLen: number;
       Ports: {
-        [portAndProtocol: string]: {
+        [portAndProtocol: string]: Array<{
           HostIp: string;
           HostPort: string;
-        }
+        }>;
       };
       SandboxKey: string;
       SecondaryIPAddresses?: any;
@@ -945,6 +945,9 @@ declare class Dockerode {
   info(callback: Callback<any>): void;
   info(): Promise<any>;
 
+  df(callback: Callback<any>): void;
+  df(): Promise<any>;
+
   version(callback: Callback<any>): void;
   version(): Promise<any>;
 
diff --git a/types/docopt/tslint.json b/types/docopt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/docopt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/doctrine/tslint.json b/types/doctrine/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/doctrine/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/documentdb-server/documentdb-server-tests.ts b/types/documentdb-server/documentdb-server-tests.ts
index d4e8e7f40c..71cb482c09 100644
--- a/types/documentdb-server/documentdb-server-tests.ts
+++ b/types/documentdb-server/documentdb-server-tests.ts
@@ -1,6 +1,6 @@
 
 
-// Samples taken from http://dl.windowsazure.com/documentDB/jsserverdocs/Collection.html
+// Samples taken from http://azure.github.io/azure-documentdb-js-server/Collection.html
 function chain() {
     var name: string = "John";
     var result: IQueryResponse = __.chain()
@@ -228,118 +228,6 @@ function count(filterQuery: string, continuationToken: string) {
     }
 }
 
-/**
-* This is run as stored procedure and does the following:
-* - create ordered result set (result) which is an array sorted by orderByFieldName parameter.
-* - call collection.queryDocuments.
-* - in the callback for each document, insert into an array (result)
-* - in the end, sort the resulting array and return it to the client
-*
-* Important notes:
-* - The resulting record set could be too large to fit into one response
-*   - To walk around that, we setBody by one element and catch the REQUEST_ENTITY_TOO_LARGE exception.
-*     When we get the exception, return resulting set to the client with continuation token
-*     to continue from item index specified by this token.
-*   - Note that when continuation is called, it will be different transaction
-*
-* @param {String} filterQuery - Optional filter for query.
-* @param {String} orderByFieldName - The name of the field to order by resulting set.
-* @param {String} continuationToken - The continuation token passed by request, continue counting from this token.
-*/
-function orderBy(filterQuery: string, orderByFieldName: string, continuationToken: number) {
-    // HTTP error codes sent to our callback funciton by DocDB server.
-    var ErrorCode: any = {
-        REQUEST_ENTITY_TOO_LARGE: 413,
-    }
-
-    var collection: ICollection = getContext().getCollection();
-    var collectionLink: string = collection.getSelfLink();
-    var result: Array<any> = new Array();
-
-    tryQuery({});
-
-    function tryQuery(options: IFeedOptions) {
-        var isAccepted: boolean = (filterQuery && filterQuery.length) ?
-            collection.queryDocuments(collectionLink, filterQuery, options, callback) :
-            collection.readDocuments(collectionLink, options, callback)
-
-        if (!isAccepted) throw new Error("Source dataset is too large to complete the operation.");
-    }
-
-    /**
-    * queryDocuments callback.
-    * @param {Error} err - Error object in case of error/exception.
-    * @param {Array} queryFeed - array containing results of the query.
-    * @param {ResponseOptions} responseOptions.
-    */
-    function callback(err: IFeedCallbackError, queryFeed: Array<any>, responseOptions: IFeedCallbackOptions) {
-        if (err) {
-            throw err;
-        }
-
-        // Iterate over document feed and store documents into the result array.
-        queryFeed.forEach(function (element: any, index: number, array: Array<any>) {
-            result[result.length] = element;
-        });
-
-        if (responseOptions.continuation) {
-            // If there is continuation, call query again providing continuation token.
-            tryQuery({ continuation: responseOptions.continuation });
-        } else {
-            // We are done with querying/got all results. Sort the results and return from the script.
-            result.sort(compare);
-
-            fillResponse();
-        }
-    }
-
-    // Compare two objects(documents) using field specified by the orderByFieldName parameter.
-    // Return 0 if equal, -1 if less, 1 if greater.
-    function compare(x: any, y: any) {
-        if (x[orderByFieldName] == y[orderByFieldName]) return 0;
-        else if (x[orderByFieldName] < y[orderByFieldName]) return -1;
-        return 1;
-    }
-
-    // This is called in the very end on an already sorted array.
-    // Sort the results and set the response body.
-    function fillResponse() {
-        // Main script is called with continuationToken which is the index of 1st item to start result batch from.
-        // Slice the result array and discard the beginning. From now on use the 'continuationResult' var.
-        var continuationResult: Array<any> = result;
-        if (continuationToken) continuationResult = result.slice(continuationToken);
-        else continuationToken = 0;
-
-        // Get/initialize the response.
-        var response: IResponse = getContext().getResponse();
-        response.setBody(null);
-
-        // Take care of response body getting too large:
-        // Set Response iterating by one element. When we fail due to MAX response size, return to the client requesting continuation.
-        var i = 0;
-        for (; i < continuationResult.length; ++i) {
-            try {
-                // Note: setBody is very expensive vs appendBody, use appendBody with simple approximation JSON.stringify(element).
-                response.appendBody(JSON.stringify(continuationResult[i]));
-            } catch (ex) {
-                if (!ex.number == ErrorCode.REQUEST_ENTITY_TOO_LARGE) throw ex;
-                break;
-            }
-        }
-
-        // Now next batch to return to client has i elements.
-        // Slice the continuationResult if needed and discard the end.
-        var partialResult: Array<any> = continuationResult;
-        var newContinuation: string = null;
-        if (i < continuationResult.length) {
-            partialResult = continuationResult.slice(0, i);
-        }
-
-        // Finally, set response body.
-        response.setBody({ result: result, continuation: newContinuation });
-    }
-}
-
 
 /**
 * This is run as stored procedure and does the following:
@@ -445,6 +333,8 @@ function bulkDeleteSproc(query: string) {
     }
 }
 
+// NOTE: the sample `sum` stored procedure (https://github.com/Azure/azure-documentdb-js-server/blob/master/samples/stored-procedures/sum.js) does not currently work, because it appears to throw an invalid Error object. See https://github.com/Azure/azure-documentdb-js-server/issues/23 to track this issue.
+
 /**
  * A DocumentDB stored procedure that updates a document by id, using a similar syntax to MongoDB's update operator.<br/>
  * <br/>
@@ -614,7 +504,7 @@ function updateSproc(id: string, update: Object) {
                 } else if (document[existingFieldName]) {
                     // If the field exists, set/overwrite the new field name and unset the existing field name.
                     document[newFieldName] = document[existingFieldName];
-                    delete document[existingFieldName];
+                    delete document[existingFieldName]; // tslint:disable-line no-dynamic-delete
                 } else {
                     // Otherwise this is a noop.
                 }
@@ -641,7 +531,7 @@ function updateSproc(id: string, update: Object) {
         if (update.$unset) {
             fields = Object.keys(update.$unset);
             for (i = 0; i < fields.length; i++) {
-                delete document[fields[i]];
+                delete document[fields[i]]; // tslint:disable-line no-dynamic-delete
             }
         }
     }
@@ -750,130 +640,6 @@ function updateSproc(id: string, update: Object) {
     }
 }
 
-/**
- * A DocumentDB stored procedure that upserts a given document (insert new or update if present) using its id property.<br/>
- * This implementation tries to create, and if the create fails then query for the document with the specified document's id, then replace it.
- * Use this sproc if creates are more common than replaces, otherwise use "upsertOptimizedForReplace"
- *
- * @function
- * @param {Object} document - A document that should be upserted into this collection.
- * @returns {Object.<string>} Returns an object with the property:<br/>
- *   op - created (or) replaced.
- */
-function upsert(document: IDocumentMeta) {
-    var context: IContext = getContext();
-    var collection: ICollection = context.getCollection();
-    var collectionLink: string = collection.getSelfLink();
-    var response: IResponse = context.getResponse();
-    var errorCodes: any = { CONFLICT: 409 };
-
-    // Not checking for existence of document.id for compatibility with createDocument.
-    if (!document) throw new Error("The document is undefined or null.");
-
-    tryCreate(document, callback);
-
-    function tryCreate(doc: IDocumentMeta, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
-        var isAccepted: boolean = collection.createDocument(collectionLink, doc, callback);
-        if (!isAccepted) throw new Error("Unable to schedule create document");
-        response.setBody({ "op": "created" });
-    }
-
-    // To replace the document, first issue a query to find it and then call replace.
-    function tryReplace(doc: IDocumentMeta, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
-        retrieveDoc(doc, null, function (retrievedDocs: Array<IDocumentMeta>) {
-            var isAccepted: boolean = collection.replaceDocument(retrievedDocs[0]._self, doc, callback);
-            if (!isAccepted) throw new Error("Unable to schedule replace document");
-            response.setBody({ "op": "replaced" });
-        });
-    }
-
-    function retrieveDoc(doc: IDocumentMeta, continuation: string, callback: Function) {
-        var query: IParameterizedQuery = { query: "select * from root r where r.id = @id", parameters: [{ name: "@id", value: doc.id }] };
-        var requestOptions: IFeedOptions = { continuation: continuation };
-        var isAccepted: boolean = collection.queryDocuments(collectionLink, query, requestOptions, function (err: IFeedCallbackError, retrievedDocs: Array<any>, responseOptions: IFeedCallbackOptions) {
-            if (err) throw err;
-
-            if (retrievedDocs.length > 0) {
-                callback(retrievedDocs);
-            } else if (responseOptions.continuation) {
-                // Conservative check for continuation. Not expected to hit in practice for the "id query"
-                retrieveDoc(doc, responseOptions.continuation, callback);
-            } else {
-                throw new Error("Error in retrieving document: " + doc.id);
-            }
-        });
-        if (!isAccepted) throw new Error("Unable to query documents");
-    }
-
-    // This is called when collection.createDocument is done in order to
-    // process the result.
-    function callback(err: IRequestCallbackError, doc: any, options: IRequestCallbackOptions) {
-        if (err) {
-            // Replace the document if status code is 409 and upsert is enabled
-            if (err.number == errorCodes.CONFLICT) {
-                return tryReplace(document, callback);
-            } else {
-                throw err;
-            }
-        }
-    }
-}
-
-/**
- * A DocumentDB stored procedure that upserts a given document (insert new or update if present) using its id property.<br/>
- * This implementation queries for the document's id, and creates if absent and replaces if found.
- * Use this sproc if replaces are more common than creates, otherwise use "upsert"
- *
- * @function
- * @param {Object} document - A document that should be upserted into this collection.
- * @returns {Object.<string>} Returns an object with the property:<br/>
- *   op - created (or) replaced.
- */
-function upsertOptimizedForReplace(document: any) {
-    var context: IContext = getContext();
-    var collection: ICollection = context.getCollection();
-    var collectionLink: string = collection.getSelfLink();
-    var response: IResponse = context.getResponse();
-
-    // Not checking for existence of document.id for compatibility with createDocument.
-    if (!document) throw new Error("The document is undefined or null.");
-
-    retrieveDoc(document, null, callback);
-
-    function retrieveDoc(doc: IDocumentMeta, continuation: string, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
-        var query: IParameterizedQuery = { query: "select * from root r where r.id = @id", parameters: [{ name: "@id", value: doc.id }] };
-        var requestOptions: IFeedOptions = { continuation: continuation };
-        var isAccepted: boolean = collection.queryDocuments(collectionLink, query, requestOptions, function (err: IFeedCallbackError, retrievedDocs: Array<any>, responseOptions: IFeedCallbackOptions) {
-            if (err) throw err;
-            if (retrievedDocs.length > 0) {
-                tryReplace(retrievedDocs[0], doc, callback);
-            } else if (responseOptions.continuation) {
-                // Conservative check for continuation. Not expected to hit in practice for the "id query".
-                retrieveDoc(doc, responseOptions.continuation, callback);
-            } else {
-                tryCreate(doc, callback);
-            }
-        });
-        if (!isAccepted) throw new Error("Unable to query documents");
-    }
-
-    function tryCreate(doc: any, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
-        var isAccepted = collection.createDocument(collectionLink, doc, callback);
-        if (!isAccepted) throw new Error("Unable to schedule create document");
-        response.setBody({ "op": "created" });
-    }
-
-    function tryReplace(docToReplace: IDocumentMeta, docContent: any, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
-        var isAccepted = collection.replaceDocument(docToReplace._self, docContent, callback);
-        if (!isAccepted) throw new Error("Unable to schedule replace document");
-        response.setBody({ "op": "replaced" });
-    }
-
-    function callback(err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions): void {
-        if (err) throw err;
-    }
-}
-
 /**
 * This script runs as a pre-trigger when a document is inserted:
 * for each inserted document, validate/canonicalize document.weekday and create field document.createdTime.
@@ -963,56 +729,4 @@ function updateMetadata() {
     }
 }
 
-/**
- * This script is meant to run as a pre-trigger to enforce the uniqueness of the "name" property.
- */
-
-function validateName() {
-    var collection: ICollection = getContext().getCollection();
-    var request: IRequest = getContext().getRequest();
-    var docToCreate: any = request.getBody();
-
-    // Reject documents that do not have a name property by throwing an exception.
-    if (!docToCreate.name) {
-        throw new Error('Document must include a "name" property.');
-    }
-
-    lookForDuplicates();
-
-    function lookForDuplicates(continuation?: string) {
-        var query: IParameterizedQuery = {
-            query: 'SELECT * FROM myCollection c WHERE c.name = @name',
-            parameters: [{
-                name: '@name',
-                value: docToCreate.name
-            }]
-        };
-        var requestOptions: IFeedOptions = {
-            continuation: continuation
-        };
-
-        var isAccepted: boolean = collection.queryDocuments(collection.getSelfLink(), query, requestOptions,
-            function (err: IFeedCallbackError, results: Array<any>, responseOptions: IFeedCallbackOptions) {
-                if (err) {
-                    throw new Error('Error querying for documents with duplicate names: ' + err.body);
-                }
-                if (results.length > 0) {
-                    // At least one document with name exists.
-                    throw new Error('Document with the name, ' + docToCreate.name + ', already exists: ' + JSON.stringify(results[0]));
-                } else if (responseOptions.continuation) {
-                    // Else if the query came back empty, but with a continuation token; repeat the query w/ the token.
-                    // This is highly unlikely; but is included to serve as an example for larger queries.
-                    lookForDuplicates(responseOptions.continuation);
-                } else {
-                    // Success, no duplicates found! Do nothing.
-                }
-            }
-        );
-
-        // If we hit execution bounds - throw an exception.
-        // This is highly unlikely; but is included to serve as an example for more complex operations.
-        if (!isAccepted) {
-            throw new Error('Timeout querying for document with duplicate name.');
-        }
-    }
-}
+// NOTE: the sample `uniqueConstraint` trigger (https://github.com/Azure/azure-documentdb-js-server/blob/master/samples/triggers/uniqueConstraint.js) does not currently work, because it appears to use a method that does not exist on `Request`, and also appears to throw an invalid Error object. See https://github.com/Azure/azure-documentdb-js-server/issues/22 and https://github.com/Azure/azure-documentdb-js-server/issues/23 to track these issues.
diff --git a/types/documentdb-server/index.d.ts b/types/documentdb-server/index.d.ts
index 974c0661fa..dad0bad292 100644
--- a/types/documentdb-server/index.d.ts
+++ b/types/documentdb-server/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for DocumentDB server side JavaScript SDK
-// Project: http://dl.windowsazure.com/documentDB/jsserverdocs
-// Definitions by: François Nguyen <https://github.com/lith-light-g>
+// Type definitions for Cosmos DB server-side JavaScript SDK
+// Project: http://azure.github.io/azure-documentdb-js-server/
+// Definitions by: François Nguyen <https://github.com/lith-light-g>, John Downs <https://github.com/johndowns/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/** The Context object provides access to all operations that can be performed on DocumentDB data, as well as access to the request and response objects. */
+/** The Context object provides access to all operations that can be performed on Cosmos DB data, as well as access to the request and response objects. */
 interface IContext {
     /** Gets the collection object. */
     getCollection(): ICollection;
@@ -227,6 +227,9 @@ interface ICollection extends IQueryAPI {
     queryDocuments(collectionLink: string,
         filterQuery: string,
         callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+    queryDocuments<T>(collectionLink: string,
+        filterQuery: string,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): boolean;
     queryDocuments(collectionLink: string,
         filterQuery: string,
         options?: IFeedOptions,
@@ -238,6 +241,9 @@ interface ICollection extends IQueryAPI {
     queryDocuments(collectionLink: string,
         filterQuery: IParameterizedQuery,
         callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+    queryDocuments<T>(collectionLink: string,
+        filterQuery: IParameterizedQuery,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): boolean;
     queryDocuments(collectionLink: string,
         filterQuery: IParameterizedQuery,
         options?: IFeedOptions,
@@ -330,6 +336,36 @@ interface ICollection extends IQueryAPI {
         document: Object,
         options?: IReplaceOptions,
         callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+    
+	/**
+	 * Upsert an attachment for the document.
+	 * @param documentLink resource link of the document under which the attachment will be upserted
+	 * @param body metadata that defines the attachment media like media, contentType. It can include any other properties as part of the metadata.
+	 * @param options optional upsert options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    upsertAttachment(documentLink: string,
+        body: Object,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+    upsertAttachment(documentLink: string,
+        body: Object,
+        options?: IUpsertOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+
+    /**
+	 * Upsert a document under the collection.
+	 * @param collectionLink resource link of the collection under which the document will be upserted
+	 * @param body body of the document. The "id" property is required and will be generated automatically if not provided (this behaviour can be overriden using the UpsertOptions). Any other properties can be added.
+	 * @param options optional upsert options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    upsertDocument(collectionLink: string,
+        body: Object,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+    upsertDocument(collectionLink: string,
+        body: Object,
+        options?: IUpsertOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
 }
 
 /** Options associated with a create operation. */
@@ -541,6 +577,14 @@ interface IQueryParam {
     value: any;
 }
 
+/** Options associated with a upsert operation. */
+interface IUpsertOptions {
+    /** Specifies indexing directives. */
+    indexAction?: string;
+    /** Disables automatic generation of "id" field of the document to be upserted (if it is not provided) */
+    disableAutomaticIdGeneration?: string;
+}
+
 /** List of error codes returned by database operations in the RequestCallback and FeedCallback. See the corresponding error message for more details. */
 interface IErrorCodes {
     // Client error
diff --git a/types/documentdb-server/tslint.json b/types/documentdb-server/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/documentdb-server/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/documentdb-session/index.d.ts b/types/documentdb-session/index.d.ts
index 69914bdc6c..ed64df8921 100644
--- a/types/documentdb-session/index.d.ts
+++ b/types/documentdb-session/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/dwhieb/documentdb-session#readme
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import session = require("express-session");
 
diff --git a/types/documentdb/index.d.ts b/types/documentdb/index.d.ts
index 140470fbda..e7962ba568 100644
--- a/types/documentdb/index.d.ts
+++ b/types/documentdb/index.d.ts
@@ -133,7 +133,7 @@ export interface AbstractMeta extends UniqueId {
     _self: string;
 
     /** The time the object was created. */
-    _ts: string;
+    _ts: number;
 
     _rid?: string;
     _etag?: string;
@@ -553,6 +553,7 @@ export class HashPartitionResolver implements PartitionResolver {
  *
  * @deprecated
  */
+// tslint:disable-next-line no-unnecessary-class
 export class Range {
     /**
      * DEPRECATED
@@ -619,7 +620,8 @@ export class DocumentClient {
      */
     constructor(urlConnection: string, auth: AuthOptions, connectionPolicy?: ConnectionPolicy, consistencyLevel?: ConsistencyLevel);
 
-    /** Create an attachment for the document object.
+    /**
+     * Create an attachment for the document object.
      * <p>
      *  Each document may contain zero or more attachments. Attachments can be of any MIME type - text, image, binary data. <br>
      *  These are stored externally in Azure Blob storage. Attachments are automatically deleted when the parent document is deleted.
@@ -642,7 +644,8 @@ export class DocumentClient {
     createAttachmentAndUploadMedia(documentLink: string, readableStream: NodeJS.ReadableStream, options: MediaOptions, callback: RequestCallback<AttachmentMeta>): void;
     createAttachmentAndUploadMedia(documentLink: string, readableStream: NodeJS.ReadableStream, callback: RequestCallback<AttachmentMeta>): void;
 
-    /** Send a request for creating a database.
+    /**
+     * Send a request for creating a database.
      *  A database manages users, permissions and a set of collections.
      *  Each Azure DocumentDB Database Account is able to support multiple independent named databases, with the database being the logical container for data.
      *  Each Database consists of one or more collections, each of which in turn contain one or more documents. Since databases are an an administrative
@@ -757,7 +760,8 @@ export class DocumentClient {
     executeStoredProcedure<TResult>(procedureLink: string, params: any[], options: RequestOptions, callback: RequestCallback<TResult>): void;
     executeStoredProcedure<TResult>(procedureLink: string, paramsOrOptions: any[] | RequestOptions, callback: RequestCallback<TResult>): void;
 
-    /** Lists all databases that satisfy a query.
+    /**
+     * Lists all databases that satisfy a query.
      * @param query     - A SQL query string.
      * @param [options] - The feed options.
      * @returns         - An instance of QueryIterator to handle reading feed.
@@ -802,10 +806,10 @@ export class DocumentClient {
 
     /**
      * Query the triggers for the collection.
-     * @param {string} collectionLink         - The self-link of the collection.
-     * @param {SqlQuerySpec | string} query   - A SQL query.
-     * @param {FeedOptions} [options]         - Represents the feed options.
-     * @returns {QueryIterator}               - An instance of queryIterator to handle reading feed.
+     * @param collectionLink         - The self-link of the collection.
+     * @param query   - A SQL query.
+     * @param [options]         - Represents the feed options.
+     * @returns               - An instance of queryIterator to handle reading feed.
      */
     queryTriggers(collectionLink: string, query: DocumentQuery, options?: FeedOptions): QueryIterator<TriggerMeta>;
 
@@ -940,10 +944,10 @@ export class DocumentClient {
 
     /**
      * Replace the document object.
-     * @param {string} documentLink      - The self-link of the document.
-     * @param {object} document          - Represent the new document body.
-     * @param {RequestOptions} [options] - The request options.
-     * @param {RequestCallback} callback - The callback for the request.
+     * @param documentLink      - The self-link of the document.
+     * @param document          - Represent the new document body.
+     * @param [options] - The request options.
+     * @param callback - The callback for the request.
      */
     replaceDocument<TDocument>(documentLink: string, document: NewDocument, options: RequestOptions, callback: RequestCallback<RetrievedDocument>): void;
     replaceDocument<TDocument>(documentLink: string, document: NewDocument, callback: RequestCallback<RetrievedDocument>): void;
@@ -1340,107 +1344,107 @@ export class DocumentClient {
     getWriteEndpoint(callback: RequestCallback<string>): void;
 }
 
-export class UriFactory {
+export namespace UriFactory {
     /**
      * Given a database id, this creates a database link.
-     * @param {string} databaseId -The database id
-     * @returns {string}          -A database link in the format of dbs/{0} with {0} being a Uri escaped version of the databaseId
+     * @param databaseId -The database id
+     * @returns          -A database link in the format of dbs/{0} with {0} being a Uri escaped version of the databaseId
      * @description Would be used when creating or deleting a DocumentCollection or a User in Azure DocumentDB database service
      */
-    static createDatabaseUri(databaseId: string): string;
+    function createDatabaseUri(databaseId: string): string;
     /**
      * Given a database and collection id, this creates a collection link.
-     * @param {string} databaseId        -The database id
-     * @param {string} collectionId      -The collection id
-     * @returns {string}                 A collection link in the format of dbs/{0}/colls/{1} with {0} being a Uri escaped version of the databaseId and {1} being collectionId
+     * @param databaseId        -The database id
+     * @param collectionId      -The collection id
+     * @returns                 A collection link in the format of dbs/{0}/colls/{1} with {0} being a Uri escaped version of the databaseId and {1} being collectionId
      * @description Would be used when updating or deleting a DocumentCollection, creating a Document, a StoredProcedure, a
      *              Trigger, a UserDefinedFunction, or when executing a query with CreateDocumentQuery in Azure DocumentDB database service.
      */
-    static createDocumentCollectionUri(databaseId: string, collectionId: string): string;
+    function createDocumentCollectionUri(databaseId: string, collectionId: string): string;
     /**
      * Given a database and collection id, this creates a collection link.
-     * @param {string} databaseId        -The database id
-     * @param {string} collectionId      -The collection id
-     * @param {string} documentId        -The document id
-     * @returns {string}                 -A document link in the format of dbs/{0}/colls/{1}/docs/{2} with {0}
+     * @param databaseId        -The database id
+     * @param collectionId      -The collection id
+     * @param documentId        -The document id
+     * @returns                 -A document link in the format of dbs/{0}/colls/{1}/docs/{2} with {0}
      *                                    being a Uri escaped version of the databaseId, {1} being collectionId and {2} being the documentId
      * @description Would be used when creating an Attachment, or when replacing or deleting a Document in Azure DocumentDB database service
      */
-    static createDocumentUri(databaseId: string, collectionId: string, documentId: string): string;
+    function createDocumentUri(databaseId: string, collectionId: string, documentId: string): string;
     /**
      * Given a database, collection and document id, this creates a document link.
-     * @param {string} databaseId    -The database Id
-     * @param {string} userId        -The user Id
-     * @param {string} permissionId  - The permissionId
-     * @returns {string} A permission link in the format of dbs/{0}/users/{1}/permissions/{2} with {0} being a Uri escaped version of the databaseId, {1} being userId and {2} being permissionId
+     * @param databaseId    -The database Id
+     * @param userId        -The user Id
+     * @param permissionId  - The permissionId
+     * @returns A permission link in the format of dbs/{0}/users/{1}/permissions/{2} with {0} being a Uri escaped version of the databaseId, {1} being userId and {2} being permissionId
      * @description Would be used when replacing or deleting a Permission in Azure DocumentDB database service.
      */
-    static createPermissionUri(databaseId: string, userId: string, permissionId: string): string;
+    function createPermissionUri(databaseId: string, userId: string, permissionId: string): string;
 
     /**
      * Given a database, collection and stored proc id, this creates a stored proc link.
-     * @param {string} databaseId        -The database Id
-     * @param {string} collectionId      -The collection Id
-     * @param {string} storedProcedureId -The stored procedure Id
-     * @returns {string}                 -A stored procedure link in the format of dbs/{0}/colls/{1}/sprocs/{2}
+     * @param databaseId        -The database Id
+     * @param collectionId      -The collection Id
+     * @param storedProcedureId -The stored procedure Id
+     * @returns                 -A stored procedure link in the format of dbs/{0}/colls/{1}/sprocs/{2}
      *                                    with {0} being a Uri escaped version of the databaseId,
      *                                    {1} being collectionId and {2} being the storedProcedureId
      * @description Would be used when replacing, executing, or deleting a StoredProcedure in Azure DocumentDB database service.
      */
-    static createStoredProcedureUri(databaseId: string, collectionId: string, storedProcedureId: string): string;
+    function createStoredProcedureUri(databaseId: string, collectionId: string, storedProcedureId: string): string;
 
     /**
      * @summary Given a database, collection and trigger id, this creates a trigger link.
-     * @param {string} databaseId        -The database Id
-     * @param {string} collectionId      -The collection Id
-     * @param {string} triggerId         -The trigger Id
-     * @returns {string}                 -A trigger link in the format of dbs/{0}/colls/{1}/triggers/{2}
+     * @param databaseId        -The database Id
+     * @param collectionId      -The collection Id
+     * @param triggerId         -The trigger Id
+     * @returns                 -A trigger link in the format of dbs/{0}/colls/{1}/triggers/{2}
      *                                    with {0} being a Uri escaped version of the databaseId,
      *                                    {1} being collectionId and {2} being the triggerId
      * @description Would be used when replacing, executing, or deleting a Trigger in Azure DocumentDB database service
      */
-    static createTriggerUri(databaseId: string, collectionId: string, triggerId: string): string;
+    function createTriggerUri(databaseId: string, collectionId: string, triggerId: string): string;
 
     /**
      * @summary Given a database, collection and udf id, this creates a udf link.
-     * @param {string} databaseId        -The database Id
-     * @param {string} collectionId      -The collection Id
-     * @param {string} udfId             -The User Defined Function Id
-     * @returns {string}                 -A udf link in the format of dbs/{0}/colls/{1}/udfs/{2} with {0} being a Uri escaped version of the databaseId, {1} being collectionId and {2} being the udfId
+     * @param databaseId        -The database Id
+     * @param collectionId      -The collection Id
+     * @param udfId             -The User Defined Function Id
+     * @returns                 -A udf link in the format of dbs/{0}/colls/{1}/udfs/{2} with {0} being a Uri escaped version of the databaseId, {1} being collectionId and {2} being the udfId
      * @description Would be used when replacing, executing, or deleting a UserDefinedFunction in Azure DocumentDB database service
      */
-    static createUserDefinedFunctionUri(databaseId: string, collectionId: string, udfId: string): string;
+    function createUserDefinedFunctionUri(databaseId: string, collectionId: string, udfId: string): string;
 
     /**
      * @summary
-     * @param {string} databaseId        -The database Id
-     * @param {string} collectionId      -The collection Id
-     * @param {string} conflictId        -The conflict Id
-     * @returns {string}                 -A conflict link in the format of dbs/{0}/colls/{1}/conflicts/{2}
+     * @param databaseId        -The database Id
+     * @param collectionId      -The collection Id
+     * @param conflictId        -The conflict Id
+     * @returns                 -A conflict link in the format of dbs/{0}/colls/{1}/conflicts/{2}
      *                                    with {0} being a Uri escaped version of the databaseId, {1} being collectionId and {2} being the conflictId
      * @description Would be used when creating a Conflict in Azure DocumentDB database service.
      */
-    static createConflictUri(databaseId: string, collectionId: string, conflictId: string): string;
+    function createConflictUri(databaseId: string, collectionId: string, conflictId: string): string;
 
     /**
      * @summary Given a database, collection and conflict id, this creates a conflict link.
-     * @param {string} databaseId        -The database Id
-     * @param {string} collectionId      -The collection Id
-     * @param {string} documentId        -The document Id\
-     * @param {string} attachmentId      -The attachment Id
-     * @returns {string}                 -A conflict link in the format of dbs/{0}/colls/{1}/conflicts/{2} with {0} being a Uri escaped version of the databaseId,
+     * @param databaseId        -The database Id
+     * @param collectionId      -The collection Id
+     * @param documentId        -The document Id\
+     * @param attachmentId      -The attachment Id
+     * @returns                 -A conflict link in the format of dbs/{0}/colls/{1}/conflicts/{2} with {0} being a Uri escaped version of the databaseId,
      *                                    {1} being collectionId and {2} being the conflictId
      * @description Would be used when creating a Conflict in Azure DocumentDB database service.
      */
-    static createAttachmentUri(databaseId: string, collectionId: string, documentId: string, attachmentId: string): string;
+    function createAttachmentUri(databaseId: string, collectionId: string, documentId: string, attachmentId: string): string;
 
     /**
      * @summary Given a database and collection, this creates a partition key ranges link in the Azure DocumentDB database service.
-     * @param {string} databaseId        -The database Id
-     * @param {string} collectionId      -The collection Id
-     * @returns {string}                 -A partition key ranges link in the format of dbs/{0}/colls/{1}/pkranges with {0} being a Uri escaped version of the databaseId and {1} being collectionId
+     * @param databaseId        -The database Id
+     * @param collectionId      -The collection Id
+     * @returns                 -A partition key ranges link in the format of dbs/{0}/colls/{1}/pkranges with {0} being a Uri escaped version of the databaseId and {1} being collectionId
      */
-    static createPartitionKeyRangesUri(databaseId: string, collectionId: string): string;
+    function createPartitionKeyRangesUri(databaseId: string, collectionId: string): string;
 }
 
 export type MediaReadMode = 'Buffered' | 'Streamed';
diff --git a/types/dojo/dojox.charting.d.ts b/types/dojo/dojox.charting.d.ts
index 0f69eee3d4..d3336effd1 100644
--- a/types/dojo/dojox.charting.d.ts
+++ b/types/dojo/dojox.charting.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Dojo v1.9
 // Project: http://dojotoolkit.org
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
+//                 Don Waldo <https://github.com/dgwaldo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -13132,326 +13133,326 @@ declare namespace dojox {
 }
 
 declare module "dojox/charting/Chart3D" {
-    var exp: dojox.charting.Chart3D
+    import exp = dojox.charting.Chart3D
     export=exp;
 }
 declare module "dojox/charting/Chart2D" {
-    var exp: dojox.charting.Chart2D
+    import exp = dojox.charting.Chart2D
     export=exp;
 }
 declare module "dojox/charting/DataSeries" {
-    var exp: dojox.charting.DataSeries
+    import exp = dojox.charting.DataSeries
     export=exp;
 }
 declare module "dojox/charting/Chart" {
-    var exp: dojox.charting.Chart
+    import exp = dojox.charting.Chart
     export=exp;
 }
 declare module "dojox/charting/DataChart" {
-    var exp: dojox.charting.DataChart
+    import exp = dojox.charting.DataChart
     export=exp;
 }
 declare module "dojox/charting/Element" {
-    var exp: dojox.charting.Element
+    import exp = dojox.charting.Element
     export=exp;
 }
 declare module "dojox/charting/Series" {
-    var exp: dojox.charting.Series
+    import exp = dojox.charting.Series
     export=exp;
 }
 declare module "dojox/charting/StoreSeries" {
-    var exp: dojox.charting.StoreSeries
+    import exp = dojox.charting.StoreSeries
     export=exp;
 }
 declare module "dojox/charting/SimpleTheme" {
-    var exp: dojox.charting.SimpleTheme
+    import exp = dojox.charting.SimpleTheme
     export=exp;
 }
 declare module "dojox/charting/SimpleTheme.defaultMarkers" {
-    var exp: dojox.charting.SimpleTheme.defaultMarkers
+    import exp = dojox.charting.SimpleTheme.defaultMarkers
     export=exp;
 }
 declare module "dojox/charting/SimpleTheme.defaultTheme" {
-    var exp: dojox.charting.SimpleTheme.defaultTheme
+    import exp = dojox.charting.SimpleTheme.defaultTheme
     export=exp;
 }
 declare module "dojox/charting/Theme" {
-    var exp: dojox.charting.Theme
+    import exp = dojox.charting.Theme
     export=exp;
 }
 declare module "dojox/charting/Theme.defaultMarkers" {
-    var exp: dojox.charting.Theme.defaultMarkers
+    import exp = dojox.charting.Theme.defaultMarkers
     export=exp;
 }
 declare module "dojox/charting/Theme.defaultTheme" {
-    var exp: dojox.charting.Theme.defaultTheme
+    import exp = dojox.charting.Theme.defaultTheme
     export=exp;
 }
 declare module "dojox/charting/action2d/Base" {
-    var exp: dojox.charting.action2d.Base
+    import exp = dojox.charting.action2d.Base
     export=exp;
 }
 declare module "dojox/charting/action2d/ChartAction" {
-    var exp: dojox.charting.action2d.ChartAction
+    import exp = dojox.charting.action2d.ChartAction
     export=exp;
 }
 declare module "dojox/charting/action2d/_IndicatorElement" {
-    var exp: dojox.charting.action2d._IndicatorElement
+    import exp = dojox.charting.action2d._IndicatorElement
     export=exp;
 }
 declare module "dojox/charting/action2d/Highlight" {
-    var exp: dojox.charting.action2d.Highlight
+    import exp = dojox.charting.action2d.Highlight
     export=exp;
 }
 declare module "dojox/charting/action2d/Magnify" {
-    var exp: dojox.charting.action2d.Magnify
+    import exp = dojox.charting.action2d.Magnify
     export=exp;
 }
 declare module "dojox/charting/action2d/MouseZoomAndPan" {
-    var exp: dojox.charting.action2d.MouseZoomAndPan
+    import exp = dojox.charting.action2d.MouseZoomAndPan
     export=exp;
 }
 declare module "dojox/charting/action2d/MouseIndicator" {
-    var exp: dojox.charting.action2d.MouseIndicator
+    import exp = dojox.charting.action2d.MouseIndicator
     export=exp;
 }
 declare module "dojox/charting/action2d/MoveSlice" {
-    var exp: dojox.charting.action2d.MoveSlice
+    import exp = dojox.charting.action2d.MoveSlice
     export=exp;
 }
 declare module "dojox/charting/action2d/PlotAction" {
-    var exp: dojox.charting.action2d.PlotAction
+    import exp = dojox.charting.action2d.PlotAction
     export=exp;
 }
 declare module "dojox/charting/action2d/Tooltip" {
-    var exp: dojox.charting.action2d.Tooltip
+    import exp = dojox.charting.action2d.Tooltip
     export=exp;
 }
 declare module "dojox/charting/action2d/Shake" {
-    var exp: dojox.charting.action2d.Shake
+    import exp = dojox.charting.action2d.Shake
     export=exp;
 }
 declare module "dojox/charting/action2d/TouchZoomAndPan" {
-    var exp: dojox.charting.action2d.TouchZoomAndPan
+    import exp = dojox.charting.action2d.TouchZoomAndPan
     export=exp;
 }
 declare module "dojox/charting/action2d/TouchIndicator" {
-    var exp: dojox.charting.action2d.TouchIndicator
+    import exp = dojox.charting.action2d.TouchIndicator
     export=exp;
 }
 declare module "dojox/charting/axis2d/common" {
-    var exp: dojox.charting.axis2d.common
+    import exp = dojox.charting.axis2d.common
     export=exp;
 }
 declare module "dojox/charting/axis2d/common.createText" {
-    var exp: dojox.charting.axis2d.common.createText
+    import exp = dojox.charting.axis2d.common.createText
     export=exp;
 }
 declare module "dojox/charting/axis2d/Base" {
-    var exp: dojox.charting.axis2d.Base
+    import exp = dojox.charting.axis2d.Base
     export=exp;
 }
 declare module "dojox/charting/axis2d/Invisible" {
-    var exp: dojox.charting.axis2d.Invisible
+    import exp = dojox.charting.axis2d.Invisible
     export=exp;
 }
 declare module "dojox/charting/axis2d/Default" {
-    var exp: dojox.charting.axis2d.Default
+    import exp = dojox.charting.axis2d.Default
     export=exp;
 }
 declare module "dojox/charting/bidi/_bidiutils" {
-    var exp: dojox.charting.bidi._bidiutils
+    import exp = dojox.charting.bidi._bidiutils
     export=exp;
 }
 declare module "dojox/charting/bidi/Chart" {
-    var exp: dojox.charting.bidi.Chart
+    import exp = dojox.charting.bidi.Chart
     export=exp;
 }
 declare module "dojox/charting/bidi/Chart3D" {
-    var exp: dojox.charting.bidi.Chart3D
+    import exp = dojox.charting.bidi.Chart3D
     export=exp;
 }
 declare module "dojox/charting/bidi/action2d/Tooltip" {
-    var exp: dojox.charting.bidi.action2d.Tooltip
+    import exp = dojox.charting.bidi.action2d.Tooltip
     export=exp;
 }
 declare module "dojox/charting/bidi/action2d/ZoomAndPan" {
-    var exp: dojox.charting.bidi.action2d.ZoomAndPan
+    import exp = dojox.charting.bidi.action2d.ZoomAndPan
     export=exp;
 }
 declare module "dojox/charting/bidi/axis2d/Default" {
-    var exp: dojox.charting.bidi.axis2d.Default
+    import exp = dojox.charting.bidi.axis2d.Default
     export=exp;
 }
 declare module "dojox/charting/bidi/widget/Chart" {
-    var exp: dojox.charting.bidi.widget.Chart
+    import exp = dojox.charting.bidi.widget.Chart
     export=exp;
 }
 declare module "dojox/charting/bidi/widget/Legend" {
-    var exp: dojox.charting.bidi.widget.Legend
+    import exp = dojox.charting.bidi.widget.Legend
     export=exp;
 }
 declare module "dojox/charting/plot2d/common" {
-    var exp: dojox.charting.plot2d.common
+    import exp = dojox.charting.plot2d.common
     export=exp;
 }
 declare module "dojox/charting/plot2d/common.defaultStats" {
-    var exp: dojox.charting.plot2d.common.defaultStats
+    import exp = dojox.charting.plot2d.common.defaultStats
     export=exp;
 }
 declare module "dojox/charting/plot2d/commonStacked" {
-    var exp: dojox.charting.plot2d.commonStacked
+    import exp = dojox.charting.plot2d.commonStacked
     export=exp;
 }
 declare module "dojox/charting/plot2d/_PlotEvents" {
-    var exp: dojox.charting.plot2d._PlotEvents
+    import exp = dojox.charting.plot2d._PlotEvents
     export=exp;
 }
 declare module "dojox/charting/plot2d/Areas" {
-    var exp: dojox.charting.plot2d.Areas
+    import exp = dojox.charting.plot2d.Areas
     export=exp;
 }
 declare module "dojox/charting/plot2d/Bars" {
-    var exp: dojox.charting.plot2d.Bars
+    import exp = dojox.charting.plot2d.Bars
     export=exp;
 }
 declare module "dojox/charting/plot2d/Base" {
-    var exp: dojox.charting.plot2d.Base
+    import exp = dojox.charting.plot2d.Base
     export=exp;
 }
 declare module "dojox/charting/plot2d/Bubble" {
-    var exp: dojox.charting.plot2d.Bubble
+    import exp = dojox.charting.plot2d.Bubble
     export=exp;
 }
 declare module "dojox/charting/plot2d/CartesianBase" {
-    var exp: dojox.charting.plot2d.CartesianBase
+    import exp = dojox.charting.plot2d.CartesianBase
     export=exp;
 }
 declare module "dojox/charting/plot2d/Candlesticks" {
-    var exp: dojox.charting.plot2d.Candlesticks
+    import exp = dojox.charting.plot2d.Candlesticks
     export=exp;
 }
 declare module "dojox/charting/plot2d/ClusteredBars" {
-    var exp: dojox.charting.plot2d.ClusteredBars
+    import exp = dojox.charting.plot2d.ClusteredBars
     export=exp;
 }
 declare module "dojox/charting/plot2d/ClusteredColumns" {
-    var exp: dojox.charting.plot2d.ClusteredColumns
+    import exp = dojox.charting.plot2d.ClusteredColumns
     export=exp;
 }
 declare module "dojox/charting/plot2d/Columns" {
-    var exp: dojox.charting.plot2d.Columns
+    import exp = dojox.charting.plot2d.Columns
     export=exp;
 }
 declare module "dojox/charting/plot2d/Grid" {
-    var exp: dojox.charting.plot2d.Grid
+    import exp = dojox.charting.plot2d.Grid
     export=exp;
 }
 declare module "dojox/charting/plot2d/Default" {
-    var exp: dojox.charting.plot2d.Default
+    import exp = dojox.charting.plot2d.Default
     export=exp;
 }
 declare module "dojox/charting/plot2d/Indicator" {
-    var exp: dojox.charting.plot2d.Indicator
+    import exp = dojox.charting.plot2d.Indicator
     export=exp;
 }
 declare module "dojox/charting/plot2d/Lines" {
-    var exp: dojox.charting.plot2d.Lines
+    import exp = dojox.charting.plot2d.Lines
     export=exp;
 }
 declare module "dojox/charting/plot2d/Markers" {
-    var exp: dojox.charting.plot2d.Markers
+    import exp = dojox.charting.plot2d.Markers
     export=exp;
 }
 declare module "dojox/charting/plot2d/Pie" {
-    var exp: dojox.charting.plot2d.Pie
+    import exp = dojox.charting.plot2d.Pie
     export=exp;
 }
 declare module "dojox/charting/plot2d/MarkersOnly" {
-    var exp: dojox.charting.plot2d.MarkersOnly
+    import exp = dojox.charting.plot2d.MarkersOnly
     export=exp;
 }
 declare module "dojox/charting/plot2d/OHLC" {
-    var exp: dojox.charting.plot2d.OHLC
+    import exp = dojox.charting.plot2d.OHLC
     export=exp;
 }
 declare module "dojox/charting/plot2d/Scatter" {
-    var exp: dojox.charting.plot2d.Scatter
+    import exp = dojox.charting.plot2d.Scatter
     export=exp;
 }
 declare module "dojox/charting/plot2d/Stacked" {
-    var exp: dojox.charting.plot2d.Stacked
+    import exp = dojox.charting.plot2d.Stacked
     export=exp;
 }
 declare module "dojox/charting/plot2d/Spider" {
-    var exp: dojox.charting.plot2d.Spider
+    import exp = dojox.charting.plot2d.Spider
     export=exp;
 }
 declare module "dojox/charting/plot2d/StackedAreas" {
-    var exp: dojox.charting.plot2d.StackedAreas
+    import exp = dojox.charting.plot2d.StackedAreas
     export=exp;
 }
 declare module "dojox/charting/plot2d/StackedBars" {
-    var exp: dojox.charting.plot2d.StackedBars
+    import exp = dojox.charting.plot2d.StackedBars
     export=exp;
 }
 declare module "dojox/charting/plot2d/StackedColumns" {
-    var exp: dojox.charting.plot2d.StackedColumns
+    import exp = dojox.charting.plot2d.StackedColumns
     export=exp;
 }
 declare module "dojox/charting/plot2d/StackedLines" {
-    var exp: dojox.charting.plot2d.StackedLines
+    import exp = dojox.charting.plot2d.StackedLines
     export=exp;
 }
 declare module "dojox/charting/plot3d/Bars" {
-    var exp: dojox.charting.plot3d.Bars
+    import exp = dojox.charting.plot3d.Bars
     export=exp;
 }
 declare module "dojox/charting/plot3d/Base" {
-    var exp: dojox.charting.plot3d.Base
+    import exp = dojox.charting.plot3d.Base
     export=exp;
 }
 declare module "dojox/charting/plot3d/Cylinders" {
-    var exp: dojox.charting.plot3d.Cylinders
+    import exp = dojox.charting.plot3d.Cylinders
     export=exp;
 }
 declare module "dojox/charting/scaler/common" {
-    var exp: dojox.charting.scaler.common
+    import exp = dojox.charting.scaler.common
     export=exp;
 }
 declare module "dojox/charting/scaler/primitive" {
-    var exp: dojox.charting.scaler.primitive
+    import exp = dojox.charting.scaler.primitive
     export=exp;
 }
 declare module "dojox/charting/scaler/linear" {
-    var exp: dojox.charting.scaler.linear
+    import exp = dojox.charting.scaler.linear
     export=exp;
 }
 declare module "dojox/charting/themes/common" {
-    var exp: dojox.charting.themes.common
+    import exp = dojox.charting.themes.common
     export=exp;
 }
 declare module "dojox/charting/themes/gradientGenerator" {
-    var exp: dojox.charting.themes.gradientGenerator
+    import exp = dojox.charting.themes.gradientGenerator
     export=exp;
 }
 declare module "dojox/charting/themes/PlotKit/base" {
-    var exp: dojox.charting.themes.PlotKit.base
+    import exp = dojox.charting.themes.PlotKit.base
     export=exp;
 }
 declare module "dojox/charting/widget/Chart2D" {
-    var exp: dojox.charting.widget.Chart2D
+    import exp = dojox.charting.widget.Chart2D
     export=exp;
 }
 declare module "dojox/charting/widget/Chart" {
-    var exp: dojox.charting.widget.Chart
+    import exp = dojox.charting.widget.Chart
     export=exp;
 }
 declare module "dojox/charting/widget/Legend" {
-    var exp: dojox.charting.widget.Legend
+    import exp = dojox.charting.widget.Legend
     export=exp;
 }
 declare module "dojox/charting/widget/SelectableLegend" {
-    var exp: dojox.charting.widget.SelectableLegend
+    import exp = dojox.charting.widget.SelectableLegend
     export=exp;
 }
diff --git a/types/dojo/tsconfig.json b/types/dojo/tsconfig.json
index 983ded2a9c..140f764554 100644
--- a/types/dojo/tsconfig.json
+++ b/types/dojo/tsconfig.json
@@ -83,4 +83,5 @@
         "dojox.widget.d.ts",
         "dojox.xml.d.ts"
     ]
-}
\ No newline at end of file
+}
+
diff --git a/types/dojo/tslint.json b/types/dojo/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dojo/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dom-inputevent/index.d.ts b/types/dom-inputevent/index.d.ts
index df1cce5ec4..0d2111a0e0 100644
--- a/types/dom-inputevent/index.d.ts
+++ b/types/dom-inputevent/index.d.ts
@@ -7,11 +7,11 @@ interface InputEventInit extends UIEventInit {
     data?: string;
     isComposing: boolean;
 }
-interface InputEvent extends UIEvent {
+
+// tslint:disable-next-line no-empty-interface
+interface InputEvent extends UIEvent {}
+declare class InputEvent {
+    constructor(typeArg: 'input' | 'beforeinput', inputEventInit?: InputEventInit);
     readonly data: string;
     readonly isComposing: boolean;
 }
-
-declare class InputEvent {
-    constructor(typeArg: 'input' | 'beforeinput', inputEventInit?: InputEventInit);
-}
diff --git a/types/dom4/tslint.json b/types/dom4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dom4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/domo/tslint.json b/types/domo/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/domo/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dompurify/tslint.json b/types/dompurify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dompurify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/domready/tslint.json b/types/domready/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/domready/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/domurl/domurl-tests.ts b/types/domurl/domurl-tests.ts
index ff7f3c11c6..2de93bcc20 100644
--- a/types/domurl/domurl-tests.ts
+++ b/types/domurl/domurl-tests.ts
@@ -38,8 +38,6 @@ else { // if not an array but scalar value here is a way how to convert to array
 
 // The way to remove the parameter:
 delete u.query.a;
-// or:
-delete u.query["a"];
 
 // If you need to remove all query string params:
 console.log(u.clearQuery());
diff --git a/types/domurl/tslint.json b/types/domurl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/domurl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/donna/tslint.json b/types/donna/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/donna/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dot-object/tslint.json b/types/dot-object/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dot-object/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dot-prop/index.d.ts b/types/dot-prop/index.d.ts
index 31877dbd9e..73078c456e 100644
--- a/types/dot-prop/index.d.ts
+++ b/types/dot-prop/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dot-prop 4.1
+// Type definitions for dot-prop 4.2
 // Project: https://github.com/sindresorhus/dot-prop#readme
 // Definitions by: Sam Verschueren <https://github.com/samverschueren>
 //                 BendingBender <https://github.com/BendingBender>
@@ -7,7 +7,7 @@
 
 interface DotProp {
     get(obj: object, path: string, defaultValue?: any): any;
-    set(obj: object, path: string, value: any): void;
+    set<T extends object>(obj: T, path: string, value: any): T;
     has(obj: object, path: string): boolean;
     delete(obj: object, path: string): boolean;
 }
diff --git a/types/dotdir-regex/dotdir-regex-tests.ts b/types/dotdir-regex/dotdir-regex-tests.ts
new file mode 100644
index 0000000000..ff40d153f8
--- /dev/null
+++ b/types/dotdir-regex/dotdir-regex-tests.ts
@@ -0,0 +1,4 @@
+import dotdir = require('dotdir-regex');
+
+// $ExpectType RegExp
+dotdir();
diff --git a/types/dotdir-regex/index.d.ts b/types/dotdir-regex/index.d.ts
new file mode 100644
index 0000000000..59b68ae322
--- /dev/null
+++ b/types/dotdir-regex/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for dotdir-regex 1.0
+// Project: https://github.com/regexhq/dotdir-regex
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function dotdirRegex(): RegExp;
+
+export = dotdirRegex;
diff --git a/types/dotdir-regex/tsconfig.json b/types/dotdir-regex/tsconfig.json
new file mode 100644
index 0000000000..48f516abd8
--- /dev/null
+++ b/types/dotdir-regex/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dotdir-regex-tests.ts"
+    ]
+}
diff --git a/types/dotdir-regex/tslint.json b/types/dotdir-regex/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dotdir-regex/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/dotdotdot/tslint.json b/types/dotdotdot/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dotdotdot/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dotenv-safe/index.d.ts b/types/dotenv-safe/index.d.ts
index a435f36fe7..2c696ae1b5 100644
--- a/types/dotenv-safe/index.d.ts
+++ b/types/dotenv-safe/index.d.ts
@@ -21,20 +21,28 @@ export interface MissingEnvVarsError extends Error {
 /**
  * Loads environment variables file into 'process.env'.
  *
- * @param {object}  options
- * @param {string}  [options.sample=".env.example"] Path to example environment file.
- * @param {string}  [options.path=".env"] Path to environment file.
- * @param {string}  [options.encoding="utf8"] Encoding of your file containing environment variables.
- * @param {boolean} [options.allowEmptyValues=false] Enabling this option will not throw an error after loading.
- *
  * @throws MissingEnvVarsError
- *
- * @return env.DotenvResult
  */
 export function load(options?: {
   path?: string,
+  /**
+   * Path to example environment file.
+   * @default ".env.example"
+   */
   sample?: string,
+  /**
+   * Path to environment file.
+   * @default ".env"
+   */
   silent?: boolean,
+  /**
+   * Encoding of your file containing environment variables.
+   * @default "utf8"
+   */
   encoding?: string,
+  /**
+   * Enabling this option will not throw an error after loading.
+   * @default false
+   */
   allowEmptyValues?: boolean,
 }): env.DotenvResult
diff --git a/types/dotenv/index.d.ts b/types/dotenv/index.d.ts
index e29c04e8d7..831790138c 100644
--- a/types/dotenv/index.d.ts
+++ b/types/dotenv/index.d.ts
@@ -13,7 +13,6 @@ export function parse(src: string | Buffer): {[name: string]: string};
 /**
  * Loads `.env` into `process.env`.
  *
- * @param options
  * @return Object Object with either
  * - "parsed" containing the parsed keys and values or
  * - "error" containing an Error object
diff --git a/types/dotenv/v2/index.d.ts b/types/dotenv/v2/index.d.ts
index e3c26eb2c6..276052e481 100644
--- a/types/dotenv/v2/index.d.ts
+++ b/types/dotenv/v2/index.d.ts
@@ -13,7 +13,6 @@ export function parse(src: string | Buffer): {[name: string]: string};
 /**
  * Loads `.env` into `process.env`.
  *
- * @param options
  * @return Object Object with the parsed keys and values, e.g., 'KEY=value' becomes { KEY: 'value' }
  */
 export function config(options?: DotenvOptions): {[name: string]: string} | false;
diff --git a/types/dotfile-regex/dotfile-regex-tests.ts b/types/dotfile-regex/dotfile-regex-tests.ts
new file mode 100644
index 0000000000..f6bad1d84b
--- /dev/null
+++ b/types/dotfile-regex/dotfile-regex-tests.ts
@@ -0,0 +1,4 @@
+import dotfile = require('dotfile-regex');
+
+// $ExpectType RegExp
+dotfile();
diff --git a/types/dotfile-regex/index.d.ts b/types/dotfile-regex/index.d.ts
new file mode 100644
index 0000000000..3a96f4fbad
--- /dev/null
+++ b/types/dotfile-regex/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for dotfile-regex 1.0
+// Project: https://github.com/regexhq/dotfile-regex
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function dotfileRegex(): RegExp;
+
+export = dotfileRegex;
diff --git a/types/dotfile-regex/tsconfig.json b/types/dotfile-regex/tsconfig.json
new file mode 100644
index 0000000000..899be54b3b
--- /dev/null
+++ b/types/dotfile-regex/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dotfile-regex-tests.ts"
+    ]
+}
diff --git a/types/dotfile-regex/tslint.json b/types/dotfile-regex/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dotfile-regex/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/double-ended-queue/double-ended-queue-tests.ts b/types/double-ended-queue/double-ended-queue-tests.ts
new file mode 100644
index 0000000000..d6df205a77
--- /dev/null
+++ b/types/double-ended-queue/double-ended-queue-tests.ts
@@ -0,0 +1,24 @@
+import * as Deque from 'double-ended-queue';
+
+const a = new Deque<number>();            // $ExpectType Deque<number>
+const b = new Deque<string>(6);           // $ExpectType Deque<string>
+const c = new Deque<string>([1, 2, 3]);   // $ExpectError
+const d = new Deque<number>([1, 2, 3]);   // $ExpectType Deque<number>
+
+a.length;           // $ExpectType number
+a.push("foo");      // $ExpectError
+a.push(4, 5);       // $ExpectType number
+a.unshift("foo");   // $ExpectError
+a.unshift(4, 5);    // $ExpectType number
+a.pop();            // $ExpectType number | undefined
+a.pop(2);           // $ExpectError
+a.shift();          // $ExpectType number | undefined
+a.peekBack();       // $ExpectType number | undefined
+a.peekFront();      // $ExpectType number | undefined
+a.toArray();        // $ExpectType number[]
+a.get();            // $ExpectError
+a.get(null);        // $ExpectError
+a.get(1);           // $ExpectType number | undefined
+b.get(-1);          // $ExpectType string | undefined
+b.clear();          // $ExpectType void
+b.isEmpty();        // $ExpectType boolean
diff --git a/types/double-ended-queue/index.d.ts b/types/double-ended-queue/index.d.ts
new file mode 100644
index 0000000000..b9aa30de1a
--- /dev/null
+++ b/types/double-ended-queue/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for double-ended-queue 2.1
+// Project: https://github.com/petkaantonov/deque
+// Definitions by: Dmitry <https://github.com/dsagal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Deque<T> {
+    readonly length: number;
+    push(...items: T[]): number;
+    unshift(...items: T[]): number;
+    pop(): T|undefined;
+    shift(): T|undefined;
+    toArray(): T[];
+    peekBack(): T|undefined;
+    peekFront(): T|undefined;
+    get(index: number): T|undefined;
+    isEmpty(): boolean;
+    clear(): void;
+}
+
+declare const Deque: {
+    prototype: Deque<any>;
+    new <T>(items?: ReadonlyArray<T>): Deque<T>;
+    new <T>(capacity: number): Deque<T>;  // tslint:disable-line:no-unnecessary-generics
+};
+
+export = Deque;
diff --git a/types/double-ended-queue/tsconfig.json b/types/double-ended-queue/tsconfig.json
new file mode 100644
index 0000000000..5477379341
--- /dev/null
+++ b/types/double-ended-queue/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "double-ended-queue-tests.ts"
+    ]
+}
diff --git a/types/double-ended-queue/tslint.json b/types/double-ended-queue/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/double-ended-queue/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/doublearray/tslint.json b/types/doublearray/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/doublearray/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/doubleclick-gpt/tslint.json b/types/doubleclick-gpt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/doubleclick-gpt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/download/download-tests.ts b/types/download/download-tests.ts
new file mode 100644
index 0000000000..34d56d763b
--- /dev/null
+++ b/types/download/download-tests.ts
@@ -0,0 +1,35 @@
+import * as fs from 'fs';
+import download = require('download');
+
+download('http://unicorn.com/foo.jpg', 'dist').then(() => {
+	console.log('done!');
+});
+
+download('http://unicorn.com/foo.jpg').then(data => {
+	fs.writeFileSync('dist/foo.jpg', data);
+});
+
+download('unicorn.com/foo.jpg').pipe(fs.createWriteStream('dist/foo.jpg'));
+
+download('unicorn.com/foo.jpg', 'dest', {
+	body: '',
+	decompress: true,
+	encoding: 'utf8',
+	extract: true,
+	filename: 'filename',
+	followRedirect: true,
+	proxy: '',
+	query: '',
+	retries: (retry: number, error: any) => 4,
+	timeout: {
+		connect: 20,
+		request: 20,
+		socket: 20
+	},
+	useElectronNet: true
+});
+
+import * as download2 from 'download';
+
+let downloadFunction = download;
+downloadFunction = download2;
diff --git a/types/download/index.d.ts b/types/download/index.d.ts
new file mode 100644
index 0000000000..cffc282832
--- /dev/null
+++ b/types/download/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for download 6.2
+// Project: https://github.com/kevva/download
+// Definitions by: Nico Jansen <https://github.com/nicojs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+interface TimeoutOptions {
+    connect?: number;
+    socket?: number;
+    request?: number;
+}
+type RetryFunction = (retry: number, error: any) => number;
+
+interface DownloadOptions {
+    body?: string | Buffer | NodeJS.ReadableStream;
+    encoding?: string | null;
+    query?: string | object;
+    timeout?: number | TimeoutOptions;
+    retries?: number | RetryFunction;
+    followRedirect?: boolean;
+    decompress?: boolean;
+    useElectronNet?: boolean;
+    /**
+     * If set to true, try extracting the file using decompress.
+     */
+    extract?: boolean;
+    /**
+     * Name of the saved file.
+     */
+    filename?: string;
+    /**
+     * Proxy endpoint
+     */
+    proxy?: string;
+}
+
+declare namespace download {}
+declare function download(url: string, destination?: string, options?: DownloadOptions): Promise<Buffer> & NodeJS.WritableStream & NodeJS.ReadableStream;
+
+export = download;
diff --git a/types/download/tsconfig.json b/types/download/tsconfig.json
new file mode 100644
index 0000000000..634ae5ab32
--- /dev/null
+++ b/types/download/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "download-tests.ts"
+    ]
+}
diff --git a/types/download/tslint.json b/types/download/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/download/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/draft-js/draft-js-tests.tsx b/types/draft-js/draft-js-tests.tsx
index dae23b90ef..63821eda98 100644
--- a/types/draft-js/draft-js-tests.tsx
+++ b/types/draft-js/draft-js-tests.tsx
@@ -12,7 +12,17 @@ import {
   SelectionState,
   getDefaultKeyBinding,
   ContentState,
-  convertFromHTML
+  RawDraftInlineStyleRange,
+  RawDraftEntityRange,
+  RawDraftEntity,
+  RawDraftContentBlock,
+  RawDraftContentState,
+  DraftBlockType,
+  DraftInlineStyleType,
+  DraftEntityMutability,
+  DraftEntityType,
+  convertFromHTML,
+  convertToRaw
 } from 'draft-js';
 
 const SPLIT_HEADER_BLOCK = 'split-header-block';
@@ -30,7 +40,7 @@ type SyntheticKeyboardEvent = React.KeyboardEvent<{}>;
 
 class RichEditorExample extends React.Component<{}, { editorState: EditorState }> {
   constructor() {
-    super();
+    super({});
 
     const sampleMarkup =
       '<b>Bold text</b>, <i>Italic text</i><br/ ><br />' +
@@ -182,9 +192,17 @@ function getBlockStyle(block: ContentBlock) {
   }
 }
 
-class StyleButton extends React.Component<{key: string, active: boolean, label: string, onToggle: (blockType: string) => void, style: string}> {
-  constructor() {
-    super();
+interface Props {
+  key: string
+  active: boolean
+  label: string
+  onToggle: (blockType: string) => void
+  style: string
+}
+
+class StyleButton extends React.Component<Props> {
+  constructor(props: Props) {
+    super(props);
   }
 
   onToggle: (event: Event) => void = (event: Event) => {
@@ -266,7 +284,7 @@ var INLINE_STYLES = [
 
 const InlineStyleControls = (props: {editorState: EditorState, onToggle: (blockType: string) => void}) => {
   var currentStyle = props.editorState.getCurrentInlineStyle();
-        return (
+  return (
     <div className="RichEditor-controls">
       {INLINE_STYLES.map(type =>
         <StyleButton
@@ -285,3 +303,23 @@ ReactDOM.render(
   <RichEditorExample />,
   document.getElementById('target')
 );
+
+const editorState = EditorState.createEmpty();
+const contentState = editorState.getCurrentContent();
+const rawContentState: RawDraftContentState = convertToRaw(contentState);
+
+rawContentState.blocks.forEach((block: RawDraftContentBlock) => {
+  block.entityRanges.forEach((entityRange: RawDraftEntityRange) => {
+    const { key, offset, length } = entityRange;
+    const entity: RawDraftEntity = rawContentState.entityMap[key];
+    const entityType: DraftEntityType = entity.type;
+    const entityMutability: DraftEntityMutability = entity.mutability;
+    console.log(entityType, entityMutability, offset, length);
+  });
+
+  block.inlineStyleRanges.forEach((inlineStyleRange: RawDraftInlineStyleRange) => {
+    const { offset, length } = inlineStyleRange
+    const inlineStyle: DraftInlineStyleType = inlineStyleRange.style;
+    console.log(inlineStyle, offset, length);
+  });
+});
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index 088d083a7f..7913e81d55 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Draft.js v0.10.3
+// Type definitions for Draft.js v0.10.4
 // Project: https://facebook.github.io/draft-js/
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
 //                 Eelco Lempsink <https://github.com/eelco>
@@ -156,6 +156,8 @@ declare namespace Draft {
                 onTab?(e: SyntheticKeyboardEvent): void,
                 onUpArrow?(e: SyntheticKeyboardEvent): void,
                 onDownArrow?(e: SyntheticKeyboardEvent): void,
+                onRightArrow?(e: SyntheticKeyboardEvent): void,
+                onLeftArrow?(e: SyntheticKeyboardEvent): void,
 
                 onBlur?(e: SyntheticEvent): void,
                 onFocus?(e: SyntheticEvent): void,
@@ -260,9 +262,10 @@ declare namespace Draft {
                  * or block types.
                  */
                 "bold" |
-                "italic" |
-                "underline" |
                 "code" |
+                "italic" |
+                "strikethrough" |
+                "underline" |
 
                 /**
                  * Split a block in two.
@@ -326,6 +329,60 @@ declare namespace Draft {
              * another fragment or if the selected fragment shall be replaced
              */
             type DraftInsertionType = "replace" | "before" | "after";
+
+            /**
+             * Valid inline styles.
+             */
+            type DraftInlineStyleType = (
+                "BOLD" |
+                "CODE" |
+                "ITALIC" |
+                "STRIKETHROUGH" |
+                "UNDERLINE"
+            )
+
+            /**
+             * Default entity types.
+             */
+            type ComposedEntityType = (
+              "LINK" |
+              "TOKEN" |
+              "PHOTO" |
+              "IMAGE"
+            )
+
+            /**
+             * Possible entity types.
+             */
+            type DraftEntityType = string | ComposedEntityType;
+
+            /**
+             * Possible "mutability" options for an entity. This refers to the behavior
+             * that should occur when inserting or removing characters in a text range
+             * with an entity applied to it.
+             *
+             * `MUTABLE`:
+             *   The text range can be modified freely. Generally used in cases where
+             *   the text content and the entity do not necessarily have a direct
+             *   relationship. For instance, the text and URI for a link may be completely
+             *   different. The user is allowed to edit the text as needed, and the entity
+             *   is preserved and applied to any characters added within the range.
+             *
+             * `IMMUTABLE`:
+             *   Not to be confused with immutable data structures used to represent the
+             *   state of the editor. Immutable entity ranges cannot be modified in any
+             *   way. Adding characters within the range will remove the entity from the
+             *   entire range. Deleting characters will delete the entire range. Example:
+             *   Facebook Page mentions.
+             *
+             * `SEGMENTED`:
+             *   Segmented entities allow the removal of partial ranges of text, as
+             *   separated by a delimiter. Adding characters wihin the range will remove
+             *   the entity from the entire range. Deleting characters within a segmented
+             *   entity will delete only the segments affected by the deletion. Example:
+             *   Facebook User mentions.
+             */
+            type DraftEntityMutability = "MUTABLE" | "IMMUTABLE" | "SEGMENTED";
         }
 
         namespace Decorators {
@@ -406,14 +463,24 @@ declare namespace Draft {
         }
 
         namespace Encoding {
+            import DraftInlineStyleType = Draft.Model.Constants.DraftInlineStyleType;
+            import DraftBlockType = Draft.Model.Constants.DraftBlockType;
+            import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+            import DraftEntityType = Draft.Model.Constants.DraftEntityType;
+
             import ContentBlock = Draft.Model.ImmutableData.ContentBlock;
             import ContentState = Draft.Model.ImmutableData.ContentState;
 
             import DraftBlockRenderMap = Draft.Component.Base.DraftBlockRenderMap;
-            import DraftBlockType = Draft.Model.Constants.DraftBlockType;
 
-            import DraftEntityType = Draft.Model.Entity.DraftEntityType;
-            import DraftEntityMutability = Draft.Model.Entity.DraftEntityMutability;
+            /**
+             * A plain object representation of an inline style range.
+             */
+            interface RawDraftInlineStyleRange {
+                style: DraftInlineStyleType;
+                offset: number;
+                length: number;
+            }
 
             /**
              * A plain object representation of an entity attribution.
@@ -421,21 +488,12 @@ declare namespace Draft {
              * The `key` value corresponds to the key of the entity in the `entityMap` of
              * a `ComposedText` object, not for use with `DraftEntity.get()`.
              */
-            interface EntityRange {
+            interface RawDraftEntityRange {
                 key: number,
                 offset: number,
                 length: number,
             }
 
-            /**
-             * A plain object representation of an inline style range.
-             */
-            interface InlineStyleRange {
-                style: string;
-                offset: number;
-                length: number;
-            }
-
             /**
              * A plain object representation of an EntityInstance.
              */
@@ -454,8 +512,8 @@ declare namespace Draft {
                 type: DraftBlockType;
                 text: string;
                 depth: number;
-                inlineStyleRanges: Array<InlineStyleRange>;
-                entityRanges: Array<EntityRange>;
+                inlineStyleRanges: Array<RawDraftInlineStyleRange>;
+                entityRanges: Array<RawDraftEntityRange>;
                 data?: Object;
             }
 
@@ -479,36 +537,8 @@ declare namespace Draft {
         }
 
         namespace Entity {
-            type ComposedEntityType = "LINK" | "TOKEN" | "PHOTO";
-            type DraftEntityType = string | ComposedEntityType;
-
-            /**
-             * An enum representing the possible "mutability" options for an entity.
-             * This refers to the behavior that should occur when inserting or removing
-             * characters in a text range with an entity applied to it.
-             *
-             * `MUTABLE`:
-             *   The text range can be modified freely. Generally used in cases where
-             *   the text content and the entity do not necessarily have a direct
-             *   relationship. For instance, the text and URI for a link may be completely
-             *   different. The user is allowed to edit the text as needed, and the entity
-             *   is preserved and applied to any characters added within the range.
-             *
-             * `IMMUTABLE`:
-             *   Not to be confused with immutable data structures used to represent the
-             *   state of the editor. Immutable entity ranges cannot be modified in any
-             *   way. Adding characters within the range will remove the entity from the
-             *   entire range. Deleting characters will delete the entire range. Example:
-             *   Facebook Page mentions.
-             *
-             * `SEGMENTED`:
-             *   Segmented entities allow the removal of partial ranges of text, as
-             *   separated by a delimiter. Adding characters wihin the range will remove
-             *   the entity from the entire range. Deleting characters within a segmented
-             *   entity will delete only the segments affected by the deletion. Example:
-             *   Facebook User mentions.
-             */
-            type DraftEntityMutability = "MUTABLE" | "IMMUTABLE" | "SEGMENTED";
+            import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+            import DraftEntityType = Draft.Model.Constants.DraftEntityType;
 
             /**
              * A "document entity" is an object containing metadata associated with a
@@ -577,10 +607,10 @@ declare namespace Draft {
 
         namespace ImmutableData {
             import DraftBlockType = Draft.Model.Constants.DraftBlockType;
-            import DraftDecoratorType = Draft.Model.Decorators.DraftDecoratorType;
+            import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+            import DraftEntityType = Draft.Model.Constants.DraftEntityType;
 
-            import DraftEntityType = Draft.Model.Entity.DraftEntityType;
-            import DraftEntityMutability = Draft.Model.Entity.DraftEntityMutability;
+            import DraftDecoratorType = Draft.Model.Decorators.DraftDecoratorType;
 
             type DraftInlineStyle = Immutable.OrderedSet<string>;
             type BlockMap = Immutable.OrderedMap<string, Draft.Model.ImmutableData.ContentBlock>;
@@ -716,7 +746,7 @@ declare namespace Draft {
             }
 
             class ContentState extends Record {
-                static createFromBlockArray(blocks: Array<ContentBlock>, entityMap: any): ContentState;
+                static createFromBlockArray(blocks: Array<ContentBlock>, entityMap?: any): ContentState;
                 static createFromText(text: string, delimiter?: string): ContentState;
 
                 createEntity(type: DraftEntityType, mutability: DraftEntityMutability, data?: Object): ContentState;
@@ -767,7 +797,7 @@ declare namespace Draft {
             class CharacterMetadata {
                 static applyStyle(record: CharacterMetadata, style: string): CharacterMetadata;
                 static removeStyle(record: CharacterMetadata, style: string): CharacterMetadata;
-                static applyEntity(record: CharacterMetadata, entityKey: string): CharacterMetadata;
+                static applyEntity(record: CharacterMetadata, entityKey: string | null): CharacterMetadata;
                 static applyEntity(record: CharacterMetadata): CharacterMetadata;
                 /**
                  * Use this function instead of the `CharacterMetadata` constructor.
@@ -864,7 +894,7 @@ declare namespace Draft {
 
                 static setBlockData(contentState: ContentState, selectionState: SelectionState, blockData: Immutable.Map<any, any>): ContentState;
                 static mergeBlockData(contentState: ContentState, selectionState: SelectionState, blockData: Immutable.Map<any, any>): ContentState;
-                static applyEntity(contentState: ContentState, selectionState: SelectionState, entityKey: string): ContentState;
+                static applyEntity(contentState: ContentState, selectionState: SelectionState, entityKey: string | null): ContentState;
             }
 
             class RichTextEditorUtil {
@@ -936,6 +966,10 @@ import RichUtils = Draft.Model.Modifier.RichTextEditorUtil;
 import DefaultDraftBlockRenderMap = Draft.Model.ImmutableData.DefaultDraftBlockRenderMap;
 import DefaultDraftInlineStyle = Draft.Model.ImmutableData.DefaultDraftInlineStyle;
 
+import RawDraftInlineStyleRange = Draft.Model.Encoding.RawDraftInlineStyleRange;
+import RawDraftEntityRange = Draft.Model.Encoding.RawDraftEntityRange;
+import RawDraftEntity = Draft.Model.Encoding.RawDraftEntity;
+import RawDraftContentBlock = Draft.Model.Encoding.RawDraftContentBlock;
 import RawDraftContentState = Draft.Model.Encoding.RawDraftContentState;
 import convertFromRaw = Draft.Model.Encoding.convertFromRawToDraftState;
 import convertToRaw = Draft.Model.Encoding.convertFromDraftStateToRaw;
@@ -948,6 +982,9 @@ import getVisibleSelectionRect = Draft.Component.Selection.getVisibleSelectionRe
 import DraftEditorCommand = Draft.Model.Constants.DraftEditorCommand;
 import DraftDragType = Draft.Model.Constants.DraftDragType;
 import DraftBlockType = Draft.Model.Constants.DraftBlockType;
+import DraftInlineStyleType = Draft.Model.Constants.DraftInlineStyleType;
+import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+import DraftEntityType = Draft.Model.Constants.DraftEntityType;
 import DraftRemovalDirection = Draft.Model.Constants.DraftRemovalDirection;
 import DraftHandleValue = Draft.Model.Constants.DraftHandleValue;
 import DraftInsertionType = Draft.Model.Constants.DraftInsertionType;
@@ -977,6 +1014,10 @@ export {
     DefaultDraftBlockRenderMap,
     DefaultDraftInlineStyle,
 
+    RawDraftInlineStyleRange,
+    RawDraftEntityRange,
+    RawDraftEntity,
+    RawDraftContentBlock,
     RawDraftContentState,
     convertFromRaw,
     convertToRaw,
@@ -989,6 +1030,9 @@ export {
     DraftEditorCommand,
     DraftDragType,
     DraftBlockType,
+    DraftInlineStyleType,
+    DraftEntityType,
+    DraftEntityMutability,
     DraftRemovalDirection,
     DraftHandleValue,
     DraftInsertionType,
diff --git a/types/draft-js/package.json b/types/draft-js/package.json
index 9b1e26b353..d657a0de12 100644
--- a/types/draft-js/package.json
+++ b/types/draft-js/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "immutable": "^3.8.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/draft-js/tslint.json b/types/draft-js/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/draft-js/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dragula/tslint.json b/types/dragula/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dragula/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dropboxjs/tslint.json b/types/dropboxjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dropboxjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dropzone/dropzone-tests.ts b/types/dropzone/dropzone-tests.ts
index 53cedba333..4abc3a6223 100644
--- a/types/dropzone/dropzone-tests.ts
+++ b/types/dropzone/dropzone-tests.ts
@@ -56,6 +56,7 @@ const dropzoneWithOptions = new Dropzone(".test", {
 	dictRemoveFile: "",
 	dictRemoveFileConfirmation: "",
 	dictMaxFilesExceeded: "",
+	dictFileSizeUnits: { tb: "", gb: "", mb: "", kb: "", b: "" },
 
 	accept: (file: Dropzone.DropzoneFile, done: (error?: string | Error) => void) => {
 		if (file.accepted) {
diff --git a/types/dropzone/index.d.ts b/types/dropzone/index.d.ts
index f809f84227..0295afbed2 100644
--- a/types/dropzone/index.d.ts
+++ b/types/dropzone/index.d.ts
@@ -26,6 +26,14 @@ declare namespace Dropzone {
 		accepted: boolean;
 		xhr?: XMLHttpRequest;
 	}
+	
+	export interface DropzoneDictFileSizeUnits { 
+		tb?: string;
+		gb?: string;
+		mb?: string;
+		kb?: string;
+		b?: string;
+	}
 
 	export interface DropzoneOptions {
 		url?: string;
@@ -72,6 +80,7 @@ declare namespace Dropzone {
 		dictRemoveFile?: string;
 		dictRemoveFileConfirmation?: string;
 		dictMaxFilesExceeded?: string;
+		dictFileSizeUnits?: DropzoneDictFileSizeUnits;
 
 		accept?(file: DropzoneFile, done: (error?: string | Error) => void): void;
 		init?(): void;
diff --git a/types/dropzone/tslint.json b/types/dropzone/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dropzone/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dropzone/v4/tslint.json b/types/dropzone/v4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dropzone/v4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dsv/tslint.json b/types/dsv/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dsv/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dts-bundle/tslint.json b/types/dts-bundle/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dts-bundle/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dts-generator/index.d.ts b/types/dts-generator/index.d.ts
index 9de25e1f91..5ef99eb2b0 100644
--- a/types/dts-generator/index.d.ts
+++ b/types/dts-generator/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/SitePen/dts-generator#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import ts = require('typescript');
 import Bluebird = require('bluebird');
diff --git a/types/dts-generator/package.json b/types/dts-generator/package.json
new file mode 100644
index 0000000000..2195330f38
--- /dev/null
+++ b/types/dts-generator/package.json
@@ -0,0 +1,6 @@
+{
+   "private": true,
+   "dependencies": {
+      "typescript": "*"
+   }
+}
diff --git a/types/duplexer3/duplexer3-tests.ts b/types/duplexer3/duplexer3-tests.ts
index 557437597c..c540828d5d 100644
--- a/types/duplexer3/duplexer3-tests.ts
+++ b/types/duplexer3/duplexer3-tests.ts
@@ -6,7 +6,7 @@ const readable = new stream.Readable({objectMode: true});
 
 writable._write = (input, encoding, done) => {
     if (readable.push(input)) {
-        return done();
+        done();
     } else {
         readable.once('drain', <(...args: any[]) => void> done);
     }
diff --git a/types/durandal/tslint.json b/types/durandal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/durandal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/durandal/v1/tslint.json b/types/durandal/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/durandal/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dustjs-linkedin/tslint.json b/types/dustjs-linkedin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dustjs-linkedin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dvtng-jss/dvtng-jss-tests.ts b/types/dvtng-jss/dvtng-jss-tests.ts
new file mode 100644
index 0000000000..2863bbfb66
--- /dev/null
+++ b/types/dvtng-jss/dvtng-jss-tests.ts
@@ -0,0 +1,16 @@
+
+
+jss.set('.demo', {
+    'font-size': '15px',
+    'color': 'red'
+});
+
+jss.get('.demo');
+
+jss.get();
+
+jss.getAll('.demo');
+
+jss.remove('.demo');
+
+jss.remove();
diff --git a/types/dvtng-jss/index.d.ts b/types/dvtng-jss/index.d.ts
new file mode 100644
index 0000000000..18278d80d1
--- /dev/null
+++ b/types/dvtng-jss/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for jss v0.6
+// Project: https://github.com/Box9/jss
+// Definitions by: Valentin Robert <https://github.com/Ptival>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Properties {
+    [name: string]: string;
+}
+
+interface Selectors {
+    [selector: string]: Properties;
+}
+
+interface JSS {
+    /**
+     * Retrieve all rules added via JSS, organized by selectors
+     */
+    get(): Selectors;
+
+    /**
+     * Retrieve rules added via JSS for a given selector
+     * @param s CSS selector
+     */
+    get(s: string): Properties;
+
+    /**
+     * Retrieve all rules specified for a given selector (not necessarily added via JSS)
+     * @param s CSS selector
+     */
+    getAll(s: string): Properties;
+
+    /**
+     * Remove all rules added via JSS
+     */
+    remove(): void;
+
+    /**
+     * Remove all rules added via JSS for the given selector
+     */
+    remove(s: string): void;
+
+    /**
+     * Add or extend an existing rule
+     * @param s CSS selector
+     * @param p CSS properties
+     */
+    set(s: string, p: Properties): void;
+}
+
+declare var jss: JSS;
diff --git a/types/dvtng-jss/tsconfig.json b/types/dvtng-jss/tsconfig.json
new file mode 100644
index 0000000000..3d47f98d9f
--- /dev/null
+++ b/types/dvtng-jss/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dvtng-jss-tests.ts"
+    ]
+}
diff --git a/types/dvtng-jss/tslint.json b/types/dvtng-jss/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dvtng-jss/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dw-bxslider-4/tslint.json b/types/dw-bxslider-4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dw-bxslider-4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dwt/tslint.json b/types/dwt/tslint.json
index acce7c8a0b..cb4a75513c 100644
--- a/types/dwt/tslint.json
+++ b/types/dwt/tslint.json
@@ -1,7 +1,10 @@
 {
   "extends": "dtslint/dt.json",
   "rules": {
+    "jsdoc-format": false,
     "max-line-length": [false],
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
     "no-trailing-whitespace": false,
     "space-before-function-paren": false,
     "only-arrow-functions": [false]
diff --git a/types/dwt/v12/tslint.json b/types/dwt/v12/tslint.json
index acce7c8a0b..cb4a75513c 100644
--- a/types/dwt/v12/tslint.json
+++ b/types/dwt/v12/tslint.json
@@ -1,7 +1,10 @@
 {
   "extends": "dtslint/dt.json",
   "rules": {
+    "jsdoc-format": false,
     "max-line-length": [false],
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
     "no-trailing-whitespace": false,
     "space-before-function-paren": false,
     "only-arrow-functions": [false]
diff --git a/types/dygraphs/index.d.ts b/types/dygraphs/index.d.ts
index c8617b18fc..6e45d5ccd7 100644
--- a/types/dygraphs/index.d.ts
+++ b/types/dygraphs/index.d.ts
@@ -526,6 +526,12 @@ declare namespace dygraphs {
          */
         highlightSeriesBackgroundAlpha?: number;
 
+        /**
+         * Sets the background color used to fade out the series in conjunction with 'highlightSeriesBackgroundAlpha'.
+         * Default: rgb(255, 255, 255)
+         */
+        highlightSeriesBackgroundColor?: string;
+
         /**
          * When set, the options from this object are applied to the timeseries closest to the mouse
          * pointer for interactive highlighting. See also 'highlightCallback'. Example:
diff --git a/types/dygraphs/tslint.json b/types/dygraphs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dygraphs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dymo-label-framework/tslint.json b/types/dymo-label-framework/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dymo-label-framework/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dynatable/tslint.json b/types/dynatable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/dynatable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/dynogels/dynogels-tests.ts b/types/dynogels/dynogels-tests.ts
new file mode 100644
index 0000000000..ca16707256
--- /dev/null
+++ b/types/dynogels/dynogels-tests.ts
@@ -0,0 +1,795 @@
+import dynogels = require("dynogels");
+import { DynamoDB } from "aws-sdk";
+import * as Joi from "joi";
+
+// AWS Configs
+dynogels.AWS.config.loadFromPath('credentials.json');
+dynogels.AWS.config.update({ region: "REGION" });
+
+// Define a Model
+const Account = dynogels.define('Account', {
+    hashKey: 'email',
+
+    // add the timestamp attributes (updatedAt, createdAt)
+    timestamps: true,
+
+    schema: {
+        email: Joi.string().email(),
+        name: Joi.string(),
+        age: Joi.number(),
+        roles: dynogels.types.stringSet(),
+        settings: {
+            nickname: Joi.string(),
+            acceptedTerms: Joi.boolean().default(false),
+            test: {
+                evan: Joi.string()
+            }
+        }
+    }
+});
+
+const BlogPost = dynogels.define('BlogPost', {
+    hashKey: 'email',
+    rangeKey: 'title',
+    schema: {
+        email: Joi.string().email(),
+        title: Joi.string(),
+        content: Joi.binary(),
+        tags: dynogels.types.stringSet(),
+    }
+});
+
+const BlogPost1 = dynogels.define('BlogPost', {
+    hashKey: 'email',
+    rangeKey: 'title',
+    schema: {
+        email: Joi.string().email(),
+        title: Joi.string()
+    },
+    validation: {
+        // allow properties not defined in the schema
+        allowUnknown: true
+    }
+});
+
+// Create Tables
+dynogels.createTables((err) => { });
+
+dynogels.createTables({
+    BlogPost: { readCapacity: 5, writeCapacity: 10 },
+    Account: {
+        readCapacity: 20,
+        writeCapacity: 4,
+        streamSpecification: {
+            streamEnabled: true,
+            streamViewType: 'NEW_IMAGE'
+        }
+    }
+}, (err) => { });
+
+dynogels.createTables({
+    $dynogels: { pollingInterval: 100 }
+}, (err) => { });
+
+// Delete Table
+BlogPost.deleteTable((err) => { });
+
+// UUID
+const Tweet = dynogels.define('Tweet', {
+    hashKey: 'TweetID',
+    timestamps: true,
+    schema: {
+        TweetID: dynogels.types.uuid(),
+        content: Joi.string(),
+    }
+});
+
+// Configuration
+const Account1 = dynogels.define('Account', {
+    hashKey: 'email',
+
+    // add the timestamp attributes (updatedAt, createdAt)
+    timestamps: true,
+
+    schema: {
+        email: Joi.string().email(),
+    }
+});
+
+const Account2 = dynogels.define('Account', {
+    hashKey: 'email',
+
+    // enable timestamps support
+    timestamps: true,
+
+    // I don't want createdAt
+    createdAt: false,
+
+    // I want updatedAt to actually be called updateTimestamp
+    updatedAt: 'updateTimestamp',
+
+    schema: {
+        email: Joi.string().email(),
+    }
+});
+
+const Event = dynogels.define('Event', {
+    hashKey: 'name',
+    schema: {
+        name: Joi.string(),
+        total: Joi.number()
+    },
+
+    tableName: 'deviceEvents'
+});
+
+const Event1 = dynogels.define('Event', {
+    hashKey: 'name',
+    schema: {
+        name: Joi.string(),
+        total: Joi.number()
+    },
+
+    // store monthly event data
+    tableName: () => {
+        const d = new Date();
+        return ['events', d.getFullYear(), d.getMonth() + 1].join('_');
+    }
+});
+
+Account.config({ tableName: 'AccountsTable' });
+
+const dynamodb = new DynamoDB();
+Account.config({ dynamodb });
+
+// or globally use custom DynamoDB instance
+// all defined models will now use this driver
+dynogels.dynamoDriver(dynamodb);
+
+// Saving Models To DynamoDB
+Account.create({ email: 'foo@example.com', name: 'Foo Bar', age: 21 }, (err, acc) => {
+    acc.get('email');
+});
+
+const acc = new Account({ email: 'test@example.com', name: 'Test Example' });
+acc.save((err) => {
+    acc.get('email');
+});
+
+BlogPost.create({
+    email: 'werner@example.com',
+    title: 'Expanding the Cloud',
+    content: 'Today, we are excited to announce the limited preview...'
+}, (err, post) => { });
+
+const item1 = { email: 'foo1@example.com', name: 'Foo 1', age: 10 };
+const item2 = { email: 'foo2@example.com', name: 'Foo 2', age: 20 };
+const item3 = { email: 'foo3@example.com', name: 'Foo 3', age: 30 };
+
+Account.create([item1, item2, item3], (err, accounts) => { });
+
+const params: dynogels.CreateItemOptions = {};
+
+params.ConditionExpression = '#i <> :x';
+params.ExpressionAttributeNames = { '#i': 'id' };
+params.ExpressionAttributeValues = { ':x': 123 };
+
+Account.create({ id: 123, name: 'Kurt Warner' }, params, (error, acc) => { });
+
+// setting overwrite to false will generate
+// the same Condition Expression as in the previous example
+Account.create({ id: 123, name: 'Kurt Warner' }, { overwrite: false }, (error, acc) => { });
+
+// Updating
+Account.update({ email: 'foo@example.com', name: 'Bar Tester' }, (err, acc) => { });
+
+Account.update({ email: 'foo@example.com', name: 'Bar Tester' }, { ReturnValues: 'ALL_OLD' }, (err, acc) => { });
+
+// Only update the account if the current age of the account is 22
+Account.update({ email: 'foo@example.com', name: 'Bar Tester' }, { expected: { age: 22 } }, (err, acc) => { });
+
+// setting an attribute to null will delete the attribute from DynamoDB
+Account.update({ email: 'foo@example.com', age: null }, (err, acc) => { });
+
+Account.update(
+    { email: 'foo@example.com', name: 'FooBar Testers' },
+    { expected: { email: { Exists: true } } },
+    (err, acc) => { }
+);
+
+Account.update(
+    { email: 'baz@example.com', name: 'Bar Tester' },
+    { expected: { email: { Exists: true } } },
+    (err, acc) => { }
+);
+
+Account.update({ email: 'foo@example.com', age: { $add: 1 } }, (err, acc) => { });
+
+BlogPost.update({
+    email: 'werner@example.com',
+    title: 'Expanding the Cloud',
+    tags: { $add: 'cloud' }
+}, (err, post) => { });
+
+BlogPost.update({
+    email: 'werner@example.com',
+    title: 'Expanding the Cloud',
+    tags: { $add: ['cloud', 'dynamodb'] }
+}, (err, post) => { });
+
+BlogPost.update({
+    email: 'werner@example.com',
+    title: 'Expanding the Cloud',
+    tags: { $del: 'cloud' }
+}, (err, post) => { });
+
+BlogPost.update({
+    email: 'werner@example.com',
+    title: 'Expanding the Cloud',
+    tags: { $del: ['aws', 'node'] }
+}, (err, post) => { });
+
+const params1: dynogels.UpdateItemOptions = {};
+params1.UpdateExpression = 'SET #year = #year + :inc, #dir.titles = list_append(#dir.titles, :title), #act[0].firstName = :firstName ADD tags :tag';
+params1.ConditionExpression = '#year = :current';
+params1.ExpressionAttributeNames = {
+    '#year': 'releaseYear',
+    '#dir': 'director',
+    '#act': 'actors'
+};
+
+params1.ExpressionAttributeValues = {
+    ':inc': 1,
+    ':current': 2001,
+    ':title': ['The Man'],
+    ':firstName': 'Rob',
+    ':tag': dynogels.Set(['Sports', 'Horror'], 'S')
+};
+
+BlogPost.update({ title: 'Movie 0', description: 'This is a description' }, params1, (err, mov) => { });
+
+// Deleting
+Account.destroy('foo@example.com', (err) => { });
+
+// Destroy model using hash and range key
+BlogPost.destroy('foo@example.com', 'Hello World!', (err) => { });
+
+BlogPost.destroy({ email: 'foo@example.com', title: 'Another Post' }, (err) => { });
+
+Account.destroy('foo@example.com', { ReturnValues: 'ALL_OLD' }, (err, acc) => { });
+
+Account.destroy('foo@example.com', { expected: { age: 22 } }, (err) => { });
+
+const params2: dynogels.DestroyItemOptions = {};
+params2.ConditionExpression = '#v = :x';
+params2.ExpressionAttributeNames = { '#v': 'version' };
+params2.ExpressionAttributeValues = { ':x': '2' };
+
+Account.destroy({ id: 123 }, params2, (err, acc) => { });
+
+// Loading Models from DynamoDB
+Account.get('test@example.com', (err, acc) => {
+    console.log('got account', acc.get('email'));
+});
+
+Account.get('test@example.com', { ConsistentRead: true }, (err, acc) => { });
+
+Account.get('test@example.com', { ConsistentRead: true, AttributesToGet: ['name', 'age'] }, (err, acc) => { });
+
+BlogPost.get('werner@example.com', 'dynamodb-keeps-getting-better-and-cheaper', (err, post) => { });
+
+BlogPost.get({ email: 'werner@example.com', title: 'Expanding the Cloud' }, (err, post) => { });
+
+BlogPost.get({ id: '123456789' }, { ProjectionExpression: 'email, age, settings.nickname' }, (err, acc) => { });
+
+// Query
+
+const callback = () => { };
+// query for blog posts by werner@example.com
+BlogPost
+    .query('werner@example.com')
+    .exec(callback);
+
+// same as above, but load all results
+BlogPost
+    .query('werner@example.com')
+    .loadAll()
+    .exec(callback);
+
+// only load the first 5 posts by werner
+BlogPost
+    .query('werner@example.com')
+    .limit(5)
+    .exec(callback);
+
+// query for posts by werner where the tile begins with 'Expanding'
+BlogPost
+    .query('werner@example.com')
+    .where('title').beginsWith('Expanding')
+    .exec(callback);
+
+// return only the count of documents that begin with the title Expanding
+BlogPost
+    .query('werner@example.com')
+    .where('title').beginsWith('Expanding')
+    .select('COUNT')
+    .exec(callback);
+
+// query the first 10 posts by werner@example.com but only return
+// the title and content from posts where the title starts with 'Expanding'
+// WARNING: See notes below on the implementation of limit in DynamoDB
+BlogPost
+    .query('werner@example.com')
+    .where('title').beginsWith('Expanding')
+    .attributes(['title', 'content'])
+    .limit(10)
+    .exec(callback);
+
+// sorting by title ascending
+BlogPost
+    .query('werner@example.com')
+    .ascending()
+    .exec(callback);
+
+// sorting by title descending
+BlogPost
+    .query('werner@example.com')
+    .descending()
+    .exec(callback);
+
+// All query options are chainable
+BlogPost
+    .query('werner@example.com')
+    .where('title').gt('Expanding')
+    .attributes(['title', 'content'])
+    .limit(10)
+    .ascending()
+    .loadAll()
+    .exec(callback);
+
+// Traversing Map Data Types
+Account
+    .query('werner@example.com')
+    .filter('settings.acceptedTerms').equals(true)
+    .exec(callback);
+
+BlogPost
+    .query('werner@example.com')
+    .where('title').equals('Expanding')
+    .exec();
+
+// less than equals
+BlogPost
+    .query('werner@example.com')
+    .where('title').lte('Expanding')
+    .exec();
+
+// less than
+BlogPost
+    .query('werner@example.com')
+    .where('title').lt('Expanding')
+    .exec();
+
+// greater than
+BlogPost
+    .query('werner@example.com')
+    .where('title').gt('Expanding')
+    .exec();
+
+// greater than equals
+BlogPost
+    .query('werner@example.com')
+    .where('title').gte('Expanding')
+    .exec();
+
+// attribute doesn't exist
+BlogPost
+    .query('werner@example.com')
+    .where('title').null()
+    .exec();
+
+// attribute exists
+BlogPost
+    .query('werner@example.com')
+    .where('title').exists()
+    .exec();
+
+BlogPost
+    .query('werner@example.com')
+    .where('title').beginsWith('Expanding')
+    .exec();
+
+BlogPost
+    .query('werner@example.com')
+    .where('title').between('foo@example.com', 'test@example.com')
+    .exec();
+
+BlogPost
+    .query('werner@example.com')
+    .where('title').equals('Expanding')
+    .filter('tags').contains('cloud')
+    .exec();
+
+BlogPost
+    .query('werner@example.com')
+    .filterExpression('#title < :t')
+    .expressionAttributeValues({ ':t': 'Expanding' })
+    .expressionAttributeNames({ '#title': 'title' })
+    .projectionExpression('#title, tag')
+    .exec();
+
+const GameScore = dynogels.define('GameScore', {
+    hashKey: 'userId',
+    rangeKey: 'gameTitle',
+    schema: {
+        userId: Joi.string(),
+        gameTitle: Joi.string(),
+        topScore: Joi.number(),
+        topScoreDateTime: Joi.date(),
+        wins: Joi.number(),
+        losses: Joi.number()
+    },
+    indexes: [{
+        hashKey: 'gameTitle', rangeKey: 'topScore', name: 'GameTitleIndex', type: 'global'
+    }]
+});
+
+GameScore
+    .query('Galaxy Invaders')
+    .usingIndex('GameTitleIndex')
+    .descending()
+    .exec(callback);
+
+const GameScore1 = dynogels.define('GameScore', {
+    hashKey: 'userId',
+    rangeKey: 'gameTitle',
+    schema: {
+        userId: Joi.string(),
+        gameTitle: Joi.string(),
+        topScore: Joi.number(),
+        topScoreDateTime: Joi.date(),
+        wins: Joi.number(),
+        losses: Joi.number()
+    },
+    indexes: [{
+        hashKey: 'gameTitle',
+        rangeKey: 'topScore',
+        name: 'GameTitleIndex',
+        type: 'global',
+        projection: { NonKeyAttributes: ['wins'], ProjectionType: 'INCLUDE' } // optional, defaults to ALL
+    }]
+});
+
+GameScore
+    .query('Galaxy Invaders')
+    .usingIndex('GameTitleIndex')
+    .where('topScore').gt(1000)
+    .descending()
+    .exec((err, data) => { });
+
+const BlogPost5 = dynogels.define('Account', {
+    hashKey: 'email',
+    rangeKey: 'title',
+    schema: {
+        email: Joi.string().email(),
+        title: Joi.string(),
+        content: Joi.binary(),
+        PublishedDateTime: Joi.date()
+    },
+
+    indexes: [{
+        hashKey: 'email', rangeKey: 'PublishedDateTime', type: 'local', name: 'PublishedIndex'
+    }]
+});
+
+BlogPost
+    .query('werner@example.com')
+    .usingIndex('PublishedIndex')
+    .descending()
+    .exec(callback);
+
+BlogPost
+    .query('werner@example.com')
+    .usingIndex('PublishedIndex')
+    .ascending()
+    .exec(callback);
+
+BlogPost
+    .query('werner@example.com')
+    .usingIndex('PublishedIndex')
+    .descending()
+    .loadAll()
+    .exec(callback);
+
+// scan all accounts, returning the first page or results
+Account.scan().exec(callback);
+
+// scan all accounts, this time loading all results
+// note this will potentially make several calls to DynamoDB
+// in order to load all results
+Account
+    .scan()
+    .loadAll()
+    .exec(callback);
+
+// Load 20 accounts
+Account
+    .scan()
+    .limit(20)
+    .exec();
+
+// Load All accounts, 20 at a time per request
+Account
+    .scan()
+    .limit(20)
+    .loadAll()
+    .exec();
+
+// Load accounts which match a filter
+// only return email and created attributes
+// and return back the consumed capacity the request took
+Account
+    .scan()
+    .where('email').gte('f@example.com')
+    .attributes(['email', 'created'])
+    .returnConsumedCapacity()
+    .exec();
+
+// Load All accounts, if settings.acceptedTerms is true
+Account
+    .scan()
+    .where('settings.acceptedTerms').equals(true)
+    .exec();
+
+// Returns number of matching accounts, rather than the matching accounts themselves
+Account
+    .scan()
+    .where('age').gte(21)
+    .select('COUNT')
+    .exec();
+
+// Start scan using start key
+Account
+    .scan()
+    .where('age').notNull()
+    .startKey('foo@example.com')
+    .exec();
+
+// equals
+Account
+    .scan()
+    .where('name').equals('Werner')
+    .exec();
+
+// not equals
+Account
+    .scan()
+    .where('name').ne('Werner')
+    .exec();
+
+// less than equals
+Account
+    .scan()
+    .where('name').lte('Werner')
+    .exec();
+
+// less than
+Account
+    .scan()
+    .where('name').lt('Werner')
+    .exec();
+
+// greater than equals
+Account
+    .scan()
+    .where('name').gte('Werner')
+    .exec();
+
+// greater than
+Account
+    .scan()
+    .where('name').gt('Werner')
+    .exec();
+
+// name attribute doesn't exist
+Account
+    .scan()
+    .where('name').null()
+    .exec();
+
+// name attribute exists
+Account
+    .scan()
+    .where('name').notNull()
+    .exec();
+
+// contains
+Account
+    .scan()
+    .where('name').contains('ner')
+    .exec();
+
+// not contains
+Account
+    .scan()
+    .where('name').notContains('ner')
+    .exec();
+
+// in
+Account
+    .scan()
+    .where('name').in(['foo@example.com', 'bar@example.com'])
+    .exec();
+
+// begins with
+Account
+    .scan()
+    .where('name').beginsWith('Werner')
+    .exec();
+
+// between
+Account
+    .scan()
+    .where('name').between('Bar', 'Foo')
+    .exec();
+
+// multiple filters
+Account
+    .scan()
+    .where('name').equals('Werner')
+    .where('age').notNull()
+    .exec();
+
+Account.scan()
+    .filterExpression('#age BETWEEN :low AND :high AND begins_with(#email, :e)')
+    .expressionAttributeValues({ ':low': 18, ':high': 22, ':e': 'test1' })
+    .expressionAttributeNames({ '#age': 'age', '#email': 'email' })
+    .projectionExpression('#age, #email')
+    .exec();
+
+const totalSegments = 8;
+
+Account.parallelScan(totalSegments)
+    .where('age').gte(18)
+    .attributes('age')
+    .exec(callback);
+
+// Load All accounts
+Account
+    .parallelScan(totalSegments)
+    .exec();
+
+Account.getItems(['foo@example.com', 'bar@example.com', 'test@example.com'], (err, accounts) => {
+    console.log(`loaded ${accounts.length} accounts`); // prints loaded 3 accounts
+});
+
+// Get both accounts, using a consistent read
+Account.getItems(['foo@example.com', 'bar@example.com'], { ConsistentRead: true }, (err, accounts) => {
+    console.log(`loaded ${accounts.length} accounts`); // prints loaded 2 accounts
+});
+
+// Streaming API
+
+const stream = Account.parallelScan(4).exec();
+
+stream.on('readable', () => {
+    console.log('single parallel scan response', stream.read());
+});
+
+stream.on('end', () => {
+    console.log('Parallel scan of accounts finished');
+});
+
+const querystream = BlogPost.query('werner@dynogels.com').loadAll().exec();
+
+querystream.on('readable', () => {
+    console.log('single query response', stream.read());
+});
+
+querystream.on('end', () => {
+    console.log('query for blog posts finished');
+});
+
+// Dynamic Table Names
+
+const Event2 = dynogels.define('Event', {
+    hashKey: 'name',
+    schema: {
+        name: Joi.string(),
+        total: Joi.number()
+    },
+
+    // store monthly event data
+    tableName: () => {
+        const d = new Date();
+        return ['events', d.getFullYear(), d.getMonth() + 1].join('_');
+    }
+});
+
+// Logging
+
+const accountLogger = {
+    info: (...args: any[]) => { },
+    warn: (...args: any[]) => { }
+};
+
+dynogels.log = accountLogger;
+
+const Account3 = dynogels.define('Account', {
+    hashKey: 'email',
+    log: accountLogger
+}); // INFO level on account table
+
+const Account4 = dynogels.define('Account', {
+    hashKey: 'email',
+
+    // add the timestamp attributes (updatedAt, createdAt)
+    timestamps: true,
+
+    schema: {
+        email: Joi.string().email(),
+        name: Joi.string().required(),
+        age: Joi.number(),
+    }
+});
+
+Account.create({ email: 'test@example.com', name: 'Test Account' }, (err, acc) => {
+    console.log('created account at', acc.get('created')); // prints created Date
+
+    acc.set({ age: 22 });
+
+    acc.update((err) => {
+        console.log('updated account age');
+    });
+});
+
+// For models with range keys you must pass in objects of hash and range key attributes
+const postKey1 = { email: 'test@example.com', title: 'Hello World!' };
+const postKey2 = { email: 'test@example.com', title: 'Another Post' };
+
+BlogPost.getItems([postKey1, postKey2], (err, posts) => {
+    console.log('loaded posts');
+});
+
+dynogels.log.info("test", "123", {});
+dynogels.log.warn("test", "123", {});
+
+// Lifecycle hooks
+Account.before('create', (data, next) => {
+    if (!data.name) {
+        data.name = 'Foo Bar';
+    }
+
+    next(null, data);
+});
+
+Account.before('update', (data, next) => {
+    data.age = 45;
+    next(null, data);
+});
+
+Account.after('create', item => {
+    console.log('Account created', item.get());
+});
+
+Account.after('update', item => {
+    console.log('Account updated', item.get());
+});
+
+Account.after('destroy', item => {
+    console.log('Account destroyed', item.get());
+});
+
+dynogels.createTables(err => {
+    if (err) {
+        process.exit(1);
+    }
+
+    Account.create({ email: 'test11@example.com' }, (err, acc) => {
+        acc.set({ age: 25 });
+
+        acc.update(() => {
+            acc.destroy({ ReturnValues: 'ALL_OLD' });
+        });
+    });
+});
diff --git a/types/dynogels/index.d.ts b/types/dynogels/index.d.ts
new file mode 100644
index 0000000000..2e4c5acbf4
--- /dev/null
+++ b/types/dynogels/index.d.ts
@@ -0,0 +1,263 @@
+// Type definitions for dynogels 8.0
+// Project: https://github.com/clarkie/dynogels#readme
+// Definitions by: Spartan Labs <https://github.com/SpartanLabs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+export import AWS = require("aws-sdk");
+import * as joi from "joi";
+import stream = require("stream");
+
+// Dynogels Data Members
+export let log: Log;
+export let models: { [key: string]: Model };
+export let types: {
+    stringSet(): joi.AnySchema;
+    numberSet(): joi.AnySchema;
+    binarySet(): joi.AnySchema;
+    uuid(): joi.AnySchema;
+    timeUUID(): joi.AnySchema;
+};
+
+export interface Log {
+    info(...args: any[]): void;
+    warn(...args: any[]): void;
+}
+
+// Dynogels global functions
+export function dynamoDriver(dynamoDB: AWS.DynamoDB): AWS.DynamoDB;
+export function reset(): void;
+export function define(modelName: string, config: ModelConfiguration): Model;
+export function createTables(callback: (err: string) => void): void;
+export function createTables(options: { [key: string]: CreateTablesOptions } | DynogelsGlobalOptions, callback: (err: string) => void): void;
+export function Set(...args: any[]): any;
+
+export interface DynogelsGlobalOptions {
+    $dynogels: {
+        pollingInterval: number;
+    };
+}
+
+export interface CreateTablesOptions {
+    readCapacity?: number;
+    writeCapacity?: number;
+    streamSpecification?: {
+        streamEnabled: boolean;
+        streamViewType: string;
+    };
+}
+
+export type LifeCycleAction = "create" | "update" | "destroy";
+
+// Dynogels Model
+export interface Model {
+    new(attrs: { [key: string]: any }): Item;
+
+    get(hashKey: any, rangeKey: any, options: GetItemOptions, callback: DynogelsItemCallback): void;
+    get(haskKey: any, options: GetItemOptions, callback: DynogelsItemCallback): void;
+    get(hashKey: any, callback: DynogelsItemCallback): void;
+    get(hashKey: any, rangeKey: any, callback: DynogelsItemCallback): void;
+    create(item: any, options: CreateItemOptions, callback: DynogelsItemCallback): void;
+    create(item: any, callback: DynogelsItemCallback): void;
+    update(item: any, options: UpdateItemOptions, callback: DynogelsItemCallback): void;
+    update(item: any, callback: DynogelsItemCallback): void;
+    destroy(hashKey: any, rangeKey: any, options: DestroyItemOptions, callback: DynogelsItemCallback): void;
+    destroy(haskKey: any, options: DestroyItemOptions, callback: DynogelsItemCallback): void;
+    destroy(hashKey: any, callback: DynogelsItemCallback): void;
+    destroy(hashKey: any, rangeKey: any, callback: DynogelsItemCallback): void;
+    destroy(item: any, options: DestroyItemOptions, callback: DynogelsItemCallback): void;
+    destroy(item: any, callback: DynogelsItemCallback): void;
+    query(hashKey: any): Query;
+    scan(): Scan;
+    parallelScan(totalSegments: number): Scan;
+    getItems(items: string[] | Array<{ [key: string]: string }>, callback: (err: Error, items: any[]) => void): void;
+    getItems(items: string[] | Array<{ [key: string]: string }>, options: GetItemOptions, callback: (err: Error, items: any[]) => void): void;
+    batchGetItems(items: string[] | Array<{ [key: string]: string }>, callback: (err: Error, items: any[]) => void): void;
+    batchGetItems(items: string[] | Array<{ [key: string]: string }>, options: GetItemOptions, callback: (err: Error, items: any[]) => void): void;
+    createTable(options: { [key: string]: CreateTablesOptions } | DynogelsGlobalOptions, callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
+    createTable(callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
+    updateTable(throughput: Throughput, callback: (err: Error, data: AWS.DynamoDB.UpdateTableOutput) => void): void;
+    updateTable(callback: (err: Error, data: AWS.DynamoDB.UpdateTableOutput) => void): void;
+    describeTable(callback: (err: Error, data: AWS.DynamoDB.DescribeTableOutput) => void): void;
+    deleteTable(callback: (err: Error) => void): void;
+    tableName(): string;
+
+    after(action: LifeCycleAction, listner: (item: Item) => void): void;
+    before(action: LifeCycleAction, listner: (data: any, next: (err: Error | null, data: any) => void) => void): void;
+    config(config: ModelConfig): { name: string };
+}
+
+export type DynogelsItemCallback = (err: Error, data: Item) => void;
+
+export interface Throughput {
+    readCapacity: number;
+    writeCapacity: number;
+}
+
+export interface CreateItemOptions {
+    expected?: { [key: string]: any };
+    overwrite?: boolean;
+
+    Expected?: AWS.DynamoDB.ExpectedAttributeMap;
+    ReturnValues?: AWS.DynamoDB.ReturnValue;
+    ReturnConsumedCapacity?: AWS.DynamoDB.ReturnConsumedCapacity;
+    ReturnItemCollectionMetrics?: AWS.DynamoDB.ReturnItemCollectionMetrics;
+    ConditionalOperator?: AWS.DynamoDB.ConditionalOperator;
+    ConditionExpression?: AWS.DynamoDB.ConditionExpression;
+    ExpressionAttributeNames?: AWS.DynamoDB.ExpressionAttributeNameMap;
+    ExpressionAttributeValues?: { [key: string]: any };
+}
+
+export interface UpdateItemOptions {
+    expected?: { [key: string]: any };
+
+    AttributeUpdates?: AWS.DynamoDB.AttributeUpdates;
+    Expected?: AWS.DynamoDB.ExpectedAttributeMap;
+    ConditionalOperator?: AWS.DynamoDB.ConditionalOperator;
+    ReturnValues?: AWS.DynamoDB.ReturnValue;
+    ReturnConsumedCapacity?: AWS.DynamoDB.ReturnConsumedCapacity;
+    ReturnItemCollectionMetrics?: AWS.DynamoDB.ReturnItemCollectionMetrics;
+    UpdateExpression?: AWS.DynamoDB.UpdateExpression;
+    ConditionExpression?: AWS.DynamoDB.ConditionExpression;
+    ExpressionAttributeNames?: AWS.DynamoDB.ExpressionAttributeNameMap;
+    ExpressionAttributeValues?: { [key: string]: any };
+}
+
+export interface DestroyItemOptions {
+    Expected?: AWS.DynamoDB.ExpectedAttributeMap;
+    ConditionalOperator?: AWS.DynamoDB.ConditionalOperator;
+    ReturnValues?: AWS.DynamoDB.ReturnValue;
+    ReturnConsumedCapacity?: AWS.DynamoDB.ReturnConsumedCapacity;
+    ReturnItemCollectionMetrics?: AWS.DynamoDB.ReturnItemCollectionMetrics;
+    ConditionExpression?: AWS.DynamoDB.ConditionExpression;
+    ExpressionAttributeNames?: AWS.DynamoDB.ExpressionAttributeNameMap;
+    ExpressionAttributeValues?: { [key: string]: any };
+}
+
+export interface GetItemOptions {
+    AttributesToGet?: AWS.DynamoDB.AttributeNameList;
+    ConsistentRead?: AWS.DynamoDB.ConsistentRead;
+    ReturnConsumedCapacity?: AWS.DynamoDB.ReturnConsumedCapacity;
+    ProjectionExpression?: AWS.DynamoDB.ProjectionExpression;
+    ExpressionAttributeNames?: AWS.DynamoDB.ExpressionAttributeNameMap;
+}
+
+export interface ModelConfig {
+    tableName?: string;
+    docClient?: any;
+    dynamodb?: AWS.DynamoDB;
+}
+
+// Dynogels Item
+export interface Item {
+    get(key?: string): { [key: string]: any };
+    set(params: {}): Item;
+    save(callback?: DynogelsItemCallback): void;
+    update(options: UpdateItemOptions, callback?: DynogelsItemCallback): void;
+    update(callback?: DynogelsItemCallback): void;
+    destroy(options: DestroyItemOptions, callback?: DynogelsItemCallback): void;
+    destroy(callback?: DynogelsItemCallback): void;
+    toJSON(): any;
+    toPlainObject(): any;
+}
+
+export interface BaseChain<T> {
+    equals(value: any): T;
+    eq(value: any): T;
+    lte(value: any): T;
+    lt(value: any): T;
+    gte(value: any): T;
+    gt(value: any): T;
+    null(): T;
+    exists(): T;
+    beginsWith(value: any): T;
+    between(value1: any, value2: any): T;
+}
+
+export interface ExtendedChain<T> extends BaseChain<T> {
+    contains(value: any): T;
+    notContains(value: any): T;
+    in(values: any[]): T;
+    ne(value: any): T;
+}
+
+export type QueryWhereChain = BaseChain<Query>;
+export type QueryFilterChain = ExtendedChain<Query>;
+
+// Dynogels Query
+export interface Query {
+    limit(number: number): Query;
+    filterExpression(expression: any): Query;
+    expressionAttributeNames(data: any): Query;
+    expressionAttributeValues(data: any): Query;
+    projectionExpression(data: any): Query;
+    usingIndex(name: string): Query;
+    consistentRead(read: boolean): Query;
+    addKeyCondition(condition: any): Query;
+    addFilterCondition(condition: any): Query;
+    startKey(hashKey: any, rangeKey: any): Query;
+    attributes(attrs: any): Query;
+    ascending(): Query;
+    descending(): Query;
+    select(value: any): Query;
+    returnConsumedCapacity(value: any): Query;
+    loadAll(): Query;
+    where(keyName: string): QueryWhereChain;
+    filter(keyName: string): QueryFilterChain;
+    exec(): stream.Readable;
+    exec(callback: (err: Error, data: any) => void): void;
+}
+
+export interface ScanWhereChain extends ExtendedChain<Scan> {
+    notNull(): Scan;
+}
+
+// Dynogels Scan
+export interface Scan {
+    limit(number: number): Scan;
+    addFilterCondition(condition: any): Scan;
+    startKey(hashKey: any, rangeKey?: any): Scan;
+    attributes(attrs: any): Scan;
+    select(value: any): Scan;
+    returnConsumedCapacity(): Scan;
+    segments(segment: any, totalSegments: number): Scan;
+    where(keyName: string): ScanWhereChain;
+    filterExpression(expression: any): Scan;
+    expressionAttributeNames(data: any): Scan;
+    expressionAttributeValues(data: any): Scan;
+    projectionExpression(data: any): Scan;
+    exec(): stream.Readable;
+    exec(callback: (err: Error, data: any) => void): void;
+    loadAll(): Scan;
+}
+
+export type tableResolve = () => string;
+
+export interface SchemaType {
+    [key: string]: joi.AnySchema | SchemaType;
+}
+
+export interface ModelConfiguration {
+    hashKey: string;
+    rangeKey?: string;
+    timestamps?: boolean;
+    createdAt?: boolean;
+    updatedAt?: string;
+    schema?: SchemaType;
+    validation?: joi.ValidationOptions;
+    tableName?: string | tableResolve;
+    indexes?: any[];
+    log?: Log;
+}
+
+export interface Document {
+    [key: string]: any;
+}
+
+export interface DocumentCollection {
+    Items: Document[];
+    Count: number;
+    ScannedCount: number;
+}
diff --git a/types/dynogels/package.json b/types/dynogels/package.json
new file mode 100644
index 0000000000..28676516a3
--- /dev/null
+++ b/types/dynogels/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "aws-sdk": "^2.58.0"
+    }
+}
\ No newline at end of file
diff --git a/types/dynogels/tsconfig.json b/types/dynogels/tsconfig.json
new file mode 100644
index 0000000000..40297f0a43
--- /dev/null
+++ b/types/dynogels/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dynogels-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/dynogels/tslint.json b/types/dynogels/tslint.json
new file mode 100644
index 0000000000..c7d87e32cc
--- /dev/null
+++ b/types/dynogels/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false
+    }
+}
\ No newline at end of file
diff --git a/types/each/tslint.json b/types/each/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/each/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easeljs/index.d.ts b/types/easeljs/index.d.ts
index d47f631728..462c9f04cf 100644
--- a/types/easeljs/index.d.ts
+++ b/types/easeljs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for EaselJS 0.8.0
+// Type definitions for EaselJS 1.0.0
 // Project: http://www.createjs.com/#!/EaselJS
 // Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -53,6 +53,22 @@ declare namespace createjs {
         clone(): Bitmap;
     }
 
+    export class BitmapCache {
+        constructor();
+
+        // properties
+        cacheID: number;
+
+        // methods
+        static getFilterBounds(target: DisplayObject, output?: Rectangle): Rectangle;
+        toString(): string;
+        define(target: DisplayObject, x: number, y: number, width: number, height: number, scale?: number): void;
+        update(compositeOperation?: string): void;
+        release(): void;
+        getCacheDataURL(): string;
+        draw(ctx: CanvasRenderingContext2D): boolean;
+    }
+
     export class ScaleBitmap extends DisplayObject {
         constructor(imageOrUrl: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | Object | string, scale9Grid: Rectangle);
 
@@ -211,6 +227,7 @@ declare namespace createjs {
 
         // properties
         alpha: number;
+        bitmapCache: BitmapCache;
         cacheCanvas: HTMLCanvasElement | Object;
         cacheID: number;
         compositeOperation: string;
@@ -924,6 +941,60 @@ declare namespace createjs {
 
     }
 
+    interface IStageGLOptions {
+        preserveBuffer?: boolean;
+        antialias?: boolean;
+        transparent?: boolean;
+        premultiply?: boolean;
+        autoPurge?: number;
+    }
+
+    export class StageGL extends Stage {
+        constructor(canvas: HTMLCanvasElement | string | Object, options?: IStageGLOptions);
+
+        // properties
+        static VERTEX_PROPERTY_COUNT: number;
+        static INDICIES_PER_CARD: number;
+        static DEFAULT_MAX_BATCH_SIZE: number;
+        static WEBGL_MAX_INDEX_NUM: number;
+        static UV_RECT: number;
+        static COVER_VERT: Float32Array;
+        static COVER_UV: Float32Array;
+        static COVER_UV_FLIP: Float32Array;
+        static REGULAR_VARYING_HEADER: string;
+        static REGULAR_VERTEX_HEADER: string;
+        static REGULAR_FRAGMENT_HEADER: string;
+        static REGULAR_VERTEX_BODY: string;
+        static REGULAR_FRAGMENT_BODY: string;
+        static REGULAR_FRAG_COLOR_NORMAL: string;
+        static REGULAR_FRAG_COLOR_PREMULTIPLY: string;
+        static PARTICLE_VERTEX_BODY: string;
+        static PARTICLE_FRAGMENT_BODY: string;
+        static COVER_VARYING_HEADER: string;
+        static COVER_VERTEX_HEADER: string;
+        static COVER_FRAGMENT_HEADER: string;
+        static COVER_VERTEX_BODY: string;
+        static COVER_FRAGMENT_BODY: string;
+        isWebGL: boolean;
+        autoPurge: number;
+        vocalDebug: boolean;
+
+        // methods
+        static buildUVRects(spritesheet: SpriteSheet, target?: number, onlyTarget?: boolean): Object;
+        static isWebGLActive(ctx: CanvasRenderingContext2D): boolean;
+        cacheDraw(target: DisplayObject, filters: Filter[], manager: BitmapCache): boolean;
+        getBaseTexture(w?: number, h?: number): WebGLTexture | null;
+        getFilterShader(filter: Filter | Object): WebGLProgram;
+        getRenderBufferTexture (w: number, h: number): WebGLTexture;
+        getTargetRenderTexture (target: DisplayObject, w: number, h: number): Object;
+        protectTextureSlot(id: number, lock?: boolean): void;
+        purgeTextures(count?: number): void;
+        releaseTexture(item: DisplayObject | WebGLTexture | HTMLImageElement | HTMLCanvasElement): void;
+        setTextureParams(gl: WebGLRenderingContext, isPOT?: boolean): void;
+        updateSimultaneousTextureCount(count?: number): void;
+        updateViewport(width: number, height: number): void;
+    }
+
 
     export class Text extends DisplayObject {
         constructor(text?: string, font?: string, color?: string);
diff --git a/types/easeljs/tslint.json b/types/easeljs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/easeljs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easy-api-request/index.d.ts b/types/easy-api-request/index.d.ts
index cc3fc85810..e306a0a2b2 100644
--- a/types/easy-api-request/index.d.ts
+++ b/types/easy-api-request/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/DeadAlready/easy-api-request
 // Definitions by: Karl Düüna <https://github.com/DeadAlready>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/easy-api-request/tslint.json b/types/easy-api-request/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/easy-api-request/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easy-jsend/index.d.ts b/types/easy-jsend/index.d.ts
index 6cf9f48d03..c0280736e9 100644
--- a/types/easy-jsend/index.d.ts
+++ b/types/easy-jsend/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/DeadAlready/easy-jsend
 // Definitions by: Karl Düüna <https://github.com/DeadAlready>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
diff --git a/types/easy-jsend/tslint.json b/types/easy-jsend/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/easy-jsend/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easy-session/index.d.ts b/types/easy-session/index.d.ts
index 904b74d23f..30df43458c 100644
--- a/types/easy-session/index.d.ts
+++ b/types/easy-session/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/DeadAlready/node-easy-session
 // Definitions by: Karl Düüna <https://github.com/DeadAlready>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 
diff --git a/types/easy-session/tslint.json b/types/easy-session/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/easy-session/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easy-table/tslint.json b/types/easy-table/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/easy-table/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easy-x-headers/easy-x-headers-tests.ts b/types/easy-x-headers/easy-x-headers-tests.ts
deleted file mode 100644
index 6887570225..0000000000
--- a/types/easy-x-headers/easy-x-headers-tests.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Created by karl on 14/07/15.
- */
-
-
-
-
-import express = require('express');
-import xHeaders = require('easy-x-headers');
-
-var app = express();
-app.use(xHeaders.getMiddleware());
-
-app.get('/', function (req, res) {
-    res.json(req.info);
-});
diff --git a/types/easy-x-headers/index.d.ts b/types/easy-x-headers/index.d.ts
deleted file mode 100644
index 35ede3ef2e..0000000000
--- a/types/easy-x-headers/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for easy-x-headers
-// Project: https://github.com/DeadAlready/easy-x-headers
-// Definitions by: Karl Düüna <https://github.com/DeadAlready>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="express" />
-
-declare namespace Express {
-    export interface Request {
-        info: any;
-    }
-}
-
-declare module "easy-x-headers" {
-    import express = require('express');
-
-    export function getMiddleware(defaults?: Object): express.RequestHandler;
-}
diff --git a/types/easy-x-headers/tsconfig.json b/types/easy-x-headers/tsconfig.json
deleted file mode 100644
index e2b2378af6..0000000000
--- a/types/easy-x-headers/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "easy-x-headers-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/easy-xapi-supertest/easy-xapi-supertest-tests.ts b/types/easy-xapi-supertest/easy-xapi-supertest-tests.ts
deleted file mode 100644
index 76dad2c8f8..0000000000
--- a/types/easy-xapi-supertest/easy-xapi-supertest-tests.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Created by karl on 14/07/15.
- */
-
-
-
-import express = require('express');
-import eSupertest = require('easy-xapi-supertest');
-
-var app = express();
-
-var getAgent = eSupertest.getAgentFactory(app);
-
-var agent = getAgent({
-    user: 'Jack',
-    role: 'user'
-});
-
-var getAgent2 = eSupertest.getAgentFactory(app, function (user:string, role?:string) {
-    return {
-        user: user,
-        role: role || 'user'
-    }
-});
-
-var agent = getAgent2('Jack');
diff --git a/types/easy-xapi-supertest/index.d.ts b/types/easy-xapi-supertest/index.d.ts
deleted file mode 100644
index f67dc4345b..0000000000
--- a/types/easy-xapi-supertest/index.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for easy-x-headers
-// Project: https://github.com/DeadAlready/easy-x-headers
-// Definitions by: Karl Düüna <https://github.com/DeadAlready>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
-
-import express = require('express');
-
-export interface BodyAgent {
-    send(data: Object): any;
-    attach(arg1: any, arg2?: any): any;
-}
-
-export interface Agent {
-    get(url: string): any;
-    delete(url: string): any;
-    post(url: string): BodyAgent;
-    patch(url: string): BodyAgent;
-    put(url: string): BodyAgent;
-}
-
-interface getAgent {
-    (...args: any[]): Agent
-}
-
-export declare function getAgentFactory(app: express.Application, transform?: Function): getAgent;
diff --git a/types/easy-xapi-supertest/tsconfig.json b/types/easy-xapi-supertest/tsconfig.json
deleted file mode 100644
index 91c132409e..0000000000
--- a/types/easy-xapi-supertest/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "easy-xapi-supertest-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/easy-xapi-utils/easy-xapi-utils-tests.ts b/types/easy-xapi-utils/easy-xapi-utils-tests.ts
index 2ad20c915a..d04d6e982a 100644
--- a/types/easy-xapi-utils/easy-xapi-utils-tests.ts
+++ b/types/easy-xapi-utils/easy-xapi-utils-tests.ts
@@ -2,9 +2,6 @@
  * Created by karl on 14/07/15.
  */
 
-
-/// <reference types="easy-xapi" />
-
 import express = require('express');
 import eXapi = require('easy-xapi');
 import eUtils = require('easy-xapi-utils');
diff --git a/types/easy-xapi-utils/index.d.ts b/types/easy-xapi-utils/index.d.ts
index 5085af7551..83f5615e61 100644
--- a/types/easy-xapi-utils/index.d.ts
+++ b/types/easy-xapi-utils/index.d.ts
@@ -2,11 +2,7 @@
 // Project: https://github.com/DeadAlready/easy-xapi-utils
 // Definitions by: Karl Düüna <https://github.com/DeadAlready>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-/// <reference types="easy-jsend" />
-/// <reference types="easy-x-headers" />
-
+// TypeScript Version: 2.2
 
 import express = require('express');
 
diff --git a/types/easy-xapi-utils/tslint.json b/types/easy-xapi-utils/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/easy-xapi-utils/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easy-xapi/index.d.ts b/types/easy-xapi/index.d.ts
index aa7316288b..5d3cdb2eb1 100644
--- a/types/easy-xapi/index.d.ts
+++ b/types/easy-xapi/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/DeadAlready/easy-xapi
 // Definitions by: Karl Düüna <https://github.com/DeadAlready>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 /// <reference types="easy-jsend" />
 /// <reference types="bunyan" />
diff --git a/types/easy-xapi/tslint.json b/types/easy-xapi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/easy-xapi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/easystarjs/easystarjs-tests.ts b/types/easystarjs/easystarjs-tests.ts
deleted file mode 100644
index 206e5bf2cc..0000000000
--- a/types/easystarjs/easystarjs-tests.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// For node.js compile using: tsc --module commonjs easystarjs-tests.ts
-// then run using: node easystarjs-tests.js
-import EasyStar = require('easystarjs');
-
-var test = new EasyStar.js();
-
-test.setGrid([
-    [0, 0, 0, 1, 0],
-    [0, 0, 0, 1, 0],
-    [0, 0, 1, 1, 0],
-    [0, 0, 0, 0, 0],
-    [0, 0, 0, 1, 0]
-]);
-test.setAcceptableTiles([0]);
-test.setIterationsPerCalculation(1000);
-test.findPath(2, 0, 4, 4, function (path: EasyStar.Position[])
-{
-    if (path == null)
-    {
-        console.log("No path found!");
-        return;
-    }
-    for (var i = 0; i < path.length; i++)
-    {
-        var pos = path[i];
-        console.log("%d, %d", pos.x, pos.y);
-    }
-});
-
-test.calculate();
-
-/*
-Should log:
-
-2, 0
-2, 1
-1, 1
-1, 2
-1, 3
-2, 3
-3, 3
-4, 3
-4, 4
-
-*/
\ No newline at end of file
diff --git a/types/easystarjs/index.d.ts b/types/easystarjs/index.d.ts
deleted file mode 100644
index c4da0c51a7..0000000000
--- a/types/easystarjs/index.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for EasyStar.js 0.1.6
-// Project: http://easystarjs.com/
-// Definitions by: Magnus Gustafsson <https://github.com/borundin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped  
-
-/*
- easystarjs.d.ts may be freely distributed under the MIT license.
- */
-
-export = easystarjs;
-
-declare namespace easystarjs
-{
-    class js
-    {
-        new (): js;
-        setGrid(grid: number[][]): void;
-        setAcceptableTiles(tiles: number[]): void;
-        findPath(startX: number, startY: number, endX: number, endY: number, callback: (path: Position[]) => void): void;
-        calculate(): void;
-        setIterationsPerCalculation(iterations: number): void;
-        avoidAdditionalPoint(x: number, y: number): void;
-        stopAvoidingAdditionalPoint(x: number, y: number): void;
-        stopAvoidingAllAdditionalPoints(): void;
-        enableDiagonals(): void;
-        disableDiagonals(): void;
-        setTileCost(tileType: number, multiplicativeCost: number): void;
-    }
-
-    interface Position
-    {
-        x: number;
-        y: number;
-    }
-}
\ No newline at end of file
diff --git a/types/easystarjs/tsconfig.json b/types/easystarjs/tsconfig.json
deleted file mode 100644
index 0f36761c26..0000000000
--- a/types/easystarjs/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "easystarjs-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index bcae4299d3..0ea8aa0c6a 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -4,77 +4,91 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace echarts {
-    function init(dom:HTMLDivElement|HTMLCanvasElement, theme?:Object|string, opts?:{
+    function init(dom: HTMLDivElement | HTMLCanvasElement, theme?: Object | string, opts?: {
         devicePixelRatio?: number
         renderer?: string
-    }):ECharts;
+    }): ECharts;
 
     const graphic: {
         clipPointsByRect(points: number[][], rect: ERectangle): number[][];
         clipRectByRect(targetRect: ERectangle, rect: ERectangle): ERectangle;
+        LinearGradient: { new  (x: number, y: number, x2: number, y2: number, colorStops: Array<Object>, globalCoord?: boolean): LinearGradient }
+
+    };
+
+
+    function connect(group: string | Array<string>): void;
+
+    function disConnect(group: string): void;
+
+    function dispose(target: ECharts | HTMLDivElement | HTMLCanvasElement): void;
+
+    function getInstanceByDom(target: HTMLDivElement | HTMLCanvasElement): void;
+
+    function registerMap(mapName: string, geoJson: Object, specialAreas?: Object): void;
+
+    function registerTheme(themeName: string, theme: Object): void;
+
+    interface LinearGradient {
+        colorStops: Array<Object>;
+        global: boolean;
+        type: string;
+        x: number
+        x2: number
+        y: number
+        y2: number
     }
-    
-    function connect(group:string|Array<string>):void;
 
-    function disConnect(group:string):void;
-
-    function dispose(target:ECharts|HTMLDivElement|HTMLCanvasElement):void;
-
-    function getInstanceByDom(target:HTMLDivElement|HTMLCanvasElement):void;
-
-    function registerMap(mapName:string, geoJson:Object, specialAreas?:Object):void;
-
-    function registerTheme(themeName:string, theme:Object):void;
 
     interface ECharts {
-        group:string;
+        group: string;
 
-        setOption(option:EChartOption, notMerge?:boolean, notRefreshImmediately?:boolean):void
+        setOption(option: EChartOption, notMerge?: boolean, notRefreshImmediately?: boolean): void
 
-        getWidth():number
+        getWidth(): number
 
-        getHeight():number
+        getHeight(): number
 
-        getDom():HTMLCanvasElement|HTMLDivElement
+        getDom(): HTMLCanvasElement | HTMLDivElement
 
-        getOption():Object
+        getOption(): Object
 
-        resize():void
+        resize(): void
 
-        dispatchAction(payload:Object):void
+        dispatchAction(payload: Object): void
 
-        on(eventName:string, handler:Function, context?:Object):void
+        on(eventName: string, handler: Function, context?: Object): void
 
-        off(eventName:string, handler?:Function):void
+        off(eventName: string, handler?: Function): void
 
-        showLoading(type?:string, opts?:Object):void
+        showLoading(type?: string, opts?: Object): void
 
-        hideLoading():void
+        hideLoading(): void
 
-        getDataURL(opts:{
+        getDataURL(opts: {
             // 导出的格�，�选 png, jpeg
             type?: string,
             // 导出的图片分辨率比例，默认为 1。
             pixelRatio?: number,
             // 导出的图片背景色，默认使用 option 里的 backgroundColor
             backgroundColor?: string
-        }):string
+        }): string
 
-        getConnectedDataURL(opts:{
+        getConnectedDataURL(opts: {
             // 导出的格�，�选 png, jpeg
             type: string,
             // 导出的图片分辨率比例，默认为 1。
             pixelRatio: number,
             // 导出的图片背景色，默认使用 option 里的 backgroundColor
             backgroundColor: string
-        }):string
+        }): string
 
-        clear():void
+        clear(): void
 
-        isDisposed():boolean
+        isDisposed(): boolean
+
+        dispose(): void
 
-        dispose():void
-        
         // 转�逻辑点到�素
         convertToPixel(finder: {
             seriesIndex?: number,
@@ -92,8 +106,8 @@ declare namespace echarts {
             gridIndex?: number,
             gridId?: string
             gridName?: string
-        } | string, value: string|Array<any>): string|Array<any>
-            
+        } | string, value: string | Array<any>): string | Array<any>
+
         convertFromPixel(finder: {
             seriesIndex?: number,
             seriesId?: string,
@@ -110,7 +124,7 @@ declare namespace echarts {
             gridIndex?: number,
             gridId?: string
             gridName?: string
-        } | string, value: Array<any>|string): Array<any>|string
+        } | string, value: Array<any> | string): Array<any> | string
     }
 
     interface ERectangle {
@@ -177,6 +191,6 @@ declare namespace echarts {
     }
 }
 
-declare module "echarts" {
+declare module 'echarts' {
     export = echarts;
 }
diff --git a/types/echarts/tslint.json b/types/echarts/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/echarts/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ed25519/ed25519-tests.ts b/types/ed25519/ed25519-tests.ts
new file mode 100644
index 0000000000..b8bbcb5d31
--- /dev/null
+++ b/types/ed25519/ed25519-tests.ts
@@ -0,0 +1,15 @@
+import * as crypto from 'crypto';
+import * as ed25519 from 'ed25519';
+
+function signAndValidatePlaintext() {
+    const seed: Buffer = crypto.randomBytes(32);
+    const keyPair: ed25519.CurveKeyPair = ed25519.MakeKeypair(seed);
+
+    const plaintext = Buffer.from('plaintext');
+    const signature: Buffer = ed25519.Sign(plaintext, keyPair.privateKey);
+
+    const matches: boolean = ed25519.Verify(plaintext, signature, keyPair.publicKey);
+    if (!matches) {
+        throw new Error("Sign and verify should work for the same plaintext");
+    }
+}
diff --git a/types/ed25519/index.d.ts b/types/ed25519/index.d.ts
new file mode 100644
index 0000000000..bc280afe0c
--- /dev/null
+++ b/types/ed25519/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for ed25519 0.0
+// Project: https://github.com/dazoe/ed25519
+// Definitions by: Erik Mavrinac <https://github.com/erikma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Main site: https://ed25519.cr.yp.to/
+// Manually generated and maintained because the package is a
+// veneer on an underlying C library; auto-generation won't work.
+// The JavaScript-C interface is well described at
+// https://github.com/dazoe/ed25519/blob/master/src/ed25519.cc
+
+/// <reference types="node" />
+
+/** The key material returned from a call to MakeKeypair(). */
+export interface CurveKeyPair {
+    /**
+     * A Buffer containing the public portion of the Curve25519 key.
+     */
+    publicKey: Buffer;
+
+    /**
+     * A Buffer containing the private, secret portion of the Curve25519 key.
+     */
+    privateKey: Buffer;
+}
+
+/**
+ * Uses the crytpographically strong random seed to generate a
+ * Curve25519 key pair.
+ * @return The public and private key pair.
+ */
+export function MakeKeypair(seed: Buffer): CurveKeyPair;
+
+/**
+ * Signs a plaintext message buffer using the private key generated using
+ * MakeKeypair().
+ * @return The signature calculated on the plaintext.
+ */
+export function Sign(message: Buffer, privateKeyOrKeyPair: Buffer | CurveKeyPair): Buffer;
+
+/**
+ * Verifies a signature for a message buffer using a
+ * public key generated using MakeKeypair().
+ * @return True if the signature validates correctly, false otherwise.
+ */
+export function Verify(message: Buffer, signature: Buffer, publicKey: Buffer): boolean;
diff --git a/types/ed25519/tsconfig.json b/types/ed25519/tsconfig.json
new file mode 100644
index 0000000000..98fa33a4b1
--- /dev/null
+++ b/types/ed25519/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ed25519-tests.ts"
+    ]
+}
diff --git a/types/ed25519/tslint.json b/types/ed25519/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/ed25519/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/egg-mock/index.d.ts b/types/egg-mock/index.d.ts
index 9ccf6989dd..7308d52184 100644
--- a/types/egg-mock/index.d.ts
+++ b/types/egg-mock/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/eggjs/egg-mock
 // Definitions by: Eward Song <https://github.com/sheperdwind>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Application, Context } from 'egg';
 
diff --git a/types/egg-mock/package.json b/types/egg-mock/package.json
new file mode 100644
index 0000000000..f56ce22a99
--- /dev/null
+++ b/types/egg-mock/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "egg": "^2.1.0"
+    }
+}
diff --git a/types/egg.js/tslint.json b/types/egg.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/egg.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/egg/egg-tests.ts b/types/egg/egg-tests.ts
deleted file mode 100644
index 8caf5f0ac5..0000000000
--- a/types/egg/egg-tests.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Controller, Service, Application } from 'egg';
-
-// controller
-class FooController extends Controller {
-  async getData() {
-    this.ctx.body = await this.service.foo.bar();
-  }
-}
-
-// add user controller and service
-declare module 'egg' {
-  interface IController { // tslint:disable-line
-    foo: FooController;
-  }
-  interface IService { // tslint:disable-line
-    foo: FooService;
-  }
-}
-
-class FooService extends Service {
-  async bar() {
-    //
-    return this.config.env;
-  }
-}
-
-// router
-
-function router(app: Application) {
-  const controller = app.controller;
-  app.get('/foo', controller.foo.getData);
-  app.post('/', controller.foo.getData);
-}
diff --git a/types/egg/index.d.ts b/types/egg/index.d.ts
deleted file mode 100644
index abf8d5db38..0000000000
--- a/types/egg/index.d.ts
+++ /dev/null
@@ -1,785 +0,0 @@
-// Type definitions for Egg 1.x
-// Project: https://github.com/eggjs/egg
-// Definitions by: Eward Song <https://github.com/sheperdwind>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-import * as accepts from 'accepts';
-import * as KoaApplication from 'koa';
-import * as KoaRouter from 'koa-router';
-import { Readable } from 'stream';
-/**
- * BaseContextClass is a base class that can be extended,
- * it's instantiated in context level,
- * {@link Helper}, {@link Service} is extending it.
- */
-declare class BaseContextClass { // tslint:disable-line
-  /**
-   * request context
-   */
-  ctx: Context;
-
-  /**
-   * Application
-   */
-  app: Application;
-
-  /**
-   * Application config object
-   */
-  config: EggAppConfig;
-
-  /**
-   * service
-   */
-  service: IService;
-
-  constructor(ctx: Context);
-}
-
-export interface Logger {
-  info(info: string, ...args: string[]): void;
-  warn(info: string, ...args: string[]): void;
-  debug(info: string, ...args: string[]): void;
-  error(info: string, ...args: string[]): void;
-}
-
-interface Request extends KoaApplication.Request { // tslint:disable-line
-  /**
-   * detect if response should be json
-   * 1. url path ends with `.json`
-   * 2. response type is set to json
-   * 3. detect by request accept header
-   *
-   * @member {Boolean} Request#acceptJSON
-   * @since 1.0.0
-   */
-  acceptJSON: boolean;
-
-  /**
-   * Request remote IPv4 address
-   * @member {String} Request#ip
-   * @example
-   * ```js
-   * this.request.ip
-   * => '127.0.0.1'
-   * => '111.10.2.1'
-   * ```
-   */
-  ip: string;
-
-  /**
-   * Get all pass through ip addresses from the request.
-   * Enable only on `app.config.proxy = true`
-   *
-   * @member {Array} Request#ips
-   * @example
-   * ```js
-   * this.request.ips
-   * => ['100.23.1.2', '201.10.10.2']
-   * ```
-   */
-  ips: string[];
-
-  protocol: string;
-
-  /**
-   * get params pass by querystring, all value are Array type. {@link Request#query}
-   * @member {Array} Request#queries
-   * @example
-   * ```js
-   * GET http://127.0.0.1:7001?a=b&a=c&o[foo]=bar&b[]=1&b[]=2&e=val
-   * this.queries
-   * =>
-   * {
-   *   "a": ["b", "c"],
-   *   "o[foo]": ["bar"],
-   *   "b[]": ["1", "2"],
-   *   "e": ["val"]
-   * }
-   * ```
-   */
-  queries: { [key: string]: string[] };
-
-  /**
-   * get params pass by querystring, all value are String type.
-   * @member {Object} Request#query
-   * @example
-   * ```js
-   * GET http://127.0.0.1:7001?name=Foo&age=20&age=21
-   * this.query
-   * => { 'name': 'Foo', 'age': 20 }
-   *
-   * GET http://127.0.0.1:7001?a=b&a=c&o[foo]=bar&b[]=1&b[]=2&e=val
-   * this.query
-   * =>
-   * {
-   *   "a": "b",
-   *   "o[foo]": "bar",
-   *   "b[]": "1",
-   *   "e": "val"
-   * }
-   * ```
-   */
-  query: { [key: string]: string };
-}
-
-interface Response extends KoaApplication.Response { // tslint:disable-line
-  /**
-   * read response real status code.
-   *
-   * e.g.: Using 302 status redirect to the global error page
-   * instead of show current 500 status page.
-   * And access log should save 500 not 302,
-   * then the `realStatus` can help us find out the real status code.
-   * @member {Number} Context#realStatus
-   */
-  realStatus: number;
-}
-
-interface ContextView { // tslint:disable-line
-  /**
-   * Render a file by view engine
-   * @param {String} name - the file path based on root
-   * @param {Object} [locals] - data used by template
-   * @param {Object} [options] - view options, you can use `options.viewEngine` to specify view engine
-   * @return {Promise<String>} result - return a promise with a render result
-   */
-  render(name: string, locals: any, options?: any): Promise<string>;
-
-  /**
-   * Render a template string by view engine
-   * @param {String} tpl - template string
-   * @param {Object} [locals] - data used by template
-   * @param {Object} [options] - view options, you can use `options.viewEngine` to specify view engine
-   * @return {Promise<String>} result - return a promise with a render result
-   */
-  renderString(name: string, locals: any, options?: any): Promise<string>;
-}
-
-export type LoggerLevel = 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'NONE';
-
-export interface EggAppConfig {
-  workerStartTimeout: number;
-  baseDir: string;
-  /**
-   * The option of `bodyParser` middleware
-   *
-   * @member Config#bodyParser
-   * @property {Boolean} enable - enable bodyParser or not, default to true
-   * @property {String | RegExp | Function | Array} ignore - won't parse request body when url path hit ignore pattern, can not set `ignore` when `match` presented
-   * @property {String | RegExp | Function | Array} match - will parse request body only when url path hit match pattern
-   * @property {String} encoding - body encoding config, default utf8
-   * @property {String} formLimit - form body size limit, default 100kb
-   * @property {String} jsonLimit - json body size limit, default 100kb
-   * @property {Boolean} strict - json body strict mode, if set strict value true, then only receive object and array json body
-   * @property {Number} queryString.arrayLimit - from item array length limit, default 100
-   * @property {Number} queryString.depth - json value deep lenght, default 5
-   * @property {Number} queryString.parameterLimit - paramter number limit ,default 1000
-   */
-  bodyParser: {
-    enable: boolean;
-    encoding: string;
-    formLimit: string;
-    jsonLimit: string;
-    strict: true;
-    queryString: {
-      arrayLimit: number;
-      depth: number;
-      parameterLimit: number;
-    };
-  };
-
-  /**
-   * logger options
-   * @member Config#logger
-   * @property {String} dir - directory of log files
-   * @property {String} encoding - log file encloding, defaults to utf8
-   * @property {String} level - default log level, could be: DEBUG, INFO, WARN, ERROR or NONE, defaults to INFO in production
-   * @property {String} consoleLevel - log level of stdout, defaults to INFO in local serverEnv, defaults to WARN in unittest, defaults to NONE elsewise
-   * @property {Boolean} outputJSON - log as JSON or not, defaults to false
-   * @property {Boolean} buffer - if enabled, flush logs to disk at a certain frequency to improve performance, defaults to true
-   * @property {String} errorLogName - file name of errorLogger
-   * @property {String} coreLogName - file name of coreLogger
-   * @property {String} agentLogName - file name of agent worker log
-   * @property {Object} coreLogger - custom config of coreLogger
-   */
-  logger: {
-    dir: string;
-    encoding: string;
-    env: string;
-    level: LoggerLevel;
-    consoleLevel: LoggerLevel;
-    outputJSON: boolean;
-    buffer: boolean;
-    appLogName: string;
-    coreLogName: string;
-    agentLogName: string;
-    errorLogName: string;
-    coreLogger: any;
-  };
-
-  httpclient: {
-    keepAlive: boolean;
-    freeSocketKeepAliveTimeout: number;
-    timeout: number;
-    maxSockets: number;
-    maxFreeSockets: number;
-    enableDNSCache: boolean;
-  };
-
-  development: {
-    /**
-     * dirs needed watch, when files under these change, application will reload, use relative path
-     */
-    watchDirs: string[];
-    /**
-     * dirs don't need watch, including subdirectories, use relative path
-     */
-    ignoreDirs: string[];
-    /**
-     * don't wait all plugins ready, default is true.
-     */
-    fastReady: boolean;
-  };
-  /**
-   * It will ignore special keys when dumpConfig
-   */
-  dump: {
-    ignore: Set<string>;
-  };
-
-  /**
-   * The environment of egg
-   */
-  env: string;
-
-  /**
-   * The current HOME directory
-   */
-  HOME: string;
-
-  hostHeaders: string;
-
-  /**
-   * I18n options
-   */
-  i18n: {
-    /**
-     * default value EN_US
-     */
-    defaultLocale: string;
-    /**
-     * i18n resource file dir, not recommend to change default value
-     */
-    dir: string;
-    /**
-     * custom the locale value field, default `query.locale`, you can modify this config, such as `query.lang`
-     */
-    queryField: string;
-    /**
-     * The locale value key in the cookie, default is locale.
-     */
-    cookieField: string;
-    /**
-     * Locale cookie expire time, default `1y`, If pass number value, the unit will be ms
-     */
-    cookieMaxAge: string | number;
-  };
-
-  /**
-   * Detect request' ip from specified headers, not case-sensitive. Only worked when config.proxy set to true.
-   */
-  ipHeaders: string;
-
-  /**
-   * jsonp options
-   * @member Config#jsonp
-   * @property {String} callback - jsonp callback method key, default to `_callback`
-   * @property {Number} limit - callback method name's max length, default to `50`
-   * @property {Boolean} csrf - enable csrf check or not. default to false
-   * @property {String|RegExp|Array} whiteList - referrer white list
-   */
-  jsonp: {
-    limit: number;
-    callback: string;
-    csrf: boolean;
-    whiteList: string | RegExp | Array<string | RegExp>;
-  };
-
-  /**
-   * The key that signing cookies. It can contain multiple keys seperated by .
-   */
-  keys: string;
-
-  /**
-   * The name of the application
-   */
-  name: string;
-
-  /**
-   * package.json
-   */
-  pkg: any;
-
-  rundir: string;
-
-  security: {
-    domainWhiteList: string[];
-    protocolWhiteList: string[];
-    defaultMiddleware: string;
-    csrf: any;
-    xframe: {
-      enable: boolean;
-      value: 'SAMEORIGIN' | 'DENY' | 'ALLOW-FROM';
-    };
-    hsts: any;
-    methodnoallow: { enable: boolean };
-    noopen: { enable: boolean; }
-    xssProtection: any;
-    csp: any;
-  };
-
-  siteFile: any;
-
-  static: any;
-
-  view: any;
-
-  watcher: any;
-}
-
-export interface Router extends KoaRouter {
-  /**
-   * restful router api
-   */
-  resources(name: string, prefix: string, middleware: any): Router;
-
-  /**
-   * @param {String} name - Router name
-   * @param {Object} params - more parameters
-   * @example
-   * ```js
-   * router.url('edit_post', { id: 1, name: 'foo', page: 2 })
-   * => /posts/1/edit?name=foo&page=2
-   * router.url('posts', { name: 'foo&1', page: 2 })
-   * => /posts?name=foo%261&page=2
-   * ```
-   * @return {String} url by path name and query params.
-   * @since 1.0.0
-   */
-  url(name: string, params: any): any;
-}
-
-declare interface EggApplication extends KoaApplication { // tslint:disable-line
-  /**
-   * The current directory of application
-   */
-  baseDir: string;
-
-  /**
-   * The configuration of application
-   */
-  config: EggAppConfig;
-
-  /**
-   * app.env delegate app.config.env
-   */
-  env: string;
-
-  /**
-   * core logger for framework and plugins, log file is $HOME/logs/{appname}/egg-web
-   */
-  coreLogger: Logger;
-
-  /**
-   * Alias to https://npmjs.com/package/depd
-   */
-  deprecate: any;
-
-  /**
-   * HttpClient instance
-   */
-  httpclient: any;
-
-  /**
-   * The loader instance, the default class is EggLoader. If you want define
-   */
-  loader: any;
-
-  /**
-   * Logger for Application, wrapping app.coreLogger with context infomation
-   *
-   * @member {ContextLogger} Context#logger
-   * @since 1.0.0
-   * @example
-   * ```js
-   * this.logger.info('some request data: %j', this.request.body);
-   * this.logger.warn('WARNING!!!!');
-   * ```
-   */
-  logger: Logger;
-
-  /**
-   * All loggers contain logger, coreLogger and customLogger
-   */
-  loggers: { [loggerName: string]: Logger };
-
-  /**
-   * messenger instance
-   */
-  messenger: any;
-
-  plugins: any;
-
-  /**
-   * get router
-   */
-  router: Router;
-
-  Service: Service;
-
-  /**
-   * Whether `application` or `agent`
-   */
-  type: string;
-
-  /**
-   * create a singleton instance
-   */
-  addSingleton(name: string, create: any): void;
-
-  /**
-   * Excute scope after loaded and before app start
-   */
-  beforeStart(scrope: () => void): void;
-
-  /**
-   * Close all, it wil close
-   * - callbacks registered by beforeClose
-   * - emit `close` event
-   * - remove add listeners
-   *
-   * If error is thrown when it's closing, the promise will reject.
-   * It will also reject after following call.
-   * @return {Promise} promise
-   * @since 1.0.0
-   */
-  close(): Promise<any>;
-
-  /**
-   * http request helper base on httpclient, it will auto save httpclient log.
-   * Keep the same api with httpclient.request(url, args).
-   * See https://github.com/node-modules/urllib#api-doc for more details.
-   */
-  curl(url: string, opt: any): Promise<any>;
-
-  /**
-   * Get logger by name, it's equal to app.loggers['name'], but you can extend it with your own logical
-   */
-  getLogger(name: string): Logger;
-
-  /**
-   * print the infomation when console.log(app)
-   */
-  inspect(): any;
-
-  /**
-   * Alias to Router#url
-   */
-  url(name: string, params: any): any;
-}
-
-export interface Application extends EggApplication {
-  /**
-   * global locals for view
-   * @see Context#locals
-   */
-  locals: any;
-
-  /**
-   * HTTP get method
-   */
-  get(path: string, fn: string): void;
-  get(path: string, ...middleware: any[]): void;
-
-  /**
-   * HTTP post method
-   */
-  post(path: string, fn: string): void;
-  post(path: string, ...middleware: any[]): void;
-
-  /**
-   * HTTP put method
-   */
-  put(path: string, fn: string): void;
-  put(path: string, ...middleware: any[]): void;
-
-  /**
-   * HTTP delete method
-   */
-  delete(path: string, fn: string): void;
-  delete(path: string, ...middleware: any[]): void;
-
-  /**
-   * restful router api
-   */
-  resources(name: string, prefix: string, fn: string): Router;
-
-  redirect(path: string, redirectPath: string): void;
-
-  controller: IController;
-
-  Controller: Controller;
-}
-
-interface FileStream extends Readable { // tslint:disable-line
-  fields: any;
-}
-
-export interface Context extends KoaApplication.Context {
-  app: Application;
-
-  service: IService;
-
-  request: Request;
-
-  response: Response;
-
-  /**
-   * Resource Parameters
-   * @example
-   * ##### ctx.params.id {string}
-   *
-   * `GET /api/users/1` => `'1'`
-   *
-   * ##### ctx.params.ids {Array<String>}
-   *
-   * `GET /api/users/1,2,3` => `['1', '2', '3']`
-   *
-   * ##### ctx.params.fields {Array<String>}
-   *
-   * Expect request return data fields, for example
-   * `GET /api/users/1?fields=name,title` => `['name', 'title']`.
-   *
-   * ##### ctx.params.data {Object}
-   *
-   * Tht request data object
-   *
-   * ##### ctx.params.page {Number}
-   *
-   * Page number, `GET /api/users?page=10` => `10`
-   *
-   * ##### ctx.params.per_page {Number}
-   *
-   * The number of every page, `GET /api/users?per_page=20` => `20`
-   */
-  params: any;
-
-  /**
-   * @see Request#accept
-   */
-  queries: { [key: string]: string[] };
-
-  /**
-   * @see Request#accept
-   */
-  accept: accepts.Accepts;
-
-  /**
-   * @see Request#acceptJSON
-   */
-  acceptJSON: boolean;
-
-  /**
-   * @see Request#ip
-   */
-  ip: string;
-
-  /**
-   * @see Response#realStatus
-   */
-  realStatus: number;
-
-  /**
-   * 设置返回资�对象
-   * set the ctx.body.data value
-   *
-   * @member {Object} Context#data=
-   * @example
-   * ```js
-   * ctx.data = {
-   *   id: 1,
-   *   name: 'fengmk2'
-   * };
-   * ```
-   *
-   * will get responce
-   *
-   * ```js
-   * HTTP/1.1 200 OK
-   *
-   * {
-   *   "data": {
-   *     "id": 1,
-   *     "name": "fengmk2"
-   *   }
-   * }
-   * ```
-   */
-  data: any;
-
-  /**
-   * set ctx.body.meta value
-   *
-   * @example
-   * ```js
-   * ctx.meta = {
-   *   count: 100
-   * };
-   * ```
-   * will get responce
-   *
-   * ```js
-   * HTTP/1.1 200 OK
-   *
-   * {
-   *   "meta": {
-   *     "count": 100
-   *   }
-   * }
-   * ```
-   */
-  meta: any;
-
-  /**
-   * locals is an object for view, you can use `app.locals` and `ctx.locals` to set variables,
-   * which will be used as data when view is rendering.
-   * The difference between `app.locals` and `ctx.locals` is the context level, `app.locals` is global level, and `ctx.locals` is request level. when you get `ctx.locals`, it will merge `app.locals`.
-   *
-   * when you set locals, only object is available
-   *
-   * ```js
-   * this.locals = {
-   *   a: 1
-   * };
-   * this.locals = {
-   *   b: 1
-   * };
-   * this.locals.c = 1;
-   * console.log(this.locals);
-   * {
-   *   a: 1,
-   *   b: 1,
-   *   c: 1,
-   * };
-   * ```
-   *
-   * `ctx.locals` has cache, it only merges `app.locals` once in one request.
-   *
-   * @member {Object} Context#locals
-   */
-  locals: any;
-
-  /**
-   * alias to {@link locals}, compatible with koa that use this variable
-   */
-  state: any;
-
-  /**
-   * Logger for Application, wrapping app.coreLogger with context infomation
-   *
-   * @member {ContextLogger} Context#logger
-   * @since 1.0.0
-   * @example
-   * ```js
-   * this.logger.info('some request data: %j', this.request.body);
-   * this.logger.warn('WARNING!!!!');
-   * ```
-   */
-  logger: Logger;
-
-  /**
-   * Request start time
-   */
-  starttime: number;
-
-  /**
-   * View instance that is created every request
-   */
-  view: ContextView;
-
-  /**
-   * http request helper base on httpclient, it will auto save httpclient log.
-   * Keep the same api with httpclient.request(url, args).
-   * See https://github.com/node-modules/urllib#api-doc for more details.
-   */
-  curl(url: string, opt: any): Promise<any>;
-
-  /**
-   * Render a file by view engine
-   * @param {String} name - the file path based on root
-   * @param {Object} [locals] - data used by template
-   * @param {Object} [options] - view options, you can use `options.viewEngine` to specify view engine
-   * @return {Promise<String>} result - return a promise with a render result
-   */
-  render(name: string, locals: any, options?: any): Promise<string>;
-
-  /**
-   * Render a template string by view engine
-   * @param {String} tpl - template string
-   * @param {Object} [locals] - data used by template
-   * @param {Object} [options] - view options, you can use `options.viewEngine` to specify view engine
-   * @return {Promise<String>} result - return a promise with a render result
-   */
-  renderString(name: string, locals: any, options?: any): Promise<string>;
-
-  __(key: string, ...values: string[]): string;
-  gettext(key: string, ...values: string[]): string;
-
-  /**
-   * get upload file stream
-   * @example
-   * ```js
-   * const stream = yield this.getFileStream();
-   * // get other fields
-   * console.log(stream.fields);
-   * ```
-   * @method Context#getFileStream
-   * @return {ReadStream} stream
-   * @since 1.0.0
-   */
-  getFileStream(): Promise<FileStream>;
-
-  /**
-   * @see Responce.redirect
-   */
-  redirect(url: string, alt?: string): void;
-}
-
-export class Controller extends BaseContextClass { }
-
-export class Service extends BaseContextClass { }
-
-/**
- * The empty interface `IService` is an placehoder, for egg
- * to auto injection service to ctx.service
- *
- * @example
- *
- * import { Service } from 'egg';
- * class FooService extends Service {
- *   async bar() {}
- * }
- *
- * declare module 'egg' {
- *   export interface IService {
- *     foo: FooService;
- *   }
- * }
- *
- * Now I can get ctx.service.foo at controller and other service file.
- */
-export interface IService { }// tslint:disable-line
-
-export interface IController { } // tslint:disable-line
diff --git a/types/egg/tsconfig.json b/types/egg/tsconfig.json
deleted file mode 100644
index 3c2ca61db1..0000000000
--- a/types/egg/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es2017",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "egg-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ej.web.all/ej.web.all-tests.ts b/types/ej.web.all/ej.web.all-tests.ts
index d1d67be14c..678754d5d4 100644
--- a/types/ej.web.all/ej.web.all-tests.ts
+++ b/types/ej.web.all/ej.web.all-tests.ts
@@ -1,4 +1,9 @@
-/* tslint:disable */
+interface Window {
+    kanbanData: any;
+    themeVarient: string;
+    themeStyle: string;
+    themeColor: string;
+}
 
 module AccordionComponent {
     $(function () {
@@ -20,8 +25,6 @@ module AccordionComponent {
     });
 }
 
- 
-
 module AutocompleteComponent{
     var carList = [
                 "Audi S6", "Austin-Healey", "Alfa Romeo", "Aston Martin",
@@ -44,22 +47,18 @@ module AutocompleteComponent{
                 "Triumph Spitfire", "Toyota 2000GT",
                 "Volvo P1800", "Volkswagen Shirako"
             ];
-    $(function () {        
-        var autocompleteInstance =new ej.Autocomplete($("#selectCar"), {        
+    $(function () {
+        var autocompleteInstance =new ej.Autocomplete($("#selectCar"), {
             width: "100%",
             watermarkText: "Select a car",
             dataSource: carList,
             enableAutoFill: true,
             showPopupButton: true,
             multiSelectMode: "delimiter"
-        });  
+        });
     });
 }
 
-
-
-
-
 module Barcodecomponent {
     $(function () {
         var barcodesample = new ej.datavisualization.Barcode($("#Barcode"), {
@@ -68,14 +67,40 @@ module Barcodecomponent {
     });
 }
 
-
-
-
-
 module Bulletgraphcomponent {
     $(function () {
         var bulletsample = new ej.datavisualization.BulletGraph($("#BulletGraph"), {
             isResponsive: true,
+            load: function () {
+                var sender = $("#BulletGraph").data("ejBulletGraph");
+                var theme: string;
+                var bulletTheme = window.themeStyle + window.themeColor + window.themeVarient;
+                if (bulletTheme) {
+                    switch (bulletTheme) {
+                        case "flatdark":
+                        case "flatazuredark":
+                        case "flatlimedark":
+                        case "flatsaffrondark":
+                        case "gradientdark":
+                        case "gradientazuredark":
+                        case "gradientlimedark":
+                        case "gradientsaffrondark":
+                        case "flathigh-contrast-01dark":
+                        case "flathigh-contrast-02dark":
+                            theme = "flatdark";
+                            break;
+                        case "flatoffice-365light":
+                        case "flatmateriallight":
+                            theme = "material";
+                            break;
+                        default:
+                            theme = "flatlight";
+                            break;
+                    }
+                    sender.model.theme = theme;
+                }
+
+            },
             tooltipSettings: { visible: true },
             quantitativeScaleSettings: {
                 featureMeasures: [{
@@ -102,10 +127,6 @@ module Bulletgraphcomponent {
     });
 }
 
-
-
-
-
 module ButtonComponent {
     $(function () {
         var basicButton = new ej.Button($("#buttonnormal"), {
@@ -151,10 +172,8 @@ module ButtonComponent {
     });
 }
 
-
-
-
 module ChartComponent {
+    var theme = "???";
     $(function () {
         var chartsample = new ej.datavisualization.Chart($("#Chart"), {
             primaryXAxis: {
@@ -166,7 +185,7 @@ module ChartComponent {
                 range: { min: 25, max: 50, interval: 5 },
                 labelFormat: "{value}%",
                 title: { text: "Efficiency" },
-                
+
             },
             commonSeriesOptions:
 			{
@@ -181,28 +200,28 @@ module ChartComponent {
                     },
                     visible: true
                 },
-                 border : {width: 2}                             
-            },	
-            series: 
+                 border : {width: 2}
+            },
+            series:
 			[
 			    {
-                points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 },{ x: 2007, y: 26 }, { x: 2008, y: 27 }, 
-						 { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],						 
+                points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 },{ x: 2007, y: 26 }, { x: 2008, y: 27 },
+						 { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],
                 name: 'India'
-                },						
+                },
                 {
-                points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 },{ x: 2007, y: 30 }, { x: 2008, y: 36 }, 
-						 { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],						 
+                points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 },{ x: 2007, y: 30 }, { x: 2008, y: 36 },
+						 { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],
                 name: 'Germany'
                 },
 				{
-                points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 },{ x: 2007, y: 34 }, { x: 2008, y: 41 }, 
-						 { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],						 
+                points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 },{ x: 2007, y: 34 }, { x: 2008, y: 41 },
+						 { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],
                 name: 'England'
-                },					
+                },
                 {
-                points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 },{ x: 2007, y: 40 }, { x: 2008, y: 44 }, 
-						 { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],						 
+                points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 },{ x: 2007, y: 40 }, { x: 2008, y: 44 },
+						 { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],
                 name: 'France'
 				}
             ],
@@ -232,6 +251,44 @@ module ChartComponent {
                     model.primaryYAxis.labelIntersectAction = "rotate45";
                     model.primaryYAxis.edgeLabelPlacement = "hide";
                 }
+                if (theme) {
+                    switch (theme) {
+                        case "flatdark":
+                        case "flatazuredark":
+                        case "flatlimedark":
+                        case "flatsaffrondark":
+                            theme = "flatdark";
+                            break;
+                        case "gradientlight":
+                        case "gradientazurelight":
+                        case "gradientlimelight":
+                        case "gradientsaffronlight":
+                            theme = "gradientlight";
+                            break;
+                        case "gradientdark":
+                        case "gradientazuredark":
+                        case "gradientlimedark":
+                        case "gradientsaffrondark":
+                            theme = "gradientdark";
+                            break;
+                        case "flatbootstraplight":
+                            theme = "bootstrap";
+                            break;
+                        case "flathigh-contrast-01dark":
+                        case "flathigh-contrast-02dark":
+                            theme = "high-contrast-01";
+                            break;
+                        case "flatmateriallight":
+                        case "flatoffice-365light":
+                            theme = "material";
+                            break;
+
+                        default:
+                            theme = "flatlight";
+                            break;
+                    }
+                    sender.model.theme = theme;
+                }
             },
             title: { text: 'Efficiency of oil-fired power production' },
             size: { height: "600" },
@@ -240,10 +297,6 @@ module ChartComponent {
     });
 }
 
-
-
-
-
 module circulargaugecomponent {
     $(function () {
         var circularsample = new ej.datavisualization.CircularGauge($("#CircularGauge"), {
@@ -290,14 +343,11 @@ module circulargaugecomponent {
                         backgroundColor: "#f5b43f",
                         border: { color: "#f5b43f" }
                     }]
-            }]	
+            }]
         });
     });
 }
 
-
-
-
 module ColorPickerComponent {
     $(function () {
         var colorSample = new ej.ColorPicker($("#colorpick"), {
@@ -306,9 +356,6 @@ module ColorPickerComponent {
     });
 }
 
-
-
-
 module DatePickerComponent {
     $(function () {
         var dateSample = new ej.DatePicker($("#datepick"), {
@@ -317,9 +364,6 @@ module DatePickerComponent {
     });
 }
 
-
-
-
 module DateTimePickerComponent {
     $(function () {
         var datetimeSample = new ej.DateRangePicker($("#daterangepick"), {
@@ -328,8 +372,6 @@ module DateTimePickerComponent {
     });
 }
 
-
-
 module DateTimePickerComponent {
     $(function () {
         var datetimeSample = new ej.DateTimePicker($("#datetimepick"), {
@@ -338,8 +380,6 @@ module DateTimePickerComponent {
     });
 }
 
-
-
 $(function () {
     var diagram = new ej.datavisualization.Diagram($("#diagram"), {
         width: "1000px",
@@ -387,7 +427,7 @@ $(function () {
             createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
         ]
     });
-    
+
 });
 
 function createNode(option: ej.datavisualization.Diagram.Node) {
@@ -412,8 +452,6 @@ function createLabel(options : any) {
     return options;
 }
 
- 
-
 module DialogComponent {
     $(function () {
         var dialogInstance = new ej.Dialog($("#basicDialog"), {
@@ -436,9 +474,6 @@ module DialogComponent {
     });
 }
 
-
-
-
 module digitalgaugecomponent {
     $(function () {
         var digitalgaugesample = new ej.datavisualization.DigitalGauge($("#DigitalGauge"), {
@@ -462,10 +497,6 @@ module digitalgaugecomponent {
 }
 
 
-		
-
-
-
 module DropDownListComponent {
     var BikeList = [
         { empid: "bk1", text: "Apache RTR" }, { empid: "bk2", text: "CBR 150-R" }, { empid: "bk3", text: "CBZ Xtreme" },
@@ -482,12 +513,12 @@ module DropDownListComponent {
             enableFilterSearch: true,
             caseSensitiveSearch: true,
             enableIncrementalSearch: true,
-            enablePopupResize: true, 
+            enablePopupResize: true,
             delimiterChar: ";",
             multiSelectMode: ej.MultiSelectMode.Delimiter,
             maxPopupHeight: "300px",
-            minPopupHeight: "150px", 
-            maxPopupWidth: "500px", 
+            minPopupHeight: "150px",
+            maxPopupWidth: "500px",
             minPopupWidth: "350px",
             showCheckbox: true,
             showRoundedCorner: true
@@ -497,10 +528,6 @@ module DropDownListComponent {
 }
 
 
-
-
-
-
 module ExplorerComponent {
     $(function () {
         var file = new ej.FileExplorer($("#fileExplorer"), {
@@ -514,16 +541,13 @@ module ExplorerComponent {
     });
 }
 
-
-
-
 module GanttComponent {
      $(function () {
          var ganttInstance = new ej.Gantt($("#GanttContainer"), {
         dataSource: (<any>window).projectData,
         allowColumnResize: true,
         allowSorting: true,
-        allowSelection: true,       
+        allowSelection: true,
         enableContextMenu: true,
         taskIdMapping: "taskID",
         allowDragAndDrop: true,
@@ -564,11 +588,9 @@ module GanttComponent {
         treeColumnIndex: 1,
         isResponsive: true,
     });
-}); 
+});
 }
 
-
-
 module GridComponent {
     $(function () {
         var gridInstance = new ej.Grid($("#Grid"), {
@@ -604,9 +626,7 @@ module GridComponent {
     });
 }
 
-
-
-var columns = ["Vegie-spread", "Tofuaa", "Alice Mutton", "Konbu", "Fløtemysost"]
+var columns = ["Vegie-spread", "Tofuaa", "Alice Mutton", "Konbu", "Fl�temysost"]
 var itemSource: any[] = [];
 for (var i = 0; i < columns.length; i++) {
     for (var j = 0; j < 6; j++) {
@@ -651,13 +671,6 @@ $(function () {
     });
 });
 
-
-
-
-declare var window:myWindow;
-export interface myWindow extends Window{
-kanbanData:any;
-}
 module KanbanComponent {
     $(function () {
         var sample = new ej.Kanban($("#Kanban"), {
@@ -680,9 +693,6 @@ module KanbanComponent {
     });
 }
 
- 
-
-
 module lineargaugecomponent {
     $(function () {
         var linearsample = new ej.datavisualization.LinearGauge($("#LinearGauge"), {
@@ -706,15 +716,11 @@ module lineargaugecomponent {
                         backgroundColor: "#E94649",
                         border: { color: "#E94649" }, startWidth: 4, endWidth: 4
                     }]
-            }]		
+            }]
         });
     });
 }
 
-	
-
- 
-
 module ListBoxComponent {
     $(function () {
         var listboxInstance = new ej.ListBox($("#selectcar"), {
@@ -723,18 +729,15 @@ module ListBoxComponent {
     });
 }
 
- 
-
 module ListviewComponent {
     $(function () {
         var listviewInstance = new ej.ListView($("#defaultlistview"), {
-            enableCheckMark: true, 
+            enableCheckMark: true,
 		    width: 400
         });
     });
 }
 
-
 var world_map=
     {
         "type": "FeatureCollection",
@@ -770,7 +773,7 @@ var world_map=
             { "type": "Feature", "properties": { "admin": "Switzerland", "name": "Switzerland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.594226108446346, 47.525058091820256], [9.632931756232974, 47.347601223329974], [9.479969516649019, 47.102809963563367], [9.932448357796657, 46.920728054382948], [10.442701450246627, 46.893546250997424], [10.36337812667861, 46.483571275409851], [9.922836541390378, 46.314899400409182], [9.182881707403054, 46.440214748716976], [8.966305779667804, 46.036931871111186], [8.489952426801322, 46.005150865251672], [8.316629672894377, 46.163642483090847], [7.755992058959832, 45.824490057959302], [7.273850945676655, 45.776947740250769], [6.843592970414504, 45.991146552100595], [6.500099724970424, 46.429672756529428], [6.022609490593537, 46.272989813820466], [6.037388950229, 46.725778713561859], [6.768713820023605, 47.287708238303686], [6.736571079138058, 47.541801255882838], [7.192202182655505, 47.449765529971003], [7.466759067422228, 47.620581976911794], [8.31730146651415, 47.613579820336255], [8.522611932009765, 47.830827541691285], [9.594226108446346, 47.525058091820256]]] } },
             { "type": "Feature", "properties": { "admin": "Chile", "name": "Chile", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-68.634010227583147, -52.636370458874353], [-68.633349999999879, -54.8695], [-67.56244, -54.87001], [-66.95992, -54.89681], [-67.291029999999878, -55.30124], [-68.148629999999841, -55.61183], [-68.639990810811796, -55.580017999086877], [-69.2321, -55.49906], [-69.95809, -55.19843], [-71.00568, -55.05383], [-72.2639, -54.49514], [-73.2852, -53.957519999999874], [-74.66253, -52.83749], [-73.8381, -53.04743], [-72.43418, -53.7154], [-71.10773, -54.07433], [-70.591779999999787, -53.61583], [-70.26748, -52.93123], [-69.345649999999878, -52.5183], [-68.634010227583147, -52.636370458874353]]], [[[-68.219913092711224, -21.49434661223183], [-67.828179897722634, -22.872918796482178], [-67.106673550063604, -22.735924574476392], [-66.985233934177629, -22.986348565362825], [-67.328442959244128, -24.025303236590908], [-68.417652960876111, -24.518554782816874], [-68.386001146097342, -26.185016371365229], [-68.594799770772667, -26.50690886811126], [-68.295541551370391, -26.899339694935787], [-69.001234910748266, -27.521213881136127], [-69.656130337183143, -28.459141127233686], [-70.013550381129861, -29.367922865518544], [-69.919008348251921, -30.336339206668306], [-70.535068935819439, -31.365010267870279], [-70.074399380153622, -33.09120981214803], [-69.814776984319209, -33.273886000299839], [-69.817309129501453, -34.193571465798279], [-70.388049485949082, -35.169687595359441], [-70.364769253201658, -36.005088799789931], [-71.121880662709771, -36.65812387466233], [-71.118625047475419, -37.576827487947192], [-70.814664272734703, -38.552995293940732], [-71.413516608349042, -38.916022230791107], [-71.680761277946445, -39.808164157878061], [-71.915734015577542, -40.832339369470716], [-71.746803758415453, -42.051386407235988], [-72.148898078078517, -42.254888197601375], [-71.915423956983901, -43.408564548517404], [-71.464056159130493, -43.787611179378324], [-71.793622606071935, -44.207172133156099], [-71.329800788036195, -44.407521661151677], [-71.222778896759721, -44.784242852559409], [-71.659315558545316, -44.973688653341434], [-71.552009446891233, -45.560732924177117], [-71.917258470330196, -46.884838148791786], [-72.44735531278026, -47.738532810253517], [-72.331160854771937, -48.244238376661819], [-72.648247443314929, -48.878618259476774], [-73.415435757120022, -49.318436374712952], [-73.328050910114456, -50.378785088909865], [-72.975746832964617, -50.741450290734299], [-72.309973517532342, -50.677009779666342], [-72.329403856074023, -51.425956312872394], [-71.914803839796321, -52.009022305865912], [-69.498362189396076, -52.142760912637236], [-68.571545376241332, -52.299443855346247], [-69.461284349226617, -52.291950772663924], [-69.94277950710611, -52.537930590373243], [-70.8451016913545, -52.899200528525711], [-71.006332160105217, -53.833252042201345], [-71.429794684520928, -53.856454760300373], [-72.557942877884855, -53.531410001184447], [-73.702756720662862, -52.835069268607249], [-73.702756720662862, -52.835070076051487], [-74.946763475225154, -52.262753588419017], [-75.260026007778507, -51.62935475037321], [-74.976632453089806, -51.043395684615675], [-75.47975419788348, -50.378371677451547], [-75.608015102831942, -48.673772881871784], [-75.182769741502128, -47.711919447623153], [-74.126580980104677, -46.939253431995084], [-75.644395311165439, -46.647643324572016], [-74.69215369332305, -45.76397633238097], [-74.351709357384252, -44.10304412208788], [-73.240356004515192, -44.454960625995611], [-72.717803921179765, -42.383355808278985], [-73.388899909138232, -42.117532240569567], [-73.701335618774834, -43.365776462579738], [-74.33194312203257, -43.224958184584395], [-74.017957119427152, -41.794812920906828], [-73.677099372029943, -39.942212823243111], [-73.217592536090663, -39.258688653318508], [-73.505559455037044, -38.282882582351064], [-73.588060879191076, -37.156284681956016], [-73.166717088499283, -37.123780206044351], [-72.553136969681717, -35.508840020491022], [-71.861732143832555, -33.909092706031522], [-71.438450486929895, -32.418899428030819], [-71.668720669222424, -30.920644626592516], [-71.370082567007714, -30.095682061484997], [-71.48989437527645, -28.861442152625909], [-70.905123867461569, -27.640379734001193], [-70.724953986275963, -25.705924167587209], [-70.403965827095035, -23.628996677344542], [-70.091245897080668, -21.393319187101223], [-70.164419725205974, -19.756468194256183], [-70.372572394477714, -18.347975355708879], [-69.858443569605797, -18.092693780187027], [-69.590423753523979, -17.580011895419286], [-69.100246955019401, -18.260125420812653], [-68.966818406841824, -18.981683444904089], [-68.442225104430918, -19.405068454671419], [-68.757167121033703, -20.37265797290447], [-68.219913092711224, -21.49434661223183]]]] } },
             { "type": "Feature", "properties": { "admin": "China", "name": "China", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[110.339187860151526, 18.678395087147603], [109.475209588663702, 18.19770091396861], [108.655207961056135, 18.507681993071397], [108.626217482540426, 19.367887885001974], [109.119055617308007, 19.821038519769385], [110.211598748822837, 20.101253973872073], [110.786550734502228, 20.077534491450077], [111.01005130416462, 19.695929877190732], [110.570646600386794, 19.255879218009305], [110.339187860151526, 18.678395087147603]]], [[[127.657407261262378, 49.760270494172929], [129.397817824420429, 49.440600084015429], [130.58229332898236, 48.729687404976112], [130.987281528853828, 47.790132351261391], [132.506671991099495, 47.788969631534876], [133.373595819228001, 48.183441677434914], [135.026311476786702, 48.478229885443902], [134.500813836810607, 47.578439846377833], [134.112362095272601, 47.212467352886719], [133.76964399631288, 46.116926988299056], [133.097126906466428, 45.14406647397216], [131.883454217659562, 45.32116160743643], [131.025212030156069, 44.967953192721573], [131.288555129115537, 44.111519680348252], [131.144687941614848, 42.929989732426932], [130.633866408409801, 42.903014634770543], [130.640015903852429, 42.39500946712527], [129.994267205933227, 42.985386867843793], [129.596668735879462, 42.424981797854592], [128.05221520397231, 41.994284572917984], [128.208433058790717, 41.466771552082534], [127.343782993683021, 41.503151760415953], [126.869083286649854, 41.816569322266155], [126.18204511932943, 41.107336127276362], [125.079941847840587, 40.569823716792449], [124.265624627785314, 39.928493353834135], [122.86757042856101, 39.637787583976255], [122.131387974130917, 39.170451768544623], [121.054554478032856, 38.89747101496291], [121.585994907722466, 39.360853583324136], [121.376757033372641, 39.750261338859524], [122.168595005381007, 40.422442531896046], [121.640358514493528, 40.946389878903304], [120.768628778161954, 40.593388169917596], [119.639602085449056, 39.898055935214209], [119.023463983233015, 39.252333075511096], [118.042748651197897, 39.204273993479674], [117.532702264477052, 38.73763580988409], [118.05969852098967, 38.061475531561051], [118.878149855628351, 37.897325344385898], [118.911636183753501, 37.448463853498723], [119.702802362142037, 37.156388658185072], [120.823457472823648, 37.870427761377968], [121.711258579597938, 37.481123358707165], [122.357937453298462, 37.454484157860684], [122.519994744965814, 36.930614325501828], [121.104163853033029, 36.651329047180432], [120.63700890511457, 36.111439520811125], [119.66456180224607, 35.609790554337728], [119.151208123858567, 34.909859117160458], [120.227524855633717, 34.360331936168613], [120.620369093916565, 33.37672272392512], [121.229014113450219, 32.460318711877186], [121.908145786630044, 31.692174384074683], [121.891919386890336, 30.949351508095098], [121.264257440273298, 30.676267401648712], [121.503519321784722, 30.14291494396425], [122.092113885589086, 29.832520453403156], [121.93842817595305, 29.018022365834803], [121.684438511238469, 28.225512600206677], [121.125661248866436, 28.135673122667178], [120.395473260582307, 27.053206895449385], [119.585496860839555, 25.740780544532605], [118.656871372554519, 24.547390855400234], [117.281606479970833, 23.624501451099714], [115.890735304835118, 22.782873236578094], [114.763827345846209, 22.668074042241663], [114.152546828265656, 22.223760077396204], [113.806779819800752, 22.548339748621423], [113.241077915501592, 22.051367499270462], [111.843592157032447, 21.550493679281512], [110.78546552942413, 21.39714386645533], [110.444039341271662, 20.34103261970639], [109.88986128137357, 20.282457383703441], [109.627655063924635, 21.008227037026725], [109.864488153118316, 21.395050970947516], [108.522812941524421, 21.715212307211821], [108.050180291782979, 21.552379869060101], [107.043420037872636, 21.8118989120299], [106.567273390735352, 22.21820486092474], [106.725403273548466, 22.794267889898375], [105.811247186305209, 22.976892401617899], [105.329209425886631, 23.352063300056976], [104.476858351664475, 22.819150092046918], [103.504514601660503, 22.703756618739217], [102.706992222100155, 22.708795070887696], [102.170435825613552, 22.464753119389336], [101.652017856861576, 22.318198757409554], [101.803119744882906, 21.174366766845051], [101.27002566936001, 21.201651923095167], [101.180005324307558, 21.436572984294052], [101.150032993578236, 21.849984442629015], [100.416537713627349, 21.558839423096654], [99.983489211021549, 21.742936713136451], [99.240898878987196, 22.118314317304559], [99.53199222208741, 22.949038804612591], [98.898749220782804, 23.142722072842581], [98.66026248575578, 24.063286037690002], [97.604719679762027, 23.897404690033049], [97.724609002679131, 25.083637193293036], [98.671838006589212, 25.91870250091349], [98.712093947344556, 26.743535874940243], [98.682690057370507, 27.508812160750658], [98.246230910233351, 27.747221381129172], [97.91198774616943, 28.335945136014367], [97.327113885490007, 28.261582749946339], [96.248833449287829, 28.411030992134467], [96.586590610747521, 28.830979519154361], [96.117678664131006, 29.452802028922513], [95.404802280664626, 29.031716620392157], [94.565990431702929, 29.27743805593996], [93.413347609432662, 28.640629380807233], [92.503118931043616, 27.896876329046442], [91.696656528696693, 27.771741848251615], [91.258853794319876, 28.040614325466343], [90.730513950567797, 28.064953925075738], [90.015828891971182, 28.296438503527177], [89.475810174521158, 28.042758897406365], [88.814248488320573, 27.299315904239389], [88.730325962278528, 28.086864732367552], [88.120440708369941, 27.876541652939572], [86.954517043000635, 27.974261786403524], [85.823319940131526, 28.203575954698742], [85.011638218123053, 28.642773952747369], [84.23457970575015, 28.839893703724691], [83.89899295444674, 29.320226141877633], [83.337115106137176, 29.463731594352193], [82.327512648450877, 30.115268052688204], [81.525804477874786, 30.422716986608659], [81.111256138029276, 30.183480943313402], [79.721366815107118, 30.882714748654728], [78.738894484374001, 31.515906073527045], [78.458446486326025, 32.61816437431272], [79.176128777995544, 32.483779812137747], [79.208891636068543, 32.994394639613738], [78.811086460285722, 33.506198025032397], [78.912268914713209, 34.321936346975768], [77.83745079947461, 35.494009507787794], [76.192848341785705, 35.89840342868785], [75.896897414050173, 36.666806138651872], [75.158027785140987, 37.133030910789152], [74.980002475895404, 37.419990139305888], [74.829985792952144, 37.990007025701445], [74.864815708316783, 38.378846340481587], [74.25751427602269, 38.606506862943476], [73.928852166646394, 38.505815334622717], [73.675379266254836, 39.431236884105566], [73.960013055318427, 39.660008449861714], [73.822243686828315, 39.893973497063136], [74.776862420556043, 40.366425279291619], [75.467827996730719, 40.56207225194867], [76.526368035797432, 40.427946071935132], [76.90448449087711, 41.066485907549648], [78.187196893226044, 41.185315863604799], [78.543660923175253, 41.582242540038713], [80.119430373051401, 42.12394074153822], [80.259990268885318, 42.34999929459908], [80.180150180994374, 42.920067857426844], [80.866206496101213, 43.180362046881008], [79.966106398441426, 44.917516994804622], [81.947070753918084, 45.317027492853143], [82.458925815769035, 45.539649563166499], [83.180483839860543, 47.330031236350735], [85.164290399113213, 47.000955715516099], [85.720483839870667, 47.452969468773077], [85.76823286330837, 48.455750637396896], [86.59877648310335, 48.549181626980605], [87.359970330762692, 49.214980780629148], [87.751264276076668, 49.297197984405464], [88.013832228551678, 48.599462795600594], [88.854297723346747, 48.069081732773007], [90.280825636763893, 47.693549099307901], [90.970809360724957, 46.88814606382293], [90.585768263718307, 45.719716091487491], [90.945539585334316, 45.286073309910243], [92.133890822318222, 45.115075995456429], [93.480733677141316, 44.97547211362], [94.688928664125356, 44.352331854828456], [95.306875441471504, 44.241330878265458], [95.762454868556688, 43.319449164394619], [96.349395786527808, 42.725635280928643], [97.451757440177971, 42.74888967546007], [99.515817498779995, 42.524691473961688], [100.845865513108279, 42.663804429691417], [101.833040399179936, 42.51487295182627], [103.312278273534787, 41.907468166667613], [104.522281935649005, 41.90834666601662], [104.964993931093431, 41.597409572916334], [106.129315627061658, 42.134327704428891], [107.744772576937976, 42.481515814781908], [109.243595819131428, 42.519446316084149], [110.412103306115299, 42.871233628911014], [111.129682244920218, 43.406834011400171], [111.82958784388137, 43.743118394539486], [111.667737257943202, 44.073175767587706], [111.348376906379428, 44.457441718110047], [111.87330610560025, 45.102079372735112], [112.436062453258842, 45.01164561622425], [113.463906691544196, 44.808893134127111], [114.46033165899604, 45.339816799493875], [115.985096470200133, 45.727235012386004], [116.717868280098855, 46.38820241961524], [117.421701287914246, 46.67273285581421], [118.874325799638711, 46.805412095723646], [119.663269891438745, 46.692679958678944], [119.772823927897562, 47.048058783550132], [118.866574334794947, 47.747060044946195], [118.064142694166719, 48.06673045510373], [117.295507440257438, 47.697709052107385], [116.308952671373234, 47.853410142602812], [115.742837355615734, 47.726544501326273], [115.485282017073018, 48.135382595403442], [116.191802199367601, 49.134598090199056], [116.67880089728618, 49.888531399121398], [117.879244419426371, 49.510983384796944], [119.288460728025839, 50.142882798862033], [119.279365675942358, 50.582907619827282], [120.182049595216924, 51.64356639261802], [120.738191359541972, 51.964115302124547], [120.725789015791975, 52.516226304730814], [120.177088657716865, 52.753886216841195], [121.003084751470226, 53.251401068731226], [122.245747918792858, 53.431725979213681], [123.571506789240843, 53.458804429734627], [125.068211297710434, 53.161044826868832], [125.946348911646169, 52.792798570356936], [126.564399041856959, 51.784255479532689], [126.939156528837657, 51.353894151405896], [127.287455682484904, 50.739797268265434], [127.657407261262378, 49.760270494172929]]]] } },
-            { "type": "Feature", "properties": { "admin": "Ivory Coast", "name": "Côte d'Ivoire", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.856125047202397, 4.994475816259508], [-3.311084357100071, 4.984295559098014], [-4.008819545904941, 5.179813340674314], [-4.64991736491791, 5.168263658057084], [-5.834496222344525, 4.993700669775135], [-6.528769090185845, 4.705087795425015], [-7.518941209330434, 4.338288479017307], [-7.712159389669749, 4.364565944837721], [-7.63536821128403, 5.188159084489455], [-7.53971513511176, 5.313345241716517], [-7.570152553731686, 5.707352199725903], [-7.993692592795879, 6.126189683451541], [-8.311347622094017, 6.193033148621081], [-8.602880214868618, 6.467564195171659], [-8.385451626000572, 6.911800645368742], [-8.485445522485348, 7.395207831243068], [-8.439298468448696, 7.686042792181736], [-8.280703497744936, 7.687179673692156], [-8.221792364932197, 8.123328762235571], [-8.299048631208562, 8.316443589710302], [-8.203498907900878, 8.455453192575446], [-7.832100389019186, 8.575704250518625], [-8.079113735374348, 9.376223863152033], [-8.309616461612249, 9.789531968622439], [-8.22933712404682, 10.129020290563897], [-8.029943610048617, 10.206534939001711], [-7.89958980959237, 10.297382106970824], [-7.622759161804808, 10.147236232946792], [-6.850506557635057, 10.138993841996237], [-6.666460944027547, 10.430810655148447], [-6.493965013037267, 10.411302801958268], [-6.205222947606429, 10.524060777219132], [-6.050452032892266, 10.096360785355442], [-5.816926235365286, 10.222554633012191], [-5.404341599946973, 10.370736802609144], [-4.954653286143098, 10.152713934769732], [-4.779883592131966, 9.821984768101741], [-4.330246954760383, 9.610834865757139], [-3.980449184576684, 9.862344061721698], [-3.511898972986272, 9.900326239456216], [-2.827496303712706, 9.642460842319775], [-2.56218950032624, 8.219627793811481], [-2.983584967450326, 7.379704901555511], [-3.244370083011261, 6.2504715031135], [-2.810701463217839, 5.389051215024109], [-2.856125047202397, 4.994475816259508]]] } },
+            { "type": "Feature", "properties": { "admin": "Ivory Coast", "name": "C�te d'Ivoire", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.856125047202397, 4.994475816259508], [-3.311084357100071, 4.984295559098014], [-4.008819545904941, 5.179813340674314], [-4.64991736491791, 5.168263658057084], [-5.834496222344525, 4.993700669775135], [-6.528769090185845, 4.705087795425015], [-7.518941209330434, 4.338288479017307], [-7.712159389669749, 4.364565944837721], [-7.63536821128403, 5.188159084489455], [-7.53971513511176, 5.313345241716517], [-7.570152553731686, 5.707352199725903], [-7.993692592795879, 6.126189683451541], [-8.311347622094017, 6.193033148621081], [-8.602880214868618, 6.467564195171659], [-8.385451626000572, 6.911800645368742], [-8.485445522485348, 7.395207831243068], [-8.439298468448696, 7.686042792181736], [-8.280703497744936, 7.687179673692156], [-8.221792364932197, 8.123328762235571], [-8.299048631208562, 8.316443589710302], [-8.203498907900878, 8.455453192575446], [-7.832100389019186, 8.575704250518625], [-8.079113735374348, 9.376223863152033], [-8.309616461612249, 9.789531968622439], [-8.22933712404682, 10.129020290563897], [-8.029943610048617, 10.206534939001711], [-7.89958980959237, 10.297382106970824], [-7.622759161804808, 10.147236232946792], [-6.850506557635057, 10.138993841996237], [-6.666460944027547, 10.430810655148447], [-6.493965013037267, 10.411302801958268], [-6.205222947606429, 10.524060777219132], [-6.050452032892266, 10.096360785355442], [-5.816926235365286, 10.222554633012191], [-5.404341599946973, 10.370736802609144], [-4.954653286143098, 10.152713934769732], [-4.779883592131966, 9.821984768101741], [-4.330246954760383, 9.610834865757139], [-3.980449184576684, 9.862344061721698], [-3.511898972986272, 9.900326239456216], [-2.827496303712706, 9.642460842319775], [-2.56218950032624, 8.219627793811481], [-2.983584967450326, 7.379704901555511], [-3.244370083011261, 6.2504715031135], [-2.810701463217839, 5.389051215024109], [-2.856125047202397, 4.994475816259508]]] } },
             { "type": "Feature", "properties": { "admin": "Cameroon", "name": "Cameroon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[13.07582238124675, 2.267097072759014], [12.951333855855605, 2.321615708826939], [12.359380323952218, 2.19281220133945], [11.751665480199787, 2.326757513839993], [11.276449008843711, 2.261050930180871], [9.649158155972627, 2.283866075037735], [9.795195753629455, 3.073404445809117], [9.404366896205998, 3.734526882335202], [8.948115675501068, 3.904128933117135], [8.744923943729416, 4.352215277519959], [8.488815545290889, 4.495617377129917], [8.500287713259693, 4.771982937026847], [8.757532993208626, 5.47966583904791], [9.233162876023043, 6.444490668153334], [9.522705926154398, 6.453482367372116], [10.118276808318255, 7.038769639509879], [10.497375115611417, 7.055357774275562], [11.058787876030349, 6.644426784690593], [11.745774366918509, 6.981382961449753], [11.839308709366801, 7.397042344589434], [12.063946160539556, 7.799808457872301], [12.218872104550597, 8.305824082874322], [12.753671502339214, 8.717762762888993], [12.955467970438971, 9.417771714714702], [13.1675997249971, 9.64062632897341], [13.308676385153914, 10.160362046748926], [13.572949659894558, 10.798565985553564], [14.415378859116682, 11.572368882692071], [14.468192172918974, 11.90475169519341], [14.57717776862253, 12.085360826053501], [14.181336297266792, 12.483656927943112], [14.213530714584634, 12.802035427293344], [14.495787387762842, 12.859396267137326], [14.893385857816522, 12.219047756392582], [14.960151808337598, 11.555574042197222], [14.923564894274955, 10.891325181517471], [15.467872755605269, 9.982336737503429], [14.909353875394713, 9.99212942142273], [14.627200555081057, 9.920919297724536], [14.171466098699025, 10.021378282099928], [13.954218377344002, 9.549494940626685], [14.544466586981766, 8.965861314322266], [14.979995558337688, 8.796104234243471], [15.120865512765331, 8.382150173369423], [15.436091749745765, 7.692812404811971], [15.279460483469107, 7.421924546737968], [14.776545444404572, 6.408498033062044], [14.536560092841111, 6.22695872642069], [14.459407179429345, 5.451760565610299], [14.558935988023501, 5.03059764243153], [14.478372430080466, 4.732605495620446], [14.950953403389658, 4.21038930909492], [15.036219516671249, 3.851367295747123], [15.405395948964379, 3.335300604664339], [15.862732374747479, 3.013537298998982], [15.907380812247649, 2.557389431158612], [16.01285241055535, 2.267639675298084], [15.940918816805061, 1.727672634280295], [15.14634199388524, 1.964014797367184], [14.337812534246577, 2.22787466064949], [13.07582238124675, 2.267097072759014]]] } },
             { "type": "Feature", "properties": { "admin": "Democratic Republic of the Congo", "name": "Dem. Rep. Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.833859897593801, 3.50916596111034], [30.773346795380036, 2.339883327642127], [31.174149204235807, 2.204465236821263], [30.852670118948048, 1.849396470543809], [30.468507521290292, 1.58380544677972], [30.086153598762703, 1.062312730306288], [29.875778842902488, 0.597379868976304], [29.819503208136634, -0.205310153813372], [29.587837762172164, -0.58740569417948], [29.579466180140876, -1.341313164885626], [29.29188683443661, -1.620055840667987], [29.254834832483336, -2.215109958508911], [29.117478875451546, -2.292211195488384], [29.02492638521678, -2.839257907730157], [29.276383904749046, -3.293907159034063], [29.339997592900342, -4.499983412294092], [29.519986606572925, -5.419978936386313], [29.41999271008816, -5.939998874539432], [29.620032179490003, -6.520015150583424], [30.199996779101692, -7.079980970898161], [30.740015496551781, -8.340007419470913], [30.34608605319081, -8.238256524288216], [29.002912225060467, -8.40703175215347], [28.734866570762495, -8.526559340044576], [28.449871046672818, -9.164918308146083], [28.673681674928922, -9.605924981324931], [28.496069777141763, -10.789883721564044], [28.372253045370421, -11.793646742401389], [28.642417433392346, -11.971568698782312], [29.341547885869087, -12.36074391037241], [29.616001417771223, -12.178894545137307], [29.699613885219485, -13.257226657771827], [28.934285922976834, -13.248958428605132], [28.52356163912102, -12.698604424696679], [28.15510867687998, -12.272480564017894], [27.38879886242378, -12.132747491100663], [27.164419793412456, -11.608748467661071], [26.55308759939961, -11.924439792532125], [25.752309604604726, -11.784965101776356], [25.418118116973197, -11.330935967659958], [24.783169793402948, -11.238693536018962], [24.314516228947948, -11.262826429899269], [24.257155389103982, -10.951992689663655], [23.912215203555714, -10.926826267137512], [23.456790805767433, -10.867863457892481], [22.837345411884733, -11.017621758674329], [22.402798292742371, -10.99307545333569], [22.155268182064304, -11.084801120653768], [22.208753289486388, -9.894796237836507], [21.87518191904234, -9.523707777548564], [21.801801385187897, -8.908706556842978], [21.949130893652036, -8.305900974158275], [21.746455926203303, -7.920084730667147], [21.728110792739695, -7.2908724910813], [20.514748162526498, -7.299605808138629], [20.601822950938292, -6.93931772219968], [20.091621534920645, -6.943090101756993], [20.037723016040214, -7.116361179231644], [19.417502475673157, -7.155428562044297], [19.166613396896107, -7.738183688999753], [19.016751743249664, -7.988245944860132], [18.464175652752683, -7.847014255406442], [18.134221632569048, -7.98767750410492], [17.472970004962232, -8.068551120641699], [17.089995965247166, -7.545688978712525], [16.860190870845198, -7.222297865429984], [16.573179965896141, -6.622644545115087], [16.326528354567042, -5.877470391466267], [13.375597364971892, -5.864241224799548], [13.02486941900696, -5.984388929878157], [12.735171339578695, -5.965682061388497], [12.322431674863507, -6.100092461779658], [12.182336866920249, -5.789930515163837], [12.436688266660866, -5.684303887559245], [12.468004184629734, -5.248361504745003], [12.631611769265788, -4.991271254092935], [12.995517205465173, -4.781103203961883], [13.258240187237044, -4.882957452009165], [13.600234816144676, -4.500138441590969], [14.144956088933295, -4.510008640158715], [14.209034864975219, -4.793092136253597], [14.582603794013179, -4.970238946150139], [15.170991652088441, -4.3435071753143], [15.753540073314749, -3.855164890156096], [16.006289503654298, -3.535132744972528], [15.972803175529149, -2.712392266453612], [16.407091912510051, -1.740927015798682], [16.86530683764212, -1.225816338713287], [17.523716261472853, -0.743830254726987], [17.638644646889983, -0.424831638189246], [17.663552687254676, -0.058083998213817], [17.826540154703245, 0.288923244626105], [17.774191928791563, 0.855658677571085], [17.89883548347958, 1.741831976728278], [18.09427575040743, 2.365721543788055], [18.39379235197114, 2.90044342692822], [18.453065219809925, 3.504385891123348], [18.542982211997778, 4.201785183118317], [18.932312452884755, 4.709506130385973], [19.467783644293146, 5.031527818212779], [20.290679152108932, 4.691677761245287], [20.927591180106273, 4.322785549329736], [21.659122755630019, 4.224341945813719], [22.405123732195531, 4.02916006104732], [22.704123569436284, 4.633050848810156], [22.841479526468103, 4.710126247573483], [23.297213982850135, 4.609693101414221], [24.41053104014625, 5.108784084489129], [24.805028924262409, 4.897246608902349], [25.128833449003274, 4.927244777847789], [25.278798455514302, 5.170408229997191], [25.650455356557465, 5.256087754737123], [26.402760857862535, 5.150874538590869], [27.044065382604703, 5.127852688004835], [27.374226108517483, 5.233944403500059], [27.979977247842807, 4.408413397637373], [28.428993768026906, 4.287154649264493], [28.696677687298795, 4.455077215996936], [29.159078403446497, 4.38926727947323], [29.715995314256013, 4.600804755060024], [29.953500197069467, 4.173699042167683], [30.833859897593801, 3.50916596111034]]] } },
             { "type": "Feature", "properties": { "admin": "Republic of Congo", "name": "Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[12.995517205465173, -4.781103203961883], [12.620759718484491, -4.438023369976135], [12.318607618873923, -4.606230157086187], [11.914963006242086, -5.037986748884789], [11.093772820691923, -3.978826592630546], [11.855121697648114, -3.42687061932105], [11.478038771214299, -2.765618991714241], [11.820963575903189, -2.514161472181982], [12.495702752338159, -2.391688327650242], [12.575284458067639, -1.948511244315134], [13.109618767965626, -2.428740329603513], [13.992407260807706, -2.470804945489099], [14.299210239324564, -1.998275648612213], [14.425455763413593, -1.333406670744971], [14.316418491277741, -0.552627455247048], [13.843320753645653, 0.038757635901149], [14.276265903386953, 1.196929836426619], [14.026668735417214, 1.395677395021153], [13.282631463278816, 1.31418366129688], [13.003113641012074, 1.830896307783319], [13.07582238124675, 2.267097072759014], [14.337812534246577, 2.22787466064949], [15.14634199388524, 1.964014797367184], [15.940918816805061, 1.727672634280295], [16.01285241055535, 2.267639675298084], [16.537058139724135, 3.198254706226278], [17.133042433346297, 3.728196519379451], [17.809900343505259, 3.560196437998569], [18.453065219809925, 3.504385891123348], [18.39379235197114, 2.90044342692822], [18.09427575040743, 2.365721543788055], [17.89883548347958, 1.741831976728278], [17.774191928791563, 0.855658677571085], [17.826540154703245, 0.288923244626105], [17.663552687254676, -0.058083998213817], [17.638644646889983, -0.424831638189246], [17.523716261472853, -0.743830254726987], [16.86530683764212, -1.225816338713287], [16.407091912510051, -1.740927015798682], [15.972803175529149, -2.712392266453612], [16.006289503654298, -3.535132744972528], [15.753540073314749, -3.855164890156096], [15.170991652088441, -4.3435071753143], [14.582603794013179, -4.970238946150139], [14.209034864975219, -4.793092136253597], [14.144956088933295, -4.510008640158715], [13.600234816144676, -4.500138441590969], [13.258240187237044, -4.882957452009165], [12.995517205465173, -4.781103203961883]]] } },
@@ -961,11 +964,6 @@ module mapcomponenet {
 }
 
 
-
-
-
-
-
 module MenuComponent {
     $(function () {
         var sample = new ej.Menu($("#syncfusionProducts"),{
@@ -989,12 +987,6 @@ module MenuComponent {
 }
 
 
-
-
-
-
- 
-
 module NavigationDrawerComponent {
     $(function () {
         var navigationdrawerInstance = new ej.NavigationDrawer($("#navpane"), {
@@ -1016,8 +1008,6 @@ module NavigationDrawerComponent {
     });
 }
 
-
-
 module PDFViewerComponent {
     $(function () {
         var pdfviewerControl = new ej.PdfViewer($("#pdfviewer"), {
@@ -1027,13 +1017,11 @@ module PDFViewerComponent {
     });
 }
 
-
-
 module PivotChartOlap {
     $(function () {
         var sample = new ej.PivotChart($("#PivotChart"),{
             dataSource: {
-			data: "http://bi.syncfusion.com/olap/msmdpump.dll", 
+			data: "http://bi.syncfusion.com/olap/msmdpump.dll",
 			catalog: "Adventure Works DW 2008 SE",
 			cube: "Adventure Works",
 			rows: [
@@ -1070,8 +1058,6 @@ module PivotChartOlap {
     });
 }
 
-
-
 var pivot_dataset = [
     { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
     { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
@@ -1144,8 +1130,6 @@ module PivotChartRelational {
     });
 }
 
-
-
 module PivotGaugeOlap {
 
     $(function () {
@@ -1201,7 +1185,7 @@ module PivotGaugeOlap {
 					length: 120,
 					width: 7
                 },
-				{		
+				{
 					type: "marker",
 					markerType: "diamond",
 					distanceFromScale: 5,
@@ -1230,7 +1214,7 @@ module PivotGaugeOlap {
 					distanceFromScale: -5,
                     backgroundColor: "#fc0606",
 					border: { color: "#fc0606" }
-                }, 
+                },
 				{
 					distanceFromScale: -5
                 }],
@@ -1248,11 +1232,9 @@ module PivotGaugeOlap {
                 }]
             }]
         });
-    });	
+    });
 }
 
-
-
 var pivot_dataset = [
     { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
     { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
@@ -1322,7 +1304,7 @@ module PivotGaugeRelational {
 					length: 120,
 					width: 7
                 },
-				{		
+				{
 					type: "marker",
 					markerType: "diamond",
 					distanceFromScale: 5,
@@ -1351,7 +1333,7 @@ module PivotGaugeRelational {
 					distanceFromScale: -5,
                     backgroundColor: "#fc0606",
 					border: { color: "#fc0606" }
-                }, 
+                },
 				{
 					distanceFromScale: -5
                 }],
@@ -1369,11 +1351,9 @@ module PivotGaugeRelational {
                 }]
             }]
         });
-    });	
+    });
 }
 
-
-
 module PivotGridOlap {
 
     $(function () {
@@ -1404,15 +1384,13 @@ module PivotGridOlap {
 			],
 			filters:[]
 		},
-        enableGroupingBar: true, 
+        enableGroupingBar: true,
         pivotTableFieldListID:"PivotSchemaDesigner"
         });
         $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
     });
 }
 
-
-
 var pivot_dataset = [
     { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
     { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
@@ -1455,7 +1433,7 @@ module PivotGridRelational {
 					fieldCaption: "State"
 				}
 			],
-			columns:                     
+			columns:
 				[{
 					fieldName: "Product",
 					fieldCaption: "Product"
@@ -1473,16 +1451,14 @@ module PivotGridRelational {
             ],
 			filters:[]
 		},
-        enableGroupingBar: true, 
+        enableGroupingBar: true,
         pivotTableFieldListID:"PivotSchemaDesigner"
         });
-       $("#PivotSchemaDesigner").ejPivotSchemaDesigner(); 
+       $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
 
     });
 }
 
-
-
 module PivotTreeMap {
     $(function () {
         var sample = new ej.PivotTreeMap($("#PivotTreeMap"),{
@@ -1516,8 +1492,6 @@ module PivotTreeMap {
     });
 }
 
-
-
 module ProgressBarComponent {
     $(function () {
         var sample = new ej.ProgressBar($("#progressBar"),{
@@ -1534,9 +1508,6 @@ module ProgressBarComponent {
 
 }
 
-
-
-
 declare var rteObj: any;
 declare var data: any;
 var radialEle = $('#defaultradialmenu'), action = 0, forRedo = 0;
@@ -1580,7 +1551,6 @@ module RadialMenuComponent {
     });
 }
 
-
 function bold(e: any) {
 
     rteObj = rteEle.data("ejRTE");
@@ -1616,9 +1586,6 @@ function redo(e: any) {
     radialEle.focus();
 }
 
-
- 
-
 module RadialSliderComponent {
     $(function () {
         var radialsliderInstance = new ej.RadialSlider($("#radialSlider"), {
@@ -1627,7 +1594,6 @@ module RadialSliderComponent {
     });
 }
 
-
 module rangecomponent {
     $(function () {
         var linearsample = new ej.datavisualization.RangeNavigator($("#RangeNavigator"), {
@@ -1650,7 +1616,67 @@ module rangecomponent {
                         fill: '#69D2E7'
                     }
                 ];
-            } 
+            },
+            loaded: function () {
+                var sender = $("#RangeNavigator").data("ejRangeNavigator");
+                var theme = window.themeStyle + window.themeColor + window.themeVarient;
+                if (theme) {
+                    switch (theme) {
+                        case "flatazurelight":
+                            theme = "azurelight";
+                            break;
+                        case "flatlimelight":
+                            theme = "limelight";
+                            break;
+                        case "flatsaffronlight":
+                            theme = "saffronlight";
+                            break;
+                        case "gradientazurelight":
+                            theme = "gradientazure";
+                            break;
+                        case "gradientlimelight":
+                            theme = "gradientlime";
+                            break;
+                        case "gradientsaffronlight":
+                            theme = "gradientsaffron";
+                            break;
+                        case "flatazuredark":
+                            theme = "azuredark";
+                            break;
+                        case "flatlimedark":
+                            theme = "limedark";
+                            break;
+                        case "flatsaffrondark":
+                            theme = "saffrondark";
+                            break;
+                        case "gradientazuredark":
+                            theme = "gradientazuredark";
+                            break;
+                        case "gradientlimedark":
+                            theme = "gradientlimedark";
+                            break;
+                        case "gradientsaffrondark":
+                            theme = "gradientsaffrondark";
+                            break;
+                        case "flathigh-contrast-01dark":
+                            theme = "highcontrast01";
+                            break;
+                        case "flathigh-contrast-02dark":
+                            theme = "highcontrast02";
+                            break;
+                        case "flatmateriallight":
+                            theme = "material";
+                            break;
+                        case "flatoffice-365light":
+                            theme = "office";
+                            break;
+                        default:
+                            theme = "flatlight";
+                            break;
+                    }
+                    sender.model.theme = theme;
+                }
+            }
 
         });
     });
@@ -1682,8 +1708,6 @@ function GetData() {
     return data;
 };
 
-
-
 module RatingComponent {
     $(function () {
 
@@ -1702,7 +1726,7 @@ module RatingComponent {
             shapeWidth: 25,
             showTooltip: true
         });
-		
+
         var sample2 = new ej.Rating($("#halfRating"),{
             precision: ej.Rating.Precision.Half,
             value: 3.5,
@@ -1733,13 +1757,11 @@ module RatingComponent {
             shapeHeight: 25,
             shapeWidth: 25,
             showTooltip: true
-        }); 
+        });
     });
 
 }
 
-
-
 module ReportViewerComponent {
 	$(function () {
 		var report = new ej.ReportViewer($("#territoryReportViewer"), {
@@ -1752,8 +1774,6 @@ module ReportViewerComponent {
 	});
 }
 
-
-
 var fontfamily = ["Segoe UI", "Arial", "Times New Roman", "Tahoma", "Helvetica"], fontsize = ["1pt", "2pt", "3pt", "4pt", "5pt"], action1 = ["New", "Clear"], action2 = ["Bold", "Italic", "Underline", "strikethrough", "superscript", "subscript", "JustifyLeft", "JustifyCenter", "JustifyRight", "JustifyFull", "Undo", "Redo"];
 module RibbonComponent {
     $(function () {
@@ -1766,7 +1786,7 @@ module RibbonComponent {
                 toolTip: "Pin the Ribbon"
             },
             applicationTab: {
-                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false } 
+                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false }
             },
             tabs: [{
                 id: "home", text: "HOME", groups: [{
@@ -1848,7 +1868,7 @@ module RibbonComponent {
                                     width: 60,
                                     isBig: false
                                 }
-                            }] 
+                            }]
                 },
                 {
                         text: "Font", alignType: "rows", content: [{
@@ -2149,7 +2169,7 @@ module RibbonComponent {
                             groups: [{
                                 id: "zoomin",
                                 text: "Zoom In",
-                                toolTip: "Zoom In",                                
+                                toolTip: "Zoom In",
                                 buttonSettings: {
                                     width: 58,
                                     click: "onClick",
@@ -2161,7 +2181,7 @@ module RibbonComponent {
                                 {
                                     id: "zoomout",
                                     text: "Zoom Out",
-                                    toolTip: "Zoom Out",                                    
+                                    toolTip: "Zoom Out",
                                     buttonSettings: {
                                         width: 70,
                                         click: "onClick",
@@ -2173,7 +2193,7 @@ module RibbonComponent {
                                 {
                                     id: "fullscreen",
                                     text: "Full Screen",
-                                    toolTip: "Full Screen",                                    
+                                    toolTip: "Full Screen",
                                     buttonSettings: {
                                         width: 73,
                                         click: "onClick",
@@ -2416,7 +2436,7 @@ module RibbonComponent {
                         }
                     ]
                 }
-            ],   
+            ],
             create: function createControl(args) {
                 var ribbon = $("#defaultRibbon").data("ejRibbon");
                 $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
@@ -2428,7 +2448,7 @@ module RibbonComponent {
 function colorHandler(args:any) {
     (this._id.indexOf("fillcolor") != -1) ? $("#contenteditor").css('background-color', args.value) : document.execCommand('forecolor', false, args.value);
 }
-function onClick(args) {
+function onClick(args: any) {
     var val, prop = args.text;
     val = (ej.isNullOrUndefined(args.model.text)) ? args.model.activeText : args.model.text;
     if (action1.indexOf(val) != -1)
@@ -2444,10 +2464,6 @@ function onClick(args) {
 }
 
 
-
-
- 
-
 module RotatorComponent {
     $(function () {
         var rotatorInstance = new ej.Rotator($("#sliderContent"), {
@@ -2469,8 +2485,6 @@ module RotatorComponent {
     });
 }
 
-
-
 module RTEComponent {
     $(function () {
         var sample = new ej.RTE($("#rteSample"),{
@@ -2541,8 +2555,6 @@ module RTEComponent {
 
 }
 
-
-
 module ScheduleComponent {
     $(function () {
         var sample = new ej.Schedule($("#Schedule1"), {
@@ -2609,9 +2621,7 @@ module ScheduleComponent {
             }
         });
     });
-}   
-
-
+}
 
 module ScrollerComponent {
     $(function () {
@@ -2621,11 +2631,11 @@ module ScrollerComponent {
         });
         $(window).bind('resize', function () {
             scrollerSample.refresh();
-        });    });
+        });
+
+    });
 }
 
-
-
 module SignatureComponent {
     $(function () {
         var basicSignature = new ej.Signature($("#signature"), {
@@ -2636,9 +2646,6 @@ module SignatureComponent {
     });
 }
 
-
-
-
 module SliderComponent {
     $(function () {
         var slider = new ej.Slider($("#minSlider"), {
@@ -2657,10 +2664,6 @@ module SliderComponent {
 }
 
 
-
-
-
-
 module linesparkline {
     $(function () {
 
@@ -2788,10 +2791,6 @@ module piesparkline4 {
     });
 }
 
-	
-
- 
-
 
 module SplitterComponent {
     $(function () {
@@ -2808,8 +2807,6 @@ module SplitterComponent {
     });
 }
 
-
-
 module SpreadsheetComponent {
 $(function () {
         var sample = new ej.Spreadsheet($("#basicSpreadsheet"), {
@@ -2825,7 +2822,7 @@ $(function () {
                 pdfUrl: (<any>window).baseurl + "api/Spreadsheet/PdfExport"
             },
             sheets: [{ rangeSettings: [{ dataSource: (<any>window).defaultData, startCell: "A1" }] }],
-			loadComplete: () => {  
+			loadComplete: () => {
 			var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
 			if (!(<any>spreadsheet).isImport) {
         spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
@@ -2837,9 +2834,6 @@ $(function () {
     });
 }
 
-
-
-
 var default_data: Array<Object> = [
     { Category : "Employees", Country : "USA", JobDescription : "Sales",         JobGroup:"Executive",                         EmployeesCount : 50 },
 	{ Category : "Employees", Country : "USA", JobDescription : "Sales",         JobGroup : "Analyst",                         EmployeesCount : 40 },
@@ -2849,13 +2843,13 @@ var default_data: Array<Object> = [
 	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 70 },
 	{ Category : "Employees", Country : "USA", JobDescription : "Management",                                                  EmployeesCount : 40 },
 	{ Category : "Employees", Country : "USA", JobDescription : "Accounts",                                                    EmployeesCount : 60 },
-	
+
 	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 43 },
 	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 125},
 	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 60 },
 	{ Category : "Employees", Country : "India",   JobDescription : "HR Executives",                                               EmployeesCount : 70 },
 	{ Category : "Employees", Country : "India",   JobDescription : "Accounts",                                                    EmployeesCount : 45 },
-	
+
 	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Executive",                       EmployeesCount : 30 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Analyst",                         EmployeesCount : 40 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Marketing",                                                   EmployeesCount : 50 },
@@ -2864,13 +2858,13 @@ var default_data: Array<Object> = [
 	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Management",                                                  EmployeesCount : 33 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Accounts",                                                    EmployeesCount : 55 },
-	
+
 	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 45 },
 	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 96 },
 	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 55 },
 	{ Category : "Employees", Country : "UK",      JobDescription : "HR Executives",                                               EmployeesCount : 60 },
 	{ Category : "Employees", Country : "UK",      JobDescription: "Accounts",                                                     EmployeesCount: 30  },
-	
+
 	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 40 },
 	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 65 },
 	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
@@ -2880,7 +2874,7 @@ var default_data: Array<Object> = [
 module sunburstcomponent {
     $(function () {
         var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
-            valueMemberPath: "EmployeesCount",           
+            valueMemberPath: "EmployeesCount",
             levels: [
                 {groupMemberPath: "Country"},
 				{groupMemberPath: "JobDescription"},
@@ -2893,6 +2887,16 @@ module sunburstcomponent {
 			enableAnimation:false,
 			size:{height:"600"},
 			innerRadius:0.2,
+            load: function () {
+                var sender = $("#Sunburst").data("ejSunburstChart");
+                var SunBurstTheme = window.themeStyle + window.themeColor + window.themeVarient;
+                SunBurstTheme = SunBurstTheme.toString();
+                if (SunBurstTheme.indexOf("dark") > -1 || SunBurstTheme.indexOf("contrast") > -1)
+                    SunBurstTheme = "flatdark";
+                else
+                    SunBurstTheme = "flatlight";
+                sender.model.theme = SunBurstTheme;
+            },
 			title:{text:"Employees Count"},
 			zoomSettings:{enable:false},
 			legend:{visible:true,position:'top'}
@@ -2900,9 +2904,6 @@ module sunburstcomponent {
     });
 }
 
-
-
-
 module TabComponent {
     $(function () {
         var sample = new ej.Tab($("#defaultTab"),{
@@ -2916,11 +2917,8 @@ module TabComponent {
     });
 }
 
-
-
 module TagCloudComponent {
-    
-    
+
     var websiteCollection = [
         { text: "Google", url: "http://www.google.com", frequency: 12 },
         { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
@@ -2951,12 +2949,10 @@ module TagCloudComponent {
                 text: "text", url: "url", frequency: "frequency"
             }
         });
-            
+
     });
 }
 
-
-
 module EditorComponent {
     $(function () {
         var num = new ej.NumericTextbox($("#numeric"), {
@@ -2989,10 +2985,6 @@ module EditorComponent {
     });
 }
 
-
-
- 
-
 module TileViewComponent {
     $(function () {
         var tile1 = new ej.Tile($("#tile1"), {
@@ -3002,38 +2994,38 @@ module TileViewComponent {
 			imageUrl:'content/images/tile/windows/people_1.png'
         });
 		var tile2 = new ej.Tile($("#tile2"), {
-            imagePosition:"center",		
+            imagePosition:"center",
 			tileSize:"small",
-			imageUrl:'content/images/tile/windows/alerts.png',		 
-	
+			imageUrl:'content/images/tile/windows/alerts.png',
+
         });
 		var tile3 = new ej.Tile($("#tile3"), {
-            imagePosition:"center",		 
+            imagePosition:"center",
 			tileSize:"small",
-			imageUrl:'content/images/tile/windows/bing.png',		 
+			imageUrl:'content/images/tile/windows/bing.png',
         });
 		var tile4 = new ej.Tile($("#tile4"), {
             tileSize:"small",
-		 	imageUrl:'content/images/tile/windows/camera.png',		 
+		 	imageUrl:'content/images/tile/windows/camera.png',
         });
 		var tile5 = new ej.Tile($("#tile5"), {
-            imagePosition:"center",		 
+            imagePosition:"center",
 			tileSize:"small",
-			imageUrl:'content/images/tile/windows/messages.png',		 
+			imageUrl:'content/images/tile/windows/messages.png',
         });
 		var tile6 = new ej.Tile($("#tile6"), {
-            imagePosition:"center",		 
+            imagePosition:"center",
 			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/games.png',	
+			imageUrl:'content/images/tile/windows/games.png',
 			caption:{text:"Play"}
         });
-		var tile7 = new ej.Tile($("#tile7"), {	 
+		var tile7 = new ej.Tile($("#tile7"), {
 			tileSize:"medium",
 			imageUrl:'content/images/tile/windows/map.png',
 			caption:{text:"Maps"}
         });
 		var tile8 = new ej.Tile($("#tile8"), {
-            imagePosition:"fill",		 
+            imagePosition:"fill",
 			tileSize:"wide",
 			imageUrl:'content/images/tile/windows/sports.png',
 			caption:{text:"Sports"}
@@ -3071,8 +3063,6 @@ module TileViewComponent {
     });
 }
 
-
-
 module TimePickerComponent {
     $(function () {
         var timeSample = new ej.TimePicker($("#timepick"), {
@@ -3081,17 +3071,14 @@ module TimePickerComponent {
     });
 }
 
-
-
-
 module ToolbarComponent {
-    
+
     $(function () {
         var sample = new ej.Toolbar($("#editingToolbar"),{
             width: "100%",
             cssClass: "gradient-lime",
             enableSeparator: true,
-            
+
             isResponsive: true,
             orientation: ej.Orientation.Horizontal,
             showRoundedCorner: true
@@ -3100,11 +3087,8 @@ module ToolbarComponent {
 
 }
 
-
-
-
 module TooltipComponent {
-    
+
     $(function () {
 
         var sample1 = new ej.Tooltip($("#link1"),{
@@ -3158,8 +3142,6 @@ module TooltipComponent {
     });
 }
 
-
-
 module TreeGridComponent {
     $(function () {
         var treegridInstance = new ej.TreeGrid($("#TreeGridContainer"), {
@@ -3199,10 +3181,7 @@ module TreeGridComponent {
         isResponsive: true,
     });
 });
-} 
-
-
-
+}
 
 var population_data: Array<Object> = [
     { Continent: "Asia", Country: "Indonesia", Growth: 3, Population: 237641326 },
@@ -3242,10 +3221,6 @@ module treemapcomponent {
     });
 }
 
-
-
- 
-
 module TreeViewComponent {
     $(function () {
         var tree = new ej.TreeView($("#treeView"), {
@@ -3257,11 +3232,8 @@ module TreeViewComponent {
     });
 }
 
-
-
-
 module UploadboxComponent {
-    
+
     $(function () {
         var sample = new ej.Uploadbox($("#UploadDefault"),{
             saveUrl: (<any>window).baseurl + "api/uploadbox/Save",
@@ -3281,9 +3253,6 @@ module UploadboxComponent {
 
 }
 
-
-
-
 module WaitingPopupComponent {
     $(function () {
         var sample = new ej.WaitingPopup($("#target"),{
diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index e9f83b680c..f1aec6bc64 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ej.web.all 15.3
+// Type definitions for ej.web.all 15.4
 // Project: http://help.syncfusion.com/js/typescript
 // Definitions by: Syncfusion <https://github.com/syncfusion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,9 +6,10 @@
 
 /// <reference types="jquery" />
 
+
 /*!
 *  filename: ej.web.all.d.ts
-*  version : 15.3.0.33
+*  version : 15.4.0.17
 *  Copyright Syncfusion Inc. 2001 - 2017. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing
@@ -16,7 +17,6 @@
 *  applicable laws.
 */
 declare namespace ej {
-    /* tslint:disable:no-empty-interface */
     const dataUtil: dataUtil;
     function isMobile(): boolean;
     function isIOS(): boolean;
@@ -54,7 +54,7 @@ declare namespace ej {
     function getNameSpace(className: string): string;
     function getOffset(ele: string): any;
     function getRenderMode(): string;
-    function getScrollableParents(element: any): void;
+    function getScrollableParents(element: any): JQuery;
     function getTheme(): string;
     function getZindexPartial(element: any, popupEle: string): number;
     function hasRenderMode(element: string): void;
@@ -5131,6 +5131,10 @@ declare namespace ej {
              */
             beforeUpload?(e: BeforeUploadEventArgs): void;
 
+            /** Fires before opening the upload dialog.
+             */
+            beforeUploadDialogOpen?(e: BeforeUploadDialogOpenEventArgs): void;
+
             /** Fires when FileExplorer control was created
              */
             create?(e: CreateEventArgs): void;
@@ -5355,6 +5359,21 @@ declare namespace ej {
             type?: string;
         }
 
+        export interface BeforeUploadDialogOpenEventArgs {
+
+            /** returns Selected FileList objects
+             */
+            files?: any;
+
+            /** returns the FileExplorer model
+             */
+            model?: any;
+
+            /** returns the name of the event.
+             */
+            type?: string;
+        }
+
         export interface CreateEventArgs {
 
             /** Set to true when the event has to be canceled, else false.
@@ -16921,6 +16940,11 @@ declare namespace ej {
              */
             readOnly?: boolean;
 
+            /** Shows/Hides the increment and decrement buttons of the slider.
+             * @Default {false}
+             */
+            showButtons?: boolean;
+
             /** Specifies the rounded corner behavior for slider.
              * @Default {false}
              */
@@ -32630,17 +32654,13 @@ declare namespace ej {
 
         export interface ActionBeginEventArgs {
 
-            /** Returns the current date value.
-             */
-            currentDate?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
 
-            /** Returns the current view value.
+            /** Returns the data about the view change action.
              */
-            currentView?: string;
+            data?: any;
 
             /** Returns the Schedule model.
              */
@@ -32650,21 +32670,17 @@ declare namespace ej {
              */
             requestType?: string;
 
-            /** Returns the target of the click.
-             */
-            target?: any;
-
             /** Returns the name of the event.
              */
             type?: string;
 
-            /** Returns the save appointment value.
+            /** Returns the name of the CRUD action performed.
              */
-            data?: any;
+            currentAction?: string;
 
-            /** Returns the id of delete appointment.
+            /** Returns the GUid of appointment.
              */
-            id?: number;
+            id?: string;
         }
 
         export interface ActionCompleteEventArgs {
@@ -32689,6 +32705,10 @@ declare namespace ej {
              */
             type?: string;
 
+            /** Returns the name of the CRUD action performed.
+             */
+            currentAction?: string;
+
             /** Returns the appointment data dropped.
              */
             appointment?: any;
@@ -32719,13 +32739,17 @@ declare namespace ej {
 
         export interface BeforeAppointmentRemoveEventArgs {
 
+            /** Returns the deleted appointment object.
+             */
+            appointment?: any;
+
             /** Returns the cancel option value.
              */
             cancel?: boolean;
 
-            /** Returns the deleted appointment object.
+            /** Returns the name of the CRUD action performed.
              */
-            appointment?: any;
+            currentAction?: string;
 
             /** Returns the Schedule model.
              */
@@ -32746,10 +32770,18 @@ declare namespace ej {
              */
             cancel?: boolean;
 
+            /** Returns the name of the CRUD action performed.
+             */
+            currentAction?: string;
+
             /** Returns the Schedule model.
              */
             model?: ej.Schedule.Model;
 
+            /** Returns the name of the Scheduler event.
+             */
+            requestType?: string;
+
             /** Returns the name of the Scheduler event.
              */
             type?: string;
@@ -32881,14 +32913,14 @@ declare namespace ej {
 
         export interface CellClickEventArgs {
 
-            /** Returns the object of cellClick event.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
 
+            /** Returns the index of the cell.
+             */
+            cellIndex?: number;
+
             /** Returns the end time of the clicked cell.
              */
             endTime?: any;
@@ -32897,6 +32929,14 @@ declare namespace ej {
              */
             model?: ej.Schedule.Model;
 
+            /** Returns day, date and time information.
+             */
+            quickString?: string;
+
+            /** Returns the object of the resource.
+             */
+            resources?: any;
+
             /** Returns the start time of the clicked cell.
              */
             startTime?: any;
@@ -32912,10 +32952,6 @@ declare namespace ej {
 
         export interface CellDoubleClickEventArgs {
 
-            /** Returns the object of cellDoubleClick event.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
@@ -32928,6 +32964,10 @@ declare namespace ej {
              */
             model?: ej.Schedule.Model;
 
+            /** Returns the object of the resource.
+             */
+            resources?: any;
+
             /** Returns the start time of the double clicked cell.
              */
             startTime?: any;
@@ -32943,26 +32983,30 @@ declare namespace ej {
 
         export interface CellHoverEventArgs {
 
-            /** Returns the object of cellHover event.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
 
             /** Returns the index of the hovered cell.
              */
-            cellIndex?: any;
+            cellIndex?: number;
 
-            /** Returns the current date of the hovered cell.
+            /** Returns the end time of the clicked cell.
              */
-            currentDate?: any;
+            endTime?: any;
 
             /** Returns the Schedule model.
              */
             model?: ej.Schedule.Model;
 
+            /** Returns the object of the resource.
+             */
+            resources?: any;
+
+            /** Returns the start time of the clicked cell.
+             */
+            startTime?: any;
+
             /** Returns the target of the clicked cell.
              */
             target?: any;
@@ -33004,10 +33048,6 @@ declare namespace ej {
 
         export interface DragEventArgs {
 
-            /** Returns the object of dragOver event.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
@@ -33023,13 +33063,17 @@ declare namespace ej {
             /** Returns the name of the event.
              */
             type?: string;
+
+            /** Returns the default dragging interval range in minutes
+             */
+            interval?: number;
         }
 
         export interface DragStartEventArgs {
 
-            /** Returns the object of dragStart event.
+            /** Returns the dragged appointment.
              */
-            object?: any;
+            appointment?: any;
 
             /** Returns the cancel option value.
              */
@@ -33050,10 +33094,6 @@ declare namespace ej {
 
         export interface DragStopEventArgs {
 
-            /** Returns the object of dragDrop event.
-             */
-            object?: any;
-
             /** Returns the dropped appointment object.
              */
             appointment?: any;
@@ -33073,10 +33113,6 @@ declare namespace ej {
 
         export interface MenuItemClickEventArgs {
 
-            /** Returns the object of menuItemClick event.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
@@ -33089,6 +33125,10 @@ declare namespace ej {
              */
             model?: ej.Schedule.Model;
 
+            /** Returns the right clicked cell details.
+             */
+            targetInfo?: any;
+
             /** Returns the name of the event.
              */
             type?: string;
@@ -33120,6 +33160,10 @@ declare namespace ej {
              */
             target?: any;
 
+            /** Returns the name of the Scheduler event.
+             */
+            requestType?: string;
+
             /** Returns the name of the event.
              */
             type?: string;
@@ -33193,10 +33237,6 @@ declare namespace ej {
 
         export interface ResizeEventArgs {
 
-            /** Returns the object of resizing event.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
@@ -33205,6 +33245,10 @@ declare namespace ej {
              */
             element?: any;
 
+            /** Returns the default appointment resizing range .
+             */
+            interval?: number;
+
             /** Returns the Schedule model.
              */
             model?: ej.Schedule.Model;
@@ -33216,9 +33260,9 @@ declare namespace ej {
 
         export interface ResizeStartEventArgs {
 
-            /** Returns the object of resizeStart event.
+            /** Returns the object of the resized appointment.
              */
-            object?: any;
+            appointment?: any;
 
             /** Returns the cancel option value.
              */
@@ -33239,10 +33283,6 @@ declare namespace ej {
 
         export interface ResizeStopEventArgs {
 
-            /** Returns the object of resizeStop event.
-             */
-            object?: any;
-
             /** Returns the resized appointment value.
              */
             appointment?: any;
@@ -33266,14 +33306,14 @@ declare namespace ej {
 
         export interface OverflowButtonClickEventArgs {
 
-            /** Returns the object consisting of start time, end time and resource value of the underlying cell on which the clicked overflow button is present.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
 
+            /** Returns the icon rendered cell information.
+             */
+            Datas?: any;
+
             /** Returns the object of menu item event.
              */
             events?: any;
@@ -33289,17 +33329,17 @@ declare namespace ej {
 
         export interface OverflowButtonHoverEventArgs {
 
-            /** Returns the object consisting of start time, end time and resource value of the underlying cell on which the overflow button is currently hovered.
-             */
-            object?: any;
-
             /** Returns the cancel option value.
              */
             cancel?: boolean;
 
+            /** Returns the icon rendered cell information.
+             */
+            datas?: any;
+
             /** Returns the object of menu item event.
              */
-            events?: any;
+            event?: any;
 
             /** Returns the Schedule model.
              */
@@ -33343,6 +33383,10 @@ declare namespace ej {
              */
             model?: ej.Schedule.Model;
 
+            /** Returns the name of the Scheduler event.
+             */
+            requestType?: string;
+
             /** Returns the name of the Scheduler event.
              */
             type?: string;
@@ -33358,10 +33402,18 @@ declare namespace ej {
              */
             cancel?: boolean;
 
+            /** Returns the name of the CRUD action performed.
+             */
+            currentAction?: string;
+
             /** Returns the Schedule model.
              */
             model?: ej.Schedule.Model;
 
+            /** Returns the name of the Scheduler event.
+             */
+            requestType?: string;
+
             /** Returns the name of the Scheduler event.
              */
             type?: string;
@@ -33377,10 +33429,18 @@ declare namespace ej {
              */
             appointment?: any;
 
+            /** Returns the name of the CRDU action performed.
+             */
+            currentAction?: string;
+
             /** Returns the Schedule model.
              */
             model?: ej.Schedule.Model;
 
+            /** Returns the name of the Scheduler event.
+             */
+            requestType?: string;
+
             /** Returns the name of the Scheduler event.
              */
             type?: string;
@@ -34190,6 +34250,11 @@ declare namespace ej {
              */
             enablePredecessorValidation?: boolean;
 
+            /** Enables or disables serial number column for Gantt. When enabled, the records will be number sequenced.
+             * @Default {false}
+             */
+            enableSerialNumber?: boolean;
+
             /** Specifies the baseline background color in Gantt
              * @Default {#fba41c}
              */
@@ -34271,6 +34336,10 @@ declare namespace ej {
              */
             editDialogFields?: EditDialogField[];
 
+            /** Options for filtering and customizing filter actions.
+             */
+            filterSettings?: FilterSettings;
+
             /** Enables or disables the responsiveness of Gantt
              * @Default {false}
              */
@@ -34655,6 +34724,32 @@ declare namespace ej {
              */
             workWeek?: any[];
 
+            /** Specifies the view type for a project in the Gantt.
+             * @Default {ej.Gantt.ViewType.ProjectView}
+             */
+            viewType?: ej.Gantt.ViewType|string;
+
+            /** Specifies the data collection for grouping the resources in resource allocation view in Gantt.
+             * @Default {[]}
+             */
+            groupCollection?: any[];
+
+            /** Default Value
+             */
+            resourceCollectionMapping?: string;
+
+            /** Default Value
+             */
+            taskCollectionMapping?: string;
+
+            /** Default Value
+             */
+            groupIdMapping?: string;
+
+            /** Default Value
+             */
+            groupNameMapping?: string;
+
             /** Triggered for every Gantt action before its starts.
              */
             actionBegin?(e: ActionBeginEventArgs): void;
@@ -35479,6 +35574,33 @@ declare namespace ej {
             editType?: string;
         }
 
+        export interface FilterSettingsFilteredColumn {
+
+            /** Specifies the value to be filtered in Gantt.
+             */
+            value?: string;
+
+            /** Specifies the field where filtering has to be performed.
+             */
+            field?: string;
+
+            /** Specifies the predicate(and/or) value to perform filtering.
+             */
+            predicate?: string;
+
+            /** Specifies the filter condition to filtered column. See operator
+             */
+            operator?: string;
+        }
+
+        export interface FilterSettings {
+
+            /** Specifies the column collection for filtering the Gantt content on initial load
+             * @Default {[]}
+             */
+            filteredColumns?: FilterSettingsFilteredColumn[];
+        }
+
         export interface SplitterSettings {
 
             /** Specifies position of the splitter in Gantt , splitter can be placed either based on percentage values or pixel values.
@@ -35867,6 +35989,16 @@ declare namespace ej {
             TimeScale24Hours
         }
 
+
+        enum ViewType {
+
+            ///Displays the project in task view in Gantt.
+            ProjectView,
+
+            ///Displays the project in resource allocation view in Gantt.
+            ResourceView
+        }
+
     }
 
     class ReportViewer extends ej.Widget {
@@ -36620,6 +36752,141 @@ declare namespace ej {
          * @returns {void}
          */
         reorderColumn(fieldName: string, targetIndex: string): void;
+
+        /** To get the updated data source of TreeGrid.
+         * @returns {any[]}
+         */
+        getUpdatedRecords(): any[];
+
+        /** Sends request to navigate to a specific page in TreeGrid.
+         * @param {number} Pass the page index to perform paging at specified page index.
+         * @returns {void}
+         */
+        gotoPage(PageIndex: number): void;
+
+        /** To change the checkbox selection to any column.
+         * @param {string} Pass the column field name to check box selection to that column.
+         * @returns {void}
+         */
+        updateCheckboxColumn(fieldName: string): void;
+
+        /** Gets the selected cell(s) element details in TreeGrid.
+         * @returns {any[]}
+         */
+        getSelectedCells(): any[];
+
+        /** Sets the minimum responsive width for TreeGrid.
+         * @param {string} Pass the minimum responsive width, above which the TreeGrid needs to work in responsive mode.
+         * @returns {void}
+         */
+        updateResponsiveMinWidth(width: string): void;
+
+        /** To open the dialog to add new record/row in TreeGrid.
+         * @returns {void}
+         */
+        showAddDialog(): void;
+
+        /** To open the dialog to edit a row/record in TreeGrid.
+         * @param {number} Pass the index of row to be edit.
+         * @returns {void}
+         */
+        showEditDialog(Index: number): void;
+
+        /** Sets the scroll left and scroll top offsets of TreeGrid.
+         * @param {string} Pass a value to set left position of horizontal scroll bar.
+         * @param {string} Pass a value to set top position of vertical scroll bar.
+         * @returns {void}
+         */
+        scrollOffset(Left: string, Top: string): void;
+
+        /** Gets the scroll top offset of TreeGrid.
+         * @returns {number}
+         */
+        getScrollTopOffset(): number;
+
+        /** Gets the scroll left offset of TreeGrid.
+         * @returns {number}
+         */
+        getScrollLeftOffset(): number;
+
+        /** Sets the scroll top offset of TreeGrid to 0.
+         * @returns {void}
+         */
+        scrollToTop(): void;
+
+        /** Sets the scroll top offset of TreeGrid to maximum value.
+         * @returns {void}
+         */
+        scrollToBottom(): void;
+
+        /** To expand and collapse an item in TreeGrid using item’s index.
+         * @param {number} Pass the row index of row to expand/collapse.
+         * @returns {void}
+         */
+        expandCollapseRow(Index: number): void;
+
+        /** To expand all the root level nodes in TreeGrid.
+         * @returns {void}
+         */
+        expandAll(): void;
+
+        /** Show/Hide the detail row of a specific record.
+         * @param {number} Pass the row index of record to show/hide the detail row.
+         * @returns {void}
+         */
+        showHideDetailsRow(rowIndex: number): void;
+
+        /** Sends filtering request to filter a column in TreeGrid.
+         * @param {string} Pass the field name of the column.
+         * @param {string} string/integer/dateTime operator.
+         * @param {string} Pass the value to be filtered in a column.
+         * @param {string} Pass the predicate as and/or.
+         * @param {boolean} Optional pass the match case value as true/false.
+         * @param {any} Optional actualFilterValue denote the filter object of current filtered columns.
+         * @returns {void}
+         */
+        filterColumn(fieldName: string, filterOperator: string, filterValue: string, predicate: string, matchcase: boolean, actualFilterValue: any): void;
+
+        /** To change the index of the tree column in TreeGrid.
+         * @param {number} Pass the column index to make the column as treeColumnIndex.
+         * @returns {void}
+         */
+        columnIndex(Index: number): void;
+
+        /** To clear the sorting from sorted columns in TreeGrid.
+         * @returns {void}
+         */
+        clearSorting(): void;
+
+        /** Gets the column index of specific column with data source field.
+         * @param {string} Pass the column field name to get its index.
+         * @returns {number}
+         */
+        getColumnIndexByField(fieldName: string): number;
+
+        /** Gets the column field name using column header text.
+         * @param {string} Pass the column header text to get its field name.
+         * @returns {string}
+         */
+        getFieldNameByHeaderText(headerText: string): string;
+
+        /** Gets the column object of specific column.
+         * @param {string} Pass the column header text to get details of that column.
+         * @returns {any}
+         */
+        getColumnByHeaderText(headerText: string): any;
+
+        /** Clears the filter applied to a specific column.
+         * @param {string} Pass the column field name to clear filtering done in that column.
+         * @returns {void}
+         */
+        clearFilter(fieldName: string): void;
+
+        /** Gets the column object of specific column.
+         * @param {string} Pass the column field name to get details of that column.
+         * @returns {any}
+         */
+        getColumnByField(fieldName: string): any;
     }
     export namespace TreeGrid {
 
@@ -36851,6 +37118,16 @@ declare namespace ej {
              */
             detailsRowHeight?: number;
 
+            /** Gets or sets a value that indicates stacked header should be shown on TreeGrid layout when the property “stackedHeaderRows� is set.
+             * @Default {false}
+             */
+            showStackedHeader?: boolean;
+
+            /** Gets or sets an object that indicates to managing the collection of stacked header rows for the treegrid.
+             * @Default {[]}
+             */
+            stackedHeaderRows?: StackedHeaderRow[];
+
             /** Specifies the visibility of summary row
              * @Default {false}
              */
@@ -38263,6 +38540,42 @@ declare namespace ej {
             enableSelectAll?: boolean;
         }
 
+        export interface StackedHeaderRowsStackedHeaderColumn {
+
+            /** Gets or sets a value that indicates the header text for the particular stacked header column.
+             * @Default {null}
+             */
+            column?: any;
+
+            /** Gets or sets a value that indicates class to the corresponding stackedHeaderColumn.
+             * @Default {null}
+             */
+            cssClass?: string;
+
+            /** Gets or sets a value that indicates the header text for the particular stacked header column.
+             * @Default {null}
+             */
+            headerText?: string;
+
+            /** Gets or sets a value that indicates the text alignment of the corresponding headerText.
+             * @Default {ej.TextAlign.Left}
+             */
+            textAlign?: string;
+
+            /** Sets the template for tooltip for the Grid stackedHeaderColumns.
+             * @Default {null}
+             */
+            tooltip?: string;
+        }
+
+        export interface StackedHeaderRow {
+
+            /** Gets or sets a value that indicates whether to add stacked header columns into the stacked header rows
+             * @Default {[]}
+             */
+            stackedHeaderColumns?: StackedHeaderRowsStackedHeaderColumn[];
+        }
+
         export interface SummaryRowsSummaryColumn {
 
             /** Specifies the summary type to perform calculations in a corresponding summary column. See summaryType.
@@ -39019,63 +39332,79 @@ declare namespace ej {
 
         export interface AjaxCompleteEventArgs {
 
-            /** returns true if the event should be canceled; otherwise, false.
+            /** Set this option to true to cancel the event.
              */
             cancel?: boolean;
 
-            /** returns the name of the event.
+            /** Instance of the navigation drawer model object.
+             */
+            model?: ej.NavigationDrawer.Model;
+
+            /** Name of the event.
              */
             type?: string;
 
-            /** returns the model value of the control.
+            /** URL of the content.
              */
-            model?: ej.NavigationDrawer.Model;
+            URL?: string;
+
+            /** Response content.
+             */
+            data?: string;
         }
 
         export interface AjaxErrorEventArgs {
 
-            /** returns true if the event should be canceled; otherwise, false.
+            /** Set this option to true to cancel the event.
              */
             cancel?: boolean;
 
-            /** returns the name of the event.
-             */
-            type?: string;
-
-            /** returns the model value of the control.
+            /** Instance of the navigation drawer model object.
              */
             model?: ej.NavigationDrawer.Model;
 
-            /** returns the error thrown in the AJAX post.
+            /** Name of the event.
              */
-            errorThrown?: any;
+            type?: string;
 
-            /** returns the status.
+            /** URL of the content.
              */
-            textStatus?: any;
+            URL?: string;
+
+            /** Error page content.
+             */
+            responseText?: string;
+
+            /** Error code.
+             */
+            status?: number;
+
+            /** The corresponding error description.
+             */
+            statusText?: string;
         }
 
         export interface AjaxSuccessEventArgs {
 
-            /** returns true if the event should be canceled; otherwise, false.
+            /** Set this option to true to cancel the event.
              */
             cancel?: boolean;
 
-            /** returns the name of the event.
-             */
-            type?: string;
-
-            /** returns the model value of the control.
+            /** Instance of the navigation drawer model object.
              */
             model?: ej.NavigationDrawer.Model;
 
-            /** returns the AJAX current content.
+            /** Name of the event.
              */
-            content?: string;
+            type?: string;
 
-            /** returns the current URL of the AJAX post.
+            /** URL of the content.
              */
             URL?: string;
+
+            /** Response content.
+             */
+            data?: string;
         }
 
         export interface BeforeCloseEventArgs {
@@ -45056,6 +45385,12 @@ declare namespace ej {
              */
             enableAsync?: boolean;
 
+            /** Sets the data type for the ajax call used within the SpellCheck control, denoting the type of data that are expected to be retrieved from the server. The applicable values are
+             * json and jsonp.
+             * @Default {jsonp}
+             */
+            ajaxDataType?: string;
+
             /** Triggers on the success of AJAX call request.
              */
             actionSuccess?(e: ActionSuccessEventArgs): void;
@@ -45789,209 +46124,283 @@ declare namespace ej.datavisualization {
         destroy(): void;
 
         /** To export Image
+         * @param {number} for the Image
+         * @param {number} for the Image
          * @returns {void}
          */
-        exportImage(): void;
+        exportImage(fileName: number, fileType: number): void;
 
         /** To get Bar Distance From Scale in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getBarDistanceFromScale(): any;
+        getBarDistanceFromScale(scaleIndex: number, pointerIndex: number): any;
 
         /** To get Bar Pointer Value in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getBarPointerValue(): any;
+        getBarPointerValue(scaleIndex: number, pointerIndex: number): any;
 
         /** To get Bar Width in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getBarWidth(): any;
+        getBarWidth(scaleIndex: number, pointerIndex: number): any;
 
         /** To get CustomLabel Angle in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} customLabelIndex value for the Gauge
          * @returns {any}
          */
-        getCustomLabelAngle(): any;
+        getCustomLabelAngle(scaleIndex: number, customLabelIndex: number): any;
 
         /** To get CustomLabel Value in string
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} customLabelIndex value for the Gauge
          * @returns {any}
          */
-        getCustomLabelValue(): any;
+        getCustomLabelValue(scaleIndex: number, customLabelIndex: number): any;
 
         /** To get Label Angle in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getLabelAngle(): any;
+        getLabelAngle(scaleIndex: number, labelIndex: number): any;
 
         /** To get LabelPlacement in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getLabelPlacement(): any;
+        getLabelPlacement(scaleIndex: number, labelIndex: number): any;
 
         /** To get LabelStyle in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getLabelStyle(): any;
+        getLabelStyle(scaleIndex: number, labelIndex: number): any;
 
         /** To get Label XDistance From Scale in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getLabelXDistanceFromScale(): any;
+        getLabelXDistanceFromScale(scaleIndex: number, labelIndex: number): any;
 
         /** To get PointerValue in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getLabelYDistanceFromScale(): any;
+        getLabelYDistanceFromScale(scaleIndex: number, labelIndex: number): any;
 
         /** To get Major Interval Value in number
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getMajorIntervalValue(): any;
+        getMajorIntervalValue(scaleIndex: number): any;
 
         /** To get MarkerStyle in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getMarkerStyle(): any;
+        getMarkerStyle(scaleIndex: number, pointerIndex: number): any;
 
         /** To get Maximum Value in number
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getMaximumValue(): any;
+        getMaximumValue(scaleIndex: number): any;
 
         /** To get PointerValue in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getMinimumValue(): any;
+        getMinimumValue(scaleIndex: number, pointerIndex: number): any;
 
         /** To get Minor Interval Value in number
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getMinorIntervalValue(): any;
+        getMinorIntervalValue(scaleIndex: number): any;
 
         /** To get Pointer Distance From Scale in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerDistanceFromScale(): any;
+        getPointerDistanceFromScale(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerHeight in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerHeight(): any;
+        getPointerHeight(scaleIndex: number, pointerIndex: number): any;
 
         /** To get Pointer Placement in String
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerPlacement(): any;
+        getPointerPlacement(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerValue in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerValue(): any;
+        getPointerValue(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerWidth in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerWidth(): any;
+        getPointerWidth(scaleIndex: number, pointerIndex: number): any;
 
         /** To get Range Border Width in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeBorderWidth(): any;
+        getRangeBorderWidth(scaleIndex: number, rangeIndex: number): any;
 
         /** To get Range Distance From Scale in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeDistanceFromScale(): any;
+        getRangeDistanceFromScale(scaleIndex: number, rangeIndex: number): any;
 
         /** To get Range End Value in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeEndValue(): any;
+        getRangeEndValue(scaleIndex: number, rangeIndex: number): any;
 
         /** To get Range End Width in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeEndWidth(): any;
+        getRangeEndWidth(scaleIndex: number, rangeIndex: number): any;
 
         /** To get Range Position in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangePosition(): any;
+        getRangePosition(scaleIndex: number, rangeIndex: number): any;
 
         /** To get Range Start Value in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeStartValue(): any;
+        getRangeStartValue(scaleIndex: number, rangeIndex: number): any;
 
         /** To get Range Start Width in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeStartWidth(): any;
+        getRangeStartWidth(scaleIndex: number, rangeIndex: number): any;
 
         /** To get ScaleBarLength in number
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleBarLength(): any;
+        getScaleBarLength(scaleIndex: number): any;
 
         /** To get Scale Bar Size in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getScaleBarSize(): any;
+        getScaleBarSize(scaleIndex: number, pointerIndex: number): any;
 
         /** To get Scale Border Width in number
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleBorderWidth(): any;
+        getScaleBorderWidth(scaleIndex: number): any;
 
         /** To get Scale Direction in number
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleDirection(): any;
+        getScaleDirection(scaleIndex: number): any;
 
         /** To get Scale Location in object
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleLocation(): any;
+        getScaleLocation(scaleIndex: number): any;
 
         /** To get Scale Style in string
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleStyle(): any;
+        getScaleStyle(scaleIndex: number): any;
 
         /** To get Tick Angle in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getTickAngle(): any;
+        getTickAngle(scaleIndex: number, tickIndex: number): any;
 
         /** To get Tick Height in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getTickHeight(): any;
+        getTickHeight(scaleIndex: number, tickIndex: number): any;
 
         /** To get getTickPlacement in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getTickPlacement(): any;
+        getTickPlacement(scaleIndex: number, tickIndex: number): any;
 
         /** To get Tick Style in string
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getTickStyle(): any;
+        getTickStyle(scaleIndex: number, tickIndex: number): any;
 
         /** To get Tick Width in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getTickWidth(): any;
+        getTickWidth(scaleIndex: number, tickIndex: number): any;
 
         /** To get get Tick XDistance From Scale in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getTickXDistanceFromScale(): any;
+        getTickXDistanceFromScale(scaleIndex: number, tickIndex: number): any;
 
         /** To get Tick YDistance From Scale in number
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
          * @returns {any}
          */
-        getTickYDistanceFromScale(): any;
+        getTickYDistanceFromScale(scaleIndex: number, tickIndex: number): any;
 
         /** Specifies the scales.
          * @returns {void}
@@ -45999,204 +46408,314 @@ declare namespace ej.datavisualization {
         scales(): void;
 
         /** To set setBarDistanceFromScale
+         * @param {number} scaleIndex,value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} Bar DistanceFromScale value for Gauge
          * @returns {void}
          */
-        setBarDistanceFromScale(): void;
+        setBarDistanceFromScale(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set setBarPointerValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} Bar Pointer Value for Gauge
          * @returns {void}
          */
-        setBarPointerValue(): void;
+        setBarPointerValue(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set setBarWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} Bar Width for Gauge
          * @returns {void}
          */
-        setBarWidth(): void;
+        setBarWidth(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set setCustomLabelAngle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} customLabelIndex value for the Gauge
+         * @param {number} Custom Label Angle for Gauge
          * @returns {void}
          */
-        setCustomLabelAngle(): void;
+        setCustomLabelAngle(scaleIndex: number, customLabelIndex: number, value: number): void;
 
         /** To set setCustomLabelValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} customLabelIndex value for the Gauge
+         * @param {number} CustomLabel value for Gauge
          * @returns {void}
          */
-        setCustomLabelValue(): void;
+        setCustomLabelValue(scaleIndex: number, customLabelIndex: number, value: number): void;
 
         /** To set setLabelAngle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Label Angle for Gauge
          * @returns {void}
          */
-        setLabelAngle(): void;
+        setLabelAngle(scaleIndex: number, labelIndex: number, angle: number): void;
 
         /** To set setLabelPlacement
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Label Placement for Gauge
          * @returns {void}
          */
-        setLabelPlacement(): void;
+        setLabelPlacement(scaleIndex: number, labelIndex: number, value: number): void;
 
         /** To set setLabelStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {string} Label Style for Gauge
          * @returns {void}
          */
-        setLabelStyle(): void;
+        setLabelStyle(scaleIndex: number, labelIndex: number, value: string): void;
 
         /** To set setLabelXDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Label XDistance From Scale for Gauge
          * @returns {void}
          */
-        setLabelXDistanceFromScale(): void;
+        setLabelXDistanceFromScale(scaleIndex: number, labelIndex: number, value: number): void;
 
         /** To set setLabelYDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Label YDistance From Scale for Gauge
          * @returns {void}
          */
-        setLabelYDistanceFromScale(): void;
+        setLabelYDistanceFromScale(scaleIndex: number, labelIndex: number, value: number): void;
 
         /** To set setMajorIntervalValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} Major Interval Value for Gauge
          * @returns {void}
          */
-        setMajorIntervalValue(): void;
+        setMajorIntervalValue(scaleIndex: number, value: number): void;
 
         /** To set setMarkerStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {string} marker Style for Gauge
          * @returns {void}
          */
-        setMarkerStyle(): void;
+        setMarkerStyle(scaleIndex: number, pointerIndex: number, value: string): void;
 
         /** To set setMaximumValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} MaximumValue for Gauge
          * @returns {void}
          */
-        setMaximumValue(): void;
+        setMaximumValue(scaleIndex: number, value: number): void;
 
         /** To set setMinimumValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} MinimumValue for Gauge
          * @returns {void}
          */
-        setMinimumValue(): void;
+        setMinimumValue(scaleIndex: number, value: number): void;
 
         /** To set setMinorIntervalValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} Minor Interval Value for Gauge
          * @returns {void}
          */
-        setMinorIntervalValue(): void;
+        setMinorIntervalValue(scaleIndex: number, value: number): void;
 
         /** To set setPointerDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} for Gauge
          * @returns {void}
          */
-        setPointerDistanceFromScale(): void;
+        setPointerDistanceFromScale(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerHeight
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} for Gauge
          * @returns {void}
          */
-        setPointerHeight(): void;
+        setPointerHeight(scaleIndex: number, pointerIndex: number, height: number): void;
 
         /** To set setPointerPlacement
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} pointer placement for Gauge
          * @returns {void}
          */
-        setPointerPlacement(): void;
+        setPointerPlacement(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} Pointer value for Gauge
          * @returns {void}
          */
-        setPointerValue(): void;
+        setPointerValue(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
+         * @param {number} Pointer width for Gauge
          * @returns {void}
          */
-        setPointerWidth(): void;
+        setPointerWidth(scaleIndex: number, pointerIndex: number, width: number): void;
 
         /** To set setRangeBorderWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
+         * @param {number} Range Border Width for Gauge
          * @returns {void}
          */
-        setRangeBorderWidth(): void;
+        setRangeBorderWidth(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set setRangeDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
+         * @param {number} Range Distance FromScale for Gauge
          * @returns {void}
          */
-        setRangeDistanceFromScale(): void;
+        setRangeDistanceFromScale(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set setRangeEndValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
+         * @param {number} Range end value for Gauge
          * @returns {void}
          */
-        setRangeEndValue(): void;
+        setRangeEndValue(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set setRangeEndWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
+         * @param {number} Range End Width for Gauge
          * @returns {void}
          */
-        setRangeEndWidth(): void;
+        setRangeEndWidth(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set setRangePosition
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
+         * @param {number} Range Position for Gauge
          * @returns {void}
          */
-        setRangePosition(): void;
+        setRangePosition(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set setRangeStartValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
+         * @param {number} range start value for Gauge
          * @returns {void}
          */
-        setRangeStartValue(): void;
+        setRangeStartValue(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set setRangeStartWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
+         * @param {number} Range Start Width for Gauge
          * @returns {void}
          */
-        setRangeStartWidth(): void;
+        setRangeStartWidth(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set setScaleBarLength
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} Scale Bar Length for Gauge
          * @returns {void}
          */
-        setScaleBarLength(): void;
+        setScaleBarLength(scaleIndex: number, value: number): void;
 
         /** To set setScaleBarSize
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} ScaleBarSize for Gauge
          * @returns {void}
          */
-        setScaleBarSize(): void;
+        setScaleBarSize(scaleIndex: number, value: number): void;
 
         /** To set setScaleBorderWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} Scale Border Width for Gauge
          * @returns {void}
          */
-        setScaleBorderWidth(): void;
+        setScaleBorderWidth(scaleIndex: number, value: number): void;
 
         /** To set setScaleDirection
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} Scale Direction for Gauge
          * @returns {void}
          */
-        setScaleDirection(): void;
+        setScaleDirection(scaleIndex: number, value: number): void;
 
         /** To set setScaleLocation
+         * @param {number} scaleIndex value for the Gauge
+         * @param {any} Scale position for Gauge
          * @returns {void}
          */
-        setScaleLocation(): void;
+        setScaleLocation(scaleIndex: number, value: any): void;
 
         /** To set setScaleStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} for Gauge
          * @returns {void}
          */
-        setScaleStyle(): void;
+        setScaleStyle(scaleIndex: number, value: number): void;
 
         /** To set setTickAngle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Tick Angle for Gauge
          * @returns {void}
          */
-        setTickAngle(): void;
+        setTickAngle(scaleIndex: number, tickIndex: number, angle: number): void;
 
         /** To set setTickHeight
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Tick Height for Gauge
          * @returns {void}
          */
-        setTickHeight(): void;
+        setTickHeight(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set setTickPlacement
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Tick Placement for Gauge
          * @returns {void}
          */
-        setTickPlacement(): void;
+        setTickPlacement(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set setTickStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {string} Tick Style for Gauge
          * @returns {void}
          */
-        setTickStyle(): void;
+        setTickStyle(scaleIndex: number, tickIndex: number, value: string): void;
 
         /** To set setTickWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Tick Width for Gauge
          * @returns {void}
          */
-        setTickWidth(): void;
+        setTickWidth(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set setTickXDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Tick XDistance From Scale for Gauge
          * @returns {void}
          */
-        setTickXDistanceFromScale(): void;
+        setTickXDistanceFromScale(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set setTickYDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} value for the Gauge
+         * @param {number} Tick YDistance From Scale for Gauge
          * @returns {void}
          */
-        setTickYDistanceFromScale(): void;
+        setTickYDistanceFromScale(scaleIndex: number, tickIndex: number, value: number): void;
     }
     export namespace LinearGauge {
 
@@ -47833,419 +48352,601 @@ declare namespace ej.datavisualization {
         destroy(): void;
 
         /** To export Image
+         * @param {string} fileName for the Image
+         * @param {string} fileType for the Image
          * @returns {boolean}
          */
-        exportImage(): boolean;
+        exportImage(fileName: string, fileType: string): boolean;
 
         /** To get BackNeedleLength
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getBackNeedleLength(): any;
+        getBackNeedleLength(scaleIndex: number, pointerIndex: number): any;
 
         /** To get CustomLabelAngle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} customLabelIndex value for the Gauge
          * @returns {any}
          */
-        getCustomLabelAngle(): any;
+        getCustomLabelAngle(scaleIndex: number, customLabelIndex: number): any;
 
         /** To get CustomLabelValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} customLabelIndex value for the Gauge
          * @returns {any}
          */
-        getCustomLabelValue(): any;
+        getCustomLabelValue(scaleIndex: number, customLabelIndex: number): any;
 
         /** To get LabelAngle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} labelIndex value for the Gauge
          * @returns {any}
          */
-        getLabelAngle(): any;
+        getLabelAngle(scaleIndex: number, labelIndex: number): any;
 
         /** To get LabelDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} labelIndex value for the Gauge
          * @returns {any}
          */
-        getLabelDistanceFromScale(): any;
+        getLabelDistanceFromScale(scaleIndex: number, labelIndex: number): any;
 
         /** To get LabelPlacement
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} labelIndex value for the Gauge
          * @returns {any}
          */
-        getLabelPlacement(): any;
+        getLabelPlacement(scaleIndex: number, labelIndex: number): any;
 
         /** To get LabelStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} labelIndex value for the Gauge
          * @returns {any}
          */
-        getLabelStyle(): any;
+        getLabelStyle(scaleIndex: number, labelIndex: number): any;
 
         /** To get MajorIntervalValue
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getMajorIntervalValue(): any;
+        getMajorIntervalValue(scaleIndex: number): any;
 
         /** To get MarkerDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getMarkerDistanceFromScale(): any;
+        getMarkerDistanceFromScale(scaleIndex: number, pointerIndex: number): any;
 
         /** To get MarkerStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getMarkerStyle(): any;
+        getMarkerStyle(scaleIndex: number, pointerIndex: number): any;
 
         /** To get MaximumValue
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getMaximumValue(): any;
+        getMaximumValue(scaleIndex: number): any;
 
         /** To get MinimumValue
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getMinimumValue(): any;
+        getMinimumValue(scaleIndex: number): any;
 
         /** To get MinorIntervalValue
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getMinorIntervalValue(): any;
+        getMinorIntervalValue(scaleIndex: number): any;
 
         /** To get NeedleStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getNeedleStyle(): any;
+        getNeedleStyle(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerCapBorderWidth
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getPointerCapBorderWidth(): any;
+        getPointerCapBorderWidth(scaleIndex: number): any;
 
         /** To get PointerCapRadius
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getPointerCapRadius(): any;
+        getPointerCapRadius(scaleIndex: number): any;
 
         /** To get PointerLength
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerLength(): any;
+        getPointerLength(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerNeedleType
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerNeedleType(): any;
+        getPointerNeedleType(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerPlacement
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerPlacement(): any;
+        getPointerPlacement(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerValue(): any;
+        getPointerValue(scaleIndex: number, pointerIndex: number): any;
 
         /** To get PointerWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} pointerIndex value for the Gauge
          * @returns {any}
          */
-        getPointerWidth(): any;
+        getPointerWidth(scaleIndex: number, pointerIndex: number): any;
 
         /** To get RangeBorderWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeBorderWidth(): any;
+        getRangeBorderWidth(scaleIndex: number, rangeIndex: number): any;
 
         /** To get RangeDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeDistanceFromScale(): any;
+        getRangeDistanceFromScale(scaleIndex: number, rangeIndex: number): any;
 
         /** To get RangeEndValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeEndValue(): any;
+        getRangeEndValue(scaleIndex: number, rangeIndex: number): any;
 
         /** To get RangePosition
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangePosition(): any;
+        getRangePosition(scaleIndex: number, rangeIndex: number): any;
 
         /** To get RangeSize
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeSize(): any;
+        getRangeSize(scaleIndex: number, rangeIndex: number): any;
 
         /** To get RangeStartValue
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} rangeIndex value for the Gauge
          * @returns {any}
          */
-        getRangeStartValue(): any;
+        getRangeStartValue(scaleIndex: number, rangeIndex: number): any;
 
         /** To get ScaleBarSize
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleBarSize(): any;
+        getScaleBarSize(scaleIndex: number): any;
 
         /** To get ScaleBorderWidth
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleBorderWidth(): any;
+        getScaleBorderWidth(scaleIndex: number): any;
 
         /** To get ScaleDirection
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleDirection(): any;
+        getScaleDirection(scaleIndex: number): any;
 
         /** To get ScaleRadius
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getScaleRadius(): any;
+        getScaleRadius(scaleIndex: number): any;
 
         /** To get StartAngle
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getStartAngle(): any;
+        getStartAngle(scaleIndex: number): any;
 
         /** To get SubGaugeLocation
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} GaugeIndex value for the Gauge
          * @returns {any}
          */
-        getSubGaugeLocation(): any;
+        getSubGaugeLocation(scaleIndex: number, GaugeIndex: number): any;
 
         /** To get SweepAngle
+         * @param {number} scaleIndex value for the Gauge
          * @returns {any}
          */
-        getSweepAngle(): any;
+        getSweepAngle(scaleIndex: number): any;
 
         /** To get TickAngle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} tickIndex value for the Gauge
          * @returns {any}
          */
-        getTickAngle(): any;
+        getTickAngle(scaleIndex: number, tickIndex: number): any;
 
         /** To get TickDistanceFromScale
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} tickIndex value for the Gauge
          * @returns {any}
          */
-        getTickDistanceFromScale(): any;
+        getTickDistanceFromScale(scaleIndex: number, tickIndex: number): any;
 
         /** To get TickHeight
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} labelIndex value for the Gauge
          * @returns {any}
          */
-        getTickHeight(): any;
+        getTickHeight(scaleIndex: number, labelIndex: number): any;
 
         /** To get TickPlacement
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} tickIndex value for the Gauge
          * @returns {any}
          */
-        getTickPlacement(): any;
+        getTickPlacement(scaleIndex: number, tickIndex: number): any;
 
         /** To get TickStyle
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} tickIndex value for the Gauge
          * @returns {any}
          */
-        getTickStyle(): any;
+        getTickStyle(scaleIndex: number, tickIndex: number): any;
 
         /** To get TickWidth
+         * @param {number} scaleIndex value for the Gauge
+         * @param {number} tickIndex value for the Gauge
          * @returns {any}
          */
-        getTickWidth(): any;
+        getTickWidth(scaleIndex: number, tickIndex: number): any;
 
         /** To set includeFirstValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} labelIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        includeFirstValue(): void;
+        includeFirstValue(scaleIndex: number, labelIndex: number, value: number): void;
 
         /** Switching the redraw option for the gauge
+         * @param {string} redraw value for the gauge
          * @returns {void}
          */
-        redraw(): void;
+        redraw(value: string): void;
 
         /** To set BackNeedleLength
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setBackNeedleLength(): void;
+        setBackNeedleLength(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set CustomLabelAngle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} customLabelIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setCustomLabelAngle(): void;
+        setCustomLabelAngle(scaleIndex: number, customLabelIndex: number, value: number): void;
 
         /** To set CustomLabelValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} customLabelIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setCustomLabelValue(): void;
+        setCustomLabelValue(scaleIndex: number, customLabelIndex: number, value: number): void;
 
         /** To set LabelAngle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} labelIndex value for the gauge
+         * @param {number} angle value for the gauge
          * @returns {void}
          */
-        setLabelAngle(): void;
+        setLabelAngle(scaleIndex: number, labelIndex: number, angle: number): void;
 
         /** To set LabelDistanceFromScale
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} labelIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setLabelDistanceFromScale(): void;
+        setLabelDistanceFromScale(scaleIndex: number, labelIndex: number, value: number): void;
 
         /** To set LabelPlacement
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} labelIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setLabelPlacement(): void;
+        setLabelPlacement(scaleIndex: number, labelIndex: number, value: number): void;
 
         /** To set LabelStyle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} labelIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setLabelStyle(): void;
+        setLabelStyle(scaleIndex: number, labelIndex: number, value: number): void;
 
         /** To set MajorIntervalValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setMajorIntervalValue(): void;
+        setMajorIntervalValue(scaleIndex: number, value: number): void;
 
         /** To set MarkerDistanceFromScale
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setMarkerDistanceFromScale(): void;
+        setMarkerDistanceFromScale(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set MarkerStyle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setMarkerStyle(): void;
+        setMarkerStyle(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set MaximumValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setMaximumValue(): void;
+        setMaximumValue(scaleIndex: number, value: number): void;
 
         /** To set MinimumValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setMinimumValue(): void;
+        setMinimumValue(scaleIndex: number, value: number): void;
 
         /** To set MinorIntervalValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setMinorIntervalValue(): void;
+        setMinorIntervalValue(scaleIndex: number, value: number): void;
 
         /** To set NeedleStyle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setNeedleStyle(): void;
+        setNeedleStyle(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerCapBorderWidth
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setPointerCapBorderWidth(): void;
+        setPointerCapBorderWidth(scaleIndex: number, value: number): void;
 
         /** To set PointerCapRadius
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setPointerCapRadius(): void;
+        setPointerCapRadius(scaleIndex: number, value: number): void;
 
         /** To set PointerLength
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setPointerLength(): void;
+        setPointerLength(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerNeedleType
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setPointerNeedleType(): void;
+        setPointerNeedleType(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerPlacement
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setPointerPlacement(): void;
+        setPointerPlacement(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setPointerValue(): void;
+        setPointerValue(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set PointerWidth
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} pointerIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setPointerWidth(): void;
+        setPointerWidth(scaleIndex: number, pointerIndex: number, value: number): void;
 
         /** To set RangeBorderWidth
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} rangeIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setRangeBorderWidth(): void;
+        setRangeBorderWidth(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set RangeDistanceFromScale
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} rangeIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setRangeDistanceFromScale(): void;
+        setRangeDistanceFromScale(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set RangeEndValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} rangeIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setRangeEndValue(): void;
+        setRangeEndValue(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set RangePosition
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} rangeIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setRangePosition(): void;
+        setRangePosition(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set RangeSize
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} rangeIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setRangeSize(): void;
+        setRangeSize(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set RangeStartValue
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} rangeIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setRangeStartValue(): void;
+        setRangeStartValue(scaleIndex: number, rangeIndex: number, value: number): void;
 
         /** To set ScaleBarSize
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setScaleBarSize(): void;
+        setScaleBarSize(scaleIndex: number, value: number): void;
 
         /** To set ScaleBorderWidth
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setScaleBorderWidth(): void;
+        setScaleBorderWidth(scaleIndex: number, value: number): void;
 
         /** To set ScaleDirection
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setScaleDirection(): void;
+        setScaleDirection(scaleIndex: number, value: number): void;
 
         /** To set ScaleRadius
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setScaleRadius(): void;
+        setScaleRadius(scaleIndex: number, value: number): void;
 
         /** To set StartAngle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setStartAngle(): void;
+        setStartAngle(scaleIndex: number, value: number): void;
 
         /** To set SubGaugeLocation
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} GaugeIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setSubGaugeLocation(): void;
+        setSubGaugeLocation(scaleIndex: number, GaugeIndex: number, value: number): void;
 
         /** To set SweepAngle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setSweepAngle(): void;
+        setSweepAngle(scaleIndex: number, value: number): void;
 
         /** To set TickAngle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} tickIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setTickAngle(): void;
+        setTickAngle(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set TickDistanceFromScale
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} tickIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setTickDistanceFromScale(): void;
+        setTickDistanceFromScale(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set TickHeight
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} tickIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setTickHeight(): void;
+        setTickHeight(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set TickPlacement
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} tickIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setTickPlacement(): void;
+        setTickPlacement(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set TickStyle
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} tickIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setTickStyle(): void;
+        setTickStyle(scaleIndex: number, tickIndex: number, value: number): void;
 
         /** To set TickWidth
+         * @param {number} scaleIndex value for the gauge
+         * @param {number} tickIndex value for the gauge
+         * @param {number} value for the gauge
          * @returns {void}
          */
-        setTickWidth(): void;
+        setTickWidth(scaleIndex: number, tickIndex: number, value: number): void;
     }
     export namespace CircularGauge {
 
@@ -50694,7 +51395,7 @@ declare namespace ej.datavisualization {
 
             /** Options to customize the left, right, top and bottom margins of chart area.
              */
-            Margin?: any;
+            margin?: Margin;
 
             /** Perspective angle of the 3D view. Chart appears closer when perspective angle is decreased, and distant when perspective angle is increased.This property is applicable only when
              * 3D view is enabled
@@ -52245,6 +52946,11 @@ declare namespace ej.datavisualization {
              */
             enableContrastColor?: boolean;
 
+            /** Displays the partially visible labels inside the chart Area
+             * @Default {false}
+             */
+            showEdgeLabels?: boolean;
+
             /** Options for customizing the border of the data label.
              */
             border?: CommonSeriesOptionsMarkerDataLabelBorder;
@@ -53790,6 +54496,29 @@ declare namespace ej.datavisualization {
             toggleSeriesVisibility?: boolean;
         }
 
+        export interface Margin {
+
+            /** Spacing for the left margin of chart area. Setting positive value decreases the width of the chart area from left side.
+             * @Default {10}
+             */
+            left?: number;
+
+            /** Spacing for the right margin of chart area. Setting positive value decreases the width of the chart area from right side.
+             * @Default {10}
+             */
+            right?: number;
+
+            /** Spacing for the top margin of chart area. Setting positive value decreases the height of the chart area from the top.
+             * @Default {10}
+             */
+            top?: number;
+
+            /** Spacing for the bottom margin of the chart area. Setting positive value decreases the height of the chart area from the bottom.
+             * @Default {10}
+             */
+            bottom?: number;
+        }
+
         export interface PrimaryXAxisAlternateGridBandEven {
 
             /** Fill color for the even grid bands.
@@ -56217,6 +56946,11 @@ declare namespace ej.datavisualization {
              */
             enableContrastColor?: boolean;
 
+            /** Displays the partially visible data labels inside the chart Area.
+             * @Default {false}
+             */
+            showEdgeLabels?: boolean;
+
             /** Options for customizing the border of the data label.
              */
             border?: SeriesMarkerDataLabelBorder;
@@ -59604,14 +60338,18 @@ declare namespace ej.datavisualization {
         redraw(): void;
 
         /** To set the value for comparative measure in bullet graph.
+         * @param {number} value for the graph
+         * @param {number} value for the graph
          * @returns {void}
          */
-        setComparativeMeasureSymbol(): void;
+        setComparativeMeasureSymbol(index: number, measure: number): void;
 
         /** To set the value for feature measure bar.
+         * @param {number} value for the graph
+         * @param {number} value for the graph
          * @returns {void}
          */
-        setFeatureMeasureBarValue(): void;
+        setFeatureMeasureBarValue(index: number, measure: number): void;
     }
     export namespace BulletGraph {
 
@@ -62830,6 +63568,13 @@ declare namespace ej.datavisualization {
          */
         exportDiagram(options?: Diagram.Options): string;
 
+        /** The exportImage method is used to export the image passed through argument with different image format and exporting options as like exportDiagram method.
+         * @param {string} pass the base64String image to be exported.
+         * @param {Diagram.Options} options to export the desired region of diagram to the desired formats.
+         * @returns {string}
+         */
+        exportImage(image: string, options?: Diagram.Options): string;
+
         /** Read a node/connector object by its name
          * @param {string} name of the node/connector that is to be identified
          * @returns {any}
@@ -62844,6 +63589,18 @@ declare namespace ej.datavisualization {
          */
         fitToPage(mode?: ej.datavisualization.Diagram.FitMode, region?: ej.datavisualization.Diagram.Region, margin?: any): void;
 
+        /** Get the diagram DOM element as a string along with dependent stylesheets.
+         * @param {any[]} If its specified, will get the diagram DOM element along with specified stylesheet references. Please note that you have to define absolute path for local CSS file.
+         * If not specified, will get the diagram content along with all stylesheets loaded in the document.
+         * @returns {void}
+         */
+        getDiagramContent(styleSheets?: any[]): void;
+
+        /** Get the bounds of the diagram.
+         * @returns {void}
+         */
+        getDiagramBounds(): void;
+
         /** Group the selected nodes and connectors
          * @returns {void}
          */
@@ -62888,9 +63645,17 @@ declare namespace ej.datavisualization {
         paste(object?: any, rename?: boolean): void;
 
         /** Print the diagram as image
+         * @param {Diagram.Options} options to print the desired region of diagram and print the diagram in multiple pages.
          * @returns {void}
          */
-        print(): void;
+        print(options?: Diagram.Options): void;
+
+        /** The printImage method is used to print the image passed through argument with desired region and multiple pages as like print method.
+         * @param {string} pass the base64String image to be printed.
+         * @param {Diagram.Options} options to export the desired region of diagram to the desired formats.
+         * @returns {string}
+         */
+        printImage(image: string, options?: Diagram.Options): string;
 
         /** Restore the last action that was reverted
          * @returns {void}
@@ -63098,6 +63863,119 @@ declare namespace ej.datavisualization {
             /** to resize the diagram content to fill its allocated space.
              */
             stretch?: ej.datavisualization.Diagram.Stretch;
+
+            /** to export the diagram into multiple pages
+             */
+            multiplePage?: boolean;
+
+            /** to set the page width of the diagram while exporting the diagram into multiple pages.
+             */
+            pageWidth?: number;
+
+            /** to set the page height of the diagram while exporting the diagram into multiple pages.
+             */
+            pageHeight?: number;
+
+            /** to sets the orientation of the page.
+             */
+            pageOrientation?: ej.datavisualization.Diagram.PageOrientations;
+        }
+
+        export interface Options {
+
+            /** name of the file to be downloaded.
+             */
+            fileName?: string;
+
+            /** format of the exported file/data.
+             */
+            format?: ej.datavisualization.Diagram.FileFormats;
+
+            /** to set the region of the diagram to be exported.
+             */
+            region?: ej.datavisualization.Diagram.Region;
+
+            /** to export any custom region of diagram.
+             */
+            bounds?: any;
+
+            /** to set margin to the exported data.
+             */
+            margin?: any;
+
+            /** to export the diagram into multiple pages
+             */
+            multiplePage?: boolean;
+
+            /** to set the page width of the diagram while exporting the diagram into multiple pages.
+             */
+            pageWidth?: number;
+
+            /** to set the page height of the diagram while exporting the diagram into multiple pages.
+             */
+            pageHeight?: number;
+
+            /** to sets the orientation of the page.
+             */
+            pageOrientation?: ej.datavisualization.Diagram.PageOrientations;
+        }
+
+        export interface Options {
+
+            /** to set the region of the diagram to be printed.
+             */
+            region?: ej.datavisualization.Diagram.Region;
+
+            /** to print any custom region of diagram.
+             */
+            bounds?: any;
+
+            /** to resize the diagram content to fill its allocated space and printed.
+             */
+            stretch?: ej.datavisualization.Diagram.Stretch;
+
+            /** to print the diagram into multiple pages
+             */
+            multiplePage?: boolean;
+
+            /** to set the page width of the diagram while printing the diagram into multiple pages.
+             */
+            pageWidth?: number;
+
+            /** to set the page height of the diagram while printing the diagram into multiple pages.
+             */
+            pageHeight?: number;
+
+            /** to sets the orientation of the page.
+             */
+            pageOrientation?: ej.datavisualization.Diagram.PageOrientations;
+        }
+
+        export interface Options {
+
+            /** to set the region of the diagram to be printed.
+             */
+            region?: ej.datavisualization.Diagram.Region;
+
+            /** to print any custom region of diagram.
+             */
+            bounds?: any;
+
+            /** to export the diagram into multiple pages
+             */
+            multiplePage?: boolean;
+
+            /** to set the page width of the diagram while printing the diagram into multiple pages.
+             */
+            pageWidth?: number;
+
+            /** to set the page height of the diagram while printing the diagram into multiple pages.
+             */
+            pageHeight?: number;
+
+            /** to sets the orientation of the page.
+             */
+            pageOrientation?: ej.datavisualization.Diagram.PageOrientations;
         }
 
         export interface Zoom {
@@ -63228,6 +64106,10 @@ declare namespace ej.datavisualization {
              */
             showTooltip?: boolean;
 
+            /** Defines diagram serialization properties that would defines how the serialization content would be.
+             */
+            serializationSettings?: SerializationSettings;
+
             /** Defines the properties of the both the horizontal and vertical gauge to measure the diagram area.
              */
             rulerSettings?: RulerSettings;
@@ -63375,6 +64257,10 @@ declare namespace ej.datavisualization {
             /** Triggered when the diagram is rendered completely.
              */
             create?(e: CreateEventArgs): void;
+
+            /** Used to decide on the action on Diagramming elements at runtime.
+             */
+            setTool?(e: SetToolEventArgs): void;
         }
 
         export interface AutoScrollChangeEventArgs {
@@ -64144,6 +65030,17 @@ declare namespace ej.datavisualization {
             diagramId?: string;
         }
 
+        export interface SetToolEventArgs {
+
+            /** Returns the port when mouse move over on it
+             */
+            source?: any;
+
+            /** Defines the tool to be activated.
+             */
+            action?: ej.datavisualization.Diagram.ActiveTool;
+        }
+
         export interface BackgroundImage {
 
             /** Defines how to align the background image over the diagram area.
@@ -64266,6 +65163,11 @@ declare namespace ej.datavisualization {
              */
             boundaryConstraints?: boolean;
 
+            /** Enables or disables the default behaviors of the label.
+             * @Default {ej.datavisualization.Diagram.LabelConstraints.None}
+             */
+            constraints?: ej.datavisualization.Diagram.LabelConstraints|string;
+
             /** Sets the fill color of the text area
              * @Default {transparent}
              */
@@ -64286,6 +65188,11 @@ declare namespace ej.datavisualization {
              */
             fontSize?: number;
 
+            /** Sets the height of the label(the maximum value of label height and the connector height will be considered as label height)
+             * @Default {0}
+             */
+            height?: number;
+
             /** Sets the horizontal alignment of the label.
              * @Default {ej.datavisualization.Diagram.HorizontalAlignment.Center}
              */
@@ -65068,6 +65975,21 @@ declare namespace ej.datavisualization {
              * @Default {30}
              */
             root?: string;
+
+            /** Defines how long edges should be, ideally. This will be the resting length for the springs.
+             * @Default {100}
+             */
+            springLength?: number;
+
+            /** Defines how long edges should be, ideally. This will be the resting length for the springs.
+             * @Default {0.442}
+             */
+            springFactor?: number;
+
+            /** Defines how long edges should be, ideally. This will be the resting length for the springs.
+             * @Default {1000}
+             */
+            maxIteration?: number;
         }
 
         export interface NodesAnnotation {
@@ -65291,11 +66213,6 @@ declare namespace ej.datavisualization {
              */
             stops?: any[];
 
-            /** Defines the type of gradient
-             * @Default {linear}
-             */
-            type?: string;
-
             /** Defines the left most position(relative to node) of the rectangular region that needs to be painted
              * @Default {0}
              */
@@ -65319,11 +66236,6 @@ declare namespace ej.datavisualization {
 
         export interface NodesGradientRadialGradient {
 
-            /** Defines the type of gradient
-             * @Default {radial}
-             */
-            type?: string;
-
             /** Defines the position of the outermost circle
              * @Default {0}
              */
@@ -65438,6 +66350,11 @@ declare namespace ej.datavisualization {
              */
             borderWidth?: number;
 
+            /** Enables or disables the default behaviors of the label.
+             * @Default {ej.datavisualization.Diagram.LabelConstraints.None}
+             */
+            constraints?: ej.datavisualization.Diagram.LabelConstraints|string;
+
             /** Sets the fill color of the text area
              * @Default {transparent}
              */
@@ -65458,6 +66375,11 @@ declare namespace ej.datavisualization {
              */
             fontSize?: number;
 
+            /** Sets the height of the label(the maximum value of label height and the node height will be considered as label height)
+             * @Default {0}
+             */
+            height?: number;
+
             /** Sets the horizontal alignment of the label.
              * @Default {ej.datavisualization.Diagram.HorizontalAlignment.Center}
              */
@@ -65733,6 +66655,10 @@ declare namespace ej.datavisualization {
              * @Default {ej.datavisualization.Diagram.PortVisibility.Default}
              */
             visibility?: ej.datavisualization.Diagram.PortVisibility|string;
+
+            /** Sets the name of the node which contains this port.
+             */
+            parent?: string;
         }
 
         export interface NodesShadow {
@@ -65753,6 +66679,38 @@ declare namespace ej.datavisualization {
             opacity?: number;
         }
 
+        export interface NodesSubProcessEvent {
+
+            /** Sets the type of the event by which the sub-process will be triggered
+             * @Default {ej.datavisualization.Diagram.BPMNEvents.Start}
+             */
+            event?: ej.datavisualization.Diagram.BPMNEvents|string;
+
+            /** Sets the fraction/ratio(relative to parent) that defines the position of the event shape
+             * @Default {ej.datavisualization.Diagram.Point(0.5, 0.5)}
+             */
+            offset?: any;
+
+            /** Sets the name of the BPMN event shape.
+             */
+            name?: string;
+
+            /** Defines the type of the event trigger
+             * @Default {ej.datavisualization.Diagram.BPMNTriggers.Message}
+             */
+            trigger?: ej.datavisualization.Diagram.BPMNTriggers|string;
+
+            /** An array of objects where each object represents a port
+             * @Default {[]}
+             */
+            ports?: any[];
+
+            /** A collection of objects where each object represents a label
+             * @Default {[]}
+             */
+            labels?: any[];
+        }
+
         export interface NodesSubProcess {
 
             /** Defines whether the BPMN sub process is without any prescribed order or not
@@ -65782,7 +66740,7 @@ declare namespace ej.datavisualization {
 
             /** Defines the collection of events that need to be appended with BPMN Sub-Process
              */
-            events?: any[];
+            events?: NodesSubProcessEvent[];
 
             /** Defines the loop type of a sub process.
              * @Default {ej.datavisualization.Diagram.BPMNLoops.None}
@@ -65826,6 +66784,10 @@ declare namespace ej.datavisualization {
              * @Default {ej.datavisualization.Diagram.BPMNTasks.None}
              */
             type?: ej.datavisualization.Diagram.BPMNTasks|string;
+
+            /** Defines the collection of events that need to be appended with BPMN tasks
+             */
+            events?: any[];
         }
 
         export interface Node {
@@ -66299,6 +67261,16 @@ declare namespace ej.datavisualization {
 
         export interface SelectedItemsUserHandle {
 
+            /** Sets the horizontal alignment of the user handle
+             * @Default {ej.datavisualization.Diagram.HorizontalAlignment.Center}
+             */
+            horizontalAlignment?: ej.datavisualization.Diagram.HorizontalAlignment|string;
+
+            /** To set the margin of the user handle
+             * @Default {ej.datavisualization.Diagram.Margin()}
+             */
+            margin?: any;
+
             /** Defines the name of the user handle
              */
             name?: string;
@@ -66318,6 +67290,11 @@ declare namespace ej.datavisualization {
              */
             enableMultiSelection?: boolean;
 
+            /** Sets the fraction/ratio(relative to node) that defines the position of the user handle
+             * @Default {ej.datavisualization.Diagram.point(0.5, 1)}
+             */
+            offset?: any;
+
             /** Sets the stroke color of the user handle
              * @Default {transparent}
              */
@@ -66341,6 +67318,11 @@ declare namespace ej.datavisualization {
              */
             tool?: any;
 
+            /** Sets the vertical alignment of the user handle
+             * @Default {ej.datavisualization.Diagram.VerticalAlignment.Center}
+             */
+            verticalAlignment?: ej.datavisualization.Diagram.VerticalAlignment|string;
+
             /** Defines the visibility of the user handle
              * @Default {true}
              */
@@ -66400,6 +67382,14 @@ declare namespace ej.datavisualization {
             width?: number;
         }
 
+        export interface SerializationSettings {
+
+            /** defines whether the default diagram properties can be serialized or not.
+             * @Default {false}
+             */
+            preventDefaultValues?: boolean;
+        }
+
         export interface RulerSettingsHorizontalRuler {
 
             /** Defines the number of intervals to be present on the each segment of the horizontal ruler.
@@ -66776,6 +67766,8 @@ declare namespace ej.datavisualization {
             InheritCrispEdges,
             //Enables the contrast between clean edges of connector over rendering speed and geometric precision
             DragLimit,
+            //Enables or disables bridging over a connector, if bridging constraints disabled..
+            BridgeObstacle,
             //Enables connector to be selected and dragged.
             Interaction,
             //Enables all constraints
@@ -66802,6 +67794,22 @@ declare namespace ej.datavisualization {
             After,
         }
     }
+    namespace Diagram {
+        enum LabelConstraints {
+            //Disable all label Constraints
+            None,
+            //Enables label to be selected
+            Selectable,
+            //Enables label to be Dragged
+            Draggable,
+            //Enables label to be Resized
+            Resizable,
+            //Enables label to be Rotated
+            Rotatable,
+            //Enables all label constraints
+            All,
+        }
+    }
     namespace Diagram {
         enum LabelRelativeMode {
             //Sets the relativeMode as SegmentPath
@@ -67645,6 +68653,16 @@ declare namespace ej.datavisualization {
             ZoomOut,
         }
     }
+    namespace Diagram {
+        enum ActiveTool {
+            //Set the default Tool
+            None,
+            //Activate the port tool to drag when the mouse is moved over the port
+            Drag,
+            //Activate the draw tool to draw when the mouse is moved over the port
+            Draw,
+        }
+    }
 
     class HeatMap extends ej.Widget {
         static fn: HeatMap;
diff --git a/types/ej.web.all/tslint.json b/types/ej.web.all/tslint.json
index d396efe0bf..35e3f27cc8 100644
--- a/types/ej.web.all/tslint.json
+++ b/types/ej.web.all/tslint.json
@@ -3,12 +3,40 @@
   "rules": {
     // All are TODOs
     "comment-format": false,
+    "jsdoc-format": false,
     "no-consecutive-blank-lines": false,
     "no-mergeable-namespace": false,
     "no-padding": false,
     "no-any-union": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
     "no-unnecessary-generics": false,
     "no-unnecessary-qualifier": false,
-    "strict-export-declare-modifiers": false
+
+    "strict-export-declare-modifiers": false,
+    "whitespace": false,
+    "prefer-conditional-expression": false,
+    "no-var-keyword": false,
+    "object-literal-shorthand": false,
+    "space-before-function-paren": false,
+    "no-namespace": false,
+    "no-internal-module": false,
+    "only-arrow-functions": false,
+    "no-empty-interface": false,
+    "prefer-const": false,
+    "max-line-length": false,
+    "array-type": false,
+    "ban-types": false,
+    "semicolon": false,
+    "object-literal-key-quotes": false,
+    "one-variable-per-declaration": false,
+    "triple-equals": false,
+    "typedef-whitespace": false,
+    "prefer-template": false,
+    "no-duplicate-variable": false,
+    "radix": false,
+    "prefer-for-of": false,
+    "one-line": false,
+    "no-unnecessary-type-assertion": false
   }
 }
diff --git a/types/ejs-locals/index.d.ts b/types/ejs-locals/index.d.ts
index 6398ee199f..5ddb36fea3 100644
--- a/types/ejs-locals/index.d.ts
+++ b/types/ejs-locals/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/randometc/ejs-locals
 // Definitions by: jt000 <https://github.com/jt000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
diff --git a/types/ejs-locals/tslint.json b/types/ejs-locals/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ejs-locals/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ejs/ejs-tests.ts b/types/ejs/ejs-tests.ts
index b5b46f03b5..a7b7b66944 100644
--- a/types/ejs/ejs-tests.ts
+++ b/types/ejs/ejs-tests.ts
@@ -1,3 +1,61 @@
+/// <reference types="node" />
+
 import ejs = require("ejs");
-var people = ['geddy', 'neil', 'alex'];
-var    html = ejs.render('<%= people.join(", "); %>', { people: people });
+import { readFileSync as read } from 'fs';
+import LRU = require("lru-cache");
+import { TemplateFunction, Options } from "ejs";
+
+const fileName = 'test.ejs';
+const people = ['geddy', 'neil', 'alex'];
+const data = { people };
+const template = '<%= people.join(", "); %>';
+const options = { filename: fileName };
+let result: string;
+let ejsFunction: TemplateFunction;
+
+const SimpleCallback = (err: any, html?: string) => {
+    if (err) {
+        return null;
+    }
+    return html;
+};
+
+result = ejs.render(template);
+result = ejs.render(template, data);
+result = ejs.render(template, data, options);
+
+result = ejs.renderFile(fileName, SimpleCallback);
+result = ejs.renderFile(fileName, data, SimpleCallback);
+result = ejs.renderFile(fileName, data, options, SimpleCallback);
+
+ejsFunction = ejs.compile('');
+ejsFunction = ejs.compile(read(fileName, "utf8"));
+ejsFunction = ejs.compile(template);
+ejsFunction = ejs.compile(template, options);
+ejsFunction = ejs.compile(template, { cache: true, filename: fileName });
+ejsFunction = ejs.compile(template, { cache: true, filename: fileName, root: "./" });
+ejsFunction = ejs.compile(template, { context: { foo: 'FOO' } });
+ejsFunction = ejs.compile(template, { compileDebug: false });
+ejsFunction = ejs.compile(template, { client: true });
+ejsFunction = ejs.compile('<$= people.join(", "); $>', { delimiter: '$' });
+ejsFunction = ejs.compile('<%= locals.people.join(", "); %>', { _with: false });
+ejsFunction = ejs.compile('<%= locals.people.join(", "); %>', { strict: true });
+ejsFunction = ejs.compile('<%= it.people.join(", "); %>', { _with: false, localsName: "it" });
+ejsFunction = ejs.compile(template, { rmWhitespace: true });
+const customEscape = (str: string) => !str ? '' : str.toUpperCase();
+ejsFunction = ejs.compile(template, { escape: customEscape });
+
+result = ejsFunction();
+result = ejsFunction({});
+result = ejsFunction(data);
+
+/** @see https://github.com/mde/ejs/tree/v2.5.7#custom-fileloader */
+ejs.fileLoader = (path: string) => "";
+
+/** @see https://github.com/mde/ejs/tree/v2.5.7#caching */
+ejs.clearCache();
+ejs.cache = LRU(100);
+
+/** @see https://github.com/mde/ejs/tree/v2.5.7#custom-delimiters */
+ejs.delimiter = "%";
+delete ejs.delimiter;
diff --git a/types/ejs/index.d.ts b/types/ejs/index.d.ts
index a5bfb23ee9..e785f2c6ae 100644
--- a/types/ejs/index.d.ts
+++ b/types/ejs/index.d.ts
@@ -1,90 +1,124 @@
-// Type definitions for ejs.js v2.3.3
+// Type definitions for ejs.js 2.5
 // Project: http://ejs.co/
-// Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
+// Definitions by: Ben Liddicott <https://github.com/benliddicott>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
-declare namespace Ejs {
-    type Data = { [name: string]: any };
-    type Dependencies = string[];
-    var cache: Cache;
-    var localsName: string;
-    function resolveInclude(name: string, filename: string): string;
-    function compile(template: string, opts?: Options): (TemplateFunction);
-    function render(template: string, data?: Data, opts?: Options): string;
+export interface Data {
+    [name: string]: any;
+}
+/**
+ * EJS template function cache. This can be a LRU object from lru-cache NPM
+ * module. By default, it is {@link module:utils.cache}, a simple in-process
+ * cache that grows continuously.
+ */
+export let cache: Cache;
+/**
+ * Name of the object containing the locals.
+ *
+ * This variable is overridden by {@link Options}`.localsName` if it is not
+ * `undefined`.
+ */
+export let localsName: string;
+/**
+ * Get the path to the included file from the parent file path and the
+ * specified path.
+ */
+export function resolveInclude(name: string, filename: string, isDir: boolean): string;
+/**
+ * Compile the given `str` of ejs into a template function.
+ */
+export function compile(template: string, opts?: Options): (TemplateFunction);
+/**
+ * Render the given `template` of ejs.
+ *
+ * If you would like to include options but not data, you need to explicitly
+ * call this function with `data` being an empty object or `null`.
+ */
+export function render(template: string, data?: Data, opts?: Options): string;
 
-    type RenderFileCallback<T> = (err: Error, str?: string) => T;
-    function renderFile<T>(path: string, cb: RenderFileCallback<T>): T;
-    function renderFile<T>(path: string, data: Data, cb: RenderFileCallback<T>): T;
-    function renderFile<T>(path: string, data: Data, opts: Options, cb: RenderFileCallback<T>): T;
+export type RenderFileCallback<T> = (err: Error, str?: string) => T;
 
-    function clearCache(): any;
+/**
+ * Render an EJS file at the given `path` and callback `cb(err, str)`.
+ *
+ * If you would like to include options but not data, you need to explicitly
+ * call this function with `data` being an empty object or `null`.
+ */
+export function renderFile<T>(path: string, cb: RenderFileCallback<T>): T;
+export function renderFile<T>(path: string, data: Data, cb: RenderFileCallback<T>): T;
+export function renderFile<T>(path: string, data: Data, opts: Options, cb: RenderFileCallback<T>): T;
 
-    interface TemplateFunction {
-        (data: Data): any;
-    }
-    interface Options {
-        cache?: any;
-        filename?: string;
-        context?: any;
-        compileDebug?: boolean;
-        client?: boolean;
-        delimiter?: string;
-        debug?: any;
-        _with?: boolean;
-    }
-    class Template {
-        constructor(text: string, opts: Options);
-        opts: Options;
-        templateText: string;
-        mode: string;
-        truncate: boolean;
-        currentLine: number;
-        source: string;
-        dependencies: Dependencies;
-        createRegex(): RegExp;
-        compile(): TemplateFunction;
-        generateSource(): any;
-        parseTemplateText(): string[];
-        scanLine(line: string): any;
+/**
+ * Clear intermediate JavaScript cache. Calls {@link Cache#reset}.
+ */
+export function clearCache(): void;
 
-    }
-    namespace Template {
-        interface MODES {
-            EVAL: string;
-            ESCAPED: string;
-            RAW: string;
-            COMMENT: string;
-            LITERAL: string;
-        }
-    }
-    function escapeRegexChars(s: string): string;
-    function escapeXML(markup: string): string;
-    function shallowCopy<T1>(to: T1, fro: any): T1;
-    interface Cache {
-        _data: { [name: string]: any };
-        set(key: string, val: any): any;
-        get(key: string): any;
-    }
-    function resolve(from1: string, to: string): string;
-    function resolve(from1: string, from2: string, to: string): string;
-    function resolve(from1: string, from2: string, from3: string, to: string): string;
-    function resolve(from1: string, from2: string, from3: string, from4: string, to: string): string;
-    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, to: string): string;
-    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, to: string): string;
-    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, to: string): string;
-    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, to: string): string;
-    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, from9: string, to: string): string;
-    function resolve(...args: string[]): string;
-    function normalize(path: string): string;
-    function isAbsolute(path: string): boolean;
-    function join(...args: string[]): string;
-    function relative(from: string, to: string): string;
-    var sep: string;
-    var delimiter: string;
-    function dirname(path: string): string;
-    function basename(path: string): string;
-    function extname(path: string): string;
-    function filter(xs: any, f: any): any; // TODO WHUT?
+export type TemplateFunction = (data?: Data) => string;
+export interface Options {
+    /** Compiled functions are cached, requires `filename` */
+    cache?: boolean;
+    /**
+     * The name of the file being rendered. Not required if you are using `renderFile()`.
+     * Used by `cache` to key caches, and for includes.
+     */
+    filename?: string;
+    /** Set project root for includes with an absolute path (/file.ejs). */
+    root?: string;
+    /** Function execution context */
+    context?: any;
+    /** When `false` no debug instrumentation is compiled */
+    compileDebug?: boolean;
+    /** When `true`, compiles a function that can be rendered in the browser without needing to load the EJS Runtime (ejs.min.js). */
+    client?: boolean;
+    /** Character to use with angle brackets for open/close */
+    delimiter?: string;
+    /** Output generated function body */
+    debug?: boolean;
+    /** When set to `true`, generated function is in strict mode */
+    strict?: boolean;
+    /**
+     * Whether or not to use `with() {}` constructs.
+     * If `false` then the locals will be stored in the `locals` object. Set to `false` in strict mode.
+     */
+    _with?: boolean;
+    /** Name to use for the object storing local variables when not using `with` Defaults to `locals` */
+    localsName?: string;
+    /**
+     * Remove all safe-to-remove whitespace, including leading and trailing whitespace.
+     * It also enables a safer version of `-%>` line slurping for all scriptlet tags (it does not strip new lines of tags in the middle of a line).
+     */
+    rmWhitespace?: boolean;
+    /**
+     * The escaping function used with `<%=` construct.
+     * It is used in rendering and is `.toString()`ed in the generation of client functions.
+     * (By default escapes XML).
+     */
+    escape?(str: string): string;
 }
 
-export = Ejs;
+export function escapeRegexChars(s: string): string;
+/**
+ * Escape characters reserved in XML.
+ *
+ * This is simply an export of {@link module:utils.escapeXML}.
+ *
+ * If `markup` is `undefined` or `null`, the empty string is returned.
+ */
+export function escapeXML(markup: string): string;
+export interface Cache {
+    set(key: string, val: TemplateFunction): void;
+    get(key: string): TemplateFunction;
+}
+export let delimiter: string;
+
+/**
+ * Custom file loader. Useful for template preprocessing or restricting access
+ * to a certain part of the filesystem.
+ */
+export function fileLoader(filePath: string): string;
+
+/**
+ * Name for detection of EJS.
+ */
+export const name = "ejs";
diff --git a/types/ejs/tslint.json b/types/ejs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ejs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ejson/tslint.json b/types/ejson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ejson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/elastic.js/tslint.json b/types/elastic.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/elastic.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 1be3f740bc..3043a1f473 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -1,6 +1,6 @@
-import elasticsearch = require("elasticsearch");
+import * as elasticsearch from "elasticsearch";
 
-var client = new elasticsearch.Client({
+let client = new elasticsearch.Client({
   host: 'localhost:9200',
   log: 'trace'
 });
@@ -10,26 +10,26 @@ client = new elasticsearch.Client({
     'box1.server.org',
     'box2.server.org'
   ],
-  selector: function (hosts: any) { }
+  selector: (hosts: any) => { }
 });
 
 client.ping({
   requestTimeout: 30000
-}, function (error) {
+}, (error) => {
 });
 
 client.search({
   q: 'pants'
-}).then(function (body) {
-  var hits = body.hits.hits;
-}, function (error) {
+}).then((body) => {
+  const hits = body.hits.hits;
+}, (error) => {
 });
 
 client.indices.delete({
   index: 'test_index',
   ignore: [404]
-}).then(function (body) {
-}, function (error) {
+}).then((body) => {
+}, (error) => {
 });
 
 client.deleteByQuery({
@@ -39,8 +39,8 @@ client.deleteByQuery({
     query: {
     }
   }
-}).then(function (response) {
-}, function (error) {
+}).then((response) => {
+}, (error) => {
 });
 
 client.create({
@@ -103,7 +103,7 @@ client.cluster.stats({
 
 client.count({
   index: 'index_name'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -120,7 +120,7 @@ client.count({
       }
     }
   }
-}, function (err, response) {
+}, (err, response) => {
   // ...
 });
 
@@ -132,7 +132,7 @@ client.explain({
 
   // the query to score it against
   q: 'field:value'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -145,7 +145,7 @@ client.explain({
       match: { title: 'test' }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -158,8 +158,7 @@ client.index({
     tags: ['y', 'z'],
     published: true,
   }
-}, function (error, response) {
-
+}, (error, response) => {
 });
 
 client.mget({
@@ -170,7 +169,7 @@ client.mget({
       { _index: 'indexC', _type: 'typeC', _id: '1' }
     ]
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -180,14 +179,14 @@ client.mget({
   body: {
     ids: [1, 2, 3]
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
 client.search({
   index: 'myindex',
   q: 'title:test'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -207,7 +206,7 @@ client.search({
       }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -221,12 +220,11 @@ client.suggest({
       }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
 });
 
-
 // first we do a search, and specify a scroll timeout
-var allTitles: string[] = [];
+const allTitles: string[] = [];
 client.search({
   index: 'myindex',
   // Set to 30 seconds because we are calling right back
@@ -236,14 +234,14 @@ client.search({
   q: 'title:test'
 }, function getMoreUntilDone(error, response) {
   // collect the title from each response
-  response.hits.hits.forEach(function (hit) {
+  response.hits.hits.forEach((hit) => {
     allTitles.push(hit.fields.title);
   });
 
   if (response.hits.total !== allTitles.length) {
     // now we can call scroll over and over
     client.scroll({
-      scrollId: response._scroll_id,
+      scrollId: response._scroll_id!,
       scroll: '30s'
     }, getMoreUntilDone);
   } else {
@@ -258,8 +256,13 @@ client.indices.updateAliases({
       { add: { index: 'logstash-2014.05', alias: 'logstash-current' } }
     ]
   }
-}).then(function (response) {
+}).then((response) => {
   // ...
-}, function (error) {
+}, (error) => {
   // ...
 });
+
+// Errors
+function testErrors() {
+    throw new elasticsearch.errors.AuthenticationException();
+}
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 8acc7e4097..dbf836c6ae 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -1,1608 +1,1661 @@
 // Type definitions for elasticsearch 5.0
 // Project: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html
-// Definitions by: Casper Skydt <https://github.com/CasperSkydt>, Blake Smith <https://github.com/bfsmith>, Dave Dunkin <https://github.com/ddunkin>, Jeffery Grajkowski <https://github.com/pushplay>, Margus Lamp <https://github.com/mlamp>, Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
+// Definitions by: Casper Skydt <https://github.com/CasperSkydt>
+//                 Blake Smith <https://github.com/bfsmith>
+//                 Dave Dunkin <https://github.com/ddunkin>
+//                 Jeffery Grajkowski <https://github.com/pushplay>
+//                 Margus Lamp <https://github.com/mlamp>
+//                 Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
+//                 Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-declare module Elasticsearch {
-    export class Client {
-        constructor(params: ConfigOptions);
-        cat: Cat;
-        cluster: Cluster;
-        indices: Indices;
-        ingest: Ingest;
-        nodes: Nodes;
-        snapshot: Snapshot;
-        tasks: Tasks;
-        bulk(params: BulkIndexDocumentsParams): Promise<any>;
-        bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
-        clearScroll(params: ClearScrollParams, callback: (error: any, response: any) => void): void;
-        clearScroll(params: ClearScrollParams): Promise<any>;
-        count(params: CountParams, callback: (error: any, response: CountResponse) => void): void;
-        count(params: CountParams): Promise<CountResponse>;
-        create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
-        create(params: CreateDocumentParams, callback: (err: any, response: CreateDocumentResponse, status: any) => void): void;
-        delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
-        delete(params: DeleteDocumentParams, callback: (error: any, response: DeleteDocumentResponse) => void): void;
-        deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
-        deleteByQuery(params: DeleteDocumentByQueryParams, callback: (error: any, response: DeleteDocumentByQueryResponse) => void): void;
-        deleteScript(params: DeleteScriptParams): Promise<any>;
-        deleteScript(params: DeleteScriptParams, callback: (error: any, response: any) => void): void;
-        deleteTemplate(params: DeleteTemplateParams): Promise<any>;
-        deleteTemplate(params: DeleteTemplateParams, callback: (error: any, response: any) => void): void;
-        exists(params: ExistsParams): Promise<any>;
-        exists(params: ExistsParams, callback: (error: any, response: any, status?: any) => void): void;
-        explain(params: ExplainParams): Promise<ExplainResponse>;
-        explain(params: ExplainParams, callback: (error: any, response: ExplainResponse) => void): void;
-        fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
-        fieldStats(params: FieldStatsParams, callback: (error: any, response: FieldStatsResponse) => void): void;
-        get<T>(params: GetParams, callback: (error: any, response: GetResponse<T>) => void): void;
-        get<T>(params: GetParams): Promise<GetResponse<T>>;
-        getScript(params: GetScriptParams): Promise<any>;
-        getScript(params: GetScriptParams, callback: (error: any, response: any) => void): void;
-        getSource(params: GetSourceParams): Promise<any>;
-        getSource(params: GetSourceParams, callback: (error: any, response: any) => void): void;
-        getTemplate(params: GetTemplateParams): Promise<any>;
-        getTemplate(params: GetTemplateParams, callback: (error: any, response: any) => void): void;
-        index<T>(params: IndexDocumentParams<T>): Promise<any>;
-        index<T>(params: IndexDocumentParams<T>, callback: (error: any, response: any) => void): void;
-        info(params: InfoParams): Promise<any>;
-        info(params: InfoParams, callback: (error: any, response: any) => void): void;
-        mget<T>(params: MGetParams, callback: (error: any, response: MGetResponse<T>) => void): void;
-        mget<T>(params: MGetParams): Promise<MGetResponse<T>>;
-        msearch<T>(params: MSearchParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
-        msearch<T>(params: MSearchParams): Promise<MSearchResponse<T>>;
-        msearchTemplate<T>(params: MSearchTemplateParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
-        msearchTemplate<T>(params: MSearchTemplateParams): Promise<MSearchResponse<T>>;
-        mtermvectors(params: MTermVectorsParams): Promise<any>;
-        mtermvectors(params: MTermVectorsParams, callback: (error: any, response: any) => void): void;
-        ping(params: PingParams): Promise<any>;
-        ping(params: PingParams, callback: (err: any, response: any, status: any) => void): void;
-        putScript(params: PutScriptParams): Promise<any>;
-        putScript(params: PutScriptParams, callback: (err: any, response: any, status: any) => void): void;
-        putTemplate(params: PutTemplateParams): Promise<any>;
-        putTemplate(params: PutTemplateParams, callback: (err: any, response: any, status: any) => void): void;
-        reindex(params: ReindexParams): Promise<ReindexResponse>;
-        reindex(params: ReindexParams, callback: (error: any, response: ReindexResponse) => void): void;
-        reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
-        reindexRethrottle(params: ReindexRethrottleParams, callback: (error: any, response: any) => void): void;
-        renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
-        renderSearchTemplate(params: RenderSearchTemplateParams, callback: (error: any, response: any) => void): void;
-        scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
-        scroll<T>(params: ScrollParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-        search<T>(params: SearchParams): Promise<SearchResponse<T>>;
-        search<T>(params: SearchParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-        searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
-        searchShards(params: SearchShardsParams, callback: (error: any, response: SearchShardsResponse) => void): void;
-        searchTemplate(params: SearchTemplateParams): Promise<any>;
-        searchTemplate(params: SearchTemplateParams, callback: (error: any, response: any) => void): void;
-        suggest(params: SuggestParams): Promise<any>;
-        suggest(params: SuggestParams, callback: (error: any, response: any) => void): void;
-        termvectors(params: TermvectorsParams): Promise<any>;
-        termvectors(params: TermvectorsParams, callback: (error: any, response: any) => void): void;
-        update(params: UpdateDocumentParams): Promise<any>;
-        update(params: UpdateDocumentParams, callback: (error: any, response: any) => void): void;
-        updateByQuery(params: UpdateDocumentByQueryParams): Promise<any>;
-        updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: any) => void): void;
-        close(): void;
-    }
+export class Client {
+    constructor(params: ConfigOptions);
+    cat: Cat;
+    cluster: Cluster;
+    indices: Indices;
+    ingest: Ingest;
+    nodes: Nodes;
+    snapshot: Snapshot;
+    tasks: Tasks;
+    bulk(params: BulkIndexDocumentsParams): Promise<any>;
+    bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
+    clearScroll(params: ClearScrollParams, callback: (error: any, response: any) => void): void;
+    clearScroll(params: ClearScrollParams): Promise<any>;
+    count(params: CountParams, callback: (error: any, response: CountResponse) => void): void;
+    count(params: CountParams): Promise<CountResponse>;
+    create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
+    create(params: CreateDocumentParams, callback: (err: any, response: CreateDocumentResponse, status: any) => void): void;
+    delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
+    delete(params: DeleteDocumentParams, callback: (error: any, response: DeleteDocumentResponse) => void): void;
+    deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
+    deleteByQuery(params: DeleteDocumentByQueryParams, callback: (error: any, response: DeleteDocumentByQueryResponse) => void): void;
+    deleteScript(params: DeleteScriptParams): Promise<any>;
+    deleteScript(params: DeleteScriptParams, callback: (error: any, response: any) => void): void;
+    deleteTemplate(params: DeleteTemplateParams): Promise<any>;
+    deleteTemplate(params: DeleteTemplateParams, callback: (error: any, response: any) => void): void;
+    exists(params: ExistsParams): Promise<any>;
+    exists(params: ExistsParams, callback: (error: any, response: any, status?: any) => void): void;
+    explain(params: ExplainParams): Promise<ExplainResponse>;
+    explain(params: ExplainParams, callback: (error: any, response: ExplainResponse) => void): void;
+    fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
+    fieldStats(params: FieldStatsParams, callback: (error: any, response: FieldStatsResponse) => void): void;
+    get<T>(params: GetParams, callback: (error: any, response: GetResponse<T>) => void): void;
+    get<T>(params: GetParams): Promise<GetResponse<T>>;
+    getScript(params: GetScriptParams): Promise<any>;
+    getScript(params: GetScriptParams, callback: (error: any, response: any) => void): void;
+    getSource(params: GetSourceParams): Promise<any>;
+    getSource(params: GetSourceParams, callback: (error: any, response: any) => void): void;
+    getTemplate(params: GetTemplateParams): Promise<any>;
+    getTemplate(params: GetTemplateParams, callback: (error: any, response: any) => void): void;
+    index<T>(params: IndexDocumentParams<T>): Promise<any>;
+    index<T>(params: IndexDocumentParams<T>, callback: (error: any, response: any) => void): void;
+    info(params: InfoParams): Promise<any>;
+    info(params: InfoParams, callback: (error: any, response: any) => void): void;
+    mget<T>(params: MGetParams, callback: (error: any, response: MGetResponse<T>) => void): void;
+    mget<T>(params: MGetParams): Promise<MGetResponse<T>>;
+    msearch<T>(params: MSearchParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
+    msearch<T>(params: MSearchParams): Promise<MSearchResponse<T>>;
+    msearchTemplate<T>(params: MSearchTemplateParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
+    msearchTemplate<T>(params: MSearchTemplateParams): Promise<MSearchResponse<T>>;
+    mtermvectors(params: MTermVectorsParams): Promise<any>;
+    mtermvectors(params: MTermVectorsParams, callback: (error: any, response: any) => void): void;
+    ping(params: PingParams): Promise<any>;
+    ping(params: PingParams, callback: (err: any, response: any, status: any) => void): void;
+    putScript(params: PutScriptParams): Promise<any>;
+    putScript(params: PutScriptParams, callback: (err: any, response: any, status: any) => void): void;
+    putTemplate(params: PutTemplateParams): Promise<any>;
+    putTemplate(params: PutTemplateParams, callback: (err: any, response: any, status: any) => void): void;
+    reindex(params: ReindexParams): Promise<ReindexResponse>;
+    reindex(params: ReindexParams, callback: (error: any, response: ReindexResponse) => void): void;
+    reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
+    reindexRethrottle(params: ReindexRethrottleParams, callback: (error: any, response: any) => void): void;
+    renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
+    renderSearchTemplate(params: RenderSearchTemplateParams, callback: (error: any, response: any) => void): void;
+    scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
+    scroll<T>(params: ScrollParams, callback: (error: any, response: SearchResponse<T>) => void): void;
+    search<T>(params: SearchParams): Promise<SearchResponse<T>>;
+    search<T>(params: SearchParams, callback: (error: any, response: SearchResponse<T>) => void): void;
+    searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
+    searchShards(params: SearchShardsParams, callback: (error: any, response: SearchShardsResponse) => void): void;
+    searchTemplate(params: SearchTemplateParams): Promise<any>;
+    searchTemplate(params: SearchTemplateParams, callback: (error: any, response: any) => void): void;
+    suggest(params: SuggestParams): Promise<any>;
+    suggest(params: SuggestParams, callback: (error: any, response: any) => void): void;
+    termvectors(params: TermvectorsParams): Promise<any>;
+    termvectors(params: TermvectorsParams, callback: (error: any, response: any) => void): void;
+    update(params: UpdateDocumentParams): Promise<any>;
+    update(params: UpdateDocumentParams, callback: (error: any, response: any) => void): void;
+    updateByQuery(params: UpdateDocumentByQueryParams): Promise<any>;
+    updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: any) => void): void;
+    close(): void;
+}
 
-    export interface ConfigOptions {
-        host?: any;
-        hosts?: any;
-        httpAuth?: string;
-        log?: any;
-        apiVersion?: string;
-        plugins?: any;
-        sniffOnStart?: boolean;
-        sniffInterval?: number;
-        sniffOnConnectionFault?: boolean;
-        maxRetries?: number;
-        requestTimeout?: number;
-        deadTimeout?: number;
-        pingTimeout?: number;
-        keepAlive?: boolean;
-        maxSockets?: number;
-        suggestCompression?: boolean;
-        connectionClass?: string;
-        sniffedNodesProtocol?: string;
-        ssl?: Object;
-        selector?: any;
-        defer?: () => void;
-        nodesToHostCallback?: any;
-        createNodeAgent?: any;
-    }
+export interface ConfigOptions {
+    host?: any;
+    hosts?: any;
+    httpAuth?: string;
+    log?: any;
+    apiVersion?: string;
+    plugins?: any;
+    sniffOnStart?: boolean;
+    sniffInterval?: number;
+    sniffOnConnectionFault?: boolean;
+    maxRetries?: number;
+    requestTimeout?: number;
+    deadTimeout?: number;
+    pingTimeout?: number;
+    keepAlive?: boolean;
+    maxSockets?: number;
+    suggestCompression?: boolean;
+    connectionClass?: string;
+    sniffedNodesProtocol?: string;
+    ssl?: object;
+    selector?: any;
+    defer?: () => void;
+    nodesToHostCallback?: any;
+    createNodeAgent?: any;
+}
 
-    export interface Explanation {
-        value: number;
-        description: string;
-        details: Explanation[];
-    }
+export interface Explanation {
+    value: number;
+    description: string;
+    details: Explanation[];
+}
 
-    export interface GenericParams {
-        requestTimeout?: number;
-        maxRetries?: number;
-        method?: string;
-        body?: any;
-        ignore?: number | number[];
-        filterPath?: string | string[];
-    }
+export interface GenericParams {
+    requestTimeout?: number;
+    maxRetries?: number;
+    method?: string;
+    body?: any;
+    ignore?: number | number[];
+    filterPath?: string | string[];
+}
 
-    export interface ShardsResponse {
-        total: number;
-        successful: number;
-        failed: number;
-    }
+export interface ShardsResponse {
+    total: number;
+    successful: number;
+    failed: number;
+    skipped: number;
+}
 
-    /**
-     * A string of a number and a time unit.  A time unit is one of
-     * [d, h, m, s, ms, micros, nanos].  eg: "30s" for 30 seconds.
-     * These are incorrectly identified as `Date | number` in the docs as of 2016-11-15.
-     */
-    export type TimeSpan = string;
+/**
+ * A string of a number and a time unit.  A time unit is one of
+ * [d, h, m, s, ms, micros, nanos].  eg: "30s" for 30 seconds.
+ * These are incorrectly identified as `Date | number` in the docs as of 2016-11-15.
+ */
+export type TimeSpan = string;
 
-    export type NameList = string | string[] | boolean;
-    export type Refresh = boolean | "true" | "false" | "wait_for" | "";
-    export type VersionType = "internal" | "external" | "external_gte" | "force";
-    export type ExpandWildcards = "open" | "closed" | "none" | "all";
-    export type DefaultOperator = "AND" | "OR";
-    export type Conflicts = "abort" | "proceed";
+export type NameList = string | string[] | boolean;
+export type Refresh = boolean | "true" | "false" | "wait_for" | "";
+export type VersionType = "internal" | "external" | "external_gte" | "force";
+export type ExpandWildcards = "open" | "closed" | "none" | "all";
+export type DefaultOperator = "AND" | "OR";
+export type Conflicts = "abort" | "proceed";
 
-    export interface BulkIndexDocumentsParams extends GenericParams {
-        waitForActiveShards?: string;
-        refresh?: Refresh;
-        routing?: string;
-        timeout?: TimeSpan;
-        type?: string;
-        fields?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        pipeline?: string;
-        index?: string;
-    }
+export interface BulkIndexDocumentsParams extends GenericParams {
+    waitForActiveShards?: string;
+    refresh?: Refresh;
+    routing?: string;
+    timeout?: TimeSpan;
+    type?: string;
+    fields?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    pipeline?: string;
+    index?: string;
+}
 
-    export interface ClearScrollParams extends GenericParams {
-        scrollId: NameList;
-    }
+export interface ClearScrollParams extends GenericParams {
+    scrollId: NameList;
+}
 
-    export interface CountParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        minScore?: number;
-        preference?: string;
-        routing?: string;
-        q?: string;
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
+export interface CountParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    minScore?: number;
+    preference?: string;
+    routing?: string;
+    q?: string;
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface CountResponse {
-        count: number;
-        _shards: ShardsResponse;
-    }
+export interface CountResponse {
+    count: number;
+    _shards: ShardsResponse;
+}
 
-    export interface CreateDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        parent?: string;
-        refresh?: Refresh;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        pipeline?: string;
-        id?: string;
-        index: string;
-        type: string;
-    }
+export interface CreateDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    parent?: string;
+    refresh?: Refresh;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    pipeline?: string;
+    id?: string;
+    index: string;
+    type: string;
+}
 
-    export interface CreateDocumentResponse {
-        _shards: ShardsResponse;
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        created: boolean;
-        result: string;
-    }
+export interface CreateDocumentResponse {
+    _shards: ShardsResponse;
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    created: boolean;
+    result: string;
+}
 
-    export interface DeleteDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        parent?: string;
-        refresh?: Refresh;
-        routing?: string;
-        timeout?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-        id: string;
-    }
+export interface DeleteDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    parent?: string;
+    refresh?: Refresh;
+    routing?: string;
+    timeout?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+    id: string;
+}
 
-    export interface DeleteDocumentResponse {
-        _shards: ShardsResponse;
-        found: boolean;
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        result: string;
-    }
+export interface DeleteDocumentResponse {
+    _shards: ShardsResponse;
+    found: boolean;
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    result: string;
+}
 
-    export interface DeleteDocumentByQueryParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        conflicts?: Conflicts;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        preference?: string;
-        q?: string;
-        routing?: string | string[] | boolean;
-        scroll?: string;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        searchTimeout?: TimeSpan;
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: string | string[] | boolean;
-        version?: number;
-        requestCache?: boolean;
-        refresh?: Refresh;
-        timeout?: TimeSpan;
-        waitForActiveShards?: string;
-        scrollSize?: number;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        index?: string;
-        type?: string;
-    }
+export interface DeleteDocumentByQueryParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    conflicts?: Conflicts;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    preference?: string;
+    q?: string;
+    routing?: string | string[] | boolean;
+    scroll?: string;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    searchTimeout?: TimeSpan;
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: string | string[] | boolean;
+    version?: number;
+    requestCache?: boolean;
+    refresh?: Refresh;
+    timeout?: TimeSpan;
+    waitForActiveShards?: string;
+    scrollSize?: number;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    index?: string;
+    type?: string;
+}
 
-    export interface DeleteDocumentByQueryResponse {
-        took: number;
-        timed_out: boolean;
-        deleted: number;
-        batches: number;
-        version_conflicts: number;
-        noops: number;
-        retries: {
-            bulk: number;
-            search: number;
-        };
-        throttled_millis: number;
-        requests_per_second: number;
-        throttled_until_millis: number;
-        total: number;
-        failures: any[];
-    }
+export interface DeleteDocumentByQueryResponse {
+    took: number;
+    timed_out: boolean;
+    deleted: number;
+    batches: number;
+    version_conflicts: number;
+    noops: number;
+    retries: {
+        bulk: number;
+        search: number;
+    };
+    throttled_millis: number;
+    requests_per_second: number;
+    throttled_until_millis: number;
+    total: number;
+    failures: any[];
+}
 
-    export interface DeleteScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-    }
+export interface DeleteScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+}
 
-    export interface DeleteTemplateParams extends GenericParams {
-        id: string;
-    }
+export interface DeleteTemplateParams extends GenericParams {
+    id: string;
+}
 
-    export interface ExistsParams extends GenericParams {
-        parent?: string;
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface ExistsParams extends GenericParams {
+    parent?: string;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface ExplainParams extends GenericParams {
-        analyzeWildcard?: boolean;
-        analyzer?: string;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        storedFields?: NameList;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        parent?: string;
-        preference?: string;
-        q?: string;
-        routing?: string;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        id?: string;
-        index?: string;
-        type?: string;
-    }
+export interface ExplainParams extends GenericParams {
+    analyzeWildcard?: boolean;
+    analyzer?: string;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    storedFields?: NameList;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    parent?: string;
+    preference?: string;
+    q?: string;
+    routing?: string;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    id?: string;
+    index?: string;
+    type?: string;
+}
 
-    export interface ExplainResponse {
-        _index: string;
-        _type: string;
-        _id: string;
-        matched: boolean;
-        explanation: ExplainResponseDetails;
-    }
+export interface ExplainResponse {
+    _index: string;
+    _type: string;
+    _id: string;
+    matched: boolean;
+    explanation: ExplainResponseDetails;
+}
 
-    export interface ExplainResponseDetails {
-        value: number;
-        description: string;
-        details: ExplainResponseDetails[];
-    }
+export interface ExplainResponseDetails {
+    value: number;
+    description: string;
+    details: ExplainResponseDetails[];
+}
 
-    export interface FieldStatsParams extends GenericParams {
-        fields?: NameList;
-        level?: "indices" | "cluster";
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-    }
+export interface FieldStatsParams extends GenericParams {
+    fields?: NameList;
+    level?: "indices" | "cluster";
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+}
 
-    export interface FieldStatsResponse {
-        _shards: ShardsResponse;
-        indices: { [indexName: string]: FieldStatsResponseIndex };
-        conflicts?: { [fieldName: string]: string };
-    }
+export interface FieldStatsResponse {
+    _shards: ShardsResponse;
+    indices: { [indexName: string]: FieldStatsResponseIndex };
+    conflicts?: { [fieldName: string]: string };
+}
 
-    export interface FieldStatsResponseIndex {
-        fields: { [fieldName: string]: FieldStatsResponseField };
-    }
+export interface FieldStatsResponseIndex {
+    fields: { [fieldName: string]: FieldStatsResponseField };
+}
 
-    export interface FieldStatsResponseField {
-        max_doc: number;
-        doc_count: number;
-        density: number;
-        sum_doc_freq: number;
-        sum_total_term_freq: number;
-        min_value: any;
-        max_value: any;
-        is_searchable: string;
-        is_aggregatable: string;
-    }
+export interface FieldStatsResponseField {
+    max_doc: number;
+    doc_count: number;
+    density: number;
+    sum_doc_freq: number;
+    sum_total_term_freq: number;
+    min_value: any;
+    max_value: any;
+    is_searchable: string;
+    is_aggregatable: string;
+}
 
-    export interface GetParams extends GenericParams {
-        storedFields?: NameList;
-        parent?: string;
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        version?: number;
-        versionType?: VersionType;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface GetParams extends GenericParams {
+    storedFields?: NameList;
+    parent?: string;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    version?: number;
+    versionType?: VersionType;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface GetResponse<T> {
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        found: boolean;
-        _source: T;
-    }
+export interface GetResponse<T> {
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    found: boolean;
+    _source: T;
+}
 
-    export interface GetScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-    }
+export interface GetScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+}
 
-    export interface GetSourceParams extends GenericParams {
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        _source: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        version?: number;
-        versionType?: VersionType;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface GetSourceParams extends GenericParams {
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    _source: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    version?: number;
+    versionType?: VersionType;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface GetTemplateParams extends GenericParams {
-        id: string;
-    }
+export interface GetTemplateParams extends GenericParams {
+    id: string;
+}
 
-    export interface IndexDocumentParams<T> extends GenericParams {
-        waitForActiveShards?: string;
-        opType?: "index" | "create";
-        parent?: string;
-        refresh?: string;
-        routing?: string;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        pipeline?: string;
-        id?: string;
-        index: string;
-        type: string;
-        body: T;
-    }
+export interface IndexDocumentParams<T> extends GenericParams {
+    waitForActiveShards?: string;
+    opType?: "index" | "create";
+    parent?: string;
+    refresh?: string;
+    routing?: string;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    pipeline?: string;
+    id?: string;
+    index: string;
+    type: string;
+    body: T;
+}
 
-    export interface InfoParams extends GenericParams {
-    }
+export interface InfoParams extends GenericParams {
+}
 
-    export interface MGetParams extends GenericParams {
-        storedFields?: NameList;
-        preference?: string;
-        realtime?: Boolean;
-        refresh?: Boolean;
-        source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        index?: string;
-        type?: string;
-    }
+export interface MGetParams extends GenericParams {
+    storedFields?: NameList;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    index?: string;
+    type?: string;
+}
 
-    export interface MGetResponse<T> {
-        docs?: GetResponse<T>[];
-    }
+export interface MGetResponse<T> {
+    docs?: Array<GetResponse<T>>;
+}
 
-    export interface MSearchParams extends GenericParams {
-        search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        maxConcurrentSearches?: number;
-        index?: NameList;
-        type?: NameList;
-    }
+export interface MSearchParams extends GenericParams {
+    search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    maxConcurrentSearches?: number;
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface MSearchResponse<T> {
-        responses?: SearchResponse<T>[];
-    }
+export interface MSearchResponse<T> {
+    responses?: Array<SearchResponse<T>>;
+}
 
-    export interface MSearchTemplateParams extends GenericParams {
-        search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        index?: NameList;
-        type?: NameList;
-    }
+export interface MSearchTemplateParams extends GenericParams {
+    search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface MTermVectorsParams extends GenericParams {
-        ids?: NameList;
-        termStatistics?: boolean;
-        fieldStatistics?: boolean;
-        fields?: NameList;
-        offsets?: boolean;
-        positions?: boolean;
-        payloads?: boolean;
-        preference?: string;
-        routing?: string;
-        parent?: string;
-        realtime?: boolean;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-    }
+export interface MTermVectorsParams extends GenericParams {
+    ids?: NameList;
+    termStatistics?: boolean;
+    fieldStatistics?: boolean;
+    fields?: NameList;
+    offsets?: boolean;
+    positions?: boolean;
+    payloads?: boolean;
+    preference?: string;
+    routing?: string;
+    parent?: string;
+    realtime?: boolean;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+}
 
-    export interface PingParams extends GenericParams {
-    }
+export interface PingParams extends GenericParams {
+}
 
-    export interface PutScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-        body: any;
-    }
+export interface PutScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+    body: any;
+}
 
-    export interface PutTemplateParams extends GenericParams {
-        id: string;
-        body: any;
-    }
+export interface PutTemplateParams extends GenericParams {
+    id: string;
+    body: any;
+}
 
-    export interface ReindexParams extends GenericParams {
-        refresh?: boolean;
-        timeout?: TimeSpan;
-        waitForActiveShards?: string;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        body: {
-            conflicts?: string;
-            source: {
-                index: string | string[];
-                type?: string | string[];
-                query?: any;
-                sort?: any;
-                size?: number;
-                remote?: {
-                    host: string;
-                    username?: string;
-                    password?: string;
-                }
-            };
-            dest: {
-                index: string;
-                version_type?: string;
-                op_type?: string;
-                routing?: string;
-                pipeline?: string;
-            };
-            script?: {
-                inline: string;
-                lang: string;
+export interface ReindexParams extends GenericParams {
+    refresh?: boolean;
+    timeout?: TimeSpan;
+    waitForActiveShards?: string;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    body: {
+        conflicts?: string;
+        source: {
+            index: string | string[];
+            type?: string | string[];
+            query?: any;
+            sort?: any;
+            size?: number;
+            remote?: {
+                host: string;
+                username?: string;
+                password?: string;
             }
         };
-    }
-
-    export interface ReindexResponse {
-        took: number;
-        updated: number;
-        created: number;
-        batches: number;
-        version_conflicts: number;
-        retries: {
-            bulk: number;
-            search: number;
-        };
-        throttled_millis: number;
-        failures: any[];
-    }
-
-    export interface ReindexRethrottleParams extends GenericParams {
-        requestsPerSecond: number;
-        taskId: string;
-    }
-
-    export interface RenderSearchTemplateParams extends GenericParams {
-        id: string;
-    }
-
-    export interface ScrollParams extends GenericParams {
-        scroll: TimeSpan;
-        scrollId: string;
-    }
-
-    export interface SearchParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        explain?: boolean;
-        storedFields?: NameList;
-        docvalueFields?: NameList;
-        fielddataFields?: NameList;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        preference?: string;
-        q?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: NameList;
-        suggestField?: string;
-        suggestMode?: "missing" | "popular" | "always";
-        suggestSize?: number;
-        suggestText?: string;
-        timeout?: TimeSpan;
-        trackScores?: boolean;
-        version?: boolean;
-        requestCache?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
-
-    export interface SearchResponse<T> {
-        took: number;
-        timed_out: boolean;
-        _scroll_id?: string;
-        _shards: ShardsResponse;
-        hits: {
-            total: number;
-            max_score: number;
-            hits: {
-                _index: string;
-                _type: string;
-                _id: string;
-                _score: number;
-                _source: T;
-                _version?: number;
-                _explanation?: Explanation;
-                fields?: any;
-                highlight?: any;
-                inner_hits?: any;
-            }[];
-        };
-        aggregations?: any;
-    }
-
-    export interface SearchShardsParams extends GenericParams {
-        preference?: string;
-        routing?: string;
-        local?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface SearchShardsResponse {
-        nodes: any;
-        shards: SearchShardsResponseShard[][];
-    }
-
-    export interface SearchShardsResponseShard {
-        index: string;
-        node: string;
-        primary: boolean;
-        share: number;
-        state: string;
-        allocation_id: {
-            id: string;
-        };
-        relocating_node: any;
-    }
-
-    export interface SearchTemplateParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        preference?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface SuggestParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        preference?: string;
-        routing?: string;
-        index: NameList;
-    }
-
-    export interface TermvectorsParams extends GenericParams {
-        termStatistics?: boolean;
-        fieldStatistics?: boolean;
-        fields?: NameList;
-        offsets?: boolean;
-        positions?: boolean;
-        payloads?: boolean;
-        preference?: string;
-        routing?: string;
-        parent?: string;
-        realtime?: boolean;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-        id?: string;
-    }
-
-    export interface UpdateDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        fields?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        lang?: string;
-        parent?: string;
-        refresh?: Refresh;
-        retryOnConflict?: number;
-        routing?: string;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: "internal" | "force";
-        id: string;
-        index: string;
-        type: string;
-    }
-
-    export interface UpdateDocumentByQueryParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        explain?: boolean;
-        storedFields?: NameList;
-        docvalueFields?: NameList;
-        fielddataFields?: NameList;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        conflicts?: Conflicts;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        pipeline?: string;
-        preference?: string;
-        q?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        searchTimeout?: TimeSpan;
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: NameList;
-        suggestField?: string;
-        suggestMode?: "missing" | "popular" | "always";
-        suggestSize?: number;
-        suggestText?: string;
-        timeout?: TimeSpan;
-        trackScores?: boolean;
-        version?: boolean;
-        versionType?: boolean;
-        requestCache?: boolean;
-        refresh?: boolean;
-        waitForActiveShards?: string;
-        scrollSize?: number;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface Cat {
-        aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
-        aliases(params: CatAliasesParams): Promise<any>;
-        allocation(params: CatAllocationParams, callback: (error: any, response: any) => void): void;
-        allocation(params: CatAllocationParams): Promise<any>;
-        count(params: CatCountParams, callback: (error: any, response: any) => void): void;
-        count(params: CatAllocationParams): Promise<any>;
-        fielddata(params: CatFielddataParams, callback: (error: any, response: any) => void): void;
-        fielddata(params: CatFielddataParams): Promise<any>;
-        health(params: CatHealthParams, callback: (error: any, response: any) => void): void;
-        health(params: CatHealthParams): Promise<any>;
-        help(params: CatHelpParams, callback: (error: any, response: any) => void): void;
-        help(params: CatHelpParams): Promise<any>;
-        indices(params: CatIndicesParams, callback: (error: any, response: any) => void): void;
-        indices(params: CatIndicesParams): Promise<any>;
-        master(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        master(params: CatCommonParams): Promise<any>;
-        nodeattrs(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        nodeattrs(params: CatCommonParams): Promise<any>;
-        nodes(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        nodes(params: CatCommonParams): Promise<any>;
-        pendingTasks(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        pendingTasks(params: CatCommonParams): Promise<any>;
-        plugins(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        plugins(params: CatCommonParams): Promise<any>;
-        recovery(params: CatRecoveryParams, callback: (error: any, response: any) => void): void;
-        recovery(params: CatRecoveryParams): Promise<any>;
-        repositories(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        repositories(params: CatCommonParams): Promise<any>;
-        segments(params: CatSegmentsParams, callback: (error: any, response: any) => void): void;
-        segments(params: CatSegmentsParams): Promise<any>;
-        shards(params: CatShardsParams, callback: (error: any, response: any) => void): void;
-        shards(params: CatShardsParams): Promise<any>;
-        snapshots(params: CatSnapshotsParams, callback: (error: any, response: any) => void): void;
-        snapshots(params: CatSnapshotsParams): Promise<any>;
-        tasks(params: CatTasksParams, callback: (error: any, response: any) => void): void;
-        tasks(params: CatTasksParams): Promise<any>;
-        threadPool(params: CatThreadPoolParams, callback: (error: any, response: any) => void): void;
-        threadPool(params: CatThreadPoolParams): Promise<any>;
-    }
-
-    export type CatBytes = "b" | "k" | "kb" | "m" | "mb" | "g" | "gb" | "t" | "tb" | "p" | "pb";
-
-    export interface CatCommonParams extends GenericParams {
-        format: string;
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatAliasesParams extends CatCommonParams {
-        name?: NameList;
-    }
-
-    export interface CatAllocationParams extends CatCommonParams {
-        bytes?: CatBytes;
-        nodeId?: NameList;
-    }
-
-    export interface CatCountParams extends CatCommonParams {
-        index?: NameList;
-    }
-
-    export interface CatFielddataParams extends CatCommonParams {
-        bytes?: CatBytes;
-        fields?: NameList;
-    }
-
-    export interface CatHealthParams extends CatCommonParams {
-        ts?: boolean;
-    }
-
-    export interface CatHelpParams extends GenericParams {
-        help?: boolean;
-    }
-
-    export interface CatIndicesParams extends CatCommonParams {
-        bytes?: CatBytes;
-        health?: "green" | "yellow" | "red";
-        pri?: boolean;
-        index?: NameList;
-    }
-
-    export interface CatRecoveryParams extends GenericParams {
-        format: string;
-        bytes?: CatBytes;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatSegmentsParams extends GenericParams {
-        format: string;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-        index?: NameList;
-    }
-
-    export interface CatShardsParams extends CatCommonParams {
-        index?: NameList;
-    }
-
-    export interface CatSnapshotsParams extends GenericParams {
-        format: string;
-        ignoreUnavailable?: boolean;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-        repository?: NameList;
-    }
-
-    export interface CatTasksParams extends GenericParams {
-        format: string;
-        nodeId?: NameList;
-        actions?: NameList;
-        detailed?: boolean;
-        parentNode?: string;
-        parentTask?: number;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatThreadPoolParams extends CatCommonParams {
-        size?: "" | "k" | "m" | "g" | "t" | "p";
-        threadPoolPatterns?: NameList;
-    }
-
-    export interface Cluster {
-        allocationExplain(params: ClusterAllocationExplainParams, callback: (error: any, response: any) => void): void;
-        allocationExplain(params: ClusterAllocationExplainParams): Promise<any>;
-        getSettings(params: ClusterGetSettingsParams, callback: (error: any, response: any) => void): void;
-        getSettings(params: ClusterGetSettingsParams): Promise<any>;
-        health(params: ClusterHealthParams, callback: (error: any, response: any) => void): void;
-        health(params: ClusterHealthParams): Promise<any>;
-        pendingTasks(params: ClusterPendingTasksParams, callback: (error: any, response: any) => void): void;
-        pendingTasks(params: ClusterPendingTasksParams): Promise<any>;
-        putSettings(params: ClusterPutSettingsParams, callback: (error: any, response: any) => void): void;
-        putSettings(params: ClusterPutSettingsParams): Promise<any>;
-        reroute(params: ClusterRerouteParams, callback: (error: any, response: any) => void): void;
-        reroute(params: ClusterRerouteParams): Promise<any>;
-        state(params: ClusterStateParams, callback: (error: any, response: any) => void): void;
-        state(params: ClusterStateParams): Promise<any>;
-        stats(params: ClusterStatsParams, callback: (error: any, response: any) => void): void;
-        stats(params: ClusterStatsParams): Promise<any>;
-    }
-
-    export interface ClusterAllocationExplainParams extends GenericParams {
-        includeYesDecisions?: boolean;
-        includeDiskInfo?: boolean;
-    }
-
-    export interface ClusterGetSettingsParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        includeDefaults?: boolean;
-    }
-
-    export interface ClusterHealthParams extends GenericParams {
-        level?: "cluster" | "indices" | "shards";
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: string;
-        waitForNodes?: string;
-        waitForEvents?: "immediate" | "urgent" | "high" | "normal" | "low" | "languid";
-        waitForRelocatingShards?: boolean;
-        waitForStatus?: "green" | "yellow" | "red";
-        index?: NameList;
-    }
-
-    export interface ClusterPendingTasksParams extends GenericParams {
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-    }
-
-    export interface ClusterPutSettingsParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-    }
-
-    export interface ClusterRerouteParams extends GenericParams {
-        dryRun?: boolean;
-        explain?: boolean;
-        retryFailed?: boolean;
-        metric?: NameList;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-    }
-
-    export interface ClusterStateParams extends GenericParams {
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        flatSettings?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-        metric?: NameList;
-    }
-
-    export interface ClusterStatsParams extends GenericParams {
-        flatSettings?: boolean;
-        human?: boolean;
-        timeout?: TimeSpan;
-        nodeId?: NameList;
-    }
-
-    export class Indices {
-        analyze(params: IndicesAnalyzeParams, callback: (error: any, response: any, status: any) => void): void;
-        analyze(params: IndicesAnalyzeParams): Promise<any>;
-        clearCache(params: IndicesClearCacheParams, callback: (error: any, response: any, status: any) => void): void;
-        clearCache(params: IndicesClearCacheParams): Promise<any>;
-        close(params: IndicesCloseParams, callback: (error: any, response: any, status: any) => void): void;
-        close(params: IndicesCloseParams): Promise<any>;
-        create(params: IndicesCreateParams, callback: (error: any, response: any, status: any) => void): void;
-        create(params: IndicesCreateParams): Promise<any>;
-        delete(params: IndicesDeleteParams, callback: (error: any, response: any, status: any) => void): void;
-        delete(params: IndicesDeleteParams): Promise<any>;
-        deleteAlias(params: IndicesDeleteAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteAlias(params: IndicesDeleteAliasParams): Promise<any>;
-        deleteTemplate(params: IndicesDeleteTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteTemplate(params: IndicesDeleteTemplateParams): Promise<any>;
-        exists(params: IndicesExistsParams, callback: (error: any, response: any, status: any) => void): void;
-        exists(params: IndicesExistsParams): Promise<any>;
-        existsAlias(params: IndicesExistsAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        existsAlias(params: IndicesExistsAliasParams): Promise<any>;
-        existsTemplate(params: IndicesExistsTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        existsTemplate(params: IndicesExistsTemplateParams): Promise<any>;
-        existsType(params: IndicesExistsTypeParams, callback: (error: any, response: any, status: any) => void): void;
-        existsType(params: IndicesExistsTypeParams): Promise<any>;
-        flush(params: IndicesFlushParams, callback: (error: any, response: any, status: any) => void): void;
-        flush(params: IndicesFlushParams): Promise<any>;
-        flushSynced(params: IndicesFlushSyncedParams, callback: (error: any, response: any, status: any) => void): void;
-        flushSynced(params: IndicesFlushSyncedParams): Promise<any>;
-        forcemerge(params: IndicesForcemergeParams, callback: (error: any, response: any, status: any) => void): void;
-        forcemerge(params: IndicesForcemergeParams): Promise<any>;
-        get(params: IndicesGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: IndicesGetParams): Promise<any>;
-        getAlias(params: IndicesGetAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        getAlias(params: IndicesGetAliasParams): Promise<any>;
-        getFieldMapping(params: IndicesGetFieldMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        getFieldMapping(params: IndicesGetFieldMappingParams): Promise<any>;
-        getMapping(params: IndicesGetMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        getMapping(params: IndicesGetMappingParams): Promise<any>;
-        getSettings(params: IndicesGetSettingsParams, callback: (error: any, response: any, status: any) => void): void;
-        getSettings(params: IndicesGetSettingsParams): Promise<any>;
-        getTemplate(params: IndicesGetTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        getTemplate(params: IndicesGetTemplateParams): Promise<any>;
-        getUpgrade(params: IndicesGetUpgradeParams, callback: (error: any, response: any, status: any) => void): void;
-        getUpgrade(params: IndicesGetUpgradeParams): Promise<any>;
-        open(params: IndicesOpenParams, callback: (error: any, response: any, status: any) => void): void;
-        open(params: IndicesOpenParams): Promise<any>;
-        putAlias(params: IndicesPutAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        putAlias(params: IndicesPutAliasParams): Promise<any>;
-        putMapping(params: IndicesPutMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        putMapping(params: IndicesPutMappingParams): Promise<any>;
-        putSettings(params: IndicesPutSettingsParams, callback: (error: any, response: any, status: any) => void): void;
-        putSettings(params: IndicesPutSettingsParams): Promise<any>;
-        putTemplate(params: IndicesPutTemplateParams, callback: (error: any, response: any) => void): void;
-        putTemplate(params: IndicesPutTemplateParams): Promise<any>;
-        recovery(params: IndicesRecoveryParams, callback: (error: any, response: any) => void): void;
-        recovery(params: IndicesRecoveryParams): Promise<any>;
-        refresh(params: IndicesRefreshParams, callback: (error: any, response: any) => void): void;
-        refresh(params: IndicesRefreshParams): Promise<any>;
-        rollover(params: IndicesRolloverParams, callback: (error: any, response: IndicesRolloverResponse) => void): void;
-        rollover(params: IndicesRolloverParams): Promise<IndicesRolloverResponse>;
-        segments(params: IndicesSegmentsParams, callback: (error: any, response: any) => void): void;
-        segments(params: IndicesSegmentsParams): Promise<any>;
-        shardStores(params: IndicesShardStoresParams, callback: (error: any, response: any) => void): void;
-        shardStores(params: IndicesShardStoresParams): Promise<any>;
-        shrink(params: IndicesShrinkParams, callback: (error: any, response: any) => void): void;
-        shrink(params: IndicesShrinkParams): Promise<any>;
-        stats(params: IndicesStatsParams, callback: (error: any, response: any) => void): void;
-        stats(params: IndicesStatsParams): Promise<any>;
-        updateAliases(params: IndicesUpdateAliasesParams, callback: (error: any, response: any) => void): void;
-        updateAliases(params: IndicesUpdateAliasesParams): Promise<any>;
-        upgrade(params: IndicesUpgradeParams, callback: (error: any, response: any) => void): void;
-        upgrade(params: IndicesUpgradeParams): Promise<any>;
-        validateQuery(params: IndicesValidateQueryParams, callback: (error: any, response: any) => void): void;
-        validateQuery(params: IndicesValidateQueryParams): Promise<any>;
-    }
-
-    export interface IndicesAnalyzeParams extends GenericParams {
-        analyzer?: string;
-        charFilter?: NameList;
-        field?: string;
-        filter?: NameList;
-        index?: string;
-        perferLocal?: boolean;
-        text?: NameList;
-        tokenizer?: string;
-        explain?: boolean;
-        attributes?: NameList;
-        format?: "";
-    }
-
-    export interface IndicesClearCacheParams extends GenericParams {
-        fieldData?: boolean;
-        fielddata?: boolean;    // yes the docs really have both
-        fields?: NameList;
-        query?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-        recycler?: boolean;
-        request?: boolean;
-    }
-
-    export interface IndicesCloseParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesCreateParams extends GenericParams {
-        waitForActiveShards?: string;
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        updateAllTypes?: boolean;
-        index: string;
-    }
-
-    export interface IndicesDeleteParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index: NameList;
-    }
-
-    export interface IndicesDeleteAliasParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index: NameList;
-        name: NameList;
-    }
-
-    export interface IndicesDeleteTemplateParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        name: string;
-    }
-
-    export interface IndicesExistsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesExistsAliasParams extends IndicesExistsParams {
-        name: NameList;
-    }
-
-    export interface IndicesExistsTemplateParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        name: NameList;
-    }
-
-    export interface IndicesExistsTypeParams extends IndicesExistsParams {
-        type: NameList;
-    }
-
-    export interface IndicesFlushParams extends GenericParams {
-        force?: boolean;
-        waitIfOngoing?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesFlushSyncedParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesForcemergeParams extends GenericParams {
-        flush?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        maxNumSegments?: number;
-        onlyExpungeDeletes?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        waitForMerge?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesGetParams extends GenericParams {
-        local?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        human?: boolean;
-        includeDefaults?: boolean;
-        index?: NameList;
-        feature?: NameList;
-    }
-
-    export interface IndicesGetAliasParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        name?: NameList;
-    }
-
-    export interface IndicesGetFieldMappingParams extends GenericParams {
-        includeDefaults?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        type?: NameList;
-        fields?: NameList;
-    }
-
-    export interface IndicesGetMappingParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
-
-    export interface IndicesGetSettingsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        local?: boolean;
-        human?: boolean;
-        includeDefaults?: boolean;
-        index?: NameList;
-        name?: NameList;
-    }
-
-    export interface IndicesGetTemplateParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        local?: boolean;
-        name?: NameList;
-    }
-
-    export interface IndicesGetUpgradeParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        human?: boolean;
-        index?: NameList;
-    }
-
-    export interface IndicesOpenParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-    }
-
-    export interface IndicesPutAliasParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index?: NameList;
-        name: NameList;
-    }
-
-    export interface IndicesPutMappingParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        updateAllTypes?: boolean;
-        index: NameList;
-        type: string;
-        body: any;
-    }
-
-    export interface IndicesPutSettingsParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        preserveExisting?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        index: NameList;
-        body: any;
-    }
-
-    export interface IndicesPutTemplateParams extends GenericParams {
-        order?: number;
-        create?: boolean;
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        flatSettings?: boolean;
-        name: string;
-        body: any;
-    }
-
-    export interface IndicesRecoveryParams extends GenericParams {
-        detailed?: boolean;
-        activeOnly?: boolean;
-        human?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesRefreshParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        force?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        index: NameList;
-    }
-
-    export interface IndicesRolloverParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: number | string;
-        alias?: string;
-        newIndex?: string;
-    }
-
-    export interface IndicesRolloverResponse {
-        acknowledged: boolean;
-        shards_acknowledged: boolean;
-        old_index: string;
-        new_index: string;
-        rolled_over: boolean;
-        dry_run: boolean;
-        conditions: { [condition: string]: boolean };
-    }
-
-    export interface IndicesSegmentsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        human?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        verbose?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesShardStoresParams extends GenericParams {
-        status?: NameList;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        operationThreading?: any;   // even the docs don't know what this does
-        index: NameList;
-    }
-
-    export interface IndicesShrinkParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: string | number;
-        index: string;
-        target: string;
-    }
-
-    export interface IndicesStatsParams extends GenericParams {
-        completionFields?: NameList;
-        fielddataFields?: NameList;
-        fields?: NameList;
-        groups?: NameList;
-        human?: boolean;
-        level?: "cluster" | "indices" | "shards";
-        types?: NameList;
-        index: NameList;
-        metric?: NameList;
-    }
-
-    export interface IndicesUpdateAliasesParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        body: {
-            actions: IndicesUpdateAliasesParamsAction[];
-        };
-    }
-
-    export interface IndicesUpdateAliasesParamsAction {
-        add?: {
-            index?: string;
-            indices?: string[];
-            alias: string;
-        };
-        remove?: {
-            index?: string;
-            indices?: string[];
-            alias: string;
-        };
-        remove_index?: {
+        dest: {
             index: string;
+            version_type?: string;
+            op_type?: string;
+            routing?: string;
+            pipeline?: string;
         };
-    }
-
-    export interface IndicesUpgradeParams extends GenericParams {
-        expandWildcards?: ExpandWildcards;
-        ignoreUnavailable?: boolean;
-        waitForCompletion?: boolean;
-        onlyAncientSegments?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesValidateQueryParams extends GenericParams {
-        explain?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        operationThreading?: any;   // even the docs don't know what this does
-        q?: string;
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        rewrite?: boolean;
-        index: NameList;
-        type?: NameList;
-    }
-
-    export class Ingest {
-        deletePipeline(params: IngestDeletePipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        deletePipeline(params: IngestDeletePipelineParams): Promise<any>;
-        getPipeline(params: IngestGetPipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        getPipeline(params: IngestGetPipelineParams): Promise<any>;
-        putPipeline(params: IngestPutPipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        putPipeline(params: IngestPutPipelineParams): Promise<any>;
-        simulate(params: IngestSimulateParams, callback: (error: any, response: any, status: any) => void): void;
-        simulate(params: IngestSimulateParams): Promise<any>;
-    }
-
-    export interface IngestDeletePipelineParams extends GenericParams {
-        masterTimeout?: number;
-        timeout?: number;
-        id: string;
-    }
-
-    export interface IngestGetPipelineParams extends GenericParams {
-        masterTimeout?: number;
-        id: string;
-    }
-
-    export interface IngestPutPipelineParams extends GenericParams {
-        masterTimeout?: number;
-        timeout?: number;
-        id: string;
-        body: any;
-    }
-
-    export interface IngestSimulateParams extends GenericParams {
-        verbose?: boolean;
-        id: string;
-    }
-
-    export class Nodes {
-        hotThreads(params: NodesHotThreadsParams, callback: (error: any, response: any, status: any) => void): void;
-        hotThreads(params: NodesHotThreadsParams): Promise<any>;
-        info(params: NodesInfoParams, callback: (error: any, response: any, status: any) => void): void;
-        info(params: NodesInfoParams): Promise<any>;
-        stats(params: NodesStatsParams, callback: (error: any, response: any, status: any) => void): void;
-        stats(params: NodesStatsParams): Promise<any>;
-    }
-
-    export interface NodesHotThreadsParams extends GenericParams {
-        interval?: TimeSpan;
-        snapshots?: number;
-        threads?: number;
-        ignoreIdleThreads?: boolean;
-        type?: "cpu" | "wait" | "blocked";
-        timeout?: TimeSpan;
-        nodeId: NameList;
-    }
-
-    export interface NodesInfoParams extends GenericParams {
-        flatSettings?: boolean;
-        human?: boolean;
-        timeout?: TimeSpan;
-        nodeId: NameList;
-        metric?: NameList;
-    }
-
-    export interface NodesStatsParams extends GenericParams {
-        completionFields?: NameList;
-        fielddataFields?: NameList;
-        fields?: NameList;
-        groups?: boolean;
-        human?: boolean;
-        level?: "indices" | "node" | "shards";
-        types?: NameList;
-        timeout?: TimeSpan;
-        metric?: NameList;
-        indexMetric?: NameList;
-        nodeId?: NameList;
-    }
-
-    export class Snapshot {
-        create(params: SnapshotCreateParams, callback: (error: any, response: any, status: any) => void): void;
-        create(params: SnapshotCreateParams): Promise<any>;
-        createRepository(params: SnapshotCreateRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        createRepository(params: SnapshotCreateRepositoryParams): Promise<any>;
-        delete(params: SnapshotDeleteParams, callback: (error: any, response: any, status: any) => void): void;
-        delete(params: SnapshotDeleteParams): Promise<any>;
-        deleteRepository(params: SnapshotDeleteRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteRepository(params: SnapshotDeleteRepositoryParams): Promise<any>;
-        get(params: SnapshotGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: SnapshotGetParams): Promise<any>;
-        getRepository(params: SnapshotGetRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        getRepository(params: SnapshotGetRepositoryParams): Promise<any>;
-        restore(params: SnapshotRestoreParams, callback: (error: any, response: any, status: any) => void): void;
-        restore(params: SnapshotRestoreParams): Promise<any>;
-        status(params: SnapshotStatusParams, callback: (error: any, response: any, status: any) => void): void;
-        status(params: SnapshotStatusParams): Promise<any>;
-        verifyRepository(params: SnapshotVerifyRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        verifyRepository(params: SnapshotVerifyRepositoryParams): Promise<any>;
-    }
-
-    export interface SnapshotCreateParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        waitForCompletion?: boolean;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotCreateRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        verify?: boolean;
-        repository: string;
-    }
-
-    export interface SnapshotDeleteParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotDeleteRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        repository: string;
-    }
-
-    export interface SnapshotGetParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        repository: string;
-        snapshot: NameList;
-    }
-
-    export interface SnapshotGetRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        local?: boolean;
-        repository: NameList;
-    }
-
-    export interface SnapshotRestoreParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        waitForCompletion?: boolean;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotStatusParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        repository: string;
-        snapshot: NameList;
-    }
-
-    export interface SnapshotVerifyRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        repository: string;
-    }
-
-    export class Tasks {
-        cancel(params: TasksCancelParams, callback: (error: any, response: any, status: any) => void): void;
-        cancel(params: TasksCancelParams): Promise<any>;
-        get(params: TasksGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: TasksGetParams): Promise<any>;
-        list(params: TasksListParams, callback: (error: any, response: any, status: any) => void): void;
-        list(params: TasksListParams): Promise<any>;
-    }
-
-    export interface TasksCancelParams extends GenericParams {
-        nodeId?: NameList;
-        actions?: NameList;
-        parentNode?: string;
-        parentTask?: string;
-        taskId?: string;
-    }
-
-    export interface TasksGetParams extends GenericParams {
-        waitForCompletion?: boolean;
-        taskId?: string;
-    }
-
-    export interface TasksListParams extends GenericParams {
-        nodeId?: NameList;
-        actions?: NameList;
-        detailed?: boolean;
-        parentNode?: string;
-        parentTask?: string;
-        waitForCompletion?: boolean;
-        groupBy?: "nodes" | "parents";
-    }
+        script?: {
+            inline: string;
+            lang: string;
+        }
+    };
 }
 
-declare module "elasticsearch" {
-    export = Elasticsearch;
+export interface ReindexResponse {
+    took: number;
+    updated: number;
+    created: number;
+    batches: number;
+    version_conflicts: number;
+    retries: {
+        bulk: number;
+        search: number;
+    };
+    throttled_millis: number;
+    failures: any[];
+}
+
+export interface ReindexRethrottleParams extends GenericParams {
+    requestsPerSecond: number;
+    taskId: string;
+}
+
+export interface RenderSearchTemplateParams extends GenericParams {
+    id: string;
+}
+
+export interface ScrollParams extends GenericParams {
+    scroll: TimeSpan;
+    scrollId: string;
+}
+
+export interface SearchParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    explain?: boolean;
+    storedFields?: NameList;
+    docvalueFields?: NameList;
+    fielddataFields?: NameList;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    preference?: string;
+    q?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: NameList;
+    suggestField?: string;
+    suggestMode?: "missing" | "popular" | "always";
+    suggestSize?: number;
+    suggestText?: string;
+    timeout?: TimeSpan;
+    trackScores?: boolean;
+    version?: boolean;
+    requestCache?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
+
+export interface SearchResponse<T> {
+    took: number;
+    timed_out: boolean;
+    _scroll_id?: string;
+    _shards: ShardsResponse;
+    hits: {
+        total: number;
+        max_score: number;
+        hits: Array<{
+            _index: string;
+            _type: string;
+            _id: string;
+            _score: number;
+            _source: T;
+            _version?: number;
+            _explanation?: Explanation;
+            fields?: any;
+            highlight?: any;
+            inner_hits?: any;
+            sort?: string[];
+        }>;
+    };
+    aggregations?: any;
+}
+
+export interface SearchShardsParams extends GenericParams {
+    preference?: string;
+    routing?: string;
+    local?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+    type: NameList;
+}
+
+export interface SearchShardsResponse {
+    nodes: any;
+    shards: SearchShardsResponseShard[][];
+}
+
+export interface SearchShardsResponseShard {
+    index: string;
+    node: string;
+    primary: boolean;
+    share: number;
+    state: string;
+    allocation_id: {
+        id: string;
+    };
+    relocating_node: any;
+}
+
+export interface SearchTemplateParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    preference?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    index: NameList;
+    type: NameList;
+}
+
+export interface SuggestParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    preference?: string;
+    routing?: string;
+    index: NameList;
+}
+
+export interface TermvectorsParams extends GenericParams {
+    termStatistics?: boolean;
+    fieldStatistics?: boolean;
+    fields?: NameList;
+    offsets?: boolean;
+    positions?: boolean;
+    payloads?: boolean;
+    preference?: string;
+    routing?: string;
+    parent?: string;
+    realtime?: boolean;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+    id?: string;
+}
+
+export interface UpdateDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    fields?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    lang?: string;
+    parent?: string;
+    refresh?: Refresh;
+    retryOnConflict?: number;
+    routing?: string;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: "internal" | "force";
+    id: string;
+    index: string;
+    type: string;
+}
+
+export interface UpdateDocumentByQueryParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    explain?: boolean;
+    storedFields?: NameList;
+    docvalueFields?: NameList;
+    fielddataFields?: NameList;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    conflicts?: Conflicts;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    pipeline?: string;
+    preference?: string;
+    q?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    searchTimeout?: TimeSpan;
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: NameList;
+    suggestField?: string;
+    suggestMode?: "missing" | "popular" | "always";
+    suggestSize?: number;
+    suggestText?: string;
+    timeout?: TimeSpan;
+    trackScores?: boolean;
+    version?: boolean;
+    versionType?: boolean;
+    requestCache?: boolean;
+    refresh?: boolean;
+    waitForActiveShards?: string;
+    scrollSize?: number;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    index: NameList;
+    type: NameList;
+}
+
+export interface Cat {
+    aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
+    aliases(params: CatAliasesParams): Promise<any>;
+    allocation(params: CatAllocationParams, callback: (error: any, response: any) => void): void;
+    allocation(params: CatAllocationParams): Promise<any>;
+    count(params: CatCountParams, callback: (error: any, response: any) => void): void;
+    count(params: CatAllocationParams): Promise<any>;
+    fielddata(params: CatFielddataParams, callback: (error: any, response: any) => void): void;
+    fielddata(params: CatFielddataParams): Promise<any>;
+    health(params: CatHealthParams, callback: (error: any, response: any) => void): void;
+    health(params: CatHealthParams): Promise<any>;
+    help(params: CatHelpParams, callback: (error: any, response: any) => void): void;
+    help(params: CatHelpParams): Promise<any>;
+    indices(params: CatIndicesParams, callback: (error: any, response: any) => void): void;
+    indices(params: CatIndicesParams): Promise<any>;
+    master(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    master(params: CatCommonParams): Promise<any>;
+    nodeattrs(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    nodeattrs(params: CatCommonParams): Promise<any>;
+    nodes(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    nodes(params: CatCommonParams): Promise<any>;
+    pendingTasks(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    pendingTasks(params: CatCommonParams): Promise<any>;
+    plugins(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    plugins(params: CatCommonParams): Promise<any>;
+    recovery(params: CatRecoveryParams, callback: (error: any, response: any) => void): void;
+    recovery(params: CatRecoveryParams): Promise<any>;
+    repositories(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    repositories(params: CatCommonParams): Promise<any>;
+    segments(params: CatSegmentsParams, callback: (error: any, response: any) => void): void;
+    segments(params: CatSegmentsParams): Promise<any>;
+    shards(params: CatShardsParams, callback: (error: any, response: any) => void): void;
+    shards(params: CatShardsParams): Promise<any>;
+    snapshots(params: CatSnapshotsParams, callback: (error: any, response: any) => void): void;
+    snapshots(params: CatSnapshotsParams): Promise<any>;
+    tasks(params: CatTasksParams, callback: (error: any, response: any) => void): void;
+    tasks(params: CatTasksParams): Promise<any>;
+    threadPool(params: CatThreadPoolParams, callback: (error: any, response: any) => void): void;
+    threadPool(params: CatThreadPoolParams): Promise<any>;
+}
+
+export type CatBytes = "b" | "k" | "kb" | "m" | "mb" | "g" | "gb" | "t" | "tb" | "p" | "pb";
+
+export interface CatCommonParams extends GenericParams {
+    format: string;
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatAliasesParams extends CatCommonParams {
+    name?: NameList;
+}
+
+export interface CatAllocationParams extends CatCommonParams {
+    bytes?: CatBytes;
+    nodeId?: NameList;
+}
+
+export interface CatCountParams extends CatCommonParams {
+    index?: NameList;
+}
+
+export interface CatFielddataParams extends CatCommonParams {
+    bytes?: CatBytes;
+    fields?: NameList;
+}
+
+export interface CatHealthParams extends CatCommonParams {
+    ts?: boolean;
+}
+
+export interface CatHelpParams extends GenericParams {
+    help?: boolean;
+}
+
+export interface CatIndicesParams extends CatCommonParams {
+    bytes?: CatBytes;
+    health?: "green" | "yellow" | "red";
+    pri?: boolean;
+    index?: NameList;
+}
+
+export interface CatRecoveryParams extends GenericParams {
+    format: string;
+    bytes?: CatBytes;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatSegmentsParams extends GenericParams {
+    format: string;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+    index?: NameList;
+}
+
+export interface CatShardsParams extends CatCommonParams {
+    index?: NameList;
+}
+
+export interface CatSnapshotsParams extends GenericParams {
+    format: string;
+    ignoreUnavailable?: boolean;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+    repository?: NameList;
+}
+
+export interface CatTasksParams extends GenericParams {
+    format: string;
+    nodeId?: NameList;
+    actions?: NameList;
+    detailed?: boolean;
+    parentNode?: string;
+    parentTask?: number;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatThreadPoolParams extends CatCommonParams {
+    size?: "" | "k" | "m" | "g" | "t" | "p";
+    threadPoolPatterns?: NameList;
+}
+
+export interface Cluster {
+    allocationExplain(params: ClusterAllocationExplainParams, callback: (error: any, response: any) => void): void;
+    allocationExplain(params: ClusterAllocationExplainParams): Promise<any>;
+    getSettings(params: ClusterGetSettingsParams, callback: (error: any, response: any) => void): void;
+    getSettings(params: ClusterGetSettingsParams): Promise<any>;
+    health(params: ClusterHealthParams, callback: (error: any, response: any) => void): void;
+    health(params: ClusterHealthParams): Promise<any>;
+    pendingTasks(params: ClusterPendingTasksParams, callback: (error: any, response: any) => void): void;
+    pendingTasks(params: ClusterPendingTasksParams): Promise<any>;
+    putSettings(params: ClusterPutSettingsParams, callback: (error: any, response: any) => void): void;
+    putSettings(params: ClusterPutSettingsParams): Promise<any>;
+    reroute(params: ClusterRerouteParams, callback: (error: any, response: any) => void): void;
+    reroute(params: ClusterRerouteParams): Promise<any>;
+    state(params: ClusterStateParams, callback: (error: any, response: any) => void): void;
+    state(params: ClusterStateParams): Promise<any>;
+    stats(params: ClusterStatsParams, callback: (error: any, response: any) => void): void;
+    stats(params: ClusterStatsParams): Promise<any>;
+}
+
+export interface ClusterAllocationExplainParams extends GenericParams {
+    includeYesDecisions?: boolean;
+    includeDiskInfo?: boolean;
+}
+
+export interface ClusterGetSettingsParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    includeDefaults?: boolean;
+}
+
+export interface ClusterHealthParams extends GenericParams {
+    level?: "cluster" | "indices" | "shards";
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: string;
+    waitForNodes?: string;
+    waitForEvents?: "immediate" | "urgent" | "high" | "normal" | "low" | "languid";
+    waitForRelocatingShards?: boolean;
+    waitForStatus?: "green" | "yellow" | "red";
+    index?: NameList;
+}
+
+export interface ClusterPendingTasksParams extends GenericParams {
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+}
+
+export interface ClusterPutSettingsParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+}
+
+export interface ClusterRerouteParams extends GenericParams {
+    dryRun?: boolean;
+    explain?: boolean;
+    retryFailed?: boolean;
+    metric?: NameList;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+}
+
+export interface ClusterStateParams extends GenericParams {
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    flatSettings?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+    metric?: NameList;
+}
+
+export interface ClusterStatsParams extends GenericParams {
+    flatSettings?: boolean;
+    human?: boolean;
+    timeout?: TimeSpan;
+    nodeId?: NameList;
+}
+
+export class Indices {
+    analyze(params: IndicesAnalyzeParams, callback: (error: any, response: any, status: any) => void): void;
+    analyze(params: IndicesAnalyzeParams): Promise<any>;
+    clearCache(params: IndicesClearCacheParams, callback: (error: any, response: any, status: any) => void): void;
+    clearCache(params: IndicesClearCacheParams): Promise<any>;
+    close(params: IndicesCloseParams, callback: (error: any, response: any, status: any) => void): void;
+    close(params: IndicesCloseParams): Promise<any>;
+    create(params: IndicesCreateParams, callback: (error: any, response: any, status: any) => void): void;
+    create(params: IndicesCreateParams): Promise<any>;
+    delete(params: IndicesDeleteParams, callback: (error: any, response: any, status: any) => void): void;
+    delete(params: IndicesDeleteParams): Promise<any>;
+    deleteAlias(params: IndicesDeleteAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteAlias(params: IndicesDeleteAliasParams): Promise<any>;
+    deleteTemplate(params: IndicesDeleteTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteTemplate(params: IndicesDeleteTemplateParams): Promise<any>;
+    exists(params: IndicesExistsParams, callback: (error: any, response: any, status: any) => void): void;
+    exists(params: IndicesExistsParams): Promise<any>;
+    existsAlias(params: IndicesExistsAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    existsAlias(params: IndicesExistsAliasParams): Promise<any>;
+    existsTemplate(params: IndicesExistsTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    existsTemplate(params: IndicesExistsTemplateParams): Promise<any>;
+    existsType(params: IndicesExistsTypeParams, callback: (error: any, response: any, status: any) => void): void;
+    existsType(params: IndicesExistsTypeParams): Promise<any>;
+    flush(params: IndicesFlushParams, callback: (error: any, response: any, status: any) => void): void;
+    flush(params: IndicesFlushParams): Promise<any>;
+    flushSynced(params: IndicesFlushSyncedParams, callback: (error: any, response: any, status: any) => void): void;
+    flushSynced(params: IndicesFlushSyncedParams): Promise<any>;
+    forcemerge(params: IndicesForcemergeParams, callback: (error: any, response: any, status: any) => void): void;
+    forcemerge(params: IndicesForcemergeParams): Promise<any>;
+    get(params: IndicesGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: IndicesGetParams): Promise<any>;
+    getAlias(params: IndicesGetAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    getAlias(params: IndicesGetAliasParams): Promise<any>;
+    getFieldMapping(params: IndicesGetFieldMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    getFieldMapping(params: IndicesGetFieldMappingParams): Promise<any>;
+    getMapping(params: IndicesGetMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    getMapping(params: IndicesGetMappingParams): Promise<any>;
+    getSettings(params: IndicesGetSettingsParams, callback: (error: any, response: any, status: any) => void): void;
+    getSettings(params: IndicesGetSettingsParams): Promise<any>;
+    getTemplate(params: IndicesGetTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    getTemplate(params: IndicesGetTemplateParams): Promise<any>;
+    getUpgrade(params: IndicesGetUpgradeParams, callback: (error: any, response: any, status: any) => void): void;
+    getUpgrade(params: IndicesGetUpgradeParams): Promise<any>;
+    open(params: IndicesOpenParams, callback: (error: any, response: any, status: any) => void): void;
+    open(params: IndicesOpenParams): Promise<any>;
+    putAlias(params: IndicesPutAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    putAlias(params: IndicesPutAliasParams): Promise<any>;
+    putMapping(params: IndicesPutMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    putMapping(params: IndicesPutMappingParams): Promise<any>;
+    putSettings(params: IndicesPutSettingsParams, callback: (error: any, response: any, status: any) => void): void;
+    putSettings(params: IndicesPutSettingsParams): Promise<any>;
+    putTemplate(params: IndicesPutTemplateParams, callback: (error: any, response: any) => void): void;
+    putTemplate(params: IndicesPutTemplateParams): Promise<any>;
+    recovery(params: IndicesRecoveryParams, callback: (error: any, response: any) => void): void;
+    recovery(params: IndicesRecoveryParams): Promise<any>;
+    refresh(params: IndicesRefreshParams, callback: (error: any, response: any) => void): void;
+    refresh(params: IndicesRefreshParams): Promise<any>;
+    rollover(params: IndicesRolloverParams, callback: (error: any, response: IndicesRolloverResponse) => void): void;
+    rollover(params: IndicesRolloverParams): Promise<IndicesRolloverResponse>;
+    segments(params: IndicesSegmentsParams, callback: (error: any, response: any) => void): void;
+    segments(params: IndicesSegmentsParams): Promise<any>;
+    shardStores(params: IndicesShardStoresParams, callback: (error: any, response: any) => void): void;
+    shardStores(params: IndicesShardStoresParams): Promise<any>;
+    shrink(params: IndicesShrinkParams, callback: (error: any, response: any) => void): void;
+    shrink(params: IndicesShrinkParams): Promise<any>;
+    stats(params: IndicesStatsParams, callback: (error: any, response: any) => void): void;
+    stats(params: IndicesStatsParams): Promise<any>;
+    updateAliases(params: IndicesUpdateAliasesParams, callback: (error: any, response: any) => void): void;
+    updateAliases(params: IndicesUpdateAliasesParams): Promise<any>;
+    upgrade(params: IndicesUpgradeParams, callback: (error: any, response: any) => void): void;
+    upgrade(params: IndicesUpgradeParams): Promise<any>;
+    validateQuery(params: IndicesValidateQueryParams, callback: (error: any, response: any) => void): void;
+    validateQuery(params: IndicesValidateQueryParams): Promise<any>;
+}
+
+export interface IndicesAnalyzeParams extends GenericParams {
+    analyzer?: string;
+    charFilter?: NameList;
+    field?: string;
+    filter?: NameList;
+    index?: string;
+    perferLocal?: boolean;
+    text?: NameList;
+    tokenizer?: string;
+    explain?: boolean;
+    attributes?: NameList;
+    format?: "";
+}
+
+export interface IndicesClearCacheParams extends GenericParams {
+    fieldData?: boolean;
+    fielddata?: boolean;    // yes the docs really have both
+    fields?: NameList;
+    query?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+    recycler?: boolean;
+    request?: boolean;
+}
+
+export interface IndicesCloseParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesCreateParams extends GenericParams {
+    waitForActiveShards?: string;
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    updateAllTypes?: boolean;
+    index: string;
+}
+
+export interface IndicesDeleteParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index: NameList;
+}
+
+export interface IndicesDeleteAliasParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index: NameList;
+    name: NameList;
+}
+
+export interface IndicesDeleteTemplateParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    name: string;
+}
+
+export interface IndicesExistsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index: NameList;
+}
+
+export interface IndicesExistsAliasParams extends IndicesExistsParams {
+    name: NameList;
+}
+
+export interface IndicesExistsTemplateParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    name: NameList;
+}
+
+export interface IndicesExistsTypeParams extends IndicesExistsParams {
+    type: NameList;
+}
+
+export interface IndicesFlushParams extends GenericParams {
+    force?: boolean;
+    waitIfOngoing?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesFlushSyncedParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesForcemergeParams extends GenericParams {
+    flush?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    maxNumSegments?: number;
+    onlyExpungeDeletes?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    waitForMerge?: boolean;
+    index: NameList;
+}
+
+export interface IndicesGetParams extends GenericParams {
+    local?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    human?: boolean;
+    includeDefaults?: boolean;
+    index?: NameList;
+    feature?: NameList;
+}
+
+export interface IndicesGetAliasParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    name?: NameList;
+}
+
+export interface IndicesGetFieldMappingParams extends GenericParams {
+    includeDefaults?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    type?: NameList;
+    fields?: NameList;
+}
+
+export interface IndicesGetMappingParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
+
+export interface IndicesGetSettingsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    local?: boolean;
+    human?: boolean;
+    includeDefaults?: boolean;
+    index?: NameList;
+    name?: NameList;
+}
+
+export interface IndicesGetTemplateParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    local?: boolean;
+    name?: NameList;
+}
+
+export interface IndicesGetUpgradeParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    human?: boolean;
+    index?: NameList;
+}
+
+export interface IndicesOpenParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+}
+
+export interface IndicesPutAliasParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index?: NameList;
+    name: NameList;
+}
+
+export interface IndicesPutMappingParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    updateAllTypes?: boolean;
+    index: NameList;
+    type: string;
+    body: any;
+}
+
+export interface IndicesPutSettingsParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    preserveExisting?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    index: NameList;
+    body: any;
+}
+
+export interface IndicesPutTemplateParams extends GenericParams {
+    order?: number;
+    create?: boolean;
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    flatSettings?: boolean;
+    name: string;
+    body: any;
+}
+
+export interface IndicesRecoveryParams extends GenericParams {
+    detailed?: boolean;
+    activeOnly?: boolean;
+    human?: boolean;
+    index: NameList;
+}
+
+export interface IndicesRefreshParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    force?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    index: NameList;
+}
+
+export interface IndicesRolloverParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: number | string;
+    alias?: string;
+    newIndex?: string;
+}
+
+export interface IndicesRolloverResponse {
+    acknowledged: boolean;
+    shards_acknowledged: boolean;
+    old_index: string;
+    new_index: string;
+    rolled_over: boolean;
+    dry_run: boolean;
+    conditions: { [condition: string]: boolean };
+}
+
+export interface IndicesSegmentsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    human?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    verbose?: boolean;
+    index: NameList;
+}
+
+export interface IndicesShardStoresParams extends GenericParams {
+    status?: NameList;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    operationThreading?: any;   // even the docs don't know what this does
+    index: NameList;
+}
+
+export interface IndicesShrinkParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: string | number;
+    index: string;
+    target: string;
+}
+
+export interface IndicesStatsParams extends GenericParams {
+    completionFields?: NameList;
+    fielddataFields?: NameList;
+    fields?: NameList;
+    groups?: NameList;
+    human?: boolean;
+    level?: "cluster" | "indices" | "shards";
+    types?: NameList;
+    index: NameList;
+    metric?: NameList;
+}
+
+export interface IndicesUpdateAliasesParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    body: {
+        actions: IndicesUpdateAliasesParamsAction[];
+    };
+}
+
+export interface IndicesUpdateAliasesParamsAction {
+    add?: {
+        index?: string;
+        indices?: string[];
+        alias: string;
+    };
+    remove?: {
+        index?: string;
+        indices?: string[];
+        alias: string;
+    };
+    remove_index?: {
+        index: string;
+    };
+}
+
+export interface IndicesUpgradeParams extends GenericParams {
+    expandWildcards?: ExpandWildcards;
+    ignoreUnavailable?: boolean;
+    waitForCompletion?: boolean;
+    onlyAncientSegments?: boolean;
+    index: NameList;
+}
+
+export interface IndicesValidateQueryParams extends GenericParams {
+    explain?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    operationThreading?: any;   // even the docs don't know what this does
+    q?: string;
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    rewrite?: boolean;
+    index: NameList;
+    type?: NameList;
+}
+
+export class Ingest {
+    deletePipeline(params: IngestDeletePipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    deletePipeline(params: IngestDeletePipelineParams): Promise<any>;
+    getPipeline(params: IngestGetPipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    getPipeline(params: IngestGetPipelineParams): Promise<any>;
+    putPipeline(params: IngestPutPipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    putPipeline(params: IngestPutPipelineParams): Promise<any>;
+    simulate(params: IngestSimulateParams, callback: (error: any, response: any, status: any) => void): void;
+    simulate(params: IngestSimulateParams): Promise<any>;
+}
+
+export interface IngestDeletePipelineParams extends GenericParams {
+    masterTimeout?: number;
+    timeout?: number;
+    id: string;
+}
+
+export interface IngestGetPipelineParams extends GenericParams {
+    masterTimeout?: number;
+    id: string;
+}
+
+export interface IngestPutPipelineParams extends GenericParams {
+    masterTimeout?: number;
+    timeout?: number;
+    id: string;
+    body: any;
+}
+
+export interface IngestSimulateParams extends GenericParams {
+    verbose?: boolean;
+    id: string;
+}
+
+export class Nodes {
+    hotThreads(params: NodesHotThreadsParams, callback: (error: any, response: any, status: any) => void): void;
+    hotThreads(params: NodesHotThreadsParams): Promise<any>;
+    info(params: NodesInfoParams, callback: (error: any, response: any, status: any) => void): void;
+    info(params: NodesInfoParams): Promise<any>;
+    stats(params: NodesStatsParams, callback: (error: any, response: any, status: any) => void): void;
+    stats(params: NodesStatsParams): Promise<any>;
+}
+
+export interface NodesHotThreadsParams extends GenericParams {
+    interval?: TimeSpan;
+    snapshots?: number;
+    threads?: number;
+    ignoreIdleThreads?: boolean;
+    type?: "cpu" | "wait" | "blocked";
+    timeout?: TimeSpan;
+    nodeId: NameList;
+}
+
+export interface NodesInfoParams extends GenericParams {
+    flatSettings?: boolean;
+    human?: boolean;
+    timeout?: TimeSpan;
+    nodeId: NameList;
+    metric?: NameList;
+}
+
+export interface NodesStatsParams extends GenericParams {
+    completionFields?: NameList;
+    fielddataFields?: NameList;
+    fields?: NameList;
+    groups?: boolean;
+    human?: boolean;
+    level?: "indices" | "node" | "shards";
+    types?: NameList;
+    timeout?: TimeSpan;
+    metric?: NameList;
+    indexMetric?: NameList;
+    nodeId?: NameList;
+}
+
+export class Snapshot {
+    create(params: SnapshotCreateParams, callback: (error: any, response: any, status: any) => void): void;
+    create(params: SnapshotCreateParams): Promise<any>;
+    createRepository(params: SnapshotCreateRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    createRepository(params: SnapshotCreateRepositoryParams): Promise<any>;
+    delete(params: SnapshotDeleteParams, callback: (error: any, response: any, status: any) => void): void;
+    delete(params: SnapshotDeleteParams): Promise<any>;
+    deleteRepository(params: SnapshotDeleteRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteRepository(params: SnapshotDeleteRepositoryParams): Promise<any>;
+    get(params: SnapshotGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: SnapshotGetParams): Promise<any>;
+    getRepository(params: SnapshotGetRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    getRepository(params: SnapshotGetRepositoryParams): Promise<any>;
+    restore(params: SnapshotRestoreParams, callback: (error: any, response: any, status: any) => void): void;
+    restore(params: SnapshotRestoreParams): Promise<any>;
+    status(params: SnapshotStatusParams, callback: (error: any, response: any, status: any) => void): void;
+    status(params: SnapshotStatusParams): Promise<any>;
+    verifyRepository(params: SnapshotVerifyRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    verifyRepository(params: SnapshotVerifyRepositoryParams): Promise<any>;
+}
+
+export interface SnapshotCreateParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    waitForCompletion?: boolean;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotCreateRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    verify?: boolean;
+    repository: string;
+}
+
+export interface SnapshotDeleteParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotDeleteRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    repository: string;
+}
+
+export interface SnapshotGetParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    repository: string;
+    snapshot: NameList;
+}
+
+export interface SnapshotGetRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    local?: boolean;
+    repository: NameList;
+}
+
+export interface SnapshotRestoreParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    waitForCompletion?: boolean;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotStatusParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    repository: string;
+    snapshot: NameList;
+}
+
+export interface SnapshotVerifyRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    repository: string;
+}
+
+export class Tasks {
+    cancel(params: TasksCancelParams, callback: (error: any, response: any, status: any) => void): void;
+    cancel(params: TasksCancelParams): Promise<any>;
+    get(params: TasksGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: TasksGetParams): Promise<any>;
+    list(params: TasksListParams, callback: (error: any, response: any, status: any) => void): void;
+    list(params: TasksListParams): Promise<any>;
+}
+
+export interface TasksCancelParams extends GenericParams {
+    nodeId?: NameList;
+    actions?: NameList;
+    parentNode?: string;
+    parentTask?: string;
+    taskId?: string;
+}
+
+export interface TasksGetParams extends GenericParams {
+    waitForCompletion?: boolean;
+    taskId?: string;
+}
+
+export interface TasksListParams extends GenericParams {
+    nodeId?: NameList;
+    actions?: NameList;
+    detailed?: boolean;
+    parentNode?: string;
+    parentTask?: string;
+    waitForCompletion?: boolean;
+    groupBy?: "nodes" | "parents";
+}
+
+export namespace errors {
+    class _Abstract extends Error {}
+    class Generic extends _Abstract {}
+    class ConnectionFault extends _Abstract {}
+    class NoConnections extends _Abstract {}
+    class Serialization extends _Abstract {}
+    class RequestTypeError extends _Abstract {}
+
+    class AuthenticationException extends _Abstract {}
+    class AuthorizationException extends _Abstract {}
+    class BadGateway extends _Abstract {}
+    class BadRequest extends _Abstract {}
+    class BlockedByWindowsParentalControls extends _Abstract {}
+    class ClientClosedRequest extends _Abstract {}
+    class Conflict extends _Abstract {}
+    class ExpectationFailed extends _Abstract {}
+    class GatewayTimeout extends _Abstract {}
+    class HTTPToHTTPS extends _Abstract {}
+    class HTTPVersionNotSupported extends _Abstract {}
+    class ImATeapot extends _Abstract {}
+    class InternalServerError extends _Abstract {}
+    class LengthRequired extends _Abstract {}
+    class MethodNotAllowed extends _Abstract {}
+    class MovedPermanently extends _Abstract {}
+    class MultipleChoices extends _Abstract {}
+    class NotAcceptable extends _Abstract {}
+    class NotExtended extends _Abstract {}
+    class NotFound extends _Abstract {}
+    class NotImplemented extends _Abstract {}
+    class NotModified extends _Abstract {}
+    class PaymentRequired extends _Abstract {}
+    class PermanentRedirect extends _Abstract {}
+    class PreconditionFailed extends _Abstract {}
+    class ProxyAuthenticationRequired extends _Abstract {}
+    class RequestedRangeNotSatisfiable extends _Abstract {}
+    class RequestEntityTooLarge extends _Abstract {}
+    class RequestHeaderTooLarge extends _Abstract {}
+    class RequestTimeout extends _Abstract {}
+    class RequestURITooLong extends _Abstract {}
+    class SeeOther extends _Abstract {}
+    class ServiceUnavailable extends _Abstract {}
+    class TemporaryRedirect extends _Abstract {}
+    class TooManyConnectionsFromThisIP extends _Abstract {}
+    class TooManyRequests extends _Abstract {}
+    class UnsupportedMediaType extends _Abstract {}
+    class UpgradeRequired extends _Abstract {}
+    class UseProxy extends _Abstract {}
+    class VariantAlsoNegotiates extends _Abstract {}
 }
diff --git a/types/elasticsearch/tsconfig.json b/types/elasticsearch/tsconfig.json
index 2d62eac43d..21ac20d7e9 100644
--- a/types/elasticsearch/tsconfig.json
+++ b/types/elasticsearch/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "elasticsearch-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/elasticsearch/tslint.json b/types/elasticsearch/tslint.json
new file mode 100644
index 0000000000..e9003e412b
--- /dev/null
+++ b/types/elasticsearch/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-unnecessary-generics": false,
+        "no-empty-interface": false
+    }
+}
diff --git a/types/electron-debug/tslint.json b/types/electron-debug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/electron-debug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/electron-devtools-installer/tslint.json b/types/electron-devtools-installer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/electron-devtools-installer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/electron-json-storage/electron-json-storage-tests.ts b/types/electron-json-storage/electron-json-storage-tests.ts
index 07d8461bed..2429f6a95f 100644
--- a/types/electron-json-storage/electron-json-storage-tests.ts
+++ b/types/electron-json-storage/electron-json-storage-tests.ts
@@ -2,8 +2,9 @@ import electron = require('electron');
 import storage = require('electron-json-storage');
 
 const DATA_PATH = '~/Downloads';
+const NEW_DATA_PATH = `${DATA_PATH}/new-data-path`;
 
-console.log(storage.DEFAULT_DATA_PATH.length);
+console.log(storage.getDefaultDataPath().length);
 
 storage.setDataPath(DATA_PATH);
 console.log(DATA_PATH.length);
@@ -12,31 +13,59 @@ console.log(storage.getDataPath().length);
 
 storage.set('foo', { foo: 'bar' }, (err: any) => { });
 storage.set('bar', { foo: 'bar' }, (err: any) => { });
+storage.set('baz', { foo: 'bar' }, {dataPath: NEW_DATA_PATH}, (err: any) => { });
 
 storage.get('foo', (err: any, data: object) => {
     console.log(JSON.stringify(data));
 });
 
+storage.get('baz', {dataPath: NEW_DATA_PATH}, (err: any, data: object) => {
+    console.log(JSON.stringify(data));
+});
+
 storage.getMany(['foo', 'bar'], (err: any, data: object) => {
     console.log(JSON.stringify(data));
 });
+storage.getMany(['baz'], {dataPath: NEW_DATA_PATH}, (err: any, data: object) => {
+    console.log(JSON.stringify(data));
+});
 
 storage.getAll((err: any, data: object) => {
     console.log(JSON.stringify(data));
 });
 
+storage.getAll({dataPath: NEW_DATA_PATH}, (err: any, data: object) => {
+    console.log(JSON.stringify(data));
+});
+
 storage.has('foo', (err: any, hasKey: boolean) => {
     console.log("hasKey?: %s", hasKey);
 });
 
+storage.has('baz', {dataPath: NEW_DATA_PATH}, (err: any, hasKey: boolean) => {
+    console.log("hasKey?: %s", hasKey);
+});
+
 storage.keys((err: any, keys: string[]) => {
     console.log(keys);
 });
 
+storage.keys({dataPath: NEW_DATA_PATH}, (err: any, keys: string[]) => {
+    console.log(keys);
+});
+
 storage.remove("foo", (err: any) => {
     console.log(err);
 });
 
+storage.remove("baz", {dataPath: NEW_DATA_PATH}, (err: any) => {
+    console.log(err);
+});
+
 storage.clear((err: any) => {
     console.log(err);
 });
+
+storage.clear({dataPath: NEW_DATA_PATH}, (err: any) => {
+    console.log(err);
+});
diff --git a/types/electron-json-storage/index.d.ts b/types/electron-json-storage/index.d.ts
index cafa6c4171..75d6cf3983 100644
--- a/types/electron-json-storage/index.d.ts
+++ b/types/electron-json-storage/index.d.ts
@@ -1,18 +1,28 @@
-// Type definitions for electron-json-storage 3.1
+// Type definitions for electron-json-storage 4.0
 // Project: https://github.com/electron-userland/electron-json-storage
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>,
-//                 nrlquaker <https://github.com/nrlquaker>
+//                 nrlquaker <https://github.com/nrlquaker>,
+//                 John Woodruff <https://github.com/jbw91>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export const DEFAULT_DATA_PATH: string;
-export function setDataPath(directory: string): void;
+export interface DataOptions { dataPath: string; }
+export function getDefaultDataPath(): string;
+export function setDataPath(directory?: string): void;
 export function getDataPath(): string;
 export function get(key: string, callback: (error: any, data: object) => void): void;
+export function get(key: string, options: DataOptions, callback: (error: any, data: object) => void): void;
 export function getMany(keys: ReadonlyArray<string>, callback: (error: any, data: object) => void): void;
+export function getMany(keys: ReadonlyArray<string>, options: DataOptions, callback: (error: any, data: object) => void): void;
 export function getAll(callback: (error: any, data: object) => void): void;
+export function getAll(options: DataOptions, callback: (error: any, data: object) => void): void;
 export function set(key: string, json: object, callback: (error: any) => void): void;
+export function set(key: string, json: object, options: DataOptions, callback: (error: any) => void): void;
 export function has(key: string, callback: (error: any, hasKey: boolean) => void): void;
+export function has(key: string, options: DataOptions, callback: (error: any, hasKey: boolean) => void): void;
 export function keys(callback: (error: any, keys: string[]) => void): void;
+export function keys(options: DataOptions, callback: (error: any, keys: string[]) => void): void;
 export function remove(key: string, callback: (error: any) => void): void;
+export function remove(key: string, options: DataOptions, callback: (error: any) => void): void;
 export function clear(callback: (error: any) => void): void;
+export function clear(options: DataOptions, callback: (error: any) => void): void;
diff --git a/types/electron-notifications/package.json b/types/electron-notifications/package.json
index 73c77d2608..880e1b40f6 100644
--- a/types/electron-notifications/package.json
+++ b/types/electron-notifications/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "electron": "^1.7.5"
     }
-}
\ No newline at end of file
+}
diff --git a/types/electron-notifications/tslint.json b/types/electron-notifications/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/electron-notifications/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/electron-notify/package.json b/types/electron-notify/package.json
index 73c77d2608..880e1b40f6 100644
--- a/types/electron-notify/package.json
+++ b/types/electron-notify/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "electron": "^1.7.5"
     }
-}
\ No newline at end of file
+}
diff --git a/types/electron-notify/tslint.json b/types/electron-notify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/electron-notify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/electron-settings/electron-settings-tests.ts b/types/electron-settings/electron-settings-tests.ts
index a1fad17f10..0ff969eb42 100644
--- a/types/electron-settings/electron-settings-tests.ts
+++ b/types/electron-settings/electron-settings-tests.ts
@@ -12,6 +12,7 @@ settings.setAll({foo: {bar: 'test'}}, {prettify: true}); // $ExpectType Settings
 
 settings.get('foo.bar'); // $ExpectType JsonValue
 settings.get('foo.bar', 'test'); // $ExpectType JsonValue
+settings.get('foo.bar', 'test',  {prettify: true}); // $ExpectType JsonValue
 
 settings.getAll(); // $ExpectType JsonValue
 
@@ -24,3 +25,6 @@ settings.deleteAll({prettify: true}); // $ExpectType Settings
 settings.watch('foo.bar', () => {}); // $ExpectType SettingsObserver
 
 settings.file(); // $ExpectType string
+
+settings.setPath('~/Documents'); // $ExpectType Settings
+settings.clearPath(); // $ExpectType Settings
diff --git a/types/electron-settings/index.d.ts b/types/electron-settings/index.d.ts
index 21bc1fb446..8ee10bf1f7 100644
--- a/types/electron-settings/index.d.ts
+++ b/types/electron-settings/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for electron-settings 3.0
+// Type definitions for electron-settings 3.1
 // Project: https://github.com/nathanbuchar/electron-settings#readme
-// Definitions by: Ian Copp <https://github.com/icopp>
+// Definitions by: Ian Copp <https://github.com/icopp>,
+//                 nrlquaker <https://github.com/nrlquaker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -56,7 +57,7 @@ interface Settings extends NodeJS.EventEmitter {
      *                     exist.
      * @see #getAll
      */
-    get(keyPath: string, defaultValue?: any): JsonValue;
+    get(keyPath: string, defaultValue?: any, options?: SettingsOptions): JsonValue;
 
     /**
      * Returns all settings.
@@ -109,6 +110,25 @@ interface Settings extends NodeJS.EventEmitter {
      * cause unintended consequences.
      */
     file(): string;
+
+    /**
+     * Sets a custom settings file path. By default, the settings file is
+     * stored in your app's user data directory in a file called Settings,
+     * but this method allows you to change this.
+     *
+     * Note: This method should be used cautiously, as it may have unintended
+     * consequences. In general, this method should only be used for
+     * debug purposes, and not in production apps.
+     * @param filePath An absolute path to the settings file where the
+     *                 user data will be saved.
+     */
+    setPath(filePath: string): Settings;
+
+    /**
+     * Clears the custom settings file path, if it exists.
+     * @see #setPath
+     */
+    clearPath(): Settings;
 }
 
 interface SettingsObserver {
diff --git a/types/electron-settings/v2/index.d.ts b/types/electron-settings/v2/index.d.ts
index a869fd52b8..2f767358e5 100644
--- a/types/electron-settings/v2/index.d.ts
+++ b/types/electron-settings/v2/index.d.ts
@@ -73,7 +73,6 @@ declare class Settings extends EventEmitter {
      *
      * @param keyPath The path to the key whose value we wish to set. This key need not already exist.
      * @param value The value to set the key at the chosen key path to. This must be a data type supported by JSON: object, array, string, number, boolean, or null.
-     * @param options
      * @throws if key path is not a string.
      * @throws if options is not an object.
      * @see setSync
@@ -91,7 +90,6 @@ declare class Settings extends EventEmitter {
      * Deletes the key and value at the chosen key path.
      *
      * @param keyPath The path to the key we wish to unset.
-     * @param options
      * @throws if keyPath is not a string.
      * @throws if options is not an object.
      * @see deleteSync
diff --git a/types/electron-spellchecker/electron-spellchecker-tests.ts b/types/electron-spellchecker/electron-spellchecker-tests.ts
new file mode 100644
index 0000000000..c62b3939c9
--- /dev/null
+++ b/types/electron-spellchecker/electron-spellchecker-tests.ts
@@ -0,0 +1,15 @@
+import {
+  SpellCheckHandler,
+  ContextMenuListener,
+  ContextMenuBuilder
+} from "electron-spellchecker";
+
+const spellCheckHandler = new SpellCheckHandler();
+spellCheckHandler.attachToInput();
+
+spellCheckHandler.switchLanguage("en-US");
+
+const contextMenuBuilder = new ContextMenuBuilder(spellCheckHandler);
+const contextMenuListener = new ContextMenuListener(info => {
+  contextMenuBuilder.showPopupMenu(info);
+});
diff --git a/types/electron-spellchecker/index.d.ts b/types/electron-spellchecker/index.d.ts
new file mode 100644
index 0000000000..8c02cc8794
--- /dev/null
+++ b/types/electron-spellchecker/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for electron-spellchecker 1.1
+// Project: https://github.com/paulcbetts/electron-spellchecker
+// Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="electron"/>
+
+export type ContextMenuFormatter = (options: { word: string }) => string;
+
+export class SpellCheckHandler {
+  currentSpellchecker: this;
+
+  attachToInput(): void;
+  autoUnloadDictionariesOnBlur(): void;
+  provideHintText(inputText: string): void;
+  switchLanguage(language: string): void;
+  getCorrectionsForMisspelling(misspelledWord: string): Promise<string[]>;
+  addToDictionary(text: string): void;
+
+  unsubscribe(): void;
+}
+
+export class ContextMenuBuilder {
+  constructor(
+    spellCheckHandler?: SpellCheckHandler,
+    target?: Electron.BrowserWindow | Electron.WebviewTag | null,
+    debugMode?: boolean,
+    processMenu?: (menu: Electron.Menu) => Electron.Menu
+  );
+
+  setAlternateStringFormatter(formatter: {
+    [key: string]: ContextMenuFormatter;
+  }): void;
+
+  showPopupMenu: (info: Electron.ContextMenuParams) => void;
+}
+
+export class ContextMenuListener {
+  constructor(
+    handler: (info: Electron.ContextMenuParams) => void,
+    target?: Electron.BrowserWindow | Electron.WebviewTag | null
+  );
+
+  unsubscribe(): void;
+}
diff --git a/types/electron-spellchecker/package.json b/types/electron-spellchecker/package.json
new file mode 100644
index 0000000000..eefa07e77a
--- /dev/null
+++ b/types/electron-spellchecker/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "electron": ">=1.6.10"
+  }
+}
diff --git a/types/electron-spellchecker/tsconfig.json b/types/electron-spellchecker/tsconfig.json
new file mode 100644
index 0000000000..539cc30156
--- /dev/null
+++ b/types/electron-spellchecker/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "electron-spellchecker-tests.ts"
+    ]
+}
diff --git a/types/electron-spellchecker/tslint.json b/types/electron-spellchecker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/electron-spellchecker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/electron-util/electron-util-tests.ts b/types/electron-util/electron-util-tests.ts
new file mode 100644
index 0000000000..074be207ae
--- /dev/null
+++ b/types/electron-util/electron-util-tests.ts
@@ -0,0 +1,41 @@
+import {
+    activeWindow,
+    app,
+    appReady,
+    chromeVersion,
+    electronVersion,
+    fixPathForAsarUnpack,
+    is,
+    platform,
+    runJS
+} from 'electron-util';
+
+app.app; // $ExpectType any
+app.BrowserWindow; // $ExpectType any
+app.dialog; // $ExpectType any
+
+is.macos; // $ExpectType boolean
+is.linux; // $ExpectType boolean
+is.windows; // $ExpectType boolean
+is.main; // $ExpectType boolean
+is.renderer; // $ExpectType boolean
+is.development; // $ExpectType boolean
+is.usingAsar; // $ExpectType boolean
+is.macAppStore; // $ExpectType boolean
+is.windowsStore; // $ExpectType boolean
+
+appReady; // $ExpectType Promise<void>
+electronVersion; // $ExpectType string
+chromeVersion; // $ExpectType string
+
+// $ExpectType string
+platform({
+    macos: 'm',
+    windows: 'w',
+    linux: 'l',
+    default: ''
+});
+
+activeWindow(); // $ExpectType any
+runJS(''); // $ExpectType Promise<any>
+fixPathForAsarUnpack('file://test.txt'); // $ExpectType string
diff --git a/types/electron-util/index.d.ts b/types/electron-util/index.d.ts
new file mode 100644
index 0000000000..275191b73d
--- /dev/null
+++ b/types/electron-util/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for electron-util 0.2
+// Project:  https://github.com/sindresorhus/electron-util
+// Definitions by: Kai Puth <https://github.com/kputh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const app: {
+    app: any,
+    BrowserWindow: any,
+    dialog: any,
+};
+
+export const is: {
+    macos: boolean,
+    linux: boolean,
+    windows: boolean,
+    main: boolean,
+    renderer: boolean,
+    development: boolean,
+    usingAsar: boolean,
+    macAppStore: boolean,
+    windowsStore: boolean,
+};
+
+export const appReady: Promise<void>;
+export const electronVersion: string;
+export const chromeVersion: string;
+
+export interface PlatformsParameter<T> {
+    macos?: T | (() => T);
+    windows?: T | (() => T);
+    linux?: T | (() => T);
+    default?: T | (() => T);
+}
+
+export function platform<T>(platforms: PlatformsParameter<T>): T;
+
+export function activeWindow(): any;
+
+export function runJS(code: string, window?: any): Promise<any>;
+
+export function fixPathForAsarUnpack(path: string): string;
diff --git a/types/electron-util/tsconfig.json b/types/electron-util/tsconfig.json
new file mode 100644
index 0000000000..c65e02a5c7
--- /dev/null
+++ b/types/electron-util/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "electron-util-tests.ts"
+    ]
+}
diff --git a/types/electron-util/tslint.json b/types/electron-util/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/electron-util/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/electron-window-state/package.json b/types/electron-window-state/package.json
index 73c77d2608..880e1b40f6 100644
--- a/types/electron-window-state/package.json
+++ b/types/electron-window-state/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "electron": "^1.7.5"
     }
-}
\ No newline at end of file
+}
diff --git a/types/electron-window-state/tslint.json b/types/electron-window-state/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/electron-window-state/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/electron-winstaller/index.d.ts b/types/electron-winstaller/index.d.ts
index bfc294d2a8..b5abd3c6ef 100644
--- a/types/electron-winstaller/index.d.ts
+++ b/types/electron-winstaller/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for electron-winstaller 2.6
 // Project: https://github.com/electron/windows-installer
-// Definitions by: Brendan Forster <https://github.com/shiftkey>
+// Definitions by: Brendan Forster <https://github.com/shiftkey>, Daniel Perez Alvarez <https://github.com/unindented>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export function convertVersion(version: string): string;
@@ -27,13 +27,19 @@ export interface Options {
      *
      * Defaults to the `author` field from your app's package.json file when unspecified.
      */
-    authors: string;
+    authors?: string;
     /**
      * The owners value for the nuget package metadata.
      *
      * Defaults to the `authors` field when unspecified.
      */
     owners?: string;
+    /**
+     * The copyright value for the nuget package metadata.
+     *
+     * Defaults to a generated copyright with `authors` or `owners`.
+     */
+    copyright?: string;
     /**
      * The name of your app's main `.exe` file.
      *
diff --git a/types/element-resize-detector/element-resize-detector-tests.ts b/types/element-resize-detector/element-resize-detector-tests.ts
new file mode 100644
index 0000000000..3c7af76280
--- /dev/null
+++ b/types/element-resize-detector/element-resize-detector-tests.ts
@@ -0,0 +1,19 @@
+import * as elementResizeDetectorMaker from 'element-resize-detector';
+
+const erd = elementResizeDetectorMaker({
+    strategy: "scroll"
+  });
+
+const testElement: HTMLElement = null;
+
+  erd.listenTo(testElement, (element) => {
+    const width = element.offsetWidth;
+    const height = element.offsetHeight;
+    console.log(`Size: " + ${width} + "x" + ${height}`);
+  });
+
+  erd.removeListener(testElement, (testElement) => {});
+
+  erd.removeAllListeners(testElement);
+
+  erd.uninstall(testElement);
diff --git a/types/element-resize-detector/index.d.ts b/types/element-resize-detector/index.d.ts
new file mode 100644
index 0000000000..5b6c1f00aa
--- /dev/null
+++ b/types/element-resize-detector/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for element-resize-detector 1.1
+// Project: https://github.com/wnr/element-resize-detector
+// Definitions by: Saransh Kataria <https://github.com/saranshkataria>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function elementResizeDetectorMaker(options?: elementResizeDetectorMaker.ErdmOptions): elementResizeDetectorMaker.Erd;
+
+declare namespace elementResizeDetectorMaker {
+    interface ErdmOptions {
+    strategy?: 'scroll' | 'object';
+    }
+
+    interface Erd {
+    listenTo(element: HTMLElement, callback: (elem: HTMLElement) => void): void;
+    removeListener(element: HTMLElement, callback: (elem: HTMLElement) => void): void;
+    removeAllListeners(element: HTMLElement): void;
+    uninstall(element: HTMLElement): void;
+    }
+}
+export = elementResizeDetectorMaker;
diff --git a/types/element-resize-detector/tsconfig.json b/types/element-resize-detector/tsconfig.json
new file mode 100644
index 0000000000..9400053488
--- /dev/null
+++ b/types/element-resize-detector/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "element-resize-detector-tests.ts"
+    ]
+}
diff --git a/types/element-resize-detector/tslint.json b/types/element-resize-detector/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/element-resize-detector/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/element-resize-event/tslint.json b/types/element-resize-event/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/element-resize-event/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/elm/tslint.json b/types/elm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/elm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/email-addresses/email-addresses-tests.ts b/types/email-addresses/email-addresses-tests.ts
deleted file mode 100644
index 7bf713e2c5..0000000000
--- a/types/email-addresses/email-addresses-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import addrs = require('email-addresses');
-
-var result: Object;
-
-result = addrs.parseOneAddress('Jack  Bowman  <jack@fogcreek.com >');
-result = addrs.parseAddressList(['foo@bar.com', 'Foo Bar <foo@bar.com>']);
diff --git a/types/email-addresses/index.d.ts b/types/email-addresses/index.d.ts
deleted file mode 100644
index 85161906ea..0000000000
--- a/types/email-addresses/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Type definitions for email-addresses 2.0.1
-// Project: https://github.com/jackbowman/email-addresses
-// Definitions by: John Grimsey <https://github.com/johngrimsey>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export function parseOneAddress(opts: any): any;
-export function parseAddressList(opts: any): any;
diff --git a/types/email-addresses/tsconfig.json b/types/email-addresses/tsconfig.json
deleted file mode 100644
index 2cda1ddc36..0000000000
--- a/types/email-addresses/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "email-addresses-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/email-templates/email-templates-tests.ts b/types/email-templates/email-templates-tests.ts
index 3c4493402c..a3311d6e81 100644
--- a/types/email-templates/email-templates-tests.ts
+++ b/types/email-templates/email-templates-tests.ts
@@ -1,29 +1,14 @@
 import EmailTemplates = require('email-templates');
 
-const EmailTemplate = EmailTemplates.EmailTemplate;
-const template = new EmailTemplate("./");
-const templateWithOptions = new EmailTemplate('./', {disableJuice: true, sassOptions: {}, juiceOptions: {}});
-const users = [
-    {
-        email: 'pappa.pizza@spaghetti.com',
-        name: {
-            first: 'Pappa',
-            last: 'Pizza'
-        }
+const email = new EmailTemplates({
+    message: {
+    from: 'Test@tesitng.com'
     },
-    {
-        email: 'mister.geppetto@spaghetti.com',
-        name: {
-            first: 'Mister',
-            last: 'Geppetto'
-        }
-    }
-];
+    transport: {
+        jsonTransport: true
+    }}
+);
 
-const templates = users.map((user) => {
-    return template.render(user)
-        .then((results) => {
-            const {html, subject, text} = results;
-            return html;
-        });
-});
+email.juiceResources('<p>bob</p><style>div{color:red;}</style><div/>');
+email.render('mars/html.pug', {name: 'elon'});
+email.send({template: 'mars', message: {to: 'elon@spacex.com'}, locals: {name: 'Elon'}});
diff --git a/types/email-templates/index.d.ts b/types/email-templates/index.d.ts
index d76c23aed3..12dceb181d 100644
--- a/types/email-templates/index.d.ts
+++ b/types/email-templates/index.d.ts
@@ -1,152 +1,104 @@
-// Type definitions for node-email-templates 2.6
+// Type definitions for node-email-templates 3.1
 // Project: https://github.com/niftylettuce/node-email-templates
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 //                 Matus Gura <https://github.com/gurisko>
+//                 Jacob Copeland <https://github.com/blankstar85>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * @summary Interface for result of email template.
- * @interface
- */
-interface EmailTemplateResults {
+interface EmailConfig {
     /**
-     * @summary HTML result.
-     * @type {string}
+     * The message <Nodemailer.com/message/>
      */
-    html: string;
-
+    message: any;
     /**
-     * @summary Text result.
-     * @type {string}
+     * The nodemailer Transport created via nodemailer.createTransport
      */
-    text: string;
-
+    transport: any;
     /**
-     * @summary Subject result.
-     * @type {string}
+     * The email template directory and engine information
      */
-    subject: string;
+    views?: any;
+    /**
+     *     Do you really want to send, false for test or development
+     */
+    send?: boolean;
+    /**
+     * Preview the email
+     */
+    preview?: boolean;
+    /**
+     * Set to object to configure and Enable <https://github.com/ladjs/il8n>
+     */
+    i18n?: any;
+    /**
+     * Pass a custom render function if necessary
+     */
+    render?: { view: string, locals: any };
+    /**
+     * <Https://github.com/werk85/node-html-to-text>
+     */
+    htmlToText?: any;
+    /**
+     * <https://github.com/Automattic/juice>
+     */
+    juice?: boolean;
+    /**
+     * <https://github.com/Automattic/juice>
+     */
+    juiceResources?: any;
 }
 
-/**
- * @summary Callback signature.
- */
-type EmailTemplateCallback = (err: any, results: EmailTemplateResults) => void;
-
-/**
- * @summary Interface for email-template options
- * @interface
- */
-interface EmailTemplateOptions {
-    disableJuice?: boolean;
-    juiceOptions?: any;
-    sassOptions?: any;
-}
-
-declare module "email-templates" {
+interface EmailOptions {
     /**
-     * @summary Email template class.
-     * @class
+     * The template name
      */
-    class EmailTemplate {
-        /**
-         * @summary Constructor.
-         * @param {string} templateDir The template directory.
-         */
-        constructor(templateDir: string, options?: EmailTemplateOptions);
-
-        /**
-         * @summary Render a single template.
-         * @param locals The template variables.
-         * @param locale The language code.
-         */
-        render(locals: any, locale?: string): Promise<EmailTemplateResults>;
-
-        /**
-         * @summary Render a single template.
-         * @param callback The callback function.
-         */
-        render(callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render a single template.
-         * @param locals The template variables.
-         * @param callback The callback function.
-         */
-        render(locals: any, callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render a single template.
-         * @param locals The template variables.
-         * @param locale The language code.
-         * @param callback The callback function.
-         */
-        render(locals: any, locale: string, callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render text
-         * @param locals The template variables.
-         * @param locale The language code.
-         */
-        renderText(locals: any, locale?: string): Promise<string>;
-
-        /**
-         * @summary Render text
-         * @param locals The template variables.
-         * @param callback The language code.
-         */
-        renderText(locals: any, callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render text
-         * @param locals The template variables.
-         * @param locale The language code.
-         * @param callback The language code.
-         */
-        renderText(locals: any, locale: string, callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render subject
-         * @param locals The template variables.
-         * @param locale The language code.
-         */
-        renderSubject(locals: any, locale?: string): Promise<string>;
-
-        /**
-         * @summary Render subject
-         * @param locals The template variables.
-         * @param callback The language code.
-         */
-        renderSubject(locals: any, callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render subject
-         * @param locals The template variables.
-         * @param locale The language code.
-         * @param callback The language code.
-         */
-        renderSubject(locals: any, locale: string, callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render HTML
-         * @param locals The template variables.
-         * @param locale The language code.
-         */
-        renderHtml(locals: any, locale?: string): Promise<string>;
-
-        /**
-         * @summary Render HTML
-         * @param locals The template variables.
-         * @param callback The language code.
-         */
-        renderHtml(locals: any, callback: EmailTemplateCallback): void;
-
-        /**
-         * @summary Render HTML
-         * @param locals The template variables.
-         * @param locale The language code.
-         * @param callback The language code.
-         */
-        renderHtml(locals: any, locale: string, callback: EmailTemplateCallback): void;
-    }
+    template: string;
+    /**
+     * Nodemailer Message <Nodemailer.com/message/>
+     */
+    message: any;
+    /**
+     * The Template Variables
+     */
+    locals: any;
 }
+
+declare class EmailTemplate {
+    constructor(config: EmailConfig);
+    /**
+     *   shorthand use of `juiceResources` with the config
+     *   mainly for custom renders like from a database).
+     */
+    juiceResources(html: string): Promise<string> ;
+    /**
+     *
+     * @param view The Html pug to render
+     * @param locals The template Variables
+     */
+    render(view: string, locals: any): Promise<string>;
+    /**
+     * Send the Email
+     */
+    send(options: EmailOptions): any;
+}
+
+declare namespace EmailTemplate {
+        /**
+         *   shorthand use of `juiceResources` with the config
+         *   mainly for custom renders like from a database).
+         */
+        function juiceResources(html: string): Promise<string> ;
+
+        /**
+         *
+         * @param view The Html pug to render
+         * @param locals The template Variables
+         */
+        function render(view: string, locals: any): Promise<string>;
+
+        /**
+         * Send the Email
+         */
+        function send(options: EmailOptions): any;
+}
+export = EmailTemplate;
diff --git a/types/email-templates/tslint.json b/types/email-templates/tslint.json
index d04b04bc22..d88586e5bd 100644
--- a/types/email-templates/tslint.json
+++ b/types/email-templates/tslint.json
@@ -1,7 +1,3 @@
 {
-  "extends": "dtslint/dt.json",
-  "rules": {
-    "no-declare-current-package": false,
-    "no-single-declare-module": false
-  }
+  "extends": "dtslint/dt.json"
 }
diff --git a/types/email-validator/email-validator-tests.ts b/types/email-validator/email-validator-tests.ts
deleted file mode 100644
index 81450bcab1..0000000000
--- a/types/email-validator/email-validator-tests.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-
-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/types/email-validator/index.d.ts b/types/email-validator/index.d.ts
deleted file mode 100644
index ad0fb761be..0000000000
--- a/types/email-validator/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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
-
-
-export declare function validate(email: String): boolean;
diff --git a/types/email-validator/tsconfig.json b/types/email-validator/tsconfig.json
deleted file mode 100644
index d126e18174..0000000000
--- a/types/email-validator/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "email-validator-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
new file mode 100644
index 0000000000..0ec24fae41
--- /dev/null
+++ b/types/ember-data/index.d.ts
@@ -0,0 +1,2157 @@
+// Type definitions for ember-data 2.14
+// Project: https://github.com/emberjs/data
+// Definitions by: Derek Wickern <https://github.com/dwickern>
+//                 Mike North <https://github.com/mike-north>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare module "ember-data" {
+    import Ember from "ember";
+    import RSVP from 'rsvp';
+    namespace DS {
+        /**
+         * Convert an hash of errors into an array with errors in JSON-API format.
+         */
+        function errorsHashToArray(errors: {}): any[];
+        /**
+         * Convert an array of errors in JSON-API format into an object.
+         */
+        function errorsArrayToHash(errors: any[]): {};
+        /**
+         * `DS.belongsTo` is used to define One-To-One and One-To-Many
+         * relationships on a [DS.Model](/api/data/classes/DS.Model.html).
+         */
+        function belongsTo<T extends Model>(
+            modelName: string,
+            options: {
+                async: false;
+                inverse?: string | null;
+                polymorphic?: boolean;
+            }
+        ): Ember.ComputedProperty<T>;
+        function belongsTo<T extends Model>(
+            modelName: string,
+            options?: {
+                async?: true;
+                inverse?: string | null;
+                polymorphic?: boolean;
+            }
+        ): Ember.ComputedProperty<T & PromiseObject<T>>;
+        /**
+         * `DS.hasMany` is used to define One-To-Many and Many-To-Many
+         * relationships on a [DS.Model](/api/data/classes/DS.Model.html).
+         */
+        function hasMany<T extends Model>(
+            type: string,
+            options: {
+                async: false;
+                inverse?: string | null;
+                polymorphic?: boolean;
+            }
+        ): Ember.ComputedProperty<ManyArray<T>>;
+        function hasMany<T extends Model>(
+            type: string,
+            options?: {
+                async?: true;
+                inverse?: string | null;
+                polymorphic?: boolean;
+            }
+        ): Ember.ComputedProperty<PromiseManyArray<T>>;
+        /**
+         * This method normalizes a modelName into the format Ember Data uses
+         * internally.
+         */
+        function normalizeModelName(modelName: string): string;
+        const VERSION: string;
+
+        interface AttrOptions<T = any> {
+            defaultValue?: T | (() => T);
+        }
+
+        /**
+         * `DS.attr` defines an attribute on a [DS.Model](/api/data/classes/DS.Model.html).
+         * By default, attributes are passed through as-is, however you can specify an
+         * optional type to have the value automatically transformed.
+         * Ember Data ships with four basic transform types: `string`, `number`,
+         * `boolean` and `date`. You can define your own transforms by subclassing
+         * [DS.Transform](/api/data/classes/DS.Transform.html).
+         */
+        function attr(
+            type: "string",
+            options?: AttrOptions<string>
+        ): Ember.ComputedProperty<string>;
+        function attr(
+            type: "boolean",
+            options?: AttrOptions<boolean>
+        ): Ember.ComputedProperty<boolean>;
+        function attr(
+            type: "number",
+            options?: AttrOptions<number>
+        ): Ember.ComputedProperty<number>;
+        function attr(
+            type: "date",
+            options?: AttrOptions<Date>
+        ): Ember.ComputedProperty<Date>;
+        function attr<T>(
+            type: string,
+            options?: AttrOptions<T>
+        ): Ember.ComputedProperty<T>;
+        function attr<T>(options?: AttrOptions<T>): Ember.ComputedProperty<T>;
+        /**
+         * WARNING: This interface is likely to change in order to accomodate https://github.com/emberjs/rfcs/pull/4
+         * ## Using BuildURLMixin
+         * To use url building, include the mixin when extending an adapter, and call `buildURL` where needed.
+         * The default behaviour is designed for RESTAdapter.
+         * ### Example
+         * ```javascript
+         * export default DS.Adapter.extend(BuildURLMixin, {
+         * findRecord: function(store, type, id, snapshot) {
+         * var url = this.buildURL(type.modelName, id, snapshot, 'findRecord');
+         * return this.ajax(url, 'GET');
+         * }
+         * });
+         * ```
+         * ### Attributes
+         * The `host` and `namespace` attributes will be used if defined, and are optional.
+         */
+        class BuildURLMixin {
+            /**
+             * Builds a URL for a given type and optional ID.
+             */
+            buildURL(
+                modelName?: string,
+                id?: string | any[] | {} | null,
+                snapshot?: Snapshot | any[] | null,
+                requestType?: string,
+                query?: {}
+            ): string;
+            /**
+             * Builds a URL for a `store.findRecord(type, id)` call.
+             */
+            urlForFindRecord(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for a `store.findAll(type)` call.
+             */
+            urlForFindAll(
+                modelName: string,
+                snapshot: SnapshotRecordArray
+            ): string;
+            /**
+             * Builds a URL for a `store.query(type, query)` call.
+             */
+            urlForQuery(query: {}, modelName: string): string;
+            /**
+             * Builds a URL for a `store.queryRecord(type, query)` call.
+             */
+            urlForQueryRecord(query: {}, modelName: string): string;
+            /**
+             * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
+             * records into 1 request when the adapter's `coalesceFindRequests`
+             * property is true.
+             */
+            urlForFindMany(
+                ids: any[],
+                modelName: string,
+                snapshots: any[]
+            ): string;
+            /**
+             * Builds a URL for fetching a async hasMany relationship when a url
+             * is not provided by the server.
+             */
+            urlForFindHasMany(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for fetching a async belongsTo relationship when a url
+             * is not provided by the server.
+             */
+            urlForFindBelongsTo(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for a `record.save()` call when the record was created
+             * locally using `store.createRecord()`.
+             */
+            urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+            /**
+             * Builds a URL for a `record.save()` call when the record has been update locally.
+             */
+            urlForUpdateRecord(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for a `record.save()` call when the record has been deleted locally.
+             */
+            urlForDeleteRecord(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Determines the pathname for a given type.
+             */
+            pathForType(modelName: string): string;
+        }
+        /**
+         * A `DS.AdapterError` is used by an adapter to signal that an error occurred
+         * during a request to an external API. It indicates a generic error, and
+         * subclasses are used to indicate specific error states. The following
+         * subclasses are provided:
+         */
+        class AdapterError {}
+        /**
+         * A `DS.InvalidError` is used by an adapter to signal the external API
+         * was unable to process a request because the content was not
+         * semantically correct or meaningful per the API. Usually this means a
+         * record failed some form of server side validation. When a promise
+         * from an adapter is rejected with a `DS.InvalidError` the record will
+         * transition to the `invalid` state and the errors will be set to the
+         * `errors` property on the record.
+         */
+        class InvalidError {}
+        /**
+         * A `DS.TimeoutError` is used by an adapter to signal that a request
+         * to the external API has timed out. I.e. no response was received from
+         * the external API within an allowed time period.
+         */
+        class TimeoutError {}
+        /**
+         * A `DS.AbortError` is used by an adapter to signal that a request to
+         * the external API was aborted. For example, this can occur if the user
+         * navigates away from the current page after a request to the external API
+         * has been initiated but before a response has been received.
+         */
+        class AbortError {}
+        /**
+         * A `DS.UnauthorizedError` equates to a HTTP `401 Unauthorized` response
+         * status. It is used by an adapter to signal that a request to the external
+         * API was rejected because authorization is required and has failed or has not
+         * yet been provided.
+         */
+        class UnauthorizedError {}
+        /**
+         * A `DS.ForbiddenError` equates to a HTTP `403 Forbidden` response status.
+         * It is used by an adapter to signal that a request to the external API was
+         * valid but the server is refusing to respond to it. If authorization was
+         * provided and is valid, then the authenticated user does not have the
+         * necessary permissions for the request.
+         */
+        class ForbiddenError {}
+        /**
+         * A `DS.NotFoundError` equates to a HTTP `404 Not Found` response status.
+         * It is used by an adapter to signal that a request to the external API
+         * was rejected because the resource could not be found on the API.
+         */
+        class NotFoundError {}
+        /**
+         * A `DS.ConflictError` equates to a HTTP `409 Conflict` response status.
+         * It is used by an adapter to indicate that the request could not be processed
+         * because of a conflict in the request. An example scenario would be when
+         * creating a record with a client generated id but that id is already known
+         * to the external API.
+         */
+        class ConflictError {}
+        /**
+         * A `DS.ServerError` equates to a HTTP `500 Internal Server Error` response
+         * status. It is used by the adapter to indicate that a request has failed
+         * because of an error in the external API.
+         */
+        class ServerError {}
+        /**
+         * Holds validation errors for a given record, organized by attribute names.
+         */
+        interface Errors extends Ember.Enumerable<any>, Ember.Evented {}
+        class Errors extends Ember.Object {
+            /**
+             * DEPRECATED:
+             * Register with target handler
+             */
+            registerHandlers(
+                target: {},
+                becameInvalid: Function,
+                becameValid: Function
+            ): any;
+            /**
+             * Returns errors for a given attribute
+             */
+            errorsFor(attribute: string): any[];
+            /**
+             * An array containing all of the error messages for this
+             * record. This is useful for displaying all errors to the user.
+             */
+            messages: Ember.ComputedProperty<any[]>;
+            /**
+             * Total number of errors.
+             */
+            length: Ember.ComputedProperty<number>;
+            isEmpty: Ember.ComputedProperty<boolean>;
+            /**
+             * DEPRECATED:
+             * Adds error messages to a given attribute and sends
+             * `becameInvalid` event to the record.
+             */
+            add(attribute: string, messages: any[] | string): any;
+            /**
+             * DEPRECATED:
+             * Removes all error messages from the given attribute and sends
+             * `becameValid` event to the record if there no more errors left.
+             */
+            remove(attribute: string): any;
+            /**
+             * DEPRECATED:
+             * Removes all error messages and sends `becameValid` event
+             * to the record.
+             */
+            clear(): any;
+            /**
+             * Checks if there is error messages for the given attribute.
+             */
+            has(attribute: string): boolean;
+        }
+        /**
+         * The model class that all Ember Data records descend from.
+         * This is the public API of Ember Data models. If you are using Ember Data
+         * in your application, this is the class you should use.
+         * If you are working on Ember Data internals, you most likely want to be dealing
+         * with `InternalModel`
+         */
+        class Model extends Ember.Object {
+            /**
+             * If this property is `true` the record is in the `empty`
+             * state. Empty is the first state all records enter after they have
+             * been created. Most records created by the store will quickly
+             * transition to the `loading` state if data needs to be fetched from
+             * the server or the `created` state if the record is created on the
+             * client. A record can also enter the empty state if the adapter is
+             * unable to locate the record.
+             */
+            isEmpty: Ember.ComputedProperty<boolean>;
+            /**
+             * If this property is `true` the record is in the `loading` state. A
+             * record enters this state when the store asks the adapter for its
+             * data. It remains in this state until the adapter provides the
+             * requested data.
+             */
+            isLoading: Ember.ComputedProperty<boolean>;
+            /**
+             * If this property is `true` the record is in the `loaded` state. A
+             * record enters this state when its data is populated. Most of a
+             * record's lifecycle is spent inside substates of the `loaded`
+             * state.
+             */
+            isLoaded: Ember.ComputedProperty<boolean>;
+            /**
+             * If this property is `true` the record is in the `dirty` state. The
+             * record has local changes that have not yet been saved by the
+             * adapter. This includes records that have been created (but not yet
+             * saved) or deleted.
+             */
+            hasDirtyAttributes: Ember.ComputedProperty<boolean>;
+            /**
+             * If this property is `true` the record is in the `saving` state. A
+             * record enters the saving state when `save` is called, but the
+             * adapter has not yet acknowledged that the changes have been
+             * persisted to the backend.
+             */
+            isSaving: Ember.ComputedProperty<boolean>;
+            /**
+             * If this property is `true` the record is in the `deleted` state
+             * and has been marked for deletion. When `isDeleted` is true and
+             * `hasDirtyAttributes` is true, the record is deleted locally but the deletion
+             * was not yet persisted. When `isSaving` is true, the change is
+             * in-flight. When both `hasDirtyAttributes` and `isSaving` are false, the
+             * change has persisted.
+             */
+            isDeleted: Ember.ComputedProperty<boolean>;
+            /**
+             * If this property is `true` the record is in the `new` state. A
+             * record will be in the `new` state when it has been created on the
+             * client and the adapter has not yet report that it was successfully
+             * saved.
+             */
+            isNew: Ember.ComputedProperty<boolean>;
+            /**
+             * If this property is `true` the record is in the `valid` state.
+             */
+            isValid: Ember.ComputedProperty<boolean>;
+            /**
+             * If the record is in the dirty state this property will report what
+             * kind of change has caused it to move into the dirty
+             * state. Possible values are:
+             */
+            dirtyType: Ember.ComputedProperty<string>;
+            /**
+             * If `true` the adapter reported that it was unable to save local
+             * changes to the backend for any reason other than a server-side
+             * validation error.
+             */
+            isError: boolean;
+            /**
+             * If `true` the store is attempting to reload the record from the adapter.
+             */
+            isReloading: boolean;
+            /**
+             * All ember models have an id property. This is an identifier
+             * managed by an external source. These are always coerced to be
+             * strings before being used internally. Note when declaring the
+             * attributes for a model it is an error to declare an id
+             * attribute.
+             */
+            id: string;
+            /**
+             * When the record is in the `invalid` state this object will contain
+             * any errors returned by the adapter. When present the errors hash
+             * contains keys corresponding to the invalid property names
+             * and values which are arrays of Javascript objects with two keys:
+             */
+            errors: Ember.ComputedProperty<Errors>;
+            /**
+             * This property holds the `DS.AdapterError` object with which
+             * last adapter operation was rejected.
+             */
+            adapterError: AdapterError;
+            /**
+             * Create a JSON representation of the record, using the serialization
+             * strategy of the store's adapter.
+             */
+            serialize(options?: { includeId?: boolean }): {};
+            /**
+             * Use [DS.JSONSerializer](DS.JSONSerializer.html) to
+             * get the JSON representation of a record.
+             */
+            toJSON(options: {}): {};
+            /**
+             * Fired when the record is ready to be interacted with,
+             * that is either loaded from the server or created locally.
+             */
+            ready(): void;
+            /**
+             * Fired when the record is loaded from the server.
+             */
+            didLoad(): void;
+            /**
+             * Fired when the record is updated.
+             */
+            didUpdate(): void;
+            /**
+             * Fired when a new record is commited to the server.
+             */
+            didCreate(): void;
+            /**
+             * Fired when the record is deleted.
+             */
+            didDelete(): void;
+            /**
+             * Fired when the record becomes invalid.
+             */
+            becameInvalid(): void;
+            /**
+             * Fired when the record enters the error state.
+             */
+            becameError(): void;
+            /**
+             * Fired when the record is rolled back.
+             */
+            rolledBack(): void;
+            /**
+             * Marks the record as deleted but does not save it. You must call
+             * `save` afterwards if you want to persist it. You might use this
+             * method if you want to allow the user to still `rollbackAttributes()`
+             * after a delete was made.
+             */
+            deleteRecord(): any;
+            /**
+             * Same as `deleteRecord`, but saves the record immediately.
+             */
+            destroyRecord(options: {}): RSVP.Promise<any>;
+            /**
+             * Unloads the record from the store. This will cause the record to be destroyed and freed up for garbage collection.
+             */
+            unloadRecord(): any;
+            /**
+             * Returns an object, whose keys are changed properties, and value is
+             * an [oldProp, newProp] array.
+             */
+            changedAttributes(): {};
+            /**
+             * If the model `hasDirtyAttributes` this function will discard any unsaved
+             * changes. If the model `isNew` it will be removed from the store.
+             */
+            rollbackAttributes(): any;
+            /**
+             * Save the record and persist any changes to the record to an
+             * external source via the adapter.
+             */
+            save(options?: {}): RSVP.Promise<this>;
+            /**
+             * Reload the record from the adapter.
+             */
+            reload(): RSVP.Promise<any>;
+            /**
+             * Get the reference for the specified belongsTo relationship.
+             */
+            belongsTo(name: string): BelongsToReference;
+            /**
+             * Get the reference for the specified hasMany relationship.
+             */
+            hasMany(name: string): HasManyReference<any>;
+            /**
+             * Given a callback, iterates over each of the relationships in the model,
+             * invoking the callback with the name of each relationship and its relationship
+             * descriptor.
+             */
+            eachRelationship(callback: Function, binding: any): any;
+            /**
+             * Represents the model's class name as a string. This can be used to look up the model's class name through
+             * `DS.Store`'s modelFor method.
+             */
+            static modelName: string;
+            /**
+             * For a given relationship name, returns the model type of the relationship.
+             */
+            static typeForRelationship(name: string, store: Store): Model;
+            /**
+             * Find the relationship which is the inverse of the one asked for.
+             */
+            static inverseFor(name: string, store: Store): {};
+            /**
+             * The model's relationships as a map, keyed on the type of the
+             * relationship. The value of each entry is an array containing a descriptor
+             * for each relationship with that type, describing the name of the relationship
+             * as well as the type.
+             */
+            static relationships: Ember.ComputedProperty<Ember.Map>;
+            /**
+             * A hash containing lists of the model's relationships, grouped
+             * by the relationship kind. For example, given a model with this
+             * definition:
+             */
+            static relationshipNames: Ember.ComputedProperty<{}>;
+            /**
+             * An array of types directly related to a model. Each type will be
+             * included once, regardless of the number of relationships it has with
+             * the model.
+             */
+            static relatedTypes: Ember.ComputedProperty<
+                Ember.NativeArray<string>
+            >;
+            /**
+             * A map whose keys are the relationships of a model and whose values are
+             * relationship descriptors.
+             */
+            static relationshipsByName: Ember.ComputedProperty<Ember.Map>;
+            /**
+             * A map whose keys are the fields of the model and whose values are strings
+             * describing the kind of the field. A model's fields are the union of all of its
+             * attributes and relationships.
+             */
+            static fields: Ember.ComputedProperty<Ember.Map>;
+            /**
+             * Given a callback, iterates over each of the relationships in the model,
+             * invoking the callback with the name of each relationship and its relationship
+             * descriptor.
+             */
+            static eachRelationship(callback: Function, binding: any): any;
+            /**
+             * Given a callback, iterates over each of the types related to a model,
+             * invoking the callback with the related type's class. Each type will be
+             * returned just once, regardless of how many different relationships it has
+             * with a model.
+             */
+            static eachRelatedType(callback: Function, binding: any): any;
+            /**
+             * A map whose keys are the attributes of the model (properties
+             * described by DS.attr) and whose values are the meta object for the
+             * property.
+             */
+            static attributes: Ember.ComputedProperty<Ember.Map>;
+            /**
+             * A map whose keys are the attributes of the model (properties
+             * described by DS.attr) and whose values are type of transformation
+             * applied to each attribute. This map does not include any
+             * attributes that do not have an transformation type.
+             */
+            static transformedAttributes: Ember.ComputedProperty<Ember.Map>;
+            /**
+             * Iterates through the attributes of the model, calling the passed function on each
+             * attribute.
+             */
+            static eachAttribute(callback: Function, binding: {}): any;
+            /**
+             * Iterates through the transformedAttributes of the model, calling
+             * the passed function on each attribute. Note the callback will not be
+             * called for any attributes that do not have an transformation type.
+             */
+            static eachTransformedAttribute(
+                callback: Function,
+                binding: {}
+            ): any;
+            /**
+             * Discards any unsaved changes to the given attribute. This feature is not enabled by default. You must enable `ds-rollback-attribute` and be running a canary build.
+             */
+            rollbackAttribute(): any;
+            /**
+             * This Ember.js hook allows an object to be notified when a property
+             * is defined.
+             */
+            didDefineProperty(
+                proto: {},
+                key: string,
+                value: Ember.ComputedProperty<any>
+            ): any;
+        }
+        /**
+         * ### State
+         */
+        class RootState {}
+        /**
+         * Represents an ordered list of records whose order and membership is
+         * determined by the adapter. For example, a query sent to the adapter
+         * may trigger a search on the server, whose results would be loaded
+         * into an instance of the `AdapterPopulatedRecordArray`.
+         */
+        class AdapterPopulatedRecordArray<T> extends RecordArray<T> {}
+        /**
+         * Represents a list of records whose membership is determined by the
+         * store. As records are created, loaded, or modified, the store
+         * evaluates them to determine if they should be part of the record
+         * array.
+         */
+        class FilteredRecordArray<T> extends RecordArray<T> {
+            /**
+             * The filterFunction is a function used to test records from the store to
+             * determine if they should be part of the record array.
+             */
+            filterFunction(record: Model): boolean;
+        }
+        /**
+         * A record array is an array that contains records of a certain modelName. The record
+         * array materializes records as needed when they are retrieved for the first
+         * time. You should not create record arrays yourself. Instead, an instance of
+         * `DS.RecordArray` or its subclasses will be returned by your application's store
+         * in response to queries.
+         */
+        interface RecordArray<T> extends Ember.ArrayProxy<T>, Ember.Evented {}
+        class RecordArray<T> {
+            /**
+             * The flag to signal a `RecordArray` is finished loading data.
+             */
+            isLoaded: boolean;
+            /**
+             * The flag to signal a `RecordArray` is currently loading data.
+             */
+            isUpdating: boolean;
+            /**
+             * The modelClass represented by this record array.
+             */
+            type: Ember.ComputedProperty<Model>;
+            /**
+             * Used to get the latest version of all of the records in this array
+             * from the adapter.
+             */
+            update(): any;
+            /**
+             * Saves all of the records in the `RecordArray`.
+             */
+            save(): PromiseArray<T>;
+        }
+        /**
+         * A BelongsToReference is a low level API that allows users and
+         * addon author to perform meta-operations on a belongs-to
+         * relationship.
+         */
+        class BelongsToReference {
+            /**
+             * This returns a string that represents how the reference will be
+             * looked up when it is loaded. If the relationship has a link it will
+             * use the "link" otherwise it defaults to "id".
+             */
+            remoteType(): string;
+            /**
+             * The `id` of the record that this reference refers to. Together, the
+             * `type()` and `id()` methods form a composite key for the identity
+             * map. This can be used to access the id of an async relationship
+             * without triggering a fetch that would normally happen if you
+             * attempted to use `record.get('relationship.id')`.
+             */
+            id(): string;
+            /**
+             * The link Ember Data will use to fetch or reload this belongs-to
+             * relationship.
+             */
+            link(): string;
+            /**
+             * The meta data for the belongs-to relationship.
+             */
+            meta(): {};
+            /**
+             * `push` can be used to update the data in the relationship and Ember
+             * Data will treat the new data as the conanical value of this
+             * relationship on the backend.
+             */
+            push(objectOrPromise: {} | RSVP.Promise<any>): RSVP.Promise<any>;
+            /**
+             * `value()` synchronously returns the current value of the belongs-to
+             * relationship. Unlike `record.get('relationshipName')`, calling
+             * `value()` on a reference does not trigger a fetch if the async
+             * relationship is not yet loaded. If the relationship is not loaded
+             * it will always return `null`.
+             */
+            value(objectOrPromise: {} | RSVP.Promise<any>): Model;
+            /**
+             * Loads a record in a belongs to relationship if it is not already
+             * loaded. If the relationship is already loaded this method does not
+             * trigger a new load.
+             */
+            load(): RSVP.Promise<any>;
+            /**
+             * Triggers a reload of the value in this relationship. If the
+             * remoteType is `"link"` Ember Data will use the relationship link to
+             * reload the relationship. Otherwise it will reload the record by its
+             * id.
+             */
+            reload(): RSVP.Promise<any>;
+        }
+        /**
+         * A HasManyReference is a low level API that allows users and addon
+         * author to perform meta-operations on a has-many relationship.
+         */
+        class HasManyReference<T> {
+            /**
+             * This returns a string that represents how the reference will be
+             * looked up when it is loaded. If the relationship has a link it will
+             * use the "link" otherwise it defaults to "id".
+             */
+            remoteType(): string;
+            /**
+             * The link Ember Data will use to fetch or reload this has-many
+             * relationship.
+             */
+            link(): string;
+            /**
+             * `ids()` returns an array of the record ids in this relationship.
+             */
+            ids(): any[];
+            /**
+             * The meta data for the has-many relationship.
+             */
+            meta(): {};
+            /**
+             * `push` can be used to update the data in the relationship and Ember
+             * Data will treat the new data as the canonical value of this
+             * relationship on the backend.
+             */
+            push(objectOrPromise: T[] | RSVP.Promise<T[]>): ManyArray<T>;
+            /**
+             * `value()` synchronously returns the current value of the has-many
+             * relationship. Unlike `record.get('relationshipName')`, calling
+             * `value()` on a reference does not trigger a fetch if the async
+             * relationship is not yet loaded. If the relationship is not loaded
+             * it will always return `null`.
+             */
+            value(): ManyArray<T>;
+            /**
+             * Loads the relationship if it is not already loaded.  If the
+             * relationship is already loaded this method does not trigger a new
+             * load.
+             */
+            load(): RSVP.Promise<any>;
+            /**
+             * Reloads this has-many relationship.
+             */
+            reload(): RSVP.Promise<any>;
+        }
+        /**
+         * An RecordReference is a low level API that allows users and
+         * addon author to perform meta-operations on a record.
+         */
+        class RecordReference<T extends Model> {
+            /**
+             * The `id` of the record that this reference refers to.
+             */
+            id(): string;
+            /**
+             * How the reference will be looked up when it is loaded: Currently
+             * this always return `identity` to signifying that a record will be
+             * loaded by the `type` and `id`.
+             */
+            remoteType(): string;
+            /**
+             * This API allows you to provide a reference with new data. The
+             * simplest usage of this API is similar to `store.push`: you provide a
+             * normalized hash of data and the object represented by the reference
+             * will update.
+             */
+            push(payload: RSVP.Promise<any> | {}): PromiseObject<T> & T;
+            /**
+             * If the entity referred to by the reference is already loaded, it is
+             * present as `reference.value`. Otherwise the value returned by this function
+             * is `null`.
+             */
+            value(): T | null;
+            /**
+             * Triggers a fetch for the backing entity based on its `remoteType`
+             * (see `remoteType` definitions per reference type).
+             */
+            load(): PromiseObject<T> & T;
+            /**
+             * Reloads the record if it is already loaded. If the record is not
+             * loaded it will load the record via `store.findRecord`
+             */
+            reload(): PromiseObject<T> & T;
+        }
+        /**
+         * A `ManyArray` is a `MutableArray` that represents the contents of a has-many
+         * relationship.
+         */
+        interface ManyArray<T> extends Ember.MutableArray<T> {}
+        class ManyArray<T> extends Ember.Object.extend(
+            Ember.MutableArray as {},
+            Ember.Evented
+        ) {
+            /**
+             * The loading state of this array
+             */
+            isLoaded: boolean;
+            /**
+             * Metadata associated with the request for async hasMany relationships.
+             */
+            meta: {};
+            /**
+             * Reloads all of the records in the manyArray. If the manyArray
+             * holds a relationship that was originally fetched using a links url
+             * Ember Data will revisit the original links url to repopulate the
+             * relationship.
+             */
+            reload(): PromiseArray<T>;
+            /**
+             * Saves all of the records in the `ManyArray`.
+             */
+            save(): PromiseArray<T>;
+            /**
+             * Create a child record within the owner
+             */
+            createRecord(inputProperties?: {}): T;
+        }
+        /**
+         * A `PromiseArray` is an object that acts like both an `Ember.Array`
+         * and a promise. When the promise is resolved the resulting value
+         * will be set to the `PromiseArray`'s `content` property. This makes
+         * it easy to create data bindings with the `PromiseArray` that will be
+         * updated when the promise resolves.
+         */
+        interface PromiseArray<T>
+            extends Ember.ArrayProxy<T>,
+        Ember.PromiseProxyMixin<PromiseArray<T>> {}
+        class PromiseArray<T> {}
+        /**
+         * A `PromiseObject` is an object that acts like both an `Ember.Object`
+         * and a promise. When the promise is resolved, then the resulting value
+         * will be set to the `PromiseObject`'s `content` property. This makes
+         * it easy to create data bindings with the `PromiseObject` that will
+         * be updated when the promise resolves.
+         */
+        interface PromiseObject<T>
+            extends Ember.ObjectProxy,
+        Ember.PromiseProxyMixin<T & PromiseObject<T>> {}
+        class PromiseObject<T> {}
+        /**
+         * A PromiseManyArray is a PromiseArray that also proxies certain method calls
+         * to the underlying manyArray.
+         * Right now we proxy:
+         */
+        class PromiseManyArray<T extends Model> extends PromiseArray<T> {
+            /**
+             * Reloads all of the records in the manyArray. If the manyArray
+             * holds a relationship that was originally fetched using a links url
+             * Ember Data will revisit the original links url to repopulate the
+             * relationship.
+             */
+            reload(): PromiseManyArray<T>;
+            /**
+             * Create a child record within the owner
+             */
+            createRecord(inputProperties?: {}): T;
+        }
+        class SnapshotRecordArray {
+            /**
+             * Number of records in the array
+             */
+            length: number;
+            /**
+             * Meta objects for the record array.
+             */
+            meta: {};
+            /**
+             * A hash of adapter options passed into the store method for this request.
+             */
+            adapterOptions: {};
+            /**
+             * The relationships to include for this request.
+             */
+            include: string | any[];
+            /**
+             * The type of the underlying records for the snapshots in the array, as a DS.Model
+             */
+            type: Model;
+            /**
+             * Get snapshots of the underlying record array
+             */
+            snapshots(): any[];
+        }
+        class Snapshot {
+            /**
+             * The underlying record for this snapshot. Can be used to access methods and
+             * properties defined on the record.
+             */
+            record: Model;
+            /**
+             * The id of the snapshot's underlying record
+             */
+            id: string;
+            /**
+             * A hash of adapter options
+             */
+            adapterOptions: {};
+            /**
+             * The name of the type of the underlying record for this snapshot, as a string.
+             */
+            modelName: string;
+            /**
+             * The type of the underlying record for this snapshot, as a DS.Model.
+             */
+            type: Model;
+            /**
+             * Returns the value of an attribute.
+             */
+            attr(keyName: string): {};
+            /**
+             * Returns all attributes and their corresponding values.
+             */
+            attributes(): {};
+            /**
+             * Returns all changed attributes and their old and new values.
+             */
+            changedAttributes(): {};
+            /**
+             * Returns the current value of a belongsTo relationship.
+             */
+            belongsTo(
+                keyName: string,
+                options?: {}
+            ): Snapshot | string | null | undefined;
+            /**
+             * Returns the current value of a hasMany relationship.
+             */
+            hasMany(keyName: string, options?: {}): any[] | undefined;
+            /**
+             * Iterates through all the attributes of the model, calling the passed
+             * function on each attribute.
+             */
+            eachAttribute(callback: Function, binding: {}): any;
+            /**
+             * Iterates through all the relationships of the model, calling the passed
+             * function on each relationship.
+             */
+            eachRelationship(callback: Function, binding: {}): any;
+            /**
+             * Serializes the snapshot using the serializer for the model.
+             */
+            serialize(options: {}): {};
+        }
+        /**
+         * The store contains all of the data for records loaded from the server.
+         * It is also responsible for creating instances of `DS.Model` that wrap
+         * the individual data for a record, so that they can be bound to in your
+         * Handlebars templates.
+         */
+        class Store {
+            /**
+             * The default adapter to use to communicate to a backend server or
+             * other persistence layer. This will be overridden by an application
+             * adapter if present.
+             */
+            adapter: string;
+            /**
+             * Create a new record in the current store. The properties passed
+             * to this method are set on the newly created record.
+             */
+            createRecord<T extends Model>(
+                modelName: string,
+                inputProperties?: {}
+            ): T;
+            /**
+             * For symmetry, a record can be deleted via the store.
+             */
+            deleteRecord(record: Model): void;
+            /**
+             * For symmetry, a record can be unloaded via the store.
+             * This will cause the record to be destroyed and freed up for garbage collection.
+             */
+            unloadRecord(record: Model): void;
+            /**
+             * This method returns a record for a given type and id combination.
+             */
+            findRecord<T extends Model>(
+                modelName: string,
+                id: string | number,
+                options?: {}
+            ): PromiseObject<T> & T;
+            /**
+             * Get the reference for the specified record.
+             */
+            getReference<T extends Model>(
+                modelName: string,
+                id: string | number
+            ): RecordReference<T>;
+            /**
+             * Get a record by a given type and ID without triggering a fetch.
+             */
+            peekRecord<T extends Model>(
+                modelName: string,
+                id: string | number
+            ): T | null;
+            /**
+             * This method returns true if a record for a given modelName and id is already
+             * loaded in the store. Use this function to know beforehand if a findRecord()
+             * will result in a request or that it will be a cache hit.
+             */
+            hasRecordForId(modelName: string, id: string | number): boolean;
+            /**
+             * This method delegates a query to the adapter. This is the one place where
+             * adapter-level semantics are exposed to the application.
+             */
+            query<T extends Model>(
+                modelName: string,
+                query: any
+            ): AdapterPopulatedRecordArray<T> & PromiseArray<T>;
+            /**
+             * This method makes a request for one record, where the `id` is not known
+             * beforehand (if the `id` is known, use [`findRecord`](#method_findRecord)
+             * instead).
+             */
+            queryRecord<T extends Model>(
+                modelName: string,
+                query: any
+            ): RSVP.Promise<T>;
+            /**
+             * `findAll` asks the adapter's `findAll` method to find the records for the
+             * given type, and returns a promise which will resolve with all records of
+             * this type present in the store, even if the adapter only returns a subset
+             * of them.
+             */
+            findAll<T extends Model>(
+                modelName: string,
+                options?: {
+                    reload?: boolean;
+                    backgroundReload?: boolean;
+                    include?: string;
+                    adapterOptions?: any;
+                }
+            ): PromiseArray<T>;
+            /**
+             * This method returns a filtered array that contains all of the
+             * known records for a given type in the store.
+             */
+            peekAll<T extends Model>(modelName: string): RecordArray<T>;
+            /**
+             * This method unloads all records in the store.
+             * It schedules unloading to happen during the next run loop.
+             */
+            unloadAll(modelName: string): void;
+            /**
+             * DEPRECATED:
+             * This method has been deprecated and is an alias for store.hasRecordForId, which should
+             * be used instead.
+             */
+            recordIsLoaded(modelName: string, id: string): boolean;
+            /**
+             * Returns the model class for the particular `modelName`.
+             */
+            modelFor<M extends Model>(modelName: string): M;
+            /**
+             * Push some data for a given type into the store.
+             */
+            push(data: {}): Model | any[];
+            /**
+             * Push some raw data into the store.
+             */
+            pushPayload(modelName: string, inputPayload: {}): any;
+            pushPayload(inputPayload: {}): any;
+            /**
+             * `normalize` converts a json payload into the normalized form that
+             * [push](#method_push) expects.
+             */
+            normalize(modelName: string, payload: {}): {};
+            /**
+             * Returns an instance of the adapter for a given type. For
+             * example, `adapterFor('person')` will return an instance of
+             * `App.PersonAdapter`.
+             */
+            adapterFor<A extends Adapter>(modelName: string): A;
+            /**
+             * Returns an instance of the serializer for a given type. For
+             * example, `serializerFor('person')` will return an instance of
+             * `App.PersonSerializer`.
+             */
+            serializerFor<S extends Serializer>(modelName: string): S;
+        }
+        /**
+         * The `JSONAPIAdapter` is the default adapter used by Ember Data. It
+         * is responsible for transforming the store's requests into HTTP
+         * requests that follow the [JSON API](http://jsonapi.org/format/)
+         * format.
+         */
+        class JSONAPIAdapter extends RESTAdapter {
+            /**
+             * By default the JSONAPIAdapter will send each find request coming from a `store.find`
+             * or from accessing a relationship separately to the server. If your server supports passing
+             * ids as a query string, you can set coalesceFindRequests to true to coalesce all find requests
+             * within a single runloop.
+             */
+            coalesceFindRequests: boolean;
+        }
+        /**
+         * The REST adapter allows your store to communicate with an HTTP server by
+         * transmitting JSON via XHR. Most Ember.js apps that consume a JSON API
+         * should use the REST adapter.
+         */
+        class RESTAdapter extends Adapter implements BuildURLMixin {
+            /**
+             * Takes a URL, an HTTP method and a hash of data, and makes an HTTP request.
+             */
+            ajax(url: string, type: string, options?: object): RSVP.Promise<any>;
+            /**
+             * Generate ajax options
+             */
+            ajaxOptions(url: string, type: string, options?: object): object;
+            /**
+             * By default, the RESTAdapter will send the query params sorted alphabetically to the
+             * server.
+             */
+            sortQueryParams(obj: {}): {};
+            /**
+             * By default the RESTAdapter will send each find request coming from a `store.find`
+             * or from accessing a relationship separately to the server. If your server supports passing
+             * ids as a query string, you can set coalesceFindRequests to true to coalesce all find requests
+             * within a single runloop.
+             */
+            coalesceFindRequests: boolean;
+            /**
+             * Endpoint paths can be prefixed with a `namespace` by setting the namespace
+             * property on the adapter:
+             */
+            namespace: string;
+            /**
+             * An adapter can target other hosts by setting the `host` property.
+             */
+            host: string;
+            /**
+             * Some APIs require HTTP headers, e.g. to provide an API
+             * key. Arbitrary headers can be set as key/value pairs on the
+             * `RESTAdapter`'s `headers` object and Ember Data will send them
+             * along with each ajax request. For dynamic headers see [headers
+             * customization](/api/data/classes/DS.RESTAdapter.html#toc_headers-customization).
+             */
+            headers: {};
+            /**
+             * Called by the store in order to fetch the JSON for a given
+             * type and ID.
+             */
+            findRecord(
+                store: Store,
+                type: Model,
+                id: string,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * Called by the store in order to fetch a JSON array for all
+             * of the records for a given type.
+             */
+            findAll(
+                store: Store,
+                type: Model,
+                sinceToken: string,
+                snapshotRecordArray: SnapshotRecordArray
+            ): RSVP.Promise<any>;
+            /**
+             * Called by the store in order to fetch a JSON array for
+             * the records that match a particular query.
+             */
+            query(store: Store, type: Model, query: {}): RSVP.Promise<any>;
+            /**
+             * Called by the store in order to fetch a JSON object for
+             * the record that matches a particular query.
+             */
+            queryRecord(store: Store, type: Model, query: {}): RSVP.Promise<any>;
+            /**
+             * Called by the store in order to fetch several records together if `coalesceFindRequests` is true
+             */
+            findMany(
+                store: Store,
+                type: Model,
+                ids: any[],
+                snapshots: any[]
+            ): RSVP.Promise<any>;
+            /**
+             * Called by the store in order to fetch a JSON array for
+             * the unloaded records in a has-many relationship that were originally
+             * specified as a URL (inside of `links`).
+             */
+            findHasMany(
+                store: Store,
+                snapshot: Snapshot,
+                url: string,
+                relationship: {}
+            ): RSVP.Promise<any>;
+            /**
+             * Called by the store in order to fetch the JSON for the unloaded record in a
+             * belongs-to relationship that was originally specified as a URL (inside of
+             * `links`).
+             */
+            findBelongsTo(
+                store: Store,
+                snapshot: Snapshot,
+                url: string
+            ): RSVP.Promise<any>;
+            /**
+             * Called by the store when a newly created record is
+             * saved via the `save` method on a model record instance.
+             */
+            createRecord(
+                store: Store,
+                type: Model,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * Called by the store when an existing record is saved
+             * via the `save` method on a model record instance.
+             */
+            updateRecord(
+                store: Store,
+                type: Model,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * Called by the store when a record is deleted.
+             */
+            deleteRecord(
+                store: Store,
+                type: Model,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * Organize records into groups, each of which is to be passed to separate
+             * calls to `findMany`.
+             */
+            groupRecordsForFindMany(store: Store, snapshots: any[]): any[];
+            /**
+             * Takes an ajax response, and returns the json payload or an error.
+             */
+            handleResponse(
+                status: number,
+                headers: {},
+                payload: {},
+                requestData: {}
+            ): {};
+            /**
+             * Default `handleResponse` implementation uses this hook to decide if the
+             * response is a success.
+             */
+            isSuccess(status: number, headers: {}, payload: {}): boolean;
+            /**
+             * Default `handleResponse` implementation uses this hook to decide if the
+             * response is an invalid error.
+             */
+            isInvalid(status: number, headers: {}, payload: {}): boolean;
+            /**
+             * Get the data (body or query params) for a request.
+             */
+            dataForRequest(params: {}): {};
+            /**
+             * Get the HTTP method for a request.
+             */
+            methodForRequest(params: {}): string;
+            /**
+             * Get the URL for a request.
+             */
+            urlForRequest(params: {}): string;
+            /**
+             * Get the headers for a request.
+             */
+            headersForRequest(params: {}): {};
+            /**
+             * Builds a URL for a given type and optional ID.
+             */
+            buildURL(
+                modelName?: string,
+                id?: string | any[] | {} | null,
+                snapshot?: Snapshot | any[] | null,
+                requestType?: string,
+                query?: {}
+            ): string;
+            /**
+             * Builds a URL for a `store.findRecord(type, id)` call.
+             */
+            urlForFindRecord(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for a `store.findAll(type)` call.
+             */
+            urlForFindAll(
+                modelName: string,
+                snapshot: SnapshotRecordArray
+            ): string;
+            /**
+             * Builds a URL for a `store.query(type, query)` call.
+             */
+            urlForQuery(query: {}, modelName: string): string;
+            /**
+             * Builds a URL for a `store.queryRecord(type, query)` call.
+             */
+            urlForQueryRecord(query: {}, modelName: string): string;
+            /**
+             * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
+             * records into 1 request when the adapter's `coalesceFindRequests`
+             * property is true.
+             */
+            urlForFindMany(
+                ids: any[],
+                modelName: string,
+                snapshots: any[]
+            ): string;
+            /**
+             * Builds a URL for fetching a async hasMany relationship when a url
+             * is not provided by the server.
+             */
+            urlForFindHasMany(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for fetching a async belongsTo relationship when a url
+             * is not provided by the server.
+             */
+            urlForFindBelongsTo(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for a `record.save()` call when the record was created
+             * locally using `store.createRecord()`.
+             */
+            urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+            /**
+             * Builds a URL for a `record.save()` call when the record has been update locally.
+             */
+            urlForUpdateRecord(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Builds a URL for a `record.save()` call when the record has been deleted locally.
+             */
+            urlForDeleteRecord(
+                id: string,
+                modelName: string,
+                snapshot: Snapshot
+            ): string;
+            /**
+             * Determines the pathname for a given type.
+             */
+            pathForType(modelName: string): string;
+        }
+        /**
+         * ## Using Embedded Records
+         */
+        class EmbeddedRecordsMixin {
+            /**
+             * Normalize the record and recursively normalize/extract all the embedded records
+             * while pushing them into the store as they are encountered
+             */
+            normalize(typeClass: Model, hash: {}, prop: string): {};
+            /**
+             * Serialize `belongsTo` relationship when it is configured as an embedded object.
+             */
+            serializeBelongsTo(
+                snapshot: Snapshot,
+                json: {},
+                relationship: {}
+            ): any;
+            /**
+             * Serializes `hasMany` relationships when it is configured as embedded objects.
+             */
+            serializeHasMany(
+                snapshot: Snapshot,
+                json: {},
+                relationship: {}
+            ): any;
+            /**
+             * When serializing an embedded record, modify the property (in the json payload)
+             * that refers to the parent record (foreign key for relationship).
+             */
+            removeEmbeddedForeignKey(
+                snapshot: Snapshot,
+                embeddedSnapshot: Snapshot,
+                relationship: {},
+                json: {}
+            ): any;
+        }
+        /**
+         * Ember Data 2.0 Serializer:
+         */
+        class JSONAPISerializer extends JSONSerializer {
+            pushPayload(store: Store, payload: {}): any;
+            /**
+             * Dasherizes and singularizes the model name in the payload to match
+             * the format Ember Data uses internally for the model name.
+             */
+            modelNameFromPayloadKey(key: string): string;
+            /**
+             * Converts the model name to a pluralized version of the model name.
+             */
+            payloadKeyFromModelName(modelName: string): string;
+            /**
+             * `keyForAttribute` can be used to define rules for how to convert an
+             * attribute name in your model to a key in your JSON.
+             * By default `JSONAPISerializer` follows the format used on the examples of
+             * http://jsonapi.org/format and uses dashes as the word separator in the JSON
+             * attribute keys.
+             */
+            keyForAttribute(key: string, method: string): string;
+            /**
+             * `keyForRelationship` can be used to define a custom key when
+             * serializing and deserializing relationship properties.
+             * By default `JSONAPISerializer` follows the format used on the examples of
+             * http://jsonapi.org/format and uses dashes as word separators in
+             * relationship properties.
+             */
+            keyForRelationship(
+                key: string,
+                typeClass: string,
+                method: string
+            ): string;
+            /**
+             * `modelNameFromPayloadType` can be used to change the mapping for a DS model
+             * name, taken from the value in the payload.
+             */
+            modelNameFromPayloadType(payloadType: string): string;
+            /**
+             * `payloadTypeFromModelName` can be used to change the mapping for the type in
+             * the payload, taken from the model name.
+             */
+            payloadTypeFromModelName(modelname: string): string;
+        }
+        /**
+         * Ember Data 2.0 Serializer:
+         */
+        class JSONSerializer extends Serializer {
+            /**
+             * The `primaryKey` is used when serializing and deserializing
+             * data. Ember Data always uses the `id` property to store the id of
+             * the record. The external source may not always follow this
+             * convention. In these cases it is useful to override the
+             * `primaryKey` property to match the `primaryKey` of your external
+             * store.
+             */
+            primaryKey: string;
+            /**
+             * The `attrs` object can be used to declare a simple mapping between
+             * property names on `DS.Model` records and payload keys in the
+             * serialized JSON object representing the record. An object with the
+             * property `key` can also be used to designate the attribute's key on
+             * the response payload.
+             */
+            attrs: {};
+            /**
+             * The `normalizeResponse` method is used to normalize a payload from the
+             * server to a JSON-API Document.
+             */
+            normalizeResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeFindRecordResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeQueryRecordResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeFindAllResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeFindBelongsToResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeFindHasManyResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeFindManyResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeQueryResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeCreateRecordResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeDeleteRecordResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeUpdateRecordResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeSaveResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeSingleResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            normalizeArrayResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            /**
+             * Normalizes a part of the JSON payload returned by
+             * the server. You should override this method, munge the hash
+             * and call super if you have generic normalization to do.
+             */
+            normalize(typeClass: Model, hash: {}): {};
+            /**
+             * Returns the resource's ID.
+             */
+            extractId(modelClass: {}, resourceHash: {}): string;
+            /**
+             * Returns the resource's attributes formatted as a JSON-API "attributes object".
+             */
+            extractAttributes(modelClass: {}, resourceHash: {}): {};
+            /**
+             * Returns a relationship formatted as a JSON-API "relationship object".
+             */
+            extractRelationship(
+                relationshipModelName: {},
+                relationshipHash: {}
+            ): {};
+            /**
+             * Returns a polymorphic relationship formatted as a JSON-API "relationship object".
+             */
+            extractPolymorphicRelationship(
+                relationshipModelName: {},
+                relationshipHash: {},
+                relationshipOptions: {}
+            ): {};
+            /**
+             * Returns the resource's relationships formatted as a JSON-API "relationships object".
+             */
+            extractRelationships(modelClass: {}, resourceHash: {}): {};
+            modelNameFromPayloadKey(key: string): string;
+            /**
+             * Check if the given hasMany relationship should be serialized
+             */
+            shouldSerializeHasMany(
+                snapshot: Snapshot,
+                key: string,
+                relationshipType: string
+            ): boolean;
+            /**
+             * Called when a record is saved in order to convert the
+             * record into JSON.
+             */
+            serialize(snapshot: Snapshot, options: {}): {};
+            /**
+             * You can use this method to customize how a serialized record is added to the complete
+             * JSON hash to be sent to the server. By default the JSON Serializer does not namespace
+             * the payload and just sends the raw serialized JSON object.
+             * If your server expects namespaced keys, you should consider using the RESTSerializer.
+             * Otherwise you can override this method to customize how the record is added to the hash.
+             * The hash property should be modified by reference.
+             */
+            serializeIntoHash(
+                hash: {},
+                typeClass: Model,
+                snapshot: Snapshot,
+                options?: {}
+            ): any;
+            /**
+             * `serializeAttribute` can be used to customize how `DS.attr`
+             * properties are serialized
+             */
+            serializeAttribute(
+                snapshot: Snapshot,
+                json: {},
+                key: string,
+                attribute: {}
+            ): any;
+            /**
+             * `serializeBelongsTo` can be used to customize how `DS.belongsTo`
+             * properties are serialized.
+             */
+            serializeBelongsTo(
+                snapshot: Snapshot,
+                json: {},
+                relationship: {}
+            ): any;
+            /**
+             * `serializeHasMany` can be used to customize how `DS.hasMany`
+             * properties are serialized.
+             */
+            serializeHasMany(
+                snapshot: Snapshot,
+                json: {},
+                relationship: {}
+            ): any;
+            /**
+             * You can use this method to customize how polymorphic objects are
+             * serialized. Objects are considered to be polymorphic if
+             * `{ polymorphic: true }` is pass as the second argument to the
+             * `DS.belongsTo` function.
+             */
+            serializePolymorphicType(
+                snapshot: Snapshot,
+                json: {},
+                relationship: {}
+            ): any;
+            /**
+             * `extractMeta` is used to deserialize any meta information in the
+             * adapter payload. By default Ember Data expects meta information to
+             * be located on the `meta` property of the payload object.
+             */
+            extractMeta(store: Store, modelClass: Model, payload: {}): any;
+            /**
+             * `extractErrors` is used to extract model errors when a call
+             * to `DS.Model#save` fails with an `InvalidError`. By default
+             * Ember Data expects error information to be located on the `errors`
+             * property of the payload object.
+             */
+            extractErrors(
+                store: Store,
+                typeClass: Model,
+                payload: {},
+                id: string | number
+            ): {};
+            /**
+             * `keyForAttribute` can be used to define rules for how to convert an
+             * attribute name in your model to a key in your JSON.
+             */
+            keyForAttribute(key: string, method: string): string;
+            /**
+             * `keyForRelationship` can be used to define a custom key when
+             * serializing and deserializing relationship properties. By default
+             * `JSONSerializer` does not provide an implementation of this method.
+             */
+            keyForRelationship(
+                key: string,
+                typeClass: string,
+                method: string
+            ): string;
+            /**
+             * `keyForLink` can be used to define a custom key when deserializing link
+             * properties.
+             */
+            keyForLink(key: string, kind: string): string;
+            modelNameFromPayloadType(type: string): string;
+            /**
+             * serializeId can be used to customize how id is serialized
+             * For example, your server may expect integer datatype of id
+             */
+            serializeId(snapshot: Snapshot, json: {}, primaryKey: string): any;
+        }
+        /**
+         * Normally, applications will use the `RESTSerializer` by implementing
+         * the `normalize` method.
+         */
+        class RESTSerializer extends JSONSerializer {
+            /**
+             * `keyForPolymorphicType` can be used to define a custom key when
+             * serializing and deserializing a polymorphic type. By default, the
+             * returned key is `${key}Type`.
+             */
+            keyForPolymorphicType(
+                key: string,
+                typeClass: string,
+                method: string
+            ): string;
+            /**
+             * Normalizes a part of the JSON payload returned by
+             * the server. You should override this method, munge the hash
+             * and call super if you have generic normalization to do.
+             */
+            normalize(modelClass: Model, resourceHash: {}, prop?: string): {};
+            /**
+             * This method allows you to push a payload containing top-level
+             * collections of records organized per type.
+             */
+            pushPayload(store: Store, payload: {}): any;
+            /**
+             * This method is used to convert each JSON root key in the payload
+             * into a modelName that it can use to look up the appropriate model for
+             * that part of the payload.
+             */
+            modelNameFromPayloadKey(key: string): string;
+            /**
+             * Called when a record is saved in order to convert the
+             * record into JSON.
+             */
+            serialize(snapshot: Snapshot, options: {}): {};
+            /**
+             * You can use this method to customize the root keys serialized into the JSON.
+             * The hash property should be modified by reference (possibly using something like _.extend)
+             * By default the REST Serializer sends the modelName of a model, which is a camelized
+             * version of the name.
+             */
+            serializeIntoHash(
+                hash: {},
+                typeClass: Model,
+                snapshot: Snapshot,
+                options?: {}
+            ): any;
+            /**
+             * You can use `payloadKeyFromModelName` to override the root key for an outgoing
+             * request. By default, the RESTSerializer returns a camelized version of the
+             * model's name.
+             */
+            payloadKeyFromModelName(modelName: string): string;
+            /**
+             * You can use this method to customize how polymorphic objects are serialized.
+             * By default the REST Serializer creates the key by appending `Type` to
+             * the attribute and value from the model's camelcased model name.
+             */
+            serializePolymorphicType(
+                snapshot: Snapshot,
+                json: {},
+                relationship: {}
+            ): any;
+            /**
+             * You can use this method to customize how a polymorphic relationship should
+             * be extracted.
+             */
+            extractPolymorphicRelationship(
+                relationshipType: {},
+                relationshipHash: {},
+                relationshipOptions: {}
+            ): {};
+            /**
+             * `modelNameFromPayloadType` can be used to change the mapping for a DS model
+             * name, taken from the value in the payload.
+             */
+            modelNameFromPayloadType(payloadType: string): string;
+            /**
+             * `payloadTypeFromModelName` can be used to change the mapping for the type in
+             * the payload, taken from the model name.
+             */
+            payloadTypeFromModelName(modelName: string): string;
+        }
+        /**
+         * The `DS.BooleanTransform` class is used to serialize and deserialize
+         * boolean attributes on Ember Data record objects. This transform is
+         * used when `boolean` is passed as the type parameter to the
+         * [DS.attr](../../data#method_attr) function.
+         */
+        class BooleanTransform extends Transform {}
+        /**
+         * The `DS.DateTransform` class is used to serialize and deserialize
+         * date attributes on Ember Data record objects. This transform is used
+         * when `date` is passed as the type parameter to the
+         * [DS.attr](../../data#method_attr) function. It uses the [`ISO 8601`](https://en.wikipedia.org/wiki/ISO_8601)
+         * standard.
+         */
+        class DateTransform extends Transform {}
+        /**
+         * The `DS.NumberTransform` class is used to serialize and deserialize
+         * numeric attributes on Ember Data record objects. This transform is
+         * used when `number` is passed as the type parameter to the
+         * [DS.attr](../../data#method_attr) function.
+         */
+        class NumberTransform extends Transform {}
+        /**
+         * The `DS.StringTransform` class is used to serialize and deserialize
+         * string attributes on Ember Data record objects. This transform is
+         * used when `string` is passed as the type parameter to the
+         * [DS.attr](../../data#method_attr) function.
+         */
+        class StringTransform extends Transform {}
+        /**
+         * The `DS.Transform` class is used to serialize and deserialize model
+         * attributes when they are saved or loaded from an
+         * adapter. Subclassing `DS.Transform` is useful for creating custom
+         * attributes. All subclasses of `DS.Transform` must implement a
+         * `serialize` and a `deserialize` method.
+         */
+        class Transform extends Ember.Object {
+            /**
+             * When given a deserialized value from a record attribute this
+             * method must return the serialized value.
+             */
+            serialize(deserialized: any, options: AttrOptions): any;
+            /**
+             * When given a serialize value from a JSON object this method must
+             * return the deserialized value for the record attribute.
+             */
+            deserialize(serialized: any, options: AttrOptions): any;
+        }
+        /**
+         * An adapter is an object that receives requests from a store and
+         * translates them into the appropriate action to take against your
+         * persistence layer. The persistence layer is usually an HTTP API, but
+         * may be anything, such as the browser's local storage. Typically the
+         * adapter is not invoked directly instead its functionality is accessed
+         * through the `store`.
+         */
+        class Adapter extends Ember.Object {
+            /**
+             * If you would like your adapter to use a custom serializer you can
+             * set the `defaultSerializer` property to be the name of the custom
+             * serializer.
+             */
+            defaultSerializer: string;
+            /**
+             * The `findRecord()` method is invoked when the store is asked for a record that
+             * has not previously been loaded. In response to `findRecord()` being called, you
+             * should query your persistence layer for a record with the given ID. The `findRecord`
+             * method should return a promise that will resolve to a JavaScript object that will be
+             * normalized by the serializer.
+             */
+            findRecord(
+                store: Store,
+                type: Model,
+                id: string,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * The `findAll()` method is used to retrieve all records for a given type.
+             */
+            findAll(
+                store: Store,
+                type: Model,
+                sinceToken: string,
+                snapshotRecordArray: SnapshotRecordArray
+            ): RSVP.Promise<any>;
+            /**
+             * This method is called when you call `query` on the store.
+             */
+            query(
+                store: Store,
+                type: Model,
+                query: {},
+                recordArray: AdapterPopulatedRecordArray<any>
+            ): RSVP.Promise<any>;
+            /**
+             * The `queryRecord()` method is invoked when the store is asked for a single
+             * record through a query object.
+             */
+            queryRecord(store: Store, type: Model, query: {}): RSVP.Promise<any>;
+            /**
+             * If the globally unique IDs for your records should be generated on the client,
+             * implement the `generateIdForRecord()` method. This method will be invoked
+             * each time you create a new record, and the value returned from it will be
+             * assigned to the record's `primaryKey`.
+             */
+            generateIdForRecord(
+                store: Store,
+                type: Model,
+                inputProperties: {}
+            ): string | number;
+            /**
+             * Proxies to the serializer's `serialize` method.
+             */
+            serialize(snapshot: Snapshot, options: {}): {};
+            /**
+             * Implement this method in a subclass to handle the creation of
+             * new records.
+             */
+            createRecord(
+                store: Store,
+                type: Model,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * Implement this method in a subclass to handle the updating of
+             * a record.
+             */
+            updateRecord(
+                store: Store,
+                type: Model,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * Implement this method in a subclass to handle the deletion of
+             * a record.
+             */
+            deleteRecord(
+                store: Store,
+                type: Model,
+                snapshot: Snapshot
+            ): RSVP.Promise<any>;
+            /**
+             * By default the store will try to coalesce all `fetchRecord` calls within the same runloop
+             * into as few requests as possible by calling groupRecordsForFindMany and passing it into a findMany call.
+             * You can opt out of this behaviour by either not implementing the findMany hook or by setting
+             * coalesceFindRequests to false.
+             */
+            coalesceFindRequests: boolean;
+            /**
+             * The store will call `findMany` instead of multiple `findRecord`
+             * requests to find multiple records at once if coalesceFindRequests
+             * is true.
+             */
+            findMany(
+                store: Store,
+                type: Model,
+                ids: any[],
+                snapshots: any[]
+            ): RSVP.Promise<any>;
+            /**
+             * Organize records into groups, each of which is to be passed to separate
+             * calls to `findMany`.
+             */
+            groupRecordsForFindMany(store: Store, snapshots: any[]): any[];
+            /**
+             * This method is used by the store to determine if the store should
+             * reload a record from the adapter when a record is requested by
+             * `store.findRecord`.
+             */
+            shouldReloadRecord(store: Store, snapshot: Snapshot): boolean;
+            /**
+             * This method is used by the store to determine if the store should
+             * reload all records from the adapter when records are requested by
+             * `store.findAll`.
+             */
+            shouldReloadAll(
+                store: Store,
+                snapshotRecordArray: SnapshotRecordArray
+            ): boolean;
+            /**
+             * This method is used by the store to determine if the store should
+             * reload a record after the `store.findRecord` method resolves a
+             * cached record.
+             */
+            shouldBackgroundReloadRecord(
+                store: Store,
+                snapshot: Snapshot
+            ): boolean;
+            /**
+             * This method is used by the store to determine if the store should
+             * reload a record array after the `store.findAll` method resolves
+             * with a cached record array.
+             */
+            shouldBackgroundReloadAll(
+                store: Store,
+                snapshotRecordArray: SnapshotRecordArray
+            ): boolean;
+        }
+        /**
+         * `DS.Serializer` is an abstract base class that you should override in your
+         * application to customize it for your backend. The minimum set of methods
+         * that you should implement is:
+         */
+        class Serializer extends Ember.Object {
+            /**
+             * The `store` property is the application's `store` that contains
+             * all records. It can be used to look up serializers for other model
+             * types that may be nested inside the payload response.
+             */
+            store: Store;
+            /**
+             * The `normalizeResponse` method is used to normalize a payload from the
+             * server to a JSON-API Document.
+             */
+            normalizeResponse(
+                store: Store,
+                primaryModelClass: Model,
+                payload: {},
+                id: string | number,
+                requestType: string
+            ): {};
+            /**
+             * The `serialize` method is used when a record is saved in order to convert
+             * the record into the form that your external data source expects.
+             */
+            serialize(snapshot: Snapshot, options: {}): {};
+            /**
+             * The `normalize` method is used to convert a payload received from your
+             * external data source into the normalized form `store.push()` expects. You
+             * should override this method, munge the hash and return the normalized
+             * payload.
+             */
+            normalize(typeClass: Model, hash: {}): {};
+        }
+    }
+    export default DS;
+}
+
+declare module "ember" {
+    import DS from "ember-data";
+    namespace Ember {
+        /*
+		* The store is automatically injected into these objects
+		*
+		* https://github.com/emberjs/data/blob/05e95280e11c411177f2fbcb65fd83488d6a9d89/addon/setup-container.js#L71-L78
+		*/
+        interface Route {
+            store: DS.Store;
+        }
+        interface Controller {
+            store: DS.Store;
+        }
+        interface DataAdapter {
+            store: DS.Store;
+        }
+    }
+}
+declare module 'ember-data/adapter' {
+	import DS from 'ember-data';
+	export default DS.Adapter;
+}
+declare module 'ember-data/adapters/errors' {
+	import DS from 'ember-data';
+	const AdapterError: typeof DS.AdapterError;
+	const InvalidError: typeof DS.InvalidError;
+	const UnauthorizedError: typeof DS.UnauthorizedError;
+	const ForbiddenError: typeof DS.ForbiddenError;
+	const NotFoundError: typeof DS.NotFoundError;
+	const ConflictError: typeof DS.ConflictError;
+	const ServerError: typeof DS.ServerError;
+	const TimeoutError: typeof DS.TimeoutError;
+	const AbortError: typeof DS.AbortError;
+	const errorsHashToArray: typeof DS.errorsHashToArray;
+	const errorsArrayToHash: typeof DS.errorsArrayToHash;
+}
+declare module 'ember-data/adapters/json-api' {
+	import DS from 'ember-data';
+	export default DS.JSONAPIAdapter;
+}
+declare module 'ember-data/adapters/rest' {
+	import DS from 'ember-data';
+	export default DS.RESTAdapter;
+}
+declare module 'ember-data/attr' {
+	import DS from 'ember-data';
+	export default DS.attr;
+}
+declare module 'ember-data/model' {
+	import DS from 'ember-data';
+	export default DS.Model;
+}
+declare module 'ember-data/relationships' {
+	import DS from 'ember-data';
+	const hasMany: typeof DS.hasMany;
+	const belongsTo: typeof DS.belongsTo;
+}
+declare module 'ember-data/serializer' {
+	import DS from 'ember-data';
+	export default DS.Serializer;
+}
+declare module 'ember-data/serializers/embedded-records-mixin' {
+	import DS from 'ember-data';
+	export default DS.EmbeddedRecordsMixin;
+}
+declare module 'ember-data/serializers/json-api' {
+	import DS from 'ember-data';
+	export default DS.JSONAPISerializer;
+}
+declare module 'ember-data/serializers/json' {
+	import DS from 'ember-data';
+	export default DS.JSONSerializer;
+}
+declare module 'ember-data/serializers/rest' {
+	import DS from 'ember-data';
+	export default DS.RESTSerializer;
+}
+declare module "ember-data/store" {
+    import DS from "ember-data";
+    export default DS.Store;
+}
+declare module "ember-data/transform" {
+    import DS from "ember-data";
+    export default DS.Transform;
+}
+declare module "ember-data/transforms/boolean" {
+    import DS from "ember-data";
+    export default DS.BooleanTransform;
+}
+declare module "ember-data/transforms/date" {
+    import DS from "ember-data";
+    export default DS.DateTransform;
+}
+declare module "ember-data/transforms/number" {
+    import DS from "ember-data";
+    export default DS.NumberTransform;
+}
+declare module "ember-data/transforms/string" {
+    import DS from "ember-data";
+    export default DS.StringTransform;
+}
+declare module "ember-data/transforms/transform" {
+    import DS from "ember-data";
+    export default DS.Transform;
+}
diff --git a/types/ember-data/test/adapter.ts b/types/ember-data/test/adapter.ts
new file mode 100644
index 0000000000..17f69bcd9c
--- /dev/null
+++ b/types/ember-data/test/adapter.ts
@@ -0,0 +1,108 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+const JsonApi = DS.JSONAPIAdapter.extend({
+    // Application specific overrides go here
+});
+
+const Customized = DS.JSONAPIAdapter.extend({
+    host: 'https://api.example.com',
+    namespace: 'api/v1',
+    headers: {
+        'API_KEY': 'secret key',
+        'ANOTHER_HEADER': 'Some header value'
+    }
+});
+
+const AuthTokenHeader = DS.JSONAPIAdapter.extend({
+    session: Ember.inject.service('session'),
+    headers: Ember.computed('session.authToken', function() {
+        return {
+            'API_KEY': this.get('session.authToken'),
+            'ANOTHER_HEADER': 'Some header value'
+        };
+    })
+});
+
+const UseAjax = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        return this.ajax(url, 'POST', {
+            param: 'foo'
+        });
+    }
+});
+
+const UseAjaxOptions = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        const options = this.ajaxOptions(url, 'DELETE', {
+            foo: 'bar'
+        });
+        return Ember.$.ajax(url, {
+            ...options
+        });
+    }
+});
+
+const UseAjaxOptionsWithOptionalThirdParams = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        const options = this.ajaxOptions(url, 'DELETE');
+        return Ember.$.ajax(url, {
+            ...options
+        });
+    }
+});
+
+// https://github.com/emberjs/data/blob/c9d8212c857ca78218ad98d11621819b38dba98f/tests/unit/adapters/build-url-mixin/build-url-test.js
+const BuildURLAdapter = DS.RESTAdapter.extend({
+    worksWithOnlyModelNameAndId() {
+        this.buildURL('rootModel', 1);
+    },
+
+    worksWithFindRecord() {
+        this.buildURL('super-user', 1, {} as any, 'findRecord');
+    },
+
+    worksWithFindAll() {
+        this.buildURL('super-user', null, {} as any, 'findAll');
+    },
+
+    worksWithQueryStub() {
+        this.buildURL('super-user', null, null, 'query', { limit: 10 });
+    },
+
+    worksWithQueryRecord() {
+        this.buildURL('super-user', null, null, 'queryRecord', { companyId: 10 });
+    },
+
+    worksWithFindMany() {
+        this.buildURL('super-user', [1, 2, 3], null, 'findMany');
+    },
+
+    worksWithFindHasMany() {
+        this.buildURL('super-user', 1, {} as any, 'findHasMany');
+    },
+
+    worksWithFindBelongsTo() {
+        this.buildURL('super-user', 1, {} as any, 'findBelongsTo');
+    },
+
+    worksWithCreateRecord() {
+        this.buildURL('super-user', 1, {} as any, 'createRecord');
+    },
+
+    worksWithUpdateRecord() {
+        this.buildURL('super-user', 1, {} as any, 'updateRecord');
+    },
+
+    worksWithDeleteRecord() {
+        this.buildURL('super-user', 1, {} as any, 'deleteRecord');
+    },
+
+    worksWithUnknownRequestType() {
+        this.buildURL('super-user', 1, null, 'unknown');
+        this.buildURL('super-user', null, null, 'unknown');
+    }
+});
diff --git a/types/ember-data/test/belongs-to.ts b/types/ember-data/test/belongs-to.ts
new file mode 100644
index 0000000000..9e59aa6128
--- /dev/null
+++ b/types/ember-data/test/belongs-to.ts
@@ -0,0 +1,16 @@
+import DS from 'ember-data';
+import { assertType } from './lib/assert';
+
+class Folder extends DS.Model {
+    name = DS.attr('string');
+    children = DS.hasMany<Folder>('folder', { inverse: 'parent' });
+    parent = DS.belongsTo<Folder>('folder', { inverse: 'children' });
+}
+
+const folder = Folder.create();
+assertType<Folder>(folder.get('parent'));
+assertType<string>(folder.get('parent').get('name'));
+folder.get('parent').then(parent => {
+    assertType<Folder>(parent);
+    assertType<string>(parent.get('name'));
+});
diff --git a/types/ember-data/test/has-many.ts b/types/ember-data/test/has-many.ts
new file mode 100644
index 0000000000..7fb586ff4a
--- /dev/null
+++ b/types/ember-data/test/has-many.ts
@@ -0,0 +1,43 @@
+import DS from 'ember-data';
+import { assertType } from './lib/assert';
+
+class Comment extends DS.Model {
+    text = DS.attr('string');
+}
+
+class BlogPost extends DS.Model {
+    title = DS.attr('string');
+    commentsAsync = DS.hasMany<Comment>('comment');
+    commentsSync = DS.hasMany<Comment>('comment', { async: false });
+}
+
+const post = BlogPost.create();
+
+assertType<DS.PromiseArray<Comment>>(post.get('commentsSync').reload());
+assertType<Comment>(post.get('commentsSync').createRecord());
+
+const comment = post.get('commentsSync').get('firstObject');
+assertType<Comment | undefined>(comment);
+if (comment) {
+    assertType<string>(comment.get('text'));
+}
+
+assertType<DS.PromiseArray<Comment>>(post.get('commentsAsync').reload());
+assertType<Comment>(post.get('commentsAsync').createRecord());
+assertType<Comment | undefined>(post.get('commentsAsync').get('firstObject'));
+
+const commentAsync = post.get('commentsAsync').get('firstObject');
+assertType<Comment | undefined>(commentAsync);
+if (commentAsync) {
+    assertType<string>(commentAsync.get('text'));
+}
+assertType<boolean>(post.get('commentsAsync').get('isFulfilled'));
+
+post.get('commentsAsync').then(comments => {
+    assertType<Comment | undefined>(comments.get('firstObject'));
+    assertType<string>(comments.get('firstObject')!.get('text'));
+});
+
+class Polymorphic extends DS.Model {
+    paymentMethods = DS.hasMany('payment-method', { polymorphic: true });
+}
diff --git a/types/ember-data/test/injections.ts b/types/ember-data/test/injections.ts
new file mode 100644
index 0000000000..4c0a6e4e6b
--- /dev/null
+++ b/types/ember-data/test/injections.ts
@@ -0,0 +1,22 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+Ember.Route.extend({
+    model(): any {
+        return this.store.findAll('my-model');
+    }
+});
+
+Ember.Controller.extend({
+    actions: {
+        create(): any {
+            return this.store.createRecord('my-model');
+        }
+    }
+});
+
+Ember.DataAdapter.extend({
+    test() {
+        this.store.findRecord('my-model', 123);
+    }
+});
diff --git a/types/ember-data/test/lib/assert.ts b/types/ember-data/test/lib/assert.ts
new file mode 100644
index 0000000000..10094b9616
--- /dev/null
+++ b/types/ember-data/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): void;
diff --git a/types/ember-data/test/model.ts b/types/ember-data/test/model.ts
new file mode 100644
index 0000000000..a18167dbee
--- /dev/null
+++ b/types/ember-data/test/model.ts
@@ -0,0 +1,32 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+import { assertType } from "./lib/assert";
+
+const Person = DS.Model.extend({
+    firstName: DS.attr(),
+    lastName: DS.attr(),
+    title: DS.attr({ defaultValue: "The default" }),
+    title2: DS.attr({ defaultValue: () => "The default" }),
+
+    fullName: Ember.computed('firstName', 'lastName', function() {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    })
+});
+
+const User = DS.Model.extend({
+    username: DS.attr('string'),
+    email: DS.attr('string'),
+    verified: DS.attr('boolean', { defaultValue: false }),
+    createdAt: DS.attr('date', {
+        defaultValue() { return new Date(); }
+    })
+});
+
+const user = User.create({ username: 'dwickern' });
+assertType<string>(user.get('id'));
+assertType<string>(user.get('username'));
+assertType<boolean>(user.get('verified'));
+assertType<Date>(user.get('createdAt'));
+
+user.serialize();
+user.serialize({ includeId: true });
diff --git a/types/ember-data/test/module-api.ts b/types/ember-data/test/module-api.ts
new file mode 100644
index 0000000000..3ef3f3a224
--- /dev/null
+++ b/types/ember-data/test/module-api.ts
@@ -0,0 +1,91 @@
+/**
+ * Tests for the Ember-Data "module API" introduced in v2.3
+ * @see https://www.emberjs.com/blog/2016/01/12/ember-data-2-3-released.html#toc_importing-modules
+ */
+import DS from 'ember-data';
+// Adapters
+import Adapter from 'ember-data/adapter';
+import JSONAPIAdapter from 'ember-data/adapters/json-api';
+import RESTAdapter from 'ember-data/adapters/rest';
+// Serializers
+import Serializer from 'ember-data/serializer';
+import RESTSerializer from 'ember-data/serializers/rest';
+import JSONSerializer from 'ember-data/serializers/json';
+import JSONAPISerializer from 'ember-data/serializers/json-api';
+
+// Model
+import Model from 'ember-data/model';
+// Model - attr
+import attr from 'ember-data/attr';
+// Model - relationships
+import { hasMany, belongsTo } from 'ember-data/relationships';
+
+// Transforms
+import BooleanTransform from 'ember-data/transforms/boolean';
+import StringTransform from 'ember-data/transforms/string';
+import NumberTransform from 'ember-data/transforms/number';
+import DateTransform from 'ember-data/transforms/date';
+import Transform from 'ember-data/transforms/transform';
+
+// Store
+import Store from 'ember-data/store';
+
+// Errors
+import * as EDErrors from 'ember-data/adapters/errors';
+
+import { assertType } from "./lib/assert";
+
+// ADAPTERS
+// - identity
+assertType<typeof DS.Adapter>(Adapter);
+assertType<typeof DS.RESTAdapter>(RESTAdapter);
+assertType<typeof DS.JSONAPIAdapter>(JSONAPIAdapter);
+// - inheritance
+assertType<typeof DS.Adapter>(RESTAdapter);
+assertType<typeof DS.RESTAdapter>(JSONAPIAdapter);
+
+// SERIALIZERS
+// - identity
+assertType<typeof DS.Serializer>(Serializer);
+assertType<typeof DS.RESTSerializer>(RESTSerializer);
+assertType<typeof DS.JSONSerializer>(JSONSerializer);
+assertType<typeof DS.JSONAPISerializer>(JSONAPISerializer);
+// - inheritance
+assertType<typeof DS.Serializer>(JSONSerializer);
+assertType<typeof DS.JSONSerializer>(RESTSerializer);
+assertType<typeof DS.JSONSerializer>(JSONAPISerializer);
+
+// MODEL
+// - identity
+assertType<typeof DS.Model>(Model);
+// - attributes
+assertType<typeof DS.attr>(attr);
+// - relationships
+assertType<typeof DS.hasMany>(hasMany);
+assertType<typeof DS.belongsTo>(belongsTo);
+
+// TRANSFORMS
+// - identity
+assertType<typeof DS.BooleanTransform>(BooleanTransform);
+assertType<typeof DS.NumberTransform>(NumberTransform);
+assertType<typeof DS.StringTransform>(StringTransform);
+assertType<typeof DS.DateTransform>(DateTransform);
+assertType<typeof DS.Transform>(Transform);
+
+// STORE
+// - identity
+assertType<typeof DS.Store>(Store);
+
+// ERRORS
+// - identity
+assertType<typeof DS.AdapterError>(EDErrors.AdapterError);
+assertType<typeof DS.InvalidError>(EDErrors.InvalidError);
+assertType<typeof DS.UnauthorizedError>(EDErrors.UnauthorizedError);
+assertType<typeof DS.ForbiddenError>(EDErrors.ForbiddenError);
+assertType<typeof DS.NotFoundError>(EDErrors.NotFoundError);
+assertType<typeof DS.ConflictError>(EDErrors.ConflictError);
+assertType<typeof DS.ServerError>(EDErrors.ServerError);
+assertType<typeof DS.TimeoutError>(EDErrors.TimeoutError);
+assertType<typeof DS.AbortError>(EDErrors.AbortError);
+assertType<typeof DS.errorsHashToArray>(EDErrors.errorsHashToArray);
+assertType<typeof DS.errorsArrayToHash>(EDErrors.errorsArrayToHash);
diff --git a/types/ember-data/test/record-reference.ts b/types/ember-data/test/record-reference.ts
new file mode 100644
index 0000000000..bb4fda42d4
--- /dev/null
+++ b/types/ember-data/test/record-reference.ts
@@ -0,0 +1,38 @@
+import DS from 'ember-data';
+import { assertType } from "./lib/assert";
+
+declare const store: DS.Store;
+
+class User extends DS.Model {
+    username = DS.attr('string');
+}
+
+let userRef = store.getReference<User>('user', 1);
+
+// get the record of the reference (null if not yet available)
+let user = userRef.value();
+if (user !== null) {
+    assertType<User>(user);
+}
+
+// get the identifier of the reference
+if (userRef.remoteType() === 'id') {
+    let id = userRef.id();
+    assertType<string>(id);
+}
+
+// load user (via store.find)
+userRef.load().then(user => {
+    assertType<User>(user);
+});
+
+// or trigger a reload
+userRef.reload().then(user => {
+    assertType<User>(user);
+});
+
+// provide data for reference
+userRef.push({ id: 1, username: '@user' }).then(function(user) {
+    assertType<User>(user);
+    userRef.value() === user;
+});
diff --git a/types/ember-data/test/relationships.ts b/types/ember-data/test/relationships.ts
new file mode 100644
index 0000000000..a878428bc4
--- /dev/null
+++ b/types/ember-data/test/relationships.ts
@@ -0,0 +1,30 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+declare const store: DS.Store;
+
+const Person = DS.Model.extend({
+    children: DS.hasMany('folder', { inverse: 'parent' }),
+    parent: DS.belongsTo('folder', { inverse: 'children' })
+});
+
+const Polymorphic = DS.Model.extend({
+    paymentMethods: DS.hasMany('payment-method', { polymorphic: true })
+});
+
+class Comment extends DS.Model {
+    author = DS.attr('string');
+}
+
+class BlogPost extends DS.Model {
+    title = DS.attr('string');
+    tag = DS.attr('string');
+    comments = DS.hasMany<Comment>('comment', { async: true });
+    relatedPosts = DS.hasMany('post');
+}
+
+let blogPost = store.peekRecord<BlogPost>('blog-post', 1);
+blogPost!.get('comments').then((comments) => {
+    // now we can work with the comments
+    let author: string = comments.get('firstObject')!.get('author');
+});
diff --git a/types/ember-data/test/serializer.ts b/types/ember-data/test/serializer.ts
new file mode 100644
index 0000000000..986020144f
--- /dev/null
+++ b/types/ember-data/test/serializer.ts
@@ -0,0 +1,38 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+const JsonApi = DS.JSONAPISerializer.extend({});
+
+const Customized = DS.JSONAPISerializer.extend({
+    serialize(snapshot: DS.Snapshot, options: {}) {
+        let json: any = this._super(...Array.from(arguments));
+
+        json.data.attributes.cost = {
+            amount: json.data.attributes.amount,
+            currency: json.data.attributes.currency
+        };
+
+        return json;
+    },
+    normalizeResponse(store: DS.Store, primaryModelClass: DS.Model, payload: any, id: string|number, requestType: string) {
+        payload.data.attributes.amount = payload.data.attributes.cost.amount;
+        payload.data.attributes.currency = payload.data.attributes.cost.currency;
+
+        delete payload.data.attributes.cost;
+
+        return this._super(...Array.from(arguments));
+    }
+});
+
+const EmbeddedRecordMixin = DS.JSONSerializer.extend(DS.EmbeddedRecordsMixin, {
+    attrs: {
+        author: {
+            serialize: false,
+            deserialize: 'records'
+        },
+        comments: {
+            deserialize: 'records',
+            serialize: 'ids'
+        }
+    }
+});
diff --git a/types/ember-data/test/store.ts b/types/ember-data/test/store.ts
new file mode 100644
index 0000000000..46b0987981
--- /dev/null
+++ b/types/ember-data/test/store.ts
@@ -0,0 +1,122 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+import { assertType } from "./lib/assert";
+
+declare const store: DS.Store;
+
+class Post extends DS.Model {
+  title = DS.attr('string');
+}
+
+let post = store.createRecord<Post>('post', {
+    title: 'Rails is Omakase',
+    body: 'Lorem ipsum'
+});
+
+post.save(); // => POST to '/posts'
+post.save().then((saved) => {
+    assertType<Post>(saved);
+});
+
+store.findRecord<Post>('post', 1).then(function(post) {
+    post.get('title'); // => "Rails is Omakase"
+    post.set('title', 'A new post');
+    post.save(); // => PATCH to '/posts/1'
+});
+
+class User extends DS.Model {
+    username = DS.attr('string');
+}
+
+store.queryRecord<User>('user', {}).then(function(user) {
+    let username = user.get('username');
+    console.log(`Currently logged in as ${username}`);
+});
+
+store.findAll('blog-post'); // => GET /blog-posts
+store.findAll('author', { reload: true }).then(function(authors) {
+    authors.getEach('id'); // ['first', 'second']
+});
+store.findAll('post', {
+    adapterOptions: { subscribe: false }
+});
+store.findAll('post', { include: 'comments,comments.author' });
+
+store.peekAll('blog-post'); // => no network request
+
+if (store.hasRecordForId('post', 1)) {
+    let maybePost = store.peekRecord('post', 1);
+    if (maybePost) {
+        maybePost.get('id'); // 1
+    }
+}
+
+class Message extends DS.Model {
+  hasBeenSeen = DS.attr('boolean');
+}
+
+const messages = store.peekAll<Message>('message');
+messages.forEach(function(message) {
+    message.set('hasBeenSeen', true);
+});
+messages.save();
+
+const people = store.peekAll('person');
+people.get('isUpdating'); // false
+people.update().then(function() {
+    people.get('isUpdating'); // false
+});
+people.get('isUpdating'); // true
+
+const MyRoute = Ember.Route.extend({
+    model(params: any): any {
+        return this.store.findRecord('post', params.post_id, {include: 'comments,comments.author'});
+    }
+});
+
+// GET to /users?filter[email]=tomster@example.com
+const tom = store.query('user', {
+    filter: {
+        email: 'tomster@example.com'
+    }
+}).then(function(users) {
+    return users.get("firstObject");
+});
+
+// GET /users?isAdmin=true
+const admins = store.query('user', { isAdmin: true });
+admins.then(function() {
+    console.log(admins.get("length")); // 42
+});
+admins.update().then(function() {
+    admins.get('isUpdating'); // false
+    console.log(admins.get("length")); // 123
+});
+
+store.push({
+    data: [{
+        id: 1,
+        type: 'album',
+        attributes: {
+            title: 'Fewer Moving Parts',
+            artist: 'David Bazan',
+            songCount: 10
+        },
+        relationships: {}
+    }, {
+        id: 2,
+        type: 'album',
+        attributes: {
+            title: 'Calgary b/w I Can\'t Make You Love Me/Nick Of Time',
+            artist: 'Bon Iver',
+            songCount: 2
+        },
+        relationships: {}
+    }]
+});
+
+class UserAdapter extends DS.Adapter { }
+class UserSerializer extends DS.Serializer { }
+
+assertType<UserAdapter>(store.adapterFor<UserAdapter>('user'));
+assertType<UserSerializer>(store.serializerFor<UserSerializer>('user'));
diff --git a/types/ember-data/test/transform.ts b/types/ember-data/test/transform.ts
new file mode 100644
index 0000000000..b76d40a73f
--- /dev/null
+++ b/types/ember-data/test/transform.ts
@@ -0,0 +1,16 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+class Point extends Ember.Object {
+    x: number;
+    y: number;
+}
+
+const PointTransform = DS.Transform.extend({
+    serialize(value: Point): number[] {
+        return [value.get('x'), value.get('y')];
+    },
+    deserialize(value: [ number, number ]): Point {
+        return Point.create({ x: value[0], y: value[1] });
+    }
+});
diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
new file mode 100644
index 0000000000..5f7c297ec7
--- /dev/null
+++ b/types/ember-data/tsconfig.json
@@ -0,0 +1,33 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/lib/assert.ts",
+        "test/model.ts",
+        "test/module-api.ts",
+        "test/adapter.ts",
+        "test/serializer.ts",
+        "test/transform.ts",
+        "test/relationships.ts",
+        "test/store.ts",
+        "test/has-many.ts",
+        "test/belongs-to.ts",
+        "test/record-reference.ts",
+        "test/injections.ts"
+    ]
+}
diff --git a/types/ember-data/tslint.json b/types/ember-data/tslint.json
new file mode 100644
index 0000000000..6d765664cf
--- /dev/null
+++ b/types/ember-data/tslint.json
@@ -0,0 +1,18 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // Heavy use of Function type in this older package.
+        "ban-types": false,
+        "jsdoc-format": false,
+        "no-misused-new": false,
+        // not sure what this means
+        "no-single-declare-module": false,
+        "object-literal-key-quotes": false,
+        "only-arrow-functions": false,
+        "no-empty-interface": false,
+        "prefer-const": false,
+        "no-unnecessary-generics": false,
+        "no-declare-current-package": false,
+        "no-self-import": false
+    }
+}
diff --git a/types/ember-feature-flags/ember-feature-flags-tests.ts b/types/ember-feature-flags/ember-feature-flags-tests.ts
new file mode 100644
index 0000000000..063aeea927
--- /dev/null
+++ b/types/ember-feature-flags/ember-feature-flags-tests.ts
@@ -0,0 +1,14 @@
+import Features from 'ember-feature-flags';
+import 'ember-feature-flags/tests/helpers/with-feature';
+
+// https://www.npmjs.com/package/ember-feature-flags#withfeature
+declare var features: Features;
+features.isEnabled('new-billing-plans'); // $ExpectType boolean
+features.enable('newHomepage'); // $ExpectType void
+features.disable('newHomepage'); // $ExpectType void
+const setup = {
+  "new-billing-plans": true,
+  "new-homepage": false
+};
+features.setup(setup); // $ExpectType void
+withFeature('new-homepage'); // $ExpectType void
diff --git a/types/ember-feature-flags/index.d.ts b/types/ember-feature-flags/index.d.ts
new file mode 100644
index 0000000000..8aec1a6f0a
--- /dev/null
+++ b/types/ember-feature-flags/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for ember-feature-flags 3.0
+// Project: https://github.com/kategengler/ember-feature-flags#readme
+// Definitions by: Frank Tan <https://github.com/tansongyang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import Ember from 'ember';
+
+// https://github.com/kategengler/ember-feature-flags/blob/v3.0.0/addon/services/features.js#L5
+export default class Features extends Ember.Service {
+    setup(features: { [key: string]: boolean }): void;
+    enable(feature: string): void;
+    disable(feature: string): void;
+    isEnabled(feature: string): boolean;
+}
diff --git a/types/ember-feature-flags/tests/helpers/with-feature.d.ts b/types/ember-feature-flags/tests/helpers/with-feature.d.ts
new file mode 100644
index 0000000000..ef735f7923
--- /dev/null
+++ b/types/ember-feature-flags/tests/helpers/with-feature.d.ts
@@ -0,0 +1,3 @@
+// https://www.npmjs.com/package/ember-feature-flags#withfeature
+// https://github.com/kategengler/ember-feature-flags/blob/v3.0.0/test-support/helpers/with-feature.js#L3
+declare function withFeature(name: string): void;
diff --git a/types/ember-feature-flags/tsconfig.json b/types/ember-feature-flags/tsconfig.json
new file mode 100644
index 0000000000..9481eddeb5
--- /dev/null
+++ b/types/ember-feature-flags/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "tests/helpers/with-feature.d.ts",
+        "ember-feature-flags-tests.ts"
+    ]
+}
diff --git a/types/ember-feature-flags/tslint.json b/types/ember-feature-flags/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ember-feature-flags/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ember-mocha/ember-mocha-tests.ts b/types/ember-mocha/ember-mocha-tests.ts
new file mode 100644
index 0000000000..3516932eec
--- /dev/null
+++ b/types/ember-mocha/ember-mocha-tests.ts
@@ -0,0 +1,195 @@
+import {
+    describeComponent, describeModel, describeModule,
+    setResolver, setupAcceptanceTest, setupComponentTest,
+    setupModelTest, setupTest
+} from 'ember-mocha';
+import { context, describe, it, beforeEach, afterEach, before, after } from 'mocha';
+import chai = require('chai');
+import Ember from "ember";
+import hbs from 'htmlbars-inline-precompile';
+
+describeModule('name', function() {
+    beforeEach(function() {
+    });
+
+    it('test', function() {
+    });
+});
+
+describeModule('name', 'description', function() {
+    it('test', function() {
+    });
+});
+
+describeModule(
+    'name',
+    'description',
+    {
+        needs: ['service:notifications']
+    },
+    function() {
+    }
+);
+
+describeModule('component:x-foo', 'TestModule callbacks', {
+    needs: [],
+
+    beforeSetup() {
+    },
+    setup() {
+    },
+    teardown() {
+    },
+    afterTeardown() {
+    }
+}, function() {
+});
+
+describeComponent('x-foo', {
+    integration: true
+}, function() {
+});
+
+describeComponent('x-foo', {
+    unit: true,
+    needs: ['helper:pluralize-string']
+}, function() {
+});
+
+describeComponent.skip(
+    'block-slot',
+    'Integration: BlockSlotComponent',
+    {
+        integration: true
+    },
+    function() {
+    }
+);
+
+describeModel('user', {
+    needs: ['model:child']
+}, function() {
+});
+
+describeModule('component:x-foo', 'TestModule callbacks', function() {
+    before(function() {
+        class I18n extends Ember.Object {}
+
+        this.skip();
+        this.timeout(1000);
+        this.registry.register('helper:i18n', I18n);
+        this.registry.register('helper:i18n', I18n, { singleton: true });
+        this.register('service:i18n', {});
+        this.inject.service('i18n');
+        this.inject.service('i18n', { as: 'i18n' });
+        this.factory('object:user').create();
+    });
+
+    after(function() {
+    });
+
+    beforeEach(function() {
+    });
+
+    afterEach(function() {
+    });
+});
+
+describe('setupTest', function() {
+    setupTest();
+
+    setupTest('service:ajax');
+
+    setupTest('service:ajax', {
+        unit: true
+    });
+
+    setupTest('controller:sidebar', {
+        // Specify the other units that are required for this test.
+        // needs: ['controller:foo']
+    });
+
+    setupComponentTest('gravatar-image', {
+        // specify the other units that are required for this test
+        // needs: ['component:foo', 'helper:bar']
+    });
+
+    setupModelTest('contact', {
+        // Specify the other units that are required for this test.
+        needs: []
+    });
+
+    const Application = Ember.Application.extend();
+
+    setupAcceptanceTest({ Application });
+
+    it('test', function() {
+    });
+});
+
+// testing context
+describe('for test suite A', function() {
+    context('when trying method foo', function() {
+        it('should test correctly', function() {
+        });
+    });
+});
+
+// if you don't have a custom resolver, do it like this:
+setResolver(Ember.DefaultResolver.create());
+
+it('renders', function() {
+    // setup the outer context
+    this.set('value', 'cat');
+    this.on('action', function(result) {
+        chai.expect(result).to.equal('bar', 'The correct result was returned');
+        chai.expect(this.get('value')).to.equal('cat');
+    });
+
+    // render the component
+    this.render(hbs`
+        {{ x-foo value=value action="result" }}
+    `);
+    this.render('{{ x-foo value=value action="result" }}');
+    this.render([
+        '{{ x-foo value=value action="result" }}'
+    ]);
+
+    chai.expect(this.$('div>.value').text()).to.equal('cat', 'The component shows the correct value');
+
+    this.$('button').click();
+});
+
+it('renders', function() {
+    // creates the component instance
+    const subject = this.subject();
+
+    const subject2 = this.subject({
+        item: 42
+    });
+
+    const { inputFormat } = this.setProperties({
+        inputFormat: 'M/D/YY',
+        outputFormat: 'MMMM D, YYYY',
+        date: '5/3/10'
+    });
+
+    const { inputFormat: if2, outputFormat } = this.getProperties('inputFormat', 'outputFormat');
+
+    const inputFormat2 = this.get('inputFormat');
+
+    // render the component on the page
+    this.render();
+    chai.expect(this.$('.foo').text()).to.equal('bar');
+});
+
+it('can calculate the result', function(assert) {
+    const subject = this.subject();
+
+    subject.set('value', 'foo');
+    chai.assert.equal(subject.get('result'), 'bar');
+});
+
+it.skip('disabled test');
+
+it.skip('disabled test', function() { });
diff --git a/types/ember-mocha/index.d.ts b/types/ember-mocha/index.d.ts
new file mode 100644
index 0000000000..f43982fda8
--- /dev/null
+++ b/types/ember-mocha/index.d.ts
@@ -0,0 +1,78 @@
+// Type definitions for ember-mocha 0.12
+// Project: https://github.com/emberjs/ember-mocha#readme
+// Definitions by: Derek Wickern <https://github.com/dwickern>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { TestContext, ModuleCallbacks } from "ember-test-helpers";
+import Ember from 'ember';
+import { it as mochaIt, ISuiteCallbackContext } from 'mocha';
+
+// these globals are re-exported as named exports by ember-mocha
+type mochaBefore = typeof before;
+type mochaAfter = typeof after;
+type mochaBeforeEach = typeof beforeEach;
+type mochaAfterEach = typeof afterEach;
+type mochaSetup = typeof setup;
+type mochaTeardown = typeof teardown;
+type mochaSuiteSetup = typeof suiteSetup;
+type mochaSuiteTeardown = typeof suiteTeardown;
+
+declare module 'ember-mocha' {
+    interface ContextDefinitionFunction {
+        (name: string, description: string, callbacks: ModuleCallbacks, tests: (this: ISuiteCallbackContext) => void): void;
+        (name: string, description: string, tests: (this: ISuiteCallbackContext) => void): void;
+        (name: string, callbacks: ModuleCallbacks, tests: (this: ISuiteCallbackContext) => void): void;
+        (name: string, tests: (this: ISuiteCallbackContext) => void): void;
+    }
+
+    interface ContextDefinition extends ContextDefinitionFunction {
+        only: ContextDefinitionFunction;
+        skip: ContextDefinitionFunction;
+    }
+
+    interface SetupTest {
+        (name?: string, callbacks?: ModuleCallbacks): void;
+        (callbacks: ModuleCallbacks): void;
+    }
+
+    /** @deprecated Use setupTest instead */
+    export const describeModule: ContextDefinition;
+
+    /** @deprecated Use setupComponentTest instead */
+    export const describeComponent: ContextDefinition;
+
+    /** @deprecated Use setupModelTest instead */
+    export const describeModel: ContextDefinition;
+
+    export const setupTest: SetupTest;
+    export const setupAcceptanceTest: SetupTest;
+    export const setupComponentTest: SetupTest;
+    export const setupModelTest: SetupTest;
+
+    export const it: typeof mochaIt;
+
+    /**
+     * Sets a Resolver globally which will be used to look up objects from each test's container.
+     */
+    export function setResolver(resolver: Ember.Resolver): void;
+}
+
+declare module 'mocha' {
+    // augment test callback context
+    interface ITestCallbackContext extends TestContext {}
+    interface IHookCallbackContext extends TestContext {}
+
+    // re-export mocha globals as named exports
+    export const describe: Mocha.IContextDefinition;
+    export const context: Mocha.IContextDefinition;
+    export const it: Mocha.ITestDefinition;
+    export const setup: mochaSetup;
+    export const teardown: mochaTeardown;
+    export const suiteSetup: mochaSuiteSetup;
+    export const suiteTeardown: mochaSuiteTeardown;
+    export const before: mochaBefore;
+    export const after: mochaAfter;
+    export const beforeEach: mochaBeforeEach;
+    export const afterEach: mochaAfterEach;
+}
diff --git a/types/ember-mocha/tsconfig.json b/types/ember-mocha/tsconfig.json
new file mode 100644
index 0000000000..e9fdedfe7f
--- /dev/null
+++ b/types/ember-mocha/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ember-mocha-tests.ts"
+    ]
+}
diff --git a/types/ember-mocha/tslint.json b/types/ember-mocha/tslint.json
new file mode 100644
index 0000000000..aed9a80a73
--- /dev/null
+++ b/types/ember-mocha/tslint.json
@@ -0,0 +1,18 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "only-arrow-functions": false,
+        "strict-export-declare-modifiers": false,
+        "no-duplicate-imports": false,
+        "unified-signatures": false,
+        "no-declare-current-package": false,
+
+        // ERROR: An interface declaring no members is equivalent to its supertype.
+        // -- Not true when augmenting an interface
+        "no-empty-interface": false,
+
+        // ERROR: interface name must not have an "I" prefix
+        // -- Augmenting @types/mocha which uses "I" prefix
+        "interface-name": false
+    }
+}
diff --git a/types/ember-modal-dialog/ember-modal-dialog-tests.ts b/types/ember-modal-dialog/ember-modal-dialog-tests.ts
new file mode 100644
index 0000000000..06ab7fd241
--- /dev/null
+++ b/types/ember-modal-dialog/ember-modal-dialog-tests.ts
@@ -0,0 +1,27 @@
+import ModalDialog from 'ember-modal-dialog/components/modal-dialog';
+
+class MyDialog extends ModalDialog {
+    // https://www.npmjs.com/package/ember-modal-dialog#configurable-properties
+    testProperties() {
+        this.hasOverlay; // $ExpectType boolean
+        this.translucentOverlay; // $ExpectType boolean
+        this.onClose();
+        this.onClickOverlay();
+        this.clickOutsideToClose; // $ExpectType boolean
+        this.renderInPlace; // $ExpectType boolean
+        this.overlayPosition; // $ExpectType "parent" | "sibling"
+        this.containerClass; // $ExpectType string
+        this.containerClassNames; // $ExpectType string[]
+        this.overlayClass; // $ExpectType string
+        this.overlayClassNames; // $ExpectType string[]
+        this.wrapperClass; // $ExpectType string
+        this.wrapperClassNames; // $ExpectType string[]
+        this.animatable; // $ExpectType boolean
+    }
+}
+
+class MyOtherDialog extends ModalDialog.extend({
+    testProperties() {
+        this.hasOverlay; // $ExpectType boolean
+    }
+}) {}
diff --git a/types/ember-modal-dialog/index.d.ts b/types/ember-modal-dialog/index.d.ts
new file mode 100644
index 0000000000..b9b356e988
--- /dev/null
+++ b/types/ember-modal-dialog/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for ember-modal-dialog 2.4
+// Project: https://github.com/yapplabs/ember-modal-dialog#readme
+// Definitions by: Frank Tan <https://github.com/tansongyang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare module 'ember-modal-dialog/components/modal-dialog' {
+    import Ember from 'ember';
+
+    // https://github.com/yapplabs/ember-modal-dialog/blob/v2.4.1/addon/components/modal-dialog.js#L28
+    // https://www.npmjs.com/package/ember-modal-dialog#configurable-properties
+    export default class ModalDialog extends Ember.Component {
+        /**
+         * Toggles presence of overlay div in DOM
+         */
+        hasOverlay: boolean;
+        /**
+         * Indicates translucence of overlay, toggles presence of translucent CSS
+         * selector
+         */
+        translucentOverlay: boolean;
+        /**
+         * The action handler for the dialog's onClose action. This action triggers
+         * when the user clicks the modal overlay.
+         */
+        onClose: () => void;
+        /**
+         * An action to be called when the overlay is clicked. If this action is
+         * specified, clicking the overlay will invoke it instead of onClose.
+         */
+        onClickOverlay: () => void;
+        /**
+         * Indicates whether clicking outside a modal without an overlay should
+         * close the modal. Useful if your modal isn't the focus of interaction, and
+         * you want hover effects to still work outside the modal.
+         */
+        clickOutsideToClose: boolean;
+        /**
+         * A boolean, when true renders the modal without wormholing or tethering,
+         * useful for including a modal in a style guide
+         */
+        renderInPlace: boolean;
+        /**
+         * either 'parent' or 'sibling', to control whether the overlay div is
+         * rendered as a parent element of the container div or as a sibling to it
+         * (default: 'parent')
+         */
+        overlayPosition: 'parent' | 'sibling';
+        /**
+         * CSS class name(s) to append to container divs. Set this from template.
+         */
+        containerClass: string;
+        /**
+         * CSS class names to append to container divs. This is a concatenated
+         * property, so it does not replace the default container class
+         * (default: 'ember-modal-dialog'. If you subclass this component, you may
+         * define this in your subclass.)
+         */
+        containerClassNames: string[];
+        /**
+         * CSS class name(s) to append to overlay divs. Set this from template.
+         */
+        overlayClass: string;
+        /**
+         * CSS class names to append to overlay divs. This is a concatenated
+         * property, so it does not replace the default overlay class
+         * (default: 'ember-modal-overlay'. If you subclass this component, you may
+         * define this in your subclass.)
+         */
+        overlayClassNames: string[];
+        /**
+         * CSS class name(s) to append to wrapper divs. Set this from template.
+         */
+        wrapperClass: string;
+        /**
+         * CSS class names to append to wrapper divs. This is a concatenated
+         * property, so it does not replace the default container class
+         * (default: 'ember-modal-wrapper'. If you subclass this component, you may
+         * define this in your subclass.)
+         */
+        wrapperClassNames: string[];
+        /**
+         * A boolean, when true makes modal animatable using liquid-fire
+         * (requires liquid-wormhole to be installed, and for tethering situations
+         * liquid-tether. Having these optional dependencies installed and NOT
+         * explicitly specifying animatable is deprecated in 2.x and is equivalent
+         * to animatable=false for backwards compatibility. As of 3.x, the implicit
+         * default will be animatable=true when the optional
+         * liquid-wormhole/liquid-tether dependency is present.
+         */
+        animatable: boolean;
+    }
+}
diff --git a/types/ember-modal-dialog/tsconfig.json b/types/ember-modal-dialog/tsconfig.json
new file mode 100644
index 0000000000..8834a9ae3d
--- /dev/null
+++ b/types/ember-modal-dialog/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ember-modal-dialog-tests.ts"
+    ]
+}
diff --git a/types/ember-modal-dialog/tslint.json b/types/ember-modal-dialog/tslint.json
new file mode 100644
index 0000000000..f55a9ded82
--- /dev/null
+++ b/types/ember-modal-dialog/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-single-declare-module": false,
+        "no-declare-current-package": false,
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/ember-qunit/ember-qunit-tests.ts b/types/ember-qunit/ember-qunit-tests.ts
new file mode 100644
index 0000000000..6ddb4e5454
--- /dev/null
+++ b/types/ember-qunit/ember-qunit-tests.ts
@@ -0,0 +1,139 @@
+import Ember from 'ember';
+import hbs from 'htmlbars-inline-precompile';
+import { module } from 'qunit';
+import {
+    test,
+    skip,
+    moduleFor,
+    moduleForModel,
+    moduleForComponent,
+    setResolver,
+    setupRenderingTest,
+    setupTest,
+} from 'ember-qunit';
+
+moduleForComponent('x-foo', {
+    integration: true
+});
+
+moduleForComponent('x-foo', {
+    unit: true,
+    needs: ['helper:pluralize-string']
+});
+
+moduleForModel('user', {
+    needs: ['model:child']
+});
+
+moduleFor('controller:home');
+
+moduleFor('component:x-foo', 'Some description');
+
+moduleFor('component:x-foo', 'TestModule callbacks', {
+    beforeSetup() {
+    },
+
+    beforeEach(assert) {
+        this.registry.register('helper:i18n', {});
+        this.register('service:i18n', {});
+        this.inject.service('i18n');
+        this.inject.service('i18n', { as: 'i18n' });
+        this.factory('object:user').create();
+        assert.ok(true);
+    },
+
+    afterEach(assert) {
+        assert.ok(true);
+    },
+
+    afterTeardown(assert) {
+        assert.ok(true);
+    }
+});
+
+// if you don't have a custom resolver, do it like this:
+setResolver(Ember.DefaultResolver.create());
+
+test('it renders', function(assert) {
+    assert.expect(2);
+
+    // setup the outer context
+    this.set('value', 'cat');
+    this.on('action', function(result) {
+        assert.equal(result, 'bar', 'The correct result was returned');
+        assert.equal(this.get('value'), 'cat');
+    });
+
+    // render the component
+    this.render(hbs`
+        {{ x-foo value=value action="result" }}
+    `);
+    this.render('{{ x-foo value=value action="result" }}');
+    this.render([
+        '{{ x-foo value=value action="result" }}'
+    ]);
+
+    assert.equal(this.$('div>.value').text(), 'cat', 'The component shows the correct value');
+
+    this.$('button').click();
+});
+
+test('it renders', function(assert) {
+    assert.expect(1);
+
+    // creates the component instance
+    const subject = this.subject();
+
+    const subject2 = this.subject({
+        item: 42
+    });
+
+    const { inputFormat } = this.setProperties({
+        inputFormat: 'M/D/YY',
+        outputFormat: 'MMMM D, YYYY',
+        date: '5/3/10'
+    });
+
+    const { inputFormat: if2, outputFormat } = this.getProperties('inputFormat', 'outputFormat');
+
+    const inputFormat2 = this.get('inputFormat');
+
+    // render the component on the page
+    this.render();
+    assert.equal(this.$('.foo').text(), 'bar');
+});
+
+test('It can calculate the result', function(assert) {
+    assert.expect(1);
+
+    const subject = this.subject();
+
+    subject.set('value', 'foo');
+    assert.equal(subject.get('result'), 'bar');
+});
+
+skip('disabled test');
+
+skip('disabled test', function(assert) { });
+
+// https://github.com/emberjs/rfcs/blob/master/text/0232-simplify-qunit-testing-api.md#qunit-nested-modules-api
+QUnit.module('some description', function(hooks) {
+  hooks.before(() => {});
+  hooks.beforeEach(() => {});
+  hooks.afterEach(() => {});
+  hooks.after(() => {});
+
+  QUnit.test('it blends', function(assert) {
+    assert.ok(true, 'of course!');
+  });
+});
+
+// http://rwjblue.com/2017/10/23/ember-qunit-simplication/#setuprenderingtest
+module('x-foo', function(hooks) {
+    setupRenderingTest(hooks);
+});
+
+// http://rwjblue.com/2017/10/23/ember-qunit-simplication/#setuptest
+module('foo service', function(hooks) {
+    setupTest(hooks);
+});
diff --git a/types/ember-qunit/index.d.ts b/types/ember-qunit/index.d.ts
new file mode 100644
index 0000000000..a669b977e1
--- /dev/null
+++ b/types/ember-qunit/index.d.ts
@@ -0,0 +1,155 @@
+// Type definitions for ember-qunit 3.0
+// Project: https://github.com/emberjs/ember-qunit#readme
+// Definitions by: Derek Wickern <https://github.com/dwickern>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="qunit" />
+
+declare module 'ember-qunit' {
+    import Ember from 'ember';
+    import { ModuleCallbacks } from "ember-test-helpers";
+
+    interface QUnitModuleCallbacks extends ModuleCallbacks, Hooks {
+        beforeSetup?(assert: Assert): void;
+        setup?(assert: Assert): void;
+        teardown?(assert: Assert): void;
+        afterTeardown?(assert: Assert): void;
+        needs?: string[];
+    }
+
+    /**
+     * @param fullName The full name of the unit, ie controller:application, route:index.
+     * @param description The description of the module
+     */
+    export function moduleFor(fullName: string, description: string, callbacks?: QUnitModuleCallbacks): void;
+    export function moduleFor(fullName: string, callbacks?: QUnitModuleCallbacks): void;
+
+    /**
+     * @param fullName the short name of the component that you'd use in a template, ie x-foo, ic-tabs, etc.
+     * @param description The description of the module
+     */
+    export function moduleForComponent(fullName: string, description: string, callbacks?: QUnitModuleCallbacks): void;
+    export function moduleForComponent(fullName: string, callbacks?: QUnitModuleCallbacks): void;
+
+    /**
+     * @param fullName the short name of the model you'd use in store operations ie user, assignmentGroup, etc.
+     * @param description The description of the module
+     */
+    export function moduleForModel(fullName: string, description: string, callbacks?: QUnitModuleCallbacks): void;
+    export function moduleForModel(fullName: string, callbacks?: QUnitModuleCallbacks): void;
+
+    /**
+     * Sets a Resolver globally which will be used to look up objects from each test's container.
+     */
+    export function setResolver(resolver: Ember.Resolver): void;
+
+    /**
+     * Sets up tests that need to render snippets of templates.
+     *
+     * The setupRenderingTest method is used for tests that need to render
+     * snippets of templates. It is also invoked in the callback scope of a
+     * QUnit module (aka "nested module").
+     *
+     * Once invoked, all subsequent hooks.beforeEach and test invocations will
+     * have access to the following:
+     * * All of the methods / properties listed for `setupTest`
+     * * this.render(...) - Renders the provided template snippet returning a
+     * promise that resolves once rendering has completed
+     * * An importable render function that de-sugars into this.render will be
+     * the default output of blueprints
+     * * this.element - Returns the native DOM element representing the element
+     * that was rendered via this.render
+     * * this.$(...) - When jQuery is present, executes a jQuery selector with
+     * the current this.element as its root
+     */
+    export function setupRenderingTest(hooks: NestedHooks): void;
+
+    /**
+     * Sets up tests that do not need to render snippets of templates.
+     *
+     * The `setupTest` method is used for all types of tests except for those
+     * that need to render snippets of templates. It is invoked in the callback
+     * scope of a QUnit module (aka "nested module").
+     *
+     * Once invoked, all subsequent hooks.beforeEach and test invocations will
+     * have access to the following:
+     * * this.owner - This exposes the standard "owner API" for the test environment.
+     * * this.set / this.setProperties - Allows setting values on the test context.
+     * * this.get / this.getProperties - Retrieves values from the test context.
+     */
+    export function setupTest(hooks: NestedHooks): void;
+
+    export class QUnitAdapter extends Ember.Test.Adapter {}
+
+    export { module, test, skip, only, todo } from 'qunit';
+}
+
+declare module 'qunit' {
+    import { TestContext } from "ember-test-helpers";
+
+    export const module: typeof QUnit.module;
+
+    /**
+     * Add a test to run.
+     *
+     * Add a test to run using `QUnit.test()`.
+     *
+     * The `assert` argument to the callback contains all of QUnit's assertion
+     * methods. Use this argument to call your test assertions.
+     *
+     * `QUnit.test()` can automatically handle the asynchronous resolution of a
+     * Promise on your behalf if you return a thenable Promise as the result of
+     * your callback function.
+     *
+     * @param name Title of unit being tested
+     * @param callback Function to close over assertions
+     */
+    export function test(name: string, callback: (this: TestContext, assert: Assert) => void): void;
+
+    /**
+     * Adds a test to exclusively run, preventing all other tests from running.
+     *
+     * Use this method to focus your test suite on a specific test. QUnit.only
+     * will cause any other tests in your suite to be ignored.
+     *
+     * Note, that if more than one QUnit.only is present only the first instance
+     * will run.
+     *
+     * This is an alternative to filtering tests to run in the HTML reporter. It
+     * is especially useful when you use a console reporter or in a codebase
+     * with a large set of long running tests.
+     *
+     * @param name Title of unit being tested
+     * @param callback Function to close over assertions
+     */
+    export function only(name: string, callback: (this: TestContext, assert: Assert) => void): void;
+
+    /**
+     * Use this method to test a unit of code which is still under development (in a “todo� state).
+     * The test will pass as long as one failing assertion is present.
+     *
+     * If all assertions pass, then the test will fail signaling that `QUnit.todo` should
+     * be replaced by `QUnit.test`.
+     *
+     * @param name Title of unit being tested
+     * @param callback Function to close over assertions
+     */
+    export function todo(name: string, callback: (this: TestContext, assert: Assert) => void): void;
+
+    /**
+     * Adds a test like object to be skipped.
+     *
+     * Use this method to replace QUnit.test() instead of commenting out entire
+     * tests.
+     *
+     * This test's prototype will be listed on the suite as a skipped test,
+     * ignoring the callback argument and the respective global and module's
+     * hooks.
+     *
+     * @param Title of unit being tested
+     */
+    export const skip: typeof QUnit.skip;
+
+    export default QUnit;
+}
diff --git a/types/ember-qunit/tsconfig.json b/types/ember-qunit/tsconfig.json
new file mode 100644
index 0000000000..1f9e626103
--- /dev/null
+++ b/types/ember-qunit/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ember-qunit-tests.ts"
+    ]
+}
diff --git a/types/ember-qunit/tslint.json b/types/ember-qunit/tslint.json
new file mode 100644
index 0000000000..5070b08af9
--- /dev/null
+++ b/types/ember-qunit/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "only-arrow-functions": false,
+        "strict-export-declare-modifiers": false,
+        "no-duplicate-imports": false,
+        "no-declare-current-package": false
+    }
+}
diff --git a/types/ember-qunit/v2/ember-qunit-tests.ts b/types/ember-qunit/v2/ember-qunit-tests.ts
new file mode 100644
index 0000000000..de22ab3d94
--- /dev/null
+++ b/types/ember-qunit/v2/ember-qunit-tests.ts
@@ -0,0 +1,107 @@
+import Ember from 'ember';
+import hbs from 'htmlbars-inline-precompile';
+import { test, skip, moduleFor, moduleForModel, moduleForComponent, setResolver } from 'ember-qunit';
+
+moduleForComponent('x-foo', {
+    integration: true
+});
+
+moduleForComponent('x-foo', {
+    unit: true,
+    needs: ['helper:pluralize-string']
+});
+
+moduleForModel('user', {
+    needs: ['model:child']
+});
+
+moduleFor('controller:home');
+
+moduleFor('component:x-foo', 'Some description');
+
+moduleFor('component:x-foo', 'TestModule callbacks', {
+    beforeSetup() {
+    },
+
+    beforeEach(assert) {
+        this.registry.register('helper:i18n', {});
+        this.register('service:i18n', {});
+        this.inject.service('i18n');
+        this.inject.service('i18n', { as: 'i18n' });
+        this.factory('object:user').create();
+        assert.ok(true);
+    },
+
+    afterEach(assert) {
+        assert.ok(true);
+    },
+
+    afterTeardown(assert) {
+        assert.ok(true);
+    }
+});
+
+// if you don't have a custom resolver, do it like this:
+setResolver(Ember.DefaultResolver.create());
+
+test('it renders', function(assert) {
+    assert.expect(2);
+
+    // setup the outer context
+    this.set('value', 'cat');
+    this.on('action', function(result) {
+        assert.equal(result, 'bar', 'The correct result was returned');
+        assert.equal(this.get('value'), 'cat');
+    });
+
+    // render the component
+    this.render(hbs`
+        {{ x-foo value=value action="result" }}
+    `);
+    this.render('{{ x-foo value=value action="result" }}');
+    this.render([
+        '{{ x-foo value=value action="result" }}'
+    ]);
+
+    assert.equal(this.$('div>.value').text(), 'cat', 'The component shows the correct value');
+
+    this.$('button').click();
+});
+
+test('it renders', function(assert) {
+    assert.expect(1);
+
+    // creates the component instance
+    const subject = this.subject();
+
+    const subject2 = this.subject({
+        item: 42
+    });
+
+    const { inputFormat } = this.setProperties({
+        inputFormat: 'M/D/YY',
+        outputFormat: 'MMMM D, YYYY',
+        date: '5/3/10'
+    });
+
+    const { inputFormat: if2, outputFormat } = this.getProperties('inputFormat', 'outputFormat');
+
+    const inputFormat2 = this.get('inputFormat');
+
+    // render the component on the page
+    this.render();
+    assert.equal(this.$('.foo').text(), 'bar');
+});
+
+test('It can calculate the result', function(assert) {
+    assert.expect(1);
+
+    const subject = this.subject();
+
+    subject.set('value', 'foo');
+    assert.equal(subject.get('result'), 'bar');
+});
+
+skip('disabled test');
+
+skip('disabled test', function(assert) { });
diff --git a/types/ember-qunit/v2/index.d.ts b/types/ember-qunit/v2/index.d.ts
new file mode 100644
index 0000000000..0edc5c837f
--- /dev/null
+++ b/types/ember-qunit/v2/index.d.ts
@@ -0,0 +1,118 @@
+// Type definitions for ember-qunit 2.2
+// Project: https://github.com/emberjs/ember-qunit#readme
+// Definitions by: Derek Wickern <https://github.com/dwickern>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="qunit" />
+
+declare module 'ember-qunit' {
+    import Ember from 'ember';
+    import { ModuleCallbacks } from "ember-test-helpers";
+
+    interface QUnitModuleCallbacks extends ModuleCallbacks, Hooks {
+        beforeSetup?(assert: Assert): void;
+        setup?(assert: Assert): void;
+        teardown?(assert: Assert): void;
+        afterTeardown?(assert: Assert): void;
+    }
+
+    /**
+     * @param fullName The full name of the unit, ie controller:application, route:index.
+     * @param description The description of the module
+     */
+    export function moduleFor(fullName: string, description: string, callbacks?: QUnitModuleCallbacks): void;
+    export function moduleFor(fullName: string, callbacks?: QUnitModuleCallbacks): void;
+
+    /**
+     * @param fullName the short name of the component that you'd use in a template, ie x-foo, ic-tabs, etc.
+     * @param description The description of the module
+     */
+    export function moduleForComponent(fullName: string, description: string, callbacks?: QUnitModuleCallbacks): void;
+    export function moduleForComponent(fullName: string, callbacks?: QUnitModuleCallbacks): void;
+
+    /**
+     * @param fullName the short name of the model you'd use in store operations ie user, assignmentGroup, etc.
+     * @param description The description of the module
+     */
+    export function moduleForModel(fullName: string, description: string, callbacks?: QUnitModuleCallbacks): void;
+    export function moduleForModel(fullName: string, callbacks?: QUnitModuleCallbacks): void;
+
+    /**
+     * Sets a Resolver globally which will be used to look up objects from each test's container.
+     */
+    export function setResolver(resolver: Ember.Resolver): void;
+
+    export class QUnitAdapter extends Ember.Test.Adapter {}
+
+    export { module, test, skip, only, todo } from 'qunit';
+}
+
+declare module 'qunit' {
+    import { TestContext } from "ember-test-helpers";
+
+    export const module: typeof QUnit.module;
+
+    /**
+     * Add a test to run.
+     *
+     * Add a test to run using `QUnit.test()`.
+     *
+     * The `assert` argument to the callback contains all of QUnit's assertion
+     * methods. Use this argument to call your test assertions.
+     *
+     * `QUnit.test()` can automatically handle the asynchronous resolution of a
+     * Promise on your behalf if you return a thenable Promise as the result of
+     * your callback function.
+     *
+     * @param name Title of unit being tested
+     * @param callback Function to close over assertions
+     */
+    export function test(name: string, callback: (this: TestContext, assert: Assert) => void): void;
+
+    /**
+     * Adds a test to exclusively run, preventing all other tests from running.
+     *
+     * Use this method to focus your test suite on a specific test. QUnit.only
+     * will cause any other tests in your suite to be ignored.
+     *
+     * Note, that if more than one QUnit.only is present only the first instance
+     * will run.
+     *
+     * This is an alternative to filtering tests to run in the HTML reporter. It
+     * is especially useful when you use a console reporter or in a codebase
+     * with a large set of long running tests.
+     *
+     * @param name Title of unit being tested
+     * @param callback Function to close over assertions
+     */
+    export function only(name: string, callback: (this: TestContext, assert: Assert) => void): void;
+
+    /**
+     * Use this method to test a unit of code which is still under development (in a “todo� state).
+     * The test will pass as long as one failing assertion is present.
+     *
+     * If all assertions pass, then the test will fail signaling that `QUnit.todo` should
+     * be replaced by `QUnit.test`.
+     *
+     * @param name Title of unit being tested
+     * @param callback Function to close over assertions
+     */
+    export function todo(name: string, callback: (this: TestContext, assert: Assert) => void): void;
+
+    /**
+     * Adds a test like object to be skipped.
+     *
+     * Use this method to replace QUnit.test() instead of commenting out entire
+     * tests.
+     *
+     * This test's prototype will be listed on the suite as a skipped test,
+     * ignoring the callback argument and the respective global and module's
+     * hooks.
+     *
+     * @param Title of unit being tested
+     */
+    export const skip: typeof QUnit.skip;
+
+    export default QUnit;
+}
diff --git a/types/ember-qunit/v2/tsconfig.json b/types/ember-qunit/v2/tsconfig.json
new file mode 100644
index 0000000000..e173bc0d73
--- /dev/null
+++ b/types/ember-qunit/v2/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../../",
+        "typeRoots": ["../../"],
+        "paths": {
+            "ember-qunit": ["ember-qunit/v2"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ember-qunit-tests.ts"
+    ]
+}
diff --git a/types/ember-qunit/v2/tslint.json b/types/ember-qunit/v2/tslint.json
new file mode 100644
index 0000000000..5070b08af9
--- /dev/null
+++ b/types/ember-qunit/v2/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "only-arrow-functions": false,
+        "strict-export-declare-modifiers": false,
+        "no-duplicate-imports": false,
+        "no-declare-current-package": false
+    }
+}
diff --git a/types/ember-test-helpers/ember-test-helpers-tests.ts b/types/ember-test-helpers/ember-test-helpers-tests.ts
new file mode 100644
index 0000000000..705d0c76b1
--- /dev/null
+++ b/types/ember-test-helpers/ember-test-helpers-tests.ts
@@ -0,0 +1,53 @@
+/// <reference types="qunit" />
+import { ModuleCallbacks, TestContext, TestModule } from "ember-test-helpers";
+import wait from 'ember-test-helpers/wait';
+import hasEmberVersion from 'ember-test-helpers/has-ember-version';
+
+import hbs from 'htmlbars-inline-precompile';
+
+function moduleFor(name: string, description: string, callbacks: ModuleCallbacks) {
+    const module = new TestModule(name, description, callbacks);
+
+    QUnit.module(module.name, {
+        beforeEach() {
+            module.setup();
+        },
+        afterEach() {
+            module.teardown();
+        }
+    });
+}
+
+async function testWait() {
+    await wait();
+}
+
+if (hasEmberVersion(2, 10)) {
+    // ...
+}
+
+// https://github.com/emberjs/ember-test-helpers/blob/f07e86914f2a3823c4cb6787307f9ba2bf447e68/tests/unit/setup-context-test.js
+QUnit.test('it sets up this.owner', function(this: TestContext, assert: Assert) {
+    const { owner } = this;
+    assert.ok(owner, 'owner was setup');
+    assert.equal(typeof owner.lookup, 'function', 'has expected lookup interface');
+
+    if (hasEmberVersion(2, 12)) {
+      assert.equal(typeof owner.factoryFor, 'function', 'has expected factory interface');
+    }
+});
+
+QUnit.test('can pauseTest to be resumed "later"', async function(this: TestContext, assert: Assert) {
+    const promise = this.pauseTest();
+
+    this.resumeTest();
+
+    await promise;
+});
+
+// https://github.com/emberjs/ember-test-helpers/blob/fb4c8d4cd36b54728ce180227f865b1fa0162632/tests/unit/setup-rendering-context-test.js
+QUnit.test('render exposes an `.element` property', async function(this: TestContext, assert: Assert) {
+    await this.render(hbs`<p>Hello!</p>`);
+
+    assert.equal(this.element.textContent, 'Hello!');
+});
diff --git a/types/ember-test-helpers/index.d.ts b/types/ember-test-helpers/index.d.ts
new file mode 100644
index 0000000000..f098c49a84
--- /dev/null
+++ b/types/ember-test-helpers/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for ember-test-helpers 0.7
+// Project: https://github.com/emberjs/ember-test-helpers#readme
+// Definitions by: Derek Wickern <https://github.com/dwickern>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="jquery" />
+
+declare module 'ember-test-helpers' {
+    import Ember from 'ember';
+    import DS from 'ember-data';
+    import { TemplateFactory } from 'htmlbars-inline-precompile';
+    import RSVP from "rsvp";
+
+    interface ModuleCallbacks {
+        integration?: boolean;
+        unit?: boolean;
+        needs?: string[];
+
+        beforeSetup?(assert?: any): void;
+        setup?(assert?: any): void;
+        teardown?(assert?: any): void;
+        afterTeardown?(assert?: any): void;
+
+        [key: string]: any;
+    }
+
+    interface TestContext {
+        get(key: string): any;
+        getProperties<K extends string>(...keys: K[]): Pick<any, K>;
+        set<V>(key: string, value: V): V;
+        setProperties<P extends { [key: string]: any }>(hash: P): P;
+        on(actionName: string, handler: (this: TestContext, ...args: any[]) => any): void;
+        send(actionName: string): void;
+        $: JQueryStatic;
+        subject(options?: {}): any;
+        render(template?: string | string[] | TemplateFactory): Promise<void>;
+        clearRender(): void;
+        registry: Ember.Registry;
+        container: Ember.Container;
+        dispatcher: Ember.EventDispatcher;
+        application: Ember.Application;
+        store: DS.Store;
+        register(fullName: string, factory: any): void;
+        factory(fullName: string): any;
+        inject: {
+            controller(name: string, options?: { as: string }): any;
+            service(name: string, options?: { as: string }): any;
+        };
+        owner: Ember.ApplicationInstance & {
+            factoryFor(fullName: string, options?: {}): any;
+        };
+        pauseTest(): Promise<void>;
+        resumeTest(): void;
+        element: Element;
+    }
+
+    class TestModule {
+        constructor(name: string, callbacks?: ModuleCallbacks);
+        constructor(name: string, description?: string, callbacks?: ModuleCallbacks);
+
+        name: string;
+        subjectName: string;
+        description: string;
+        isIntegration: boolean;
+        callbacks: ModuleCallbacks;
+        context: TestContext;
+        resolver: Ember.Resolver;
+
+        setup(assert?: any): RSVP.Promise<void>;
+        teardown(assert?: any): RSVP.Promise<void>;
+        getContext(): TestContext;
+        setContext(context: TestContext): void;
+    }
+
+    class TestModuleForAcceptance extends TestModule {}
+    class TestModuleForIntegration extends TestModule {}
+    class TestModuleForComponent extends TestModule {}
+    class TestModuleForModel extends TestModule {}
+
+    function getContext(): TestContext | undefined;
+    function setContext(context: TestContext): void;
+    function unsetContext(): void;
+    function setResolver(resolver: Ember.Resolver): void;
+}
+
+declare module 'ember-test-helpers/wait' {
+    import RSVP from "rsvp";
+
+    interface WaitOptions {
+        waitForTimers?: boolean;
+        waitForAJAX?: boolean;
+        waitForWaiters?: boolean;
+    }
+
+    export default function wait(options?: WaitOptions): RSVP.Promise<void>;
+}
+
+declare module 'ember-test-helpers/has-ember-version' {
+    export default function hasEmberVersion(major: number, minor: number): boolean;
+}
diff --git a/types/ember-test-helpers/tsconfig.json b/types/ember-test-helpers/tsconfig.json
new file mode 100644
index 0000000000..dc9c583d1c
--- /dev/null
+++ b/types/ember-test-helpers/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ember-test-helpers-tests.ts"
+    ]
+}
diff --git a/types/ember-test-helpers/tslint.json b/types/ember-test-helpers/tslint.json
new file mode 100644
index 0000000000..659431c9ea
--- /dev/null
+++ b/types/ember-test-helpers/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false,
+        "no-duplicate-imports": false,
+        "no-declare-current-package": false
+    }
+}
diff --git a/types/ember-testing-helpers/ember-testing-helpers-tests.ts b/types/ember-testing-helpers/ember-testing-helpers-tests.ts
index 3691e3ede0..01ee44b338 100644
--- a/types/ember-testing-helpers/ember-testing-helpers-tests.ts
+++ b/types/ember-testing-helpers/ember-testing-helpers-tests.ts
@@ -1,12 +1,12 @@
-import RSVP = require('rsvp');
+import RSVP from 'rsvp';
 
 function testAndThen() {
-    const result: RSVP.Promise<string, never> = andThen(() => 'some string');
+    const result: RSVP.Promise<string> = andThen(() => 'some string');
     result.then(s => s.length);
 }
 
 function testClick() {
-    const result: RSVP.Promise<void, never> = click('someString');
+    const result: RSVP.Promise<void> = click('someString');
     result.then(() => {});
 }
 
@@ -29,7 +29,7 @@ function testFillIn() {
     const textResult = fillIn('.foo', 'waffles');
     textResult.then(() => true);
     const contextResult = fillIn('.bar', {}, 'pancakes');
-    contextResult.catch(reason => false);
+    contextResult.catch((reason: any) => false);
 }
 
 function testFind() {
diff --git a/types/ember-testing-helpers/index.d.ts b/types/ember-testing-helpers/index.d.ts
index 33231a0b65..8bbbcc09f7 100644
--- a/types/ember-testing-helpers/index.d.ts
+++ b/types/ember-testing-helpers/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for ember-testing/lib/helpers
 // Project: https://github.com/emberjs/ember.js/tree/master/packages/ember-testing/lib/helpers
-// Definitions by: Chris Krycho <github.com/chriskrycho>
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 // Note that these are distributed separately because they represent a discrete
 // set of functionality, and as globally-injected items (as of Ember 2.13), are
@@ -10,14 +10,14 @@
 
 /// <reference types="jquery" />
 
-import RSVP = require('rsvp');
+import RSVP from 'rsvp';
 
 type KeyEventType = 'keydown' | 'keyup' | 'keypress';
-type WaitResult<T> = RSVP.Promise<T, never>;
+type WaitResult<T> = RSVP.Promise<T>;
 
 declare global {
     // https://github.com/emberjs/ember.js/blob/master/packages/ember-testing/lib/helpers/and_then.js
-    function andThen<T>(callback: (...args: any[]) => T): RSVP.Promise<T, never>;
+    function andThen<T>(callback: (...args: any[]) => T): RSVP.Promise<T>;
 
     // https://github.com/emberjs/ember.js/blob/master/packages/ember-testing/lib/helpers/click.js
     function click(selector: string, context?: Object): WaitResult<void>;
@@ -45,7 +45,7 @@ declare global {
     function keyEvent(selector: string, type: KeyEventType, keyCode: number): WaitResult<void>;
 
     // https://github.com/emberjs/ember.js/blob/master/packages/ember-testing/lib/helpers/pause_test.js
-    function pauseTest(): RSVP.Promise<{}, never>;
+    function pauseTest(): RSVP.Promise<{}>;
     function resumeTest(): void;
 
     // https://github.com/emberjs/ember.js/blob/master/packages/ember-testing/lib/helpers/trigger_event.js
diff --git a/types/ember-testing-helpers/tsconfig.json b/types/ember-testing-helpers/tsconfig.json
index 725957a948..622d4d1584 100644
--- a/types/ember-testing-helpers/tsconfig.json
+++ b/types/ember-testing-helpers/tsconfig.json
@@ -10,9 +10,7 @@
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/ember-testing-helpers/tslint.json b/types/ember-testing-helpers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ember-testing-helpers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ember/ember-tests.ts b/types/ember/ember-tests.ts
deleted file mode 100644
index 3964d68a86..0000000000
--- a/types/ember/ember-tests.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-import Ember from 'ember';
-
-let App: any;
-
-App = Ember.Application.create<Ember.Application>();
-
-App.president = Ember.Object.create({
-    name: 'Barack Obama',
-});
-App.country = Ember.Object.create({
-    presidentNameBinding: 'MyApp.president.name',
-});
-App.country.get('presidentName');
-App.president = Ember.Object.create({
-    firstName: 'Barack',
-    lastName: 'Obama',
-    fullName: Ember.computed(function() {
-        return `${this.get('firstName')} ${this.get('lastName')}`;
-    }),
-});
-App.president.get('fullName');
-
-declare class MyPerson extends Ember.Object {
-    static createMan(): MyPerson;
-}
-
-const Person1 = Ember.Object.extend<typeof MyPerson>({
-    say: (thing: string) => {
-        alert(thing);
-    },
-});
-
-declare class MyPerson2 extends Ember.Object {
-    helloWorld(): void;
-}
-const tom = Person1.create<MyPerson2>({
-    name: 'Tom Dale',
-    helloWorld() {
-        this.say('Hi my name is ' + this.get('name'));
-    },
-});
-tom.helloWorld();
-
-Person1.reopen({ isPerson: true });
-Person1.create<Ember.Object>().get('isPerson');
-
-Person1.reopenClass({
-    createMan: () => {
-        return Person1.create({ isMan: true });
-    },
-});
-// ReSharper disable once DuplicatingLocalDeclaration
-Person1.createMan().get('isMan');
-
-const person = Person1.create<Ember.Object>({
-    firstName: 'Yehuda',
-    lastName: 'Katz',
-});
-person.addObserver('fullName', null, () => {});
-person.set('firstName', 'Brohuda');
-
-App.todosController = Ember.Object.create({
-    todos: [Ember.Object.create({ isDone: false })],
-    remaining: Ember.computed('todos.@each.isDone', function() {
-        const todos = this.get('todos');
-        return todos.filterProperty('isDone', false).get('length');
-    }),
-});
-
-const todos = App.todosController.get('todos');
-let todo = todos.objectAt(0);
-todo.set('isDone', true);
-App.todosController.get('remaining');
-todo = Ember.Object.create({ isDone: false });
-todos.pushObject(todo);
-App.todosController.get('remaining');
-
-App.wife = Ember.Object.create({
-    householdIncome: 80000,
-});
-App.husband = Ember.Object.create({
-    householdIncomeBinding: 'App.wife.householdIncome',
-});
-App.husband.get('householdIncome');
-App.husband.set('householdIncome', 90000);
-App.wife.get('householdIncome');
-
-App.user = Ember.Object.create({
-    fullName: 'Kara Gates',
-});
-App.user.set('fullName', 'Krang Gates');
-App.userView.set('userName', 'Truckasaurus Gates');
-App.user.get('fullName');
-
-App = Ember.Application.create({
-    rootElement: '#sidebar',
-});
-
-App.userController = Ember.Object.create({
-    content: Ember.Object.create({
-        firstName: 'Albert',
-        lastName: 'Hofmann',
-        posts: 25,
-        hobbies: 'Riding bicycles',
-    }),
-});
-
-Ember.Helper.helper(params => {
-    const cents = params[0];
-    return `${cents * 0.01}`;
-});
-
-Ember.Helper.helper((params, hash) => {
-    const cents = params[0];
-    const currency = hash.currency;
-    return `${currency}${cents * 0.01}`;
-});
-
-Handlebars.registerHelper(
-    'highlight',
-    (property: string, options: any) =>
-        new Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
-);
-
-const coolView = App.CoolView.create();
-
-const Person2 = Ember.Object.extend<typeof Ember.Object>({
-    sayHello() {
-        console.log('Hello from ' + this.get('name'));
-    },
-});
-const people = Ember.A([
-    Person2.create({ name: 'Juan' }),
-    Person2.create({ name: 'Charles' }),
-    Person2.create({ name: 'Majd' }),
-]);
-people.invoke('sayHello');
-
-const arr = Ember.A([Ember.Object.create(), Ember.Object.create()]);
-arr.setEach('name', 'unknown');
-arr.getEach('name');
-
-const Person3 = Ember.Object.extend<typeof Ember.Object>({
-    name: null,
-    isHappy: false,
-});
-const people2 = Ember.A([
-    Person3.create({ name: 'Yehuda', isHappy: true }),
-    Person3.create({ name: 'Majd', isHappy: false }),
-]);
-const isHappy = (person: Ember.Object): Boolean => {
-    return !!person.get('isHappy');
-};
-people2.every(isHappy);
-people2.any(isHappy);
-people2.everyProperty('isHappy', true);
-people2.someProperty('isHappy', true);
-
-// Examples taken from http://emberjs.com/api/classes/Em.RSVP.Promise.html
-const promise = new Ember.RSVP.Promise<string, string>((resolve: Function, reject: Function) => {
-    // on success
-    resolve('ok!');
-
-    // on failure
-    reject('no-k!');
-});
-
-promise.then(
-    (value: any) => {
-        // on fulfillment
-    },
-    (reason: any) => {
-        // on rejection
-    }
-);
-
-const mix1 = Ember.Mixin.create({
-    foo: 1,
-});
-
-const mix2 = Ember.Mixin.create({
-    bar: 2,
-});
-
-const mix3 = Ember.Mixin.create({
-    foo: 3,
-});
-
-const mix4 = Ember.Mixin.create({
-    bar: 4,
-});
-
-const mix5 = Ember.Mixin.create({
-    foo: 5,
-});
-
-const mix6 = Ember.Mixin.create({
-    bar: 6,
-});
-
-const mix7 = Ember.Mixin.create({
-    foo: 7,
-});
-
-const component1 = Ember.Component.extend(mix1, mix2, mix3, mix4, mix5, mix6, mix7, {
-    lyft: Ember.inject.service(),
-    cars: Ember.computed.readOnly('lyft.cars'),
-});
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
old mode 100644
new mode 100755
index 91f0e2a02c..238e895e34
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1,2555 +1,3671 @@
-// Type definitions for Ember.js 2.7
+// Type definitions for Ember.js 2.8
 // Project: http://emberjs.com/
 // Definitions by: Jed Mao <https://github.com/jedmao>
 //                 bttf <https://github.com/bttf>
+//                 Derek Wickern <https://github.com/dwickern>
+//                 Chris Krycho <https://github.com/chriskrycho>
+//                 Theron Cross <https://github.com/theroncross>
+//                 Martin Feckie <https://github.com/mfeckie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 /// <reference types="jquery" />
 /// <reference types="handlebars" />
 
-// Capitalization is intentional: this makes it much easier to re-export RSVP on
-// the Ember namespace.
-import Rsvp = require('rsvp');
+declare module 'ember' {
+    // Capitalization is intentional: this makes it much easier to re-export RSVP on
+    // the Ember namespace.
+    import Rsvp from 'rsvp';
+    import { TemplateFactory } from 'htmlbars-inline-precompile';
 
-declare namespace EmberStates {
-    interface Transition {
-        targetName: string;
-        urlMethod: string;
-        intent: any;
-        params: {} | any;
-        pivotHandler: any;
-        resolveIndex: number;
-        handlerInfos: any;
-        resolvedModels: {} | any;
-        isActive: boolean;
-        state: any;
-        queryParams: {} | any;
-        queryParamsOnly: boolean;
+    // Get an alias to the global Array type to use in inner scope below.
+    type GlobalArray<T> = T[];
 
-        isTransition: boolean;
+    /**
+     * Deconstructs computed properties into the types which would be returned by `.get()`.
+     */
+    type ComputedProperties<T> = { [K in keyof T]: Ember.ComputedProperty<T[K]> | T[K] };
 
-        /**
-          The Transition's internal promise. Calling `.then` on this property
-          is that same as calling `.then` on the Transition object itself, but
-          this property is exposed for when you want to pass around a
-          Transition's promise, but not the Transition object itself, since
-          Transition object can be externally `abort`ed, while the promise
-          cannot.
-         */
-        promise: Rsvp.Promise<any, any>;
+    /**
+     * Check that any arguments to `create()` match the type's properties.
+     *
+     * Accept any additional properties and add merge them into the instance.
+     */
+    type EmberInstanceArguments<T> = Partial<T> & {
+        [key: string]: any;
+    };
 
-        /**
-          Custom state can be stored on a Transition's `data` object.
-          This can be useful for decorating a Transition within an earlier
-          hook and shared with a later hook. Properties set on `data` will
-          be copied to new transitions generated by calling `retry` on this
-          transition.
-         */
-        data: any;
-
-        /**
-          A standard promise hook that resolves if the transition
-          succeeds and rejects if it fails/redirects/aborts.
-
-          Forwards to the internal `promise` property which you can
-          use in situations where you want to pass around a thennable,
-          but not the Transition itself.
-
-          @arg {Function} onFulfilled
-          @arg {Function} onRejected
-          @arg {String} label optional string for labeling the promise. Useful for tooling.
-          @return {Promise}
-         */
-        then(onFulfilled: Function, onRejected?: Function, label?: string): Rsvp.Promise<any, any>;
-
-        /**
-          Forwards to the internal `promise` property which you can
-          use in situations where you want to pass around a thennable,
-          but not the Transition itself.
-
-          @method catch
-          @arg {Function} onRejection
-          @arg {String} label optional string for labeling the promise.
-          Useful for tooling.
-          @return {Promise}
-         */
-        catch(onRejection: Function, label?: string): Rsvp.Promise<any, any>;
-
-        /**
-          Forwards to the internal `promise` property which you can
-          use in situations where you want to pass around a thennable,
-          but not the Transition itself.
-
-          @method finally
-          @arg {Function} callback
-          @arg {String} label optional string for labeling the promise.
-          Useful for tooling.
-          @return {Promise}
-         */
-        finally(callback: Function, label?: string): Rsvp.Promise<any, any>;
-
-        /**
-         Aborts the Transition. Note you can also implicitly abort a transition
-         by initiating another transition while a previous one is underway.
-        */
-        abort(): EmberStates.Transition;
-        normalize(manager: Ember.StateManager, contexts: any[]): void;
-
-        /**
-         Retries a previously-aborted transition (making sure to abort the
-         transition if it's still active). Returns a new transition that
-         represents the new attempt to transition.
-        */
-        retry(): EmberStates.Transition;
-
-        /**
-          Sets the URL-changing method to be employed at the end of a
-          successful transition. By default, a new Transition will just
-          use `updateURL`, but passing 'replace' to this method will
-          cause the URL to update using 'replaceWith' instead. Omitting
-          a parameter will disable the URL change, allowing for transitions
-          that don't update the URL at completion (this is also used for
-          handleURL, since the URL has already changed before the
-          transition took place).
-
-          @arg {String} method the type of URL-changing method to use
-            at the end of a transition. Accepted values are 'replace',
-            falsy values, or any other non-falsy value (which is
-            interpreted as an updateURL transition).
-
-          @return {Transition} this transition
-         */
-        method(method: string): EmberStates.Transition;
-
-        /**
-          Fires an event on the current list of resolved/resolving
-          handlers within this transition. Useful for firing events
-          on route hierarchies that haven't fully been entered yet.
-
-          Note: This method is also aliased as `send`
-
-          @arg {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled events throw an error
-          @arg {String} name the name of the event to fire
-         */
-        trigger(ignoreFailure: boolean, eventName: string): void;
-        /**
-          Fires an event on the current list of resolved/resolving
-          handlers within this transition. Useful for firing events
-          on route hierarchies that haven't fully been entered yet.
-
-          Note: This method is also aliased as `send`
-
-          @arg {String} name the name of the event to fire
-         */
-        trigger(eventName: string): void;
-
-        /**
-          Transitions are aborted and their promises rejected
-          when redirects occur; this method returns a promise
-          that will follow any redirects that occur and fulfill
-          with the value fulfilled by any redirecting transitions
-          that occur.
-
-          @return {Promise} a promise that fulfills with the same
-            value that the final redirecting transition fulfills with
-         */
-        followRedirects(): Rsvp.Promise<any, any>;
+    /**
+     * Accept any additional properties and add merge them into the prototype.
+     */
+    interface EmberClassArguments {
+        [key: string]: any;
     }
-}
 
-// Get an alias to the global Array type to use in inner scope below.
-type GlobalArray<T> = T[];
+    /**
+     * Map type `T` to a plain object hash with the identity mapping.
+     *
+     * Discards any additional object identity like the ability to `new()` up the class.
+     * The `new()` capability is added back later by merging `EmberClassConstructor<T>`
+     *
+     * Implementation is carefully chosen for the reasons described in
+     * https://github.com/typed-ember/ember-typings/pull/29
+     */
+    type Objectify<T> = Readonly<T>;
 
-declare namespace EmberTesting {
-    namespace Test {
-        class Adapter {
-            asyncEnd(): void;
-            asyncStart(): void;
-            exception(error: string): void;
+    type Fix<T> = { [K in keyof T]: T[K] };
+
+    /**
+     * Ember.Object.extend(...) accepts any number of mixins or literals.
+     */
+    type MixinOrLiteral<T, Base> = Ember.Mixin<T, Base> | T;
+
+    /**
+     * Used to infer the type of ember classes of type `T`.
+     *
+     * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
+     *
+     * The no-arg constructor is required by the typescript compiler.
+     * The multi-arg constructor is included for better ergonomics.
+     *
+     * Implementation is carefully chosen for the reasons described in
+     * https://github.com/typed-ember/ember-typings/pull/29
+     */
+    type EmberClassConstructor<T> = (new () => T) & (new (...args: any[]) => T);
+
+    type ComputedPropertyGetterFunction<T> = (this: any, key: string) => T;
+
+    interface ComputedPropertyGet<T> {
+        get(this: any, key: string): T;
+    }
+
+    interface ComputedPropertySet<T> {
+        set(this: any, key: string, value: T): T;
+    }
+
+    type ComputedPropertyCallback<T> =
+        | ComputedPropertyGetterFunction<T>
+        | ComputedPropertyGet<T>
+        | ComputedPropertySet<T>
+        | (ComputedPropertyGet<T> & ComputedPropertySet<T>);
+
+    interface ActionsHash {
+        [index: string]: (...params: any[]) => any;
+    }
+
+    interface EmberRunTimer {
+        __ember_run_timer_brand__: any;
+    }
+
+    type RunMethod<Target, Ret = any> = ((this: Target, ...args: any[]) => Ret) | keyof Target;
+    type EmberRunQueues =
+        | 'sync'
+        | 'actions'
+        | 'routerTransitions'
+        | 'render'
+        | 'afterRender'
+        | 'destroy';
+
+    type ObserverMethod<Target, Sender> =
+        | (keyof Target)
+        | ((this: Target, sender: Sender, key: keyof Sender, value: any, rev: number) => void);
+
+    interface RenderOptions {
+        into?: string;
+        controller?: string;
+        model?: any;
+        outlet?: string;
+        view?: string;
+    }
+
+    interface RouteQueryParam {
+        refreshModel?: boolean;
+        replace?: boolean;
+        as?: string;
+    }
+
+    interface EventDispatcherEvents {
+        touchstart?: string | null;
+        touchmove?: string | null;
+        touchend?: string | null;
+        touchcancel?: string | null;
+        keydown?: string | null;
+        keyup?: string | null;
+        keypress?: string | null;
+        mousedown?: string | null;
+        mouseup?: string | null;
+        contextmenu?: string | null;
+        click?: string | null;
+        dblclick?: string | null;
+        mousemove?: string | null;
+        focusin?: string | null;
+        focusout?: string | null;
+        mouseenter?: string | null;
+        mouseleave?: string | null;
+        submit?: string | null;
+        input?: string | null;
+        change?: string | null;
+        dragstart?: string | null;
+        drag?: string | null;
+        dragenter?: string | null;
+        dragleave?: string | null;
+        dragover?: string | null;
+        drop?: string | null;
+        dragend?: string | null;
+        [event: string]: string | null | undefined;
+    }
+
+    interface ViewMixin {
+        /**
+         * A list of properties of the view to apply as attributes. If the property
+         * is a string value, the value of that string will be applied as the value
+         * for an attribute of the property's name.
+         */
+        attributeBindings: string[];
+        /**
+         * Returns the current DOM element for the view.
+         */
+        element: Element;
+        /**
+         * Returns a jQuery object for this view's element. If you pass in a selector
+         * string, this method will return a jQuery object, using the current element
+         * as its buffer.
+         */
+        $: JQueryStatic;
+        /**
+         * The HTML `id` of the view's element in the DOM. You can provide this
+         * value yourself but it must be unique (just as in HTML):
+         */
+        elementId: string;
+        /**
+         * Tag name for the view's outer element. The tag name is only used when an
+         * element is first created. If you change the `tagName` for an element, you
+         * must destroy and recreate the view element.
+         */
+        tagName: string;
+        /**
+         * Renders the view again. This will work regardless of whether the
+         * view is already in the DOM or not. If the view is in the DOM, the
+         * rendering process will be deferred to give bindings a chance
+         * to synchronize.
+         */
+        rerender(): void;
+        /**
+         * Called when a view is going to insert an element into the DOM.
+         */
+        willInsertElement(): void;
+        /**
+         * Called when the element of the view has been inserted into the DOM.
+         * Override this function to do any set up that requires an element
+         * in the document body.
+         */
+        didInsertElement(): void;
+        /**
+         * Called when the view is about to rerender, but before anything has
+         * been torn down. This is a good opportunity to tear down any manual
+         * observers you have installed based on the DOM state
+         */
+        willClearRender(): void;
+        /**
+         * Called when the element of the view is going to be destroyed. Override
+         * this function to do any teardown that requires an element, like removing
+         * event listeners.
+         */
+        willDestroyElement(): void;
+    }
+    const ViewMixin: Ember.Mixin<ViewMixin>;
+
+    /**
+    Ember.CoreView is an abstract class that exists to give view-like behavior to both Ember's main
+    view class Ember.Component and other classes that don't need the full functionality of Ember.Component.
+
+    Unless you have specific needs for CoreView, you will use Ember.Component in your applications.
+    **/
+    class CoreView extends Ember.Object.extend(Ember.Evented, Ember.ActionHandler) {}
+    interface ActionSupport {
+        sendAction(action: string, ...params: any[]): void;
+    }
+    const ActionSupport: Ember.Mixin<ActionSupport>;
+
+    interface ClassNamesSupport {
+        /**
+        A list of properties of the view to apply as class names. If the property is a string value,
+        the value of that string will be applied as a class name.
+
+        If the value of the property is a Boolean, the name of that property is added as a dasherized
+        class name.
+
+        If you would prefer to use a custom value instead of the dasherized property name, you can
+        pass a binding like this: `classNameBindings: ['isUrgent:urgent']`
+
+        This list of properties is inherited from the component's superclasses as well.
+        */
+        classNameBindings: string[];
+        /**
+         * Standard CSS class names to apply to the view's outer element. This
+         * property automatically inherits any class names defined by the view's
+         * superclasses as well.
+         */
+        classNames: string[];
+    }
+    const ClassNamesSupport: Ember.Mixin<ClassNamesSupport>;
+
+    interface TriggerActionOptions {
+        action?: string;
+        target?: Ember.Object;
+        actionContext?: Ember.Object;
+    }
+    /**
+    Ember.TargetActionSupport is a mixin that can be included in a class to add a triggerAction method
+    with semantics similar to the Handlebars {{action}} helper. In normal Ember usage, the {{action}}
+    helper is usually the best choice. This mixin is most often useful when you are doing more
+    complex event handling in Components.
+    **/
+    interface TargetActionSupport {
+        triggerAction(opts: TriggerActionOptions): boolean;
+    }
+
+    export namespace Ember {
+        interface FunctionPrototypeExtensions {
+            /**
+             * The `property` extension of Javascript's Function prototype is available
+             * when `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Function` is
+             * `true`, which is the default.
+             */
+            property(...args: string[]): ComputedProperty<any>;
+            /**
+             * The `observes` extension of Javascript's Function prototype is available
+             * when `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Function` is
+             * true, which is the default.
+             */
+            observes(...args: string[]): this;
+            /**
+             * The `on` extension of Javascript's Function prototype is available
+             * when `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Function` is
+             * true, which is the default.
+             */
+            on(...args: string[]): this;
         }
 
-        class QUnitAdapter extends Adapter {}
-    }
-}
-
-interface Function {
-    observes(...args: string[]): Function;
-    observesBefore(...args: string[]): Function;
-    on(...args: string[]): Function;
-    property(...args: string[]): Function;
-}
-
-interface String {
-    camelize(): string;
-    capitalize(): string;
-    classify(): string;
-    dasherize(): string;
-    decamelize(): string;
-    fmt(...args: string[]): string;
-    htmlSafe(): typeof Handlebars.SafeString;
-    loc(...args: string[]): string;
-    underscore(): string;
-    w(): string[];
-}
-
-interface Array<T> {
-    constructor(arr: any[]): void;
-    activate(): void;
-    addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-    addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-    any(callback: Function, target?: any): boolean;
-    anyBy(key: string, value?: string): boolean;
-    arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-    arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-    someProperty(key: string, value?: any): boolean;
-    clear(): any[];
-    compact(): any[];
-    contains(obj: any): boolean;
-    enumerableContentDidChange(
-        start: number,
-        removing: Ember.Enumerable | number,
-        adding: Ember.Enumerable | number
-    ): any;
-    enumerableContentDidChange(
-        removing: Ember.Enumerable | number,
-        adding: Ember.Enumerable | number
-    ): any;
-    enumerableContentWillChange(
-        removing: Ember.Enumerable | number,
-        adding: Ember.Enumerable | number
-    ): Ember.Enumerable;
-    every(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-    everyBy(key: string, value?: string): boolean;
-    everyProperty(key: string, value?: any): boolean;
-    filter(callback: Function, target?: any): any[];
-    filterBy(key: string, value?: string): any[];
-
-    /**
-    Returns the first item in the array for which the callback returns true.
-    This method works similar to the `filter()` method defined in JavaScript 1.6
-    except that it will stop working on the array once a match is found.
-    The callback method you provide should have the following signature (all
-    parameters are optional):
-    ```javascript
-    function(item, index, enumerable);
-    ```
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `enumerable` is the enumerable object itself.
-    It should return the `true` to include the item in the results, `false`
-    otherwise.
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as `this` on the context. This is a good way
-    to give your iterator function access to the current object.
-    @function find
-    @arg callback The callback to execute
-    @arg {Object} [target] The target object to use
-    @return {Object} Found item or `undefined`.
-*/
-    find(callback: Function, target?: any): any;
-    findBy(key: string, value?: string): any;
-    forEach(callback: Function, target?: any): any;
-    getEach(key: string): any[];
-    indexOf(object: any, startAt?: number): number;
-    insertAt(idx: number, object: any): any[];
-    invoke(methodName: string, ...args: any[]): any[];
-    lastIndexOf(object: any, startAt?: number): number;
-    map(callback: Function, target?: any): any[];
-    mapBy(key: string): any[];
-    nextObject(index: number, previousObject: any, context: any): any;
-    objectAt(idx: number): any;
-    objectsAt(...args: number[]): any[];
-    popObject(): any;
-    pushObject(obj: any): any;
-    pushObjects(...args: any[]): any[];
-    reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-    reject: ItemIndexEnumerableCallbackTarget;
-    rejectBy(key: string, value?: string): any[];
-    removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-    removeAt(start: number, len: number): any;
-    removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-    replace(idx: number, amt: number, objects: any[]): void;
-    reverseObjects(): any[];
-    setEach(key: string, value?: any): any;
-    setObjects(objects: any[]): any[];
-    shiftObject(): any;
-    slice(beginIndex?: number, endIndex?: number): any[];
-    some(callback: Function, target?: any): boolean;
-    toArray(): any[];
-    uniq(): any[];
-    unshiftObject(object: any): any;
-    unshiftObjects(objects: any[]): any[];
-    without(value: any): any[];
-    '[]': any[];
-    '@each': Ember.EachProxy;
-    Boolean: boolean;
-    firstObject: any;
-    hasEnumerableObservers: boolean;
-    lastObject: any;
-    addObject(object: any): any;
-    addObjects(objects: Ember.Enumerable): any[];
-    removeObject(object: any): any;
-    removeObjects(objects: Ember.Enumerable): any[];
-    addObserver: ModifyObserver;
-    beginPropertyChanges(): any[];
-    cacheFor(keyName: string): any;
-    decrementProperty(keyName: string, decrement?: number): number;
-    endPropertyChanges(): any[];
-    get(keyName: string): any;
-    getProperties(...args: string[]): {};
-    getProperties(keys: string[]): {};
-    getWithDefault(keyName: string, defaultValue: any): any;
-    hasObserverFor(key: string): boolean;
-    incrementProperty(keyName: string, increment?: number): number;
-    notifyPropertyChange(keyName: string): any[];
-    propertyDidChange(keyName: string): any[];
-    propertyWillChange(keyName: string): any[];
-    removeObserver(key: string, target: any, method: Function | string): Ember.Observable;
-    set(keyName: string, value: any): any[];
-    setProperties(hash: {}): any[];
-    toggleProperty(keyName: string): any;
-    copy(deep: boolean): any[];
-    frozenCopy(): any[];
-    // 1.3
-    isAny(key: string, value?: string): boolean;
-    isEvery(key: string, value?: string): boolean;
-}
-
-interface ApplicationCreateArguments {
-    customEvents?: {};
-    rootElement?: string;
-    /**
-    Basic logging of successful transitions.
-    **/
-    LOG_TRANSITIONS?: boolean;
-    /**
-    Detailed logging of all routing steps.
-    **/
-    LOG_TRANSITIONS_INTERNAL?: boolean;
-}
-
-type ApplicationInitializerFunction = (
-    container: Ember.Container,
-    application: Ember.Application
-) => void;
-
-interface ApplicationInitializerArguments {
-    name?: string;
-    initialize?: ApplicationInitializerFunction;
-}
-
-interface CoreObjectArguments {
-    /**
-    An overridable method called when objects are instantiated. By default, does nothing unless it is
-    overridden during class definition. NOTE: If you do override init for a framework class like Ember.View
-    or Ember.ArrayController, be sure to call this._super() in your init declaration! If you don't, Ember
-    may not have an opportunity to do important setup work, and you'll see strange behavior in your application.
-    **/
-    init?: Function;
-    /**
-    Override to implement teardown.
-    **/
-    willDestroy?: Function;
-
-    [propName: string]: any;
-}
-
-interface EnumerableConfigurationOptions {
-    willChange?: boolean;
-    didChange?: boolean;
-}
-
-type ItemIndexEnumerableCallbackTarget = (
-    callback: ItemIndexEnumerableCallback,
-    target?: any
-) => any[];
-
-type ItemIndexEnumerableCallback = (item: any, index: number, enumerable: Ember.Enumerable) => void;
-
-type ReduceCallback = (
-    previousValue: any,
-    item: any,
-    index: number,
-    enumerable: Ember.Enumerable
-) => void;
-
-interface TransitionsHash {
-    contexts: any[];
-    exitStates: Ember.State[];
-    enterStates: Ember.State[];
-    resolveState: Ember.State;
-}
-
-interface ActionsHash {
-    willTransition?: Function;
-    error?: Function;
-}
-
-interface DisconnectOutletOptions {
-    outlet?: string;
-    parentView?: string;
-}
-
-interface RenderOptions {
-    into?: string;
-    controller?: string;
-    model?: any;
-    outlet?: string;
-    view?: string;
-}
-
-type ModifyObserver = (
-    obj: any,
-    path: string | null,
-    target: Function | any,
-    method?: Function | string
-) => void;
-
-declare namespace Ember {
-    /**
-    Alias for jQuery.
-    **/
-    // ReSharper disable once DuplicatingLocalDeclaration
-    const $: JQueryStatic;
-    /**
-    Creates an Ember.NativeArray from an Array like object. Does not modify the original object.
-    Ember.A is not needed if Ember.EXTEND_PROTOTYPES is true (the default value). However, it is
-    recommended that you use Ember.A when creating addons for ember or when you can not garentee
-    that Ember.EXTEND_PROTOTYPES will be true.
-    **/
-    function A(arr?: any[]): NativeArray;
-    /**
-    The Ember.ActionHandler mixin implements support for moving an actions property to an _actions
-    property at extend time, and adding _actions to the object's mergedProperties list.
-    **/
-    class ActionHandlerMixin {
-        /**
-        Triggers a named action on the ActionHandler
-        **/
-        send(name: string, ...args: any[]): void;
-        /**
-        The collection of functions, keyed by name, available on this ActionHandler as action targets.
-        **/
-        actions: ActionsHash;
-    }
-    /**
-    An instance of Ember.Application is the starting point for every Ember application. It helps to
-    instantiate, initialize and coordinate the many objects that make up your app.
-    **/
-    class Application extends Namespace {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        /**
-        Call advanceReadiness after any asynchronous setup logic has completed.
-        Each call to deferReadiness must be matched by a call to advanceReadiness
-        or the application will never become ready and routing will not begin.
-        **/
-        advanceReadiness(): void;
-        /**
-        Use this to defer readiness until some condition is true.
-
-        This allows you to perform asynchronous setup logic and defer
-        booting your application until the setup has finished.
-
-        However, if the setup requires a loading UI, it might be better
-        to use the router for this purpose.
-        */
-        deferReadiness(): void;
-        /**
-        defines an injection or typeInjection
-        **/
-        inject(factoryNameOrType: string, property: string, injectionName: string): void;
-        /**
-        This injects the test helpers into the window's scope. If a function of the
-        same name has already been defined it will be cached (so that it can be reset
-        if the helper is removed with `unregisterHelper` or `removeTestHelpers`).
-        Any callbacks registered with `onInjectHelpers` will be called once the
-        helpers have been injected.
-        **/
-        injectTestHelpers(): void;
-        /**
-        registers a factory for later injection
-        @param fullName type:name (e.g., 'model:user')
-        @param factory (e.g., App.Person)
-        **/
-        register(fullName: string, factory: Function, options?: {}): void;
-        /**
-        This removes all helpers that have been registered, and resets and functions
-        that were overridden by the helpers.
-        **/
-        removeTestHelpers(): void;
-        /**
-        Reset the application. This is typically used only in tests.
-        **/
-        reset(): void;
-        /**
-        This hook defers the readiness of the application, so that you can start
-        the app when your tests are ready to run. It also sets the router's
-        location to 'none', so that the window's location will not be modified
-        (preventing both accidental leaking of state between tests and interference
-        with your testing framework).
-        **/
-        setupForTesting(): void;
-        /**
-        The DOM events for which the event dispatcher should listen.
-        */
-        customEvents: {};
-        /**
-        The Ember.EventDispatcher responsible for delegating events to this application's views.
-        **/
-        eventDispatcher: EventDispatcher;
-        /**
-        Set this to provide an alternate class to Ember.DefaultResolver
-        **/
-        resolver: DefaultResolver;
-        /**
-        The root DOM element of the Application. This can be specified as an
-        element or a jQuery-compatible selector string.
-
-        This is the element that will be passed to the Application's, eventDispatcher,
-        which sets up the listeners for event delegation. Every view in your application
-        should be a child of the element you specify here.
-        **/
-        rootElement: HTMLElement;
-        /**
-        Called when the Application has become ready.
-        The call will be delayed until the DOM has become ready.
-        **/
-        ready: Function;
-        /**
-        Application's router.
-        **/
-        Router: Router;
-        registry: Registry;
-    }
-    /**
-    This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
-    Array class as well as other controllers, etc. that want to appear to be arrays.
-    **/
-    class Array implements Enumerable {
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(
-            start: number,
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): any;
-        enumerableContentDidChange(removing: Enumerable | number, adding: Enumerable | number): any;
-        enumerableContentWillChange(
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): Enumerable;
-        every(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: ItemIndexEnumerableCallback, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: ItemIndexEnumerableCallback, target?: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: ItemIndexEnumerableCallback, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        setEach(key: string, value?: any): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        without(value: any): Enumerable;
-        '@each': EachProxy;
-        Boolean: boolean;
-        '[]': any[];
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-    }
-    /**
-    An ArrayProxy wraps any other object that implements Ember.Array and/or Ember.MutableArray,
-    forwarding all requests. This makes it very useful for a number of binding use cases or other cases
-    where being able to swap out the underlying array is useful.
-    **/
-    class ArrayProxy extends Object implements MutableArray {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: string): boolean;
-        clear(): any[];
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(
-            start: number,
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): any;
-        enumerableContentDidChange(removing: Enumerable | number, adding: Enumerable | number): any;
-        enumerableContentWillChange(
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): Enumerable;
-        every(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: ItemIndexEnumerableCallback, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: ItemIndexEnumerableCallback, $target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: ItemIndexEnumerableCallback, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        insertAt(idx: number, object: any): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectAtContent(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        popObject(): any;
-        pushObject(obj: any): any;
-        pushObjects(...args: any[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeAt(start: number, len: number): any;
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        replace(idx: number, amt: number, objects: any[]): any;
-        replaceContent(idx: number, amt: number, objects: any[]): void;
-        reverseObjects(): any[];
-        setEach(key: string, value?: any): any;
-        setObjects(objects: any[]): any[];
-        shiftObject(): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        unshiftObject(object: any): any;
-        unshiftObjects(objects: any[]): any[];
-        without(value: any): Enumerable;
-        '[]': any[];
-        '@each': EachProxy;
-        Boolean: boolean;
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-    }
-    const BOOTED: boolean;
-    /**
-    Connects the properties of two objects so that whenever the value of one property changes,
-    the other property will be changed also.
-    **/
-    class Binding {
-        constructor(toPath: string, fromPath: string);
-        connect(obj: any): Binding;
-        copy(): Binding;
-        disconnect(): Binding;
-        from(path: string): Binding;
-        to(path: string | any[]): Binding;
-        toString(): string;
-    }
-    class Button extends Component implements TargetActionSupport {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        triggerAction(opts: {}): boolean;
-    }
-    /**
-    The internal class used to create text inputs when the {{input}} helper is used
-    with type of checkbox. See Handlebars.helpers.input for usage details.
-    **/
-    class Checkbox extends Component {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    /**
-    Implements some standard methods for comparing objects. Add this mixin to any class
-    you create that can compare its instances.
-    **/
-    class Comparable {
-        compare(a: any, b: any): number;
-    }
-    /**
-    A view that is completely isolated. Property access in its templates go to the view object
-    and actions are targeted at the view object. There is no access to the surrounding context or
-    outer controller; all contextual information is passed in.
-    **/
-    class Component extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        sendAction(action: string, context: any): void;
-        targetObject: Controller;
-    }
-    /**
-    A computed property transforms an objects function into a property.
-    By default the function backing the computed property will only be called once and the result
-    will be cached. You can specify various properties that your computed property is dependent on.
-    This will force the cached result to be recomputed if the dependencies are modified.
-    **/
-    class ComputedProperty {
-        get(keyName: string): any;
-        meta(meta: {}): ComputedProperty;
-        property(...args: string[]): ComputedProperty;
-        readOnly(): ComputedProperty;
-        set(keyName: string, newValue: any, oldValue: string): any;
-        // ReSharper disable UsingOfReservedWord
-        volatile(): ComputedProperty;
-        // ReSharper restore UsingOfReservedWord
-    }
-    class Container {
-        constructor(parent: Container);
-        parent: Container;
-        children: any[];
-        owner: any;
-        ownerInjection(): any;
-        resolver: Function;
-        registry: Registry;
-        cache: {};
-        typeInjections: {};
-        injections: {};
-        child(): Container;
-        set(object: {}, key: string, value: any): void;
-        /**
-        registers a factory for later injection
-        @param fullName type:name (e.g., 'model:user')
-        @param factory (e.g., App.Person)
-        **/
-        describe(fullName: string): string;
-        makeToString(factory: any, fullName: string): Function;
-        lookup(fullName: string, options?: {}): any;
-        lookupFactory(fullName: string, options?: {}): any;
-        destroy(): void;
-        reset(): void;
-    }
-    class Controller extends Object implements ControllerMixin {
-        replaceRoute(name: string, ...args: any[]): void;
-        transitionToRoute(name: string, ...args: any[]): void;
-        controllers: {};
-        model: any;
-        needs: string[];
-        queryParams: any;
-        target: any;
-        send(name: string, ...args: any[]): void;
-        actions: ActionsHash;
-    }
-    /**
-    Additional methods for the ControllerMixin.
-    **/
-    class ControllerMixin extends ActionHandlerMixin {
-        replaceRoute(name: string, ...args: any[]): void;
-        transitionToRoute(name: string, ...args: any[]): void;
-        controllers: {};
-        model: any;
-        needs: string[];
-        queryParams: any;
-        target: any;
-    }
-    /**
-    Implements some standard methods for copying an object. Add this mixin to any object you
-    create that can create a copy of itself. This mixin is added automatically to the built-in array.
-    You should generally implement the copy() method to return a copy of the receiver.
-    Note that frozenCopy() will only work if you also implement Ember.Freezable.
-    **/
-    class Copyable {
-        copy(deep: boolean): Copyable;
-        frozenCopy(): Copyable;
-    }
-    class CoreObject {
-        /**
-        An overridable method called when objects are instantiated. By default,
-        does nothing unless it is overridden during class definition.
-        @method init
-        **/
-        init(): void;
+        interface ArrayPrototypeExtensions<T> extends MutableArray<T>, Observable, Copyable {}
 
         /**
-        Defines the properties that will be concatenated from the superclass (instead of overridden).
-        @property concatenatedProperties
-        @type Array
-        @default null
-        **/
-        concatenatedProperties: any[];
-
-        /**
-        Destroyed object property flag. If this property is true the observers and bindings were
-        already removed by the effect of calling the destroy() method.
-        @property isDestroyed
-        @default false
-        **/
-        isDestroyed: boolean;
-        /**
-        Destruction scheduled flag. The destroy() method has been called. The object stays intact
-        until the end of the run loop at which point the isDestroyed flag is set.
-        @property isDestroying
-        @default false
-        **/
-        isDestroying: boolean;
-
-        /**
-        Destroys an object by setting the `isDestroyed` flag and removing its
-        metadata, which effectively destroys observers and bindings.
-        If you try to set a property on a destroyed object, an exception will be
-        raised.
-        Note that destruction is scheduled for the end of the run loop and does not
-        happen immediately.  It will set an isDestroying flag immediately.
-        @method destroy
-        @return {Ember.Object} receiver
-        */
-        destroy(): CoreObject;
-
-        /**
-        Override to implement teardown.
-        @method willDestroy
-        */
-        willDestroy(): void;
-
-        /**
-        Returns a string representation which attempts to provide more information than Javascript's toString
-        typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
-        @method toString
-        @return {String} string representation
-        **/
-        toString(): string;
-
-        static isClass: boolean;
-        static isMethod: boolean;
-
-        /**
-        Creates a new subclass.
-        @method extend
-        @static
-        @param {Mixin} [mixins] - One or more Mixin classes
-        @param {Object} [args] - Object containing values to use within the new class
-        **/
-        static extend<T>(args?: CoreObjectArguments): T;
-        static extend<T>(mixin1: Mixin, args?: CoreObjectArguments): T;
-        static extend<T>(mixin1: Mixin, mixin2: Mixin, args?: CoreObjectArguments): T;
-        static extend<T>(mixin1: Mixin, mixin2: Mixin, mixin3: Mixin, args?: CoreObjectArguments): T;
-        static extend<T>(mixin1: Mixin, mixin2: Mixin, mixin3: Mixin, mixin4: Mixin, args?: CoreObjectArguments): T;
-        static extend<T>(mixin1: Mixin, mixin2: Mixin, mixin3: Mixin, mixin4: Mixin, mixin5: Mixin, args?: CoreObjectArguments): T;
-        static extend<T>(mixin1: Mixin, mixin2: Mixin, mixin3: Mixin, mixin4: Mixin, mixin5: Mixin, mixin6: Mixin, args?: CoreObjectArguments): T;
-        static extend<T>(mixin1: Mixin, mixin2: Mixin, mixin3: Mixin, mixin4: Mixin, mixin5: Mixin, mixin6: Mixin, mixin7: Mixin, args?: CoreObjectArguments): T;
-
-        /**
-        Creates a new subclass.
-        @method extend
-        @param {Mixin} [mixins] - One or more Mixin classes
-        @param {Object} [args] - Object containing values to use within the new class
-        Non-static method because Ember classes aren't currently 'real' TypeScript classes.
-        **/
-        extend<T>(mixin1?: Mixin, mixin2?: Mixin, args?: CoreObjectArguments): T;
-
-        /**
-        Equivalent to doing extend(arguments).create(). If possible use the normal create method instead.
-        @method createWithMixins
-        @static
-        @param [args]
-        **/
-        static createWithMixins<T extends {}>(args?: {}): T;
-
-        /**
-        Creates an instance of the class.
-        @method create
-        @static
-        @param [args] - A hash containing values with which to initialize the newly instantiated object.
-        **/
-        static create<T extends {}>(args?: {}): T;
-
-        /**
-        Augments a constructor's prototype with additional properties and functions.
-        To add functions and properties to the constructor itself, see reopenClass.
-        @method reopen
-        **/
-        static reopen<T extends {}>(args?: {}): T;
-
-        /**
-        Augments a constructor's own properties and functions.
-        To add functions and properties to instances of a constructor by extending the
-        constructor's prototype see reopen.
-        @method reopenClass
-        **/
-        static reopenClass<T extends {}>(args?: {}): T;
-
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-
-        /**
-        Returns the original hash that was passed to meta().
-        @method metaForProperty
-        @static
-        @param key {String} property name
-        **/
-        static metaForProperty(key: string): {};
-
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-
-        @method eachComputedProperty
-        @static
-        @param {Function} callback
-        @param {Object} binding
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-    }
-    class DAG {
-        add(name: string): any;
-        map(name: string, value: any): void;
-        addEdge(fromName: string, toName: string): void;
-        topsort(fn: Function): void;
-        addEdges(name: string, value: any, before: any, after: any): void;
-        names: any[];
-        vertices: {};
-    }
-    function DEFAULT_GETTER_FUNCTION(name: string): Function;
-    /**
-    The DefaultResolver defines the default lookup rules to resolve container lookups before consulting
-    the container for registered items:
-    templates are looked up on Ember.TEMPLATES
-    other names are looked up on the application after converting the name.
-    For example, controller:post looks up App.PostController by default.
-    **/
-    class DefaultResolver {
-        resolve(fullName: string): {};
-        namespace: Application;
-    }
-    /**
-    Objects of this type can implement an interface to respond to requests to get and set.
-    The default implementation handles simple properties.
-    You generally won't need to create or subclass this directly.
-    **/
-    class Descriptor {}
-    namespace ENV {
-        const EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
-        const LOG_BINDINGS: boolean;
-        const LOG_STACKTRACE_ON_DEPRECATION: boolean;
-        const LOG_VERSION: boolean;
-        const MODEL_FACTORY_INJECTIONS: boolean;
-        const RAISE_ON_DEPRECATION: boolean;
-    }
-    namespace EXTEND_PROTOTYPES {
-        const Array: boolean;
-        const Function: boolean;
-        const String: boolean;
-    }
-    /**
-    This is the object instance returned when you get the @each property on an array. It uses
-    the unknownProperty handler to automatically create EachArray instances for property names.
-    **/
-    class EachProxy extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        unknownProperty(keyName: string, value: any): any[];
-    }
-    /**
-    This mixin defines the common interface implemented by enumerable objects in Ember. Most of these
-    methods follow the standard Array iteration API defined up to JavaScript 1.8 (excluding language-specific
-    features that cannot be emulated in older versions of JavaScript).
-    This mixin is applied automatically to the Array class on page load, so you can use any of these methods
-    on simple arrays. If Array already implements one of these methods, the mixin will not override them.
-    **/
-    class Enumerable {
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(
-            start: number,
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): any;
-        enumerableContentDidChange(removing: Enumerable | number, adding: Enumerable | number): any;
-        enumerableContentWillChange(
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): Enumerable;
-        every(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: ItemIndexEnumerableCallback, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: ItemIndexEnumerableCallback, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: ItemIndexEnumerableCallback, target?: any): any;
-        getEach(key: string): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        setEach(key: string, value?: any): any;
-        some(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        without(value: any): Enumerable;
-        '[]': any[];
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-    }
-    /**
-    A subclass of the JavaScript Error object for use in Ember.
-    **/
-    // Restore this to 'typeof Error' when https://github.com/Microsoft/TypeScript/issues/983 is resolved
-    // ReSharper disable once DuplicatingLocalDeclaration
-    const Error: any; // typeof Error;
-    /**
-    Handles delegating browser events to their corresponding Ember.Views. For example, when you click on
-    a view, Ember.EventDispatcher ensures that that view's mouseDown method gets called.
-    **/
-    class EventDispatcher extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        events: {};
-    }
-    /**
-    This mixin allows for Ember objects to subscribe to and emit events.
-    You can also chain multiple event subscriptions.
-    **/
-    class Evented {
-        has(name: string): boolean;
-        off(name: string, target: any, method: Function): Evented;
-        on(name: string, target: any, method: Function): Evented;
-        one(name: string, target: any, method: Function): Evented;
-        trigger(name: string, ...args: string[]): void;
-    }
-    const FROZEN_ERROR: string;
-    class Freezable {
-        freeze(): Freezable;
-        isFrozen: boolean;
-    }
-    const GUID_KEY: string;
-    namespace Handlebars {
-        function compile(string: string): Function;
-        function compile(environment: any, options?: any, context?: any, asObject?: any): any;
-        function precompile(string: string, options: any): void;
-        class Compiler {}
-        class JavaScriptCompiler {}
-        function registerPartial(name: string, str: any): void;
-        function K(): any;
-        function createFrame(objec: any): any;
-        function Exception(message: string): void;
-        class SafeString {
-            constructor(str: string);
-            static toString(): string;
-        }
-        function parse(string: string): any;
-        function print(ast: any): void;
-        const logger: typeof Ember.Logger;
-        function log(level: string, str: string): void;
-    }
-    class HashLocation extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    class HistoryLocation extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        rootURL: string;
-    }
-    const IS_BINDING: RegExp;
-    const inject: {
-        controller(name?: string): Controller;
-        service(name?: string): Service;
-    };
-    class Helper extends Object {
-        static helper(h: (params: any, hash?: any) => any): Helper;
-        compute(params: any[], hash: any): any;
-        recompute(params: any[], hash: any): any;
-    }
-    class Instrumentation {
-        getProperties(obj: any, list: any[]): {};
-        getProperties(obj: any, ...args: string[]): {};
-        instrument(name: string, payload: any, callback: Function, binding: any): void;
-        reset(): void;
-        subscribe(pattern: string, object: any): void;
-        unsubscribe(subscriber: any): void;
-    }
-    const K: Function;
-    const LOG_BINDINGS: boolean;
-    const LOG_STACKTRACE_ON_DEPRECATION: boolean;
-    const LOG_VERSION: boolean;
-    class Location {
-        create(options?: {}): any;
-        registerImplementation(name: string, implementation: any): void;
-    }
-    const Logger: {
-        assert(param: any): void;
-        debug(...args: any[]): void;
-        error(...args: any[]): void;
-        info(...args: any[]): void;
-        log(...args: any[]): void;
-        warn(...args: any[]): void;
-    };
-    function MANDATORY_SETTER_FUNCTION(value: string): void;
-    const META_KEY: string;
-    class Map {
-        copy(): Map;
-        static create(): Map;
-        forEach(callback: Function, self: any): void;
-        get(key: any): any;
-        has(key: any): boolean;
-        set(key: any, value: any): void;
-        length: number;
-    }
-    class MapWithDefault extends Map {
-        copy(): MapWithDefault;
-        static create(): MapWithDefault;
-    }
-    class Mixin {
-        apply(obj: any): any;
-        /**
-        Creates an instance of the class.
-        @param arguments A hash containing values with which to initialize the newly instantiated object.
-        **/
-        static create<T extends Mixin>(...args: CoreObjectArguments[]): T;
-        detect(obj: any): boolean;
-        reopen<T extends Mixin>(args?: {}): T;
-    }
-    class MutableArray implements Array, MutableEnumberable {
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: string): boolean;
-        clear(): any[];
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(
-            start: number,
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): any;
-        enumerableContentDidChange(removing: Enumerable | number, adding: Enumerable | number): any;
-        enumerableContentWillChange(
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): Enumerable;
-        every(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: ItemIndexEnumerableCallback, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: ItemIndexEnumerableCallback, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: ItemIndexEnumerableCallback, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        insertAt(idx: number, object: any): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        popObject(): any;
-        pushObject(obj: any): any;
-        pushObjects(...args: any[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeAt(start: number, len: number): any;
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        replace(idx: number, amt: number, objects: any[]): any;
-        reverseObjects(): any[];
-        setEach(key: string, value?: any): any;
-        setObjects(objects: any[]): any[];
-        shiftObject(): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        unshiftObject(object: any): any;
-        unshiftObjects(objects: any[]): any[];
-        without(value: any): Enumerable;
-        '[]': any[];
-        '@each': EachProxy;
-        Boolean: boolean;
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-    }
-    class MutableEnumberable implements Enumerable {
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        any(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(
-            start: number,
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): any;
-        enumerableContentDidChange(removing: Enumerable | number, adding: Enumerable | number): any;
-        enumerableContentWillChange(
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): Enumerable;
-        every(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: ItemIndexEnumerableCallback, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: ItemIndexEnumerableCallback, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: ItemIndexEnumerableCallback, target?: any): any;
-        getEach(key: string): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-        setEach(key: string, value?: any): any;
-        some(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        without(value: any): Enumerable;
-        '[]': any[];
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-    }
-    const NAME_KEY: string;
-    class Namespace extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    class NativeArray implements MutableArray, Observable, Copyable {
-        constructor(arr: any[]);
-        static activate(): void;
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: any): boolean;
-        clear(): any[];
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(
-            start: number,
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): any;
-        enumerableContentDidChange(removing: Enumerable | number, adding: Enumerable | number): any;
-        enumerableContentWillChange(
-            removing: Enumerable | number,
-            adding: Enumerable | number
-        ): Enumerable;
-        every(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: any): boolean;
-        filter(callback: ItemIndexEnumerableCallback, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: ItemIndexEnumerableCallback, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: ItemIndexEnumerableCallback, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        insertAt(idx: number, object: any): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        popObject(): any;
-        pushObject(obj: any): any;
-        pushObjects(...args: any[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeAt(start: number, len: number): any;
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        replace(idx: number, amt: number, objects: any[]): any;
-        reverseObjects(): any[];
-        setEach(key: string, value?: any): any;
-        setObjects(objects: any[]): any[];
-        shiftObject(): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: ItemIndexEnumerableCallback, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        unshiftObject(object: any): any;
-        unshiftObjects(objects: any[]): any[];
-        without(value: any): Enumerable;
-        '[]': any[];
-        '@each': EachProxy;
-        Boolean: boolean;
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-        addObserver: ModifyObserver;
-        beginPropertyChanges(): Observable;
-        cacheFor(keyName: string): any;
-        decrementProperty(keyName: string, decrement?: number): number;
-        endPropertyChanges(): Observable;
-        get(keyName: string): any;
-        getProperties(...args: string[]): {};
-        getProperties(keys: string[]): {};
-        getWithDefault(keyName: string, defaultValue: any): any;
-        hasObserverFor(key: string): boolean;
-        incrementProperty(keyName: string, increment?: number): number;
-        notifyPropertyChange(keyName: string): Observable;
-        propertyDidChange(keyName: string): Observable;
-        propertyWillChange(keyName: string): Observable;
-        removeObserver(key: string, target: any, method: Function | string): void;
-        set(keyName: string, value: any): Observable;
-        setProperties(hash: {}): Observable;
-        toggleProperty(keyName: string): any;
-        copy(deep: boolean): Copyable;
-        frozenCopy(): Copyable;
-    }
-    class NoneLocation extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    const ORDER_DEFINITION: string[];
-    class Object extends CoreObject implements Observable {
-        addObserver: ModifyObserver;
-        beginPropertyChanges(): Observable;
-        cacheFor(keyName: string): any;
-        decrementProperty(keyName: string, decrement?: number): number;
-        endPropertyChanges(): Observable;
-
-        /**
-         * Retrieves the value of a property from the object
-         * @param keyName
-         * @returns {}
+         * Given a fullName return a factory manager.
          */
-        get(keyName: string): any;
+        interface _ContainerProxyMixin {
+            /**
+             * Returns an object that can be used to provide an owner to a
+             * manually created instance.
+             */
+            ownerInjection(): {};
+            /**
+             * Given a fullName return a corresponding instance.
+             */
+            lookup(fullName: string, options?: {}): any;
+        }
+        const _ContainerProxyMixin: Mixin<_ContainerProxyMixin>;
 
         /**
-         * Retrieves the value of a property from the object
-         * @param keyName
-         * @returns {}
+         * RegistryProxyMixin is used to provide public access to specific
+         * registry functionality.
          */
-        get<T>(keyName: string): T;
-
-        getProperties(...args: string[]): {};
-        getProperties(keys: string[]): {};
-        getWithDefault(keyName: string, defaultValue: any): any;
-        hasObserverFor(key: string): boolean;
-        incrementProperty(keyName: string, increment?: number): number;
-        notifyPropertyChange(keyName: string): Observable;
-        propertyDidChange(keyName: string): Observable;
-        propertyWillChange(keyName: string): Observable;
-        removeObserver(key: string, target: any, method: Function | string): Observable;
-        set(keyName: string, value: any): Observable;
-        setProperties(hash: {}): Observable;
-        toggleProperty(keyName: string): any;
-    }
-    class ObjectProxy extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        /**
-        The object whose properties will be forwarded.
-        **/
-        content: Object;
-    }
-    class Observable {
-        addObserver: ModifyObserver;
-        beginPropertyChanges(): Observable;
-        cacheFor(keyName: string): any;
-        decrementProperty(keyName: string, decrement?: number): number;
-        endPropertyChanges(): Observable;
-        get(keyName: string): any;
-        getProperties(...args: string[]): {};
-        getProperties(keys: string[]): {};
-        getWithDefault(keyName: string, defaultValue: any): any;
-        hasObserverFor(key: string): boolean;
-        incrementProperty(keyName: string, increment?: number): number;
-        notifyPropertyChange(keyName: string): Observable;
-        propertyDidChange(keyName: string): Observable;
-        propertyWillChange(keyName: string): Observable;
-        removeObserver(key: string, target: {}, method: Function | string): void;
-        set(keyName: string, value: any): Observable;
-        setProperties(hash: {}): Observable;
-        /**
-        Set the value of a boolean property to the opposite of its current value.
-        */
-        toggleProperty(keyName: string): boolean;
-    }
-    class OrderedSet {
-        add(obj: any): void;
-        clear(): void;
-        copy(): OrderedSet;
-        static create(): OrderedSet;
-        forEach(fn: Function, self: any): void;
-        has(obj: any): boolean;
-        isEmpty(): boolean;
-        toArray(): any[];
-    }
-    class Registry {
-        constructor(options: any);
-        static set: typeof Ember.set;
-    }
-
-    // FYI - RSVP source comes from https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/promise.js
-    const RSVP: typeof Rsvp;
-
-    /**
-      The `Ember.Route` class is used to define individual routes. Refer to
-      the [routing guide](http://emberjs.com/guides/routing/) for documentation.
-    */
-    class Route extends Object implements ActionHandlerMixin, Evented {
-        static isClass: boolean;
-        static isMethod: boolean;
-
-        /**
-        This hook is executed when the router enters the route. It is not executed
-        when the model for the route changes.
-        @method activate
-        */
-        activate: Function;
-
-        /**
-        This hook is called after this route's model has resolved.
-        It follows identical async/promise semantics to `beforeModel`
-        but is provided the route's resolved model in addition to
-        the `transition`, and is therefore suited to performing
-        logic that can only take place after the model has already
-        resolved.
-
-        Refer to documentation for `beforeModel` for a description
-        of transition-pausing semantics when a promise is returned
-        from this hook.
-        @method afterModel
-        @param {Object} resolvedModel the value returned from `model`,
-            or its resolved value if it was a promise
-        @param {Transition} transition
-        @return {Promise} if the value returned from this hook is
-            a promise, the transition will pause until the transition
-            resolves. Otherwise, non-promise return values are not
-            utilized in any way.
-        */
-        afterModel(resolvedModel: any, transition: EmberStates.Transition): Rsvp.Promise<any, any>;
-
-        /**
-        This hook is the first of the route entry validation hooks
-        called when an attempt is made to transition into a route
-        or one of its children. It is called before `model` and
-        `afterModel`, and is appropriate for cases when:
-        1) A decision can be made to redirect elsewhere without
-            needing to resolve the model first.
-        2) Any async operations need to occur first before the
-            model is attempted to be resolved.
-        This hook is provided the current `transition` attempt
-        as a parameter, which can be used to `.abort()` the transition,
-        save it for a later `.retry()`, or retrieve values set
-        on it from a previous hook. You can also just call
-        `this.transitionTo` to another route to implicitly
-        abort the `transition`.
-        You can return a promise from this hook to pause the
-        transition until the promise resolves (or rejects). This could
-        be useful, for instance, for retrieving async code from
-        the server that is required to enter a route.
-
-        @method beforeModel
-        @param {Transition} transition
-        @return {Promise} if the value returned from this hook is
-            a promise, the transition will pause until the transition
-            resolves. Otherwise, non-promise return values are not
-            utilized in any way.
-        */
-        beforeModel(transition: EmberStates.Transition): Rsvp.Promise<any, any>;
-
-        /**
-        The controller associated with this route.
-
-        @property controller
-        @type Ember.Controller
-        @since 1.6.0
-        */
-        controller: Controller;
-
-        /**
-        Returns the controller for a particular route or name.
-        The controller instance must already have been created, either through entering the
-        associated route or using `generateController`.
-
-        @method controllerFor
-        @param {String} name the name of the route or controller
-        @return {Ember.Controller}
-        */
-        controllerFor(name: string): Controller;
-
-        /**
-        The name of the controller to associate with this route.
-        By default, Ember will lookup a route's controller that matches the name
-        of the route (i.e. `App.PostController` for `App.PostRoute`). However,
-        if you would like to define a specific controller to use, you can do so
-        using this property.
-        This is useful in many ways, as the controller specified will be:
-        * passed to the `setupController` method.
-        * used as the controller for the view being rendered by the route.
-        * returned from a call to `controllerFor` for the route.
-        @property controllerName
-        @type String
-        @default null
-        @since 1.4.0
-        */
-        controllerName: string;
-
-        /**
-        This hook is executed when the router completely exits this route. It is
-        not executed when the model for the route changes.
-        @method deactivate
-        */
-        deactivate: Function;
-
-        /**
-        Deserializes value of the query parameter based on defaultValueType
-        @method deserializeQueryParam
-        @param {Object} value
-        @param {String} urlKey
-        @param {String} defaultValueType
-        */
-        deserializeQueryParam(value: any, urlKey: string, defaultValueType: string): any;
-
-        /**
-        Disconnects a view that has been rendered into an outlet.
-        You may pass any or all of the following options to `disconnectOutlet`:
-        * `outlet`: the name of the outlet to clear (default: 'main')
-        * `parentView`: the name of the view containing the outlet to clear
-            (default: the view rendered by the parent route)
-
-        @method disconnectOutlet
-        @param {Object|String} options the options hash or outlet name
-        */
-        disconnectOutlet(options: DisconnectOutletOptions | string): void;
-
-        /**
-        @method findModel
-        @param {String} type the model type
-        @param {Object} value the value passed to find
-        */
-        findModel(type: string, value: any): any;
-
-        /**
-        Generates a controller for a route.
-        If the optional model is passed then the controller type is determined automatically,
-        e.g., an ArrayController for arrays.
-
-        @method generateController
-        @param {String} name the name of the controller
-        @param {Object} model the model to infer the type of the controller (optional)
-        */
-        generateController(name: string, model: {}): Controller;
-
-        /**
-        Perform a synchronous transition into another route without attempting
-        to resolve promises, update the URL, or abort any currently active
-        asynchronous transitions (i.e. regular transitions caused by
-        `transitionTo` or URL changes).
-        This method is handy for performing intermediate transitions on the
-        way to a final destination route, and is called internally by the
-        default implementations of the `error` and `loading` handlers.
-        @method intermediateTransitionTo
-        @param {String} name the name of the route
-        @param {...Object} models the model(s) to be used while transitioning
-        to the route.
-        @since 1.2.0
-        */
-        intermediateTransitionTo(name: string, ...models: any[]): void;
-
-        /**
-        A hook you can implement to convert the URL into the model for
-        this route.
-
-        @method model
-        @param {Object} params the parameters extracted from the URL
-        @param {Transition} transition
-        @return {Object|Promise} the model for this route. If
-            a promise is returned, the transition will pause until
-            the promise resolves, and the resolved value of the promise
-            will be used as the model for this route.
-        */
-        model(params: {}, transition: EmberStates.Transition): any | Rsvp.Promise<any, any>;
-
-        /**
-        Returns the model of a parent (or any ancestor) route
-        in a route hierarchy.  During a transition, all routes
-        must resolve a model object, and if a route
-        needs access to a parent route's model in order to
-        resolve a model (or just reuse the model from a parent),
-        it can call `this.modelFor(theNameOfParentRoute)` to
-        retrieve it.
-
-        @method modelFor
-        @param {String} name the name of the route
-        @return {Object} the model object
-        */
-        modelFor(name: string): {};
-
-        /**
-        Retrieves parameters, for current route using the state.params
-        variable and getQueryParamsFor, using the supplied routeName.
-        @method paramsFor
-        @param {String} name
-        */
-        paramsFor(name: string): any;
-
-        /**
-        Configuration hash for this route's queryParams.
-        @property queryParams
-        @for Ember.Route
-        @type Hash
-        */
-        queryParams: {};
-
-        /**
-        Refresh the model on this route and any child routes, firing the
-        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
-        to how routes are entered when transitioning in from other route.
-        The current route params (e.g. `article_id`) will be passed in
-        to the respective model hooks, and if a different model is returned,
-        `setupController` and associated route hooks will re-fire as well.
-        An example usage of this method is re-querying the server for the
-        latest information using the same parameters as when the route
-        was first entered.
-        Note that this will cause `model` hooks to fire even on routes
-        that were provided a model object when the route was initially
-        entered.
-        @method refresh
-        @return {Transition} the transition object associated with this
-            attempted transition
-        @since 1.4.0
-        */
-        redirect(): EmberStates.Transition;
-
-        /**
-        Refresh the model on this route and any child routes, firing the
-        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
-        to how routes are entered when transitioning in from other route.
-        The current route params (e.g. `article_id`) will be passed in
-        to the respective model hooks, and if a different model is returned,
-        `setupController` and associated route hooks will re-fire as well.
-        An example usage of this method is re-querying the server for the
-        latest information using the same parameters as when the route
-        was first entered.
-        Note that this will cause `model` hooks to fire even on routes
-        that were provided a model object when the route was initially
-        entered.
-        @method refresh
-        @return {Transition} the transition object associated with this
-            attempted transition
-        @since 1.4.0
-        */
-        refresh(): EmberStates.Transition;
-
-        /**
-        `render` is used to render a template into a region of another template
-        (indicated by an `{{outlet}}`). `render` is used both during the entry
-        phase of routing (via the `renderTemplate` hook) and later in response to
-        user interaction.
-
-        @method render
-        @param {String} name the name of the template to render
-        @param {Object} [options] the options
-        @param {String} [options.into] the template to render into,
-                        referenced by name. Defaults to the parent template
-        @param {String} [options.outlet] the outlet inside `options.template` to render into.
-                        Defaults to 'main'
-        @param {String|Object} [options.controller] the controller to use for this template,
-                        referenced by name or as a controller instance. Defaults to the Route's paired controller
-        @param {Object} [options.model] the model object to set on `options.controller`.
-                        Defaults to the return value of the Route's model hook
-        */
-        render(name: string, options?: RenderOptions): void;
-
-        /**
-        A hook you can use to render the template for the current route.
-        This method is called with the controller for the current route and the
-        model supplied by the `model` hook. By default, it renders the route's
-        template, configured with the controller for the route.
-        This method can be overridden to set up and render additional or
-        alternative templates.
-
-        @method renderTemplate
-        @param {Object} controller the route's controller
-        @param {Object} model the route's model
-        */
-        renderTemplate(controller: Controller, model: {}): void;
-
-        /**
-        Transition into another route while replacing the current URL, if possible.
-        This will replace the current history entry instead of adding a new one.
-        Beside that, it is identical to `transitionTo` in all other respects. See
-        'transitionTo' for additional information regarding multiple models.
-
-        @method replaceWith
-        @param {String} name the name of the route or a URL
-        @param {...Object} models the model(s) or identifier(s) to be used while
-            transitioning to the route.
-        @return {Transition} the transition object associated with this
-            attempted transition
-        */
-        replaceWith(name: string, ...models: any[]): void;
-
-        /**
-        A hook you can use to reset controller values either when the model
-        changes or the route is exiting.
-
-        @method resetController
-        @param {Controller} controller instance
-        @param {Boolean} isExiting
-        @param {Object} transition
-        @since 1.7.0
-        */
-        resetController(controller: Ember.Controller, isExiting: boolean, transition: any): void;
-
-        /**
-        A hook you can implement to convert the route's model into parameters
-        for the URL.
-
-        The default `serialize` method will insert the model's `id` into the
-        route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
-        If the route has multiple dynamic segments or does not contain '_id', `serialize`
-        will return `Ember.getProperties(model, params)`
-        This method is called when `transitionTo` is called with a context
-        in order to populate the URL.
-        @method serialize
-        @param {Object} model the route's model
-        @param {Array} params an Array of parameter names for the current
-            route (in the example, `['post_id']`.
-        @return {Object} the serialized parameters
-        */
-        serialize(model: {}, params: string[]): string;
-
-        /**
-        Serializes value of the query parameter based on defaultValueType
-        @method serializeQueryParam
-        @param {Object} value
-        @param {String} urlKey
-        @param {String} defaultValueType
-        */
-        serializeQueryParam(value: any, urlKey: string, defaultValueType: string): string;
-
-        /**
-        Serializes the query parameter key
-        @method serializeQueryParamKey
-        @param {String} controllerPropertyName
-        */
-        serializeQueryParamKey(controllerPropertyName: string): string;
-
-        /**
-        A hook you can use to setup the controller for the current route.
-        This method is called with the controller for the current route and the
-        model supplied by the `model` hook.
-        By default, the `setupController` hook sets the `model` property of
-        the controller to the `model`.
-        If you implement the `setupController` hook in your Route, it will
-        prevent this default behavior. If you want to preserve that behavior
-        when implementing your `setupController` function, make sure to call
-        `_super`
-        @method setupController
-        @param {Controller} controller instance
-        @param {Object} model
-        */
-        setupController(controller: Controller, model: {}): void;
-
-        /**
-        Store property provides a hook for data persistence libraries to inject themselves.
-        By default, this store property provides the exact same functionality previously
-        in the model hook.
-        Currently, the required interface is:
-        `store.find(modelName, findArguments)`
-        @method store
-        @param {Object} store
-        */
-        store(store: any): any;
-
-        /**
-        The name of the template to use by default when rendering this routes
-        template.
-        This is similar with `viewName`, but is useful when you just want a custom
-        template without a view.
-
-        @property templateName
-        @type String
-        @default null
-        @since 1.4.0
-        */
-        templateName: string;
-
-        /**
-        Transition the application into another route. The route may
-        be either a single route or route path
-
-        @method transitionTo
-        @param {String} name the name of the route or a URL
-        @param {...Object} models the model(s) or identifier(s) to be used while
-        transitioning to the route.
-        @param {Object} [options] optional hash with a queryParams property
-        containing a mapping of query parameters
-        @return {Transition} the transition object associated with this
-        attempted transition
-        */
-        transitionTo(name: string, ...object: any[]): EmberStates.Transition;
-
-        /**
-        The name of the view to use by default when rendering this routes template.
-        When rendering a template, the route will, by default, determine the
-        template and view to use from the name of the route itself. If you need to
-        define a specific view, set this property.
-        This is useful when multiple routes would benefit from using the same view
-        because it doesn't require a custom `renderTemplate` method.
-        @property viewName
-        @type String
-        @default null
-        @since 1.4.0
-        */
-        viewName: string;
-
-        // ActionHandlerMixin methods
-
-        /**
-        Sends an action to the router, which will delegate it to the currently
-        active route hierarchy per the bubbling rules explained under actions
-
-        @method send
-        @param {String} actionName The action to trigger
-        @param {*} context a context to send with the action
-        */
-        send(name: string, ...args: any[]): void;
-
-        /**
-        The collection of functions, keyed by name, available on this
-        `ActionHandler` as action targets.
-        These functions will be invoked when a matching `{{action}}` is triggered
-        from within a template and the application's current route is this route.
-        Actions can also be invoked from other parts of your application
-        via `ActionHandler#send`.
-        The `actions` hash will inherit action handlers from
-        the `actions` hash defined on extended parent classes
-        or mixins rather than just replace the entire hash.
-
-        Within a Controller, Route, View or Component's action handler,
-        the value of the `this` context is the Controller, Route, View or
-        Component object:
-
-        It is also possible to call `this._super.apply(this, arguments)` from within an
-        action handler if it overrides a handler defined on a parent
-        class or mixin.
-
-        ## Bubbling
-        By default, an action will stop bubbling once a handler defined
-        on the `actions` hash handles it. To continue bubbling the action,
-        you must return `true` from the handler
-
-        @property actions
-        @type Hash
-        @default null
-        */
-        actions: ActionsHash;
-
-        // Evented methods
-
-        /**
-        Subscribes to a named event with given function.
-
-        An optional target can be passed in as the 2nd argument that will
-        be set as the "this" for the callback. This is a good way to give your
-        function access to the object triggering the event. When the target
-        parameter is used the callback becomes the third argument.
-
-        @method on
-        @param {String} name The name of the event
-        @param {Object} [target] The "this" binding for the callback
-        @param {Function} method The callback to execute
-        @return this
-        */
-        on(name: string, target: any, method: Function): Evented;
-
-        /**
-        Subscribes a function to a named event and then cancels the subscription
-        after the first time the event is triggered. It is good to use ``one`` when
-        you only care about the first time an event has taken place.
-        This function takes an optional 2nd argument that will become the "this"
-        value for the callback. If this argument is passed then the 3rd argument
-        becomes the function.
-
-        @method one
-        @param {String} name The name of the event
-        @param {Object} [target] The "this" binding for the callback
-        @param {Function} method The callback to execute
-        @return this
-        */
-        one(name: string, target: any, method: Function): Evented;
-
-        /**
-        Triggers a named event for the object. Any additional arguments
-        will be passed as parameters to the functions that are subscribed to the
-        event.
-
-        @method trigger
-        @param {String} name The name of the event
-        @param {Object...} args Optional arguments to pass on
-        */
-        trigger(name: string, ...args: string[]): void;
-
-        /**
-        Cancels subscription for given name, target, and method.
-
-        @method off
-        @param {String} name The name of the event
-        @param {Object} target The target of the subscription
-        @param {Function} method The function of the subscription
-        @return this
-        */
-        off(name: string, target: any, method: Function): Evented;
-
-        /**
-        Checks to see if object has any subscriptions for named event.
-
-        @method has
-        @param {String} name The name of the event
-        @return {Boolean} does the object have a subscription for event
-        */
-        has(name: string): boolean;
-    }
-
-    class Router extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        map(callback: Function): Router;
-    }
-    class RouterDSL {
-        resource(name: string, options?: {}, callback?: Function): void;
-        resource(name: string, callback: Function): void;
-        route(name: string, options?: {}): void;
-        explicitIndex: boolean;
-        router: Router;
-        options: any;
-    }
-    class Service extends CoreObject implements Observable {
-        /* Observable */
-        addObserver: ModifyObserver;
-        beginPropertyChanges(): Observable;
-        cacheFor(keyName: string): any;
-        decrementProperty(keyName: string, decrement?: number): number;
-        endPropertyChanges(): Observable;
-        get(keyName: string): any;
-        getProperties(...args: string[]): {};
-        getProperties(keys: string[]): {};
-        getWithDefault(keyName: string, defaultValue: any): any;
-        hasObserverFor(key: string): boolean;
-        incrementProperty(keyName: string, increment?: number): number;
-        notifyPropertyChange(keyName: string): Observable;
-        propertyDidChange(keyName: string): Observable;
-        propertyWillChange(keyName: string): Observable;
-        removeObserver(key: string, target: {}, method: Function | string): void;
-        set(keyName: string, value: any): Observable;
-        setProperties(hash: {}): Observable;
-        toggleProperty(keyName: string): boolean;
-        /* /Observable */
-    }
-    const STRINGS: boolean;
-    class State extends Object implements Evented {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        has(name: string): boolean;
-        off(name: string, target: any, method: Function): State;
-        on(name: string, target: any, method: Function): State;
-        one(name: string, target: any, method: Function): State;
-        trigger(name: string, ...args: string[]): void;
-        getPathsCache(stateManager: {}, path: string): {};
-        init(): void;
-        setPathsCache(stateManager: {}, path: string, transitions: any): void;
-        static transitionTo(target: string): void;
-        hasContext: boolean;
-        isLeaf: boolean;
-        name: string;
-        parentState: State;
-        path: string;
-        enter: Function;
-        exit: Function;
-        setup: Function;
-    }
-    class StateManager extends State {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        contextFreeTransition(currentState: State, path: string): TransitionsHash;
-        enterState(transition: TransitionsHash): void;
-        getState(name: string): State;
-        getStateByPath(root: State, path: string): State;
-        getStateMeta(state: State, key: string): any;
-        getStatesInPath(root: State, path: string): State[];
-        goToState(path: string, context: any): void;
-        send(event: string): void;
-        setStateMeta(state: State, key: string, value: any): any;
-        stateMetaFor(state: State): {};
-        transitionTo(path: string, context: any): void;
-        triggerSetupContext(transitions: TransitionsHash): void;
-        unhandledEvent(manager: StateManager, event: string): any;
-        currentPath: string;
-        currentState: State;
-        errorOnUnhandledEvents: boolean;
-        transitionEvent: string;
-    }
-    namespace String {
-        function camelize(str: string): string;
-        function capitalize(str: string): string;
-        function classify(str: string): string;
-        function dasherize(str: string): string;
-        function decamelize(str: string): string;
-        function fmt(...args: string[]): string;
-        function htmlSafe(str: string): void; // TODO: @returns Handlebars.SafeStringStatic;
-        function loc(...args: string[]): string;
-        function underscore(str: string): string;
-        function w(str: string): string[];
-    }
-    const TEMPLATES: {};
-    class TargetActionSupport {
-        triggerAction(opts: {}): boolean;
-    }
-    namespace Test {
-        class Adapter extends Ember.Object {
-            constructor();
+        interface _RegistryProxyMixin {
+            /**
+             * Given a fullName return the corresponding factory.
+             */
+            resolveRegistration(fullName: string): Function;
+            /**
+             * Registers a factory that can be used for dependency injection (with
+             * `inject`) or for service lookup. Each factory is registered with
+             * a full name including two parts: `type:name`.
+             */
+            register(fullName: string, factory: Function, options: {}): any;
+            /**
+             * Unregister a factory.
+             */
+            unregister(fullName: string): any;
+            /**
+             * Check if a factory is registered.
+             */
+            hasRegistration(fullName: string): boolean;
+            /**
+             * Register an option for a particular factory.
+             */
+            registerOption(fullName: string, optionName: string, options: {}): any;
+            /**
+             * Return a specific registered option for a particular factory.
+             */
+            registeredOption(fullName: string, optionName: string): {};
+            /**
+             * Register options for a particular factory.
+             */
+            registerOptions(fullName: string, options: {}): any;
+            /**
+             * Return registered options for a particular factory.
+             */
+            registeredOptions(fullName: string): {};
+            /**
+             * Allow registering options for all factories of a type.
+             */
+            registerOptionsForType(type: string, options: {}): any;
+            /**
+             * Return the registered options for all factories of a type.
+             */
+            registeredOptionsForType(type: string): {};
+            /**
+             * Define a dependency injection onto a specific factory or all factories
+             * of a type.
+             */
+            inject(factoryNameOrType: string, property: string, injectionName: string): any;
         }
-        class Promise<T, U> extends Rsvp.Promise<T, U> {
-            constructor();
+        const _RegistryProxyMixin: Mixin<_RegistryProxyMixin>;
+        /**
+         Ember.ActionHandler is available on some familiar classes including Ember.Route,
+        Ember.Component, and Ember.Controller. (Internally the mixin is used by Ember.CoreView,
+        Ember.ControllerMixin, and Ember.Route and available to the above classes through inheritance.)
+        **/
+        interface ActionHandler {
+            /**
+             Triggers a named action on the ActionHandler. Any parameters supplied after the actionName
+            string will be passed as arguments to the action target function.
+
+            If the ActionHandler has its target property set, actions may bubble to the target.
+            Bubbling happens when an actionName can not be found in the ActionHandler's actions
+            hash or if the action target function returns true.
+            **/
+            send(actionName: string, ...args: any[]): void;
+            /**
+             The collection of functions, keyed by name, available on this ActionHandler as action targets.
+            **/
+            actions: ActionsHash;
         }
-        function oninjectHelpers(callback: Function): void;
-        function promise<T, U>(resolver: (a: T) => any, label: string): Ember.Test.Promise<T, U>;
-        function unregisterHelper(name: string): void;
-        function registerHelper(name: string, helperMethod: Function): void;
-        function registerAsyncHelper(name: string, helperMethod: Function): void;
-
-        const adapter: Object;
-        const QUnitAdapter: Object;
-
-        function registerWaiter(callback: Function): void;
-        function registerWaiter(context: any, callback: Function): void;
-        function unregisterWaiter(callback: Function): void;
-        function unregisterWaiter(context: any, callback: Function): void;
-
-        function resolve<T>(result: T): Ember.Test.Promise<T, void>;
-    }
-    class TextArea extends Component implements TextSupport {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
+        const ActionHandler: Ember.Mixin<ActionHandler>;
         /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
+        An instance of Ember.Application is the starting point for every Ember application. It helps to
+        instantiate, initialize and coordinate the many objects that make up your app.
         **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
+        class Application extends Namespace {
+            /**
+            Call advanceReadiness after any asynchronous setup logic has completed.
+            Each call to deferReadiness must be matched by a call to advanceReadiness
+            or the application will never become ready and routing will not begin.
+            **/
+            advanceReadiness(): void;
+            /**
+            Use this to defer readiness until some condition is true.
+
+            This allows you to perform asynchronous setup logic and defer
+            booting your application until the setup has finished.
+
+            However, if the setup requires a loading UI, it might be better
+            to use the router for this purpose.
+            */
+            deferReadiness(): void;
+            /**
+            defines an injection or typeInjection
+            **/
+            inject(factoryNameOrType: string, property: string, injectionName: string): void;
+            /**
+            This injects the test helpers into the window's scope. If a function of the
+            same name has already been defined it will be cached (so that it can be reset
+            if the helper is removed with `unregisterHelper` or `removeTestHelpers`).
+            Any callbacks registered with `onInjectHelpers` will be called once the
+            helpers have been injected.
+            **/
+            injectTestHelpers(): void;
+            /**
+            registers a factory for later injection
+            @param fullName type:name (e.g., 'model:user')
+            @param factory (e.g., App.Person)
+            **/
+            register(fullName: string, factory: Function, options?: {}): void;
+            /**
+            This removes all helpers that have been registered, and resets and functions
+            that were overridden by the helpers.
+            **/
+            removeTestHelpers(): void;
+            /**
+            Reset the application. This is typically used only in tests.
+            **/
+            reset(): void;
+            /**
+            This hook defers the readiness of the application, so that you can start
+            the app when your tests are ready to run. It also sets the router's
+            location to 'none', so that the window's location will not be modified
+            (preventing both accidental leaking of state between tests and interference
+            with your testing framework).
+            **/
+            setupForTesting(): void;
+            /**
+            The DOM events for which the event dispatcher should listen.
+            */
+            customEvents: EventDispatcherEvents;
+            /**
+            The Ember.EventDispatcher responsible for delegating events to this application's views.
+            **/
+            eventDispatcher: EventDispatcher;
+            /**
+            Set this to provide an alternate class to Ember.DefaultResolver
+            **/
+            resolver: DefaultResolver;
+            /**
+            The root DOM element of the Application. This can be specified as an
+            element or a jQuery-compatible selector string.
+
+            This is the element that will be passed to the Application's, eventDispatcher,
+            which sets up the listeners for event delegation. Every view in your application
+            should be a child of the element you specify here.
+            **/
+            rootElement: HTMLElement | string;
+            /**
+            Called when the Application has become ready.
+            The call will be delayed until the DOM has become ready.
+            **/
+            ready: Function;
+            /**
+            Application's router.
+            **/
+            Router: Router;
+            registry: Registry;
+        }
         /**
-        Returns the original hash that was passed to meta().
-        @param key property name
+        The `ApplicationInstance` encapsulates all of the stateful aspects of a
+        running `Application`.
         **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        cancel(event: Function): void;
-        focusIn(event: Function): void;
-        focusOut(event: Function): void;
-        insertNewLine(event: Function): void;
-        keyPress(event: Function): void;
-        action: string;
-        bubbles: boolean;
-        onEvent: string;
-    }
-    class TextField extends Component implements TextSupport {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
+        class ApplicationInstance extends EngineInstance {}
         /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
+        This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
+        Array class as well as other controllers, etc. that want to appear to be arrays.
         **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
+        interface Array<T> extends Enumerable<T> {
+            /**
+             * __Required.__ You must implement this method to apply this mixin.
+             */
+            length: number | ComputedProperty<number>;
+            /**
+             * Returns the object at the given `index`. If the given `index` is negative
+             * or is greater or equal than the array length, returns `undefined`.
+             */
+            objectAt(idx: number): T | undefined;
+            /**
+             * This returns the objects at the specified indexes, using `objectAt`.
+             */
+            objectsAt(indexes: number[]): Ember.Array<T>;
+            /**
+             * Returns a new array that is a slice of the receiver. This implementation
+             * uses the observable array methods to retrieve the objects for the new
+             * slice.
+             */
+            slice(beginIndex?: number, endIndex?: number): T[];
+            /**
+             * Returns the index of the given object's first occurrence.
+             * If no `startAt` argument is given, the starting location to
+             * search is 0. If it's negative, will count backward from
+             * the end of the array. Returns -1 if no match is found.
+             */
+            indexOf(searchElement: T, fromIndex?: number): number;
+            /**
+             * Returns the index of the given object's last occurrence.
+             * If no `startAt` argument is given, the search starts from
+             * the last position. If it's negative, will count backward
+             * from the end of the array. Returns -1 if no match is found.
+             */
+            lastIndexOf(searchElement: T, fromIndex?: number): number;
+            /**
+             * Adds an array observer to the receiving array. The array observer object
+             * normally must implement two methods:
+             */
+            addArrayObserver(target: {}, opts: {}): this;
+            /**
+             * Removes an array observer from the object if the observer is current
+             * registered. Calling this method multiple times with the same object will
+             * have no effect.
+             */
+            removeArrayObserver(target: {}, opts: {}): this;
+            /**
+             * Becomes true whenever the array currently has observers watching changes
+             * on the array.
+             */
+            hasArrayObservers: ComputedProperty<boolean>;
+            /**
+             * If you are implementing an object that supports `Ember.Array`, call this
+             * method just before the array content changes to notify any observers and
+             * invalidate any related properties. Pass the starting index of the change
+             * as well as a delta of the amounts to change.
+             */
+            arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): this;
+            /**
+             * If you are implementing an object that supports `Ember.Array`, call this
+             * method just after the array content changes to notify any observers and
+             * invalidate any related properties. Pass the starting index of the change
+             * as well as a delta of the amounts to change.
+             */
+            arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): this;
+            /**
+             * Returns a special object that can be used to observe individual properties
+             * on the array. Just get an equivalent property on this object and it will
+             * return an enumerable that maps automatically to the named key on the
+             * member objects.
+             */
+            '@each': ComputedProperty<T>;
+        }
+        // Ember.Array rather than Array because the `array-type` lint rule doesn't realize the global is shadowed
+        const Array: Mixin<Ember.Array<any>>;
+
         /**
-        Returns the original hash that was passed to meta().
-        @param key property name
+        An ArrayProxy wraps any other object that implements Ember.Array and/or Ember.MutableArray,
+        forwarding all requests. This makes it very useful for a number of binding use cases or other cases
+        where being able to swap out the underlying array is useful.
         **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        cancel(event: Function): void;
-        focusIn(event: Function): void;
-        focusOut(event: Function): void;
-        insertNewLine(event: Function): void;
-        keyPress(event: Function): void;
-        action: string;
-        bubbles: boolean;
-        onEvent: string;
-        pattern: string;
-        size: string;
-        type: string;
-        value: string;
+        interface ArrayProxy<T> extends MutableArray<T> {}
+        class ArrayProxy<T> extends Object.extend(MutableArray as {}) {
+            content: NativeArray<T>;
+
+            /**
+             * Should actually retrieve the object at the specified index from the
+             * content. You can override this method in subclasses to transform the
+             * content item to something new.
+             */
+            objectAtContent(idx: number): T | undefined;
+        }
+        /**
+        AutoLocation will select the best location option based off browser support with the priority order: history, hash, none.
+        **/
+        class AutoLocation extends Object {}
+        /**
+         * Connects the properties of two objects so that whenever the value of one property changes,
+         * the other property will be changed also.
+         *
+         * @deprecated https://emberjs.com/deprecations/v2.x#toc_ember-binding
+         **/
+        class Binding {
+            constructor(toPath: string, fromPath: string);
+            connect(obj: any): Binding;
+            copy(): Binding;
+            disconnect(): Binding;
+            from(path: string): Binding;
+            to(path: string | string[]): Binding;
+            toString(): string;
+        }
+        /**
+        The internal class used to create text inputs when the {{input}} helper is used
+        with type of checkbox. See Handlebars.helpers.input for usage details.
+        **/
+        class Checkbox extends Component {}
+        /**
+         * Implements some standard methods for comparing objects. Add this mixin to
+         * any class you create that can compare its instances.
+         */
+        interface Comparable {
+            compare(a: any, b: any): number;
+        }
+        const Comparable: Mixin<Comparable>;
+        /**
+        A view that is completely isolated. Property access in its templates go to the view object
+        and actions are targeted at the view object. There is no access to the surrounding context or
+        outer controller; all contextual information is passed in.
+        **/
+        class Component extends CoreView.extend(ViewMixin, ActionSupport, ClassNamesSupport) {
+            // methods
+            readDOMAttr(name: string): string;
+            // properties
+            /**
+             * The WAI-ARIA role of the control represented by this view. For example, a button may have a
+             * role of type 'button', or a pane may have a role of type 'alertdialog'. This property is
+             * used by assistive software to help visually challenged users navigate rich web applications.
+             */
+            ariaRole: string;
+            /**
+             * The HTML id of the component's element in the DOM. You can provide this value yourself but
+             * it must be unique (just as in HTML):
+             *
+             * If not manually set a default value will be provided by the framework. Once rendered an
+             * element's elementId is considered immutable and you should never change it. If you need
+             * to compute a dynamic value for the elementId, you should do this when the component or
+             * element is being instantiated:
+             */
+            elementId: string;
+            /**
+             * If false, the view will appear hidden in DOM.
+             */
+            isVisible: boolean;
+            /**
+             * A component may contain a layout. A layout is a regular template but supersedes the template
+             * property during rendering. It is the responsibility of the layout template to retrieve the
+             * template property from the component (or alternatively, call Handlebars.helpers.yield,
+             * {{yield}}) to render it in the correct location. This is useful for a component that has a
+             * shared wrapper, but which delegates the rendering of the contents of the wrapper to the
+             * template property on a subclass.
+             */
+            layout: TemplateFactory | string;
+            /**
+             * Enables components to take a list of parameters as arguments.
+             */
+            static positionalParams: string[] | string;
+            // events
+            /**
+             * Called when the attributes passed into the component have been updated. Called both during the
+             * initial render of a container and during a rerender. Can be used in place of an observer; code
+             * placed here will be executed every time any attribute updates.
+             */
+            didReceiveAttrs(): void;
+            /**
+             * Called after a component has been rendered, both on initial render and in subsequent rerenders.
+             */
+            didRender(): void;
+            /**
+             * Called when the component has updated and rerendered itself. Called only during a rerender,
+             * not during an initial render.
+             */
+            didUpdate(): void;
+            /**
+             * Called when the attributes passed into the component have been changed. Called only during a
+             * rerender, not during an initial render.
+             */
+            didUpdateAttrs(): void;
+            /**
+             * Called before a component has been rendered, both on initial render and in subsequent rerenders.
+             */
+            willRender(): void;
+            /**
+             * Called when the component is about to update and rerender itself. Called only during a rerender,
+             * not during an initial render.
+             */
+            willUpdate(): void;
+        }
+        /**
+        A computed property transforms an objects function into a property.
+        By default the function backing the computed property will only be called once and the result
+        will be cached. You can specify various properties that your computed property is dependent on.
+        This will force the cached result to be recomputed if the dependencies are modified.
+        **/
+        class ComputedProperty<T> {
+            /**
+             * Call on a computed property to set it into non-cached mode. When in this
+             * mode the computed property will not automatically cache the return value.
+             */
+            volatile(): this;
+            /**
+             * Call on a computed property to set it into read-only mode. When in this
+             * mode the computed property will throw an error when set.
+             */
+            readOnly(): this;
+            /**
+             * Sets the dependent keys on this computed property. Pass any number of
+             * arguments containing key paths that this computed property depends on.
+             */
+            property(...path: string[]): this;
+            /**
+             * In some cases, you may want to annotate computed properties with additional
+             * metadata about how they function or what values they operate on. For example,
+             * computed property functions may close over variables that are then no longer
+             * available for introspection.
+             */
+            meta(meta: {}): this;
+            meta(): {};
+        }
+        /**
+         * A container used to instantiate and cache objects.
+         */
+        class Container {
+            /**
+             * Given a fullName, return the corresponding factory. The consumer of the factory
+             * is responsible for the destruction of any factory instances, as there is no
+             * way for the container to ensure instances are destroyed when it itself is
+             * destroyed.
+             */
+            factoryFor(fullName: string, options?: {}): any;
+        }
+        /**
+        The ContainerDebugAdapter helps the container and resolver interface
+        with tools that debug Ember such as the Ember Inspector for Chrome and Firefox.
+        **/
+        class ContainerDebugAdapter extends Object {
+            resolver: Resolver;
+            canCatalogEntriesByType(type: string): boolean;
+            catalogEntriesByType(type: string): any[];
+        }
+        /**
+         * Additional methods for the Controller.
+         */
+        interface ControllerMixin extends ActionHandler {
+            replaceRoute(name: string, ...args: any[]): void;
+            transitionToRoute(name: string, ...args: any[]): void;
+            model: any;
+            queryParams: string[] | Array<{ [key: string]: { type: string } }>;
+            target: Object;
+        }
+        const ControllerMixin: Ember.Mixin<ControllerMixin>;
+        class Controller extends Object.extend(ControllerMixin) {}
+        /**
+         * Implements some standard methods for copying an object. Add this mixin to
+         * any object you create that can create a copy of itself. This mixin is
+         * added automatically to the built-in array.
+         */
+        interface Copyable {
+            /**
+             * __Required.__ You must implement this method to apply this mixin.
+             */
+            copy(deep: boolean): Copyable;
+            /**
+             * If the object implements `Ember.Freezable`, then this will return a new
+             * copy if the object is not frozen and the receiver if the object is frozen.
+             */
+            frozenCopy(): Copyable;
+        }
+        const Copyable: Ember.Mixin<Copyable>;
+        class CoreObject {
+            _super(...args: any[]): any;
+
+            /**
+            An overridable method called when objects are instantiated. By default,
+            does nothing unless it is overridden during class definition.
+            **/
+            init(): void;
+
+            /**
+             * Defines the properties that will be concatenated from the superclass (instead of overridden).
+             * @default null
+             */
+            concatenatedProperties: any[];
+
+            /**
+            Destroyed object property flag. If this property is true the observers and bindings were
+            already removed by the effect of calling the destroy() method.
+            @default false
+            **/
+            isDestroyed: boolean;
+            /**
+            Destruction scheduled flag. The destroy() method has been called. The object stays intact
+            until the end of the run loop at which point the isDestroyed flag is set.
+            @default false
+            **/
+            isDestroying: boolean;
+
+            /**
+            Destroys an object by setting the `isDestroyed` flag and removing its
+            metadata, which effectively destroys observers and bindings.
+            If you try to set a property on a destroyed object, an exception will be
+            raised.
+            Note that destruction is scheduled for the end of the run loop and does not
+            happen immediately.  It will set an isDestroying flag immediately.
+            @return receiver
+            */
+            destroy(): CoreObject;
+
+            /**
+            Override to implement teardown.
+            */
+            willDestroy(): void;
+
+            /**
+            Returns a string representation which attempts to provide more information than Javascript's toString
+            typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
+            @return string representation
+            **/
+            toString(): string;
+
+            static create<Instance>(this: EmberClassConstructor<Instance>): Fix<Instance>;
+
+            static create<Instance, Args, T1 extends EmberInstanceArguments<Args>>(
+                this: EmberClassConstructor<Instance & ComputedProperties<Args>>,
+                arg1: T1 & ThisType<Fix<T1 & Instance>>
+            ): Fix<Instance & T1>;
+
+            static create<
+                Instance,
+                Args,
+                T1 extends EmberInstanceArguments<Args>,
+                T2 extends EmberInstanceArguments<Args>
+            >(
+                this: EmberClassConstructor<Instance & ComputedProperties<Args>>,
+                arg1: T1 & ThisType<Fix<Instance & T1>>,
+                arg2: T2 & ThisType<Fix<Instance & T1 & T2>>
+            ): Fix<Instance & T1 & T2>;
+
+            static create<
+                Instance,
+                Args,
+                T1 extends EmberInstanceArguments<Args>,
+                T2 extends EmberInstanceArguments<Args>,
+                T3 extends EmberInstanceArguments<Args>
+            >(
+                this: EmberClassConstructor<Instance & ComputedProperties<Args>>,
+                arg1: T1 & ThisType<Fix<Instance & T1>>,
+                arg2: T2 & ThisType<Fix<Instance & T1 & T2>>,
+                arg3: T3 & ThisType<Fix<Instance & T1 & T2 & T3>>
+            ): Fix<Instance & T1 & T2 & T3>;
+
+            static extend<Statics, Instance>(
+                this: Statics & EmberClassConstructor<Instance>
+            ): Objectify<Statics> & EmberClassConstructor<Instance>;
+
+            static extend<Statics, Instance extends B1, T1 extends EmberClassArguments, B1>(
+                this: Statics & EmberClassConstructor<Instance>,
+                arg1: MixinOrLiteral<T1, B1> & ThisType<Fix<Instance & T1>>
+            ): Objectify<Statics> & EmberClassConstructor<T1 & Instance>;
+
+            static extend<
+                Statics,
+                Instance extends B1 & B2,
+                T1 extends EmberClassArguments,
+                B1,
+                T2 extends EmberClassArguments,
+                B2
+            >(
+                this: Statics & EmberClassConstructor<Instance>,
+                arg1: MixinOrLiteral<T1, B1> & ThisType<Fix<Instance & T1>>,
+                arg2: MixinOrLiteral<T2, B2> & ThisType<Fix<Instance & T1 & T2>>
+            ): Objectify<Statics> & EmberClassConstructor<T1 & T2 & Instance>;
+
+            static extend<
+                Statics,
+                Instance extends B1 & B2 & B3,
+                T1 extends EmberClassArguments,
+                B1,
+                T2 extends EmberClassArguments,
+                B2,
+                T3 extends EmberClassArguments,
+                B3
+            >(
+                this: Statics & EmberClassConstructor<Instance>,
+                arg1: MixinOrLiteral<T1, B1> & ThisType<Fix<Instance & T1>>,
+                arg2: MixinOrLiteral<T2, B2> & ThisType<Fix<Instance & T1 & T2>>,
+                arg3: MixinOrLiteral<T3, B3> & ThisType<Fix<Instance & T1 & T2 & T3>>
+            ): Objectify<Statics> & EmberClassConstructor<T1 & T2 & T3 & Instance>;
+
+            static extend<
+                Statics,
+                Instance extends B1 & B2 & B3 & B4,
+                T1 extends EmberClassArguments,
+                B1,
+                T2 extends EmberClassArguments,
+                B2,
+                T3 extends EmberClassArguments,
+                B3,
+                T4 extends EmberClassArguments,
+                B4
+            >(
+                this: Statics & EmberClassConstructor<Instance>,
+                arg1: MixinOrLiteral<T1, B1> & ThisType<Fix<Instance & T1>>,
+                arg2: MixinOrLiteral<T2, B2> & ThisType<Fix<Instance & T1 & T2>>,
+                arg3: MixinOrLiteral<T3, B3> & ThisType<Fix<Instance & T1 & T2 & T3>>,
+                arg4: MixinOrLiteral<T4, B4> & ThisType<Fix<Instance & T1 & T2 & T3 & T4>>
+            ): Objectify<Statics> & EmberClassConstructor<T1 & T2 & T3 & T4 & Instance>;
+
+            static reopen<Statics, Instance>(
+                this: Statics & EmberClassConstructor<Instance>
+            ): Objectify<Statics> & EmberClassConstructor<Instance>;
+
+            static reopen<Statics, Instance extends B1, T1 extends EmberClassArguments, B1>(
+                this: Statics & EmberClassConstructor<Instance>,
+                arg1: MixinOrLiteral<T1, B1> & ThisType<Fix<Instance & T1>>
+            ): Objectify<Statics> & EmberClassConstructor<Instance & T1>;
+
+            static reopen<
+                Statics,
+                Instance extends B1 & B2,
+                T1 extends EmberClassArguments,
+                B1,
+                T2 extends EmberClassArguments,
+                B2
+            >(
+                this: Statics & EmberClassConstructor<Instance>,
+                arg1: MixinOrLiteral<T1, B1> & ThisType<Fix<Instance & T1>>,
+                arg2: MixinOrLiteral<T2, B2> & ThisType<Fix<Instance & T1 & T2>>
+            ): Objectify<Statics> & EmberClassConstructor<Instance & T1 & T2>;
+
+            static reopen<
+                Statics,
+                Instance extends B1 & B2 & B3,
+                T1 extends EmberClassArguments,
+                B1,
+                T2 extends EmberClassArguments,
+                B2,
+                T3 extends EmberClassArguments,
+                B3
+            >(
+                this: Statics & EmberClassConstructor<Instance>,
+                arg1: MixinOrLiteral<T1, B1> & ThisType<Fix<Instance & T1>>,
+                arg2: MixinOrLiteral<T2, B2> & ThisType<Fix<Instance & T1 & T2>>,
+                arg3: MixinOrLiteral<T3, B3> & ThisType<Fix<Instance & T1 & T2 & T3>>
+            ): Objectify<Statics> & EmberClassConstructor<Instance & T1 & T2 & T3>;
+
+            static reopenClass<Statics>(this: Statics): Statics;
+
+            static reopenClass<Statics, T1 extends EmberClassArguments>(
+                this: Statics,
+                arg1: T1
+            ): Statics & T1;
+
+            static reopenClass<
+                Statics,
+                T1 extends EmberClassArguments,
+                T2 extends EmberClassArguments
+            >(this: Statics, arg1: T1, arg2: T2): Statics & T1 & T2;
+
+            static reopenClass<
+                Statics,
+                T1 extends EmberClassArguments,
+                T2 extends EmberClassArguments,
+                T3 extends EmberClassArguments
+            >(this: Statics, arg1: T1, arg2: T2, arg3: T3): Statics & T1 & T2 & T3;
+
+            static detect<Statics, Instance>(
+                this: Statics & EmberClassConstructor<Instance>,
+                obj: any
+            ): obj is Objectify<Statics> & EmberClassConstructor<Instance>;
+
+            static detectInstance<Instance>(
+                this: EmberClassConstructor<Instance>,
+                obj: any
+            ): obj is Instance;
+
+            /**
+             Iterate over each computed property for the class, passing its name and any
+            associated metadata (see metaForProperty) to the callback.
+            **/
+            static eachComputedProperty(callback: Function, binding: {}): void;
+            /**
+             Returns the original hash that was passed to meta().
+            @param key property name
+            **/
+            static metaForProperty(key: string): {};
+            static isClass: boolean;
+            static isMethod: boolean;
+        }
+        /**
+         * The `DataAdapter` helps a data persistence library
+         * interface with tools that debug Ember such as Chrome and Firefox.
+         */
+        class DataAdapter extends Object {
+            /**
+             * The container-debug-adapter which is used
+             * to list all models.
+             */
+            containerDebugAdapter: any;
+            /**
+             * Ember Data > v1.0.0-beta.18
+             * requires string model names to be passed
+             * around instead of the actual factories.
+             */
+            acceptsModelName: any;
+            /**
+             * Specifies how records can be filtered.
+             * Records returned will need to have a `filterValues`
+             * property with a key for every name in the returned array.
+             */
+            getFilters(): any[];
+            /**
+             * Fetch the model types and observe them for changes.
+             */
+            watchModelTypes(typesAdded: Function, typesUpdated: Function): Function;
+            /**
+             * Fetch the records of a given type and observe them for changes.
+             */
+            watchRecords(
+                modelName: string,
+                recordsAdded: Function,
+                recordsUpdated: Function,
+                recordsRemoved: Function
+            ): Function;
+        }
+        const Debug: {
+            /**
+             * Allows for runtime registration of handler functions that override the default deprecation behavior.
+             * Deprecations are invoked by calls to [Ember.deprecate](http://emberjs.com/api/classes/Ember.html#method_deprecate).
+             * The following example demonstrates its usage by registering a handler that throws an error if the
+             * message contains the word "should", otherwise defers to the default handler.
+             */
+            registerDeprecationHandler(handler: Function): any;
+            /**
+             * Allows for runtime registration of handler functions that override the default warning behavior.
+             * Warnings are invoked by calls made to [Ember.warn](http://emberjs.com/api/classes/Ember.html#method_warn).
+             * The following example demonstrates its usage by registering a handler that does nothing overriding Ember's
+             * default warning behavior.
+             */
+            registerWarnHandler(handler: Function): any;
+        };
+        /**
+         * The DefaultResolver defines the default lookup rules to resolve
+         * container lookups before consulting the container for registered
+         * items:
+         */
+        class DefaultResolver extends Resolver {
+            /**
+             * This method is called via the container's resolver method.
+             * It parses the provided `fullName` and then looks up and
+             * returns the appropriate template or class.
+             */
+            resolve(fullName: string): {};
+            /**
+             * This will be set to the Application instance when it is
+             * created.
+             */
+            namespace: Application;
+        }
+        /**
+         * The `Engine` class contains core functionality for both applications and
+         * engines.
+         */
+        class Engine extends Namespace {
+            /**
+             * The goal of initializers should be to register dependencies and injections.
+             * This phase runs once. Because these initializers may load code, they are
+             * allowed to defer application readiness and advance it. If you need to access
+             * the container or store you should use an InstanceInitializer that will be run
+             * after all initializers and therefore after all code is loaded and the app is
+             * ready.
+             */
+            initializer(initializer: {}): any;
+            /**
+             * Instance initializers run after all initializers have run. Because
+             * instance initializers run after the app is fully set up. We have access
+             * to the store, container, and other items. However, these initializers run
+             * after code has loaded and are not allowed to defer readiness.
+             */
+            instanceInitializer(instanceInitializer: any): any;
+            /**
+             * Set this to provide an alternate class to `Ember.DefaultResolver`
+             */
+            resolver: Resolver;
+        }
+        /**
+         * The `EngineInstance` encapsulates all of the stateful aspects of a
+         * running `Engine`.
+         */
+        class EngineInstance extends Ember.Object.extend(
+            _RegistryProxyMixin,
+            _ContainerProxyMixin
+        ) {
+            /**
+             * Unregister a factory.
+             */
+            unregister(fullName: string): any;
+        }
+        /**
+         * This mixin defines the common interface implemented by enumerable objects
+         * in Ember. Most of these methods follow the standard Array iteration
+         * API defined up to JavaScript 1.8 (excluding language-specific features that
+         * cannot be emulated in older versions of JavaScript).
+         */
+        interface Enumerable<T> {
+            /**
+             * Helper method returns the first object from a collection. This is usually
+             * used by bindings and other parts of the framework to extract a single
+             * object if the enumerable contains only one item.
+             */
+            firstObject: ComputedProperty<T | undefined>;
+            /**
+             * Helper method returns the last object from a collection. If your enumerable
+             * contains only one object, this method should always return that object.
+             * If your enumerable is empty, this method should return `undefined`.
+             */
+            lastObject: ComputedProperty<T | undefined>;
+            /**
+             * @deprecated Use `Enumerable#includes` instead.
+             */
+            contains(obj: T): boolean;
+            /**
+             * Iterates through the enumerable, calling the passed function on each
+             * item. This method corresponds to the `forEach()` method defined in
+             * JavaScript 1.6.
+             */
+            forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
+            /**
+             * Alias for `mapBy`
+             */
+            getEach(key: string): any[];
+            /**
+             * Sets the value on the named property for each member. This is more
+             * ergonomic than using other methods defined on this helper. If the object
+             * implements Ember.Observable, the value will be changed to `set(),` otherwise
+             * it will be set directly. `null` objects are skipped.
+             */
+            setEach(key: string, value: any): any;
+            /**
+             * Maps all of the items in the enumeration to another value, returning
+             * a new array. This method corresponds to `map()` defined in JavaScript 1.6.
+             */
+            map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
+            /**
+             * Similar to map, this specialized function returns the value of the named
+             * property on all items in the enumeration.
+             */
+            mapBy(key: string): any[];
+            /**
+             * Returns an array with all of the items in the enumeration that the passed
+             * function returns true for. This method corresponds to `filter()` defined in
+             * JavaScript 1.6.
+             */
+            filter<S extends T>(
+                callbackfn: (value: T, index: number, array: T[]) => value is S,
+                thisArg?: any
+            ): S[];
+            filter(callbackfn: (value: T, index: number, array: T[]) => any, thisArg?: any): NativeArray<T>;
+            /**
+             * Returns an array with all of the items in the enumeration where the passed
+             * function returns false. This method is the inverse of filter().
+             */
+            reject(callbackfn: (value: T, index: number, array: T[]) => any, thisArg?: any): NativeArray<T>;
+            /**
+             * Returns an array with just the items with the matched property. You
+             * can pass an optional second argument with the target value. Otherwise
+             * this will match any property that evaluates to `true`.
+             */
+            filterBy(key: string, value?: any): NativeArray<T>;
+            /**
+             * Returns an array with the items that do not have truthy values for
+             * key.  You can pass an optional second argument with the target value.  Otherwise
+             * this will match any property that evaluates to false.
+             */
+            rejectBy(key: string, value?: string): NativeArray<T>;
+            /**
+             * Returns the first item in the array for which the callback returns true.
+             * This method works similar to the `filter()` method defined in JavaScript 1.6
+             * except that it will stop working on the array once a match is found.
+             */
+            find(
+                predicate: (value: T, index: number, obj: T[]) => boolean,
+                thisArg?: any
+            ): T | undefined;
+            /**
+             * Returns the first item with a property matching the passed value. You
+             * can pass an optional second argument with the target value. Otherwise
+             * this will match any property that evaluates to `true`.
+             */
+            findBy(key: string, value?: any): T | undefined;
+            /**
+             * Returns `true` if the passed function returns true for every item in the
+             * enumeration. This corresponds with the `every()` method in JavaScript 1.6.
+             */
+            every(
+                callbackfn: (value: T, index: number, array: T[]) => boolean,
+                thisArg?: any
+            ): boolean;
+            /**
+             * Returns `true` if the passed property resolves to the value of the second
+             * argument for all items in the enumerable. This method is often simpler/faster
+             * than using a callback.
+             */
+            isEvery(key: string, value: boolean): boolean;
+            /**
+             * Returns `true` if the passed function returns true for any item in the
+             * enumeration.
+             */
+            any(callback: (value: T, index: number, array: T[]) => boolean, target?: {}): boolean;
+            /**
+             * Returns `true` if the passed property resolves to the value of the second
+             * argument for any item in the enumerable. This method is often simpler/faster
+             * than using a callback.
+             */
+            isAny(key: string, value?: boolean): boolean;
+            /**
+             * This will combine the values of the enumerator into a single value. It
+             * is a useful way to collect a summary value from an enumeration. This
+             * corresponds to the `reduce()` method defined in JavaScript 1.8.
+             */
+            reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
+            reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+            /**
+             * Invokes the named method on every object in the receiver that
+             * implements it. This method corresponds to the implementation in
+             * Prototype 1.6.
+             */
+            invoke(methodName: keyof T, ...args: any[]): any[];
+            /**
+             * Simply converts the enumerable into a genuine array. The order is not
+             * guaranteed. Corresponds to the method implemented by Prototype.
+             */
+            toArray(): T[];
+            /**
+             * Returns a copy of the array with all `null` and `undefined` elements removed.
+             */
+            compact(): NativeArray<T>;
+            /**
+             * Returns a new enumerable that excludes the passed value. The default
+             * implementation returns an array regardless of the receiver type.
+             * If the receiver does not contain the value it returns the original enumerable.
+             */
+            without(value: T): NativeArray<T>;
+            /**
+             * Returns a new enumerable that contains only unique values. The default
+             * implementation returns an array regardless of the receiver type.
+             */
+            uniq(): NativeArray<T>;
+            /**
+             * Converts the enumerable into an array and sorts by the keys
+             * specified in the argument.
+             */
+            sortBy(property: string): NativeArray<T>;
+            /**
+             * Returns a new enumerable that contains only items containing a unique property value.
+             * The default implementation returns an array regardless of the receiver type.
+             */
+            uniqBy(): NativeArray<T>;
+            /**
+             * Returns `true` if the passed object can be found in the enumerable.
+             */
+            includes(searchElement: T, fromIndex?: number): boolean;
+            /**
+             * This is the handler for the special array content property. If you get
+             * this property, it will return this. If you set this property to a new
+             * array, it will replace the current content.
+             */
+            '[]': ComputedProperty<this>;
+        }
+        const Enumerable: Mixin<Enumerable<any>>;
+        /**
+        A subclass of the JavaScript Error object for use in Ember.
+        **/
+        const Error: ErrorConstructor;
+        /**
+         * `Ember.EventDispatcher` handles delegating browser events to their
+         * corresponding `Ember.Views.` For example, when you click on a view,
+         * `Ember.EventDispatcher` ensures that that view's `mouseDown` method gets
+         * called.
+         */
+        class EventDispatcher extends Object {
+            /**
+             * The set of events names (and associated handler function names) to be setup
+             * and dispatched by the `EventDispatcher`. Modifications to this list can be done
+             * at setup time, generally via the `Ember.Application.customEvents` hash.
+             */
+            events: EventDispatcherEvents;
+        }
+        /**
+         * This mixin allows for Ember objects to subscribe to and emit events.
+         */
+        interface Evented {
+            /**
+             * Subscribes to a named event with given function.
+             */
+            on<Target>(
+                name: string,
+                target: Target,
+                method: (this: Target, ...args: any[]) => void
+            ): this;
+            on(name: string, method: (...args: any[]) => void): this;
+            /**
+             * Subscribes a function to a named event and then cancels the subscription
+             * after the first time the event is triggered. It is good to use ``one`` when
+             * you only care about the first time an event has taken place.
+             */
+            one<Target>(
+                name: string,
+                target: Target,
+                method: (this: Target, ...args: any[]) => void
+            ): this;
+            one(name: string, method: (...args: any[]) => void): this;
+            /**
+             * Triggers a named event for the object. Any additional arguments
+             * will be passed as parameters to the functions that are subscribed to the
+             * event.
+             */
+            trigger(name: string, ...args: any[]): any;
+            /**
+             * Cancels subscription for given name, target, and method.
+             */
+            off<Target>(
+                name: string,
+                target: Target,
+                method: (this: Target, ...args: any[]) => void
+            ): this;
+            off(name: string, method: (...args: any[]) => void): this;
+            /**
+             * Checks to see if object has any subscriptions for named event.
+             */
+            has(name: string): boolean;
+        }
+        const Evented: Mixin<Evented>;
+        /**
+         * The `Ember.Freezable` mixin implements some basic methods for marking an
+         * object as frozen. Once an object is frozen it should be read only. No changes
+         * may be made the internal state of the object.
+         * @deprecated Use `Object.freeze` instead.
+         */
+        interface Freezable {
+            freeze(): Freezable;
+            isFrozen: boolean;
+        }
+        const Freezable: Mixin<Freezable>;
+        /**
+         * `Ember.HashLocation` implements the location API using the browser's
+         * hash. At present, it relies on a `hashchange` event existing in the
+         * browser.
+         */
+        class HashLocation extends Object {}
+        /**
+         * Ember.HistoryLocation implements the location API using the browser's
+         * history.pushState API.
+         */
+        class HistoryLocation extends Object {}
+        /**
+         * Ember Helpers are functions that can compute values, and are used in templates.
+         * For example, this code calls a helper named `format-currency`:
+         */
+        class Helper extends Object {
+            /**
+             * In many cases, the ceremony of a full `Ember.Helper` class is not required.
+             * The `helper` method create pure-function helpers without instances. For
+             * example:
+             */
+            static helper(helper: (params: any[], hash?: object) => any): Helper;
+            /**
+             * Override this function when writing a class-based helper.
+             */
+            compute(params: any[], hash: object): any;
+            /**
+             * On a class-based helper, it may be useful to force a recomputation of that
+             * helpers value. This is akin to `rerender` on a component.
+             */
+            recompute(): any;
+        }
+        /**
+         * The purpose of the Ember Instrumentation module is
+         * to provide efficient, general-purpose instrumentation
+         * for Ember.
+         */
+        const Instrumentation: {
+            instrument(name: string, payload: any, callback: Function, binding: any): void;
+            reset(): void;
+            subscribe(pattern: string, object: any): void;
+            unsubscribe(subscriber: any): void;
+        };
+        /**
+         * `Ember.LinkComponent` renders an element whose `click` event triggers a
+         * transition of the application's instance of `Ember.Router` to
+         * a supplied route by name.
+         */
+        class LinkComponent extends Component {
+            /**
+             * Used to determine when this `LinkComponent` is active.
+             */
+            currentWhen: any;
+            /**
+             * Sets the `title` attribute of the `LinkComponent`'s HTML element.
+             */
+            title: string | null;
+            /**
+             * Sets the `rel` attribute of the `LinkComponent`'s HTML element.
+             */
+            rel: string | null;
+            /**
+             * Sets the `tabindex` attribute of the `LinkComponent`'s HTML element.
+             */
+            tabindex: string | null;
+            /**
+             * Sets the `target` attribute of the `LinkComponent`'s HTML element.
+             */
+            target: string | null;
+            /**
+             * The CSS class to apply to `LinkComponent`'s element when its `active`
+             * property is `true`.
+             */
+            activeClass: string;
+            /**
+             * Determines whether the `LinkComponent` will trigger routing via
+             * the `replaceWith` routing strategy.
+             */
+            replace: boolean;
+        }
+        /**
+         * Ember.Location returns an instance of the correct implementation of
+         * the `location` API.
+         */
+        const Location: {
+            /**
+             * This is deprecated in favor of using the container to lookup the location
+             * implementation as desired.
+             * @deprecated Use the container to lookup the location implementation that you need.
+             */
+            create(options?: {}): any;
+        };
+        /**
+         * Inside Ember-Metal, simply uses the methods from `imports.console`.
+         * Override this to provide more robust logging functionality.
+         */
+        const Logger: {
+            /**
+             * If the value passed into `Ember.Logger.assert` is not truthy it will throw an error with a stack trace.
+             */
+            assert(test: boolean, message?: string): void;
+            /**
+             * Logs the arguments to the console in blue text.
+             */
+            debug(...args: any[]): void;
+            /**
+             * Prints the arguments to the console with an error icon, red text and a stack trace.
+             */
+            error(...args: any[]): void;
+            /**
+             * Logs the arguments to the console.
+             */
+            info(...args: any[]): void;
+            /**
+             * Logs the arguments to the console.
+             */
+            log(...args: any[]): void;
+            /**
+             * Prints the arguments to the console with a warning icon.
+             */
+            warn(...args: any[]): void;
+        };
+        /**
+         * A Map stores values indexed by keys. Unlike JavaScript's
+         * default Objects, the keys of a Map can be any JavaScript
+         * object.
+         * @deprecated
+         */
+        class Map {
+            copy(): Map;
+            static create(): Map;
+            forEach(callback: Function, self: any): void;
+            get(key: any): any;
+            has(key: any): boolean;
+            set(key: any, value: any): void;
+            length: number;
+        }
+        /**
+         * @deprecated
+         */
+        class MapWithDefault extends Map {
+            copy(): MapWithDefault;
+            static create(): MapWithDefault;
+        }
+        /**
+         * The `Ember.Mixin` class allows you to create mixins, whose properties can be
+         * added to other classes.
+         */
+        class Mixin<T, Base = Ember.Object> {
+            /**
+             * Mixin needs to have *something* on its prototype, otherwise it's treated like an empty interface.
+             * It cannot be private, sadly.
+             */
+            __ember_mixin__: never;
+
+            static create<T, Base = Ember.Object>(
+                args?: T & ThisType<Fix<T & Base>>
+            ): Mixin<T, Base>;
+
+            static create<T1, T2, Base = Ember.Object>(
+                arg1: T1 & ThisType<Fix<T1 & Base>>,
+                arg2: T2 & ThisType<Fix<T2 & Base>>
+            ): Mixin<T1 & T2, Base>;
+
+            static create<T1, T2, T3, Base = Ember.Object>(
+                arg1: T1 & ThisType<Fix<T1 & Base>>,
+                arg2: T2 & ThisType<Fix<T2 & Base>>,
+                arg3: T3 & ThisType<Fix<T3 & Base>>
+            ): Mixin<T1 & T2 & T3, Base>;
+
+            static create<T1, T2, T3, T4, Base = Ember.Object>(
+                arg1: T1 & ThisType<Fix<T1 & Base>>,
+                arg2: T2 & ThisType<Fix<T2 & Base>>,
+                arg3: T3 & ThisType<Fix<T3 & Base>>,
+                arg4: T4 & ThisType<Fix<T4 & Base>>
+            ): Mixin<T1 & T2 & T3 & T4, Base>;
+        }
+        /**
+         * This mixin defines the API for modifying array-like objects. These methods
+         * can be applied only to a collection that keeps its items in an ordered set.
+         * It builds upon the Array mixin and adds methods to modify the array.
+         * One concrete implementations of this class include ArrayProxy.
+         */
+        interface MutableArray<T> extends Array<T>, MutableEnumerable<T> {
+            /**
+             * __Required.__ You must implement this method to apply this mixin.
+             */
+            replace(idx: number, amt: number, objects: any[]): any;
+            /**
+             * Remove all elements from the array. This is useful if you
+             * want to reuse an existing array without having to recreate it.
+             */
+            clear(): this;
+            /**
+             * This will use the primitive `replace()` method to insert an object at the
+             * specified index.
+             */
+            insertAt(idx: number, object: {}): this;
+            /**
+             * Remove an object at the specified index using the `replace()` primitive
+             * method. You can pass either a single index, or a start and a length.
+             */
+            removeAt(start: number, len: number): this;
+            /**
+             * Push the object onto the end of the array. Works just like `push()` but it
+             * is KVO-compliant.
+             */
+            pushObject(obj: T): T;
+            /**
+             * Add the objects in the passed numerable to the end of the array. Defers
+             * notifying observers of the change until all objects are added.
+             */
+            pushObjects(objects: Enumerable<T>): this;
+            /**
+             * Pop object from array or nil if none are left. Works just like `pop()` but
+             * it is KVO-compliant.
+             */
+            popObject(): T;
+            /**
+             * Shift an object from start of array or nil if none are left. Works just
+             * like `shift()` but it is KVO-compliant.
+             */
+            shiftObject(): T;
+            /**
+             * Unshift an object to start of array. Works just like `unshift()` but it is
+             * KVO-compliant.
+             */
+            unshiftObject(obj: T): T;
+            /**
+             * Adds the named objects to the beginning of the array. Defers notifying
+             * observers until all objects have been added.
+             */
+            unshiftObjects(objects: Enumerable<T>): this;
+            /**
+             * Reverse objects in the array. Works just like `reverse()` but it is
+             * KVO-compliant.
+             */
+            reverseObjects(): this;
+            /**
+             * Replace all the receiver's content with content of the argument.
+             * If argument is an empty array receiver will be cleared.
+             */
+            setObjects(objects: Ember.Array<T>): this;
+        }
+        const MutableArray: Mixin<MutableArray<any>>;
+        /**
+         * This mixin defines the API for modifying generic enumerables. These methods
+         * can be applied to an object regardless of whether it is ordered or
+         * unordered.
+         */
+        interface MutableEnumerable<T> extends Enumerable<T> {
+            /**
+             * __Required.__ You must implement this method to apply this mixin.
+             */
+            addObject(object: T): T;
+            /**
+             * Adds each object in the passed enumerable to the receiver.
+             */
+            addObjects(objects: Enumerable<T>): this;
+            /**
+             * __Required.__ You must implement this method to apply this mixin.
+             */
+            removeObject(object: T): T;
+            /**
+             * Removes each object in the passed enumerable from the receiver.
+             */
+            removeObjects(objects: Enumerable<T>): this;
+        }
+        const MutableEnumerable: Mixin<MutableEnumerable<any>>;
+        /**
+         * A Namespace is an object usually used to contain other objects or methods
+         * such as an application or framework. Create a namespace anytime you want
+         * to define one of these new containers.
+         */
+        class Namespace extends Object {}
+        /**
+         * The NativeArray mixin contains the properties needed to make the native
+         * Array support Ember.MutableArray and all of its dependent APIs. Unless you
+         * have `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Array` set to
+         * false, this will be applied automatically. Otherwise you can apply the mixin
+         * at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
+         */
+        interface NativeArray<T> extends GlobalArray<T>, MutableArray<T>, Observable, Copyable {
+            /**
+             * __Required.__ You must implement this method to apply this mixin.
+             */
+            length: number;
+
+            // NOTE: some array polyfill methods are re-declared here because their signatures
+            // differ between typescript versions 2.4 and 2.6. Since we need to compile against
+            // both, pick the more recent signature and re-declare it here as a tie-breaker.
+
+            /**
+             * Returns the first item in the array for which the callback returns true.
+             * This method works similar to the `filter()` method defined in JavaScript 1.6
+             * except that it will stop working on the array once a match is found.
+             */
+            find(
+                predicate: (value: T, index: number, obj: T[]) => boolean,
+                thisArg?: any
+            ): T | undefined;
+            /**
+             * This will combine the values of the enumerator into a single value. It
+             * is a useful way to collect a summary value from an enumeration. This
+             * corresponds to the `reduce()` method defined in JavaScript 1.8.
+             */
+            reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
+            reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+            filter<S extends T>(
+                callbackfn: (value: T, index: number, array: T[]) => value is S,
+                thisArg?: any
+            ): S[];
+            filter(callbackfn: (value: T, index: number, array: T[]) => any, thisArg?: any): Enumerable<T>;
+        }
+        const NativeArray: Mixin<NativeArray<any>>;
+        /**
+         * Ember.NoneLocation does not interact with the browser. It is useful for
+         * testing, or when you need to manage state with your Router, but temporarily
+         * don't want it to muck with the URL (for example when you embed your
+         * application in a larger page).
+         */
+        class NoneLocation extends Object {}
+        /**
+         * `Ember.Object` is the main base class for all Ember objects. It is a subclass
+         * of `Ember.CoreObject` with the `Ember.Observable` mixin applied. For details,
+         * see the documentation for each of these.
+         */
+        class Object extends CoreObject.extend(Observable) {}
+        /**
+         * `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
+         * to a proxied `content` object.
+         */
+        class ObjectProxy extends Object {
+            /**
+            The object whose properties will be forwarded.
+            **/
+            content: Object;
+        }
+        /**
+         * This mixin provides properties and property observing functionality, core features of the Ember object model.
+         */
+        interface Observable {
+            /**
+             * Retrieves the value of a property from the object.
+             */
+            get<T, K extends keyof T>(this: ComputedProperties<T>, key: K): T[K];
+            /**
+             * To get the values of multiple properties at once, call `getProperties`
+             * with a list of strings or an array:
+             */
+            getProperties<T, K extends keyof T>(this: ComputedProperties<T>, list: K[]): Pick<T, K>;
+            getProperties<T, K extends keyof T>(
+                this: ComputedProperties<T>,
+                ...list: K[]
+            ): Pick<T, K>;
+            /**
+             * Sets the provided key or path to the value.
+             */
+            set<T, K extends keyof T>(this: ComputedProperties<T>, key: K, value: T[K]): T[K];
+            /**
+             * Sets a list of properties at once. These properties are set inside
+             * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+             * observers will be buffered.
+             */
+            setProperties<T, K extends keyof T>(
+                this: ComputedProperties<T>,
+                hash: Pick<T, K>
+            ): Pick<T, K>;
+            /**
+             * Convenience method to call `propertyWillChange` and `propertyDidChange` in
+             * succession.
+             */
+            notifyPropertyChange(keyName: string): this;
+            /**
+             * Adds an observer on a property.
+             */
+            addObserver<Target>(
+                key: keyof this,
+                target: Target,
+                method: ObserverMethod<Target, this>
+            ): void;
+            /**
+             * Remove an observer you have previously registered on this object. Pass
+             * the same key, target, and method you passed to `addObserver()` and your
+             * target will no longer receive notifications.
+             */
+            removeObserver<Target>(
+                key: keyof this,
+                target: Target,
+                method: ObserverMethod<Target, this>
+            ): any;
+            /**
+             * Retrieves the value of a property, or a default value in the case that the
+             * property returns `undefined`.
+             */
+            getWithDefault<T, K extends keyof T>(
+                this: ComputedProperties<T>,
+                key: K,
+                defaultValue: T[K]
+            ): T[K];
+            /**
+             * Set the value of a property to the current value plus some amount.
+             */
+            incrementProperty(keyName: keyof this, increment?: number): number;
+            /**
+             * Set the value of a property to the current value minus some amount.
+             */
+            decrementProperty(keyName: keyof this, decrement?: number): number;
+            /**
+             * Set the value of a boolean property to the opposite of its
+             * current value.
+             */
+            toggleProperty(keyName: keyof this): boolean;
+            /**
+             * Returns the cached value of a computed property, if it exists.
+             * This allows you to inspect the value of a computed property
+             * without accidentally invoking it if it is intended to be
+             * generated lazily.
+             */
+            cacheFor<T, K extends keyof T>(this: ComputedProperties<T>, key: K): T[K] | undefined;
+        }
+        const Observable: Mixin<Observable, Ember.CoreObject>;
+        /**
+         * This class is used internally by Ember and Ember Data.
+         * Please do not use it at this time. We plan to clean it up
+         * and add many tests soon.
+         * @deprecated
+         */
+        class OrderedSet {
+            add(obj: any): void;
+            clear(): void;
+            copy(): OrderedSet;
+            static create(): OrderedSet;
+            forEach(fn: Function, self: any): void;
+            has(obj: any): boolean;
+            isEmpty(): boolean;
+            toArray(): any[];
+        }
+        /**
+         * A low level mixin making ObjectProxy promise-aware.
+         */
+        interface PromiseProxyMixin<T> extends RSVP.Promise<T> {
+            /**
+             * If the proxied promise is rejected this will contain the reason
+             * provided.
+             */
+            reason: any;
+            /**
+             * Once the proxied promise has settled this will become `false`.
+             */
+            isPending: boolean;
+            /**
+             * Once the proxied promise has settled this will become `true`.
+             */
+            isSettled: boolean;
+            /**
+             * Will become `true` if the proxied promise is rejected.
+             */
+            isRejected: boolean;
+            /**
+             * Will become `true` if the proxied promise is fulfilled.
+             */
+            isFulfilled: boolean;
+            /**
+             * The promise whose fulfillment value is being proxied by this object.
+             */
+            promise: RSVP.Promise<T>;
+        }
+        const PromiseProxyMixin: Mixin<PromiseProxyMixin<any>>;
+        /**
+         * A registry used to store factory and option information keyed
+         * by type.
+         */
+        class Registry {
+            register(
+                fullName: string,
+                factory: EmberClassConstructor<any>,
+                options?: { singleton?: boolean }
+            ): void;
+        }
+        class Resolver extends Ember.Object {}
+        /**
+         The `Ember.Route` class is used to define individual routes. Refer to
+        the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+        */
+        class Route extends Object.extend(ActionHandler, Evented) {
+            // methods
+            /**
+            This hook is called after this route's model has resolved.
+            It follows identical async/promise semantics to `beforeModel`
+            but is provided the route's resolved model in addition to
+            the `transition`, and is therefore suited to performing
+            logic that can only take place after the model has already
+            resolved.
+            */
+            afterModel(resolvedModel: any, transition: Transition): any;
+
+            /**
+            This hook is the first of the route entry validation hooks
+            called when an attempt is made to transition into a route
+            or one of its children. It is called before `model` and
+            `afterModel`, and is appropriate for cases when:
+            1) A decision can be made to redirect elsewhere without
+                needing to resolve the model first.
+            2) Any async operations need to occur first before the
+                model is attempted to be resolved.
+            This hook is provided the current `transition` attempt
+            as a parameter, which can be used to `.abort()` the transition,
+            save it for a later `.retry()`, or retrieve values set
+            on it from a previous hook. You can also just call
+            `this.transitionTo` to another route to implicitly
+            abort the `transition`.
+            You can return a promise from this hook to pause the
+            transition until the promise resolves (or rejects). This could
+            be useful, for instance, for retrieving async code from
+            the server that is required to enter a route.
+            */
+            beforeModel(transition: Transition): Rsvp.Promise<any>;
+
+            /**
+             * Returns the controller for a particular route or name.
+             * The controller instance must already have been created, either through entering the
+             * associated route or using `generateController`.
+             */
+            controllerFor(name: string): Controller;
+
+            /**
+             * Disconnects a view that has been rendered into an outlet.
+             */
+            disconnectOutlet(options: string | { outlet?: string; parentView?: string }): void;
+
+            /**
+             * A hook you can implement to convert the URL into the model for
+             * this route.
+             */
+            model(params: {}, transition: Transition): any;
+
+            /**
+             * Returns the model of a parent (or any ancestor) route
+             * in a route hierarchy.  During a transition, all routes
+             * must resolve a model object, and if a route
+             * needs access to a parent route's model in order to
+             * resolve a model (or just reuse the model from a parent),
+             * it can call `this.modelFor(theNameOfParentRoute)` to
+             * retrieve it.
+             */
+            modelFor(name: string): {};
+
+            /**
+             * Retrieves parameters, for current route using the state.params
+             * variable and getQueryParamsFor, using the supplied routeName.
+             */
+            paramsFor(name: string): {};
+
+            /**
+             * Refresh the model on this route and any child routes, firing the
+             * `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+             * to how routes are entered when transitioning in from other route.
+             * The current route params (e.g. `article_id`) will be passed in
+             * to the respective model hooks, and if a different model is returned,
+             * `setupController` and associated route hooks will re-fire as well.
+             * An example usage of this method is re-querying the server for the
+             * latest information using the same parameters as when the route
+             * was first entered.
+             * Note that this will cause `model` hooks to fire even on routes
+             * that were provided a model object when the route was initially
+             * entered.
+             */
+            redirect(): Transition;
+
+            /**
+             * Refresh the model on this route and any child routes, firing the
+             * `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+             * to how routes are entered when transitioning in from other route.
+             * The current route params (e.g. `article_id`) will be passed in
+             * to the respective model hooks, and if a different model is returned,
+             * `setupController` and associated route hooks will re-fire as well.
+             * An example usage of this method is re-querying the server for the
+             * latest information using the same parameters as when the route
+             * was first entered.
+             * Note that this will cause `model` hooks to fire even on routes
+             * that were provided a model object when the route was initially
+             * entered.
+             */
+            refresh(): Transition;
+
+            /**
+             * `render` is used to render a template into a region of another template
+             * (indicated by an `{{outlet}}`). `render` is used both during the entry
+             * phase of routing (via the `renderTemplate` hook) and later in response to
+             * user interaction.
+             */
+            render(name: string, options?: RenderOptions): void;
+
+            /**
+             * A hook you can use to render the template for the current route.
+             * This method is called with the controller for the current route and the
+             * model supplied by the `model` hook. By default, it renders the route's
+             * template, configured with the controller for the route.
+             * This method can be overridden to set up and render additional or
+             * alternative templates.
+             */
+            renderTemplate(controller: Controller, model: {}): void;
+
+            /**
+             * Transition into another route while replacing the current URL, if possible.
+             * This will replace the current history entry instead of adding a new one.
+             * Beside that, it is identical to `transitionTo` in all other respects. See
+             * 'transitionTo' for additional information regarding multiple models.
+             */
+            replaceWith(name: string, ...args: any[]): Transition;
+
+            /**
+             * A hook you can use to reset controller values either when the model
+             * changes or the route is exiting.
+             */
+            resetController(controller: Controller, isExiting: boolean, transition: any): void;
+
+            /**
+             * Sends an action to the router, which will delegate it to the currently active
+             * route hierarchy per the bubbling rules explained under actions.
+             */
+            send(name: string, ...args: any[]): void;
+
+            /**
+             * A hook you can implement to convert the route's model into parameters
+             * for the URL.
+             *
+             * The default `serialize` method will insert the model's `id` into the
+             * route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+             * If the route has multiple dynamic segments or does not contain '_id', `serialize`
+             * will return `Ember.getProperties(model, params)`
+             * This method is called when `transitionTo` is called with a context
+             * in order to populate the URL.
+             */
+            serialize(model: {}, params: string[]): string | object;
+
+            /**
+             * A hook you can use to setup the controller for the current route.
+             * This method is called with the controller for the current route and the
+             * model supplied by the `model` hook.
+             * By default, the `setupController` hook sets the `model` property of
+             * the controller to the `model`.
+             * If you implement the `setupController` hook in your Route, it will
+             * prevent this default behavior. If you want to preserve that behavior
+             * when implementing your `setupController` function, make sure to call
+             * `_super`
+             */
+            setupController(controller: Controller, model: {}): void;
+
+            /**
+             * Transition the application into another route. The route may
+             * be either a single route or route path
+             */
+            transitionTo(name: string, ...object: any[]): Transition;
+
+            /**
+             * The name of the view to use by default when rendering this routes template.
+             * When rendering a template, the route will, by default, determine the
+             * template and view to use from the name of the route itself. If you need to
+             * define a specific view, set this property.
+             * This is useful when multiple routes would benefit from using the same view
+             * because it doesn't require a custom `renderTemplate` method.
+             */
+            transitionTo(name: string, ...object: any[]): Transition;
+
+            // properties
+            /**
+             * The controller associated with this route.
+             */
+            controller: Controller;
+
+            /**
+             * The name of the controller to associate with this route.
+             * By default, Ember will lookup a route's controller that matches the name
+             * of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+             * if you would like to define a specific controller to use, you can do so
+             * using this property.
+             * This is useful in many ways, as the controller specified will be:
+             * * p assed to the `setupController` method.
+             * * used as the controller for the view being rendered by the route.
+             * * returned from a call to `controllerFor` for the route.
+             */
+            controllerName: string;
+
+            /**
+             * Configuration hash for this route's queryParams.
+             */
+            queryParams: { [key: string]: RouteQueryParam };
+
+            /**
+             * The name of the route, dot-delimited
+             */
+            routeName: string;
+
+            /**
+             * The name of the template to use by default when rendering this routes
+             * template.
+             * This is similar with `viewName`, but is useful when you just want a custom
+             * template without a view.
+             */
+            templateName: string;
+
+            // events
+            /**
+             * This hook is executed when the router enters the route. It is not executed
+             * when the model for the route changes.
+             */
+            activate(): void;
+
+            /**
+             * This hook is executed when the router completely exits this route. It is
+             * not executed when the model for the route changes.
+             */
+            deactivate(): void;
+
+            /**
+             * The didTransition action is fired after a transition has successfully been
+             * completed. This occurs after the normal model hooks (beforeModel, model,
+             * afterModel, setupController) have resolved. The didTransition action has
+             * no arguments, however, it can be useful for tracking page views or resetting
+             * state on the controller.
+             */
+            didTransition(): void;
+
+            /**
+             * When attempting to transition into a route, any of the hooks may return a promise
+             * that rejects, at which point an error action will be fired on the partially-entered
+             * routes, allowing for per-route error handling logic, or shared error handling logic
+             * defined on a parent route.
+             */
+            error(error: any, transition: Transition): void;
+
+            /**
+             * The loading action is fired on the route when a route's model hook returns a
+             * promise that is not already resolved. The current Transition object is the first
+             * parameter and the route that triggered the loading event is the second parameter.
+             */
+            loading(transition: Transition, route: Route): void;
+
+            /**
+             * The willTransition action is fired at the beginning of any attempted transition
+             * with a Transition object as the sole argument. This action can be used for aborting,
+             * redirecting, or decorating the transition from the currently active routes.
+             */
+            willTransition(transition: Transition): void;
+        }
+        /**
+         * The `Ember.Router` class manages the application state and URLs. Refer to
+         * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+         */
+        class Router extends Object.extend(Evented) {
+            /**
+             * The `Router.map` function allows you to define mappings from URLs to routes
+             * in your application. These mappings are defined within the
+             * supplied callback function using `this.route`.
+             */
+            static map(callback: (this: RouterDSL) => void): void;
+            /**
+             * The `location` property determines the type of URL's that your
+             * application will use.
+             */
+            location: string;
+            /**
+             * Represents the URL of the root of the application, often '/'. This prefix is
+             * assumed on all routes defined on this router.
+             */
+            rootURL: string;
+            /**
+             * Handles updating the paths and notifying any listeners of the URL
+             * change.
+             */
+            didTransition(): any;
+            /**
+             * Handles notifying any listeners of an impending URL
+             * change.
+             */
+            willTransition(): any;
+            /**
+             * Transition the application into another route. The route may
+             * be either a single route or route path:
+             */
+            transitionTo(name: string, ...models: any[]): Transition;
+            transitionTo(name: string, options: {}): Transition;
+        }
+        class RouterDSL {
+            constructor(name: string, options: object);
+            route(name: string, callback: (this: RouterDSL) => void): void;
+            route(
+                name: string,
+                options?: { path?: string; resetNamespace?: boolean },
+                callback?: (this: RouterDSL) => void
+            ): void;
+            mount(
+                name: string,
+                options?: {
+                    as?: string,
+                    path?: string,
+                    resetNamespace?: boolean,
+                    engineInfo?: any
+                }
+            ): void;
+        }
+        class Service extends Object {}
+        /**
+         * The internal class used to create textarea element when the `{{textarea}}`
+         * helper is used.
+         */
+        class TextArea extends Component.extend(TextSupport) {}
+        /**
+         * The internal class used to create text inputs when the `{{input}}`
+         * helper is used with `type` of `text`.
+         */
+        class TextField extends Component.extend(TextSupport) {
+            /**
+             * The `value` attribute of the input element. As the user inputs text, this
+             * property is updated live.
+             */
+            value: string;
+            /**
+             * The `type` attribute of the input element.
+             */
+            type: string;
+            /**
+             * The `size` of the text field in characters.
+             */
+            size: string;
+            /**
+             * The `pattern` attribute of input element.
+             */
+            pattern: string;
+            /**
+             * The `min` attribute of input element used with `type="number"` or `type="range"`.
+             */
+            min: string;
+            /**
+             * The `max` attribute of input element used with `type="number"` or `type="range"`.
+             */
+            max: string;
+        }
+        /**
+         * `TextSupport` is a shared mixin used by both `Ember.TextField` and
+         * `Ember.TextArea`. `TextSupport` adds a number of methods that allow you to
+         * specify a controller action to invoke when a certain event is fired on your
+         * text field or textarea. The specifed controller action would get the current
+         * value of the field passed in as the only argument unless the value of
+         * the field is empty. In that case, the instance of the field itself is passed
+         * in as the only argument.
+         */
+        interface TextSupport extends TargetActionSupport {
+            cancel(event: Function): void;
+            focusIn(event: Function): void;
+            focusOut(event: Function): void;
+            insertNewLine(event: Function): void;
+            keyPress(event: Function): void;
+            action: string;
+            bubbles: boolean;
+            onEvent: string;
+        }
+        const TextSupport: Ember.Mixin<TextSupport, Ember.Component>;
+        interface Transition {
+            /**
+             Aborts the Transition. Note you can also implicitly abort a transition
+            by initiating another transition while a previous one is underway.
+            */
+            abort(): Transition;
+            /**
+             Retries a previously-aborted transition (making sure to abort the
+            transition if it's still active). Returns a new transition that
+            represents the new attempt to transition.
+            */
+            retry(): Transition;
+        }
+        interface ViewTargetActionSupport {
+            target: any;
+            actionContext: any;
+        }
+        const ViewTargetActionSupport: Mixin<ViewTargetActionSupport>;
+        const ViewUtils: {}; // TODO: define interface
+
+        // FYI - RSVP source comes from https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/promise.js
+        const RSVP: typeof Rsvp;
+        namespace RSVP {
+            type Promise<T> = Rsvp.Promise<T>;
+        }
+
+        /**
+         * This is a container for an assortment of testing related functionality
+         */
+        namespace Test {
+            /**
+             * `registerHelper` is used to register a test helper that will be injected
+             * when `App.injectTestHelpers` is called.
+             */
+            function registerHelper(
+                name: string,
+                helperMethod: (app: Application, ...args: any[]) => any,
+                options?: object
+            ): any;
+            /**
+             * `registerAsyncHelper` is used to register an async test helper that will be injected
+             * when `App.injectTestHelpers` is called.
+             */
+            function registerAsyncHelper(
+                name: string,
+                helperMethod: (app: Application, ...args: any[]) => any
+            ): void;
+            /**
+             * Remove a previously added helper method.
+             */
+            function unregisterHelper(name: string): void;
+            /**
+             * Used to register callbacks to be fired whenever `App.injectTestHelpers`
+             * is called.
+             */
+            function onInjectHelpers(callback: (app: Application) => void): void;
+            /**
+             * This returns a thenable tailored for testing.  It catches failed
+             * `onSuccess` callbacks and invokes the `Ember.Test.adapter.exception`
+             * callback in the last chained then.
+             */
+            function promise<T>(
+                resolver: (
+                    resolve: (value?: T | PromiseLike<T>) => void,
+                    reject: (reason?: any) => void
+                ) => void,
+                label?: string
+            ): Ember.Test.Promise<T>;
+            /**
+             * Replacement for `Ember.RSVP.resolve`
+             * The only difference is this uses
+             * an instance of `Ember.Test.Promise`
+             */
+            function resolve<T>(value?: T | PromiseLike<T>, label?: string): Ember.Test.Promise<T>;
+            /**
+             * This allows ember-testing to play nicely with other asynchronous
+             * events, such as an application that is waiting for a CSS3
+             * transition or an IndexDB transaction. The waiter runs periodically
+             * after each async helper (i.e. `click`, `andThen`, `visit`, etc) has executed,
+             * until the returning result is truthy. After the waiters finish, the next async helper
+             * is executed and the process repeats.
+             */
+            function registerWaiter(callback: () => boolean): any;
+            function registerWaiter<Context>(
+                context: Context,
+                callback: (this: Context) => boolean
+            ): any;
+            /**
+             * `unregisterWaiter` is used to unregister a callback that was
+             * registered with `registerWaiter`.
+             */
+            function unregisterWaiter(callback: () => boolean): any;
+            function unregisterWaiter<Context>(
+                context: Context,
+                callback: (this: Context) => boolean
+            ): any;
+            /**
+             * Iterates through each registered test waiter, and invokes
+             * its callback. If any waiter returns false, this method will return
+             * true indicating that the waiters have not settled yet.
+             */
+            function checkWaiters(): boolean;
+            /**
+             * Used to allow ember-testing to communicate with a specific testing
+             * framework.
+             */
+            const adapter: Adapter;
+            /**
+             * The primary purpose of this class is to create hooks that can be implemented
+             * by an adapter for various test frameworks.
+             */
+            class Adapter {
+                /**
+                 * This callback will be called whenever an async operation is about to start.
+                 */
+                asyncStart(): any;
+                /**
+                 * This callback will be called whenever an async operation has completed.
+                 */
+                asyncEnd(): any;
+                /**
+                 * Override this method with your testing framework's false assertion.
+                 * This function is called whenever an exception occurs causing the testing
+                 * promise to fail.
+                 */
+                exception(error: string): any;
+            }
+            /**
+             * This class implements the methods defined by Ember.Test.Adapter for the
+             * QUnit testing framework.
+             */
+            class QUnitAdapter extends Adapter {}
+            class Promise<T> extends Rsvp.Promise<T> {
+                constructor(
+                    executor: (
+                        resolve: (value?: T | PromiseLike<T>) => void,
+                        reject: (reason?: any) => void
+                    ) => void
+                );
+            }
+        }
+        /**
+         * Namespace for injection helper methods.
+         */
+        namespace inject {
+            /**
+             * Creates a property that lazily looks up another controller in the container.
+             * Can only be used when defining another controller.
+             */
+            function controller(name?: string): ComputedProperty<Controller>;
+            /**
+             * Creates a property that lazily looks up a service in the container. There
+             * are no restrictions as to what objects a service can be injected into.
+             */
+            function service(name?: string): ComputedProperty<Service>;
+        }
+        namespace ENV {
+            const EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
+            const LOG_BINDINGS: boolean;
+            const LOG_STACKTRACE_ON_DEPRECATION: boolean;
+            const LOG_VERSION: boolean;
+            const MODEL_FACTORY_INJECTIONS: boolean;
+            const RAISE_ON_DEPRECATION: boolean;
+        }
+        namespace EXTEND_PROTOTYPES {
+            const Array: boolean;
+            const Function: boolean;
+            const String: boolean;
+        }
+        namespace Handlebars {
+            function compile(string: string): Function;
+            function compile(environment: any, options?: any, context?: any, asObject?: any): any;
+            function precompile(string: string, options: any): void;
+            class Compiler {}
+            class JavaScriptCompiler {}
+            function registerPartial(name: string, str: any): void;
+            function K(): any;
+            function createFrame(objec: any): any;
+            function Exception(message: string): void;
+            class SafeString {
+                constructor(str: string);
+                static toString(): string;
+            }
+            function parse(string: string): any;
+            function print(ast: any): void;
+            const logger: typeof Ember.Logger;
+            function log(level: string, str: string): void;
+        }
+        namespace String {
+            function camelize(str: string): string;
+            function capitalize(str: string): string;
+            function classify(str: string): string;
+            function dasherize(str: string): string;
+            function decamelize(str: string): string;
+            function fmt(...args: string[]): string;
+            function htmlSafe(str: string): void; // TODO: @returns Handlebars.SafeStringStatic;
+            function isHTMLSafe(str: string): boolean;
+            function loc(...args: string[]): string;
+            function underscore(str: string): string;
+            function w(str: string): string[];
+        }
+        const computed: {
+            <T>(cb: ComputedPropertyCallback<T>): ComputedProperty<T>;
+            <T>(k1: string, cb: ComputedPropertyCallback<T>): ComputedProperty<T>;
+            <T>(k1: string, k2: string, cb: ComputedPropertyCallback<T>): ComputedProperty<T>;
+            <T>(
+                k1: string,
+                k2: string,
+                k3: string,
+                cb: ComputedPropertyCallback<T>
+            ): ComputedProperty<T>;
+            <T>(
+                k1: string,
+                k2: string,
+                k3: string,
+                k4: string,
+                cb: ComputedPropertyCallback<T>
+            ): ComputedProperty<T>;
+            <T>(
+                k1: string,
+                k2: string,
+                k3: string,
+                k4: string,
+                k5: string,
+                cb: ComputedPropertyCallback<T>
+            ): ComputedProperty<T>;
+            <T>(
+                k1: string,
+                k2: string,
+                k3: string,
+                k4: string,
+                k5: string,
+                k6: string,
+                cb: ComputedPropertyCallback<T>
+            ): ComputedProperty<T>;
+            (
+                k1: string,
+                k2: string,
+                k3: string,
+                k4: string,
+                k5: string,
+                k6: string,
+                k7: string,
+                ...rest: any[]
+            ): ComputedProperty<any>;
+
+            /**
+             * A computed property that returns true if the value of the dependent
+             * property is null, an empty string, empty array, or empty function.
+             */
+            empty(dependentKey: string): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns true if the value of the dependent
+             * property is NOT null, an empty string, empty array, or empty function.
+             */
+            notEmpty(dependentKey: string): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns true if the value of the dependent
+             * property is null or undefined. This avoids errors from JSLint complaining
+             * about use of ==, which can be technically confusing.
+             */
+            none(dependentKey: string): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns the inverse boolean value
+             * of the original value for the dependent property.
+             */
+            not(dependentKey: string): ComputedProperty<boolean>;
+            /**
+             * A computed property that converts the provided dependent property
+             * into a boolean value.
+             */
+            bool(dependentKey: string): ComputedProperty<boolean>;
+            /**
+             * A computed property which matches the original value for the
+             * dependent property against a given RegExp, returning `true`
+             * if the value matches the RegExp and `false` if it does not.
+             */
+            match(dependentKey: string, regexp: RegExp): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns true if the provided dependent property
+             * is equal to the given value.
+             */
+            equal(dependentKey: string, value: any): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns true if the provided dependent property
+             * is greater than the provided value.
+             */
+            gt(dependentKey: string, value: number): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns true if the provided dependent property
+             * is greater than or equal to the provided value.
+             */
+            gte(dependentKey: string, value: number): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns true if the provided dependent property
+             * is less than the provided value.
+             */
+            lt(dependentKey: string, value: number): ComputedProperty<boolean>;
+            /**
+             * A computed property that returns true if the provided dependent property
+             * is less than or equal to the provided value.
+             */
+            lte(dependentKey: string, value: number): ComputedProperty<boolean>;
+            /**
+             * A computed property that performs a logical `and` on the
+             * original values for the provided dependent properties.
+             */
+            and(...dependentKeys: string[]): ComputedProperty<boolean>;
+            /**
+             * A computed property which performs a logical `or` on the
+             * original values for the provided dependent properties.
+             */
+            or(...dependentKeys: string[]): ComputedProperty<boolean>;
+            /**
+             * Creates a new property that is an alias for another property
+             * on an object. Calls to `get` or `set` this property behave as
+             * though they were called on the original property.
+             */
+            alias(dependentKey: string): ComputedProperty<any>;
+            /**
+             * Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
+             * data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
+             * not mutate the upstream property, rather causes the current property to
+             * become the value set. This causes the downstream property to permanently
+             * diverge from the upstream property.
+             */
+            oneWay(dependentKey: string): ComputedProperty<any>;
+            /**
+             * This is a more semantically meaningful alias of `computed.oneWay`,
+             * whose name is somewhat ambiguous as to which direction the data flows.
+             */
+            reads(dependentKey: string): ComputedProperty<any>;
+            /**
+             * Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
+             * a readOnly one way binding. Very often when using `computed.oneWay` one does
+             * not also want changes to propagate back up, as they will replace the value.
+             */
+            readOnly(dependentKey: string): ComputedProperty<any>;
+            /**
+             * Creates a new property that is an alias for another property
+             * on an object. Calls to `get` or `set` this property behave as
+             * though they were called on the original property, but also
+             * print a deprecation warning.
+             */
+            deprecatingAlias(
+                dependentKey: string,
+                options: { id: string; until: string }
+            ): ComputedProperty<any>;
+            /**
+             * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
+             */
+            deprecatingAlias(
+                dependentKey: string,
+                options?: { id?: string; until?: string }
+            ): ComputedProperty<any>;
+            /**
+             * A computed property that returns the sum of the values
+             * in the dependent array.
+             */
+            sum(dependentKey: string): ComputedProperty<number>;
+            /**
+             * A computed property that calculates the maximum value in the
+             * dependent array. This will return `-Infinity` when the dependent
+             * array is empty.
+             */
+            max(dependentKey: string): ComputedProperty<number>;
+            /**
+             * A computed property that calculates the minimum value in the
+             * dependent array. This will return `Infinity` when the dependent
+             * array is empty.
+             */
+            min(dependentKey: string): ComputedProperty<number>;
+            /**
+             * Returns an array mapped via the callback
+             */
+            map<U>(
+                dependentKey: string,
+                callback: (value: any, index: number, array: any[]) => U
+            ): ComputedProperty<U[]>;
+            /**
+             * Returns an array mapped to the specified key.
+             */
+            mapBy(dependentKey: string, propertyKey: string): ComputedProperty<any[]>;
+            /**
+             * Filters the array by the callback.
+             */
+            filter(
+                dependentKey: string,
+                callback: (value: any, index: number, array: any[]) => boolean
+            ): ComputedProperty<any[]>;
+            /**
+             * Filters the array by the property and value
+             */
+            filterBy(
+                dependentKey: string,
+                propertyKey: string,
+                value?: any
+            ): ComputedProperty<any[]>;
+            /**
+             * A computed property which returns a new array with all the unique
+             * elements from one or more dependent arrays.
+             */
+            uniq(propertyKey: string): ComputedProperty<any[]>;
+            /**
+             * A computed property which returns a new array with all the unique
+             * elements from an array, with uniqueness determined by specific key.
+             */
+            uniqBy(dependentKey: string, propertyKey: string): ComputedProperty<any[]>;
+            /**
+             * A computed property which returns a new array with all the unique
+             * elements from one or more dependent arrays.
+             */
+            union(...propertyKeys: string[]): ComputedProperty<any[]>;
+            /**
+             * A computed property which returns a new array with all the elements
+             * two or more dependent arrays have in common.
+             */
+            intersect(...propertyKeys: string[]): ComputedProperty<any[]>;
+            /**
+             * A computed property which returns a new array with all the
+             * properties from the first dependent array that are not in the second
+             * dependent array.
+             */
+            setDiff(setAProperty: string, setBProperty: string): ComputedProperty<any[]>;
+            /**
+             * A computed property that returns the array of values
+             * for the provided dependent properties.
+             */
+            collect(...dependentKeys: string[]): ComputedProperty<any[]>;
+            /**
+             * A computed property which returns a new array with all the
+             * properties from the first dependent array sorted based on a property
+             * or sort function.
+             */
+            sort(
+                itemsKey: string,
+                sortDefinition: string | ((itemA: any, itemB: any) => number)
+            ): ComputedProperty<any[]>;
+        };
+        const run: {
+            /**
+             * Runs the passed target and method inside of a RunLoop, ensuring any
+             * deferred actions including bindings and views updates are flushed at the
+             * end.
+             */
+            <Ret>(method: (...args: any[]) => Ret): Ret;
+            <Target, Ret>(target: Target, method: RunMethod<Target, Ret>): Ret;
+            /**
+             * If no run-loop is present, it creates a new one. If a run loop is
+             * present it will queue itself to run on the existing run-loops action
+             * queue.
+             */
+            join<Ret>(method: (...args: any[]) => Ret, ...args: any[]): Ret | undefined;
+            join<Target, Ret>(
+                target: Target,
+                method: RunMethod<Target, Ret>,
+                ...args: any[]
+            ): Ret | undefined;
+            /**
+             * Allows you to specify which context to call the specified function in while
+             * adding the execution of that function to the Ember run loop. This ability
+             * makes this method a great way to asynchronously integrate third-party libraries
+             * into your Ember application.
+             */
+            bind<Target, Ret>(
+                target: Target,
+                method: RunMethod<Target, Ret>,
+                ...args: any[]
+            ): (...args: any[]) => Ret;
+            /**
+             * Begins a new RunLoop. Any deferred actions invoked after the begin will
+             * be buffered until you invoke a matching call to `run.end()`. This is
+             * a lower-level way to use a RunLoop instead of using `run()`.
+             */
+            begin(): void;
+            /**
+             * Ends a RunLoop. This must be called sometime after you call
+             * `run.begin()` to flush any deferred actions. This is a lower-level way
+             * to use a RunLoop instead of using `run()`.
+             */
+            end(): void;
+            /**
+             * Adds the passed target/method and any optional arguments to the named
+             * queue to be executed at the end of the RunLoop. If you have not already
+             * started a RunLoop when calling this method one will be started for you
+             * automatically.
+             */
+            schedule<Target>(
+                queue: EmberRunQueues,
+                target: Target,
+                method: RunMethod<Target>,
+                ...args: any[]
+            ): EmberRunTimer;
+            schedule(
+                queue: EmberRunQueues,
+                method: (args: any[]) => any,
+                ...args: any[]
+            ): EmberRunTimer;
+            /**
+             * Invokes the passed target/method and optional arguments after a specified
+             * period of time. The last parameter of this method must always be a number
+             * of milliseconds.
+             */
+            later(method: (...args: any[]) => any, wait: number): EmberRunTimer;
+            later<Target>(target: Target, method: RunMethod<Target>, wait: number): EmberRunTimer;
+            later<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                wait: number
+            ): EmberRunTimer;
+            later<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                wait: number
+            ): EmberRunTimer;
+            later<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                wait: number
+            ): EmberRunTimer;
+            later<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                wait: number
+            ): EmberRunTimer;
+            later<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                arg4: any,
+                wait: number
+            ): EmberRunTimer;
+            later<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                arg4: any,
+                arg5: any,
+                wait: number
+            ): EmberRunTimer;
+            /**
+             * Schedule a function to run one time during the current RunLoop. This is equivalent
+             * to calling `scheduleOnce` with the "actions" queue.
+             */
+            once<Target>(target: Target, method: RunMethod<Target>, ...args: any[]): EmberRunTimer;
+            /**
+             * Schedules a function to run one time in a given queue of the current RunLoop.
+             * Calling this method with the same queue/target/method combination will have
+             * no effect (past the initial call).
+             */
+            scheduleOnce<Target>(
+                queue: EmberRunQueues,
+                target: Target,
+                method: RunMethod<Target>,
+                ...args: any[]
+            ): EmberRunTimer;
+            /**
+             * Schedules an item to run from within a separate run loop, after
+             * control has been returned to the system. This is equivalent to calling
+             * `run.later` with a wait time of 1ms.
+             */
+            next<Target>(target: Target, method: RunMethod<Target>, ...args: any[]): EmberRunTimer;
+            /**
+             * Cancels a scheduled item. Must be a value returned by `run.later()`,
+             * `run.once()`, `run.scheduleOnce()`, `run.next()`, `run.debounce()`, or
+             * `run.throttle()`.
+             */
+            cancel(timer: EmberRunTimer): boolean;
+            /**
+             * Delay calling the target method until the debounce period has elapsed
+             * with no additional debounce calls. If `debounce` is called again before
+             * the specified time has elapsed, the timer is reset and the entire period
+             * must pass again before the target method is called.
+             */
+            debounce(
+                method: (...args: any[]) => any,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            debounce<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            debounce<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            debounce<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            debounce<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            debounce<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            debounce<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                arg4: any,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            debounce<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                arg4: any,
+                arg5: any,
+                wait: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            /**
+             * Ensure that the target method is never called more frequently than
+             * the specified spacing period. The target method is called immediately.
+             */
+            throttle(
+                method: (...args: any[]) => any,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            throttle<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            throttle<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            throttle<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            throttle<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            throttle<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            throttle<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                arg4: any,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+            throttle<Target>(
+                target: Target,
+                method: RunMethod<Target>,
+                arg0: any,
+                arg1: any,
+                arg2: any,
+                arg3: any,
+                arg4: any,
+                arg5: any,
+                spacing: number,
+                immediate?: boolean
+            ): EmberRunTimer;
+
+            queues: EmberRunQueues[];
+        };
+        const platform: {
+            defineProperty: boolean;
+            hasPropertyAccessors: boolean;
+        };
+
+        /**
+         * `getEngineParent` retrieves an engine instance's parent instance.
+         */
+        function getEngineParent(engine: EngineInstance): EngineInstance;
+        /**
+         * Display a deprecation warning with the provided message and a stack trace
+         * (Chrome and Firefox only).
+         */
+        function deprecate(
+            message: string,
+            test: boolean,
+            options: { id: string; until: string }
+        ): any;
+        /**
+         * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
+         */
+        function deprecate(
+            message: string,
+            test: boolean,
+            options?: { id?: string; until?: string }
+        ): any;
+        /**
+         * Define an assertion that will throw an exception if the condition is not met.
+         */
+        function assert(desc: string, test?: boolean): void | never;
+        /**
+         * Display a debug notice.
+         */
+        function debug(message: string): void;
+        /**
+         * NOTE: This is a low-level method used by other parts of the API.
+         * You almost never want to call this method directly. Instead you
+         * should use Ember.mixin() to define new properties.
+         */
+        function defineProperty(
+            obj: object,
+            keyName: string,
+            desc?: PropertyDescriptor | ComputedProperty<any>,
+            data?: any,
+            meta?: any
+        ): void;
+        /**
+         * Alias an old, deprecated method with its new counterpart.
+         */
+        function deprecateFunc<Func extends ((...args: any[]) => any)>(
+            message: string,
+            options: { id: string; until: string },
+            func: Func
+        ): Func;
+        /**
+         * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
+         */
+        function deprecateFunc<Func extends ((...args: any[]) => any)>(
+            message: string,
+            func: Func
+        ): Func;
+        /**
+         * Run a function meant for debugging.
+         */
+        function runInDebug(func: () => void): any;
+        /**
+         * Display a warning with the provided message.
+         */
+        function warn(message: string, test: boolean, options: { id: string }): any;
+        function warn(message: string, options: { id: string }): any;
+        /**
+         * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
+         */
+        function warn(message: string, test: boolean, options?: { id?: string }): any;
+        /**
+         * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
+         */
+        function warn(message: string, options?: { id?: string }): any;
+        /**
+         * Global helper method to create a new binding. Just pass the root object
+         * along with a `to` and `from` path to create and connect the binding.
+         * @deprecated https://emberjs.com/deprecations/v2.x#toc_ember-binding
+         */
+        function bind(obj: {}, to: string, from: string): Binding;
+        /**
+         * Returns the cached value for a property, if one exists.
+         * This can be useful for peeking at the value of a computed
+         * property that is generated lazily, without accidentally causing
+         * it to be created.
+         */
+        function cacheFor<T, K extends keyof T>(
+            obj: ComputedProperties<T>,
+            key: K
+        ): T[K] | undefined;
+        /**
+         * Add an event listener
+         */
+        function addListener<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            target: Target,
+            method: ObserverMethod<Target, Context>,
+            once?: boolean
+        ): void;
+        /**
+         * Remove an event listener
+         */
+        function removeListener<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            target: Target,
+            method: ObserverMethod<Target, Context>
+        ): any;
+        /**
+         * Send an event. The execution of suspended listeners
+         * is skipped, and once listeners are removed. A listener without
+         * a target is executed on the passed object. If an array of actions
+         * is not passed, the actions stored on the passed object are invoked.
+         */
+        function sendEvent(obj: any, eventName: string, params?: any[], actions?: any[]): boolean;
+        /**
+         * Define a property as a function that should be executed when
+         * a specified event or events are triggered.
+         */
+        function on(eventNames: string, func: (...args: any[]) => void): (...args: any[]) => void;
+        /**
+         * To get multiple properties at once, call `Ember.getProperties`
+         * with an object followed by a list of strings or an array:
+         */
+        function getProperties<T, K extends keyof T>(
+            obj: ComputedProperties<T>,
+            list: K[]
+        ): Pick<T, K>;
+        function getProperties<T, K extends keyof T>(
+            obj: ComputedProperties<T>,
+            ...list: K[]
+        ): Pick<T, K>;
+        /**
+         * A value is blank if it is empty or a whitespace string.
+         */
+        function isBlank(obj: any): boolean;
+        /**
+         * Verifies that a value is `null` or an empty string, empty array,
+         * or empty function.
+         */
+        function isEmpty(obj: any): boolean;
+        /**
+         * Returns true if the passed value is null or undefined. This avoids errors
+         * from JSLint complaining about use of ==, which can be technically
+         * confusing.
+         */
+        function isNone(obj: any): obj is null | undefined;
+        /**
+         * A value is present if it not `isBlank`.
+         */
+        function isPresent(obj: any): boolean;
+        /**
+         * Merge the contents of two objects together into the first object.
+         * @deprecated Use Object.assign
+         */
+        function merge<T, U>(original: T, updates: U): T & U;
+        /**
+         * Makes a method available via an additional name.
+         */
+        function aliasMethod(methodName: string): ComputedProperty<any>;
+        /**
+         * Specify a method that observes property changes.
+         */
+        function observer(key1: string, func: (target: any, key: string) => void): void;
+        function observer(
+            key1: string,
+            key2: string,
+            func: (target: any, key: string) => void
+        ): void;
+        function observer(
+            key1: string,
+            key2: string,
+            key3: string,
+            func: (target: any, key: string) => void
+        ): void;
+        function observer(
+            key1: string,
+            key2: string,
+            key3: string,
+            key4: string,
+            func: (target: any, key: string) => void
+        ): void;
+        function observer(
+            key1: string,
+            key2: string,
+            key3: string,
+            key4: string,
+            key5: string,
+            func: (target: any, key: string) => void
+        ): void;
+        /**
+         * Adds an observer on a property.
+         */
+        function addObserver<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            target: Target,
+            method: ObserverMethod<Target, Context>
+        ): void;
+        /**
+         * Remove an observer you have previously registered on this object. Pass
+         * the same key, target, and method you passed to `addObserver()` and your
+         * target will no longer receive notifications.
+         */
+        function removeObserver<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            target: Target,
+            method: ObserverMethod<Target, Context>
+        ): any;
+        /**
+         * Gets the value of a property on an object. If the property is computed,
+         * the function will be invoked. If the property is not defined but the
+         * object implements the `unknownProperty` method then that will be invoked.
+         */
+        function get<T, K extends keyof T>(obj: ComputedProperties<T>, key: K): T[K];
+        /**
+         * Retrieves the value of a property from an Object, or a default value in the
+         * case that the property returns `undefined`.
+         */
+        function getWithDefault<T, K extends keyof T>(
+            obj: ComputedProperties<T>,
+            key: K,
+            defaultValue: T[K]
+        ): T[K];
+        /**
+         * Sets the value of a property on an object, respecting computed properties
+         * and notifying observers and other listeners of the change. If the
+         * property is not defined but the object implements the `setUnknownProperty`
+         * method then that will be invoked as well.
+         */
+        function set<T, K extends keyof T, V extends T[K]>(
+            obj: ComputedProperties<T>,
+            key: K,
+            value: V
+        ): V;
+        /**
+         * Error-tolerant form of `Ember.set`. Will not blow up if any part of the
+         * chain is `undefined`, `null`, or destroyed.
+         */
+        function trySet(root: object, path: string, value: any): any;
+        /**
+         * Set a list of properties on an object. These properties are set inside
+         * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+         * observers will be buffered.
+         */
+        function setProperties<T, K extends keyof T>(
+            obj: ComputedProperties<T>,
+            hash: Pick<T, K>
+        ): Pick<T, K>;
+        /**
+         * Detects when a specific package of Ember (e.g. 'Ember.Application')
+         * has fully loaded and is available for extension.
+         */
+        function onLoad(name: string, callback: Function): any;
+        /**
+         * Called when an Ember.js package (e.g Ember.Application) has finished
+         * loading. Triggers any callbacks registered for this event.
+         */
+        function runLoadHooks(name: string, object?: {}): any;
+        /**
+         * Creates an `Ember.NativeArray` from an Array like object.
+         * Does not modify the original object's contents. Ember.A is not needed if
+         * `EmberENV.EXTEND_PROTOTYPES` is `true` (the default value). However,
+         * it is recommended that you use Ember.A when creating addons for
+         * ember or when you can not guarantee that `EmberENV.EXTEND_PROTOTYPES`
+         * will be `true`.
+         */
+        function A<T>(arr?: T[]): NativeArray<T>;
+        /**
+         * Compares two javascript values and returns:
+         */
+        function compare(v: any, w: any): number;
+        /**
+         * Creates a shallow copy of the passed object. A deep copy of the object is
+         * returned if the optional `deep` argument is `true`.
+         */
+        function copy(obj: any, deep?: boolean): any;
+        /**
+         * Compares two objects, returning true if they are equal.
+         */
+        function isEqual(a: any, b: any): boolean;
+        /**
+         * Returns true if the passed object is an array or Array-like.
+         */
+        function isArray(obj: any): obj is ArrayLike<any>;
+        /**
+         * Returns a consistent type for the passed object.
+         */
+        function typeOf(item: any): string;
+        /**
+         * Copy properties from a source object to a target object.
+         * @deprecated Use Object.assign
+         */
+        function assign<T, U>(target: T, source: U): T & U;
+        function assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+        function assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+        /**
+         * Polyfill for Object.create
+         * @deprecated Use Object.create
+         */
+        function create(o: object | null): any;
+        /**
+         * Polyfill for Object.keys
+         * @deprecated Use Object.keys
+         */
+        function keys(o: any): string[];
+        /**
+         * Returns a unique id for the object. If the object does not yet have a guid,
+         * one will be assigned to it. You can call this on any object,
+         * `Ember.Object`-based or not, but be aware that it will add a `_guid`
+         * property.
+         */
+        function guidFor(obj: any): string;
+        /**
+         * Convenience method to inspect an object. This method will attempt to
+         * convert the object into a useful string description.
+         */
+        function inspect(obj: any): string;
+        /**
+         * Checks to see if the `methodName` exists on the `obj`,
+         * and if it does, invokes it with the arguments passed.
+         */
+        function tryInvoke(obj: any, methodName: string, args?: any[]): any;
+        /**
+         * Forces the passed object to be part of an array. If the object is already
+         * an array, it will return the object. Otherwise, it will add the object to
+         * an array. If obj is `null` or `undefined`, it will return an empty array.
+         */
+        function makeArray<T>(obj?: T[] | T | null): T[];
+        /**
+         * Framework objects in an Ember application (components, services, routes, etc.)
+         * are created via a factory and dependency injection system. Each of these
+         * objects is the responsibility of an "owner", which handled its
+         * instantiation and manages its lifetime.
+         */
+        function getOwner(object: any): any;
+        /**
+         * `setOwner` forces a new owner on a given object instance. This is primarily
+         * useful in some testing cases.
+         */
+        function setOwner(object: any, owner: any): void;
+        /**
+         * A function may be assigned to `Ember.onerror` to be called when Ember
+         * internals encounter an error. This is useful for specialized error handling
+         * and reporting code.
+         */
+        function onerror(error: Error): void;
+        /**
+         * An empty function useful for some operations. Always returns `this`.
+         * @deprecated https://emberjs.com/deprecations/v2.x/#toc_code-ember-k-code
+         */
+        function K<This>(this: This): This;
+        /**
+         * The semantic version
+         */
+        const VERSION: string;
+        /**
+         * Alias for jQuery
+         */
+        const $: JQueryStatic;
+        /**
+         * This property indicates whether or not this application is currently in
+         * testing mode. This is set when `setupForTesting` is called on the current
+         * application.
+         */
+        const testing: boolean;
+
+        const instrument: typeof Instrumentation.instrument;
+
+        const reset: typeof Instrumentation.reset;
+
+        const subscribe: typeof Instrumentation.subscribe;
+
+        const unsubscribe: typeof Instrumentation.unsubscribe;
+        /**
+         * Expands `pattern`, invoking `callback` for each expansion.
+         */
+        function expandProperties(pattern: string, callback: (expanded: string) => void): void;
     }
-    class TextSupport {
-        cancel(event: Function): void;
-        focusIn(event: Function): void;
-        focusOut(event: Function): void;
-        insertNewLine(event: Function): void;
-        keyPress(event: Function): void;
-        action: string;
-        bubbles: boolean;
-        onEvent: string;
-    }
-    const VERSION: string;
-    class ViewTargetActionSupport extends Mixin {
-        target: any;
-        actionContext: any;
-    }
-    const ViewUtils: {}; // TODO: define interface
-    function addListener(
-        obj: any,
-        eventName: string,
-        target: Function | any,
-        method: Function | string,
-        once?: boolean
-    ): void;
-    const addObserver: ModifyObserver;
-    /**
-    Ember.alias is deprecated. Please use Ember.aliasMethod or Ember.computed.alias instead.
-    **/
-    const alias: typeof deprecateFunc;
-    function aliasMethod(methodName: string): Descriptor;
-    function assert(desc: string, test: boolean): void;
-    function beginPropertyChanges(): void;
-    function bind(obj: any, to: string, from: string): Binding;
-    function cacheFor(obj: any, key: string): any;
-    function canInvoke(obj: any, methodName: string): boolean;
-    function changeProperties(callback: Function, binding?: any): void;
-    function compare(v: any, w: any): number;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    const computed: {
-        (...args: any[]): ComputedProperty;
-        alias(dependentKey: string): ComputedProperty;
-        and(...args: string[]): ComputedProperty;
-        any(...args: string[]): ComputedProperty;
-        bool(dependentKey: string): ComputedProperty;
-        defaultTo(defaultPath: string): ComputedProperty;
-        empty(dependentKey: string): ComputedProperty;
-        equal(dependentKey: string, value: any): ComputedProperty;
-        filter(
-            dependentKey: string,
-            callback: (item: any, index?: number, array?: any[]) => boolean
-        ): ComputedProperty;
-        filterBy(dependentKey: string, propertyKey: string, value: any): ComputedProperty;
-        gt(dependentKey: string, value: number): ComputedProperty;
-        gte(dependentKey: string, value: number): ComputedProperty;
-        lt(dependentKey: string, value: number): ComputedProperty;
-        lte(dependentKey: string, value: number): ComputedProperty;
-        map(dependentKey: string, callback: <T>(item: any, index: number) => T): ComputedProperty;
-        match(dependentKey: string, regexp: RegExp): ComputedProperty;
-        none(dependentKey: string): ComputedProperty;
-        not(dependentKey: string): ComputedProperty;
-        notEmpty(dependentKey: string): ComputedProperty;
-        oneWay(dependentKey: string): ComputedProperty;
-        or(...args: string[]): ComputedProperty;
-        readOnly(dependentString: string): ComputedProperty;
 
-        /** A computed property which returns a new array with all the unique
-            elements from one or more dependent arrays. Alias for uniq. */
-        union(...propertyKeys: string[]): ComputedProperty;
-
-        /** A computed property which returns a new array with all the unique
-            elements from one or more dependent arrays. */
-        uniq(...propertyKeys: string[]): ComputedProperty;
-
-        /** A computed property which returns a new array with all the unique
-            elements from an array, with uniqueness determined by specific key. */
-        uniqBy(dependentKey: string, propertyKey: string): ComputedProperty;
-    };
-    // ReSharper restore DuplicatingLocalDeclaration
-    function controllerFor(
-        container: Container,
-        controllerName: string,
-        lookupOptions?: {}
-    ): Controller;
-    function copy(obj: any, deep: boolean): any;
-    /**
-    Creates an instance of the CoreObject class.
-    @param arguments A hash containing values with which to initialize the newly instantiated object.
-    **/
-    function create(arguments?: {}): CoreObject;
-    function debug(message: string): void;
-    function defineProperty(obj: any, keyName: string, desc: {}): void;
-    function deprecate(message: string, test?: boolean): void;
-    function deprecateFunc(message: string, func: Function): Function;
-    function destroy(obj: any): void;
-    /**
-    Ember.empty is deprecated. Please use Ember.isEmpty instead.
-    **/
-    // ReSharper disable once DuplicatingLocalDeclaration
-    const empty: typeof deprecateFunc;
-    function endPropertyChanges(): void;
-    function finishChains(obj: any): void;
-    function generateController(
-        container: Container,
-        controllerName: string,
-        context: any
-    ): Controller;
-    function generateGuid(obj: any, prefix?: string): string;
-    function get(obj: any, keyName: string): any;
-    function getProperties(obj: any, ...args: string[]): object;
-    function getProperties(obj: any, keys: string[]): object;
-    /**
-    getPath is deprecated since get now supports paths.
-    **/
-    const getPath: typeof deprecateFunc;
-    function getWithDefault(root: string, key: string, defaultValue: any): any;
-    function guidFor(obj: any): string;
-    function handleErrors(func: Function, context: any): any;
-    function hasListeners(context: any, name: string): boolean;
-    function hasOwnProperty(prop: string): boolean;
-    function immediateObserver(func: Function, ...propertyNames: any[]): Function;
-    function inspect(obj: any): string;
-    function instrument(name: string, payload: any, callback: Function, binding: any): void;
-    function isArray(obj: any): boolean;
-    function isBlank(obj: any): boolean;
-    function isEmpty(obj: any): boolean;
-    function isEqual(a: any, b: any): boolean;
-    function isGlobalPath(path: string): boolean;
-    const isNamespace: boolean;
-    function isNone(obj: any): boolean;
-    function isPresent(obj: any): boolean;
-    function isPrototypeOf(obj: {}): boolean;
-    function isWatching(obj: any, key: string): boolean;
-    function keys(obj: any): any[];
-    function listenersDiff(obj: any, eventName: string, otherActions: any[]): any[];
-    function listenersFor(obj: any, eventName: string): any[];
-    function listenersUnion(obj: any, eventName: string, otherActions: any[]): void;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    const lookup: {}; // TODO: define interface
-    function makeArray(obj: any): any[];
-    function merge(original: any, updates: any): any;
-    function meta(obj: any): {};
-    function mixin(obj: any, ...args: any[]): any;
-    /**
-    Ember.none is deprecated. Please use Ember.isNone instead.
-    **/
-    const none: typeof deprecateFunc;
-    function observer(...args: any[]): Function;
-    function observersFor(obj: any, path: string): any[];
-    function onLoad(name: string, callback: Function): void;
-    const onError: Error;
-    function onerror(error: any): void;
-    function overrideChains(obj: any, keyName: string, m: any): boolean;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    const platform: {
-        defineProperty: boolean;
-        hasPropertyAccessors: boolean;
-    };
-    function propertyDidChange(obj: any, keyName: string): void;
-    function propertyIsEnumerable(prop: string): boolean;
-    function propertyWillChange(obj: any, keyName: string): void;
-    function removeChainWatcher(obj: any, keyName: string, node: any): void;
-    function removeListener(
-        obj: any,
-        eventName: string,
-        target: Function | any,
-        method: Function | string
-    ): void;
-    function removeObserver(obj: any, path: string, target: any, method: Function): any;
-    function required(): Descriptor;
-    function rewatch(obj: any): void;
-
-    type RunMethod<T> = (...args: any[]) => T;
-    const run: {
-        <T>(method: RunMethod<T> | string): T;
-        <T>(target: any, method: RunMethod<T> | string): T;
-        begin(): void;
-        cancel(timer: any): void;
-        debounce(target: any, method: Function | string, ...args: any[]): void;
-        end(): void;
-        join(target: any, method: Function | string, ...args: any[]): any;
-        later(target: any, method: Function | string, ...args: any[]): string;
-        next(target: any, method: Function | string, ...args: any[]): number;
-        once(target: any, method: Function | string, ...args: any[]): number;
-        schedule(queue: string, target: any, method: Function | string, ...args: any[]): void;
-        scheduleOnce(queue: string, target: any, method: Function | string, ...args: any[]): void;
-        sync(): void;
-        throttle(target: any, method: Function | string, ...args: any[]): void;
-        queues: any[];
-    };
-    function runInDebug(fn: Function): void;
-    function runLoadHooks(name: string, object: any): void;
-    function sendEvent(obj: any, eventName: string, params?: any[], actions?: any[]): boolean;
-    function set(obj: any, keyName: string, value: any): any;
-    /**
-    setPath is deprecated since set now supports paths.
-    **/
-    const setPath: typeof deprecateFunc;
-    function setProperties(self: any, hash: {}): any;
-    function subscribe(pattern: string, object: any): void;
-    function toLocaleString(): string;
-    function toString(): string;
-    function tryCatchFinally(
-        tryable: Function,
-        catchable: Function,
-        finalizer: Function,
-        binding?: any
-    ): any;
-    function tryInvoke(obj: any, methodName: string, args?: any[]): any;
-    function trySet(obj: any, path: string, value: any): void;
-    /**
-    trySetPath has been renamed to trySet.
-    **/
-    const trySetPath: typeof deprecateFunc;
-    function typeOf(item: any): string;
-    function unwatch(obj: any, keyPath: string): void;
-    function unwatchKey(obj: any, keyName: string): void;
-    function unwatchPath(obj: any, keyPath: string): void;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    const uuid: number;
-    function valueOf(): {};
-    function warn(message: string, test?: boolean): void;
-    function watch(obj: any, keyPath: string): void;
-    function watchKey(obj: any, keyName: string): void;
-    function watchPath(obj: any, keyPath: string): void;
-    function watchedEvents(obj: {}): any[];
-    function wrap(func: Function, superFunc: Function): Function;
-    const _ContainerProxyMixin: Mixin;
-    const _RegistryProxyMixin: Mixin;
-    function getOwner(object: any): any;
-    function setOwner(object: any, owner: any): void;
-    const testing: boolean;
-    const MODEL_FACTORY_INJECTIONS: boolean;
-    function assign(original: any, ...sources: any[]): any;
+    export default Ember;
 }
 
-export default Ember;
+declare module '@ember/application' {
+    import Ember from 'ember';
+    export default Ember.Application;
+    export const getOwner: typeof Ember.getOwner;
+    export const onLoad: typeof Ember.onLoad;
+    export const runLoadHooks: typeof Ember.runLoadHooks;
+    export const setOwner: typeof Ember.setOwner;
+}
+
+declare module '@ember/application/deprecations' {
+    import Ember from 'ember';
+    export const deprecate: typeof Ember.deprecate;
+    export const deprecateFunc: typeof Ember.deprecateFunc;
+}
+
+declare module '@ember/application/globals-resolver' {
+    import Ember from 'ember';
+    export default Ember.DefaultResolver;
+}
+
+declare module '@ember/application/instance' {
+    import Ember from 'ember';
+    export default Ember.ApplicationInstance;
+}
+
+declare module '@ember/application/resolver' {
+    import Ember from 'ember';
+    export default Ember.Resolver;
+}
+
+declare module '@ember/array' {
+    import Ember from 'ember';
+    export default Ember.Array;
+    export const A: typeof Ember.A;
+    export const isArray: typeof Ember.isArray;
+    export const makeArray: typeof Ember.makeArray;
+}
+
+declare module '@ember/array/mutable' {
+    import Ember from 'ember';
+    export default Ember.MutableArray;
+}
+
+declare module '@ember/array/proxy' {
+    import Ember from 'ember';
+    export default Ember.ArrayProxy;
+}
+
+declare module '@ember/component' {
+    import Ember from 'ember';
+    export default Ember.Component;
+}
+
+declare module '@ember/component/checkbox' {
+    import Ember from 'ember';
+    export default Ember.Checkbox;
+}
+
+declare module '@ember/component/helper' {
+    import Ember from 'ember';
+    export default Ember.Helper;
+    export const helper: typeof Ember.Helper.helper;
+}
+
+declare module '@ember/component/text-area' {
+    import Ember from 'ember';
+    export default Ember.TextArea;
+}
+
+declare module '@ember/component/text-field' {
+    import Ember from 'ember';
+    export default Ember.TextField;
+}
+
+declare module '@ember/controller' {
+    import Ember from 'ember';
+    export default Ember.Controller;
+    export const inject: typeof Ember.inject.controller;
+}
+
+declare module '@ember/debug' {
+    import Ember from 'ember';
+    export const assert: typeof Ember.assert;
+    export const debug: typeof Ember.debug;
+    export const inspect: typeof Ember.inspect;
+    export const registerDeprecationHandler: typeof Ember.Debug.registerDeprecationHandler;
+    export const registerWarnHandler: typeof Ember.Debug.registerWarnHandler;
+    export const runInDebug: typeof Ember.runInDebug;
+    export const warn: typeof Ember.warn;
+}
+
+declare module '@ember/debug/container-debug-adapter' {
+    import Ember from 'ember';
+    export default Ember.ContainerDebugAdapter;
+}
+
+declare module '@ember/debug/data-adapter' {
+    import Ember from 'ember';
+    export default Ember.DataAdapter;
+}
+
+declare module '@ember/engine' {
+    import Ember from 'ember';
+    export default Ember.Engine;
+    export const getEngineParent: typeof Ember.getEngineParent;
+}
+
+declare module '@ember/engine/instance' {
+    import Ember from 'ember';
+    export default Ember.EngineInstance;
+}
+
+declare module '@ember/enumerable' {
+    import Ember from 'ember';
+    export default Ember.Enumerable;
+}
+
+declare module '@ember/instrumentation' {
+    import Ember from 'ember';
+    export const instrument: typeof Ember.instrument;
+    export const reset: typeof Ember.reset;
+    export const subscribe: typeof Ember.subscribe;
+    export const unsubscribe: typeof Ember.unsubscribe;
+}
+
+declare module '@ember/map' {
+    import Ember from 'ember';
+    export default Ember.Map;
+}
+
+declare module '@ember/map/with-default' {
+    import Ember from 'ember';
+    export default Ember.MapWithDefault;
+}
+
+declare module '@ember/object' {
+    import Ember from 'ember';
+    export default Ember.Object;
+    export const aliasMethod: typeof Ember.aliasMethod;
+    export const computed: typeof Ember.computed;
+    export const defineProperty: typeof Ember.defineProperty;
+    export const get: typeof Ember.get;
+    export const getProperties: typeof Ember.getProperties;
+    export const getWithDefault: typeof Ember.getWithDefault;
+    export const observer: typeof Ember.observer;
+    export const set: typeof Ember.set;
+    export const setProperties: typeof Ember.setProperties;
+    export const trySet: typeof Ember.trySet;
+}
+
+declare module '@ember/object/computed' {
+    import Ember from 'ember';
+    export default Ember.ComputedProperty;
+    export const alias: typeof Ember.computed.alias;
+    export const and: typeof Ember.computed.and;
+    export const bool: typeof Ember.computed.bool;
+    export const collect: typeof Ember.computed.collect;
+    export const deprecatingAlias: typeof Ember.computed.deprecatingAlias;
+    export const empty: typeof Ember.computed.empty;
+    export const equal: typeof Ember.computed.equal;
+    export const expandProperties: typeof Ember.expandProperties;
+    export const filter: typeof Ember.computed.filter;
+    export const filterBy: typeof Ember.computed.filterBy;
+    export const gt: typeof Ember.computed.gt;
+    export const gte: typeof Ember.computed.gte;
+    export const intersect: typeof Ember.computed.intersect;
+    export const lt: typeof Ember.computed.lt;
+    export const lte: typeof Ember.computed.lte;
+    export const map: typeof Ember.computed.map;
+    export const mapBy: typeof Ember.computed.mapBy;
+    export const match: typeof Ember.computed.match;
+    export const max: typeof Ember.computed.max;
+    export const min: typeof Ember.computed.min;
+    export const none: typeof Ember.computed.none;
+    export const not: typeof Ember.computed.not;
+    export const notEmpty: typeof Ember.computed.notEmpty;
+    export const oneWay: typeof Ember.computed.oneWay;
+    export const or: typeof Ember.computed.or;
+    export const readOnly: typeof Ember.computed.readOnly;
+    export const reads: typeof Ember.computed.reads;
+    export const setDiff: typeof Ember.computed.setDiff;
+    export const sort: typeof Ember.computed.sort;
+    export const sum: typeof Ember.computed.sum;
+    export const union: typeof Ember.computed.union;
+    export const uniq: typeof Ember.computed.uniq;
+    export const uniqBy: typeof Ember.computed.uniqBy;
+}
+
+declare module '@ember/object/core' {
+    import Ember from 'ember';
+    export default Ember.CoreObject;
+}
+
+declare module '@ember/object/evented' {
+    import Ember from 'ember';
+    export default Ember.Evented;
+    export const on: typeof Ember.on;
+}
+
+declare module '@ember/object/events' {
+    import Ember from 'ember';
+    export const addListener: typeof Ember.addListener;
+    export const removeListener: typeof Ember.removeListener;
+    export const sendEvent: typeof Ember.sendEvent;
+}
+
+declare module '@ember/object/internals' {
+    import Ember from 'ember';
+    export const cacheFor: typeof Ember.cacheFor;
+    export const copy: typeof Ember.copy;
+    export const guidFor: typeof Ember.guidFor;
+}
+
+declare module '@ember/object/mixin' {
+    import Ember from 'ember';
+    export default Ember.Mixin;
+}
+
+declare module '@ember/object/observable' {
+    import Ember from 'ember';
+    export default Ember.Observable;
+}
+
+declare module '@ember/object/observers' {
+    import Ember from 'ember';
+    export const addObserver: typeof Ember.addObserver;
+    export const removeObserver: typeof Ember.removeObserver;
+}
+
+declare module '@ember/object/promise-proxy-mixin' {
+    import Ember from 'ember';
+    export default Ember.PromiseProxyMixin;
+}
+
+declare module '@ember/object/proxy' {
+    import Ember from 'ember';
+    export default Ember.ObjectProxy;
+}
+
+declare module '@ember/polyfills' {
+    import Ember from 'ember';
+    export const assign: typeof Ember.assign;
+    export const create: typeof Ember.create;
+    export const hasPropertyAccessors: typeof Ember.platform.hasPropertyAccessors;
+    export const keys: typeof Ember.keys;
+    export const merge: typeof Ember.merge;
+}
+
+declare module '@ember/routing/auto-location' {
+    import Ember from 'ember';
+    export default Ember.AutoLocation;
+}
+
+declare module '@ember/routing/hash-location' {
+    import Ember from 'ember';
+    export default Ember.HashLocation;
+}
+
+declare module '@ember/routing/history-location' {
+    import Ember from 'ember';
+    export default Ember.HistoryLocation;
+}
+
+declare module '@ember/routing/link-component' {
+    import Ember from 'ember';
+    export default Ember.LinkComponent;
+}
+
+declare module '@ember/routing/location' {
+    import Ember from 'ember';
+    export default Ember.Location;
+}
+
+declare module '@ember/routing/none-location' {
+    import Ember from 'ember';
+    export default Ember.NoneLocation;
+}
+
+declare module '@ember/routing/route' {
+    import Ember from 'ember';
+    export default Ember.Route;
+}
+
+declare module '@ember/routing/router' {
+    import Ember from 'ember';
+    export default Ember.Router;
+}
+
+declare module '@ember/runloop' {
+    import Ember from 'ember';
+    export const begin: typeof Ember.run.begin;
+    export const bind: typeof Ember.run.bind;
+    export const cancel: typeof Ember.run.cancel;
+    export const debounce: typeof Ember.run.debounce;
+    export const end: typeof Ember.run.end;
+    export const join: typeof Ember.run.join;
+    export const later: typeof Ember.run.later;
+    export const next: typeof Ember.run.next;
+    export const once: typeof Ember.run.once;
+    export const run: typeof Ember.run;
+    export const schedule: typeof Ember.run.schedule;
+    export const scheduleOnce: typeof Ember.run.scheduleOnce;
+    export const throttle: typeof Ember.run.throttle;
+}
+
+declare module '@ember/service' {
+    import Ember from 'ember';
+    export default Ember.Service;
+    export const inject: typeof Ember.inject.service;
+}
+
+declare module '@ember/string' {
+    import Ember from 'ember';
+    export const camelize: typeof Ember.String.camelize;
+    export const capitalize: typeof Ember.String.capitalize;
+    export const classify: typeof Ember.String.classify;
+    export const dasherize: typeof Ember.String.dasherize;
+    export const decamelize: typeof Ember.String.decamelize;
+    export const fmt: typeof Ember.String.fmt;
+    export const htmlSafe: typeof Ember.String.htmlSafe;
+    export const isHTMLSafe: typeof Ember.String.isHTMLSafe;
+    export const loc: typeof Ember.String.loc;
+    export const underscore: typeof Ember.String.underscore;
+    export const w: typeof Ember.String.w;
+}
+
+declare module '@ember/test' {
+    import Ember from 'ember';
+    export const registerAsyncHelper: typeof Ember.Test.registerAsyncHelper;
+    export const registerHelper: typeof Ember.Test.registerHelper;
+    export const registerWaiter: typeof Ember.Test.registerWaiter;
+    export const unregisterHelper: typeof Ember.Test.unregisterHelper;
+    export const unregisterWaiter: typeof Ember.Test.unregisterWaiter;
+}
+
+declare module '@ember/test/adapter' {
+    import Ember from 'ember';
+    export default Ember.Test.Adapter;
+}
+
+declare module '@ember/utils' {
+    import Ember from 'ember';
+    export const compare: typeof Ember.compare;
+    export const isBlank: typeof Ember.isBlank;
+    export const isEmpty: typeof Ember.isEmpty;
+    export const isEqual: typeof Ember.isEqual;
+    export const isNone: typeof Ember.isNone;
+    export const isPresent: typeof Ember.isPresent;
+    export const tryInvoke: typeof Ember.tryInvoke;
+    export const typeOf: typeof Ember.typeOf;
+}
+
+declare module 'htmlbars-inline-precompile' {
+    interface TemplateFactory {
+        __htmlbars_inline_precompile_template_factory: any;
+    }
+    export default function hbs(tagged: TemplateStringsArray): TemplateFactory;
+}
diff --git a/types/ember/test/application.ts b/types/ember/test/application.ts
new file mode 100755
index 0000000000..0589e64879
--- /dev/null
+++ b/types/ember/test/application.ts
@@ -0,0 +1,15 @@
+import Ember from 'ember';
+import { assertType } from "./lib/assert";
+
+let App = Ember.Application.create({
+    customEvents: {
+        paste: 'paste'
+    }
+});
+
+let App2 = Ember.Application.create({
+    customEvents: {
+        mouseenter: null,
+        mouseleave: null
+    }
+});
diff --git a/types/ember/test/array-ext.ts b/types/ember/test/array-ext.ts
new file mode 100755
index 0000000000..86e84fd7c5
--- /dev/null
+++ b/types/ember/test/array-ext.ts
@@ -0,0 +1,18 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+declare global {
+    interface Array<T> extends Ember.ArrayPrototypeExtensions<T> {}
+}
+
+class Person extends Ember.Object {
+    name: string;
+}
+
+const person = Person.create({ name: 'Joe' });
+const array = [person];
+
+assertType<number>(array.get('length'));
+assertType<Person | undefined>(array.get('firstObject'));
+assertType<string[]>(array.mapBy('name'));
+assertType<string[]>(array.map(p => p.get('name')));
diff --git a/types/ember/test/array-proxy.ts b/types/ember/test/array-proxy.ts
new file mode 100644
index 0000000000..dceea7b847
--- /dev/null
+++ b/types/ember/test/array-proxy.ts
@@ -0,0 +1,26 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const pets = ['dog', 'cat', 'fish'];
+const proxy = Ember.ArrayProxy.create({ content: Ember.A(pets) });
+
+proxy.get('firstObject'); // 'dog'
+proxy.set('content', Ember.A(['amoeba', 'paramecium']));
+proxy.get('firstObject'); // 'amoeba'
+
+const overridden = Ember.ArrayProxy.create({
+    content: Ember.A(pets),
+    objectAtContent(idx: number): string {
+        return this.get('content').objectAt(idx)!.toUpperCase();
+    }
+});
+
+overridden.get('firstObject'); // 'DOG'
+
+class MyNewProxy<T> extends Ember.ArrayProxy<T> {
+    isNew = true;
+}
+
+let x = MyNewProxy.create({ content: Ember.A([1, 2, 3]) }) as MyNewProxy<number>;
+assertType<number | undefined>(x.get('firstObject'));
+assertType<boolean>(x.isNew);
diff --git a/types/ember/test/array.ts b/types/ember/test/array.ts
new file mode 100755
index 0000000000..38f0fad5c6
--- /dev/null
+++ b/types/ember/test/array.ts
@@ -0,0 +1,48 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+type Person = typeof Person.prototype;
+const Person = Ember.Object.extend({
+    name: '',
+    isHappy: false
+});
+
+const people = Ember.A([
+    Person.create({ name: 'Yehuda', isHappy: true }),
+    Person.create({ name: 'Majd', isHappy: false }),
+]);
+
+assertType<number>(people.get('length'));
+assertType<Person>(people.get('lastObject'));
+assertType<boolean>(people.isAny('isHappy'));
+assertType<boolean>(people.isAny('isHappy', false));
+assertType<Ember.Enumerable<Person>>(people.filterBy('isHappy'));
+assertType<Ember.Enumerable<Person>>(people.rejectBy('isHappy'));
+assertType<Ember.Enumerable<Person>>(people.filter((person) => person.get('name') === 'Yehuda'));
+assertType<typeof people>(people.get('[]'));
+assertType<Person>(people.get('[]').get('firstObject'));
+
+assertType<Ember.Array<boolean>>(people.mapBy('isHappy'));
+assertType<any[]>(people.mapBy('name.length'));
+
+const last = people.get('lastObject');
+if (last) {
+    assertType<string>(last.get('name'));
+}
+
+const first = people.get('lastObject');
+if (first) {
+    assertType<boolean>(first.get('isHappy'));
+}
+
+const letters: Ember.Enumerable<string> = Ember.A(['a', 'b', 'c']);
+const codes: number[] = letters.map((item, index, enumerable) => {
+    assertType<string>(item);
+    assertType<number>(index);
+    return item.charCodeAt(0);
+});
+
+let value = '1,2,3';
+let filters = Ember.A(value.split(','));
+filters.push('4');
+filters.sort();
diff --git a/types/ember/test/component.ts b/types/ember/test/component.ts
new file mode 100755
index 0000000000..bcc314300d
--- /dev/null
+++ b/types/ember/test/component.ts
@@ -0,0 +1,124 @@
+import Ember from 'ember';
+import Component from '@ember/component';
+import Object, { computed } from '@ember/object';
+import hbs from 'htmlbars-inline-precompile';
+import { assertType } from "./lib/assert";
+
+Component.extend({
+  layout: hbs`
+        <div>
+          {{yield}}
+        </div>
+    `,
+});
+
+Component.extend({
+  layout: 'my-layout',
+});
+
+const MyComponent = Component.extend();
+assertType<string | string[]>(Ember.get(MyComponent, 'positionalParams'));
+
+const component1 = Component.extend({
+  actions: {
+    hello(name: string) {
+      console.log('Hello', name);
+    },
+  },
+});
+
+Component.extend({
+  name: '',
+  hello(name: string) {
+    this.set('name', name);
+  },
+});
+
+Component.extend({
+  tagName: 'em',
+});
+
+Component.extend({
+  classNames: ['my-class', 'my-other-class'],
+});
+
+Component.extend({
+  classNameBindings: ['propertyA', 'propertyB'],
+  propertyA: 'from-a',
+  propertyB: computed(function() {
+    if (!this.get('propertyA')) {
+      return 'from-b';
+    }
+  }),
+});
+
+Component.extend({
+  classNameBindings: ['hovered'],
+  hovered: true,
+});
+
+Component.extend({
+  classNameBindings: ['messages.empty'],
+  messages: Object.create({
+    empty: true,
+  }),
+});
+
+Component.extend({
+  classNameBindings: ['isEnabled:enabled:disabled'],
+  isEnabled: true,
+});
+
+Component.extend({
+  classNameBindings: ['isEnabled::disabled'],
+  isEnabled: true,
+});
+
+Component.extend({
+  tagName: 'a',
+  attributeBindings: ['href'],
+  href: 'http://google.com',
+});
+
+Component.extend({
+  tagName: 'a',
+  attributeBindings: ['url:href'],
+  url: 'http://google.com',
+});
+
+Component.extend({
+  tagName: 'use',
+  attributeBindings: ['xlinkHref:xlink:href'],
+  xlinkHref: '#triangle',
+});
+
+Component.extend({
+  tagName: 'input',
+  attributeBindings: ['disabled'],
+  disabled: false,
+});
+
+Component.extend({
+  tagName: 'input',
+  attributeBindings: ['disabled'],
+  disabled: computed(() => {
+    if ('someLogic') {
+      return true;
+    } else {
+      return false;
+    }
+  }),
+});
+
+Component.extend({
+  tagName: 'form',
+  attributeBindings: ['novalidate'],
+  novalidate: null,
+});
+
+Component.extend({
+  click(event: object) {
+    // will be called when an instance's
+    // rendered element is clicked
+  },
+});
diff --git a/types/ember/test/computed.ts b/types/ember/test/computed.ts
new file mode 100755
index 0000000000..c812ef62b3
--- /dev/null
+++ b/types/ember/test/computed.ts
@@ -0,0 +1,162 @@
+import Ember from 'ember';
+import Component from '@ember/component';
+import { or } from '@ember/object/computed';
+import { assertType } from './lib/assert';
+
+const Person = Ember.Object.extend({
+    firstName: '',
+    lastName: '',
+    age: 0,
+
+    noArgs: Ember.computed<string>(() => 'test'),
+
+    fullName: Ember.computed<string>('firstName', 'lastName', function() {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }),
+
+    fullNameReadonly: Ember.computed<string>('fullName', function() {
+        return this.get('fullName');
+    }).readOnly(),
+
+    fullNameWritable: Ember.computed<string>('firstName', 'lastName', {
+        get() {
+            return this.get('fullName');
+        },
+        set(key, value) {
+            let [first, last] = value.split(' ');
+            this.set('firstName', first);
+            this.set('lastName', last);
+            return value;
+        }
+    }),
+
+    fullNameGetOnly: Ember.computed<string>('fullName', {
+        get() {
+            return this.get('fullName');
+        }
+    }),
+
+    fullNameSetOnly: Ember.computed<string>('firstName', 'lastName', {
+        set(key, value) {
+            let [first, last] = value.split(' ');
+            this.set('firstName', first);
+            this.set('lastName', last);
+            return value;
+        }
+    }),
+
+    combinators: Ember.computed<string>(function() {
+        return this.get('firstName');
+    }).property('firstName')
+      .meta({ foo: 'bar' })
+      .volatile()
+      .readOnly()
+});
+
+const person = Person.create({
+    firstName: 'Fred',
+    lastName: 'Smith',
+    age: 29,
+});
+
+assertType<string>(person.firstName);
+assertType<number>(person.age);
+assertType<Ember.ComputedProperty<string>>(person.noArgs);
+assertType<Ember.ComputedProperty<string>>(person.fullName);
+assertType<Ember.ComputedProperty<string>>(person.fullNameReadonly);
+assertType<Ember.ComputedProperty<string>>(person.fullNameWritable);
+assertType<Ember.ComputedProperty<string>>(person.fullNameGetOnly);
+assertType<Ember.ComputedProperty<string>>(person.fullNameSetOnly);
+assertType<Ember.ComputedProperty<string>>(person.combinators);
+
+assertType<string>(person.get('firstName'));
+assertType<number>(person.get('age'));
+assertType<string>(person.get('noArgs'));
+assertType<string>(person.get('fullName'));
+assertType<string>(person.get('fullNameReadonly'));
+assertType<string>(person.get('fullNameWritable'));
+assertType<string>(person.get('fullNameGetOnly'));
+assertType<string>(person.get('fullNameSetOnly'));
+assertType<string>(person.get('combinators'));
+
+assertType<{ firstName: string, fullName: string, age: number }>(person.getProperties('firstName', 'fullName', 'age'));
+
+const person2 = Person.create({
+    fullName: 'Fred Smith'
+});
+
+assertType<string>(person2.get('firstName'));
+assertType<string>(person2.get('fullName'));
+
+const person3 = Person.extend({
+    firstName: 'Fred',
+    fullName: 'Fred Smith'
+}).create();
+
+assertType<string>(person3.get('firstName'));
+assertType<string>(person3.get('fullName'));
+
+const person4 = Person.extend({
+    firstName: Ember.computed(() => 'Fred'),
+    fullName: Ember.computed(() => 'Fred Smith')
+}).create();
+
+assertType<string>(person4.get('firstName'));
+assertType<string>(person4.get('fullName'));
+
+// computed property macros
+const objectWithComputedProperties = Ember.Object.extend({
+    alias: Ember.computed.alias('foo'),
+    and: Ember.computed.and('foo', 'bar', 'baz', 'qux'),
+    bool: Ember.computed.bool('foo'),
+    collect: Ember.computed.collect('foo', 'bar', 'baz', 'qux'),
+    deprecatingAlias: Ember.computed.deprecatingAlias('foo', {
+        id: 'hamster.deprecate-banana',
+        until: '3.0.0'
+    }),
+    empty: Ember.computed.empty('foo'),
+    equalNumber: Ember.computed.equal('foo', 1),
+    equalString: Ember.computed.equal('foo', 'bar'),
+    equalObject: Ember.computed.equal('foo', {}),
+    filter: Ember.computed.filter('foo', (item) => item === 'bar'),
+    filterBy1: Ember.computed.filterBy('foo', 'bar'),
+    filterBy2: Ember.computed.filterBy('foo', 'bar', false),
+    gt: Ember.computed.gt('foo', 3),
+    gte: Ember.computed.gte('foo', 3),
+    intersect: Ember.computed.intersect('foo', 'bar', 'baz', 'qux'),
+    lt: Ember.computed.lt('foo', 3),
+    lte: Ember.computed.lte('foo', 3),
+    map: Ember.computed.map('foo', (item, index) => item.bar),
+    mapBy: Ember.computed.mapBy('foo', 'bar'),
+    match: Ember.computed.match('foo', /^tom.ter$/),
+    max: Ember.computed.max('foo'),
+    min: Ember.computed.min('foo'),
+    none: Ember.computed.none('foo'),
+    not: Ember.computed.not('foo'),
+    notEmpty: Ember.computed.notEmpty('foo'),
+    oneWay: Ember.computed.oneWay('foo'),
+    or: Ember.computed.or('foo', 'bar', 'baz', 'qux'),
+    readOnly: Ember.computed.readOnly('foo'),
+    reads: Ember.computed.reads('foo'),
+    setDiff: Ember.computed.setDiff('foo', 'bar'),
+    sort1: Ember.computed.sort('foo', 'bar'),
+    sort2: Ember.computed.sort('foo', (itemA, itemB) => {
+        if (itemA < itemB) {
+            return -1;
+        } else if (itemA > itemB) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }),
+    sum: Ember.computed.sum('foo'),
+    union: Ember.computed.union('foo', 'bar', 'baz', 'qux'),
+    uniq: Ember.computed.uniq('foo'),
+    uniqBy: Ember.computed.uniqBy('foo', 'bar')
+});
+
+const component2 = Component.extend({
+    isAnimal: or('isDog', 'isCat')
+}).create();
+
+assertType<boolean>(component2.get('isAnimal'));
diff --git a/types/ember/test/controller.ts b/types/ember/test/controller.ts
new file mode 100755
index 0000000000..02307f447c
--- /dev/null
+++ b/types/ember/test/controller.ts
@@ -0,0 +1,11 @@
+import Controller from '@ember/controller';
+
+Controller.extend ({
+  queryParams: ['category'],
+  category: null,
+  isExpanded: false,
+
+  toggleBody() {
+    this.toggleProperty('isExpanded');
+  }
+});
diff --git a/types/ember/test/create.ts b/types/ember/test/create.ts
new file mode 100755
index 0000000000..6dc61b80f6
--- /dev/null
+++ b/types/ember/test/create.ts
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const obj = Ember.Object.create({ a: 1 }, { b: 2 }, { c: 3 });
+assertType<number>(obj.a);
+assertType<number>(obj.b);
+assertType<number>(obj.c);
diff --git a/types/ember/test/detect-instance.ts b/types/ember/test/detect-instance.ts
new file mode 100755
index 0000000000..1b25beb244
--- /dev/null
+++ b/types/ember/test/detect-instance.ts
@@ -0,0 +1,20 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const ExtendClass = Ember.Object.extend({
+    foo: 'hello'
+});
+
+class ES6Class extends Ember.Object {
+    bar: string;
+}
+
+let testObject = null;
+
+if (ExtendClass.detectInstance(testObject)) {
+    assertType<string>(testObject.foo);
+}
+
+if (ES6Class.detectInstance(testObject)) {
+    assertType<string>(testObject.bar);
+}
diff --git a/types/ember/test/detect.ts b/types/ember/test/detect.ts
new file mode 100755
index 0000000000..cd54880f9f
--- /dev/null
+++ b/types/ember/test/detect.ts
@@ -0,0 +1,20 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const ExtendClass = Ember.Object.extend({
+    foo: 'hello'
+});
+
+class ES6Class extends Ember.Object {
+    bar: string;
+}
+
+let TestClass = Ember.Object;
+
+if (ExtendClass.detect(TestClass)) {
+    assertType<string>(TestClass.create().foo);
+}
+
+if (ES6Class.detect(TestClass)) {
+    assertType<string>(TestClass.create().bar);
+}
diff --git a/types/ember/test/ember-tests.ts b/types/ember/test/ember-tests.ts
new file mode 100755
index 0000000000..94de3bf259
--- /dev/null
+++ b/types/ember/test/ember-tests.ts
@@ -0,0 +1,169 @@
+import Ember from 'ember';
+
+let App: any;
+
+App = Ember.Application.create();
+App.president = Ember.Object.create({
+    name: 'Barack Obama',
+});
+App.country = Ember.Object.create({
+    presidentNameBinding: 'MyApp.president.name',
+});
+App.country.get('presidentName');
+App.president = Ember.Object.create({
+    firstName: 'Barack',
+    lastName: 'Obama',
+    fullName: Ember.computed(function() {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }),
+});
+App.president.get('fullName');
+
+declare class MyPerson extends Ember.Object {
+    static createMan(): MyPerson;
+}
+MyPerson.createMan();
+
+const Person1 = Ember.Object.extend({
+    say: (thing: string) => {
+        alert(thing);
+    },
+});
+
+declare class MyPerson2 extends Ember.Object {
+    helloWorld(): void;
+}
+MyPerson2.create().helloWorld();
+
+const tom = Person1.create({
+    name: 'Tom Dale',
+    helloWorld() {
+        this.say('Hi my name is ' + this.get('name'));
+    },
+});
+tom.helloWorld();
+
+const PersonReopened = Person1.reopen({ isPerson: true });
+PersonReopened.create().get('isPerson');
+
+App.todosController = Ember.Object.create({
+    todos: [Ember.Object.create({ isDone: false })],
+    remaining: Ember.computed('todos.@each.isDone', function() {
+        const todos = this.get('todos');
+        return todos.filterProperty('isDone', false).get('length');
+    }),
+});
+
+const todos = App.todosController.get('todos');
+let todo = todos.objectAt(0);
+todo.set('isDone', true);
+App.todosController.get('remaining');
+todo = Ember.Object.create({ isDone: false });
+todos.pushObject(todo);
+App.todosController.get('remaining');
+
+App.wife = Ember.Object.create({
+    householdIncome: 80000,
+});
+App.husband = Ember.Object.create({
+    householdIncomeBinding: 'App.wife.householdIncome',
+});
+App.husband.get('householdIncome');
+App.husband.set('householdIncome', 90000);
+App.wife.get('householdIncome');
+
+App.user = Ember.Object.create({
+    fullName: 'Kara Gates',
+});
+App.user.set('fullName', 'Krang Gates');
+App.userView.set('userName', 'Truckasaurus Gates');
+App.user.get('fullName');
+
+App = Ember.Application.create({
+    rootElement: '#sidebar',
+});
+
+App.userController = Ember.Object.create({
+    content: Ember.Object.create({
+        firstName: 'Albert',
+        lastName: 'Hofmann',
+        posts: 25,
+        hobbies: 'Riding bicycles',
+    }),
+});
+
+Handlebars.registerHelper(
+    'highlight',
+    (property: string, options: any) =>
+        new Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
+);
+
+const coolView = App.CoolView.create();
+
+const Person2 = Ember.Object.extend({
+    name: '',
+    sayHello() {
+        console.log('Hello from ' + this.get('name'));
+    },
+});
+const people = Ember.A([
+    Person2.create({ name: 'Juan' }),
+    Person2.create({ name: 'Charles' }),
+    Person2.create({ name: 'Majd' }),
+]);
+people.invoke('sayHello');
+
+const arr = Ember.A([Ember.Object.create(), Ember.Object.create()]);
+arr.setEach('name', 'unknown');
+arr.getEach('name');
+
+const Person3 = Ember.Object.extend({
+    name: '',
+    isHappy: false,
+});
+const people2 = Ember.A([
+    Person3.create({ name: 'Yehuda', isHappy: true }),
+    Person3.create({ name: 'Majd', isHappy: false }),
+]);
+const isHappy = (person: typeof Person3.prototype): boolean => {
+    return !!person.get('isHappy');
+};
+people2.every(isHappy);
+people2.any(isHappy);
+people2.isEvery('isHappy', true);
+people2.isAny('isHappy', true);
+people2.isAny('isHappy');
+
+// Examples taken from http://emberjs.com/api/classes/Em.RSVP.Promise.html
+const promise = new Ember.RSVP.Promise<string>((resolve: Function, reject: Function) => {
+    // on success
+    resolve('ok!');
+
+    // on failure
+    reject('no-k!');
+});
+
+promise.then(
+    (value: any) => {
+        // on fulfillment
+    },
+    (reason: any) => {
+        // on rejection
+    }
+);
+
+// make sure Ember.RSVP.Promise can be reference as a type
+declare function promiseReturningFunction(urn: string): Ember.RSVP.Promise<string>;
+
+const mix1 = Ember.Mixin.create({
+    foo: 1,
+});
+
+const mix2 = Ember.Mixin.create({
+    bar: 2,
+});
+
+const component1 = Ember.Component.extend(mix1, mix2, {
+    lyft: Ember.inject.service(),
+    cars: Ember.computed.readOnly('lyft.cars'),
+});
diff --git a/types/ember/test/event.ts b/types/ember/test/event.ts
new file mode 100755
index 0000000000..c934072440
--- /dev/null
+++ b/types/ember/test/event.ts
@@ -0,0 +1,58 @@
+import Ember from 'ember';
+
+function testOn() {
+    let Job = Ember.Object.extend({
+        logCompleted: Ember.on('completed', function() {
+            console.log('Job completed!');
+        })
+    });
+
+    let job = Job.create();
+
+    Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
+}
+
+function testEvented() {
+    let Person = Ember.Object.extend(Ember.Evented, {
+        greet() {
+            this.trigger('greet');
+        }
+    });
+
+    let person = Person.create();
+
+    person.on('greet', function() {
+        console.log('Our person has greeted');
+    });
+
+    person.on('greet', function() {
+        console.log('Our person has greeted');
+    }).one('greet', function() {
+        console.log('Offer one-time special');
+    }).off('event', {}, function() {});
+
+    person.greet();
+}
+
+function testObserver() {
+    Ember.Object.extend({
+        valueObserver: Ember.observer('value', function() {
+            // Executes whenever the "value" property changes
+        })
+    });
+}
+
+function testListener() {
+    Ember.Component.extend({
+        init() {
+            Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener');
+            Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener', true);
+            Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener);
+            Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener, true);
+            Ember.removeListener(this, 'willDestroyElement', this, 'willDestroyListener');
+            Ember.removeListener(this, 'willDestroyElement', this, this.willDestroyListener);
+        },
+        willDestroyListener() {
+        }
+    });
+}
diff --git a/types/ember/test/extend.ts b/types/ember/test/extend.ts
new file mode 100755
index 0000000000..a54f81a600
--- /dev/null
+++ b/types/ember/test/extend.ts
@@ -0,0 +1,61 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const Person = Ember.Object.extend({
+    firstName: '',
+    lastName: '',
+
+    getFullName() {
+        return `${this.firstName} ${this.lastName}`;
+    },
+    getFullName2(): string {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }
+});
+
+assertType<string>(Person.prototype.firstName);
+assertType<() => string>(Person.prototype.getFullName);
+
+const person = Person.create({
+    firstName: 'Joe',
+    lastName: 'Blow',
+    extra: 42
+});
+
+assertType<string>(person.getFullName());
+assertType<number>(person.extra);
+
+class ES6Person extends Ember.Object {
+    firstName: string;
+    lastName: string;
+
+    get fullName() {
+        return `${this.firstName} ${this.lastName}`;
+    }
+    get fullName2(): string {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }
+}
+
+assertType<string>(ES6Person.prototype.firstName);
+assertType<string>(ES6Person.prototype.fullName);
+
+const es6Person = ES6Person.create({
+    firstName: 'Joe',
+    lastName: 'Blow',
+    extra: 42
+});
+
+assertType<string>(es6Person.fullName);
+assertType<number>(es6Person.extra);
+
+class PersonWithStatics extends Ember.Object {
+    static isPerson = true;
+}
+const PersonWithStatics2 = PersonWithStatics.extend({});
+class PersonWithStatics3 extends PersonWithStatics {}
+class PersonWithStatics4 extends PersonWithStatics2 {}
+assertType<boolean>(PersonWithStatics.isPerson);
+assertType<boolean>(PersonWithStatics2.isPerson);
+assertType<boolean>(PersonWithStatics3.isPerson);
+assertType<boolean>(PersonWithStatics4.isPerson);
diff --git a/types/ember/test/function-ext.ts b/types/ember/test/function-ext.ts
new file mode 100755
index 0000000000..37d831d49a
--- /dev/null
+++ b/types/ember/test/function-ext.ts
@@ -0,0 +1,21 @@
+import Ember from 'ember';
+
+declare global {
+    interface Function extends Ember.FunctionPrototypeExtensions {}
+}
+
+Ember.Object.extend({
+    foo: '',
+
+    arr: function() {
+        return [];
+    }.property(),
+
+    alias: function(this: any) {
+        return this.get('foo');
+    }.property('foo', 'bar.@each.baz'),
+
+    observer: function() {}.observes('foo', 'bar'),
+
+    on: function() {}.on('foo', 'bar'),
+});
diff --git a/types/ember/test/helper.ts b/types/ember/test/helper.ts
new file mode 100755
index 0000000000..efe3ce33d7
--- /dev/null
+++ b/types/ember/test/helper.ts
@@ -0,0 +1,27 @@
+import Ember from 'ember';
+
+const FormatCurrencyHelper = Ember.Helper.helper(function(params, hash: { currency: string }) {
+    let cents = params[0];
+    let currency = hash.currency;
+    return `${currency}${cents * 0.01}`;
+});
+
+class User extends Ember.Object {
+    email: string;
+}
+
+class SessionService extends Ember.Service {
+    currentUser: User;
+}
+
+const CurrentUserEmailHelper = Ember.Helper.extend({
+    session: Ember.inject.service() as Ember.ComputedProperty<SessionService>,
+    onNewUser: Ember.observer('session.currentUser', function(this: Ember.Helper) {
+        this.recompute();
+    }),
+    compute(): string {
+        return this.get('session')
+            .get('currentUser')
+            .get('email');
+    },
+});
diff --git a/types/ember/test/inject.ts b/types/ember/test/inject.ts
new file mode 100755
index 0000000000..dd628f6d2a
--- /dev/null
+++ b/types/ember/test/inject.ts
@@ -0,0 +1,20 @@
+import Ember from 'ember';
+
+class AuthService extends Ember.Service {
+    isAuthenticated: boolean;
+}
+
+class ApplicationController extends Ember.Controller {
+    transitionToLogin() {}
+}
+
+class LoginRoute extends Ember.Route {
+    auth = Ember.inject.service('authentication') as Ember.ComputedProperty<AuthService>;
+    application = Ember.inject.controller() as Ember.ComputedProperty<ApplicationController>;
+
+    didTransition() {
+        if (!this.get('auth').get('isAuthenticated')) {
+            this.get('application').transitionToLogin();
+        }
+    }
+}
diff --git a/types/ember/test/lib/assert.ts b/types/ember/test/lib/assert.ts
new file mode 100755
index 0000000000..d6748cd5bc
--- /dev/null
+++ b/types/ember/test/lib/assert.ts
@@ -0,0 +1,5 @@
+/** Static assertion that `value` has type `T` */
+// Disable tslint here b/c the generic is used to let us do a type coercion and
+// validate that coercion works for the type value "passed into" the function.
+// tslint:disable-next-line:no-unnecessary-generics
+export declare function assertType<T>(value: T): void;
diff --git a/types/ember/test/mixin.ts b/types/ember/test/mixin.ts
new file mode 100755
index 0000000000..2c417c00da
--- /dev/null
+++ b/types/ember/test/mixin.ts
@@ -0,0 +1,46 @@
+import Ember from 'ember';
+import { assertType } from "./lib/assert";
+
+interface EditableMixin {
+    edit(): void;
+    isEditing: boolean;
+}
+
+const EditableMixin: Ember.Mixin<EditableMixin, Ember.Route> = Ember.Mixin.create({
+    edit() {
+        this.get('controller');
+        console.log('starting to edit');
+        this.set('isEditing', true);
+    },
+    isEditing: false
+});
+
+const EditableComment = Ember.Route.extend(EditableMixin, {
+    postId: 0,
+
+    canEdit() {
+        return !this.isEditing;
+    },
+
+    tryEdit() {
+        if (this.canEdit()) {
+            this.edit();
+        }
+    }
+});
+
+const comment = EditableComment.create({
+    postId: 42
+});
+
+comment.edit();
+comment.canEdit();
+comment.tryEdit();
+assertType<boolean>(comment.isEditing);
+assertType<number>(comment.postId);
+
+const LiteralMixins = Ember.Object.extend({ a: 1 }, { b: 2 }, { c: 3 });
+const obj = LiteralMixins.create();
+assertType<number>(obj.a);
+assertType<number>(obj.b);
+assertType<number>(obj.c);
diff --git a/types/ember/test/object.ts b/types/ember/test/object.ts
new file mode 100755
index 0000000000..cfe2c9380f
--- /dev/null
+++ b/types/ember/test/object.ts
@@ -0,0 +1,15 @@
+import Ember from 'ember';
+
+const LifetimeHooks = Ember.Object.extend({
+    resource: null as {} | null,
+
+    init() {
+        this._super();
+        this.resource = {};
+    },
+
+    willDestroy() {
+        delete this.resource;
+        this._super();
+    }
+});
diff --git a/types/ember/test/observable.ts b/types/ember/test/observable.ts
new file mode 100755
index 0000000000..680b6decf7
--- /dev/null
+++ b/types/ember/test/observable.ts
@@ -0,0 +1,88 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+class MyComponent extends Ember.Component {
+    foo = 'bar';
+
+    init() {
+        this._super.apply(this, arguments);
+        this.addObserver('foo', this, 'fooDidChange');
+        this.addObserver('foo', this, this.fooDidChange);
+        Ember.addObserver(this, 'foo', this, 'fooDidChange');
+        Ember.addObserver(this, 'foo', this, this.fooDidChange);
+        this.removeObserver('foo', this, 'fooDidChange');
+        this.removeObserver('foo', this, this.fooDidChange);
+        Ember.removeObserver(this, 'foo', this, 'fooDidChange');
+        Ember.removeObserver(this, 'foo', this, this.fooDidChange);
+    }
+
+    fooDidChange(sender: MyComponent, key: 'foo') {
+        // your code
+    }
+}
+
+const myComponent = MyComponent.create();
+myComponent.addObserver('foo', null, () => {});
+myComponent.set('foo', 'baz');
+
+const person = Ember.Object.create({
+    name: 'Fred',
+    age: 29,
+    capitalized: Ember.computed<string>(function() {
+        return this.get('name').toUpperCase();
+    })
+});
+
+const pojo = { name: 'Fred', age: 29 };
+
+function testGet() {
+    assertType<string>(Ember.get(person, 'name'));
+    assertType<number>(Ember.get(person, 'age'));
+    assertType<string>(Ember.get(person, 'capitalized'));
+    assertType<string>(person.get('name'));
+    assertType<number>(person.get('age'));
+    assertType<string>(person.get('capitalized'));
+    assertType<string>(Ember.get(pojo, 'name'));
+}
+
+function testGetProperties() {
+    assertType<{ name: string }>(Ember.getProperties(person, 'name'));
+    assertType<{ name: string, age: number }>(Ember.getProperties(person, 'name', 'age'));
+    assertType<{ name: string, age: number }>(Ember.getProperties(person, [ 'name', 'age' ]));
+    assertType<{ name: string, age: number, capitalized: string }>(Ember.getProperties(person, 'name', 'age', 'capitalized'));
+    assertType<{ name: string }>(person.getProperties('name'));
+    assertType<{ name: string, age: number }>(person.getProperties('name', 'age'));
+    assertType<{ name: string, age: number }>(person.getProperties([ 'name', 'age' ]));
+    assertType<{ name: string, age: number, capitalized: string }>(person.getProperties('name', 'age', 'capitalized'));
+    assertType<{ name: string, age: number }>(Ember.getProperties(pojo, 'name', 'age'));
+}
+
+function testGetWithDefault() {
+    assertType<string>(Ember.getWithDefault(person, 'name', 'Joe'));
+    assertType<number>(Ember.getWithDefault(person, 'age', 20));
+    assertType<string>(Ember.getWithDefault(person, 'capitalized', 'JOE'));
+    assertType<string>(person.getWithDefault('name', 'Joe'));
+    assertType<number>(person.getWithDefault('age', 20));
+    assertType<string>(person.getWithDefault('capitalized', 'JOE'));
+    assertType<string>(Ember.getWithDefault(pojo, 'name', 'JOE'));
+}
+
+function testSet() {
+    assertType<string>(Ember.set(person, 'name', 'Joe'));
+    assertType<number>(Ember.set(person, 'age', 35));
+    assertType<string>(Ember.set(person, 'capitalized', 'JOE'));
+    assertType<string>(person.set('name', 'Joe'));
+    assertType<number>(person.set('age', 35));
+    assertType<string>(person.set('capitalized', 'JOE'));
+    assertType<string>(Ember.set(pojo, 'name', 'Joe'));
+}
+
+function testSetProperties() {
+    assertType<{ name: string }>(Ember.setProperties(person, { name: 'Joe' }));
+    assertType<{ name: string, age: number }>(Ember.setProperties(person, { name: 'Joe', age: 35 }));
+    assertType<{ name: string, capitalized: string }>(Ember.setProperties(person, { name: 'Joe', capitalized: 'JOE' }));
+    assertType<{ name: string }>(person.setProperties({ name: 'Joe' }));
+    assertType<{ name: string, age: number }>(person.setProperties({ name: 'Joe', age: 35 }));
+    assertType<{ name: string, capitalized: string }>(person.setProperties({ name: 'Joe', capitalized: 'JOE' }));
+    assertType<{ name: string, age: number }>(Ember.setProperties(pojo, { name: 'Joe', age: 35 }));
+}
diff --git a/types/ember/test/reopen.ts b/types/ember/test/reopen.ts
new file mode 100755
index 0000000000..6c13ca4155
--- /dev/null
+++ b/types/ember/test/reopen.ts
@@ -0,0 +1,65 @@
+import Ember from 'ember';
+import { assertType } from "./lib/assert";
+
+type Person = typeof Person.prototype;
+const Person = Ember.Object.extend({
+    name: '',
+    sayHello() {
+        alert(`Hello. My name is ${this.get('name')}`);
+    }
+});
+
+assertType<Person>(Person.reopen());
+
+assertType<string>(Person.create().name);
+assertType<void>(Person.create().sayHello());
+
+const Person2 = Person.reopenClass({
+    species: 'Homo sapiens',
+
+    createPerson(name: string): Person {
+        return Person.create({ name });
+    }
+});
+
+assertType<string>(Person2.create().name);
+assertType<void>(Person2.create().sayHello());
+assertType<string>(Person2.species);
+
+let tom = Person2.create({
+    name: 'Tom Dale'
+});
+let yehuda = Person2.createPerson('Yehuda Katz');
+
+tom.sayHello(); // "Hello. My name is Tom Dale"
+yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+alert(Person2.species); // "Homo sapiens"
+
+const Person3 = Person2.reopen({
+    goodbyeMessage: 'goodbye',
+
+    sayGoodbye() {
+        alert(`${this.get('goodbyeMessage')}, ${this.get('name')}`);
+    }
+});
+
+const person3 = Person3.create();
+person3.get('name');
+person3.get('goodbyeMessage');
+person3.sayHello();
+person3.sayGoodbye();
+
+interface AutoResizeMixin { resizable: true; }
+declare const AutoResizeMixin: Ember.Mixin<AutoResizeMixin>;
+
+const ResizableTextArea = Ember.TextArea.reopen(AutoResizeMixin, {
+    scaling: 1.0
+});
+const text = ResizableTextArea.create();
+assertType<boolean>(text.resizable);
+assertType<number>(text.scaling);
+
+const Reopened = Ember.Object.reopenClass({ a: 1 }, { b: 2 }, { c: 3 });
+assertType<number>(Reopened.a);
+assertType<number>(Reopened.b);
+assertType<number>(Reopened.c);
diff --git a/types/ember/test/route.ts b/types/ember/test/route.ts
new file mode 100755
index 0000000000..22193bd88d
--- /dev/null
+++ b/types/ember/test/route.ts
@@ -0,0 +1,87 @@
+import Route from '@ember/routing/route';
+import Object from '@ember/object';
+import Array from '@ember/array';
+import Ember from 'ember'; // currently needed for Transition
+
+interface Post extends Ember.Object {}
+
+interface Posts extends Array<Post> {}
+
+Route.extend({
+    beforeModel(transition: Ember.Transition) {
+        this.transitionTo('someOtherRoute');
+    },
+});
+
+Route.extend({
+    afterModel(posts: Posts, transition: Ember.Transition) {
+        if (posts.length === 1) {
+            this.transitionTo('post.show', posts.firstObject);
+        }
+    },
+});
+
+Route.extend({
+    actions: {
+        showModal(evt: { modalName: string }) {
+            this.render(evt.modalName, {
+                outlet: 'modal',
+                into: 'application',
+            });
+        },
+        hideModal(evt: { modalName: string }) {
+            this.disconnectOutlet({
+                outlet: 'modal',
+                parentView: 'application',
+            });
+        },
+    },
+});
+
+Ember.Route.extend({
+    model() {
+        return this.modelFor('post');
+    },
+});
+
+Route.extend({
+    queryParams: {
+        memberQp: { refreshModel: true },
+    },
+});
+
+Route.extend({
+    renderTemplate() {
+        this.render('photos', {
+            into: 'application',
+            outlet: 'anOutletName',
+        });
+    },
+});
+
+Route.extend({
+    renderTemplate(controller: Ember.Controller, model: {}) {
+        this.render('posts', {
+            view: 'someView', // the template to render, referenced by name
+            into: 'application', // the template to render into, referenced by name
+            outlet: 'anOutletName', // the outlet inside `options.into` to render into.
+            controller: 'someControllerName', // the controller to use for this template, referenced by name
+            model, // the model to set on `options.controller`.
+        });
+    },
+});
+
+Route.extend({
+    resetController(controller: Ember.Controller, isExiting: boolean, transition: boolean) {
+        if (isExiting) {
+            //   controller.set('page', 1);
+        }
+    },
+});
+
+Route.extend({
+    setupController(controller: Ember.Controller, model: {}) {
+        this._super(controller, model);
+        this.controllerFor('application').set('model', model);
+    },
+});
diff --git a/types/ember/test/router.ts b/types/ember/test/router.ts
new file mode 100755
index 0000000000..9ec79ce281
--- /dev/null
+++ b/types/ember/test/router.ts
@@ -0,0 +1,24 @@
+import Ember from 'ember';
+
+const AppRouter = Ember.Router.extend({
+});
+
+AppRouter.map(function() {
+    this.route('index', { path: '/' });
+    this.route('about');
+    this.route('favorites', { path: '/favs' });
+    this.route('posts', function() {
+        this.route('index', { path: '/' });
+        this.route('new');
+        this.route('post', { path: '/post/:post_id', resetNamespace: true });
+        this.route('comments', { resetNamespace: true }, function() {
+            this.route('new');
+        });
+    });
+    this.route('photo', { path: '/photo/:id' }, function() {
+        this.route('comment', { path: '/comment/:id' });
+    });
+    this.route('not-found', { path: '/*path' });
+    this.mount('my-engine');
+    this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine'});
+});
diff --git a/types/ember/test/run.ts b/types/ember/test/run.ts
new file mode 100755
index 0000000000..8d1c82e6e3
--- /dev/null
+++ b/types/ember/test/run.ts
@@ -0,0 +1,204 @@
+import Ember from 'ember';
+import RSVP from 'rsvp';
+import { run } from '@ember/runloop';
+import { assertType } from "./lib/assert";
+
+assertType<string[]>(Ember.run.queues);
+
+function testRun() {
+    let r = run(function() {
+        // code to be executed within a RunLoop
+        return 123;
+    });
+    assertType<number>(r);
+
+    function destroyApp(application: Ember.Application) {
+        Ember.run(application, 'destroy');
+        run(application, function() {
+            this.destroy();
+        });
+    }
+}
+
+function testBind() {
+    Ember.Component.extend({
+        init() {
+            const bound = Ember.run.bind(this, this.setupEditor);
+            bound();
+        },
+
+        editor: null as string | null,
+
+        setupEditor(editor: string) {
+            this.set('editor', editor);
+        }
+    });
+}
+
+function testCancel() {
+    const myContext = {};
+
+    let runNext = run.next(myContext, function() {
+        // will not be executed
+    });
+
+    run.cancel(runNext);
+
+    let runLater = run.later(myContext, function() {
+        // will not be executed
+    }, 500);
+
+    run.cancel(runLater);
+
+    let runScheduleOnce = run.scheduleOnce('afterRender', myContext, function() {
+        // will not be executed
+    });
+
+    run.cancel(runScheduleOnce);
+
+    let runOnce = run.once(myContext, function() {
+        // will not be executed
+    });
+
+    run.cancel(runOnce);
+
+    let throttle = run.throttle(myContext, function() {
+        // will not be executed
+    }, 1, false);
+
+    run.cancel(throttle);
+
+    let debounce = run.debounce(myContext, function() {
+        // will not be executed
+    }, 1);
+
+    run.cancel(debounce);
+
+    let debounceImmediate = run.debounce(myContext, function() {
+        // will be executed since we passed in true (immediate)
+    }, 100, true);
+
+    // the 100ms delay until this method can be called again will be canceled
+    run.cancel(debounceImmediate);
+}
+
+function testDebounce() {
+    function runIt() {
+    }
+
+    let myContext = { name: 'debounce' };
+
+    run.debounce(runIt, 150);
+    run.debounce(myContext, runIt, 150);
+    run.debounce(myContext, runIt, 150, true);
+
+    Ember.Component.extend({
+        searchValue: 'test',
+        fetchResults(value: string) {},
+
+        actions: {
+            handleTyping() {
+                // the fetchResults function is passed into the component from its parent
+                Ember.run.debounce(this, this.get('fetchResults'), this.get('searchValue'), 250);
+            }
+        }
+    });
+}
+
+function testBegin() {
+    run.begin();
+    // code to be executed within a RunLoop
+    run.end();
+}
+
+function testJoin() {
+    run.join(function() {
+        // creates a new run-loop
+    });
+
+    run(function() {
+        // creates a new run-loop
+        run.join(function() {
+            // joins with the existing run-loop, and queues for invocation on
+            // the existing run-loops action queue.
+        });
+    });
+
+    new RSVP.Promise(function(resolve) {
+        Ember.run.later(function() {
+            resolve({ msg: 'Hold Your Horses' });
+        }, 3000);
+    });
+}
+
+function testLater() {
+    const myContext = {};
+    run.later(myContext, function() {
+        // code here will execute within a RunLoop in about 500ms with this == myContext
+    }, 500);
+}
+
+function testNext() {
+    const myContext = {};
+    run.next(myContext, function() {
+        // code to be executed in the next run loop,
+        // which will be scheduled after the current one
+    });
+}
+
+function testOnce() {
+    Ember.Component.extend({
+        init() {
+            Ember.run.once(this, 'processFullName');
+        },
+
+        processFullName() {
+        }
+    });
+}
+
+function testSchedule() {
+    Ember.Component.extend({
+        init() {
+            run.schedule('sync', this, function() {
+                // this will be executed in the first RunLoop queue, when bindings are synced
+                console.log('scheduled on sync queue');
+            });
+
+            run.schedule('actions', this, function() {
+                // this will be executed in the 'actions' queue, after bindings have synced.
+                console.log('scheduled on actions queue');
+            });
+        }
+    });
+
+    Ember.run.schedule('actions', () => {
+        // Do more things
+    });
+}
+
+function testScheduleOnce() {
+    function sayHi() {
+        console.log('hi');
+    }
+
+    const myContext = {};
+    run(function() {
+        run.scheduleOnce('afterRender', myContext, sayHi);
+        run.scheduleOnce('afterRender', myContext, sayHi);
+        // sayHi will only be executed once, in the afterRender queue of the RunLoop
+    });
+    run.scheduleOnce('actions', myContext, function() {
+        console.log('Closure');
+    });
+}
+
+function testThrottle() {
+    function runIt() {
+    }
+
+    let myContext = { name: 'throttle' };
+
+    run.throttle(runIt, 150);
+    run.throttle(myContext, runIt, 150);
+}
diff --git a/types/ember/test/test.ts b/types/ember/test/test.ts
new file mode 100755
index 0000000000..6cd1b2b908
--- /dev/null
+++ b/types/ember/test/test.ts
@@ -0,0 +1,32 @@
+import Ember from 'ember';
+
+let pending = 0;
+Ember.Test.registerWaiter(() => pending !== 0);
+
+declare const MyDb: {
+    hasPendingTransactions(): boolean;
+};
+Ember.Test.registerWaiter(MyDb, MyDb.hasPendingTransactions);
+
+Ember.Test.promise(function(resolve) {
+    window.setTimeout(resolve, 500);
+});
+
+Ember.Test.registerHelper('boot', function(app) {
+    Ember.run(app, app.advanceReadiness);
+});
+
+Ember.Test.registerAsyncHelper('boot', function(app) {
+    Ember.run(app, app.advanceReadiness);
+});
+
+Ember.Test.registerAsyncHelper('waitForPromise', (app, promise) => {
+    return new Ember.Test.Promise((resolve) => {
+        Ember.Test.adapter.asyncStart();
+
+        promise.then(() => {
+            Ember.run.schedule('afterRender', null, resolve);
+            Ember.Test.adapter.asyncEnd();
+        });
+    });
+});
diff --git a/types/ember/test/transition.ts b/types/ember/test/transition.ts
new file mode 100755
index 0000000000..3a64675c24
--- /dev/null
+++ b/types/ember/test/transition.ts
@@ -0,0 +1,28 @@
+import Ember from 'ember';
+
+Ember.Route.extend({
+    beforeModel(transition: Ember.Transition) {
+        if (new Date() > new Date('January 1, 1980')) {
+            alert('Sorry, you need a time machine to enter this route.');
+            transition.abort();
+        }
+    }
+});
+
+Ember.Controller.extend({
+    previousTransition: <Ember.Transition | null> null,
+
+    actions: {
+        login() {
+            // Log the user in, then reattempt previous transition if it exists.
+            let previousTransition = this.get('previousTransition');
+            if (previousTransition) {
+                this.set('previousTransition', null);
+                previousTransition.retry();
+            } else {
+                // Default back to homepage
+                this.transitionToRoute('index');
+            }
+        }
+    }
+});
diff --git a/types/ember/test/utils.ts b/types/ember/test/utils.ts
new file mode 100755
index 0000000000..d729d472b8
--- /dev/null
+++ b/types/ember/test/utils.ts
@@ -0,0 +1,71 @@
+import Ember from 'ember';
+import * as utils from '@ember/utils';
+import { assertType } from "./lib/assert";
+
+function testIsNoneType() {
+    const maybeUndefined: string | undefined = 'not actually undefined';
+    if (utils.isNone(maybeUndefined)) {
+        return;
+    }
+
+    const anotherString = maybeUndefined + 'another string';
+}
+
+function testMerge() {
+    assertType<{ first: string, last: string }>(
+        Ember.merge({ first: 'Tom' }, { last: 'Dale' })
+    );
+}
+
+function testAssign() {
+    assertType<{ first: string, middle: string, last: string }>(
+        Ember.assign({ first: 'Tom' }, { middle: 'M' }, { last: 'Dale' })
+    );
+}
+
+function testOnError() {
+    Ember.onerror = function(error) {
+        Ember.$.post('/report-error', {
+            stack: error.stack,
+            otherInformation: 'whatever app state you want to provide'
+        });
+    };
+}
+
+function testMakeArray() {
+    assertType<any[]>(Ember.makeArray());
+    assertType<any[]>(Ember.makeArray(null));
+    assertType<any[]>(Ember.makeArray(undefined));
+    assertType<string[]>(Ember.makeArray('lindsay'));
+    assertType<number[]>(Ember.makeArray([1, 2, 42]));
+}
+
+function testDeprecateFunc() {
+    function newMethod(first: string, second: number): string {
+        return '';
+    }
+
+    let oldMethod = Ember.deprecateFunc('Please use the new method', { id: 'deprecated.id', until: '6.0' }, newMethod);
+    assertType<string>(newMethod('first', 123));
+    assertType<string>(oldMethod('first', 123));
+}
+
+function testDefineProperty() {
+    const contact = {};
+
+    // ES5 compatible mode
+    Ember.defineProperty(contact, 'firstName', {
+        writable: true,
+        configurable: false,
+        enumerable: true,
+        value: 'Charles'
+    });
+
+    // define a simple property
+    Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
+
+    // define a computed property
+    Ember.defineProperty(contact, 'fullName', Ember.computed('firstName', 'lastName', function() {
+        return `${this.firstName} ${this.lastName}`;
+    }));
+}
diff --git a/types/ember/tsconfig.json b/types/ember/tsconfig.json
old mode 100644
new mode 100755
index 194304e853..c0aab2e780
--- a/types/ember/tsconfig.json
+++ b/types/ember/tsconfig.json
@@ -1,24 +1,49 @@
 {
     "compilerOptions": {
         "module": "commonjs",
+        "target": "es5",
         "lib": [
             "es6",
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
+        "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": true,
+        "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "ember-tests.ts"
+        "test/lib/assert.ts",
+        "test/application.ts",
+        "test/ember-tests.ts",
+        "test/event.ts",
+        "test/extend.ts",
+        "test/create.ts",
+        "test/object.ts",
+        "test/observable.ts",
+        "test/mixin.ts",
+        "test/reopen.ts",
+        "test/detect.ts",
+        "test/detect-instance.ts",
+        "test/array.ts",
+        "test/array-ext.ts",
+        "test/array-proxy.ts",
+        "test/helper.ts",
+        "test/computed.ts",
+        "test/component.ts",
+        "test/function-ext.ts",
+        "test/inject.ts",
+        "test/utils.ts",
+        "test/transition.ts",
+        "test/router.ts",
+        "test/run.ts",
+        "test/test.ts",
+        "test/controller.ts",
+        "test/route.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/ember/tslint.json b/types/ember/tslint.json
old mode 100644
new mode 100755
index 309f39a5d1..35e8f3768a
--- a/types/ember/tslint.json
+++ b/types/ember/tslint.json
@@ -4,11 +4,26 @@
         // Heavy use of Function type in this older package.
         "ban-types": false,
         "jsdoc-format": false,
-        "no-any-union": false,
         "no-misused-new": false,
-        // not sure what this means
+
+        // these are disabled because of rfc176 module exports
+        "strict-export-declare-modifiers": false,
         "no-single-declare-module": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false
+        "no-declare-current-package": false,
+        "no-self-import": false,
+
+        // We use interfaces in a number of places to express things (including
+        // mixins in particular, but also including extending a global
+        // interface) which TS currently can't express correctly.
+        "no-empty-interface": false,
+
+        "no-duplicate-imports": false,
+        "no-unnecessary-qualifier": false,
+        "prefer-const": false,
+        "no-void-expression": false,
+        "only-arrow-functions": false,
+        "no-submodule-imports": false,
+        
+        "no-unnecessary-class": false
     }
 }
diff --git a/types/ember/v1/index.d.ts b/types/ember/v1/index.d.ts
index 91e117f016..f36952117e 100644
--- a/types/ember/v1/index.d.ts
+++ b/types/ember/v1/index.d.ts
@@ -727,9 +727,9 @@ declare namespace Ember {
         lastObject: any;
         length: number;
         addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
+        addObjects(objects: Enumerable): MutableEnumerable;
         removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
+        removeObjects(objects: Enumerable): MutableEnumerable;
     }
     var BOOTED: boolean;
     /**
@@ -1425,7 +1425,7 @@ declare namespace Ember {
         detect(obj: any): boolean;
         reopen<T extends Mixin>(args?: {}): T;
     }
-    class MutableArray implements Array, MutableEnumberable {
+    class MutableArray implements Array, MutableEnumerable {
         addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
         addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
         any(callback: Function, target?: any): boolean;
@@ -1495,14 +1495,14 @@ declare namespace Ember {
         lastObject: any;
         length: number;
         addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
+        addObjects(objects: Enumerable): MutableEnumerable;
         removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
+        removeObjects(objects: Enumerable): MutableEnumerable;
     }
-    class MutableEnumberable implements Enumerable {
+    class MutableEnumerable implements Enumerable {
         addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
         addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
+        addObjects(objects: Enumerable): MutableEnumerable;
         any(callback: Function, target?: any): boolean;
         anyBy(key: string, value?: string): boolean;
         someProperty(key: string, value?: string): boolean;
@@ -1538,7 +1538,7 @@ declare namespace Ember {
         rejectBy(key: string, value?: string): any[];
         removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
         removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
+        removeObjects(objects: Enumerable): MutableEnumerable;
         setEach(key: string, value?: any): any;
         some(callback: Function, target?: any): boolean;
         toArray(): any[];
@@ -1638,9 +1638,9 @@ declare namespace Ember {
         lastObject: any;
         length: number;
         addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
+        addObjects(objects: Enumerable): MutableEnumerable;
         removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
+        removeObjects(objects: Enumerable): MutableEnumerable;
         addObserver: ModifyObserver;
         beginPropertyChanges(): Observable;
         cacheFor(keyName: string): any;
@@ -2457,7 +2457,7 @@ declare namespace Ember {
         static isClass: boolean;
         static isMethod: boolean;
     }
-    class Set extends CoreObject implements MutableEnumberable, Copyable, Freezable {
+    class Set extends CoreObject implements MutableEnumerable, Copyable, Freezable {
         addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Set;
         addObject(object: any): any;
         addObjects(objects: Enumerable): Set;
@@ -2522,10 +2522,10 @@ declare namespace Ember {
         unshift(obj: any): Set;
         length: number;
     }
-    class SortableMixin implements MutableEnumberable {
+    class SortableMixin implements MutableEnumerable {
         addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
         addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
+        addObjects(objects: Enumerable): MutableEnumerable;
         any(callback: Function, target?: any): boolean;
         anyBy(key: string, value?: string): boolean;
         someProperty(key: string, value?: string): boolean;
@@ -2561,7 +2561,7 @@ declare namespace Ember {
         rejectBy(key: string, value?: string): any[];
         removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
         removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
+        removeObjects(objects: Enumerable): MutableEnumerable;
         setEach(key: string, value?: any): any;
         some(callback: Function, target?: any): boolean;
         toArray(): any[];
@@ -3086,7 +3086,7 @@ declare namespace Em {
     class MapWithDefault extends Ember.MapWithDefault { }
     class Mixin extends Ember.Mixin { }
     class MutableArray extends Ember.MutableArray { }
-    class MutableEnumerable extends Ember.MutableEnumberable { }
+    class MutableEnumerable extends Ember.MutableEnumerable { }
     var NAME_KEY: typeof Ember.NAME_KEY;
     class Namespace extends Ember.Namespace { }
     class NativeArray extends Ember.NativeArray { }
@@ -3330,7 +3330,7 @@ declare module "Ember" {
     class MapWithDefault extends Ember.MapWithDefault { }
     class Mixin extends Ember.Mixin { }
     class MutableArray extends Ember.MutableArray { }
-    class MutableEnumerable extends Ember.MutableEnumberable { }
+    class MutableEnumerable extends Ember.MutableEnumerable { }
     var NAME_KEY: typeof Ember.NAME_KEY;
     class Namespace extends Ember.Namespace { }
     class NativeArray extends Ember.NativeArray { }
diff --git a/types/ember/v1/tslint.json b/types/ember/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ember/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/emissary/tslint.json b/types/emissary/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/emissary/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/emoji-mart/dist-es/components/category.d.ts b/types/emoji-mart/dist-es/components/category.d.ts
new file mode 100644
index 0000000000..8cd4ceefbb
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/category.d.ts
@@ -0,0 +1,20 @@
+import React = require('react');
+
+import { EmojiData } from '..';
+
+import { Emoji, EmojiProps, I18n } from '.';
+
+export interface Props {
+    emojis?: Array<string|EmojiData>;
+    hasStickyPosition?: boolean;
+    name: string;
+    native: boolean;
+    perLine: number;
+    emojiProps: EmojiProps;
+    recent?: string[];
+    i18n: I18n;
+}
+
+export default class Category extends React.Component<Props> {
+    // all methods and properties inside this are most likely intended to be private
+}
diff --git a/types/emoji-mart/dist-es/components/emoji.d.ts b/types/emoji-mart/dist-es/components/emoji.d.ts
new file mode 100644
index 0000000000..030ff7ce12
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/emoji.d.ts
@@ -0,0 +1,31 @@
+import React = require('react');
+
+import { EmojiData, EmojiSkin } from '..';
+
+export type BackgroundImageFn = (set: EmojiSet, sheetSize: EmojiSheetSize) => string;
+export type EmojiSet = 'apple'|'google'|'twitter'|'emojione'|'messenger'|'facebook';
+export type EmojiSheetSize = 16|20|32|64;
+
+export interface Props {
+    onOver?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    onLeave?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    onClick?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    /** defaults to returning a png from unpkg.com-hosted emoji-datasource-${set} */
+    backgroundImageFn?: BackgroundImageFn;
+    native?: boolean;
+    forceSize?: boolean;
+    tooltip?: boolean;
+    /** defaults to 1 */
+    skin?: EmojiSkin;
+    /** defaults to 64 */
+    sheetSize?: EmojiSheetSize;
+    /** defaults to 'apple' */
+    set?: EmojiSet;
+    size: number;
+    emoji: string|EmojiData;
+}
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare const Emoji: React.SFC<Props>;
+
+export { Emoji as default };
diff --git a/types/emoji-mart/dist-es/components/index.d.ts b/types/emoji-mart/dist-es/components/index.d.ts
new file mode 100644
index 0000000000..6fc29ecd54
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/index.d.ts
@@ -0,0 +1,4 @@
+// The other exports on the components folder are not public API
+export { default as Category, Props as CategoryProps } from './category';
+export { default as Emoji, Props as EmojiProps, BackgroundImageFn, EmojiSet, EmojiSheetSize } from './emoji';
+export { default as Picker, Props as PickerProps, I18n, PartialI18n, CustomEmoji } from './picker';
diff --git a/types/emoji-mart/dist-es/components/picker.d.ts b/types/emoji-mart/dist-es/components/picker.d.ts
new file mode 100644
index 0000000000..9f9132df05
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/picker.d.ts
@@ -0,0 +1,54 @@
+import React = require('react');
+
+import { EmojiData, EmojiSkin } from '..';
+
+import { Category, Emoji, EmojiProps, BackgroundImageFn, EmojiSet, EmojiSheetSize } from '.';
+
+// tslint:disable-next-line interface-name
+export interface I18n {
+    search: string;
+    categories: Record<'search'|'recent'|'people'|'nature'|'foods'|'activity'|'places'|'objects'|'symbols'|'flags'|'custom', string>;
+    notfound: string;
+}
+
+export type PartialI18n = Partial<Pick<I18n, 'search'|'notfound'> & { categories: Partial<I18n['categories']>}>;
+
+export interface CustomEmoji {
+    // id is overridden by short_names[0]
+    name: string;
+    /** Must contain at least one name. The first name is used as the unique id. */
+    short_names: string[];
+    emoticons?: string[];
+    keywords?: string[];
+    imageUrl: string;
+}
+
+export interface Props {
+    /** NOTE: default is not preventable */
+    onClick?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    perLine?: number;
+    emojiSize?: number;
+    i18n?: PartialI18n;
+    style?: React.CSSProperties;
+    title?: string;
+    emoji?: string;
+    color?: string;
+    set?: EmojiSet;
+    skin?: EmojiSkin;
+    native?: boolean;
+    backgroundImageFn?: BackgroundImageFn;
+    sheetSize?: EmojiSheetSize;
+    emojisToShowFilter?(emoji: EmojiData): boolean;
+    showPreview?: boolean;
+    emojiTooltip?: boolean;
+    include?: string[];
+    exclude?: string[];
+    recent?: string[];
+    autoFocus?: boolean;
+    /** NOTE: custom emoji are copied into a singleton object on every new mount */
+    custom: CustomEmoji[];
+}
+
+export default class Picker extends React.PureComponent<Props> {
+    // everything inside it is supposed to be private
+}
diff --git a/types/emoji-mart/dist-es/index.d.ts b/types/emoji-mart/dist-es/index.d.ts
new file mode 100644
index 0000000000..e49d37fcf6
--- /dev/null
+++ b/types/emoji-mart/dist-es/index.d.ts
@@ -0,0 +1,15 @@
+export { default as  emojiIndex, EmojiData, EmojiSkin } from './utils/emoji-index';
+export { default as store, StoreHandlers } from './utils/store';
+export { default as frequently } from './utils/frequently';
+
+export {
+    Picker,
+    PickerProps,
+    I18n,
+    PartialI18n,
+    CustomEmoji,
+    Emoji,
+    EmojiProps,
+    Category,
+    CategoryProps
+} from './components';
diff --git a/types/emoji-mart/dist-es/utils/emoji-index.d.ts b/types/emoji-mart/dist-es/utils/emoji-index.d.ts
new file mode 100644
index 0000000000..c6499e663c
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/emoji-index.d.ts
@@ -0,0 +1,25 @@
+export type EmojiSkin = 1|2|3|4|5|6;
+
+export interface EmojiData {
+    id: string;
+    name: string;
+    colons: string;
+    /** Reverse mapping to keyof emoticons */
+    emoticons: string[];
+    unified: string;
+    skin: EmojiSkin|null;
+    native: string;
+}
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare const _default: {
+    search(query: ''): null
+    search(query: string): EmojiData|null
+
+    emojis: { [emoji: string]: EmojiData }
+
+    /** Mapping of string to keyof emojis */
+    emoticons: { [emoticon: string]: string }
+};
+
+export { _default as default };
diff --git a/types/emoji-mart/dist-es/utils/frequently.d.ts b/types/emoji-mart/dist-es/utils/frequently.d.ts
new file mode 100644
index 0000000000..d2f318de5f
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/frequently.d.ts
@@ -0,0 +1,9 @@
+import { EmojiData } from '..';
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare const _default: {
+    add(emoji: Pick<EmojiData, 'id'>): void
+    get(perLine: number): string[]
+};
+
+export { _default as default };
diff --git a/types/emoji-mart/dist-es/utils/store.d.ts b/types/emoji-mart/dist-es/utils/store.d.ts
new file mode 100644
index 0000000000..009284bd7b
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/store.d.ts
@@ -0,0 +1,15 @@
+export interface StoreHandlers {
+    getter?(key: string): any;
+    setter?(key: string, value: any): void;
+}
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare const _default: {
+    setHandlers(handlers?: StoreHandlers): void
+    setNamespace(namespace: string): void
+    update(state: {[key: string]: any}): void
+    set(key: string, value: any): void
+    get(key: string): any
+};
+
+export { _default as default };
diff --git a/types/emoji-mart/emoji-mart-tests.tsx b/types/emoji-mart/emoji-mart-tests.tsx
new file mode 100644
index 0000000000..7b7b8d0471
--- /dev/null
+++ b/types/emoji-mart/emoji-mart-tests.tsx
@@ -0,0 +1,93 @@
+// Port of https://github.com/missive/emoji-mart/blob/master/src/components/emoji.js
+
+import React = require('react');
+
+import { Picker, Emoji, EmojiProps, CustomEmoji } from 'emoji-mart';
+
+declare var console: { log(...args: any[]): void; };
+
+const CUSTOM_EMOJIS: CustomEmoji[] = [
+  {
+    name: 'Party Parrot',
+    short_names: ['parrot'],
+    keywords: ['party'],
+    imageUrl: 'http://cultofthepartyparrot.com/parrots/hd/parrot.gif'
+  },
+  {
+    name: 'Octocat',
+    short_names: ['octocat'],
+    keywords: ['github'],
+    imageUrl: 'https://assets-cdn.github.com/images/icons/emoji/octocat.png?v7'
+  },
+  {
+    name: 'Squirrel',
+    short_names: ['shipit', 'squirrel'],
+    keywords: ['github'],
+    imageUrl: 'https://assets-cdn.github.com/images/icons/emoji/shipit.png?v7'
+  },
+];
+
+interface State {
+    native: boolean;
+    set: EmojiProps['set']|'native';
+    emoji: string;
+    title: string;
+    custom: CustomEmoji[];
+}
+
+class Example extends React.Component<{}, State> {
+    readonly state: Readonly<State> = {
+        native: true,
+        set: 'apple',
+        emoji: 'point_up',
+        title: 'Pick your emoji…',
+        custom: CUSTOM_EMOJIS
+    };
+  render() {
+    return (
+        <div>
+            <div className="row">
+                <h1>Emoji Mart �</h1>
+            </div>
+
+            <div className="row">
+                {(['native', 'apple', 'google', 'twitter', 'emojione', 'messenger', 'facebook'] as Array<EmojiProps['set']|'native'>).map((set) => {
+                    const props = { disabled: !this.state.native && set === this.state.set };
+
+                    if (set === 'native' && this.state.native) {
+                        props.disabled = true;
+                    }
+
+                    return (
+                        <button
+                            key={set}
+                            value={set}
+                            onClick={() => {
+                                if (set === 'native') {
+                                    this.setState({ native: true });
+                                } else {
+                                    this.setState({ set, native: false });
+                                }
+                            }}
+                            {...props}
+                        >
+                            {set}
+                        </button>
+                    );
+                })}
+            </div>
+
+            <div className="row">
+                <Picker
+                    {...this.state}
+                    // NOTE: The original code passes the this.state directly, which includes a potential
+                    // invalid 'set' value. The value of 'set' happens to be ignored if native is true, but no
+                    // good way to represent it in the typings.
+                    set={this.state.set === 'native' ? undefined : this.state.set}
+                    onClick={console.log}
+                />
+            </div>
+        </div>
+    );
+  }
+}
diff --git a/types/emoji-mart/index.d.ts b/types/emoji-mart/index.d.ts
new file mode 100644
index 0000000000..1116d6eb6f
--- /dev/null
+++ b/types/emoji-mart/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for emoji-mart 2.2
+// Project: https://github.com/missive/emoji-mart
+// Definitions by: Diogo Franco <https://github.com/Kovensky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+// These definitions should work with 2.3, but the tests doesn't pass on 2.3.
+
+export * from './dist-es';
diff --git a/types/emoji-mart/tsconfig.json b/types/emoji-mart/tsconfig.json
new file mode 100644
index 0000000000..fb776e9a21
--- /dev/null
+++ b/types/emoji-mart/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "dist-es/components/category.d.ts",
+        "dist-es/components/emoji.d.ts",
+        "dist-es/components/index.d.ts",
+        "dist-es/components/picker.d.ts",
+        "dist-es/utils/emoji-index.d.ts",
+        "dist-es/utils/frequently.d.ts",
+        "dist-es/utils/store.d.ts",
+        "dist-es/index.d.ts",
+        "emoji-mart-tests.tsx"
+    ]
+}
diff --git a/types/emoji-mart/tslint.json b/types/emoji-mart/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/emoji-mart/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/empower/tslint.json b/types/empower/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/empower/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/emscripten/emscripten-tests.ts b/types/emscripten/emscripten-tests.ts
index 153ea6b5de..627efba590 100644
--- a/types/emscripten/emscripten-tests.ts
+++ b/types/emscripten/emscripten-tests.ts
@@ -18,6 +18,7 @@ function ModuleTest(): void {
     Module.print = function(text) { alert('stdout: ' + text) };
 
     var int_sqrt = Module.cwrap('int_sqrt', 'number', ['number'])
+    int_sqrt = Module.cwrap('int_sqrt', null, ['number'])
     int_sqrt(12)
     int_sqrt(28)
 
@@ -27,6 +28,7 @@ function ModuleTest(): void {
     var x = Module.getValue(buf, 'i32') + 123;
     Module.HEAPU8.set(myTypedArray, buf);
     Module.ccall('my_function', 'number', ['number'], [buf]);
+    Module.ccall('my_function', null, ['number'], [buf]);
     Module._free(buf);
     Module.destroy({});
 }
diff --git a/types/emscripten/index.d.ts b/types/emscripten/index.d.ts
index 14260dd9d4..4db8ac4925 100644
--- a/types/emscripten/index.d.ts
+++ b/types/emscripten/index.d.ts
@@ -40,8 +40,8 @@ declare namespace Module {
 
     var Runtime: any;
 
-    function ccall(ident: string, returnType: string, argTypes: string[], args: any[]): any;
-    function cwrap(ident: string, returnType: string, argTypes: string[]): any;
+    function ccall(ident: string, returnType: string | null, argTypes: string[], args: any[]): any;
+    function cwrap(ident: string, returnType: string | null, argTypes: string[]): any;
 
     function setValue(ptr: number, value: any, type: string, noSafe?: boolean): void;
     function getValue(ptr: number, type: string, noSafe?: boolean): number;
diff --git a/types/emscripten/tslint.json b/types/emscripten/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/emscripten/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/encoding-japanese/tslint.json b/types/encoding-japanese/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/encoding-japanese/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/engine.io-client/index.d.ts b/types/engine.io-client/index.d.ts
index 2f1d69a1d6..0abb98eb79 100644
--- a/types/engine.io-client/index.d.ts
+++ b/types/engine.io-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/socketio/engine.io-client
 // Definitions by: KentarouTakeda <https://github.com/KentarouTakeda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="node" />
 
diff --git a/types/enhanced-resolve/tslint.json b/types/enhanced-resolve/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/enhanced-resolve/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/enigma.js/README.md b/types/enigma.js/README.md
new file mode 100644
index 0000000000..4370bff4cb
--- /dev/null
+++ b/types/enigma.js/README.md
@@ -0,0 +1,36 @@
+# Installation
+`npm install --save @types/enigma.js`
+
+# Summary
+This package contains type definitions for enigma.js (https://github.com/qlik-oss/enigma.js).
+
+# Example
+
+`npm install --save enigma.js`
+
+`npm install --save bluebird`
+
+```js
+import * as enigma from "enigma.js";
+import * as blubird from "bluebird";
+
+let qixSchema = require("./node_modules/enigma.js/schemas/12.20.0.json");
+
+let enigmaConfig: enigmaJS.IConfig = {
+    Promise: blubird,
+    schema: qixSchema,    
+    url: "ws://localhost:4848/"
+};
+
+let session = enigma.create(enigmaConfig);
+
+session.on("traffic:sent", data => console.log("sent:", data));
+
+session.open()
+    .then((global: EngineAPI.IGlobal) => {
+        return global.EngineVersion();
+    })
+    .then((version) => {
+        console.log(version);
+    });
+```
diff --git a/types/enigma.js/enigma.js-tests.ts b/types/enigma.js/enigma.js-tests.ts
new file mode 100644
index 0000000000..10f6aae226
--- /dev/null
+++ b/types/enigma.js/enigma.js-tests.ts
@@ -0,0 +1,10 @@
+import * as enigma from "enigma.js";
+// import enigma = require("enigma.js");
+
+const config: enigmaJS.IConfig = {
+            url: "http://127.0.0.1:4848/",
+            schema: {}
+        };
+enigma.create(config).open().then((global) => {
+    console.log("connect fine");
+});
diff --git a/types/enigma.js/index.d.ts b/types/enigma.js/index.d.ts
new file mode 100644
index 0000000000..f691e69b2b
--- /dev/null
+++ b/types/enigma.js/index.d.ts
@@ -0,0 +1,228 @@
+// Type definitions for enigma.js 2.2
+// Project: https://github.com/qlik-oss/enigma.js/
+// Definitions by: Konrad Mattheis <https://github.com/konne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare module "enigma.js" {
+    const e: IEnigmaClass;
+    export = e;
+}
+
+// declare const enigmaJS: IEnigmaClass;
+// export = enigmaJS;
+// export as namespace enigmaJS;
+
+interface IEnigmaClass {
+    /**
+     * Create a session object.
+     * @returns - Returns a session.
+     * Note: See Configuration for the configuration options.
+     */
+    create(config: enigmaJS.IConfig): enigmaJS.ISession;
+}
+
+declare namespace enigmaJS {
+    type MixinType = "Doc"| "GenericObject"| "GenericBookmark" | string;
+
+    interface IMixin {
+        /**
+         * QIX Engine types like for example GenericObject, Doc, GenericBookmark, are supported but also custom GenericObject
+         * types such as barchart, story and myCustomType.
+         * An API will get both their generic type as well as custom type mixins applied.
+         */
+        types: MixinType[];
+
+        init(args: {config: any, api: IGeneratedAPI}): void;
+
+        /**
+         * mixin.extend is an object containing methods to extend the generated API with. These method names cannot already exist or enigma.js will throw an error.
+         */
+        extend?: any;
+
+        /**
+         * mixin.override is an object containing methods that overrides existing API methods.
+         * These method names needs to exist already* or engima.js will throw an error.
+         * Be careful when overriding, you may break expected behaviors in other mixins or your application.
+         * base is a reference to the previous mixin method, can be used to invoke the mixin chain before this mixin method.
+         */
+        override?: any;
+    }
+
+    interface IResponseInterceptors {
+        /**
+         * This method is invoked when a previous interceptor has rejected the promise, use this to handle for example errors before they are sent into mixins.
+         * @param session refers to the session executing the interceptor.
+         * @param request is the JSON-RPC request resulting in this error. You may use .retry() to retry sending it to QIX Engine.
+         * @param error is whatever the previous interceptor rejected with.
+         */
+        onRejected?(session: ISession, request: any, error: any): Promise<any>;
+
+        /**
+         * This method is invoked when a promise has been successfully resolved, use this to modify the result or reject the promise chain before it is sent to mixins.
+         * @param session refers to the session executing the interceptor.
+         * @param request is the JSON-RPC request resulting in this error. You may use .retry() to retry sending it to QIX Engine.
+         * @param error is whatever the previous interceptor resolved with.
+         */
+        onFulfilled?(session: ISession, request: any, result: any): Promise<any>;
+    }
+
+    interface IRequestInterceptors {
+        /**
+         * This method is invoked when a request is about to be sent to QIX Engine.
+         * @param session refers to the session executing the interceptor.
+         * @param request is the JSON-RPC request resulting in this error. You may use .retry() to retry sending it to QIX Engine.
+         * @returns request the new request
+         */
+        onFulfilled?(session: ISession, request: any, result: any): any;
+    }
+
+    interface IProtocol {
+        // Set to false to disable the use of the bandwidth-reducing delta protocol.
+        delta?: boolean;
+    }
+
+    /**
+     * This section describes the configuration object that is sent into enigma.create(config).
+     */
+    interface IConfig {
+        /**
+         * Object containing the specification for the API to generate. Corresponds to a specific version of the QIX Engine API.
+         */
+        schema: object;
+        /**
+         * String containing a proper websocket URL to QIX Engine.
+         */
+        url: string;
+        /**
+         * A function to use when instantiating the WebSocket, mandatory for Node.js.
+         */
+        createSocket?: any;
+        /**
+         * ES6-compatible Promise library.
+         */
+        Promise?: any;
+        /**
+         * Set to true if the session should be suspended instead of closed when the websocket is closed.
+         */
+        suspendOnClose?: boolean;
+        /**
+         * Mixins to extend/augment the QIX Engine API.
+         * See Mixins section for more information how each entry in this array should look like.
+         * Mixins are applied in the array order.
+         */
+        mixins?: IMixin[];
+        /**
+         * Interceptors for augmenting requests before they are sent to QIX Engine.
+         * See Interceptors section for more information how each entry in this array should look like.
+         * Interceptors are applied in the array order.
+         */
+        requestInterceptors?: IRequestInterceptors[];
+        /**
+         * Interceptors for augmenting responses before they are sent to QIX Engine.
+         * See Interceptors section for more information how each entry in this array should look like.
+         * Interceptors are applied in the array order.
+         */
+        responseInterceptors?: IResponseInterceptors[];
+        /**
+         * An object containing additional JSON-RPC request parameters.
+         * protocol.delta :  Set to false to disable the use of the bandwidth-reducing delta protocol.
+         */
+        protocol?: any;
+    }
+
+    interface ISession {
+        /**
+         * Establishes the websocket against the configured URL. Eventually resolved with the QIX global interface when the connection has been established.
+         * @return Promise.
+         */
+        open<T extends IGeneratedAPI>(): Promise<T>;
+
+        /**
+         * Closes the websocket and cleans up internal caches, also triggers the closed event on all generated APIs.
+         * Eventually resolved when the websocket has been closed.
+         *
+         * Note: you need to manually invoke this when you want to close a session and config.suspendOnClose is true.
+         * @return Promise.
+         */
+        close(): Promise<any>;
+
+        /**
+         * Suspends the enigma.js session by closing the websocket and rejecting all method calls until it has been resumed again.
+         * @return Promise.
+         */
+        suspend(): Promise<any>;
+
+        /**
+         * Resume a previously suspended enigma.js session by re-creating the websocket and, if possible, re-open the document
+         * as well as refreshing the internal caches. If successful, changed events will be triggered on all generated APIs,
+         * and on the ones it was unable to restore, the closed event will be triggered.
+         * @param onlyIfAttached onlyIfAttached can be used to only allow resuming if the QIX Engine session was reattached properly.
+         * @return Promise.
+         * Note: Eventually resolved when the websocket (and potentially the previously opened document, and generated APIs) has been restored,
+         * rejected when it fails any of those steps, or when onlyIfAttached is true and a new QIX Engine session was created.
+         */
+        resume(onlyIfAttached?: boolean): Promise<any>;
+
+        /**
+         * Handle opened state. This event is triggered whenever the websocket is connected and ready for communication.
+         *
+         * Handle closed state. This event is triggered when the underlying websocket is closed and config.suspendOnClose is false.
+         *
+         * Handle suspended state. This event is triggered in two cases (listed below). It is useful in scenarios where you for example
+         * want to block interaction in your application until you are resumed again.
+         * If config.suspendOnClose is true and there was a network disconnect (socked closed)
+         * If you ran session.suspend()
+         * The evt.initiator value is a string indicating what triggered the suspended state. Possible values: network, manual.
+         *
+         * Handle resumed state. This event is triggered when the session was properly resumed.
+         * It is useful in scenarios where you for example can close blocking modal dialogs and allow the user to interact with your application again.
+         *
+         * notification:*
+         * @param event - Event that triggers the function
+         * @param func - Called function
+         */
+        on(event: "opened" | "closed" | "suspended" | "resumed" | string, func: any): void;
+    }
+
+    interface IGeneratedAPI {
+        /**
+         * This property contains the unique identifier for this API.
+         */
+        id: string;
+
+        /**
+         * This property contains the schema class name for this API.
+         */
+        type: string;
+
+        /**
+         * Despite the name, this property corresponds to the qInfo.qType property on your generic object's properties object.
+         */
+        genericType: string;
+
+        /**
+         * This property contains a reference to the session that this API belongs to.
+         */
+        session: ISession;
+
+        /**
+         * This property contains the handle QIX Engine assigned to the API.
+         * Used internally in enigma.js for caches and JSON-RPC
+         */
+        handle: number;
+
+        /**
+         * register a function for events
+         * @param event - function called if this event occures
+         * @param func - function that is called
+         */
+        on(event: "changed" | "closed", func: () => void): void;
+
+        /**
+         * manual emit an events
+         * @param event - event that occures
+         */
+        emit(event: "changed" | "closed"): void;
+    }
+}
diff --git a/types/enigma.js/tsconfig.json b/types/enigma.js/tsconfig.json
new file mode 100644
index 0000000000..b3b93456f0
--- /dev/null
+++ b/types/enigma.js/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "enigma.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/enigma.js/tslint.json b/types/enigma.js/tslint.json
new file mode 100644
index 0000000000..84cbb5f289
--- /dev/null
+++ b/types/enigma.js/tslint.json
@@ -0,0 +1,13 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // TODOs
+    "ban-types": false,
+    "no-empty-interface": false,
+    "no-mergeable-namespace": false,
+    "no-unnecessary-generics": false,
+    "no-single-declare-module": false,
+    "no-declare-current-package": false,
+    "interface-name": false
+  }
+}
diff --git a/types/ent/tslint.json b/types/ent/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ent/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/envify/tslint.json b/types/envify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/envify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/enzyme-adapter-react-15/index.d.ts b/types/enzyme-adapter-react-15/index.d.ts
index b0b289d08d..01307da953 100644
--- a/types/enzyme-adapter-react-15/index.d.ts
+++ b/types/enzyme-adapter-react-15/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/airbnb/enzyme
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { EnzymeAdapter } from 'enzyme';
 
diff --git a/types/enzyme-adapter-react-16/index.d.ts b/types/enzyme-adapter-react-16/index.d.ts
index 39aa6c03a6..82927b03e5 100644
--- a/types/enzyme-adapter-react-16/index.d.ts
+++ b/types/enzyme-adapter-react-16/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/airbnb/enzyme
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { EnzymeAdapter } from 'enzyme';
 
diff --git a/types/enzyme/enzyme-tests.tsx b/types/enzyme/enzyme-tests.tsx
index 63e716c50b..c48c050357 100644
--- a/types/enzyme/enzyme-tests.tsx
+++ b/types/enzyme/enzyme-tests.tsx
@@ -1,5 +1,14 @@
 import * as React from "react";
-import { shallow, mount, render, ShallowWrapper, ReactWrapper } from "enzyme";
+import {
+    shallow,
+    mount,
+    render,
+    ShallowWrapper,
+    ReactWrapper,
+    configure,
+    EnzymeAdapter,
+    ShallowRendererProps,
+} from "enzyme";
 import { Component, ReactElement, HTMLAttributes, ComponentClass, StatelessComponent } from "react";
 
 // Help classes/interfaces
@@ -24,6 +33,18 @@ class MyComponent extends Component<MyComponentProps, MyComponentState> {
 
 const MyStatelessComponent = (props: StatelessProps) => <span />;
 
+// Enzyme.configure
+function configureTest() {
+    const configureAdapter: { adapter: EnzymeAdapter } = { adapter: {} };
+    configure(configureAdapter);
+
+    const configureAdapterAndDisableLifecycle: typeof configureAdapter & Pick<ShallowRendererProps, "disableLifecycleMethods"> = {
+        adapter: {},
+        disableLifecycleMethods: true,
+    };
+    configure(configureAdapterAndDisableLifecycle);
+}
+
 // ShallowWrapper
 function ShallowWrapperTest() {
     let shallowWrapper: ShallowWrapper<MyComponentProps, MyComponentState> =
@@ -50,7 +71,8 @@ function ShallowWrapperTest() {
             context: {
                 test: "a",
             },
-            lifecycleExperimental: true
+            lifecycleExperimental: true,
+            disableLifecycleMethods: true
         });
     }
 
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index e5275fa93a..0568a852f7 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Enzyme 2.8
+// Type definitions for Enzyme 3.1
 // Project: https://github.com/airbnb/enzyme
 // Definitions by: Marian Palkus <https://github.com/MarianPalkus>
 //                 Cap3 <http://www.cap3.de>
@@ -48,33 +48,28 @@ export type Intercepter<T> = (intercepter: T) => void;
 export interface CommonWrapper<P = {}, S = {}> {
     /**
      * Returns a new wrapper with only the nodes of the current wrapper that, when passed into the provided predicate function, return true.
-     * @param predicate
      */
     filterWhere(predicate: (wrapper: this) => boolean): this;
 
     /**
      * Returns whether or not the current wrapper has a node anywhere in it's render tree that looks like the one passed in.
-     * @param node
      */
-    contains(node: ReactElement<any> | string): boolean;
+    contains(node: ReactElement<any> | Array<ReactElement<any>> | string): boolean;
 
     /**
      * Returns whether or not a given react element exists in the shallow render tree.
-     * @param node
      */
-    containsMatchingElement(node: ReactElement<any>): boolean;
+    containsMatchingElement(node: ReactElement<any> | Array<ReactElement<any>>): boolean;
 
     /**
      * Returns whether or not all the given react elements exists in the shallow render tree
-     * @param nodes
      */
-    containsAllMatchingElements(nodes: Array<ReactElement<any>>): boolean;
+    containsAllMatchingElements(nodes: Array<ReactElement<any>> | Array<Array<ReactElement<any>>>): boolean;
 
     /**
      * Returns whether or not one of the given react elements exists in the shallow render tree.
-     * @param nodes
      */
-    containsAnyMatchingElements(nodes: Array<ReactElement<any>>): boolean;
+    containsAnyMatchingElements(nodes: Array<ReactElement<any>> | Array<Array<ReactElement<any>>>): boolean;
 
     /**
      * Returns whether or not the current render tree is equal to the given node, based on the expected value.
@@ -88,13 +83,11 @@ export interface CommonWrapper<P = {}, S = {}> {
 
     /**
      * Returns whether or not the current node has a className prop including the passed in class name.
-     * @param className
      */
     hasClass(className: string): boolean;
 
     /**
      * Returns whether or not the current node matches a provided selector.
-     * @param selector
      */
     is(selector: EnzymeSelector): boolean;
 
@@ -112,7 +105,6 @@ export interface CommonWrapper<P = {}, S = {}> {
     /**
      * Returns a new wrapper with only the nodes of the current wrapper that don't match the provided selector.
      * This method is effectively the negation or inverse of filter.
-     * @param selector
      */
     not(selector: EnzymeSelector): this;
 
@@ -134,7 +126,6 @@ export interface CommonWrapper<P = {}, S = {}> {
 
     /**
      * Returns the node at a given index of the current wrapper.
-     * @param index
      */
     get(index: number): ReactElement<any>;
 
@@ -165,7 +156,6 @@ export interface CommonWrapper<P = {}, S = {}> {
 
     /**
      * Returns a wrapper around the node at a given index of the current wrapper.
-     * @param index
      */
     at(index: number): this;
 
@@ -191,7 +181,6 @@ export interface CommonWrapper<P = {}, S = {}> {
 
     /**
      * Returns the state hash for the root node of the wrapper. Optionally pass in a prop name and it will return just that value.
-     * @param [key]
      */
     state(): S;
     state<K extends keyof S>(key: K): S[K];
@@ -214,7 +203,6 @@ export interface CommonWrapper<P = {}, S = {}> {
      * Returns the prop value for the node of the current wrapper with the provided key.
      *
      * NOTE: can only be called on a wrapper of a single node.
-     * @param key
      */
     prop<K extends keyof P>(key: K): P[K];
     prop<T>(key: string): T;
@@ -228,7 +216,6 @@ export interface CommonWrapper<P = {}, S = {}> {
     /**
      * Simulate events.
      * Returns itself.
-     * @param event
      * @param args?
      */
     simulate(event: string, ...args: any[]): this;
@@ -242,8 +229,6 @@ export interface CommonWrapper<P = {}, S = {}> {
      * Returns itself.
      *
      * NOTE: can only be called on a wrapper instance that is also the root instance.
-     * @param state
-     * @param [callback]
      */
     setState<K extends keyof S>(state: Pick<S, K>, callback?: () => void): this;
 
@@ -256,7 +241,6 @@ export interface CommonWrapper<P = {}, S = {}> {
      * Returns itself.
      *
      * NOTE: can only be called on a wrapper instance that is also the root instance.
-     * @param props
      */
     setProps<K extends keyof P>(props: Pick<P, K>): this;
 
@@ -266,7 +250,6 @@ export interface CommonWrapper<P = {}, S = {}> {
      * Returns itself.
      *
      * NOTE: can only be called on a wrapper instance that is also the root instance.
-     * @param state
      */
     setContext(context: any): this;
 
@@ -320,40 +303,32 @@ export interface CommonWrapper<P = {}, S = {}> {
     /**
      * Applies the provided reducing function to every node in the wrapper to reduce to a single value. Each node
      * is passed in as a ShallowWrapper, and is processed from left to right.
-     * @param fn
-     * @param initialValue
      */
     reduce<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R;
 
     /**
      * Applies the provided reducing function to every node in the wrapper to reduce to a single value.
      * Each node is passed in as a ShallowWrapper, and is processed from right to left.
-     * @param fn
-     * @param initialValue
      */
     reduceRight<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R;
 
     /**
      * Returns whether or not any of the nodes in the wrapper match the provided selector.
-     * @param selector
      */
     some(selector: EnzymeSelector): boolean;
 
     /**
      * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
-     * @param fn
      */
     someWhere(fn: (wrapper: this) => boolean): boolean;
 
     /**
      * Returns whether or not all of the nodes in the wrapper match the provided selector.
-     * @param selector
      */
     every(selector: EnzymeSelector): boolean;
 
     /**
      * Returns whether or not all of the nodes in the wrapper pass the provided predicate function.
-     * @param fn
      */
     everyWhere(fn: (wrapper: this) => boolean): boolean;
 
@@ -378,11 +353,10 @@ export interface CommonWrapper<P = {}, S = {}> {
     length: number;
 }
 
-export class ShallowWrapper {
-    constructor(nodes: JSX.Element[] | JSX.Element, root?: ShallowWrapper, options?: ShallowRendererProps);
-}
-
-export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
+// tslint:disable-next-line no-empty-interface
+export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {}
+export class ShallowWrapper<P = {}, S = {}> {
+    constructor(nodes: JSX.Element[] | JSX.Element, root?: ShallowWrapper<any, any>, options?: ShallowRendererProps);
     shallow(options?: ShallowRendererProps): ShallowWrapper<P, S>;
     unmount(): this;
 
@@ -404,14 +378,12 @@ export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
 
     /**
      * Finds every node in the render tree that returns true for the provided predicate function.
-     * @param predicate
      */
     findWhere(predicate: (wrapper: ShallowWrapper<any, any>) => boolean): ShallowWrapper<any, any>;
 
     /**
      * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
      * can be provided and it will filter the children by this selector.
-     * @param [selector]
      */
     children<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     children<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
@@ -420,7 +392,6 @@ export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
 
     /**
      * Returns a new wrapper with child at the specified index.
-     * @param index
      */
     childAt(index: number): ShallowWrapper<any, any>;
     childAt<P2, S2>(index: number): ShallowWrapper<P2, S2>;
@@ -428,7 +399,6 @@ export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
     /**
      * Shallow render the one non-DOM child of the current wrapper, and return a wrapper around the result.
      * NOTE: can only be called on wrapper of a single non-DOM component element node.
-     * @param [options]
      */
     dive<P2, S2>(options?: ShallowRendererProps): ShallowWrapper<P2, S2>;
 
@@ -445,7 +415,6 @@ export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
      * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
      *
      * Note: can only be called on a wrapper of a single node.
-     * @param [selector]
      */
     parents<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     parents<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
@@ -457,7 +426,6 @@ export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
      * ancestors in the tree, starting with itself.
      *
      * Note: can only be called on a wrapper of a single node.
-     * @param selector
      */
     closest<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     closest<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
@@ -470,11 +438,11 @@ export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
     parent(): ShallowWrapper<any, any>;
 }
 
-export class ReactWrapper {
-    constructor(nodes: JSX.Element | JSX.Element[], root?: ReactWrapper, options?: MountRendererProps);
-}
+// tslint:disable-next-line no-empty-interface
+export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {}
+export class ReactWrapper<P = {}, S = {}> {
+    constructor(nodes: JSX.Element | JSX.Element[], root?: ReactWrapper<any, any>, options?: MountRendererProps);
 
-export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
     unmount(): this;
     mount(): this;
 
@@ -517,7 +485,6 @@ export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
 
     /**
      * Finds every node in the render tree that returns true for the provided predicate function.
-     * @param predicate
      */
     findWhere(predicate: (wrapper: ReactWrapper<any, any>) => boolean): ReactWrapper<any, any>;
 
@@ -531,7 +498,6 @@ export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
     /**
      * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
      * can be provided and it will filter the children by this selector.
-     * @param [selector]
      */
     children<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     children<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
@@ -540,7 +506,6 @@ export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
 
     /**
      * Returns a new wrapper with child at the specified index.
-     * @param index
      */
     childAt(index: number): ReactWrapper<any, any>;
     childAt<P2, S2>(index: number): ReactWrapper<P2, S2>;
@@ -550,7 +515,6 @@ export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
      * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
      *
      * Note: can only be called on a wrapper of a single node.
-     * @param [selector]
      */
     parents<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     parents<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
@@ -562,7 +526,6 @@ export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
      * ancestors in the tree, starting with itself.
      *
      * Note: can only be called on a wrapper of a single node.
-     * @param selector
      */
     closest<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     closest<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
@@ -583,13 +546,17 @@ export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {
      * Returns itself.
      *
      * NOTE: can only be called on a wrapper instance that is also the root instance.
-     * @param props
-     * @param [callback]
      */
     setProps<K extends keyof P>(props: Pick<P, K>, callback?: () => void): this;
 }
 
 export interface ShallowRendererProps {
+    // See https://github.com/airbnb/enzyme/blob/enzyme@3.1.1/docs/api/shallow.md#arguments
+    /**
+     * If set to true, componentDidMount is not called on the component, and componentDidUpdate is not called after
+     * setProps and setContext. Default to false.
+     */
+    disableLifecycleMethods?: boolean;
     /**
      * Enable experimental support for full react lifecycle methods
      */
@@ -618,24 +585,18 @@ export interface MountRendererProps {
 /**
  * Shallow rendering is useful to constrain yourself to testing a component as a unit, and to ensure that
  * your tests aren't indirectly asserting on behavior of child components.
- * @param node
- * @param [options]
  */
 export function shallow<P>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, any>;
 export function shallow<P, S>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, S>;
 
 /**
  * Mounts and renders a react component into the document and provides a testing wrapper around it.
- * @param node
- * @param [options]
  */
 export function mount<P>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, any>;
 export function mount<P, S>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, S>;
 
 /**
  * Render react components to static HTML and analyze the resulting HTML structure.
- * @param node
- * @param [options]
  */
 export function render<P, S>(node: ReactElement<P>, options?: any): Cheerio;
 
@@ -646,6 +607,15 @@ export class EnzymeAdapter {
 /**
  * Configure enzyme to use the correct adapter for the react verstion
  * This is enabling the Enzyme configuration with adapters in TS
- * @param options
  */
-export function configure(options: { adapter: EnzymeAdapter }): void;
+export function configure(options: {
+    adapter: EnzymeAdapter,
+    // See https://github.com/airbnb/enzyme/blob/enzyme@3.1.1/docs/guides/migration-from-2-to-3.md#lifecycle-methods
+    // Actually, `{adapter:} & Pick<ShallowRendererProps,"disableLifecycleMethods">` is more precise. However,
+    // in that case jsdoc won't be shown
+    /**
+     * If set to true, componentDidMount is not called on the component, and componentDidUpdate is not called after
+     * setProps and setContext. Default to false.
+     */
+    disableLifecycleMethods?: boolean;
+}): void;
diff --git a/types/eonasdan-bootstrap-datetimepicker/package.json b/types/eonasdan-bootstrap-datetimepicker/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/eonasdan-bootstrap-datetimepicker/package.json
+++ b/types/eonasdan-bootstrap-datetimepicker/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/eonasdan-bootstrap-datetimepicker/tslint.json b/types/eonasdan-bootstrap-datetimepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/eonasdan-bootstrap-datetimepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/epiceditor/tslint.json b/types/epiceditor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/epiceditor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/epilogue/epilogue-tests.ts b/types/epilogue/epilogue-tests.ts
new file mode 100644
index 0000000000..0cf40fd1e9
--- /dev/null
+++ b/types/epilogue/epilogue-tests.ts
@@ -0,0 +1,33 @@
+import * as epilogue from 'epilogue';
+import * as express from 'express';
+import * as Sequelize from 'sequelize';
+
+const database = new Sequelize({ });
+
+epilogue.initialize({
+    app: express(),
+    sequelize: database
+});
+
+epilogue.initialize({
+    app: express(),
+    sequelize: database,
+    base: ''
+});
+
+epilogue.initialize({
+    app: express(),
+    sequelize: database,
+    base: '',
+    updateMethod: ''
+});
+
+const User = database.define('User', {
+    username: Sequelize.STRING,
+    birthday: Sequelize.DATE
+});
+
+epilogue.resource({
+    model: User,
+    endpoints: ['/users', '/users/:id']
+});
diff --git a/types/epilogue/index.d.ts b/types/epilogue/index.d.ts
new file mode 100644
index 0000000000..3fe56b9e9f
--- /dev/null
+++ b/types/epilogue/index.d.ts
@@ -0,0 +1,199 @@
+// Type definitions for epilogue 0.7
+// Project: https://github.com/dchester/epilogue
+// Definitions by: Satana Charuwichitratana <https://github.com/micksatana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import {
+    Sequelize,
+    AssociationOptions,
+    DataTypeAbstract,
+    DataTypeString,
+    DataTypeChar,
+    DataTypeText,
+    DataTypeNumber,
+    DataTypeInteger,
+    DataTypeBigInt,
+    DataTypeFloat,
+    DataTypeTime,
+    DataTypeDate,
+    DataTypeDateOnly,
+    DataTypeBoolean,
+    DataTypeNow,
+    DataTypeBlob,
+    DataTypeDecimal,
+    DataTypeUUID,
+    DataTypeUUIDv1,
+    DataTypeUUIDv4,
+    DataTypeHStore,
+    DataTypeJSONType,
+    DataTypeJSONB,
+    DataTypeVirtual,
+    DataTypeArray,
+    DataTypeEnum,
+    DataTypeRange,
+    DataTypeReal,
+    DataTypeDouble,
+    DataTypeGeometry
+} from 'sequelize';
+
+import { Express, Request, Response } from 'express';
+
+export class Endpoint {
+    constructor(endpoint: string);
+    string: string;
+    attributes: string[];
+}
+
+export class Resource {
+    constructor(options: ResourceOptions);
+    app: Express;
+    sequelize: Sequelize;
+    model: any;
+    include: Array<{ model: any } | string>;
+    associationOptions: ResourceAssociationOptions;
+    readOnlyAttributes: string[];
+    excludeAttributes: string[];
+    attributes: string[];
+    actions: string[];
+    endpoints: {
+        singular: string;
+        plural: string;
+    };
+    updateMethod: string;
+    pagination: boolean;
+    search: ResourceSearchOption;
+    sort: ResourceSortOption;
+    reloadInstances: boolean;
+    controllers: Controllers;
+}
+
+export interface Controllers {
+    base: BaseController;
+    create: CreateController;
+    read: ReadController;
+    update: UpdateController;
+    delete: DeleteController;
+    list: ListController;
+}
+
+export namespace Errors {
+    class EpilogueError extends Error {
+        constructor(status: number | EpilogueError, message?: string, errors?: string[], cause?: Error);
+
+        name: string;
+        message: string;
+        errors: string[];
+        status: number | EpilogueError;
+        cause: Error;
+    }
+
+    class NotFoundError extends EpilogueError {
+        constructor(message?: string, errors?: string[], cause?: Error);
+    }
+
+    class BadRequestError extends EpilogueError {
+        constructor(message?: string, errors?: string[], cause?: Error);
+    }
+
+    class ForbiddenError extends EpilogueError {
+        constructor(message?: string, errors?: string[], cause?: Error);
+    }
+
+    class RequestCompleted extends Error {
+        constructor();
+    }
+}
+
+export interface ResourceAssociationOptions extends AssociationOptions {
+    removeForeignKeys: boolean;
+}
+
+export interface ResourceSearchOption {
+    param: string;
+    operator: string;
+    attributes: string[];
+}
+
+export interface ResourceSortOption {
+    param: string;
+    default: string;
+}
+
+export interface InitializeOptions {
+    app: Express;
+    sequelize: Sequelize;
+    base?: string;
+    updateMethod?: string;
+}
+
+export interface BaseContollerOptions {
+    endpoint: string;
+    model: any;
+    app: Express;
+    resource: Resource;
+    include: Array<{ model: any } | string>;
+}
+
+export interface Context {
+    instance: Resource;
+    criteria: any;
+    attributes: any;
+    options: any;
+    continue: () => void;
+    skip: () => void;
+    stop: () => void;
+    error: (status: number | Errors.EpilogueError, message?: string, errorList?: string[], cause?: Error) => void;
+}
+
+export class BaseController {
+    constructor(options: BaseContollerOptions);
+    endpoint: Endpoint;
+    model: any;
+}
+
+export class CreateController extends BaseController {
+    write: (req: Request, res: Response, context: Context) => Promise<() => void>;
+}
+
+export class ReadController extends BaseController {
+    fetch: (req: Request, res: Response, context: Context) => Promise<() => void>;
+}
+
+export class UpdateController extends BaseController {
+    fetch: (req: Request, res: Response, context: Context) => Promise<() => void>;
+    write: (req: Request, res: Response, context: Context) => Promise<() => void>;
+}
+
+export class DeleteController extends BaseController {
+    fetch: (req: Request, res: Response, context: Context) => Promise<() => void>;
+    write: (req: Request, res: Response, context: Context) => Promise<() => void>;
+}
+
+export class ListController extends BaseController {
+    fetch: (req: Request, res: Response, context: Context) => Promise<() => void>;
+    _safeishParse: (value: any, type: DataTypeAbstract | DataTypeString | DataTypeChar | DataTypeText | DataTypeNumber |
+                        DataTypeInteger | DataTypeBigInt | DataTypeFloat | DataTypeTime | DataTypeDate | DataTypeDateOnly |
+                        DataTypeBoolean | DataTypeNow | DataTypeBlob | DataTypeDecimal | DataTypeUUID | DataTypeUUIDv1 |
+                        DataTypeUUIDv4 | DataTypeHStore | DataTypeJSONType | DataTypeJSONB | DataTypeVirtual |
+                        DataTypeArray | DataTypeEnum | DataTypeRange | DataTypeReal | DataTypeDouble | DataTypeGeometry,
+                    sequelize: Sequelize) => any;
+}
+
+export interface ResourceOptions {
+    model: any;
+    endpoints: string[];
+    actions?: string[];
+    include?: Array<{ model: any } | string>;
+    pagination?: boolean;
+    search?: ResourceSearchOption;
+    sort?: ResourceSortOption;
+    reloadInstances?: boolean;
+    associations?: AssociationOptions;
+    excludeAttributes?: string[];
+    readOnlyAttributes?: string[];
+    updateMethod?: string;
+}
+
+export function initialize(options?: InitializeOptions): void;
+export function resource(options?: ResourceOptions): Resource;
diff --git a/types/epilogue/tsconfig.json b/types/epilogue/tsconfig.json
new file mode 100644
index 0000000000..593077c6bc
--- /dev/null
+++ b/types/epilogue/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "epilogue-tests.ts"
+    ]
+}
diff --git a/types/epilogue/tslint.json b/types/epilogue/tslint.json
new file mode 100644
index 0000000000..10d875b8db
--- /dev/null
+++ b/types/epilogue/tslint.json
@@ -0,0 +1,4 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {}
+}
diff --git a/types/epub/tslint.json b/types/epub/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/epub/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/eq.js/tslint.json b/types/eq.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/eq.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/error-stack-parser/error-stack-parser-tests.ts b/types/error-stack-parser/error-stack-parser-tests.ts
deleted file mode 100644
index c8b9198261..0000000000
--- a/types/error-stack-parser/error-stack-parser-tests.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-ErrorStackParser.parse(new Error('Boom'));
diff --git a/types/error-stack-parser/index.d.ts b/types/error-stack-parser/index.d.ts
deleted file mode 100644
index ad722b0f2b..0000000000
--- a/types/error-stack-parser/index.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for ErrorStackParser v1.3.3
-// Project: https://github.com/stacktracejs/error-stack-parser
-// Definitions by: Eric Wendelin <https://www.eriwen.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module ErrorStackParser {
-    export interface StackFrame {
-        constructor(functionName: string, args: any, fileName: string, lineNumber: number, columnNumber: number, source: string): StackFrame;
-
-        functionName?: string;
-        args?: any[];
-        fileName?: string;
-        lineNumber?: number;
-        columnNumber?: number;
-        source?: string;
-        toString(): string;
-    }
-
-    /**
-     * Given an Error object, extract the most information from it.
-     *
-     * @param {Error} error object
-     * @return {Array} of StackFrames
-     */
-    export function parse(error: Error): StackFrame[];
-}
diff --git a/types/error-stack-parser/tsconfig.json b/types/error-stack-parser/tsconfig.json
deleted file mode 100644
index 98f3beb1a5..0000000000
--- a/types/error-stack-parser/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "error-stack-parser-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/errorhandler/index.d.ts b/types/errorhandler/index.d.ts
index aa6664553b..71f0f3db21 100644
--- a/types/errorhandler/index.d.ts
+++ b/types/errorhandler/index.d.ts
@@ -2,9 +2,7 @@
 // Project: https://github.com/expressjs/errorhandler
 // Definitions by: Santi Albo <https://github.com/santialbo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
+// TypeScript Version: 2.3
 
 import * as express from 'express';
 
diff --git a/types/errorhandler/tslint.json b/types/errorhandler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/errorhandler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/es6-collections/tslint.json b/types/es6-collections/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/es6-collections/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/es6-error/es6-error-tests.ts b/types/es6-error/es6-error-tests.ts
deleted file mode 100644
index 26ed7b6677..0000000000
--- a/types/es6-error/es6-error-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as ExtendableError from "es6-error"
-
-class TestError extends ExtendableError {
-    constructor (message: string = "TestError") {
-        super(message)
-    }
-}
-
-throw new TestError("Test Message")
diff --git a/types/es6-error/index.d.ts b/types/es6-error/index.d.ts
deleted file mode 100644
index c1d3d5ce21..0000000000
--- a/types/es6-error/index.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Type definitions for es6-error v4.0.0
-// Project: https://github.com/bjyoungblood/es6-error
-// Definitions by: Karol Janyst <https://github.com/LKay>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = Error;
diff --git a/types/es6-error/tsconfig.json b/types/es6-error/tsconfig.json
deleted file mode 100644
index 1205819cd3..0000000000
--- a/types/es6-error/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "es6-error-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/es6-promise/es6-promise-tests.ts b/types/es6-promise/es6-promise-tests.ts
deleted file mode 100644
index ac9910df46..0000000000
--- a/types/es6-promise/es6-promise-tests.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-var promiseString: Promise<string>,
- 	promiseStringArr: Promise<string[]>,
-	arrayOfPromise: Promise<string>[],
-	promiseNumber: Promise<number>,
-	promiseAny: Promise<any>,
-	thenable: Thenable<string>;
-
-// constructor test
-var constructResult = new Promise<string>((resolve, reject) => {
-	resolve('a string');
-});
-promiseString = constructResult;
-
-
-var constructResult1 = new Promise<string>((resolve:(promise: Thenable<string>) => void) => {
-	resolve(Promise.resolve('a string'));
-});
-promiseString = constructResult1;
-
-//resolve test
-var resolveResult = Promise.resolve('a string');
-promiseString = resolveResult;
-
-var resolveResult1 = Promise.resolve(thenable);
-promiseString = resolveResult1;
-
-//reject test
-var rejectResult = Promise.reject('there is an error');
-promiseAny = rejectResult;
-
-//all test
-var allResult = Promise.all(arrayOfPromise);
-promiseStringArr = allResult;
-
-//race test
-var raceResult = Promise.race(arrayOfPromise);
-promiseString = raceResult;
-
-
-//then test
-var thenWithPromiseResult = promiseString.then(word => Promise.resolve(word.length));
-promiseNumber = thenWithPromiseResult;
-
-var thenWithPromiseResultAndPromiseReject = promiseString.then(word => Promise.resolve(word.length), error => Promise.resolve(10));
-promiseNumber = thenWithPromiseResultAndPromiseReject;
-
-var thenWithPromiseResultAndSimpleReject = promiseString.then(word => Promise.resolve(word.length), error => 10);
-promiseNumber = thenWithPromiseResultAndSimpleReject;
-
-var thenWithSimpleResult = promiseString.then(word => word.length);
-promiseNumber = thenWithSimpleResult;
-
-var thenWithSimpleResultAndPromiseReject = promiseString.then(word => word.length, error => Promise.resolve(10));
-promiseNumber = thenWithSimpleResultAndPromiseReject;
-
-var thenWithSimpleResultAndSimpleReject = promiseString.then(word => word.length, error => 10);
-promiseNumber = thenWithSimpleResultAndSimpleReject;
-
-var thenWithUndefinedFullFillAndSimpleReject = promiseString.then(undefined, error => 10);
-promiseNumber = thenWithUndefinedFullFillAndSimpleReject;
-
-var thenWithUndefinedFullFillAndPromiseReject = promiseString.then(undefined, error => Promise.resolve(10));
-promiseNumber = thenWithUndefinedFullFillAndPromiseReject;
-
-var thenWithNoResultAndNoReject = promiseString.then<number>();
-promiseNumber = thenWithNoResultAndNoReject;
-
-var catchAfterThen = promiseString.then().catch<number>();
-promiseNumber = catchAfterThen;
-
-var voidPromise = new Promise<void>(function (resolve) { resolve(); });
-
-//catch test
-var catchWithSimpleResult = promiseString.catch(error => 10);
-promiseNumber = catchWithSimpleResult;
-
-var catchWithPromiseResult = promiseString.catch(error => Promise.resolve(10));
-promiseNumber = catchWithPromiseResult;
-
-promiseString = promiseString.catch<string>(function (): string {
-  throw new Error('Better error msg');
-});
-
-//examples coming from http://www.html5rocks.com/en/tutorials/es6/promises/
-
-function get(url: string) {
-    // Return a new promise.
-    return new Promise<string>(function(resolve, reject) {
-        // Do the usual XHR stuff
-        var req = new XMLHttpRequest();
-        req.open('GET', url);
-
-        req.onload = function() {
-            // This is called even on 404 etc
-            // so check the status
-            if (req.status == 200) {
-                // Resolve the promise with the response text
-                resolve(req.response);
-            }
-            else {
-                // Otherwise reject with the status text
-                // which will hopefully be a meaningful error
-                reject(Error(req.statusText));
-            }
-        };
-
-        // Handle network errors
-        req.onerror = function() {
-            reject(Error("Network Error"));
-        };
-
-        // Make the request
-        req.send();
-    });
-}
-
-
-
-function getJSON(url: string) {
-	return get(url).then(JSON.parse);
-}
-
-function addHtmlToPage(html: string) {
-
-}
-
-function addTextToPage(text: string) {
-
-}
-
-interface Story {
-	heading: string;
-	chapterUrls: string[]
-}
-
-getJSON('story.json').then(function(story: Story) {
-  addHtmlToPage(story.heading);
-
-  // Map our array of chapter urls to
-  // an array of chapter json promises.
-  // This makes sure they all download parallel.
-  return story.chapterUrls.map(getJSON)
-    .reduce(function(sequence, chapterPromise) {
-      // Use reduce to chain the promises together,
-      // adding content to the page for each chapter
-      return sequence.then(function() {
-        // Wait for everything in the sequence so far,
-        // then wait for this chapter to arrive.
-        return chapterPromise;
-      }).then(function(chapter) {
-        addHtmlToPage(chapter.html);
-      });
-    }, Promise.resolve());
-}).then(function() {
-  addTextToPage("All done");
-}).catch(function(err) {
-  // catch any error that happened along the way
-  addTextToPage("Argh, broken: " + err.message);
-}).then(function() {
-  (<HTMLElement>document.querySelector('.spinner')).style.display = 'none';
-});
-
-interface T1 {
-    __t1: string;
-}
-
-interface T2 {
-    __t2: string;
-}
-
-interface T3 {
-    __t3: string;
-}
-
-function f1(): Promise<T1> {
-    return Promise.resolve({ __t1: "foo_t1" });
-}
-
-function f2(x: T1): T2 {
-    return { __t2: x.__t1 + ":foo_21" };
-}
-
-var x3 = f1()
-    .then(f2, (e: Error) => {
-    console.log("error 1");
-    throw e;
-})
-    .then((x: T2) => {
-    return { __t3: x.__t2 + "bar" };
-});
\ No newline at end of file
diff --git a/types/es6-promise/index.d.ts b/types/es6-promise/index.d.ts
deleted file mode 100644
index 56e0682491..0000000000
--- a/types/es6-promise/index.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for es6-promise
-// Project: https://github.com/jakearchibald/ES6-Promise
-// Definitions by: François de Campredon <https://github.com/fdecampredon>, vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Thenable<T> {
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
-}
-
-declare class Promise<T> implements Thenable<T> {
-	/**
-	 * 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 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().
-	 */
-	constructor(callback: (resolve : (value?: T | Thenable<T>) => void, reject: (error?: any) => void) => void);
-
-	/**
-	 * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
-	 * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
-	 * Both callbacks have a single parameter , the fulfillment value or rejection reason.
-	 * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
-	 * If an error is thrown in the callback, the returned promise rejects with that error.
-	 *
-	 * @param onFulfilled called when/if "promise" resolves
-	 * @param onRejected called when/if "promise" rejects
-	 */
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Promise<U>;
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Promise<U>;
-
-	/**
-	 * Sugar for promise.then(undefined, onRejected)
-	 *
-	 * @param onRejected called when/if "promise" rejects
-	 */
-	catch<U>(onRejected?: (error: any) => U | Thenable<U>): Promise<U>;
-}
-
-declare namespace Promise {
-	/**
-	 * Make a new promise from the thenable.
-	 * A thenable is promise-like in as far as it has a "then" method.
-	 */
-	function resolve<T>(value?: T | Thenable<T>): Promise<T>;
-
-	/**
-	 * Make a promise that rejects to obj. For consistency and debugging (eg stack traces), obj should be an instanceof Error
-	 */
-	function reject(error: any): Promise<any>;
-	function reject<T>(error: T): Promise<T>;
-
-	/**
-	 * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
-	 * the array passed to all can be a mixture of promise-like objects and other objects.
-	 * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
-	 */
-	function all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>, T8 | Thenable<T8>, T9 | Thenable<T9>, T10 | Thenable<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-    function all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>, T8 | Thenable<T8>, T9 | Thenable<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-    function all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>, T8 | Thenable<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-    function all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
-    function all<T1, T2, T3, T4, T5, T6>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
-    function all<T1, T2, T3, T4, T5>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>]): Promise<[T1, T2, T3, T4, T5]>;
-    function all<T1, T2, T3, T4>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>]): Promise<[T1, T2, T3, T4]>;
-    function all<T1, T2, T3>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>]): Promise<[T1, T2, T3]>;
-    function all<T1, T2>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>]): Promise<[T1, T2]>;
-    function all<T>(values: (T | Thenable<T>)[]): Promise<T[]>;
-
-	/**
-	 * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
-	 */
-	function race<T>(promises: (T | Thenable<T>)[]): Promise<T>;
-}
-
-declare module 'es6-promise' {
-	var foo: typeof Promise; // Temp variable to reference Promise in local context
-	namespace rsvp {
-		export var Promise: typeof foo;
-		export function polyfill(): void;
-	}
-	export = rsvp;
-}
diff --git a/types/es6-promise/tsconfig.json b/types/es6-promise/tsconfig.json
deleted file mode 100644
index 8b3cc9da2a..0000000000
--- a/types/es6-promise/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es5",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "es6-promise-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/es6-shim/tslint.json b/types/es6-shim/tslint.json
new file mode 100644
index 0000000000..637071b426
--- /dev/null
+++ b/types/es6-shim/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-object-spread": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/escape-html/tslint.json b/types/escape-html/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/escape-html/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/escape-latex/tslint.json b/types/escape-latex/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/escape-latex/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/escape-string-regexp/index.d.ts b/types/escape-string-regexp/index.d.ts
index 1ef18aedb1..7a52a312b1 100644
--- a/types/escape-string-regexp/index.d.ts
+++ b/types/escape-string-regexp/index.d.ts
@@ -1,10 +1,11 @@
 // Type definitions for escape-string-regexp
 // Project: https://github.com/sindresorhus/escape-string-regexp
 // Definitions by: kruncher <https://github.com/kruncher>
+//                 faergeek <https://github.com/faergeek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
 
-declare function escapeStringRegexp(str: string): string;
+declare const escapeStringRegexp: (str: string) => string;
 
 export = escapeStringRegexp;
diff --git a/types/escape-string-regexp/tslint.json b/types/escape-string-regexp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/escape-string-regexp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/escodegen/tslint.json b/types/escodegen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/escodegen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/esprima-walk/tslint.json b/types/esprima-walk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/esprima-walk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/esprima/v2/tslint.json b/types/esprima/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/esprima/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/espruino/espruino-tests.ts b/types/espruino/espruino-tests.ts
new file mode 100644
index 0000000000..5e84a93e65
--- /dev/null
+++ b/types/espruino/espruino-tests.ts
@@ -0,0 +1,2 @@
+I2C1.setup({ scl: D4, sda: D0 });
+Serial2.setup(9600, { rx: D16, tx: D17 });
diff --git a/types/espruino/index.d.ts b/types/espruino/index.d.ts
new file mode 100644
index 0000000000..43d1068230
--- /dev/null
+++ b/types/espruino/index.d.ts
@@ -0,0 +1,4028 @@
+// Type definitions for Espruino 1.94
+// Project: http://www.espruino.com/
+// Definitions by: Stanislav Berkov <https://github.com/stasberkov>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare interface Object {
+    removeListener(event: string, listener: any): any;
+}
+
+declare module "Wifi" {
+    function connect(ssid: string, options: any, callback: (err: any) => any): any;
+}
+
+declare module "InfluxDB" {
+    function setup(options: any): any;
+    function write(data: string): any;
+}
+
+/**
+ * <p>This is the built-in class for the Arduino-style pin namings on ST Nucleo boards</p>
+ * 
+ * @url http://www.espruino.com/Reference#Nucleo
+ */
+declare interface Nucleo {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Nucleo;
+}
+
+/**
+* 
+*/
+declare namespace Nucleo {
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_A0
+     */
+    var A0: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_A1
+     */
+    var A1: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_A2
+     */
+    var A2: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_A3
+     */
+    var A3: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_A4
+     */
+    var A4: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_A5
+     */
+    var A5: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D0
+     */
+    var D0: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D1
+     */
+    var D1: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D2
+     */
+    var D2: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D3
+     */
+    var D3: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D4
+     */
+    var D4: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D5
+     */
+    var D5: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D6
+     */
+    var D6: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D7
+     */
+    var D7: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D8
+     */
+    var D8: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D9
+     */
+    var D9: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D10
+     */
+    var D10: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D11
+     */
+    var D11: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D12
+     */
+    var D12: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D13
+     */
+    var D13: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D14
+     */
+    var D14: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_Nucleo_D15
+     */
+    var D15: Pin;
+}
+
+/**
+* <p>This is a built-in class to allow you to use the ESP8266 NodeMCU boards&#39;s pin namings to access pins. It is only available on ESP8266-based boards.</p>
+* 
+* @url http://www.espruino.com/Reference#NodeMCU
+*/
+declare interface NodeMCU {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): NodeMCU;
+}
+
+
+/**
+* 
+*/
+declare namespace NodeMCU {
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_A0
+     */
+    var A0: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D0
+     */
+    var D0: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D1
+     */
+    var D1: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D2
+     */
+    var D2: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D3
+     */
+    var D3: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D4
+     */
+    var D4: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D5
+     */
+    var D5: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D6
+     */
+    var D6: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D7
+     */
+    var D7: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D8
+     */
+    var D8: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D9
+     */
+    var D9: Pin;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_NodeMCU_D10
+     */
+    var D10: Pin;
+}
+
+/**
+* <p>Creates a Queue Object</p>
+* 
+* @url http://www.espruino.com/Reference#l_Queue_Queue
+*/
+declare interface Queue {
+
+    /**
+     * 
+     * @param queueName 
+     * @return  
+     */
+    new(queueName: any): any;
+
+    /**
+     * <p>reads one character from queue, if available</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Queue_read
+     */
+    read(): void;
+
+    /**
+     * <p>Writes one character to queue</p>
+     * 
+     * @param char 
+     * @url http://www.espruino.com/Reference#l_Queue_writeChar
+     */
+    writeChar(char: any): void;
+
+    /**
+     * <p>logs list of queues</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Queue_log
+     */
+    log(): void;
+}
+
+/**
+* <p>Creates a Task Object</p>
+* 
+* @url http://www.espruino.com/Reference#l_Task_Task
+*/
+declare interface Task {
+
+    /**
+     * 
+     * @param taskName 
+     * @return  
+     */
+    new(taskName: any): any;
+
+    /**
+     * <p>Suspend task, be careful not to suspend Espruino task itself</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Task_suspend
+     */
+    suspend(): void;
+
+    /**
+     * <p>Resumes a suspended task</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Task_resume
+     */
+    resume(): void;
+
+    /**
+     * <p>returns name of actual task</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Task_getCurrent
+     */
+    getCurrent(): any;
+
+    /**
+     * <p>Sends a binary notify to task</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Task_notify
+     */
+    notify(): void;
+
+    /**
+     * <p>logs list of tasks</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Task_log
+     */
+    log(): void;
+}
+
+/**
+* <p>Creates a Timer Object</p>
+* 
+* @url http://www.espruino.com/Reference#l_Timer_Timer
+*/
+declare interface Timer {
+
+    /**
+     * 
+     * @param timerName 
+     * @param group 
+     * @param index 
+     * @param isrIndex 
+     * @return  
+     */
+    new(timerName: any, group: number, index: number, isrIndex: number): any;
+
+    /**
+     * <p>Starts a timer</p>
+     * 
+     * @param duration 
+     * @url http://www.espruino.com/Reference#l_Timer_start
+     */
+    start(duration: number): void;
+
+    /**
+     * <p>Reschedules a timer, needs to be started at least once</p>
+     * 
+     * @param duration 
+     * @url http://www.espruino.com/Reference#l_Timer_reschedule
+     */
+    reschedule(duration: number): void;
+
+    /**
+     * <p>logs list of timers</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Timer_log
+     */
+    log(): void;
+}
+
+
+    // write(data: any[]): any;
+    // on(event: string, handler: (data: any) => any): any;
+    // setup(boudrate: number, options: any): any;
+    // read(chars?: number): string;
+
+
+/**
+* <p>This class allows use of the built-in USARTs</p>
+* <p>Methods may be called on the USB, Serial1, Serial2, Serial3, Serial4, Serial5 and Serial6 objects. While different processors provide different numbers of USARTs, you can always rely on at least Serial1 and Serial2</p>
+* 
+* @url http://www.espruino.com/Reference#Serial
+*/
+declare interface Serial extends Object {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Serial;
+
+    /**
+     * <p>Set this Serial port as the port for the JavaScript console (REPL).</p>
+     * <p>Unless <code>force</code> is set to true, changes in the connection state of the board
+     * (for instance plugging in USB) will cause the console to change.</p>
+     * 
+     * @param force 
+     * @url http://www.espruino.com/Reference#l_Serial_setConsole
+     */
+    setConsole(force: boolean): void;
+
+    setup(baudrate: number, options: any): void;
+
+    /**
+     * <p>Print a string to the serial port - without a line feed</p>
+     * <p> <strong>Note:</strong> This function replaces any occurances of <code>\n</code> in the string with <code>\r\n</code>. To avoid this, use <code>Serial.write</code>.</p>
+     * 
+     * @param string 
+     * @url http://www.espruino.com/Reference#l_Serial_print
+     */
+    print(string: any): void;
+
+    on(eventName: string, f: (str: string) => void): void;
+
+    /**
+     * <p>Print a line to the serial port with a newline (<code>\r\n</code>) at the end of it.</p>
+     * <p> <strong>Note:</strong> This function converts data to a string first, eg <code>Serial.print([1,2,3])</code> is equivalent to <code>Serial.print(&quot;1,2,3&quot;). If you&#39;d like to write raw bytes, use</code>Serial.write`.</p>
+     * 
+     * @param string 
+     * @url http://www.espruino.com/Reference#l_Serial_println
+     */
+    println(string: any): void;
+
+    /**
+     * <p>Write a character or array of data to the serial port</p>
+     * <p>This method writes unmodified data, eg <code>Serial.write([1,2,3])</code> is equivalent to <code>Serial.write(&quot;\1\2\3&quot;)</code>. If you&#39;d like data converted to a string first, use <code>Serial.print</code>.</p>
+     * 
+     * @param data 
+     * @url http://www.espruino.com/Reference#l_Serial_write
+     */
+    write(data: any): void;
+
+
+    /**
+     * <p>Return how many bytes are available to read. If there is already a listener for data, this will always return 0.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Serial_available
+     */
+    available(): number;
+
+    /**
+     * <p>Return a string containing characters that have been received</p>
+     * 
+     * @param chars 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Serial_read
+     */
+    read(chars?: number): any;
+
+    /**
+     * <p>Pipe this USART to a stream (an object with a &#39;write&#39; method)</p>
+     * 
+     * @param destination 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_Serial_pipe
+     */
+    pipe(destination: any, options: any): void;
+
+    /**
+     * <p>Try and find a USART (Serial) hardware device that will work on this pin (eg. <code>Serial1</code>)</p>
+     * <p>May return undefined if no device can be found.</p>
+     * 
+     * @param pin 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Serial_find
+     */
+    find(pin: Pin): any;
+}
+
+/**
+* <p>The USB Serial port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_USB
+*/
+declare var USB: Serial;
+
+/**
+* <p>The first Serial (USART) port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Serial1
+*/
+declare var Serial1: Serial;
+
+/**
+* <p>The second Serial (USART) port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Serial2
+*/
+declare var Serial2: Serial;
+
+/**
+* <p>The third Serial (USART) port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Serial3
+*/
+declare var Serial3: Serial;
+
+/**
+* <p>The fourth Serial (USART) port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Serial4
+*/
+declare var Serial4: Serial;
+
+/**
+* <p>The fifth Serial (USART) port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Serial5
+*/
+declare var Serial5: Serial;
+
+/**
+* <p>The sixth Serial (USART) port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Serial6
+*/
+declare var Serial6: Serial;
+
+/**
+* <p>A loopback serial device. Data sent to LoopbackA comes out of LoopbackB and vice versa</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_LoopbackA
+*/
+declare var LoopbackA: Serial;
+
+/**
+* <p>A loopback serial device. Data sent to LoopbackA comes out of LoopbackB and vice versa</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_LoopbackB
+*/
+declare var LoopbackB: Serial;
+
+/**
+* <p>A telnet serial device that maps to the built-in telnet console server (devices that have
+* built-in wifi only).</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Telnet
+*/
+declare var Telnet: {
+};
+
+/**
+* <p>This module allows access to read and write the STM32&#39;s flash memory.</p>
+* <p>It should be used with extreme caution, as it is easy to overwrite parts of Flash
+* memory belonging to Espruino or even its bootloader. If you damage the bootloader
+* then you may need external hardware such as a USB-TTL converter to restore it. For
+* more information on restoring the bootloader see <code>Advanced Reflashing</code> in your
+* board&#39;s reference pages.</p>
+* <p>To see which areas of memory you can and can&#39;t overwrite, look at the values
+* reported by <code>process.memory()</code>.</p>
+* 
+* @url http://www.espruino.com/Reference#l_Flash_undefined
+*/
+declare interface Flash {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Flash;
+}
+
+
+/**
+* 
+*/
+declare namespace Flash {
+
+    /**
+     * <p>Returns the start and length of the flash page containing the given address.</p>
+     * 
+     * @param addr 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Flash_getPage
+     */
+    function getPage(addr: number): any;
+
+    /**
+     * <p>This method returns an array of objects of the form <code>{addr : #, length : #}</code>, representing
+     * contiguous areas of flash memory in the chip that are not used for anything.</p>
+     * <p>The memory areas returned are on page boundaries. This means that you can
+     * safely erase the page containing any address here, and you won&#39;t risk
+     * deleting part of the Espruino firmware.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Flash_getFree
+     */
+    function getFree(): any;
+
+    /**
+     * <p>Erase a page of flash memory</p>
+     * 
+     * @param addr 
+     * @url http://www.espruino.com/Reference#l_Flash_erasePage
+     */
+    function erasePage(addr: any): void;
+
+    /**
+     * <p>Write data into memory at the given address - IN MULTIPLES OF 4 BYTES.</p>
+     * <p>In flash memory you may only turn bits that are 1 into bits that are 0. If
+     * you&#39;re writing data into an area that you have already written (so <code>read</code>
+     * doesn&#39;t return all <code>0xFF</code>) you&#39;ll need to call <code>erasePage</code> to clear the
+     * entire page.</p>
+     * 
+     * @param data 
+     * @param addr 
+     * @url http://www.espruino.com/Reference#l_Flash_write
+     */
+    function write(data: any, addr: number): void;
+
+    /**
+     * <p>Read flash memory from the given address</p>
+     * 
+     * @param length 
+     * @param addr 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Flash_read
+     */
+    function read(length: number, addr: number): any;
+}
+
+/**
+* <p>This is the built-in JavaScript class for Espruino utility functions.</p>
+* 
+* @url http://www.espruino.com/Reference#E
+*/
+declare interface E {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): E;
+}
+
+
+/**
+* 
+*/
+declare namespace E {
+
+    /**
+     * <p>Use the STM32&#39;s internal thermistor to work out the temperature.</p>
+     * <p>While this is implemented on Espruino boards, it may not be implemented on other devices. If so it&#39;ll return NaN.</p>
+     * <p> <strong>Note:</strong> This is not entirely accurate and varies by a few degrees from chip to chip. It measures the <strong>die temperature</strong>, so when connected to USB it could be reading 10 over degrees C above ambient temperature. When running from battery with <code>setDeepSleep(true)</code> it is much more accurate though.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_getTemperature
+     */
+    function getTemperature(): number;
+
+    /**
+     * <p>Check the internal voltage reference. To work out an actual voltage of an input pin, you can use <code>analogRead(pin)*E.getAnalogVRef()</code></p>
+     * <p> <strong>Note:</strong> This value is calculated by reading the voltage on an internal voltage reference with the ADC.
+     * It will be slightly noisy, so if you need this for accurate measurements we&#39;d recommend that you call
+     * this function several times and average the results.</p>
+     * <p>While this is implemented on Espruino boards, it may not be implemented on other devices. If so it&#39;ll return NaN.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_getAnalogVRef
+     */
+    function getAnalogVRef(): number;
+
+    /**
+     * <p>ADVANCED: This is a great way to crash Espruino if you&#39;re not sure what you are doing</p>
+     * <p>Create a native function that executes the code at the given address. Eg. <code>E.nativeCall(0x08012345,&#39;double (double,double)&#39;)(1.1, 2.2)</code></p>
+     * <p>If you&#39;re executing a thumb function, you&#39;ll almost certainly need to set the bottom bit of the address to 1.</p>
+     * <p>Note it&#39;s not guaranteed that the call signature you provide can be used - there are limits on the number of arguments allowed.</p>
+     * <p>When supplying <code>data</code>, if it is a &#39;flat string&#39; then it will be used directly, otherwise it&#39;ll be converted to a flat string and used.</p>
+     * 
+     * @param addr 
+     * @param sig 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_nativeCall
+     */
+    function nativeCall(addr: number, sig: any, data: any): any;
+
+    /**
+     * <p>Clip a number to be between min and max (inclusive)</p>
+     * 
+     * @param x 
+     * @param min 
+     * @param max 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_clip
+     */
+    function clip(x: number, min: number, max: number): number;
+
+    /**
+     * <p>Sum the contents of the given Array, String or ArrayBuffer and return the result</p>
+     * 
+     * @param arr 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_sum
+     */
+    function sum(arr: any): number;
+
+    /**
+     * <p>Work out the variance of the contents of the given Array, String or ArrayBuffer and return the result. This is equivalent to <code>v=0;for (i in arr) v+=Math.pow(mean-arr[i],2)</code></p>
+     * 
+     * @param arr 
+     * @param mean 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_variance
+     */
+    function variance(arr: any, mean: number): number;
+
+    /**
+     * <p>Convolve arr1 with arr2. This is equivalent to <code>v=0;for (i in arr1) v+=arr1[i] * arr2[(i+offset) % arr2.length]</code></p>
+     * 
+     * @param arr1 
+     * @param arr2 
+     * @param offset 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_convolve
+     */
+    function convolve(arr1: any, arr2: any, offset: number): number;
+
+    /**
+     * <p>Performs a Fast Fourier Transform (fft) on the supplied data and writes it back into the original arrays. Note that if only one array is supplied, the data written back is the modulus of the complex result <code>sqrt(r*r+i*i)</code>.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_E_FFT
+     */
+    interface FFT {
+
+        /**
+         * 
+         * @param arrReal 
+         * @param arrImage 
+         * @param inverse 
+         * @return  
+         */
+        new(arrReal: any, arrImage: any, inverse: boolean): FFT;
+    }
+
+
+    /**
+     * <p>Interpolate between two adjacent values in the Typed Array</p>
+     * 
+     * @param array 
+     * @param index 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_interpolate
+     */
+    function interpolate(array: any, index: number): number;
+
+    /**
+     * <p>Interpolate between four adjacent values in the Typed Array, in 2D.</p>
+     * 
+     * @param array 
+     * @param width 
+     * @param x 
+     * @param y 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_interpolate2d
+     */
+    function interpolate2d(array: any, width: number, x: number, y: number): number;
+
+    /**
+     * <p>Kicks a Watchdog timer set up with <code>E.enableWatchdog(..., false)</code>. See
+     * <code>E.enableWatchdog</code> for more information.</p>
+     * <p><strong>NOTE:</strong> This is only implemented on STM32 and nRF5x devices (all official Espruino boards).</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_E_kickWatchdog
+     */
+    function kickWatchdog(): void;
+
+    /**
+     * <p>Get and reset the error flags. Returns an array that can contain:</p>
+     * <p><code>&#39;FIFO_FULL&#39;</code>: The receive FIFO filled up and data was lost. This could be state transitions for setWatch, or received characters.</p>
+     * <p><code>&#39;BUFFER_FULL&#39;</code>: A buffer for a stream filled up and characters were lost. This can happen to any stream - Serial,HTTP,etc.</p>
+     * <p><code>&#39;CALLBACK&#39;</code>: A callback (s<code>etWatch</code>, <code>setInterval</code>, <code>on(&#39;data&#39;,...)</code>) caused an error and so was removed.</p>
+     * <p><code>&#39;LOW_MEMORY&#39;</code>: Memory is running low - Espruino had to run a garbage collection pass or remove some of the command history</p>
+     * <p><code>&#39;MEMORY&#39;</code>: Espruino ran out of memory and was unable to allocate some data that it needed.</p>
+     * <p><code>&#39;JSERR_UART_OVERFLOW&#39;</code> : A UART received data but it was not read in time and was lost</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_getErrorFlags
+     */
+    function getErrorFlags(): any;
+
+    /**
+     * <p>Get Espruino&#39;s interpreter flags that control the way it handles your JavaScript code.</p>
+     * <ul>
+     * <li><code>deepSleep</code> - Allow deep sleep modes (also set by setDeepSleep)</li>
+     * <li><code>pretokenise</code> - When adding functions, pre-minify them and tokenise reserved words</li>
+     * </ul>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_getFlags
+     */
+    function getFlags(): any;
+
+    /**
+     * <p>Set the Espruino interpreter flags that control the way it handles your JavaScript code.</p>
+     * <p>Run <code>E.getFlags()</code> and check its description for a list of available flags and their values.</p>
+     * 
+     * @param flags 
+     * @url http://www.espruino.com/Reference#l_E_setFlags
+     */
+    function setFlags(flags: any): void;
+
+    /**
+     * <p>Create an ArrayBuffer from the given string. This is done via a reference, not a copy - so it is very fast and memory efficient.</p>
+     * <p>Note that this is an ArrayBuffer, not a Uint8Array. To get one of those, do: <code>new Uint8Array(E.toArrayBuffer(&#39;....&#39;))</code>.</p>
+     * 
+     * @param str 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_toArrayBuffer
+     */
+    function toArrayBuffer(str: any): ArrayBuffer;
+
+    /**
+     * <p>This creates a Uint8Array from the given arguments. If an argument is a String or an Array,
+     * each element is traversed and added as if it were an 8 bit value. If it is anything else, it is
+     * converted to an 8 bit value directly.</p>
+     * 
+     * @param args 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_toUint8Array
+     */
+    function toUint8Array(args: any): Uint8Array;
+
+    /**
+     * <p>This creates and returns a special type of string, which actually references
+     * a specific memory address. It can be used in order to use sections of
+     * Flash memory directly in Espruino (for example to execute code straight
+     * from flash memory with <code>eval(E.memoryArea( ... ))</code>)</p>
+     * <p><strong>Note:</strong> This is only tested on STM32-based platforms (Espruino Original
+     * and Espruino Pico) at the moment.</p>
+     * 
+     * @param addr 
+     * @param len 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_memoryArea
+     */
+    function memoryArea(addr: number, len: number): string;
+
+    /**
+     * <p>This writes JavaScript code into Espruino&#39;s flash memory, to be executed on
+     * startup. It differs from <code>save()</code> in that <code>save()</code> saves the whole state of
+     * the interpreter, whereas this just saves JS code that is executed at boot.</p>
+     * <p>Code will be executed before <code>onInit()</code> and <code>E.on(&#39;init&#39;, ...)</code>.</p>
+     * <p>If <code>alwaysExec</code> is <code>true</code>, the code will be executed even after a call to
+     * <code>reset()</code>. This is useful if you&#39;re making something that you want to
+     * program, but you want some code that is always built in (for instance
+     * setting up a display or keyboard).</p>
+     * <p>To remove boot code that has been saved previously, use <code>E.setBootCode(&quot;&quot;)</code></p>
+     * <p><strong>Note:</strong> this removes any code that was previously saved with <code>save()</code></p>
+     * 
+     * @param code 
+     * @param alwaysExec 
+     * @url http://www.espruino.com/Reference#l_E_setBootCode
+     */
+    function setBootCode(code: any, alwaysExec: boolean): void;
+
+    /**
+     * <p>This sets the clock frequency of Espruino&#39;s processor. It will return <code>0</code> if
+     * it is unimplemented or the clock speed cannot be changed.</p>
+     * <p><strong>Note:</strong> On pretty much all boards, UART, SPI, I2C, PWM, etc will change
+     * frequency and will need setting up again in order to work.</p>
+     * <h3 id="stm32f4">STM32F4</h3>
+     * <p>Options is of the form <code>{ M: int, N: int, P: int, Q: int }</code> - see the &#39;Clocks&#39;
+     * section of the microcontroller&#39;s reference manual for what these mean.</p>
+     * <ul>
+     * <li>System clock = 8Mhz <em> N / ( M </em> P )</li>
+     * <li>USB clock (should be 48Mhz) = 8Mhz <em> N / ( M </em> Q )</li>
+     * </ul>
+     * <p>Optional arguments are:</p>
+     * <ul>
+     * <li><code>latency</code> - flash latency from 0..15</li>
+     * <li><code>PCLK1</code> - Peripheral clock 1 divisor (default: 2)</li>
+     * <li><code>PCLK2</code> - Peripheral clock 2 divisor (default: 4)</li>
+     * </ul>
+     * <p>The Pico&#39;s default is <code>{M:8, N:336, P:4, Q:7, PCLK1:2, PCLK2:4}</code>, use
+     * <code>{M:8, N:336, P:8, Q:7, PCLK:1, PCLK2:2}</code> to halve the system clock speed
+     * while keeping the peripherals running at the same speed (omitting PCLK1/2
+     * will lead to the peripherals changing speed too).</p>
+     * <p>On STM32F4 boards (eg. Espruino Pico), the USB clock needs to be kept at 48Mhz
+     * or USB will fail to work. You&#39;ll also experience USB instability if the processor
+     * clock falls much below 48Mhz.</p>
+     * <h3 id="esp8266">ESP8266</h3>
+     * <p>Just specify an integer value, either 80 or 160 (for 80 or 160Mhz)</p>
+     * 
+     * @param options 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_setClock
+     */
+    function setClock(options: any): number;
+
+    /**
+     * <p>Reverse the 8 bits in a byte, swapping MSB and LSB.</p>
+     * <p>For example, <code>E.reverseByte(0b10010000) == 0b00001001</code>.</p>
+     * <p>Note that you can reverse all the bytes in an array with: <code>arr = arr.map(E.reverseByte)</code></p>
+     * 
+     * @param x 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_reverseByte
+     */
+    function reverseByte(x: number): number;
+
+    /**
+     * <p>Output the current list of Utility Timer Tasks - for debugging only</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_E_dumpTimers
+     */
+    function dumpTimers(): void;
+
+    /**
+     * <p>Dump any locked variables that aren&#39;t referenced from <code>global</code> - for debugging memory leaks only.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_E_dumpLockedVars
+     */
+    function dumpLockedVars(): void;
+
+    /**
+     * <p>Take each element of the <code>from</code> array, look it up in <code>map</code> (or call the
+     * function with it as a first argument), and write it into the corresponding
+     * element in the <code>to</code> array.</p>
+     * 
+     * @param from 
+     * @param to 
+     * @param map 
+     * @param bits 
+     * @url http://www.espruino.com/Reference#l_E_mapInPlace
+     */
+    function mapInPlace(from: any, to: any, map: any, bits: number): void;
+
+    /**
+     * <p>Get the current interpreter state in a text form such that it can be copied to a new device</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_dumpStr
+     */
+    function dumpStr(): string;
+
+    /**
+     * <p>Set the seed for the random number generator used by <code>Math.random()</code>.</p>
+     * 
+     * @param v 
+     * @url http://www.espruino.com/Reference#l_E_srand
+     */
+    function srand(v: number): void;
+
+    /**
+     * <p>Unlike &#39;Math.random()&#39; which uses a pseudo-random number generator, this
+     * method reads from the internal voltage reference several times, xoring and
+     * rotating to try and make a relatively random value from the noise in the
+     * signal.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_hwRand
+     */
+    function hwRand(): number;
+
+    /**
+     * <p>Convert hue, saturation and brightness to red, green and blue (packed into an integer)</p>
+     * <p>This replaces <code>Graphics.setColorHSB</code> and <code>Graphics.setBgColorHSB</code>. On devices with 24 bit colour it can
+     * be used as: <code>Graphics.setColorHSB(E.HSBtoRGB(h, s, b))</code></p>
+     * 
+     * @url http://www.espruino.com/Reference#l_E_HSBtoRGB
+     */
+    interface HSBtoRGB {
+
+        /**
+         * 
+         * @param hue 
+         * @param sat 
+         * @param bri 
+         * @return  
+         */
+        new(hue: number, sat: number, bri: number): number;
+    }
+
+
+    /**
+     * <p>Set a password on the console (REPL). When powered on, Espruino will
+     * then demand a password before the console can be used. If you want to
+     * lock the console immediately after this you can call <code>E.lockConsole()</code></p>
+     * <p>To remove the password, call this function with no arguments.</p>
+     * <p><strong>Note:</strong> There is no protection against multiple password attempts, so someone
+     * could conceivably try every password in a dictionary.</p>
+     * <p><strong>Note:</strong> This password is stored in memory in plain text. If someone is able
+     * to execute arbitrary JavaScript code on the device (eg, you use <code>eval</code> on input
+     * from unknown sources) or read the device&#39;s firmware then they may be able to
+     * obtain it.</p>
+     * 
+     * @param password 
+     * @url http://www.espruino.com/Reference#l_E_setPassword
+     */
+    function setPassword(password: any): void;
+
+    /**
+     * <p>If a password has been set with <code>E.setPassword()</code>, this will lock the console
+     * so the password needs to be entered to unlock it.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_E_lockConsole
+     */
+    function lockConsole(): void;
+
+    /**
+     * <p>Set the time zone to be used with <code>Date</code> objects.</p>
+     * <p>For example <code>E.setTimeZone(1)</code> will be GMT+0100</p>
+     * 
+     * @param zone 
+     * @url http://www.espruino.com/Reference#l_E_setTimeZone
+     */
+    function setTimeZone(zone: number): void;
+
+    /**
+     * <p>USB HID will only take effect next time you unplug and re-plug your Espruino. If you&#39;re
+     * disconnecting it from power you&#39;ll have to make sure you have <code>save()</code>d after calling
+     * this function.</p>
+     * 
+     * @param opts 
+     * @url http://www.espruino.com/Reference#l_E_setUSBHID
+     */
+    function setUSBHID(opts: any): void;
+
+    /**
+     * 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_sendUSBHID
+     */
+    function sendUSBHID(data: any): boolean;
+
+    /**
+     * <p>Unmount the SD card, so it can be removed. If you remove the SD card without calling this you may cause corruption, and you will be unable to access another SD card until you reset Espruino or call <code>E.unmountSD()</code>.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_E_unmountSD
+     */
+    function unmountSD(): void;
+
+    /**
+     * <p>Open a file</p>
+     * 
+     * @param path 
+     * @param mode 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_E_openFile
+     */
+    function openFile(path: any, mode: any): File;
+}
+
+/**
+* <p>Creates a pin from the given argument (or returns undefined if no argument)</p>
+* 
+* @url http://www.espruino.com/Reference#l_Pin_Pin
+*/
+declare interface Pin {
+
+    /**
+     * 
+     * @param value 
+     * @return  
+     */
+    new(value: any): any;
+
+    /**
+     * <p>Returns the input state of the pin as a boolean.</p>
+     * <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset the pin&#39;s state to <code>&quot;input&quot;</code></p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Pin_read
+     */
+    read(): boolean;
+
+    /**
+     * <p>Sets the output state of the pin to a 1</p>
+     * <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset the pin&#39;s state to <code>&quot;output&quot;</code></p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Pin_set
+     */
+    set(): void;
+
+    /**
+     * <p>Sets the output state of the pin to a 0</p>
+     * <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset the pin&#39;s state to <code>&quot;output&quot;</code></p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Pin_reset
+     */
+    reset(): void;
+
+    /**
+     * <p>Sets the output state of the pin to the parameter given</p>
+     * <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset the pin&#39;s state to <code>&quot;output&quot;</code></p>
+     * 
+     * @param value 
+     * @url http://www.espruino.com/Reference#l_Pin_write
+     */
+    write(value: boolean): void;
+
+    /**
+     * <p>Sets the output state of the pin to the parameter given at the specified time.</p>
+     * <p> <strong>Note:</strong> this <strong>doesn&#39;t</strong> change the mode of the pin to an output. To do that, you need to use <code>pin.write(0)</code> or <code>pinMode(pin, &#39;output&#39;)</code> first.</p>
+     * 
+     * @param value 
+     * @param time 
+     * @url http://www.espruino.com/Reference#l_Pin_writeAtTime
+     */
+    writeAtTime(value: boolean, time: number): void;
+
+    /**
+     * <p>Return the current mode of the given pin. See <code>pinMode</code> for more information.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Pin_getMode
+     */
+    getMode(): any;
+
+    /**
+     * <p>Set the mode of the given pin. See <a href="#l__global_pinMode"><code>pinMode</code></a> for more information on pin modes.</p>
+     * 
+     * @param mode 
+     * @url http://www.espruino.com/Reference#l_Pin_mode
+     */
+    mode(mode: any): void;
+
+    /**
+     * <p>Toggles the state of the pin from off to on, or from on to off.</p>
+     * <p><strong>Note:</strong> This method doesn&#39;t currently work on the ESP8266 port of Espruino.</p>
+     * <p><strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset the pin&#39;s state to <code>&quot;output&quot;</code></p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Pin_toggle
+     */
+    toggle(): boolean;
+}
+
+/**
+* <p>Built-in class that caches the modules used by the <code>require</code> command</p>
+* 
+* @url http://www.espruino.com/Reference#Modules
+*/
+declare interface Modules {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Modules;
+}
+
+
+/**
+* 
+*/
+declare namespace Modules {
+
+    /**
+     * <p>Return an array of module names that have been cached</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Modules_getCached
+     */
+    function getCached(): any;
+
+    /**
+     * <p>Remove the given module from the list of cached modules</p>
+     * 
+     * @param id 
+     * @url http://www.espruino.com/Reference#l_Modules_removeCached
+     */
+    function removeCached(id: any): void;
+
+    /**
+     * <p>Remove all cached modules</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Modules_removeAllCached
+     */
+    function removeAllCached(): void;
+
+    /**
+     * <p>Add the given module to the cache</p>
+     * 
+     * @param id 
+     * @param sourcecode 
+     * @url http://www.espruino.com/Reference#l_Modules_addCached
+     */
+    function addCached(id: any, sourcecode: any): void;
+}
+
+/**
+* <p>Create a waveform class. This allows high speed input and output of waveforms. It has an internal variable called <code>buffer</code> (as well as <code>buffer2</code> when double-buffered - see <code>options</code> below) which contains the data to input/output.</p>
+* <p>When double-buffered, a &#39;buffer&#39; event will be emitted each time a buffer is finished with (the argument is that buffer). When the recording stops, a &#39;finish&#39; event will be emitted (with the first argument as the buffer).</p>
+* 
+* @url http://www.espruino.com/Reference#l_Waveform_Waveform
+*/
+declare interface Waveform {
+
+    /**
+     * 
+     * @param samples 
+     * @param options 
+     * @return  
+     */
+    new(samples: number, options: any): any;
+
+    /**
+     * <p>Will start outputting the waveform on the given pin - the pin must have previously been initialised with analogWrite. If not repeating, it&#39;ll emit a <code>finish</code> event when it is done.</p>
+     * 
+     * @param output 
+     * @param freq 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_Waveform_startOutput
+     */
+    startOutput(output: Pin, freq: number, options: any): void;
+
+    /**
+     * <p>Will start inputting the waveform on the given pin that supports analog. If not repeating, it&#39;ll emit a <code>finish</code> event when it is done.</p>
+     * 
+     * @param output 
+     * @param freq 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_Waveform_startInput
+     */
+    startInput(output: Pin, freq: number, options: any): void;
+
+    /**
+     * <p>Stop a waveform that is currently outputting</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Waveform_stop
+     */
+    stop(): void;
+}
+
+/**
+* <p>Create a software OneWire implementation on the given pin</p>
+* 
+* @url http://www.espruino.com/Reference#l_OneWire_OneWire
+*/
+declare interface OneWire {
+
+    /**
+     * 
+     * @param pin 
+     * @return  
+     */
+    new(pin: Pin): any;
+
+    /**
+     * <p>Perform a reset cycle</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_OneWire_reset
+     */
+    reset(): boolean;
+
+    /**
+     * <p>Select a ROM - always performs a reset first</p>
+     * 
+     * @param rom 
+     * @url http://www.espruino.com/Reference#l_OneWire_select
+     */
+    select(rom: any): void;
+
+    /**
+     * <p>Skip a ROM</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_OneWire_skip
+     */
+    skip(): void;
+
+    /**
+     * <p>Write one or more bytes</p>
+     * 
+     * @param data 
+     * @param power 
+     * @url http://www.espruino.com/Reference#l_OneWire_write
+     */
+    write(data: any, power: boolean): void;
+
+    /**
+     * <p>Read a byte</p>
+     * 
+     * @param count 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_OneWire_read
+     */
+    read(count: any): any;
+
+    /**
+     * <p>Search for devices</p>
+     * 
+     * @param command 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_OneWire_search
+     */
+    search(command: number): any;
+}
+
+/**
+* <p>Create a software SPI port. This has limited functionality (no baud rate), but it can work on any pins.</p>
+* <p>Use <code>SPI.setup</code> to configure this port.</p>
+* 
+* @url http://www.espruino.com/Reference#l_SPI_SPI
+*/
+declare interface SPI {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): SPI;
+
+    /**
+     * <p>Set up this SPI port as an SPI Master.</p>
+     * 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_SPI_setup
+     */
+    setup(options: any): void;
+
+    /**
+     * <p>Send data down SPI, and return the result. Sending an integer will return an integer, a String will return a String, and anything else will return a Uint8Array.</p>
+     * <p>Sending multiple bytes in one call to send is preferable as they can then be transmitted end to end. Using multiple calls to send() will result in significantly slower transmission speeds.</p>
+     * <p>For maximum speeds, please pass either Strings or Typed Arrays as arguments. Note that you can even pass arrays of arrays, like <code>[1,[2,3,4],5]</code></p>
+     * 
+     * @param data 
+     * @param nss_pin 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_SPI_send
+     */
+    send(data: any, nss_pin: Pin): any;
+
+    /**
+     * <p>Write a character or array of characters to SPI - without reading the result back.</p>
+     * <p>For maximum speeds, please pass either Strings or Typed Arrays as arguments.</p>
+     * 
+     * @param data 
+     * @url http://www.espruino.com/Reference#l_SPI_write
+     */
+    write(data: any): void;
+
+    /**
+     * <p>Send data down SPI, using 4 bits for each &#39;real&#39; bit (MSB first). This can be useful for faking one-wire style protocols</p>
+     * <p>Sending multiple bytes in one call to send is preferable as they can then be transmitted end to end. Using multiple calls to send() will result in significantly slower transmission speeds.</p>
+     * 
+     * @param data 
+     * @param bit0 
+     * @param bit1 
+     * @param nss_pin 
+     * @url http://www.espruino.com/Reference#l_SPI_send4bit
+     */
+    send4bit(data: any, bit0: number, bit1: number, nss_pin: Pin): void;
+
+    /**
+     * <p>Send data down SPI, using 8 bits for each &#39;real&#39; bit (MSB first). This can be useful for faking one-wire style protocols</p>
+     * <p>Sending multiple bytes in one call to send is preferable as they can then be transmitted end to end. Using multiple calls to send() will result in significantly slower transmission speeds.</p>
+     * 
+     * @param data 
+     * @param bit0 
+     * @param bit1 
+     * @param nss_pin 
+     * @url http://www.espruino.com/Reference#l_SPI_send8bit
+     */
+    send8bit(data: any, bit0: number, bit1: number, nss_pin: Pin): void;
+
+    /**
+     * <p>Try and find an SPI hardware device that will work on this pin (eg. <code>SPI1</code>)</p>
+     * <p>May return undefined if no device can be found.</p>
+     * 
+     * @param pin 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_SPI_find
+     */
+    find(pin: Pin): any;
+}
+
+/**
+* <p>The first SPI port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_SPI1
+*/
+declare var SPI1: SPI;
+
+/**
+* <p>The second SPI port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_SPI2
+*/
+declare var SPI2: SPI;
+
+/**
+* <p>The third SPI port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_SPI3
+*/
+declare var SPI3: SPI;
+
+declare interface I2CSetupOptions {
+    scl: Pin;
+    sda: Pin;
+    bitrate?: number;
+}
+
+/**
+* <p>Create a software I2C port. This has limited functionality (no baud rate), but it can work on any pins.</p>
+* <p>Use <code>SPI.setup</code> to configure this port.</p>
+* 
+* @url http://www.espruino.com/Reference#l_I2C_I2C
+*/
+declare interface I2C {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): I2C;
+
+    /**
+     * <p>Set up this I2C port</p>
+     * <p>If not specified in options, the default pins are used (usually the lowest numbered pins on the lowest port that supports this peripheral)</p>
+     * 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_I2C_setup
+     */
+    setup(options: I2CSetupOptions): void;
+
+    /**
+     * <p>Transmit to the slave device with the given address. This is like Arduino&#39;s beginTransmission, write, and endTransmission rolled up into one.</p>
+     * 
+     * @param address 
+     * @param data 
+     * @url http://www.espruino.com/Reference#l_I2C_writeTo
+     */
+    writeTo(address: any, data: any): void;
+
+    /**
+     * <p>Request bytes from the given slave device, and return them as a Uint8Array (packed array of bytes). This is like using Arduino Wire&#39;s requestFrom, available and read functions.  Sends a STOP</p>
+     * 
+     * @param address 
+     * @param quantity 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_I2C_readFrom
+     */
+    readFrom(address: any, quantity: number): Uint8Array;
+
+    /**
+     * <p>Try and find an I2C hardware device that will work on this pin (eg. <code>I2C1</code>)</p>
+     * <p>May return undefined if no device can be found.</p>
+     * 
+     * @param pin 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_I2C_find
+     */
+    find(pin: Pin): any;
+}
+
+/**
+* <p>The first I2C port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_I2C1
+*/
+declare var I2C1: I2C;
+
+/**
+* <p>The second I2C port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_I2C2
+*/
+declare var I2C2: I2C;
+
+/**
+* <p>The third I2C port</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_I2C3
+*/
+declare var I2C3: I2C;
+
+/**
+* <p>This library provides TV out capability on the Espruino and Espruino Pico.</p>
+* <p>See the [[Television]] page for more information.</p>
+* 
+* @url http://www.espruino.com/Reference#l_tv_undefined
+*/
+declare function tv(): void;
+
+
+/**
+* <p>Class containing AES encryption/decryption</p>
+* <p><strong>Note:</strong> This library is currently only included in builds for the Espruino Pico and Espruino WiFi. For other boards you will have to make build your own firmware, and you may need to remove other features in order to make room.</p>
+* 
+* @url http://www.espruino.com/Reference#AES
+*/
+declare interface AES {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): AES;
+}
+
+
+/**
+* 
+*/
+declare namespace AES {
+
+    /**
+     * 
+     * @param passphrase 
+     * @param key 
+     * @param options 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_AES_encrypt
+     */
+    function encrypt(passphrase: any, key: any, options: any): ArrayBuffer;
+
+    /**
+     * 
+     * @param passphrase 
+     * @param key 
+     * @param options 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_AES_decrypt
+     */
+    function decrypt(passphrase: any, key: any, options: any): ArrayBuffer;
+}
+
+/**
+* <p>The NRF class is for controlling functionality of the Nordic nRF51/nRF52 chips. Currently these only used in <a href="http://puck-js.com">Puck.js</a> and the <a href="/MicroBit">BBC micro:bit</a>.</p>
+* <p>The main part of this is control of Bluetooth Low Energy - both searching for devices, and changing advertising data.</p>
+* 
+* @url http://www.espruino.com/Reference#NRF
+*/
+declare interface NRF {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): NRF;
+}
+
+
+/**
+* 
+*/
+declare namespace NRF {
+
+    /**
+     * <p>If a device is connected to Espruino, disconnect from it.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_NRF_disconnect
+     */
+    function disconnect(): void;
+
+    /**
+     * <p>Disable Bluetooth advertising and disconnect from any device that
+     * connected to Puck.js as a peripheral (this won&#39;t affect any devices
+     * that Puck.js initiated connections to).</p>
+     * <p>This makes Puck.js undiscoverable, so it can&#39;t be connected to.</p>
+     * <p>Use <code>NRF.wake()</code> to wake up and make Puck.js connectable again.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_NRF_sleep
+     */
+    function sleep(): void;
+
+    /**
+     * <p>Enable Bluetooth advertising (this is enabled by default), which
+     * allows other devices to discover and connect to Puck.js.</p>
+     * <p>Use <code>NRF.sleep()</code> to disable advertising.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_NRF_wake
+     */
+    function wake(): void;
+
+    /**
+     * <p>Restart the Bluetooth softdevice (if there is currently a BLE connection,
+     * it will queue a restart to be done when the connection closes).</p>
+     * <p>You shouldn&#39;t need to call this function in normal usage. However, Nordic&#39;s
+     * BLE softdevice has some settings that cannot be reset. For example there
+     * are only a certain number of unique UUIDs. Once these are all used the
+     * only option is to restart the softdevice to clear them all out.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_NRF_restart
+     */
+    function restart(): void;
+
+    /**
+     * <p>Get this device&#39;s Bluetooth MAC address.</p>
+     * <p>For Puck.js, the last 5 characters of this (eg. <code>ee:ff</code>)
+     * are used in the device&#39;s advertised Bluetooth name.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_NRF_getAddress
+     */
+    function getAddress(): any;
+
+    /**
+     * <p>Get the battery level in volts (the voltage that the NRF chip is running off of).</p>
+     * <p>This is the battery level of the device itself - it has nothing to with any
+     * device that might be connected.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_NRF_getBattery
+     */
+    function getBattery(): number;
+
+    /**
+     * <p>This is just like <code>NRF.setAdvertising</code>, except instead of advertising
+     * the data, it returns the packet that would be advertised as an array.</p>
+     * 
+     * @param data 
+     * @param options 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_NRF_getAdvertisingData
+     */
+    function getAdvertisingData(data: any, options: any): any;
+
+    /**
+     * <p>Set the BLE radio transmit power. The default TX power is 0 dBm.</p>
+     * 
+     * @param power 
+     * @url http://www.espruino.com/Reference#l_NRF_setTxPower
+     */
+    function setTxPower(power: number): void;
+
+    /**
+     * <p>This sets the connection parameters - these affect the transfer speed and
+     * power usage when the device is connected.</p>
+     * <ul>
+     * <li>When not low power, the connection interval is between 7.5 and 20ms</li>
+     * <li>When low power, the connection interval is between 500 and 1000ms</li>
+     * </ul>
+     * <p>When low power connection is enabled, transfers of data over Bluetooth
+     * will be very slow, however power usage while connected will be drastically
+     * decreased.</p>
+     * <p>This will only take effect after the connection is disconnected and
+     * re-established.</p>
+     * 
+     * @param lowPower 
+     * @url http://www.espruino.com/Reference#l_NRF_setLowPowerConnection
+     */
+    function setLowPowerConnection(lowPower: boolean): void;
+
+    /**
+     * <p>Send a USB HID report. HID must first be enabled with <code>NRF.setServices({}, {hid: hid_report})</code></p>
+     * 
+     * @param data 
+     * @param callback 
+     * @url http://www.espruino.com/Reference#l_NRF_sendHIDReport
+     */
+    function sendHIDReport(data: any, callback: any): void;
+
+    /**
+     * <p>If set to true, whenever a device bonds it will be added to the
+     * whitelist.</p>
+     * <p>When set to false, the whitelist is cleared and newly bonded
+     * devices will not be added to the whitelist.</p>
+     * <p><strong>Note:</strong> This is remembered between <code>reset()</code>s but isn&#39;t
+     * remembered after power-on (you&#39;ll have to add it to <code>onInit()</code>.</p>
+     * 
+     * @param whitelisting 
+     * @url http://www.espruino.com/Reference#l_NRF_setWhitelist
+     */
+    function setWhitelist(whitelisting: boolean): void;
+}
+
+/**
+* <p>The Bluetooth Serial port - used when data is sent or received over Bluetooth Smart on nRF51/nRF52 chips.</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_Bluetooth
+*/
+declare var Bluetooth: Serial;
+
+/**
+* <p>Web Bluetooth-style device - get this using <code>NRF.requestDevice(address)</code></p>
+* 
+* @url http://www.espruino.com/Reference#BluetoothDevice
+*/
+declare interface BluetoothDevice {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): BluetoothDevice;
+
+    /**
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_BluetoothDevice_gatt
+     */
+    gatt: any;
+}
+
+/**
+* <p>Web Bluetooth-style GATT server - get this using <code>NRF.connect(address)</code>
+* or <code>NRF.requestDevice(options)</code> then <code>response.gatt.connect</code></p>
+* <p><a href="https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattserver">https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattserver</a></p>
+* 
+* @url http://www.espruino.com/Reference#BluetoothRemoteGATTServer
+*/
+declare interface BluetoothRemoteGATTServer {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): BluetoothRemoteGATTServer;
+
+    /**
+     * <p>Connect to a BLE device - returns a promise,
+     * the argument of which is the <code>BluetoothRemoteGATTServer</code> connection.</p>
+     * <p>See <a href="/Reference#l_NRF_requestDevice"><code>NRF.requestDevice</code></a> for usage examples.</p>
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_connect
+     */
+    connect(): any;
+
+    /**
+     * <p>Disconnect from a previously connected BLE device connected with
+     * <code>NRF.connect</code> - this does not disconnect from something that has
+     * connected to the Espruino.</p>
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_disconnect
+     */
+    disconnect(): void;
+
+    /**
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @param service 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_getPrimaryService
+     */
+    getPrimaryService(service: any): any;
+
+    /**
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTServer_getPrimaryServices
+     */
+    getPrimaryServices(): any;
+}
+
+/**
+* <p>Web Bluetooth-style GATT service - get this using <code>BluetoothRemoteGATTServer.getPrimaryService(s)</code></p>
+* <p><a href="https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattservice">https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattservice</a></p>
+* 
+* @url http://www.espruino.com/Reference#BluetoothRemoteGATTService
+*/
+declare interface BluetoothRemoteGATTService {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): BluetoothRemoteGATTService;
+
+    /**
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @param characteristic 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTService_getCharacteristic
+     */
+    getCharacteristic(characteristic: any): any;
+
+    /**
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTService_getCharacteristics
+     */
+    getCharacteristics(): any;
+}
+
+/**
+* <p>Web Bluetooth-style GATT characteristic - get this using <code>BluetoothRemoteGATTService.getCharacteristic(s)</code></p>
+* <p><a href="https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattcharacteristic">https://webbluetoothcg.github.io/web-bluetooth/#bluetoothremotegattcharacteristic</a></p>
+* 
+* @url http://www.espruino.com/Reference#BluetoothRemoteGATTCharacteristic
+*/
+declare interface BluetoothRemoteGATTCharacteristic {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): BluetoothRemoteGATTCharacteristic;
+
+    /**
+     * <p><strong>Note:</strong> This is only available on some devices</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_BluetoothRemoteGATTCharacteristic_stopNotifications
+     */
+    stopNotifications(): any;
+}
+
+/**
+* <p>This class exists in order to interface Espruino with fast-moving trigger wheels. Trigger wheels are physical discs with evenly spaced teeth cut into them, and often with one or two teeth next to each other missing. A sensor sends a signal whenever a tooth passed by, and this allows a device to measure not only RPM, but absolute position.</p>
+* <p>This class is currently in testing - it is NOT AVAILABLE on normal boards.</p>
+* 
+* @url http://www.espruino.com/Reference#Trig
+*/
+declare interface Trig {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Trig;
+}
+
+
+/**
+* 
+*/
+declare namespace Trig {
+
+    /**
+     * <p>Get the position of the trigger wheel at the given time (from getTime)</p>
+     * 
+     * @param time 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Trig_getPosAtTime
+     */
+    function getPosAtTime(time: number): number;
+
+    /**
+     * <p>Initialise the trigger class</p>
+     * 
+     * @param pin 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_Trig_setup
+     */
+    function setup(pin: Pin, options: any): void;
+
+    /**
+     * <p>Set a trigger for a certain point in the cycle</p>
+     * 
+     * @param num 
+     * @param pos 
+     * @param pins 
+     * @param pulseLength 
+     * @url http://www.espruino.com/Reference#l_Trig_setTrigger
+     */
+    function setTrigger(num: number, pos: number, pins: any, pulseLength: number): void;
+
+    /**
+     * <p>Disable a trigger</p>
+     * 
+     * @param num 
+     * @url http://www.espruino.com/Reference#l_Trig_killTrigger
+     */
+    function killTrigger(num: number): void;
+
+    /**
+     * <p>Get the current state of a trigger</p>
+     * 
+     * @param num 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Trig_getTrigger
+     */
+    function getTrigger(num: number): any;
+
+    /**
+     * <p>Get the RPM of the trigger wheel</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Trig_getRPM
+     */
+    function getRPM(): number;
+
+    /**
+     * <p>Get the current error flags from the trigger wheel - and zero them</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Trig_getErrors
+     */
+    function getErrors(): number;
+
+    /**
+     * <p>Get the current error flags from the trigger wheel - and zero them</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Trig_getErrorArray
+     */
+    function getErrorArray(): any;
+}
+
+/**
+* <p>This library allows you to write to Neopixel/WS281x/APA10x LED strips</p>
+* <p>These use a high speed single-wire protocol which needs platform-specific
+* implementation on some devices - hence this library to simplify things.</p>
+* 
+* @url http://www.espruino.com/Reference#l_neopixel_undefined
+*/
+declare function neopixel(): void;
+
+/**
+* <p>The ESP8266 library is specific to the ESP8266 version of Espruino, i.e., running Espruino on an ESP8266 module (not to be confused with using the ESP8266 as Wifi add-on to an Espruino board).  This library contains functions to handle ESP8266-specific actions.
+* For example: <code>var esp8266 = require(&#39;ESP8266&#39;); esp8266.reboot();</code> performs a hardware reset of the module.</p>
+* 
+* @url http://www.espruino.com/Reference#l_ESP8266_undefined
+*/
+declare interface ESP8266 {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): ESP8266;
+}
+
+
+/**
+* 
+*/
+declare namespace ESP8266 {
+
+    /**
+     * <p>Perform a hardware reset/reboot of the esp8266.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_ESP8266_reboot
+     */
+    function reboot(): void;
+
+
+    /**
+     * <p>Enable or disable the logging of debug information.  A value of <code>true</code> enables debug logging while a value of <code>false</code> disables debug logging.  Debug output is sent to UART1 (gpio2).</p>
+     * 
+     * @param enable 
+     * @url http://www.espruino.com/Reference#l_ESP8266_logDebug
+     */
+    function logDebug(enable: boolean): void;
+
+    /**
+     * <p>Set the debug logging mode. It can be disabled (which frees ~1.2KB of heap), enabled in-memory only, or in-memory and output to a UART.</p>
+     * 
+     * @param mode 
+     * @url http://www.espruino.com/Reference#l_ESP8266_setLog
+     */
+    function setLog(mode: number): void;
+
+    /**
+     * <p>Prints the contents of the debug log to the console.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_ESP8266_printLog
+     */
+    function printLog(): void;
+
+    /**
+     * <p>Returns one line from the log or up to 128 characters.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_ESP8266_readLog
+     */
+    function readLog(): void;
+
+    /**
+     * <p>Dumps info about all sockets to the log. This is for troubleshooting the socket implementation.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_ESP8266_dumpSocketInfo
+     */
+    function dumpSocketInfo(): void;
+
+    /**
+     * <p><strong>Note:</strong> This is deprecated. Use <code>E.setClock(80/160)</code>
+     * <strong>Note:</strong>
+     * Set the operating frequency of the ESP8266 processor. The default is 160Mhz.</p>
+     * <p><strong>Warning</strong>: changing the cpu frequency affects the timing of some I/O operations, notably of software SPI and I2C, so things may be a bit slower at 80Mhz.</p>
+     * 
+     * @param freq 
+     * @url http://www.espruino.com/Reference#l_ESP8266_setCPUFreq
+     */
+    function setCPUFreq(freq: any): void;
+
+    /**
+     * <p>Returns an object that contains details about the state of the ESP8266 with the following fields:</p>
+     * <ul>
+     * <li><code>sdkVersion</code>   - Version of the SDK.</li>
+     * <li><code>cpuFrequency</code> - CPU operating frequency in Mhz.</li>
+     * <li><code>freeHeap</code>     - Amount of free heap in bytes.</li>
+     * <li><code>maxCon</code>       - Maximum number of concurrent connections.</li>
+     * <li><code>flashMap</code>     - Configured flash size&amp;map: &#39;512KB:256/256&#39; .. &#39;4MB:512/512&#39;</li>
+     * <li><code>flashKB</code>      - Configured flash size in KB as integer</li>
+     * <li><code>flashChip</code>    - Type of flash chip as string with manufacturer &amp; chip, ex: &#39;0xEF 0x4016`</li>
+     * </ul>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_ESP8266_getState
+     */
+    function getState(): any;
+
+    /**
+     * <p><strong>Note:</strong> This is deprecated. Use <code>require(&quot;flash&quot;).getFree()</code></p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_ESP8266_getFreeFlash
+     */
+    function getFreeFlash(): any;
+
+    /**
+     * 
+     * @param arrayOfData 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_ESP8266_crc32
+     */
+    function crc32(arrayOfData: any): any;
+
+    /**
+     * <p><strong>This function is deprecated.</strong> Please use <code>require(&quot;neopixel&quot;).write(pin, data)</code> instead</p>
+     * 
+     * @param pin 
+     * @param arrayOfData 
+     * @url http://www.espruino.com/Reference#l_ESP8266_neopixelWrite
+     */
+    function neopixelWrite(pin: Pin, arrayOfData: any): void;
+
+    /**
+     * <p>Put the ESP8266 into &#39;deep sleep&#39; for the given number of microseconds, 
+     * reducing power consumption drastically. </p>
+     * <p>meaning of option values:</p>
+     * <p>0 - the 108th Byte of init parameter decides whether RF calibration will be performed or not.</p>
+     * <p>1 - run RF calibration after waking up. Power consumption is high.</p>
+     * <p>2 - no RF calibration after waking up. Power consumption is low.</p>
+     * <p>4 - no RF after waking up. Power consumption is the lowest.</p>
+     * <p><strong>Note:</strong> unlike normal Espruino boards&#39; &#39;deep sleep&#39; mode, ESP8266 deep sleep actually turns off the processor. After the given number of microseconds have elapsed, the ESP8266 will restart as if power had been turned off and then back on. <em>All contents of RAM will be lost</em>. 
+     * Connect GPIO 16 to RST to enable wakeup.</p>
+     * <p><strong>Special:</strong> 0 microseconds cause sleep forever until external wakeup RST pull down occurs.</p>
+     * 
+     * @param micros 
+     * @param option 
+     * @url http://www.espruino.com/Reference#l_ESP8266_deepSleep
+     */
+    function deepSleep(micros: any, option: any): void;
+
+    /**
+     * <p>Perform a network ping request. The parameter can be either a String or a numeric IP address.
+     * <strong>Note:</strong> This function should probably be removed, or should it be part of the wifi library?</p>
+     * 
+     * @param ipAddr 
+     * @param pingCallback 
+     * @url http://www.espruino.com/Reference#l_ESP8266_ping
+     */
+    function ping(ipAddr: any, pingCallback: any): void;
+}
+
+/**
+* <p>This library allows you to create http servers and make http requests</p>
+* <p>In order to use this, you will need an extra module to get network connectivity such as the <a href="/CC3000">TI CC3000</a> or <a href="/WIZnet">WIZnet W5500</a>.</p>
+* <p>This is designed to be a cut-down version of the <a href="http://nodejs.org/api/http.html">node.js library</a>. Please see the <a href="/Internet">Internet</a> page for more information on how to use it.</p>
+* 
+* @url http://www.espruino.com/Reference#l_http_undefined
+*/
+declare function http(): void;
+
+/**
+* 
+*/
+declare namespace http {
+
+    /**
+     * <p>Create an HTTP Server</p>
+     * <p>When a request to the server is made, the callback is called. In the callback you can use the methods on the response (httpSRs) to send data. You can also add <code>request.on(&#39;data&#39;,function() { ... })</code> to listen for POSTed data</p>
+     * 
+     * @param callback 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_http_createServer
+     */
+    function createServer(callback: any): httpSrv;
+}
+
+/**
+* <p>The HTTP server created by <code>require(&#39;http&#39;).createServer</code></p>
+* 
+* @url http://www.espruino.com/Reference#httpSrv
+*/
+declare interface httpSrv {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): httpSrv;
+
+    /**
+     * <p>Start listening for new HTTP connections on the given port</p>
+     * 
+     * @param port 
+     * @url http://www.espruino.com/Reference#l_httpSrv_listen
+     */
+    listen(port: number): void;
+
+    /**
+     * <p>Stop listening for new HTTP connections</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_httpSrv_close
+     */
+    close(): void;
+}
+
+/**
+* <p>The HTTP server request</p>
+* 
+* @url http://www.espruino.com/Reference#httpSRq
+*/
+declare interface httpSRq {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): httpSRq;
+
+    /**
+     * <p>Return how many bytes are available to read. If there is already a listener for data, this will always return 0.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_httpSRq_available
+     */
+    available(): number;
+
+    /**
+     * <p>Return a string containing characters that have been received</p>
+     * 
+     * @param chars 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_httpSRq_read
+     */
+    read(chars: number): any;
+
+    /**
+     * <p>Pipe this to a stream (an object with a &#39;write&#39; method)</p>
+     * 
+     * @param destination 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_httpSRq_pipe
+     */
+    pipe(destination: any, options: any): void;
+}
+
+/**
+* <p>The HTTP server response</p>
+* 
+* @url http://www.espruino.com/Reference#httpSRs
+*/
+declare interface httpSRs {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): httpSRs;
+
+    /**
+     * <p>This function writes the <code>data</code> argument as a string. Data that is passed in
+     * (including arrays) will be converted to a string with the normal JavaScript 
+     * <code>toString</code> method. For more information about sending binary data see <code>Socket.write</code></p>
+     * 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_httpSRs_write
+     */
+    write(data: any): boolean;
+
+    /**
+     * <p>See <code>Socket.write</code> for more information about the data argument</p>
+     * 
+     * @param data 
+     * @url http://www.espruino.com/Reference#l_httpSRs_end
+     */
+    end(data: any): void;
+
+    /**
+     * 
+     * @param statusCode 
+     * @param headers 
+     * @url http://www.espruino.com/Reference#l_httpSRs_writeHead
+     */
+    writeHead(statusCode: number, headers: any): void;
+}
+
+/**
+* <p>The HTTP client request, returned by <code>http.request()</code> and <code>http.get()</code>.</p>
+* 
+* @url http://www.espruino.com/Reference#httpCRq
+*/
+declare interface httpCRq {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): httpCRq;
+
+    /**
+     * <p>This function writes the <code>data</code> argument as a string. Data that is passed in
+     * (including arrays) will be converted to a string with the normal JavaScript 
+     * <code>toString</code> method. For more information about sending binary data see <code>Socket.write</code></p>
+     * 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_httpCRq_write
+     */
+    write(data: any): boolean;
+
+    /**
+     * <p>Finish this HTTP request - optional data to append as an argument</p>
+     * <p>See <code>Socket.write</code> for more information about the data argument</p>
+     * 
+     * @param data 
+     * @url http://www.espruino.com/Reference#l_httpCRq_end
+     */
+    end(data: any): void;
+}
+
+/**
+* <p>The HTTP client response, passed to the callback of <code>http.request()</code> an <code>http.get()</code>.</p>
+* 
+* @url http://www.espruino.com/Reference#httpCRs
+*/
+declare interface httpCRs {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): httpCRs;
+
+    /**
+     * <p>Return how many bytes are available to read. If there is a &#39;data&#39; event handler, this will always return 0.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_httpCRs_available
+     */
+    available(): number;
+
+    /**
+     * <p>Return a string containing characters that have been received</p>
+     * 
+     * @param chars 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_httpCRs_read
+     */
+    read(chars: number): any;
+
+    /**
+     * <p>Pipe this to a stream (an object with a &#39;write&#39; method)</p>
+     * 
+     * @param destination 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_httpCRs_pipe
+     */
+    pipe(destination: any, options: any): void;
+}
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l_CC3000_undefined
+*/
+declare interface CC3000 {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): CC3000;
+}
+
+
+/**
+* 
+*/
+declare namespace CC3000 {
+
+    /**
+     * <p>Initialise the CC3000 and return a WLAN object</p>
+     * 
+     * @param spi 
+     * @param cs 
+     * @param en 
+     * @param irq 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_CC3000_connect
+     */
+    function connect(spi: any, cs: Pin, en: Pin, irq: Pin): WLAN;
+}
+
+/**
+* <p>An instantiation of a WiFi network adaptor</p>
+* 
+* @url http://www.espruino.com/Reference#WLAN
+*/
+declare interface WLAN {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): WLAN;
+
+    /**
+     * <p>Connect to a wireless network</p>
+     * 
+     * @param ap 
+     * @param key 
+     * @param callback 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_WLAN_connect
+     */
+    connect(ap: any, key: any, callback: any): boolean;
+
+    /**
+     * <p>Completely uninitialise and power down the CC3000. After this you&#39;ll have to use <code>require(&quot;CC3000&quot;).connect()</code> again.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_WLAN_disconnect
+     */
+    disconnect(): void;
+
+    /**
+     * <p>Completely uninitialise and power down the CC3000, then reconnect to the old access point.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_WLAN_reconnect
+     */
+    reconnect(): void;
+
+    /**
+     * <p>Get the current IP address</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_WLAN_getIP
+     */
+    getIP(): any;
+
+    /**
+     * <p>Set the current IP address for get an IP from DHCP (if no options object is specified).</p>
+     * <p><strong>Note:</strong> Changes are written to non-volatile memory, but will only take effect after calling <code>wlan.reconnect()</code></p>
+     * 
+     * @param options 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_WLAN_setIP
+     */
+    setIP(options: any): boolean;
+}
+
+/**
+* <p>This library implements a telnet console for the Espruino interpreter. It requires a network
+* connection, e.g. Wifi, and <strong>currently only functions on the ESP8266 and on Linux </strong>. It uses
+* port 23 on the ESP8266 and port 2323 on Linux.</p>
+* <p><strong>Note:</strong> To enable on Linux, run <code>./espruino --telnet</code></p>
+* 
+* @url http://www.espruino.com/Reference#l_TelnetServer_undefined
+*/
+declare interface TelnetServer {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): TelnetServer;
+}
+
+
+/**
+* 
+*/
+declare namespace TelnetServer {
+
+    /**
+     * 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_TelnetServer_setOptions
+     */
+    function setOptions(options: any): void;
+}
+
+/**
+* <p>Library for communication with the WIZnet Ethernet module</p>
+* 
+* @url http://www.espruino.com/Reference#l_WIZnet_undefined
+*/
+declare interface WIZnet {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): WIZnet;
+}
+
+
+/**
+* 
+*/
+declare namespace WIZnet {
+
+    /**
+     * <p>Initialise the WIZnet module and return an Ethernet object</p>
+     * 
+     * @param spi 
+     * @param cs 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_WIZnet_connect
+     */
+    function connect(spi: any, cs: Pin): Ethernet;
+}
+
+/**
+* <p>An instantiation of an Ethernet network adaptor</p>
+* 
+* @url http://www.espruino.com/Reference#Ethernet
+*/
+declare interface Ethernet {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Ethernet;
+
+    /**
+     * <p>Get the current IP address, subnet, gateway and mac address.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Ethernet_getIP
+     */
+    getIP(): any;
+
+    /**
+     * <p>Set the current IP address or get an IP from DHCP (if no options object is specified)</p>
+     * <p>If &#39;mac&#39; is specified as an option, it must be a string of the form <code>&quot;00:01:02:03:04:05&quot;</code></p>
+     * 
+     * @param options 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Ethernet_setIP
+     */
+    setIP(options: any): boolean;
+}
+
+/**
+* <p>Library that initialises a network device that calls into JavaScript</p>
+* 
+* @url http://www.espruino.com/Reference#l_NetworkJS_undefined
+*/
+declare interface NetworkJS {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): NetworkJS;
+}
+
+
+/**
+* <p>This class helps to convert URLs into Objects of information ready for http.request/get</p>
+* 
+* @url http://www.espruino.com/Reference#url
+*/
+declare function url(): void;
+
+/**
+* 
+*/
+declare namespace url {
+
+    /**
+     * <p>A utility function to split a URL into parts</p>
+     * <p>This is useful in web servers for instance when handling a request.</p>
+     * <p>For instance <code>url.parse(&quot;/a?b=c&amp;d=e&quot;,true)</code> returns <code>{&quot;method&quot;:&quot;GET&quot;,&quot;host&quot;:&quot;&quot;,&quot;path&quot;:&quot;/a?b=c&amp;d=e&quot;,&quot;pathname&quot;:&quot;/a&quot;,&quot;search&quot;:&quot;?b=c&amp;d=e&quot;,&quot;port&quot;:80,&quot;query&quot;:{&quot;b&quot;:&quot;c&quot;,&quot;d&quot;:&quot;e&quot;}}</code></p>
+     * 
+     * @param urlStr 
+     * @param parseQuery 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_url_parse
+     */
+    function parse(urlStr: any, parseQuery: boolean): any;
+}
+
+/**
+* <p>This library allows you to create TCPIP servers and clients</p>
+* <p>In order to use this, you will need an extra module to get network connectivity.</p>
+* <p>This is designed to be a cut-down version of the <a href="http://nodejs.org/api/net.html">node.js library</a>. Please see the <a href="/Internet">Internet</a> page for more information on how to use it.</p>
+* 
+* @url http://www.espruino.com/Reference#l_net_undefined
+*/
+declare function net(): void;
+
+/**
+* 
+*/
+declare namespace net {
+
+    /**
+     * <p>Create a Server</p>
+     * <p>When a request to the server is made, the callback is called. In the callback you can use the methods on the connection to send data. You can also add <code>connection.on(&#39;data&#39;,function() { ... })</code> to listen for received data</p>
+     * 
+     * @param callback 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_net_createServer
+     */
+    function createServer(callback: any): Server;
+
+    /**
+     * <p>Create a socket connection</p>
+     * 
+     * @param options 
+     * @param callback 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_net_connect
+     */
+    function connect(options: any, callback: any): Socket;
+}
+
+/**
+* <p>The socket server created by <code>require(&#39;net&#39;).createServer</code></p>
+* 
+* @url http://www.espruino.com/Reference#Server
+*/
+declare interface Server {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Server;
+
+    /**
+     * <p>Start listening for new connections on the given port</p>
+     * 
+     * @param port 
+     * @url http://www.espruino.com/Reference#l_Server_listen
+     */
+    listen(port: number): void;
+
+    /**
+     * <p>Stop listening for new connections</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Server_close
+     */
+    close(): void;
+}
+
+/**
+* <p>An actual socket connection - allowing transmit/receive of TCP data</p>
+* 
+* @url http://www.espruino.com/Reference#Socket
+*/
+declare interface Socket {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Socket;
+
+    /**
+     * <p>Return how many bytes are available to read. If there is already a listener for data, this will always return 0.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Socket_available
+     */
+    available(): number;
+
+    /**
+     * <p>Return a string containing characters that have been received</p>
+     * 
+     * @param chars 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Socket_read
+     */
+    read(chars: number): any;
+
+    /**
+     * <p>Pipe this to a stream (an object with a &#39;write&#39; method)</p>
+     * 
+     * @param destination 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_Socket_pipe
+     */
+    pipe(destination: any, options: any): void;
+
+    /**
+     * <p>Close this socket - optional data to append as an argument.</p>
+     * <p>See <code>Socket.write</code> for more information about the data argument</p>
+     * 
+     * @param data 
+     * @url http://www.espruino.com/Reference#l_Socket_end
+     */
+    end(data: any): void;
+}
+
+/**
+* <p>This library allows you to create TCPIP servers and clients using TLS encryption</p>
+* <p>In order to use this, you will need an extra module to get network connectivity.</p>
+* <p>This is designed to be a cut-down version of the <a href="http://nodejs.org/api/tls.html">node.js library</a>. Please see the <a href="/Internet">Internet</a> page for more information on how to use it.</p>
+* 
+* @url http://www.espruino.com/Reference#l_tls_undefined
+*/
+declare function tls(): void;
+
+/**
+* <p><strong>Note:</strong> This library is currently only included in builds for the original Espruino boards.
+* For other boards you will have to make build your own firmware.</p>
+* 
+* @url http://www.espruino.com/Reference#l_hashlib_undefined
+*/
+declare function hashlib(): void;
+
+/**
+* 
+*/
+declare namespace hashlib {
+
+    /**
+     * 
+     * @param message 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_hashlib_sha224
+     */
+    function sha224(message: any): HASH;
+
+    /**
+     * 
+     * @param message 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_hashlib_sha256
+     */
+    function sha256(message: any): HASH;
+}
+
+/**
+* <p><strong>Note:</strong> This class is currently only included in builds for the original Espruino boards.
+* For other boards you will have to make build your own firmware.</p>
+* 
+* @url http://www.espruino.com/Reference#HASH
+*/
+declare interface HASH {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): HASH;
+
+    /**
+     * 
+     * @param message 
+     * @url http://www.espruino.com/Reference#l_HASH_update
+     */
+    update(message: any): void;
+
+    /**
+     * 
+     * @param message 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_HASH_digest
+     */
+    digest(message: any): any;
+
+    /**
+     * 
+     * @param message 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_HASH_hexdigest
+     */
+    hexdigest(message: any): any;
+}
+
+/**
+* <p>Class containing utility functions for the Seeed WIO LTE board</p>
+* 
+* @url http://www.espruino.com/Reference#WioLTE
+*/
+declare interface WioLTE {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): WioLTE;
+}
+
+
+/**
+* 
+*/
+declare namespace WioLTE {
+
+    /**
+     * <p>Set the WIO&#39;s LED</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_WioLTE_LED
+     */
+    interface LED {
+
+        /**
+         * 
+         * @param red 
+         * @param green 
+         * @param blue 
+         * @return  
+         */
+        new(red: number, green: number, blue: number): LED;
+    }
+
+
+    /**
+     * <p>Set the power of Grove connectors, except for <code>D38</code> and <code>D39</code> which are always on.</p>
+     * 
+     * @param onoff 
+     * @url http://www.espruino.com/Reference#l_WioLTE_setGrovePower
+     */
+    function setGrovePower(onoff: boolean): void;
+
+    /**
+     * <p>Turn power to the WIO&#39;s LED on or off.</p>
+     * <p>Turning the LED on won&#39;t immediately display a color - that must be done with <code>WioLTE.LED(r,g,b)</code></p>
+     * 
+     * @param onoff 
+     * @url http://www.espruino.com/Reference#l_WioLTE_setLEDPower
+     */
+    function setLEDPower(onoff: boolean): void;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_WioLTE_D38
+     */
+    var D38: any;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_WioLTE_D20
+     */
+    var D20: any;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_WioLTE_A6
+     */
+    var A6: any;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_WioLTE_I2C
+     */
+    var I2C: any;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_WioLTE_UART
+     */
+    var UART: any;
+
+    /**
+     * 
+     * @url http://www.espruino.com/Reference#l_WioLTE_A4
+     */
+    var A4: any;
+}
+
+/**
+* <p>This library handles interfacing with a FAT32 filesystem on an SD card. The API is designed to be similar to node.js&#39;s - However Espruino does not currently support asynchronous file IO, so the functions behave like node.js&#39;s xxxxSync functions. Versions of the functions with &#39;Sync&#39; after them are also provided for compatibility.</p>
+* <p>Currently this provides minimal file IO - it&#39;s great for logging and loading/saving settings, but not good for loading large amounts of data as you will soon fill your memory up.</p>
+* <p>It is currently only available on boards that contain an SD card slot, such as the Olimexino and the HY. It can not currently be added to boards that did not ship with a card slot.</p>
+* <p>To use this, you must type <code>var fs = require(&#39;fs&#39;)</code> to get access to the library</p>
+* 
+* @url http://www.espruino.com/Reference#l_fs_undefined
+*/
+declare function fs(): void;
+
+/**
+* 
+*/
+declare namespace fs {
+
+    /**
+     * 
+     * @param source 
+     * @param destination 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_fs_pipe
+     */
+    function pipe(source: any, destination: any, options: any): void;
+
+    /**
+     * <p>List all files in the supplied directory, returning them as an array of strings.</p>
+     * <p>NOTE: Espruino does not yet support Async file IO, so this function behaves like the &#39;Sync&#39; version.</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_readdir
+     */
+    function readdir(path: any): any;
+
+    /**
+     * <p>List all files in the supplied directory, returning them as an array of strings.</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_readdirSync
+     */
+    function readdirSync(path: any): any;
+
+    /**
+     * <p>Write the data to the given file</p>
+     * <p>NOTE: Espruino does not yet support Async file IO, so this function behaves like the &#39;Sync&#39; version.</p>
+     * 
+     * @param path 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_writeFile
+     */
+    function writeFile(path: any, data: any): boolean;
+
+    /**
+     * <p>Write the data to the given file</p>
+     * 
+     * @param path 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_writeFileSync
+     */
+    function writeFileSync(path: any, data: any): boolean;
+
+    /**
+     * <p>Append the data to the given file, created a new file if it doesn&#39;t exist</p>
+     * <p>NOTE: Espruino does not yet support Async file IO, so this function behaves like the &#39;Sync&#39; version.</p>
+     * 
+     * @param path 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_appendFile
+     */
+    function appendFile(path: any, data: any): boolean;
+
+    /**
+     * <p>Append the data to the given file, created a new file if it doesn&#39;t exist</p>
+     * 
+     * @param path 
+     * @param data 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_appendFileSync
+     */
+    function appendFileSync(path: any, data: any): boolean;
+
+    /**
+     * <p>Read all data from a file and return as a string</p>
+     * <p>NOTE: Espruino does not yet support Async file IO, so this function behaves like the &#39;Sync&#39; version.</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_readFile
+     */
+    function readFile(path: any): any;
+
+    /**
+     * <p>Read all data from a file and return as a string.</p>
+     * <p><strong>Note:</strong> The size of files you can load using this method is limited by the amount of available RAM. To read files a bit at a time, see the <code>File</code> class.</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_readFileSync
+     */
+    function readFileSync(path: any): any;
+
+    /**
+     * <p>Delete the given file</p>
+     * <p>NOTE: Espruino does not yet support Async file IO, so this function behaves like the &#39;Sync&#39; version.</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_unlink
+     */
+    function unlink(path: any): boolean;
+
+    /**
+     * <p>Delete the given file</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_unlinkSync
+     */
+    function unlinkSync(path: any): boolean;
+
+    /**
+     * <p>Return information on the given file. This returns an object with the following
+     * fields:</p>
+     * <p>size: size in bytes
+     * dir: a boolean specifying if the file is a directory or not
+     * mtime: A Date structure specifying the time the file was last modified</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_statSync
+     */
+    function statSync(path: any): any;
+
+    /**
+     * <p>Create the directory</p>
+     * <p>NOTE: Espruino does not yet support Async file IO, so this function behaves like the &#39;Sync&#39; version.</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_mkdir
+     */
+    function mkdir(path: any): boolean;
+
+    /**
+     * <p>Create the directory</p>
+     * 
+     * @param path 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_fs_mkdirSync
+     */
+    function mkdirSync(path: any): boolean;
+}
+
+/**
+* <p>This is the File object - it allows you to stream data to and from files (As opposed to the <code>require(&#39;fs&#39;).readFile(..)</code> style functions that read an entire file).</p>
+* <p>To create a File object, you must type <code>var fd = E.openFile(&#39;filepath&#39;,&#39;mode&#39;)</code> - see <a href="#l_E_openFile">E.openFile</a> for more information.</p>
+* <p><strong>Note:</strong> If you want to remove an SD card after you have started using it, you <em>must</em> call <code>E.unmountSD()</code> or you may cause damage to the card.</p>
+* 
+* @url http://www.espruino.com/Reference#File
+*/
+declare interface File {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): File;
+
+    /**
+     * <p>Close an open file.</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_File_close
+     */
+    close(): void;
+
+    /**
+     * <p>write data to a file</p>
+     * 
+     * @param buffer 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_File_write
+     */
+    write(buffer: any): number;
+
+    /**
+     * <p>Read data in a file in byte size chunks</p>
+     * 
+     * @param length 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_File_read
+     */
+    read(length: number): any;
+
+    /**
+     * <p>Skip the specified number of bytes forward in the file</p>
+     * 
+     * @param nBytes 
+     * @url http://www.espruino.com/Reference#l_File_skip
+     */
+    skip(nBytes: number): void;
+
+    /**
+     * <p>Seek to a certain position in the file</p>
+     * 
+     * @param nBytes 
+     * @url http://www.espruino.com/Reference#l_File_seek
+     */
+    seek(nBytes: number): void;
+
+    /**
+     * <p>Pipe this file to a stream (an object with a &#39;write&#39; method)</p>
+     * 
+     * @param destination 
+     * @param options 
+     * @url http://www.espruino.com/Reference#l_File_pipe
+     */
+    pipe(destination: any, options: any): void;
+}
+
+/**
+* <p>This class provides Graphics operations that can be applied to a surface.</p>
+* <p>Use Graphics.createXXX to create a graphics object that renders in the way you want. See <a href="/Graphics">the Graphics page</a> for more information.</p>
+* <p><strong>Note:</strong> On boards that contain an LCD, there is a built-in &#39;LCD&#39; object of type Graphics. For instance to draw a line you&#39;d type: <code>LCD.drawLine(0,0,100,100)</code></p>
+* 
+* @url http://www.espruino.com/Reference#Graphics
+*/
+declare interface Graphics {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Graphics;
+
+    /**
+     * <p>The width of the LCD</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_getWidth
+     */
+    getWidth(): number;
+
+    /**
+     * <p>The height of the LCD</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_getHeight
+     */
+    getHeight(): number;
+
+    /**
+     * <p>Clear the LCD with the Background Color</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Graphics_clear
+     */
+    clear(): void;
+
+    /**
+     * <p>Fill a rectangular area in the Foreground Color</p>
+     * 
+     * @param x1 
+     * @param y1 
+     * @param x2 
+     * @param y2 
+     * @url http://www.espruino.com/Reference#l_Graphics_fillRect
+     */
+    fillRect(x1: number, y1: number, x2: number, y2: number): void;
+
+    /**
+     * <p>Draw an unfilled rectangle 1px wide in the Foreground Color</p>
+     * 
+     * @param x1 
+     * @param y1 
+     * @param x2 
+     * @param y2 
+     * @url http://www.espruino.com/Reference#l_Graphics_drawRect
+     */
+    drawRect(x1: number, y1: number, x2: number, y2: number): void;
+
+    /**
+     * <p>Draw a filled circle in the Foreground Color</p>
+     * 
+     * @param x 
+     * @param y 
+     * @param rad 
+     * @url http://www.espruino.com/Reference#l_Graphics_fillCircle
+     */
+    fillCircle(x: number, y: number, rad: number): void;
+
+    /**
+     * <p>Draw an unfilled circle 1px wide in the Foreground Color</p>
+     * 
+     * @param x 
+     * @param y 
+     * @param rad 
+     * @url http://www.espruino.com/Reference#l_Graphics_drawCircle
+     */
+    drawCircle(x: number, y: number, rad: number): void;
+
+    /**
+     * <p>Get a pixel&#39;s color</p>
+     * 
+     * @param x 
+     * @param y 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_getPixel
+     */
+    getPixel(x: number, y: number): number;
+
+    /**
+     * <p>Set a pixel&#39;s color</p>
+     * 
+     * @param x 
+     * @param y 
+     * @param col 
+     * @url http://www.espruino.com/Reference#l_Graphics_setPixel
+     */
+    setPixel(x: number, y: number, col: any): void;
+
+    /**
+     * <p>Set the color to use for subsequent drawing operations</p>
+     * 
+     * @param r 
+     * @param g 
+     * @param b 
+     * @url http://www.espruino.com/Reference#l_Graphics_setColor
+     */
+    setColor(r: any, g: any, b: any): void;
+
+    /**
+     * <p>Set the background color to use for subsequent drawing operations</p>
+     * 
+     * @param r 
+     * @param g 
+     * @param b 
+     * @url http://www.espruino.com/Reference#l_Graphics_setBgColor
+     */
+    setBgColor(r: any, g: any, b: any): void;
+
+    /**
+     * <p>Get the color to use for subsequent drawing operations</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_getColor
+     */
+    getColor(): number;
+
+    /**
+     * <p>Get the background color to use for subsequent drawing operations</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_getBgColor
+     */
+    getBgColor(): number;
+
+    /**
+     * <p>Make subsequent calls to <code>drawString</code> use the built-in 4x6 pixel bitmapped Font</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Graphics_setFontBitmap
+     */
+    setFontBitmap(): void;
+
+    /**
+     * <p>Make subsequent calls to <code>drawString</code> use a Vector Font of the given height</p>
+     * 
+     * @param size 
+     * @url http://www.espruino.com/Reference#l_Graphics_setFontVector
+     */
+    setFontVector(size: number): void;
+
+    /**
+     * <p>Make subsequent calls to <code>drawString</code> use a Custom Font of the given height. See the <a href="http://www.espruino.com/Fonts">Fonts page</a> for more
+     * information about custom fonts and how to create them.</p>
+     * 
+     * @param bitmap 
+     * @param firstChar 
+     * @param width 
+     * @param height 
+     * @url http://www.espruino.com/Reference#l_Graphics_setFontCustom
+     */
+    setFontCustom(bitmap: any, firstChar: number, width: any, height: number): void;
+
+    /**
+     * <p>Draw a string of text in the current font</p>
+     * 
+     * @param str 
+     * @param x 
+     * @param y 
+     * @url http://www.espruino.com/Reference#l_Graphics_drawString
+     */
+    drawString(str: any, x: number, y: number): void;
+
+    /**
+     * <p>Return the size in pixels of a string of text in the current font</p>
+     * 
+     * @param str 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_stringWidth
+     */
+    stringWidth(str: any): number;
+
+    /**
+     * <p>Draw a line between x1,y1 and x2,y2 in the current foreground color</p>
+     * 
+     * @param x1 
+     * @param y1 
+     * @param x2 
+     * @param y2 
+     * @url http://www.espruino.com/Reference#l_Graphics_drawLine
+     */
+    drawLine(x1: number, y1: number, x2: number, y2: number): void;
+
+    /**
+     * <p>Draw a line from the last position of lineTo or moveTo to this position</p>
+     * 
+     * @param x 
+     * @param y 
+     * @url http://www.espruino.com/Reference#l_Graphics_lineTo
+     */
+    lineTo(x: number, y: number): void;
+
+    /**
+     * <p>Move the cursor to a position - see lineTo</p>
+     * 
+     * @param x 
+     * @param y 
+     * @url http://www.espruino.com/Reference#l_Graphics_moveTo
+     */
+    moveTo(x: number, y: number): void;
+
+    /**
+     * <p>Draw a filled polygon in the current foreground color</p>
+     * 
+     * @param poly 
+     * @url http://www.espruino.com/Reference#l_Graphics_fillPoly
+     */
+    fillPoly(poly: any): void;
+
+    /**
+     * <p>Set the current rotation of the graphics device.</p>
+     * 
+     * @param rotation 
+     * @param reflect 
+     * @url http://www.espruino.com/Reference#l_Graphics_setRotation
+     */
+    setRotation(rotation: number, reflect: boolean): void;
+
+    /**
+     * <p>Draw an image at the specified position. If the image is 1 bit, the graphics foreground/background colours will be used. Otherwise color data will be copied as-is. Bitmaps are rendered MSB-first</p>
+     * 
+     * @param image 
+     * @param x 
+     * @param y 
+     * @url http://www.espruino.com/Reference#l_Graphics_drawImage
+     */
+    drawImage(image: any, x: number, y: number): void;
+
+    /**
+     * <p>Return the area of the Graphics canvas that has been modified, and optionally clear
+     * the modified area to 0.</p>
+     * <p>For instance if <code>g.setPixel(10,20)</code> was called, this would return <code>{x1:10, y1:20, x2:10, y2:20}</code></p>
+     * 
+     * @param reset 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_getModified
+     */
+    getModified(reset: boolean): any;
+
+    /**
+     * <p>Create a Graphics object that renders to an Array Buffer. This will have a field called &#39;buffer&#39; that can get used to get at the buffer itself</p>
+     * 
+     * @param width 
+     * @param height 
+     * @param bpp 
+     * @param options 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_createArrayBuffer
+     */
+    createArrayBuffer(width: number, height: number, bpp: number, options: any): Graphics;
+
+    /**
+     * <p>Create a Graphics object that renders by calling a JavaScript callback function to draw pixels</p>
+     * 
+     * @param width 
+     * @param height 
+     * @param bpp 
+     * @param callback 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_createCallback
+     */
+    createCallback(width: number, height: number, bpp: number, callback: any): Graphics;
+
+    /**
+     * <p>Create a Graphics object that renders to SDL window (Linux-based devices only)</p>
+     * 
+     * @param width 
+     * @param height 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Graphics_createSDL
+     */
+    createSDL(width: number, height: number): Graphics;
+}
+
+/**
+* <p>Class containing <a href="http://www.puck-js.com">Puck.js&#39;s</a> utility functions.</p>
+* 
+* @url http://www.espruino.com/Reference#Puck
+*/
+declare interface Puck {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Puck;
+}
+
+
+/**
+* 
+*/
+declare namespace Puck {
+
+    /**
+     * <p>Turn on the magnetometer, take a single reading, and then turn it off again.</p>
+     * <p>An object of the form <code>{x,y,z}</code> is returned containing magnetometer readings.
+     * Due to residual magnetism in the Puck and magnetometer itself, with
+     * no magnetic field the Puck will not return <code>{x:0,y:0,z:0}</code>.</p>
+     * <p>Instead, it&#39;s up to you to figure out what the &#39;zero value&#39; is for your
+     * Puck in your location and to then subtract that from the value returned. If
+     * you&#39;re not trying to measure the Earth&#39;s magnetic field then it&#39;s a good idea
+     * to just take a reading at startup and use that.</p>
+     * <p>With the aerial at the top of the board, the <code>y</code> reading is vertical, <code>x</code> is
+     * horizontal, and <code>z</code> is through the board.</p>
+     * <p>Readings are in increments of 0.1 micro Tesla (uT). The Earth&#39;s magnetic field
+     * varies from around 25-60 uT, so the reading will vary by 250 to 600 depending
+     * on location.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Puck_mag
+     */
+    function mag(): any;
+
+    /**
+     * <p>Turn on the magnetometer, take a single temperature reading from the MAG3110 chip, and then turn it off again.</p>
+     * <p>(If the magnetometer is already on, this just returns the last reading obtained)</p>
+     * <p><code>E.getTemperature()</code> uses the microcontroller&#39;s temperature sensor, but this uses the magnetometer&#39;s.</p>
+     * <p>The reading obtained is an integer (so no decimal places), but the sensitivity is factory trimmed. to 1&deg;C, however the temperature
+     * offset isn&#39;t - so absolute readings may still need calibrating.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Puck_magTemp
+     */
+    function magTemp(): number;
+
+    /**
+     * <p>Turn the magnetometer off</p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Puck_magOff
+     */
+    function magOff(): void;
+
+    /**
+     * <p>Transmit the given set of IR pulses - data should be an array of pulse times
+     * in milliseconds (as <code>[on, off, on, off, on, etc]</code>).</p>
+     * <p>For example <code>Puck.IR(pulseTimes)</code> - see <a href="http://www.espruino.com/Puck.js+Infrared">http://www.espruino.com/Puck.js+Infrared</a>
+     * for a full example.</p>
+     * <p>You can also attach an external LED to Puck.js, in which case
+     * you can just execute <code>Puck.IR(pulseTimes, led_cathode, led_anode)</code></p>
+     * 
+     * @url http://www.espruino.com/Reference#l_Puck_IR
+     */
+    interface IR {
+
+        /**
+         * 
+         * @param data 
+         * @param cathode 
+         * @param anode 
+         * @return  
+         */
+        new(data: any, cathode: Pin, anode: Pin): IR;
+    }
+
+
+    /**
+     * <p>Capacitive sense - the higher the capacitance, the higher the number returned.</p>
+     * <p>If called without arguments, a value depending on the capacitance of what is 
+     * attached to pin D11 will be returned. If you attach a length of wire to D11,
+     * you&#39;ll be able to see a higher value returned when your hand is near the wire
+     * than when it is away.</p>
+     * <p>You can also supply pins to use yourself, however if you do this then
+     * the TX pin must be connected to RX pin and sense plate via a roughly 1MOhm 
+     * resistor.</p>
+     * <p>When not supplying pins, Puck.js uses an internal resistor between D12(tx)
+     * and D11(rx).</p>
+     * 
+     * @param tx 
+     * @param rx 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Puck_capSense
+     */
+    function capSense(tx: Pin, rx: Pin): number;
+
+    /**
+     * <p>Return a light value based on the light the red LED is seeing.</p>
+     * <p><strong>Note:</strong> If called more than 5 times per second, the received light value
+     * may not be accurate.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Puck_light
+     */
+    function light(): number;
+
+    /**
+     * <p>Return an approximate battery percentage remaining based on
+     * a normal CR2032 battery (2.8 - 2.2v)</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Puck_getBatteryPercentage
+     */
+    function getBatteryPercentage(): number;
+
+    /**
+     * <p>Run a self-test, and return true for a pass. This checks for shorts
+     * between pins, so your Puck shouldn&#39;t have anything connected to it.</p>
+     * <p><strong>Note:</strong> This self-test auto starts if you hold the button on your Puck
+     * down while inserting the battery, leave it pressed for 3 seconds (while
+     * the green LED is lit) and release it soon after all LEDs turn on. 5
+     * red blinks is a fail, 5 green is a pass.</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Puck_selfTest
+     */
+    function selfTest(): boolean;
+}
+
+/**
+* <p>Class containing utility functions for accessing IO on the hexagonal badge</p>
+* 
+* @url http://www.espruino.com/Reference#Badge
+*/
+declare interface Badge {
+
+    /**
+     * 
+     * @return  
+     */
+    new(): Badge;
+}
+
+
+/**
+* 
+*/
+declare namespace Badge {
+
+    /**
+     * <p>Capacitive sense - the higher the capacitance, the higher the number returned.</p>
+     * <p>Supply a corner between 1 and 6, and a</p>
+     * 
+     * @param corner 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Badge_capSense
+     */
+    function capSense(corner: number): number;
+
+    /**
+     * <p>Return an approximate battery percentage remaining based on
+     * a normal CR2032 battery (2.8 - 2.2v)</p>
+     * 
+     * @return  
+     * @url http://www.espruino.com/Reference#l_Badge_getBatteryPercentage
+     */
+    function getBatteryPercentage(): number;
+
+    /**
+     * <p>Set the LCD&#39;s contrast</p>
+     * 
+     * @param c 
+     * @url http://www.espruino.com/Reference#l_Badge_setContrast
+     */
+    function setContrast(c: number): void;
+}
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_HIGH
+*/
+declare var HIGH: number;
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_LOW
+*/
+declare var LOW: number;
+
+/**
+* <p>Read 8 bits of memory at the given location - DANGEROUS!</p>
+* 
+* @param addr 
+* @param count 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_peek8
+*/
+declare function peek8(addr: number, count: number): any;
+
+/**
+* <p>Write 8 bits of memory at the given location - VERY DANGEROUS!</p>
+* 
+* @param addr 
+* @param value 
+* @url http://www.espruino.com/Reference#l__global_poke8
+*/
+declare function poke8(addr: number, value: any): void;
+
+/**
+* <p>Read 16 bits of memory at the given location - DANGEROUS!</p>
+* 
+* @param addr 
+* @param count 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_peek16
+*/
+declare function peek16(addr: number, count: number): any;
+
+/**
+* <p>Write 16 bits of memory at the given location - VERY DANGEROUS!</p>
+* 
+* @param addr 
+* @param value 
+* @url http://www.espruino.com/Reference#l__global_poke16
+*/
+declare function poke16(addr: number, value: any): void;
+
+/**
+* <p>Read 32 bits of memory at the given location - DANGEROUS!</p>
+* 
+* @param addr 
+* @param count 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_peek32
+*/
+declare function peek32(addr: number, count: number): any;
+
+/**
+* <p>Write 32 bits of memory at the given location - VERY DANGEROUS!</p>
+* 
+* @param addr 
+* @param value 
+* @url http://www.espruino.com/Reference#l__global_poke32
+*/
+declare function poke32(addr: number, value: any): void;
+
+/**
+* <p>Get the analog value of the given pin</p>
+* <p>This is different to Arduino which only returns an integer between 0 and 1023</p>
+* <p>However only pins connected to an ADC will work (see the datasheet)</p>
+* <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset pin&#39;s state to <code>&quot;analog&quot;</code></p>
+* 
+* @param pin 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_analogRead
+*/
+declare function analogRead(pin: Pin): number;
+
+/**
+* <p>Set the analog Value of a pin. It will be output using PWM.</p>
+* <p>Objects can contain:</p>
+* <ul>
+* <li><code>freq</code> - pulse frequency in Hz, eg. <code>analogWrite(A0,0.5,{ freq : 10 });</code> - specifying a frequency will force PWM output, even if the pin has a DAC</li>
+* <li><code>soft</code> - boolean, If true software PWM is used if available.</li>
+* <li><p><code>forceSoft</code> - boolean, If true software PWM is used even</p>
+* <p><strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset pin&#39;s state to <code>&quot;output&quot;</code></p>
+* </li>
+* </ul>
+* 
+* @param pin 
+* @param value 
+* @param options 
+* @url http://www.espruino.com/Reference#l__global_analogWrite
+*/
+declare function analogWrite(pin: Pin, value: number, options: any): void;
+
+/**
+* <p>Pulse the pin with the value for the given time in milliseconds. It uses a hardware timer to produce accurate pulses, and returns immediately (before the pulse has finished). Use <code>digitalPulse(A0,1,0)</code> to wait until a previous pulse has finished.</p>
+* <p>eg. <code>digitalPulse(A0,1,5);</code> pulses A0 high for 5ms. <code>digitalPulse(A0,1,[5,2,4]);</code> pulses A0 high for 5ms, low for 2ms, and high for 4ms</p>
+* <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset pin&#39;s state to <code>&quot;output&quot;</code></p>
+* <p>digitalPulse is for SHORT pulses that need to be very accurate. If you&#39;re doing anything over a few milliseconds, use setTimeout instead.</p>
+* 
+* @param pin 
+* @param value 
+* @param time 
+* @url http://www.espruino.com/Reference#l__global_digitalPulse
+*/
+declare function digitalPulse(pin: Pin, value: boolean, time: any): void;
+
+/**
+* <p>Set the digital value of the given pin.</p>
+* <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset pin&#39;s state to <code>&quot;output&quot;</code></p>
+* <p>If pin argument is an array of pins (eg. <code>[A2,A1,A0]</code>) the value argument will be treated
+* as an array of bits where the last array element is the least significant bit.</p>
+* <p>In this case, pin values are set least significant bit first (from the right-hand side
+* of the array of pins). This means you can use the same pin multiple times, for
+* example <code>digitalWrite([A1,A1,A0,A0],0b0101)</code> would pulse A0 followed by A1.</p>
+* 
+* @param pin 
+* @param value 
+* @url http://www.espruino.com/Reference#l__global_digitalWrite
+*/
+declare function digitalWrite(pin: Pin, value: number): void;
+
+/**
+* <p>Get the digital value of the given pin.</p>
+* <p> <strong>Note:</strong> if you didn&#39;t call <code>pinMode</code> beforehand then this function will also reset pin&#39;s state to <code>&quot;input&quot;</code></p>
+* <p>If the pin argument is an array of pins (eg. <code>[A2,A1,A0]</code>) the value returned will be an number where
+* the last array element is the least significant bit, for example if <code>A0=A1=1</code> and <code>A2=0</code>, <code>digitalRead([A2,A1,A0]) == 0b011</code></p>
+* 
+* @param pin 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_digitalRead
+*/
+declare function digitalRead(pin: Pin): number;
+
+/**
+* <p>Set the mode of the given pin.</p>
+* <ul>
+* <li><code>auto</code>/<code>undefined</code> - Don&#39;t change state, but allow <code>digitalWrite</code>/etc to automatically change state as appropriate</li>
+* <li><code>analog</code> - Analog input</li>
+* <li><code>input</code> - Digital input</li>
+* <li><code>input_pullup</code> - Digital input with internal ~40k pull-up resistor</li>
+* <li><code>input_pulldown</code> - Digital input with internal ~40k pull-down resistor</li>
+* <li><code>output</code> - Digital output</li>
+* <li><code>opendrain</code> - Digital output that only ever pulls down to 0v. Sending a logical <code>1</code> leaves the pin open circuit</li>
+* <li><code>opendrain_pullup</code> - Digital output that pulls down to 0v. Sending a logical <code>1</code> enables internal ~40k pull-up resistor</li>
+* <li><code>af_output</code> - Digital output from built-in peripheral</li>
+* <li><p><code>af_opendrain</code> - Digital output from built-in peripheral that only ever pulls down to 0v. Sending a logical <code>1</code> leaves the pin open circuit</p>
+* <p><strong>Note:</strong> <code>digitalRead</code>/<code>digitalWrite</code>/etc set the pin mode automatically <em>unless</em> <code>pinMode</code> has been called first.
+* If you want <code>digitalRead</code>/etc to set the pin mode automatically after you have called <code>pinMode</code>, simply call it again
+* with no mode argument (<code>pinMode(pin)</code>), <code>auto</code> as the argument (<code>pinMode(pin, &quot;auto&quot;)</code>), or with the 3rd &#39;automatic&#39;
+* argument set to true (<code>pinMode(pin, &quot;output&quot;, true)</code>).</p>
+* </li>
+* </ul>
+* 
+* @param pin 
+* @param mode 
+* @param automatic 
+* @url http://www.espruino.com/Reference#l__global_pinMode
+*/
+declare function pinMode(pin: Pin, mode: any, automatic: boolean): void;
+
+/**
+* <p>Return the current mode of the given pin. See <code>pinMode</code> for more information on returned values.</p>
+* 
+* @param pin 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_getPinMode
+*/
+declare function getPinMode(pin: Pin): any;
+
+/**
+* <p>Call the function specified when the pin changes. Watches set with <code>setWatch</code> can be removed using <code>clearWatch</code>.</p>
+* <p>The function may also take an argument, which is an object of type <code>{state:bool, time:float, lastTime:float}</code>.</p>
+* <ul>
+* <li><code>state</code> is whether the pin is currently a <code>1</code> or a <code>0</code></li>
+* <li><code>time</code> is the time in seconds at which the pin changed state</li>
+* <li><code>lastTime</code> is the time in seconds at which the <strong>pin last changed state</strong>. When using <code>edge:&#39;rising&#39;</code> or <code>edge:&#39;falling&#39;</code>, this is not the same as when the function was last called.</li>
+* </ul>
+* <p>For instance, if you want to measure the length of a positive pulse you could use <code>setWatch(function(e) { console.log(e.time-e.lastTime); }, BTN, { repeat:true, edge:&#39;falling&#39; });</code>.
+* This will only be called on the falling edge of the pulse, but will be able to measure the width of the pulse because <code>e.lastTime</code> is the time of the rising edge.</p>
+* <p>Internally, an interrupt writes the time of the pin&#39;s state change into a queue, and the function
+* supplied to <code>setWatch</code> is executed only from the main message loop. However, if the callback is a
+* native function <code>void (bool state)</code> then you can add <code>irq:true</code> to options, which will cause the
+* function to be called from within the IRQ. When doing this, interrupts will happen on both edges
+* and there will be no debouncing.</p>
+* <p><strong>Note:</strong> The STM32 chip (used in the <a href="/EspruinoBoard">Espruino Board</a> and <a href="/Pico">Pico</a>) cannot
+* watch two pins with the same number - eg <code>A0</code> and <code>B0</code>.</p>
+* 
+* @param function 
+* @param pin 
+* @param options 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_setWatch
+*/
+declare function setWatch(f: (a?: any) => any, pin: Pin, options: any): any;
+
+/**
+* <p>Clear the Watch that was created with setWatch. If no parameter is supplied, all watches will be removed.</p>
+* 
+* @param id 
+* @url http://www.espruino.com/Reference#l__global_clearWatch
+*/
+declare function clearWatch(id: any): void;
+
+/**
+* <p>A reference to the global scope, where everything is defined.</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_global
+*/
+declare var global: any;
+
+/**
+* <p>When Espruino is busy, set the pin specified here high. Set this to undefined to disable the feature.</p>
+* 
+* @param pin 
+* @url http://www.espruino.com/Reference#l__global_setBusyIndicator
+*/
+declare function setBusyIndicator(pin: Pin): void;
+
+/**
+* <p>When Espruino is asleep, set the pin specified here low (when it&#39;s awake, set it high). Set this to undefined to disable the feature.</p>
+* <p>Please see <a href="http://www.espruino.com/Power+Consumption">http://www.espruino.com/Power+Consumption</a> for more details on this.</p>
+* 
+* @param pin 
+* @url http://www.espruino.com/Reference#l__global_setSleepIndicator
+*/
+declare function setSleepIndicator(pin: Pin): void;
+
+/**
+* <p>Set whether we can enter deep sleep mode, which reduces power consumption to around 100uA. This only works on STM32 Espruino Boards.</p>
+* <p>Please see <a href="http://www.espruino.com/Power+Consumption">http://www.espruino.com/Power+Consumption</a> for more details on this.</p>
+* 
+* @param sleep 
+* @url http://www.espruino.com/Reference#l__global_setDeepSleep
+*/
+declare function setDeepSleep(sleep: boolean): void;
+
+/**
+* <p>Output debugging information</p>
+* <p>Note: This is not included on boards with low amounts of flash memory, or the Espruino board.</p>
+* 
+* @param root 
+* @url http://www.espruino.com/Reference#l__global_trace
+*/
+declare function trace(root: any): void;
+
+/**
+* <p>Output current interpreter state in a text form such that it can be copied to a new device</p>
+* <p>Note: &#39;Internal&#39; functions are currently not handled correctly. You will need to recreate these in the <code>onInit</code> function.</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_dump
+*/
+declare function dump(): void;
+
+/**
+* <p>Restart and load the program out of flash - this has an effect similar to
+* completely rebooting Espruino (power off/power on), but without actually
+* performing a full reset of the hardware.</p>
+* <p>This command only executes when the Interpreter returns to the Idle state - for
+* instance <code>a=1;load();a=2;</code> will still leave &#39;a&#39; as undefined (or what it was
+* set to in the saved program).</p>
+* <p>Espruino will resume from where it was when you last typed <code>save()</code>.
+* If you want code to be executed right after loading (for instance to initialise
+* devices connected to Espruino), add an <code>init</code> event handler to <code>E</code> with
+* <code>E.on(&#39;init&#39;, function() { ... your_code ... });</code>. This will then be automatically
+* executed by Espruino every time it starts.</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_load
+*/
+declare function load(): void;
+
+/**
+* <p>Save program memory into flash. It will then be loaded automatically every time
+* Espruino powers on or is hard-reset.</p>
+* <p>This command only executes when the Interpreter returns to the Idle state - for
+* instance <code>a=1;save();a=2;</code> will save &#39;a&#39; as 2.</p>
+* <p>When Espruino powers on, it will resume from where it was when you typed <code>save()</code>.
+* If you want code to be executed right after loading (for instance to initialise
+* devices connected to Espruino), add an <code>init</code> event handler to <code>E</code> with
+* <code>E.on(&#39;init&#39;, function() { ... your_code ... });</code>. This will then be automatically
+* executed by Espruino every time it starts.</p>
+* <p>In order to stop the program saved with this command being loaded automatically,
+* hold down Button 1 while also pressing reset. On some boards, Button 1 enters
+* bootloader mode, so you will need to press Reset with Button 1 raised, and then
+* hold Button 1 down a fraction of a second later.</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_save
+*/
+declare function save(): void;
+
+/**
+* <p>Reset the interpreter - clear program memory in RAM, and do not load a saved program from flash. This does NOT reset the underlying hardware (which allows you to reset the device without it disconnecting from USB).</p>
+* <p>This command only executes when the Interpreter returns to the Idle state - for instance <code>a=1;reset();a=2;</code> will still leave &#39;a&#39; as undefined.</p>
+* <p>The safest way to do a full reset is to hit the reset button.</p>
+* <p>If <code>reset()</code> is called with no arguments, it will reset the board&#39;s state in
+* RAM but will not reset the state in flash. When next powered on (or when
+* <code>load()</code> is called) the board will load the previously saved code.</p>
+* <p>Calling <code>reset(true)</code> will cause <em>all saved code in flash memory to
+* be cleared as well</em>.</p>
+* 
+* @param clearFlash 
+* @url http://www.espruino.com/Reference#l__global_reset
+*/
+declare function reset(clearFlash: boolean): void;
+
+/**
+* <p>Print the supplied string(s) to the console</p>
+* <p> <strong>Note:</strong> If you&#39;re connected to a computer (not a wall adaptor) via USB but <strong>you are not running a terminal app</strong> then when you print data Espruino may pause execution and wait until the computer requests the data it is trying to print.</p>
+* 
+* @param text 
+* @url http://www.espruino.com/Reference#l__global_print
+*/
+declare function print(text: any): void;
+
+/**
+* <p>Fill the console with the contents of the given function, so you can edit it.</p>
+* <p>NOTE: This is a convenience function - it will not edit &#39;inner functions&#39;. For that, you must edit the &#39;outer function&#39; and re-execute it.</p>
+* 
+* @param funcName 
+* @url http://www.espruino.com/Reference#l__global_edit
+*/
+declare function edit(funcName: any): void;
+
+/**
+* <p>Should TinyJS echo what you type back to you? true = yes (Default), false = no. When echo is off, the result of executing a command is not returned. Instead, you must use &#39;print&#39; to send output.</p>
+* 
+* @param echoOn 
+* @url http://www.espruino.com/Reference#l__global_echo
+*/
+declare function echo(echoOn: boolean): void;
+
+/**
+* <p>Return the current system time in Seconds (as a floating point number)</p>
+* 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_getTime
+*/
+declare function getTime(): number;
+
+/**
+* <p>Set the current system time in seconds (to the nearest second)</p>
+* 
+* @param time 
+* @url http://www.espruino.com/Reference#l__global_setTime
+*/
+declare function setTime(time: number): void;
+
+/**
+* <p>Get the serial number of this board</p>
+* 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_getSerial
+*/
+declare function getSerial(): any;
+
+/**
+* <p>Clear the Interval that was created with setInterval, for example:</p>
+* <p><code>var id = setInterval(function () { print(&#39;foo&#39;); }, 1000);</code></p>
+* <p><code>clearInterval(id);</code></p>
+* <p>If no argument is supplied, all timers and intervals are stopped</p>
+* 
+* @param id 
+* @url http://www.espruino.com/Reference#l__global_clearInterval
+*/
+declare function clearInterval(id: any): void;
+
+/**
+* <p>Clear the Timeout that was created with setTimeout, for example:</p>
+* <p><code>var id = setTimeout(function () { print(&#39;foo&#39;); }, 1000);</code></p>
+* <p><code>clearTimeout(id);</code></p>
+* <p>If no argument is supplied, all timers and intervals are stopped</p>
+* 
+* @param id 
+* @url http://www.espruino.com/Reference#l__global_clearTimeout
+*/
+declare function clearTimeout(id: any): void;
+
+/**
+* <p>Change the Interval on a callback created with setInterval, for example:</p>
+* <p><code>var id = setInterval(function () { print(&#39;foo&#39;); }, 1000); // every second</code></p>
+* <p><code>changeInterval(id, 1500); // now runs every 1.5 seconds</code></p>
+* <p>This takes effect immediately and resets the timeout, so in the example above,
+* regardless of when you call <code>changeInterval</code>, the next interval will occur 1500ms
+* after it.</p>
+* 
+* @param id 
+* @param time 
+* @url http://www.espruino.com/Reference#l__global_changeInterval
+*/
+declare function changeInterval(id: any, time: number): void;
+
+/**
+* <p>A variable containing the arguments given to the function</p>
+* 
+* @url http://www.espruino.com/Reference#l__global_arguments
+*/
+declare var arguments: any;
+
+/**
+* <p>Evaluate a string containing JavaScript code</p>
+* 
+* @param code 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_eval
+*/
+declare function eval(code: any): any;
+
+/**
+* <p>Convert a string representing a number into an integer</p>
+* 
+* @param string 
+* @param radix 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_parseInt
+*/
+declare function parseInt(string: any, radix: any): any;
+
+/**
+* <p>Convert a string representing a number into an float</p>
+* 
+* @param string 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_parseFloat
+*/
+declare function parseFloat(string: any): number;
+
+/**
+* <p>Whether the x is NaN (Not a Number) or not</p>
+* 
+* @param x 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_isNaN
+*/
+declare function isNaN(x: any): boolean;
+
+/**
+* <p>Encode the supplied string (or array) into a base64 string</p>
+* 
+* @param binaryData 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_btoa
+*/
+declare function btoa(binaryData: any): any;
+
+/**
+* <p>Decode the supplied base64 string into a normal string</p>
+* 
+* @param binaryData 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_atob
+*/
+declare function atob(binaryData: any): any;
+
+/**
+* <p>Convert a string with any character not alphanumeric or <code>- _ . ! ~ * &#39; ( )</code> converted to the form <code>%XY</code> where <code>XY</code> is its hexadecimal representation</p>
+* 
+* @param str 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_encodeURIComponent
+*/
+declare function encodeURIComponent(str: any): any;
+
+/**
+* <p>Convert any groups of characters of the form &#39;%ZZ&#39;, into characters with hex code &#39;0xZZ&#39;</p>
+* 
+* @param str 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_decodeURIComponent
+*/
+declare function decodeURIComponent(str: any): any;
+
+/**
+* <p><strong>Note:</strong> This function is only available on the <a href="/MicroBit">BBC micro:bit</a> board</p>
+* <p>Get the current acceleration of the micro:bit from the on-board accelerometer</p>
+* 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_acceleration
+*/
+declare function acceleration(): any;
+
+/**
+* <p><strong>Note:</strong> This function is only available on the <a href="/MicroBit">BBC micro:bit</a> board</p>
+* <p>Get the current compass position for the micro:bit from the on-board magnetometer</p>
+* 
+* @return  
+* @url http://www.espruino.com/Reference#l__global_compass
+*/
+declare function compass(): any;
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_BTNA
+*/
+declare var BTNA: Pin;
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_BTNB
+*/
+declare var BTNB: Pin;
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_BTNU
+*/
+declare var BTNU: Pin;
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_BTND
+*/
+declare var BTND: Pin;
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_BTNL
+*/
+declare var BTNL: Pin;
+
+/**
+* 
+* @url http://www.espruino.com/Reference#l__global_BTNR
+*/
+declare var BTNR: Pin;
+
+declare var D0: Pin;
+declare var D1: Pin;
+declare var D2: Pin;
+declare var D3: Pin;
+declare var D4: Pin;
+declare var D5: Pin;
+declare var D6: Pin;
+declare var D7: Pin;
+declare var D8: Pin;
+declare var D9: Pin;
+declare var D10: Pin;
+declare var D11: Pin;
+declare var D12: Pin;
+declare var D13: Pin;
+declare var D14: Pin;
+declare var D15: Pin;
+declare var D16: Pin;
+declare var D17: Pin;
+declare var D18: Pin;
+declare var D19: Pin;
+declare var D20: Pin;
+declare var D21: Pin;
+declare var D22: Pin;
diff --git a/types/espruino/tsconfig.json b/types/espruino/tsconfig.json
new file mode 100644
index 0000000000..38bb3dfd03
--- /dev/null
+++ b/types/espruino/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+          "es2015",
+          "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "espruino-tests.ts"
+    ]
+}
diff --git a/types/espruino/tslint.json b/types/espruino/tslint.json
new file mode 100644
index 0000000000..1e942a18f8
--- /dev/null
+++ b/types/espruino/tslint.json
@@ -0,0 +1,15 @@
+{ 
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false,
+        "no-padding": false,
+        "no-trailing-whitespace": false,
+        "jsdoc-format": false,
+        "no-redundant-jsdoc-2": false,
+        "max-line-length": false,
+        "interface-name": false,
+        "no-misused-new": false,
+        "no-consecutive-blank-lines": false,
+        "no-var-keyword": false
+    }
+}
diff --git a/types/esri-leaflet/esri-leaflet-tests.ts b/types/esri-leaflet/esri-leaflet-tests.ts
index 89520101a3..37be66a9a3 100644
--- a/types/esri-leaflet/esri-leaflet-tests.ts
+++ b/types/esri-leaflet/esri-leaflet-tests.ts
@@ -1,9 +1,3 @@
-// tslint:disable:no-trailing-whitespace
-// tslint:disable:prefer-method-signature
-// tslint:disable:no-single-declare-module
-// tslint:disable:only-arrow-functions
-// tslint:disable:space-before-function-paren
-
 import * as L from 'leaflet';
 import 'esri-leaflet';
 
@@ -108,15 +102,15 @@ tiledMapLayer.metadata((err, metadata) => { });
 
 tiledMapLayer.identify()
     .at(latlng)
-    .run(function (error, featureCollection) { });
+    .run((error, featureCollection) => {});
 tiledMapLayer.find()
     .layers('18')
     .text('Colorado')
-    .run(function (error, featureCollection) { });
+    .run((error, featureCollection) => {});
 tiledMapLayer.query()
     .layer(0)
     .within(latlngbounds)
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 
 let dynamicMapLayer: L.esri.DynamicMapLayer;
 let dynamicMapLayerOptions: L.esri.DynamicMapLayerOptions;
@@ -225,24 +219,24 @@ dynamicMapLayer = new L.esri.DynamicMapLayer({
     token: 'token'
 });
 
-dynamicMapLayer.bindPopup(function (err, featureCollection, response) {
+dynamicMapLayer.bindPopup((err, featureCollection, response) => {
     const count = featureCollection.features.length;
     return (count) ? count + ' features' : false;
 });
 
-dynamicMapLayer.metadata(function (error, metadata) { });
+dynamicMapLayer.metadata((error, metadata) => {});
 
 dynamicMapLayer.identify()
     .at(latlng)
-    .run(function (error, featureCollection) { });
+    .run((error, featureCollection) => {});
 dynamicMapLayer.find()
     .layers('18')
     .text('Colorado')
-    .run(function (error, featureCollection) { });
+    .run((error, featureCollection) => {});
 dynamicMapLayer.query()
     .layer(0)
     .within(latlngbounds)
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 
 let featureLayerOptions: L.esri.FeatureLayerOptions;
 let featureLayer: L.esri.FeatureLayer;
@@ -324,20 +318,20 @@ featureLayer = new L.esri.FeatureLayer({
 featureLayer.setStyle({
     color: 'white'
 });
-featureLayer.setStyle(function (feature) {
+featureLayer.setStyle(feature => {
     return {
         weight: feature.properties.pixelWidth
     };
 });
 
-featureLayer.eachFeature(function (layer) { });
+featureLayer.eachFeature(layer => {});
 
 featureLayer.query()
     .within(latlngbounds)
     .where("Direction = 'WEST'")
-    .run(function (error, featureCollection) { });
+    .run((error, featureCollection) => {});
 
-featureLayer.metadata(function (error, metadata) { });
+featureLayer.metadata((error, metadata) => {});
 
 let mapServiceOptions: L.esri.MapServiceOptions;
 let mapService: L.esri.MapService;
@@ -372,27 +366,27 @@ mapService = new L.esri.MapService({
 mapService.query()
     .layer(0)
     .within(latlngbounds)
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 mapService.identify()
     .on(map)
     .at(latlng)
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 mapService.find()
     .layers('18')
     .text('Colorado')
     .fields('name')
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 
 mapService.identify()
     .on(map)
     .at([45.543, -122.621])
     .layers('visible:1')
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 mapService.find()
     .layers('18')
     .text('Colorado')
     .fields('GNIS_NAME')
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 
 let imageServiceOptions: L.esri.ImageServiceOptions;
 let imageService: L.esri.ImageService;
@@ -457,7 +451,7 @@ featureLayerService = new L.esri.FeatureLayerService({
 featureLayerService.query()
     .within(latlngbounds)
     .where("Direction = 'WEST'")
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 
 const feature = {
     type: 'Feature',
@@ -469,7 +463,7 @@ const feature = {
         name: 'Hello World'
     }
 };
-featureLayerService.addFeature(feature, function (error, response) { });
+featureLayerService.addFeature(feature, (error, response) => {});
 
 const feature2 = {
     type: 'Feature',
@@ -482,14 +476,14 @@ const feature2 = {
         name: 'Hi I\'m Feature 2'
     }
 };
-featureLayerService.updateFeature(feature2, function (error, response) { });
+featureLayerService.updateFeature(feature2, (error, response) => {});
 
-featureLayerService.deleteFeature(2, function (error, response) { });
+featureLayerService.deleteFeature(2, (error, response) => {});
 
 featureLayerService
     .query()
     .where("name='Hello World'")
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 
 let queryOptions: L.esri.QueryOptions;
 let query: L.esri.Query;
@@ -522,17 +516,17 @@ query = new L.esri.Query({
 });
 
 query.within(latlngbounds);
-query.run(function (error, featureCollection, response) { });
-query.bounds(function (error, latLngBounds, response) { });
+query.run((error, featureCollection, response) => {});
+query.bounds((error, latLngBounds, response) => {});
 
 query.nearby(latlng, 500);
-query.run(function (error, featureCollection, response) { });
+query.run((error, featureCollection, response) => {});
 
 query.nearby(latlng, 2000).where("direction='East'").orderBy('stop_id', 'ASC');
-query.count(function (error, count, response) { });
-query.ids(function (error, ids, response) { });
+query.count((error, count, response) => {});
+query.ids((error, ids, response) => {});
 
-query.where("zone_id='B'").bounds(function (error, latLngBounds, response) { });
+query.where("zone_id='B'").bounds((error, latLngBounds, response) => {});
 
 query.transform(15851);
 query.transform({wkid: 15851 });
@@ -574,7 +568,7 @@ identifyFeatures
     .on(map)
     .at([45.543, -122.621])
     .layers('visible:1')
-    .run(function (error, featureCollection, response) { });
+    .run((error, featureCollection, response) => {});
 
 identifyFeatures.at(marker);
 identifyFeatures.at(polygon);
@@ -614,9 +608,9 @@ find = new L.esri.Find({
 
 find.layers('18')
     .text('Colorado');
-find.run(function (error, featureCollection, response) { });
+find.run((error, featureCollection, response) => {});
 
 find.layers('13')
     .text('198133')
     .fields('GNIS_ID');
-find.run(function (error, featureCollection, response) { });
+find.run((error, featureCollection, response) => {});
diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts
index 07cab832e0..69c5eb5827 100644
--- a/types/esri-leaflet/index.d.ts
+++ b/types/esri-leaflet/index.d.ts
@@ -13,30 +13,18 @@ declare module 'leaflet' {
         interface LayerOptionsBase {
             /**
              * URL of the Map Service
-             *
-             * @type {string}
-             * @memberof LayerOptionsBase
              */
             url: string;
             /**
              * URL of an ArcGIS API for JavaScript proxy or ArcGIS Resource Proxy to use for proxying requests.
-             *
-             * @type {string}
-             * @memberof LayerOptionsBase
              */
             proxy?: string;
             /**
              * Dictates if the service should use CORS when making GET requests.
-             *
-             * @type {boolean}
-             * @memberof LayerOptionsBase
              */
             useCors?: boolean;
             /**
              * Will use this token to authenticate all calls to the service.
-             *
-             * @type {string}
-             * @memberof LayerOptionsBase
              */
             token?: string;
         }
@@ -71,544 +59,357 @@ declare module 'leaflet' {
         }
 
         /**
-         * Options for L.esri.BasemapLayer
-         *
-         * @interface BasemapLayerOptions
-         * @extends {L.TileLayerOptions}
+         * Options for `L.esri.BasemapLayer`
          */
         interface BasemapLayerOptions extends L.TileLayerOptions {
             /**
              * 	Will use this token to authenticate all calls to the service.
              *
-             * @type {string}
-             * @memberof BasemapLayerOptions
              */
             token?: string;
         }
 
         /**
-         * L.esri.BasemapLayer is used to display Esri hosted basemaps and attributes data providers appropriately. The Terms of Use for Esri hosted services apply to all Leaflet applications.
-         *
-         * @class BasemapLayer
-         * @extends {L.TileLayer}
+         * `L.esri.BasemapLayer` is used to display Esri hosted basemaps and attributes data providers appropriately.
+         * The Terms of Use for Esri hosted services apply to all Leaflet applications.
          */
         class BasemapLayer extends L.TileLayer {
             constructor(key: Basemaps, options?: BasemapLayerOptions);
         }
 
         /**
-         * L.esri.basemapLayer is used to display Esri hosted basemaps and attributes data providers appropriately. The Terms of Use for Esri hosted services apply to all Leaflet applications.
-         *
-         * @param {Basemaps} key
-         * @param {BasemapLayerOptions} [options]
-         * @returns {BasemapLayer}
+         * `L.esri.basemapLayer` is used to display Esri hosted basemaps and attributes data providers appropriately.
+         * The Terms of Use for Esri hosted services apply to all Leaflet applications.
          */
         function basemapLayer(key: Basemaps, options?: BasemapLayerOptions): BasemapLayer;
 
         /**
-         * Options for L.esri.TiledMapLayer
-         *
-         * @interface TiledMapLayerOptions
-         * @extends {L.TileLayerOptions}
+         * Options for `L.esri.TiledMapLayer`
          */
         interface TiledMapLayerOptions extends L.TileLayerOptions, LayerOptionsBase {
             /**
-             * If correctZoomLevels is enabled this controls the amount of tolerance for the difference at each scale level for remapping tile levels.
-             * Default 0.1
+             * If correctZoomLevels is enabled this controls the amount of tolerance for the difference at each scale
+             * level for remapping tile levels.
              *
-             * @type {number}
-             * @memberof TiledMapLayerOptions
+             * Default 0.1
              */
             zoomOffsetAllowance?: number;
         }
 
         /**
-         * Access tiles from ArcGIS Online and ArcGIS Server to visualize and identify features. Copyright text from the service is added to map attribution automatically.
-         *
-         * @class TiledMapLayer
-         * @extends {L.TileLayer}
+         * Access tiles from ArcGIS Online and ArcGIS Server to visualize and identify features. Copyright text from the
+         * service is added to map attribution automatically.
          */
         class TiledMapLayer extends L.TileLayer {
             constructor(options: TiledMapLayerOptions);
             /**
-             * Authenticates this service with a new token and runs any pending requests that required a token.
-             *
-             * @param {string} token
-             * @returns {this}
-             * @memberof TiledMapLayer
+             * Authenticates this service with a new token and runs any pending requests that required a token
              */
             authenticate(token: string): this;
             /**
              * Requests metadata about this Feature Layer. Callback will be called with error and metadata.
-             *
-             * @param {CallbackHandler} callback
-             * @param {*} context
-             * @returns {this}
-             * @memberof TiledMapLayer
              */
             metadata(callback: CallbackHandler, context?: any): this;
             /**
-             * Returns a new L.esri.services.IdentifyFeatures object that can be used to identify features on this layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof TiledMapLayer
+             * Returns a new `L.esri.services.IdentifyFeatures` object that can be used to identify features on this
+             * layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             identify(): IdentifyFeatures;
             /**
-             * Returns a new L.esri.services.Find object that can be used to find features. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof TiledMapLayer
+             * Returns a new `L.esri.services.Find` object that can be used to find features. Your callback function
+             * will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             find(): Find;
             /**
-             * Returns a new L.esri.Query object that can be used to query this service.
-             *
-             * @returns {*}
-             * @memberof TiledMapLayer
+             * Returns a new `L.esri.Query` object that can be used to query this service.
              */
             query(): Query;
         }
 
         /**
-         * Access tiles from ArcGIS Online and ArcGIS Server to visualize and identify features. Copyright text from the service is added to map attribution automatically.
-         *
-         * @param {TiledMapLayerOptions} options
-         * @returns {TiledMapLayer}
+         * Access tiles from ArcGIS Online and ArcGIS Server to visualize and identify features. Copyright text from the
+         * service is added to map attribution automatically.
          */
         function tiledMapLayer(options: TiledMapLayerOptions): TiledMapLayer;
 
         /**
          * Options for RasterLayer
-         *
-         * @interface RasterLayerOptions
-         * @extends {L.ImageOverlayOptions}
          */
         interface RasterLayerOptions extends L.ImageOverlayOptions {
             /**
              * Server response content type.
-             * Default: 'image'
-             *
-             * @type {string}
-             * @memberof RasterLayerOptions
+             * @default 'image'
              */
             f?: string;
             /**
              * Position of the layer relative to other overlays.
-             * Default: 'front'
-             *
-             * @type {string}
-             * @memberof RasterLayerOptions
+             * @default 'front'
              */
             position?: string;
             /**
              * 	Closest zoom level the layer will be displayed on the map.
-             *
-             * @type {number}
-             * @memberof RasterLayerOptions
              */
             maxZoom?: number;
             /**
              * Furthest zoom level the layer will be displayed on the map.
-             *
-             * @type {number}
-             * @memberof RasterLayerOptions
              */
             minZoom?: number;
         }
 
         /**
          * A generic class representing an image layer. This class can be extended to provide support for making export requests from ArcGIS REST services.
-         *
-         * @class RasterLayer
-         * @extends {L.ImageOverlay}
          */
         abstract class RasterLayer extends L.ImageOverlay {
             /**
              * Redraws this layer below all other overlay layers.
-             *
-             * @returns {this}
-             * @memberof RasterLayer
              */
             bringToBack(): this;
             /**
              * 	Redraws this layer above all other overlay layers.
-             *
-             * @returns {this}
-             * @memberof RasterLayer
              */
             bringToFront(): this;
             /**
              * 	Returns the current opacity of the layer.
-             *
-             * @returns {number}
-             * @memberof RasterLayer
              */
             getOpacity(): number;
             /**
              * Sets the opacity of the layer.
-             *
-             * @param {number} opacity
-             * @returns {this}
-             * @memberof RasterLayer
              */
             setOpacity(opacity: number): this;
             /**
              * Returns the current time range being used for rendering. Array [from, to];
-             *
-             * @returns {Date[]}
-             * @memberof RasterLayer
              */
             getTimeRange(): Date[];
             /**
              * Redraws the layer with he passed time range.
-             *
-             * @param {Date} from
-             * @param {Date} to
-             * @returns {this}
-             * @memberof RasterLayer
              */
             setTimeRange(from: Date, to: Date): this;
             /**
              * Used to make a fresh request to the service and draw the response.
-             *
-             * @returns {this}
-             * @memberof RasterLayer
              */
             redraw(): this;
             /**
              * Authenticates this service with a new token and runs any pending requests that required a token.
-             *
-             * @param {string} token
-             * @returns {this}
-             * @memberof TiledMapLayer
              */
             authenticate(token: string): this;
             /**
              * Requests metadata about this Feature Layer. Callback will be called with error and metadata.
-             *
-             * @param {CallbackHandler} callback
-             * @param {*} context
-             * @returns {this}
-             * @memberof TiledMapLayer
              */
             metadata(callback: CallbackHandler, context?: any): this;
         }
 
         /**
-         * Options for L.esri.DynamicMapLayer
-         *
-         * @interface DynamicMapLayerOptions
-         * @extends {RasterLayerOptions}
+         * Options for `L.esri.DynamicMapLayer`
          */
         interface DynamicMapLayerOptions extends RasterLayerOptions, LayerOptionsBase {
             /**
              * Output format of the image.
-             * Default: 'png24'
-             *
-             * @type {string}
-             * @memberof DynamicMapLayerOptions
+             * @default 'png24'
              */
             format?: string;
             /**
              * Allow the server to produce transparent images.
-             *
-             * @type {boolean}
-             * @memberof DynamicMapLayerOptions
              */
             transparent?: boolean;
             /**
-             * Attribution from service metadata copyright text is automatically displayed in Leaflet's default control. This property can be used for customization.
-             *
-             * @type {string}
-             * @memberof DynamicMapLayerOptions
+             * Attribution from service metadata copyright text is automatically displayed in Leaflet's default control.
+             * This property can be used for customization.
              */
             attribution?: string;
-            /*
+            /**
              * An array of Layer IDs like [3,4,5] to show from the service.
-             *
-             * @type {any[]}
-             * @memberof DynamicMapLayerOptions
              */
             layers?: any[];
             /**
-             * 	SQL filters to define what features will be included in the image rendered by the service. An object is used with keys that map each query to its respective layer.
-             * { 3: "STATE_NAME='Kansas'", 9: "POP2007>25000" }
+             * 	SQL filters to define what features will be included in the image rendered by the service. An object is
+             * 	used with keys that map each query to its respective layer.
              *
-             * @type {*}
-             * @memberof DynamicMapLayerOptions
+             * { 3: "STATE_NAME='Kansas'", 9: "POP2007>25000" }
              */
             layerDefs?: any;
             /**
-             * JSON object literal used to manipulate the layer symbology defined in the service itself. Requires a 10.1 (or above) map service which supports dynamicLayers requests.
-             *
-             * @type {*}
-             * @memberof DynamicMapLayerOptions
+             * JSON object literal used to manipulate the layer symbology defined in the service itself. Requires a 10.1
+             * (or above) map service which supports dynamicLayers requests.
              */
             dynamicLayers?: any;
             /**
              * If enabled, appends a timestamp to each request to ensure a fresh image is created server-side.
-             *
-             * @type {boolean}
-             * @memberof DynamicMapLayerOptions
              */
             disableCache?: boolean;
         }
 
         /**
-         * Render and visualize Map Services from ArcGIS Online and ArcGIS Server. L.esri.DynamicMapLayer also supports custom popups and identification of features.
-         * Map Services are used when its preferable to ask the server to draw layers at a particular location and scale and pass back the image which was generated on the fly. They also expose capabilities for querying and identifying individual features.
+         * Render and visualize Map Services from ArcGIS Online and ArcGIS Server. `L.esri.DynamicMapLayer` also
+         * supports custom popups and identification of features.
          *
-         * @class DynamicMapLayer
-         * @extends {RasterLayer}
+         * Map Services are used when its preferable to ask the server to draw layers at a particular location and scale
+         * and pass back the image which was generated on the fly. They also expose capabilities for querying and
+         * identifying individual features.
          */
         class DynamicMapLayer extends RasterLayer {
             constructor(options: DynamicMapLayerOptions);
             /**
-             * Uses the provided function to create a popup that will identify features whenever the map is clicked. Your function will be passed a GeoJSON FeatureCollection of the features at the clicked location and should return the appropriate HTML. If you do not want to open the popup when there are no results, return false.
-             *
-             * @param {any} fn
-             * @param {L.PopupOptions} popupOptions
-             * @returns {this}
-             * @memberof DynamicMapLayer
+             * Uses the provided function to create a popup that will identify features whenever the map is clicked.
+             * Your function will be passed a GeoJSON FeatureCollection of the features at the clicked location and
+             * should return the appropriate HTML. If you do not want to open the popup when there are no results,
+             * return false.
              */
             bindPopup(fn: FeatureCallbackHandler, popupOptions?: L.PopupOptions): this;
             bindPopup(content: ((layer: Layer) => Content) | Content | Popup, options?: PopupOptions): this;
             /**
              * Removes a popup previously bound with bindPopup.
-             *
-             * @returns {this}
-             * @memberof DynamicMapLayer
              */
             unbindPopup(): this;
             /**
              * Returns the current opacity of the layer.
-             *
-             * @returns {number}
-             * @memberof DynamicMapLayer
              */
             getOpacity(): number;
             /**
              * Sets the opacity of the layer.
-             *
-             * @param {number} opacity
-             * @returns {this}
-             * @memberof DynamicMapLayer
              */
             setOpacity(opacity: number): this;
             /**
              * Returns the array of visible layers specified in the layer constructor.
-             *
-             * @returns {Array<any>}
-             * @memberof DynamicMapLayer
              */
             getLayers(): any[];
             /**
              * Redraws the layer to show the passed array of layer ids.
-             *
-             * @param {Array<any>} layers
-             * @returns {this}
-             * @memberof DynamicMapLayer
              */
             setLayers(layers: any[]): this;
             /**
              * Returns the current layer definition(s) being used for rendering.
-             *
-             * @returns {*}
-             * @memberof DynamicMapLayer
              */
             getLayerDefs(): any;
             /**
              * Redraws the layer with the new layer definitions. Corresponds to the layerDefs option on the export API.
-             *
-             * @param {*} layerDefs
-             * @returns {this}
-             * @memberof DynamicMapLayer
              */
             setLayerDefs(layerDefs: any): this;
             /**
              * Returns the current time options being used for rendering.
-             *
-             * @returns {*}
-             * @memberof DynamicMapLayer
              */
             getTimeOptions(): any;
             /**
-             * Sets the current time options being used to render the layer. Corresponds to the layerTimeOptions option on the export API.
-             *
-             * @param {*} timeOptions
-             * @returns {this}
-             * @memberof DynamicMapLayer
+             * Sets the current time options being used to render the layer. Corresponds to the layerTimeOptions option
+             * on the export API.
              */
             setTimeOptions(timeOptions: any): this;
             /**
              * Returns a JSON object representing the modified layer symbology being requested from the map service.
-             *
-             * @returns {*}
-             * @memberof DynamicMapLayer
              */
             getDynamicLayers(): any;
             /**
-             * Used to insert raw dynamicLayers JSON in situations where you'd like to modify layer symbology defined in the service itself.
-             *
-             * @param {*} layers
-             * @returns {this}
-             * @memberof DynamicMapLayer
+             * Used to insert raw dynamicLayers JSON in situations where you'd like to modify layer symbology defined in
+             * the service itself.
              */
             setDynamicLayers(layers: any): this;
             /**
-             * Returns a new L.esri.services.IdentifyFeatures object that can be used to identify features on this layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof DynamicMapLayer
+             * Returns a new `L.esri.services.IdentifyFeatures` object that can be used to identify features on this
+             * layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             identify(): IdentifyFeatures;
             /**
-             * Returns a new L.esri.services.Find object that can be used to find features. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof DynamicMapLayer
+             * Returns a new `L.esri.services.Find` object that can be used to find features. Your callback function
+             * will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             find(): Find;
             /**
-             * Returns a new L.esri.Query object that can be used to query this service.
-             *
-             * @returns {*}
-             * @memberof DynamicMapLayer
+             * Returns a new `L.esri.Query` object that can be used to query this service.
              */
             query(): Query;
         }
 
         /**
-         * Render and visualize Map Services from ArcGIS Online and ArcGIS Server. L.esri.DynamicMapLayer also supports custom popups and identification of features.
-         * Map Services are used when its preferable to ask the server to draw layers at a particular location and scale and pass back the image which was generated on the fly. They also expose capabilities for querying and identifying individual features.
+         * Render and visualize Map Services from ArcGIS Online and ArcGIS Server. L.esri.DynamicMapLayer also supports
+         * custom popups and identification of features.
          *
-         * @param {DynamicMapLayerOptions} options
-         * @returns {DynamicMapLayer}
+         * Map Services are used when its preferable to ask the server to draw layers at a particular location and scale
+         * and pass back the image which was generated on the fly. They also expose capabilities for querying and
+         * identifying individual features.
          */
         function dynamicMapLayer(options: DynamicMapLayerOptions): DynamicMapLayer;
 
         /**
          * Options for FeatureLayer
-         *
-         * @interface FeatureLayerOptions
-         * @extends {LayerOptionsBase}
          */
         interface FeatureLayerOptions extends LayerOptionsBase {
             /**
-             * Function that will be used for creating layers for GeoJSON points. If the option is not specified, simple markers will be created). For point layers, custom panes should be passed through pointToLayer (example here).
-             *
-             * @memberof FeatureLayerOptions
+             * Function that will be used for creating layers for GeoJSON points. If the option is not specified, simple
+             * markers will be created). For point layers, custom panes should be passed through pointToLayer (example here).
              */
             pointToLayer?: (feature: any, latLng: LatLngExpression) => void;
             /**
              * Function that will be used to get style options for vector layers created for GeoJSON features.
-             *
-             * @memberof FeatureLayerOptions
              */
             style?: (feature: any, layer: L.Layer) => void;
             /**
              * 	Provides an opportunity to introspect individual GeoJSON features in the layer.
-             *
-             * @memberof FeatureLayerOptions
              */
             onEachFeature?: (feature: any, layer: L.Layer) => void;
             /**
-             * An optional expression to filter features server side. String values should be denoted using single quotes ie: where: "FIELDNAME = 'field value'"; More information about valid SQL syntax can be found here.
-             *
-             * @type {string}
-             * @memberof FeatureLayerOptions
+             * An optional expression to filter features server side. String values should be denoted using single
+             * quotes ie: where: "FIELDNAME = 'field value'"; More information about valid SQL syntax can be found here.
              */
             where?: string;
             /**
              * Closest zoom level the layer will be displayed on the map. example: maxZoom:19
-             *
-             * @type {number}
-             * @memberof FeatureLayerOptions
              */
             maxZoom?: number;
             /**
              * Furthest zoom level the layer will be displayed on the map. example: minZoom:3
-             *
-             * @type {number}
-             * @memberof FeatureLayerOptions
              */
             minZoom?: number;
             /**
              * Will remove layers from the internal cache when they are removed from the map.
-             *
-             * @type {boolean}
-             * @memberof FeatureLayerOptions
              */
             cacheLayers?: boolean;
             /**
-             * 	An array of fieldnames to pull from the service. Includes all fields by default. You should always specify the name of the unique id for the service. Usually either 'FID' or 'OBJECTID'.
-             *
-             * @type {Array<string>}
-             * @memberof FeatureLayerOptions
+             * 	An array of fieldnames to pull from the service. Includes all fields by default. You should always
+             * 	specify the name of the unique id for the service. Usually either `FID` or `OBJECTID`.
              */
             fields?: string[];
             /**
-             * 	When paired with to defines the time range of features to display. Requires the Feature Layer to be time enabled.
-             *
-             * @type {Date}
-             * @memberof FeatureLayerOptions
+             * 	When paired with to defines the time range of features to display. Requires the Feature Layer to be time
+             * 	enabled.
              */
             from?: Date;
             /**
-             * When paired with from defines the time range of features to display. Requires the Feature Layer to be time enabled.
-             *
-             * @type {Date}
-             * @memberof FeatureLayerOptions
+             * When paired with from defines the time range of features to display. Requires the Feature Layer to be
+             * time enabled.
              */
             to?: Date;
             /**
-             * The name of the field to lookup the time of the feature. Can be an object like {start:'startTime', end:'endTime'} or a string like 'created'.
-             *
-             * @type {*}
-             * @memberof FeatureLayerOptions
+             * The name of the field to lookup the time of the feature. Can be an object like
+             * {start:'startTime', end:'endTime'} or a string like 'created'.
              */
             timeField?: any;
             /**
-             * Determines where features are filtered by time. By default features will be filtered by the server. If set to 'client' all features are requested and filtered by the app before display.
-             *
-             * @type {('server' | 'client')}
-             * @memberof FeatureLayerOptions
+             * Determines where features are filtered by time. By default features will be filtered by the server. If
+             * set to 'client' all features are requested and filtered by the app before display.
              */
             timeFilterMode?: 'server' | 'client';
             /**
-             * 	How much to simplify polygons and polylines. A higher value gives better performance, a lower value gives a more accurate representation.
-             *
-             * @type {number}
-             * @memberof FeatureLayerOptions
+             * 	How much to simplify polygons and polylines. A higher value gives better performance, a lower value
+             * 	gives a more accurate representation.
              */
             simplifyFactor?: number;
             /**
-             * How many digits of precision to request from the server. Wikipedia has a great reference of digit precision to meters.
-             *
-             * @type {number}
-             * @memberof FeatureLayerOptions
+             * How many digits of precision to request from the server. Wikipedia has a great reference of digit
+             * precision to meters.
              */
             precision?: number;
             /**
-             * The vector renderer to use to draw the service. Usually L.svg() is preferable but setting to L.canvas() can have performance benefits for large polygon layers.
-             *
-             * @type {(L.SVG | L.Canvas)}
-             * @memberof FeatureLayerOptions
+             * The vector renderer to use to draw the service. Usually L.svg() is preferable but setting to `L.canvas()`
+             * can have performance benefits for large polygon layers.
              */
             renderer?: L.SVG | L.Canvas;
             /**
-             * Set this to false if your own service supports GeoJSON as an output format but you'd like to ask for Geoservices JSON instead.
-             *
-             * @type {boolean}
-             * @memberof FeatureLayerOptions
+             * Set this to false if your own service supports GeoJSON as an output format but you'd like to ask for
+             * Geoservices JSON instead.
              */
             isModern?: boolean;
             /**
-             * When utilizing esri-leaflet-renderers '2.0.2' or above, this option makes it possible to override the symbology defined by the service itself.
-             *
-             * @type {boolean}
-             * @memberof FeatureLayerOptions
+             * When utilizing esri-leaflet-renderers '2.0.2' or above, this option makes it possible to override the
+             * symbology defined by the service itself.
              */
             ignoreRenderer?: boolean;
         }
@@ -618,221 +419,176 @@ declare module 'leaflet' {
         // TODO: VirtualGrid extends support
 
         /**
-         * L.esri.FeatureLayer is used to visualize, style, query and edit vector geographic data hosted in both ArcGIS Online and published using ArcGIS Server. Copyright text from the service is added to map attribution automatically.
-         * Feature Layers reference an individual data source in either a parent Map Service or Feature Service that can contain multiple layers. You can see a sample Map Service URL below: http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer
-         * This particular service includes two different data sources. The URL for the 'Hurricane Tracks' feature layer will end in a number (representing its position among the other layers). http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer/1
-         * Feature Layer URLs always end in a number (ex: /FeatureServer/{LAYER_ID} or /MapServer/{LAYER_ID}).
-         * You can create a new empty feature service with a single layer on the ArcGIS for Developers website or you can use ArcGIS Online to create a Feature Service from a CSV or Shapefile
-         * L.esri.FeatureLayer divides the current map extent into a grid of individual cells and uses them to fire queries to fetch nearby features. This technique is comparable to MODE_ONDEMAND in the ArcGIS API for JavaScript.
+         * `L.esri.FeatureLayer` is used to visualize, style, query and edit vector geographic data hosted in both
+         * ArcGIS Online and published using ArcGIS Server. Copyright text from the service is added to map attribution
+         * automatically.
          *
-         * @class FeatureLayer
-         * @extends {L.Layer}
+         * Feature Layers reference an individual data source in either a parent Map Service or Feature Service that can
+         * contain multiple layers. You can see a sample Map Service URL below:
+         * http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer
+         *
+         * This particular service includes two different data sources. The URL for the 'Hurricane Tracks' feature layer
+         * will end in a number (representing its position among the other layers).
+         * http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer/1
+         *
+         * Feature Layer URLs always end in a number (ex: /FeatureServer/{LAYER_ID} or /MapServer/{LAYER_ID}).
+         *
+         * You can create a new empty feature service with a single layer on the ArcGIS for Developers website or you
+         * can use ArcGIS Online to create a Feature Service from a CSV or Shapefile
+         *
+         * `L.esri.FeatureLayer` divides the current map extent into a grid of individual cells and uses them to fire
+         * queries to fetch nearby features. This technique is comparable to `MODE_ONDEMAND` in the ArcGIS API for
+         * JavaScript.
          */
         class FeatureLayer extends L.Layer {
             constructor(options: FeatureLayerOptions);
             /**
-             * Sets the given path options to each layer that has a setStyle method. Can also be a Function that will receive a feature argument and should return Path Options
-             * featureLayer.setStyle({ color: 'white' })
-             * featureLayer.setStyle(function(feature){ return { weight: feature.properties.pixelWidth };})
+             * Sets the given path options to each layer that has a setStyle method. Can also be a Function that will
+             * receive a feature argument and should return Path Options
              *
-             * @param {(L.PathOptions | StyleCallback)} style
-             * @returns {this}
-             * @memberof FeatureLayer
+             * `featureLayer.setStyle({ color: 'white' })`
+             * `featureLayer.setStyle(function(feature){ return { weight: feature.properties.pixelWidth };})`
              */
             setStyle(style: L.PathOptions | StyleCallback): this;
             /**
              * Changes the style on a specfic feature.
-             *
-             * @param {(string | number)} id
-             * @param {(L.PathOptions | StyleCallback)} style
-             * @returns {this}
-             * @memberof FeatureLayer
              */
             setFeatureStyle(id: string | number, style: L.PathOptions | StyleCallback): this;
             /**
              * 	Given the ID of a feature, reset that feature to the original style.
-             *
-             * @returns {this}
-             * @memberof FeatureLayer
              */
             resetStyle(): this;
             /**
-             * Calls the passed function against every feature. The function will be passed the layer that represents the feature.
-             * featureLayer.eachFeature(function(layer){ console.log(layer.feature.properties.NAME); });
+             * Calls the passed function against every feature. The function will be passed the layer that represents
+             * the feature.
              *
-             * @param {(feature: any) => void} fn
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof FeatureLayer
+             * featureLayer.eachFeature(function(layer){ console.log(layer.feature.properties.NAME); });
              */
             eachFeature(fn: (feature: any) => void, context?: any): this;
             /**
              * Calls the passed function against every feature that is currently being displayed.
-             *
-             * @param {(feature: any) => void} fn
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof FeatureLayer
              */
             eachActiveFeature(fn: (feature: any) => void, context?: any): this;
             /**
-             * Given the id of a Feature return the layer on the map that represents it. This will usually be a Leaflet vector layer like Polyline or Polygon, or a Leaflet Marker.
-             *
-             * @param {(string | number)} id
-             * @returns {L.Layer}
-             * @memberof FeatureLayer
+             * Given the id of a Feature return the layer on the map that represents it. This will usually be a Leaflet
+             * vector layer like Polyline or Polygon, or a Leaflet Marker.
              */
             getFeature(id: string | number): L.Layer;
             /**
              * Returns the current where setting
-             *
-             * @returns {string}
-             * @memberof FeatureLayer
              */
             getWhere(): string;
             /**
-             * Sets the new where option and refreshes the layer to reflect the new where filter. Accepts an optional callback and function context.
-             *
-             * @param {string} where
-             * @param {FeatureCallbackHandler} [callback]
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof FeatureLayer
+             * Sets the new where option and refreshes the layer to reflect the new where filter. Accepts an optional
+             * callback and function context.
              */
             setWhere(where: string, callback?: FeatureCallbackHandler, context?: any): this;
             /**
              * 	Returns the current time range as an array like [from, to]
-             *
-             * @returns {Date[]}
-             * @memberof FeatureLayer
              */
             getTimeRange(): Date[];
             /**
-             * Sets the current time filter applied to features. An optional callback is run upon completion if timeFilterMode is set to 'server'. Also accepts function context as the last argument.
-             *
-             * @param {Date} from
-             * @param {Date} to
-             * @param {FeatureCallbackHandler} [callback]
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof FeatureLayer
+             * Sets the current time filter applied to features. An optional callback is run upon completion if
+             * timeFilterMode is set to 'server'. Also accepts function context as the last argument.
              */
             setTimeRange(from: Date, to: Date, callback?: FeatureCallbackHandler, context?: any): this;
             /**
              * Adds a new feature to the feature layer. this also adds the feature to the map if creation is successful.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Create capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities.
              *
-             * @param {GeoJSONFeature<GeoJSON.GeometryObject>} feature
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayer
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who
+             * created the service.
+             *
+             * Requires the Create capability be enabled on the service. You can check if creation exists by checking
+             * the metadata of your service under capabilities.
              */
             // TODO: GeoJSONFeature<GeoJSON.GeometryObject>
             addFeature(feature: any, callback?: ResponseCallbackHandler, context?: any): this;
             /**
              * Update the provided feature on the Feature Layer. This also updates the feature on the map.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Update capability be enabled on the service. You can check if this operation exists by checking the metadata of your service under capabilities.
              *
-             * @param {GeoJSONFeature<GeoJSON.GeometryObject>} feature
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayer
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who
+             * created the service.
+             *
+             * Requires the Update capability be enabled on the service. You can check if this operation exists by
+             * checking the metadata of your service under capabilities.
              */
             // TODO: GeoJSONFeature<GeoJSON.GeometryObject>
             updateFeature(feature: any, callback?: ResponseCallbackHandler, context?: any): this;
             /**
-             * 	Remove the feature with the provided id from the feature layer. This will also remove the feature from the map if it exists.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Delete capability be enabled on the service. You can check if this operation exists by checking the metadata of your service under capabilities.
+             * Remove the feature with the provided id from the feature layer. This will also remove the feature from
+             * the map if it exists.
              *
-             * @param {(string | number)} id
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayer
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who
+             * created the service.
+             *
+             * Requires the Delete capability be enabled on the service. You can check if this operation exists by
+             * checking the metadata of your service under capabilities.
              */
             deleteFeature(id: string | number, callback?: ResponseCallbackHandler, context?: any): this;
             /**
-             * Removes an array of features with the provided ids from the feature layer. This will also remove the features from the map if they exist.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Delete capability be enabled on the service. You can check if this operation exists by checking the metadata of your service under capabilities.
+             * Removes an array of features with the provided ids from the feature layer. This will also remove the
+             * features from the map if they exist.
              *
-             * @param {(Array<string | number>)} ids
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayer
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who
+             * created the service.
+             *
+             * Requires the Delete capability be enabled on the service. You can check if this operation exists by
+             * checking the metadata of your service under capabilities.
              */
             deleteFeatures(ids: string[] | number[], callback?: ResponseCallbackHandler, context?: any): this;
             /**
              * Redraws a feature with the provided id from the feature layer.
-             *
-             * @param {(string | number)} id
-             * @returns {this}
-             * @memberof FeatureLayer
              */
             redraw(id: string | number): this;
             /**
-             * 	Redraws all features from the feature layer that exist on the map.
-             *
-             * @returns {this}
-             * @memberof FeatureLayer
+             * Redraws all features from the feature layer that exist on the map.
              */
             refresh(): this;
             /**
              * Authenticates this service with a new token and runs any pending requests that required a token.
-             *
-             * @param {string} token
-             * @returns {this}
-             * @memberof TiledMapLayer
              */
             authenticate(token: string): this;
             /**
              * Requests metadata about this Feature Layer. Callback will be called with error and metadata.
-             *
-             * @param {CallbackHandler} callback
-             * @param {*} context
-             * @returns {this}
-             * @memberof TiledMapLayer
              */
             metadata(callback: CallbackHandler, context?: any): this;
             /**
-             * Returns a new L.esri.services.IdentifyFeatures object that can be used to identify features on this layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof TiledMapLayer
+             * Returns a new `L.esri.services.IdentifyFeatures` object that can be used to identify features on this
+             * layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             identify(): IdentifyFeatures;
             /**
-             * Returns a new L.esri.services.Find object that can be used to find features. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof TiledMapLayer
+             * Returns a new `L.esri.services.Find` object that can be used to find features. Your callback function
+             * will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             find(): Find;
             /**
-             * Returns a new L.esri.Query object that can be used to query this service.
-             *
-             * @returns {*}
-             * @memberof TiledMapLayer
+             * Returns a new `L.esri.Query` object that can be used to query this service.
              */
             query(): Query;
         }
 
         /**
-         * L.esri.FeatureLayer is used to visualize, style, query and edit vector geographic data hosted in both ArcGIS Online and published using ArcGIS Server. Copyright text from the service is added to map attribution automatically.
-         * Feature Layers reference an individual data source in either a parent Map Service or Feature Service that can contain multiple layers. You can see a sample Map Service URL below: http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer
-         * This particular service includes two different data sources. The URL for the 'Hurricane Tracks' feature layer will end in a number (representing its position among the other layers). http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer/1
-         * Feature Layer URLs always end in a number (ex: /FeatureServer/{LAYER_ID} or /MapServer/{LAYER_ID}).
-         * You can create a new empty feature service with a single layer on the ArcGIS for Developers website or you can use ArcGIS Online to create a Feature Service from a CSV or Shapefile
-         * L.esri.FeatureLayer divides the current map extent into a grid of individual cells and uses them to fire queries to fetch nearby features. This technique is comparable to MODE_ONDEMAND in the ArcGIS API for JavaScript.
+         * `L.esri.FeatureLayer` is used to visualize, style, query and edit vector geographic data hosted in both
+         * ArcGIS Online and published using ArcGIS Server. Copyright text from the service is added to map attribution
+         * automatically.
          *
-         * @param {FeatureLayerOptions} options
-         * @returns {FeatureLayer}
+         * Feature Layers reference an individual data source in either a parent Map Service or Feature Service that can
+         * contain multiple layers. You can see a sample Map Service URL below:
+         * http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer
+         *
+         * This particular service includes two different data sources. The URL for the 'Hurricane Tracks' feature layer
+         * will end in a number (representing its position among the other layers).
+         * http://sampleserver6.arcgisonline.com/arcgis/rest/services/Hurricanes/MapServer/1
+         *
+         * Feature Layer URLs always end in a number (ex: /FeatureServer/{LAYER_ID} or /MapServer/{LAYER_ID}).
+         *
+         * You can create a new empty feature service with a single layer on the ArcGIS for Developers website or you
+         * can use ArcGIS Online to create a Feature Service from a CSV or Shapefile
+         *
+         * L.esri.FeatureLayer divides the current map extent into a grid of individual cells and uses them to fire
+         * queries to fetch nearby features. This technique is comparable to MODE_ONDEMAND in the ArcGIS API for
+         * JavaScript.
          */
         function featureLayer(options: FeatureLayerOptions): FeatureLayer;
 
@@ -840,780 +596,511 @@ declare module 'leaflet' {
         type ResponseCallbackHandler = (error?: any, response?: any) => void;
 
         /**
-         * Options for L.esri.Service
-         *
-         * @interface ServiceOptions
+         * Options for `L.esri.Service`
          */
         interface ServiceOptions {
             /**
              * URL of the ArcGIS service you would like to consume.
-             *
-             * @type {string}
-             * @memberof ServiceOptions
              */
             url?: string;
             /**
              * URL of an ArcGIS API for JavaScript proxy or ArcGIS Resource Proxy to use for proxying POST requests.
-             *
-             * @type {string}
-             * @memberof ServiceOptions
              */
             proxy?: string;
             /**
              * If this service should use CORS when making GET requests.
-             *
-             * @type {boolean}
-             * @memberof ServiceOptions
              */
             useCors?: boolean;
             /**
              * Operation timeout
-             *
-             * @type {number}
-             * @memberof ServiceOptions
              */
             timeout?: number;
         }
 
         /**
-         * A generic class representing a hosted resource on ArcGIS Online or ArcGIS Server. This class can be extended to provide support for making requests and serves as a standard for authentication and proxying.
-         *
-         * @class Service
-         * @extends {L.Evented}
+         * A generic class representing a hosted resource on ArcGIS Online or ArcGIS Server. This class can be extended
+         * to provide support for making requests and serves as a standard for authentication and proxying.
          */
         abstract class Service extends L.Evented {
             /**
-             * Makes a GET request to the service. The service's URL will be combined with the path option and parameters will be serialized to a query string. Accepts an optional function context for the callback.
-             *
-             * @param {string} url
-             * @param {*} [params]
-             * @param {CallbackHandler} [callback]
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof Service
+             * Makes a GET request to the service. The service's URL will be combined with the path option and
+             * parameters will be serialized to a query string. Accepts an optional function context for the callback.
              */
             get(url: string, params?: any, callback?: CallbackHandler, context?: any): this;
             /**
-             * Makes a POST request to the service. The service's URL will be combined with the path option and parameters will be serialized. Accepts an optional function context for the callback.
-             *
-             * @param {string} url
-             * @param {*} [params]
-             * @param {CallbackHandler} [callback]
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof Service
+             * Makes a POST request to the service. The service's URL will be combined with the path option and
+             * parameters will be serialized. Accepts an optional function context for the callback.
              */
             post(url: string, params?: any, callback?: CallbackHandler, context?: any): this;
             /**
              * Authenticates this service with a new token and runs any pending requests that required a token.
-             *
-             * @param {string} token
-             * @returns {this}
-             * @memberof TiledMapLayer
              */
             authenticate(token: string): this;
             /**
              * Requests metadata about this Feature Layer. Callback will be called with error and metadata.
-             *
-             * @param {CallbackHandler} callback
-             * @param {*} context
-             * @returns {this}
-             * @memberof TiledMapLayer
              */
             metadata(callback: CallbackHandler, context?: any): this;
         }
 
         /**
          * Options for MapService
-         *
-         * @interface MapServiceOptions
-         * @extends {ServiceOptions}
          */
         interface MapServiceOptions extends ServiceOptions { }
 
         /**
-         * L.esri.MapService is an abstraction for interacting with Map Services running on ArcGIS Online and ArcGIS Server that allows you to make requests to the API, as well as query and identify published features.
-         *
-         * @class MapService
-         * @extends {Service}
+         * `L.esri.MapService` is an abstraction for interacting with Map Services running on ArcGIS Online and ArcGIS
+         * Server that allows you to make requests to the API, as well as query and identify published features.
          */
         class MapService extends Service {
             constructor(options: MapServiceOptions);
             /**
-             * Returns a new L.esri.services.IdentifyFeatures object that can be used to identify features on this layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof MapService
+             * Returns a new `L.esri.services.IdentifyFeatures` object that can be used to identify features on this
+             * layer. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             identify(): IdentifyFeatures;
             /**
-             * Returns a new L.esri.services.Find object that can be used to find features. Your callback function will be passed a GeoJSON FeatureCollection with the results or an error.
-             *
-             * @returns {*}
-             * @memberof MapService
+             * Returns a new `L.esri.services.Find` object that can be used to find features. Your callback function
+             * will be passed a GeoJSON FeatureCollection with the results or an error.
              */
             find(): Find;
             /**
-             * Returns a new L.esri.Query object that can be used to query this service.
-             *
-             * @returns {*}
-             * @memberof MapService
+             * Returns a new `L.esri.Query` object that can be used to query this service.
              */
             query(): Query;
         }
 
         /**
-         * L.esri.MapService is an abstraction for interacting with Map Services running on ArcGIS Online and ArcGIS Server that allows you to make requests to the API, as well as query and identify published features.
-         *
-         * @param {MapServiceOptions} options
-         * @returns {MapService}
+         * `L.esri.MapService` is an abstraction for interacting with Map Services running on ArcGIS Online and ArcGIS
+         * Server that allows you to make requests to the API, as well as query and identify published features.
          */
         function mapService(options: MapServiceOptions): MapService;
 
         /**
          * Options for Task
-         *
-         * @interface TaskOptions
-         * @extends {ServiceOptions}
          */
         interface TaskOptions extends ServiceOptions { }
 
         /**
-         * L.esri.Task is a generic class that provides the foundation for calling operations on ArcGIS Online and ArcGIS Server Services like query, find and identify.
-         *
-         * @class Task
-         * @extends {L.Class}
+         * `L.esri.Task` is a generic class that provides the foundation for calling operations on ArcGIS Online and
+         * ArcGIS Server Services like query, find and identify.
          */
         class Task extends L.Class {
             constructor(options: TaskOptions | Service);
             /**
-             * Makes a request to the associated service. The service's URL will be combined with the path option and parameters will be serialized. Accepts an optional function context for the callback.
-             *
-             * @param {string} url
-             * @param {*} params
-             * @param {*} callback
-             * @param {*} context
-             * @returns {this}
-             * @memberof Task
+             * Makes a request to the associated service. The service's URL will be combined with the path option and
+             * parameters will be serialized. Accepts an optional function context for the callback.
              */
             request(url: string, params?: any, callback?: any, context?: any): this;
             /**
-             * Adds a token to this request if the service requires authentication. Will be added automatically if used with a service.
-             *
-             * @param {string} token
-             * @returns {this}
-             * @memberof Task
+             * Adds a token to this request if the service requires authentication. Will be added automatically if used
+             * with a service.
              */
             token(token: string): this;
 
-            /**
-             *
-             *
-             * @param {boolean} returnUnformattedValues
-             * @returns {this}
-             * @memberof Task
-             */
             format(returnUnformattedValues: boolean): this;
         }
 
         /**
-         * L.esri.Task is a generic class that provides the foundation for calling operations on ArcGIS Online and ArcGIS Server Services like query, find and identify.
-         *
-         * @param {(TaskOptions | Service)} options
-         * @returns {Task}
+         * `L.esri.Task` is a generic class that provides the foundation for calling operations on ArcGIS Online and
+         * ArcGIS Server Services like query, find and identify.
          */
         function task(options: TaskOptions | Service): Task;
 
         /**
          * Options for ImageService
-         *
-         * @interface ImageServiceOptions
-         * @extends {ServiceOptions}
          */
         interface ImageServiceOptions extends ServiceOptions {}
 
         /**
-         * L.esri.ImageService is an abstraction for interacting with Image Services running on ArcGIS Online and ArcGIS Server that allows you to make requests to the API, as well as query and identify features on the service.
-         *
-         * @class ImageService
-         * @extends {Service}
+         * `L.esri.ImageService` is an abstraction for interacting with Image Services running on ArcGIS Online and
+         * ArcGIS Server that allows you to make requests to the API, as well as query and identify features on the
+         * service.
          */
         class ImageService extends Service {
             constructor(options: ImageServiceOptions);
             /**
-             * Returns a new L.esri.Query object that can be used to query this service.
-             *
-             * @returns {this}
-             * @memberof ImageService
+             * Returns a new `L.esri.Query` object that can be used to query this service.
              */
             query(): Query;
         }
 
         /**
-         * L.esri.ImageService is an abstraction for interacting with Image Services running on ArcGIS Online and ArcGIS Server that allows you to make requests to the API, as well as query and identify features on the service.
-         *
-         * @param {ImageServiceOptions} options
-         * @returns {ImageService}
+         * `L.esri.ImageService` is an abstraction for interacting with Image Services running on ArcGIS Online and
+         * ArcGIS Server that allows you to make requests to the API, as well as query and identify features on the
+         * service.
          */
         function imageService(options: ImageServiceOptions): ImageService;
 
         /**
          * Options for FeatureLayerService
-         *
-         * @interface FeatureLayerServiceOptions
-         * @extends {ServiceOptions}
          */
         interface FeatureLayerServiceOptions extends ServiceOptions { }
 
         /**
-         * L.esri.FeatureLayerService is an abstraction for interacting with Feature Layers running on ArcGIS Online and ArcGIS Server that allows you to make requests to the API, as well as query, add, update and remove features from the service.
-         *
-         * @class FeatureLayerService
-         * @extends {Service}
+         * `L.esri.FeatureLayerService` is an abstraction for interacting with Feature Layers running on ArcGIS Online
+         * and ArcGIS Server that allows you to make requests to the API, as well as query, add, update and remove
+         * features from the service.
          */
         class FeatureLayerService extends Service {
             constructor(options: FeatureLayerServiceOptions);
             /**
-             * Returns a new L.esri.Query object that can be used to query this layer.
-             *
-             * @returns {this}
-             * @memberof FeatureLayerService
+             * Returns a new `L.esri.Query` object that can be used to query this layer.
              */
             query(): Query;
             /**
              * Adds a new feature to the feature layer. this also adds the feature to the map if creation is successful.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Create capability be enabled on the service. You can check if creation exists by checking the metadata of your service under capabilities.
              *
-             * @param {GeoJSONFeature<GeoJSON.GeometryObject>} feature
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayerService
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user
+             * who created the service.
+             *
+             * Requires the Create capability be enabled on the service. You can check if creation exists by checking
+             * the metadata of your service under capabilities.
              */
             // TODO: GeoJSONFeature<GeoJSON.GeometryObject>
             addFeature(feature: any, callback?: ResponseCallbackHandler, context?: any): this;
             /**
              * Update the provided feature on the Feature Layer. This also updates the feature on the map.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Update capability be enabled on the service. You can check if this operation exists by checking the metadata of your service under capabilities.
              *
-             * @param {GeoJSONFeature<GeoJSON.GeometryObject>} feature
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayerService
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who
+             * created the service.
+             *
+             * Requires the Update capability be enabled on the service. You can check if this operation exists by
+             * checking the metadata of your service under capabilities.
              */
             // TODO: GeoJSONFeature<GeoJSON.GeometryObject>
             updateFeature(feature: any, callback?: ResponseCallbackHandler, context?: any): this;
             /**
-             * 	Remove the feature with the provided id from the feature layer. This will also remove the feature from the map if it exists.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Delete capability be enabled on the service. You can check if this operation exists by checking the metadata of your service under capabilities.
+             * Remove the feature with the provided id from the feature layer. This will also remove the feature from
+             * the map if it exists.
              *
-             * @param {(string | number)} id
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayerService
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who
+             * created the service.
+             *
+             * Requires the Delete capability be enabled on the service. You can check if this operation exists by
+             * checking the metadata of your service under capabilities.
              */
             deleteFeature(id: string | number, callback?: ResponseCallbackHandler, context?: any): this;
             /**
-             * Removes an array of features with the provided ids from the feature layer. This will also remove the features from the map if they exist.
-             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who created the service.
-             * Requires the Delete capability be enabled on the service. You can check if this operation exists by checking the metadata of your service under capabilities.
+             * Removes an array of features with the provided ids from the feature layer. This will also remove the
+             * features from the map if they exist.
              *
-             * @param {(Array<string | number>)} ids
-             * @param {ResponseCallbackHandler} [callback]
-             * @param {*} context
-             * @returns {this}
-             * @memberof FeatureLayerService
+             * Requires authentication as a user who has permission to edit the service in ArcGIS Online or the user who
+             * created the service.
+             *
+             * Requires the Delete capability be enabled on the service. You can check if this operation exists by
+             * checking the metadata of your service under capabilities.
              */
             deleteFeatures(ids: string[] | number[], callback?: ResponseCallbackHandler, context?: any): this;
         }
 
         /**
-         * L.esri.FeatureLayerService is an abstraction for interacting with Feature Layers running on ArcGIS Online and ArcGIS Server that allows you to make requests to the API, as well as query, add, update and remove features from the service.
-         *
-         * @param {FeatureLayerServiceOptions} options
-         * @returns {FeatureLayerService}
+         * `L.esri.FeatureLayerService` is an abstraction for interacting with Feature Layers running on ArcGIS Online
+         * and ArcGIS Server that allows you to make requests to the API, as well as query, add, update and remove
+         * features from the service.
          */
         function featureLayerService(options: FeatureLayerServiceOptions): FeatureLayerService;
 
         /**
          * Options for Query
-         *
-         * @interface QueryOptions
-         * @extends {TaskOptions}
          */
         interface QueryOptions extends TaskOptions { }
 
         /**
-         * L.esri.Query is an abstraction for the query API included in Feature Layers and Image Services. It provides a chainable API for building request parameters and executing queries.
-         * Note Depending on the type of service you are querying (Feature Layer, Map Service, Image Service) and the version of ArcGIS Server that hosts the service some of these options may not be available.
+         * `L.esri.Query` is an abstraction for the query API included in Feature Layers and Image Services. It provides
+         * a chainable API for building request parameters and executing queries.
          *
-         * @class Query
-         * @extends {Task}
+         * Note Depending on the type of service you are querying (Feature Layer, Map Service, Image Service) and the
+         * version of ArcGIS Server that hosts the service some of these options may not be available.
          */
         class Query extends Task {
             constructor(options: QueryOptions);
             /**
-             * Queries features from the service within (fully contained by) the passed geometry object. geometry can be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLng, L.LatLngBounds and L.GeoJSON. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point, Polyline, Polygon.
-             *
-             * @param {Geometry} geometry
-             * @returns {this}
-             * @memberof Query
+             * Queries features from the service within (fully contained by) the passed geometry object. geometry can be
+             * an instance of `L.Marker`, `L.Polygon`, `L.Polyline`, `L.LatLng`, `L.LatLngBounds` and `L.GeoJSON`. It
+             * can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing
+             * Point, Polyline, Polygon.
              */
             within(geometry: Geometry): this;
             /**
-             * Queries features from the service that fully contain the passed geometry object. geometry can be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLng, L.LatLngBounds and L.GeoJSON. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point, Polyline, Polygon.
-             *
-             * @param {Geometry} geometry
-             * @returns {this}
-             * @memberof Query
+             * Queries features from the service that fully contain the passed geometry object. geometry can be an
+             * instance of `L.Marker`, `L.Polygon`, `L.Polyline`, `L.LatLng`, `L.LatLngBounds` and `L.GeoJSON`. It can
+             * also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point,
+             * Polyline, Polygon.
              */
             contains(geometry: Geometry): this;
             /**
-             * Queries features from the service that intersect (touch anywhere) the passed geometry object. geometry can be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLng, L.LatLngBounds and L.GeoJSON. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point, Polyline, Polygon.
-             *
-             * @param {Geometry} geometry
-             * @returns {this}
-             * @memberof Query
+             * Queries features from the service that intersect (touch anywhere) the passed geometry object. geometry
+             * can be an instance of `L.Marker`, `L.Polygon`, `L.Polyline`, `L.LatLng`, `L.LatLngBounds` and
+             * `L.GeoJSON`. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature
+             * objects containing Point, Polyline, Polygon.
              */
             intersects(geometry: Geometry): this;
             /**
-             * Queries features from the service that have a bounding box that intersects the bounding box of the passed geometry object. geometry can be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLng, L.LatLngBounds and L.GeoJSON. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point, Polyline, Polygon.
-             *
-             * @param {Geometry} geometry
-             * @returns {this}
-             * @memberof Query
+             * Queries features from the service that have a bounding box that intersects the bounding box of the passed
+             * geometry object. geometry can be an instance of `L.Marker`, `L.Polygon`, `L.Polyline`, `L.LatLng`,
+             * `L.LatLngBounds` and `L.GeoJSON`. It can also accept valid GeoJSON Point, Polyline, Polygon objects and
+             * GeoJSON Feature objects containing Point, Polyline, Polygon.
              */
             bboxIntersects(geometry: Geometry): this;
             /**
-             * Queries features from the service that overlap (touch but are not fully contained by) the passed geometry object. geometry can be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLng, L.LatLngBounds and L.GeoJSON. It can also accept valid GeoJSON Point, Polyline, Polygon objects and GeoJSON Feature objects containing Point, Polyline, Polygon.
-             *
-             * @param {Geometry} geometry
-             * @returns {this}
-             * @memberof Query
+             * Queries features from the service that overlap (touch but are not fully contained by) the passed geometry
+             * object. geometry can be an instance of `L.Marker`, `L.Polygon`, `L.Polyline`, `L.LatLng`,
+             * `L.LatLngBounds` and `L.GeoJSON`. It can also accept valid GeoJSON Point, Polyline, Polygon objects and
+             * GeoJSON Feature objects containing Point, Polyline, Polygon.
              */
             overlap(geometry: Geometry): this;
             /**
              * Queries features a given distance in meters around a LatLng.
-             * Only available for Feature Layers hosted on ArcGIS Online or ArcGIS Server 10.3 that include the capability supportQueryWithDistance.
              *
-             * @param {L.LatLng} latlng
-             * @param {number} distance
-             * @returns {this}
-             * @memberof Query
+             * Only available for Feature Layers hosted on ArcGIS Online or ArcGIS Server 10.3 that include the
+             * capability supportQueryWithDistance.
              */
             nearby(latlng: L.LatLng, distance: number): this;
             /**
-             * 	Adds a where clause to the query. String values should be denoted using single quotes ie: query.where("FIELDNAME = 'field value'"); More info about valid SQL can be found here.
+             * Adds a where clause to the query. String values should be denoted using single quotes ie:
              *
-             * @param {string} where
-             * @returns {this}
-             * @memberof Query
+             * `query.where("FIELDNAME = 'field value'");`
+             *
+             * More info about valid SQL can be found here.
              */
             where(where: string): this;
             /**
              * Define the offset of the results, when combined with limit can be used for paging.
-             * Only available for Feature Layers hosted on ArcGIS Online or ArcGIS Server 10.3.
              *
-             * @param {number} offset
-             * @returns {this}
-             * @memberof Query
+             * Only available for Feature Layers hosted on ArcGIS Online or ArcGIS Server 10.3.
              */
             offset(offset: number): this;
             /**
              * Limit the number of results returned by this query, when combined with offset can be used for paging.
-             * Only available for Feature Layers hosted on ArcGIS Online or ArcGIS Server 10.3.
              *
-             * @param {number} limit
-             * @returns {this}
-             * @memberof Query
+             * Only available for Feature Layers hosted on ArcGIS Online or ArcGIS Server 10.3.
              */
             limit(limit: number): this;
             /**
-             * Queries features within a given time range. Only available for Layers/Services with timeInfo in their metadata.
-             *
-             * @param {Date} from
-             * @param {Date} to
-             * @returns {this}
-             * @memberof Query
+             * Queries features within a given time range. Only available for Layers/Services with timeInfo in their
+             * metadata.
              */
             between(from: Date, to: Date): this;
             /**
              * An array of associated fields to request for each feature.
-             *
-             * @param {(string | Array<string>)} fields
-             * @returns {this}
-             * @memberof Query
              */
             fields(fields: string | string[]): this;
             /**
              * Return geometry with results. Default is true.
-             *
-             * @param {boolean} returnGeometry
-             * @returns {this}
-             * @memberof Query
              */
             returnGeometry(returnGeometry: boolean): this;
             /**
-             * Simplify the geometries of the output features for the current map view. the factor parameter controls the amount of simplification between 0 (no simplification) and 1 (the most basic shape possible).
-             *
-             * @param {L.Map} map
-             * @param {number} factor
-             * @returns {this}
-             * @memberof Query
+             * Simplify the geometries of the output features for the current map view. the factor parameter controls
+             * the amount of simplification between 0 (no simplification) and 1 (the most basic shape possible).
              */
             simplify(map: L.Map, factor: number): this;
             /**
-             * Sort output features using values from an individual field. "ASC" (ascending) is the default sort order, but "DESC" can be passed as an alternative. This method can be called more than once to apply advanced sorting.
-             *
-             * @param {string} fieldName
-             * @param {string} order
-             * @returns {this}
-             * @memberof Query
+             * Sort output features using values from an individual field. "ASC" (ascending) is the default sort order,
+             * but "DESC" can be passed as an alternative. This method can be called more than once to apply advanced
+             * sorting.
              */
             orderBy(fieldName: string, order: string): this;
             /**
              * Return only specific feature IDs if they match other query parameters.
-             *
-             * @param {Array<any>} ids
-             * @returns {this}
-             * @memberof Query
              */
             featureIds(ids: any[]): this;
             /**
              * Return only this many decimal points of precision in the output geometries.
-             *
-             * @param {number} precision
-             * @returns {this}
-             * @memberof Query
              */
             precision(precision: number): this;
             /**
              * Used to select which layer inside a Map Service to perform the query on.
-             * Only available for Map Services.
              *
-             * @param {(number | string)} layer
-             * @returns {this}
-             * @memberof Query
+             * Only available for Map Services.
              */
             layer(layer: number | string): this;
             /**
              * Override the default pixelSize when querying an Image Service.
-             * Only available for Image Services.
              *
-             * @param {L.Point} point
-             * @returns {this}
-             * @memberof Query
+             * Only available for Image Services.
              */
             pixelSize(point: L.Point): this;
             /**
-             * Exectues the query request with the current parameters, features will be passed to callback as a GeoJSON FeatureCollection. Accepts an optional function context.
-             *
-             * @param {FeatureCallbackHandler} callback
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof Query
+             * Executes the query request with the current parameters, features will be passed to callback as a GeoJSON
+             * FeatureCollection. Accepts an optional function context.
              */
             run(callback: FeatureCallbackHandler, context?: any): this;
             /**
-             * Exectues the query request with the current parameters, passing only the number of features matching the query to callback as an Integer. Accepts an optional function context.
-             *
-             * @param {FeatureCallbackHandler} callback
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof Query
+             * Executes the query request with the current parameters, passing only the number of features matching the
+             * query to callback as an Integer. Accepts an optional function context.
              */
             count(callback: FeatureCallbackHandler, context?: any): this;
             /**
-             * Exectues the query request with the current parameters, passing only an array of the feature ids matching the query to callbackcallback. Accepts an optional function context.
-             *
-             * @param {FeatureCallbackHandler} callback
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof Query
+             * Executes the query request with the current parameters, passing only an array of the feature ids matching
+             * the query to callbackcallback. Accepts an optional function context.
              */
             ids(callback: FeatureCallbackHandler, context?: any): this;
             /**
-             * Executes the query request with the current parameters, passing only the LatLngBounds of all features matching the query in the callback. Accepts an optional function context. Only available for Feature Layers hosted on ArcGIS Online or ArcGIS Server 10.3.1.
-             *
-             * @param {FeatureCallbackHandler} callback
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof Query
+             * Executes the query request with the current parameters, passing only the LatLngBounds of all features
+             * matching the query in the callback. Accepts an optional function context. Only available for Feature
+             * Layers hosted on ArcGIS Online or ArcGIS Server 10.3.1.
              */
             bounds(callback: FeatureCallbackHandler, context?: any): this;
             /**
              * The WKID of a datum transformation for the server to apply when reprojecting output features.
-             *
-             * @param {SpatialReferenceExpression} datumTranformation
-             * @returns {this}
-             * @memberof Query
              */
             transform(datumTranformation: SpatialReferenceExpression): this;
         }
 
         /**
-         * L.esri.Query is an abstraction for the query API included in Feature Layers and Image Services. It provides a chainable API for building request parameters and executing queries.
-         * Note Depending on the type of service you are querying (Feature Layer, Map Service, Image Service) and the version of ArcGIS Server that hosts the service some of these options may not be available.
+         * `L.esri.Query` is an abstraction for the query API included in Feature Layers and Image Services. It provides
+         * a chainable API for building request parameters and executing queries.
          *
-         * @param {QueryOptions} options
-         * @returns {Query}
+         * Note Depending on the type of service you are querying (Feature Layer, Map Service, Image Service) and the
+         * version of ArcGIS Server that hosts the service some of these options may not be available.
          */
         function query(options: QueryOptions): Query;
 
         /**
          * Options for IdentifyFeatures
-         *
-         * @interface IdentifyFeaturesOptions
-         * @extends {ServiceOptions}
          */
         interface IdentifyFeaturesOptions extends ServiceOptions { }
 
         /**
-         * L.esri.IdentifyFeatures is an abstraction for the Identify API found in Map Services. It provides a chainable API for building request parameters and executing the request.
-         *
-         * @class IdentifyFeatures
-         * @extends {Task}
+         * `L.esri.IdentifyFeatures` is an abstraction for the Identify API found in Map Services. It provides a
+         * chainable API for building request parameters and executing the request.
          */
         class IdentifyFeatures extends Task {
             constructor(options: IdentifyFeaturesOptions | ImageService);
             /**
              * The map to identify features on.
-             *
-             * @param {L.Map} map
-             * @returns {this}
-             * @memberof IdentifyFeatures
              */
             on(map: L.Map): this;
             /**
-             * Identifies features at a given LatLng geometry can also be an instance of L.Marker, L.Polygon, L.Polyline, L.LatLngBounds, L.GeoJSON or a valid GeoJSON object literal.
-             *
-             * @param {Geometry} geometry
-             * @returns {this}
-             * @memberof IdentifyFeatures
+             * Identifies features at a given LatLng geometry can also be an instance of `L.Marker`, `L.Polygon`,
+             * `L.Polyline`, `L.LatLngBounds`, `L.GeoJSON` or a valid GeoJSON object literal.
              */
             at(geometry: Geometry): this;
             /**
              * Add a layer definition to the query.
-             *
-             * @param {number} id
-             * @param {string} where
-             * @returns {this}
-             * @memberof IdentifyFeatures
              */
             layerDef(id: number, where: string): this;
             /**
              * Identifies features within a given time range.
-             *
-             * @param {Date} from
-             * @param {Date} to
-             * @returns {this}
-             * @memberof IdentifyFeatures
              */
             between(from: Date, to: Date): this;
             /**
-             * By default, only the topmost feature will be identified, but it is possible to specify both an alternative strategy and array of individual layers. See the REST API documentation for more information about valid combinations.
-             * ex: .layers('all:0').
+             * By default, only the topmost feature will be identified, but it is possible to specify both an
+             * alternative strategy and array of individual layers. See the REST API documentation for more information
+             * about valid combinations.
              *
-             * @param {string} layers
-             * @returns {this}
-             * @memberof IdentifyFeatures
+             * ex: `.layers('all:0')`.
              */
             layers(layers: string | string[]): this;
             /**
              * Return only this many decimal points of precision in the output geometries.
-             *
-             * @param {number} precision
-             * @returns {this}
-             * @memberof IdentifyFeatures
              */
             precision(precision: number): this;
             /**
              * Buffer the identify area by a given number of screen pixels.
-             *
-             * @param {number} precision
-             * @returns {this}
-             * @memberof IdentifyFeatures
              */
             tolerance(precision: number): this;
             /**
              * Return geometry with results. Default is true.
-             *
-             * @param {boolean} returnGeometry
-             * @returns {this}
-             * @memberof IdentifyFeatures
              */
             returnGeometry(returnGeometry: boolean): this;
             /**
-             * 	Simplify the geometries of the output features for the current map view. the factor parameter controls the amount of simplification between 0 (no simplification) and 1 (the most basic shape possible).
-             *
-             * @param {L.Map} map
-             * @param {number} factor
-             * @returns {this}
-             * @memberof IdentifyFeatures
+             * Simplify the geometries of the output features for the current map view. the factor parameter controls
+             * the amount of simplification between `0` (no simplification) and `1` (the most basic shape possible).
              */
             simplify(map: L.Map, factor: number): this;
             /**
-             * Executes the identify request with the current parameters, identified features will be passed to callback as a GeoJSON FeatureCollection. Accepts an optional function context
-             *
-             * @param {FeatureCallbackHandler} callback
-             * @param {*} context
-             * @returns {this}
-             * @memberof IdentifyFeatures
+             * Executes the identify request with the current parameters, identified features will be passed to callback
+             * as a GeoJSON FeatureCollection. Accepts an optional function context
              */
             run(callback: FeatureCallbackHandler, context?: any): this;
         }
 
         /**
-         * L.esri.IdentifyFeatures is an abstraction for the Identify API found in Map Services. It provides a chainable API for building request parameters and executing the request.
-         *
-         * @param {(IdentifyFeaturesOptions | ImageService)} options
-         * @returns {IdentifyFeatures}
+         * `L.esri.IdentifyFeatures` is an abstraction for the Identify API found in Map Services. It provides a
+         * chainable API for building request parameters and executing the request.
          */
         function identifyFeatures(options: IdentifyFeaturesOptions | ImageService): IdentifyFeatures;
 
         /**
          * Options for Find Task
-         *
-         * @interface FindOptions
-         * @extends {ServiceOptions}
          */
         interface FindOptions extends ServiceOptions { }
 
         /**
-         * L.esri.Find is an abstraction for the find API included in Map Services. It provides a chainable API for building request parameters and executing find tasks.
-         *
-         * @class Find
-         * @extends {Task}
+         * `L.esri.Find` is an abstraction for the find API included in Map Services. It provides a chainable API for
+         * building request parameters and executing find tasks.
          */
         class Find extends Task {
             constructor(options: FindOptions | MapService);
             /**
              * Text that is searched across the layers and fields the user specifies.
-             *
-             * @param {string} text
-             * @returns {this}
-             * @memberof Find
              */
             text(text: string): this;
             /**
-             * When true find task will search for a value that contains the searchText. When false it will do an exact match on the searchText string. Default is true.
-             *
-             * @param {boolean} contains
-             * @returns {this}
-             * @memberof Find
+             * When true find task will search for a value that contains the searchText. When false it will do an exact
+             * match on the searchText string. Default is true.
              */
             contains(contains: boolean): this;
             /**
              * 	An array or comma-separated list of field names to search. If not specified, all fields are searched.
-             *
-             * @param {(string | Array<string>)} fields
-             * @returns {this}
-             * @memberof Find
              */
             fields(fields: string | string[]): this;
             /**
              * 	The well known ID (ex. 4326) for the results.
-             *
-             * @param {number} sr
-             * @returns {this}
-             * @memberof Find
              */
             spatialReference(sr: number): this;
             /**
              * 	Add a layer definition to the find task.
-             *
-             * @param {number} id
-             * @param {string} where
-             * @returns {this}
-             * @memberof Find
              */
             layerDef(id: number, where: string): this;
             /**
              * 	Layers to perform find task on. Accepts an array of layer IDs or comma-separated list.
-             *
-             * @param {(string | Array<string>)} layers
-             * @returns {this}
-             * @memberof Find
              */
             layers(layers: string | string[]): this;
             /**
              * Return geometry with results. Default is true.
-             *
-             * @param {boolean} returnGeometry
-             * @returns {this}
-             * @memberof Find
              */
             returnGeometry(returnGeometry: boolean): this;
             /**
              * Specifies the maximum allowable offset to be used for generalizing geometries returned by the find task.
-             *
-             * @param {number} maxAllowableOffset
-             * @returns {this}
-             * @memberof Find
              */
             maxAllowableOffset(maxAllowableOffset: number): this;
             /**
              * Specifies the number of decimal places in returned geometries.
-             *
-             * @param {number} precision
-             * @returns {this}
-             * @memberof Find
              */
             precision(precision: number): this;
             /**
-             * Include Z values in the results. Default value is true. This parameter only applies if returnGeometry=true.
-             *
-             * @param {boolean} returnZ
-             * @returns {this}
-             * @memberof Find
+             * Include Z values in the results. Default value is true. This parameter only applies if
+             * `returnGeometry=true`.
              */
             returnZ(returnZ: boolean): this;
             /**
-             * Includes M values if the features have them. Default value is false. This parameter only applies if returnGeometry=true.
-             *
-             * @param {boolean} returnM
-             * @returns {this}
-             * @memberof Find
+             * Includes M values if the features have them. Default value is false. This parameter only applies if
+             * `returnGeometry=true`.
              */
             returnM(returnM: boolean): this;
             /**
-             * Property used for adding new layers or modifying the data source of existing ones in the current map service.
-             *
-             * @param {*} dynamicLayers
-             * @returns {this}
-             * @memberof Find
+             * Property used for adding new layers or modifying the data source of existing ones in the current map
+             * service.
              */
             dynamicLayers(dynamicLayers: any): this;
             /**
-             * Simplify the geometries of the output features for the current map view. the factor parameter controls the amount of simplification between 0 (no simplification) and 1 (simplify to the most basic shape possible).
-             *
-             * @param {L.Map} map
-             * @param {number} factor
-             * @returns {this}
-             * @memberof Find
+             * Simplify the geometries of the output features for the current map view. the factor parameter controls
+             * the amount of simplification between `0` (no simplification) and `1`
+             * (simplify to the most basic shape possible).
              */
             simplify(map: L.Map, factor: number): this;
             /**
-             * 	Exectues the find request with the current parameters, features will be passed to callback as a GeoJSON FeatureCollection. Accepts an optional function context.
-             *
-             * @param {FeatureCallbackHandler} callback
-             * @param {*} [context]
-             * @returns {this}
-             * @memberof Find
+             * Executes the find request with the current parameters, features will be passed to callback as a GeoJSON
+             * FeatureCollection. Accepts an optional function context.
              */
             run(callback: FeatureCallbackHandler, context?: any): this;
         }
 
         /**
-         * L.esri.Find is an abstraction for the find API included in Map Services. It provides a chainable API for building request parameters and executing find tasks.
-         *
-         * @param {(FindOptions | MapService)} options
-         * @returns {Find}
+         * L.esri.Find is an abstraction for the find API included in Map Services. It provides a chainable API for
+         * building request parameters and executing find tasks.
          */
         function find(options: FindOptions | MapService): Find;
     }
diff --git a/types/estraverse/tslint.json b/types/estraverse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/estraverse/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/estree/estree-tests.ts b/types/estree/estree-tests.ts
index ac2516f18b..5cd065d03f 100644
--- a/types/estree/estree-tests.ts
+++ b/types/estree/estree-tests.ts
@@ -273,9 +273,6 @@ switch (node.type) {
   case 'Program':
     program = node;
     break;
-  case 'FunctionDeclaration':
-    functionDeclaration = node
-    break;
   case 'FunctionExpression':
     functionExpression = node
     break;
@@ -367,18 +364,12 @@ switch (node.type) {
   case 'ObjectExpression':
     objectExpression = node;
     break;
-  case 'FunctionExpression':
-    functionExpression = node;
-    break;
   case 'ArrowFunctionExpression':
     arrowFunctionExpression = node;
     break;
   case 'YieldExpression':
     yieldExpression = node;
     break;
-  case 'Literal':
-    literal = node;
-    break;
   case 'UnaryExpression':
     unaryExpression = node;
     break;
@@ -421,9 +412,6 @@ switch (node.type) {
   case 'MetaProperty':
     metaProperty = node;
     break;
-  case 'Identifier':
-    identifier = node;
-    break;
   case 'AwaitExpression':
     awaitExpression = node;
     break;
@@ -443,9 +431,6 @@ switch (node.type) {
     break;
 
   // narrowing of Pattern
-  case 'Identifier':
-    identifier = node;
-    break;
   case 'ObjectPattern':
     objectPattern = node;
     break;
@@ -458,20 +443,11 @@ switch (node.type) {
   case 'AssignmentPattern':
     assignmentPattern = node;
     break;
-  case 'MemberExpression':
-    memberExpression = node;
-    break;
   // end narrowing of Pattern
 
   case 'ClassBody':
     classBody = node
     break;
-  case 'ClassDeclaration':
-    classDeclaration = node
-    break;
-  case 'ClassExpression':
-    classExpression = node
-    break;
   case 'MethodDefinition':
     methodDefinition = node
     break;
diff --git a/types/estree/index.d.ts b/types/estree/index.d.ts
index 23c5b19f86..068cbfd8ce 100644
--- a/types/estree/index.d.ts
+++ b/types/estree/index.d.ts
@@ -21,23 +21,28 @@
 // but it has the notable advantage of making ESTree much easier to use as
 // an end user.
 
-interface BaseNode {
+interface BaseNodeWithoutComments {
   // Every leaf interface that extends BaseNode must specify a type property.
   // The type property should be a string literal. For example, Identifier
   // has: `type: "Identifier"`
-
-  leadingComments?: Array<Comment>;
-  trailingComments?: Array<Comment>;
+  type: string;
   loc?: SourceLocation | null;
   range?: [number, number];
 }
+
+interface BaseNode extends BaseNodeWithoutComments {
+  leadingComments?: Array<Comment>;
+  trailingComments?: Array<Comment>;
+}
+
 export type Node =
     Identifier | Literal | Program | Function | SwitchCase | CatchClause |
     VariableDeclarator | Statement | Expression | Property |
     AssignmentProperty | Super | TemplateElement | SpreadElement | Pattern |
     ClassBody | Class | MethodDefinition | ModuleDeclaration | ModuleSpecifier;
 
-export interface Comment {
+export interface Comment extends BaseNodeWithoutComments {
+  type: "Line" | "Block";
   value: string;
 }
 
@@ -74,13 +79,13 @@ interface BaseFunction extends BaseNode {
 export type Function =
     FunctionDeclaration | FunctionExpression | ArrowFunctionExpression;
 
-
 export type Statement =
     ExpressionStatement | BlockStatement | EmptyStatement |
     DebuggerStatement | WithStatement | ReturnStatement | LabeledStatement |
     BreakStatement | ContinueStatement | IfStatement | SwitchStatement |
     ThrowStatement | TryStatement | WhileStatement | DoWhileStatement |
     ForStatement | ForInStatement | ForOfStatement | Declaration;
+
 interface BaseStatement extends BaseNode { }
 
 export interface EmptyStatement extends BaseStatement {
@@ -186,6 +191,7 @@ export interface DebuggerStatement extends BaseStatement {
 
 export type Declaration =
       FunctionDeclaration | VariableDeclaration | ClassDeclaration;
+
 interface BaseDeclaration extends BaseStatement { }
 
 export interface FunctionDeclaration extends BaseFunction, BaseDeclaration {
@@ -214,6 +220,7 @@ type Expression =
     CallExpression | NewExpression | SequenceExpression | TemplateLiteral |
     TaggedTemplateExpression | ClassExpression | MetaProperty | Identifier |
     AwaitExpression;
+
 export interface BaseExpression extends BaseNode { }
 
 export interface ThisExpression extends BaseExpression {
@@ -254,7 +261,7 @@ export interface SequenceExpression extends BaseExpression {
 export interface UnaryExpression extends BaseExpression {
   type: "UnaryExpression";
   operator: UnaryOperator;
-  prefix: boolean;
+  prefix: true;
   argument: Expression;
 }
 
@@ -317,6 +324,7 @@ export interface MemberExpression extends BaseExpression, BasePattern {
 export type Pattern =
     Identifier | ObjectPattern | ArrayPattern | RestElement |
     AssignmentPattern | MemberExpression;
+
 interface BasePattern extends BaseNode { }
 
 export interface SwitchCase extends BaseNode {
@@ -341,17 +349,17 @@ export type Literal = SimpleLiteral | RegExpLiteral;
 export interface SimpleLiteral extends BaseNode, BaseExpression {
   type: "Literal";
   value: string | boolean | number | null;
-  raw: string;
+  raw?: string;
 }
 
 export interface RegExpLiteral extends BaseNode, BaseExpression {
   type: "Literal";
-  value: RegExp;
+  value?: RegExp | null;
   regex: {
     pattern: string;
     flags: string;
   };
-  raw: string;
+  raw?: string;
 }
 
 export type UnaryOperator =
diff --git a/types/estree/tslint.json b/types/estree/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/estree/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/evaporate/tslint.json b/types/evaporate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/evaporate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/event-kit/README.md b/types/event-kit/README.md
deleted file mode 100644
index 90835ef13e..0000000000
--- a/types/event-kit/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## Event Kit Type Definitions
-
-TypeScript type definitions for [event-kit](https://github.com/atom/event-kit), which is published [under the same name](https://www.npmjs.com/package/event-kit) on NPM.
-
-### Usage Notes
-
-#### Exports
-
-The three classes exported from this module are: [CompositeDisposable](https://github.com/atom/event-kit/blob/master/src/composite-disposable.coffee), [Disposable](https://github.com/atom/event-kit/blob/master/src/disposable.coffee), and [Emitter](https://github.com/atom/event-kit/blob/master/src/emitter.coffee).
-
-```ts
-import { CompositeDisposable, Disposable, Emitter } from "event-kit";
-let subscriptions = new CompositeDisposable();
-```
-
-#### The EventKit Namespace
-
-All types used by "event-kit" can be referenced from the EventKit namespace.
-
-```ts
-function example(disposable: EventKit.DisposableLike) {}
-```
diff --git a/types/event-kit/event-kit-tests.ts b/types/event-kit/event-kit-tests.ts
index 0cc6028fd6..8ff96d66e8 100644
--- a/types/event-kit/event-kit-tests.ts
+++ b/types/event-kit/event-kit-tests.ts
@@ -1,34 +1,34 @@
 import { Disposable, CompositeDisposable, Emitter } from "event-kit";
 
 declare let bool: boolean;
-declare let subscription: EventKit.Disposable;
-declare let subscriptions: EventKit.CompositeDisposable;
-declare let emitter: EventKit.Emitter;
+declare let subscription: Disposable;
+declare let subscriptions: CompositeDisposable;
+declare let emitter: Emitter;
 
 // NPM Usage Tests ============================================================
 class User {
-	private readonly emitter: EventKit.Emitter;
-	name: string;
+    private readonly emitter: Emitter;
+    name: string;
 
-	constructor() {
-		this.emitter = new Emitter();
-	}
+    constructor() {
+        this.emitter = new Emitter();
+    }
 
-	onDidChangeName(callback: (value: string) => void) {
-		return this.emitter.on("did-change-name", callback);
-	}
+    onDidChangeName(callback: (value: string) => void) {
+        return this.emitter.on("did-change-name", callback);
+    }
 
-	setName(name: string) {
-		if (name !== this.name) {
-			this.name = name;
-			this.emitter.emit("did-change-name", name);
-		}
-		return name;
-	}
+    setName(name: string) {
+        if (name !== this.name) {
+            this.name = name;
+            this.emitter.emit("did-change-name", name);
+        }
+        return name;
+    }
 
-	destroy() {
-		this.emitter.dispose();
-	}
+    destroy() {
+        this.emitter.dispose();
+    }
 }
 
 const user = new User();
@@ -55,8 +55,8 @@ subscriptions.dispose();
 // Managing Disposables
 subscriptions.add(subscription);
 subscriptions.add(
-	subscription,
-	{ dispose() {} }
+    subscription,
+    { dispose() {} }
 );
 
 subscriptions.remove(subscription);
@@ -81,3 +81,8 @@ subscription = emitter.preempt("test-event", value => {});
 // Event Emission
 emitter.emit("test-event");
 emitter.emit("test-event", 42);
+
+async function testEmitAsync() {
+    await emitter.emitAsync("test-event");
+    await emitter.emitAsync("test-event", 42);
+}
diff --git a/types/event-kit/index.d.ts b/types/event-kit/index.d.ts
index 0df33472b1..2208ffaae3 100644
--- a/types/event-kit/index.d.ts
+++ b/types/event-kit/index.d.ts
@@ -2,129 +2,112 @@
 // Project: https://github.com/atom/event-kit
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
-declare global {
-	namespace EventKit {
-		/** The static side to each exported class. Should generally only be used internally. */
-		namespace Statics {
-			/* tslint:disable:no-unnecessary-qualifier */
-			/** The static side to the Disposable class. */
-			interface Disposable {
-				/** Ensure that Object correctly implements the Disposable contract. */
-				isDisposable(object: object): boolean;
-
-				/** Construct a Disposable. */
-				new (disposableAction?: () => void): EventKit.Disposable;
-			}
-
-			/** The static side to the CompositeDisposable class. */
-			interface CompositeDisposable {
-				/** Construct an instance, optionally with one or more disposables. */
-				new (...disposables: DisposableLike[]): EventKit.CompositeDisposable;
-			}
-
-			/** The static side to the Emitter class. */
-			interface Emitter {
-				/** Construct an emitter. */
-				new (): EventKit.Emitter;
-			}
-			/* tslint:enable:no-unnecessary-qualifier */
-		}
-
-		interface DisposableLike {
-			dispose(): void;
-		}
-
-		/** A handle to a resource that can be disposed. */
-		interface Disposable extends DisposableLike {
-			disposed: boolean;
-
-			/** A callback which will be called within dispose(). */
-			disposalAction?(): void;
-
-			/** Perform the disposal action, indicating that the resource associated
-			 *  with this disposable is no longer needed.
-			 */
-			dispose(): void;
-		}
-
-		/** An object that aggregates multiple Disposable instances together into a
-		 *  single disposable, so they can all be disposed as a group.
-		 */
-		interface CompositeDisposable extends DisposableLike {
-			disposed: boolean;
-
-			/** Dispose all disposables added to this composite disposable.
-			 *  If this object has already been disposed, this method has no effect.
-			 */
-			dispose(): void;
-
-			// Managing Disposables
-			/** Add disposables to be disposed when the composite is disposed.
-			 *  If this object has already been disposed, this method has no effect.
-			 */
-			add(...disposables: DisposableLike[]): void;
-
-			/** Remove a previously added disposable. */
-			remove(disposable: DisposableLike): void;
-
-			/** Alias to CompositeDisposable::remove. */
-			delete(disposable: DisposableLike): void;
-
-			/** Clear all disposables. They will not be disposed by the next call to
-			 *  dispose.
-			 */
-			clear(): void;
-		}
-
-		/** Utility class to be used when implementing event-based APIs that allows
-		 *  for handlers registered via ::on to be invoked with calls to ::emit.
-		 */
-		interface Emitter extends DisposableLike {
-			disposed: boolean;
-
-			/** Clear out any existing subscribers. */
-			clear(): void;
-
-			/** Unsubscribe all handlers. */
-			dispose(): boolean;
-
-			// Event Subscription
-			/** Registers a handler to be invoked whenever the given event is emitted. */
-			// tslint:disable-next-line:no-any
-			on(eventName: string, handler: (value: any) => void): Disposable;
-
-			/** Register the given handler function to be invoked the next time an event
-			 *  with the given name is emitted via ::emit.
-			 */
-			// tslint:disable-next-line:no-any
-			once(eventName: string, handler: (value: any) => void): Disposable;
-
-			/** Register the given handler function to be invoked before all other
-			 *  handlers existing at the time of subscription whenever events by the
-			 *  given name are emitted via ::emit.
-			 */
-			// tslint:disable-next-line:no-any
-			preempt(eventName: string, handler: (value: any) => void): Disposable;
-
-			// Event Emission
-			/** Invoke handlers registered via ::on for the given event name. */
-			// tslint:disable-next-line:no-any
-			emit(eventName: string, value?: any): void;
-		}
-	}
+export interface DisposableLike {
+    dispose(): void;
 }
 
 /** A handle to a resource that can be disposed. */
-export const Disposable: EventKit.Statics.Disposable;
+export class Disposable implements DisposableLike {
+    disposed: boolean;
 
-/** An object that aggregates multiple Disposable instances together into a
+    /** Ensure that Object correctly implements the Disposable contract. */
+    static isDisposable(object: object): boolean;
+
+    /** Construct a Disposable. */
+    constructor(disposableAction?: () => void);
+
+    /** A callback which will be called within dispose(). */
+    disposalAction?: () => void;
+
+    /**
+     *  Perform the disposal action, indicating that the resource associated
+     *  with this disposable is no longer needed.
+     */
+    dispose(): void;
+}
+
+/**
+ *  An object that aggregates multiple Disposable instances together into a
  *  single disposable, so they can all be disposed as a group.
  */
-export const CompositeDisposable: EventKit.Statics.CompositeDisposable;
+export class CompositeDisposable implements DisposableLike {
+    disposed: boolean;
 
-/** Utility class to be used when implementing event-based APIs that allows
+    /** Construct an instance, optionally with one or more disposables. */
+    constructor(...disposables: DisposableLike[]);
+
+    /**
+     *  Dispose all disposables added to this composite disposable.
+     *  If this object has already been disposed, this method has no effect.
+     */
+    dispose(): void;
+
+    // Managing Disposables
+    /**
+     *  Add disposables to be disposed when the composite is disposed.
+     *  If this object has already been disposed, this method has no effect.
+     */
+    add(...disposables: DisposableLike[]): void;
+
+    /** Remove a previously added disposable. */
+    remove(disposable: DisposableLike): void;
+
+    /** Alias to CompositeDisposable::remove. */
+    delete(disposable: DisposableLike): void;
+
+    /**
+     *  Clear all disposables. They will not be disposed by the next call to
+     *  dispose.
+     */
+    clear(): void;
+}
+
+/**
+ *  Utility class to be used when implementing event-based APIs that allows
  *  for handlers registered via ::on to be invoked with calls to ::emit.
  */
-export const Emitter: EventKit.Statics.Emitter;
+// tslint:disable-next-line:no-any
+export class Emitter<Emissions = { [key: string]: any }> implements DisposableLike {
+    disposed: boolean;
+
+    /** Construct an emitter. */
+    constructor();
+
+    /** Clear out any existing subscribers. */
+    clear(): void;
+
+    /** Unsubscribe all handlers. */
+    dispose(): boolean;
+
+    // Event Subscription
+    /** Registers a handler to be invoked whenever the given event is emitted. */
+    on<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
+        Disposable;
+
+    /**
+     *  Register the given handler function to be invoked the next time an event
+     *  with the given name is emitted via ::emit.
+     */
+    once<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
+        Disposable;
+
+    /**
+     *  Register the given handler function to be invoked before all other
+     *  handlers existing at the time of subscription whenever events by the
+     *  given name are emitted via ::emit.
+     */
+    preempt<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
+        Disposable;
+
+    // Event Emission
+    /** Invoke the handlers registered via ::on for the given event name. */
+    emit<T extends keyof Emissions>(eventName: T, value?: Emissions[T]): void;
+
+    /**
+     *  Asynchronously invoke the handlers registered via ::on for the given event name.
+     *  @return A promise that will be fulfilled once all handlers have been invoked.
+     */
+    emitAsync<T extends keyof Emissions>(eventName: T, value?: Emissions[T]): Promise<void>;
+}
diff --git a/types/event-kit/tsconfig.json b/types/event-kit/tsconfig.json
index 0097bf6ba3..0b6a81c5f8 100644
--- a/types/event-kit/tsconfig.json
+++ b/types/event-kit/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -21,4 +21,4 @@
         "index.d.ts",
         "event-kit-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/event-kit/tslint.json b/types/event-kit/tslint.json
index 4b036f727a..e0508241c7 100644
--- a/types/event-kit/tslint.json
+++ b/types/event-kit/tslint.json
@@ -1,37 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Custom rules.
-        "class-name": true,
-        "indent": [true, "tabs"],
-        "jsdoc-format": true,
+        "indent": [true, "spaces", 4],
         "max-line-length": [true, 100],
-        "quotemark": [true, "double", "avoid-escape"],
-        "trailing-comma": [true, {
-            "multiline": { "objects": "always", "arrays": "always", "functions": "never" },
-            "singleline": { "objects": "never", "arrays": "never", "functions": "never" }
-        }],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-separator",
-            "check-type",
-            "check-typecast",
-            "check-rest-spread",
-            "check-preblock"
-        ],
-        // Soon to be defaults.
-        "arrow-return-shorthand": [true, "multiline"],
-        "no-any": true,
-        "no-floating-promises": true,
-        "no-unbound-method": true,
-        "no-unsafe-any": true,
-        "number-literal-format": true,
-        "restrict-plus-operands": true,
-        "return-undefined": true,
-        "switch-final-break": true
+        "no-any": true
     }
 }
diff --git a/types/event-kit/v1/.editorconfig b/types/event-kit/v1/.editorconfig
deleted file mode 100644
index 570211f898..0000000000
--- a/types/event-kit/v1/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.ts]
-indent_style = tab
-indent_size = 4
diff --git a/types/event-kit/v1/event-kit-tests.ts b/types/event-kit/v1/event-kit-tests.ts
deleted file mode 100644
index 4b4a0d4e7c..0000000000
--- a/types/event-kit/v1/event-kit-tests.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-import { Disposable, CompositeDisposable, Emitter } from "event-kit";
-
-// Emitter
-
-class User {
-	private emitter: Emitter;
-	name: string;
-
-	constructor() {
-		this.emitter = new Emitter();
-	}
-
-	onDidChangeName(callback: (name: string) => void): Disposable {
-		return this.emitter.on('did-change-name', callback);
-	}
-
-	setName(name: string): void {
-		if (this.name != name) {
-			this.name = name;
-			this.emitter.emit('did-change-name', name);
-		}
-	}
-
-	destroy(): void {
-		this.emitter.clear();
-		this.emitter.dispose();
-	}
-}
-
-// Disposable
-
-var disposable = new Disposable(() => {
-	// cleanup
-});
-disposable.dispose();
-
-var user = new User();
-var subscription = user.onDidChangeName((name: string) => {
-	console.log('User name change to: ' + name);
-});
-if(Disposable.isDisposable(subscription)) {}
-subscription.dispose();
-
-// CompositeDisposable
-
-var subscriptions = new CompositeDisposable();
-subscriptions.add(
-	user.onDidChangeName((name: string) => {
-		console.log('subscriber #1');
-	}),
-	user.onDidChangeName((name: string) => {
-		console.log('subscriber #2');
-	})
-);
-subscriptions.dispose();
diff --git a/types/event-kit/v1/index.d.ts b/types/event-kit/v1/index.d.ts
deleted file mode 100644
index 74f270c40f..0000000000
--- a/types/event-kit/v1/index.d.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Type definitions for event-kit v1.2.0
-// Project: https://github.com/atom/event-kit
-// Definitions by: Vadim Macagon <https://github.com/enlight>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = AtomEventKit;
-
-declare namespace AtomEventKit {
-	interface IDisposable {
-		dispose(): void;
-	}
-
-	/** Static side of the Disposable class. */
-	interface DisposableStatic {
-		prototype: Disposable;
-		new (disposalAction: Function): Disposable;
-		/**
-		* Ensure that Object correctly implements the Disposable.
-		*/
-		isDisposable(object: Object): boolean;
-	}
-
-	/** Instance side of the Disposable class. */
-	interface Disposable extends IDisposable {
-		disposed: boolean;
-
-		constructor: DisposableStatic;
-	}
-
-	/** A class that represent a handle to a resource that can be disposed. */
-	var Disposable: DisposableStatic;
-
-	/** Static side of the CompositeDisposable class. */
-	interface CompositeDisposableStatic {
-		prototype: CompositeDisposable;
-		new (...disposables: IDisposable[]): CompositeDisposable;
-	}
-
-	/** Instance side of the CompositeDisposable class. */
-	interface CompositeDisposable extends IDisposable {
-		disposed: boolean;
-
-		constructor: CompositeDisposableStatic;
-		add(...disposables: IDisposable[]): void;
-		remove(disposable: IDisposable): void;
-		clear(): void;
-	}
-
-	/**
-	 * A class that aggregates multiple [[Disposable]] instances together into a single disposable,
-	 * so that they can all be disposed as a group.
-	 */
-	var CompositeDisposable: CompositeDisposableStatic;
-
-	/** Static side of the Emitter class. */
-	interface EmitterStatic {
-		prototype: Emitter;
-		new (): Emitter;
-	}
-
-	/** Instance side of the Emitter class. */
-	interface Emitter {
-		isDisposed: boolean;
-
-		constructor: EmitterStatic;
-		/**
-		* Clear out any existing subscribers.
-		*/
-		clear(): void;
-		/**
-		* Unsubscribe all handlers.
-		*/
-		dispose(): void;
-		/**
-		* Registers a handler to be invoked whenever the given event is emitted.
-		* @return An object that will unregister the handler when disposed.
-		*/
-		on(eventName: string, handler: (value: any) => void, unshift?: boolean): Disposable;
-		/**
-		* Registers a handler to be invoked *before* all previously registered handlers for
-		* the given event.
-		* @return An object that will unregister the handler when disposed.
-		*/
-		preempt(eventName: string, handler: (value: any) => void): Disposable;
-		/** Invokes any registered handlers for the given event. */
-		emit(eventName: string, value: any): void;
-	}
-
-	/** A utility class for implementing event-based APIs. */
-	var Emitter: EmitterStatic;
-}
diff --git a/types/event-kit/v1/tsconfig.json b/types/event-kit/v1/tsconfig.json
deleted file mode 100644
index ba260dd683..0000000000
--- a/types/event-kit/v1/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "event-kit": [
-                "event-kit/v1"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "event-kit-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/event-loop-lag/tslint.json b/types/event-loop-lag/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/event-loop-lag/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/event-stream/event-stream-tests.ts b/types/event-stream/event-stream-tests.ts
index cdb541b382..38525be696 100644
--- a/types/event-stream/event-stream-tests.ts
+++ b/types/event-stream/event-stream-tests.ts
@@ -1,18 +1,14 @@
-
-
-
 import gulp = require("gulp");
 import * as es from "event-stream";
 
 gulp.task("es:concat", () => {
-    var streams = gulp.src(["*"])        
+    var streams = gulp.src(["*"])
         .pipe(gulp.dest("build"));
-		
+
 	return es.concat.apply(null, streams);
 });
 
 gulp.task("es:readArray ", () => {
     var reader = es.readArray([1, 2, 3]);
-    
 });
 
diff --git a/types/event-stream/tsconfig.json b/types/event-stream/tsconfig.json
index 93e6b0c016..6f3624e82f 100644
--- a/types/event-stream/tsconfig.json
+++ b/types/event-stream/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/event-stream/tslint.json b/types/event-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/event-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/event-to-promise/tslint.json b/types/event-to-promise/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/event-to-promise/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/events/events-tests.ts b/types/events/events-tests.ts
new file mode 100644
index 0000000000..ccf89c1402
--- /dev/null
+++ b/types/events/events-tests.ts
@@ -0,0 +1,60 @@
+import { EventEmitter } from 'events';
+
+const emitter = new EventEmitter();
+const listener = () => {
+  console.log('once');
+};
+const listener1 = () => {
+  console.log('listener1');
+};
+const listener2 = () => {
+  console.log('listener2');
+};
+const listener3 = (arg1: string) => {
+  console.log('listener3', arg1);
+};
+const listener4 = () => {
+  console.log('type of number');
+};
+
+emitter.setMaxListeners(100);
+
+emitter.addListener('send', listener1);
+
+emitter.on('send', listener2);
+
+emitter.on('send', listener3);
+
+emitter.once('send', listener);
+
+emitter.once(1, listener4);
+
+emitter.listeners('send');
+emitter.listenerCount('send');
+
+EventEmitter.defaultMaxListeners = 100;
+console.log(`count(static): ${EventEmitter.listenerCount(emitter, 'send')}`);
+console.log(`ncount: ${emitter.listenerCount('send')}`);
+
+setTimeout(() => {
+  console.log('\n');
+  emitter.emit('send');
+}, 1000);
+
+setTimeout(() => {
+  console.log('\n');
+  emitter.emit('send');
+  emitter.removeListener('send', listener2);
+}, 2000);
+
+setTimeout(() => {
+  console.log('\n');
+  emitter.emit('send', 'params1');
+  emitter.removeAllListeners('send');
+}, 3000);
+
+setTimeout(() => {
+  console.log('\n');
+  emitter.emit(1);
+  emitter.emit('send');
+}, 3000);
diff --git a/types/events/index.d.ts b/types/events/index.d.ts
new file mode 100644
index 0000000000..85ce0a7b0e
--- /dev/null
+++ b/types/events/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for events 1.1
+// Project: https://github.com/Gozala/events
+// Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type Listener = (...args: any[]) => void;
+
+export class EventEmitter {
+  static listenerCount(emitter: EventEmitter, type: string | number): number;
+  static defaultMaxListeners: number;
+
+  setMaxListeners(n: number): this;
+  emit(type: string | number, ...args: any[]): boolean;
+  addListener(type: string | number, listener: Listener): this;
+  on(type: string | number, listener: Listener): this;
+  once(type: string | number, listener: Listener): this;
+  removeListener(type: string | number, listener: Listener): this;
+  removeAllListeners(type: string | number): this;
+  listeners(type: string | number): Listener[];
+  listenerCount(type: string | number): number;
+}
diff --git a/types/events/tsconfig.json b/types/events/tsconfig.json
new file mode 100644
index 0000000000..f43a926ad8
--- /dev/null
+++ b/types/events/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "target": "es6",
+      "lib": [
+        "es6",
+        "dom"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "events-tests.ts"
+    ]
+}
diff --git a/types/events/tslint.json b/types/events/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/events/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/evernote/tslint.json b/types/evernote/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/evernote/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/execa/index.d.ts b/types/execa/index.d.ts
index c74c60672d..c3aced26ee 100644
--- a/types/execa/index.d.ts
+++ b/types/execa/index.d.ts
@@ -1,63 +1,264 @@
-// Type definitions for execa 0.7
+// Type definitions for execa 0.8
 // Project: https://github.com/sindresorhus/execa#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 //                 BendingBender <https://github.com/BendingBender>
+//                 Borek Bernard <https://github.com/borekb>
+//                 Mick Dekkers <https://github.com/mickdekkers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="node" />
 
-import { ChildProcess, ExecOptions, SpawnOptions, SpawnSyncOptions } from "child_process";
+import { ChildProcess } from 'child_process';
 import { Stream } from 'stream';
 
-type StdIOOption = 'pipe' | 'ipc' | 'ignore' | number | Stream | undefined | null;
-
-interface ExecaOptions {
-    input: string | Buffer | Stream;
-    preferLocal: boolean;
-    stripEof: boolean;
-    extendEnv: boolean;
-    argv0: string;
-    localDir: string;
-    reject: boolean;
-    cleanup: boolean;
-    stdin: StdIOOption;
-    stdout: StdIOOption;
-    stderr: StdIOOption;
-}
-
-type Options = SpawnOptions & ExecaOptions & ExecOptions;
-type SyncOptions = SpawnSyncOptions & ExecaOptions & ExecOptions;
-
-interface ExecaReturns {
-    cmd: string;
-    code: number;
-    failed: boolean;
-    killed: boolean;
-    signal: string | null;
-    stderr: string;
-    stdout: string;
-    timedOut: boolean;
-}
-
-type ExecaError = Error & ExecaReturns;
-
-interface ExecaChildPromise {
-    catch<TResult = never>(onrejected?: ((reason: ExecaError) => TResult | PromiseLike<TResult>) | undefined | null): Promise<ExecaReturns | TResult>;
-}
-type ExecaChildProcess = ChildProcess & ExecaChildPromise & Promise<ExecaReturns>;
-
-declare function execa(file: string, options?: Partial<Options>): ExecaChildProcess;
-declare function execa(file: string, args?: string[], options?: Partial<Options>): ExecaChildProcess;
+/**
+ * A better `child_process`
+ */
 declare namespace execa {
-    function stdout(file: string, options?: Partial<Options>): Promise<string>;
-    function stdout(file: string, args?: string[], options?: Partial<Options>): Promise<string>;
-    function stderr(file: string, options?: Partial<Options>): Promise<string>;
-    function stderr(file: string, args?: string[], options?: Partial<Options>): Promise<string>;
-    function shell(command: string, options?: Partial<Options>): ExecaChildProcess;
-    function sync(file: string, options?: Partial<SyncOptions>): ExecaReturns;
-    function sync(file: string, args?: string[], options?: Partial<SyncOptions>): ExecaReturns;
-    function shellSync(command: string, options?: Partial<Options>): ExecaReturns;
+    interface ExecaStatic {
+        /**
+         * Execute a file.
+         *
+         * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
+         * @returns a `child_process` instance which is enhanced to also be a `Promise` for a result `Object` with `stdout` and `stderr` properties.
+         */
+        (file: string, args?: string[], options?: Options): ExecaChildProcess;
+        (file: string, options?: Options): ExecaChildProcess;
+
+        /**
+         * Execute a file.
+         *
+         * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
+         * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stdout`.
+         */
+        stdout(file: string, args?: string[], options?: Options): Promise<string>;
+        stdout(file: string, options?: Options): Promise<string>;
+
+        /**
+         * Execute a file.
+         *
+         * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
+         * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stderr`.
+         */
+        stderr(file: string, args?: string[], options?: Options): Promise<string>;
+        stderr(file: string, options?: Options): Promise<string>;
+
+        /**
+         * Execute a command through the system shell.
+         *
+         * Prefer `execa()` whenever possible, as it's both faster and safer.
+         * @returns a `child_process` instance which is enhanced to also be a `Promise` for a result `Object` with `stdout` and `stderr` properties.
+         */
+        shell(command: string, options?: Options): ExecaChildProcess;
+
+        /**
+         * Execute a file synchronously.
+         *
+         * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
+         * @returns the same result object as `child_process.spawnSync`.
+         * @throws an `Error` if the command fails.
+         */
+        sync(file: string, args?: string[], options?: SyncOptions): ExecaReturns;
+        sync(file: string, options?: SyncOptions): ExecaReturns;
+
+        /**
+         * Execute a command synchronously through the system shell.
+         *
+         * @returns the same result object as `child_process.spawnSync`.
+         * @throws an `Error` if the command fails.
+         */
+        shellSync(command: string, options?: Options): ExecaReturns;
+    }
+
+    type StdIOOption = 'pipe' | 'ipc' | 'ignore' | Stream | number | null | undefined;
+
+    interface CommonOptions {
+        /**
+         * Current working directory of the child process.
+         * @default `process.cwd()`
+         */
+        cwd?: string;
+        /**
+         * Environment key-value pairs.
+         * Extends automatically from `process.env`.
+         * Set `extendEnv` to `false` if you don't want this.
+         * @default `process.env`
+         */
+        env?: NodeJS.ProcessEnv;
+        /**
+         * Set to `false` if you don't want to extend the environment variables when providing the `env` property.
+         * @default `true`
+         */
+        extendEnv?: boolean;
+        /**
+         * Explicitly set the value of `argv[0]` sent to the child process.
+         * This will be set to `command` or `file` if not specified.
+         */
+        argv0?: string;
+        /**
+         * The `stdio` option is used to configure the pipes that are established between the parent and child process.
+         * By default, the child's stdin, stdout, and stderr are redirected to corresponding `subprocess.stdin`, `subprocess.stdout`, and `subprocess.stderr` streams on the `ChildProcess` object.
+         * @default `'pipe'`
+         *
+         * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+         */
+        stdio?: 'pipe' | 'ignore' | 'inherit' | StdIOOption[];
+        /**
+         * Prepare child to run independently of its parent process.
+         * Specific behavior depends on the platform.
+         * @see https://nodejs.org/api/child_process.html#child_process_options_detached
+         */
+        detached?: boolean;
+        /**
+         * Sets the user identity of the process.
+         */
+        uid?: number;
+        /**
+         * Sets the group identity of the process.
+         */
+        gid?: number;
+        /**
+         * If `true`, runs `command` inside of a shell.
+         * Uses `/bin/sh` on UNIX and `cmd.exe` on Windows.
+         * A different shell can be specified as a string.
+         * The shell should understand the `-c` switch on UNIX or `/d /s /c` on Windows.
+         * @default `false`
+         */
+        shell?: boolean | string;
+        /**
+         * If `true`, no quoting or escaping of arguments is done on Windows.
+         * Ignored on other platforms.
+         * This is set to `true` automatically when `shell` is specified.
+         * @default `false`
+         */
+        windowsVerbatimArguments?: boolean;
+        /**
+         * Strip EOF (last newline) from the output.
+         * @default `true`
+         * @see https://github.com/sindresorhus/strip-eof
+         */
+        stripEof?: boolean;
+        /**
+         * Prefer locally installed binaries when looking for a binary to execute.
+         * If you `$ npm install foo`, you can then `execa('foo')`.
+         * @default `true`
+         */
+        preferLocal?: boolean;
+        /**
+         * Preferred path to find locally installed binaries in (use with `preferLocal`).
+         * @default `process.cwd()`
+         */
+        localDir?: string;
+        /**
+         * Setting this to `false` resolves the promise with the error instead of rejecting it.
+         * @default `true`
+         */
+        reject?: boolean;
+        /**
+         * Keep track of the spawned process and `kill` it when the parent process exits.
+         * @default `true`
+         */
+        cleanup?: boolean;
+        /**
+         * Specify the character encoding used to decode the `stdout` and `stderr` output.
+         * @default `utf8`
+         */
+        encoding?: string;
+        /**
+         * If `timeout` is greater than `0`, the parent will send the signal identified by the `killSignal` property (the default is `SIGTERM`) if the child runs longer than `timeout` milliseconds.
+         * @default `0`
+         */
+        timeout?: number;
+        /**
+         * Largest amount of data in bytes allowed on `stdout` or `stderr`.
+         * @default `10000000` (10MB)
+         */
+        maxBuffer?: number;
+        /**
+         * Signal value to be used when the spawned process will be killed.
+         * @default `SIGTERM`
+         */
+        killSignal?: string | number;
+        /**
+         * Used to configure the stdin pipe that is established between the parent and child process.
+         * @default `'pipe'`
+         * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+         */
+        stdin?: StdIOOption;
+        /**
+         * Used to configure the stdout pipe that is established between the parent and child process.
+         * @default `'pipe'`
+         * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+         */
+        stdout?: StdIOOption;
+        /**
+         * Used to configure the stderr pipe that is established between the parent and child process.
+         * @default `'pipe'`
+         * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+         */
+        stderr?: StdIOOption;
+    }
+
+    interface Options extends CommonOptions {
+        /**
+         * Write some input to the `stdin` of your binary.
+         */
+        input?: string | Buffer | Stream;
+    }
+
+    interface SyncOptions extends CommonOptions {
+        /**
+         * Write some input to the `stdin` of your binary.
+         * Streams are not allowed when using the synchronous methods.
+         */
+        input?: string | Buffer;
+    }
+
+    interface ExecaReturns {
+        /**
+         * The command that was run.
+         */
+        cmd: string;
+        /**
+         * The exit code of the process that was run.
+         */
+        code: number;
+        /**
+         * Whether the process failed to run.
+         */
+        failed: boolean;
+        /**
+         * Whether the process was killed.
+         */
+        killed: boolean;
+        /**
+         * The signal that was used to terminate the process.
+         */
+        signal: string | null;
+        /**
+         * The output of the process on stderr.
+         */
+        stderr: string;
+        /**
+         * The output of the process on stdout.
+         */
+        stdout: string;
+        /**
+         * Whether the process timed out.
+         */
+        timedOut: boolean;
+    }
+
+    type ExecaError = Error & ExecaReturns;
+
+    interface ExecaChildPromise {
+        catch<TResult = never>(onrejected?: ((reason: ExecaError) => TResult | PromiseLike<TResult>) | null): Promise<ExecaReturns | TResult>;
+    }
+
+    type ExecaChildProcess = ChildProcess & ExecaChildPromise & Promise<ExecaReturns>;
 }
 
+declare var execa: execa.ExecaStatic;
+
 export = execa;
diff --git a/types/exit/tslint.json b/types/exit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/exit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/exorcist/tslint.json b/types/exorcist/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/exorcist/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/expect.js/tslint.json b/types/expect.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/expect.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/expectations/tslint.json b/types/expectations/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/expectations/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
new file mode 100644
index 0000000000..386cb41b04
--- /dev/null
+++ b/types/expo/expo-tests.tsx
@@ -0,0 +1,347 @@
+import * as React from 'react';
+
+import {
+    Accelerometer,
+    Amplitude,
+    Asset,
+    AuthSession,
+    Audio,
+    AppLoading,
+    BarCodeScanner,
+    BlurViewProps,
+    BlurView,
+    Brightness,
+    Camera,
+    DocumentPicker,
+    Facebook,
+    FacebookAds,
+    FileSystem,
+    ImagePicker,
+    ImageManipulator,
+    FaceDetector,
+    Svg
+} from 'expo';
+
+Accelerometer.addListener((obj) => {
+    obj.x;
+    obj.y;
+    obj.z;
+});
+Accelerometer.removeAllListeners();
+Accelerometer.setUpdateInterval(1000);
+
+Amplitude.initialize('key');
+Amplitude.setUserId('userId');
+Amplitude.setUserProperties({key: 1});
+Amplitude.clearUserProperties();
+Amplitude.logEvent('name');
+Amplitude.logEventWithProperties('event', {key: 'value'});
+Amplitude.setGroup('type', {key: 'value'});
+
+const asset = Asset.fromModule(1);
+asset.downloadAsync();
+Asset.loadAsync(1);
+Asset.loadAsync([1, 2, 3]);
+const asset1 = new Asset({
+    uri: 'uri',
+    type: 'type',
+    name: 'name',
+    hash: 'hash',
+    width: 122,
+    height: 122
+});
+
+const url = AuthSession.getRedirectUrl();
+AuthSession.dismiss();
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: 'url2'
+}).then(result => {
+    switch (result.type) {
+        case 'success':
+            result.event;
+            result.params;
+            break;
+        case 'error':
+            result.errorCode;
+            result.params;
+            result.event;
+            break;
+        case 'dismissed':
+        case 'cancel':
+            result.type;
+            break;
+    }
+});
+
+Audio.setAudioModeAsync({
+    shouldDuckAndroid: false,
+    playsInSilentModeIOS: true,
+    interruptionModeIOS: 2,
+    interruptionModeAndroid: 1,
+    allowsRecordingIOS: true
+});
+Audio.setIsEnabledAsync(true);
+async () => {
+    const result = await Audio.Sound.create('uri', {
+        volume: 0.5,
+        rate: 0.6
+    }, null, true);
+
+    const sound = result.sound;
+    const status = result.status;
+
+    if (!status.isLoaded) {
+        status.error;
+    } else {
+        status.didJustFinish;
+        // etc.
+    }
+
+    const _status = await sound.getStatusAsync();
+    await sound.loadAsync('uri');
+};
+
+() => (
+    <AppLoading
+        startAsync={() => Promise.resolve()}
+        onFinish={() => {}}
+        onError={(error) => console.log(error)} />
+);
+() => (
+    <AppLoading
+        startAsync={null}
+        onFinish={null}
+        onError={null} />
+);
+
+const barcodeReadCallback = () => {};
+() => (
+    <BarCodeScanner
+        type="front"
+        torchMode="off"
+        barCodeTypes={['s']}
+        onBarCodeRead={barcodeReadCallback} />
+);
+
+() => (
+    <BlurView
+        tint="dark"
+        intensity={2} />
+);
+
+async () => {
+    await Brightness.setBrightnessAsync(.6);
+    await Brightness.setSystemBrightnessAsync(.7);
+    const br1 = await Brightness.getBrightnessAsync();
+    const br2 = await Brightness.getSystemBrightnessAsync();
+};
+
+Camera.Constants.AutoFocus;
+Camera.Constants.Type;
+Camera.Constants.FlashMode;
+Camera.Constants.WhiteBalance;
+Camera.Constants.VideoQuality;
+Camera.Constants.BarCodeType;
+() => {
+    return(<Camera ref={(component: any) => {
+        if (component) {
+            component.recordAsync();
+        }
+    }} />);
+};
+
+async () => {
+    const result = await DocumentPicker.getDocumentAsync();
+
+    if (result.type === 'success') {
+        result.name;
+        result.uri;
+        result.size;
+    }
+};
+
+async () => {
+    const result = await Facebook.logInWithReadPermissionsAsync('appId');
+
+    if (result.type === 'success') {
+        result.expires;
+        result.token;
+    }
+};
+
+() => (
+    <FacebookAds.BannerView
+        type="large"
+        placementId="str"
+        onPress={() => {}}
+        onError={() => {}} />
+);
+
+async () => {
+    const info = await FileSystem.getInfoAsync('file');
+
+    info.exists;
+    info.isDirectory;
+
+    if (info.exists) {
+        info.md5;
+        info.uri;
+        info.size;
+        info.modificationTime;
+    }
+
+    const string: string = await FileSystem.readAsStringAsync('file');
+    await FileSystem.writeAsStringAsync('file', 'content');
+    await FileSystem.deleteAsync('file');
+    await FileSystem.moveAsync({ from: 'from', to: 'to'});
+    await FileSystem.copyAsync({ from: 'from', to: 'to' });
+    await FileSystem.makeDirectoryAsync('dir');
+    const dirs: string[] = await FileSystem.readDirectoryAsync('dir');
+    const result = await FileSystem.downloadAsync('from', 'to');
+
+    result.headers;
+    result.status;
+    result.uri;
+    result.md5;
+};
+
+async () => {
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+    }
+};
+
+async () => {
+    const result = await ImageManipulator.manipulate('url', {
+        rotate: 90
+    }, {
+        compress: 0.5
+    });
+
+    result.height;
+    result.uri;
+    result.width;
+};
+
+FaceDetector.Constants.Mode.fast;
+FaceDetector.Constants.Mode.accurate;
+FaceDetector.Constants.Landmarks.all;
+FaceDetector.Constants.Landmarks.none;
+FaceDetector.Constants.Classifications.all;
+FaceDetector.Constants.Classifications.none;
+async () => {
+    const result = await FaceDetector.detectFaces('url', {
+        mode: FaceDetector.Constants.Mode.fast,
+        detectLandmarks: FaceDetector.Constants.Landmarks.all,
+        runClassifications: FaceDetector.Constants.Classifications.none
+    });
+
+    result.faces[0];
+};
+
+() => (
+    <Svg width={100} height={50}>
+        <Svg.Rect
+            x={25}
+            y={5}
+            width={150}
+            height={50}
+            fill='rgb(0,0,255)'
+            strokeWidth={3}
+            stroke='rgb(0,0,0)'
+        />
+        <Svg.Circle
+            cx={50}
+            cy={50}
+            r={50}
+            fill="pink"
+        />
+        <Svg.Ellipse
+            cx={55}
+            cy={55}
+            rx={50}
+            ry={30}
+            stroke="purple"
+            strokeWidth={2}
+            fill="yellow"
+        />
+        <Svg.Line
+            x1={0}
+            y1={0}
+            x2={100}
+            y2={100}
+            stroke="red"
+            strokeWidth={2}
+        />
+        <Svg.Polygon
+            points="40,5 70,80 25,95"
+            fill="lime"
+            stroke="purple"
+            strokeWidth={1}
+        />
+        <Svg.Polyline
+            points="10,10 20,12 30,20 40,60 60,70 95,90"
+            fill="none"
+            stroke="black"
+            strokeWidth={3}
+        />
+        <Svg.Text
+            fill="none"
+            stroke="purple"
+            fontSize={20}
+            fontWeight="bold"
+            x={100}
+            y={20}
+            textAnchor="middle"
+        >
+            STROKED TEXT
+        </Svg.Text>
+        <Svg.Defs>
+            <Svg.Path
+                id="path"
+                d=""
+            />
+        </Svg.Defs>
+        <Svg.G y={20}>
+            <Svg.Text fill="blue"        >
+                <Svg.TextPath href="#path" startOffset="-10%">
+                    We go up and down,
+                    <Svg.TSpan fill="red" dy="5,5,5">then up again</Svg.TSpan>
+                </Svg.TextPath>
+            </Svg.Text>
+            <Svg.Path
+                d=""
+                fill="none"
+                stroke="red"
+                strokeWidth={1}
+            />
+        </Svg.G>
+        <Svg.Use href="#shape" x="20" y="0" />
+        <Svg.Symbol id="symbol" viewBox="0 0 150 110" width="100" height="50">
+            <Svg.Circle cx="50" cy="50" r="40" strokeWidth="8" stroke="red" fill="red"/>
+            <Svg.Circle cx="90" cy="60" r="40" strokeWidth="8" stroke="green" fill="white"/>
+        </Svg.Symbol>
+        <Svg.Defs>
+            <Svg.ClipPath id="clip">
+                <Svg.Circle cx="50%" cy="50%" r="40%"/>
+            </Svg.ClipPath>
+            <Svg.RadialGradient id="grad" cx="50%" cy="50%" rx="50%" ry="50%" fx="50%" fy="50%" gradientUnits="userSpaceOnUse">
+                <Svg.Stop
+                    offset="0%"
+                    stopColor="#ff0"
+                    stopOpacity="1"
+                />
+            </Svg.RadialGradient>
+            <Svg.LinearGradient id="grad" x1="0" y1="0" x2="170" y2="0">
+                <Svg.Stop offset="1" stopColor="red" stopOpacity="1" />
+            </Svg.LinearGradient>
+        </Svg.Defs>
+    </Svg>
+);
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
new file mode 100644
index 0000000000..89acb6ac10
--- /dev/null
+++ b/types/expo/index.d.ts
@@ -0,0 +1,1662 @@
+// Type definitions for expo 24.0
+// Project: https://github.com/expo/expo-sdk
+// Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
+//                 Martynas Kadiša <https://github.com/martynaskadisa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { EventSubscription } from 'fbemitter';
+import { Component, ComponentClass, Ref } from 'react';
+import {
+    ViewStyle,
+    ViewProperties,
+    ColorPropType,
+    ImageURISource,
+    NativeEventEmitter,
+    ImageRequireSource
+} from 'react-native';
+
+export type URISource = ImageURISource;
+export type RequireSource = ImageRequireSource;
+export type ResizeModeContain = 'contain';
+export type ResizeModeCover = 'cover';
+export type ResizeModeStretch = 'stretch';
+export type Orientation = 'portrait' | 'landscape';
+export type Axis = number;
+export interface HashMap { [key: string]: any; }
+export type FloatFromZeroToOne = 0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1;
+export type BarCodeReadCallback = (params: { type: string; data: string; }) => void;
+export type Md5 = string;
+
+/**
+ * Accelerometer
+ */
+export namespace Accelerometer {
+    interface AccelerometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: AccelerometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Amplitude
+ */
+export namespace Amplitude {
+    function initialize(apiKey: string): void;
+    function setUserId(userId: string): void;
+    function setUserProperties(userProperties: HashMap): void;
+    function clearUserProperties(): void;
+    function logEvent(eventName: string): void;
+    function logEventWithProperties(eventName: string, properties: HashMap): void;
+    function setGroup(groupType: string, groupNames: HashMap): void;
+}
+
+/**
+ * Asset
+ */
+export class Asset {
+    constructor({ name, type, hash, uri, width, height }: {
+        name: string;
+        type: string;
+        hash: string;
+        uri: string;
+        width?: number;
+        height?: number;
+    });
+    name: string;
+    type: string;
+    hash: string;
+    uri: string;
+    localUri: string;
+    width?: number;
+    height?: number;
+
+    downloading: boolean;
+    downloaded: boolean;
+    downloadCallbacks: Array<{ resolve: () => any, reject: (e?: any) => any }>;
+
+    downloadAsync(): Promise<void>;
+
+    static fromModule(module: RequireSource): Asset;
+    static loadAsync(module: RequireSource[] | RequireSource): Promise<void>;
+}
+
+/**
+ * AuthSession
+ */
+export namespace AuthSession {
+    function startAsync(options: { authUrl: string; returnUrl: string; }): Promise<{
+        type: 'cancel';
+    } | {
+        type: 'dismissed';
+    } | {
+        type: 'success';
+        params: HashMap;
+        event: HashMap;
+    } | {
+        type: 'error';
+        params: HashMap;
+        errorCode: string;
+        event: HashMap;
+    }>;
+    function dismiss(): void;
+    function getRedirectUrl(): string;
+}
+
+/**
+ * AV
+ */
+export type PlaybackStatus = {
+    isLoaded: false;
+    androidImplementation?: string;
+    error?: string;
+} | {
+    isLoaded: true;
+    androidImplementation?: string;
+    uri: string;
+    progressUpdateIntervalMillis: number;
+    durationMillis?: number;
+    positionMillis: number;
+    playableDurationMillis?: number;
+    shouldPlay: boolean;
+    isPlaying: boolean;
+    isBuffering: boolean;
+    rate: number;
+    shouldCorrectPitch: boolean;
+    volume: number;
+    isMuted: boolean;
+    isLooping: boolean;
+    didJustFinish: boolean;
+};
+
+export interface PlaybackStatusToSet {
+    androidImplementation?: string;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: FloatFromZeroToOne;
+    shouldCorrectPitch?: boolean;
+    volume?: FloatFromZeroToOne;
+    isMuted?: boolean;
+    isLooping?: boolean;
+}
+
+export type Source = string | RequireSource | Asset;
+
+export class PlaybackObject {
+    loadAsync(source: Source, initialStatus?: PlaybackStatusToSet, downloadFirst?: boolean): Promise<PlaybackStatus>;
+    unloadAsync(): Promise<PlaybackStatus>;
+    getStatusAsync(): Promise<PlaybackStatus>;
+    setOnPlaybackStatusUpdate(onPlaybackStatusUpdate: (status: PlaybackStatus) => void): void;
+    setStatusAsync(status: PlaybackStatusToSet): Promise<PlaybackStatus>;
+    playAsync(): Promise<PlaybackStatus>;
+    playFromPositionAsync(positionMillis: number): Promise<PlaybackStatus>;
+    pauseAsync(): Promise<PlaybackStatus>;
+    stopAsync(): Promise<PlaybackStatus>;
+    setPositionAsync(positionMillis: number): Promise<PlaybackStatus>;
+    setRateAsync(rate: number, shouldCorrectPitch: boolean): Promise<PlaybackStatus>;
+    setVolumeAsync(volume: number): Promise<PlaybackStatus>;
+    setIsMutedAsync(isMuted: boolean): Promise<PlaybackStatus>;
+    setIsLoopingAsync(isLooping: boolean): Promise<PlaybackStatus>;
+    setProgressUpdateIntervalAsync(progressUpdateIntervalMillis: number): Promise<PlaybackStatus>;
+}
+
+export namespace Audio {
+    enum InterruptionModeIOS {
+        INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS = 0,
+        INTERRUPTION_MODE_IOS_DO_NOT_MIX = 1,
+        INTERRUPTION_MODE_IOS_DUCK_OTHERS = 2
+    }
+
+    enum InterruptionModeAndroid {
+        INTERRUPTION_MODE_ANDROID_DO_NOT_MIX = 1,
+        INTERRUPTION_MODE_ANDROID_DUCK_OTHERS = 2
+    }
+
+    type RecordingStatus = {
+        canRecord: false,
+        isDoneRecording: false
+    } | {
+        canRecord: true,
+        isRecording: boolean,
+        durationMillis: number
+    } | {
+        canRecord: false,
+        isDoneRecording: true,
+        durationMillis: number
+    };
+
+    interface AudioMode {
+        playsInSilentModeIOS: boolean;
+        allowsRecordingIOS: boolean;
+        interruptionModeIOS: InterruptionModeIOS;
+        shouldDuckAndroid: boolean;
+        interruptionModeAndroid: InterruptionModeAndroid;
+    }
+
+    function setIsEnabledAsync(value: boolean): Promise<void>;
+    function setAudioModeAsync(mode: AudioMode): Promise<void>;
+
+    class Sound extends PlaybackObject {
+        constructor();
+
+        static create(
+            source: Source,
+            initialStatus?: PlaybackStatusToSet,
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null,
+            downloadFirst?: boolean
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+
+    interface RecordingOptions {
+        android: {
+            extension: string;
+            outputFormat: number;
+            audioEncoder: number;
+            sampleRate?: number;
+            numberOfChannels?: number;
+            bitRate?: number;
+            maxFileSize?: number;
+        };
+        ios: {
+            extension: string;
+            outputFormat?: string | number;
+            audioQuality: number;
+            sampleRate: number;
+            numberOfChannels: number;
+            bitRate: number;
+            bitRateStrategy?: number;
+            bitDepthHint?: number;
+            linearPCMBitDepth?: number;
+            linearPCMIsBigEndian?: boolean;
+            linearPCMIsFloat?: boolean;
+        };
+    }
+
+    class Recording {
+        constructor();
+
+        getStatusAsync(): Promise<RecordingStatus>;
+        setOnRecordingStatusUpdate(onRecordingStatusUpdate: (status: RecordingStatus) => void): void;
+        setProgressUpdateInterval(miliss: number): void;
+        prepareToRecordAsync(options: Recording): Promise<RecordingStatus>;
+        isPreparedToRecord(): boolean;
+        startAsync(): Promise<RecordingStatus>;
+        pauseAsync(): Promise<RecordingStatus>;
+        stopAndUnloadAsync(): Promise<RecordingStatus>;
+        getURI(): string | undefined;
+        createNewLoadedSound(initialStatus: PlaybackStatusToSet, onPlaybackStatusUpdate: (status: PlaybackStatus) => void): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+}
+
+/**
+ * Expo Video
+ */
+export interface NaturalSize {
+    width: number;
+    height: number;
+    orientation: Orientation;
+}
+
+export interface ReadyForDisplayEvent {
+    naturalSize: NaturalSize;
+    status: PlaybackStatus;
+}
+
+export enum FullscreenUpdateVariants {
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT = 0,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT = 1,
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS = 2,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS = 3
+}
+
+export interface FullscreenUpdateEvent {
+    fullscreenUpdate: FullscreenUpdateVariants;
+    status: PlaybackStatus;
+}
+
+export interface VideoProps {
+    source?: Source | null;
+    posterSource?: URISource | RequireSource;
+
+    resizeMode?: ResizeModeContain | ResizeModeCover | ResizeModeStretch;
+    useNativeControls?: boolean;
+    usePoster?: boolean;
+
+    onPlaybackStatusUpdate?: (status: PlaybackStatus) => void;
+    onReadyForDisplay?: (event: ReadyForDisplayEvent) => void;
+    onIOSFullscreenUpdate?: (event: FullscreenUpdateEvent) => void;
+
+    onLoadStart?: () => void;
+    onLoad?: (status: PlaybackStatus) => void;
+    onError?: (error: string) => void;
+
+    status?: PlaybackStatusToSet;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    volume?: number;
+    isMuted?: boolean;
+    isLooping?: boolean;
+
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
+    rotation?: number;
+    ref?: Ref<PlaybackObject>;
+}
+
+export interface VideoState {
+    showPoster: boolean;
+}
+
+export class Video extends Component<VideoProps, VideoState> {
+    static RESIZE_MODE_CONTAIN: ResizeModeContain;
+    static RESIZE_MODE_COVER: ResizeModeCover;
+    static RESIZE_MODE_STRETCH: ResizeModeStretch;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS;
+}
+
+/**
+ * AppLoading
+ */
+export type AppLoadingProperties = {
+    startAsync: () => Promise<void>;
+    onFinish: () => void;
+    onError?: (error: Error) => void;
+} | {
+    startAsync: null;
+    onFinish: null;
+    onError?: null;
+};
+export class AppLoading extends Component<AppLoadingProperties> { }
+
+/**
+ * BarCodeScanner
+ */
+export interface BarCodeScannerProps extends ViewProperties {
+    type?: 'front' | 'back';
+    torchMode?: 'on' | 'off';
+    barCodeTypes?: string[];
+    onBarCodeRead?: BarCodeReadCallback;
+}
+
+export class BarCodeScanner extends Component<BarCodeScannerProps> { }
+
+/**
+ * BlurView
+ */
+export interface BlurViewProps extends ViewProperties {
+    tint: 'light' | 'default' | 'dark';
+    intensity: number;
+}
+export class BlurView extends Component<BlurViewProps> { }
+
+/**
+ * Brightness
+ */
+export namespace Brightness {
+    function setBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+    function getBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function getSystemBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function setSystemBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+}
+
+/**
+ * Camera
+ */
+export interface TakePictureOptions {
+    quality?: number;
+    base64?: boolean;
+    exif?: boolean;
+}
+export interface PictureResponse {
+    uri: string;
+    width: number;
+    height: number;
+    exif: string;
+    base64: string;
+}
+export interface RecordOptions {
+    quality?: string;
+    maxDuration?: number;
+    maxFileSize?: number;
+    mute?: boolean;
+}
+export class CameraObject {
+    takePictureAsync(options: TakePictureOptions): Promise<PictureResponse>;
+    recordAsync(options: RecordOptions): Promise<{ uri: string; }>;
+    stopRecording(): void;
+    getSupportedRatiosAsync(): Promise<string[]>; // Android only
+}
+export interface CameraProperties extends ViewProperties {
+    flashMode?: string | number;
+    type?: string | number;
+    ratio?: string;
+    autoFocus?: string | number | boolean;
+    focusDepth?: FloatFromZeroToOne;
+    zoom?: FloatFromZeroToOne;
+    whiteBalance?: string | number;
+    barCodeTypes?: string[];
+    onCameraReady?: () => void;
+    onMountError?: () => void;
+    onBarCodeRead?: BarCodeReadCallback;
+    ref?: Ref<CameraObject>;
+}
+export interface CameraConstants {
+    readonly Type: string;
+    readonly FlashMode: string;
+    readonly AutoFocus: string;
+    readonly WhiteBalance: string;
+    readonly VideoQuality: string;
+    readonly BarCodeType: string;
+}
+export class Camera extends Component<CameraProperties> {
+    static readonly Constants: CameraConstants;
+}
+
+/**
+ * Constants
+ */
+export namespace Constants {
+    const appOwnership: 'expo' | 'standalone' | 'guest';
+    const expoVersion: string;
+    const deviceId: string;
+    const deviceName: string;
+    const deviceYearClass: number;
+    const isDevice: boolean;
+
+    interface Platform {
+        ios: {
+            platform: string;
+            model: string;
+            userInterfaceIdiom: string;
+        };
+    }
+    const platform: Platform;
+    const sessionId: string;
+    const statusBarHeight: number;
+    const systemFonts: string[];
+
+    interface Manifest {
+        name: string;
+        description?: string;
+        slug?: string;
+        sdkVersion?: string;
+        version?: string;
+        orientation?: Orientation;
+        primaryColor?: string;
+        privacy?: 'public' | 'unlisted';
+        scheme?: string;
+        icon?: string;
+        platforms?: string[];
+        githubUrl?: string;
+        notification?: {
+            icon?: string,
+            color?: string,
+            androidMode?: 'default' | 'collapse',
+            androidCollapsedTitle?: string
+        };
+        loading?: {
+            icon?: string,
+            exponentIconColor?: 'white' | 'blue',
+            exponentIconGrayscale?: 1 | 0,
+            backgroundImage?: string,
+            backgroundColor?: string,
+            hideExponentText?: boolean
+        };
+        appKey?: string;
+        androidStatusBar?: {
+            barStyle?: 'lignt-content' | 'dark-content',
+            backgroundColor?: string
+        };
+        androidShowExponentNotificationInShellApp?: boolean;
+        extra?: {
+            [propName: string]: any
+        };
+        rnCliPath?: any;
+        entryPoint?: string;
+        packagerOpts?: {
+            hostType?: string,
+            dev?: boolean,
+            strict?: boolean,
+            minify?: boolean,
+            urlType?: string,
+            urlRandomness?: string,
+            lanType?: string,
+            [propName: string]: any
+        };
+        ignoreNodeModulesValidation?: any;
+        nodeModulesPath?: string;
+        ios?: {
+            bundleIdentifier?: string,
+            buildNumber?: string,
+            config?: {
+                usesNonExemptEncryption?: boolean,
+                googleSignIn?: {
+                    reservedClientId: string
+                }
+            },
+            supportsTablet?: boolean,
+            infoPlist?: any
+        };
+        android?: {
+            package?: string,
+            versionCode?: string,
+            config?: {
+                fabric?: {
+                    apiKey: string,
+                    buildSecret: string
+                },
+                googleMaps?: {
+                    apiKey: string
+                },
+                googleSignIn?: {
+                    apiKey: string,
+                    certificateHash: string
+                }
+            }
+        };
+        facebookScheme?: any;
+        facebookAppId?: string;
+        facebookDisplayName?: string;
+        splash?: {
+            backgroundColor?: string;
+            resizeMode?: ResizeModeContain | ResizeModeCover;
+            image?: string;
+        };
+        assetBundlePatterns?: string[];
+        releaseChannel: string;
+        [propName: string]: any;
+    }
+    const manifest: Manifest;
+    const linkingUri: string;
+}
+
+/**
+ * Contacts
+ */
+export namespace Contacts {
+    type PhoneNumbers = 'phoneNumbers';
+    type Emails = 'emails';
+    type Addresses = 'addresses';
+    type Image = 'image';
+    type Thumbnail = 'thumbnail';
+    type Note = 'note';
+    type Birthday = 'birthday';
+    type NonGregorianBirthday = 'nonGregorianBirthday';
+    type NamePrefix = 'namePrefix';
+    type NameSuffix = 'nameSuffix';
+    type PhoneticFirstName = 'phoneticFirstName';
+    type PhoneticMiddleName = 'phoneticMiddleName';
+    type PhoneticLastName = 'phoneticLastName';
+    type SocialProfiles = 'socialProfiles';
+    type InstantMessageAddresses = 'instantMessageAddresses';
+    type UrlAddresses = 'urlAddresses';
+    type Dates = 'dates';
+    type Relationships = 'relationships';
+
+    const PHONE_NUMBERS: PhoneNumbers;
+    const EMAILS: Emails;
+    const ADDRESSES: Addresses;
+    const IMAGE: Image;
+    const THUMBNAIL: Thumbnail;
+    const NOTE: Note;
+    const BIRTHDAY: Birthday;
+    const NON_GREGORIAN_BIRTHDAY: NonGregorianBirthday;
+    const NAME_PREFIX: NamePrefix;
+    const NAME_SUFFIX: NameSuffix;
+    const PHONETIC_FIRST_NAME: PhoneticFirstName;
+    const PHONETIC_MIDDLE_NAME: PhoneticMiddleName;
+    const PHONETIC_LAST_NAME: PhoneticLastName;
+    const SOCIAL_PROFILES: SocialProfiles;
+    const IM_ADDRESSES: InstantMessageAddresses;
+    const URLS: UrlAddresses;
+    const DATES: Dates;
+    const RELATIONSHIPS: Relationships;
+
+    type FieldType = PhoneNumbers | Emails | Addresses | Image | Thumbnail |
+        Note | Birthday | NonGregorianBirthday | NamePrefix | NameSuffix |
+        PhoneticFirstName | PhoneticMiddleName | PhoneticLastName | SocialProfiles |
+        InstantMessageAddresses | UrlAddresses | Dates | Relationships;
+
+    interface Options {
+        pageSize?: number;
+        pageOffset?: number;
+        fields?: FieldType[];
+    }
+
+    interface Contact {
+        id: string;
+        contactType: string;
+        name: string;
+        firstName?: string;
+        middleName?: string;
+        lastName?: string;
+        previousLastName?: string;
+        namePrefix?: string;
+        nameSuffix?: string;
+        nickname?: string;
+        phoneticFirstName?: string;
+        phoneticMiddleName?: string;
+        phoneticLastName?: string;
+        emails?: Array<{
+            email?: string;
+            primary?: boolean;
+            label: string;
+            id: string;
+        }>;
+        phoneNumbers?: Array<{
+            number?: string;
+            primary?: boolean;
+            digits?: string;
+            countryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        addresses?: Array<{
+            street?: string;
+            city?: string;
+            country?: string;
+            region?: string;
+            neighborhood?: string;
+            postalCode?: string;
+            poBox?: string;
+            isoCountryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        socialProfiles?: Array<{
+            service?: string;
+            localizedProfile?: string;
+            url?: string;
+            username?: string;
+            userId?: string;
+            label: string;
+            id: string;
+        }>;
+        instantMessageAddresses?: Array<{
+            service?: string;
+            username?: string;
+            localizedService?: string;
+            label: string;
+            id: string;
+        }>;
+        urls?: {
+            label: string;
+            url?: string;
+            id: string;
+        };
+        company?: string;
+        jobTitle?: string;
+        department?: string;
+        imageAvailable?: boolean;
+        image?: {
+            uri?: string;
+        };
+        thumbnail?: {
+            uri?: string;
+        };
+        note?: string;
+        dates?: Array<{
+            day?: number;
+            month?: number;
+            year?: number;
+            id: string;
+            label: string;
+        }>;
+        relationships?: Array<{
+            label: string;
+            name?: string;
+            id: string;
+        }>;
+    }
+
+    interface Response {
+        data: Contact[];
+        total: number;
+        hasNextPage: boolean;
+        hasPreviousPage: boolean;
+    }
+
+    function getContactsAsync(options: Options): Promise<Response>;
+    function getContactByIdAsync(options: { id?: string; fields?: FieldType[] }): Promise<Contact>;
+}
+
+/**
+ * DocumentPicker
+ */
+export namespace DocumentPicker {
+    interface Options {
+        type?: string;
+    }
+    type Response = {
+        type: 'success';
+        uri: string;
+        name: string;
+        size: number;
+    } | {
+        type: 'cancel';
+    };
+
+    function getDocumentAsync(options?: Options): Promise<Response>;
+}
+
+/**
+ * ErrorRecovery
+ */
+export namespace ErrorRecovery {
+    function setRecoveryProps(props: HashMap): void;
+}
+
+/**
+ * Facebook
+ */
+export namespace Facebook {
+    interface Options {
+        permissions?: string[];
+        behavior?: 'web' | 'native' | 'browser' | 'system';
+    }
+    type Response = {
+        type: 'success';
+        token: string;
+        expires: number;
+    } | {
+        type: 'cancel';
+    };
+    function logInWithReadPermissionsAsync(appId: string, options?: Options): Promise<Response>;
+}
+
+/**
+ * Facebook Ads
+ */
+export namespace FacebookAds {
+    /**
+     * Interstitial Ads
+     */
+    namespace InterstitialAdManager {
+        function showAd(placementId: string): Promise<boolean>;
+    }
+
+    /**
+     * Native Ads
+     */
+    type MediaCachePolicy = 'none' | 'icon' | 'image' | 'all';
+    class NativeAdsManager {
+        constructor(placementId: string, numberOfAdsToRequest?: number);
+        disableAutoRefresh(): void;
+        setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
+    }
+
+    function withNativeAd(component: Component<{
+        icon?: string;
+        coverImage?: string;
+        title?: string;
+        subtitle?: string;
+        description?: string;
+        callToActionText?: string;
+        socialContext?: string;
+    }>): Component<{ adsManager: NativeAdsManager }, { ad: any, canRequestAds: boolean }>;
+
+    /**
+     * Banner View
+     */
+    type AdType = 'large' | 'rectangle' | 'standard';
+
+    interface BannerViewProps {
+        type: AdType;
+        placementId: string;
+        onPress: () => void;
+        onError: () => void;
+    }
+
+    class BannerView extends Component<BannerViewProps> { }
+
+    /**
+     * Ad Settings
+     */
+    namespace AdSettings {
+        const currentDeviceHash: string;
+        function addTestDevice(device: string): void;
+        function clearTestDevices(): void;
+        type SDKLogLevel = 'none' | 'debug' | 'verbose' | 'warning' | 'error' | 'notification';
+        function setLogLevel(logLevel: SDKLogLevel): void;
+        function setIsChildDirected(isDirected: boolean): void;
+        function setMediationService(mediationService: string): void;
+        function setUrlPrefix(urlPrefix: string): void;
+    }
+}
+
+/**
+ * FileSystem
+ */
+export namespace FileSystem {
+    type FileInfo = {
+        exists: true;
+        isDirectory: boolean;
+        uri: string;
+        size: number;
+        modificationTime: number;
+        md5?: Md5;
+    } | {
+        exists: false;
+        isDirectory: false;
+    };
+
+    interface DownloadResult {
+        uri: string;
+        status: number;
+        headers: { [name: string]: string };
+        md5?: Md5;
+    }
+
+    const documentDirectory: string;
+    const cacheDirectory: string;
+
+    function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
+    function readAsStringAsync(fileUri: string): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string): Promise<void>;
+    function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
+    function moveAsync(options: { from: string, to: string; }): Promise<void>;
+    function copyAsync(options: { from: string, to: string; }): Promise<void>;
+    function makeDirectoryAsync(dirUri: string, options?: { intermediates: boolean }): Promise<void>;
+    function readDirectoryAsync(dirUri: string): Promise<string[]>;
+    function downloadAsync(uri: string, fileUri: string, options?: { md5?: boolean; }): Promise<DownloadResult>;
+    function createDownloadResumable(
+        uri: string,
+        fileUri: string,
+        options?: DownloadOptions,
+        callback?: (totalBytesWritten: number, totalBytesExpectedToWrite: number) => void,
+        resumeData?: string | null
+    ): DownloadResumable;
+
+    interface PauseResult {
+        url: string;
+        fileUri: string;
+        options: { md5: boolean; };
+        resumeData: string;
+    }
+
+    interface DownloadOptions {
+        md5?: boolean;
+        headers?: { [name: string]: string };
+    }
+
+    interface DownloadProgressData {
+        totalBytesWritten: number;
+        totalBytesExpectedToWrite: number;
+    }
+
+    type DownloadProgressCallback = (data: DownloadProgressData) => void;
+
+    class DownloadResumable {
+        constructor(
+            url: string,
+            fileUri: string,
+            options: DownloadOptions,
+            callback?: DownloadProgressCallback,
+            resumeData?: string
+        );
+
+        downloadAsync(): Promise<DownloadResult>;
+        pauseAsync(): Promise<PauseResult>;
+        resumeAsync(): Promise<DownloadResult>;
+        savable(): PauseResult;
+    }
+}
+
+/**
+ * Fingerprint
+ */
+export namespace Fingerprint {
+    type FingerprintAuthenticationResult = { success: true } | { success: false, error: string };
+
+    function hasHardwareAsync(): Promise<boolean>;
+    function isEnrolledAsync(): Promise<boolean>;
+    function authenticateAsync(promptMessageIOS?: string): Promise<FingerprintAuthenticationResult>;
+    function cancelAuthenticate(): void;
+}
+
+/**
+ * Font
+ */
+export namespace Font {
+    interface FontMap {
+        [name: string]: RequireSource;
+    }
+
+    function loadAsync(name: string, url: string): Promise<void>;
+    function loadAsync(map: FontMap): Promise<void>;
+}
+
+/**
+ * GLView
+ */
+export interface GLViewProps extends ViewProperties {
+    onContextCreate(): void;
+    msaaSamples: number;
+}
+export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }
+
+/**
+ * Google
+ */
+export namespace Google {
+    interface LogInConfig {
+        androidClientId?: string;
+        androidStandaloneAppClientId?: string;
+        iosClientId?: string;
+        iosStandaloneAppClientId?: string;
+        webClientId?: string;
+        behavior?: 'system' | 'web';
+        scopes?: string[];
+    }
+
+    type LogInResult = {
+        type: 'cancel';
+    } | {
+        type: 'success';
+        accessToken: string;
+        idToken?: string;
+        refreshToken?: string;
+        serverAuthCode?: string;
+        user: {
+            id: string;
+            name: string;
+            givenName: string;
+            familyName: string;
+            photoUrl?: string;
+            email?: string;
+        }
+    };
+
+    function logInAsync(config: LogInConfig): Promise<LogInResult>;
+}
+
+/**
+ * Gyroscope
+ */
+export namespace Gyroscope {
+    interface GyroscopeObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: GyroscopeObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Image Picker
+ */
+export namespace ImagePicker {
+    interface ImageInfo {
+        uri: string;
+        width: number;
+        height: number;
+    }
+
+    type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
+
+    interface _MediaTypeOptions {
+        All: 'All';
+        Videos: 'Videos';
+        Images: 'Images';
+    }
+
+    const MediaTypeOptions: _MediaTypeOptions;
+
+    interface ImageLibraryOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+        mediaTypes?: keyof _MediaTypeOptions;
+    }
+
+    function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
+
+    interface CameraOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+    }
+    function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
+}
+
+/**
+ * IntentLauncherAndroid
+ */
+export namespace IntentLauncherAndroid {
+    const ACTION_ACCESSIBILITY_SETTINGS: string;
+    const ACTION_APP_NOTIFICATION_REDACTION: string;
+    const ACTION_CONDITION_PROVIDER_SETTINGS: string;
+    const ACTION_NOTIFICATION_LISTENER_SETTINGS: string;
+    const ACTION_PRINT_SETTINGS: string;
+    const ACTION_ADD_ACCOUNT_SETTINGS: string;
+    const ACTION_AIRPLANE_MODE_SETTINGS: string;
+    const ACTION_APN_SETTINGS: string;
+    const ACTION_APPLICATION_DETAILS_SETTINGS: string;
+    const ACTION_APPLICATION_DEVELOPMENT_SETTINGS: string;
+    const ACTION_APPLICATION_SETTINGS: string;
+    const ACTION_APP_NOTIFICATION_SETTINGS: string;
+    const ACTION_APP_OPS_SETTINGS: string;
+    const ACTION_BATTERY_SAVER_SETTINGS: string;
+    const ACTION_BLUETOOTH_SETTINGS: string;
+    const ACTION_CAPTIONING_SETTINGS: string;
+    const ACTION_CAST_SETTINGS: string;
+    const ACTION_DATA_ROAMING_SETTINGS: string;
+    const ACTION_DATE_SETTINGS: string;
+    const ACTION_DEVICE_INFO_SETTINGS: string;
+    const ACTION_DEVICE_NAME: string;
+    const ACTION_DISPLAY_SETTINGS: string;
+    const ACTION_DREAM_SETTINGS: string;
+    const ACTION_HARD_KEYBOARD_SETTINGS: string;
+    const ACTION_HOME_SETTINGS: string;
+    const ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS: string;
+    const ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS: string;
+    const ACTION_INPUT_METHOD_SETTINGS: string;
+    const ACTION_INPUT_METHOD_SUBTYPE_SETTINGS: string;
+    const ACTION_INTERNAL_STORAGE_SETTINGS: string;
+    const ACTION_LOCALE_SETTINGS: string;
+    const ACTION_LOCATION_SOURCE_SETTINGS: string;
+    const ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS: string;
+    const ACTION_MANAGE_APPLICATIONS_SETTINGS: string;
+    const ACTION_MANAGE_DEFAULT_APPS_SETTINGS: string;
+    const ACTION_MEMORY_CARD_SETTINGS: string;
+    const ACTION_MONITORING_CERT_INFO: string;
+    const ACTION_NETWORK_OPERATOR_SETTINGS: string;
+    const ACTION_NFCSHARING_SETTINGS: string;
+    const ACTION_NFC_PAYMENT_SETTINGS: string;
+    const ACTION_NFC_SETTINGS: string;
+    const ACTION_NIGHT_DISPLAY_SETTINGS: string;
+    const ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS: string;
+    const ACTION_NOTIFICATION_SETTINGS: string;
+    const ACTION_PAIRING_SETTINGS: string;
+    const ACTION_PRIVACY_SETTINGS: string;
+    const ACTION_QUICK_LAUNCH_SETTINGS: string;
+    const ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: string;
+    const ACTION_SECURITY_SETTINGS: string;
+    const ACTION_SETTINGS: string;
+    const ACTION_SHOW_ADMIN_SUPPORT_DETAILS: string;
+    const ACTION_SHOW_INPUT_METHOD_PICKER: string;
+    const ACTION_SHOW_REGULATORY_INFO: string;
+    const ACTION_SHOW_REMOTE_BUGREPORT_DIALOG: string;
+    const ACTION_SOUND_SETTINGS: string;
+    const ACTION_STORAGE_MANAGER_SETTINGS: string;
+    const ACTION_SYNC_SETTINGS: string;
+    const ACTION_SYSTEM_UPDATE_SETTINGS: string;
+    const ACTION_TETHER_PROVISIONING_UI: string;
+    const ACTION_TRUSTED_CREDENTIALS_USER: string;
+    const ACTION_USAGE_ACCESS_SETTINGS: string;
+    const ACTION_USER_DICTIONARY_INSERT: string;
+    const ACTION_USER_DICTIONARY_SETTINGS: string;
+    const ACTION_USER_SETTINGS: string;
+    const ACTION_VOICE_CONTROL_AIRPLANE_MODE: string;
+    const ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE: string;
+    const ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE: string;
+    const ACTION_VOICE_INPUT_SETTINGS: string;
+    const ACTION_VPN_SETTINGS: string;
+    const ACTION_VR_LISTENER_SETTINGS: string;
+    const ACTION_WEBVIEW_SETTINGS: string;
+    const ACTION_WIFI_IP_SETTINGS: string;
+    const ACTION_WIFI_SETTINGS: string;
+    const ACTION_WIRELESS_SETTINGS: string;
+    const ACTION_ZEN_MODE_AUTOMATION_SETTINGS: string;
+    const ACTION_ZEN_MODE_EVENT_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_PRIORITY_SETTINGS: string;
+    const ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_SETTINGS: string;
+
+    function startActivityAsync(activity: string, data?: HashMap): Promise<boolean>;
+}
+
+/**
+ * KeepAwake
+ */
+export class KeepAwake extends Component {
+    static activate(): void;
+    static deactivate(): void;
+}
+
+/**
+ * LinearGradient
+ */
+export interface LinearGradientProps {
+    colors: string[];
+    start: [number, number];
+    end: [number, number];
+    locations: number[];
+}
+
+export class LinearGradient extends Component<LinearGradientProps> { }
+
+/**
+ * Location
+ */
+export namespace Location {
+    interface LocationOptions {
+        enableHighAccuracy?: boolean;
+        timeInterval?: number;
+        distanceInterval?: number;
+    }
+
+    interface LocationProps {
+        latitude: number;
+        longitude: number;
+    }
+
+    interface Coords extends LocationProps {
+        altitude: number;
+        accuracy: number;
+    }
+
+    interface LocationData {
+        coords: {
+            heading: number;
+            speed: number
+        } & Coords;
+        timestamp: number;
+    }
+
+    interface ProviderStatus {
+        locationServicesEnabled: boolean;
+        gpsAvailable?: boolean;
+        networkAvailable?: boolean;
+        passiveAvailable?: boolean;
+    }
+
+    interface HeadingStatus {
+        magHeading: number;
+        trueHeading: number;
+        accuracy: number;
+    }
+
+    interface GeocodeData {
+        city: string;
+        street: string;
+        region: string;
+        postalCode: string;
+        country: string;
+        name: string;
+    }
+
+    type LocationCallback = (data: LocationData) => void;
+
+    function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
+    function watchPositionAsync(options: LocationOptions, callback: LocationCallback): EventSubscription;
+    function getProviderStatusAsync(): Promise<ProviderStatus>;
+    function getHeadingAsync(): Promise<HeadingStatus>;
+    function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
+    function geocodeAsync(address: string): Promise<Coords>;
+    function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData>;
+    function setApiKey(key: string): void;
+}
+
+/**
+ * Magnetometer
+ */
+export namespace Magnetometer {
+    interface MagnetometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: MagnetometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Notifications
+ */
+export namespace Notifications {
+    interface Notification {
+        origin: 'selected' | 'received';
+        data: any;
+        remote: boolean;
+        isMultiple: boolean;
+    }
+
+    interface LocalNotification {
+        title: string;
+        body?: string;
+        data?: any;
+        ios?: {
+            sound?: boolean
+        };
+        android?: {
+            sound?: boolean;
+            icon?: string;
+            color?: string;
+            priority?: 'min' | 'low' | 'high' | 'max';
+            sticky?: boolean;
+            vibrate?: boolean | number[];
+            link?: string;
+        };
+    }
+
+    type LocalNotificationId = string | number;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    function getExponentPushTokenAsync(): Promise<string>;
+    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
+    function scheduleLocalNotificationAsync(
+        localNotification: LocalNotification,
+        schedulingOptions: { time: Date | number, repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year' }
+    ): Promise<LocalNotificationId>;
+    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function dismissAllNotificationsAsync(): Promise<void>;
+    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+    function getBadgeNumberAsync(): Promise<number>;
+    function setBadgeNumberAsync(number: number): Promise<void>;
+}
+
+/**
+ * Pedometer
+ */
+export namespace Pedometer {
+    function isAvailableAsync(): Promise<boolean>;
+    function getStepCountAsync(start: Date, end: Date): Promise<{ steps: number; }>;
+    function watchStepCount(callback: (params: { steps: number; }) => void): EventSubscription;
+}
+
+/**
+ * Permissions
+ */
+export namespace Permissions {
+    type PermissionType = 'remoteNotifications' | 'location' |
+        'camera' | 'contacts' | 'audioRecording';
+    type PermissionStatus = 'undetermined' | 'granted' | 'denied';
+    type PermissionExpires = 'never';
+    interface PermissionDetailsLocationIOS {
+        scope: 'whenInUse' | 'always';
+    }
+    interface PermissionDetailsLocationAndroid {
+        scope: 'fine' | 'coarse' | 'none';
+    }
+    interface PermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        ios?: PermissionDetailsLocationIOS;
+        android?: PermissionDetailsLocationAndroid;
+    }
+
+    function getAsync(type: PermissionType): Promise<PermissionResponse>;
+    function askAsync(type: PermissionType): Promise<PermissionResponse>;
+
+    const CAMERA: string;
+    const CAMERA_ROLL: string;
+    const AUDIO_RECORDING: string;
+    const LOCATION: string;
+    const REMOTE_NOTIFICATIONS: string;
+    const NOTIFICATIONS: string;
+    const CONTACTS: string;
+}
+
+/**
+ * Register Root Component
+ */
+export function registerRootComponent(component: Component): Component;
+
+/**
+ * ScreenOrientation
+ */
+export namespace ScreenOrientation {
+    interface Orientation {
+        ALL: 'ALL';
+        ALL_BUT_UPSIDE_DOWN: 'ALL_BUT_UPSIDE_DOWN';
+        PORTRAIT: 'PORTRAIT';
+        PORTRAIT_UP: 'PORTRAIT_UP';
+        PORTRAIT_DOWN: 'PORTRAIT_DOWN';
+        LANDSCAPE: 'LANDSCAPE';
+        LANDSCAPE_LEFT: 'LANDSCAPE_LEFT';
+        LANDSCAPE_RIGHT: 'LANDSCAPE_RIGHT';
+    }
+    const Orientation: Orientation;
+    function allow(orientation: string): void;
+}
+
+/**
+ * SecureStore
+ */
+export namespace SecureStore {
+    interface SecureStoreOptions {
+        keychainService?: string;
+        keychainAccessible?: number;
+    }
+    function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+    function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+    function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+}
+
+/**
+ * Segment
+ */
+export namespace Segment {
+    function initialize(keys: {
+        androidWriteKey: string;
+        iosWriteKey: string;
+    }): void;
+    function identify(userId: string): void;
+    function identifyWithTraits(userId: string, traits: object): void;
+    function track(event: string): void;
+    function reset(): void;
+    function trackWithProperties(event: string, properties: object): void;
+    function screen(screenName: string): void;
+    function screenWithProperties(screenName: string, properties: object): void;
+    function flush(): void;
+}
+
+/**
+ * Speech
+ */
+export namespace Speech {
+    interface SpeechOptions {
+        language?: string;
+        pitch?: number;
+        rate?: number;
+        onStart?: () => void;
+        onStopped?: () => void;
+        onDone?: () => void;
+        onError?: (error: string) => void;
+    }
+
+    function speak(text: string, options?: SpeechOptions): void;
+    function stop(): void;
+    function isSpeakingAsync(): Promise<boolean>;
+}
+
+/**
+ * SQLite
+ */
+export namespace SQLite {
+    type Error = any;
+
+    interface Database {
+        transaction(
+            callback: (transaction: Transaction) => any,
+            error?: (error: Error) => any,     // TODO def of error
+            success?: () => any
+        ): void;
+    }
+
+    interface Transaction {
+        executeSql(
+            sqlStatement: string,
+            arguments?: string[] | number[],
+            success?: (transaction: Transaction, resultSet: ResultSet) => any,
+            error?: (transaction: Transaction, error: Error) => any
+        ): void;
+    }
+
+    interface ResultSet {
+        insertId: number;
+        rowAffected: number;
+        rows: {
+            length: number;
+            item: (index: number) => any;
+            _array: HashMap[];
+        };
+    }
+
+    function openDatabase(
+        name: string | {
+            name: string,
+            version?: string,
+            description?: string,
+            size?: number,
+            callback?: () => any
+        },
+        version?: string,
+        description?: string,
+        size?: number,
+        callback?: () => any
+    ): any;
+}
+
+/**
+ * Svg
+ */
+export interface SvgCommonProps {
+    fill?: string;
+    fillOpacity?: number | string;
+    stroke?: string;
+    strokeWidth?: number | string;
+    strokeOpacity?: number | string;
+    strokeLinecap?: string;
+    strokeLineJoin?: string;
+    strokeDasharray?: any[];
+    strokeDashoffset?: any;
+    x?: number | string;
+    y?: number | string;
+    rotate?: number | string;
+    scale?: number | string;
+    origin?: number | string;
+    originX?: number | string;
+    originY?: number | string;
+    id?: string;
+    disabled?: boolean;
+    onPress?: () => any;
+    onPressIn?: () => any;
+    onPressOut?: () => any;
+    onLongPress?: () => any;
+    delayPressIn?: number;
+    delayPressOut?: number;
+    delayLongPress?: number;
+}
+
+export interface SvgRectProps extends SvgCommonProps {
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgCircleProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    r: number | string;
+}
+
+export interface SvgEllipseProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+}
+
+export interface SvgLineProps extends SvgCommonProps {
+    x1: number | string;
+    y1: number | string;
+    x2: number | string;
+    y2: number | string;
+}
+
+export interface SvgPolyProps extends SvgCommonProps {
+    points: string;
+}
+
+export interface SvgPathProps extends SvgCommonProps {
+    d: string;
+}
+
+export interface SvgTextProps extends SvgCommonProps {
+    textAnchor?: string;
+    fontSize?: number | string;
+    fontWeight?: string;
+}
+
+export interface SvgTSpanProps extends SvgTextProps {
+    dx?: string;
+    dy?: string;
+}
+
+export interface SvgTextPathProps extends SvgCommonProps {
+    href?: string;
+    startOffset?: string;
+}
+
+export interface SvgUseProps extends SvgCommonProps {
+    href: string;
+    x: number | string;
+    y: number | string;
+}
+
+export interface SvgSymbolProps extends SvgCommonProps {
+    viewBox: string;
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgLinearGradientProps extends SvgCommonProps {
+    x1: number | string;
+    x2: number | string;
+    y1: number | string;
+    y2: number | string;
+}
+
+export interface SvgRadialGradientProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+    fx: number | string;
+    fy: number | string;
+    gradientUnits?: string;
+}
+
+export interface SvgStopProps extends SvgCommonProps {
+    offset?: string;
+    stopColor?: string;
+    stopOpacity?: string;
+}
+
+export class Svg extends Component<{ width: number, height: number }> {
+    static Circle: ComponentClass<SvgCircleProps>;
+    static ClipPath: ComponentClass<SvgCommonProps>;
+    static Defs: ComponentClass<{ }>;
+    static Ellipse: ComponentClass<SvgEllipseProps>;
+    static G: ComponentClass<SvgCommonProps>;
+    static Line: ComponentClass<SvgLineProps>;
+    static LinearGradient: ComponentClass<SvgLinearGradientProps>;
+    static Path: ComponentClass<SvgPathProps>;
+    static Polygon: ComponentClass<SvgPolyProps>;
+    static Polyline: ComponentClass<SvgPolyProps>;
+    static RadialGradient: ComponentClass<SvgRadialGradientProps>;
+    static Rect: ComponentClass<SvgRectProps>;
+    static Stop: ComponentClass<SvgStopProps>;
+    static Symbol: ComponentClass<SvgSymbolProps>;
+    static Text: ComponentClass<SvgTextProps>;
+    static TextPath: ComponentClass<SvgTextPathProps>;
+    static TSpan: ComponentClass<SvgTSpanProps>;
+    static Use: ComponentClass<SvgUseProps>;
+}
+
+/**
+ * Take Snapshot
+ */
+export function takeSnapshotAsync(
+    view?: (number | React.ReactElement<any>),
+    options?: {
+        width?: number,
+        height?: number,
+        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
+        quality?: number,
+        result?: 'file' | 'base64' | 'data-uri',
+    }
+): Promise<string>;
+
+/**
+ * Util
+ */
+export namespace Util {
+    function getCurrentDeviceCountryAsync(): Promise<number>;
+    function getCurrentLocaleAsync(): Promise<string>;
+    function getCurrentTimeZoneAsync(): Promise<string>;
+    function reload(): void;
+    function addNewVersionListenerExperimental(listener: (event: {
+        manifest: object;
+    }) => void): { remove(): void; }; // Android only
+}
+
+/**
+ * Web Browser
+ */
+export namespace WebBrowser {
+    function openBrowserAsync(url: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function dismissBrowser(): Promise<{ type: 'dismissed' }>;
+}
+
+/**
+ * ImageManipulator
+ */
+export namespace ImageManipulator {
+    interface ImageResult {
+        uri: string;
+        width: number;
+        height: number;
+        base64?: string;
+    }
+    interface SaveOptions {
+        base64?: boolean;
+        compress?: FloatFromZeroToOne;
+        format?: 'jpeg' | 'png';
+    }
+    interface CropParameters {
+        originX: number;
+        originY: number;
+        width: number;
+        height: number;
+    }
+    interface ImageManipulationOptions {
+        resize?: { width?: number; height?: number };
+        rotate?: number;
+        flip?: { vertical?: boolean; horizontal?: boolean };
+        crop?: CropParameters;
+    }
+    function manipulate(uri: string, actions: ImageManipulationOptions, saveOptions?: SaveOptions): Promise<ImageResult>;
+}
+
+/**
+ * FaceDetector
+ */
+export namespace FaceDetector {
+    interface Point {
+        x: Axis;
+        y: Axis;
+    }
+    interface Face {
+        bounds: {
+            size: {
+                width: number;
+                height: number;
+            },
+            origin: Point;
+        };
+        smilingProbability?: number;
+        leftEarPosition?: Point;
+        rightEarPosition?: Point;
+        leftEyePosition?: Point;
+        leftEyeOpenProbability?: number;
+        rightEyePosition?: Point;
+        rightEyeOpenProbability?: number;
+        leftCheekPosition?: Point;
+        rightCheekPosition?: Point;
+        leftMouthPosition?: Point;
+        mouthPosition?: Point;
+        rightMouthPosition?: Point;
+        bottomMouthPosition?: Point;
+        noseBasePosition?: Point;
+        yawAngle?: number;
+        rollAngle?: number;
+    }
+    interface DetectFaceResult {
+        faces: Face[];
+        image: {
+            uri: string;
+            width: number;
+            height: number;
+            orientation: number;
+        };
+    }
+    interface Mode {
+        fast: 'fast';
+        accurate: 'accurate';
+    }
+    interface _Shared {
+        all: 'all';
+        none: 'none';
+    }
+    type Landmarks = _Shared;
+    type Classifications = _Shared;
+    interface _Constants {
+        Mode: Mode;
+        Landmarks: Landmarks;
+        Classifications: Classifications;
+    }
+
+    const Constants: _Constants;
+
+    interface Options {
+        mode?: keyof Mode;
+        detectLandmarks?: keyof Landmarks;
+        runClassifications?: keyof Classifications;
+    }
+
+    function detectFaces(uri: string, options?: Options): Promise<DetectFaceResult>;
+}
diff --git a/types/expo/tsconfig.json b/types/expo/tsconfig.json
new file mode 100644
index 0000000000..5d0f560837
--- /dev/null
+++ b/types/expo/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo-tests.tsx"
+    ]
+}
diff --git a/types/expo/tslint.json b/types/expo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/expo/v23/expo-tests.tsx b/types/expo/v23/expo-tests.tsx
new file mode 100644
index 0000000000..dd8696d5ba
--- /dev/null
+++ b/types/expo/v23/expo-tests.tsx
@@ -0,0 +1,204 @@
+import * as React from 'react';
+
+import {
+    Accelerometer,
+    Amplitude,
+    Asset,
+    AuthSession,
+    Audio,
+    AppLoading,
+    BarCodeScanner,
+    BlurViewProps,
+    BlurView,
+    Brightness,
+    Camera,
+    DocumentPicker,
+    Facebook,
+    FacebookAds,
+    FileSystem,
+	ImagePicker
+} from 'expo';
+
+Accelerometer.addListener((obj) => {
+    obj.x;
+    obj.y;
+    obj.z;
+});
+Accelerometer.removeAllListeners();
+Accelerometer.setUpdateInterval(1000);
+
+Amplitude.initialize('key');
+Amplitude.setUserId('userId');
+Amplitude.setUserProperties({key: 1});
+Amplitude.clearUserProperties();
+Amplitude.logEvent('name');
+Amplitude.logEventWithProperties('event', {key: 'value'});
+Amplitude.setGroup('type', {key: 'value'});
+
+const asset = Asset.fromModule(1);
+asset.downloadAsync();
+Asset.loadAsync(1);
+Asset.loadAsync([1, 2, 3]);
+const asset1 = new Asset({
+    uri: 'uri',
+    type: 'type',
+    name: 'name',
+    hash: 'hash',
+    width: 122,
+    height: 122
+});
+
+const url = AuthSession.getRedirectUrl();
+AuthSession.dismiss();
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: 'url2'
+}).then(result => {
+    switch (result.type) {
+        case 'success':
+            result.event;
+            result.params;
+            break;
+        case 'error':
+            result.errorCode;
+            result.params;
+            result.event;
+            break;
+        case 'dismissed':
+        case 'cancel':
+            result.type;
+            break;
+    }
+});
+
+Audio.setAudioModeAsync({
+    shouldDuckAndroid: false,
+    playsInSilentModeIOS: true,
+    interruptionModeIOS: 2,
+    interruptionModeAndroid: 1,
+    allowsRecordingIOS: true
+});
+Audio.setIsEnabledAsync(true);
+async () => {
+    const result = await Audio.Sound.create('uri', {
+        volume: 0.5,
+        rate: 0.6
+    }, null, true);
+
+    const sound = result.sound;
+    const status = result.status;
+
+    if (!status.isLoaded) {
+        status.error;
+    } else {
+        status.didJustFinish;
+        // etc.
+    }
+
+    const _status = await sound.getStatusAsync();
+    await sound.loadAsync('uri');
+};
+
+() => (
+    <AppLoading
+        startAsync={() => Promise.resolve()}
+        onFinish={() => {}}
+        onError={(error) => console.log(error)} />
+);
+() => (
+    <AppLoading
+        startAsync={null}
+        onFinish={null}
+        onError={null} />
+);
+
+const barcodeReadCallback = () => {};
+() => (
+    <BarCodeScanner
+        type="front"
+        torchMode="off"
+        barCodeTypes={['s']}
+        onBarCodeRead={barcodeReadCallback} />
+);
+
+() => (
+    <BlurView
+        tint="dark"
+        intensity={2} />
+);
+
+async () => {
+    await Brightness.setBrightnessAsync(.6);
+    await Brightness.setSystemBrightnessAsync(.7);
+    const br1 = await Brightness.getBrightnessAsync();
+    const br2 = await Brightness.getSystemBrightnessAsync();
+};
+
+Camera.Constants.AutoFocus;
+Camera.Constants.Type;
+Camera.Constants.FlashMode;
+Camera.Constants.WhiteBalance;
+Camera.Constants.VideoQuality;
+Camera.Constants.BarCodeType;
+() => {
+    return(<Camera ref={(component: any) => {
+        if (component) {
+            component.recordAsync();
+        }
+    }} />);
+};
+
+async () => {
+    const result = await DocumentPicker.getDocumentAsync();
+
+    if (result.type === 'success') {
+        result.name;
+        result.uri;
+        result.size;
+    }
+};
+
+async () => {
+    const result = await Facebook.logInWithReadPermissionsAsync('appId');
+
+    if (result.type === 'success') {
+        result.expires;
+        result.token;
+    }
+};
+
+() => (
+    <FacebookAds.BannerView
+        type="large"
+        placementId="str"
+        onPress={() => {}}
+        onError={() => {}} />
+);
+
+async () => {
+    const info = await FileSystem.getInfoAsync('file');
+
+    info.exists;
+    info.isDirectory;
+
+    if (info.exists) {
+        info.md5;
+        info.uri;
+        info.size;
+        info.modificationTime;
+    }
+
+    const string: string = await FileSystem.readAsStringAsync('file');
+    await FileSystem.writeAsStringAsync('file', 'content');
+    await FileSystem.deleteAsync('file');
+    await FileSystem.moveAsync({ from: 'from', to: 'to'});
+    await FileSystem.copyAsync({ from: 'from', to: 'to' });
+    await FileSystem.makeDirectoryAsync('dir');
+    const dirs: string[] = await FileSystem.readDirectoryAsync('dir');
+    const result = await FileSystem.downloadAsync('from', 'to');
+
+    result.headers;
+    result.status;
+    result.uri;
+    result.md5;
+};
diff --git a/types/expo/v23/index.d.ts b/types/expo/v23/index.d.ts
new file mode 100644
index 0000000000..076cd43f8c
--- /dev/null
+++ b/types/expo/v23/index.d.ts
@@ -0,0 +1,1482 @@
+// Type definitions for expo 23.0
+// Project: https://github.com/expo/expo-sdk
+// Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { EventSubscription } from 'fbemitter';
+import { Component, Ref } from 'react';
+import {
+    ViewStyle,
+    ViewProperties,
+    ColorPropType,
+    ImageURISource,
+    NativeEventEmitter,
+    ImageRequireSource
+} from 'react-native';
+
+export type URISource = ImageURISource;
+export type RequireSource = ImageRequireSource;
+export type ResizeModeContain = 'contain';
+export type ResizeModeCover = 'cover';
+export type ResizeModeStretch = 'stretch';
+export type Orientation = 'portrait' | 'landscape';
+export type Axis = number;
+export interface HashMap { [key: string]: any; }
+export type FloatFromZeroToOne = 0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1;
+export type BarCodeReadCallback = (params: { type: string; data: string; }) => void;
+export type Md5 = string;
+
+/**
+ * Accelerometer
+ */
+export namespace Accelerometer {
+    interface AccelerometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: AccelerometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Amplitude
+ */
+export namespace Amplitude {
+    function initialize(apiKey: string): void;
+    function setUserId(userId: string): void;
+    function setUserProperties(userProperties: HashMap): void;
+    function clearUserProperties(): void;
+    function logEvent(eventName: string): void;
+    function logEventWithProperties(eventName: string, properties: HashMap): void;
+    function setGroup(groupType: string, groupNames: HashMap): void;
+}
+
+/**
+ * Asset
+ */
+export class Asset {
+    constructor({ name, type, hash, uri, width, height }: {
+        name: string;
+        type: string;
+        hash: string;
+        uri: string;
+        width?: number;
+        height?: number;
+    });
+    name: string;
+    type: string;
+    hash: string;
+    uri: string;
+    localUri: string;
+    width?: number;
+    height?: number;
+
+    downloading: boolean;
+    downloaded: boolean;
+    downloadCallbacks: Array<{ resolve: () => any, reject: (e?: any) => any }>;
+
+    downloadAsync(): Promise<void>;
+
+    static fromModule(module: RequireSource): Asset;
+    static loadAsync(module: RequireSource[] | RequireSource): Promise<void>;
+}
+
+/**
+ * AuthSession
+ */
+export namespace AuthSession {
+    function startAsync(options: { authUrl: string; returnUrl: string; }): Promise<{
+        type: 'cancel';
+    } | {
+        type: 'dismissed';
+    } | {
+        type: 'success';
+        params: HashMap;
+        event: HashMap;
+    } | {
+        type: 'error';
+        params: HashMap;
+        errorCode: string;
+        event: HashMap;
+    }>;
+    function dismiss(): void;
+    function getRedirectUrl(): string;
+}
+
+/**
+ * AV
+ */
+export type PlaybackStatus = {
+    isLoaded: false;
+    androidImplementation?: string;
+    error?: string;
+} | {
+    isLoaded: true;
+    androidImplementation?: string;
+    uri: string;
+    progressUpdateIntervalMillis: number;
+    durationMillis?: number;
+    positionMillis: number;
+    playableDurationMillis?: number;
+    shouldPlay: boolean;
+    isPlaying: boolean;
+    isBuffering: boolean;
+    rate: number;
+    shouldCorrectPitch: boolean;
+    volume: number;
+    isMuted: boolean;
+    isLooping: boolean;
+    didJustFinish: boolean;
+};
+
+export interface PlaybackStatusToSet {
+    androidImplementation?: string;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: FloatFromZeroToOne;
+    shouldCorrectPitch?: boolean;
+    volume?: FloatFromZeroToOne;
+    isMuted?: boolean;
+    isLooping?: boolean;
+}
+
+export type Source = string | RequireSource | Asset;
+
+export class PlaybackObject {
+    loadAsync(source: Source, initialStatus?: PlaybackStatusToSet, downloadFirst?: boolean): Promise<PlaybackStatus>;
+    unloadAsync(): Promise<PlaybackStatus>;
+    getStatusAsync(): Promise<PlaybackStatus>;
+    setOnPlaybackStatusUpdate(onPlaybackStatusUpdate: (status: PlaybackStatus) => void): void;
+    setStatusAsync(status: PlaybackStatusToSet): Promise<PlaybackStatus>;
+    playAsync(): Promise<PlaybackStatus>;
+    playFromPositionAsync(positionMillis: number): Promise<PlaybackStatus>;
+    pauseAsync(): Promise<PlaybackStatus>;
+    stopAsync(): Promise<PlaybackStatus>;
+    setPositionAsync(positionMillis: number): Promise<PlaybackStatus>;
+    setRateAsync(rate: number, shouldCorrectPitch: boolean): Promise<PlaybackStatus>;
+    setVolumeAsync(volume: number): Promise<PlaybackStatus>;
+    setIsMutedAsync(isMuted: boolean): Promise<PlaybackStatus>;
+    setIsLoopingAsync(isLooping: boolean): Promise<PlaybackStatus>;
+    setProgressUpdateIntervalAsync(progressUpdateIntervalMillis: number): Promise<PlaybackStatus>;
+}
+
+export namespace Audio {
+    enum InterruptionModeIOS {
+        INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS = 0,
+        INTERRUPTION_MODE_IOS_DO_NOT_MIX = 1,
+        INTERRUPTION_MODE_IOS_DUCK_OTHERS = 2
+    }
+
+    enum InterruptionModeAndroid {
+        INTERRUPTION_MODE_ANDROID_DO_NOT_MIX = 1,
+        INTERRUPTION_MODE_ANDROID_DUCK_OTHERS = 2
+    }
+
+    type RecordingStatus = {
+        canRecord: false,
+        isDoneRecording: false
+    } | {
+        canRecord: true,
+        isRecording: boolean,
+        durationMillis: number
+    } | {
+        canRecord: false,
+        isDoneRecording: true,
+        durationMillis: number
+    };
+
+    interface AudioMode {
+        playsInSilentModeIOS: boolean;
+        allowsRecordingIOS: boolean;
+        interruptionModeIOS: InterruptionModeIOS;
+        shouldDuckAndroid: boolean;
+        interruptionModeAndroid: InterruptionModeAndroid;
+    }
+
+    function setIsEnabledAsync(value: boolean): Promise<void>;
+    function setAudioModeAsync(mode: AudioMode): Promise<void>;
+
+    class Sound extends PlaybackObject {
+        constructor();
+
+        static create(
+            source: Source,
+            initialStatus?: PlaybackStatusToSet,
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null,
+            downloadFirst?: boolean
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+
+    interface RecordingOptions {
+        android: {
+            extension: string;
+            outputFormat: number;
+            audioEncoder: number;
+            sampleRate?: number;
+            numberOfChannels?: number;
+            bitRate?: number;
+            maxFileSize?: number;
+        };
+        ios: {
+            extension: string;
+            outputFormat?: string | number;
+            audioQuality: number;
+            sampleRate: number;
+            numberOfChannels: number;
+            bitRate: number;
+            bitRateStrategy?: number;
+            bitDepthHint?: number;
+            linearPCMBitDepth?: number;
+            linearPCMIsBigEndian?: boolean;
+            linearPCMIsFloat?: boolean;
+        };
+    }
+
+    class Recording {
+        constructor();
+
+        getStatusAsync(): Promise<RecordingStatus>;
+        setOnRecordingStatusUpdate(onRecordingStatusUpdate: (status: RecordingStatus) => void): void;
+        setProgressUpdateInterval(miliss: number): void;
+        prepareToRecordAsync(options: Recording): Promise<RecordingStatus>;
+        isPreparedToRecord(): boolean;
+        startAsync(): Promise<RecordingStatus>;
+        pauseAsync(): Promise<RecordingStatus>;
+        stopAndUnloadAsync(): Promise<RecordingStatus>;
+        getURI(): string | undefined;
+        createNewLoadedSound(initialStatus: PlaybackStatusToSet, onPlaybackStatusUpdate: (status: PlaybackStatus) => void): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+}
+
+/**
+ * Expo Video
+ */
+export interface NaturalSize {
+    width: number;
+    height: number;
+    orientation: Orientation;
+}
+
+export interface ReadyForDisplayEvent {
+    naturalSize: NaturalSize;
+    status: PlaybackStatus;
+}
+
+export enum FullscreenUpdateVariants {
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT = 0,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT = 1,
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS = 2,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS = 3
+}
+
+export interface FullscreenUpdateEvent {
+    fullscreenUpdate: FullscreenUpdateVariants;
+    status: PlaybackStatus;
+}
+
+export interface VideoProps {
+    source?: Source | null;
+    posterSource?: URISource | RequireSource;
+
+    resizeMode?: ResizeModeContain | ResizeModeCover | ResizeModeStretch;
+    useNativeControls?: boolean;
+    usePoster?: boolean;
+
+    onPlaybackStatusUpdate?: (status: PlaybackStatus) => void;
+    onReadyForDisplay?: (event: ReadyForDisplayEvent) => void;
+    onIOSFullscreenUpdate?: (event: FullscreenUpdateEvent) => void;
+
+    onLoadStart?: () => void;
+    onLoad?: (status: PlaybackStatus) => void;
+    onError?: (error: string) => void;
+
+    status?: PlaybackStatusToSet;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    volume?: number;
+    isMuted?: boolean;
+    isLooping?: boolean;
+
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
+    rotation?: number;
+    ref?: Ref<PlaybackObject>;
+}
+
+export interface VideoState {
+    showPoster: boolean;
+}
+
+export class Video extends Component<VideoProps, VideoState> {
+    static RESIZE_MODE_CONTAIN: ResizeModeContain;
+    static RESIZE_MODE_COVER: ResizeModeCover;
+    static RESIZE_MODE_STRETCH: ResizeModeStretch;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS;
+}
+
+/**
+ * AppLoading
+ */
+export type AppLoadingProperties = {
+    startAsync: () => Promise<void>;
+    onFinish: () => void;
+    onError?: (error: Error) => void;
+} | {
+    startAsync: null;
+    onFinish: null;
+    onError?: null;
+};
+export class AppLoading extends Component<AppLoadingProperties> { }
+
+/**
+ * BarCodeScanner
+ */
+export interface BarCodeScannerProps extends ViewProperties {
+    type?: 'front' | 'back';
+    torchMode?: 'on' | 'off';
+    barCodeTypes?: string[];
+    onBarCodeRead?: BarCodeReadCallback;
+}
+
+export class BarCodeScanner extends Component<BarCodeScannerProps> { }
+
+/**
+ * BlurView
+ */
+export interface BlurViewProps extends ViewProperties {
+    tint: 'light' | 'default' | 'dark';
+    intensity: number;
+}
+export class BlurView extends Component<BlurViewProps> { }
+
+/**
+ * Brightness
+ */
+export namespace Brightness {
+    function setBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+    function getBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function getSystemBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function setSystemBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+}
+
+/**
+ * Camera
+ */
+export interface TakePictureOptions {
+    quality?: number;
+    base64?: boolean;
+    exif?: boolean;
+}
+export interface PictureResponse {
+    uri: string;
+    width: number;
+    height: number;
+    exif: string;
+    base64: string;
+}
+export interface RecordOptions {
+    quality?: string;
+    maxDuration?: number;
+    maxFileSize?: number;
+    mute?: boolean;
+}
+export class CameraObject {
+    takePictureAsync(options: TakePictureOptions): Promise<PictureResponse>;
+    recordAsync(options: RecordOptions): Promise<{ uri: string; }>;
+    stopRecording(): void;
+    getSupportedRatiosAsync(): Promise<string[]>; // Android only
+}
+export interface CameraProperties extends ViewProperties {
+    flashMode?: string | number;
+    type?: string | number;
+    ratio?: string;
+    autoFocus?: string | number | boolean;
+    focusDepth?: FloatFromZeroToOne;
+    zoom?: FloatFromZeroToOne;
+    whiteBalance?: string | number;
+    barCodeTypes?: string[];
+    onCameraReady?: () => void;
+    onMountError?: () => void;
+    onBarCodeRead?: BarCodeReadCallback;
+    ref?: Ref<CameraObject>;
+}
+export interface CameraConstants {
+    readonly Type: string;
+    readonly FlashMode: string;
+    readonly AutoFocus: string;
+    readonly WhiteBalance: string;
+    readonly VideoQuality: string;
+    readonly BarCodeType: string;
+}
+export class Camera extends Component<CameraProperties> {
+    static readonly Constants: CameraConstants;
+}
+
+/**
+ * Constants
+ */
+export namespace Constants {
+    const appOwnership: 'expo' | 'standalone' | 'guest';
+    const expoVersion: string;
+    const deviceId: string;
+    const deviceName: string;
+    const deviceYearClass: number;
+    const isDevice: boolean;
+
+    interface Platform {
+        ios: {
+            platform: string;
+            model: string;
+            userInterfaceIdiom: string;
+        };
+    }
+    const platform: Platform;
+    const sessionId: string;
+    const statusBarHeight: number;
+    const systemFonts: string[];
+
+    interface Manifest {
+        name: string;
+        description?: string;
+        slug?: string;
+        sdkVersion?: string;
+        version?: string;
+        orientation?: Orientation;
+        primaryColor?: string;
+        privacy?: 'public' | 'unlisted';
+        scheme?: string;
+        icon?: string;
+        platforms?: string[];
+        githubUrl?: string;
+        notification?: {
+            icon?: string,
+            color?: string,
+            androidMode?: 'default' | 'collapse',
+            androidCollapsedTitle?: string
+        };
+        loading?: {
+            icon?: string,
+            exponentIconColor?: 'white' | 'blue',
+            exponentIconGrayscale?: 1 | 0,
+            backgroundImage?: string,
+            backgroundColor?: string,
+            hideExponentText?: boolean
+        };
+        appKey?: string;
+        androidStatusBar?: {
+            barStyle?: 'lignt-content' | 'dark-content',
+            backgroundColor?: string
+        };
+        androidShowExponentNotificationInShellApp?: boolean;
+        extra?: {
+            [propName: string]: any
+        };
+        rnCliPath?: any;
+        entryPoint?: string;
+        packagerOpts?: {
+            hostType?: string,
+            dev?: boolean,
+            strict?: boolean,
+            minify?: boolean,
+            urlType?: string,
+            urlRandomness?: string,
+            lanType?: string,
+            [propName: string]: any
+        };
+        ignoreNodeModulesValidation?: any;
+        nodeModulesPath?: string;
+        ios?: {
+            bundleIdentifier?: string,
+            buildNumber?: string,
+            config?: {
+                usesNonExemptEncryption?: boolean,
+                googleSignIn?: {
+                    reservedClientId: string
+                }
+            },
+            supportsTablet?: boolean,
+            infoPlist?: any
+        };
+        android?: {
+            package?: string,
+            versionCode?: string,
+            config?: {
+                fabric?: {
+                    apiKey: string,
+                    buildSecret: string
+                },
+                googleMaps?: {
+                    apiKey: string
+                },
+                googleSignIn?: {
+                    apiKey: string,
+                    certificateHash: string
+                }
+            }
+        };
+        facebookScheme?: any;
+        facebookAppId?: string;
+        facebookDisplayName?: string;
+        splash?: {
+            backgroundColor?: string;
+            resizeMode?: ResizeModeContain | ResizeModeCover;
+            image?: string;
+        };
+        assetBundlePatterns?: string[];
+        [propName: string]: any;
+    }
+    const manifest: Manifest;
+    const linkingUri: string;
+}
+
+/**
+ * Contacts
+ */
+export namespace Contacts {
+    type PhoneNumbers = 'phoneNumbers';
+    type Emails = 'emails';
+    type Addresses = 'addresses';
+    type Image = 'image';
+    type Thumbnail = 'thumbnail';
+    type Note = 'note';
+    type Birthday = 'birthday';
+    type NonGregorianBirthday = 'nonGregorianBirthday';
+    type NamePrefix = 'namePrefix';
+    type NameSuffix = 'nameSuffix';
+    type PhoneticFirstName = 'phoneticFirstName';
+    type PhoneticMiddleName = 'phoneticMiddleName';
+    type PhoneticLastName = 'phoneticLastName';
+    type SocialProfiles = 'socialProfiles';
+    type InstantMessageAddresses = 'instantMessageAddresses';
+    type UrlAddresses = 'urlAddresses';
+    type Dates = 'dates';
+    type Relationships = 'relationships';
+
+    const PHONE_NUMBERS: PhoneNumbers;
+    const EMAILS: Emails;
+    const ADDRESSES: Addresses;
+    const IMAGE: Image;
+    const THUMBNAIL: Thumbnail;
+    const NOTE: Note;
+    const BIRTHDAY: Birthday;
+    const NON_GREGORIAN_BIRTHDAY: NonGregorianBirthday;
+    const NAME_PREFIX: NamePrefix;
+    const NAME_SUFFIX: NameSuffix;
+    const PHONETIC_FIRST_NAME: PhoneticFirstName;
+    const PHONETIC_MIDDLE_NAME: PhoneticMiddleName;
+    const PHONETIC_LAST_NAME: PhoneticLastName;
+    const SOCIAL_PROFILES: SocialProfiles;
+    const IM_ADDRESSES: InstantMessageAddresses;
+    const URLS: UrlAddresses;
+    const DATES: Dates;
+    const RELATIONSHIPS: Relationships;
+
+    type FieldType = PhoneNumbers | Emails | Addresses | Image | Thumbnail |
+        Note | Birthday | NonGregorianBirthday | NamePrefix | NameSuffix |
+        PhoneticFirstName | PhoneticMiddleName | PhoneticLastName | SocialProfiles |
+        InstantMessageAddresses | UrlAddresses | Dates | Relationships;
+
+    interface Options {
+        pageSize?: number;
+        pageOffset?: number;
+        fields?: FieldType[];
+    }
+
+    interface Contact {
+        id: string;
+        contactType: string;
+        name: string;
+        firstName?: string;
+        middleName?: string;
+        lastName?: string;
+        previousLastName?: string;
+        namePrefix?: string;
+        nameSuffix?: string;
+        nickname?: string;
+        phoneticFirstName?: string;
+        phoneticMiddleName?: string;
+        phoneticLastName?: string;
+        emails?: Array<{
+            email?: string;
+            primary?: boolean;
+            label: string;
+            id: string;
+        }>;
+        phoneNumbers?: Array<{
+            number?: string;
+            primary?: boolean;
+            digits?: string;
+            countryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        addresses?: Array<{
+            street?: string;
+            city?: string;
+            country?: string;
+            region?: string;
+            neighborhood?: string;
+            postalCode?: string;
+            poBox?: string;
+            isoCountryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        socialProfiles?: Array<{
+            service?: string;
+            localizedProfile?: string;
+            url?: string;
+            username?: string;
+            userId?: string;
+            label: string;
+            id: string;
+        }>;
+        instantMessageAddresses?: Array<{
+            service?: string;
+            username?: string;
+            localizedService?: string;
+            label: string;
+            id: string;
+        }>;
+        urls?: {
+            label: string;
+            url?: string;
+            id: string;
+        };
+        company?: string;
+        jobTitle?: string;
+        department?: string;
+        imageAvailable?: boolean;
+        image?: {
+            uri?: string;
+        };
+        thumbnail?: {
+            uri?: string;
+        };
+        note?: string;
+        dates?: Array<{
+            day?: number;
+            month?: number;
+            year?: number;
+            id: string;
+            label: string;
+        }>;
+        relationships?: Array<{
+            label: string;
+            name?: string;
+            id: string;
+        }>;
+    }
+
+    interface Response {
+        data: Contact[];
+        total: number;
+        hasNextPage: boolean;
+        hasPreviousPage: boolean;
+    }
+
+    function getContactsAsync(options: Options): Promise<Response>;
+    function getContactByIdAsync(options: { id?: string; fields?: FieldType[] }): Promise<Contact>;
+}
+
+/**
+ * DocumentPicker
+ */
+export namespace DocumentPicker {
+    interface Options {
+        type?: string;
+    }
+    type Response = {
+        type: 'success';
+        uri: string;
+        name: string;
+        size: number;
+    } | {
+        type: 'cancel';
+    };
+
+    function getDocumentAsync(options?: Options): Promise<Response>;
+}
+
+/**
+ * ErrorRecovery
+ */
+export namespace ErrorRecovery {
+    function setRecoveryProps(props: HashMap): void;
+}
+
+/**
+ * Facebook
+ */
+export namespace Facebook {
+    interface Options {
+        permissions?: string[];
+        behavior?: 'web' | 'native' | 'browser' | 'system';
+    }
+    type Response = {
+        type: 'success';
+        token: string;
+        expires: number;
+    } | {
+        type: 'cancel';
+    };
+    function logInWithReadPermissionsAsync(appId: string, options?: Options): Promise<Response>;
+}
+
+/**
+ * Facebook Ads
+ */
+export namespace FacebookAds {
+    /**
+     * Interstitial Ads
+     */
+    namespace InterstitialAdManager {
+        function showAd(placementId: string): Promise<boolean>;
+    }
+
+    /**
+     * Native Ads
+     */
+    type MediaCachePolicy = 'none' | 'icon' | 'image' | 'all';
+    class NativeAdsManager {
+        constructor(placementId: string, numberOfAdsToRequest?: number);
+        disableAutoRefresh(): void;
+        setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
+    }
+
+    function withNativeAd(component: Component<{
+        icon?: string;
+        coverImage?: string;
+        title?: string;
+        subtitle?: string;
+        description?: string;
+        callToActionText?: string;
+        socialContext?: string;
+    }>): Component<{ adsManager: NativeAdsManager }, { ad: any, canRequestAds: boolean }>;
+
+    /**
+     * Banner View
+     */
+    type AdType = 'large' | 'rectangle' | 'standard';
+
+    interface BannerViewProps {
+        type: AdType;
+        placementId: string;
+        onPress: () => void;
+        onError: () => void;
+    }
+
+    class BannerView extends Component<BannerViewProps> { }
+
+    /**
+     * Ad Settings
+     */
+    namespace AdSettings {
+        const currentDeviceHash: string;
+        function addTestDevice(device: string): void;
+        function clearTestDevices(): void;
+        type SDKLogLevel = 'none' | 'debug' | 'verbose' | 'warning' | 'error' | 'notification';
+        function setLogLevel(logLevel: SDKLogLevel): void;
+        function setIsChildDirected(isDirected: boolean): void;
+        function setMediationService(mediationService: string): void;
+        function setUrlPrefix(urlPrefix: string): void;
+    }
+}
+
+/**
+ * FileSystem
+ */
+export namespace FileSystem {
+    type FileInfo = {
+        exists: true;
+        isDirectory: boolean;
+        uri: string;
+        size: number;
+        modificationTime: number;
+        md5?: Md5;
+    } | {
+        exists: false;
+        isDirectory: false;
+    };
+
+    interface DownloadResult {
+        uri: string;
+        status: number;
+        headers: { [name: string]: string };
+        md5?: Md5;
+    }
+
+    const documentDirectory: string;
+    const cacheDirectory: string;
+
+    function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
+    function readAsStringAsync(fileUri: string): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string): Promise<void>;
+    function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
+    function moveAsync(options: { from: string, to: string; }): Promise<void>;
+    function copyAsync(options: { from: string, to: string; }): Promise<void>;
+    function makeDirectoryAsync(dirUri: string, options?: { intermediates: boolean }): Promise<void>;
+    function readDirectoryAsync(dirUri: string): Promise<string[]>;
+    function downloadAsync(uri: string, fileUri: string, options?: { md5?: boolean; }): Promise<DownloadResult>;
+    function createDownloadResumable(
+        uri: string,
+        fileUri: string,
+        options?: DownloadOptions,
+        callback?: (totalBytesWritten: number, totalBytesExpectedToWrite: number) => void,
+        resumeData?: string | null
+    ): DownloadResumable;
+
+    interface PauseResult {
+        url: string;
+        fileUri: string;
+        options: { md5: boolean; };
+        resumeData: string;
+    }
+
+    interface DownloadOptions {
+        md5?: boolean;
+        headers?: { [name: string]: string };
+    }
+
+    interface DownloadProgressData {
+        totalBytesWritten: number;
+        totalBytesExpectedToWrite: number;
+    }
+
+    type DownloadProgressCallback = (data: DownloadProgressData) => void;
+
+    class DownloadResumable {
+        constructor(
+            url: string,
+            fileUri: string,
+            options: DownloadOptions,
+            callback?: DownloadProgressCallback,
+            resumeData?: string
+        );
+
+        downloadAsync(): Promise<DownloadResult>;
+        pauseAsync(): Promise<PauseResult>;
+        resumeAsync(): Promise<DownloadResult>;
+        savable(): PauseResult;
+    }
+}
+
+/**
+ * Fingerprint
+ */
+export namespace Fingerprint {
+    type FingerprintAuthenticationResult = { success: true } | { success: false, error: string };
+
+    function hasHardwareAsync(): Promise<boolean>;
+    function isEnrolledAsync(): Promise<boolean>;
+    function authenticateAsync(promptMessageIOS?: string): Promise<FingerprintAuthenticationResult>;
+    function cancelAuthenticate(): void;
+}
+
+/**
+ * Font
+ */
+export namespace Font {
+    interface FontMap {
+        [name: string]: RequireSource;
+    }
+
+    function loadAsync(name: string, url: string): Promise<void>;
+    function loadAsync(map: FontMap): Promise<void>;
+}
+
+/**
+ * GLView
+ */
+export interface GLViewProps extends ViewProperties {
+    onContextCreate(): void;
+    msaaSamples: number;
+}
+export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }
+
+/**
+ * Google
+ */
+export namespace Google {
+    interface LogInConfig {
+        androidClientId?: string;
+        androidStandaloneAppClientId?: string;
+        iosClientId?: string;
+        iosStandaloneAppClientId?: string;
+        webClientId?: string;
+        behavior?: 'system' | 'web';
+        scopes?: string[];
+    }
+
+    type LogInResult = {
+        type: 'cancel';
+    } | {
+        type: 'success';
+        accessToken: string;
+        idToken?: string;
+        refreshToken?: string;
+        serverAuthCode?: string;
+        user: {
+            id: string;
+            name: string;
+            givenName: string;
+            familyName: string;
+            photoUrl?: string;
+            email?: string;
+        }
+    };
+
+    function logInAsync(config: LogInConfig): Promise<LogInResult>;
+}
+
+/**
+ * Gyroscope
+ */
+export namespace Gyroscope {
+    interface GyroscopeObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: GyroscopeObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Image Picker
+ */
+export namespace ImagePicker {
+    interface ImageInfo {
+        uri: string;
+        width: number;
+        height: number;
+    }
+
+    type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
+
+    interface ImageLibraryOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+    }
+
+    function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
+
+    interface CameraOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+    }
+    function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
+}
+
+/**
+ * IntentLauncherAndroid
+ */
+export namespace IntentLauncherAndroid {
+    const ACTION_ACCESSIBILITY_SETTINGS: string;
+    const ACTION_APP_NOTIFICATION_REDACTION: string;
+    const ACTION_CONDITION_PROVIDER_SETTINGS: string;
+    const ACTION_NOTIFICATION_LISTENER_SETTINGS: string;
+    const ACTION_PRINT_SETTINGS: string;
+    const ACTION_ADD_ACCOUNT_SETTINGS: string;
+    const ACTION_AIRPLANE_MODE_SETTINGS: string;
+    const ACTION_APN_SETTINGS: string;
+    const ACTION_APPLICATION_DETAILS_SETTINGS: string;
+    const ACTION_APPLICATION_DEVELOPMENT_SETTINGS: string;
+    const ACTION_APPLICATION_SETTINGS: string;
+    const ACTION_APP_NOTIFICATION_SETTINGS: string;
+    const ACTION_APP_OPS_SETTINGS: string;
+    const ACTION_BATTERY_SAVER_SETTINGS: string;
+    const ACTION_BLUETOOTH_SETTINGS: string;
+    const ACTION_CAPTIONING_SETTINGS: string;
+    const ACTION_CAST_SETTINGS: string;
+    const ACTION_DATA_ROAMING_SETTINGS: string;
+    const ACTION_DATE_SETTINGS: string;
+    const ACTION_DEVICE_INFO_SETTINGS: string;
+    const ACTION_DEVICE_NAME: string;
+    const ACTION_DISPLAY_SETTINGS: string;
+    const ACTION_DREAM_SETTINGS: string;
+    const ACTION_HARD_KEYBOARD_SETTINGS: string;
+    const ACTION_HOME_SETTINGS: string;
+    const ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS: string;
+    const ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS: string;
+    const ACTION_INPUT_METHOD_SETTINGS: string;
+    const ACTION_INPUT_METHOD_SUBTYPE_SETTINGS: string;
+    const ACTION_INTERNAL_STORAGE_SETTINGS: string;
+    const ACTION_LOCALE_SETTINGS: string;
+    const ACTION_LOCATION_SOURCE_SETTINGS: string;
+    const ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS: string;
+    const ACTION_MANAGE_APPLICATIONS_SETTINGS: string;
+    const ACTION_MANAGE_DEFAULT_APPS_SETTINGS: string;
+    const ACTION_MEMORY_CARD_SETTINGS: string;
+    const ACTION_MONITORING_CERT_INFO: string;
+    const ACTION_NETWORK_OPERATOR_SETTINGS: string;
+    const ACTION_NFCSHARING_SETTINGS: string;
+    const ACTION_NFC_PAYMENT_SETTINGS: string;
+    const ACTION_NFC_SETTINGS: string;
+    const ACTION_NIGHT_DISPLAY_SETTINGS: string;
+    const ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS: string;
+    const ACTION_NOTIFICATION_SETTINGS: string;
+    const ACTION_PAIRING_SETTINGS: string;
+    const ACTION_PRIVACY_SETTINGS: string;
+    const ACTION_QUICK_LAUNCH_SETTINGS: string;
+    const ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: string;
+    const ACTION_SECURITY_SETTINGS: string;
+    const ACTION_SETTINGS: string;
+    const ACTION_SHOW_ADMIN_SUPPORT_DETAILS: string;
+    const ACTION_SHOW_INPUT_METHOD_PICKER: string;
+    const ACTION_SHOW_REGULATORY_INFO: string;
+    const ACTION_SHOW_REMOTE_BUGREPORT_DIALOG: string;
+    const ACTION_SOUND_SETTINGS: string;
+    const ACTION_STORAGE_MANAGER_SETTINGS: string;
+    const ACTION_SYNC_SETTINGS: string;
+    const ACTION_SYSTEM_UPDATE_SETTINGS: string;
+    const ACTION_TETHER_PROVISIONING_UI: string;
+    const ACTION_TRUSTED_CREDENTIALS_USER: string;
+    const ACTION_USAGE_ACCESS_SETTINGS: string;
+    const ACTION_USER_DICTIONARY_INSERT: string;
+    const ACTION_USER_DICTIONARY_SETTINGS: string;
+    const ACTION_USER_SETTINGS: string;
+    const ACTION_VOICE_CONTROL_AIRPLANE_MODE: string;
+    const ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE: string;
+    const ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE: string;
+    const ACTION_VOICE_INPUT_SETTINGS: string;
+    const ACTION_VPN_SETTINGS: string;
+    const ACTION_VR_LISTENER_SETTINGS: string;
+    const ACTION_WEBVIEW_SETTINGS: string;
+    const ACTION_WIFI_IP_SETTINGS: string;
+    const ACTION_WIFI_SETTINGS: string;
+    const ACTION_WIRELESS_SETTINGS: string;
+    const ACTION_ZEN_MODE_AUTOMATION_SETTINGS: string;
+    const ACTION_ZEN_MODE_EVENT_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_PRIORITY_SETTINGS: string;
+    const ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_SETTINGS: string;
+
+    function startActivityAsync(activity: string, data?: HashMap): Promise<boolean>;
+}
+
+/**
+ * KeepAwake
+ */
+export class KeepAwake extends Component {
+    static activate(): void;
+    static deactivate(): void;
+}
+
+/**
+ * LinearGradient
+ */
+export interface LinearGradientProps {
+    colors: string[];
+    start: [number, number];
+    end: [number, number];
+    locations: number[];
+}
+
+export class LinearGradient extends Component<LinearGradientProps> { }
+
+/**
+ * Location
+ */
+export namespace Location {
+    interface LocationOptions {
+        enableHighAccuracy?: boolean;
+        timeInterval?: number;
+        distanceInterval?: number;
+    }
+
+    interface LocationProps {
+        latitude: number;
+        longitude: number;
+    }
+
+    interface Coords extends LocationProps {
+        altitude: number;
+        accuracy: number;
+    }
+
+    interface LocationData {
+        coords: {
+            heading: number;
+            speed: number
+        } & Coords;
+        timestamp: number;
+    }
+
+    interface ProviderStatus {
+        locationServicesEnabled: boolean;
+        gpsAvailable?: boolean;
+        networkAvailable?: boolean;
+        passiveAvailable?: boolean;
+    }
+
+    interface HeadingStatus {
+        magHeading: number;
+        trueHeading: number;
+        accuracy: number;
+    }
+
+    interface GeocodeData {
+        city: string;
+        street: string;
+        region: string;
+        postalCode: string;
+        country: string;
+        name: string;
+    }
+
+    type LocationCallback = (data: LocationData) => void;
+
+    function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
+    function watchPositionAsync(options: LocationOptions, callback: LocationCallback): EventSubscription;
+    function getProviderStatusAsync(): Promise<ProviderStatus>;
+    function getHeadingAsync(): Promise<HeadingStatus>;
+    function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
+    function geocodeAsync(address: string): Promise<Coords>;
+    function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData>;
+    function setApiKey(key: string): void;
+}
+
+/**
+ * Magnetometer
+ */
+export namespace Magnetometer {
+    interface MagnetometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: MagnetometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Notifications
+ */
+export namespace Notifications {
+    interface Notification {
+        origin: 'selected' | 'received';
+        data: any;
+        remote: boolean;
+        isMultiple: boolean;
+    }
+
+    interface LocalNotification {
+        title: string;
+        body?: string;
+        data?: any;
+        ios?: {
+            sound?: boolean
+        };
+        android?: {
+            sound?: boolean;
+            icon?: string;
+            color?: string;
+            priority?: 'min' | 'low' | 'high' | 'max';
+            sticky?: boolean;
+            vibrate?: boolean | number[];
+            link?: string;
+        };
+    }
+
+    type LocalNotificationId = string | number;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    function getExponentPushTokenAsync(): Promise<string>;
+    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
+    function scheduleLocalNotificationAsync(
+        localNotification: LocalNotification,
+        schedulingOptions: { time: Date | number, repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year' }
+    ): Promise<LocalNotificationId>;
+    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function dismissAllNotificationsAsync(): Promise<void>;
+    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+    function getBadgeNumberAsync(): Promise<number>;
+    function setBadgeNumberAsync(number: number): Promise<void>;
+}
+
+/**
+ * Pedometer
+ */
+export namespace Pedometer {
+    function isAvailableAsync(): Promise<boolean>;
+    function getStepCountAsync(start: Date, end: Date): Promise<{ steps: number; }>;
+    function watchStepCount(callback: (params: { steps: number; }) => void): EventSubscription;
+}
+
+/**
+ * Permissions
+ */
+export namespace Permissions {
+    type PermissionType = 'remoteNotifications' | 'location' |
+        'camera' | 'contacts' | 'audioRecording';
+    type PermissionStatus = 'undetermined' | 'granted' | 'denied';
+    type PermissionExpires = 'never';
+    interface PermissionDetailsLocationIOS {
+        scope: 'whenInUse' | 'always';
+    }
+    interface PermissionDetailsLocationAndroid {
+        scope: 'fine' | 'coarse' | 'none';
+    }
+    interface PermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        ios?: PermissionDetailsLocationIOS;
+        android?: PermissionDetailsLocationAndroid;
+    }
+
+    function getAsync(type: PermissionType): Promise<PermissionResponse>;
+    function askAsync(type: PermissionType): Promise<PermissionResponse>;
+
+    const CAMERA: string;
+    const CAMERA_ROLL: string;
+    const AUDIO_RECORDING: string;
+    const LOCATION: string;
+    const REMOTE_NOTIFICATIONS: string;
+    const NOTIFICATIONS: string;
+    const CONTACTS: string;
+}
+
+/**
+ * Register Root Component
+ */
+export function registerRootComponent(component: Component): Component;
+
+/**
+ * ScreenOrientation
+ */
+export namespace ScreenOrientation {
+    interface Orientation {
+        ALL: 'ALL';
+        ALL_BUT_UPSIDE_DOWN: 'ALL_BUT_UPSIDE_DOWN';
+        PORTRAIT: 'PORTRAIT';
+        PORTRAIT_UP: 'PORTRAIT_UP';
+        PORTRAIT_DOWN: 'PORTRAIT_DOWN';
+        LANDSCAPE: 'LANDSCAPE';
+        LANDSCAPE_LEFT: 'LANDSCAPE_LEFT';
+        LANDSCAPE_RIGHT: 'LANDSCAPE_RIGHT';
+    }
+    const Orientation: Orientation;
+    function allow(orientation: string): void;
+}
+
+/**
+ * SecureStore
+ */
+export namespace SecureStore {
+    interface SecureStoreOptions {
+        keychainService?: string;
+        keychainAccessible?: number;
+    }
+    function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+    function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+    function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+}
+
+/**
+ * Segment
+ */
+export namespace Segment {
+    function initialize(keys: {
+        androidWriteKey: string;
+        iosWriteKey: string;
+    }): void;
+    function identify(userId: string): void;
+    function identifyWithTraits(userId: string, traits: object): void;
+    function track(event: string): void;
+    function reset(): void;
+    function trackWithProperties(event: string, properties: object): void;
+    function screen(screenName: string): void;
+    function screenWithProperties(screenName: string, properties: object): void;
+    function flush(): void;
+}
+
+/**
+ * Speech
+ */
+export namespace Speech {
+    interface SpeechOptions {
+        language?: string;
+        pitch?: number;
+        rate?: number;
+        onStart?: () => void;
+        onStopped?: () => void;
+        onDone?: () => void;
+        onError?: (error: string) => void;
+    }
+
+    function speak(text: string, options?: SpeechOptions): void;
+    function stop(): void;
+    function isSpeakingAsync(): Promise<boolean>;
+}
+
+/**
+ * SQLite
+ */
+export namespace SQLite {
+    type Error = any;
+
+    interface Database {
+        transaction(
+            callback: (transaction: Transaction) => any,
+            error?: (error: Error) => any,     // TODO def of error
+            success?: () => any
+        ): void;
+    }
+
+    interface Transaction {
+        executeSql(
+            sqlStatement: string,
+            arguments?: string[] | number[],
+            success?: (transaction: Transaction, resultSet: ResultSet) => any,
+            error?: (transaction: Transaction, error: Error) => any
+        ): void;
+    }
+
+    interface ResultSet {
+        insertId: number;
+        rowAffected: number;
+        rows: {
+            length: number;
+            item: (index: number) => any;
+            _array: HashMap[];
+        };
+    }
+
+    function openDatabase(
+        name: string | {
+            name: string,
+            version?: string,
+            description?: string,
+            size?: number,
+            callback?: () => any
+        },
+        version?: string,
+        description?: string,
+        size?: number,
+        callback?: () => any
+    ): any;
+}
+
+/**
+ * Svg
+ */
+export interface SvgCommonProps {
+    fill?: string;
+    fillOpacity?: number;
+    stroke?: string;
+    strokeWidth?: number;
+    strokeOpacity?: number;
+    strokeLinecap?: string;
+    strokeLineJoin?: string;
+    strokeDasharray?: any[];
+    strokeDashoffset?: any;
+    x?: Axis;
+    y?: Axis;
+    rotate?: number;
+    scale?: number;
+    origin?: number | string;
+    originX?: number;
+    originY?: number;
+}
+
+export class Svg extends Component<{ width: number, heigth: number }> { }
+export class Rect extends Component<SvgCommonProps> { }
+
+export interface CircleProps extends SvgCommonProps {
+    cx: Axis;
+    cy: Axis;
+}
+export class Circle extends Component<CircleProps> { }
+
+export interface EllipseProps extends CircleProps {
+    rx: Axis;
+    ry: Axis;
+}
+export class Ellipse extends Component<SvgCommonProps> { }
+
+export interface LineProps extends SvgCommonProps {
+    x1: Axis;
+    y1: Axis;
+    x2: Axis;
+    y2: Axis;
+}
+export class Line extends Component<LineProps> { }
+
+export interface PolyProps extends SvgCommonProps {
+    points: string;
+}
+export class Polygon extends Component<PolyProps> { }
+export class Polyline extends Component<PolyProps> { }
+
+export interface PathLine extends SvgCommonProps {
+    d: string;
+}
+export class Path extends Component<PolyProps> { }
+
+export interface TextProps extends SvgCommonProps {
+    textAnchor: string;
+}
+export class Text extends Component<TextProps> { }
+export class G extends Component<SvgCommonProps> { }
+export class Use extends Component<{ href: string, x: number, y: number }> { }
+export class Symbol extends Component<{ viewbox: string, widt: number, height: number }> { }
+export class Defs extends Component { }
+export class RadialGradient extends Component<SvgCommonProps> { }
+
+/**
+ * Take Snapshot
+ */
+export function takeSnapshotAsync(
+    view?: (number | React.ReactElement<any>),
+    options?: {
+        width?: number,
+        height?: number,
+        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
+        quality?: number,
+        result?: 'file' | 'base64' | 'data-uri',
+    }
+): Promise<string>;
+
+/**
+ * Util
+ */
+export namespace Util {
+    function getCurrentDeviceCountryAsync(): Promise<number>;
+    function getCurrentLocaleAsync(): Promise<string>;
+    function getCurrentTimeZoneAsync(): Promise<string>;
+    function reload(): void;
+    function addNewVersionListenerExperimental(listener: (event: {
+        manifest: object;
+    }) => void): { remove(): void; }; // Android only
+}
+
+/**
+ * Web Browser
+ */
+export namespace WebBrowser {
+    function openBrowserAsync(url: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function dismissBrowser(): Promise<{ type: 'dismissed' }>;
+}
diff --git a/types/expo/v23/tsconfig.json b/types/expo/v23/tsconfig.json
new file mode 100644
index 0000000000..4dbf5afca3
--- /dev/null
+++ b/types/expo/v23/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "expo": [
+                "expo/v23"
+            ],
+            "expo/*": [
+                "expo/v23/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo-tests.tsx"
+    ]
+}
diff --git a/types/expo/v23/tslint.json b/types/expo/v23/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expo/v23/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/expr-eval/expr-eval-tests.ts b/types/expr-eval/expr-eval-tests.ts
deleted file mode 100644
index 53689ea6bd..0000000000
--- a/types/expr-eval/expr-eval-tests.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Parser, Expression } from 'expr-eval';
-
-const expr = Parser.parse('2^2');
-Parser.evaluate('2^2');
-Parser.evaluate('2^x', { x: 2 });
-Parser.evaluate('x.toUpperCase()', { x: 'hello world' });
-
-expr.evaluate({ x: 3 });
-expr.simplify();
-expr.simplify({ x: 2 });
-expr.variables().forEach(str => str.toUpperCase());
-expr.symbols().forEach(str => str.toUpperCase());
-expr.toJSFunction('y, x');
-expr.toJSFunction('y, z', { y: 2 })({ z: 3 });
diff --git a/types/expr-eval/index.d.ts b/types/expr-eval/index.d.ts
deleted file mode 100644
index 8fc4c1438a..0000000000
--- a/types/expr-eval/index.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for expr-eval 1.0
-// Project: https://github.com/silentmatt/expr-eval#readme
-// Definitions by: Connor Peet <https://github.com/connor4312>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export type Value = number
-    | string
-    | ((...args: Value[]) => Value)
-    | { [propertyName: string]: Value };
-
-export interface Values {
-    [propertyName: string]: Value;
-}
-
-export class Parser {
-    constructor(options?: { allowMemberAccess?: boolean });
-    parse(expression: string): Expression;
-    evaluate(expression: string, values?: Values): number;
-
-    static parse(expression: string): Expression;
-    static evaluate(expression: string, values?: Values): number;
-}
-
-export interface Expression {
-    simplify(values?: Values): Expression;
-    evaluate(values?: Values): number;
-    substitute(values: Values): Expression;
-    symbols(): string[];
-    variables(): string[];
-    toJSFunction(params: string, values?: Values): (...args: Value[]) => number;
-}
diff --git a/types/expr-eval/tsconfig.json b/types/expr-eval/tsconfig.json
deleted file mode 100644
index 01f1b1e4e3..0000000000
--- a/types/expr-eval/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "expr-eval-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/express-brute-memcached/index.d.ts b/types/express-brute-memcached/index.d.ts
index dd7f2d2573..ca8cccda4d 100644
--- a/types/express-brute-memcached/index.d.ts
+++ b/types/express-brute-memcached/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/AdamPflug/express-brute-memcached
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * @summary Memcached options.
diff --git a/types/express-brute-memcached/tslint.json b/types/express-brute-memcached/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-brute-memcached/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-brute-mongo/index.d.ts b/types/express-brute-mongo/index.d.ts
index 56af09a099..0b637ed37b 100644
--- a/types/express-brute-mongo/index.d.ts
+++ b/types/express-brute-mongo/index.d.ts
@@ -8,15 +8,8 @@ import { Collection } from "mongodb";
 
 /**
  * @summary MongoDB store adapter.
- * @class
  */
 declare class MongoStore {
-    /**
-     * @summary Constructor.
-     * @constructor
-     * @param {Function} getCollection The collection.
-     * @param {Object}   options       The otpions.
-     */
     constructor(getCollection: (collection: (c: Collection) => void) => void, options?: Object);
 }
 export = MongoStore;
diff --git a/types/express-brute-mongo/tsconfig.json b/types/express-brute-mongo/tsconfig.json
index 9d21f88e3c..d57cb21dd2 100644
--- a/types/express-brute-mongo/tsconfig.json
+++ b/types/express-brute-mongo/tsconfig.json
@@ -4,6 +4,11 @@
         "lib": [
             "es6"
         ],
+        "paths": {
+            "mongodb": [
+                "mongodb/v2"
+            ]
+        },
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
diff --git a/types/express-brute-mongo/tslint.json b/types/express-brute-mongo/tslint.json
index c0ad422b87..81e3db2614 100644
--- a/types/express-brute-mongo/tslint.json
+++ b/types/express-brute-mongo/tslint.json
@@ -1,8 +1,9 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
+        // TODOs
         "ban-types": false,
-        "dt-header": false
+        "dt-header": false,
+        "no-unnecessary-class": false
     }
 }
diff --git a/types/express-brute-redis/index.d.ts b/types/express-brute-redis/index.d.ts
index ea720c4c85..a03c589123 100644
--- a/types/express-brute-redis/index.d.ts
+++ b/types/express-brute-redis/index.d.ts
@@ -2,12 +2,12 @@
 // Project: https://github.com/AdamPflug/express-brute-redis
 // Definitions by: Scott Harwell <https://github.com/scottharwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { ClientOpts } from "redis";
 
 /**
  * @summary Redis store for Express Brute
- * @class
  */
 declare class express_brute_redis {
     /**
@@ -23,24 +23,16 @@ declare class express_brute_redis {
 
     /**
      * @summary Sets a key in Redis storage.
-     * @param key
-     * @param value
-     * @param lifetime
-     * @param callback
      */
     set(key: string, value: string, lifetime?: number, callback?: (sender: express_brute_redis) => void): void;
 
     /**
      * @summary Gets a key in Redis storage.
-     * @param key
-     * @param callback
      */
     get(key: string, callback?: (err: Error, data: any) => void): void;
 
     /**
      * @summary Resets a key in Redis storage.
-     * @param key
-     * @param callback
      */
     reset(key: string, callback?: (err: Error, data: any) => void, ...args: any[]): void;
 }
diff --git a/types/express-brute/index.d.ts b/types/express-brute/index.d.ts
index d948eb7bf6..b7961ea597 100644
--- a/types/express-brute/index.d.ts
+++ b/types/express-brute/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/AdamPflug/express-brute
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 
diff --git a/types/express-brute/tslint.json b/types/express-brute/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-brute/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-busboy/express-busboy-tests.ts b/types/express-busboy/express-busboy-tests.ts
new file mode 100644
index 0000000000..512fd7f245
--- /dev/null
+++ b/types/express-busboy/express-busboy-tests.ts
@@ -0,0 +1,7 @@
+import * as expressBusboy from 'express-busboy';
+
+import * as express from 'express';
+
+const app: express.Application = express();
+const options: expressBusboy.ExpressBusboyOptions = {};
+const result: express.Application = expressBusboy.extend(app, options);
diff --git a/types/express-busboy/index.d.ts b/types/express-busboy/index.d.ts
new file mode 100644
index 0000000000..1df30054bc
--- /dev/null
+++ b/types/express-busboy/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for express-busboy 6.0
+// Project: https://github.com/yahoo/express-busboy
+// Definitions by: Pinguet62 <https://github.com/pinguet62>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as connectBusboy from 'connect-busboy';
+import * as express from 'express';
+
+export interface ExpressBusboyOptions extends connectBusboy.ConnectBusboyOptions {
+    upload?: number;
+    path?: string;
+    allowedPath?: string | RegExp | ((url: string) => boolean);
+    restrictMultiple?: boolean;
+    mimeTypeLimit?: string | string[];
+}
+
+export function extend(app: express.Application, options?: ExpressBusboyOptions): express.Application;
diff --git a/types/express-busboy/tsconfig.json b/types/express-busboy/tsconfig.json
new file mode 100644
index 0000000000..1920bb9991
--- /dev/null
+++ b/types/express-busboy/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-busboy-tests.ts"
+    ]
+}
diff --git a/types/express-busboy/tslint.json b/types/express-busboy/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-busboy/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-cluster/express-cluster-tests.ts b/types/express-cluster/express-cluster-tests.ts
new file mode 100644
index 0000000000..4eb096ffd6
--- /dev/null
+++ b/types/express-cluster/express-cluster-tests.ts
@@ -0,0 +1,6 @@
+import cluster = require('express-cluster');
+
+() => {
+    cluster(worker => {}, {count: 5});
+    cluster({count: 5}, worker => {});
+};
diff --git a/types/express-cluster/index.d.ts b/types/express-cluster/index.d.ts
new file mode 100644
index 0000000000..bee845d02e
--- /dev/null
+++ b/types/express-cluster/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for express-cluster 0.0
+// Project: https://github.com/Flipboard/express-cluster
+// Definitions by: Miloslav Nenadál <https://github.com/nenadalm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import cluster = require('cluster');
+
+interface Config {
+    count?: number;
+    respawn?: boolean;
+    verbose?: boolean;
+    workerListener?(): void;
+    outputStream?: NodeJS.WritableStream;
+}
+
+type WorkerFunction = (worker: cluster.Worker) => void;
+
+interface Cluster {
+    (fn: WorkerFunction, config: Config): void;
+    (config: Config, fn: WorkerFunction): void;
+}
+
+declare const c: Cluster;
+export = c;
diff --git a/types/express-cluster/tsconfig.json b/types/express-cluster/tsconfig.json
new file mode 100644
index 0000000000..5d27d3ec2e
--- /dev/null
+++ b/types/express-cluster/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-cluster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/express-cluster/tslint.json b/types/express-cluster/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-cluster/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-debug/index.d.ts b/types/express-debug/index.d.ts
index b5cfb43c97..b897e9bd07 100644
--- a/types/express-debug/index.d.ts
+++ b/types/express-debug/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/devoidfury/express-debug
 // Definitions by: Federico Bond <https://github.com/federicobond>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/express-debug/tslint.json b/types/express-debug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-debug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-domain-middleware/index.d.ts b/types/express-domain-middleware/index.d.ts
index 935f315dd4..7b4df930de 100644
--- a/types/express-domain-middleware/index.d.ts
+++ b/types/express-domain-middleware/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.npmjs.com/package/express-domain-middleware
 // Definitions by: Hookclaw <https://github.com/hookclaw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 
diff --git a/types/express-domain-middleware/tslint.json b/types/express-domain-middleware/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-domain-middleware/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-ejs-layouts/express-ejs-layouts-tests.ts b/types/express-ejs-layouts/express-ejs-layouts-tests.ts
new file mode 100644
index 0000000000..9d77105a9d
--- /dev/null
+++ b/types/express-ejs-layouts/express-ejs-layouts-tests.ts
@@ -0,0 +1,7 @@
+import * as express from 'express';
+import * as expressEjsLayouts from 'express-ejs-layouts';
+
+function expressRequestHandlerTest() {
+    const app = express()
+        .use(expressEjsLayouts());
+}
diff --git a/types/express-ejs-layouts/index.d.ts b/types/express-ejs-layouts/index.d.ts
new file mode 100644
index 0000000000..958cd158e2
--- /dev/null
+++ b/types/express-ejs-layouts/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for express-ejs-layouts 2.3
+// Project: https://github.com/Soarez/express-ejs-layouts
+// Definitions by: Erik Mavrinac <https://github.com/erikma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { RequestHandler } from 'express';
+
+declare function expressEjsLayouts(): RequestHandler;
+
+declare namespace expressEjsLayouts {
+}
+
+export = expressEjsLayouts;
diff --git a/types/express-ejs-layouts/tsconfig.json b/types/express-ejs-layouts/tsconfig.json
new file mode 100644
index 0000000000..7ade9f8819
--- /dev/null
+++ b/types/express-ejs-layouts/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-ejs-layouts-tests.ts"
+    ]
+}
diff --git a/types/express-ejs-layouts/tslint.json b/types/express-ejs-layouts/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/express-ejs-layouts/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/express-enforces-ssl/index.d.ts b/types/express-enforces-ssl/index.d.ts
index f4c1d424a4..271485b61c 100644
--- a/types/express-enforces-ssl/index.d.ts
+++ b/types/express-enforces-ssl/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/aredo/express-enforces-ssl
 // Definitions by: Kevin Stubbs <https://github.com/kevinstubbs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Request, Response, NextFunction } from 'express';
 
diff --git a/types/express-flash-2/index.d.ts b/types/express-flash-2/index.d.ts
index 06c1bc6591..42ace71f78 100644
--- a/types/express-flash-2/index.d.ts
+++ b/types/express-flash-2/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jack2gs/express-flash-2
 // Definitions by: Matheus Salmi <https://github.com/mathsalmi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import express = require('express');
 
diff --git a/types/express-flash-notification/express-flash-notification-tests.ts b/types/express-flash-notification/express-flash-notification-tests.ts
new file mode 100644
index 0000000000..df740cff01
--- /dev/null
+++ b/types/express-flash-notification/express-flash-notification-tests.ts
@@ -0,0 +1,57 @@
+import express = require("express");
+import flash = require("express-flash-notification");
+
+const app = express();
+
+// Simple initialization test
+app.use(flash(app));
+
+// Incomplete object test
+app.use(flash(app, {
+	sessionName: "to-flash",
+	utilityName: "||",
+	localsName: "!to-flash"
+}));
+
+// Empty object test
+app.use(flash(app, {}));
+
+// Functions test
+app.use(flash(app, {
+	beforeSingleRender: (item, callback) => { callback(null, item); },
+	afterAllRender: (htmlFragments, callback) => { callback(null, htmlFragments.join("\n")); }
+}));
+
+// Full object test
+app.use(flash(app, {
+	sessionName: "flash",
+	utilityName: "flash",
+	localsName: "flash",
+	viewName: "flash",
+	beforeSingleRender: (item, callback) => { callback(null, item); },
+	afterAllRender: (htmlFragments, callback) => { callback(null, htmlFragments.join("\n")); }
+  }));
+
+app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
+	req.flash("info");
+	req.flash("info", "I am a pretty butterfly");
+	req.flash("info", "I am a pretty butterfly", "/");
+	req.flash("info", "I am a pretty butterfly", true);
+	req.flash({
+		type: "error",
+		message: "Lets mix things up, shall we?"
+	});
+
+	req.flash({
+		type: "info",
+		message: "if cats rules the world",
+		redirect: false
+	});
+
+	req.flash({
+		type: "success",
+		message: "Odd",
+		redirect: true,
+		url: "/"
+	});
+});
diff --git a/types/express-flash-notification/index.d.ts b/types/express-flash-notification/index.d.ts
new file mode 100644
index 0000000000..68bbb8eaeb
--- /dev/null
+++ b/types/express-flash-notification/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for express-flash-notification 0.5
+// Project: https://github.com/carlosascari/express-flash-notification
+// Definitions by: Mister4Eyes <https://github.com/Mister4Eyes>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import express = require("express");
+
+interface efnOptions {
+	sessionName?: string;
+	utilityName?: string;
+	localsName?: string;
+	viewName?: string;
+	beforeSingleRender?: (item: any, callback: (err: any, item: any) => void) => void;
+	afterAllRender?: (htmlFragments: string[], callback: (err: any, html: string) => void) => void;
+}
+
+declare function express_flash_notification(app: express.Application, options?: efnOptions, ...args: any[]): any;
+
+declare namespace express_flash_notification {
+	const prototype: {};
+}
+
+declare global {
+	namespace Express {
+		interface FlashOptions {
+			type?: string;
+			message?: string;
+			redirect?: boolean;
+			url?: string;
+		}
+		interface Request {
+			flash(type: string, message?: string, redirect?: string|boolean): void;
+			flash(object: FlashOptions): void;
+		}
+	}
+}
+
+export = express_flash_notification;
diff --git a/types/express-flash-notification/tsconfig.json b/types/express-flash-notification/tsconfig.json
new file mode 100644
index 0000000000..842aacf264
--- /dev/null
+++ b/types/express-flash-notification/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+		"noImplicitThis": true,
+        "strictNullChecks": true,
+		"strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-flash-notification-tests.ts"
+    ]
+}
diff --git a/types/express-flash-notification/tslint.json b/types/express-flash-notification/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/express-flash-notification/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/express-formidable/express-formidable-tests.ts b/types/express-formidable/express-formidable-tests.ts
index 91f9e34519..f508f0be95 100644
--- a/types/express-formidable/express-formidable-tests.ts
+++ b/types/express-formidable/express-formidable-tests.ts
@@ -3,7 +3,12 @@ import expform = require("express-formidable");
 
 const app = express();
 
-app.use("/form1", expform());
+app.use("/form1", expform(), (req, res, next) => {
+    console.log(req.fields);
+    console.log(req.files);
+    next();
+});
+
 app.use("/form2", expform({
     encoding: "utf-8",
     uploadDir: "./uploads",
diff --git a/types/express-formidable/index.d.ts b/types/express-formidable/index.d.ts
index 57342521c2..75a34d0350 100644
--- a/types/express-formidable/index.d.ts
+++ b/types/express-formidable/index.d.ts
@@ -1,9 +1,21 @@
-// Type definitions for express-formidable 1.0.0
+// Type definitions for express-formidable 1.0
 // Project: https://github.com/noraesae/express-formidable
-// Definitions by: Torkild Dyvik Olsen <https://github.com/tdolsen>
+// Definitions by: Torkild Dyvik Olsen <https://github.com/tdolsen>, Evan Shortiss <https://github.com/evanshortiss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import { RequestHandler } from "express";
+import * as express from "express";
+import { Fields, Files } from "formidable";
+
+// Extend the express request object with attached formidable files and fields
+declare global {
+  namespace Express {
+    interface Request {
+      fields?: Fields;
+      files?: Files;
+    }
+  }
+}
 
 interface ExpressFormidableOptions {
     encoding?: string;
@@ -16,6 +28,8 @@ interface ExpressFormidableOptions {
     multiples?: boolean;
 }
 
-declare function ExpressFormidable(options?: ExpressFormidableOptions): RequestHandler;
+declare function ExpressFormidable(options?: ExpressFormidableOptions): express.RequestHandler;
+
+declare namespace ExpressFormidable {}
 
 export = ExpressFormidable;
diff --git a/types/express-formidable/tsconfig.json b/types/express-formidable/tsconfig.json
index 9deeebd96f..45a7b6c12b 100644
--- a/types/express-formidable/tsconfig.json
+++ b/types/express-formidable/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-formidable-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/express-formidable/tslint.json b/types/express-formidable/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/express-formidable/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index 077e3ab736..82f988a506 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -4,6 +4,7 @@
 //                 Nitin Tutlani <https://github.com/nitintutlani>
 //                 Daniel Fader <https://github.com/hubel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Request, Response } from "express";
 
diff --git a/types/express-graphql/tslint.json b/types/express-graphql/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-graphql/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-handlebars/index.d.ts b/types/express-handlebars/index.d.ts
index 3f11234d46..2c718e08b8 100644
--- a/types/express-handlebars/index.d.ts
+++ b/types/express-handlebars/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ericf/express-handlebars
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>, Igor Dultsev <https://github.com/yhaskell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 interface PartialTemplateOptions {
     cache?: boolean;
diff --git a/types/express-handlebars/tslint.json b/types/express-handlebars/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-handlebars/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-jwt/index.d.ts b/types/express-jwt/index.d.ts
index 300e20a311..de0a2dd337 100644
--- a/types/express-jwt/index.d.ts
+++ b/types/express-jwt/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.npmjs.org/package/express-jwt
 // Definitions by: Wonshik Kim <https://github.com/wokim>, Kacper Polak <https://github.com/kacepe>, Sl1MBoy <https://github.com/Sl1MBoy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import express = require('express');
 import unless = require('express-unless');
diff --git a/types/express-jwt/tslint.json b/types/express-jwt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-jwt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-less/index.d.ts b/types/express-less/index.d.ts
index c414e759f7..4a4accaa51 100644
--- a/types/express-less/index.d.ts
+++ b/types/express-less/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.npmjs.com/package/express-less
 // Definitions by: xyb <https://github.com/xieyubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
diff --git a/types/express-less/tslint.json b/types/express-less/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-less/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-minify/index.d.ts b/types/express-minify/index.d.ts
index c4fe760c58..f3c02b4acd 100644
--- a/types/express-minify/index.d.ts
+++ b/types/express-minify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/SummerWish/express-minify
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 /// <reference types="node" />
diff --git a/types/express-minify/tslint.json b/types/express-minify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-minify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-mongo-sanitize/index.d.ts b/types/express-mongo-sanitize/index.d.ts
index 354b6830dd..c7c76d32c5 100644
--- a/types/express-mongo-sanitize/index.d.ts
+++ b/types/express-mongo-sanitize/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/fiznool/express-mongo-sanitize#readme
 // Definitions by: Eric Byers <https://github.com/ericbyers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import express = require('express');
 
diff --git a/types/express-mung/index.d.ts b/types/express-mung/index.d.ts
index 85bd8e6aff..e6de726cd8 100644
--- a/types/express-mung/index.d.ts
+++ b/types/express-mung/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/richardschneider/express-mung
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express"/>
 /// <reference types="node"/>
diff --git a/types/express-mung/tslint.json b/types/express-mung/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-mung/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-myconnection/express-myconnection-tests.ts b/types/express-myconnection/express-myconnection-tests.ts
index ea744f926b..40101b364e 100644
--- a/types/express-myconnection/express-myconnection-tests.ts
+++ b/types/express-myconnection/express-myconnection-tests.ts
@@ -23,10 +23,10 @@ app.use(
 
 app.use(function list(req: express.Request, res: express.Response, next: Function){
 
-    req.getConnection(function(err: mysql.IError, connection: mysql.IConnection) {
+    req.getConnection(function(err: mysql.MysqlError, connection: mysql.Connection) {
         if (err) return next(err);
 
-        connection.query('SELECT 1 AS RESULT', [], function(err: mysql.IError, results: any) {
+        connection.query('SELECT 1 AS RESULT', [], function(err: mysql.MysqlError, results: any) {
             if (err) return next(err);
 
             results[0].RESULT;
@@ -36,4 +36,3 @@ app.use(function list(req: express.Request, res: express.Response, next: Functio
         });
     });
 });
-
diff --git a/types/express-myconnection/index.d.ts b/types/express-myconnection/index.d.ts
index 1f789eed09..5014c73571 100644
--- a/types/express-myconnection/index.d.ts
+++ b/types/express-myconnection/index.d.ts
@@ -2,19 +2,20 @@
 // Project: https://www.npmjs.org/package/express-myconnection
 // Definitions by: Michael Ferris <https://github.com/Cellule>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 /// <reference types="mysql" />
 
-declare namespace mysql{
-  export interface IConnection {}
-  export interface IError {}
+declare namespace mysql {
+  export interface Connection {}
+  export interface MysqlError {}
 }
 
 declare namespace Express {
 
   export interface Request {
-    getConnection?: (callback: (err: mysql.IError, connection: mysql.IConnection) => void) => void;
+    getConnection?: (callback: (err: mysql.MysqlError, connection: mysql.Connection) => void) => void;
   }
 }
 
@@ -22,8 +23,7 @@ declare module "express-myconnection" {
   import express = require('express');
   import mysql = require('mysql');
 
-  function connection(mysql: mysql.IMySql, dbConfig: mysql.IConnectionConfig, strategy: string): express.RequestHandler;
+  function connection(mysqlInstance: (typeof mysql), dbConfig: mysql.ConnectionConfig, strategy: string): express.RequestHandler;
 
   export = connection;
 }
-
diff --git a/types/express-myconnection/tslint.json b/types/express-myconnection/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-myconnection/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-mysql-session/index.d.ts b/types/express-mysql-session/index.d.ts
index f8d6282ecd..14c857b5dc 100644
--- a/types/express-mysql-session/index.d.ts
+++ b/types/express-mysql-session/index.d.ts
@@ -30,106 +30,35 @@ declare namespace MySQLStore {
 }
 
 declare class MySQLStore {
-    /**
-     * @param  {MySQLStore.Options} options
-     * @param  {any} connection?
-     * @param  {(error:any)=>void} callback?
-     */
     constructor(options: MySQLStore.Options, connection?: any, callback?: (error: any) => void);
 
-    /**
-     * @returns void
-     */
     setDefaultOptions(): void;
 
-    /**
-     * @param  {(error:any)=>void} callback?
-     * @returns void
-     */
     createDatabaseTable(callback?: (error: any) => void): void;
 
-    /**
-     * @param  {string} sessionId
-     * @param  {(error:any,session:any)=>void} callback?
-     * @returns void
-     */
     get(sessionId: string, callback?: (error: any, session: any) => void): void;
 
-    /**
-     * @param  {string} sessionId
-     * @param  {any} data
-     * @param  {(error:any)=>void} callback?
-     * @returns void
-     */
     set(sessionId: string, data: any, callback?: (error: any) => void): void;
 
-    /**
-     * @param  {string} sessionId
-     * @param  {any} data
-     * @param  {(error:any)=>void} callback?
-     * @returns void
-     */
     touch(sessionId: string, data: any, callback?: (error: any) => void): void;
 
-    /**
-     * @param  {string} sessionId
-     * @param  {(error:any)=>void} callback?
-     * @returns void
-     */
     destroy(sessionId: string, callback?: (error: any) => void): void;
 
-    /**
-     * @param  {(error:any,count:any)=>void} callback?
-     * @returns void
-     */
     length(callback?: (error: any, count: any) => void): void;
 
-    /**
-     * @param  {(error:any)=>void} callback?
-     * @returns void
-     */
     clear(callback?: (error: any) => void): void;
 
-    /**
-     * @param  {(error:any)=>void} callback?
-     * @returns void
-     */
     clearExpiredSessions(callback?: (error: any) => void): void;
 
-    /**
-     * @param  {number} interval
-     * @returns void
-     */
     setExpirationInterval(interval: number): void;
 
-    /**
-     * @returns void
-     */
     clearExpirationInterval(): void;
 
-    /**
-     * @param  {()=>void} callback?
-     * @returns void
-     */
     close(callback?: () => void): void;
 
-    /**
-     * @param  {any} object
-     * @param  {any} defaultValues
-     * @param  {any} options?
-     * @returns void
-     */
     default(object: any, defaultValues: any, options?: any): void;
 
-    /**
-     * @param  {any} object
-     * @returns void
-     */
     clone(object: any): void;
 
-    /**
-     * @param  {any} value
-     * @returns void
-     */
     isObject(value: any): void;
 }
diff --git a/types/express-oauth-server/express-oauth-server-tests.ts b/types/express-oauth-server/express-oauth-server-tests.ts
new file mode 100644
index 0000000000..436763b9b8
--- /dev/null
+++ b/types/express-oauth-server/express-oauth-server-tests.ts
@@ -0,0 +1,83 @@
+import ExpressOAuthServer = require("express-oauth-server");
+import * as OAuth2Server from "oauth2-server";
+import * as express from "express";
+
+const oauth2Model: OAuth2Server.AuthorizationCodeModel = {
+    getClient: async (clientId: string, clientSecret: string): Promise<OAuth2Server.Client | OAuth2Server.Falsey> => {
+        return undefined;
+    },
+    saveToken: async (token: OAuth2Server.Token, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.Token> => {
+        return token;
+    },
+    getAccessToken: async (accessToken: string): Promise<OAuth2Server.Token> => {
+        return {
+            accessToken,
+            client: {id: "testClient", grants: ["access_token"]},
+            user: {id: "testUser"}
+        };
+    },
+    verifyScope: async (token: OAuth2Server.Token, scope: string): Promise<boolean> => {
+        return true;
+    },
+    getAuthorizationCode: async (authorizationCode: string): Promise<OAuth2Server.AuthorizationCode> => {
+        return {
+            authorizationCode,
+            expiresAt: new Date(),
+            redirectUri: "www.test.com",
+            client: {id: "testClient", grants: ["access_token"]},
+            user: {id: "testUser"}
+        };
+    },
+    saveAuthorizationCode: async (code: OAuth2Server.AuthorizationCode, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.AuthorizationCode> => {
+        return code;
+    },
+    revokeAuthorizationCode: async (code: OAuth2Server.AuthorizationCode): Promise<boolean> => {
+        return true;
+    }
+};
+
+const serverOptions: OAuth2Server.ServerOptions = {
+    model: oauth2Model,
+};
+const expressOAuthServer: ExpressOAuthServer = new ExpressOAuthServer(serverOptions);
+
+let oAuthServer: OAuth2Server;
+let resultingTokenMiddleware: (
+    request: express.Request,
+    response: express.Response,
+    next: express.NextFunction,
+) => Promise<OAuth2Server.Token>;
+let resultingAuthorizationCodeMiddleware: (
+    request: express.Request,
+    response: express.Response,
+    next: express.NextFunction,
+) => Promise<OAuth2Server.AuthorizationCode>;
+
+oAuthServer = expressOAuthServer.server;
+resultingTokenMiddleware = expressOAuthServer.authenticate();
+resultingTokenMiddleware = expressOAuthServer.token();
+resultingAuthorizationCodeMiddleware = expressOAuthServer.authorize();
+
+// Real-life example
+
+const expressApp = express();
+
+expressApp.all(
+    "/path",
+    expressOAuthServer.authenticate(),
+    (req: express.Request, res: express.Response, next: express.NextFunction) => {
+        res.json({message: "Secure data"});
+    },
+);
+
+expressApp.get(
+    "/profile",
+    expressOAuthServer.authenticate({scope: "profile"}),
+    (req: express.Request & {user?: OAuth2Server.Token}, res: express.Response, next: express.NextFunction) => {
+        res.json({
+            profile: req.user
+        });
+    },
+);
+
+expressApp.listen(1234);
diff --git a/types/express-oauth-server/index.d.ts b/types/express-oauth-server/index.d.ts
new file mode 100644
index 0000000000..0a5a1162ea
--- /dev/null
+++ b/types/express-oauth-server/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for express-oauth-server 2.0
+// Project: https://github.com/oauthjs/express-oauth-server#readme
+// Definitions by: Arne Schubert <https://github.com/atd-schubert>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as express from 'express';
+import * as OAuth2Server from 'oauth2-server';
+
+declare class ExpressOAuthServer {
+    server: OAuth2Server;
+
+    constructor(options: OAuth2Server.ServerOptions);
+
+    authenticate(options?: OAuth2Server.AuthenticateOptions): (
+        request: express.Request,
+        response: express.Response,
+        next: express.NextFunction,
+    ) => Promise<OAuth2Server.Token>;
+
+    authorize(options?: OAuth2Server.AuthorizeOptions): (
+        request: express.Request,
+        response: express.Response,
+        next: express.NextFunction,
+    ) => Promise<OAuth2Server.AuthorizationCode>;
+
+    token(options?: OAuth2Server.TokenOptions): (
+        request: express.Request,
+        response: express.Response,
+        next: express.NextFunction,
+    ) => Promise<OAuth2Server.Token>;
+}
+
+export = ExpressOAuthServer;
diff --git a/types/express-oauth-server/tsconfig.json b/types/express-oauth-server/tsconfig.json
new file mode 100644
index 0000000000..197ec65f00
--- /dev/null
+++ b/types/express-oauth-server/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-oauth-server-tests.ts"
+    ]
+}
diff --git a/types/express-oauth-server/tslint.json b/types/express-oauth-server/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-oauth-server/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-openapi/index.d.ts b/types/express-openapi/index.d.ts
index cfb38fee5c..a6ac5bda65 100644
--- a/types/express-openapi/index.d.ts
+++ b/types/express-openapi/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kogosoftwarellc/express-openapi
 // Definitions by: TANAKA Koichi <https://github.com/mugeso>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /* =================== USAGE ===================
  import express = require('express');
diff --git a/types/express-openapi/tslint.json b/types/express-openapi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-openapi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-partials/index.d.ts b/types/express-partials/index.d.ts
index fb043b1307..6a604a2996 100644
--- a/types/express-partials/index.d.ts
+++ b/types/express-partials/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/publicclass/express-partials
 // Definitions by: jt000 <https://github.com/jt000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
diff --git a/types/express-partials/tslint.json b/types/express-partials/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-partials/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-promise-router/express-promise-router-tests.ts b/types/express-promise-router/express-promise-router-tests.ts
new file mode 100644
index 0000000000..42e0cdf570
--- /dev/null
+++ b/types/express-promise-router/express-promise-router-tests.ts
@@ -0,0 +1,12 @@
+import Router = require("express-promise-router");
+
+const router = Router();
+
+router.get("/", (req, res) => {
+    // equivalent to calling next()
+    return Promise.resolve('next');
+});
+
+router.post("/", async (req, res) => {
+    // ...
+});
diff --git a/types/express-promise-router/index.d.ts b/types/express-promise-router/index.d.ts
new file mode 100644
index 0000000000..507f6d0e40
--- /dev/null
+++ b/types/express-promise-router/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for express-promise-router 2.0
+// Project: https://github.com/express-promise-router/express-promise-router
+// Definitions by: Anjun Wang <https://github.com/wanganjun>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/* =================== USAGE ===================
+import Router = require('express-promise-router');
+
+const router = Router();
+
+router.get('/', (req, res) => {
+    // equivalent to calling next()
+    return Promise.resolve('next');
+})
+
+router.post('/', async (req, res) => {
+    // ...
+})
+
+export default router;
+ =============================================== */
+
+import { Router } from "express";
+
+/**
+ * A simple wrapper for Express 4's Router that allows middleware to return
+ * promises. If the promise is rejected, `express-promise-router` will call next
+ * with the reason
+ */
+declare const PromiseRouter: typeof Router;
+export = PromiseRouter;
diff --git a/types/express-promise-router/tsconfig.json b/types/express-promise-router/tsconfig.json
new file mode 100644
index 0000000000..1f33dd7104
--- /dev/null
+++ b/types/express-promise-router/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-promise-router-tests.ts"
+    ]
+}
diff --git a/types/express-promise-router/tslint.json b/types/express-promise-router/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-promise-router/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-rate-limit/express-rate-limit-tests.ts b/types/express-rate-limit/express-rate-limit-tests.ts
index fab5badeb8..6be714f3bf 100644
--- a/types/express-rate-limit/express-rate-limit-tests.ts
+++ b/types/express-rate-limit/express-rate-limit-tests.ts
@@ -11,12 +11,17 @@ const createAccountLimiter = new RateLimit({
   delayAfter: 1, // begin slowing down responses after the first request
   delayMs: 3 * 1000, // slow down subsequent responses by 3 seconds per request
   max: 5, // start blocking after 5 requests
-  message: "Too many accounts created from this IP, please try again after an hour"
+  message: "Too many accounts created from this IP, please try again after an hour",
+  handler: (req, _, next) => next(new Error(`TooManyRequests: ${req.ip}`))
+});
+
+const callbackWithFewerParams = new RateLimit({
+  handler: (req, res) => res.status(429).json(`TooManyRequests: ${req.ip}`)
 });
 
 class SomeStore implements RateLimit.Store {
   incr(key: string, cb: RateLimit.StoreIncrementCallback) { }
-  resetAll() { }
+  decrement(key: string) { }
   resetKey(key: string) { }
 }
 
diff --git a/types/express-rate-limit/index.d.ts b/types/express-rate-limit/index.d.ts
index 86b8d497b0..32799cc842 100644
--- a/types/express-rate-limit/index.d.ts
+++ b/types/express-rate-limit/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for express-rate-limit 2.8
+// Type definitions for express-rate-limit 2.9
 // Project: https://github.com/nfriedly/express-rate-limit
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, makepost <https://github.com/makepost>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import express = require("express");
 
@@ -10,22 +11,23 @@ declare namespace RateLimit {
 
     interface Store {
         incr(key: string, cb: StoreIncrementCallback): void;
-        resetAll(): void;
+        decrement(key: string): void;
         resetKey(key: string): void;
     }
 
     interface Options {
         delayAfter?: number;
         delayMs?: number;
-        handlers?(req?: express.Request, res?: express.Response, next?: express.NextFunction): any;
+        handler?(req: express.Request, res: express.Response, next: express.NextFunction): any;
         headers?: boolean;
-        keyGenerator?(req?: express.Request, res?: express.Response): string;
+        keyGenerator?(req: express.Request, res: express.Response): string;
         max?: number;
         message?: string;
-        skip?(req?: express.Request, res?: express.Response): boolean;
+        skip?(req: express.Request, res: express.Response): boolean;
+        skipFailedRequests?: boolean;
         statusCode?: number;
         store?: Store;
-        onLimitReached?(req?: express.Request, res?: express.Response, optionsUsed?: Options): void;
+        onLimitReached?(req: express.Request, res: express.Response, optionsUsed: Options): void;
         windowMs?: number;
     }
 }
diff --git a/types/express-route-fs/index.d.ts b/types/express-route-fs/index.d.ts
index a16f7dd171..ddc6e90e46 100644
--- a/types/express-route-fs/index.d.ts
+++ b/types/express-route-fs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kripod/express-route-fs
 // Definitions by: Kristóf Poduszló <https://github.com/kripod>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 /**
diff --git a/types/express-route-fs/tslint.json b/types/express-route-fs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-route-fs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-sanitized/index.d.ts b/types/express-sanitized/index.d.ts
index abb6be788a..c120c3b09f 100644
--- a/types/express-sanitized/index.d.ts
+++ b/types/express-sanitized/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/askhogan/express-sanitized
 // Definitions by: Chris Barth <https://github.com/cjbarth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as express from "express";
 
diff --git a/types/express-serve-static-core/express-serve-static-core-tests.ts b/types/express-serve-static-core/express-serve-static-core-tests.ts
index 5803337a65..4c2f0919c2 100644
--- a/types/express-serve-static-core/express-serve-static-core-tests.ts
+++ b/types/express-serve-static-core/express-serve-static-core-tests.ts
@@ -1,5 +1,3 @@
-
-
 import * as express from 'express-serve-static-core';
 
-// null test file - everything should be tested from express.d.ts and serve-static.d.ts
\ No newline at end of file
+// null test file - everything should be tested from express.d.ts and serve-static.d.ts
diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index 00597aa17c..edc7641d29 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -1,91 +1,93 @@
-// Type definitions for Express 4.x
+// Type definitions for Express 4.11
 // Project: http://expressjs.com
-// Definitions by: Boris Yankov <https://github.com/borisyankov>, Michał Lytek <https://github.com/19majkel94>, Kacper Polak <https://github.com/kacepe>
+// Definitions by: Boris Yankov <https://github.com/borisyankov>
+//                 Michał Lytek <https://github.com/19majkel94>
+//                 Kacper Polak <https://github.com/kacepe>
+//                 Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
 // This extracts the core definitions from express to prevent a circular dependency between express and serve-static
 /// <reference types="node" />
 
 declare global {
     namespace Express {
-
         // These open interfaces may be extended in an application-specific manner via declaration merging.
-        // See for example method-override.d.ts (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/method-override/method-override.d.ts)
-        export interface Request { }
-        export interface Response { }
-        export interface Application { }
+        // See for example method-override.d.ts (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/method-override/index.d.ts)
+        interface Request { }
+        interface Response { }
+        interface Application { }
     }
 }
 
 import * as http from "http";
 
-interface NextFunction {
+export interface NextFunction {
+    // tslint:disable-next-line callable-types (In ts2.1 it thinks the type alias has no call signatures)
     (err?: any): void;
 }
 
-interface RequestHandler {
+export interface RequestHandler {
+    // tslint:disable-next-line callable-types (This is extended from and can't extend from a type alias in ts<2.2
     (req: Request, res: Response, next: NextFunction): any;
 }
 
-interface ErrorRequestHandler {
-    (err: any, req: Request, res: Response, next: NextFunction): any;
-}
+export type ErrorRequestHandler = (err: any, req: Request, res: Response, next: NextFunction) => any;
 
-type PathParams = string | RegExp | (string | RegExp)[];
+export type PathParams = string | RegExp | Array<string | RegExp>;
 
-type RequestHandlerParams = RequestHandler | ErrorRequestHandler | (RequestHandler | ErrorRequestHandler)[];
+export type RequestHandlerParams = RequestHandler | ErrorRequestHandler | Array<RequestHandler | ErrorRequestHandler>;
 
-interface IRouterMatcher<T> {
+export interface IRouterMatcher<T> {
     (path: PathParams, ...handlers: RequestHandler[]): T;
     (path: PathParams, ...handlers: RequestHandlerParams[]): T;
 }
 
-interface IRouterHandler<T> {
+export interface IRouterHandler<T> {
     (...handlers: RequestHandler[]): T;
     (...handlers: RequestHandlerParams[]): T;
 }
 
-interface IRouter extends RequestHandler {
+export interface IRouter extends RequestHandler {
     /**
-        * Map the given param placeholder `name`(s) to the given callback(s).
-        *
-        * Parameter mapping is used to provide pre-conditions to routes
-        * which use normalized placeholders. For example a _:user_id_ parameter
-        * could automatically load a user's information from the database without
-        * any additional code,
-        *
-        * The callback uses the samesignature as middleware, the only differencing
-        * being that the value of the placeholder is passed, in this case the _id_
-        * of the user. Once the `next()` function is invoked, just like middleware
-        * it will continue on to execute the route, or subsequent parameter functions.
-        *
-        *      app.param('user_id', function(req, res, next, id){
-        *        User.find(id, function(err, user){
-        *          if (err) {
-        *            next(err);
-        *          } else if (user) {
-        *            req.user = user;
-        *            next();
-        *          } else {
-        *            next(new Error('failed to load user'));
-        *          }
-        *        });
-        *      });
-        *
-        * @param name
-        * @param fn
-        */
+     * Map the given param placeholder `name`(s) to the given callback(s).
+     *
+     * Parameter mapping is used to provide pre-conditions to routes
+     * which use normalized placeholders. For example a _:user_id_ parameter
+     * could automatically load a user's information from the database without
+     * any additional code,
+     *
+     * The callback uses the samesignature as middleware, the only differencing
+     * being that the value of the placeholder is passed, in this case the _id_
+     * of the user. Once the `next()` function is invoked, just like middleware
+     * it will continue on to execute the route, or subsequent parameter functions.
+     *
+     *      app.param('user_id', function(req, res, next, id){
+     *        User.find(id, function(err, user){
+     *          if (err) {
+     *            next(err);
+     *          } else if (user) {
+     *            req.user = user;
+     *            next();
+     *          } else {
+     *            next(new Error('failed to load user'));
+     *          }
+     *        });
+     *      });
+     */
     param(name: string, handler: RequestParamHandler): this;
-    // Alternatively, you can pass only a callback, in which case you have the opportunity to alter the app.param() API
-    // deprecated since express 4.11.0
+
+    /**
+     * Alternatively, you can pass only a callback, in which case you have the opportunity to alter the app.param()
+     *
+     * @deprecated since version 4.11
+     */
     param(callback: (name: string, matcher: RegExp) => RequestParamHandler): this;
 
     /**
-        * Special-cased "all" method, applying the given route `path`,
-        * middleware, and callback to _every_ HTTP method.
-        *
-        * @param path
-        * @param fn
-        */
+     * Special-cased "all" method, applying the given route `path`,
+     * middleware, and callback to _every_ HTTP method.
+     */
     all: IRouterMatcher<this>;
     get: IRouterMatcher<this>;
     post: IRouterMatcher<this>;
@@ -124,7 +126,7 @@ interface IRouter extends RequestHandler {
     stack: any[];
 }
 
-interface IRoute {
+export interface IRoute {
     path: string;
     stack: any;
     all: IRouterHandler<this>;
@@ -151,12 +153,12 @@ interface IRoute {
     subscribe: IRouterHandler<this>;
     trace: IRouterHandler<this>;
     unlock: IRouterHandler<this>;
-    unsubscribe: IRouterHandler<this>
+    unsubscribe: IRouterHandler<this>;
 }
 
 export interface Router extends IRouter { }
 
-interface CookieOptions {
+export interface CookieOptions {
     maxAge?: number;
     signed?: boolean;
     expires?: Date | boolean;
@@ -168,35 +170,32 @@ interface CookieOptions {
     sameSite?: boolean | string;
 }
 
-interface ByteRange { start: number; end: number; }
+export interface ByteRange { start: number; end: number; }
 
-interface RequestRanges extends Array<ByteRange> { type: string; }
+export interface RequestRanges extends Array<ByteRange> { type: string; }
 
-interface Errback { (err: Error): void; }
-
-interface Request extends http.IncomingMessage, Express.Request {
+export type Errback = (err: Error) => void;
 
+export interface Request extends http.IncomingMessage, Express.Request {
     /**
-        * Return request header.
-        *
-        * The `Referrer` header field is special-cased,
-        * both `Referrer` and `Referer` are interchangeable.
-        *
-        * Examples:
-        *
-        *     req.get('Content-Type');
-        *     // => "text/plain"
-        *
-        *     req.get('content-type');
-        *     // => "text/plain"
-        *
-        *     req.get('Something');
-        *     // => undefined
-        *
-        * Aliased as `req.header()`.
-        *
-        * @param name
-        */
+     * Return request header.
+     *
+     * The `Referrer` header field is special-cased,
+     * both `Referrer` and `Referer` are interchangeable.
+     *
+     * Examples:
+     *
+     *     req.get('Content-Type');
+     *     // => "text/plain"
+     *
+     *     req.get('content-type');
+     *     // => "text/plain"
+     *
+     *     req.get('Something');
+     *     // => undefined
+     *
+     * Aliased as `req.header()`.
+     */
     get(name: "set-cookie"): string[] | undefined;
     get(name: string): string | undefined;
 
@@ -204,234 +203,223 @@ interface Request extends http.IncomingMessage, Express.Request {
     header(name: string): string | undefined;
 
     /**
-        * Check if the given `type(s)` is acceptable, returning
-        * the best match when true, otherwise `undefined`, in which
-        * case you should respond with 406 "Not Acceptable".
-        *
-        * The `type` value may be a single mime type string
-        * such as "application/json", the extension name
-        * such as "json", a comma-delimted list such as "json, html, text/plain",
-        * or an array `["json", "html", "text/plain"]`. When a list
-        * or array is given the _best_ match, if any is returned.
-        *
-        * Examples:
-        *
-        *     // Accept: text/html
-        *     req.accepts('html');
-        *     // => "html"
-        *
-        *     // Accept: text/*, application/json
-        *     req.accepts('html');
-        *     // => "html"
-        *     req.accepts('text/html');
-        *     // => "text/html"
-        *     req.accepts('json, text');
-        *     // => "json"
-        *     req.accepts('application/json');
-        *     // => "application/json"
-        *
-        *     // Accept: text/*, application/json
-        *     req.accepts('image/png');
-        *     req.accepts('png');
-        *     // => undefined
-        *
-        *     // Accept: text/*;q=.5, application/json
-        *     req.accepts(['html', 'json']);
-        *     req.accepts('html, json');
-        *     // => "json"
-        */
+     * Check if the given `type(s)` is acceptable, returning
+     * the best match when true, otherwise `undefined`, in which
+     * case you should respond with 406 "Not Acceptable".
+     *
+     * The `type` value may be a single mime type string
+     * such as "application/json", the extension name
+     * such as "json", a comma-delimted list such as "json, html, text/plain",
+     * or an array `["json", "html", "text/plain"]`. When a list
+     * or array is given the _best_ match, if any is returned.
+     *
+     * Examples:
+     *
+     *     // Accept: text/html
+     *     req.accepts('html');
+     *     // => "html"
+     *
+     *     // Accept: text/*, application/json
+     *     req.accepts('html');
+     *     // => "html"
+     *     req.accepts('text/html');
+     *     // => "text/html"
+     *     req.accepts('json, text');
+     *     // => "json"
+     *     req.accepts('application/json');
+     *     // => "application/json"
+     *
+     *     // Accept: text/*, application/json
+     *     req.accepts('image/png');
+     *     req.accepts('png');
+     *     // => undefined
+     *
+     *     // Accept: text/*;q=.5, application/json
+     *     req.accepts(['html', 'json']);
+     *     req.accepts('html, json');
+     *     // => "json"
+     */
     accepts(): string[];
     accepts(type: string): string | false;
     accepts(type: string[]): string | false;
     accepts(...type: string[]): string | false;
 
     /**
-        * Returns the first accepted charset of the specified character sets,
-        * based on the request's Accept-Charset HTTP header field.
-        * If none of the specified charsets is accepted, returns false.
-        *
-        * For more information, or if you have issues or concerns, see accepts.
-        * @param charset
-        */
+     * Returns the first accepted charset of the specified character sets,
+     * based on the request's Accept-Charset HTTP header field.
+     * If none of the specified charsets is accepted, returns false.
+     *
+     * For more information, or if you have issues or concerns, see accepts.
+     */
     acceptsCharsets(): string[];
     acceptsCharsets(charset: string): string | false;
     acceptsCharsets(charset: string[]): string | false;
     acceptsCharsets(...charset: string[]): string | false;
 
     /**
-        * Returns the first accepted encoding of the specified encodings,
-        * based on the request's Accept-Encoding HTTP header field.
-        * If none of the specified encodings is accepted, returns false.
-        *
-        * For more information, or if you have issues or concerns, see accepts.
-        * @param encoding
-        */
+     * Returns the first accepted encoding of the specified encodings,
+     * based on the request's Accept-Encoding HTTP header field.
+     * If none of the specified encodings is accepted, returns false.
+     *
+     * For more information, or if you have issues or concerns, see accepts.
+     */
     acceptsEncodings(): string[];
     acceptsEncodings(encoding: string): string | false;
     acceptsEncodings(encoding: string[]): string | false;
     acceptsEncodings(...encoding: string[]): string | false;
 
     /**
-        * Returns the first accepted language of the specified languages,
-        * based on the request's Accept-Language HTTP header field.
-        * If none of the specified languages is accepted, returns false.
-        *
-        * For more information, or if you have issues or concerns, see accepts.
-        *
-        * @param lang
-        */
+     * Returns the first accepted language of the specified languages,
+     * based on the request's Accept-Language HTTP header field.
+     * If none of the specified languages is accepted, returns false.
+     *
+     * For more information, or if you have issues or concerns, see accepts.
+     */
     acceptsLanguages(): string[];
     acceptsLanguages(lang: string): string | false;
     acceptsLanguages(lang: string[]): string | false;
     acceptsLanguages(...lang: string[]): string | false;
 
     /**
-        * Parse Range header field,
-        * capping to the given `size`.
-        *
-        * Unspecified ranges such as "0-" require
-        * knowledge of your resource length. In
-        * the case of a byte range this is of course
-        * the total number of bytes. If the Range
-        * header field is not given `null` is returned,
-        * `-1` when unsatisfiable, `-2` when syntactically invalid.
-        *
-        * NOTE: remember that ranges are inclusive, so
-        * for example "Range: users=0-3" should respond
-        * with 4 users when available, not 3.
-        *
-        * @param size
-        */
+     * Parse Range header field,
+     * capping to the given `size`.
+     *
+     * Unspecified ranges such as "0-" require
+     * knowledge of your resource length. In
+     * the case of a byte range this is of course
+     * the total number of bytes. If the Range
+     * header field is not given `null` is returned,
+     * `-1` when unsatisfiable, `-2` when syntactically invalid.
+     *
+     * NOTE: remember that ranges are inclusive, so
+     * for example "Range: users=0-3" should respond
+     * with 4 users when available, not 3.
+     */
     range(size: number): RequestRanges|null|-1|-2;
 
     /**
-        * Return an array of Accepted media types
-        * ordered from highest quality to lowest.
-        */
+     * Return an array of Accepted media types
+     * ordered from highest quality to lowest.
+     */
     accepted: MediaType[];
 
     /**
-        * @deprecated Use either req.params, req.body or req.query, as applicable.
-        *
-        * Return the value of param `name` when present or `defaultValue`.
-        *
-        *  - Checks route placeholders, ex: _/user/:id_
-        *  - Checks body params, ex: id=12, {"id":12}
-        *  - Checks query string params, ex: ?id=12
-        *
-        * To utilize request bodies, `req.body`
-        * should be an object. This can be done by using
-        * the `connect.bodyParser()` middleware.
-        *
-        * @param name
-        * @param defaultValue
-        */
+     * @deprecated since 4.11 Use either req.params, req.body or req.query, as applicable.
+     *
+     * Return the value of param `name` when present or `defaultValue`.
+     *
+     *  - Checks route placeholders, ex: _/user/:id_
+     *  - Checks body params, ex: id=12, {"id":12}
+     *  - Checks query string params, ex: ?id=12
+     *
+     * To utilize request bodies, `req.body`
+     * should be an object. This can be done by using
+     * the `connect.bodyParser()` middleware.
+     */
     param(name: string, defaultValue?: any): string;
 
     /**
-        * Check if the incoming request contains the "Content-Type"
-        * header field, and it contains the give mime `type`.
-        *
-        * Examples:
-        *
-        *      // With Content-Type: text/html; charset=utf-8
-        *      req.is('html');
-        *      req.is('text/html');
-        *      req.is('text/*');
-        *      // => true
-        *
-        *      // When Content-Type is application/json
-        *      req.is('json');
-        *      req.is('application/json');
-        *      req.is('application/*');
-        *      // => true
-        *
-        *      req.is('html');
-        *      // => false
-        *
-        * @param type
-        */
+     * Check if the incoming request contains the "Content-Type"
+     * header field, and it contains the give mime `type`.
+     *
+     * Examples:
+     *
+     *      // With Content-Type: text/html; charset=utf-8
+     *      req.is('html');
+     *      req.is('text/html');
+     *      req.is('text/*');
+     *      // => true
+     *
+     *      // When Content-Type is application/json
+     *      req.is('json');
+     *      req.is('application/json');
+     *      req.is('application/*');
+     *      // => true
+     *
+     *      req.is('html');
+     *      // => false
+     */
     is(type: string): string | false;
 
     /**
-        * Return the protocol string "http" or "https"
-        * when requested with TLS. When the "trust proxy"
-        * setting is enabled the "X-Forwarded-Proto" header
-        * field will be trusted. If you're running behind
-        * a reverse proxy that supplies https for you this
-        * may be enabled.
-        */
+     * Return the protocol string "http" or "https"
+     * when requested with TLS. When the "trust proxy"
+     * setting is enabled the "X-Forwarded-Proto" header
+     * field will be trusted. If you're running behind
+     * a reverse proxy that supplies https for you this
+     * may be enabled.
+     */
     protocol: string;
 
     /**
-        * Short-hand for:
-        *
-        *    req.protocol == 'https'
-        */
+     * Short-hand for:
+     *
+     *    req.protocol == 'https'
+     */
     secure: boolean;
 
     /**
-        * Return the remote address, or when
-        * "trust proxy" is `true` return
-        * the upstream addr.
-        */
+     * Return the remote address, or when
+     * "trust proxy" is `true` return
+     * the upstream addr.
+     */
     ip: string;
 
     /**
-        * When "trust proxy" is `true`, parse
-        * the "X-Forwarded-For" ip address list.
-        *
-        * For example if the value were "client, proxy1, proxy2"
-        * you would receive the array `["client", "proxy1", "proxy2"]`
-        * where "proxy2" is the furthest down-stream.
-        */
+     * When "trust proxy" is `true`, parse
+     * the "X-Forwarded-For" ip address list.
+     *
+     * For example if the value were "client, proxy1, proxy2"
+     * you would receive the array `["client", "proxy1", "proxy2"]`
+     * where "proxy2" is the furthest down-stream.
+     */
     ips: string[];
 
     /**
-        * Return subdomains as an array.
-        *
-        * Subdomains are the dot-separated parts of the host before the main domain of
-        * the app. By default, the domain of the app is assumed to be the last two
-        * parts of the host. This can be changed by setting "subdomain offset".
-        *
-        * For example, if the domain is "tobi.ferrets.example.com":
-        * If "subdomain offset" is not set, req.subdomains is `["ferrets", "tobi"]`.
-        * If "subdomain offset" is 3, req.subdomains is `["tobi"]`.
-        */
+     * Return subdomains as an array.
+     *
+     * Subdomains are the dot-separated parts of the host before the main domain of
+     * the app. By default, the domain of the app is assumed to be the last two
+     * parts of the host. This can be changed by setting "subdomain offset".
+     *
+     * For example, if the domain is "tobi.ferrets.example.com":
+     * If "subdomain offset" is not set, req.subdomains is `["ferrets", "tobi"]`.
+     * If "subdomain offset" is 3, req.subdomains is `["tobi"]`.
+     */
     subdomains: string[];
 
     /**
-        * Short-hand for `url.parse(req.url).pathname`.
-        */
+     * Short-hand for `url.parse(req.url).pathname`.
+     */
     path: string;
 
     /**
-        * Parse the "Host" header field hostname.
-        */
+     * Parse the "Host" header field hostname.
+     */
     hostname: string;
 
     /**
-        * @deprecated Use hostname instead.
-        */
+     * @deprecated Use hostname instead.
+     */
     host: string;
 
     /**
-        * Check if the request is fresh, aka
-        * Last-Modified and/or the ETag
-        * still match.
-        */
+     * Check if the request is fresh, aka
+     * Last-Modified and/or the ETag
+     * still match.
+     */
     fresh: boolean;
 
     /**
-        * Check if the request is stale, aka
-        * "Last-Modified" and / or the "ETag" for the
-        * resource has changed.
-        */
+     * Check if the request is stale, aka
+     * "Last-Modified" and / or the "ETag" for the
+     * resource has changed.
+     */
     stale: boolean;
 
     /**
-        * Check if the request was an _XMLHttpRequest_.
-        */
+     * Check if the request was an _XMLHttpRequest_.
+     */
     xhr: boolean;
 
     //body: { username: string; password: string; remember: boolean; title: string; };
@@ -444,12 +432,7 @@ interface Request extends http.IncomingMessage, Express.Request {
 
     params: any;
 
-    /**
-        * Clear cookie `name`.
-        *
-        * @param name
-        * @param options
-        */
+    /** Clear cookie `name`. */
     clearCookie(name: string, options?: any): Response;
 
     query: any;
@@ -467,275 +450,259 @@ interface Request extends http.IncomingMessage, Express.Request {
     app: Application;
 }
 
-interface MediaType {
+export interface MediaType {
     value: string;
     quality: number;
     type: string;
     subtype: string;
 }
 
-interface Send {
-    (body?: any): Response;
-}
+export type Send = (body?: any) => Response;
 
-interface Response extends http.ServerResponse, Express.Response {
+export interface Response extends http.ServerResponse, Express.Response {
     /**
-        * Set status `code`.
-        *
-        * @param code
-        */
+     * Set status `code`.
+     */
     status(code: number): Response;
 
     /**
-        * Set the response HTTP status code to `statusCode` and send its string representation as the response body.
-        * @link http://expressjs.com/4x/api.html#res.sendStatus
-        *
-        * Examples:
-        *
-        *    res.sendStatus(200); // equivalent to res.status(200).send('OK')
-        *    res.sendStatus(403); // equivalent to res.status(403).send('Forbidden')
-        *    res.sendStatus(404); // equivalent to res.status(404).send('Not Found')
-        *    res.sendStatus(500); // equivalent to res.status(500).send('Internal Server Error')
-        *
-        * @param code
-        */
+     * Set the response HTTP status code to `statusCode` and send its string representation as the response body.
+     * @link http://expressjs.com/4x/api.html#res.sendStatus
+     *
+     * Examples:
+     *
+     *    res.sendStatus(200); // equivalent to res.status(200).send('OK')
+     *    res.sendStatus(403); // equivalent to res.status(403).send('Forbidden')
+     *    res.sendStatus(404); // equivalent to res.status(404).send('Not Found')
+     *    res.sendStatus(500); // equivalent to res.status(500).send('Internal Server Error')
+     */
     sendStatus(code: number): Response;
 
     /**
-        * Set Link header field with the given `links`.
-        *
-        * Examples:
-        *
-        *    res.links({
-        *      next: 'http://api.example.com/users?page=2',
-        *      last: 'http://api.example.com/users?page=5'
-        *    });
-        *
-        * @param links
-        */
+     * Set Link header field with the given `links`.
+     *
+     * Examples:
+     *
+     *    res.links({
+     *      next: 'http://api.example.com/users?page=2',
+     *      last: 'http://api.example.com/users?page=5'
+     *    });
+     */
     links(links: any): Response;
 
     /**
-        * Send a response.
-        *
-        * Examples:
-        *
-        *     res.send(new Buffer('wahoo'));
-        *     res.send({ some: 'json' });
-        *     res.send('<p>some html</p>');
-        *     res.send(404, 'Sorry, cant find that');
-        *     res.send(404);
-        */
+     * Send a response.
+     *
+     * Examples:
+     *
+     *     res.send(new Buffer('wahoo'));
+     *     res.send({ some: 'json' });
+     *     res.send('<p>some html</p>');
+     *     res.send(404, 'Sorry, cant find that');
+     *     res.send(404);
+     */
     send: Send;
 
     /**
-        * Send JSON response.
-        *
-        * Examples:
-        *
-        *     res.json(null);
-        *     res.json({ user: 'tj' });
-        *     res.json(500, 'oh noes!');
-        *     res.json(404, 'I dont have that');
-        */
+     * Send JSON response.
+     *
+     * Examples:
+     *
+     *     res.json(null);
+     *     res.json({ user: 'tj' });
+     *     res.json(500, 'oh noes!');
+     *     res.json(404, 'I dont have that');
+     */
     json: Send;
 
     /**
-        * Send JSON response with JSONP callback support.
-        *
-        * Examples:
-        *
-        *     res.jsonp(null);
-        *     res.jsonp({ user: 'tj' });
-        *     res.jsonp(500, 'oh noes!');
-        *     res.jsonp(404, 'I dont have that');
-        */
+     * Send JSON response with JSONP callback support.
+     *
+     * Examples:
+     *
+     *     res.jsonp(null);
+     *     res.jsonp({ user: 'tj' });
+     *     res.jsonp(500, 'oh noes!');
+     *     res.jsonp(404, 'I dont have that');
+     */
     jsonp: Send;
 
     /**
-        * Transfer the file at the given `path`.
-        *
-        * Automatically sets the _Content-Type_ response header field.
-        * The callback `fn(err)` is invoked when the transfer is complete
-        * or when an error occurs. Be sure to check `res.sentHeader`
-        * if you wish to attempt responding, as the header and some data
-        * may have already been transferred.
-        *
-        * Options:
-        *
-        *   - `maxAge`   defaulting to 0 (can be string converted by `ms`)
-        *   - `root`     root directory for relative filenames
-        *   - `headers`  object of headers to serve with file
-        *   - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them
-        *
-        * Other options are passed along to `send`.
-        *
-        * Examples:
-        *
-        *  The following example illustrates how `res.sendFile()` may
-        *  be used as an alternative for the `static()` middleware for
-        *  dynamic situations. The code backing `res.sendFile()` is actually
-        *  the same code, so HTTP cache support etc is identical.
-        *
-        *     app.get('/user/:uid/photos/:file', function(req, res){
-        *       var uid = req.params.uid
-        *         , file = req.params.file;
-        *
-        *       req.user.mayViewFilesFrom(uid, function(yes){
-        *         if (yes) {
-        *           res.sendFile('/uploads/' + uid + '/' + file);
-        *         } else {
-        *           res.send(403, 'Sorry! you cant see that.');
-        *         }
-        *       });
-        *     });
-        *
-        * @api public
-        */
+     * Transfer the file at the given `path`.
+     *
+     * Automatically sets the _Content-Type_ response header field.
+     * The callback `fn(err)` is invoked when the transfer is complete
+     * or when an error occurs. Be sure to check `res.sentHeader`
+     * if you wish to attempt responding, as the header and some data
+     * may have already been transferred.
+     *
+     * Options:
+     *
+     *   - `maxAge`   defaulting to 0 (can be string converted by `ms`)
+     *   - `root`     root directory for relative filenames
+     *   - `headers`  object of headers to serve with file
+     *   - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them
+     *
+     * Other options are passed along to `send`.
+     *
+     * Examples:
+     *
+     *  The following example illustrates how `res.sendFile()` may
+     *  be used as an alternative for the `static()` middleware for
+     *  dynamic situations. The code backing `res.sendFile()` is actually
+     *  the same code, so HTTP cache support etc is identical.
+     *
+     *     app.get('/user/:uid/photos/:file', function(req, res){
+     *       var uid = req.params.uid
+     *         , file = req.params.file;
+     *
+     *       req.user.mayViewFilesFrom(uid, function(yes){
+     *         if (yes) {
+     *           res.sendFile('/uploads/' + uid + '/' + file);
+     *         } else {
+     *           res.send(403, 'Sorry! you cant see that.');
+     *         }
+     *       });
+     *     });
+     *
+     * @api public
+     */
     sendFile(path: string): void;
     sendFile(path: string, options: any): void;
     sendFile(path: string, fn: Errback): void;
     sendFile(path: string, options: any, fn: Errback): void;
 
     /**
-        * @deprecated Use sendFile instead.
-        */
+     * @deprecated Use sendFile instead.
+     */
     sendfile(path: string): void;
     /**
-        * @deprecated Use sendFile instead.
-        */
+     * @deprecated Use sendFile instead.
+     */
     sendfile(path: string, options: any): void;
     /**
-        * @deprecated Use sendFile instead.
-        */
+     * @deprecated Use sendFile instead.
+     */
     sendfile(path: string, fn: Errback): void;
     /**
-        * @deprecated Use sendFile instead.
-        */
+     * @deprecated Use sendFile instead.
+     */
     sendfile(path: string, options: any, fn: Errback): void;
 
     /**
-        * Transfer the file at the given `path` as an attachment.
-        *
-        * Optionally providing an alternate attachment `filename`,
-        * and optional callback `fn(err)`. The callback is invoked
-        * when the data transfer is complete, or when an error has
-        * ocurred. Be sure to check `res.headerSent` if you plan to respond.
-        *
-        * This method uses `res.sendfile()`.
-        */
+     * Transfer the file at the given `path` as an attachment.
+     *
+     * Optionally providing an alternate attachment `filename`,
+     * and optional callback `fn(err)`. The callback is invoked
+     * when the data transfer is complete, or when an error has
+     * ocurred. Be sure to check `res.headerSent` if you plan to respond.
+     *
+     * This method uses `res.sendfile()`.
+     */
     download(path: string): void;
     download(path: string, filename: string): void;
     download(path: string, fn: Errback): void;
     download(path: string, filename: string, fn: Errback): void;
 
     /**
-        * Set _Content-Type_ response header with `type` through `mime.lookup()`
-        * when it does not contain "/", or set the Content-Type to `type` otherwise.
-        *
-        * Examples:
-        *
-        *     res.type('.html');
-        *     res.type('html');
-        *     res.type('json');
-        *     res.type('application/json');
-        *     res.type('png');
-        *
-        * @param type
-        */
+     * Set _Content-Type_ response header with `type` through `mime.lookup()`
+     * when it does not contain "/", or set the Content-Type to `type` otherwise.
+     *
+     * Examples:
+     *
+     *     res.type('.html');
+     *     res.type('html');
+     *     res.type('json');
+     *     res.type('application/json');
+     *     res.type('png');
+     */
     contentType(type: string): Response;
 
     /**
-        * Set _Content-Type_ response header with `type` through `mime.lookup()`
-        * when it does not contain "/", or set the Content-Type to `type` otherwise.
-        *
-        * Examples:
-        *
-        *     res.type('.html');
-        *     res.type('html');
-        *     res.type('json');
-        *     res.type('application/json');
-        *     res.type('png');
-        *
-        * @param type
-        */
+     * Set _Content-Type_ response header with `type` through `mime.lookup()`
+     * when it does not contain "/", or set the Content-Type to `type` otherwise.
+     *
+     * Examples:
+     *
+     *     res.type('.html');
+     *     res.type('html');
+     *     res.type('json');
+     *     res.type('application/json');
+     *     res.type('png');
+     */
     type(type: string): Response;
 
     /**
-        * Respond to the Acceptable formats using an `obj`
-        * of mime-type callbacks.
-        *
-        * This method uses `req.accepted`, an array of
-        * acceptable types ordered by their quality values.
-        * When "Accept" is not present the _first_ callback
-        * is invoked, otherwise the first match is used. When
-        * no match is performed the server responds with
-        * 406 "Not Acceptable".
-        *
-        * Content-Type is set for you, however if you choose
-        * you may alter this within the callback using `res.type()`
-        * or `res.set('Content-Type', ...)`.
-        *
-        *    res.format({
-        *      'text/plain': function(){
-        *        res.send('hey');
-        *      },
-        *
-        *      'text/html': function(){
-        *        res.send('<p>hey</p>');
-        *      },
-        *
-        *      'appliation/json': function(){
-        *        res.send({ message: 'hey' });
-        *      }
-        *    });
-        *
-        * In addition to canonicalized MIME types you may
-        * also use extnames mapped to these types:
-        *
-        *    res.format({
-        *      text: function(){
-        *        res.send('hey');
-        *      },
-        *
-        *      html: function(){
-        *        res.send('<p>hey</p>');
-        *      },
-        *
-        *      json: function(){
-        *        res.send({ message: 'hey' });
-        *      }
-        *    });
-        *
-        * By default Express passes an `Error`
-        * with a `.status` of 406 to `next(err)`
-        * if a match is not made. If you provide
-        * a `.default` callback it will be invoked
-        * instead.
-        *
-        * @param obj
-        */
+     * Respond to the Acceptable formats using an `obj`
+     * of mime-type callbacks.
+     *
+     * This method uses `req.accepted`, an array of
+     * acceptable types ordered by their quality values.
+     * When "Accept" is not present the _first_ callback
+     * is invoked, otherwise the first match is used. When
+     * no match is performed the server responds with
+     * 406 "Not Acceptable".
+     *
+     * Content-Type is set for you, however if you choose
+     * you may alter this within the callback using `res.type()`
+     * or `res.set('Content-Type', ...)`.
+     *
+     *    res.format({
+     *      'text/plain': function(){
+     *        res.send('hey');
+     *      },
+     *
+     *      'text/html': function(){
+     *        res.send('<p>hey</p>');
+     *      },
+     *
+     *      'appliation/json': function(){
+     *        res.send({ message: 'hey' });
+     *      }
+     *    });
+     *
+     * In addition to canonicalized MIME types you may
+     * also use extnames mapped to these types:
+     *
+     *    res.format({
+     *      text: function(){
+     *        res.send('hey');
+     *      },
+     *
+     *      html: function(){
+     *        res.send('<p>hey</p>');
+     *      },
+     *
+     *      json: function(){
+     *        res.send({ message: 'hey' });
+     *      }
+     *    });
+     *
+     * By default Express passes an `Error`
+     * with a `.status` of 406 to `next(err)`
+     * if a match is not made. If you provide
+     * a `.default` callback it will be invoked
+     * instead.
+     */
     format(obj: any): Response;
 
     /**
-        * Set _Content-Disposition_ header to _attachment_ with optional `filename`.
-        *
-        * @param filename
-        */
+     * Set _Content-Disposition_ header to _attachment_ with optional `filename`.
+     */
     attachment(filename?: string): Response;
 
     /**
-        * Set header `field` to `val`, or pass
-        * an object of header fields.
-        *
-        * Examples:
-        *
-        *    res.set('Foo', ['bar', 'baz']);
-        *    res.set('Accept', 'application/json');
-        *    res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
-        *
-        * Aliased as `res.header()`.
-        */
+     * Set header `field` to `val`, or pass
+     * an object of header fields.
+     *
+     * Examples:
+     *
+     *    res.set('Foo', ['bar', 'baz']);
+     *    res.set('Accept', 'application/json');
+     *    res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+     *
+     * Aliased as `res.header()`.
+     */
     set(field: any): Response;
     set(field: string, value?: string): Response;
 
@@ -745,102 +712,91 @@ interface Response extends http.ServerResponse, Express.Response {
     // Property indicating if HTTP headers has been sent for the response.
     headersSent: boolean;
 
-    /**
-        * Get value for header `field`.
-        *
-        * @param field
-        */
+    /** Get value for header `field`. */
     get(field: string): string;
 
-    /**
-        * Clear cookie `name`.
-        *
-        * @param name
-        * @param options
-        */
+    /** Clear cookie `name`. */
     clearCookie(name: string, options?: any): Response;
 
     /**
-        * Set cookie `name` to `val`, with the given `options`.
-        *
-        * Options:
-        *
-        *    - `maxAge`   max-age in milliseconds, converted to `expires`
-        *    - `signed`   sign the cookie
-        *    - `path`     defaults to "/"
-        *
-        * Examples:
-        *
-        *    // "Remember Me" for 15 minutes
-        *    res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
-        *
-        *    // save as above
-        *    res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
-        */
+     * Set cookie `name` to `val`, with the given `options`.
+     *
+     * Options:
+     *
+     *    - `maxAge`   max-age in milliseconds, converted to `expires`
+     *    - `signed`   sign the cookie
+     *    - `path`     defaults to "/"
+     *
+     * Examples:
+     *
+     *    // "Remember Me" for 15 minutes
+     *    res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
+     *
+     *    // save as above
+     *    res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
+     */
     cookie(name: string, val: string, options: CookieOptions): Response;
     cookie(name: string, val: any, options: CookieOptions): Response;
     cookie(name: string, val: any): Response;
 
     /**
-        * Set the location header to `url`.
-        *
-        * The given `url` can also be the name of a mapped url, for
-        * example by default express supports "back" which redirects
-        * to the _Referrer_ or _Referer_ headers or "/".
-        *
-        * Examples:
-        *
-        *    res.location('/foo/bar').;
-        *    res.location('http://example.com');
-        *    res.location('../login'); // /blog/post/1 -> /blog/login
-        *
-        * Mounting:
-        *
-        *   When an application is mounted and `res.location()`
-        *   is given a path that does _not_ lead with "/" it becomes
-        *   relative to the mount-point. For example if the application
-        *   is mounted at "/blog", the following would become "/blog/login".
-        *
-        *      res.location('login');
-        *
-        *   While the leading slash would result in a location of "/login":
-        *
-        *      res.location('/login');
-        *
-        * @param url
-        */
+     * Set the location header to `url`.
+     *
+     * The given `url` can also be the name of a mapped url, for
+     * example by default express supports "back" which redirects
+     * to the _Referrer_ or _Referer_ headers or "/".
+     *
+     * Examples:
+     *
+     *    res.location('/foo/bar').;
+     *    res.location('http://example.com');
+     *    res.location('../login'); // /blog/post/1 -> /blog/login
+     *
+     * Mounting:
+     *
+     *   When an application is mounted and `res.location()`
+     *   is given a path that does _not_ lead with "/" it becomes
+     *   relative to the mount-point. For example if the application
+     *   is mounted at "/blog", the following would become "/blog/login".
+     *
+     *      res.location('login');
+     *
+     *   While the leading slash would result in a location of "/login":
+     *
+     *      res.location('/login');
+     */
     location(url: string): Response;
 
     /**
-        * Redirect to the given `url` with optional response `status`
-        * defaulting to 302.
-        *
-        * The resulting `url` is determined by `res.location()`, so
-        * it will play nicely with mounted apps, relative paths,
-        * `"back"` etc.
-        *
-        * Examples:
-        *
-        *    res.redirect('/foo/bar');
-        *    res.redirect('http://example.com');
-        *    res.redirect(301, 'http://example.com');
-        *    res.redirect('http://example.com', 301);
-        *    res.redirect('../login'); // /blog/post/1 -> /blog/login
-        */
+     * Redirect to the given `url` with optional response `status`
+     * defaulting to 302.
+     *
+     * The resulting `url` is determined by `res.location()`, so
+     * it will play nicely with mounted apps, relative paths,
+     * `"back"` etc.
+     *
+     * Examples:
+     *
+     *    res.redirect('/foo/bar');
+     *    res.redirect('http://example.com');
+     *    res.redirect(301, 'http://example.com');
+     *    res.redirect('http://example.com', 301);
+     *    res.redirect('../login'); // /blog/post/1 -> /blog/login
+     */
     redirect(url: string): void;
     redirect(status: number, url: string): void;
     redirect(url: string, status: number): void;
 
     /**
-        * Render `view` with the given `options` and optional callback `fn`.
-        * When a callback function is given a response will _not_ be made
-        * automatically, otherwise a response of _200_ and _text/html_ is given.
-        *
-        * Options:
-        *
-        *  - `cache`     boolean hinting to the engine it should cache
-        *  - `filename`  filename of the view being rendered
-        */
+     * Render `view` with the given `options` and optional callback `fn`.
+     * When a callback function is given a response will _not_ be made
+     * automatically, otherwise a response of _200_ and _text/html_ is given.
+     *
+     * Options:
+     *
+     *  - `cache`     boolean hinting to the engine it should cache
+     *  - `filename`  filename of the view being rendered
+     */
     render(view: string, options?: Object, callback?: (err: Error, html: string) => void): void;
     render(view: string, callback?: (err: Error, html: string) => void): void;
 
@@ -858,185 +814,181 @@ interface Response extends http.ServerResponse, Express.Response {
     vary(field: string): Response;
 
     app: Application;
+
+    /**
+     * Appends the specified value to the HTTP response header field.
+     * If the header is not already set, it creates the header with the specified value.
+     * The value parameter can be a string or an array.
+     *
+     * Note: calling res.set() after res.append() will reset the previously-set header value.
+     *
+     * @since 4.11.0
+     */
+    append(field: string, value?: string[]|string): Response;
 }
 
-interface Handler extends RequestHandler { }
+export interface Handler extends RequestHandler { }
 
-interface RequestParamHandler {
-    (req: Request, res: Response, next: NextFunction, value: any, name: string): any;
-}
+export type RequestParamHandler = (req: Request, res: Response, next: NextFunction, value: any, name: string) => any;
 
-type ApplicationRequestHandler<T> =  IRouterHandler<T> & IRouterMatcher<T> & {
-  (...handlers: RequestHandlerParams[]): T;
-};
+export type ApplicationRequestHandler<T> = IRouterHandler<T> & IRouterMatcher<T> & ((...handlers: RequestHandlerParams[]) => T);
 
-interface Application extends IRouter, Express.Application {
+export interface Application extends IRouter, Express.Application {
     /**
      * Express instance itself is a request handler, which could be invoked without
      * third argument.
      */
-    (req: Request, res: Response): any;
+    (req: Request | http.IncomingMessage, res: Response | http.ServerResponse): any;
 
     /**
-        * Initialize the server.
-        *
-        *   - setup default configuration
-        *   - setup default middleware
-        *   - setup route reflection methods
-        */
+     * Initialize the server.
+     *
+     *   - setup default configuration
+     *   - setup default middleware
+     *   - setup route reflection methods
+     */
     init(): void;
 
     /**
-        * Initialize application configuration.
-        */
+     * Initialize application configuration.
+     */
     defaultConfiguration(): void;
 
     /**
-        * Register the given template engine callback `fn`
-        * as `ext`.
-        *
-        * By default will `require()` the engine based on the
-        * file extension. For example if you try to render
-        * a "foo.jade" file Express will invoke the following internally:
-        *
-        *     app.engine('jade', require('jade').__express);
-        *
-        * For engines that do not provide `.__express` out of the box,
-        * or if you wish to "map" a different extension to the template engine
-        * you may use this method. For example mapping the EJS template engine to
-        * ".html" files:
-        *
-        *     app.engine('html', require('ejs').renderFile);
-        *
-        * In this case EJS provides a `.renderFile()` method with
-        * the same signature that Express expects: `(path, options, callback)`,
-        * though note that it aliases this method as `ejs.__express` internally
-        * so if you're using ".ejs" extensions you dont need to do anything.
-        *
-        * Some template engines do not follow this convention, the
-        * [Consolidate.js](https://github.com/visionmedia/consolidate.js)
-        * library was created to map all of node's popular template
-        * engines to follow this convention, thus allowing them to
-        * work seamlessly within Express.
-        */
+     * Register the given template engine callback `fn`
+     * as `ext`.
+     *
+     * By default will `require()` the engine based on the
+     * file extension. For example if you try to render
+     * a "foo.jade" file Express will invoke the following internally:
+     *
+     *     app.engine('jade', require('jade').__express);
+     *
+     * For engines that do not provide `.__express` out of the box,
+     * or if you wish to "map" a different extension to the template engine
+     * you may use this method. For example mapping the EJS template engine to
+     * ".html" files:
+     *
+     *     app.engine('html', require('ejs').renderFile);
+     *
+     * In this case EJS provides a `.renderFile()` method with
+     * the same signature that Express expects: `(path, options, callback)`,
+     * though note that it aliases this method as `ejs.__express` internally
+     * so if you're using ".ejs" extensions you dont need to do anything.
+     *
+     * Some template engines do not follow this convention, the
+     * [Consolidate.js](https://github.com/visionmedia/consolidate.js)
+     * library was created to map all of node's popular template
+     * engines to follow this convention, thus allowing them to
+     * work seamlessly within Express.
+     */
     engine(ext: string, fn: Function): Application;
 
     /**
-        * Assign `setting` to `val`, or return `setting`'s value.
-        *
-        *    app.set('foo', 'bar');
-        *    app.get('foo');
-        *    // => "bar"
-        *    app.set('foo', ['bar', 'baz']);
-        *    app.get('foo');
-        *    // => ["bar", "baz"]
-        *
-        * Mounted servers inherit their parent server's settings.
-        *
-        * @param setting
-        * @param val
-        */
+     * Assign `setting` to `val`, or return `setting`'s value.
+     *
+     *    app.set('foo', 'bar');
+     *    app.get('foo');
+     *    // => "bar"
+     *    app.set('foo', ['bar', 'baz']);
+     *    app.get('foo');
+     *    // => ["bar", "baz"]
+     *
+     * Mounted servers inherit their parent server's settings.
+     */
     set(setting: string, val: any): Application;
-    get: { (name: string): any; } & IRouterMatcher<this>;
+    get: ((name: string) => any) & IRouterMatcher<this>;
 
     param(name: string | string[], handler: RequestParamHandler): this;
-    // Alternatively, you can pass only a callback, in which case you have the opportunity to alter the app.param() API
+
+    /**
+     * Alternatively, you can pass only a callback, in which case you have the opportunity to alter the app.param()
+     *
+     * @deprecated since version 4.11
+     */
     param(callback: (name: string, matcher: RegExp) => RequestParamHandler): this;
 
     /**
-        * Return the app's absolute pathname
-        * based on the parent(s) that have
-        * mounted it.
-        *
-        * For example if the application was
-        * mounted as "/admin", which itself
-        * was mounted as "/blog" then the
-        * return value would be "/blog/admin".
-        */
+     * Return the app's absolute pathname
+     * based on the parent(s) that have
+     * mounted it.
+     *
+     * For example if the application was
+     * mounted as "/admin", which itself
+     * was mounted as "/blog" then the
+     * return value would be "/blog/admin".
+     */
     path(): string;
 
     /**
-        * Check if `setting` is enabled (truthy).
-        *
-        *    app.enabled('foo')
-        *    // => false
-        *
-        *    app.enable('foo')
-        *    app.enabled('foo')
-        *    // => true
-        */
+     * Check if `setting` is enabled (truthy).
+     *
+     *    app.enabled('foo')
+     *    // => false
+     *
+     *    app.enable('foo')
+     *    app.enabled('foo')
+     *    // => true
+     */
     enabled(setting: string): boolean;
 
     /**
-        * Check if `setting` is disabled.
-        *
-        *    app.disabled('foo')
-        *    // => true
-        *
-        *    app.enable('foo')
-        *    app.disabled('foo')
-        *    // => false
-        *
-        * @param setting
-        */
+     * Check if `setting` is disabled.
+     *
+     *    app.disabled('foo')
+     *    // => true
+     *
+     *    app.enable('foo')
+     *    app.disabled('foo')
+     *    // => false
+     */
     disabled(setting: string): boolean;
 
-    /**
-        * Enable `setting`.
-        *
-        * @param setting
-        */
+    /** Enable `setting`. */
     enable(setting: string): Application;
 
-    /**
-        * Disable `setting`.
-        *
-        * @param setting
-        */
+    /** Disable `setting`. */
     disable(setting: string): Application;
 
     /**
-        * Configure callback for zero or more envs,
-        * when no `env` is specified that callback will
-        * be invoked for all environments. Any combination
-        * can be used multiple times, in any order desired.
-        *
-        * Examples:
-        *
-        *    app.configure(function(){
-        *      // executed for all envs
-        *    });
-        *
-        *    app.configure('stage', function(){
-        *      // executed staging env
-        *    });
-        *
-        *    app.configure('stage', 'production', function(){
-        *      // executed for stage and production
-        *    });
-        *
-        * Note:
-        *
-        *  These callbacks are invoked immediately, and
-        *  are effectively sugar for the following:
-        *
-        *     var env = process.env.NODE_ENV || 'development';
-        *
-        *      switch (env) {
-        *        case 'development':
-        *          ...
-        *          break;
-        *        case 'stage':
-        *          ...
-        *          break;
-        *        case 'production':
-        *          ...
-        *          break;
-        *      }
-        *
-        * @param env
-        * @param fn
-        */
+     * Configure callback for zero or more envs,
+     * when no `env` is specified that callback will
+     * be invoked for all environments. Any combination
+     * can be used multiple times, in any order desired.
+     *
+     * Examples:
+     *
+     *    app.configure(function(){
+     *      // executed for all envs
+     *    });
+     *
+     *    app.configure('stage', function(){
+     *      // executed staging env
+     *    });
+     *
+     *    app.configure('stage', 'production', function(){
+     *      // executed for stage and production
+     *    });
+     *
+     * Note:
+     *
+     *  These callbacks are invoked immediately, and
+     *  are effectively sugar for the following:
+     *
+     *     var env = process.env.NODE_ENV || 'development';
+     *
+     *      switch (env) {
+     *        case 'development':
+     *          ...
+     *          break;
+     *        case 'stage':
+     *          ...
+     *          break;
+     *        case 'production':
+     *          ...
+     *          break;
+     *      }
+     */
     configure(fn: Function): Application;
     configure(env0: string, fn: Function): Application;
     configure(env0: string, env1: string, fn: Function): Application;
@@ -1045,41 +997,36 @@ interface Application extends IRouter, Express.Application {
     configure(env0: string, env1: string, env2: string, env3: string, env4: string, fn: Function): Application;
 
     /**
-        * Render the given view `name` name with `options`
-        * and a callback accepting an error and the
-        * rendered template string.
-        *
-        * Example:
-        *
-        *    app.render('email', { name: 'Tobi' }, function(err, html){
-        *      // ...
-        *    })
-        *
-        * @param name
-        * @param options or fn
-        * @param fn
-        */
+     * Render the given view `name` name with `options`
+     * and a callback accepting an error and the
+     * rendered template string.
+     *
+     * Example:
+     *
+     *    app.render('email', { name: 'Tobi' }, function(err, html){
+     *      // ...
+     *    })
+     */
     render(name: string, options?: Object, callback?: (err: Error, html: string) => void): void;
     render(name: string, callback: (err: Error, html: string) => void): void;
 
-
     /**
-        * Listen for connections.
-        *
-        * A node `http.Server` is returned, with this
-        * application (which is a `Function`) as its
-        * callback. If you wish to create both an HTTP
-        * and HTTPS server you may do so with the "http"
-        * and "https" modules as shown here:
-        *
-        *    var http = require('http')
-        *      , https = require('https')
-        *      , express = require('express')
-        *      , app = express();
-        *
-        *    http.createServer(app).listen(80);
-        *    https.createServer({ ... }, app).listen(443);
-        */
+     * Listen for connections.
+     *
+     * A node `http.Server` is returned, with this
+     * application (which is a `Function`) as its
+     * callback. If you wish to create both an HTTP
+     * and HTTPS server you may do so with the "http"
+     * and "https" modules as shown here:
+     *
+     *    var http = require('http')
+     *      , https = require('https')
+     *      , express = require('express')
+     *      , app = express();
+     *
+     *    http.createServer(app).listen(80);
+     *    https.createServer({ ... }, app).listen(443);
+     */
     listen(port: number, hostname: string, backlog: number, callback?: Function): http.Server;
     listen(port: number, hostname: string, callback?: Function): http.Server;
     listen(port: number, callback?: Function): http.Server;
@@ -1097,13 +1044,13 @@ interface Application extends IRouter, Express.Application {
     locals: any;
 
     /**
-        * The app.routes object houses all of the routes defined mapped by the
-        * associated HTTP verb. This object may be used for introspection
-        * capabilities, for example Express uses this internally not only for
-        * routing but to provide default OPTIONS behaviour unless app.options()
-        * is used. Your application or framework may also remove routes by
-        * simply by removing them from this object.
-        */
+     * The app.routes object houses all of the routes defined mapped by the
+     * associated HTTP verb. This object may be used for introspection
+     * capabilities, for example Express uses this internally not only for
+     * routing but to provide default OPTIONS behaviour unless app.options()
+     * is used. Your application or framework may also remove routes by
+     * simply by removing them from this object.
+     */
     routes: any;
 
     /**
@@ -1114,8 +1061,7 @@ interface Application extends IRouter, Express.Application {
     use: ApplicationRequestHandler<this>;
 }
 
-interface Express extends Application {
+export interface Express extends Application {
     request: Request;
-
     response: Response;
 }
diff --git a/types/express-serve-static-core/tslint.json b/types/express-serve-static-core/tslint.json
new file mode 100644
index 0000000000..9b8c6a0c20
--- /dev/null
+++ b/types/express-serve-static-core/tslint.json
@@ -0,0 +1,11 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "ban-types": false,
+        "comment-format": false,
+        "interface-name": false,
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+  }
diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index 1a4d473a44..13ce6ab8b2 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for express-session 1.15
 // Project: https://www.npmjs.org/package/express-session
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>, Jacob Bogers <https://github.com/jacobbogers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Definitions by: Jacob Bogers <https://github.com/jacobbogers
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/express-unless/index.d.ts b/types/express-unless/index.d.ts
index 8a64ab87a8..7d7056f766 100644
--- a/types/express-unless/index.d.ts
+++ b/types/express-unless/index.d.ts
@@ -2,9 +2,7 @@
 // Project: https://www.npmjs.org/package/express-unless
 // Definitions by: Wonshik Kim <https://github.com/wokim>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
+// TypeScript Version: 2.3
 
 import express = require('express');
 
diff --git a/types/express-unless/tslint.json b/types/express-unless/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-unless/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-useragent/index.d.ts b/types/express-useragent/index.d.ts
index a8d55b113b..d6f47aa206 100644
--- a/types/express-useragent/index.d.ts
+++ b/types/express-useragent/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.npmjs.org/package/express-useragent
 // Definitions by: Isman Usoh <https://github.com/isman-usoh/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="express" />
 
diff --git a/types/express-useragent/tslint.json b/types/express-useragent/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/express-useragent/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
new file mode 100644
index 0000000000..7ce00c479e
--- /dev/null
+++ b/types/express-winston/express-winston-tests.ts
@@ -0,0 +1,94 @@
+import expressWinston = require('express-winston');
+import * as winston from 'winston';
+import * as express from 'express';
+
+const app = express();
+
+// Logger with all options
+app.use(expressWinston.logger({
+  baseMeta: { foo: 'foo' },
+  bodyBlacklist: [ 'foo' ],
+  bodyWhitelist: [ 'bar' ],
+  colorize: true,
+  dynamicMeta: (req, res, err) => ({ foo: 'bar' }),
+  expressFormat: true,
+  ignoreRoute: (req, res) => true,
+  ignoredRoutes: [ 'foo' ],
+  level: 'level',
+  metaField: 'metaField',
+  msg: 'msg',
+  requestFilter: (req, prop) => true,
+  requestWhitelist: [ 'foo', 'bar' ],
+  skip: (req, res) => false,
+  statusLevels: ({ error: 'error', success: 'success', warn: 'warn' }),
+  transports: [
+    new winston.transports.Console({
+      json: true,
+      colorize: true
+    })
+  ]
+}));
+
+// Logger with minimum options (transport)
+app.use(expressWinston.logger({
+  transports: [
+    new winston.transports.Console({
+      json: true,
+      colorize: true
+    })
+  ],
+}));
+
+// Logger with minimum options (winstonInstance)
+app.use(expressWinston.logger({
+  winstonInstance: winston,
+}));
+
+// Error Logger with all options
+app.use(expressWinston.errorLogger({
+  baseMeta: { foo: 'foo' },
+  dynamicMeta: (req, res, err) => ({ foo: 'bar' }),
+  level: 'level',
+  metaField: 'metaField',
+  msg: 'msg',
+  requestFilter: (req, prop) => true,
+  requestWhitelist: [ 'foo', 'bar' ],
+  transports: [
+    new winston.transports.Console({
+      json: true,
+      colorize: true
+    })
+  ]
+}));
+
+// Error Logger with min options (transports)
+app.use(expressWinston.errorLogger({
+  transports: [
+    new winston.transports.Console({
+      json: true,
+      colorize: true
+    })
+  ],
+}));
+
+// Error Logger with min options (winstonInstance)
+app.use(expressWinston.errorLogger({
+  winstonInstance: winston,
+}));
+
+expressWinston.bodyBlacklist.push('potato');
+expressWinston.bodyWhitelist.push('apple');
+expressWinston.defaultRequestFilter = (req: express.Request, prop: string) => true;
+expressWinston.defaultResponseFilter = (res: express.Response, prop: string) => true;
+expressWinston.defaultSkip = () => true;
+expressWinston.ignoredRoutes.push('/ignored');
+expressWinston.responseWhitelist.push('body');
+
+const router = express.Router();
+
+router.post('/user/register', (req, res, next) => {
+    const expressWinstonReq = req as expressWinston.ExpressWinstonRequest;
+    expressWinstonReq._routeWhitelists.body = [ 'username', 'email', 'age' ];
+    expressWinstonReq._routeWhitelists.req = [ 'userId' ];
+    expressWinstonReq._routeWhitelists.res = [ '_headers' ];
+});
diff --git a/types/express-winston/index.d.ts b/types/express-winston/index.d.ts
new file mode 100644
index 0000000000..21e7ead653
--- /dev/null
+++ b/types/express-winston/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for express-winston 2.4
+// Project: https://github.com/bithavoc/express-winston#readme
+// Definitions by: Alex Brick <https://github.com/bricka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { ErrorRequestHandler, Handler, Request, Response } from 'express';
+import { TransportInstance, Winston } from 'winston';
+
+export interface MetaObject {
+  [field: string]: string;
+}
+
+export type DynamicMetaFunction = (req: Request, res: Response, err: Error) => MetaObject | undefined;
+export type RequestFilter = (req: Request, propName: string) => boolean;
+export type ResponseFilter = (res: Response, propName: string) => boolean;
+export type RouteFilter = (req: Request, res: Response) => boolean;
+
+export interface BaseLoggerOptions {
+  baseMeta?: MetaObject;
+  bodyBlacklist?: string[];
+  bodyWhitelist?: string[];
+  colorize?: boolean;
+  dynamicMeta?: DynamicMetaFunction;
+  expressFormat?: boolean;
+  ignoreRoute?: RouteFilter;
+  ignoredRoutes?: string[];
+  level?: string;
+  metaField?: string;
+  msg?: string;
+  requestFilter?: RequestFilter;
+  requestWhitelist?: string[];
+  responseFilter?: ResponseFilter;
+  responseWhitelist?: string[];
+  skip?: RouteFilter;
+  statusLevels?: {
+    error?: string;
+    success?: string;
+    warn?: string;
+  };
+}
+
+export interface LoggerOptionsWithTransports extends BaseLoggerOptions {
+  transports: TransportInstance[];
+}
+
+export interface LoggerOptionsWithWinstonInstance extends BaseLoggerOptions {
+  winstonInstance: Winston;
+}
+
+export type LoggerOptions = LoggerOptionsWithTransports | LoggerOptionsWithWinstonInstance;
+
+export function logger(options: LoggerOptions): Handler;
+
+export interface BaseErrorLoggerOptions {
+  baseMeta?: MetaObject;
+  dynamicMeta?: DynamicMetaFunction;
+  level?: string;
+  metaField?: string;
+  msg?: string;
+  requestFilter?: RequestFilter;
+  requestWhitelist?: string[];
+}
+
+export interface ErrorLoggerOptionsWithTransports extends BaseErrorLoggerOptions {
+  transports: TransportInstance[];
+}
+
+export interface ErrorLoggerOptionsWithWinstonInstance extends BaseErrorLoggerOptions {
+  winstonInstance: Winston;
+}
+
+export type ErrorLoggerOptions = ErrorLoggerOptionsWithTransports | ErrorLoggerOptionsWithWinstonInstance;
+
+export function errorLogger(options: ErrorLoggerOptions): ErrorRequestHandler;
+
+export let requestWhitelist: string[];
+
+export let bodyWhitelist: string[];
+
+export let bodyBlacklist: string[];
+
+export let responseWhitelist: string[];
+
+export let ignoredRoutes: string[];
+
+export let defaultRequestFilter: RequestFilter;
+
+export let defaultResponseFilter: ResponseFilter;
+
+export function defaultSkip(): boolean;
+
+export interface ExpressWinstonRequest extends Request {
+    _routeWhitelists: {
+        body: string[];
+        req: string[];
+        res: string[];
+    };
+}
diff --git a/types/express-winston/tsconfig.json b/types/express-winston/tsconfig.json
new file mode 100644
index 0000000000..dcebd7fafb
--- /dev/null
+++ b/types/express-winston/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-winston-tests.ts"
+    ]
+}
diff --git a/types/express-winston/tslint.json b/types/express-winston/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-winston/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 62e9fc7124..1c9220a8b5 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -1,109 +1,129 @@
 import * as express from 'express';
 
 namespace express_tests {
-
-    var app = express();
+    const app = express();
 
     app.engine('jade', require('jade').__express);
     app.engine('html', require('ejs').renderFile);
 
     express.static.mime.define({
-	'application/fx': ['fx']
+        'application/fx': ['fx']
     });
     app.use('/static', express.static(__dirname + '/public'));
 
     // simple logger
-    app.use(function(req, res, next) {
-    console.log('%s %s', req.method, req.url);
-    next();
+    app.use((req, res, next) => {
+        console.log('%s %s', req.method, req.url);
+        next();
     });
 
-    app.use(function(err: any, req: express.Request, res: express.Response, next: express.NextFunction) {
-    console.error(err);
-    next(err);
+    app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
+        console.error(err);
+        next(err);
     });
 
+    app.get('/', (req, res) => {
+        res.send('hello world');
+    });
 
-    app.get('/', function(req, res) {
-    res.send('hello world');
+    // Accept json app-wide or on one endpoint.
+    app.use(express.json({ limit: "200kb" }));
+    app.post('/echo', express.json(), (req, res) => {
+        res.json(req.body);
+    });
+
+    // Accept urlencoded app-wide or on one endpoint.
+    app.use(express.urlencoded({
+        extended: false,
+        parameterLimit: 16
+    }));
+    app.post('/search', express.urlencoded(), (req, res) => {
+        res.json(Object.keys(req.body));
     });
 
     const router = express.Router({ caseSensitive: true, mergeParams: true, strict: true });
 
-    const pathStr: string = 'test';
+    const pathStr = 'test';
     const pathRE: RegExp = /test/;
     const path = true ? pathStr : pathRE;
 
     router.get(path);
-    router.put(path)
+    router.put(path);
     router.post(path);
     router.delete(path);
     router.get(pathStr);
-    router.put(pathStr)
+    router.put(pathStr);
     router.post(pathStr);
     router.delete(pathStr);
     router.get(pathRE);
-    router.put(pathRE)
+    router.put(pathRE);
     router.post(pathRE);
     router.delete(pathRE);
 
-    router.use((req, res, next) => { next(); })
+    router.use((req, res, next) => { next(); });
     router.route('/users')
-    .get((req, res, next) => {
-        let types: string[] = req.accepts();
-        let type: string | false = req.accepts('json');
-        type = req.accepts(['json', 'text']);
-        type = req.accepts('json', 'text');
+        .get((req, res, next) => {
+            const types: string[] = req.accepts();
+            let type: string | false = req.accepts('json');
+            type = req.accepts(['json', 'text']);
+            type = req.accepts('json', 'text');
 
-        let charsets: string[] = req.acceptsCharsets();
-        let charset: string | false = req.acceptsCharsets('utf-8');
-        charset = req.acceptsCharsets(['utf-8', 'utf-16']);
-        charset = req.acceptsCharsets('utf-8', 'utf-16');
+            const charsets: string[] = req.acceptsCharsets();
+            let charset: string | false = req.acceptsCharsets('utf-8');
+            charset = req.acceptsCharsets(['utf-8', 'utf-16']);
+            charset = req.acceptsCharsets('utf-8', 'utf-16');
 
-        let encodings: string[] = req.acceptsEncodings();
-        let encoding: string | false = req.acceptsEncodings('gzip');
-        encoding = req.acceptsEncodings(['gzip', 'deflate']);
-        encoding = req.acceptsEncodings('gzip', 'deflate');
+            const encodings: string[] = req.acceptsEncodings();
+            let encoding: string | false = req.acceptsEncodings('gzip');
+            encoding = req.acceptsEncodings(['gzip', 'deflate']);
+            encoding = req.acceptsEncodings('gzip', 'deflate');
 
-        let languages: string[] = req.acceptsLanguages();
-        let language: string | false = req.acceptsLanguages('en');
-        language = req.acceptsLanguages(['en', 'ja']);
-        language = req.acceptsLanguages('en', 'ja');
+            const languages: string[] = req.acceptsLanguages();
+            let language: string | false = req.acceptsLanguages('en');
+            language = req.acceptsLanguages(['en', 'ja']);
+            language = req.acceptsLanguages('en', 'ja');
 
-        // downcasting
-        req.get('set-cookie') as undefined;
-        req.get('set-cookie') as string[];
-        const setCookieHeader1 = req.get('set-cookie');
-        if (setCookieHeader1 !== undefined) {
-            const setCookieHeader2: string[] = setCookieHeader1;
-        }
-        req.get('header') as undefined;
-        req.get('header') as string;
-        const header1 = req.get('header');
-        if (header1 !== undefined) {
-            const header2: string = header1;
-        }
+            // downcasting
+            req.get('set-cookie') as undefined;
+            req.get('set-cookie') as string[];
+            const setCookieHeader1 = req.get('set-cookie');
+            if (setCookieHeader1 !== undefined) {
+                const setCookieHeader2: string[] = setCookieHeader1;
+            }
+            req.get('header') as undefined;
+            req.get('header') as string;
+            const header1 = req.get('header');
+            if (header1 !== undefined) {
+                const header2: string = header1;
+            }
 
-        // upcasting
-        const setCookieHeader3: string[] | undefined = req.get('set-cookie');
-        const header3: string | undefined = req.header('header');
+            // upcasting
+            const setCookieHeader3: string[] | undefined = req.get('set-cookie');
+            const header3: string | undefined = req.header('header');
 
-        req.headers.existingHeader as string;
-        req.headers.nonExistingHeader as any as undefined;
+            req.headers.existingHeader as string;
+            req.headers.nonExistingHeader as any as undefined;
 
-        res.send(req.query['token']);
-    });
+            res.send(req.query['token']);
+        });
 
-    router.get('/user/:id', function(req, res, next) {
-    if (req.params.id == 0) next('route');
-    else next();
-    }, function(req, res, next) {
-    res.render('regular');
+    router.get('/user/:id', (req, res, next) => {
+        if (Number(req.params.id) === 0) next('route');
+        else next();
+    }, (req, res, next) => {
+        res.render('regular');
     });
 
     app.use((req, res, next) => {
-    // hacky trick, router is just a handler
-    router(req, res, next);
+        // hacky trick, router is just a handler
+        router(req, res, next);
+    });
+
+    // Test append function
+    app.use((req, res, next) => {
+        res.append('Link', ['<http://localhost/>', '<http://localhost:3000/>']);
+        res.append('Set-Cookie', 'foo=bar; Path=/; HttpOnly');
+        res.append('Warning', '199 Miscellaneous warning');
     });
 
     app.use(router);
@@ -120,9 +140,7 @@ namespace express_tests {
  ***************************/
 import * as http from 'http';
 
-
 namespace node_tests {
-
     {
         // http.createServer can take express application
         const app: express.Application = express();
diff --git a/types/express/index.d.ts b/types/express/index.d.ts
index e127d6d5ed..18231dcfbc 100644
--- a/types/express/index.d.ts
+++ b/types/express/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Express 4.x
+// Type definitions for Express 4.11
 // Project: http://expressjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -14,6 +14,7 @@
 /// <reference types="express-serve-static-core" />
 /// <reference types="serve-static" />
 
+import * as bodyParser from "body-parser";
 import * as serveStatic from "serve-static";
 import * as core from "express-serve-static-core";
 
@@ -23,12 +24,23 @@ import * as core from "express-serve-static-core";
 declare function e(): core.Express;
 
 declare namespace e {
+    /**
+     * This is a built-in middleware function in Express. It parses incoming requests with JSON payloads and is based on body-parser.
+     * @since 4.16.0
+     */
+    var json: typeof bodyParser.json;
 
     /**
-     * This is the only built-in middleware function in Express. It serves static files and is based on serve-static.
+     * This is a built-in middleware function in Express. It serves static files and is based on serve-static.
      */
     var static: typeof serveStatic;
 
+    /**
+     * This is a built-in middleware function in Express. It parses incoming requests with urlencoded payloads and is based on body-parser.
+     * @since 4.16.0
+     */
+    var urlencoded: typeof bodyParser.urlencoded;
+
     export function Router(options?: RouterOptions): core.Router;
 
     interface RouterOptions {
@@ -60,7 +72,7 @@ declare namespace e {
     interface Handler extends core.Handler { }
     interface IRoute extends core.IRoute { }
     interface IRouter<T> extends core.IRouter { }
-    interface IRouterHandler<T> extends core.IRouterHandler<T> { }    
+    interface IRouterHandler<T> extends core.IRouterHandler<T> { }
     interface IRouterMatcher<T> extends core.IRouterMatcher<T> { }
     interface MediaType extends core.MediaType { }
     interface NextFunction extends core.NextFunction { }
diff --git a/types/express/tslint.json b/types/express/tslint.json
new file mode 100644
index 0000000000..7b39baf22b
--- /dev/null
+++ b/types/express/tslint.json
@@ -0,0 +1,12 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // Not sure if changing these won't break apps.
+        "interface-name": false,
+        "no-empty-interface": false,
+        "no-namespace": false,
+        "no-reference-import": false,
+        "no-var-keyword": false,
+        "strict-export-declare-modifiers": false
+    }
+}
\ No newline at end of file
diff --git a/types/extended-listbox/extended-listbox-tests.ts b/types/extended-listbox/extended-listbox-tests.ts
deleted file mode 100644
index 571a455300..0000000000
--- a/types/extended-listbox/extended-listbox-tests.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-const testElement: HTMLElement = document.getElementById("test");
-
-// Create Listbox with defaults
-let instance: SingleSelectListBox = new SingleSelectListBox(testElement);
-instance = new MultiSelectListBox(testElement);
-
-
-// Create with options
-let settings = <ListBoxSettings>{};
-settings.searchBar = false;
-settings.searchBarWatermark = "Search";
-settings.searchBarButton = { icon: "fa fa-search", visible: true, onClick: function () { alert(); } };
-settings.getItems = (): (string|ListBoxItem)[] => {
-    return ["Test1"];
-};
-settings.onItemsChanged = (event: ListBoxEvent): void => {
-    console.log(event.eventName);
-    console.log(event.args);
-    console.log(event.target);
-};
-settings.onFilterChanged = (event: ListBoxEvent): void => {
-    console.log(event.args);
-};
-settings.onValueChanged = (event: ListBoxEvent): void => {
-    console.log(event.args);
-};
-settings.onItemDoubleClicked = (event: ListBoxEvent): void => {
-    console.log(event.args);
-};
-settings.onItemEnterPressed = (event: ListBoxEvent): void => {
-    console.log(event.args);
-};
-
-instance = new SingleSelectListBox(testElement, settings);
-instance = new MultiSelectListBox(testElement, settings);
-
-
-/////// NEW API ///////
-
-// Add string item
-var id: string = instance.addItem("Test2");
-
-
-// Add item
-var item: ListBoxItem = <ListBoxItem>{};
-item.selected = true;
-item.disabled = false;
-item.childItems = [{ text: "Test4" }];
-item.groupHeader = false;
-item.id = "ouetioreit";
-item.index = 0;
-item.text = "Test3";
-id = instance.addItem(item);
-
-
-// Add string items
-var ids: string[] = instance.addItems(["Test2", "Test1"]);
-
-
-// Remove item
-instance.removeItem(id);
-
-
-// Remove items
-instance.removeItems([id, ids[0]]);
-
-
-// Get item
-var i: ListBoxItem = instance.getItem(id);
-
-
-// Get items
-var allItems: ListBoxItem[] = instance.getItems();
-
-// Get selected items
-var allItems: ListBoxItem[] = instance.getSelection();
-
-
-// Move item up
-var newIndex: number = instance.moveItemUp(i.id);
-
-
-// Move item down
-newIndex = instance.moveItemDown(i.id);
-
-
-// Move item to top
-var newIndex: number = instance.moveItemToTop(i.id);
-
-
-// Move item to bottom
-newIndex = instance.moveItemToBottom(i.id);
-
-
-// Clear selection
-instance.clearSelection();
-
-
-// Enable
-instance.enable(false);
-
-
-// Destroy
-instance.destroy();
-
-
-// onValueChanged
-settings.onValueChanged = (event: ListBoxEvent) => {
-    console.log(event.args);
-};
-
-
-// onItemsChanged
-settings.onItemsChanged = (event: ListBoxEvent) => {
-    console.log(event.args);
-};
-
-
-// onFilterChanged
-settings.onFilterChanged = (event: ListBoxEvent) => {
-    console.log(event.args);
-};
-
-
-// onItemEnterPressed
-settings.onItemEnterPressed = (event: ListBoxEvent) => {
-    console.log(event.args);
-};
-
-
-// onItemDoubleClicked
-settings.onItemDoubleClicked = (event: ListBoxEvent) => {
-    console.log(event.args);
-};
diff --git a/types/extended-listbox/index.d.ts b/types/extended-listbox/index.d.ts
deleted file mode 100644
index 5d6e7822d5..0000000000
--- a/types/extended-listbox/index.d.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-// Type definitions for extended-listbox 4.0.x
-// Project: https://github.com/code-chris/extended-listbox
-// Definitions by: Christian Kotzbauer <https://github.com/code-chris>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface ListBoxItem {
-    /** display text */
-    text?: string;
-
-    /** unique identifier, if not set it will be generated */
-    id?: string;
-
-    /** index position from the item in the list; only used for manual addItem api calls */
-    index?: number;
-
-    /** determines if the item should be clickable */
-    disabled?: boolean;
-
-    /** determines if the item is selected */
-    selected?: boolean;
-
-    /** determines if the item has childItems */
-    groupHeader?: boolean;
-
-    /** display text or id of the parent; only used for manual addItem api calls */
-    parentGroupId?: string;
-
-    /** list of childItems */
-    childItems?: (string | ListBoxItem)[];
-}
-
-interface ListBoxSearchBarButtonOptions {
-    /** determines if the button is visible */
-    visible?: boolean;
-
-    /** css class for the i-tag of the button */
-    icon?: string;
-
-    /** callback for button click */
-    onClick?: () => void;
-}
-
-interface ListBoxSettings {
-    /** determines if the searchBar is visible */
-    searchBar?: boolean;
-
-    /** watermark (placeholder) for the searchBar */
-    searchBarWatermark?: string;
-
-    /** settings for the searchBar button */
-    searchBarButton?: ListBoxSearchBarButtonOptions;
-
-    /** function which returns a array of items */
-    getItems?: () => (string | ListBoxItem)[];
-
-    /** callback for selection changes */
-    onValueChanged?: (event: ListBoxEvent) => void;
-
-    /** callback for searchBar text changes */
-    onFilterChanged?: (event: ListBoxEvent) => void;
-
-    /** callback for item changes (item added, item removed, item order) */
-    onItemsChanged?: (event: ListBoxEvent) => void;
-
-    /** callback for enter keyPress event on an item */
-    onItemEnterPressed?: (event: ListBoxEvent) => void;
-
-    /** callback for doubleClick event on an item */
-    onItemDoubleClicked?: (event: ListBoxEvent) => void;
-}
-
-interface ListBoxEvent {
-    /** unique event name */
-    eventName: string;
-
-    /** target object for which event is triggered */
-    target: Element;
-
-    /** any object */
-    args: any;
-}
-
-interface BaseListBox {
-    /** Adds a new item to the list */
-    addItem(item: string | ListBoxItem): string;
-
-    /** Adds new items to the list */
-    addItems(items: (string | ListBoxItem)[]): string[];
-
-    /** Removes a item from the list */
-    removeItem(identifier: string): void;
-
-    /** Removes items from the list */
-    removeItems(identifiers: string[]): void;
-
-    /** Reverts all changes from the DOM */
-    destroy(): void;
-
-    /** Resets the selection state of all items */
-    clearSelection(): void;
-
-    /** Returns a item object for the given id or display text */
-    getItem(identifier: string): ListBoxItem;
-
-    /** Returns all item objects */
-    getItems(): ListBoxItem[];
-
-    /** Decreases the index of the matching item by one */
-    moveItemUp(identifier: string): number;
-
-    /** Increases the index of the matching item by one */
-    moveItemDown(identifier: string): number;
-
-    /** Moves item to the bottom of the list */
-    moveItemToBottom(identifier: string): number;
-
-    /** Moves item to the top of the list */
-    moveItemToTop(identifier: string): number;
-
-    /** Enables or disables the whole list and all childs */
-    enable(state: boolean): void;
-
-    /** Returns all ListBoxItem's which are selected */
-    getSelection(): ListBoxItem[];
-}
-
-interface SingleSelectListBox extends BaseListBox {
-}
-
-interface MultiSelectListBox extends BaseListBox {
-}
-
-declare var SingleSelectListBox: {
-    prototype: SingleSelectListBox;
-    new(domElement: HTMLElement, options?: ListBoxSettings): SingleSelectListBox;
-};
-
-declare var MultiSelectListBox: {
-    prototype: MultiSelectListBox;
-    new(domElement: HTMLElement, options?: ListBoxSettings): MultiSelectListBox;
-};
diff --git a/types/extended-listbox/tsconfig.json b/types/extended-listbox/tsconfig.json
deleted file mode 100644
index 38eda11579..0000000000
--- a/types/extended-listbox/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "extended-listbox-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/extjs/tslint.json b/types/extjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/extjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/eyes/tslint.json b/types/eyes/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/eyes/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fabric/index.d.ts b/types/fabric/index.d.ts
index c24a413b40..ac6104d419 100644
--- a/types/fabric/index.d.ts
+++ b/types/fabric/index.d.ts
@@ -18,82 +18,78 @@ export function createCanvasForNode(width: number, height: number): Canvas;
 // ----------------------------------------------------------
 /**
  * Creates markup containing SVG referenced elements like patterns, gradients etc.
- * @param {fabric.Canvas} canvas instance of fabric.Canvas
+ * @param canvas instance of fabric.Canvas
  */
 export function createSVGRefElementsMarkup(canvas: StaticCanvas): string;
 /**
  * Creates markup containing SVG font faces
- * @param {Array} objects Array of fabric objects
+ * @param objects Array of fabric objects
  */
 export function createSVGFontFacesMarkup(objects: Object[]): string;
 /**
  * Takes string corresponding to an SVG document, and parses it into a set of fabric objects
- * @param {String} string
- * @param {Function} callback
- * @param {Function} [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
  */
 export function loadSVGFromString(string: string, callback: (results: Object[], options: any) => void, reviver?: Function): void;
 /**
  * Takes url corresponding to an SVG document, and parses it into a set of fabric objects.
  * Note that SVG is fetched via XMLHttpRequest, so it needs to conform to SOP (Same Origin Policy)
- * @param {String} url
- * @param {Function} callback
- * @param {Function} [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
  */
 export function loadSVGFromURL(url: string, callback: (results: Object[], options: any) => void, reviver?: Function): void;
 /**
  * Returns CSS rules for a given SVG document
- * @param {SVGDocument} doc SVG document to parse
+ * @param doc SVG document to parse
  */
 export function getCSSRules(doc: SVGElement): any;
 
 export function parseElements(elements: any[], callback: Function, options: any, reviver?: Function): void;
 /**
  * Parses "points" attribute, returning an array of values
- * @param {String} points points attribute string
+ * @param points points attribute string
  */
 export function parsePointsAttribute(points: string): any[];
 /**
  * Parses "style" attribute, retuning an object with values
- * @param {SVGElement} element Element to parse
+ * @param element Element to parse
  */
 export function parseStyleAttribute(element: SVGElement): any;
 /**
  * Transforms an array of svg elements to corresponding fabric.* instances
- * @param {Array} elements Array of elements to parse
- * @param {Function} callback Being passed an array of fabric instances (transformed from SVG elements)
- * @param {Object} [options] Options object
- * @param {Function} [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ * @param elements Array of elements to parse
+ * @param callback Being passed an array of fabric instances (transformed from SVG elements)
+ * @param [options] Options object
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
  */
 export function parseElements(elements: any[], callback: Function, options?: any, reviver?: Function): void;
 /**
  * Returns an object of attributes' name/value, given element and an array of attribute names;
  * Parses parent "g" nodes recursively upwards.
- * @param {DOMElement} element Element to parse
- * @param {Array} attributes Array of attributes to parse
+ * @param element Element to parse
+ * @param attributes Array of attributes to parse
  */
 export function parseAttributes(element: HTMLElement, attributes: string[], svgUid?: string): { [key: string]: string };
 /**
  * Parses an SVG document, returning all of the gradient declarations found in it
- * @param {SVGDocument} doc SVG document to parse
+ * @param doc SVG document to parse
  */
 export function getGradientDefs(doc: SVGElement): { [key: string]: any };
 /**
  * Parses a short font declaration, building adding its properties to a style object
- * @param {String} value font declaration
- * @param {Object} oStyle definition
+ * @param value font declaration
+ * @param oStyle definition
  */
 export function parseFontDeclaration(value: string, oStyle: any): void;
 /**
  * Parses an SVG document, converts it to an array of corresponding fabric.* instances and passes them to a callback
- * @param {SVGDocument} doc SVG document to parse
- * @param {Function} callback Callback to call when parsing is finished; It's being passed an array of elements (parsed from a document).
- * @param {Function} [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ * @param doc SVG document to parse
+ * @param callback Callback to call when parsing is finished; It's being passed an array of elements (parsed from a document).
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
  */
 export function parseSVGDocument(doc: SVGElement, callback: (results: Object[], options: any) => void, reviver?: Function): void;
 /**
  * Parses "transform" attribute, returning an array of values
- * @param {String} attributeValue String containing attribute value
+ * @param attributeValue String containing attribute value
  */
 export function parseTransformAttribute(attributeValue: string): number[];
 
@@ -208,74 +204,71 @@ interface ICollection<T> {
 	/**
 	 * Adds objects to collection, then renders canvas (if `renderOnAddRemove` is not `false`)
 	 * Objects should be instances of (or inherit from) fabric.Object
-	 * @param {...fabric.Object} object Zero or more fabric instances
+	 * @param object Zero or more fabric instances
 	 */
 	add(...object: Object[]): T;
 
 	/**
 	 * Inserts an object into collection at specified index, then renders canvas (if `renderOnAddRemove` is not `false`)
 	 * An object should be an instance of (or inherit from) fabric.Object
-	 * @param {Object} object Object to insert
-	 * @param {Number} index Index to insert object at
-	 * @param {Boolean} nonSplicing When `true`, no splicing (shifting) of objects occurs
-	 * @return {Self} thisArg
+	 * @param object Object to insert
+	 * @param index Index to insert object at
+	 * @param nonSplicing When `true`, no splicing (shifting) of objects occurs
+	 * @return thisArg
 	 * @chainable
 	 */
 	insertAt(object: Object, index: number, nonSplicing: boolean): T;
 
 	/**
 	 * Removes objects from a collection, then renders canvas (if `renderOnAddRemove` is not `false`)
-	 * @param {...fabric.Object} object Zero or more fabric instances
-	 * @return {Self} thisArg
+	 * @param object Zero or more fabric instances
+	 * @return thisArg
 	 * @chainable
 	 */
 	remove(...object: Object[]): T;
 
 	/**
 	 * Executes given function for each object in this group
-	 * @param {Function} callback
-	 * @param {Object} context Context (aka thisObject)
-	 * @return {Self} thisArg
+	 * @param context Context (aka thisObject)
+	 * @return thisArg
 	 */
 	forEachObject(callback: (element: Object, index: number, array: Object[]) => any, context?: any): T;
 
 	/**
 	 * Returns an array of children objects of this instance
 	 * Type parameter introduced in 1.3.10
-	 * @param {String} [type] When specified, only objects of this type are returned
-	 * @return {Array}
+	 * @param [type] When specified, only objects of this type are returned
 	 */
 	getObjects(type?: string): Object[];
 
 	/**
 	 * Returns object at specified index
-	 * @param {Number} index
-	 * @return {Self} thisArg
+	 * @return thisArg
 	 */
 	item(index: number): T;
 
 	/**
 	 * Returns true if collection contains no objects
-	 * @return {Boolean} true if collection is empty
+	 * @return true if collection is empty
 	 */
 	isEmpty(): boolean;
 
 	/**
 	 * Returns a size of a collection (i.e: length of an array containing its objects)
-	 * @return {Number} Collection size
+	 * @return Collection size
 	 */
 	size(): number;
 
 	/**
 	 * Returns true if collection contains an object
-	 * @param {Object} object Object to check against
-	 * @return {Boolean} `true` if collection contains an object
+	 * @param object Object to check against
+	 * @return `true` if collection contains an object
 	 */
 	contains(object: Object): boolean;
 
 	/**
 	 * Returns number representation of a collection complexity
-	 * @return {Number} complexity
+	 * @return complexity
 	 */
 	complexity(): number;
 }
@@ -295,8 +288,8 @@ interface IObservable<T> {
 	on(eventName: {[key: string]: Function}): T;
 	/**
 	 * Fires event with an optional options object
-	 * @param {String} eventName Event name to fire
-	 * @param {Object} [options] Options object
+	 * @param eventName Event name to fire
+	 * @param [options] Options object
 	 */
 	trigger(eventName: string, options?: any): T;
 	/**
@@ -308,38 +301,35 @@ interface IObservable<T> {
 	off(eventName?: string|any, handler?: (e: IEvent) => any): T;
 }
 
+interface Callbacks {
+	/** Invoked on completion */
+	onComplete?: Function;
+	/** Invoked on every step of animation */
+	onChange?: Function;
+}
+
 // animation mixin
 // ----------------------------------------------------
 interface ICanvasAnimation<T> {
 	FX_DURATION: number;
 	/**
 	 * Centers object horizontally with animation.
-	 * @param {fabric.Object} object Object to center
-	 * @param {Object} [callbacks] Callbacks object with optional "onComplete" and/or "onChange" properties
-	 * @param {Function} [callbacks.onComplete] Invoked on completion
-	 * @param {Function} [callbacks.onChange] Invoked on every step of animation
+	 * @param object Object to center
 	 */
-	fxCenterObjectH(object: Object, callbacks?: { onComplete: Function; onChange: Function; }): T;
+	fxCenterObjectH(object: Object, callbacks?: Callbacks): T;
 
 	/**
 	 * Centers object vertically with animation.
-	 * @param {fabric.Object} object Object to center
-	 * @param {Object} [callbacks] Callbacks object with optional "onComplete" and/or "onChange" properties
-	 * @param {Function} [callbacks.onComplete] Invoked on completion
-	 * @param {Function} [callbacks.onChange] Invoked on every step of animation
+	 * @param object Object to center
 	 */
-	fxCenterObjectV(object: Object, callbacks?: { onComplete: Function; onChange: Function; }): T;
+	fxCenterObjectV(object: Object, callbacks?: Callbacks): T;
 
 	/**
 	 * Same as `fabric.Canvas#remove` but animated
-	 * @param {fabric.Object} object Object to remove
-	 * @param {Object} [callbacks] Callbacks object with optional "onComplete" and/or "onChange" properties
-	 * @param {Function} [callbacks.onComplete] Invoked on completion
-	 * @param {Function} [callbacks.onChange] Invoked on every step of animation
-	 * @return {fabric.Canvas} thisArg
+	 * @param object Object to remove
 	 * @chainable
 	 */
-	fxRemove(object: Object, callbacks?: { onComplete: Function; onChange: Function; }): T;
+	fxRemove(object: Object): T;
 }
 interface IObjectAnimation<T> {
 	/**
@@ -393,7 +383,7 @@ export class Color {
 	/**
 	 * Color class
 	 * The purpose of Color is to abstract and encapsulate common color operations;
-	 * @param {String} color optional in hex or rgb(a) format
+	 * @param color optional in hex or rgb(a) format
 	 */
 	constructor(color?: string);
 
@@ -439,7 +429,7 @@ export class Color {
 
 	/**
 	 * Sets value of alpha channel for this color
-	 * @param {Number} alpha Alpha value 0-1
+	 * @param alpha Alpha value 0-1
 	 */
 	setAlpha(alpha: number): void;
 
@@ -450,66 +440,63 @@ export class Color {
 
 	/**
 	 * Transforms color to its black and white representation
-	 * @param {Number} threshold
 	 */
 	toBlackWhite(threshold: number): Color;
 	/**
 	 * Overlays color with another color
-	 * @param {String|fabric.Color} otherColor
 	 */
 	overlayWith(otherColor: string|Color): Color;
 
 	/**
 	 * Returns new color object, when given a color in RGB format
-	 * @param {String} color Color value ex: rgb(0-255,0-255,0-255)
+	 * @param color Color value ex: rgb(0-255,0-255,0-255)
 	 */
 	static fromRgb(color: string): Color;
 	/**
 	 * Returns new color object, when given a color in RGBA format
-	 * @param {String} color Color value ex: rgb(0-255,0-255,0-255)
+	 * @param color Color value ex: rgb(0-255,0-255,0-255)
 	 */
 	static fromRgba(color: string): Color;
 	/**
 	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in RGB or RGBA format
-	 * @param {String} color Color value ex: rgb(0-255,0-255,0-255), rgb(0%-100%,0%-100%,0%-100%)
+	 * @param color Color value ex: rgb(0-255,0-255,0-255), rgb(0%-100%,0%-100%,0%-100%)
 	 */
 	static sourceFromRgb(color: string): number[];
 	/**
 	 * Returns new color object, when given a color in HSL format
-	 * @param {String} color Color value ex: hsl(0-260,0%-100%,0%-100%)
+	 * @param color Color value ex: hsl(0-260,0%-100%,0%-100%)
 	 */
 	static fromHsl(color: string): Color;
 	/**
 	 * Returns new color object, when given a color in HSLA format
-	 * @param {String} color Color value ex: hsl(0-260,0%-100%,0%-100%)
+	 * @param color Color value ex: hsl(0-260,0%-100%,0%-100%)
 	 */
 	static fromHsla(color: string): Color;
 	/**
 	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in HSL or HSLA format.
-	 * @param {String} color Color value ex: hsl(0-360,0%-100%,0%-100%) or hsla(0-360,0%-100%,0%-100%, 0-1)
+	 * @param color Color value ex: hsl(0-360,0%-100%,0%-100%) or hsla(0-360,0%-100%,0%-100%, 0-1)
 	 */
 	static sourceFromHsl(color: string): number[];
 	/**
 	 * Returns new color object, when given a color in HEX format
-	 * @param {String} color Color value ex: FF5555
+	 * @param color Color value ex: FF5555
 	 */
 	static fromHex(color: string): Color;
 
 	/**
 	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in HEX format
-	 * @param {String} color ex: FF5555
+	 * @param color ex: FF5555
 	 */
 	static sourceFromHex(color: string): number[];
 	/**
 	 * Returns new color object, when given color in array representation (ex: [200, 100, 100, 0.5])
-	 * @param {Array} source
 	 */
 	static fromSource(source: number[]): Color;
 }
 
 interface IGradientOptions {
 	/**
-	 * @param {String} [options.type] Type of gradient 'radial' or 'linear'
+	 * @param [options.type] Type of gradient 'radial' or 'linear'
 	 */
 	type?: string;
 	/**
@@ -544,7 +531,7 @@ interface IGradientOptions {
 interface IGradient extends IGradientOptions {
 	/**
 	 * Adds another colorStop
-	 * @param {Object} colorStop Object with offset and color
+	 * @param colorStop Object with offset and color
 	 */
 	addColorStop(colorStop: any): IGradient;
 	/**
@@ -553,15 +540,15 @@ interface IGradient extends IGradientOptions {
 	toObject(): any;
 	/**
 	 * Returns SVG representation of an gradient
-	 * @param {Object} object Object to create a gradient for
-	 * @param {Boolean} normalize Whether coords should be normalized
-	 * @return {String} SVG representation of an gradient (linear/radial)
+	 * @param object Object to create a gradient for
+	 * @param normalize Whether coords should be normalized
+	 * @return SVG representation of an gradient (linear/radial)
 	 */
 	toSVG(object: Object, normalize?: boolean): string;
 
 	/**
 	 * Returns an instance of CanvasGradient
-	 * @param {CanvasRenderingContext2D} ctx Context to render on
+	 * @param ctx Context to render on
 	 */
 	toLive(ctx: CanvasRenderingContext2D, object?: PathGroup): CanvasGradient;
 }
@@ -569,14 +556,12 @@ interface IGrandientStatic {
 	new (options?: IGradientOptions): IGradient;
 	/**
 	 * Returns instance from an SVG element
-	 * @param {SVGGradientElement} el SVG gradient element
-	 * @param {fabric.Object} instance
+	 * @param el SVG gradient element
 	 */
 	fromElement(el: SVGGradientElement, instance: Object): IGradient;
 	/**
 	 * Returns instance from its object representation
-	 * @param {Object} obj
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	fromObject(obj: any, options: any[]): IGradient;
 }
@@ -647,7 +632,6 @@ export class Pattern  {
 	toObject(): any;
 	/**
 	 * Returns SVG representation of a pattern
-	 * @param {fabric.Object} object
 	 */
 	toSVG(object: Object): string;
 }
@@ -660,134 +644,111 @@ export class Point {
 
 	/**
 	 * Adds another point to this one and returns another one
-	 * @param {fabric.Point} that
 	 */
 	add(that: Point): Point;
 
 	/**
 	 * Adds another point to this one
-	 * @param {fabric.Point} that
 	 */
 	addEquals(that: Point): Point;
 
 	/**
 	 * Adds value to this point and returns a new one
-	 * @param {Number} scalar
 	 */
 	scalarAdd(scalar: number): Point;
 
 	/**
 	 * Adds value to this point
-	 * @param {Number} scalar
 	 */
 	scalarAddEquals(scalar: number): Point;
 
 	/**
 	 * Subtracts another point from this point and returns a new one
-	 * @param {fabric.Point} that
 	 */
 	subtract(that: Point): Point;
 
 	/**
 	 * Subtracts another point from this point
-	 * @param {fabric.Point} that
 	 */
 	subtractEquals(that: Point): Point;
 
 	/**
 	 * Subtracts value from this point and returns a new one
-	 * @param {Number} scalar
 	 */
 	scalarSubtract(scalar: number): Point;
 
 	/**
 	 * Subtracts value from this point
-	 * @param {Number} scalar
 	 */
 	scalarSubtractEquals(scalar: number): Point;
 
 	/**
 	 * Miltiplies this point by a value and returns a new one
-	 * @param {Number} scalar
 	 */
 	multiply(scalar: number): Point;
 
 	/**
 	 * Miltiplies this point by a value
-	 * @param {Number} scalar
 	 */
 	multiplyEquals(scalar: number): Point;
 
 	/**
 	 * Divides this point by a value and returns a new one
-	 * @param {Number} scalar
 	 */
 	divide(scalar: number): Point;
 
 	/**
 	 * Divides this point by a value
-	 * @param {Number} scalar
 	 */
 	divideEquals(scalar: number): Point;
 
 	/**
 	 * Returns true if this point is equal to another one
-	 * @param {fabric.Point} that
 	 */
 	eq(that: Point): Point;
 
 	/**
 	 * Returns true if this point is less than another one
-	 * @param {fabric.Point} that
 	 */
 	lt(that: Point): Point;
 
 	/**
 	 * Returns true if this point is less than or equal to another one
-	 * @param {fabric.Point} that
 	 */
 	lte(that: Point): Point;
 
 	/**
 	 * Returns true if this point is greater another one
-	 * @param {fabric.Point} that
 	 */
 	gt(that: Point): Point;
 
 	/**
 	 * Returns true if this point is greater than or equal to another one
-	 * @param {fabric.Point} that
 	 */
 	gte(that: Point): Point;
 
 	/**
 	 * Returns new point which is the result of linear interpolation with this one and another one
-	 * @param {fabric.Point} that
-	 * @param {Number} t
 	 */
 	lerp(that: Point, t: number): Point;
 
 	/**
 	 * Returns distance from this point and another one
-	 * @param {fabric.Point} that
 	 */
 	distanceFrom(that: Point): number;
 
 	/**
 	 * Returns the point between this point and another one
-	 * @param {fabric.Point} that
 	 */
 	midPointFrom(that: Point): Point;
 
 	/**
 	 * Returns a new point which is the min of this and another one
-	 * @param {fabric.Point} that
 	 */
 	min(that: Point): Point;
 
 	/**
 	 * Returns a new point which is the max of this and another one
-	 * @param {fabric.Point} that
 	 */
 	max(that: Point): Point;
 
@@ -798,20 +759,16 @@ export class Point {
 
 	/**
 	 * Sets x/y of this point
-	 * @param {Number} x
-	 * @param {Number} y
 	 */
 	setXY(x: number, y: number): Point;
 
 	/**
 	 * Sets x/y of this point from another point
-	 * @param {fabric.Point} that
 	 */
 	setFromPoint(that: Point): Point;
 
 	/**
 	 * Swaps x/y of this point and another point
-	 * @param {fabric.Point} that
 	 */
 	swap(that: Point): Point;
 }
@@ -856,7 +813,6 @@ export class IShadow {
 	toString(): string;
 	/**
 	 * Returns SVG representation of a shadow
-	 * @param {fabric.Object} object
 	 */
 	toSVG(object: Object): string;
 
@@ -972,8 +928,8 @@ export interface StaticCanvas extends IObservable<StaticCanvas>, IStaticCanvasOp
 export class StaticCanvas {
 	/**
 	 * Constructor
-	 * @param {HTMLElement|String} element <canvas> element to initialize instance on
-	 * @param {Object} [options] Options object
+	 * @param element <canvas> element to initialize instance on
+	 * @param [options] Options object
 	 */
 	constructor(element: HTMLCanvasElement|string, options?: ICanvasOptions);
 
@@ -985,31 +941,31 @@ export class StaticCanvas {
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#overlayImage|overlay image} for this canvas
-	 * @param {(fabric.Image|String)} image fabric.Image instance or URL of an image to set overlay to
-	 * @param {Function} callback callback to invoke when image is loaded and set as an overlay
-	 * @param {Object} [options] Optional options to set for the {@link fabric.Image|overlay image}.
+	 * @param image fabric.Image instance or URL of an image to set overlay to
+	 * @param callback callback to invoke when image is loaded and set as an overlay
+	 * @param [options] Optional options to set for the {@link fabric.Image|overlay image}.
 	 */
 	setOverlayImage(image: Image|string, callback: Function, options?: IObjectOptions): StaticCanvas;
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#backgroundImage|background image} for this canvas
-	 * @param {(fabric.Image|String)} image fabric.Image instance or URL of an image to set background to
-	 * @param {Function} callback Callback to invoke when image is loaded and set as background
-	 * @param {Object} [options] Optional options to set for the {@link fabric.Image|background image}.
+	 * @param image fabric.Image instance or URL of an image to set background to
+	 * @param callback Callback to invoke when image is loaded and set as background
+	 * @param [options] Optional options to set for the {@link fabric.Image|background image}.
 	 */
 	setBackgroundImage(image: Image|string, callback: Function, options?: IObjectOptions): StaticCanvas;
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#overlayColor|background color} for this canvas
-	 * @param {(String|fabric.Pattern)} overlayColor Color or pattern to set background color to
-	 * @param {Function} callback Callback to invoke when background color is set
+	 * @param overlayColor Color or pattern to set background color to
+	 * @param callback Callback to invoke when background color is set
 	 */
 	setOverlayColor(overlayColor: string|Pattern, callback: Function): StaticCanvas;
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#backgroundColor|background color} for this canvas
-	 * @param {(String|fabric.Pattern)} backgroundColor Color or pattern to set background color to
-	 * @param {Function} callback Callback to invoke when background color is set
+	 * @param backgroundColor Color or pattern to set background color to
+	 * @param callback Callback to invoke when background color is set
 	 */
 	setBackgroundColor(backgroundColor: string|Pattern, callback: Function): StaticCanvas;
 
@@ -1025,22 +981,22 @@ export class StaticCanvas {
 
 	/**
 	 * Sets width of this canvas instance
-	 * @param {Number|String} value                         Value to set width to
-	 * @param {Object}        [options]                     Options object
+	 * @param value                         Value to set width to
+	 * @param        [options]                     Options object
 	 */
 	setWidth(value: number|string, options?: ICanvasDimensionsOptions): StaticCanvas;
 
 	/**
 	 * Sets height of this canvas instance
-	 * @param {Number|String} value                         Value to set height to
-	 * @param {Object}        [options]                     Options object
+	 * @param value                         Value to set height to
+	 * @param        [options]                     Options object
 	 */
 	setHeight(value: number|string, options?: ICanvasDimensionsOptions): StaticCanvas;
 
 	/**
 	 * Sets dimensions (width, height) of this canvas instance. when options.cssOnly flag active you should also supply the unit of measure (px/%/em)
-	 * @param {Object}        dimensions                    Object with width/height properties
-	 * @param {Object}        [options]                     Options object
+	 * @param        dimensions                    Object with width/height properties
+	 * @param        [options]                     Options object
 	 */
 	setDimensions(dimensions: ICanvasDimensions, options?: ICanvasDimensionsOptions): StaticCanvas;
 
@@ -1051,32 +1007,32 @@ export class StaticCanvas {
 
 	/**
 	 * Sets viewport transform of this canvas instance
-	 * @param {Array} vpt the transform in the form of context.transform
+	 * @param vpt the transform in the form of context.transform
 	 */
 	setViewportTransform(vpt: number[]): StaticCanvas;
 
 	/**
 	 * Sets zoom level of this canvas instance, zoom centered around point
-	 * @param {fabric.Point} point to zoom with respect to
-	 * @param {Number} value to set zoom to, less than 1 zooms out
+	 * @param point to zoom with respect to
+	 * @param value to set zoom to, less than 1 zooms out
 	 */
 	zoomToPoint(point: Point, value: number): StaticCanvas;
 
 	/**
 	 * Sets zoom level of this canvas instance
-	 * @param {Number} value to set zoom to, less than 1 zooms out
+	 * @param value to set zoom to, less than 1 zooms out
 	 */
 	setZoom(value: number): StaticCanvas;
 
 	/**
 	 * Pan viewport so as to place point at top left corner of canvas
-	 * @param {fabric.Point} point to move to
+	 * @param point to move to
 	 */
 	absolutePan(point: Point): StaticCanvas;
 
 	/**
 	 * Pans viewpoint relatively
-	 * @param {fabric.Point} point (position vector) to move by
+	 * @param point (position vector) to move by
 	 */
 	relativePan(point: Point): StaticCanvas;
 
@@ -1097,7 +1053,7 @@ export class StaticCanvas {
 
 	/**
 	 * Clears specified context of canvas element
-	 * @param {CanvasRenderingContext2D} ctx Context to clear
+	 * @param ctx Context to clear
 	 * @chainable
 	 */
 	clearContext(ctx: CanvasRenderingContext2D): StaticCanvas;
@@ -1114,7 +1070,7 @@ export class StaticCanvas {
 
 	/**
 	 * Renders both the top canvas and the secondary container canvas.
-	 * @param {Boolean} [allOnTop] Whether we want to force all images to be rendered on the top canvas
+	 * @param [allOnTop] Whether we want to force all images to be rendered on the top canvas
 	 * @chainable
 	 */
 	renderAll(allOnTop?: boolean): StaticCanvas;
@@ -1134,39 +1090,39 @@ export class StaticCanvas {
 	/**
 	 * Centers object horizontally.
 	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 * @param {fabric.Object} object Object to center horizontally
+	 * @param object Object to center horizontally
 	 */
 	centerObjectH(object: Object): StaticCanvas;
 
 	/**
 	 * Centers object vertically.
 	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 * @param {fabric.Object} object Object to center vertically
+	 * @param object Object to center vertically
 	 */
 	centerObjectV(object: Object): StaticCanvas;
 
 	/**
 	 * Centers object vertically and horizontally.
 	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 * @param {fabric.Object} object Object to center vertically and horizontally
+	 * @param object Object to center vertically and horizontally
 	 */
 	centerObject(object: Object): StaticCanvas;
 
 	/**
 	 * Returs dataless JSON representation of canvas
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	toDatalessJSON(propertiesToInclude?: any[]): string;
 
 	/**
 	 * Returns object representation of canvas
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 
 	/**
 	 * Returns dataless object representation of canvas
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	toDatalessObject(propertiesToInclude?: any[]): any;
 
@@ -1178,44 +1134,44 @@ export class StaticCanvas {
 
 	/**
 	 * Returns SVG representation of canvas
-	 * @param {Object} [options] Options object for SVG output
-	 * @param {Function} [reviver] Method for further parsing of svg elements, called after each fabric object converted into svg representation.
+	 * @param [options] Options object for SVG output
+	 * @param [reviver] Method for further parsing of svg elements, called after each fabric object converted into svg representation.
 	 */
 	toSVG(options: IToSVGOptions, reviver?: Function): string;
 
 	/**
 	 * Moves an object to the bottom of the stack of drawn objects
-	 * @param {fabric.Object} object Object to send to back
+	 * @param object Object to send to back
 	 * @chainable
 	 */
 	sendToBack(object: Object): StaticCanvas;
 
 	/**
 	 * Moves an object to the top of the stack of drawn objects
-	 * @param {fabric.Object} object Object to send
+	 * @param object Object to send
 	 * @chainable
 	 */
 	bringToFront(object: Object): StaticCanvas;
 
 	/**
 	 * Moves an object down in stack of drawn objects
-	 * @param {fabric.Object} object Object to send
-	 * @param {Boolean} [intersecting] If `true`, send object behind next lower intersecting object
+	 * @param object Object to send
+	 * @param [intersecting] If `true`, send object behind next lower intersecting object
 	 * @chainable
 	 */
 	sendBackwards(object: Object): StaticCanvas;
 
 	/**
 	 * Moves an object up in stack of drawn objects
-	 * @param {fabric.Object} object Object to send
-	 * @param {Boolean} [intersecting] If `true`, send object in front of next upper intersecting object
+	 * @param object Object to send
+	 * @param [intersecting] If `true`, send object in front of next upper intersecting object
 	 * @chainable
 	 */
 	bringForward(object: Object): StaticCanvas;
 	/**
 	 * Moves an object to specified level in stack of drawn objects
-	 * @param {fabric.Object} object Object to send
-	 * @param {Number} index Position to move to
+	 * @param object Object to send
+	 * @param index Position to move to
 	 * @chainable
 	 */
 	moveTo(object: Object, index: number): StaticCanvas;
@@ -1232,32 +1188,32 @@ export class StaticCanvas {
 
 	/**
 	 * Exports canvas element to a dataurl image. Note that when multiplier is used, cropping is scaled appropriately
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	toDataURL(options?: IDataURLOptions): string;
 
 	/**
 	 * Provides a way to check support of some of the canvas methods
 	 * (either those of HTMLCanvasElement itself, or rendering context)
-	 * @param {String} methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
-	 * @return {Boolean | null} `true` if method is supported (or at least exists), null` if canvas element or context can not be initialized
+	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
+	 * @return `true` if method is supported (or at least exists), null` if canvas element or context can not be initialized
 	 */
 	supports(methodName: string): boolean;
 
 	/**
 	 * Populates canvas with data from the specified JSON.
 	 * JSON format must conform to the one of toJSON formats
-	 * @param {String|Object} json JSON string or object
-	 * @param {Function} callback Callback, invoked when json is parsed
+	 * @param json JSON string or object
+	 * @param callback Callback, invoked when json is parsed
 	 *                            and corresponding objects (e.g: {@link fabric.Image})
 	 *                            are initialized
-	 * @param {Function} [reviver] Method for further parsing of JSON elements, called after each fabric object created.
+	 * @param [reviver] Method for further parsing of JSON elements, called after each fabric object created.
 	 */
 	loadFromJSON(json: string|any, callback: Function, reviver?: Function): Canvas;
 	/**
 	 * Clones canvas instance
-	 * @param {Object} [callback] Receives cloned instance as a first argument
-	 * @param {Array} [properties] Array of properties to include in the cloned canvas and children
+	 * @param [callback] Receives cloned instance as a first argument
+	 * @param [properties] Array of properties to include in the cloned canvas and children
 	 */
 	clone(callback: (canvas: StaticCanvas) => any, properties?: any[]): void;
 
@@ -1265,7 +1221,7 @@ export class StaticCanvas {
 	 * Clones canvas instance without cloning existing data.
 	 * This essentially copies canvas dimensions, clipping properties, etc.
 	 * but leaves data empty (so that you can populate it with your own)
-	 * @param {Object} [callback] Receives cloned instance as a first argument
+	 * @param [callback] Receives cloned instance as a first argument
 	 */
 	cloneWithoutData(callback: (canvas: StaticCanvas) => any): void;
 
@@ -1279,13 +1235,13 @@ export class StaticCanvas {
 
 	/**
 	 * Straightens object, then rerenders canvas
-	 * @param {fabric.Object} object Object to straighten
+	 * @param object Object to straighten
 	 */
 	straightenObject(object: Object): StaticCanvas;
 
 	/**
 	 * Same as straightenObject, but animated
-	 * @param {fabric.Object} object Object to straighten
+	 * @param object Object to straighten
 	 */
 	fxStraightenObject(object: Object): StaticCanvas;
 
@@ -1293,12 +1249,12 @@ export class StaticCanvas {
 	/**
 	 * Provides a way to check support of some of the canvas methods
 	 * (either those of HTMLCanvasElement itself, or rendering context)
-	 * @param {String} methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
+	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
 	 */
 	static supports(methodName: string): boolean;
 	/**
 	 * Returns JSON representation of canvas
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	static toJSON(propertiesToInclude?: any[]): string;
 }
@@ -1409,8 +1365,8 @@ export interface Canvas extends ICanvasOptions {}
 export class Canvas {
 	/**
 	 * Constructor
-	 * @param {HTMLElement|String} element <canvas> element to initialize instance on
-	 * @param {Object} [options] Options object
+	 * @param element <canvas> element to initialize instance on
+	 * @param [options] Options object
 	 */
 	constructor(element: HTMLCanvasElement | string, options?: ICanvasOptions);
 
@@ -1418,93 +1374,90 @@ export class Canvas {
 
 	/**
 	 * Checks if point is contained within an area of given object
-	 * @param {Event} e Event object
-	 * @param {fabric.Object} target Object to test against
+	 * @param e Event object
+	 * @param target Object to test against
 	 */
 	containsPoint(e: Event, target: Object): boolean;
 	/**
 	 * Deactivates all objects on canvas, removing any active group or object
-	 * @return {fabric.Canvas} thisArg
+	 * @return thisArg
 	 */
 	deactivateAll(): Canvas;
 	/**
 	 * Deactivates all objects and dispatches appropriate events
-	 * @param {Event} [e] Event (passed along when firing)
-	 * @return {fabric.Canvas} thisArg
+	 * @param [e] Event (passed along when firing)
+	 * @return thisArg
 	 */
 	deactivateAllWithDispatch(e?: Event): Canvas;
 	/**
 	 * Discards currently active group
-	 * @param {Event} [e] Event (passed along when firing)
-	 * @return {fabric.Canvas} thisArg
+	 * @param [e] Event (passed along when firing)
+	 * @return thisArg
 	 */
 	discardActiveGroup(e?: Event): Canvas;
 	/**
 	 * Discards currently active object
-	 * @param {Event} [e] Event (passed along when firing)
-	 * @return {fabric.Canvas} thisArg
+	 * @param [e] Event (passed along when firing)
+	 * @return thisArg
 	 * @chainable
 	 */
 	discardActiveObject(e?: Event): Canvas;
 	/**
 	 * Draws objects' controls (borders/controls)
-	 * @param {CanvasRenderingContext2D} ctx Context to render controls on
+	 * @param ctx Context to render controls on
 	 */
 	drawControls(ctx: CanvasRenderingContext2D): void;
 	/**
 	 * Method that determines what object we are clicking on
-	 * @param {Event} e mouse event
-	 * @param {Boolean} skipGroup when true, group is skipped and only objects are traversed through
+	 * @param e mouse event
+	 * @param skipGroup when true, group is skipped and only objects are traversed through
 	 */
 	findTarget(e: MouseEvent, skipGroup: boolean): Canvas;
 	/**
 	 * Returns currently active group
-	 * @return {fabric.Group} Current group
+	 * @return Current group
 	 */
 	getActiveGroup(): Group;
 	/**
 	 * Returns currently active object
-	 * @return {fabric.Object} active object
+	 * @return active object
 	 */
 	getActiveObject(): Object;
 	/**
 	 * Returns pointer coordinates relative to canvas.
-	 * @param {Event} e
-	 * @return {Object} object with "x" and "y" number values
+	 * @return object with "x" and "y" number values
 	 */
 	getPointer(e: Event, ignoreZoom?: boolean, upperCanvasEl?: CanvasRenderingContext2D): { x: number; y: number; };
 	/**
 	 * Returns context of canvas where object selection is drawn
-	 * @return {CanvasRenderingContext2D}
 	 */
 	getSelectionContext(): CanvasRenderingContext2D;
 	/**
 	 * Returns <canvas> element on which object selection is drawn
-	 * @return {HTMLCanvasElement}
 	 */
 	getSelectionElement(): HTMLCanvasElement;
 	/**
 	 * Returns true if object is transparent at a certain location
-	 * @param {fabric.Object} target Object to check
-	 * @param {Number} x Left coordinate
-	 * @param {Number} y Top coordinate
+	 * @param target Object to check
+	 * @param x Left coordinate
+	 * @param y Top coordinate
 	 */
 	isTargetTransparent(target: Object, x: number, y: number): boolean;
 	/**
 	 * Sets active group to a speicified one
-	 * @param {fabric.Group} group Group to set as a current one
-	 * @param {Event} [e] Event (passed along when firing)
+	 * @param group Group to set as a current one
+	 * @param [e] Event (passed along when firing)
 	 */
 	setActiveGroup(group: Group, e?: Event): Canvas;
 	/**
 	 * Sets given object as the only active object on canvas
-	 * @param {fabric.Object} object Object to set as an active one
-	 * @param {Event} [e] Event (passed along when firing "object:selected")
+	 * @param object Object to set as an active one
+	 * @param [e] Event (passed along when firing "object:selected")
 	 */
 	setActiveObject(object: Object, e?: Event): Canvas;
 	/**
 	 * Set the cursor type of the canvas element
-	 * @param {String} value Cursor type of the canvas element.
+	 * @param value Cursor type of the canvas element.
 	 * @see http://www.w3.org/TR/css3-ui/#cursor
 	 */
 	setCursor(value: string): void;
@@ -1518,12 +1471,12 @@ export class Canvas {
 	/**
 	 * Provides a way to check support of some of the canvas methods
 	 * (either those of HTMLCanvasElement itself, or rendering context)
-	 * @param {String} methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
+	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
 	 */
 	static supports(methodName: string): boolean;
 	/**
 	 * Returns JSON representation of canvas
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	static toJSON(propertiesToInclude?: any[]): string;
 }
@@ -1553,35 +1506,32 @@ export class Circle {
 
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity of this instance
+	 * @return complexity of this instance
 	 */
 	complexity(): number;
 	/**
 	 * Returns horizontal radius of an object (according to how an object is scaled)
-	 * @return {Number}
 	 */
 	getRadiusX(): number;
 	/**
 	 * Returns vertical radius of an object (according to how an object is scaled)
-	 * @return {Number}
 	 */
 	getRadiusY(): number;
 	/**
 	 * Sets radius of an object (and updates width accordingly)
-	 * @return {Number}
 	 */
 	setRadius(value: number): number;
 
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns svg representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
@@ -1591,13 +1541,13 @@ export class Circle {
 	static ATTRIBUTE_NAMES: string[];
 	/**
 	 * Returns Circle instance from an SVG element
-	 * @param {SVGElement} element Element to parse
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, options: ICircleOptions): Circle;
 	/**
 	 * Returns Circle instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Circle;
 }
@@ -1618,30 +1568,28 @@ export class Ellipse {
 
 	/**
 	 * Returns horizontal radius of an object (according to how an object is scaled)
-	 * @return {Number}
 	 */
 	getRx(): number;
 
 	/**
 	 * Returns Vertical radius of an object (according to how an object is scaled)
-	 * @return {Number}
 	 */
 	getRy(): number;
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns svg representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity
+	 * @return complexity
 	 */
 	complexity(): number;
 
@@ -1652,14 +1600,14 @@ export class Ellipse {
 
 	/**
 	 * Returns Ellipse instance from an SVG element
-	 * @param {SVGElement} element Element to parse
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, options?: IEllipseOptions): Ellipse;
 
 	/**
 	 * Returns Ellipse instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Ellipse;
 }
@@ -1668,91 +1616,87 @@ export interface Group extends Object, ICollection<Group> {}
 export class Group {
 	/**
 	 * Constructor
-	 * @param {Object} objects Group objects
-	 * @param {Object} [options] Options object
+	 * @param objects Group objects
+	 * @param [options] Options object
 	 */
 	constructor(items?: any[], options?: IObjectOptions);
 
 	activateAllObjects(): Group;
 	/**
 	 * Adds an object to a group; Then recalculates group's dimension, position.
-	 * @param {Object} object
-	 * @return {fabric.Group} thisArg
+	 * @return thisArg
 	 * @chainable
 	 */
 	addWithUpdate(object: Object): Group;
 	containsPoint(point: Point): boolean;
 	/**
 	 * Destroys a group (restoring state of its objects)
-	 * @return {fabric.Group} thisArg
+	 * @return thisArg
 	 * @chainable
 	 */
 	destroy(): Group;
 	/**
 	 * Returns requested property
-	 * @param {String} prop Property to get
-	 * @return {Any}
+	 * @param prop Property to get
 	 */
 	get(prop: string): any;
 	/**
 	 * Checks whether this group was moved (since `saveCoords` was called last)
-	 * @return {Boolean} true if an object was moved (since fabric.Group#saveCoords was called)
+	 * @return true if an object was moved (since fabric.Group#saveCoords was called)
 	 */
 	hasMoved(): boolean;
 	/**
 	 * Removes an object from a group; Then recalculates group's dimension, position.
-	 * @param {Object} object
-	 * @return {fabric.Group} thisArg
+	 * @return thisArg
 	 * @chainable
 	 */
 	removeWithUpdate(object: Object): Group;
 	/**
 	 * Renders instance on a given context
-	 * @param {CanvasRenderingContext2D} ctx context to render instance on
+	 * @param ctx context to render instance on
 	 */
 	render(ctx: CanvasRenderingContext2D): void;
 	/**
 	 * Removes objects from a collection, then renders canvas (if `renderOnAddRemove` is not `false`)
-	 * @param {...fabric.Object} object Zero or more fabric instances
-	 * @return {Self} thisArg
+	 * @param object Zero or more fabric instances
+	 * @return thisArg
 	 * @chainable
 	 */
 	remove(...object: Object[]): Group;
 	/**
 	 * Saves coordinates of this instance (to be used together with `hasMoved`)
 	 * @saveCoords
-	 * @return {fabric.Group} thisArg
+	 * @return thisArg
 	 * @chainable
 	 */
 	saveCoords(): Group;
 	/**
 	 * Sets coordinates of all group objects
-	 * @return {fabric.Group} thisArg
+	 * @return thisArg
 	 * @chainable
 	 */
 	setObjectsCoords(): Group;
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns string represenation of a group
-	 * @return {String}
 	 */
 	toString(): string;
 	/**
 	 * Returns svg representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
 	/**
 	 * Returns {@link fabric.Group} instance from an object representation
-	 * @param {Object} object Object to create a group from
-	 * @param {Function} [callback] Callback to invoke when an group instance is created
+	 * @param object Object to create a group from
+	 * @param [callback] Callback to invoke when an group instance is created
 	 */
 	static fromObject(object: any, callback: (group: Group) => any): void;
 }
@@ -1791,41 +1735,41 @@ interface Image extends Object, IImageOptions {}
 export class Image {
 	/**
 	 * Constructor
-	 * @param {HTMLImageElement | String} element Image element
-	 * @param {Object} [options] Options object
+	 * @param element Image element
+	 * @param [options] Options object
 	 */
 	constructor(element: HTMLImageElement, objObjects: IObjectOptions);
 
 	initialize(element?: string|HTMLImageElement, options?: IImageOptions): void;
 	/**
 	 * Applies filters assigned to this image (from "filters" array)
-	 * @param {Function} callback Callback is invoked when all filters have been applied and new image is generated
+	 * @param callback Callback is invoked when all filters have been applied and new image is generated
 	 */
 	applyFilters(callback: Function): void;
 	/**
 	 * Returns a clone of an instance
-	 * @param {Function} callback Callback is invoked with a clone as a first argument
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param callback Callback is invoked with a clone as a first argument
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	clone(callback?: Function, propertiesToInclude?: any[]): Object;
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity of this instance
+	 * @return complexity of this instance
 	 */
 	complexity(): number;
 	/**
 	 * Returns image element which this instance if based on
-	 * @return {HTMLImageElement} Image element
+	 * @return Image element
 	 */
 	getElement(): HTMLImageElement;
 	/**
 	 * Returns original size of an image
-	 * @return {Object} Object with "width" and "height" properties
+	 * @return Object with "width" and "height" properties
 	 */
 	getOriginalSize(): { width: number; height: number; };
 	/**
 	 * Returns source of an image
-	 * @return {String} Source of an image
+	 * @return Source of an image
 	 */
 	getSrc(): string;
 	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
@@ -1834,9 +1778,8 @@ export class Image {
 	 * Sets image element for this instance to a specified one.
 	 * If filters defined they are applied to new image.
 	 * You might need to call `canvas.renderAll` and `object.setCoords` after replacing, to render new image and update controls area.
-	 * @param {HTMLImageElement} element
-	 * @param {Function} [callback] Callback is invoked when all filters have been applied and new image is generated
-	 * @param {Object} [options] Options object
+	 * @param [callback] Callback is invoked when all filters have been applied and new image is generated
+	 * @param [options] Options object
 	 */
 	setElement(element: HTMLImageElement, callback: Function, options: IImageOptions): Image;
 	/**
@@ -1845,48 +1788,47 @@ export class Image {
 	setCrossOrigin(value: string): Image;
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} Object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return Object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns string representation of an instance
-	 * @return {String} String representation of an instance
+	 * @return String representation of an instance
 	 */
 	toString(): string;
 	/**
 	 * Returns SVG representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 	/**
 	 * Sets source of an image
-	 * @param {String} src Source string (URL)
-	 * @param {Function} [callback] Callback is invoked when image has been loaded (and all filters have been applied)
-	 * @param {Object} [options] Options object
+	 * @param src Source string (URL)
+	 * @param [callback] Callback is invoked when image has been loaded (and all filters have been applied)
+	 * @param [options] Options object
 	 */
 	setSrc(src: string, callback?: Function, options?: IImageOptions): Image;
 
 	/**
 	 * Creates an instance of fabric.Image from an URL string
-	 * @param {String} url URL to create an image from
-	 * @param {Function} [callback] Callback to invoke when image is created (newly created image is passed as a first argument)
-	 * @param {Object} [imgOptions] Options object
+	 * @param url URL to create an image from
+	 * @param [callback] Callback to invoke when image is created (newly created image is passed as a first argument)
+	 * @param [imgOptions] Options object
 	 */
 	static fromURL(url: string, callback?: (image: Image) => any, objObjects?: IObjectOptions): Image;
 	/**
 	 * Creates an instance of fabric.Image from its object representation
-	 * @static
-	 * @param {Object} object Object to create an instance from
-	 * @param {Function} [callback] Callback to invoke when an image instance is created
+	 * @param object Object to create an instance from
+	 * @param [callback] Callback to invoke when an image instance is created
 	 */
 	static fromObject(object: any, callback: (image: Image) => {}): void;
 	/**
 	 * Returns Image instance from an SVG element
-	 * @param {SVGElement} element Element to parse
-	 * @param {Function} callback Callback to execute when fabric.Image object is created
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param callback Callback to execute when fabric.Image object is created
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, callback: Function, options?: IImageOptions): void;
 	/**
@@ -1919,40 +1861,40 @@ export interface Line extends Object, ILineOptions {}
 export class Line {
 	/**
 	 * Constructor
-	 * @param {Array} [points] Array of points
-	 * @param {Object} [options] Options object
+	 * @param [points] Array of points
+	 * @param [options] Options object
 	 */
 	constructor(points?: number[], objObjects?: IObjectOptions);
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity
+	 * @return complexity
 	 */
 	complexity(): number;
 	initialize(points?: number[], options?: ILineOptions): Line;
 	/**
 	 * Returns object representation of an instance
 	 * @methd toObject
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude: any[]): any;
 	/**
 	 * Returns SVG representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
 	static ATTRIBUTE_NAMES: string[];
 	/**
 	 * Returns fabric.Line instance from an SVG element
-	 * @param {SVGElement} element Element to parse
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, options?: ILineOptions): Line;
 	/**
 	 * Returns fabric.Line instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Line;
 }
@@ -2195,7 +2137,6 @@ interface IObjectOptions {
 	/**
 	 * Function that determines clipping of an object (context is passed as a first argument)
 	 * Note that context origin is at the object's center point (not left/top corner)
-	 * @type Function
 	 */
 	clipTo?: Function;
 
@@ -2308,20 +2249,20 @@ export class Object {
 
 	/**
 	 * Transforms context when rendering an object
-	 * @param {CanvasRenderingContext2D} ctx Context
-	 * @param {Boolean} fromLeft When true, context is transformed to object's top/left corner. This is used when rendering text on Node
+	 * @param ctx Context
+	 * @param fromLeft When true, context is transformed to object's top/left corner. This is used when rendering text on Node
 	 */
 	transform(ctx: CanvasRenderingContext2D, fromLeft: boolean): void;
 
 	/**
 	 * Returns an object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 
 	/**
 	 * Returns (dataless) object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	toDatalessObject(propertiesToInclude?: any[]): any;
 
@@ -2332,7 +2273,7 @@ export class Object {
 
 	/**
 	 * Basic getter
-	 * @param {String} property Property name
+	 * @param property Property name
 	 */
 	get(property: string): any;
 
@@ -2340,8 +2281,8 @@ export class Object {
 	 * Sets property to a given value.
 	 * When changing position/dimension -related properties (left, top, scale, angle, etc.) `set` does not update position of object's borders/controls.
 	 * If you need to update those, call `setCoords()`.
-	 * @param {String} key Property name
-	 * @param {Object|Function} value Property value (if function, the value is passed into it and its return value is used as a new one)
+	 * @param key Property name
+	 * @param value Property value (if function, the value is passed into it and its return value is used as a new one)
 	 */
 	set(key: string, value: any|Function): Object;
 	/**
@@ -2354,13 +2295,13 @@ export class Object {
 
 	/**
 	 * Toggles specified property from `true` to `false` or from `false` to `true`
-	 * @param {String} property Property to toggle
+	 * @param property Property to toggle
 	 */
 	toggle(property: string): Object;
 
 	/**
 	 * Sets sourcePath of an object
-	 * @param {String} value Value to set sourcePath to
+	 * @param value Value to set sourcePath to
 	 */
 	setSourcePath(value: string): Object;
 
@@ -2371,21 +2312,21 @@ export class Object {
 
 	/**
 	 * Renders an object on a specified context
-	 * @param {CanvasRenderingContext2D} ctx Context to render on
-	 * @param {Boolean} [noTransform] When true, context is not transformed
+	 * @param ctx Context to render on
+	 * @param [noTransform] When true, context is not transformed
 	 */
 	render(ctx: CanvasRenderingContext2D, noTransform?: boolean): void;
 
 	/**
 	 * Clones an instance
-	 * @param {Function} callback Callback is invoked with a clone as a first argument
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param callback Callback is invoked with a clone as a first argument
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	clone(callback: Function, propertiesToInclude?: any[]): Object;
 
 	/**
 	 * Creates an instance of fabric.Image out of an object
-	 * @param {Function} callback callback, invoked with an instance as a first argument
+	 * @param callback callback, invoked with an instance as a first argument
 	 */
 	cloneAsImage(callback: (image: Image) => any): Object;
 
@@ -2397,7 +2338,7 @@ export class Object {
 
 	/**
 	 * Returns true if specified type is identical to the type of an instance
-	 * @param {String} type Type to check against
+	 * @param type Type to check against
 	 */
 	isType(type: string): boolean;
 
@@ -2408,26 +2349,26 @@ export class Object {
 
 	/**
 	 * Returns a JSON representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	toJSON(propertiesToInclude?: any[]): any;
 
 	/**
 	 * Sets gradient (fill or stroke) of an object
 	 * <b>Backwards incompatibility note:</b> This method was named "setGradientFill" until v1.1.0
-	 * @param {String} property Property name 'stroke' or 'fill'
-	 * @param {Object} [options] Options object
+	 * @param property Property name 'stroke' or 'fill'
+	 * @param [options] Options object
 	 */
 	setGradient(property: string, options: IGradientOptions): Object;
 	/**
 	 * Sets pattern fill of an object
-	 * @param {Object} options Options object
+	 * @param options Options object
 	 */
 	setPatternFill(options: IFillOptions): Object;
 
 	/**
 	 * Sets shadow of an object
-	 * @param {String} [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
+	 * @param [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
 	 */
 	setShadow(options?: string): Object;
 	/**
@@ -2438,19 +2379,19 @@ export class Object {
 
 	/**
 	 * Sets "color" of an instance (alias of `set('fill', …)`)
-	 * @param {String} color Color value
+	 * @param color Color value
 	 */
 	setColor(color: string): Object;
 
 	/**
 	 * Sets "angle" of an instance
-	 * @param {Number} angle Angle value
+	 * @param angle Angle value
 	 */
 	setAngle(angle: number): Object;
 
 	/**
 	 * Sets "angle" of an instance
-	 * @param {Number} angle Angle value
+	 * @param angle Angle value
 	 */
 	rotate(angle: number): Object;
 
@@ -2479,19 +2420,19 @@ export class Object {
 
 	/**
 	 * Returns coordinates of a pointer relative to an object
-	 * @param {Event} e Event to operate upon
-	 * @param {Object} [pointer] Pointer to operate upon (instead of event)
+	 * @param e Event to operate upon
+	 * @param [pointer] Pointer to operate upon (instead of event)
 	 */
 	getLocalPointer(e: Event, pointer: any): any;
 
 	/**
 	 * Sets object's properties from options
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	setOptions(options: any): void;
 	/**
 	 * Sets sourcePath of an object
-	 * @param {String} value Value to set sourcePath to
+	 * @param value Value to set sourcePath to
 	 */
 	setSourcePath(value: string): Object;
 	// functions from object svg export mixin
@@ -2517,8 +2458,8 @@ export class Object {
 	hasStateChanged(): boolean;
 	/**
 	 * Saves state of an object
-	 * @param {Object} [options] Object with additional `stateProperties` array to include when saving state
-	 * @return {fabric.Object} thisArg
+	 * @param [options] Object with additional `stateProperties` array to include when saving state
+	 * @return thisArg
 	 */
 	saveState(options?: { stateProperties: any[] }): Object;
 	/**
@@ -2533,17 +2474,14 @@ export class Object {
 	straighten(): Object;
 	/**
 	 * Same as straighten but with animation
-	 * @param {Object} callbacks Object with callback functions
-	 * @param {Function} [callbacks.onComplete] Invoked on completion
-	 * @param {Function} [callbacks.onChange] Invoked on every step of animation
 	 */
-	fxStraighten(callbacks: { onComplete?: Function; onChange: Function }): Object;
+	fxStraighten(callbacks: Callbacks): Object;
 
 	// functions from object stacking mixin
 	// -----------------------------------------------------------------------------------------------------------------------------------
 	/**
 	 * Moves an object up in stack of drawn objects
-	 * @param {Boolean} [intersecting] If `true`, send object in front of next upper intersecting object
+	 * @param [intersecting] If `true`, send object in front of next upper intersecting object
 	 */
 	bringForward(intersecting?: boolean): Object;
 	/**
@@ -2552,7 +2490,7 @@ export class Object {
 	bringToFront(): Object;
 	/**
 	 * Moves an object down in stack of drawn objects
-	 * @param {Boolean} [intersecting] If `true`, send object behind next lower intersecting object
+	 * @param [intersecting] If `true`, send object behind next lower intersecting object
 	 */
 	sendBackwards(intersecting?: boolean): Object;
 	/**
@@ -2561,7 +2499,7 @@ export class Object {
 	sendToBack(): Object;
 	/**
 	 * Moves an object to specified level in stack of drawn objects
-	 * @param {Number} index New position of object
+	 * @param index New position of object
 	 */
 	moveTo(index: number): Object;
 
@@ -2569,17 +2507,17 @@ export class Object {
 	// -----------------------------------------------------------------------------------------------------------------------------------
 	/**
 	 * Translates the coordinates from origin to center coordinates (based on the object's dimensions)
-	 * @param {fabric.Point} point The point which corresponds to the originX and originY params
-	 * @param {String} originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param {String} originY Vertical origin: 'top', 'center' or 'bottom'
+	 * @param point The point which corresponds to the originX and originY params
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
 	 */
 	translateToCenterPoint(point: Point, originX: string, originY: string): Point;
 
 	/**
 	 * Translates the coordinates from center to origin coordinates (based on the object's dimensions)
-	 * @param {fabric.Point} center The point which corresponds to center of the object
-	 * @param {String} originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param {String} originY Vertical origin: 'top', 'center' or 'bottom'
+	 * @param center The point which corresponds to center of the object
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
 	 */
 	translateToOriginPoint(center: Point, originX: string, originY: string): Point;
 	/**
@@ -2589,40 +2527,39 @@ export class Object {
 
 	/**
 	 * Returns the coordinates of the object as if it has a different origin
-	 * @param {String} originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param {String} originY Vertical origin: 'top', 'center' or 'bottom'
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
 	 */
 	getPointByOrigin(): Point;
 
 	/**
 	 * Returns the point in local coordinates
-	 * @param {fabric.Point} point The point relative to the global coordinate system
-	 * @param {String} originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param {String} originY Vertical origin: 'top', 'center' or 'bottom'
+	 * @param point The point relative to the global coordinate system
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
 	 */
 	toLocalPoint(point: Point, originX: string, originY: string): Point;
 
 	/**
 	 * Sets the position of the object taking into consideration the object's origin
-	 * @param {fabric.Point} pos The new position of the object
-	 * @param {String} originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param {String} originY Vertical origin: 'top', 'center' or 'bottom'
-	 * @return {void}
+	 * @param pos The new position of the object
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
 	 */
 	setPositionByOrigin(pos: Point, originX: string, originY: string): void;
 
 	/**
-	 * @param {String} to One of 'left', 'center', 'right'
+	 * @param to One of 'left', 'center', 'right'
 	 */
 	adjustPosition(to: string): void;
 
 	// functions from interactivity mixin
 	// -----------------------------------------------------------------------------------------------------------------------------------
-	/**-
+	/**
 	 * Draws borders of an object's bounding box.
 	 * Requires public properties: width, height
 	 * Requires public options: padding, borderColor
-	 * @param {CanvasRenderingContext2D} ctx Context to draw on
+	 * @param ctx Context to draw on
 	 */
 	drawBorders(context: CanvasRenderingContext2D): Object;
 
@@ -2630,25 +2567,25 @@ export class Object {
 	 * Draws corners of an object's bounding box.
 	 * Requires public properties: width, height
 	 * Requires public options: cornerSize, padding
-	 * @param {CanvasRenderingContext2D} ctx Context to draw on
+	 * @param ctx Context to draw on
 	 */
 	drawCorners(context: CanvasRenderingContext2D): Object;
 
 	/**
 	 * Returns true if the specified control is visible, false otherwise.
-	 * @param {String} controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
+	 * @param controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
 	 */
 	isControlVisible(controlName: string): boolean;
 	/**
 	 * Sets the visibility of the specified control.
-	 * @param {String} controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
-	 * @param {Boolean} visible true to set the specified control visible, false otherwise
+	 * @param controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
+	 * @param visible true to set the specified control visible, false otherwise
 	 */
 	setControlVisible(controlName: string, visible: boolean): Object;
 
 	/**
 	 * Sets the visibility state of object controls.
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	setControlsVisibility(options?: {
 		bl?: boolean;
@@ -2670,50 +2607,50 @@ export class Object {
 	setCoords(): Object;
 	/**
 	 * Returns coordinates of object's bounding rectangle (left, top, width, height)
-	 * @return {Object} Object with left, top, width, height properties
+	 * @return Object with left, top, width, height properties
 	 */
 	getBoundingRect(): { left: number; top: number; width: number; height: number };
 	/**
 	 * Checks if object is fully contained within area of another object
-	 * @param {Object} other Object to test
+	 * @param other Object to test
 	 */
 	isContainedWithinObject(other: Object): boolean;
 	/**
 	 * Checks if object is fully contained within area formed by 2 points
-	 * @param {Object} pointTL top-left point of area
-	 * @param {Object} pointBR bottom-right point of area
+	 * @param pointTL top-left point of area
+	 * @param pointBR bottom-right point of area
 	 */
 	isContainedWithinRect(pointTL: any, pointBR: any): boolean;
 	/**
 	 * Checks if point is inside the object
-	 * @param {fabric.Point} point Point to check against
+	 * @param point Point to check against
 	 */
 	containsPoint(point: Point): boolean;
 	/**
 	 * Scales an object (equally by x and y)
-	 * @param {Number} value Scale factor
-	 * @return {fabric.Object} thisArg
+	 * @param value Scale factor
+	 * @return thisArg
 	 */
 	scale(value: number): Object;
 	/**
 	 * Scales an object to a given height, with respect to bounding box (scaling by x/y equally)
-	 * @param {Number} value New height value
+	 * @param value New height value
 	 */
 	scaleToHeight(value: number): Object;
 	/**
 	 * Scales an object to a given width, with respect to bounding box (scaling by x/y equally)
-	 * @param {Number} value New width value
+	 * @param value New width value
 	 */
 	scaleToWidth(value: number): Object;
 	/**
 	 * Checks if object intersects with another object
-	 * @param {Object} other Object to test
+	 * @param other Object to test
 	 */
 	intersectsWithObject(other: Object): boolean;
 	/**
 	 * Checks if object intersects with an area formed by 2 points
-	 * @param {Object} pointTL top-left point of area
-	 * @param {Object} pointBR bottom-right point of area
+	 * @param pointTL top-left point of area
+	 * @param pointBR bottom-right point of area
 	 */
 	intersectsWithRect(pointTL: any, pointBR: any): boolean;
 }
@@ -2738,8 +2675,8 @@ export interface IPath extends Object, IPathOptions {}
 export class IPath {
 	/**
 	 * Constructor
-	 * @param {Array|String} path Path data (sequence of coordinates and corresponding "command" tokens)
-	 * @param {Object} [options] Options object
+	 * @param path Path data (sequence of coordinates and corresponding "command" tokens)
+	 * @param [options] Options object
 	 */
 	constructor(path?: string|any[], options?: IPathOptions);
 
@@ -2747,51 +2684,50 @@ export class IPath {
 
 	/**
 	 * Returns number representation of an instance complexity
-	 * @return {Number} complexity of this instance
+	 * @return complexity of this instance
 	 */
 	complexity(): number;
 
 	/**
 	 * Renders path on a specified context
-	 * @param {CanvasRenderingContext2D} ctx context to render path on
-	 * @param {Boolean} [noTransform] When true, context is not transformed
+	 * @param ctx context to render path on
+	 * @param [noTransform] When true, context is not transformed
 	 */
 	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
 	/**
 	 * Returns dataless object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toDatalessObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns string representation of an instance
-	 * @return {String} string representation of an instance
+	 * @return string representation of an instance
 	 */
 	toString(): string;
 	/**
 	 * Returns svg representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
 	/**
 	 * Creates an instance of fabric.Path from an SVG <path> element
-	 * @param {SVGElement} element to parse
-	 * @param {Function} callback Callback to invoke when an fabric.Path instance is created
-	 * @param {Object} [options] Options object
+	 * @param element to parse
+	 * @param callback Callback to invoke when an fabric.Path instance is created
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, callback: (path: IPath) => any, options?: IPathOptions): void;
 	/**
 	 * Creates an instance of fabric.Path from an object
-	 * @param {Object} object
-	 * @param {Function} callback Callback to invoke when an fabric.Path instance is created
+	 * @param callback Callback to invoke when an fabric.Path instance is created
 	 */
 	static fromObject(object: any, callback: (path: IPath) => any): void;
 }
@@ -2799,63 +2735,60 @@ export class IPath {
 export class PathGroup extends Object {
 	/**
 	 * Constructor
-	 * @param {Array} paths
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	constructor(paths: IPath[], options?: IObjectOptions);
 
 	initialize(paths: IPath[], options?: IObjectOptions): void;
 	/**
 	 * Returns number representation of object's complexity
-	 * @return {Number} complexity
+	 * @return complexity
 	 */
 	complexity(): number;
 	/**
 	 * Returns true if all paths in this group are of same color
-	 * @return {Boolean} true if all paths are of the same color (`fill`)
+	 * @return true if all paths are of the same color (`fill`)
 	 */
 	isSameColor(): boolean;
 	/**
 	 * Renders this group on a specified context
-	 * @param {CanvasRenderingContext2D} ctx Context to render this instance on
+	 * @param ctx Context to render this instance on
 	 */
 	render(ctx: CanvasRenderingContext2D): void;
 	/**
 	 * Returns dataless object representation of this path group
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} dataless object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return dataless object representation of an instance
 	 */
 	toDatalessObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns object representation of this path group
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns a string representation of this path group
-	 * @return {String} string representation of an object
+	 * @return string representation of an object
 	 */
 	toString(): string;
 	/**
 	 * Returns svg representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 	/**
 	 * Returns all paths in this path group
-	 * @return {Array} array of path objects included in this path group
+	 * @return array of path objects included in this path group
 	 */
 	getObjects(): IPath[];
 
 	static fromObject(object: any): PathGroup;
 	/**
 	 * Creates fabric.PathGroup instance from an object representation
-	 * @static
-	 * @memberOf fabric.PathGroup
-	 * @param {Object} object Object to create an instance from
-	 * @param {Function} callback Callback to invoke when an fabric.PathGroup instance is created
+	 * @param object Object to create an instance from
+	 * @param callback Callback to invoke when an fabric.PathGroup instance is created
 	 */
 	static fromObject(object: any, callback: (group: PathGroup) => any): void;
 }
@@ -2880,27 +2813,27 @@ export interface Polygon extends IPolygonOptions {}
 export class Polygon extends Object {
 	/**
 	 * Constructor
-	 * @param {Array} points Array of points
-	 * @param {Object} [options] Options object
+	 * @param points Array of points
+	 * @param [options] Options object
 	 */
 	constructor(points: Array<{ x: number; y: number }>, options?: IObjectOptions, skipOffset?: boolean);
 
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity of this instance
+	 * @return complexity of this instance
 	 */
 	complexity(): number;
 
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns svg representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
@@ -2911,13 +2844,13 @@ export class Polygon extends Object {
 
 	/**
 	 * Returns Polygon instance from an SVG element
-	 * @param {SVGElement} element Element to parse
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, options?: IPolygonOptions): Polygon;
 	/**
 	 * Returns fabric.Polygon instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Polygon;
 }
@@ -2942,27 +2875,27 @@ export interface Polyline extends IPolylineOptions {}
 export class Polyline extends Object {
 	/**
 	 * Constructor
-	 * @param {Array} points Array of points (where each point is an object with x and y)
-	 * @param {Object} [options] Options object
-	 * @param {Boolean} [skipOffset] Whether points offsetting should be skipped
+	 * @param points Array of points (where each point is an object with x and y)
+	 * @param [options] Options object
+	 * @param [skipOffset] Whether points offsetting should be skipped
 	 */
 	constructor(points: Array<{ x: number; y: number }>, options?: IPolylineOptions);
 	initialize(points: Point[], options?: IPolylineOptions): void;
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity of this instance
+	 * @return complexity of this instance
 	 */
 	complexity(): number;
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} Object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return Object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): any;
 	/**
 	 * Returns SVG representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
@@ -2973,13 +2906,13 @@ export class Polyline extends Object {
 
 	/**
 	 * Returns Polyline  instance from an SVG element
-	 * @param {SVGElement} element Element to parse
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, options?: IPolylineOptions): Polyline;
 	/**
 	 * Returns fabric.Polyline instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Polyline;
 }
@@ -3002,25 +2935,25 @@ export interface Rect extends IRectOptions {}
 export class Rect extends Object {
 	/**
 	 * Constructor
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	constructor(options?: IRectOptions);
 	initialize(points?: number[], options?: any): Rect;
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity
+	 * @return complexity
 	 */
 	complexity(): number;
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude: any[]): any;
 	/**
 	 * Returns svg representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
@@ -3030,13 +2963,13 @@ export class Rect extends Object {
 	static ATTRIBUTE_NAMES: string[];
 	/**
 	 * Returns Rect instance from an SVG element
-	 * @param {SVGElement} element Element to parse
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, options?: IRectOptions): Rect;
 	/**
 	 * Returns Rect instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Rect;
 }
@@ -3093,8 +3026,8 @@ export interface Text extends ITextOptions {}
 export class Text extends Object {
 	/**
 	 * Constructor
-	 * @param {String} text Text string
-	 * @param {Object} [options] Options object
+	 * @param text Text string
+	 * @param [options] Options object
 	 */
 	constructor(text: string, options?: ITextOptions);
 	/**
@@ -3107,17 +3040,17 @@ export class Text extends Object {
 	toString(): string;
 	/**
 	 * Renders text instance on a specified context
-	 * @param {CanvasRenderingContext2D} ctx Context to render on
+	 * @param ctx Context to render on
 	 */
 	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
 	/**
 	 * Returns object representation of an instance
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
 	 */
 	toObject(propertiesToInclude?: any[]): Object;
 	/**
 	 * Returns SVG representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
+	 * @param [reviver] Method for further parsing of svg representation.
 	 */
 	toSVG(reviver?: Function): string;
 	/**
@@ -3126,7 +3059,7 @@ export class Text extends Object {
 	getFontSize(): number;
 	/**
 	 * Sets object's fontSize
-	 * @param {Number} fontSize Font size (in pixels)
+	 * @param fontSize Font size (in pixels)
 	 */
 	setFontSize(fontSize: number): Text;
 	/**
@@ -3135,7 +3068,7 @@ export class Text extends Object {
 	getFontWeight(): number|string;
 	/**
 	 * Sets object's fontWeight
-	 * @param {(Number|String)} fontWeight Font weight
+	 * @param fontWeight Font weight
 	 */
 	setFontWeight(fontWeight: string|number): Text;
 	/**
@@ -3144,7 +3077,7 @@ export class Text extends Object {
 	getFontFamily(): string;
 	/**
 	 * Sets object's fontFamily
-	 * @param {String} fontFamily Font family
+	 * @param fontFamily Font family
 	 */
 	setFontFamily(fontFamily: string): Text;
 	/**
@@ -3153,7 +3086,7 @@ export class Text extends Object {
 	getText(): string;
 	/**
 	 * Sets object's text
-	 * @param {String} text Text
+	 * @param text Text
 	 */
 	setText(text: string): Text;
 	/**
@@ -3162,7 +3095,7 @@ export class Text extends Object {
 	getTextDecoration(): string;
 	/**
 	 * Sets object's textDecoration
-	 * @param {String} textDecoration Text decoration
+	 * @param textDecoration Text decoration
 	 */
 	setTextDecoration(textDecoration: string): Text;
 	/**
@@ -3171,7 +3104,7 @@ export class Text extends Object {
 	getFontStyle(): string;
 	/**
 	 * Sets object's fontStyle
-	 * @param {String} fontStyle Font style
+	 * @param fontStyle Font style
 	 */
 	setFontStyle(fontStyle: string): Text;
 	/**
@@ -3180,7 +3113,7 @@ export class Text extends Object {
 	getLineHeight(): number;
 	/**
 	 * Sets object's lineHeight
-	 * @param {Number} lineHeight Line height
+	 * @param lineHeight Line height
 	 */
 	setLineHeight(lineHeight: number): Text;
 	/**
@@ -3189,7 +3122,7 @@ export class Text extends Object {
 	getTextAlign(): string;
 	/**
 	 * Sets object's textAlign
-	 * @param {String} textAlign Text alignment
+	 * @param textAlign Text alignment
 	 */
 	setTextAlign(textAlign: string): Text;
 	/**
@@ -3198,7 +3131,7 @@ export class Text extends Object {
 	getTextBackgroundColor(): string;
 	/**
 	 * Sets object's textBackgroundColor
-	 * @param {String} textBackgroundColor Text background color
+	 * @param textBackgroundColor Text background color
 	 */
 	setTextBackgroundColor(textBackgroundColor: string): Text;
 
@@ -3213,13 +3146,13 @@ export class Text extends Object {
 
 	/**
 	 * Returns fabric.Text instance from an SVG element (<b>not yet implemented</b>)
-	 * @param {SVGElement} element Element to parse
-	 * @param {Object} [options] Options object
+	 * @param element Element to parse
+	 * @param [options] Options object
 	 */
 	static fromElement(element: SVGElement, options?: ITextOptions): Text;
 	/**
 	 * Returns fabric.Text instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Text;
 }
@@ -3290,8 +3223,8 @@ export interface IText extends Text, IITextOptions {}
 export class IText extends Object {
 	/**
 	 * Constructor
-	 * @param {String} text Text string
-	 * @param {Object} [options] Options object
+	 * @param text Text string
+	 * @param [options] Options object
 	 */
 	constructor(text: string, options?: IITextOptions);
 	/**
@@ -3301,34 +3234,33 @@ export class IText extends Object {
 	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
 	/**
 	 * Returns object representation of an instance
-	 * @method toObject
-	 * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return {Object} object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
 	 */
 	toObject(propertiesToInclude?: any[]): Object;
 
 	setText(value: string): Text;
 	/**
 	 * Sets selection start (left boundary of a selection)
-	 * @param {Number} index Index to set selection start to
+	 * @param index Index to set selection start to
 	 */
 	setSelectionStart(index: number): void;
 	/**
 	 * Sets selection end (right boundary of a selection)
-	 * @param {Number} index Index to set selection end to
+	 * @param index Index to set selection end to
 	 */
 	setSelectionEnd(index: number): void;
 	/**
 	 * Gets style of a current selection/cursor (at the start position)
-	 * @param {Number} [startIndex] Start index to get styles at
-	 * @param {Number} [endIndex] End index to get styles at
-	 * @return {Object} styles Style object at a specified (or current) index
+	 * @param [startIndex] Start index to get styles at
+	 * @param [endIndex] End index to get styles at
+	 * @return styles Style object at a specified (or current) index
 	 */
 	getSelectionStyles(startIndex: number, endIndex: number): any;
 	/**
 	 * Sets style of a current selection
-	 * @param {Object} [styles] Styles object
-	 * @return {fabric.IText} thisArg
+	 * @param [styles] Styles object
+	 * @return thisArg
 	 * @chainable
 	 */
 	setSelectionStyles(styles: any): Text;
@@ -3340,42 +3272,41 @@ export class IText extends Object {
 
 	/**
 	 * Returns 2d representation (lineIndex and charIndex) of cursor (or selection start)
-	 * @param {Number} [selectionStart] Optional index. When not given, current selectionStart is used.
+	 * @param [selectionStart] Optional index. When not given, current selectionStart is used.
 	 */
 	get2DCursorLocation(selectionStart?: number): void;
 	/**
 	 * Returns complete style of char at the current cursor
-	 * @param {Number} lineIndex Line index
-	 * @param {Number} charIndex Char index
-	 * @return {Object} Character style
+	 * @param lineIndex Line index
+	 * @param charIndex Char index
+	 * @return Character style
 	 */
 	getCurrentCharStyle(lineIndex: number, charIndex: number): any;
 
 	/**
 	 * Returns fontSize of char at the current cursor
-	 * @param {Number} lineIndex Line index
-	 * @param {Number} charIndex Char index
-	 * @return {Number} Character font size
+	 * @param lineIndex Line index
+	 * @param charIndex Char index
+	 * @return Character font size
 	 */
 	getCurrentCharFontSize(lineIndex: number, charIndex: number): number;
 
 	/**
 	 * Returns color (fill) of char at the current cursor
-	 * @param {Number} lineIndex Line index
-	 * @param {Number} charIndex Char index
-	 * @return {String} Character color (fill)
+	 * @param lineIndex Line index
+	 * @param charIndex Char index
+	 * @return Character color (fill)
 	 */
 	getCurrentCharColor(lineIndex: number, charIndex: number): string;
 	/**
 	 * Renders cursor
-	 * @param {Object} boundaries
 	 */
 	renderCursor(boundaries: any): void;
 
 	/**
 	 * Renders text selection
-	 * @param {Array} chars Array of characters
-	 * @param {Object} boundaries Object with left/top/leftOffset/topOffset
+	 * @param chars Array of characters
+	 * @param boundaries Object with left/top/leftOffset/topOffset
 	 */
 	renderSelection(chars: string[], boundaries: any): void;
 
@@ -3420,27 +3351,27 @@ export class IText extends Object {
 
 	/**
 	 * Find new selection index representing start of current word according to current selection index
-	 * @param {Number} startFrom Surrent selection index
-	 * @return {Number} New selection index
+	 * @param startFrom Surrent selection index
+	 * @return New selection index
 	 */
 	findWordBoundaryLeft(startFrom: number): number;
 
 	/**
 	 * Find new selection index representing end of current word according to current selection index
-	 * @param {Number} startFrom Current selection index
-	 * @return {Number} New selection index
+	 * @param startFrom Current selection index
+	 * @return New selection index
 	 */
 	findWordBoundaryRight(startFrom: number): number;
 
 	/**
 	 * Find new selection index representing start of current line according to current selection index
-	 * @param {Number} startFrom Current selection index
+	 * @param startFrom Current selection index
 	 */
 	findLineBoundaryLeft(startFrom: number): number;
 
 	/**
 	 * Find new selection index representing end of current line according to current selection index
-	 * @param {Number} startFrom Current selection index
+	 * @param startFrom Current selection index
 	 */
 	findLineBoundaryRight(startFrom: number): number;
 
@@ -3451,19 +3382,19 @@ export class IText extends Object {
 
 	/**
 	 * Finds index corresponding to beginning or end of a word
-	 * @param {Number} selectionStart Index of a character
-	 * @param {Number} direction: 1 or -1
+	 * @param selectionStart Index of a character
+	 * @param direction: 1 or -1
 	 */
 	searchWordBoundary(selectionStart: number, direction: number): number;
 
 	/**
 	 * Selects a word based on the index
-	 * @param {Number} selectionStart Index of a character
+	 * @param selectionStart Index of a character
 	 */
 	selectWord(selectionStart: number): void;
 	/**
 	 * Selects a line based on the index
-	 * @param {Number} selectionStart Index of a character
+	 * @param selectionStart Index of a character
 	 */
 	selectLine(selectionStart: number): void;
 
@@ -3478,51 +3409,51 @@ export class IText extends Object {
 	initMouseMoveHandler(): void;
 	/**
 	 * Exits from editing state
-	 * @return {fabric.IText} thisArg
+	 * @return thisArg
 	 * @chainable
 	 */
 	exitEditing(): IText;
 
 	/**
 	 * Inserts a character where cursor is (replacing selection if one exists)
-	 * @param {String} _chars Characters to insert
+	 * @param _chars Characters to insert
 	 */
 	insertChars(_chars: string, useCopiedStyle?: boolean): void;
 	/**
 	 * Inserts new style object
-	 * @param {Number} lineIndex Index of a line
-	 * @param {Number} charIndex Index of a char
-	 * @param {Boolean} isEndOfLine True if it's end of line
+	 * @param lineIndex Index of a line
+	 * @param charIndex Index of a char
+	 * @param isEndOfLine True if it's end of line
 	 */
 	insertNewlineStyleObject(lineIndex: number, charIndex: number, isEndOfLine: boolean): void;
 
 	/**
 	 * Inserts style object for a given line/char index
-	 * @param {Number} lineIndex Index of a line
-	 * @param {Number} charIndex Index of a char
-	 * @param {Object} [style] Style object to insert, if given
+	 * @param lineIndex Index of a line
+	 * @param charIndex Index of a char
+	 * @param [style] Style object to insert, if given
 	 */
 	insertCharStyleObject(lineIndex: number, charIndex: number, isEndOfLine: boolean): void;
 
 	/**
 	 * Inserts style object(s)
-	 * @param {String} _chars Characters at the location where style is inserted
-	 * @param {Boolean} isEndOfLine True if it's end of line
-	 * @param {Boolean} [useCopiedStyle] Style to insert
+	 * @param _chars Characters at the location where style is inserted
+	 * @param isEndOfLine True if it's end of line
+	 * @param [useCopiedStyle] Style to insert
 	 */
 	insertStyleObjects(_chars: string, isEndOfLine: boolean, useCopiedStyle?: boolean): void;
 
 	/**
 	 * Shifts line styles up or down
-	 * @param {Number} lineIndex Index of a line
-	 * @param {Number} offset Can be -1 or +1
+	 * @param lineIndex Index of a line
+	 * @param offset Can be -1 or +1
 	 */
 	shiftLineStyles(lineIndex: number, offset: number): void;
 
 	/**
 	 * Removes style object
-	 * @param {Boolean} isBeginningOfLine True if cursor is at the beginning of line
-	 * @param {Number} [index] Optional index. When not given, current selectionStart is used.
+	 * @param isBeginningOfLine True if cursor is at the beginning of line
+	 * @param [index] Optional index. When not given, current selectionStart is used.
 	 */
 	removeStyleObject(isBeginningOfLine: boolean, index?: number): void;
 	/**
@@ -3532,7 +3463,7 @@ export class IText extends Object {
 
 	/**
 	 * Returns fabric.IText instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): IText;
 }
@@ -3541,25 +3472,25 @@ interface ITriangleOptions extends IObjectOptions { }
 export class Triangle extends Object {
 	/**
 	 * Constructor
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	constructor(options?: ITriangleOptions);
 
 	/**
 	 * Returns complexity of an instance
-	 * @return {Number} complexity of this instance
+	 * @return complexity of this instance
 	 */
 	complexity(): number;
 	/**
 	 * Returns SVG representation of an instance
-	 * @param {Function} [reviver] Method for further parsing of svg representation.
-	 * @return {String} svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
 	 */
 	toSVG(reviver?: Function): string;
 
 	/**
 	 * Returns Triangle instance from an object representation
-	 * @param {Object} object Object to create an instance from
+	 * @param object Object to create an instance from
 	 */
 	static fromObject(object: any): Triangle;
 }
@@ -3571,200 +3502,184 @@ interface IAllFilters {
 	BaseFilter: {
 		/**
 		 * Constructor
-		 * @param {Object} [options] Options object
+		 * @param [options] Options object
 		 */
 		new (options?: any): IBaseFilter;
 	};
 	Blend: {
 		/**
 		 * Constructor
-		 * @param {Object} [options] Options object
+		 * @param [options] Options object
 		 */
 		new (options?: { color?: string; mode?: string; alpha?: number; image?: Image }): IBlendFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IBlendFilter
 	};
 	Brightness: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {Number} [options.brightness=0] Value to brighten the image up (0..255)
-		 */
-		new (options?: { brightness: number }): IBrightnessFilter;
+		new (options?: {
+			/**
+			 * Value to brighten the image up (0..255)
+			 * @default 0
+			 */
+			brightness: number
+		}): IBrightnessFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IBrightnessFilter
 	};
 	Convolute: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {Boolean} [options.opaque=false] Opaque value (true/false)
-		 * @param {Array} [options.matrix] Filter matrix
-		 */
-		new (options?: { opaque?: boolean; matrix?: number[] }): IConvoluteFilter;
+		new (options?: {
+			opaque?: boolean,
+			/** Filter matrix */
+			matrix?: number[],
+		}): IConvoluteFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IConvoluteFilter
 	};
 	GradientTransparency: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {Number} [options.threshold=100] Threshold value
-		 */
-		new (options?: { threshold?: number; }): IGradientTransparencyFilter;
+		new (options?: {
+			/** @default 100 */
+			threshold?: number;
+		}): IGradientTransparencyFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IGradientTransparencyFilter
 	};
 	Grayscale: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 */
 		new (options?: any): IGrayscaleFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IGrayscaleFilter
 	};
 	Invert: {
 		/**
 		 * Constructor
-		 * @param {Object} [options] Options object
+		 * @param [options] Options object
 		 */
 		new (options?: any): IInvertFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IInvertFilter
 	};
 	Mask: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {fabric.Image} [options.mask] Mask image object
-		 * @param {Number} [options.channel=0] Rgb channel (0, 1, 2 or 3)
-		 */
-		new (options?: { mask?: Image; channel: number; }): IMaskFilter;
+		new (options?: {
+			/** Mask image object */
+			mask?: Image,
+			/**
+			 * Rgb channel (0, 1, 2 or 3)
+			 * @default 0
+			 */
+			channel: number,
+		}): IMaskFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IMaskFilter
 	};
 	Multiply: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {Number} [options.color=#000000] Color to multiply the image pixels with
-		 */
-		new (options?: { color: string; }): IMultiplyFilter;
+		new (options?: {
+			/**
+			 * Color to multiply the image pixels with
+			 * @default #000000
+			 */
+			color: string;
+		}): IMultiplyFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IMultiplyFilter
 	};
 	Noise: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {Number} [options.noise=0] Noise value
-		 */
-		new (options?: { noise: number; }): INoiseFilter;
+		new (options?: {
+			/** @default 0 */
+			noise: number,
+		}): INoiseFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): INoiseFilter
 	};
 	Pixelate: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {Number} [options.blocksize=4] Blocksize for pixelate
-		 */
-		new (options?: { blocksize?: number; }): IPixelateFilter;
+		new (options?: {
+			/**
+			 * Blocksize for pixelate
+			 * @default 4
+			 */
+			blocksize?: number,
+		}): IPixelateFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IPixelateFilter
 	};
 	RemoveWhite: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {Number} [options.threshold=30] Threshold value
-		 * @param {Number} [options.distance=20] Distance value
-		 */
-		new (options?: { threshold?: number; distance?: number; }): IRemoveWhiteFilter;
+		new (options?: {
+			/** @default 30 */
+			threshold?: number,
+			/** @default 20 */
+			distance?: number,
+		}): IRemoveWhiteFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IRemoveWhiteFilter
 	};
 	Resize: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 */
 		new (options?: any): IResizeFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): IResizeFilter
 	};
 	Sepia2: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 */
 		new (options?: any): ISepia2Filter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): ISepia2Filter
 	};
 	Sepia: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 */
 		new (options?: any): ISepiaFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): ISepiaFilter
 	};
 	Tint: {
-		/**
-		 * Constructor
-		 * @param {Object} [options] Options object
-		 * @param {String} [options.color=#000000] Color to tint the image with
-		 * @param {Number} [options.opacity] Opacity value that controls the tint effect's transparency (0..1)
-		 */
-		new (options?: { color?: string; opacity?: number; }): ITintFilter;
+		new (options?: {
+			/**
+			 * Color to tint the image with
+			 * @default #000000
+			 */
+			color?: string;
+			/** Opacity value that controls the tint effect's transparency (0..1) */
+			opacity?: number;
+		}): ITintFilter;
 		/**
 		 * Returns filter instance from an object representation
-		 * @param {Object} object Object to create an instance from
+		 * @param object Object to create an instance from
 		 */
 		fromObject(object: any): ITintFilter
 	};
@@ -3772,7 +3687,7 @@ interface IAllFilters {
 interface IBaseFilter {
 	/**
 	 * Sets filter's properties from options
-	 * @param {Object} [options] Options object
+	 * @param [options] Options object
 	 */
 	setOptions(options?: any): void;
 	/**
@@ -3787,77 +3702,77 @@ interface IBaseFilter {
 interface IBlendFilter extends IBaseFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IBrightnessFilter extends IBaseFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IConvoluteFilter extends IBaseFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IGradientTransparencyFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IGrayscaleFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IInvertFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IMaskFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IMultiplyFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface INoiseFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IPixelateFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface IRemoveWhiteFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
@@ -3883,28 +3798,28 @@ interface IResizeFilter {
 	lanczosLobes: number;
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface ISepiaFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface ISepia2Filter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
 interface ITintFilter {
 	/**
 	 * Applies filter to canvas element
-	 * @param {Object} canvasEl Canvas element to apply filter to
+	 * @param canvasEl Canvas element to apply filter to
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
@@ -3946,7 +3861,7 @@ export class BaseBrush {
 
 	/**
 	 * Sets shadow of an object
-	 * @param {Object|String} [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
+	 * @param [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
 	 */
 	setShadow(options: string|any): BaseBrush;
 }
@@ -3958,13 +3873,11 @@ export class CircleBrush extends BaseBrush {
 	width: number;
 	/**
 	 * Invoked inside on mouse down and mouse move
-	 * @param {Object} pointer
 	 */
 	drawDot(pointer: any): void;
 
 	/**
-	 * @param {Object} pointer
-	 * @return {fabric.Point} Just added pointer point
+	 * @return Just added pointer point
 	 */
 	addPoint(pointer: any): Point;
 }
@@ -3996,9 +3909,7 @@ export class SprayBrush extends BaseBrush {
 	 * Whether overlapping dots (rectangles) should be removed (for performance reasons)
 	 */
 	optimizeOverlapping: boolean;
-	/**
-	 * @param {Object} pointer
-	 */
+
 	addSprayChunk(pointer: any): void;
 }
 export class PatternBrush extends PencilBrush {
@@ -4018,15 +3929,13 @@ export class PatternBrush extends PencilBrush {
 export class PencilBrush extends BaseBrush {
 	/**
 	 * Converts points to SVG path
-	 * @param {Array} points Array of points
-	 * @param {Number} minX
-	 * @param {Number} minY
+	 * @param points Array of points
 	 */
 	convertPointsToSVGPath(points: Array<{ x: number; y: number }>, minX?: number, minY?: number): string[];
 
 	/**
 	 * Creates fabric.Path object to add on canvas
-	 * @param {String} pathData Path data
+	 * @param pathData Path data
 	 */
 	createPath(pathData: string): IPath;
 }
@@ -4067,13 +3976,13 @@ interface IUtilAnimationOptions {
 interface IUtilAnimation {
 	/**
 	 * Changes value from one to another within certain period of time, invoking callbacks as value is being changed.
-	 * @param {Object} [options] Animation options
+	 * @param [options] Animation options
 	 */
 	animate(options?: IUtilAnimationOptions): void;
 	/**
 	 * requestAnimationFrame polyfill based on http://paulirish.com/2011/requestanimationframe-for-smart-animating/
 	 * In order to get a precise start time, `requestAnimFrame` should be called as an entry into the method
-	 * @param {Function} callback Callback to invoke
+	 * @param callback Callback to invoke
 	 */
 	requestAnimFrame(callback: Function): void;
 }
@@ -4116,35 +4025,25 @@ interface IUtilAnimEase {
 interface IUtilArc {
 	/**
 	 * Draws arc
-	 * @param {CanvasRenderingContext2D} ctx
-	 * @param {Number} fx
-	 * @param {Number} fy
-	 * @param {Array} coords
 	 */
 	drawArc(ctx: CanvasRenderingContext2D, fx: number, fy: number, coords: number[]): void;
 	/**
 	 * Calculate bounding box of a elliptic-arc
-	 * @param {Number} fx start point of arc
-	 * @param {Number} fy
-	 * @param {Number} rx horizontal radius
-	 * @param {Number} ry vertical radius
-	 * @param {Number} rot angle of horizontal axe
-	 * @param {Number} large 1 or 0, whatever the arc is the big or the small on the 2 points
-	 * @param {Number} sweep 1 or 0, 1 clockwise or counterclockwise direction
-	 * @param {Number} tx end point of arc
-	 * @param {Number} ty
+	 * @param fx start point of arc
+	 * @param rx horizontal radius
+	 * @param ry vertical radius
+	 * @param rot angle of horizontal axe
+	 * @param large 1 or 0, whatever the arc is the big or the small on the 2 points
+	 * @param sweep 1 or 0, 1 clockwise or counterclockwise direction
+	 * @param tx end point of arc
 	 */
 	getBoundsOfArc(fx: number, fy: number, rx: number, ry: number, rot: number, large: number, sweep: number, tx: number, ty: number): Point[];
 	/**
 	 * Calculate bounding box of a beziercurve
-	 * @param {Number} x0 starting point
-	 * @param {Number} y0
-	 * @param {Number} x1 first control point
-	 * @param {Number} y1
-	 * @param {Number} x2 secondo control point
-	 * @param {Number} y2
-	 * @param {Number} x3 end of beizer
-	 * @param {Number} y3
+	 * @param x0 starting point
+	 * @param x1 first control point
+	 * @param x2 secondo control point
+	 * @param x3 end of beizer
 	 */
 	getBoundsOfCurve(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): Point[];
 }
@@ -4152,24 +4051,18 @@ interface IUtilArc {
 interface IUtilDomEvent {
 	/**
 	 * Cross-browser wrapper for getting event's coordinates
-	 * @param {Event} event Event object
-	 * @param {HTMLCanvasElement} upperCanvasEl &lt;canvas> element on which object selection is drawn
+	 * @param event Event object
+	 * @param upperCanvasEl &lt;canvas> element on which object selection is drawn
 	 */
 	getPointer(event: Event, upperCanvasEl: HTMLCanvasElement): Point;
 
 	/**
 	 * Adds an event listener to an element
-	 * @param {HTMLElement} element
-	 * @param {String} eventName
-	 * @param {Function} handler
 	 */
 	addListener(element: HTMLElement, eventName: string, handler: Function): void;
 
 	/**
 	 * Removes an event listener from an element
-	 * @param {HTMLElement} element
-	 * @param {String} eventName
-	 * @param {Function} handler
 	 */
 	removeListener(element: HTMLElement, eventName: string, handler: Function): void;
 }
@@ -4177,67 +4070,63 @@ interface IUtilDomEvent {
 interface IUtilDomMisc {
 	/**
 	 * Takes id and returns an element with that id (if one exists in a document)
-	 * @param {String|HTMLElement} id
 	 */
 	getById(id: string|HTMLElement): HTMLElement;
 	/**
 	 * Converts an array-like object (e.g. arguments or NodeList) to an array
-	 * @param {Object} arrayLike
 	 */
 	toArray(arrayLike: any): any[];
 	/**
 	 * Creates specified element with specified attributes
-	 * @memberOf fabric.util
-	 * @param {String} tagName Type of an element to create
-	 * @param {Object} [attributes] Attributes to set on an element
-	 * @return {HTMLElement} Newly created element
+	 * @param tagName Type of an element to create
+	 * @param [attributes] Attributes to set on an element
+	 * @return Newly created element
 	 */
 	makeElement(tagName: string, attributes?: any): HTMLElement;
 	/**
 	 * Adds class to an element
-	 * @param {HTMLElement} element Element to add class to
-	 * @param {String} className Class to add to an element
+	 * @param element Element to add class to
+	 * @param className Class to add to an element
 	 */
 	addClass(element: HTMLElement, classname: string): void;
 	/**
 	 * Wraps element with another element
-	 * @param {HTMLElement} element Element to wrap
-	 * @param {HTMLElement|String} wrapper Element to wrap with
-	 * @param {Object} [attributes] Attributes to set on a wrapper
+	 * @param element Element to wrap
+	 * @param wrapper Element to wrap with
+	 * @param [attributes] Attributes to set on a wrapper
 	 */
 	wrapElement(element: HTMLElement, wrapper: HTMLElement|string, attributes?: any): HTMLElement;
 	/**
 	 * Returns element scroll offsets
-	 * @param {HTMLElement} element Element to operate on
-	 * @param {HTMLElement} upperCanvasEl Upper canvas element
+	 * @param element Element to operate on
+	 * @param upperCanvasEl Upper canvas element
 	 */
 	getScrollLeftTop(element: HTMLElement, upperCanvasEl: HTMLElement): { left: number; right: number; };
 	/**
 	 * Returns offset for a given element
-	 * @param {HTMLElement} element Element to get offset for
+	 * @param element Element to get offset for
 	 */
 	getElementOffset(element: HTMLElement): { left: number; right: number; };
 	/**
 	 * Returns style attribute value of a given element
-	 * @param {HTMLElement} element Element to get style attribute for
-	 * @param {String} attr Style attribute to get for element
+	 * @param element Element to get style attribute for
+	 * @param attr Style attribute to get for element
 	 */
 	getElementStyle(elment: HTMLElement, attr: string): string;
 	/**
 	 * Inserts a script element with a given url into a document; invokes callback, when that script is finished loading
-	 * @memberOf fabric.util
-	 * @param {String} url URL of a script to load
-	 * @param {Function} callback Callback to execute when script is finished loading
+	 * @param url URL of a script to load
+	 * @param callback Callback to execute when script is finished loading
 	 */
 	getScript(url: string, callback: Function): void;
 	/**
 	 * Makes element unselectable
-	 * @param {HTMLElement} element Element to make unselectable
+	 * @param element Element to make unselectable
 	 */
 	makeElementUnselectable(element: HTMLElement): HTMLElement;
 	/**
 	 * Makes element selectable
-	 * @param {HTMLElement} element Element to make selectable
+	 * @param element Element to make selectable
 	 */
 	makeElementSelectable(element: HTMLElement): HTMLElement;
 }
@@ -4245,19 +4134,19 @@ interface IUtilDomMisc {
 interface IUtilDomRequest {
 	/**
 	 * Cross-browser abstraction for sending XMLHttpRequest
-	 * @param {String} url URL to send XMLHttpRequest to
-	 * @param {Object} [options] Options object
-	 * @param {String} [options.method="GET"]
-	 * @param {Function} options.onComplete Callback to invoke when request is completed
+	 * @param url URL to send XMLHttpRequest to
 	 */
-	request(url: string, options?: { method?: string; onComplete: Function }): XMLHttpRequest;
+	request(url: string, options?: {
+		/** @default "GET" */
+		method?: string,
+		/** Callback to invoke when request is completed */
+		onComplete: Function,
+	}): XMLHttpRequest;
 }
 
 interface IUtilDomStyle {
 	/**
 	 * Cross-browser wrapper for setting element's style
-	 * @param {HTMLElement} element
-	 * @param {Object} styles
 	 */
 	setStyle(element: HTMLElement, styles: any): HTMLElement;
 }
@@ -4265,20 +4154,18 @@ interface IUtilDomStyle {
 interface IUtilArray {
 	/**
 	 * Invokes method on all items in a given array
-	 * @param {Array} array Array to iterate over
-	 * @param {String} method Name of a method to invoke
+	 * @param array Array to iterate over
+	 * @param method Name of a method to invoke
 	 */
 	invoke(array: any[], method: string): any[];
 	/**
 	 * Finds minimum value in array (not necessarily "first" one)
-	 * @param {Array} array Array to iterate over
-	 * @param {String} byProperty
+	 * @param array Array to iterate over
 	 */
 	min(array: any[], byProperty: string): any;
 	/**
 	 * Finds maximum value in array (not necessarily "first" one)
-	 * @param {Array} array Array to iterate over
-	 * @param {String} byProperty
+	 * @param array Array to iterate over
 	 */
 	max(array: any[], byProperty: string): any;
 }
@@ -4286,14 +4173,14 @@ interface IUtilArray {
 interface IUtilClass {
 	/**
 	 * Helper for creation of "classes".
-	 * @param {Function} [parent] optional "Class" to inherit from
-	 * @param {Object} [properties] Properties shared by all instances of this class
+	 * @param [parent] optional "Class" to inherit from
+	 * @param [properties] Properties shared by all instances of this class
 	 *                  (be careful modifying objects defined here as this would affect all instances)
 	 */
 	createClass(parent: Function, properties?: any): void;
 	/**
 	 * Helper for creation of "classes".
-	 * @param {Object} [properties] Properties shared by all instances of this class
+	 * @param [properties] Properties shared by all instances of this class
 	 *                  (be careful modifying objects defined here as this would affect all instances)
 	 */
 	createClass(properties?: any): void;
@@ -4302,16 +4189,14 @@ interface IUtilClass {
 interface IUtilObject {
 	/**
 	 * Copies all enumerable properties of one object to another
-	 * @param {Object} destination Where to copy to
-	 * @param {Object} source Where to copy from
+	 * @param destination Where to copy to
+	 * @param source Where to copy from
 	 */
 	extend(destination: any, source: any): any;
 
 	/**
 	 * Creates an empty object and copies all enumerable properties of another object to it
-	 * @memberOf fabric.util.object
-	 * @param {Object} object Object to clone
-	 * @return {Object}
+	 * @param object Object to clone
 	 */
 	clone(object: any): any;
 }
@@ -4319,14 +4204,14 @@ interface IUtilObject {
 interface IUtilString {
 	/**
 	 * Camelizes a string
-	 * @param {String} string String to camelize
+	 * @param string String to camelize
 	 */
 	camelize(string: string): string;
 
 	/**
 	 * Capitalizes a string
-	 * @param {String} string String to capitalize
-	 * @param {Boolean} [firstLetterOnly] If true only first letter is capitalized
+	 * @param string String to capitalize
+	 * @param [firstLetterOnly] If true only first letter is capitalized
 	 * and other letters stay untouched, if false first letter is capitalized
 	 * and other letters are converted to lowercase.
 	 */
@@ -4334,7 +4219,7 @@ interface IUtilString {
 
 	/**
 	 * Escapes XML in a string
-	 * @param {String} string String to escape
+	 * @param string String to escape
 	 */
 	escapeXml(string: string): string;
 }
@@ -4343,64 +4228,61 @@ interface IUtilMisc {
 	/**
 	 * Removes value from an array.
 	 * Presence of value (and its position in an array) is determined via `Array.prototype.indexOf`
-	 * @param {Array} array
-	 * @param {Any} value
 	 */
 	removeFromArray(array: any[], value: any): any[];
 
 	/**
 	 * Returns random number between 2 specified ones.
-	 * @param {Number} min lower limit
-	 * @param {Number} max upper limit
+	 * @param min lower limit
+	 * @param max upper limit
 	 */
 	getRandomInt(min: number, max: number): number;
 
 	/**
 	 * Transforms degrees to radians.
-	 * @param {Number} degrees value in degrees
+	 * @param degrees value in degrees
 	 */
 	degreesToRadians(degrees: number): number;
 
 	/**
 	 * Transforms radians to degrees.
-	 * @memberOf fabric.util
-	 * @param {Number} radians value in radians
+	 * @param radians value in radians
 	 */
 	radiansToDegrees(radians: number): number;
 
 	/**
 	 * Rotates `point` around `origin` with `radians`
-	 * @param {fabric.Point} point The point to rotate
-	 * @param {fabric.Point} origin The origin of the rotation
-	 * @param {Number} radians The radians of the angle for the rotation
+	 * @param point The point to rotate
+	 * @param origin The origin of the rotation
+	 * @param radians The radians of the angle for the rotation
 	 */
 	rotatePoint(point: Point, origin: Point, radians: number): Point;
 
 	/**
 	 * Apply transform t to point p
-	 * @param  {fabric.Point} p The point to transform
-	 * @param  {Array} t The transform
-	 * @param  {Boolean} [ignoreOffset] Indicates that the offset should not be applied
+	 * @param  p The point to transform
+	 * @param  t The transform
+	 * @param  [ignoreOffset] Indicates that the offset should not be applied
 	 */
 	transformPoint(p: Point, t: any[], ignoreOffset?: boolean): Point;
 
 	/**
 	 * Invert transformation t
-	 * @param {Array} t The transform
+	 * @param t The transform
 	 */
 	invertTransform(t: any[]): any[];
 
 	/**
 	 * A wrapper around Number#toFixed, which contrary to native method returns number, not string.
-	 * @param {Number|String} number number to operate on
-	 * @param {Number} fractionDigits number of fraction digits to "leave"
+	 * @param number number to operate on
+	 * @param fractionDigits number of fraction digits to "leave"
 	 */
 	toFixed(number: number, fractionDigits: number): number;
 
 	/**
 	 * Converts from attribute value to pixel value if applicable.
 	 * Returns converted pixels or original value not converted.
-	 * @param {Number|String} value number to operate on
+	 * @param value number to operate on
 	 */
 	parseUnit(value: number|string, fontSize?: number): number|string;
 
@@ -4411,65 +4293,65 @@ interface IUtilMisc {
 
 	/**
 	 * Returns klass "Class" object of given namespace
-	 * @param {String} type Type of object (eg. 'circle')
-	 * @param {String} namespace Namespace to get klass "Class" object from
+	 * @param type Type of object (eg. 'circle')
+	 * @param namespace Namespace to get klass "Class" object from
 	 */
 	getKlass(type: string, namespace: string): any;
 
 	/**
 	 * Returns object of given namespace
-	 * @param {String} namespace Namespace string e.g. 'fabric.Image.filter' or 'fabric'
+	 * @param namespace Namespace string e.g. 'fabric.Image.filter' or 'fabric'
 	 */
 	resolveNamespace(namespace: string): any;
 
 	/**
 	 * Loads image element from given url and passes it to a callback
-	 * @param {String} url URL representing an image
-	 * @param {Function} callback Callback; invoked with loaded image
-	 * @param {Any} [context] Context to invoke callback in
-	 * @param {Object} [crossOrigin] crossOrigin value to set image element to
+	 * @param url URL representing an image
+	 * @param callback Callback; invoked with loaded image
+	 * @param [context] Context to invoke callback in
+	 * @param [crossOrigin] crossOrigin value to set image element to
 	 */
 	loadImage(url: string, callback: (image: HTMLImageElement) => {}, context?: any, crossOrigin?: boolean): void;
 
 	/**
 	 * Creates corresponding fabric instances from their object representations
-	 * @param {Array} objects Objects to enliven
-	 * @param {Function} callback Callback to invoke when all objects are created
-	 * @param {String} namespace Namespace to get klass "Class" object from
-	 * @param {Function} reviver Method for further parsing of object elements, called after each fabric object created.
+	 * @param objects Objects to enliven
+	 * @param callback Callback to invoke when all objects are created
+	 * @param namespace Namespace to get klass "Class" object from
+	 * @param reviver Method for further parsing of object elements, called after each fabric object created.
 	 */
 	enlivenObjects(objects: any[], callback: Function, namespace: string, reviver?: Function): void;
 
 	/**
 	 * Groups SVG elements (usually those retrieved from SVG document)
-	 * @param {Array} elements SVG elements to group
-	 * @param {Object} [options] Options object
+	 * @param elements SVG elements to group
+	 * @param [options] Options object
 	 */
 	groupSVGElements(elements: any[], options?: any, path?: any): PathGroup;
 
 	/**
 	 * Populates an object with properties of another object
-	 * @param {Object} source Source object
-	 * @param {Object} destination Destination object
-	 * @param {Array} properties Propertie names to include
+	 * @param source Source object
+	 * @param destination Destination object
+	 * @param properties Propertie names to include
 	 */
 	populateWithProperties(source: any, destination: any, properties: any): void;
 
 	/**
 	 * Draws a dashed line between two points
 	 * This method is used to draw dashed line around selection area.
-	 * @param {CanvasRenderingContext2D} ctx context
-	 * @param {Number} x  start x coordinate
-	 * @param {Number} y start y coordinate
-	 * @param {Number} x2 end x coordinate
-	 * @param {Number} y2 end y coordinate
-	 * @param {Array} da dash array pattern
+	 * @param ctx context
+	 * @param x  start x coordinate
+	 * @param y start y coordinate
+	 * @param x2 end x coordinate
+	 * @param y2 end y coordinate
+	 * @param da dash array pattern
 	 */
 	drawDashedLine(ctx: CanvasRenderingContext2D, x: number, y: number, x2: number, y2: number, da: any[]): void;
 
 	/**
 	 * Creates canvas element and initializes it via excanvas if necessary
-	 * @param {CanvasElement} [canvasEl] optional canvas element to initialize;
+	 * @param [canvasEl] optional canvas element to initialize;
 	 * when not given, element is created implicitly
 	 */
 	createCanvasElement(canvasEl?: HTMLCanvasElement): HTMLCanvasElement;
@@ -4481,36 +4363,36 @@ interface IUtilMisc {
 
 	/**
 	 * Creates accessors (getXXX, setXXX) for a "class", based on "stateProperties" array
-	 * @param {Object} klass "Class" to create accessors for
+	 * @param klass "Class" to create accessors for
 	 */
 	createAccessors(klass: any): any;
 
 	/**
-	 * @param {fabric.Object} receiver Object implementing `clipTo` method
-	 * @param {CanvasRenderingContext2D} ctx Context to clip
+	 * @param receiver Object implementing `clipTo` method
+	 * @param ctx Context to clip
 	 */
 	clipContext(receiver: Object, ctx: CanvasRenderingContext2D): void;
 
 	/**
 	 * Multiply matrix A by matrix B to nest transformations
-	 * @param  {Array} a First transformMatrix
-	 * @param  {Array} b Second transformMatrix
+	 * @param  a First transformMatrix
+	 * @param  b Second transformMatrix
 	 */
 	multiplyTransformMatrices(a: any[], b: any[]): any[];
 
 	/**
 	 * Returns string representation of function body
-	 * @param {Function} fn Function to get body of
+	 * @param fn Function to get body of
 	 */
 	getFunctionBody(fn: Function): string;
 
 	/**
 	 * Returns true if context has transparent pixel
 	 * at specified location (taking tolerance into account)
-	 * @param {CanvasRenderingContext2D} ctx context
-	 * @param {Number} x x coordinate
-	 * @param {Number} y y coordinate
-	 * @param {Number} tolerance Tolerance
+	 * @param ctx context
+	 * @param x x coordinate
+	 * @param y y coordinate
+	 * @param tolerance Tolerance
 	 */
 	isTransparent(ctx: CanvasRenderingContext2D, x: number, y: number, tolerance: number): boolean;
 }
diff --git a/types/facebook-js-sdk/tslint.json b/types/facebook-js-sdk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/facebook-js-sdk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/facebook-pixel/tslint.json b/types/facebook-pixel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/facebook-pixel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/faker/faker-tests.ts b/types/faker/faker-tests.ts
index 5fb6a53746..df671dcf6a 100644
--- a/types/faker/faker-tests.ts
+++ b/types/faker/faker-tests.ts
@@ -1,5 +1,3 @@
-
-
 let resultStr: string;
 let resultBool: boolean;
 let resultNum: number;
@@ -17,7 +15,7 @@ resultStr = faker.address.cityPrefix();
 resultStr = faker.address.citySuffix();
 resultStr = faker.address.streetName();
 resultStr = faker.address.streetAddress();
-resultStr = faker.address.streetAddress(false);;
+resultStr = faker.address.streetAddress(false);
 resultStr = faker.address.streetSuffix();
 resultStr = faker.address.streetPrefix();
 resultStr = faker.address.secondaryAddress();
@@ -63,6 +61,8 @@ resultDate = faker.date.between('foo', 'bar');
 resultDate = faker.date.between(new Date(), new Date());
 resultDate = faker.date.recent();
 resultDate = faker.date.recent(100);
+resultDate = faker.date.soon();
+resultDate = faker.date.soon(30);
 resultStr = faker.date.month();
 resultStr = faker.date.month({
 	abbr: true,
@@ -86,6 +86,9 @@ resultStr = faker.finance.currencyCode();
 resultStr = faker.finance.currencyName();
 resultStr = faker.finance.currencySymbol();
 resultStr = faker.finance.bitcoinAddress();
+resultStr = faker.finance.ethereumAddress();
+resultStr = faker.finance.iban();
+resultStr = faker.finance.iban(true);
 resultStr = faker.finance.bic();
 
 resultStr = faker.hacker.abbreviation();
@@ -96,7 +99,7 @@ resultStr = faker.hacker.ingverb();
 resultStr = faker.hacker.phrase();
 
 resultStr = faker.helpers.randomize();
-resultNum = faker.helpers.randomize([1,2,3,4]);
+resultNum = faker.helpers.randomize([1, 2, 3, 4]);
 resultStr = faker.helpers.randomize(['foo', 'bar', 'quux']);
 resultStr = faker.helpers.slugify('foo bar quux');
 resultStr = faker.helpers.replaceSymbolWithNumber('foo# bar#');
@@ -167,7 +170,6 @@ resultStr = faker.name.jobType();
 resultStr = faker.phone.phoneNumber();
 resultStr = faker.phone.phoneNumber('#');
 resultStr = faker.phone.phoneNumberFormat();
-// https://github.com/Marak/faker.js/blob/master/lib/phone_number.js#L9-L13
 resultStr = faker.phone.phoneNumberFormat(0);
 resultStr = faker.phone.phoneFormats();
 
@@ -179,27 +181,104 @@ resultNum = faker.random.number({
 	precision: 0
 });
 resultStr = faker.random.arrayElement();
-resultStr = faker.random.arrayElement(['foo', 'bar', 'quux'])
+resultStr = faker.random.arrayElement(['foo', 'bar', 'quux']);
 resultStr = faker.random.objectElement();
 resultStr = faker.random.objectElement({foo: 'bar', field: 'foo'});
 resultStr = faker.random.uuid();
 resultBool = faker.random.boolean();
 resultStr = faker.random.word();
+resultStr = faker.random.word("noun");
 resultStr = faker.random.words();
 resultStr = faker.random.words(0);
 resultStr = faker.random.image();
 resultStr = faker.random.locale();
 resultStr = faker.random.alphaNumeric();
 resultStr = faker.random.alphaNumeric(0);
+resultStr = faker.random.hexaDecimal();
+resultStr = faker.random.hexaDecimal(3);
 
-resultStr = faker.system.fileName( "foo", "bar" );
-resultStr = faker.system.commonFileName( "foo", "bar" );
+resultStr = faker.system.fileName("foo", "bar");
+resultStr = faker.system.commonFileName("foo", "bar");
 resultStr = faker.system.mimeType();
 resultStr = faker.system.commonFileType();
 resultStr = faker.system.commonFileExt();
 resultStr = faker.system.fileType();
-resultStr = faker.system.fileExt( "foo" );
+resultStr = faker.system.fileExt("foo");
+resultStr = faker.system.directoryPath();
+resultStr = faker.system.filePath();
 resultStr = faker.system.semver();
 
+import fakerAz = require('faker/locale/az');
+resultStr = fakerAz.name.firstName();
+import fakerCz = require('faker/locale/cz');
+resultStr = fakerCz.name.firstName();
+import fakerDe = require('faker/locale/de');
+resultStr = fakerDe.name.firstName();
+import fakerDeAT = require('faker/locale/de_AT');
+resultStr = fakerDeAT.name.firstName();
+import fakerdeCH = require('faker/locale/de_CH');
+resultStr = fakerdeCH.name.firstName();
 import fakerEn = require('faker/locale/en');
-resultStr = faker.name.firstName();
+resultStr = fakerEn.name.firstName();
+import fakerEnAU = require('faker/locale/en_AU');
+resultStr = fakerEnAU.name.firstName();
+import fakerEnBORK = require('faker/locale/en_BORK');
+resultStr = fakerEnBORK.name.firstName();
+import fakerEnCA = require('faker/locale/en_CA');
+resultStr = fakerEnCA.name.firstName();
+import fakerEnGB = require('faker/locale/en_GB');
+resultStr = fakerEnGB.name.firstName();
+import fakerEnIE = require('faker/locale/en_IE');
+resultStr = fakerEnIE.name.firstName();
+import fakerEnIND = require('faker/locale/en_IND');
+resultStr = fakerEnIND.name.firstName();
+import fakerEnUS = require('faker/locale/en_US');
+resultStr = fakerEnUS.name.firstName();
+import fakerEnAuOcker = require('faker/locale/en_au_ocker');
+resultStr = fakerEnAuOcker.name.firstName();
+import fakerEs = require('faker/locale/es');
+resultStr = fakerEs.name.firstName();
+import fakerEsMX = require('faker/locale/es_MX');
+resultStr = fakerEsMX.name.firstName();
+import fakerFa = require('faker/locale/fa');
+resultStr = fakerFa.name.firstName();
+import fakerFr = require('faker/locale/fr');
+resultStr = fakerFr.name.firstName();
+import fakerFrCA = require('faker/locale/fr_CA');
+resultStr = fakerFrCA.name.firstName();
+import fakerGe = require('faker/locale/ge');
+resultStr = fakerGe.name.firstName();
+import fakerIdID = require('faker/locale/id_ID');
+resultStr = fakerIdID.name.firstName();
+import fakerIt = require('faker/locale/it');
+resultStr = fakerIt.name.firstName();
+import fakerJa = require('faker/locale/ja');
+resultStr = fakerJa.name.firstName();
+import fakerKo = require('faker/locale/ko');
+resultStr = fakerKo.name.firstName();
+import fakerNbNO = require('faker/locale/nb_NO');
+resultStr = fakerNbNO.name.firstName();
+import fakerNep = require('faker/locale/nep');
+resultStr = fakerNep.name.firstName();
+import fakerNl = require('faker/locale/nl');
+resultStr = fakerNl.name.firstName();
+import fakerPl = require('faker/locale/pl');
+resultStr = fakerPl.name.firstName();
+import fakerPtBR = require('faker/locale/pt_BR');
+resultStr = fakerPtBR.name.firstName();
+import fakerRu = require('faker/locale/ru');
+resultStr = fakerRu.name.firstName();
+import fakerSk = require('faker/locale/sk');
+resultStr = fakerSk.name.firstName();
+import fakerSv = require('faker/locale/sv');
+resultStr = fakerSv.name.firstName();
+import fakerTr = require('faker/locale/tr');
+resultStr = fakerTr.name.firstName();
+import fakerUk = require('faker/locale/uk');
+resultStr = fakerUk.name.firstName();
+import fakerVi = require('faker/locale/vi');
+resultStr = fakerVi.name.firstName();
+import fakerZhCN = require('faker/locale/zh_CN');
+resultStr = fakerZhCN.name.firstName();
+import fakerZhTW = require('faker/locale/zh_TW');
+resultStr = fakerZhTW.name.firstName();
diff --git a/types/faker/index.d.ts b/types/faker/index.d.ts
index eda944d515..552e7d3eeb 100644
--- a/types/faker/index.d.ts
+++ b/types/faker/index.d.ts
@@ -1,9 +1,12 @@
-// Type definitions for faker v4.1.0
+// Type definitions for faker 4.1
 // Project: http://marak.com/faker.js/
-// Definitions by: Ben Swartz <https://github.com/bensw>, Bas Pennings <https://github.com/basp>, Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions by: Ben Swartz <https://github.com/bensw>,
+//                 Bas Pennings <https://github.com/basp>,
+//                 Yuki Kokubun <https://github.com/Kuniwak>,
+//                 Matt Bishop <https://github.com/mattbishop>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var fakerStatic: Faker.FakerStatic;
+declare const fakerStatic: Faker.FakerStatic;
 
 declare namespace Faker {
 	interface FakerStatic {
@@ -64,6 +67,7 @@ declare namespace Faker {
 			future(years?: number, refDate?: string|Date): Date;
 			between(from: string|number|Date, to: string|Date): Date;
 			recent(days?: number): Date;
+			soon(days?: number): Date;
 			month(options?: { abbr?: boolean, context?: boolean }): string;
 			weekday(options?: { abbr?: boolean, context?: boolean }): string;
 		};
@@ -74,12 +78,14 @@ declare namespace Faker {
 			account(length?: number): string;
 			accountName(): string;
 			mask(length?: number, parens?: boolean, elipsis?: boolean): string;
-			amount(min?:number, max?: number, dec?: number, symbol?: string): string;
+			amount(min?: number, max?: number, dec?: number, symbol?: string): string;
 			transactionType(): string;
 			currencyCode(): string;
 			currencyName(): string;
 			currencySymbol(): string;
 			bitcoinAddress(): string;
+			ethereumAddress(): string;
+			iban(formatted?: boolean): string
 			bic(): string
 		};
 
@@ -101,13 +107,12 @@ declare namespace Faker {
 			shuffle<T>(o: T[]): T[];
 			shuffle(): string[];
 			mustache(str: string, data: { [key: string]: string|((substring: string, ...args: any[]) => string) }): string;
-			createCard(): Faker.Card;
-			contextualCard(): Faker.ContextualCard;
-			userCard(): Faker.UserCard;
-			createTransaction(): Faker.Transaction;
+			createCard(): Card;
+			contextualCard(): ContextualCard;
+			userCard(): UserCard;
+			createTransaction(): Transaction;
 		};
 
-
 		image: {
 			image(): string;
 			avatar(): string;
@@ -186,11 +191,12 @@ declare namespace Faker {
 			objectElement<T>(object?: { [key: string]: T }, field?: any): T;
 			uuid(): string;
 			boolean(): boolean;
-			word(): string; // TODO: have ability to return specific type of word? As in: noun, adjective, verb, etc
+			word(type?: string): string;
 			words(count?: number): string;
 			image(): string;
 			locale(): string;
 			alphaNumeric(count?: number): string;
+			hexaDecimal(count?: number): string;
 		};
 
 		system: {
@@ -201,8 +207,8 @@ declare namespace Faker {
 			commonFileExt(): string;
 			fileType(): string;
 			fileExt(mimeType: string): string;
-			//directoryPath(): string;
-			//filePath(): string;
+			directoryPath(): string;
+			filePath(): string;
 			semver(): string;
 		};
 
@@ -315,10 +321,6 @@ declare module "faker/locale/de_CH" {
 	export = fakerStatic;
 }
 
-declare module "faker/locale/el_GR" {
-	export = fakerStatic;
-}
-
 declare module "faker/locale/en" {
 	export = fakerStatic;
 }
diff --git a/types/faker/tslint.json b/types/faker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/faker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/faker/v3/tslint.json b/types/faker/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/faker/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/falcor-express/index.d.ts b/types/falcor-express/index.d.ts
index 172813baa1..7bd42aa1d8 100644
--- a/types/falcor-express/index.d.ts
+++ b/types/falcor-express/index.d.ts
@@ -2,11 +2,10 @@
 // Project: https://github.com/Netflix/falcor-express
 // Definitions by: Quramy <https://github.com/Quramy>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="falcor" />
 
-
-
 import { Request, Response, Handler } from 'express';
 import {DataSource} from 'falcor';
 declare function dataSourceRoute(getDataSource: (req: Request, res: Response) => DataSource): Handler;
diff --git a/types/falcor-express/tslint.json b/types/falcor-express/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/falcor-express/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/falcor-http-datasource/tslint.json b/types/falcor-http-datasource/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/falcor-http-datasource/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/falcor-json-graph/tslint.json b/types/falcor-json-graph/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/falcor-json-graph/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/falcor-router/tslint.json b/types/falcor-router/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/falcor-router/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/famous/tslint.json b/types/famous/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/famous/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fancy-log/fancy-log-tests.ts b/types/fancy-log/fancy-log-tests.ts
new file mode 100644
index 0000000000..581f75e42a
--- /dev/null
+++ b/types/fancy-log/fancy-log-tests.ts
@@ -0,0 +1,26 @@
+import log = require('fancy-log');
+
+log();
+log(1);
+log('foo');
+log('foo', 'bar');
+
+log.dir();
+log.dir(1);
+log.dir('foo');
+log.dir('foo', 'bar');
+
+log.error();
+log.error(1);
+log.error('foo');
+log.error('foo', 'bar');
+
+log.info();
+log.info(1);
+log.info('foo');
+log.info('foo', 'bar');
+
+log.warn();
+log.warn(1);
+log.warn('foo');
+log.warn('foo', 'bar');
diff --git a/types/fancy-log/index.d.ts b/types/fancy-log/index.d.ts
new file mode 100644
index 0000000000..2fbdb3f0d2
--- /dev/null
+++ b/types/fancy-log/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for fancy-log 1.3
+// Project: https://github.com/js-cli/fancy-log
+// Definitions by: Pine Mizune <https://github.com/pine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace FancyLog {
+    interface Logger {
+        (...args: any[]): Logger;
+        dir(...args: any[]): Logger;
+        error(...args: any[]): Logger;
+        info(...args: any[]): Logger;
+        warn(...args: any[]): Logger;
+    }
+}
+
+declare var logger: FancyLog.Logger;
+export = logger;
diff --git a/types/fancy-log/tsconfig.json b/types/fancy-log/tsconfig.json
new file mode 100644
index 0000000000..0ef3d95d9e
--- /dev/null
+++ b/types/fancy-log/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fancy-log-tests.ts"
+    ]
+}
diff --git a/types/fancy-log/tslint.json b/types/fancy-log/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fancy-log/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/farbtastic/tslint.json b/types/farbtastic/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/farbtastic/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fast-levenshtein/tslint.json b/types/fast-levenshtein/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fast-levenshtein/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fast-stats/tslint.json b/types/fast-stats/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fast-stats/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fastclick/tslint.json b/types/fastclick/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fastclick/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/favico.js/tslint.json b/types/favico.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/favico.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fb/index.d.ts b/types/fb/index.d.ts
index a968d9f3c0..d48aedee8a 100644
--- a/types/fb/index.d.ts
+++ b/types/fb/index.d.ts
@@ -83,12 +83,20 @@ interface FeedDialogParams {
 	ref?: any;
 }
 
-declare type FBUIParams = ShareDialogParams
-                        | PageTabDialogParams
-                        | RequestsDialogParams
-                        | SendDialogParams
-                        | PayDialogParams
-                        | FeedDialogParams;
+interface LiveDialogParams {
+	redirect_uri?: string;
+	method: string;
+	display: string;
+	phase: string;
+	broadcast_data?: LiveDialogResponse;
+}
+
+interface LiveDialogResponse {
+	id: string;
+	stream_url: string;
+	secure_stream_url: string;
+	status: string;
+}
 
 interface FBLoginOptions{
     auth_type?: string;
@@ -201,8 +209,14 @@ interface FBSDK{
     api(path: string, params: any, callback: (response: any) => void): void;
     api(path: string, method: ApiMethod, params: any, callback: (response: any) => void): void;
 
-    /* This method is used to trigger different forms of Facebook created UI dialogs. */
-    ui(params : FBUIParams, handler : (fbResponseObject : Object) => any) : void;
+    /* These methods are used to trigger different forms of Facebook-created UI dialogs. */
+    ui(params : ShareDialogParams, handler : (fbResponseObject : Object) => any) : void;
+    ui(params : PageTabDialogParams, handler : (fbResponseObject : Object) => any) : void;
+    ui(params : RequestsDialogParams, handler : (fbResponseObject : Object) => any) : void;
+    ui(params : SendDialogParams, handler : (fbResponseObject : Object) => any) : void;
+    ui(params : PayDialogParams, handler : (fbResponseObject : Object) => any) : void;
+    ui(params : FeedDialogParams, handler : (fbResponseObject : Object) => any) : void;
+    ui(params : LiveDialogParams, handler : (fbResponseObject : LiveDialogResponse) => any) : void;
 
     /* Allows you to determine if a user is logged in to Facebook and has authenticated your app */
     getLoginStatus(handler : (fbResponseObject : FB.LoginStatusResponse) => any, force?: Boolean) : void;
diff --git a/types/fb/tslint.json b/types/fb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fbemitter/tslint.json b/types/fbemitter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fbemitter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/featherlight/tslint.json b/types/featherlight/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/featherlight/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fecha/fecha-tests.ts b/types/fecha/fecha-tests.ts
deleted file mode 100644
index 0d0ce48638..0000000000
--- a/types/fecha/fecha-tests.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import fecha = require('fecha');
-
-// test fecha.parse
-fecha.parse("February 3rd, 2014", "MMMM Do, YYYY");
-fecha.parse("5/3/98", "shortDate");
-
-// test override fecha.i18n
-fecha.i18n = {
-  dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thur", "Fri", "Sat"],
-  dayNames: [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
-  monthNamesShort: [
-    "Jan",
-    "Feb",
-    "Mar",
-    "Apr",
-    "May",
-    "Jun",
-    "Jul",
-    "Aug",
-    "Sep",
-    "Oct",
-    "Nov",
-    "Dec"
-  ],
-  monthNames: [
-    "January",
-    "February",
-    "March",
-    "April",
-    "May",
-    "June",
-    "July",
-    "August",
-    "September",
-    "October",
-    "November",
-    "December"
-  ],
-  amPm: ["am", "pm"],
-  DoFn(D: number) {
-    return D + "th";
-  }
-};
-
-// just change one default mask
-fecha.masks.shortDate = "M/D/YY";
-
-// test override fecha.masks with an object. Must implement all keys.
-// if you want to implement partially, use
-// fecha.masks = Object.assign(fecha.masks, {shortDate: 'M/D/YY'}) for example.
-fecha.masks = {
-  default: "ddd MMM DD YYYY HH:mm:ss",
-  shortDate: "M/D/YY",
-  mediumDate: "MMM D, YYYY",
-  longDate: "MMMM D, YYYY",
-  fullDate: "dddd, MMMM D, YYYY",
-  shortTime: "HH:mm",
-  mediumTime: "HH:mm:ss",
-  longTime: "HH:mm:ss.SSS"
-};
-
-// test add custom named mask.
-// fecha.masks.myMask = "HH:mm:ss YY/MM/DD"; does not work for now.
-fecha.masks['myMask'] = "HH:mm:ss YY/MM/DD";
-
-// test fecha.format without i18nSettings, with Date object.
-fecha.format(new Date(2014, 5, 6, 14, 10, 45), "myMask");
-
-// test fecha.format without i18nSettings with number.
-fecha.format(Date.now(), "myMask");
-
-// test override i18nSettings with fecha.format
-fecha.format(new Date(2014, 5, 6, 14, 10, 45), "myMask", {
-  dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thur", "Fri", "Sat"],
-  dayNames: [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
-  monthNamesShort: [
-    "Jan",
-    "Feb",
-    "Mar",
-    "Apr",
-    "May",
-    "Jun",
-    "Jul",
-    "Aug",
-    "Sep",
-    "Oct",
-    "Nov",
-    "Dec"
-  ],
-  monthNames: [
-    "January",
-    "February",
-    "March",
-    "April",
-    "May",
-    "June",
-    "July",
-    "August",
-    "September",
-    "October",
-    "November",
-    "December"
-  ],
-  amPm: ["am", "pm"],
-  DoFn(D: number) {
-    return D + "th";
-  }
-});
diff --git a/types/fecha/index.d.ts b/types/fecha/index.d.ts
deleted file mode 100644
index f68d26a316..0000000000
--- a/types/fecha/index.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for fecha 2.3
-// Project: https://github.com/taylorhakes/fecha
-// Definitions by: Goh Yisheng <https://github.com/9y5>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export type Days = [string, string, string, string, string, string, string];
-
-export type Months = [
-    string,
-    string,
-    string,
-    string,
-    string,
-    string,
-    string,
-    string,
-    string,
-    string,
-    string,
-    string
-];
-
-export interface i18nSettings {
-    amPm: [string, string];
-    dayNames: Days;
-    dayNamesShort: Days;
-    monthNames: Months;
-    monthNamesShort: Months;
-    DoFn(D: number): string;
-}
-
-export interface Masks {
-    default: string;
-    fullDate: string;
-    longDate: string;
-    longTime: string;
-    mediumDate: string;
-    mediumTime: string;
-    shortDate: string;
-    shortTime: string;
-    [myMask: string]: string;
-}
-
-export let masks: Masks;
-
-export let i18n: i18nSettings;
-
-export function format(dateObj: Date | number, mask: string, i18nSettings?: i18nSettings): string;
-
-export function parse(dateStr: string, format: string, i18nSettings?: i18nSettings): Date;
-
-export as namespace Fecha;
diff --git a/types/fecha/tsconfig.json b/types/fecha/tsconfig.json
deleted file mode 100644
index 8582f99228..0000000000
--- a/types/fecha/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fecha-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/feedparser/feedparser-tests.ts b/types/feedparser/feedparser-tests.ts
new file mode 100644
index 0000000000..25d652de8c
--- /dev/null
+++ b/types/feedparser/feedparser-tests.ts
@@ -0,0 +1,32 @@
+import request = require('request');
+import * as FeedParser from "feedparser";
+
+const req = request('https://news.google.com/news?cf=all&hl=en&pz=1&ned=us&output=rss');
+const feedparser = new FeedParser({});
+
+req.on("error", error => {
+  // handle any request errors
+});
+
+req.on("response", res => {
+  if (res.statusCode !== 200) {
+    req.emit('error', new Error('Bad status code'));
+  } else {
+    req.pipe(feedparser);
+  }
+});
+
+feedparser.on('error', (error: Error) => {
+  // always handle errors
+});
+
+feedparser.on('readable', () => {
+  // This is where the action is!
+  const stream = feedparser;
+  const meta = feedparser.meta; // **NOTE** the "meta" is always available in the context of the feedparser instance
+  let item: FeedParser.Item;
+
+  while (item = stream.read()) {
+    console.log(item);
+  }
+});
diff --git a/types/feedparser/index.d.ts b/types/feedparser/index.d.ts
new file mode 100644
index 0000000000..75f3dde979
--- /dev/null
+++ b/types/feedparser/index.d.ts
@@ -0,0 +1,168 @@
+// Type definitions for feedparser 2.2
+// Project: https://github.com/danmactough/node-feedparser
+// Definitions by: Juan J. Jimenez-Anca <https://github.com/cortopy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/** Declaration file generated by dts-gen */
+
+/// <reference types="node" />
+
+import stream = require('stream');
+import { SAXStream } from 'sax';
+export = FeedParser;
+
+declare class FeedParser extends stream.Duplex {
+    constructor(options: FeedParser.Options);
+    options: FeedParser.Options;
+    stream: SAXStream;
+    meta: {
+        [key: string]: any
+    };
+    _emitted_meta: boolean;
+    stack: any[];
+    xmlbase: any[];
+    in_xhtml: boolean;
+    xhtml: {
+        [key: string]: any
+    };
+    errors: Error[];
+
+    addListener(ev: any, fn: any): any;
+
+    cork(): void;
+
+    eventNames(): any;
+
+    getMaxListeners(): any;
+
+    handleAttributes(attrs: FeedParser.Attrs, el: string): any;
+
+    handleCloseTag(el: string): void;
+
+    handleEnd(): any;
+
+    handleError(e: Error): void;
+
+    handleItem(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Item;
+
+    handleMeta(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Meta;
+
+    handleOpenTag(node: FeedParser.Node): void;
+
+    handleProcessingInstruction(node: FeedParser.Node): void;
+
+    handleSaxError(e: Error): void;
+
+    handleText(text: string): void;
+
+    init(): void;
+
+    isPaused(): any;
+
+    listenerCount(type: FeedParser.Type): any;
+
+    listeners(type: FeedParser.Type): any;
+
+    on(ev: any, fn: any): any;
+
+    pause(): any;
+
+    pipe(dest: any, pipeOpts: any): any;
+
+    push(chunk: any, encoding: any): any;
+
+    read(n?: number): FeedParser.Item;
+
+    removeAllListeners(type: FeedParser.Type, ...args: any[]): any;
+
+    resume(): any;
+
+    resumeSaxError(): void;
+
+    setDefaultEncoding(encoding: any): any;
+
+    setEncoding(enc: any): any;
+
+    setMaxListeners(n: any): any;
+
+    uncork(): void;
+
+    unpipe(dest: any): any;
+
+    unshift(chunk: any): any;
+
+    wrap(stream: SAXStream, ...args: any[]): any;
+
+    private _transform(data: any, encoding: string, done: () => any): void;
+    private _flush(done: () => any): void;
+}
+
+declare namespace FeedParser {
+    type Type = "atom" | "rss" | "rdf";
+
+    interface Options {
+        normalize?: boolean;
+        addmeta?: boolean;
+        feedurl?: string;
+        resume_saxerror?: boolean;
+        MAX_BUFFER_LENGTH?: number;
+    }
+
+    interface Node {
+        [key: string]: any;
+    }
+
+    interface Attrs {
+        name: string;
+        value: any;
+        prefix: string;
+        local: string;
+        uri: string;
+    }
+
+    interface NS {
+        [key: string]: string;
+    }
+
+    interface Image {
+        url: string;
+        title: string;
+    }
+
+    interface Meta {
+        "#ns": NS[];
+        "#type": Type;
+        "#version": string;
+        title: string;
+        description: string;
+        date: Date | null;
+        pubdate: Date | null;
+        link: string;
+        xmlurl: string;
+        author: string;
+        language: string;
+        image: Image;
+        favicon: string;
+        copyright: string;
+        generator: string;
+        categories: string[];
+    }
+
+    interface Item {
+        title: string;
+        description: string;
+        summary: string;
+        date: Date | null;
+        pubdate: Date | null;
+        link: string;
+        origlink: string;
+        author: string;
+        guid: string;
+        comments: string;
+        image: Image;
+        categories: string[];
+        enclosures: string[];
+        meta: Meta;
+    }
+}
diff --git a/types/feedparser/tsconfig.json b/types/feedparser/tsconfig.json
new file mode 100644
index 0000000000..683adf9415
--- /dev/null
+++ b/types/feedparser/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "feedparser-tests.ts"
+    ]
+}
diff --git a/types/node-feedparser/tslint.json b/types/feedparser/tslint.json
similarity index 100%
rename from types/node-feedparser/tslint.json
rename to types/feedparser/tslint.json
diff --git a/types/fetch-mock/fetch-mock-tests.ts b/types/fetch-mock/fetch-mock-tests.ts
index cfd595cb16..459c8e1076 100644
--- a/types/fetch-mock/fetch-mock-tests.ts
+++ b/types/fetch-mock/fetch-mock-tests.ts
@@ -1,6 +1,11 @@
 import * as fetchMock from "fetch-mock";
 
 fetchMock.mock("http://test.com", 200);
+fetchMock.mock("http://test.com", 200, {
+    headers: {
+        test: "header"
+    }
+});
 fetchMock.mock(/test\.com/, 200);
 fetchMock.mock(() => true, 200);
 fetchMock.mock((url, opts) => true, 200);
diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index 4b89b1decd..13563277b4 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -12,8 +12,6 @@ declare namespace fetchMock {
 
     /**
      * Mock matcher function
-     * @param url
-     * @param opts
      */
     type MockMatcherFunction = (url: string, opts: MockRequest) => boolean;
     /**
@@ -77,8 +75,6 @@ declare namespace fetchMock {
                         | MockResponseObject | Promise<MockResponseObject>;
     /**
      * Mock response function
-     * @param url
-     * @param opts
      */
     type MockResponseFunction = (url: string, opts: MockRequest) => MockResponse;
 
@@ -100,6 +96,10 @@ declare namespace fetchMock {
          * http method to match
          */
         method?: string;
+        /**
+         * key/value map of headers to match
+         */
+        headers?: { [key: string]: string };
         /**
          * as specified above
          */
diff --git a/types/ffi/ffi-tests.ts b/types/ffi/ffi-tests.ts
index c83e57089c..a08bc299e2 100644
--- a/types/ffi/ffi-tests.ts
+++ b/types/ffi/ffi-tests.ts
@@ -5,102 +5,102 @@ import Union = require('ref-union');
 import TArray = require('ref-array');
 
 {
-    var sqlite3 = ref.types.void;
-    var sqlite3Ptr = ref.refType(sqlite3);
-    var sqlite3PtrPtr = ref.refType(sqlite3Ptr);
-    var stringPtr = ref.refType(ref.types.CString);
+    const sqlite3 = ref.types.void;
+    const sqlite3Ptr = ref.refType(sqlite3);
+    const sqlite3PtrPtr = ref.refType(sqlite3Ptr);
+    const stringPtr = ref.refType(ref.types.CString);
 
-    var libsqlite3 = ffi.Library('libsqlite3', {
-      'sqlite3_open': [ 'int', [ 'string', sqlite3PtrPtr ] ],
-      'sqlite3_close': [ 'int', [ sqlite3PtrPtr ] ],
-      'sqlite3_exec': [ 'int', [ sqlite3PtrPtr, 'string', 'pointer', 'pointer', stringPtr ] ],
-      'sqlite3_changes': [ 'int', [ sqlite3PtrPtr ]]
+    const libsqlite3 = ffi.Library('libsqlite3', {
+      sqlite3_open: [ 'int', [ 'string', sqlite3PtrPtr ] ],
+      sqlite3_close: [ 'int', [ sqlite3PtrPtr ] ],
+      sqlite3_exec: [ 'int', [ sqlite3PtrPtr, 'string', 'pointer', 'pointer', stringPtr ] ],
+      sqlite3_changes: [ 'int', [ sqlite3PtrPtr ]]
     });
 
-    var dbPtrPtr = ref.alloc(sqlite3PtrPtr);
+    const dbPtrPtr = ref.alloc(sqlite3PtrPtr);
     libsqlite3.sqlite3_open("test.sqlite3", dbPtrPtr);
 }
 {
-    var func = ffi.ForeignFunction(new Buffer(10), 'int', [ 'int' ]);
+    const func = ffi.ForeignFunction(new Buffer(10), 'int', [ 'int' ]);
     func(-5);
-    func.async(-5, function(err: any, res: any) {});
+    func.async(-5, (err: any, res: any) => {});
 }
 {
-    var funcPtr = ffi.Callback('int', [ 'int' ], Math.abs);
-    var func    = ffi.ForeignFunction(funcPtr, 'int', [ 'int' ]);
+    const funcPtr = ffi.Callback('int', [ 'int' ], Math.abs);
+    const func    = ffi.ForeignFunction(funcPtr, 'int', [ 'int' ]);
 }
 {
-    var printfPointer = ffi.DynamicLibrary().get('printf');
-    var printfGen = ffi.VariadicForeignFunction(printfPointer, 'void', [ 'string' ]);
+    const printfPointer = ffi.DynamicLibrary().get('printf');
+    const printfGen = ffi.VariadicForeignFunction(printfPointer, 'void', [ 'string' ]);
     printfGen()('Hello World!\n');
     printfGen('int')('This is an int: %d\n', 10);
     printfGen('string')('This is a string: %s\n', 'hello');
 }
 {
     ref.address(new Buffer(1));
-    var intBuf = ref.alloc(ref.types.int);
-    var intWith4 = ref.alloc(ref.types.int, 4);
-    var buf0 = ref.allocCString('hello world');
-    var type = ref.coerceType('int **');
-    var val = ref.deref(intBuf);
+    const intBuf = ref.alloc(ref.types.int);
+    const intWith4 = ref.alloc(ref.types.int, 4);
+    const buf0 = ref.allocCString('hello world');
+    const type = ref.coerceType('int **');
+    const val = ref.deref(intBuf);
 }
 {
     ref.isNull(new Buffer(1));
 }
 {
-    var str = ref.readCString(new Buffer('hello\0world\0'), 0);
-    var buf = ref.alloc('int64');
+    const str = ref.readCString(new Buffer('hello\0world\0'), 0);
+    const buf = ref.alloc('int64');
     ref.writeInt64BE(buf, 0, '9223372036854775807');
-    var val = ref.readInt64BE(buf, 0)
+    const val = ref.readInt64BE(buf, 0);
 }
 {
-    var voidPtrType = ref.refType(ref.types.void);
-    var buf = ref.alloc('int64');
+    const voidPtrType = ref.refType(ref.types.void);
+    const buf = ref.alloc('int64');
     ref.writeInt64LE(buf, 0, '9223372036854775807');
 }
 {
-    var S1 = Struct({ a: ref.types.int });
-    var S2 = new Struct({ a: 'int' });
+    const S1 = Struct({ a: ref.types.int });
+    const S2 = new Struct({ a: 'int' });
 }
 {
-    var P = new Struct;
+    const P = new Struct();
     P.defineProperty('a', ref.types.int);
     P.defineProperty('d', 'long');
 }
 {
-    var SimpleStruct = Struct({
+    const SimpleStruct = Struct({
         first : ref.types.byte,
         last  : ref.types.byte
     });
 
-    var ss = new SimpleStruct({ first: 50, last: 100 });
+    const ss = new SimpleStruct({ first: 50, last: 100 });
     ss.first += 200;
 }
 {
-    var ST = Struct();
-    var test: ref.Type = ST.fields['t'].type;
+    const ST = Struct();
+    const test: ref.Type = ST.fields['t'].type;
 }
 {
-    var CharArray = TArray('char');
-    var b = new Buffer('hello', 'ascii');
-    var a = new CharArray(b);
+    const CharArray = TArray('char');
+    const b = new Buffer('hello', 'ascii');
+    const a = new CharArray(b);
 }
 {
-    var Int32Array = TArray(ref.types.int32);
-    var input = [1, 4, 91, 123123, 5123512, 0, -1];
-    var a = new Int32Array(input);
+    const Int32Array = TArray(ref.types.int32);
+    const input = [1, 4, 91, 123123, 5123512, 0, -1];
+    const a = new Int32Array(input);
 }
 {
-    var int = ref.types.int;
-    var IntArray = TArray(int);
+    const int = ref.types.int;
+    const IntArray = TArray(int);
 
-    var buf = new Buffer(int.size * 3);
+    const buf = new Buffer(int.size * 3);
     int.set(buf, int.size * 0, 5);
     int.set(buf, int.size * 1, 8);
     int.set(buf, int.size * 2, 0);
 
-    var array = IntArray.untilZeros(buf);
+    const array = IntArray.untilZeros(buf);
 }
 {
-    var refCharArr = TArray('char')([1, 3, 5], 2).ref();
+    const refCharArr = TArray('char')([1, 3, 5], 2).ref();
 }
diff --git a/types/ffi/index.d.ts b/types/ffi/index.d.ts
index 19107f373e..76e197e841 100644
--- a/types/ffi/index.d.ts
+++ b/types/ffi/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for node-ffi
+// Type definitions for node-ffi 0.1
 // Project: https://github.com/rbranson/node-ffi
 // Definitions by: Paul Loyd <https://github.com/loyd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
@@ -10,7 +11,7 @@ import ref = require('ref');
 import StructType = require('ref-struct');
 
 /** Provides a friendly API on-top of `DynamicLibrary` and `ForeignFunction`. */
-export var Library: {
+export interface Library {
     /** The extension to use on libraries. */
     EXT: string;
 
@@ -19,15 +20,16 @@ export var Library: {
      * @param funcs hash of [retType, [...argType], opts?: {abi?, async?, varargs?}]
      * @param lib hash that will be extended
      */
-    new (libFile: string, funcs?: {[key: string]: any[]}, lib?: Object): any;
+    new (libFile: string, funcs?: {[key: string]: any[]}, lib?: object): any;
 
     /**
      * @param libFile name of library
      * @param funcs hash of [retType, [...argType], opts?: {abi?, async?, varargs?}]
      * @param lib hash that will be extended
      */
-    (libFile: string, funcs?: {[key: string]: any[]}, lib?: Object): any;
-};
+    (libFile: string, funcs?: {[key: string]: any[]}, lib?: object): any;
+}
+export const Library: Library;
 
 /** Get value of errno. */
 export function errno(): number;
@@ -48,11 +50,9 @@ export interface Function extends ref.Type {
 }
 
 /** Creates and returns a type for a C function pointer. */
-export var Function: {
-    new (retType: ref.Type, argTypes: any[], abi?: number): Function;
-    new (retType: string, argTypes: any[], abi?: number): Function;
-    (retType: ref.Type, argTypes: any[], abi?: number): Function;
-    (retType: string, argTypes: any[], abi?: number): Function;
+export const Function: {
+    new (retType: ref.Type | string, argTypes: any[], abi?: number): Function;
+    (retType: ref.Type | string, argTypes: any[], abi?: number): Function;
 };
 
 export interface ForeignFunction {
@@ -66,12 +66,10 @@ export interface ForeignFunction {
  * function into native types and also unmarshalling the return from function
  * execution.
  */
-export var ForeignFunction: {
-    new (ptr: Buffer, retType: ref.Type, argTypes: any[], abi?: number): ForeignFunction;
-    new (ptr: Buffer, retType: string, argTypes: any[], abi?: number): ForeignFunction;
-    (ptr: Buffer, retType: ref.Type, argTypes: any[], abi?: number): ForeignFunction;
-    (ptr: Buffer, retType: string, argTypes: any[], abi?: number): ForeignFunction;
-}
+export const ForeignFunction: {
+    new (ptr: Buffer, retType: ref.Type | string, argTypes: any[], abi?: number): ForeignFunction;
+    (ptr: Buffer, retType: ref.Type | string, argTypes: any[], abi?: number): ForeignFunction;
+};
 
 export interface VariadicForeignFunction {
     /**
@@ -95,11 +93,9 @@ export interface VariadicForeignFunction {
  * This function takes care of caching and reusing `ForeignFunction` instances that
  * contain the same ffi_type argument signature.
  */
-export var VariadicForeignFunction: {
-    new (ptr: Buffer, ret: ref.Type, fixedArgs: any[], abi?: number): VariadicForeignFunction;
-    new (ptr: Buffer, ret: string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
-    (ptr: Buffer, ret: ref.Type, fixedArgs: any[], abi?: number): VariadicForeignFunction;
-    (ptr: Buffer, ret: string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
+export const VariadicForeignFunction: {
+    new (ptr: Buffer, ret: ref.Type | string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
+    (ptr: Buffer, ret: ref.Type | string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
 };
 
 export interface DynamicLibrary {
@@ -118,7 +114,7 @@ export interface DynamicLibrary {
  * call `get___` on the pointer to dereference it into its actual value, or
  * turn the pointer into a callable function with `ForeignFunction`.
  */
-export var DynamicLibrary: {
+export const DynamicLibrary: {
     FLAGS: {
         RTLD_LAZY: number;
         RTLD_NOW: number;
@@ -139,46 +135,44 @@ export var DynamicLibrary: {
  * The function pointer may be used in other C functions that
  * accept C callback functions.
  */
-export var Callback: {
+export const Callback: {
     new (retType: any, argTypes: any[], abi: number, fn: any): Buffer;
     new (retType: any, argTypes: any[], fn: any): Buffer;
     (retType: any, argTypes: any[], abi: number, fn: any): Buffer;
     (retType: any, argTypes: any[], fn: any): Buffer;
-}
+};
 
-export var ffiType: {
+export const ffiType: {
     /** Get a `ffi_type *` Buffer appropriate for the given type. */
-    (type: ref.Type): Buffer
-    /** Get a `ffi_type *` Buffer appropriate for the given type. */
-    (type: string): Buffer
+    (type: ref.Type | string): Buffer
     FFI_TYPE: StructType;
-}
+};
 
-export var CIF: (retType: any, types: any[], abi?: any) => Buffer
-export var CIF_var: (retType: any, types: any[], numFixedArgs: number, abi?: any) => Buffer;
-export var HAS_OBJC: boolean;
-export var FFI_TYPES: {[key: string]: Buffer};
-export var FFI_OK: number;
-export var FFI_BAD_TYPEDEF: number;
-export var FFI_BAD_ABI: number;
-export var FFI_DEFAULT_ABI: number;
-export var FFI_FIRST_ABI: number;
-export var FFI_LAST_ABI: number;
-export var FFI_SYSV: number;
-export var FFI_UNIX64: number;
-export var RTLD_LAZY: number;
-export var RTLD_NOW: number;
-export var RTLD_LOCAL: number;
-export var RTLD_GLOBAL: number;
-export var RTLD_NOLOAD: number;
-export var RTLD_NODELETE: number;
-export var RTLD_NEXT: Buffer;
-export var RTLD_DEFAULT: Buffer;
-export var LIB_EXT: string;
-export var FFI_TYPE: StructType;
+export function CIF(retType: any, types: any[], abi?: any): Buffer;
+export function CIF_var(retType: any, types: any[], numFixedArgs: number, abi?: any): Buffer;
+export const HAS_OBJC: boolean;
+export const FFI_TYPES: {[key: string]: Buffer};
+export const FFI_OK: number;
+export const FFI_BAD_TYPEDEF: number;
+export const FFI_BAD_ABI: number;
+export const FFI_DEFAULT_ABI: number;
+export const FFI_FIRST_ABI: number;
+export const FFI_LAST_ABI: number;
+export const FFI_SYSV: number;
+export const FFI_UNIX64: number;
+export const RTLD_LAZY: number;
+export const RTLD_NOW: number;
+export const RTLD_LOCAL: number;
+export const RTLD_GLOBAL: number;
+export const RTLD_NOLOAD: number;
+export const RTLD_NODELETE: number;
+export const RTLD_NEXT: Buffer;
+export const RTLD_DEFAULT: Buffer;
+export const LIB_EXT: string;
+export const FFI_TYPE: StructType;
 
 /** Default types. */
-export var types: {
+export const types: {
     void: ref.Type;                 int64: ref.Type;                 ushort: ref.Type;
     int: ref.Type;                  uint64: ref.Type;                float: ref.Type;
     uint: ref.Type;                 long: ref.Type;                  double: ref.Type;
@@ -189,4 +183,3 @@ export var types: {
     int32: ref.Type;                uchar: ref.Type;                 size_t: ref.Type;
     uint32: ref.Type;               short: ref.Type;
 };
-
diff --git a/types/ffi/node-ffi-buffer.d.ts b/types/ffi/node-ffi-buffer.d.ts
index 5203a2d9ee..fa817e1662 100644
--- a/types/ffi/node-ffi-buffer.d.ts
+++ b/types/ffi/node-ffi-buffer.d.ts
@@ -28,32 +28,23 @@ interface Buffer {
 	/** Shorthand for `ref.reinterpretUntilZeros`. */
 	reinterpretUntilZeros(size: number, offset?: number): Buffer;
 	/** Shorthand for `ref.writeCString`. */
-	writeCString(offset: number, string: string, encoding?: string): void;
+	writeCString(offset: number, input: string, encoding?: string): void;
 	/** Shorthand for `ref.writeInt64BE`. */
-	writeInt64BE(offset: number, input: number): any;
-	/** Shorthand for `ref.writeInt64BE`. */
-	writeInt64BE(offset: number, input: string): any;
+	writeInt64BE(offset: number, input: number | string): any;
 	/** Shorthand for `ref.writeInt64LE`. */
-	writeInt64LE(offset: number, input: number): any;
-	/** Shorthand for `ref.writeInt64LE`. */
-	writeInt64LE(offset: number, input: string): any;
+	writeInt64LE(offset: number, input: number | string): any;
 	/** Shorthand for `ref.writeObject`. */
-	writeObject(offset: number, object: Object): void;
+	writeObject(offset: number, object: object): void;
 	/** Shorthand for `ref.writePointer`. */
 	writePointer(offset: number, pointer: Buffer): void;
 	/** Shorthand for `ref.writeUInt64BE`. */
-	writeUInt64BE(offset: number, input: number): any;
-	/** Shorthand for `ref.writeUInt64BE`. */
-	writeUInt64BE(offset: number, input: string): any;
+	writeUInt64BE(offset: number, input: number | string): any;
 	/** Shorthand for `ref.writeUInt64LE`. */
-	writeUInt64LE(offset: number, input: number): any;
-	/** Shorthand for `ref.writeUInt64LE`. */
-	writeUInt64LE(offset: number, input: string): any;
+	writeUInt64LE(offset: number, input: number | string): any;
 
 	/**
 	 * Generate string for inspecting.
 	 * String includes the hex-encoded memory address of the Buffer instance.
-	 * @override
 	 */
 	inspect(): string;
 }
diff --git a/types/ffi/tsconfig.json b/types/ffi/tsconfig.json
index 3e89d06e94..db74f21b0e 100644
--- a/types/ffi/tsconfig.json
+++ b/types/ffi/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "node-ffi-buffer.d.ts",
         "ffi-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/ffi/tslint.json b/types/ffi/tslint.json
new file mode 100644
index 0000000000..c5fa24ca82
--- /dev/null
+++ b/types/ffi/tslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "dtslint/dt.json",
+
+  "rules": {
+    "no-consecutive-blank-lines": [true, 3],
+    "ban-types": [false] 
+  }
+}
diff --git a/types/fhir/tslint.json b/types/fhir/tslint.json
new file mode 100644
index 0000000000..e87060ef20
--- /dev/null
+++ b/types/fhir/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-invalid-template-strings": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fibers/tslint.json b/types/fibers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fibers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/field/tslint.json b/types/field/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/field/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/file-saver/file-saver-tests.ts b/types/file-saver/file-saver-tests.ts
index 1cc06f58ba..7e704663d8 100644
--- a/types/file-saver/file-saver-tests.ts
+++ b/types/file-saver/file-saver-tests.ts
@@ -1,30 +1,40 @@
-
-
-import { saveAs as importedSaveAs } from "file-saver";
-function testImportedSaveAs() {
-    var data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
-    var filename: string = 'hello world.txt';
-    var disableAutoBOM = true;
-
-    importedSaveAs(data, filename, disableAutoBOM);
-}
+import "file-saver";
 
 /**
  * @summary Test for "saveAs" function.
  */
 function testSaveAs() {
-    var data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
-    var filename: string = 'hello world.txt';
-    var disableAutoBOM = true;
+    const data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
+    const filename = 'hello world.txt';
+    const disableAutoBOM = true;
 
     saveAs(data, filename, disableAutoBOM);
 }
 
 /**
- * @summary Test for "saveAs" function.
+ * @summary Test for "saveAs" function on the window object.
  */
-function testSaveAsFile() {
-    const data = new File(["Hello, world!"], "hello world.txt" ,{type: "text/plain;charset=utf-8"});
-    
+function testWindowSaveAs() {
+    const data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
+    const filename = 'hello world.txt';
+    const disableAutoBOM = true;
+
+    window.saveAs(data, filename, disableAutoBOM);
+}
+
+/**
+ * @summary Test for "saveAs" function with the 3rd parameter omitted
+ */
+function testOptionalOneParamSaveAs() {
+    const data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
+    const filename = 'hello world.txt';
+    saveAs(data, filename);
+}
+
+/**
+ * @summary Test for "saveAs" function with the 2nd and 3rd parameters omitted
+ */
+function testOptionalTwoParamsSaveAs() {
+    const data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
     saveAs(data);
 }
diff --git a/types/file-saver/index.d.ts b/types/file-saver/index.d.ts
index 8d78e10682..935fed44c2 100644
--- a/types/file-saver/index.d.ts
+++ b/types/file-saver/index.d.ts
@@ -1,46 +1,26 @@
-// Type definitions for FileSaver.js
+// Type definitions for FileSaver.js 1.3
 // Project: https://github.com/eligrey/FileSaver.js/
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Daniel Roth <https://github.com/DaIgeb>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+//                 Daniel Roth <https://github.com/DaIgeb>
+//                 Chris Barr <https://github.com/chrismbarr>
+// Definitions:  https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/file-saver
 
-/**
- * @summary Interface for "saveAs" function.
- * @author  Cyril Schumacher
- * @version 1.0
- */
-interface FileSaver {
-    (
-        /**
-         * @summary Data.
-         * @type {Blob}
-         */
-        data: Blob,
-
-        /**
-         * @summary File name.
-         * @type {DOMString}
-         */
-        filename: string,
-
-        /**
-         * @summary Disable Unicode text encoding hints or not.
-        * @type {boolean}
-        */
-        disableAutoBOM?: boolean
-    ): void
-
-    (
-        /**
-         * @summary File.
-         * @type {File}
-         */
-        data: File
-    ): void
+declare namespace FileSaver {
+    /**
+     * FileSaver.js implements the saveAs() FileSaver interface in browsers that do not natively support it.
+     * @param data - The actual file data blob.
+     * @param filename - The optional name of the file to be downloaded. If omitted, the name used in the file data will be used. If none is provided "download" will be used.
+     * @param disableAutoBOM - Optional & defaults to `false`. Set to `true` if you don't want FileSaver.js to automatically provide Unicode text encoding hints
+     */
+    function saveAs(data: Blob, filename?: string, disableAutoBOM?: boolean): void;
 }
 
-declare var saveAs: FileSaver;
+declare global {
+    const saveAs: typeof FileSaver.saveAs;
 
-declare module "file-saver" {
-    var fileSaver: { saveAs: typeof saveAs };
-    export = fileSaver
+    interface Window {
+        saveAs: typeof FileSaver.saveAs;
+    }
 }
+
+export = FileSaver;
diff --git a/types/file-saver/tsconfig.json b/types/file-saver/tsconfig.json
index 1dc5a6f8f4..803ff5f510 100644
--- a/types/file-saver/tsconfig.json
+++ b/types/file-saver/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "file-saver-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/file-saver/tslint.json b/types/file-saver/tslint.json
new file mode 100644
index 0000000000..adaee1b55f
--- /dev/null
+++ b/types/file-saver/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "export-just-namespace": false
+    }
+}
diff --git a/types/filesize/tslint.json b/types/filesize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/filesize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/filesystem/tslint.json b/types/filesystem/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/filesystem/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/filewriter/tslint.json b/types/filewriter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/filewriter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fill-pdf/tslint.json b/types/fill-pdf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fill-pdf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/finalhandler/tslint.json b/types/finalhandler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/finalhandler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/finch/tslint.json b/types/finch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/finch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/find/find-tests.ts b/types/find/find-tests.ts
new file mode 100644
index 0000000000..c6c1cd04f5
--- /dev/null
+++ b/types/find/find-tests.ts
@@ -0,0 +1,32 @@
+import * as find from "find";
+
+const stringPattern = ".d.ts";
+const regexPattern = /ts(config|lint)\.json/;
+const rootDir = ".";
+
+const emptyCb = (): void => { };
+const errorCb = (err: Error): void => { };
+const stringArrayCallback = (paths: string[]): void => { };
+const singleStringCb = (paths: string): void => { };
+
+find.file(rootDir, (dirs: string[]): void => { }).error(emptyCb); // $ExpectType void
+find.file(rootDir, (dirs: string[]): void => { }).error(errorCb); // $ExpectType void
+find.file(stringPattern, rootDir, (dirs: string[]): void => { }).error(errorCb); // $ExpectType void
+find.file(regexPattern, rootDir, (dirs: string[]): void => { }).error(errorCb); // $ExpectType void
+find.fileSync(rootDir); // $ExpectType string[]
+find.fileSync(stringPattern, rootDir); // $ExpectType string[]
+find.fileSync(regexPattern, rootDir); // $ExpectType string[]
+find.eachFile(rootDir, singleStringCb).end(emptyCb).error(errorCb).end(emptyCb); // $ExpectType FindEachStream
+find.eachFile(stringPattern, rootDir, singleStringCb).end(emptyCb).error(errorCb).end(emptyCb); // $ExpectType FindEachStream
+find.eachFile(regexPattern, rootDir, singleStringCb).end(emptyCb).error(errorCb).end(emptyCb); // $ExpectType FindEachStream
+
+find.dir(stringPattern, rootDir, (dirs: string[]): void => { }).error(emptyCb); // $ExpectType void
+find.dir(stringPattern, rootDir, (dirs: string[]): void => { }).error(errorCb); // $ExpectType void
+find.dir(regexPattern, rootDir, (dirs: string[]): void => { }).error(errorCb); // $ExpectType void
+find.dir(rootDir, (dirs: string[]): void => { }).error(errorCb); // $ExpectType void
+find.dirSync(rootDir); // $ExpectType string[]
+find.dirSync(stringPattern, rootDir); // $ExpectType string[]
+find.dirSync(regexPattern, rootDir); // $ExpectType string[]
+find.eachDir(rootDir, singleStringCb).end(emptyCb).error(errorCb).end(emptyCb); // $ExpectType FindEachStream
+find.eachDir(stringPattern, rootDir, singleStringCb).end(emptyCb).error(errorCb).end(emptyCb); // $ExpectType FindEachStream
+find.eachDir(regexPattern, rootDir, singleStringCb).end(emptyCb).error(errorCb).end(emptyCb); // $ExpectType FindEachStream
diff --git a/types/find/index.d.ts b/types/find/index.d.ts
new file mode 100644
index 0000000000..61166669db
--- /dev/null
+++ b/types/find/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for find 0.2
+// Project: https://github.com/yuanchuan/find#readme
+// Definitions by: Andrey Lalev <https://github.com/andypyrope>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface AsyncFindStream {
+    /**
+     * Handling errors in asynchronous interfaces.
+     * @param callback The callback that is called upon an error
+     */
+    error(callback: (() => void)  | ((err: Error) => void)): void;
+}
+
+export interface FindEachStream {
+    /**
+     * Handling errors in asynchronous interfaces.
+     * @param callback The callback that is called upon an error
+     */
+    error(callback: (() => void) | ((err: Error) => void)): FindEachStream;
+
+    /**
+     * Detect end in find.eachfile and find.eachdir.
+     * @param callback The callback called at the end of find.eachfile and find.eachdir
+     */
+    end(callback: () => void): FindEachStream;
+}
+
+/**
+ * Find all files in a given directory asynchronously.
+ * @param root The root directory
+ * @param callback A callback that accepts an array of the found files
+ */
+export function file(root: string, callback: (files: string[]) => void): AsyncFindStream;
+
+/**
+ * Find all files that match a glob pattern in a given directory asynchronously.
+ * @param pattern The pattern to filter the files with
+ * @param root The root directory
+ * @param callback A callback that accepts an array of the found files
+ */
+export function file(pattern: string | RegExp, root: string, callback: (files: string[]) => void): AsyncFindStream;
+
+/**
+ * Find all files in a given directory asynchronously.
+ * @param root The root directory
+ * @param callback A callback that accepts each file separately
+ */
+export function eachFile(root: string, callback: (file: string) => void): FindEachStream;
+
+/**
+ * Find all files that match a glob pattern in a given directory asynchronously.
+ * @param pattern The pattern to filter the files with
+ * @param root The root directory
+ * @param callback A callback that accepts an array of the found files
+ */
+export function eachFile(pattern: string | RegExp, root: string, callback: (file: string) => void): FindEachStream;
+
+/**
+ * Find all files in a given directory synchronously.
+ * @param root The root directory
+ * @returns The files that have been found
+ */
+export function fileSync(root: string): string[];
+
+/**
+ * Find all files that match a glob pattern in a given directory synchronously.
+ * @param pattern The pattern to filter the files with
+ * @param root The root directory
+ * @returns The files that have been found
+ */
+export function fileSync(pattern: string | RegExp, root: string): string[];
+
+/**
+ * Find all directories in a given directory asynchronously.
+ * @param root The root directory
+ * @param callback A callback that accepts an array of the found directories
+ */
+export function dir(root: string, callback: (directories: string[]) => void): AsyncFindStream;
+
+/**
+ * Find all directories that match a glob pattern in a given directory asynchronously.
+ * @param pattern The pattern to filter the directories with
+ * @param root The root directory
+ * @param callback A callback that accepts an array of the found directories
+ */
+export function dir(pattern: RegExp | string, root: string, callback: (directories: string[]) => void): AsyncFindStream;
+
+/**
+ * Find all directories in a given directory synchronously.
+ * @param root The root directory
+ * @returns The directories that have been found
+ */
+export function dirSync(root: string): string[];
+
+/**
+ * Find all directories that match a glob pattern in a given directory synchronously.
+ * @param pattern The pattern to filter the directories with
+ * @param root The root directory
+ * @returns The directories that have been found
+ */
+export function dirSync(pattern: string | RegExp, root: string): string[];
+
+/**
+ * Find all directories in a given directory asynchronously.
+ * @param root The root directory
+ * @param callback A callback that accepts each of the found directories separately
+ */
+export function eachDir(root: string, callback: (directory: string) => void): FindEachStream;
+
+/**
+ * Find all directories that match a glob pattern in a given directory asynchronously.
+ * @param pattern The pattern to filter the directories with
+ * @param root The root directory
+ * @param callback A callback that accepts each of the found directories separately
+ */
+export function eachDir(pattern: string | RegExp, root: string, callback: (directory: string) => void): FindEachStream;
diff --git a/types/find/tsconfig.json b/types/find/tsconfig.json
new file mode 100644
index 0000000000..e231e78ff5
--- /dev/null
+++ b/types/find/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "find-tests.ts"
+    ]
+}
diff --git a/types/find/tslint.json b/types/find/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/find/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/findup-sync/tslint.json b/types/findup-sync/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/findup-sync/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fingerprintjs/tslint.json b/types/fingerprintjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fingerprintjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fingerprintjs2/index.d.ts b/types/fingerprintjs2/index.d.ts
index c9fc9b2a39..94b705b807 100644
--- a/types/fingerprintjs2/index.d.ts
+++ b/types/fingerprintjs2/index.d.ts
@@ -13,7 +13,7 @@ declare class Fingerprint2 {
 interface Fingerprint2Options {
     swfContainerId?: string;
     swfPath?: string;
-    userDefinedFonts?: [string];
+    userDefinedFonts?: string[];
     excludeUserAgent?: boolean;
     excludeLanguage?: boolean;
     excludeColorDepth?: boolean;
diff --git a/types/firebase-client/index.d.ts b/types/firebase-client/index.d.ts
index fe5dd5b9e7..f13c8499f5 100644
--- a/types/firebase-client/index.d.ts
+++ b/types/firebase-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.github.com/jpstevens/firebase-client
 // Definitions by: Andrew Breen <https://github.com/fpsscarecrow>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Q from "q";
 
diff --git a/types/firebase-client/tslint.json b/types/firebase-client/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/firebase-client/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/firebase-token-generator/tslint.json b/types/firebase-token-generator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/firebase-token-generator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/firebase/firebase-simplelogin.d.ts b/types/firebase/firebase-simplelogin.d.ts
deleted file mode 100644
index c03702502d..0000000000
--- a/types/firebase/firebase-simplelogin.d.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// Type definitions for Firebase Simple Login
-// Project: https://www.firebase.com/docs/security/simple-login-overview.html
-// Definitions by: Wilker Lucio <https://github.com/wilkerlucio>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
-interface IFirebaseSimpleLoginError {
-    code: string;
-    message: string;
-}
-
-interface IFirebaseSimpleLoginOptions {
-    // general options
-    debug?: boolean
-    rememberMe?: boolean
-
-    // email
-    email?: string
-    password?: string
-
-    // facebook / github / google / twitter
-    preferRedirect?: boolean
-
-    // facebook / github / google
-    scope?: string
-
-    // facebook
-    access_token?: string
-
-    // twitter
-    oauth_token?: string
-
-    // persona
-    backgroundColor?: string
-    privacyPolicy?: string
-    siteLogo?: string
-    siteName?: string
-    termsOfService?: string
-}
-
-interface IFirebaseSimpleLoginUser {
-    // general data
-    firebaseAuthToken: string;
-    id: string;
-    provider: string;
-    uid: string;
-
-    // email / persona
-    md5_hash?: string;
-
-    // email
-    email?: string;
-
-    // facebook / github / google / twitter
-    accessToken?: string
-    displayName?: string
-    thirdPartyUserData?: Object
-
-    // github / twitter
-    username?: string
-
-    // twitter
-    accessTokenSecret?: string
-}
-
-declare class FirebaseSimpleLogin {
-    email: string;
-    id: string;
-    provider: string;
-    uid: string;
-    username: string;
-
-    constructor(firebase: Firebase, callback: (err: IFirebaseSimpleLoginError, user: IFirebaseSimpleLoginUser) => any);
-
-    login(loginType: string, options?: IFirebaseSimpleLoginOptions): void;
-    logout(): void;
-
-    createUser(email: string,
-               password: string,
-               callback?: (err: IFirebaseSimpleLoginError, user: IFirebaseSimpleLoginUser) => any): void;
-
-    changePassword(email: string,
-                   oldPassword: string,
-                   newPassword: string,
-                   callback?: (err: IFirebaseSimpleLoginError, success: boolean) => any): void;
-
-    sendPasswordResetEmail(email: string,
-                           callback?: (err: IFirebaseSimpleLoginError, success: boolean) => any): void;
-
-    removeUser(email: string,
-               password: string,
-               callback?: (err: IFirebaseSimpleLoginError, success: boolean) => any): void;
-}
\ No newline at end of file
diff --git a/types/firebase/index.d.ts b/types/firebase/index.d.ts
deleted file mode 100644
index af121a0d02..0000000000
--- a/types/firebase/index.d.ts
+++ /dev/null
@@ -1,418 +0,0 @@
-// Type definitions for Firebase API 2.4.1
-// Project: https://www.firebase.com/docs/javascript/firebase
-// Definitions by: Vincent Botone <https://github.com/vbortone>, Shin1 Kashimura <https://github.com/in-async/>, Sebastien Dubois <https://github.com/dsebastien>, Szymon Stasik <https://github.com/ciekawy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface FirebaseAuthResult {
-	auth: any;
-	expires: number;
-}
-
-interface FirebaseDataSnapshot {
-	/**
-	 * Returns true if this DataSnapshot contains any data.
-	 * It is slightly more efficient than using snapshot.val() !== null.
-	 */
-	exists(): boolean;
-	/**
-	 * Gets the JavaScript object representation of the DataSnapshot.
-	 */
-	val(): any;
-	/**
-	 * Gets a DataSnapshot for the location at the specified relative path.
-	 */
-	child(childPath: string): FirebaseDataSnapshot;
-	/**
-	 * Enumerates through the DataSnapshot’s children (in the default order).
-	 */
-	forEach(childAction: (childSnapshot: FirebaseDataSnapshot) => void): boolean;
-	forEach(childAction: (childSnapshot: FirebaseDataSnapshot) => boolean): boolean;
-	/**
-	 * Returns true if the specified child exists.
-	 */
-	hasChild(childPath: string): boolean;
-	/**
-	 * Returns true if the DataSnapshot has any children.
-	 */
-	hasChildren(): boolean;
-	/**
-	 * Gets the key name of the location that generated this DataSnapshot.
-	 */
-	key(): string;
-	/**
-	 * @deprecated Use key() instead.
-	 * Gets the key name of the location that generated this DataSnapshot.
-	 */
-	name(): string;
-	/**
-	 * Gets the number of children for this DataSnapshot.
-	 */
-	numChildren(): number;
-	/**
-	 * Gets the Firebase reference for the location that generated this DataSnapshot.
-	 */
-	ref(): Firebase;
-	/**
-	 * Gets the priority of the data in this DataSnapshot.
-	 * @returns {string, number, null} The priority, or null if no priority was set.
-	 */
-	getPriority(): any; // string or number
-	/**
-	 * Exports the entire contents of the DataSnapshot as a JavaScript object.
-	 */
-	exportVal(): Object;
-}
-
-interface FirebaseOnDisconnect {
-	/**
-	 * Ensures the data at this location is set to the specified value when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	set(value: any, onComplete: (error: any) => void): void;
-	set(value: any): Promise<void>;
-	/**
-	 * Ensures the data at this location is set to the specified value and priority when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	setWithPriority(value: any, priority: string|number, onComplete: (error: any) => void): void;
-	setWithPriority(value: any, priority: string|number): Promise<void>;
-	/**
-	 * Writes the enumerated children at this Firebase location when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	update(value: Object, onComplete: (error: any) => void): void;
-	update(value: Object): Promise<void>;
-	/**
-	 * Ensures the data at this location is deleted when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	remove(onComplete: (error: any) => void): void;
-	remove(): Promise<void>;
-	/**
-	 * Cancels all previously queued onDisconnect() set or update events for this location and all children.
-	 */
-	cancel(onComplete: (error: any) => void): void;
-	cancel(): Promise<void>;
-}
-
-interface FirebaseQuery {
-	/**
-	 * Listens for data changes at a particular location.
-	 */
-	on(eventType: string, callback: (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void, cancelCallback?: (error: any) => void, context?: Object): (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void;
-	/**
-	 * Detaches a callback previously attached with on().
-	 */
-	off(eventType?: string, callback?: (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void, context?: Object): void;
-	/**
-	 * Listens for exactly one event of the specified event type, and then stops listening.
-	 */
-	once(eventType: string, successCallback: (dataSnapshot: FirebaseDataSnapshot) => void, context?: Object): void;
-	once(eventType: string, successCallback: (dataSnapshot: FirebaseDataSnapshot) => void, failureCallback?: (error: any) => void, context?: Object): void;
-	once(eventType: string): Promise<FirebaseDataSnapshot>
-	/**
-	 * Generates a new Query object ordered by the specified child key.
-	 */
-	orderByChild(key: string): FirebaseQuery;
-	/**
-	 * Generates a new Query object ordered by key name.
-	 */
-	orderByKey(): FirebaseQuery;
-	/**
-	 * Generates a new Query object ordered by child values.
-	 */
-	orderByValue(): FirebaseQuery;
-	/**
-	 * Generates a new Query object ordered by priority.
-	 */
-	orderByPriority(): FirebaseQuery;
-	/**
-	 * @deprecated Use limitToFirst() and limitToLast() instead.
-	 * Generates a new Query object limited to the specified number of children.
-	 */
-	limit(limit: number): FirebaseQuery;
-	/**
-	 * Creates a Query with the specified starting point.
-	 * The generated Query includes children which match the specified starting point.
-	 */
-	startAt(value: string, key?: string): FirebaseQuery;
-	startAt(value: number, key?: string): FirebaseQuery;
-	/**
-	 * Creates a Query with the specified ending point.
-	 * The generated Query includes children which match the specified ending point.
-	 */
-	endAt(value: string, key?: string): FirebaseQuery;
-	endAt(value: number, key?: string): FirebaseQuery;
-	/**
-	 * Creates a Query which includes children which match the specified value.
-	 */
-	equalTo(value: string|number|boolean, key?: string): FirebaseQuery;
-	/**
-	 * Generates a new Query object limited to the first certain number of children.
-	 */
-	limitToFirst(limit: number): FirebaseQuery;
-	/**
-	 * Generates a new Query object limited to the last certain number of children.
-	 */
-	limitToLast(limit: number): FirebaseQuery;
-	/**
-	 * Gets a Firebase reference to the Query's location.
-	 */
-	ref(): Firebase;
-}
-
-interface Firebase extends FirebaseQuery {
-	/**
-	 * @deprecated Use authWithCustomToken() instead.
-	 * Authenticates a Firebase client using the provided authentication token or Firebase Secret.
-	 */
-	auth(authToken: string, onComplete: (error: any, result: FirebaseAuthResult) => void, onCancel?:(error: any) => void): void;
-	auth(authToken: string): Promise<FirebaseAuthResult>;
-	/**
-	 * Authenticates a Firebase client using an authentication token or Firebase Secret.
-	 */
-	authWithCustomToken(autoToken: string, onComplete: (error: any, authData: FirebaseAuthData) => void, options?:Object): void;
-	authWithCustomToken(autoToken: string, options?:Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using a new, temporary guest account.
-	 */
-	authAnonymously(onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authAnonymously(options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using an email / password combination.
-	 */
-	authWithPassword(credentials: FirebaseCredentials, onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authWithPassword(credentials: FirebaseCredentials, options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using a popup-based OAuth flow.
-	 */
-	authWithOAuthPopup(provider: string, onComplete:(error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authWithOAuthPopup(provider: string, options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using a redirect-based OAuth flow.
-	 */
-	authWithOAuthRedirect(provider: string, onComplete: (error: any) => void, options?: Object): void;
-	authWithOAuthRedirect(provider: string, options?: Object): Promise<void>;
-	/**
-	 * Authenticates a Firebase client using OAuth access tokens or credentials.
-	 */
-	authWithOAuthToken(provider: string, credentials: string|Object, onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authWithOAuthToken(provider: string, credentials: string|Object, options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Synchronously access the current authentication state of the client.
-	 */
-	getAuth(): FirebaseAuthData;
-	/**
-	 * Listen for changes to the client's authentication state.
-	 */
-	onAuth(onComplete: (authData: FirebaseAuthData) => void, context?: Object): void;
-	/**
-	 * Detaches a callback previously attached with onAuth().
-	 */
-	offAuth(onComplete: (authData: FirebaseAuthData) => void, context?: Object): void;
-	/**
-	 * Unauthenticates a Firebase client.
-	 */
-	unauth(): void;
-	/**
-	 * Gets a Firebase reference for the location at the specified relative path.
-	 */
-	child(childPath: string): Firebase;
-	/**
-	 * Gets a Firebase reference to the parent location.
-	 */
-	parent(): Firebase;
-	/**
-	 * Gets a Firebase reference to the root of the Firebase.
-	 */
-	root(): Firebase;
-	/**
-	 * Returns the last token in a Firebase location.
-	 */
-	key(): string;
-	/**
-	 * @deprecated Use key() instead.
-	 * Returns the last token in a Firebase location.
-	 */
-	name(): string;
-	/**
-	 * Gets the absolute URL corresponding to this Firebase reference's location.
-	 */
-	toString(): string;
-	/**
-	 * Writes data to this Firebase location.
-	 */
-	set(value: any, onComplete: (error: any) => void): void;
-	set(value: any): Promise<void>;
-	/**
-	 * Writes the enumerated children to this Firebase location.
-	 */
-	update(value: Object, onComplete: (error: any) => void): void;
-	update(value: Object): Promise<void>;
-	/**
-	 * Removes the data at this Firebase location.
-	 */
-	remove(onComplete: (error: any) => void): void;
-	remove(): Promise<void>;
-	/**
-	 * Generates a new child location using a unique name and returns a Firebase reference to it.
-	 * @returns {Firebase} A Firebase reference for the generated location.
-	 */
-	push(value?: any, onComplete?: (error: any) => void): FirebaseWithPromise<void>;
-	/**
-	 * Writes data to this Firebase location. Like set() but also specifies the priority for that data.
-	 */
-	setWithPriority(value: any, priority: string|number, onComplete: (error: any) => void): void;
-	setWithPriority(value: any, priority: string|number): Promise<void>;
-	/**
-	 * Sets a priority for the data at this Firebase location.
-	 */
-	setPriority(priority: string|number, onComplete: (error: any) => void): void;
-	setPriority(priority: string|number): Promise<void>;
-	/**
-	 * Atomically modifies the data at this location.
-	 */
-	transaction(updateFunction: (currentData: any)=> any, onComplete?: (error: any, committed: boolean, snapshot: FirebaseDataSnapshot) => void, applyLocally?: boolean): void;
-	/**
-	 * Creates a new user account using an email / password combination.
-	 */
-	createUser(credentials: FirebaseCredentials, onComplete: (error: any, userData: any) => void): void;
-	/**
-	 * Updates the email associated with an email / password user account.
-	 */
-	changeEmail(credentials: FirebaseChangeEmailCredentials, onComplete: (error: any) => void): void;
-	/**
-	 * Change the password of an existing user using an email / password combination.
-	 */
-	changePassword(credentials: FirebaseChangePasswordCredentials, onComplete: (error: any) => void): void;
-	/**
-	 * Removes an existing user account using an email / password combination.
-	 */
-	removeUser(credentials: FirebaseCredentials, onComplete: (error: any) => void): void;
-	/**
-	 * Sends a password-reset email to the owner of the account, containing a token that may be used to authenticate and change the user password.
-	 */
-	resetPassword(credentials: FirebaseResetPasswordCredentials, onComplete: (error: any) => void): void;
-	onDisconnect(): FirebaseOnDisconnect;
-}
-
-interface FirebaseWithPromise<T> extends Firebase, Promise<T> {}
-
-interface FirebaseStatic {
-	/**
-	 * Constructs a new Firebase reference from a full Firebase URL.
-	 */
-	new (firebaseURL: string): Firebase;
-	/**
-	 * Manually disconnects the Firebase client from the server and disables automatic reconnection.
-	 */
-	goOffline(): void;
-	/**
-	 * Manually reestablishes a connection to the Firebase server and enables automatic reconnection.
-	 */
-	goOnline(): void;
-
-	ServerValue: {
-		/**
-		 * A placeholder value for auto-populating the current timestamp
-		 * (time since the Unix epoch, in milliseconds) by the Firebase servers.
-		 */
-		TIMESTAMP: any;
-	};
-}
-declare var Firebase: FirebaseStatic;
-
-declare module 'firebase' {
-	export = Firebase;
-}
-
-// Reference: https://www.firebase.com/docs/web/api/firebase/getauth.html
-interface FirebaseAuthData {
-	uid: string;
-	provider: string;
-	token: string;
-	expires: number;
-	auth: Object;
-	google?: FirebaseAuthDataGoogle;
-	twitter?: FirebaseAuthDataTwitter;
-	github?: FirebaseAuthDataGithub;
-	facebook?: FirebaseAuthDataFacebook;
-	password?: FirebaseAuthDataPassword;
-	anonymous?: any;
-}
-
-interface FirebaseAuthDataPassword{
-	email: string;
-	isTemporaryPassword: boolean;
-	profileImageURL: string;
-}
-
-interface FirebaseAuthDataTwitter{
-	id: string;
-	accessToken: string;
-	accessTokenSecret: string;
-	displayName: string;
-	username: string;
-	profileImageURL: string;
-	cachedUserProfile: any;
-}
-
-interface FirebaseAuthDataGithub{
-	id: string;
-	accessToken: string;
-	displayName: string;
-	email?: string;
-	username: string;
-	profileImageURL: string;
-	cachedUserProfile: any;
-}
-
-interface FirebaseAuthDataFacebook{
-	id: string;
-	accessToken: string;
-	displayName: string;
-	email?: string;
-	profileImageURL: string;
-	cachedUserProfile: any;
-}
-
-interface FirebaseAuthDataGoogle {
-	accessToken: string;
-	cachedUserProfile: FirebaseAuthDataGoogleCachedUserProfile;
-	displayName: string;
-	email?: string;
-	id: string;
-	profileImageURL: string;
-}
-
-interface FirebaseAuthDataGoogleCachedUserProfile {
-	"family name"?: string;
-	gender?: string;
-	"given name"?: string;
-	id?: string;
-	link?: string;
-	locale?: string;
-	name?: string;
-	picture?: string;
-}
-
-interface FirebaseCredentials {
-	email: string;
-	password: string;
-}
-
-interface FirebaseChangePasswordCredentials {
-	email: string;
-	oldPassword: string;
-	newPassword: string;
-}
-
-interface FirebaseChangeEmailCredentials {
-	oldEmail: string;
-	newEmail: string;
-	password: string;
-}
-
-interface FirebaseResetPasswordCredentials {
-	email: string;
-}
diff --git a/types/firebase/test/index.ts b/types/firebase/test/index.ts
deleted file mode 100644
index dc144552ea..0000000000
--- a/types/firebase/test/index.ts
+++ /dev/null
@@ -1,1050 +0,0 @@
-
-var AUTH_TOKEN: string = "12345";
-var dataRef:Firebase = new Firebase("https://SampleChat.firebaseio-demo.com/");
-//Log me in
-dataRef.auth(AUTH_TOKEN, function(error, result) {
-  if(error) {
-    console.log("Login Failed!", error);
-  } else {
-    console.log('Authenticated successfully with payload:', result.auth);
-    console.log('Auth expires at:', new Date(result.expires * 1000));
-  }
-});
-
-var firebaseRef = new Firebase('https://samplechat.firebaseio-demo.com/');
-/*
- * Firebase.authWithCustomToken()
- */
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	// Log me in
-	dataRef.authWithCustomToken(AUTH_TOKEN, function (error, authData) {
-		if (error) {
-			console.log('Login Failed!', error);
-		} else {
-			console.log('Authenticated successfully with payload:', authData);
-		}
-	});
-}
-
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-
-	var onComplete = function (authData: FirebaseAuthData) {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-
-	// Log me in
-	dataRef.authWithCustomToken(AUTH_TOKEN).then(onComplete, onError);
-	// Same as before but use returned Promise to handle the result
-}
-
-/*
- * Firebase.authAnonymously()
- */
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-
-	var onComplete = function (authData: FirebaseAuthData) {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-
-	// Log me in
-	dataRef.authAnonymously().then(onComplete, onError);
-	// Same as before but use returned Promise to handle the result
-}
-
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	// Log me in
-	dataRef.authAnonymously(function (error, authData) {
-		if (error) {
-			console.log('Login Failed!', error);
-		} else {
-			console.log('Authenticated successfully with payload:', authData);
-		}
-	});
-}
-
-/*
- * Firebase.authWithPassword()
- */
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	// Log me in
-	dataRef.authWithPassword({
-		"email": "bobtony@firebase.com",
-		"password": "correcthorsebatterystaple"
-	}, function (error, authData) {
-		if (error) {
-			console.log('Login Failed!', error);
-		} else {
-			console.log('Authenticated successfully with payload:', authData);
-		}
-	});
-}
-
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	var onComplete = function (authData: FirebaseAuthData) {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-
-	// Log me in
-	dataRef.authWithPassword({
-		"email": "bobtony@firebase.com",
-		"password": "correcthorsebatterystaple"
-	}).then(onComplete, onError);
-	// Same as before but use returned Promise to handle the result
-}
-
-/*
- * Firebase.authWithOAuthPopup()
- */
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	// Log me in
-	dataRef.authWithOAuthPopup("twitter", function (error, authData) {
-		if (error) {
-			console.log('Login Failed!', error);
-		} else {
-			console.log('Authenticated successfully with payload:', authData);
-		}
-	});
-}
-
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-
-	var onComplete = function (authData: FirebaseAuthData) {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-
-	// Log me in
-	dataRef.authWithOAuthPopup("twitter").then(onComplete, onError);
-	// Same as before but use returned Promise to handle the result
-}
-
-/*
- * Firebase.authWithOAuthRedirect
- */
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	// Log me in
-	dataRef.authWithOAuthRedirect("twitter", function (error) {
-		if (error) {
-			console.log('Login Failed!', error);
-		} else {
-			// We'll never get here, as the page will redirect on success.
-		}
-	});
-}
-
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-
-	var onComplete = function () {
-		// We'll never get here, as the page will redirect on success.
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-
-	// Log me in
-	dataRef.authWithOAuthRedirect("twitter").then(onComplete, onError);
-	// Same as before but use returned Promise to handle the result
-}
-
-/*
- * Firebase.authWithOAuthToken()
- */
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	// Authenticate with Facebook using an existing OAuth 2.0 access token
-	dataRef.authWithOAuthToken("facebook", "<ACCESS-TOKEN>", function (error, authData) {
-		if (error) {
-			console.log('Login Failed!', error);
-		} else {
-			console.log('Authenticated successfully with payload:', authData);
-		}
-	});
-}
-
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-
-	var onComplete = function (authData: FirebaseAuthData) {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-
-	// Authenticate with Facebook using an existing OAuth 2.0 access token
-	dataRef.authWithOAuthToken("facebook", "<ACCESS-TOKEN>").then(onComplete, onError);
-	// Same as before but use returned Promise to handle the result
-}
-
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	// Authenticate with Twitter using an existing OAuth 1.0a credential set
-	dataRef.authWithOAuthToken("twitter", {
-		"user_id": "<USER-ID>",
-		"oauth_token": "<ACCESS-TOKEN>",
-		"oauth_token_secret": "<ACCESS-TOKEN-SECRET>",
-	}, function (error, authData) {
-		if (error) {
-			console.log('Login Failed!', error);
-		} else {
-			console.log('Authenticated successfully with payload:', authData);
-		}
-	});
-}
-
-/*
- * Firebase.getAuth()
- */
-() => {
-	var dataRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	var authData = dataRef.getAuth();
-
-	if (authData) {
-		console.log('Authenticated user with uid:', authData.uid);
-	}
-}
-
-/*
- * Firebase.onAuth()
- */
-() => {
-	var firebaseRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	firebaseRef.onAuth(function (authData) {
-		if (authData) {
-			console.log('Client is authenticated with uid ' + authData.uid);
-		} else {
-			// Client is unauthenticated
-		}
-	});
-}
-
-/*
- * Firebase.offAuth
- */
-() => {
-	var firebaseRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	var onAuthChange = function (authData: FirebaseAuthData) { /*...*/ };
-	firebaseRef.onAuth(onAuthChange);
-	// Sometime later...
-	firebaseRef.offAuth(onAuthChange);
-}
-
-//Time to log out!
-dataRef.unauth();
-
-var usersRef:Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/users/');
-var fredRef:Firebase = usersRef.child('fred');
-var fredFirstNameRef:Firebase = fredRef.child('name/first');
-var x:string = fredFirstNameRef.toString();
-// x is now 'https://SampleChat.firebaseIO-demo.com/users/fred/name/first'.
-
-var usersRef2:Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/users/');
-var sampleChatRef:Firebase = usersRef2.parent();
-var x2:string = sampleChatRef.toString();
-// x is now 'https://SampleChat.firebaseIO-demo.com'.
-var y:Firebase = sampleChatRef.parent();
-// y is now null, since sampleChatRef refers to the root of the Firebase.
-
-var fredRef2:Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/users/fred');
-var sampleChatRef2 :Firebase= fredRef2.root();
-var x3:string = sampleChatRef2.toString();
-// x is now 'https://SampleChat.firebaseIO-demo.com'.
-
-var fredRef3:Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/users/fred');
-var x4:string = fredRef3.name();
-// x is now 'fred'.
-
-/*
- * Firebase.key()
- */
-() => {
-	var fredRef = new Firebase("https://samplechat.firebaseio-demo.com/users/fred");
-	var key = fredRef.key();  // key === "fred"
-	key = fredRef.child("name/last").key();  // key === "last"
-}
-() => {
-	// Calling key() on the root of a Firebase will return null:
-	var rootRef = new Firebase("https://samplechat.firebaseio-demo.com");
-	var key = rootRef.key();  // key === null
-}
-
-/*
- * Firebase.set()
- */
-() => {
-	var fredNameRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/name');
-	fredNameRef.child('first').set('Fred');
-	fredNameRef.child('last').set('Flintstone');
-	// We've written 'Fred' to the Firebase location storing fred's first name,
-	// and 'Flintstone' to the location storing his last name
-}
-() => {
-	var fredNameRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/name');
-	fredNameRef.set({ first: 'Fred', last: 'Flintstone' });
-	// Exact same effect as the previous example, except we've written
-	// fred's first and last name simultaneously
-}
-() => {
-	var fredNameRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/name');
-	var onComplete = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		} else {
-			console.log('Synchronization succeeded');
-		}
-	};
-	fredNameRef.set({ first: 'Fred', last: 'Flintstone' }, onComplete);
-	// Same as the previous example, except we will also log a message
-	// when the data has finished synchronizing
-}
-
-() => {
-	var fredNameRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/name');
-	var onComplete = function () {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-	fredNameRef.set({ first: 'Fred', last: 'Flintstone' }).then(onComplete, onError);
-	// Same as the previous example but use returned Promise to handle the result
-}
-
-/*
- * Firebase.update()
- */
-() => {
-	var fredNameRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/name');
-	// Modify the 'first' and 'last' children, but leave other data at fredNameRef unchanged
-	fredNameRef.update({ first: 'Fred', last: 'Flintstone' });
-}
-() => {
-	var fredNameRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/name');
-	// Same as the previous example, except we will also display an alert
-	// message when the data has finished synchronizing.
-	var onComplete = function (error:any) {
-		if (error) {
-			console.log('Synchronization failed');
-		} else {
-			console.log('Synchronization succeeded');
-		}
-	};
-	fredNameRef.update({ first: 'Wilma', last: 'Flintstone' }, onComplete);
-}
-
-() => {
-	var fredNameRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/name');
-	var onComplete = function () {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-	fredNameRef.update({ first: 'Fred', last: 'Flintstone' }).then(onComplete, onError);
-	// Same as the previous example but use returned Promise to handle the result
-}
-
-() => {
-	var fredRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred');
-	//The following 2 function calls are equivalent
-	fredRef.update({ name: { first: 'Fred', last: 'Flintstone' }});
-	fredRef.child('name').set({ first: 'Fred', last: 'Flintstone' });
-}
-
-/*
- * Firebase.remove()
- */
-() => {
-	var fredRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred');
-	fredRef.remove();
-	// All data at the Firebase location for user 'fred' has been deleted
-	// (including any child data)
-}
-() => {
-	var onComplete = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		} else {
-			console.log('Synchronization succeeded');
-		}
-	};
-	fredRef.remove(onComplete);
-	// Same as the previous example, except we will also log
-	// a message when the delete has finished synchronizing
-}
-
-() => {
-	var onComplete = function () {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-	fredRef.remove().then(onComplete, onError);
-	// Same as the previous example but use returned Promise to handle the result
-}
-
-/*
- * Firebase.push()
- */
-() => {
-	var messageListRef = new Firebase('https://samplechat.firebaseio-demo.com/message_list');
-	var newMessageRef = messageListRef.push();
-	newMessageRef.set({ 'user_id': 'fred', 'text': 'Yabba Dabba Doo!' });
-	// We've appended a new message to the message_list location.
-	var path = newMessageRef.toString();
-	// path will be something like
-	// 'https://samplechat.firebaseio-demo.com/message_list/-IKo28nwJLH0Nc5XeFmj'
-}
-() => {
-	var messageListRef = new Firebase('https://SampleChat.firebaseIO-demo.com/message_list');
-	messageListRef.push({ 'user_id': 'fred', 'text': 'Yabba Dabba Doo!' });
-	// Same effect as the previous example, but we've combined the push() and the set().
-}
-
-/*
- * Firebase.setWithPriority()
- */
-() => {
-	var fredRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred');
-
-	var user = {
-		name: {
-			first: 'Fred',
-			last: 'Flintstone'
-		},
-		rank: 1000
-	};
-
-	fredRef.setWithPriority(user, 1000);
-	// We've written Fred's name and rank to firebase, and used his rank (1000) as the
-	// priority of the data so he'll be ordered relative to other users by his rank
-}
-
-
-() => {
-	var fredRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred');
-
-	var user = {
-		name: {
-			first: 'Fred',
-			last: 'Flintstone'
-		},
-		rank: 1000
-	};
-
-	fredRef.setWithPriority(user, 1000);
-
-	var onComplete = function () {
-		console.log('Synchronization succeeded');
-	};
-	var onError = function (error: any) {
-		if (error) {
-			console.log('Synchronization failed');
-		}
-	};
-
-	fredRef.setWithPriority(user, 1000).then(onComplete, onError);
-	// Same as the previous example but use returned Promise to handle the result
-}
-
-/*
- * Firebase.setPriority()
- */
-() => {
-	var fredRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred');
-	fredRef.setPriority(1000);
-	// We have changed the priority of fred's user data to 1000
-}
-
-// Increment Fred's rank by 1.
-var fredRankRef:Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/users/fred/rank');
-fredRankRef.transaction(function(currentRank: number) {
-  return currentRank+1;
-});
-
-// Try to create a user for wilma, but only if the user id 'wilma' isn't already taken.
-var wilmaRef: Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/users/wilma');
-wilmaRef.transaction(function(currentData) {
-  if (currentData === null) {
-    return {name: {first: 'Wilma', last: 'Flintstone'} };
-  } else {
-    console.log('User wilma already exists.');
-    return; // Abort the transaction.
-  }
-}, function(error: any, committed: boolean, snapshot: FirebaseDataSnapshot) {
-  if (error)
-    console.log('Transaction failed abnormally!', error);
-  else if (!committed)
-    console.log('We aborted the transaction (because wilma already exists).');
-  else
-    console.log('User wilma added!');
-  console.log('Wilma\'s data: ', snapshot.val());
-});
-
-/*
- * Firebase.createUser()
- */
-() => {
-	var firebaseRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	firebaseRef.createUser({
-		email: "bobtony@firebase.com",
-		password: "correcthorsebatterystaple"
-	}, function (err) {
-		if (err) {
-			switch (err.code) {
-				case 'EMAIL_TAKEN':
-				// The new user account cannot be created because the email is already in use.
-				case 'INVALID_EMAIL':
-				// The specified email is not a valid email.
-				default:
-			}
-		} else {
-			// User account created successfully!
-		}
-	});
-}
-
-/*
- * Firebase.changePassword()
- */
-() => {
-	var firebaseRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	firebaseRef.changePassword({
-		email: "bobtony@firebase.com",
-		oldPassword: "correcthorsebatterystaple",
-		newPassword: "shinynewpassword"
-	}, function (err) {
-		if (err) {
-			switch (err.code) {
-				case 'INVALID_PASSWORD':
-				// The specified user account password is incorrect.
-				case 'INVALID_USER':
-				// The specified user account does not exist.
-				default:
-			}
-		} else {
-			// User password changed successfully!
-		}
-	});
-}
-
-/*
- * Firebase.removeUser()
- */
-() => {
-	var firebaseRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	firebaseRef.removeUser({
-		email: "bobtony@firebase.com",
-		password: "correcthorsebatterystaple"
-	}, function (err) {
-		if (err) {
-			switch (err.code) {
-				case 'INVALID_USER':
-				// The specified user account does not exist.
-				case 'INVALID_PASSWORD':
-				// The specified user account password is incorrect.
-				default:
-			}
-		} else {
-			// User account deleted successfully!
-		}
-	});
-}
-
-/*
- * Firebase.resetPassword()
- */
-() => {
-	var firebaseRef = new Firebase('https://samplechat.firebaseio-demo.com');
-	firebaseRef.resetPassword({
-		email: "bobtony@firebase.com"
-	}, function (err) {
-		if (err) {
-			switch (err.code) {
-				case 'INVALID_USER':
-				// The specified user account does not exist.
-				default:
-			}
-		} else {
-			// Password reset email sent successfully!
-		}
-	});
-}
-
-//var messageListRef: Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/message_list');
-//var lastMessagesQuery:FirebaseQuery = messageListRef.endAt().limit(500);
-//lastMessagesQuery.on('child_added', function(childSnapshot: FirebaseDataSnapshot) { /* handle child add */ });
-
-//var messageListRef2:Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/message_list');
-//var firstMessagesQuery:FirebaseQuery = messageListRef2.startAt().limit(500);
-//firstMessagesQuery.on('child_added', function(childSnapshot: FirebaseDataSnapshot) { /* handle child add */ });
-
-//var usersRef3: Firebase = new Firebase('https://SampleChat.firebaseIO-demo.com/users');
-//var usersQuery: FirebaseQuery = usersRef3.startAt(1000).limit(50);
-//usersQuery.on('child_added', function(userSnapshot: FirebaseDataSnapshot) { /* handle user */ });
-
-/*
- * Firebase.goOffline()
- * Firebase.goOnline()
- */
-() => {
-	var usersRef = new Firebase('https://samplechat.firebaseio-demo.com/users');
-	Firebase.goOffline(); // All Firebase instances are disconnected
-	Firebase.goOnline(); // All Firebase instances automatically reconnect
-}
-
-/*
- * FirebaseQuery.on()
- */
-() => {
-	firebaseRef.on('value', function (dataSnapshot) {
-		// code to handle new value.
-	});
-
-	firebaseRef.on('child_added', function (childSnapshot, prevChildName) {
-		// code to handle new child.
-	});
-
-	firebaseRef.on('child_removed', function (oldChildSnapshot) {
-		// code to handle child removal.
-	});
-
-	firebaseRef.on('child_changed', function (childSnapshot, prevChildName) {
-		// code to handle child data changes.
-	});
-
-	firebaseRef.on('child_changed', function (childSnapshot, prevChildName) {
-		// code to handle child data changes.
-	});
-}
-
-/*
- * FirebaseQuery.off()
- */
-() => {
-	var onValueChange = function (dataSnapshot: FirebaseDataSnapshot) { /* handle... */ };
-	firebaseRef.on('value', onValueChange);
-	// Sometime later...
-	firebaseRef.off('value', onValueChange);
-}
-() => {
-	// Or you can save a line of code by using an inline function
-	// and on()'s return value.
-	var onValueChange = firebaseRef.on('value', function (dataSnapshot) { /* handle... */ });
-	// Sometime later...
-	firebaseRef.off('value', onValueChange);
-}
-
-/*
- * FirebaseQuery.once()
- */
-() => {
-	// Basic usage of .once() to read the data located at firebaseRef.
-	firebaseRef.once('value', function (dataSnapshot) {
-		// handle read data.
-	});
-}
-() => {
-	// Provide a failureCallback to be notified when this
-	// callback is revoked due to security violations.
-	firebaseRef.once('value', function (dataSnapshot) {
-		// code to handle new value
-	}, function (err: any) {
-		// code to handle read error
-	});
-}
-() => {
-	// Provide a context to override "this" when callbacks are triggered.
-	firebaseRef.once('value', function (dataSnapshot) {
-		// this.x is 1
-	}, { x: 1 });
-}
-
-() => {
-	// Use a Promise in place of a callback
-	firebaseRef.once('value').then(function(dataSnapshot){
-		// handle read data
-	})
-}
-
-/*
- * FirebaseQuery.orderByChild()
- */
-() => {
-	// For example, using our sample Firebase of dinosaur facts,
-	// we can read all dinosaurs ordered by height using the following query:
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByChild("height").on("child_added", function (snapshot) {
-		console.log(snapshot.key() + " was " + snapshot.val().height + " meters tall");
-	});
-}
-
-/*
- * FirebaseQuery.orderByKey()
- */
-() => {
-	// For example, using our sample Firebase of dinosaur facts, 
-	// we can read all dinosaurs in alphabetical order, ignoring their priority, 
-	// using the following query:
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByKey().on("child_added", function (snapshot) {
-		console.log(snapshot.key());
-	});
-}
-
-/*
- * FirebaseQuery.orderByPriority()
- */
-() => {
-	// For example, using our sample Firebase of dinosaur facts, 
-	// we can read all dinosaurs in priority order using the following query:
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByPriority().on("child_added", function (snapshot) {
-		console.log(snapshot.key());
-	});
-}
-
-/*
- * FirebaseQuery.startAt()
- */
-() => {
-	// For example, using our sample Firebase of dinosaur facts, 
-	// we can find all dinosaurs that are at least three meters tall 
-	// by combining orderByChild() and startAt():
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByChild("height").startAt(3).on("child_added", function (snapshot) {
-		console.log(snapshot.key())
-	});
-}
-
-/*
- * FirebaseQuery.endAt()
- */
-() => {
-	// For example, using our sample Firebase of dinosaur facts, 
-	// we can find all dinosaurs whose names come before Pterodactyl lexicographically 
-	// by combining orderByKey() and endAt():
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByKey().endAt("pterodactyl").on("child_added", function (snapshot) {
-		console.log(snapshot.key());
-	});
-}
-
-/*
- * FirebaseQuery.equalTo()
- */
-() => {
-	// For example, using our sample Firebase of dinosaur facts, 
-	// we can find all dinosaurs whose height is exactly 25 meters 
-	// by combining orderByChild() and equalTo():
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByChild("height").equalTo(25).on("child_added", function (snapshot) {
-		console.log(snapshot.key());
-	});
-}
-
-/*
- * FirebaseQuery.limitToFirst
- */
-() => {
-	// Using our sample Firebase of dinosaur facts, 
-	// we can find the two shortest dinosaurs with this query:
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByChild("height").limitToFirst(2).on("child_added", function (snapshot) {
-		console.log(snapshot.key());
-	});
-}
-
-/*
- * FirebaseQuery.limitToLast
- */
-() => {
-	// Using our sample Firebase of dinosaur facts, 
-	// we can find the two heaviest dinosaurs with this query:
-	var ref = new Firebase("https://dinosaur-facts.firebaseio.com/");
-	ref.orderByChild("weight").limitToLast(2).on("child_added", function (snapshot) {
-		console.log(snapshot.key());
-	});
-}
-
-/*
- * FirebaseQuery.ref()
- */
-() => {
-	// The Firebase reference returned by ref() is equivalent to the Firebase reference used to create the Query.
-	var ref = new Firebase("https://samplechat.firebaseio-demo.com/users");
-	var query = ref.limitToFirst(5);
-	var refToSameLocation = query.ref();  // ref === refToSameLocation
-}
-
-/*
- * Firebase.onDisconnect().set()
- */
-() => {
-	var disconnectRef = new Firebase('https://samplechat.firebaseio-demo.com/disconnectmessage');
-	disconnectRef.onDisconnect().set('I disconnected!');
-}
-
-/*
- * Firebase.onDisconnect().update()
- */
-() => {
-	var disconnectRef = new Firebase('https://samplechat.firebaseio-demo.com/disconnectmessage');
-	disconnectRef.onDisconnect().update({ message: 'I disconnected!' });
-}
-
-/*
- * Firebase.onDisconnect().remove()
- */
-() => {
-	var disconnectRef = new Firebase('https://samplechat.firebaseio-demo.com/disconnectdata');
-	disconnectRef.onDisconnect().remove();
-}
-
-/*
- * Firebase.onDisconnect().setWithPriority()
- */
-() => {
-	var disconnectRef = new Firebase('https://samplechat.firebaseio-demo.com/disconnectMessage');
-	disconnectRef.onDisconnect().setWithPriority('I disconnected', 10);
-}
-
-/*
- * Firebase.onDisconnect().cancel()
- */
-() => {
-	var fredOnlineRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred/online');
-	fredOnlineRef.onDisconnect().set(false);
-
-	// cancel the previously set onDisconnect().set() event
-	fredOnlineRef.onDisconnect().cancel();
-}
-
-/*
- * Firebase.ServerValue.TIMESTAMP
- */
-() => {
-	// Record the current time immediately, and queue an event to
-	// record the time at which the user disconnects.
-	var sessionsRef = new Firebase('https://samplechat.firebaseio-demo.com/sessions/');
-	var mySessionRef = sessionsRef.push();
-	mySessionRef.onDisconnect().update({ endedAt: Firebase.ServerValue.TIMESTAMP });
-	mySessionRef.update({ startedAt: Firebase.ServerValue.TIMESTAMP });
-}
-
-/*
- * DataSnapshot.val()
- */
-() => {
-	// Demonstrate writing data and then reading it back as a Javascript object.
-	var fredNameRef = new Firebase('https://SampleChat.firebaseIO-demo.com/users/fred');
-	fredNameRef.set({ first: 'Fred', last: 'Flintstone' });
-
-	fredNameRef.once('value', function (nameSnapshot) {
-		var val = nameSnapshot.val();
-		// val now contains the object { first: 'Fred', last: 'Flintstone' }.
-	});
-}
-
-/*
- * DataSnapshot.child()
- */
-(dataSnapshot:FirebaseDataSnapshot) => {
-	// Given a DataSnapshot containing a child 'name' that has children 'first'
-	// (set to 'Fred') and 'last' (set to 'Flintstone'):
-	var nameSnapshot = dataSnapshot.child('name');
-	var name = nameSnapshot.val();
-	// name now contains { first: 'Fred', last: 'Flintstone'}.
-
-	var firstNameSnapshot = dataSnapshot.child('name/first');
-	var firstName = firstNameSnapshot.val();
-	// firstName now contains 'Fred'.
-
-	var favoriteColorSnapshot = dataSnapshot.child('favorite_color');
-	var favoriteColor = favoriteColorSnapshot.val();
-	// favoriteColor will be null, because there is no 'favorite_color' child in dataSnapshot.
-}
-
-/*
- * DataSnapshot.forEach()
- */
-(dataSnapshot:FirebaseDataSnapshot) => {
-	// Given a DataSnapshot containing a child "fred" and a child "wilma", this callback
-	// function will be called twice
-	dataSnapshot.forEach(function (childSnapshot) {
-		// key will be "fred" the first time and "wilma" the second time
-		var key = childSnapshot.key();
-
-		// childData will be the actual contents of the child
-		var childData = childSnapshot.val();
-	});
-}
-(dataSnapshot:FirebaseDataSnapshot) => {
-	// Given a DataSnapshot containing a child "fred" and a child "wilma", this callback
-	// funciton will only be called once (since we return true)
-	dataSnapshot.forEach(function (childSnapshot) {
-		var key = childSnapshot.key();  // key will be "fred"
-		return true;
-	});
-}
-
-/*
- * DataSnapshot.hasChild()
- */
-(dataSnapshot: FirebaseDataSnapshot) => {
-	// Given a DataSnapshot with child 'fred' and no other children:
-	var x = dataSnapshot.hasChild('fred');
-	var y = dataSnapshot.hasChild('whales');
-	// x is true and y is false.
-}
-
-/*
- * DataSnapshot.hasChildren()
- */
-(dataSnapshot: FirebaseDataSnapshot) => {
-	// Given a DataSnapshot containing a child 'name' with children 'first'
-	// (set to 'Fred') and 'last' (set to 'Flintstone'):
-	var x = dataSnapshot.hasChildren();
-	// x is true.
-	var y = dataSnapshot.child('name').hasChildren();
-	// y is true.
-	var z = dataSnapshot.child('name/first').hasChildren();
-	// z is false since 'Fred' is a string and therefore has no children.
-}
-
-/*
- * DataSnapshot.key()
- */
-() => {
-	// Calling key() on any DataSnapshot (except for one which represents the root of a Firebase) 
-	// will return the key name of the location that generated it:
-	var fredRef = new Firebase("https://samplechat.firebaseio-demo.com/users/fred");
-	fredRef.on("value", function (fredSnapshot) {
-		var key = fredSnapshot.key();  // key === "fred"
-		key = fredSnapshot.child("name/last").key();  // key === "last"
-	});
-}
-() => {
-	// Calling key() on a DataSnapshot generated from a reference to the root of a Firebase return null:
-	var rootRef = new Firebase("https://samplechat.firebaseio-demo.com");
-	rootRef.on("value", function (rootSnapshot) {
-		var key = rootSnapshot.key();  // key === null
-	});
-}
-
-/*
- * DataSnapshot.name()
- */
-() => {
-	var fredRef = new Firebase("https://samplechat.firebaseio-demo.com/users/fred");
-	fredRef.on("value", function (fredSnapshot) {
-		var key = fredSnapshot.name();  // key === "fred"
-		key = fredSnapshot.child("name/last").name();  // key === "last"
-	});
-}
-() => {
-	var rootRef = new Firebase("https://samplechat.firebaseio-demo.com");
-	rootRef.on("value", function (rootSnapshot) {
-		var key = rootSnapshot.name();  // key === null
-	});
-}
-
-/*
- * DataSnapshot.numChildren()
- */
-(dataSnapshot: FirebaseDataSnapshot) => {
-	// Given a DataSnapshot containing a child 'name' with children 'first'
-	// (set to 'Fred') and 'last' (set to 'Flintstone'):
-	var x = dataSnapshot.numChildren();
-	// x is 1.
-	var y = dataSnapshot.child('name').numChildren();
-	// y is 2.
-	var z = dataSnapshot.child('name/first').numChildren();
-	// z is 0 since 'Fred' is a string and therefore has no children.
-}
-
-/*
- * DataSnaphot.ref()
- */
-() => {
-	var fredRef = new Firebase('https://samplechat.firebaseio-demo.com/users/fred');
-	fredRef.on('value', function (fredSnapshot) {
-		var fredRef2 = fredSnapshot.ref();
-		// fredRef and fredRef2 both point to the same location.
-	});
-}
-
-/*
- * DataSnapshot.getPriority()
- */
-(dataSnapshot: FirebaseDataSnapshot) => {
-	// Given a snapshot for data with priority 1000:
-	var x = dataSnapshot.getPriority();
-	// x is now 1000.
-}
-
-/*
- * DataSnapshot.exportVal()
- */
-(dataSnapshot: FirebaseDataSnapshot) => {
-	firebaseRef.setWithPriority('hello', 500);
-	firebaseRef.once('value', function (dataSnapshot) {
-		var x = dataSnapshot.exportVal();
-		// x now contains { '.value': 'hello', '.priority': 500 }
-	});
-}
-(dataSnapshot: FirebaseDataSnapshot) => {
-	firebaseRef.set('hello');
-	firebaseRef.once('value', function (dataSnapshot) {
-		var x = dataSnapshot.exportVal();
-		// x now contains 'hello'
-	});
-}
-(dataSnapshot: FirebaseDataSnapshot) => {
-	// Note: To access these variables in JavaScript, you can use x['.value'] and x['.priority'].
-	firebaseRef.setWithPriority({ a: 'hello', b: 'hi' }, 500);
-	firebaseRef.once('value', function (dataSnapshot) {
-		var x = dataSnapshot.exportVal();
-		// x now contains { 'a': 'hello', 'b': 'hi', '.priority': 500 }
-	});
-}
diff --git a/types/firebase/test/simplelogin.ts b/types/firebase/test/simplelogin.ts
deleted file mode 100644
index a68f98aba3..0000000000
--- a/types/firebase/test/simplelogin.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-var chatRef: Firebase = new Firebase('https://<YOUR-FIREBASE>.firebaseio.com');
-var auth: FirebaseSimpleLogin = new FirebaseSimpleLogin(chatRef, function(error, user) {
-    if (error) {
-        // an error occurred while attempting login
-        switch(error.code) {
-            case 'INVALID_EMAIL':
-            case 'INVALID_PASSWORD':
-            default:
-        }
-    } else if (user) {
-        // user authenticated with Firebase
-        console.log('User ID: ' + user.id + ', Provider: ' + user.provider);
-    } else {
-        // user is logged out
-    }
-});
-
-var email = 'my@email.com';
-var password = 'secret';
-var oldPassword = 'secret';
-var newPassword = 'secret';
-
-auth.login('password', {
-    email: '<email@domain.com>',
-    password: '<password>',
-    rememberMe: true
-});
-
-auth.login('facebook', {
-    rememberMe: true,
-    scope: 'email,user_likes'
-});
-
-auth.login('github', {
-    rememberMe: true,
-    scope: 'user,gist'
-});
-
-auth.login('google', {
-    rememberMe: true,
-    scope: 'https://www.googleapis.com/auth/plus.login'
-});
-
-auth.login('persona', {
-    rememberMe: true
-});
-
-auth.login('twitter', {
-    rememberMe: true
-});
-
-auth.login('anonymous');
-
-auth.createUser(email, password, function(error, user) {
-    if (!error) {
-        console.log('User Id: ' + user.id + ', Email: ' + user.email);
-    }
-});
-
-auth.createUser(email, password);
-
-auth.changePassword(email, oldPassword, newPassword, function(error, success) {
-    if (!error) {
-        console.log('Password changed successfully');
-    }
-});
-
-auth.changePassword(email, oldPassword, newPassword);
-
-auth.sendPasswordResetEmail(email, function(error, success) {
-    if (!error) {
-        console.log('Password reset email sent successfully');
-    }
-});
-
-auth.sendPasswordResetEmail(email);
-
-auth.removeUser(email, password, function(error, success) {
-    if (!error) {
-        console.log('User deleted successfully');
-    }
-});
-
-auth.removeUser(email, password);
\ No newline at end of file
diff --git a/types/firebase/tsconfig.json b/types/firebase/tsconfig.json
deleted file mode 100644
index 4695310ec3..0000000000
--- a/types/firebase/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "firebase-simplelogin.d.ts",
-        "test/index.ts",
-        "test/simplelogin.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/firebird/firebird-tests.ts b/types/firebird/firebird-tests.ts
index 96600a7f2d..d248fe427c 100644
--- a/types/firebird/firebird-tests.ts
+++ b/types/firebird/firebird-tests.ts
@@ -119,4 +119,4 @@ blob._write(buffer, 10);
 blob._write(buffer, 10, (err: Error | null) => {});
 
 /* Stream */
-const strm: NodeJS.ReadWriteStream = new fb.Stream(blob);
+const strm = new fb.Stream(blob);
diff --git a/types/firebird/index.d.ts b/types/firebird/index.d.ts
index 430a3b3b60..37d88324fc 100644
--- a/types/firebird/index.d.ts
+++ b/types/firebird/index.d.ts
@@ -12,6 +12,8 @@
  * Original document is [here](https://www.npmjs.com/package/firebird).
  */
 declare module 'firebird' {
+    import * as stream from 'stream';
+
     /**
      * @see createConnection() method will create Firebird Connection object for you
      */
@@ -27,10 +29,6 @@ declare module 'firebird' {
          * Connects you to database,
          *
          * @param database a database name in Firebird notation, i.e. <hostname>:<path to database file | alias>
-         * @param username user name
-         * @param pasword
-         * @param role
-         *
          * @throws raises exception on error (try to catch it).
          */
         connectSync(db: string, user: string, pass: string, role: string): void;
@@ -39,9 +37,6 @@ declare module 'firebird' {
          * Asynchronously connects you to Database.
          *
          * @param database a database name in Firebird notation, i.e. <hostname>:<path to database file | alias>
-         * @param username user name
-         * @param pasword
-         * @param role
          * @param callback function(err), where err is error object in case of error.
          */
         connect(db: string, user: string, pass: string, role: string, callback: (err: Error | null) => void): void;
@@ -146,7 +141,8 @@ declare module 'firebird' {
          */
         start(callback: (err: Error | null) => void): void;
 
-        /**Synchronously prepares SQL statement and returns FBStatement object.
+        /**
+         * Synchronously prepares SQL statement and returns FBStatement object.
          *
          * @param sql an SQL query to prepare.
          */
@@ -325,7 +321,7 @@ declare module 'firebird' {
          * Synchronously prepares SQL statement
          *
          * @param sql an SQL query to prepare.
-         * @returns @see FBStatement object in context of this transaction.
+         * @returns object in context of this transaction.
          */
         prepareSync(sql: string): FBStatement;
 
@@ -355,9 +351,6 @@ declare module 'firebird' {
 
         /**
          * Same as @see execSync but executes statement in context of given @see Transaction obejct.
-         *
-         * @param transaction
-         * @param params
          */
         execInTransSync(transaction: Transaction, ...params: DataType[]): void;
 
@@ -375,9 +368,6 @@ declare module 'firebird' {
 
          /**
           * Same as @see exec but executes statement in context of given @see Transaction obejct.
-          *
-          * @param transaction
-          * @param params
           */
          execInTrans(transaction: Transaction, ...params: DataType[]): void;
     }
@@ -453,24 +443,13 @@ declare module 'firebird' {
      * You may pipe strm to/from NodeJS Stream objects (fs or socket).
      * You may also look at [NodeJS Streams reference](https://nodejs.org/api/stream.html).
      */
-    class Stream implements NodeJS.ReadWriteStream {
+    class Stream extends stream.Stream {
         constructor(blob: FBBlob);
 
-        /* Following lines is JUST AS NodeJS.ReadStream, NodeJS.WriteStream, and NodeJS.Emmiter */
-        /* tslint:disable */
-
         /* NodeJS.ReadStream */
         readable: boolean;
-        read(size?: number): string | Buffer;
-        setEncoding(encoding: string | null): this;
         pause(): this;
         resume(): this;
-        isPaused(): boolean;
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
-        unshift(chunk: string): void;
-        unshift(chunk: Buffer): void;
-        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
 
         /* NodeJS.WriteStream */
         writable: boolean;
@@ -480,22 +459,8 @@ declare module 'firebird' {
         end(buffer: Buffer, cb?: Function): void;
         end(str: string, cb?: Function): void;
         end(str: string, encoding?: string, cb?: Function): void;
+        destroy(error?: Error): void;
 
-        /* EventEmitter */
-        addListener(event: string | symbol, listener: Function): this;
-        on(event: string | symbol, listener: Function): this;
-        once(event: string | symbol, listener: Function): this;
-        removeListener(event: string | symbol, listener: Function): this;
-        removeAllListeners(event?: string | symbol): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string | symbol): Function[];
-        emit(event: string | symbol, ...args: any[]): boolean;
-        listenerCount(type: string | symbol): number;
-        prependListener(event: string | symbol, listener: Function): this;
-        prependOnceListener(event: string | symbol, listener: Function): this;
-        eventNames(): (string | symbol)[];
-
-        /* tslint:enable */
+        check_destroyed(): void;
     }
 }
diff --git a/types/firebird/tslint.json b/types/firebird/tslint.json
index 4b3c58f2c3..b9ced8ae6f 100644
--- a/types/firebird/tslint.json
+++ b/types/firebird/tslint.json
@@ -2,8 +2,11 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // TODO
+        "ban-types": false,
         "no-boolean-literal-compare": false,
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-single-declare-module": false,
+        "no-unnecessary-generics": false,
+        "unified-signatures": false
     }
 }
diff --git a/types/firefox-webext-browser/firefox-webext-browser-tests.ts b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
new file mode 100644
index 0000000000..01d9cf9f3d
--- /dev/null
+++ b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
@@ -0,0 +1,10 @@
+browser.nonexistentNS; // $ExpectError
+browser.nonexistentNS.unknownMethod(); // $ExpectError
+
+// Test that out overwritten things at least worked
+browser.runtime.getManifest(); // $ExpectType WebExtensionManifest
+browser.test; // $ExpectError
+browser.manifest; // $ExpectError
+browser._manifest; // $ExpectType typeof _manifest
+browser._manifest.WebExtensionLangpackManifest; // $ExpectError
+browser._manifest.NativeManifest; // $ExpectError
diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
new file mode 100644
index 0000000000..dcbfb48648
--- /dev/null
+++ b/types/firefox-webext-browser/index.d.ts
@@ -0,0 +1,6828 @@
+// Type definitions for WebExtension Development in FireFox 58.0
+// Project: https://developer.mozilla.org/en-US/Add-ons/WebExtensions
+// Definitions by: Jacob Bom <https://github.com/bomjacob>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+// Generated using script at github.com/bomjacob/definitelytyped-firefox-webext-browser
+
+interface WebExtEventBase<TAddListener extends (...args: any[]) => any, TCallback> {
+    addListener: TAddListener;
+
+    removeListener(cb: TCallback): void;
+
+    hasListener(cb: TCallback): boolean;
+}
+
+type WebExtEvent<TCallback extends (...args: any[]) => any> = WebExtEventBase<(callback: TCallback) => void, TCallback>;
+
+interface Window {
+    browser: typeof browser;
+}
+
+/**
+ * Permissions: `alarms`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.alarms {
+    /* alarms types */
+    interface Alarm {
+        /** Name of this alarm. */
+        name: string;
+        /** Time when the alarm is scheduled to fire, in milliseconds past the epoch. */
+        scheduledTime: number;
+        /** When present, signals that the alarm triggers periodically after so many minutes. */
+        periodInMinutes?: number;
+    }
+
+    /* alarms functions */
+    /**
+     * Creates an alarm. After the delay is expired, the onAlarm event is fired. If there is another alarm with the
+     * same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+     * @param alarmInfo Details about the alarm. The alarm first fires either at 'when' milliseconds past the epoch (if
+     *     'when' is provided), after 'delayInMinutes' minutes from the current time (if 'delayInMinutes' is provided
+     *     instead), or after 'periodInMinutes' minutes from the current time (if only 'periodInMinutes' is provided).
+     *     Users should never provide both 'when' and 'delayInMinutes'. If 'periodInMinutes' is provided, then the
+     *     alarm recurs repeatedly after that many minutes.
+     */
+    function create(alarmInfo: {
+        /** Time when the alarm is scheduled to first fire, in milliseconds past the epoch. */
+        when?: number;
+        /** Number of minutes from the current time after which the alarm should first fire. */
+        delayInMinutes?: number;
+        /** Number of minutes after which the alarm should recur repeatedly. */
+        periodInMinutes?: number;
+    }): void;
+    /**
+     * Creates an alarm. After the delay is expired, the onAlarm event is fired. If there is another alarm with the
+     * same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+     * @param name Optional name to identify this alarm. Defaults to the empty string.
+     * @param alarmInfo Details about the alarm. The alarm first fires either at 'when' milliseconds past the epoch (if
+     *     'when' is provided), after 'delayInMinutes' minutes from the current time (if 'delayInMinutes' is provided
+     *     instead), or after 'periodInMinutes' minutes from the current time (if only 'periodInMinutes' is provided).
+     *     Users should never provide both 'when' and 'delayInMinutes'. If 'periodInMinutes' is provided, then the
+     *     alarm recurs repeatedly after that many minutes.
+     */
+    function create(name: string, alarmInfo: {
+        /** Time when the alarm is scheduled to first fire, in milliseconds past the epoch. */
+        when?: number;
+        /** Number of minutes from the current time after which the alarm should first fire. */
+        delayInMinutes?: number;
+        /** Number of minutes after which the alarm should recur repeatedly. */
+        periodInMinutes?: number;
+    }): void;
+
+    /**
+     * Retrieves details about the specified alarm.
+     * @param [name] The name of the alarm to get. Defaults to the empty string.
+     */
+    function get(name?: string): Promise<Alarm>;
+
+    /** Gets an array of all the alarms. */
+    function getAll(): Promise<Alarm[]>;
+
+    /**
+     * Clears the alarm with the given name.
+     * @param [name] The name of the alarm to clear. Defaults to the empty string.
+     */
+    function clear(name?: string): Promise<boolean>;
+
+    /** Clears all alarms. */
+    function clearAll(): Promise<boolean>;
+
+    /* alarms events */
+    /**
+     * Fired when an alarm has expired. Useful for transient background pages.
+     * @param name The alarm that has expired.
+     */
+    const onAlarm: WebExtEvent<(name: Alarm) => void>;
+}
+
+/** Not allowed in: Content scripts, Devtools pages */
+declare namespace browser._manifest {
+    /* _manifest types */
+    type OptionalPermission = _OptionalPermission;
+
+    type Permission = string | OptionalPermission | _Permission;
+
+    /** Represents a protocol handler definition. */
+    interface ProtocolHandler {
+        /**
+         * A user-readable title string for the protocol handler. This will be displayed to the user in interface
+         * objects as needed.
+         */
+        name: string;
+        /**
+         * The protocol the site wishes to handle, specified as a string. For example, you can register to handle SMS
+         * text message links by registering to handle the "sms" scheme.
+         */
+        protocol: string | _ProtocolHandlerProtocol;
+        /**
+         * The URL of the handler, as a string. This string should include "%s" as a placeholder which will be replaced
+         * with the escaped URL of the document to be handled. This URL might be a true URL, or it could be a phone
+         * number, email address, or so forth.
+         */
+        uriTemplate: ExtensionURL | HttpURL;
+    }
+
+    /** Represents a WebExtension manifest.json file */
+    interface WebExtensionManifest {
+        /** A list of protocol handler definitions. */
+        protocol_handlers?: ProtocolHandler[];
+        default_locale?: string;
+        manifest_version: number;
+        minimum_chrome_version?: string;
+        minimum_opera_version?: string;
+        applications?: {
+            gecko?: FirefoxSpecificProperties;
+        };
+        browser_specific_settings?: {
+            gecko?: FirefoxSpecificProperties;
+        };
+        name: string;
+        short_name?: string;
+        description?: string;
+        author?: string;
+        version: string;
+        homepage_url?: string;
+        icons?: {
+            [key: number]: string;
+        };
+        incognito?: _WebExtensionManifestIncognito;
+        background?: {
+            page: ExtensionURL;
+            persistent?: PersistentBackgroundProperty;
+        } | {
+            scripts: ExtensionURL[];
+            persistent?: PersistentBackgroundProperty;
+        };
+        options_ui?: {
+            page: ExtensionURL;
+            browser_style?: boolean;
+            chrome_style?: boolean;
+            open_in_tab?: boolean;
+        };
+        content_scripts?: ContentScript[];
+        content_security_policy?: string;
+        permissions?: PermissionOrOrigin[];
+        optional_permissions?: OptionalPermissionOrOrigin[];
+        web_accessible_resources?: string[];
+        developer?: {
+            name?: string;
+            url?: string;
+        };
+        theme?: ThemeType;
+        browser_action?: {
+            default_title?: string;
+            default_icon?: IconPath;
+            /** Specifies icons to use for dark and light themes */
+            theme_icons?: ThemeIcons[];
+            default_popup?: string;
+            browser_style?: boolean;
+            /** Defines the location the browserAction will appear by default. The default location is navbar. */
+            default_area?: _WebExtensionManifestBrowserActionDefaultArea;
+        };
+        chrome_settings_overrides?: {
+            homepage?: string;
+            search_provider?: {
+                name: string;
+                keyword?: string;
+                search_url: string;
+                favicon_url?: string;
+                suggest_url?: string;
+                /** @deprecated Unsupported on Firefox at this time. */
+                instant_url?: string;
+                /** @deprecated Unsupported on Firefox at this time. */
+                image_url?: string;
+                /** @deprecated Unsupported on Firefox at this time. */
+                search_url_post_params?: string;
+                /** @deprecated Unsupported on Firefox at this time. */
+                instant_url_post_params?: string;
+                /** @deprecated Unsupported on Firefox at this time. */
+                image_url_post_params?: string;
+                /** @deprecated Unsupported on Firefox at this time. */
+                alternate_urls?: string[];
+                /** @deprecated Unsupported on Firefox. */
+                prepopulated_id?: number;
+                /** Sets the default engine to a built-in engine only. */
+                is_default?: boolean;
+            };
+        };
+        commands?: {
+            suggested_key?: {
+                default?: KeyName;
+                mac?: KeyName;
+                linux?: KeyName;
+                windows?: KeyName;
+                chromeos?: string;
+                android?: string;
+                ios?: string;
+                /** @deprecated Unknown platform name */
+                additionalProperties?: string;
+            };
+            description?: string;
+        };
+        devtools_page?: ExtensionURL;
+        omnibox?: {
+            keyword: string;
+        };
+        page_action?: {
+            default_title?: string;
+            default_icon?: IconPath;
+            default_popup?: string;
+            browser_style?: boolean;
+        };
+        sidebar_action?: {
+            default_title?: string;
+            default_icon?: IconPath;
+            browser_style?: boolean;
+            default_panel: string;
+        };
+        chrome_url_overrides?: {
+            newtab?: ExtensionURL;
+            /** @deprecated Unsupported on Firefox at this time. */
+            bookmarks?: ExtensionURL;
+            /** @deprecated Unsupported on Firefox at this time. */
+            history?: ExtensionURL;
+        };
+    }
+
+    interface ThemeIcons {
+        /** A light icon to use for dark themes */
+        light: ExtensionURL;
+        /** The dark icon to use for light themes */
+        dark: ExtensionURL;
+        /** The size of the icons */
+        size: number;
+    }
+
+    type OptionalPermissionOrOrigin = OptionalPermission | MatchPattern;
+
+    type PermissionOrOrigin = Permission | MatchPattern;
+
+    type HttpURL = string;
+
+    type ExtensionURL = string;
+
+    type ImageDataOrExtensionURL = string;
+
+    type ExtensionID = string;
+
+    interface FirefoxSpecificProperties {
+        id?: ExtensionID;
+        update_url?: string;
+        strict_min_version?: string;
+        strict_max_version?: string;
+    }
+
+    type MatchPattern = string | _MatchPattern;
+
+    /** Same as MatchPattern above, but includes moz-extension protocol */
+    type MatchPatternInternal = string | _MatchPatternInternal;
+
+    /**
+     * Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be
+     * set at the same time. Based on InjectDetails, but using underscore rather than camel case naming conventions.
+     */
+    interface ContentScript {
+        matches: MatchPattern[];
+        exclude_matches?: MatchPattern[];
+        include_globs?: string[];
+        exclude_globs?: string[];
+        /** The list of CSS files to inject */
+        css?: ExtensionURL[];
+        /** The list of CSS files to inject */
+        js?: ExtensionURL[];
+        /**
+         * If allFrames is `true`, implies that the JavaScript or CSS should be injected into all frames of current
+         * page. By default, it's `false` and is only injected into the top frame.
+         */
+        all_frames?: boolean;
+        /**
+         * If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your
+         * extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default
+         * it is `false`.
+         */
+        match_about_blank?: boolean;
+        /** The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle". */
+        run_at?: extensionTypes.RunAt;
+    }
+
+    type IconPath = {
+        [key: number]: ExtensionURL;
+    } | ExtensionURL;
+
+    type IconImageData = {
+        [key: number]: ImageData;
+    } | ImageData;
+
+    type ImageData = any;
+
+    /** @deprecated An unexpected property was found in the WebExtension manifest. */
+    type UnrecognizedProperty = any;
+
+    /** @deprecated Event pages are not currently supported. This will run as a persistent background page. */
+    type PersistentBackgroundProperty = boolean;
+
+    interface ThemeType {
+        images?: {
+            additional_backgrounds?: ImageDataOrExtensionURL[];
+            headerURL?: ImageDataOrExtensionURL;
+            theme_frame?: ImageDataOrExtensionURL;
+        };
+        colors?: {
+            accentcolor?: string;
+            frame?: number[];
+            tab_text?: number[];
+            textcolor?: string;
+            toolbar?: string;
+            toolbar_text?: string;
+            bookmark_text?: string;
+            toolbar_field?: string;
+            toolbar_field_text?: string;
+            toolbar_top_separator?: string;
+            toolbar_bottom_separator?: string;
+            toolbar_vertical_separator?: string;
+        };
+        icons?: {
+            back?: ExtensionURL;
+            forward?: ExtensionURL;
+            reload?: ExtensionURL;
+            stop?: ExtensionURL;
+            bookmark_star?: ExtensionURL;
+            bookmark_menu?: ExtensionURL;
+            downloads?: ExtensionURL;
+            home?: ExtensionURL;
+            app_menu?: ExtensionURL;
+            cut?: ExtensionURL;
+            copy?: ExtensionURL;
+            paste?: ExtensionURL;
+            new_window?: ExtensionURL;
+            new_private_window?: ExtensionURL;
+            save_page?: ExtensionURL;
+            print?: ExtensionURL;
+            history?: ExtensionURL;
+            full_screen?: ExtensionURL;
+            find?: ExtensionURL;
+            options?: ExtensionURL;
+            addons?: ExtensionURL;
+            developer?: ExtensionURL;
+            synced_tabs?: ExtensionURL;
+            open_file?: ExtensionURL;
+            sidebars?: ExtensionURL;
+            subscribe?: ExtensionURL;
+            text_encoding?: ExtensionURL;
+            email_link?: ExtensionURL;
+            forget?: ExtensionURL;
+            pocket?: ExtensionURL;
+            getmsg?: ExtensionURL;
+            newmsg?: ExtensionURL;
+            address?: ExtensionURL;
+            reply?: ExtensionURL;
+            replyall?: ExtensionURL;
+            replylist?: ExtensionURL;
+            forwarding?: ExtensionURL;
+            delete?: ExtensionURL;
+            junk?: ExtensionURL;
+            file?: ExtensionURL;
+            nextUnread?: ExtensionURL;
+            prevUnread?: ExtensionURL;
+            mark?: ExtensionURL;
+            tag?: ExtensionURL;
+            compact?: ExtensionURL;
+            archive?: ExtensionURL;
+            chat?: ExtensionURL;
+            nextMsg?: ExtensionURL;
+            prevMsg?: ExtensionURL;
+            QFB?: ExtensionURL;
+            conversation?: ExtensionURL;
+            newcard?: ExtensionURL;
+            newlist?: ExtensionURL;
+            editcard?: ExtensionURL;
+            newim?: ExtensionURL;
+            send?: ExtensionURL;
+            spelling?: ExtensionURL;
+            attach?: ExtensionURL;
+            security?: ExtensionURL;
+            save?: ExtensionURL;
+            quote?: ExtensionURL;
+            buddy?: ExtensionURL;
+            join_chat?: ExtensionURL;
+            chat_accounts?: ExtensionURL;
+            calendar?: ExtensionURL;
+            tasks?: ExtensionURL;
+            synchronize?: ExtensionURL;
+            newevent?: ExtensionURL;
+            newtask?: ExtensionURL;
+            editevent?: ExtensionURL;
+            today?: ExtensionURL;
+            category?: ExtensionURL;
+            complete?: ExtensionURL;
+            priority?: ExtensionURL;
+            saveandclose?: ExtensionURL;
+            attendees?: ExtensionURL;
+            privacy?: ExtensionURL;
+            status?: ExtensionURL;
+            freebusy?: ExtensionURL;
+            timezones?: ExtensionURL;
+        };
+        properties?: {
+            additional_backgrounds_alignment?: _ThemeTypeAdditionalBackgroundsAlignment[];
+            additional_backgrounds_tiling?: _ThemeTypeAdditionalBackgroundsTiling[];
+        };
+    }
+
+    type KeyName = string;
+
+    enum _OptionalPermission {
+        browserSettings = "browserSettings",
+        cookies = "cookies",
+        clipboardRead = "clipboardRead",
+        clipboardWrite = "clipboardWrite",
+        geolocation = "geolocation",
+        idle = "idle",
+        notifications = "notifications",
+        topSites = "topSites",
+        webNavigation = "webNavigation",
+        webRequest = "webRequest",
+        webRequestBlocking = "webRequestBlocking",
+        bookmarks = "bookmarks",
+        find = "find",
+        history = "history",
+        activeTab = "activeTab",
+        tabs = "tabs"
+    }
+
+    enum _Permission {
+        contextualIdentities = "contextualIdentities",
+        downloads = "downloads",
+        downloadsopen = "downloads.open",
+        identity = "identity",
+        management = "management",
+        alarms = "alarms",
+        mozillaAddons = "mozillaAddons",
+        storage = "storage",
+        unlimitedStorage = "unlimitedStorage",
+        privacy = "privacy",
+        proxy = "proxy",
+        nativeMessaging = "nativeMessaging",
+        theme = "theme",
+        browsingData = "browsingData",
+        devtools = "devtools",
+        geckoProfiler = "geckoProfiler",
+        menus = "menus",
+        contextMenus = "contextMenus",
+        pkcs11 = "pkcs11",
+        sessions = "sessions"
+    }
+
+    enum _ProtocolHandlerProtocol {
+        bitcoin = "bitcoin",
+        geo = "geo",
+        gopher = "gopher",
+        im = "im",
+        irc = "irc",
+        ircs = "ircs",
+        magnet = "magnet",
+        mailto = "mailto",
+        mms = "mms",
+        news = "news",
+        nntp = "nntp",
+        sip = "sip",
+        sms = "sms",
+        smsto = "smsto",
+        ssh = "ssh",
+        tel = "tel",
+        urn = "urn",
+        webcal = "webcal",
+        wtai = "wtai",
+        xmpp = "xmpp"
+    }
+
+    enum _WebExtensionManifestIncognito {
+        spanning = "spanning"
+    }
+
+    /** Defines the location the browserAction will appear by default. The default location is navbar. */
+    enum _WebExtensionManifestBrowserActionDefaultArea {
+        navbar = "navbar",
+        menupanel = "menupanel",
+        tabstrip = "tabstrip",
+        personaltoolbar = "personaltoolbar"
+    }
+
+    enum _MatchPattern {
+        all_urls = "<all_urls>"
+    }
+
+    enum _MatchPatternInternal {
+        all_urls = "<all_urls>"
+    }
+
+    enum _ThemeTypeAdditionalBackgroundsAlignment {
+        bottom = "bottom",
+        center = "center",
+        left = "left",
+        right = "right",
+        top = "top",
+        centerbottom = "center bottom",
+        centercenter = "center center",
+        centertop = "center top",
+        leftbottom = "left bottom",
+        leftcenter = "left center",
+        lefttop = "left top",
+        rightbottom = "right bottom",
+        rightcenter = "right center",
+        righttop = "right top"
+    }
+
+    enum _ThemeTypeAdditionalBackgroundsTiling {
+        norepeat = "no-repeat",
+        repeat = "repeat",
+        repeatx = "repeat-x",
+        repeaty = "repeat-y"
+    }
+}
+
+/**
+ * Use the `browser.browserSettings` API to control global settings of the browser.
+ *
+ * Permissions: `browserSettings`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.browserSettings {
+    /* browserSettings types */
+
+    /** How images should be animated in the browser. */
+    enum ImageAnimationBehavior {
+        normal = "normal",
+        none = "none",
+        once = "once"
+    }
+
+    /* browserSettings properties */
+    /** Allows or disallows pop-up windows from opening in response to user events. */
+    const allowPopupsForUserEvents: types.Setting;
+
+    /** Enables or disables the browser cache. */
+    const cacheEnabled: types.Setting;
+
+    /** Returns the value of the overridden home page. Read-only. */
+    const homepageOverride: types.Setting;
+
+    /**
+     * Controls the behaviour of image animation in the browser. This setting's value is of type
+     * ImageAnimationBehavior, defaulting to `normal`.
+     */
+    const imageAnimationBehavior: types.Setting;
+
+    /** Returns the value of the overridden new tab page. Read-only. */
+    const newTabPageOverride: types.Setting;
+
+    /** Disables webAPI notifications. */
+    const webNotificationsDisabled: types.Setting;
+}
+
+/**
+ * Offers the ability to write to the clipboard. Reading is not supported because the clipboard can already be read
+ * through the standard web platform APIs.
+ *
+ * Permissions: `clipboardWrite`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.clipboard {
+    type ArrayBuffer = any;
+
+    /** The type of imageData. */
+    enum _SetImageData {
+        jpeg = "jpeg",
+        png = "png"
+    }
+
+    /* clipboard functions */
+    /**
+     * Copy an image to the clipboard. The image is re-encoded before it is written to the clipboard. If the image is
+     * invalid, the clipboard is not modified.
+     * @param imageData The image data to be copied.
+     * @param imageType The type of imageData.
+     */
+    function setImageData(imageData: ArrayBuffer, imageType: _SetImageData): Promise<void>;
+}
+
+/**
+ * Use the `browser.contextualIdentities` API to query and modify contextual identity, also called as containers.
+ *
+ * Permissions: `contextualIdentities`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.contextualIdentities {
+    /* contextualIdentities types */
+    /** Represents information about a contextual identity. */
+    interface ContextualIdentity {
+        /** The name of the contextual identity. */
+        name: string;
+        /** The icon name of the contextual identity. */
+        icon: string;
+        /** The icon url of the contextual identity. */
+        iconUrl: string;
+        /** The color name of the contextual identity. */
+        color: string;
+        /** The color hash of the contextual identity. */
+        colorCode: string;
+        /** The cookie store ID of the contextual identity. */
+        cookieStoreId: string;
+    }
+
+    /* contextualIdentities functions */
+    /**
+     * Retrieves information about a single contextual identity.
+     * @param cookieStoreId The ID of the contextual identity cookie store.
+     */
+    function get(cookieStoreId: string): Promise<ContextualIdentity>;
+
+    /**
+     * Retrieves all contextual identities
+     * @param details Information to filter the contextual identities being retrieved.
+     */
+    function query(details: {
+        /** Filters the contextual identity by name. */
+        name?: string;
+    }): Promise<ContextualIdentity[]>;
+
+    /**
+     * Creates a contextual identity with the given data.
+     * @param details Details about the contextual identity being created.
+     */
+    function create(details: {
+        /** The name of the contextual identity. */
+        name: string;
+        /** The color of the contextual identity. */
+        color: string;
+        /** The icon of the contextual identity. */
+        icon: string;
+    }): Promise<ContextualIdentity>;
+
+    /**
+     * Updates a contextual identity with the given data.
+     * @param cookieStoreId The ID of the contextual identity cookie store.
+     * @param details Details about the contextual identity being created.
+     */
+    function update(cookieStoreId: string, details: {
+        /** The name of the contextual identity. */
+        name?: string;
+        /** The color of the contextual identity. */
+        color?: string;
+        /** The icon of the contextual identity. */
+        icon?: string;
+    }): Promise<ContextualIdentity>;
+
+    /**
+     * Deletes a contetual identity by its cookie Store ID.
+     * @param cookieStoreId The ID of the contextual identity cookie store.
+     */
+    function remove(cookieStoreId: string): Promise<ContextualIdentity>;
+
+    /* contextualIdentities events */
+    /** Fired when a container is updated. */
+    const onUpdated: WebExtEvent<(changeInfo: {
+        /** Contextual identity that has been updated */
+        contextualIdentity: ContextualIdentity;
+    }) => void>;
+
+    /** Fired when a new container is created. */
+    const onCreated: WebExtEvent<(changeInfo: {
+        /** Contextual identity that has been created */
+        contextualIdentity: ContextualIdentity;
+    }) => void>;
+
+    /** Fired when a container is removed. */
+    const onRemoved: WebExtEvent<(changeInfo: {
+        /** Contextual identity that has been removed */
+        contextualIdentity: ContextualIdentity;
+    }) => void>;
+}
+
+/**
+ * Use the `browser.cookies` API to query and modify cookies, and to be notified when they change.
+ *
+ * Permissions: `cookies`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.cookies {
+    /* cookies types */
+    /** Represents information about an HTTP cookie. */
+    interface Cookie {
+        /** The name of the cookie. */
+        name: string;
+        /** The value of the cookie. */
+        value: string;
+        /** The domain of the cookie (e.g. "www.google.com", "example.com"). */
+        domain: string;
+        /**
+         * True if the cookie is a host-only cookie (i.e. a request's host must exactly match the domain of the cookie).
+         */
+        hostOnly: boolean;
+        /** The path of the cookie. */
+        path: string;
+        /**
+         * True if the cookie is marked as Secure (i.e. its scope is limited to secure channels, typically HTTPS).
+         */
+        secure: boolean;
+        /** True if the cookie is marked as HttpOnly (i.e. the cookie is inaccessible to client-side scripts). */
+        httpOnly: boolean;
+        /** True if the cookie is a session cookie, as opposed to a persistent cookie with an expiration date. */
+        session: boolean;
+        /**
+         * The expiration date of the cookie as the number of seconds since the UNIX epoch. Not provided for session
+         * cookies.
+         */
+        expirationDate?: number;
+        /** The ID of the cookie store containing this cookie, as provided in getAllCookieStores(). */
+        storeId: string;
+    }
+
+    /**
+     * Represents a cookie store in the browser. An incognito mode window, for instance, uses a separate cookie store
+     * from a non-incognito window.
+     */
+    interface CookieStore {
+        /** The unique identifier for the cookie store. */
+        id: string;
+        /** Identifiers of all the browser tabs that share this cookie store. */
+        tabIds: number[];
+        /** Indicates if this is an incognito cookie store */
+        incognito: boolean;
+    }
+
+    /**
+     * The underlying reason behind the cookie's change. If a cookie was inserted, or removed via an explicit call to
+     * `cookies.remove`, "cause" will be "explicit". If a cookie was automatically removed due to expiry, "cause" will
+     * be "expired". If a cookie was removed due to being overwritten with an already-expired expiration date, "cause"
+     * will be set to "expired_overwrite". If a cookie was automatically removed due to garbage collection, "cause"
+     * will be "evicted". If a cookie was automatically removed due to a "set" call that overwrote it, "cause" will be
+     * "overwrite". Plan your response accordingly.
+     */
+    enum OnChangedCause {
+        evicted = "evicted",
+        expired = "expired",
+        explicit = "explicit",
+        expired_overwrite = "expired_overwrite",
+        overwrite = "overwrite"
+    }
+
+    /* cookies functions */
+    /**
+     * Retrieves information about a single cookie. If more than one cookie of the same name exists for the given URL,
+     * the one with the longest path will be returned. For cookies with the same path length, the cookie with the
+     * earliest creation time will be returned.
+     * @param details Details to identify the cookie being retrieved.
+     */
+    function get(details: {
+        /**
+         * The URL with which the cookie to retrieve is associated. This argument may be a full URL, in which case any
+         * data following the URL path (e.g. the query string) is simply ignored. If host permissions for this URL are
+         * not specified in the manifest file, the API call will fail.
+         */
+        url: string;
+        /** The name of the cookie to retrieve. */
+        name: string;
+        /**
+         * The ID of the cookie store in which to look for the cookie. By default, the current execution context's
+         * cookie store will be used.
+         */
+        storeId?: string;
+    }): Promise<Cookie>;
+
+    /**
+     * Retrieves all cookies from a single cookie store that match the given information. The cookies returned will be
+     * sorted, with those with the longest path first. If multiple cookies have the same path length, those with the
+     * earliest creation time will be first.
+     * @param details Information to filter the cookies being retrieved.
+     */
+    function getAll(details: {
+        /** Restricts the retrieved cookies to those that would match the given URL. */
+        url?: string;
+        /** Filters the cookies by name. */
+        name?: string;
+        /** Restricts the retrieved cookies to those whose domains match or are subdomains of this one. */
+        domain?: string;
+        /** Restricts the retrieved cookies to those whose path exactly matches this string. */
+        path?: string;
+        /** Filters the cookies by their Secure property. */
+        secure?: boolean;
+        /** Filters out session vs. persistent cookies. */
+        session?: boolean;
+        /**
+         * The cookie store to retrieve cookies from. If omitted, the current execution context's cookie store will be
+         * used.
+         */
+        storeId?: string;
+    }): Promise<Cookie[]>;
+
+    /**
+     * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.
+     * @param details Details about the cookie being set.
+     */
+    function set(details: {
+        /**
+         * The request-URI to associate with the setting of the cookie. This value can affect the default domain and
+         * path values of the created cookie. If host permissions for this URL are not specified in the manifest file,
+         * the API call will fail.
+         */
+        url: string;
+        /** The name of the cookie. Empty by default if omitted. */
+        name?: string;
+        /** The value of the cookie. Empty by default if omitted. */
+        value?: string;
+        /** The domain of the cookie. If omitted, the cookie becomes a host-only cookie. */
+        domain?: string;
+        /** The path of the cookie. Defaults to the path portion of the url parameter. */
+        path?: string;
+        /** Whether the cookie should be marked as Secure. Defaults to false. */
+        secure?: boolean;
+        /** Whether the cookie should be marked as HttpOnly. Defaults to false. */
+        httpOnly?: boolean;
+        /**
+         * The expiration date of the cookie as the number of seconds since the UNIX epoch. If omitted, the cookie
+         * becomes a session cookie.
+         */
+        expirationDate?: number;
+        /**
+         * The ID of the cookie store in which to set the cookie. By default, the cookie is set in the current
+         * execution context's cookie store.
+         */
+        storeId?: string;
+    }): Promise<Cookie | undefined>;
+
+    /**
+     * Deletes a cookie by name.
+     * @param details Information to identify the cookie to remove.
+     */
+    function remove(details: {
+        /**
+         * The URL associated with the cookie. If host permissions for this URL are not specified in the manifest file,
+         * the API call will fail.
+         */
+        url: string;
+        /** The name of the cookie to remove. */
+        name: string;
+        /**
+         * The ID of the cookie store to look in for the cookie. If unspecified, the cookie is looked for by default in
+         * the current execution context's cookie store.
+         */
+        storeId?: string;
+    }): Promise<{
+        /** The URL associated with the cookie that's been removed. */
+        url: string;
+        /** The name of the cookie that's been removed. */
+        name: string;
+        /** The ID of the cookie store from which the cookie was removed. */
+        storeId: string;
+    } | undefined>;
+
+    /** Lists all existing cookie stores. */
+    function getAllCookieStores(): Promise<CookieStore[]>;
+
+    /* cookies events */
+    /**
+     * Fired when a cookie is set or removed. As a special case, note that updating a cookie's properties is
+     * implemented as a two step process: the cookie to be updated is first removed entirely, generating a notification
+     * with "cause" of "overwrite" . Afterwards, a new cookie is written with the updated values, generating a second
+     * notification with "cause" "explicit".
+     */
+    const onChanged: WebExtEvent<(changeInfo: {
+        /** True if a cookie was removed. */
+        removed: boolean;
+        /** Information about the cookie that was set or removed. */
+        cookie: Cookie;
+        /** The underlying reason behind the cookie's change. */
+        cause: OnChangedCause;
+    }) => void>;
+}
+
+/**
+ * Permissions: `downloads`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.downloads {
+    /* downloads types */
+    enum FilenameConflictAction {
+        uniquify = "uniquify",
+        overwrite = "overwrite",
+        prompt = "prompt"
+    }
+
+    enum InterruptReason {
+        FILE_FAILED = "FILE_FAILED",
+        FILE_ACCESS_DENIED = "FILE_ACCESS_DENIED",
+        FILE_NO_SPACE = "FILE_NO_SPACE",
+        FILE_NAME_TOO_LONG = "FILE_NAME_TOO_LONG",
+        FILE_TOO_LARGE = "FILE_TOO_LARGE",
+        FILE_VIRUS_INFECTED = "FILE_VIRUS_INFECTED",
+        FILE_TRANSIENT_ERROR = "FILE_TRANSIENT_ERROR",
+        FILE_BLOCKED = "FILE_BLOCKED",
+        FILE_SECURITY_CHECK_FAILED = "FILE_SECURITY_CHECK_FAILED",
+        FILE_TOO_SHORT = "FILE_TOO_SHORT",
+        NETWORK_FAILED = "NETWORK_FAILED",
+        NETWORK_TIMEOUT = "NETWORK_TIMEOUT",
+        NETWORK_DISCONNECTED = "NETWORK_DISCONNECTED",
+        NETWORK_SERVER_DOWN = "NETWORK_SERVER_DOWN",
+        NETWORK_INVALID_REQUEST = "NETWORK_INVALID_REQUEST",
+        SERVER_FAILED = "SERVER_FAILED",
+        SERVER_NO_RANGE = "SERVER_NO_RANGE",
+        SERVER_BAD_CONTENT = "SERVER_BAD_CONTENT",
+        SERVER_UNAUTHORIZED = "SERVER_UNAUTHORIZED",
+        SERVER_CERT_PROBLEM = "SERVER_CERT_PROBLEM",
+        SERVER_FORBIDDEN = "SERVER_FORBIDDEN",
+        USER_CANCELED = "USER_CANCELED",
+        USER_SHUTDOWN = "USER_SHUTDOWN",
+        CRASH = "CRASH"
+    }
+
+    /**
+     * *file*:
+     *   The download's filename is suspicious.
+     * *url*:
+     *   The download's URL is known to be malicious.
+     * *content*:
+     *   The downloaded file is known to be malicious.
+     * *uncommon*:
+     *   The download's URL is not commonly downloaded and could be dangerous.
+     * *safe*:
+     *   The download presents no known danger to the user's computer.
+     *
+     * These string constants will never change, however the set of DangerTypes may change.
+     */
+    enum DangerType {
+        file = "file",
+        url = "url",
+        content = "content",
+        uncommon = "uncommon",
+        host = "host",
+        unwanted = "unwanted",
+        safe = "safe",
+        accepted = "accepted"
+    }
+
+    /**
+     * *in_progress*:
+     *   The download is currently receiving data from the server.
+     * *interrupted*:
+     *   An error broke the connection with the file host.
+     * *complete*:
+     *   The download completed successfully.
+     *
+     * These string constants will never change, however the set of States may change.
+     */
+    enum State {
+        in_progress = "in_progress",
+        interrupted = "interrupted",
+        complete = "complete"
+    }
+
+    interface DownloadItem {
+        /** An identifier that is persistent across browser sessions. */
+        id: number;
+        /** Absolute URL. */
+        url: string;
+        referrer?: string;
+        /** Absolute local path. */
+        filename: string;
+        /** False if this download is recorded in the history, true if it is not recorded. */
+        incognito: boolean;
+        /** Indication of whether this download is thought to be safe or known to be suspicious. */
+        danger: DangerType;
+        /** The file's MIME type. */
+        mime: string;
+        /** Number of milliseconds between the unix epoch and when this download began. */
+        startTime: string;
+        /** Number of milliseconds between the unix epoch and when this download ended. */
+        endTime?: string;
+        estimatedEndTime?: string;
+        /** Indicates whether the download is progressing, interrupted, or complete. */
+        state: State;
+        /** True if the download has stopped reading data from the host, but kept the connection open. */
+        paused: boolean;
+        canResume: boolean;
+        /** Number indicating why a download was interrupted. */
+        error?: InterruptReason;
+        /** Number of bytes received so far from the host, without considering file compression. */
+        bytesReceived: number;
+        /** Number of bytes in the whole file, without considering file compression, or -1 if unknown. */
+        totalBytes: number;
+        /** Number of bytes in the whole file post-decompression, or -1 if unknown. */
+        fileSize: number;
+        exists: boolean;
+        byExtensionId?: string;
+        byExtensionName?: string;
+    }
+
+    interface StringDelta {
+        current?: string;
+        previous?: string;
+    }
+
+    interface DoubleDelta {
+        current?: number;
+        previous?: number;
+    }
+
+    interface BooleanDelta {
+        current?: boolean;
+        previous?: boolean;
+    }
+
+    /**
+     * A time specified as a Date object, a number or string representing milliseconds since the epoch, or an ISO 8601
+     * string
+     */
+    type DownloadTime = string | extensionTypes.Date;
+
+    /**
+     * Parameters that combine to specify a predicate that can be used to select a set of downloads. Used for example
+     * in search() and erase()
+     */
+    interface DownloadQuery {
+        /**
+         * This array of search terms limits results to DownloadItems whose `filename` or `url` contain all of the
+         * search terms that do not begin with a dash '-' and none of the search terms that do begin with a dash.
+         */
+        query?: string[];
+        /** Limits results to downloads that started before the given ms since the epoch. */
+        startedBefore?: DownloadTime;
+        /** Limits results to downloads that started after the given ms since the epoch. */
+        startedAfter?: DownloadTime;
+        /** Limits results to downloads that ended before the given ms since the epoch. */
+        endedBefore?: DownloadTime;
+        /** Limits results to downloads that ended after the given ms since the epoch. */
+        endedAfter?: DownloadTime;
+        /** Limits results to downloads whose totalBytes is greater than the given integer. */
+        totalBytesGreater?: number;
+        /** Limits results to downloads whose totalBytes is less than the given integer. */
+        totalBytesLess?: number;
+        /** Limits results to DownloadItems whose `filename` matches the given regular expression. */
+        filenameRegex?: string;
+        /** Limits results to DownloadItems whose `url` matches the given regular expression. */
+        urlRegex?: string;
+        /**
+         * Setting this integer limits the number of results. Otherwise, all matching DownloadItems will be returned.
+         */
+        limit?: number;
+        /**
+         * Setting elements of this array to DownloadItem properties in order to sort the search results. For example,
+         * setting `orderBy='startTime'` sorts the DownloadItems by their start time in ascending order. To specify
+         * descending order, prefix `orderBy` with a hyphen: '-startTime'.
+         */
+        orderBy?: string[];
+        id?: number;
+        /** Absolute URL. */
+        url?: string;
+        /** Absolute local path. */
+        filename?: string;
+        /** Indication of whether this download is thought to be safe or known to be suspicious. */
+        danger?: DangerType;
+        /** The file's MIME type. */
+        mime?: string;
+        startTime?: string;
+        endTime?: string;
+        /** Indicates whether the download is progressing, interrupted, or complete. */
+        state?: State;
+        /** True if the download has stopped reading data from the host, but kept the connection open. */
+        paused?: boolean;
+        /** Why a download was interrupted. */
+        error?: InterruptReason;
+        /** Number of bytes received so far from the host, without considering file compression. */
+        bytesReceived?: number;
+        /** Number of bytes in the whole file, without considering file compression, or -1 if unknown. */
+        totalBytes?: number;
+        /** Number of bytes in the whole file post-decompression, or -1 if unknown. */
+        fileSize?: number;
+        exists?: boolean;
+    }
+
+    /** The HTTP method to use if the URL uses the HTTP[S] protocol. */
+    enum _DownloadMethod {
+        GET = "GET",
+        POST = "POST"
+    }
+
+    /* downloads functions */
+    /**
+     * Download a URL. If the URL uses the HTTP[S] protocol, then the request will include all cookies currently set
+     * for its hostname. If both `filename` and `saveAs` are specified, then the Save As dialog will be displayed,
+     * pre-populated with the specified `filename`. If the download started successfully, `callback` will be called
+     * with the new DownloadItem's `downloadId`. If there was an error starting the download, then `callback` will be
+     * called with `downloadId=undefined` and browser.extension.lastError will contain a descriptive string. The error
+     * strings are not guaranteed to remain backwards compatible between releases. You must not parse it.
+     * @param options What to download and how.
+     */
+    function download(options: {
+        /** The URL to download. */
+        url: string;
+        /** A file path relative to the Downloads directory to contain the downloaded file. */
+        filename?: string;
+        /** Whether to associate the download with a private browsing session. */
+        incognito?: boolean;
+        conflictAction?: FilenameConflictAction;
+        /**
+         * Use a file-chooser to allow the user to select a filename. If the option is not specified, the file chooser
+         * will be shown only if the Firefox "Always ask you where to save files" option is enabled (i.e. the pref
+         * `browser.download.useDownloadDir` is set to `false`).
+         */
+        saveAs?: boolean;
+        /** The HTTP method to use if the URL uses the HTTP[S] protocol. */
+        method?: _DownloadMethod;
+        /**
+         * Extra HTTP headers to send with the request if the URL uses the HTTP[s] protocol. Each header is represented
+         * as a dictionary containing the keys `name` and either `value` or `binaryValue`, restricted to those allowed
+         * by XMLHttpRequest.
+         */
+        headers?: Array<{
+            /** Name of the HTTP header. */
+            name: string;
+            /** Value of the HTTP header. */
+            value: string;
+        }>;
+        /** Post body. */
+        body?: string;
+    }): Promise<number | undefined>;
+
+    /**
+     * Find DownloadItems. Set `query` to the empty object to get all DownloadItems. To get a specific DownloadItem,
+     * set only the `id` field.
+     */
+    function search(query: DownloadQuery): Promise<DownloadItem[]>;
+
+    /**
+     * Pause the download. If the request was successful the download is in a paused state. Otherwise
+     * browser.extension.lastError contains an error message. The request will fail if the download is not active.
+     * @param downloadId The id of the download to pause.
+     */
+    function pause(downloadId: number): Promise<void>;
+
+    /**
+     * Resume a paused download. If the request was successful the download is in progress and unpaused. Otherwise
+     * browser.extension.lastError contains an error message. The request will fail if the download is not active.
+     * @param downloadId The id of the download to resume.
+     */
+    function resume(downloadId: number): Promise<void>;
+
+    /**
+     * Cancel a download. When `callback` is run, the download is cancelled, completed, interrupted or doesn't exist
+     * anymore.
+     * @param downloadId The id of the download to cancel.
+     */
+    function cancel(downloadId: number): Promise<void>;
+
+    /**
+     * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated
+     * event has been received. The image returned by this function while a download is in progress may be different
+     * from the image returned after the download is complete. Icon retrieval is done by querying the underlying
+     * operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a
+     * number of factors including state of the download, platform, registered file types and visual theme. If a file
+     * icon cannot be determined, browser.extension.lastError will contain an error message.
+     * @param downloadId The identifier for the download.
+     */
+    function getFileIcon(downloadId: number, options?: {
+        /**
+         * The size of the icon. The returned icon will be square with dimensions size * size pixels. The default size
+         * for the icon is 32x32 pixels.
+         */
+        size?: number;
+    }): Promise<string>;
+
+    /** Open the downloaded file. */
+    function open(downloadId: number): Promise<void>;
+
+    /** Show the downloaded file in its folder in a file manager. */
+    function show(downloadId: number): Promise<boolean | undefined>;
+
+    function showDefaultFolder(): void;
+
+    /** Erase matching DownloadItems from history */
+    function erase(query: DownloadQuery): Promise<number[] | undefined>;
+
+    function removeFile(downloadId: number): Promise<void>;
+
+    /**
+     * Prompt the user to either accept or cancel a dangerous download. `acceptDanger()` does not automatically accept
+     * dangerous downloads.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function acceptDanger(downloadId: number): Promise<void>;
+
+    /**
+     * Initiate dragging the file to another application.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function drag(downloadId: number): void;
+
+    /** @deprecated Unsupported on Firefox at this time. */
+    function setShelfEnabled(enabled: boolean): void;
+
+    /* downloads events */
+    /** This event fires with the DownloadItem object when a download begins. */
+    const onCreated: WebExtEvent<(downloadItem: DownloadItem) => void>;
+
+    /**
+     * Fires with the `downloadId` when a download is erased from history.
+     * @param downloadId The `id` of the DownloadItem that was erased.
+     */
+    const onErased: WebExtEvent<(downloadId: number) => void>;
+
+    /**
+     * When any of a DownloadItem's properties except `bytesReceived` changes, this event fires with the `downloadId`
+     * and an object containing the properties that changed.
+     */
+    const onChanged: WebExtEvent<(downloadDelta: {
+        /** The `id` of the DownloadItem that changed. */
+        id: number;
+        /** Describes a change in a DownloadItem's `url`. */
+        url?: StringDelta;
+        /** Describes a change in a DownloadItem's `filename`. */
+        filename?: StringDelta;
+        /** Describes a change in a DownloadItem's `danger`. */
+        danger?: StringDelta;
+        /** Describes a change in a DownloadItem's `mime`. */
+        mime?: StringDelta;
+        /** Describes a change in a DownloadItem's `startTime`. */
+        startTime?: StringDelta;
+        /** Describes a change in a DownloadItem's `endTime`. */
+        endTime?: StringDelta;
+        /** Describes a change in a DownloadItem's `state`. */
+        state?: StringDelta;
+        canResume?: BooleanDelta;
+        /** Describes a change in a DownloadItem's `paused`. */
+        paused?: BooleanDelta;
+        /** Describes a change in a DownloadItem's `error`. */
+        error?: StringDelta;
+        /** Describes a change in a DownloadItem's `totalBytes`. */
+        totalBytes?: DoubleDelta;
+        /** Describes a change in a DownloadItem's `fileSize`. */
+        fileSize?: DoubleDelta;
+        exists?: BooleanDelta;
+    }) => void>;
+}
+
+/**
+ * The `browser.events` namespace contains common types used by APIs dispatching events to notify you when something
+ * interesting happens.
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.events {
+    /* events types */
+    /** Description of a declarative rule for handling events. */
+    interface Rule {
+        /** Optional identifier that allows referencing this rule. */
+        id?: string;
+        /** Tags can be used to annotate rules and perform operations on sets of rules. */
+        tags?: string[];
+        /** List of conditions that can trigger the actions. */
+        conditions: any[];
+        /** List of actions that are triggered if one of the condtions is fulfilled. */
+        actions: any[];
+        /** Optional priority of this rule. Defaults to 100. */
+        priority?: number;
+    }
+
+    /** An object which allows the addition and removal of listeners for a Chrome event. */
+    interface Event {
+        /**
+         * Registers an event listener _callback_ to an event.
+         * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
+         */
+        addListener(callback: () => void): void;
+
+        /**
+         * Deregisters an event listener _callback_ from an event.
+         * @param callback Listener that shall be unregistered.
+         */
+        removeListener(callback: () => void): void;
+
+        /**
+         * @param callback Listener whose registration status shall be tested.
+         * @returns True if _callback_ is registered to the event.
+         */
+        hasListener(callback: () => void): boolean;
+
+        /** @returns True if any event listeners are registered to the event. */
+        hasListeners(): boolean;
+
+        /**
+         * Registers rules to handle events.
+         * @param eventName Name of the event this function affects.
+         * @param webViewInstanceId If provided, this is an integer that uniquely identfies the <webview> associated
+         *     with this function call.
+         * @param rules Rules to be registered. These do not replace previously registered rules.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        addRules?(eventName: string, webViewInstanceId: number, rules: Rule[]): Promise<Rule[] | undefined>;
+
+        /**
+         * Returns currently registered rules.
+         * @param eventName Name of the event this function affects.
+         * @param webViewInstanceId If provided, this is an integer that uniquely identfies the <webview> associated
+         *     with this function call.
+         * @param [ruleIdentifiers] If an array is passed, only rules with identifiers contained in this array are
+         *     returned.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        getRules?(eventName: string, webViewInstanceId: number, ruleIdentifiers?: string[]): Promise<Rule[]>;
+
+        /**
+         * Unregisters currently registered rules.
+         * @param eventName Name of the event this function affects.
+         * @param webViewInstanceId If provided, this is an integer that uniquely identfies the <webview> associated
+         *     with this function call.
+         * @param [ruleIdentifiers] If an array is passed, only rules with identifiers contained in this array are
+         *     unregistered.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        removeRules?(eventName: string, webViewInstanceId: number, ruleIdentifiers?: string[]): Promise<void>;
+    }
+
+    /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
+    interface UrlFilter {
+        /**
+         * Matches if the host name of the URL contains a specified string. To test whether a host name component has a
+         * prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot
+         * is added at the beginning of the host name. Similarly, hostContains can be used to match against component
+         * suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last
+         * components need to be done separately using hostSuffix, because no implicit dot is added at the end of the
+         * host name.
+         */
+        hostContains?: string;
+        /** Matches if the host name of the URL is equal to a specified string. */
+        hostEquals?: string;
+        /** Matches if the host name of the URL starts with a specified string. */
+        hostPrefix?: string;
+        /** Matches if the host name of the URL ends with a specified string. */
+        hostSuffix?: string;
+        /** Matches if the path segment of the URL contains a specified string. */
+        pathContains?: string;
+        /** Matches if the path segment of the URL is equal to a specified string. */
+        pathEquals?: string;
+        /** Matches if the path segment of the URL starts with a specified string. */
+        pathPrefix?: string;
+        /** Matches if the path segment of the URL ends with a specified string. */
+        pathSuffix?: string;
+        /** Matches if the query segment of the URL contains a specified string. */
+        queryContains?: string;
+        /** Matches if the query segment of the URL is equal to a specified string. */
+        queryEquals?: string;
+        /** Matches if the query segment of the URL starts with a specified string. */
+        queryPrefix?: string;
+        /** Matches if the query segment of the URL ends with a specified string. */
+        querySuffix?: string;
+        /**
+         * Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from
+         * the URL if they match the default port number.
+         */
+        urlContains?: string;
+        /**
+         * Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped
+         * from the URL if they match the default port number.
+         */
+        urlEquals?: string;
+        /**
+         * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are
+         * stripped from the URL if they match the default port number. The regular expressions use the [RE2
+         * syntax](https://github.com/google/re2/blob/master/doc/syntax.txt).
+         */
+        urlMatches?: string;
+        /**
+         * Matches if the URL without query segment and fragment identifier matches a specified regular expression.
+         * Port numbers are stripped from the URL if they match the default port number. The regular expressions use
+         * the [RE2 syntax](https://github.com/google/re2/blob/master/doc/syntax.txt).
+         */
+        originAndPathMatches?: string;
+        /**
+         * Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped
+         * from the URL if they match the default port number.
+         */
+        urlPrefix?: string;
+        /**
+         * Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped
+         * from the URL if they match the default port number.
+         */
+        urlSuffix?: string;
+        /** Matches if the scheme of the URL is equal to any of the schemes specified in the array. */
+        schemes?: string[];
+        /**
+         * Matches if the port of the URL is contained in any of the specified port lists. For example `[80, 443,
+         * [1000, 1200]]` matches all requests on port 80, 443 and in the range 1000-1200.
+         */
+        ports?: Array<number | [number, number]>;
+    }
+}
+
+/**
+ * The `browser.extension` API has utilities that can be used by any extension page. It includes support for exchanging
+ * messages between an extension and its content scripts or between extensions, as described in detail in Message
+ * Passing.
+ */
+declare namespace browser.extension {
+    /* extension types */
+
+    /** The type of extension view. */
+    enum ViewType {
+        tab = "tab",
+        popup = "popup",
+        sidebar = "sidebar"
+    }
+
+    /* extension properties */
+    /**
+     * Set for the lifetime of a callback if an ansychronous extension api has resulted in an error. If no error has
+     * occured lastError will be `undefined`.
+     */
+    const lastError: {
+        /** Description of the error that has taken place. */
+        message: string;
+    } | undefined;
+
+    /**
+     * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito
+     * process. The latter only applies to extensions with 'split' incognito_behavior.
+     */
+    const inIncognitoContext: boolean | undefined;
+
+    /* extension functions */
+    /**
+     * Converts a relative path within an extension install directory to a fully-qualified URL.
+     * @param path A path to a resource within an extension expressed relative to its install directory.
+     * @returns The fully-qualified URL to the resource.
+     */
+    function getURL(path: string): string;
+
+    /**
+     * Returns an array of the JavaScript 'window' objects for each of the pages running inside the current extension.
+     * @returns Array of global objects
+     */
+    function getViews(fetchProperties?: {
+        /**
+         * The type of view to get. If omitted, returns all views (including background pages and tabs). Valid values:
+         * 'tab', 'popup', 'sidebar'.
+         */
+        type?: ViewType;
+        /** The window to restrict the search to. If omitted, returns all views. */
+        windowId?: number;
+        /** Find a view according to a tab id. If this field is omitted, returns all views. */
+        tabId?: number;
+    }): Window[];
+
+    /**
+     * Returns the JavaScript 'window' object for the background page running inside the current extension. Returns
+     * null if the extension has no background page.
+     */
+    function getBackgroundPage(): Window | void;
+
+    /**
+     * Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed
+     * in Incognito' checkbox.
+     */
+    function isAllowedIncognitoAccess(): Promise<boolean>;
+
+    /**
+     * Retrieves the state of the extension's access to the 'file://' scheme (as determined by the user-controlled
+     * 'Allow access to File URLs' checkbox.
+     */
+    function isAllowedFileSchemeAccess(): Promise<boolean>;
+
+    /**
+     * Sets the value of the ap CGI parameter used in the extension's update URL. This value is ignored for extensions
+     * that are hosted in the browser vendor's store.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function setUpdateUrlData(data: string): void;
+
+    /* extension events */
+    /**
+     * Fired when a request is sent from either an extension process or a content script.
+     * @param request The request sent by the calling script.
+     * @param sendResponse Function to call (at most once) when you have a response. The argument should be any
+     *     JSON-ifiable object, or undefined if there is no response. If you have more than one `onRequest` listener in
+     *     the same document, then only one may send a response.
+     * @deprecated Please use `runtime.onMessage`.
+     */
+    const onRequest: WebExtEvent<(request: any, sender: runtime.MessageSender, sendResponse: (response?: any) => void) => void> | undefined;
+
+    /**
+     * Fired when a request is sent from another extension.
+     * @param request The request sent by the calling script.
+     * @param sendResponse Function to call when you have a response. The argument should be any JSON-ifiable object,
+     *     or undefined if there is no response.
+     * @deprecated Please use `runtime.onMessageExternal`.
+     */
+    const onRequestExternal: WebExtEvent<(request: any, sender: runtime.MessageSender, sendResponse: (response?: any) => void) => void> | undefined;
+}
+
+/**
+ * The `browser.extensionTypes` API contains type declarations for WebExtensions.
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.extensionTypes {
+    /* extensionTypes types */
+
+    /** The format of an image. */
+    enum ImageFormat {
+        jpeg = "jpeg",
+        png = "png"
+    }
+
+    /** Details about the format and quality of an image. */
+    interface ImageDetails {
+        /** The format of the resulting image. Default is `"jpeg"`. */
+        format?: ImageFormat;
+        /**
+         * When format is `"jpeg"`, controls the quality of the resulting image. This value is ignored for PNG images.
+         * As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed
+         * to store it will decrease.
+         */
+        quality?: number;
+    }
+
+    /** The soonest that the JavaScript or CSS will be injected into the tab. */
+    enum RunAt {
+        document_start = "document_start",
+        document_end = "document_end",
+        document_idle = "document_idle"
+    }
+
+    /** The origin of the CSS to inject, this affects the cascading order (priority) of the stylesheet. */
+    enum CSSOrigin {
+        user = "user",
+        author = "author"
+    }
+
+    /**
+     * Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be
+     * set at the same time.
+     */
+    interface InjectDetails {
+        /**
+         * JavaScript or CSS code to inject.
+         *
+         * **Warning:**
+         * Be careful using the `code` parameter. Incorrect use of it may open your extension to [cross site
+         * scripting](https://en.wikipedia.org/wiki/Cross-site_scripting) attacks.
+         */
+        code?: string;
+        /** JavaScript or CSS file to inject. */
+        file?: string;
+        /**
+         * If allFrames is `true`, implies that the JavaScript or CSS should be injected into all frames of current
+         * page. By default, it's `false` and is only injected into the top frame.
+         */
+        allFrames?: boolean;
+        /**
+         * If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your
+         * extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default
+         * it is `false`.
+         */
+        matchAboutBlank?: boolean;
+        /** The ID of the frame to inject the script into. This may not be used in combination with `allFrames`. */
+        frameId?: number;
+        /** The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle". */
+        runAt?: RunAt;
+        /** The css origin of the stylesheet to inject. Defaults to "author". */
+        cssOrigin?: CSSOrigin;
+    }
+
+    type Date = string | number | object/*Date*/;
+}
+
+/**
+ * Use the `browser.i18n` infrastructure to implement internationalization across your whole app or extension.
+ */
+declare namespace browser.i18n {
+    /* i18n types */
+    /**
+     * An ISO language code such as `en` or `fr`. For a complete list of languages supported by this method, see
+     * [kLanguageInfoTable](http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc).
+     * For an unknown language, `und` will be returned, which means that [percentage] of the text is unknown to CLD
+     */
+    type LanguageCode = string;
+
+    /* i18n functions */
+    /**
+     * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the
+     * locale, use `i18n.getUILanguage`.
+     */
+    function getAcceptLanguages(): Promise<LanguageCode[]>;
+
+    /**
+     * Gets the localized string for the specified message. If the message is missing, this method returns an empty
+     * string (''). If the format of the `getMessage()` call is wrong — for example, _messageName_ is not a string or
+     * the _substitutions_ array has more than 9 elements — this method returns `undefined`.
+     * @param messageName The name of the message, as specified in the `messages.json` file.
+     * @param [substitutions] Substitution strings, if the message requires any.
+     * @returns Message localized for current locale.
+     */
+    function getMessage(messageName: string, substitutions?: any): string;
+
+    /**
+     * Gets the browser UI language of the browser. This is different from `i18n.getAcceptLanguages` which returns the
+     * preferred user languages.
+     * @returns The browser UI language code such as en-US or fr-FR.
+     */
+    function getUILanguage(): string;
+
+    /**
+     * Detects the language of the provided text using CLD.
+     * @param text User input string to be translated.
+     */
+    function detectLanguage(text: string): Promise<{
+        /** CLD detected language reliability */
+        isReliable: boolean;
+        /** array of detectedLanguage */
+        languages: Array<{
+            language: LanguageCode;
+            /** The percentage of the detected language */
+            percentage: number;
+        }>;
+    }>;
+}
+
+/**
+ * Use the browser.identity API to get OAuth2 access tokens.
+ *
+ * Permissions: `identity`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.identity {
+    /* identity types */
+    /** An object encapsulating an OAuth account id. */
+    interface AccountInfo {
+        /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+        id: string;
+    }
+
+    /* identity functions */
+    /**
+     * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getAccounts(): Promise<AccountInfo[]>;
+
+    /**
+     * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getAuthToken(details?: {
+        interactive?: boolean;
+        account?: AccountInfo;
+        scopes?: string[];
+    }): Promise<AccountInfo[] | undefined>;
+
+    /**
+     * Retrieves email address and obfuscated gaia id of the user signed into a profile.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getProfileUserInfo(): Promise<{
+        email: string;
+        id: string;
+    }>;
+
+    /**
+     * Removes an OAuth2 access token from the Identity API's token cache.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function removeCachedAuthToken(details: {
+        token: string;
+    }): Promise<{
+        email: string;
+        id: string;
+    } | undefined>;
+
+    /** Starts an auth flow at the specified URL. */
+    function launchWebAuthFlow(details: {
+        url: string;
+        interactive?: boolean;
+    }): Promise<string>;
+
+    /**
+     * Generates a redirect URL to be used in |launchWebAuthFlow|.
+     * @param [ path] The path appended to the end of the generated URL.
+     */
+    function getRedirectURL(path?: string): string;
+
+    /* identity events */
+    /**
+     * Fired when signin state changes for an account on the user's profile.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onSignInChanged: WebExtEvent<(account: AccountInfo, signedIn: boolean) => void> | undefined;
+}
+
+/**
+ * Use the `browser.idle` API to detect when the machine's idle state changes.
+ *
+ * Permissions: `idle`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.idle {
+    /* idle types */
+    enum IdleState {
+        active = "active",
+        idle = "idle"
+    }
+
+    /* idle functions */
+    /**
+     * Returns "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+     * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have
+     *     elapsed since the last user input detected.
+     */
+    function queryState(detectionIntervalInSeconds: number): Promise<IdleState>;
+
+    /**
+     * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events.
+     * The default interval is 60 seconds.
+     * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
+     */
+    function setDetectionInterval(intervalInSeconds: number): void;
+
+    /* idle events */
+    /**
+     * Fired when the system changes to an active or idle state. The event fires with "idle" if the the user has not
+     * generated any input for a specified number of seconds, and "active" when the user generates input on an idle
+     * system.
+     */
+    const onStateChanged: WebExtEvent<(newState: IdleState) => void>;
+}
+
+/**
+ * The `browser.management` API provides ways to manage the list of extensions that are installed and running.
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.management {
+    /* management types */
+    /** Information about an icon belonging to an extension. */
+    interface IconInfo {
+        /**
+         * A number representing the width and height of the icon. Likely values include (but are not limited to) 128,
+         * 48, 24, and 16.
+         */
+        size: number;
+        /**
+         * The URL for this icon image. To display a grayscale version of the icon (to indicate that an extension is
+         * disabled, for example), append `?grayscale=true` to the URL.
+         */
+        url: string;
+    }
+
+    /** A reason the item is disabled. */
+    enum ExtensionDisabledReason {
+        unknown = "unknown",
+        permissions_increase = "permissions_increase"
+    }
+
+    /** The type of this extension. Will always be 'extension'. */
+    enum ExtensionType {
+        extension = "extension",
+        theme = "theme"
+    }
+
+    /**
+     * How the extension was installed. One of
+     * `development`: The extension was loaded unpacked in developer mode,
+     * `normal`: The extension was installed normally via an .xpi file,
+     * `sideload`: The extension was installed by other software on the machine,
+     * `other`: The extension was installed by other means.
+     */
+    enum ExtensionInstallType {
+        development = "development",
+        normal = "normal",
+        sideload = "sideload",
+        other = "other"
+    }
+
+    /** Information about an installed extension. */
+    interface ExtensionInfo {
+        /** The extension's unique identifier. */
+        id: string;
+        /** The name of this extension. */
+        name: string;
+        /** A short version of the name of this extension. */
+        shortName?: string;
+        /** The description of this extension. */
+        description: string;
+        /** The version of this extension. */
+        version: string;
+        /** The version name of this extension if the manifest specified one. */
+        versionName?: string;
+        /** Whether this extension can be disabled or uninstalled by the user. */
+        mayDisable: boolean;
+        /** Whether it is currently enabled or disabled. */
+        enabled: boolean;
+        /** A reason the item is disabled. */
+        disabledReason?: ExtensionDisabledReason;
+        /** The type of this extension. Will always return 'extension'. */
+        type: ExtensionType;
+        /** The URL of the homepage of this extension. */
+        homepageUrl?: string;
+        /** The update URL of this extension. */
+        updateUrl?: string;
+        /** The url for the item's options page, if it has one. */
+        optionsUrl: string;
+        /**
+         * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual
+         * image at that url may be larger or smaller than what was declared, so you might consider using explicit
+         * width and height attributes on img tags referencing these images. See the manifest documentation on icons
+         * for more details.
+         */
+        icons?: IconInfo[];
+        /** Returns a list of API based permissions. */
+        permissions?: string[];
+        /** Returns a list of host based permissions. */
+        hostPermissions?: string[];
+        /** How the extension was installed. */
+        installType: ExtensionInstallType;
+    }
+
+    /* management functions */
+    /** Returns a list of information about installed extensions. */
+    function getAll(): Promise<ExtensionInfo[] | undefined>;
+
+    /**
+     * Returns information about the installed extension that has the given ID.
+     * @param id The ID from an item of `management.ExtensionInfo`.
+     */
+    function get(id: _manifest.ExtensionID): Promise<ExtensionInfo | undefined>;
+
+    /**
+     * Returns information about the calling extension. Note: This function can be used without requesting the
+     * 'management' permission in the manifest.
+     */
+    function getSelf(): Promise<ExtensionInfo | undefined>;
+
+    /**
+     * Uninstalls the calling extension. Note: This function can be used without requesting the 'management' permission
+     * in the manifest.
+     */
+    function uninstallSelf(options?: {
+        /** Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false. */
+        showConfirmDialog?: boolean;
+        /** The message to display to a user when being asked to confirm removal of the extension. */
+        dialogMessage?: string;
+    }): Promise<void>;
+
+    /**
+     * Enables or disables the given add-on.
+     * @param id ID of the add-on to enable/disable.
+     * @param enabled Whether to enable or disable the add-on.
+     */
+    function setEnabled(id: string, enabled: boolean): Promise<void>;
+
+    /* management events */
+    /** Fired when an addon has been disabled. */
+    const onDisabled: WebExtEvent<(info: ExtensionInfo) => void>;
+
+    /** Fired when an addon has been enabled. */
+    const onEnabled: WebExtEvent<(info: ExtensionInfo) => void>;
+
+    /** Fired when an addon has been installed. */
+    const onInstalled: WebExtEvent<(info: ExtensionInfo) => void>;
+
+    /** Fired when an addon has been uninstalled. */
+    const onUninstalled: WebExtEvent<(info: ExtensionInfo) => void>;
+}
+
+/**
+ * Permissions: `notifications`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.notifications {
+    /* notifications types */
+    enum TemplateType {
+        basic = "basic",
+        image = "image",
+        list = "list",
+        progress = "progress"
+    }
+
+    enum PermissionLevel {
+        granted = "granted",
+        denied = "denied"
+    }
+
+    interface NotificationItem {
+        /** Title of one item of a list notification. */
+        title: string;
+        /** Additional details about this item. */
+        message: string;
+    }
+
+    interface CreateNotificationOptions {
+        /** Which type of notification to display. */
+        type: TemplateType;
+        /** A URL to the sender's avatar, app icon, or a thumbnail for image notifications. */
+        iconUrl?: string;
+        /** A URL to the app icon mask. */
+        appIconMaskUrl?: string;
+        /** Title of the notification (e.g. sender name for email). */
+        title: string;
+        /** Main notification content. */
+        message: string;
+        /** Alternate notification content with a lower-weight font. */
+        contextMessage?: string;
+        /** Priority ranges from -2 to 2\. -2 is lowest priority. 2 is highest. Zero is default. */
+        priority?: number;
+        /** A timestamp associated with the notification, in milliseconds past the epoch. */
+        eventTime?: number;
+        /**
+         * Text and icons for up to two notification action buttons.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        buttons?: Array<{
+            title: string;
+            iconUrl?: string;
+        }>;
+        /** A URL to the image thumbnail for image-type notifications. */
+        imageUrl?: string;
+        /** Items for multi-item notifications. */
+        items?: NotificationItem[];
+        /** Current progress ranges from 0 to 100. */
+        progress?: number;
+        /**
+         * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+         */
+        isClickable?: boolean;
+    }
+
+    interface UpdateNotificationOptions {
+        /** Which type of notification to display. */
+        type?: TemplateType;
+        /** A URL to the sender's avatar, app icon, or a thumbnail for image notifications. */
+        iconUrl?: string;
+        /** A URL to the app icon mask. */
+        appIconMaskUrl?: string;
+        /** Title of the notification (e.g. sender name for email). */
+        title?: string;
+        /** Main notification content. */
+        message?: string;
+        /** Alternate notification content with a lower-weight font. */
+        contextMessage?: string;
+        /** Priority ranges from -2 to 2\. -2 is lowest priority. 2 is highest. Zero is default. */
+        priority?: number;
+        /** A timestamp associated with the notification, in milliseconds past the epoch. */
+        eventTime?: number;
+        /**
+         * Text and icons for up to two notification action buttons.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        buttons?: Array<{
+            title: string;
+            iconUrl?: string;
+        }>;
+        /** A URL to the image thumbnail for image-type notifications. */
+        imageUrl?: string;
+        /** Items for multi-item notifications. */
+        items?: NotificationItem[];
+        /** Current progress ranges from 0 to 100. */
+        progress?: number;
+        /**
+         * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+         */
+        isClickable?: boolean;
+    }
+
+    /* notifications functions */
+    /**
+     * Creates and displays a notification.
+     * @param options Contents of the notification.
+     */
+    function create(options: CreateNotificationOptions): Promise<string | undefined>;
+    /**
+     * Creates and displays a notification.
+     * @param notificationId Identifier of the notification. If it is empty, this method generates an id. If it matches
+     *     an existing notification, this method first clears that notification before proceeding with the create
+     *     operation.
+     * @param options Contents of the notification.
+     */
+    function create(notificationId: string, options: CreateNotificationOptions): Promise<string | undefined>;
+
+    /**
+     * Updates an existing notification.
+     * @param notificationId The id of the notification to be updated.
+     * @param options Contents of the notification to update to.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function update(notificationId: string, options: UpdateNotificationOptions): Promise<boolean | undefined>;
+
+    /**
+     * Clears an existing notification.
+     * @param notificationId The id of the notification to be updated.
+     */
+    function clear(notificationId: string): Promise<boolean | undefined>;
+
+    /** Retrieves all the notifications. */
+    function getAll(): Promise<CreateNotificationOptions>;
+
+    /**
+     * Retrieves whether the user has enabled notifications from this app or extension.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getPermissionLevel(): Promise<PermissionLevel>;
+
+    /* notifications events */
+    /**
+     * Fired when the notification closed, either by the system or by user action.
+     * @param notificationId The notificationId of the closed notification.
+     * @param byUser True if the notification was closed by the user.
+     */
+    const onClosed: WebExtEvent<(notificationId: string, byUser: boolean) => void>;
+
+    /**
+     * Fired when the user clicked in a non-button area of the notification.
+     * @param notificationId The notificationId of the clicked notification.
+     */
+    const onClicked: WebExtEvent<(notificationId: string) => void>;
+
+    /**
+     * Fired when the user pressed a button in the notification.
+     * @param notificationId The notificationId of the clicked notification.
+     * @param buttonIndex The index of the button clicked by the user.
+     */
+    const onButtonClicked: WebExtEvent<(notificationId: string, buttonIndex: number) => void>;
+
+    /**
+     * Fired when the user changes the permission level.
+     * @param level The new permission level.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onPermissionLevelChanged: WebExtEvent<(level: PermissionLevel) => void> | undefined;
+
+    /**
+     * Fired when the user clicked on a link for the app's notification settings.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onShowSettings: WebExtEvent<() => void> | undefined;
+
+    /**
+     * Fired when the notification is shown.
+     * @param notificationId The notificationId of the shown notification.
+     */
+    const onShown: WebExtEvent<(notificationId: string) => void>;
+}
+
+/**
+ * Manifest keys: `optional_permissions`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.permissions {
+    /* permissions types */
+    interface Permissions {
+        permissions?: _manifest.OptionalPermission[];
+        origins?: _manifest.MatchPattern[];
+    }
+
+    interface AnyPermissions {
+        permissions?: _manifest.Permission[];
+        origins?: _manifest.MatchPatternInternal[];
+    }
+
+    /* permissions functions */
+    /** Get a list of all the extension's permissions. */
+    function getAll(): Promise<AnyPermissions>;
+
+    /** Check if the extension has the given permissions. */
+    function contains(permissions: AnyPermissions): Promise<boolean>;
+
+    /**
+     * Request the given permissions.
+     *
+     * Not allowed in: Devtools pages
+     */
+    function request(permissions: Permissions): Promise<boolean>;
+
+    /** Relinquish the given permissions. */
+    function remove(permissions: Permissions): Promise<void>;
+
+    /* permissions events */
+    /**
+     * Fired when the extension acquires new permissions.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onAdded: WebExtEvent<(permissions: Permissions) => void> | undefined;
+
+    /**
+     * Fired when permissions are removed from the extension.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onRemoved: WebExtEvent<(permissions: Permissions) => void> | undefined;
+}
+
+/**
+ * Permissions: `privacy`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.privacy {
+}
+
+/**
+ * Use the `browser.privacy` API to control usage of the features in the browser that can affect a user's privacy.
+ *
+ * Permissions: `privacy`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.privacy.network {
+    /* privacy.network types */
+
+    /** The IP handling policy of WebRTC. */
+    enum IPHandlingPolicy {
+        default = "default",
+        default_public_and_private_interfaces = "default_public_and_private_interfaces",
+        default_public_interface_only = "default_public_interface_only",
+        disable_non_proxied_udp = "disable_non_proxied_udp"
+    }
+
+    /* privacy.network properties */
+    /**
+     * If enabled, the browser attempts to speed up your web browsing experience by pre-resolving DNS entries,
+     * prerendering sites (`<link rel='prefetch' ...>`), and preemptively opening TCP and SSL connections to servers.
+     * This preference's value is a boolean, defaulting to `true`.
+     */
+    const networkPredictionEnabled: types.Setting;
+
+    /** Allow users to enable and disable RTCPeerConnections (aka WebRTC). */
+    const peerConnectionEnabled: types.Setting;
+
+    /**
+     * Allow users to specify the media performance/privacy tradeoffs which impacts how WebRTC traffic will be routed
+     * and how much local address information is exposed. This preference's value is of type IPHandlingPolicy,
+     * defaulting to `default`.
+     */
+    const webRTCIPHandlingPolicy: types.Setting;
+}
+
+/**
+ * Use the `browser.privacy` API to control usage of the features in the browser that can affect a user's privacy.
+ *
+ * Permissions: `privacy`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.privacy.services {
+    /* privacy.services properties */
+    /**
+     * If enabled, the password manager will ask if you want to save passwords. This preference's value is a boolean,
+     * defaulting to `true`.
+     */
+    const passwordSavingEnabled: types.Setting;
+}
+
+/**
+ * Use the `browser.privacy` API to control usage of the features in the browser that can affect a user's privacy.
+ *
+ * Permissions: `privacy`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.privacy.websites {
+    /* privacy.websites types */
+
+    /** The mode for tracking protection. */
+    enum TrackingProtectionModeOption {
+        always = "always",
+        never = "never",
+        private_browsing = "private_browsing"
+    }
+
+    /* privacy.websites properties */
+    /**
+     * If disabled, the browser blocks third-party sites from setting cookies. The value of this preference is of type
+     * boolean, and the default value is `true`.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const thirdPartyCookiesAllowed: types.Setting | undefined;
+
+    /**
+     * If enabled, the browser sends auditing pings when requested by a website (`<a ping>`). The value of this
+     * preference is of type boolean, and the default value is `true`.
+     */
+    const hyperlinkAuditingEnabled: types.Setting;
+
+    /**
+     * If enabled, the browser sends `referer` headers with your requests. Yes, the name of this preference doesn't
+     * match the misspelled header. No, we're not going to change it. The value of this preference is of type boolean,
+     * and the default value is `true`.
+     */
+    const referrersEnabled: types.Setting;
+
+    /**
+     * If enabled, the browser attempts to appear similar to other users by reporting generic information to websites.
+     * This can prevent websites from uniquely identifying users. Examples of data that is spoofed include number of
+     * CPU cores, precision of JavaScript timers, the local timezone, and disabling features such as GamePad support,
+     * and the WebSpeech and Navigator APIs. The value of this preference is of type boolean, and the default value is
+     * `false`.
+     */
+    const resistFingerprinting: types.Setting;
+
+    /**
+     * If enabled, the browser will associate all data (including cookies, HSTS data, cached images, and more) for any
+     * third party domains with the domain in the address bar. This prevents third party trackers from using directly
+     * stored information to identify you across different websites, but may break websites where you login with a
+     * third party account (such as a Facebook or Google login.) The value of this preference is of type boolean, and
+     * the default value is `false`.
+     */
+    const firstPartyIsolate: types.Setting;
+
+    /**
+     * **Available on Windows and ChromeOS only**: If enabled, the browser provides a unique ID to plugins in order to
+     * run protected content. The value of this preference is of type boolean, and the default value is `true`.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const protectedContentEnabled: types.Setting | undefined;
+
+    /**
+     * Allow users to specify the mode for tracking protection. This setting's value is of type
+     * TrackingProtectionModeOption, defaulting to `private_browsing_only`.
+     */
+    const trackingProtectionMode: types.Setting;
+}
+
+/**
+ * Use the browser.proxy API to register proxy scripts in Firefox. Proxy scripts in Firefox are proxy auto-config files
+ * with extra contextual information and support for additional return types.
+ *
+ * Permissions: `proxy`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.proxy {
+    /* proxy functions */
+    /** Registers the proxy script for the extension. */
+    function register(url: string): Promise<void>;
+
+    /** Unregisters the proxy script for the extension. */
+    function unregister(): Promise<void>;
+
+    /**
+     * Registers the proxy script for the extension.
+     * @deprecated Please use `proxy.register`
+     */
+    function registerProxyScript(url: string): Promise<any>;
+
+    /* proxy events */
+    /** Notifies about proxy script errors. */
+    const onProxyError: WebExtEvent<(error: object) => void>;
+}
+
+/**
+ * Use the `browser.runtime` API to retrieve the background page, return details about the manifest, and listen for and
+ * respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs
+ * to fully-qualified URLs.
+ *
+ * Allowed in: Proxy scripts
+ */
+declare namespace browser.runtime {
+    /* runtime types */
+    /** An object which allows two way communication with other pages. */
+    interface Port {
+        name: string;
+        disconnect: () => void;
+        onDisconnect: events.Event;
+        onMessage: events.Event;
+        postMessage: () => void;
+        /** This property will **only** be present on ports passed to onConnect/onConnectExternal listeners. */
+        sender?: MessageSender;
+    }
+
+    /** An object containing information about the script context that sent a message or request. */
+    interface MessageSender {
+        /**
+         * The `tabs.Tab` which opened the connection, if any. This property will **only** be present when the
+         * connection was opened from a tab (including content scripts), and **only** if the receiver is an extension,
+         * not an app.
+         */
+        tab?: tabs.Tab;
+        /**
+         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be
+         * set when `tab` is set.
+         */
+        frameId?: number;
+        /** The ID of the extension or app that opened the connection, if any. */
+        id?: string;
+        /**
+         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's
+         * URL not the URL of the page which hosts it.
+         */
+        url?: string;
+        /**
+         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app,
+         * and if available.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        tlsChannelId?: string;
+    }
+
+    /** The operating system the browser is running on. */
+    enum PlatformOs {
+        mac = "mac",
+        win = "win",
+        android = "android",
+        cros = "cros",
+        linux = "linux",
+        openbsd = "openbsd"
+    }
+
+    /** The machine's processor architecture. */
+    enum PlatformArch {
+        arm = "arm",
+        x8632 = "x86-32",
+        x8664 = "x86-64"
+    }
+
+    /** An object containing information about the current platform. */
+    interface PlatformInfo {
+        /** The operating system the browser is running on. */
+        os: PlatformOs;
+        /** The machine's processor architecture. */
+        arch: PlatformArch;
+        /**
+         * The native client architecture. This may be different from arch on some platforms.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        nacl_arch?: PlatformNaclArch;
+    }
+
+    /** An object containing information about the current browser. */
+    interface BrowserInfo {
+        /** The name of the browser, for example 'Firefox'. */
+        name: string;
+        /** The name of the browser vendor, for example 'Mozilla'. */
+        vendor: string;
+        /** The browser's version, for example '42.0.0' or '0.8.1pre'. */
+        version: string;
+        /** The browser's build ID/date, for example '20160101'. */
+        buildID: string;
+    }
+
+    /** Result of the update check. */
+    enum RequestUpdateCheckStatus {
+        throttled = "throttled",
+        no_update = "no_update",
+        update_available = "update_available"
+    }
+
+    /** The reason that this event is being dispatched. */
+    enum OnInstalledReason {
+        install = "install",
+        update = "update",
+        browser_update = "browser_update"
+    }
+
+    /**
+     * The reason that the event is being dispatched. 'app_update' is used when the restart is needed because the
+     * application is updated to a newer version. 'os_update' is used when the restart is needed because the browser/OS
+     * is updated to a newer version. 'periodic' is used when the system runs for more than the permitted uptime set in
+     * the enterprise policy.
+     */
+    enum OnRestartRequiredReason {
+        app_update = "app_update",
+        os_update = "os_update",
+        periodic = "periodic"
+    }
+
+    type PlatformNaclArch = any;
+
+    /* runtime properties */
+    /** This will be defined during an API method callback if there was an error */
+    const lastError: {
+        /** Details about the error which occurred. */
+        message?: string;
+    } | undefined;
+
+    /** The ID of the extension/app. */
+    const id: string;
+
+    /* runtime functions */
+    /**
+     * Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If
+     * the background page is an event page, the system will ensure it is loaded before calling the callback. If there
+     * is no background page, an error is set.
+     */
+    function getBackgroundPage(): Promise<Window>;
+
+    /**
+     * 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 the browser
+     * happens to support at the time.
+     *
+     * If your Extension does not declare an options page, or the browser failed to create one for some other reason,
+     * the callback will set `lastError`.
+     */
+    function openOptionsPage(): Promise<void>;
+
+    /**
+     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full
+     * manifest file.
+     */
+    function getManifest(): _manifest.WebExtensionManifest;
+
+    /**
+     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+     * @param path A path to a resource within an app/extension expressed relative to its install directory.
+     * @returns The fully-qualified URL to the resource.
+     */
+    function getURL(path: string): string;
+
+    /**
+     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and
+     * implement surveys. Maximum 255 characters.
+     * @param url 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.
+     */
+    function setUninstallURL(url: string): Promise<void>;
+
+    /** Reloads the app or extension. */
+    function reload(): void;
+
+    /**
+     * Requests an update check for this app/extension.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function requestUpdateCheck(): Promise<object>;
+
+    /**
+     * Restart the device when the app runs in kiosk mode. Otherwise, it's no-op.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function restart(): void;
+
+    /**
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other
+     * extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension
+     * communication, and web messaging. Note that this does not connect to any listeners in a content script.
+     * Extensions may connect to content scripts embedded in tabs via `tabs.connect`.
+     * @param [extensionId] The ID of the extension or app to connect to. If omitted, a connection will be attempted
+     *     with your own extension. Required if sending messages from a web page for web messaging.
+     * @returns Port through which messages can be sent and received. The port's `runtime.Port onDisconnect` event is
+     *     fired if the extension/app does not exist.
+     */
+    function connect(extensionId?: string, connectInfo?: {
+        /** Will be passed into onConnect for processes that are listening for the connection event. */
+        name?: string;
+        /**
+         * Whether the TLS channel ID will be passed into onConnectExternal for processes that are listening for the
+         * connection event.
+         */
+        includeTlsChannelId?: boolean;
+    }): Port;
+
+    /**
+     * Connects to a native application in the host machine.
+     * @param application The name of the registered application to connect to.
+     * @returns Port through which messages can be sent and received with the application
+     */
+    function connectNative(application: string): Port;
+
+    /**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to
+     * `runtime.connect` but only sends a single message, with an optional response. If sending to your extension, the
+     * `runtime.onMessage` event will be fired in each page, or `runtime.onMessageExternal`, if a different extension.
+     * Note that extensions cannot send messages to content scripts using this method. To send messages to content
+     * scripts, use `tabs.sendMessage`.
+     *
+     * Allowed in: Proxy scripts
+     */
+    function sendMessage(message: any, options?: {
+        /**
+         * Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the
+         * connection event.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        includeTlsChannelId?: boolean;
+        /** If true, the message will be directed to the extension's proxy sandbox. */
+        toProxyScript?: boolean;
+    }): Promise<any>;
+    /**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to
+     * `runtime.connect` but only sends a single message, with an optional response. If sending to your extension, the
+     * `runtime.onMessage` event will be fired in each page, or `runtime.onMessageExternal`, if a different extension.
+     * Note that extensions cannot send messages to content scripts using this method. To send messages to content
+     * scripts, use `tabs.sendMessage`.
+     *
+     * Allowed in: Proxy scripts
+     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to
+     *     your own extension/app. Required if sending messages from a web page for web messaging.
+     */
+    function sendMessage(extensionId: string, message: any, options?: {
+        /**
+         * Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the
+         * connection event.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        includeTlsChannelId?: boolean;
+        /** If true, the message will be directed to the extension's proxy sandbox. */
+        toProxyScript?: boolean;
+    }): Promise<any>;
+
+    /**
+     * Send a single message to a native application.
+     * @param application The name of the native messaging host.
+     * @param message The message that will be passed to the native messaging host.
+     */
+    function sendNativeMessage(application: string, message: any): Promise<any>;
+
+    /** Returns information about the current browser. */
+    function getBrowserInfo(): Promise<BrowserInfo>;
+
+    /** Returns information about the current platform. */
+    function getPlatformInfo(): Promise<PlatformInfo>;
+
+    /**
+     * Returns a DirectoryEntry for the package directory.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getPackageDirectoryEntry(): Promise<object/*DirectoryEntry*/>;
+
+    /* runtime events */
+    /**
+     * Fired when a profile that has this extension installed first starts up. This event is not fired for incognito
+     * profiles.
+     */
+    const onStartup: WebExtEvent<() => void>;
+
+    /**
+     * Fired when the extension is first installed, when the extension is updated to a new version, and when the
+     * browser is updated to a new version.
+     */
+    const onInstalled: WebExtEvent<(details: {
+        /** The reason that this event is being dispatched. */
+        reason: OnInstalledReason;
+        /**
+         * Indicates the previous version of the extension, which has just been updated. This is present only if
+         * 'reason' is 'update'.
+         */
+        previousVersion?: string;
+        /** Indicates whether the addon is installed as a temporary extension. */
+        temporary: boolean;
+        /**
+         * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is
+         * 'shared_module_update'.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        id?: string;
+    }) => void>;
+
+    /**
+     * Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up.
+     * Note that since the page is unloading, any asynchronous operations started while handling this event are not
+     * guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled
+     * event will be sent and the page won't be unloaded.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onSuspend: WebExtEvent<() => void> | undefined;
+
+    /**
+     * Sent after onSuspend to indicate that the app won't be unloaded after all.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onSuspendCanceled: WebExtEvent<() => void> | undefined;
+
+    /**
+     * Fired when an update is available, but isn't installed immediately because the app is currently running. If you
+     * do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be
+     * installed sooner you can explicitly call `runtime.reload`. If your extension is using a persistent background
+     * page, the background page of course never gets unloaded, so unless you call `runtime.reload` manually in
+     * response to this event the update will not get installed until the next time the browser itself restarts. If no
+     * handlers are listening for this event, and your extension has a persistent background page, it behaves as if
+     * `runtime.reload` is called in response to this event.
+     * @param details The manifest details of the available update.
+     */
+    const onUpdateAvailable: WebExtEvent<(details: {
+        /** The version number of the available update. */
+        version: string;
+    }) => void>;
+
+    /**
+     * Fired when an update for the browser is available, but isn't installed immediately because a browser restart is
+     * required.
+     * @deprecated Please use `runtime.onRestartRequired`.
+     */
+    const onBrowserUpdateAvailable: WebExtEvent<() => void> | undefined;
+
+    /** Fired when a connection is made from either an extension process or a content script. */
+    const onConnect: WebExtEvent<(port: Port) => void>;
+
+    /** Fired when a connection is made from another extension. */
+    const onConnectExternal: WebExtEvent<(port: Port) => void>;
+
+    /**
+     * Fired when a message is sent from either an extension process or a content script.
+     *
+     * Allowed in: Proxy scripts
+     * @param message The message sent by the calling script.
+     * @param sendResponse Function to call (at most once) when you have a response. The argument should be any
+     *     JSON-ifiable object. If you have more than one `onMessage` listener in the same document, then only one may
+     *     send a response. This function becomes invalid when the event listener returns, unless you return true from
+     *     the event listener to indicate you wish to send a response asynchronously (this will keep the message
+     *     channel open to the other end until `sendResponse` is called).
+     * @returns Return true from the event listener if you wish to call `sendResponse` after the event listener
+     *     returns.
+     */
+    const onMessage: WebExtEvent<(message: any, sender: MessageSender, sendResponse: (response?: any) => void) => boolean | Promise<any> | void>;
+
+    /**
+     * Fired when a message is sent from another extension/app. Cannot be used in a content script.
+     * @param message The message sent by the calling script.
+     * @param sendResponse Function to call (at most once) when you have a response. The argument should be any
+     *     JSON-ifiable object. If you have more than one `onMessage` listener in the same document, then only one may
+     *     send a response. This function becomes invalid when the event listener returns, unless you return true from
+     *     the event listener to indicate you wish to send a response asynchronously (this will keep the message
+     *     channel open to the other end until `sendResponse` is called).
+     * @returns Return true from the event listener if you wish to call `sendResponse` after the event listener
+     *     returns.
+     */
+    const onMessageExternal: WebExtEvent<(message: any, sender: MessageSender, sendResponse: (response?: any) => void) => boolean | Promise<any> | void>;
+
+    /**
+     * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at
+     * its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced
+     * after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
+     * @param reason The reason that the event is being dispatched.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onRestartRequired: WebExtEvent<(reason: OnRestartRequiredReason) => void> | undefined;
+}
+
+/**
+ * Use the `browser.storage` API to store, retrieve, and track changes to user data.
+ *
+ * Permissions: `storage`
+ */
+declare namespace browser.storage {
+    /* storage types */
+    interface StorageChange {
+        /** The old value of the item, if there was an old value. */
+        oldValue?: any;
+        /** The new value of the item, if there is a new value. */
+        newValue?: any;
+    }
+
+    interface StorageArea {
+        /**
+         * Gets one or more items from storage.
+         * @param [keys] A single key to get, list of keys to get, or a dictionary specifying default values (see
+         *     description of the object). An empty list or object will return an empty result object. Pass in `null`
+         *     to get the entire contents of storage.
+         */
+        get(keys?: string | string[] | object): Promise<any>;
+
+        /**
+         * Gets the amount of space (in bytes) being used by one or more items.
+         * @param [keys] A single key or list of keys to get the total usage for. An empty list will return 0\. Pass in
+         *     `null` to get the total usage of all of storage.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        getBytesInUse?(keys?: string | string[]): Promise<number>;
+
+        /**
+         * Sets multiple items.
+         * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in
+         *     storage will not be affected.
+         *
+         * Primitive values such as numbers will serialize as expected. Values with a `typeof` `"object"` and
+         *     `"function"` will typically serialize to `{}`, with the exception of `Array` (serializes as expected),
+         *     `Date`, and `Regex` (serialize using their `String` representation).
+         */
+        set(items: any): Promise<void>;
+
+        /**
+         * Removes one or more items from storage.
+         * @param keys A single key or a list of keys for items to remove.
+         */
+        remove(keys: string | string[]): Promise<void>;
+
+        /** Removes all items from storage. */
+        clear(): Promise<void>;
+    }
+
+    /* storage properties */
+    /** Items in the `sync` storage area are synced by the browser. */
+    const sync: StorageArea;
+
+    /** Items in the `local` storage area are local to each machine. */
+    const local: StorageArea;
+
+    /**
+     * Items in the `managed` storage area are set by administrators or native applications, and are read-only for the
+     * extension; trying to modify this namespace results in an error.
+     */
+    const managed: StorageArea;
+
+    /* storage events */
+    /**
+     * Fired when one or more items change.
+     * @param changes Object mapping each key that changed to its corresponding `storage.StorageChange` for that item.
+     * @param areaName The name of the storage area (`"sync"`, `"local"` or `"managed"`) the changes are for.
+     */
+    const onChanged: WebExtEvent<(changes: StorageChange, areaName: string) => void>;
+}
+
+/**
+ * The theme API allows customizing of visual elements of the browser.
+ *
+ * Permissions: `theme`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.theme {
+    /* theme types */
+    /** Info provided in the onUpdated listener. */
+    interface ThemeUpdateInfo {
+        /** The new theme after update */
+        theme: object;
+        /** The id of the window the theme has been applied to */
+        windowId?: number;
+    }
+
+    /* theme functions */
+    /**
+     * Returns the current theme for the specified window or the last focused window.
+     * @param [windowId] The window for which we want the theme.
+     */
+    function getCurrent(windowId?: number): Promise<_manifest.ThemeType>;
+
+    /**
+     * Make complete updates to the theme. Resolves when the update has completed.
+     * @param details The properties of the theme to update.
+     */
+    function update(details: _manifest.ThemeType): void;
+    /**
+     * Make complete updates to the theme. Resolves when the update has completed.
+     * @param windowId The id of the window to update. No id updates all windows.
+     * @param details The properties of the theme to update.
+     */
+    function update(windowId: number, details: _manifest.ThemeType): void;
+
+    /**
+     * Removes the updates made to the theme.
+     * @param [windowId] The id of the window to reset. No id resets all windows.
+     */
+    function reset(windowId?: number): void;
+
+    /* theme events */
+    /**
+     * Fired when a new theme has been applied
+     * @param updateInfo Details of the theme update
+     */
+    const onUpdated: WebExtEvent<(updateInfo: ThemeUpdateInfo) => void>;
+}
+
+/**
+ * Use the browser.topSites API to access the top sites that are displayed on the new tab page.
+ *
+ * Permissions: `topSites`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.topSites {
+    /* topSites types */
+    /** An object encapsulating a most visited URL, such as the URLs on the new tab page. */
+    interface MostVisitedURL {
+        /** The most visited URL. */
+        url: string;
+        /** The title of the page. */
+        title?: string;
+    }
+
+    /* topSites functions */
+    /** Gets a list of top sites. */
+    function get(options?: {
+        /** Which providers to get top sites from. Possible values are "places" and "activityStream". */
+        providers?: string[];
+    }): Promise<MostVisitedURL[]>;
+}
+
+/**
+ * Contains types used by other schemas.
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.types {
+    /* types types */
+
+    /**
+     * The scope of the Setting. One of
+     *
+     * *   `regular`: setting for the regular profile (which is inherited by the incognito profile if not overridden
+     * elsewhere),
+     * *   `regular_only`: setting for the regular profile only (not inherited by the incognito profile),
+     * *   `incognito_persistent`: setting for the incognito profile that survives browser restarts (overrides regular
+     * preferences),
+     * *   `incognito_session_only`: setting for the incognito profile that can only be set during an incognito session
+     * and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+     *
+     * Only `regular` is supported by Firefox at this time.
+     */
+    enum SettingScope {
+        regular = "regular",
+        regular_only = "regular_only",
+        incognito_persistent = "incognito_persistent",
+        incognito_session_only = "incognito_session_only"
+    }
+
+    /**
+     * One of
+     *
+     * *   `not_controllable`: cannot be controlled by any extension
+     * *   `controlled_by_other_extensions`: controlled by extensions with higher precedence
+     * *   `controllable_by_this_extension`: can be controlled by this extension
+     * *   `controlled_by_this_extension`: controlled by this extension
+     */
+    enum LevelOfControl {
+        not_controllable = "not_controllable",
+        controlled_by_other_extensions = "controlled_by_other_extensions",
+        controllable_by_this_extension = "controllable_by_this_extension",
+        controlled_by_this_extension = "controlled_by_this_extension"
+    }
+
+    interface Setting {
+        /**
+         * Gets the value of a setting.
+         * @param details Which setting to consider.
+         */
+        get(details: {
+            /** Whether to return the value that applies to the incognito session (default false). */
+            incognito?: boolean;
+        }): Promise<{
+            /** The value of the setting. */
+            value: any;
+            /** The level of control of the setting. */
+            levelOfControl: LevelOfControl;
+            /**
+             * Whether the effective value is specific to the incognito session.
+             * This property will _only_ be present if the `incognito` property in the `details` parameter of `get()`
+             * was true.
+             */
+            incognitoSpecific?: boolean;
+        }>;
+
+        /**
+         * Sets the value of a setting.
+         * @param details Which setting to change.
+         */
+        set(details: {
+            /**
+             * The value of the setting.
+             * Note that every setting has a specific value type, which is described together with the setting. An
+             * extension should _not_ set a value of a different type.
+             */
+            value: any;
+            /** Where to set the setting (default: regular). */
+            scope?: SettingScope;
+        }): Promise<void>;
+
+        /**
+         * Clears the setting, restoring any default value.
+         * @param details Which setting to clear.
+         */
+        clear(details: {
+            /** Where to clear the setting (default: regular). */
+            scope?: SettingScope;
+        }): Promise<void>;
+
+        /**
+         * Fired after the setting changes.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        onChange: WebExtEvent<(details: {
+            /** The value of the setting after the change. */
+            value: any;
+            /** The level of control of the setting. */
+            levelOfControl: LevelOfControl;
+            /**
+             * Whether the value that has changed is specific to the incognito session.
+             * This property will _only_ be present if the user has enabled the extension in incognito mode.
+             */
+            incognitoSpecific?: boolean;
+        }) => void>;
+    }
+}
+
+/**
+ * Use the `browser.webNavigation` API to receive notifications about the status of navigation requests in-flight.
+ *
+ * Permissions: `webNavigation`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.webNavigation {
+    /* webNavigation types */
+
+    /**
+     * Cause of the navigation. The same transition types as defined in the history API are used. These are the same
+     * transition types as defined in the history API except with `"start_page"` in place of `"auto_toplevel"` (for
+     * backwards compatibility).
+     */
+    enum TransitionType {
+        link = "link",
+        typed = "typed",
+        auto_bookmark = "auto_bookmark",
+        auto_subframe = "auto_subframe",
+        manual_subframe = "manual_subframe",
+        generated = "generated",
+        start_page = "start_page",
+        form_submit = "form_submit",
+        reload = "reload",
+        keyword = "keyword",
+        keyword_generated = "keyword_generated"
+    }
+
+    enum TransitionQualifier {
+        client_redirect = "client_redirect",
+        server_redirect = "server_redirect",
+        forward_back = "forward_back",
+        from_address_bar = "from_address_bar"
+    }
+
+    interface EventUrlFilters {
+        url: events.UrlFilter[];
+    }
+
+    type _WebNavigationOnBeforeNavigateEvent<T = (details: {
+        /** The ID of the tab in which the navigation is about to occur. */
+        tabId: number;
+        url: string;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /**
+         * 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a
+         * subframe. Frame IDs are unique for a given tab and process.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame. Set to -1 of no parent frame exists. */
+        parentFrameId: number;
+        /** The time when the browser was about to start the navigation, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    type _WebNavigationOnCommittedEvent<T = (details: {
+        /** The ID of the tab in which the navigation occurs. */
+        tabId: number;
+        url: string;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /**
+         * 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a
+         * subframe. Frame IDs are unique within a tab.
+         */
+        frameId: number;
+        /**
+         * Cause of the navigation.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        transitionType?: TransitionType;
+        /**
+         * A list of transition qualifiers.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        transitionQualifiers?: TransitionQualifier[];
+        /** The time when the navigation was committed, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    type _WebNavigationOnDOMContentLoadedEvent<T = (details: {
+        /** The ID of the tab in which the navigation occurs. */
+        tabId: number;
+        url: string;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /**
+         * 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a
+         * subframe. Frame IDs are unique within a tab.
+         */
+        frameId: number;
+        /** The time when the page's DOM was fully constructed, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    type _WebNavigationOnCompletedEvent<T = (details: {
+        /** The ID of the tab in which the navigation occurs. */
+        tabId: number;
+        url: string;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /**
+         * 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a
+         * subframe. Frame IDs are unique within a tab.
+         */
+        frameId: number;
+        /** The time when the document finished loading, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    type _WebNavigationOnErrorOccurredEvent<T = (details: {
+        /** The ID of the tab in which the navigation occurs. */
+        tabId: number;
+        url: string;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /**
+         * 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a
+         * subframe. Frame IDs are unique within a tab.
+         */
+        frameId: number;
+        /**
+         * The error description.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        error?: string;
+        /** The time when the error occurred, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    type _WebNavigationOnCreatedNavigationTargetEvent<T = (details: {
+        /** The ID of the tab in which the navigation is triggered. */
+        sourceTabId: number;
+        /** The ID of the process runs the renderer for the source tab. */
+        sourceProcessId: number;
+        /**
+         * The ID of the frame with sourceTabId in which the navigation is triggered. 0 indicates the main frame.
+         */
+        sourceFrameId: number;
+        /** The URL to be opened in the new window. */
+        url: string;
+        /** The ID of the tab in which the url is opened */
+        tabId: number;
+        /** The time when the browser was about to create a new view, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    type _WebNavigationOnReferenceFragmentUpdatedEvent<T = (details: {
+        /** The ID of the tab in which the navigation occurs. */
+        tabId: number;
+        url: string;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /**
+         * 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a
+         * subframe. Frame IDs are unique within a tab.
+         */
+        frameId: number;
+        /**
+         * Cause of the navigation.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        transitionType?: TransitionType;
+        /**
+         * A list of transition qualifiers.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        transitionQualifiers?: TransitionQualifier[];
+        /** The time when the navigation was committed, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    type _WebNavigationOnHistoryStateUpdatedEvent<T = (details: {
+        /** The ID of the tab in which the navigation occurs. */
+        tabId: number;
+        url: string;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /**
+         * 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a
+         * subframe. Frame IDs are unique within a tab.
+         */
+        frameId: number;
+        /**
+         * Cause of the navigation.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        transitionType?: TransitionType;
+        /**
+         * A list of transition qualifiers.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        transitionQualifiers?: TransitionQualifier[];
+        /** The time when the navigation was committed, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void> = WebExtEventBase<(callback: T, filters?: EventUrlFilters) => void, T>;
+
+    /* webNavigation functions */
+    /**
+     * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is
+     * identified by a tab ID and a frame ID.
+     * @param details Information about the frame to retrieve information about.
+     */
+    function getFrame(details: {
+        /** The ID of the tab in which the frame is. */
+        tabId: number;
+        /** The ID of the process runs the renderer for this tab. */
+        processId?: number;
+        /** The ID of the frame in the given tab. */
+        frameId: number;
+    }): Promise<{
+        /**
+         * True if the last navigation in this frame was interrupted by an error, i.e. the onErrorOccurred event fired.
+         */
+        errorOccurred?: boolean;
+        /**
+         * The URL currently associated with this frame, if the frame identified by the frameId existed at one point in
+         * the given tab. The fact that an URL is associated with a given frameId does not imply that the corresponding
+         * frame still exists.
+         */
+        url: string;
+        /** The ID of the tab in which the frame is. */
+        tabId: number;
+        /**
+         * The ID of the frame. 0 indicates that this is the main frame; a positive value indicates the ID of a
+         * subframe.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame. Set to -1 of no parent frame exists. */
+        parentFrameId: number;
+    }>;
+
+    /**
+     * Retrieves information about all frames of a given tab.
+     * @param details Information about the tab to retrieve all frames from.
+     */
+    function getAllFrames(details: {
+        /** The ID of the tab. */
+        tabId: number;
+    }): Promise<Array<{
+        /**
+         * True if the last navigation in this frame was interrupted by an error, i.e. the onErrorOccurred event fired.
+         */
+        errorOccurred?: boolean;
+        /**
+         * The ID of the process runs the renderer for this tab.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        processId?: number;
+        /** The ID of the tab in which the frame is. */
+        tabId: number;
+        /**
+         * The ID of the frame. 0 indicates that this is the main frame; a positive value indicates the ID of a
+         * subframe.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame. Set to -1 of no parent frame exists. */
+        parentFrameId: number;
+        /** The URL currently associated with this frame. */
+        url: string;
+    }>>;
+
+    /* webNavigation events */
+    /** Fired when a navigation is about to occur. */
+    const onBeforeNavigate: _WebNavigationOnBeforeNavigateEvent;
+
+    /**
+     * Fired when a navigation is committed. The document (and the resources it refers to, such as images and
+     * subframes) might still be downloading, but at least part of the document has been received from the server and
+     * the browser has decided to switch to the new document.
+     */
+    const onCommitted: _WebNavigationOnCommittedEvent;
+
+    /** Fired when the page's DOM is fully constructed, but the referenced resources may not finish loading. */
+    const onDOMContentLoaded: _WebNavigationOnDOMContentLoadedEvent;
+
+    /** Fired when a document, including the resources it refers to, is completely loaded and initialized. */
+    const onCompleted: _WebNavigationOnCompletedEvent;
+
+    /**
+     * Fired when an error occurs and the navigation is aborted. This can happen if either a network error occurred, or
+     * the user aborted the navigation.
+     */
+    const onErrorOccurred: _WebNavigationOnErrorOccurredEvent;
+
+    /** Fired when a new window, or a new tab in an existing window, is created to host a navigation. */
+    const onCreatedNavigationTarget: _WebNavigationOnCreatedNavigationTargetEvent;
+
+    /**
+     * Fired when the reference fragment of a frame was updated. All future events for that frame will use the updated
+     * URL.
+     */
+    const onReferenceFragmentUpdated: _WebNavigationOnReferenceFragmentUpdatedEvent;
+
+    /** Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab. */
+    const onTabReplaced: WebExtEvent<(details: {
+        /** The ID of the tab that was replaced. */
+        replacedTabId: number;
+        /** The ID of the tab that replaced the old tab. */
+        tabId: number;
+        /** The time when the replacement happened, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => void>;
+
+    /**
+     * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated
+     * URL.
+     */
+    const onHistoryStateUpdated: _WebNavigationOnHistoryStateUpdatedEvent;
+}
+
+/**
+ * Use the `browser.webRequest` API to observe and analyze traffic and to intercept, block, or modify requests
+ * in-flight.
+ *
+ * Permissions: `webRequest`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.webRequest {
+    /* webRequest types */
+    enum ResourceType {
+        main_frame = "main_frame",
+        sub_frame = "sub_frame",
+        stylesheet = "stylesheet",
+        script = "script",
+        image = "image",
+        object = "object",
+        object_subrequest = "object_subrequest",
+        xmlhttprequest = "xmlhttprequest",
+        xbl = "xbl",
+        xslt = "xslt",
+        ping = "ping",
+        beacon = "beacon",
+        xml_dtd = "xml_dtd",
+        font = "font",
+        media = "media",
+        websocket = "websocket",
+        csp_report = "csp_report",
+        imageset = "imageset",
+        web_manifest = "web_manifest",
+        other = "other"
+    }
+
+    enum OnBeforeRequestOptions {
+        blocking = "blocking",
+        requestBody = "requestBody"
+    }
+
+    enum OnBeforeSendHeadersOptions {
+        requestHeaders = "requestHeaders",
+        blocking = "blocking"
+    }
+
+    enum OnSendHeadersOptions {
+        requestHeaders = "requestHeaders"
+    }
+
+    enum OnHeadersReceivedOptions {
+        blocking = "blocking",
+        responseHeaders = "responseHeaders"
+    }
+
+    enum OnAuthRequiredOptions {
+        responseHeaders = "responseHeaders",
+        blocking = "blocking",
+        asyncBlocking = "asyncBlocking"
+    }
+
+    enum OnResponseStartedOptions {
+        responseHeaders = "responseHeaders"
+    }
+
+    enum OnBeforeRedirectOptions {
+        responseHeaders = "responseHeaders"
+    }
+
+    enum OnCompletedOptions {
+        responseHeaders = "responseHeaders"
+    }
+
+    /** An object describing filters to apply to webRequest events. */
+    interface RequestFilter {
+        /** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
+        urls: string[];
+        /** A list of request types. Requests that cannot match any of the types will be filtered out. */
+        types?: ResourceType[];
+        tabId?: number;
+        windowId?: number;
+    }
+
+    /**
+     * An array of HTTP headers. Each header is represented as a dictionary containing the keys `name` and either
+     * `value` or `binaryValue`.
+     */
+    type HttpHeaders = Array<{
+        /** Name of the HTTP header. */
+        name: string;
+        /** Value of the HTTP header if it can be represented by UTF-8. */
+        value?: string;
+        /**
+         * Value of the HTTP header if it cannot be represented by UTF-8, stored as individual byte values (0..255).
+         */
+        binaryValue?: number[];
+    }>;
+
+    /**
+     * Returns value for event handlers that have the 'blocking' extraInfoSpec applied. Allows the event handler to
+     * modify network requests.
+     */
+    interface BlockingResponse {
+        /**
+         * If true, the request is cancelled. Used in onBeforeRequest, this prevents the request from being sent.
+         */
+        cancel?: boolean;
+        /**
+         * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is
+         * prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP
+         * schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method
+         * for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the
+         * redirect will be issued using the GET method.
+         */
+        redirectUrl?: string;
+        /**
+         * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request
+         * headers instead.
+         */
+        requestHeaders?: HttpHeaders;
+        /**
+         * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with
+         * these response headers instead. Only return `responseHeaders` if you really want to modify the headers in
+         * order to limit the number of conflicts (only one extension may modify `responseHeaders` for each request).
+         */
+        responseHeaders?: HttpHeaders;
+        /**
+         * Only used as a response to the onAuthRequired event. If set, the request is made using the supplied
+         * credentials.
+         */
+        authCredentials?: {
+            username: string;
+            password: string;
+        };
+    }
+
+    /** Contains data uploaded in a URL request. */
+    interface UploadData {
+        /** An ArrayBuffer with a copy of the data. */
+        bytes?: any;
+        /** A string with the file's path and name. */
+        file?: string;
+    }
+
+    type _WebRequestOnBeforeRequestEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'. */
+        requestBody?: {
+            /** Errors when obtaining request body data. */
+            error?: string;
+            /**
+             * If the request method is POST and the body is a sequence of key-value pairs encoded in UTF8, encoded as
+             * either multipart/form-data, or application/x-www-form-urlencoded, this dictionary is present and for
+             * each key contains the list of all values for that key. If the data is of another media type, or if it is
+             * malformed, the dictionary is not present. An example value of this dictionary is {'key': ['value1',
+             * 'value2']}.
+             */
+            formData?: object;
+            /**
+             * If the request method is PUT or POST, and the body is not already parsed in formData, then the unparsed
+             * request body elements are contained in this array.
+             */
+            raw?: UploadData[];
+        };
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+    }) => BlockingResponse | Promise<BlockingResponse> | void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnBeforeRequestOptions[]) => void, T>;
+
+    type _WebRequestOnBeforeSendHeadersEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /** The HTTP request headers that are going to be sent out with this request. */
+        requestHeaders?: HttpHeaders;
+    }) => BlockingResponse | Promise<BlockingResponse> | void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnBeforeSendHeadersOptions[]) => void, T>;
+
+    type _WebRequestOnSendHeadersEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /** The HTTP request headers that have been sent out with this request. */
+        requestHeaders?: HttpHeaders;
+    }) => void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnSendHeadersOptions[]) => void, T>;
+
+    type _WebRequestOnHeadersReceivedEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /**
+         * HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses
+         * that lack a status line).
+         */
+        statusLine: string;
+        /** The HTTP response headers that have been received with this response. */
+        responseHeaders?: HttpHeaders;
+        /** Standard HTTP status code returned by the server. */
+        statusCode: number;
+    }) => BlockingResponse | Promise<BlockingResponse> | void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnHeadersReceivedOptions[]) => void, T>;
+
+    type _WebRequestOnAuthRequiredEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /** The authentication scheme, e.g. Basic or Digest. */
+        scheme: string;
+        /** The authentication realm provided by the server, if there is one. */
+        realm?: string;
+        /** The server requesting authentication. */
+        challenger: {
+            host: string;
+            port: number;
+        };
+        /** True for Proxy-Authenticate, false for WWW-Authenticate. */
+        isProxy: boolean;
+        /** The HTTP response headers that were received along with this response. */
+        responseHeaders?: HttpHeaders;
+        /**
+         * HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses
+         * that lack a status line) or an empty string if there are no headers.
+         */
+        statusLine: string;
+        /** Standard HTTP status code returned by the server. */
+        statusCode: number;
+    }) => BlockingResponse | Promise<BlockingResponse> | void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnAuthRequiredOptions[]) => void, T>;
+
+    type _WebRequestOnResponseStartedEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /**
+         * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
+         */
+        ip?: string;
+        /** Indicates if this response was fetched from disk cache. */
+        fromCache: boolean;
+        /** Standard HTTP status code returned by the server. */
+        statusCode: number;
+        /** The HTTP response headers that were received along with this response. */
+        responseHeaders?: HttpHeaders;
+        /**
+         * HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses
+         * that lack a status line) or an empty string if there are no headers.
+         */
+        statusLine: string;
+    }) => void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnResponseStartedOptions[]) => void, T>;
+
+    type _WebRequestOnBeforeRedirectEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /**
+         * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
+         */
+        ip?: string;
+        /** Indicates if this response was fetched from disk cache. */
+        fromCache: boolean;
+        /** Standard HTTP status code returned by the server. */
+        statusCode: number;
+        /** The new URL. */
+        redirectUrl: string;
+        /** The HTTP response headers that were received along with this redirect. */
+        responseHeaders?: HttpHeaders;
+        /**
+         * HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses
+         * that lack a status line) or an empty string if there are no headers.
+         */
+        statusLine: string;
+    }) => void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnBeforeRedirectOptions[]) => void, T>;
+
+    type _WebRequestOnCompletedEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /**
+         * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
+         */
+        ip?: string;
+        /** Indicates if this response was fetched from disk cache. */
+        fromCache: boolean;
+        /** Standard HTTP status code returned by the server. */
+        statusCode: number;
+        /** The HTTP response headers that were received along with this response. */
+        responseHeaders?: HttpHeaders;
+        /**
+         * HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses
+         * that lack a status line) or an empty string if there are no headers.
+         */
+        statusLine: string;
+    }) => void> = WebExtEventBase<(callback: T, filter: RequestFilter, extraInfoSpec?: OnCompletedOptions[]) => void, T>;
+
+    type _WebRequestOnErrorOccurredEvent<T = (details: {
+        /**
+         * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to
+         * relate different events of the same request.
+         */
+        requestId: string;
+        url: string;
+        /** Standard HTTP method. */
+        method: string;
+        /**
+         * The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a
+         * subframe in which the request happens. If the document of a (sub-)frame is loaded (`type` is `main_frame` or
+         * `sub_frame`), `frameId` indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique
+         * within a tab.
+         */
+        frameId: number;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+        /** URL of the resource that triggered this request. */
+        originUrl?: string;
+        /** URL of the page into which the requested resource will be loaded. */
+        documentUrl?: string;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: number;
+        /** How the requested resource will be used. */
+        type: ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: number;
+        /**
+         * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
+         */
+        ip?: string;
+        /** Indicates if this response was fetched from disk cache. */
+        fromCache: boolean;
+        /**
+         * The error description. This string is _not_ guaranteed to remain backwards compatible between releases. You
+         * must not parse and act based upon its content.
+         */
+        error: string;
+    }) => void> = WebExtEventBase<(callback: T, filter: RequestFilter) => void, T>;
+
+    /* webRequest properties */
+    /**
+     * The maximum number of times that `handlerBehaviorChanged` can be called per 10 minute sustained interval.
+     * `handlerBehaviorChanged` is an expensive function call that shouldn't be called often.
+     */
+    const MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
+
+    /* webRequest functions */
+    /**
+     * Needs to be called when the behavior of the webRequest handlers has changed to prevent incorrect handling due to
+     * caching. This function call is expensive. Don't call it often.
+     */
+    function handlerBehaviorChanged(): Promise<void>;
+
+    /** ... */
+    function filterResponseData(requestId: string): object/*StreamFilter*/;
+
+    /* webRequest events */
+    /**
+     * Fired when a request is about to occur.
+     * @returns If "blocking" is specified in the "extraInfoSpec" parameter, the event listener should return an object
+     *     of this type.
+     */
+    const onBeforeRequest: _WebRequestOnBeforeRequestEvent;
+
+    /**
+     * Fired before sending an HTTP request, once the request headers are available. This may occur after a TCP
+     * connection is made to the server, but before any HTTP data is sent.
+     * @returns If "blocking" is specified in the "extraInfoSpec" parameter, the event listener should return an object
+     *     of this type.
+     */
+    const onBeforeSendHeaders: _WebRequestOnBeforeSendHeadersEvent;
+
+    /**
+     * Fired just before a request is going to be sent to the server (modifications of previous onBeforeSendHeaders
+     * callbacks are visible by the time onSendHeaders is fired).
+     */
+    const onSendHeaders: _WebRequestOnSendHeadersEvent;
+
+    /**
+     * Fired when HTTP response headers of a request have been received.
+     * @returns If "blocking" is specified in the "extraInfoSpec" parameter, the event listener should return an object
+     *     of this type.
+     */
+    const onHeadersReceived: _WebRequestOnHeadersReceivedEvent;
+
+    /**
+     * Fired when an authentication failure is received. The listener has three options: it can provide authentication
+     * credentials, it can cancel the request and display the error page, or it can take no action on the challenge. If
+     * bad user credentials are provided, this may be called multiple times for the same request.
+     * @returns If "blocking" is specified in the "extraInfoSpec" parameter, the event listener should return an object
+     *     of this type.
+     */
+    const onAuthRequired: _WebRequestOnAuthRequiredEvent;
+
+    /**
+     * Fired when the first byte of the response body is received. For HTTP requests, this means that the status line
+     * and response headers are available.
+     */
+    const onResponseStarted: _WebRequestOnResponseStartedEvent;
+
+    /** Fired when a server-initiated redirect is about to occur. */
+    const onBeforeRedirect: _WebRequestOnBeforeRedirectEvent;
+
+    /** Fired when a request is completed. */
+    const onCompleted: _WebRequestOnCompletedEvent;
+
+    /** Fired when an error occurs. */
+    const onErrorOccurred: _WebRequestOnErrorOccurredEvent;
+}
+
+/**
+ * Use the `browser.bookmarks` API to create, organize, and otherwise manipulate bookmarks. Also see Override Pages,
+ * which you can use to create a custom Bookmark Manager page.
+ *
+ * Permissions: `bookmarks`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.bookmarks {
+    /* bookmarks types */
+
+    /**
+     * Indicates the reason why this node is unmodifiable. The `managed` value indicates that this node was configured
+     * by the system administrator or by the custodian of a supervised user. Omitted if the node can be modified by the
+     * user and the extension (default).
+     */
+    enum BookmarkTreeNodeUnmodifiable {
+        managed = "managed"
+    }
+
+    /** Indicates the type of a BookmarkTreeNode, which can be one of bookmark, folder or separator. */
+    enum BookmarkTreeNodeType {
+        bookmark = "bookmark",
+        folder = "folder",
+        separator = "separator"
+    }
+
+    /**
+     * A node (either a bookmark or a folder) in the bookmark tree. Child nodes are ordered within their parent folder.
+     */
+    interface BookmarkTreeNode {
+        /**
+         * The unique identifier for the node. IDs are unique within the current profile, and they remain valid even
+         * after the browser is restarted.
+         */
+        id: string;
+        /** The `id` of the parent folder. Omitted for the root node. */
+        parentId?: string;
+        /** The 0-based position of this node within its parent folder. */
+        index?: number;
+        /** The URL navigated to when a user clicks the bookmark. Omitted for folders. */
+        url?: string;
+        /** The text displayed for the node. */
+        title: string;
+        /** When this node was created, in milliseconds since the epoch (`new Date(dateAdded)`). */
+        dateAdded?: number;
+        /** When the contents of this folder last changed, in milliseconds since the epoch. */
+        dateGroupModified?: number;
+        /**
+         * Indicates the reason why this node is unmodifiable. The `managed` value indicates that this node was
+         * configured by the system administrator or by the custodian of a supervised user. Omitted if the node can be
+         * modified by the user and the extension (default).
+         */
+        unmodifiable?: BookmarkTreeNodeUnmodifiable;
+        /** Indicates the type of the BookmarkTreeNode, which can be one of bookmark, folder or separator. */
+        type?: BookmarkTreeNodeType;
+        /** An ordered list of children of this node. */
+        children?: BookmarkTreeNode[];
+    }
+
+    /** Object passed to the create() function. */
+    interface CreateDetails {
+        /** Defaults to the Other Bookmarks folder. */
+        parentId?: string;
+        index?: number;
+        title?: string;
+        url?: string;
+        /** Indicates the type of BookmarkTreeNode to create, which can be one of bookmark, folder or separator. */
+        type?: BookmarkTreeNodeType;
+    }
+
+    export {_import as import};
+
+    export {_export as export};
+
+    /* bookmarks functions */
+    /**
+     * Retrieves the specified BookmarkTreeNode(s).
+     * @param idOrIdList A single string-valued id, or an array of string-valued ids
+     */
+    function get(idOrIdList: string | string[]): Promise<BookmarkTreeNode[]>;
+
+    /** Retrieves the children of the specified BookmarkTreeNode id. */
+    function getChildren(id: string): Promise<BookmarkTreeNode[]>;
+
+    /**
+     * Retrieves the recently added bookmarks.
+     * @param numberOfItems The maximum number of items to return.
+     */
+    function getRecent(numberOfItems: number): Promise<BookmarkTreeNode[]>;
+
+    /** Retrieves the entire Bookmarks hierarchy. */
+    function getTree(): Promise<BookmarkTreeNode[]>;
+
+    /**
+     * Retrieves part of the Bookmarks hierarchy, starting at the specified node.
+     * @param id The ID of the root of the subtree to retrieve.
+     */
+    function getSubTree(id: string): Promise<BookmarkTreeNode[]>;
+
+    /**
+     * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce
+     * BookmarkTreeNodes matching all specified properties.
+     * @param query Either a string of words and quoted phrases that are matched against bookmark URLs and titles, or
+     *     an object. If an object, the properties `query`, `url`, and `title` may be specified and bookmarks matching
+     *     all specified properties will be produced.
+     */
+    function search(query: string | {
+        /** A string of words and quoted phrases that are matched against bookmark URLs and titles. */
+        query?: string;
+        /** The URL of the bookmark; matches verbatim. Note that folders have no URL. */
+        url?: string;
+        /** The title of the bookmark; matches verbatim. */
+        title?: string;
+    }): Promise<BookmarkTreeNode[]>;
+
+    /**
+     * Creates a bookmark or folder under the specified parentId. If url is NULL or missing, it will be a folder.
+     */
+    function create(bookmark: CreateDetails): Promise<BookmarkTreeNode | undefined>;
+
+    /** Moves the specified BookmarkTreeNode to the provided location. */
+    function move(id: string, destination: {
+        parentId?: string;
+        index?: number;
+    }): Promise<BookmarkTreeNode | undefined>;
+
+    /**
+     * Updates the properties of a bookmark or folder. Specify only the properties that you want to change; unspecified
+     * properties will be left unchanged. **Note:** Currently, only 'title' and 'url' are supported.
+     */
+    function update(id: string, changes: {
+        title?: string;
+        url?: string;
+    }): Promise<BookmarkTreeNode | undefined>;
+
+    /** Removes a bookmark or an empty bookmark folder. */
+    function remove(id: string): Promise<void>;
+
+    /** Recursively removes a bookmark folder. */
+    function removeTree(id: string): Promise<void>;
+
+    /**
+     * Imports bookmarks from an html bookmark file
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function _import(): Promise<void>;
+
+    /**
+     * Exports bookmarks to an html bookmark file
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function _export(): Promise<void>;
+
+    /* bookmarks events */
+    /** Fired when a bookmark or folder is created. */
+    const onCreated: WebExtEvent<(id: string, bookmark: BookmarkTreeNode) => void>;
+
+    /**
+     * Fired when a bookmark or folder is removed. When a folder is removed recursively, a single notification is fired
+     * for the folder, and none for its contents.
+     */
+    const onRemoved: WebExtEvent<(id: string, removeInfo: {
+        parentId: string;
+        index: number;
+        node: BookmarkTreeNode;
+    }) => void>;
+
+    /**
+     * Fired when a bookmark or folder changes. **Note:** Currently, only title and url changes trigger this.
+     */
+    const onChanged: WebExtEvent<(id: string, changeInfo: {
+        title: string;
+        url?: string;
+    }) => void>;
+
+    /** Fired when a bookmark or folder is moved to a different parent folder. */
+    const onMoved: WebExtEvent<(id: string, moveInfo: {
+        parentId: string;
+        index: number;
+        oldParentId: string;
+        oldIndex: number;
+    }) => void>;
+
+    /**
+     * Fired when the children of a folder have changed their order due to the order being sorted in the UI. This is
+     * not called as a result of a move().
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onChildrenReordered: WebExtEvent<(id: string, reorderInfo: {
+        childIds: string[];
+    }) => void> | undefined;
+
+    /**
+     * Fired when a bookmark import session is begun. Expensive observers should ignore onCreated updates until
+     * onImportEnded is fired. Observers should still handle other notifications immediately.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onImportBegan: WebExtEvent<() => void> | undefined;
+
+    /**
+     * Fired when a bookmark import session is ended.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onImportEnded: WebExtEvent<() => void> | undefined;
+}
+
+/**
+ * Use browser actions to put icons in the main browser toolbar, to the right of the address bar. In addition to its
+ * icon, a browser action can also have a tooltip, a badge, and a popup.
+ *
+ * Manifest keys: `browser_action`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.browserAction {
+    /* browserAction types */
+    type ColorArray = [number, number, number, number];
+
+    /** Pixel data for an image. Must be an ImageData object (for example, from a `canvas` element). */
+    type ImageDataType = object/*ImageData*/;
+
+    /* browserAction functions */
+    /** Sets the title of the browser action. This shows up in the tooltip. */
+    function setTitle(details: {
+        /** The string the browser action should display when moused over. */
+        title: string;
+        /** Limits the change to when a particular tab is selected. Automatically resets when the tab is closed. */
+        tabId?: number;
+    }): Promise<void>;
+
+    /** Gets the title of the browser action. */
+    function getTitle(details: {
+        /**
+         * Specify the tab to get the title from. If no tab is specified, the non-tab-specific title is returned.
+         */
+        tabId?: number;
+    }): Promise<string>;
+
+    /**
+     * Sets the icon for the browser action. The icon can be specified either as the path to an image file or as the
+     * pixel data from a canvas element, or as dictionary of either one of those. Either the **path** or the
+     * **imageData** property must be specified.
+     */
+    function setIcon(details: {
+        /**
+         * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is
+         * specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the
+         * number of image pixels that fit into one screen space unit equals `scale`, then image with size `scale` * 19
+         * will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified.
+         * Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
+         */
+        imageData?: ImageDataType | {
+            [key: number]: ImageDataType;
+        };
+        /**
+         * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If
+         * the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel
+         * density. If the number of image pixels that fit into one screen space unit equals `scale`, then image with
+         * size `scale` * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must
+         * be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
+         */
+        path?: string | {
+            [key: number]: string;
+        };
+        /** Limits the change to when a particular tab is selected. Automatically resets when the tab is closed. */
+        tabId?: number;
+    }): Promise<void>;
+
+    /** Sets the html document to be opened as a popup when the user clicks on the browser action's icon. */
+    function setPopup(details: {
+        /** Limits the change to when a particular tab is selected. Automatically resets when the tab is closed. */
+        tabId?: number;
+        /** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
+        popup: string;
+    }): Promise<void>;
+
+    /** Gets the html document set as the popup for this browser action. */
+    function getPopup(details: {
+        /**
+         * Specify the tab to get the popup from. If no tab is specified, the non-tab-specific popup is returned.
+         */
+        tabId?: number;
+    }): Promise<string>;
+
+    /** Sets the badge text for the browser action. The badge is displayed on top of the icon. */
+    function setBadgeText(details: {
+        /** Any number of characters can be passed, but only about four can fit in the space. */
+        text: string;
+        /** Limits the change to when a particular tab is selected. Automatically resets when the tab is closed. */
+        tabId?: number;
+    }): Promise<void>;
+
+    /**
+     * Gets the badge text of the browser action. If no tab is specified, the non-tab-specific badge text is returned.
+     */
+    function getBadgeText(details: {
+        /**
+         * Specify the tab to get the badge text from. If no tab is specified, the non-tab-specific badge text is
+         * returned.
+         */
+        tabId?: number;
+    }): Promise<string>;
+
+    /** Sets the background color for the badge. */
+    function setBadgeBackgroundColor(details: {
+        /**
+         * An array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque
+         * red is `[255, 0, 0, 255]`. Can also be a string with a CSS value, with opaque red being `#FF0000` or `#F00`.
+         */
+        color: string | ColorArray;
+        /** Limits the change to when a particular tab is selected. Automatically resets when the tab is closed. */
+        tabId?: number;
+    }): Promise<void>;
+
+    /** Gets the background color of the browser action. */
+    function getBadgeBackgroundColor(details: {
+        /**
+         * Specify the tab to get the badge background color from. If no tab is specified, the non-tab-specific badge
+         * background color is returned.
+         */
+        tabId?: number;
+    }): Promise<ColorArray>;
+
+    /**
+     * Enables the browser action for a tab. By default, browser actions are enabled.
+     * @param [tabId] The id of the tab for which you want to modify the browser action.
+     */
+    function enable(tabId?: number): Promise<void>;
+
+    /**
+     * Disables the browser action for a tab.
+     * @param [tabId] The id of the tab for which you want to modify the browser action.
+     */
+    function disable(tabId?: number): Promise<void>;
+
+    /** Opens the extension popup window in the active window. */
+    function openPopup(): Promise<void>;
+
+    /* browserAction events */
+    /**
+     * Fired when a browser action icon is clicked. This event will not fire if the browser action has a popup.
+     */
+    const onClicked: WebExtEvent<(tab: tabs.Tab) => void>;
+}
+
+/**
+ * Use the `browser.browsingData` API to remove browsing data from a user's local profile.
+ *
+ * Permissions: `browsingData`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.browsingData {
+    /* browsingData types */
+    /** Options that determine exactly what data will be removed. */
+    interface RemovalOptions {
+        /**
+         * Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via
+         * the `getTime` method of the JavaScript `Date` object). If absent, defaults to 0 (which would remove all
+         * browsing data).
+         */
+        since?: extensionTypes.Date;
+        /** Only remove data associated with these hostnames (only applies to cookies and localStorage). */
+        hostnames?: string[];
+        /**
+         * An object whose properties specify which origin types ought to be cleared. If this object isn't specified,
+         * it defaults to clearing only "unprotected" origins. Please ensure that you _really_ want to remove
+         * application data before adding 'protectedWeb' or 'extensions'.
+         */
+        originTypes?: {
+            /** Normal websites. */
+            unprotectedWeb?: boolean;
+            /** Websites that have been installed as hosted applications (be careful!). */
+            protectedWeb?: boolean;
+            /** Extensions and packaged applications a user has installed (be _really_ careful!). */
+            extension?: boolean;
+        };
+    }
+
+    /** A set of data types. Missing data types are interpreted as `false`. */
+    interface DataTypeSet {
+        /**
+         * The browser's cache. Note: when removing data, this clears the _entire_ cache: it is not limited to the
+         * range you specify.
+         */
+        cache?: boolean;
+        /** The browser's cookies. */
+        cookies?: boolean;
+        /** The browser's download list. */
+        downloads?: boolean;
+        /** The browser's stored form data. */
+        formData?: boolean;
+        /** The browser's history. */
+        history?: boolean;
+        /** Websites' IndexedDB data. */
+        indexedDB?: boolean;
+        /** Websites' local storage data. */
+        localStorage?: boolean;
+        /** Server-bound certificates. */
+        serverBoundCertificates?: boolean;
+        /** Stored passwords. */
+        passwords?: boolean;
+        /** Plugins' data. */
+        pluginData?: boolean;
+        /** Service Workers. */
+        serviceWorkers?: boolean;
+    }
+
+    /* browsingData functions */
+    /**
+     * Reports which types of data are currently selected in the 'Clear browsing data' settings UI. Note: some of the
+     * data types included in this API are not available in the settings UI, and some UI settings control more than one
+     * data type listed here.
+     */
+    function settings(): Promise<{
+        options: RemovalOptions;
+        /**
+         * All of the types will be present in the result, with values of `true` if they are both selected to be
+         * removed and permitted to be removed, otherwise `false`.
+         */
+        dataToRemove: DataTypeSet;
+        /**
+         * All of the types will be present in the result, with values of `true` if they are permitted to be removed
+         * (e.g., by enterprise policy) and `false` if not.
+         */
+        dataRemovalPermitted: DataTypeSet;
+    }>;
+
+    /**
+     * Clears various types of browsing data stored in a user's profile.
+     * @param dataToRemove The set of data types to remove.
+     */
+    function remove(options: RemovalOptions, dataToRemove: DataTypeSet): Promise<void>;
+
+    /**
+     * Clears websites' appcache data.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function removeAppcache(options: RemovalOptions): Promise<void>;
+
+    /** Clears the browser's cache. */
+    function removeCache(options: RemovalOptions): Promise<void>;
+
+    /** Clears the browser's cookies and server-bound certificates modified within a particular timeframe. */
+    function removeCookies(options: RemovalOptions): Promise<void>;
+
+    /** Clears the browser's list of downloaded files (_not_ the downloaded files themselves). */
+    function removeDownloads(options: RemovalOptions): Promise<void>;
+
+    /**
+     * Clears websites' file system data.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function removeFileSystems(options: RemovalOptions): Promise<void>;
+
+    /** Clears the browser's stored form data (autofill). */
+    function removeFormData(options: RemovalOptions): Promise<void>;
+
+    /** Clears the browser's history. */
+    function removeHistory(options: RemovalOptions): Promise<void>;
+
+    /**
+     * Clears websites' IndexedDB data.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function removeIndexedDB(options: RemovalOptions): Promise<void>;
+
+    /** Clears websites' local storage data. */
+    function removeLocalStorage(options: RemovalOptions): Promise<void>;
+
+    /** Clears plugins' data. */
+    function removePluginData(options: RemovalOptions): Promise<void>;
+
+    /** Clears the browser's stored passwords. */
+    function removePasswords(options: RemovalOptions): Promise<void>;
+
+    /**
+     * Clears websites' WebSQL data.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function removeWebSQL(options: RemovalOptions): Promise<void>;
+}
+
+/**
+ * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to
+ * open the browser action or send a command to the xtension.
+ *
+ * Manifest keys: `commands`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.commands {
+    /* commands types */
+    interface Command {
+        /** The name of the Extension Command */
+        name?: string;
+        /** The Extension Command description */
+        description?: string;
+        /** The shortcut active for this command, or blank if not active. */
+        shortcut?: string;
+    }
+
+    /* commands functions */
+    /** Returns all the registered extension commands for this extension and their shortcut (if active). */
+    function getAll(): Promise<Command[] | undefined>;
+
+    /* commands events */
+    /** Fired when a registered command is activated using a keyboard shortcut. */
+    const onCommand: WebExtEvent<(command: string) => void>;
+}
+
+/**
+ * Permissions: `devtools`
+ *
+ * Allowed in: Devtools pages only
+ */
+declare namespace browser.devtools {
+}
+
+/**
+ * Use the `browser.devtools.inspectedWindow` API to interact with the inspected window: obtain the tab ID for the
+ * inspected page, evaluate the code in the context of the inspected window, reload the page, or obtain the list of
+ * resources within the page.
+ *
+ * Allowed in: Devtools pages only
+ */
+declare namespace browser.devtools.inspectedWindow {
+    /* devtools.inspectedWindow types */
+    /** A resource within the inspected page, such as a document, a script, or an image. */
+    interface Resource {
+        /** The URL of the resource. */
+        url: string;
+
+        /**
+         * Gets the content of the resource.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        getContent?(): Promise<object>;
+
+        /**
+         * Sets the content of the resource.
+         * @param content New content of the resource. Only resources with the text type are currently supported.
+         * @param commit True if the user has finished editing the resource, and the new content of the resource should
+         *     be persisted; false if this is a minor change sent in progress of the user editing the resource.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        setContent?(content: string, commit: boolean): Promise<any>;
+    }
+
+    /* devtools.inspectedWindow properties */
+    /** The ID of the tab being inspected. This ID may be used with browser.tabs.* API. */
+    const tabId: number;
+
+    /* devtools.inspectedWindow functions */
+    /**
+     * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must
+     * evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a
+     * DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the `result`
+     * parameter of the callback is `undefined`. In the case of a DevTools-side error, the `isException` parameter is
+     * non-null and has `isError` set to true and `code` set to an error code. In the case of a JavaScript error,
+     * `isException` is set to true and `value` is set to the string value of thrown object.
+     * @param expression An expression to evaluate.
+     * @param [options] The options parameter can contain one or more options.
+     */
+    function eval(expression: string, options?: {
+        /**
+         * If specified, the expression is evaluated on the iframe whose URL matches the one specified. By default, the
+         * expression is evaluated in the top frame of the inspected page.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        frameURL?: string;
+        /**
+         * Evaluate the expression in the context of the content script of the calling extension, provided that the
+         * content script is already injected into the inspected page. If not, the expression is not evaluated and the
+         * callback is invoked with the exception parameter set to an object that has the `isError` field set to true
+         * and the `code` field set to `E_NOTFOUND`.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        useContentScriptContext?: boolean;
+        /**
+         * Evaluate the expression in the context of a content script of an extension that matches the specified
+         * origin. If given, contextSecurityOrigin overrides the 'true' setting on userContentScriptContext.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        contextSecurityOrigin?: string;
+    }): Promise<object | undefined>;
+
+    /** Reloads the inspected page. */
+    function reload(reloadOptions?: {
+        /**
+         * When true, the loader will bypass the cache for all inspected page resources loaded before the `load` event
+         * is fired. The effect is similar to pressing Ctrl+Shift+R in the inspected window or within the Developer
+         * Tools window.
+         */
+        ignoreCache?: boolean;
+        /**
+         * If specified, the string will override the value of the `User-Agent` HTTP header that's sent while loading
+         * the resources of the inspected page. The string will also override the value of the `navigator.userAgent`
+         * property that's returned to any scripts that are running within the inspected page.
+         */
+        userAgent?: string;
+        /**
+         * If specified, the script will be injected into every frame of the inspected page immediately upon load,
+         * before any of the frame's scripts. The script will not be injected after subsequent reloads—for example, if
+         * the user presses Ctrl+R.
+         */
+        injectedScript?: string;
+        /**
+         * If specified, this script evaluates into a function that accepts three string arguments: the source to
+         * preprocess, the URL of the source, and a function name if the source is an DOM event handler. The
+         * preprocessorerScript function should return a string to be compiled by Chrome in place of the input source.
+         * In the case that the source is a DOM event handler, the returned source must compile to a single JS
+         * function.
+         * @deprecated Please avoid using this parameter, it will be removed soon.
+         */
+        preprocessorScript?: string;
+    }): void;
+
+    /**
+     * Retrieves the list of resources from the inspected page.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getResources(): Promise<Resource[]>;
+
+    /* devtools.inspectedWindow events */
+    /**
+     * Fired when a new resource is added to the inspected page.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onResourceAdded: WebExtEvent<(resource: Resource) => void> | undefined;
+
+    /**
+     * Fired when a new revision of the resource is committed (e.g. user saves an edited version of the resource in the
+     * Developer Tools).
+     * @param content New content of the resource.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onResourceContentCommitted: WebExtEvent<(resource: Resource, content: string) => void> | undefined;
+}
+
+/**
+ * Use the `browser.devtools.network` API to retrieve the information about network requests displayed by the Developer
+ * Tools in the Network panel.
+ *
+ * Allowed in: Devtools pages only
+ */
+declare namespace browser.devtools.network {
+    /* devtools.network types */
+    /**
+     * Represents a network request for a document resource (script, image and so on). See HAR Specification for
+     * reference.
+     */
+    interface Request {
+        /** Returns content of the response body. */
+        getContent(): Promise<object>;
+    }
+
+    /* devtools.network functions */
+    /**
+     * Returns HAR log that contains all known network requests.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getHAR(): Promise<any>;
+
+    /* devtools.network events */
+    /**
+     * Fired when a network request is finished and all request data are available.
+     * @param request Description of a network request in the form of a HAR entry. See HAR specification for details.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    const onRequestFinished: WebExtEvent<(request: Request) => void> | undefined;
+
+    /**
+     * Fired when the inspected window navigates to a new page.
+     * @param url URL of the new page.
+     */
+    const onNavigated: WebExtEvent<(url: string) => void>;
+}
+
+/**
+ * Use the `browser.devtools.panels` API to integrate your extension into Developer Tools window UI: create your own
+ * panels, access existing panels, and add sidebars.
+ *
+ * Allowed in: Devtools pages only
+ */
+declare namespace browser.devtools.panels {
+    /* devtools.panels types */
+    /** Represents the Elements panel. */
+    interface ElementsPanel {
+        /**
+         * Creates a pane within panel's sidebar.
+         * @param title Text that is displayed in sidebar caption.
+         * @param [callback] A callback invoked when the sidebar is created.
+         */
+        createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
+
+        /** Fired when an object is selected in the panel. */
+        onSelectionChanged: WebExtEvent<() => void>;
+    }
+
+    /** Represents the Sources panel. */
+    interface SourcesPanel {
+        /**
+         * Creates a pane within panel's sidebar.
+         * @param title Text that is displayed in sidebar caption.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        createSidebarPane?(title: string): Promise<ExtensionSidebarPane | undefined>;
+
+        /**
+         * Fired when an object is selected in the panel.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        onSelectionChanged: WebExtEvent<() => void>;
+    }
+
+    /** Represents a panel created by extension. */
+    interface ExtensionPanel {
+        /**
+         * Appends a button to the status bar of the panel.
+         * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two
+         *     32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the
+         *     button is pressed.
+         * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
+         * @param disabled Whether the button is disabled.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        createStatusBarButton?(iconPath: string, tooltipText: string, disabled: boolean): Button;
+
+        /**
+         * Fired upon a search action (start of a new search, search result navigation, or search being canceled).
+         * @param action Type of search action being performed.
+         * @param [queryString] Query string (only for 'performSearch').
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        onSearch: WebExtEvent<(action: string, queryString?: string) => void>;
+        /**
+         * Fired when the user switches to the panel.
+         * @param window The JavaScript `window` object of panel's page.
+         */
+        onShown: WebExtEvent<(window: object/*global*/) => void>;
+        /** Fired when the user switches away from the panel. */
+        onHidden: WebExtEvent<() => void>;
+    }
+
+    /** A sidebar created by the extension. */
+    interface ExtensionSidebarPane {
+        /**
+         * Sets the height of the sidebar.
+         * @param height A CSS-like size specification, such as `'100px'` or `'12ex'`.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        setHeight?(height: string): void;
+
+        /**
+         * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
+         * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM
+         *     nodes are displayed in an expandable tree similar to the console/watch.
+         * @param [rootTitle] An optional title for the root of the expression tree.
+         */
+        setExpression(expression: string, rootTitle?: string): Promise<void>;
+
+        /**
+         * Sets a JSON-compliant object to be displayed in the sidebar pane.
+         * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of
+         *     the caller (API client).
+         * @param [rootTitle] An optional title for the root of the expression tree.
+         */
+        setObject(jsonObject: string, rootTitle?: string): Promise<void>;
+
+        /**
+         * Sets an HTML page to be displayed in the sidebar pane.
+         * @param path Relative path of an extension page to display within the sidebar.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        setPage?(path: string): void;
+
+        /**
+         * Fired when the sidebar pane becomes visible as a result of user switching to the panel that hosts it.
+         * @param window The JavaScript `window` object of the sidebar page, if one was set with the `setPage()` method.
+         */
+        onShown: WebExtEvent<(window: object/*global*/) => void>;
+        /**
+         * Fired when the sidebar pane becomes hidden as a result of the user switching away from the panel that hosts
+         * the sidebar pane.
+         */
+        onHidden: WebExtEvent<() => void>;
+    }
+
+    /** A button created by the extension. */
+    interface Button {
+        /**
+         * Updates the attributes of the button. If some of the arguments are omitted or `null`, the corresponding
+         * attributes are not updated.
+         * @param [iconPath] Path to the new icon of the button.
+         * @param [tooltipText] Text shown as a tooltip when user hovers the mouse over the button.
+         * @param [disabled] Whether the button is disabled.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        update?(iconPath?: string, tooltipText?: string, disabled?: boolean): void;
+
+        /**
+         * Fired when the button is clicked.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        onClicked: WebExtEvent<() => void>;
+    }
+
+    /* devtools.panels properties */
+    /** Elements panel. */
+    const elements: ElementsPanel;
+
+    /** Sources panel. */
+    const sources: SourcesPanel;
+
+    /** The name of the current devtools theme. */
+    const themeName: string;
+
+    /* devtools.panels functions */
+    /**
+     * Creates an extension panel.
+     * @param title Title that is displayed next to the extension icon in the Developer Tools toolbar.
+     * @param iconPath Path of the panel's icon relative to the extension directory.
+     * @param pagePath Path of the panel's HTML page relative to the extension directory.
+     */
+    function create(title: string, iconPath: string, pagePath: string): Promise<ExtensionPanel | undefined>;
+
+    /**
+     * Specifies the function to be called when the user clicks a resource link in the Developer Tools window. To unset
+     * the handler, either call the method with no parameters or pass null as the parameter.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function setOpenResourceHandler(): Promise<devtools.inspectedWindow.Resource | undefined>;
+
+    /**
+     * Requests DevTools to open a URL in a Developer Tools panel.
+     * @param url The URL of the resource to open.
+     * @param lineNumber Specifies the line number to scroll to when the resource is loaded.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function openResource(url: string, lineNumber: number): Promise<void>;
+
+    /* devtools.panels events */
+    /**
+     * Fired when the devtools theme changes.
+     * @param themeName The name of the current devtools theme.
+     */
+    const onThemeChanged: WebExtEvent<(themeName: string) => void>;
+}
+
+/**
+ * Use the `browser.find` API to interact with the browser's `Find` interface.
+ *
+ * Permissions: `find`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.find {
+    /* find functions */
+    /**
+     * Search for text in document and store found ranges in array, in document order.
+     * @param queryphrase The string to search for.
+     * @param [params] Search parameters.
+     */
+    function find(queryphrase: string, params?: {
+        /** Tab to query. Defaults to the active tab. */
+        tabId?: number;
+        /** Find only ranges with case sensitive match. */
+        caseSensitive?: boolean;
+        /** Find only ranges that match entire word. */
+        entireWord?: boolean;
+        /** Return rectangle data which describes visual position of search results. */
+        includeRectData?: boolean;
+        /** Return range data which provides range data in a serializable form. */
+        includeRangeData?: boolean;
+    }): Promise<{
+        count: number;
+        rangeData?: Array<{
+            framePos: number;
+            startTextNodePos: number;
+            endTextNodePos: number;
+            startOffset: number;
+            endOffset: number;
+        }>;
+        rectData?: Array<{
+            rectsAndTexts: {
+                rectList: Array<{
+                    top: number;
+                    left: number;
+                    bottom: number;
+                    right: number;
+                }>;
+                textList: string[];
+            };
+            textList: string;
+        }>;
+    }>;
+
+    /**
+     * Highlight a range
+     * @param [params] highlightResults parameters
+     */
+    function highlightResults(params?: {
+        /** Found range to be highlighted. Default highlights all ranges. */
+        rangeIndex?: number;
+        /** Tab to highlight. Defaults to the active tab. */
+        tabId?: number;
+        /** Don't scroll to highlighted item. */
+        noScroll?: boolean;
+    }): void;
+
+    /**
+     * Remove all highlighting from previous searches.
+     * @param [tabId] Tab to highlight. Defaults to the active tab.
+     */
+    function removeHighlighting(tabId?: number): void;
+}
+
+/**
+ * Exposes the browser's profiler.
+ *
+ * Permissions: `geckoProfiler`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.geckoProfiler {
+    /* geckoProfiler types */
+    enum ProfilerFeature {
+        java = "java",
+        js = "js",
+        leaf = "leaf",
+        mainthreadio = "mainthreadio",
+        memory = "memory",
+        privacy = "privacy",
+        restyle = "restyle",
+        stackwalk = "stackwalk",
+        tasktracer = "tasktracer",
+        threads = "threads"
+    }
+
+    /* geckoProfiler functions */
+    /** Starts the profiler with the specified settings. */
+    function start(settings: {
+        /**
+         * The size in bytes of the buffer used to store profiling data. A larger value allows capturing a profile that
+         * covers a greater amount of time.
+         */
+        bufferSize: number;
+        /**
+         * Interval in milliseconds between samples of profiling data. A smaller value will increase the detail of the
+         * profiles captured.
+         */
+        interval: number;
+        /** A list of active features for the profiler. */
+        features: ProfilerFeature[];
+        /** A list of thread names for which to capture profiles. */
+        threads?: string[];
+    }): Promise<any>;
+
+    /** Stops the profiler and discards any captured profile data. */
+    function stop(): Promise<any>;
+
+    /** Pauses the profiler, keeping any profile data that is already written. */
+    function pause(): Promise<any>;
+
+    /** Resumes the profiler with the settings that were initially used to start it. */
+    function resume(): Promise<any>;
+
+    /** Gathers the profile data from the current profiling session. */
+    function getProfile(): Promise<any>;
+
+    /**
+     * Gathers the profile data from the current profiling session. The returned promise resolves to an array buffer
+     * that contains a JSON string.
+     */
+    function getProfileAsArrayBuffer(): Promise<any>;
+
+    /**
+     * Gets the debug symbols for a particular library.
+     * @param debugName The name of the library's debug file. For example, 'xul.pdb
+     * @param breakpadId The Breakpad ID of the library
+     */
+    function getSymbols(debugName: string, breakpadId: string): Promise<any>;
+
+    /* geckoProfiler events */
+    /**
+     * Fires when the profiler starts/stops running.
+     * @param isRunning Whether the profiler is running or not. Pausing the profiler will not affect this value.
+     */
+    const onRunning: WebExtEvent<(isRunning: boolean) => void>;
+}
+
+/**
+ * Use the `browser.history` API to interact with the browser's record of visited pages. You can add, remove, and query
+ * for URLs in the browser's history. To override the history page with your own version, see Override Pages.
+ *
+ * Permissions: `history`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.history {
+    /* history types */
+
+    /** The transition type for this visit from its referrer. */
+    enum TransitionType {
+        link = "link",
+        typed = "typed",
+        auto_bookmark = "auto_bookmark",
+        auto_subframe = "auto_subframe",
+        manual_subframe = "manual_subframe",
+        generated = "generated",
+        auto_toplevel = "auto_toplevel",
+        form_submit = "form_submit",
+        reload = "reload",
+        keyword = "keyword",
+        keyword_generated = "keyword_generated"
+    }
+
+    /** An object encapsulating one result of a history query. */
+    interface HistoryItem {
+        /** The unique identifier for the item. */
+        id: string;
+        /** The URL navigated to by a user. */
+        url?: string;
+        /** The title of the page when it was last loaded. */
+        title?: string;
+        /** When this page was last loaded, represented in milliseconds since the epoch. */
+        lastVisitTime?: number;
+        /** The number of times the user has navigated to this page. */
+        visitCount?: number;
+        /** The number of times the user has navigated to this page by typing in the address. */
+        typedCount?: number;
+    }
+
+    /** An object encapsulating one visit to a URL. */
+    interface VisitItem {
+        /** The unique identifier for the item. */
+        id: string;
+        /** The unique identifier for this visit. */
+        visitId: string;
+        /** When this visit occurred, represented in milliseconds since the epoch. */
+        visitTime?: number;
+        /** The visit ID of the referrer. */
+        referringVisitId: string;
+        /** The transition type for this visit from its referrer. */
+        transition: TransitionType;
+    }
+
+    /* history functions */
+    /** Searches the history for the last visit time of each page matching the query. */
+    function search(query: {
+        /** A free-text query to the history service. Leave empty to retrieve all pages. */
+        text: string;
+        /**
+         * Limit results to those visited after this date. If not specified, this defaults to 24 hours in the past.
+         */
+        startTime?: extensionTypes.Date;
+        /** Limit results to those visited before this date. */
+        endTime?: extensionTypes.Date;
+        /** The maximum number of results to retrieve. Defaults to 100. */
+        maxResults?: number;
+    }): Promise<HistoryItem[]>;
+
+    /** Retrieves information about visits to a URL. */
+    function getVisits(details: {
+        /**
+         * The URL for which to retrieve visit information. It must be in the format as returned from a call to
+         * history.search.
+         */
+        url: string;
+    }): Promise<VisitItem[]>;
+
+    /**
+     * Adds a URL to the history with a default visitTime of the current time and a default transition type of "link".
+     */
+    function addUrl(details: {
+        /** The URL to add. Must be a valid URL that can be added to history. */
+        url: string;
+        /** The title of the page. */
+        title?: string;
+        /** The transition type for this visit from its referrer. */
+        transition?: TransitionType;
+        /** The date when this visit occurred. */
+        visitTime?: extensionTypes.Date;
+    }): Promise<void>;
+
+    /** Removes all occurrences of the given URL from the history. */
+    function deleteUrl(details: {
+        /** The URL to remove. */
+        url: string;
+    }): Promise<void>;
+
+    /**
+     * Removes all items within the specified date range from the history. Pages will not be removed from the history
+     * unless all visits fall within the range.
+     */
+    function deleteRange(range: {
+        /** Items added to history after this date. */
+        startTime: extensionTypes.Date;
+        /** Items added to history before this date. */
+        endTime: extensionTypes.Date;
+    }): Promise<void>;
+
+    /** Deletes all items from the history. */
+    function deleteAll(): Promise<void>;
+
+    /* history events */
+    /**
+     * Fired when a URL is visited, providing the HistoryItem data for that URL. This event fires before the page has
+     * loaded.
+     */
+    const onVisited: WebExtEvent<(result: HistoryItem) => void>;
+
+    /**
+     * Fired when one or more URLs are removed from the history service. When all visits have been removed the URL is
+     * purged from history.
+     */
+    const onVisitRemoved: WebExtEvent<(removed: {
+        /** True if all history was removed. If true, then urls will be empty. */
+        allHistory: boolean;
+        urls: string[];
+    }) => void>;
+
+    /** Fired when the title of a URL is changed in the browser history. */
+    const onTitleChanged: WebExtEvent<(changed: {
+        /** The URL for which the title has changed */
+        url: string;
+        /** The new title for the URL. */
+        title: string;
+    }) => void>;
+}
+
+/**
+ * Use the browser.contextMenus API to add items to the browser's context menu. You can choose what types of objects
+ * your context menu additions apply to, such as images, hyperlinks, and pages.
+ *
+ * Permissions: `contextMenus`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.contextMenus {
+    /* contextMenus types */
+
+    /**
+     * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other
+     * contexts except for 'tab' and 'tools_menu'.
+     */
+    enum ContextType {
+        all = "all",
+        page = "page",
+        frame = "frame",
+        selection = "selection",
+        link = "link",
+        editable = "editable",
+        password = "password",
+        image = "image",
+        video = "video",
+        audio = "audio",
+        launcher = "launcher",
+        browser_action = "browser_action",
+        page_action = "page_action",
+        tab = "tab"
+    }
+
+    /** The type of menu item. */
+    enum ItemType {
+        normal = "normal",
+        checkbox = "checkbox",
+        radio = "radio",
+        separator = "separator"
+    }
+
+    /** Information sent when a context menu item is clicked. */
+    interface OnClickData {
+        /** The ID of the menu item that was clicked. */
+        menuItemId: number | string;
+        /** The parent ID, if any, for the item clicked. */
+        parentMenuItemId?: number | string;
+        /**
+         * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+         */
+        mediaType?: string;
+        /** If the element is a link, the text of that link. */
+        linkText?: string;
+        /** If the element is a link, the URL it points to. */
+        linkUrl?: string;
+        /** Will be present for elements with a 'src' URL. */
+        srcUrl?: string;
+        /**
+         * The URL of the page where the menu item was clicked. This property is not set if the click occured in a
+         * context where there is no current page, such as in a launcher context menu.
+         */
+        pageUrl?: string;
+        /** The URL of the frame of the element where the context menu was clicked, if it was in a frame. */
+        frameUrl?: string;
+        /** The text for the context selection, if any. */
+        selectionText?: string;
+        /** A flag indicating whether the element is editable (text input, textarea, etc.). */
+        editable: boolean;
+        /** A flag indicating the state of a checkbox or radio item before it was clicked. */
+        wasChecked?: boolean;
+        /** A flag indicating the state of a checkbox or radio item after it is clicked. */
+        checked?: boolean;
+        /** An array of keyboard modifiers that were held while the menu item was clicked. */
+        modifiers: _OnClickDataModifiers[];
+    }
+
+    enum _OnClickDataModifiers {
+        Shift = "Shift",
+        Alt = "Alt",
+        Command = "Command",
+        Ctrl = "Ctrl",
+        MacCtrl = "MacCtrl"
+    }
+
+    /* contextMenus properties */
+    /**
+     * The maximum number of top level extension items that can be added to an extension action context menu. Any items
+     * beyond this limit will be ignored.
+     */
+    const ACTION_MENU_TOP_LEVEL_LIMIT: number;
+
+    /* contextMenus functions */
+    /**
+     * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the
+     * creation callback fires (the details will be in `runtime.lastError`).
+     * @param [callback] Called when the item has been created in the browser. If there were any problems creating the
+     *     item, details will be available in `runtime.lastError`.
+     * @returns The ID of the newly created item.
+     */
+    function create(createProperties: {
+        /** The type of menu item. Defaults to 'normal' if not specified. */
+        type?: ItemType;
+        /**
+         * The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this
+         * extension.
+         */
+        id?: string;
+        icons?: {
+            [key: number]: string;
+        };
+        /**
+         * The text to be displayed in the item; this is _required_ unless `type` is 'separator'. When the context is
+         * 'selection', you can use `%s` within the string to show the selected text. For example, if this parameter's
+         * value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the
+         * selection is "Translate 'cool' to Pig Latin".
+         */
+        title?: string;
+        /**
+         * The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio
+         * item can be selected at a time in a given group of radio items.
+         */
+        checked?: boolean;
+        /** List of contexts this menu item will appear in. Defaults to ['page'] if not specified. */
+        contexts?: ContextType[];
+        /**
+         * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead,
+         * they should register a listener for `contextMenus.onClicked`.
+         * @param info Information about the item clicked and the context where the click happened.
+         * @param tab The details of the tab where the click took place. Note: this parameter only present for
+         *     extensions.
+         */
+        onclick?: (info: menusInternal.OnClickData, tab: tabs.Tab) => void;
+        /** The ID of a parent menu item; this makes the item a child of a previously added item. */
+        parentId?: number | string;
+        /**
+         * Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This
+         * applies to frames as well.) For details on the format of a pattern, see Match Patterns.
+         */
+        documentUrlPatterns?: string[];
+        /**
+         * Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and
+         * the href of anchor tags.
+         */
+        targetUrlPatterns?: string[];
+        /** Whether this context menu item is enabled or disabled. Defaults to true. */
+        enabled?: boolean;
+        /**
+         * Specifies a command to issue for the context click. Currently supports internal commands
+         * _execute_page_action, _execute_browser_action and _execute_sidebar_action.
+         */
+        command?: string;
+    }, callback?: () => void): number | string;
+
+    /**
+     * Updates a previously created context menu item.
+     * @param id The ID of the item to update.
+     * @param updateProperties The properties to update. Accepts the same values as the create function.
+     */
+    function update(id: number | string, updateProperties: {
+        type?: ItemType;
+        title?: string;
+        checked?: boolean;
+        contexts?: ContextType[];
+        /**
+         * @param tab The details of the tab where the click took place. Note: this parameter only present for
+         *     extensions.
+         */
+        onclick?: (info: menusInternal.OnClickData, tab: tabs.Tab) => void;
+        /** Note: You cannot change an item to be a child of one of its own descendants. */
+        parentId?: number | string;
+        documentUrlPatterns?: string[];
+        targetUrlPatterns?: string[];
+        enabled?: boolean;
+    }): Promise<void>;
+
+    /**
+     * Removes a context menu item.
+     * @param menuItemId The ID of the context menu item to remove.
+     */
+    function remove(menuItemId: number | string): Promise<void>;
+
+    /** Removes all context menu items added by this extension. */
+    function removeAll(): Promise<void>;
+
+    /* contextMenus events */
+    /**
+     * Fired when a context menu item is clicked.
+     * @param info Information about the item clicked and the context where the click happened.
+     * @param [tab] The details of the tab where the click took place. If the click did not take place in a tab, this
+     *     parameter will be missing.
+     */
+    const onClicked: WebExtEvent<(info: OnClickData, tab?: tabs.Tab) => void>;
+}
+
+/**
+ * Use the browser.menus API to add items to the browser's menus. You can choose what types of objects your context
+ * menu additions apply to, such as images, hyperlinks, and pages.
+ *
+ * Permissions: `menus`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.menus {
+    /* menus types */
+
+    /**
+     * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other
+     * contexts except for 'tab' and 'tools_menu'.
+     */
+    enum ContextType {
+        all = "all",
+        page = "page",
+        frame = "frame",
+        selection = "selection",
+        link = "link",
+        editable = "editable",
+        password = "password",
+        image = "image",
+        video = "video",
+        audio = "audio",
+        launcher = "launcher",
+        browser_action = "browser_action",
+        page_action = "page_action",
+        tab = "tab",
+        tools_menu = "tools_menu"
+    }
+
+    /** The type of menu item. */
+    enum ItemType {
+        normal = "normal",
+        checkbox = "checkbox",
+        radio = "radio",
+        separator = "separator"
+    }
+
+    /** Information sent when a context menu item is clicked. */
+    interface OnClickData {
+        /** The ID of the menu item that was clicked. */
+        menuItemId: number | string;
+        /** The parent ID, if any, for the item clicked. */
+        parentMenuItemId?: number | string;
+        /**
+         * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+         */
+        mediaType?: string;
+        /** If the element is a link, the text of that link. */
+        linkText?: string;
+        /** If the element is a link, the URL it points to. */
+        linkUrl?: string;
+        /** Will be present for elements with a 'src' URL. */
+        srcUrl?: string;
+        /**
+         * The URL of the page where the menu item was clicked. This property is not set if the click occured in a
+         * context where there is no current page, such as in a launcher context menu.
+         */
+        pageUrl?: string;
+        /** The URL of the frame of the element where the context menu was clicked, if it was in a frame. */
+        frameUrl?: string;
+        /** The text for the context selection, if any. */
+        selectionText?: string;
+        /** A flag indicating whether the element is editable (text input, textarea, etc.). */
+        editable: boolean;
+        /** A flag indicating the state of a checkbox or radio item before it was clicked. */
+        wasChecked?: boolean;
+        /** A flag indicating the state of a checkbox or radio item after it is clicked. */
+        checked?: boolean;
+        /** An array of keyboard modifiers that were held while the menu item was clicked. */
+        modifiers: _OnClickDataModifiers[];
+    }
+
+    enum _OnClickDataModifiers {
+        Shift = "Shift",
+        Alt = "Alt",
+        Command = "Command",
+        Ctrl = "Ctrl",
+        MacCtrl = "MacCtrl"
+    }
+
+    /* menus properties */
+    /**
+     * The maximum number of top level extension items that can be added to an extension action context menu. Any items
+     * beyond this limit will be ignored.
+     */
+    const ACTION_MENU_TOP_LEVEL_LIMIT: number;
+
+    /* menus functions */
+    /**
+     * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the
+     * creation callback fires (the details will be in `runtime.lastError`).
+     * @param [callback] Called when the item has been created in the browser. If there were any problems creating the
+     *     item, details will be available in `runtime.lastError`.
+     * @returns The ID of the newly created item.
+     */
+    function create(createProperties: {
+        /** The type of menu item. Defaults to 'normal' if not specified. */
+        type?: ItemType;
+        /**
+         * The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this
+         * extension.
+         */
+        id?: string;
+        icons?: {
+            [key: number]: string;
+        };
+        /**
+         * The text to be displayed in the item; this is _required_ unless `type` is 'separator'. When the context is
+         * 'selection', you can use `%s` within the string to show the selected text. For example, if this parameter's
+         * value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the
+         * selection is "Translate 'cool' to Pig Latin".
+         */
+        title?: string;
+        /**
+         * The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio
+         * item can be selected at a time in a given group of radio items.
+         */
+        checked?: boolean;
+        /** List of contexts this menu item will appear in. Defaults to ['page'] if not specified. */
+        contexts?: ContextType[];
+        /**
+         * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead,
+         * they should register a listener for `contextMenus.onClicked`.
+         * @param info Information about the item clicked and the context where the click happened.
+         * @param tab The details of the tab where the click took place. Note: this parameter only present for
+         *     extensions.
+         */
+        onclick?: (info: menusInternal.OnClickData, tab: tabs.Tab) => void;
+        /** The ID of a parent menu item; this makes the item a child of a previously added item. */
+        parentId?: number | string;
+        /**
+         * Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This
+         * applies to frames as well.) For details on the format of a pattern, see Match Patterns.
+         */
+        documentUrlPatterns?: string[];
+        /**
+         * Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and
+         * the href of anchor tags.
+         */
+        targetUrlPatterns?: string[];
+        /** Whether this context menu item is enabled or disabled. Defaults to true. */
+        enabled?: boolean;
+        /**
+         * Specifies a command to issue for the context click. Currently supports internal commands
+         * _execute_page_action, _execute_browser_action and _execute_sidebar_action.
+         */
+        command?: string;
+    }, callback?: () => void): number | string;
+
+    /**
+     * Updates a previously created context menu item.
+     * @param id The ID of the item to update.
+     * @param updateProperties The properties to update. Accepts the same values as the create function.
+     */
+    function update(id: number | string, updateProperties: {
+        type?: ItemType;
+        title?: string;
+        checked?: boolean;
+        contexts?: ContextType[];
+        /**
+         * @param tab The details of the tab where the click took place. Note: this parameter only present for
+         *     extensions.
+         */
+        onclick?: (info: menusInternal.OnClickData, tab: tabs.Tab) => void;
+        /** Note: You cannot change an item to be a child of one of its own descendants. */
+        parentId?: number | string;
+        documentUrlPatterns?: string[];
+        targetUrlPatterns?: string[];
+        enabled?: boolean;
+    }): Promise<void>;
+
+    /**
+     * Removes a context menu item.
+     * @param menuItemId The ID of the context menu item to remove.
+     */
+    function remove(menuItemId: number | string): Promise<void>;
+
+    /** Removes all context menu items added by this extension. */
+    function removeAll(): Promise<void>;
+
+    /* menus events */
+    /**
+     * Fired when a context menu item is clicked.
+     * @param info Information about the item clicked and the context where the click happened.
+     * @param [tab] The details of the tab where the click took place. If the click did not take place in a tab, this
+     *     parameter will be missing.
+     */
+    const onClicked: WebExtEvent<(info: OnClickData, tab?: tabs.Tab) => void>;
+}
+
+/**
+ * Use the `browser.contextMenus` API to add items to the browser's context menu. You can choose what types of objects
+ * your context menu additions apply to, such as images, hyperlinks, and pages.
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.menusInternal {
+    /* menusInternal types */
+    /** Information sent when a context menu item is clicked. */
+    interface OnClickData {
+        /** The ID of the menu item that was clicked. */
+        menuItemId: number | string;
+        /** The parent ID, if any, for the item clicked. */
+        parentMenuItemId?: number | string;
+        /**
+         * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+         */
+        mediaType?: string;
+        /** If the element is a link, the URL it points to. */
+        linkUrl?: string;
+        /** Will be present for elements with a 'src' URL. */
+        srcUrl?: string;
+        /**
+         * The URL of the page where the menu item was clicked. This property is not set if the click occured in a
+         * context where there is no current page, such as in a launcher context menu.
+         */
+        pageUrl?: string;
+        /** The URL of the frame of the element where the context menu was clicked, if it was in a frame. */
+        frameUrl?: string;
+        /** The text for the context selection, if any. */
+        selectionText?: string;
+        /** A flag indicating whether the element is editable (text input, textarea, etc.). */
+        editable: boolean;
+        /** A flag indicating the state of a checkbox or radio item before it was clicked. */
+        wasChecked?: boolean;
+        /** A flag indicating the state of a checkbox or radio item after it is clicked. */
+        checked?: boolean;
+    }
+}
+
+/**
+ * The omnibox API allows you to register a keyword with Firefox's address bar.
+ *
+ * Manifest keys: `omnibox`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.omnibox {
+    /* omnibox types */
+
+    /** The style type. */
+    enum DescriptionStyleType {
+        url = "url",
+        match = "match",
+        dim = "dim"
+    }
+
+    /**
+     * The window disposition for the omnibox query. This is the recommended context to display results. For example,
+     * if the omnibox command is to navigate to a certain URL, a disposition of 'newForegroundTab' means the navigation
+     * should take place in a new selected tab.
+     */
+    enum OnInputEnteredDisposition {
+        currentTab = "currentTab",
+        newForegroundTab = "newForegroundTab",
+        newBackgroundTab = "newBackgroundTab"
+    }
+
+    /** A suggest result. */
+    interface SuggestResult {
+        /**
+         * The text that is put into the URL bar, and that is sent to the extension when the user chooses this entry.
+         */
+        content: string;
+        /**
+         * The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags
+         * are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim'
+         * (for dim helper text). The styles can be nested, eg. <dim><match>dimmed match</match></dim>. You must escape
+         * the five predefined entities to display them as text: stackoverflow.com/a/1091953/89484
+         */
+        description: string;
+        /**
+         * An array of style ranges for the description, as provided by the extension.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        descriptionStyles?: Array<{
+            offset: number;
+            /** The style type */
+            type: DescriptionStyleType;
+            length?: number;
+        }>;
+        /**
+         * An array of style ranges for the description, as provided by ToValue().
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        descriptionStylesRaw?: Array<{
+            offset: number;
+            type: number;
+        }>;
+    }
+
+    /** A suggest result. */
+    interface DefaultSuggestResult {
+        /** The text that is displayed in the URL dropdown. */
+        description: string;
+        /**
+         * An array of style ranges for the description, as provided by the extension.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        descriptionStyles?: Array<{
+            offset: number;
+            /** The style type */
+            type: DescriptionStyleType;
+            length?: number;
+        }>;
+        /**
+         * An array of style ranges for the description, as provided by ToValue().
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        descriptionStylesRaw?: Array<{
+            offset: number;
+            type: number;
+        }>;
+    }
+
+    /* omnibox functions */
+    /**
+     * Sets the description and styling for the default suggestion. The default suggestion is the text that is
+     * displayed in the first suggestion row underneath the URL bar.
+     * @param suggestion A partial SuggestResult object, without the 'content' parameter.
+     */
+    function setDefaultSuggestion(suggestion: DefaultSuggestResult): void;
+
+    /* omnibox events */
+    /**
+     * User has started a keyword input session by typing the extension's keyword. This is guaranteed to be sent
+     * exactly once per input session, and before any onInputChanged events.
+     */
+    const onInputStarted: WebExtEvent<() => void>;
+
+    /**
+     * User has changed what is typed into the omnibox.
+     * @param suggest A callback passed to the onInputChanged event used for sending suggestions back to the browser.
+     */
+    const onInputChanged: WebExtEvent<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void>;
+
+    /** User has accepted what is typed into the omnibox. */
+    const onInputEntered: WebExtEvent<(text: string, disposition: OnInputEnteredDisposition) => void>;
+
+    /** User has ended the keyword input session without accepting the input. */
+    const onInputCancelled: WebExtEvent<() => void>;
+}
+
+/**
+ * Use the `browser.pageAction` API to put icons inside the address bar. Page actions represent actions that can be
+ * taken on the current page, but that aren't applicable to all pages.
+ *
+ * Manifest keys: `page_action`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.pageAction {
+    /* pageAction types */
+    /** Pixel data for an image. Must be an ImageData object (for example, from a `canvas` element). */
+    type ImageDataType = object/*ImageData*/;
+
+    /* pageAction functions */
+    /**
+     * Shows the page action. The page action is shown whenever the tab is selected.
+     * @param tabId The id of the tab for which you want to modify the page action.
+     */
+    function show(tabId: number): Promise<void>;
+
+    /**
+     * Hides the page action.
+     * @param tabId The id of the tab for which you want to modify the page action.
+     */
+    function hide(tabId: number): Promise<void>;
+
+    /** Sets the title of the page action. This is displayed in a tooltip over the page action. */
+    function setTitle(details: {
+        /** The id of the tab for which you want to modify the page action. */
+        tabId: number;
+        /** The tooltip string. */
+        title: string;
+    }): void;
+
+    /** Gets the title of the page action. */
+    function getTitle(details: {
+        /** Specify the tab to get the title from. */
+        tabId: number;
+    }): Promise<string>;
+
+    /**
+     * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel
+     * data from a canvas element, or as dictionary of either one of those. Either the **path** or the **imageData**
+     * property must be specified.
+     */
+    function setIcon(details: {
+        /** The id of the tab for which you want to modify the page action. */
+        tabId: number;
+        /**
+         * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is
+         * specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the
+         * number of image pixels that fit into one screen space unit equals `scale`, then image with size `scale` * 19
+         * will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified.
+         * Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
+         */
+        imageData?: ImageDataType | {
+            [key: number]: ImageDataType;
+        };
+        /**
+         * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If
+         * the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel
+         * density. If the number of image pixels that fit into one screen space unit equals `scale`, then image with
+         * size `scale` * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must
+         * be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
+         */
+        path?: string | {
+            [key: number]: string;
+        };
+    }): Promise<void>;
+
+    /** Sets the html document to be opened as a popup when the user clicks on the page action's icon. */
+    function setPopup(details: {
+        /** The id of the tab for which you want to modify the page action. */
+        tabId: number;
+        /** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
+        popup: string;
+    }): void;
+
+    /** Gets the html document set as the popup for this page action. */
+    function getPopup(details: {
+        /** Specify the tab to get the popup from. */
+        tabId: number;
+    }): Promise<string>;
+
+    /** Opens the extension page action in the active window. */
+    function openPopup(): Promise<void>;
+
+    /* pageAction events */
+    /** Fired when a page action icon is clicked. This event will not fire if the page action has a popup. */
+    const onClicked: WebExtEvent<(tab: tabs.Tab) => void>;
+}
+
+/**
+ * PKCS#11 module management API
+ *
+ * Permissions: `pkcs11`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.pkcs11 {
+    /* pkcs11 functions */
+    /** checks whether a PKCS#11 module, given by name, is installed */
+    function isModuleInstalled(name: string): Promise<boolean>;
+
+    /** Install a PKCS#11 module with a given name */
+    function installModule(name: string, flags?: number): Promise<void>;
+
+    /** Remove an installed PKCS#11 module from firefox */
+    function uninstallModule(name: string): Promise<void>;
+
+    /** Enumerate a module's slots, each with their name and whether a token is present */
+    function getModuleSlots(name: string): Promise<{
+        name: string;
+        token?: {
+            name: string;
+            manufacturer: string;
+            HWVersion: string;
+            FWVersion: string;
+            serial: string;
+            isLoggedIn: string;
+        };
+    }>;
+}
+
+/**
+ * Use the `browser.sessions` API to query and restore tabs and windows from a browsing session.
+ *
+ * Permissions: `sessions`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.sessions {
+    /* sessions types */
+    interface Filter {
+        /**
+         * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum
+         * number of entries (`sessions.MAX_SESSION_RESULTS`).
+         */
+        maxResults?: number;
+    }
+
+    interface Session {
+        /** The time when the window or tab was closed or modified, represented in milliseconds since the epoch. */
+        lastModified: number;
+        /** The `tabs.Tab`, if this entry describes a tab. Either this or `sessions.Session.window` will be set. */
+        tab?: tabs.Tab;
+        /**
+         * The `windows.Window`, if this entry describes a window. Either this or `sessions.Session.tab` will be set.
+         */
+        window?: windows.Window;
+    }
+
+    interface Device {
+        info: string;
+        /** The name of the foreign device. */
+        deviceName: string;
+        /**
+         * A list of open window sessions for the foreign device, sorted from most recently to least recently modified
+         * session.
+         */
+        sessions: Session[];
+    }
+
+    /* sessions properties */
+    /** The maximum number of `sessions.Session` that will be included in a requested list. */
+    const MAX_SESSION_RESULTS: number;
+
+    /* sessions functions */
+    /**
+     * Forget a recently closed tab.
+     * @param windowId The windowId of the window to which the recently closed tab to be forgotten belongs.
+     * @param sessionId The sessionId (closedId) of the recently closed tab to be forgotten.
+     */
+    function forgetClosedTab(windowId: number, sessionId: string): Promise<void>;
+
+    /**
+     * Forget a recently closed window.
+     * @param sessionId The sessionId (closedId) of the recently closed window to be forgotten.
+     */
+    function forgetClosedWindow(sessionId: string): Promise<void>;
+
+    /** Gets the list of recently closed tabs and/or windows. */
+    function getRecentlyClosed(callback: (sessions: Session[]) => void): Promise<Session[]>;
+    /** Gets the list of recently closed tabs and/or windows. */
+    function getRecentlyClosed(filter: Filter, callback: (sessions: Session[]) => void): Promise<Session[]>;
+
+    /**
+     * Retrieves all devices with synced sessions.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function getDevices(filter?: Filter): Promise<Device[]>;
+
+    /**
+     * Reopens a `windows.Window` or `tabs.Tab`, with an optional callback to run when the entry has been restored.
+     * @param [sessionId] The `windows.Window.sessionId`, or `tabs.Tab.sessionId` to restore. If this parameter is not
+     *     specified, the most recently closed session is restored.
+     */
+    function restore(sessionId?: string, callback?: (restoredSession: Session) => void): Promise<Session>;
+
+    /**
+     * Set a key/value pair on a given tab.
+     * @param tabId The id of the tab that the key/value pair is being set on.
+     * @param key The key which corresponds to the value being set.
+     * @param value The value being set.
+     */
+    function setTabValue(tabId: number, key: string, value: any): Promise<void>;
+
+    /**
+     * Retrieve a value that was set for a given key on a given tab.
+     * @param tabId The id of the tab whose value is being retrieved from.
+     * @param key The key which corresponds to the value.
+     */
+    function getTabValue(tabId: number, key: string): Promise<string | object | undefined>;
+
+    /**
+     * Remove a key/value pair that was set on a given tab.
+     * @param tabId The id of the tab whose key/value pair is being removed.
+     * @param key The key which corresponds to the value.
+     */
+    function removeTabValue(tabId: number, key: string): Promise<void>;
+
+    /**
+     * Set a key/value pair on a given window.
+     * @param windowId The id of the window that the key/value pair is being set on.
+     * @param key The key which corresponds to the value being set.
+     * @param value The value being set.
+     */
+    function setWindowValue(windowId: number, key: string, value: any): Promise<void>;
+
+    /**
+     * Retrieve a value that was set for a given key on a given window.
+     * @param windowId The id of the window whose value is being retrieved from.
+     * @param key The key which corresponds to the value.
+     */
+    function getWindowValue(windowId: number, key: string): Promise<string | object | undefined>;
+
+    /**
+     * Remove a key/value pair that was set on a given window.
+     * @param windowId The id of the window whose key/value pair is being removed.
+     * @param key The key which corresponds to the value.
+     */
+    function removeWindowValue(windowId: number, key: string): Promise<void>;
+
+    /* sessions events */
+    /**
+     * Fired when recently closed tabs and/or windows are changed. This event does not monitor synced sessions changes.
+     */
+    const onChanged: WebExtEvent<() => void>;
+}
+
+/**
+ * Use sidebar actions to add a sidebar to Firefox.
+ *
+ * Manifest keys: `sidebar_action`
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.sidebarAction {
+    /* sidebarAction types */
+    /** Pixel data for an image. Must be an ImageData object (for example, from a `canvas` element). */
+    type ImageDataType = object/*ImageData*/;
+
+    /* sidebarAction functions */
+    /** Sets the title of the sidebar action. This shows up in the tooltip. */
+    function setTitle(details: {
+        /** The string the sidebar action should display when moused over. */
+        title: string;
+        /** Sets the sidebar title for the tab specified by tabId. Automatically resets when the tab is closed. */
+        tabId?: number;
+    }): Promise<void>;
+
+    /** Gets the title of the sidebar action. */
+    function getTitle(details: {
+        /**
+         * Specify the tab to get the title from. If no tab is specified, the non-tab-specific title is returned.
+         */
+        tabId?: number;
+    }): Promise<string>;
+
+    /**
+     * Sets the icon for the sidebar action. The icon can be specified either as the path to an image file or as the
+     * pixel data from a canvas element, or as dictionary of either one of those. Either the **path** or the
+     * **imageData** property must be specified.
+     */
+    function setIcon(details: {
+        /**
+         * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is
+         * specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the
+         * number of image pixels that fit into one screen space unit equals `scale`, then image with size `scale` * 19
+         * will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified.
+         * Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
+         */
+        imageData?: ImageDataType | {
+            [key: number]: ImageDataType;
+        };
+        /**
+         * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If
+         * the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel
+         * density. If the number of image pixels that fit into one screen space unit equals `scale`, then image with
+         * size `scale` * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must
+         * be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
+         */
+        path?: string;
+        /** Sets the sidebar icon for the tab specified by tabId. Automatically resets when the tab is closed. */
+        tabId?: number;
+    }): Promise<void>;
+
+    /**
+     * Sets the url to the html document to be opened in the sidebar when the user clicks on the sidebar action's icon.
+     */
+    function setPanel(details: {
+        /** Sets the sidebar url for the tab specified by tabId. Automatically resets when the tab is closed. */
+        tabId?: number;
+        /** The url to the html file to show in a sidebar. If set to the empty string (''), no sidebar is shown. */
+        panel: string;
+    }): Promise<void>;
+
+    /** Gets the url to the html document set as the panel for this sidebar action. */
+    function getPanel(details: {
+        /**
+         * Specify the tab to get the sidebar from. If no tab is specified, the non-tab-specific sidebar is returned.
+         */
+        tabId?: number;
+    }): Promise<string>;
+
+    /** Opens the extension sidebar in the active window. */
+    function open(): Promise<void>;
+
+    /** Closes the extension sidebar in the active window if the sidebar belongs to the extension. */
+    function close(): Promise<void>;
+}
+
+/**
+ * Use the `browser.tabs` API to interact with the browser's tab system. You can use this API to create, modify, and
+ * rearrange tabs in the browser.
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.tabs {
+    /* tabs types */
+
+    /** An event that caused a muted state change. */
+    enum MutedInfoReason {
+        /** A user input action has set/overridden the muted state. */
+        user = "user",
+        /** Tab capture started, forcing a muted state change. */
+        capture = "capture",
+        /** An extension, identified by the extensionId field, set the muted state. */
+        extension = "extension"
+    }
+
+    /** Tab muted state and the reason for the last state change. */
+    interface MutedInfo {
+        /**
+         * Whether the tab is prevented from playing sound (but hasn't necessarily recently produced sound). Equivalent
+         * to whether the muted audio indicator is showing.
+         */
+        muted: boolean;
+        /** The reason the tab was muted or unmuted. Not set if the tab's mute state has never been changed. */
+        reason?: MutedInfoReason;
+        /**
+         * The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted
+         * state last changed.
+         */
+        extensionId?: string;
+    }
+
+    interface Tab {
+        /**
+         * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be
+         * assigned an ID, for example when querying foreign tabs using the `sessions` API, in which case a session ID
+         * may be present. Tab ID can also be set to `tabs.TAB_ID_NONE` for apps and devtools windows.
+         */
+        id?: number;
+        /** The zero-based index of the tab within its window. */
+        index: number;
+        /** The ID of the window the tab is contained within. */
+        windowId?: number;
+        /**
+         * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists.
+         */
+        openerTabId?: number;
+        /**
+         * Whether the tab is selected.
+         * @deprecated Please use `tabs.Tab.highlighted`.
+         */
+        selected?: boolean;
+        /** Whether the tab is highlighted. Works as an alias of active */
+        highlighted: boolean;
+        /** Whether the tab is active in its window. (Does not necessarily mean the window is focused.) */
+        active: boolean;
+        /** Whether the tab is pinned. */
+        pinned: boolean;
+        /** The last time the tab was accessed as the number of milliseconds since epoch. */
+        lastAccessed?: number;
+        /**
+         * Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also
+         * muted). Equivalent to whether the speaker audio indicator is showing.
+         */
+        audible?: boolean;
+        /** Current tab muted state and the reason for the last state change. */
+        mutedInfo?: MutedInfo;
+        /**
+         * The URL the tab is displaying. This property is only present if the extension's manifest includes the
+         * `"tabs"` permission.
+         */
+        url?: string;
+        /**
+         * The title of the tab. This property is only present if the extension's manifest includes the `"tabs"`
+         * permission.
+         */
+        title?: string;
+        /**
+         * The URL of the tab's favicon. This property is only present if the extension's manifest includes the
+         * `"tabs"` permission. It may also be an empty string if the tab is loading.
+         */
+        favIconUrl?: string;
+        /** Either _loading_ or _complete_. */
+        status?: string;
+        /** True while the tab is not loaded with content. */
+        discarded?: boolean;
+        /** Whether the tab is in an incognito window. */
+        incognito: boolean;
+        /** The width of the tab in pixels. */
+        width?: number;
+        /** The height of the tab in pixels. */
+        height?: number;
+        /** The session ID used to uniquely identify a Tab obtained from the `sessions` API. */
+        sessionId?: string;
+        /** The CookieStoreId used for the tab. */
+        cookieStoreId?: string;
+        /** Whether the document in the tab can be rendered in reader mode. */
+        isArticle?: boolean;
+        /** Whether the document in the tab is being rendered in reader mode. */
+        isInReaderMode?: boolean;
+    }
+
+    /**
+     * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page;
+     * defaults to `automatic`.
+     */
+    enum ZoomSettingsMode {
+        /** Zoom changes are handled automatically by the browser. */
+        automatic = "automatic",
+        /**
+         * Overrides the automatic handling of zoom changes. The `onZoomChange` event will still be dispatched, and it
+         * is the responsibility of the extension to listen for this event and manually scale the page. This mode does
+         * not support `per-origin` zooming, and will thus ignore the `scope` zoom setting and assume `per-tab`.
+         */
+        manual = "manual",
+        /**
+         * Disables all zooming in the tab. The tab will revert to the default zoom level, and all attempted zoom
+         * changes will be ignored.
+         */
+        disabled = "disabled"
+    }
+
+    /**
+     * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults to
+     * `per-origin` when in `automatic` mode, and `per-tab` otherwise.
+     */
+    enum ZoomSettingsScope {
+        /**
+         * Zoom changes will persist in the zoomed page's origin, i.e. all other tabs navigated to that same origin
+         * will be zoomed as well. Moreover, `per-origin` zoom changes are saved with the origin, meaning that when
+         * navigating to other pages in the same origin, they will all be zoomed to the same zoom factor. The
+         * `per-origin` scope is only available in the `automatic` mode.
+         */
+        perorigin = "per-origin",
+        /**
+         * Zoom changes only take effect in this tab, and zoom changes in other tabs will not affect the zooming of
+         * this tab. Also, `per-tab` zoom changes are reset on navigation; navigating a tab will always load pages with
+         * their `per-origin` zoom factors.
+         */
+        pertab = "per-tab"
+    }
+
+    /** Defines how zoom changes in a tab are handled and at what scope. */
+    interface ZoomSettings {
+        /**
+         * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page;
+         * defaults to `automatic`.
+         */
+        mode?: ZoomSettingsMode;
+        /**
+         * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults
+         * to `per-origin` when in `automatic` mode, and `per-tab` otherwise.
+         */
+        scope?: ZoomSettingsScope;
+        /** Used to return the default zoom level for the current tab in calls to tabs.getZoomSettings. */
+        defaultZoomFactor?: number;
+    }
+
+    /** The page settings including: orientation, scale, background, margins, headers, footers. */
+    interface PageSettings {
+        /** The page content orientation: 0 = portrait, 1 = landscape. Default: 0. */
+        orientation?: number;
+        /** The page content scaling factor: 1.0 = 100% = normal size. Default: 1.0. */
+        scaling?: number;
+        /** Whether the page content should shrink to fit the page width (overrides scaling). Default: true. */
+        shrinkToFit?: boolean;
+        /** Whether the page background colors should be shown. Default: false. */
+        showBackgroundColors?: boolean;
+        /** Whether the page background images should be shown. Default: false. */
+        showBackgroundImages?: boolean;
+        /** The page size unit: 0 = inches, 1 = millimeters. Default: 0. */
+        paperSizeUnit?: number;
+        /** The paper width in paper size units. Default: 8.5. */
+        paperWidth?: number;
+        /** The paper height in paper size units. Default: 11.0. */
+        paperHeight?: number;
+        /** The text for the page's left header. Default: '&T'. */
+        headerLeft?: string;
+        /** The text for the page's center header. Default: ''. */
+        headerCenter?: string;
+        /** The text for the page's right header. Default: '&U'. */
+        headerRight?: string;
+        /** The text for the page's left footer. Default: '&PT'. */
+        footerLeft?: string;
+        /** The text for the page's center footer. Default: ''. */
+        footerCenter?: string;
+        /** The text for the page's right footer. Default: '&D'. */
+        footerRight?: string;
+        /** The margin between the page content and the left edge of the paper (inches). Default: 0.5. */
+        marginLeft?: number;
+        /** The margin between the page content and the right edge of the paper (inches). Default: 0.5. */
+        marginRight?: number;
+        /** The margin between the page content and the top edge of the paper (inches). Default: 0.5. */
+        marginTop?: number;
+        /** The margin between the page content and the bottom edge of the paper (inches). Default: 0.5. */
+        marginBottom?: number;
+    }
+
+    /** Whether the tabs have completed loading. */
+    enum TabStatus {
+        loading = "loading",
+        complete = "complete"
+    }
+
+    /** The type of window. */
+    enum WindowType {
+        normal = "normal",
+        popup = "popup",
+        panel = "panel",
+        app = "app",
+        devtools = "devtools"
+    }
+
+    /* tabs properties */
+    /** An ID which represents the absence of a browser tab. */
+    const TAB_ID_NONE: number;
+
+    /* tabs functions */
+    /** Retrieves details about the specified tab. */
+    function get(tabId: number): Promise<Tab>;
+
+    /**
+     * Gets the tab that this script call is being made from. May be undefined if called from a non-tab context (for
+     * example: a background page or popup view).
+     */
+    function getCurrent(): Promise<Tab>;
+
+    /**
+     * Connects to the content script(s) in the specified tab. The `runtime.onConnect` event is fired in each content
+     * script running in the specified tab for the current extension. For more details, see Content Script Messaging.
+     * @returns A port that can be used to communicate with the content scripts running in the specified tab. The
+     *     port's `runtime.Port` event is fired if the tab closes or does not exist.
+     */
+    function connect(tabId: number, connectInfo?: {
+        /** Will be passed into onConnect for content scripts that are listening for the connection event. */
+        name?: string;
+        /** Open a port to a specific frame identified by `frameId` instead of all frames in the tab. */
+        frameId?: number;
+    }): runtime.Port;
+
+    /**
+     * Sends a single request to the content script(s) in the specified tab, with an optional callback to run when a
+     * response is sent back. The `extension.onRequest` event is fired in each content script running in the specified
+     * tab for the current extension.
+     * @deprecated Please use `runtime.sendMessage`.
+     */
+    function sendRequest(tabId: number, request: any, responseCallback?: (response: any) => void): void;
+
+    /**
+     * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a
+     * response is sent back. The `runtime.onMessage` event is fired in each content script running in the specified
+     * tab for the current extension.
+     */
+    function sendMessage(tabId: number, message: any, options?: {
+        /** Send a message to a specific frame identified by `frameId` instead of all frames in the tab. */
+        frameId?: number;
+    }): Promise<any>;
+
+    /**
+     * Gets the tab that is selected in the specified window.
+     * @param [windowId] Defaults to the current window.
+     * @deprecated Please use `tabs.query` `{active: true}`.
+     */
+    function getSelected(windowId?: number): Promise<Tab>;
+
+    /**
+     * Gets details about all tabs in the specified window.
+     * @param [windowId] Defaults to the current window.
+     * @deprecated Please use `tabs.query` `{windowId: windowId}`.
+     */
+    function getAllInWindow(windowId?: number): Promise<Tab[]>;
+
+    /** Creates a new tab. */
+    function create(createProperties: {
+        /** The window to create the new tab in. Defaults to the current window. */
+        windowId?: number;
+        /**
+         * The position the tab should take in the window. The provided value will be clamped to between zero and the
+         * number of tabs in the window.
+         */
+        index?: number;
+        /**
+         * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e.
+         * 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within
+         * the extension. Defaults to the New Tab Page.
+         */
+        url?: string;
+        /**
+         * Whether the tab should become the active tab in the window. Does not affect whether the window is focused
+         * (see `windows.update`). Defaults to `true`.
+         */
+        active?: boolean;
+        /**
+         * Whether the tab should become the selected tab in the window. Defaults to `true`
+         * @deprecated Please use _active_.
+         */
+        selected?: boolean;
+        /** Whether the tab should be pinned. Defaults to `false` */
+        pinned?: boolean;
+        /**
+         * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly
+         * created tab.
+         */
+        openerTabId?: number;
+        /** The CookieStoreId for the tab that opened this tab. */
+        cookieStoreId?: string;
+        /** Whether the document in the tab should be opened in reader mode. */
+        openInReaderMode?: boolean;
+    }): Promise<Tab | undefined>;
+
+    /**
+     * Duplicates a tab.
+     * @param tabId The ID of the tab which is to be duplicated.
+     */
+    function duplicate(tabId: number): Promise<Tab | undefined>;
+
+    /** Gets all tabs that have the specified properties, or all tabs if no properties are specified. */
+    function query(queryInfo: {
+        /** Whether the tabs are active in their windows. */
+        active?: boolean;
+        /** Whether the tabs are pinned. */
+        pinned?: boolean;
+        /** Whether the tabs are audible. */
+        audible?: boolean;
+        /** Whether the tabs are muted. */
+        muted?: boolean;
+        /** Whether the tabs are highlighted. Works as an alias of active. */
+        highlighted?: boolean;
+        /** Whether the tabs are in the current window. */
+        currentWindow?: boolean;
+        /** Whether the tabs are in the last focused window. */
+        lastFocusedWindow?: boolean;
+        /** Whether the tabs have completed loading. */
+        status?: TabStatus;
+        /** True while the tabs are not loaded with content. */
+        discarded?: boolean;
+        /** Match page titles against a pattern. */
+        title?: string;
+        /** Match tabs against one or more URL patterns. Note that fragment identifiers are not matched. */
+        url?: string | string[];
+        /** The ID of the parent window, or `windows.WINDOW_ID_CURRENT` for the current window. */
+        windowId?: number;
+        /** The type of window the tabs are in. */
+        windowType?: WindowType;
+        /** The position of the tabs within their windows. */
+        index?: number;
+        /** The CookieStoreId used for the tab. */
+        cookieStoreId?: string;
+        /**
+         * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab.
+         */
+        openerTabId?: number;
+    }): Promise<Tab[]>;
+
+    /**
+     * Highlights the given tabs.
+     * @deprecated Unsupported on Firefox at this time.
+     */
+    function highlight(highlightInfo: {
+        /** The window that contains the tabs. */
+        windowId?: number;
+        /** One or more tab indices to highlight. */
+        tabs: number[] | number;
+    }): Promise<windows.Window | undefined>;
+
+    /**
+     * Modifies the properties of a tab. Properties that are not specified in `updateProperties` are not modified.
+     */
+    function update(updateProperties: {
+        /** A URL to navigate the tab to. */
+        url?: string;
+        /**
+         * Whether the tab should be active. Does not affect whether the window is focused (see `windows.update`).
+         */
+        active?: boolean;
+        /**
+         * Adds or removes the tab from the current selection.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        highlighted?: boolean;
+        /**
+         * Whether the tab should be selected.
+         * @deprecated Please use _highlighted_.
+         */
+        selected?: boolean;
+        /** Whether the tab should be pinned. */
+        pinned?: boolean;
+        /** Whether the tab should be muted. */
+        muted?: boolean;
+        /**
+         * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab.
+         */
+        openerTabId?: number;
+        /** Whether the load should replace the current history entry for the tab. */
+        loadReplace?: boolean;
+    }): Promise<Tab | undefined>;
+    /**
+     * Modifies the properties of a tab. Properties that are not specified in `updateProperties` are not modified.
+     * @param tabId Defaults to the selected tab of the current window.
+     */
+    function update(tabId: number, updateProperties: {
+        /** A URL to navigate the tab to. */
+        url?: string;
+        /**
+         * Whether the tab should be active. Does not affect whether the window is focused (see `windows.update`).
+         */
+        active?: boolean;
+        /**
+         * Adds or removes the tab from the current selection.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        highlighted?: boolean;
+        /**
+         * Whether the tab should be selected.
+         * @deprecated Please use _highlighted_.
+         */
+        selected?: boolean;
+        /** Whether the tab should be pinned. */
+        pinned?: boolean;
+        /** Whether the tab should be muted. */
+        muted?: boolean;
+        /**
+         * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab.
+         */
+        openerTabId?: number;
+        /** Whether the load should replace the current history entry for the tab. */
+        loadReplace?: boolean;
+    }): Promise<Tab | undefined>;
+
+    /**
+     * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved
+     * to and from normal (window.type === "normal") windows.
+     * @param tabIds The tab or list of tabs to move.
+     */
+    function move(tabIds: number | number[], moveProperties: {
+        /** Defaults to the window the tab is currently in. */
+        windowId?: number;
+        /** The position to move the window to. -1 will place the tab at the end of the window. */
+        index: number;
+    }): Promise<Tab | Tab[] | undefined>;
+
+    /**
+     * Reload a tab.
+     * @param [tabId] The ID of the tab to reload; defaults to the selected tab of the current window.
+     */
+    function reload(tabId?: number, reloadProperties?: {
+        /** Whether using any local cache. Default is false. */
+        bypassCache?: boolean;
+    }): Promise<void>;
+
+    /**
+     * Closes one or more tabs.
+     * @param tabIds The tab or list of tabs to close.
+     */
+    function remove(tabIds: number | number[]): Promise<void>;
+
+    /**
+     * discards one or more tabs.
+     * @param tabIds The tab or list of tabs to discard.
+     */
+    function discard(tabIds: number | number[]): Promise<void>;
+
+    /**
+     * Detects the primary language of the content in a tab.
+     * @param [tabId] Defaults to the active tab of the current window.
+     */
+    function detectLanguage(tabId?: number): Promise<string>;
+
+    /**
+     * Toggles reader mode for the document in the tab.
+     * @param [tabId] Defaults to the active tab of the current window.
+     */
+    function toggleReaderMode(tabId?: number): Promise<void>;
+
+    /**
+     * Captures the visible area of the currently active tab in the specified window. You must have <all_urls>
+     * permission to use this method.
+     * @param [windowId] The target window. Defaults to the current window.
+     */
+    function captureVisibleTab(windowId?: number, options?: extensionTypes.ImageDetails): Promise<string>;
+
+    /**
+     * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts
+     * doc.
+     * @param details Details of the script to run.
+     */
+    function executeScript(details: extensionTypes.InjectDetails): Promise<any[] | undefined>;
+    /**
+     * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts
+     * doc.
+     * @param tabId The ID of the tab in which to run the script; defaults to the active tab of the current window.
+     * @param details Details of the script to run.
+     */
+    function executeScript(tabId: number, details: extensionTypes.InjectDetails): Promise<any[] | undefined>;
+
+    /**
+     * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
+     * @param details Details of the CSS text to insert.
+     */
+    function insertCSS(details: extensionTypes.InjectDetails): Promise<void>;
+    /**
+     * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
+     * @param tabId The ID of the tab in which to insert the CSS; defaults to the active tab of the current window.
+     * @param details Details of the CSS text to insert.
+     */
+    function insertCSS(tabId: number, details: extensionTypes.InjectDetails): Promise<void>;
+
+    /**
+     * Removes injected CSS from a page. For details, see the programmatic injection section of the content scripts doc.
+     * @param details Details of the CSS text to remove.
+     */
+    function removeCSS(details: extensionTypes.InjectDetails): Promise<void>;
+    /**
+     * Removes injected CSS from a page. For details, see the programmatic injection section of the content scripts
+     * doc.
+     * @param tabId The ID of the tab from which to remove the injected CSS; defaults to the active tab of the current
+     *     window.
+     * @param details Details of the CSS text to remove.
+     */
+    function removeCSS(tabId: number, details: extensionTypes.InjectDetails): Promise<void>;
+
+    /**
+     * Zooms a specified tab.
+     * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor.
+     *     Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+     */
+    function setZoom(zoomFactor: number): Promise<void>;
+    /**
+     * Zooms a specified tab.
+     * @param tabId The ID of the tab to zoom; defaults to the active tab of the current window.
+     * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor.
+     *     Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+     */
+    function setZoom(tabId: number, zoomFactor: number): Promise<void>;
+
+    /**
+     * Gets the current zoom factor of a specified tab.
+     * @param [tabId] The ID of the tab to get the current zoom factor from; defaults to the active tab of the current
+     *     window.
+     */
+    function getZoom(tabId?: number): Promise<number>;
+
+    /**
+     * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset
+     * to defaults upon navigating the tab.
+     * @param zoomSettings Defines how zoom changes are handled and at what scope.
+     */
+    function setZoomSettings(zoomSettings: ZoomSettings): Promise<void>;
+    /**
+     * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset
+     * to defaults upon navigating the tab.
+     * @param tabId The ID of the tab to change the zoom settings for; defaults to the active tab of the current
+     *     window.
+     * @param zoomSettings Defines how zoom changes are handled and at what scope.
+     */
+    function setZoomSettings(tabId: number, zoomSettings: ZoomSettings): Promise<void>;
+
+    /**
+     * Gets the current zoom settings of a specified tab.
+     * @param [tabId] The ID of the tab to get the current zoom settings from; defaults to the active tab of the
+     *     current window.
+     */
+    function getZoomSettings(tabId?: number): Promise<ZoomSettings>;
+
+    /** Prints page in active tab. */
+    function print(): void;
+
+    /** Shows print preview for page in active tab. */
+    function printPreview(): Promise<void>;
+
+    /**
+     * Saves page in active tab as a PDF file.
+     * @param pageSettings The page settings used to save the PDF file.
+     */
+    function saveAsPDF(pageSettings: PageSettings): Promise<string | undefined>;
+
+    /* tabs events */
+    /**
+     * Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can
+     * listen to onUpdated events to be notified when a URL is set.
+     * @param tab Details of the tab that was created.
+     */
+    const onCreated: WebExtEvent<(tab: Tab) => void>;
+
+    /**
+     * Fired when a tab is updated.
+     * @param changeInfo Lists the changes to the state of the tab that was updated.
+     * @param tab Gives the state of the tab that was updated.
+     */
+    const onUpdated: WebExtEvent<(tabId: number, changeInfo: {
+        /** The status of the tab. Can be either _loading_ or _complete_. */
+        status: string;
+        /** True while the tab is not loaded with content. */
+        discarded?: boolean;
+        /** The tab's URL if it has changed. */
+        url?: string;
+        /** The tab's new pinned state. */
+        pinned?: boolean;
+        /** The tab's new audible state. */
+        audible?: boolean;
+        /** The tab's new muted state and the reason for the change. */
+        mutedInfo?: MutedInfo;
+        /** The tab's new favicon URL. */
+        favIconUrl?: string;
+    }, tab: Tab) => void>;
+
+    /**
+     * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly
+     * moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a
+     * tab is moved between windows. For that, see `tabs.onDetached`.
+     */
+    const onMoved: WebExtEvent<(tabId: number, moveInfo: {
+        windowId: number;
+        fromIndex: number;
+        toIndex: number;
+    }) => void>;
+
+    /**
+     * Fires when the selected tab in a window changes.
+     * @param tabId The ID of the tab that has become active.
+     * @deprecated Please use `tabs.onActivated`.
+     */
+    const onSelectionChanged: WebExtEvent<(tabId: number, selectInfo: {
+        /** The ID of the window the selected tab changed inside of. */
+        windowId: number;
+    }) => void> | undefined;
+
+    /**
+     * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event
+     * fired, but you can listen to `tabs.onUpdated` events to be notified when a URL is set.
+     * @param tabId The ID of the tab that has become active.
+     * @deprecated Please use `tabs.onActivated`.
+     */
+    const onActiveChanged: WebExtEvent<(tabId: number, selectInfo: {
+        /** The ID of the window the selected tab changed inside of. */
+        windowId: number;
+    }) => void> | undefined;
+
+    /**
+     * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event
+     * fired, but you can listen to onUpdated events to be notified when a URL is set.
+     */
+    const onActivated: WebExtEvent<(activeInfo: {
+        /** The ID of the tab that has become active. */
+        tabId: number;
+        /** The ID of the window the active tab changed inside of. */
+        windowId: number;
+    }) => void>;
+
+    /**
+     * Fired when the highlighted or selected tabs in a window changes.
+     * @deprecated Please use `tabs.onHighlighted`.
+     */
+    const onHighlightChanged: WebExtEvent<(selectInfo: {
+        /** The window whose tabs changed. */
+        windowId: number;
+        /** All highlighted tabs in the window. */
+        tabIds: number[];
+    }) => void> | undefined;
+
+    /** Fired when the highlighted or selected tabs in a window changes. */
+    const onHighlighted: WebExtEvent<(highlightInfo: {
+        /** The window whose tabs changed. */
+        windowId: number;
+        /** All highlighted tabs in the window. */
+        tabIds: number[];
+    }) => void>;
+
+    /** Fired when a tab is detached from a window, for example because it is being moved between windows. */
+    const onDetached: WebExtEvent<(tabId: number, detachInfo: {
+        oldWindowId: number;
+        oldPosition: number;
+    }) => void>;
+
+    /** Fired when a tab is attached to a window, for example because it was moved between windows. */
+    const onAttached: WebExtEvent<(tabId: number, attachInfo: {
+        newWindowId: number;
+        newPosition: number;
+    }) => void>;
+
+    /** Fired when a tab is closed. */
+    const onRemoved: WebExtEvent<(tabId: number, removeInfo: {
+        /** The window whose tab is closed. */
+        windowId: number;
+        /** True when the tab is being closed because its window is being closed. */
+        isWindowClosing: boolean;
+    }) => void>;
+
+    /** Fired when a tab is replaced with another tab due to prerendering or instant. */
+    const onReplaced: WebExtEvent<(addedTabId: number, removedTabId: number) => void>;
+
+    /** Fired when a tab is zoomed. */
+    const onZoomChange: WebExtEvent<(ZoomChangeInfo: {
+        tabId: number;
+        oldZoomFactor: number;
+        newZoomFactor: number;
+        zoomSettings: ZoomSettings;
+    }) => void>;
+}
+
+/**
+ * Use the `browser.windows` API to interact with browser windows. You can use this API to create, modify, and
+ * rearrange windows in the browser.
+ *
+ * Not allowed in: Content scripts, Devtools pages
+ */
+declare namespace browser.windows {
+    /* windows types */
+
+    /**
+     * The type of browser window this is. Under some circumstances a Window may not be assigned type property, for
+     * example when querying closed windows from the `sessions` API.
+     */
+    enum WindowType {
+        normal = "normal",
+        popup = "popup",
+        panel = "panel",
+        app = "app",
+        devtools = "devtools"
+    }
+
+    /**
+     * The state of this browser window. Under some circumstances a Window may not be assigned state property, for
+     * example when querying closed windows from the `sessions` API.
+     */
+    enum WindowState {
+        normal = "normal",
+        minimized = "minimized",
+        maximized = "maximized",
+        fullscreen = "fullscreen",
+        docked = "docked"
+    }
+
+    interface Window {
+        /**
+         * The ID of the window. Window IDs are unique within a browser session. Under some circumstances a Window may
+         * not be assigned an ID, for example when querying windows using the `sessions` API, in which case a session
+         * ID may be present.
+         */
+        id?: number;
+        /** Whether the window is currently the focused window. */
+        focused: boolean;
+        /**
+         * The offset of the window from the top edge of the screen in pixels. Under some circumstances a Window may
+         * not be assigned top property, for example when querying closed windows from the `sessions` API.
+         */
+        top?: number;
+        /**
+         * The offset of the window from the left edge of the screen in pixels. Under some circumstances a Window may
+         * not be assigned left property, for example when querying closed windows from the `sessions` API.
+         */
+        left?: number;
+        /**
+         * The width of the window, including the frame, in pixels. Under some circumstances a Window may not be
+         * assigned width property, for example when querying closed windows from the `sessions` API.
+         */
+        width?: number;
+        /**
+         * The height of the window, including the frame, in pixels. Under some circumstances a Window may not be
+         * assigned height property, for example when querying closed windows from the `sessions` API.
+         */
+        height?: number;
+        /** Array of `tabs.Tab` objects representing the current tabs in the window. */
+        tabs?: tabs.Tab[];
+        /** Whether the window is incognito. */
+        incognito: boolean;
+        /** The type of browser window this is. */
+        type?: WindowType;
+        /** The state of this browser window. */
+        state?: WindowState;
+        /** Whether the window is set to be always on top. */
+        alwaysOnTop: boolean;
+        /** The session ID used to uniquely identify a Window obtained from the `sessions` API. */
+        sessionId?: string;
+        /** The title of the window. Read-only. */
+        title?: string;
+    }
+
+    /**
+     * Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless
+     * the '--enable-panels' flag is set.
+     */
+    enum CreateType {
+        normal = "normal",
+        popup = "popup",
+        panel = "panel",
+        detached_panel = "detached_panel"
+    }
+
+    /* windows properties */
+    /** The windowId value that represents the absence of a browser window. */
+    const WINDOW_ID_NONE: number;
+
+    /** The windowId value that represents the current window. */
+    const WINDOW_ID_CURRENT: number;
+
+    /* windows functions */
+    /** Gets details about a window. */
+    function get(windowId: number, getInfo?: {
+        /**
+         * If true, the `windows.Window` object will have a `tabs` property that contains a list of the `tabs.Tab`
+         * objects. The `Tab` objects only contain the `url`, `title` and `favIconUrl` properties if the extension's
+         * manifest file includes the `"tabs"` permission.
+         */
+        populate?: boolean;
+        /**
+         * If set, the `windows.Window` returned will be filtered based on its type. If unset the default filter is set
+         * to `['app', 'normal', 'panel', 'popup']`, with `'app'` and `'panel'` window types limited to the extension's
+         * own windows.
+         */
+        windowTypes?: WindowType[];
+    }): Promise<Window>;
+
+    /** Gets the current window. */
+    function getCurrent(getInfo?: {
+        /**
+         * If true, the `windows.Window` object will have a `tabs` property that contains a list of the `tabs.Tab`
+         * objects. The `Tab` objects only contain the `url`, `title` and `favIconUrl` properties if the extension's
+         * manifest file includes the `"tabs"` permission.
+         */
+        populate?: boolean;
+        /**
+         * If set, the `windows.Window` returned will be filtered based on its type. If unset the default filter is set
+         * to `['app', 'normal', 'panel', 'popup']`, with `'app'` and `'panel'` window types limited to the extension's
+         * own windows.
+         */
+        windowTypes?: WindowType[];
+    }): Promise<Window>;
+
+    /** Gets the window that was most recently focused — typically the window 'on top'. */
+    function getLastFocused(getInfo?: {
+        /**
+         * If true, the `windows.Window` object will have a `tabs` property that contains a list of the `tabs.Tab`
+         * objects. The `Tab` objects only contain the `url`, `title` and `favIconUrl` properties if the extension's
+         * manifest file includes the `"tabs"` permission.
+         */
+        populate?: boolean;
+        /**
+         * If set, the `windows.Window` returned will be filtered based on its type. If unset the default filter is set
+         * to `['app', 'normal', 'panel', 'popup']`, with `'app'` and `'panel'` window types limited to the extension's
+         * own windows.
+         */
+        windowTypes?: WindowType[];
+    }): Promise<Window>;
+
+    /** Gets all windows. */
+    function getAll(getInfo?: {
+        /**
+         * If true, each `windows.Window` object will have a `tabs` property that contains a list of the `tabs.Tab`
+         * objects for that window. The `Tab` objects only contain the `url`, `title` and `favIconUrl` properties if
+         * the extension's manifest file includes the `"tabs"` permission.
+         */
+        populate?: boolean;
+        /**
+         * If set, the `windows.Window` returned will be filtered based on its type. If unset the default filter is set
+         * to `['app', 'normal', 'panel', 'popup']`, with `'app'` and `'panel'` window types limited to the extension's
+         * own windows.
+         */
+        windowTypes?: WindowType[];
+    }): Promise<Window[]>;
+
+    /** Creates (opens) a new browser with any optional sizing, position or default URL provided. */
+    function create(createData?: {
+        /**
+         * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e.
+         * 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within
+         * the extension. Defaults to the New Tab Page.
+         */
+        url?: string | string[];
+        /** The id of the tab for which you want to adopt to the new window. */
+        tabId?: number;
+        /**
+         * The number of pixels to position the new window from the left edge of the screen. If not specified, the new
+         * window is offset naturally from the last focused window. This value is ignored for panels.
+         */
+        left?: number;
+        /**
+         * The number of pixels to position the new window from the top edge of the screen. If not specified, the new
+         * window is offset naturally from the last focused window. This value is ignored for panels.
+         */
+        top?: number;
+        /**
+         * The width in pixels of the new window, including the frame. If not specified defaults to a natural width.
+         */
+        width?: number;
+        /**
+         * The height in pixels of the new window, including the frame. If not specified defaults to a natural height.
+         */
+        height?: number;
+        /**
+         * If true, opens an active window. If false, opens an inactive window.
+         * @deprecated Unsupported on Firefox at this time.
+         */
+        focused?: boolean;
+        /** Whether the new window should be an incognito window. */
+        incognito?: boolean;
+        /**
+         * Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup
+         * unless the '--enable-panels' flag is set.
+         */
+        type?: CreateType;
+        /**
+         * The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined
+         * with 'left', 'top', 'width' or 'height'.
+         */
+        state?: WindowState;
+        /** Allow scripts to close the window. */
+        allowScriptsToClose?: boolean;
+        /** A string to add to the beginning of the window title. */
+        titlePreface?: string;
+    }): Promise<Window | undefined>;
+
+    /**
+     * Updates the properties of a window. Specify only the properties that you want to change; unspecified properties
+     * will be left unchanged.
+     */
+    function update(windowId: number, updateInfo: {
+        /**
+         * The offset from the left edge of the screen to move the window to in pixels. This value is ignored for
+         * panels.
+         */
+        left?: number;
+        /**
+         * The offset from the top edge of the screen to move the window to in pixels. This value is ignored for panels.
+         */
+        top?: number;
+        /** The width to resize the window to in pixels. This value is ignored for panels. */
+        width?: number;
+        /** The height to resize the window to in pixels. This value is ignored for panels. */
+        height?: number;
+        /**
+         * If true, brings the window to the front. If false, brings the next window in the z-order to the front.
+         */
+        focused?: boolean;
+        /**
+         * If true, causes the window to be displayed in a manner that draws the user's attention to the window,
+         * without changing the focused window. The effect lasts until the user changes focus to the window. This
+         * option has no effect if the window already has focus. Set to false to cancel a previous draw attention
+         * request.
+         */
+        drawAttention?: boolean;
+        /**
+         * The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with
+         * 'left', 'top', 'width' or 'height'.
+         */
+        state?: WindowState;
+        /** A string to add to the beginning of the window title. */
+        titlePreface?: string;
+    }): Promise<Window | undefined>;
+
+    /** Removes (closes) a window, and all the tabs inside it. */
+    function remove(windowId: number): Promise<void>;
+
+    /* windows events */
+    /**
+     * Fired when a window is created.
+     * @param window Details of the window that was created.
+     */
+    const onCreated: WebExtEvent<(window: Window) => void>;
+
+    /**
+     * Fired when a window is removed (closed).
+     * @param windowId ID of the removed window.
+     */
+    const onRemoved: WebExtEvent<(windowId: number) => void>;
+
+    /**
+     * Fired when the currently focused window changes. Will be `windows.WINDOW_ID_NONE` if all browser windows have
+     * lost focus. Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a
+     * switch from one browser window to another.
+     * @param windowId ID of the newly focused window.
+     */
+    const onFocusChanged: WebExtEvent<(windowId: number) => void>;
+}
diff --git a/types/firefox-webext-browser/tsconfig.json b/types/firefox-webext-browser/tsconfig.json
new file mode 100644
index 0000000000..202f6824d1
--- /dev/null
+++ b/types/firefox-webext-browser/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "firefox-webext-browser-tests.ts"
+    ]
+}
diff --git a/types/firefox-webext-browser/tslint.json b/types/firefox-webext-browser/tslint.json
new file mode 100644
index 0000000000..c94feb08d9
--- /dev/null
+++ b/types/firefox-webext-browser/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-mergeable-namespace": false,
+        "unified-signatures": false,
+        "no-unnecessary-qualifier": false
+    }
+}
diff --git a/types/firefox/tslint.json b/types/firefox/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/firefox/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/firmata/index.d.ts b/types/firmata/index.d.ts
index b89402b9d4..6f72107a07 100644
--- a/types/firmata/index.d.ts
+++ b/types/firmata/index.d.ts
@@ -155,7 +155,7 @@ declare namespace Board {
 	interface Options {
 		reportVersionTimeout?: number;
 		samplingInterval?: number;
-		serialport?: SerialPort.options;
+		serialport?: SerialPort.Options;
 	}
 
 	interface PinModes {
diff --git a/types/firmata/tsconfig.json b/types/firmata/tsconfig.json
index bf87f0bba2..d843e1300d 100644
--- a/types/firmata/tsconfig.json
+++ b/types/firmata/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "serialport": ["serialport/v4"]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/first-mate/README.md b/types/first-mate/README.md
deleted file mode 100644
index e83328a13e..0000000000
--- a/types/first-mate/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## First Mate Type Definitions
-
-TypeScript type definitions for [First Mate](https://github.com/atom/first-mate), which is published as "[first-mate](https://www.npmjs.com/package/first-mate)" on NPM.
-
-### Usage Notes
-
-#### Exports
-
-The three classes exported from this module are: [Grammar](https://github.com/atom/first-mate/blob/master/src/grammar.coffee), [GrammarRegistry](https://github.com/atom/first-mate/blob/master/src/grammar-registry.coffee), and [ScopeSelector](https://github.com/atom/first-mate/blob/master/src/scope-selector.coffee).
-
-```ts
-import { Grammar, GrammarRegistry, ScopeSelector } from "first-mate";
-let selector = new ScopeSelector("a | b");
-```
-
-#### The FirstMate Namespace
-
-Many of the types used by First Mate can be referenced from the FirstMate namespace.
-
-```ts
-function example(grammar: FirstMate.Grammar) {}
-```
diff --git a/types/first-mate/first-mate-tests.ts b/types/first-mate/first-mate-tests.ts
index b0fd70d4e2..3d3be512a1 100644
--- a/types/first-mate/first-mate-tests.ts
+++ b/types/first-mate/first-mate-tests.ts
@@ -1,8 +1,9 @@
+import { Disposable } from "event-kit";
 import { GrammarRegistry, Grammar, ScopeSelector } from "first-mate";
 
-declare let subscription: EventKit.Disposable;
-declare let grammar: FirstMate.Grammar;
-declare let grammars: FirstMate.Grammar[];
+declare let subscription: Disposable;
+declare let grammar: Grammar;
+declare let grammars: Grammar[];
 
 // NPM Examples ===============================================================
 const selector = new ScopeSelector("a | b");
@@ -15,7 +16,7 @@ const { line, tags } = grammar.tokenizeLine("var offset = 3;");
 // Convert compact tags representation into convenient, space-inefficient tokens.
 const tokens = registry.decodeTokens(line, tags);
 for (const { value, scopes } of tokens) {
-	console.log(`Token text: '${value}' with scopes: ${scopes}`);
+    console.log(`Token text: '${value}' with scopes: ${scopes}`);
 }
 
 // General Usage ==============================================================
@@ -25,13 +26,13 @@ new GrammarRegistry({ maxTokensPerLine: 100 });
 registry.loadGrammarSync("javascript.json");
 const result = grammar.tokenizeLine('var text = "hello world";');
 result.tokens.forEach((token) => {
-	console.log(`Token text: '${token.value}' with scopes: ${token.scopes}`);
+    console.log(`Token text: '${token.value}' with scopes: ${token.scopes}`);
 });
 
 new ScopeSelector("source.file");
 let prefix = selector.getPrefix("test");
 if (prefix) {
-	str = prefix.charAt(0);
+    str = prefix.charAt(0);
 }
 prefix = selector.getPrefix(["test", "test"]);
 
@@ -43,10 +44,10 @@ subscription = grammar.onDidUpdate(() => {});
 
 const tokenizeLinesResult = grammar.tokenizeLines("Test String");
 for (const tokenizedLine of tokenizeLinesResult) {
-	for (const token of tokenizedLine) {
-		token.scopes;
-		token.value;
-	}
+    for (const token of tokenizedLine) {
+        token.scopes;
+        token.value;
+    }
 }
 
 grammar.tokenizeLine("Test String");
@@ -75,19 +76,19 @@ potentialGrammar = registry.removeGrammarForScopeName("scope.test");
 grammar = registry.readGrammarSync("/test/path");
 
 registry.readGrammar("/test/path", (error, grammar) => {
-	if (grammar) {
-		grammar.name;
-	} else {
-		if (error) error.name;
-	}
+    if (grammar) {
+        grammar.name;
+    } else {
+        if (error) error.name;
+    }
 });
 
 grammar = registry.loadGrammarSync("/test/path");
 
 registry.loadGrammar("/test/path", (error, grammar) => {
-	if (grammar) {
-		grammar.name;
-	} else {
-		if (error) error.name;
-	}
+    if (grammar) {
+        grammar.name;
+    } else {
+        if (error) error.name;
+    }
 });
diff --git a/types/first-mate/index.d.ts b/types/first-mate/index.d.ts
index cf812b6add..2fcc7141cb 100644
--- a/types/first-mate/index.d.ts
+++ b/types/first-mate/index.d.ts
@@ -2,257 +2,251 @@
 // Project: https://github.com/atom/first-mate/
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
-/// <reference types="event-kit" />
-
-declare global {
-	/** TextMate helpers. */
-	namespace FirstMate {
-		/** Objects that appear as parameters to functions. */
-		namespace Options {
-			interface Grammar {
-				name?: string;
-				fileTypes?: ReadonlyArray<string>;
-				scopeName?: string;
-				foldingStopMarker?: string;
-				maxTokensPerLine?: number;
-				maxLineLength?: number;
-
-				injections?: object;
-				injectionSelector?: ScopeSelector;
-				patterns?: ReadonlyArray<object>;
-				repository?: object;
-				firstLineMatch?: boolean;
-			}
-		}
-
-		/** The static side to each exported class. Should generally only be used internally. */
-		namespace Statics {
-			/* tslint:disable:no-unnecessary-qualifier */
-			/** The static side to the Grammar class. */
-			interface Grammar {
-				new (registry: FirstMate.GrammarRegistry, options?: FirstMate.Options.Grammar):
-					FirstMate.Grammar;
-			}
-
-			/** The static side to the GrammarRegistry class. */
-			interface GrammarRegistry {
-				new (options?: { maxTokensPerLine?: number, maxLineLength?: number }):
-					FirstMate.GrammarRegistry;
-			}
-
-			/** The static side to the ScopeSelector class. */
-			interface ScopeSelector {
-				/** Create a new scope selector.
-				 *  @param source The string to parse as a scope selector.
-				 *  @return A newly constructed ScopeSelector.
-				 */
-				new (source: string): FirstMate.ScopeSelector;
-			}
-			/* tslint:enable:no-unnecessary-qualifier */
-		}
-
-		/** Data structures that are used within classes. */
-		namespace Structures {
-			interface GrammarToken {
-				value: string;
-				scopes: string[];
-			}
-
-			/** Result returned by `Grammar.tokenizeLine`. */
-			interface TokenizeLineResult {
-				/** The string of text that was tokenized. */
-				line: string;
-
-				/** An array of integer scope ids and strings. Positive ids indicate the
-				 *  beginning of a scope, and negative tags indicate the end. To resolve ids
-				 *  to scope names, call {GrammarRegistry::scopeForId} with the absolute
-				 *  value of the id.
-				 */
-				tags: Array<number|string>;
-
-				/** This is a dynamic property. Invoking it will incur additional overhead,
-				 *  but will automatically translate the `tags` into token objects with `value`
-				 *  and `scopes` properties.
-				 */
-				tokens: GrammarToken[];
-
-				/** An array of rules representing the tokenized state at the end of the line.
-				 *  These should be passed back into this method when tokenizing the next line
-				 *  in the file.
-				 */
-				ruleStack: GrammarRule[];
-			}
-
-			interface GrammarRule {
-				// https://github.com/atom/first-mate/blob/v7.0.7/src/rule.coffee
-				// This is private. Don't go down the rabbit hole.
-				rule: object;
-				scopeName: string;
-				contentScopeName: string;
-			}
-		}
-
-		/** Grammar that tokenizes lines of text. */
-		interface Grammar {
-			name: string;
-			fileTypes: string[];
-			scopeName: string;
-			maxTokensPerLine: number;
-			maxLineLength: number;
-
-			// Event Subscription
-			onDidUpdate(callback: () => void): EventKit.Disposable;
-
-			// Tokenizing
-			/** Tokenize all lines in the given text.
-			 *  @param text A string containing one or more lines.
-			 *  @return An array of token arrays for each line tokenized.
-			 */
-			tokenizeLines(text: string): Structures.GrammarToken[][];
-
-			/** Tokenizes the line of text.
-			 *  @param line A string of text to tokenize.
-			 *  @param ruleStack An optional array of rules previously returned from this
-			 *  method. This should be null when tokenizing the first line in the file.
-			 *  @param firstLine A optional boolean denoting whether this is the first line
-			 *  in the file which defaults to `false`.
-			 *  @return An object representing the result of the tokenize.
-			 */
-			tokenizeLine(line: string, ruleStack?: null, firstLine?: boolean):
-				Structures.TokenizeLineResult;
-			/** Tokenizes the line of text.
-			 *  @param line A string of text to tokenize.
-			 *  @param ruleStack An optional array of rules previously returned from this
-			 *  method. This should be null when tokenizing the first line in the file.
-			 *  @param firstLine A optional boolean denoting whether this is the first line
-			 *  in the file which defaults to `false`.
-			 *  @return An object representing the result of the tokenize.
-			 */
-			tokenizeLine(line: string, ruleStack: Structures.GrammarRule[], firstLine?: false):
-				Structures.TokenizeLineResult;
-		}
-
-		/** Instance side of GrammarRegistry class. */
-		interface GrammarRegistry {
-			maxTokensPerLine: number;
-			maxLineLength: number;
-
-			// Event Subscription
-			/** Invoke the given callback when a grammar is added to the registry.
-			 *  @param callback The callback to be invoked whenever a grammar is added.
-			 *  @return A Disposable on which `.dispose()` can be called to unsubscribe.
-			 */
-			onDidAddGrammar(callback: (grammar: Grammar) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when a grammar is updated due to a grammar it
-			 *  depends on being added or removed from the registry.
-			 *  @param callback The callback to be invoked whenever a grammar is updated.
-			 *  @return A Disposable on which `.dispose()` can be called to unsubscribe.
-			 */
-			onDidUpdateGrammar(callback: (grammar: Grammar) => void): EventKit.Disposable;
-
-			// Managing Grammars
-			/** Get all the grammars in this registry.
-			 *  @return A non-empty array of Grammar instances.
-			 */
-			getGrammars(): Grammar[];
-
-			/** Get a grammar with the given scope name.
-			 *  @param scopeName A string such as `source.js`.
-			 *  @return A Grammar or undefined.
-			 */
-			grammarForScopeName(scopeName: string): Grammar|undefined;
-
-			/** Add a grammar to this registry.
-			 *  A 'grammar-added' event is emitted after the grammar is added.
-			 *  @param grammar The Grammar to add. This should be a value previously returned
-			 *  from ::readGrammar or ::readGrammarSync.
-			 *  @return Returns a Disposable on which `.dispose()` can be called to remove
-			 *  the grammar.
-			 */
-			addGrammar(grammar: Grammar): EventKit.Disposable;
-
-			/** Remove the given grammar from this registry.
-			 *  @param grammar The grammar to remove. This should be a grammar previously
-			 *  added to the registry from ::addGrammar.
-			 */
-			removeGrammar(grammar: Grammar): void;
-
-			/** Remove the grammar with the given scope name.
-			 *  @param scopeName A string such as `source.js`.
-			 *  @return Returns the removed Grammar or undefined.
-			 */
-			removeGrammarForScopeName(scopeName: string): Grammar|undefined;
-
-			/** Read a grammar synchronously but don't add it to the registry.
-			 *  @param grammarPath The absolute file path to a grammar.
-			 *  @return The newly loaded Grammar.
-			 */
-			readGrammarSync(grammarPath: string): Grammar;
-
-			/** Read a grammar asynchronously but don't add it to the registry.
-			 *  @param grammarPath The absolute file path to the grammar.
-			 *  @param callback The function to be invoked once the Grammar has been read in.
-			 */
-			readGrammar(grammarPath: string, callback: (error: Error|null, grammar?: Grammar) =>
-				void): void;
-
-			/** Read a grammar synchronously and add it to this registry.
-			 *  @param grammarPath The absolute file path to the grammar.
-			 *  @return The newly loaded Grammar.
-			 */
-			loadGrammarSync(grammarPath: string): Grammar;
-
-			/** Read a grammar asynchronously and add it to the registry.
-			 *  @param grammarPath The absolute file path to the grammar.
-			 *  @param callback The function to be invoked once the Grammar has been read in
-			 *  and added to the registry.
-			 */
-			loadGrammar(grammarPath: string, callback: (error: Error|null, grammar?: Grammar) =>
-				void): void;
-
-			/** Convert compact tags representation into convenient, space-inefficient tokens.
-			 *  @param lineText The text of the tokenized line.
-			 *  @param tags The tags returned from a call to Grammar::tokenizeLine().
-			 *  @return An array of Token instances decoded from the given tags.
-			 */
-			decodeTokens(lineText: string, tags: Array<number|string>): Structures.GrammarToken[];
-		}
-
-		interface ScopeSelector {
-			/** Check if this scope selector matches the scopes.
-			 *  @param scopes A single scope or an array of them to be compared against.
-			 *  @return A boolean indicating whether or not this ScopeSelector matched.
-			 */
-			matches(scopes: string|ReadonlyArray<string>): boolean;
-
-			/** Gets the prefix of this scope selector.
-			 *  @param scopes The scopes to match a prefix against.
-			 *  @return The matching prefix, if there is one.
-			 */
-			getPrefix(scopes: string|ReadonlyArray<string>): string|undefined;
-
-			/** Convert this TextMate scope selector to a CSS selector.
-			 *  @return A string with the CSSSelector representation of this ScopeSelector.
-			 */
-			toCssSelector(): string;
-
-			/** Convert this TextMate scope selector to a CSS selector, prefixing scopes
-			 *  with `syntax--`.
-			 *  @return A string with the syntax-specific CSSSelector representation of this
-			 *  ScopeSelector.
-			 */
-			toCssSyntaxSelector(): string;
-		}
-	}
-}
-
-/** Registry containing one or more grammars. */
-export const GrammarRegistry: FirstMate.Statics.GrammarRegistry;
-
-export const ScopeSelector: FirstMate.Statics.ScopeSelector;
+import { Disposable } from "event-kit";
 
 /** Grammar that tokenizes lines of text. */
-export const Grammar: FirstMate.Statics.Grammar;
+export class Grammar {
+    name: string;
+    fileTypes: string[];
+    scopeName: string;
+    maxTokensPerLine: number;
+    maxLineLength: number;
+
+    constructor(registry: GrammarRegistry, options?: GrammarOptions);
+
+    // Event Subscription
+    onDidUpdate(callback: () => void): Disposable;
+
+    // Tokenizing
+    /**
+     *  Tokenize all lines in the given text.
+     *  @param text A string containing one or more lines.
+     *  @return An array of token arrays for each line tokenized.
+     */
+    tokenizeLines(text: string): GrammarToken[][];
+
+    /**
+     *  Tokenizes the line of text.
+     *  @param line A string of text to tokenize.
+     *  @param ruleStack An optional array of rules previously returned from this
+     *  method. This should be null when tokenizing the first line in the file.
+     *  @param firstLine A optional boolean denoting whether this is the first line
+     *  in the file which defaults to `false`.
+     *  @return An object representing the result of the tokenize.
+     */
+    tokenizeLine(line: string, ruleStack?: null, firstLine?: boolean): TokenizeLineResult;
+    /**
+     *  Tokenizes the line of text.
+     *  @param line A string of text to tokenize.
+     *  @param ruleStack An optional array of rules previously returned from this
+     *  method. This should be null when tokenizing the first line in the file.
+     *  @param firstLine A optional boolean denoting whether this is the first line
+     *  in the file which defaults to `false`.
+     *  @return An object representing the result of the tokenize.
+     */
+    tokenizeLine(line: string, ruleStack: GrammarRule[], firstLine?: false):
+        TokenizeLineResult;
+}
+
+/** Instance side of GrammarRegistry class. */
+export class GrammarRegistry {
+    maxTokensPerLine: number;
+    maxLineLength: number;
+
+    constructor(options?: { maxTokensPerLine?: number, maxLineLength?: number });
+
+    // Event Subscription
+    /**
+     *  Invoke the given callback when a grammar is added to the registry.
+     *  @param callback The callback to be invoked whenever a grammar is added.
+     *  @return A Disposable on which `.dispose()` can be called to unsubscribe.
+     */
+    onDidAddGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+    /**
+     *  Invoke the given callback when a grammar is updated due to a grammar it
+     *  depends on being added or removed from the registry.
+     *  @param callback The callback to be invoked whenever a grammar is updated.
+     *  @return A Disposable on which `.dispose()` can be called to unsubscribe.
+     */
+    onDidUpdateGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+    // Managing Grammars
+    /**
+     *  Get all the grammars in this registry.
+     *  @return A non-empty array of Grammar instances.
+     */
+    getGrammars(): Grammar[];
+
+    /**
+     *  Get a grammar with the given scope name.
+     *  @param scopeName A string such as `source.js`.
+     *  @return A Grammar or undefined.
+     */
+    grammarForScopeName(scopeName: string): Grammar|undefined;
+
+    /**
+     *  Add a grammar to this registry.
+     *  A 'grammar-added' event is emitted after the grammar is added.
+     *  @param grammar The Grammar to add. This should be a value previously returned
+     *  from ::readGrammar or ::readGrammarSync.
+     *  @return Returns a Disposable on which `.dispose()` can be called to remove
+     *  the grammar.
+     */
+    addGrammar(grammar: Grammar): Disposable;
+
+    /**
+     *  Remove the given grammar from this registry.
+     *  @param grammar The grammar to remove. This should be a grammar previously
+     *  added to the registry from ::addGrammar.
+     */
+    removeGrammar(grammar: Grammar): void;
+
+    /**
+     *  Remove the grammar with the given scope name.
+     *  @param scopeName A string such as `source.js`.
+     *  @return Returns the removed Grammar or undefined.
+     */
+    removeGrammarForScopeName(scopeName: string): Grammar|undefined;
+
+    /**
+     *  Read a grammar synchronously but don't add it to the registry.
+     *  @param grammarPath The absolute file path to a grammar.
+     *  @return The newly loaded Grammar.
+     */
+    readGrammarSync(grammarPath: string): Grammar;
+
+    /**
+     *  Read a grammar asynchronously but don't add it to the registry.
+     *  @param grammarPath The absolute file path to the grammar.
+     *  @param callback The function to be invoked once the Grammar has been read in.
+     */
+    readGrammar(grammarPath: string, callback: (error: Error|null, grammar?: Grammar) =>
+        void): void;
+
+    /**
+     *  Read a grammar synchronously and add it to this registry.
+     *  @param grammarPath The absolute file path to the grammar.
+     *  @return The newly loaded Grammar.
+     */
+    loadGrammarSync(grammarPath: string): Grammar;
+
+    /**
+     *  Read a grammar asynchronously and add it to the registry.
+     *  @param grammarPath The absolute file path to the grammar.
+     *  @param callback The function to be invoked once the Grammar has been read in
+     *  and added to the registry.
+     */
+    loadGrammar(grammarPath: string, callback: (error: Error|null, grammar?: Grammar) =>
+        void): void;
+
+    /**
+     *  Convert compact tags representation into convenient, space-inefficient tokens.
+     *  @param lineText The text of the tokenized line.
+     *  @param tags The tags returned from a call to Grammar::tokenizeLine().
+     *  @return An array of Token instances decoded from the given tags.
+     */
+    decodeTokens(lineText: string, tags: Array<number|string>): GrammarToken[];
+}
+
+export class ScopeSelector {
+    /**
+     *  Create a new scope selector.
+     *  @param source The string to parse as a scope selector.
+     *  @return A newly constructed ScopeSelector.
+     */
+    constructor(source: string);
+
+    /**
+     *  Check if this scope selector matches the scopes.
+     *  @param scopes A single scope or an array of them to be compared against.
+     *  @return A boolean indicating whether or not this ScopeSelector matched.
+     */
+    matches(scopes: string|ReadonlyArray<string>): boolean;
+
+    /**
+     *  Gets the prefix of this scope selector.
+     *  @param scopes The scopes to match a prefix against.
+     *  @return The matching prefix, if there is one.
+     */
+    getPrefix(scopes: string|ReadonlyArray<string>): string|undefined;
+
+    /**
+     *  Convert this TextMate scope selector to a CSS selector.
+     *  @return A string with the CSSSelector representation of this ScopeSelector.
+     */
+    toCssSelector(): string;
+
+    /**
+     *  Convert this TextMate scope selector to a CSS selector, prefixing scopes
+     *  with `syntax--`.
+     *  @return A string with the syntax-specific CSSSelector representation of this
+     *  ScopeSelector.
+     */
+    toCssSyntaxSelector(): string;
+}
+
+// Options ====================================================================
+// The option objects that the user is expected to fill out and provide to
+// specific API calls.
+
+export interface GrammarOptions {
+    name?: string;
+    fileTypes?: ReadonlyArray<string>;
+    scopeName?: string;
+    foldingStopMarker?: string;
+    maxTokensPerLine?: number;
+    maxLineLength?: number;
+
+    injections?: object;
+    injectionSelector?: ScopeSelector;
+    patterns?: ReadonlyArray<object>;
+    repository?: object;
+    firstLineMatch?: boolean;
+}
+
+// Structures =================================================================
+// The structures that are passed to the user by Atom following specific API calls.
+
+export interface GrammarToken {
+    value: string;
+    scopes: string[];
+}
+
+/** Result returned by `Grammar.tokenizeLine`. */
+export interface TokenizeLineResult {
+    /** The string of text that was tokenized. */
+    line: string;
+
+    /**
+     *  An array of integer scope ids and strings. Positive ids indicate the
+     *  beginning of a scope, and negative tags indicate the end. To resolve ids
+     *  to scope names, call GrammarRegistry::scopeForId with the absolute
+     *  value of the id.
+     */
+    tags: Array<number|string>;
+
+    /**
+     *  This is a dynamic property. Invoking it will incur additional overhead,
+     *  but will automatically translate the `tags` into token objects with `value`
+     *  and `scopes` properties.
+     */
+    tokens: GrammarToken[];
+
+    /**
+     *  An array of rules representing the tokenized state at the end of the line.
+     *  These should be passed back into this method when tokenizing the next line
+     *  in the file.
+     */
+    ruleStack: GrammarRule[];
+}
+
+export interface GrammarRule {
+    // https://github.com/atom/first-mate/blob/v7.0.7/src/rule.coffee
+    // This is private. Don't go down the rabbit hole.
+    rule: object;
+    scopeName: string;
+    contentScopeName: string;
+}
diff --git a/types/first-mate/tsconfig.json b/types/first-mate/tsconfig.json
index 3d6aadabec..3c11f8dbb2 100644
--- a/types/first-mate/tsconfig.json
+++ b/types/first-mate/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -21,4 +21,4 @@
         "index.d.ts",
         "first-mate-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/first-mate/tslint.json b/types/first-mate/tslint.json
index 4b036f727a..e0508241c7 100644
--- a/types/first-mate/tslint.json
+++ b/types/first-mate/tslint.json
@@ -1,37 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Custom rules.
-        "class-name": true,
-        "indent": [true, "tabs"],
-        "jsdoc-format": true,
+        "indent": [true, "spaces", 4],
         "max-line-length": [true, 100],
-        "quotemark": [true, "double", "avoid-escape"],
-        "trailing-comma": [true, {
-            "multiline": { "objects": "always", "arrays": "always", "functions": "never" },
-            "singleline": { "objects": "never", "arrays": "never", "functions": "never" }
-        }],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-separator",
-            "check-type",
-            "check-typecast",
-            "check-rest-spread",
-            "check-preblock"
-        ],
-        // Soon to be defaults.
-        "arrow-return-shorthand": [true, "multiline"],
-        "no-any": true,
-        "no-floating-promises": true,
-        "no-unbound-method": true,
-        "no-unsafe-any": true,
-        "number-literal-format": true,
-        "restrict-plus-operands": true,
-        "return-undefined": true,
-        "switch-final-break": true
+        "no-any": true
     }
 }
diff --git a/types/first-mate/v4/.editorconfig b/types/first-mate/v4/.editorconfig
deleted file mode 100644
index 570211f898..0000000000
--- a/types/first-mate/v4/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.ts]
-indent_style = tab
-indent_size = 4
diff --git a/types/first-mate/v4/first-mate-tests.ts b/types/first-mate/v4/first-mate-tests.ts
deleted file mode 100644
index 1f7fe0fc76..0000000000
--- a/types/first-mate/v4/first-mate-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-import { GrammarRegistry, Grammar, IToken } from "first-mate";
-
-var registry = new GrammarRegistry({ maxTokensPerLine: 100 });
-var grammar = registry.loadGrammarSync('javascript.json');
-var result = grammar.tokenizeLine('var text = "hello world";');
-result.tokens.forEach((token) => {
-	console.log("Token text: '" + token.value + "' with scopes: " + token.scopes);
-});
diff --git a/types/first-mate/v4/index.d.ts b/types/first-mate/v4/index.d.ts
deleted file mode 100644
index 81b7d96c04..0000000000
--- a/types/first-mate/v4/index.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-// Type definitions for first-mate v4.1.7
-// Project: https://github.com/atom/first-mate/
-// Definitions by: Vadim Macagon <https://github.com/enlight>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as AtomEventKit from "event-kit";
-export = AtomFirstMate;
-
-declare namespace AtomFirstMate {
-	type Disposable = AtomEventKit.Disposable;
-
-	interface IToken {
-		value: string;
-		scopes: string[];
-	}
-
-	/** Result returned by `Grammar.tokenizeLine`. */
-	interface TokenizeLineResult {
-		/** Text that was tokenized. */
-		line: string;
-		tags: any[];
-		/**
-		 * This is a dynamic property that will only be available if `Grammar.tokenizeLine` was called
-		 * with `compatibilityMode` set to `true` (the default).
-		 */
-		tokens?: IToken[];
-		/**
-		 * The tokenized state at the end of the line. This should be passed back into `tokenizeLine`
-		 * when tokenizing the next line in the file/buffer.
-		 */
-		ruleStack: Rule[]
-	}
-
-	/** Instance side of Rule class. */
-	interface Rule {
-	}
-
-	/** Static side of Grammar class. */
-	interface GrammarStatic {
-		prototype: Grammar;
-		new (registry: GrammarRegistry, options?: any): Grammar;
-	}
-
-	/** Instance side of Grammar class. */
-	interface Grammar {
-		constructor: GrammarStatic;
-		onDidUpdate(callback: Function): Disposable;
-		/**
-		 * Tokenizes all lines in a string.
-		 *
-		 * @param text A string containing one or more lines.
-		 * @return An array of token arrays, one token array per line.
-		 */
-		tokenizeLines(text: string): Array<Array<IToken>>;
-		/**
-		 * Tokenizes a line of text.
-		 *
-		 * @param line Text to be tokenized.
-		 * @param firstLine Indicates whether `line` is the first line in the file/buffer,
-		 *                  defaults to `false`.
-		 * @param compatibilityMode `true` by default.
-		 * @return An object containing tokens for the given line.
-		 */
-		tokenizeLine(
-			line: string, ruleStack?: Rule[], firstLine?: boolean, compatibilityMode?: boolean
-		): TokenizeLineResult;
-	}
-
-	/** Grammar that tokenizes lines of text. */
-	var Grammar: GrammarStatic;
-
-	/** Static side of GrammarRegistry class. */
-	interface GrammarRegistryStatic {
-		prototype: GrammarRegistry;
-		new (options?: { maxTokensPerLine: number }): GrammarRegistry;
-	}
-
-	/** Instance side of GrammarRegistry class. */
-	interface GrammarRegistry {
-		constructor: GrammarRegistryStatic;
-
-		// Event Subscription
-
-		onDidAddGrammar(callback: (grammar: Grammar) => void): Disposable;
-		onDidUpdateGrammar(callback: (grammar: Grammar) => void): Disposable;
-
-		// Managing Grammars
-
-		getGrammars(): Grammar[];
-		grammarForScopeName(scopeName: string): Grammar;
-		addGrammar(grammar: Grammar): Disposable;
-		removeGrammarForScopeName(scopeName: string): Grammar;
-		readGrammarSync(grammarPath: string): Grammar;
-		readGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
-		loadGrammarSync(grammarPath: string): Grammar;
-		loadGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
-		grammarOverrideForPath(filePath: string): Grammar;
-		setGrammarOverrideForPath(filePath: string, scopeName: string): Grammar;
-		clearGrammarOverrides(): void;
-		selectGrammar(filePath: string, fileContents: string): Grammar;
-	}
-
-	/** Registry containing one or more grammars. */
-	var GrammarRegistry: GrammarRegistryStatic;
-}
diff --git a/types/first-mate/v4/tsconfig.json b/types/first-mate/v4/tsconfig.json
deleted file mode 100644
index 59868ddb2c..0000000000
--- a/types/first-mate/v4/tsconfig.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "event-kit": [
-                "event-kit/v1"
-            ],
-            "first-mate": [
-                "first-mate/v4"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "first-mate-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/fixed-data-table-2/fixed-data-table-2-tests.tsx b/types/fixed-data-table-2/fixed-data-table-2-tests.tsx
new file mode 100644
index 0000000000..3b34d6a44a
--- /dev/null
+++ b/types/fixed-data-table-2/fixed-data-table-2-tests.tsx
@@ -0,0 +1,196 @@
+/**
+ * The tests are based on tests from types/fixed-data-table
+ */
+
+import * as React from "react";
+import { Table, Cell, Column, CellProps } from "fixed-data-table-2";
+
+// create your Table
+class MyTable1 extends React.Component {
+    render() {
+        return (
+            <Table
+                rowsCount={100}
+                rowHeight={50}
+                headerHeight={50}
+                width={1000}
+                height={500}>
+            // add columns
+            </Table>
+        );
+    }
+}
+
+// create your Columns
+class MyTable2 extends React.Component {
+    render() {
+        return (
+            <Table
+                rowsCount={100}
+                rowHeight={50}
+                headerHeight={50}
+                width={1000}
+                height={500}>
+                <Column
+                    cell={<Cell>Basic content</Cell>}
+                    width={200}
+                />
+            </Table>
+        );
+    }
+}
+
+// provide Custom Data
+interface MyTable3State {
+    myTableData: Array<{ name: string }>;
+}
+
+class MyTable3 extends React.Component<{}, MyTable3State> {
+    constructor(props: {}) {
+        super(props);
+
+        this.state = {
+            myTableData: [
+                { name: "Rylan" },
+                { name: "Amelia" },
+                { name: "Estevan" },
+                { name: "Florence" },
+                { name: "Tressa" },
+            ]
+        };
+    }
+
+    render() {
+        return (
+            <Table
+                rowsCount={this.state.myTableData.length}
+                rowHeight={50}
+                headerHeight={50}
+                width={1000}
+                height={500}>
+                <Column
+                    header={<Cell>Name</Cell>}
+                    cell={(props) => (
+                        <Cell {...props}>
+                            {this.state.myTableData[props.rowIndex].name}
+                        </Cell>
+                    )}
+                    width={200}
+                />
+            </Table>
+        );
+    }
+}
+
+// Create Reusable Cells
+interface RowData {
+    [field: string]: string;
+}
+
+interface MyCellProps extends CellProps {
+    field: string;
+    myData: RowData[];
+}
+
+class MyTextCell extends React.Component<MyCellProps> {
+    render() {
+        const { rowIndex, field, myData } = this.props;
+
+        return (
+            <Cell height={this.props.height}
+                width={this.props.height}
+                columnKey={this.props.columnKey}
+                rowIndex={this.props.rowIndex}
+                className="text-cell">
+                {myData[rowIndex!][field]}
+            </Cell>
+        );
+    }
+}
+
+class MyLinkCell extends React.Component<MyCellProps> {
+    render() {
+        const { rowIndex, field, myData } = this.props;
+        const link: string = myData[rowIndex!][field];
+
+        return (
+            <Cell width={this.props.width}
+                height={this.props.height}
+                rowIndex={this.props.rowIndex}
+                columnKey={this.props.columnKey}
+                className="link-cell">
+                <a href={link}>{link}</a>
+            </Cell>
+        );
+    }
+}
+
+interface MyTable4State {
+    tableData: RowData[];
+}
+
+class MyTable4 extends React.Component<{}, MyTable4State> {
+    constructor(props: {}) {
+        super(props);
+        this.state = {
+            tableData: [
+                { name: "Rylan", email: "Angelita_Weimann42@gmail.com" },
+                { name: "Amelia", email: "Dexter.Trantow57@hotmail.com" },
+                { name: "Estevan", email: "Aimee7@hotmail.com" },
+                { name: "Florence", email: "Jarrod.Bernier13@yahoo.com" },
+                { name: "Tressa", email: "Yadira1@hotmail.com" }
+            ]
+        };
+    }
+
+    render() {
+        return (
+            <Table
+                rowsCount={this.state.tableData.length}
+                rowHeight={50}
+                headerHeight={50}
+                width={1000}
+                height={500}>
+                {
+                    ["name", "email"].map(field =>
+                        <Column
+                            key={field}
+                            header={<Cell>{field}</Cell>}
+                            cell={
+                                <MyTextCell
+                                    myData={this.state.tableData}
+                                    field={field}
+                                />
+                            }
+                            width={200} />
+                    )
+                }
+            </Table>
+        );
+    }
+}
+
+// Listen for events
+class MyTable5 extends React.Component {
+    render() {
+        return (
+            <Table
+                rowsCount={100}
+                rowHeight={50}
+                headerHeight={50}
+                width={1000}
+                height={500}
+                onScrollStart={(x: number, y: number) => { }}
+                onScrollEnd={(x: number, y: number) => { }}
+                onContentHeightChange={(newHeight: number) => { }}
+                onRowClick={(event: React.SyntheticEvent<Table>, rowIndex: number) => { }}
+                onRowDoubleClick={(event: React.SyntheticEvent<Table>, rowIndex: number) => { }}
+                onRowMouseDown={(event: React.SyntheticEvent<Table>, rowIndex: number) => { }}
+                onRowMouseEnter={(event: React.SyntheticEvent<Table>, rowIndex: number) => { }}
+                onRowMouseLeave={(event: React.SyntheticEvent<Table>, rowIndex: number) => { }}
+                onColumnResizeEndCallback={(newColumnWidth: number, columnKey: string) => { }}>
+            // add columns
+            </Table>
+        );
+    }
+}
diff --git a/types/fixed-data-table-2/index.d.ts b/types/fixed-data-table-2/index.d.ts
new file mode 100644
index 0000000000..a39397a228
--- /dev/null
+++ b/types/fixed-data-table-2/index.d.ts
@@ -0,0 +1,677 @@
+// Type definitions for fixed-data-table-2 0.8
+// Project: https://github.com/schrodinger/fixed-data-table-2
+// Definitions by: Ilya Petukhov <https://github.com/ilivit>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export as namespace FixedDataTable;
+
+export interface RowProps {
+    /** the row index */
+    rowIndex: number;
+
+    /** supplied from the Table or rowHeightGetter */
+    height: number;
+
+    /** supplied from the Table */
+    width: number;
+}
+
+export interface ColumnReorderEndEvent {
+    /** the column before the new location of this one */
+    columnBefore?: string;
+
+    /** the column after the new location of this one */
+    columnAfter?: string;
+
+    /** the column key that was just reordered */
+    reorderColumn: string;
+}
+
+export type ElementOrFunc<P> = string | React.ReactElement<any> | ((props: P) => (string | React.ReactElement<any>));
+
+export type TableRowEventHandler = (event: React.SyntheticEvent<Table>, rowIndex: number) => void;
+
+/**
+ * Data grid component with fixed or scrollable header and columns.
+ *
+ * The layout of the data table is as follows:
+ *
+ * ```
+ * +---------------------------------------------------+
+ * | Fixed Column Group    | Scrollable Column Group   |
+ * | Header                | Header                    |
+ * |                       |                           |
+ * +---------------------------------------------------+
+ * |                       |                           |
+ * | Fixed Header Columns  | Scrollable Header Columns |
+ * |                       |                           |
+ * +-----------------------+---------------------------+
+ * |                       |                           |
+ * | Fixed Body Columns    | Scrollable Body Columns   |
+ * |                       |                           |
+ * +-----------------------+---------------------------+
+ * |                       |                           |
+ * | Fixed Footer Columns  | Scrollable Footer Columns |
+ * |                       |                           |
+ * +-----------------------+---------------------------+
+ * ```
+ *
+ * - Fixed Column Group Header: These are the headers for a group
+ *   of columns if included in the table that do not scroll
+ *   vertically or horizontally.
+ *
+ * - Scrollable Column Group Header: The header for a group of columns
+ *   that do not move while scrolling vertically, but move horizontally
+ *   with the horizontal scrolling.
+ *
+ * - Fixed Header Columns: The header columns that do not move while scrolling
+ *   vertically or horizontally.
+ *
+ * - Scrollable Header Columns: The header columns that do not move
+ *   while scrolling vertically, but move horizontally with the horizontal
+ *   scrolling.
+ *
+ * - Fixed Body Columns: The body columns that do not move while scrolling
+ *   horizontally, but move vertically with the vertical scrolling.
+ *
+ * - Scrollable Body Columns: The body columns that move while scrolling
+ *   vertically or horizontally.
+ */
+export interface TableProps extends React.ClassAttributes<Table> {
+    /**
+     * Pixel width of table. If all columns do not fit,
+     * a horizontal scrollbar will appear.
+     */
+    width: number;
+
+    /**
+     * Pixel height of table. If all rows do not fit,
+     * a vertical scrollbar will appear.
+     *
+     * Either `height` or `maxHeight` must be specified.
+     */
+    height?: number;
+
+    /**
+     * Class name to be passed into parent container
+     */
+    className?: string;
+
+    /**
+     * Maximum pixel height of table. If all rows do not fit,
+     * a vertical scrollbar will appear.
+     *
+     * Either `height` or `maxHeight` must be specified.
+     */
+    maxHeight?: number;
+
+    /**
+     * Pixel height of table's owner, this is used in a managed scrolling
+     * situation when you want to slide the table up from below the fold
+     * without having to constantly update the height on every scroll tick.
+     * Instead, vary this property on scroll. By using `ownerHeight`, we
+     * over-render the table while making sure the footer and horizontal
+     * scrollbar of the table are visible when the current space for the table
+     * in view is smaller than the final, over-flowing height of table. It
+     * allows us to avoid resizing and reflowing table when it is moving in the
+     * view.
+     *
+     * This is used if `ownerHeight < height` (or `maxHeight`).
+     */
+    ownerHeight?: number;
+
+    overflowX?: 'hidden' | 'auto';
+    overflowY?: 'hidden' | 'auto';
+
+    /**
+     * Boolean flag indicating of touch scrolling should be enabled
+     * This feature is current in beta and may have bugs
+     */
+    touchScrollEnabled?: boolean;
+
+    /** Boolean flags to control if scrolling with keys is enabled */
+    keyboardScrollEnabled?: boolean;
+    /** Boolean flags to control if scrolling with keys is enabled */
+    keyboardPageEnabled?: boolean;
+
+    /** Hide the scrollbar but still enable scroll functionality */
+    showScrollbarX?: boolean;
+    /** Hide the scrollbar but still enable scroll functionality */
+    showScrollbarY?: boolean;
+
+    /**
+     * Callback when horizontally scrolling the grid.
+     *
+     * Return false to stop propagation.
+     */
+    onHorizontalScroll?: (scrollPos: number) => boolean;
+
+    /**
+     * Callback when vertically scrolling the grid.
+     *
+     * Return false to stop propagation.
+     */
+    onVerticalScroll?: (scrollPos: number) => boolean;
+
+    /**
+     * Number of rows in the table.
+     */
+    rowsCount: number;
+
+    /**
+     * Pixel height of rows unless `rowHeightGetter` is specified and returns
+     * different value.
+     */
+    rowHeight: number;
+
+    /**
+     * If specified, `rowHeightGetter(index)` is called for each row and the
+     * returned value overrides `rowHeight` for particular row.
+     */
+    rowHeightGetter?: (index: number) => number;
+
+    /**
+     * Pixel height of sub-row unless `subRowHeightGetter` is specified and returns
+     * different value.  Defaults to 0 and no sub-row being displayed.
+     */
+    subRowHeight?: number;
+
+    /**
+     * If specified, `subRowHeightGetter(index)` is called for each row and the
+     * returned value overrides `subRowHeight` for particular row.
+     */
+    subRowHeightGetter?: (index: number) => number;
+
+    /**
+     * The row expanded for table row.
+     * This can either be a React element, or a function that generates
+     * a React Element. By default, the React element passed in can expect to
+     * receive the following props:
+     *
+     * ```
+     * props: {
+     *   rowIndex; number // (the row index)
+     *   height: number // (supplied from the Table or rowHeightGetter)
+     *   width: number // (supplied from the Table)
+     * }
+     * ```
+     *
+     * Because you are passing in your own React element, you can feel free to
+     * pass in whatever props you may want or need.
+     *
+     * If you pass in a function, you will receive the same props object as the
+     * first argument.
+     */
+    rowExpanded?: ElementOrFunc<RowProps>;
+
+    /**
+     * To get any additional CSS classes that should be added to a row,
+     * `rowClassNameGetter(index)` is called.
+     */
+    rowClassNameGetter?: (index: number) => string;
+
+    /**
+     * If specified, `rowKeyGetter(index)` is called for each row and the
+     * returned value overrides `key` for the particular row.
+     */
+    rowKeyGetter?: (index: number) => string;
+
+    /**
+     * Pixel height of the column group header.
+     */
+    groupHeaderHeight?: number;
+
+    /**
+     * Pixel height of header.
+     */
+    headerHeight: number;
+
+    /**
+     * Pixel height of fixedDataTableCellGroupLayout/cellGroupWrapper.
+     * Default is headerHeight and groupHeaderHeight.
+     *
+     * This can be used with CSS to make a header cell span both the group & normal header row.
+     * Setting this to a value larger than height will cause the content to
+     * overflow the height. This is useful when adding a 2nd table as the group
+     * header and vertically merging the 2 headers when a column is not part
+     * of a group. Here are the necessary CSS changes:
+     *
+     * Both headers:
+     *  - cellGroupWrapper needs overflow-x: hidden and pointer-events: none
+     *  - cellGroup needs pointer-events: auto to reenable them on child els
+     * Group header:
+     *  - Layout/main needs overflow: visible and a higher z-index
+     *  - CellLayout/main needs overflow-y: visible
+     *  - cellGroup needs overflow: visible
+     */
+    cellGroupWrapperHeight?: number;
+
+    /**
+     * Pixel height of footer.
+     */
+    footerHeight?: number;
+
+    /**
+     * Value of horizontal scroll.
+     */
+    scrollLeft?: number;
+
+    /**
+     * Index of column to scroll to.
+     */
+    scrollToColumn?: number;
+
+    /**
+     * Value of vertical scroll.
+     */
+    scrollTop?: number;
+
+    /**
+     * Index of row to scroll to.
+     */
+    scrollToRow?: number;
+
+    /**
+     * Callback that is called when scrolling starts with current horizontal
+     * and vertical scroll values.
+     */
+    onScrollStart?: (x: number, y: number) => void;
+
+    /**
+     * Callback that is called when scrolling ends or stops with new horizontal
+     * and vertical scroll values.
+     */
+    onScrollEnd?: (x: number, y: number) => void;
+
+    /**
+     * If enabled scroll events will not be propagated outside of the table.
+     */
+    stopScrollPropagation?: boolean;
+
+    /**
+     * Callback that is called when `rowHeightGetter` returns a different height
+     * for a row than the `rowHeight` prop. This is necessary because initially
+     * table estimates heights of some parts of the content.
+     */
+    onContentHeightChange?: (newHeight: number) => void;
+
+    /**
+     * Callback that is called when a row is clicked.
+     */
+    onRowClick?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a row is double clicked.
+     */
+    onRowDoubleClick?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a mouse-down event happens on a row.
+     */
+    onRowMouseDown?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a mouse-up event happens on a row.
+     */
+    onRowMouseUp?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a mouse-enter event happens on a row.
+     */
+    onRowMouseEnter?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a mouse-leave event happens on a row.
+     */
+    onRowMouseLeave?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a touch-start event happens on a row.
+     */
+    onRowTouchStart?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a touch-end event happens on a row.
+     */
+    onRowTouchEnd?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when a touch-move event happens on a row.
+     */
+    onRowTouchMove?: TableRowEventHandler;
+
+    /**
+     * Callback that is called when resizer has been released
+     * and column needs to be updated.
+     *
+     * Required if the isResizable property is true on any column.
+     *
+     * ```
+     * function(
+     *   newColumnWidth: number,
+     *   columnKey: string,
+     * )
+     * ```
+     */
+    onColumnResizeEndCallback?: (newColumnWidth: number, columnKey: string) => void;
+
+    /**
+     * Callback that is called when reordering has been completed
+     * and columns need to be updated.
+     *
+     * ```
+     * function(
+     *   event {
+     *     columnBefore: string|undefined, // the column before the new location of this one
+     *     columnAfter: string|undefined,  // the column after the new location of this one
+     *     reorderColumn: string,          // the column key that was just reordered
+     *   }
+     * )
+     * ```
+     */
+    onColumnReorderEndCallback?: (event: ColumnReorderEndEvent) => void;
+
+    /**
+     * Whether a column is currently being resized.
+     */
+    isColumnResizing?: boolean;
+
+    /**
+     * Whether columns are currently being reordered.
+     */
+    isColumnReordering?: boolean;
+
+    /**
+     * The number of rows outside the viewport to prerender. Defaults to roughly
+     * half of the number of visible rows.
+     */
+    bufferRowCount?: number;
+}
+
+export class Table extends React.Component<TableProps> {
+}
+
+export interface ColumnHeaderProps {
+    columnKey?: string;
+
+    /** supplied from the Table or rowHeightGetter */
+    height: number;
+
+    /** supplied from the Column */
+    width: number;
+}
+
+export interface ColumnCellProps extends ColumnHeaderProps {
+    /** the row index of the cell */
+    rowIndex: number;
+}
+
+/**
+ * Component that defines the attributes of table column.
+ */
+export interface ColumnProps extends React.ClassAttributes<Column> {
+    /**
+     * The horizontal alignment of the table cell content.
+     */
+    align?: 'left' | 'center' | 'right';
+
+    /**
+     * Controls if the column is fixed when scrolling in the X axis.
+     *
+     * defaultValue: false
+     */
+    fixed?: boolean;
+
+    /**
+     * Controls if the column is fixed to the right side of the table
+     * when scrolling in the X axis.
+     *
+     * defaultValue: false
+     */
+    fixedRight?: boolean;
+
+    /**
+     * The header cell for this column.
+     * This can either be a string a React element, or a function that generates
+     * a React Element. Passing in a string will render a default header cell
+     * with that string. By default, the React element passed in can expect to
+     * receive the following props:
+     *
+     * ```
+     * props: {
+     *   columnKey: string // (of the column, if given)
+     *   height: number // (supplied from the Table or rowHeightGetter)
+     *   width: number // (supplied from the Column)
+     * }
+     * ```
+     *
+     * Because you are passing in your own React element, you can feel free to
+     * pass in whatever props you may want or need.
+     *
+     * If you pass in a function, you will receive the same props object as the
+     * first argument.
+     */
+    header?: ElementOrFunc<ColumnHeaderProps>;
+
+    /**
+     * This is the body cell that will be cloned for this column.
+     * This can either be a string a React element, or a function that generates
+     * a React Element. Passing in a string will render a default header cell
+     * with that string. By default, the React element passed in can expect to
+     * receive the following props:
+     *
+     * ```
+     * props: {
+     *   rowIndex; number // (the row index of the cell)
+     *   columnKey: string // (of the column, if given)
+     *   height: number // (supplied from the Table or rowHeightGetter)
+     *   width: number // (supplied from the Column)
+     * }
+     * ```
+     *
+     * Because you are passing in your own React element, you can feel free to
+     * pass in whatever props you may want or need.
+     *
+     * If you pass in a function, you will receive the same props object as the
+     * first argument.
+     */
+    cell?: ElementOrFunc<ColumnCellProps>;
+
+    /**
+     * This is the footer cell for this column.
+     * This can either be a string a React element, or a function that generates
+     * a React Element. Passing in a string will render a default header cell
+     * with that string. By default, the React element passed in can expect to
+     * receive the following props:
+     *
+     * ```
+     * props: {
+     *   columnKey: string // (of the column, if given)
+     *   height: number // (supplied from the Table or rowHeightGetter)
+     *   width: number // (supplied from the Column)
+     * }
+     * ```
+     *
+     * Because you are passing in your own React element, you can feel free to
+     * pass in whatever props you may want or need.
+     *
+     * If you pass in a function, you will receive the same props object as the
+     * first argument.
+     */
+    footer?: ElementOrFunc<ColumnHeaderProps>;
+
+    /**
+     * This is used to uniquely identify the column, and is not required unless
+     * you a resizing columns. This will be the key given in the
+     * `onColumnResizeEndCallback` on the Table.
+     */
+    columnKey?: string | number;
+
+    /**
+     * The pixel width of the column.
+     */
+    width: number;
+
+    /**
+     * If this is a resizable column this is its minimum pixel width.
+     */
+    minWidth?: number;
+
+    /**
+     * If this is a resizable column this is its maximum pixel width.
+     */
+    maxWidth?: number;
+
+    /**
+     * The grow factor relative to other columns. Same as the flex-grow API
+     * from http://www.w3.org/TR/css3-flexbox/. Basically, take any available
+     * extra width and distribute it proportionally according to all columns'
+     * flexGrow values. Defaults to zero (no-flexing).
+     */
+    flexGrow?: number;
+
+    /**
+     * Whether the column can be resized with the
+     * FixedDataTableColumnResizeHandle. Please note that if a column
+     * has a flex grow, once you resize the column this will be set to 0.
+     *
+     * This property only provides the UI for the column resizing. If this
+     * is set to true, you will need to set the onColumnResizeEndCallback table
+     * property and render your columns appropriately.
+     */
+    isResizable?: boolean;
+
+    /**
+     * Whether the column can be dragged to reorder.
+     */
+    isReorderable?: boolean;
+
+    /**
+     * Whether cells in this column can be removed from document when outside
+     * of viewport as a result of horizontal scrolling.
+     * Setting this property to true allows the table to not render cells in
+     * particular column that are outside of viewport for visible rows. This
+     * allows to create table with many columns and not have vertical scrolling
+     * performance drop.
+     * Setting the property to false will keep previous behaviour and keep
+     * cell rendered if the row it belongs to is visible.
+     *
+     * defaultValue: false
+     */
+    allowCellsRecycling?: boolean;
+
+    /**
+     * Flag to enable performance check when rendering. Stops the component from
+     * rendering if none of it's passed in props have changed
+     */
+    pureRendering?: boolean;
+}
+
+export class Column extends React.Component<ColumnProps> {
+}
+
+export interface ColumnGroupHeaderProps {
+    /* supplied from the groupHeaderHeight */
+    height: number;
+
+    /* supplied from the Column */
+    width: number;
+}
+
+/**
+ * Component that defines the attributes of a table column group.
+ */
+export interface ColumnGroupProps extends React.ClassAttributes<ColumnGroup> {
+    /**
+     * The horizontal alignment of the table cell content.
+     */
+    align?: 'left' | 'center' | 'right';
+
+    /**
+     * Controls if the column group is fixed when scrolling in the X axis.
+     *
+     * defaultValue: false
+     */
+    fixed?: boolean;
+
+    /**
+     * This is the header cell for this column group.
+     * This can either be a string or a React element. Passing in a string
+     * will render a default footer cell with that string. By default, the React
+     * element passed in can expect to receive the following props:
+     *
+     * ```
+     * props: {
+     *   height: number // (supplied from the groupHeaderHeight)
+     *   width: number // (supplied from the Column)
+     * }
+     * ```
+     *
+     * Because you are passing in your own React element, you can feel free to
+     * pass in whatever props you may want or need.
+     *
+     * You can also pass in a function that returns a react elemnt, with the
+     * props object above passed in as the first parameter.
+     */
+    header?: string | React.ReactElement<any> | ((props: ColumnGroupHeaderProps) => (string | React.ReactElement<any>));
+}
+
+export class ColumnGroup extends React.Component<ColumnGroupProps> {
+}
+
+/**
+ * Component that handles default cell layout and styling.
+ *
+ * All props unless specified below will be set onto the top level `div`
+ * rendered by the cell.
+ *
+ * Example usage via from a `Column`:
+ * ```
+ * const MyColumn = (
+ *   <Column
+ *     cell={({rowIndex, width, height}) => (
+ *       <Cell
+ *         width={width}
+ *         height={height}
+ *         className="my-class">
+ *         Cell number: <span>{rowIndex}</span>
+ *        </Cell>
+ *     )}
+ *     width={100}
+ *   />
+ * );
+ * ```
+ */
+export interface CellProps extends React.HTMLAttributes<Cell> {
+    /**
+     * Outer height of the cell.
+     */
+    height?: number;
+
+    /**
+     * Outer width of the cell.
+     */
+    width?: number;
+
+    /**
+     * Optional prop that if specified on the `Column` will be passed to the
+     * cell. It can be used to uniquely identify which column is the cell is in.
+     */
+    columnKey?: string | number;
+
+    /**
+     * Optional prop that represents the rows index in the table.
+     * For the 'cell' prop of a Column, this parameter will exist for any
+     * cell in a row with a positive index.
+     *
+     * Below that entry point the user is welcome to consume or
+     * pass the prop through at their discretion.
+     */
+    rowIndex?: number;
+}
+
+export class Cell extends React.Component<CellProps> {
+}
diff --git a/types/fixed-data-table-2/tsconfig.json b/types/fixed-data-table-2/tsconfig.json
new file mode 100644
index 0000000000..c548d5c369
--- /dev/null
+++ b/types/fixed-data-table-2/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "files": [
+        "index.d.ts",
+        "fixed-data-table-2-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "jsx":"preserve",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/fixed-data-table-2/tslint.json b/types/fixed-data-table-2/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/fixed-data-table-2/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/fixed-data-table/fixed-data-table-tests.tsx b/types/fixed-data-table/fixed-data-table-tests.tsx
index cdbd46eb6c..bb09fedcaf 100644
--- a/types/fixed-data-table/fixed-data-table-tests.tsx
+++ b/types/fixed-data-table/fixed-data-table-tests.tsx
@@ -36,7 +36,7 @@ class MyTable2 extends React.Component {
 
 // provide Custom Data
 interface MyTable3State {
-    myTableData: [{name: string}];
+    myTableData: {name: string}[];
 }
 
 class MyTable3 extends React.Component<{}, MyTable3State> {
diff --git a/types/fixed-data-table/tslint.json b/types/fixed-data-table/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fixed-data-table/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flake-idgen/tslint.json b/types/flake-idgen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flake-idgen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flat/tslint.json b/types/flat/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flat/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flatbuffers/flatbuffers-tests.ts b/types/flatbuffers/flatbuffers-tests.ts
index 493773fdcf..13f8453224 100644
--- a/types/flatbuffers/flatbuffers-tests.ts
+++ b/types/flatbuffers/flatbuffers-tests.ts
@@ -14,7 +14,7 @@ enum Any {
 }
 
 class Monster2 {
-  bb: flatbuffers.ByteBuffer= null;
+  bb: flatbuffers.ByteBuffer = null;
 
   bb_pos = 0;
 
@@ -89,7 +89,7 @@ class Test {
 }
 
 class TestSimpleTableWithEnum {
-  bb: flatbuffers.ByteBuffer= null;
+  bb: flatbuffers.ByteBuffer = null;
 
   bb_pos = 0;
 
@@ -134,7 +134,7 @@ class TestSimpleTableWithEnum {
 }
 
 class Vec3 {
-  bb: flatbuffers.ByteBuffer= null;
+  bb: flatbuffers.ByteBuffer = null;
 
   bb_pos = 0;
 
@@ -242,7 +242,7 @@ class Vec3 {
 }
 
 class Stat {
-  bb: flatbuffers.ByteBuffer= null;
+  bb: flatbuffers.ByteBuffer = null;
 
   bb_pos = 0;
 
@@ -305,7 +305,7 @@ class Stat {
 }
 
 class Monster {
-  bb: flatbuffers.ByteBuffer= null;
+  bb: flatbuffers.ByteBuffer = null;
 
   bb_pos = 0;
 
diff --git a/types/flatbuffers/index.d.ts b/types/flatbuffers/index.d.ts
index 44455a1ee0..b95741200b 100644
--- a/types/flatbuffers/index.d.ts
+++ b/types/flatbuffers/index.d.ts
@@ -7,122 +7,39 @@ export { flatbuffers };
 
 declare global {
   namespace flatbuffers {
-    /**
-     * @typedef {number}
-     */
     type Offset = number;
 
-    /**
-     * @typedef {{
-     *   bb: flatbuffers.ByteBuffer,
-     *   bb_pos: number
-     * }}
-     */
     interface Table {
       bb: ByteBuffer;
       bb_pos: number;
     }
 
-    /**
-     * @type {number}
-     * @const
-     */
     const SIZEOF_SHORT: number;
-
-    /**
-     * @type {number}
-     * @const
-     */
     const SIZEOF_INT: number;
-
-    /**
-     * @type {number}
-     * @const
-     */
     const FILE_IDENTIFIER_LENGTH: number;
 
-    /**
-     * @enum {number}
-     */
     enum Encoding { UTF8_BYTES, UTF16_STRING }
 
-    /**
-     * @type {Int32Array}
-     * @const
-     */
     const int32: Int32Array;
-
-    /**
-     * @type {Float32Array}
-     * @const
-     */
     const float32: Float32Array;
-
-    /**
-     * @type {Float64Array}
-     * @const
-     */
     const float64: Float64Array;
-
-    /**
-     * @type {boolean}
-     * @const
-     */
     const isLittleEndian: boolean;
 
     ////////////////////////////////////////////////////////////////////////////////
 
     class Long {
-      /**
-       * @type {number}
-       * @const
-       */
       low: number;
-
-      /**
-       * @type {number}
-       * @const
-       */
       high: number;
-
-      /**
-       * @type {flatbuffers.Long}
-       * @const
-       */
       static ZERO: Long;
-
-      /**
-       * @constructor
-       * @param {number} high
-       * @param {number} low
-       */
       constructor(low: number, high: number);
-
-      /**
-       * @returns {number}
-       */
       toFloat64(): number;
-
-      /**
-       * @param {flatbuffers.Long} other
-       * @returns {boolean}
-       */
       equals(other: any): boolean;
-
-      /**
-       * @param {number} low
-       * @param {number} high
-       */
       static create(low: number, high: number): Long;
     }
 
     ////////////////////////////////////////////////////////////////////////////////
 
     class Builder {
-      /**
-       * @constructor
-       * @param {number=} initial_size
-       */
       constructor(initial_size?: number);
 
       /**
@@ -130,7 +47,7 @@ declare global {
        * don't get serialized into the buffer. Forcing defaults provides a
        * way to manually disable this optimization.
        *
-       * @param {boolean} forceDefaults true always serializes default values
+       * @param forceDefaults true always serializes default values
        */
       forceDefaults(forceDefaults: boolean): void;
 
@@ -138,8 +55,6 @@ declare global {
        * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
        * called finish(). The actual data starts at the ByteBuffer's current position,
        * not necessarily at 0.
-       *
-       * @returns {flatbuffers.ByteBuffer}
        */
       dataBuffer(): ByteBuffer;
 
@@ -147,8 +62,6 @@ declare global {
        * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
        * called finish(). The actual data starts at the ByteBuffer's current position,
        * not necessarily at 0.
-       *
-       * @returns {Uint8Array}
        */
       asUint8Array(): Uint8Array;
 
@@ -158,131 +71,37 @@ declare global {
        * field is aligned to 4 bytes, and the string data follows it directly. If all
        * you need to do is alignment, `additional_bytes` will be 0.
        *
-       * @param {number} size This is the of the new element to write
-       * @param {number} additional_bytes The padding size
+       * @param size This is the of the new element to write
+       * @param additional_bytes The padding size
        */
       prep(size: number, additional_bytes: number): void;
 
-      /**
-       * @param {number} byte_size
-       */
       pad(byte_size: number): void;
 
-      /**
-       * @param {number} value
-       */
       writeInt8(value: number): void;
-
-      /**
-       * @param {number} value
-       */
       writeInt16(value: number): void;
-
-      /**
-       * @param {number} value
-       */
       writeInt32(value: number): void;
-
-      /**
-       * @param {flatbuffers.Long} value
-       */
       writeInt64(value: Long): void;
-
-      /**
-       * @param {number} value
-       */
       writeFloat32(value: number): void;
-
-      /**
-       * @param {number} value
-       */
       writeFloat64(value: number): void;
 
-      /**
-       * @param {number} value
-       */
       addInt8(value: number): void;
-
-      /**
-       * @param {number} value
-       */
       addInt16(value: number): void;
-
-      /**
-       * @param {number} value
-       */
       addInt32(value: number): void;
-
-      /**
-       * @param {flatbuffers.Long} value
-       */
       addInt64(value: Long): void;
-
-      /**
-       * @param {number} value
-       */
       addFloat32(value: number): void;
-
-      /**
-       * @param {number} value
-       */
       addFloat64(value: number): void;
-
-      /**
-       * @param {number} voffset
-       * @param {number} value
-       * @param {number} defaultValue
-       */
       addFieldInt8(voffset: number, value: number, defaultValue: number): void;
-
-      /**
-       * @param {number} voffset
-       * @param {number} value
-       * @param {number} defaultValue
-       */
       addFieldInt16(voffset: number, value: number, defaultValue: number): void;
-
-      /**
-       * @param {number} voffset
-       * @param {number} value
-       * @param {number} defaultValue
-       */
       addFieldInt32(voffset: number, value: number, defaultValue: number): void;
-
-      /**
-       * @param {number} voffset
-       * @param {flatbuffers.Long} value
-       * @param {flatbuffers.Long} defaultValue
-       */
       addFieldInt64(voffset: number, value: Long, defaultValue: Long): void;
-
-      /**
-       * @param {number} voffset
-       * @param {number} value
-       * @param {number} defaultValue
-       */
       addFieldFloat32(voffset: number, value: number, defaultValue: number): void;
-
-      /**
-       * @param {number} voffset
-       * @param {number} value
-       * @param {number} defaultValue
-       */
       addFieldFloat64(voffset: number, value: number, defaultValue: number): void;
 
-      /**
-       * @param {number} voffset
-       * @param {flatbuffers.Offset} value
-       * @param {flatbuffers.Offset} defaultValue
-       */
       addFieldOffset(voffset: number, value: Offset, defaultValue: Offset): void;
 
       /**
        * Structs are stored inline, so nothing additional is being added. `d` is always 0.
-       *
-       * @param {number} voffset
-       * @param {flatbuffers.Offset} value
-       * @param {flatbuffers.Offset} defaultValue
        */
       addFieldStruct(voffset: number, value: Offset, defaultValue: Offset): void;
 
@@ -291,7 +110,7 @@ declare global {
        * where they're used.  You'll get this assertion failure if you
        * created it elsewhere.
        *
-       * @param {flatbuffers.Offset} obj The offset of the created object
+       * @param obj The offset of the created object
        */
       nested(obj: Offset): void;
 
@@ -303,13 +122,11 @@ declare global {
 
       /**
        * Set the current vtable at `voffset` to the current location in the buffer.
-       *
-       * @param {number} voffset
        */
       slot(voffset: number): void;
 
       /**
-       * @returns {flatbuffers.Offset} Offset relative to the end of the buffer.
+       * @returns Offset relative to the end of the buffer.
        */
       offset(): Offset;
 
@@ -317,8 +134,8 @@ declare global {
        * Doubles the size of the backing ByteBuffer and copies the old data towards
        * the end of the new buffer (since we build the buffer backwards).
        *
-       * @param {flatbuffers.ByteBuffer} bb The current buffer with the existing data
-       * @returns {flatbuffers.ByteBuffer} A new byte buffer with the old data copied
+       * @param bb The current buffer with the existing data
+       * @returns A new byte buffer with the old data copied
        * to it. The data is located at the end of the buffer.
        */
       static growByteBuffer(bb: ByteBuffer): ByteBuffer;
@@ -326,7 +143,7 @@ declare global {
       /**
        * Adds on offset, relative to where it will be written.
        *
-       * @param {flatbuffers.Offset} offset The offset to add
+       * @param offset The offset to add
        */
       addOffset(offset: Offset): void;
 
@@ -334,30 +151,21 @@ declare global {
        * Start encoding a new object in the buffer.  Users will not usually need to
        * call this directly. The FlatBuffers compiler will generate helper methods
        * that call this method internally.
-       *
-       * @param {number} numfields
        */
       startObject(numfields: number): void;
 
       /**
        * Finish off writing the object that is under construction.
        *
-       * @returns {flatbuffers.Offset} The offset to the object inside `dataBuffer`
+       * @returns The offset to the object inside `dataBuffer`
        */
       endObject(): Offset;
 
-      /**
-       * @param {flatbuffers.Offset} root_table
-       * @param {string=} file_identifier
-       */
       finish(root_table: Offset, file_identifier?: string): void;
 
       /**
        * This checks a required field has been set in a given table that has
        * just been constructed.
-       *
-       * @param {flatbuffers.Offset} table
-       * @param {number} field
        */
       requiredField(table: Offset, field: number): void;
 
@@ -366,9 +174,9 @@ declare global {
        * this directly. The FlatBuffers compiler will create a start/end
        * method for vector types in generated code.
        *
-       * @param {number} elem_size The size of each element in the array
-       * @param {number} num_elems The number of elements in the array
-       * @param {number} alignment The alignment of the array
+       * @param elem_size The size of each element in the array
+       * @param num_elems The number of elements in the array
+       * @param alignment The alignment of the array
        */
       startVector(elem_size: number, num_elems: number, alignment: number): void;
 
@@ -376,7 +184,7 @@ declare global {
        * Finish off the creation of an array and all its elements. The array must be
        * created with `startVector`.
        *
-       * @returns {flatbuffers.Offset} The offset at which the newly created array
+       * @returns The offset at which the newly created array
        * starts.
        */
       endVector(): Offset;
@@ -385,17 +193,13 @@ declare global {
        * Encode the string `s` in the buffer using UTF-8. If a Uint8Array is passed
        * instead of a string, it is assumed to contain valid UTF-8 encoded data.
        *
-       * @param {string|Uint8Array} s The string to encode
-       * @return {flatbuffers.Offset} The offset in the buffer where the encoded string starts
+       * @param s The string to encode
+       * @return The offset in the buffer where the encoded string starts
        */
       createString(s: string|Uint8Array): Offset;
 
       /**
        * Conveniance function for creating Long objects.
-       *
-       * @param {number} low
-       * @param {number} high
-       * @returns {Long}
        */
       createLong(low: number, high: number): Long;
     }
@@ -403,174 +207,48 @@ declare global {
     ////////////////////////////////////////////////////////////////////////////////
 
     class ByteBuffer {
-      /**
-       * @constructor
-       * @param {Uint8Array} bytes
-       */
       constructor(bytes: Uint8Array);
 
-      /**
-       * @param {number} byte_size
-       * @returns {flatbuffers.ByteBuffer}
-       */
       static allocate(byte_size: number): ByteBuffer;
 
-      /**
-       * @returns {Uint8Array}
-       */
       bytes(): Uint8Array;
 
-      /**
-       * @returns {number}
-       */
       position(): number;
 
-      /**
-       * @param {number} position
-       */
       setPosition(position: number): void;
 
-      /**
-       * @returns {number}
-       */
       capacity(): number;
 
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readInt8(offset: number): number;
-
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readUint8(offset: number): number;
-
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readInt16(offset: number): number;
-
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readUint16(offset: number): number;
-
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readInt32(offset: number): number;
-
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readUint32(offset: number): number;
-
-      /**
-       * @param {number} offset
-       * @returns {flatbuffers.Long}
-       */
       readInt64(offset: number): Long;
-
-      /**
-       * @param {number} offset
-       * @returns {flatbuffers.Long}
-       */
       readUint64(offset: number): Long;
-
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readFloat32(offset: number): number;
-
-      /**
-       * @param {number} offset
-       * @returns {number}
-       */
       readFloat64(offset: number): number;
 
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeInt8(offset: number, value: number): void;
-
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeUint8(offset: number, value: number): void;
-
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeInt16(offset: number, value: number): void;
-
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeUint16(offset: number, value: number): void;
-
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeInt32(offset: number, value: number): void;
-
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeUint32(offset: number, value: number): void;
-
-      /**
-       * @param {number} offset
-       * @param {flatbuffers.Long} value
-       */
       writeInt64(offset: number, value: Long): void;
-
-      /**
-       * @param {number} offset
-       * @param {flatbuffers.Long} value
-       */
       writeUint64(offset: number, value: Long): void;
-
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeFloat32(offset: number, value: number): void;
-
-      /**
-       * @param {number} offset
-       * @param {number} value
-       */
       writeFloat64(offset: number, value: number): void;
 
       /**
        * Look up a field in the vtable, return an offset into the object, or 0 if the
        * field is not present.
-       *
-       * @param {number} bb_pos
-       * @param {number} vtable_offset
-       * @returns {number}
        */
       __offset(bb_pos: number, vtable_offset: number): number;
 
       /**
        * Initialize any Table-derived type to point to the union at the given offset.
-       *
-       * @param {flatbuffers.Table} t
-       * @param {number} offset
-       * @returns {flatbuffers.Table}
        */
       __union<T extends Table>(t: T, offset: number): T;
 
@@ -583,47 +261,29 @@ declare global {
        * and from UTF-16 when the data will just be packaged back up in another
        * FlatBuffer later on.
        *
-       * @param {number} offset
-       * @param {flatbuffers.Encoding=} optionalEncoding Defaults to UTF16_STRING
-       * @returns {string|Uint8Array}
+       * @param optionalEncoding Defaults to UTF16_STRING
        */
       __string(offset: number, optionalEncoding?: Encoding): string|Uint8Array;
 
       /**
        * Retrieve the relative offset stored at "offset"
-       * @param {number} offset
-       * @returns {number}
        */
       __indirect(offset: number): number;
 
       /**
        * Get the start of data of a vector whose offset is stored at "offset" in this object.
-       *
-       * @param {number} offset
-       * @returns {number}
        */
       __vector(offset: number): number;
 
       /**
        * Get the length of a vector whose offset is stored at "offset" in this object.
-       *
-       * @param {number} offset
-       * @returns {number}
        */
       __vector_len(offset: number): number;
 
-      /**
-       * @param {string} ident
-       * @returns {boolean}
-       */
       __has_identifier(ident: string): boolean;
 
       /**
        * Conveniance function for creating Long objects.
-       *
-       * @param {number} low
-       * @param {number} high
-       * @returns {Long}
        */
       createLong(low: number, high: number): Long;
     }
diff --git a/types/flatpickr/flatpickr-tests.ts b/types/flatpickr/flatpickr-tests.ts
deleted file mode 100644
index f6800e38b7..0000000000
--- a/types/flatpickr/flatpickr-tests.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as Flatpickr from 'flatpickr';
-
-const picker1 = new Flatpickr('input');
-
-const input = document.querySelector('input');
-if (input != null) {
-    const picker2 = new Flatpickr(input, {
-        mode: 'range',
-        onChange: dates => null
-    });
-    picker2.setDate(['2016-11-15T00:00:00.000Z', new Date()]);
-}
-
-picker1.destroy();
diff --git a/types/flatpickr/index.d.ts b/types/flatpickr/index.d.ts
deleted file mode 100644
index eb29ddfa14..0000000000
--- a/types/flatpickr/index.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-// Type definitions for flatpickr 3.0
-// Project: https://github.com/chmln/flatpickr
-// Definitions by: James Birtles <https://github.com/UnwrittenFun>
-//                 Rowell Heria <https://github.com/rowellx68>
-//                 Michael Wagner <https://github.com/wagich>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function flatpickr(element: string | Element | HTMLElement, options?: Flatpickr.Options): Flatpickr;
-
-declare class Flatpickr {
-    constructor(element: string | Element | HTMLElement, options?: Flatpickr.Options);
-
-    changeMonth(month: number, isOffset?: boolean): void;
-    clear(): void;
-    close(): void;
-    destroy(): void;
-    formatDate(date: Date, format: string): string;
-    jumpToDate(date?: Flatpickr.DateString): void;
-    open(): void;
-    parseDate(date: string, format: string): Date;
-    redraw(): void;
-    set(option: string, value: any): void;
-    setDate(date: Flatpickr.DateString | Flatpickr.DateString[], triggerChange?: boolean, dateFormat?: string): void;
-    toggle(): void;
-
-    static localize(locale: string | Flatpickr.Locale): void;
-    static l10ns: {
-        default: Flatpickr.Locale;
-    };
-}
-
-declare namespace Flatpickr {
-    interface Options {
-        altFormat?: string;
-        altInput?: boolean;
-        altInputClass?: string;
-        allowInput?: boolean;
-        clickOpens?: boolean;
-        dateFormat?: string | null;
-        defaultDate?: DateString | DateString[];
-        defaultHour?: number;
-        defaultMinute?: number;
-        disable?: DateRange[];
-        disableMobile?: boolean;
-        enable?: DateRange[];
-        enableTime?: boolean;
-        enableSeconds?: boolean;
-        hourIncrement?: number;
-        inline?: boolean;
-        maxDate?: DateString;
-        minDate?: DateString;
-        minuteIncrement?: number;
-        mode?: Mode;
-        nextArrow?: string;
-        noCalendar?: boolean;
-        onChange?: EventCallback | EventCallback[];
-        onClose?: EventCallback | EventCallback[];
-        onOpen?: EventCallback | EventCallback[];
-        onReady?: EventCallback | EventCallback[];
-        onMonthChange?: EventCallback | EventCallback[];
-        onYearChange?: EventCallback | EventCallback[];
-        onValueUpdate?: EventCallback | EventCallback[];
-        onDayCreate?: EventCallback | EventCallback[];
-        parseDate?(date: string): Date;
-        prevArrow?: string;
-        shorthandCurrentMonth?: boolean;
-        static?: boolean;
-        time_24hr?: boolean;
-        utc?: boolean;
-        weekNumbers?: boolean;
-        wrap?: boolean;
-        locale?: string | Locale;
-        plugins?: any[];
-    }
-
-    interface Locale {
-        weekdays?: {
-            shorthand?: string[];
-            longhand?: string[];
-        };
-
-        months?: {
-            shorthand?: string[];
-            longhand?: string[];
-        };
-
-        firstDayOfWeek?: number;
-        weekAbbreviation?: string;
-        rangeSeparator?: string;
-        am?: string;
-        pm?: string;
-
-        ordinal?: ((nth: number) => string) | string;
-
-        scrollTitle?: string;
-        toggleTitle?: string;
-    }
-
-    type DateString = Date | string;
-    type DateRange = DateString | { from: DateString, to: DateString } | ((date: Date) => boolean);
-    type Mode = 'single' | 'multiple' | 'range';
-    type EventCallback = (selectedDates: Date[], dateStr: string, instance: Flatpickr, elem: HTMLElement) => void;
-}
-
-export = Flatpickr;
diff --git a/types/flatpickr/tsconfig.json b/types/flatpickr/tsconfig.json
deleted file mode 100644
index 7980eb3627..0000000000
--- a/types/flatpickr/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "flatpickr-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/flatpickr/v2/flatpickr-tests.ts b/types/flatpickr/v2/flatpickr-tests.ts
deleted file mode 100644
index f6800e38b7..0000000000
--- a/types/flatpickr/v2/flatpickr-tests.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as Flatpickr from 'flatpickr';
-
-const picker1 = new Flatpickr('input');
-
-const input = document.querySelector('input');
-if (input != null) {
-    const picker2 = new Flatpickr(input, {
-        mode: 'range',
-        onChange: dates => null
-    });
-    picker2.setDate(['2016-11-15T00:00:00.000Z', new Date()]);
-}
-
-picker1.destroy();
diff --git a/types/flatpickr/v2/index.d.ts b/types/flatpickr/v2/index.d.ts
deleted file mode 100644
index 9a98beabaa..0000000000
--- a/types/flatpickr/v2/index.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for flatpickr 2.2
-// Project: https://github.com/chmln/flatpickr
-// Definitions by: James Birtles <https://github.com/UnwrittenFun>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class Flatpickr {
-    constructor(element: string | Element, options?: Flatpickr.Options);
-
-    changeMonth(month: number, isOffset: boolean): void;
-    clear(): void;
-    close(): void;
-    destroy(): void;
-    formatDate(format: string, date: Date): string;
-    jumpToDate(date?: Flatpickr.DateString): void;
-    open(): void;
-    parseDate(date: string): Date;
-    redraw(): void;
-    set(option: string, value: any): void;
-    setDate(date: Flatpickr.DateString | Flatpickr.DateString[]): void;
-    toggle(): void;
-}
-
-declare namespace Flatpickr {
-    interface Options {
-        altFormat?: string;
-        altInput?: boolean;
-        altInputClass?: string;
-        allowInput?: boolean;
-        clickOpens?: boolean;
-        dateFormat?: string | null;
-        defaultDate?: DateString | DateString[];
-        disable?: DateRange[];
-        enable?: DateRange[];
-        enableTime?: boolean;
-        enableSeconds?: boolean;
-        hourIncrement?: number;
-        inline?: boolean;
-        maxDate?: DateString;
-        minDate?: DateString;
-        minuteIncrement?: number;
-        mode?: Mode;
-        nextArrow?: string;
-        noCalendar?: boolean;
-        onChange?: EventCallback | EventCallback[];
-        onClose?: EventCallback | EventCallback[];
-        onOpen?: EventCallback | EventCallback[];
-        onReady?: EventCallback | EventCallback[];
-        onMonthChange?: EventCallback | EventCallback[];
-        onYearChange?: EventCallback | EventCallback[];
-        onValueUpdate?: EventCallback | EventCallback[];
-        onDayCreate?: EventCallback | EventCallback[];
-        parseDate?(date: string): Date;
-        prevArrow?: string;
-        shorthandCurrentMonth?: boolean;
-        static?: boolean;
-        time_24hr?: boolean;
-        utc?: boolean;
-        weekNumbers?: boolean;
-        wrap?: boolean;
-    }
-
-    type DateString = Date | string;
-    type DateRange = DateString | { from: DateString, to: DateString } | ((date: Date) => boolean);
-    type Mode = 'single' | 'multiple' | 'range';
-    type EventCallback = (selectedDates: Date[], dateStr: string, instance: Flatpickr, elem: HTMLElement) => void;
-}
-
-export = Flatpickr;
diff --git a/types/flatpickr/v2/tsconfig.json b/types/flatpickr/v2/tsconfig.json
deleted file mode 100644
index 844aea45cd..0000000000
--- a/types/flatpickr/v2/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "flatpickr": [
-                "flatpickr/v2"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "flatpickr-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/flexslider/tslint.json b/types/flexslider/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flexslider/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index fda440b1fe..ae5dc46cb7 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -80,19 +80,16 @@ declare class Flickity {
     // properties
 
     /**
-     * @type integer
      * The selected cell index.
      */
     selectedIndex: number;
 
     /**
-     * @type Element
      * The selected cell element.
      */
     selectedElement: Element;
 
     /**
-     * @type Element[]
      * The array of cells. Use cells.length for the total number of cells.
      */
     cells: Element[];
@@ -144,10 +141,9 @@ declare class Flickity {
     /**
      * Select a slide of a cell. Useful for groupCells.
      *
-     * @param {number | string} index Zero-based index OR selector string of the cell to select.
-     * @param {boolean} [isWrapped] Optional. If true, the last slide will be selected if at the first slide.
-     * @param {boolean} [isInstant] If true, immediately view the selected slide without animation.
-     * @memberof Flickity
+     * @param index Zero-based index OR selector string of the cell to select.
+     * @param isWrapped If true, the last slide will be selected if at the first slide.
+     * @param isInstant If true, immediately view the selected slide without animation.
      */
     selectCell(index: number | string, isWrapped?: boolean, isInstant?: boolean): void;
 
diff --git a/types/flight/tslint.json b/types/flight/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flight/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flightplan/tslint.json b/types/flightplan/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flightplan/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flipsnap/tslint.json b/types/flipsnap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flipsnap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flot/index.d.ts b/types/flot/index.d.ts
index 84ab0daeb8..a75142b49e 100644
--- a/types/flot/index.d.ts
+++ b/types/flot/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for Flot
 // Project: http://www.flotcharts.org/
-// Definitions by: Matt Burland <https://github.com/burlandm>, Timo Mühlbach <https://github.com/Anticom>
+// Definitions by:  Matt Burland <https://github.com/burlandm>
+//                  Timo Mühlbach <https://github.com/Anticom>
+//                  Ariel Kuechler <https://github.com/admiralsmaster> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -120,6 +122,10 @@ declare namespace jquery.flot {
         tickLength?: number;
 
         alignTicksWithAxis?: number;
+        
+        timezone?: string;                      // "browser" or timezone (only makes sense for mode: "time")
+        timeformat?: string;                    // null or format string
+        twelveHourClock?: boolean;
     }
 
     interface seriesTypeBase {
diff --git a/types/flot/tslint.json b/types/flot/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flot/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/flowjs/tslint.json b/types/flowjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/flowjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts b/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts
index e45f8ff855..53b095a8b2 100644
--- a/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts
+++ b/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts
@@ -50,3 +50,7 @@ command.clone()
 
 // Save a converted version with the original size
 command.save('/path/to/output-original-size.mp4');
+
+ffmpeg.ffprobe('/path/to/file.avi', (err, metadata) => {
+    console.dir(metadata);
+});
diff --git a/types/fluent-ffmpeg/index.d.ts b/types/fluent-ffmpeg/index.d.ts
index 65bacff53e..1e9eaf5eb4 100644
--- a/types/fluent-ffmpeg/index.d.ts
+++ b/types/fluent-ffmpeg/index.d.ts
@@ -281,12 +281,10 @@ declare namespace Ffmpeg {
         getAvailableFormats(callback: FormatsCallback): void;
 
         // ffprobe
-        /* tslint:disable:unified-signatures */
-        ffprobe(callback: (err: any, data: FfprobeData) => void): (err: any, data: FfprobeData) => void;
-        ffprobe(index: number, callback: (err: any, data: FfprobeData) => void): (err: any, data: FfprobeData) => void;
-        ffprobe(options: string[], callback: (err: any, data: FfprobeData) => void): (err: any, data: FfprobeData) => void;
-        ffprobe(index: number, options: string[], callback: (err: any, data: FfprobeData) => void): (err: any, data: FfprobeData) => void;
-        /* tslint:enable:unified-signatures */
+        ffprobe(callback: (err: any, data: FfprobeData) => void): void;
+        ffprobe(index: number, callback: (err: any, data: FfprobeData) => void): void;
+        ffprobe(options: string[], callback: (err: any, data: FfprobeData) => void): void; // tslint:disable-line unified-signatures
+        ffprobe(index: number, options: string[], callback: (err: any, data: FfprobeData) => void): void;
 
         // recipes
         saveToFile(output: string): FfmpegCommand;
@@ -305,6 +303,11 @@ declare namespace Ffmpeg {
         clone(): FfmpegCommand;
         run(): void;
     }
+
+    function ffprobe(file: string, callback: (err: any, data: FfprobeData) => void): void;
+    function ffprobe(file: string, index: number, callback: (err: any, data: FfprobeData) => void): void;
+    function ffprobe(file: string, options: string[], callback: (err: any, data: FfprobeData) => void): void; // tslint:disable-line unified-signatures
+    function ffprobe(file: string, index: number, options: string[], callback: (err: any, data: FfprobeData) => void): void;
 }
 declare function Ffmpeg(options?: Ffmpeg.FfmpegCommandOptions): Ffmpeg.FfmpegCommand;
 declare function Ffmpeg(input?: string | stream.Readable, options?: Ffmpeg.FfmpegCommandOptions): Ffmpeg.FfmpegCommand;
diff --git a/types/flux-standard-action/flux-standard-action-tests.ts b/types/flux-standard-action/flux-standard-action-tests.ts
deleted file mode 100644
index 1a98c6663c..0000000000
--- a/types/flux-standard-action/flux-standard-action-tests.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-
-//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);
-
-declare function alert (message: string): void
-
-function unwrapAction(action: { type: string }) {
-    if (isFSA(action)) {
-        if (isError(action)) {
-            alert(action.payload!.message)
-        }
-        return action.payload
-    }
-}
-
-var result5: TextPayload = unwrapAction(sample1)
-var result6: Error = unwrapAction(sample2)
diff --git a/types/flux-standard-action/index.d.ts b/types/flux-standard-action/index.d.ts
deleted file mode 100644
index ce328e9be8..0000000000
--- a/types/flux-standard-action/index.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for flux-standard-action 0.5.0
-// Project: https://github.com/acdlite/flux-standard-action
-// Definitions by: Qubo <https://github.com/tkqubo>
-//                 Simon Fridlund <https://github.com/zimme>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-export interface ErrorAction extends Action<Error> {
-    error: true;
-}
-
-export interface Action<T> {
-    type: string;
-    payload?: T;
-    error?: boolean;
-}
-
-/** Usage: `var action: Action<string> & AnyMeta;` */
-export interface AnyMeta {
-    meta?: any;
-}
-
-/** Usage: `var action: Action<string> & TypedMeta<string>;` */
-export interface TypedMeta<T> {
-    meta?: T;
-}
-
-export declare function isFSA(action: any): action is Action<any>;
-
-export declare function isError(action: any): action is ErrorAction;
diff --git a/types/flux-standard-action/tsconfig.json b/types/flux-standard-action/tsconfig.json
deleted file mode 100644
index 050e130d5a..0000000000
--- a/types/flux-standard-action/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "flux-standard-action-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/flux/lib/FluxContainer.d.ts b/types/flux/lib/FluxContainer.d.ts
index 4d49293fa6..e4cdadf555 100644
--- a/types/flux/lib/FluxContainer.d.ts
+++ b/types/flux/lib/FluxContainer.d.ts
@@ -9,29 +9,14 @@ import * as React from "react";
  * The component receives information from the stores via state. The state
  * is generated using a static `calculateState()` method that each container must implement.
  */
-/**
- * Default options to create a Container.
- *
- * @interface RealOptions
- */
+
+/** Default options to create a Container. */
 export interface RealOptions {
-    /**
-     * Default value: true
-     *
-     * @type {boolean}
-     */
+    /** @default true */
     pure?: boolean;
-    /**
-     * Default value: false
-     *
-     * @type {boolean}
-     */
+    /** @default false */
     withProps?: boolean;
-    /**
-     * Default value: false
-     *
-     * @type {boolean}
-     */
+    /** @default false */
     withContext?: boolean;
 }
 
diff --git a/types/fluxxor/package.json b/types/fluxxor/package.json
index 26741e77bf..5e33d02c41 100644
--- a/types/fluxxor/package.json
+++ b/types/fluxxor/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "eventemitter3": "^2.0.3"
     }
-}
\ No newline at end of file
+}
diff --git a/types/fluxxor/tslint.json b/types/fluxxor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fluxxor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fm-websync/index.d.ts b/types/fm-websync/index.d.ts
index ef5d51d64b..997c4666d1 100644
--- a/types/fm-websync/index.d.ts
+++ b/types/fm-websync/index.d.ts
@@ -469,8 +469,6 @@ declare namespace fm {
              * While this method will typically run asychronously, the WebSync client is designed to be used without (much) consideration for its asynchronous nature.
              * To that end, any calls to methods that require an active connection, like bind, subscribe and publish, will be queued automatically and executed once this
              * method has completed successfully.
-             *
-             * @param connectConfig
              */
             connect(config: connectConfig): client;
 
@@ -506,7 +504,6 @@ declare namespace fm {
              * Unsubscribes the client from receiving messages on one or more channels.
              * When the unsubscribe completes successfully, the callback specified by onSuccess will be invoked, passing in the unsubscribed channel(s),
              * including any modifications made on the server.
-             * @param config
              */
             unsubscribe(config: unsubscribeConfig): client;
         }
diff --git a/types/fontfaceobserver/index.d.ts b/types/fontfaceobserver/index.d.ts
index 8f461dbd4f..a10214a57d 100644
--- a/types/fontfaceobserver/index.d.ts
+++ b/types/fontfaceobserver/index.d.ts
@@ -25,7 +25,7 @@ declare class FontFaceObserver {
      * @param testString If your font doesn't contain latin characters you can pass a custom test string.
      * @param timeout The default timeout for giving up on font loading is 3 seconds. You can increase or decrease this by passing a number of milliseconds.
      */
-    load(testString?: string, timeout?: number): Promise<void>;
+    load(testString?: string | null, timeout?: number): Promise<void>;
 }
 
 declare module "fontfaceobserver" {
diff --git a/types/fontfaceobserver/tslint.json b/types/fontfaceobserver/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fontfaceobserver/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fontoxml/tslint.json b/types/fontoxml/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fontoxml/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/forge-di/tslint.json b/types/forge-di/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/forge-di/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/form-data/index.d.ts b/types/form-data/index.d.ts
index 9b102b287f..24e46b3bb8 100644
--- a/types/form-data/index.d.ts
+++ b/types/form-data/index.d.ts
@@ -4,6 +4,7 @@
 //                 Leon Yu <https://github.com/leonyu>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/form-data.d.ts
 
diff --git a/types/form-serializer/tslint.json b/types/form-serializer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/form-serializer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/form-urlencoded/form-urlencoded-tests.ts b/types/form-urlencoded/form-urlencoded-tests.ts
new file mode 100644
index 0000000000..34f598383e
--- /dev/null
+++ b/types/form-urlencoded/form-urlencoded-tests.ts
@@ -0,0 +1,10 @@
+import encode, { FormEncodedOptions } from "form-urlencoded";
+
+const opts: FormEncodedOptions = {
+    sorted: true,
+    skipIndex: false,
+    ignorenull: true
+};
+
+encode([1, 2, 3]);
+encode([1, 2, 3], opts);
diff --git a/types/form-urlencoded/index.d.ts b/types/form-urlencoded/index.d.ts
new file mode 100644
index 0000000000..d076b05227
--- /dev/null
+++ b/types/form-urlencoded/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for form-urlencoded 2.0
+// Project: https://github.com/iambumblehead/form-urlencoded#readme
+// Definitions by: Antoine Lépée <https://github.com/alepee>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface FormEncodedOptions {
+    sorted?: boolean;
+    skipIndex?: boolean;
+    ignorenull?: boolean;
+}
+
+export default function(data: any, opts?: FormEncodedOptions): string;
diff --git a/types/form-urlencoded/tsconfig.json b/types/form-urlencoded/tsconfig.json
new file mode 100644
index 0000000000..4eefbe0a12
--- /dev/null
+++ b/types/form-urlencoded/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "form-urlencoded-tests.ts"
+    ]
+}
diff --git a/types/form-urlencoded/tslint.json b/types/form-urlencoded/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/form-urlencoded/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/format-duration/format-duration-tests.ts b/types/format-duration/format-duration-tests.ts
new file mode 100644
index 0000000000..4a08b33119
--- /dev/null
+++ b/types/format-duration/format-duration-tests.ts
@@ -0,0 +1,5 @@
+import formatDuration  = require("format-duration");
+
+const milliseconds = 12345;
+
+const duration: string = formatDuration(milliseconds);
diff --git a/types/format-duration/index.d.ts b/types/format-duration/index.d.ts
new file mode 100644
index 0000000000..06682200b2
--- /dev/null
+++ b/types/format-duration/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for format-duration 1.0
+// Project: https://github.com/ungoldman/format-duration
+// Definitions by: Giles Roadnight <https://github.com/Roaders>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function formatDuration(ms: number): string;
+
+export = formatDuration;
diff --git a/types/format-duration/tsconfig.json b/types/format-duration/tsconfig.json
new file mode 100644
index 0000000000..f17a4f7c6c
--- /dev/null
+++ b/types/format-duration/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "format-duration-tests.ts"
+    ]
+}
diff --git a/types/format-duration/tslint.json b/types/format-duration/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/format-duration/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/format-io/format-io-tests.ts b/types/format-io/format-io-tests.ts
new file mode 100644
index 0000000000..bb551740d0
--- /dev/null
+++ b/types/format-io/format-io-tests.ts
@@ -0,0 +1,6 @@
+import * as format from 'format-io';
+
+format.addSlashToEnd('a/s/d'); // $ExpectType string
+format.size(1024 * 1024); // $ExpectType string
+format.permissions.symbolic('00777'); // $ExpectType string
+format.permissions.numeric('rwx rwx rwx'); // $ExpectType string
diff --git a/types/format-io/index.d.ts b/types/format-io/index.d.ts
new file mode 100644
index 0000000000..67e86188d6
--- /dev/null
+++ b/types/format-io/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for format-io 0.9
+// Project: http://github.com/coderaiser/format-io
+// Definitions by: Amit Beckenstein <https://github.com/amitbeck>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Appends a '/' to the end of the path unless it exists.
+ * @param path A path.
+ * @returns The path with a '/' appended to it.
+ */
+export function addSlashToEnd(path: string): string;
+
+/**
+ * Returns a short string representing the size of bytes in unit symbols up to petabytes.
+ * @param size Size in bytes.
+ * @returns A string representing the size in the matching unit symbol.
+ */
+export function size(size: number): string;
+
+/**
+ * Contains functions to format permissions.
+ */
+export namespace permissions {
+    /**
+     * Converts Unix-like permissions from numeric to symbolic notation.
+     * @param perm A string of Unix-like permission in numeric notation.
+     * @returns A representation of the permissions in symbolic notation.
+     */
+    function symbolic(perm: string): string;
+
+    /**
+     * Converts Unix-like permissions from symbolic to numeric notation.
+     * @param perm A string of Unix-like permission in symbolic notation.
+     * @returns A representation of the permissions in numeric notation.
+     */
+    function numeric(perm: string): string;
+}
diff --git a/types/format-io/tsconfig.json b/types/format-io/tsconfig.json
new file mode 100644
index 0000000000..29333d35cf
--- /dev/null
+++ b/types/format-io/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "format-io-tests.ts"
+    ]
+}
diff --git a/types/format-io/tslint.json b/types/format-io/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/format-io/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/formidable/formidable-tests.ts b/types/formidable/formidable-tests.ts
index abc6485cfb..2b964702c5 100644
--- a/types/formidable/formidable-tests.ts
+++ b/types/formidable/formidable-tests.ts
@@ -11,6 +11,9 @@ http.createServer((req, res) => {
     form.parse(req, (err, fields, files) => {
       res.writeHead(200, {'content-type': 'text/plain'});
       res.write('received upload:\n\n');
+
+      let array = fields['an-array'] as Array<string>;
+
       res.end(util.inspect({fields: fields, files: files}));
     });
 
diff --git a/types/formidable/index.d.ts b/types/formidable/index.d.ts
index d22fa259a2..8163fa5894 100644
--- a/types/formidable/index.d.ts
+++ b/types/formidable/index.d.ts
@@ -29,7 +29,7 @@ export declare class IncomingForm extends events.EventEmitter {
 }
 
 export interface Fields {
-    [key: string]: string;
+    [key: string]: string|Array<string>;
 }
 
 export interface Files {
diff --git a/types/formidable/tslint.json b/types/formidable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/formidable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fossil-delta/index.d.ts b/types/fossil-delta/index.d.ts
index 98ab4cc600..3b79af9cc4 100644
--- a/types/fossil-delta/index.d.ts
+++ b/types/fossil-delta/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for fossil-delta 0.2.5
+// Type definitions for fossil-delta 1.0.0
 // Project: https://github.com/dchest/fossil-delta-js
 // Definitions by: Endel Dreyer <https://github.com/endel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,5 +8,5 @@
 type ByteArray = Array<number> | Uint8Array | Buffer;
 
 export function create(origin: ByteArray, target: ByteArray): Array<number>;
-export function apply(origin: ByteArray, delta: Array<number>): Array<number>;
+export function apply(origin: ByteArray, delta: Array<number>, ops?: { verifyChecksum: boolean }): Array<number>;
 export function outputSize(delta: Array<number>): number;
diff --git a/types/fossil-delta/tslint.json b/types/fossil-delta/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fossil-delta/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/foundation-sites/foundation-sites-tests.ts b/types/foundation-sites/foundation-sites-tests.ts
deleted file mode 100644
index 574f2b7b76..0000000000
--- a/types/foundation-sites/foundation-sites-tests.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-$(document).foundation();
-$(document).foundation('method5');
-$(document).foundation('method', 'method2');
-
-Foundation.Abide($('.selector'));
-Foundation.Abide($('.selector'), {});
-
-Foundation.Accordion($('.selector'));
-Foundation.Accordion($('.selector'), {});
-
-Foundation.AccordionMenu($('.selector'));
-Foundation.AccordionMenu($('.selector'), {});
-
-Foundation.DrillDown($('.selector'));
-Foundation.DrillDown($('.selector'), {});
-
-Foundation.Dropdown($('.selector'));
-Foundation.Dropdown($('.selector'), {});
-
-Foundation.DropdownMenu($('.selector'));
-Foundation.DropdownMenu($('.selector'), {});
-
-Foundation.Equalizer($('.selector'));
-Foundation.Equalizer($('.selector'), {});
-
-Foundation.Interchange($('.selector'));
-Foundation.Interchange($('.selector'), {});
-
-Foundation.Magellan($('.selector'));
-Foundation.Magellan($('.selector'), {});
-
-Foundation.OffCanvas($('.selector'));
-Foundation.OffCanvas($('.selector'), {});
-
-Foundation.Orbit($('.selector'));
-Foundation.Orbit($('.selector'), {});
-
-Foundation.Reveal($('.selector'));
-Foundation.Reveal($('.selector'), {});
-
-Foundation.Slider($('.selector'));
-Foundation.Slider($('.selector'), {});
-
-Foundation.Sticky($('.selector'));
-Foundation.Sticky($('.selector'), {});
-
-Foundation.Tabs($('.selector'));
-Foundation.Tabs($('.selector'), {});
-
-Foundation.Toggler($('.selector'));
-Foundation.Toggler($('.selector'), {});
-
-Foundation.Tooltip($('.selector'));
-Foundation.Tooltip($('.selector'), {});
-
-/*
- TODO: fix this:
- error TS7017: Index signature of object type implicitly has an 'any' type.
-
- function pluginList() {
-
- 'use strict';
-
- return [
- 'Abide',
- 'Accordion',
- 'AccordionMenu',
- 'DrillDown',
- 'Dropdown',
- 'DropdownMenu',
- 'Equalizer',
- 'Interchange',
- 'Magellan',
- 'OffCanvas',
- 'Orbit',
- 'Reveal',
- 'Slider',
- 'Sticky',
- 'Tabs',
- 'Toggler',
- 'Tooltip'
- ];
- }
-
- pluginList().forEach((value:string) => {
- Foundation[value]($('.selector'));
- Foundation[value]($('.selector'), {});
- });
- */
-
-
diff --git a/types/foundation-sites/index.d.ts b/types/foundation-sites/index.d.ts
deleted file mode 100644
index e9f42f6db5..0000000000
--- a/types/foundation-sites/index.d.ts
+++ /dev/null
@@ -1,457 +0,0 @@
-// Type definitions for Foundation Sites v6.1.1
-// Project: http://foundation.zurb.com/
-// Definitions by: Sam Vloeberghs <https://github.com/samvloeberghs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-// please also see the typings project and prefer to use it!
-// typings project: https://github.com/typings/typings
-// typings: https://github.com/samvloeberghs/foundation-sites-typings
-
-/// <reference types="jquery"/>
-
-declare namespace FoundationSites {
-
-    // http://foundation.zurb.com/sites/docs/abide.html#javascript-reference
-    interface Abide {
-        requiredChecked(element:Object): boolean;
-        findFormError($el:Object): Object;
-        findLabel(element:Object): boolean;
-        addErrorClasses(element:Object): void;
-        removeErrorClasses(element:Object): void;
-        validateInput(element:Object, form:Object): void;
-        validateForm(element:Object): void;
-        validateText(element:Object): boolean;
-        validateRadio(group:string): boolean;
-        matchValidation($el:Object, validators:string, required:boolean): boolean;
-        resetForm($form:Object): void;
-        destroy(): void;
-    }
-
-    interface IAbidePatterns {
-        alpha?: RegExp;
-        alpha_numeric?: RegExp;
-        integer?: RegExp;
-        number?: RegExp;
-        card?: RegExp;
-        cvv?: RegExp;
-        email ?: RegExp;
-        url?: RegExp;
-        domain?: RegExp;
-        datetime?: RegExp;
-        date?: RegExp;
-        time?: RegExp;
-        dateISO?: RegExp;
-        month_day_year?: RegExp;
-        day_month_year?: RegExp;
-        color?: RegExp;
-    }
-
-    interface IAbideOptions {
-        validateOn?: string;
-        labelErrorClass?: string;
-        inputErrorClass?: string;
-        formErrorSelector?: string;
-        formErrorClass?: string;
-        liveValidate?: boolean;
-        validators?:any;
-    }
-
-    // http://foundation.zurb.com/sites/docs/accordion.html#javascript-reference
-    interface Accordion {
-        toggle($target:JQuery): void;
-        down($target:JQuery, firstTime:boolean): void;
-        up($target:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IAccordionOptions {
-        slideSpeed?: number
-        multiOpen?: boolean;
-        allowAllClosed?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/accordion-menu.html#javascript-reference
-    interface AccordionMenu {
-        hideAll(): void;
-        toggle($target:JQuery): void;
-        down($target:JQuery, firstTime:boolean): void;
-        up($target:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IAccordionMenuOptions {
-        slideSpeed?: number;
-        multiOpen?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/drilldown-menu.html#javascript-reference
-    interface Drilldown {
-        _hideAll(): void;
-        _back($elem:JQuery): void;
-        _show($elem:JQuery): void;
-        _hide($elem:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IDrilldownOptions {
-        backButton?: string;
-        wrapper?: string
-        closeOnClick?: boolean
-    }
-
-    // http://foundation.zurb.com/sites/docs/dropdown.html#javascript-reference
-    interface Dropdown {
-        getPositionClass(): string;
-        open(): void;
-        close(): void;
-        toggle(): void;
-        destroy(): void;
-    }
-
-    interface IDropdownOptions {
-        hoverDelay?: number;
-        hover?: boolean;
-        hoverPane?: boolean;
-        vOffset?: number;
-        hOffset?: number;
-        positionClass?: string;
-        trapFocus?: boolean;
-        autoFocus?: boolean;
-        closeOnClick?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/dropdown-menu.html#javascript-reference
-    interface DropdownMenu {
-        destroy(): void;
-    }
-
-    interface IDropdownMenuOptions {
-        disableHover?: boolean;
-        autoclose?: boolean;
-        hoverDelay?: number;
-        clickOpen?: boolean;
-        closingTime?: number;
-        alignment?: string;
-        closeOnClick?:boolean;
-        verticalClass?: string;
-        rightClass?: string;
-        forceFollow?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/equalizer.html#javascript-reference
-    interface Equalizer {
-        getHeights(element:Object): Array<any>;
-        getHeightsByRow(cb:Function): void;
-        applyHeight(heights:Array<any>): void;
-        applyHeightByRow(groups:Array<any>):void;
-        destroy(): void;
-    }
-
-    interface IEqualizerOptions {
-        equalizeOnStack?: boolean;
-        equalizeByRow?: boolean;
-        equalizeOn?:string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/interchange.html#javascript-reference
-    interface Interchange {
-        replace(path:string): void;
-        destroy(): void;
-    }
-
-    interface IInterchangeOptions {
-        rules?: Array<any>
-    }
-
-    // http://foundation.zurb.com/sites/docs/magellan.html#javascript-reference
-    interface Magellan {
-        calcPoints(): void;
-        reflow(): void;
-        destroy(): void;
-    }
-
-    interface IMagellanOptions {
-        animationDuration?: number;
-        animationEasing?: string;
-        threshold?: number;
-        activeClass?: string;
-        deepLinking?: boolean;
-        barOffset?: number;
-    }
-
-    // http://foundation.zurb.com/sites/docs/offcanvas.html#javascript-reference
-    interface OffCanvas {
-        reveal(isRevealed:boolean): void;
-        open(event:Object, trigger:JQuery): void;
-        close(): void;
-        toggle(event:Object, trigger:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IOffCanvasOptions {
-        closeOnClick?: boolean;
-        transitionTime?: number;
-        position?: string;
-        forceTop?: boolean;
-        isRevealed?: boolean;
-        revealOn?: string;
-        autoFocus?: boolean;
-        revealClass?: string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/orbit.html#javascript-reference
-    interface Orbit {
-        geoSync(): void;
-        changeSlide(isLTR:boolean, chosenSlide?:Object, idx?:number): void;
-        destroy(): void;
-    }
-
-    interface IOrbitOptions {
-        bullets?: boolean;
-        navButtons?: boolean;
-        animInFromRight?: string;
-        animOutToRight?: string;
-        animInFromLeft?: string;
-        animOutToLeft?: string;
-        autoPlay?: boolean;
-        timerDelay?: number;
-        infiniteWrap?: boolean;
-        swipe?: boolean;
-        pauseOnHover?: boolean;
-        accessible?: boolean;
-        containerClass?: string;
-        slideClass?: string;
-        boxOfBullets?: string;
-        nextClass?: string;
-        prevClass?: string;
-        useMUI?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/reveal.html#javascript-reference
-    interface Reveal {
-        open(): void;
-        toggle(): void;
-        close(): void;
-        destroy(): void;
-    }
-
-    interface IRevealOptions {
-        animationIn?: string;
-        animationOut?: string;
-        showDelay?: number;
-        hideDelay?: number;
-        closeOnClick?: boolean;
-        closeOnEsc?: boolean;
-        multipleOpened?: boolean;
-        vOffset?: number;
-        hOffset?: number;
-        fullScreen?: boolean;
-        btmOffsetPct?: number;
-        overlay?: boolean;
-        resetOnClose?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/slider.html#javascript-reference
-    interface Slider {
-        destroy(): void;
-    }
-
-    interface ISliderOptions {
-        start?: number;
-        end?: number;
-        step?: number;
-        initialStart ?: number;
-        initialEnd?: number;
-        binding?: boolean;
-        clickSelect?: boolean;
-        vertical?: boolean;
-        draggable?: boolean;
-        disabled?: boolean;
-        doubleSided?: boolean;
-        decimal?: number;
-        moveTime?: number;
-        disabledClass?: string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/sticky.html#javascript-reference
-    interface Sticky {
-        _pauseListeners(scrollListener:string): void;
-        _calc(checkSizes:boolean, scroll:number): void;
-        destroy(): void;
-        emCalc(Number:number): void;
-    }
-
-    interface IStickyOptions {
-        container?: string;
-        stickTo?: string;
-        anchor?: string;
-        topAnchor?: string;
-        btmAnchor?: string;
-        marginTop?: number;
-        marginBottom?: number;
-        stickyOn?: string;
-        stickyClass?: string;
-        containerClass?: string;
-        checkEvery?: number;
-    }
-
-    // http://foundation.zurb.com/sites/docs/tabs.html#javascript-reference
-    interface Tabs {
-        _handleTabChange($target:JQuery): void;
-        selectTab($target:JQuery): void;
-        destroy(): void;
-    }
-
-    interface ITabsOptions {
-        autoFocus?: boolean;
-        wrapOnKeys?: boolean;
-        matchHeight?: boolean;
-        linkClass?: string;
-        panelClass?: string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/toggler.html#javascript-reference
-    interface Toggler {
-        toggle(): void;
-        destroy(): void;
-    }
-
-    interface ITogglerOptions {
-        animate?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/tooltip.html#javascript-reference
-    interface Tooltip {
-        show(): void;
-        hide(): void;
-        toggle(): void;
-        destroy(): void;
-    }
-
-    interface ITooltipOptions {
-        hoverDelay?: number;
-        fadeInDuration?: number;
-        fadeOutDuration?: number;
-        disableHover?: boolean;
-        templateClasses?: string;
-        tooltipClass?: string;
-        triggerClass?: string;
-        showOn?: string;
-        template?: string;
-        tipText?: string;
-        clickOpen?: boolean;
-        positionClass?: string;
-        vOffset?: number;
-        hOffset?:number;
-    }
-
-    // Utilities
-    // ---------
-
-    interface Box {
-        ImNotTouchingYou(element:Object, parent?:Object, lrOnly?:boolean, tbOnly?:boolean): boolean;
-        GetDimensions(element:Object): Object;
-        GetOffsets(element:Object, anchor:Object, position:string, vOffset:number, hOffset:number, isOverflow:boolean): Object;
-    }
-
-    interface KeyBoard {
-        parseKey(event:any): string;
-        handleKey(event:any, component:any, functions:any):void;
-        findFocusable($element:Object): Object;
-    }
-
-    interface MediaQuery {
-        get(size:string): string;
-        atLeast(size:string): boolean;
-        queries:Array<string>;
-        current:string;
-    }
-
-    interface Motion {
-        animateIn(element:Object, animation:any, cb:Function): void;
-        animateOut(element:Object, animation:any, cb:Function): void;
-    }
-
-    interface Move {
-        // TODO
-    }
-
-    interface Nest {
-        Feather(menu:any, type:any):void;
-        Burn(menu:any, type:any):void;
-    }
-
-    interface Timer {
-        start(): void;
-        restart(): void;
-        pause(): void;
-    }
-
-    interface Touch {
-        // TODO :extension on jQuery
-    }
-
-    interface Triggers {
-        // TODO :extension on jQuery
-    }
-
-    interface FoundationSitesStatic {
-        version : string;
-
-        rtl(): boolean;
-        plugin(plugin:Object, name:string): void;
-        registerPlugin(plugin:Object): void;
-        unregisterPlugin(plugin:Object): void;
-        reInit(plugins:Array<any>):void;
-        GetYoDigits(length:number, namespace?:string): string;
-        reflow(elem:Object, plugins?:Array<string>|string): void;
-        getFnName(fn:string): string;
-        transitionend(): string;
-
-        util : {
-            throttle(func:(...args:any[]) => any, delay:number): (...args:any[]) => any;
-        };
-
-        Abide(element:Object, options?:IAbideOptions): Abide;
-        Accordion(element:Object, options?:IAccordionOptions): Accordion;
-        AccordionMenu(element:Object, options?:IAccordionMenuOptions): AccordionMenu;
-        DrillDown(element:Object, options?:IDrilldownOptions): Drilldown;
-        Dropdown(element:Object, options?:IDropdownOptions): Dropdown;
-        DropdownMenu(element:Object, options?:IDropdownMenuOptions): DropdownMenu;
-        Equalizer(element:Object, options?:IEqualizerOptions): Equalizer;
-        Interchange(element:Object, options?:IInterchangeOptions): Interchange;
-        Magellan(element:Object, options?:IMagellanOptions): Magellan;
-        OffCanvas(element:Object, options?:IOffCanvasOptions): OffCanvas;
-        Orbit(element:Object, options?:IOrbitOptions): Orbit;
-        Reveal(element:Object, options?:IRevealOptions): Reveal;
-        Slider(element:Object, options?:ISliderOptions): Slider;
-        Sticky(element:Object, options?:IStickyOptions): Sticky;
-        Tabs(element:Object, options?:ITabsOptions): Tabs;
-        Toggler(element:Object, options?:ITogglerOptions): Toggler;
-        Tooltip(element:Object, options?:ITooltipOptions): Tooltip;
-
-        // utils
-        Box: Box;
-        KeyBoard: KeyBoard;
-        MediaQuery: MediaQuery;
-        Motion: Motion;
-        Move: Move;
-        Nest: Nest;
-        Timer: Timer;
-        Touch: Touch;
-        Triggers: Triggers;
-
-    }
-
-}
-
-interface JQuery {
-    foundation(method?: string, ...args: any[]): JQuery;
-}
-
-declare var Foundation:FoundationSites.FoundationSitesStatic;
-
-declare module "foundation-sites" {
-    export = Foundation;
-}
diff --git a/types/foundation-sites/tsconfig.json b/types/foundation-sites/tsconfig.json
deleted file mode 100644
index 301e0bc66b..0000000000
--- a/types/foundation-sites/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "foundation-sites-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/foundation/tslint.json b/types/foundation/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/foundation/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fpsmeter/tslint.json b/types/fpsmeter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fpsmeter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/framebus/framebus-tests.ts b/types/framebus/framebus-tests.ts
index e37186d168..571f9488b1 100644
--- a/types/framebus/framebus-tests.ts
+++ b/types/framebus/framebus-tests.ts
@@ -1,6 +1,7 @@
 import * as framebus from "framebus";
 
-const popup = window.open('https://example.com');
+// tslint:disable-next-line no-unnecessary-type-assertion (in older TS versions `window.open` is not nullable)
+const popup = window.open('https://example.com')!;
 framebus.include(popup);
 framebus.emit('hello popup and friends!');
 
diff --git a/types/framebus/index.d.ts b/types/framebus/index.d.ts
index 25286a495b..4879dfceef 100644
--- a/types/framebus/index.d.ts
+++ b/types/framebus/index.d.ts
@@ -21,19 +21,16 @@ export interface FrameBus {
     unsub(event: string, fn: (...args: any[]) => any): boolean;
     off(event: string, fn: (...args: any[]) => any): boolean;
 }
-/*~ If this module has methods, declare them as functions like so.
- */
+
 /**
  * let popup = window.open('https://example.com');
  * framebus.include(popup);
  * framebus.emit('hello popup and friends!');
- * @param popup
  */
 export function include(popup: Window): boolean;
 /**
  * framebus.target('https://example.com').on('my cool event', function () {});
  * // will ignore all incoming 'my cool event' NOT from 'https://example.com'
- * @param origin {string}
  */
 export function target(origin: string): FrameBus;
 
@@ -42,64 +39,64 @@ export function target(origin: string): FrameBus;
  *    console.log('Got back %s as a reply!', data)
  * }
  * framebus.publish('Marco!', callback, 'http://listener.example.com');
- * @param event {string} The name of the event
- * @param args  {...any[]} The data to give to subscribers
- * // @param last{callback(data)} Give subscribers a function for easy, direct replies
+ * @param event The name of the event
+ * @param args The data to give to subscribers
+ * @param last Give subscribers a function for easy, direct replies
  */
 export function publish(event: string, ...args: any[]/* fn:  callback(data:)*/): boolean;
 
 /**
  * publish = pub = trigger = emit
  * framebus.publish('Marco!', callback, 'http://listener.example.com');
- * @param event {string} The name of the event
- * @param args  {...any[]} The data to give to subscribers
- * // @param last{callback(data)} Give subscribers a function for easy, direct replies
+ * @param event The name of the event
+ * @param args  The data to give to subscribers
+ * @param last Give subscribers a function for easy, direct replies
  */
 export function pub(event: string, ...args: any[]): boolean;
 /**
  * publish = pub = trigger = emit
- * @param event {string} The name of the event
- * @param args  {...any[]} The data to give to subscribers
- * // @param last{callback(data)} Give subscribers a function for easy, direct replies
+ * @param event The name of the event
+ * @param args  The data to give to subscribers
+ * @param last Give subscribers a function for easy, direct replies
  */
 export function trigger(event: string, ...args: any[]): boolean;
 /**
  * publish = pub = trigger = emit
- * @param event {string} The name of the event
- * @param args  {...any[]} The data to give to subscribers
- * // @param last{callback(data)} Give subscribers a function for easy, direct replies
+ * @param event The name of the event
+ * @param args  The data to give to subscribers
+ * @param last Give subscribers a function for easy, direct replies
  */
 export function emit(event: string, ...args: any[]): boolean;
 /**
  * **this** scope is the MessageEvent object from the underlying postMessage
- * @param event {string} The name of the event
- * @param fn  {Callback} ([arg...] [, callback]) Event handler. Arguments are from the publish invocation
+ * @param event The name of the event
+ * @param fn  ([arg...] [, callback]) Event handler. Arguments are from the publish invocation
  */
 export function subscribe(event: string, fn: (...args: any[]) => any): boolean;
 /**
  * **this** scope is the MessageEvent object from the underlying postMessage
- * @param event {string} The name of the event
- * @param fn  {Callback} ([arg...] [, callback]) Event handler. Arguments are from the publish invocation
+ * @param event The name of the event
+ * @param fn  ([arg...] [, callback]) Event handler. Arguments are from the publish invocation
  */
 export function sub(event: string, fn: (...args: any[]) => any): boolean;
 /**
  * **this** scope is the MessageEvent object from the underlying postMessage
- * @param event {string} The name of the event
- * @param fn  {Callback} ([arg...] [, callback]) Event handler. Arguments are from the publish invocation
+ * @param event The name of the event
+ * @param fn  ([arg...] [, callback]) Event handler. Arguments are from the publish invocation
  */
 export function on(event: string, fn: (...args: any[]) => any): boolean;
 /**
- * @param event {string} The name of the event
- * @param fn {Callback} The function that was subscribed
+ * @param event The name of the event
+ * @param fn The function that was subscribed
  */
 export function unsubscribe(event: string, fn: (...args: any[]) => any): boolean;
 /**
- * @param event {string} The name of the event
- * @param fn {Callback} The function that was subscribed
+ * @param event The name of the event
+ * @param fn The function that was subscribed
  */
 export function unsub(event: string, fn: (...args: any[]) => any): boolean;
 /**
- * @param event {string} The name of the event
- * @param fn {Callback} The function that was subscribed
+ * @param event The name of the event
+ * @param fn The function that was subscribed
  */
 export function off(event: string, fn: (...args: any[]) => any): boolean;
diff --git a/types/freedom/tslint.json b/types/freedom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/freedom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/frisby/tslint.json b/types/frisby/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/frisby/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/from/tslint.json b/types/from/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/from/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fromjs/tslint.json b/types/fromjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fromjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fromnow/tslint.json b/types/fromnow/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fromnow/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fs-cson/fs-cson-tests.ts b/types/fs-cson/fs-cson-tests.ts
new file mode 100644
index 0000000000..1d23580cad
--- /dev/null
+++ b/types/fs-cson/fs-cson-tests.ts
@@ -0,0 +1,39 @@
+import * as fsCson from 'fs-cson';
+
+fsCson.register();
+
+fsCson.readFile('sample.cson', (err, data) => {
+  if (!err) {
+    console.log(data);
+  }
+});
+
+const data = fsCson.readFileSync('sample.cson');
+
+function updater(data: any) {
+  const result: any = {};
+  for (const key in data) {
+    const value = data[key];
+    result[key] = value * 2;
+  }
+  result.c = 6;
+  return result;
+}
+
+fsCson.updateFile('sample.cson', updater, (err) => {
+  if (err) console.error(err);
+});
+
+fsCson.updateFileSync('sample.cson', updater);
+
+fsCson.writeFile('sample.cson', { a: 1, b: 2 }, (err) => {
+  if (err) console.error(err);
+});
+
+fsCson.writeFileSync('sample.cson', { a: 1, b: 2 });
+
+fsCson.writeFileSafe('sample.cson', { a: 1, b: 2 }, (err) => {
+  if (err) console.error(err);
+});
+
+fsCson.writeFileSafeSync('sample.cson', { a: 1, b: 2 });
diff --git a/types/fs-cson/index.d.ts b/types/fs-cson/index.d.ts
new file mode 100644
index 0000000000..86d37c0634
--- /dev/null
+++ b/types/fs-cson/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for fs-cson 0.3
+// Project: https://github.com/charlierudolph/fs-cson
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export function readFile(filePath: string, done: (err: Error | null, result: any) => void): void;
+export function readFileSync(filePath: string): any;
+export function register(): void;
+export function updateFile(filePath: string, updater: (data: any) => any, done: (err: NodeJS.ErrnoException) => void): void;
+export function updateFileSync(filePath: string, updater: (data: any) => any): void;
+export function writeFile(filePath: string, data: any, done: (err: NodeJS.ErrnoException) => void): void;
+export function writeFileSync(filePath: string, data: any): void;
+export function writeFileSafe(filePath: string, data: any, done: (err: NodeJS.ErrnoException) => void): void;
+export function writeFileSafeSync(filePath: string, data: any): void;
diff --git a/types/fs-cson/tsconfig.json b/types/fs-cson/tsconfig.json
new file mode 100644
index 0000000000..fcd9242b1d
--- /dev/null
+++ b/types/fs-cson/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-cson-tests.ts"
+    ]
+}
diff --git a/types/fs-cson/tslint.json b/types/fs-cson/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fs-cson/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fs-ext/tslint.json b/types/fs-ext/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fs-ext/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fs-extra-promise-es6/index.d.ts b/types/fs-extra-promise-es6/index.d.ts
index f5847dd6f0..0f52b5c02e 100644
--- a/types/fs-extra-promise-es6/index.d.ts
+++ b/types/fs-extra-promise-es6/index.d.ts
@@ -117,64 +117,15 @@ export function write(fd: number, buffer: NodeBuffer, offset: number, length: nu
 export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
 export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
 export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-/**
- * readFile
- * @param filename
- * @param options
- *          string: encoding
- *          OpenOptions: options
- * @param callback
- */
 export function readFile(filename: string, options: OpenOptions | string, callback: (err: Error, data: string) => void): void;
 export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
 export function readFileSync(filename: string): NodeBuffer;
-/**
- * readFileSync
- * @param filename
- * @param options
- *          string: encoding
- *          OpenOptions: options
- */
 export function readFileSync(filename: string, options: OpenOptions | string): string;
-/**
- * writeFile
- * @param filename
- * @param data
- * @param options
- *          string: encoding
- *          OpenOptions: options
- * @param callback
- */
 export function writeFile(filename: string, data: any, callback?: (err: Error) => void): void;
 export function writeFile(filename: string, data: any, options: OpenOptions | string, callback?: (err: Error) => void): void;
-/**
- * writeFileSync
- * @param filename
- * @param data
- * @param option
- *          string: encoding
- *          OpenOptions: options
- */
 export function writeFileSync(filename: string, data: any, option?: OpenOptions | string): void;
-/**
- * appendFile
- * @param filename
- * @param data
- * @param option:
- *          string: encoding
- *          OpenOptions: options
- * @param callback
- */
 export function appendFile(filename: string, data: any, callback?: (err: Error) => void): void;
 export function appendFile(filename: string, data: any, option: OpenOptions | string, callback?: (err: Error) => void): void;
-/**
- * appendFileSync
- * @param filename
- * @param data
- * @param option
- *          string: encoding
- *          OpenOptions: options
- */
 export function appendFileSync(filename: string, data: any, option?: OpenOptions | string): void;
 export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
 export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
@@ -252,32 +203,9 @@ export function futimesAsync(fd: number, atime: number, mtime: number): Promise<
 export function fsyncAsync(fd: number): Promise<void>;
 export function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
 export function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-/**
- * readFileAsync
- * @param filename
- * @param options:
- *          string: encoding
- *          OpenOptions: options
- */
 export function readFileAsync(filename: string, options: OpenOptions | string): Promise<string>;
 export function readFileAsync(filename: string): Promise<NodeBuffer>;
-/**
- * writeFileAsync
- * @param filename
- * @param data
- * @param options:
- *          string: encoding
- *          OpenOptions: options
- */
 export function writeFileAsync(filename: string, data: any, options?: OpenOptions | string): Promise<void>;
-/**
- * appendFileAsync
- * @param filename
- * @param data
- * @param option:
- *          string: encoding
- *          OpenOptions: option
- */
 export function appendFileAsync(filename: string, data: any, option?: OpenOptions | string): Promise<void>;
 
 export function existsAsync(path: string): Promise<boolean>;
diff --git a/types/fs-extra-promise/index.d.ts b/types/fs-extra-promise/index.d.ts
index 9d174f791f..de47c81a1e 100644
--- a/types/fs-extra-promise/index.d.ts
+++ b/types/fs-extra-promise/index.d.ts
@@ -19,14 +19,6 @@ export interface MkdirOptions {
 }
 
 // promisified versions
-/**
- * copyAsync
- * @param src
- * @param dest
- * @param options
- *              CopyFilter: filter
- *              CopyOptions: options
- */
 export function copyAsync(src: string, dest: string, options?: CopyFilter | CopyOptions): Promise<void>;
 
 export function createFileAsync(file: string): Promise<void>;
@@ -75,32 +67,9 @@ export function futimesAsync(fd: number, atime: number, mtime: number): Promise<
 export function fsyncAsync(fd: number): Promise<void>;
 export function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
 export function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-/**
- * readFileAsync
- * @param filename
- * @param options:
- *              string: encoding
- *              ReadOptions: options
- */
 export function readFileAsync(filename: string, options: string | ReadOptions): Promise<string>;
 export function readFileAsync(filename: string): Promise<NodeBuffer>;
-/**
- * writeFileAsync
- * @param filename
- * @param data
- * @param options:
- *              string: encoding
- *              WriteOptions: options
- */
 export function writeFileAsync(filename: string, data: any, options?: string | WriteOptions): Promise<void>;
-/**
- * appendFileAsync
- * @param filename
- * @param data
- * @param options:
- *              string: encoding
- *              WriteOptions: options
- */
 export function appendFileAsync(filename: string, data: any, option?: string | WriteOptions): Promise<void>;
 
 export function existsAsync(path: string): Promise<boolean>;
diff --git a/types/fs-extra-promise/tsconfig.json b/types/fs-extra-promise/tsconfig.json
index e0f6cc3450..4a4fc0f60b 100644
--- a/types/fs-extra-promise/tsconfig.json
+++ b/types/fs-extra-promise/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "fs-extra": [
+                "fs-extra/v4"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/fs-extra/fs-extra-tests.ts b/types/fs-extra/fs-extra-tests.ts
index f405486adb..50d594e1a4 100644
--- a/types/fs-extra/fs-extra-tests.ts
+++ b/types/fs-extra/fs-extra-tests.ts
@@ -14,7 +14,7 @@ const fd = 0;
 const modeNum = 0;
 const modeStr = "";
 const object = {};
-const errorCallback = (err: Error | null) => { };
+const errorCallback = (err: Error) => { };
 const readOptions: fs.ReadOptions = {
 	reviver: {}
 };
@@ -52,17 +52,9 @@ fs.copy(src, dest,
 	},
 	errorCallback
 );
-fs.copy(src, dest,
-	{
-		overwrite: true,
-		preserveTimestamps: true,
-		filter: /.*/
-	},
-	errorCallback
-);
+
 fs.copySync(src, dest);
 fs.copySync(src, dest, { filter: (src: string, dest: string) => false });
-fs.copySync(src, dest, { filter: /.*/ });
 fs.copySync(src, dest,
 	{
 		overwrite: true,
@@ -70,13 +62,7 @@ fs.copySync(src, dest,
 		filter: (src: string, dest: string) => false
 	}
 );
-fs.copySync(src, dest,
-	{
-		overwrite: true,
-		preserveTimestamps: true,
-		filter: /.*/
-	}
-);
+
 fs.createFile(file).then(() => {
 	// stub
 });
diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts
index 60c112c68b..f556afa82f 100644
--- a/types/fs-extra/index.d.ts
+++ b/types/fs-extra/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for fs-extra 4.0
+// Type definitions for fs-extra 5.0
 // Project: https://github.com/jprichardson/node-fs-extra
 // Definitions by: Alan Agius <https://github.com/alan-agius4>,
 //                 midknight41 <https://github.com/midknight41>,
@@ -14,242 +14,236 @@ import { Stats } from "fs";
 export * from "fs";
 
 export function copy(src: string, dest: string, options?: CopyOptions): Promise<void>;
-export function copy(src: string, dest: string, callback: (err: Error | null) => void): void;
-export function copy(src: string, dest: string, options: CopyOptions, callback: (err: Error | null) => void): void;
+export function copy(src: string, dest: string, callback: (err: Error) => void): void;
+export function copy(src: string, dest: string, options: CopyOptions, callback: (err: Error) => void): void;
 export function copySync(src: string, dest: string, options?: CopyOptions): void;
 
 export function move(src: string, dest: string, options?: MoveOptions): Promise<void>;
-export function move(src: string, dest: string, callback: (err: Error | null) => void): void;
-export function move(src: string, dest: string, options: MoveOptions, callback: (err: Error | null) => void): void;
+export function move(src: string, dest: string, callback: (err: Error) => void): void;
+export function move(src: string, dest: string, options: MoveOptions, callback: (err: Error) => void): void;
 export function moveSync(src: string, dest: string, options?: MoveOptions): void;
 
 export function createFile(file: string): Promise<void>;
-export function createFile(file: string, callback: (err: Error | null) => void): void;
+export function createFile(file: string, callback: (err: Error) => void): void;
 export function createFileSync(file: string): void;
 
 export function ensureDir(path: string): Promise<void>;
-export function ensureDir(path: string, callback: (err: Error | null) => void): void;
+export function ensureDir(path: string, callback: (err: Error) => void): void;
 export function ensureDirSync(path: string): void;
 
 export function mkdirs(dir: string): Promise<void>;
-export function mkdirs(dir: string, callback: (err: Error | null) => void): void;
+export function mkdirs(dir: string, callback: (err: Error) => void): void;
 export function mkdirp(dir: string): Promise<void>;
-export function mkdirp(dir: string, callback: (err: Error | null) => void): void;
+export function mkdirp(dir: string, callback: (err: Error) => void): void;
 export function mkdirsSync(dir: string): void;
 export function mkdirpSync(dir: string): void;
 
-export function outputFile(file: string, data: any): Promise<void>;
-export function outputFile(file: string, data: any, callback: (err: Error | null) => void): void;
-export function outputFileSync(file: string, data: any): void;
+export function outputFile(file: string, data: any, options?: WriteFileOptions | string): Promise<void>;
+export function outputFile(file: string, data: any, callback: (err: Error) => void): void;
+export function outputFile(file: string, data: any, options: WriteFileOptions | string, callback: (err: Error) => void): void;
+export function outputFileSync(file: string, data: any, options?: WriteFileOptions | string): void;
 
 export function readJson(file: string, options?: ReadOptions): Promise<any>;
-export function readJson(file: string, callback: (err: Error | null, jsonObject: any) => void): void;
-export function readJson(file: string, options: ReadOptions, callback: (err: Error | null, jsonObject: any) => void): void;
+export function readJson(file: string, callback: (err: Error, jsonObject: any) => void): void;
+export function readJson(file: string, options: ReadOptions, callback: (err: Error, jsonObject: any) => void): void;
 export function readJSON(file: string, options?: ReadOptions): Promise<any>;
-export function readJSON(file: string, callback: (err: Error | null, jsonObject: any) => void): void;
-export function readJSON(file: string, options: ReadOptions, callback: (err: Error | null, jsonObject: any) => void): void;
+export function readJSON(file: string, callback: (err: Error, jsonObject: any) => void): void;
+export function readJSON(file: string, options: ReadOptions, callback: (err: Error, jsonObject: any) => void): void;
 
 export function readJsonSync(file: string, options?: ReadOptions): any;
 export function readJSONSync(file: string, options?: ReadOptions): any;
 
 export function remove(dir: string): Promise<void>;
-export function remove(dir: string, callback: (err: Error | null) => void): void;
+export function remove(dir: string, callback: (err: Error) => void): void;
 export function removeSync(dir: string): void;
 
 export function outputJSON(file: string, data: any, options?: WriteOptions): Promise<void>;
-export function outputJSON(file: string, data: any, options: WriteOptions, callback: (err: Error | null) => void): void;
-export function outputJSON(file: string, data: any, callback: (err: Error | null) => void): void;
+export function outputJSON(file: string, data: any, options: WriteOptions, callback: (err: Error) => void): void;
+export function outputJSON(file: string, data: any, callback: (err: Error) => void): void;
 export function outputJson(file: string, data: any, options?: WriteOptions): Promise<void>;
-export function outputJson(file: string, data: any, options: WriteOptions, callback: (err: Error | null) => void): void;
-export function outputJson(file: string, data: any, callback: (err: Error | null) => void): void;
+export function outputJson(file: string, data: any, options: WriteOptions, callback: (err: Error) => void): void;
+export function outputJson(file: string, data: any, callback: (err: Error) => void): void;
 export function outputJsonSync(file: string, data: any, options?: WriteOptions): void;
 export function outputJSONSync(file: string, data: any, options?: WriteOptions): void;
 
 export function writeJSON(file: string, object: any, options?: WriteOptions): Promise<void>;
-export function writeJSON(file: string, object: any, callback: (err: Error | null) => void): void;
-export function writeJSON(file: string, object: any, options: WriteOptions, callback: (err: Error | null) => void): void;
+export function writeJSON(file: string, object: any, callback: (err: Error) => void): void;
+export function writeJSON(file: string, object: any, options: WriteOptions, callback: (err: Error) => void): void;
 export function writeJson(file: string, object: any, options?: WriteOptions): Promise<void>;
-export function writeJson(file: string, object: any, callback: (err: Error | null) => void): void;
-export function writeJson(file: string, object: any, options: WriteOptions, callback: (err: Error | null) => void): void;
+export function writeJson(file: string, object: any, callback: (err: Error) => void): void;
+export function writeJson(file: string, object: any, options: WriteOptions, callback: (err: Error) => void): void;
 
 export function writeJsonSync(file: string, object: any, options?: WriteOptions): void;
 export function writeJSONSync(file: string, object: any, options?: WriteOptions): void;
 
 export function ensureFile(path: string): Promise<void>;
-export function ensureFile(path: string, callback: (err: Error | null) => void): void;
+export function ensureFile(path: string, callback: (err: Error) => void): void;
 export function ensureFileSync(path: string): void;
 
 export function ensureLink(src: string, dest: string): Promise<void>;
-export function ensureLink(src: string, dest: string, callback: (err: Error | null) => void): void;
+export function ensureLink(src: string, dest: string, callback: (err: Error) => void): void;
 export function ensureLinkSync(src: string, dest: string): void;
 
 export function ensureSymlink(src: string, dest: string, type?: SymlinkType): Promise<void>;
-export function ensureSymlink(src: string, dest: string, type: SymlinkType, callback: (err: Error | null) => void): void;
-export function ensureSymlink(src: string, dest: string, callback: (err: Error | null) => void): void;
+export function ensureSymlink(src: string, dest: string, type: SymlinkType, callback: (err: Error) => void): void;
+export function ensureSymlink(src: string, dest: string, callback: (err: Error) => void): void;
 export function ensureSymlinkSync(src: string, dest: string, type?: SymlinkType): void;
 
 export function emptyDir(path: string): Promise<void>;
-export function emptyDir(path: string, callback: (err: Error | null) => void): void;
+export function emptyDir(path: string, callback: (err: Error) => void): void;
 export function emptyDirSync(path: string): void;
 
 export function pathExists(path: string): Promise<boolean>;
-export function pathExists(path: string, callback: (err: Error | null, exists: boolean) => void): void;
+export function pathExists(path: string, callback: (err: Error, exists: boolean) => void): void;
 export function pathExistsSync(path: string): boolean;
 
 // fs async methods
 // copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/v6/index.d.ts
 
-/** Tests a user's permissions for the file specified by path. */
-export function access(path: string | Buffer, callback: (err: NodeJS.ErrnoException | null) => void): void;
-export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException | null) => void): void;
+export function access(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function access(path: string | Buffer, mode?: number): Promise<void>;
 
 export function appendFile(file: string | Buffer | number, data: any, options: { encoding?: string; mode?: number | string; flag?: string; },
-    callback: (err: NodeJS.ErrnoException | null) => void): void;
-export function appendFile(file: string | Buffer | number, data: any, callback: (err: NodeJS.ErrnoException | null) => void): void;
+    callback: (err: NodeJS.ErrnoException) => void): void;
+export function appendFile(file: string | Buffer | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
 export function appendFile(file: string | Buffer | number, data: any, options?: { encoding?: string; mode?: number | string; flag?: string; }): Promise<void>;
 
-export function chmod(path: string | Buffer, mode: string | number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function chmod(path: string | Buffer, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function chmod(path: string | Buffer, mode: string | number): Promise<void>;
 
 export function chown(path: string | Buffer, uid: number, gid: number): Promise<void>;
-export function chown(path: string | Buffer, uid: number, gid: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function chown(path: string | Buffer, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
 
-export function close(fd: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function close(fd: number): Promise<void>;
 
-export function fchmod(fd: number, mode: string | number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function fchmod(fd: number, mode: string | number): Promise<void>;
 
-export function fchown(fd: number, uid: number, gid: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function fchown(fd: number, uid: number, gid: number): Promise<void>;
 
 export function fdatasync(fd: number, callback: () => void): void;
 export function fdatasync(fd: number): Promise<void>;
 
-export function fstat(fd: number, callback: (err: NodeJS.ErrnoException | null, stats: Stats) => any): void;
+export function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
 export function fstat(fd: number): Promise<Stats>;
 
-export function fsync(fd: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function fsync(fd: number): Promise<void>;
 
-export function ftruncate(fd: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
-export function ftruncate(fd: number, len: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function ftruncate(fd: number, len: number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function ftruncate(fd: number, len?: number): Promise<void>;
 
-export function futimes(fd: number, atime: number, mtime: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
-export function futimes(fd: number, atime: Date, mtime: Date, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function futimes(fd: number, atime: number, mtime: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function futimes(fd: number, atime: Date, mtime: Date, callback: (err: NodeJS.ErrnoException) => void): void;
 export function futimes(fd: number, atime: number, mtime: number): Promise<void>;
 export function futimes(fd: number, atime: Date, mtime: Date): Promise<void>;
 
-export function lchown(path: string | Buffer, uid: number, gid: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function lchown(path: string | Buffer, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function lchown(path: string | Buffer, uid: number, gid: number): Promise<void>;
 
-export function link(srcpath: string | Buffer, dstpath: string | Buffer, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function link(srcpath: string | Buffer, dstpath: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
 export function link(srcpath: string | Buffer, dstpath: string | Buffer): Promise<void>;
 
-export function lstat(path: string | Buffer, callback: (err: NodeJS.ErrnoException | null, stats: Stats) => any): void;
+export function lstat(path: string | Buffer, callback: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
 export function lstat(path: string | Buffer): Promise<Stats>;
 
 /**
  * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
  *
- * @param path
  * @param callback No arguments other than a possible exception are given to the completion callback.
  */
-export function mkdir(path: string | Buffer, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function mkdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
 /**
  * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
  *
- * @param path
- * @param mode
  * @param callback No arguments other than a possible exception are given to the completion callback.
  */
-export function mkdir(path: string | Buffer, mode: number | string, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function mkdir(path: string | Buffer, mode: number | string, callback: (err: NodeJS.ErrnoException) => void): void;
 export function mkdir(path: string | Buffer): Promise<void>;
 
-export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException | null, fd: number) => void): void;
-export function open(path: string | Buffer, flags: string | number, mode: number, callback: (err: NodeJS.ErrnoException | null, fd: number) => void): void;
+export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+export function open(path: string | Buffer, flags: string | number, mode: number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
 export function open(path: string | Buffer, flags: string | number, mode?: number): Promise<number>;
 
 export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number | null,
-    callback: (err: NodeJS.ErrnoException | null, bytesRead: number, buffer: Buffer) => void): void;
+    callback: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
 export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number | null): Promise<ReadResult>;
 
-export function readFile(file: string | Buffer | number, callback: (err: NodeJS.ErrnoException | null, data: Buffer) => void): void;
-export function readFile(file: string | Buffer | number, encoding: string, callback: (err: NodeJS.ErrnoException | null, data: string) => void): void;
+export function readFile(file: string | Buffer | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+export function readFile(file: string | Buffer | number, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
 export function readFile(file: string | Buffer | number, options: { flag?: string; } | { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
 export function readFile(file: string | Buffer | number, options: { flag?: string; } | { encoding: string; flag?: string; }): Promise<string>;
 // tslint:disable-next-line:unified-signatures
 export function readFile(file: string | Buffer | number, encoding: string): Promise<string>;
 export function readFile(file: string | Buffer | number): Promise<Buffer>;
 
-export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException | null, files: string[]) => void): void;
+export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
 export function readdir(path: string | Buffer): Promise<string[]>;
 
-export function readlink(path: string | Buffer, callback: (err: NodeJS.ErrnoException | null, linkString: string) => any): void;
+export function readlink(path: string | Buffer, callback: (err: NodeJS.ErrnoException, linkString: string) => any): void;
 export function readlink(path: string | Buffer): Promise<string>;
 
-export function realpath(path: string | Buffer, callback: (err: NodeJS.ErrnoException | null, resolvedPath: string) => any): void;
-export function realpath(path: string | Buffer, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException | null, resolvedPath: string) => any): void;
+export function realpath(path: string | Buffer, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+export function realpath(path: string | Buffer, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
 export function realpath(path: string | Buffer, cache?: { [path: string]: string }): Promise<string>;
 
-export function rename(oldPath: string, newPath: string, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function rename(oldPath: string, newPath: string, callback: (err: NodeJS.ErrnoException) => void): void;
 export function rename(oldPath: string, newPath: string): Promise<void>;
 
 /**
  * Asynchronous rmdir - removes the directory specified in {path}
  *
- * @param path
  * @param callback No arguments other than a possible exception are given to the completion callback.
  */
-export function rmdir(path: string | Buffer, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function rmdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
 export function rmdir(path: string | Buffer): Promise<void>;
 
-export function stat(path: string | Buffer, callback: (err: NodeJS.ErrnoException | null, stats: Stats) => any): void;
+export function stat(path: string | Buffer, callback: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
 export function stat(path: string | Buffer): Promise<Stats>;
 
-export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type: string, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type: string, callback: (err: NodeJS.ErrnoException) => void): void;
 export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: string): Promise<void>;
 
-export function truncate(path: string | Buffer, callback: (err?: NodeJS.ErrnoException | null) => void): void;
-export function truncate(path: string | Buffer, len: number, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function truncate(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function truncate(path: string | Buffer, len: number, callback: (err: NodeJS.ErrnoException) => void): void;
 export function truncate(path: string | Buffer, len?: number): Promise<void>;
 
 /**
  * Asynchronous unlink - deletes the file specified in {path}
  *
- * @param path
  * @param callback No arguments other than a possible exception are given to the completion callback.
  */
-export function unlink(path: string | Buffer, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function unlink(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
 export function unlink(path: string | Buffer): Promise<void>;
 
-export function utimes(path: string | Buffer, atime: number, mtime: number, callback: (err?: NodeJS.ErrnoException) => void): void;
-export function utimes(path: string | Buffer, atime: Date, mtime: Date, callback: (err?: NodeJS.ErrnoException | null) => void): void;
+export function utimes(path: string | Buffer, atime: number, mtime: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function utimes(path: string | Buffer, atime: Date, mtime: Date, callback: (err: NodeJS.ErrnoException) => void): void;
 export function utimes(path: string | Buffer, atime: number, mtime: number): Promise<void>;
 export function utimes(path: string | Buffer, atime: Date, mtime: Date): Promise<void>;
 
 export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-export function write(fd: number, buffer: Buffer, offset: number, length: number, callback: (err: NodeJS.ErrnoException | null, written: number, buffer: Buffer) => void): void;
-export function write(fd: number, data: any, callback: (err: NodeJS.ErrnoException | null, written: number, str: string) => void): void;
-export function write(fd: number, data: any, offset: number, callback: (err: NodeJS.ErrnoException | null, written: number, str: string) => void): void;
-export function write(fd: number, data: any, offset: number, encoding: string, callback: (err: NodeJS.ErrnoException | null, written: number, str: string) => void): void;
+export function write(fd: number, buffer: Buffer, offset: number, length: number, callback: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+export function write(fd: number, data: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+export function write(fd: number, data: any, offset: number, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+export function write(fd: number, data: any, offset: number, encoding: string, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
 export function write(fd: number, buffer: Buffer, offset: number, length: number, position?: number | null): Promise<WriteResult>;
 export function write(fd: number, data: any, offset: number, encoding?: string): Promise<WriteResult>;
 
-export function writeFile(file: string | Buffer | number, data: any, callback: (err: NodeJS.ErrnoException | null) => void): void;
-export function writeFile(file: string | Buffer | number, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): Promise<void>;
-export function writeFile(file: string | Buffer | number, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback: (err: NodeJS.ErrnoException | null) => void): void;
+export function writeFile(file: string | Buffer | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+export function writeFile(file: string | Buffer | number, data: any, options?: WriteFileOptions | string): Promise<void>;
+export function writeFile(file: string | Buffer | number, data: any, options: WriteFileOptions | string, callback: (err: NodeJS.ErrnoException) => void): void;
 
 /**
  * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
  *
- * @param prefix
  * @param callback The created folder path is passed as a string to the callback's second parameter.
  */
 export function mkdtemp(prefix: string): Promise<string>;
-export function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException | null, folder: string) => void): void;
+export function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
 
 export interface PathEntry {
     path: string;
@@ -260,7 +254,7 @@ export interface PathEntryStream {
     read(): PathEntry | null;
 }
 
-export type CopyFilter = ((src: string, dest: string) => boolean) | RegExp;
+export type CopyFilter = (src: string, dest: string) => boolean;
 
 export type SymlinkType = "dir" | "file";
 
@@ -286,15 +280,18 @@ export interface ReadOptions {
     flag?: string;
 }
 
-export interface WriteOptions {
-    fs?: object;
-    replacer?: any;
-    spaces?: number;
+export interface WriteFileOptions {
     encoding?: string;
     flag?: string;
     mode?: number;
 }
 
+export interface WriteOptions extends WriteFileOptions {
+    fs?: object;
+    replacer?: any;
+    spaces?: number | string;
+}
+
 export interface ReadResult {
     bytesRead: number;
     buffer: Buffer;
diff --git a/types/fs-extra/v4/fs-extra-tests.ts b/types/fs-extra/v4/fs-extra-tests.ts
new file mode 100644
index 0000000000..1af094260d
--- /dev/null
+++ b/types/fs-extra/v4/fs-extra-tests.ts
@@ -0,0 +1,230 @@
+import * as fs from "fs-extra";
+import * as Path from "path";
+
+const len = 2;
+const src = "";
+const dest = "";
+const file = "";
+const dir = "";
+const path = "";
+const data = "";
+const uid = 0;
+const gid = 0;
+const fd = 0;
+const modeNum = 0;
+const modeStr = "";
+const object = {};
+const errorCallback = (err: Error) => { };
+const readOptions: fs.ReadOptions = {
+	reviver: {}
+};
+const writeOptions: fs.WriteOptions = {
+	replacer: {}
+};
+
+fs.moveSync(src, dest, {});
+fs.move(src, dest, {}).then(() => {
+	// stub
+});
+fs.move(src, dest).then(() => {
+	// stub
+});
+fs.move(src, dest, {}, () => {
+	// stub
+});
+fs.move(src, dest, () => {
+	// stub
+});
+
+fs.copy(src, dest).then(() => {
+	// stub
+});
+fs.copy(src, dest, { overwrite: true }).then(() => {
+	// stub
+});
+fs.copy(src, dest, errorCallback);
+fs.copy(src, dest, { filter: (src: string, dest: string) => false }, errorCallback);
+fs.copy(src, dest,
+	{
+		overwrite: true,
+		preserveTimestamps: true,
+		filter: (src: string, dest: string) => false
+	},
+	errorCallback
+);
+fs.copy(src, dest,
+	{
+		overwrite: true,
+		preserveTimestamps: true,
+		filter: /.*/
+	},
+	errorCallback
+);
+fs.copySync(src, dest);
+fs.copySync(src, dest, { filter: (src: string, dest: string) => false });
+fs.copySync(src, dest, { filter: /.*/ });
+fs.copySync(src, dest,
+	{
+		overwrite: true,
+		preserveTimestamps: true,
+		filter: (src: string, dest: string) => false
+	}
+);
+fs.copySync(src, dest,
+	{
+		overwrite: true,
+		preserveTimestamps: true,
+		filter: /.*/
+	}
+);
+fs.createFile(file).then(() => {
+	// stub
+});
+fs.createFile(file, errorCallback);
+fs.createFileSync(file);
+
+fs.mkdirs(dir).then(() => {
+	// stub
+});
+fs.mkdirp(dir).then(() => {
+	// stub
+});
+fs.mkdirs(dir, errorCallback);
+fs.mkdirsSync(dir);
+fs.mkdirp(dir, errorCallback);
+fs.mkdirpSync(dir);
+
+fs.outputFile(file, data).then(() => {
+	// stub
+});
+fs.outputFile(file, data, errorCallback);
+fs.outputFileSync(file, data);
+
+fs.outputJson(file, data, {
+	spaces: 2
+}).then(() => {
+	// stub
+});
+fs.outputJson(file, data, {
+	spaces: 2
+}, errorCallback);
+fs.outputJSON(file, data, errorCallback);
+fs.outputJSON(file, data).then(() => {
+	// stub
+});
+
+fs.outputJsonSync(file, data);
+fs.outputJSONSync(file, data);
+
+fs.readJson(file).then(() => {
+	// stub
+});
+
+fs.readJson(file, readOptions).then(() => {
+	// stub
+});
+fs.readJson(file, (error: Error, jsonObject: any) => { });
+fs.readJson(file, readOptions, (error: Error, jsonObject: any) => { });
+fs.readJSON(file, (error: Error, jsonObject: any) => { });
+fs.readJSON(file, readOptions, (error: Error, jsonObject: any) => { });
+
+fs.readJsonSync(file, readOptions);
+fs.readJSONSync(file, readOptions);
+
+fs.remove(dir, errorCallback);
+fs.remove(dir).then(() => {
+	// stub
+});
+fs.removeSync(dir);
+
+fs.writeJson(file, object).then(() => {
+	// stub
+});
+fs.writeJSON(file, object).then(() => {
+	// stub
+});
+fs.writeJson(file, object, errorCallback);
+fs.writeJson(file, object, writeOptions, errorCallback);
+fs.writeJSON(file, object, errorCallback);
+fs.writeJSON(file, object, writeOptions, errorCallback);
+fs.writeJson(file, object, writeOptions).then(() => {
+	// stub
+});
+fs.writeJSON(file, object, writeOptions).then(() => {
+	// stub
+});
+fs.writeJsonSync(file, object, writeOptions);
+fs.writeJSONSync(file, object, writeOptions);
+
+fs.ensureDir(path).then(() => {
+	// stub
+});
+fs.ensureDir(path, errorCallback);
+fs.ensureDirSync(path);
+
+fs.ensureFile(path).then(() => {
+	// stub
+});
+fs.ensureFile(path, errorCallback);
+fs.ensureFileSync(path);
+fs.ensureLink(path, path).then(() => {
+	// stub
+});
+fs.ensureLink(path, path, errorCallback);
+fs.ensureLinkSync(path, path);
+fs.ensureSymlink(path, path, "file").then(() => {
+	// stub
+});
+fs.ensureSymlink(path, path, errorCallback);
+fs.ensureSymlinkSync(path, path);
+fs.emptyDir(path).then(() => {
+	// stub
+});
+fs.emptyDir(path, errorCallback);
+fs.emptyDirSync(path);
+fs.pathExists(path).then((_exist: boolean) => {
+	// stub
+});
+fs.pathExists(path, (_err: Error, _exists: boolean) => { });
+const x: boolean = fs.pathExistsSync(path);
+
+fs.rename(src, dest, errorCallback);
+fs.renameSync(src, dest);
+fs.truncate(path, len, errorCallback);
+fs.truncateSync(path, len);
+fs.chown(path, uid, gid, errorCallback);
+fs.chownSync(path, uid, gid);
+fs.fchown(fd, uid, gid, errorCallback);
+fs.fchownSync(fd, uid, gid);
+fs.lchown(path, uid, gid, errorCallback);
+fs.lchownSync(path, uid, gid);
+fs.chmod(path, modeNum, errorCallback);
+fs.chmod(path, modeStr, errorCallback);
+fs.chmodSync(path, modeNum);
+fs.chmodSync(path, modeStr);
+fs.fchmod(fd, modeNum, errorCallback);
+fs.fchmod(fd, modeStr, errorCallback);
+fs.fchmodSync(fd, modeNum);
+fs.fchmodSync(fd, modeStr);
+fs.lchmod(path, modeStr, errorCallback);
+fs.lchmod(path, modeNum, errorCallback);
+fs.lchmodSync(path, modeNum);
+fs.lchmodSync(path, modeStr);
+fs.statSync(path);
+fs.lstatSync(path);
+
+fs.read(0, new Buffer(""), 0, 0, null).then(x => {
+	const a = x.buffer;
+	const b = x.bytesRead;
+});
+
+fs.write(0, new Buffer(""), 0, 0, null).then(x => {
+	const a = x.buffer;
+	const b = x.bytesWritten;
+});
+
+// $ExpectType Promise<void>
+fs.writeFile("foo.txt", "i am foo", { encoding: "utf-8" });
+
+// $ExpectType Promise<string>
+fs.mkdtemp("foo");
diff --git a/types/fs-extra/v4/index.d.ts b/types/fs-extra/v4/index.d.ts
new file mode 100644
index 0000000000..575df86b4d
--- /dev/null
+++ b/types/fs-extra/v4/index.d.ts
@@ -0,0 +1,303 @@
+// Type definitions for fs-extra 4.0
+// Project: https://github.com/jprichardson/node-fs-extra
+// Definitions by: Alan Agius <https://github.com/alan-agius4>,
+//                 midknight41 <https://github.com/midknight41>,
+//                 Brendan Forster <https://github.com/shiftkey>,
+//                 Mees van Dijk <https://github.com/mees->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { Stats } from "fs";
+
+export * from "fs";
+
+export function copy(src: string, dest: string, options?: CopyOptions): Promise<void>;
+export function copy(src: string, dest: string, callback: (err: Error) => void): void;
+export function copy(src: string, dest: string, options: CopyOptions, callback: (err: Error) => void): void;
+export function copySync(src: string, dest: string, options?: CopyOptions): void;
+
+export function move(src: string, dest: string, options?: MoveOptions): Promise<void>;
+export function move(src: string, dest: string, callback: (err: Error) => void): void;
+export function move(src: string, dest: string, options: MoveOptions, callback: (err: Error) => void): void;
+export function moveSync(src: string, dest: string, options?: MoveOptions): void;
+
+export function createFile(file: string): Promise<void>;
+export function createFile(file: string, callback: (err: Error) => void): void;
+export function createFileSync(file: string): void;
+
+export function ensureDir(path: string): Promise<void>;
+export function ensureDir(path: string, callback: (err: Error) => void): void;
+export function ensureDirSync(path: string): void;
+
+export function mkdirs(dir: string): Promise<void>;
+export function mkdirs(dir: string, callback: (err: Error) => void): void;
+export function mkdirp(dir: string): Promise<void>;
+export function mkdirp(dir: string, callback: (err: Error) => void): void;
+export function mkdirsSync(dir: string): void;
+export function mkdirpSync(dir: string): void;
+
+export function outputFile(file: string, data: any, options?: WriteFileOptions | string): Promise<void>;
+export function outputFile(file: string, data: any, callback: (err: Error) => void): void;
+export function outputFile(file: string, data: any, options: WriteFileOptions | string, callback: (err: Error) => void): void;
+export function outputFileSync(file: string, data: any, options?: WriteFileOptions | string): void;
+
+export function readJson(file: string, options?: ReadOptions): Promise<any>;
+export function readJson(file: string, callback: (err: Error, jsonObject: any) => void): void;
+export function readJson(file: string, options: ReadOptions, callback: (err: Error, jsonObject: any) => void): void;
+export function readJSON(file: string, options?: ReadOptions): Promise<any>;
+export function readJSON(file: string, callback: (err: Error, jsonObject: any) => void): void;
+export function readJSON(file: string, options: ReadOptions, callback: (err: Error, jsonObject: any) => void): void;
+
+export function readJsonSync(file: string, options?: ReadOptions): any;
+export function readJSONSync(file: string, options?: ReadOptions): any;
+
+export function remove(dir: string): Promise<void>;
+export function remove(dir: string, callback: (err: Error) => void): void;
+export function removeSync(dir: string): void;
+
+export function outputJSON(file: string, data: any, options?: WriteOptions): Promise<void>;
+export function outputJSON(file: string, data: any, options: WriteOptions, callback: (err: Error) => void): void;
+export function outputJSON(file: string, data: any, callback: (err: Error) => void): void;
+export function outputJson(file: string, data: any, options?: WriteOptions): Promise<void>;
+export function outputJson(file: string, data: any, options: WriteOptions, callback: (err: Error) => void): void;
+export function outputJson(file: string, data: any, callback: (err: Error) => void): void;
+export function outputJsonSync(file: string, data: any, options?: WriteOptions): void;
+export function outputJSONSync(file: string, data: any, options?: WriteOptions): void;
+
+export function writeJSON(file: string, object: any, options?: WriteOptions): Promise<void>;
+export function writeJSON(file: string, object: any, callback: (err: Error) => void): void;
+export function writeJSON(file: string, object: any, options: WriteOptions, callback: (err: Error) => void): void;
+export function writeJson(file: string, object: any, options?: WriteOptions): Promise<void>;
+export function writeJson(file: string, object: any, callback: (err: Error) => void): void;
+export function writeJson(file: string, object: any, options: WriteOptions, callback: (err: Error) => void): void;
+
+export function writeJsonSync(file: string, object: any, options?: WriteOptions): void;
+export function writeJSONSync(file: string, object: any, options?: WriteOptions): void;
+
+export function ensureFile(path: string): Promise<void>;
+export function ensureFile(path: string, callback: (err: Error) => void): void;
+export function ensureFileSync(path: string): void;
+
+export function ensureLink(src: string, dest: string): Promise<void>;
+export function ensureLink(src: string, dest: string, callback: (err: Error) => void): void;
+export function ensureLinkSync(src: string, dest: string): void;
+
+export function ensureSymlink(src: string, dest: string, type?: SymlinkType): Promise<void>;
+export function ensureSymlink(src: string, dest: string, type: SymlinkType, callback: (err: Error) => void): void;
+export function ensureSymlink(src: string, dest: string, callback: (err: Error) => void): void;
+export function ensureSymlinkSync(src: string, dest: string, type?: SymlinkType): void;
+
+export function emptyDir(path: string): Promise<void>;
+export function emptyDir(path: string, callback: (err: Error) => void): void;
+export function emptyDirSync(path: string): void;
+
+export function pathExists(path: string): Promise<boolean>;
+export function pathExists(path: string, callback: (err: Error, exists: boolean) => void): void;
+export function pathExistsSync(path: string): boolean;
+
+// fs async methods
+// copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/v6/index.d.ts
+
+export function access(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function access(path: string | Buffer, mode?: number): Promise<void>;
+
+export function appendFile(file: string | Buffer | number, data: any, options: { encoding?: string; mode?: number | string; flag?: string; },
+    callback: (err: NodeJS.ErrnoException) => void): void;
+export function appendFile(file: string | Buffer | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+export function appendFile(file: string | Buffer | number, data: any, options?: { encoding?: string; mode?: number | string; flag?: string; }): Promise<void>;
+
+export function chmod(path: string | Buffer, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function chmod(path: string | Buffer, mode: string | number): Promise<void>;
+
+export function chown(path: string | Buffer, uid: number, gid: number): Promise<void>;
+export function chown(path: string | Buffer, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+export function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function close(fd: number): Promise<void>;
+
+export function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function fchmod(fd: number, mode: string | number): Promise<void>;
+
+export function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function fchown(fd: number, uid: number, gid: number): Promise<void>;
+
+export function fdatasync(fd: number, callback: () => void): void;
+export function fdatasync(fd: number): Promise<void>;
+
+export function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+export function fstat(fd: number): Promise<Stats>;
+
+export function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function fsync(fd: number): Promise<void>;
+
+export function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function ftruncate(fd: number, len: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function ftruncate(fd: number, len?: number): Promise<void>;
+
+export function futimes(fd: number, atime: number, mtime: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function futimes(fd: number, atime: Date, mtime: Date, callback: (err: NodeJS.ErrnoException) => void): void;
+export function futimes(fd: number, atime: number, mtime: number): Promise<void>;
+export function futimes(fd: number, atime: Date, mtime: Date): Promise<void>;
+
+export function lchown(path: string | Buffer, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function lchown(path: string | Buffer, uid: number, gid: number): Promise<void>;
+
+export function link(srcpath: string | Buffer, dstpath: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function link(srcpath: string | Buffer, dstpath: string | Buffer): Promise<void>;
+
+export function lstat(path: string | Buffer, callback: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+export function lstat(path: string | Buffer): Promise<Stats>;
+
+/**
+ * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+ *
+ * @param callback No arguments other than a possible exception are given to the completion callback.
+ */
+export function mkdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+/**
+ * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+ *
+ * @param callback No arguments other than a possible exception are given to the completion callback.
+ */
+export function mkdir(path: string | Buffer, mode: number | string, callback: (err: NodeJS.ErrnoException) => void): void;
+export function mkdir(path: string | Buffer): Promise<void>;
+
+export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+export function open(path: string | Buffer, flags: string | number, mode: number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+export function open(path: string | Buffer, flags: string | number, mode?: number): Promise<number>;
+
+export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number | null,
+    callback: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
+export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number | null): Promise<ReadResult>;
+
+export function readFile(file: string | Buffer | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+export function readFile(file: string | Buffer | number, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+export function readFile(file: string | Buffer | number, options: { flag?: string; } | { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+export function readFile(file: string | Buffer | number, options: { flag?: string; } | { encoding: string; flag?: string; }): Promise<string>;
+// tslint:disable-next-line:unified-signatures
+export function readFile(file: string | Buffer | number, encoding: string): Promise<string>;
+export function readFile(file: string | Buffer | number): Promise<Buffer>;
+
+export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+export function readdir(path: string | Buffer): Promise<string[]>;
+
+export function readlink(path: string | Buffer, callback: (err: NodeJS.ErrnoException, linkString: string) => any): void;
+export function readlink(path: string | Buffer): Promise<string>;
+
+export function realpath(path: string | Buffer, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+export function realpath(path: string | Buffer, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+export function realpath(path: string | Buffer, cache?: { [path: string]: string }): Promise<string>;
+
+export function rename(oldPath: string, newPath: string, callback: (err: NodeJS.ErrnoException) => void): void;
+export function rename(oldPath: string, newPath: string): Promise<void>;
+
+/**
+ * Asynchronous rmdir - removes the directory specified in {path}
+ *
+ * @param callback No arguments other than a possible exception are given to the completion callback.
+ */
+export function rmdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function rmdir(path: string | Buffer): Promise<void>;
+
+export function stat(path: string | Buffer, callback: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+export function stat(path: string | Buffer): Promise<Stats>;
+
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type: string, callback: (err: NodeJS.ErrnoException) => void): void;
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: string): Promise<void>;
+
+export function truncate(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function truncate(path: string | Buffer, len: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function truncate(path: string | Buffer, len?: number): Promise<void>;
+
+/**
+ * Asynchronous unlink - deletes the file specified in {path}
+ *
+ * @param callback No arguments other than a possible exception are given to the completion callback.
+ */
+export function unlink(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function unlink(path: string | Buffer): Promise<void>;
+
+export function utimes(path: string | Buffer, atime: number, mtime: number, callback: (err: NodeJS.ErrnoException) => void): void;
+export function utimes(path: string | Buffer, atime: Date, mtime: Date, callback: (err: NodeJS.ErrnoException) => void): void;
+export function utimes(path: string | Buffer, atime: number, mtime: number): Promise<void>;
+export function utimes(path: string | Buffer, atime: Date, mtime: Date): Promise<void>;
+
+export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+export function write(fd: number, buffer: Buffer, offset: number, length: number, callback: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+export function write(fd: number, data: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+export function write(fd: number, data: any, offset: number, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+export function write(fd: number, data: any, offset: number, encoding: string, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+export function write(fd: number, buffer: Buffer, offset: number, length: number, position?: number | null): Promise<WriteResult>;
+export function write(fd: number, data: any, offset: number, encoding?: string): Promise<WriteResult>;
+
+export function writeFile(file: string | Buffer | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+export function writeFile(file: string | Buffer | number, data: any, options?: WriteFileOptions | string): Promise<void>;
+export function writeFile(file: string | Buffer | number, data: any, options: WriteFileOptions | string, callback: (err: NodeJS.ErrnoException) => void): void;
+
+/**
+ * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+ *
+ * @param callback The created folder path is passed as a string to the callback's second parameter.
+ */
+export function mkdtemp(prefix: string): Promise<string>;
+export function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+export interface PathEntry {
+    path: string;
+    stats: Stats;
+}
+
+export interface PathEntryStream {
+    read(): PathEntry | null;
+}
+
+export type CopyFilter = ((src: string, dest: string) => boolean) | RegExp;
+
+export type SymlinkType = "dir" | "file";
+
+export interface CopyOptions {
+    dereference?: boolean;
+    overwrite?: boolean;
+    preserveTimestamps?: boolean;
+    errorOnExist?: boolean;
+    filter?: CopyFilter;
+    recursive?: boolean;
+}
+
+export interface MoveOptions {
+    overwrite?: boolean;
+    limit?: number;
+}
+
+export interface ReadOptions {
+    throws?: boolean;
+    fs?: object;
+    reviver?: any;
+    encoding?: string;
+    flag?: string;
+}
+
+export interface WriteFileOptions {
+    encoding?: string;
+    flag?: string;
+    mode?: number;
+}
+
+export interface WriteOptions extends WriteFileOptions {
+    fs?: object;
+    replacer?: any;
+    spaces?: number | string;
+}
+
+export interface ReadResult {
+    bytesRead: number;
+    buffer: Buffer;
+}
+
+export interface WriteResult {
+    bytesWritten: number;
+    buffer: Buffer;
+}
diff --git a/types/fs-extra/v4/tsconfig.json b/types/fs-extra/v4/tsconfig.json
new file mode 100644
index 0000000000..80435f4ede
--- /dev/null
+++ b/types/fs-extra/v4/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "fs-extra": [
+                "fs-extra/v4"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-extra-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/sharp-timer/v0/tslint.json b/types/fs-extra/v4/tslint.json
similarity index 100%
rename from types/sharp-timer/v0/tslint.json
rename to types/fs-extra/v4/tslint.json
diff --git a/types/fs-finder/tslint.json b/types/fs-finder/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fs-finder/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fs-mock/tslint.json b/types/fs-mock/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fs-mock/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fs-plus/fs-plus-tests.ts b/types/fs-plus/fs-plus-tests.ts
new file mode 100644
index 0000000000..92ae917266
--- /dev/null
+++ b/types/fs-plus/fs-plus-tests.ts
@@ -0,0 +1,151 @@
+import * as path from "path";
+import * as fs from "fs-plus";
+
+const homeDir = fs.getHomeDirectory();
+
+console.log(fs.absolute("~") === fs.realpathSync(homeDir));
+console.log(
+    fs.absolute(path.join("~", "does", "not", "exist")) ===
+        path.join(homeDir, "does", "not", "exist")
+);
+
+console.log(fs.normalize("~/foo") === path.join(homeDir, "foo"));
+
+console.log(fs.tildify(homeDir) === "~");
+
+console.log(
+    fs.getAppDataDirectory() ===
+        path.join(fs.getHomeDirectory(), "Library", "Application Support")
+);
+
+console.log(fs.isAbsolute("/a/b/c"));
+
+console.log(fs.existsSync("/a/b/c"));
+
+console.log(fs.isDirectorySync("/a/b/c"));
+
+fs.isDirectory("a/b/c", result => {
+    console.log(result);
+});
+
+console.log(fs.isFileSync("/a/b/c"));
+
+console.log(fs.isSymbolicLinkSync("/a/b/c"));
+
+fs.isSymbolicLink("a/b/c", result => {
+    console.log(result);
+});
+
+console.log(fs.isExecutableSync("/a/b/c"));
+
+console.log(fs.getSizeSync("/a/b/c") === -1);
+
+console.log(fs.listSync("/a/b").indexOf("c") === 0);
+console.log(fs.listSync("/a/b", [".ts", ".tsx"]).indexOf("c.tsx") === 0);
+
+fs.list("/a/b", (err, result) => {
+    if (err) {
+        console.error(err);
+        return;
+    }
+    console.log(result.indexOf("c") === 0);
+});
+fs.list("/a/b", [".ts", ".tsx"], (err, result) => {
+    if (err) {
+        console.error(err);
+        return;
+    }
+    console.log(result.indexOf("c.tsx") === 0);
+});
+
+console.log(fs.listTreeSync("/a/b").indexOf("c") === 0);
+
+fs.moveSync("/a/b", "a/c");
+
+fs.move("/a/b", "a/c", err => {
+    console.log(err);
+});
+
+fs.removeSync("/a/b");
+
+fs.remove("/a/b", err => {
+    console.log(err);
+});
+
+fs.writeFileSync("a/b/c", "data");
+fs.writeFileSync("a/b/c", "data", "utf8");
+fs.writeFileSync("a/b/c", "data", { encoding: "utf8" });
+
+fs.writeFile("a/b/c", "data", err => {
+    console.log(err);
+});
+fs.writeFile("a/b/c", "data", "utf8", err => {
+    console.log(err);
+});
+fs.writeFile("a/b/c", "data", { encoding: "utf8" }, err => {
+    console.log(err);
+});
+
+fs.copySync("/a/b", "a/c");
+
+fs.copy("/a/b", "a/c", err => {
+    console.log(err);
+});
+
+fs.copyFileSync("/a/b", "a/c");
+fs.copyFileSync("/a/b", "a/c", 32 * 1024);
+
+fs.makeTreeSync("/a/b");
+
+fs.makeTree("/a/b", err => {
+    console.log(err);
+});
+
+fs.traverseTreeSync(
+    "a/b/c",
+    file => {
+        console.log("file", file);
+    },
+    dir => {
+        console.log("directory", dir);
+        return true;
+    }
+);
+
+fs.traverseTree(
+    "a/b/c",
+    file => {
+        console.log("file", file);
+    },
+    dir => {
+        console.log("directory", dir);
+    },
+    err => {
+        console.error(err);
+    }
+);
+
+console.log(fs.md5ForPath("a/b/c"));
+
+console.log(fs.resolve("a/b/c", "sample.js"));
+console.log(fs.resolve("a/b/c", "sample", [".js"]));
+
+console.log(fs.resolveOnLoadPath("sample.js"));
+console.log(fs.resolveOnLoadPath("sample", [".js"]));
+
+console.log(fs.resolveExtension("a/b/c", [".js"]));
+
+console.log(fs.isCompressedExtension(".tar.gz"));
+
+console.log(fs.isImageExtension(".jpg"));
+
+console.log(fs.isPdfExtension(".pdf"));
+
+console.log(fs.isBinaryExtension(".exe"));
+
+console.log(fs.isReadmePath("a/b/README.md"));
+
+console.log(fs.isMarkdownExtension(".md"));
+
+console.log(fs.isCaseInsensitive());
+console.log(fs.isCaseSensitive());
diff --git a/types/fs-plus/index.d.ts b/types/fs-plus/index.d.ts
new file mode 100644
index 0000000000..0151de2c73
--- /dev/null
+++ b/types/fs-plus/index.d.ts
@@ -0,0 +1,305 @@
+// Type definitions for fs-plus 3.0
+// Project: https://github.com/atom/fs-plus
+// Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Stats } from "fs";
+
+export * from "fs";
+
+/**
+ * Returns the absolute path to the home directory.
+ */
+export function getHomeDirectory(): string;
+
+/**
+ * Make the given path absolute by resolving it against the current working directory.
+ */
+export function absolute(relativePath: string): string;
+
+/**
+ * Normalize the given path treating a leading `~` segment as referring to the home directory. This method does not query the filesystem.
+ */
+export function normalize(pathToNormalize: string): string;
+
+/**
+ * Convert an absolute path to tilde path for Linux and macOS.
+ */
+export function tildify(pathToTildify: string): string;
+
+/**
+ * Get path to store application specific data.
+ *
+ * * Mac: `~/Library/Application Support/`
+ * * Win: `%AppData%`
+ * * Linux: `/var/lib`
+ */
+export function getAppDataDirectory(): string;
+
+/**
+ * Returns true if the given path is absolute.
+ */
+export function isAbsolute(pathToCheck: string): boolean;
+
+/**
+ * Returns true if a file or folder at the specified path exists.
+ */
+export function existsSync(pathToCheck: string): boolean;
+
+/**
+ * Returns true if the given path exists and is a directory.
+ */
+export function isDirectorySync(directoryPath: string): boolean;
+
+/**
+ * Asynchronously checks that the given path exists and is a directory.
+ */
+export function isDirectory(
+    directoryPath: string,
+    callback: (result: boolean) => void
+): void;
+
+/**
+ * Returns true if the specified path exists and is a file.
+ */
+export function isFileSync(filePath: string): boolean;
+
+/**
+ * Returns true if the specified path is a symbolic link.
+ */
+export function isSymbolicLinkSync(symlinkPath: string): boolean;
+
+/**
+ * Calls back with true if the specified path is a symbolic link.
+ */
+export function isSymbolicLink(
+    symlinkPath: string,
+    callback: (result: boolean) => void
+): void;
+
+/**
+ * Returns true if the specified path is executable.
+ */
+export function isExecutableSync(pathToCheck: string): boolean;
+
+/**
+ * Returns the size of the specified path.
+ */
+export function getSizeSync(pathToCheck: string): number;
+
+/**
+ * Returns an Array with the paths of the files and directories contained within the directory path. It is not recursive.
+ */
+export function listSync(rootPath: string, extensions?: string[]): string[];
+
+/**
+ * Asynchronously lists the files and directories in the given path. The listing is not recursive.
+ */
+export function list(
+    rootPath: string,
+    callback: (err: Error, result: string[]) => void
+): void;
+
+/**
+ * Asynchronously lists the files and directories in the given path. The listing is not recursive.
+ */
+export function list(
+    rootPath: string,
+    extensions: string[],
+    callback: (err: Error, result: string[]) => void
+): void;
+
+/**
+ * Get all paths under the given path.
+ */
+export function listTreeSync(rootPath: string): string[];
+
+/**
+ * Moves the source file or directory to the target.
+ */
+export function moveSync(source: string, target: string): void;
+
+/**
+ * Asynchronously moves the source file or directory to the target.
+ */
+export function move(
+    source: string,
+    target: string,
+    callback: (err: Error) => void
+): void;
+
+/**
+ * Removes the file or directory at the given path.
+ */
+export function removeSync(pathToRemove: string): void;
+
+/**
+ * Asynchronously removes the file or directory at the given path.
+ */
+export function remove(
+    pathToRemove: string,
+    callback: (err: Error) => void
+): void;
+
+/**
+ * Open, write, flush, and close a file, writing the given content synchronously.
+ */
+export function writeFileSync(
+    filePath: string,
+    content: string,
+    options?:
+        | { encoding?: string | null; mode?: number | string; flag?: string }
+        | string
+        | null
+): void;
+
+/**
+ * Open, write, flush, and close a file, writing the given content asynchronously.
+ */
+export function writeFile(
+    filePath: string,
+    content: any,
+    callback: (err: any) => void
+): void;
+
+/**
+ * Open, write, flush, and close a file, writing the given content asynchronously.
+ */
+export function writeFile(
+    filePath: string,
+    content: any,
+    options:
+        | { encoding?: string | null; mode?: number | string; flag?: string }
+        | string
+        | undefined
+        | null,
+    callback: (err: any) => void
+): void;
+
+/**
+ * Copies the given path.
+ */
+export function copySync(source: string, target: string): void;
+
+/**
+ * Asynchronously copies the given path.
+ */
+export function copy(
+    source: string,
+    target: string,
+    callback: (err: any) => void
+): void;
+
+/**
+ * Copies the given path synchronously, buffering reads and writes to keep memory footprint to a minimum. If the destination directory doesn't exist, it creates it.
+ */
+export function copyFileSync(
+    source: string,
+    target: string,
+    bufferSize?: number
+): void;
+
+/**
+ * Create a directory at the specified path including any missing parent directories.
+ */
+export function makeTreeSync(directoryPath: string): void;
+
+/**
+ * Asynchronously create a directory at the specified path including any missing parent directories.
+ */
+export function makeTree(
+    directoryPath: string,
+    callback: (err: any) => void
+): void;
+
+/**
+ * Recursively walk the given path and execute the given functions.
+ */
+export function traverseTreeSync(
+    rootPath: string,
+    onFile: (file: string) => void,
+    onDirectory: (dir: string) => boolean | void
+): void;
+
+/**
+ * Asynchronously walk the given path and execute the given functions.
+ */
+export function traverseTree(
+    rootPath: string,
+    onFile: (file: string) => void,
+    onDirectory: (dir: string) => boolean | void,
+    onDone: (err: any) => void
+): void;
+
+/**
+ * Hashes the contents of the given file.
+ */
+export function md5ForPath(pathToDigest: string): string;
+
+/**
+ * Finds a relative path among the given array of paths.
+ */
+export function resolve(
+    loadPath: string,
+    pathToResolve: string,
+    extensions?: string[]
+): string | undefined;
+
+/**
+ * Finds a relative path using Node's module paths as load paths.
+ */
+export function resolveOnLoadPath(
+    pathToResolve: string,
+    extensions?: string[]
+): string | undefined;
+
+/**
+ * Finds the first file in the given path which matches the extension in the order given.
+ */
+export function resolveExtension(
+    pathToResolve: string,
+    extensions: string[]
+): string | undefined;
+
+/**
+ * Returns true for extensions associated with compressed files.
+ */
+export function isCompressedExtension(ext: string): boolean;
+
+/**
+ * Returns true for extensions associated with image files.
+ */
+export function isImageExtension(ext: string): boolean;
+
+/**
+ * Returns true for extensions associated with PDF files.
+ */
+export function isPdfExtension(ext: string): boolean;
+
+/**
+ * Returns true for extensions associated with binary files.
+ */
+export function isBinaryExtension(ext: string): boolean;
+
+/**
+ * Returns true for files named similarily to `README`.
+ */
+export function isReadmePath(readmePath: string): boolean;
+
+/**
+ * Returns true for extensions associated with Markdown files.
+ */
+export function isMarkdownExtension(ext: string): boolean;
+
+/**
+ * Is the filesystem case insensitive?
+ */
+export function isCaseInsensitive(): boolean;
+
+/**
+ * Is the filesystem case sensitive?
+ */
+export function isCaseSensitive(): boolean;
diff --git a/types/fs-plus/tsconfig.json b/types/fs-plus/tsconfig.json
new file mode 100644
index 0000000000..1ab0098d52
--- /dev/null
+++ b/types/fs-plus/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-plus-tests.ts"
+    ]
+}
diff --git a/types/fs-plus/tslint.json b/types/fs-plus/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fs-plus/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fs-readfile-promise/fs-readfile-promise-tests.ts b/types/fs-readfile-promise/fs-readfile-promise-tests.ts
new file mode 100644
index 0000000000..9bd1ac070c
--- /dev/null
+++ b/types/fs-readfile-promise/fs-readfile-promise-tests.ts
@@ -0,0 +1,32 @@
+import * as readFile from "fs-readfile-promise";
+
+declare const path: string;
+declare const encoding: string;
+declare const nullable: null;
+declare const options: { encoding: string, flag: string };
+
+async function testPathOnly() {
+    return readFile(path);
+}
+async function testPathEncoding() {
+    return readFile(path, encoding);
+}
+async function testPathNull() {
+    return readFile(path, nullable);
+}
+async function testPathOption() {
+    return readFile(path, options);
+}
+
+testPathOnly()
+    .then(console.log)
+    .catch(console.log);
+testPathEncoding()
+    .then(console.log)
+    .catch(console.log);
+testPathNull()
+    .then(console.log)
+    .catch(console.log);
+testPathOption()
+    .then(console.log)
+    .catch(console.log);
diff --git a/types/fs-readfile-promise/index.d.ts b/types/fs-readfile-promise/index.d.ts
new file mode 100644
index 0000000000..b2d6aeab61
--- /dev/null
+++ b/types/fs-readfile-promise/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for fs-readfile-promise 3.0
+// Project: https://github.com/shinnn/fs-readfile-promise
+// Definitions by: Motosugi Murata <https://github.com/mtsg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+import { PathLike } from "fs";
+type PathType = PathLike | number;
+type OptionsType = { encoding: string; flag?: string; } | string;
+
+export = fsReadFilePromise;
+
+/**
+ * Asynchronously reads the entire contents of a file.
+ * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+ * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+ * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+ * If a flag is not provided, it defaults to `'r'`.
+ */
+declare function fsReadFilePromise(path: PathType, options: OptionsType): Promise<string>;
+
+/**
+ * Asynchronously reads the entire contents of a file.
+ * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+ * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+ */
+declare function fsReadFilePromise(path: PathType, options?: null): Promise<Buffer>;
+
+declare namespace fsReadFilePromise { }
diff --git a/types/fs-readfile-promise/tsconfig.json b/types/fs-readfile-promise/tsconfig.json
new file mode 100644
index 0000000000..3496c329e5
--- /dev/null
+++ b/types/fs-readfile-promise/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-readfile-promise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/fs-readfile-promise/tslint.json b/types/fs-readfile-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fs-readfile-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fscreen/fscreen-tests.ts b/types/fscreen/fscreen-tests.ts
new file mode 100644
index 0000000000..eb2845f76f
--- /dev/null
+++ b/types/fscreen/fscreen-tests.ts
@@ -0,0 +1,26 @@
+import fscreen from 'fscreen';
+
+const element = document.createElement('div');
+
+if (fscreen.fullscreenEnabled) {
+    fscreen.addEventListener('fullscreenchange', handler, false);
+    fscreen.requestFullscreen(element);
+}
+
+function handler() {
+    if (fscreen.fullscreenElement !== null) {
+        // Entered fullscreen mode
+    } else {
+        // Exited fullscreen mode
+    }
+}
+
+fscreen.requestFullscreen(element);
+fscreen.requestFullscreenFunction(element);
+fscreen.exitFullscreen();
+fscreen.onfullscreenchange = handler;
+fscreen.addEventListener('fullscreenchange', handler);
+fscreen.removeEventListener('fullscreenchange', handler);
+fscreen.onfullscreenerror = handler;
+fscreen.addEventListener('fullscreenerror', handler);
+fscreen.removeEventListener('fullscreenerror', handler);
diff --git a/types/fscreen/index.d.ts b/types/fscreen/index.d.ts
new file mode 100644
index 0000000000..dfe2f6117f
--- /dev/null
+++ b/types/fscreen/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for fscreen 1.0
+// Project: https://github.com/rafrex/fscreen#readme
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Handler = () => void;
+
+declare class Fscreen {
+    readonly fullscreenElement: Element | undefined;
+    readonly fullscreenEnabled: boolean;
+    readonly exitFullscreen: Handler;
+    onfullscreenchange: Handler;
+    onfullscreenerror: Handler;
+
+    addEventListener(type: string, handler: Handler, useCapture?: boolean): void;
+    removeEventListener(type: string, handler: Handler): void;
+    requestFullscreen(element: Element): void;
+    requestFullscreenFunction(element: Element): void;
+}
+
+declare const fscreen: Fscreen;
+export default fscreen;
diff --git a/types/fscreen/tsconfig.json b/types/fscreen/tsconfig.json
new file mode 100644
index 0000000000..e352d9fd2e
--- /dev/null
+++ b/types/fscreen/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "target": "es6",
+        "strictFunctionTypes": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fscreen-tests.ts"
+    ]
+}
diff --git a/types/fscreen/tslint.json b/types/fscreen/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fscreen/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ftdomdelegate/tslint.json b/types/ftdomdelegate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ftdomdelegate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ftp/tslint.json b/types/ftp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ftp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ftpd/tslint.json b/types/ftpd/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ftpd/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fullcalendar/fullcalendar-tests.ts b/types/fullcalendar/fullcalendar-tests.ts
deleted file mode 100644
index 13df4e3853..0000000000
--- a/types/fullcalendar/fullcalendar-tests.ts
+++ /dev/null
@@ -1,854 +0,0 @@
-/// <reference types="jqueryui" />
-
-import * as FullCalendar from 'fullcalendar';
-import * as moment from 'moment';
-
-// All examples from http://arshaw.com/fullcalendar/docs/
-
-$('#calendar').fullCalendar({});
-
-$('#calendar').fullCalendar({
-    weekends: false
-});
-
-$('#calendar').fullCalendar({
-    dayClick() {
-        alert('a day has been clicked!');
-    }
-});
-
-$('#calendar').fullCalendar('next');
-
-$('#calendar').fullCalendar({
-    events: 'http://www.google.com/your_feed_url/'
-});
-
-$('#calendar').fullCalendar({
-    events: {
-        url: 'http://www.google.com/your_feed_url/',
-        className: 'gcal-event',           // an option!
-        currentTimezone: 'America/Chicago' // an option!
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-    // source with no options
-        "http://www.google.com/your_feed_url1/",
-
-    // source with no options
-        "http://www.google.com/your_feed_url2/",
-
-        // source WITH options
-        {
-            url: "http://www.google.com/your_feed_url3/",
-            className: 'nice-event'
-        }
-    ]
-});
-
-$('#calendar').fullCalendar({
-    height: 650
-});
-
-$('#calendar').fullCalendar('option', 'height', 700);
-
-$('#calendar').fullCalendar({
-    contentHeight: 600
-});
-
-$('#calendar').fullCalendar('option', 'contentHeight', 650);
-
-$('#calendar').fullCalendar({
-    aspectRatio: 2
-});
-
-$('#calendar').fullCalendar('option', 'aspectRatio', 1.8);
-
-$('#calendar').fullCalendar({
-    viewRender(view) {
-        alert('The new title of the view is ' + view.title);
-    }
-});
-
-$('#calendar').fullCalendar({
-    windowResize(view) {
-        alert('The calendar has adjusted to a window resize');
-    }
-});
-
-$('#calendar').fullCalendar('render');
-
-$('#calendar').fullCalendar({
-    dragOpacity: .5
-});
-
-const view = $('#calendar').fullCalendar('getView');
-alert("The view's title is " + view.title);
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,basicWeek,basicDay'
-        },
-        editable: true,
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,basicWeek,basicDay'
-        },
-        defaultView: 'basicWeek',
-        editable: true,
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,basicWeek,basicDay'
-        },
-        defaultView: 'basicDay',
-        editable: true,
-        events: [
-            {
-                id: 1,
-                title: "Long Event",
-                start: new Date(y, m, d, 14, 0),
-                end: new Date(y, m, d + 3),
-                allDay: false
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d - 1),
-                allDay: true
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d + 6),
-                allDay: true
-            },
-            {
-                id: 3,
-                title: "Meeting",
-                start: new Date(y, m, d, 9, 0),
-                allDay: false
-            },
-            {
-                id: 4,
-                title: "Click for Facebook",
-                start: new Date(y, m, d, 16),
-                end: new Date(y, m, d),
-                url: "http://facebook.com/",
-                allDay: false
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        editable: true,
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        defaultView: 'agendaWeek',
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        defaultView: 'agendaDay',
-        editable: true,
-        events: [
-            {
-                id: 1,
-                title: "Long Event",
-                start: new Date(y, m, d),
-                end: new Date(y, m, d + 3),
-                allDay: true
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d - 1),
-                allDay: true
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d + 6),
-                allDay: true
-            },
-            {
-                id: 3,
-                title: "Meeting",
-                start: new Date(y, m, d, 10, 0),
-                allDay: false
-            },
-            {
-                id: 4,
-                title: "Click for Facebook",
-                start: new Date(y, m, d, 11, 30),
-                end: new Date(y, m, d),
-                url: "http://facebook.com/",
-                allDay: false
-            }
-        ]
-    });
-});
-
-$('#my-prev-button').click(() => {
-    $('#calendar').fullCalendar('prev');
-});
-
-$('#my-next-button').click(() => {
-    $('#calendar').fullCalendar('next');
-});
-
-$('#my-today-button').click(() => {
-    $('#calendar').fullCalendar('today');
-});
-
-$('#calendar').fullCalendar('gotoDate', 1, 0, 1);
-
-$('#my-button').click(() => {
-    const d = $('#calendar').fullCalendar('getDate');
-    alert("The current date of the calendar is " + d);
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'My Event',
-            start: '2010-01-01T14:30:00',
-            allDay: false
-        }
-        // other events here...
-    ],
-    timeFormat: 'H(:mm)' // uppercase H for 24-hour clock
-});
-
-$('#calendar').fullCalendar({
-    buttonText: {
-        prev: '&lt;',
-        next: '&gt;'
-    }
-});
-
-$('#calendar').fullCalendar({
-    dayClick(date, jsEvent, view) {
-        alert(`Coordinates: ${jsEvent.pageX},${jsEvent.pageY}`);
-
-        alert('Current view: ' + view.name);
-
-        // change the day's background color just for fun
-        $(this).css('background-color', 'red');
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventClick(calEvent, jsEvent, view) {
-        alert('Event: ' + calEvent.title);
-        alert(`Coordinates: ${jsEvent.pageX},${jsEvent.pageY}`);
-        alert('View: ' + view.name);
-
-        // change the border color just for fun
-        $(this).css('border-color', 'red');
-    }
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'My Event',
-            start: '2010-01-01',
-            url: 'http://google.com/'
-        }
-        // other events here
-    ],
-    eventClick(event) {
-        if (event.url) {
-            window.open(event.url);
-            return false;
-        }
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            url: '/myfeed.php',
-            type: 'POST',
-            data: {
-                custom_param1: 'something',
-                custom_param2: 'somethingelse'
-            },
-            error() {
-                alert('there was an error while fetching events!');
-            },
-            color: 'yellow',   // a non-ajax option
-            textColor: 'black' // a non-ajax option
-        }
-
-        // any other sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    events: {
-        url: '/myfeed.php',
-        type: 'POST',
-        data: {
-            custom_param1: 'something',
-            custom_param2: 'somethingelse'
-        },
-        error() {
-            alert('there was an error while fetching events!');
-        },
-        color: 'yellow',   // a non-ajax option
-        textColor: 'black' // a non-ajax option
-    }
-});
-
-$('#calendar').fullCalendar({
-    events: {
-        url: '/myfeed.php',
-        cache: true
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            url: '/myfeed.php', // use the `url` property
-            color: 'yellow',    // an option!
-            textColor: 'black'  // an option!
-        }
-
-        // any other sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    events: '/myfeed.php'
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'event1',
-            start: '2010-01-01'
-        },
-        {
-            title: 'event2',
-            start: '2010-01-05',
-            end: '2010-01-07'
-        },
-        {
-            title: 'event3',
-            start: '2010-01-09 12:30:00',
-            allDay: false // will make the time show
-        }
-    ]
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            events: [ // put the array in the `events` property
-                {
-                    title: 'event1',
-                    start: '2010-01-01'
-                },
-                {
-                    title: 'event2',
-                    start: '2010-01-05',
-                    end: '2010-01-07'
-                },
-                {
-                    title: 'event3',
-                    start: '2010-01-09 12:30:00',
-                }
-            ],
-            color: 'black',     // an option!
-            textColor: 'yellow' // an option!
-        }
-
-        // any other event sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    events(start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: (events: FullCalendar.EventObject[]) => void) {
-        $.ajax({
-            url: 'myxmlfeed.php',
-            dataType: 'xml',
-            data: {
-                // our hypothetical feed requires UNIX timestamps
-                start: Math.round(start.toDate().getTime() / 1000),
-                end: Math.round(end.toDate().getTime() / 1000)
-            },
-            success(doc) {
-                const events: any[] = [];
-                $(doc).find('event').each(() => {
-                    events.push({
-                        title: $(this).attr('title'),
-                        start: $(this).attr('start') // will be parsed
-                    });
-                });
-                callback(events);
-            }
-        });
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            events(start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: (events: FullCalendar.EventObject[]) => void) {
-                // ...
-            },
-            color: 'yellow',   // an option!
-            textColor: 'black' // an option!
-        }
-        // any other sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        '/feed1.php',
-        '/feed2.php'
-    ]
-});
-
-$('#calendar').fullCalendar({
-    eventClick(event, element) {
-        event.title = "CLICKED!";
-
-        $('#calendar').fullCalendar('updateEvent', event);
-    }
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        // my event data
-    ],
-    eventColor: '#378006'
-});
-
-interface JQueryQTip extends JQuery {
-    qtip(options: Object): JQuery; // dummy plugin interface
-}
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'My Event',
-            start: '2010-01-01',
-            description: 'This is a cool event'
-        }
-        // more events here
-    ],
-    eventRender(event: FullCalendar.EventObject, element: JQueryQTip, view: FullCalendar.ViewObject) {
-        element.qtip({
-            content: event.description
-        });
-    }
-});
-$('#my-draggable').draggable({
-    revert: true,      // immediately snap back to original position
-    revertDuration: 0  //
-});
-
-$('#calendar').fullCalendar({
-    droppable: true,
-    drop(date, allDay) {
-        alert(`Dropped on ${date} with allDay=${allDay}`);
-    }
-});
-
-$('#calendar').fullCalendar({
-    droppable: true,
-    dropAccept: '.cool-event',
-    drop() {
-        alert('dropped!');
-    }
-});
-
-$('#draggable1').draggable();
-$('#draggable2').draggable();
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        editable: true,
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    /* initialize the external events
-    -----------------------------------------------------------------*/
-    $('#external-events div.external-event').each(() => {
-        // create an Event Object (http://arshaw.com/fullcalendar/docs/event_data/Event_Object/)
-        // it doesn't need to have a start or end
-        const eventObject = {
-            title: $.trim($(this).text()) // use the element's text as the event title
-        };
-
-        // store the Event Object in the DOM element so we can get to it later
-        $(this).data('eventObject', eventObject);
-
-        // make the event draggable using jQuery UI
-        $(this).draggable({
-            zIndex: 999,
-            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',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        editable: true,
-        droppable: true, // this allows things to be dropped onto the calendar !!!
-        drop(date, allDay) { // this function is called when something is dropped
-
-            // retrieve the dropped element's stored Event Object
-            const originalEventObject = $(this).data('eventObject');
-
-            // we need to copy it, so that multiple events don't have a reference to the same object
-            const copiedEventObject: any = $.extend({}, originalEventObject);
-
-            // assign it the date that was reported
-            copiedEventObject.start = date;
-            copiedEventObject.allDay = allDay;
-
-            // render the event on the calendar
-            // the last `true` argument determines if the event "sticks" (http://arshaw.com/fullcalendar/docs/event_rendering/renderEvent/)
-            $('#calendar').fullCalendar('renderEvent', copiedEventObject, true);
-
-            // is the "remove after drop" checkbox checked?
-            if ($('#drop-remove').is(':checked')) {
-                // if so, remove the element from the "Draggable Events" list
-                $(this).remove();
-            }
-        }
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        editable: true,
-        events: [{
-            id: 'test1',
-            title: 'event full of features',
-            start: new Date(y, m, 1),
-            startEditable: true,
-            allDay: false,
-            url: 'http://www.google.com',
-            className: 'gcal-event',
-            editable: false,
-            durationEditable: false,
-            rendering: 'background',
-            overlap: false,
-            constraint: {
-                start: '10:00',
-                end: '18:00',
-                dow: [ 1, 2 ],
-                // days of week. an array of zero-based day of week integers (0=Sunday)
-                // (Monday-Tuesday in this example)
-            },
-            color: 'white',
-            backgroundColor: 'black',
-            borderColor: 'grey',
-            textColor: 'white',
-        }],
-    });
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        editable: true,
-        events: [{
-            id: 'test2',
-            title: 'just an event',
-            start: new Date(y, m, 1),
-        }],
-        eventConstraint: 'businessHours',
-        eventLimit: true,
-        businessHours: [{
-            start: '10:00',
-            end: '18:00',
-            dow: [ 1, 2 ],
-            // days of week. an array of zero-based day of week integers (0=Sunday)
-            // (Monday-Tuesday in this example)
-        }, {
-            start: '09:00',
-            end: '19:00',
-            dow: [ 3, 4 ],
-        }],
-    });
-
-    $('#calendar').fullCalendar('refetchEventSources', 'http://www.google.com/your_feed_url1/');
-});
-
-$('#calendar').fullCalendar('refetchEvents');
diff --git a/types/fullcalendar/index.d.ts b/types/fullcalendar/index.d.ts
deleted file mode 100644
index 196de10898..0000000000
--- a/types/fullcalendar/index.d.ts
+++ /dev/null
@@ -1,1134 +0,0 @@
-// Type definitions for FullCalendar 3.5
-// Project: http://fullcalendar.io/
-// Definitions by: Neil Stalker <https://github.com/nestalk>,
-//                 Marcelo Camargo <https://github.com/hasellcamargo>,
-//                 Patrick Niemann <https://github.com/panic175>
-//                 Hadrien Milano <https://github.com/hmil>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery"/>
-
-import * as moment from 'moment';
-
-export as namespace FC;
-
-export interface Calendar {
-    /**
-     * Gets the version of Fullcalendar
-     */
-    version: string;
-}
-
-export interface BusinessHours {
-    start: moment.Duration | string | Date;
-    end: moment.Duration | string | Date;
-    dow: number[];
-}
-
-export interface Timespan {
-    start: moment.Moment | string | Date;
-    end?: moment.Moment | string | Date;
-}
-
-export interface Header {
-    left: string;
-    center: string;
-    right: string;
-}
-
-export interface CustomButtonDefinition {
-    text: string;
-    click(element: JQuery): void;
-    icon?: string;
-    themeIcon?: string;
-    bootstrapGlyphicon?: string;
-}
-
-export interface ButtonIconsDefinition {
-    prev: string;
-    next: string;
-    prevYear: string;
-    nextYear: string;
-}
-
-export interface EventSegment {
-    /**
-     * the Event Object
-     */
-    event: EventObject;
-
-    /**
-     * the Moment for when this stretch of the event begins
-     */
-    start: moment.Moment;
-
-    /**
-     * the Moment for when this stretch of the event ends (exclusive)
-     */
-    end: moment.Moment;
-
-    /**
-     * boolean if this is chronologically the first segment for the event
-     */
-    isStart: boolean;
-
-    /**
-     * boolean if this is chronologically the last segment for the event
-     */
-    isEnd: boolean;
-}
-
-export interface CellInfo {
-    /**
-     * the Moment date of the day
-     */
-    date: moment.Moment;
-
-    /**
-     * jQuery element for the day cell
-     */
-    dayEl: JQuery;
-
-    /**
-     * jQuery element for the "more" link
-     */
-    moreEl: JQuery;
-
-    /**
-     * array of all event "segment" objects for the given day
-     */
-    segs: EventSegment[];
-
-    /**
-     * array of only the segment objects that were not displayed prior
-     */
-    hiddenSegs: EventSegment[];
-}
-
-export interface TimeRange {
-    start: string | Date | moment.Moment;
-    end: string | Date | moment.Moment;
-}
-
-export interface DropInfo {
-    start: moment.Moment;
-
-    /**
-     *  exclusive end date/time
-     */
-    end: moment.Moment;
-
-    /**
-     *  if you are using a Resource View
-     */
-    resourceId?: string;
-}
-
-export interface Options extends
-        GeneralDisplayOptions,
-        TimezoneOptions,
-        ViewsOptions,
-        AgendaOptions,
-        ListViewOptions,
-        CurrentDateOptions,
-        TextTimeCustomizationOptions,
-        ClickingAndHoveringOptions,
-        SelectionOptions,
-        EventDataOptions,
-        EventRenderingOptions,
-        EventDraggingResizingOptions,
-        DroppingExternalElementsOptions {
-    // scheduler options
-    resourceAreaWidth?: number;
-    schedulerLicenseKey?: string;
-    resourceLabelText?: any;
-    resourceColumns?: any;
-    displayEventTime?: any;
-}
-
-/**
- * General display - https://fullcalendar.io/docs/display/
- */
-export interface GeneralDisplayOptions {
-    /**
-     * Defines the buttons and title at the top of the calendar.
-     *
-     * default:
-     *  {
-     *      left:   'title',
-     *      center: '',
-     *      right:  'today prev,next'
-     *  }
-     */
-    header?: boolean | Header;
-
-    /**
-     * Renders a set of controls at the bottom of the calendar.
-     *
-     * default: false
-     */
-    footer?: boolean | Header;
-
-    /**
-     * Defines custom buttons that can be used in the header.
-     */
-    customButtons?: { [name: string]: CustomButtonDefinition };
-
-    /**
-     * Determines which icons are displayed in buttons of the header.
-     *
-     * default:
-     *  {
-     *      prev: 'left-single-arrow',
-     *      next: 'right-single-arrow',
-     *      prevYear: 'left-double-arrow',
-     *      nextYear: 'right-double-arrow'
-     *  }
-     *
-     */
-    buttonIcons?: boolean | ButtonIconsDefinition;
-
-    /**
-     * Renders the calendar with a given theme system.
-     *
-     * default: 'standard'
-     */
-    themeSystem?: 'standard' | 'bootstrap3' | 'jquery-ui';
-
-    /**
-     * Determines which icons are displayed in buttons of the header when jQuery UI theming is on.
-     */
-    themeButtonIcons?: boolean | ButtonIconsDefinition;
-
-    /**
-     * Determines which icons are displayed in buttons of the header when Bootstrap theming is on.
-     */
-    bootstrapGlyphicons?: boolean | ButtonIconsDefinition;
-
-    /**
-     * The day that each week begins.
-     *
-     * 0 = Sunday
-     *
-     * default: set by the current `locale`
-     */
-    firstDay?: number;
-
-    /**
-     * Displays the calendar in right-to-left mode.
-     *
-     * default: false
-     */
-    isRTL?: boolean;
-
-    /**
-     * Whether to include Saturday/Sunday columns in any of the calendar views.
-     *
-     * default: true
-     */
-    weekends?: boolean;
-
-    /**
-     * Exclude certain days-of-the-week from being displayed.
-     *
-     * default: []
-     */
-    hiddenDays?: number[];
-
-    /**
-     * Determines the number of weeks displayed in a month view.
-     *
-     * default: true
-     */
-    fixedWeekCount?: boolean;
-
-    /**
-     * Determines if week numbers should be displayed on the calendar.
-     *
-     * default: false
-     */
-    weekNumbers?: boolean;
-
-    /**
-     * Determines the styling for week numbers in month view and the basic views.
-     *
-     * default: false
-     */
-    weekNumbersWithinDays?: boolean;
-
-    /**
-     * The method for calculating week numbers that are displayed with the weekNumbers setting.
-     *
-     * default: 'local'
-     */
-    weekNumberCalculation?: 'local' | 'ISO' | ((m: moment.Moment) => number);
-
-    /**
-     * Emphasizes certain time slots on the calendar. By default, Monday-Friday, 9am-5pm.
-     *
-     * default: false
-     */
-    businessHours?: boolean | BusinessHours | BusinessHours[];
-
-    /**
-     * In month view, whether dates in the previous or next month should be rendered at all.
-     *
-     * default: true
-     */
-    showNonCurrentDates?: boolean;
-
-    /**
-     * Will make the entire calendar (including header) a pixel height.
-     *
-     * default: undefined
-     */
-    height?: number | 'auto' | 'parent' | (() => number);
-
-    /**
-     * Will make the calendar's content area a pixel height.
-     */
-    contentHeight?: number | 'auto' | (() => number);
-
-    /**
-     * Determines the width-to-height aspect ratio of the calendar.
-     *
-     * default: 1.35
-     */
-    aspectRatio?: number;
-
-    /**
-     * Whether to automatically resize the calendar when the browser window resizes.
-     *
-     * default: true
-     */
-    handleWindowResize?: boolean;
-
-    /**
-     * Time, in milliseconds, the calendar will wait to adjust its size after a window resize event occurs.
-     *
-     * default: 100
-     */
-    windowResizeDelay?: number;
-
-    /**
-     * Limits the number of events displayed on a day.
-     *
-     * default: false
-     */
-    eventLimit?: boolean | number;
-
-    /**
-     * Determines the action taken when the user clicks on a "more" link created by the eventLimit option.
-     */
-    eventLimitClick?: 'popover' | 'week' | 'day' | string | ((cellinfo: CellInfo, jsevent: Event) => void);
-
-    /**
-     * Triggered when a new date-range is rendered, or when the view type switches.
-     */
-    viewRender?(view: ViewObject, element: JQuery): void;
-
-    /**
-     * Triggered when a rendered date-range needs to be torn down.
-     */
-    viewDestroy?(view: ViewObject, element: JQuery): void;
-
-    /**
-     * A hook for modifying a day cell.
-     */
-    dayRender?(date: moment.Moment, cell: JQuery): void;
-
-    /**
-     * Triggered after the calendar's dimensions have been changed due to the browser window being resized.
-     */
-    windowResize?(view: ViewObject): void;
-}
-
-/**
- * Timezone - https://fullcalendar.io/docs/timezone/
- */
-export interface TimezoneOptions {
-    /**
-     * Determines the timezone in which dates throughout the API are parsed and rendered.
-     *
-     * default: false
-     */
-    timezone?: string | boolean;
-
-    /**
-     * Explicitly sets the "today" date of the calendar. This is the day that is normally highlighted in yellow.
-     */
-    now?: moment.Moment | Date | string | (() => moment.Moment);
-}
-
-/**
- * Views - https://fullcalendar.io/docs/views/
- */
-export interface ViewsOptions {
-    /**
-     * The initial view when the calendar loads.
-     *
-     * default: 'month'
-     */
-    defaultView?: string;
-
-    views?: ViewSpecificOptions;
-}
-
-/**
- * Agenda Options - https://fullcalendar.io/docs/agenda/
- */
-export interface AgendaOptions {
-    /**
-     * Determines if the "all-day" slot is displayed at the top of the calendar.
-     *
-     * default: true
-     */
-    allDaySlot?: boolean;
-
-    /**
-     * The text titling the "all-day" slot at the top of the calendar.
-     *
-     * default: 'all-day'
-     */
-    allDayText?: string;
-
-    /**
-     * The frequency for displaying time slots.
-     *
-     * default: '00:30:00'
-     */
-    slotDuration?: moment.Duration;
-
-    /**
-     * Determines the time-text that will be displayed on the vertical axis of the agenda views.
-     *
-     * default: 'h(:mm)a'
-     */
-    slotLabelFormat?: string;
-
-    /**
-     * Determines how often the time-axis is labeled with text displaying the date/time of slots.
-     */
-    slotLabelInterval?: moment.Duration;
-
-    /**
-     * The time interval at which a dragged event will snap to the agenda view time grid. Also affects the granularity at which `selections` can be made.
-     */
-    snapDuration?: moment.Duration;
-
-    /**
-     * Determines how far down the scroll pane is initially scrolled down.
-     *
-     * default: '06:00:00' (6am)
-     */
-    scrollTime?: moment.Duration;
-
-    /**
-     * Determines the starting time that will be displayed, even when the scrollbars have been scrolled all the way up.
-     *
-     * default: "00:00:00"
-     */
-    minTime?: moment.Duration;
-
-    /**
-     * Determines the end time (exclusively) that will be displayed, even when the scrollbars have been scrolled all the way down.
-     *
-     * default: "24:00:00"
-     */
-    maxTime?: moment.Duration;
-
-    /**
-     * Determines if timed events in agenda view should visually overlap.
-     *
-     * default: true
-     */
-    slotEventOverlap?: boolean;
-}
-
-/**
- * List View - https://fullcalendar.io/docs/list_view/
- */
-export interface ListViewOptions {
-    /**
-     * A date formatting string that affects the text on the left side of the day headings in list view.
-     */
-    listDayFormat?: string | boolean;
-
-    /**
-     * A date formatting string that affects the text on the right side of the day headings in list view.
-     */
-    listDayAltFormat?: string | boolean;
-
-    /**
-     * The text that is displayed in the middle of list view, alerting the user that there are no events within the given range.
-     *
-     * default: "No events to display"
-     */
-    noEventsMessage?: string;
-}
-
-/**
- *  Current Date - https://fullcalendar.io/docs/current_date/
- */
-export interface CurrentDateOptions {
-    /**
-     * The initial date displayed when the calendar first loads.
-     */
-    defaultDate?: moment.Moment | Date | string;
-
-    /**
-     * Whether or not to display a marker indicating the current time.
-     *
-     * default: false
-     */
-    nowIndicator?: boolean;
-
-    /**
-     * Sets the exact date range that is visible in a view.
-     */
-    visibleRange?: ((currentDate: moment.Moment) => TimeRange) | TimeRange;
-
-    /**
-     * Limits which dates the user can navigate to and where events can go.
-     */
-    validRange?: TimeRange;
-
-    /**
-     * How far into the future/past the calendar navigates when prev/next is executed.
-     */
-    dateIncrement?: moment.Duration;
-
-    /**
-     * Determines the first visible day for a Custom or Generic view.
-     */
-    dateAlignment?: string;
-
-    /**
-     * Sets the exact duration of a Custom or Generic view.
-     */
-    duration?: moment.Duration;
-
-    /**
-     * Sets the exact number of days displayed in a Custom or Generic view, regardless of weekends or hiddenDays.
-     */
-    dayCount?: number;
-}
-
-/**
- * Text/Time Customization - https://fullcalendar.io/docs/text/
- */
-export interface TextTimeCustomizationOptions {
-    /**
-     * Customize the language and localization options for the calendar.
-     *
-     * default 'en'
-     */
-    locale?: string;
-
-    /**
-     * Determines the time-text that will be displayed on each event.
-     */
-    timeFormat?: string;
-
-    /**
-     * Determines the text that will be displayed on the calendar's column headings.
-     */
-    columnFormat?: string;
-
-    /**
-     * Determines the text that will be displayed in the header's title.
-     */
-    titleFormat?: string;
-
-    /**
-     * Text that will be displayed on buttons of the header.
-     */
-    buttonText?: ButtonTextObject;
-
-    /**
-     * Full names of months.
-     */
-    monthNames?: string[];
-
-    /**
-     * Abbreviated names of months.
-     */
-    monthNamesShort?: string[];
-
-    /**
-     * Full names of days-of-week.
-     */
-    dayNames?: string[];
-
-    /**
-     * Abbreviated names of days-of-week.
-     */
-    dayNamesShort?: string[];
-
-    /**
-     * The heading text for week numbers.
-     *
-     * default: 'W'
-     */
-    weekNumberTitle?: string;
-
-    /**
-     * Whether or not to display the text for an event's time.
-     */
-    displayEventTime?: boolean;
-
-    /**
-     * Whether or not to display an event's end time text when it is rendered on the calendar.
-     */
-    displayEventEnd?: boolean;
-
-    /**
-     * Determines the text of the link created by eventLimit setting.
-     *
-     * default: "more"
-     */
-    eventLimitText?: string | ((nEvents: number) => string);
-
-    /**
-     * Determines the date format of title of the popover created by the eventLimitClick option.
-     */
-    dayPopoverFormat?: string;
-}
-
-/**
- * Clicking & Hovering - https://fullcalendar.io/docs/mouse/
- */
-export interface ClickingAndHoveringOptions {
-    /**
-     * Determines if day names and week names are clickable.
-     *
-     * default: false
-     */
-    navLinks?: boolean;
-
-    /**
-     * Determines what happens upon a day heading nav-link click.
-     */
-    navLinkDayClick?: string | ((date: any, jsEvent: Event) => void);
-
-    /**
-     * Determines what happens upon a week-number nav-link click.
-     */
-    navLinkWeekClick?: string | ((weekStart: any, jsEvent: Event) => void);
-
-    /**
-     * Triggered when the user clicks on a day.
-     */
-    dayClick?(date: Date, jsEvent: MouseEvent, view: ViewObject): void;
-
-    /**
-     * Triggered when the user clicks an event.
-     */
-    eventClick?(event: EventObject, jsEvent: MouseEvent, view: ViewObject): boolean | void; // return type boolean or void
-
-    /**
-     * Triggered when the user mouses over an event.
-     */
-    eventMouseover?(event: EventObject, jsEvent: MouseEvent, view: ViewObject): void;
-
-    /**
-     * Triggered when the user mouses out of an event.
-     */
-    eventMouseout?(event: EventObject, jsEvent: MouseEvent, view: ViewObject): void;
-}
-
-/**
- * Selection - https://fullcalendar.io/docs/selection/
- */
-export interface SelectionOptions {
-    selectable?: boolean;
-    selectHelper?: boolean;
-    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;
-}
-
-/**
- * Event Data - https://fullcalendar.io/docs/event_data/
- *
- * TODO: update interface to v3
- */
-export interface EventDataOptions {
-    /**
-     * This has one of the following types:
-     *
-     * - EventObject[]
-     * - string (JSON feed)
-     * - (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: {(events: EventObject[]) => void;}) => void;
-     */
-    events?: any;
-
-    /**
-     * An array, each element being one of the following types:
-     *
-     * - EventSource
-     * - EventObject[]
-     * - string (JSON feed)
-     * - (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: {(events: EventObject[]) => void;}) => void;
-     */
-    eventSources?: any[];
-
-    allDayDefault?: boolean;
-    startParam?: string;
-    endParam?: string;
-    lazyFetching?: boolean;
-    eventDataTransform?(eventData: any): EventObject;
-    loading?(isLoading: boolean, view: ViewObject): void;
-}
-
-/**
- * Event Rendering - https://fullcalendar.io/docs/event_rendering/
- */
-export interface EventRenderingOptions {
-    /**
-     * Sets the background and border colors for all events on the calendar.
-     */
-    eventColor?: string;
-
-    /**
-     * Sets the background color for all events on the calendar.
-     */
-    eventBackgroundColor?: string;
-
-    /**
-     * Sets the border color for all events on the calendar.
-     */
-    eventBorderColor?: string;
-
-    /**
-     * Sets the text color for all events on the calendar.
-     */
-    eventTextColor?: string;
-
-    /**
-     * When an event's end time spans into another day, the minimum time it must be in order for it to render as if it were on that day.
-     *
-     * default: "09:00:00" (9am)
-     */
-    nextDayThreshold?: moment.Duration;
-
-    /**
-     * Determines the vertical ordering events that have the same dates / times.
-     *
-     * default 'title'
-     */
-    eventOrder?: string | Array<((a: EventObject, b: EventObject) => number) | (string | ((a: EventObject, b: EventObject) => number))>;
-
-    /**
-     * The amount of milliseconds to wait after an operation, before rendering events.
-     *
-     * default: null
-     */
-    eventRenderWait?: number | null;
-
-    /**
-     * Triggered while an event is being rendered.
-     */
-    eventRender?(event: EventObject, element: JQuery, view: ViewObject): void;
-
-    /**
-     * Triggered after an event has been placed on the calendar in its final position.
-     */
-    eventAfterRender?(event: EventObject, element: JQuery, view: ViewObject): void;
-
-    /**
-     * Triggered after all events have finished rendering.
-     */
-    eventAfterAllRender?(view: ViewObject): void;
-
-    /**
-     * Called before an event's element is removed from the DOM.
-     */
-    eventDestroy?(event: EventObject, element: JQuery, view: ViewObject): void;
-}
-
-/**
- * Event Dragging & Resizing - https://fullcalendar.io/docs/event_ui/
- */
-export interface EventDraggingResizingOptions {
-    /**
-     * Determines whether the events on the calendar can be modified.
-     *
-     * default: false
-     */
-    editable?: boolean;
-
-    /**
-     * Allow events' start times to be editable through dragging.
-     *
-     * default: true
-     */
-    eventStartEditable?: boolean;
-
-    /**
-     * Allow events' durations to be editable through resizing.
-     *
-     * default: true
-     */
-    eventDurationEditable?: boolean;
-
-    /**
-     * Time it takes for an event to revert to its original position after an unsuccessful drag.
-     *
-     * default: 500
-     */
-    dragRevertDuration?: number; // integer, milliseconds
-
-    /**
-     * The opacity of an event while it is being dragged.
-     *
-     * default: .75
-     */
-    dragOpacity?: number;
-
-    /**
-     * Whether to automatically move scroll containers during event drag-and-drop or while selecting.
-     *
-     * default: true
-     */
-    dragScroll?: boolean;
-
-    /**
-     * Determines if events on the calendar, when dragged and resized, are allowed to overlap each other.
-     *
-     * default: true
-     */
-    eventOverlap?: boolean | ((stillEvent: EventObject, movingEvent: EventObject) => boolean);
-
-    /**
-     * Limits event dragging and resizing to certain windows of time.
-     */
-    eventConstraint?: "businessHours" | BusinessHours | Timespan | string;
-
-    /**
-     * Exact programmatic control over where an event can be dropped.
-     */
-    eventAllow?: ((dropInfo: DropInfo, draggedEvent: Event) => boolean);
-
-    /**
-     * For touch devices, the amount of time the user most hold down before an event becomes draggable or a date becomes selectable.
-     *
-     * default: 1000
-     */
-    longPressDelay?: number;
-
-    /**
-     * For touch devices, the amount of time the user most hold down before an event becomes draggable.
-     *
-     * default: 1000
-     */
-    eventLongPressDelay?: number;
-
-    /**
-     * Triggered when event dragging begins.
-     */
-    eventDragStart?(event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject): void;
-
-    /**
-     * Triggered when event dragging stops.
-     */
-    eventDragStop?(event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject): void;
-
-    /**
-     * Triggered when dragging stops and the event has moved to a different day/time.
-     */
-    eventDrop?(event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject): void;
-
-    /**
-     * Triggered when event resizing begins.
-     */
-    eventResizeStart?(event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject): void;
-
-    /**
-     * Triggered when event resizing stops.
-     */
-    eventResizeStop?(event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject): void;
-
-    /**
-     * Triggered when resizing stops and the event has changed in duration.
-     */
-    eventResize?(event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject): void;
-}
-
-/**
- * Dropping External Elements - https://fullcalendar.io/docs/dropping/
- */
-export interface DroppingExternalElementsOptions {
-    /**
-     * Determines if jQuery UI draggables can be dropped onto the calendar.
-     *
-     * default: false
-     */
-    droppable?: boolean;
-
-    /**
-     * Provides a way to filter which elements can be dropped onto the calendar.
-     */
-    dropAccept?: string | ((draggable: any) => boolean);
-
-    /**
-     * Called when a valid jQuery UI draggable has been dropped onto the calendar.
-     */
-    drop?(date: moment.Moment, jsEvent: MouseEvent, ui: any): void;
-
-    /**
-     * Called when an external element, containing event data, is dropped on the calendar.
-     */
-    eventReceive?(event: EventObject): void;
-}
-
-export interface ButtonTextObject {
-    prev?: string;
-    next?: string;
-    prevYear?: string;
-    nextYear?: string;
-    today?: string;
-    month?: string;
-    week?: string;
-    day?: string;
-    list?: string;
-}
-
-// TODO: check compatibility with v3 and update if necessary
-/* Refer to http://fullcalendar.io/docs/event_data/Event_Object/ */
-export interface EventObject extends Timespan {
-    id?: any; // String/number
-    title: string;
-    allDay?: boolean;
-    url?: string;
-    className?: string | string[];
-    editable?: boolean;
-    startEditable?: boolean;
-    durationEditable?: boolean;
-    rendering?: string;
-    overlap?: boolean;
-    constraint?: Timespan | BusinessHours;
-    source?: EventSource;
-    color?: string;
-    backgroundColor?: string;
-    borderColor?: string;
-    textColor?: string;
-    // non-standard fields, see https://fullcalendar.io/docs/event_data/Event_Object/ and https://fullcalendar.io/docs/event_rendering/eventRender/
-    [x: string]: any;
-}
-
-// TODO: check compatibility with v3 and update if necessary
-export interface ViewObject extends Timespan {
-    name: string;
-    title: string;
-    intervalStart: moment.Moment;
-    intervalEnd: moment.Moment;
-}
-
-// TODO: check compatibility with v3 and update if necessary
-export interface EventSource extends JQueryAjaxSettings {
-    /**
-     * This has one of the following types:
-     *
-     * - EventObject[]
-     * - string (JSON feed)
-     * - (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: {(events: EventObject[]) => void;}) => void;
-     */
-    events?: any;
-
-    color?: string;
-    backgroundColor?: string;
-    borderColor?: string;
-    textColor?: string;
-    className?: any; // string/string[]
-    editable?: boolean;
-    allDayDefault?: boolean;
-    ignoreTimezone?: boolean;
-    eventTransform?: any;
-    startParam?: string;
-    endParam?: string;
-}
-
-/*
-* View Specific Options - http://fullcalendar.io/docs/views/View-Specific-Options/
-* TODO: check compatibility with v3 and update if necessary
-*/
-export interface ViewSpecificOptions {
-    basic?: Options;
-    agenda?: Options;
-    week?: Options;
-    day?: Options;
-    month?: Options;
-    basicWeek?: Options;
-    basicDay?: Options;
-    agendaWeek?: Options;
-    agendaDay?: Options;
-}
-
-declare global {
-    // TODO: check compatibility with v3 and update if necessary
-    interface JQuery {
-        /**
-         * Get/Set option value
-         */
-        fullCalendar(method: 'option', option: string, value?: any): void;
-
-        /**
-         * Immediately forces the calendar to render and/or readjusts its size.
-         */
-        fullCalendar(method: 'render'): void;
-
-        /**
-         * Restores the element to the state before FullCalendar was initialized.
-         */
-        fullCalendar(method: 'destroy'): void;
-
-        /**
-         * Returns the View Object for the current view.
-         */
-        fullCalendar(method: 'getView'): ViewObject;
-
-        /**
-         * Immediately switches to a different view.
-         */
-        fullCalendar(method: 'changeView', viewName: string): void;
-
-        /**
-         * Moves the calendar one step back (either by a month, week, or day).
-         */
-        fullCalendar(method: 'prev'): void;
-
-        /**
-         * Moves the calendar one step forward (either by a month, week, or day).
-         */
-        fullCalendar(method: 'next'): void;
-
-        /**
-         * Moves the calendar back one year.
-         */
-        fullCalendar(method: 'prevYear'): void;
-
-        /**
-         * Moves the calendar forward one year.
-         */
-        fullCalendar(method: 'nextYear'): void;
-
-        /**
-         * Moves the calendar to the current date.
-         */
-        fullCalendar(method: 'today'): void;
-
-        /**
-         * Moves the calendar to an arbitrary year/month/date.
-         */
-        fullCalendar(method: 'gotoDate', year: number, month?: number, date?: number): void;
-
-        /**
-         * Moves the calendar to an arbitrary date.
-         */
-        fullCalendar(method: 'gotoDate', date: moment.Moment | Date | string): void;
-
-        /**
-         * Moves the calendar forward/backward an arbitrary amount of time.
-         */
-        fullCalendar(method: 'incrementDate', year: number, month?: number, date?: number): void;
-
-        /**
-         * Returns a Date object for the current date of the calendar.
-         */
-        fullCalendar(method: 'getDate'): Date;
-
-        /**
-         * A method for programmatically selecting a period of time.
-         */
-        fullCalendar(method: 'select', startDate: Date, endDate: Date, allDay: boolean): void;
-
-        /**
-         * A method for programmatically clearing the current selection.
-         */
-        fullCalendar(method: 'unselect'): void;
-
-        /**
-         * Reports changes to an event and renders them on the calendar.
-         */
-        fullCalendar(method: 'updateEvent', event: EventObject): void;
-
-        /**
-         * Reports changes for multiple events and renders them on the calendar.
-         */
-        fullCalendar(method: 'updateEvents', events: EventObject[]): void;
-
-        /**
-         * Retrieves events that FullCalendar has in memory.
-         */
-        fullCalendar(method: 'clientEvents', idOrfilter?: any): EventObject[];
-
-        /**
-         * Retrieves events that FullCalendar has in memory.
-         */
-        fullCalendar(method: 'clientEvents', idOrfilter?: (e: EventObject) => boolean): EventObject[];
-
-        /**
-         * Removes events from the calendar.
-         */
-        fullCalendar(method: 'removeEvents', idOrfilter?: any): void;
-
-        /**
-         * Removes events from the calendar.
-         */
-        fullCalendar(method: 'removeEvents', idOrfilter?: (e: EventObject) => boolean): void;
-
-        /**
-         * Refetches events from all sources and rerenders them on the screen.
-         */
-        fullCalendar(method: 'refetchEvents'): void;
-
-        /**
-         * Dynamically adds an event source.
-         */
-        fullCalendar(method: 'addEventSource', source: any): void;
-
-        /**
-         * Dynamically removes an event source.
-         */
-        fullCalendar(method: 'removeEventSource', source: any): void;
-
-        /**
-         * Renders a new event on the calendar.
-         */
-        fullCalendar(method: 'renderEvent', event: EventObject, stick?: boolean): void;
-
-        /**
-         * Renders new events on the calendar.
-         */
-        fullCalendar(method: 'renderEvents', events: EventObject[], stick?: boolean): void;
-
-        /**
-         * Rerenders all events on the calendar.
-         */
-        fullCalendar(method: 'rerenderEvents'): void;
-
-        /**
-         * Refetches one or more specific event sources.
-         */
-        fullCalendar(method: 'refetchEventSources', source: any): void;
-
-        /**
-         * Create calendar object
-         */
-        fullCalendar(options: Options): JQuery;
-
-        /**
-         * Generic method function
-         */
-        fullCalendar(method: string, arg1: any, arg2: any, arg3: any): void;
-    }
-
-    interface JQueryStatic {
-        fullCalendar: Calendar;
-    }
-}
diff --git a/types/fullcalendar/package.json b/types/fullcalendar/package.json
deleted file mode 100644
index fce08a048d..0000000000
--- a/types/fullcalendar/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "moment": ">=2.14.0"
-    }
-}
\ No newline at end of file
diff --git a/types/fullcalendar/tsconfig.json b/types/fullcalendar/tsconfig.json
deleted file mode 100644
index 289c13f80e..0000000000
--- a/types/fullcalendar/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fullcalendar-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/fullcalendar/tslint.json b/types/fullcalendar/tslint.json
deleted file mode 100644
index 1b62a88e52..0000000000
--- a/types/fullcalendar/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "ban-types": false,
-        "unified-signatures": false
-    }
-}
diff --git a/types/fullcalendar/v1/fullcalendar-tests.ts b/types/fullcalendar/v1/fullcalendar-tests.ts
deleted file mode 100644
index f5c81c0727..0000000000
--- a/types/fullcalendar/v1/fullcalendar-tests.ts
+++ /dev/null
@@ -1,793 +0,0 @@
-/// <reference types="jqueryui" />
-
-// All examples from http://arshaw.com/fullcalendar/docs/
-
-$('#calendar').fullCalendar({});
-
-$('#calendar').fullCalendar({
-    weekends: false
-});
-
-$('#calendar').fullCalendar({
-    dayClick: () => {
-        alert('a day has been clicked!');
-    }
-});
-
-$('#calendar').fullCalendar('next');
-
-$('#calendar').fullCalendar({
-    events: 'http://www.google.com/your_feed_url/'
-});
-
-$('#calendar').fullCalendar({
-    events: {
-        url: 'http://www.google.com/your_feed_url/',
-        className: 'gcal-event',           // an option!
-        currentTimezone: 'America/Chicago' // an option!
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-    // source with no options
-        "http://www.google.com/your_feed_url1/",
-
-    // source with no options
-        "http://www.google.com/your_feed_url2/",
-
-        // source WITH options
-        {
-            url: "http://www.google.com/your_feed_url3/",
-            className: 'nice-event'
-        }
-    ]
-});
-
-$('#calendar').fullCalendar({
-    height: 650
-});
-
-$('#calendar').fullCalendar('option', 'height', 700);
-
-$('#calendar').fullCalendar({
-    contentHeight: 600
-});
-
-$('#calendar').fullCalendar('option', 'contentHeight', 650);
-
-$('#calendar').fullCalendar({
-    aspectRatio: 2
-});
-
-$('#calendar').fullCalendar('option', 'aspectRatio', 1.8);
-
-$('#calendar').fullCalendar({
-    viewRender: view => {
-        alert('The new title of the view is ' + view.title);
-    }
-});
-
-$('#calendar').fullCalendar({
-    windowResize: view => {
-        alert('The calendar has adjusted to a window resize');
-    }
-});
-
-$('#calendar').fullCalendar('render');
-
-$('#calendar').fullCalendar({
-    dragOpacity: .5
-});
-
-const view = $('#calendar').fullCalendar('getView');
-alert("The view's title is " + view.title);
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,basicWeek,basicDay'
-        },
-        editable: true,
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,basicWeek,basicDay'
-        },
-        defaultView: 'basicWeek',
-        editable: true,
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,basicWeek,basicDay'
-        },
-        defaultView: 'basicDay',
-        editable: true,
-        events: [
-            {
-                id: 1,
-                title: "Long Event",
-                start: new Date(y, m, d, 14, 0),
-                end: new Date(y, m, d + 3),
-                allDay: false
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d - 1),
-                allDay: true
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d + 6),
-                allDay: true
-            },
-            {
-                id: 3,
-                title: "Meeting",
-                start: new Date(y, m, d, 9, 0),
-                allDay: false
-            },
-            {
-                id: 4,
-                title: "Click for Facebook",
-                start: new Date(y, m, d, 16),
-                end: new Date(y, m, d),
-                url: "http://facebook.com/",
-                allDay: false
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        editable: true,
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        defaultView: 'agendaWeek',
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        defaultView: 'agendaDay',
-        editable: true,
-        events: [
-            {
-                id: 1,
-                title: "Long Event",
-                start: new Date(y, m, d),
-                end: new Date(y, m, d + 3),
-                allDay: true
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d - 1),
-                allDay: true
-            },
-            {
-                id: 2,
-                title: "Repeating Event",
-                start: new Date(y, m, d + 6),
-                allDay: true
-            },
-            {
-                id: 3,
-                title: "Meeting",
-                start: new Date(y, m, d, 10, 0),
-                allDay: false
-            },
-            {
-                id: 4,
-                title: "Click for Facebook",
-                start: new Date(y, m, d, 11, 30),
-                end: new Date(y, m, d),
-                url: "http://facebook.com/",
-                allDay: false
-            }
-        ]
-    });
-});
-
-$('#my-prev-button').click(() => {
-    $('#calendar').fullCalendar('prev');
-});
-
-$('#my-next-button').click(() => {
-    $('#calendar').fullCalendar('next');
-});
-
-$('#my-today-button').click(() => {
-    $('#calendar').fullCalendar('today');
-});
-
-$('#calendar').fullCalendar('gotoDate', 1, 0, 1);
-
-$('#my-button').click(() => {
-    const d = $('#calendar').fullCalendar('getDate');
-    alert("The current date of the calendar is " + d);
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'My Event',
-            start: '2010-01-01T14:30:00',
-            allDay: false
-        }
-        // other events here...
-    ],
-    timeFormat: 'H(:mm)' // uppercase H for 24-hour clock
-});
-
-$('#calendar').fullCalendar({
-    buttonText: {
-        prev: '&lt;',
-        next: '&gt;'
-    }
-});
-
-$('#calendar').fullCalendar({
-    dayClick(date, allDay, jsEvent, view) {
-        if (allDay) {
-            alert('Clicked on the entire day: ' + date);
-        } else {
-            alert('Clicked on the slot: ' + date);
-        }
-
-        alert(`Coordinates: ${jsEvent.pageX},${jsEvent.pageY}`);
-
-        alert('Current view: ' + view.name);
-
-        // change the day's background color just for fun
-        $(this).css('background-color', 'red');
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventClick(calEvent, jsEvent, view) {
-        alert('Event: ' + calEvent.title);
-        alert(`Coordinates: ${jsEvent.pageX},${jsEvent.pageY}`);
-        alert('View: ' + view.name);
-
-        // change the border color just for fun
-        $(this).css('border-color', 'red');
-    }
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'My Event',
-            start: '2010-01-01',
-            url: 'http://google.com/'
-        }
-        // other events here
-    ],
-    eventClick(event) {
-        if (event.url) {
-            window.open(event.url);
-            return false;
-        }
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            url: '/myfeed.php',
-            type: 'POST',
-            data: {
-                custom_param1: 'something',
-                custom_param2: 'somethingelse'
-            },
-            error: () => {
-                alert('there was an error while fetching events!');
-            },
-            color: 'yellow',   // a non-ajax option
-            textColor: 'black' // a non-ajax option
-        }
-
-        // any other sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    events: {
-        url: '/myfeed.php',
-        type: 'POST',
-        data: {
-            custom_param1: 'something',
-            custom_param2: 'somethingelse'
-        },
-        error: () => {
-            alert('there was an error while fetching events!');
-        },
-        color: 'yellow',   // a non-ajax option
-        textColor: 'black' // a non-ajax option
-    }
-});
-
-$('#calendar').fullCalendar({
-    events: {
-        url: '/myfeed.php',
-        cache: true
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            url: '/myfeed.php', // use the `url` property
-            color: 'yellow',    // an option!
-            textColor: 'black'  // an option!
-        }
-
-        // any other sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    events: '/myfeed.php'
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'event1',
-            start: '2010-01-01'
-        },
-        {
-            title: 'event2',
-            start: '2010-01-05',
-            end: '2010-01-07'
-        },
-        {
-            title: 'event3',
-            start: '2010-01-09 12:30:00',
-            allDay: false // will make the time show
-        }
-    ]
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            events: [ // put the array in the `events` property
-                {
-                    title: 'event1',
-                    start: '2010-01-01'
-                },
-                {
-                    title: 'event2',
-                    start: '2010-01-05',
-                    end: '2010-01-07'
-                },
-                {
-                    title: 'event3',
-                    start: '2010-01-09 12:30:00',
-                }
-            ],
-            color: 'black',     // an option!
-            textColor: 'yellow' // an option!
-        }
-
-        // any other event sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    events(start: any, end: any, callback: any) {
-        $.ajax({
-            url: 'myxmlfeed.php',
-            dataType: 'xml',
-            data: {
-                // our hypothetical feed requires UNIX timestamps
-                start: Math.round(start.getTime() / 1000),
-                end: Math.round(end.getTime() / 1000)
-            },
-            success(doc) {
-                const events: any[] = [];
-                $(doc).find('event').each(() => {
-                    events.push({
-                        title: $(this).attr('title'),
-                        start: $(this).attr('start') // will be parsed
-                    });
-                });
-                callback(events);
-            }
-        });
-    }
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        // your event source
-        {
-            events(start: any, end: any, callback: any) {
-                // ...
-            },
-            color: 'yellow',   // an option!
-            textColor: 'black' // an option!
-        }
-
-        // any other sources...
-    ]
-});
-
-$('#calendar').fullCalendar({
-    eventSources: [
-        '/feed1.php',
-        '/feed2.php'
-    ]
-});
-
-$('#calendar').fullCalendar({
-    eventClick(event, element) {
-        event.title = "CLICKED!";
-
-        $('#calendar').fullCalendar('updateEvent', event);
-    }
-});
-
-$('#calendar').fullCalendar({
-    events: [
-        // my event data
-    ],
-    eventColor: '#378006'
-});
-
-interface EventWithDescription extends FullCalendar.EventObject {
-    description: string;
-}
-interface JQuery {
-    qtip: any; // dummy plugin interface
-}
-
-$('#calendar').fullCalendar({
-    events: [
-        {
-            title: 'My Event',
-            start: '2010-01-01',
-            description: 'This is a cool event'
-        }
-        // more events here
-    ],
-    eventRender(event: EventWithDescription, element: any) {
-        element.qtip({
-            content: event.description
-        });
-    }
-});
-$('#my-draggable').draggable({
-    revert: true,      // immediately snap back to original position
-    revertDuration: 0  //
-});
-
-$('#calendar').fullCalendar({
-    droppable: true,
-    drop(date, allDay) {
-        alert(`Dropped on ${date} with allDay=${allDay}`);
-    }
-});
-
-$('#calendar').fullCalendar({
-    droppable: true,
-    dropAccept: '.cool-event',
-    drop: () => {
-        alert('dropped!');
-    }
-});
-
-$('#draggable1').draggable();
-$('#draggable2').draggable();
-
-$(document).ready(() => {
-    const date = new Date();
-    const d = date.getDate();
-    const m = date.getMonth();
-    const y = date.getFullYear();
-
-    $('#calendar').fullCalendar({
-        theme: true,
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        editable: true,
-        events: [
-            {
-                title: 'All Day Event',
-                start: new Date(y, m, 1)
-            },
-            {
-                title: 'Long Event',
-                start: new Date(y, m, d - 5),
-                end: new Date(y, m, d - 2)
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d - 3, 16, 0),
-                allDay: false
-            },
-            {
-                id: 999,
-                title: 'Repeating Event',
-                start: new Date(y, m, d + 4, 16, 0),
-                allDay: false
-            },
-            {
-                title: 'Meeting',
-                start: new Date(y, m, d, 10, 30),
-                allDay: false
-            },
-            {
-                title: 'Lunch',
-                start: new Date(y, m, d, 12, 0),
-                end: new Date(y, m, d, 14, 0),
-                allDay: false
-            },
-            {
-                title: 'Birthday Party',
-                start: new Date(y, m, d + 1, 19, 0),
-                end: new Date(y, m, d + 1, 22, 30),
-                allDay: false
-            },
-            {
-                title: 'Click for Google',
-                start: new Date(y, m, 28),
-                end: new Date(y, m, 29),
-                url: 'http://google.com/'
-            }
-        ]
-    });
-});
-
-$(document).ready(() => {
-    /* initialize the external events
-    -----------------------------------------------------------------*/
-    $('#external-events div.external-event').each(() => {
-        // create an Event Object (http://arshaw.com/fullcalendar/docs/event_data/Event_Object/)
-        // it doesn't need to have a start or end
-        const eventObject = {
-            title: $.trim($(this).text()) // use the element's text as the event title
-        };
-
-        // store the Event Object in the DOM element so we can get to it later
-        $(this).data('eventObject', eventObject);
-
-        // make the event draggable using jQuery UI
-        $(this).draggable({
-            zIndex: 999,
-            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',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        editable: true,
-        droppable: true, // this allows things to be dropped onto the calendar !!!
-        drop(date, allDay) { // this function is called when something is dropped
-
-            // retrieve the dropped element's stored Event Object
-            const originalEventObject = $(this).data('eventObject');
-
-            // we need to copy it, so that multiple events don't have a reference to the same object
-            const copiedEventObject: any = $.extend({}, originalEventObject);
-
-            // assign it the date that was reported
-            copiedEventObject.start = date;
-            copiedEventObject.allDay = allDay;
-
-            // render the event on the calendar
-            // the last `true` argument determines if the event "sticks" (http://arshaw.com/fullcalendar/docs/event_rendering/renderEvent/)
-            $('#calendar').fullCalendar('renderEvent', copiedEventObject, true);
-
-            // is the "remove after drop" checkbox checked?
-            if ($('#drop-remove').is(':checked')) {
-                // if so, remove the element from the "Draggable Events" list
-                $(this).remove();
-            }
-        }
-    });
-});
-
-$('#calendar').fullCalendar('refetchEvents');
diff --git a/types/fullcalendar/v1/index.d.ts b/types/fullcalendar/v1/index.d.ts
deleted file mode 100644
index 63b70c9cc7..0000000000
--- a/types/fullcalendar/v1/index.d.ts
+++ /dev/null
@@ -1,427 +0,0 @@
-// Type definitions for FullCalendar 1.6
-// Project: http://arshaw.com/fullcalendar/
-// Definitions by: Neil Stalker <https://github.com/nestalk>, Marcelo Camargo <https://github.com/hasellcamargo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery"/>
-import * as moment from "moment";
-
-declare global {
-    namespace FullCalendar {
-        interface Calendar {
-            /**
-             * Formats a Date object into a string.
-             */
-            formatDate(date: Date, format: string, options?: Options): string;
-
-            /**
-             * Formats a date range (two Date objects) into a string.
-             */
-            formatDates(date1: Date, date2: Date, format: string, options?: Options): string;
-
-            /**
-             * Parses a string into a Date object.
-             */
-            parseDate(dateString: string, ignoreTimezone?: boolean): Date;
-
-            /**
-             * Parses an ISO8601 string into a Date object.
-             */
-            parseISO8601(dateString: string, ignoreTimezone?: boolean): Date;
-
-            /**
-             * Gets the version of Fullcalendar
-             */
-            version: string;
-        }
-
-        interface BusinessHours {
-            start: moment.Duration;
-            end: moment.Duration;
-            dow: number[];
-        }
-
-        interface Timespan {
-            start: moment.Moment;
-            end: moment.Moment;
-        }
-
-        interface Options extends AgendaOptions, EventDraggingResizingOptions, DroppingExternalElementsOptions, SelectionOptions {
-            // General display - http://arshaw.com/fullcalendar/docs/display/
-
-            header?: {
-                left: string;
-                center: string;
-                right: string;
-            };
-            theme?: boolean;
-            buttonIcons?: {
-                prev: string;
-                next: string;
-            };
-            firstDay?: number;
-            isRTL?: boolean;
-            weekends?: boolean;
-            hiddenDays?: number[];
-            weekMode?: string;
-            weekNumbers?: boolean;
-            weekNumberCalculation?: any; // String/Function
-            businessHours?: boolean | BusinessHours;
-            height?: number;
-            contentHeight?: number;
-            aspectRatio?: number;
-            handleWindowResize?: boolean;
-            viewRender?(view: ViewObject, element: JQuery): void;
-            viewDestroy?(view: ViewObject, element: JQuery): void;
-            dayRender?(date: Date, cell: HTMLTableDataCellElement): void;
-            windowResize?(view: ViewObject): void;
-
-            // Timezone
-            timezone?: string | boolean;
-            now?: moment.Moment | Date | string | (() => moment.Moment);
-
-            // Views - http://arshaw.com/fullcalendar/docs/views/
-
-            defaultView?: string;
-
-            // Current Date - http://arshaw.com/fullcalendar/docs/current_date/
-
-            defaultDate?: moment.Moment | Date | string;
-            year?: number;
-            month?: number;
-            date?: number;
-
-            // Text/Time Customization - http://arshaw.com/fullcalendar/docs/text/
-
-            timeFormat?: any; // String/ViewOptionHash
-            columnFormat?: any; // String/ViewOptionHash
-            titleFormat?: any; // String/ViewOptionHash
-
-            buttonText?: ButtonTextObject;
-            monthNames?: string[];
-            monthNamesShort?: string[];
-            dayNames?: string[];
-            dayNamesShort?: string[];
-            weekNumberTitle?: string;
-
-            // Clicking & Hovering - http://arshaw.com/fullcalendar/docs/mouse/
-
-            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/
-
-            /**
-             * This has one of the following types:
-             *
-             * - EventObject[]
-             * - string (JSON feed)
-             * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
-             */
-            events?: any;
-
-            /**
-             * An array, each element being one of the following types:
-             *
-             * - EventSource
-             * - EventObject[]
-             * - string (JSON feed)
-             * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
-             */
-            eventSources?: any[];
-
-            allDayDefault?: boolean;
-            ignoreTimezone?: boolean;
-            startParam?: string;
-            endParam?: string;
-            lazyFetching?: boolean;
-            eventDataTransform?(eventData: any): EventObject;
-            loading?(isLoading: boolean, view: ViewObject): void;
-
-            // Event Rendering - http://arshaw.com/fullcalendar/docs/event_rendering/
-
-            eventColor?: string;
-            eventBackgroundColor?: string;
-            eventBorderColor?: string;
-            eventTextColor?: string;
-            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;
-        }
-
-        interface ViewOptionHash {
-            month?: any;
-            week?: any;
-            day?: any;
-            agenda?: any;
-            agendaDay?: any;
-            agendaWeek?: any;
-            basic?: any;
-            basicDay?: any;
-            basicWeek?: any;
-            ''?: any;
-        }
-
-        /**
-         * Agenda Options - http://arshaw.com/fullcalendar/docs/agenda/
-         */
-        interface AgendaOptions {
-            allDaySlot?: boolean;
-            allDayText?: 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
-        */
-        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/
-        */
-        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;
-        }
-
-        interface DroppingExternalElementsOptions {
-            droppable?: boolean;
-            dropAccept?: string | ((draggable: any) => boolean);
-            drop?(date: moment.Moment, jsEvent: MouseEvent, ui: any): void;
-            eventReceive?(event: EventObject): void;
-        }
-
-        interface ButtonTextObject {
-            prev?: string;
-            next?: string;
-            prevYear?: string;
-            nextYear?: string;
-            today?: string;
-            month?: string;
-            week?: string;
-            day?: string;
-        }
-
-        interface EventObject extends Timespan {
-            id?: any; // String/number
-            title: string;
-            allDay?: boolean;
-            url?: string;
-            className?: any; // string/Array<string>
-            editable?: boolean;
-            source?: EventSource;
-            color?: string;
-            backgroundColor?: string;
-            borderColor?: string;
-            textColor?: string;
-            rendering?: string;
-        }
-
-        interface ViewObject extends Timespan {
-            name: string;
-            title: string;
-            intervalStart: moment.Moment;
-            intervalEnd: moment.Moment;
-        }
-
-        interface EventSource extends JQueryAjaxSettings {
-            /**
-             * This has one of the following types:
-             *
-             * - EventObject[]
-             * - string (JSON feed)
-             * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
-             */
-            events?: any;
-
-            color?: string;
-            backgroundColor?: string;
-            borderColor?: string;
-            textColor?: string;
-            className?: any; // string/Array<string>
-            editable?: boolean;
-            allDayDefault?: boolean;
-            ignoreTimezone?: boolean;
-            eventTransform?: any;
-            startParam?: string;
-            endParam?: string;
-        }
-    }
-
-    interface JQuery {
-        /**
-         * Get/Set option value
-         */
-        fullCalendar(method: 'option', option: string, value?: any): void;
-
-        /**
-         * Immediately forces the calendar to render and/or readjusts its size.
-         */
-        fullCalendar(method: 'render'): void;
-
-        /**
-         * Restores the element to the state before FullCalendar was initialized.
-         */
-        fullCalendar(method: 'destroy'): void;
-
-        /**
-         * Returns the View Object for the current view.
-         */
-        fullCalendar(method: 'getView'): FullCalendar.ViewObject;
-
-        /**
-         * Immediately switches to a different view.
-         */
-        fullCalendar(method: 'changeView', viewName: string): void;
-
-        /**
-         * Moves the calendar one step back (either by a month, week, or day).
-         */
-        fullCalendar(method: 'prev'): void;
-
-        /**
-         * Moves the calendar one step forward (either by a month, week, or day).
-         */
-        fullCalendar(method: 'next'): void;
-
-        /**
-         * Moves the calendar back one year.
-         */
-        fullCalendar(method: 'prevYear'): void;
-
-        /**
-         * Moves the calendar forward one year.
-         */
-        fullCalendar(method: 'nextYear'): void;
-
-        /**
-         * Moves the calendar to the current date.
-         */
-        fullCalendar(method: 'today'): void;
-
-        /**
-         * Moves the calendar to an arbitrary year/month/date.
-         */
-        fullCalendar(method: 'gotoDate', year: number, month?: number, date?: number): void;
-
-        /**
-         * Moves the calendar to an arbitrary date.
-         */
-        fullCalendar(method: 'gotoDate', date: Date | string): void;
-
-        /**
-         * Moves the calendar forward/backward an arbitrary amount of time.
-         */
-        fullCalendar(method: 'incrementDate', year: number, month?: number, date?: number): void;
-
-        /**
-         * Returns a Date object for the current date of the calendar.
-         */
-        fullCalendar(method: 'getDate'): Date;
-
-        /**
-         * A method for programmatically selecting a period of time.
-         */
-        fullCalendar(method: 'select', startDate: Date, endDate: Date, allDay: boolean): void;
-
-        /**
-         * A method for programmatically clearing the current selection.
-         */
-        fullCalendar(method: 'unselect'): void;
-
-        /**
-         * Reports changes to an event and renders them on the calendar.
-         */
-        fullCalendar(method: 'updateEvent', event: FullCalendar.EventObject): void;
-
-        /**
-         * Retrieves events that FullCalendar has in memory.
-         */
-        fullCalendar(method: 'clientEvents', idOrfilter?: any): FullCalendar.EventObject[];
-
-        /**
-         * Retrieves events that FullCalendar has in memory.
-         */
-        fullCalendar(method: 'clientEvents', idOrfilter?: (e: FullCalendar.EventObject) => boolean): FullCalendar.EventObject[];
-
-        /**
-         * Removes events from the calendar.
-         */
-        fullCalendar(method: 'removeEvents', idOrfilter?: any): void;
-
-        /**
-         * Removes events from the calendar.
-         */
-        fullCalendar(method: 'removeEvents', idOrfilter?: (e: FullCalendar.EventObject) => boolean): void;
-
-        /**
-         * Refetches events from all sources and rerenders them on the screen.
-         */
-        fullCalendar(method: 'refetchEvents'): void;
-
-        /**
-         * Dynamically adds an event source.
-         */
-        fullCalendar(method: 'addEventSource', source: any): void;
-
-        /**
-         * Dynamically removes an event source.
-         */
-        fullCalendar(method: 'removeEventSource', source: any): void;
-
-        /**
-         * Renders a new event on the calendar.
-         */
-        fullCalendar(method: 'renderEvent', event: FullCalendar.EventObject, stick?: boolean): void;
-
-        /**
-         * Rerenders all events on the calendar.
-         */
-        fullCalendar(method: 'rerenderEvents'): void;
-
-        /**
-         * Create calendar object
-         */
-        fullCalendar(options: FullCalendar.Options): JQuery;
-
-        /**
-         * Generic method function
-         */
-        fullCalendar(method: string, arg1: any, arg2: any, arg3: any): void;
-    }
-
-    interface JQueryStatic {
-        fullCalendar: FullCalendar.Calendar;
-    }
-}
diff --git a/types/fullcalendar/v1/package.json b/types/fullcalendar/v1/package.json
deleted file mode 100644
index fce08a048d..0000000000
--- a/types/fullcalendar/v1/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "moment": ">=2.14.0"
-    }
-}
\ No newline at end of file
diff --git a/types/fullcalendar/v1/tsconfig.json b/types/fullcalendar/v1/tsconfig.json
deleted file mode 100644
index c6612c5858..0000000000
--- a/types/fullcalendar/v1/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "types": [],
-        "paths": {
-            "fullcalendar": [
-                "fullcalendar/v1"
-            ]
-        },
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fullcalendar-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/fullcalendar/v1/tslint.json b/types/fullcalendar/v1/tslint.json
deleted file mode 100644
index 1b62a88e52..0000000000
--- a/types/fullcalendar/v1/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "ban-types": false,
-        "unified-signatures": false
-    }
-}
diff --git a/types/fullname/tslint.json b/types/fullname/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fullname/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fullpage.js/fullpage.js-tests.ts b/types/fullpage.js/fullpage.js-tests.ts
index b8990ea9c8..fe49995328 100644
--- a/types/fullpage.js/fullpage.js-tests.ts
+++ b/types/fullpage.js/fullpage.js-tests.ts
@@ -1,7 +1,7 @@
 function test_public_methods() {
-    $(() => {
+    $(document).ready(function() {
         $('#fullpage').fullpage({
-            // Navigation
+            //Navigation
             menu: '#menu',
             lockAnchors: false,
             anchors:['firstPage', 'secondPage'],
@@ -9,10 +9,10 @@ function test_public_methods() {
             navigationPosition: 'right',
             navigationTooltips: ['firstSlide', 'secondSlide'],
             showActiveTooltip: false,
-            slidesNavigation: true,
+            slidesNavigation: false,
             slidesNavPosition: 'bottom',
 
-            // Scrolling
+            //Scrolling
             css3: true,
             scrollingSpeed: 700,
             autoScrolling: true,
@@ -25,18 +25,27 @@ function test_public_methods() {
             loopTop: false,
             loopHorizontal: true,
             continuousVertical: false,
+            continuousHorizontal: false,
+            scrollHorizontally: false,
+            interlockedSlides: false,
+            dragAndMove: false,
+            offsetSections: false,
+            resetSliders: false,
+            fadingEffect: false,
             normalScrollElements: '#element1, .element2',
             scrollOverflow: false,
+            scrollOverflowReset: false,
             scrollOverflowOptions: null,
             touchSensitivity: 15,
             normalScrollElementTouchThreshold: 5,
+            bigSectionsDestination: null,
 
-            // Accessibility
+            //Accessibility
             keyboardScrolling: true,
             animateAnchor: true,
             recordHistory: true,
 
-            // Design
+            //Design
             controlArrows: true,
             verticalCentered: true,
             sectionsColor : ['#ccc', '#fff'],
@@ -45,18 +54,76 @@ function test_public_methods() {
             fixedElements: '#header, .footer',
             responsiveWidth: 0,
             responsiveHeight: 0,
+            responsiveSlides: false,
+            parallax: false,
+            parallaxOptions: {type: 'reveal', percentage: 62, property: 'translate'},
 
-            // Custom selectors
+            //Custom selectors
             sectionSelector: '.section',
             slideSelector: '.slide',
 
-            // Events
-            onLeave: (index, nextIndex, direction) => {},
-            afterLoad: (anchorLink, index) => {},
-            afterRender: () => {},
-            afterResize: () => {},
-            afterSlideLoad: (anchorLink, index, slideAnchor, slideIndex) => {},
-            onSlideLeave: (anchorLink, index, slideIndex, direction, nextSlideIndex) => {}
+            lazyLoading: true,
+
+            //events
+            onLeave: function(index, nextIndex, direction){},
+            afterLoad: function(anchorLink, index){},
+            afterRender: function(){},
+            afterResize: function(){},
+            afterResponsive: function(isResponsive){},
+            afterSlideLoad: function(anchorLink, index, slideAnchor, slideIndex){},
+            onSlideLeave: function(anchorLink, index, slideIndex, direction, nextSlideIndex){}
         });
     });
+
+    $.fn.fullpage.moveSectionUp();
+
+    $.fn.fullpage.moveSectionDown();
+
+    $.fn.fullpage.moveTo('firstSlide', 2);
+
+    $.fn.fullpage.moveTo(3, 0);
+
+    $.fn.fullpage.moveTo(3);
+
+    $.fn.fullpage.silentMoveTo('firstSlide', 2);
+
+    $.fn.fullpage.moveSlideRight();
+
+    $.fn.fullpage.moveSlideLeft();
+
+    $.fn.fullpage.setAutoScrolling(false);
+
+    $.fn.fullpage.setFitToSection(false);
+
+    $.fn.fullpage.fitToSection();
+
+    $.fn.fullpage.setLockAnchors(false);
+
+    $.fn.fullpage.setAllowScrolling(false);
+
+    $.fn.fullpage.setAllowScrolling(false, 'down');
+
+    $.fn.fullpage.setAllowScrolling(false, 'down, right');
+
+    $.fn.fullpage.setKeyboardScrolling(false);
+
+    $.fn.fullpage.setKeyboardScrolling(false, 'down');
+
+    $.fn.fullpage.setKeyboardScrolling(false, 'down, right');
+
+    $.fn.fullpage.setRecordHistory(false);
+
+    $.fn.fullpage.setScrollingSpeed(700);
+
+    $.fn.fullpage.destroy();
+
+    $.fn.fullpage.destroy('all');
+
+    $.fn.fullpage.reBuild();
+
+    $.fn.fullpage.setResponsive(true);
+
+    $.fn.fullpage.responsiveSlides.toSections();
+
+    $.fn.fullpage.responsiveSlides.toSlides();
 }
diff --git a/types/fullpage.js/index.d.ts b/types/fullpage.js/index.d.ts
index 869a64d6e8..3f70a6b5e0 100644
--- a/types/fullpage.js/index.d.ts
+++ b/types/fullpage.js/index.d.ts
@@ -1,11 +1,13 @@
-// Type definitions for fullpage.js v2.8.0
+// Type definitions for fullpage.js v2.9.5
 // Project: http://alvarotrigo.com/fullPage/
-// Definitions by: Andrew Roberts <http://www.atroberts.org>
+// Definitions by: Andrew Roberts <http://www.atroberts.org>, Jodi Warren <https://github.com/jodiwarren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
+import htmlString = JQuery.htmlString;
+
 interface FullPageJsOptions {
     /**
      * (default false) A selector can be used to specify the menu to link with the sections. This way the scrolling of the sections will activate the corresponding element in the menu using the class active. This won't generate a menu but will just add the active class to the element in the given menu with the corresponding anchor links. In order to link the elements of the menu with the sections, an HTML 5 data-tag (data-menuanchor) will be needed to use with the same anchor links as used within the sections.
@@ -114,6 +116,47 @@ interface FullPageJsOptions {
      */
     continuousVertical?: boolean;
 
+    /**
+     * (default false) Extension of fullpage.js. Defines whether sliding right in the last slide should slide right to the first one or not, and if scrolling left in the first slide should slide left to the last one or not. Not compatible with loopHorizontal. Requires fullpage.js >= 2.8.3.
+     */
+    continuousHorizontal?: boolean;
+
+    /**
+     * (default false) Extension of fullpage.js. Defines whether to slide horizontally within sliders by using the mouse wheel or trackpad. Ideal for story telling. Requires fullpage.js >= 2.8.3.
+     */
+    scrollHorizontally?: boolean;
+
+    /** 
+     * (default false) Extension of fullpage.js. Determines whether moving one horizontal slider will force the sliding of sliders in other section in the same direction. Possible values are true, false or an array with the interlocked sections. For example [1,3,5] starting by 1. Requires fullpage.js >= 2.8.3. 
+     */
+    interlockedSlides?: boolean | number[];
+
+    /**
+     * Enables or disables the dragging and flicking of sections and slides by using mouse or fingers. Requires fullpage.js >= 2.8.9. Possible values are: 
+     * true: enables the feature.
+     * false: disables the feature.
+     * vertical: enables the feature only vertically.
+     * horizontal: enables the feature only horizontally.
+     * fingersonly: enables the feature for touch devices only.
+     * mouseonly: enables the feature for desktop devices only (mouse and trackpad).
+     */
+    dragAndMove?: boolean | 'vertical' | 'horizontal' | 'fingersonly' | 'mouseonly';
+
+    /**
+     * (default false)Extension of fullpage.js. Provides a way to use non full screen sections based on percentage. Ideal to show visitors there's more content in the site by showing part of the next or previous section. Requires fullPage.js >= 2.8.8 To define the percentage of each section the attribute data-percentage must be used. The centering of the section in the viewport can be determined by using a boolean value in the attribute data-centered (default to true if not specified). For example:
+     */
+    offsetSections?: boolean;
+
+    /** 
+     * (default false). Extension of fullpage.js. Defines whether or not to reset every slider after leaving its section. Requires fullpage.js >= 2.8.3.
+     */
+    resetSliders?: boolean;
+
+    /**
+     * Defines whether to use a fading effect or not instead of the default scrolling one. Possible values are true, false, sections, slides. It can therefore be applied just vertically or horizontally, or to both at the time. Requires fullpage.js >= 2.8.6.
+     */
+    fadingEffect?: boolean | 'sections' | 'slides';
+
     /**
      *  (default null) If you want to avoid the auto scroll when scrolling over some elements, this is the option you need to use. (useful for maps, scrolling divs etc.) It requires a string with the jQuery selectors for those elements. (For example: normalScrollElements: '#element1, .element2')
      */
@@ -129,6 +172,11 @@ interface FullPageJsOptions {
      */
     scrollOverflowOptions?: any;
 
+    /**
+     * When set to true it scrolls up the content of the section/slide with scroll bar when leaving to another vertical section. This way the section/slide will always show the start of its content even when scrolling from a section under it
+     */
+    scrollOverflowReset?: boolean;
+
     /**
      * (default 5) Defines a percentage of the browsers window width/height, and how far a swipe must measure for navigating to the next section / slide
      */
@@ -139,6 +187,11 @@ interface FullPageJsOptions {
      */
     normalScrollElementTouchThreshold?: number;
 
+    /**
+     * Defines how to scroll to a section which size is bigger than the viewport. By default fullPage.js scrolls to the top if you come from a section above the destination one and to the bottom if you come from a section below the destination one.
+     */
+    bigSectionsDestination?: 'top' | 'bottom' | null;
+
     // Accessibility
 
     /**
@@ -200,6 +253,30 @@ interface FullPageJsOptions {
      */
     responsiveHeight?: number;
 
+    /** 
+     * When set to true slides will be turned into vertical sections when responsive mode is fired. (by using the responsiveWidth or responsiveHeight options detailed above). Requires fullpage.js >= 2.8.5.
+     */ 
+    responsiveSlides?: boolean;
+
+    /**
+     * When set to true slides will be turned into vertical sections when responsive mode is fired. (by using the responsiveWidth or responsiveHeight options detailed above). Requires fullpage.js >= 2.8.5.
+     */
+    parallax?: boolean;
+
+    /**
+     * Allows to configure the parameters for the parallax backgrounds effect when using the option parallax:true.
+     */ 
+    parallaxOptions?: {
+        type?: 'cover' | 'reveal',
+        percentage?: number,
+        property?: string,
+    };
+
+    /**
+     * Lazy loading is active by default which means it will lazy load any media element containing the attribute data-src as detailed in the Lazy Loading docs . If you want to use any other lazy loading library you can disable this fullpage.js feature.
+     */ 
+    lazyLoading?: boolean;
+
     // Custom selectors
 
     /**
@@ -238,6 +315,12 @@ interface FullPageJsOptions {
      */
     afterResize?: () => void;
 
+    /**
+     * This callback is fired after fullpage.js changes from normal to responsive mode or from responsive mode to normal mode.
+     * @param {boolean} isResponsive boolean that determines if it enters into responsive mode (true) or goes back to normal mode (false)
+     */
+    afterResponsive?: (isResponsive: boolean) => void;
+
     /**
      * Callback fired once the slide of a section have been loaded, after the scrolling has ended.
      *
@@ -263,6 +346,168 @@ interface FullPageJsOptions {
     onSlideLeave?: (anchorLink: string, index: number, slideIndex: number, direction: string, nextSlideIndex: number) => void;
 }
 
+interface FullPageJSGlobalOptions {
+    options: FullPageJsOptions;
+}
+
+interface FullPageJsMethods {
+    (options?: FullPageJsOptions): any;
+
+    /**
+     * Sets the scrolling configuration in real time.
+     * Defines the way the page scrolling behaves.
+     * If it is set to true, it will use the "automatic" scrolling,
+     * otherwise, it will use the "manual" or "normal" scrolling of the site.
+     */
+    setAutoScrolling(active: boolean): void;
+
+    /**
+     * Defines whether to record the history for each hash change in the URL.
+     */
+    setRecordHistory(active: boolean): void;
+
+    /**
+     * Defines the scrolling speed in milliseconds.
+     */
+    setScrollingSpeed(speed: number): void;
+
+    /**
+     *  Sets the value for the option fitToSection
+     *  determining whether to fit the section in the screen or not.
+     */
+    setFitToSection(active: boolean): void;
+
+    /**
+     * Adds or remove the possibility of scrolling through sections
+     * by using the mouse wheel or the trackpad.
+     */
+    setLockAnchors(active: boolean): void;
+
+    /**
+     * Adds or remove the possibility of scrolling through sections
+     * by using the mouse wheel or the trackpad.
+     */
+    setMouseWheelScrolling(active: boolean): void;
+
+    /**
+     * Adds or remove the possibility of scrolling through sections
+     * by using the mouse wheel/trackpad or touch gestures.
+     * Optionally a second parameter can be used to specify the direction
+     * for which the action will be applied.
+     */
+    setAllowScrolling(active: boolean, directions?: string): void;
+
+    /**
+     * Adds or remove the possibility of scrolling through sections
+     * by using the keyboard arrow keys
+     */
+    setKeyboardScrolling(active: boolean, directions?: string): void;
+
+    /**
+     * Scrolls one section up
+     */
+    moveSectionUp(): void;
+
+    /**
+     * Scrolls one section down
+     */
+    moveSectionDown(): void;
+
+    /**
+     * Moves the page to the given section and slide with no animation.
+     * Anchors or index positions can be used as params.
+     */
+    silentMoveTo(sectionAnchor: number | string, slideAnchor?: number | string): void;
+
+    /**
+     * Scrolls the page to the given section and slide.
+     * The first slide, the visible one by default, will have index 0.
+     */
+    moveTo(sectionAnchor: number | string, slideAnchor?: number | string): void;
+
+    /**
+     * Slides right the slider of the active section.
+     * Optional `section` param.
+     */
+    moveSlideRight(section?: number | string): void;
+
+    /**
+     * Slides left the slider of the active section.
+     * Optional `section` param.
+     */
+    moveSlideLeft(section?: number | string): void;
+
+    /**
+     * When resizing is finished, we adjust the slides sizes and positions
+     */
+    reBuild(): void;
+
+    /**
+     * Sets the responsive mode of the page.
+     * When set to true the autoScrolling will be turned off
+     * and the result will be exactly the same one as when
+     * the responsiveWidth or responsiveHeight options
+     * get fired.
+     */
+    setResponsive(active: boolean): void;
+
+    /**
+     * Sets the value for the option fitToSection
+     * determining whether to fit the section
+     * in the screen or not.
+     */
+    setFitToSection(active?: boolean): void;
+
+    /**
+     * Scrolls to the nearest active section fitting it in the viewport.
+     */
+    fitToSection(): void;
+
+    /**
+     * Adds or remove the possibility of scrolling through sections/slides
+     * by using the mouse wheel/trackpad or touch gestures
+     * (which is active by default).
+     *
+     * Note this won't disable the keyboard scrolling. You would need to
+     * use setKeyboardScrolling for it.
+     */
+    setAllowScrolling(allow: boolean, direction?: string): void;
+
+    /**
+     * Destroys the plugin events and optionally its HTML markup and styles.
+     * Ideal to use when using AJAX to load content.
+     *
+     * If 'all' is passed, the HTML markup
+     * and styles used by fullpage.js will be removed. This way the
+     * original HTML markup, the one used before any plugin
+     * modification is made, will be maintained.
+     *
+     * @param {"all" | undefined} type
+     */
+    destroy(type?: 'all'): void;
+
+    responsiveSlides: {
+        /**
+         * Extension of fullpage.js. Requires fullpage.js >= 2.8.5.
+         * Turns horizontal slides into vertical sections.
+         */
+        toSections(): void;
+
+        /**
+         * Extension of fullpage.js. Requires fullpage.js >= 2.8.5.
+         * Turns back the original slides (now converted into
+         * vertical sections) into horizontal slides again.
+         */
+        toSlides(): void;
+    }
+}
+
+interface FullPageJs extends FullPageJSGlobalOptions, FullPageJsMethods {}
+
+interface JQueryStatic {
+    fullpage: FullPageJsMethods;
+}
+
 interface JQuery {
-    fullpage(options?: FullPageJsOptions): JQuery;
+    fullpage: FullPageJs;
 }
diff --git a/types/fullpage.js/tsconfig.json b/types/fullpage.js/tsconfig.json
index c8a11e250e..d20953732c 100644
--- a/types/fullpage.js/tsconfig.json
+++ b/types/fullpage.js/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "fullpage.js-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/fullpage.js/tslint.json b/types/fullpage.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fullpage.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fuse/tslint.json b/types/fuse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fuse/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fuzzaldrin-plus/tslint.json b/types/fuzzaldrin-plus/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fuzzaldrin-plus/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/fuzzaldrin/fuzzaldrin-tests.ts b/types/fuzzaldrin/fuzzaldrin-tests.ts
new file mode 100644
index 0000000000..90ec26e3e0
--- /dev/null
+++ b/types/fuzzaldrin/fuzzaldrin-tests.ts
@@ -0,0 +1,20 @@
+import { match, filter, score } from 'fuzzaldrin';
+
+let number = 0;
+const string = '' as string;
+let strings: string[] = [];
+let objects: Array<{name: string, speed: number}> = [];
+
+strings = filter(strings, string);
+strings = filter(strings, string, {maxResults: number});
+objects = filter(objects, string, {key: 'name'});
+objects = filter(objects, string, {key: 'name', maxResults: number});
+
+number = score(string, string);
+
+match(string, string);
+
+// These should be type errors! Uncomment to verify.
+// objects = filter(objects, string);
+// objects = filter(objects, string, {key: 'speed'});
+// strings = filter(strings, string, {key: 'speed'});
diff --git a/types/fuzzaldrin/index.d.ts b/types/fuzzaldrin/index.d.ts
index 1e1427c08f..ca9a64e819 100644
--- a/types/fuzzaldrin/index.d.ts
+++ b/types/fuzzaldrin/index.d.ts
@@ -2,7 +2,9 @@
 // Project: https://github.com/atom/fuzzaldrin
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-export function filter<T>(candidates: T[], query: string, options?: { key?: string, maxResults?: number }): T[];
+export function filter(candidates: string[], query: string, options?: {maxResults?: number}): string[];
+export function filter<T, K extends keyof T>(candidates: T[], query: string & T[K], options: {key: K, maxResults?: number}): T[];
 export function match(string: string, query: string): any;
 export function score(string: string, query: string): number;
diff --git a/types/fuzzaldrin/tsconfig.json b/types/fuzzaldrin/tsconfig.json
index abf333c6bf..2e1263faf8 100644
--- a/types/fuzzaldrin/tsconfig.json
+++ b/types/fuzzaldrin/tsconfig.json
@@ -17,6 +17,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "fuzzaldrin-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/fuzzyset.js/fuzzyset.js-tests.ts b/types/fuzzyset.js/fuzzyset.js-tests.ts
new file mode 100644
index 0000000000..97a0d45008
--- /dev/null
+++ b/types/fuzzyset.js/fuzzyset.js-tests.ts
@@ -0,0 +1,10 @@
+import FuzzySet = require('fuzzyset.js');
+
+const fuzzyset: FuzzySet = FuzzySet(['coucou', 'foo', 'bar', 'toto']);
+const results = fuzzyset.get('foo');
+
+fuzzyset.length();
+
+fuzzyset.isEmpty();
+
+fuzzyset.values();
diff --git a/types/fuzzyset.js/index.d.ts b/types/fuzzyset.js/index.d.ts
new file mode 100644
index 0000000000..04914683bc
--- /dev/null
+++ b/types/fuzzyset.js/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for fuzzyset.js 0.0
+// Project: https://github.com/Glench/fuzzyset.js
+// Definitions by: Louis Grignon <https://github.com/lgrignon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+interface FuzzySet {
+  get<T = undefined>(candidate: string, defaultValue?: T, minScore?: number): Array<[number, string]> | T | null;
+  add(value: string): boolean;
+  length(): number;
+  isEmpty(): boolean;
+  values(): string[];
+}
+
+declare function FuzzySet(
+  source: string[],
+  useLevenshtein?: boolean,
+  gramSizeLower?: number,
+  gramSizeUpper?: number,
+): FuzzySet;
+
+export = FuzzySet;
+export as namespace FuzzySet;
diff --git a/types/fuzzyset.js/tsconfig.json b/types/fuzzyset.js/tsconfig.json
new file mode 100644
index 0000000000..a1eeb06b97
--- /dev/null
+++ b/types/fuzzyset.js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fuzzyset.js-tests.ts"
+    ]
+}
diff --git a/types/fuzzyset.js/tslint.json b/types/fuzzyset.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fuzzyset.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fxn/tslint.json b/types/fxn/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/fxn/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gae.channel.api/tslint.json b/types/gae.channel.api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gae.channel.api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gamepad/tslint.json b/types/gamepad/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gamepad/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gamequery/tslint.json b/types/gamequery/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gamequery/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gandi-livedns/tslint.json b/types/gandi-livedns/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gandi-livedns/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.analytics/tslint.json b/types/gapi.analytics/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.analytics/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.auth2/index.d.ts b/types/gapi.auth2/index.d.ts
index c5cfff0d9e..0acae5e2a7 100644
--- a/types/gapi.auth2/index.d.ts
+++ b/types/gapi.auth2/index.d.ts
@@ -27,7 +27,7 @@ declare namespace gapi.auth2 {
      * Signs in the user using the specified options.
      * If no option specified here, fallback to the options specified to gapi.auth2.init().
      */
-    signIn(options?: SigninOptions | SigninOptionsBuilder): any;
+    signIn(options?: SigninOptions | SigninOptionsBuilder): Promise<GoogleUser>;
 
     /**
      * Signs out all accounts from the application.
diff --git a/types/gapi.calendar/tslint.json b/types/gapi.calendar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.calendar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.drive/tslint.json b/types/gapi.drive/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.drive/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.pagespeedonline/tslint.json b/types/gapi.pagespeedonline/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.pagespeedonline/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.people/tslint.json b/types/gapi.people/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.people/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.plus/tslint.json b/types/gapi.plus/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.plus/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.translate/tslint.json b/types/gapi.translate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.translate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.urlshortener/tslint.json b/types/gapi.urlshortener/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.urlshortener/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.youtube/index.d.ts b/types/gapi.youtube/index.d.ts
index b09779cdb3..bf2aebaf3a 100644
--- a/types/gapi.youtube/index.d.ts
+++ b/types/gapi.youtube/index.d.ts
@@ -778,7 +778,7 @@ interface GoogleApiYouTubeActivityResource {
         /**
          * A map of thumbnail images associated with the resource that is primarily associated with the activity.
          */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        thumbnails: GoogleApiYouTubeThumbnailResource;
         /**
          * Channel title for the channel responsible for this activity
          */
@@ -1082,7 +1082,7 @@ interface GoogleApiYouTubeChannelResource {
         /**
          * A map of thumbnail images associated with the channel. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
          */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        thumbnails: GoogleApiYouTubeThumbnailResource;
     }
     /**
      * The contentDetails object encapsulates information about the channels content.
@@ -1526,7 +1526,7 @@ interface GoogleApiYouTubePlaylistItemResource {
         /**
          * A map of thumbnail images associated with the playlist item. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
          */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        thumbnails: GoogleApiYouTubeThumbnailResource;
         /**
          * The channel title of the channel that the playlist item belongs to.
          */
@@ -1713,7 +1713,7 @@ interface GoogleApiYouTubeSearchResource {
         /**
          * A map of thumbnail images associated with the search result. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
          */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        thumbnails: GoogleApiYouTubeThumbnailResource;
         /**
          * The title of the channel that published the resource that the search result identifies.
          */
@@ -1774,7 +1774,7 @@ interface GoogleApiYouTubeSubscriptionResource {
         /**
          * A map of thumbnail images associated with the subscription. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
          */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        thumbnails: GoogleApiYouTubeThumbnailResource;
     }
     /**
      *
@@ -1796,7 +1796,7 @@ interface GoogleApiYouTubeSubscriptionResource {
         title: string;
         description: string;
         channelId: string;
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        thumbnails: GoogleApiYouTubeThumbnailResource;
     }
 }
 
@@ -1902,7 +1902,7 @@ interface GoogleApiYouTubeVideoResource {
         /**
          * A map of thumbnail images associated with the video. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
          */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        thumbnails: GoogleApiYouTubeThumbnailResource;
         /**
          * Channel title for the channel that the video belongs to.
          */
diff --git a/types/gapi.youtube/tslint.json b/types/gapi.youtube/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.youtube/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi.youtubeanalytics/tslint.json b/types/gapi.youtubeanalytics/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi.youtubeanalytics/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gapi/tslint.json b/types/gapi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gapi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gen-readlines/gen-readlines-tests.ts b/types/gen-readlines/gen-readlines-tests.ts
new file mode 100644
index 0000000000..5579f34c04
--- /dev/null
+++ b/types/gen-readlines/gen-readlines-tests.ts
@@ -0,0 +1,25 @@
+/// <reference types="node" />
+
+import fs = require("fs");
+import readlines = require("gen-readlines");
+
+const fd = fs.openSync('./somefile.txt', 'r');
+const stats = fs.fstatSync(fd);
+
+let buff: Buffer;
+
+for (const line of readlines(fd, stats.size)) {
+    buff = line;
+    console.log(line.toString());
+}
+
+fs.closeSync(fd);
+
+fs.open('./test_data/hipster.txt', 'r', (err, fd) => {
+    fs.fstat(fd, (err, stats) => {
+        for (const line of readlines(fd, stats.size, 64 * 0x400, 0)) {
+            buff = line;
+            console.log(line.toString());
+        }
+    });
+});
diff --git a/types/gen-readlines/index.d.ts b/types/gen-readlines/index.d.ts
new file mode 100644
index 0000000000..091bce0625
--- /dev/null
+++ b/types/gen-readlines/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for gen-readlines 0.1
+// Project: https://github.com/neurosnap/gen-readlines#readme
+// Definitions by: Peter Harris <https://github.com/CodeAnimal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Generator based line reader
+ *
+ * @param fd            The file descriptor
+ * @param filesize      The size of the file in bytes
+ * @param bufferSize    The size of the buffer in bytes, default: 64*1024
+ * @param position      The position where to start reading the file in bytes, default: 0
+ *
+ * @returns The generator object, yeilding each line as a string
+ */
+declare function readlines(fd: number, filesize: number, bufferSize?: number, position?: number): IterableIterator<Buffer>;
+
+export = readlines;
diff --git a/types/gen-readlines/tsconfig.json b/types/gen-readlines/tsconfig.json
new file mode 100644
index 0000000000..18d185012c
--- /dev/null
+++ b/types/gen-readlines/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes" : true
+    },
+    "files": [
+        "index.d.ts",
+        "gen-readlines-tests.ts"
+    ]
+}
diff --git a/types/gen-readlines/tslint.json b/types/gen-readlines/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gen-readlines/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/generic-functions/tslint.json b/types/generic-functions/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/generic-functions/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gently/tslint.json b/types/gently/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gently/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/geodesy/geodesy-tests.ts b/types/geodesy/geodesy-tests.ts
index 984b8e80c2..6f6641520e 100644
--- a/types/geodesy/geodesy-tests.ts
+++ b/types/geodesy/geodesy-tests.ts
@@ -4,7 +4,9 @@ import {
   Dms,
   Vector3d,
   OsGridRef,
-  LatLonEllipsoidal as LatLon, LatLonSpherical } from 'geodesy';
+  LatLonEllipsoidal as LatLon, LatLonSpherical,
+  LatLonVectors
+} from 'geodesy';
 
 /**
  * Mgrs
@@ -165,3 +167,38 @@ LatLonSpherical.crossingParallels(point1, point2, 30);
 const polygon = [new LatLonSpherical(0, 0), new LatLonSpherical(1, 0), new LatLonSpherical(0, 1)];
 LatLonSpherical.areaOf(polygon); // 6.18e9 m²
 LatLonSpherical.areaOf(polygon, 6371e3); // 6.18e9 m²
+
+/**
+ * LatLonVectors
+ */
+const point3 = new LatLonVectors(49.78846, -97.44306);
+const point4 = new LatLonVectors(49.79822, -97.4592);
+const point5 = new LatLonVectors(49.7981, -97.41371);
+const point6 = new LatLonVectors(49.76851, -97.41371);
+const point7 = new LatLonVectors(49.76873, -97.45954);
+const point8 = new LatLonVectors(49.78846, -97.44306);
+point3.toVector(); // Vector3d { x: -0.08363305717526297, y: -0.6401716454146233, z: 0.7636660108677438 }
+point3.greatCircle(45); // Vector3d { x: -0.6311975610221534, y: 0.6270426835846277, z: 0.45651627782881243 }
+point3.distanceTo(point4, 6371e3); // 1587.463492544562 m
+point3.bearingTo(point4); // 313.1353494923952 deg
+point3.midpointTo(point4); // LatLon { lat: 49.79334028019261, lon: -97.45112918683637 }
+point3.intermediatePointTo(point4, 0.25); // LatLon { lat: 49.79090021013134, lon: -97.44709439015365 }
+point3.intermediatePointOnChordTo(point4, 0.5); // LatLon { lat: 49.7933402801926, lon: -97.45112918683637 }
+point3.destinationPoint(100, 0, 6371e3); // LatLon { lat: 49.78935932160593, lon: -97.44306000000003 }
+point3.crossTrackDistanceTo(point4, point5, 6371e3); // 1080.7461902301488 m
+point3.crossTrackDistanceTo(point4, 60, 6371e3); // 1519.091945034438 m
+point3.alongTrackDistanceTo(point4, point5, 6371e3); // 1162.7673995854138 m
+point3.alongTrackDistanceTo(point4, 60, 6371e3); // 460.86875216457025 m
+point3.nearestPointOnSegment(point4, point5); // LatLon { lat: 49.79817930627353, lon: -97.44299978937423 }
+point3.isBetween(point4, point5); // true
+
+const boundary = [point4, point5, point6, point7];
+point3.enclosedBy(boundary); // true
+point3.equals(point4); // false
+point3.equals(point8); // true
+point3.toString('dms', 3); // 49°47′18.456″N, 097°26′35.016″W
+
+// Static functions
+LatLonVectors.intersection(point4, point5, point3, 1); // LatLon { lat: 49.7981787830497, lon: -97.44279718554108 }
+LatLonVectors.areaOf(boundary, 6371e3); // 10768180.94129682 m^2
+LatLonVectors.meanOf(boundary); // LatLon { lat: 49.783392242641824, lon: -97.43653998581752 }
diff --git a/types/geodesy/index.d.ts b/types/geodesy/index.d.ts
index 1d8ef3e110..15a53796e0 100644
--- a/types/geodesy/index.d.ts
+++ b/types/geodesy/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for geodesy 1.1
+// Type definitions for geodesy 1.2
 // Project: https://github.com/chrisveness/geodesy
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // 		   Gilbert Handy <https://github.com/HandyG52>
+//         Harry Nicholls <https://github.com/excelulous>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export type format = 'd' | 'dm' | 'dms';
@@ -94,15 +95,12 @@ export class Utm {
 
 export namespace Dms {
     let separator: string;
-}
-
-export class Dms {
-    static parseDMS(dmsStr: string): number;
-    static toDMS(deg: number, format?: format, dp?: 0 | 2 | 4): string;
-    static toLat(deg: number, format?: format, dp?: 0 | 2 | 4): string;
-    static toLon(deg: number, format?: format, dp?: 0 | 2 | 4): string;
-    static toBrng(deg: number, format?: format, dp?: 0 | 2 | 4): string;
-    static compassPoint(bearing: number, precision?: 1 | 2 | 3): string;
+    function parseDMS(dmsStr: string): number;
+    function toDMS(deg: number, format?: format, dp?: 0 | 2 | 4): string;
+    function toLat(deg: number, format?: format, dp?: 0 | 2 | 4): string;
+    function toLon(deg: number, format?: format, dp?: 0 | 2 | 4): string;
+    function toBrng(deg: number, format?: format, dp?: 0 | 2 | 4): string;
+    function compassPoint(bearing: number, precision?: 1 | 2 | 3): string;
 }
 
 export class Vector3d {
@@ -171,3 +169,27 @@ export class LatLonSpherical {
     static areaOf(polygon: LatLonSpherical[], radius?: number): number;
     toString(format?: string, dp?: number): string;
 }
+
+export class LatLonVectors {
+    lat: number;
+    lon: number;
+    constructor(lat: number, lon: number);
+    toVector(): Vector3d;
+    greatCircle(bearing: number): Vector3d;
+    distanceTo(point: LatLonVectors, radius?: number): number;
+    bearingTo(point: LatLonVectors): number;
+    midpointTo(point: LatLonVectors): number;
+    intermediatePointTo(point: LatLonVectors, fraction: number): LatLonVectors;
+    intermediatePointOnChordTo(point: LatLonVectors, fraction: number): LatLonVectors;
+    destinationPoint(distance: number, bearing: number, radius?: number): LatLonVectors;
+    static intersection(path1start: LatLonVectors, path1brngEnd: LatLonVectors | number, path2start: LatLonVectors, path2brngEnd: LatLonVectors | number): LatLonVectors;
+    crossTrackDistanceTo(pathStart: LatLonVectors, pathBrngEnd: LatLonVectors | number, radius?: number): number;
+    alongTrackDistanceTo(pathStart: LatLonVectors, pathBrngEnd: LatLonVectors | number, radius?: number): number;
+    nearestPointOnSegment(point1: LatLonVectors, point2: LatLonVectors): LatLonVectors;
+    isBetween(point1: LatLonVectors, point2: LatLonVectors): boolean;
+    enclosedBy(polygon: LatLonVectors[]): boolean;
+    static areaOf(polygon: LatLonVectors[], radius?: number): number;
+    static meanOf(points: ReadonlyArray<LatLonVectors>): LatLonVectors;
+    equals(point: LatLonVectors): boolean;
+    toString(format?: string, dp?: number): string;
+  }
diff --git a/types/geoip-lite/tslint.json b/types/geoip-lite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/geoip-lite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/geojson/geojson-tests.ts b/types/geojson/geojson-tests.ts
index 85a7df2034..ce8c62418e 100644
--- a/types/geojson/geojson-tests.ts
+++ b/types/geojson/geojson-tests.ts
@@ -1,4 +1,10 @@
-let featureCollection: GeoJSON.FeatureCollection<any> =  {
+import {
+    BBox,
+    Feature, FeatureCollection, GeometryCollection, LineString,
+    MultiLineString, MultiPoint, MultiPolygon, Point, Polygon, GeometryObject
+} from "geojson";
+
+let featureCollection: FeatureCollection<Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon | GeometryCollection> = {
     type: "FeatureCollection",
     features: [
         {
@@ -34,7 +40,7 @@ let featureCollection: GeoJSON.FeatureCollection<any> =  {
             geometry: {
                 type: "Polygon",
                 coordinates: [
-                    [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
+                    [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]
                 ]
             },
             properties: {
@@ -44,17 +50,10 @@ let featureCollection: GeoJSON.FeatureCollection<any> =  {
                 }
             }
         }
-    ],
-    crs: {
-        type: "link",
-        properties: {
-            href: "http://example.com/crs/42",
-            type: "proj4"
-        }
-    }
+    ]
 };
 
-let featureWithPolygon: GeoJSON.Feature<GeoJSON.Polygon> = {
+const featureWithPolygon: Feature<Polygon> = {
     type: "Feature",
     bbox: [-180.0, -90.0, 180.0, 90.0],
     geometry: {
@@ -66,57 +65,57 @@ let featureWithPolygon: GeoJSON.Feature<GeoJSON.Polygon> = {
     properties: null
 };
 
-let point: GeoJSON.Point = {
-	type: "Point",
-	coordinates: [100.0, 0.0]
+const point: Point = {
+    type: "Point",
+    coordinates: [100.0, 0.0]
 };
 
 // This type is commonly used in the turf package
-let pointCoordinates: number[] = point.coordinates;
+const pointCoordinates: number[] = point.coordinates;
 
-let lineString: GeoJSON.LineString = {
-	type: "LineString",
-	coordinates: [ [100.0, 0.0], [101.0, 1.0] ]
+const lineString: LineString = {
+    type: "LineString",
+    coordinates: [[100.0, 0.0], [101.0, 1.0]]
 };
 
-let polygon: GeoJSON.Polygon = {
+const polygon: Polygon = {
     type: "Polygon",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
+        [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]
     ]
 };
 
-let polygonWithHole: GeoJSON.Polygon = {
+const polygonWithHole: Polygon = {
     type: "Polygon",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ],
-        [ [100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2] ]
+        [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+        [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]
     ]
 };
 
-let multiPoint: GeoJSON.MultiPoint = {
+const multiPoint: MultiPoint = {
     type: "MultiPoint",
-    coordinates: [ [100.0, 0.0], [101.0, 1.0] ]
+    coordinates: [[100.0, 0.0], [101.0, 1.0]]
 };
 
-let multiLineString: GeoJSON.MultiLineString = {
+const multiLineString: MultiLineString = {
     type: "MultiLineString",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 1.0] ],
-        [ [102.0, 2.0], [103.0, 3.0] ]
+        [[100.0, 0.0], [101.0, 1.0]],
+        [[102.0, 2.0], [103.0, 3.0]]
     ]
 };
 
-let multiPolygon: GeoJSON.MultiPolygon = {
+const multiPolygon: MultiPolygon = {
     type: "MultiPolygon",
     coordinates: [
         [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
         [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
-         [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+        [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
     ]
 };
 
-let geometryCollection: GeoJSON.GeometryCollection = {
+const geometryCollection: GeometryCollection = {
     type: "GeometryCollection",
     geometries: [
         {
@@ -125,16 +124,17 @@ let geometryCollection: GeoJSON.GeometryCollection = {
         },
         {
             type: "LineString",
-            coordinates: [ [101.0, 0.0], [102.0, 1.0] ]
+            coordinates: [[101.0, 0.0], [102.0, 1.0]]
         }
     ]
 };
 
-let feature: GeoJSON.Feature<GeoJSON.GeometryObject> = {
+let feature: Feature<GeometryObject> = {
     type: "Feature",
     geometry: lineString,
     properties: null
 };
+
 feature = {
     type: "Feature",
     geometry: polygon,
@@ -172,55 +172,79 @@ featureCollection = {
         {
             type: "Feature",
             geometry: lineString,
-            properties: {test: 'OK'}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: polygon,
-            properties: {test: 'OK'}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: polygonWithHole,
-            properties: {test: 'OK'}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiPoint,
-            properties: {test: 'OK'}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiLineString,
-            properties: {test: 'OK'}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiPolygon,
-            properties: {test: 'OK'}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: geometryCollection,
-            properties: {test: 'OK'}
+            properties: { test: "OK" }
         }
-    ],
-    crs: {
-        type: "link",
-        properties: {
-            href: "http://example.com/crs/42",
-            type: "proj4"
-        }
-    }
+    ]
 };
 
 // Allow access to custom properties
-const pt: GeoJSON.Feature<GeoJSON.Point> = {
-    type: 'Feature',
+const pt: Feature<Point> = {
+    type: "Feature",
     properties: {
-        foo: 'bar',
-        hello: 'world',
+        foo: "bar",
+        hello: "world",
         1: 2
     },
     geometry: {
-        type: 'Point',
+        type: "Point",
         coordinates: [0, 0]
     }
 };
-pt.properties.foo;
-pt.properties.hello;
-pt.properties[1];
+
+if (pt.properties) {
+    if (pt.properties.foo == null || pt.properties.hello == null || pt.properties[1] == null) {
+        throw TypeError("Properties should not be null or undefined.");
+    }
+} else {
+    throw TypeError("Feature should have a 'properties' property.");
+}
+
+// Optional generic for properties
+
+interface TestProperty {
+    foo: "bar" | "baz";
+    hello: string;
+}
+
+const testProps: TestProperty = {
+    foo: "bar",
+    hello: "world"
+};
+
+const typedPropertiesFeature: Feature<Point> = {
+    type: "Feature",
+    properties: testProps,
+    geometry: {
+        type: "Point",
+        coordinates: [0, 0]
+    }
+};
+
+const typedPropertiesFeatureCollection: FeatureCollection<Point> = {
+    type: "FeatureCollection",
+    features: [typedPropertiesFeature]
+};
diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index 9c55aa19c9..e6783255eb 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -1,121 +1,165 @@
-// Type definitions for GeoJSON Format Specification Revision 1.0
-// Project: http://geojson.org/
+// Type definitions for geojson 7946.0
+// Project: https://geojson.org/
 // Definitions by: Jacob Bruun <https://github.com/cobster>
+//                 Arne Schubert <https://github.com/atd-schubert>
+//                 Jeff Jacobson <https://github.com/JeffJacobson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// Note: as of the RFC 7946 version of GeoJSON, Coordinate Reference Systems
+// are no longer supported. (See https://tools.ietf.org/html/rfc7946#appendix-B)}
 
 export as namespace GeoJSON;
 
-/***
-* http://geojson.org/geojson-spec.html#geojson-objects
-*/
-export interface GeoJsonObject {
-    type: string;
-    bbox?: number[];
-    crs?: CoordinateReferenceSystem;
-}
-
-/***
-* http://geojson.org/geojson-spec.html#positions
-*/
-export type Position = number[];
-
-/***
-* http://geojson.org/geojson-spec.html#geometry-objects
-*/
-export interface DirectGeometryObject extends GeoJsonObject {
-    coordinates: Position[][][] | Position[][] | Position[] | Position;
-}
 /**
- * GeometryObject supports geometry collection as well
+ * The valid values for the "type" property of GeoJSON geometry objects.
+ * https://tools.ietf.org/html/rfc7946#section-1.4
  */
-export type GeometryObject = DirectGeometryObject | GeometryCollection;
+export type GeoJsonGeometryTypes = "Point" | "LineString" | "MultiPoint" | "Polygon" | "MultiLineString" |
+    "MultiPolygon" | "GeometryCollection";
 
-/***
-* http://geojson.org/geojson-spec.html#point
-*/
-export interface Point extends DirectGeometryObject {
-    type: 'Point';
+/**
+ * The value values for the "type" property of GeoJSON Objects.
+ * https://tools.ietf.org/html/rfc7946#section-1.4
+ */
+export type GeoJsonTypes = "FeatureCollection" | "Feature" | GeoJsonGeometryTypes;
+
+/**
+ * Bounding box
+ * https://tools.ietf.org/html/rfc7946#section-5
+ */
+export type BBox = [number, number, number, number] | [number, number, number, number, number, number];
+
+/**
+ * A Position is an array of coordinates.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.1
+ * Array should contain between two and three elements.
+ * The previous GeoJSON specification allowed more elements (e.g., which could be used to represent M values),
+ * but the current specification only allows X, Y, and (optionally) Z to be defined.
+ */
+export type Position = number[]; // [number, number] | [number, number, number];
+
+/**
+ * The base GeoJSON object.
+ * https://tools.ietf.org/html/rfc7946#section-3
+ * The GeoJSON specification also allows foreign members
+ * (https://tools.ietf.org/html/rfc7946#section-6.1)
+ * Developers should use "&" type in TypeScript or extend the interface
+ * to add these foreign members.
+ */
+export interface GeoJsonObject {
+    // Don't include foreign members directly into this type def.
+    // in order to preserve type safety.
+    // [key: string]: any;
+    /**
+     * Specifies the type of GeoJSON object.
+     */
+    type: GeoJsonTypes;
+    /**
+     * Bounding box of the coordinate range of the object's Geometries, Features, or Feature Collections.
+     * https://tools.ietf.org/html/rfc7946#section-5
+     */
+    bbox?: BBox;
+}
+
+/**
+ * A geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3
+ */
+export interface GeometryObject extends GeoJsonObject {
+    type: GeoJsonGeometryTypes;
+}
+
+/**
+ * Point geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.2
+ */
+export interface Point extends GeometryObject {
+    type: "Point";
     coordinates: Position;
 }
 
-/***
-* http://geojson.org/geojson-spec.html#multipoint
-*/
-export interface MultiPoint extends DirectGeometryObject {
-    type: 'MultiPoint';
+/**
+ * MultiPoint geometry object.
+ *  https://tools.ietf.org/html/rfc7946#section-3.1.3
+ */
+export interface MultiPoint extends GeometryObject {
+    type: "MultiPoint";
     coordinates: Position[];
 }
 
-/***
-* http://geojson.org/geojson-spec.html#linestring
-*/
-export interface LineString extends DirectGeometryObject {
-    type: 'LineString';
+/**
+ * LineString geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.4
+ */
+export interface LineString extends GeometryObject {
+    type: "LineString";
     coordinates: Position[];
 }
 
-/***
-* http://geojson.org/geojson-spec.html#multilinestring
-*/
-export interface MultiLineString extends DirectGeometryObject {
-    type: 'MultiLineString';
+/**
+ * MultiLineString geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.5
+ */
+export interface MultiLineString extends GeometryObject {
+    type: "MultiLineString";
     coordinates: Position[][];
 }
 
-/***
-* http://geojson.org/geojson-spec.html#polygon
-*/
-export interface Polygon extends DirectGeometryObject {
-    type: 'Polygon';
+/**
+ * Polygon geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.6
+ */
+export interface Polygon extends GeometryObject {
+    type: "Polygon";
     coordinates: Position[][];
 }
 
-/***
-* http://geojson.org/geojson-spec.html#multipolygon
-*/
-export interface MultiPolygon extends DirectGeometryObject {
-    type: 'MultiPolygon';
+/**
+ * MultiPolygon geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.7
+ */
+export interface MultiPolygon extends GeometryObject {
+    type: "MultiPolygon";
     coordinates: Position[][][];
 }
 
-/***
-* http://geojson.org/geojson-spec.html#geometry-collection
-*/
-export interface GeometryCollection extends GeoJsonObject {
-    type: 'GeometryCollection';
-    geometries: GeometryObject[];
+/**
+ * Geometry Collection
+ * https://tools.ietf.org/html/rfc7946#section-3.1.8
+ */
+export interface GeometryCollection extends GeometryObject {
+    type: "GeometryCollection";
+    geometries: Array<Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon>;
 }
 
-/***
-* https://tools.ietf.org/html/rfc7946#section-3.2
-*/
-export interface Feature<T extends GeometryObject> extends GeoJsonObject {
-    type: 'Feature';
-    geometry: T;
-    properties: any;
+export type GeoJsonProperties = { [name: string]: any; } | null;
+
+/**
+ * A feature object which contains a geometry and associated properties.
+ * https://tools.ietf.org/html/rfc7946#section-3.2
+ */
+export interface Feature<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
+    type: "Feature";
+    /**
+     * The feature's geometry
+     */
+    geometry: G | null;
+    /**
+     * A value that uniquely identifies this feature in a
+     * https://tools.ietf.org/html/rfc7946#section-3.2.
+     */
     id?: string | number;
+    /**
+     * Properties associated with this feature.
+     */
+    properties: P | null;
 }
 
-/***
-* http://geojson.org/geojson-spec.html#feature-collection-objects
-*/
-export interface FeatureCollection<T extends GeometryObject> extends GeoJsonObject {
-    type: 'FeatureCollection';
-    features: Array<Feature<T>>;
-}
-
-/***
-* http://geojson.org/geojson-spec.html#coordinate-reference-system-objects
-*/
-export interface CoordinateReferenceSystem {
-    type: string;
-    properties: any;
-}
-
-export interface NamedCoordinateReferenceSystem extends CoordinateReferenceSystem {
-    properties: { name: string };
-}
-
-export interface LinkedCoordinateReferenceSystem extends CoordinateReferenceSystem {
-    properties: { href: string; type: string };
+/**
+ * A collection of feature objects.
+ *  https://tools.ietf.org/html/rfc7946#section-3.3
+ */
+export interface FeatureCollection<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
+    features: Array<Feature<G, P>>;
 }
diff --git a/types/geojson2osm/index.d.ts b/types/geojson2osm/index.d.ts
index 08bc529cc0..39b03de5bf 100644
--- a/types/geojson2osm/index.d.ts
+++ b/types/geojson2osm/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Rub21/geojson2osm
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="geojson"/>
 
diff --git a/types/geojson2osm/tslint.json b/types/geojson2osm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/geojson2osm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/geolib/index.d.ts b/types/geolib/index.d.ts
deleted file mode 100644
index 8842c3eb20..0000000000
--- a/types/geolib/index.d.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-// Type definitions for geolib 2.0
-// Project: https://github.com/manuelbieh/Geolib
-// Definitions by: Vladimir Venegas <https://github.com/vvenegasv>, Alex Efimov <https://github.com/dotnetpart>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace geolib {
-    interface PositionAsDecimal {
-        latitude: number;
-        longitude: number;
-    }
-
-    interface PositionAsSexadecimal {
-        latitude: string;
-        longitude: string;
-    }
-
-    interface PositionWithElevation extends PositionAsDecimal {
-        elevation?: number;
-    }
-
-    interface PositionInTime extends PositionAsDecimal {
-        time: number;
-    }
-
-    interface Bound {
-        minLat: number;
-        maxLat: number;
-        minLng: number;
-        maxLng: number;
-        minElev?: number;
-        maxElev?: number;
-    }
-
-    interface CompassDirection {
-        rough: string;
-        exact: string;
-    }
-
-    interface Distance {
-        latitude: number;
-        longitude: number;
-        distance: number;
-        key: string;
-    }
-
-    interface SpeedOption {
-        unit: string;
-    }
-
-    /** Calculates the distance between two geo coordinates
-     *
-     * Return value is always float and represents the distance in meters.
-     */
-    function getDistance(start: PositionAsDecimal|PositionAsSexadecimal, end: PositionAsDecimal|PositionAsSexadecimal, accuracy?: number, precision?: number): number;
-
-    /** Calculates the distance between two geo coordinates but this method is far more inaccurate as compared to getDistance.
-     * It can take up 2 to 3 arguments. start, end and accuracy can be defined in the same as in getDistance.
-     *
-     * Return value is always float that represents the distance in meters.
-     */
-    function getDistanceSimple(start: PositionAsDecimal|PositionAsSexadecimal, end: PositionAsDecimal|PositionAsSexadecimal, accuracy?: number): number;
-
-    /** Calculates the geographical center of all points in a collection of geo coordinates
-     * Takes an object or array of coordinates and calculates the center of it.
-     */
-    function getCenter(coords: PositionAsDecimal[]): PositionAsDecimal;
-
-    /** Calculates the center of the bounds of geo coordinates. Takes an array of coordinates,
-     * calculate the border of those, and gives back the center of that rectangle. On polygons
-     * like political borders (eg. states), this may gives a closer result to human expectation,
-     * than getCenter, because that function can be disturbed by uneven distribution of point in
-     * different sides. Imagine the US state Oklahoma: getCenter on that gives a southern point,
-     * because the southern border contains a lot more nodes, than the others.
-     */
-    function getCenterOfBounds(coords: PositionAsDecimal[]): PositionAsDecimal;
-
-    /** Calculates the bounds of geo coordinates.
-     *
-     * Returns maximum and minimum, latitude, longitude, and elevation (if provided) in form of an object
-     */
-    function getBounds(coords: PositionWithElevation[]): Bound;
-
-    /** Checks whether a point is inside of a polygon or not. Note: the polygon coords must be in correct order!
-     *
-     * Returns true or false
-     */
-    function isPointInside(latlng: PositionAsDecimal, polygon: PositionAsDecimal[]): boolean;
-
-    /** Similar to is point inside: checks whether a point is inside of a circle or not.
-     *
-     * Returns true or false
-     */
-    function isPointInCircle(latlng: PositionAsDecimal, center: PositionAsDecimal, radius: number): boolean;
-
-    /** Gets rhumb line bearing of two points. Find out about the difference between rhumb line and great circle bearing on Wikipedia.
-     * Rhumb line should be fine in most cases: http://en.wikipedia.org/wiki/Rhumb_line#General_and_mathematical_description Function
-     * is heavily based on Doug Vanderweide's great PHP version (licensed under GPL 3.0)
-     * http://www.dougv.com/2009/07/13/calculating-the-bearing-and-compass-rose-direction-between-two-latitude-longitude-coordinates-in-php/
-     *
-     * Returns calculated bearing as integer.
-     */
-    function getRhumbLineBearing(originLL: PositionAsDecimal, destLL: PositionAsDecimal): number;
-
-    /** Gets great circle bearing of two points. See description of getRhumbLineBearing for more information.
-     *
-     * Returns calculated bearing as integer
-     */
-    function getBearing(originLL: PositionAsDecimal, destLL: PositionAsDecimal): number;
-
-    /** Gets the compass direction from an origin coordinate (originLL) to a destination coordinate (destLL).
-     * Bearing mode. Can be either circle or rhumbline (default).
-     *
-     * Returns an object with a rough (NESW) and an exact direction (NNE, NE, ENE, E, ESE, etc).
-     */
-    function getCompassDirection(originLL: PositionAsDecimal, destLL: PositionAsDecimal, bearingMode?: string): CompassDirection;
-
-    /** Sorts an object or array of coords by distance from a reference coordinate */
-    function orderByDistance(latlng: PositionAsDecimal, coords: PositionAsDecimal[]): Distance[];
-
-    /** Finds the nearest coordinate to a reference coordinate. */
-    function findNearest(latlng: PositionAsDecimal, coords: PositionAsDecimal[], offset?: number, limit?: number): Distance[];
-
-    /** Calculates the length of a collection of coordinates.
-     *
-     * Returns the length of the path in meters
-     */
-    function getPathLength(coords: PositionAsDecimal[]): number;
-
-    /** Calculates the speed between two points within a given time span.
-     *
-     * Returns the speed in options.unit (default is km/h).
-     */
-    function getSpeed(coords: PositionInTime[], option?: SpeedOption): number;
-
-    /** Calculates if given point lies in a line formed by start and end */
-    function isPointInLine(point: PositionAsDecimal, start: PositionAsDecimal, end: PositionAsDecimal): boolean;
-
-    /** Converts a given distance (in meters) to another unit.
-     * distance distance to be converted (source must be in meter). unit can be one of:
-     * - m (meter)
-     * - km (kilometers)
-     * - cm (centimeters)
-     * - mm (millimeters)
-     * - mi (miles)
-     * - sm (seamiles)
-     * - ft (foot)
-     * - in (inch)
-     * - yd (yards)
-     */
-    function convertUnit(unit: string, distance: number, round?: number): number;
-
-    /** Converts a sexagesimal coordinate to decimal format */
-    function sexagesimal2decimal(coord: string): number;
-
-    /** Converts a decimal coordinate to sexagesimal format */
-    function decimal2sexagesimal(coord: number): string;
-
-    /** Returns the latitude for a given point and converts it to decimal.
-     * Works with: latitude, lat, 1 (GeoJSON array)
-     */
-    function latitude(latlng: any): number;
-
-    /** Returns the longitude for a given point and converts it to decimal.
-     * Works with: longitude, lng, lon, 0 (GeoJSON array)
-     */
-    function longitude(latlng: any): number;
-
-    /** Returns the elevation for a given point and converts it to decimal.
-     * Works with: elevation, elev, alt, altitude, 2 (GeoJSON array)
-     */
-    function elevation(latlng: any): number;
-
-    /** Checks if a coordinate is already in decimal format and, if not, converts it to */
-    function useDecimal(latlng: string|number): number;
-
-    /** Computes the destination point given an initial point, a distance (in meters) and a bearing (in degrees).
-     * If no radius is given it defaults to the mean earth radius of 6371000 meter.
-     *
-     * Returns an object: `{"latitude": destLat, "longitude": destLng}`
-     * (Attention: this formula is not *100%* accurate (but very close though))
-     */
-    function computeDestinationPoint(start: PositionAsDecimal, distance: number, bearing: number, radius?: number): PositionAsDecimal;
-}
diff --git a/types/geolib/tsconfig.json b/types/geolib/tsconfig.json
deleted file mode 100644
index 233fe708bf..0000000000
--- a/types/geolib/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "geolib-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/geolib/tslint.json b/types/geolib/tslint.json
deleted file mode 100644
index 946997cb87..0000000000
--- a/types/geolib/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-useless-files": false
-    }
-}
diff --git a/types/geometry-dom/tslint.json b/types/geometry-dom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/geometry-dom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/get-port/tslint.json b/types/get-port/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/get-port/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gifffer/gifffer-tests.ts b/types/gifffer/gifffer-tests.ts
new file mode 100644
index 0000000000..b069e0020c
--- /dev/null
+++ b/types/gifffer/gifffer-tests.ts
@@ -0,0 +1,28 @@
+import Gifffer from 'gifffer';
+
+let gifs: HTMLButtonElement[];
+
+gifs = Gifffer({
+    playButtonStyles: {
+        width: '60px',
+        height: '60px',
+        'border-radius': '30px',
+        background: 'rgba(0, 0, 0, 0.3)',
+        position: 'absolute',
+        top: '50%',
+        left: '50%',
+        margin: '-30px 0 0 -30px'
+    },
+    playButtonIconStyles: {
+        width: '0',
+        height: '0',
+        'border-top': '14px solid transparent',
+        'border-bottom': '14px solid transparent',
+        'border-left': '14px solid rgba(0, 0, 0, 0.5)',
+        position: 'absolute',
+        left: '26px',
+        top: '16px'
+    }
+});
+
+gifs[0].click();
diff --git a/types/gifffer/index.d.ts b/types/gifffer/index.d.ts
new file mode 100644
index 0000000000..ac0f7663cc
--- /dev/null
+++ b/types/gifffer/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for gifffer 1.5
+// Project: https://github.com/krasimir/gifffer#readme
+// Definitions by: William Lohan <https://github.com/gatimus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * @see {@link https://github.com/krasimir/gifffer#styling|Styling}
+ */
+export interface GiffferOptions {
+    playButtonStyles: { [style: string]: string; };
+    playButtonIconStyles: { [style: string]: string; };
+}
+
+/**
+ * @see {@link https://github.com/krasimir/gifffer#usage|Usage}
+ */
+export default function Gifffer(options?: GiffferOptions): HTMLButtonElement[];
diff --git a/types/gifffer/tsconfig.json b/types/gifffer/tsconfig.json
new file mode 100644
index 0000000000..273e998048
--- /dev/null
+++ b/types/gifffer/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gifffer-tests.ts"
+    ]
+}
diff --git a/types/gifffer/tslint.json b/types/gifffer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gifffer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gijgo/tslint.json b/types/gijgo/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gijgo/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/giraffe/tslint.json b/types/giraffe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/giraffe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/git-config/tslint.json b/types/git-config/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/git-config/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/git/tslint.json b/types/git/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/git/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/github-username-regex/github-username-regex-tests.ts b/types/github-username-regex/github-username-regex-tests.ts
new file mode 100644
index 0000000000..d829752776
--- /dev/null
+++ b/types/github-username-regex/github-username-regex-tests.ts
@@ -0,0 +1,4 @@
+import githubUsernameRegex = require("github-username-regex");
+
+const githubUsernameRegexString: string = githubUsernameRegex.source;
+const valid: boolean = githubUsernameRegex.test("abc-123");
diff --git a/types/github-username-regex/index.d.ts b/types/github-username-regex/index.d.ts
new file mode 100644
index 0000000000..59b3d703f7
--- /dev/null
+++ b/types/github-username-regex/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for github-username-regex 1.0
+// Project: https://github.com/shinnn/github-username-regex
+// Definitions by: BehindTheMath <https://github.com/BehindTheMath>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const githubUsernameRegex: RegExp;
+export = githubUsernameRegex;
diff --git a/types/github-username-regex/tsconfig.json b/types/github-username-regex/tsconfig.json
new file mode 100644
index 0000000000..4a30cf07ad
--- /dev/null
+++ b/types/github-username-regex/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "github-username-regex-tests.ts"
+    ]
+}
diff --git a/types/github-username-regex/tslint.json b/types/github-username-regex/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/github-username-regex/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gl-matrix/gl-matrix-tests.ts b/types/gl-matrix/gl-matrix-tests.ts
index 765f871e30..c929323764 100644
--- a/types/gl-matrix/gl-matrix-tests.ts
+++ b/types/gl-matrix/gl-matrix-tests.ts
@@ -70,7 +70,7 @@ outVec2 = vec2.negate(outVec2, vec2A);
 outVec2 = vec2.inverse(outVec2, vec2A);
 outVec2 = vec2.normalize(outVec2, vec2A);
 outVal = vec2.dot(vec2A, vec2B);
-outVec2 = vec2.cross(outVec2, vec2A, vec2B);
+outVec2 = vec2.cross(outVec3, vec2A, vec2B);
 outVec2 = vec2.lerp(outVec2, vec2A, vec2B, 0.5);
 outVec2 = vec2.random(outVec2);
 outVec2 = vec2.random(outVec2, 5.0);
@@ -338,6 +338,7 @@ outVal = quat.squaredLength(quatA);
 outVal = quat.sqrLen(quatA);
 outQuat = quat.normalize(outQuat, quatA);
 outVal = quat.dot(quatA, quatB);
+outQuat = quat.fromEuler(outQuat, deg90, deg90, deg90);
 outQuat = quat.lerp(outQuat, quatA, quatB, 0.5);
 outQuat = quat.slerp(outQuat, quatA, quatB, 0.5);
 outQuat = quat.invert(outQuat, quatA);
@@ -432,7 +433,7 @@ outVec2 = _vec2.negate(outVec2, vec2A);
 outVec2 = _vec2.inverse(outVec2, vec2A);
 outVec2 = _vec2.normalize(outVec2, vec2A);
 outVal = _vec2.dot(vec2A, vec2B);
-outVec2 = _vec2.cross(outVec2, vec2A, vec2B);
+outVec2 = _vec2.cross(outVec3, vec2A, vec2B);
 outVec2 = _vec2.lerp(outVec2, vec2A, vec2B, 0.5);
 outVec2 = _vec2.random(outVec2);
 outVec2 = _vec2.random(outVec2, 5.0);
diff --git a/types/gl-matrix/index.d.ts b/types/gl-matrix/index.d.ts
index 1ce2ea5d58..cad714796d 100644
--- a/types/gl-matrix/index.d.ts
+++ b/types/gl-matrix/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for gl-matrix 2.3.2
+// Type definitions for gl-matrix 2.4
 // Project: https://github.com/toji/gl-matrix
 // Definitions by: Mattijs Kneppers <https://github.com/mattijskneppers>, based on definitions by Tat <https://github.com/tatchx>
 //                 Nikolay Babanov <https://github.com/nbabanov>
 //                 Austin Martin <https://github.com/auzmartist>
+//                 Wayne Langman <https://github.com/surtr-isaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'gl-matrix' {
@@ -343,7 +344,7 @@ declare module 'gl-matrix' {
          * @param b the second operand
          * @returns out
          */
-        public static cross(out: vec2, a: vec2 | number[], b: vec2 | number[]): vec2;
+        public static cross(out: vec3, a: vec2 | number[], b: vec2 | number[]): vec2;
 
         /**
          * Performs a linear interpolation between two vec2's
@@ -2943,6 +2944,17 @@ declare module 'gl-matrix' {
          */
         public static dot(a: quat, b: quat): number;
 
+        /**
+         * Creates a quaternion from the given euler angle x, y, z.
+         *
+         * @param {quat} out the receiving quaternion
+         * @param {number} x Angle to rotate around X axis in degrees.
+         * @param {number} y Angle to rotate around Y axis in degrees.
+         * @param {number} z Angle to rotate around Z axis in degrees.
+         * @returns {quat} out
+         */
+        public static fromEuler(out: quat, x: number, y: number, z: number): quat;
+
         /**
          * Performs a linear interpolation between two quat's
          *
diff --git a/types/gl-matrix/tslint.json b/types/gl-matrix/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gl-matrix/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gldatepicker/tslint.json b/types/gldatepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gldatepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/glidejs/tslint.json b/types/glidejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/glidejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/glob-expand/tslint.json b/types/glob-expand/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/glob-expand/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/glob-parent/glob-parent-tests.ts b/types/glob-parent/glob-parent-tests.ts
new file mode 100644
index 0000000000..13c7df5d59
--- /dev/null
+++ b/types/glob-parent/glob-parent-tests.ts
@@ -0,0 +1,4 @@
+import globParent = require('glob-parent');
+
+// $ExpectType string
+globParent('*.js');
diff --git a/types/glob-parent/index.d.ts b/types/glob-parent/index.d.ts
new file mode 100644
index 0000000000..052bbcd1db
--- /dev/null
+++ b/types/glob-parent/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for glob-parent 3.1
+// Project: https://github.com/es128/glob-parent
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function globParent(pattern: string): string;
+
+export = globParent;
diff --git a/types/glob-parent/tsconfig.json b/types/glob-parent/tsconfig.json
new file mode 100644
index 0000000000..1e74b9bc82
--- /dev/null
+++ b/types/glob-parent/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "glob-parent-tests.ts"
+    ]
+}
diff --git a/types/glob-parent/tslint.json b/types/glob-parent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/glob-parent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/glob-stream/glob-stream-tests.ts b/types/glob-stream/glob-stream-tests.ts
index 617246799c..ca436746cc 100644
--- a/types/glob-stream/glob-stream-tests.ts
+++ b/types/glob-stream/glob-stream-tests.ts
@@ -2,9 +2,24 @@ import gs = require('glob-stream');
 
 var read: NodeJS.ReadableStream;
 
-read = gs.create('xx');
-read = gs.create('xx', {});
-read = gs.create(['xx'], {});
-read = gs.create(['xx'], {cwd: 'xx'});
-read = gs.create(['xx'], {base: 'xx'});
-read = gs.create(['xx'], {cwdbase: true});
+// Types
+var strPredicate: gs.UniqueByStringPredicate = 'base';
+var fnPredicate: gs.UniqueByFunctionPredicate = (entry) => entry.path;
+
+// Base cases
+read = gs('xx');
+read = gs('xx', {});
+read = gs(['xx'], {});
+
+// Package options
+read = gs(['xx'], { allowEmpty: true });
+read = gs(['xx'], { base: 'xx' });
+read = gs(['xx'], { cwdbase: true });
+read = gs(['xx'], { uniqueBy: 'path' });
+read = gs(['xx'], { uniqueBy: 'base' });
+read = gs(['xx'], { uniqueBy: 'cwd' });
+read = gs(['xx'], { uniqueBy: (entry: gs.Entry) => entry.path });
+
+// Glob options
+read = gs(['xx'], { root: 'root' });
+read = gs(['xx'], { debug: true });
diff --git a/types/glob-stream/index.d.ts b/types/glob-stream/index.d.ts
index 36a5d9fb92..d9d9c6d7c6 100644
--- a/types/glob-stream/index.d.ts
+++ b/types/glob-stream/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for glob-stream v3.1.12
+// Type definitions for glob-stream v6.1.0
 // Project: https://github.com/wearefractal/glob-stream
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+//                 mrmlnc <https://github.com/mrmlnc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -8,17 +9,40 @@
 
 import glob = require('glob');
 
-export interface Options extends glob.IOptions {
-    cwd?: string;
-    base?: string;
-    cwdbase?: boolean;
+declare function GlobStream(glob: string | string[]): NodeJS.ReadableStream;
+declare function GlobStream(glob: string | string[], options: GlobStream.Options): NodeJS.ReadableStream;
+
+declare namespace GlobStream {
+    export interface Entry {
+        cwd: string;
+        base: string;
+        path: string;
+    }
+
+    export type UniqueByStringPredicate = 'cwd' | 'base' | 'path';
+    export type UniqueByFunctionPredicate = (entry: Entry) => string;
+
+    export interface Options extends glob.IOptions {
+        /**
+         * Whether or not to error upon an empty singular glob.
+         */
+        allowEmpty?: boolean;
+        /**
+         * The absolute segment of the glob path that isn't a glob. This value is attached
+         * to each globobject and is useful for relative pathing.
+         */
+        base?: string;
+        /**
+         * Whether or not the `cwd` and `base` should be the same.
+         */
+        cwdbase?: boolean;
+        /**
+         * Filters stream to remove duplicates based on the string property name or the result of function.
+         * When using a function, the function receives the streamed
+         * data (objects containing `cwd`, `base`, `path` properties) to compare against.
+         */
+        uniqueBy?: UniqueByStringPredicate | UniqueByFunctionPredicate;
+    }
 }
 
-export interface Element {
-    cwd: string;
-    base: string;
-    path: string;
-}
-
-export declare function create(glob: string, opts?: Options): NodeJS.ReadableStream;
-export declare function create(globs: string[], opts?: Options): NodeJS.ReadableStream;
+export = GlobStream;
diff --git a/types/glob-stream/tslint.json b/types/glob-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/glob-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/glob/glob-tests.ts b/types/glob/glob-tests.ts
index dcc72341cc..e0f612e682 100644
--- a/types/glob/glob-tests.ts
+++ b/types/glob/glob-tests.ts
@@ -1,22 +1,30 @@
 import glob = require("glob");
-var Glob = glob.Glob;
+const Glob = glob.Glob;
 
-(()=> {
-	var pattern = "test/a/**/[cg]/../[cg]";
+(() => {
+	const pattern = "test/a/**/[cg]/../[cg]";
 	console.log(pattern);
 
-	var mg = new Glob(pattern, {mark: true, sync: true}, function (er, matches) {
-		console.log("matches", matches)
+	const mg = new Glob(pattern, {mark: true, sync: true}, (er, matches) => {
+		if (er) {
+			console.error(er);
+			return;
+		}
+		console.log("matches", matches);
 	});
-	console.log("after")
+	console.log("after");
 })();
 
-(()=> {
-	var pattern = "{./*/*,/*,/usr/local/*}";
+(() => {
+	const pattern = "{./*/*,/*,/usr/local/*}";
 	console.log(pattern);
 
-	var mg = new Glob(pattern, {mark: true}, function (er, matches) {
-		console.log("matches", matches)
+	const mg = new Glob(pattern, {mark: true}, (er, matches) => {
+		if (er) {
+			console.error(er);
+			return;
+		}
+		console.log("matches", matches);
 	});
-	console.log("after")
+	console.log("after");
 })();
diff --git a/types/glob/index.d.ts b/types/glob/index.d.ts
index c7c6ffc601..f7628d5ab7 100644
--- a/types/glob/index.d.ts
+++ b/types/glob/index.d.ts
@@ -1,11 +1,10 @@
-// Type definitions for Glob 5.0.10
+// Type definitions for Glob 5.0
 // Project: https://github.com/isaacs/node-glob
 // Definitions by: vvakame <https://github.com/vvakame>
 //                 voy <https://github.com/voy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="minimatch" />
 
 import events = require("events");
 import fs = require('fs');
@@ -19,8 +18,8 @@ declare namespace G {
 
     function hasMagic(pattern: string, options?: IOptions): boolean;
 
-    var Glob: IGlobStatic;
-    var GlobSync: IGlobSyncStatic;
+    let Glob: IGlobStatic;
+    let GlobSync: IGlobSyncStatic;
 
     interface IOptions extends minimatch.IOptions {
         cwd?: string;
@@ -63,7 +62,7 @@ declare namespace G {
     }
 
     interface IGlobSyncStatic {
-        new (pattern: string, options?: IOptions): IGlobBase
+        new (pattern: string, options?: IOptions): IGlobBase;
         prototype: IGlobBase;
     }
 
diff --git a/types/glob/tslint.json b/types/glob/tslint.json
new file mode 100644
index 0000000000..2c7c1bed53
--- /dev/null
+++ b/types/glob/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "interface-name": false
+    }
+}
diff --git a/types/globalize-compiler/tslint.json b/types/globalize-compiler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/globalize-compiler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/globalize/tslint.json b/types/globalize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/globalize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gm/index.d.ts b/types/gm/index.d.ts
index 2cba86936d..0670f0ae0f 100644
--- a/types/gm/index.d.ts
+++ b/types/gm/index.d.ts
@@ -1,15 +1,13 @@
 // Type definitions for gm 1.17
 // Project: https://github.com/aheckmann/gm
-// Definitions by: Joel Spadin <https://github.com/ChaosinaCan>
+// Definitions by: Joel Spadin <https://github.com/ChaosinaCan>, Maarten van Vliet <https://github.com/maartenvanvliet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
 
 import stream = require('stream');
 
-declare function m(image: string): m.State;
-declare function m(stream: NodeJS.ReadableStream, image?: string): m.State;
-declare function m(buffer: Buffer, image?: string): m.State;
+declare function m(stream: NodeJS.ReadableStream | Buffer | string, image?: string): m.State;
 declare function m(width: number, height: number, color?: string): m.State;
 
 declare namespace m {
@@ -27,7 +25,7 @@ declare namespace m {
     interface CompareOptions {
         file?: string;
         highlightColor?: string;
-        highlightStyle?: string;
+        highlightStyle?: HighlightStyle;
         tolerance?: number;
     }
 
@@ -108,78 +106,17 @@ declare namespace m {
         border(width: number, height: number): State;
         borderColor(color: string): State;
         box(color: string): State;
-        channel(type: 'Red'): State;
-        channel(type: 'Green'): State;
-        channel(type: 'Blue'): State;
-        channel(type: 'Opacity'): State;
-        channel(type: 'Matte'): State;
-        channel(type: 'Cyan'): State;
-        channel(type: 'Magenta'): State;
-        channel(type: 'Yellow'): State;
-        channel(type: 'Black'): State;
-        channel(type: 'Gray'): State;
-        channel(type: string): State;
+        channel(type: NamedColor | string): State;
         charcoal(factor: number): State;
         chop(width: number, height: number, x?: number, y?: number): State;
         clip(): State;
         coalesce(): State;
         colorize(red: number, green: number, blue: number): State;
-        colorMap(type: 'shared'): State;
-        colorMap(type: 'private'): State;
-        colorMap(type: string): State;
+        colorMap(type: 'shared' | 'private' | string): State;
         colors(colors: number): State;
-        colorspace(space: 'CineonLog'): State;
-        colorspace(space: 'CMYK'): State;
-        colorspace(space: 'GRAY'): State;
-        colorspace(space: 'HSL'): State;
-        colorspace(space: 'HSB'): State;
-        colorspace(space: 'OHTA'): State;
-        colorspace(space: 'RGB'): State;
-        colorspace(space: 'Rec601Luma'): State;
-        colorspace(space: 'Rec709Luma'): State;
-        colorspace(space: 'Rec601YCbCr'): State;
-        colorspace(space: 'Rec709YCbCr'): State;
-        colorspace(space: 'Transparent'): State;
-        colorspace(space: 'XYZ'): State;
-        colorspace(space: 'YCbCr'): State;
-        colorspace(space: 'YIQ'): State;
-        colorspace(space: 'YPbPr'): State;
-        colorspace(space: 'YUV'): State;
-        colorspace(space: string): State;
-        compose(operator: 'Over'): State;
-        compose(operator: 'In'): State;
-        compose(operator: 'Out'): State;
-        compose(operator: 'Atop'): State;
-        compose(operator: 'Xor'): State;
-        compose(operator: 'Plus'): State;
-        compose(operator: 'Minus'): State;
-        compose(operator: 'Add'): State;
-        compose(operator: 'Subtract'): State;
-        compose(operator: 'Difference'): State;
-        compose(operator: 'Divide'): State;
-        compose(operator: 'Multiply'): State;
-        compose(operator: 'Bumpmap'): State;
-        compose(operator: 'Copy'): State;
-        compose(operator: 'CopyRed'): State;
-        compose(operator: 'CopyGreen'): State;
-        compose(operator: 'CopyBlue'): State;
-        compose(operator: 'CopyOpacity'): State;
-        compose(operator: 'CopyCyan'): State;
-        compose(operator: 'CopyMagenta'): State;
-        compose(operator: 'CopyYellow'): State;
-        compose(operator: 'CopyBlack'): State;
-        compose(operator: string): State;
-        compress(type: 'None'): State;
-        compress(type: 'BZip'): State;
-        compress(type: 'Fax'): State;
-        compress(type: 'Group4'): State;
-        compress(type: 'JPEG'): State;
-        compress(type: 'Lossless'): State;
-        compress(type: 'LZW'): State;
-        compress(type: 'RLE'): State;
-        compress(type: 'Zip'): State;
-        compress(type: 'LZMA'): State;
-        compress(type: string): State;
+        colorspace(space: ColorSpace | string): State;
+        compose(operator: ComposeOperator | string): State;
+        compress(type: CompressionType | string): State;
         contrast(multiplier: number): State;
         convolve(kernel: string): State;
         createDirectories(): State;
@@ -192,52 +129,18 @@ declare namespace m {
         despeckle(): State;
         displace(horizontal: number, vertical: number): State;
         display(xServer: string): State;
-        dispose(method: 'Undefined'): State;
-        dispose(method: 'None'): State;
-        dispose(method: 'Background'): State;
-        dispose(method: 'Previous'): State;
-        dispose(method: string): State;
+        dispose(method: DisposeMethod | string): State;
         dissolve(percent: number): State;
         dither(enable?: boolean): State;
         edge(radius?: number): State;
         emboss(radius?: number): State;
-        encoding(encoding: 'AdobeCustom'): State;
-        encoding(encoding: 'AdobeExpert'): State;
-        encoding(encoding: 'AdobeStandard'): State;
-        encoding(encoding: 'AppleRoman'): State;
-        encoding(encoding: 'BIG5'): State;
-        encoding(encoding: 'GB2312'): State;
-        encoding(encoding: 'Latin 2'): State;
-        encoding(encoding: 'None'): State;
-        encoding(encoding: 'SJIScode'): State;
-        encoding(encoding: 'Symbol'): State;
-        encoding(encoding: 'Unicode'): State;
-        encoding(encoding: 'Wansung'): State;
-        encoding(encoding: string): State;
-        endian(type: 'MSB'): State;
-        endian(type: 'LSB'): State;
-        endian(type: 'Native'): State;
-        endian(type: string): State;
+        encoding(encoding: Encoding | string): State;
+        endian(type: EndianType | string): State;
         enhance(): State;
         equalize(): State;
         extent(width: number, height: number, options?: string): State;
         file(filename: string): State;
-        filter(type: 'Point'): State;
-        filter(type: 'Box'): State;
-        filter(type: 'Triangle'): State;
-        filter(type: 'Hermite'): State;
-        filter(type: 'Hanning'): State;
-        filter(type: 'Hamming'): State;
-        filter(type: 'Blackman'): State;
-        filter(type: 'Gaussian'): State;
-        filter(type: 'Quadratic'): State;
-        filter(type: 'Cubic'): State;
-        filter(type: 'Catrom'): State;
-        filter(type: 'Mitchell'): State;
-        filter(type: 'Lanczos'): State;
-        filter(type: 'Bessel'): State;
-        filter(type: 'Sinc'): State;
-        filter(type: string): State;
+        filter(type: FilterType | string): State;
         flatten(): State;
         flip(): State;
         flop(): State;
@@ -249,52 +152,18 @@ declare namespace m {
         geometry(width: number, height?: number, option?: ResizeOption): State;
         geometry(geometry: string): State;
         greenPrimary(x: number, y: number): State;
-        gravity(direction: 'NorthWest'): State;
-        gravity(direction: 'North'): State;
-        gravity(direction: 'NorthEast'): State;
-        gravity(direction: 'West'): State;
-        gravity(direction: 'Center'): State;
-        gravity(direction: 'East'): State;
-        gravity(direction: 'SouthWest'): State;
-        gravity(direction: 'South'): State;
-        gravity(direction: 'SouthEast'): State;
-        gravity(direction: string): State;
+        gravity(direction: GravityDirection | string): State;
         highlightColor(color: string): State;
-        highlightStyle(style: 'Assign'): State;
-        highlightStyle(style: 'Threshold'): State;
-        highlightStyle(style: 'Tint'): State;
-        highlightStyle(style: 'XOR'): State;
-        highlightStyle(style: string): State;
+        highlightStyle(style: HighlightStyle | string): State;
         iconGeometry(geometry: string): State;
         implode(factor?: number): State;
-        intent(type: 'Absolute'): State;
-        intent(type: 'Perceptual'): State;
-        intent(type: 'Relative'): State;
-        intent(type: 'Saturation'): State;
-        intent(type: string): State;
-        interlace(type: 'None'): State;
-        interlace(type: 'Line'): State;
-        interlace(type: 'Plane'): State;
-        interlace(type: 'Partition'): State;
-        interlace(type: string): State;
+        intent(type: IntentType | string): State;
+        interlace(type: InterlaceType | string): State;
         label(name: string): State;
         lat(width: number, height: number, offset: number, percent?: boolean): State;
         level(blackPoint: number, gamma: number, whitePoint: number, percent?: boolean): State;
-        limit(type: 'disk', val: string): State;
-        limit(type: 'file', val: string): State;
-        limit(type: 'map', val: string): State;
-        limit(type: 'memory', val: string): State;
-        limit(type: 'pixels', val: string): State;
-        limit(type: 'threads', val: string): State;
-        limit(type: string, val: string): State;
-        list(type: string): State;
-        list(type: 'Color'): State;
-        list(type: 'Delegate'): State;
-        list(type: 'Format'): State;
-        list(type: 'Magic'): State;
-        list(type: 'Module'): State;
-        list(type: 'Resource'): State;
-        list(type: 'Type'): State;
+        limit(type: LimitType | string, val: string): State;
+        list(type: ListType | string): State;
         log(format: string): State;
         loop(iterations: number): State;
         lower(width: number, height: number): State;
@@ -306,112 +175,29 @@ declare namespace m {
         maximumError(limit: number): State;
         median(radius?: number): State;
         minify(factor: number): State;
-        mode(mode: 'frame'): State;
-        mode(mode: 'unframe'): State;
-        mode(mode: 'concatenate'): State;
-        mode(mode: string): State;
+        mode(mode: OperationMode | string): State;
         modulate(b: number, s: number, h: number): State;
         monitor(): State;
         monochrome(): State;
-        morph(otherImg: string, outName: string, callback?: WriteCallback): State;
-        morph(otherImg: string[], outName: string, callback?: WriteCallback): State;
+        morph(otherImg: string | string[], outName: string, callback?: WriteCallback): State;
         mosaic(): State;
         motionBlur(radius: number, sigma?: number, angle?: number): State;
         name(): State;
         negative(): State;
-        noise(type: 'uniform'): State;
-        noise(type: 'gaussian'): State;
-        noise(type: 'multiplicative'): State;
-        noise(type: 'impulse'): State;
-        noise(type: 'laplacian'): State;
-        noise(type: 'poisson'): State;
-        noise(type: string): State;
-        noise(radius: number): State;
+        noise(type: NoiseType | string | number): State;
         noop(): State;
         normalize(): State;
         opaque(color: string): State;
-        operator(channel: string, operator: 'Add', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'And', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Assign', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Depth', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Divide', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Gamma', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Negate', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'LShift', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Log', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Max', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Min', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Multiply', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Or', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Pow', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'RShift', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Subtract', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Threshold', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Threshold-White', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Threshold-White-Negate', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Threshold-Black', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Threshold-Black-Negate', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Xor', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Noise-Gaussian', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Noise-Impulse', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Noise-Laplacian', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Noise-Multiplicative', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Noise-Poisson', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Noise-Random', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: 'Noise-Uniform', rvalue: number, percent?: boolean): State;
-        operator(channel: string, operator: string, rvalue: number, percent?: boolean): State;
-        orderedDither(channelType: 'All', NxN: string): State;
-        orderedDither(channelType: 'Intensity', NxN: string): State;
-        orderedDither(channelType: 'Red', NxN: string): State;
-        orderedDither(channelType: 'Green', NxN: string): State;
-        orderedDither(channelType: 'Blue', NxN: string): State;
-        orderedDither(channelType: 'Cyan', NxN: string): State;
-        orderedDither(channelType: 'Magenta', NxN: string): State;
-        orderedDither(channelType: 'Yellow', NxN: string): State;
-        orderedDither(channelType: 'Black', NxN: string): State;
-        orderedDither(channelType: 'Opacity', NxN: string): State;
-        orderedDither(channelType: string, NxN: string): State;
+        operator(channel: string, operator: ChannelOperator | string, rvalue: number, percent?: boolean): State;
+        orderedDither(channelType: ChannelType | string, NxN: string): State;
         outputDirectory(directory: string): State;
-        page(width: number, height: number, arg?: '%'): State;
-        page(width: number, height: number, arg?: '!'): State;
-        page(width: number, height: number, arg?: '<'): State;
-        page(width: number, height: number, arg?: '>'): State;
-        page(width: number, height: number, arg?: string): State;
+        page(width: number, height: number, arg?: '%' | '!' | '<' | '>' |string): State;
         pause(seconds: number): State;
         pen(color: string): State;
         ping(): State;
         pointSize(size: number): State;
         noProfile(): State;
-        preview(type: 'Rotate'): State;
-        preview(type: 'Shear'): State;
-        preview(type: 'Roll'): State;
-        preview(type: 'Hue'): State;
-        preview(type: 'Saturation'): State;
-        preview(type: 'Brightness'): State;
-        preview(type: 'Gamma'): State;
-        preview(type: 'Spiff'): State;
-        preview(type: 'Dull'): State;
-        preview(type: 'Grayscale'): State;
-        preview(type: 'Quantize'): State;
-        preview(type: 'Despeckle'): State;
-        preview(type: 'ReduceNoise'): State;
-        preview(type: 'AddNoise'): State;
-        preview(type: 'Sharpen'): State;
-        preview(type: 'Blur'): State;
-        preview(type: 'Threshold'): State;
-        preview(type: 'EdgeDetect'): State;
-        preview(type: 'Spread'): State;
-        preview(type: 'Shade'): State;
-        preview(type: 'Raise'): State;
-        preview(type: 'Segment'): State;
-        preview(type: 'Solarize'): State;
-        preview(type: 'Swirl'): State;
-        preview(type: 'Implode'): State;
-        preview(type: 'Wave'): State;
-        preview(type: 'OilPaint'): State;
-        preview(type: 'CharcoalDrawing'): State;
-        preview(type: 'JPEG'): State;
-        preview(type: string): State;
+        preview(type: PreviewType | string): State;
         paint(radius: number): State;
         process(command: string): State;
         profile(filename: string): State;
@@ -424,8 +210,7 @@ declare namespace m {
         region(width: number, height: number, x?: number, y?: number): State;
         remote(): State;
         render(): State;
-        repage(reset: '+'): State;
-        repage(reset: string): State;
+        repage(reset: '+' | string): State;
         repage(width: number, height: number, xoff: number, yoff: number, arg?: string): State;
         sample(geometry: string): State;
         samplingFactor(horizontalFactor: number, verticalFactor: number): State;
@@ -461,46 +246,21 @@ declare namespace m {
         threshold(value: number, percent?: boolean): State;
         thumb(width: number, height: number, outName: string, callback: WriteCallback): State;
         thumb(width: number, height: number, outName: string, quality: number, callback: WriteCallback): State;
-        thumb(width: number, height: number, outName: string, quality: number, align: 'topleft', callback: WriteCallback): State;
-        thumb(width: number, height: number, outName: string, quality: number, align: 'center', callback: WriteCallback): State;
-        thumb(width: number, height: number, outName: string, quality: number, align: string, callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, align: 'topleft' | 'center' | string, callback: WriteCallback): State;
         tile(filename: string): State;
         title(title: string): State;
         transform(color: string): State;
         transparent(color: string): State;
         treeDepth(depth: number): State;
         trim(): State;
-        type(type: 'Bilevel'): State;
-        type(type: 'Grayscale'): State;
-        type(type: 'Palette'): State;
-        type(type: 'PaletteMatte'): State;
-        type(type: 'TrueColor'): State;
-        type(type: 'TrueColorMatte'): State;
-        type(type: 'ColorSeparation'): State;
-        type(type: 'ColorSeparationMatte'): State;
-        type(type: 'Optimize'): State;
-        type(type: string): State;
+        type(type: ImageType | string): State;
         update(seconds: number): State;
-        units(type: 'Undefined'): State;
-        units(type: 'PixelsPerInch'): State;
-        units(type: 'PixelsPerCentimeter'): State;
-        units(type: string): State;
+        units(type: UnitType | string): State;
         unsharp(radius: number, sigma?: number, amount?: number, threshold?: number): State;
         usePixmap(): State;
         view(): State;
-        virtualPixel(method: 'Constant'): State;
-        virtualPixel(method: 'Edge'): State;
-        virtualPixel(method: 'Mirror'): State;
-        virtualPixel(method: 'Tile'): State;
-        virtualPixel(method: string): State;
-        visual(type: 'StaticGray'): State;
-        visual(type: 'GrayScale'): State;
-        visual(type: 'StaticColor'): State;
-        visual(type: 'PseudoColor'): State;
-        visual(type: 'TrueColor'): State;
-        visual(type: 'DirectColor'): State;
-        visual(type: 'default'): State;
-        visual(type: string): State;
+        virtualPixel(method: VirtualPixelMethod | string): State;
+        visual(type: VisualType | string): State;
         watermark(brightness: number, saturation: number): State;
         wave(amplitude: number, wavelength: number): State;
         whitePoint(x: number, y: number): State;
@@ -530,46 +290,21 @@ declare namespace m {
         // Drawing Operations
         draw(args: string): State;
         drawArc(x0: number, y0: number, x1: number, y1: number, r0: number, r1: number): State;
-        drawBezier(x0: number, y0: number, x1: number, y1: number): State;
-        drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
-        drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
+        drawBezier(x0: number, y0: number, x1: number, y1: number, x2?: number, y2?: number, ...coords: number[]): State;
         drawCircle(x0: number, y0: number, x1: number, y1: number): State;
         drawEllipse(x0: number, y0: number, rx: number, ry: number, a0: number, a1: number): State;
         drawLine(x0: number, y0: number, x1: number, y1: number): State;
         drawPoint(x: number, y: number): State;
-        drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
         drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-        drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
         drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-        drawRectangle(x0: number, y0: number, x1: number, y1: number): State;
-        drawRectangle(x0: number, y0: number, x1: number, y1: number, rc: number): State;
-        drawRectangle(x0: number, y0: number, x1: number, y1: number, wc: number, hc: number): State;
-        drawText(x: number, y: number, text: string, gravity: 'NorthWest'): State;
-        drawText(x: number, y: number, text: string, gravity: 'North'): State;
-        drawText(x: number, y: number, text: string, gravity: 'NorthEast'): State;
-        drawText(x: number, y: number, text: string, gravity: 'West'): State;
-        drawText(x: number, y: number, text: string, gravity: 'Center'): State;
-        drawText(x: number, y: number, text: string, gravity: 'East'): State;
-        drawText(x: number, y: number, text: string, gravity: 'SouthWest'): State;
-        drawText(x: number, y: number, text: string, gravity: 'South'): State;
-        drawText(x: number, y: number, text: string, gravity: 'SouthEast'): State;
-        drawText(x: number, y: number, text: string, gravity?: string): State;
+        drawRectangle(x0: number, y0: number, x1: number, y1: number, wc?: number, hc?: number): State;
+        drawText(x: number, y: number, text: string, gravity?: GravityDirection | string): State;
         fill(color: string): State;
         font(name: string, size?: number): State;
         fontSize(size: number): State;
         stroke(color: string, width?: number): State;
         strokeWidth(width: number): State;
-        setDraw(property: 'color', x: number, y: number, method: 'point'): State;
-        setDraw(property: 'color', x: number, y: number, method: 'replace'): State;
-        setDraw(property: 'color', x: number, y: number, method: 'floodfill'): State;
-        setDraw(property: 'color', x: number, y: number, method: 'filltoborder'): State;
-        setDraw(property: 'color', x: number, y: number, method: 'reset'): State;
-        setDraw(property: 'matte', x: number, y: number, method: 'point'): State;
-        setDraw(property: 'matte', x: number, y: number, method: 'replace'): State;
-        setDraw(property: 'matte', x: number, y: number, method: 'floodfill'): State;
-        setDraw(property: 'matte', x: number, y: number, method: 'filltoborder'): State;
-        setDraw(property: 'matte', x: number, y: number, method: 'reset'): State;
-        setDraw(property: string, x: number, y: number, method: string): State;
+        setDraw(property: SetDrawProperty | string, x: number, y: number, method: SetDrawMethod | string): State;
 
         // Commands
         stream(callback?: WriteCallback): stream.PassThrough;
@@ -581,17 +316,45 @@ declare namespace m {
 
     interface SubClass {
         (image: string): State;
-        (stream: NodeJS.ReadableStream, image?: string): State;
-        (buffer: Buffer, image?: string): State;
+        (stream: NodeJS.ReadableStream | Buffer, image?: string): State;
         (width: number, height: number, color?: string): State;
     }
 
     function compare(filename1: string, filename2: string, callback: CompareCallback): void;
-    function compare(filename1: string, filename2: string, tolerance: number, callback: CompareCallback): void;
-    function compare(filename1: string, filename2: string, options: CompareOptions, callback: CompareCallback): void;
+    function compare(filename1: string, filename2: string, options: CompareOptions | number, callback: CompareCallback): void;
 
     function subClass(options: ClassOptions): SubClass;
 
+    type ChannelOperator = 'Add'
+        | 'And'
+        | 'Assign'
+        | 'Depth'
+        | 'Divide'
+        | 'Gamma'
+        | 'Negate'
+        | 'LShift'
+        | 'Log'
+        | 'Max'
+        | 'Min'
+        | 'Multiply'
+        | 'Or'
+        | 'Pow'
+        | 'RShift'
+        | 'Subtract'
+        | 'Threshold'
+        | 'Threshold-White'
+        | 'Threshold-White-Negate'
+        | 'Threshold-Black'
+        | 'Threshold-Black-Negate'
+        | 'Xor'
+        | 'Noise-Gaussian'
+        | 'Noise-Impulse'
+        | 'Noise-Laplacian'
+        | 'Noise-Multiplicative'
+        | 'Noise-Poisson'
+        | 'Noise-Random'
+        | 'Noise-Uniform';
+
     type ChannelType = 'All'
         | 'Intensity'
         | 'Red'
@@ -603,10 +366,202 @@ declare namespace m {
         | 'Black'
         | 'Opacity';
 
+    type ColorSpace = 'CineonLog'
+        | 'CMYK'
+        | 'GRAY'
+        | 'HSL'
+        | 'HSB'
+        | 'OHTA'
+        | 'RGB'
+        | 'Rec601Luma'
+        | 'Rec709Luma'
+        | 'Rec601YCbCr'
+        | 'Rec709YCbCr'
+        | 'Transparent'
+        | 'XYZ'
+        | 'YCbCr'
+        | 'YIQ'
+        | 'YPbPr'
+        | 'YUV';
+
     type CompareCallback = (err: Error, isEqual: boolean, equality: number, raw: number) => any;
 
+    type ComposeOperator = 'Over'
+        | 'In'
+        | 'Out'
+        | 'Atop'
+        | 'Xor'
+        | 'Plus'
+        | 'Minus'
+        | 'Add'
+        | 'Subtract'
+        | 'Difference'
+        | 'Divide'
+        | 'Multiply'
+        | 'Bumpmap'
+        | 'Copy'
+        | 'CopyRed'
+        | 'CopyGreen'
+        | 'CopyBlue'
+        | 'CopyOpacity'
+        | 'CopyCyan'
+        | 'CopyMagenta'
+        | 'CopyYellow'
+        | 'CopyBlack';
+
+    type CompressionType = 'None'
+        | 'BZip'
+        | 'Fax'
+        | 'Group4'
+        | 'JPEG'
+        | 'Lossless'
+        | 'LZW'
+        | 'RLE'
+        | 'Zip'
+        | 'LZMA';
+
+    type DisposeMethod = 'Undefined'
+        | 'None'
+        | 'Background'
+        | 'Previous';
+
+    type Encoding = 'AdobeCustom'
+        | 'AdobeExpert'
+        | 'AdobeStandard'
+        | 'AppleRoman'
+        | 'BIG5'
+        | 'GB2312'
+        | 'Latin 2'
+        | 'None'
+        | 'SJIScode'
+        | 'Symbol'
+        | 'Unicode'
+        | 'Wansung';
+
+    type EndianType = 'MSB'
+        | 'LSB'
+        | 'Native';
+
+    type FilterType = 'Point'
+        | 'Box'
+        | 'Triangle'
+        | 'Hermite'
+        | 'Hanning'
+        | 'Hamming'
+        | 'Blackman'
+        | 'Gaussian'
+        | 'Quadratic'
+        | 'Cubic'
+        | 'Catrom'
+        | 'Mitchell'
+        | 'Lanczos'
+        | 'Bessel'
+        | 'Sinc';
+
     type GetterCallback<T> = (err: Error, value: T) => any;
 
+    type GravityDirection = 'NorthWest'
+        | 'North'
+        | 'NorthEast'
+        | 'West'
+        | 'Center'
+        | 'East'
+        | 'SouthWest'
+        | 'South'
+        | 'SouthEast';
+
+    type HighlightStyle = 'Assign'
+        | 'Threshold'
+        | 'Tint'
+        | 'XOR';
+
+    type ImageType = 'Bilevel'
+        | 'Grayscale'
+        | 'Palette'
+        | 'PaletteMatte'
+        | 'TrueColor'
+        | 'TrueColorMatte'
+        | 'ColorSeparation'
+        | 'ColorSeparationMatte'
+        | 'Optimize';
+
+    type IntentType = 'Absolute'
+        | 'Perceptual'
+        | 'Relative'
+        | 'Saturation';
+
+    type InterlaceType = 'None'
+        | 'Line'
+        | 'Plane'
+        | 'Partition';
+
+    type LimitType = 'disk'
+        | 'file'
+        | 'map'
+        | 'memory'
+        | 'pixels'
+        | 'threads';
+
+    type ListType = 'Color'
+        | 'Delegate'
+        | 'Format'
+        | 'Magic'
+        | 'Module'
+        | 'Resource'
+        | 'Type';
+
+    type NamedColor = 'Red'
+        | 'Green'
+        | 'Blue'
+        | 'Opacity'
+        | 'Matte'
+        | 'Cyan'
+        | 'Magenta'
+        | 'Yellow'
+        | 'Black'
+        | 'Gray';
+
+    type NoiseType = 'uniform'
+        | 'gaussian'
+        | 'multiplicative'
+        | 'impulse'
+        | 'laplacian'
+        | 'poisson';
+
+    type OperationMode = 'frame'
+        | 'unframe'
+        | 'concatenate';
+
+    type PreviewType = 'Rotate'
+        | 'Shear'
+        | 'Roll'
+        | 'Hue'
+        | 'Saturation'
+        | 'Brightness'
+        | 'Gamma'
+        | 'Spiff'
+        | 'Dull'
+        | 'Grayscale'
+        | 'Quantize'
+        | 'Despeckle'
+        | 'ReduceNoise'
+        | 'AddNoise'
+        | 'Sharpen'
+        | 'Blur'
+        | 'Threshold'
+        | 'EdgeDetect'
+        | 'Spread'
+        | 'Shade'
+        | 'Raise'
+        | 'Segment'
+        | 'Solarize'
+        | 'Swirl'
+        | 'Implode'
+        | 'Wave'
+        | 'OilPaint'
+        | 'CharcoalDrawing'
+        | 'JPEG';
+
     type ResizeOption = '%' /** Width and height are specified in percents */
         | '@' /** Specify maximum area in pixels */
         | '!' /** Ignore aspect ratio */
@@ -614,6 +569,31 @@ declare namespace m {
         | '<' /** Change dimensions only if image is smaller than width or height */
         | '>'; /** Change dimensions only if image is larger than width or height */
 
+    type SetDrawMethod = 'point'
+        | 'replace'
+        | 'floodfill'
+        | 'filltoborder'
+        | 'reset';
+
+    type SetDrawProperty = 'color' | 'matte';
+
+    type UnitType = 'Undefined'
+        | 'PixelsPerInch'
+        | 'PixelsPerCentimeter';
+
+    type VirtualPixelMethod = 'Constant'
+        | 'Edge'
+        | 'Mirror'
+        | 'Tile';
+
+    type VisualType = 'StaticGray'
+        | 'GrayScale'
+        | 'StaticColor'
+        | 'PseudoColor'
+        | 'TrueColor'
+        | 'DirectColor'
+        | 'default';
+
     type WriteCallback = (err: Error, stdout: string, stderr: string, cmd: string) => any;
 }
 
diff --git a/types/gm/tslint.json b/types/gm/tslint.json
index 7c456f533a..f93cf8562a 100644
--- a/types/gm/tslint.json
+++ b/types/gm/tslint.json
@@ -1,7 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // This package unifiable overloaded functions, lot of effort to fix
-        "unified-signatures": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/go/tslint.json b/types/go/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/go/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts b/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
new file mode 100644
index 0000000000..ca6d874fa4
--- /dev/null
+++ b/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
@@ -0,0 +1,32 @@
+// Examples from https://github.com/googlesamples/apps-script-oauth2
+
+/**
+ * Create the OAuth2 service.
+ */
+function getDriveService() {
+    return OAuth2.createService('drive')
+        .setAuthorizationBaseUrl('https://accounts.google.com/o/oauth2/auth')
+        .setTokenUrl('https://accounts.google.com/o/oauth2/token')
+        .setClientId('xxx')
+        .setClientSecret('yyy')
+        .setCallbackFunction('authCallback')
+        .setPropertyStore(PropertiesService.getUserProperties())
+        .setScope('https://www.googleapis.com/auth/drive')
+        .setParam('login_hint', Session.getActiveUser().getEmail())
+        .setParam('access_type', 'offline')
+        .setParam('approval_prompt', 'force')
+    ;
+}
+
+/**
+ * Handle the callback.
+ */
+function authCallback(request: any) {
+    const driveService = getDriveService();
+    const isAuthorized = driveService.handleCallback(request);
+    if (isAuthorized) {
+        Logger.log('success');
+    } else {
+        Logger.log('denied');
+    }
+}
diff --git a/types/google-apps-script-oauth2/index.d.ts b/types/google-apps-script-oauth2/index.d.ts
new file mode 100644
index 0000000000..d5d9022849
--- /dev/null
+++ b/types/google-apps-script-oauth2/index.d.ts
@@ -0,0 +1,197 @@
+// Type definitions for google-apps-script-oauth2 24.0
+// Project: https://github.com/googlesamples/apps-script-oauth2
+// Definitions by: dhayab <https://github.com/dhayab>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="google-apps-script" />
+
+declare namespace GoogleAppsScriptOAuth2 {
+    interface OAuth2 {
+        /**
+         * The supported locations for passing the state parameter.
+         */
+        STATE_PARAMETER_LOCATION: typeof StateParameterLocation;
+        /**
+         * The supported formats for the returned OAuth2 token.
+         */
+        TOKEN_FORMAT: typeof TokenFormat;
+        /**
+         * Creates a new OAuth2 service with the name specified.
+         * It's usually best to create and configure your service once at the start of your script,
+         * and then reference them during the different phases of the authorization flow.
+         */
+        createService(serviceName: string): OAuth2Service;
+        /**
+         * Returns the redirect URI that will be used for a given script.
+         * Often this URI needs to be entered into a configuration screen of your OAuth provider.
+         */
+        getRedirectUri(scriptId: string): string;
+    }
+
+    interface OAuth2Service {
+        /**
+         * Gets an access token for this service.
+         * This token can be used in HTTP requests to the service's endpoint.
+         * This method will throw an error if the user's access was not granted or has expired.
+         */
+        getAccessToken(): string;
+        /**
+         * Gets the authorization URL.
+         * The first step in getting an OAuth2 token is to have the user visit this URL
+         * and approve the authorization request. The user will then be redirected back to your
+         * application using callback function name specified, so that the flow may continue.
+         */
+        getAuthorizationUrl(): string;
+        /**
+         * Gets the last error that occurred this execution when trying to
+         * automatically refresh or generate an access token.
+         */
+        getLastError(): any;
+        /**
+         * Returns the redirect URI that will be used for this service.
+         * Often this URI needs to be entered into a configuration screen of your OAuth provider.
+         */
+        getRedirectUri(): string;
+        /**
+         * Gets the token from the service's property store or cache.
+         */
+        getToken(): object | null;
+        /**
+         * Completes the OAuth2 flow using the request data passed in to the callback function.
+         */
+        handleCallback(callbackRequest: object): boolean;
+        /**
+         * Determines if the service has access (has been authorized and hasn't expired).
+         * If offline access was granted and the previous token has expired this method attempts
+         * to generate a new token.
+         */
+        hasAccess(): boolean;
+        /**
+         * Refreshes a token that has expired.
+         * This is only possible if offline access was requested when the token was authorized.
+         */
+        refresh(): void;
+        /**
+         * Resets the service, removing access and requiring the service to be re-authorized.
+         */
+        reset(): void;
+        /**
+         * Sets the service's authorization base URL (required).
+         * For Google services this URL should be `https://accounts.google.com/o/oauth2/auth`.
+         */
+        setAuthorizationBaseUrl(authorizationBaseUrl: string): OAuth2Service;
+        /**
+         * Sets the cache to use when persisting credentials (optional).
+         * Using a cache will reduce the need to read from the property store and may increase
+         * performance. In most cases this should be a private cache, but a public cache may be
+         * appropriate if you want to share access across users.
+         */
+        setCache(cache: GoogleAppsScript.Cache.Cache): OAuth2Service;
+        /**
+         * Sets the name of the authorization callback function (required).
+         * This is the function that will be called when the user completes the authorization flow
+         * on the service provider's website. The callback accepts a request parameter, which
+         * should be passed to this service's `handleCallback()` method to complete the process.
+         */
+        setCallbackFunction(callbackFunctionName: string): OAuth2Service;
+        /**
+         * Sets the client ID to use for the OAuth flow (required).
+         * You can create client IDs in the "Credentials" section of a Google Developers Console
+         * project. Although you can use any project with this library, it may be convinient to use
+         * the project that was created for your script. These projects are not visible if you
+         * visit the console directly, but you can access it by click on the menu item
+         * "Resources > Advanced Google services" in the Script Editor, and then click on the link
+         * "Google Developers Console" in the resulting dialog.
+         */
+        setClientId(clientId: string): OAuth2Service;
+        /**
+         * Sets the client secret to use for the OAuth flow (required).
+         * See the documentation for `setClientId()` for more information on how to create client IDs and secrets.
+         */
+        setClientSecret(clientSecret: string): OAuth2Service;
+        /**
+         * Sets number of minutes that a token obtained through Service Account authorization should be valid. Default: 60 minutes.
+         */
+        setExpirationMinutes(expirationMinutes: string): OAuth2Service;
+        /**
+         * Sets the issuer (iss) value to use for Service Account authorization.
+         * If not set the client ID will be used instead.
+         */
+        setIssuer(issuer: string): OAuth2Service;
+        /**
+         * Sets an additional parameter to use when constructing the authorization URL (optional).
+         * See the documentation for your service provider for information on what parameter values they support.
+         */
+        setParam(name: string, value: string): OAuth2Service;
+        /**
+         * Sets the private key to use for Service Account authorization.
+         */
+        setPrivateKey(privateKey: string): OAuth2Service;
+        /**
+         * Sets the property store to use when persisting credentials (required).
+         * In most cases this should be user properties, but document or script properties may be appropriate
+         * if you want to share access across users.
+         */
+        setPropertyStore(propertyStore: GoogleAppsScript.Properties.Properties): OAuth2Service;
+        /**
+         * Sets the scope or scopes to request during the authorization flow (optional).
+         * If the scope value is an array it will be joined using the separator before being sent to the server,
+         * which is is a space character by default.
+         */
+        setScope(scope: string | string[], separator?: string): OAuth2Service;
+        /**
+         * Sets the subject (sub) value to use for Service Account authorization.
+         */
+        setSubject(subject: string): OAuth2Service;
+        /**
+         * Sets the format of the returned token. Default: `OAuth2.TOKEN_FORMAT.JSON`.
+         */
+        setTokenFormat(tokenFormat: TokenFormat): OAuth2Service;
+        /**
+         * Sets the additional HTTP headers that should be sent when retrieving or refreshing the access token.
+         */
+        setTokenHeaders(tokenHeaders: { [key: string]: string }): OAuth2Service;
+        /**
+         * Sets an additional function to invoke on the payload of the access token request.
+         */
+        setTokenPayloadHandler(tokenHandler: (tokenPayload: TokenPayload) => object): OAuth2Service;
+        /**
+         * Sets the service's token URL (required).
+         * For Google services this URL should be `https://accounts.google.com/o/oauth2/token`.
+         */
+        setTokenUrl(tokenUrl: string): OAuth2Service;
+    }
+
+    enum StateParameterLocation {
+        /**
+         * Pass the state parameter in the authorization URL.
+         */
+        AUTHORIZATION_URL,
+        /**
+         * Pass the state token in the redirect URL, as a workaround for APIs that don't support the state parameter.
+         */
+        REDIRECT_URL,
+    }
+
+    enum TokenFormat {
+        /**
+         * JSON format, for example `{"access_token": "..."}`.
+         */
+        JSON,
+        /**
+         * Form URL-encoded, for example `access_token=...`.
+         */
+        FORM_URL_ENCODED,
+    }
+
+    interface TokenPayload {
+        code: string;
+        client_id: string;
+        client_secret: string;
+        redirect_uri: string;
+        grant_type: string;
+    }
+}
+
+declare var OAuth2: GoogleAppsScriptOAuth2.OAuth2;
diff --git a/types/google-apps-script-oauth2/tsconfig.json b/types/google-apps-script-oauth2/tsconfig.json
new file mode 100644
index 0000000000..bc09dd70b9
--- /dev/null
+++ b/types/google-apps-script-oauth2/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "google-apps-script-oauth2-tests.ts"
+    ]
+}
diff --git a/types/google-apps-script-oauth2/tslint.json b/types/google-apps-script-oauth2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/google-apps-script-oauth2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/google-apps-script/google-apps-script.cache.d.ts b/types/google-apps-script/google-apps-script.cache.d.ts
index c0cf592b43..23a9b19c34 100644
--- a/types/google-apps-script/google-apps-script.cache.d.ts
+++ b/types/google-apps-script/google-apps-script.cache.d.ts
@@ -29,13 +29,13 @@ declare namespace GoogleAppsScript {
      */
     export interface Cache {
       get(key: string): string;
-      getAll(keys: String[]): Object;
+      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;
+      removeAll(keys: string[]): void;
     }
 
     /**
diff --git a/types/google-apps-script/google-apps-script.calendar.d.ts b/types/google-apps-script/google-apps-script.calendar.d.ts
index d94ec25ad3..34a3d46a11 100644
--- a/types/google-apps-script/google-apps-script.calendar.d.ts
+++ b/types/google-apps-script/google-apps-script.calendar.d.ts
@@ -113,9 +113,9 @@ declare namespace GoogleAppsScript {
       deleteTag(key: string): CalendarEvent;
       getAllDayEndDate(): Date;
       getAllDayStartDate(): Date;
-      getAllTagKeys(): String[];
+      getAllTagKeys(): string[];
       getColor(): string;
-      getCreators(): String[];
+      getCreators(): string[];
       getDateCreated(): Date;
       getDescription(): string;
       getEmailReminders(): Integer[];
@@ -170,9 +170,9 @@ declare namespace GoogleAppsScript {
       anyoneCanAddSelf(): boolean;
       deleteEventSeries(): void;
       deleteTag(key: string): CalendarEventSeries;
-      getAllTagKeys(): String[];
+      getAllTagKeys(): string[];
       getColor(): string;
-      getCreators(): String[];
+      getCreators(): string[];
       getDateCreated(): Date;
       getDescription(): string;
       getEmailReminders(): Integer[];
diff --git a/types/google-apps-script/google-apps-script.card.d.ts b/types/google-apps-script/google-apps-script.card.d.ts
new file mode 100644
index 0000000000..62d497eb4f
--- /dev/null
+++ b/types/google-apps-script/google-apps-script.card.d.ts
@@ -0,0 +1,657 @@
+// Type definitions for Google Apps Script 2017-10-30
+// Project: https://developers.google.com/apps-script/
+// Definitions by: dhayab <https://github.com/dhayab/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.gmail.d.ts" />
+
+declare namespace GoogleAppsScript {
+    export module Card {
+        export interface Action {
+            /**
+             * Sets the name of the callback function to be called.
+             */
+            setFunctionName(functionName: string): Action;
+            /**
+             * Sets the loading indicator that displays while the action is in progress.
+             */
+            setLoadIndicator(loadIndicator: LoadIndicator): Action;
+            /**
+             * Allows custom parameters to be passed to the callback function.
+             */
+            setParameters(parameters: { [key: string]: string }): Action;
+        }
+
+        export interface ActionEvent {
+            messageMetadata: {
+                /**
+                 * An access token. You can use this to enable access to user data using temporary Gmail add-on scopes.
+                 */
+                accessToken: string;
+                /**
+                 * The message ID of the thread open in the Gmail UI.
+                 */
+                messageId: string;
+            }
+            /**
+             * Indicates where the event originates (web, iOS, or Android).
+             */
+            clientPlatform: string;
+            /**
+             * The current values of all form widgets in the card, restricted to one value per widget. The keys are the string IDs associated with the widgets.
+             *
+             * The event object provides `formInput` as a convenience for when you need to read data from multiple widgets with expected singular values, such as text inputs and switches.
+             *
+             * For multi-valued widgets such as checkboxes, you can read each value from `formInputs` instead.
+             */
+            formInput: { [key: string]: string };
+            /**
+             * The current values of widgets in the card, presented in arrays. The keys are the string IDs associated with the widget.
+             *
+             * For single-valued widgets, the value is presented in a single-element array. For multi-valued widgets such as checkboxes, all the values are presented in an array.
+             */
+            formInputs: { [key: string]: string[] };
+            /**
+             * Any additional parameters you supply to the `Action` using `Action.setParameters()`.
+             */
+            parameters: { [key: string]: string };
+        }
+
+        export interface ActionResponse {
+            /**
+             * Prints the JSON representation of this object.
+             */
+            printJson(): string;
+        }
+
+        export interface ActionResponseBuilder {
+            /**
+             * Builds the current action response and validates it.
+             */
+            build(): ActionResponse;
+            /**
+             * Sets the response to `Navigation` action.
+             */
+            setNavigation(navigation: Navigation): ActionResponseBuilder;
+            /**
+             * Sets the notification to display when the action is activated.
+             */
+            setNotification(notification: Notification): ActionResponseBuilder;
+            /**
+             * Sets the URL to navigate to when the action is activated.
+             */
+            setOpenLink(openLink: OpenLink): ActionResponseBuilder;
+        }
+
+        export interface AuthorizationAction {
+            /**
+             * Sets the authorization URL that user is taken to from the authorization prompt.
+             */
+            setAuthorizationUrl(authorizationUrl: string): AuthorizationAction;
+        }
+
+        export interface AuthorizationException {
+            /**
+             * Prints the JSON representation of this object.
+             */
+            printJson(): string;
+            /**
+             * Sets the authorization URL that user is taken to from the authorization prompt.
+             */
+            setAuthorizationUrl(authUrl: string): AuthorizationException;
+            /**
+             * The name of a function to call to generate a custom authorization prompt.
+             */
+            setCustomUiCallback(callback: string): AuthorizationException;
+            /**
+             * Sets the name that is displayed to the user when asking for authorization.
+             */
+            setResourceDisplayName(name: string): AuthorizationException;
+            /**
+             * Triggers this exception to be thrown.
+             */
+            throwException(): void;
+        }
+
+        interface Button<T> extends Widget {
+            /**
+             * Sets an authorization action that opens a URL to the authorization flow when the object is clicked.
+             */
+            setAuthorizationAction(action: AuthorizationAction): T;
+            /**
+             * Sets an action that composes a draft email when the object is clicked.
+             */
+            setComposeAction(action: Action, composedEmailType: ComposedEmailType): T;
+            /**
+             * Sets an action that executes when the object is clicked.
+             */
+            setOnClickAction(action: Action): T;
+            /**
+             * Sets an action that opens a URL in a tab when the object is clicked.
+             */
+            setOnClickOpenLinkAction(action: Action): T;
+            /**
+             * Sets a URL to be opened when the object is clicked.
+             */
+            setOpenLink(openLink: OpenLink): T;
+        }
+
+        export interface ButtonSet extends Widget {
+            /**
+             * Adds a button.
+             */
+            addButton(button: Button<ImageButton | TextButton>): ButtonSet;
+        }
+
+        export interface Card {
+            /**
+             * Prints the JSON representation of this object.
+             */
+            printJson(): string;
+        }
+
+        export interface CardAction extends Button<CardAction> {
+            /**
+             * Sets the menu text for this action.
+             */
+            setText(text: string): CardAction;
+        }
+
+        export interface CardBuilder {
+            /**
+             * Adds a CardAction to this Card.
+             */
+            addCardAction(cardAction: CardAction): CardBuilder;
+            /**
+             * Adds a section to this card.
+             */
+            addSection(section: CardSection): CardBuilder;
+            /**
+             * Builds the current card and validates it.
+             */
+            build(): Card;
+            /**
+             * Sets the header for this card.
+             */
+            setHeader(cardHeader: CardHeader): CardBuilder;
+            /**
+             * Sets the name for this card.
+             */
+            setName(name: string): CardBuilder;
+        }
+
+        export interface CardHeader {
+            /**
+             * Sets the alternative text for the header image.
+             */
+            setImageAltText(imageAltText: string): CardHeader;
+            /**
+             * Sets the cropping of the icon in the card header.
+             */
+            setImageStyle(imageStyle: ImageStyle): CardHeader;
+            /**
+             * Sets the image to use in the header by providing its URL.
+             */
+            setImageUrl(imageUrl: string): CardHeader;
+            /**
+             * Sets the subtitle of the card header.
+             */
+            setSubtitle(subtitle: string): CardHeader;
+            /**
+             * Sets the title of the card header.
+             */
+            setTitle(title: string): CardHeader;
+        }
+
+        export interface CardSection {
+            /**
+             * Adds the given widget to this section.
+             */
+            addWidget(widget: Widget): CardSection;
+            /**
+             * Sets whether the section can be collapsed.
+             */
+            setCollapsible(collapsible: boolean): CardSection;
+            /**
+             * Sets the header of the section.
+             */
+            setHeader(header: string): CardSection;
+            /**
+             * Sets the number of widgets that are still shown when this section is collapsed.
+             */
+            setNumUncollapsibleWidgets(numUncollapsibleWidgets: Integer): CardSection;
+        }
+
+        export interface CardService {
+            /**
+             * Specifies whether the composed email is a standalone or reply draft.
+             */
+            ComposedEmailType: typeof ComposedEmailType;
+            /**
+             * Predefined icons that can be used in various UI objects, such as ImageButton or KeyValue widgets.
+             */
+            Icon: typeof Icon;
+            /**
+             * Defines an image cropping style.
+             */
+            ImageStyle: typeof ImageStyle;
+            /**
+             * Specifies the type of loading or progress indicator to display while an Action is being processed.
+             */
+            LoadIndicator: typeof LoadIndicator;
+            /**
+             * Type of notification to show.
+             */
+            NotificationType: typeof NotificationType;
+            /**
+             * Specifies what to do when a URL opened through an OpenLink is closed.
+             *
+             * When a link is opened, the client either forgets about it or waits until the window is closed. The implementation depends on the client platform capabilities. OnClose may cause OpenAs to be ignored; if the client platform cannot support both selected values together, OnClose takes precedence.
+             */
+            OnClose: typeof OnClose;
+            /**
+             * Specifies how to open a URL.
+             *
+             * The client can open a URL as either a full size window (if that is the frame used by the client), or an overlay (such as a pop-up). The implementation depends on the client platform capabilities, and the value selected may be ignored if the client does not support it. FULL_SIZE is supported by all clients.
+             *
+             * Using OnClose may cause OpenAs to be ignored; if the client platform cannot support both selected values together, OnClose takes precedence.
+             */
+            OpenAs: typeof OpenAs;
+            /**
+             * Type of selection input.
+             */
+            SelectionInputType: typeof SelectionInputType;
+            /**
+             * Creates a new `Action`.
+             */
+            newAction(): Action;
+            /**
+             * Creates a new `ActionResponseBuilder`.
+             */
+            newActionResponseBuilder(): ActionResponseBuilder;
+            /**
+             * Creates a new `AuthorizationAction`.
+             */
+            newAuthorizationAction(): AuthorizationAction;
+            /**
+             * Creates a new `AuthorizationException`.
+             */
+            newAuthorizationException(): AuthorizationException;
+            /**
+             * Creates a new `ButtonSet`.
+             */
+            newButtonSet(): ButtonSet;
+            /**
+             * Creates a new `CardAction`.
+             */
+            newCardAction(): CardAction;
+            /**
+             * Creates a new `CardBuilder`.
+             */
+            newCardBuilder(): CardBuilder;
+            /**
+             * Creates a new `CardHeader`.
+             */
+            newCardHeader(): CardHeader;
+            /**
+             * Creates a new `CardSection`.
+             */
+            newCardSection(): CardSection;
+            /**
+             * Creates a new `ComposeActionResponseBuilder`.
+             */
+            newComposeActionResponseBuilder(): ComposeActionResponseBuilder;
+            /**
+             * Creates a new `Image`.
+             */
+            newImage(): Image;
+            /**
+             * Creates a new `ImageButton`.
+             */
+            newImageButton(): ImageButton;
+            /**
+             * Creates a new `KeyValue`.
+             */
+            newKeyValue(): KeyValue;
+            /**
+             * Creates a new `Navigation`.
+             */
+            newNavigation(): Navigation;
+            /**
+             * Creates a new `Notification`.
+             */
+            newNotification(): Notification;
+            /**
+             * Creates a new `OpenLink`.
+             */
+            newOpenLink(): OpenLink;
+            /**
+             * Creates a new `SelectionInput`.
+             */
+            newSelectionInput(): SelectionInput;
+            /**
+             * Creates a new `Suggestions`.
+             */
+            newSuggestions(): Suggestions;
+            /**
+             * Creates a new `SuggestionsResponseBuilder`.
+             */
+            newSuggestionsResponseBuilder(): SuggestionsResponseBuilder;
+            /**
+             * Creates a new `Switch`.
+             */
+            newSwitch(): Switch;
+            /**
+             * Creates a new `TextButton`.
+             */
+            newTextButton(): TextButton;
+            /**
+             * Creates a new `TextInput`.
+             */
+            newTextInput(): TextInput;
+            /**
+             * Creates a new `TextParagraph`.
+             */
+            newTextParagraph(): TextParagraph;
+            /**
+             * Creates a new `UniversalActionResponseBuilder`.
+             */
+            newUniversalActionResponseBuilder(): UniversalActionResponseBuilder;
+        }
+
+        export interface ComposeActionResponse {
+            /**
+             * Prints the JSON representation of this object.
+             */
+            printJson(): string;
+        }
+
+        export interface ComposeActionResponseBuilder {
+            /**
+             * Builds the current compose action response and validates it.
+             */
+            build(): ComposeActionResponse;
+            /**
+             * Sets the draft `GmailMessage` created using `GmailMessage.createDraftReply(body)` or similar functions.
+             */
+            setGmailDraft(draft: Gmail.GmailDraft): ComposeActionResponseBuilder;
+        }
+
+        export interface Image extends Button<Image> {
+            /**
+             * Sets the alternative text of the image for accessibility.
+             */
+            setAltText(altText: string): Image;
+            /**
+             * Sets the URL of the image.
+             */
+            setImageUrl(url: string): Image;
+        }
+
+        export interface ImageButton extends Button<ImageButton> {
+            /**
+             * Sets the alternative text of the button for accessibility.
+             */
+            setAltText(altText: string): ImageButton;
+            /**
+             * Sets a predefined Icon to display on the button.
+             */
+            setIcon(icon: Icon): ImageButton;
+            /**
+             * Sets the URL of an image to use as this button's icon.
+             */
+            setIconUrl(url: string): ImageButton;
+        }
+
+        export interface KeyValue extends Button<KeyValue> {
+            /**
+             * Sets the label text to be used as the key.
+             */
+            setBottomLabel(text: string): KeyValue;
+            /**
+             * Sets the Button that is displayed to the right of the context.
+             */
+            setButton(button: Button<ImageButton | TextButton>): KeyValue;
+            /**
+             * Sets the text to be used as the value.
+             */
+            setContent(text: string): KeyValue;
+            /**
+             * Sets the icon to be used as the key.
+             */
+            setIcon(icon: Icon): KeyValue;
+            /**
+             * Sets the alternative text for the icon.
+             */
+            setIconAltText(altText: string): KeyValue;
+            /**
+             * Sets the URL of the icon to be used as the key.
+             */
+            setIconUrl(url: string): KeyValue;
+            /**
+             * Sets whether the value text should be displayed on a single line or multiple lines.
+             */
+            setMultiline(multiline: boolean): KeyValue;
+            /**
+             * Sets the Switch that is displayed to the right of the content.
+             */
+            setSwitch(switchToSet: Switch): KeyValue;
+            /**
+             * Sets the label text to be used as the key.
+             */
+            setTopLabel(text: string): KeyValue;
+        }
+
+        export interface Navigation {
+            /**
+             * Pops a card from the navigation stack.
+             */
+            popCard(): Navigation;
+            /**
+             * Pops to the specified card by its card name.
+             */
+            popToNamedCard(cardName: string): Navigation;
+            /**
+             * Pops the card stack to the root card.
+             */
+            popToRoot(): Navigation;
+            /**
+             * Prints the JSON representation of this object.
+             */
+            printJson(): string;
+            /**
+             * Pushes the given card onto the stack.
+             */
+            pushCard(card: Card): Navigation;
+            /**
+             * Does an in-place replacement of the current card.
+             */
+            updateCard(card: Card): Navigation;
+        }
+
+        export interface Notification {
+            /**
+             * Sets the text to show in the notification.
+             */
+            setText(text: string): Notification;
+            /**
+             * Sets the notification type to show.
+             */
+            setType(type: NotificationType): Notification;
+        }
+
+        export interface OpenLink {
+            /**
+             * Sets the behavior of the URL action when the URL window or tab is closed.
+             */
+            setOnClose(onClose: OnClose): OpenLink;
+            /**
+             * Sets the behavior of URL when it is opened.
+             */
+            setOpenAs(openAs: OpenAs): OpenLink;
+            /**
+             * Sets the URL to be opened.
+             */
+            setUrl(url: string): OpenLink;
+        }
+
+        export interface SelectionInput extends Widget {
+            /**
+             * Adds a new item that can be selected.
+             */
+            addItem(text: Object, value: Object, selected: boolean): SelectionInput;
+            /**
+             * Sets the key that identifies this selection input in the event object that is generated when there is a UI interaction.
+             */
+            setFieldName(fieldName: string): SelectionInput;
+            /**
+             * Sets an Action to be performed whenever the selection input changes.
+             */
+            setOnChangeAction(action: Action): SelectionInput;
+            /**
+             * Sets the title to be shown ahead of the input field.
+             */
+            setTitle(title: string): SelectionInput;
+            /**
+             * Sets the type of this input.
+             */
+            setType(type: SelectionInputType): SelectionInput;
+        }
+
+        export interface Suggestions {
+            /**
+             * Add a text suggestion.
+             */
+            addSuggestion(suggestion: string): Suggestions;
+            /**
+             * Add a list of text suggestions.
+             */
+            addSuggestions(suggestions: string[]): Suggestions;
+        }
+
+        export interface SuggestionsResponse {
+            /**
+             * Prints the JSON representation of this object.
+             */
+            printJson(): string;
+        }
+
+        export interface SuggestionsResponseBuilder {
+            /**
+             * Builds the current suggestions response and validates it.
+             */
+            build(): SuggestionsResponse;
+            /**
+             * Sets the suggestions used in auto complete in text fields.
+             */
+            setSuggestions(suggestions: Suggestions): SuggestionsResponseBuilder;
+        }
+
+        export interface Switch extends Widget {
+            /**
+             * Sets the key that identified this switch in the event object that is generated when there is a UI interaction.
+             */
+            setFieldName(fieldName: string): Switch;
+            /**
+             * Sets the action to take when the switch is toggled.
+             */
+            setOnChangeAction(action: Action): Switch;
+            /**
+             * Sets whether this switch should start as selected or unselected.
+             */
+            setSelected(selected: boolean): Switch;
+            /**
+             * Sets the value that is sent as the form input when this switch is toggled on.
+             */
+            setValue(value: string): Switch;
+        }
+
+        export interface TextButton extends Button<TextButton> {
+            /**
+             * Sets the text to be displayed on the button.
+             */
+            setText(text: string): TextButton;
+        }
+
+        export interface TextInput extends Widget {
+            /**
+             * Sets the key that identifies this text input in the event object that is generated when there is a UI interaction.
+             */
+            setFieldName(fieldName: string): TextInput;
+            /**
+             * Sets a hint for the text input.
+             */
+            setHint(hint: string): TextInput;
+            /**
+             * Sets whether the input text shows on one line or multiple lines.
+             */
+            setMultiline(multiline: boolean): TextInput;
+            /**
+             * Sets an action to be performed whenever the text input changes.
+             */
+            setOnChangeAction(action: Action): TextInput;
+            /**
+             * Sets the suggestions for autocompletion in the text field.
+             */
+            setSuggestions(suggestions: Suggestions): TextInput;
+            /**
+             * Sets the callback action to fetch suggestions based on user input for autocompletion.
+             */
+            setSuggestionsAction(suggestionsAction: Action): TextInput
+            /**
+             * Sets the title to be shown above the input field.
+             */
+            setTitle(title: string): TextInput;
+            /**
+             * Sets the pre-filled value to be set in the input field.
+             */
+            setValue(value: string): TextInput;
+        }
+
+        export interface TextParagraph extends Widget {
+            /**
+             * Sets the text of the paragraph.
+             */
+            setText(text: string): TextParagraph;
+        }
+
+        export interface UniversalActionResponse {
+            /**
+             * Prints the JSON representation of this object.
+             */
+            printJson(): string;
+        }
+
+        export interface UniversalActionResponseBuilder {
+            /**
+             * Builds the current universal action response and validates it.
+             */
+            build(): UniversalActionResponse;
+            /**
+             * Displays the add-on with the specified cards.
+             */
+            displayAddOnCards(cardObjects: Card[]): UniversalActionResponseBuilder;
+            /**
+             * Sets the URL to open when the universal action is selected.
+             */
+            setOpenLink(openLink: OpenLink): UniversalActionResponseBuilder;
+        }
+
+        export interface Widget { }
+
+        export enum ComposedEmailType { REPLY_AS_DRAFT, STANDALONE_DRAFT }
+        export enum Icon { NONE, AIRPLANE, BOOKMARK, BUS, CAR, CLOCK, CONFIRMATION_NUMBER_ICON, DOLLAR, DESCRIPTION, EMAIL, EVENT_PERFORMER, EVENT_SEAT, FLIGHT_ARRIVAL, FLIGHT_DEPARTURE, HOTEL, HOTEL_ROOM_TYPE, INVITE, MAP_PIN, MEMBERSHIP, MULTIPLE_PEOPLE, OFFER, PERSON, PHONE, RESTAURANT_ICON, SHOPPING_CART, STAR, STORE, TICKET, TRAIN, VIDEO_CAMERA, VIDEO_PLAY }
+        export enum ImageStyle { SQUARE, CIRCLE }
+        export enum LoadIndicator { SPINNER, NONE }
+        export enum NotificationType { INFO, ERROR, WARNING }
+        export enum OnClose { NOTHING, RELOAD_ADD_ON }
+        export enum OpenAs { FULL_SIZE, OVERLAY }
+        export enum SelectionInputType { CHECK_BOX, RADIO_BUTTON, DROPDOWN }
+    }
+}
+
+/**
+ * CardService provides the ability to create generic cards used across different Google extensibility products, such as [Gmail add-ons](https://developers.google.com/gmail/add-ons).
+ */
+declare var CardService: GoogleAppsScript.Card.CardService;
diff --git a/types/google-apps-script/google-apps-script.charts.d.ts b/types/google-apps-script/google-apps-script.charts.d.ts
index de6de7b767..5e3b51436c 100644
--- a/types/google-apps-script/google-apps-script.charts.d.ts
+++ b/types/google-apps-script/google-apps-script.charts.d.ts
@@ -52,7 +52,7 @@ declare namespace GoogleAppsScript {
       build(): Chart;
       reverseCategories(): AreaChartBuilder;
       setBackgroundColor(cssValue: string): AreaChartBuilder;
-      setColors(cssValues: String[]): AreaChartBuilder;
+      setColors(cssValues: string[]): AreaChartBuilder;
       setDataSourceUrl(url: string): AreaChartBuilder;
       setDataTable(tableBuilder: DataTableBuilder): AreaChartBuilder;
       setDataTable(table: DataTableSource): AreaChartBuilder;
@@ -105,7 +105,7 @@ declare namespace GoogleAppsScript {
       reverseCategories(): BarChartBuilder;
       reverseDirection(): BarChartBuilder;
       setBackgroundColor(cssValue: string): BarChartBuilder;
-      setColors(cssValues: String[]): BarChartBuilder;
+      setColors(cssValues: string[]): BarChartBuilder;
       setDataSourceUrl(url: string): BarChartBuilder;
       setDataTable(tableBuilder: DataTableBuilder): BarChartBuilder;
       setDataTable(table: DataTableSource): BarChartBuilder;
@@ -199,7 +199,7 @@ declare namespace GoogleAppsScript {
       setLabelStacking(orientation: Orientation): CategoryFilterBuilder;
       setSelectedValuesLayout(layout: PickerValuesLayout): CategoryFilterBuilder;
       setSortValues(sortValues: boolean): CategoryFilterBuilder;
-      setValues(values: String[]): CategoryFilterBuilder;
+      setValues(values: string[]): CategoryFilterBuilder;
     }
 
     /**
@@ -326,7 +326,7 @@ declare namespace GoogleAppsScript {
       build(): Chart;
       reverseCategories(): ColumnChartBuilder;
       setBackgroundColor(cssValue: string): ColumnChartBuilder;
-      setColors(cssValues: String[]): ColumnChartBuilder;
+      setColors(cssValues: string[]): ColumnChartBuilder;
       setDataSourceUrl(url: string): ColumnChartBuilder;
       setDataTable(tableBuilder: DataTableBuilder): ColumnChartBuilder;
       setDataTable(table: DataTableSource): ColumnChartBuilder;
@@ -590,7 +590,7 @@ declare namespace GoogleAppsScript {
       build(): Chart;
       reverseCategories(): LineChartBuilder;
       setBackgroundColor(cssValue: string): LineChartBuilder;
-      setColors(cssValues: String[]): LineChartBuilder;
+      setColors(cssValues: string[]): LineChartBuilder;
       setCurveStyle(style: CurveStyle): LineChartBuilder;
       setDataSourceUrl(url: string): LineChartBuilder;
       setDataTable(tableBuilder: DataTableBuilder): LineChartBuilder;
@@ -723,7 +723,7 @@ declare namespace GoogleAppsScript {
       reverseCategories(): PieChartBuilder;
       set3D(): PieChartBuilder;
       setBackgroundColor(cssValue: string): PieChartBuilder;
-      setColors(cssValues: String[]): PieChartBuilder;
+      setColors(cssValues: string[]): PieChartBuilder;
       setDataSourceUrl(url: string): PieChartBuilder;
       setDataTable(tableBuilder: DataTableBuilder): PieChartBuilder;
       setDataTable(table: DataTableSource): PieChartBuilder;
@@ -773,7 +773,7 @@ declare namespace GoogleAppsScript {
     export interface ScatterChartBuilder {
       build(): Chart;
       setBackgroundColor(cssValue: string): ScatterChartBuilder;
-      setColors(cssValues: String[]): ScatterChartBuilder;
+      setColors(cssValues: string[]): ScatterChartBuilder;
       setDataSourceUrl(url: string): ScatterChartBuilder;
       setDataTable(tableBuilder: DataTableBuilder): ScatterChartBuilder;
       setDataTable(table: DataTableSource): ScatterChartBuilder;
diff --git a/types/google-apps-script/google-apps-script.contacts.d.ts b/types/google-apps-script/google-apps-script.contacts.d.ts
index 46337d87d5..e0fa82d371 100644
--- a/types/google-apps-script/google-apps-script.contacts.d.ts
+++ b/types/google-apps-script/google-apps-script.contacts.d.ts
@@ -91,7 +91,7 @@ declare namespace GoogleAppsScript {
       setPrefix(prefix: string): Contact;
       setShortName(shortName: string): Contact;
       setSuffix(suffix: string): Contact;
-      getEmailAddresses(): String[];
+      getEmailAddresses(): string[];
       getHomeAddress(): string;
       getHomeFax(): string;
       getHomePhone(): string;
diff --git a/types/google-apps-script/google-apps-script.document.d.ts b/types/google-apps-script/google-apps-script.document.d.ts
index bee604636a..b0cc1c4e2a 100644
--- a/types/google-apps-script/google-apps-script.document.d.ts
+++ b/types/google-apps-script/google-apps-script.document.d.ts
@@ -52,7 +52,7 @@ declare namespace GoogleAppsScript {
       appendParagraph(paragraph: Paragraph): Paragraph;
       appendParagraph(text: string): Paragraph;
       appendTable(): Table;
-      appendTable(cells: String[][]): Table;
+      appendTable(cells: string[][]): Table;
       appendTable(table: Table): Table;
       clear(): Body;
       copy(): Body;
@@ -90,7 +90,7 @@ declare namespace GoogleAppsScript {
       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, cells: string[][]): Table;
       insertTable(childIndex: Integer, table: Table): Table;
       removeChild(child: Element): Body;
       replaceText(searchPattern: string, replacement: string): Element;
@@ -185,13 +185,13 @@ declare namespace GoogleAppsScript {
       addBookmark(position: Position): Bookmark;
       addEditor(emailAddress: string): Document;
       addEditor(user: Base.User): Document;
-      addEditors(emailAddresses: String[]): 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;
+      addViewers(emailAddresses: string[]): Document;
       getAs(contentType: string): Base.Blob;
       getBlob(): Base.Blob;
       getBody(): Body;
@@ -459,7 +459,7 @@ declare namespace GoogleAppsScript {
 
     /**
      *
-     * Deprecated. The methods getFontFamily() and setFontFamily(String) now use string
+     * 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.
@@ -502,7 +502,7 @@ declare namespace GoogleAppsScript {
       appendParagraph(paragraph: Paragraph): Paragraph;
       appendParagraph(text: string): Paragraph;
       appendTable(): Table;
-      appendTable(cells: String[][]): Table;
+      appendTable(cells: string[][]): Table;
       appendTable(table: Table): Table;
       clear(): FooterSection;
       copy(): FooterSection;
@@ -531,7 +531,7 @@ declare namespace GoogleAppsScript {
       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, cells: string[][]): Table;
       insertTable(childIndex: Integer, table: Table): Table;
       removeChild(child: Element): FooterSection;
       removeFromParent(): FooterSection;
@@ -643,7 +643,7 @@ declare namespace GoogleAppsScript {
       appendParagraph(paragraph: Paragraph): Paragraph;
       appendParagraph(text: string): Paragraph;
       appendTable(): Table;
-      appendTable(cells: String[][]): Table;
+      appendTable(cells: string[][]): Table;
       appendTable(table: Table): Table;
       clear(): HeaderSection;
       copy(): HeaderSection;
@@ -672,7 +672,7 @@ declare namespace GoogleAppsScript {
       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, cells: string[][]): Table;
       insertTable(childIndex: Integer, table: Table): Table;
       removeChild(child: Element): HeaderSection;
       removeFromParent(): HeaderSection;
@@ -1269,7 +1269,7 @@ declare namespace GoogleAppsScript {
       appendParagraph(paragraph: Paragraph): Paragraph;
       appendParagraph(text: string): Paragraph;
       appendTable(): Table;
-      appendTable(cells: String[][]): Table;
+      appendTable(cells: string[][]): Table;
       appendTable(table: Table): Table;
       clear(): TableCell;
       copy(): TableCell;
@@ -1308,7 +1308,7 @@ declare namespace GoogleAppsScript {
       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, cells: string[][]): Table;
       insertTable(childIndex: Integer, table: Table): Table;
       isAtDocumentEnd(): boolean;
       merge(): TableCell;
diff --git a/types/google-apps-script/google-apps-script.drive.d.ts b/types/google-apps-script/google-apps-script.drive.d.ts
index 36693eaf9f..6d5e6d3da3 100644
--- a/types/google-apps-script/google-apps-script.drive.d.ts
+++ b/types/google-apps-script/google-apps-script.drive.d.ts
@@ -20,6 +20,18 @@ declare namespace GoogleAppsScript {
      */
     export enum Access { ANYONE, ANYONE_WITH_LINK, DOMAIN, DOMAIN_WITH_LINK, PRIVATE }
 
+    /**
+     * 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 a G Suite domain.)
+     *      var folder = DriveApp.createFolder('Shared Folder');
+     *      folder.setSharing(DriveApp.Access.ANYONE, DriveApp.Permission.EDIT);
+     */
+    export enum Permission { VIEW, EDIT, COMMENT, OWNER, ORGANIZER, NONE }
+
     /**
      * Allows scripts to create, find, and modify files and folders in Google Drive.
      *
@@ -33,29 +45,104 @@ declare namespace GoogleAppsScript {
     export interface DriveApp {
       Access: typeof Access;
       Permission: typeof Permission;
+      /**
+       * Adds the given file to the root of the user's Drive.
+       * This method does not move the file out of its existing parent folder;
+       * a file can have more than one parent simultaneously.
+       */
       addFile(child: File): Folder;
+      /**
+       * Adds the given folder to the root of the user's Drive.
+       * This method does not move the folder out of its existing parent folder;
+       * a folder can have more than one parent simultaneously.
+       */
       addFolder(child: Folder): Folder;
+      /**
+       * Resumes a file iteration using a continuation token from a previous iterator.
+       * This method is useful if processing an iterator in one execution would exceed
+       * the maximum execution time. Continuation tokens are generally valid for one week.
+       */
       continueFileIterator(continuationToken: string): FileIterator;
+      /**
+       * Resumes a folder iteration using a continuation token from a previous iterator.
+       * This method is useful if processing an iterator in one execution would exceed
+       * the maximum execution time. Continuation tokens are generally valid for one week.
+       */
       continueFolderIterator(continuationToken: string): FolderIterator;
+      /** Creates a file in the root of the user's Drive from a given Blob of arbitrary data. */
       createFile(blob: Base.BlobSource): File;
+      /**
+       * Creates a text file in the root of the user's Drive with the given name
+       * and contents. Throws an exception if content is larger than 50 MB.
+       */
       createFile(name: string, content: string): File;
+      /**
+       * Creates a file in the root of the user's Drive with the given name, contents, and MIME type.
+       * Throws an exception if content is larger than 10MB.
+       */
       createFile(name: string, content: string, mimeType: string): File;
+      /** Creates a folder in the root of the user's Drive with the given name. */
       createFolder(name: string): Folder;
+      /**
+       * Gets the file with the given ID.
+       * Throws a scripting exception if the file does not exist or
+       * the user does not have permission to access it.
+       */
       getFileById(id: string): File;
+      /** Gets a collection of all files in the user's Drive. */
       getFiles(): FileIterator;
+      /** Gets a collection of all files in the user's Drive that have the given name. */
       getFilesByName(name: string): FileIterator;
+      /** Gets a collection of all files in the user's Drive that have the given MIME type. */
       getFilesByType(mimeType: string): FileIterator;
+      /**
+       * Gets the folder with the given ID. Throws a scripting exception if the folder
+       * does not exist or the user does not have permission to access it.
+       */
       getFolderById(id: string): Folder;
+      /** Gets a collection of all folders in the user's Drive. */
       getFolders(): FolderIterator;
+      /** Gets a collection of all folders in the user's Drive that have the given name. */
       getFoldersByName(name: string): FolderIterator;
+      /** Gets the folder at the root of the user's Drive. */
       getRootFolder(): Folder;
+      /** Gets the number of bytes the user is allowed to store in Drive. */
       getStorageLimit(): Integer;
+      /** Gets the number of bytes the user is currently storing in Drive. */
       getStorageUsed(): Integer;
+      /** Gets a collection of all the files in the trash of the user's Drive. */
       getTrashedFiles(): FileIterator;
+      /** Gets a collection of all the folders in the trash of the user's Drive. */
       getTrashedFolders(): FolderIterator;
+      /**
+       * Removes the given file from the root of the user's Drive.
+       * This method does not delete the file, but if a file is removed from all
+       * of its parents, it cannot be seen in Drive except by searching for it
+       * or using the "All items" view.
+       */
       removeFile(child: File): Folder;
+      /**
+       * Removes the given folder from the root of the user's Drive.
+       * This method does not delete the folder or its contents, but if a folder
+       * is removed from all of its parents, it cannot be seen in Drive except
+       * by searching for it or using the "All items" view.
+       */
       removeFolder(child: Folder): Folder;
+      /**
+       * Gets a collection of all files in the user's Drive that match the given search criteria.
+       * The search criteria are detailed the Google Drive SDK documentation.
+       * Note that the params argument is a query string that may contain string values,
+       * so take care to escape quotation marks correctly
+       * (for example "title contains 'Gulliver\\'s Travels'" or 'title contains "Gulliver\'s Travels"').
+       */
       searchFiles(params: string): FileIterator;
+      /**
+       * Gets a collection of all folders in the user's Drive that match the given search criteria.
+       * The search criteria are detailed the Google Drive SDK documentation.
+       * Note that the params argument is a query string that may contain string values,
+       * so take care to escape quotation marks correctly
+       * (for example "title contains 'Gulliver\\'s Travels'" or 'title contains "Gulliver\'s Travels"').
+       */
       searchFolders(params: string): FolderIterator;
     }
 
@@ -74,13 +161,13 @@ declare namespace GoogleAppsScript {
     export interface File {
       addCommenter(emailAddress: string): File;
       addCommenter(user: Base.User): File;
-      addCommenters(emailAddresses: String[]): File;
+      addCommenters(emailAddresses: string[]): File;
       addEditor(emailAddress: string): File;
       addEditor(user: Base.User): File;
-      addEditors(emailAddresses: String[]): File;
+      addEditors(emailAddresses: string[]): File;
       addViewer(emailAddress: string): File;
       addViewer(user: Base.User): File;
-      addViewers(emailAddresses: String[]): File;
+      addViewers(emailAddresses: string[]): File;
       getAccess(email: string): Permission;
       getAccess(user: Base.User): Permission;
       getAs(contentType: string): Base.Blob;
@@ -139,8 +226,18 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface FileIterator {
+      /**
+       * Gets a token that can be used to resume this iteration at a later time.
+       * This method is useful if processing an iterator in one execution would
+       * exceed the maximum execution time. Continuation tokens are generally valid for one week.
+       */
       getContinuationToken(): string;
+      /** Determines whether calling next() will return an item. */
       hasNext(): boolean;
+      /**
+       * Gets the next item in the collection of files or folders.
+       * Throws an exception if no items remain.
+       */
       next(): File;
     }
 
@@ -157,12 +254,12 @@ declare namespace GoogleAppsScript {
     export interface Folder {
       addEditor(emailAddress: string): Folder;
       addEditor(user: Base.User): Folder;
-      addEditors(emailAddresses: String[]): 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;
+      addViewers(emailAddresses: string[]): Folder;
       createFile(blob: Base.BlobSource): File;
       createFile(name: string, content: string): File;
       createFile(name: string, content: string, mimeType: string): File;
@@ -222,23 +319,21 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface FolderIterator {
+      /**
+       * Gets a token that can be used to resume this iteration at a later time.
+       * This method is useful if processing an iterator in one execution would
+       * exceed the maximum execution time. Continuation tokens are generally valid for one week.
+       */
       getContinuationToken(): string;
+      /** Determines whether calling next() will return an item. */
       hasNext(): boolean;
+      /**
+       * Gets the next item in the collection of files or folders.
+       * Throws an exception if no items remain.
+       */
       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 a G Suite domain.)
-     *      var folder = DriveApp.createFolder('Shared Folder');
-     *      folder.setSharing(DriveApp.Access.ANYONE, DriveApp.Permission.EDIT);
-     */
-    export enum Permission { VIEW, EDIT, COMMENT, OWNER, ORGANIZER, NONE }
-
     /**
      * A user associated with a file in Google Drive. Users can be accessed from
      *  File.getEditors(), Folder.getViewers(), and other methods.
@@ -251,10 +346,24 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface User {
+      /** Gets the domain name associated with the user's account. */
       getDomain(): string;
+      /**
+       * Gets the user's email address. The user's email address is only available
+       * if the user has chosen to share the address from the Google+ account settings
+       * page, or if the user belongs to the same domain as the user running the script
+       * and the domain administrator has allowed all users within the domain to see
+       * other users' email addresses.
+       */
       getEmail(): string;
-      getName(): string;
-      getPhotoUrl(): string;
+      /** Gets the user's name. This method returns null if the user's name is not available. */
+      getName(): string | null;
+      /** Gets the URL for the user's photo. This method returns null if the user's photo is not available. */
+      getPhotoUrl(): string | null;
+      /**
+       * Gets the user's email address.
+       * @deprecated As of June 24, 2013, replaced by getEmail()
+       */
       getUserLoginId(): string;
     }
 
diff --git a/types/google-apps-script/google-apps-script.forms.d.ts b/types/google-apps-script/google-apps-script.forms.d.ts
index e10c47b169..cdfbfbd1ef 100644
--- a/types/google-apps-script/google-apps-script.forms.d.ts
+++ b/types/google-apps-script/google-apps-script.forms.d.ts
@@ -41,7 +41,7 @@ declare namespace GoogleAppsScript {
       clearValidation(): CheckboxItem;
       createChoice(value: string): Choice;
       createChoice(value: string, isCorrect: boolean): Choice;
-      createResponse(responses: String[]): ItemResponse;
+      createResponse(responses: string[]): ItemResponse;
       duplicate(): CheckboxItem;
       getChoices(): Choice[];
       getFeedbackForCorrect(): QuizFeedback;
@@ -54,7 +54,7 @@ declare namespace GoogleAppsScript {
       getType(): ItemType;
       hasOtherOption(): boolean;
       isRequired(): boolean;
-      setChoiceValues(values: String[]): CheckboxItem;
+      setChoiceValues(values: string[]): CheckboxItem;
       setChoices(choices: Choice[]): CheckboxItem;
       setFeedbackForCorrect(feedback: QuizFeedback): CheckboxItem;
       setFeedbackForIncorrect(feedback: QuizFeedback): CheckboxItem;
@@ -323,7 +323,7 @@ declare namespace GoogleAppsScript {
       addDurationItem(): DurationItem;
       addEditor(emailAddress: string): Form;
       addEditor(user: Base.User): Form;
-      addEditors(emailAddresses: String[]): Form;
+      addEditors(emailAddresses: string[]): Form;
       addGridItem(): GridItem;
       addImageItem(): ImageItem;
       addListItem(): ListItem;
@@ -468,20 +468,20 @@ declare namespace GoogleAppsScript {
      */
     export interface GridItem {
       clearValidation(): GridItem;
-      createResponse(responses: String[]): ItemResponse;
+      createResponse(responses: string[]): ItemResponse;
       duplicate(): GridItem;
-      getColumns(): String[];
+      getColumns(): string[];
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
-      getRows(): String[];
+      getRows(): string[];
       getTitle(): string;
       getType(): ItemType;
       isRequired(): boolean;
-      setColumns(columns: String[]): GridItem;
+      setColumns(columns: string[]): GridItem;
       setHelpText(text: string): GridItem;
       setRequired(enabled: boolean): GridItem;
-      setRows(rows: String[]): GridItem;
+      setRows(rows: string[]): GridItem;
       setTitle(title: string): GridItem;
       setValidation(validation: GridValidation): GridItem;
     }
@@ -676,7 +676,7 @@ declare namespace GoogleAppsScript {
       getTitle(): string;
       getType(): ItemType;
       isRequired(): boolean;
-      setChoiceValues(values: String[]): ListItem;
+      setChoiceValues(values: string[]): ListItem;
       setChoices(choices: Choice[]): ListItem;
       setFeedbackForCorrect(feedback: QuizFeedback): ListItem;
       setFeedbackForIncorrect(feedback: QuizFeedback): ListItem;
@@ -719,7 +719,7 @@ declare namespace GoogleAppsScript {
       getType(): ItemType;
       hasOtherOption(): boolean;
       isRequired(): boolean;
-      setChoiceValues(values: String[]): MultipleChoiceItem;
+      setChoiceValues(values: string[]): MultipleChoiceItem;
       setChoices(choices: Choice[]): MultipleChoiceItem;
       setFeedbackForCorrect(feedback: QuizFeedback): MultipleChoiceItem;
       setFeedbackForIncorrect(feedback: QuizFeedback): MultipleChoiceItem;
@@ -867,7 +867,7 @@ declare namespace GoogleAppsScript {
      *      textItem.setFeedbackForIncorrect(feedback);
      */
     export interface QuizFeedback {
-      getLinkUrls(): String[];
+      getLinkUrls(): string[];
       getText(): string;
     }
 
diff --git a/types/google-apps-script/google-apps-script.gmail.d.ts b/types/google-apps-script/google-apps-script.gmail.d.ts
index fd0bda2b13..4967f53394 100644
--- a/types/google-apps-script/google-apps-script.gmail.d.ts
+++ b/types/google-apps-script/google-apps-script.gmail.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
+//                 dhayab <https://github.com/dhayab/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="google-apps-script.types.d.ts" />
@@ -12,12 +13,16 @@ declare namespace GoogleAppsScript {
      * Provides access to Gmail threads, messages, and labels.
      */
     export interface GmailApp {
+      createDraft(recipient: string, subject: string, body: string): GmailDraft;
+      createDraft(recipient: string, subject: string, body: string, options: GmailDraftOptions): GmailDraft;
       createLabel(name: string): GmailLabel;
       deleteLabel(label: GmailLabel): GmailApp;
-      getAliases(): String[];
+      getAliases(): string[];
       getChatThreads(): GmailThread[];
       getChatThreads(start: Integer, max: Integer): GmailThread[];
+      getDraft(draftId: string): GmailDraft;
       getDraftMessages(): GmailMessage[];
+      getDrafts(): GmailDraft[];
       getInboxThreads(): GmailThread[];
       getInboxThreads(start: Integer, max: Integer): GmailThread[];
       getInboxUnreadCount(): Integer;
@@ -68,6 +73,7 @@ declare namespace GoogleAppsScript {
       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;
+      setCurrentMessageAccessToken(accessToken: string): void;
       starMessage(message: GmailMessage): GmailApp;
       starMessages(messages: GmailMessage[]): GmailApp;
       unstarMessage(message: GmailMessage): GmailApp;
@@ -112,6 +118,72 @@ declare namespace GoogleAppsScript {
       getAllBlobs(): Base.Blob[];
     }
 
+    export interface GmailDraft {
+      /**
+       * Deletes this draft message.
+       */
+      deleteDraft(): void;
+      /**
+       * Gets the ID of this draft message.
+       */
+      getId(): string;
+      /**
+       * Returns a GmailMessage representing this draft.
+       */
+      getMessage(): GmailMessage;
+      /**
+       * Returns the ID of the `GmailMessage` representing this draft.
+       */
+      getMessageId(): string;
+      /**
+       * Sends this draft email message.
+       */
+      send(): GmailMessage;
+      /**
+       * Replaces the contents of this draft message.
+       */
+      update(recipient: string, subject: string, body: string): GmailDraft;
+      /**
+       * Replaces the contents of this draft message using optional arguments.
+       */
+      update(recipient: string, subject: string, body: string, options: GmailDraftOptions): GmailDraft;
+    }
+
+    export type GmailDraftOptions = {
+      /**
+       * An array of files to send with the email.
+       */
+      attachments?: Base.BlobSource[];
+      /**
+       * A comma-separated list of email addresses to BCC.
+       */
+      bcc?: string;
+      /**
+       * A comma-separated list of email addresses to CC.
+       */
+      cc?: string;
+      /**
+       * The address that the email should be sent from, which must be one of the values returned by `GmailApp.getAliases()`.
+       */
+      from?: string;
+      /**
+       * If set, devices capable of rendering HTML will use it instead of the required body argument; you can add an optional `inlineImages` field in HTML body if you have inlined images for your email.
+       */
+      htmlBody?: string;
+      /**
+       * A JavaScript object containing a mapping from image key (`String`) to image data (`BlobSource`) ; this assumes that the `htmlBody` parameter is used and contains references to these images in the format `<img src="cid:imageKey" />`.
+       */
+      inlineImages?: { [imageKey: string]: Base.BlobSource };
+      /**
+       * The name of the sender of the email (default: the user's name).
+       */
+      name?: string;
+      /**
+       * An email address to use as the default reply-to address (default: the user's email address).
+       */
+      replyTo?: string;
+    }
+
     /**
      * A user-created label in a user's Gmail account.
      */
@@ -131,6 +203,10 @@ declare namespace GoogleAppsScript {
      * A message in a user's Gmail account.
      */
     export interface GmailMessage {
+      createDraftReply(body: string): GmailDraft;
+      createDraftReply(body: string, options: GmailDraftOptions): GmailDraft;
+      createDraftReplyAll(body: string): GmailDraft;
+      createDraftReplyAll(body: string, options: GmailDraftOptions): GmailDraft;
       forward(recipient: string): GmailMessage;
       forward(recipient: string, options: Object): GmailMessage;
       getAttachments(): GmailAttachment[];
@@ -169,6 +245,10 @@ declare namespace GoogleAppsScript {
      */
     export interface GmailThread {
       addLabel(label: GmailLabel): GmailThread;
+      createDraftReply(body: string): GmailDraft;
+      createDraftReply(body: string, options: GmailDraftOptions): GmailDraft;
+      createDraftReplyAll(body: string): GmailDraft;
+      createDraftReplyAll(body: string, options: GmailDraftOptions): GmailDraft;
       getFirstMessageSubject(): string;
       getId(): string;
       getLabels(): GmailLabel[];
diff --git a/types/google-apps-script/google-apps-script.jdbc.d.ts b/types/google-apps-script/google-apps-script.jdbc.d.ts
index ff1a0baf13..96ae94abac 100644
--- a/types/google-apps-script/google-apps-script.jdbc.d.ts
+++ b/types/google-apps-script/google-apps-script.jdbc.d.ts
@@ -78,7 +78,7 @@ declare namespace GoogleAppsScript {
       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;
+      execute(sql: string, columnNames: string[]): boolean;
       executeBatch(): Integer[];
       executeQuery(): JdbcResultSet;
       executeQuery(sql: string): JdbcResultSet;
@@ -86,7 +86,7 @@ declare namespace GoogleAppsScript {
       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;
+      executeUpdate(sql: string, columnNames: string[]): Integer;
       getArray(parameterIndex: Integer): JdbcArray;
       getArray(parameterName: string): JdbcArray;
       getBigDecimal(parameterIndex: Integer): BigNumber;
@@ -155,7 +155,7 @@ declare namespace GoogleAppsScript {
       getURL(parameterIndex: Integer): string;
       getURL(parameterName: string): string;
       getUpdateCount(): Integer;
-      getWarnings(): String[];
+      getWarnings(): string[];
       isClosed(): boolean;
       isPoolable(): boolean;
       registerOutParameter(parameterIndex: Integer, sqlType: Integer): void;
@@ -272,7 +272,7 @@ declare namespace GoogleAppsScript {
       getHoldability(): Integer;
       getMetaData(): JdbcDatabaseMetaData;
       getTransactionIsolation(): Integer;
-      getWarnings(): String[];
+      getWarnings(): string[];
       isClosed(): boolean;
       isReadOnly(): boolean;
       isValid(timeout: Integer): boolean;
@@ -285,7 +285,7 @@ declare namespace GoogleAppsScript {
       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;
+      prepareStatementByName(sql: string, columnNames: string[]): JdbcPreparedStatement;
       releaseSavepoint(savepoint: JdbcSavepoint): void;
       rollback(): void;
       rollback(savepoint: JdbcSavepoint): void;
@@ -377,7 +377,7 @@ declare namespace GoogleAppsScript {
       getSystemFunctions(): string;
       getTablePrivileges(catalog: string, schemaPattern: string, tableNamePattern: string): JdbcResultSet;
       getTableTypes(): JdbcResultSet;
-      getTables(catalog: string, schemaPattern: string, tableNamePattern: string, types: String[]): 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;
@@ -525,7 +525,7 @@ declare namespace GoogleAppsScript {
       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;
+      execute(sql: string, columnNames: string[]): boolean;
       executeBatch(): Integer[];
       executeQuery(): JdbcResultSet;
       executeQuery(sql: string): JdbcResultSet;
@@ -533,7 +533,7 @@ declare namespace GoogleAppsScript {
       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;
+      executeUpdate(sql: string, columnNames: string[]): Integer;
       getConnection(): JdbcConnection;
       getFetchDirection(): Integer;
       getFetchSize(): Integer;
@@ -550,7 +550,7 @@ declare namespace GoogleAppsScript {
       getResultSetHoldability(): Integer;
       getResultSetType(): Integer;
       getUpdateCount(): Integer;
-      getWarnings(): String[];
+      getWarnings(): string[];
       isClosed(): boolean;
       isPoolable(): boolean;
       setArray(parameterIndex: Integer, x: JdbcArray): void;
@@ -676,7 +676,7 @@ declare namespace GoogleAppsScript {
       getType(): Integer;
       getURL(columnIndex: Integer): string;
       getURL(columnLabel: string): string;
-      getWarnings(): String[];
+      getWarnings(): string[];
       insertRow(): void;
       isAfterLast(): boolean;
       isBeforeFirst(): boolean;
@@ -814,13 +814,13 @@ declare namespace GoogleAppsScript {
       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;
+      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;
+      executeUpdate(sql: string, columnNames: string[]): Integer;
       getConnection(): JdbcConnection;
       getFetchDirection(): Integer;
       getFetchSize(): Integer;
@@ -835,7 +835,7 @@ declare namespace GoogleAppsScript {
       getResultSetHoldability(): Integer;
       getResultSetType(): Integer;
       getUpdateCount(): Integer;
-      getWarnings(): String[];
+      getWarnings(): string[];
       isClosed(): boolean;
       isPoolable(): boolean;
       setCursorName(name: string): void;
diff --git a/types/google-apps-script/google-apps-script.properties.d.ts b/types/google-apps-script/google-apps-script.properties.d.ts
index a53a3cbaf4..fada88d73b 100644
--- a/types/google-apps-script/google-apps-script.properties.d.ts
+++ b/types/google-apps-script/google-apps-script.properties.d.ts
@@ -20,7 +20,7 @@ declare namespace GoogleAppsScript {
     export interface Properties {
       deleteAllProperties(): Properties;
       deleteProperty(key: string): Properties;
-      getKeys(): String[];
+      getKeys(): string[];
       getProperties(): Object;
       getProperty(key: string): string | null;
       setProperties(properties: Object): Properties;
@@ -58,7 +58,7 @@ declare namespace GoogleAppsScript {
     export interface ScriptProperties {
       deleteAllProperties(): ScriptProperties;
       deleteProperty(key: string): ScriptProperties;
-      getKeys(): String[];
+      getKeys(): string[];
       getProperties(): Object;
       getProperty(key: string): string | null;
       setProperties(properties: Object): ScriptProperties;
@@ -75,7 +75,7 @@ declare namespace GoogleAppsScript {
     export interface UserProperties {
       deleteAllProperties(): UserProperties;
       deleteProperty(key: string): UserProperties;
-      getKeys(): String[];
+      getKeys(): string[];
       getProperties(): Object;
       getProperty(key: string): string | null;
       setProperties(properties: Object): UserProperties;
diff --git a/types/google-apps-script/google-apps-script.sites.d.ts b/types/google-apps-script/google-apps-script.sites.d.ts
index 6b21ffe529..5bbe126750 100644
--- a/types/google-apps-script/google-apps-script.sites.d.ts
+++ b/types/google-apps-script/google-apps-script.sites.d.ts
@@ -128,13 +128,13 @@ declare namespace GoogleAppsScript {
       addColumn(name: string): Column;
       addHostedAttachment(blob: Base.BlobSource): Attachment;
       addHostedAttachment(blob: Base.BlobSource, description: string): Attachment;
-      addListItem(values: String[]): ListItem;
+      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;
+      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;
@@ -144,7 +144,7 @@ declare namespace GoogleAppsScript {
       getAnnouncements(optOptions: Object): Page[];
       getAttachments(): Attachment[];
       getAttachments(optOptions: Object): Attachment[];
-      getAuthors(): String[];
+      getAuthors(): string[];
       getChildByName(name: string): Page;
       getChildren(): Page[];
       getChildren(options: Object): Page[];
@@ -202,15 +202,15 @@ declare namespace GoogleAppsScript {
     export interface Site {
       addEditor(emailAddress: string): Site;
       addEditor(user: Base.User): Site;
-      addEditors(emailAddresses: String[]): 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;
+      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;
+      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[];
@@ -242,7 +242,7 @@ declare namespace GoogleAppsScript {
       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;
+      createListItem(html: string, columnNames: string[], values: string[], parent: Page): ListItem;
       createWebAttachment(title: string, url: string, parent: Page): Attachment;
       deleteSite(): void;
       getAnnouncements(): Page[];
diff --git a/types/google-apps-script/google-apps-script.spreadsheet.d.ts b/types/google-apps-script/google-apps-script.spreadsheet.d.ts
index e710fcfb4a..7cd1cb8946 100644
--- a/types/google-apps-script/google-apps-script.spreadsheet.d.ts
+++ b/types/google-apps-script/google-apps-script.spreadsheet.d.ts
@@ -113,8 +113,8 @@ declare namespace GoogleAppsScript {
       requireTextEqualTo(text: string): DataValidationBuilder;
       requireTextIsEmail(): DataValidationBuilder;
       requireTextIsUrl(): DataValidationBuilder;
-      requireValueInList(values: String[]): DataValidationBuilder;
-      requireValueInList(values: String[], showDropdown: boolean): 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;
@@ -176,7 +176,7 @@ declare namespace GoogleAppsScript {
       reverseCategories(): EmbeddedAreaChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedAreaChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedAreaChartBuilder;
+      setColors(cssValues: string[]): EmbeddedAreaChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedAreaChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
@@ -219,7 +219,7 @@ declare namespace GoogleAppsScript {
       reverseDirection(): EmbeddedBarChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedBarChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedBarChartBuilder;
+      setColors(cssValues: string[]): EmbeddedBarChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedBarChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
@@ -335,7 +335,7 @@ declare namespace GoogleAppsScript {
       reverseCategories(): EmbeddedColumnChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedColumnChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedColumnChartBuilder;
+      setColors(cssValues: string[]): EmbeddedColumnChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedColumnChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
@@ -376,7 +376,7 @@ declare namespace GoogleAppsScript {
       reverseCategories(): EmbeddedComboChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedComboChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedComboChartBuilder;
+      setColors(cssValues: string[]): EmbeddedComboChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedComboChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
@@ -417,7 +417,7 @@ declare namespace GoogleAppsScript {
       reverseCategories(): EmbeddedHistogramChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedHistogramChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedHistogramChartBuilder;
+      setColors(cssValues: string[]): EmbeddedHistogramChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedHistogramChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
@@ -458,7 +458,7 @@ declare namespace GoogleAppsScript {
       reverseCategories(): EmbeddedLineChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedLineChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedLineChartBuilder;
+      setColors(cssValues: string[]): EmbeddedLineChartBuilder;
       setCurveStyle(style: Charts.CurveStyle): EmbeddedLineChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedLineChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
@@ -501,7 +501,7 @@ declare namespace GoogleAppsScript {
       set3D(): EmbeddedPieChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedPieChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedPieChartBuilder;
+      setColors(cssValues: string[]): EmbeddedPieChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedPieChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedPieChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
@@ -532,7 +532,7 @@ declare namespace GoogleAppsScript {
       removeRange(range: Range): EmbeddedChartBuilder;
       setBackgroundColor(cssValue: string): EmbeddedScatterChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
-      setColors(cssValues: String[]): EmbeddedScatterChartBuilder;
+      setColors(cssValues: string[]): EmbeddedScatterChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedScatterChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
@@ -625,7 +625,7 @@ declare namespace GoogleAppsScript {
      */
     export interface PageProtection {
       addUser(email: string): void;
-      getUsers(): String[];
+      getUsers(): string[];
       isProtected(): boolean;
       removeUser(user: string): void;
       setProtected(protection: boolean): void;
@@ -677,7 +677,7 @@ declare namespace GoogleAppsScript {
     export interface Protection {
       addEditor(emailAddress: string): Protection;
       addEditor(user: Base.User): Protection;
-      addEditors(emailAddresses: String[]): Protection;
+      addEditors(emailAddresses: string[]): Protection;
       canDomainEdit(): boolean;
       canEdit(): boolean;
       getDescription(): string;
@@ -690,7 +690,7 @@ declare namespace GoogleAppsScript {
       remove(): void;
       removeEditor(emailAddress: string): Protection;
       removeEditor(user: Base.User): Protection;
-      removeEditors(emailAddresses: String[]): Protection;
+      removeEditors(emailAddresses: string[]): Protection;
       setDescription(description: string): Protection;
       setDomainEdit(editable: boolean): Protection;
       setNamedRange(namedRange: NamedRange): Protection;
@@ -746,7 +746,7 @@ declare namespace GoogleAppsScript {
       copyValuesToRange(sheet: Sheet, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
       getA1Notation(): string;
       getBackground(): string;
-      getBackgrounds(): String[][];
+      getBackgrounds(): string[][];
       getCell(row: Integer, column: Integer): Range;
       getColumn(): Integer;
       getColumnIndex(): Integer;
@@ -756,43 +756,43 @@ declare namespace GoogleAppsScript {
       getDataValidation(): DataValidation;
       getDataValidations(): DataValidation[][];
       getDisplayValue(): string;
-      getDisplayValues(): String[][];
+      getDisplayValues(): string[][];
       getFontColor(): string;
-      getFontColors(): String[][];
-      getFontFamilies(): String[][];
+      getFontColors(): string[][];
+      getFontFamilies(): string[][];
       getFontFamily(): string;
       getFontLine(): string;
-      getFontLines(): String[][];
+      getFontLines(): string[][];
       getFontSize(): Integer;
       getFontSizes(): Integer[][];
       getFontStyle(): string;
-      getFontStyles(): String[][];
+      getFontStyles(): string[][];
       getFontWeight(): string;
-      getFontWeights(): String[][];
+      getFontWeights(): string[][];
       getFormula(): string;
       getFormulaR1C1(): string;
-      getFormulas(): String[][];
-      getFormulasR1C1(): String[][];
+      getFormulas(): string[][];
+      getFormulasR1C1(): string[][];
       getGridId(): Integer;
       getHeight(): Integer;
       getHorizontalAlignment(): string;
-      getHorizontalAlignments(): String[][];
+      getHorizontalAlignments(): string[][];
       getLastColumn(): Integer;
       getLastRow(): Integer;
       getMergedRanges(): Range[];
       getNote(): string;
-      getNotes(): String[][];
+      getNotes(): string[][];
       getNumColumns(): Integer;
       getNumRows(): Integer;
       getNumberFormat(): string;
-      getNumberFormats(): String[][];
+      getNumberFormats(): string[][];
       getRow(): Integer;
       getRowIndex(): Integer;
       getSheet(): Sheet;
       getValue(): Object;
       getValues(): Object[][];
       getVerticalAlignment(): string;
-      getVerticalAlignments(): String[][];
+      getVerticalAlignments(): string[][];
       getWidth(): Integer;
       getWrap(): boolean;
       getWraps(): Boolean[][];
@@ -812,7 +812,7 @@ declare namespace GoogleAppsScript {
       protect(): Protection;
       setBackground(color: string): Range;
       setBackgroundRGB(red: Integer, green: Integer, blue: Integer): Range;
-      setBackgrounds(color: String[][]): Range;
+      setBackgrounds(color: string[][]): Range;
       setBorder(top: boolean, left: boolean, bottom: boolean, right: boolean, vertical: boolean, horizontal: boolean): Range;
       setBorder(top: boolean, left: boolean, bottom: boolean, right: boolean, vertical: boolean, horizontal: boolean, color: string, style: BorderStyle): Range;
       setDataValidation(rule: DataValidation): Range;
@@ -831,8 +831,8 @@ declare namespace GoogleAppsScript {
       setFontWeights(fontWeights: Object[][]): Range;
       setFormula(formula: string): Range;
       setFormulaR1C1(formula: string): Range;
-      setFormulas(formulas: String[][]): Range;
-      setFormulasR1C1(formulas: String[][]): Range;
+      setFormulas(formulas: string[][]): Range;
+      setFormulasR1C1(formulas: string[][]): Range;
       setHorizontalAlignment(alignment: string): Range;
       setHorizontalAlignments(alignments: Object[][]): Range;
       setNote(note: string): Range;
@@ -949,11 +949,11 @@ declare namespace GoogleAppsScript {
     export interface Spreadsheet {
       addEditor(emailAddress: string): Spreadsheet;
       addEditor(user: Base.User): Spreadsheet;
-      addEditors(emailAddresses: String[]): Spreadsheet;
+      addEditors(emailAddresses: string[]): Spreadsheet;
       addMenu(name: string, subMenus: Object[]): void;
       addViewer(emailAddress: string): Spreadsheet;
       addViewer(user: Base.User): Spreadsheet;
-      addViewers(emailAddresses: String[]): Spreadsheet;
+      addViewers(emailAddresses: string[]): Spreadsheet;
       appendRow(rowContents: Object[]): Sheet;
       autoResizeColumn(columnPosition: Integer): Sheet;
       copy(name: string): Spreadsheet;
@@ -1085,7 +1085,7 @@ declare namespace GoogleAppsScript {
       /**
        * Returns the currently active spreadsheet, or null if there is none.
        */
-      getActive(): Spreadsheet;
+      getActive(): Spreadsheet | null;
       /**
        * Returns the range of cells that is currently considered active.
        */
@@ -1097,7 +1097,7 @@ declare namespace GoogleAppsScript {
       /**
        * Returns the currently active spreadsheet, or null if there is none.
        */
-      getActiveSpreadsheet(): Spreadsheet;
+      getActiveSpreadsheet(): Spreadsheet | null;
       /**
        * Returns an instance of the spreadsheet's user-interface environment that allows the script to add features like menus, dialogs, and sidebars.
        */
diff --git a/types/google-apps-script/google-apps-script.types.d.ts b/types/google-apps-script/google-apps-script.types.d.ts
index 3c7bfb550c..5204a8a2a4 100644
--- a/types/google-apps-script/google-apps-script.types.d.ts
+++ b/types/google-apps-script/google-apps-script.types.d.ts
@@ -8,6 +8,5 @@ declare module GoogleAppsScript {
   type Byte = number;
   type Integer = number;
   type Char = string;
-  type String = string;
   type JdbcSQL_XML = any;
 }
diff --git a/types/google-apps-script/google-apps-script.ui.d.ts b/types/google-apps-script/google-apps-script.ui.d.ts
index bd4424351e..f44218a866 100644
--- a/types/google-apps-script/google-apps-script.ui.d.ts
+++ b/types/google-apps-script/google-apps-script.ui.d.ts
@@ -395,11 +395,11 @@ declare namespace GoogleAppsScript {
       validateNotMatches(widget: Widget, pattern: string): ClientHandler;
       validateNotMatches(widget: Widget, pattern: string, flags: string): ClientHandler;
       validateNotNumber(widget: Widget): ClientHandler;
-      validateNotOptions(widget: Widget, options: String[]): 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;
+      validateOptions(widget: Widget, options: string[]): ClientHandler;
       validateRange(widget: Widget, min: Number, max: Number): ClientHandler;
       validateSum(widgets: Widget[], sum: Integer): ClientHandler;
     }
@@ -1477,11 +1477,11 @@ declare namespace GoogleAppsScript {
       validateNotMatches(widget: Widget, pattern: string): Handler;
       validateNotMatches(widget: Widget, pattern: string, flags: string): Handler;
       validateNotNumber(widget: Widget): Handler;
-      validateNotOptions(widget: Widget, options: String[]): 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;
+      validateOptions(widget: Widget, options: string[]): Handler;
       validateRange(widget: Widget, min: Number, max: Number): Handler;
       validateSum(widgets: Widget[], sum: Integer): Handler;
     }
@@ -2482,11 +2482,11 @@ declare namespace GoogleAppsScript {
       validateNotMatches(widget: Widget, pattern: string): ServerHandler;
       validateNotMatches(widget: Widget, pattern: string, flags: string): ServerHandler;
       validateNotNumber(widget: Widget): ServerHandler;
-      validateNotOptions(widget: Widget, options: String[]): 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;
+      validateOptions(widget: Widget, options: string[]): ServerHandler;
       validateRange(widget: Widget, min: Number, max: Number): ServerHandler;
       validateSum(widgets: Widget[], sum: Integer): ServerHandler;
     }
diff --git a/types/google-apps-script/google-apps-script.url-fetch.d.ts b/types/google-apps-script/google-apps-script.url-fetch.d.ts
index b9ede5163e..fc24727f67 100644
--- a/types/google-apps-script/google-apps-script.url-fetch.d.ts
+++ b/types/google-apps-script/google-apps-script.url-fetch.d.ts
@@ -25,6 +25,60 @@ declare namespace GoogleAppsScript {
       getResponseCode(): Integer;
     }
 
+    export interface URLFetchRequestOptions {
+        /**
+         * the content type (defaults to 'application/x-www-form-urlencoded'). Another example of content
+         * type is 'application/xml; charset=utf-8'.
+         */
+        contentType?: string;
+
+        /**
+         * a JavaScript key/value map of HTTP headers for the request
+         */
+        headers?: Object;
+
+        /**
+         * the HTTP method for the request: get, delete, patch, post, or put. The default is get.
+         */
+        method?: 'get' | 'delete' | 'patch' | 'post' | 'put';
+
+        /**
+         * the payload (e.g. POST body) for the request. Certain HTTP methods (e.g. GET) do not accept a
+         * payload. It can be a string, a byte array, or a JavaScript object. A JavaScript object will be
+         * interpretted as a map of form field names to values, where the values can be either strings or blobs.
+         */
+        payload?: string;
+
+        /**
+         * Deprecated. This instructs fetch to resolve the specified URL within the intranet linked to your
+         * domain through (deprecated) SDC
+         */
+        useIntranet?: boolean;
+
+        /**
+         * if this is set to false, the fetch will ignore any invalid certificates for HTTPS requests.
+         * The default is true.
+         */
+        validateHttpsCertificates?: boolean;
+
+        /**
+         * if this is set to false, the fetch not automatically follow HTTP redirects; it will return
+         * the original HTTP response. The default is true.
+         */
+        followRedirects?: boolean;
+
+        /**
+         * if this is set to true, the fetch will not throw an exception if the response code indicates
+         * failure, and will instead return the HTTPResponse (default: false)
+         */
+        muteHttpExceptions?: boolean;
+
+        /**
+         * if this is set to false, reserved characters in the URL will not be escaped (default: true)
+         */
+        escaping?: boolean;
+    }
+
     /**
      * Fetch resources and communicate with other hosts over the Internet.
      *
@@ -37,10 +91,8 @@ declare namespace GoogleAppsScript {
      * HTTPResponse
      */
     export interface UrlFetchApp {
-      fetch(url: string): HTTPResponse;
-      fetch(url: string, params: Object): HTTPResponse;
-      getRequest(url: string): Object;
-      getRequest(url: string, params: Object): Object;
+      fetch(url: string, params?: URLFetchRequestOptions): HTTPResponse;
+      getRequest(url: string, params?: URLFetchRequestOptions): Object;
     }
 
   }
diff --git a/types/google-apps-script/google-apps-script.utilities.d.ts b/types/google-apps-script/google-apps-script.utilities.d.ts
index 2beda0bfc1..c8fde9349c 100644
--- a/types/google-apps-script/google-apps-script.utilities.d.ts
+++ b/types/google-apps-script/google-apps-script.utilities.d.ts
@@ -58,8 +58,8 @@ declare namespace GoogleAppsScript {
       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[][];
+      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;
diff --git a/types/google-apps-script/index.d.ts b/types/google-apps-script/index.d.ts
index f80598c391..0e4ca164a9 100644
--- a/types/google-apps-script/index.d.ts
+++ b/types/google-apps-script/index.d.ts
@@ -7,6 +7,7 @@
 /// <reference path="google-apps-script.base.d.ts"/>
 /// <reference path="google-apps-script.cache.d.ts"/>
 /// <reference path="google-apps-script.calendar.d.ts"/>
+/// <reference path="google-apps-script.card.d.ts"/>
 /// <reference path="google-apps-script.charts.d.ts"/>
 /// <reference path="google-apps-script.contacts.d.ts"/>
 /// <reference path="google-apps-script.content.d.ts"/>
diff --git a/types/google-apps-script/tslint.json b/types/google-apps-script/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google-apps-script/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google-closure-compiler/tslint.json b/types/google-closure-compiler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google-closure-compiler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google-cloud__datastore/google-cloud__datastore-tests.ts b/types/google-cloud__datastore/google-cloud__datastore-tests.ts
index 285cb1fb00..3093a8256a 100644
--- a/types/google-cloud__datastore/google-cloud__datastore-tests.ts
+++ b/types/google-cloud__datastore/google-cloud__datastore-tests.ts
@@ -35,12 +35,17 @@ ds.determineBaseUrl_('http://localhost:8081');
 
 // Keys components creation:
 const dsInt: DatastoreInt = ds.int(42);
+const isInt = ds.isInt(dsInt);
 const dsDouble: DatastoreDouble = ds.double('3.14');
+const isDouble = ds.isDouble(dsDouble);
+
 const dsGeopoint: DatastoreGeopoint = ds.geoPoint({latitude: 0, longitude: 0});
+const isGeoPoint = ds.isGeoPoint(dsGeopoint);
 
 // Keys creation:
 const keyPath: DatastoreKeyPath = [kind, 'Google', 'Department', dsInt];
 const key: DatastoreKey = ds.key(keyPath);
+const isKey = ds.isKey(key);
 const ancestorKey: DatastoreKey = ds.key(['ParentCompany', 'Alphabet']);
 const keyWithOptions: DatastoreKey = ds.key({
                                                 namespace: 'special-namespace',
diff --git a/types/google-cloud__datastore/index.d.ts b/types/google-cloud__datastore/index.d.ts
index 6eee49ba50..8c9cdd23c3 100644
--- a/types/google-cloud__datastore/index.d.ts
+++ b/types/google-cloud__datastore/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for @google-cloud/datastore 1.1
-// Project: https://github.com/GoogleCloudPlatform/google-cloud-node/tree/master/packages/datastore
+// Type definitions for @google-cloud/datastore 1.3
+// Project: https://github.com/googleapis/nodejs-datastore
 // Definitions by: Antoine Beauvais-Lacasse <https://github.com/beaulac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
@@ -20,7 +20,11 @@ declare module '@google-cloud/datastore' {
         DatastoreCoords,
         OneOrMany
     } from '@google-cloud/datastore/entity';
-    import { DatastoreRequest as DatastoreRequest_, CommitCallback, CommitResult } from '@google-cloud/datastore/request';
+    import {
+        DatastoreRequest as DatastoreRequest_,
+        CommitCallback,
+        CommitResult
+    } from '@google-cloud/datastore/request';
     import {
         Query as DatastoreQuery,
         MoreResultsAfterCursor,
@@ -51,12 +55,20 @@ declare module '@google-cloud/datastore' {
 
         int(value: string | number): DatastoreInt;
 
+        isInt(value: any): value is DatastoreInt;
+
         double(value: string | number): DatastoreDouble;
 
+        isDouble(value: any): value is DatastoreDouble;
+
         geoPoint(coordinates: DatastoreCoords): DatastoreGeopoint;
 
+        isGeoPoint(value: any): value is DatastoreGeopoint;
+
         key(pathOrOptions: DatastoreKeyPath | DatastoreKeyOptions): DatastoreKey;
 
+        isKey(value: any): value is DatastoreKey;
+
         determineBaseUrl_(customApiEndpoint?: string): void;
     }
 
@@ -84,6 +96,7 @@ declare module '@google-cloud/datastore/entity' {
     interface DatastoreInt {
         value: string;
     }
+
     interface DatastoreDouble {
         value: string;
     }
@@ -92,6 +105,7 @@ declare module '@google-cloud/datastore/entity' {
         latitude: number;
         longitude: number;
     }
+
     interface DatastoreGeopoint {
         value: DatastoreCoords;
     }
@@ -223,7 +237,7 @@ declare module '@google-cloud/datastore/request' {
 
         runQuery(query: Query, options: QueryOptions, callback: QueryCallback): void;
         runQuery(query: Query, callback: QueryCallback): void;
-        runQuery(query: Query, options?: QueryOptions): QueryResult;
+        runQuery(query: Query, options?: QueryOptions): Promise<QueryResult>;
 
         runQueryStream(query: Query, options?: QueryOptions): NodeJS.ReadableStream;
 
@@ -297,6 +311,8 @@ declare module '@google-cloud/datastore/transaction' {
     type RollbackCallback = (err: Error, rollbackResponse: {}) => void;
     type RollbackResult = [{}];
 
-    type TransactionCallback = (err: Error, tx: DatastoreTransaction, beginTxResponse: BeginTransactionResponse) => void;
+    type TransactionCallback = (err: Error,
+                                tx: DatastoreTransaction,
+                                beginTxResponse: BeginTransactionResponse) => void;
     type TransactionResult = [DatastoreTransaction, BeginTransactionResponse];
 }
diff --git a/types/google-cloud__pubsub/google-cloud__pubsub-tests.ts b/types/google-cloud__pubsub/google-cloud__pubsub-tests.ts
new file mode 100644
index 0000000000..7a9b9905c2
--- /dev/null
+++ b/types/google-cloud__pubsub/google-cloud__pubsub-tests.ts
@@ -0,0 +1,578 @@
+import * as PubSub from '@google-cloud/pubsub';
+
+// AUTHOR NOTES: We use the examples directly from the library documentation
+// where possible. If there is a problem with a given example (e.g. undocumented
+// feature or option), we make a note of it and provide an alternative example
+// call instead.
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBSUB
+///////////////////////////////////////////////////////////////////////////////
+{
+    let pubsub: PubSub.PubSub;
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=PubSub
+    // When running on Google Cloud Platform:
+    pubsub = PubSub();
+    // When running elsewhere:
+    pubsub = PubSub({
+        projectId: 'grape-spaceship-123',
+        keyFilename: '/path/to/keyfile.json',
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=createSubscription
+    // Subscribe to a topic:
+    pubsub.createSubscription('messageCenter', 'newMessages', (err, subscription, apiResponse) => { });
+    // Customize the subscription:
+    // NOTE: ackDeadline, as given in the example, is undocumented, so create a subscription only with the KNOWN options
+    pubsub.createSubscription('messageCenter', 'newMessages', {
+        retainAckedMessages: true,
+    }, (err, subscription, apiResponse) => { });
+    // If the callback is omitted, we'll return a Promise.
+    pubsub.createSubscription('messageCenter', 'newMessages').then((data) => {
+        const subscription = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=createTopic
+    // Create topic with callback
+    pubsub.createTopic('my-new-topic', (err, topic, apiResponse) => {
+        if (!err) {
+            // The topic was created successfully.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    pubsub.createTopic('my-new-topic').then((data) => {
+        const topic = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=getSnapshots
+    // Get snapshots:
+    pubsub.getSnapshots((err, snapshots) => {
+        if (!err) {
+            // snapshots is an array of Snapshot objects.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    pubsub.getSnapshots().then((data) => {
+        const snapshots = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=getSnapshotsStream
+    // Get snapshots stream
+    pubsub.getSnapshotsStream()
+        .on('error', console.error)
+        .on('data', (snapshot) => {
+            // snapshot is a Snapshot object.
+        })
+        .on('end', () => {
+            // All snapshots retrieved.
+        });
+    // If you anticipate many results, you can end a stream early to prevent unnecessary processing and API requests.
+    // NOTE: this had to be modified to work around the 'this' keyword as used in the example
+    {
+        const stream = pubsub.getSnapshotsStream();
+        stream.on('data', (snapshot) => {
+            stream.end();
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=getSubscriptions
+    // Get subscriptions:
+    pubsub.getSubscriptions((err, subscriptions) => {
+        if (!err) {
+            // subscriptions is an array of Subscription objects.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    pubsub.getSubscriptions().then((data) => {
+        const subscriptions = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=getSubscriptionsStream
+    // Get subscriptions stream
+    pubsub.getSubscriptionsStream()
+        .on('error', console.error)
+        .on('data', (subscription) => {
+            // subscription is a Subscription object.
+        })
+        .on('end', () => {
+            // All subscriptions retrieved.
+        });
+    // If you anticipate many results, you can end a stream early to prevent unnecessary processing and API requests.
+    // Note: this had to be modified to work around the 'this' keyword as used in the example.
+    {
+        const stream = pubsub.getSubscriptionsStream();
+        stream.on('data', (subscription) => {
+            stream.end();
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=getTopics
+    // Get topics:
+    pubsub.getTopics((err, topics) => {
+        if (!err) {
+            // topics is an array of Topic objects.
+        }
+    });
+    // Customize the query:
+    pubsub.getTopics({
+        pageSize: 3
+    }, (err, topics) => { });
+    // If the callback is omitted, we'll return a Promise.
+    pubsub.getTopics().then((data) => {
+        const topics = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=getTopicsStream
+    // Get topics stream:
+    pubsub.getTopicsStream()
+        .on('error', console.error)
+        .on('data', (topic) => {
+            // topic is a Topic object.
+        })
+        .on('end', () => {
+            // All topics retrieved.
+        });
+    // If you anticipate many results, you can end a stream early to prevent unnecessary processing and API requests.
+    // Note: this had to be modified to work around the 'this' keyword as used in the example.
+    {
+        const stream = pubsub.getTopicsStream();
+        stream.on('data', (topic) => {
+            stream.end();
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=snapshot
+    // Snapshot:
+    {
+        const snapshot = pubsub.snapshot('my-snapshot');
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=subscription
+    // Subscription:
+    {
+        const subscription = pubsub.subscription('my-subscription');
+
+        // Register a listener for `message` events.
+        subscription.on('message', (message) => {
+            // Called every time a message is received.
+            // message.id = ID of the message.
+            // message.ackId = ID used to acknowledge the message receival.
+            // message.data = Contents of the message.
+            // message.attributes = Attributes of the message.
+            // message.publishTime = Timestamp when Pub/Sub received the message.
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub?method=topic
+    // Topic:
+    {
+        const topic = pubsub.topic('my-topic');
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLISHER
+///////////////////////////////////////////////////////////////////////////////
+{
+    const pubsub = PubSub();
+    const topic = pubsub.topic('my-topic');
+    const publisher = topic.publisher();
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/publisher?method=publish
+    // Publish:
+    publisher.publish(new Buffer('Hello, world!'), (err, messageId) => {
+        if (err) {
+            // Error handling omitted.
+        }
+    });
+    // Optionally you can provide an object containing attributes for the message.
+    publisher.publish(new Buffer('Hello, world!'), { key: 'value' }, (err, messageId) => {
+        if (err) {
+            // Error handling omitted.
+        }
+    });
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// SNAPSHOT
+///////////////////////////////////////////////////////////////////////////////
+{
+    const pubsub = PubSub();
+    const subscription = pubsub.subscription('my-subscription');
+
+    // There are two type of snapshots; the ones obtained from subscription.createSnapshot() have more functionality
+    const snapshot = pubsub.snapshot('my-snapshot');
+    const snapshotFromSubscription = subscription.snapshot('my-snapshot');
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/snapshot?method=create
+    // Note: Only available to snapshots created via methods of Subscription
+    // Create snapshot
+    snapshotFromSubscription.create('my-snapshot', (err, snapshot, apiResponse) => {
+        if (!err) {
+            // The snapshot was created successfully.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    snapshotFromSubscription.create('my-snapshot').then((data) => {
+        const snapshot = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/snapshot?method=delete
+    // Delete the snapshot
+    snapshot.delete((err, apiResponse) => { });
+    // If the callback is omitted, we'll return a Promise.
+    snapshot.delete().then((data) => {
+        const apiResponse = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/snapshot?method=seek
+    // Note: Only available to snapshots created via methods of Subscription
+    // Seek:
+    snapshotFromSubscription.seek((err, apiResponse) => { });
+    // If the callback is omitted, we'll return a Promise.
+    snapshotFromSubscription.seek().then((data) => {
+        const apiResponse = data[0];
+    });
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// SUBSCRIPTION
+///////////////////////////////////////////////////////////////////////////////
+{
+    const pubsub = PubSub();
+    const topic = pubsub.topic('my-topic');
+    const subscription = topic.subscription('my-subscription');
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=close
+    // Close:
+    subscription.close((err) => {
+        if (err) {
+            // Error handling omitted.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    subscription.close().then(() => { });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=createSnapshot
+    // Create snapshot:
+    subscription.createSnapshot('my-snapshot', (err, snapshot, apiResponse) => {
+        if (!err) {
+            // The snapshot was created successfully.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    subscription.createSnapshot('my-snapshot').then((data) => {
+        const snapshot = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=delete
+    // Delete:
+    subscription.delete((err, apiResponse) => { });
+    // If the callback is omitted, we'll return a Promise.
+    subscription.delete().then((data) => {
+        const apiResponse = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=exists
+    // Exists:
+    subscription.exists((err, exists) => { });
+    // If the callback is omitted, we'll return a Promise.
+    subscription.exists().then((data) => {
+        const exists = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=get
+    // Get:
+    subscription.get((err, subscription, apiResponse) => {
+        // The `subscription` data has been populated.
+    });
+    // If the callback is omitted, we'll return a Promise.
+    subscription.get().then((data) => {
+        const subscription = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=getMetadata
+    // Get metadata:
+    subscription.getMetadata((err, apiResponse) => {
+        if (err) {
+            // Error handling omitted.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    subscription.getMetadata().then((data) => {
+        const apiResponse = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=modifyPushConfig
+    // Modify push config:
+    // Note: Had to modify the code to force typings
+    {
+        const pushConfig: PubSub.Subscription.PushConfig = {
+            pushEndpoint: 'https://mydomain.com/push',
+            attributes: {
+                'x-goog-version': 'v1',
+            }
+        };
+        subscription.modifyPushConfig(pushConfig, (err, apiResponse) => {
+            if (err) {
+                // Error handling omitted.
+            }
+        });
+        // If the callback is omitted, we'll return a Promise.
+        subscription.modifyPushConfig(pushConfig).then((data) => {
+            const apiResponse = data[0];
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=seek
+    // Seek:
+    {
+        const callback: PubSub.Subscription.SeekCallback = (err, resp) => {
+            if (!err) {
+                // Seek was successful.
+            }
+        };
+        subscription.seek('my-snapshot', callback);
+        // Alternatively, to specify a certain point in time, you can provide a Date object.
+        subscription.seek(new Date('October 21 2015'), callback);
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=setMetadata
+    {
+        const metadata = {
+            key: 'value'
+        };
+
+        // Set metadata
+        subscription.setMetadata(metadata, (err, apiResponse) => {
+            if (err) {
+                // Error handling omitted.
+            }
+        });
+        // If the callback is omitted, we'll return a Promise.
+        subscription.setMetadata(metadata).then((data) => {
+            const apiResponse = data[0];
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=snapshot
+    // Snapshot:
+    subscription.snapshot('my-snapshot');
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// TOPIC
+///////////////////////////////////////////////////////////////////////////////
+{
+    const pubsub = PubSub();
+    const topic = pubsub.topic('my-topic');
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=create
+    // Create:
+    topic.create((err, topic, apiResponse) => {
+        if (!err) {
+            // The topic was created successfully.
+        }
+    });
+    // If the callback is omitted, we'll return a Promise.
+    topic.create().then((data) => {
+        const topic = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=createSubscription
+    {
+        const callback: PubSub.Topic.CreateSubscriptionCallback = (err, subscription, apiResponse) => { };
+
+        // Without specifying any options.
+        topic.createSubscription('newMessages', callback);
+
+        // With options.
+        // Note: ackDeadline not documented, so we use a different option
+        topic.createSubscription('newMessages', {
+            // ackDeadline: 90000 // 90 seconds
+            retainAckedMessages: true,
+        }, callback);
+
+        // If the callback is omitted, we'll return a Promise.
+        topic.createSubscription('newMessages').then((data) => {
+            const subscription = data[0];
+            const apiResponse = data[1];
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=delete
+    // Delete:
+    topic.delete((err, apiResponse) => { });
+    // If the callback is omitted, we'll return a Promise.
+    topic.delete().then((data) => {
+        const apiResponse = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=exists
+    // Exists:
+    topic.exists((err, exists) => { });
+    // If the callback is omitted, we'll return a Promise.
+    topic.exists().then((data) => {
+        const exists = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=get
+    // Get:
+    topic.get((err, topic, apiResponse) => {
+        // The `topic` data has been populated.
+    });
+    // If the callback is omitted, we'll return a Promise.
+    topic.get().then((data) => {
+        const topic = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=getMetadata
+    // Get metadata
+    topic.getMetadata((err, apiResponse) => { });
+    // If the callback is omitted, we'll return a Promise.
+    topic.getMetadata().then((data) => {
+        const apiResponse = data[0];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=getSubscriptions
+    // Get subscriptions:
+    // Note: Modified so that the callback is a constant
+    {
+        const callback: PubSub.Topic.GetSubscriptionsCallback = (err, subscriptions) => {
+            // subscriptions is an array of `Subscription` objects.
+        };
+
+        topic.getSubscriptions(callback);
+
+        // Customize the query.
+        topic.getSubscriptions({
+            pageSize: 3
+        }, callback);
+
+        // If the callback is omitted, we'll return a Promise.
+        topic.getSubscriptions().then((data) => {
+            const subscriptions = data[0];
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=getSubscriptionsStream
+    // Get subscriptions stream:
+    topic.getSubscriptionsStream()
+        .on('error', console.error)
+        .on('data', (subscription) => {
+            // subscription is a Subscription object.
+        })
+        .on('end', () => {
+            // All subscriptions retrieved.
+        });
+    // If you anticipate many results, you can end a stream early to prevent unnecessary processing and API requests.
+    {
+        const stream = topic.getSubscriptionsStream();
+        stream.on('data', (subscription) => {
+            stream.end();
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=publisher
+    topic.publisher().publish(new Buffer('Hello, world!'), (err, messageId) => {
+        if (err) {
+            // Error handling omitted.
+        }
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=subscription
+    // Register a listener for `message` events.
+    topic.subscription('my-subscription').on('message', (message) => {
+        // Called every time a message is received.
+        // message.id = ID of the message.
+        // message.ackId = ID used to acknowledge the message receival.
+        // message.data = Contents of the message.
+        // message.attributes = Attributes of the message.
+        // message.publishTime = Timestamp when Pub/Sub received the message.
+    });
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// IAM
+///////////////////////////////////////////////////////////////////////////////
+{
+    const pubsub = PubSub();
+    const topic = pubsub.topic('my-topic');
+    const subscription = topic.subscription('my-subscription');
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=iam.getPolicy
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=iam.getPolicy
+    // Get policy:
+    topic.iam.getPolicy((err, policy, apiResponse) => { });
+    subscription.iam.getPolicy((err, policy, apiResponse) => { });
+    // If the callback is omitted, we'll return a Promise.
+    topic.iam.getPolicy().then((data) => {
+        const policy = data[0];
+        const apiResponse = data[1];
+    });
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=iam.setPolicy
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=iam.setPolicy
+    {
+        const myPolicy = {
+            bindings: [
+                {
+                    role: 'roles/pubsub.subscriber',
+                    members: ['serviceAccount:myotherproject@appspot.gserviceaccount.com']
+                }
+            ]
+        };
+
+        // Set policy:
+        topic.iam.setPolicy(myPolicy, (err, policy, apiResponse) => { });
+        subscription.iam.setPolicy(myPolicy, (err, policy, apiResponse) => { });
+
+        // If the callback is omitted, we'll return a Promise.
+        topic.iam.setPolicy(myPolicy).then((data) => {
+            const policy = data[0];
+            const apiResponse = data[1];
+        });
+    }
+
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/subscription?method=iam.testPermissions
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=iam.testPermissions
+    {
+        const test = 'pubsub.topics.update';
+
+        // Test permission
+        topic.iam.testPermissions(test, (err, permissions, apiResponse) => {
+            console.log(permissions);
+            // {
+            //   "pubsub.topics.update": true
+            // }
+        });
+
+        // Test several permissions at once.
+        const tests = [
+            'pubsub.subscriptions.consume',
+            'pubsub.subscriptions.update'
+        ];
+
+        subscription.iam.testPermissions(tests, (err, permissions) => {
+            console.log(permissions);
+            // {
+            //   "pubsub.subscriptions.consume": true,
+            //   "pubsub.subscriptions.update": false
+            // }
+        });
+
+        // If the callback is omitted, we'll return a Promise.
+        topic.iam.testPermissions(test).then((data) => {
+            const permissions = data[0];
+            const apiResponse = data[1];
+        });
+    }
+}
diff --git a/types/google-cloud__pubsub/index.d.ts b/types/google-cloud__pubsub/index.d.ts
new file mode 100644
index 0000000000..7c9014b7d3
--- /dev/null
+++ b/types/google-cloud__pubsub/index.d.ts
@@ -0,0 +1,344 @@
+// Type definitions for @google-cloud/pubsub 0.14
+// Project: https://github.com/GoogleCloudPlatform/google-cloud-node/tree/master/packages/pubsub
+// Definitions by: Paul Huynh <https://github.com/pheromonez>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node"/>
+import { EventEmitter } from "events";
+import { Duplex } from "stream";
+
+declare namespace PubSub {
+    // TODO write definitions for the for v1
+    // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/v1
+    function v1(config?: GCloudConfiguration): any;
+
+    interface GCloudConfiguration {
+        projectId?: string;
+        keyFilename?: string;
+        email?: string;
+        credentials?: {
+            client_email?: string;
+            private_key?: string
+        };
+        autoRetry?: boolean;
+        maxRetries?: number;
+        promise?: any;
+    }
+
+    interface PubSub {
+        createSubscription(topic: Topic | string, name: string, options?: PubSub.CreateSubscriptionOptions): Promise<any[]>;
+        createSubscription(topic: Topic | string, name: string, callback: PubSub.CreateSubscriptionCallback): void;
+        createSubscription(topic: Topic | string, name: string, options: PubSub.CreateSubscriptionOptions, callback: PubSub.CreateSubscriptionCallback): void;
+
+        createTopic(name: string, gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        createTopic(name: string, callback: PubSub.CreateTopicCallback): void;
+        createTopic(name: string, gaxOpts: GAX.CallOptions, callback: PubSub.CreateTopicCallback): void;
+
+        getSnapshots(options?: PubSub.GetSnapshotsOptions): Promise<any[]>;
+        getSnapshots(callback: PubSub.GetSnapshotsCallback): void;
+        getSnapshots(options: PubSub.GetSnapshotsOptions, callback: PubSub.GetSnapshotsCallback): void;
+
+        getSnapshotsStream(options?: PubSub.GetSnapshotsOptions): Duplex;
+
+        getSubscriptions(options?: PubSub.GetSubscriptionsOptions): Promise<any[]>;
+        getSubscriptions(callback: PubSub.GetSubscriptionsCallback): void;
+        getSubscriptions(options: PubSub.GetSubscriptionsOptions, callback: PubSub.GetSubscriptionsCallback): void;
+
+        getSubscriptionsStream(options?: PubSub.GetSubscriptionsOptions): Duplex;
+
+        getTopics(query?: PubSub.GetTopicsQuery): Promise<any[]>;
+        getTopics(callback: PubSub.GetTopicsCallback): void;
+        getTopics(query: PubSub.GetTopicsQuery, callback: PubSub.GetTopicsCallback): void;
+
+        getTopicsStream(query?: PubSub.GetTopicsQuery): Duplex;
+
+        snapshot(name: string): Snapshot;
+
+        subscription(name: string, options?: PubSub.SubscriptionOptions): Subscription;
+
+        topic(name: string): Topic;
+    }
+    namespace PubSub {
+        interface CreateSubscriptionOptions {
+            flowControl?: {
+                maxBytes?: number;
+                maxMessages?: number;
+            };
+            gaxOpts?: GAX.CallOptions;
+            messageRetentionDuration?: number | Date;
+            pushEndpoint?: string;
+            retainAckedMessages?: boolean;
+        }
+        type CreateSubscriptionCallback = (err: Error | null, subscription: Subscription, apiResponse: object) => void;
+
+        type CreateTopicCallback = (err: Error | null, topic: Topic, apiResponse: object) => void;
+
+        interface GetSnapshotsOptions {
+            autoPaginate?: boolean;
+            gaxOpts?: GAX.CallOptions;
+            pageSize?: number;
+            pageToken?: string;
+        }
+        type GetSnapshotsCallback = (err: Error | null, snapshots: Snapshot[]) => void;
+
+        interface GetSubscriptionsOptions {
+            autoPaginate?: boolean;
+            gaxOpts?: GAX.CallOptions;
+            pageSize?: number;
+            pageToken?: string;
+            topic?: Topic | string;
+        }
+        type GetSubscriptionsCallback = (err: Error | null, subscriptions: Subscription[], apiResponse: object) => void;
+
+        interface GetTopicsQuery {
+            autoPaginate?: boolean;
+            gaxOpts?: GAX.CallOptions;
+            pageSize?: number;
+            pageToken?: string;
+        }
+        type GetTopicsCallback = (err: Error | null, topics: Topic[], apiResponse: object) => void;
+
+        interface SubscriptionOptions {
+            flowControl?: {
+                maxBytes?: number;
+                maxMessages?: number;
+            };
+            maxConnections?: number;
+        }
+    }
+
+    interface Publisher {
+        publish(data: Buffer, callback: Publisher.PublishCallback): void;
+        publish(data: Buffer, attributes: object, callback: Publisher.PublishCallback): void;
+        publish(data: Buffer, attributes?: object): Promise<any[]>;
+    }
+    namespace Publisher {
+        type PublishCallback = (error: Error | null, messageId: string) => void;
+    }
+
+    interface Snapshot {
+        delete(): Promise<any[]>;
+        delete(callback: Snapshot.DeleteCallback): void;
+    }
+    interface SnapshotFromSubscription extends Snapshot {
+        create(name: string): Promise<any[]>;
+        create(name: string, callback: Snapshot.CreateCallback): void;
+
+        seek(): Promise<any[]>;
+        seek(callback: Snapshot.SeekCallback): void;
+    }
+    namespace Snapshot {
+        type DeleteCallback = (err: Error | null, apiResponse: object) => void;
+
+        type CreateCallback = (err: Error | null, snapshot: Snapshot, apiResponse: object) => void;
+
+        type SeekCallback = (err: Error | null, apiResponse: object) => void;
+    }
+
+    interface Subscription extends EventEmitter {
+        close(): Promise<void>;
+        close(callback: Subscription.CloseCallback): void;
+
+        createSnapshot(name: string, gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        createSnapshot(name: string, callback: Subscription.CreateSnapshotCallback): void;
+        createSnapshot(name: string, gaxOpts: GAX.CallOptions, callback: Subscription.CreateSnapshotCallback): void;
+
+        delete(gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        delete(callback: Subscription.DeleteCallback): void;
+        delete(gaxOpts: GAX.CallOptions, callback: Subscription.DeleteCallback): void;
+
+        exists(): Promise<any[]>;
+        exists(callback: Subscription.ExistsCallback): void;
+
+        get(gaxOpts?: GAX.CallOptions): Promise<any[]>; // TODO: only expose autoCreate
+        // NOTE: The following are not documented, but are possible signatures base on the source code
+        get(callback: Subscription.GetCallback): void;
+        get(gaxOpts: GAX.CallOptions, callback: Subscription.GetCallback): void;
+
+        getMetadata(gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        getMetadata(callback: Subscription.GetMetadataCallback): void;
+        getMetadata(gaxOpts: GAX.CallOptions, callback: Subscription.GetMetadataCallback): void;
+
+        iam: IAM;
+
+        modifyPushConfig(config: Subscription.PushConfig, gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        modifyPushConfig(config: Subscription.PushConfig, callback: Subscription.ModifyPushConfigCallback): void;
+        modifyPushConfig(config: Subscription.PushConfig, gaxOpts: GAX.CallOptions, callback: Subscription.ModifyPushConfigCallback): void;
+
+        seek(snapshot: string | Date, callback: Subscription.SeekCallback): void;
+        seek(snapshot: string | Date, gaxOpts: GAX.CallOptions, callback: Subscription.SeekCallback): void;
+
+        setMetadata(metadata: object, gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        setMetadata(metadata: object, callback: Subscription.SetMetadataCallback): void;
+        setMetadata(metadata: object, gaxOpts: GAX.CallOptions, callback: Subscription.SetMetadataCallback): void;
+
+        snapshot(name: string): SnapshotFromSubscription;
+    }
+    namespace Subscription {
+        type CloseCallback = (err: Error | null) => void;
+
+        type CreateSnapshotCallback = (err: Error | null, snapshot: SnapshotFromSubscription, apiResponse: object) => void;
+
+        type DeleteCallback = (err: Error | null, apiResponse: object) => void;
+
+        type ExistsCallback = (err: Error | null, exists: boolean) => void;
+
+        type GetCallback = (err: Error | null, subscription: Subscription, apiResponse: object) => void;
+
+        type GetMetadataCallback = (err: Error | null, apiResponse: object) => void;
+
+        interface PushConfig {
+            pushEndpoint?: string;
+            // https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions#pushconfig
+            attributes?: PushConfigAttributes;
+        }
+        interface PushConfigAttributes {
+            'x-goog-version': 'v1beta' | 'v1' | 'v1beta2';
+        }
+        type ModifyPushConfigCallback = (err: Error | null, apiResponse: object) => void;
+
+        type SeekCallback = (err: Error | null, apiResponse: object) => void;
+
+        type SetMetadataCallback = (err: Error | null, apiResponse: object) => void;
+    }
+
+    interface Topic {
+        create(gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        create(callback: Topic.CreateCallback): void;
+        create(gaxOpts: GAX.CallOptions, callback: Topic.CreateCallback): void;
+
+        createSubscription(nameOrOptions?: string | Topic.CreateSubscriptionOptions): Promise<any[]>;
+        createSubscription(name: string, options: Topic.CreateSubscriptionOptions): Promise<any[]>;
+        createSubscription(callback: Topic.CreateSubscriptionCallback): void;
+        createSubscription(nameOrOptions: string | Topic.CreateSubscriptionOptions, callback: Topic.CreateSubscriptionCallback): void;
+        createSubscription(name: string, options: Topic.CreateSubscriptionOptions, callback: Topic.CreateSubscriptionCallback): void;
+
+        delete(gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        delete(callback: Topic.DeleteCallback): void;
+        delete(gaxOpts: GAX.CallOptions, callback: Topic.DeleteCallback): void;
+
+        exists(): Promise<any[]>;
+        exists(callback: Topic.ExistsCallback): void;
+
+        // NOTE: The documentation in the link is incomplete; the function takes a callback
+        // as second argument (in the source):
+        // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=get
+        get(gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        get(callback: Topic.GetCallback): void;
+        get(gaxOpts: GAX.CallOptions, callback: Topic.GetCallback): void;
+
+        getMetadata(gaxOpts?: GAX.CallOptions): Promise<any[]>;
+        getMetadata(callback: Topic.GetMetadataCallback): void;
+        getMetadata(gaxOpts: GAX.CallOptions, callback: Topic.GetMetadataCallback): void;
+
+        getSubscriptions(options?: Topic.GetSubscriptionsOptions): Promise<any[]>;
+        getSubscriptions(callback: Topic.GetSubscriptionsCallback): void;
+        getSubscriptions(options: Topic.GetSubscriptionsOptions, callback: Topic.GetSubscriptionsCallback): void;
+
+        // Note: The documention lists the parameter as 'query', when it probably should be 'options'.
+        getSubscriptionsStream(options?: Topic.GetSubscriptionsOptions): Duplex;
+
+        iam: IAM;
+
+        publisher(options?: Topic.PublisherOptions): Publisher;
+
+        subscription(name: string, options?: Topic.SubscriptionOptions): Subscription;
+    }
+    namespace Topic {
+        type CreateCallback = PubSub.CreateTopicCallback;
+
+        type CreateSubscriptionOptions = PubSub.CreateSubscriptionOptions;
+        type CreateSubscriptionCallback = PubSub.CreateSubscriptionCallback;
+
+        // Note: This is not fully documented in the link; browse the source code to find the callback parameters
+        // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=delete
+        type DeleteCallback = (err: Error | null, apiResponse: object) => void;
+
+        type ExistsCallback = (err: Error | null, exists: boolean) => void;
+
+        // Note: This is not fully documented in the link; browse the source code to find the callback parameters
+        // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/topic?method=get
+        type GetCallback = (err: Error | null, topic: Topic, apiResponse: object) => void;
+
+        type GetMetadataCallback = (err: Error | null, apiResponse: object) => void;
+
+        // Options are SLIGHTLY different to PubSub.getSubscriptions(...), so we can't just reuse it
+        interface GetSubscriptionsOptions {
+            autoPaginate?: boolean;
+            gaxOpts?: GAX.CallOptions;
+            pageSize?: number;
+            pageToken?: string;
+        }
+        // Callback signature also slightly different to PubSub.getSubscriptions(callback), so we can't just reuse it
+        type GetSubscriptionsCallback = (err: Error | null, subscriptions: Subscription[]) => void;
+
+        interface PublisherOptions {
+            batching?: {
+                maxBytes?: number;
+                maxMessages?: number;
+                maxMilliseconds?: number;
+            };
+        }
+
+        type SubscriptionOptions = PubSub.SubscriptionOptions;
+    }
+
+    // Allow this interface to start with 'I', since it's an acronym!
+    // tslint:disable-next-line interface-name
+    interface IAM {
+        getPolicy(): Promise<any[]>;
+        getPolicy(callback: IAM.GetPolicyCallback): void;
+
+        setPolicy(policy: IAM.Policy): Promise<any[]>;
+        setPolicy(policy: IAM.Policy, callback: IAM.SetPolicyCallback): void;
+
+        testPermissions(permissions: string | string[]): Promise<any[]>;
+        testPermissions(permissions: string | string[], callback: IAM.TestPermissionsCallback): void;
+    }
+    namespace IAM {
+        type GetPolicyCallback = (err: Error | null, policy: Policy, apiResponse: object) => void;
+
+        type SetPolicyCallback = (err: Error | null, policy: Policy, apiResponse: object) => void;
+
+        type TestPermissionsCallback = (err: Error | null, permissions: string | string[], apiResponse: object) => void;
+
+        interface Policy {
+            bindings?: any[];
+            rules?: object[];
+            etag?: string;
+        }
+    }
+
+    namespace GAX {
+        /** https://googleapis.github.io/gax-nodejs/global.html#CallOptions */
+        interface CallOptions {
+            timeout?: number;
+            retry?: RetryOptions;
+            autoPaginate?: boolean;
+            pageToken?: object;
+            isBundling?: boolean;
+            longrunning?: BackoffSettings;
+            promise?: PromiseConstructor; // FIXME Unsure if this is the correct type; remove this comment if it is
+        }
+
+        /** https://googleapis.github.io/gax-nodejs/global.html#RetryOptions */
+        interface RetryOptions {
+            retryCodes: string[];
+            backoffSettings: BackoffSettings;
+        }
+
+        /** https://googleapis.github.io/gax-nodejs/global.html#BackoffSettings */
+        interface BackoffSettings {
+            initialRetryDelayMillis: number;
+            retryDelayMultiplier: number;
+            maxRetryDelayMillis: number;
+            initialRpcTimeoutMillis: number;
+            maxRpcTimeoutMillis: number;
+            totalTimeoutMillis: number;
+        }
+    }
+}
+
+declare function PubSub(config?: PubSub.GCloudConfiguration): PubSub.PubSub;
+export = PubSub;
diff --git a/types/google-cloud__pubsub/tsconfig.json b/types/google-cloud__pubsub/tsconfig.json
new file mode 100644
index 0000000000..f71eb2a331
--- /dev/null
+++ b/types/google-cloud__pubsub/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "paths": {
+            "@google-cloud/pubsub": [
+                "google-cloud__pubsub"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "google-cloud__pubsub-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/google-cloud__pubsub/tslint.json b/types/google-cloud__pubsub/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/google-cloud__pubsub/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/google-cloud__storage/google-cloud__storage-tests.ts b/types/google-cloud__storage/google-cloud__storage-tests.ts
index 5784f68df4..24d300b8e6 100644
--- a/types/google-cloud__storage/google-cloud__storage-tests.ts
+++ b/types/google-cloud__storage/google-cloud__storage-tests.ts
@@ -30,7 +30,6 @@ import * as CloudStorage from "@google-cloud/storage";
 
 /**
  * Test the storage service.
- * @class TestStorage
  */
 export class TestStorage {
     // constants
@@ -41,32 +40,16 @@ export class TestStorage {
     // import Storage class
     static gcs = CloudStorage();
 
-    // the bucket
-    private buckets: Bucket[] = [];
-
-    /**
-     * @constructor
-     */
     constructor() {
         // nothing to do
     }
 
-    /**
-     * Returns the bucket.
-     * @method bucket
-     * @param {string} name
-     * @return {Bucket}
-     */
+    /** Returns the bucket. */
     bucket(name: string): Bucket {
         return TestStorage.gcs.bucket(name);
     }
 
-    /**
-     * Create a new bucket.
-     * @param {string} name
-     * @param {BucketConfig} metadata
-     * @return {Promise<[Bucket, ApiResponse]>}
-     */
+    /** Create a new bucket. */
     createBucket(name: string, config?: BucketConfig): Promise<[Bucket, ApiResponse]> {
         // overwrite default values with custom config
         config = Object.assign(TestStorage.BUCKET_CONFIG, config);
@@ -76,161 +59,89 @@ export class TestStorage {
 
     /**
      * Query for buckets.
-     * @param {BucketQuery} query
      */
     getBuckets(query?: BucketQuery): Promise<[Bucket[]]> {
         return TestStorage.gcs.getBuckets(query);
     }
 }
 
-/**
- * The bucket API wrapper.
- * @class TestBucket
- */
+/** The bucket API wrapper. */
 export class TestBucket {
     // the bucket in the cloud
     bucket: Bucket;
 
-    /**
-     * Create a bucket.
-     * @param {BucketConfig} config
-     * @return {Promise<[Bucket, ApiResponse]>}
-     */
+    /** Create a bucket. */
     create(config?: BucketConfig): Promise<[Bucket, ApiResponse]> {
         return this.bucket.create(config);
     }
 
-    /**
-     * Create a channel that will be notified when objects in this bucket changes.
-     * @method createChannel
-     * @param {string} id
-     * @param {ChannelConfig} config
-     * @return {Promise<[Channel, ApiResponse]>}
-     */
+    /** Create a channel that will be notified when objects in this bucket changes. */
     createChannel(id: string, config: ChannelConfig): Promise<[Channel, ApiResponse]> {
         return this.bucket.createChannel(id, config);
     }
 
-    /**
-     * Delete the bucket.
-     * @method delete
-     * @return {Promise<[ApiResponse]>}
-     */
+    /** Delete the bucket. */
     delete(): Promise<[ApiResponse]> {
         return this.bucket.delete();
     }
 
-    /**
-     * Iterate over the bucket's files, calling file.delete() on each.
-     * @method deleteFiles
-     * @return {Promise<void>}
-     */
+    /** Iterate over the bucket's files, calling file.delete() on each. */
     deleteFiles(query?: BucketQuery): Promise<void> {
         return this.bucket.deleteFiles(query);
     }
 
-    /**
-     * Check if the bucket exists.
-     * @method exists
-     * @return {Promise<[boolean]>}
-     */
+    /** Check if the bucket exists. */
     exists(): Promise<[boolean]> {
         return this.bucket.exists();
     }
 
-    /**
-     * Create a File object.
-     * @method file
-     * @param {string} name
-     * @param {BucketFileOptions} options
-     */
+    /** Create a File object. */
     file(name: string, options?: BucketFileOptions): File {
         return this.bucket.file(name);
     }
 
-    /**
-     * Get a bucket if it exists.
-     * @method get
-     * @param {BucketGetOptions} options
-     */
+    /** Get a bucket if it exists. */
     get(options?: BucketGetOptions): Promise<[Bucket, ApiResponse]> {
         return this.bucket.get(options);
     }
 
-    /**
-     * Get File objects for the files currently in the bucket
-     * @method getFiles
-     * @param {BucketQuery} query
-     * @return {Promise<[File[]]>}
-     */
+    /** Get File objects for the files currently in the bucket */
     getFiles(query?: BucketQuery): Promise<[File[]]> {
         return this.bucket.getFiles(query);
     }
 
-    /**
-     * Get File objects for the files currently in the bucket as a readable object stream.
-     * @method getFilesStream
-     * @param {BucketQuery} query
-     * @return {ReadStream}
-     */
+    /** Get File objects for the files currently in the bucket as a readable object stream. */
     getFilesStream(query?: BucketQuery): fs.ReadStream {
         return this.bucket.getFilesStream(query);
     }
 
-    /**
-     * Get the bucket's metadata.
-     * @method getMetadata
-     * @return {Promise<[BucketMetadata, ApiResponse]>}
-     */
+    /** Get the bucket's metadata. */
     getMetadata(): Promise<[BucketMetadata, ApiResponse]> {
         return this.bucket.getMetadata();
     }
 
-    /**
-     * Make the bucket listing private.
-     * @method makePrivate
-     * @param {} options
-     * @return Promise<[File[]]>
-     */
+    /** Make the bucket listing private. */
     makePrivate(options?: BucketPrivacyOptions): Promise<[File[]]> {
         return this.bucket.makePrivate(options);
     }
 
-    /**
-     * Make the bucket publicly readable.
-     * @method makePublic
-     * @param {} options
-     * @return Promise<[File[]]>
-     */
+    /** Make the bucket publicly readable. */
     makePublic(options?: BucketPrivacyOptions): Promise<[File[]]> {
         return this.bucket.makePublic(options);
     }
 
-    /**
-     * Set the bucket's metadata.
-     * @method setMetadata
-     * @param {BucketMetadata} metadata
-     * @return {Promise<[ApiResponse]>}
-     */
+    /** Set the bucket's metadata. */
     setMetadata(metadata?: BucketMetadata): Promise<[ApiResponse]> {
         return this.bucket.setMetadata(metadata);
     }
 
-    /**
-     * Upload a file.
-     * @method upload
-     * @param {localPath} string
-     * @param {UploadOptions} options
-     */
+    /** Upload a file. */
     upload(localPath: string, options?: UploadOptions): Promise<[File]> {
         return this.bucket.upload(localPath, options);
     }
 }
 
-/**
- * The file API wrapper.
- * @class TestFile
- */
+/** The file API wrapper. */
 export class TestFile {
     // the file in the cloud
     file: File;
@@ -239,21 +150,12 @@ export class TestFile {
      * Copy this file to another file.
      * By default, this will copy the file to the same bucket, but you can choose to copy it to another
      * Bucket by providing a Bucket or File object or a URL starting with "gs:// ".
-     * @method copy
-     * @param {string} destination
-     * @return Promise<[File, ApiResponse]>
      */
-
     copy(destination: string | Bucket | File): Promise<[File, ApiResponse]> {
         return this.file.copy(destination);
     }
 
-    /**
-     * Create a unique resumable upload session URI. This is the first step when performing a resumable upload.
-     * @method createResumableUpload
-     * @param {ResumableUploadOptions} options
-     * @return {Promise<[string]}
-     */
+    /** Create a unique resumable upload session URI. This is the first step when performing a resumable upload. */
     createResumableUpload(options?: ResumableUploadOptions): Promise<[string]> {
         return this.file.createResumableUpload(options);
     }
@@ -261,105 +163,57 @@ export class TestFile {
     /**
      * Create a readable stream to read the contents of the remote file.
      * It can be piped to a writable stream or listened to for 'data' events to read a file's contents.
-     * @method createReadStream
-     * @param {ReadStreamOptions} options
-     * @return {ReadStream}
      */
     createReadStream(options?: ReadStreamOptions): fs.ReadStream {
         return this.file.createReadStream(options);
     }
 
-    /**
-     * Create a writable stream to overwrite the contents of the file in your bucket.
-     * @method createWriteStream
-     * @param {WriteStreamOptions} options
-     * @return {WriteStream}
-     */
+    /** Create a writable stream to overwrite the contents of the file in your bucket. */
     createWriteStream(options?: WriteStreamOptions): fs.WriteStream {
         return this.file.createWriteStream(options);
     }
 
-    /**
-     * Delete the file.
-     * @method delete
-     * @return {Promise<[ApiResponse]>}
-     */
+    /** Delete the file. */
     delete(): Promise<[ApiResponse]> {
         return this.file.delete();
     }
 
-    /**
-     * Convenience method to download a file into memory or to a local destination.
-     * @method download
-     * @param {DownloadOptions} options
-     * @return {Promise<[string]>}
-     */
+    /** Convenience method to download a file into memory or to a local destination. */
     download(options?: DownloadOptions): Promise<[Buffer]> {
         return this.file.download(options);
     }
 
-    /**
-     * Check if the file exists.
-     * @method exists
-     * @return {Promise<[boolean]>}
-     */
+    /** Check if the file exists. */
     exists(): Promise<[boolean]> {
         return this.file.exists();
     }
 
-    /**
-     * Get a file object and its metadata if it exists.
-     * @method get
-     * @return {Promise<[File, ApiResponse]>}
-     */
+    /** Get a file object and its metadata if it exists. */
     get(): Promise<[File, ApiResponse]> {
         return this.file.get();
     }
 
-    /**
-     * Get the file's metadata.
-     * @method getMetadata
-     * @return {Promise<[FileMetadata, ApiResponse]>}
-     */
+    /** Get the file's metadata. */
     getMetadata(): Promise<[FileMetadata, ApiResponse]> {
         return this.file.getMetadata();
     }
 
-    /**
-     * Get a signed policy document to allow a user to upload data with a POST request
-     * @method getSignedPolicy
-     * @param {SignedPolicyOptions} options
-     * @return {Promise<[SignedPolicy]>}
-     */
+    /** Get a signed policy document to allow a user to upload data with a POST request */
     getSignedPolicy(options?: SignedPolicyOptions): Promise<[SignedPolicy]> {
         return this.file.getSignedPolicy(options);
     }
 
-    /**
-     * Get a signed URL to allow limited time access to the file
-     * @method getSignedUrl
-     * @param {SignedUrlConfig} config
-     * @return {Promise<[string]>}
-     */
+    /** Get a signed URL to allow limited time access to the file */
     getSignedUrl(config?: SignedUrlConfig): Promise<[string]> {
         return this.file.getSignedUrl(config);
     }
 
-    /**
-     * Make a file private to the project and remove all other permissions.
-     * @method makePrivate
-     * @param {FilePrivateOptions} options
-     * @return {Promise<[ApiResponse]>}
-     */
+    /** Make a file private to the project and remove all other permissions. */
     makePrivate(options?: FilePrivateOptions): Promise<[ApiResponse]> {
         return this.file.makePrivate(options);
     }
 
-    /**
-     * Set a file to be publicly readable and maintain all previous permissions.
-     * @method makePublic
-     * @return {Promise<[ApiResponse]>}
-     */
+    /** Set a file to be publicly readable and maintain all previous permissions. */
     makePublic(): Promise<[ApiResponse]> {
         return this.file.makePublic();
     }
@@ -368,29 +222,17 @@ export class TestFile {
      * Move this file to another location.
      * By default, this will move the file to the same bucket, but you can choose to move it to
      * another Bucket by providing a Bucket or File object or a URL beginning with "gs:// ".
-     * @method move
-     * @param {string|Bucket|File} destination
-     * @return {Promise<[File, ApiResponse]>}
      */
     move(destination: string | Bucket | File): Promise<[File, ApiResponse]> {
         return this.file.move(destination);
     }
 
-    /**
-     * Write arbitrary data to a file.
-     * @param {string} data
-     * @param {WriteStreamOptions} options
-     * @return {Promise<void>}
-     */
+    /** Write arbitrary data to a file. */
     save(data: string, options?: WriteStreamOptions): Promise<void> {
         return this.file.save(data);
     }
 
-    /**
-     * The Storage API allows you to use a custom key for server-side encryption.
-     * @param {string|Buffer} encryptionKey
-     * @return {File}
-     */
+    /** The Storage API allows you to use a custom key for server-side encryption. */
     setEncryptionKey(encryptionKey: string | Buffer): File {
         return this.file.setEncryptionKey(encryptionKey);
     }
@@ -399,9 +241,6 @@ export class TestFile {
      * Merge the given metadata with the current remote file's metadata.
      * This will set metadata if it was previously unset or update previously set metadata.
      * To unset previously set metadata, set its value to null.
-     * @method setMetadata
-     * @param {FileMetadata} metadata
-     * @return {Promise<[ApiResponse]>}
      */
     setMetadata(metadata: FileMetadata): Promise<[ApiResponse]> {
         return this.file.setMetadata(metadata);
diff --git a/types/google-cloud__storage/index.d.ts b/types/google-cloud__storage/index.d.ts
index 55f3b0d3d2..a614ea4982 100644
--- a/types/google-cloud__storage/index.d.ts
+++ b/types/google-cloud__storage/index.d.ts
@@ -134,7 +134,7 @@ declare namespace Storage {
         makePublic(): Promise<[ApiResponse]>;
         move(destination: string | Bucket | File): Promise<[File, ApiResponse]>;
         name: string;
-        save(data: string, options?: WriteStreamOptions): Promise<void>;
+        save(data: string | Buffer, options?: WriteStreamOptions): Promise<void>;
         setEncryptionKey(encryptionKey: string | Buffer): File;
         setMetadata(metadata: FileMetadata): Promise<[ApiResponse]>;
         metadata?: FileMetadata;
@@ -153,6 +153,7 @@ declare namespace Storage {
     interface FileMetadata {
         contentType?: string;
         metadata?: CustomFileMetadata;
+        cacheControl?: string;
     }
 
     /**
diff --git a/types/google-drive-realtime-api/google-drive-realtime-api-tests.ts b/types/google-drive-realtime-api/google-drive-realtime-api-tests.ts
index af2313f147..7eb8708768 100644
--- a/types/google-drive-realtime-api/google-drive-realtime-api-tests.ts
+++ b/types/google-drive-realtime-api/google-drive-realtime-api-tests.ts
@@ -94,7 +94,7 @@ namespace GRealtime {
 	export class MyRealtimeDoc  {
 		protected rtmodel: CollabModel;
 		protected rtdoc: CollabDoc;
-		private myRTLoader = new GRealtime.MyRTLoader();
+		private readonly myRTLoader = new GRealtime.MyRTLoader();
 
 		newFile(title: string,
 		        initializeModel: (x:CollabModel) => void,
diff --git a/types/google-drive-realtime-api/tslint.json b/types/google-drive-realtime-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google-drive-realtime-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google-earth/tslint.json b/types/google-earth/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google-earth/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google-libphonenumber/tslint.json b/types/google-libphonenumber/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google-libphonenumber/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google-maps/tslint.json b/types/google-maps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google-maps/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google-protobuf/google-protobuf-tests.ts b/types/google-protobuf/google-protobuf-tests.ts
index 19421754ac..ee9a1c8d66 100644
--- a/types/google-protobuf/google-protobuf-tests.ts
+++ b/types/google-protobuf/google-protobuf-tests.ts
@@ -93,15 +93,15 @@ class MySimple extends jspb.Message {
       const field = reader.getFieldNumber();
       switch (field) {
         case 1:
-          const value1 = /** @type {string} */ (reader.readString());
+          const value1 = reader.readString();
           msg.setMyString(value1);
           break;
         case 2:
-          const value2 = /** @type {boolean} */ (reader.readBool());
+          const value2 = reader.readBool();
           msg.setMyBool(value2);
           break;
         case 3:
-          const value3 = /** @type {string} */ (reader.readString());
+          const value3 = reader.readString();
           msg.addSomeLabels(value3);
           break;
         case 4:
diff --git a/types/google.analytics/google.analytics-tests.ts b/types/google.analytics/google.analytics-tests.ts
index 945f967dc9..5256f636c7 100644
--- a/types/google.analytics/google.analytics-tests.ts
+++ b/types/google.analytics/google.analytics-tests.ts
@@ -41,14 +41,39 @@ describe('UniversalAnalytics', () => {
     });
     it('should excercise Tracker APIs', () => {
         const tracker: UniversalAnalytics.Tracker = ga.create('UA-65432-1', 'auto');
-        const aString: string = tracker.get<string>('aString');
-        const aNumber: number = tracker.get<number>('aNumber');
-        const anObject: {} = tracker.get<{}>('anObject');
+
+        tracker.get('fieldName');
+
+        tracker.set('aString', 'aString');
+        tracker.set('aNumber', 1);
+        tracker.set('anObject', {});
+        tracker.set({
+            several: 'values',
+            at: 'once'
+        });
+
         tracker.send('pageview');
+        tracker.send('pageview', '/some-path');
         tracker.send('pageview', {some: 'details'});
-        tracker.set('aString', aString);
-        tracker.set('aNumber', aNumber);
-        tracker.set('anObject', anObject);
+    });
+
+    it('should exercise Model APIs', () => {
+        const tracker: UniversalAnalytics.Tracker = ga.create('UA-65432-1', 'auto');
+
+        tracker.set('sendHitTask', (gaHitModel: UniversalAnalytics.Model) => {
+            gaHitModel.get('hitPayload');
+
+            gaHitModel.set('hitCallback', () => console.log('hit sent'), true);
+            gaHitModel.set('hitCallback', () => console.log('hit sent'));
+            gaHitModel.set({
+                hitPayload: 'a=1&b=2',
+                otherField: 3
+            });
+            gaHitModel.set({
+                hitPayload: 'a=1&b=2',
+                otherField: 3
+            }, null, false);
+        });
     });
 });
 
diff --git a/types/google.analytics/index.d.ts b/types/google.analytics/index.d.ts
index c6d188d1cb..b0412a362f 100644
--- a/types/google.analytics/index.d.ts
+++ b/types/google.analytics/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Google Analytics (Classic and Universal)
 // Project: https://developers.google.com/analytics/devguides/collection/gajs/, https://developers.google.com/analytics/devguides/collection/analyticsjs/method-reference
-// Definitions by: Ronnie Haakon Hegelund <http://ronniehegelund.blogspot.dk>, Pat Kujawa <http://patkujawa.com>
+// Definitions by: Ronnie Haakon Hegelund <http://ronniehegelund.blogspot.dk>, Pat Kujawa <http://patkujawa.com>, Tyler Murphy <https://github.com/tyler-murphy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare class Tracker {
@@ -620,12 +620,17 @@ declare namespace UniversalAnalytics {
     }
 
     interface Tracker {
-        get<T>(fieldName: string): T;
-        send(hitType: string, opt_fieldObject?: {}): void;
-        set(fieldName: string, value: string): void;
-        set(fieldName: string, value: {}): void;
-        set(fieldName: string, value: number): void;
-        set(fieldName: string, value: boolean): void;
+        get(fieldName: string): any;
+        set(fieldName: string, fieldValue: any): void;
+        set(fieldsObject: {}): void;
+        send(hitType: string, ...fields: any[]): void;
+        send(hitType: string, fieldsObject: {}): void;
+    }
+
+    interface Model {
+        get(fieldName: string): any;
+        set(fieldName: string, fieldValue: any, temporary?: boolean): void;
+        set(fields: {}, fieldValue?: null, temporary?: boolean): void;
     }
 }
 
diff --git a/types/google.feeds/tslint.json b/types/google.feeds/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google.feeds/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google.geolocation/tslint.json b/types/google.geolocation/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google.geolocation/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google.picker/index.d.ts b/types/google.picker/index.d.ts
index 0341811917..851697cb32 100644
--- a/types/google.picker/index.d.ts
+++ b/types/google.picker/index.d.ts
@@ -122,6 +122,9 @@ declare namespace google {
 
             // Filters the documents based on whether they are starred by the user.
             setStarred(starred:boolean):DocsView;
+
+            // Allows the user to select folders from Team Drives.
+            setEnableTeamDrives(enabled:boolean):DocsView;
         }
 
         /**
@@ -146,6 +149,9 @@ declare namespace google {
 
             // For photo uploads, controls whether per-photo selection (as opposed to per-album) selection is enabled.
             SIMPLE_UPLOAD_ENABLED: string;
+
+            // Whether Team Drive items should be included in results.
+            SUPPORT_TEAM_DRIVES: string;
         };
 
         export var ViewId:{
diff --git a/types/google.picker/tslint.json b/types/google.picker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google.picker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/google.visualization/index.d.ts b/types/google.visualization/index.d.ts
index de893bbdc9..a94ca8dc90 100644
--- a/types/google.visualization/index.d.ts
+++ b/types/google.visualization/index.d.ts
@@ -456,8 +456,8 @@ declare namespace google {
             maxTextLines?: number;
             minTextSpacing?: number;
             showTextEvery?: number;
-            maxValue?: number;
-            minValue?: number;
+            maxValue?: number | Date | number[];
+            minValue?: number | Date | number[];
             viewWindowMode?: string;
             viewWindow?: ChartViewWindow;
         }
@@ -468,8 +468,8 @@ declare namespace google {
         }
 
         export interface ChartViewWindow {
-            max?: number;
-            min?: number;
+            max?: number | Date | number[];
+            min?: number | Date | number[];
         }
 
         export interface ChartTooltip {
@@ -645,6 +645,7 @@ declare namespace google {
             interpolateNulls?: boolean;
             legend?: ChartLegend | 'none';
             lineWidth?: number;
+            min?: number;
             orientation?: string;
             pointSize?: number;
             reverseCategories?: boolean;
@@ -1009,7 +1010,7 @@ declare namespace google {
         export interface TableOptions {
             allowHtml?: boolean;
             alternatingRowStyle?: boolean;
-            cssClassName?: CssClassNames;
+            cssClassNames?: CssClassNames;
             firstRowNumber?: number;
             height?: string;
             page?: string;
diff --git a/types/google.visualization/tslint.json b/types/google.visualization/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/google.visualization/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/googlemaps.infobubble/tslint.json b/types/googlemaps.infobubble/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/googlemaps.infobubble/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 66ddb31f5d..83190d3e28 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Google Maps JavaScript API 3.29
+// Type definitions for Google Maps JavaScript API 3.30
 // Project: https://developers.google.com/maps/
-// Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>, Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>,  Grant Hutchins <https://github.com/nertzy>, Denis Atyasov <https://github.com/xaolas>, Michael McMullin <https://github.com/mrmcnerd>, Martin Costello <https://github.com/martincostello>
+// Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>, Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>,  Grant Hutchins <https://github.com/nertzy>, Denis Atyasov <https://github.com/xaolas>, Michael McMullin <https://github.com/mrmcnerd>, Martin Costello <https://github.com/martincostello>, Sven Kreiss <https://github.com/svenkreiss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*
@@ -2471,10 +2471,18 @@ declare namespace google.maps {
             description: string;
             matched_substrings: PredictionSubstring[];
             place_id: string;
+            reference: string;
+            structured_formatting: AutocompleteStructuredFormatting;
             terms: PredictionTerm[];
             types: string[];
         }
 
+        export interface AutocompleteStructuredFormatting {
+            main_text: string;
+            main_text_matched_substrings: PredictionSubstring[];
+            secondary_text: string;
+        }
+
         export interface OpeningHours {
             open_now: boolean;
             periods: OpeningPeriod[];
@@ -2607,7 +2615,7 @@ declare namespace google.maps {
             getDetails(request: PlaceDetailsRequest, callback: (result: PlaceResult, status: PlacesServiceStatus) => void): void;
             nearbySearch(request: PlaceSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void): void;
             radarSearch(request: RadarSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
-            textSearch(request: TextSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
+            textSearch(request: TextSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void): void;
         }
 
         export enum PlacesServiceStatus {
@@ -2697,7 +2705,7 @@ declare namespace google.maps {
              * Accepted values are 'marker', 'polygon', 'polyline', 'rectangle', 'circle', or null. A drawing mode
              * of null means that the user can interact with the map as normal, and clicks do not draw anything.
              */
-            drawingMode?: OverlayType;
+            drawingMode?: OverlayType | null;
             /**
              * The Map to which the DrawingManager is attached, which is the Map on which the overlays created
              * will be placed.
diff --git a/types/googlemaps/tslint.json b/types/googlemaps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/googlemaps/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index b8b1e362e1..f76a907b7d 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: BendingBender <https://github.com/BendingBender>
 //                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 
@@ -69,7 +69,6 @@ declare const got: got.GotFn &
     };
 
 declare namespace got {
-    // tslint:disable unified-signatures
     interface GotFn {
         (url: GotUrl): GotPromise<string>;
         (url: GotUrl, options: GotJSONOptions): GotPromise<any>;
@@ -78,7 +77,6 @@ declare namespace got {
         (url: GotUrl, options: GotBodyOptions<string>): GotPromise<string>;
         (url: GotUrl, options: GotBodyOptions<null>): GotPromise<Buffer>;
     }
-    // tslint:enable unified-signatures
 
     type GotStreamFn = (url: GotUrl, options?: GotOptions<string | null>) => GotEmitter & nodeStream.Duplex;
 
diff --git a/types/got/tslint.json b/types/got/tslint.json
index 3db14f85ea..4a4f94c041 100644
--- a/types/got/tslint.json
+++ b/types/got/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "unified-signatures": false
+    }
+}
diff --git a/types/graceful-fs/index.d.ts b/types/graceful-fs/index.d.ts
index 2b31db0668..69e7a5dce9 100644
--- a/types/graceful-fs/index.d.ts
+++ b/types/graceful-fs/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/graham_scan/tslint.json b/types/graham_scan/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/graham_scan/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/graphene-pk11/graphene-pk11-tests.ts b/types/graphene-pk11/graphene-pk11-tests.ts
deleted file mode 100644
index e0ad0fa2c3..0000000000
--- a/types/graphene-pk11/graphene-pk11-tests.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-
-import * as graphene from "graphene-pk11";
-let Module = graphene.Module;
-
-let lib = "/usr/local/lib/softhsm/libsofthsm2.so";
-
-let mod = Module.load(lib, "SoftHSM");
-mod.initialize();
-
-let slot = mod.getSlots(0);
-if (slot.flags & graphene.SlotFlag.TOKEN_PRESENT) {
-    let session = slot.open();
-    session.login("12345");
-
-    // generate EC key
-    let keys = session.generateKeyPair(graphene.KeyGenMechanism.ECDSA, {
-        keyType: graphene.KeyType.ECDSA,
-        token: false,
-        derive: true,
-        paramsECDSA: graphene.NamedCurve.getByName("secp192r1").value
-    }, {
-            keyType: graphene.KeyType.ECDSA,
-            token: false,
-            derive: true
-        });
-
-    // derive algorithm
-    let alg = {
-        name: "ECDH1_DERIVE",
-        params: new graphene.EcdhParams(
-            graphene.EcKdf.SHA1,
-            null,
-            keys.publicKey.getAttribute({ pointEC: null }).pointEC)
-    };
-
-    // Template for derived key
-    let template = {
-        "class": graphene.ObjectClass.SECRET_KEY,
-        "token": false,
-        "keyType": graphene.KeyType.AES,
-        "valueLen": 256 / 8,
-        "encrypt": true,
-        "decrypt": true
-    };
-
-    // Key derivation
-    let dKey = session.deriveKey(alg, keys.privateKey, template);
-    console.log("Derived key handle:", dKey.handle);
-
-    session.logout();
-    session.close();
-}
-else {
-    console.error("Slot is not initialized");
-}
-
-mod.finalize();
\ No newline at end of file
diff --git a/types/graphene-pk11/index.d.ts b/types/graphene-pk11/index.d.ts
deleted file mode 100644
index a31e4e0812..0000000000
--- a/types/graphene-pk11/index.d.ts
+++ /dev/null
@@ -1,2273 +0,0 @@
-// Type definitions for graphene-pk11 v2.0.3
-// Project: https://github.com/PeculiarVentures/graphene
-// Definitions by: Stepan Miroshin <https://github.com/microshine>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-/**
- * A simple layer for interacting with PKCS #11 / PKCS11 / CryptoKI for Node
- * v2.0.3
- */
-
-import * as pkcs11 from "pkcs11js";
-
-type Handle = Buffer;
-type CryptoData = string | Buffer;
-
-declare class Pkcs11Error extends Error {
-    code: number;
-    func: string;
-    constructor(code: number, func: string);
-}
-
-declare class BaseObject {
-    protected lib: pkcs11.PKCS11;
-    constructor(lib?: pkcs11.PKCS11);
-}
-
-declare class HandleObject extends BaseObject {
-    /**
-     * handle to pkcs11 object
-     */
-    handle: Handle;
-
-    constructor(handle: Handle, lib: pkcs11.PKCS11);
-
-    protected getInfo(): void;
-}
-
-declare class Collection<T extends BaseObject> extends BaseObject {
-
-    protected items_: Array<any>;
-    protected classType: any;
-
-    /**
-     * returns length of collection
-     */
-    length: number;
-
-    constructor(items: Array<any>, lib: pkcs11.PKCS11, classType: any);
-
-    /**
-     * returns item from collection by index
-     * @param {number} index of element in collection `[0..n]`
-     */
-    items(index: number): T;
-}
-
-declare function isString(v: any): boolean;
-declare function isNumber(v: any): boolean;
-declare function isBoolean(v: any): boolean;
-declare function isUndefined(v: any): boolean;
-declare function isNull(v: any): boolean;
-declare function isEmpty(v: any): boolean;
-declare function isFunction(v: any): boolean;
-declare function isObject(v: any): boolean;
-declare function isArray(v: any): boolean;
-declare function isFlag(v: any, fv: number): boolean;
-declare function dateFromString(text: string): Date;
-
-// ========== Crypto ==========
-
-declare class Cipher extends BaseObject {
-
-    session: Session;
-
-    constructor(session: Session, alg: MechanismType, key: Key, lib: pkcs11.PKCS11);
-
-    protected init(alg: MechanismType, key: Key): void;
-
-    update(data: CryptoData): Buffer;
-    final(): Buffer;
-    once(data: CryptoData, enc: Buffer): Buffer;
-    once(data: CryptoData, enc: Buffer, cb: (error: Error, data: Buffer) => void): void;
-}
-
-declare class Decipher extends BaseObject {
-
-    protected session: Session;
-    protected blockSize: number;
-
-    constructor(session: Session, alg: MechanismType, key: Key, blockSize: number, lib: pkcs11.PKCS11);
-
-    protected init(alg: MechanismType, key: Key): void;
-
-    update(data: Buffer): Buffer;
-    final(): Buffer;
-    once(data: Buffer, dec: Buffer): Buffer;
-    once(data: Buffer, dec: Buffer, cb: (error: Error, data: Buffer) => void): void;
-}
-
-declare class Digest extends BaseObject {
-
-    session: Session;
-
-    constructor(session: Session, alg: MechanismType, lib: pkcs11.PKCS11);
-
-    protected init(alg: MechanismType): void;
-
-    update(data: CryptoData): void;
-    final(): Buffer;
-    once(data: CryptoData): Buffer;
-    once(data: CryptoData, cb: (error: Error, data: Buffer) => void): void;
-}
-
-declare class Sign extends BaseObject {
-
-    session: Session;
-
-    constructor(session: Session, alg: MechanismType, key: Key, lib: pkcs11.PKCS11);
-
-    protected init(alg: MechanismType, key: Key): void;
-
-    update(data: CryptoData): void;
-    final(): Buffer;
-    once(data: CryptoData): Buffer;
-    once(data: CryptoData, cb: (error: Error, data: Buffer) => void): void;
-}
-
-declare class Verify extends BaseObject {
-
-    session: Session;
-
-    constructor(session: Session, alg: MechanismType, key: Key, lib: pkcs11.PKCS11);
-
-    protected init(alg: MechanismType, key: Key): void;
-
-    update(data: CryptoData): void;
-    final(signature: Buffer): boolean;
-    once(data: CryptoData, signature: Buffer): boolean;
-    once(data: CryptoData, signature: Buffer, cb: (error: Error, valid: boolean) => void): void;
-}
-
-// ========== Keys ==========
-
-interface IParams {
-    toCKI(): any;
-}
-
-declare enum MechParams {
-    AesCBC,
-    AesCCM,
-    AesGCM,
-    RsaOAEP,
-    RsaPSS,
-    EcDH,
-}
-
-// AES
-
-declare class AesCbcParams implements IParams, pkcs11.AesCBC {
-    /**
-     * initialization vector
-     * - must have a fixed size of 16 bytes
-     */
-    iv: Buffer;
-    /**
-     * the data
-     */
-    data: Buffer;
-    type: MechParams;
-    constructor(iv: Buffer, data?: Buffer);
-    toCKI(): Buffer;
-}
-
-declare class AesCcmParams implements IParams {
-    /**
-     * length of the data where 0 <= dataLength < 2^8L
-     */
-    dataLength: number;
-    /**
-     * the nonce
-     */
-    nonce: Buffer;
-    /**
-     * the additional authentication data
-     * - This data is authenticated but not encrypted
-     */
-    aad: Buffer;
-    /**
-     * length of authentication tag (output following cipher text) in bits.
-     * - Can be any value between 0 and 128
-     */
-    macLength: number;
-    type: MechParams;
-    constructor(dataLength: number, nonce: Buffer, aad?: Buffer, macLength?: number);
-    toCKI(): pkcs11.AesCCM;
-}
-
-declare class AesGcmParams implements IParams {
-    /**
-     * initialization vector
-     * - The length of the initialization vector can be any number between 1 and 256.
-     * 96-bit (12 byte) IV values can be processed more efficiently,
-     * so that length is recommended for situations in which efficiency is critical.
-     */
-    iv: Buffer;
-    /**
-     * pointer to additional authentication data.
-     * This data is authenticated but not encrypted.
-     */
-    aad: Buffer;
-    /**
-     * length of authentication tag (output following cipher text) in bits.
-     * Can be any value between 0 and 128. Default 128
-     */
-    tagBits: number;
-    type: MechParams;
-    constructor(iv: Buffer, aad?: Buffer, tagBits?: number);
-    toCKI(): pkcs11.AesGCM;
-}
-
-// EC
-
-interface INamedCurve {
-    name: string;
-    oid: string;
-    value: Buffer;
-    size: number;
-}
-
-declare class NamedCurve {
-    static getByName(name: string): INamedCurve;
-    static getByOid(oid: string): INamedCurve;
-}
-
-declare enum EcKdf {
-    NULL,
-    SHA1,
-    SHA224,
-    SHA256,
-    SHA384,
-    SHA512,
-}
-
-declare class EcdhParams implements IParams, pkcs11.ECDH1 {
-    /**
-     * key derivation function used on the shared secret value
-     */
-    kdf: EcKdf;
-    /**
-     * some data shared between the two parties
-     */
-    sharedData: Buffer;
-    /**
-     * other party's EC public key value
-     */
-    publicData: Buffer;
-    type: MechParams;
-    /**
-     * Creates an instance of EcdhParams.
-     *
-     * @param {EcKdf} kdf key derivation function used on the shared secret value
-     * @param {Buffer} [sharedData=null] some data shared between the two parties
-     * @param {Buffer} [publicData=null] other party's EC public key value
-     */
-    constructor(kdf: EcKdf, sharedData?: Buffer, publicData?: Buffer);
-    toCKI(): pkcs11.ECDH1;
-}
-
-// Rsa
-
-declare enum RsaMgf {
-    MGF1_SHA1,
-    MGF1_SHA224,
-    MGF1_SHA256,
-    MGF1_SHA384,
-    MGF1_SHA512,
-}
-
-declare class RsaOaepParams implements IParams {
-    hashAlgorithm: MechanismEnum;
-    mgf: RsaMgf;
-    source: number;
-    sourceData: Buffer;
-    type: MechParams;
-    constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, sourceData?: Buffer);
-    toCKI(): pkcs11.RsaOAEP;
-}
-
-declare class RsaPssParams implements IParams {
-    /**
-     * hash algorithm used in the PSS encoding;
-     * - if the signature mechanism does not include message hashing,
-     * then this value must be the mechanism used by the application to generate
-     * the message hash;
-     * - if the signature mechanism includes hashing,
-     * then this value must match the hash algorithm indicated
-     * by the signature mechanism
-     */
-    hashAlgorithm: MechanismEnum;
-    /**
-     * mask generation function to use on the encoded block
-     */
-    mgf: RsaMgf;
-    /**
-     * length, in bytes, of the salt value used in the PSS encoding;
-     * - typical values are the length of the message hash and zero
-     */
-    saltLength: number;
-    type: MechParams;
-    constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, saltLen?: number);
-    toCKI(): pkcs11.RsaPSS;
-}
-
-// ========== Objects ==========
-
-declare enum ObjectClass {
-    DATA,
-    CERTIFICATE,
-    PUBLIC_KEY,
-    PRIVATE_KEY,
-    SECRET_KEY,
-    HW_FEATURE,
-    DOMAIN_PARAMETERS,
-    MECHANISM,
-    OTP_KEY,
-}
-
-declare class SessionObject extends HandleObject {
-    /**
-     * Session
-     */
-    session: Session;
-    /**
-     * gets the size of an object in bytes
-     *
-     * @readonly
-     * @type {number}
-     */
-    size: number;
-    class: ObjectClass;
-
-    /**
-     * Creates an instance of SessionObject.
-     *
-     * @param {SessionObject} object
-     */
-    constructor(object: SessionObject);
-    /**
-     * Creates an instance of SessionObject.
-     *
-     * @param {Handle} handle
-     * @param {Session} session
-     * @param {pkcs11.PKCS11} lib
-     */
-    constructor(handle: Handle, session: Session, lib: pkcs11.PKCS11);
-    constructor(handle: SessionObject);
-
-    /**
-     * copies an object, creating a new object for the copy
-     *
-     * @param {ITemplate} template template for the new object
-     * @returns {SessionObject}
-     */
-    copy(template: ITemplate): SessionObject;
-    /**
-     * destroys an object
-     */
-    destroy(): void;
-    getAttribute(attr: string): ITemplate;
-    getAttribute(attrs: ITemplate): ITemplate;
-    setAttribute(attrs: string, value: any): void;
-    setAttribute(attrs: ITemplate): void;
-    get(name: string): any;
-    set(name: string, value: any): void;
-    toType<T extends SessionObject>(): T;
-}
-
-declare class SessionObjectCollection extends Collection<SessionObject> {
-    session: Session;
-
-    constructor(items: Array<Handle>, session: Session, lib: pkcs11.PKCS11, classType?: any);
-
-    items(index: number): SessionObject;
-}
-
-declare class Storage extends SessionObject {
-    /**
-     * `true` if object is a token object;
-     * `false` if object is a session object. Default is `false`.
-     */
-    token: boolean;
-    /**
-     * `true` if object is a private object;
-     * `false` if object is a public object.
-     * Default value is token-specific, and may depend on the values of other attributes of the object.
-     */
-    private: boolean;
-    /**
-     * `true` if object can be modified. Default is `false`
-     */
-    modifiable: boolean;
-    /**
-     * Description of the object (default empty)
-     */
-    label: string;
-}
-
-/**
- * Data objects (object declare class `CKO_DATA`) hold information defined by an application.
- * Other than providing access to it, Cryptoki does not attach any special meaning to a data object
- *
- * @export
- * @declare class Data
- * @extends {Storage}
- */
-declare class Data extends Storage {
-    /**
-     * Description of the application that manages the object (default empty)
-     *
-     * @type {string}
-     */
-    application: string;
-    /**
-     * DER-encoding of the object identifier indicating the data object type (default empty)
-     *
-     * @type {Buffer}
-     */
-    objectId: Buffer;
-    /**
-     * Value of the object (default empty)
-     *
-     * @type {Buffer}
-     */
-    value: Buffer;
-}
-
-declare class DomainParameters extends Storage {
-    /**
-     * Type of key the domain parameters can be used to generate.
-     */
-    keyType: KeyType;
-    /**
-     * `CK_TRUE` only if domain parameters were either * generated locally (i.e., on the token)
-     * with a `C_GenerateKey` * created with a `C_CopyObject` call as a copy of domain parameters
-     * which had its `CKA_LOCAL` attribute set to `CK_TRUE`
-     */
-    local: boolean;
-}
-
-declare enum KeyType {
-    RSA,
-    DSA,
-    DH,
-    ECDSA,
-    EC,
-    X9_42_DH,
-    KEA,
-    GENERIC_SECRET,
-    RC2,
-    RC4,
-    DES,
-    DES2,
-    DES3,
-    CAST,
-    CAST3,
-    CAST5,
-    CAST128,
-    RC5,
-    IDEA,
-    SKIPJACK,
-    BATON,
-    JUNIPER,
-    CDMF,
-    AES,
-    GOSTR3410,
-    GOSTR3411,
-    GOST28147,
-    BLOWFISH,
-    TWOFISH,
-    SECURID,
-    HOTP,
-    ACTI,
-    CAMELLIA,
-    ARIA,
-}
-declare enum KeyGenMechanism {
-    AES,
-    RSA,
-    RSA_X9_31,
-    DSA,
-    DH_PKCS,
-    DH_X9_42,
-    GOSTR3410,
-    GOST28147,
-    RC2,
-    RC4,
-    DES,
-    DES2,
-    SECURID,
-    ACTI,
-    CAST,
-    CAST3,
-    CAST5,
-    CAST128,
-    RC5,
-    IDEA,
-    GENERIC_SECRET,
-    SSL3_PRE_MASTER,
-    CAMELLIA,
-    ARIA,
-    SKIPJACK,
-    KEA,
-    BATON,
-    ECDSA,
-    EC,
-    JUNIPER,
-    TWOFISH,
-}
-
-/**
- * Definition for the base key object declare class
- * - defines the object declare class `CKO_PUBLIC_KEY`, `CKO_PRIVATE_KEY` and `CKO_SECRET_KEY` for type `CK_OBJECT_CLASS`
- * as used in the `CKA_CLASS` attribute of objects
- */
-declare class Key extends Storage {
-    /**
-     * Type of key
-     * - Must be specified when object is created with `C_CreateObject`
-     * - Must be specified when object is unwrapped with `C_UnwrapKey`
-     */
-    type: KeyType;
-    /**
-     * Key identifier for key (default empty)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification
-     * of the attribute during the course of a `C_CopyObject` call.
-     */
-    id: Buffer;
-    /**
-     * Start date for the key (default empty)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification
-     * of the attribute during the course of a `C_CopyObject` call.
-     */
-    startDate: Date;
-    /**
-     * End date for the key (default empty)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification
-     * of the attribute during the course of a `C_CopyObject` call.
-     */
-    endDate: Date;
-    /**
-     * `CK_TRUE` if key supports key derivation
-     * (i.e., if other keys can be derived from this one (default `CK_FALSE`)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification
-     * of the attribute during the course of a `C_CopyObject` call.
-     * @returns boolean
-     */
-    derive: boolean;
-    /**
-     * `CK_TRUE` only if key was either * generated locally (i.e., on the token)
-     * with a `C_GenerateKey` or `C_GenerateKeyPair` call * created with a `C_CopyObject` call
-     * as a copy of a key which had its `CKA_LOCAL` attribute set to `CK_TRUE`
-     * - Must not be specified when object is created with `C_CreateObject`.
-     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-     */
-    local: boolean;
-    /**
-     * Identifier of the mechanism used to generate the key material.
-     * - Must not be specified when object is created with `C_CreateObject`.
-     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-     */
-    mechanism: KeyGenMechanism;
-    allowedMechanisms: void;
-}
-
-/**
- * Private key objects (object declare class `CKO_PRIVATE_KEY`) hold private keys
- */
-declare class PrivateKey extends Key {
-    /**
-     * DER-encoding of the key subject name (default empty)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     */
-    subject: Buffer;
-    /**
-     * `CK_TRUE` if key is sensitive
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Attribute cannot be changed once set to CK_TRUE. It becomes a read only attribute.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    sensitive: boolean;
-    /**
-     * `CK_TRUE` if key supports decryption
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    decrypt: boolean;
-    /**
-     * `CK_TRUE` if key supports signatures where the signature is an appendix to the data
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    sign: boolean;
-    /**
-     * `CK_TRUE` if key supports signatures where the data can be recovered from the signature
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    signRecover: boolean;
-    /**
-     * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    unwrap: boolean;
-    /**
-     * `CK_TRUE` if key is extractable and can be wrapped
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    extractable: boolean;
-    /**
-     * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
-     * - Must not be specified when object is created with `C_CreateObject`.
-     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-     */
-    alwaysSensitive: boolean;
-    /**
-     * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
-     * - Must not be specified when object is created with `C_CreateObject`.
-     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-     */
-    neverExtractable: boolean;
-    /**
-     * `CK_TRUE` if the key can only be wrapped with a wrapping key
-     * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
-     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-     */
-    wrapTrusted: boolean;
-    /**
-     * For wrapping keys. The attribute template to apply to any keys unwrapped
-     * using this wrapping key. Any user supplied template is applied after this template
-     * as if the object has already been created.
-     */
-    template: void;
-    alwaysAuthenticate: boolean;
-}
-
-/**
- * Public key objects (object declare class CKO_PUBLIC_KEY) hold public keys
- */
-declare class PublicKey extends Key {
-    /**
-     * DER-encoding of the key subject name (default empty)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     */
-    subject: Buffer;
-    /**
-     * `CK_TRUE` if key supports encryption
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    encrypt: boolean;
-    /**
-     * `CK_TRUE` if key supports verification where the signature is an appendix to the data
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    verify: boolean;
-    /**
-     * `CK_TRUE` if key supports verification where the data is recovered from the signature
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    verifyRecover: boolean;
-    /**
-     * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    wrap: boolean;
-    /**
-     * The key can be trusted for the application that it was created.
-     * - The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
-     * - Can only be set to CK_TRUE by the SO user.
-     */
-    trusted: boolean;
-    /**
-     * For wrapping keys. The attribute template to match against any keys wrapped using this wrapping key.
-     * Keys that do not match cannot be wrapped.
-     */
-    template: void;
-}
-
-/**
- * Secret key objects (object declare class `CKO_SECRET_KEY`) hold secret keys.
- */
-declare class SecretKey extends Key {
-    /**
-     * `CK_TRUE` if key is sensitive
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-     */
-    sensitive: boolean;
-    /**
-     * `CK_TRUE` if key supports encryption
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    encrypt: boolean;
-    /**
-     * `CK_TRUE` if key supports decryption
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    decrypt: boolean;
-    /**
-     * `CK_TRUE` if key supports verification (i.e., of authentication codes) where the signature is an appendix to the data
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    verify: boolean;
-    /**
-     * 	`CK_TRUE` if key supports signatures (i.e., authentication codes) where the signature is an appendix to the data
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    sign: boolean;
-    /**
-     * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    wrap: boolean;
-    /**
-     * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    unwrap: boolean;
-    /**
-     * `CK_TRUE` if key is extractable and can be wrapped
-     * - May be modified after object is created with a `C_SetAttributeValue` call,
-     * or in the process of copying object with a `C_CopyObject` call.
-     * However, it is possible that a particular token may not permit modification of the attribute
-     * during the course of a `C_CopyObject` call.
-     * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
-     * - Default value is token-specific, and may depend on the values of other attributes.
-     */
-    extractable: boolean;
-    /**
-     * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
-     * - Must not be specified when object is created with `C_CreateObject`.
-     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-     */
-    alwaysSensitive: boolean;
-    /**
-     * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
-     * - Must not be specified when object is created with `C_CreateObject`.
-     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-     */
-    neverExtractable: boolean;
-    /**
-     * Key checksum
-     */
-    checkValue: Buffer;
-    /**
-     * `CK_TRUE` if the key can only be wrapped with a wrapping key
-     * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
-     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-     */
-    wrapTrusted: boolean;
-    /**
-     * The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
-     * - Can only be set to CK_TRUE by the SO user.
-     */
-    trusted: boolean;
-    /**
-     * For wrapping keys.
-     * The attribute template to match against any keys wrapped using this wrapping key.
-     * Keys that do not match cannot be wrapped.
-     */
-    wrapTemplate: void;
-    /**
-     * For wrapping keys.
-     * The attribute template to apply to any keys unwrapped using this wrapping key.
-     * Any user supplied template is applied after this template as if the object has already been created.
-     */
-    unwrapTemplate: void;
-}
-
-declare enum CertificateType {
-    X_509,
-    X_509_ATTR_CERT,
-    WTLS,
-}
-
-declare enum CertificateCategory {
-    Unspecified,
-    TokenUser,
-    Authority,
-    OtherEntity,
-}
-
-/**
- * Certificate objects (object declare class CKO_CERTIFICATE) hold public-key or attribute certificates
- */
-declare class Certificate extends Storage {
-    /**
-     * Type of certificate
-     */
-    type: CertificateType;
-    /**
-     * The certificate can be trusted for the application that it was created.
-     */
-    trusted: boolean;
-    /**
-     * Categorization of the certificate
-     */
-    category: CertificateCategory;
-    /**
-     * Checksum
-     */
-    checkValue: Buffer;
-    /**
-     * Start date for the certificate (default empty)
-     */
-    startDate: Date;
-    /**
-     * End date for the certificate (default empty)
-     */
-    endDate: Date;
-}
-
-/**
- * X.509 attribute certificate objects (certificate type `CKC_X_509_ATTR_CERT`) hold X.509 attribute certificates
- */
-declare class AttributeCertificate extends Certificate {
-    /**
-     * DER-encoding of the attribute certificate's subject field.
-     * This is distinct from the `CKA_SUBJECT` attribute contained in `CKC_X_509` certificates
-     * because the `ASN.1` syntax and encoding are different.
-     * - Must be specified when the object is created
-     */
-    owner: Buffer;
-    /**
-     * DER-encoding of the attribute certificate's issuer field.
-     * This is distinct from the `CKA_ISSUER` attribute contained in `CKC_X_509` certificates
-     * because the ASN.1 syntax and encoding are different. (default empty)
-     */
-    issuer: Buffer;
-    /**
-     * DER-encoding of the certificate serial number (default empty)
-     */
-    serialNumber: Buffer;
-    /**
-     * BER-encoding of a sequence of object identifier values corresponding
-     * to the attribute types contained in the certificate.
-     * When present, this field offers an opportunity for applications
-     * to search for a particular attribute certificate without fetching
-     * and parsing the certificate itself. (default empty)
-     */
-    types: Buffer;
-    /**
-     * BER-encoding of the certificate
-     * - Must be specified when the object is created.
-     */
-    value: Buffer;
-}
-
-/**
- * WTLS certificate objects (certificate type `CKC_WTLS`) hold WTLS public key certificates
- */
-declare class WtlsCertificate extends Certificate {
-    /**
-     * WTLS-encoding (Identifier type) of the certificate subject
-     * - Must be specified when the object is created.
-     * - Can only be empty if `CKA_VALUE` is empty.
-     */
-    subject: Buffer;
-    /**
-     * WTLS-encoding (Identifier type) of the certificate issuer (default empty)
-     */
-    issuer: Buffer;
-    /**
-     * Key identifier for public/private key pair (default empty)
-     */
-    id: Buffer;
-    /**
-     * WTLS-encoding of the certificate
-     * - Must be specified when the object is created.
-     * - Must be non-empty if `CKA_URL` is empty.
-     */
-    value: Buffer;
-    /**
-     * If not empty this attribute gives the URL where the complete certificate
-     * can be obtained (default empty)
-     * - Must be non-empty if `CKA_VALUE` is empty
-     */
-    url: string;
-    /**
-     * DER-encoding of the certificate serial number (default empty)
-     */
-    serialNumber: Buffer;
-    /**
-     * SHA-1 hash of the subject public key (default empty)
-     * - Can only be empty if `CKA_URL` is empty.
-     */
-    subjetcKeyIdentifier: Buffer;
-    /**
-     * SHA-1 hash of the issuer public key (default empty)
-     * - Can only be empty if `CKA_URL` is empty.
-     */
-    authorityKeyIdentifier: Buffer;
-}
-
-declare enum JavaMIDP {
-    Unspecified,
-    Manufacturer,
-    Operator,
-    ThirdParty,
-}
-
-/**
- * X.509 certificate objects (certificate type `CKC_X_509`) hold X.509 public key certificates
- */
-declare class X509Certificate extends Certificate {
-    /**
-     * DER-encoding of the certificate subject name
-     * - Must be specified when the object is created.
-     * - Must be non-empty if `CKA_URL` is empty.
-     */
-    subject: Buffer;
-    /**
-     * Key identifier for public/private key pair (default empty)
-     */
-    id: Buffer;
-    /**
-     * DER-encoding of the certificate issuer name (default empty)
-     */
-    issuer: Buffer;
-    /**
-     * HEX-encoding of the certificate serial number (default empty)
-     */
-    serialNumber: string;
-    /**
-     * BER-encoding of the certificate
-     * - Must be specified when the object is created.
-     * - Must be non-empty if `CKA_URL` is empty.
-     */
-    value: Buffer;
-    /**
-     * If not empty this attribute gives the URL where the complete certificate
-     * can be obtained (default empty)
-     * - Must be non-empty if `CKA_VALUE` is empty
-     */
-    url: string;
-    /**
-     * SHA-1 hash of the subject public key (default empty)
-     * - Can only be empty if `CKA_URL` is empty.
-     */
-    subjetcKeyIdentifier: Buffer;
-    /**
-     * SHA-1 hash of the issuer public key (default empty)
-     * - Can only be empty if `CKA_URL` is empty.
-     */
-    authorityKeyIdentifier: Buffer;
-    /**
-     * Java MIDP security domain
-     */
-    java: JavaMIDP;
-}
-
-interface IAlgorithm {
-    name: string;
-    params: Buffer | IParams;
-}
-
-type MechanismType = MechanismEnum | KeyGenMechanism | IAlgorithm | string;
-
-declare enum MechanismFlag {
-    /**
-     * `True` if the mechanism is performed by the device; `false` if the mechanism is performed in software
-     */
-    HW,
-    /**
-     * `True` if the mechanism can be used with encrypt function
-     */
-    ENCRYPT,
-    /**
-     * `True` if the mechanism can be used with decrypt function
-     */
-    DECRYPT,
-    /**
-     * `True` if the mechanism can be used with digest function
-     */
-    DIGEST,
-    /**
-     * `True` if the mechanism can be used with sign function
-     */
-    SIGN,
-    /**
-     * `True` if the mechanism can be used with sign recover function
-     */
-    SIGN_RECOVER,
-    /**
-     * `True` if the mechanism can be used with verify function
-     */
-    VERIFY,
-    /**
-     * `True` if the mechanism can be used with verify recover function
-     */
-    VERIFY_RECOVER,
-    /**
-     * `True` if the mechanism can be used with geberate function
-     */
-    GENERATE,
-    /**
-     * `True` if the mechanism can be used with generate key pair function
-     */
-    GENERATE_KEY_PAIR,
-    /**
-     * `True` if the mechanism can be used with wrap function
-     */
-    WRAP,
-    /**
-     * `True` if the mechanism can be used with unwrap function
-     */
-    UNWRAP,
-    /**
-     * `True` if the mechanism can be used with derive function
-     */
-    DERIVE,
-}
-
-declare class Mechanism extends BaseObject {
-
-    protected handle: number;
-    protected slotHandle: Handle;
-
-    /**
-     * the minimum size of the key for the mechanism
-     * _whether this is measured in bits or in bytes is mechanism-dependent_
-     */
-    minKeySize: number;
-    /**
-     * the maximum size of the key for the mechanism
-     * _whether this is measured in bits or in bytes is mechanism-dependent_
-     */
-    maxKeySize: number;
-    /**
-     * bit flag specifying mechanism capabilities
-     */
-    flags: number;
-    /**
-     * returns string name from MechanismEnum
-     */
-    name: string;
-
-    constructor(handle: number, slotHandle: Handle, lib: pkcs11.PKCS11);
-
-    protected getInfo(): void;
-
-    static create(alg: MechanismType): pkcs11.Mechanism;
-    static vendor(jsonFile: string): void;
-    static vendor(name: string, value: number): void;
-}
-
-declare class MechanismCollection extends Collection<Mechanism> {
-
-    protected slotHandle: Handle;
-
-    constructor(items: Array<number>, slotHandle: Handle, lib: pkcs11.PKCS11, classType?: typeof Mechanism);
-    /**
-     * returns item from collection by index
-     * @param {number} index of element in collection `[0..n]`
-     */
-    items(index: number): Mechanism;
-}
-
-declare enum MechanismEnum {
-    RSA_PKCS_KEY_PAIR_GEN,
-    RSA_PKCS,
-    RSA_9796,
-    RSA_X_509,
-    MD2_RSA_PKCS,
-    MD5_RSA_PKCS,
-    SHA1_RSA_PKCS,
-    RIPEMD128_RSA_PKCS,
-    RIPEMD160_RSA_PKCS,
-    RSA_PKCS_OAEP,
-    RSA_X9_31_KEY_PAIR_GEN,
-    RSA_X9_31,
-    SHA1_RSA_X9_31,
-    RSA_PKCS_PSS,
-    SHA1_RSA_PKCS_PSS,
-    DSA_KEY_PAIR_GEN,
-    DSA,
-    DSA_SHA1,
-    DSA_SHA224,
-    DSA_SHA256,
-    DSA_SHA384,
-    DSA_SHA512,
-    DH_PKCS_KEY_PAIR_GEN,
-    DH_PKCS_DERIVE,
-    X9_42_DH_KEY_PAIR_GEN,
-    X9_42_DH_DERIVE,
-    X9_42_DH_HYBRID_DERIVE,
-    X9_42_MQV_DERIVE,
-    SHA256_RSA_PKCS,
-    SHA384_RSA_PKCS,
-    SHA512_RSA_PKCS,
-    SHA256_RSA_PKCS_PSS,
-    SHA384_RSA_PKCS_PSS,
-    SHA512_RSA_PKCS_PSS,
-    SHA224_RSA_PKCS,
-    SHA224_RSA_PKCS_PSS,
-    RC2_KEY_GEN,
-    RC2_ECB,
-    RC2_CBC,
-    RC2_MAC,
-    RC2_MAC_GENERAL,
-    RC2_CBC_PAD,
-    RC4_KEY_GEN,
-    RC4,
-    DES_KEY_GEN,
-    DES_ECB,
-    DES_CBC,
-    DES_MAC,
-    DES_MAC_GENERAL,
-    DES_CBC_PAD,
-    DES2_KEY_GEN,
-    DES3_KEY_GEN,
-    DES3_ECB,
-    DES3_CBC,
-    DES3_MAC,
-    DES3_MAC_GENERAL,
-    DES3_CBC_PAD,
-    CDMF_KEY_GEN,
-    CDMF_ECB,
-    CDMF_CBC,
-    CDMF_MAC,
-    CDMF_MAC_GENERAL,
-    CDMF_CBC_PAD,
-    DES_OFB64,
-    DES_OFB8,
-    DES_CFB64,
-    DES_CFB8,
-    MD2,
-    MD2_HMAC,
-    MD2_HMAC_GENERAL,
-    MD5,
-    MD5_HMAC,
-    MD5_HMAC_GENERAL,
-    SHA1,
-    SHA,
-    SHA_1,
-    SHA_1_HMAC,
-    SHA_1_HMAC_GENERAL,
-    RIPEMD128,
-    RIPEMD128_HMAC,
-    RIPEMD128_HMAC_GENERAL,
-    RIPEMD160,
-    RIPEMD160_HMAC,
-    RIPEMD160_HMAC_GENERAL,
-    SHA256,
-    SHA256_HMAC,
-    SHA256_HMAC_GENERAL,
-    SHA224,
-    SHA224_HMAC,
-    SHA224_HMAC_GENERAL,
-    SHA384,
-    SHA384_HMAC,
-    SHA384_HMAC_GENERAL,
-    SHA512,
-    SHA512_HMAC,
-    SHA512_HMAC_GENERAL,
-    SECURID_KEY_GEN,
-    SECURID,
-    HOTP_KEY_GEN,
-    HOTP,
-    ACTI,
-    ACTI_KEY_GEN,
-    CAST_KEY_GEN,
-    CAST_ECB,
-    CAST_CBC,
-    CAST_MAC,
-    CAST_MAC_GENERAL,
-    CAST_CBC_PAD,
-    CAST3_KEY_GEN,
-    CAST3_ECB,
-    CAST3_CBC,
-    CAST3_MAC,
-    CAST3_MAC_GENERAL,
-    CAST3_CBC_PAD,
-    CAST5_KEY_GEN,
-    CAST128_KEY_GEN,
-    CAST5_ECB,
-    CAST128_ECB,
-    CAST5_CBC,
-    CAST128_CBC,
-    CAST5_MAC,
-    CAST128_MAC,
-    CAST5_MAC_GENERAL,
-    CAST128_MAC_GENERAL,
-    CAST5_CBC_PAD,
-    CAST128_CBC_PAD,
-    RC5_KEY_GEN,
-    RC5_ECB,
-    RC5_CBC,
-    RC5_MAC,
-    RC5_MAC_GENERAL,
-    RC5_CBC_PAD,
-    IDEA_KEY_GEN,
-    IDEA_ECB,
-    IDEA_CBC,
-    IDEA_MAC,
-    IDEA_MAC_GENERAL,
-    IDEA_CBC_PAD,
-    GENERIC_SECRET_KEY_GEN,
-    CONCATENATE_BASE_AND_KEY,
-    CONCATENATE_BASE_AND_DATA,
-    CONCATENATE_DATA_AND_BASE,
-    XOR_BASE_AND_DATA,
-    EXTRACT_KEY_FROM_KEY,
-    SSL3_PRE_MASTER_KEY_GEN,
-    SSL3_MASTER_KEY_DERIVE,
-    SSL3_KEY_AND_MAC_DERIVE,
-    SSL3_MASTER_KEY_DERIVE_DH,
-    TLS_PRE_MASTER_KEY_GEN,
-    TLS_MASTER_KEY_DERIVE,
-    TLS_KEY_AND_MAC_DERIVE,
-    TLS_MASTER_KEY_DERIVE_DH,
-    TLS_PRF,
-    SSL3_MD5_MAC,
-    SSL3_SHA1_MAC,
-    MD5_KEY_DERIVATION,
-    MD2_KEY_DERIVATION,
-    SHA1_KEY_DERIVATION,
-    SHA256_KEY_DERIVATION,
-    SHA384_KEY_DERIVATION,
-    SHA512_KEY_DERIVATION,
-    SHA224_KEY_DERIVATION,
-    PBE_MD2_DES_CBC,
-    PBE_MD5_DES_CBC,
-    PBE_MD5_CAST_CBC,
-    PBE_MD5_CAST3_CBC,
-    PBE_MD5_CAST5_CBC,
-    PBE_MD5_CAST128_CBC,
-    PBE_SHA1_CAST5_CBC,
-    PBE_SHA1_CAST128_CBC,
-    PBE_SHA1_RC4_128,
-    PBE_SHA1_RC4_40,
-    PBE_SHA1_DES3_EDE_CBC,
-    PBE_SHA1_DES2_EDE_CBC,
-    PBE_SHA1_RC2_128_CBC,
-    PBE_SHA1_RC2_40_CBC,
-    PKCS5_PBKD2,
-    PBA_SHA1_WITH_SHA1_HMAC,
-    WTLS_PRE_MASTER_KEY_GEN,
-    WTLS_MASTER_KEY_DERIVE,
-    WTLS_MASTER_KEY_DERIVE_DH_ECC,
-    WTLS_PRF,
-    WTLS_SERVER_KEY_AND_MAC_DERIVE,
-    WTLS_CLIENT_KEY_AND_MAC_DERIVE,
-    KEY_WRAP_LYNKS,
-    KEY_WRAP_SET_OAEP,
-    CAMELLIA_KEY_GEN,
-    CAMELLIA_ECB,
-    CAMELLIA_CBC,
-    CAMELLIA_MAC,
-    CAMELLIA_MAC_GENERAL,
-    CAMELLIA_CBC_PAD,
-    CAMELLIA_ECB_ENCRYPT_DATA,
-    CAMELLIA_CBC_ENCRYPT_DATA,
-    CAMELLIA_CTR,
-    ARIA_KEY_GEN,
-    ARIA_ECB,
-    ARIA_CBC,
-    ARIA_MAC,
-    ARIA_MAC_GENERAL,
-    ARIA_CBC_PAD,
-    ARIA_ECB_ENCRYPT_DATA,
-    ARIA_CBC_ENCRYPT_DATA,
-    SKIPJACK_KEY_GEN,
-    SKIPJACK_ECB64,
-    SKIPJACK_CBC64,
-    SKIPJACK_OFB64,
-    SKIPJACK_CFB64,
-    SKIPJACK_CFB32,
-    SKIPJACK_CFB16,
-    SKIPJACK_CFB8,
-    SKIPJACK_WRAP,
-    SKIPJACK_PRIVATE_WRAP,
-    SKIPJACK_RELAYX,
-    KEA_KEY_PAIR_GEN,
-    KEA_KEY_DERIVE,
-    FORTEZZA_TIMESTAMP,
-    BATON_KEY_GEN,
-    BATON_ECB128,
-    BATON_ECB96,
-    BATON_CBC128,
-    BATON_COUNTER,
-    BATON_SHUFFLE,
-    BATON_WRAP,
-    ECDSA_KEY_PAIR_GEN,
-    EC_KEY_PAIR_GEN,
-    ECDSA,
-    ECDSA_SHA1,
-    ECDSA_SHA224,
-    ECDSA_SHA256,
-    ECDSA_SHA384,
-    ECDSA_SHA512,
-    ECDH1_DERIVE,
-    ECDH1_COFACTOR_DERIVE,
-    ECMQV_DERIVE,
-    JUNIPER_KEY_GEN,
-    JUNIPER_ECB128,
-    JUNIPER_CBC128,
-    JUNIPER_COUNTER,
-    JUNIPER_SHUFFLE,
-    JUNIPER_WRAP,
-    FASTHASH,
-    AES_KEY_GEN,
-    AES_ECB,
-    AES_CBC,
-    AES_MAC,
-    AES_MAC_GENERAL,
-    AES_CBC_PAD,
-    AES_CTR,
-    AES_CMAC,
-    AES_CMAC_GENERAL,
-    BLOWFISH_KEY_GEN,
-    BLOWFISH_CBC,
-    TWOFISH_KEY_GEN,
-    TWOFISH_CBC,
-    AES_GCM,
-    AES_CCM,
-    AES_KEY_WRAP,
-    AES_KEY_WRAP_PAD,
-    DES_ECB_ENCRYPT_DATA,
-    DES_CBC_ENCRYPT_DATA,
-    DES3_ECB_ENCRYPT_DATA,
-    DES3_CBC_ENCRYPT_DATA,
-    AES_ECB_ENCRYPT_DATA,
-    AES_CBC_ENCRYPT_DATA,
-    GOSTR3410_KEY_PAIR_GEN,
-    GOSTR3410,
-    GOSTR3410_WITH_GOSTR3411,
-    GOSTR3410_KEY_WRAP,
-    GOSTR3410_DERIVE,
-    GOSTR3411,
-    GOSTR3411_HMAC,
-    GOST28147_KEY_GEN,
-    GOST28147_ECB,
-    GOST28147,
-    GOST28147_MAC,
-    GOST28147_KEY_WRAP,
-    DSA_PARAMETER_GEN,
-    DH_PKCS_PARAMETER_GEN,
-    X9_42_DH_PARAMETER_GEN,
-    VENDOR_DEFINED,
-}
-
-declare enum SessionFlag {
-    /**
-     * `True` if the session is read/write; `false` if the session is read-only
-     */
-    RW_SESSION,
-    /**
-     * This flag is provided for backward compatibility, and should always be set to `true`
-     */
-    SERIAL_SESSION,
-}
-
-declare enum UserType {
-    /**
-     * Security Officer
-     */
-    SO,
-    /**
-     * User
-     */
-    USER,
-    /**
-     * Context specific
-     */
-    CONTEXT_SPECIFIC,
-}
-
-interface IKeyPair {
-    privateKey: PrivateKey;
-    publicKey: PublicKey;
-}
-
-/**
- * provides information about a session
- *
- * @export
- * @declare class Session
- * @extends {core.HandleObject}
- */
-declare class Session extends HandleObject {
-
-    constructor(handle: Handle, slot: Slot, lib: pkcs11.PKCS11);
-    /**
-     * Slot
-     *
-     * @type {Slot}
-     */
-    slot: Slot;
-    /**
-     * the state of the session
-     *
-     * @type {number}
-     */
-    state: number;
-    /**
-     * bit flags that define the type of session
-     *
-     * @type {number}
-     */
-    flags: number;
-    /**
-     * an error code defined by the cryptographic device. Used for errors not covered by Cryptoki
-     *
-     * @type {number}
-     */
-    deviceError: number;
-
-    protected getInfo(): void;
-
-    /**
-     * closes a session between an application and a token
-     */
-    close(): void;
-    /**
-     * initializes the normal user's PIN
-     * @param {string} pin the normal user's PIN
-     */
-    initPin(pin: string): void;
-    /**
-     * modifies the PIN of the user who is logged in
-     * @param {string} oldPin
-     * @param {string} newPin
-     */
-    setPin(oldPin: string, newPin: string): void;
-    /**
-     * obtains a copy of the cryptographic operations state of a session, encoded as a string of bytes
-     */
-    getOperationState(): Buffer;
-    /**
-     * restores the cryptographic operations state of a session
-     * from a string of bytes obtained with getOperationState
-     * @param {Buffer} state the saved state
-     * @param {number} encryptionKey holds key which will be used for an ongoing encryption
-     * or decryption operation in the restored session
-     * (or 0 if no encryption or decryption key is needed,
-     * either because no such operation is ongoing in the stored session
-     * or because all the necessary key information is present in the saved state)
-     * @param {number} authenticationKey holds a handle to the key which will be used for an ongoing signature,
-     * MACing, or verification operation in the restored session
-     * (or 0 if no such key is needed, either because no such operation is ongoing in the stored session
-     * or because all the necessary key information is present in the saved state)
-     */
-    setOperationState(state: Buffer, encryptionKey?: number, authenticationKey?: number): void;
-    /**
-     * logs a user into a token
-     * @param {string} pin the user's PIN.
-     * - This standard allows PIN values to contain any valid `UTF8` character,
-     * but the token may impose subset restrictions
-     * @param {} userType the user type. Default is `USER`
-     */
-    login(pin: string, userType?: UserType): void;
-    /**
-     * logs a user out from a token
-     */
-    logout(): void;
-    /**
-     * creates a new object
-     * - Only session objects can be created during a read-only session.
-     * - Only public objects can be created unless the normal user is logged in.
-     * @param {ITemplate} template the object's template
-     * @returns {SessionObject}
-     */
-    create(template: ITemplate): SessionObject;
-    /**
-     * Copies an object, creating a new object for the copy
-     * @param {SessionObject} object the copied object
-     * @param {ITemplate} template template for new object
-     * @returns {SessionObject}
-     */
-    copy(object: SessionObject, template: ITemplate): SessionObject;
-    /**
-     * removes all session objects matched to template
-     * - if template is null, removes all session objects
-     * - returns a number of destroied session objects
-     * @param {ITemplate} template template
-     */
-    destroy(template: ITemplate): number;
-    /**
-     * @param {SessionObject} object
-     */
-    destroy(object: SessionObject): number;
-    destroy(): number;
-    /**
-     * removes all session objects
-     * - returns a number of destroied session objects
-     */
-    clear(): number;
-    /**
-     * returns a collection of session objects mached to template
-     * @param template template
-     * @param callback optional callback function wich is called for each founded object
-     * - if callback function returns false, it breaks find function.
-     */
-    find(callback?: (obj: SessionObject) => any): SessionObjectCollection;
-    find(template: ITemplate, callback?: (obj: SessionObject, index: number) => any): SessionObjectCollection;
-    /**
-     * Returns object from session by handle
-     * @param  {number} handle handle of object
-     * @returns T
-     */
-    getObject<T extends SessionObject>(handle: Handle): T;
-    /**
-     * generates a secret key or set of domain parameters, creating a new object.
-     * @param mechanism generation mechanism
-     * @param template template for the new key or set of domain parameters
-     */
-    generateKey(mechanism: MechanismType, template?: ITemplate): SecretKey;
-    generateKey(mechanism: MechanismType, template: ITemplate, callback: (err: Error, key: SecretKey) => void): void;
-    generateKeyPair(mechanism: MechanismType, publicTemplate: ITemplate, privateTemplate: ITemplate): IKeyPair;
-    generateKeyPair(mechanism: MechanismType, publicTemplate: ITemplate, privateTemplate: ITemplate, callback: (err: Error, keys: IKeyPair) => void): void;
-    createSign(alg: MechanismType, key: Key): Sign;
-    createVerify(alg: MechanismType, key: Key): Verify;
-    createCipher(alg: MechanismType, key: Key): Cipher;
-    createDecipher(alg: MechanismType, key: Key, blockSize?: number): Decipher;
-    createDigest(alg: MechanismType): Digest;
-    wrapKey(alg: MechanismType, wrappingKey: Key, key: Key): Buffer;
-    wrapKey(alg: MechanismType, wrappingKey: Key, key: Key, callback: (err: Error, wkey: Buffer) => void): void;
-    unwrapKey(alg: MechanismType, unwrappingKey: Key, wrappedKey: Buffer, template: ITemplate): Key;
-    unwrapKey(alg: MechanismType, unwrappingKey: Key, wrappedKey: Buffer, template: ITemplate, callback: (err: Error, key: Key) => void): void;
-    /**
-     * derives a key from a base key, creating a new key object
-     * @param {MechanismType} alg key deriv. mech
-     * @param {Key} baseKey base key
-     * @param {ITemplate} template new key template
-     */
-    deriveKey(alg: MechanismType, baseKey: Key, template: ITemplate): SecretKey;
-    deriveKey(alg: MechanismType, baseKey: Key, template: ITemplate, callback: (err: Error, key: Key) => void): void;
-    /**
-     * generates random data
-     * @param {number} size \# of bytes to generate
-     */
-    generateRandom(size: number): Buffer;
-}
-
-interface ITemplate {
-    /**
-     * CKA_CLASS
-     */
-    class?: number;
-    /**
-     * CKA_TOKEN
-     */
-    token?: boolean;
-    /**
-     * CKA_PRIVATE
-     */
-    private?: boolean;
-    /**
-     * CKA_LABEL
-     */
-    label?: string;
-    /**
-     * CKA_APPLICATION
-     */
-    application?: string;
-    /**
-     * CKA_VALUE
-     */
-    value?: Buffer;
-    /**
-     * CKA_OBJECT_ID
-     */
-    objectId?: Buffer;
-    /**
-     * CKA_CERTIFICATE_TYPE
-     */
-    certType?: number;
-    /**
-     * CKA_ISSUER
-     */
-    issuer?: Buffer;
-    /**
-     * CKA_SERIAL_NUMBER
-     */
-    serial?: Buffer;
-    /**
-     * CKA_AC_ISSUER
-     */
-    issuerAC?: Buffer;
-    /**
-     * CKA_OWNER
-     */
-    owner?: Buffer;
-    /**
-     * CKA_ATTR_TYPES
-     */
-    attrTypes?: Buffer;
-    /**
-     * CKA_TRUSTED
-     */
-    trusted?: boolean;
-    /**
-     * CKA_CERTIFICATE_CATEGORY
-     */
-    certCategory?: number;
-    /**
-     * CKA_JAVA_MIDP_SECURITY_DOMAIN
-     */
-    javaDomain?: number;
-    /**
-     * CKA_URL
-     */
-    url?: string;
-    /**
-     * CKA_HASH_OF_SUBJECT_PUBLIC_KEY
-     */
-    ski?: Buffer;
-    /**
-     * CKA_HASH_OF_ISSUER_PUBLIC_KEY
-     */
-    aki?: Buffer;
-    /**
-     * CKA_NAME_HASH_ALGORITHM
-     */
-    digestName?: number;
-    /**
-     * CKA_CHECK_VALUE
-     */
-    checkValue?: Buffer;
-    /**
-     * CKA_KEY_TYPE
-     */
-    keyType?: number;
-    /**
-     * CKA_SUBJECT
-     */
-    subject?: Buffer;
-    /**
-     * CKA_ID
-     */
-    id?: Buffer;
-    /**
-     * CKA_SENSITIVE
-     */
-    sensitive?: boolean;
-    /**
-     * CKA_ENCRYPT
-     */
-    encrypt?: boolean;
-    /**
-     * CKA_DECRYPT
-     */
-    decrypt?: boolean;
-    /**
-     * CKA_WRAP
-     */
-    wrap?: boolean;
-    /**
-     * CKA_UNWRAP
-     */
-    unwrap?: boolean;
-    /**
-     * CKA_SIGN
-     */
-    sign?: boolean;
-    /**
-     * CKA_SIGN_RECOVER
-     */
-    signRecover?: boolean;
-    /**
-     * CKA_VERIFY
-     */
-    verify?: boolean;
-    /**
-     * CKA_VERIFY_RECOVER
-     */
-    verifyRecover?: boolean;
-    /**
-     * CKA_DERIVE
-     */
-    derive?: boolean;
-    /**
-     * CKA_START_DATE
-     */
-    startDate?: Date;
-    /**
-     * CKA_END_DATE
-     */
-    endDate?: Date;
-    /**
-     * CKA_MODULUS
-     */
-    modulus?: Buffer;
-    /**
-     * CKA_MODULUS_BITS
-     */
-    modulusBits?: number;
-    /**
-     * CKA_PUBLIC_EXPONENT
-     */
-    publicExponent?: Buffer;
-    /**
-     * CKA_PRIVATE_EXPONEN
-     */
-    privateExponent?: Buffer;
-    /**
-     * CKA_PRIME_1
-     */
-    prime1?: Buffer;
-    /**
-     * CKA_PRIME_2
-     */
-    prime2?: Buffer;
-    /**
-     * CKA_EXPONENT_1
-     */
-    exp1?: Buffer;
-    /**
-     * CKA_EXPONENT_2
-     */
-    exp2?: Buffer;
-    /**
-     * CKA_COEFFICIEN
-     */
-    coefficient?: Buffer;
-    /**
-     * CKA_PRIME
-     */
-    prime?: Buffer;
-    /**
-     * CKA_SUBPRIME
-     */
-    subprime?: Buffer;
-    /**
-     * CKA_BASE
-     */
-    base?: Buffer;
-    /**
-     * CKA_PRIME_BITS
-     */
-    primeBits?: number;
-    /**
-     * CKA_SUBPRIME_BITS
-     */
-    subprimeBits?: number;
-    /**
-     * CKA_VALUE_BITS
-     */
-    valueBits?: number;
-    /**
-     * CKA_VALUE_LEN
-     */
-    valueLen?: number;
-    /**
-     * CKA_EXTRACTABLE
-     */
-    extractable?: boolean;
-    /**
-     * CKA_LOCAL
-     */
-    local?: boolean;
-    /**
-     * CKA_NEVER_EXTRACTABLE
-     */
-    neverExtractable?: boolean;
-    /**
-     * CKA_ALWAYS_SENSITIVE
-     */
-    alwaysSensitive?: boolean;
-    /**
-     * CKA_KEY_GEN_MECHANISM
-     */
-    keyGenMechanism?: number;
-    /**
-     * CKA_MODIFIABLE
-     */
-    modifiable?: boolean;
-    /**
-     * CKA_COPYABLE
-     */
-    copyable?: boolean;
-    /**
-     * CKA_ECDSA_PARAMS
-     */
-    paramsECDSA?: Buffer;
-    paramsEC?: Buffer;
-    /**
-     * CKA_EC_POINT
-     */
-    pointEC?: Buffer;
-    /**
-     * CKA_SECONDARY_AUTH
-     */
-    secondaryAuth?: boolean;
-    /**
-     * CKA_AUTH_PIN_FLAGS
-     */
-    authPinFlags?: Buffer;
-    /**
-     * CKA_ALWAYS_AUTHENTICATE
-     */
-    alwaysAuth?: boolean;
-    /**
-     * CKA_WRAP_WITH_TRUSTED
-     */
-    wrapWithTrusted?: boolean;
-    /**
-     * CKA_WRAP_TEMPLATE
-     */
-    wrapTemplate?: any;
-    /**
-     * CKA_UNWRAP_TEMPLATE
-     */
-    unwrapTemplate?: any;
-    /**
-     * CKA_OTP_FORMAT
-     */
-    otpFormat?: any;
-    /**
-     * CKA_OTP_LENGTH
-     */
-    otpLength?: any;
-    /**
-     * CKA_OTP_TIME_INTERVAL
-     */
-    otpTimeInterval?: any;
-    /**
-     * CKA_OTP_USER_FRIENDLY_MODE
-     */
-    otpUserFriendlyMode?: any;
-    /**
-     * CKA_OTP_CHALLENGE_REQUIREMENT
-     */
-    otpChallengeReq?: any;
-    /**
-     * CKA_OTP_TIME_REQUIREMENT
-     */
-    otpTimeReq?: any;
-    /**
-     * CKA_OTP_COUNTER_REQUIREMENT
-     */
-    otpCounterReq?: any;
-    /**
-     * CKA_OTP_PIN_REQUIREMENT
-     */
-    otppinReq?: any;
-    /**
-     * CKA_OTP_COUNTER
-     */
-    otpCounter?: any;
-    /**
-     * CKA_OTP_TIME
-     */
-    otpTime?: any;
-    /**
-     * CKA_OTP_USER_IDENTIFIER
-     */
-    otpUserId?: any;
-    /**
-     * CKA_OTP_SERVICE_IDENTIFIER
-     */
-    otpServiceId?: any;
-    /**
-     * CKA_OTP_SERVICE_LOGO
-     */
-    otpServiceLogo?: any;
-    /**
-     * CKA_OTP_SERVICE_LOGO_TYPE
-     */
-    otpServiceLogoType?: any;
-    /**
-     * CKA_HW_FEATURE_TYPE
-     */
-    hwFeatureType?: any;
-    /**
-     * CKA_RESET_ON_INIT
-     */
-    resetOnInit?: any;
-    /**
-     * CKA_HAS_RESET
-     */
-    hasReset?: any;
-    /**
-     * CKA_PIXEL_X
-     */
-    pixelX?: any;
-    /**
-     * CKA_PIXEL_Y
-     */
-    pixelY?: any;
-    /**
-     * CKA_RESOLUTION
-     */
-    resolution?: any;
-    /**
-     * CKA_CHAR_ROWS
-     */
-    charRows?: any;
-    /**
-     * CKA_CHAR_COLUMNS
-     */
-    charCols?: any;
-    /**
-     * CKA_COLOR
-     */
-    color?: any;
-    /**
-     * CKA_BITS_PER_PIXEL
-     */
-    bitsPerPixel?: any;
-    /**
-     * CKA_CHAR_SETS
-     */
-    charSets?: any;
-    /**
-     * CKA_ENCODING_METHODS
-     */
-    encMethod?: any;
-    /**
-     * CKA_MIME_TYPES
-     */
-    mimeTypes?: any;
-    /**
-     * CKA_MECHANISM_TYPE
-     */
-    mechanismType?: any;
-    /**
-     * CKA_REQUIRED_CMS_ATTRIBUTES
-     */
-    requiredCmsAttrs?: any;
-    /**
-     * CKA_DEFAULT_CMS_ATTRIBUTES
-     */
-    defaultCmsAttrs?: any;
-    /**
-     * CKA_SUPPORTED_CMS_ATTRIBUTES
-     */
-    suportedCmsAttrs?: any;
-    /**
-     * CKA_ALLOWED_MECHANISMS
-     */
-    allowedMechanisms?: any;
-}
-
-declare class Template {
-    static toPkcs11(tmpl: ITemplate): pkcs11.Attribute[];
-    static fromPkcs11(tmpl: pkcs11.Template): ITemplate;
-}
-
-declare enum SlotFlag {
-    /**
-     * `True` if a token is present in the slot (e.g., a device is in the reader)
-     */
-    TOKEN_PRESENT,
-    /**
-     * `True` if the reader supports removable devices
-     */
-    REMOVABLE_DEVICE,
-    /**
-     * True if the slot is a hardware slot, as opposed to a software slot implementing a "soft token"
-     */
-    HW_SLOT,
-}
-declare class Slot extends HandleObject {
-
-    slotDescription: string;
-    manufacturerID: string;
-    flags: number;
-    hardwareVersion: pkcs11.Version;
-    firmwareVersion: pkcs11.Version;
-    module: Module;
-
-    constructor(handle: Handle, module: Module, lib: pkcs11.PKCS11);
-
-    /**
-     * Recieve information about Slot
-     *
-     * @protected
-     */
-    protected getInfo(): void;
-
-    /**
-     * Returns information about token
-     *
-     * @returns {Token}
-     */
-    getToken(): Token;
-    /**
-     * returns list of `MechanismInfo`
-     *
-     * @returns {MechanismCollection}
-     */
-    getMechanisms(): MechanismCollection;
-    /**
-     * initializes a token
-     *
-     * @param {string} pin the SO's initial PIN
-     * @returns {string}
-     */
-    initToken(pin: string): string;
-    /**
-     * opens a session between an application and a token in a particular slot
-     *
-     * @param {SessionFlag} [flags=session.SessionFlag.SERIAL_SESSION] indicates the type of session
-     * @returns {Session}
-     */
-    open(flags?: SessionFlag): Session;
-    /**
-     * closes all sessions an application has with a token
-     */
-    closeAll(): void;
-}
-
-/**
- * Collection of slots
- *
- * @export
- * @declare class SlotCollection
- * @extends {core.Collection<Slot>}
- */
-declare class SlotCollection extends Collection<Slot> {
-    module: Module;
-    items(index: number): Slot;
-    constructor(items: Array<Buffer>, module: Module, lib: pkcs11.PKCS11, classType?: any);
-}
-
-declare enum TokenFlag {
-    RNG,
-    WRITE_PROTECTED,
-    LOGIN_REQUIRED,
-    USER_PIN_INITIALIZED,
-    RESTORE_KEY_NOT_NEEDED,
-    CLOCK_ON_TOKEN,
-    PROTECTED_AUTHENTICATION_PATH,
-    DUAL_CRYPTO_OPERATIONS,
-    TOKEN_INITIALIZED,
-    SECONDARY_AUTHENTICATION,
-    USER_PIN_COUNT_LOW,
-    USER_PIN_FINAL_TRY,
-    USER_PIN_LOCKED,
-    USER_PIN_TO_BE_CHANGED,
-    SO_PIN_COUNT_LOW,
-    SO_PIN_FINAL_TRY,
-    SO_PIN_LOCKED,
-    SO_PIN_TO_BE_CHANGED,
-    ERROR_STATE,
-}
-
-declare class Token extends HandleObject {
-    /**
-     * application-defined label, assigned during token initialization.
-     * - Must be padded with the blank character (' ').
-     * - Should __not__ be null-terminated.
-     */
-    label: string;
-    /**
-     * ID of the device manufacturer.
-     * - Must be padded with the blank character (' ').
-     * - Should __not__ be null-terminated.
-     */
-    manufacturerID: string;
-    /**
-     * model of the device.
-     * - Must be padded with the blank character (' ').
-     * - Should __not__ be null-terminated.
-     */
-    model: string;
-    /**
-     * character-string serial number of the device.
-     * - Must be padded with the blank character (' ').
-     * - Should __not__ be null-terminated.
-     */
-    serialNumber: string;
-    /**
-     * bit flags indicating capabilities and status of the device
-     */
-    flags: number;
-    /**
-     * maximum number of sessions that can be opened with the token at one time by a single application
-     */
-    maxSessionCount: number;
-    /**
-     * number of sessions that this application currently has open with the token
-     */
-    sessionCount: number;
-    /**
-     * maximum number of read/write sessions that can be opened
-     * with the token at one time by a single application
-     */
-    maxRwSessionCount: number;
-    /**
-     * number of read/write sessions that this application currently has open with the token
-     */
-    rwSessionCount: number;
-    /**
-     * maximum length in bytes of the PIN
-     */
-    maxPinLen: number;
-    /**
-     * minimum length in bytes of the PIN
-     */
-    minPinLen: number;
-    /**
-     * the total amount of memory on the token in bytes in which public objects may be stored
-     */
-    totalPublicMemory: number;
-    /**
-     * the amount of free (unused) memory on the token in bytes for public objects
-     */
-    freePublicMemory: number;
-    /**
-     * the total amount of memory on the token in bytes in which private objects may be stored
-     */
-    totalPrivateMemory: number;
-    /**
-     * the amount of free (unused) memory on the token in bytes for private objects
-     */
-    freePrivateMemory: number;
-    /**
-     * version number of hardware
-     */
-    hardwareVersion: pkcs11.Version;
-    /**
-     * version number of firmware
-     */
-    firmwareVersion: pkcs11.Version;
-    /**
-     * current time as a character-string of length 16,
-     * represented in the format YYYYMMDDhhmmssxx
-     */
-    utcTime: Date;
-
-    constructor(handle: Handle, lib: pkcs11.PKCS11);
-
-    protected getInfo(): void;
-}
-
-declare class Module extends BaseObject {
-    libFile: string;
-    libName: string;
-    /**
-     * Cryptoki interface version
-     */
-    cryptokiVersion: pkcs11.Version;
-    /**
-     * blank padded manufacturer ID
-     */
-    manufacturerID: string;
-    /**
-     * must be zero
-     */
-    flags: number;
-    /**
-     * blank padded library description
-     */
-    libraryDescription: string;
-    /**
-     * version of library
-     */
-    libraryVersion: pkcs11.Version;
-    constructor(lib: pkcs11.PKCS11);
-    protected getInfo(): void;
-    /**
-     * initializes the Cryptoki library
-     */
-    initialize(): void;
-    /**
-     * indicates that an application is done with the Cryptoki library
-     */
-    finalize(): void;
-    /**
-     * obtains a list of slots in the system
-     * @param {number} index index of an element in collection
-     * @param {number} tokenPresent only slots with tokens. Default `True`
-     */
-    getSlots(index: number, tokenPresent?: boolean): Slot;
-    /**
-     * @param {number} tokenPresent only slots with tokens. Default `True`
-     */
-    getSlots(tokenPresent?: boolean): SlotCollection;
-    /**
-     * loads pkcs11 lib
-     * @param libFile path to PKCS11 library
-     * @param libName name of PKCS11 library
-     */
-    static load(libFile: string, libName?: string): Module;
-}
diff --git a/types/graphene-pk11/package.json b/types/graphene-pk11/package.json
deleted file mode 100644
index 517ccdb420..0000000000
--- a/types/graphene-pk11/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "pkcs11js": "^1.0.8"
-    }
-}
\ No newline at end of file
diff --git a/types/graphene-pk11/tsconfig.json b/types/graphene-pk11/tsconfig.json
deleted file mode 100644
index 1d66008bb3..0000000000
--- a/types/graphene-pk11/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "graphene-pk11-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/graphite-udp/index.d.ts b/types/graphite-udp/index.d.ts
index 167b85673a..dbd07ddf43 100644
--- a/types/graphite-udp/index.d.ts
+++ b/types/graphite-udp/index.d.ts
@@ -55,10 +55,6 @@ export interface ClientOptions {
 	/**
 	 * called when metrics are sent
 	 * Defaults to null
-	 *
-	 * @param {error} Error
-	 * @param {metrics}
-	 * @return void
 	 */
 	callback?(error: Error, metrics: any): void;
 }
@@ -68,19 +64,11 @@ export class Client {
 
 	/**
 	 * During the interval time option, if 2 or more metrics with the same name are sent, metrics will be added (summed)
-	 *
-	 * @param {name}
-	 * @param {value} number
-	 * @return void
 	 */
 	add(name: string, value: number): void;
 
 	/**
 	 * During the interval time option, if 2 or more metrics with the same name are sent, the last one will be used
-	 *
-	 * @param {name} metric name (my.test.metric)
-	 * @param {value} number
-	 * @return void
 	 */
 	put(name: string, value: number): void;
 
diff --git a/types/graphlib/tslint.json b/types/graphlib/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/graphlib/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/graphql-date/index.d.ts b/types/graphql-date/index.d.ts
index 35ad44f7e1..4615d424a1 100644
--- a/types/graphql-date/index.d.ts
+++ b/types/graphql-date/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tjmehta/graphql-date
 // Definitions by: Eric Naeseth <https://github.com/enaeseth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { GraphQLScalarType } from 'graphql';
 
diff --git a/types/graphql-relay/index.d.ts b/types/graphql-relay/index.d.ts
index 7c0d9965a8..2318a527e4 100644
--- a/types/graphql-relay/index.d.ts
+++ b/types/graphql-relay/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/graphql/graphql-relay-js
 // Definitions by: Arvitaly <https://github.com/arvitaly>, nitintutlani <https://github.com/nitintutlani>, Grelinfo <https://github.com/Grelinfo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import {
     GraphQLBoolean,
diff --git a/types/graphql-type-json/index.d.ts b/types/graphql-type-json/index.d.ts
index c9549b946d..2b10599e0e 100644
--- a/types/graphql-type-json/index.d.ts
+++ b/types/graphql-type-json/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/taion/graphql-type-json#readme
 // Definitions by: Pavel Ivanov <https://github.com/schfkt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
 import { GraphQLScalarType } from "graphql";
 
 declare const GraphQLJSON: GraphQLScalarType;
diff --git a/types/graphql/execution/execute.d.ts b/types/graphql/execution/execute.d.ts
index 6d02b82124..c8ee7d9215 100644
--- a/types/graphql/execution/execute.d.ts
+++ b/types/graphql/execution/execute.d.ts
@@ -28,11 +28,13 @@ export interface ExecutionContext {
 
 /**
  * The result of execution. `data` is the result of executing the
- * query, `errors` is null if no errors occurred, and is a
+ * query, `extensions` represents additional metadata, `errors` is
+ * null if no errors occurred, and is a
  * non-empty array if an error occurred.
  */
 export interface ExecutionResult {
     data?: { [key: string]: any };
+    extensions?: { [key: string]: any };
     errors?: GraphQLError[];
 }
 
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index b65245a33e..4bca573210 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -8,6 +8,8 @@
 //                 Mikhail Novikov <https://github.com/freiksenet>
 //                 Ivan Goncharov <https://github.com/IvanGoncharov>
 //                 Hagai Cohen <https://github.com/DxCx>
+//                 Ricardo Portugal <https://github.com/rportugal>
+//                 Tim Griesser <https://github.com/tgriesser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index 7f84c875fb..4a44c5d1c6 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -262,9 +262,9 @@ export type GraphQLIsTypeOfFn<TSource, TContext> = (
     info: GraphQLResolveInfo
 ) => boolean | Promise<boolean>;
 
-export type GraphQLFieldResolver<TSource, TContext> = (
+export type GraphQLFieldResolver<TSource, TContext, TArgs = { [argName: string]: any }> = (
     source: TSource,
-    args: { [argName: string]: any },
+    args: TArgs,
     context: TContext,
     info: GraphQLResolveInfo
 ) => any;
@@ -284,11 +284,11 @@ export interface GraphQLResolveInfo {
 
 export type ResponsePath = { prev: ResponsePath, key: string | number } | undefined;
 
-export interface GraphQLFieldConfig<TSource, TContext> {
+export interface GraphQLFieldConfig<TSource, TContext, TArgs = { [argName: string]: any }> {
     type: GraphQLOutputType;
     args?: GraphQLFieldConfigArgumentMap;
-    resolve?: GraphQLFieldResolver<TSource, TContext>;
-    subscribe?: GraphQLFieldResolver<TSource, TContext>;
+    resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
+    subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     deprecationReason?: string;
     description?: string;
     astNode?: FieldDefinitionNode;
@@ -309,13 +309,13 @@ export interface GraphQLFieldConfigMap<TSource, TContext> {
     [fieldName: string]: GraphQLFieldConfig<TSource, TContext>;
 }
 
-export interface GraphQLField<TSource, TContext> {
+export interface GraphQLField<TSource, TContext, TArgs = { [argName: string]: any }> {
     name: string;
     description: string;
     type: GraphQLOutputType;
     args: GraphQLArgument[];
-    resolve?: GraphQLFieldResolver<TSource, TContext>;
-    subscribe?: GraphQLFieldResolver<TSource, TContext>;
+    resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
+    subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     isDeprecated?: boolean;
     deprecationReason?: string;
     astNode?: FieldDefinitionNode;
@@ -455,6 +455,7 @@ export class GraphQLEnumType {
     constructor(config: GraphQLEnumTypeConfig);
     getValues(): GraphQLEnumValue[];
     getValue(name: string): GraphQLEnumValue;
+    isValidValue(value: any): boolean;
     serialize(value: any): string;
     parseValue(value: any): any;
     parseLiteral(valueNode: ValueNode): any;
diff --git a/types/graphviz/tslint.json b/types/graphviz/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/graphviz/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/grasp/grasp-tests.ts b/types/grasp/grasp-tests.ts
new file mode 100644
index 0000000000..647f57d8fd
--- /dev/null
+++ b/types/grasp/grasp-tests.ts
@@ -0,0 +1,50 @@
+import fs = require("fs");
+import * as grasp from "grasp";
+
+grasp(); // $ExpectError
+grasp({ args: [] }); // $ExpectType void
+
+// $ExpectType void
+grasp({
+    args: [],
+    error: console.error,
+    callback: console.log,
+    exit: process.exit,
+    console,
+    stdin: process.stdin,
+    fs,
+    input: "foo bar"
+});
+
+// $ExpectError
+grasp({
+    args: [],
+    textFormat: { cyan: "cyan" }
+});
+
+// $ExpectType string
+grasp.VERSION;
+
+const fooquery = grasp.search("fooquery"); // $ExpectError
+const equery = grasp.search("equery");
+const squery = grasp.search("squery");
+
+// $ExpectType Node[]
+grasp.search("equery", "pattern", "input");
+
+// $ExpectType Node[]
+equery("pattern")("input");
+
+// $ExpectType (input: string) => Node[]
+squery("pattern");
+
+const replacer = grasp.replace("equery", "pattern");
+
+// $ExpectType string
+replacer("replacement", "input");
+
+// $ExpectType string
+replacer((getRaw, node, query, named) => {
+    getRaw(node); // $ExpectType string
+    return "foo";
+}, "input");
diff --git a/types/grasp/index.d.ts b/types/grasp/index.d.ts
new file mode 100644
index 0000000000..bafaac5fdb
--- /dev/null
+++ b/types/grasp/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for grasp 0.6
+// Project: http://graspjs.com
+// Definitions by: Isaac Wolkerstorfer <https://github.com/agnoster>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import * as fs from "fs";
+import * as cliColor from "cli-color";
+// Though Grasp does not use esprima, the parser it uses (flow-parser) has a compatible Node type and existing typedefs
+import { Node } from "estree";
+
+export = grasp;
+
+declare function grasp(options: {
+    args: string[] | Record<string, any> | string;
+    error?: (message: string) => void;
+    callback?: (result: string) => void;
+    exit?: (code: number) => void;
+    input?: string;
+
+    // The following are "overrides" for defaults, such as console, cli-color,
+    // process.stdin, or fs. In most cases grasp only makes use of a small
+    // surface area of the types, but I think if someone really wants to pass a
+    // fake fs that only implements the subset of methods they think grasp uses,
+    // it should be up to them to use a cast rather than the typedef to be
+    // overly lenient. We never know if grasp might change their internal use of
+    // fs, after all.
+    fs?: typeof fs;
+    console?: typeof console;
+    textFormat?: typeof cliColor;
+    stdin?: typeof process.stdin;
+}): void;
+
+declare namespace grasp {
+    const VERSION: string;
+
+    // Both the search and replace functions are curryable, which leads to quite
+    // a bit of noise. Using generic currying will discard variable name
+    // information, so we hand-roll it here
+
+    function search(engine: QueryEngineType, selector: string, input: string): Node[];
+    function search(engine: QueryEngineType, selector: string): (input: string) => Node[];
+    function search(engine: QueryEngineType): GraspSearchWithQueryEngine;
+
+    function replace(engine: QueryEngineType, selector: string, replacement: Replacement, input: string): string;
+    function replace(engine: QueryEngineType, selector: string, replacement: Replacement): (input: string) => string;
+    function replace(engine: QueryEngineType, selector: string): GraspReplaceWithSelector;
+    function replace(engine: QueryEngineType): GraspReplaceWithQueryEngine;
+
+    type QueryEngineType = "squery" | "equery";
+
+    type Replacement =
+        | string
+        | ((
+              getRaw: (node: Node) => string,
+              node: Node,
+              query: (q: string) => Node[],
+              named: { [key: string]: string | Node }
+          ) => string);
+
+    type GraspSearchWithQueryEngine = ((selector: string, input: string) => Node[]) &
+        ((selector: string) => (input: string) => Node[]);
+
+    type GraspReplaceWithQueryEngine = ((selector: string) => GraspReplaceWithSelector) &
+        ((selector: string, replacement: Replacement) => (input: string) => string) &
+        ((selector: string, replacement: Replacement, input: string) => string);
+
+    type GraspReplaceWithSelector = ((replacement: Replacement) => (input: string) => string) &
+        ((replacement: Replacement, input: string) => string);
+}
diff --git a/types/grasp/tsconfig.json b/types/grasp/tsconfig.json
new file mode 100644
index 0000000000..e0996e4408
--- /dev/null
+++ b/types/grasp/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "grasp-tests.ts"]
+}
diff --git a/types/grasp/tslint.json b/types/grasp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/grasp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gravatar/tslint.json b/types/gravatar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gravatar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/greasemonkey/tslint.json b/types/greasemonkey/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/greasemonkey/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/grecaptcha/index.d.ts b/types/grecaptcha/index.d.ts
index 59d1fa6699..067139e6c9 100644
--- a/types/grecaptcha/index.d.ts
+++ b/types/grecaptcha/index.d.ts
@@ -46,21 +46,18 @@ declare namespace ReCaptchaV2 {
      * Optional. The color theme of the widget.
      * Accepted values: "light", "dark"
      * @default "light"
-     * @type {Theme}
      */
     theme?: Theme;
     /**
      * Optional. The type of CAPTCHA to serve.
      * Accepted values: "audio", "image"
      * @default "image"
-     * @type {Type}
      */
     type?: Type;
     /**
      * Optional. The size of the widget.
      * Accepted values: "compact", "normal", "invisible".
      * @default "compact"
-     * @type {Size}
      */
     size?: Size;
     /**
@@ -77,7 +74,6 @@ declare namespace ReCaptchaV2 {
      * Optional. The badge location for g-recaptcha with size of "invisible".
      *
      * @default "bottomright"
-     * @type {Badge}
      */
     badge?: Badge;
     /**
diff --git a/types/recaptcha/recaptcha-tests.ts b/types/grecaptcha/v0/grecaptcha-tests.ts
similarity index 100%
rename from types/recaptcha/recaptcha-tests.ts
rename to types/grecaptcha/v0/grecaptcha-tests.ts
diff --git a/types/recaptcha/index.d.ts b/types/grecaptcha/v0/index.d.ts
similarity index 100%
rename from types/recaptcha/index.d.ts
rename to types/grecaptcha/v0/index.d.ts
diff --git a/types/grecaptcha/v0/tsconfig.json b/types/grecaptcha/v0/tsconfig.json
new file mode 100644
index 0000000000..b75ce228e8
--- /dev/null
+++ b/types/grecaptcha/v0/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "grecaptcha": [
+                "grecaptcha/v0"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "grecaptcha-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/grecaptcha/v0/tslint.json b/types/grecaptcha/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/grecaptcha/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gregorian-calendar/tslint.json b/types/gregorian-calendar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gregorian-calendar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/griddle-react/index.d.ts b/types/griddle-react/index.d.ts
deleted file mode 100644
index ea40fb2130..0000000000
--- a/types/griddle-react/index.d.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-// Type definitions for griddle-react 0.7
-// Project: https://github.com/griddlegriddle/griddle
-// Definitions by: David Hara <https://github.com/hodavidhara>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 David Hara
-
-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.
-*/
-
-import * as React from 'react';
-
-type ReactClass<T> = React.ComponentClass<T> | React.StatelessComponent<T>;
-
-export interface CustomColumnComponentProps<T> {
-  data: any;
-  rowData: T;
-  metaData: ColumnMetaData<T>;
-}
-
-export interface CustomRowComponentProps<T> {
-  data: T;
-}
-
-export interface CustomGridComponentProps<T> {
-  data: T[];
-}
-
-export interface CustomPagerComponentProps {
-  currentPage: number;
-  maxPage: number;
-  nextText: string;
-  previousText: string;
-  next(): void;
-  previous(): void;
-  setPage(number: number): void;
-}
-
-export interface CustomHeaderComponentProps {
-  filterByColumn?(filter: string, columnName: string): void;
-  columnName: string;
-  displayName: string;
-}
-
-export interface CustomFilterComponentProps {
-  placeholderText?: string;
-  changeFilter(val: any): void;
-}
-
-export interface ColumnMetaData<T> {
-  columnName: string;
-  cssClassName?: string;
-  customComponent?: ReactClass<CustomColumnComponentProps<T>>;
-  customHeaderComponent?: ReactClass<CustomHeaderComponentProps>;
-  customHeaderComponentProps?: {};
-  displayName?: string;
-  locked?: boolean;
-  order?: number;
-  sortable?: boolean;
-  visible?: boolean;
-}
-
-export type BodyCssClassNameFunction<T> = (rowData: T) => string;
-
-export interface RowMetaData<T> {
-  bodyCssClassName?: BodyCssClassNameFunction<T> | string;
-}
-
-export interface GriddleProps<T> {
-  columns?: string[];
-  columnMetadata?: Array<ColumnMetaData<T>>;
-  rowMetadata?: RowMetaData<T>;
-  results?: T[];
-  resultsPerPage?: number;
-  initialSort?: string;
-  initialSortAscending?: boolean;
-  gridClassName?: string;
-  tableClassName?: string;
-  customFormatClassName?: string;
-  settingsText?: string;
-  filterPlaceholderText?: string;
-  nextText?: string;
-  previousText?: string;
-  maxRowsText?: string;
-  enableCustomFormatText?: string;
-  childrenColumnName?: string;
-  metadataColumns?: string[];
-  showFilter?: boolean;
-  showSettings?: boolean;
-  useCustomRowComponent?: boolean;
-  useCustomGridComponent?: boolean;
-  useCustomPagerComponent?: boolean;
-  useCustomFilterer?: boolean;
-  useCustomFilterComponent?: boolean;
-  useGriddleStyles?: boolean;
-  customRowComponent?: ReactClass<CustomRowComponentProps<T>>;
-  customGridComponent?: ReactClass<CustomGridComponentProps<T>>;
-  customPagerComponent?: ReactClass<CustomPagerComponentProps>;
-  customFilterComponent?: ReactClass<CustomFilterComponentProps>;
-  customFilterer?(items: T[], query: any): T[];
-  enableToggleCustom?: boolean;
-  noDataMessage?: string;
-  noDataClassName?: string;
-  customNoDataComponent?: ReactClass<void>;
-  showTableHeading?: boolean;
-  showPager?: boolean;
-  useFixedHeader?: boolean;
-  useExternal?: boolean;
-  externalSetPage?(index: number): void;
-  externalChangeSort?(sort: string, sortAscending: boolean): void;
-  externalSetFilter?(filter: string): void;
-  externalSetPageSize?(size: number): void;
-  externalMaxPage?: number;
-  externalCurrentPage?: number;
-  externalSortColumn?: string;
-  externalSortAscending?: boolean;
-  externalLoadingComponent?: ReactClass<void>;
-  externalIsLoading?: boolean;
-  enableInfiniteScroll?: boolean;
-  bodyHeight?: number;
-  paddingHeight?: number;
-  rowHeight?: number;
-  infiniteScrollLoadTreshold?: number;
-  useFixedLayout?: boolean;
-  isSubGriddle?: boolean;
-  enableSort?: boolean;
-  sortAscendingClassName?: string;
-  sortDescendingClassName?: string;
-  parentRowCollapsedClassName?: string;
-  parentRowExpandedClassName?: string;
-  settingsToggleClassName?: string;
-  nextClassName?: string;
-  previousClassName?: string;
-  sortAscendingComponent?: string | React.ReactElement<any>;
-  sortDescendingComponent?: string | React.ReactElement<any>;
-  sortDefaultComponent?: string | React.ReactElement<any>;
-  parentRowCollapsedComponent?: string | React.ReactElement<any>;
-  parentRowExpandedComponent?: string | React.ReactElement<any>;
-  settingsIconComponent?: string | React.ReactElement<any>;
-  nextIconComponent?: string | React.ReactElement<any>;
-  previousIconComponent?: string | React.ReactElement<any>;
-  onRowClick?(): void;
-}
-
-declare class Griddle<T> extends React.Component<GriddleProps<T>> {
-}
-
-export default Griddle;
diff --git a/types/griddle-react/test/CustomColumnComponent.tsx b/types/griddle-react/test/CustomColumnComponent.tsx
deleted file mode 100644
index f344796538..0000000000
--- a/types/griddle-react/test/CustomColumnComponent.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Licensed under the MIT License (MIT)
-
-Copyright (c) 2016 David Hara
-*/
-
-import * as React from 'react';
-import Griddle, { CustomColumnComponentProps } from 'griddle-react';
-
-interface MyCustomResult {
-  name: string;
-  test: string;
-}
-
-class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>> {
-  render() {
-    const url = `speakers/${this.props.rowData.test}/${this.props.data}`;
-    return <a href={url}>{this.props.data}</a>;
-  }
-}
-
-const StatelessFunctionComponent = (props: CustomColumnComponentProps<MyCustomResult>) => {
-  const url = `speakers/${props.rowData.test}/${props.data}`;
-  return <a href={url}>{props.data}</a>;
-};
-
-const columnMeta = [
-  {
-    columnName: "name",
-    order: 1,
-    locked: false,
-    visible: true,
-    customComponent: StatelessFunctionComponent
-  }];
-
-const results: MyCustomResult[] = [
-  {
-    name: 'David Hara',
-    test: 'blah'
-  },
-  {
-    name: 'Hara, David',
-    test: 'blah2'
-  }
-];
-
-const rowMetaData = {
-  bodyCssClassName: (rowData: MyCustomResult) => {
-    return rowData.test;
-  }
-};
-
-class CustomColumnComponentGrid extends React.Component {
-  render() {
-    type TypedGriddle = new () => Griddle<MyCustomResult>;
-    const TypedGriddle = Griddle as TypedGriddle;
-
-    return (
-      <TypedGriddle
-        results={results}
-        columnMetadata={columnMeta}
-        rowMetadata={rowMetaData}
-        sortAscendingComponent={<span className="fa fa-sort-alpha-asc"/>}
-        sortDescendingComponent={<span className="fa fa-sort-alpha-desc"/>}
-        customRowComponent={LinkComponent} />
-    );
-  }
-}
-
-export default CustomColumnComponentGrid;
diff --git a/types/griddle-react/test/CustomFilterComponent.tsx b/types/griddle-react/test/CustomFilterComponent.tsx
deleted file mode 100644
index 5c8b8d629c..0000000000
--- a/types/griddle-react/test/CustomFilterComponent.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Licensed under the MIT License (MIT)
-
-Copyright (c) 2016 David Hara
-*/
-
-import * as _ from 'lodash';
-import * as React from 'react';
-import Griddle, { CustomFilterComponentProps } from 'griddle-react';
-
-const CustomFilterFunction = (items: ResultType[], query: string): ResultType[] => {
-  return _.filter(items, (item) => {
-    let match = false;
-    _.forIn(item, (value, key) => {
-      if (String(value).toLowerCase().indexOf(query.toLowerCase()) >= 0) {
-        match = true;
-        return;
-      }
-    });
-
-    return match;
-  });
-};
-
-class CustomFilterComponent extends React.Component<CustomFilterComponentProps> {
-  query = '';
-
-  searchChange(event: React.FormEvent<HTMLInputElement>) {
-    this.query = event.currentTarget.value;
-    this.props.changeFilter(this.query);
-  }
-
-  render() {
-    return (
-      <div className="filter-container">
-        <input type="text"
-               name="search"
-               placeholder="Search..."
-               onChange={this.searchChange.bind(this)}/>
-      </div>
-    );
-  }
-}
-
-interface ResultType {
-  id: number;
-  name: string;
-  city: string;
-  state: string;
-  country: string;
-  company: string;
-  favoriteNumber: number;
-}
-
-const someData: ResultType[] = [
-  {
-    id: 0,
-    name: "Mayer Leonard",
-    city: "Kapowsin",
-    state: "Hawaii",
-    country: "United Kingdom",
-    company: "Ovolo",
-    favoriteNumber: 7
-  },
-  {
-    id: 1,
-    name: "Koch Becker",
-    city: "Johnsonburg",
-    state: "New Jersey",
-    country: "Madagascar",
-    company: "Eventage",
-    favoriteNumber: 2
-  }
-];
-
-class CustomFilterComponentGrid extends React.Component {
-  render() {
-    type TypedGriddle = new () => Griddle<ResultType>;
-    const TypedGriddle = Griddle as TypedGriddle;
-
-    return (
-      <TypedGriddle results={someData} showFilter={true}
-                    useCustomFilterer={true} customFilterer={CustomFilterFunction}
-                    useCustomFilterComponent={true} customFilterComponent={CustomFilterComponent}/>
-    );
-  }
-}
-
-export default CustomFilterComponentGrid;
diff --git a/types/griddle-react/test/CustomHeaderComponent.tsx b/types/griddle-react/test/CustomHeaderComponent.tsx
deleted file mode 100644
index c5256956fc..0000000000
--- a/types/griddle-react/test/CustomHeaderComponent.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Licensed under the MIT License (MIT)
-
-Copyright (c) 2016 David Hara
-*/
-
-import * as React from 'react';
-import Griddle, { ColumnMetaData, CustomHeaderComponentProps } from 'griddle-react';
-
-interface MoreCustomHeaderComponentProps extends CustomHeaderComponentProps {
-  color: string;
-}
-
-class HeaderComponent extends React.Component<MoreCustomHeaderComponentProps> {
-  textOnClick(e: React.FormEvent<HTMLInputElement>) {
-    e.stopPropagation();
-  }
-
-  filterText(e: React.FormEvent<HTMLInputElement>) {
-    this.props.filterByColumn(e.currentTarget.value, this.props.columnName);
-  }
-
-  render() {
-    return (
-      <span>
-        <div><strong style={{color: this.props.color}}>{this.props.displayName}</strong></div>
-        <input type='text' onChange={this.filterText.bind(this)} onClick={this.textOnClick.bind(this)}/>
-      </span>
-    );
-  }
-}
-
-interface ResultType {
-  id: number;
-  name: string;
-  city: string;
-  state: string;
-  country: string;
-  company: string;
-  favoriteNumber: number;
-}
-
-const  someData: ResultType[] = [
-  {
-    id: 0,
-    name: "Mayer Leonard",
-    city: "Kapowsin",
-    state: "Hawaii",
-    country: "United Kingdom",
-    company: "Ovolo",
-    favoriteNumber: 7
-  },
-  {
-    id: 1,
-    name: "Koch Becker",
-    city: "Johnsonburg",
-    state: "New Jersey",
-    country: "Madagascar",
-    company: "Eventage",
-    favoriteNumber: 2
-  }
-];
-
-const  columnMeta: Array<ColumnMetaData<ResultType>> = [
-  {
-    columnName: 'name',
-    order: 1,
-    sortable: false,
-    visible: true,
-  },
-  {
-    columnName: 'city',
-    customHeaderComponent: HeaderComponent,
-    customHeaderComponentProps: {color: 'red'}
-  },
-  {
-    columnName: 'state',
-    customHeaderComponent: HeaderComponent,
-    customHeaderComponentProps: {color: 'blue'}
-  }
-];
-
-class CustomHeaderComponentGrid extends React.Component {
-  render() {
-    type TypedGriddle = new () => Griddle<ResultType>;
-    const TypedGriddle = Griddle as TypedGriddle;
-
-    return (
-      <TypedGriddle results={someData} columnMetadata={columnMeta} columns={["name", "city", "state", "country"]}/>
-    );
-  }
-}
-
-export default CustomHeaderComponentGrid;
diff --git a/types/griddle-react/test/index.tsx b/types/griddle-react/test/index.tsx
deleted file mode 100644
index b42513a34d..0000000000
--- a/types/griddle-react/test/index.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Licensed under the MIT License (MIT)
-
-Copyright (c) 2016 David Hara
-*/
-
-import * as React from 'react';
-import { render } from 'react-dom';
-import Griddle, { CustomColumnComponentProps } from 'griddle-react';
-import CustomColumnComponentGrid from './CustomColumnComponent';
-import CustomHeaderComponentGrid from './CustomHeaderComponent';
-import CustomFilterComponentGrid from './CustomFilterComponent';
-
-interface MyCustomResult {
-  name: string;
-  test: string;
-}
-
-class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>> {
-  render() {
-    const url = `speakers/${this.props.rowData.test}/${this.props.data}`;
-    return <a href={url}>{this.props.data}</a>;
-  }
-}
-
-const StatelessFunctionComponent = (props: CustomColumnComponentProps<MyCustomResult>) => {
-  const url = `speakers/${props.rowData.test}/${props.data}`;
-  return <a href={url}>{props.data}</a>;
-};
-
-const columnMeta = [
-  {
-    columnName: "name",
-    order: 1,
-    locked: false,
-    visible: true,
-    customComponent: StatelessFunctionComponent
-  }];
-
-const results: MyCustomResult[] = [
-  {
-    name: 'David Hara',
-    test: 'blah'
-  },
-  {
-    name: 'Hara, David',
-    test: 'blah2'
-  }
-];
-
-const rowMetaData = {
-  bodyCssClassName: (rowData: MyCustomResult) => {
-    return rowData.test;
-  }
-};
-
-type TypedGriddle = new () => Griddle<MyCustomResult>;
-const TypedGriddle = Griddle as TypedGriddle;
-
-render(
-  <div>
-    <h1>Custom Column Component Grid</h1>
-    <CustomColumnComponentGrid />
-    <h1>Custom Header Component Grid</h1>
-    <CustomHeaderComponentGrid />
-    <h1>Custom Filter Component Grid</h1>
-    <CustomFilterComponentGrid />
-    <TypedGriddle
-      results={results}
-      columnMetadata={columnMeta}
-      rowMetadata={rowMetaData}
-      sortAscendingComponent={<span className="fa fa-sort-alpha-asc"/>}
-      sortDescendingComponent={<span className="fa fa-sort-alpha-desc"/>}
-      customRowComponent={LinkComponent}
-    />
-  </div>,
-  document.getElementById('root')
-);
diff --git a/types/griddle-react/tsconfig.json b/types/griddle-react/tsconfig.json
deleted file mode 100644
index 8f233e8e23..0000000000
--- a/types/griddle-react/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "jsx": "preserve",
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "test/index.tsx",
-        "test/CustomColumnComponent.tsx",
-        "test/CustomFilterComponent.tsx",
-        "test/CustomHeaderComponent.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/gridfs-stream/tslint.json b/types/gridfs-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gridfs-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gridstack/index.d.ts b/types/gridstack/index.d.ts
index 20f01186c6..ec7899217c 100644
--- a/types/gridstack/index.d.ts
+++ b/types/gridstack/index.d.ts
@@ -321,7 +321,7 @@ interface IGridstackOptions {
     /**
      * if true widgets could be removed by dragging outside of the grid. It could also be a jQuery selector string, 
      */
-    removable?: boolean;
+    removable?: boolean | string;
     /**
      * time in milliseconds before widget is being removed while dragging outside of the grid. (default: 2000)
      */
diff --git a/types/gridstack/tslint.json b/types/gridstack/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gridstack/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/grunt/tslint.json b/types/grunt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/grunt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/guid/guid-tests.ts b/types/guid/guid-tests.ts
new file mode 100644
index 0000000000..52e0a738d1
--- /dev/null
+++ b/types/guid/guid-tests.ts
@@ -0,0 +1,18 @@
+import guid = require('guid');
+
+// $ExpectType object
+guid.create();
+
+// $ExpectType string
+guid.raw();
+
+const newRawGuid = guid.raw();
+
+// $ExpectType boolean
+guid.isGuid(newRawGuid);
+
+// $ExpectType string
+guid.EMPTY;
+
+// $ExpectType object
+guid(guid.create());
diff --git a/types/guid/index.d.ts b/types/guid/index.d.ts
new file mode 100644
index 0000000000..6025e90bf1
--- /dev/null
+++ b/types/guid/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for guid 1.0
+// Project: https://github.com/dandean/guid
+// Definitions by: Marc-Andre Roy <https://github.com/maroy1986>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = guid;
+
+declare function guid(guid: object): object;
+
+declare namespace guid {
+    const EMPTY: string;
+
+    const prototype: {
+    };
+
+    function create(): object;
+
+    function isGuid(value: string): boolean;
+
+    function raw(): string;
+}
diff --git a/types/guid/tsconfig.json b/types/guid/tsconfig.json
new file mode 100644
index 0000000000..17563577fd
--- /dev/null
+++ b/types/guid/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "guid-tests.ts"
+    ]
+}
diff --git a/types/guid/tslint.json b/types/guid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/guid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gulp-angular-templatecache/tsconfig.json b/types/gulp-angular-templatecache/tsconfig.json
index b494e68ba8..3971eae080 100644
--- a/types/gulp-angular-templatecache/tsconfig.json
+++ b/types/gulp-angular-templatecache/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-angular-templatecache/tslint.json b/types/gulp-angular-templatecache/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-angular-templatecache/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-autoprefixer/tsconfig.json b/types/gulp-autoprefixer/tsconfig.json
index dfaa5a3f0e..52fd74103c 100644
--- a/types/gulp-autoprefixer/tsconfig.json
+++ b/types/gulp-autoprefixer/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-autoprefixer/tslint.json b/types/gulp-autoprefixer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-autoprefixer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-babel/tslint.json b/types/gulp-babel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-babel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-batch/tsconfig.json b/types/gulp-batch/tsconfig.json
index bb64157b23..8b5bce2f98 100644
--- a/types/gulp-batch/tsconfig.json
+++ b/types/gulp-batch/tsconfig.json
@@ -16,11 +16,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-bump/gulp-bump-tests.ts b/types/gulp-bump/gulp-bump-tests.ts
new file mode 100644
index 0000000000..b15e800a5e
--- /dev/null
+++ b/types/gulp-bump/gulp-bump-tests.ts
@@ -0,0 +1,22 @@
+import * as gulp from 'gulp';
+import * as GulpBump from 'gulp-bump';
+
+gulp
+    .src('package.json')
+    .pipe(GulpBump())
+    .pipe(gulp.dest('./'));
+
+gulp
+    .src('package.json')
+    .pipe(GulpBump({regex: /^.+$/}))
+    .pipe(gulp.dest('./'));
+
+gulp
+    .src('package.json')
+    .pipe(GulpBump({version: '1.0.0', global: true}))
+    .pipe(gulp.dest('./'));
+
+gulp
+    .src('package.json')
+    .pipe(GulpBump({version: '1.0.0', case: true}))
+    .pipe(gulp.dest('./'));
diff --git a/types/gulp-bump/index.d.ts b/types/gulp-bump/index.d.ts
new file mode 100644
index 0000000000..4657dc06b2
--- /dev/null
+++ b/types/gulp-bump/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for gulp-bump 2.8
+// Project: https://github.com/stevelacy/gulp-bump
+// Definitions by: silkentrance <https://github.com/silkentrance>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import * as BumpRegex from 'bump-regex';
+
+declare function GulpBump(options?: BumpRegex.Options): NodeJS.ReadWriteStream;
+
+declare namespace GulpBump {
+}
+
+export = GulpBump;
diff --git a/types/gulp-bump/tsconfig.json b/types/gulp-bump/tsconfig.json
new file mode 100644
index 0000000000..003c952709
--- /dev/null
+++ b/types/gulp-bump/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "jsx": "react",
+        "types": [],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true,
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-bump-tests.ts"
+    ]
+}
diff --git a/types/gulp-bump/tslint.json b/types/gulp-bump/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/gulp-bump/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/gulp-cache/tsconfig.json b/types/gulp-cache/tsconfig.json
index 0012ddcd48..e947f63db5 100644
--- a/types/gulp-cache/tsconfig.json
+++ b/types/gulp-cache/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-cache/tslint.json b/types/gulp-cache/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-cache/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-cached/tsconfig.json b/types/gulp-cached/tsconfig.json
index 7195fa2007..cdec085a2b 100644
--- a/types/gulp-cached/tsconfig.json
+++ b/types/gulp-cached/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-cached/tslint.json b/types/gulp-cached/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-cached/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-changed/tsconfig.json b/types/gulp-changed/tsconfig.json
index c3bf70b010..d04c43b32e 100644
--- a/types/gulp-changed/tsconfig.json
+++ b/types/gulp-changed/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-changed/tslint.json b/types/gulp-changed/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-changed/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-cheerio/tsconfig.json b/types/gulp-cheerio/tsconfig.json
index 227362df78..be78d9969c 100644
--- a/types/gulp-cheerio/tsconfig.json
+++ b/types/gulp-cheerio/tsconfig.json
@@ -13,11 +13,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-cheerio/tslint.json b/types/gulp-cheerio/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-cheerio/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-clean-dest/gulp-clean-dest-tests.ts b/types/gulp-clean-dest/gulp-clean-dest-tests.ts
new file mode 100644
index 0000000000..22a14f7487
--- /dev/null
+++ b/types/gulp-clean-dest/gulp-clean-dest-tests.ts
@@ -0,0 +1,10 @@
+import cleanDest = require("gulp-clean-dest");
+
+const someDir = ".";
+
+// $ExpectType ReadWriteStream
+cleanDest(someDir);
+cleanDest(someDir, {});
+cleanDest(someDir, { cwd: someDir });
+cleanDest(someDir, { extension: ".ts" });
+cleanDest(someDir, { cwd: someDir, extension: ".ts" });
diff --git a/types/gulp-clean-dest/index.d.ts b/types/gulp-clean-dest/index.d.ts
new file mode 100644
index 0000000000..bbb33abad0
--- /dev/null
+++ b/types/gulp-clean-dest/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for gulp-clean-dest 0.2
+// Project: https://github.com/clark800/gulp-clean-dest
+// Definitions by: Andrey Lalev <https://github.com/andypyrope>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace gulpCleanDest {
+    interface Options {
+        /**
+         * The working directory the folder is relative to.
+         */
+        cwd?: string;
+
+        /**
+         * Extension of the destination files. Useful if it differs from the original.
+         */
+        extension?: string;
+    }
+}
+
+/**
+ * Removes files from the dest directory prior to building.
+ * @param destination The name of the dest directory
+ * @param options Options for the cleaning process
+ */
+declare function gulpCleanDest(destination: string, options?: gulpCleanDest.Options): NodeJS.ReadWriteStream;
+
+export = gulpCleanDest;
diff --git a/types/gulp-clean-dest/tsconfig.json b/types/gulp-clean-dest/tsconfig.json
new file mode 100644
index 0000000000..777c860568
--- /dev/null
+++ b/types/gulp-clean-dest/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-clean-dest-tests.ts"
+    ]
+}
diff --git a/types/gulp-clean-dest/tslint.json b/types/gulp-clean-dest/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-clean-dest/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gulp-coffeeify/tsconfig.json b/types/gulp-coffeeify/tsconfig.json
index 87113d7415..241ff2e5f8 100644
--- a/types/gulp-coffeeify/tsconfig.json
+++ b/types/gulp-coffeeify/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-coffeeify/tslint.json b/types/gulp-coffeeify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-coffeeify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-coffeelint/tsconfig.json b/types/gulp-coffeelint/tsconfig.json
index 6a570592f3..94e2edb626 100644
--- a/types/gulp-coffeelint/tsconfig.json
+++ b/types/gulp-coffeelint/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-coffeelint/tslint.json b/types/gulp-coffeelint/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-coffeelint/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-concat/tsconfig.json b/types/gulp-concat/tsconfig.json
index 0be8e7ed81..b28024194c 100644
--- a/types/gulp-concat/tsconfig.json
+++ b/types/gulp-concat/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-concat/tslint.json b/types/gulp-concat/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-concat/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-connect/index.d.ts b/types/gulp-connect/index.d.ts
index f023c2bff1..e099f62a39 100644
--- a/types/gulp-connect/index.d.ts
+++ b/types/gulp-connect/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/avevlad/gulp-connect#readme
 // Definitions by: Andre Wiggins <https://github.com/andrewiggins>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as http from "http";
 import * as https from "https";
diff --git a/types/gulp-copy/tsconfig.json b/types/gulp-copy/tsconfig.json
index cc162d9266..0c92078d28 100644
--- a/types/gulp-copy/tsconfig.json
+++ b/types/gulp-copy/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-copy/tslint.json b/types/gulp-copy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-copy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-csso/tsconfig.json b/types/gulp-csso/tsconfig.json
index 79361ceb1b..d0e22a2035 100644
--- a/types/gulp-csso/tsconfig.json
+++ b/types/gulp-csso/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-csso/tslint.json b/types/gulp-csso/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-csso/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-debug/tsconfig.json b/types/gulp-debug/tsconfig.json
index 8302ca5c8b..3dbd5e8109 100644
--- a/types/gulp-debug/tsconfig.json
+++ b/types/gulp-debug/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-debug/tslint.json b/types/gulp-debug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-debug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-dtsm/tsconfig.json b/types/gulp-dtsm/tsconfig.json
index 3fd7d615a4..dd1ca59de4 100644
--- a/types/gulp-dtsm/tsconfig.json
+++ b/types/gulp-dtsm/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-dtsm/tslint.json b/types/gulp-dtsm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-dtsm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-espower/tsconfig.json b/types/gulp-espower/tsconfig.json
index 7418c01526..cf469c3b13 100644
--- a/types/gulp-espower/tsconfig.json
+++ b/types/gulp-espower/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-espower/tslint.json b/types/gulp-espower/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-espower/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-file-include/tsconfig.json b/types/gulp-file-include/tsconfig.json
index 5fe64f435c..ab226efcb3 100644
--- a/types/gulp-file-include/tsconfig.json
+++ b/types/gulp-file-include/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-file-include/tslint.json b/types/gulp-file-include/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-file-include/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-filter/tsconfig.json b/types/gulp-filter/tsconfig.json
index f68c124ec5..f4f7d56d52 100644
--- a/types/gulp-filter/tsconfig.json
+++ b/types/gulp-filter/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-filter/tslint.json b/types/gulp-filter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-filter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-flatten/tsconfig.json b/types/gulp-flatten/tsconfig.json
index 2c189387f7..ab4f9a894a 100644
--- a/types/gulp-flatten/tsconfig.json
+++ b/types/gulp-flatten/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-flatten/tslint.json b/types/gulp-flatten/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-flatten/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-gh-pages/tsconfig.json b/types/gulp-gh-pages/tsconfig.json
index 76784cfd3d..1ea7bf2217 100644
--- a/types/gulp-gh-pages/tsconfig.json
+++ b/types/gulp-gh-pages/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-gh-pages/tslint.json b/types/gulp-gh-pages/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-gh-pages/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-gzip/tsconfig.json b/types/gulp-gzip/tsconfig.json
index f72b05fb7e..4f3f5f8d77 100644
--- a/types/gulp-gzip/tsconfig.json
+++ b/types/gulp-gzip/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-gzip/tslint.json b/types/gulp-gzip/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-gzip/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-help-doc/tsconfig.json b/types/gulp-help-doc/tsconfig.json
index 07185baa30..b6f16b60a9 100644
--- a/types/gulp-help-doc/tsconfig.json
+++ b/types/gulp-help-doc/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-help-doc/tslint.json b/types/gulp-help-doc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-help-doc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-help/index.d.ts b/types/gulp-help/index.d.ts
index f32258a589..3e726363b4 100644
--- a/types/gulp-help/index.d.ts
+++ b/types/gulp-help/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/chmontgomery/gulp-help
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="gulp" />
diff --git a/types/gulp-help/tsconfig.json b/types/gulp-help/tsconfig.json
index e8247d3ae3..a174bbab6e 100644
--- a/types/gulp-help/tsconfig.json
+++ b/types/gulp-help/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-help/tslint.json b/types/gulp-help/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-help/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-html-replace/tsconfig.json b/types/gulp-html-replace/tsconfig.json
index 0c5f9d408a..fcf17ed178 100644
--- a/types/gulp-html-replace/tsconfig.json
+++ b/types/gulp-html-replace/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-html-replace/tslint.json b/types/gulp-html-replace/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-html-replace/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-htmlmin/tsconfig.json b/types/gulp-htmlmin/tsconfig.json
index f45a7a0721..022acde96e 100644
--- a/types/gulp-htmlmin/tsconfig.json
+++ b/types/gulp-htmlmin/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-htmlmin/tslint.json b/types/gulp-htmlmin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-htmlmin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-if/tsconfig.json b/types/gulp-if/tsconfig.json
index c78250c104..bb2544820b 100644
--- a/types/gulp-if/tsconfig.json
+++ b/types/gulp-if/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-if/tslint.json b/types/gulp-if/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-if/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-inject/tsconfig.json b/types/gulp-inject/tsconfig.json
index 1d5bd5080b..aacadf6415 100644
--- a/types/gulp-inject/tsconfig.json
+++ b/types/gulp-inject/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-inject/tslint.json b/types/gulp-inject/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-inject/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-insert/tsconfig.json b/types/gulp-insert/tsconfig.json
index aca1a98ef4..6feda660ed 100644
--- a/types/gulp-insert/tsconfig.json
+++ b/types/gulp-insert/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-insert/tslint.json b/types/gulp-insert/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-insert/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-install/tsconfig.json b/types/gulp-install/tsconfig.json
index d5a0bdce77..e1b6063ac9 100644
--- a/types/gulp-install/tsconfig.json
+++ b/types/gulp-install/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-install/tslint.json b/types/gulp-install/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-install/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-istanbul/tsconfig.json b/types/gulp-istanbul/tsconfig.json
index 837285ca19..133f0cd935 100644
--- a/types/gulp-istanbul/tsconfig.json
+++ b/types/gulp-istanbul/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-istanbul/tslint.json b/types/gulp-istanbul/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-istanbul/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-jade/tsconfig.json b/types/gulp-jade/tsconfig.json
index 87dca8e4b2..7e924cb11b 100644
--- a/types/gulp-jade/tsconfig.json
+++ b/types/gulp-jade/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-jade/tslint.json b/types/gulp-jade/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-jade/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-jasmine-browser/tsconfig.json b/types/gulp-jasmine-browser/tsconfig.json
index 06b97335ea..55990f3261 100644
--- a/types/gulp-jasmine-browser/tsconfig.json
+++ b/types/gulp-jasmine-browser/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-jasmine-browser/tslint.json b/types/gulp-jasmine-browser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-jasmine-browser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-jasmine/gulp-jasmine-tests.ts b/types/gulp-jasmine/gulp-jasmine-tests.ts
new file mode 100644
index 0000000000..e40f187004
--- /dev/null
+++ b/types/gulp-jasmine/gulp-jasmine-tests.ts
@@ -0,0 +1,20 @@
+import gulpJasmine = require("gulp-jasmine");
+import jasmine = require("jasmine");
+
+const dummyReporter: jasmine.CustomReporter = {};
+
+gulpJasmine(); // $ExpectType ReadWriteStream
+gulpJasmine({});
+gulpJasmine({
+    verbose: true,
+    includeStackTrace: true,
+    reporter: dummyReporter,
+    timeout: 1000,
+    errorOnFail: false,
+    config: {}
+});
+gulpJasmine({ reporter: [dummyReporter, dummyReporter] });
+const readonlyDummyReporters: ReadonlyArray<jasmine.CustomReporter> = [
+    dummyReporter, dummyReporter
+];
+gulpJasmine({ reporter: readonlyDummyReporters });
diff --git a/types/gulp-jasmine/index.d.ts b/types/gulp-jasmine/index.d.ts
new file mode 100644
index 0000000000..f69fb865e6
--- /dev/null
+++ b/types/gulp-jasmine/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for gulp-jasmine 2.4
+// Project: https://github.com/sindresorhus/gulp-jasmine#readme
+// Definitions by: Andrey Lalev <https://github.com/andypyrope>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+/// <reference types="jasmine" />
+
+interface JasmineOptions {
+    /**
+     *  Display spec names in default reporter.
+     */
+    verbose?: boolean;
+
+    /**
+     * Include stack traces in failures in default reporter.
+     * @default false
+     */
+    includeStackTrace?: boolean;
+
+    /**
+     * Reporter(s) to use.
+     */
+    reporter?: jasmine.CustomReporter | ReadonlyArray<jasmine.CustomReporter>;
+
+    /**
+     * Time to wait in milliseconds before a test automatically fails.
+     * @default 5000
+     */
+    timeout?: number;
+
+    /**
+     * Stops the stream on failed tests.
+     * @default true
+     */
+    errorOnFail?: boolean;
+
+    /**
+     * Passes the config to Jasmine's loadConfig method.
+     */
+    config?: object;
+}
+
+/**
+ * Executes Jasmine tests. Emits a 'jasmineDone' event on success.
+ * @param options Optional options for the execution of the Jasmine test
+ */
+declare function gulpJasmine(options?: JasmineOptions): NodeJS.ReadWriteStream;
+export = gulpJasmine;
diff --git a/types/gulp-jasmine/tsconfig.json b/types/gulp-jasmine/tsconfig.json
new file mode 100644
index 0000000000..d44751f20b
--- /dev/null
+++ b/types/gulp-jasmine/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-jasmine-tests.ts"
+    ]
+}
diff --git a/types/gulp-jasmine/tslint.json b/types/gulp-jasmine/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-jasmine/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gulp-json-editor/tsconfig.json b/types/gulp-json-editor/tsconfig.json
index 1375d471be..4f224b2a01 100644
--- a/types/gulp-json-editor/tsconfig.json
+++ b/types/gulp-json-editor/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-json-editor/tslint.json b/types/gulp-json-editor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-json-editor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-jsonminify/gulp-jsonminify-tests.ts b/types/gulp-jsonminify/gulp-jsonminify-tests.ts
new file mode 100644
index 0000000000..23008bad7e
--- /dev/null
+++ b/types/gulp-jsonminify/gulp-jsonminify-tests.ts
@@ -0,0 +1,8 @@
+import * as gulp from 'gulp';
+import * as jsonminify from 'gulp-jsonminify';
+
+gulp.task('minify', () => {
+  return gulp.src('src/*.json')
+    .pipe(jsonminify())
+    .pipe(gulp.dest('dist'));
+});
diff --git a/types/gulp-jsonminify/index.d.ts b/types/gulp-jsonminify/index.d.ts
new file mode 100644
index 0000000000..f2ea2ba3ee
--- /dev/null
+++ b/types/gulp-jsonminify/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for gulp-jsonminify 1.0
+// Project: https://github.com/tcarlsen/gulp-jsonminify
+// Definitions by: Pine Mizune <https://github.com/pine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace jsonminify {
+}
+
+declare function jsonminify(): NodeJS.ReadWriteStream;
+
+export = jsonminify;
diff --git a/types/gulp-jsonminify/tsconfig.json b/types/gulp-jsonminify/tsconfig.json
new file mode 100644
index 0000000000..0b6036c600
--- /dev/null
+++ b/types/gulp-jsonminify/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-jsonminify-tests.ts"
+    ]
+}
diff --git a/types/gulp-jsonminify/tslint.json b/types/gulp-jsonminify/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-jsonminify/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gulp-jspm/tsconfig.json b/types/gulp-jspm/tsconfig.json
index 4c6b72f8dc..b612a0a146 100644
--- a/types/gulp-jspm/tsconfig.json
+++ b/types/gulp-jspm/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-jspm/tslint.json b/types/gulp-jspm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-jspm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-less/tsconfig.json b/types/gulp-less/tsconfig.json
index f171058365..e4c00666f5 100644
--- a/types/gulp-less/tsconfig.json
+++ b/types/gulp-less/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-less/tslint.json b/types/gulp-less/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-less/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-load-plugins/tsconfig.json b/types/gulp-load-plugins/tsconfig.json
index ba1a293ff2..880ad1acd1 100644
--- a/types/gulp-load-plugins/tsconfig.json
+++ b/types/gulp-load-plugins/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-load-plugins/tslint.json b/types/gulp-load-plugins/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-load-plugins/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-minify-css/tsconfig.json b/types/gulp-minify-css/tsconfig.json
index d819c27e96..ccb2e4b319 100644
--- a/types/gulp-minify-css/tsconfig.json
+++ b/types/gulp-minify-css/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-minify-css/tslint.json b/types/gulp-minify-css/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-minify-css/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-minify-html/tsconfig.json b/types/gulp-minify-html/tsconfig.json
index 76d980ea8d..80ef59bff4 100644
--- a/types/gulp-minify-html/tsconfig.json
+++ b/types/gulp-minify-html/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-minify-html/tslint.json b/types/gulp-minify-html/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-minify-html/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-mocha/tsconfig.json b/types/gulp-mocha/tsconfig.json
index 273fda23a6..52b200e921 100644
--- a/types/gulp-mocha/tsconfig.json
+++ b/types/gulp-mocha/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-mocha/tslint.json b/types/gulp-mocha/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-mocha/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-mustache/index.d.ts b/types/gulp-mustache/index.d.ts
index 3b01944b19..13e0198558 100644
--- a/types/gulp-mustache/index.d.ts
+++ b/types/gulp-mustache/index.d.ts
@@ -16,7 +16,7 @@ declare namespace GulpMustache {
 
     interface Options {
         extension?: string;
-        tags?: ReadonlyArray<string> | undefined;
+        tags?: ReadonlyArray<string>;
     }
 }
 
diff --git a/types/gulp-newer/tsconfig.json b/types/gulp-newer/tsconfig.json
index 6b5366c6c6..c139e12412 100644
--- a/types/gulp-newer/tsconfig.json
+++ b/types/gulp-newer/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-newer/tslint.json b/types/gulp-newer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-newer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-ng-annotate/tsconfig.json b/types/gulp-ng-annotate/tsconfig.json
index 63cd5003e0..1b7db8f980 100644
--- a/types/gulp-ng-annotate/tsconfig.json
+++ b/types/gulp-ng-annotate/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-ng-annotate/tslint.json b/types/gulp-ng-annotate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-ng-annotate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-nodemon/tsconfig.json b/types/gulp-nodemon/tsconfig.json
index 46bb88dd05..af6e7a7991 100644
--- a/types/gulp-nodemon/tsconfig.json
+++ b/types/gulp-nodemon/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-nodemon/tslint.json b/types/gulp-nodemon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-nodemon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-plumber/tsconfig.json b/types/gulp-plumber/tsconfig.json
index 2ba3904c26..ad53d6fde5 100644
--- a/types/gulp-plumber/tsconfig.json
+++ b/types/gulp-plumber/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-plumber/tslint.json b/types/gulp-plumber/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-plumber/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-protractor/tsconfig.json b/types/gulp-protractor/tsconfig.json
index 26c6e1555d..bb39acdbdc 100644
--- a/types/gulp-protractor/tsconfig.json
+++ b/types/gulp-protractor/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-protractor/tslint.json b/types/gulp-protractor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-protractor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-remember/tsconfig.json b/types/gulp-remember/tsconfig.json
index b4aab06a9a..02070e1b82 100644
--- a/types/gulp-remember/tsconfig.json
+++ b/types/gulp-remember/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-remember/tslint.json b/types/gulp-remember/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-remember/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-rename/tsconfig.json b/types/gulp-rename/tsconfig.json
index 41e681e145..b9b34366ee 100644
--- a/types/gulp-rename/tsconfig.json
+++ b/types/gulp-rename/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-rename/tslint.json b/types/gulp-rename/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-rename/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-replace/tsconfig.json b/types/gulp-replace/tsconfig.json
index dc8f1136a6..5d188a1919 100644
--- a/types/gulp-replace/tsconfig.json
+++ b/types/gulp-replace/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-replace/tslint.json b/types/gulp-replace/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-replace/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-rev-replace/tsconfig.json b/types/gulp-rev-replace/tsconfig.json
index 3b2af8ba17..c9a020605c 100644
--- a/types/gulp-rev-replace/tsconfig.json
+++ b/types/gulp-rev-replace/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-rev-replace/tslint.json b/types/gulp-rev-replace/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-rev-replace/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-rev/tsconfig.json b/types/gulp-rev/tsconfig.json
index 067b8c92f9..fac8396ef8 100644
--- a/types/gulp-rev/tsconfig.json
+++ b/types/gulp-rev/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-rev/tslint.json b/types/gulp-rev/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-rev/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-ruby-sass/tsconfig.json b/types/gulp-ruby-sass/tsconfig.json
index 75580fe986..947482e45c 100644
--- a/types/gulp-ruby-sass/tsconfig.json
+++ b/types/gulp-ruby-sass/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-ruby-sass/tslint.json b/types/gulp-ruby-sass/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-ruby-sass/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-sass/tsconfig.json b/types/gulp-sass/tsconfig.json
index efe0eabef2..311d0e2615 100644
--- a/types/gulp-sass/tsconfig.json
+++ b/types/gulp-sass/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-sass/tslint.json b/types/gulp-sass/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-sass/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-shell/tsconfig.json b/types/gulp-shell/tsconfig.json
index 98b9e954ff..d9797a8f28 100644
--- a/types/gulp-shell/tsconfig.json
+++ b/types/gulp-shell/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-shell/tslint.json b/types/gulp-shell/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-shell/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-size/tsconfig.json b/types/gulp-size/tsconfig.json
index f8cd52f4a8..2d84cb001c 100644
--- a/types/gulp-size/tsconfig.json
+++ b/types/gulp-size/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-sort/tsconfig.json b/types/gulp-sort/tsconfig.json
index 0292a80e42..df1ddc44e4 100644
--- a/types/gulp-sort/tsconfig.json
+++ b/types/gulp-sort/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-sort/tslint.json b/types/gulp-sort/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-sort/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-sourcemaps/tsconfig.json b/types/gulp-sourcemaps/tsconfig.json
index f5120afcf2..198b428937 100644
--- a/types/gulp-sourcemaps/tsconfig.json
+++ b/types/gulp-sourcemaps/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-sourcemaps/tslint.json b/types/gulp-sourcemaps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-sourcemaps/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-strip-debug/tsconfig.json b/types/gulp-strip-debug/tsconfig.json
index 6fbe80a409..ad5d90ca69 100644
--- a/types/gulp-strip-debug/tsconfig.json
+++ b/types/gulp-strip-debug/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-strip-debug/tslint.json b/types/gulp-strip-debug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-strip-debug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-svg-sprite/tsconfig.json b/types/gulp-svg-sprite/tsconfig.json
index 7e048c457d..ed703e4c09 100644
--- a/types/gulp-svg-sprite/tsconfig.json
+++ b/types/gulp-svg-sprite/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-svg-sprite/tslint.json b/types/gulp-svg-sprite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-svg-sprite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-task-listing/tsconfig.json b/types/gulp-task-listing/tsconfig.json
index 28850e65d1..6d99b2f3f2 100644
--- a/types/gulp-task-listing/tsconfig.json
+++ b/types/gulp-task-listing/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-task-listing/tslint.json b/types/gulp-task-listing/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-task-listing/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-tsd/tsconfig.json b/types/gulp-tsd/tsconfig.json
index b935f8e5e5..692c21e642 100644
--- a/types/gulp-tsd/tsconfig.json
+++ b/types/gulp-tsd/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-tsd/tslint.json b/types/gulp-tsd/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-tsd/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-tslint/gulp-tslint-tests.ts b/types/gulp-tslint/gulp-tslint-tests.ts
deleted file mode 100644
index efadfa9bb1..0000000000
--- a/types/gulp-tslint/gulp-tslint-tests.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-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(){
-    return gulp.src('source.ts')
-        .pipe(tslint())
-        .pipe(tslint.report('verbose'));
-});
-
-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",
- *   // Lines and characters start from 0
- *   "startPosition": {"position": 8, "line": 0, "character": 8},
- *   "endPosition": {"position": 9, "line": 0, "character": 9},
- *   "ruleName": "one-line"
- * }]
- */
-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. including the emitError boolean
-};
-
-gulp.task('invalid-custom', function(){
-    return gulp.src('input.ts')
-        .pipe(tslint())
-        .pipe(tslint.report(testReporter));
-});
-
-gulp.task('tslint-json', function(){
-    return gulp.src('input.ts')
-        .pipe(tslint({
-            configuration: {
-              rules: {
-                "class-name": true,
-                // ...
-              }
-            }
-        }))
-        .pipe(tslint.report('prose'));;
-});
-
-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/types/gulp-tslint/index.d.ts b/types/gulp-tslint/index.d.ts
deleted file mode 100644
index b5972dbae7..0000000000
--- a/types/gulp-tslint/index.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node"/>
-/// <reference types="vinyl" />
-
-import vinyl = require("vinyl");
-
-declare namespace gulpTsLint {
-    interface GulpTsLint {
-        (options?: Options): NodeJS.ReadWriteStream;
-        report(reporter?: Reporter, options?: ReportOptions): NodeJS.ReadWriteStream;
-        report(options?: ReportOptions): NodeJS.ReadWriteStream;
-    }
-
-    interface Options {
-        configuration?: {},
-        rulesDirectory?: string,
-        tslint?: GulpTsLint
-    }
-
-    interface ReportOptions {
-        emitError?: boolean,
-        reportLimit?: number,
-        summarizeFailureOutput?: boolean
-    }
-
-    interface Position {
-        position: number;
-        line: number;
-        character: number;
-    }
-
-    interface Output {
-        name: string;
-        failure: string;
-        startPosition: Position;
-        endPosition: Position;
-        ruleName: string;
-    }
-
-    type Reporter = string | ((output: Output[], file: vinyl, options: ReportOptions) => any);
-}
-
-declare var gulpTsLint: gulpTsLint.GulpTsLint;
-export = gulpTsLint;
diff --git a/types/gulp-tslint/tsconfig.json b/types/gulp-tslint/tsconfig.json
deleted file mode 100644
index 117173c83d..0000000000
--- a/types/gulp-tslint/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "gulp-tslint-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/gulp-typedoc/tsconfig.json b/types/gulp-typedoc/tsconfig.json
index 5fce39a6e5..04b9015fc3 100644
--- a/types/gulp-typedoc/tsconfig.json
+++ b/types/gulp-typedoc/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-typedoc/tslint.json b/types/gulp-typedoc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-typedoc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-useref/tsconfig.json b/types/gulp-useref/tsconfig.json
index ee962cd194..cdb7922c57 100644
--- a/types/gulp-useref/tsconfig.json
+++ b/types/gulp-useref/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-useref/tslint.json b/types/gulp-useref/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-useref/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp-util/gulp-util-tests.ts b/types/gulp-util/gulp-util-tests.ts
index 651f9bff9b..47e705bf00 100644
--- a/types/gulp-util/gulp-util-tests.ts
+++ b/types/gulp-util/gulp-util-tests.ts
@@ -1,21 +1,38 @@
 /// <reference types="mocha" />
-/// <reference types="should" />
 
 import gulp = require('gulp');
 import util = require('gulp-util');
 import path = require('path');
-import should = require('should');
 import Stream = require('stream');
 import through = require('through2');
-var es = require('event-stream');
+const es = require('event-stream');
+
+// TODO: These aren't useful as types tests since they take `any`.
+declare const should: ShouldStatic;
+interface ShouldStatic {
+	exist(obj: any, desc?: string): void;
+	not: this;
+}
+interface Should {
+	// tslint:disable-next-line ban-types
+	be: { instanceof(cls: Function): void; type(name: string): void; false: undefined; true: undefined; };
+	equal(obj: any): void;
+	eql(obj: any): void;
+	not: this;
+}
+declare global {
+	interface Object {
+		should: Should;
+	}
+}
 
 // ReSharper disable WrongExpressionStatement
 describe('File()', () => {
 	it('should return a valid file', done => {
-		var fname = path.join(__dirname, './fixtures/test.coffee');
-		var base = path.join(__dirname, './fixtures/');
-		var file = new util.File({
-			base: base,
+		const fname = path.join(__dirname, './fixtures/test.coffee');
+		const base = path.join(__dirname, './fixtures/');
+		const file = new util.File({
+			base,
 			cwd: __dirname,
 			path: fname
 		});
@@ -32,10 +49,10 @@ describe('File()', () => {
 	});
 
 	it('should return a valid file 2', done => {
-		var fname = path.join(__dirname, './fixtures/test.coffee');
-		var base = __dirname;
-		var file = new util.File({
-			base: base,
+		const fname = path.join(__dirname, './fixtures/test.coffee');
+		const base = __dirname;
+		const file = new util.File({
+			base,
 			cwd: __dirname,
 			path: fname
 		});
@@ -54,32 +71,31 @@ describe('File()', () => {
 
 describe('replaceExtension()', () => {
 	it('should return a valid replaced extension on nested', done => {
-		var fname = path.join(__dirname, './fixtures/test.coffee');
-		var expected = path.join(__dirname, './fixtures/test.js');
-		var nu = util.replaceExtension(fname, '.js');
+		const fname = path.join(__dirname, './fixtures/test.coffee');
+		const expected = path.join(__dirname, './fixtures/test.js');
+		const nu = util.replaceExtension(fname, '.js');
 		should.exist(nu);
 		nu.should.equal(expected);
 		done();
 	});
 
 	it('should return a valid replaced extension on flat', done => {
-		var fname = 'test.coffee';
-		var expected = 'test.js';
-		var nu = util.replaceExtension(fname, '.js');
+		const fname = 'test.coffee';
+		const expected = 'test.js';
+		const nu = util.replaceExtension(fname, '.js');
 		should.exist(nu);
 		nu.should.equal(expected);
 		done();
 	});
 
 	it('should not return a valid replaced extension on empty string', done => {
-		var fname = '';
-		var expected = '';
-		var nu = util.replaceExtension(fname, '.js');
+		const fname = '';
+		const expected = '';
+		const nu = util.replaceExtension(fname, '.js');
 		should.exist(nu);
 		nu.should.equal(expected);
 		done();
 	});
-
 });
 
 describe('colors', () => {
@@ -96,14 +112,14 @@ describe('date', () => {
 		done();
 	});
 	it('should return today\'s date', done => {
-		var time = new Date();
-		var dateutil = util.date('HH:MM:ss');
-		dateutil.should.equal(('0' + time.getHours()).slice(-2) + ':' + ('0' + time.getMinutes()).slice(-2) + ':' + ('0' + time.getSeconds()).slice(-2));
+		const time = new Date();
+		const dateutil = util.date('HH:MM:ss');
+		dateutil.should.equal(`${('0' + time.getHours()).slice(-2)}:${('0' + time.getMinutes()).slice(-2)}:${('0' + time.getSeconds()).slice(-2)}`);
 		done();
 	});
 });
 
-var now = new Date();
+const now = new Date();
 
 // Basic usage
 util.date(now, 'dddd, mmmm dS, yyyy, h:MM:ss TT');
@@ -157,11 +173,11 @@ util.date(now, 'N');
 
 describe('log()', () => {
 	it('should work i guess', done => {
-		var writtenValue = '';
+		const writtenValue = '';
 
 		util.log(1, 2, 3, 4, 'five');
-		var time = util.date(new Date(), 'HH:MM:ss');
-		writtenValue.should.eql('[' + util.colors.gray(time) + '] 1 2 3 4 five\n');
+		const time = util.date(new Date(), 'HH:MM:ss');
+		writtenValue.should.eql(`[${util.colors.gray(time)}] 1 2 3 4 five\n`);
 
 		done();
 	});
@@ -169,34 +185,34 @@ describe('log()', () => {
 
 describe('template()', () => {
 	it('should work with just a template', done => {
-		var opt = {
+		const opt = {
 			name: 'todd',
 			file: {
 				path: 'hi.js'
 			}
 		};
-		var expected = 'test todd hi.js';
+		const expected = 'test todd hi.js';
 
-		var tmpl = util.template('test <%= name %> <%= file.path %>');
+		const tmpl = util.template('test <%= name %> <%= file.path %>');
 		should.exist(tmpl);
 		'function'.should.equal(typeof (tmpl));
 
 		// eval it now
-		var etmpl = tmpl(opt);
+		const etmpl = tmpl(opt);
 		'string'.should.equal(typeof (etmpl));
 		etmpl.should.equal(expected);
 		done();
 	});
 
 	it('should work with a template and data', done => {
-		var opt = {
+		const opt = {
 			name: 'todd',
 			file: {
 				path: 'hi.js'
 			}
 		};
-		var expected = 'test todd hi.js';
-		var tmpl = util.template('test <%= name %> <%= file.path %>', opt);
+		const expected = 'test todd hi.js';
+		const tmpl = util.template('test <%= name %> <%= file.path %>', opt);
 		should.exist(tmpl);
 		'string'.should.equal(typeof (tmpl));
 		tmpl.should.equal(expected);
@@ -204,11 +220,11 @@ describe('template()', () => {
 	});
 
 	//it('should throw an error when no file object is passed', done => {
-	//	var opt = {
+	//	const opt = {
 	//		name: 'todd'
 	//	};
 	//	try {
-	//		var tmpl = util.template('test <%= name %> <%= file.path %>', opt);
+	//		const tmpl = util.template('test <%= name %> <%= file.path %>', opt);
 	//	} catch (err) {
 	//		should.exist(err);
 	//		done();
@@ -216,23 +232,23 @@ describe('template()', () => {
 	//});
 
 	it('should ignore modified templateSettings', done => {
-		var templateSettings = require('lodash.templatesettings');
+		const templateSettings = require('lodash.templatesettings');
 		templateSettings.interpolate = /\{\{([\s\S]+?)\}\}/g;
 
-		var opt = {
+		const opt = {
 			name: 'todd',
 			file: {
 				path: 'hi.js'
 			}
 		};
-		var expected = 'test {{name}} hi.js';
+		const expected = 'test {{name}} hi.js';
 
-		var tmpl = util.template('test {{name}} <%= file.path %>');
+		const tmpl = util.template('test {{name}} <%= file.path %>');
 		should.exist(tmpl);
 		'function'.should.equal(typeof (tmpl));
 
 		// eval it now
-		var etmpl = tmpl(opt);
+		const etmpl = tmpl(opt);
 		'string'.should.equal(typeof (etmpl));
 		etmpl.should.equal(expected);
 
@@ -240,26 +256,25 @@ describe('template()', () => {
 	});
 
 	it('should allow ES6 delimiters', done => {
-		var opt = {
+		const opt = {
 			name: 'todd',
 			file: {
 				path: 'hi.js'
 			}
 		};
-		var expected = 'test todd hi.js';
+		const expected = 'test todd hi.js';
 
-		var tmpl = util.template('test ${name} ${file.path}');
+		const tmpl = util.template('test ${name} ${file.path}'); // tslint:disable-line no-invalid-template-strings
 		should.exist(tmpl);
 		'function'.should.equal(typeof (tmpl));
 
 		// eval it now
-		var etmpl = tmpl(opt);
+		const etmpl = tmpl(opt);
 		'string'.should.equal(typeof (etmpl));
 		etmpl.should.equal(expected);
 
 		done();
 	});
-
 });
 
 describe('env', () => {
@@ -276,8 +291,8 @@ describe('noop()', () => {
 		done();
 	});
 	it('should return a stream that passes through all data', done => {
-		var inp = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-		var stream = util.noop();
+		const inp = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+		const stream = util.noop();
 		es.readArray(inp)
 			.pipe(stream)
 			.pipe(es.writeArray((err: Error, arr: any[]) => {
@@ -291,7 +306,7 @@ describe('noop()', () => {
 
 describe('beep()', () => {
 	it('should send the right code to stdout', done => {
-		var writtenValue = '';
+		const writtenValue = '';
 
 		util.beep();
 		writtenValue.should.equal('\x07');
@@ -338,45 +353,45 @@ describe('isNull()', () => {
 });
 
 // linefeed
-declare var lines: string[];
+declare const lines: string[];
 lines.join(util.linefeed);
 
 describe('combine()', () => {
 	it('should return a function', done => {
-		var src = [1, 2, 3];
-		var inp = es.readArray(src);
-		var factory = util.combine(inp);
+		const src = [1, 2, 3];
+		const inp = es.readArray(src);
+		const factory = util.combine(inp);
 		factory.should.be.type('function');
 		done();
 	});
 	it('should return a function that returns a stream combination', done => {
-		var src = [1, 2, 3];
-		var inp = es.readArray(src);
-		var inp2 = es.writeArray((err: Error, data: any[]) => {
+		const src = [1, 2, 3];
+		const inp = es.readArray(src);
+		const inp2 = es.writeArray((err: Error, data: any[]) => {
 			should.not.exist(err);
 			data.should.eql(src);
 			done();
 		});
-		var factory = util.combine(inp, inp2);
+		const factory = util.combine(inp, inp2);
 		factory().should.be.instanceof(Stream.Readable);
 	});
 	it('should return a function that returns a stream combination when given an array', done => {
-		var src = [1, 2, 3];
-		var inp = es.readArray(src);
-		var inp2 = es.writeArray((err: Error, data: any[]) => {
+		const src = [1, 2, 3];
+		const inp = es.readArray(src);
+		const inp2 = es.writeArray((err: Error, data: any[]) => {
 			should.not.exist(err);
 			data.should.eql(src);
 			done();
 		});
-		var factory = util.combine([inp, inp2]);
+		const factory = util.combine([inp, inp2]);
 		factory().should.be.instanceof(Stream.Readable);
 	});
 });
 
 describe('buffer()', () => {
 	it('should buffer stuff and return an array into the callback', done => {
-		var src = [1, 2, 3];
-		var inp = es.readArray(src);
+		const src = [1, 2, 3];
+		const inp = es.readArray(src);
 		inp.pipe(util.buffer((err: Error, data: any[]) => {
 			should.not.exist(err);
 			should.exist(data);
@@ -385,8 +400,8 @@ describe('buffer()', () => {
 		}));
 	});
 	it('should buffer stuff and emit it as a data event', done => {
-		var src = [1, 2, 3];
-		var inp = es.readArray(src);
+		const src = [1, 2, 3];
+		const inp = es.readArray(src);
 		inp.pipe(util.buffer()).on('data', (data: any[]) => {
 			should.exist(data);
 			data.should.eql(src);
@@ -394,8 +409,8 @@ describe('buffer()', () => {
 		});
 	});
 	it('should buffer stuff and return a stream with the buffered data', done => {
-		var src = [1, 2, 3];
-		var inp = es.readArray(src);
+		const src = [1, 2, 3];
+		const inp = es.readArray(src);
 		inp.pipe(util.buffer()).pipe(es.through((data: any[]) => {
 			should.exist(data);
 			data.should.eql(src);
@@ -406,35 +421,35 @@ describe('buffer()', () => {
 
 describe('PluginError()', () => {
 	it('should default name to Error', () => {
-		var err = new util.PluginError('test', 'something broke');
+		const err = new util.PluginError('test', 'something broke');
 		err.name.should.equal('Error');
 	});
 
 	it('should default name to Error, even when wrapped error has no name', () => {
-		var realErr = { message: 'something broke' };
-		var err = new util.PluginError('test', realErr);
+		const realErr = { message: 'something broke' };
+		const err = new util.PluginError('test', realErr);
 		err.name.should.equal('Error');
 	});
 
 	it('should print the plugin name in toString', () => {
-		var err = new util.PluginError('test', 'something broke');
+		const err = new util.PluginError('test', 'something broke');
 		err.toString().indexOf('test').should.not.equal(-1);
 	});
 
 	it('should not include the stack by default in toString', () => {
-		var err = new util.PluginError('test', 'something broke');
+		const err = new util.PluginError('test', 'something broke');
 		// just check that there are no 'at' lines
 		err.toString().indexOf('at').should.equal(-1);
 	});
 
 	it('should include the stack when specified in toString', () => {
-		var err = new util.PluginError('test', 'something broke', { stack: "at huh", showStack: true });
+		const err = new util.PluginError('test', 'something broke', { stack: "at huh", showStack: true });
 		// just check that there are 'at' lines
 		err.toString().indexOf('at').should.not.equal(-1);
 	});
 
 	it('should take arguments as one object', () => {
-		var err = new util.PluginError({
+		const err = new util.PluginError({
 			plugin: 'test',
 			message: 'something broke'
 		});
@@ -443,7 +458,7 @@ describe('PluginError()', () => {
 	});
 
 	it('should take arguments as plugin name and one object', () => {
-		var err = new util.PluginError('test', {
+		const err = new util.PluginError('test', {
 			message: 'something broke'
 		});
 		err.plugin.should.equal('test');
@@ -451,22 +466,22 @@ describe('PluginError()', () => {
 	});
 
 	it('should take arguments as plugin name and message', () => {
-		var err = new util.PluginError('test', 'something broke');
+		const err = new util.PluginError('test', 'something broke');
 		err.plugin.should.equal('test');
 		err.message.should.equal('something broke');
 	});
 
 	it('should take arguments as plugin name, message, and one object', () => {
-		var err = new util.PluginError('test', 'something broke', { showStack: true });
+		const err = new util.PluginError('test', 'something broke', { showStack: true });
 		err.plugin.should.equal('test');
 		err.message.should.equal('something broke');
 		err.showStack.should.equal(true);
 	});
 
 	it('should take arguments as plugin name, error, and one object', () => {
-		var realErr = new Error('something broke');
-		(<any>realErr).fileName = 'original.js';
-		var err = new util.PluginError('test', realErr, { showStack: true, fileName: 'override.js' });
+		const realErr = new Error('something broke') as Error & { fileName: string };
+		realErr.fileName = 'original.js';
+		const err = new util.PluginError('test', realErr, { showStack: true, fileName: 'override.js' });
 		err.plugin.should.equal('test');
 		err.message.should.equal('something broke');
 		err.fileName.should.equal('override.js');
@@ -474,26 +489,27 @@ describe('PluginError()', () => {
 	});
 
 	it('should take properties from error', () => {
-		var realErr = new Error('something broke');
-		(<any>realErr).abstractProperty = 'abstract';
-		var err = new util.PluginError('test', realErr);
+		const realErr = new Error('something broke') as Error & { abstractProperty: string };
+		realErr.abstractProperty = 'abstract';
+		const err = new util.PluginError('test', realErr);
 		err.plugin.should.equal('test');
 		err.message.should.equal('something broke');
-		(<any>err).abstractProperty.should.equal('abstract');
+		// TODO: use generics to make this work without a cast?
+		(err as util.PluginError & { abstractProperty: string }).abstractProperty.should.equal('abstract');
 	});
 
 	it('should be configured to show properties by default', () => {
-		var err = new util.PluginError('test', 'something broke');
+		const err = new util.PluginError('test', 'something broke');
 		err.showProperties.should.be.true;
 	});
 
 	it('should not be configured to take option to show properties', () => {
-		var err = new util.PluginError('test', 'something broke', { showProperties: false });
+		const err = new util.PluginError('test', 'something broke', { showProperties: false });
 		err.showProperties.should.be.false;
 	});
 
 	it('should show properties', () => {
-		var err = new util.PluginError('test', 'it broke', { showProperties: true });
+		const err = new util.PluginError('test', 'it broke', { showProperties: true });
 		err.fileName = 'original.js';
 		err.lineNumber = 35;
 		err.toString().indexOf('it broke').should.not.equal(-1);
@@ -502,25 +518,25 @@ describe('PluginError()', () => {
 	});
 
 	it('should show properties', () => {
-		var realErr = new Error('something broke');
-		(<any>realErr).fileName = 'original.js';
-		(<any>realErr).lineNumber = 35;
-		var err = new util.PluginError('test', realErr, { showProperties: true });
+		const realErr = new Error('something broke') as Error & { fileName: string, lineNumber: number };
+		realErr.fileName = 'original.js';
+		realErr.lineNumber = 35;
+		const err = new util.PluginError('test', realErr, { showProperties: true });
 		err.toString().indexOf('message:').should.equal(-1);
 		err.toString().indexOf('fileName:').should.not.equal(-1);
 	});
 
 	it('should not show properties', () => {
-		var realErr = new Error('something broke');
-		(<any>realErr).fileName = 'original.js';
-		(<any>realErr).lineNumber = 35;
-		var err = new util.PluginError('test', realErr, { showProperties: false });
+		const realErr = new Error('something broke') as Error & { fileName: string, lineNumber: number };
+		realErr.fileName = 'original.js';
+		realErr.lineNumber = 35;
+		const err = new util.PluginError('test', realErr, { showProperties: false });
 		err.toString().indexOf('message:').should.equal(-1);
 		err.toString().indexOf('fileName:').should.equal(-1);
 	});
 
 	it('should not show properties, but should show stack', () => {
-		var err = new util.PluginError('test', 'it broke', { stack: 'test stack', showStack: true, showProperties: false });
+		const err = new util.PluginError('test', 'it broke', { stack: 'test stack', showStack: true, showProperties: false });
 		err.fileName = 'original.js';
 		err.lineNumber = 35;
 		err.toString().indexOf('message:').should.equal(-1);
@@ -529,40 +545,40 @@ describe('PluginError()', () => {
 	});
 
 	it('should not show properties, but should show stack for real error', () => {
-		var realErr = new Error('something broke');
-		(<any>realErr).fileName = 'original.js';
-		(<any>realErr).lineNumber = 35;
-		(<any>realErr).stack = 'test stack';
-		var err = new util.PluginError('test', realErr, { showStack: true, showProperties: false });
+		const realErr = new Error('something broke') as Error & { fileName: string, lineNumber: number };
+		realErr.fileName = 'original.js';
+		realErr.lineNumber = 35;
+		realErr.stack = 'test stack';
+		const err = new util.PluginError('test', realErr, { showStack: true, showProperties: false });
 		err.toString().indexOf('message:').should.equal(-1);
 		err.toString().indexOf('fileName:').should.equal(-1);
 		err.toString().indexOf('test stack').should.not.equal(-1);
 	});
 
 	it('should not show properties, but should show stack for _stack', () => {
-		var realErr = new Error('something broke');
-		(<any>realErr).fileName = 'original.js';
-		(<any>realErr).lineNumber = 35;
-		(<any>realErr)._stack = 'test stack';
-		var err = new util.PluginError('test', realErr, { showStack: true, showProperties: false });
+		const realErr = new Error('something broke') as Error & { fileName: string, lineNumber: number, _stack: string };
+		realErr.fileName = 'original.js';
+		realErr.lineNumber = 35;
+		realErr._stack = 'test stack';
+		const err = new util.PluginError('test', realErr, { showStack: true, showProperties: false });
 		err.toString().indexOf('message:').should.equal(-1);
 		err.toString().indexOf('fileName:').should.equal(-1);
 		err.toString().indexOf('test stack').should.not.equal(-1);
 	});
 
 	it('should show properties and stack', () => {
-		var realErr = new Error('something broke');
-		(<any>realErr).fileName = 'original.js';
-		(<any>realErr).stack = 'test stack';
-		var err = new util.PluginError('test', realErr, { showStack: true });
+		const realErr = new Error('something broke') as Error & { fileName: string };
+		realErr.fileName = 'original.js';
+		realErr.stack = 'test stack';
+		const err = new util.PluginError('test', realErr, { showStack: true });
 		err.toString().indexOf('message:').should.equal(-1);
 		err.toString().indexOf('fileName:').should.not.equal(-1);
 		err.toString().indexOf('test stack').should.not.equal(-1);
 	});
 
 	it('should show properties added after the error is created', () => {
-		var realErr = new Error('something broke');
-		var err = new util.PluginError('test', realErr);
+		const realErr = new Error('something broke');
+		const err = new util.PluginError('test', realErr);
 		err.fileName = 'original.js';
 		err.toString().indexOf('message:').should.equal(-1);
 		err.toString().indexOf('fileName:').should.not.equal(-1);
@@ -571,8 +587,8 @@ describe('PluginError()', () => {
 	it('should toString quickly', function(done) {
 		this.timeout(100);
 
-		var err = new util.PluginError('test', 'it broke', { showStack: true });
-		var str = err.toString();
+		const err = new util.PluginError('test', 'it broke', { showStack: true });
+		const str = err.toString();
 
 		done();
 	});
@@ -580,15 +596,15 @@ describe('PluginError()', () => {
 	it('should toString quickly with original error', function(done) {
 		this.timeout(100);
 
-		var realErr = new Error('it broke');
-		var err = new util.PluginError('test', realErr, { showStack: true });
-		var str = err.toString();
+		const realErr = new Error('it broke');
+		const err = new util.PluginError('test', realErr, { showStack: true });
+		const str = err.toString();
 
 		done();
 	});
 
 	it('should not show "Details:" if there are no properties to show', () => {
-		var err = new util.PluginError('plugin', 'message');
+		const err = new util.PluginError('plugin', 'message');
 		err.toString().indexOf('Details:').should.equal(-1);
 	});
 });
diff --git a/types/gulp-util/index.d.ts b/types/gulp-util/index.d.ts
index ee059ca986..d7538ee572 100644
--- a/types/gulp-util/index.d.ts
+++ b/types/gulp-util/index.d.ts
@@ -1,53 +1,50 @@
-// Type definitions for gulp-util v3.0.x
+// Type definitions for gulp-util 3.0
 // Project: https://github.com/gulpjs/gulp-util
 // Definitions by: jedmao <https://github.com/jedmao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="chalk" />
-/// <reference types="vinyl" />
 
 import vinyl = require('vinyl');
-import chalk = require('chalk');
+import chalk from 'chalk';
 import through2 = require('through2');
 
 export { vinyl as File };
 
 /**
-* Replaces a file extension in a path. Returns the new path.
-*/
+ * Replaces a file extension in a path. Returns the new path.
+ */
 export function replaceExtension(npath: string, ext: string): string;
 
-export var colors: typeof chalk;
+export const colors: typeof chalk;
 
-export var date: {
-	(now?: Date, mask?: string, convertLocalTimeToUTC?: boolean): any;
-	(date?: string, mask?: string, convertLocalTimeToUTC?: boolean): any;
+export const date: {
+	(now?: Date | string, mask?: string, convertLocalTimeToUTC?: boolean): any;
 	masks: any;
 };
 
 /**
-* Logs stuff. Already prefixed with [gulp] and all that. Use the right colors
-* for values. If you pass in multiple arguments it will join them by a space.
-*/
+ * Logs stuff. Already prefixed with [gulp] and all that. Use the right colors
+ * for values. If you pass in multiple arguments it will join them by a space.
+ */
 export function log(message?: any, ...optionalParams: any[]): void;
 
 /**
-* This is a lodash.template function wrapper. You must pass in a valid gulp
-* file object so it is available to the user or it will error. You can not
-* configure any of the delimiters. Look at the lodash docs for more info.
-*/
+ * This is a lodash.template function wrapper. You must pass in a valid gulp
+ * file object so it is available to the user or it will error. You can not
+ * configure any of the delimiters. Look at the lodash docs for more info.
+ */
 export function template(tmpl: string): (opt: { file: { path: string } }) => string;
 export function template(tmpl: string, opt: { file: { path: string } }): string;
 
-export var env: any;
+export const env: any;
 
 export function beep(): void;
 
 /**
-* Returns a stream that does nothing but pass data straight through.
-*/
-export var noop: typeof through2;
+ * Returns a stream that does nothing but pass data straight through.
+ */
+export const noop: typeof through2;
 
 export function isStream(obj: any): boolean;
 
@@ -55,47 +52,46 @@ export function isBuffer(obj: any): boolean;
 
 export function isNull(obj: any): boolean;
 
-export var linefeed: string;
+export const linefeed: string;
 
 export function combine(streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
 export function combine(...streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
 
 /**
-* This is similar to es.wait but instead of buffering text into one string
-* it buffers anything into an array (so very useful for file objects).
-*/
+ * This is similar to es.wait but instead of buffering text into one string
+ * it buffers anything into an array (so very useful for file objects).
+ */
 export function buffer(cb?: (err: Error, data: any[]) => void): NodeJS.ReadWriteStream;
 
 export class PluginError implements Error, PluginErrorOptions {
 	constructor(options?: PluginErrorOptions);
 	constructor(pluginName: string, options?: PluginErrorOptions);
-	constructor(pluginName: string, message: string, options?: PluginErrorOptions);
-	constructor(pluginName: string, message: Error, options?: PluginErrorOptions);
+	constructor(pluginName: string, message: string | Error, options?: PluginErrorOptions);
 	/**
-	* The module name of your plugin.
-	*/
+	 * The module name of your plugin.
+	 */
 	name: string;
 	/**
-	* Can be a string or an existing error.
-	*/
+	 * Can be a string or an existing error.
+	 */
 	message: any;
 	fileName: string;
 	lineNumber: number;
 	/**
-	* You need to include the message along with this stack. If you pass an
-	* error in as the message the stack will be pulled from that, otherwise one
-	* will be created.
-	*/
+	 * You need to include the message along with this stack. If you pass an
+	 * error in as the message the stack will be pulled from that, otherwise one
+	 * will be created.
+	 */
 	stack: string;
 	/**
-	* By default the stack will not be shown. Set this to true if you think the
-	* stack is important for your error.
-	*/
+	 * By default the stack will not be shown. Set this to true if you think the
+	 * stack is important for your error.
+	 */
 	showStack: boolean;
 	/**
-	* Error properties will be included in err.toString(). Can be omitted by
-	* setting this to false.
-	*/
+	 * Error properties will be included in err.toString(). Can be omitted by
+	 * setting this to false.
+	 */
 	showProperties: boolean;
 	plugin: string;
 	error: Error;
@@ -103,30 +99,30 @@ export class PluginError implements Error, PluginErrorOptions {
 
 export interface PluginErrorOptions {
 	/**
-	* The module name of your plugin.
-	*/
+	 * The module name of your plugin.
+	 */
 	name?: string;
 	/**
-	* Can be a string or an existing error.
-	*/
+	 * Can be a string or an existing error.
+	 */
 	message?: any;
 	fileName?: string;
 	lineNumber?: number;
 	/**
-	* You need to include the message along with this stack. If you pass an
-	* error in as the message the stack will be pulled from that, otherwise one
-	* will be created.
-	*/
+	 * You need to include the message along with this stack. If you pass an
+	 * error in as the message the stack will be pulled from that, otherwise one
+	 * will be created.
+	 */
 	stack?: string;
 	/**
-	* By default the stack will not be shown. Set this to true if you think the
-	* stack is important for your error.
-	*/
+	 * By default the stack will not be shown. Set this to true if you think the
+	 * stack is important for your error.
+	 */
 	showStack?: boolean;
 	/**
-	* Error properties will be included in err.toString(). Can be omitted by
-	* setting this to false.
-	*/
+	 * Error properties will be included in err.toString(). Can be omitted by
+	 * setting this to false.
+	 */
 	showProperties?: boolean;
 	plugin?: string;
 	error?: Error;
diff --git a/types/gulp-util/package.json b/types/gulp-util/package.json
new file mode 100644
index 0000000000..2cc9b48ed6
--- /dev/null
+++ b/types/gulp-util/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "chalk": "^2.2.0"
+    }
+}
diff --git a/types/gulp-util/tsconfig.json b/types/gulp-util/tsconfig.json
index 66cca3e125..f383866019 100644
--- a/types/gulp-util/tsconfig.json
+++ b/types/gulp-util/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-util/tslint.json b/types/gulp-util/tslint.json
new file mode 100644
index 0000000000..e1a7487f42
--- /dev/null
+++ b/types/gulp-util/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "comment-format": false, // TODO
+        "no-var-requires": false // TODO
+    }
+}
diff --git a/types/gulp-watch/tsconfig.json b/types/gulp-watch/tsconfig.json
index 9dc56e0f0c..079cb9d569 100644
--- a/types/gulp-watch/tsconfig.json
+++ b/types/gulp-watch/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/gulp-watch/tslint.json b/types/gulp-watch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp-watch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gulp/index.d.ts b/types/gulp/index.d.ts
index 465cceb4e5..161cd998c4 100644
--- a/types/gulp/index.d.ts
+++ b/types/gulp/index.d.ts
@@ -33,14 +33,12 @@ declare namespace GulpClient {
          * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
          * Folders that don't exist will be created.
          * @param path The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
-         * @param options
          */
         dest: DestMethod;
 
         /**
          * Functions exactly like gulp.dest, but will create symlinks instead of copying a directory.
          * @param folder A folder path or a function that receives in a file and returns a folder path.
-         * @param options
          */
         symlink: typeof vfs.symlink;
 
diff --git a/types/gulp/v3/index.d.ts b/types/gulp/v3/index.d.ts
index 4abdba21ed..98a26d040d 100644
--- a/types/gulp/v3/index.d.ts
+++ b/types/gulp/v3/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://gulpjs.com
 // Definitions by: Drew Noakes <https://drewnoakes.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="orchestrator" />
diff --git a/types/gulp/v3/tsconfig.json b/types/gulp/v3/tsconfig.json
index 1a7d4547b7..2948f23682 100644
--- a/types/gulp/v3/tsconfig.json
+++ b/types/gulp/v3/tsconfig.json
@@ -16,8 +16,8 @@
             "gulp": [
                 "gulp/v3"
             ],
-            "q": [
-                "q/v0"
+            "micromatch": [
+                "micromatch/v2"
             ]
         },
         "types": [],
diff --git a/types/gulp/v3/tslint.json b/types/gulp/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/gulp/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/gzip-js/gzip-js-tests.ts b/types/gzip-js/gzip-js-tests.ts
new file mode 100644
index 0000000000..f492685abe
--- /dev/null
+++ b/types/gzip-js/gzip-js-tests.ts
@@ -0,0 +1,16 @@
+import * as gz from 'gzip-js';
+
+const options = {
+    level: 3,
+    name: 'hello-world.txt',
+    timestamp: Date.now() / 1000,
+};
+
+const out = Buffer.from(gz.zip('Hello world', options));
+console.log(out);
+
+let buf;
+buf = Buffer.from(gz.unzip([42, 42, 42]));
+buf = Buffer.from(gz.unzip(Buffer.from([42, 42, 42])));
+buf = Buffer.from(gz.unzip(new Uint8Array([42, 42, 42])));
+console.log(buf.toString());
diff --git a/types/gzip-js/index.d.ts b/types/gzip-js/index.d.ts
new file mode 100644
index 0000000000..0a5c0000ea
--- /dev/null
+++ b/types/gzip-js/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for gzip-js 0.3
+// Project: https://github.com/beatgammit/gzip-js
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+export interface ZipOptions {
+    level?: number;
+    name?: string;
+    timestamp?: number;
+}
+export function zip(data: string, opts?: ZipOptions): number[];
+export function unzip(data: number[] | Buffer | Uint8Array): number[];
+export const DEFAULT_LEVEL: number;
diff --git a/types/gzip-js/tsconfig.json b/types/gzip-js/tsconfig.json
new file mode 100644
index 0000000000..a8138e1de9
--- /dev/null
+++ b/types/gzip-js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gzip-js-tests.ts"
+    ]
+}
diff --git a/types/gzip-js/tslint.json b/types/gzip-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gzip-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gzip-size/gzip-size-tests.ts b/types/gzip-size/gzip-size-tests.ts
index f07d99bd50..70ea15b5e6 100644
--- a/types/gzip-size/gzip-size-tests.ts
+++ b/types/gzip-size/gzip-size-tests.ts
@@ -1,7 +1,16 @@
+import fs = require('fs');
 import gzipSize = require('gzip-size');
 
 const string = 'Lorem ipsum dolor sit amet.';
 
 console.log(string.length);
 
+gzipSize(string).then(size => console.log(size));
+
 console.log(gzipSize.sync(string));
+
+const stream = fs.createReadStream("index.d.ts");
+const gstream = stream.pipe(gzipSize.stream()).on("gzip-size", size => console.log(size));
+console.log(gstream.gzipSize); // Could be a number or undefined. Recommended to use "gzip-size" event instead
+
+gzipSize.file("index.d.ts").then(size => console.log(size));
diff --git a/types/gzip-size/index.d.ts b/types/gzip-size/index.d.ts
index 12b1899b54..66251e0da8 100644
--- a/types/gzip-size/index.d.ts
+++ b/types/gzip-size/index.d.ts
@@ -1,13 +1,54 @@
-// Type definitions for gzip-size 3.0
+// Type definitions for gzip-size 4.1
 // Project: https://github.com/sindresorhus/gzip-size
 // Definitions by: York Yao <https://github.com/plantain-00>
+//                 Jimi van der Woning <https://github.com/jimivdw>
+//                 Andre Wiggins <https://github.com/andrewiggins>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-declare function gzipSize(input: string | Buffer, callback: (error: Error, size: number) => void): string;
-export = gzipSize;
-declare namespace gzipSize {
-    function sync(input: string | Buffer): number;
-    function stream(): NodeJS.ReadWriteStream;
+import * as stream from 'stream';
+import * as zlib from 'zlib';
+
+interface GzipSizeStream extends stream.PassThrough {
+    on(event: string, listener: (...args: any[]) => void): this;
+    on(event: "gzip-size", listener: (size: number) => void): this;
+
+    /**
+     * Contains the gzip size of the stream after it is finished.
+     * Since this happens asynchronously, it is recommended you use
+     * the `.on("gzip-size", size => console.log(size))` method instead
+     */
+    gzipSize?: number;
 }
+
+/**
+ * Returns a Promise for the size.
+ * @param input A string or Buffer to determine the gzip size of
+ * @param options Any zlib option
+ */
+declare function gzipSize(input: string | Buffer, options?: zlib.ZlibOptions): Promise<number>;
+
+declare namespace gzipSize {
+    /**
+     * Returns the size synchronously
+     * @param input A string or Buffer to determine the gzip size of
+     * @param options Any zlib option
+     */
+    function sync(input: string | Buffer, options?: zlib.ZlibOptions): number;
+
+    /**
+     * Returns a stream.PassThrough. The stream emits a gzip-size event and has a gzipSize property.
+     * @param options Any zlib option
+     */
+    function stream(options?: zlib.ZlibOptions): GzipSizeStream;
+
+    /**
+     * Returns a Promise for the size of the file.
+     * @param path The path to the file
+     * @param options Any zlib option
+     */
+    function file(path: string, options?: zlib.ZlibOptions): Promise<number>;
+}
+
+export = gzipSize;
diff --git a/types/gzip-size/v3/gzip-size-tests.ts b/types/gzip-size/v3/gzip-size-tests.ts
new file mode 100644
index 0000000000..f07d99bd50
--- /dev/null
+++ b/types/gzip-size/v3/gzip-size-tests.ts
@@ -0,0 +1,7 @@
+import gzipSize = require('gzip-size');
+
+const string = 'Lorem ipsum dolor sit amet.';
+
+console.log(string.length);
+
+console.log(gzipSize.sync(string));
diff --git a/types/gzip-size/v3/index.d.ts b/types/gzip-size/v3/index.d.ts
new file mode 100644
index 0000000000..12b1899b54
--- /dev/null
+++ b/types/gzip-size/v3/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for gzip-size 3.0
+// Project: https://github.com/sindresorhus/gzip-size
+// Definitions by: York Yao <https://github.com/plantain-00>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function gzipSize(input: string | Buffer, callback: (error: Error, size: number) => void): string;
+export = gzipSize;
+declare namespace gzipSize {
+    function sync(input: string | Buffer): number;
+    function stream(): NodeJS.ReadWriteStream;
+}
diff --git a/types/gzip-size/v3/tsconfig.json b/types/gzip-size/v3/tsconfig.json
new file mode 100644
index 0000000000..88a695711b
--- /dev/null
+++ b/types/gzip-size/v3/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "gzip-size": [
+                "gzip-size/v3"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gzip-size-tests.ts"
+    ]
+}
diff --git a/types/gzip-size/v3/tslint.json b/types/gzip-size/v3/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/gzip-size/v3/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/h2o2/index.d.ts b/types/h2o2/index.d.ts
index 881b75c0a8..aeb7652183 100644
--- a/types/h2o2/index.d.ts
+++ b/types/h2o2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/catbox
 // Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="node" />
 
diff --git a/types/h2o2/tsconfig.json b/types/h2o2/tsconfig.json
index 57ff1914fc..30a156a786 100644
--- a/types/h2o2/tsconfig.json
+++ b/types/h2o2/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "h2o2-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/h2o2/tslint.json b/types/h2o2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/h2o2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/halfred/tslint.json b/types/halfred/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/halfred/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hammerjs/tslint.json b/types/hammerjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hammerjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hammerjs/v1/tslint.json b/types/hammerjs/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hammerjs/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/handlebars/tslint.json b/types/handlebars/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/handlebars/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/handlebars/v1/tslint.json b/types/handlebars/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/handlebars/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/handsontable/index.d.ts b/types/handsontable/index.d.ts
deleted file mode 100644
index 6d86a085f1..0000000000
--- a/types/handsontable/index.d.ts
+++ /dev/null
@@ -1,616 +0,0 @@
-// Type definitions for Handsontable 0.31
-// Project: https://handsontable.com/
-// Definitions by: Handsoncode sp. z o.o. <http://handsoncode.net/>
-//                 Ryan Riley <https://github.com/panesofglass>
-//                 Andrew Stegmaier <https://github.com/astegmaier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped\
-
-declare namespace __Handsontable {
-    // The Core class is used inside the Handsontable namespace in the actual source code.
-    // However, there is a resolution issue when a class outside a namespace or module
-    // extends a class inside a module with the same name. That issue includes a work-around.
-    // Using the workaround found here: https://github.com/Microsoft/TypeScript/issues/3602
-
-    class Core {
-        constructor(element: Element, options: Handsontable.Options);
-        addHook(key: string, callback: Function|any[]): void;
-        addHookOnce(key: string, callback: Function|any[]): void;
-        alter(action: string, index: number, amount?: number, source?: string, keepEmptyRows?: boolean): void;
-        clear(): void;
-        colOffset(): number;
-        colToProp(col: number): string|number;
-        countCols(): number;
-        countEmptyCols(ending?: boolean): number;
-        countEmptyRows(ending?: boolean): number;
-        countRenderedCols(): number;
-        countRenderedRows(): number;
-        countRows(): number;
-        countSourceRows(): number;
-        countVisibleCols(): number;
-        countVisibleRows(): number;
-        deselectCell(): void;
-        destroy(): void;
-        destroyEditor(revertOriginal?: boolean): void;
-        getActiveEditor(): Object;
-        getCell(row: number, col: number, topmost?: boolean): Element;
-        getCellEditor(row: number, col: number): Object;
-        getCellMeta(row: number, col: number): Object;
-        getCellRenderer(row: number, col: number): Function;
-        getCellValidator(row: number, col: number): any;
-        getColHeader(col?: number): any[]|string;
-        getColWidth(col: number): number;
-        getCoords(elem: Element): Object;
-        getCopyableData(row: number, column: number): string;
-        getCopyableText(startRow: number, startCol: number, endRow: number, endCol: number): string;
-        getData(r?: number, c?: number, r2?: number, c2?: number): any[];
-        getDataAtCell(row: number, col: number): any;
-        getDataAtCol(col: number): any[];
-        getDataAtProp(prop: string|number): any[];
-        getDataAtRow(row: number): any[];
-        getDataAtRowProp(row: number, prop: string): any;
-        getDataType(rowFrom: number, columnFrom: number, rowTo: number, columnTo: number): string;
-        getInstance(): any;
-        getPlugin(pluginName: string): any;
-        getRowHeader(row?: number): any[]|string;
-        getRowHeight(row: number): number;
-        getSchema(): Object;
-        getSelected(): any[];
-        getSelectedRange(): Handsontable.Range;
-        getSettings(): Handsontable.Options;
-        getSourceData(r?: number, c?: number, r2?: number, c2?: number): any[];
-        getSourceDataAtCell(row: number, column: number): any;
-        getSourceDataAtCol(column: number): any[];
-        getSourceDataAtRow(row: number): any[]|Object;
-        getValue(): any;
-        hasColHeaders(): boolean;
-        hasHook(key: string): boolean;
-        hasRowHeaders(): boolean;
-        isEmptyCol(col: number): boolean;
-        isEmptyRow(row: number): boolean;
-        isListening(): boolean;
-        listen(): void;
-        loadData(data: any[]): void;
-        populateFromArray(row: number, col: number, input: any[], endRow?: number, endCol?: number, source?: string, method?: string, direction?: string, deltas?: any[]): any;
-        propToCol(prop: string | number): number;
-        removeCellMeta(row: number, col: number, key: string): void;
-        removeHook(key: string, callback: Function): void;
-        render(): void;
-        rowOffset(): number;
-        runHooks(key: string, p1?: any, p2?: any, p3?: any, p4?: any, p5?: any, p6?: any): any;
-        selectCell(row: number, col: number, endRow?: number, endCol?: number, scrollToCell?: boolean, changeListener?: boolean): boolean;
-        selectCellByProp(row: number, prop: string, endRow?: number, endProp?: string, scrollToCell?: boolean): boolean;
-        setCellMeta(row: number, col: number, key: string, val: string): void;
-        setCellMetaObject(row: number, col: number, prop: Object): void;
-        setDataAtCell(row: number, col: number, value: string, source?: string): void;
-        setDataAtCell(changes: Array<[number, number, any]>): void;
-        setDataAtRowProp(row: number|any[], prop: string, value: string, source?: string): void;
-        spliceCol(col: number, index: number, amount: number, elements?: any): void;
-        spliceRow(row: number, index: number, amount: number, elements?: any): void;
-        toPhysicalRow(row: number): number;
-        toPhysicalColumn(column: number): number;
-        toVisualRow(row: number): number;
-        toVisualColumn(column: number): number;
-        unlisten(): void;
-        updateSettings(settings: Object, init?: boolean): void;
-        validateCells(callback: Function): void;
-    }
-}
-
-declare namespace Handsontable {
-    interface Options {
-        allowEmpty?: boolean;
-        allowInsertColumn?: boolean;
-        allowInsertRow?: boolean;
-        allowInvalid?: boolean;
-        allowRemoveColumn?: boolean;
-        allowRemoveRow?: boolean;
-        autoColumnSize?: Object|boolean;
-        autoComplete?: any[];
-        autoRowSize?: Object|boolean;
-        autoWrapCol?: boolean;
-        autoWrapRow?: boolean;
-        bindRowsWithHeaders?: boolean|string;
-        cell?: any[];
-        cells?: Function;
-        checkedTemplate?: boolean|string;
-        className?: string|any[];
-        colHeaders?: boolean|any[]|Function;
-        collapsibleColumns?: boolean|any[];
-        columnHeaderHeight?: number|any[];
-        columns?: any[];
-        columnSorting?: boolean|Object;
-        columnSummary?: Object;
-        colWidths?: any[]|Function|number|string;
-        commentedCellClassName?: string;
-        comments?: boolean|any[];
-        contextMenu?: boolean|any[]|Object;
-        contextMenuCopyPaste?: Object;
-        copyable?: boolean;
-        copyColsLimit?: number;
-        copyPaste?: boolean;
-        copyRowsLimit?: number;
-        correctFormat?: boolean;
-        currentColClassName?: string;
-        currentRowClassName?: string;
-        customBorders?: boolean|any[];
-        data?: any[]|Function;
-        dataSchema?: Object;
-        dateFormat?: string;
-        debug?: boolean;
-        defaultDate?: string;
-        disableVisualSelection?: boolean|string|any[];
-        dropdownMenu?: boolean|Object|any[];
-        editor?: string|Function|boolean;
-        enterBeginsEditing?: boolean;
-        enterMoves?: Object|Function;
-        fillHandle?: boolean|string|Object;
-        filter?: boolean;
-        filteringCaseSensitive?: boolean;
-        filters?: boolean;
-        fixedColumnsLeft?: number;
-        fixedRowsBottom?: number;
-        fixedRowsTop?: number;
-        format?: string;
-        fragmentSelection?: boolean|string;
-        ganttChart?: Object;
-        headerTooltips?: boolean|Object;
-        height?: number|Function;
-        hiddenColumns?: boolean|Object;
-        hiddenRows?: boolean|Object;
-        invalidCellClassName?: string;
-        label?: Object;
-        language?: string;
-        manualColumnFreeze?: boolean;
-        manualColumnMove?: boolean|any[];
-        manualColumnResize?: boolean|any[];
-        manualRowMove?: boolean|any[];
-        manualRowResize?: boolean|any[];
-        maxCols?: number;
-        maxRows?: number;
-        mergeCells?: boolean|any[];
-        minCols?: number;
-        minRows?: number;
-        minSpareCols?: number;
-        minSpareRows?: number;
-        multiSelect?: boolean;
-        nestedHeaders?: any[];
-        noWordWrapClassName?: string;
-        observeChanges?: boolean;
-        observeDOMVisibility?: boolean;
-        outsideClickDeselects?: boolean;
-        pasteMode?: string;
-        persistentState?: boolean;
-        placeholder?: any;
-        placeholderCellClassName?: string;
-        preventOverflow?: string|boolean;
-        readOnly?: boolean;
-        readOnlyCellClassName?: string;
-        renderAllRows?: boolean;
-        renderer?: string|Function;
-        rowHeaders?: boolean|any[]|Function;
-        rowHeaderWidth?: number|any[];
-        rowHeights?: any[]|Function|number|string;
-        search?: boolean;
-        selectOptions?: any[];
-        skipColumnOnPaste?: boolean;
-        sortByRelevance?: boolean;
-        sortFunction?: Function;
-        sortIndicator?: boolean;
-        source?: any[]|Function;
-        startCols?: number;
-        startRows?: number;
-        stretchH?: string;
-        strict?: boolean;
-        tableClassName?: string|any[];
-        tabMoves?: Object;
-        title?: string;
-        trimDropdown?: boolean;
-        trimWhitespace?: boolean;
-        type?: string;
-        uncheckedTemplate?: boolean|string;
-        undo?: boolean;
-        validator?: Function|RegExp;
-        viewportColumnRenderingOffset?: number|string;
-        viewportRowRenderingOffset?: number|string;
-        visibleRows?: number;
-        width?: number|Function;
-        wordWrap?: boolean;
-        isEmptyCol?(col: number): boolean;
-        isEmptyRow?(row: number): boolean;
-
-        // hooks
-        afterAutofillApplyValues?(startArea: any[], entireArea: any[]): void;
-        afterCellMetaReset?(): void;
-        afterChange?(changes: Array<[number, number|string, any, any]>, source?: string): void;
-        afterChangesObserved?(): void;
-        afterColumnMove?(startColumn: number, endColumn: number): void;
-        afterColumnResize?(currentColumn: number, newSize: number, isDoubleClick: boolean): void;
-        afterColumnSort?(column: number, order: boolean): void;
-        afterContextMenuDefaultOptions?(predefinedItems: any[]): void;
-        afterContextMenuHide?(context: Object): void;
-        afterContextMenuShow?(context: Object): void;
-        afterCopyLimit?(selectedRows: number, selectedColumnds: number, copyRowsLimit: number, copyColumnsLimit: number): void;
-        afterCreateCol?(index: number, amount: number): void;
-        afterCreateRow?(index: number, amount: number): void;
-        afterDeselect?(): void;
-        afterDestroy?(): void;
-        afterDocumentKeyDown?(event: Event): void;
-        afterFilter?(formulasStack: any[]): void;
-        afterGetCellMeta?(row: number, col: number, cellProperties: Object): void;
-        afterGetColHeader?(col: number, TH: Element): void;
-        afterGetColumnHeaderRenderers?(array: any[]): void;
-        afterGetRowHeader?(row: number, TH: Element): void;
-        afterGetRowHeaderRenderers?(array: any[]): void;
-        afterInit?(): void;
-        afterLoadData?(firstTime: boolean): void;
-        afterMomentumScroll?(): void;
-        afterOnCellCornerDblClick?(event: Object): void;
-        afterOnCellCornerMouseDown?(event: Object): void;
-        afterOnCellMouseDown?(event: Object, coords: Object, TD: Element): void;
-        afterOnCellMouseOver?(event: Object, coords: Object, TD: Element): void;
-        afterRemoveCol?(index: number, amount: number): void;
-        afterRemoveRow?(index: number, amount: number): void;
-        afterRender?(isForced: boolean): void;
-        afterRenderer?(TD: Element, row: number, col: number, prop: string|number, value: string, cellProperties: Object): void;
-        afterRowMove?(startRow: number, endRow: number): void;
-        afterRowResize?(currentRow: number, newSize: number, isDoubleClick: boolean): void;
-        afterScrollHorizontally?(): void;
-        afterScrollVertically?(): void;
-        afterSelection?(r: number, c: number, r2: number, c2: number): void;
-        afterSelectionByProp?(r: number, p: string, r2: number, p2: string): void;
-        afterSelectionEnd?(r: number, c: number, r2: number, c2: number): void;
-        afterSelectionEndByProp?(r: number, p: string, r2: number, p2: string): void;
-        afterSetCellMeta?(row: number, col: number, key: string, value: any): void;
-        afterUpdateSettings?(): void;
-        afterValidate?(isValid: boolean, value: any, row: number, prop: string|number, source: string): void|boolean;
-        beforeAutofill?(start: Object, end: Object, data: any[]): void;
-        beforeCellAlignment?(stateBefore: any, range: any, type: string, alignmentClass: string): void;
-        beforeChange?(changes: any[], source: string): void;
-        beforeChangeRender?(changes: any[], source: string): void;
-        beforeColumnMove?(startColumn: number, endColumn: number): void;
-        beforeColumnResize?(currentColumn: number, newSize: number, isDoubleClick: boolean): void;
-        beforeColumnSort?(column: number, order: boolean): void;
-        beforeDrawBorders?(corners: any[], borderClassName: string): void;
-        beforeFilter?(formulasStack: any[]): void;
-        beforeGetCellMeta?(row: number, col: number, cellProperties: Object): void;
-        beforeInit?(): void;
-        beforeInitWalkontable?(walkontableConfig: Object): void;
-        beforeKeyDown?(event: Event): void;
-        beforeOnCellMouseDown?(event: Event, coords: Object, TD: Element): void;
-        beforeRemoveCol?(index: number, amount: number, logicalCols?: any[]): void;
-        beforeRemoveRow?(index: number, amount: number, logicalRows?: any[]): void;
-        beforeRender?(isForced: boolean): void;
-        beforeRenderer?(TD: Element, row: number, col: number, prop: string|number, value: string, cellProperties: Object): void;
-        beforeRowMove?(startRow: number, endRow: number): void;
-        beforeRowResize?(currentRow: number, newSize: number, isDoubleClick: boolean): any;
-        beforeSetRangeEnd?(coords: any[]): void;
-        beforeStretchingColumnWidth?(stretchedWidth: number, column: number): void;
-        beforeTouchScroll?(): void;
-        beforeValidate?(value: any, row: number, prop: string|number, source: string): void;
-        construct?(): void;
-        init?(): void;
-        modifyCol?(col: number): void;
-        modifyColHeader?(column: number): void;
-        modifyColWidth?(width: number, col: number): void;
-        modifyCopyableRange?(copyableRanges: any[]): void;
-        modifyRow?(row: number): void;
-        modifyRowHeader?(row: number): void;
-        modifyRowHeight?(height: number, row: number): void;
-        persistentStateLoad?(key: string, valuePlaceholder: Object): void;
-        persistentStateReset?(key: string): void;
-        persistentStateSave?(key: string, value: any): void;
-        unmodifyCol?(col: number): void;
-    }
-
-    class Core extends __Handsontable.Core {
-    }
-
-    interface Selection {
-        start: CellPosition;
-        end: CellPosition;
-    }
-
-    interface Range {
-        from: CellPosition;
-        to: CellPosition;
-    }
-
-    interface HandsontableRegisterer {
-        getInstance(id: string): Core;
-        registerInstance(id: string, instance: Core): void;
-        removeInstance(id: string): void;
-    }
-
-    interface ColumnProperties extends CellProperties {
-        data?: string | number;
-        title?: string;
-        editor?: string | EditorConstructor;
-        selectOptions?: any[];
-        width?: number;
-    }
-
-    interface CellProperties {
-        renderer?: CellRenderer;
-        type?: string;
-        readOnly?: boolean;
-        language?: string;
-        format?: string;
-        validator?: Validator;
-        allowInvalid?: boolean;
-        className?: string;
-    }
-
-    interface CellPosition {
-        row: number;
-        col: number;
-    }
-
-    // so that you can write custom plugins in typescript
-    interface BasePlugin {
-        init(): void;
-        enablePlugin(): void;
-        disablePlugin(): void;
-        addHook(name: string, callback: Function): void;
-        removeHooks(name: string): void;
-        clearHooks(): void;
-        callOnPluginsReady(callback: Function): void;
-        updatePlugin(): void;
-        destroy(): void;
-        enabled: boolean;
-        hot: Core;
-    }
-
-    interface PluginConstructor {
-        new (hotInstance: Core): BasePlugin;
-    }
-
-    interface ContextMenuPluginConstructor extends PluginConstructor {
-        SEPARATOR: string;
-    }
-
-    interface Plugins {
-        AutoColumnSize: PluginConstructor;
-        AutoRowSizeAutoRowSize: PluginConstructor;
-        BasePlugin: PluginConstructor;
-        BindRowsWithHeaders: PluginConstructor;
-        CollapsibleColumns: PluginConstructor;
-        ColumnSorting: PluginConstructor;
-        ColumnSummary: PluginConstructor;
-        Comments: PluginConstructor;
-        ContextMenu: ContextMenuPluginConstructor;
-        ContextMenuCopyPaste: PluginConstructor;
-        DragToScroll: PluginConstructor;
-        DropdownMenu: PluginConstructor;
-        ExportFile: PluginConstructor;
-        Filters: PluginConstructor;
-        Formulas: PluginConstructor;
-        GanttChart: PluginConstructor;
-        HeaderTooltips: PluginConstructor;
-        HiddenColumns: PluginConstructor;
-        HiddenRows: PluginConstructor;
-        ManualColumnFreeze: PluginConstructor;
-        ManualColumnMove: PluginConstructor;
-        ManualColumnResize: PluginConstructor;
-        ManualRowMove: PluginConstructor;
-        ManualRowResize: PluginConstructor;
-        MultipleSelectionHandles: PluginConstructor;
-        NestedHeaders: PluginConstructor;
-        NestedRows: PluginConstructor;
-        ObserveChanges: PluginConstructor;
-        TouchScroll: PluginConstructor;
-        TrimRows: PluginConstructor;
-        registerPlugin(pluginName: string, PluginClass: PluginConstructor): void;
-    }
-
-    interface Hooks {
-        /**
-         * Adds a listener (globally or locally) to a specified hook name.
-         *
-         * @param key Hook name.
-         * @param callback Callback function or an array of functions.
-         * @param context (optional) The context for the hook callback to be added - a Handsontable instance or leave empty.
-         */
-        add(key: string, callback: ((...params: any[]) => any | void) | Array<(...params: any[]) => any | void>, context?: Handsontable): Object;
-
-        /**
-         * Returns a new object with empty handlers related to every registered hook name.
-         */
-        createEmptyBucket(): Object;
-
-        /**
-         * Deregisters a hook name (removes it from the list of known hook names).
-         *
-         * @param key Hook name.
-         */
-        deregister(key: string): void;
-
-        /**
-         * Destroy all listeners connected to the context. If no context is provided, the global listeners will be destroyed.
-         *
-         * @param context (optional) A Handsontable instance.
-         */
-        destroy(context?: Handsontable): void;
-
-        /**
-         * Get hook bucket based on the context of the object or if argument is undefined, get the global hook bucket.
-         *
-         * @param context (optional) A Handsontable instance.
-         */
-        getBucket(context?: Handsontable): Object;
-
-        /**
-         * Returns an array of registered hooks.
-         */
-        getRegistered(): string[];
-
-        /**
-         * Checks whether there are any registered listeners for the provided hook name.
-         *
-         * @param key Hook name.
-         * @param context (optional) A Handsontable instance.
-         */
-        has(key: string, context?: Handsontable): boolean;
-
-        /**
-         * Returns a boolean depending on if a hook by such name has been registered.
-         *
-         * @param key Hook name.
-         */
-        isRegistered(key: string): boolean;
-
-        /**
-         * Adds a listener to a specified hook. After the hook runs this listener will be automatically removed from the bucket.
-         *
-         * @param key Hook/Event name.
-         * @param callback Callback function.
-         * @param context (optional) A Handsontable instance.
-         */
-        once(key: string, callback: ((...params: any[]) => any | void) | Array<(...params: any[]) => any | void>, context?: Handsontable): void;
-
-        /**
-         * Registers a hook name (adds it to the list of the known hook names). Used by plugins.
-         *
-         * @param key The hook name.
-         */
-        register(key: string): void;
-
-        /**
-         * Removes a listener from a hook with a given name.
-         *
-         * @param key Hook/Event name.
-         * @param callback Callback function.
-         * @param context (optional) A Handsontable instance.
-         */
-        remove(key: string, callback: (...params: any[]) => any | void, context?: Handsontable): boolean;
-
-        /**
-         * Runs all local and global callbacks assigned to the hook identified by the key parameter.
-         * It returns either a return value from the last called callback or the first parameter (p1) passed to the run function.
-         *
-         * @param context Handsontable instance.
-         * @param key Hook/Event name.
-         * @param p1 (optional) Parameter to be passed as an argument to the callback function.
-         * @param p2 (optional) Parameter to be passed as an argument to the callback function.
-         * @param p3 (optional) Parameter to be passed as an argument to the callback function.
-         * @param p4 (optional) Parameter to be passed as an argument to the callback function.
-         * @param p5 (optional) Parameter to be passed as an argument to the callback function.
-         * @param p6 (optional) Parameter to be passed as an argument to the callback function.
-         */
-        run(context: Handsontable, key: string, p1?: any, p2?: any, p3?: any, p4?: any, p5?: any, p6?: any): any;
-    }
-
-    interface Dom {
-        addEvent(element: HTMLElement, eventName: string, callback: Function): void;
-        addClass(element: HTMLElement, className: string | string[]): void;
-        removeClass(element: HTMLElement, className: string | string[]): void;
-        offset(element: HTMLElement): any;
-        getWindowScrollLeft(): number;
-        getWindowScrollTop(): number;
-        outerHeight(element: HTMLElement): number;
-        hasClass(element: HTMLElement, className: string): boolean | undefined;
-        empty(element: HTMLElement): void;
-    }
-
-    interface ArrayMapper {
-        clearMap(): void;
-        getIndexByValue(value: any): number;
-        getValueByIndex(index: number): any;
-        insertItems(index: number, amount?: number): number[];
-        removeItems(index: number | number[], amount?: number): number[];
-        unshiftItems(index: number | number[], amount?: number): void;
-        shiftItems(index: number, amount?: number): void;
-    }
-
-    interface Utils {
-        arrayMapper: ArrayMapper;
-    }
-
-    interface Helper {
-        arrayFilter(array: any[], predicate: Function): any[];
-        arrayEach(array: any[], predicate: Function): void;
-        arrayMap(array: any[], predicate: Function): any[];
-        arrayReduce(array: any[], predicate: Function, initialValue?: any): any;
-        objectEach(obj: any, predicate: Function): void;
-        rangeEach(rangeFrom: number, rangeTo: number | Function, iteratee?: Function): void;
-        mixin(Base: any, ...mixins: any[]): void;
-        isNumeric(number: any): boolean;
-        createSpreadsheetData(rows: number, columns: number): any;
-    }
-
-    type CellRenderer = (
-            instance: Core,
-            td: HTMLTableCellElement,
-            row: number,
-            col: number,
-            prop: string,
-            value: any,
-            cellProperties: any) => void;
-
-    interface Editor {
-        open(): void;
-    }
-
-    interface EditorConstructor {
-        new (instance: Core): Editor;
-    }
-
-    interface Editors {
-        TextEditor: EditorConstructor;
-    }
-
-    type Validator = (value: any, callback: (condition: boolean) => void) => void;
-
-    interface Renderers {
-        TextRenderer: CellRenderer;
-        NumericRenderer: CellRenderer;
-        AutocompleteRenderer: CellRenderer;
-    }
-
-    type AsyncAutocompleteSourceFunction = (query: string, process: (values: any[]) => void) => void;
-
-    interface AutocompleteColumn extends ColumnProperties {
-        source?: any[] | AsyncAutocompleteSourceFunction;
-        strict?: boolean;
-        trimDropdown?: boolean;
-    }
-
-    interface DateColumn extends ColumnProperties {
-        dateFormat?: string;
-        correctFormat?: boolean;
-    }
-
-    interface NumericColumn extends ColumnProperties {
-        format?: string;
-        language?: string;
-    }
-
-    interface CheckboxColumnLabel {
-        position?: 'before' | 'after';
-        property?: string;
-        value: string;
-    }
-
-    interface CheckboxColumn extends ColumnProperties {
-        checkedTemplate?: any;
-        uncheckedTemplate?: any;
-        label?: CheckboxColumnLabel;
-    }
-
-    type CellMetaFunction = (row: number, column: number, prop: string) => void;
-
-    type DropdownColumn = AutocompleteColumn;
-}
-
-declare class Handsontable extends __Handsontable.Core {
-    static plugins: Handsontable.Plugins;
-    static hooks: Handsontable.Hooks;
-    static Dom: Handsontable.Dom;
-    static dom: Handsontable.Dom;
-    static helper: Handsontable.Helper;
-    static utils: Handsontable.Utils;
-    static renderers: Handsontable.Renderers;
-    static editors: Handsontable.Editors;
-}
-
-export = Handsontable;
-export as namespace Handsontable;
diff --git a/types/handsontable/test/global.ts b/types/handsontable/test/global.ts
deleted file mode 100644
index 3760fb1f95..0000000000
--- a/types/handsontable/test/global.ts
+++ /dev/null
@@ -1,327 +0,0 @@
-function test_HandsontableInit() {
-  const elem = document.createElement('div');
-  const hot = new Handsontable(elem, {
-    allowEmpty: true,
-    allowInsertColumn: true,
-    allowInsertRow: true,
-    allowInvalid: true,
-    allowRemoveColumn: true,
-    allowRemoveRow: true,
-    autoColumnSize: true,
-    autoComplete: [],
-    autoRowSize: true,
-    autoWrapCol: true,
-    autoWrapRow: true,
-    bindRowsWithHeaders: 'foo',
-    cell: [],
-    cells: () => { return; },
-    checkedTemplate: true,
-    className: [],
-    colHeaders: true,
-    collapsibleColumns: true,
-    columnHeaderHeight: 123,
-    columns: [],
-    columnSorting: {},
-    columnSummary: {},
-    colWidths: 123,
-    commentedCellClassName: 'foo',
-    comments: [],
-    contextMenu: true,
-    contextMenuCopyPaste: {},
-    copyable: true,
-    copyColsLimit: 123,
-    copyPaste: true,
-    copyRowsLimit: 123,
-    correctFormat: true,
-    currentColClassName: 'foo',
-    currentRowClassName: 'foo',
-    customBorders: true,
-    data: [],
-    dataSchema: {},
-    dateFormat: 'foo',
-    debug: true,
-    defaultDate: 'foo',
-    disableVisualSelection: true,
-    dropdownMenu: [],
-    editor: true,
-    enterBeginsEditing: true,
-    enterMoves: {},
-    fillHandle: true,
-    filter: true,
-    filteringCaseSensitive: true,
-    filters: false,
-    fixedColumnsLeft: 123,
-    fixedRowsBottom: 123,
-    fixedRowsTop: 123,
-    format: 'foo',
-    fragmentSelection: true,
-    ganttChart: {},
-    headerTooltips: true,
-    height: 123,
-    hiddenColumns: true,
-    hiddenRows: {},
-    invalidCellClassName: 'foo',
-    label: {},
-    language: 'foo',
-    manualColumnFreeze: true,
-    manualColumnMove: true,
-    manualColumnResize: true,
-    manualRowMove: true,
-    manualRowResize: true,
-    maxCols: 123,
-    maxRows: 123,
-    mergeCells: true,
-    minCols: 123,
-    minRows: 123,
-    minSpareCols: 123,
-    minSpareRows: 123,
-    multiSelect: true,
-    nestedHeaders: [],
-    noWordWrapClassName: 'foo',
-    observeChanges: true,
-    observeDOMVisibility: true,
-    outsideClickDeselects: true,
-    pasteMode: 'foo',
-    persistentState: true,
-    placeholder: 123,
-    placeholderCellClassName: 'foo',
-    preventOverflow: true,
-    readOnly: true,
-    readOnlyCellClassName: 'foo',
-    renderAllRows: true,
-    renderer: 'foo',
-    rowHeaders: true,
-    rowHeaderWidth: 123,
-    rowHeights: 123,
-    search: true,
-    selectOptions: [],
-    skipColumnOnPaste: true,
-    sortByRelevance: true,
-    sortFunction: () => { return; },
-    sortIndicator: true,
-    source: [],
-    startCols: 123,
-    startRows: 123,
-    stretchH: 'foo',
-    strict: true,
-    tableClassName: 'foo',
-    tabMoves: {},
-    title: 'foo',
-    trimDropdown: true,
-    trimWhitespace: true,
-    type: 'foo',
-    uncheckedTemplate: true,
-    undo: true,
-    validator: () => {return; },
-    viewportColumnRenderingOffset: 123,
-    viewportRowRenderingOffset: 123,
-    visibleRows: 123,
-    width: 1232,
-    wordWrap: true,
-
-    // Hooks
-    afterAutofillApplyValues: () => {return; },
-    afterCellMetaReset: () => {return; },
-    afterChange: (changes) => {return; },
-    afterChangesObserved: () => {return; },
-    afterColumnMove: () => {return; },
-    afterColumnResize: () => {return; },
-    afterColumnSort: () => {return; },
-    afterContextMenuDefaultOptions: () => {return; },
-    afterContextMenuHide: () => {return; },
-    afterContextMenuShow: () => {return; },
-    afterCopyLimit: () => {return; },
-    afterCreateCol: () => {return; },
-    afterCreateRow: () => {return; },
-    afterDeselect: () => {return; },
-    afterDestroy: () => {return; },
-    afterDocumentKeyDown: () => {return; },
-    afterFilter: () => {return; },
-    afterGetCellMeta: () => {return; },
-    afterGetColHeader: () => {return; },
-    afterGetColumnHeaderRenderers: () => {return; },
-    afterGetRowHeader: () => {return; },
-    afterGetRowHeaderRenderers: () => {return; },
-    afterInit: () => {return; },
-    afterLoadData: () => {return; },
-    afterMomentumScroll: () => {return; },
-    afterOnCellCornerDblClick: () => {return; },
-    afterOnCellCornerMouseDown: () => {return; },
-    afterOnCellMouseDown: () => {return; },
-    afterOnCellMouseOver: () => {return; },
-    afterRemoveCol: () => {return; },
-    afterRemoveRow: () => {return; },
-    afterRender: () => {return; },
-    afterRenderer: () => {return; },
-    afterRowMove: () => {return; },
-    afterRowResize: () => {return; },
-    afterScrollHorizontally: () => {return; },
-    afterScrollVertically: () => {return; },
-    afterSelection: () => {return; },
-    afterSelectionByProp: () => {return; },
-    afterSelectionEnd: () => {return; },
-    afterSelectionEndByProp: () => {return; },
-    afterSetCellMeta: () => {return; },
-    afterUpdateSettings: () => {return; },
-    afterValidate: () => {return; },
-    beforeAutofill: () => {return; },
-    beforeCellAlignment: () => {return; },
-    beforeChange: () => {return; },
-    beforeChangeRender: () => {return; },
-    beforeColumnMove: () => {return; },
-    beforeColumnResize: () => {return; },
-    beforeColumnSort: () => {return; },
-    beforeDrawBorders: () => {return; },
-    beforeFilter: () => {return; },
-    beforeGetCellMeta: () => {return; },
-    beforeInit: () => {return; },
-    beforeInitWalkontable: () => {return; },
-    beforeKeyDown: () => {return; },
-    beforeOnCellMouseDown: () => {return; },
-    beforeRemoveCol: () => {return; },
-    beforeRemoveRow: () => {return; },
-    beforeRender: () => {return; },
-    beforeRenderer: () => {return; },
-    beforeRowMove: () => {return; },
-    beforeRowResize: () => {return; },
-    beforeSetRangeEnd: () => {return; },
-    beforeStretchingColumnWidth: () => {return; },
-    beforeTouchScroll: () => {return; },
-    beforeValidate: () => {return; },
-    construct: () => {return; },
-    init: () => {return; },
-    modifyCol: () => {return; },
-    modifyColHeader: () => {return; },
-    modifyColWidth: () => {return; },
-    modifyCopyableRange: () => {return; },
-    modifyRow: () => {return; },
-    modifyRowHeader: () => {return; },
-    modifyRowHeight: () => {return; },
-    persistentStateLoad: () => {return; },
-    persistentStateReset: () => {return; },
-    persistentStateSave: () => {return; },
-    unmodifyCol: () => {return; }
-  });
-}
-
-function test_HandsontableMethods() {
-  const elem = document.createElement('div');
-  const hot = new Handsontable(elem, {});
-  hot.addHook('foo', []);
-  hot.addHookOnce('foo', []);
-  hot.alter('foo', 123, 123, 'foo', true);
-  hot.clear();
-  hot.colOffset();
-  hot.colToProp(123);
-  hot.countCols();
-  hot.countEmptyCols(true);
-  hot.countEmptyRows(true);
-  hot.countRenderedCols();
-  hot.countRenderedRows();
-  hot.countRows();
-  hot.countSourceRows();
-  hot.countVisibleCols();
-  hot.countVisibleRows();
-  hot.deselectCell();
-  hot.destroy();
-  hot.destroyEditor(true);
-  hot.getActiveEditor();
-  hot.getCell(123, 123, true);
-  hot.getCellEditor(123, 123);
-  hot.getCellMeta(123, 123);
-  hot.getCellRenderer(123, 123);
-  hot.getCellValidator(123, 123);
-  hot.getColHeader(123);
-  hot.getColWidth(123);
-  hot.getCoords(elem.querySelector('td'));
-  hot.getCopyableData(123, 123);
-  hot.getCopyableText(123, 123, 123, 123);
-  hot.getData(123, 123, 123, 123);
-  hot.getDataAtCell(123, 123);
-  hot.getDataAtCol(123);
-  hot.getDataAtProp(123);
-  hot.getDataAtRow(123);
-  hot.getDataAtRowProp(123, 'foo');
-  hot.getDataType(123, 123, 123, 123);
-  hot.getInstance();
-  hot.getPlugin('foo');
-  hot.getRowHeader(123);
-  hot.getRowHeight(123);
-  hot.getSchema();
-  hot.getSelected();
-  const range: Handsontable.Range = hot.getSelectedRange();
-  hot.getSettings();
-  hot.getSourceData(123, 123, 123, 123);
-  hot.getSourceDataAtCell(123, 123);
-  hot.getSourceDataAtCol(123);
-  hot.getSourceDataAtRow(123);
-  hot.getValue();
-  hot.hasColHeaders();
-  hot.hasHook('foo');
-  hot.hasRowHeaders();
-  hot.isEmptyCol(123);
-  hot.isEmptyRow(123);
-  hot.isListening();
-  hot.listen();
-  hot.loadData([]);
-  hot.populateFromArray(123, 123, [], 123, 123, 'foo', 'foo', 'foo', []);
-  hot.propToCol('foo');
-  hot.propToCol(123);
-  hot.removeCellMeta(123, 123, 'foo');
-  hot.removeHook('foo', () => {return; });
-  hot.render();
-  hot.rowOffset();
-  hot.runHooks('foo', 123, 'foo', true, {}, [], () => {return; });
-  hot.selectCell(123, 123, 123, 123, true, true);
-  hot.selectCellByProp(123, 'foo', 123, 'foo', true);
-  hot.setCellMeta(123, 123, 'foo', 'foo');
-  hot.setCellMetaObject(123, 123, {});
-  hot.setDataAtCell(123, 123, 'foo', 'foo');
-  hot.setDataAtCell([[123, 123, 'foo'], [123, 123, 'foo']]);
-  hot.setDataAtRowProp(123, 'foo', 'foo', 'foo');
-  hot.spliceCol(123, 123, 123, 'foo');
-  hot.spliceRow(123, 123, 123, 'foo');
-  hot.toPhysicalRow(123);
-  hot.toPhysicalColumn(123);
-  hot.toVisualRow(123);
-  hot.toVisualColumn(123);
-  hot.unlisten();
-  hot.updateSettings({}, true);
-  hot.validateCells(() => {return; });
-
-  Handsontable.renderers.NumericRenderer(hot, new HTMLTableDataCellElement(), 0, 0, "prop", 1.235, {});
-  Handsontable.renderers.TextRenderer(hot, new HTMLTableDataCellElement(), 0, 0, "prop", 1.235, {});
-  Handsontable.Dom.addEvent(new HTMLElement(), "eventName", () => { return; });
-  Handsontable.Dom.empty(new HTMLElement());
-
-  let bucket: {};
-  let registeredHooks: string[];
-  let hasHook: boolean;
-  let isRegistered: boolean;
-  bucket = Handsontable.hooks.add('beforeInit', () => { return; });
-  bucket = Handsontable.hooks.add('beforeInit', () => { return; }, hot);
-  Handsontable.hooks.createEmptyBucket();
-  Handsontable.hooks.deregister('myHook');
-  Handsontable.hooks.destroy();
-  Handsontable.hooks.destroy(hot);
-  bucket = Handsontable.hooks.getBucket();
-  bucket = Handsontable.hooks.getBucket(hot);
-  registeredHooks = Handsontable.hooks.getRegistered();
-  hasHook = Handsontable.hooks.has("myHook");
-  hasHook = Handsontable.hooks.has("myHook", hot);
-  isRegistered = Handsontable.hooks.isRegistered("myHook");
-  Handsontable.hooks.once('beforeInit', () => { return; });
-  Handsontable.hooks.once('beforeInit', [() => { return; }, () => { return; }]);
-  Handsontable.hooks.once('beforeInit', () => { return; }, hot);
-  Handsontable.hooks.register('myHook');
-  Handsontable.hooks.remove('beforeInit', () => { return; });
-  Handsontable.hooks.remove('beforeInit', () => { return; }, hot);
-  Handsontable.hooks.run(hot, 'beforeInit');
-  Handsontable.hooks.run(hot, 'beforeInit', 'param1', 'param2', 'param3', 'param4', 'param5', 'param6');
- }
-
-class MyCustomHotPlugin extends Handsontable.plugins.BasePlugin {
-  isEnabled(): boolean {
-    return !!this.hot.getSettings().manualRowMove;
-  }
-}
diff --git a/types/handsontable/test/module.ts b/types/handsontable/test/module.ts
deleted file mode 100644
index 0bdffed3f5..0000000000
--- a/types/handsontable/test/module.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-import Handsontable = require("handsontable");
-
-function test_HandsontableInit() {
-  const elem = document.createElement('div');
-  const hot = new Handsontable(elem, {
-    allowEmpty: true,
-    allowInsertColumn: true,
-    allowInsertRow: true,
-    allowInvalid: true,
-    allowRemoveColumn: true,
-    allowRemoveRow: true,
-    autoColumnSize: true,
-    autoComplete: [],
-    autoRowSize: true,
-    autoWrapCol: true,
-    autoWrapRow: true,
-    bindRowsWithHeaders: 'foo',
-    cell: [],
-    cells: () => { return; },
-    checkedTemplate: true,
-    className: [],
-    colHeaders: true,
-    collapsibleColumns: true,
-    columnHeaderHeight: 123,
-    columns: [],
-    columnSorting: {},
-    columnSummary: {},
-    colWidths: 123,
-    commentedCellClassName: 'foo',
-    comments: [],
-    contextMenu: true,
-    contextMenuCopyPaste: {},
-    copyable: true,
-    copyColsLimit: 123,
-    copyPaste: true,
-    copyRowsLimit: 123,
-    correctFormat: true,
-    currentColClassName: 'foo',
-    currentRowClassName: 'foo',
-    customBorders: true,
-    data: [],
-    dataSchema: {},
-    dateFormat: 'foo',
-    debug: true,
-    defaultDate: 'foo',
-    disableVisualSelection: true,
-    dropdownMenu: [],
-    editor: true,
-    enterBeginsEditing: true,
-    enterMoves: {},
-    fillHandle: true,
-    filter: true,
-    filteringCaseSensitive: true,
-    filters: false,
-    fixedColumnsLeft: 123,
-    fixedRowsBottom: 123,
-    fixedRowsTop: 123,
-    format: 'foo',
-    fragmentSelection: true,
-    ganttChart: {},
-    headerTooltips: true,
-    height: 123,
-    hiddenColumns: true,
-    hiddenRows: {},
-    invalidCellClassName: 'foo',
-    label: {},
-    language: 'foo',
-    manualColumnFreeze: true,
-    manualColumnMove: true,
-    manualColumnResize: true,
-    manualRowMove: true,
-    manualRowResize: true,
-    maxCols: 123,
-    maxRows: 123,
-    mergeCells: true,
-    minCols: 123,
-    minRows: 123,
-    minSpareCols: 123,
-    minSpareRows: 123,
-    multiSelect: true,
-    nestedHeaders: [],
-    noWordWrapClassName: 'foo',
-    observeChanges: true,
-    observeDOMVisibility: true,
-    outsideClickDeselects: true,
-    pasteMode: 'foo',
-    persistentState: true,
-    placeholder: 123,
-    placeholderCellClassName: 'foo',
-    preventOverflow: true,
-    readOnly: true,
-    readOnlyCellClassName: 'foo',
-    renderAllRows: true,
-    renderer: 'foo',
-    rowHeaders: true,
-    rowHeaderWidth: 123,
-    rowHeights: 123,
-    search: true,
-    selectOptions: [],
-    skipColumnOnPaste: true,
-    sortByRelevance: true,
-    sortFunction: () => { return; },
-    sortIndicator: true,
-    source: [],
-    startCols: 123,
-    startRows: 123,
-    stretchH: 'foo',
-    strict: true,
-    tableClassName: 'foo',
-    tabMoves: {},
-    title: 'foo',
-    trimDropdown: true,
-    trimWhitespace: true,
-    type: 'foo',
-    uncheckedTemplate: true,
-    undo: true,
-    validator: () => {return; },
-    viewportColumnRenderingOffset: 123,
-    viewportRowRenderingOffset: 123,
-    visibleRows: 123,
-    width: 1232,
-    wordWrap: true,
-
-    // Hooks
-    afterAutofillApplyValues: () => {return; },
-    afterCellMetaReset: () => {return; },
-    afterChange: (changes) => {return; },
-    afterChangesObserved: () => {return; },
-    afterColumnMove: () => {return; },
-    afterColumnResize: () => {return; },
-    afterColumnSort: () => {return; },
-    afterContextMenuDefaultOptions: () => {return; },
-    afterContextMenuHide: () => {return; },
-    afterContextMenuShow: () => {return; },
-    afterCopyLimit: () => {return; },
-    afterCreateCol: () => {return; },
-    afterCreateRow: () => {return; },
-    afterDeselect: () => {return; },
-    afterDestroy: () => {return; },
-    afterDocumentKeyDown: () => {return; },
-    afterFilter: () => {return; },
-    afterGetCellMeta: () => {return; },
-    afterGetColHeader: () => {return; },
-    afterGetColumnHeaderRenderers: () => {return; },
-    afterGetRowHeader: () => {return; },
-    afterGetRowHeaderRenderers: () => {return; },
-    afterInit: () => {return; },
-    afterLoadData: () => {return; },
-    afterMomentumScroll: () => {return; },
-    afterOnCellCornerDblClick: () => {return; },
-    afterOnCellCornerMouseDown: () => {return; },
-    afterOnCellMouseDown: () => {return; },
-    afterOnCellMouseOver: () => {return; },
-    afterRemoveCol: () => {return; },
-    afterRemoveRow: () => {return; },
-    afterRender: () => {return; },
-    afterRenderer: () => {return; },
-    afterRowMove: () => {return; },
-    afterRowResize: () => {return; },
-    afterScrollHorizontally: () => {return; },
-    afterScrollVertically: () => {return; },
-    afterSelection: () => {return; },
-    afterSelectionByProp: () => {return; },
-    afterSelectionEnd: () => {return; },
-    afterSelectionEndByProp: () => {return; },
-    afterSetCellMeta: () => {return; },
-    afterUpdateSettings: () => {return; },
-    afterValidate: () => {return; },
-    beforeAutofill: () => {return; },
-    beforeCellAlignment: () => {return; },
-    beforeChange: () => {return; },
-    beforeChangeRender: () => {return; },
-    beforeColumnMove: () => {return; },
-    beforeColumnResize: () => {return; },
-    beforeColumnSort: () => {return; },
-    beforeDrawBorders: () => {return; },
-    beforeFilter: () => {return; },
-    beforeGetCellMeta: () => {return; },
-    beforeInit: () => {return; },
-    beforeInitWalkontable: () => {return; },
-    beforeKeyDown: () => {return; },
-    beforeOnCellMouseDown: () => {return; },
-    beforeRemoveCol: () => {return; },
-    beforeRemoveRow: () => {return; },
-    beforeRender: () => {return; },
-    beforeRenderer: () => {return; },
-    beforeRowMove: () => {return; },
-    beforeRowResize: () => {return; },
-    beforeSetRangeEnd: () => {return; },
-    beforeStretchingColumnWidth: () => {return; },
-    beforeTouchScroll: () => {return; },
-    beforeValidate: () => {return; },
-    construct: () => {return; },
-    init: () => {return; },
-    modifyCol: () => {return; },
-    modifyColHeader: () => {return; },
-    modifyColWidth: () => {return; },
-    modifyCopyableRange: () => {return; },
-    modifyRow: () => {return; },
-    modifyRowHeader: () => {return; },
-    modifyRowHeight: () => {return; },
-    persistentStateLoad: () => {return; },
-    persistentStateReset: () => {return; },
-    persistentStateSave: () => {return; },
-    unmodifyCol: () => {return; }
-  });
-}
-
-function test_HandsontableMethods() {
-  const elem = document.createElement('div');
-  const hot = new Handsontable(elem, {});
-  hot.addHook('foo', []);
-  hot.addHookOnce('foo', []);
-  hot.alter('foo', 123, 123, 'foo', true);
-  hot.clear();
-  hot.colOffset();
-  hot.colToProp(123);
-  hot.countCols();
-  hot.countEmptyCols(true);
-  hot.countEmptyRows(true);
-  hot.countRenderedCols();
-  hot.countRenderedRows();
-  hot.countRows();
-  hot.countSourceRows();
-  hot.countVisibleCols();
-  hot.countVisibleRows();
-  hot.deselectCell();
-  hot.destroy();
-  hot.destroyEditor(true);
-  hot.getActiveEditor();
-  hot.getCell(123, 123, true);
-  hot.getCellEditor(123, 123);
-  hot.getCellMeta(123, 123);
-  hot.getCellRenderer(123, 123);
-  hot.getCellValidator(123, 123);
-  hot.getColHeader(123);
-  hot.getColWidth(123);
-  hot.getCoords(elem.querySelector('td'));
-  hot.getCopyableData(123, 123);
-  hot.getCopyableText(123, 123, 123, 123);
-  hot.getData(123, 123, 123, 123);
-  hot.getDataAtCell(123, 123);
-  hot.getDataAtCol(123);
-  hot.getDataAtProp(123);
-  hot.getDataAtRow(123);
-  hot.getDataAtRowProp(123, 'foo');
-  hot.getDataType(123, 123, 123, 123);
-  hot.getInstance();
-  hot.getPlugin('foo');
-  hot.getRowHeader(123);
-  hot.getRowHeight(123);
-  hot.getSchema();
-  hot.getSelected();
-  const range: Handsontable.Range = hot.getSelectedRange();
-  hot.getSettings();
-  hot.getSourceData(123, 123, 123, 123);
-  hot.getSourceDataAtCell(123, 123);
-  hot.getSourceDataAtCol(123);
-  hot.getSourceDataAtRow(123);
-  hot.getValue();
-  hot.hasColHeaders();
-  hot.hasHook('foo');
-  hot.hasRowHeaders();
-  hot.isEmptyCol(123);
-  hot.isEmptyRow(123);
-  hot.isListening();
-  hot.listen();
-  hot.loadData([]);
-  hot.populateFromArray(123, 123, [], 123, 123, 'foo', 'foo', 'foo', []);
-  hot.propToCol('foo');
-  hot.propToCol(123);
-  hot.removeCellMeta(123, 123, 'foo');
-  hot.removeHook('foo', () => {return; });
-  hot.render();
-  hot.rowOffset();
-  hot.runHooks('foo', 123, 'foo', true, {}, [], () => {return; });
-  hot.selectCell(123, 123, 123, 123, true, true);
-  hot.selectCellByProp(123, 'foo', 123, 'foo', true);
-  hot.setCellMeta(123, 123, 'foo', 'foo');
-  hot.setCellMetaObject(123, 123, {});
-  hot.setDataAtCell(123, 123, 'foo', 'foo');
-  hot.setDataAtCell([[123, 123, 'foo'], [123, 123, 'foo']]);
-  hot.setDataAtRowProp(123, 'foo', 'foo', 'foo');
-  hot.spliceCol(123, 123, 123, 'foo');
-  hot.spliceRow(123, 123, 123, 'foo');
-  hot.toPhysicalRow(123);
-  hot.toPhysicalColumn(123);
-  hot.toVisualRow(123);
-  hot.toVisualColumn(123);
-  hot.unlisten();
-  hot.updateSettings({}, true);
-  hot.validateCells(() => {return; });
-
-  Handsontable.renderers.NumericRenderer(hot, new HTMLTableDataCellElement(), 0, 0, "prop", 1.235, {});
-  Handsontable.renderers.TextRenderer(hot, new HTMLTableDataCellElement(), 0, 0, "prop", 1.235, {});
-  Handsontable.Dom.addEvent(new HTMLElement(), "eventName", () => { return; });
-  Handsontable.Dom.empty(new HTMLElement());
-
-  let bucket: {};
-  let registeredHooks: string[];
-  let hasHook: boolean;
-  let isRegistered: boolean;
-  bucket = Handsontable.hooks.add('beforeInit', () => { return; });
-  bucket = Handsontable.hooks.add('beforeInit', () => { return; }, hot);
-  Handsontable.hooks.createEmptyBucket();
-  Handsontable.hooks.deregister('myHook');
-  Handsontable.hooks.destroy();
-  Handsontable.hooks.destroy(hot);
-  bucket = Handsontable.hooks.getBucket();
-  bucket = Handsontable.hooks.getBucket(hot);
-  registeredHooks = Handsontable.hooks.getRegistered();
-  hasHook = Handsontable.hooks.has("myHook");
-  hasHook = Handsontable.hooks.has("myHook", hot);
-  isRegistered = Handsontable.hooks.isRegistered("myHook");
-  Handsontable.hooks.once('beforeInit', () => { return; });
-  Handsontable.hooks.once('beforeInit', [() => { return; }, () => { return; }]);
-  Handsontable.hooks.once('beforeInit', () => { return; }, hot);
-  Handsontable.hooks.register('myHook');
-  Handsontable.hooks.remove('beforeInit', () => { return; });
-  Handsontable.hooks.remove('beforeInit', () => { return; }, hot);
-  Handsontable.hooks.run(hot, 'beforeInit');
-  Handsontable.hooks.run(hot, 'beforeInit', 'param1', 'param2', 'param3', 'param4', 'param5', 'param6');
-}
-
-class MyCustomHotPlugin extends Handsontable.plugins.BasePlugin {
-  isEnabled(): boolean {
-    return !!this.hot.getSettings().manualRowMove;
-  }
-}
diff --git a/types/handsontable/tsconfig.json b/types/handsontable/tsconfig.json
deleted file mode 100644
index afe6365050..0000000000
--- a/types/handsontable/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "test/global.ts",
-        "test/module.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/handsontable/tslint.json b/types/handsontable/tslint.json
deleted file mode 100644
index 5f3a731336..0000000000
--- a/types/handsontable/tslint.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "dtslint/dt.json",
-  "rules": {
-    // TODOs
-    "ban-types": false,
-    "dt-header": false,
-    "no-any-union": false,
-    "no-single-declare-module": false
-  }
-}
diff --git a/types/hapi-auth-basic/hapi-auth-basic-tests.ts b/types/hapi-auth-basic/hapi-auth-basic-tests.ts
index 7f78fe9f65..1a7192af6f 100644
--- a/types/hapi-auth-basic/hapi-auth-basic-tests.ts
+++ b/types/hapi-auth-basic/hapi-auth-basic-tests.ts
@@ -22,21 +22,22 @@ const users: {[index: string]: User} = {
     }
 };
 
-const validate: Basic.ValidateFunc = function (request, username, password, callback) {
+const validate: Basic.Validate = async (request, username, password, h) => {
 
     const user = users[username];
     if (!user) {
-        return callback(null, false);
+        return { isValid: false, credentials: null };
     }
 
-    Bcrypt.compare(password, user.password, (err, isValid) => {
+    let isValid = await Bcrypt.compare(password, user.password)
 
-        callback(err, isValid, { id: user.id, name: user.name });
-    });
+    return { isValid, credentials: { id: user.id, name: user.name } };
 };
 
-server.register(Basic, (err) => {
+server.register(Basic).then(() => {
+
+    server.auth.strategy('simple', 'basic', { validate });
+	server.auth.default('simple');
 
-    server.auth.strategy('simple', 'basic', { validateFunc: validate });
     server.route({ method: 'GET', path: '/', config: { auth: 'simple' } });
 });
diff --git a/types/hapi-auth-basic/index.d.ts b/types/hapi-auth-basic/index.d.ts
index 07c3c8cc20..ddf05c348a 100644
--- a/types/hapi-auth-basic/index.d.ts
+++ b/types/hapi-auth-basic/index.d.ts
@@ -1,18 +1,24 @@
-// Type definitions for hapi 4.2
+// Type definitions for hapi-bauth-basic 5.0.0
 // Project: https://github.com/hapijs/hapi-auth-basic
 // Definitions by: AJP <https://github.com/AJamesPhillips>
+//                 Rodrigo Saboya <https://github.com/saboya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as Hapi from 'hapi';
 
 declare namespace Basic {
-    interface ValidateFuncCallback {
-        (err: Error | null, isValid: boolean, userCredentials?: any): void;
+    interface ValidateCustomResponse {
+        response: any,
     }
 
-    interface ValidateFunc {
-        (request: Hapi.Request, username: string, password: string, callback: ValidateFuncCallback): void;
+    interface ValidateResponse {
+        isValid: boolean,
+        credentials?: any,
+    }
+
+    interface Validate {
+        (request: Hapi.Request, username: string, password: string, h: object): Promise<ValidateResponse | ValidateCustomResponse>;
     }
 }
 
diff --git a/types/hapi-auth-basic/tsconfig.json b/types/hapi-auth-basic/tsconfig.json
index b1fb0f67e0..56ac44dbdd 100644
--- a/types/hapi-auth-basic/tsconfig.json
+++ b/types/hapi-auth-basic/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "hapi-auth-basic-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi-auth-basic/tslint.json b/types/hapi-auth-basic/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hapi-auth-basic/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hapi-auth-jwt2/index.d.ts b/types/hapi-auth-jwt2/index.d.ts
index 4d5f6b2cd4..91e8ef931e 100644
--- a/types/hapi-auth-jwt2/index.d.ts
+++ b/types/hapi-auth-jwt2/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/dwyl/hapi-auth-jwt2
 // Definitions by: Warren Seymour <https://github.com/warrenseymour>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
 import { Request, Response, PluginFunction } from 'hapi';
 
 declare namespace hapiAuthJwt2 {
diff --git a/types/hapi-auth-jwt2/tsconfig.json b/types/hapi-auth-jwt2/tsconfig.json
index 3bdb692c52..78a8423cc4 100644
--- a/types/hapi-auth-jwt2/tsconfig.json
+++ b/types/hapi-auth-jwt2/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "hapi-auth-jwt2-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi-decorators/index.d.ts b/types/hapi-decorators/index.d.ts
index 4cd98beda8..473e28420f 100644
--- a/types/hapi-decorators/index.d.ts
+++ b/types/hapi-decorators/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/knownasilya/hapi-decorators
 // Definitions by: Ken Howard <https://github.com/kenhowardpdx>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as hapi from 'hapi';
 import * as Joi from 'joi';
diff --git a/types/hapi-decorators/tsconfig.json b/types/hapi-decorators/tsconfig.json
index fb06375c84..80aa56a21e 100644
--- a/types/hapi-decorators/tsconfig.json
+++ b/types/hapi-decorators/tsconfig.json
@@ -15,6 +15,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -22,4 +25,4 @@
         "index.d.ts",
         "hapi-decorators-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi-decorators/tslint.json b/types/hapi-decorators/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hapi-decorators/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index f996967691..a97a9f1edb 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/hapi
 // Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  +                                                                           +
diff --git a/types/hapi/tsconfig.json b/types/hapi/tsconfig.json
index 2a3f7dbd5d..96790b3bff 100644
--- a/types/hapi/tsconfig.json
+++ b/types/hapi/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -94,4 +97,4 @@
         "test/server/table.ts",
         "test/server/version.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi/tslint.json b/types/hapi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hapi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hapi/v12/tslint.json b/types/hapi/v12/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hapi/v12/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hapi/v15/tslint.json b/types/hapi/v15/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hapi/v15/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hapi/v8/tslint.json b/types/hapi/v8/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hapi/v8/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/har-format/index.d.ts b/types/har-format/index.d.ts
index 09ea2791fd..3ab7fd773e 100644
--- a/types/har-format/index.d.ts
+++ b/types/har-format/index.d.ts
@@ -82,7 +82,8 @@ export interface Browser {
  * http://www.softwareishard.com/blog/har-12-spec/#pages
  */
 export interface Page {
-    /** Date and time stamp for the beginning of the page load
+    /**
+     * Date and time stamp for the beginning of the page load
      *
      * (ISO 8601 - `YYYY-MM-DDThh:mm:ss.sTZD`,
      * e.g. `2009-07-24T19:20:30.45+01:00`).
@@ -266,19 +267,21 @@ export interface Page {
  * http://www.softwareishard.com/blog/har-12-spec/#pageTimings
  */
 export interface PageTiming {
-    /** Content of the page loaded. Number of milliseconds since page load
+    /**
+     * Content of the page loaded. Number of milliseconds since page load
      * started (`page.startedDateTime`).
      *
      * Use `-1` if the timing does not apply to the current request.
      */
     onContentLoad?: number;
-    /** Page is loaded (`onLoad` event fired). Number of milliseconds since
+    /**
+     * Page is loaded (`onLoad` event fired). Number of milliseconds since
      * page load started (`page.startedDateTime`).
      *
      * Use `-1` if the timing does not apply to the current request.
      */
     onLoad?: number;
-    /**  A comment provided by the user or the application */
+    /** A comment provided by the user or the application */
     comment?: string;
     _startRender?: number;
 }
@@ -562,7 +565,8 @@ export interface Response {
      * of header objects._
      */
     headersSize: number;
-    /** Size of the received response body in bytes.
+    /**
+     * Size of the received response body in bytes.
      *
      * - Set to zero in case of responses coming from the cache (`304`).
      * - Set to `-1` if the info is not available.
@@ -633,12 +637,14 @@ export interface QueryString {
 export interface PostData {
     /** Mime type of posted data. */
     mimeType: string;
-    /** List of posted parameters (in case of URL encoded parameters).
+    /**
+     * List of posted parameters (in case of URL encoded parameters).
      *
      * _`text` and `params` fields are mutually exclusive._
      */
     params: Param[];
-    /** Plain text posted data
+    /**
+     * Plain text posted data
      *
      * _`params` and `text` fields are mutually exclusive._
      */
@@ -733,14 +739,16 @@ export interface Cache {
     comment?: string;
 }
 export interface CacheDetails {
-    /** Expiration time of the cache entry.
+    /**
+     * Expiration time of the cache entry.
      *
      * _(Format not documente but assumingly ISO 8601 -
      * `YYYY-MM-DDThh:mm:ss.sTZD`)_
      */
     expires?: string;
-    /** The last time the cache entry was opened.
-     *    *
+    /**
+     * The last time the cache entry was opened.
+     *
      * _(Format not documente but assumingly ISO 8601 -
      * `YYYY-MM-DDThh:mm:ss.sTZD`)_
      */
diff --git a/types/harmony-proxy/tslint.json b/types/harmony-proxy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/harmony-proxy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hasher/index.d.ts b/types/hasher/index.d.ts
index da2e32109a..d6c7a6e3b7 100644
--- a/types/hasher/index.d.ts
+++ b/types/hasher/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/millermedeiros/hasher/
 // Definitions by: flyfishMT <https://github.com/flyfishMT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="signals" />
 
diff --git a/types/hasher/tslint.json b/types/hasher/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hasher/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hashids/tslint.json b/types/hashids/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hashids/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hashmap/tslint.json b/types/hashmap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hashmap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hashmap/v1/tslint.json b/types/hashmap/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hashmap/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hashset/tslint.json b/types/hashset/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hashset/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hashtable/tslint.json b/types/hashtable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hashtable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/haversine/haversine-tests.ts b/types/haversine/haversine-tests.ts
index 043d7d5898..5c068ea4b3 100644
--- a/types/haversine/haversine-tests.ts
+++ b/types/haversine/haversine-tests.ts
@@ -1,11 +1,11 @@
 import haversine = require('haversine');
 
-const start: haversine.Coordinate = {
+const start: haversine.CoordinateLongitudeLatitude = {
   longitude: 48.1548256,
   latitude: 11.4017529
 };
 
-const end: haversine.Coordinate = {
+const end: haversine.CoordinateLongitudeLatitude = {
   longitude: 52.5065133,
   latitude: 13.1445551
 };
@@ -16,3 +16,51 @@ const options: haversine.Options = {
 };
 
 haversine(start, end, options);
+
+const startShort: haversine.CoordinateLonLat = {
+  lon: 48.1548256,
+  lat: 11.4017529
+};
+
+const endShort: haversine.CoordinateLonLat = {
+  lon: 52.5065133,
+  lat: 13.1445551
+};
+
+const optionsShort: haversine.Options = {
+  format: '{lon,lat}'
+};
+
+haversine(startShort, endShort, optionsShort);
+
+const startLatLon: haversine.LatLonTuple = [11.4017529, 48.1548256];
+
+const endLatLon: haversine.LatLonTuple = [13.1445551, 52.5065133];
+
+const optionsLatLon: haversine.Options = {
+  format: '[lat,lon]'
+};
+
+haversine(startLatLon, endLatLon, optionsLatLon);
+
+const startGeoJSON = {
+  type: "Feature",
+  geometry: {
+    type: "LineString",
+    coordinates: startLatLon
+  }
+};
+
+const endGeoJSON = {
+  type: "Feature",
+  geometry: {
+    type: "LineString",
+    coordinates: endLatLon
+  }
+};
+
+const optionsGeoJSON: haversine.Options = {
+  format: 'geojson'
+};
+
+haversine(startGeoJSON, endGeoJSON, optionsGeoJSON);
diff --git a/types/haversine/index.d.ts b/types/haversine/index.d.ts
index aa3c0cb1aa..5f6d1e9173 100644
--- a/types/haversine/index.d.ts
+++ b/types/haversine/index.d.ts
@@ -1,14 +1,29 @@
-// Type definitions for haversine 1.0
+// Type definitions for haversine 1.1
 // Project: https://github.com/njj/haversine
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace haversine {
-    interface Coordinate {
+    interface CoordinateLongitudeLatitude {
         longitude: number;
         latitude: number;
     }
 
+    interface CoordinateLonLat {
+        lon: number;
+        lat: number;
+    }
+
+    type LatLonTuple = [number, number];
+
+    interface GeoJSON {
+        geometry: {
+            coordinates: LatLonTuple
+        };
+    }
+
+    type Coordinate = (CoordinateLongitudeLatitude | CoordinateLonLat | LatLonTuple | GeoJSON);
+
     interface Options {
         /**
          * Unit of measurement applied to result. Default: "km".
@@ -18,14 +33,15 @@ declare namespace haversine {
          * If passed, will result in library returning boolean value of whether or not the start and end points are within that supplied threshold. Default: null.
          */
         threshold?: number;
+        /**
+         * Format of coordinate arguments.
+         */
+        format?: '[lat,lon]' | '[lon,lat]' | '{lon,lat}' | 'geojson';
     }
 }
 
 /**
  * Determines the great-circle distance between two points on a sphere given their longitudes and latitudes
- * @param start
- * @param end
- * @param options
  */
 declare function haversine(
     start: haversine.Coordinate,
diff --git a/types/he/tslint.json b/types/he/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/he/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/headroom/tslint.json b/types/headroom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/headroom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/heap/tslint.json b/types/heap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/heap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/heapdump/heapdump-tests.ts b/types/heapdump/heapdump-tests.ts
new file mode 100644
index 0000000000..49019f83fc
--- /dev/null
+++ b/types/heapdump/heapdump-tests.ts
@@ -0,0 +1,9 @@
+import * as heapdump from 'heapdump';
+
+heapdump.writeSnapshot('/tmp/myDump', (err) => {
+  if (err) {
+    console.log('Failed to dump heap: ' + err);
+  } else {
+    console.log('Successfully dumped heap!');
+  }
+});
diff --git a/types/heapdump/index.d.ts b/types/heapdump/index.d.ts
new file mode 100644
index 0000000000..d4e0477a32
--- /dev/null
+++ b/types/heapdump/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for heapdump 0.3
+// Project: https://github.com/bnoordhuis/node-heapdump
+// Definitions by: weekens <https://github.com/weekens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function writeSnapshot(dumpFileName: string, callback: (err?: Error) => void): void;
diff --git a/types/heapdump/tsconfig.json b/types/heapdump/tsconfig.json
new file mode 100644
index 0000000000..a15a306b41
--- /dev/null
+++ b/types/heapdump/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "heapdump-tests.ts"
+    ]
+}
diff --git a/types/heapdump/tslint.json b/types/heapdump/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/heapdump/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/heatmap.js/heatmap.js-tests.ts b/types/heatmap.js/heatmap.js-tests.ts
index c2f2d34c16..af0c021b3f 100644
--- a/types/heatmap.js/heatmap.js-tests.ts
+++ b/types/heatmap.js/heatmap.js-tests.ts
@@ -1,42 +1,271 @@
+declare const container: HTMLElement;
 
+// -- h337.HeatmapConfiguration --
 
-var baseLayer = L.tileLayer(
-    'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-        attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://cloudmade.com">CloudMade</a>',
-        maxZoom: 18
-     });
+{
+    const config: h337.HeatmapConfiguration = { container };
+    config; // $ExpectType HeatmapConfiguration<"value", "x", "y">
+}
 
-var testData: HeatmapData = {
-    max: 8,
-    data: [
-        {
-            lat: 24.6408,
-            lng:46.7728,
-            count: 3
-        }, {
-            lat: 50.75,
-            lng: -1.55,
-            count: 1
+{
+    const config: h337.HeatmapConfiguration = {
+        container,
+        xField: 'x',
+        yField: 'y',
+        valueField: 'value',
+    };
+}
+
+{
+    // $ExpectError
+    const config: h337.HeatmapConfiguration = {
+        container,
+        valueField: 'foo',
+    };
+}
+
+{
+    const config: h337.HeatmapConfiguration<'foo'> = {
+        container,
+        valueField: 'foo',
+    };
+    config; // $ExpectType HeatmapConfiguration<"foo", "x", "y">
+}
+
+// -- h337.create --
+
+{
+    // $ExpectType Heatmap<"value", "x", "y">
+    h337.create({ container });
+
+    // $ExpectType Heatmap<"count", "xPos", "yPos">
+    h337.create<"count", "xPos", "yPos">({
+        container,
+        valueField: "count",
+        xField: "xPos",
+        yField: "yPos",
+    });
+
+    const config: h337.HeatmapConfiguration<"count", "xPos", "yPos"> = {
+        container,
+        valueField: "count",
+        xField: "xPos",
+        yField: "yPos",
+    };
+    // $ExpectType Heatmap<"count", "xPos", "yPos">
+    h337.create(config);
+}
+
+// -- Heatmap#addData --
+
+{
+    const heatmap = h337.create({ container });
+
+    // $ExpectType Heatmap<"value", "x", "y">
+    heatmap.addData({ x: 1, y: 1, value: 5 });
+
+    heatmap.addData([
+        { x: 1, y: 1, value: 1 },
+        { x: 2, y: 2, value: 2 },
+    ]);
+
+    heatmap.addData({ x: null, y: 1, value: 1 }); // $ExpectError
+    heatmap.addData({ x: 1, y: null, value: 1 }); // $ExpectError
+    heatmap.addData({ x: 1, y: 1, value: null }); // $ExpectError
+    heatmap.addData({ y: 1, value: 1 }); // $ExpectError
+    heatmap.addData({ x: 1, value: 1 }); // $ExpectError
+    heatmap.addData({ x: 1, y: 1, }); // $ExpectError
+}
+
+{
+    const heatmap = h337.create<"count", "xPos", "yPos">({
+        container,
+        xField: "xPos",
+        yField: "yPos",
+        valueField: "count",
+    });
+
+    // $ExpectType Heatmap<"count", "xPos", "yPos">
+    heatmap.addData({ xPos: 1, yPos: 1, count: 5 });
+
+    heatmap.addData([
+        { xPos: 1, yPos: 1, count: 1 },
+        { xPos: 2, yPos: 2, count: 2 },
+    ]);
+
+    heatmap.addData({ xPos: null, yPos: 1, count: 1 }); // $ExpectError
+    heatmap.addData({ xPos: 1, yPos: null, count: 1 }); // $ExpectError
+    heatmap.addData({ xPos: 1, yPos: 1, count: null }); // $ExpectError
+    heatmap.addData({ yPos: 1, count: 1 }); // $ExpectError
+    heatmap.addData({ xPos: 1, count: 1 }); // $ExpectError
+    heatmap.addData({ xPos: 1, yPos: 1, }); // $ExpectError
+}
+
+// -- Heatmap#setData --
+
+{
+    const validData: ReadonlyArray<h337.DataPoint> =
+        [{ x: 1, y: 2, value: 1 }];
+
+    const heatmap = h337.create({ container });
+    heatmap.setData({ max: 5, data: validData }); // $ExpectError
+    heatmap.setData({ min: 5, data: validData }); // $ExpectError
+
+    // $ExpectType Heatmap<"value", "x", "y">
+    heatmap.setData({
+        min: 0,
+        max: 1,
+        data: validData
+    });
+
+    heatmap.setData({ // $ExpectError
+        min: 0,
+        max: 1,
+        data: [{ xPos: 1, yPos: 2, value: 5 }]
+    });
+}
+
+{
+    const validData: ReadonlyArray<h337.DataPoint<"count", "xPos", "yPos">> =
+        [{ xPos: 1, yPos: 2, count: 1 }];
+
+    const heatmap = h337.create<"count", "xPos", "yPos">({ container });
+    heatmap.setData({ max: 5, data: validData }); // $ExpectError
+    heatmap.setData({ min: 5, data: validData }); // $ExpectError
+
+    // $ExpectType Heatmap<"count", "xPos", "yPos">
+    heatmap.setData({
+        min: 0,
+        max: 1,
+        data: validData
+    });
+
+    heatmap.setData({ // $ExpectError
+        min: 0,
+        max: 1,
+        data: [{ x: 1, y: 2, value: 5 }]
+    });
+}
+
+// -- Heatmap#setDataMax / Heatmap#setDataMin --
+
+{
+    const heatmap = h337.create({ container });
+
+    // $ExpectType Heatmap<"value", "x", "y">
+    heatmap.setDataMax(500);
+    heatmap.setDataMax(null); // $ExpectError
+    heatmap.setDataMax(); // $ExpectError
+
+    heatmap.setDataMin(500);
+    heatmap.setDataMin(null); // $ExpectError
+    heatmap.setDataMin(); // $ExpectError
+}
+
+// -- Heatmap#configure --
+
+{
+    const heatmap = h337.create({ container });
+
+    // $ExpectType Heatmap<"value", "x", "y">
+    heatmap.configure({ container });
+
+    const nextHeatmap = heatmap.configure<"count", "xPos", "yPos">({
+        container,
+        valueField: "count",
+        xField: "xPos",
+        yField: "yPos"
+    });
+
+    nextHeatmap; // $ExpectType Heatmap<"count", "xPos", "yPos">
+
+    // $ExpectType Heatmap<"count", "xPos", "yPos">
+    nextHeatmap.configure({ container });
+}
+
+// -- Heatmap#getValueAt --
+
+{
+    // $ExpectType number
+    h337.create({ container }).getValueAt({ x: 0, y: 1 });
+
+    // $ExpectType number
+    h337.create<"foo", "bar", "baz">({ container }).getValueAt({ x: 0, y: 1 });
+}
+
+// -- Heatmap#getData --
+
+{
+    // $ExpectType HeatmapData<DataCircle>
+    h337.create({ container }).getData();
+
+    // $ExpectType HeatmapData<DataCircle>
+    h337.create<"foo", "bar", "baz">({ container }).getData();
+}
+
+// -- Heatmap#getDataURL --
+
+{
+    // $ExpectType string
+    h337.create({ container }).getDataURL();
+}
+
+// -- Heatmap#repaint --
+{
+    // $ExpectType Heatmap<"value", "x", "y">
+    h337.create({ container }).repaint();
+
+    // $ExpectType Heatmap<"foo", "bar", "baz">
+    h337.create<"foo", "bar", "baz">({ container }).repaint();
+}
+
+// -- Leaflet plugin --
+
+{
+    const baseLayer = L.tileLayer(
+        'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            // tslint:disable-next-line max-line-length
+            attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://cloudmade.com">CloudMade</a>',
+            maxZoom: 18
         }
-    ]
-};
+    );
 
-var config : HeatmapConfiguration = {
-    radius: 2,
-    maxOpacity: .8,
-    scaleRadius: true,
-    useLocalExtrema: true,
-    latField: 'lat',
-    lngField: 'lng',
-    valueField: 'count'
-};
+    const testData: h337.HeatmapData<h337.DataPoint<'count', 'lat', 'lng'>> = {
+        min: 1,
+        max: 3,
+        data: [
+            {
+                lat: 24.6408,
+                lng: 46.7728,
+                count: 3
+            }, {
+                lat: 50.75,
+                lng: -1.55,
+                count: 1
+            }
+        ]
+    };
 
-var heatmapLayer = new HeatmapOverlay(config);
+    const config: h337.HeatmapOverlayConfiguration<'count'> = {
+        radius: 2,
+        maxOpacity: .8,
+        scaleRadius: true,
+        useLocalExtrema: true,
+        latField: 'lat',
+        lngField: 'lng',
+        valueField: 'count'
+    };
+    config; // $ExpectType HeatmapOverlayConfiguration<"count", "lat", "lng">
 
-var map = new L.Map('map-canvas', {
-    center: new L.LatLng(25.6586, -80.3568),
-    zoom: 4,
-    layers: [baseLayer, heatmapLayer]
-});
+    const heatmapLayer = new HeatmapOverlay(config);
+    heatmapLayer; // $ExpectType HeatmapOverlay<"count", "lat", "lng">
 
-heatmapLayer.setData(testData);
+    const map = new L.Map('map-canvas', {
+        center: new L.LatLng(25.6586, -80.3568),
+        zoom: 4,
+        layers: [baseLayer, heatmapLayer]
+    });
+
+    // $ExpectType void
+    heatmapLayer.setData(testData);
+}
diff --git a/types/heatmap.js/index.d.ts b/types/heatmap.js/index.d.ts
index 60ee16c4f0..265f17f5fb 100644
--- a/types/heatmap.js/index.d.ts
+++ b/types/heatmap.js/index.d.ts
@@ -1,142 +1,390 @@
-// Type definitions for heatmap.js v2.0
+// Type definitions for heatmap.js 2.0
 // Project: https://github.com/pa7/heatmap.js/
 // Definitions by: Yang Guan <https://github.com/lookuptable>
+//                 Rhys van der Waerden <https://github.com/rhys-vdw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export as namespace h337;
+
+/**
+ * Create a heatmap instance. A Heatmap can be customized with the configObject.
+ *
+ * @example <caption>Simple configuration with standard gradient</caption>
+ *
+ * // create configuration object
+ * var config = {
+ *   container: document.getElementById('heatmapContainer'),
+ *   radius: 10,
+ *   maxOpacity: .5,
+ *   minOpacity: 0,
+ *   blur: .75
+ * };
+ * // create heatmap with configuration
+ * var heatmapInstance = h337.create(config);
+ *
+ * @example <caption>Custom gradient configuration</caption>
+ *
+ * // create configuration object
+ * var config = {
+ *   container: document.getElementById('heatmapContainer'),
+ *   radius: 10,
+ *   maxOpacity: .5,
+ *   minOpacity: 0,
+ *   blur: .75,
+ *   gradient: {
+ *     // enter n keys between 0 and 1 here
+ *     // for gradient color customization
+ *     '.5': 'blue',
+ *     '.8': 'red',
+ *     '.95': 'white'
+ *   }
+ * };
+ * var heatmapInstance = h337.create(config);
+ */
+export function create<
+    V extends string = 'value',
+    X extends string = 'x',
+    Y extends string = 'y'
+>(
+    configObject: HeatmapConfiguration<V, X, Y>
+): Heatmap<V, X, Y>;
+
+export function register(pluginKey: string, plugin: any): void;
+
+/**
+ * Heatmap instances are returned by h337.create. A heatmap instance has its own
+ * internal datastore and renderer where you can manipulate data. As a result
+ * the heatmap gets updated (either partially or completely, depending on
+ * whether it's necessary).
+ */
+export class Heatmap<V extends string, X extends string, Y extends string> {
+    /**
+     * Use this functionality only for adding datapoints on the fly, not for data
+     * initialization! heatmapInstance.addData adds a single or multiple
+     * datapoints to the heatmap's datastore.
+     *
+     * @example <caption>A single datapoint</caption>
+     *
+     * var dataPoint = {
+     *   x: 5, // x coordinate of the datapoint, a number
+     *   y: 5, // y coordinate of the datapoint, a number
+     *   value: 100 // the value at datapoint(x, y)
+     * };
+     * heatmapInstance.addData(dataPoint);
+     *
+     * @example <caption>multiple datapoints</caption>
+     *
+     * // for data initialization use setData!!
+     * var dataPoints = [dataPoint, dataPoint, dataPoint, dataPoint];
+     * heatmapInstance.addData(dataPoints);
+     */
+    addData(dataPoint: DataPoint<V, X, Y> | ReadonlyArray<DataPoint<V, X, Y>>): this;
+
+    /**
+     * Initialize a heatmap instance with the given dataset. Removes all
+     * previously existing points from the heatmap instance and re-initializes
+     * the datastore.
+     *
+     * @example
+     *
+     * var data = {
+     *   max: 100,
+     *   min: 0,
+     *   data: [
+     *     dataPoint, dataPoint, dataPoint, dataPoint
+     *   ]
+     * };
+     * heatmapInstance.setData(data);
+     */
+    setData(data: HeatmapData<DataPoint<V, X, Y>>): this;
+
+    /**
+     * Changes the upper bound of your dataset and triggers a complete
+     * rerendering.
+     *
+     * @example
+     *
+     * heatmapInstance.setDataMax(200);
+     * // setting the maximum value triggers a complete rerendering of the heatmap
+     * heatmapInstance.setDataMax(100);
+     */
+    setDataMax(number: number): this;
+
+    /**
+     * Changes the lower bound of your dataset and triggers a complete
+     * rerendering.
+     *
+     * @example
+     *
+     * heatmapInstance.setDataMin(10);
+     * // setting the minimum value triggers a complete rerendering of the heatmap
+     * heatmapInstance.setDataMin(0);
+     */
+    setDataMin(number: number): this;
+
+    /**
+     * Reconfigures a heatmap instance after it has been initialized. Triggers a
+     * complete rerendering.
+     *
+     * NOTE: This returns a reference to itself, but also offers an opportunity
+     * to change the `xField`, `yField` and `valueField` options, which can
+     * change the type of the `Heatmap` instance.
+     *
+     * @example
+     *
+     * var nuConfig = {
+     *   radius: 10,
+     *   maxOpacity: .5,
+     *   minOpacity: 0,
+     *   blur: .75
+     * };
+     * heatmapInstance.configure(nuConfig);
+     */
+    configure<
+        Vn extends string = V,
+        Xn extends string = X,
+        Yn extends string = Y
+    >(configObject: HeatmapConfiguration<Vn, Xn, Yn>): Heatmap<Vn, Xn, Yn>;
+
+    /**
+     * Returns value at datapoint position.
+     *
+     * The returned value is an interpolated value based on the gradient blending
+     * if point is not in store.
+     *
+     * @example
+     *
+     * heatmapInstance.addData({ x: 10, y: 10, value: 100});
+     * // get the value at x=10, y=10
+     * heatmapInstance.getValueAt({ x: 10, y: 10 }); // returns 100
+     */
+    getValueAt(point: { x: number, y: number }): number;
+
+    /**
+     * Returns a persistable and reimportable (with setData) JSON object.
+     *
+     * @example
+     *
+     * var currentData = heatmapInstance.getData();
+     * // now let's create a new instance and set the data
+     * var heatmap2 = h337.create(config);
+     * heatmap2.setData(currentData); // now both heatmap instances have the same content
+     */
+    getData(): HeatmapData<DataCircle>;
+
+    /**
+     * Returns dataURL string.
+     *
+     * The returned value is the base64 encoded dataURL of the heatmap instance.
+     *
+     * @example
+     *
+     * heatmapInstance.getDataURL(); // data:image/png;base64...
+     * // ready for saving locally or on the server
+     */
+    getDataURL(): string;
+
+    /**
+     * Repaints the whole heatmap canvas.
+     */
+    repaint(): this;
+}
+
+export interface BaseHeatmapConfiguration<V extends string = 'value'> {
+    /**
+     * A background color string in form of hexcode, color name, or rgb(a)
+     */
+    backgroundColor?: string;
+
+    /**
+     * The blur factor that will be applied to all datapoints. The higher the
+     * blur factor is, the smoother the gradients will be
+     * Default value: 0.85
+     */
+    blur?: number;
+
+    /**
+     * An object that represents the gradient.
+     * Syntax: {[key: number in range [0,1]]: color}
+     */
+    gradient?: { [key: string]: string };
+
+    /**
+     * The maximal opacity the highest value in the heatmap will have. (will be
+     * overridden if opacity set)
+     * Default value: 0.6
+     */
+    maxOpacity?: number;
+
+    /**
+     * The minimum opacity the lowest value in the heatmap will have (will be
+     * overridden if opacity set)
+     */
+    minOpacity?: number;
+
+    /**
+     * A global opacity for the whole heatmap. This overrides maxOpacity and
+     * minOpacity if set
+     * Default value: 0.6
+     */
+    opacity?: number;
+
+    /**
+     * The radius each datapoint will have (if not specified on the datapoint
+     * itself)
+     */
+    radius?: number;
+
+    /**
+     * Scales the radius based on map zoom.
+     */
+    scaleRadius?: boolean;
+
+    /**
+     * The property name of the value/weight in a datapoint
+     * Default value: 'value'
+     */
+    valueField?: V;
+
+    /**
+     * Pass a callback to receive extrema change updates. Useful for DOM
+     * legends.
+     */
+    onExtremaChange?: () => void;
+
+    /**
+     * Indicate whether the heatmap should use a global extrema or a local
+     * extrema (the maximum and minimum of the currently displayed viewport)
+     */
+    useLocalExtrema?: boolean;
+}
+
+/**
+ * Configuration object of a heatmap
+ */
+export interface HeatmapConfiguration<
+    V extends string = 'value',
+    X extends string = 'x',
+    Y extends string = 'y',
+> extends BaseHeatmapConfiguration<V> {
+    /**
+     * A DOM node where the heatmap canvas should be appended (heatmap will adapt to
+     * the node's size)
+     */
+    container: HTMLElement;
+
+    /**
+     * The property name of your x coordinate in a datapoint
+     * Default value: 'x'
+     */
+    xField?: X;
+
+    /**
+     * The property name of your y coordinate in a datapoint
+     * Default value: 'y'
+     */
+    yField?: Y;
+}
+
+export interface HeatmapOverlayConfiguration<
+    V extends string = 'value',
+    TLat extends string = 'lat',
+    TLong extends string = 'lng',
+> extends BaseHeatmapConfiguration<V> {
+    /**
+     * The property name of your latitude coordinate in a datapoint
+     * Default value: 'x'
+     */
+    latField?: TLat;
+
+    /**
+     * The property name of your longitude coordinate in a datapoint
+     * Default value: 'y'
+     */
+    lngField?: TLong;
+}
+
+/**
+ * A single data point on a heatmap. The interface of the data point can be
+ * overridden by providing alternative values for `xKey` and `yKey` in the
+ * config object.
+ */
+export type DataPoint<
+    V extends string = 'value',
+    X extends string = 'x',
+    Y extends string = 'y',
+> = Record<V | X | Y, number>;
+
+/**
+ * Type of data returned by `Heatmap#hello`, which ignores custom `xField`,
+ * `yField` and `valueField`.
+ */
+export interface DataCircle {
+    x: number;
+    y: number;
+    value: number;
+    radius: number;
+}
+
+/**
+ * An object representing the set of data points on a heatmap
+ */
+export interface HeatmapData<T> {
+    /**
+     * An array of data points
+     */
+    data: ReadonlyArray<T>;
+
+    /**
+     * Max value of the valueField
+     */
+    max: number;
+
+    /**
+     * Min value of the valueField
+     */
+    min: number;
+}
+
+// -- Leaflet plugin --
 
 import * as Leaflet from "leaflet";
 
 declare global {
-    /*
-    * Configuration object of a heatmap
-    */
-    interface HeatmapConfiguration {
-
-        /*
-        * A background color string in form of hexcode, color name, or rgb(a)
-        */
-        backgroundColor?: string;
-
-        /*
-        * The blur factor that will be applied to all datapoints. The higher the
-        * blur factor is, the smoother the gradients will be
-        * Default value: 0.85
-        */
-        blur?: number;
-
-        /*
-        * An object that represents the gradient
-        */
-        gradient?: any;
-
-        /*
-        * The property name of your latitude coordinate in a datapoint
-        * Default value: 'x'
-        */
-        latField?: string;
-
-        /*
-        * The property name of your longitude coordinate in a datapoint
-        * Default value: 'y'
-        */
-        lngField?: string;
-
-        /*
-        * The maximal opacity the highest value in the heatmap will have. (will be
-        * overridden if opacity set)
-        * Default value: 0.6
-        */
-        maxOpacity?: number;
-
-        /*
-        * The minimum opacity the lowest value in the heatmap will have (will be
-        * overridden if opacity set)
-        */
-        minOpacity?: number;
-
-        /*
-        * A global opacity for the whole heatmap. This overrides maxOpacity and
-        * minOpacity if set
-        */
-        opacity?: number;
-
-        /*
-        * The radius each datapoint will have (if not specified on the datapoint
-        * itself)
-        */
-        radius?: number;
+    /**
+     * The overlay layer to be added onto leaflet map
+     */
+    class HeatmapOverlay<
+        V extends string,
+        TLat extends string,
+        TLng extends string
+    > implements Leaflet.ILayer {
+        /**
+         * Initialization function
+         */
+        constructor(configuration: HeatmapOverlayConfiguration<V, TLat, TLng>);
 
         /**
-         * Scales the radius based on map zoom.
+         * Initialize a heatmap instance with the given dataset
          */
-        scaleRadius?: boolean;
+        setData(data: HeatmapData<DataPoint<V, TLat, TLng>>): void;
 
-        /*
-        * Indicate whether the heatmap should use a global extrema or a local
-        * extrema (the maximum and minimum of the currently displayed viewport)
-        */
-        useLocalExtrema?: boolean;
+        /**
+         * Experimential... not ready.
+         */
+        addData(data: DataPoint<V, TLat, TLng> | ReadonlyArray<DataPoint<V, TLat, TLng>>): void;
 
-        /*
-        * The property name of the value/weight in a datapoint
-        * Default value: 'value'
-        */
-        valueField?: string;
-    }
-
-    /*
-    * A single data point on a heatmap. The keys are specified by
-    * HeatmapConfig.latField, HeatmapConfig.lngField and HeatmapConfig.valueField
-    */
-    interface HeatmapDataPoint {
-        [index: string]: number;
-    }
-
-    /*
-    * An object representing the set of data points on a heatmap
-    */
-    interface HeatmapData {
-
-        /*
-        * An array of HeatmapDataPoints
-        */
-        data: HeatmapDataPoint[];
-
-        /*
-        * Max value of the valueField
-        */
-        max?: number;
-
-        /*
-        * Min value of the valueField
-        */
-        min?: number;
-    }
-
-    /*
-    * The overlay layer to be added onto leaflet map
-    */
-    class HeatmapOverlay {
-
-        /*
-        * Initialization function
-        */
-        constructor(configuration: HeatmapConfiguration)
-
-        /*
-        * Create DOM elements for an overlay, adding them to map panes and puts
-        * listeners on relevant map events
-        */
+        /**
+         * Create DOM elements for an overlay, adding them to map panes and puts
+         * listeners on relevant map events
+         */
         onAdd(map: Leaflet.Map): void;
 
-        /*
-        * Remove the overlay's elements from the DOM and remove listeners
-        * previously added by onAdd()
-        */
+        /**
+         * Remove the overlay's elements from the DOM and remove listeners
+         * previously added by onAdd()
+         */
         onRemove(map: Leaflet.Map): void;
-
-        /*
-        * Initialize a heatmap instance with the given dataset
-        */
-        setData(data: HeatmapData): void;
     }
 }
diff --git a/types/heatmap.js/tsconfig.json b/types/heatmap.js/tsconfig.json
index 06fa28716f..2e22853a34 100644
--- a/types/heatmap.js/tsconfig.json
+++ b/types/heatmap.js/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/heatmap.js/tslint.json b/types/heatmap.js/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/heatmap.js/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/hellosign-embedded/tslint.json b/types/hellosign-embedded/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hellosign-embedded/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index c5883ae70b..a78e768688 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/helmetjs/helmet
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Evan Hahn <https://github.com/EvanHahn>, Elliot Blackburn <https://github.com/bluehatbrit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import express = require('express');
 
diff --git a/types/helmet/tslint.json b/types/helmet/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/helmet/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/heredatalens/index.d.ts b/types/heredatalens/index.d.ts
index 1e80ac29ba..cb9a4d7807 100644
--- a/types/heredatalens/index.d.ts
+++ b/types/heredatalens/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developer.here.com/
 // Definitions by: Bernd Hacker <https://github.com/denyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="heremaps" />
 
@@ -19,7 +20,7 @@ declare namespace H.datalens {
     class Service implements service.IConfigurable {
         /**
          * Constructor
-         * @param options {Service.Options=} - Overrides the configuration from the service.Platform instance
+         * @param options - Overrides the configuration from the service.Platform instance
          */
         constructor(options?: Service.Options);
 
@@ -28,13 +29,13 @@ declare namespace H.datalens {
          * It makes any CRUD request (GET, PUT, POST, DELETE).
          * This method can be used when implementing a custom provider or implementing data management.
          * Otherwise existing providers are used to get data from the Data Lens REST API.
-         * @param method {string} - Any HTTP method (GET, PUT, POST, etc.)
-         * @param endpoint {string} - The REST API endpoint
-         * @param params {any=} - URL parameters
-         * @param body {any=} - The payload of the request
-         * @param onResult {function(any)=} - Callback called on a successful request with response data
-         * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
-         * @returns {Promise<any>} - Response Promise
+         * @param method - Any HTTP method (GET, PUT, POST, etc.)
+         * @param endpoint - The REST API endpoint
+         * @param params - URL parameters
+         * @param body - The payload of the request
+         * @param onResult - Callback called on a successful request with response data
+         * @param onError - Callback called on an unsuccessful request with the Error object
+         * @returns - Response Promise
          */
         request(method: string, endpoint: string, params?: any, body?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
 
@@ -42,45 +43,44 @@ declare namespace H.datalens {
          * This method fetches query data for a given query ID.
          * This method can be used when implementing a custom provider.
          * Otherwise existing providers are used to get data from the Data Lens REST API.
-         * @param queryId {string} - The ID of the Data Lens REST API query
-         * @param params {any=} - Query dynamic parameters
-         * @param onResult {function(any)=} - Callback called on a successful request with response data
-         * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
-         * @returns {Promise<any>} - Response Promise
+         * @param queryId - The ID of the Data Lens REST API query
+         * @param params - Query dynamic parameters
+         * @param onResult - Callback called on a successful request with response data
+         * @param onError - Callback called on an unsuccessful request with the Error object
+         * @returns - Response Promise
          */
         fetchQueryData(queryId: string, params?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
 
         /**
          * This method fetches statistical data for the Data Lens query (eg minimum and maximum values for the query metric).
          * It can be used to define visualization boundaries, scales and legends.
-         * @param queryId {string} - The ID of the Data Lens REST API query
-         * @param statsQuery {any} - A JSON object which defines a statistics query for the Data Lens query
-         * @param onResult {function(any)=} - Callback called on a successful request with response data
-         * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
-         * @returns {Promise<any>} - Response Promise
+         * @param queryId - The ID of the Data Lens REST API query
+         * @param statsQuery - A JSON object which defines a statistics query for the Data Lens query
+         * @param onResult - Callback called on a successful request with response data
+         * @param onError - Callback called on an unsuccessful request with the Error object
+         * @returns - Response Promise
          */
         fetchQueryStats(queryId: string, statsQuery: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
 
         /**
          * This method fetches a layer of geometries (eg buildings or administrative boundaries).
-         * @param layerName {string} - The name of the layer
-         * @param params {any=} - URL parameters (eg bounding box)
-         * @param onResult {function(any)=} - Callback called on a successful request with response data
-         * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
-         * @returns {Promise<any>} - Response Promise
+         * @param layerName - The name of the layer
+         * @param params - URL parameters (eg bounding box)
+         * @param onResult - Callback called on a successful request with response data
+         * @param onError - Callback called on an unsuccessful request with the Error object
+         * @returns - Response Promise
          */
         fetchLayer(layerName: string, params?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
 
         /**
          * This method fetches vector tile data from the layer.
-         * @param layerName {string}
-         * @param x {QueryTileProvider.X} - Tile columns
-         * @param y {QueryTileProvider.Y} - Tile row
-         * @param z {QueryTileProvider.Zoom} - zoom level
-         * @param params {any=} - URL parameters (eg bounding box)
-         * @param onResult {function(any)=} - Callback called on a successful request with response data
-         * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
-         * @returns {Promise<Uint8Array>} - Typed array with tile data
+         * @param x - Tile columns
+         * @param y - Tile row
+         * @param z - zoom level
+         * @param params - URL parameters (eg bounding box)
+         * @param onResult - Callback called on a successful request with response data
+         * @param onError - Callback called on an unsuccessful request with the Error object
+         * @returns - Typed array with tile data
          */
         fetchLayerTile(layerName: string, x: QueryTileProvider.X, y: QueryTileProvider.Y, z: QueryTileProvider.Zoom,
                         params?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<Uint8Array>;
@@ -88,20 +88,19 @@ declare namespace H.datalens {
         /**
          * Sets the access and refresh tokens used to authenticate all requests against the Data Lens REST API.
          * Use this method to implement custom authentication to the Data Lens REST API.
-         * @param accessToken {string} - The token used to authenticate all requests
-         * @param refreshToken {string} - The token used to fetch a new access token after the previous access token has expired.
+         * @param accessToken - The token used to authenticate all requests
+         * @param refreshToken - The token used to fetch a new access token after the previous access token has expired.
          * When refreshToken is provided, Service will automatically update the expired accessToken.
          */
         setTokens(accessToken: string, refreshToken: string): void;
 
         /**
          * This method implements service.IConfigurable interface. It is called by the service.Platform instance.
-         * @param appId {string} - The appId
-         * @param appCode {string} - The appCode
-         * @param useHTTPS {boolean} - A flag to use HTTPS or not
-         * @param useCIT {boolean} - A flag to use the staging server (CIT) or not
-         * @param baseUrl {service.Url=} - The base URL for all requests to the Data Lens REST API
-         * @returns {Service}
+         * @param appId - The appId
+         * @param appCode - The appCode
+         * @param useHTTPS - A flag to use HTTPS or not
+         * @param useCIT - A flag to use the staging server (CIT) or not
+         * @param baseUrl - The base URL for all requests to the Data Lens REST API
          */
         configure(appId: string, appCode: string, useHTTPS: boolean, useCIT: boolean, baseUrl?: service.Url): Service;
     }
@@ -112,33 +111,37 @@ declare namespace H.datalens {
          * Normally the Service instance is configured with the service.Platform instance.
          * This configuration can be overridden by specifying these options.
          * It can be useful when the Data Lens environment is different from the HERE Platform environment.
-         * @property subDomain {string=} - Subdomain of the Data Lens REST API URL
-         * @property version {string=} - Pathname prefix of the Data Lens REST API endpoints
-         * @property access_token {string=} - The token used to authenticate all requests
-         * @property refresh_token {string=} - The token used to fetch a new access token after the previous access token has expired.
-         * When refresh_token is provided, Service will automatically update the expired access_token.
-         * @property domainSharding {string[]=} - To increase the number of simultaneous requests to the Data Lens REST API, domain sharding is used.
-         * This option can be used when the Data Lens environment does not support domain sharding.
-         * @property baseUrl {string=} - Defines an alternative host for the Data Lens REST API URL
          */
         interface Options {
+            /** Subdomain of the Data Lens REST API URL */
             subDomain?: string;
+            /** Pathname prefix of the Data Lens REST API endpoints */
             version?: string;
+            /** The token used to authenticate all requests */
             access_token?: string;
+            /**
+             * The token used to fetch a new access token after the previous access token has expired.
+             * When refresh_token is provided, Service will automatically update the expired access_token.
+             */
             refresh_token?: string;
+            /**
+             * To increase the number of simultaneous requests to the Data Lens REST API, domain sharding is used.
+             * This option can be used when the Data Lens environment does not support domain sharding.
+             */
             domainSharding?: string[];
+            /** Defines an alternative host for the Data Lens REST API URL */
             baseUrl?: string;
         }
 
         /**
          * The format of Data Lens query data.
          * The Data Lens query data has a table-like structure with named columns and rows.
-         * @property columns {string[]} - Column names
-         * @property rows {Array<Array>} - Rows of data
          */
         interface Data {
+            /** Column names */
             columns: string[];
-            rows: [any[]]; // rows : { Array.<Array> }
+            /** Rows of data */
+            rows: any[][];
         }
     }
 
@@ -150,20 +153,20 @@ declare namespace H.datalens {
     class Provider extends map.provider.Provider {
         /**
          * Constructor
-         * @param data {Service.Data=} - JSON object
-         * @param options {map.provider.Provider.Options=} - Configures data accessibility parameters
+         * @param data - JSON object
+         * @param options - Configures data accessibility parameters
          */
         constructor(data?: Service.Data, options?: map.provider.Provider.Options);
 
         /**
          * Updates the provider data. When data is updated, the update event is triggered so that the consuming layers are redrawn.
-         * @param data {Service.Data} - JSON object
+         * @param data - JSON object
          */
         setData(data: Service.Data): void;
 
         /**
          * Retrieves the provider data.
-         * @returns {Service.Data} - JSON object
+         * @returns - JSON object
          */
         getData(): Service.Data;
     }
@@ -177,15 +180,14 @@ declare namespace H.datalens {
     class QueryProvider extends Provider {
         /**
          * Constructor
-         * @param service {Service} - Data Lens REST API service
-         * @param options {QueryProvider.Options=} - Configures source query and data accessibility parameters
+         * @param service - Data Lens REST API service
+         * @param options - Configures source query and data accessibility parameters
          */
         constructor(data: Service.Data, options?: QueryProvider.Options);
 
         /**
          * Updates the query ID to be used in the next call of the Data Lens REST API.
          * Note that new data will be fetched only after the reload method is called.
-         * @param queryId {string}
          */
         setQueryId(queryId: string): void;
 
@@ -193,7 +195,7 @@ declare namespace H.datalens {
          * Updates the query's dynamic parameters to be used in the next call of the Data Lens REST API.
          * Note that new data will be fetched only after the reload method is called.
          * This method is normally used when updating your visualization.
-         * @param queryParams {any|null} - Query dynamic parameters
+         * @param queryParams - Query dynamic parameters
          */
         setQueryParams(queryParams: any|null): void;
 
@@ -206,13 +208,13 @@ declare namespace H.datalens {
         /**
          * Updates the provider data.
          * When data is updated, the update event is triggered so that the consuming layers are redrawn.
-         * @param data {Service.Data} - JSON object
+         * @param data - JSON object
          */
         setData(data: Service.Data): void;
 
         /**
          * Retrieves the provider data.
-         * @returns {Service.Data} - JSON object
+         * @returns - JSON object
          */
         getData(): Service.Data;
     }
@@ -221,11 +223,11 @@ declare namespace H.datalens {
         /**
          * Configures source query and data accessibility parameters for QueryProvider
          * Specifies the query credentials and dynamic parameters required for fetching query data with the Data Lens REST API. Other options from Provider.Options are available.
-         * @property queryId {string} - The ID of the Data Lens REST API query
-         * @property queryParams {any=} - The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query.
          */
         interface Options {
+            /** The ID of the Data Lens REST API query */
             queryId: string;
+            /** The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query. */
             queryParams?: any;
         }
     }
@@ -239,29 +241,27 @@ declare namespace H.datalens {
     class QueryTileProvider extends map.provider.RemoteTileProvider {
         /**
          * Constructor
-         * @param service {Service} - Data Lens REST API service
-         * @param options {QueryTileProvider.Options} - Configures source query and data accessibility parameters
+         * @param service - Data Lens REST API service
+         * @param options - Configures source query and data accessibility parameters
          */
         constructor(service: Service, options: QueryTileProvider.Options);
 
         /**
          * Updates the query ID to be used in the next call of the Data Lens REST API.
          * Note that new data will be fetched only after the reload method is called.
-         * @param queryId {string}
          */
         setQueryId(queryId: string): void;
 
         /**
          * Updates the query's dynamic parameters to be used in the next call of the Data Lens REST API.
          * Note that new data will be fetched only after the reload method is called. This method is normally used when updating your visualization.
-         * @param queryParams {any|null}
          */
         setQueryParams(queryParams: any|null): void;
 
         /**
          * Updates the names of the dynamic parameters that defines tiles. This method is only needed when the query ID is updated.
          * Note that new data will be fetched only after the reload method is called.
-         * @param tileParamNames {QueryTileProvider.TileParamNames} - Names of the URI parameters that control the x/y/z of a tiled query
+         * @param tileParamNames - Names of the URI parameters that control the x/y/z of a tiled query
          */
         setTileParamNames(tileParamNames: QueryTileProvider.TileParamNames): void;
     }
@@ -271,13 +271,13 @@ declare namespace H.datalens {
          * Represents the names of the URI parameters that control the x/y/z of tiled query.
          * When defining the Data Lens query, dynamic parameters that control tiling can be arbitrarily named.
          * Names of these parameters must be specified to fetch tiles.
-         * @property x {string} - Name of the dynamic parameter that defines tile column
-         * @property y {string} - Name of the dynamic parameter that defines tile row
-         * @property z {string} - Name of the dynamic parameter that defines zoom level
          */
         interface TileParamNames {
+            /** Name of the dynamic parameter that defines tile column */
             x: string;
+            /** Name of the dynamic parameter that defines tile row */
             y: string;
+            /** Name of the dynamic parameter that defines zoom level */
             z: string;
         }
 
@@ -285,13 +285,13 @@ declare namespace H.datalens {
          * Configures source query and data accessibility parameters for QueryTileProvider
          * Specifies the query credentials and dynamic parameters required for fetching tiled query data with the Data Lens REST API.
          * Other options from Provider.Options are available.
-         * @property tileParamNames {QueryTileProvider.TileParamNames=} - Names of the URI parameters that control the x/y/z of a tiled query
-         * @property queryId {string} - The ID for the Data Lens REST API query
-         * @property queryParams {any=} - The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query.
          */
         interface Options {
+            /** Names of the URI parameters that control the x/y/z of a tiled query */
             tileParamNames: TileParamNames;
+            /** The ID for the Data Lens REST API query */
             queryId: string;
+            /** The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query. */
             queryParams?: string;
         }
 
@@ -340,8 +340,8 @@ declare namespace H.datalens {
 
         /**
          * This is a default implementation of renderTile callback. This method represents each point as a black 1x1 pixel square.
-         * @param points {Array<RasterLayer.TilePoint>} - Input data points within a tile
-         * @param canvas {HTMLCanvasElement} - The target canvas
+         * @param points - Input data points within a tile
+         * @param canvas - The target canvas
          */
         static defaultRenderTile(points: RasterLayer.TilePoint[], canvas: HTMLCanvasElement): void;
     }
@@ -354,34 +354,34 @@ declare namespace H.datalens {
          * This behavior can be changed by defining the dataToRows callback.
          * To collect the rows for a tile including buffer, the rows must be translated to RasterLayer.TilePoint.
          * This translation must be specified with the rowToTilePoint callback. The final rendering on the tile canvas must be defined in renderTile.
-         * @property dataToRows {function(Service.Data, QueryTileProvider.X, QueryTileProvider.Y, QueryTileProvider.Zoom)=} -
-         * Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile.
-         * @property rowToTilePoint {function(RasterLayer.Row, RasterLayer.X, RasterLayer.Y)=} -
-         * Defines how the row is translated to the RasterLayer.TilePoint. This callback is called for each row that is returned from dataToRows.
-         * @property buffer {function(QueryTileProvider.Zoom)=} - Defines the buffer as a function of the zoom level.
-         * The buffer is a value (in pixels) that defines an extra area around each tile to capture data points from.
-         * This is done to avoid drawing edges between tiles. For example, if data points represented with circles with a maximum radius of 10 pixels, then the buffer must be 10 pixels.
-         * @property renderTile {function(Array<RasterLayer.TilePoint>, HTMLCanvasElement, QueryTileProvider.Zoom)=} -
-         * Defines how tile data is represented on a canvas. Input points for each tile are collected with respect to the buffer.
-         * For progressive rendering this callback may be called more than once for the tile.
          */
         interface Options {
+            /** Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile. */
             dataToRows?(data: Service.Data, x: QueryTileProvider.X, y: QueryTileProvider.Y, zoom: QueryTileProvider.Zoom): Row[];
+            /** Defines how the row is translated to the RasterLayer.TilePoint. This callback is called for each row that is returned from dataToRows. */
             rowToTilePoint?(row: Row, x: X, y: Y): TilePoint;
+            /**
+             * The buffer is a value (in pixels) that defines an extra area around each tile to capture data points from.
+             * This is done to avoid drawing edges between tiles. For example, if data points represented with circles with a maximum radius of 10 pixels, then the buffer must be 10 pixels.
+             */
             buffer?(zoom: QueryTileProvider.Zoom): number;
+            /**
+             * Defines how tile data is represented on a canvas. Input points for each tile are collected with respect to the buffer.
+             * For progressive rendering this callback may be called more than once for the tile.
+             */
             renderTile?(points: TilePoint[], canvas: HTMLCanvasElement, zoom: QueryTileProvider.Zoom): void;
         }
 
         /**
          * Defines the input data format for heat map rendering.
          * To collect data rows for each tile with respect to the buffer, each row must be represented as a point within the map tile.
-         * @property x {number} - Row relative to tile
-         * @property y {number} - Column relative to tile
-         * @property data {RasterLayer.Row=} - Reference to source data row
          */
         interface TilePoint {
+            /** Row relative to tile */
             x: number;
+            /** Column relative to tile */
             y: number;
+            /** Reference to source data row */
             data?: Row;
         }
 
@@ -414,37 +414,29 @@ declare namespace H.datalens {
     class HeatmapLayer extends RasterLayer {
         /**
          * Constructor
-         * @param provider {QueryTileProvider} - Source of tiled data
-         * @param options {HeatmapLayer.Options} - Configuration for data processing and rendering
+         * @param provider - Source of tiled data
+         * @param options - Configuration for data processing and rendering
          */
         constructor(provider: QueryTileProvider, options: HeatmapLayer.Options);
 
         /**
          * Default value for dataToRows callback option. It represents each row as an object where property names correspond to data column names.
-         * @param data {Service.Data}
-         * @param x {QueryTileProvider.X}
-         * @param y {QueryTileProvider.Y}
-         * @param zoom {QueryTileProvider.Zoom}
-         * @returns {Array<HeatmapLayer.Row>}
          */
         static defaultDataToRows: (data: Service.Data, x: QueryTileProvider.X, y: QueryTileProvider.Y, zoom: QueryTileProvider.Zoom) =>
             HeatmapLayer.Row[];
 
         /**
          * Set of possible values for the inputScale option
-         * @type {HeatmapLayer.InputScale}
          */
         static inputScale: HeatmapLayer.InputScale;
 
         /**
          * Set of possible values for the aggregation option
-         * @type {HeatmapLayer.Aggregation}
          */
         static aggregation: HeatmapLayer.Aggregation;
 
         /**
-         * @param zoom {number} - zoom level
-         * @return {HeatmapLayer.Options}
+         * @param zoom - zoom level
          */
         getOptionsPerZoom(zoom: number): HeatmapLayer.Options;
 
@@ -466,38 +458,50 @@ declare namespace H.datalens {
          * By default this step is processed with HeatmapLayer.defaultDataToRows. This behavior can be changed by defining the dataToRows callback.
          * To collect the rows for a tile including buffer, the rows must be translated to HeatmapLayer.TilePoint. This translation must be specified with the rowToTilePoint callback.
          * Other options define the blending options for the heat map.
-         * @property dataToRows {function(Service.Data, QueryTileProvider.X, QueryTileProvider.Y, QueryTileProvider.Zoom)=} -
-         * Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile.
-         * @property rowToTilePoint {function(HeatmapLayer.Row, HeatmapLayer.X, HeatmapLayer.Y)=} -
-         * Defines how the row is translated to the HeatmapLayer.TilePoint. This callback is called for each row that is returned from dataToRows.
-         * @property bandwidth {HeatmapLayer~Bandwidth | HeatmapLayer~BandwidthStop | Array.<HeatmapLayer~BandwidthStop> |
-         * HeatmapLayer~BandwidthCallback=} - Describes the bandwidth behavior in relation to current zoom level A numeric value sets it static across all levels
-         * An Object with zoom, value and optional zoomIncrementFactor (1 equals doubling on every zoom increment) defines a behavior across all zoom levels
-         * An Array of one or more zoom, value objects describes the behavior between the two defined levels and extrapolates the implied change outside of the defined range
-         * Alternatively defines the level of smoothing as a function of the zoom level. The callback must return a value in pixels.
-         * The cut-off of the Gaussian kernel is defined as 3 * bandwidth , a multiple (default 3) of bandwidth.
-         * @property valueRange {function(QueryTileProvider.Zoom)} - Defines the range for the color scale as a function of the zoom level.
-         * The returned value must be an array of 2 numbers.
-         * @property countRange {function(QueryTileProvider.Zoom)} - Defines the range for the density alpha mask as a function of the zoom level.
-         * When defined, the density alpha mask is applied. The returned value must be an array of 2 numbers.
-         * @property colorScale {function(number)} - Defines a color palette as a function of the normalized value. You can use D3.js library scale functions with the domain [0, 1].
-         * @property alphaScale {function(number)} - Defines the alpha mask value as a function of the normalized count.
-         * You can use D3.js library scale functions with the domain [0, 1] and the range [0, 1].
-         * @property aggregation {HeatmapLayer.Aggregation} - Specifies which type of aggregation was applied (eg. type of aggregation function for bucket in the Data Lens query).
-         * Possible values are SUM or AVERAGE. If the aggregation type is AVERAGE , then an averaged heat map is rendered.
-         * @property inputScale {HeatmapLayer.InputScale} - Defines the scale (eg logarithmic scale) of the TilePoint value.
-         * Note: if the value is not in a linear scale, then the aggregation in the source query must be defined with respect to the scale type.
-         * For example, before applying the average aggregation function in a query, the value must be transformed to the linear scale. This guarantees correct linear averaging of values.
          */
         interface Options {
+            /** Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile. */
             dataToRows?(data: Service.Data, x: QueryTileProvider.X, y: QueryTileProvider.Y, zoom: QueryTileProvider.Zoom): Row[];
+            /** Defines how the row is translated to the HeatmapLayer.TilePoint. This callback is called for each row that is returned from dataToRows. */
             rowToTilePoint(row: Row, x: X, y: Y): TilePoint;
+            /**
+             * Describes the bandwidth behavior in relation to current zoom level A numeric value sets it static across all levels
+             * An Object with zoom, value and optional zoomIncrementFactor (1 equals doubling on every zoom increment) defines a behavior across all zoom levels
+             * An Array of one or more zoom, value objects describes the behavior between the two defined levels and extrapolates the implied change outside of the defined range
+             * Alternatively defines the level of smoothing as a function of the zoom level. The callback must return a value in pixels.
+             * The cut-off of the Gaussian kernel is defined as 3 * bandwidth , a multiple (default 3) of bandwidth.
+             */
             bandwidth?: Bandwidth | BandwidthStop | BandwidthStop[] | BandwidthCallback;
+            /**
+             * Defines the range for the color scale as a function of the zoom level.
+             * The returned value must be an array of 2 numbers.
+             */
             valueRange?(zoom: QueryTileProvider.Zoom): number[];
+            /**
+             * Defines the range for the density alpha mask as a function of the zoom level.
+             * When defined, the density alpha mask is applied. The returned value must be an array of 2 numbers.
+             */
             countRange?(zoom: QueryTileProvider.Zoom): number[];
+            /**
+             * Defines a color palette as a function of the normalized value.
+             * You can use D3.js library scale functions with the domain [0, 1].
+             */
             colorScale?(scale: number): string;
+            /**
+             * Defines the alpha mask value as a function of the normalized count.
+             * You can use D3.js library scale functions with the domain [0, 1] and the range [0, 1].
+             */
             alphaScale?(scale: number): number;
+            /**
+             * Specifies which type of aggregation was applied (eg. type of aggregation function for bucket in the Data Lens query).
+             * Possible values are SUM or AVERAGE. If the aggregation type is AVERAGE , then an averaged heat map is rendered.
+             */
             aggregation?: Aggregation;
+            /**
+             * Defines the scale (eg logarithmic scale) of the TilePoint value.
+             * Note: if the value is not in a linear scale, then the aggregation in the source query must be defined with respect to the scale type.
+             * For example, before applying the average aggregation function in a query, the value must be transformed to the linear scale. This guarantees correct linear averaging of values.
+             */
             inputScale?: InputScale;
         }
 
@@ -551,17 +555,17 @@ declare namespace H.datalens {
         /**
          * Defines the input data format for heat map rendering.
          * For heat map rendering, each row of data must be represented as a point within the map tile.
-         * @property x {number} - Row relative to tile
-         * @property y {number} - Column relative to tile
-         * @property value {number} - Value at the point (eg aggregated bucket value)
-         * @property count {number} - Number of contributors to the value at the point (eg number of rows in a bucket)
-         * @property data {HeatmapLayer.Row} - Reference to source data row
          */
         interface TilePoint {
+            /** Row relative to tile */
             x: number;
+            /** Column relative to tile */
             y: number;
+            /** Value at the point (eg aggregated bucket value) */
             value: number;
+            /** Number of contributors to the value at the point (eg number of rows in a bucket) */
             count: number;
+            /** Reference to source data row */
             data?: Row;
         }
 
@@ -569,24 +573,24 @@ declare namespace H.datalens {
          * Set of possible values for the aggregation option.
          * If the heat map input data is buckets, then different types of aggregation can be applied to the rows in a bucket.
          * The aggregation type is required for proper blending mode of the heat map. For the AVERAGE aggregation type, an averaged heat map is rendered.
-         * @property SUM {string} - Specifies that the sum aggregation was applied to the bucket value
-         * @property AVERAGE {string} - Specifies that the average aggregation was applied to the bucket value
          */
         enum Aggregation {
+            /** Specifies that the sum aggregation was applied to the bucket value */
             SUM,
+            /** Specifies that the average aggregation was applied to the bucket value */
             AVERAGE
         }
 
         /**
          * Set of possible values for the inputScale option.
          * The input scale is required for proper heat map blending. If the input scale is not linear, then the TilePoint.value is converted to linear scale before calculating the sum or average.
-         * @property DB {string} - Decibel (dB) scale
-         * @property LINEAR {string} - Linear scale
-         * @property LOG {string} - Logarithmic scale
          */
         enum InputScale {
+            /** Decibel (dB) scale */
             DB,
+            /** Linear scale */
             LINEAR,
+            /** Logarithmic scale */
             LOG
         }
     }
@@ -600,30 +604,28 @@ declare namespace H.datalens {
     class ObjectLayer extends map.layer.ObjectLayer {
         /**
          * Constructor
-         * @param provider {map.provider.RemoteTileProvider | Provider | QueryProvider | QueryTileProvider} - Data source (tiled or not)
-         * @param options {ObjectLayer.Options} - Defines data processing, clustering and data-driven styling
+         * @param provider - Data source (tiled or not)
+         * @param options - Defines data processing, clustering and data-driven styling
          */
         constructor(provider: map.provider.RemoteTileProvider | Provider | QueryProvider | QueryTileProvider, options: ObjectLayer.Options);
 
         /**
          * Default value for dataToRows callback option. It represents each row as an object where property names correspond to data column names.
-         * @property data {Service.Data}
-         * @returns {Array<ObjectLayer.Row>}
          */
         static defaultDataToRows(data: Service.Data): ObjectLayer.Row[];
 
         /**
          * A factory method for data-driven icons. The method allows you to build an icon from SVG markup or JsonML object. Provides caching of icons with the same markup.
-         * @param svg {string | Array} - SVG presented as markup or JsonML Array
-         * @param options {map.Icon.Options=} - Icon options (eg size and anchor). Note that the default anchor is in the middle.
-         * @param options.size {H.math.ISize | number} - When the icon is a square, you can define the size as a number in pixels
-         * @returns {map.Icon} - Icon which can be used for marker or cluster
+         * @param svg - SVG presented as markup or JsonML Array
+         * @param options - Icon options (eg size and anchor). Note that the default anchor is in the middle.
+         * @param options.size - When the icon is a square, you can define the size as a number in pixels
+         * @returns - Icon which can be used for marker or cluster
          */
         static createIcon(svg: string | any[], options?: map.Icon.Options): map.Icon;
 
         /**
          * Returns cache of icons created with the createIcon method. Can be used to clean the icon cache.
-         * @return {util.Cache} - Icon cache
+         * @return - Icon cache
          */
         static getIconCache(): util.Cache;
 
@@ -634,8 +636,8 @@ declare namespace H.datalens {
 
         /**
          * Recalculates the style and applies it to the map object based on the new StyleState
-         * @param object {map.Object} - Map object
-         * @param state {ObjectLayer.StyleState} - New state
+         * @param object - Map object
+         * @param state - New state
          */
         updateObjectStyle(any: map.Object, state: ObjectLayer.StyleState): void;
     }
@@ -646,18 +648,20 @@ declare namespace H.datalens {
          * The initial step of rendering is to split the tile data by rows, where each row represents a bucket.
          * By default this step is processed with ObjectLayer.defaultDataToRows. This behavior can be changed by defining the dataToRows callback.
          * In the next step each row must be presented as a map object with the rowToMapObject callback. Data-driven styling can be provided with the rowToStyle callback.
-         * @property dataToRows {function(Service.Data)=} - Defines how the input data is split by rows. You can specify this callback to define client-side aggregation and filtering.
-         * @property rowToMapObject {function(ObjectLayer.Row, QueryTileProvider.Zoom)} - Defines how each row is presented on the map (eg marker, polygon)
-         * @property rowToStyle {function(ObjectLayer.Row, QueryTileProvider.Zoom, ObjectLayer.StyleState)=} -
-         * Defines map object style and icon according to data row and zoom level. Also it can define different styles depending on the StyleState (eg hovered, selected).
-         * @property dataDomains {ObjectLayer.DataDomains=} - Defines quantization of data for improving data-driven styling performance
-         * @property clustering {ObjectLayer.Clustering=} - When present, client-side clustering is applied
          */
         interface Options {
+            /** Defines how the input data is split by rows. You can specify this callback to define client-side aggregation and filtering. */
             dataToRows?(data: Service.Data): Row[];
+            /** Defines how each row is presented on the map (eg marker, polygon) */
             rowToMapObject(row: Row, z: QueryTileProvider.Zoom): map.Object;
+            /**
+             * Defines map object style and icon according to data row and zoom level.
+             * Also it can define different styles depending on the StyleState (eg hovered, selected).
+             */
             rowToStyle?(row: Row, z: QueryTileProvider.Zoom, styleState: StyleState): ObjectStyleOptions;
+            /** Defines quantization of data for improving data-driven styling performance */
             dataDomains?: DataDomains;
+            /** When present, client-side clustering is applied */
             clustering?: Clustering;
         }
 
@@ -666,11 +670,11 @@ declare namespace H.datalens {
          * When the clustering option is provided, rows returned from dataToRows go to the clustering.rowToDataPoint callback to be transformed to data points.
          * Then, the data points are clustered according to clustering.options. Clustering produces clusters and noise points (data points that are not clustered).
          * Clusters and noise points must be presented as map objects with the rowToMapObject callback and can be styled with the rowToStyle callback.
-         * @property rowToDataPoint {ObjectLayer.Row} - Defines data points from rows
-         * @property options {function(QueryTileProvider.Zoom)} - Defines clustering options as a function of the zoom level
          */
         interface Clustering {
+            /** Defines data points from rows */
             rowToDataPoint(row: Row): clustering.DataPoint;
+            /** Defines clustering options as a function of the zoom level */
             options(zoom: QueryTileProvider.Zoom): clustering.Provider.ClusteringOptions;
         }
 
@@ -695,15 +699,15 @@ declare namespace H.datalens {
         /**
          * Output from the rowToStyle callback.
          * Defines the styles or the icon that is applied to the map object.
-         * @property icon {map.Icon} - Marker icon
-         * @property style {map.SpatialStyle.Options} - Spatial style
-         * @property arrows {map.ArrowStyle.Options} - Style of arrows to render along a polyline
-         * @property zIndex {number} - The z-index value of the map object, default is 0
          */
         interface ObjectStyleOptions {
+            /** Marker icon */
             icon: map.Icon;
+            /** Spatial style */
             style?: map.SpatialStyle.Options;
+            /** Style of arrows to render along a polyline */
             arrows?: map.ArrowStyle.Options;
+            /** The z-index value of the map object, default is 0 */
             zIndex?: number;
         }
 
@@ -722,30 +726,23 @@ declare namespace H.datalens {
     class RawDataProvider extends map.provider.RemoteTileProvider {
         /**
          * Constructor
-         * @param options {RawDataProvider.Options} - Configures options
+         * @param options - Configures options
          */
         constructor(options: RawDataProvider.Options);
 
         /**
          * Updates the data url. Note that new data will be fetched only after the reload method is called.
-         * @param dataUrl {string}
          */
         setDataUrl(dataUrl: string): void;
     }
 
     namespace RawDataProvider {
-        /**
-         * Defines options for RawDataProvider
-         * Options for RawDataProvider
-         * @property dataUrl - The data url to fetch
-         * @property dataToFeatures {function(any)=} - Defines how the input data is mapped to an array of GeoJSON features
-         * @property featuresToRows {function(Array<RawDataProvider.Feature>, QueryTileProvider.X, QueryTileProvider.Y, QueryTileProvider.Zoom,
-         * RawDataProvider.TileSize, RawDataProvider.Helpers)=} -
-         * Defines how GeoJSON features on a tile should be mapped to data rows, which are inputs to layers such as ObjectLayer and HeatmapLayer
-         */
         interface Options {
+            /** The data url to fetch */
             dataUrl?: string;
+            /** Defines how the input data is mapped to an array of GeoJSON features */
             dataToFeatures?(obj: any): Feature[];
+            /** Defines how GeoJSON features on a tile should be mapped to data rows, which are inputs to layers such as ObjectLayer and HeatmapLayer */
             featuresToRows?(features: Feature[], x: QueryTileProvider.X, y: QueryTileProvider.Y, z: QueryTileProvider.Zoom,
                             tileSize: TileSize, helpers: Helpers): ObjectLayer.Row[];
         }
@@ -765,16 +762,14 @@ declare namespace H.datalens {
         /**
          * A helper class used in the worker thread
          * This helper class provides convenience functions you can use in the worker thread
-         * @property latLngToPixel {function(RawDataProvider.Latitude, RawDataProvider.Longitude, QueryTileProvider.Zoom, RawDataProvider.TileSize)=} -
-         * Translates geographical coordinates (latitude, longitude) to world pixel coordinates.
-         * @property pixelToLatLng {function(RawDataProvider.PX, RawDataProvider.PY, QueryTileProvider.Zoom, RawDataProvider.TileSize)=} -
-         * Translates world pixel coordinates to geographical coordinates (latitude, longitude).
-         * @property parseCSV {function(any)=} - Takes CSV data as input, parses it, and return the parsed result.
          */
         interface Helpers {
+            /** Translates geographical coordinates (latitude, longitude) to world pixel coordinates. */
             latLngToPixel?(latitude: Latitude, longitude: Longitude, z: QueryTileProvider.Zoom,
                             tileSize: TileSize): PixelCoordinates;
+            /** Translates world pixel coordinates to geographical coordinates (latitude, longitude). */
             pixelToLatLng?(x: PX, y: PY, z: QueryTileProvider.Zoom, tileSize: TileSize): GeoCoordinates;
+            /** Takes CSV data as input, parses it, and return the parsed result. */
             parseCSV?(obj: any): any[];
         }
 
@@ -822,9 +817,9 @@ declare namespace H.datalens {
     class SpatialLayer extends map.layer.TileLayer {
         /**
          * Constructor
-         * @param dataProvider {Provider} - Source of tiled data (pass in null if data come from feature properties)
-         * @param spatialProvider {SpatialTileProvider} - Source of geometry data
-         * @param options {SpatialLayer.Options} - Configuration for data processing and rendering
+         * @param dataProvider - Source of tiled data (pass in null if data come from feature properties)
+         * @param spatialProvider - Source of geometry data
+         * @param options - Configuration for data processing and rendering
          */
         constructor(dataProvider: Provider, spatialProvider: SpatialTileProvider, options: SpatialLayer.Options);
 
@@ -843,8 +838,6 @@ declare namespace H.datalens {
 
         /**
          * This method changes the state of a map object; for example, style on mouse event.
-         * @param {map.Object} spatial
-         * @param {SpatialLayer.StyleState} state
          */
         updateSpatialStyle(spatial: map.Object, state: SpatialLayer.StyleState): void;
     }
@@ -854,23 +847,19 @@ declare namespace H.datalens {
          * Defines data processing and rendering options for SpatialLayer
          * The initial step of rendering is to split the tile data by rows, where each row represents a bucket.
          * By default this step is processed with SpatialLayer.defaultDataToRows. This behavior can be changed by defining the dataToRows callback.
-         * @property dataToRows {function(Service.Data, QueryTileProvider.X, QueryTileProvider.Y, QueryTileProvider.Zoom)=} -
-         * Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile.
-         * @property rowToSpatialId {function(SpatialLayer.Row)} -
-         * Defines how to get the spatial ID from a data row. This callback is called for each row that is returned from dataToRows.
-         * @property featureToSpatialId {function(SpatialLayer.Feature)} -
-         * Defines how to get the spatial ID from a geometry feature. This callback is called for each geometry feature in the vector tile.
-         * @property rowToStyle {function(SpatialLayer.Row, QueryTileProvider.Zoom, SpatialLayer.StyleState)} -
-         * Defines how the row is translated to map object style. This callback is called for each row that is returned from dataToRows.
-         * @property defaultStyle {function(QueryTileProvider.Zoom, SpatialLayer.StyleState)} - Defines the default map object style.
-         * @property transformFeature {SpatialLayer.transformFeature} - Defines how to transform the features.
          */
         interface Options {
+            /** Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile. */
             dataToRows?(data: Service.Data, x: QueryTileProvider.X, y: QueryTileProvider.Y, z: QueryTileProvider.Zoom): Row[];
+            /** Defines how to get the spatial ID from a data row. This callback is called for each row that is returned from dataToRows. */
             rowToSpatialId(row: Row): string;
+            /** Defines how to get the spatial ID from a geometry feature. This callback is called for each geometry feature in the vector tile. */
             featureToSpatialId(feature: Feature): string;
+            /** Defines how the row is translated to map object style. This callback is called for each row that is returned from dataToRows. */
             rowToStyle(row: Row, z: QueryTileProvider.Zoom, styleState: StyleState): any;
+            /** Defines the default map object style. */
             defaultStyle(z: QueryTileProvider.Zoom, styleState: StyleState): any;
+            /** Defines how to transform the features. */
             transformFeature: transformFeature;
         }
 
@@ -906,8 +895,8 @@ declare namespace H.datalens {
     class SpatialTileProvider extends map.provider.RemoteTileProvider {
         /**
          * Constructor
-         * @param service {Service} - Data Lens REST API service
-         * @param options {SpatialTileProvider.Options} - Configures layer name
+         * @param service - Data Lens REST API service
+         * @param options - Configures layer name
          */
         constructor(service: Service, options: SpatialTileProvider.Options);
 
@@ -915,14 +904,12 @@ declare namespace H.datalens {
 
         /**
          * Updates the layer name to be used in the next call of the Data Lens REST API. Note that new data will be fetched only after the reload method is called.
-         * @param {string} layerName
          */
         setLayerName(layerName: string): void;
 
         /**
          * Updates the query's dynamic parameters to be used in the next call of the Data Lens REST API. Note that new data will be fetched only after the reload method is called.
          * This method is normally used when updating your visualization.
-         * @param {any|null} queryParams
          */
         setQueryParams(queryParams: any | null): void;
     }
@@ -931,11 +918,11 @@ declare namespace H.datalens {
         /**
          * Defines layer name and data accessibility parameters for SpatialTileProvider
          * This defines the layer name and dynamic parameters required for fetching tiled geometry data with the Data Lens REST API. Other options from Provider.Options are available.
-         * @property layerName {string} - The name of the layer to fetch with the Data Lens REST API query
-         * @property queryParams {any} - The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query.
          */
         interface Options {
+            /** The name of the layer to fetch with the Data Lens REST API query */
             layerName: string;
+            /** The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query. */
             queryParams?: any;
         }
     }
diff --git a/types/heremaps/heremaps-tests.ts b/types/heremaps/heremaps-tests.ts
index 0856cd2616..9e92b92d72 100644
--- a/types/heremaps/heremaps-tests.ts
+++ b/types/heremaps/heremaps-tests.ts
@@ -179,3 +179,16 @@ pixelProjection.rescale(12);
 
 const point = pixelProjection.geoToPixel({ lat: 53, lng: 12 });
 pixelProjection.xyToGeo(point.x, point.y);
+
+const engine = map.getEngine();
+engine.getAnimationDuration();
+engine.setAnimationDuration(1000);
+
+engine.getAnimationEase();
+engine.setAnimationEase(H.util.animation.ease.EASE_IN_QUAD);
+
+const engineListener = (e: Event) => {
+    console.log(e);
+};
+engine.addEventListener('tap', engineListener);
+engine.removeEventListener('tap', engineListener);
diff --git a/types/heremaps/index.d.ts b/types/heremaps/index.d.ts
index 0bda913919..8b68f11278 100644
--- a/types/heremaps/index.d.ts
+++ b/types/heremaps/index.d.ts
@@ -264,6 +264,12 @@ declare namespace H {
          * @param opt_scope {Object=} - An optional scope to call the callback in.
          */
         addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
+
+        /**
+         * This returns the map's render engine
+         * @return {H.map.render.p2d.RenderEngine} - map render engine
+         */
+        getEngine(): H.map.render.p2d.RenderEngine;
     }
 
     namespace Map {
@@ -3606,6 +3612,261 @@ declare namespace H {
                 }
             }
         }
+
+        namespace render {
+            /**
+             * This is an abstract class representing a render engine. Render engines are used to render the geographical position from a view model on the
+             * screen (viewport element). The rendered result may be different for different engines, because every engine uses its own capabilities and
+             * specific implementation to present the current view model data in best possible way. For example, 2D engines create a two-dimensional flat
+             * map composed of tiles, while 3D engines can generate panoramas displaying the same coordinates as a 'street view'.
+             */
+            class RenderEngine extends H.util.EventTarget {
+                /**
+                 * Constructor
+                 * @param viewPort {H.map.ViewPort} - An object representing the map viewport
+                 * @param viewModel {H.map.ViewModel} - An object representing a view of the map
+                 * @param dataModel {H.map.DataModel} - An object encapsulating the data to be rendered on the map (layers and objects)
+                 * @param options {H.map.render.RenderEngine.Options} - An object containing the render engine initialization options
+                 */
+                constructor(viewPort: H.map.ViewPort, viewModel: H.map.ViewModel, dataModel: H.map.DataModel, options: H.map.render.RenderEngine.Options);
+
+                /**
+                 * This method adds a listener for a specific event.
+                 * Note that to prevent potential memory leaks, you must either call removeEventListener or dispose on the given object when you no longer need it.
+                 * @param type {string} - The name of the event
+                 * @param handler {!Function} - An event handler function
+                 * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+                 * @param opt_scope {Object=} - An object defining the scope for the handler function
+                 */
+                addEventListener(type: string, handler: (evt: Event) => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+                /**
+                 * This method removes a previously added listener from the EventTarget instance.
+                 * @param type {string} - The name of the event
+                 * @param handler {!Function} - A previously added event handler
+                 * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+                 * @param opt_scope {Object=} - An object defining the scope for the handler function
+                 */
+                removeEventListener(type: string, handler: (evt: Event) => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+                /**
+                 * This method dispatches an event on the EventTarget object.
+                 * @param evt {H.util.Event|string} - An object representing the event or a string with the event name
+                 */
+                dispatchEvent(evt: H.util.Event | string): void;
+
+                /**
+                 * This method removes listeners from the given object. Classes that extend EventTarget may need to override this method in order to remove
+                 * references to DOM Elements and additional listeners.
+                 */
+                dispose(): void;
+
+                /**
+                 * This method adds a callback which is triggered when the EventTarget object is being disposed.
+                 * @param callback {!Function} - The callback function.
+                 * @param opt_scope {Object=} - An optional scope for the callback function
+                 */
+                addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
+            }
+
+            namespace RenderEngine {
+                /**
+                 * An object containing the render engine initialization options
+                 */
+                interface Options {
+                    [key: string]: string;
+                }
+
+                /**
+                 * This object defines the modifiers to use for H.map.ViewPort#startInteraction.
+                 */
+                enum InteractionModifiers {
+                    /** changes zoom level during the interaction */
+                    ZOOM,
+                    /** changes map center during the interaction */
+                    HEADING,
+                    /** changes heading angle during the interaction */
+                    TILT,
+                    /** changes tilt angle during the interaction */
+                    INCLINE,
+                    /** changes incline angle during the interaction */
+                    COORD,
+                }
+            }
+
+            /**
+             * The rendering states of the layer.
+             */
+            enum RenderState {
+                /**
+                 * Data loading/processing is still in progress, but there is nothing to render. In this state rendering engine might go to sleep mode after
+                 * certain amount of time to prevent draining of battery on the user device.
+                 */
+                PENDING,
+                /** Data rendering or animation is in progress. */
+                ACTIVE,
+                /** Data rendering or animation is done. */
+                DONE,
+            }
+
+            /**
+             * An object containing rendering parameters.
+             */
+            interface RenderingParams {
+                /**
+                 * The geographical area to render. Note that it is not the same as visible viewport. Specified bounds also include H.Map.Options#margin and
+                 * optionally an additional margin in case of DOM node rendering for a better rendering experience.
+                 * @type {H.geo.Rect}
+                 */
+                bounds: H.geo.Rect;
+
+                /**
+                 * The zoom level to render the data for.
+                 * @type {number}
+                 */
+                zoom: number;
+
+                /**
+                 * The coordinates of the screen center in CSS pixels.
+                 * @type {H.math.Point}
+                 */
+                screenCenter: H.math.Point;
+
+                /**
+                 * The coordinates relative to the screen center where the rendering has the highest priority. If the layer has to request and/or process data
+                 * asynchronously, it's recommended to prioritize the rendering close to this center.
+                 * @type {H.math.Point}
+                 */
+                priorityCenter: H.math.Point;
+
+                /**
+                 * The pixel projection to use to project geographical coordinates into screen coordinates and vice versa.
+                 * @type {H.geo.PixelProjection}
+                 */
+                projection: H.geo.PixelProjection;
+
+                /**
+                 * Indicates whether only cached data should be considered.
+                 * @type {boolean}
+                 */
+                cacheOnly: boolean;
+
+                /**
+                 * The size of the area to render.
+                 * @type {H.math.Size}
+                 */
+                size: H.math.Size;
+
+                /**
+                 * The pixelRatio to use for over-sampling in cases of high-resolution displays.
+                 * See https://developer.mozilla.org/en-US/docs/Web/API/Window/devicePixelRatio.
+                 * @type {number}
+                 */
+                pixelRatio: number;
+            }
+
+            /**
+             * Contains functionality specific to 2D map rendering.
+             */
+            namespace p2d {
+                /**
+                 * This class implements a map render engine. It presents a geographic location (camera data from a view model) and renders all map layers in
+                 * the order in which they are provided in a single 2D canvas element.
+                 */
+                class RenderEngine extends H.map.render.RenderEngine {
+                    /**
+                     * Constructor
+                     * @param viewPort {H.map.ViewPort} - An object representing the map viewport
+                     * @param viewModel {H.map.ViewModel} - An object representing a view of the map
+                     * @param dataModel {H.map.DataModel} - An object encapsulating the data to be rendered on the map (layers and objects)
+                     * @param options {H.map.render.RenderEngine.Options} - An object containing the render engine initialization options
+                     */
+                    constructor(viewPort: H.map.ViewPort, viewModel: H.map.ViewModel, dataModel: H.map.DataModel, options: H.map.render.RenderEngine.Options);
+
+                    /**
+                     * This method sets the length (duration) for all animations run by the render engine in milliseconds.
+                     * @param duration {number} - A value indicating the duration of animations in milliseconds
+                     */
+                    setAnimationDuration(duration: number): void;
+
+                    /**
+                     * This method retrieves the current setting indicating the length of animations (duration) run by the the render engine in milliseconds.
+                     * @return {number}
+                     */
+                    getAnimationDuration(): number;
+
+                    /**
+                     * This method sets a value indicating the easing to apply to animations run by the render engine.
+                     * @param easeFunction {Function(number)} - A function that alters the progress ratio of an animation. It receives an argument indicating
+                     * animation progress as a numeric value in the range between 0 and 1 and must return a numeric value in the same range.
+                     */
+                    setAnimationEase(easeFunction: (progress: number) => number): void;
+
+                    /**
+                     * This method retrieves the current setting representing the easing to be applied to animations.
+                     * @return {Function(number) => number} - A numeric value in the range 0 to 1
+                     */
+                    getAnimationEase(): (progress: number) => number;
+
+                    /**
+                     * This method resets animation settings on the render engine to defaults.
+                     * Duration is set to 300ms and easing to H.util.animation.ease.EASE_OUT_QUAD.
+                     */
+                    resetAnimationDefaults(): void;
+
+                    /**
+                     * This method adds a listener for a specific event.
+                     * Note that to prevent potential memory leaks, you must either call removeEventListener or dispose on the given object when you no longer need it.
+                     * @param type {string} - The name of the event
+                     * @param handler {!Function} - An event handler function
+                     * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+                     * @param opt_scope {Object=} - An object defining the scope for the handler function
+                     */
+                    addEventListener(type: string, handler: (evt: Event) => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+                    /**
+                     * This method removes a previously added listener from the EventTarget instance.
+                     * @param type {string} - The name of the event
+                     * @param handler {!Function} - A previously added event handler
+                     * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+                     * @param opt_scope {Object=} - An object defining the scope for the handler function
+                     */
+                    removeEventListener(type: string, handler: (evt: Event) => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+                    /**
+                     * This method dispatches an event on the EventTarget object.
+                     * @param evt {H.util.Event|string} - An object representing the event or a string with the event name
+                     */
+                    dispatchEvent(evt: H.util.Event | string): void;
+
+                    /**
+                     * This method removes listeners from the given object. Classes that extend EventTarget may need to override this method in order to remove
+                     * references to DOM Elements and additional listeners.
+                     */
+                    dispose(): void;
+
+                    /**
+                     * This method adds a callback which is triggered when the EventTarget object is being disposed.
+                     * @param callback {!Function} - The callback function.
+                     * @param opt_scope {Object=} - An optional scope for the callback function
+                     */
+                    addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
+                }
+
+                namespace RenderEngine {
+                    interface Options {
+                        /** Object describes how many cached zoom levels should be used as a base map background while base map tiles are */
+                        renderBaseBackground?: {};
+
+                        /** The pixelRatio to use for over-sampling in cases of high-resolution displays */
+                        pixelRatio: number;
+
+                        /** optional */
+                        enableSubpixelRendering?: boolean;
+                    }
+                }
+            }
+        }
     }
 
     /***** mapevents *****/
diff --git a/types/heremaps/tslint.json b/types/heremaps/tslint.json
index 81562efc97..3db820d5e5 100644
--- a/types/heremaps/tslint.json
+++ b/types/heremaps/tslint.json
@@ -3,6 +3,9 @@
     "rules": {
         // TODOs
         "interface-name": false,
-        "no-unnecessary-qualifier": false
+        "no-unnecessary-class": false,
+        "no-unnecessary-qualifier": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false
     }
 }
\ No newline at end of file
diff --git a/types/hex-rgba/hex-rgba-tests.ts b/types/hex-rgba/hex-rgba-tests.ts
new file mode 100644
index 0000000000..f7ee8cf285
--- /dev/null
+++ b/types/hex-rgba/hex-rgba-tests.ts
@@ -0,0 +1,3 @@
+import hexToRgba = require('hex-rgba');
+
+const rgba = hexToRgba('#1b2b34', 40);
diff --git a/types/hex-rgba/index.d.ts b/types/hex-rgba/index.d.ts
new file mode 100644
index 0000000000..ba4205a73f
--- /dev/null
+++ b/types/hex-rgba/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for hex-rgba 1.0
+// Project: https://github.com/developersoul/hex-rgba#readme
+// Definitions by: Andrew Makarov <https://github.com/r3nya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = hexToRgba;
+
+declare function hexToRgba(hex: string, opacity: number): string;
diff --git a/types/hex-rgba/tsconfig.json b/types/hex-rgba/tsconfig.json
new file mode 100644
index 0000000000..82f2e3808e
--- /dev/null
+++ b/types/hex-rgba/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "hex-rgba-tests.ts"
+    ]
+}
diff --git a/types/hex-rgba/tslint.json b/types/hex-rgba/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hex-rgba/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/hexo-bunyan/index.d.ts b/types/hexo-bunyan/index.d.ts
index fb39ec6684..ea2df7a378 100644
--- a/types/hexo-bunyan/index.d.ts
+++ b/types/hexo-bunyan/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/trentm/node-bunyan#readme
 // Definitions by: segayuu <https://github.com/segayuu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import bunyan = require("bunyan");
 
diff --git a/types/hexo-fs/hexo-fs-tests.ts b/types/hexo-fs/hexo-fs-tests.ts
index 71e6d99e1b..5f73cd91fc 100644
--- a/types/hexo-fs/hexo-fs-tests.ts
+++ b/types/hexo-fs/hexo-fs-tests.ts
@@ -1,11 +1,10 @@
 import fs = require('hexo-fs');
-import path = require('path');
-import mocha = require('mocha');
+import { join, dirname } from 'path';
+import 'mocha';
 import chai = require('chai');
 import Promise = require('bluebird');
 
 const should = chai.should();
-const { join } = path;
 
 function createDummyFolder(path: string) {
     return Promise.all([
@@ -31,18 +30,18 @@ const tmpDir = join(__dirname, 'fs_tmp');
 
 before(() => fs.mkdirs(tmpDir));
 
-after((done) => {
+after(done => {
     fs.rmdir(tmpDir);
     done();
 });
 
 it('exists()', () => {
-    return fs.exists(tmpDir).then((exist) => {
+    return fs.exists(tmpDir).then(exist => {
         exist.should.be.true;
     });
 });
 
-it('exists() - callback', (callback) => {
+it('exists() - callback', callback => {
     fs.exists(tmpDir, (exist) => {
         exist.should.be.true;
         callback();
@@ -54,19 +53,19 @@ it('mkdirs()', () => {
 
     return fs.mkdirs(target).then(() => {
         return fs.exists(target);
-    }).then((exist) => {
+    }).then(exist => {
         exist.should.be.true;
         return fs.rmdir(join(tmpDir, 'a'));
     });
 });
 
-it('mkdirs() - callback', (callback) => {
+it('mkdirs() - callback', callback => {
     const target = join(tmpDir, 'a', 'b', 'c');
 
-    fs.mkdirs(target, (err) => {
+    fs.mkdirs(target, err => {
         should.not.exist(err);
 
-        fs.exists(target, (exist) => {
+        fs.exists(target, exist => {
             exist.should.be.true;
             fs.rmdir(join(tmpDir, 'a'), callback);
         });
@@ -78,7 +77,7 @@ it('mkdirsSync()', () => {
 
     fs.mkdirsSync(target);
 
-    return fs.exists(target).then((exist) => {
+    return fs.exists(target).then(exist => {
         exist.should.be.true;
         return fs.rmdir(join(tmpDir, 'a'));
     });
@@ -90,17 +89,17 @@ it('writeFile()', () => {
 
     return fs.writeFile(target, body).then(() => {
         return fs.readFile(target);
-    }).then((content) => {
+    }).then(content => {
         content.should.eql(body);
         return fs.rmdir(join(tmpDir, 'a'));
     });
 });
 
-it('writeFile() - callback', (callback) => {
+it('writeFile() - callback', callback => {
     const target = join(tmpDir, 'a', 'b', 'test.txt');
     const body = 'foo';
 
-    fs.writeFile(target, body, (err) => {
+    fs.writeFile(target, body, err => {
         should.not.exist(err);
 
         fs.readFile(target, (_, content) => {
@@ -116,7 +115,7 @@ it('writeFileSync()', () => {
 
     fs.writeFileSync(target, body);
 
-    return fs.readFile(target).then((content) => {
+    return fs.readFile(target).then(content => {
         content.should.eql(body);
         return fs.rmdir(join(tmpDir, 'a'));
     });
@@ -131,19 +130,19 @@ it('appendFile()', () => {
         return fs.appendFile(target, body2);
     }).then(() => {
         return fs.readFile(target);
-    }).then((content) => {
+    }).then(content => {
         content.should.eql(body + body2);
         return fs.rmdir(join(tmpDir, 'a'));
     });
 });
 
-it('appendFile() - callback', (callback) => {
+it('appendFile() - callback', callback => {
     const target = join(tmpDir, 'a', 'b', 'test.txt');
     const body = 'foo';
     const body2 = 'bar';
 
     fs.writeFile(target, body, () => {
-        fs.appendFile(target, body2, (err) => {
+        fs.appendFile(target, body2, err => {
             should.not.exist(err);
 
             fs.readFile(target, (_, content) => {
@@ -162,7 +161,7 @@ it('appendFileSync()', () => {
     return fs.writeFile(target, body).then(() => {
         fs.appendFileSync(target, body2);
         return fs.readFile(target);
-    }).then((content) => {
+    }).then(content => {
         content.should.eql(body + body2);
         return fs.rmdir(join(tmpDir, 'a'));
     });
@@ -177,7 +176,7 @@ it('copyFile()', () => {
         return fs.copyFile(src, dest);
     }).then(() => {
         return fs.readFile(dest);
-    }).then((content) => {
+    }).then(content => {
         content.should.eql(body);
 
         return Promise.all([
@@ -187,15 +186,15 @@ it('copyFile()', () => {
     });
 });
 
-it('copyFile() - callback', (callback) => {
+it('copyFile() - callback', callback => {
     const src = join(tmpDir, 'test.txt');
     const dest = join(tmpDir, 'a', 'b', 'test.txt');
     const body = 'foo';
 
-    fs.writeFile(src, body, (err) => {
+    fs.writeFile(src, body, err => {
         if (err) return callback(err);
 
-        fs.copyFile(src, dest, (err) => {
+        fs.copyFile(src, dest, err => {
             if (err) return callback(err);
 
             fs.readFile(dest, (err, content) => {
@@ -217,7 +216,7 @@ it('copyDir()', () => {
 
     return createDummyFolder(src).then(() => {
         return fs.copyDir(src, dest);
-    }).then((files) => {
+    }).then(files => {
         files.should.have.members([
             'e.txt',
             'f.js',
@@ -231,7 +230,7 @@ it('copyDir()', () => {
             fs.readFile(join(dest, 'folder', 'h.txt')),
             fs.readFile(join(dest, 'folder', 'i.js'))
         ]);
-    }).then((result) => {
+    }).then(result => {
         result.should.eql(['e', 'f', 'h', 'i']);
     }).then(() => {
         return Promise.all([
@@ -241,7 +240,7 @@ it('copyDir()', () => {
     });
 });
 
-it('copyDir() - callback', (callback) => {
+it('copyDir() - callback', callback => {
     const src = join(tmpDir, 'a');
     const dest = join(tmpDir, 'b');
 
@@ -260,7 +259,7 @@ it('copyDir() - callback', (callback) => {
                 fs.readFile(join(dest, 'f.js')),
                 fs.readFile(join(dest, 'folder', 'h.txt')),
                 fs.readFile(join(dest, 'folder', 'i.js'))
-            ]).then((result) => {
+            ]).then(result => {
                 result.should.eql(['e', 'f', 'h', 'i']);
             }).then(() => {
                 return Promise.all([
@@ -278,7 +277,7 @@ it('copyDir() - ignoreHidden off', () => {
 
     return createDummyFolder(src).then(() => {
         return fs.copyDir(src, dest, { ignoreHidden: false });
-    }).then((files) => {
+    }).then(files => {
         files.should.have.members([
             join('.hidden', 'a.txt'),
             join('.hidden', 'b.js'),
@@ -302,7 +301,7 @@ it('copyDir() - ignoreHidden off', () => {
             fs.readFile(join(dest, 'folder', 'i.js')),
             fs.readFile(join(dest, 'folder', '.j'))
         ]);
-    }).then((result) => {
+    }).then(result => {
         result.should.eql(['a', 'b', 'd', 'e', 'f', 'g', 'h', 'i', 'j']);
     }).then(() => {
         return Promise.all([
@@ -318,14 +317,14 @@ it('copyDir() - ignorePattern', () => {
 
     return createDummyFolder(src).then(() => {
         return fs.copyDir(src, dest, { ignorePattern: /\.js/ });
-    }).then((files) => {
+    }).then(files => {
         files.should.have.members(['e.txt', join('folder', 'h.txt')]);
 
         return Promise.all([
             fs.readFile(join(dest, 'e.txt')),
             fs.readFile(join(dest, 'folder', 'h.txt'))
         ]);
-    }).then((result) => {
+    }).then(result => {
         result.should.eql(['e', 'h']);
     }).then(() => {
         return Promise.all([
@@ -340,7 +339,7 @@ it('listDir()', () => {
 
     return createDummyFolder(target).then(() => {
         return fs.listDir(target);
-    }).then((files) => {
+    }).then(files => {
         files.should.have.members([
             'e.txt',
             'f.js',
@@ -352,7 +351,7 @@ it('listDir()', () => {
     });
 });
 
-it('listDir() - callback', (callback) => {
+it('listDir() - callback', callback => {
     const target = join(tmpDir, 'test');
 
     createDummyFolder(target).then(() => {
@@ -376,7 +375,7 @@ it('listDir() - ignoreHidden off', () => {
 
     return createDummyFolder(target).then(() => {
         return fs.listDir(target, { ignoreHidden: false });
-    }).then((files) => {
+    }).then(files => {
         files.should.have.members([
             join('.hidden', 'a.txt'),
             join('.hidden', 'b.js'),
@@ -398,7 +397,7 @@ it('listDir() - ignorePattern', () => {
 
     return createDummyFolder(target).then(() => {
         return fs.listDir(target, { ignorePattern: /\.js/ });
-    }).then((files) => {
+    }).then(files => {
         files.should.have.members(['e.txt', join('folder', 'h.txt')]);
         return fs.rmdir(target);
     });
@@ -457,17 +456,17 @@ it('readFile()', () => {
 
     return fs.writeFile(target, body).then(() => {
         return fs.readFile(target);
-    }).then((content) => {
+    }).then(content => {
         content.should.eql(body);
         return fs.unlink(target);
     });
 });
 
-it('readFile() - callback', (callback) => {
+it('readFile() - callback', callback => {
     const target = join(tmpDir, 'test.txt');
     const body = 'test';
 
-    fs.writeFile(target, body, (err) => {
+    fs.writeFile(target, body, err => {
         if (err) return callback(err);
 
         fs.readFile(target, (err, content) => {
@@ -486,7 +485,7 @@ it('readFile() - escape BOM', () => {
 
     return fs.writeFile(target, body).then(() => {
         return fs.readFile(target);
-    }).then((content) => {
+    }).then(content => {
         content.should.eql('foo');
         return fs.unlink(target);
     });
@@ -498,7 +497,7 @@ it('readFile() - escape Windows line ending', () => {
 
     return fs.writeFile(target, body).then(() => {
         return fs.readFile(target);
-    }).then((content) => {
+    }).then(content => {
         content.should.eql('foo\nbar');
         return fs.unlink(target);
     });
@@ -539,12 +538,12 @@ it('unlink()', () => {
 
     return fs.writeFile(target, '').then(() => {
         return fs.exists(target);
-    }).then((exist) => {
+    }).then(exist => {
         exist.should.eql(true);
         return fs.unlink(target);
     }).then(() => {
         return fs.exists(target);
-    }).then((exist) => {
+    }).then(exist => {
         exist.should.eql(false);
     });
 });
@@ -554,7 +553,7 @@ it('emptyDir()', () => {
 
     return createDummyFolder(target).then(() => {
         return fs.emptyDir(target);
-    }).then<Array<[string, boolean]>>((files) => {
+    }).then(files => {
         files.should.have.members([
             'e.txt',
             'f.js',
@@ -574,7 +573,7 @@ it('emptyDir()', () => {
             [join(target, 'folder', '.j'), true]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -582,7 +581,7 @@ it('emptyDir()', () => {
     });
 });
 
-it('emptyDir() - callback', (callback) => {
+it('emptyDir() - callback', callback => {
     const target = join(tmpDir, 'test');
 
     createDummyFolder(target).then(() => {
@@ -596,7 +595,7 @@ it('emptyDir() - callback', (callback) => {
                 join('folder', 'i.js')
             ]);
 
-            Promise.map<[string, boolean], void>([
+            Promise.map([
                 [join(target, '.hidden', 'a.txt'), true],
                 [join(target, '.hidden', 'b.js'), true],
                 [join(target, '.hidden', 'c', 'd'), true],
@@ -606,8 +605,8 @@ it('emptyDir() - callback', (callback) => {
                 [join(target, 'folder', 'h.txt'), false],
                 [join(target, 'folder', 'i.js'), false],
                 [join(target, 'folder', '.j'), true]
-            ], (data: [string, boolean]) => {
-                return fs.exists(data[0]).then((exist) => {
+            ], (data: any) => {
+                return fs.exists(data[0]).then(exist => {
                     exist.should.eql(data[1]);
                 });
             }).then(() => {
@@ -622,7 +621,7 @@ it('emptyDir() - ignoreHidden off', () => {
 
     return createDummyFolder(target).then(() => {
         return fs.emptyDir(target, { ignoreHidden: false });
-    }).then<Array<[string, boolean]>>((files) => {
+    }).then(files => {
         files.should.have.members([
             join('.hidden', 'a.txt'),
             join('.hidden', 'b.js'),
@@ -647,7 +646,7 @@ it('emptyDir() - ignoreHidden off', () => {
             [join(target, 'folder', '.j'), false]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -660,7 +659,7 @@ it('emptyDir() - ignorePattern', () => {
 
     return createDummyFolder(target).then(() => {
         return fs.emptyDir(target, { ignorePattern: /\.js/ });
-    }).then<Array<[string, boolean]>>((files) => {
+    }).then(files => {
         files.should.have.members(['e.txt', join('folder', 'h.txt')]);
 
         return [
@@ -675,7 +674,7 @@ it('emptyDir() - ignorePattern', () => {
             [join(target, 'folder', '.j'), true]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -688,7 +687,7 @@ it('emptyDir() - exclude', () => {
 
     return createDummyFolder(target).then(() => {
         return fs.emptyDir(target, { exclude: ['e.txt', join('folder', 'i.js')] });
-    }).then<Array<[string, boolean]>>((files) => {
+    }).then(files => {
         files.should.have.members(['f.js', join('folder', 'h.txt')]);
 
         return [
@@ -703,7 +702,7 @@ it('emptyDir() - exclude', () => {
             [join(target, 'folder', '.j'), true]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -714,7 +713,7 @@ it('emptyDir() - exclude', () => {
 it('emptyDirSync()', () => {
     const target = join(tmpDir, 'test');
 
-    return createDummyFolder(target).then<Array<[string, boolean]>>(() => {
+    return createDummyFolder(target).then(() => {
         const files = fs.emptyDirSync(target);
         files.should.have.members([
             'e.txt',
@@ -735,7 +734,7 @@ it('emptyDirSync()', () => {
             [join(target, 'folder', '.j'), true]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -746,7 +745,7 @@ it('emptyDirSync()', () => {
 it('emptyDirSync() - ignoreHidden off', () => {
     const target = join(tmpDir, 'test');
 
-    return createDummyFolder(target).then<Array<[string, boolean]>>(() => {
+    return createDummyFolder(target).then(() => {
         const files = fs.emptyDirSync(target, { ignoreHidden: false });
         files.should.have.members([
             join('.hidden', 'a.txt'),
@@ -772,7 +771,7 @@ it('emptyDirSync() - ignoreHidden off', () => {
             [join(target, 'folder', '.j'), false]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -783,7 +782,7 @@ it('emptyDirSync() - ignoreHidden off', () => {
 it('emptyDirSync() - ignorePattern', () => {
     const target = join(tmpDir, 'test');
 
-    return createDummyFolder(target).then<Array<[string, boolean]>>(() => {
+    return createDummyFolder(target).then(() => {
         const files = fs.emptyDirSync(target, { ignorePattern: /\.js/ });
         files.should.have.members(['e.txt', join('folder', 'h.txt')]);
 
@@ -799,7 +798,7 @@ it('emptyDirSync() - ignorePattern', () => {
             [join(target, 'folder', '.j'), true]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -810,7 +809,7 @@ it('emptyDirSync() - ignorePattern', () => {
 it('emptyDirSync() - exclude', () => {
     const target = join(tmpDir, 'test');
 
-    return createDummyFolder(target).then<Array<[string, boolean]>>(() => {
+    return createDummyFolder(target).then(() => {
         const files = fs.emptyDirSync(target, { exclude: ['e.txt', join('folder', 'i.js')] });
         files.should.have.members(['f.js', join('folder', 'h.txt')]);
 
@@ -826,7 +825,7 @@ it('emptyDirSync() - exclude', () => {
             [join(target, 'folder', '.j'), true]
         ];
     }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then((exist) => {
+        return fs.exists(data[0]).then(exist => {
             exist.should.eql(data[1]);
         });
     }).then(() => {
@@ -841,19 +840,19 @@ it('rmdir()', () => {
         return fs.rmdir(target);
     }).then(() => {
         return fs.exists(target);
-    }).then((exist) => {
+    }).then(exist => {
         exist.should.be.false;
     });
 });
 
-it('rmdir() - callback', (callback) => {
+it('rmdir() - callback', callback => {
     const target = join(tmpDir, 'test');
 
     createDummyFolder(target).then(() => {
-        fs.rmdir(target, (err) => {
+        fs.rmdir(target, err => {
             should.not.exist(err);
 
-            fs.exists(target, (exist) => {
+            fs.exists(target, exist => {
                 exist.should.be.false;
                 callback();
             });
@@ -867,7 +866,7 @@ it('rmdirSync()', () => {
     return createDummyFolder(target).then(() => {
         fs.rmdirSync(target);
         return fs.exists(target);
-    }).then((exist) => {
+    }).then(exist => {
         exist.should.be.false;
     });
 });
@@ -877,7 +876,7 @@ import { FSWatcher } from 'chokidar';
 it('watch()', () => {
     let watcher: FSWatcher;
 
-    return fs.watch(tmpDir).then((watcher_) => {
+    return fs.watch(tmpDir).then(watcher_ => {
         watcher = watcher_;
 
         return new Promise((resolve, reject) => {
@@ -905,7 +904,7 @@ it('ensurePath() - file exists', () => {
         fs.writeFile(join(target, 'bar.txt'), '')
     ]).then(() => {
         return fs.ensurePath(join(target, 'foo.txt'));
-    }).then((path) => {
+    }).then(path => {
         path.should.eql(join(target, 'foo-2.txt'));
         return fs.rmdir(target);
     });
@@ -914,12 +913,12 @@ it('ensurePath() - file exists', () => {
 it('ensurePath() - file not exist', () => {
     const target = join(tmpDir, 'foo.txt');
 
-    return fs.ensurePath(target).then((path) => {
+    return fs.ensurePath(target).then(path => {
         path.should.eql(target);
     });
 });
 
-it('ensurePath() - callback', (callback) => {
+it('ensurePath() - callback', callback => {
     const target = join(tmpDir, 'test');
 
     Promise.all([
@@ -962,7 +961,7 @@ it('ensurePathSync() - file not exist', () => {
 it('ensureWriteStream()', () => {
     const target = join(tmpDir, 'foo', 'bar.txt');
 
-    return fs.ensureWriteStream(target).then((stream) => {
+    return fs.ensureWriteStream(target).then(stream => {
         stream.path.should.eql(target);
         stream.on('finish', () => {
             return fs.unlink(target);
@@ -970,7 +969,7 @@ it('ensureWriteStream()', () => {
     });
 });
 
-it('ensureWriteStream() - callback', (callback) => {
+it('ensureWriteStream() - callback', callback => {
     const target = join(tmpDir, 'foo', 'bar.txt');
 
     fs.ensureWriteStream(target, (err, stream) => {
@@ -986,6 +985,6 @@ it('ensureWriteStreamSync()', () => {
 
     stream.path.should.eql(target);
     stream.on('finish', () => {
-        return fs.rmdir(path.dirname(target));
+        return fs.rmdir(dirname(target));
     });
 });
diff --git a/types/hexo-fs/index.d.ts b/types/hexo-fs/index.d.ts
index 896fbc24eb..46c7b99d64 100644
--- a/types/hexo-fs/index.d.ts
+++ b/types/hexo-fs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://hexo.io/
 // Definitions by: segayuu <https://github.com/segayuu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import Promise = require('bluebird');
 import {
@@ -90,24 +91,14 @@ export let accessSync: ((path: PathLike, mode?: number) => void) | undefined; //
 // appendFile
 /**
  * Appends data to a file.
- * @param path
- * @param data
- * @param callback
  */
 export function appendFile(path: string, data: any, callback?: (err: any) => void): Promise<void>;
 /**
  * Appends data to a file.
- * @param path
- * @param data
- * @param options
- * @param callback
  */
 export function appendFile(path: string, data: any, options: string | AppendFileOptions, callback?: (err: any) => void): Promise<void>;
 /**
  * Synchronous version of fs.appendFile.
- * @param path
- * @param data
- * @param options
  */
 export function appendFileSync(path: string, data: any, options?: string | AppendFileOptions): void;
 
@@ -130,23 +121,14 @@ export { closeSync };
 // copy
 /**
  * Copies a directory from src to dest. It returns an array of copied files.
- * @param src
- * @param dest
- * @param callback
  */
 export function copyDir(src: string, dest: string, callback?: (err: any, value?: string[]) => void): Promise<string[]>;
 /**
  * Copies a directory from src to dest. It returns an array of copied files.
- * @param dest
- * @param options
- * @param callback
  */
 export function copyDir(src: string, dest: string, options?: DirectoryOptions, callback?: (err: any, value?: string[]) => void): Promise<string[]>;
 /**
  * Copies a file from src to dest.
- * @param src
- * @param dest
- * @param callback
  */
 export function copyFile(src: PathLike, dest: string, callback?: (err: any) => void): Promise<void>;
 
@@ -156,8 +138,6 @@ export { createReadStream, createWriteStream };
 // emptyDir
 /**
  * Deletes all files in a directory. It returns an array of deleted files.
- * @param path
- * @param callback
  */
 export function emptyDir(path: string, callback?: (err: any, value?: string | string[]) => void): Promise<string | string[]>;
 export function emptyDir(
@@ -170,28 +150,20 @@ export function emptyDirSync(path: string, options?: DirectoryOptions & { exclud
 // ensurePath
 /**
  * Ensures the given path is available to use or appends a number to the path.
- * @param path
- * @param callback
  */
 export function ensurePath(path: string, callback?: (err: any, value?: string) => void): Promise<string>;
 /**
  * Synchronous version of `fs.ensurePath`.
- * @param path
  */
 export function ensurePathSync(path: string): string;
 
 // ensureWriteStream
 /**
  * Creates the parent directories if they does not exist and returns a writable stream.
- * @param path
- * @param callback
  */
 export function ensureWriteStream(path: string, callback?: (err: any, value?: WriteStream) => void): Promise<WriteStream>;
 /**
  * Creates the parent directories if they does not exist and returns a writable stream.
- * @param path
- * @param options
- * @param callback
  */
 export function ensureWriteStream(
     path: string,
@@ -207,8 +179,6 @@ export function ensureWriteStream(
 ): Promise<WriteStream>;
 /**
  * Synchronous version of fs.ensureWriteStream.
- * @param path
- * @param options
  */
 export function ensureWriteStreamSync(path: string, options?: string | {
     flags?: string;
@@ -223,12 +193,10 @@ export function ensureWriteStreamSync(path: string, options?: string | {
 /**
  * Test whether or not the given `path` exists by checking with the file system.
  * @param path checking if exists.
- * @param callback
  */
 export function exists(path: PathLike, callback?: (exist: boolean) => void): Promise<boolean>;
 /**
  * Synchronous version of `fs.exists`.
- * @param path
  */
 export function existsSync(path: PathLike): boolean;
 
@@ -243,22 +211,14 @@ export { linkSync };
 // listDir
 /**
  * Lists files in a directory.
- * @param path
- * @param callback
  */
 export function listDir(path: string, callback?: (err: any, value?: string[]) => void): Promise<string[]>;
 /**
  * Lists files in a directory.
- * @param path
- * @param options
- * @param callback
  */
 export function listDir(path: string, options?: DirectoryOptions, callback?: (err: any, value?: string[]) => void): Promise<string[]>;
 /**
  * Synchronous version of `fs.listDir`.
- * @param path
- * @param options
- * @param parent
  */
 export function listDirSync(path: string, options?: DirectoryOptions, parent?: string): string | string[];
 
@@ -269,13 +229,10 @@ export { mkdirSync };
 // mkdirs
 /**
  * Creates a directory and its parent directories if they does not exist.
- * @param path
- * @param callback
  */
 export function mkdirs(path: PathLike, callback?: (err: any) => void): Promise<void>;
 /**
  * Synchronous version of `fs.mkdirs`.
- * @param path
  */
 export function mkdirsSync(path: string): void;
 
@@ -306,15 +263,10 @@ export { readdirSync };
 // readFile
 /**
  * Reads the entire contents of a file.
- * @param path
- * @param callback
  */
 export function readFile(path: PathLike | number, callback?: (err: any, value?: string) => void): Promise<string>;
 /**
  * Reads the entire contents of a file.
- * @param path
- * @param options
- * @param callback
  */
 export function readFile(
     path: PathLike | number,
@@ -323,8 +275,6 @@ export function readFile(
 ): Promise<string>;
 /**
  * Synchronous version of `fs.readFile`.
- * @param path
- * @param options
  */
 export function readFileSync(path: PathLike | number, options?: { encoding?: string; flag?: string; escape?: boolean; }): string;
 
@@ -374,9 +324,6 @@ import { FSWatcher, WatchOptions } from 'chokidar';
  * Watches changes of a file or a directory.
  *
  * See Chokidar API for more info.
- * @param path
- * @param options
- * @param callback
  */
 export function watch(path: string | string[], options?: WatchOptions, callback?: (err: any, value?: FSWatcher) => void): Promise<FSWatcher>;
 export { watchFile, unwatchFile };
@@ -400,17 +347,10 @@ export { writeSync };
 // writeFile
 /**
  * Writes data to a file.
- * @param path
- * @param data
- * @param callback
  */
 export function writeFile(path: string, data: any, callback?: (err: any) => void): Promise<void>;
 /**
  * Writes data to a file.
- * @param path
- * @param data
- * @param options
- * @param callback
  */
 export function writeFile(
     path: string,
@@ -420,16 +360,11 @@ export function writeFile(
 ): Promise<void>;
 /**
  * Synchronous version of `fs.writeFile`.
- * @param path
- * @param data
- * @param options
  */
 export function writeFileSync(path: string, data: any, options?: string | { encoding?: string | null; mode?: string | number; flag?: string }): void;
 
 // Static classes
-export let Stats: Stats;
-export let ReadStream: ReadStream;
-export let WriteStream: WriteStream;
+export { Stats, ReadStream, WriteStream } from 'graceful-fs';
 
 // util
 export function escapeEOL(str: string): string;
diff --git a/types/hexo-log/index.d.ts b/types/hexo-log/index.d.ts
index 07a5b74ede..40640a3a36 100644
--- a/types/hexo-log/index.d.ts
+++ b/types/hexo-log/index.d.ts
@@ -8,8 +8,6 @@ import bunyan = require('hexo-bunyan');
 import streams = require('stream');
 
 declare class HexoLogger extends bunyan {
-    /* tslint:disable:unified-signatures */
-
     /**
      * Returns a boolean: is the `debug` level enabled?
      *
@@ -154,8 +152,6 @@ declare class HexoLogger extends bunyan {
      * Uses `util.format` for msg formatting.
      */
     log(format: any, ...params: any[]): void;
-
-    /* tslint:enable:unified-signatures */
 }
 
 declare function createLogger(options?: { name?: string; silent?: boolean; debug?: boolean; }): HexoLogger;
diff --git a/types/hexo-log/tslint.json b/types/hexo-log/tslint.json
index 3db14f85ea..08b1465cd6 100644
--- a/types/hexo-log/tslint.json
+++ b/types/hexo-log/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false
+    }
+}
diff --git a/types/highcharts-ng/tslint.json b/types/highcharts-ng/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/highcharts-ng/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/highcharts/highstock.d.ts b/types/highcharts/highstock.d.ts
index 79103b3464..d2d81af469 100644
--- a/types/highcharts/highstock.d.ts
+++ b/types/highcharts/highstock.d.ts
@@ -112,16 +112,16 @@ declare global {
         /**
          * Creates a new Highcharts.Chart for the current JQuery selector; usually
          * a div selected by $('#container')
-         * @param {Highcharts.Options} options Options for this chart
-         * @return current {JQuery} selector the current JQuery selector
+         * @param options Options for this chart
+         * @return current selector the current JQuery selector
          */
         highcharts(type: "StockChart", options: Highstock.Options): JQuery;
         /**
          * Creates a new Highcharts.Chart for the current JQuery selector; usually
          * a div selected by $('#container')
-         * @param {Highcharts.Options} options Options for this chart
+         * @param options Options for this chart
          * @param callback Callback function used to manipulate the constructed chart instance
-         * @return current {JQuery} selector the current JQuery selector
+         * @return current selector the current JQuery selector
          */
         highcharts(type: "StockChart", options: Highstock.Options, callback: (chart: Highstock.ChartObject) => void): JQuery;
 
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 662c4f4164..917ab479ea 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Highcharts 5.0.10
+// Type definitions for Highcharts 5.0.13
 // Project: http://www.highcharts.com/
 // Definitions by: Damiano Gambarotto <https://github.com/damianog>
 //                 Dan Lewi Harkestad <https://github.com/baltie>
@@ -55,6 +55,12 @@ declare namespace Highcharts {
         max: number;
     }
 
+    interface AxisLabelFormatterOptions {
+        value: any;
+        isFirst: number;
+        isLast: number;
+    }
+
     interface AxisLabels {
         /**
          * What part of the string the given position is anchored to. Can be one of 'left', 'center' or 'right'. Defaults to
@@ -100,7 +106,7 @@ declare namespace Highcharts {
          * this are axis, chart, isFirst and isLast.
          * @default function() {return this.value;}
          */
-        formatter?(): string;
+        formatter?(this: AxisLabelFormatterOptions): string;
         /**
          * Horizontal axis only. When staggerLines is not set, maxStaggerLines defines how many lines the axis is allowed to
          * add to automatically avoid overlapping X labels. Set to 1 to disable overlap detection.
@@ -507,7 +513,7 @@ declare namespace Highcharts {
          * The actual text of the axis title. It can contain basic HTML text markup like <b>, <i> and spans with style.
          * @default xAxis: null, yAxis: 'Values'
          */
-        text?: string;
+        text?: string | null;
         /**
          * Horizontal pixel offset of the title position.
          * @default 0
@@ -1021,9 +1027,9 @@ declare namespace Highcharts {
          */
         tickmarkPlacement?: string;
         /**
-         * The axis title, showing next to the axis line.
+         * The axis title, showing next to the axis line. To disable the title, set the text to null.
          */
-        title?: AxisTitle;
+        title?: AxisTitle | null;
         /**
          * The type of axis. Can be one of 'linear', 'logarithmic', 'datetime' or 'category'. In a datetime axis, the
          * numbers are given in milliseconds, and tick marks are placed on appropriate values like full hours or days. In a
@@ -1036,7 +1042,7 @@ declare namespace Highcharts {
          * Datetime axis only. An array determining what time intervals the ticks are allowed to fall on. Each array item is
          * an array where the first value is the time unit and the second value another array of allowed multiples.
          */
-        units?: [[string, [number]]];
+        units?: Array<[string, number[]]>;
         /**
          * Whether axis, including axis title, line, ticks and labels, should be visible.
          * @default true
@@ -1518,12 +1524,10 @@ declare namespace Highcharts {
         stops?: any[][];
         /**
          * Brighten the color
-         * @param {number} alpha
          */
         brighten?(alpha: number): Gradient;
         /**
          * Return the color a specified format
-         * @param {string} format
          */
         get?(format: string): string;
         /**
@@ -1536,8 +1540,6 @@ declare namespace Highcharts {
         rgba?: number[];
         /**
          * Set the color's opacity to a given alpha value
-         * @param  {number} alpha
-         * @return {Gradient}
          */
         setOpacity?(alpha: number): Gradient;
     }
@@ -1672,7 +1674,6 @@ declare namespace Highcharts {
         stroke?: string;
         /**
          * The button stroke width
-         * @type {[type]}
          */
         'stroke-width'?: number;
         /**
@@ -1758,9 +1759,6 @@ declare namespace Highcharts {
          * @deprecated
          */
         defaultSeriesType?: string;
-        /**
-         *
-         */
         description?: string;
         /**
          * Event listeners for the chart.
@@ -2048,7 +2046,7 @@ declare namespace Highcharts {
          * switchRowsAndColumns is set, the columns are interpreted as series.
          * @since 4.0
          */
-        columns?: Array<[string | number]>;
+        columns?: Array<Array<string | number>>;
         /**
          * The callback that is evaluated when the data is finished loading, optionally from an external source, and parsed.
          * The first argument passed is a finished chart options object, containing the series. These options can be
@@ -3671,9 +3669,6 @@ declare namespace Highcharts {
          * @default 0.1
          */
         brightness?: number;
-        /**
-         *
-         */
         color?: string | Gradient;
         /**
          * Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the
@@ -5277,6 +5272,9 @@ declare namespace Highcharts {
         * interfaces (AreaChartSeriesOptions, LineChartSeriesOptions, etc.)
         */
     interface IndividualSeriesOptions {
+        size?: number | string;
+        innerSize?: number | string;
+
         type?: string;
         /**
          * The main color or the series. In line type series it applies to the line and the point markers unless otherwise
@@ -5619,7 +5617,7 @@ declare namespace Highcharts {
          * The title of the chart. To disable the title, set the text to null.
          * @default 'Chart title'
          */
-        text?: string;
+        text?: string | null;
         /**
          * Whether to {@link http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html|use HTML} to render the text.
          * @default false
@@ -6071,13 +6069,13 @@ declare namespace Highcharts {
     interface AxisObject {
         /**
          * Add a plot band after render time.
-         * @param {PlotBands} options A configuration object consisting of the same members as options.xAxis.plotBands
+         * @param options A configuration object consisting of the same members as options.xAxis.plotBands
          * @since 1.2.0
          */
         addPlotBand(options: PlotBands): void;
         /**
          * Add a plot line after render time.
-         * @param {PlotLines} options A configuration object consisting of the same members as options.xAxis.plotLines
+         * @param options A configuration object consisting of the same members as options.xAxis.plotLines
          * @since 1.2.0
          */
         addPlotLine(options: PlotLines): void;
@@ -6094,26 +6092,26 @@ declare namespace Highcharts {
         remove(redraw?: boolean): void;
         /**
          * Remove a plot band by its id.
-         * @param {string} id The plot band's id as given in the original configuration object or in the addPlotBand method.
+         * @param id The plot band's id as given in the original configuration object or in the addPlotBand method.
          * @since 1.2.0
          */
         removePlotBand(id: string): void;
         /**
          * Remove a plot line by its id.
-         * @param {string} id The plot line's id as given in the original configuration object or in the addPlotLine method.
+         * @param id The plot line's id as given in the original configuration object or in the addPlotLine method.
          * @since 1.2.0
          */
         removePlotLine(id: string): void;
         /**
          * Set new categories for the axis. Redraws.
-         * @param {string[]} categories The new category names.
+         * @param categories The new category names.
          * @since 1.2.0
          */
         setCategories(categories: string[]): void;
         /**
          * Set new categories for the axis.
-         * @param {string[]} categories The new category names.
-         * @param {boolean}  redraw     Whether to redraw the axis or wait for an explicit call to chart.redraw().
+         * @param categories The new category names.
+         * @param  redraw     Whether to redraw the axis or wait for an explicit call to chart.redraw().
          * @since 1.2.0
          */
         setCategories(categories: string[], redraw: boolean): void;
@@ -6122,42 +6120,40 @@ declare namespace Highcharts {
          * minimum and maximum values are rounded off to the nearest tick. To prevent this, these options can be set to
          * false before calling setExtremes. Also, setExtremes will not allow a range lower than the minRange option, which
          * by default is the range of five points.
-         * @param {number} min The new minimum value
-         * @param {number} max The new maximum value
-         * @param {boolean} redraw Whether to redraw the chart or wait for an explicit call to chart.redraw().
-         * @param {boolean | Animation} animation When true, the resize will be animated with default animation options.
+         * @param min The new minimum value
+         * @param max The new maximum value
+         * @param redraw Whether to redraw the chart or wait for an explicit call to chart.redraw().
+         * @param animation When true, the resize will be animated with default animation options.
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
         setExtremes(min?: number, max?: number, redraw?: boolean, animation?: boolean | Animation, eventArguments?: any): void;
         /**
          * Update the title of the axis after render time.
-         * @param {AxisTitle} title  The new title options on the same format as given in xAxis.title.
-         * @param {boolean}             redraw Whether to redraw the chart now or hold until the next chart.redraw()
+         * @param title  The new title options on the same format as given in xAxis.title.
+         * @param             redraw Whether to redraw the chart now or hold until the next chart.redraw()
          * @since 2.2
          */
         setTitle(title: AxisTitle, redraw?: boolean): void;
         /**
          * Translates a value in terms of axis units in to pixels within the chart.
-         * @param  {number}  value           A value in terms of axis units.
-         * @param  {boolean} paneCoordinates Whether to return the pixel coordinate relative to the chart or just the axis/pane itself.
-         * @return {number}
+         * @param   value           A value in terms of axis units.
+         * @param  paneCoordinates Whether to return the pixel coordinate relative to the chart or just the axis/pane itself.
          * @since 3.0
          */
         toPixels(value: number, paneCoordinates?: boolean): number;
         /**
          * Translate a pixel position along the axis to a value in terms of axis units.
-         * @param  {number}  pixel           A pixel position along the axis.
-         * @param  {boolean} paneCoordinates Whether the input pixel position is relative to the chart or just the axis/pane itself.
-         * @return {number}
+         * @param   pixel           A pixel position along the axis.
+         * @param  paneCoordinates Whether the input pixel position is relative to the chart or just the axis/pane itself.
          * @since 3.0
          */
         toValue(pixel: number, paneCoordinates?: boolean): number;
         /**
          * Update an axis object with a new set of options. The options are merged with the existing options, so only new or
          * altered options need to be specified.
-         * @param {AxisOptions} options The new options that will be merged in with existing options on the axis.
-         * @param {boolean}               redraw  Defaults to true. Whether to redraw the chart after the new options are set.
+         * @param options The new options that will be merged in with existing options on the axis.
+         * @param               redraw  Defaults to true. Whether to redraw the chart after the new options are set.
          * @since 3.0
          */
         update(options: AxisOptions, redraw?: boolean): void;
@@ -6173,12 +6169,11 @@ declare namespace Highcharts {
          * Add an axis to the chart after render time. Note that this method should never be used when adding data
          * synchronously at chart render time, as it adds expense to the calculations and rendering. When adding data at the
          * same time as the chart is initiated, add the axis as a configuration option instead.
-         * @param  {AxisOptions} options The Axis options, as documented under xAxis and yAxis.
+         * @param  options The Axis options, as documented under xAxis and yAxis.
          * @param  [boolean] isX Whether it is an X axis or Y axis
          * @param  [boolean] redraw Defaults to true. Whether to redraw the chart after the series is added. See the redraw() method.
          * @param  [boolean | Animation] animation Defaults to true. When true, the series' updating will be animated with default animation options.
          * The animation can also be a configuration object with properties duration and easing.
-         * @return {AxisObject}
          * @since 3.0
          */
         addAxis(options: AxisOptions, isX?: boolean, redraw?: boolean, animation?: boolean | Animation): AxisObject;
@@ -6192,7 +6187,7 @@ declare namespace Highcharts {
          * Add a series to the chart after render time. Note that this method should never be used when adding data
          * synchronously at chart render time, as it adds expense to the calculations and rendering. When adding data at the
          * same time as the chart is initiated, add the series as a configuration option instead.
-         * @param {T} options The series options, as documented under plotOptions.series and under the plotOptions for each series type.
+         * @param options The series options, as documented under plotOptions.series and under the plotOptions for each series type.
          * @param [boolean] redraw
          * @since 1.2.0
          */
@@ -6201,8 +6196,8 @@ declare namespace Highcharts {
          * Add a series to the chart as drilldown from a specific point in the parent series. This method is used for async
          * drilldown, when clicking a point in a series should result in loading and displaying a more high-resolution
          * series. When not async, the setup is simpler using the drilldown.series options structure.
-         * @param {PointObject} point The existing Point object from which the drilldown will start.
-         * @param {IndividualSeriesOptions} seriesOptions The series options, as documented under plotOptions.series and under the plotOptions for each series type.
+         * @param point The existing Point object from which the drilldown will start.
+         * @param seriesOptions The series options, as documented under plotOptions.series and under the plotOptions for each series type.
          * @since 3.0.8
          */
         addSeriesAsDrilldown(point: PointObject, seriesOptions: IndividualSeriesOptions): void;
@@ -6236,7 +6231,7 @@ declare namespace Highcharts {
         /**
          * Exporting module required. Submit an SVG version of the chart to a server along with some parameters for
          * conversion.
-         * @param {ExportingOptions} options Exporting options. Out of the exporting options, the following options can be given as parameters to the exportChart method.
+         * @param options Exporting options. Out of the exporting options, the following options can be given as parameters to the exportChart method.
          * All options default to the values given in the exporting config options. filename: the filename for the export without extension,
          * url: the URL for the server module to do the conversion, width: the width of the PNG or JPEG image generated on the server,
          * type: the MIME type of the converted image, sourceWidth: the width of the source (in-page) chart, sourceHeight: the height of the source chart.
@@ -6246,11 +6241,11 @@ declare namespace Highcharts {
         /**
          * Exporting module required. Submit an SVG version of the chart to a server along with some parameters for
          * conversion.
-         * @param {ExportingOptions} options Exporting options. Out of the exporting options, the following options can be given as parameters to the exportChart method.
+         * @param options Exporting options. Out of the exporting options, the following options can be given as parameters to the exportChart method.
          * All options default to the values given in the exporting config options. filename: the filename for the export without extension,
          * url: the URL for the server module to do the conversion, width: the width of the PNG or JPEG image generated on the server,
          * type: the MIME type of the converted image, sourceWidth: the width of the source (in-page) chart, sourceHeight: the height of the source chart.
-         * @param {Options} chartOptions Additional chart options for the exported chart. For example a different background color can be added here.
+         * @param chartOptions Additional chart options for the exported chart. For example a different background color can be added here.
          * @since 2.0
          */
         exportChart(options: ExportingOptions, chartOptions: Options): void;
@@ -6263,7 +6258,7 @@ declare namespace Highcharts {
         /**
          * Export the chart to a PNG or SVG without sending it to a server. Requires
          * modules/exporting.js and modules/offline-exporting.js.
-         * @param {ExportingOptions} options Exporting options. Same as
+         * @param options Exporting options. Same as
          * the exportChart params.
          * @since 2.0
          */
@@ -6271,39 +6266,37 @@ declare namespace Highcharts {
         /**
          * Export the chart to a PNG or SVG without sending it to a server.
          * Requires modules/exporting.js and modules/offline-exporting.js.
-         * @param {ExportingOptions} options Exporting options. Same as
+         * @param options Exporting options. Same as
          * the exportChart params.
-         * @param {Options} chartOptions Additional chart options for the
+         * @param chartOptions Additional chart options for the
          * exported chart. Same as the exportChart params.
          * @since 2.0
          */
         exportChartLocal(options: ExportingOptions, chartOptions: Options): void;
         /**
          * Get an axis, series or point by its id as given in the configuration options.
-         * @param  {string} id The id of the axis, series or point to get.
-         * @return {AxisObject|SeriesObject|PointObject}
+         * @param  id The id of the axis, series or point to get.
          * @since 1.2.0
          */
         get(id: string): AxisObject | SeriesObject | PointObject;
         /**
          * Exporting module required. Get an SVG string representing the chart.
-         * @param  {Options} additionalOptions Chart options to add to the exported chart in addition to the options given for the original chart.
+         * @param  additionalOptions Chart options to add to the exported chart in addition to the options given for the original chart.
          * For example if series.lineWidth should be greater in the exported chart than in the original, or the chart should have a different background color, this is added here.
-         * @return {string}
          * @since 2.0
          */
         getSVG(additionalOptions?: Options): string;
         /**
          * Returns an array of all currently selected points in the chart. Points can be selected either programmatically by
          * the point.select() method or by clicking.
-         * @return {PointObject[]} An array of the selected points.
+         * @return An array of the selected points.
          * @since 1.2.0
          */
         getSelectedPoints(): PointObject[];
         /**
          * Returns an array of all currently selected series in the chart. Series can be selected either programmatically by
          * the series.select() method or by checking the checkbox next to the legend item if series.showCheckBox is true.
-         * @return {SeriesObject[]} An array of the selected Series items.
+         * @return An array of the selected Series items.
          * @since 1.2.0
          */
         getSelectedSeries(): SeriesObject[];
@@ -6342,21 +6335,20 @@ declare namespace Highcharts {
         reflow(): void;
         /**
          * An array of all the chart's series.
-         * @type {SeriesObject[]}
          * @since 1.2.0
          */
         series: SeriesObject[];
         /**
          * Resize the chart to a given width and height.
-         * @param {number} width The new pixel width of the chart.
-         * @param {number} height The new pixel height of the chart.
-         * @param {boolean | Animation} animation Defaults to true. When true, the resize will be animated with default animation options.
+         * @param width The new pixel width of the chart.
+         * @param height The new pixel height of the chart.
+         * @param animation Defaults to true. When true, the resize will be animated with default animation options.
          *  The animation can also be a configuration object with properties duration and easing.
          */
         setSize(width: number, height: number, animation?: boolean | Animation): void;
         /**
          * Set a new title or subtitle for the chart
-         * @param {TitleOptions} title A configuration object for the new title as defined at #title.
+         * @param title A configuration object for the new title as defined at #title.
          * @param [SubtitleOptions] subtitle A configuration object for the new subtitle as defined at #subtitle.
          * @param [boolean] redraw Whether to redraw the chart. Defaults to true.
          * @since 2.1.0
@@ -6386,11 +6378,13 @@ declare namespace Highcharts {
          * found, the first item is updated. So for example, running chart.update with a series item without an id, will cause
          * the existing chart's first series to be updated.
          * See also the responsive option set. Switching between responsive.rules basically runs chart.update under the hood.
-         * @param {Options} option A configuration object for the new chart options as defined in the options section of the API.
+         * @param option A configuration object for the new chart options as defined in the options section of the API.
          * @param [boolean] redraw Whether to redraw the chart. Defaults to true.
+         * @param [boolean] oneToOne When true, the series, xAxis and yAxis collections will be updated one to one, and
+         * items will be either added or removed to match the new updated options. Defaults to false.
          * @since 5.0.0
          */
-        update(options: Options, redraw?: boolean): void;
+        update(options: Options, redraw?: boolean, oneToOne?: boolean): void;
         /**
          * This method is deprecated as of 2.0.1. Updating the chart position after a move operation is no longer necessary.
          * @since 1.2.5
@@ -6416,36 +6410,32 @@ declare namespace Highcharts {
     interface Chart {
         /**
          * This is the constructor for creating a new chart object.
-         * @param  {Options} options The chart options
-         * @return {ChartObject}
+         * @param  options The chart options
          */
         new (options: Options): ChartObject;
         /**
          * This is the constructor for creating a new chart object.
-         * @param {Options} options The chart options
+         * @param options The chart options
          * @param callback A function to execute when the chart object is finished loading and rendering. In most cases the chart is built in one thread,
          * but in Internet Explorer version 8 or less the chart is sometimes initiated before the document is ready,
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * s a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
-         * @return {ChartObject}
          */
         new (options: Options, callback: (chart: ChartObject) => void): ChartObject;
         /**
          * This is the constructor for creating a new chart object.
-         * @param {string|HTMLElement} renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
-         * @param {Options} options The chart options
-         * @return {ChartObject}
+         * @param renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
+         * @param options The chart options
          */
         new (renderTo: string | HTMLElement, options: Options): ChartObject;
         /**
          * This is the constructor for creating a new chart object.
-         * @param {string|HTMLElement} renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
-         * @param {Options} options The chart options
+         * @param renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
+         * @param options The chart options
          * @param callback A function to execute when the chart object is finished loading and rendering. In most cases the chart is built in one thread,
          * but in Internet Explorer version 8 or less the chart is sometimes initiated before the document is ready,
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * As a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
-         * @return {ChartObject}
          */
         new (renderTo: string | HTMLElement, options: Options, callback: (chart: ChartObject) => void): ChartObject;
     }
@@ -6458,18 +6448,16 @@ declare namespace Highcharts {
     interface ElementObject {
         /**
          * Add the element to the renderer canvas.
-         * @param  {ElementObject} parent The element can be added to a g (group) element.
-         * @return {ElementObject}
+         * @param  parent The element can be added to a g (group) element.
          * @since 2.0
          */
         add(parent?: ElementObject): ElementObject;
         /**
          * Apply numeric attributes to the SVG/VML element by animation. See Element.attr() for more information on setting
          * attributes.
-         * @param  {any} attributes A set of attributes to apply.
-         * @param  {any} animation Optional animation parameters that are passed over to jQuery or other framework.
+         * @param  attributes A set of attributes to apply.
+         * @param  animation Optional animation parameters that are passed over to jQuery or other framework.
          * Valid properties depend on the library, but options like duration, easing and complete are supported by jQuery.
-         * @return {ElementObject}
          * @since 2.0
          */
         animate(attributes: any, animation?: any): ElementObject;
@@ -6481,15 +6469,13 @@ declare namespace Highcharts {
          * to position the element instead.
          *
          * Attributes frequently used in Highcharts are fill, stroke, stroke-width.
-         * @param  {any} hash A set of attributes to apply.
-         * @return {ElementObject}
+         * @param  hash A set of attributes to apply.
          * @since 2.0
          */
         attr(hash: any): ElementObject;
         /**
          * Apply some CSS properties to the element
-         * @param {Object} hash The object literal of CSS properties to apply. Properties should be hyphenated, not camelCased.
-         * @return {ElementObject}
+         * @param hash The object literal of CSS properties to apply. Properties should be hyphenated, not camelCased.
          * @since 2.0
          */
         css(hash: Object): ElementObject;
@@ -6507,15 +6493,14 @@ declare namespace Highcharts {
         getBBox(): { x: number; y: number; height: number; width: number; };
         /**
          * Apply an event handler to the element
-         * @param {string} eventType The event type to attach, for example 'click', 'mouseover', 'touch'.
+         * @param eventType The event type to attach, for example 'click', 'mouseover', 'touch'.
          * @param handler The event handler function.
-         * @return {ElementObject}
          * @since 2.0
          */
         on(eventType: string, handler: () => void): ElementObject;
         /**
          * Bring the element to the front. Alternatively, a zIndex attribute can be given.
-         * @return {ElementObject} The element object
+         * @return The element object
          * @since 2.0
          */
         toFront(): ElementObject;
@@ -6536,22 +6521,20 @@ declare namespace Highcharts {
     interface RendererObject {
         /**
          * Draw an arc on the renderer canvas.
-         * @param  {number} centerX The x position of the arc's center in the SVG element.
-         * @param  {number} centerY The y position of the arc's center in the SVG element.
-         * @param  {number} outerRadius The outer radius of the arc.
-         * @param  {number} innerRadius The inner radius of the arc.
-         * @param  {number} start The starting angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.
-         * @param  {number} end The ending angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.
-         * @return {ElementObject}
+         * @param  centerX The x position of the arc's center in the SVG element.
+         * @param  centerY The y position of the arc's center in the SVG element.
+         * @param  outerRadius The outer radius of the arc.
+         * @param  innerRadius The inner radius of the arc.
+         * @param  start The starting angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.
+         * @param  end The ending angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.
          * @since 2.0
          */
         arc(centerX: number, centerY: number, outerRadius: number, innerRadius: number, start: number, end: number): ElementObject;
         /**
          * Draw circle on the renderer canvas.
-         * @param  {number} centerX The x position of the circle's center in the SVG element.
-         * @param  {number} centerY The y position of the circle's center in the SVG element.
-         * @param  {number} radius  [description]
-         * @return {ElementObject}
+         * @param  centerX The x position of the circle's center in the SVG element.
+         * @param  centerY The y position of the circle's center in the SVG element.
+         * @param  radius  [description]
          * @since 2.0
          */
         circle(centerX: number, centerY: number, radius: number): ElementObject;
@@ -6559,7 +6542,7 @@ declare namespace Highcharts {
          * Styled mode only. A hook for adding general definitions to the SVG's defs tag. Definitions can be referenced from
          * the CSS by its id. Read more in Gradients, shadows and patterns.
          * The definitions can also be added as configuration options, see defs.
-         * @param {def} A serialized form of an SVG definition, including children.
+         * @param A serialized form of an SVG definition, including children.
          * @since 5.0.0
          */
         definition(def: object): ElementObject;
@@ -6567,18 +6550,16 @@ declare namespace Highcharts {
          * Add an SVG/VML group.
          * @param [string] name The name of the group. This will be used in the class name, which will be 'highcharts-'+ name.
          * Other Element objects are added to the group by using the group as the first parameter in .add() for the wrappers
-         * @return {ElementObject}
          * @since 2.0
          */
         g(name?: string): ElementObject;
         /**
          * Add an image from an external resource.
-         * @param  {string} source The URL of the image.
-         * @param  {number} x      The x position of the image's upper left corner.
-         * @param  {number} y      The y position of the image's upper left corner.
-         * @param  {number} width  The width of the image.
-         * @param  {number} height The height of the image.
-         * @return {ElementObject}
+         * @param  source The URL of the image.
+         * @param  x      The x position of the image's upper left corner.
+         * @param  y      The y position of the image's upper left corner.
+         * @param  width  The width of the image.
+         * @param  height The height of the image.
          * @since 2.0
          */
         image(source: string, x: number, y: number, width: number, height: number): ElementObject;
@@ -6587,9 +6568,9 @@ declare namespace Highcharts {
          * element with a text and a path or rect inside, to make it behave somewhat like a HTML div. Border and background
          * are set through stroke, stroke-width and fill attributes using the attr method. This must be done before calling
          * add.
-         * @param  {string} str The text or HTML to draw
-         * @param  {number} x The x position of the label's left side.
-         * @param  {number} y The y position of the label's top side or baseline, depending on the baseline parameter.
+         * @param  str The text or HTML to draw
+         * @param  x The x position of the label's left side.
+         * @param  y The y position of the label's top side or baseline, depending on the baseline parameter.
          * @param  [string] shape The shape of the label's border/background, if any. Defaults to rect.
          * @param  [number] anchorX If the shape has a pointer, like the chevron on a callout shape, anchorX is the x position to point to.
          * @param  [number] anchorY If the shape has a pointer, like the chevron on a callout shape, anchorY is the y position to point to.
@@ -6597,35 +6578,31 @@ declare namespace Highcharts {
          * @param  [boolean] baseline Whether the label should be vertically aligned by the text baseline, which makes it behave like the text element,
          * or by the top left side, which makes it behave like a HTML div.
          * @param  [string] className A class name for the g element surrounding the label.
-         * @return {ElementObject}
          * @since 2.0
          */
         label(str: string, x: number, y: number, shape?: string, anchorX?: number, anchorY?: number, useHTML?: boolean, baseline?: boolean, className?: string): ElementObject;
         /**
          * Add a path based on SVG's path commands. In SVG capable browsers all path commands are supported, but in VML only
          * a subset is supported: absolute moveTo (M), absolute lineTo (L), absolute curveTo (C) and close (Z).
-         * @param  {(string|number)[]} path An SVG path split up in array form.
-         * @return {ElementObject}
+         * @param  path An SVG path split up in array form.
          */
-        path(path: [string | number]): ElementObject;
+        path(path: Array<string | number>): ElementObject;
         /**
          * Add a rectangle.
-         * @param  {number} x The x position of the rectangle's upper left corner.
-         * @param  {number} y The y position of the rectangle's upper left corner.
-         * @param  {number} width The width of the rectangle.
-         * @param  {number} height The height of the rectangle.
-         * @param  {number} cornerRadius The corner radius of all the rectangle's corners.
-         * @return {ElementObject}
+         * @param  x The x position of the rectangle's upper left corner.
+         * @param  y The y position of the rectangle's upper left corner.
+         * @param  width The width of the rectangle.
+         * @param  height The height of the rectangle.
+         * @param  cornerRadius The corner radius of all the rectangle's corners.
          * @since 2.0
          */
         rect(x: number, y: number, width: number, height: number, cornerRadius: number): ElementObject;
         /**
          * Draw text. The text can contain a subset of HTML, like spans and anchors and some basic text styling of these.
          * For more advanced features like border and background, use label instead.
-         * @param  {string} str The text or HTML to draw
-         * @param  {number} x The x position of the text's lower left corner.
-         * @param  {number} y The y position of the text's lower left corner.
-         * @return {ElementObject}
+         * @param  str The text or HTML to draw
+         * @param  x The x position of the text's lower left corner.
+         * @param  y The y position of the text's lower left corner.
          * @since 2.0
          */
         text(str: string, x: number, y: number): ElementObject;
@@ -6660,10 +6637,9 @@ declare namespace Highcharts {
          * Formats a JavaScript date timestamp (milliseconds since Jan 1st 1970) into a human readable date string. The
          * format is a subset of the formats for PHP's strftime function. Additional formats can be given in the
          * Highcharts.dateFormats hook, see below.
-         * @param  {string} format A string containing some of the formats.
+         * @param  format A string containing some of the formats.
          * @param  [number] time The JavaScript time to format.
          * @param  [boolean] capitalize Whether to capitalize words in the return string.
-         * @return {string}
          */
         dateFormat(format: string, time?: number, capitalize?: boolean): string;
         /**
@@ -6675,27 +6651,25 @@ declare namespace Highcharts {
         /**
          * The error handler function. By default is provides error messages for debugging, with links to the descriptions on Highcharts website.
          * This function can be redefined to catch errors in client applications.
-         * @param {code} Number|String The error code. If this is a number, the default error function prints a link to a human readable error code
+         * @param Number|String The error code. If this is a number, the default error function prints a link to a human readable error code
          * description according to error definition file. If it's a string, the description is printed in the console.
-         * @param {fatal} Whether the error should stop execution.
+         * @param Whether the error should stop execution.
          * @since 5.0.6
          */
         error(code: number | string, fatal: boolean): Function;
         /**
          * Formats a JavaScript number with grouped thousands, a fixed amount of decimals and an optional decimal point. It
          * is a port of PHP's function with the same name. See PHP number_format for a full explanation of the parameters.
-         * @param  {number} value        The raw number to format.
-         * @param  {number} decimals     The desired number of decimals.
-         * @param  {string} decimalPoint The decimal point. Defaults to '.' or to the string specified globally in options.lang.decimalPoint.
-         * @param  {string} thousandsSep The thousands separator. Defaults to ' ' or to the string specified globally in options.lang.thousandsSep.
-         * @return {string}
+         * @param  value        The raw number to format.
+         * @param  decimals     The desired number of decimals.
+         * @param  decimalPoint The decimal point. Defaults to '.' or to the string specified globally in options.lang.decimalPoint.
+         * @param  thousandsSep The thousands separator. Defaults to ' ' or to the string specified globally in options.lang.thousandsSep.
          */
         numberFormat(value: number, decimals?: number, decimalPoint?: string, thousandsSep?: string): string;
         /**
          * Sets the options globally for all charts created after this has been called. Takes an options JavaScript object
          * structure as the argument. These options are merged with the default options and the result is returned.
          * @param options The chart configuration object.
-         * @return {Options}
          */
         setOptions(options: GlobalOptions): Options;
         /**
@@ -6774,12 +6748,12 @@ declare namespace Highcharts {
         total: number;
         /**
          * Update the point with new values.
-         * @param {number|[number,number]|DataPoint} options The point options. Point options are handled as described under the series<type>.data item for each series type.
+         * @param options The point options. Point options are handled as described under the series<type>.data item for each series type.
          * For example for a line series, if options is a single number, the point will be given that number as the main y value. If it is an array,
          * it will be interpreted as x and y values respectively. If it is an object, advanced options are applied.
          * @param [boolean] redraw Defaults to true. Whether to redraw the chart after the point is updated.If doing more operations on the chart,
          * it is a good idea to set redraw to false and call chart.redraw() after.
-         * @param {boolean|Animation} animation Defaults to true. When true, the update will be animated with default animation options.
+         * @param animation Defaults to true. When true, the update will be animated with default animation options.
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
@@ -6814,7 +6788,7 @@ declare namespace Highcharts {
         /**
          * Add a point to the series after render time. The point can be added at the end, or by giving it an X value, to
          * the start or in the middle of the series.
-         * @param {number|[number,number]|DataPoint} The point options. If options is a single number, a point with that y value is appended to the series.
+         * @param The point options. If options is a single number, a point with that y value is appended to the series.
          * If it is an array, it will be interpreted as x and y values respectively. If it is an object, advanced options as outlined under series.data are applied.
          * @param [boolean=true] redraw - Whether to redraw the chart after the point is added. When adding more than one point,
          * it is highly recommended that the redraw option be set to false, and instead chart.redraw() is explicitly called after the adding of points is finished.
@@ -6861,7 +6835,7 @@ declare namespace Highcharts {
         /**
          * Remove a point from the series. Unlike the Point.remove method, this can also be done on a point that is not
          * instanciated because it is outside the view or subject to data grouping.
-         * @param {number} index - The index of the point in the data array.
+         * @param index - The index of the point in the data array.
          * @param [boolean=true] redraw - Whether to redraw the chart after the point is added. When adding more than one point,
          * it is highly recommended that the redraw option be set to false, and instead chart.redraw() is explicitly called after the adding of points is finished.
          * @param [boolean|Animation=true] animation - When true, the graph will be animated with default animation options.
@@ -6884,7 +6858,7 @@ declare namespace Highcharts {
         /**
          * Apply a new set of data to the series and optionally redraw it. Note that this method throws away all points and
          * creates new ones. For updating the values of existing points, use Point.update() instead.
-         * @param {number[]|number[][]|DataPoint[]} data - Takes an array of data in the same format as described under series<type>data for the given series type.
+         * @param data - Takes an array of data in the same format as described under series<type>data for the given series type.
          * @param [boolean=true] redraw - Whether to redraw the chart after the series is altered.If doing more operations on the chart,
          * it is a good idea to set redraw to false and call chart.redraw() after.
          * @param [boolean|Animation] animation - When the updated data is the same length as the existing data, points will be updated by default,
@@ -6916,7 +6890,7 @@ declare namespace Highcharts {
          * Update the series with a new set of options. For a clean and precise handling of new options, all methods and
          * elements from the series is removed, and it is initiated from scratch. Therefore, this method is more performance
          * expensive than some other utility methods like setData or setVisible.
-         * @param {IndividualSeriesOptions} options New options that will be merged into the series' existing options.
+         * @param options New options that will be merged into the series' existing options.
          * @param [boolean] redraw - Whether to redraw the chart after the series is altered. If doing more operations on the chart,
          * it is a good idea to set redraw to false and call chart.redraw() after.
          * @since 1.2.0
@@ -6942,7 +6916,7 @@ declare namespace Highcharts {
     interface LegendObject {
         /**
          * Update the legend with new options.
-         * @param {LegendOptions} options New options that will be merged into the legend's existing options.
+         * @param options New options that will be merged into the legend's existing options.
          * @param [boolean] redraw - Whether to redraw the chart. Defaults to true.
          * @since 5.0.0
          */
@@ -6956,14 +6930,14 @@ declare global {
         /**
          * Creates a new Highcharts.Chart for the current JQuery selector; usually
          * a div selected by $('#container')
-         * @param {Options} options Options for this chart
+         * @param options Options for this chart
          * @return current {JQuery} selector the current JQuery selector
          */
         highcharts(options: Highcharts.Options): JQuery;
         /**
          * Creates a new Highcharts.Chart for the current JQuery selector; usually
          * a div selected by $('#container')
-         * @param {Options} options Options for this chart
+         * @param options Options for this chart
          * @param callback Callback function used to manipulate the constructed chart instance
          * @return current {JQuery} selector the current JQuery selector
          */
diff --git a/types/highcharts/modules/no-data-to-display.d.ts b/types/highcharts/modules/no-data-to-display.d.ts
index a842eee5f0..f79ce249d1 100644
--- a/types/highcharts/modules/no-data-to-display.d.ts
+++ b/types/highcharts/modules/no-data-to-display.d.ts
@@ -9,7 +9,7 @@ declare module "highcharts" {
     interface ChartObject {
         /**
          * Returns true if there are data points within the plot area now
-         * @return {boolean} If chart has any data.
+         * @return If chart has any data.
          * @since 3.0.8
          */
         hasData(): boolean;
@@ -22,7 +22,7 @@ declare module "highcharts" {
 
         /**
          * Display a no-data message.
-         * @param {String} message An optional message to show in place of the default one
+         * @param message An optional message to show in place of the default one
          * @since 3.0.8
          */
         showNoData(message?: string): void;
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index a004778ed9..ad026a1e52 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -1345,11 +1345,11 @@ function test_BoxPlot() {
         series: [{
             name: 'Observations',
             data: [
-                [760, 801, 848, 895, 965],
-                [733, 853, 939, 980, 1080],
-                [714, 762, 817, 870, 918],
-                [724, 802, 806, 871, 950],
-                [834, 836, 864, 882, 910]
+                760, 801, 848, 895, 965,
+                733, 853, 939, 980, 1080,
+                714, 762, 817, 870, 918,
+                724, 802, 806, 871, 950,
+                834, 836, 864, 882, 910
             ]
         }]
     });
@@ -2247,7 +2247,7 @@ function test_AxisOptions() {
             distance: 10,
             enabled: true,
             format: "format",
-            formatter() { return this.value; },
+            formatter() { return String(this.value); },
             maxStaggerLines: 5,
             overflow: false,
             padding: 10,
@@ -2448,6 +2448,9 @@ function test_ChartObject() {
     const firstXAxis = chart.xAxis[0];
     const firstYAxis = chart.yAxis[0];
     const legend = chart.legend;
+    chart.update(<Highcharts.Options> {});
+    chart.update(<Highcharts.Options> {}, true);
+    chart.update(<Highcharts.Options> {}, true, true);
 }
 
 function test_ElementObject() {
@@ -2707,8 +2710,7 @@ function test_SoftMinSoftMax() {
         }]
     });
 
-    let toggle = false;
-    chart.series[0].data[11].update((toggle = (!toggle)) ? 120 : 54);
+    chart.series[0].data[11].update(120);
 }
 
 function test_StyledColorZones() {
diff --git a/types/highland/highland-tests.ts b/types/highland/highland-tests.ts
index 2e4d4eca33..e97c5c9416 100644
--- a/types/highland/highland-tests.ts
+++ b/types/highland/highland-tests.ts
@@ -289,7 +289,7 @@ barStream = fooStream.flatten<Bar>();
 
 fooStream = fooStream.fork();
 
-fooStream = fooStream.merge(fooStreamStream);
+fooStream = _<Foo>([fooStream, fooStream]).merge();
 
 fooStream = fooStream.observe();
 
diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index 79282adca3..3a2116a4d8 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -3,7 +3,9 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Hugo Wood <https://github.com/hgwood>
 //                 William Yu <https://github.com/iwllyu>
+//                 Alvis HT Tang <https://github.com/alvis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
@@ -71,8 +73,9 @@ interface HighlandStatic {
 	 * @api public
 	 */
 	<R>(): Highland.Stream<R>;
+  <R>(xs: Highland.Stream<R>[]): Highland.Stream<R>;
 	<R>(xs: R[]): Highland.Stream<R>;
-	<R>(xs: (push: (err: Error, x?: R) => void, next: () => void) => void): Highland.Stream<R>;
+	<R>(xs: (push: (err: Error | null, x?: R) => void, next: () => void) => void): Highland.Stream<R>;
 
 	<R>(xs: Highland.Stream<R>): Highland.Stream<R>;
 	<R>(xs: NodeJS.ReadableStream): Highland.Stream<R>;
@@ -85,7 +88,7 @@ interface HighlandStatic {
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	// UTILS
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	
+
 	/**
 	 * Returns true if `x` is a Highland Stream.
 	 *
@@ -335,7 +338,7 @@ interface HighlandStatic {
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	// OPERATORS
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	
+
 	/**
 	 * Add two values. Can be partially applied.
 	 *
@@ -435,7 +438,7 @@ declare namespace Highland {
 		 * @api public
 		 */
 		end(): void;
-		
+
 		/**
 		 * Pauses the stream. All Highland Streams start in the paused state.
 		 *
@@ -477,7 +480,7 @@ declare namespace Highland {
 		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 		// TRANSFORMS
 		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-		
+
 		/**
 		 * Adds a value to the end of a Stream.
 		 *
@@ -501,7 +504,7 @@ declare namespace Highland {
 		 * _([1, 2, 3, 4, 5]).batch(2)  // => [1, 2], [3, 4], [5]
 		 */
 		batch(n: number): Stream<R[]>;
-		
+
 		/**
 		 * Takes one Stream and batches incoming data within a maximum time frame
 		 * into arrays of a maximum length.
@@ -560,7 +563,7 @@ declare namespace Highland {
 		 * @param {Function} f - the function to handle errors and values
 		 * @api public
 		 */
-		consume<U>(f: (err: Error, x: R, push: (err: Error, value?: U) => void, next: () => void) => void): Stream<U>;
+		consume<U>(f: (err: Error, x: R, push: (err: Error | null, value?: U) => void, next: () => void) => void): Stream<U>;
 
 		/**
 		 * Holds off pushing data events downstream until there has been no more
@@ -625,7 +628,7 @@ declare namespace Highland {
 		 * @param {Function} f - the function to pass all errors to
 		 * @api public
 		 */
-		errors(f: (err: Error, push: (err: Error, x?: R) => void) => void): Stream<R>;
+		errors(f: (err: Error, push: (err: Error | null, x?: R) => void) => void): Stream<R>;
 
 		/**
 		 * Creates a new Stream including only the values which pass a truth test.
@@ -903,6 +906,28 @@ declare namespace Highland {
 		 */
 		throttle(ms: number): Stream<R>;
 
+    /**
+     * Filters out all duplicate values from the stream and keeps only the first
+     * occurence of each value, using === to define equality.
+     *
+     * @id uniq
+     * @section Streams
+     * @name Stream.uniq()
+     * @api public
+     */
+    uniq(): Stream<R>;
+
+    /**
+     * Filters out all duplicate values from the stream and keeps only the first
+     * occurence of each value, using the provided function to define equality.
+     *
+     * @id uniqBy
+     * @section Streams
+     * @name Stream.uniqBy()
+     * @api public
+     */
+    uniqBy(f: (a: R, b: R) => boolean): Stream<R>;
+
 		/**
 		 * A convenient form of filter, which returns all objects from a Stream
 		 * match a set of property values.
@@ -1012,7 +1037,7 @@ declare namespace Highland {
 		 * _([txt, md]).merge();
 		 * // => contents of foo.txt, bar.txt and baz.txt in the order they were read
 		 */
-		merge (ys: Stream<Stream<R>>): Stream<R>;
+	  merge(): Stream<R>;
 
 		/**
 		 * Observes a stream, allowing you to handle values as they are emitted, without
@@ -1207,7 +1232,7 @@ declare namespace Highland {
 		 * @param {Function} f - the iterator function
 		 * @api public
 		 */
-		each(f: (x: R) => void): void;
+		each(f: (x: R) => void): Pick<Stream<R>, 'done'>;
 
 		/**
 		 * Pipes a Highland Stream to a [Node Writable Stream](http://nodejs.org/api/stream.html#stream_class_stream_writable)
@@ -1243,7 +1268,7 @@ declare namespace Highland {
 		 * @api public
 		 */
 		pull(f: (err: Error, x: R) => void): void;
-		
+
 		/**
 		 * Collects all values from a Stream into an Array and calls a function with
 		 * once with the result. This function causes a **thunk**.
@@ -1282,6 +1307,29 @@ declare namespace Highland {
 		 * });
 		 */
 		toCallback(cb: (err?: Error, x?: R) => void): void;
+
+    /**
+     * Converts the result of a stream to Promise.
+     *
+     * If the stream contains a single value, it will return
+     * with the single item emitted by the stream (if present).
+     * If the stream is empty, `undefined` will be returned.
+     * If an error is encountered in the stream, this function will stop
+     * consumption and call `cb` with the error.
+     * If the stream contains more than one item, it will stop consumption
+     * and reject with an error.
+     *
+     * @id toPromise
+     * @section Consumption
+     * @name Stream.toPromise(PromiseCtor)
+     * @param {Function} PromiseCtor - Promises/A+ compliant constructor
+     * @api public
+     *
+     * _([1, 2, 3, 4]).collect().toPromise(Promise).then(function (result) {
+     *     // parameter result will be [1,2,3,4]
+     * });
+     */
+    toPromise(promiseConstructor: PromiseConstructor): PromiseLike<R>;
 	}
 
 	interface PipeableStream<T, R> extends Stream<R> {}
diff --git a/types/highland/tslint.json b/types/highland/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/highland/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/highlight.js/index.d.ts b/types/highlight.js/index.d.ts
index 7ae5d613fe..f96be1c06f 100644
--- a/types/highlight.js/index.d.ts
+++ b/types/highlight.js/index.d.ts
@@ -1,15 +1,19 @@
-// Type definitions for highlight.js v9.1.0
+// Type definitions for highlight.js v9.12
 // Project: https://github.com/isagalaev/highlight.js
-// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>, Jeremy Hull <https://github.com/sourrust>
+// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
+//                 Jeremy Hull <https://github.com/sourrust>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace hljs
 {
+	interface Node { }
+
 	export function highlight(
 		name: string,
 		value: string,
 		ignore_illegals?: boolean,
-		continuation?: boolean) : IHighlightResult;
+		continuation?: ICompiledMode) : IHighlightResult;
 	export function highlightAuto(
 		value: string,
 		languageSubset?: string[]) : IAutoHighlightResult;
@@ -154,6 +158,6 @@ declare namespace hljs
 	}
 }
 
-declare module 'highlight.js' {
-	export = hljs;
-}
\ No newline at end of file
+
+export = hljs;
+export as namespace hljs;
diff --git a/types/highlight.js/tsconfig.json b/types/highlight.js/tsconfig.json
index 5f5d2ae011..e3627e99ca 100644
--- a/types/highlight.js/tsconfig.json
+++ b/types/highlight.js/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/highlight.js/tslint.json b/types/highlight.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/highlight.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/highlight.js/v7/tslint.json b/types/highlight.js/v7/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/highlight.js/v7/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/history.js/tslint.json b/types/history.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/history.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/history/index.d.ts b/types/history/index.d.ts
index a7f93bba86..eb15aaa0fc 100644
--- a/types/history/index.d.ts
+++ b/types/history/index.d.ts
@@ -18,7 +18,7 @@ export interface History {
     go(n: number): void;
     goBack(): void;
     goForward(): void;
-    block(prompt?: boolean): UnregisterCallback;
+    block(prompt?: boolean | string | TransitionPromptHook): UnregisterCallback;
     listen(listener: LocationListener): UnregisterCallback;
     createHref(location: LocationDescriptorObject): Href;
 }
@@ -28,7 +28,7 @@ export interface Location {
     search: Search;
     state: LocationState;
     hash: Hash;
-    key: LocationKey;
+    key?: LocationKey;
 }
 
 export interface LocationDescriptorObject {
@@ -48,6 +48,7 @@ export namespace History {
     export type Pathname = string;
     export type Search = string;
     export type TransitionHook = (location: Location, callback: (result: any) => void) => any;
+    export type TransitionPromptHook = (location: Location, action: Action) => string | false | void;
     export type Hash = string;
     export type Href = string;
 }
@@ -60,6 +61,7 @@ export type Path = History.Path;
 export type Pathname = History.Pathname;
 export type Search = History.Search;
 export type TransitionHook = History.TransitionHook;
+export type TransitionPromptHook = History.TransitionPromptHook;
 export type Hash = History.Hash;
 export type Href = History.Href;
 
diff --git a/types/history/tslint.json b/types/history/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/history/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/history/v2/tslint.json b/types/history/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/history/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/history/v3/tslint.json b/types/history/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/history/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index f496f2d165..ea26719b22 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for hls.js 0.7
+// Type definitions for hls.js 0.8
 // Project: https://github.com/video-dev/hls.js
 // Definitions by: John G. Gainfort, Jr. <https://github.com/jgainfort>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -467,18 +467,6 @@ declare namespace Hls {
   const version: string;
 
   interface Config {
-    /**
-     * (default: true)
-     * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
-     * if set to false, an explicit API call (hls.startLoad(startPosition=-1)) will be needed to start quality level/fragment loading.
-     */
-    autoStartLoad: boolean;
-    /**
-     * (default -1)
-     * if set to -1, playback will start from initialTime=0 for VoD and according to liveSyncDuration/liveSyncDurationCount config params for Live
-     * otherwise, playback will start from predefined value. (unless stated otherwise in autoStartLoad=false mode : in that case startPosition can be overrided using hls.startLoad(startPosition)).
-     */
-    startPosition: number;
     /**
      * (default: false)
      * if set to true, the adaptive algorithm with limit levels usable in auto-quality by the HTML video element dimensions (width and height)
@@ -491,6 +479,18 @@ declare namespace Hls {
      * a logger object could also be provided for custom logging: config.debug = customLogger;
      */
     debug: boolean;
+    /**
+     * (default: true)
+     * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
+     * if set to false, an explicit API call (hls.startLoad(startPosition=-1)) will be needed to start quality level/fragment loading.
+     */
+    autoStartLoad: boolean;
+    /**
+     * (default -1)
+     * if set to -1, playback will start from initialTime=0 for VoD and according to liveSyncDuration/liveSyncDurationCount config params for Live
+     * otherwise, playback will start from predefined value. (unless stated otherwise in autoStartLoad=false mode : in that case startPosition can be overrided using hls.startLoad(startPosition)).
+     */
+    startPosition: number;
     /**
      * (default: undefined)
      * if audio codec is not signaled in variant manifest, or if only a stream manifest is provided, hls.js tries to guess audio codec by parsing audio sampling rate in ADTS header.
@@ -534,6 +534,13 @@ declare namespace Hls {
      * This could result in small overlapping or hole in media buffer. This tolerance factor helps cope with this.
      */
     maxBufferHole: number;
+    /**
+     * (default: 2s)
+     * In case playback is stalled, and a buffered range is available upfront, less than maxSeekHole seconds from current media position,
+     * hls.js will jump over this buffer hole to reach the beginning of this following buffered range.
+     * maxSeekHole allows to configure this jumpable threshold.
+     */
+    maxSeekHole: number;
     /**
      * (default: 4s)
      *
@@ -544,12 +551,20 @@ declare namespace Hls {
      */
     maxStarvationDelay: number;
     /**
-     * (default: 2s)
-     * In case playback is stalled, and a buffered range is available upfront, less than maxSeekHole seconds from current media position,
-     * hls.js will jump over this buffer hole to reach the beginning of this following buffered range.
-     * maxSeekHole allows to configure this jumpable threshold.
+     * (default 0.2s)
+     * This tolerance factor is used during fragment lookup.
+     * Instead of checking whether buffered.end is located within [start, end] range, frag lookup will be done by checking within [start-maxFragLookUpTolerance, end-maxFragLookUpTolerance] range.
+     * This tolerance factor is used to cope with situations like:
+     *      buffered.end = 9.991
+     *      frag[0] : [0,10]
+     *      frag[1] : [10,20]
+     *      buffered.end is within frag[0] range, but as we are close to frag[1], frag[1] should be choosen instead
+     * If maxFragLookUpTolerance = 0.2, this lookup will be adjusted to
+     *      frag[0] : [-0.2,9.8]
+     *      frag[1] : [9.8,19.8]
+     *  This time, buffered.end is within frag[1] range, and frag[1] will be the next fragment to be loaded, as expected
      */
-    maxSeekHole: number;
+    maxLoadingDelay: number;
     /**
      * (default: 0.5s)
      * media element is expected to play and if currentTime has not moved for more than lowBufferWatchdogPeriod and if there are less than maxBufferHole seconds buffered upfront,
@@ -574,21 +589,6 @@ declare namespace Hls {
      * media.currentTime += (nb nudge retry -1)*nudgeOffset
      */
     nudgeMaxRetry: number;
-    /**
-     * (default 0.2s)
-     * This tolerance factor is used during fragment lookup.
-     * Instead of checking whether buffered.end is located within [start, end] range, frag lookup will be done by checking within [start-maxFragLookUpTolerance, end-maxFragLookUpTolerance] range.
-     * This tolerance factor is used to cope with situations like:
-     *      buffered.end = 9.991
-     *      frag[0] : [0,10]
-     *      frag[1] : [10,20]
-     *      buffered.end is within frag[0] range, but as we are close to frag[1], frag[1] should be choosen instead
-     * If maxFragLookUpTolerance = 0.2, this lookup will be adjusted to
-     *      frag[0] : [-0.2,9.8]
-     *      frag[1] : [9.8,19.8]
-     *  This time, buffered.end is within frag[1] range, and frag[1] will be the next fragment to be loaded, as expected
-     */
-    maxLoadingDelay: number;
     /**
      * (default 4s)
      *
@@ -603,6 +603,13 @@ declare namespace Hls {
      * Decreasing this value is likely to cause playback stalls.
      */
     liveSyncDurationCount: number;
+    /**
+     * (default: Infinity)
+     * maximum delay allowed from edge of live, expressed in multiple of EXT-X-TARGETDURATION.
+     * If set to 10, the player will seek back to liveSyncDurationCount whenever the next fragment to be loaded is older than N-10, N being the last fragment of the live playlist.
+     * If set, this value must be stricly superior to liveSyncDurationCount a value too close from liveSyncDurationCount is likely to cause playback stalls.
+     */
+    liveMaxLatencyDurationCount: number;
     /**
      * (default: undefined)
      * Alternative parameter to liveSyncDurationCount, expressed in seconds vs number of segments.
@@ -611,13 +618,6 @@ declare namespace Hls {
      * A value too low (inferior to ~3 segment durations) is likely to cause playback stalls.
      */
     liveSyncDuration: number;
-    /**
-     * (default: Infinity)
-     * maximum delay allowed from edge of live, expressed in multiple of EXT-X-TARGETDURATION.
-     * If set to 10, the player will seek back to liveSyncDurationCount whenever the next fragment to be loaded is older than N-10, N being the last fragment of the live playlist.
-     * If set, this value must be stricly superior to liveSyncDurationCount a value too close from liveSyncDurationCount is likely to cause playback stalls.
-     */
-    liveMaxLatencyDurationCount: number;
     /**
      * (default: undefined)
      * Alternative parameter to liveMaxLatencyDurationCount, expressed in seconds vs number of segments.
@@ -627,6 +627,13 @@ declare namespace Hls {
      * A value too close from liveSyncDuration is likely to cause playback stalls.
      */
     liveMaxLatencyDuration: number;
+    /**
+     * (default: false)
+     * Override current Media Source duration to Infinity for a live broadcast. Useful, if you are building a player which relies
+     * on native UI capabilities in modern browsers. If you want to have a native Live UI in environments like iOS Safari, Safari,
+     * Android Google Chrome, etc. set this value to true.
+     */
+    liveDurationInfinity: boolean;
     /**
      * (default: true)
      * Enable WebWorker (if available on browser) for TS demuxing/MP4 remuxing, to improve performance and avoid lag/frame drops.
@@ -657,7 +664,8 @@ declare namespace Hls {
     /**
      * (default: 1000 ms)
      * Initial delay between XMLHttpRequest error and first load retry (in ms).
-     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ...
+     * capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
      * Prefetch start fragment although media not attached.
      */
     manifestLoadingRetryDelay: number;
@@ -680,7 +688,8 @@ declare namespace Hls {
     /**
      * (default: 1000 ms)
      * Initial delay between XMLHttpRequest error and first load retry (in ms).
-     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ...
+     * capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
      * Prefetch start fragment although media not attached.
      */
     levelLoadingRetryDelay: number;
@@ -703,7 +712,8 @@ declare namespace Hls {
     /**
      * (default: 1000 ms)
      * Initial delay between XMLHttpRequest error and first load retry (in ms).
-     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ...
+     * capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
      * Prefetch start fragment although media not attached.
      */
     fragLoadingRetryDelay: number;
@@ -772,6 +782,11 @@ declare namespace Hls {
      * destroy() : should clean-up all used resources
      */
     timelineController: TimelineController;
+    /**
+     * (default: true)
+     * Whether or not to enable WebVTT captions on HLS
+     */
+    enableWebVTT?: boolean;
     /**
      * (default: true)
      * whether or not to enable CEA-708 captions
@@ -803,11 +818,26 @@ declare namespace Hls {
      * This helps playback continue in certain cases that might otherwise get stuck.
      */
     stretchShortVideoTrack: boolean;
+    /**
+     * (default: 1)
+     * Browsers are really strict about audio frames timings. They usually play audio frames one after the other, regardless of
+     * the timestamps advertised in the fmp4. If audio timestamps are not consistent (consecutive audio frames too close or too far
+     * from each other), audio will easily drift. hls.js is restamping audio frames so that the distance between consecutive audio
+     * frame remains constant. If the distance is larger than the max allowed drift, hls.js will either
+     *     * drop the next audio frame if distance is too small (if next audio frame timestamp is smaller than expected
+     *       timestamp - max allowed drifter)
+     *     * insert silent frames if distance is too big (next audio frame timestamp is bigger than expected
+     *       timestamp + max allowed drift)
+     * Parameter should be an integer representing the max number of audio frames allowed to drifter. Keep in mind that one
+     * audio frame is 1024 audio samples (if using AAC), at 44.1 kHz, it gives 1024/44100 = 23ms.
+     */
+    maxAudioFramesDrift: number;
     /**
      * (default: true)
      * Whether or not to force having a key frame in the first AVC sample after a discontinuity.
      * If set to true, after a discontinuity, the AVC samples without any key frame will be dropped until finding one that contains a key frame.
-     * If set to false, all AVC samples will be kept, which can help avoid holes in the stream. Setting this parameter to false can also generate decoding weirdness when switching level or seeking.
+     * If set to false, all AVC samples will be kept, which can help avoid holes in the stream.
+     * Setting this parameter to false can also generate decoding weirdness when switching level or seeking.
      */
     forceKeyFrameOnDiscontinuity: boolean;
     /**
@@ -871,18 +901,6 @@ declare namespace Hls {
   }
 
   interface OptionalConfig {
-    /**
-     * (default: true)
-     * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
-     * if set to false, an explicit API call (hls.startLoad(startPosition=-1)) will be needed to start quality level/fragment loading.
-     */
-    autoStartLoad?: boolean;
-    /**
-     * (default -1)
-     * if set to -1, playback will start from initialTime=0 for VoD and according to liveSyncDuration/liveSyncDurationCount config params for Live
-     * otherwise, playback will start from predefined value. (unless stated otherwise in autoStartLoad=false mode : in that case startPosition can be overrided using hls.startLoad(startPosition)).
-     */
-    startPosition?: number;
     /**
      * (default: false)
      * if set to true, the adaptive algorithm with limit levels usable in auto-quality by the HTML video element dimensions (width and height)
@@ -895,6 +913,18 @@ declare namespace Hls {
      * a logger object could also be provided for custom logging: config.debug = customLogger;
      */
     debug?: boolean;
+    /**
+     * (default: true)
+     * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
+     * if set to false, an explicit API call (hls.startLoad(startPosition=-1)) will be needed to start quality level/fragment loading.
+     */
+    autoStartLoad?: boolean;
+    /**
+     * (default -1)
+     * if set to -1, playback will start from initialTime=0 for VoD and according to liveSyncDuration/liveSyncDurationCount config params for Live
+     * otherwise, playback will start from predefined value. (unless stated otherwise in autoStartLoad=false mode : in that case startPosition can be overrided using hls.startLoad(startPosition)).
+     */
+    startPosition?: number;
     /**
      * (default: undefined)
      * if audio codec is not signaled in variant manifest, or if only a stream manifest is provided, hls.js tries to guess audio codec by parsing audio sampling rate in ADTS header.
@@ -938,6 +968,13 @@ declare namespace Hls {
      * This could result in small overlapping or hole in media buffer. This tolerance factor helps cope with this.
      */
     maxBufferHole?: number;
+    /**
+     * (default: 2s)
+     * In case playback is stalled, and a buffered range is available upfront, less than maxSeekHole seconds from current media position,
+     * hls.js will jump over this buffer hole to reach the beginning of this following buffered range.
+     * maxSeekHole allows to configure this jumpable threshold.
+     */
+    maxSeekHole?: number;
     /**
      * (default: 4s)
      *
@@ -948,12 +985,20 @@ declare namespace Hls {
      */
     maxStarvationDelay?: number;
     /**
-     * (default: 2s)
-     * In case playback is stalled, and a buffered range is available upfront, less than maxSeekHole seconds from current media position,
-     * hls.js will jump over this buffer hole to reach the beginning of this following buffered range.
-     * maxSeekHole allows to configure this jumpable threshold.
+     * (default 0.2s)
+     * This tolerance factor is used during fragment lookup.
+     * Instead of checking whether buffered.end is located within [start, end] range, frag lookup will be done by checking within [start-maxFragLookUpTolerance, end-maxFragLookUpTolerance] range.
+     * This tolerance factor is used to cope with situations like:
+     *      buffered.end = 9.991
+     *      frag[0] : [0,10]
+     *      frag[1] : [10,20]
+     *      buffered.end is within frag[0] range, but as we are close to frag[1], frag[1] should be choosen instead
+     * If maxFragLookUpTolerance = 0.2, this lookup will be adjusted to
+     *      frag[0] : [-0.2,9.8]
+     *      frag[1] : [9.8,19.8]
+     *  This time, buffered.end is within frag[1] range, and frag[1] will be the next fragment to be loaded, as expected
      */
-    maxSeekHole?: number;
+    maxLoadingDelay?: number;
     /**
      * (default: 0.5s)
      * media element is expected to play and if currentTime has not moved for more than lowBufferWatchdogPeriod and if there are less than maxBufferHole seconds buffered upfront,
@@ -978,21 +1023,6 @@ declare namespace Hls {
      * media.currentTime += (nb nudge retry -1)*nudgeOffset
      */
     nudgeMaxRetry?: number;
-    /**
-     * (default 0.2s)
-     * This tolerance factor is used during fragment lookup.
-     * Instead of checking whether buffered.end is located within [start, end] range, frag lookup will be done by checking within [start-maxFragLookUpTolerance, end-maxFragLookUpTolerance] range.
-     * This tolerance factor is used to cope with situations like:
-     *      buffered.end = 9.991
-     *      frag[0] : [0,10]
-     *      frag[1] : [10,20]
-     *      buffered.end is within frag[0] range, but as we are close to frag[1], frag[1] should be choosen instead
-     * If maxFragLookUpTolerance = 0.2, this lookup will be adjusted to
-     *      frag[0] : [-0.2,9.8]
-     *      frag[1] : [9.8,19.8]
-     *  This time, buffered.end is within frag[1] range, and frag[1] will be the next fragment to be loaded, as expected
-     */
-    maxLoadingDelay?: number;
     /**
      * (default 4s)
      *
@@ -1007,6 +1037,13 @@ declare namespace Hls {
      * Decreasing this value is likely to cause playback stalls.
      */
     liveSyncDurationCount?: number;
+    /**
+     * (default: Infinity)
+     * maximum delay allowed from edge of live, expressed in multiple of EXT-X-TARGETDURATION.
+     * If set to 10, the player will seek back to liveSyncDurationCount whenever the next fragment to be loaded is older than N-10, N being the last fragment of the live playlist.
+     * If set, this value must be stricly superior to liveSyncDurationCount a value too close from liveSyncDurationCount is likely to cause playback stalls.
+     */
+    liveMaxLatencyDurationCount?: number;
     /**
      * (default: undefined)
      * Alternative parameter to liveSyncDurationCount, expressed in seconds vs number of segments.
@@ -1015,13 +1052,6 @@ declare namespace Hls {
      * A value too low (inferior to ~3 segment durations) is likely to cause playback stalls.
      */
     liveSyncDuration?: number;
-    /**
-     * (default: Infinity)
-     * maximum delay allowed from edge of live, expressed in multiple of EXT-X-TARGETDURATION.
-     * If set to 10, the player will seek back to liveSyncDurationCount whenever the next fragment to be loaded is older than N-10, N being the last fragment of the live playlist.
-     * If set, this value must be stricly superior to liveSyncDurationCount a value too close from liveSyncDurationCount is likely to cause playback stalls.
-     */
-    liveMaxLatencyDurationCount?: number;
     /**
      * (default: undefined)
      * Alternative parameter to liveMaxLatencyDurationCount, expressed in seconds vs number of segments.
@@ -1031,6 +1061,13 @@ declare namespace Hls {
      * A value too close from liveSyncDuration is likely to cause playback stalls.
      */
     liveMaxLatencyDuration?: number;
+    /**
+     * (default: false)
+     * Override current Media Source duration to Infinity for a live broadcast. Useful, if you are building a player which relies
+     * on native UI capabilities in modern browsers. If you want to have a native Live UI in environments like iOS Safari, Safari,
+     * Android Google Chrome, etc. set this value to true.
+     */
+    liveDurationInfinity?: boolean;
     /**
      * (default: true)
      * Enable WebWorker (if available on browser) for TS demuxing/MP4 remuxing, to improve performance and avoid lag/frame drops.
@@ -1061,7 +1098,8 @@ declare namespace Hls {
     /**
      * (default: 1000 ms)
      * Initial delay between XMLHttpRequest error and first load retry (in ms).
-     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ...
+     * capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
      * Prefetch start fragment although media not attached.
      */
     manifestLoadingRetryDelay?: number;
@@ -1084,7 +1122,8 @@ declare namespace Hls {
     /**
      * (default: 1000 ms)
      * Initial delay between XMLHttpRequest error and first load retry (in ms).
-     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ...
+     * capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
      * Prefetch start fragment although media not attached.
      */
     levelLoadingRetryDelay?: number;
@@ -1107,7 +1146,8 @@ declare namespace Hls {
     /**
      * (default: 1000 ms)
      * Initial delay between XMLHttpRequest error and first load retry (in ms).
-     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ...
+     * capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
      * Prefetch start fragment although media not attached.
      */
     fragLoadingRetryDelay?: number;
@@ -1120,7 +1160,7 @@ declare namespace Hls {
      * (default: false)
      * Start prefetching start fragment although media not attached yet. Max number of append retries.
      */
-    startFragPrefech?: boolean;
+    startFragPrefetch?: boolean;
     /**
      * (default: 3)
      * Max number of sourceBuffer.appendBuffer() retry upon error. Such error could happen in loop with UHD streams, when internal buffer is full. (Quota Exceeding Error will be triggered).
@@ -1176,6 +1216,11 @@ declare namespace Hls {
      * destroy() : should clean-up all used resources
      */
     timelineController?: TimelineController;
+    /**
+     * (default: true)
+     * Whether or not to enable WebVTT captions on HLS
+     */
+    enableWebVTT?: boolean;
     /**
      * (default: true)
      * whether or not to enable CEA-708 captions
@@ -1207,11 +1252,26 @@ declare namespace Hls {
      * This helps playback continue in certain cases that might otherwise get stuck.
      */
     stretchShortVideoTrack?: boolean;
+    /**
+     * (default: 1)
+     * Browsers are really strict about audio frames timings. They usually play audio frames one after the other, regardless of
+     * the timestamps advertised in the fmp4. If audio timestamps are not consistent (consecutive audio frames too close or too far
+     * from each other), audio will easily drift. hls.js is restamping audio frames so that the distance between consecutive audio
+     * frame remains constant. If the distance is larger than the max allowed drift, hls.js will either
+     *     * drop the next audio frame if distance is too small (if next audio frame timestamp is smaller than expected
+     *       timestamp - max allowed drifter)
+     *     * insert silent frames if distance is too big (next audio frame timestamp is bigger than expected
+     *       timestamp + max allowed drift)
+     * Parameter should be an integer representing the max number of audio frames allowed to drifter. Keep in mind that one
+     * audio frame is 1024 audio samples (if using AAC), at 44.1 kHz, it gives 1024/44100 = 23ms.
+     */
+    maxAudioFramesDrift?: number;
     /**
      * (default: true)
      * Whether or not to force having a key frame in the first AVC sample after a discontinuity.
      * If set to true, after a discontinuity, the AVC samples without any key frame will be dropped until finding one that contains a key frame.
-     * If set to false, all AVC samples will be kept, which can help avoid holes in the stream. Setting this parameter to false can also generate decoding weirdness when switching level or seeking.
+     * If set to false, all AVC samples will be kept, which can help avoid holes in the stream.
+     * Setting this parameter to false can also generate decoding weirdness when switching level or seeking.
      */
     forceKeyFrameOnDiscontinuity?: boolean;
     /**
@@ -1540,7 +1600,7 @@ declare namespace Hls {
    *  Customized text track syncronization controller.
    */
   interface TimelineController {
-    /**d
+    /**
      * clean-up all used resources
      */
     destory(): void;
diff --git a/types/holderjs/holderjs-tests.ts b/types/holderjs/holderjs-tests.ts
new file mode 100644
index 0000000000..5a33d74aac
--- /dev/null
+++ b/types/holderjs/holderjs-tests.ts
@@ -0,0 +1,7 @@
+import * as Holder from "holderjs";
+
+const myImage = document.getElementById('myImage');
+
+Holder.run({
+    images: myImage
+});
diff --git a/types/holderjs/index.d.ts b/types/holderjs/index.d.ts
new file mode 100644
index 0000000000..a77d5cda60
--- /dev/null
+++ b/types/holderjs/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for holderjs 2.9
+// Project: http://holderjs.com
+// Definitions by: Soner Köksal <https://github.com/renjfk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Options {
+    images: HTMLElement | null;
+}
+
+export function run(options: Options): void;
diff --git a/types/holderjs/tsconfig.json b/types/holderjs/tsconfig.json
new file mode 100644
index 0000000000..6cf9415ee2
--- /dev/null
+++ b/types/holderjs/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "holderjs-tests.ts"
+    ]
+}
diff --git a/types/holderjs/tslint.json b/types/holderjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/holderjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/homeworks/homeworks-tests.ts b/types/homeworks/homeworks-tests.ts
deleted file mode 100644
index 16bce6d106..0000000000
--- a/types/homeworks/homeworks-tests.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-const element: JQuery = $('#element');
-const target: JQuery = $('#target');
-
-element.checkbox({
-  /* Empty options */
-}).bind('change', (event: HomeWorksEventObject) => {
-  /* HomeWorks native event */
-});
-
-element.converter({
-  /* Empty options */
-});
-
-element.dropdown({
-  /* Empty options */
-});
-
-const dropdownHandlerTarget: JQuery = element.addHandler(target);
-
-element.input({
-  /* Empty options */
-}).bind('change', (event: HomeWorksEventObject) => {
-  /* HomeWorks native event */
-});
-
-element.modal({
-  /* Any options */
-}).each(() => {
-  /* Chaining */
-});
-element.modal('show');
-element.modal('hide');
-element.modal('open');
-element.modal('close');
-
-notification('title', 'content', 'url', 'success');
-
-element.ripple({
-  /* Object options */
-});
-element.start({
-  x: 1,
-  y: 2
-});
-
-element.spinner({
-  type: 'any',
-  empty: 'any'
-}).bind('change', (event: HomeWorksEventObject) => {
-  /* HomeWorks native event */
-});
-
-element.step('method');
-element.step({
-  active: 0
-}).bind('move', (event: HomeWorksStepEventObject) => {
-  /* HomeWorks step event */
-});
-
-element.tab('method');
-element.tab({
-  active: 0
-}).bind('move', (event: HomeWorksTabEventObject) => {
-  /* HomeWorks step event */
-});
-
-toast('hello homeworks');
-toast({
-  message: 'hello homeworks'
-});
-
-element.toggle({
-  placeholder: 'placeholder'
-}).bind('change', (event: HomeWorksEventObject) => {
-  /* HomeWorks native event */
-});
-
-element.upload({
-  url: 'url',
-  type: 'type',
-  data: {},
-  dest: 'dest',
-  isBtn: true,
-  beforeStart() {
-  },
-  complete(data: any) {
-  },
-  success(data?: any, state?: any, xhr?: any) {
-  },
-  error(xhr?: any, state?: any, error?: any) {
-  },
-  extensions: 'any'
-});
diff --git a/types/homeworks/index.d.ts b/types/homeworks/index.d.ts
deleted file mode 100644
index 4449483d35..0000000000
--- a/types/homeworks/index.d.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-// Type definitions for homeworks 1.0
-// Project: https://github.com/IGAWorksDev/homeworks/
-// Definitions by: Kenneth Ceyer <https://github.com/KennethanCeyer>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery" />
-
-/**
- * * [MAIN]
- * @ EVENT
- *
- */
-
-declare interface HomeWorksEventObject {
-    element: JQuery;
-    value: string;
-    checked?: boolean;
-}
-
-declare interface JQuery {
-    bind(eventType: string, handler: (...parameters: any[]) => void): JQuery;
-    knock(): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ CHECKBOX
- *
- */
-interface CheckboxOptions {
-}
-
-declare interface JQuery {
-    checkbox(options?: CheckboxOptions): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ CONVERTER
- *
- */
-
-interface ConverterOptions {
-}
-
-declare interface JQuery {
-    converter(options?: ConverterOptions): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ DROPDOIWN
- *
- */
-
-interface DropdownOptions {
-}
-
-declare interface JQuery {
-    dropdown(options?: DropdownOptions): JQuery;
-    addHandler(target: JQuery): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ INPUT
- *
- */
-
-interface InputOptions {
-}
-
-declare interface JQuery {
-    input(options?: InputOptions): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ MODAL
- *
- */
-
-declare interface JQuery {
-    modal(options?: any): JQuery;
-    modal(method?: string, options?: any): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ NOTIFICATION
- *
- */
-
-declare function notification(title: string, content: string, url: string, status?: string): void;
-
-/**
- * * [COMPONENT]
- * @ RIPPLE
- *
- */
-
-interface RippleStartOptions {
-    x: number;
-    y: number;
-}
-
-declare interface JQuery {
-    ripple(options?: any): JQuery;
-    start(options?: RippleStartOptions): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ SPINNER
- *
- */
-
-interface SpinnerOptions {
-    type?: any;
-    empty?: any;
-}
-
-declare interface JQuery {
-    spinner(options?: SpinnerOptions): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ STEP
- *
- */
-
-interface StepOptions {
-    active?: number;
-}
-
-declare interface JQuery {
-    step(method?: string): JQuery;
-    step(options?: StepOptions): JQuery;
-}
-
-declare interface HomeWorksStepEventObject {
-    header: JQuery[];
-    index: number;
-    length: number;
-}
-
-/**
- * * [COMPONENT]
- * @ TAB
- *
- */
-
-interface TabOptions {
-    active?: number;
-}
-
-declare interface JQuery {
-    tab(method?: string): JQuery;
-    tab(options?: TabOptions): JQuery;
-}
-
-declare interface HomeWorksTabEventObject {
-    header: JQuery[];
-    index: number;
-    length: number;
-}
-
-/**
- * * [COMPONENT]
- * @ TOAST
- *
- */
-
-declare function toast(message: any): void;
-
-/**
- * * [COMPONENT]
- * @ TOGGLE
- *
- */
-
-interface ToggleOptions {
-    placeholder?: string;
-}
-
-declare interface JQuery {
-    toggle(options: ToggleOptions): JQuery;
-}
-
-/**
- * * [COMPONENT]
- * @ UPLOAD
- *
- */
-
-interface UploadOptions {
-    url: string;
-    type?: string;
-    data?: any;
-    dest?: string;
-    isBtn?: boolean;
-    beforeStart?: () => void;
-    complete?: (data?: any) => void;
-    success?: (data?: any, state?: any, xhr?: any) => void;
-    error?: (xhr?: any, state?: any, error?: any) => void;
-    extensions?: any;
-}
-
-declare interface JQuery {
-    upload(options?: UploadOptions): JQuery;
-}
diff --git a/types/homeworks/tsconfig.json b/types/homeworks/tsconfig.json
deleted file mode 100644
index e26de44673..0000000000
--- a/types/homeworks/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "homeworks-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/homeworks/tslint.json b/types/homeworks/tslint.json
deleted file mode 100644
index 626d0c5922..0000000000
--- a/types/homeworks/tslint.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-empty-interface": false,
-        "strict-export-declare-modifiers": false,
-        "prefer-method-signature": false,
-        "unified-signatures": false
-    }
-}
diff --git a/types/hooker/tslint.json b/types/hooker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hooker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hopscotch/tslint.json b/types/hopscotch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hopscotch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/howler/index.d.ts b/types/howler/index.d.ts
index 2e4f43ae20..0fd16e5f0d 100644
--- a/types/howler/index.d.ts
+++ b/types/howler/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for howler.js v2.0.3
+// Type definitions for howler.js v2.0.5
 // Project: https://github.com/goldfire/howler.js
-// Definitions by: Pedro Casaubon <https://github.com/xperiments>, Todd Dukart <https://github.com/tdukart>, Alexander Leon <https://github.com/alien35> 
+// Definitions by: Pedro Casaubon <https://github.com/xperiments>, Todd Dukart <https://github.com/tdukart>, Alexander Leon <https://github.com/alien35>, Nicholas Higgins <https://github.com/nicholashza> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface HowlerGlobal {
@@ -38,9 +38,11 @@ interface IHowlProperties {
     rate?: number;
     pool?: number;
     format?: string[] | string;
+    xhrWithCredentials?: boolean;
     onload?: () => void;
     onloaderror?: (soundId: number, error: any) => void;
     onplay?: (soundId: number) => void;
+    onplayerror?: (soundId: number, error: any) => void;
     onend?: (soundId: number) => void;
     onpause?: (soundId: number) => void;
     onstop?: (soundId: number) => void;
@@ -78,6 +80,7 @@ interface Howl {
     on(event: 'load', callback: () => void, id?: number): this;
     on(event: 'loaderror', callback: (soundId: number, error: any) => void, id?: number): this;
     on(event: 'play', callback: (soundId: number) => void, id?: number): this;
+    on(event: 'playerror', callback: (soundId: number, error: any) => void, id?: number): this;
     on(event: 'end', callback: (soundId: number) => void, id?: number): this;
     on(event: 'pause', callback: (soundId: number) => void, id?: number): this;
     on(event: 'stop', callback: (soundId: number) => void, id?: number): this;
@@ -91,6 +94,7 @@ interface Howl {
     once(event: 'load', callback: () => void, id?: number): this;
     once(event: 'loaderror', callback: (soundId: number, error: any) => void, id?: number): this;
     once(event: 'play', callback: (soundId: number) => void, id?: number): this;
+    once(event: 'playerror', callback: (soundId: number, error: any) => void, id?: number): this;
     once(event: 'end', callback: (soundId: number) => void, id?: number): this;
     once(event: 'pause', callback: (soundId: number) => void, id?: number): this;
     once(event: 'stop', callback: (soundId: number) => void, id?: number): this;
diff --git a/types/howler/tslint.json b/types/howler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/howler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hpp/index.d.ts b/types/hpp/index.d.ts
index 6328df7d70..18439ee488 100644
--- a/types/hpp/index.d.ts
+++ b/types/hpp/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/analog-nico/hpp
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as express from 'express';
 
diff --git a/types/html-entities/tslint.json b/types/html-entities/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/html-entities/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/html-minifier/html-minifier-tests.ts b/types/html-minifier/html-minifier-tests.ts
index 4196a870e6..5cb2ffccf9 100644
--- a/types/html-minifier/html-minifier-tests.ts
+++ b/types/html-minifier/html-minifier-tests.ts
@@ -1,8 +1,7 @@
-
 import * as HTMLMinifier from 'html-minifier';
 const minify = HTMLMinifier.minify;
 
-var result = minify('<p title="blah" id="moo">foo</p>', {
+const result = minify('<p title="blah" id="moo">foo</p>', {
   removeAttributeQuotes: true
 });
 result; // '<p title=blah id=moo>foo</p>'
diff --git a/types/html-minifier/index.d.ts b/types/html-minifier/index.d.ts
index 0bf9e2ae7f..6232cb1193 100644
--- a/types/html-minifier/index.d.ts
+++ b/types/html-minifier/index.d.ts
@@ -1,111 +1,164 @@
-// Type definitions for HTMLMinifier v1.1.1
+// Type definitions for html-minifier 3.5
 // Project: https://github.com/kangax/html-minifier
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+//                 Riku <https://github.com/rikuayanokozy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="uglify-js" />
-
 import * as UglifyJS from 'uglify-js';
 import * as CleanCSS from 'clean-css';
 import * as RelateUrl from 'relateurl';
 
-declare namespace HTMLMinifier {
-    function minify(text: string, options?: Options): string;
+export function minify(text: string, options?: Options): string;
 
-    interface Options {
-        // Strip HTML comments
-        removeComments?: boolean;
+export interface Options {
+    // Treat attributes in case sensitive manner (useful for custom HTML tags)
+    caseSensitive?: boolean;
 
-        // Strip HTML comments from scripts and styles
-        removeCommentsFromCDATA?: boolean;
+    // Omit attribute values from boolean attributes
+    collapseBooleanAttributes?: boolean;
 
-        // Remove CDATA sections from script and style elements
-        removeCDATASectionsFromCDATA?: boolean;
+    // Don't leave any spaces between display:inline; elements when collapsing. Must be used in conjunction with collapseWhitespace=true
+    collapseInlineTagWhitespace?: boolean;
 
-        // Collapse white space that contributes to text nodes in a document tree
-        collapseWhitespace?: boolean;
+    /**
+     * Collapse white space that contributes to text nodes in a document tree
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#collapse_whitespace
+     */
+    collapseWhitespace?: boolean;
 
-        // Always collapse to 1 space (never remove it entirely). Must be used in conjunction with collapseWhitespace=true
-        conservativeCollapse?: boolean;
+    // Always collapse to 1 space (never remove it entirely). Must be used in conjunction with collapseWhitespace=true
+    conservativeCollapse?: boolean;
 
-        // Don't leave any spaces between display:inline; elements when collapsing. Must be used in conjunction with collapseWhitespace=true
-        collapseInlineTagWhitespace?: boolean;
+    // Arrays of regex'es that allow to support custom attribute assign expressions (e.g. '<div flex?="{{mode != cover}}"></div>')
+    customAttrAssign?: RegExp[];
 
-        // Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with collapseWhitespace=true
-        preserveLineBreaks?: boolean;
+    // Regex that specifies custom attribute to strip newlines from (e.g. /ng-class/)
+    customAttrCollapse?: RegExp[];
 
-        // Omit attribute values from boolean attributes
-        collapseBooleanAttributes?: boolean;
+    // Arrays of regex'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)
+    customAttrSurround?: RegExp[];
 
-        // Remove quotes around attributes when possible
-        removeAttributeQuotes?: boolean;
+    // Arrays of regex'es that allow to support custom event attributes for minifyJS (e.g. ng-click)
+    customEventAttributes?: RegExp[];
 
-        // Remove attributes when value matches default
-        removeRedundantAttributes?: boolean;
+    // Use direct Unicode characters whenever possible
+    decodeEntities?: boolean;
 
-        // Prevents the escaping of the values of attributes.
-        preventAttributesEscaping?: boolean;
+    // Parse input according to HTML5 specifications
+    html5?: boolean;
 
-        // Replaces the doctype with the short (HTML5) doctype
-        useShortDoctype?: boolean;
+    // Array of regex'es that allow to ignore certain comments, when matched
+    ignoreCustomComments?: RegExp[];
 
-        // Remove all attributes with whitespace-only values
-        removeEmptyAttributes?: boolean;
+    // Array of regex'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }}, etc.)
+    ignoreCustomFragments?: RegExp[];
 
-        // Remove type="text/javascript" from script tags. Other type attribute values are left intact.
-        removeScriptTypeAttributes?: boolean;
+    // Insert tags generated by HTML parser
+    includeAutoGeneratedTags?: boolean;
 
-        // Remove type="text/css" from style and link tags. Other type attribute values are left intact.
-        removeStyleLinkTypeAttributes?: boolean;
+    // Keep the trailing slash on singleton elements
+    keepClosingSlash?: boolean;
 
-        // Remove unrequired tags
-        removeOptionalTags?: boolean;
+    // Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points
+    maxLineLength?: number;
 
-        // Remove all elements with empty contents
-        removeEmptyElements?: boolean;
+    // Minify CSS in style elements and style attributes (uses clean-css or function specified)
+    minifyCSS?: boolean | CleanCSS.Options | ((text: string) => string);
 
-        // Toggle linting
-        lint?: boolean;
+    // Minify JavaScript in script elements and event attributes (uses UglifyJS or function specified)
+    minifyJS?: boolean | UglifyJS.MinifyOptions | ((text: string, inline: boolean) => string);
 
-        // Keep the trailing slash on singleton elements
-        keepClosingSlash?: boolean;
+    // Minify URLs in various attributes (uses relateurl or function specified)
+    minifyURLs?: boolean | RelateUrl.Options | ((text: string) => string);
 
-        // Treat attributes in case sensitive manner (useful for custom HTML tags.)
-        caseSensitive?: boolean;
+    // Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with collapseWhitespace=true
+    preserveLineBreaks?: boolean;
 
-        // Minify Javascript in script elements and on* attributes (uses UglifyJS)
-        minifyJS?: boolean | UglifyJS.MinifyOptions;
+    // Prevents the escaping of the values of attributes
+    preventAttributesEscaping?: boolean;
 
-        // Minify CSS in style elements and style attributes (uses clean-css)
-        minifyCSS?: boolean | CleanCSS.Options;
+    // Process contents of conditional comments through minifier
+    processConditionalComments?: boolean;
 
-        // Minify URLs in various attributes (uses relateurl)
-        minifyURLs?: boolean | RelateUrl.Options;
+    // Array of strings corresponding to types of script elements to process through minifier (e.g. text/ng-template, text/x-handlebars-template, etc.)
+    processScripts?: string[];
 
-        // Array of regex'es that allow to ignore certain comments, when matched
-        ignoreCustomComments?: Array<RegExp>;
+    // Type of quote to use for attribute values (' or ")
+    quoteCharacter?: string;
 
-        // Array of regex'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }}, etc.)
-        ignoreCustomFragments?: Array<RegExp>;
+    /**
+     * Remove quotes around attributes when possible
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#remove_attribute_quotes
+     */
+    removeAttributeQuotes?: boolean;
 
-        // Array of strings corresponding to types of script elements to process through minifier (e.g. text/ng-template, text/x-handlebars-template, etc.)
-        processScripts?: Array<string>;
+    /**
+     * Strip HTML comments
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#remove_comments
+     */
+    removeComments?: boolean;
 
-        // Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points
-        maxLineLength?: number;
+    /**
+     * Remove all attributes with whitespace-only values
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#remove_empty_or_blank_attributes
+     */
+    removeEmptyAttributes?: boolean | ((attrName: string, tag: string) => boolean);
 
-        // Arrays of regex'es that allow to support custom attribute assign expressions (e.g. '<div flex?="{{mode != cover}}"></div>')
-        customAttrAssign?: Array<RegExp>;
+    /**
+     * Remove all elements with empty contents
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#remove_empty_elements
+     */
+    removeEmptyElements?: boolean;
 
-        // Arrays of regex'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)
-        customAttrSurround?: Array<RegExp>;
+    /**
+     * Remove optional tags
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#remove_optional_tags
+     */
+    removeOptionalTags?: boolean;
 
-        // Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)
-        customAttrCollapse?: RegExp;
+    /**
+     * Remove attributes when value matches default.
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#remove_redundant_attributes
+     */
+    removeRedundantAttributes?: boolean;
 
-        // Type of quote to use for attribute values (' or ")
-        quoteCharacter?: string;
-    }
+    // Remove type="text/javascript" from script tags. Other type attribute values are left intact
+    removeScriptTypeAttributes?: boolean;
+
+    // Remove type="text/css" from style and link tags. Other type attribute values are left intact
+    removeStyleLinkTypeAttributes?: boolean;
+
+    // Remove space between attributes whenever possible. Note that this will result in invalid HTML!
+    removeTagWhitespace?: boolean;
+
+    /**
+     * Sort attributes by frequency
+     *
+     * Minifier options like sortAttributes and sortClassName won't impact the plain-text size
+     * of the output. However, they form long repetitive chains of characters that should improve
+     * compression ratio of gzip used in HTTP compression.
+     *
+     * @see https://github.com/kangax/html-minifier#sorting-attributes--style-classes
+     */
+    sortAttributes?: boolean;
+
+    /**
+     * Sort style classes by frequency
+     *
+     * Minifier options like sortAttributes and sortClassName won't impact the plain-text size
+     * of the output. However, they form long repetitive chains of characters that should improve
+     * compression ratio of gzip used in HTTP compression.
+     *
+     * @see https://github.com/kangax/html-minifier#sorting-attributes--style-classes
+     */
+    sortClassName?: boolean;
+
+    // Trim white space around ignoreCustomFragments
+    trimCustomFragments?: boolean;
+
+    /**
+     * Replaces the doctype with the short (HTML5) doctype
+     * @see http://perfectionkills.com/experimenting-with-html-minifier/#use_short_doctype
+     */
+    useShortDoctype?: boolean;
 }
-
-export = HTMLMinifier;
diff --git a/types/html-minifier/tslint.json b/types/html-minifier/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/html-minifier/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/html-minifier/v1/html-minifier-tests.ts b/types/html-minifier/v1/html-minifier-tests.ts
new file mode 100644
index 0000000000..4196a870e6
--- /dev/null
+++ b/types/html-minifier/v1/html-minifier-tests.ts
@@ -0,0 +1,8 @@
+
+import * as HTMLMinifier from 'html-minifier';
+const minify = HTMLMinifier.minify;
+
+var result = minify('<p title="blah" id="moo">foo</p>', {
+  removeAttributeQuotes: true
+});
+result; // '<p title=blah id=moo>foo</p>'
diff --git a/types/html-minifier/v1/index.d.ts b/types/html-minifier/v1/index.d.ts
new file mode 100644
index 0000000000..0bf9e2ae7f
--- /dev/null
+++ b/types/html-minifier/v1/index.d.ts
@@ -0,0 +1,111 @@
+// Type definitions for HTMLMinifier v1.1.1
+// Project: https://github.com/kangax/html-minifier
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="uglify-js" />
+
+import * as UglifyJS from 'uglify-js';
+import * as CleanCSS from 'clean-css';
+import * as RelateUrl from 'relateurl';
+
+declare namespace HTMLMinifier {
+    function minify(text: string, options?: Options): string;
+
+    interface Options {
+        // Strip HTML comments
+        removeComments?: boolean;
+
+        // Strip HTML comments from scripts and styles
+        removeCommentsFromCDATA?: boolean;
+
+        // Remove CDATA sections from script and style elements
+        removeCDATASectionsFromCDATA?: boolean;
+
+        // Collapse white space that contributes to text nodes in a document tree
+        collapseWhitespace?: boolean;
+
+        // Always collapse to 1 space (never remove it entirely). Must be used in conjunction with collapseWhitespace=true
+        conservativeCollapse?: boolean;
+
+        // Don't leave any spaces between display:inline; elements when collapsing. Must be used in conjunction with collapseWhitespace=true
+        collapseInlineTagWhitespace?: boolean;
+
+        // Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with collapseWhitespace=true
+        preserveLineBreaks?: boolean;
+
+        // Omit attribute values from boolean attributes
+        collapseBooleanAttributes?: boolean;
+
+        // Remove quotes around attributes when possible
+        removeAttributeQuotes?: boolean;
+
+        // Remove attributes when value matches default
+        removeRedundantAttributes?: boolean;
+
+        // Prevents the escaping of the values of attributes.
+        preventAttributesEscaping?: boolean;
+
+        // Replaces the doctype with the short (HTML5) doctype
+        useShortDoctype?: boolean;
+
+        // Remove all attributes with whitespace-only values
+        removeEmptyAttributes?: boolean;
+
+        // Remove type="text/javascript" from script tags. Other type attribute values are left intact.
+        removeScriptTypeAttributes?: boolean;
+
+        // Remove type="text/css" from style and link tags. Other type attribute values are left intact.
+        removeStyleLinkTypeAttributes?: boolean;
+
+        // Remove unrequired tags
+        removeOptionalTags?: boolean;
+
+        // Remove all elements with empty contents
+        removeEmptyElements?: boolean;
+
+        // Toggle linting
+        lint?: boolean;
+
+        // Keep the trailing slash on singleton elements
+        keepClosingSlash?: boolean;
+
+        // Treat attributes in case sensitive manner (useful for custom HTML tags.)
+        caseSensitive?: boolean;
+
+        // Minify Javascript in script elements and on* attributes (uses UglifyJS)
+        minifyJS?: boolean | UglifyJS.MinifyOptions;
+
+        // Minify CSS in style elements and style attributes (uses clean-css)
+        minifyCSS?: boolean | CleanCSS.Options;
+
+        // Minify URLs in various attributes (uses relateurl)
+        minifyURLs?: boolean | RelateUrl.Options;
+
+        // Array of regex'es that allow to ignore certain comments, when matched
+        ignoreCustomComments?: Array<RegExp>;
+
+        // Array of regex'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }}, etc.)
+        ignoreCustomFragments?: Array<RegExp>;
+
+        // Array of strings corresponding to types of script elements to process through minifier (e.g. text/ng-template, text/x-handlebars-template, etc.)
+        processScripts?: Array<string>;
+
+        // Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points
+        maxLineLength?: number;
+
+        // Arrays of regex'es that allow to support custom attribute assign expressions (e.g. '<div flex?="{{mode != cover}}"></div>')
+        customAttrAssign?: Array<RegExp>;
+
+        // Arrays of regex'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)
+        customAttrSurround?: Array<RegExp>;
+
+        // Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)
+        customAttrCollapse?: RegExp;
+
+        // Type of quote to use for attribute values (' or ")
+        quoteCharacter?: string;
+    }
+}
+
+export = HTMLMinifier;
diff --git a/types/html-minifier/v1/tsconfig.json b/types/html-minifier/v1/tsconfig.json
new file mode 100644
index 0000000000..8def52b67d
--- /dev/null
+++ b/types/html-minifier/v1/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "html-minifier": ["html-minifier/v1"],
+            "html-minifier/*": ["html-minifier/v1/*"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "html-minifier-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/html-minifier/v1/tslint.json b/types/html-minifier/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/html-minifier/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/html-pdf/tslint.json b/types/html-pdf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/html-pdf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/html-to-text/tslint.json b/types/html-to-text/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/html-to-text/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/html-webpack-plugin/html-webpack-plugin-tests.ts b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
index a84d19bea5..7a1e5f20bc 100644
--- a/types/html-webpack-plugin/html-webpack-plugin-tests.ts
+++ b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
@@ -19,6 +19,9 @@ const optionsArray: HtmlWebpackPlugin.Options[] = [
 	{
 		arbitrary: 'data',
 	},
+	{
+		chunksSortMode: 'manual',
+	}
 ];
 
 const plugins: HtmlWebpackPlugin[] = optionsArray.map(options => new HtmlWebpackPlugin(options));
diff --git a/types/html-webpack-plugin/index.d.ts b/types/html-webpack-plugin/index.d.ts
index b08a69faa5..dc23e020d7 100644
--- a/types/html-webpack-plugin/index.d.ts
+++ b/types/html-webpack-plugin/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for html-webpack-plugin 2.28
+// Type definitions for html-webpack-plugin 2.30
 // Project: https://github.com/ampedandwired/html-webpack-plugin
-// Definitions by: Simon Hartcher <https://github.com/deevus>, Benjamin Lim <https://github.com/bumbleblym>
+// Definitions by: Simon Hartcher <https://github.com/deevus>
+//                 Benjamin Lim <https://github.com/bumbleblym>
+//                 Tomek �aziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { Plugin } from 'webpack';
@@ -35,9 +37,9 @@ declare namespace HtmlWebpackPlugin {
 		cache?: boolean;
 		/**
 		 * Allows to control how chunks should be sorted before they are included to the html.
-		 * Allowed values: `'none' | 'auto' | 'dependency' | {function}` - default: `'auto'`
+		 * Allowed values: 'none' | 'auto' | 'dependency' |'manual' | {function} - default: 'auto'
 		 */
-		chunksSortMode?: 'none' | 'auto' | 'dependency' | ChunkComparator;
+		chunksSortMode?: 'none' | 'auto' | 'dependency' | 'manual' | ChunkComparator;
 		/** Allows you to add only some chunks (e.g. only the unit-test chunk) */
 		chunks?: string[];
 		/** Allows you to skip some chunks (e.g. don't add the unit-test chunk) */
diff --git a/types/html2canvas/tslint.json b/types/html2canvas/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/html2canvas/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/htmlhint/tslint.json b/types/htmlhint/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/htmlhint/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/htmlparser2/tslint.json b/types/htmlparser2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/htmlparser2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/htmltojsx/tslint.json b/types/htmltojsx/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/htmltojsx/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/http-assert/index.d.ts b/types/http-assert/index.d.ts
index 47b283db92..aac93be123 100644
--- a/types/http-assert/index.d.ts
+++ b/types/http-assert/index.d.ts
@@ -2,51 +2,29 @@
 // Project: https://github.com/jshttp/http-assert
 // Definitions by: jKey Lu <https://github.com/jkeylu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /**
- * @param {number} [status] the status code
- * @param {string} [msg] the message of the error, defaulting to node's text for that status code
- * @param {object} [opts] custom properties to attach to the error object
+ * @param status the status code
+ * @param msg the message of the error, defaulting to node's text for that status code
+ * @param opts custom properties to attach to the error object
  */
 declare function assert(value: any, status?: number, msg?: string, opts?: {}): void;
 
 declare namespace assert {
     /**
-     * @param {number} [status] the status code
-     * @param {string} [msg] the message of the error, defaulting to node's text for that status code
-     * @param {object} [opts] custom properties to attach to the error object
+     * @param status the status code
+     * @param msg the message of the error, defaulting to node's text for that status code
+     * @param opts custom properties to attach to the error object
      */
-    function equal<T>(a: T, b: T, status?: number, msg?: string, opts?: {}): void;
-    /**
-     * @param {number} [status] the status code
-     * @param {string} [msg] the message of the error, defaulting to node's text for that status code
-     * @param {object} [opts] custom properties to attach to the error object
-     */
-    function notEqual<T>(a: T, b: T, status?: number, msg?: string, opts?: {}): void;
-    /**
-     * @param {number} [status] the status code
-     * @param {string} [msg] the message of the error, defaulting to node's text for that status code
-     * @param {object} [opts] custom properties to attach to the error object
-     */
-    function strictEqual<T>(a: T, b: T, status?: number, msg?: string, opts?: {}): void;
-    /**
-     * @param {number} [status] the status code
-     * @param {string} [msg] the message of the error, defaulting to node's text for that status code
-     * @param {object} [opts] custom properties to attach to the error object
-     */
-    function notStrictEqual<T>(a: T, b: T, status?: number, msg?: string, opts?: {}): void;
-    /**
-     * @param {number} [status] the status code
-     * @param {string} [msg] the message of the error, defaulting to node's text for that status code
-     * @param {object} [opts] custom properties to attach to the error object
-     */
-    function deepEqual<T>(a: T, b: T, status?: number, msg?: string, opts?: {}): void;
-    /**
-     * @param {number} [status] the status code
-     * @param {string} [msg] the message of the error, defaulting to node's text for that status code
-     * @param {object} [opts] custom properties to attach to the error object
-     */
-    function notDeepEqual<T>(a: T, b: T, status?: number, msg?: string, opts?: {}): void;
+    type Assert = <T>(a: T, b: T, status?: number, msg?: string, opts?: {}) => void;
+
+    const equal: Assert;
+    const notEqual: Assert;
+    const strictEqual: Assert;
+    const notStrictEqual: Assert;
+    const deepEqual: Assert;
+    const notDeepEqual: Assert;
 }
 
 export = assert;
diff --git a/types/http-aws-es/index.d.ts b/types/http-aws-es/index.d.ts
index c14547a58f..91e12604f8 100644
--- a/types/http-aws-es/index.d.ts
+++ b/types/http-aws-es/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/TheDeveloper/http-aws-es#readme
 // Definitions by: Marco Gonzalez <https://github.com/marcogrcr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/http-aws-es/package.json b/types/http-aws-es/package.json
index 7952b2931b..1abd559361 100644
--- a/types/http-aws-es/package.json
+++ b/types/http-aws-es/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "aws-sdk": "^2.7.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/http-context/http-context-tests.ts b/types/http-context/http-context-tests.ts
new file mode 100644
index 0000000000..629f09ece3
--- /dev/null
+++ b/types/http-context/http-context-tests.ts
@@ -0,0 +1,73 @@
+import http = require('http');
+import httpContext = require('http-context');
+
+const context: httpContext.Context = httpContext();
+const request: httpContext.Request = context.request;
+const response: httpContext.Response = context.response;
+
+let header: http.IncomingHttpHeaders = context.header;
+header = context.headers;
+header = request.header;
+header = request.headers;
+const headerString: string | string[] | undefined = header['Content-Type'];
+
+let url: string = context.url;
+url = request.url;
+context.accepts('html');
+
+let href: string = context.href;
+href = request.href;
+
+let method: string = context.method;
+method = request.method;
+
+let path: string = context.path;
+path = request.path;
+
+let query: {[param: string]: string | string[]} = context.query;
+query = request.query;
+const querySearch: string | string[] = query['search'];
+
+let queryString: string = context.querystring;
+queryString = request.querystring;
+
+let search: string = context.search;
+search = request.search;
+
+let host: string = context.host;
+host = request.host;
+
+let hostname: string = context.hostname;
+hostname = request.hostname;
+
+let fresh: boolean = context.fresh;
+fresh = request.fresh;
+
+let idempotent: boolean = context.idempotent;
+idempotent = request.idempotent;
+
+let protocol: string = context.protocol;
+protocol = request.protocol;
+
+let secure: boolean = context.secure;
+secure = request.secure;
+
+let subdomains: string[] = context.subdomains;
+subdomains = request.subdomains;
+
+let accepts: string[] | string | false = context.accepts('text/html');
+accepts = request.accepts('text/html');
+accepts = request.accepts('text/html', 'text/txt');
+accepts = request.accepts(['text/html', 'text/txt']);
+
+let status: number = context.status;
+status = response.status;
+
+let message: string = context.message;
+message = response.message;
+
+let body: any = context.body;
+body = response.body;
+
+let length: number = context.length;
+length = response.length;
diff --git a/types/http-context/index.d.ts b/types/http-context/index.d.ts
new file mode 100644
index 0000000000..30aae4c99b
--- /dev/null
+++ b/types/http-context/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for http-context 1.1
+// Project: https://github.com/lapwinglabs/http-context#readme
+// Definitions by: Matt Traynham <https://github.com/mtraynham>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import accepts = require('accepts');
+import http = require('http');
+
+export = HttpContext;
+
+declare function HttpContext(): HttpContext.Context;
+
+declare namespace HttpContext {
+    interface RequestJSON {
+        method: string;
+        url: string;
+        header: http.IncomingHttpHeaders;
+    }
+
+    interface RequestDelegate {
+        header: http.IncomingHttpHeaders;
+        headers: http.IncomingHttpHeaders;
+        url: string;
+        href: string;
+        method: string;
+        path: string;
+        query: {[param: string]: string | string[]};
+        querystring: string;
+        search: string;
+        host: string;
+        hostname: string;
+        fresh: boolean;
+        idempotent: boolean;
+        protocol: string;
+        secure: boolean;
+        subdomains: string[];
+        accepts(types: string[]): string[] | string | false;
+        accepts(...types: string[]): string[] | string | false;
+        acceptsCharsets(charsets: string[]): string | false;
+        acceptsCharsets(...charsets: string[]): string | false;
+        acceptsEncodings(encodings: string[]): string | false;
+        acceptsEncodings(...encodings: string[]): string | false;
+        acceptsLanguages(languages: string[]): string | false;
+        acceptsLanguages(...languages: string[]): string | false;
+        is(types: string[]): string | false;
+        is(...types: string[]): string | false;
+        get(field: string): string;
+    }
+
+    interface Request extends RequestDelegate {
+        request: http.IncomingMessage;
+        charset: string;
+        length: number;
+        type: string;
+        accept: accepts.Accepts;
+        inspect(): RequestJSON;
+        toJSON(): RequestJSON;
+    }
+
+    interface ResponseJSON {
+        status: number;
+        message: string;
+        header: http.OutgoingHttpHeaders;
+    }
+
+    interface ResponseDelegate {
+        status: number;
+        message: string;
+        body: any;
+        length: number;
+        headerSent: boolean;
+        type: string;
+        lastModified: string | Date;
+        etag: string;
+        writable: boolean;
+        vary(field: string): void;
+        redirect(url: string, alt: string): void;
+        attachment(filename: string): void;
+        set(field: string, val: string): void;
+        append(field: string, val: string[]): void;
+        append(field: string, ...val: string[]): void;
+        remove(field: string): void;
+    }
+
+    interface Response extends ResponseDelegate {
+        response: http.OutgoingMessage;
+        header: http.OutgoingHttpHeaders;
+        is(types: string[]): string | false;
+        is(...types: string[]): string | false;
+        get(field: string): string;
+        inspect(): ResponseJSON;
+        toJSON(): ResponseJSON;
+    }
+
+    interface Context extends RequestDelegate, ResponseDelegate {
+        request: Request;
+        response: Response;
+    }
+}
diff --git a/types/http-context/tsconfig.json b/types/http-context/tsconfig.json
new file mode 100644
index 0000000000..51422e3199
--- /dev/null
+++ b/types/http-context/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "http-context-tests.ts"
+    ]
+}
diff --git a/types/http-context/tslint.json b/types/http-context/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/http-context/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/http-proxy-agent/http-proxy-agent-tests.ts b/types/http-proxy-agent/http-proxy-agent-tests.ts
new file mode 100644
index 0000000000..f730cd1bde
--- /dev/null
+++ b/types/http-proxy-agent/http-proxy-agent-tests.ts
@@ -0,0 +1,12 @@
+import Agent = require('http-proxy-agent');
+
+// $ExpectType HttpProxyAgent
+new Agent('url');
+new Agent({});
+new Agent({ host: 'url' });
+
+// $ExpectError
+new Agent();
+
+// $ExpectError
+new Agent({ a: 1 });
diff --git a/types/http-proxy-agent/index.d.ts b/types/http-proxy-agent/index.d.ts
new file mode 100644
index 0000000000..015508b5d1
--- /dev/null
+++ b/types/http-proxy-agent/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for http-proxy-agent 2.0
+// Project: https://github.com/TooTallNate/node-http-proxy-agent
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { Agent } from 'http';
+import { Url } from 'url';
+
+declare class HttpProxyAgent extends Agent {
+    constructor(options: string | Url);
+}
+
+export = HttpProxyAgent;
diff --git a/types/http-proxy-agent/tsconfig.json b/types/http-proxy-agent/tsconfig.json
new file mode 100644
index 0000000000..626d4eaa4c
--- /dev/null
+++ b/types/http-proxy-agent/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "http-proxy-agent-tests.ts"
+    ]
+}
diff --git a/types/http-proxy-agent/tslint.json b/types/http-proxy-agent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/http-proxy-agent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/http-proxy-middleware/index.d.ts b/types/http-proxy-middleware/index.d.ts
index 370b3d1487..5db24429c9 100644
--- a/types/http-proxy-middleware/index.d.ts
+++ b/types/http-proxy-middleware/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Zebulon McCorkle <https://github.com/zebMcCorkle>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/http-proxy/index.d.ts b/types/http-proxy/index.d.ts
index 4ed829d390..962a9ecdb6 100644
--- a/types/http-proxy/index.d.ts
+++ b/types/http-proxy/index.d.ts
@@ -10,6 +10,7 @@ import * as http from "http";
 import * as https from "https";
 import * as events from "events";
 import * as url from "url";
+import * as stream from "stream";
 
 type ProxyTargetUrl = string | url.Url;
 
@@ -32,7 +33,6 @@ declare class Server extends events.EventEmitter {
    * @param req - Client request.
    * @param res - Client response.
    * @param options - Additionnal options.
-   * @param
    */
   web(
     req: http.IncomingMessage,
@@ -163,6 +163,8 @@ declare class Server extends events.EventEmitter {
 
 declare namespace Server {
   interface ServerOptions {
+    /** Buffer */
+    buffer?: stream.Stream;
     /** URL string to be parsed with the url module. */
     target?: string;
     /** URL string to be parsed with the url module. */
diff --git a/types/http-status-codes/http-status-codes-tests.ts b/types/http-status-codes/http-status-codes-tests.ts
deleted file mode 100644
index 8f0e3aae2c..0000000000
--- a/types/http-status-codes/http-status-codes-tests.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import HttpStatusCodes = require("http-status-codes");
-
-var ACCEPTED = HttpStatusCodes.ACCEPTED;
-var BAD_GATEWAY = HttpStatusCodes.BAD_GATEWAY;
-var BAD_REQUEST = HttpStatusCodes.BAD_REQUEST;
-var CONFLICT = HttpStatusCodes.CONFLICT;
-var CONTINUE = HttpStatusCodes.CONTINUE;
-var CREATED = HttpStatusCodes.CREATED;
-var EXPECTATION_FAILED = HttpStatusCodes.EXPECTATION_FAILED;
-var FAILED_DEPENDENCY  = HttpStatusCodes.FAILED_DEPENDENCY ;
-var FORBIDDEN = HttpStatusCodes.FORBIDDEN;
-var GATEWAY_TIMEOUT = HttpStatusCodes.GATEWAY_TIMEOUT;
-var GONE = HttpStatusCodes.GONE;
-var HTTP_VERSION_NOT_SUPPORTED = HttpStatusCodes.HTTP_VERSION_NOT_SUPPORTED;
-var INSUFFICIENT_SPACE_ON_RESOURCE = HttpStatusCodes.INSUFFICIENT_SPACE_ON_RESOURCE;
-var INSUFFICIENT_STORAGE = HttpStatusCodes.INSUFFICIENT_STORAGE;
-var INTERNAL_SERVER_ERROR = HttpStatusCodes.INTERNAL_SERVER_ERROR;
-var LENGTH_REQUIRED = HttpStatusCodes.LENGTH_REQUIRED;
-var LOCKED = HttpStatusCodes.LOCKED;
-var METHOD_FAILURE = HttpStatusCodes.METHOD_FAILURE;
-var METHOD_NOT_ALLOWED = HttpStatusCodes.METHOD_NOT_ALLOWED;
-var MOVED_PERMANENTLY = HttpStatusCodes.MOVED_PERMANENTLY;
-var MOVED_TEMPORARILY = HttpStatusCodes.MOVED_TEMPORARILY;
-var MULTI_STATUS = HttpStatusCodes.MULTI_STATUS;
-var MULTIPLE_CHOICES = HttpStatusCodes.MULTIPLE_CHOICES;
-var NETWORK_AUTHENTICATION_REQUIRED = HttpStatusCodes.NETWORK_AUTHENTICATION_REQUIRED;
-var NO_CONTENT = HttpStatusCodes.NO_CONTENT;
-var NON_AUTHORITATIVE_INFORMATION = HttpStatusCodes.NON_AUTHORITATIVE_INFORMATION;
-var NOT_ACCEPTABLE = HttpStatusCodes.NOT_ACCEPTABLE;
-var NOT_FOUND = HttpStatusCodes.NOT_FOUND;
-var NOT_IMPLEMENTED = HttpStatusCodes.NOT_IMPLEMENTED;
-var NOT_MODIFIED = HttpStatusCodes.NOT_MODIFIED;
-var OK = HttpStatusCodes.OK;
-var PARTIAL_CONTENT = HttpStatusCodes.PARTIAL_CONTENT;
-var PAYMENT_REQUIRED = HttpStatusCodes.PAYMENT_REQUIRED;
-var PRECONDITION_FAILED = HttpStatusCodes.PRECONDITION_FAILED;
-var PRECONDITION_REQUIRED = HttpStatusCodes.PRECONDITION_REQUIRED;
-var PROCESSING = HttpStatusCodes.PROCESSING;
-var PROXY_AUTHENTICATION_REQUIRED = HttpStatusCodes.PROXY_AUTHENTICATION_REQUIRED;
-var REQUEST_HEADER_FIELDS_TOO_LARGE = HttpStatusCodes.REQUEST_HEADER_FIELDS_TOO_LARGE;
-var REQUEST_TIMEOUT = HttpStatusCodes.REQUEST_TIMEOUT;
-var REQUEST_TOO_LONG = HttpStatusCodes.REQUEST_TOO_LONG;
-var REQUEST_URI_TOO_LONG = HttpStatusCodes.REQUEST_URI_TOO_LONG;
-var REQUESTED_RANGE_NOT_SATISFIABLE = HttpStatusCodes.REQUESTED_RANGE_NOT_SATISFIABLE;
-var RESET_CONTENT = HttpStatusCodes.RESET_CONTENT;
-var SEE_OTHER = HttpStatusCodes.SEE_OTHER;
-var SERVICE_UNAVAILABLE = HttpStatusCodes.SERVICE_UNAVAILABLE;
-var SWITCHING_PROTOCOLS = HttpStatusCodes.SWITCHING_PROTOCOLS;
-var TEMPORARY_REDIRECT = HttpStatusCodes.TEMPORARY_REDIRECT;
-var TOO_MANY_REQUESTS = HttpStatusCodes.TOO_MANY_REQUESTS;
-var UNAUTHORIZED = HttpStatusCodes.UNAUTHORIZED;
-var UNPROCESSABLE_ENTITY = HttpStatusCodes.UNPROCESSABLE_ENTITY;
-var UNSUPPORTED_MEDIA_TYPE = HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE;
-var USE_PROXY = HttpStatusCodes.USE_PROXY;
-
-var ACCEPTED_Text = HttpStatusCodes.getStatusText(202);
-var BAD_GATEWAY_Text = HttpStatusCodes.getStatusText(502);
-var BAD_REQUEST_Text = HttpStatusCodes.getStatusText(400);
-var CONFLICT_Text = HttpStatusCodes.getStatusText(409);
-var CONTINUE_Text = HttpStatusCodes.getStatusText(100);
-var CREATED_Text = HttpStatusCodes.getStatusText(201);
-var EXPECTATION_FAILED_Text = HttpStatusCodes.getStatusText(417);
-var FAILED_DEPENDENCY_Text = HttpStatusCodes.getStatusText(424);
-var FORBIDDEN_Text = HttpStatusCodes.getStatusText(403);
-var GATEWAY_TIMEOUT_Text = HttpStatusCodes.getStatusText(504);
-var GONE_Text = HttpStatusCodes.getStatusText(410);
-var HTTP_VERSION_NOT_SUPPORTED_Text = HttpStatusCodes.getStatusText(505);
-var INSUFFICIENT_SPACE_ON_RESOURCE_Text = HttpStatusCodes.getStatusText(419);
-var INSUFFICIENT_STORAGE_Text = HttpStatusCodes.getStatusText(507);
-var INTERNAL_SERVER_ERROR_Text = HttpStatusCodes.getStatusText(500);
-var LENGTH_REQUIRED_Text = HttpStatusCodes.getStatusText(411);
-var LOCKED_Text = HttpStatusCodes.getStatusText(423);
-var METHOD_FAILURE_Text = HttpStatusCodes.getStatusText(420);
-var METHOD_NOT_ALLOWED_Text = HttpStatusCodes.getStatusText(405);
-var MOVED_PERMANENTLY_Text = HttpStatusCodes.getStatusText(301);
-var MOVED_TEMPORARILY_Text = HttpStatusCodes.getStatusText(302);
-var MULTI_STATUS_Text = HttpStatusCodes.getStatusText(207);
-var MULTIPLE_CHOICES_Text = HttpStatusCodes.getStatusText(300);
-var NETWORK_AUTHENTICATION_REQUIRED_Text = HttpStatusCodes.getStatusText(511);
-var NO_CONTENT_Text = HttpStatusCodes.getStatusText(204);
-var NON_AUTHORITATIVE_INFORMATION_Text = HttpStatusCodes.getStatusText(203);
-var NOT_ACCEPTABLE_Text = HttpStatusCodes.getStatusText(406);
-var NOT_FOUND_Text = HttpStatusCodes.getStatusText(404);
-var NOT_IMPLEMENTED_Text = HttpStatusCodes.getStatusText(501);
-var NOT_MODIFIED_Text = HttpStatusCodes.getStatusText(304);
-var OK_Text = HttpStatusCodes.getStatusText(200);
-var PARTIAL_CONTENT_Text = HttpStatusCodes.getStatusText(206);
-var PAYMENT_REQUIRED_Text = HttpStatusCodes.getStatusText(402);
-var PRECONDITION_FAILED_Text = HttpStatusCodes.getStatusText(412);
-var PRECONDITION_REQUIRED_Text = HttpStatusCodes.getStatusText(428);
-var PROCESSING_Text = HttpStatusCodes.getStatusText(102);
-var PROXY_AUTHENTICATION_REQUIRED_Text = HttpStatusCodes.getStatusText(407);
-var REQUEST_HEADER_FIELDS_TOO_LARGE_Text = HttpStatusCodes.getStatusText(431);
-var REQUEST_TIMEOUT_Text = HttpStatusCodes.getStatusText(408);
-var REQUEST_TOO_LONG_Text = HttpStatusCodes.getStatusText(413);
-var REQUEST_URI_TOO_LONG_Text = HttpStatusCodes.getStatusText(414);
-var REQUESTED_RANGE_NOT_SATISFIABLE_Text = HttpStatusCodes.getStatusText(416);
-var RESET_CONTENT_Text = HttpStatusCodes.getStatusText(205);
-var SEE_OTHER_Text = HttpStatusCodes.getStatusText(303);
-var SERVICE_UNAVAILABLE_Text = HttpStatusCodes.getStatusText(503);
-var SWITCHING_PROTOCOLS_Text = HttpStatusCodes.getStatusText(101);
-var TEMPORARY_REDIRECT_Text = HttpStatusCodes.getStatusText(307);
-var TOO_MANY_REQUESTS_Text = HttpStatusCodes.getStatusText(429);
-var UNAUTHORIZED_Text = HttpStatusCodes.getStatusText(401);
-var UNPROCESSABLE_ENTITY_Text = HttpStatusCodes.getStatusText(422);
-var UNSUPPORTED_MEDIA_TYPE_Text = HttpStatusCodes.getStatusText(415);
-var USE_PROXY_Text = HttpStatusCodes.getStatusText(305);
\ No newline at end of file
diff --git a/types/http-status-codes/index.d.ts b/types/http-status-codes/index.d.ts
deleted file mode 100644
index 082ce9b767..0000000000
--- a/types/http-status-codes/index.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for Node.JS package http-status-codes v1.0.5
-// Project: https://github.com/prettymuchbryce/node-http-status
-// Definitions by: Josh McCullough <https://github.com/JoshMcCullough>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-export declare var ACCEPTED: number;
-export declare var BAD_GATEWAY: number;
-export declare var BAD_REQUEST: number;
-export declare var CONFLICT: number;
-export declare var CONTINUE: number;
-export declare var CREATED: number;
-export declare var EXPECTATION_FAILED: number;
-export declare var FAILED_DEPENDENCY: number;
-export declare var FORBIDDEN: number;
-export declare var GATEWAY_TIMEOUT: number;
-export declare var GONE: number;
-export declare var HTTP_VERSION_NOT_SUPPORTED: number;
-export declare var INSUFFICIENT_SPACE_ON_RESOURCE: number;
-export declare var INSUFFICIENT_STORAGE: number;
-export declare var INTERNAL_SERVER_ERROR: number;
-export declare var LENGTH_REQUIRED: number;
-export declare var LOCKED: number;
-export declare var METHOD_FAILURE: number;
-export declare var METHOD_NOT_ALLOWED: number;
-export declare var MOVED_PERMANENTLY: number;
-export declare var MOVED_TEMPORARILY: number;
-export declare var MULTI_STATUS: number;
-export declare var MULTIPLE_CHOICES: number;
-export declare var NETWORK_AUTHENTICATION_REQUIRED: number;
-export declare var NO_CONTENT: number;
-export declare var NON_AUTHORITATIVE_INFORMATION: number;
-export declare var NOT_ACCEPTABLE: number;
-export declare var NOT_FOUND: number;
-export declare var NOT_IMPLEMENTED: number;
-export declare var NOT_MODIFIED: number;
-export declare var OK: number;
-export declare var PARTIAL_CONTENT: number;
-export declare var PAYMENT_REQUIRED: number;
-export declare var PRECONDITION_FAILED: number;
-export declare var PRECONDITION_REQUIRED: number;
-export declare var PROCESSING: number;
-export declare var PROXY_AUTHENTICATION_REQUIRED: number;
-export declare var REQUEST_HEADER_FIELDS_TOO_LARGE: number;
-export declare var REQUEST_TIMEOUT: number;
-export declare var REQUEST_TOO_LONG: number;
-export declare var REQUEST_URI_TOO_LONG: number;
-export declare var REQUESTED_RANGE_NOT_SATISFIABLE: number;
-export declare var RESET_CONTENT: number;
-export declare var SEE_OTHER: number;
-export declare var SERVICE_UNAVAILABLE: number;
-export declare var SWITCHING_PROTOCOLS: number;
-export declare var TEMPORARY_REDIRECT: number;
-export declare var TOO_MANY_REQUESTS: number;
-export declare var UNAUTHORIZED: number;
-export declare var UNPROCESSABLE_ENTITY: number;
-export declare var UNSUPPORTED_MEDIA_TYPE: number;
-export declare var USE_PROXY: number;
-
-export declare function getStatusText(statusCode: number): string;
diff --git a/types/http-status-codes/tsconfig.json b/types/http-status-codes/tsconfig.json
deleted file mode 100644
index c6e7cecee8..0000000000
--- a/types/http-status-codes/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "http-status-codes-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/http-status/tslint.json b/types/http-status/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/http-status/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/http-string-parser/tslint.json b/types/http-string-parser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/http-string-parser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/httperr/tslint.json b/types/httperr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/httperr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hubspot-pace/tslint.json b/types/hubspot-pace/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hubspot-pace/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/humane/tslint.json b/types/humane/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/humane/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/humanparser/tslint.json b/types/humanparser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/humanparser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/humps/tslint.json b/types/humps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/humps/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hyperscript/tslint.json b/types/hyperscript/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hyperscript/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hypertext-application-language/tslint.json b/types/hypertext-application-language/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/hypertext-application-language/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/hystrixjs/hystrixjs-tests.ts b/types/hystrixjs/hystrixjs-tests.ts
index 676015be06..72c709068d 100644
--- a/types/hystrixjs/hystrixjs-tests.ts
+++ b/types/hystrixjs/hystrixjs-tests.ts
@@ -1,10 +1,10 @@
 import hystrixjs = require('hystrixjs');
 import q = require('q');
 
-var commandFactory = hystrixjs.commandFactory;
+const commandFactory = hystrixjs.commandFactory;
 
-var command = commandFactory
-    .getOrCreate('testCommand', 'testGroup')
+const command = commandFactory
+    .getOrCreate<string, string>('testCommand', 'testGroup')
     .circuitBreakerSleepWindowInMilliseconds(5000)
     .errorHandler((error) => {
         return false;
@@ -29,16 +29,16 @@ var command = commandFactory
 
 command.execute('something').then((result) => {
     console.log(result);
-})
+});
 
 commandFactory.resetCache();
 
-var metricsFactory = hystrixjs.metricsFactory;
+const metricsFactory = hystrixjs.metricsFactory;
 
-var metrics = metricsFactory.getOrCreate({
+const metrics = metricsFactory.getOrCreate({
     commandKey: 'metricsKey',
     commandGroup: 'metricsGroup'
-})
+});
 metrics.markSuccess();
 metrics.markFailure();
 metrics.markRejected();
@@ -48,7 +48,7 @@ metrics.decrementExecutionCount();
 metrics.getCurrentExecutionCount();
 metrics.addExecutionTime(3000);
 metrics.getRollingCount("FAILURE");
-var healthcounts = metrics.getHealthCounts();
+const healthcounts = metrics.getHealthCounts();
 console.log(healthcounts.totalCount);
 console.log(healthcounts.errorCount);
 console.log(healthcounts.errorPercentage);
@@ -59,7 +59,7 @@ metricsFactory.getAllMetrics().map((metrics) => {
     console.log(metrics.getCurrentExecutionCount());
 });
 
-var hystrixConfig = hystrixjs.hystrixConfig;
+const hystrixConfig = hystrixjs.hystrixConfig;
 console.log(hystrixConfig.metricsPercentileWindowBuckets());
 console.log(hystrixConfig.circuitBreakerForceClosed());
 console.log(hystrixConfig.circuitBreakerForceOpened());
@@ -73,11 +73,11 @@ console.log(hystrixConfig.metricsStatisticalWindowBuckets());
 console.log(hystrixConfig.metricsStatisticalWindowInMilliseconds());
 console.log(hystrixConfig.metricsPercentileWindowInMilliseconds());
 console.log(hystrixConfig.requestVolumeRejectionThreshold());
-console.log(hystrixConfig.resetProperties());
-console.log(hystrixConfig.init({}));
+hystrixConfig.resetProperties();
+hystrixConfig.init({});
 
-var hystrixSSEStream = hystrixjs.hystrixSSEStream;
+const hystrixSSEStream = hystrixjs.hystrixSSEStream;
 
 hystrixSSEStream.toObservable().subscribe((result) => {
     console.log(result);
-})
+});
diff --git a/types/hystrixjs/index.d.ts b/types/hystrixjs/index.d.ts
index b11305c13b..d3ee7bb416 100644
--- a/types/hystrixjs/index.d.ts
+++ b/types/hystrixjs/index.d.ts
@@ -1,28 +1,29 @@
-// Type definitions for dragula v2.1.2
+// Type definitions for hystrixjs 0.2
 // Project: https://bitbucket.org/igor_sechyn/hystrixjs
 // Definitions by: Igor Sechyn <https://github.com/igorsechyn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import * as Q from "q";
 import * as RX from "rx";
 
 export as namespace hystrixjs;
 export as namespace HystrixJS;
 
 export interface HystrixProperties {
-    "hystrix.force.circuit.open"?: boolean,
-    "hystrix.force.circuit.closed"?: boolean,
-    "hystrix.circuit.sleepWindowInMilliseconds"?: number,
-    "hystrix.circuit.errorThresholdPercentage"?: number,
-    "hystrix.circuit.volumeThreshold"?: number,
-    "hystrix.circuit.volumeThreshold.forceOverride"?: boolean,
-    "hystrix.circuit.volumeThreshold.override"?: number,
-    "hystrix.execution.timeoutInMilliseconds"?: number,
-    "hystrix.metrics.statistical.window.timeInMilliseconds"?: number,
-    "hystrix.metrics.statistical.window.bucketsNumber"?: number,
-    "hystrix.metrics.percentile.window.timeInMilliseconds"?: number,
-    "hystrix.metrics.percentile.window.bucketsNumber"?: number,
-    "hystrix.request.volume.rejectionThreshold"?: number
+    "hystrix.force.circuit.open"?: boolean;
+    "hystrix.force.circuit.closed"?: boolean;
+    "hystrix.circuit.sleepWindowInMilliseconds"?: number;
+    "hystrix.circuit.errorThresholdPercentage"?: number;
+    "hystrix.circuit.volumeThreshold"?: number;
+    "hystrix.circuit.volumeThreshold.forceOverride"?: boolean;
+    "hystrix.circuit.volumeThreshold.override"?: number;
+    "hystrix.execution.timeoutInMilliseconds"?: number;
+    "hystrix.metrics.statistical.window.timeInMilliseconds"?: number;
+    "hystrix.metrics.statistical.window.bucketsNumber"?: number;
+    "hystrix.metrics.percentile.window.timeInMilliseconds"?: number;
+    "hystrix.metrics.percentile.window.bucketsNumber"?: number;
+    "hystrix.request.volume.rejectionThreshold"?: number;
+    "hystrix.promise.implementation"?: PromiseConstructorLike;
 }
 
 export interface HystrixConfig {
@@ -38,14 +39,45 @@ export interface HystrixConfig {
     metricsStatisticalWindowBuckets(): number;
     metricsStatisticalWindowInMilliseconds(): number;
     metricsPercentileWindowInMilliseconds(): number;
-    metricsPercentileWindowBuckets(): number;
     requestVolumeRejectionThreshold(): number;
     resetProperties(): void;
     init(properties: HystrixProperties): void;
 }
 
 export interface Command {
-    execute(...args: any[]): Q.Promise<any>;
+    execute(...args: any[]): PromiseLike<any>;
+}
+
+export interface CommandA0<R> {
+    execute<R>(): PromiseLike<R>;
+}
+
+export interface CommandA1<R, T> {
+    execute(t: T): PromiseLike<R>;
+}
+
+export interface CommandA2<R, T, U> {
+    execute(t: T, u: U): PromiseLike<R>;
+}
+
+export interface CommandA3<R, T, U, V> {
+    execute(t: T, u: U, v: V): PromiseLike<R>;
+}
+
+export interface CommandA4<R, T, U, V, W> {
+    execute(t: T, u: U, v: V, w: W): PromiseLike<R>;
+}
+
+export interface CommandA5<R, T, U, V, W, X> {
+    execute(t: T, u: U, v: V, w: W, x: X): PromiseLike<R>;
+}
+
+export interface CommandA6<R, T, U, V, W, X, Y> {
+    execute(t: T, u: U, v: V, w: W, x: X, y: Y): PromiseLike<R>;
+}
+
+export interface CommandA7<R, T, U, V, W, X, Y, Z> {
+    execute(t: T, u: U, v: V, w: W, x: X, y: Y, z: Z): PromiseLike<R>;
 }
 
 export interface CommandBuilder {
@@ -61,14 +93,174 @@ export interface CommandBuilder {
     percentileWindowNumberOfBuckets(value: number): CommandBuilder;
     percentileWindowLength(value: number): CommandBuilder;
     circuitBreakerErrorThresholdPercentage(value: number): CommandBuilder;
-    run(value: (args: any) => Q.Promise<any>): CommandBuilder;
-    fallbackTo(value: (...args: any[]) => Q.Promise<any>): CommandBuilder;
     context(value: any): CommandBuilder;
+    run(value: (...args: any[]) => PromiseLike<any>): CommandBuilder;
+    fallbackTo(value: (error: Error, args ?: any[]) => PromiseLike<any>): CommandBuilder;
     build(): Command;
 }
 
+export interface CommandBuilderA0<R> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA0<R>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA0<R>;
+    timeout(value: number): CommandBuilderA0<R>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA0<R>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA0<R>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA0<R>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA0<R>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA0<R>;
+    statisticalWindowLength(value: number): CommandBuilderA0<R>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA0<R>;
+    percentileWindowLength(value: number): CommandBuilderA0<R>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA0<R>;
+    context(value: any): CommandBuilderA0<R>;
+    run(value: () => PromiseLike<R>): CommandBuilderA0<R>;
+    fallbackTo(value: (error: Error) => PromiseLike<R>): CommandBuilderA0<R>;
+    build(): CommandA0<R>;
+}
+
+export interface CommandBuilderA1<R, T> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA1<R, T>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA1<R, T>;
+    timeout(value: number): CommandBuilderA1<R, T>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA1<R, T>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA1<R, T>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA1<R, T>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA1<R, T>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA1<R, T>;
+    statisticalWindowLength(value: number): CommandBuilderA1<R, T>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA1<R, T>;
+    percentileWindowLength(value: number): CommandBuilderA1<R, T>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA1<R, T>;
+    context(value: any): CommandBuilderA1<R, T>;
+    run(value: (t: T) => PromiseLike<R>): CommandBuilderA1<R, T>;
+    fallbackTo(value: (error: Error, args: [T]) => PromiseLike<R>): CommandBuilderA1<R, T>;
+    build(): CommandA1<R, T>;
+}
+
+export interface CommandBuilderA2<R, T, U> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA2<R, T, U>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA2<R, T, U>;
+    timeout(value: number): CommandBuilderA2<R, T, U>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA2<R, T, U>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA2<R, T, U>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA2<R, T, U>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA2<R, T, U>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA2<R, T, U>;
+    statisticalWindowLength(value: number): CommandBuilderA2<R, T, U>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA2<R, T, U>;
+    percentileWindowLength(value: number): CommandBuilderA2<R, T, U>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA2<R, T, U>;
+    context(value: any): CommandBuilderA2<R, T, U>;
+    run(value: (t: T, u: U) => PromiseLike<R>): CommandBuilderA2<R, T, U>;
+    fallbackTo(value: (error: Error, args: [T, U]) => PromiseLike<R>): CommandBuilderA2<R, T, U>;
+    build(): CommandA2<R, T, U>;
+}
+
+export interface CommandBuilderA3<R, T, U, V> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA3<R, T, U, V>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA3<R, T, U, V>;
+    timeout(value: number): CommandBuilderA3<R, T, U, V>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA3<R, T, U, V>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA3<R, T, U, V>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA3<R, T, U, V>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA3<R, T, U, V>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA3<R, T, U, V>;
+    statisticalWindowLength(value: number): CommandBuilderA3<R, T, U, V>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA3<R, T, U, V>;
+    percentileWindowLength(value: number): CommandBuilderA3<R, T, U, V>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA3<R, T, U, V>;
+    context(value: any): CommandBuilderA3<R, T, U, V>;
+    run(value: (t: T, u: U, v: V) => PromiseLike<R>): CommandBuilderA3<R, T, U, V>;
+    fallbackTo(value: (error: Error, args: [T, U, V]) => PromiseLike<R>): CommandBuilderA3<R, T, U, V>;
+    build(): CommandA3<R, T, U, V>;
+}
+
+export interface CommandBuilderA4<R, T, U, V, W> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA4<R, T, U, V, W>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA4<R, T, U, V, W>;
+    timeout(value: number): CommandBuilderA4<R, T, U, V, W>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA4<R, T, U, V, W>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA4<R, T, U, V, W>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA4<R, T, U, V, W>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA4<R, T, U, V, W>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA4<R, T, U, V, W>;
+    statisticalWindowLength(value: number): CommandBuilderA4<R, T, U, V, W>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA4<R, T, U, V, W>;
+    percentileWindowLength(value: number): CommandBuilderA4<R, T, U, V, W>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA4<R, T, U, V, W>;
+    context(value: any): CommandBuilderA4<R, T, U, V, W>;
+    run(value: (t: T, u: U, v: V, w: W) => PromiseLike<R>): CommandBuilderA4<R, T, U, V, W>;
+    fallbackTo(value: (error: Error, args: [T, U, V, W]) => PromiseLike<R>): CommandBuilderA4<R, T, U, V, W>;
+    build(): CommandA4<R, T, U, V, W>;
+}
+
+export interface CommandBuilderA5<R, T, U, V, W, X> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA5<R, T, U, V, W, X>;
+    timeout(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA5<R, T, U, V, W, X>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA5<R, T, U, V, W, X>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    statisticalWindowLength(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    percentileWindowLength(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA5<R, T, U, V, W, X>;
+    context(value: any): CommandBuilderA5<R, T, U, V, W, X>;
+    run(value: (t: T, u: U, v: V, w: W, x: X) => PromiseLike<R>): CommandBuilderA5<R, T, U, V, W, X>;
+    fallbackTo(value: (error: Error, args: [T, U, V, W, X]) => PromiseLike<R>): CommandBuilderA5<R, T, U, V, W, X>;
+    build(): CommandA5<R, T, U, V, W, X>;
+}
+
+export interface CommandBuilderA6<R, T, U, V, W, X, Y> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    timeout(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    statisticalWindowLength(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    percentileWindowLength(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    context(value: any): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    run(value: (t: T, u: U, v: V, w: W, x: X, y: Y) => PromiseLike<R>): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    fallbackTo(value: (error: Error, args: [T, U, V, W, X, Y]) => PromiseLike<R>): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    build(): CommandA6<R, T, U, V, W, X, Y>;
+}
+
+export interface CommandBuilderA7<R, T, U, V, W, X, Y, Z> {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    errorHandler(value: (error: any) => boolean): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    timeout(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    requestVolumeRejectionThreshold(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    circuitBreakerForceOpened(value: boolean): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    circuitBreakerForceClosed(value: boolean): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    statisticalWindowLength(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    percentileWindowLength(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    context(value: any): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    run(value: (t: T, u: U, v: V, w: W, x: X, y: Y, z: Z) => PromiseLike<R>): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    fallbackTo(value: (error: Error, args: [T, U, V, W, X, Y, Z]) => PromiseLike<R>): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
+    build(): CommandA7<R, T, U, V, W, X, Y, Z>;
+}
+
 export interface CommandFactory {
     getOrCreate(commandKey: string, commandGroup?: string): CommandBuilder;
+    getOrCreate<R>(commandKey: string, commandGroup?: string): CommandBuilderA0<R>;
+    getOrCreate<R, T>(commandKey: string, commandGroup?: string): CommandBuilderA1<R, T>;
+    getOrCreate<R, T, U>(commandKey: string, commandGroup?: string): CommandBuilderA2<R, T, U>;
+    getOrCreate<R, T, U, V>(commandKey: string, commandGroup?: string): CommandBuilderA3<R, T, U, V>;
+    getOrCreate<R, T, U, V, W>(commandKey: string, commandGroup?: string): CommandBuilderA4<R, T, U, V, W>;
+    getOrCreate<R, T, U, V, W, X>(commandKey: string, commandGroup?: string): CommandBuilderA5<R, T, U, V, W, X>;
+    getOrCreate<R, T, U, V, W, X, Y>(commandKey: string, commandGroup?: string): CommandBuilderA6<R, T, U, V, W, X, Y>;
+    getOrCreate<R, T, U, V, W, X, Y, Z>(commandKey: string, commandGroup?: string): CommandBuilderA7<R, T, U, V, W, X, Y, Z>;
     resetCache(): void;
 }
 
@@ -95,28 +287,28 @@ export interface CommandMetrics {
 }
 
 export interface MetricsProperties {
-    commandKey: string,
-    commandGroup: string,
-    statisticalWindowTimeInMilliSeconds?: number,
-    statisticalWindowNumberOfBuckets?: number,
-    percentileWindowTimeInMilliSeconds?: number,
-    percentileWindowNumberOfBuckets?: number
+    commandKey: string;
+    commandGroup: string;
+    statisticalWindowTimeInMilliSeconds?: number;
+    statisticalWindowNumberOfBuckets?: number;
+    percentileWindowTimeInMilliSeconds?: number;
+    percentileWindowNumberOfBuckets?: number;
 }
 
 export interface MetricsFactory {
     getOrCreate(config: MetricsProperties): CommandMetrics;
     resetCache(): void;
-    getAllMetrics(): Array<CommandMetrics>;
+    getAllMetrics(): CommandMetrics[];
 }
 
 export interface CirctuiBreakerConfig {
-    circuitBreakerSleepWindowInMilliseconds: number,
-    commandKey: string,
-    circuitBreakerErrorThresholdPercentage: number,
-    circuitBreakerRequestVolumeThreshold: number,
-    commandGroup: string,
-    circuitBreakerForceClosed: boolean,
-    circuitBreakerForceOpened: boolean
+    circuitBreakerSleepWindowInMilliseconds: number;
+    commandKey: string;
+    circuitBreakerErrorThresholdPercentage: number;
+    circuitBreakerRequestVolumeThreshold: number;
+    commandGroup: string;
+    circuitBreakerForceClosed: boolean;
+    circuitBreakerForceOpened: boolean;
 }
 
 export interface CircuitBreaker {
@@ -128,16 +320,16 @@ export interface CircuitBreaker {
 
 export interface CircuitFactory {
     getOrCreate(config: CirctuiBreakerConfig): CircuitBreaker;
-    getCache(): Array<CircuitBreaker>;
+    getCache(): CircuitBreaker[];
     resetCache(): void;
 }
 
 export interface HystrixSSEStream {
-    toObservable(): Rx.Observable<any>
+    toObservable(): Rx.Observable<any>;
 }
 
-export var commandFactory: CommandFactory;
-export var metricsFactory: MetricsFactory;
-export var circuitFactory: CircuitFactory;
-export var hystrixSSEStream: HystrixSSEStream;
-export var hystrixConfig: HystrixConfig;
\ No newline at end of file
+export const commandFactory: CommandFactory;
+export const metricsFactory: MetricsFactory;
+export const circuitFactory: CircuitFactory;
+export const hystrixSSEStream: HystrixSSEStream;
+export const hystrixConfig: HystrixConfig;
diff --git a/types/hystrixjs/tsconfig.json b/types/hystrixjs/tsconfig.json
index 0cf5de7b81..480476e8d1 100644
--- a/types/hystrixjs/tsconfig.json
+++ b/types/hystrixjs/tsconfig.json
@@ -13,11 +13,7 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
+        "paths": {},
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -26,4 +22,4 @@
         "index.d.ts",
         "hystrixjs-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hystrixjs/tslint.json b/types/hystrixjs/tslint.json
new file mode 100644
index 0000000000..3fc34b8203
--- /dev/null
+++ b/types/hystrixjs/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "no-unnecessary-generics": false
+    }
+}
diff --git a/types/i18n-js/i18n-js-tests.ts b/types/i18n-js/i18n-js-tests.ts
new file mode 100644
index 0000000000..4f19dc4c02
--- /dev/null
+++ b/types/i18n-js/i18n-js-tests.ts
@@ -0,0 +1,81 @@
+/**
+ * Test suite created by Yuya Tanaka <https://github.com/ypresto>
+ * Created by using code examples from https://github.com/fnando/i18n-js
+ */
+
+import I18n = require("i18n-js");
+
+I18n.defaultLocale = "pt-BR";
+I18n.locale = "pt-BR";
+I18n.currentLocale() === "pt-BR";
+
+I18n.t("some.scoped.translation");
+I18n.t("some.scoped.translation", { locale: "fr" });
+I18n.t("hello", { name: "John Doe" });
+I18n.t("some.missing.scope", { defaultValue: "A default message" });
+I18n.t("noun", { defaultValue: "I'm a {{noun}}", noun: "Mac" });
+I18n.t("some.missing.scope", { defaults: [{ scope: "some.existing.scope" }] });
+I18n.t("some.missing.scope", { defaults: [{ message: "Some message" }] });
+
+I18n.fallbacks = true;
+I18n.locales.no = ["nb", "en"];
+I18n.locales.no = "nb";
+I18n.locales.no = locale => ["nb"];
+
+I18n.missingBehaviour = "guess";
+I18n.missingTranslationPrefix = "EE: ";
+I18n.missingTranslation = (scope, options) => "foobar";
+I18n.missingTranslation = (scope, options) => null;
+I18n.missingTranslation = (scope, options) => undefined;
+
+I18n.t("inbox.counting", { count: 10 });
+I18n.pluralization["ru"] = count => {
+    const key = count % 10 === 1 && count % 100 !== 11 ? "one"
+        : [2, 3, 4].indexOf(count % 10) >= 0 && [12, 13, 14].indexOf(count % 100) < 0 ? "few"
+            : count % 10 === 0 || [5, 6, 7, 8, 9].indexOf(count % 10) >= 0 || [11, 12, 13, 14].indexOf(count % 100) >= 0 ? "many"
+                : "other";
+    return [key];
+};
+
+const options = { scope: "activerecord.attributes.user" };
+I18n.t("name", options);
+I18n.t(["greetings", "hello"]);
+
+I18n.l("currency", 1990.99);
+I18n.l("number", 1990.99);
+I18n.l("percentage", 123.45);
+
+I18n.toNumber(1000);
+I18n.toCurrency(1000);
+I18n.toPercentage(100);
+
+I18n.toNumber(1000, { precision: 0 });
+I18n.toNumber(1000, { delimiter: ".", separator: "," });
+I18n.toNumber(1000, { delimiter: ".", precision: 0 });
+
+I18n.toCurrency(1000, { precision: 0 });
+
+I18n.toHumanSize(1234);
+
+I18n.l("date.formats.short", "2009-09-18");
+I18n.l("time.formats.short", "2009-09-18 23:12:43");
+I18n.l("time.formats.short", "2009-11-09T18:10:34");
+I18n.l("time.formats.short", "2009-11-09T18:10:34Z");
+I18n.l("date.formats.short", 1251862029000);
+I18n.l("date.formats.short", "09/18/2009");
+I18n.l("date.formats.short", (new Date()));
+
+I18n.l("date.formats.ordinal_day", "2009-09-18", { day: "18th" });
+
+I18n.strftime(new Date(), "%d/%m/%Y");
+
+const point_in_number = 1000;
+I18n.t("point", { count: point_in_number, formatted_number: I18n.toNumber(point_in_number) });
+
+I18n.translations = {};
+I18n.translations["en"] = {
+  message: "Some special message for you"
+};
+I18n.translations["pt-BR"] = {
+  message: "Uma mensagem especial para você"
+};
diff --git a/types/i18n-js/index.d.ts b/types/i18n-js/index.d.ts
new file mode 100644
index 0000000000..4800125087
--- /dev/null
+++ b/types/i18n-js/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for i18n-js 3.0
+// Project: https://github.com/fnando/i18n-js
+// Definitions by: Yuya Tanaka <https://github.com/ypresto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// tslint:disable-next-line:export-just-namespace
+export = I18n;
+export as namespace I18n;
+
+declare namespace I18n {
+    type Scope = string | string[];
+
+    let defaultLocale: string;
+    let locale: string;
+    let defaultSeparator: string;
+    let placeholder: RegExp;
+    let fallbacks: boolean;
+    let missingBehaviour: "message" | "guess";
+    let missingTranslationPrefix: string;
+
+    // tslint:disable-next-line prefer-declare-function
+    let missingTranslation: (scope: string, options?: TranslateOptions) => string | null | undefined;
+    // tslint:disable-next-line prefer-declare-function
+    let missingPlaceholder: (placeholder: string, message: string, options?: InterpolateOptions) => string | null | undefined;
+    // tslint:disable-next-line prefer-declare-function
+    let nullPlaceholder: (placeholder: string, message: string, options?: InterpolateOptions) => string | null | undefined;
+
+    let translations: { [locale: string]: object };
+    let locales: { [key: string]: string | string[] | ((locale: string) => string | string[]) };
+    let pluralization: { [locale: string]: (count: number) => string[] };
+
+    function reset(): void;
+
+    function currentLocale(): string;
+
+    interface InterpolateOptions {
+        [key: string]: any; // interpolation
+    }
+
+    interface TranslateOptions extends InterpolateOptions {
+        scope?: Scope;
+        message?: string;
+        defaults?: Array<{ message: string } | { scope: Scope }>;
+        defaultValue?: string;
+    }
+    function translate(scope: Scope, options?: TranslateOptions): string;
+    function t(scope: Scope, options?: TranslateOptions): string;
+
+    function localize(scope: "currency" | "number" | "percentage", value: number, options?: InterpolateOptions): string;
+    function localize(scope: Scope, value: string | number | Date, options?: InterpolateOptions): string;
+    function l(scope: "currency" | "number" | "percentage", value: number, options?: InterpolateOptions): string;
+    function l(scope: Scope, value: string | number | Date, options?: InterpolateOptions): string;
+
+    interface ToNumberOptions {
+        precision?: number;
+        separator?: string;
+        delimiter?: string;
+        strip_insignificant_zeros?: boolean;
+    }
+    function toNumber(num: number, options?: ToNumberOptions): string;
+
+    type ToPercentageOptions = ToNumberOptions;
+    function toPercentage(num: number, options?: ToPercentageOptions): string;
+
+    interface ToCurrencyOptions extends ToNumberOptions {
+        format?: string;
+        unit?: string;
+        sign_first?: boolean;
+    }
+    function toCurrency(num: number, options?: ToCurrencyOptions): string;
+
+    interface ToHumanSizeOptions extends ToNumberOptions {
+        format?: string;
+    }
+    function toHumanSize(num: number, options?: ToHumanSizeOptions): string;
+
+    function strftime(date: Date, format: string): string;
+}
diff --git a/types/i18n-js/tsconfig.json b/types/i18n-js/tsconfig.json
new file mode 100644
index 0000000000..4a9e4d110b
--- /dev/null
+++ b/types/i18n-js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "i18n-js-tests.ts"
+    ]
+}
diff --git a/types/i18n-js/tslint.json b/types/i18n-js/tslint.json
new file mode 100644
index 0000000000..299e93b32f
--- /dev/null
+++ b/types/i18n-js/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "indent": [true, "spaces", 4],
+        "quotemark": [true, "double", "avoid-escape"]
+    }
+}
diff --git a/types/i18n/index.d.ts b/types/i18n/index.d.ts
index 534b46b186..ee0f3d584f 100644
--- a/types/i18n/index.d.ts
+++ b/types/i18n/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 //                 FindQ <https://github.com/FindQ>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare namespace i18n {
     interface ConfigurationOptions {
@@ -159,15 +160,15 @@ declare namespace i18n {
 
     /**
      * Configure current i18n instance
-     * @param {ConfigurationOptions} options - configuration options for i18n
+     * @param options - configuration options for i18n
      */
     function configure(options: ConfigurationOptions): void;
 
     /**
      * Initialize i18n middleware for express
-     * @param {Express.Request} request - Current express request
-     * @param {Express.Response} response - Current express response
-     * @param {Function} next - Callback to continue process
+     * @param request - Current express request
+     * @param response - Current express response
+     * @param next - Callback to continue process
      */
     function init(request: Express.Request, response: Express.Response, next?: () => void): void;
 
@@ -175,15 +176,15 @@ declare namespace i18n {
 
     /**
      * Translate the given phrase using locale configuration
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @returns The translated phrase
      */
     function __(phraseOrOptions: string | TranslateOptions, ...replace: string[]): string;
     /**
      * Translate the given phrase using locale configuration
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @param {Replacements} replacements - An object containing replacements
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @param replacements - An object containing replacements
+     * @returns The translated phrase
      */
     function __(phraseOrOptions: string | TranslateOptions, replacements: Replacements): string;
 
@@ -193,17 +194,17 @@ declare namespace i18n {
 
     /**
      * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @param {number} [count] - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
+     * @param options - Options for plural translate
+     * @param [count] - The number which allow to select from plural to singular
+     * @returns The translated phrase
      */
     function __n(options: PluralOptions, count?: number): string;
     /**
      * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular phrase to translate if count is <= 1
-     * @param {string} plural - The plural phrase to translate if count is > 1
-     * @param {number | string} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
+     * @param singular - The singular phrase to translate if count is <= 1
+     * @param plural - The plural phrase to translate if count is > 1
+     * @param count - The number which allow to select from plural to singular
+     * @returns The translated phrase
      */
     function __n(singular: string, plural: string, count: number | string): string;
 
@@ -213,15 +214,15 @@ declare namespace i18n {
 
     /**
      * Translate the given phrase using locale configuration and MessageFormat
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @returns The translated phrase
      */
     function __mf(phraseOrOptions: string | TranslateOptions, ...replace: any[]): string;
     /**
      * Translate the given phrase using locale configuration and MessageFormat
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @param {Replacements} replacements - An object containing replacements
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @param replacements - An object containing replacements
+     * @returns The translated phrase
      */
     function __mf(phraseOrOptions: string | TranslateOptions, replacements: Replacements): string;
 
@@ -231,8 +232,8 @@ declare namespace i18n {
 
     /**
      * Returns a list of translations for a given phrase in each language.
-     * @param {string} phrase - The phrase to get translations in each language
-     * @returns {string[]} The phrase in each language
+     * @param phrase - The phrase to get translations in each language
+     * @returns The phrase in each language
      */
     function __l(phrase: string): string[];
 
@@ -242,8 +243,8 @@ declare namespace i18n {
 
     /**
      * Returns a hashed list of translations for a given phrase in each language.
-     * @param {string} phrase - The phrase to get translations in each language
-     * @returns {HashedList[]} The phrase in each language
+     * @param phrase - The phrase to get translations in each language
+     * @returns The phrase in each language
      */
     function __h(phrase: string): HashedList[];
 
@@ -253,36 +254,35 @@ declare namespace i18n {
 
     /**
      * Change the current active locale
-     * @param {string} locale - The locale to set as default
+     * @param locale - The locale to set as default
      */
     function setLocale(locale: string): void;
     /**
      * Change the current active locale for specified response
-     * @param {Express.Request | Express.Response} response - The request or response to change locale on
-     * @param {string} locale - The locale to set as default
-     * @param {boolean} [inheritance=false] - Disables inheritance if true
+     * @param response - The request or response to change locale on
+     * @param locale - The locale to set as default
+     * @param [inheritance=false] - Disables inheritance if true
      */
     // tslint:disable-next-line:unified-signatures
     function setLocale(requestOrResponse: Express.Request | Express.Response, locale: string, inheritance?: boolean): void;
     /**
      * Change the current active locale for specified response
-     * @param {any | any[]} objects - The object(s) to change locale on
-     * @param {string} locale - The locale to set as default
-     * @param {boolean} [inheritance=false] - Disables inheritance if true
+     * @param objects - The object(s) to change locale on
+     * @param locale - The locale to set as default
+     * @param [inheritance=false] - Disables inheritance if true
      */
     // tslint:disable-next-line:unified-signatures
     function setLocale(objects: any | any[], locale: string, inheritance?: boolean): void;
 
     /**
      * Get the current active locale for specified request
-     * @param {Express.Request} [request] - The request to get locale for
-     * @returns {string} The current locale in request
+     * @param [request] - The request to get locale for
+     * @returns The current locale in request
      */
     function getLocale(request?: Express.Request): string;
 
     /**
      * Get a list with all configured locales
-     * @returns {string[]}
      */
     function getLocales(): string[];
 
@@ -292,20 +292,20 @@ declare namespace i18n {
 
     /**
      * Get the current global catalog
-     * @returns {GlobalCatalog} The current global catalog
+     * @returns The current global catalog
      */
     function getCatalog(): GlobalCatalog;
     /**
      * Get the catalog for the given locale
-     * @param {string} locale - The locale to get catalog for
-     * @returns {LocaleCatalog} The specified locale catalog
+     * @param locale - The locale to get catalog for
+     * @returns The specified locale catalog
      */
     function getCatalog(locale: string): LocaleCatalog;
     /**
      * Get the current active locale catalog for specified request
-     * @param {Express.Request} request - The request to get locale catalog for
-     * @param {string} [locale] - The locale to get catalog for
-     * @returns {LocaleCatalog} The current locale catalog for the specified request
+     * @param request - The request to get locale catalog for
+     * @param [locale] - The locale to get catalog for
+     * @returns The current locale catalog for the specified request
      */
     function getCatalog(request: Express.Request, locale?: string): LocaleCatalog;
 
@@ -313,13 +313,12 @@ declare namespace i18n {
 
     /**
      * Override the current request locale by using the query param (?locale=en)
-     * @param {Express.Request} [request] - The request to override locale for
+     * @param [request] - The request to override locale for
      */
     function overrideLocaleFromQuery(request?: Express.Request): void;
 
     /**
      * Get current i18n-node version
-     * @member {string}
      */
     const version: string;
 }
@@ -331,15 +330,15 @@ interface i18nAPI {
 
     /**
      * Translate the given phrase using locale configuration
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @returns The translated phrase
      */
     __(phraseOrOptions: string | i18n.TranslateOptions, ...replace: string[]): string;
     /**
      * Translate the given phrase using locale configuration
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @param {i18n.Replacements} replacements - An object containing replacements
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @param replacements - An object containing replacements
+     * @returns The translated phrase
      */
     __(phraseOrOptions: string | i18n.TranslateOptions, replacements: i18n.Replacements): string;
 
@@ -349,17 +348,17 @@ interface i18nAPI {
 
     /**
      * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @param {number} [count] - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
+     * @param options - Options for plural translate
+     * @param [count] - The number which allow to select from plural to singular
+     * @returns The translated phrase
      */
     __n(options: i18n.PluralOptions, count?: number): string;
     /**
      * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular phrase to translate if count is <= 1
-     * @param {string} plural - The plural phrase to translate if count is > 1
-     * @param {number | string} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
+     * @param singular - The singular phrase to translate if count is <= 1
+     * @param plural - The plural phrase to translate if count is > 1
+     * @param count - The number which allow to select from plural to singular
+     * @returns The translated phrase
      */
     __n(singular: string, plural: string, count: number | string): string;
 
@@ -369,15 +368,15 @@ interface i18nAPI {
 
     /**
      * Translate the given phrase using locale configuration and MessageFormat
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @returns The translated phrase
      */
     __mf(phraseOrOptions: string | i18n.TranslateOptions, ...replace: any[]): string;
     /**
      * Translate the given phrase using locale configuration and MessageFormat
-     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
-     * @param {i18n.Replacements} replacements - An object containing replacements
-     * @returns {string} The translated phrase
+     * @param phraseOrOptions - The phrase to translate or options for translation
+     * @param replacements - An object containing replacements
+     * @returns The translated phrase
      */
     __mf(phraseOrOptions: string | i18n.TranslateOptions, replacements: i18n.Replacements): string;
 
@@ -387,8 +386,8 @@ interface i18nAPI {
 
     /**
      * Returns a list of translations for a given phrase in each language.
-     * @param {string} phrase - The phrase to get translations in each language
-     * @returns {string[]} The phrase in each language
+     * @param phrase - The phrase to get translations in each language
+     * @returns The phrase in each language
      */
     __l(phrase: string): string[];
 
@@ -398,8 +397,8 @@ interface i18nAPI {
 
     /**
      * Returns a hashed list of translations for a given phrase in each language.
-     * @param {string} phrase - The phrase to get translations in each language
-     * @returns {HashedList[]} The phrase in each language
+     * @param phrase - The phrase to get translations in each language
+     * @returns The phrase in each language
      */
     __h(phrase: string): i18n.HashedList[];
 
@@ -407,25 +406,25 @@ interface i18nAPI {
 
     /**
      * Get the current active locale
-     * @returns {string} The current locale in request
+     * @returns The current locale in request
      */
     getLocale(): string;
 
     /**
      * Change the current active locale
-     * @param {string} locale - The locale to set as default
+     * @param locale - The locale to set as default
      */
     setLocale(locale: string): void;
 
     /**
      * Get the current global catalog
-     * @returns {GlobalCatalog} The current global catalog
+     * @returns The current global catalog
      */
     getCatalog(): i18n.GlobalCatalog;
     /**
      * Get the catalog for the given locale
-     * @param {string} locale - The locale to get catalog for
-     * @returns {LocaleCatalog} The specified locale catalog
+     * @param locale - The locale to get catalog for
+     * @returns The specified locale catalog
      */
     getCatalog(locale?: string): i18n.LocaleCatalog;
 }
diff --git a/types/i18next-browser-languagedetector/index.d.ts b/types/i18next-browser-languagedetector/index.d.ts
index 1e85fd81e4..6eec150445 100644
--- a/types/i18next-browser-languagedetector/index.d.ts
+++ b/types/i18next-browser-languagedetector/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://i18next.com/
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace i18nextBrowserLanguageDetector {
     interface DetectorOptions {
diff --git a/types/i18next-browser-languagedetector/v0/index.d.ts b/types/i18next-browser-languagedetector/v0/index.d.ts
index 424573f9b8..9d8f58a52a 100644
--- a/types/i18next-browser-languagedetector/v0/index.d.ts
+++ b/types/i18next-browser-languagedetector/v0/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://i18next.com/
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as i18next from "i18next";
 
@@ -11,10 +12,7 @@ declare namespace I18next {
 }
 
 declare namespace i18nextBrowserLanguageDetector {
-    /**
-     * @summary Interface for Language detector options.
-     * @interface
-     */
+    /** Interface for Language detector options. */
     interface LanguageDetectorOptions {
         caches?: string[] | boolean;
         cookieDomain?: string;
@@ -26,10 +24,7 @@ declare namespace i18nextBrowserLanguageDetector {
         order?: string[];
     }
 
-    /**
-     * @summary Interface for custom detector.
-     * @interface
-     */
+    /** Interface for custom detector. */
     interface CustomDetector {
         name: string;
 
@@ -38,43 +33,24 @@ declare namespace i18nextBrowserLanguageDetector {
         lookup(options: {}): string;
     }
 
-    /**
-     * @summary i18next options.
-     * @interface
-     */
+    /** i18next options. */
     interface I18nextOptions {
         detection?: LanguageDetectorOptions;
     }
 
-    /**
-     * @summary i18next interface.
-     * @interface
-     */
+    /** i18next interface. */
     interface I18nextStatic {
         use(module: LngDetector): I18nextStatic;
     }
 
-    /**
-     * @summary i18next language detection.
-     * @class
-     */
+    /** i18next language detection. */
     class LngDetector {
-        /**
-         * @summary Constructor.
-         * @constructor
-         */
         constructor(services?: any, options?: LanguageDetectorOptions);
 
-        /**
-         * @summary Adds detector.
-         * @param {CustomDetector} detector The custom detector.
-         */
+        /** Adds detector. */
         addDetector(detector: CustomDetector): LngDetector;
 
-        /**
-         * @summary Initializes detector.
-         * @param {LanguageDetectorOptions} options The options.
-         */
+        /** Initializes detector. */
         init(options?: LanguageDetectorOptions): void;
     }
 }
diff --git a/types/i18next-express-middleware/tslint.json b/types/i18next-express-middleware/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/i18next-express-middleware/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/i18next-node-fs-backend/tslint.json b/types/i18next-node-fs-backend/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/i18next-node-fs-backend/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/i18next-sprintf-postprocessor/tslint.json b/types/i18next-sprintf-postprocessor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/i18next-sprintf-postprocessor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/i18next-xhr-backend/index.d.ts b/types/i18next-xhr-backend/index.d.ts
index a3190ca878..c4e8a41b4a 100644
--- a/types/i18next-xhr-backend/index.d.ts
+++ b/types/i18next-xhr-backend/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/i18next/i18next-xhr-backend
 // Definitions by: Jan Mühlemann <https://github.com/jamuhl>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace I18NextXhrBackend {
     type LoadPathOption = string | ((lngs: string[], namespaces: string[]) => string);
diff --git a/types/i2c-bus/tslint.json b/types/i2c-bus/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/i2c-bus/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/iban/tslint.json b/types/iban/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/iban/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ibm-mobilefirst/tslint.json b/types/ibm-mobilefirst/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ibm-mobilefirst/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/icepick/tslint.json b/types/icepick/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/icepick/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/icheck/tslint.json b/types/icheck/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/icheck/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/iconv-lite/iconv-lite-tests.ts b/types/iconv-lite/iconv-lite-tests.ts
deleted file mode 100644
index f89e84e195..0000000000
--- a/types/iconv-lite/iconv-lite-tests.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Code examples from iconv-lite README
-
-import * as iconv from "iconv-lite";
-
-import * as assert from "assert";
-import * as fs from "fs";
-import * as http from "http";
-
-// Basic API
-(() => {
-	// Convert from an encoded buffer to js string.
-	const str: string = iconv.decode(new Buffer([0x68, 0x65, 0x6c, 0x6c, 0x6f]), 'win1251');
-
-	// Convert from js string to an encoded buffer.
-	const buf: Buffer = iconv.encode("Sample input string", 'win1251');
-
-	// Check if encoding is supported
-	const exists: boolean = iconv.encodingExists("us-ascii");
-})();
-
-// Streaming API
-(() => {
-	// Decode stream (from binary stream to js strings)
-	http.createServer(function(req, res) {
-		var converterStream = iconv.decodeStream('win1251');
-		req.pipe(converterStream);
-
-		converterStream.on('data', function(str: string) {
-			console.log(str); // Do something with decoded strings, chunk-by-chunk.
-		});
-	});
-
-	// Convert encoding streaming example
-	fs.createReadStream('file-in-win1251.txt')
-		.pipe(iconv.decodeStream('win1251'))
-		.pipe(iconv.encodeStream('ucs2'))
-		.pipe(fs.createWriteStream('file-in-ucs2.txt'));
-
-	// Sugar: all encode/decode streams have .collect(cb) method to accumulate data.
-	http.createServer(function(req, res) {
-		req.pipe(iconv.decodeStream('win1251')).collect(function(err, body) {
-			assert(typeof body == 'string');
-			console.log(body); // full request body string
-		});
-	});
-})();
-
-// Extend Node.js own encodings
-(() => {
-	iconv.extendNodeEncodings();
-	iconv.undoExtendNodeEncodings();
-})();
diff --git a/types/iconv-lite/index.d.ts b/types/iconv-lite/index.d.ts
deleted file mode 100644
index 4c0f1ecf11..0000000000
--- a/types/iconv-lite/index.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for iconv-lite
-// Project: https://github.com/ashtuchkin/iconv-lite
-// Definitions by: Martin Poelstra <https://github.com/poelstra>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/// <reference types="node" />
-
-import stream = require("stream");
-
-export interface Options {
-    stripBOM: boolean;
-    addBOM: boolean;
-    defaultEncoding: string;
-}
-
-export function decode(buffer: Buffer, encoding: string, options?: Options): string;
-export function encode(source: string, encoding: string, options?: Options): Buffer;
-export function encodingExists(encoding: string): boolean;
-
-export class DecodeStream extends stream.Transform {
-    collect(cb: (err: Error, decoded: string) => any): DecodeStream;
-}
-
-export class EncodeStream extends stream.Transform {
-    collect(cb: (err: Error, decoded: Buffer) => any): EncodeStream;
-}
-
-export function decodeStream(encoding: string, options?: Options): DecodeStream;
-export function encodeStream(encoding: string, options?: Options): EncodeStream;
-
-export function extendNodeEncodings(): void;
-export function undoExtendNodeEncodings(): void;
diff --git a/types/iconv-lite/tsconfig.json b/types/iconv-lite/tsconfig.json
deleted file mode 100644
index 27ea4716bf..0000000000
--- a/types/iconv-lite/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "iconv-lite-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/iconv/tslint.json b/types/iconv/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/iconv/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ids/tslint.json b/types/ids/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ids/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/iframe-resizer/index.d.ts b/types/iframe-resizer/index.d.ts
index 9c6f7e80ba..8d65629da6 100644
--- a/types/iframe-resizer/index.d.ts
+++ b/types/iframe-resizer/index.d.ts
@@ -260,7 +260,7 @@ export interface IFrameResizedData {
 // tslint:disable-next-line:interface-name
 export interface IFrameMessageData {
   iframe: IFrameComponent;
-  message: string;
+  message: any;
 }
 
 // tslint:disable-next-line:interface-name
diff --git a/types/ignite-ui/index.d.ts b/types/ignite-ui/index.d.ts
index ad29e6d24a..bff55ec33d 100644
--- a/types/ignite-ui/index.d.ts
+++ b/types/ignite-ui/index.d.ts
@@ -6,14 +6,12 @@
 interface DataSourceSettingsPaging {
 	/**
 	 * Paging is not enabled by default
-	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Type for the paging operation
 	 *
-	 *
 	 * Valid values:
 	 * "local" Data is paged client-side.
 	 * "remote" A remote request is done and URL params encoded
@@ -22,31 +20,26 @@ interface DataSourceSettingsPaging {
 
 	/**
 	 * Number of records on each page
-	 *
 	 */
 	pageSize?: number;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size
-	 *
 	 */
 	pageSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index
-	 *
 	 */
 	pageIndexUrlKey?: string;
 
 	/**
 	 * Current page index
-	 *
 	 */
 	pageIndex?: number;
 
 	/**
 	 * Whether when a new page of data is requested we should append the new data to the existing data
-	 *
 	 */
 	appendPage?: boolean;
 
@@ -68,55 +61,46 @@ interface DataSourceSettingsFiltering {
 
 	/**
 	 * Enables or disables case sensitive filtering on the data. Works only for local filtering
-	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * If the type of paging/sorting/filtering is local and applyToAllData is true, filtering will be performed on the whole data source that's present locally, otherwise only on the current dataView. if type is remote, this setting doesn't have any effect.
-	 *
 	 */
 	applyToAllData?: boolean;
 
 	/**
 	 * Can point to either a string or a function object. The parameters that are passed are 1) the data array to be filtered, 2) the filtering expression definitions. Should return an array of the filtered data
-	 *
 	 */
 	customFunc?: any;
 
 	/**
 	 * Url key that will be encoded in the request if remote filtering is performed. Default value of null implies OData-style URL encoding. Please see http://www.odata.org/developers/protocols/uri-conventions for details
-	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Url key that will be encoded in the request, specifying if the filtering logic will be AND or OR
-	 *
 	 */
 	filterLogicUrlKey?: string;
 
 	/**
 	 * Data will be initially filtered accordingly, directly after dataBind()
-	 *
 	 */
 	defaultFields?: any[];
 
 	/**
 	 * A list of expression objects, containing the following key-value pairs: fieldName, expression (search string), condition , and logic (AND/OR)
-	 *
 	 */
 	expressions?: any[];
 
 	/**
 	 * An "SQL-like' encoded expressions string. Takes precedence over "expressions". Example: col2 > 100; col2 LIKE %test%
-	 *
 	 */
 	exprString?: string;
 
 	/**
 	 * An object containing custom defined filtering conditions as objects.
-	 *
 	 */
 	customConditions?: any;
 
@@ -130,7 +114,6 @@ interface DataSourceSettingsSorting {
 	/**
 	 * Sorting direction
 	 *
-	 *
 	 * Valid values:
 	 * "none"
 	 * "asc"
@@ -140,38 +123,32 @@ interface DataSourceSettingsSorting {
 
 	/**
 	 * When defaultDirection is different than "none", and defaultFields is specified, data will be initially sorted accordingly, directly after dataBind()
-	 *
 	 */
 	defaultFields?: any[];
 
 	/**
 	 * If the sorting type is local and applyToAllData is true, sorting will be performed on the whole data source that's present locally, otherwise only on the current dataView. If sorting type is remote, this setting doesn't have any effect.
-	 *
 	 */
 	applyToAllData?: boolean;
 
 	/**
 	 * Custom sorting function that can point to either a string or a function object. When the function is called, the following arguments are passed: data array, fields (array of field definitions) , direction ("asc" or "desc"). The function should return a sorted data array
-	 *
 	 */
 	customFunc?: any;
 
 	/**
 	 * Custom comparison sorting function. Accepts the following arguments: fields, schema, booleand value whether sorting is ascending , convert function(please check option for customConvertFunc) and returns a value 0 indicating that values are equal, 1 indicating that val1 > val2 and -1 indicating that val1 < val2
-	 *
 	 */
 	compareFunc?: any;
 
 	/**
 	 * Custom data value conversion function(called from sorting function). Accepts a value of the data cell and column key and should return the converted value
-	 *
 	 */
 	customConvertFunc?: any;
 
 	/**
 	 * Specifies whether sorting will be applied locally or remotely (via a remote request)
 	 *
-	 *
 	 * Valid values:
 	 * "remote"
 	 * "local"
@@ -180,37 +157,31 @@ interface DataSourceSettingsSorting {
 
 	/**
 	 * Specifies if sorting will be case sensitive or not. Works only for local sorting
-	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Default is null and uses OData conventions
-	 *
 	 */
 	sortUrlKey?: string;
 
 	/**
 	 * URL param value for ascending type of sorting. Default is null and uses OData conventions
-	 *
 	 */
 	sortUrlAscValueKey?: string;
 
 	/**
 	 * URL param value for descending type of sorting. Default is null and uses OData conventions
-	 *
 	 */
 	sortUrlDescValueKey?: string;
 
 	/**
 	 * A list of sorting expressions , consisting of the following keys (and their respective values): fieldName, direction and compareFunc (optional)
-	 *
 	 */
 	expressions?: any[];
 
 	/**
 	 * Takes precedence over experssions, an "SQL-like" encoded expressions string  : see sort(). Example col2 > 100 ORDER BY asc
-	 *
 	 */
 	exprString?: string;
 
@@ -223,33 +194,28 @@ interface DataSourceSettingsSorting {
 interface DataSourceSettingsGroupby {
 	/**
 	 * Default collapse state
-	 *
 	 */
 	defaultCollapseState?: boolean;
 
 	/**
 	 * The name of the property that determines whether a record from the group data view is a group record.
-	 *
 	 */
 	groupRecordKey?: string;
 
 	/**
 	 * The name of the property that determines whether a record from the group data view is a summary group record.
-	 *
 	 */
 	groupSummaryRecordKey?: string;
 
 	/**
 	 * Array of objects containing the summaries for each field.
 	 * Each summary object has the following format { field:"fieldName", summaryFunctions: [] }, where the summaryFunctions arrays can contain either a summary name (avg, sum, count etc.) or a custom function for caclulating a custom summary.
-	 *
 	 */
 	summaries?: any[];
 
 	/**
 	 * Specifies the postion for the summaries for each field inside each group.
 	 *
-	 *
 	 * Valid values:
 	 * "top" One summary row will be displayed at the top for each group
 	 * "bottom"  One summary row will be displayed at the bottom for each group
@@ -260,7 +226,6 @@ interface DataSourceSettingsGroupby {
 	/**
 	 * . Specifies how paging should be applied when there is at least one grouped column
 	 *
-	 *
 	 * Valid values:
 	 * "allRecords" Paging is applied for all records - data and non-data records(like group-by records)
 	 * "dataRecordsOnly" Paging is applied ONLY for data records. Non-data records are disregarded in paging calculations.
@@ -277,7 +242,6 @@ interface DataSourceSettingsSummaries {
 	/**
 	 * Specifies whether summaries will be applied locally or remotely (via a remote request)
 	 *
-	 *
 	 * Valid values:
 	 * "remote" A remote request is done and URL params encoded
 	 * "local" Data is paged client-side.
@@ -286,20 +250,17 @@ interface DataSourceSettingsSummaries {
 
 	/**
 	 * Url key for retrieving data from response - used only when summaries are remote
-	 *
 	 */
 	summaryExprUrlKey?: string;
 
 	/**
 	 * Key for retrieving data from the summaries response - used only when summaries are remote
-	 *
 	 */
 	summariesResponseKey?: string;
 
 	/**
 	 * Determines when the summary values are calculated
 	 *
-	 *
 	 * Valid values:
 	 * "priortofilteringandpaging"
 	 * "afterfilteringbeforepaging"
@@ -309,7 +270,6 @@ interface DataSourceSettingsSummaries {
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
-	 *
 	 */
 	columnSettings?: any[];
 
@@ -322,62 +282,52 @@ interface DataSourceSettingsSummaries {
 interface DataSourceSettings {
 	/**
 	 * Setting this is only necessary when the data source is set to a table in string format. we need to create an invisible dummy data container in the body and append the table data to it
-	 *
 	 */
 	id?: string;
 
 	/**
 	 * This is the property in the dataView where actual resulting records will be put. (So the dataView will not be array but an object if this is defined), after the potential data source transformation
-	 *
 	 */
 	outputResultsName?: string;
 
 	/**
 	 * Callback function to call when data binding is complete
-	 *
 	 */
 	callback?: Function;
 
 	/**
 	 * Object on which to invoke the callback function
-	 *
 	 */
 	callee?: any;
 
 	/**
 	 * This is the normalized (transformed) resulting data, after it's fetched from the data source
-	 *
 	 */
 	data?: any[];
 
 	/**
 	 * This is the source of data - non normalized. Can be an array, can be reference to some JSON object, can be a DOM element for a HTML TABLE, or a function
-	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Client-side dataBinding event. Can be a string pointing to a function name, or an object pointing to a function
-	 *
 	 */
 	dataBinding?: any;
 
 	/**
 	 * Client-side dataBound event. Can be a string pointing to a function name, or an object pointing to a function
-	 *
 	 */
 	dataBound?: any;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request
-	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Type of the data source
 	 *
-	 *
 	 * Valid values:
 	 * "json" Specifies that the data source is an already evaluated JSON (JavaScript object/array) or a string that can be evaluated to JSON
 	 * "xml" Specifies that the data source is a XML Document object or a string that can be evaluated to XML
@@ -397,32 +347,27 @@ interface DataSourceSettings {
 
 	/**
 	 * A schema object that defines which fields from the data to bind to
-	 *
 	 */
 	schema?: any;
 
 	/**
 	 * The unique field identifier
-	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * Property in the response which specifies the total number of records in the backend (this is needed for paging)
-	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped)
-	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType
 	 *
-	 *
 	 * Valid values:
 	 * "json"
 	 * "xml"
@@ -435,55 +380,46 @@ interface DataSourceSettings {
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * If set to false will disable transformations on schema, even if it is defined locally in the javascript code
-	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Event that is fired before URL parameters are encoded. Can point to a function name or the function object itself
-	 *
 	 */
 	urlParamsEncoding?: any;
 
 	/**
 	 * Event that is fired after URL parameters are encoded (When a remote request is done). Can point to a function name or the function object itself
-	 *
 	 */
 	urlParamsEncoded?: any;
 
 	/**
 	 * Settings related to built-in paging functionality
-	 *
 	 */
 	paging?: DataSourceSettingsPaging;
 
 	/**
 	 * Settings related to built-in filtering functionality
-	 *
 	 */
 	filtering?: DataSourceSettingsFiltering;
 
 	/**
 	 * Settings related to built-in sorting functionality
-	 *
 	 */
 	sorting?: DataSourceSettingsSorting;
 
 	/**
 	 * Settings related to built-in group by functionality
-	 *
 	 */
 	groupby?: DataSourceSettingsGroupby;
 
 	/**
 	 * Settings related to built-in summaries functionality
-	 *
 	 */
 	summaries?: DataSourceSettingsSummaries;
 
@@ -491,13 +427,11 @@ interface DataSourceSettings {
 	 * *** IMPORTANT DEPRECATED ***
 	 * A list of field definitions specifying the schema of the data source.
 	 * Field objects description: {name, [type], [xpath]}
-	 *
 	 */
 	fields?: any[];
 
 	/**
 	 * If true, will serialize the transaction log of updated values - if any - whenever commit is performed via a remote request.
-	 *
 	 */
 	serializeTransactionLog?: boolean;
 
@@ -506,19 +440,16 @@ interface DataSourceSettings {
 	 * if a new row is added, and then deleted, there will be no transaction added to the log
 	 * if an edit is made to a row or cell, then the value is brought back to its original value, the transaction should be removed
 	 * Note: This option takes effect only when autoCommit is set to false.
-	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * If auto commit is true, data will be automatically commited to the data source, once a value or a batch of values are updated via saveChanges()
-	 *
 	 */
 	autoCommit?: boolean;
 
 	/**
 	 * Specifies an update remote URL, to which an AJAX request will be made as soon as saveChages() is called.
-	 *
 	 */
 	updateUrl?: string;
 
@@ -528,7 +459,6 @@ interface DataSourceSettings {
 	 * Use item.row to obtain reference to the added row.
 	 * Use item.rowId to get the row ID.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
-	 *
 	 */
 	rowAdded?: Function;
 
@@ -539,7 +469,6 @@ interface DataSourceSettings {
 	 * Use item.newRow to obtain reference to the updated row.
 	 * Use item.oldRow to obtain reference to the row that was updated.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
-	 *
 	 */
 	rowUpdated?: Function;
 
@@ -550,7 +479,6 @@ interface DataSourceSettings {
 	 * Use item.rowId to get the row ID.
 	 * Use item.rowIndex to get the row index.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
-	 *
 	 */
 	rowInserted?: Function;
 
@@ -560,7 +488,6 @@ interface DataSourceSettings {
 	 * Use item.rowId to get the row ID.
 	 * Use item.rowIndex to get the row index.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
-	 *
 	 */
 	rowDeleted?: Function;
 
@@ -601,8 +528,6 @@ class DataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -649,15 +574,12 @@ class DataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -675,7 +597,6 @@ class DataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -683,7 +604,6 @@ class DataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -896,9 +816,6 @@ class DataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -959,8 +876,6 @@ class DataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -1040,8 +955,6 @@ class TypeParser {
 
 	/**
 	 * L.A. 18 June 2012 Fixing bug #113265 Column 'date' shows empty values as 'NaN'
-	 *
-	 * @param obj
 	 */
 	toDate(obj: Object): void;
 	toNumber(obj: Object): void;
@@ -1064,7 +977,6 @@ interface DataSchemaSchemaFields {
 	 * bool
 	 * date
 	 * object
-	 *
 	 */
 	type?: string|number|boolean|Date|Object;
 
@@ -1179,8 +1091,6 @@ class RemoteDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -1227,15 +1137,12 @@ class RemoteDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -1253,7 +1160,6 @@ class RemoteDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -1261,7 +1167,6 @@ class RemoteDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -1474,9 +1379,6 @@ class RemoteDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -1537,8 +1439,6 @@ class RemoteDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -1655,8 +1555,6 @@ class JSONDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -1703,15 +1601,12 @@ class JSONDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -1729,7 +1624,6 @@ class JSONDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -1737,7 +1631,6 @@ class JSONDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -1950,9 +1843,6 @@ class JSONDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -2013,8 +1903,6 @@ class JSONDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -2209,9 +2097,6 @@ class RESTDataSource {
 
 	/**
 	 * Posts to the restSettings urls using $.ajax, by serializing the changes as url params.
-	 *
-	 * @param success
-	 * @param error
 	 */
 	saveChanges(success: Object, error: Object): void;
 
@@ -2242,8 +2127,6 @@ class RESTDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -2290,15 +2173,12 @@ class RESTDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -2316,7 +2196,6 @@ class RESTDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -2324,7 +2203,6 @@ class RESTDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -2529,9 +2407,6 @@ class RESTDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -2592,8 +2467,6 @@ class RESTDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -2670,7 +2543,6 @@ RESTDataSource: typeof Infragistics.RESTDataSource;
 interface JSONPDataSourceSettings {
 	/**
 	 * Override the callback function name in a jsonp request. Sets option jsonp in $.ajax functionbool Setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation
-	 *
 	 */
 	jsonp?: string|boolean;
 
@@ -2721,8 +2593,6 @@ class JSONPDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -2769,15 +2639,12 @@ class JSONPDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -2795,7 +2662,6 @@ class JSONPDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -2803,7 +2669,6 @@ class JSONPDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -3016,9 +2881,6 @@ class JSONPDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -3079,8 +2941,6 @@ class JSONPDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -3185,8 +3045,6 @@ class XmlDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -3233,15 +3091,12 @@ class XmlDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -3259,7 +3114,6 @@ class XmlDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -3267,7 +3121,6 @@ class XmlDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -3480,9 +3333,6 @@ class XmlDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -3543,8 +3393,6 @@ class XmlDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -3661,8 +3509,6 @@ class FunctionDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -3709,15 +3555,12 @@ class FunctionDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -3735,7 +3578,6 @@ class FunctionDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -3743,7 +3585,6 @@ class FunctionDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -3956,9 +3797,6 @@ class FunctionDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -4019,8 +3857,6 @@ class FunctionDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -4137,8 +3973,6 @@ class HtmlTableDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -4185,15 +4019,12 @@ class HtmlTableDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -4211,7 +4042,6 @@ class HtmlTableDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -4219,7 +4049,6 @@ class HtmlTableDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -4432,9 +4261,6 @@ class HtmlTableDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -4495,8 +4321,6 @@ class HtmlTableDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -4601,8 +4425,6 @@ class ArrayDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -4649,15 +4471,12 @@ class ArrayDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -4675,7 +4494,6 @@ class ArrayDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -4683,7 +4501,6 @@ class ArrayDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -4896,9 +4713,6 @@ class ArrayDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -4959,8 +4773,6 @@ class ArrayDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -5128,8 +4940,6 @@ class MashupDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -5176,15 +4986,12 @@ class MashupDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -5202,7 +5009,6 @@ class MashupDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -5210,7 +5016,6 @@ class MashupDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -5362,9 +5167,6 @@ class MashupDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -5425,8 +5227,6 @@ class MashupDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -5635,7 +5435,6 @@ interface TreeHierarchicalDataSourceSettingsTreeDSPaging {
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is 'rootLevelOnly' then the context row always shows the value of the contextRowRootText option.
 	 *
-	 *
 	 * Valid values:
 	 * "none" Does not render the contextual row
 	 * "parent" Renders a read-only representation of the immediate parent row
@@ -5714,19 +5513,16 @@ interface TreeHierarchicalDataSourceSettingsTreeDS {
 
 	/**
 	 * If set to TRUE it is expected that the source of data is normalized and transformed(has set dataLevel and expansion state). The source of data is used as flatDataView. Usually used when the paging is remote and paging mode is allLevels, or features are remote(and the processing of the returned result should be made on the server)
-	 *
 	 */
 	initialFlatDataView?: boolean;
 
 	/**
 	 * Specifies a custom function to be called when requesting data to the server - usually when expanding/collapsing record. If set the function should return the encoded URL. It takes as parameters: data record(type: object), expand - (type: bool).
-	 *
 	 */
 	customEncodeUrlFunc?: Function;
 
 	/**
 	 * If true save expansion states in internal list and send it to the server. Applying to one of the main constraint of the REST architecture  Stateless Interactions - client specific data(like expansion states) should NOT be stored on the server
-	 *
 	 */
 	persistExpansionStates?: boolean;
 
@@ -5968,7 +5764,6 @@ class TreeHierarchicalDataSource {
 	 * @param fieldExpressions a list of field expression definitions
 	 * @param boolLogic boolean logic. Accepted values are AND and OR.
 	 * @param keepFilterState if keepFilterState is set to true, it will not discard previous filtering expressions
-	 * @param fieldExpressionsOnStrings
 	 */
 	filter(fieldExpressions: Object, boolLogic: Object, keepFilterState: boolean, fieldExpressionsOnStrings: Object): void;
 
@@ -6001,8 +5796,6 @@ class TreeHierarchicalDataSource {
 
 	/**
 	 * Gets the path of a record by the record or the record's key
-	 *
-	 * @param record
 	 */
 	getPathBy(record: Object): string;
 
@@ -6019,7 +5812,6 @@ class TreeHierarchicalDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
-	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -6077,8 +5869,6 @@ class TreeHierarchicalDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
-	 *
-	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -6125,15 +5915,12 @@ class TreeHierarchicalDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
-	 *
-	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
-	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -6142,7 +5929,6 @@ class TreeHierarchicalDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
-	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -6277,9 +6063,6 @@ class TreeHierarchicalDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
-	 * @param key
-	 * @param dsObj
-	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -6330,8 +6113,6 @@ class TreeHierarchicalDataSource {
 
 	/**
 	 * For internal use
-	 *
-	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -6450,7 +6231,6 @@ interface GridExcelExporterCallbacks {
 	 * Use args.rowId to get key or index of row.
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
-	 *
 	 */
 	cellExported?: Function;
 
@@ -6463,14 +6243,12 @@ interface GridExcelExporterCallbacks {
 	 * Use args.rowId to get key or index of row.
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
-	 *
 	 */
 	cellExporting?: Function;
 
 	/**
 	 * Set a callback that is fired when exporting fails.
 	 * Use error to get the reference of error object.
-	 *
 	 */
 	error?: Function;
 
@@ -6480,7 +6258,6 @@ interface GridExcelExporterCallbacks {
 	 * Use args.grid to get reference to the igGrid widget.
 	 * Use args.workbook to get reference to the excel workbook.
 	 * Use args.worksheet to get reference to the excel worksheet.
-	 *
 	 */
 	exportEnding?: Function;
 
@@ -6488,7 +6265,6 @@ interface GridExcelExporterCallbacks {
 	 * Cancel="true" Set a callback that is fired when the exporting has started.
 	 * Function takes arguments sender and args.
 	 * Use args.grid to get reference to igGrid widget.
-	 *
 	 */
 	exportStarting?: Function;
 
@@ -6498,7 +6274,6 @@ interface GridExcelExporterCallbacks {
 	 * Use args.headerText to get the igGrid column key of the header cell.
 	 * Use args.columnKey to get the igGrid column key of the header cell.
 	 * Use args.columnIndex to get the igGrid column index of the header cell.
-	 *
 	 */
 	headerCellExported?: Function;
 
@@ -6508,7 +6283,6 @@ interface GridExcelExporterCallbacks {
 	 * Use args.headerText to get or set the igGrid column key of the header cell.
 	 * Use args.columnKey to get the igGrid column key of the header cell.
 	 * Use args.columnIndex to get the igGrid column index of the header cell.
-	 *
 	 */
 	headerCellExporting?: Function;
 
@@ -6520,7 +6294,6 @@ interface GridExcelExporterCallbacks {
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
 	 * Note: When exporting an igHierarchicalGrid this callback is available only for the root grid rows.
-	 *
 	 */
 	rowExported?: Function;
 
@@ -6532,14 +6305,12 @@ interface GridExcelExporterCallbacks {
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
 	 * Note: When exporting an igHierarchicalGrid this callback is available only for the root grid rows.
-	 *
 	 */
 	rowExporting?: Function;
 
 	/**
 	 * Set a callback that is fired when exporting is successful.
 	 * Use data to get the reference of saved object.
-	 *
 	 */
 	success?: Function;
 
@@ -6551,7 +6322,6 @@ interface GridExcelExporterCallbacks {
 	 * Use args.columnIndex to get the igGrid column index.
 	 * Use args.summary to get a reference to the summary object.
 	 * Use args.xlRowIndex to get the worksheet row index.
-	 *
 	 */
 	summaryExported?: Function;
 
@@ -6563,7 +6333,6 @@ interface GridExcelExporterCallbacks {
 	 * Use args.columnIndex to get the igGrid column index.
 	 * Use args.summary to get a reference to the summary object.
 	 * Use args.xlRowIndex to get reference to worksheet row index.
-	 *
 	 */
 	summaryExporting?: Function;
 
@@ -6577,7 +6346,6 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether fixed columns will be applied in the exported table. This is set to none by default, but will change to applied if column fixing feature is defined in the igGrid.
 	 *
-	 *
 	 * Valid values:
 	 * "none" No column fixing will be applied in the excel document.
 	 * "applied" Column fixing will be applied in the excel document.
@@ -6587,7 +6355,6 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether filtering will be applied in the exported table. this is set to none by default, but will change to applied if filtering feature is defined in the igGrid.
 	 *
-	 *
 	 * Valid values:
 	 * "none" No filtering will be applied in the excel document.
 	 * "applied" Filtering will be applied in the excel document.
@@ -6598,7 +6365,6 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether hidden columns will be removed from the exported table. This is set to none by default, but will change to applied if hiding feature is defined in the igGrid.
 	 *
-	 *
 	 * Valid values:
 	 * "none" All hidden columns will be exported to the excel document.
 	 * "applied" Hidden columns will be exported as hidden in the excel document.
@@ -6609,7 +6375,6 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether the rows on the current page or entire data will exported.
 	 *
-	 *
 	 * Valid values:
 	 * "currentPage" Only current page will be exported to the excel document.
 	 * "allRows" All pages will be exported to the excel document.
@@ -6619,7 +6384,6 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether sorting will be applied in the exported table. This is set_ to none by default, but will change to applied if sorting feature is defined in the igGrid.
 	 *
-	 *
 	 * Valid values:
 	 * "none" No sorting will be applied in the excel document.
 	 * "applied" Sorting will be applied in the excel document.
@@ -6629,7 +6393,6 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether summaries will be added in the exported table. This is set to none by default, but will change to applied if summaries feature is defined in the igGrid.
 	 *
-	 *
 	 * Valid values:
 	 * "none" No summaries will be exported to the excel document.
 	 * "applied" Summaries will be exported to the excel document.
@@ -6645,14 +6408,12 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 interface GridExcelExporterSettings {
 	/**
 	 * List of strings containing the keys for the columns that will not be exported.
-	 *
 	 */
 	columnsToSkip?: any[];
 
 	/**
 	 * Indicates whether all sublevel data will be exported, or only data under expanded rows.
 	 *
-	 *
 	 * Valid values:
 	 * "allRows" All sublevel data will be exported.
 	 * "expandedRows" Only data under expanded rows will be exported.
@@ -6661,7 +6422,6 @@ interface GridExcelExporterSettings {
 
 	/**
 	 * Specifies the name of the excel file that will be generated.
-	 *
 	 */
 	fileName?: string;
 
@@ -6673,7 +6433,6 @@ interface GridExcelExporterSettings {
 	/**
 	 * Indicates whether excel table styles will be the same as grid styles. This is set to applied by default. Custom grid themes are not supported.
 	 *
-	 *
 	 * Valid values:
 	 * "none" The styles from the grid are not applied to the table region.
 	 * "applied" The styles from the grid are applied to the table region.
@@ -6682,7 +6441,6 @@ interface GridExcelExporterSettings {
 
 	/**
 	 * List of strings containing the keys for the worksheet columns which will not be applied any filtering
-	 *
 	 */
 	skipFilteringOn?: any[];
 
@@ -6692,13 +6450,11 @@ interface GridExcelExporterSettings {
 	 * TableStyleMedium[1-28]
 	 * TableStyleLight[1-21]
 	 * TableStyleDark[1-11]
-	 *
 	 */
 	tableStyle?: string;
 
 	/**
 	 * Specifies the name of workbook where the igGrid will be exported.
-	 *
 	 */
 	worksheetName?: string;
 
@@ -7772,27 +7528,16 @@ class OlapResultView {
 
 	/**
 	 * Creates a new $.ig.OlapResultView object with result object having the same structure as the original one and new visibleResult where the tuples which appear as children under specified tuple and member index are no longer present.
-	 *
-	 * @param axisName
-	 * @param tupleIndex
-	 * @param memberIndex
 	 */
 	collapseTupleMember(axisName: Object, tupleIndex: Object, memberIndex: Object): Object;
 
 	/**
 	 * Creates a $.ig.OlapResultView view object with result object having the same structure as the original one and new visibleResult where the tuples which appear as children under specified tuple and member index are accessible as part of the visibleResult.
-	 *
-	 * @param axisName
-	 * @param tupleIndex
-	 * @param memberIndex
 	 */
 	expandTupleMember(axisName: Object, tupleIndex: Object, memberIndex: Object): Object;
 
 	/**
 	 * Creates a new $.ig.OlapResultView object as the axis specified by axisName of the original result object is extended with the tuples of the same axis found into supplied partialResult object.
-	 *
-	 * @param partialResult
-	 * @param axisName
 	 */
 	extend(partialResult: Object, axisName: Object): Object;
 }
@@ -8022,29 +7767,21 @@ declare namespace Infragistics {
 class Catalog {
 	/**
 	 * Returns the name of the catalog.
-	 *
-	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the catalog.
-	 *
-	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the catalog used when displaying the name of the catalog to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns the description of the catalog which is a human-readable description of the catalog
-	 *
-	 * @param value
 	 */
 	description(value: Object): string;
 }
@@ -8054,29 +7791,21 @@ declare namespace Infragistics {
 class Cube {
 	/**
 	 * Returns the name of the cube.
-	 *
-	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the cube.
-	 *
-	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the cube used when displaying the name of the cube to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the cube.
-	 *
-	 * @param value
 	 */
 	description(value: Object): string;
 
@@ -8086,22 +7815,16 @@ class Cube {
 	 *             $.ig.CubeType.prototype.cube = 0;
 	 *             $.ig.CubeType.prototype.dimension = 1;
 	 *             $.ig.CubeType.prototype.unknown = 2;
-	 *
-	 * @param value
 	 */
 	cubeType(value: Object): number;
 
 	/**
 	 * Returns the date and time on which the cube was last processed.
-	 *
-	 * @param value
 	 */
 	lastProcessed(value: Object): Object;
 
 	/**
 	 * Returns the date and time on which the cube was last updated.
-	 *
-	 * @param value
 	 */
 	lastUpdated(value: Object): Object;
 }
@@ -8111,29 +7834,21 @@ declare namespace Infragistics {
 class Dimension {
 	/**
 	 * Returns the name of the dimension.
-	 *
-	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the dimension.
-	 *
-	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the dimension used when displaying the name of the dimension to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the dimension.
-	 *
-	 * @param value
 	 */
 	description(value: Object): string;
 
@@ -8157,8 +7872,6 @@ class Dimension {
 	 *             $.ig.DimensionType.prototype.organization = 15;
 	 *             $.ig.DimensionType.prototype.billOfMaterials = 16;
 	 *             $.ig.DimensionType.prototype.geography = 17;
-	 *
-	 * @param value
 	 */
 	dimensionType(value: Object): number;
 }
@@ -8168,50 +7881,36 @@ declare namespace Infragistics {
 class Hierarchy {
 	/**
 	 * Returns the name of the hierarchy.
-	 *
-	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the hierarchy.
-	 *
-	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the hierarchy used when displaying the name of the hierarchy to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the hierarchy.
-	 *
-	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the unique name of the default member for the hierarchy.
-	 *
-	 * @param value
 	 */
 	defaultMember(value: Object): string;
 
 	/**
 	 * Returns the unique name of the 'All' member for the hierarchy.
-	 *
-	 * @param value
 	 */
 	allMember(value: Object): string;
 
 	/**
 	 * Returns the unique name of the dimension that contains the hierarchy.
-	 *
-	 * @param value
 	 */
 	dimensionUniqueName(value: Object): string;
 
@@ -8226,16 +7925,12 @@ class Hierarchy {
 	 *
 	 *             $.ig.HierarchyOrigin.prototype.systemInternal = 4;
 	 *             Identifies attributes with no attribute .
-	 *
-	 * @param value
 	 */
 	hierarchyOrigin(value: Object): number;
 
 	/**
 	 * Returns the hierarchy display folder path to be used when displaying the hierarchy in the user interface.
 	 *             Folder names will be separated by a semicolon (;). Nested folders are indicated by a backslash (\).
-	 *
-	 * @param value
 	 */
 	hierarchyDisplayFolder(value: Object): string;
 }
@@ -8245,36 +7940,26 @@ declare namespace Infragistics {
 class Measure {
 	/**
 	 * Returns the name of the measure.
-	 *
-	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the measure.
-	 *
-	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the measure used when displaying the name of the measure to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the measure.
-	 *
-	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the name of the measure group this measure belongs to.
-	 *
-	 * @param value
 	 */
 	measureGroupName(value: Object): string;
 
@@ -8325,23 +8010,17 @@ class Measure {
 	 *
 	 *             $.ig.AggregatorType.prototype.calculated = 127;
 	 *             The aggregated function will returns the result derived from a formula.
-	 *
-	 * @param value
 	 */
 	aggregatorType(value: Object): number;
 
 	/**
 	 * Returns the default format string for the measure.
-	 *
-	 * @param value
 	 */
 	defaultFormatString(value: Object): string;
 
 	/**
 	 * Returns the measure display folder path to be used when displaying the measure in the user interface.
 	 *             Folder names will be separated by a semicolon (;). Nested folders are indicated by a backslash (\).
-	 *
-	 * @param value
 	 */
 	measureDisplayFolder(value: Object): string;
 }
@@ -8351,71 +8030,51 @@ declare namespace Infragistics {
 class Level {
 	/**
 	 * Returns the name of the level.
-	 *
-	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the level.
-	 *
-	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the level used when displaying the name of the level to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the level.
-	 *
-	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the distance of the level from the root of the level. Root level is zero (0)
-	 *
-	 * @param value
 	 */
 	depth(value: Object): number;
 
 	/**
 	 * Returns the unique name of the hierarchy that contains the level.
-	 *
-	 * @param value
 	 */
 	hierarchyUniqueName(value: Object): string;
 
 	/**
 	 * Returns the unique name of the dimension that contains the level.
-	 *
-	 * @param value
 	 */
 	dimensionUniqueName(value: Object): string;
 
 	/**
 	 * Returns the count of all members in the level.
-	 *
-	 * @param value
 	 */
 	membersCount(value: Object): number;
 
 	/**
 	 * Returns a value that defines how the level was sourced.
-	 *
-	 * @param value
 	 */
 	levelOrigin(value: Object): number;
 
 	/**
 	 * Returns the ID of the attribute that the level is sorted on.
-	 *
-	 * @param value
 	 */
 	levelOrderingProperty(value: Object): number;
 }
@@ -8425,36 +8084,26 @@ declare namespace Infragistics {
 class MeasureGroup {
 	/**
 	 * Returns the name of the measure group.
-	 *
-	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the caption of the measure group used when displaying the name of the measure group to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the measure group.
-	 *
-	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the name of the catalog to which this measure group belongs.
-	 *
-	 * @param value
 	 */
 	catalogName(value: Object): string;
 
 	/**
 	 * Returns the name of the cube to which this measure group belongs
-	 *
-	 * @param value
 	 */
 	cubeName(value: Object): string;
 }
@@ -8464,15 +8113,11 @@ declare namespace Infragistics {
 class MeasureList {
 	/**
 	 * Returns the caption of the measure list used when displaying the name of the measure list to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns an array of $.ig.Measure objects this measure list is grouping.
-	 *
-	 * @param value
 	 */
 	measures(value: Object): any[];
 }
@@ -8482,22 +8127,16 @@ declare namespace Infragistics {
 class OlapResult {
 	/**
 	 * Returns a value indicating whether the result object contains any data.
-	 *
-	 * @param value
 	 */
 	isEmpty(value: Object): boolean;
 
 	/**
 	 * Returns an array of $.ig.OlapResultAxis objects this result is built on.
-	 *
-	 * @param value
 	 */
 	axes(value: Object): any[];
 
 	/**
 	 * Returns an array of $.ig.OlapResultCell objects which hold the result data.
-	 *
-	 * @param value
 	 */
 	cells(value: Object): any[];
 }
@@ -8569,71 +8208,51 @@ declare namespace Infragistics {
 class OlapResultAxisMember {
 	/**
 	 * Returns the unique name of the axis member.
-	 *
-	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the axis member used when displaying the name of the axis member to the user.
-	 *
-	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns the unique name of the level this member belongs to.
-	 *
-	 * @param value
 	 */
 	levelUniqueName(value: Object): string;
 
 	/**
 	 * Returns the unique name of the hierarchy that contains the level.
-	 *
-	 * @param value
 	 */
 	hierarchyUniqueName(value: Object): string;
 
 	/**
 	 * Returns the distance of member parent level from the root of the level. Root level is zero (0)
-	 *
-	 * @param value
 	 */
 	levelNumber(value: Object): number;
 
 	/**
 	 * A bitmap of the information projected by childCount, drilledDown and parentSameAsPrev properties.
-	 *
-	 * @param value
 	 */
 	displayInfo(value: Object): number;
 
 	/**
 	 * Returns the count of children members this member has.
-	 *
-	 * @param value
 	 */
 	childCount(value: Object): number;
 
 	/**
 	 * Returns a value that indicates whether at least one child of this member appears on the axis, immediately following all occurrences of that member. This can be used by applications to display a "+" or a "-" next to the member.
-	 *
-	 * @param value
 	 */
 	drilledDown(value: Object): boolean;
 
 	/**
 	 * Returns a value that indicates whether the parent of this member is the same as the parent of the member preceding all occurrences of the current member.
-	 *
-	 * @param value
 	 */
 	parentSameAsPrev(value: Object): boolean;
 
 	/**
 	 * Returns a key value map of the members' properties. By default only 'PARENT_UNIQUE_NAME' and 'CHILDREN_CARDINALITY' properties are available.
-	 *
-	 * @param value
 	 */
 	properties(value: Object): Object;
 }
@@ -8643,15 +8262,11 @@ declare namespace Infragistics {
 class OlapResultCell {
 	/**
 	 * Returns the position of the cell when cells are iterated row by row.
-	 *
-	 * @param value
 	 */
 	cellOrdinal(value: Object): number;
 
 	/**
 	 * Returns a key value map of the cell's properties. Currently only 'Value' and 'FmtValue' properties are available.
-	 *
-	 * @param value
 	 */
 	properties(value: Object): Object;
 }
@@ -11000,7 +10615,6 @@ interface IgCategoryChart {
 	/**
 	 * Gets or sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
 	 *
-	 *
 	 * Valid values:
 	 * "linearInterpolate" Plot the unknown value as the midpoint between surrounding known values using linear interpolation.
 	 * "dontPlot" Do not plot the unknown value on the chart.
@@ -12485,7 +12099,6 @@ interface JQuery {
 
 	/**
 	 * Gets  the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
-	 *
 	 */
 
 	igCategoryChart(optionLiteral: 'option', optionName: "unknownValuePlotting"): string;
@@ -12493,7 +12106,6 @@ interface JQuery {
 	/**
 	 * Sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -13555,7 +13167,6 @@ interface IgDataChartLegend {
 	/**
 	 * The height of the legend.null will stretch vertically to fit data, no other height are defined.
 	 *
-	 *
 	 * Valid values:
 	 * "null"
 	 */
@@ -13764,7 +13375,6 @@ interface IgDataChartAxes {
 	/**
 	 * Gets or sets the axis MinimumValue.
 	 *
-	 *
 	 * Valid values:
 	 * "number" The minimum value can be set to be a number when the axis is of numeric type
 	 * "date" The minimum value can be set to be a date object when [type](ui.igDataChart#options:axes.type) option is set to "categoryDateTimeX"
@@ -13774,7 +13384,6 @@ interface IgDataChartAxes {
 	/**
 	 * Gets or sets the axis MaximumValue.
 	 *
-	 *
 	 * Valid values:
 	 * "number" The maximum value can be set to be a number when the axis is of numeric type
 	 * "date" The maximum value can be set to be a date object when [type](ui.igDataChart#options:axes.type) option is set to "categoryDateTimeX"
@@ -13995,7 +13604,6 @@ interface IgDataChartSeriesLegend {
 	/**
 	 * The height of the legend.null will stretch vertically to fit data, no other height are defined
 	 *
-	 *
 	 * Valid values:
 	 * "null"
 	 */
@@ -15530,7 +15138,6 @@ interface IgDataChart {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
-	 *
 	 * Valid values:
 	 * "deferred" Defer the view update until after the user action is complete.
 	 * "immediate" Update the view immediately while the user action is happening.
@@ -16864,7 +16471,6 @@ interface IgPieChart {
 	/**
 	 * Gets or sets the position of chart labels.
 	 *
-	 *
 	 * Valid values:
 	 * "none" No labels will be displayed.
 	 * "center" Labels will be displayed in the center.
@@ -16889,7 +16495,6 @@ interface IgPieChart {
 	/**
 	 * Gets or sets the type of selection the pie chart allows.
 	 *
-	 *
 	 * Valid values:
 	 * "single" A single slice is allowed to be selected.
 	 * "multiple" Multiple slices are allowed to be selected.
@@ -16912,7 +16517,6 @@ interface IgPieChart {
 	/**
 	 * Gets or sets whether the leader lines are visible.
 	 *
-	 *
 	 * Valid values:
 	 * "visible"
 	 * "collapsed"
@@ -16922,7 +16526,6 @@ interface IgPieChart {
 	/**
 	 * Gets or sets what type of leader lines will be used for the outside end labels.
 	 *
-	 *
 	 * Valid values:
 	 * "straight"
 	 * "arc"
@@ -17031,7 +16634,6 @@ interface IgPieChart {
 	/**
 	 * Gets or sets the rotational direction of the chart.
 	 *
-	 *
 	 * Valid values:
 	 * "counterclockwise"
 	 * "clockwise"
@@ -17450,7 +17052,6 @@ interface JQuery {
 
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
-	 *
 	 */
 
 	igDataChart(optionLiteral: 'option', optionName: "windowResponse"): string;
@@ -17458,7 +17059,6 @@ interface JQuery {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -19100,7 +18700,6 @@ interface JQuery {
 
 	/**
 	 * Gets  the position of chart labels.
-	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "labelsPosition"): string;
@@ -19108,7 +18707,6 @@ interface JQuery {
 	/**
 	 * Sets the position of chart labels.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -19144,7 +18742,6 @@ interface JQuery {
 
 	/**
 	 * Gets  the type of selection the pie chart allows.
-	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "selectionMode"): string;
@@ -19152,7 +18749,6 @@ interface JQuery {
 	/**
 	 * Sets the type of selection the pie chart allows.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -19188,7 +18784,6 @@ interface JQuery {
 
 	/**
 	 * Gets  whether the leader lines are visible.
-	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "leaderLineVisibility"): string;
@@ -19196,7 +18791,6 @@ interface JQuery {
 	/**
 	 * Sets whether the leader lines are visible.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -19204,7 +18798,6 @@ interface JQuery {
 
 	/**
 	 * Gets  what type of leader lines will be used for the outside end labels.
-	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "leaderLineType"): string;
@@ -19212,7 +18805,6 @@ interface JQuery {
 	/**
 	 * Sets what type of leader lines will be used for the outside end labels.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -19444,7 +19036,6 @@ interface JQuery {
 
 	/**
 	 * Gets  the rotational direction of the chart.
-	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "sweepDirection"): string;
@@ -19452,7 +19043,6 @@ interface JQuery {
 	/**
 	 * Sets the rotational direction of the chart.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -20206,14 +19796,12 @@ interface IgColorPicker {
 	/**
 	 * Gets/Sets the default colors. Default colors are the ones displayed in the upper table of the color picker.
 	 *             The array should contain arrays that contain the color values for every next row.
-	 *
 	 */
 	colors?: string;
 
 	/**
 	 * Gets/Sets the standard colors. Standard colors are the ones displayed in the color picker bottom,
 	 *             visually separated from the default colors. The array should contain the color values.
-	 *
 	 */
 	standardColors?: any[];
 
@@ -20281,7 +19869,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the default colors. Default colors are the ones displayed in the upper table of the color picker.
 	 *             The array should contain arrays that contain the color values for every next row.
-	 *
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "colors"): string;
 
@@ -20289,7 +19876,6 @@ interface JQuery {
 	 * /Sets the default colors. Default colors are the ones displayed in the upper table of the color picker.
 	 *             The array should contain arrays that contain the color values for every next row.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "colors", optionValue: string): void;
@@ -20297,7 +19883,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the standard colors. Standard colors are the ones displayed in the color picker bottom,
 	 *             visually separated from the default colors. The array should contain the color values.
-	 *
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "standardColors"): any[];
 
@@ -20305,7 +19890,6 @@ interface JQuery {
 	 * /Sets the standard colors. Standard colors are the ones displayed in the color picker bottom,
 	 *             visually separated from the default colors. The array should contain the color values.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "standardColors", optionValue: any[]): void;
@@ -20391,31 +19975,26 @@ interface CollapsingEventUIParam {
 interface IgColorPickerSplitButton {
 	/**
 	 * Button items.
-	 *
 	 */
 	items?: any[];
 
 	/**
 	 * Gets/sets the button default color value.
-	 *
 	 */
 	defaultColor?: string;
 
 	/**
 	 * If this option is set to true, the igColorPickerSplitButton will be rendered with an icon.
-	 *
 	 */
 	hasDefaultIcon?: boolean;
 
 	/**
 	 * Default button item name.
-	 *
 	 */
 	defaultItemName?: string;
 
 	/**
 	 * Specifies whether the default button will be switched when another button is selected.
-	 *
 	 */
 	swapDefaultEnabled?: boolean;
 
@@ -20474,15 +20053,11 @@ interface IgColorPickerSplitButtonMethods {
 
 	/**
 	 * Collapse the widget.
-	 *
-	 * @param e
 	 */
 	collapse(e: Object): Object;
 
 	/**
 	 * Expands the widget.
-	 *
-	 * @param e
 	 */
 	expand(e: Object): Object;
 
@@ -20521,70 +20096,60 @@ interface JQuery {
 
 	/**
 	 * Button items.
-	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "items"): any[];
 
 	/**
 	 * Button items.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "items", optionValue: any[]): void;
 
 	/**
 	 * Gets/ the button default color value.
-	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultColor"): string;
 
 	/**
 	 * /sets the button default color value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultColor", optionValue: string): void;
 
 	/**
 	 * If this option is set to true, the igColorPickerSplitButton will be rendered with an icon.
-	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "hasDefaultIcon"): boolean;
 
 	/**
 	 * If this option is set to true, the igColorPickerSplitButton will be rendered with an icon.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "hasDefaultIcon", optionValue: boolean): void;
 
 	/**
 	 * Default button item name.
-	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultItemName"): string;
 
 	/**
 	 * Default button item name.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultItemName", optionValue: string): void;
 
 	/**
 	 * Gets whether the default button will be switched when another button is selected.
-	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled"): boolean;
 
 	/**
 	 * Sets whether the default button will be switched when another button is selected.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled", optionValue: boolean): void;
@@ -20687,25 +20252,21 @@ interface JQuery {
 interface IgComboLocale {
 	/**
 	 * Gets/Sets text of list item for condition when [filteringType](ui.igcombo#options:filteringType) option is enabled and no match was found.
-	 *
 	 */
 	noMatchFoundText?: any;
 
 	/**
 	 * Gets/Sets title for html element which represent the drop-down button.
-	 *
 	 */
 	dropDownButtonTitle?: any;
 
 	/**
 	 * Gets/Sets title for html element which represent the clear button.
-	 *
 	 */
 	clearButtonTitle?: any;
 
 	/**
 	 * Gets/Sets value that is displayed when input field is empty.
-	 *
 	 */
 	placeHolder?: any;
 
@@ -20718,13 +20279,11 @@ interface IgComboLocale {
 interface IgComboLoadOnDemandSettings {
 	/**
 	 * Gets/Sets option to enable load on demand.
-	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Gets/Sets number of records loaded on each request.
-	 *
 	 */
 	pageSize?: number;
 
@@ -20737,25 +20296,21 @@ interface IgComboLoadOnDemandSettings {
 interface IgComboMultiSelection {
 	/**
 	 * Set enabled to true to turn multi selection on. Set to true by default when target element for the combo is a select with the multiple attribute set.
-	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Set addWithKeyModifier to true to disable the additive selection, then additive selection can be done by ctrl + mouse click / enter.
-	 *
 	 */
 	addWithKeyModifier?: boolean;
 
 	/**
 	 * Set showCheckboxes to true to render check boxes in front of each drop down item.
-	 *
 	 */
 	showCheckboxes?: boolean;
 
 	/**
 	 * Use itemSeparator to set what string to be rendered between items in field.
-	 *
 	 */
 	itemSeparator?: string;
 
@@ -20768,14 +20323,12 @@ interface IgComboMultiSelection {
 interface IgComboGrouping {
 	/**
 	 * Gets/Sets name of column by which the records will be grouped. Setting this option enables the grouping.
-	 *
 	 */
 	key?: string;
 
 	/**
 	 * Specifies the sort order - ascending or descending.
 	 *
-	 *
 	 * Valid values:
 	 * "asc"
 	 * "desc"
@@ -20791,13 +20344,11 @@ interface IgComboGrouping {
 interface IgComboInitialSelectedItem {
 	/**
 	 * Optional="true" Index of item in the list. The index should be greater than -1 and less than the count of the [items](ui.igcombo#methods:items) in the list (rows in dataSource).
-	 *
 	 */
 	index?: number;
 
 	/**
 	 * Optional="true" Value matching the [valueKey](ui.igcombo#options:valueKey) property of the item.
-	 *
 	 */
 	value?: any;
 
@@ -20996,20 +20547,17 @@ interface SelectionChangedEventUIParam {
 interface IgCombo {
 	/**
 	 * Gets/Sets the width of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
-	 *
 	 */
 	width?: string|number;
 
 	/**
 	 * Gets/Sets height of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
-	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * Gets/Sets the width of drop-down list in pixels.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The default drop-down list width can be set in pixels (px).
 	 * "number" The default drop-down list width can be set as a number.
@@ -21019,39 +20567,33 @@ interface IgCombo {
 	/**
 	 * Gets/Sets a valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 * Note: if it is set to string and [dataSourceType](ui.igcombo#options:dataSourceType) option is not set, then [$.ig.JSONDataSource](ig.jsondatasource) is used.
-	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of [$.ig.DataSource](ig.datasource) and its [type](ig.datasource#options:settings.type) property.
-	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * Sets URL which is used for sending JSON on request for remote filtering (MVC for example). That option is required when [load on demand](ui.igcombo#options:loadOnDemandSettings) is
 	 * [enabled](ui.igcombo#options:loadOnDemandSettings.enabled) and its [type](ui.igcombo#options:filteringType) is remote.
-	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) property in the response specifying the total number of records on the server.
-	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) This is basically the property in the response where data records are held, if the response is wrapped.
-	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
 	 *
-	 *
 	 * Valid values:
 	 * "json"
 	 * "xml"
@@ -21064,38 +20606,32 @@ interface IgCombo {
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType.
-	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request.
-	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Gets/Sets name of column which contains the "value". If it is missing, then the name of first column will be used.
-	 *
 	 */
 	valueKey?: string;
 
 	/**
 	 * Gets/Sets name of column which contains the displayed text. If it is missing, then [valueKey](ui.igcombo#options:valueKey) option will be used.
-	 *
 	 */
 	textKey?: string;
 
 	/**
 	 * Gets/Sets a template used to render an item in list. The igCombo utilizes igTemplating for generating node content templates.
 	 * More info on the templating engine can be found here: http://www.igniteui.com/help/infragistics-templating-engine.
-	 *
 	 */
 	itemTemplate?: string;
 
 	/**
 	 * Gets/Sets template used to render a header in the drop-down list. The template is rendered inside of a DIV html element.
-	 *
 	 */
 	headerTemplate?: string;
 
@@ -21108,39 +20644,33 @@ interface IgCombo {
 	 * - {1}: Number of records in dataSource
 	 * - {2}: Number of (filtered) records on server
 	 * - {3}: Number of all records on server
-	 *
 	 */
 	footerTemplate?: string;
 
 	/**
 	 * Gets/Sets the name of a hidden INPUT element, which is used when submitting data. Its value will be set to the values of the selected items valueKeys separated by ',' character on any change in igCombo. If the combo element has 'name' attribute and this option is not set, the 'name' attribute will be used for the input name.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets show drop-down list animation duration in milliseconds.
-	 *
 	 */
 	animationShowDuration?: number;
 
 	/**
 	 * Gets/Sets hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	animationHideDuration?: number;
 
 	/**
 	 * If set to true, the container of the drop-down list is appended to the body.
 	 * If set to false, it is appended to the parent element of the combo.
-	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets type of filtering.Note: option is set to "remote", then the "css.waitFiltering" is applied to combo and its drop-down list.
 	 *
-	 *
 	 * Valid values:
 	 * "remote" filtering is performed by server
 	 * "local" filtering is performed by $.ig.DataSource
@@ -21150,14 +20680,12 @@ interface IgCombo {
 
 	/**
 	 * Gets/Sets URL key name that specifies how the remote filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
-	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Gets/Sets condition used for filtering.Note: When [autoComplete](ui.igcombo#options:autoComplete) is enabled, the filtering condition is always "startsWith".
 	 *
-	 *
 	 * Valid values:
 	 * "contains"
 	 * "doesNotContain"
@@ -21175,7 +20703,6 @@ interface IgCombo {
 	/**
 	 * Gets/Sets filtering logic.
 	 *
-	 *
 	 * Valid values:
 	 * "OR"
 	 * "AND"
@@ -21216,7 +20743,6 @@ interface IgCombo {
 	 * Notes:
 	 * That option has effect only when data is loaded remotely using [dataSourceUrl](ui.igcombo#options:dataSourceUrl).
 	 * Selection is supported only for already loaded items.
-	 *
 	 */
 	loadOnDemandSettings?: IgComboLoadOnDemandSettings;
 
@@ -21224,14 +20750,12 @@ interface IgCombo {
 	 * Gets/Sets how many items should be shown at once.
 	 *    Notes:
 	 *    This option is used for [virtualization](ui.igcombo#options:virtualization) in order to render initial list items.
-	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Sets gets functionality mode.
 	 *
-	 *
 	 * Valid values:
 	 * "editable" Allows to modify value by edit field and drop-down list.
 	 * "dropdown" Allows to modify value by drop-down list only.
@@ -21243,33 +20767,28 @@ interface IgCombo {
 	/**
 	 * Gets/Sets ability to use virtual rendering for drop-down list. Enable to boost performance when combo has lots of records.
 	 * If that option is enabled, then only visible items are created and the top edge of the first visible item in list is aligned to the top edge of list.
-	 *
 	 */
 	virtualization?: boolean;
 
 	/**
 	 * Gets/Sets object specifying multi selection feature options. Note showCheckboxes and itemSeparator has effect only if multi selection is enabled.
-	 *
 	 */
 	multiSelection?: IgComboMultiSelection;
 
 	/**
 	 * Gets/Sets object specifying grouping feature options. The option has key and dir properties.
-	 *
 	 */
 	grouping?: IgComboGrouping;
 
 	/**
 	 * Gets/Sets object which contains options supported by [igValidator](ui.igvalidator).
 	 * Notes: in order for validator to work, application should ensure that [igValidator](ui.igvalidator) is loaded (ig.ui.validator.js/css files).
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Gets/Sets condition used for highlighting of matching parts in items of drop-down list.
 	 *
-	 *
 	 * Valid values:
 	 * "multi" multiple matches in a single item are rendered
 	 * "contains" match at any position in item is rendered
@@ -21281,20 +20800,17 @@ interface IgCombo {
 
 	/**
 	 * If set to true, filtering and auto selection will be case-sensitive.
-	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * Gets/Sets whether the first matching item should be auto selected when typing in input. When [multiSelection](ui.igcombo#options:multiSelection) is enabled this option will instead put the active item on the matching element.
-	 *
 	 */
 	autoSelectFirstMatch?: boolean;
 
 	/**
 	 * Gets/Sets ability to autocomplete field from first matching item in list.
 	 * Note: When autoComplete option is enabled, then "startsWith" is used for [filteringCondition](ui.igcombo#options:filteringCondition).
-	 *
 	 */
 	autoComplete?: boolean;
 
@@ -21302,56 +20818,47 @@ interface IgCombo {
 	 * If set to true:
 	 * 1. Allows custom value input only with single selection.
 	 * 2. Custom values will be auto completed to the closest value if [autoComplete](ui.igcombo#options:autoComplete) is enabled.
-	 *
 	 */
 	allowCustomValue?: boolean;
 
 	/**
 	 * Gets/Sets ability to close drop-down list when control loses focus.
-	 *
 	 */
 	closeDropDownOnBlur?: boolean;
 
 	/**
 	 * Specifies the delay duration before processing the changes in the input. Useful to boost performance by lowering the count of selection, filtering, auto complete and highlighting operations executed on each input change.
-	 *
 	 */
 	delayInputChangeProcessing?: number;
 
 	/**
 	 * Gets/Sets tabIndex for the field of the combo.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets ability to show the drop-down list when the combo is in focus. This option has effect only if the combo is in editable [mode](ui.igcombo#options:mode).
-	 *
 	 */
 	dropDownOnFocus?: boolean;
 
 	/**
 	 * Gets sets ability to close drop-down list when single item in the list is selected with mouse click or enter press. The default value when [multiSelection](ui.igcombo#options:multiSelection) is enabled will be false. This option will not close the drop down when [multiSelection](ui.igcombo#options:multiSelection) is enabled and additive selection is performed.
-	 *
 	 */
 	closeDropDownOnSelect?: boolean;
 
 	/**
 	 * Gets/Sets ability to select items by space button press.
-	 *
 	 */
 	selectItemBySpaceKey?: boolean;
 
 	/**
 	 * Gets/Sets list of items to be selected when the combo is initialized. It should contain array of objects with index or value property, then on initialization the matching items will be selected. If initialSelectedItems are not set, the combo is with single selection and it is in a dropdown, readonly or readonlylist [mode](ui.igcombo#options:mode), the first item will be automatically selected.
 	 * Note: Only items loaded on initialization can be selected. When using [load on demand](ui.igCombo#options:loadOnDemandSettings), selecting an item which is not loaded yet will fail.
-	 *
 	 */
 	initialSelectedItems?: IgComboInitialSelectedItem[];
 
 	/**
 	 * Gets/Sets ability to prevent submitting form on enter key press.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
@@ -21364,28 +20871,24 @@ interface IgCombo {
 	 * Custom values can be something like "currency", "percent", "dateLong", "time", "MMM-dd-yyyy H:mm tt", etc.
 	 *
 	 * Custom format strings should match the data type in "textKey" column.
-	 *
 	 */
 	format?: string;
 
 	/**
 	 * Gets/Sets whether the onscreen keyboard should be shown when the dropdown button is clicked (touch devices only).
 	 * Note: The keyboard will still show when the combo input is focused in editable mode.
-	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Specifies whether the clear button should be rendered.
 	 * When the [mode](ui.igcombo#options:mode) is single selection, readonly or readonlylist this option will default to false. It can still be enabled when it is specifically set to true.
-	 *
 	 */
 	enableClearButton?: boolean;
 
 	/**
 	 * Gets/Sets drop-down list orientation when open button is clicked.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" if there is enough space, it positions the drop-down list below the combo input, otherwise - above the combo input
 	 * "bottom" below the combo input
@@ -21903,7 +21406,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "width"): string|number;
@@ -21911,7 +21413,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21919,7 +21420,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets height of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "height"): string|number;
@@ -21927,7 +21427,6 @@ interface JQuery {
 	/**
 	 * /Sets height of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21935,7 +21434,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of drop-down list in pixels.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "dropDownWidth"): string|number;
@@ -21943,7 +21441,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of drop-down list in pixels.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21952,7 +21449,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets a valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 * Note: if it is set to string and [dataSourceType](ui.igcombo#options:dataSourceType) option is not set, then [$.ig.JSONDataSource](ig.jsondatasource) is used.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSource"): any;
 
@@ -21960,21 +21456,18 @@ interface JQuery {
 	 * /Sets a valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 * Note: if it is set to string and [dataSourceType](ui.igcombo#options:dataSourceType) option is not set, then [$.ig.JSONDataSource](ig.jsondatasource) is used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of [$.ig.DataSource](ig.datasource) and its [type](ig.datasource#options:settings.type) property.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of [$.ig.DataSource](ig.datasource) and its [type](ig.datasource#options:settings.type) property.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
@@ -21982,7 +21475,6 @@ interface JQuery {
 	/**
 	 * Sets URL which is used for sending JSON on request for remote filtering (MVC for example). That option is required when [load on demand](ui.igcombo#options:loadOnDemandSettings) is
 	 * [enabled](ui.igcombo#options:loadOnDemandSettings.enabled) and its [type](ui.igcombo#options:filteringType) is remote.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
@@ -21990,42 +21482,36 @@ interface JQuery {
 	 * Sets URL which is used for sending JSON on request for remote filtering (MVC for example). That option is required when [load on demand](ui.igcombo#options:loadOnDemandSettings) is
 	 * [enabled](ui.igcombo#options:loadOnDemandSettings.enabled) and its [type](ui.igcombo#options:filteringType) is remote.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) property in the response specifying the total number of records on the server.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) property in the response specifying the total number of records on the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) This is basically the property in the response where data records are held, if the response is wrapped.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) This is basically the property in the response where data records are held, if the response is wrapped.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "responseDataType"): string;
@@ -22033,7 +21519,6 @@ interface JQuery {
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -22041,56 +21526,48 @@ interface JQuery {
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Gets/Sets name of column which contains the "value". If it is missing, then the name of first column will be used.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "valueKey"): string;
 
 	/**
 	 * /Sets name of column which contains the "value". If it is missing, then the name of first column will be used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "valueKey", optionValue: string): void;
 
 	/**
 	 * Gets/Sets name of column which contains the displayed text. If it is missing, then [valueKey](ui.igcombo#options:valueKey) option will be used.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "textKey"): string;
 
 	/**
 	 * /Sets name of column which contains the displayed text. If it is missing, then [valueKey](ui.igcombo#options:valueKey) option will be used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "textKey", optionValue: string): void;
@@ -22098,7 +21575,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets a template used to render an item in list. The igCombo utilizes igTemplating for generating node content templates.
 	 * More info on the templating engine can be found here: http://www.igniteui.com/help/infragistics-templating-engine.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "itemTemplate"): string;
 
@@ -22106,21 +21582,18 @@ interface JQuery {
 	 * /Sets a template used to render an item in list. The igCombo utilizes igTemplating for generating node content templates.
 	 * More info on the templating engine can be found here: http://www.igniteui.com/help/infragistics-templating-engine.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "itemTemplate", optionValue: string): void;
 
 	/**
 	 * Gets/Sets template used to render a header in the drop-down list. The template is rendered inside of a DIV html element.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "headerTemplate"): string;
 
 	/**
 	 * /Sets template used to render a header in the drop-down list. The template is rendered inside of a DIV html element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "headerTemplate", optionValue: string): void;
@@ -22134,7 +21607,6 @@ interface JQuery {
 	 * - {1}: Number of records in dataSource
 	 * - {2}: Number of (filtered) records on server
 	 * - {3}: Number of all records on server
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "footerTemplate"): string;
 
@@ -22148,49 +21620,42 @@ interface JQuery {
 	 * - {2}: Number of (filtered) records on server
 	 * - {3}: Number of all records on server
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "footerTemplate", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the name of a hidden INPUT element, which is used when submitting data. Its value will be set to the values of the selected items valueKeys separated by ',' character on any change in igCombo. If the combo element has 'name' attribute and this option is not set, the 'name' attribute will be used for the input name.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name of a hidden INPUT element, which is used when submitting data. Its value will be set to the values of the selected items valueKeys separated by ',' character on any change in igCombo. If the combo element has 'name' attribute and this option is not set, the 'name' attribute will be used for the input name.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets show drop-down list animation duration in milliseconds.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationShowDuration"): number;
 
 	/**
 	 * /Sets show drop-down list animation duration in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationShowDuration", optionValue: number): void;
 
 	/**
 	 * Gets/Sets hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationHideDuration"): number;
 
 	/**
 	 * /Sets hide drop-down list animation duration in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationHideDuration", optionValue: number): void;
@@ -22198,7 +21663,6 @@ interface JQuery {
 	/**
 	 * If set to true, the container of the drop-down list is appended to the body.
 	 * If set to false, it is appended to the parent element of the combo.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -22206,14 +21670,12 @@ interface JQuery {
 	 * If set to true, the container of the drop-down list is appended to the body.
 	 * If set to false, it is appended to the parent element of the combo.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets type of filtering.Note: option is set to "remote", then the "css.waitFiltering" is applied to combo and its drop-down list.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "filteringType"): string;
@@ -22221,7 +21683,6 @@ interface JQuery {
 	/**
 	 * /Sets type of filtering.Note: option is set to "remote", then the "css.waitFiltering" is applied to combo and its drop-down list.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -22229,21 +21690,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets URL key name that specifies how the remote filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "filterExprUrlKey"): string;
 
 	/**
 	 * /Sets URL key name that specifies how the remote filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "filterExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Gets/Sets condition used for filtering.Note: When [autoComplete](ui.igcombo#options:autoComplete) is enabled, the filtering condition is always "startsWith".
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "filteringCondition"): string;
@@ -22251,7 +21709,6 @@ interface JQuery {
 	/**
 	 * /Sets condition used for filtering.Note: When [autoComplete](ui.igcombo#options:autoComplete) is enabled, the filtering condition is always "startsWith".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -22259,7 +21716,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets filtering logic.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "filteringLogic"): string;
@@ -22267,7 +21723,6 @@ interface JQuery {
 	/**
 	 * /Sets filtering logic.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -22344,7 +21799,6 @@ interface JQuery {
 	 * Notes:
 	 * That option has effect only when data is loaded remotely using [dataSourceUrl](ui.igcombo#options:dataSourceUrl).
 	 * Selection is supported only for already loaded items.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "loadOnDemandSettings"): IgComboLoadOnDemandSettings;
 
@@ -22354,7 +21808,6 @@ interface JQuery {
 	 * That option has effect only when data is loaded remotely using [dataSourceUrl](ui.igcombo#options:dataSourceUrl).
 	 * Selection is supported only for already loaded items.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "loadOnDemandSettings", optionValue: IgComboLoadOnDemandSettings): void;
@@ -22363,7 +21816,6 @@ interface JQuery {
 	 * Gets/Sets how many items should be shown at once.
 	 *    Notes:
 	 *    This option is used for [virtualization](ui.igcombo#options:virtualization) in order to render initial list items.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -22372,14 +21824,12 @@ interface JQuery {
 	 *    Notes:
 	 *    This option is used for [virtualization](ui.igcombo#options:virtualization) in order to render initial list items.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Sets gets functionality mode.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "mode"): string;
@@ -22387,7 +21837,6 @@ interface JQuery {
 	/**
 	 * Sets gets functionality mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -22396,7 +21845,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets ability to use virtual rendering for drop-down list. Enable to boost performance when combo has lots of records.
 	 * If that option is enabled, then only visible items are created and the top edge of the first visible item in list is aligned to the top edge of list.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
@@ -22404,35 +21852,30 @@ interface JQuery {
 	 * /Sets ability to use virtual rendering for drop-down list. Enable to boost performance when combo has lots of records.
 	 * If that option is enabled, then only visible items are created and the top edge of the first visible item in list is aligned to the top edge of list.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets object specifying multi selection feature options. Note showCheckboxes and itemSeparator has effect only if multi selection is enabled.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "multiSelection"): IgComboMultiSelection;
 
 	/**
 	 * /Sets object specifying multi selection feature options. Note showCheckboxes and itemSeparator has effect only if multi selection is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "multiSelection", optionValue: IgComboMultiSelection): void;
 
 	/**
 	 * Gets/Sets object specifying grouping feature options. The option has key and dir properties.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "grouping"): IgComboGrouping;
 
 	/**
 	 * /Sets object specifying grouping feature options. The option has key and dir properties.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "grouping", optionValue: IgComboGrouping): void;
@@ -22440,7 +21883,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets object which contains options supported by [igValidator](ui.igvalidator).
 	 * Notes: in order for validator to work, application should ensure that [igValidator](ui.igvalidator) is loaded (ig.ui.validator.js/css files).
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -22448,14 +21890,12 @@ interface JQuery {
 	 * /Sets object which contains options supported by [igValidator](ui.igvalidator).
 	 * Notes: in order for validator to work, application should ensure that [igValidator](ui.igvalidator) is loaded (ig.ui.validator.js/css files).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Gets/Sets condition used for highlighting of matching parts in items of drop-down list.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "highlightMatchesMode"): string;
@@ -22463,7 +21903,6 @@ interface JQuery {
 	/**
 	 * /Sets condition used for highlighting of matching parts in items of drop-down list.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -22471,28 +21910,24 @@ interface JQuery {
 
 	/**
 	 * If set to true, filtering and auto selection will be case-sensitive.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * If set to true, filtering and auto selection will be case-sensitive.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the first matching item should be auto selected when typing in input. When [multiSelection](ui.igcombo#options:multiSelection) is enabled this option will instead put the active item on the matching element.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoSelectFirstMatch"): boolean;
 
 	/**
 	 * /Sets whether the first matching item should be auto selected when typing in input. When [multiSelection](ui.igcombo#options:multiSelection) is enabled this option will instead put the active item on the matching element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoSelectFirstMatch", optionValue: boolean): void;
@@ -22500,7 +21935,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets ability to autocomplete field from first matching item in list.
 	 * Note: When autoComplete option is enabled, then "startsWith" is used for [filteringCondition](ui.igcombo#options:filteringCondition).
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoComplete"): boolean;
 
@@ -22508,7 +21942,6 @@ interface JQuery {
 	 * /Sets ability to autocomplete field from first matching item in list.
 	 * Note: When autoComplete option is enabled, then "startsWith" is used for [filteringCondition](ui.igcombo#options:filteringCondition).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoComplete", optionValue: boolean): void;
@@ -22517,7 +21950,6 @@ interface JQuery {
 	 * If set to true:
 	 * 1. Allows custom value input only with single selection.
 	 * 2. Custom values will be auto completed to the closest value if [autoComplete](ui.igcombo#options:autoComplete) is enabled.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "allowCustomValue"): boolean;
 
@@ -22526,91 +21958,78 @@ interface JQuery {
 	 * 1. Allows custom value input only with single selection.
 	 * 2. Custom values will be auto completed to the closest value if [autoComplete](ui.igcombo#options:autoComplete) is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "allowCustomValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets ability to close drop-down list when control loses focus.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnBlur"): boolean;
 
 	/**
 	 * /Sets ability to close drop-down list when control loses focus.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnBlur", optionValue: boolean): void;
 
 	/**
 	 * Gets the delay duration before processing the changes in the input. Useful to boost performance by lowering the count of selection, filtering, auto complete and highlighting operations executed on each input change.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "delayInputChangeProcessing"): number;
 
 	/**
 	 * Sets the delay duration before processing the changes in the input. Useful to boost performance by lowering the count of selection, filtering, auto complete and highlighting operations executed on each input change.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "delayInputChangeProcessing", optionValue: number): void;
 
 	/**
 	 * Gets/Sets tabIndex for the field of the combo.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex for the field of the combo.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets ability to show the drop-down list when the combo is in focus. This option has effect only if the combo is in editable [mode](ui.igcombo#options:mode).
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownOnFocus"): boolean;
 
 	/**
 	 * /Sets ability to show the drop-down list when the combo is in focus. This option has effect only if the combo is in editable [mode](ui.igcombo#options:mode).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownOnFocus", optionValue: boolean): void;
 
 	/**
 	 * Gets  ability to close drop-down list when single item in the list is selected with mouse click or enter press. The default value when [multiSelection](ui.igcombo#options:multiSelection) is enabled will be false. This option will not close the drop down when [multiSelection](ui.igcombo#options:multiSelection) is enabled and additive selection is performed.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnSelect"): boolean;
 
 	/**
 	 * Sets ability to close drop-down list when single item in the list is selected with mouse click or enter press. The default value when [multiSelection](ui.igcombo#options:multiSelection) is enabled will be false. This option will not close the drop down when [multiSelection](ui.igcombo#options:multiSelection) is enabled and additive selection is performed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnSelect", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets ability to select items by space button press.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "selectItemBySpaceKey"): boolean;
 
 	/**
 	 * /Sets ability to select items by space button press.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "selectItemBySpaceKey", optionValue: boolean): void;
@@ -22618,7 +22037,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items to be selected when the combo is initialized. It should contain array of objects with index or value property, then on initialization the matching items will be selected. If initialSelectedItems are not set, the combo is with single selection and it is in a dropdown, readonly or readonlylist [mode](ui.igcombo#options:mode), the first item will be automatically selected.
 	 * Note: Only items loaded on initialization can be selected. When using [load on demand](ui.igCombo#options:loadOnDemandSettings), selecting an item which is not loaded yet will fail.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "initialSelectedItems"): IgComboInitialSelectedItem[];
 
@@ -22626,21 +22044,18 @@ interface JQuery {
 	 * /Sets list of items to be selected when the combo is initialized. It should contain array of objects with index or value property, then on initialization the matching items will be selected. If initialSelectedItems are not set, the combo is with single selection and it is in a dropdown, readonly or readonlylist [mode](ui.igcombo#options:mode), the first item will be automatically selected.
 	 * Note: Only items loaded on initialization can be selected. When using [load on demand](ui.igCombo#options:loadOnDemandSettings), selecting an item which is not loaded yet will fail.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "initialSelectedItems", optionValue: IgComboInitialSelectedItem[]): void;
 
 	/**
 	 * Gets/Sets ability to prevent submitting form on enter key press.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets ability to prevent submitting form on enter key press.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
@@ -22654,7 +22069,6 @@ interface JQuery {
 	 * Custom values can be something like "currency", "percent", "dateLong", "time", "MMM-dd-yyyy H:mm tt", etc.
 	 *
 	 * Custom format strings should match the data type in "textKey" column.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "format"): string;
 
@@ -22668,7 +22082,6 @@ interface JQuery {
 	 *
 	 * Custom format strings should match the data type in "textKey" column.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "format", optionValue: string): void;
@@ -22676,7 +22089,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the onscreen keyboard should be shown when the dropdown button is clicked (touch devices only).
 	 * Note: The keyboard will still show when the combo input is focused in editable mode.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -22684,7 +22096,6 @@ interface JQuery {
 	 * /Sets whether the onscreen keyboard should be shown when the dropdown button is clicked (touch devices only).
 	 * Note: The keyboard will still show when the combo input is focused in editable mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
@@ -22692,7 +22103,6 @@ interface JQuery {
 	/**
 	 * Gets whether the clear button should be rendered.
 	 * When the [mode](ui.igcombo#options:mode) is single selection, readonly or readonlylist this option will default to false. It can still be enabled when it is specifically set to true.
-	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "enableClearButton"): boolean;
 
@@ -22700,14 +22110,12 @@ interface JQuery {
 	 * Sets whether the clear button should be rendered.
 	 * When the [mode](ui.igcombo#options:mode) is single selection, readonly or readonlylist this option will default to false. It can still be enabled when it is specifically set to true.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "enableClearButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets drop-down list orientation when open button is clicked.
-	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -22715,7 +22123,6 @@ interface JQuery {
 	/**
 	 * /Sets drop-down list orientation when open button is clicked.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -23009,37 +22416,31 @@ interface JQuery {
 interface IgDialogLocale {
 	/**
 	 * Gets/Sets the title/tooltip for the close button in the dialog.
-	 *
 	 */
 	closeButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the minimize button in the dialog.
-	 *
 	 */
 	minimizeButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the maximize button in the dialog.
-	 *
 	 */
 	maximizeButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the pin button in the dialog.
-	 *
 	 */
 	pinButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the pin button in the dialog.
-	 *
 	 */
 	unpinButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the restore button in the dialog.
-	 *
 	 */
 	restoreButtonTitle?: string;
 
@@ -23157,14 +22558,12 @@ interface IgDialog {
 	 * 2. It should not have parent.
 	 * 3. It should not contain attributes which might destroy layout or appearance of the dialog.
 	 * 4. Change of that option is not supported.
-	 *
 	 */
 	mainElement?: Element;
 
 	/**
 	 * Gets/Sets the state of the dialog.Note: when the dialog is modal, then pinned and minimized states are not supported, because that will trigger misbehavior.
 	 *
-	 *
 	 * Valid values:
 	 * "opened" The dialog is opened.
 	 * "minimized" The dialog is minimized.
@@ -23180,79 +22579,66 @@ interface IgDialog {
 	 * Notes:
 	 * 1. If the parent element of the original target-element is invisible, then the pinned dialog becomes invisible as well.
 	 * 2. Pinned state is not supported for modal dialog.
-	 *
 	 */
 	pinned?: boolean;
 
 	/**
 	 * Gets/Sets whether the dialog should close when Esc key is pressed.
-	 *
 	 */
 	closeOnEscape?: boolean;
 
 	/**
 	 * Gets/Sets whether the close button in the dialog header should be visible.
-	 *
 	 */
 	showCloseButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the maximize button in the dialog header should be visible.
-	 *
 	 */
 	showMaximizeButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the minimize button in the dialog header should be visible.
-	 *
 	 */
 	showMinimizeButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the pin button in the dialog header should be visible.
-	 *
 	 */
 	showPinButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the dialog will be pinned on minimize.
-	 *
 	 */
 	pinOnMinimized?: boolean;
 
 	/**
 	 * Gets the name of the css class which is applied to the SPAN element located on the left side of the header.
-	 *
 	 */
 	imageClass?: string;
 
 	/**
 	 * Gets/Sets the text which appears in the header of the dialog.
-	 *
 	 */
 	headerText?: string;
 
 	/**
 	 * Gets/Sets whether the dialog header should be visible.
-	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Gets/Sets whether the dialog footer should be visible.
-	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Gets/Sets the text which appears in the footer of the dialog.
-	 *
 	 */
 	footerText?: string;
 
 	/**
 	 * Gets the name of the css class which is applied to the main DIV element of the dialog.
-	 *
 	 */
 	dialogClass?: string;
 
@@ -23261,88 +22647,74 @@ interface IgDialog {
 	 * That can be reference to html element, jquery selector or jquery object.
 	 * By default the parent form of the original target element is used. If a form is not found, then the body is used.
 	 * Note: If the "position" of the container is not set or it is "static", then the position is set to "relative".
-	 *
 	 */
 	container?: any;
 
 	/**
 	 * Gets/Sets the initial height of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
-	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * Gets/Sets the initial width of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
-	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * Gets/Sets the minimal height of the dialog in normal state.
-	 *
 	 */
 	minHeight?: number;
 
 	/**
 	 * Gets/Sets the minimal width of the dialog in normal state.
-	 *
 	 */
 	minWidth?: number;
 
 	/**
 	 * Gets/Sets the maximal height of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
-	 *
 	 */
 	maxHeight?: number;
 
 	/**
 	 * Gets/Sets the maximal width of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
-	 *
 	 */
 	maxWidth?: number;
 
 	/**
 	 * Gets/Sets whether the dialog can be dragged by the user.
-	 *
 	 */
 	draggable?: boolean;
 
 	/**
 	 * Gets/Sets the initial position of the dialog. That should be an object, which contains "top" and "left" members or an object
 	 * supported by jquery.position(param) method. Examples: { left: 100, top: 200 }, { my: "left top", at: "left top", offset: "100 200" }
-	 *
 	 */
 	position?: any;
 
 	/**
 	 * Gets/Sets whether the dialog can be resized by the user.
-	 *
 	 */
 	resizable?: boolean;
 
 	/**
 	 * Gets/Sets the value for the tabIndex attribute applied to the main html element of the dialog.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is opened. That can be any object supported by the jquery show(param) method.
-	 *
 	 */
 	openAnimation?: any;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is closed. That can be any object supported by the jquery hide(param) method.
-	 *
 	 */
 	closeAnimation?: any;
 
 	/**
 	 * Gets/Sets the value of zIndex applied to the main html element of the dialog. If value is not set, then 1000 is used.
-	 *
 	 */
 	zIndex?: number;
 
@@ -23350,7 +22722,6 @@ interface IgDialog {
 	 * Gets/Sets the modal state of the dialog.
 	 * If there are more than 1 modal igDialog, then the last opened dialog wins and becomes on the top.
 	 * Note: the modal functionality is not supported when the dialog is minimized or pinned, because that will trigger misbehavior.
-	 *
 	 */
 	modal?: boolean;
 
@@ -23360,7 +22731,6 @@ interface IgDialog {
 	 * If that option is enabled, then focus and blur event handlers are added to all the child elements of the dialog.
 	 * If the dialog is modal or it can be maximized, then it is not recommended to disable that option.
 	 * If that option is modified after the igDialog was already created, then depending on current state of the dialog, it will be temporary closed-opened or opened-closed.
-	 *
 	 */
 	trackFocus?: boolean;
 
@@ -23403,13 +22773,11 @@ interface IgDialog {
 
 	/**
 	 * Gets/Sets the temporary value for src, which is used while changing the parent of the base element if it is an instance of IFRAME. That allows getting around possible JavaScript exceptions under IE.
-	 *
 	 */
 	temporaryUrl?: string;
 
 	/**
 	 * Gets/Sets the ability to adjust the state of the header depending on focused and not-focused states. Note: the "trackFocus" option should be enabled.
-	 *
 	 */
 	enableHeaderFocus?: boolean;
 
@@ -23417,7 +22785,6 @@ interface IgDialog {
 	 * Gets/Sets the processing of the double-click on the dialog-header.If this option is not false and dialog was minimized, then its state will be set to normal.
 	 * If this option is set to "auto" and showMaximizeButton is enabled or if this option is set to true, then the dialog will be maximized when it was in normal state,
 	 * and dialog-state will be set to normal if it was maximized.
-	 *
 	 */
 	enableDblclick?: any;
 
@@ -23620,7 +22987,6 @@ interface JQuery {
 	 * 2. It should not have parent.
 	 * 3. It should not contain attributes which might destroy layout or appearance of the dialog.
 	 * 4. Change of that option is not supported.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "mainElement"): Element;
 
@@ -23632,14 +22998,12 @@ interface JQuery {
 	 * 3. It should not contain attributes which might destroy layout or appearance of the dialog.
 	 * 4. Change of that option is not supported.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "mainElement", optionValue: Element): void;
 
 	/**
 	 * Gets/Sets the state of the dialog.Note: when the dialog is modal, then pinned and minimized states are not supported, because that will trigger misbehavior.
-	 *
 	 */
 
 	igDialog(optionLiteral: 'option', optionName: "state"): string;
@@ -23647,7 +23011,6 @@ interface JQuery {
 	/**
 	 * /Sets the state of the dialog.Note: when the dialog is modal, then pinned and minimized states are not supported, because that will trigger misbehavior.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -23660,7 +23023,6 @@ interface JQuery {
 	 * Notes:
 	 * 1. If the parent element of the original target-element is invisible, then the pinned dialog becomes invisible as well.
 	 * 2. Pinned state is not supported for modal dialog.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinned"): boolean;
 
@@ -23672,175 +23034,150 @@ interface JQuery {
 	 * 1. If the parent element of the original target-element is invisible, then the pinned dialog becomes invisible as well.
 	 * 2. Pinned state is not supported for modal dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinned", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the dialog should close when Esc key is pressed.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeOnEscape"): boolean;
 
 	/**
 	 * /Sets whether the dialog should close when Esc key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeOnEscape", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the close button in the dialog header should be visible.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showCloseButton"): boolean;
 
 	/**
 	 * /Sets whether the close button in the dialog header should be visible.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showCloseButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the maximize button in the dialog header should be visible.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMaximizeButton"): boolean;
 
 	/**
 	 * /Sets whether the maximize button in the dialog header should be visible.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMaximizeButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the minimize button in the dialog header should be visible.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMinimizeButton"): boolean;
 
 	/**
 	 * /Sets whether the minimize button in the dialog header should be visible.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMinimizeButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the pin button in the dialog header should be visible.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showPinButton"): boolean;
 
 	/**
 	 * /Sets whether the pin button in the dialog header should be visible.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showPinButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the dialog will be pinned on minimize.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinOnMinimized"): boolean;
 
 	/**
 	 * /Sets whether the dialog will be pinned on minimize.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinOnMinimized", optionValue: boolean): void;
 
 	/**
 	 * Gets the name of the css class which is applied to the SPAN element located on the left side of the header.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "imageClass"): string;
 
 	/**
 	 * The name of the css class which is applied to the SPAN element located on the left side of the header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "imageClass", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the text which appears in the header of the dialog.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "headerText"): string;
 
 	/**
 	 * /Sets the text which appears in the header of the dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "headerText", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether the dialog header should be visible.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * /Sets whether the dialog header should be visible.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the dialog footer should be visible.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * /Sets whether the dialog footer should be visible.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the text which appears in the footer of the dialog.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "footerText"): string;
 
 	/**
 	 * /Sets the text which appears in the footer of the dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "footerText", optionValue: string): void;
 
 	/**
 	 * Gets the name of the css class which is applied to the main DIV element of the dialog.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "dialogClass"): string;
 
 	/**
 	 * The name of the css class which is applied to the main DIV element of the dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "dialogClass", optionValue: string): void;
@@ -23850,7 +23187,6 @@ interface JQuery {
 	 * That can be reference to html element, jquery selector or jquery object.
 	 * By default the parent form of the original target element is used. If a form is not found, then the body is used.
 	 * Note: If the "position" of the container is not set or it is "static", then the position is set to "relative".
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "container"): any;
 
@@ -23860,7 +23196,6 @@ interface JQuery {
 	 * By default the parent form of the original target element is used. If a form is not found, then the body is used.
 	 * Note: If the "position" of the container is not set or it is "static", then the position is set to "relative".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "container", optionValue: any): void;
@@ -23868,7 +23203,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the initial height of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
-	 *
 	 */
 
 	igDialog(optionLiteral: 'option', optionName: "height"): number|string;
@@ -23877,7 +23211,6 @@ interface JQuery {
 	 * /Sets the initial height of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -23886,7 +23219,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the initial width of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
-	 *
 	 */
 
 	igDialog(optionLiteral: 'option', optionName: "width"): number|string;
@@ -23895,7 +23227,6 @@ interface JQuery {
 	 * /Sets the initial width of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -23903,70 +23234,60 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimal height of the dialog in normal state.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minHeight"): number;
 
 	/**
 	 * /Sets the minimal height of the dialog in normal state.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minHeight", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the minimal width of the dialog in normal state.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minWidth"): number;
 
 	/**
 	 * /Sets the minimal width of the dialog in normal state.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximal height of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxHeight"): number;
 
 	/**
 	 * /Sets the maximal height of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxHeight", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximal width of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxWidth"): number;
 
 	/**
 	 * /Sets the maximal width of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets whether the dialog can be dragged by the user.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "draggable"): boolean;
 
 	/**
 	 * /Sets whether the dialog can be dragged by the user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "draggable", optionValue: boolean): void;
@@ -23974,7 +23295,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the initial position of the dialog. That should be an object, which contains "top" and "left" members or an object
 	 * supported by jquery.position(param) method. Examples: { left: 100, top: 200 }, { my: "left top", at: "left top", offset: "100 200" }
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "position"): any;
 
@@ -23982,77 +23302,66 @@ interface JQuery {
 	 * /Sets the initial position of the dialog. That should be an object, which contains "top" and "left" members or an object
 	 * supported by jquery.position(param) method. Examples: { left: 100, top: 200 }, { my: "left top", at: "left top", offset: "100 200" }
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "position", optionValue: any): void;
 
 	/**
 	 * Gets/Sets whether the dialog can be resized by the user.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "resizable"): boolean;
 
 	/**
 	 * /Sets whether the dialog can be resized by the user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "resizable", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the value for the tabIndex attribute applied to the main html element of the dialog.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets the value for the tabIndex attribute applied to the main html element of the dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is opened. That can be any object supported by the jquery show(param) method.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "openAnimation"): any;
 
 	/**
 	 * /Sets the animation applied to the dialog when it is opened. That can be any object supported by the jquery show(param) method.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "openAnimation", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is closed. That can be any object supported by the jquery hide(param) method.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeAnimation"): any;
 
 	/**
 	 * /Sets the animation applied to the dialog when it is closed. That can be any object supported by the jquery hide(param) method.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeAnimation", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the value of zIndex applied to the main html element of the dialog. If value is not set, then 1000 is used.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "zIndex"): number;
 
 	/**
 	 * /Sets the value of zIndex applied to the main html element of the dialog. If value is not set, then 1000 is used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "zIndex", optionValue: number): void;
@@ -24061,7 +23370,6 @@ interface JQuery {
 	 * Gets/Sets the modal state of the dialog.
 	 * If there are more than 1 modal igDialog, then the last opened dialog wins and becomes on the top.
 	 * Note: the modal functionality is not supported when the dialog is minimized or pinned, because that will trigger misbehavior.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "modal"): boolean;
 
@@ -24070,7 +23378,6 @@ interface JQuery {
 	 * If there are more than 1 modal igDialog, then the last opened dialog wins and becomes on the top.
 	 * Note: the modal functionality is not supported when the dialog is minimized or pinned, because that will trigger misbehavior.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "modal", optionValue: boolean): void;
@@ -24081,7 +23388,6 @@ interface JQuery {
 	 * If that option is enabled, then focus and blur event handlers are added to all the child elements of the dialog.
 	 * If the dialog is modal or it can be maximized, then it is not recommended to disable that option.
 	 * If that option is modified after the igDialog was already created, then depending on current state of the dialog, it will be temporary closed-opened or opened-closed.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "trackFocus"): boolean;
 
@@ -24092,7 +23398,6 @@ interface JQuery {
 	 * If the dialog is modal or it can be maximized, then it is not recommended to disable that option.
 	 * If that option is modified after the igDialog was already created, then depending on current state of the dialog, it will be temporary closed-opened or opened-closed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "trackFocus", optionValue: boolean): void;
@@ -24185,28 +23490,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the temporary value for src, which is used while changing the parent of the base element if it is an instance of IFRAME. That allows getting around possible JavaScript exceptions under IE.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "temporaryUrl"): string;
 
 	/**
 	 * /Sets the temporary value for src, which is used while changing the parent of the base element if it is an instance of IFRAME. That allows getting around possible JavaScript exceptions under IE.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "temporaryUrl", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the ability to adjust the state of the header depending on focused and not-focused states. Note: the "trackFocus" option should be enabled.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableHeaderFocus"): boolean;
 
 	/**
 	 * /Sets the ability to adjust the state of the header depending on focused and not-focused states. Note: the "trackFocus" option should be enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableHeaderFocus", optionValue: boolean): void;
@@ -24215,7 +23516,6 @@ interface JQuery {
 	 * Gets/Sets the processing of the double-click on the dialog-header.If this option is not false and dialog was minimized, then its state will be set to normal.
 	 * If this option is set to "auto" and showMaximizeButton is enabled or if this option is set to true, then the dialog will be maximized when it was in normal state,
 	 * and dialog-state will be set to normal if it was maximized.
-	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableDblclick"): any;
 
@@ -24224,7 +23524,6 @@ interface JQuery {
 	 * If this option is set to "auto" and showMaximizeButton is enabled or if this option is set to true, then the dialog will be maximized when it was in normal state,
 	 * and dialog-state will be set to normal if it was maximized.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableDblclick", optionValue: any): void;
@@ -25559,7 +24858,6 @@ interface IgBaseEditor {
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -25568,7 +24866,6 @@ interface IgBaseEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -25576,44 +24873,37 @@ interface IgBaseEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -25621,25 +24911,21 @@ interface IgBaseEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -26007,7 +25293,6 @@ interface IgTextEditor {
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -26018,19 +25303,16 @@ interface IgTextEditor {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type string.
-	 *
 	 */
 	listItems?: any[];
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -26039,13 +25321,11 @@ interface IgTextEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -26054,7 +25334,6 @@ interface IgTextEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	visibleItemsCount?: number;
 
@@ -26063,7 +25342,6 @@ interface IgTextEditor {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
-	 *
 	 */
 	includeKeys?: string;
 
@@ -26072,14 +25350,12 @@ interface IgTextEditor {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
-	 *
 	 */
 	excludeKeys?: string;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -26089,14 +25365,12 @@ interface IgTextEditor {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -26108,7 +25382,6 @@ interface IgTextEditor {
 	/**
 	 * Gets the text mode of the editor such as: single-line text editor, password editor or multiline editor. That option has effect only on initialization. If based element (selector) is TEXTAREA, then it is used as input-field.
 	 *
-	 *
 	 * Valid values:
 	 * "text" Single line text editor based on INPUT element is created.
 	 * "password" Editor based on INPUT element with type password is created.
@@ -26118,32 +25391,27 @@ interface IgTextEditor {
 
 	/**
 	 * Gets/Sets the ability of the editor to automatically move the dropdown list selection item from one end to the opposite side. When the last item is reached and spin down is performed, the first item gets selected and vice versa. This option has no effect there is no drop-down list.
-	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
-	 *
 	 */
 	isLimitedToListValues?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -26154,7 +25422,6 @@ interface IgTextEditor {
 	/**
 	 * Gets/Sets the maximum length of a text which can be entered by the user.
 	 * Negative values or 0 disables that behavior. If set at runtime the editor doesn't apply the option to the cuurent value.
-	 *
 	 */
 	maxLength?: number;
 
@@ -26162,27 +25429,23 @@ interface IgTextEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	toUpper?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	toLower?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -26190,14 +25453,12 @@ interface IgTextEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -26206,7 +25467,6 @@ interface IgTextEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -26214,44 +25474,37 @@ interface IgTextEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -26259,25 +25512,21 @@ interface IgTextEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -26659,7 +25908,6 @@ interface IgNumericEditor {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
-	 *
 	 */
 	listItems?: any[];
 
@@ -26668,7 +25916,6 @@ interface IgNumericEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
-	 *
 	 */
 	negativeSign?: string;
 
@@ -26676,7 +25923,6 @@ interface IgNumericEditor {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	negativePattern?: string;
 
@@ -26685,7 +25931,6 @@ interface IgNumericEditor {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	decimalSeparator?: string;
 
@@ -26695,7 +25940,6 @@ interface IgNumericEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	groupSeparator?: string;
 
@@ -26708,7 +25952,6 @@ interface IgNumericEditor {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	groups?: any[];
 
@@ -26718,7 +25961,6 @@ interface IgNumericEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	maxDecimals?: number;
 
@@ -26729,7 +25971,6 @@ interface IgNumericEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	minDecimals?: number;
 
@@ -26737,14 +25978,12 @@ interface IgNumericEditor {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
-	 *
 	 */
 	roundDecimals?: boolean;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -26757,7 +25996,6 @@ interface IgNumericEditor {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
-	 *
 	 * Valid values:
 	 * "double" the Number object is used with the limits of a double and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue). Note: that is used as default.
 	 * "float" the Number object is used with the limits of a float and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue).
@@ -26774,26 +26012,22 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
-	 *
 	 */
 	minValue?: number;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
-	 *
 	 */
 	maxValue?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
-	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
-	 *
 	 */
 	spinDelta?: number;
 
@@ -26802,7 +26036,6 @@ interface IgNumericEditor {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
-	 *
 	 * Valid values:
 	 * "null" scientific format is disabled.
 	 * "E" scientific format is enabled and the "E" character is used.
@@ -26815,13 +26048,11 @@ interface IgNumericEditor {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
-	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
-	 *
 	 */
 	isLimitedToListValues?: boolean;
 
@@ -26850,22 +26081,17 @@ interface IgNumericEditor {
 	 */
 	toUpper?: any;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -26875,13 +26101,11 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -26890,13 +26114,11 @@ interface IgNumericEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -26905,20 +26127,17 @@ interface IgNumericEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -26929,20 +26148,17 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -26954,13 +26170,11 @@ interface IgNumericEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -26968,14 +26182,12 @@ interface IgNumericEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -26984,7 +26196,6 @@ interface IgNumericEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -26992,31 +26203,26 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -27024,25 +26230,21 @@ interface IgNumericEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -27248,20 +26450,17 @@ interface IgCurrencyEditor {
 	 * Gets/Sets the string, which is used as positive pattern. The "n" flag represents the value of number.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	positivePattern?: string;
 
 	/**
 	 * Gets/Sets a string that is used as the currency symbol that is shown in display mode.
-	 *
 	 */
 	currencySymbol?: string;
 
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
-	 *
 	 */
 	listItems?: any[];
 
@@ -27270,7 +26469,6 @@ interface IgCurrencyEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
-	 *
 	 */
 	negativeSign?: string;
 
@@ -27278,7 +26476,6 @@ interface IgCurrencyEditor {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	negativePattern?: string;
 
@@ -27287,7 +26484,6 @@ interface IgCurrencyEditor {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	decimalSeparator?: string;
 
@@ -27297,7 +26493,6 @@ interface IgCurrencyEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	groupSeparator?: string;
 
@@ -27310,7 +26505,6 @@ interface IgCurrencyEditor {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	groups?: any[];
 
@@ -27320,7 +26514,6 @@ interface IgCurrencyEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	maxDecimals?: number;
 
@@ -27331,7 +26524,6 @@ interface IgCurrencyEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	minDecimals?: number;
 
@@ -27339,14 +26531,12 @@ interface IgCurrencyEditor {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
-	 *
 	 */
 	roundDecimals?: boolean;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -27359,7 +26549,6 @@ interface IgCurrencyEditor {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
-	 *
 	 * Valid values:
 	 * "double" the Number object is used with the limits of a double and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue). Note: that is used as default.
 	 * "float" the Number object is used with the limits of a float and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue).
@@ -27376,26 +26565,22 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
-	 *
 	 */
 	minValue?: number;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
-	 *
 	 */
 	maxValue?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
-	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
-	 *
 	 */
 	spinDelta?: number;
 
@@ -27404,7 +26589,6 @@ interface IgCurrencyEditor {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
-	 *
 	 * Valid values:
 	 * "null" scientific format is disabled.
 	 * "E" scientific format is enabled and the "E" character is used.
@@ -27417,13 +26601,11 @@ interface IgCurrencyEditor {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
-	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
-	 *
 	 */
 	isLimitedToListValues?: boolean;
 
@@ -27452,22 +26634,17 @@ interface IgCurrencyEditor {
 	 */
 	toUpper?: any;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -27477,13 +26654,11 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -27492,13 +26667,11 @@ interface IgCurrencyEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -27507,20 +26680,17 @@ interface IgCurrencyEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -27531,20 +26701,17 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -27556,13 +26723,11 @@ interface IgCurrencyEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -27570,14 +26735,12 @@ interface IgCurrencyEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -27586,7 +26749,6 @@ interface IgCurrencyEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -27594,31 +26756,26 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -27626,25 +26783,21 @@ interface IgCurrencyEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -27717,14 +26870,12 @@ interface IgPercentEditor {
 	 * Gets/Sets the pattern for positive numeric values, which is used in display (no focus) state.
 	 * If you use the "en-US" culture the default value for "positivePattern" will be "n$" where the "$" flag represents the "numericSymbol" and the "n" flag represents the value of the number.
 	 * Note: this option has priority over possible regional settings.
-	 *
 	 */
 	positivePattern?: string;
 
 	/**
 	 * Gets/Sets the symbol, which is used in display (no focus) state.
 	 * Note: this option has priority over possible regional settings.
-	 *
 	 */
 	percentSymbol?: string;
 
@@ -27734,7 +26885,6 @@ interface IgPercentEditor {
 	 * For example, if the factor is 100 and the "value" is set to 0.123, then the editor will show string "12.3".
 	 * Possible values: 1 or 100.
 	 * Note: this option has priority over possible regional settings.
-	 *
 	 */
 	displayFactor?: number;
 
@@ -27743,7 +26893,6 @@ interface IgPercentEditor {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igPercentEditor#options:minDecimals) and [maxDecimals](ui.igPercentEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
-	 *
 	 * Valid values:
 	 * "double" the Number object is used with the limits of a double and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igpercenteditor#options:allowNullValue). Note: that is used as default.
 	 * "float" the Number object is used with the limits of a float and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igpercenteditor#options:allowNullValue).
@@ -27760,14 +26909,12 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igpercenteditor#options:buttonType) or [spinUp](ui.igpercenteditor#methods:spinUp) and [spinDown](ui.igpercenteditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
-	 *
 	 */
 	spinDelta?: number;
 
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
-	 *
 	 */
 	listItems?: any[];
 
@@ -27776,7 +26923,6 @@ interface IgPercentEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
-	 *
 	 */
 	negativeSign?: string;
 
@@ -27784,7 +26930,6 @@ interface IgPercentEditor {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	negativePattern?: string;
 
@@ -27793,7 +26938,6 @@ interface IgPercentEditor {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	decimalSeparator?: string;
 
@@ -27803,7 +26947,6 @@ interface IgPercentEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	groupSeparator?: string;
 
@@ -27816,7 +26959,6 @@ interface IgPercentEditor {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	groups?: any[];
 
@@ -27826,7 +26968,6 @@ interface IgPercentEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	maxDecimals?: number;
 
@@ -27837,7 +26978,6 @@ interface IgPercentEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	minDecimals?: number;
 
@@ -27845,14 +26985,12 @@ interface IgPercentEditor {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
-	 *
 	 */
 	roundDecimals?: boolean;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -27862,20 +27000,17 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
-	 *
 	 */
 	minValue?: number;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
-	 *
 	 */
 	maxValue?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
-	 *
 	 */
 	allowNullValue?: boolean;
 
@@ -27884,7 +27019,6 @@ interface IgPercentEditor {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
-	 *
 	 * Valid values:
 	 * "null" scientific format is disabled.
 	 * "E" scientific format is enabled and the "E" character is used.
@@ -27897,13 +27031,11 @@ interface IgPercentEditor {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
-	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
-	 *
 	 */
 	isLimitedToListValues?: boolean;
 
@@ -27932,22 +27064,17 @@ interface IgPercentEditor {
 	 */
 	toUpper?: any;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -27957,13 +27084,11 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -27972,13 +27097,11 @@ interface IgPercentEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -27987,20 +27110,17 @@ interface IgPercentEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -28011,20 +27131,17 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -28036,13 +27153,11 @@ interface IgPercentEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -28050,14 +27165,12 @@ interface IgPercentEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -28066,7 +27179,6 @@ interface IgPercentEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -28074,31 +27186,26 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -28106,25 +27213,21 @@ interface IgPercentEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -28204,7 +27307,6 @@ interface IgMaskEditor {
 	/**
 	 * Gets visibility of the clear button. That option can be set only on initialization.
 	 *
-	 *
 	 * Valid values:
 	 * "clear" A button to clear the value is located on the right side of the editor.
 	 */
@@ -28228,14 +27330,12 @@ interface IgMaskEditor {
 	 * >: all letters to the right are converted to the upper case. In order to disable conversion, the ">" flag should be used again.
 	 * <: all letters to the right are converted to the lower case. In order to disable conversion, the "<" flag should be used again.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	inputMask?: string;
 
 	/**
 	 * It affects the value of the control (value method/option and submitted in forms). It defines what the value should contain from text, unfilled prompts and literals. The default is allText and when used value method/option returns the text entered, all prompts (positions) and literals.
 	 *
-	 *
 	 * Valid values:
 	 * "rawText" only entered text. All unfilled prompts (positions) and literals are ignored (removed).
 	 * "rawTextWithRequiredPrompts" only entered text and required prompts (positions). All optional unfilled prompts and literals are ignored (removed)
@@ -28248,19 +27348,16 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets character which is used as prompt in edit mode for available entry position.
-	 *
 	 */
 	unfilledCharsPrompt?: string;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when editor is in display mode (not focused).
-	 *
 	 */
 	padChar?: string;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when application calls get for the [value](ui.igmaskeditor#methods:value) methods.
-	 *
 	 */
 	emptyChar?: string;
 
@@ -28269,7 +27366,6 @@ interface IgMaskEditor {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	includeKeys?: string;
 
@@ -28278,7 +27374,6 @@ interface IgMaskEditor {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	excludeKeys?: string;
 
@@ -28328,9 +27423,6 @@ interface IgMaskEditor {
 	 */
 	dropDownOnReadOnly?: boolean;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -28348,7 +27440,6 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	value?: any;
 	suppressKeyboard?: boolean;
@@ -28356,7 +27447,6 @@ interface IgMaskEditor {
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -28366,14 +27456,12 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -28384,40 +27472,34 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	toUpper?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	toLower?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	suppressNotifications?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -28426,7 +27508,6 @@ interface IgMaskEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -28434,38 +27515,32 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -28473,25 +27548,21 @@ interface IgMaskEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 	dropDownListOpening?: DropDownListOpeningEvent;
@@ -28591,21 +27662,18 @@ interface IgDateEditor {
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	value?: Date;
 
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	minValue?: Date;
 
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	maxValue?: Date;
 
@@ -28647,7 +27715,6 @@ interface IgDateEditor {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
-	 *
 	 */
 	dateDisplayFormat?: string;
 
@@ -28678,7 +27745,6 @@ interface IgDateEditor {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dateInputFormat?: string;
 
@@ -28688,7 +27754,6 @@ interface IgDateEditor {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
-	 *
 	 * Valid values:
 	 * "date" The value method returns a Date object. When this mode is set the value sent to the server on submit is serialized as ISO 8061 string with local time and zone values by default.
 	 * "displayModeText" The "text" in display mode (no focus) format (pattern) is used to be send to the server and is returned from the value() method (returns a string object).
@@ -28700,14 +27765,12 @@ interface IgDateEditor {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
-	 *
 	 */
 	displayTimeOffset?: any;
 
 	/**
 	 * Gets visibility of the spin and clear buttons. That option can be set only on initialization. Combinations like 'spin,clear' are supported too.
 	 *
-	 *
 	 * Valid values:
 	 * "clear" A button to clear the value is located on the right side of the editor.
 	 * "spin" Spin buttons are located on the right side of the editor
@@ -28729,7 +27792,6 @@ interface IgDateEditor {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
-	 *
 	 * Valid values:
 	 * "number" Value this value it is applied to all time periods - years, days, minutes, etc.
 	 * "object" A configuration object, which defines specific values for each time period. The option can accept the following format:
@@ -28740,14 +27802,12 @@ interface IgDateEditor {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
-	 *
 	 */
 	limitSpinToCurrentField?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
-	 *
 	 */
 	enableUTCDates?: boolean;
 
@@ -28755,19 +27815,16 @@ interface IgDateEditor {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
-	 *
 	 */
 	centuryThreshold?: number;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
-	 *
 	 */
 	yearShift?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number|Date;
 
@@ -28842,7 +27899,6 @@ interface IgDateEditor {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	includeKeys?: string;
 
@@ -28851,7 +27907,6 @@ interface IgDateEditor {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	excludeKeys?: string;
 
@@ -28865,9 +27920,6 @@ interface IgDateEditor {
 	 */
 	dropDownOrientation?: string;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -28886,7 +27938,6 @@ interface IgDateEditor {
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -28896,14 +27947,12 @@ interface IgDateEditor {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -28914,26 +27963,22 @@ interface IgDateEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	suppressNotifications?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -28942,7 +27987,6 @@ interface IgDateEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -28950,32 +27994,27 @@ interface IgDateEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -28983,25 +28022,21 @@ interface IgDateEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -29061,8 +28096,6 @@ interface IgDateEditorMethods {
 	/**
 	 * Sets selected date. This method can be used when dataMode is set as either displayModeText or editModeText.
 	 * In such cases the value() cannot accept a date object as a new value and getSelectedDate() can be used to replace that functionality.
-	 *
-	 * @param date
 	 */
 	selectDate(date: Date): void;
 
@@ -29137,7 +28170,6 @@ interface IgDatePicker {
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.
 	 *
-	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -29147,14 +28179,12 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets the options supported by the [jquery.ui.datepicker](http://api.jqueryui.com/datepicker/). Only options related to the drop-down calendar are supported.
-	 *
 	 */
 	datepickerOptions?: any;
 
 	/**
 	 * Gets the ability to limit igDatePicker to be used only as s calendar. When set to true the editor input is not editable.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
@@ -29186,28 +28216,24 @@ interface IgDatePicker {
 	/**
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
-	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	value?: Date;
 
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	minValue?: Date;
 
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	maxValue?: Date;
 
@@ -29249,7 +28275,6 @@ interface IgDatePicker {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
-	 *
 	 */
 	dateDisplayFormat?: string;
 
@@ -29280,7 +28305,6 @@ interface IgDatePicker {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	dateInputFormat?: string;
 
@@ -29290,7 +28314,6 @@ interface IgDatePicker {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
-	 *
 	 * Valid values:
 	 * "date" The value method returns a Date object. When this mode is set the value sent to the server on submit is serialized as ISO 8061 string with local time and zone values by default.
 	 * "displayModeText" The "text" in display mode (no focus) format (pattern) is used to be send to the server and is returned from the value() method (returns a string object).
@@ -29302,7 +28325,6 @@ interface IgDatePicker {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
-	 *
 	 */
 	displayTimeOffset?: any;
 
@@ -29321,7 +28343,6 @@ interface IgDatePicker {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
-	 *
 	 * Valid values:
 	 * "number" Value this value it is applied to all time periods - years, days, minutes, etc.
 	 * "object" A configuration object, which defines specific values for each time period. The option can accept the following format:
@@ -29332,14 +28353,12 @@ interface IgDatePicker {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
-	 *
 	 */
 	limitSpinToCurrentField?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
-	 *
 	 */
 	enableUTCDates?: boolean;
 
@@ -29347,19 +28366,16 @@ interface IgDatePicker {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
-	 *
 	 */
 	centuryThreshold?: number;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
-	 *
 	 */
 	yearShift?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 	nullValue?: string|number|Date;
 
@@ -29403,7 +28419,6 @@ interface IgDatePicker {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	includeKeys?: string;
 
@@ -29412,7 +28427,6 @@ interface IgDatePicker {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	excludeKeys?: string;
 
@@ -29426,9 +28440,6 @@ interface IgDatePicker {
 	 */
 	dropDownOrientation?: string;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -29447,7 +28458,6 @@ interface IgDatePicker {
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -29457,14 +28467,12 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -29475,26 +28483,22 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	suppressNotifications?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -29503,7 +28507,6 @@ interface IgDatePicker {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -29511,32 +28514,27 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -29544,25 +28542,21 @@ interface IgDatePicker {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -29678,8 +28672,6 @@ interface IgDatePickerMethods {
 	/**
 	 * Sets selected date. This method can be used when dataMode is set as either displayModeText or editModeText.
 	 * In such cases the value() cannot accept a date object as a new value and getSelectedDate() can be used to replace that functionality.
-	 *
-	 * @param date
 	 */
 	selectDate(date: Date): void;
 
@@ -29719,14 +28711,12 @@ interface JQuery {
 interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets whether the checkbox is checked.
-	 *
 	 */
 	checked?: boolean;
 
 	/**
 	 * Gets/Sets size of the checkbox based on preset styles.For different sizes, define 'width' and 'height' options instead.
 	 *
-	 *
 	 * Valid values:
 	 * "verysmall" The size of the Checkbox editor is very small.
 	 * "small" The size of the Checkbox editor is small.
@@ -29738,19 +28728,16 @@ interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets a custom class on the checkbox. Custom image can be used this way.
 	 * The following jQuery classes can be used in addition http://api.jqueryui.com/theming/icons/
-	 *
 	 */
 	iconClass?: string;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the readonly attribute. Does not allow editing. Disables changing the checkbox state as an interaction, but it still can be changed programmatically. On submit the current value is sent into the request.
-	 *
 	 */
 	readOnly?: boolean;
 	allowNullValue?: boolean;
@@ -29759,7 +28746,6 @@ interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -29768,7 +28754,6 @@ interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -29776,19 +28761,16 @@ interface IgCheckboxEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -29796,25 +28778,21 @@ interface IgCheckboxEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -29968,8 +28946,6 @@ interface IgCheckboxEditorMethods {
 	 * This option is used when the checkbox is intended to operate as a Boolean editor. In that case the return type is bool.
 	 * 2. If the [value](ui.igcheckboxeditor#options:value) option IS defined, then 'value' method will return the value that will be submitted when the editor is checked and the form is submitted.
 	 * To get checked state regardless of the 'value' option, use $(".selector").igCheckboxEditor("option", "checked");
-	 *
-	 * @param newValue
 	 */
 	value(newValue: Object): string;
 
@@ -30055,7 +29031,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -30063,7 +29038,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30071,7 +29045,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -30079,7 +29052,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30087,28 +29059,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -30116,7 +29084,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -30124,14 +29091,12 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -30139,7 +29104,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30147,42 +29111,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -30191,7 +29149,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -30200,42 +29157,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -30243,7 +29194,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30578,7 +29528,6 @@ interface JQuery {
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -30586,7 +29535,6 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30595,7 +29543,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type string.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -30603,35 +29550,30 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -30641,7 +29583,6 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -30651,21 +29592,18 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -30675,7 +29613,6 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -30685,7 +29622,6 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
@@ -30695,7 +29631,6 @@ interface JQuery {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -30705,7 +29640,6 @@ interface JQuery {
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -30715,7 +29649,6 @@ interface JQuery {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -30725,14 +29658,12 @@ interface JQuery {
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -30740,7 +29671,6 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30748,21 +29678,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -30770,7 +29697,6 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30778,7 +29704,6 @@ interface JQuery {
 
 	/**
 	 * Gets the text mode of the editor such as: single-line text editor, password editor or multiline editor. That option has effect only on initialization. If based element (selector) is TEXTAREA, then it is used as input-field.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "textMode"): string;
@@ -30786,7 +29711,6 @@ interface JQuery {
 	/**
 	 * The text mode of the editor such as: single-line text editor, password editor or multiline editor. That option has effect only on initialization. If based element (selector) is TEXTAREA, then it is used as input-field.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30794,63 +29718,54 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the ability of the editor to automatically move the dropdown list selection item from one end to the opposite side. When the last item is reached and spin down is performed, the first item gets selected and vice versa. This option has no effect there is no drop-down list.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
 	/**
 	 * /Sets the ability of the editor to automatically move the dropdown list selection item from one end to the opposite side. When the last item is reached and spin down is performed, the first item gets selected and vice versa. This option has no effect there is no drop-down list.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -30858,7 +29773,6 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30867,7 +29781,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the maximum length of a text which can be entered by the user.
 	 * Negative values or 0 disables that behavior. If set at runtime the editor doesn't apply the option to the cuurent value.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "maxLength"): number;
 
@@ -30875,7 +29788,6 @@ interface JQuery {
 	 * /Sets the maximum length of a text which can be entered by the user.
 	 * Negative values or 0 disables that behavior. If set at runtime the editor doesn't apply the option to the cuurent value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "maxLength", optionValue: number): void;
@@ -30884,7 +29796,6 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -30893,7 +29804,6 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
@@ -30901,7 +29811,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toUpper"): boolean;
 
@@ -30909,7 +29818,6 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: boolean): void;
@@ -30917,7 +29825,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toLower"): boolean;
 
@@ -30925,21 +29832,18 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toLower", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -30948,7 +29852,6 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -30957,14 +29860,12 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -30972,7 +29873,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30980,7 +29880,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -30988,7 +29887,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30996,28 +29894,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -31025,7 +29919,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -31033,14 +29926,12 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -31048,7 +29939,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31056,42 +29946,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -31100,7 +29984,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -31109,42 +29992,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -31152,7 +30029,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31627,7 +30503,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -31635,7 +30510,6 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
@@ -31645,7 +30519,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativeSign"): string;
 
@@ -31655,7 +30528,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativeSign", optionValue: string): void;
@@ -31664,7 +30536,6 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativePattern"): string;
 
@@ -31673,7 +30544,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativePattern", optionValue: string): void;
@@ -31683,7 +30553,6 @@ interface JQuery {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "decimalSeparator"): string;
 
@@ -31693,7 +30562,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "decimalSeparator", optionValue: string): void;
@@ -31704,7 +30572,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groupSeparator"): string;
 
@@ -31715,7 +30582,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groupSeparator", optionValue: string): void;
@@ -31729,7 +30595,6 @@ interface JQuery {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groups"): any[];
 
@@ -31743,7 +30608,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groups", optionValue: any[]): void;
@@ -31754,7 +30618,6 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxDecimals"): number;
 
@@ -31765,7 +30628,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxDecimals", optionValue: number): void;
@@ -31777,7 +30639,6 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minDecimals"): number;
 
@@ -31789,7 +30650,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minDecimals", optionValue: number): void;
@@ -31798,7 +30658,6 @@ interface JQuery {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "roundDecimals"): boolean;
 
@@ -31807,14 +30666,12 @@ interface JQuery {
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "roundDecimals", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -31822,7 +30679,6 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31832,7 +30688,6 @@ interface JQuery {
 	 * Defines the range that editor's value can accept.This is achieved by setting the [minValue](ui.igNumericEditor#options:minValue) and [maxValue](ui.igNumericEditor#options:maxValue) editor's options, accordingly to the lowest and highest accepted values for the defined numeric mode.
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -31842,7 +30697,6 @@ interface JQuery {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31850,28 +30704,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minValue"): number;
 
 	/**
 	 * /Sets the minimum value which can be entered in the editor by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minValue", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxValue"): number;
 
 	/**
 	 * /Sets the maximum value which can be entered in the editor by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: number): void;
@@ -31879,7 +30729,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -31887,21 +30736,18 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinDelta"): number;
 
 	/**
 	 * /Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinDelta", optionValue: number): void;
@@ -31910,7 +30756,6 @@ interface JQuery {
 	 * Gets/Sets support for scientific format.
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "scientificFormat"): string;
@@ -31920,7 +30765,6 @@ interface JQuery {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31929,7 +30773,6 @@ interface JQuery {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
@@ -31937,21 +30780,18 @@ interface JQuery {
 	 * /Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
@@ -32016,18 +30856,13 @@ interface JQuery {
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
-	/**
-	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "value"): any;
 
@@ -32035,14 +30870,12 @@ interface JQuery {
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -32050,7 +30883,6 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32058,28 +30890,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -32089,7 +30917,6 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -32099,21 +30926,18 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -32123,7 +30947,6 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -32133,28 +30956,24 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -32162,7 +30981,6 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32170,35 +30988,30 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -32206,7 +31019,6 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32216,7 +31028,6 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -32225,21 +31036,18 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -32248,7 +31056,6 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -32257,14 +31064,12 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -32272,7 +31077,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32280,7 +31084,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -32288,7 +31091,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32296,21 +31098,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -32318,7 +31117,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32326,42 +31124,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -32370,7 +31162,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -32379,42 +31170,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -32422,7 +31207,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32597,7 +31381,6 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as positive pattern. The "n" flag represents the value of number.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "positivePattern"): string;
 
@@ -32606,21 +31389,18 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "positivePattern", optionValue: string): void;
 
 	/**
 	 * Gets/Sets a string that is used as the currency symbol that is shown in display mode.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "currencySymbol"): string;
 
 	/**
 	 * /Sets a string that is used as the currency symbol that is shown in display mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "currencySymbol", optionValue: string): void;
@@ -32628,7 +31408,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -32636,7 +31415,6 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
@@ -32646,7 +31424,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativeSign"): string;
 
@@ -32656,7 +31433,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativeSign", optionValue: string): void;
@@ -32665,7 +31441,6 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativePattern"): string;
 
@@ -32674,7 +31449,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativePattern", optionValue: string): void;
@@ -32684,7 +31458,6 @@ interface JQuery {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "decimalSeparator"): string;
 
@@ -32694,7 +31467,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "decimalSeparator", optionValue: string): void;
@@ -32705,7 +31477,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groupSeparator"): string;
 
@@ -32716,7 +31487,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groupSeparator", optionValue: string): void;
@@ -32730,7 +31500,6 @@ interface JQuery {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groups"): any[];
 
@@ -32744,7 +31513,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groups", optionValue: any[]): void;
@@ -32755,7 +31523,6 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxDecimals"): number;
 
@@ -32766,7 +31533,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxDecimals", optionValue: number): void;
@@ -32778,7 +31544,6 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minDecimals"): number;
 
@@ -32790,7 +31555,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minDecimals", optionValue: number): void;
@@ -32799,7 +31563,6 @@ interface JQuery {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "roundDecimals"): boolean;
 
@@ -32808,14 +31571,12 @@ interface JQuery {
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "roundDecimals", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -32823,7 +31584,6 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32833,7 +31593,6 @@ interface JQuery {
 	 * Defines the range that editor's value can accept.This is achieved by setting the [minValue](ui.igNumericEditor#options:minValue) and [maxValue](ui.igNumericEditor#options:maxValue) editor's options, accordingly to the lowest and highest accepted values for the defined numeric mode.
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -32843,7 +31602,6 @@ interface JQuery {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32851,28 +31609,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minValue"): number;
 
 	/**
 	 * /Sets the minimum value which can be entered in the editor by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minValue", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxValue"): number;
 
 	/**
 	 * /Sets the maximum value which can be entered in the editor by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: number): void;
@@ -32880,7 +31634,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -32888,21 +31641,18 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinDelta"): number;
 
 	/**
 	 * /Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinDelta", optionValue: number): void;
@@ -32911,7 +31661,6 @@ interface JQuery {
 	 * Gets/Sets support for scientific format.
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "scientificFormat"): string;
@@ -32921,7 +31670,6 @@ interface JQuery {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32930,7 +31678,6 @@ interface JQuery {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
@@ -32938,21 +31685,18 @@ interface JQuery {
 	 * /Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
@@ -33017,18 +31761,13 @@ interface JQuery {
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
-	/**
-	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "value"): any;
 
@@ -33036,14 +31775,12 @@ interface JQuery {
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -33051,7 +31788,6 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33059,28 +31795,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -33090,7 +31822,6 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -33100,21 +31831,18 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -33124,7 +31852,6 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -33134,28 +31861,24 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -33163,7 +31886,6 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33171,35 +31893,30 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -33207,7 +31924,6 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33217,7 +31933,6 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -33226,21 +31941,18 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -33249,7 +31961,6 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -33258,14 +31969,12 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -33273,7 +31982,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33281,7 +31989,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -33289,7 +31996,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33297,21 +32003,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -33319,7 +32022,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33327,42 +32029,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -33371,7 +32067,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -33380,42 +32075,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -33423,7 +32112,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33453,7 +32141,6 @@ interface JQuery {
 	 * Gets/Sets the pattern for positive numeric values, which is used in display (no focus) state.
 	 * If you use the "en-US" culture the default value for "positivePattern" will be "n$" where the "$" flag represents the "numericSymbol" and the "n" flag represents the value of the number.
 	 * Note: this option has priority over possible regional settings.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "positivePattern"): string;
 
@@ -33462,7 +32149,6 @@ interface JQuery {
 	 * If you use the "en-US" culture the default value for "positivePattern" will be "n$" where the "$" flag represents the "numericSymbol" and the "n" flag represents the value of the number.
 	 * Note: this option has priority over possible regional settings.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "positivePattern", optionValue: string): void;
@@ -33470,7 +32156,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the symbol, which is used in display (no focus) state.
 	 * Note: this option has priority over possible regional settings.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "percentSymbol"): string;
 
@@ -33478,7 +32163,6 @@ interface JQuery {
 	 * /Sets the symbol, which is used in display (no focus) state.
 	 * Note: this option has priority over possible regional settings.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "percentSymbol", optionValue: string): void;
@@ -33489,7 +32173,6 @@ interface JQuery {
 	 * For example, if the factor is 100 and the "value" is set to 0.123, then the editor will show string "12.3".
 	 * Possible values: 1 or 100.
 	 * Note: this option has priority over possible regional settings.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "displayFactor"): number;
 
@@ -33500,7 +32183,6 @@ interface JQuery {
 	 * Possible values: 1 or 100.
 	 * Note: this option has priority over possible regional settings.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "displayFactor", optionValue: number): void;
@@ -33509,7 +32191,6 @@ interface JQuery {
 	 * Defines the range that editor's value can accept.This is achieved by setting the [minValue](ui.igPercentEditor#options:minValue) and [maxValue](ui.igPercentEditor#options:maxValue) editor's options, accordingly to the lowest and highest accepted values for the defined numeric mode.
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igPercentEditor#options:minDecimals) and [maxDecimals](ui.igPercentEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -33519,7 +32200,6 @@ interface JQuery {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igPercentEditor#options:minDecimals) and [maxDecimals](ui.igPercentEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33527,14 +32207,12 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igpercenteditor#options:buttonType) or [spinUp](ui.igpercenteditor#methods:spinUp) and [spinDown](ui.igpercenteditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinDelta"): number;
 
 	/**
 	 * /Sets the default delta-value which is used with "spin" [buttonType](ui.igpercenteditor#options:buttonType) or [spinUp](ui.igpercenteditor#methods:spinUp) and [spinDown](ui.igpercenteditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinDelta", optionValue: number): void;
@@ -33542,7 +32220,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -33550,7 +32227,6 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
@@ -33560,7 +32236,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativeSign"): string;
 
@@ -33570,7 +32245,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativeSign", optionValue: string): void;
@@ -33579,7 +32253,6 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativePattern"): string;
 
@@ -33588,7 +32261,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativePattern", optionValue: string): void;
@@ -33598,7 +32270,6 @@ interface JQuery {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "decimalSeparator"): string;
 
@@ -33608,7 +32279,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "decimalSeparator", optionValue: string): void;
@@ -33619,7 +32289,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groupSeparator"): string;
 
@@ -33630,7 +32299,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groupSeparator", optionValue: string): void;
@@ -33644,7 +32312,6 @@ interface JQuery {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groups"): any[];
 
@@ -33658,7 +32325,6 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groups", optionValue: any[]): void;
@@ -33669,7 +32335,6 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxDecimals"): number;
 
@@ -33680,7 +32345,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxDecimals", optionValue: number): void;
@@ -33692,7 +32356,6 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minDecimals"): number;
 
@@ -33704,7 +32367,6 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minDecimals", optionValue: number): void;
@@ -33713,7 +32375,6 @@ interface JQuery {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "roundDecimals"): boolean;
 
@@ -33722,14 +32383,12 @@ interface JQuery {
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "roundDecimals", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -33737,7 +32396,6 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33745,28 +32403,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minValue"): number;
 
 	/**
 	 * /Sets the minimum value which can be entered in the editor by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minValue", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxValue"): number;
 
 	/**
 	 * /Sets the maximum value which can be entered in the editor by the end user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: number): void;
@@ -33774,7 +32428,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -33782,7 +32435,6 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
@@ -33791,7 +32443,6 @@ interface JQuery {
 	 * Gets/Sets support for scientific format.
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "scientificFormat"): string;
@@ -33801,7 +32452,6 @@ interface JQuery {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33810,7 +32460,6 @@ interface JQuery {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
@@ -33818,21 +32467,18 @@ interface JQuery {
 	 * /Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
@@ -33897,18 +32543,13 @@ interface JQuery {
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
-	/**
-	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "value"): any;
 
@@ -33916,14 +32557,12 @@ interface JQuery {
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -33931,7 +32570,6 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33939,28 +32577,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -33970,7 +32604,6 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -33980,21 +32613,18 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -34004,7 +32634,6 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -34014,28 +32643,24 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -34043,7 +32668,6 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34051,35 +32675,30 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -34087,7 +32706,6 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34097,7 +32715,6 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -34106,21 +32723,18 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -34129,7 +32743,6 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -34138,14 +32751,12 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -34153,7 +32764,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34161,7 +32771,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -34169,7 +32778,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34177,21 +32785,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -34199,7 +32804,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34207,42 +32811,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -34251,7 +32849,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -34260,42 +32857,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -34303,7 +32894,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34340,7 +32930,6 @@ interface JQuery {
 
 	/**
 	 * Gets visibility of the clear button. That option can be set only on initialization.
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -34348,7 +32937,6 @@ interface JQuery {
 	/**
 	 * Visibility of the clear button. That option can be set only on initialization.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34372,7 +32960,6 @@ interface JQuery {
 	 * >: all letters to the right are converted to the upper case. In order to disable conversion, the ">" flag should be used again.
 	 * <: all letters to the right are converted to the lower case. In order to disable conversion, the "<" flag should be used again.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputMask"): string;
 
@@ -34395,14 +32982,12 @@ interface JQuery {
 	 * <: all letters to the right are converted to the lower case. In order to disable conversion, the "<" flag should be used again.
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputMask", optionValue: string): void;
 
 	/**
 	 * It affects the value of the control (value method/option and submitted in forms). It defines what the value should contain from text, unfilled prompts and literals. The default is allText and when used value method/option returns the text entered, all prompts (positions) and literals.
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -34410,7 +32995,6 @@ interface JQuery {
 	/**
 	 * It affects the value of the control (value method/option and submitted in forms). It defines what the value should contain from text, unfilled prompts and literals. The default is allText and when used value method/option returns the text entered, all prompts (positions) and literals.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34418,42 +33002,36 @@ interface JQuery {
 
 	/**
 	 * Gets character which is used as prompt in edit mode for available entry position.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "unfilledCharsPrompt"): string;
 
 	/**
 	 * Character which is used as prompt in edit mode for available entry position.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "unfilledCharsPrompt", optionValue: string): void;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when editor is in display mode (not focused).
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "padChar"): string;
 
 	/**
 	 * /Sets character which is used as replacement of not-filled required position in mask when editor is in display mode (not focused).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "padChar", optionValue: string): void;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when application calls get for the [value](ui.igmaskeditor#methods:value) methods.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "emptyChar"): string;
 
 	/**
 	 * /Sets character which is used as replacement of not-filled required position in mask when application calls get for the [value](ui.igmaskeditor#methods:value) methods.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "emptyChar", optionValue: string): void;
@@ -34463,7 +33041,6 @@ interface JQuery {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -34473,7 +33050,6 @@ interface JQuery {
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -34483,7 +33059,6 @@ interface JQuery {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -34493,7 +33068,6 @@ interface JQuery {
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
@@ -34608,12 +33182,8 @@ interface JQuery {
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
-	/**
-	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -34648,14 +33218,12 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
@@ -34664,7 +33232,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -34672,7 +33239,6 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34680,21 +33246,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -34702,7 +33265,6 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34710,28 +33272,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
@@ -34739,7 +33297,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toUpper"): boolean;
 
@@ -34747,7 +33304,6 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: boolean): void;
@@ -34755,7 +33311,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toLower"): boolean;
 
@@ -34763,28 +33318,24 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toLower", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -34792,7 +33343,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34800,7 +33350,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -34808,7 +33357,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34816,14 +33364,12 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -34831,7 +33377,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -34839,14 +33384,12 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -34854,7 +33397,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34862,42 +33404,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -34906,7 +33442,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -34915,42 +33450,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -34958,7 +33487,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35025,7 +33553,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "value"): Date;
 
@@ -35033,7 +33560,6 @@ interface JQuery {
 	 * /Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "value", optionValue: Date): void;
@@ -35041,7 +33567,6 @@ interface JQuery {
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "minValue"): Date;
 
@@ -35049,7 +33574,6 @@ interface JQuery {
 	 * The minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "minValue", optionValue: Date): void;
@@ -35057,7 +33581,6 @@ interface JQuery {
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "maxValue"): Date;
 
@@ -35065,7 +33588,6 @@ interface JQuery {
 	 * The maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: Date): void;
@@ -35108,7 +33630,6 @@ interface JQuery {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateDisplayFormat"): string;
 
@@ -35151,7 +33672,6 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateDisplayFormat", optionValue: string): void;
@@ -35183,7 +33703,6 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateInputFormat"): string;
 
@@ -35215,7 +33734,6 @@ interface JQuery {
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateInputFormat", optionValue: string): void;
@@ -35225,7 +33743,6 @@ interface JQuery {
 	 * The [enableUTCDates](ui.%%WidgetNameLowered%%#options:enableUTCDates) option can be used to output an UTC ISO string instead.
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -35236,7 +33753,6 @@ interface JQuery {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35246,7 +33762,6 @@ interface JQuery {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "displayTimeOffset"): any;
 
@@ -35255,14 +33770,12 @@ interface JQuery {
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "displayTimeOffset", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin and clear buttons. That option can be set only on initialization. Combinations like 'spin,clear' are supported too.
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -35270,7 +33783,6 @@ interface JQuery {
 	/**
 	 * Visibility of the spin and clear buttons. That option can be set only on initialization. Combinations like 'spin,clear' are supported too.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35290,7 +33802,6 @@ interface JQuery {
 	 * milliseconds: 100
 	 * }
 	 * Time periods that don't have values use 1 as default.
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "spinDelta"): number|Object;
@@ -35310,7 +33821,6 @@ interface JQuery {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35320,7 +33830,6 @@ interface JQuery {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "limitSpinToCurrentField"): boolean;
 
@@ -35329,7 +33838,6 @@ interface JQuery {
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "limitSpinToCurrentField", optionValue: boolean): void;
@@ -35337,7 +33845,6 @@ interface JQuery {
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
@@ -35345,7 +33852,6 @@ interface JQuery {
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -35354,7 +33860,6 @@ interface JQuery {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "centuryThreshold"): number;
 
@@ -35363,28 +33868,24 @@ interface JQuery {
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "centuryThreshold", optionValue: number): void;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "yearShift"): number;
 
 	/**
 	 * /Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "yearShift", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "nullValue"): string|number|Date;
@@ -35392,7 +33893,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35561,7 +34061,6 @@ interface JQuery {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -35571,7 +34070,6 @@ interface JQuery {
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -35581,7 +34079,6 @@ interface JQuery {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -35591,7 +34088,6 @@ interface JQuery {
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
@@ -35620,12 +34116,8 @@ interface JQuery {
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
 
-	/**
-	 */
 	igDateEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igDateEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -35660,7 +34152,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -35668,7 +34159,6 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35676,21 +34166,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -35698,7 +34185,6 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35706,49 +34192,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -35756,7 +34235,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35764,7 +34242,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -35772,7 +34249,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35780,14 +34256,12 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -35795,7 +34269,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -35803,49 +34276,42 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -35854,7 +34320,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -35863,42 +34328,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -35906,7 +34365,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36012,7 +34470,6 @@ interface JQuery {
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -36020,7 +34477,6 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36028,14 +34484,12 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the options supported by the [jquery.ui.datepicker](http://api.jqueryui.com/datepicker/). Only options related to the drop-down calendar are supported.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "datepickerOptions"): any;
 
 	/**
 	 * /Sets the options supported by the [jquery.ui.datepicker](http://api.jqueryui.com/datepicker/). Only options related to the drop-down calendar are supported.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "datepickerOptions", optionValue: any): void;
@@ -36043,7 +34497,6 @@ interface JQuery {
 	/**
 	 * Gets the ability to limit igDatePicker to be used only as s calendar. When set to true the editor input is not editable.
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -36051,7 +34504,6 @@ interface JQuery {
 	 * The ability to limit igDatePicker to be used only as s calendar. When set to true the editor input is not editable.
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
@@ -36119,7 +34571,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -36127,7 +34578,6 @@ interface JQuery {
 	 * /Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
@@ -36135,7 +34585,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "value"): Date;
 
@@ -36143,7 +34592,6 @@ interface JQuery {
 	 * /Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "value", optionValue: Date): void;
@@ -36151,7 +34599,6 @@ interface JQuery {
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "minValue"): Date;
 
@@ -36159,7 +34606,6 @@ interface JQuery {
 	 * The minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "minValue", optionValue: Date): void;
@@ -36167,7 +34613,6 @@ interface JQuery {
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "maxValue"): Date;
 
@@ -36175,7 +34620,6 @@ interface JQuery {
 	 * The maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "maxValue", optionValue: Date): void;
@@ -36218,7 +34662,6 @@ interface JQuery {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateDisplayFormat"): string;
 
@@ -36261,7 +34704,6 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateDisplayFormat", optionValue: string): void;
@@ -36293,7 +34735,6 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateInputFormat"): string;
 
@@ -36325,7 +34766,6 @@ interface JQuery {
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateInputFormat", optionValue: string): void;
@@ -36335,7 +34775,6 @@ interface JQuery {
 	 * The [enableUTCDates](ui.%%WidgetNameLowered%%#options:enableUTCDates) option can be used to output an UTC ISO string instead.
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -36346,7 +34785,6 @@ interface JQuery {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36356,7 +34794,6 @@ interface JQuery {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "displayTimeOffset"): any;
 
@@ -36365,7 +34802,6 @@ interface JQuery {
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "displayTimeOffset", optionValue: any): void;
@@ -36384,7 +34820,6 @@ interface JQuery {
 	 * milliseconds: 100
 	 * }
 	 * Time periods that don't have values use 1 as default.
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "spinDelta"): number|Object;
@@ -36404,7 +34839,6 @@ interface JQuery {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36414,7 +34848,6 @@ interface JQuery {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "limitSpinToCurrentField"): boolean;
 
@@ -36423,7 +34856,6 @@ interface JQuery {
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "limitSpinToCurrentField", optionValue: boolean): void;
@@ -36431,7 +34863,6 @@ interface JQuery {
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
@@ -36439,7 +34870,6 @@ interface JQuery {
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -36448,7 +34878,6 @@ interface JQuery {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "centuryThreshold"): number;
 
@@ -36457,28 +34886,24 @@ interface JQuery {
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "centuryThreshold", optionValue: number): void;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "yearShift"): number;
 
 	/**
 	 * /Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "yearShift", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "nullValue"): string|number|Date;
@@ -36486,7 +34911,6 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36581,7 +35005,6 @@ interface JQuery {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -36591,7 +35014,6 @@ interface JQuery {
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -36601,7 +35023,6 @@ interface JQuery {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -36611,7 +35032,6 @@ interface JQuery {
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
@@ -36640,12 +35060,8 @@ interface JQuery {
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
 
-	/**
-	 */
 	igDatePicker(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igDatePicker(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -36680,7 +35096,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -36688,7 +35103,6 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36696,21 +35110,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -36718,7 +35129,6 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36726,49 +35136,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "width"): string|number;
@@ -36776,7 +35179,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36784,7 +35186,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "height"): string|number;
@@ -36792,7 +35193,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -36800,14 +35200,12 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -36815,7 +35213,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -36823,49 +35220,42 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -36874,7 +35264,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -36883,42 +35272,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -36926,7 +35309,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37072,21 +35454,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets whether the checkbox is checked.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "checked"): boolean;
 
 	/**
 	 * /Sets whether the checkbox is checked.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "checked", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets size of the checkbox based on preset styles.For different sizes, define 'width' and 'height' options instead.
-	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "size"): string;
@@ -37094,7 +35473,6 @@ interface JQuery {
 	/**
 	 * /Sets size of the checkbox based on preset styles.For different sizes, define 'width' and 'height' options instead.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37103,7 +35481,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets a custom class on the checkbox. Custom image can be used this way.
 	 * The following jQuery classes can be used in addition http://api.jqueryui.com/theming/icons/
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "iconClass"): string;
 
@@ -37111,35 +35488,30 @@ interface JQuery {
 	 * /Sets a custom class on the checkbox. Custom image can be used this way.
 	 * The following jQuery classes can be used in addition http://api.jqueryui.com/theming/icons/
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "iconClass", optionValue: string): void;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the readonly attribute. Does not allow editing. Disables changing the checkbox state as an interaction, but it still can be changed programmatically. On submit the current value is sent into the request.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute. Does not allow editing. Disables changing the checkbox state as an interaction, but it still can be changed programmatically. On submit the current value is sent into the request.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
@@ -37150,7 +35522,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -37158,7 +35529,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37166,7 +35536,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -37174,7 +35543,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37182,42 +35550,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -37226,7 +35588,6 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -37235,42 +35596,36 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -37278,7 +35633,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -38750,7 +37104,6 @@ interface JQuery {
 interface IgGridAppendRowsOnDemandLocale {
 	/**
 	 * Specifies caption text for the "load more data" button.
-	 *
 	 */
 	loadMoreDataButtonText?: string;
 
@@ -38811,7 +37164,6 @@ interface IgGridAppendRowsOnDemand {
 	/**
 	 * Defines local or remote type of appending rows on demand in igGrid
 	 *
-	 *
 	 * Valid values:
 	 * "remote" request data from the remote endpoint
 	 * "local" loading data on the client-side
@@ -38820,44 +37172,37 @@ interface IgGridAppendRowsOnDemand {
 
 	/**
 	 * Default number of records per chunk
-	 *
 	 */
 	chunkSize?: number;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
-	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk size
-	 *
 	 */
 	chunkSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk index
-	 *
 	 */
 	chunkIndexUrlKey?: string;
 
 	/**
 	 * Initial chunk index position
-	 *
 	 */
 	defaultChunkIndex?: number;
 
 	/**
 	 * Current chunk index position
-	 *
 	 */
 	currentChunkIndex?: number;
 
 	/**
 	 * denotes the append rows on demand request method
 	 *
-	 *
 	 * Valid values:
 	 * "auto" new record will be appended to the grid while the user scrolls the scrollbar
 	 * "button" a button will be rendered at the bottom of the grid. The user should press it to load more rows
@@ -38908,7 +37253,6 @@ interface JQuery {
 
 	/**
 	 * Defines local or remote type of appending rows on demand in igGrid
-	 *
 	 */
 
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "type"): string;
@@ -38916,7 +37260,6 @@ interface JQuery {
 	/**
 	 * Defines local or remote type of appending rows on demand in igGrid
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -38924,91 +37267,78 @@ interface JQuery {
 
 	/**
 	 * Default number of records per chunk
-	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSize"): number;
 
 	/**
 	 * Default number of records per chunk
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSize", optionValue: number): void;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
-	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk size
-	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSizeUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk size
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSizeUrlKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk index
-	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkIndexUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk index
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkIndexUrlKey", optionValue: string): void;
 
 	/**
 	 * Initial chunk index position
-	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "defaultChunkIndex"): number;
 
 	/**
 	 * Initial chunk index position
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "defaultChunkIndex", optionValue: number): void;
 
 	/**
 	 * Current chunk index position
-	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "currentChunkIndex"): number;
 
 	/**
 	 * Current chunk index position
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "currentChunkIndex", optionValue: number): void;
 
 	/**
 	 * Denotes the append rows on demand request method
-	 *
 	 */
 
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "loadTrigger"): string;
@@ -39016,7 +37346,6 @@ interface JQuery {
 	/**
 	 * Denotes the append rows on demand request method
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39072,20 +37401,17 @@ interface JQuery {
 interface IgGridCellMergingColumnSetting {
 	/**
 	 * Column index. This is a required property in every column setting if columnKey is not set.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Defines when merging should be applied.
 	 *
-	 *
 	 * Valid values:
 	 * "sorting" The column will only be merged when sorted
 	 * "always" The column will always be merged
@@ -39096,7 +37422,6 @@ interface IgGridCellMergingColumnSetting {
 	/**
 	 * Defines the rules merging is based on.
 	 *
-	 *
 	 * Valid values:
 	 * "duplicate" Duplicate values in the column will be merged together.
 	 * "null" Merging will be applied for each subsequent null value after a non-null value.
@@ -39200,7 +37525,6 @@ interface IgGridCellMerging {
 	/**
 	 * Defines the type of merging.
 	 *
-	 *
 	 * Valid values:
 	 * "visual" the grid cells will be merged only visually
 	 * "physical" the grid cell will be merged physically throughout rowspan
@@ -39210,7 +37534,6 @@ interface IgGridCellMerging {
 	/**
 	 * Defines when merging should be applied.
 	 *
-	 *
 	 * Valid values:
 	 * "sorting" Only sorted columns will have merging applied
 	 * "always" Merging will be applied to all columns always
@@ -39221,7 +37544,6 @@ interface IgGridCellMerging {
 	/**
 	 * Defines the rules merging is based on.
 	 *
-	 *
 	 * Valid values:
 	 * "duplicate" Duplicate values in the column will be merged together.
 	 * "null" Merging will be applied for each subsequent null value after a non-null value.
@@ -39230,7 +37552,6 @@ interface IgGridCellMerging {
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridCellMergingColumnSetting[];
 
@@ -39290,7 +37611,6 @@ interface JQuery {
 
 	/**
 	 * Defines the type of merging.
-	 *
 	 */
 
 	igGridCellMerging(optionLiteral: 'option', optionName: "mergeType"): string;
@@ -39298,7 +37618,6 @@ interface JQuery {
 	/**
 	 * Defines the type of merging.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39306,7 +37625,6 @@ interface JQuery {
 
 	/**
 	 * Defines when merging should be applied.
-	 *
 	 */
 
 	igGridCellMerging(optionLiteral: 'option', optionName: "mergeOn"): string;
@@ -39314,7 +37632,6 @@ interface JQuery {
 	/**
 	 * Defines when merging should be applied.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39322,7 +37639,6 @@ interface JQuery {
 
 	/**
 	 * Defines the rules merging is based on.
-	 *
 	 */
 
 	igGridCellMerging(optionLiteral: 'option', optionName: "mergeStrategy"): string|Function;
@@ -39330,7 +37646,6 @@ interface JQuery {
 	/**
 	 * Defines the rules merging is based on.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39338,14 +37653,12 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
-	 *
 	 */
 	igGridCellMerging(optionLiteral: 'option', optionName: "columnSettings"): IgGridCellMergingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridCellMerging(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridCellMergingColumnSetting[]): void;
@@ -39426,13 +37739,11 @@ interface IgGridColumnFixingLocale {
 
 	/**
 	 * Text of the feature chooser button for fixing a currently unfixed column.
-	 *
 	 */
 	featureChooserTextFixedColumn?: string;
 
 	/**
 	 * Text of the feature chooser button for unfixing a currently fixed column.
-	 *
 	 */
 	featureChooserTextUnfixedColumn?: string;
 
@@ -39445,25 +37756,21 @@ interface IgGridColumnFixingLocale {
 interface IgGridColumnFixingColumnSetting {
 	/**
 	 * Identifies the grid column by key. Either key or index must be set in every column setting.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Identifies the grid column by index. Either key or index must be set in every column setting.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Specifies whether the column can be fixed or not. If allow fixing is false, then the fixing pin will not be rendered for the column.
-	 *
 	 */
 	allowFixing?: boolean;
 
 	/**
 	 * Specifies whether the column is initially fixed or not. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#initial-state) out for more information.
-	 *
 	 */
 	isFixed?: boolean;
 
@@ -39637,26 +37944,22 @@ interface IgGridColumnFixing {
 
 	/**
 	 * Specifies whether to show the column fixing buttons in header cells/feature chooser.
-	 *
 	 */
 	showFixButtons?: boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
-	 *
 	 */
 	syncRowHeights?: boolean;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
-	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
-	 *
 	 * Valid values:
 	 * "left" Fixed columns are rendered on the left side of the main grid.
 	 * "right" Fixed columns are rendered on the right side of the main grid.
@@ -39665,14 +37968,12 @@ interface IgGridColumnFixing {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width can be set in pixels (px) and percentage (%).
 	 * "number" The width can be set in pixels as a number.
@@ -39681,7 +37982,6 @@ interface IgGridColumnFixing {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
-	 *
 	 */
 	fixNondataColumns?: boolean;
 
@@ -39908,49 +38208,42 @@ interface JQuery {
 
 	/**
 	 * Gets whether to show the column fixing buttons in header cells/feature chooser.
-	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons"): boolean;
 
 	/**
 	 * Sets whether to show the column fixing buttons in header cells/feature chooser.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons", optionValue: boolean): void;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
-	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights"): boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights", optionValue: boolean): void;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
-	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
-	 *
 	 */
 
 	igGridColumnFixing(optionLiteral: 'option', optionName: "fixingDirection"): string;
@@ -39958,7 +38251,6 @@ interface JQuery {
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39966,21 +38258,18 @@ interface JQuery {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
-	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnFixingColumnSetting[]): void;
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
-	 *
 	 */
 
 	igGridColumnFixing(optionLiteral: 'option', optionName: "minimalVisibleAreaWidth"): string|number;
@@ -39988,7 +38277,6 @@ interface JQuery {
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39996,14 +38284,12 @@ interface JQuery {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
-	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns"): boolean;
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns", optionValue: boolean): void;
@@ -40100,19 +38386,16 @@ interface JQuery {
 interface IgGridColumnMovingColumnSetting {
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. The preferred way of populating a column setting is to always use the column keys as identifiers.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Allows the column to be moved.
-	 *
 	 */
 	allowMoving?: boolean;
 
@@ -40125,85 +38408,71 @@ interface IgGridColumnMovingColumnSetting {
 interface IgGridColumnMovingLocale {
 	/**
 	 * Specifies the apply button text.
-	 *
 	 */
 	movingDialogButtonApplyText?: string;
 
 	/**
 	 * Specifies the cancel button text.
-	 *
 	 */
 	movingDialogButtonCancelText?: string;
 
 	/**
 	 * Specifies caption for each move down button in the column moving dialog.
-	 *
 	 */
 	movingDialogCaptionButtonDesc?: string;
 
 	/**
 	 * Specifies caption for each move up button in the column moving dialog.
-	 *
 	 */
 	movingDialogCaptionButtonAsc?: string;
 
 	/**
 	 * Specifies caption text for the column moving dialog.
-	 *
 	 */
 	movingDialogCaptionText?: string;
 
 	/**
 	 * Specifies caption text for the feature chooser entry.
-	 *
 	 */
 	movingDialogDisplayText?: string;
 
 	/**
 	 * Specifies text for drop tooltip in column moving dialog.
-	 *
 	 */
 	movingDialogDropTooltipText?: string;
 
 	/**
 	 * Specifies title for close dialog button.
-	 *
 	 */
 	movingDialogCloseButtonTitle?: string;
 
 	/**
 	 * Specifies caption for the move left dropdown button.
-	 *
 	 */
 	dropDownMoveLeftText?: string;
 
 	/**
 	 * Specifies caption for the move right dropdown button.
-	 *
 	 */
 	dropDownMoveRightText?: string;
 
 	/**
 	 * Specifies caption for the move first dropdown button.
-	 *
 	 */
 	dropDownMoveFirstText?: string;
 
 	/**
 	 * Specifies caption for the move last dropdown button.
-	 *
 	 */
 	dropDownMoveLastText?: string;
 
 	/**
 	 * Specifies tooltip text for the move indicator.
-	 *
 	 */
 	movingToolTipMove?: string;
 
 	/**
 	 * Specifies caption text for the feature chooser submenu button.
-	 *
 	 */
 	featureChooserSubmenuText?: string;
 
@@ -40482,14 +38751,12 @@ interface MovingDialogDragColumnMovedEventUIParam {
 interface IgGridColumnMoving {
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
-	 *
 	 * Valid values:
 	 * "immediate" Column headers will rearange as you drag with a space opening under the cursor for the header to be dropped on
 	 * "deferred" A clone of the header dragged will be created and indicators will be shown between columns to help navigate the drop.
@@ -40499,7 +38766,6 @@ interface IgGridColumnMoving {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
-	 *
 	 * Valid values:
 	 * "dom" Columns will be rearranged through dom manipulation
 	 * "render" Columns will not be rearranged but the grid will be rendered again with the new column order. Please note this option is incompatible with immediate move mode.
@@ -40508,56 +38774,47 @@ interface IgGridColumnMoving {
 
 	/**
 	 * Specifies if header cells should include an additional button that opens a moving helper dropdown.
-	 *
 	 */
 	addMovingDropdown?: boolean;
 
 	/**
 	 * Specifies width of column moving dialog
-	 *
 	 */
 	movingDialogWidth?: number;
 
 	/**
 	 * Specifies height of column moving dialog
-	 *
 	 */
 	movingDialogHeight?: number;
 
 	/**
 	 * Specifies time in milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	movingDialogAnimationDuration?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
-	 *
 	 */
 	movingAcceptanceTolerance?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
-	 *
 	 */
 	movingScrollTolerance?: number;
 
 	/**
 	 * Specifies a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
-	 *
 	 */
 	scrollSpeedMultiplier?: number;
 
 	/**
 	 * Specifies the length (in pixels) of each individual scroll operation
-	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Specifies whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
-	 *
 	 */
 	hideHeaderContentsDuringDrag?: boolean;
 
@@ -40565,7 +38822,6 @@ interface IgGridColumnMoving {
 	 * Specifies the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
-	 *
 	 */
 	dragHelperOpacity?: number;
 
@@ -40638,7 +38894,6 @@ interface IgGridColumnMoving {
 
 	/**
 	 * Specifies markup for drop tooltip in column moving dialog
-	 *
 	 */
 	movingDialogDropTooltipMarkup?: string;
 
@@ -40652,7 +38907,6 @@ interface IgGridColumnMoving {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
@@ -40777,21 +39031,18 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnMovingColumnSetting[]): void;
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
-	 *
 	 */
 
 	igGridColumnMoving(optionLiteral: 'option', optionName: "mode"): string;
@@ -40799,7 +39050,6 @@ interface JQuery {
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40807,7 +39057,6 @@ interface JQuery {
 
 	/**
 	 * Specify the way columns will be rearranged
-	 *
 	 */
 
 	igGridColumnMoving(optionLiteral: 'option', optionName: "moveType"): string;
@@ -40815,7 +39064,6 @@ interface JQuery {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40823,112 +39071,96 @@ interface JQuery {
 
 	/**
 	 * Gets if header cells should include an additional button that opens a moving helper dropdown.
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown"): boolean;
 
 	/**
 	 * Sets if header cells should include an additional button that opens a moving helper dropdown.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown", optionValue: boolean): void;
 
 	/**
 	 * Gets width of column moving dialog
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth"): number;
 
 	/**
 	 * Sets width of column moving dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth", optionValue: number): void;
 
 	/**
 	 * Gets height of column moving dialog
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight"): number;
 
 	/**
 	 * Sets height of column moving dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight", optionValue: number): void;
 
 	/**
 	 * Gets time in milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time in milliseconds for animation duration to show/hide modal dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance", optionValue: number): void;
 
 	/**
 	 * Gets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier"): number;
 
 	/**
 	 * Sets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) of each individual scroll operation
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Sets the length (in pixels) of each individual scroll operation
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
@@ -40936,7 +39168,6 @@ interface JQuery {
 	/**
 	 * Gets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag"): boolean;
 
@@ -40944,7 +39175,6 @@ interface JQuery {
 	 * Sets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag", optionValue: boolean): void;
@@ -40953,7 +39183,6 @@ interface JQuery {
 	 * Gets the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity"): number;
 
@@ -40962,7 +39191,6 @@ interface JQuery {
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity", optionValue: number): void;
@@ -41125,14 +39353,12 @@ interface JQuery {
 
 	/**
 	 * Gets markup for drop tooltip in column moving dialog
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup"): string;
 
 	/**
 	 * Sets markup for drop tooltip in column moving dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup", optionValue: string): void;
@@ -41157,14 +39383,12 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -41508,7 +39732,6 @@ interface IgGridFeatureChooserPopover {
 	/**
 	 * controls the direction in which the control shows relative to the target element
 	 *
-	 *
 	 * Valid values:
 	 * "auto" lets the control show on the side where enough space is available with the priority specified by the [directionPriority](ui.%%WidgetNameLowered%%#options:directionPriority) property
 	 * "left" shows popover on the left side of the target element
@@ -41521,14 +39744,12 @@ interface IgGridFeatureChooserPopover {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
-	 *
 	 */
 	directionPriority?: any[];
 
 	/**
 	 * controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
-	 *
 	 * Valid values:
 	 * "auto" lets the control choose a position depending on available space with the following priority balanced > end > start
 	 * "balanced" the popover is positioned at the middle of the target element
@@ -41539,44 +39760,37 @@ interface IgGridFeatureChooserPopover {
 
 	/**
 	 * defines width for the popover. leave null for auto.
-	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * defines height for the popover. leave null for auto
-	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * defines width the popover won't go under the value even if no specific one is set.
-	 *
 	 */
 	minWidth?: number|string;
 
 	/**
 	 * defines width the popover won't exceed even if no specific one is set.
-	 *
 	 */
 	maxWidth?: number|string;
 
 	/**
 	 * defines height the popover won't exceed even if no specific one is set.
-	 *
 	 */
 	maxHeight?: number|string;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
-	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * sets the content for the popover container. If left null the content will be get from the target.
 	 *
-	 *
 	 * Valid values:
 	 * "string" String content of the popover container
 	 * "function" Function which is a callback that should return the content. Use the 'this' value to access the target DOM element.
@@ -41585,20 +39799,17 @@ interface IgGridFeatureChooserPopover {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
-	 *
 	 */
 	selectors?: string;
 
 	/**
 	 * Sets the content for the popover header
-	 *
 	 */
 	headerTemplate?: IgPopoverHeaderTemplate;
 
 	/**
 	 * sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
-	 *
 	 * Valid values:
 	 * "mouseenter" the popover is shown on mouse enter in the target element
 	 * "click" the popover is shown on click on the target element
@@ -41609,7 +39820,6 @@ interface IgGridFeatureChooserPopover {
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
-	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to the parent jQuery object
@@ -41821,7 +40031,6 @@ interface JQuery {
 
 	/**
 	 * Controls the direction in which the control shows relative to the target element
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "direction"): string;
@@ -41829,7 +40038,6 @@ interface JQuery {
 	/**
 	 * Controls the direction in which the control shows relative to the target element
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41838,7 +40046,6 @@ interface JQuery {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
-	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "directionPriority"): any[];
 
@@ -41846,14 +40053,12 @@ interface JQuery {
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "directionPriority", optionValue: any[]): void;
 
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "position"): string;
@@ -41861,7 +40066,6 @@ interface JQuery {
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41869,7 +40073,6 @@ interface JQuery {
 
 	/**
 	 * Defines width for the popover. leave null for auto.
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "width"): number|string;
@@ -41877,7 +40080,6 @@ interface JQuery {
 	/**
 	 * Defines width for the popover. leave null for auto.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41885,7 +40087,6 @@ interface JQuery {
 
 	/**
 	 * Defines height for the popover. leave null for auto
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "height"): number|string;
@@ -41893,7 +40094,6 @@ interface JQuery {
 	/**
 	 * Defines height for the popover. leave null for auto
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41901,7 +40101,6 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "minWidth"): number|string;
@@ -41909,7 +40108,6 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41917,7 +40115,6 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "maxWidth"): number|string;
@@ -41925,7 +40122,6 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41933,7 +40129,6 @@ interface JQuery {
 
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "maxHeight"): number|string;
@@ -41941,7 +40136,6 @@ interface JQuery {
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41949,21 +40143,18 @@ interface JQuery {
 
 	/**
 	 * The time popover fades in and out when showing/hiding
-	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * The content for the popover container. If left null the content will be get from the target.
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "contentTemplate"): string|Function;
@@ -41971,7 +40162,6 @@ interface JQuery {
 	/**
 	 * Sets the content for the popover container. If left null the content will be get from the target.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41979,35 +40169,30 @@ interface JQuery {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
-	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "selectors"): string;
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "selectors", optionValue: string): void;
 
 	/**
 	 * The content for the popover header
-	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "headerTemplate"): IgPopoverHeaderTemplate;
 
 	/**
 	 * Sets the content for the popover header
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "headerTemplate", optionValue: IgPopoverHeaderTemplate): void;
 
 	/**
 	 * The event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "showOn"): string;
@@ -42015,7 +40200,6 @@ interface JQuery {
 	/**
 	 * Sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -42023,7 +40207,6 @@ interface JQuery {
 
 	/**
 	 * Controls where the popover DOM should be attached to.
-	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "appendTo"): string|Object;
@@ -42031,7 +40214,6 @@ interface JQuery {
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -42132,26 +40314,22 @@ interface IgGridFilteringColumnSettingDefaultExpressions {
 interface IgGridFilteringColumnSetting {
 	/**
 	 * Identifies the grid column by key. Either key or index must be set in every column setting.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Identifies the grid column by index. Either key or index must be set in every column setting.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Enables/disables filtering for the column.
-	 *
 	 */
 	allowFiltering?: boolean;
 
 	/**
 	 * Initial filtering condition for the column.
 	 *
-	 *
 	 * Valid values:
 	 * "empty"
 	 * "notEmpty"
@@ -42186,13 +40364,11 @@ interface IgGridFilteringColumnSetting {
 
 	/**
 	 * An array of strings that determine which [conditions](ui.iggridfiltering#options:columnSettings.condition) to display for this column.
-	 *
 	 */
 	conditionList?: any[];
 
 	/**
 	 * Initial filtering expressions - if set they will be applied on initialization together with the preset [condition](ui.iggridfiltering#options:columnSettings.condition).
-	 *
 	 */
 	defaultExpressions?: IgGridFilteringColumnSettingDefaultExpressions;
 
@@ -42216,379 +40392,316 @@ interface IgGridFilteringColumnSetting {
 interface IgGridFilteringLocale {
 	/**
 	 * StartsWith null text that will be used for the filter editors.
-	 *
 	 */
 	startsWithNullText?: string;
 
 	/**
 	 * EndsWith null text that will be used for the filter editors.
-	 *
 	 */
 	endsWithNullText?: string;
 
 	/**
 	 * Contains null text that will be used for the filter editors.
-	 *
 	 */
 	containsNullText?: string;
 
 	/**
 	 * Does not contain null text that will be used for the filter editors.
-	 *
 	 */
 	doesNotContainNullText?: string;
 
 	/**
 	 * Equals null text that will be used for the filter editors.
-	 *
 	 */
 	equalsNullText?: string;
 
 	/**
 	 * Does not equal null text that will be used for the filter editors.
-	 *
 	 */
 	doesNotEqualNullText?: string;
 
 	/**
 	 * Greater than null text that will be used for the filter editors.
-	 *
 	 */
 	greaterThanNullText?: string;
 
 	/**
 	 * Less than null text that will be used for the filter editors.
-	 *
 	 */
 	lessThanNullText?: string;
 
 	/**
 	 * Greater than or equal to null text that will be used for the filter editors.
-	 *
 	 */
 	greaterThanOrEqualToNullText?: string;
 
 	/**
 	 * Less than or equal to null text that will be used for the filter editors.
-	 *
 	 */
 	lessThanOrEqualToNullText?: string;
 
 	/**
 	 * On null text that will be used for the filter editors.
-	 *
 	 */
 	onNullText?: string;
 
 	/**
 	 * Not on null text that will be used for the filter editors.
-	 *
 	 */
 	notOnNullText?: string;
 
 	/**
 	 * After null text that will be used for the filter editors.
-	 *
 	 */
 	afterNullText?: string;
 
 	/**
 	 * Before null text that will be used for the filter editors.
-	 *
 	 */
 	beforeNullText?: string;
 
 	/**
 	 * Empty null text that will be used for the filter editors.
-	 *
 	 */
 	emptyNullText?: string;
 
 	/**
 	 * Not empty null text that will be used for the filter editors.
-	 *
 	 */
 	notEmptyNullText?: string;
 
 	/**
 	 * Not empty null text that will be used for the filter editors.
-	 *
 	 */
 	nullNullText?: string;
 
 	/**
 	 * Not empty null text that will be used for the filter editors.
-	 *
 	 */
 	notNullNullText?: string;
 
 	/**
 	 * 'Starts with' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	startsWithLabel?: string;
 
 	/**
 	 * 'Starts with' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	endsWithLabel?: string;
 
 	/**
 	 * 'Contains' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	containsLabel?: string;
 
 	/**
 	 * 'Does not contain' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	doesNotContainLabel?: string;
 
 	/**
 	 * 'Equals' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	equalsLabel?: string;
 
 	/**
 	 * 'Does not Equal' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	doesNotEqualLabel?: string;
 
 	/**
 	 * 'Greater Than' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	greaterThanLabel?: string;
 
 	/**
 	 * 'Less Than' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	lessThanLabel?: string;
 
 	/**
 	 * 'Greater Than or Equal' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	greaterThanOrEqualToLabel?: string;
 
 	/**
 	 * 'Less Than or Equal' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	lessThanOrEqualToLabel?: string;
 
 	/**
 	 * 'True' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	trueLabel?: string;
 
 	/**
 	 * 'False' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	falseLabel?: string;
 
 	/**
 	 * 'After' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	afterLabel?: string;
 
 	/**
 	 * 'Before' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	beforeLabel?: string;
 
 	/**
 	 * 'Today' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	todayLabel?: string;
 
 	/**
 	 * 'Yesterday' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	yesterdayLabel?: string;
 
 	/**
 	 * 'This Month' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	thisMonthLabel?: string;
 
 	/**
 	 * 'Last Month' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	lastMonthLabel?: string;
 
 	/**
 	 * 'Next Month' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	nextMonthLabel?: string;
 
 	/**
 	 * 'This Year' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	thisYearLabel?: string;
 
 	/**
 	 * 'Last Year' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	lastYearLabel?: string;
 
 	/**
 	 * 'Next Year' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	nextYearLabel?: string;
 
 	/**
 	 * 'Clear' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	clearLabel?: string;
 
 	/**
 	 * 'No Filter' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	noFilterLabel?: string;
 
 	/**
 	 * 'On' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	onLabel?: string;
 
 	/**
 	 * 'Not On' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	notOnLabel?: string;
 
 	/**
 	 * 'Advance Button' label that is used for the predefined filtering conditions in the filter dropdowns.
-	 *
 	 */
 	advancedButtonLabel?: string;
 
 	/**
 	 * Specifies the filter dialog caption label.
-	 *
 	 */
 	filterDialogCaptionLabel?: string;
 
 	/**
 	 * Specifies the filter condition label.
-	 *
 	 */
 	filterDialogConditionLabel1?: string;
 
 	/**
 	 * Specifies the filter condition label.
-	 *
 	 */
 	filterDialogConditionLabel2?: string;
 
 	/**
 	 * Specifies the filter condition drop-down label.
-	 *
 	 */
 	filterDialogConditionDropDownLabel?: string;
 
 	/**
 	 * Specifies the dialog's Ok button label.
-	 *
 	 */
 	filterDialogOkLabel?: string;
 
 	/**
 	 * Specifies the dialog's Cancel button label.
-	 *
 	 */
 	filterDialogCancelLabel?: string;
 
 	/**
 	 * Specifies the Any label for the filtering dialog.
-	 *
 	 */
 	filterDialogAnyLabel?: string;
 
 	/**
 	 * Specifies the All label for the filtering dialog.
-	 *
 	 */
 	filterDialogAllLabel?: string;
 
 	/**
 	 * Specifies the Add button label for the filtering dialog.
-	 *
 	 */
 	filterDialogAddLabel?: string;
 
 	/**
 	 * Specifies the Error label for the filtering dialog.
-	 *
 	 */
 	filterDialogErrorLabel?: string;
 
 	/**
 	 * Specifies the Close label for the filtering dialog.
-	 *
 	 */
 	filterDialogCloseLabel?: string;
 
 	/**
 	 * Specifies the Filtering summary title.
-	 *
 	 */
 	filterSummaryTitleLabel?: string;
 
 	/**
 	 * Specifies the summary template for the matching records.
-	 *
 	 */
 	filterSummaryTemplate?: string;
 
 	/**
 	 * Specifies clear all label in the filter dialog.
-	 *
 	 */
 	filterDialogClearAllLabel?: string;
 
 	/**
 	 * Custom tooltip template for the filter button, when a filter is applied.
-	 *
 	 */
 	tooltipTemplate?: string;
 
 	/**
 	 * Feature chooser text when filter is shown and filter [mode](ui.iggridfiltering#options:mode) is simple.
-	 *
 	 */
 	featureChooserText?: string;
 
 	/**
 	 * Feature chooser text when filter is hidden and filter [mode](ui.iggridfiltering#options:mode) is simple.
-	 *
 	 */
 	featureChooserTextHide?: string;
 
 	/**
 	 * Feature chooser text when filter [mode](ui.iggridfiltering#options:mode) is advanced.
-	 *
 	 */
 	featureChooserTextAdvancedFilter?: string;
 
@@ -42601,7 +40714,6 @@ interface IgGridFilteringLocale {
 interface IgGridFiltering {
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
-	 *
 	 */
 	caseSensitive?: boolean;
 
@@ -42609,13 +40721,11 @@ interface IgGridFiltering {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
-	 *
 	 */
 	filterSummaryAlwaysVisible?: boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
-	 *
 	 */
 	renderFC?: boolean;
 
@@ -42628,7 +40738,6 @@ interface IgGridFiltering {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
-	 *
 	 * Valid values:
 	 * "linear" The column filtering drop downs are shown with a linear animation.
 	 * "none" No animation is used when showing the filtering drop downs.
@@ -42637,14 +40746,12 @@ interface IgGridFiltering {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
-	 *
 	 */
 	filterDropDownAnimationDuration?: number;
 
 	/**
 	 * Width of the column filter dropdowns.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width in pixels (0px)
 	 * "number" The width in pixels as a number (0)
@@ -42661,14 +40768,12 @@ interface IgGridFiltering {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
-	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
-	 *
 	 * Valid values:
 	 * "true" All predefined filters in the filter dropdowns will have icons rendered in front of the text.
 	 * "false" No icons will be rendered.
@@ -42677,14 +40782,12 @@ interface IgGridFiltering {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridFilteringColumnSetting[];
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * Valid values:
 	 * "remote" Filtering is performed by a remote end-point.
 	 * "local" Filtering is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -42693,14 +40796,12 @@ interface IgGridFiltering {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
-	 *
 	 */
 	filterDelay?: number;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
-	 *
 	 * Valid values:
 	 * "simple" Renders just a filter row.
 	 * "advanced" Allows to configure multiple filters from a dialog - Excel style.
@@ -42709,14 +40810,12 @@ interface IgGridFiltering {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
-	 *
 	 */
 	advancedModeEditorsVisible?: boolean;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
-	 *
 	 * Valid values:
 	 * "left"
 	 * "right"
@@ -42726,7 +40825,6 @@ interface IgGridFiltering {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog window width in pixels (370px).
 	 * "number" The dialog window width in pixels as a number (370).
@@ -42736,7 +40834,6 @@ interface IgGridFiltering {
 	/**
 	 * default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog window height in pixels (350px).
 	 * "number" The dialog window height in pixels as a number (350).
@@ -42746,7 +40843,6 @@ interface IgGridFiltering {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The filtering condition dropdowns width in pixels (80px).
 	 * "number" The filtering condition dropdowns width in pixels as a number (80).
@@ -42756,7 +40852,6 @@ interface IgGridFiltering {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The filtering expression input boxes width in pixels (80px).
 	 * "number" The filtering expression input boxes width in pixels as a number (80).
@@ -42766,7 +40861,6 @@ interface IgGridFiltering {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The column chooser dropdowns width in pixels (80px).
 	 * "number" The column chooser dropdowns width in pixels  as a number (80).
@@ -42775,14 +40869,12 @@ interface IgGridFiltering {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
-	 *
 	 */
 	renderFilterButton?: boolean;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The button is rendered on the left.
 	 * "right" The button is rendered on the right.
@@ -42828,13 +40920,11 @@ interface IgGridFiltering {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
-	 *
 	 */
 	filterDialogAddConditionTemplate?: string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
-	 *
 	 */
 	filterDialogAddConditionDropDownTemplate?: string;
 
@@ -42844,20 +40934,17 @@ interface IgGridFiltering {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
-	 *
 	 */
 	filterDialogFilterTemplate?: string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
-	 *
 	 */
 	filterDialogFilterConditionTemplate?: string;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog Add button width in pixels (100px).
 	 * "number" The dialog Add button width in pixels as a number (100).
@@ -42867,7 +40954,6 @@ interface IgGridFiltering {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The advanced filter dialog Ok and Cancel buttons width in pixels (120px).
 	 * "number" The advanced filter dialog Ok and Cancel buttons width in pixels as a number (120).
@@ -42876,7 +40962,6 @@ interface IgGridFiltering {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
-	 *
 	 */
 	filterDialogMaxFilterCount?: number;
 
@@ -42890,31 +40975,26 @@ interface IgGridFiltering {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
-	 *
 	 */
 	showEmptyConditions?: boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
-	 *
 	 */
 	showNullConditions?: boolean;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables filtering persistence between states.
-	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
-	 *
 	 */
 	inherit?: boolean;
 
@@ -42927,14 +41007,12 @@ interface IgGridFiltering {
 interface JQuery {
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
@@ -42943,7 +41021,6 @@ interface JQuery {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible"): boolean;
 
@@ -42952,21 +41029,18 @@ interface JQuery {
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible", optionValue: boolean): void;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFC"): boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFC", optionValue: boolean): void;
@@ -42987,7 +41061,6 @@ interface JQuery {
 
 	/**
 	 * Type of animations for the column filter dropdowns.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimations"): string;
@@ -42995,7 +41068,6 @@ interface JQuery {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43003,21 +41075,18 @@ interface JQuery {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration"): number;
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Width of the column filter dropdowns.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownWidth"): string|number;
@@ -43025,7 +41094,6 @@ interface JQuery {
 	/**
 	 * Width of the column filter dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43051,21 +41119,18 @@ interface JQuery {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey"): string;
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Enable/disable filter icons visibility.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownItemIcons"): boolean;
@@ -43073,7 +41138,6 @@ interface JQuery {
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43081,21 +41145,18 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "columnSettings"): IgGridFilteringColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridFilteringColumnSetting[]): void;
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "type"): string;
@@ -43103,7 +41164,6 @@ interface JQuery {
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43111,21 +41171,18 @@ interface JQuery {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDelay"): number;
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDelay", optionValue: number): void;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "mode"): string;
@@ -43133,7 +41190,6 @@ interface JQuery {
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43141,21 +41197,18 @@ interface JQuery {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible"): boolean;
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible", optionValue: boolean): void;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "advancedModeHeaderButtonLocation"): string;
@@ -43163,7 +41216,6 @@ interface JQuery {
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43171,7 +41223,6 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogWidth"): string|number;
@@ -43179,7 +41230,6 @@ interface JQuery {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43187,7 +41237,6 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogHeight"): string|number;
@@ -43195,7 +41244,6 @@ interface JQuery {
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43203,7 +41251,6 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterDropDownDefaultWidth"): string|number;
@@ -43211,7 +41258,6 @@ interface JQuery {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43219,7 +41265,6 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogExprInputDefaultWidth"): string|number;
@@ -43227,7 +41272,6 @@ interface JQuery {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43235,7 +41279,6 @@ interface JQuery {
 
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogColumnDropDownDefaultWidth"): string|number;
@@ -43243,7 +41286,6 @@ interface JQuery {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43251,21 +41293,18 @@ interface JQuery {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton"): boolean;
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton", optionValue: boolean): void;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterButtonLocation"): string;
@@ -43273,7 +41312,6 @@ interface JQuery {
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43367,28 +41405,24 @@ interface JQuery {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate"): string;
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate"): string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate", optionValue: string): void;
@@ -43399,7 +41433,6 @@ interface JQuery {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate"): string;
 
@@ -43410,28 +41443,24 @@ interface JQuery {
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate"): string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddButtonWidth"): string|number;
@@ -43439,7 +41468,6 @@ interface JQuery {
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43447,7 +41475,6 @@ interface JQuery {
 
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
-	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogOkCancelButtonWidth"): string|number;
@@ -43455,7 +41482,6 @@ interface JQuery {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43463,14 +41489,12 @@ interface JQuery {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount"): number;
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount", optionValue: number): void;
@@ -43495,70 +41519,60 @@ interface JQuery {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions"): boolean;
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions", optionValue: boolean): void;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showNullConditions"): boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showNullConditions", optionValue: boolean): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables filtering persistence between states.
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables filtering persistence between states.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
-	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -43571,20 +41585,17 @@ interface JQuery {
 interface IgGridColumnGroupOptions {
 	/**
 	 * Sets whether the group is expanded or collapsed. Applied only if the allowGroupCollapsing is set to true.
-	 *
 	 */
 	expanded?: boolean;
 
 	/**
 	 * Sets whether expansion indicators are visible in the group header.
-	 *
 	 */
 	allowGroupCollapsing?: boolean;
 
 	/**
 	 * Sets when should the group be hidden. Applied only if the allowGroupCollapsing is set to true.
 	 *
-	 *
 	 * Valid values:
 	 * "never" never hide the group
 	 * "always" always hide the group
@@ -43602,20 +41613,17 @@ interface IgGridColumnGroupOptions {
 interface IgGridColumn {
 	/**
 	 * Header text for the specified column.
-	 *
 	 */
 	headerText?: string;
 
 	/**
 	 * The property in the data source to which the column is bound. Also used to identify the column by, and find specific columns with API methods such as [columnByKey](ui.iggrid#methods:columnByKey).
-	 *
 	 */
 	key?: string;
 
 	/**
 	 * Reference to a function (string or function) which will be used for formatting the cell values. The function should accept a value and return the new formatted value. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * Valid values:
 	 * "string" The name of the function which will be used for formatting the cell values.
 	 * "function" Function which will be used for formatting the cell values. The function should accept a value and return the new formatted value.
@@ -43636,14 +41644,12 @@ interface IgGridColumn {
 
 	/**
 	 * Data type of the column cell values: string, number, bool, date, object.
-	 *
 	 */
 	dataType?: string|number|boolean|Date|Object;
 
 	/**
 	 * Width of the column in pixels or percentage. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).If width is not defined and [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) is set, it is assumed for all columns.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The column width can be set in pixels (px), percentage (%) or as '*' in order to auto-size based on the cells and header content.
 	 * "number" The column width can be set as a number
@@ -43652,38 +41658,32 @@ interface IgGridColumn {
 
 	/**
 	 * Initial visibility of the column. A column can be hidden without the Hiding feature being enabled but there will be no UI for unhiding it. Columns can be defined as hidden in the options of the Hiding feature as well and those definitions take precedence.
-	 *
 	 */
 	hidden?: boolean;
 
 	/**
 	 * Sets a template for an individual column. the contents of the template should be the HTML markup that goes inside the table cell, or the entire table cell markup. [Here's an example of creating a basic column template](http://www.igniteui.com/help/creating-a-basic-column-template-in-the-iggrid)
-	 *
 	 */
 	template?: string;
 
 	/**
 	 * Sets whether column data is derived from the datasource. If set to true, then the cells in this column are not bound to the data source. The data in this column is populated using [formula](ui.iggrid#options:columns.formula), or using [unboundValues](ui.iggrid#options:columns.unboundValues), or through the [setUnboundValues](ui.iggrid#methods:setUnboundValues) API method. [Here's an overview of the unbound columns feature](http://www.igniteui.com/help/iggrid-unboundcolumns-overview)
-	 *
 	 */
 	unbound?: boolean;
 
 	/**
 	 * Options used to configure collapsible column [groups](ui.iggrid#options:columns.group).
-	 *
 	 */
 	groupOptions?: IgGridColumnGroupOptions;
 
 	/**
 	 * Array of child column definitions. If the column has the property group than the grid has multi column headers.
-	 *
 	 */
 	group?: any[];
 
 	/**
 	 * Determines the way in which dates will be displayed in the grid for this column.
 	 *
-	 *
 	 * Valid values:
 	 * "local" The dates for this column will be rendered in the client's local timezone.
 	 * "utc" The dates for this column will be rendered in their UTC representation.
@@ -43699,7 +41699,6 @@ interface IgGridColumn {
 	/**
 	 * A reference to or the name of a JavaScript function, which will calculate the value of the current cell based on other cell values in the same row. Used with [unbound columns](ui.iggrid#options:columns.unbound).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The name of the JavaScript function.
 	 * "function" Reference to the JavaScript function.
@@ -43708,26 +41707,22 @@ interface IgGridColumn {
 
 	/**
 	 * Array of values which will be populated in the column cells at initialization, if the column is [unbound](ui.iggrid#options:columns.unbound).
-	 *
 	 */
 	unboundValues?: any[];
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the header cell of this column.
-	 *
 	 */
 	headerCssClass?: string;
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the data cells of this column. The class is not applied if the column has a column [template](ui.iggrid#options:columns.template) defined, which contains full <td> definition in the template.
-	 *
 	 */
 	columnCssClass?: string;
 
 	/**
 	 * This option is applicable only for columns with [dataType](ui.iggrid#options:columns.dataType) of object. Reference to a function, or the name of the function, that will be used for complex data extraction from the data records, whose return value will be used for all data operations associated with this column and will be displayed as cell value. [Here you can find more examples of how to setup a column mapper](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-mapper)
 	 *
-	 *
 	 * Valid values:
 	 * "string" The name of the mapper function.
 	 * "function" Reference to the mapper function.
@@ -43736,31 +41731,26 @@ interface IgGridColumn {
 
 	/**
 	 * Specifies the row index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	rowIndex?: number;
 
 	/**
 	 * Specifies the column index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Specifies the navigation index of the cell for the TAB sequence when the cells are in edit mode in a Multi-Row Layout grid. Has no effect otherwise. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	navigationIndex?: number;
 
 	/**
 	 * Specifies the colSpan of the cell in a Multi-Row Layout configuration. colSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	colSpan?: number;
 
 	/**
 	 * Specifies the rowSpan of the cell in a Multi-Row Layout configuration. rowSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout). If multi-row-layout is not used but multi-column-header is set then this option is used to adjust span of header cell.
-	 *
 	 */
 	rowSpan?: number;
 
@@ -43785,19 +41775,16 @@ interface IgGridFeature {
 interface IgGridRestSettingsCreate {
 	/**
 	 * Specifies a remote URL to which create requests will be sent. This will be used for both batch and non-batch, however if template is also set, this URL will only be used for batch requests.
-	 *
 	 */
 	url?: string;
 
 	/**
 	 * Specifies a remote URL template. Use ${id} in place of the resource id.
-	 *
 	 */
 	template?: string;
 
 	/**
 	 * Specifies whether create requests will be sent in batches
-	 *
 	 */
 	batch?: boolean;
 
@@ -43854,7 +41841,6 @@ interface IgGridRestSettingsRemove {
 interface IgGridRestSettings {
 	/**
 	 * Settings for create requests
-	 *
 	 */
 	create?: IgGridRestSettingsCreate;
 
@@ -43875,13 +41861,11 @@ interface IgGridRestSettings {
 
 	/**
 	 * Specifies a custom function to serialize content sent to the server. It should accept a single object or an array of objects and return a string. If not specified, JSON.stringify() will be used.
-	 *
 	 */
 	contentSerializer?: Function;
 
 	/**
 	 * Specifies the content type of the request. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	contentType?: string;
 
@@ -43894,49 +41878,41 @@ interface IgGridRestSettings {
 interface IgGridScrollSettings {
 	/**
 	 * Sets gets current vertical position.
-	 *
 	 */
 	scrollTop?: number;
 
 	/**
 	 * Sets gets current horizontal position.
-	 *
 	 */
 	scrollLeft?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using the mouse wheel.
-	 *
 	 */
 	wheelStep?: number;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using the mouse wheel.
-	 *
 	 */
 	smoothing?: boolean;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.iggrid#options:scrollSettings.smoothing).
-	 *
 	 */
 	smoothingStep?: number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.iggrid#options:scrollSettings.smoothing).
-	 *
 	 */
 	smoothingDuration?: number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on touch devices. Note: Value set to 0 would disable touch movements. Value set to -1 would invert them.
-	 *
 	 */
 	inertiaStep?: number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on touch devices.
-	 *
 	 */
 	inertiaDuration?: number;
 
@@ -44258,7 +42234,6 @@ interface IgGrid {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The widget width can be set in pixels as a number. Example values: 800, 700.
@@ -44269,7 +42244,6 @@ interface IgGrid {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -44279,14 +42253,12 @@ interface IgGrid {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
-	 *
 	 */
 	autoAdjustHeight?: boolean;
 
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The avarage row height can be set in pixels ("25px").
 	 * "number" The avarage row height can be set in pixels as a number (25).
@@ -44296,7 +42268,6 @@ interface IgGrid {
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The avarage column width can be set in pixels ("25px").
 	 * "number" The avarage column width can be set in pixels as a number (25).
@@ -44306,7 +42277,6 @@ interface IgGrid {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The default column width can be set in pixels ("100px").
 	 * "number" The default column width can be set in pixels as a number (100).
@@ -44317,20 +42287,17 @@ interface IgGrid {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
-	 *
 	 */
 	autoGenerateColumns?: boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
-	 *
 	 */
 	virtualization?: boolean;
 
 	/**
 	 * Determines row virtualization mode.
 	 *
-	 *
 	 * Valid values:
 	 * "fixed" Renders only the visible rows and/or columns in the grid. On scrolling the same rows and/or columns are updated with new data from the data source. Only fixed virtualization can work with column virtualization at the same time. Fixed virtualization is not supported by some grid features: Resizing, Group By, Responsive.
 	 * "continuous" renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
@@ -44339,32 +42306,27 @@ interface IgGrid {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
-	 *
 	 */
 	rowVirtualization?: boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
-	 *
 	 */
 	columnVirtualization?: boolean;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
-	 *
 	 */
 	virtualizationMouseWheelStep?: number;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
-	 *
 	 */
 	adjustVirtualHeights?: boolean;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
-	 *
 	 * Valid values:
 	 * "infragistics" The grid will use the Infragistics Templating engine to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
 	 * "jsRender" The grid will use jsRender to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
@@ -44373,14 +42335,12 @@ interface IgGrid {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
-	 *
 	 */
 	columns?: IgGridColumn[];
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
-	 *
 	 * Valid values:
 	 * "array" dataSource as an array
 	 * "object" ddataSource as an object
@@ -44390,103 +42350,86 @@ interface IgGrid {
 
 	/**
 	 * Specifies a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
-	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
-	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
-	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the requests to a remote data source.
-	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Controls the visibility of the grid header.
-	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
-	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	fixedHeaders?: boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	fixedFooters?: boolean;
 
 	/**
 	 * Caption text that will be shown above the grid header.
-	 *
 	 */
 	caption?: string;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
-	 *
 	 */
 	features?: IgGridFeature[];
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
-	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
-	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
-	 *
 	 */
 	serializeTransactionLog?: boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
-	 *
 	 */
 	autoCommit?: boolean;
 
@@ -44496,14 +42439,12 @@ interface IgGrid {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
-	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * Valid values:
 	 * "date" formats only Date columns
 	 * "number" formats only number columns
@@ -44515,69 +42456,58 @@ interface IgGrid {
 
 	/**
 	 * Gets sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
-	 *
 	 */
 	renderCheckboxes?: boolean;
 
 	/**
 	 * URL to which updating requests will be made.
-	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Settings related to REST compliant update routines.
-	 *
 	 */
 	restSettings?: IgGridRestSettings;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
-	 *
 	 */
 	alternateRowStyles?: boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
-	 *
 	 */
 	autofitLastColumn?: boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
-	 *
 	 */
 	enableHoverStyles?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
-	 *
 	 */
 	enableUTCDates?: boolean;
 
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
-	 *
 	 */
 	mergeUnboundColumns?: boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
-	 *
 	 */
 	jsonpRequest?: boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
-	 *
 	 */
 	enableResizeContainerCheck?: boolean;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
-	 *
 	 * Valid values:
 	 * "none" Always hide the feature chooser icon; The feature chooser is shown on tapping/clicking the column header.
 	 * "desktopOnly" Always show the icon on desktop but hide when touch device detected.
@@ -44587,7 +42517,6 @@ interface IgGrid {
 
 	/**
 	 * Settings related to content scrolling.
-	 *
 	 */
 	scrollSettings?: IgGridScrollSettings;
 
@@ -45072,8 +43001,6 @@ interface IgGridMethods {
 
 	/**
 	 * Causes the grid to data bind to the data source (local or remote) , and re-render all of the data as well
-	 *
-	 * @param internal
 	 */
 	dataBind(internal: Object): void;
 
@@ -45192,8 +43119,6 @@ interface IgGridMethods {
 	 * 1. Remove custom CSS classes that were added.
 	 * 2. Unwrap any wrapping elements such as scrolling divs and other containers.
 	 * 3. Unbind all events that were bound.
-	 *
-	 * @param notToCallDestroy
 	 */
 	destroy(notToCallDestroy: Object): void;
 }
@@ -45277,7 +43202,6 @@ interface JQuery {
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "width"): string|number;
@@ -45285,7 +43209,6 @@ interface JQuery {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45293,7 +43216,6 @@ interface JQuery {
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "height"): string|number;
@@ -45301,7 +43223,6 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45309,21 +43230,18 @@ interface JQuery {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data  ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoAdjustHeight"): boolean;
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoAdjustHeight", optionValue: boolean): void;
 
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "avgRowHeight"): string|number;
@@ -45331,7 +43249,6 @@ interface JQuery {
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45339,7 +43256,6 @@ interface JQuery {
 
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "avgColumnWidth"): string|number;
@@ -45347,7 +43263,6 @@ interface JQuery {
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45355,7 +43270,6 @@ interface JQuery {
 
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "defaultColumnWidth"): string|number;
@@ -45363,7 +43277,6 @@ interface JQuery {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45373,7 +43286,6 @@ interface JQuery {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoGenerateColumns"): boolean;
 
@@ -45382,28 +43294,24 @@ interface JQuery {
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoGenerateColumns", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
 	/**
 	 * Determines row virtualization mode.
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "virtualizationMode"): string;
@@ -45411,7 +43319,6 @@ interface JQuery {
 	/**
 	 * Determines row virtualization mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45419,63 +43326,54 @@ interface JQuery {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "rowVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "rowVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columnVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columnVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep"): number;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep", optionValue: number): void;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights"): boolean;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights", optionValue: boolean): void;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "templatingEngine"): string;
@@ -45483,7 +43381,6 @@ interface JQuery {
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45491,21 +43388,18 @@ interface JQuery {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columns"): IgGridColumn[];
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columns", optionValue: IgGridColumn[]): void;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "dataSource"): Array<any>|Object|string;
@@ -45513,7 +43407,6 @@ interface JQuery {
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45521,238 +43414,204 @@ interface JQuery {
 
 	/**
 	 * Gets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
 
 	/**
 	 * Gets the HTTP verb to be used to issue the requests to a remote data source.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP verb to be used to issue the requests to a remote data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Controls the visibility of the grid header.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * Controls the visibility of the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Controls the visibility of the grid footer.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedHeaders"): boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedHeaders", optionValue: boolean): void;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedFooters"): boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedFooters", optionValue: boolean): void;
 
 	/**
 	 * Caption text that will be shown above the grid header.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "caption"): string;
 
 	/**
 	 * Caption text that will be shown above the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "caption", optionValue: string): void;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "features"): IgGridFeature[];
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "features", optionValue: IgGridFeature[]): void;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "localSchemaTransform"): boolean;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "localSchemaTransform", optionValue: boolean): void;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "primaryKey"): string;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "primaryKey", optionValue: string): void;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "serializeTransactionLog"): boolean;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "serializeTransactionLog", optionValue: boolean): void;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoCommit"): boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoCommit", optionValue: boolean): void;
@@ -45763,7 +43622,6 @@ interface JQuery {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "aggregateTransactions"): boolean;
 
@@ -45774,14 +43632,12 @@ interface JQuery {
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
@@ -45789,7 +43645,6 @@ interface JQuery {
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45797,98 +43652,84 @@ interface JQuery {
 
 	/**
 	 * Gets  ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "renderCheckboxes"): boolean;
 
 	/**
 	 * Sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "renderCheckboxes", optionValue: boolean): void;
 
 	/**
 	 * URL to which updating requests will be made.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * URL to which updating requests will be made.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Settings related to REST compliant update routines.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "restSettings"): IgGridRestSettings;
 
 	/**
 	 * Settings related to REST compliant update routines.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "restSettings", optionValue: IgGridRestSettings): void;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "alternateRowStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "alternateRowStyles", optionValue: boolean): void;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autofitLastColumn"): boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autofitLastColumn", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableHoverStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableHoverStyles", optionValue: boolean): void;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -45896,7 +43737,6 @@ interface JQuery {
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns"): boolean;
 
@@ -45904,42 +43744,36 @@ interface JQuery {
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns", optionValue: boolean): void;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "jsonpRequest"): boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "jsonpRequest", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck"): boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck", optionValue: boolean): void;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
-	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "featureChooserIconDisplay"): string;
@@ -45947,7 +43781,6 @@ interface JQuery {
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45955,14 +43788,12 @@ interface JQuery {
 
 	/**
 	 * Settings related to content scrolling.
-	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "scrollSettings"): IgGridScrollSettings;
 
 	/**
 	 * Settings related to content scrolling.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "scrollSettings", optionValue: IgGridScrollSettings): void;
@@ -46280,19 +44111,16 @@ interface IgGridGroupByGroupedColumn {
 
 	/**
 	 * sort order - ascending or descending
-	 *
 	 */
 	dir?: any;
 
 	/**
 	 * Key of the columnLayout, if the grid is hierarchical
-	 *
 	 */
 	layout?: string;
 
 	/**
 	 * [column](ui.iggrid#options:columns) object for the column that is grouped
-	 *
 	 */
 	col?: any;
 
@@ -46305,13 +44133,11 @@ interface IgGridGroupByGroupedColumn {
 interface IgGridGroupBySummarySettings {
 	/**
 	 * Specifies the delimiter for multiple summaries.
-	 *
 	 */
 	multiSummaryDelimiter?: string;
 
 	/**
 	 * Format of the summary value. By default, two digits are shown after the decimal place. Checkout [Formatting Dates, Numbers and Strings](http://www.igniteui.com/help/formatting-dates-numbers-and-strings) for details on the valid formatting specifiers.
-	 *
 	 */
 	summaryFormat?: string;
 
@@ -46325,7 +44151,6 @@ interface IgGridGroupByColumnSettingsSummaries {
 	/**
 	 * the summary function key
 	 *
-	 *
 	 * Valid values:
 	 * "avg" average summary function
 	 * "min" minimum summary function
@@ -46338,7 +44163,6 @@ interface IgGridGroupByColumnSettingsSummaries {
 
 	/**
 	 * Specifies the summary text that will be shown before the value
-	 *
 	 */
 	text?: string;
 
@@ -46349,7 +44173,6 @@ interface IgGridGroupByColumnSettingsSummaries {
 	 * key - key of the grouped column,
 	 * allGroupData - array of data records for the group(for the whole data source - not only for the data view)
 	 *
-	 *
 	 * Valid values:
 	 * "string" the name of the function as a string located in the global window object.
 	 * "function" which will be used for calculating the summary value.
@@ -46365,13 +44188,11 @@ interface IgGridGroupByColumnSettingsSummaries {
 interface IgGridGroupByColumnSettings {
 	/**
 	 * Enables/disables grouping a column from the UI. By default all columns can be grouped.
-	 *
 	 */
 	allowGrouping?: boolean;
 
 	/**
 	 * Specifies the initial column grouped state.
-	 *
 	 */
 	isGroupBy?: boolean;
 
@@ -46386,7 +44207,6 @@ interface IgGridGroupByColumnSettings {
 	 * 1 - indicating that val1 > val2
 	 * -1 - indicating that val1 < val2
 	 *
-	 *
 	 * Valid values:
 	 * "string" the name of the function as a string located in the global window object.
 	 * "function" function which will be used for custom comparison.
@@ -46401,7 +44221,6 @@ interface IgGridGroupByColumnSettings {
 	/**
 	 * Reference/name of a function (string or function) which will be used for formatting the cell values. The function should accept a value from the grouped column and return the new formatted value in the label of the row.
 	 *
-	 *
 	 * Valid values:
 	 * "string" the name of the function as a string located in the global window object.
 	 * "function" which will be used for formatting the cell values.
@@ -46410,19 +44229,16 @@ interface IgGridGroupByColumnSettings {
 
 	/**
 	 * Specifies the sort order - ascending or descending when the column is initially grouped ([isGroupBy](ui.iggridgroupby#options:columnSettings.isGroupBy) = true).
-	 *
 	 */
 	dir?: any;
 
 	/**
 	 * A list of aggregation functions to calculate on the column values for each group. When not specified the default aggregate function is "count".
-	 *
 	 */
 	summaries?: IgGridGroupByColumnSettingsSummaries;
 
 	/**
 	 * Enables/disables default summaries per group data island or specifies summaries that are applied to specific column no matter the group.
-	 *
 	 */
 	groupSummaries?: any;
 
@@ -46435,115 +44251,96 @@ interface IgGridGroupByColumnSettings {
 interface IgGridGroupByLocale {
 	/**
 	 * Specifies the group by area text.
-	 *
 	 */
 	emptyGroupByAreaContent?: string;
 
 	/**
 	 * Specifies the text for the hyperlink which opens the GroupBy Dialog.
-	 *
 	 */
 	emptyGroupByAreaContentSelectColumns?: string;
 
 	/**
 	 * Specifies the caption for the hyperlink which opens the GroupBy Dialog.
-	 *
 	 */
 	emptyGroupByAreaContentSelectColumnsCaption?: string;
 
 	/**
 	 * Specifies the expand groups button tooltip.
-	 *
 	 */
 	expandTooltip?: string;
 
 	/**
 	 * Specifies the collapse groups button tooltip.
-	 *
 	 */
 	collapseTooltip?: string;
 
 	/**
 	 * Specifies the remove group button tooltip.
-	 *
 	 */
 	removeButtonTooltip?: string;
 
 	/**
 	 * Specifies caption for each descending sorted column in GroupBy Dialog.
-	 *
 	 */
 	modalDialogCaptionButtonDesc?: string;
 
 	/**
 	 * Specifies caption for each descending sorted column in GroupBy Dialog.
-	 *
 	 */
 	modalDialogCaptionButtonAsc?: string;
 
 	/**
 	 * Specifies caption for ungroup button in GroupBy Dialog.
-	 *
 	 */
 	modalDialogCaptionButtonUngroup?: string;
 
 	/**
 	 * Specifies text for group button in GroupBy Dialog.
-	 *
 	 */
 	modalDialogGroupByButtonText?: string;
 
 	/**
 	 * Specifies caption text for the GroupBy Dialog.
-	 *
 	 */
 	modalDialogCaptionText?: string;
 
 	/**
 	 * Specifies label for layouts dropdown in the GroupBy Dialog.
-	 *
 	 */
 	modalDialogDropDownLabel?: string;
 
 	/**
 	 * Specifies label for "Clear all" button in the GroupBy Dialog.
-	 *
 	 */
 	modalDialogClearAllButtonLabel?: string;
 
 	/**
 	 * Specifies name of the root layout which is shown for the layouts in the modal dialog tree.
-	 *
 	 */
 	modalDialogRootLevelHierarchicalGrid?: string;
 
 	/**
 	 * Specifies caption of layouts dropdown button in the GroupBy Dialog.
-	 *
 	 */
 	modalDialogDropDownButtonCaption?: string;
 
 	/**
 	 * Specifies text of button which apply changes in modal dialog.
-	 *
 	 */
 	modalDialogButtonApplyText?: string;
 
 	/**
 	 * Specifies text of button which cancel changes in modal dialog.
-	 *
 	 */
 	modalDialogButtonCancelText?: string;
 
 	/**
 	 * Specifies the summary row title.
-	 *
 	 */
 	summaryRowTitle?: string;
 
 	/**
 	 * Specifies the summary icon title.
-	 *
 	 */
 	summaryIconTitle?: string;
 
@@ -46923,7 +44720,6 @@ interface IgGridGroupBy {
 	/**
 	 * Sets the place in the grid where the GroupBy area will be
 	 *
-	 *
 	 * Valid values:
 	 * "top" the GroupBy area will be rendered above the grid headers
 	 * "hidden" the GroupBy area will not be rendered
@@ -46933,14 +44729,12 @@ interface IgGridGroupBy {
 
 	/**
 	 * Specifies if after grouping, the grouped rows will be initially expanded or collapsed.
-	 *
 	 */
 	initialExpand?: boolean;
 
 	/**
 	 * Specifies when paging is applied and there is at least one grouped column which records should be included in page processing.
 	 *
-	 *
 	 * Valid values:
 	 * "allRecords" All records are included in page processing - data records and group-by metadata records
 	 * "dataRecordsOnly" Only data records are included in page processing(metadata group-by records are ignored)
@@ -46949,32 +44743,27 @@ interface IgGridGroupBy {
 
 	/**
 	 * Specifies if grouped rows will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
-	 *
 	 */
 	expansionIndicatorVisibility?: boolean;
 
 	/**
 	 * By default, the column width for the header is taken. If this is specified it's used for all headers.
-	 *
 	 */
 	groupByLabelWidth?: number;
 
 	/**
 	 * Specifies the opacity of the drag markup, while a column header is being dragged. The value must be between 0 and 1.
-	 *
 	 */
 	labelDragHelperOpacity?: number;
 
 	/**
 	 * Specifies the indentation for a grouped row. If several columns are grouped, the total indentation will grow
-	 *
 	 */
 	indentation?: number;
 
 	/**
 	 * default sort order - ascending or descending
 	 *
-	 *
 	 * Valid values:
 	 * "asc" The group is sorted in ascending order.
 	 * "desc" The group is sorted in descending order.
@@ -46983,26 +44772,22 @@ interface IgGridGroupBy {
 
 	/**
 	 * Returns the list of currently grouped columns. The option is read-only and cannot be set at initialization or at runtime.
-	 *
 	 */
 	groupedColumns?: IgGridGroupByGroupedColumn[];
 
 	/**
 	 * Specifies a key to get group by data from the remote response.
-	 *
 	 */
 	resultResponseKey?: string;
 
 	/**
 	 * Template for the grouped row's text. Variables available for the template are ${key}, ${val} and ${count}.
-	 *
 	 */
 	groupedRowTextTemplate?: string;
 
 	/**
 	 * Specifies whether the GroupBy operation takes place locally on client-side or remotely on server-side.
 	 *
-	 *
 	 * Valid values:
 	 * "local" Execute the GroupBy operation locally on client-side.
 	 * "remote" Execute the GroupBy operation by a request to the server.
@@ -47011,31 +44796,26 @@ interface IgGridGroupBy {
 
 	/**
 	 * URL param name which specifies a GroupBy [expression](ig.datasource#options:settings.sorting.expressions). When groupByUrlKey, [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
-	 *
 	 */
 	groupByUrlKey?: string;
 
 	/**
 	 * URL param value denoting ascending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), groupByUrlKeyAscValue and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
-	 *
 	 */
 	groupByUrlKeyAscValue?: string;
 
 	/**
 	 * URL param value denoting descending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and groupByUrlKeyDescValue are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
-	 *
 	 */
 	groupByUrlKeyDescValue?: string;
 
 	/**
 	 * Specifies the settings for GroupBy summaries.
-	 *
 	 */
 	summarySettings?: IgGridGroupBySummarySettings;
 
 	/**
 	 * Configures individual column settings.
-	 *
 	 */
 	columnSettings?: IgGridGroupByColumnSettings;
 
@@ -47132,32 +44912,27 @@ interface IgGridGroupBy {
 
 	/**
 	 * Enables/disables immediate column grouping/ungrouping. When false operation is delayed until after "Apply" button is clicked by the user.
-	 *
 	 */
 	modalDialogGroupByOnClick?: boolean;
 
 	/**
 	 * Specifies width of layouts dropdown in the GroupBy Dialog
-	 *
 	 */
 	modalDialogDropDownWidth?: number;
 
 	/**
 	 * Specifies width of layouts dropdown in the GroupBy Dialog
-	 *
 	 */
 	modalDialogDropDownAreaWidth?: number;
 
 	/**
 	 * Specifies time in milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	modalDialogAnimationDuration?: number;
 
 	/**
 	 * Specifies width of the GroupBy Dialog
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The dialog width can be set in pixels as a number. Example values: 800, 700.
@@ -47167,7 +44942,6 @@ interface IgGridGroupBy {
 	/**
 	 * Specifies height of the GroupBy Dialog
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog height can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The dialog height can be set in pixels as a number. Example values: 800, 700.
@@ -47176,20 +44950,17 @@ interface IgGridGroupBy {
 
 	/**
 	 * Format grouped column using the formatter set in [igGrid.columns.formatter](ui.iggrid#options:columns.formatter) or [igGrid.columns.format](ui.iggrid#options:columns.format).
-	 *
 	 */
 	useGridColumnFormatter?: boolean;
 
 	/**
 	 * Enables / disables GroupBy persistence between states. Checkout the [GroupBy Persistence](http://www.igniteui.com/help/iggrid-groupby-overview#groupBy-persistence) topic for details.
-	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Controls containment behavior for the GroupBy Dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "owner" The GroupBy Dialog will be draggable only in the grid area
 	 * "window" The GroupBy Dialog will be draggable in the whole window area
@@ -47198,7 +44969,6 @@ interface IgGridGroupBy {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. Checkout the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic for details.
-	 *
 	 */
 	dialogWidget?: string;
 
@@ -47210,14 +44980,12 @@ interface IgGridGroupBy {
 	/**
 	 * Specifies default summaries that will appear when grouping by a column on the bottom of each group as a row.This option has a lower priority than the groupSummaries defined under columnSettings for each column.
 	 * All default summaries are defined under $.ig.util.defaultSummaryMethods
-	 *
 	 */
 	groupSummaries?: any;
 
 	/**
 	 * Specifies the groupSummaries postion inside each group.
 	 *
-	 *
 	 * Valid values:
 	 * "top" One summary row will be displayed at the top for each group
 	 * "bottom"  One summary row will be displayed at the bottom for each group
@@ -47426,7 +45194,6 @@ interface JQuery {
 
 	/**
 	 * Sets the place in the grid where the GroupBy area will be
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByAreaVisibility"): string;
@@ -47434,7 +45201,6 @@ interface JQuery {
 	/**
 	 * Sets the place in the grid where the GroupBy area will be
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -47442,21 +45208,18 @@ interface JQuery {
 
 	/**
 	 * Gets if after grouping, the grouped rows will be initially expanded or collapsed.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "initialExpand"): boolean;
 
 	/**
 	 * Sets if after grouping, the grouped rows will be initially expanded or collapsed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "initialExpand", optionValue: boolean): void;
 
 	/**
 	 * Gets when paging is applied and there is at least one grouped column which records should be included in page processing.
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "pagingMode"): string;
@@ -47464,7 +45227,6 @@ interface JQuery {
 	/**
 	 * Sets when paging is applied and there is at least one grouped column which records should be included in page processing.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -47472,63 +45234,54 @@ interface JQuery {
 
 	/**
 	 * Gets if grouped rows will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "expansionIndicatorVisibility"): boolean;
 
 	/**
 	 * Sets if grouped rows will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "expansionIndicatorVisibility", optionValue: boolean): void;
 
 	/**
 	 * By default, the column width for the header is taken. If this is specified it's used for all headers.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByLabelWidth"): number;
 
 	/**
 	 * By default, the column width for the header is taken. If this is specified it's used for all headers.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByLabelWidth", optionValue: number): void;
 
 	/**
 	 * Gets the opacity of the drag markup, while a column header is being dragged. The value must be between 0 and 1.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "labelDragHelperOpacity"): number;
 
 	/**
 	 * Sets the opacity of the drag markup, while a column header is being dragged. The value must be between 0 and 1.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "labelDragHelperOpacity", optionValue: number): void;
 
 	/**
 	 * Specifies the indentation for a grouped row. If several columns are grouped, the total indentation will grow
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "indentation"): number;
 
 	/**
 	 * Specifies the indentation for a grouped row. If several columns are grouped, the total indentation will grow
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "indentation", optionValue: number): void;
 
 	/**
 	 * Default sort order - ascending or descending
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "defaultSortingDirection"): string;
@@ -47536,7 +45289,6 @@ interface JQuery {
 	/**
 	 * Default sort order - ascending or descending
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -47544,49 +45296,42 @@ interface JQuery {
 
 	/**
 	 * Returns the list of currently grouped columns. The option is read-only and cannot be set at initialization or at runtime.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedColumns"): IgGridGroupByGroupedColumn[];
 
 	/**
 	 * Returns the list of currently grouped columns. The option is read-only and cannot be set at initialization or at runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedColumns", optionValue: IgGridGroupByGroupedColumn[]): void;
 
 	/**
 	 * Gets a key to get group by data from the remote response.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "resultResponseKey"): string;
 
 	/**
 	 * Sets a key to get group by data from the remote response.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "resultResponseKey", optionValue: string): void;
 
 	/**
 	 * Template for the grouped row's text. Variables available for the template are ${key}, ${val} and ${count}.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedRowTextTemplate"): string;
 
 	/**
 	 * Template for the grouped row's text. Variables available for the template are ${key}, ${val} and ${count}.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedRowTextTemplate", optionValue: string): void;
 
 	/**
 	 * Gets whether the GroupBy operation takes place locally on client-side or remotely on server-side.
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "type"): string;
@@ -47594,7 +45339,6 @@ interface JQuery {
 	/**
 	 * Sets whether the GroupBy operation takes place locally on client-side or remotely on server-side.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -47602,70 +45346,60 @@ interface JQuery {
 
 	/**
 	 * URL param name which specifies a GroupBy [expression](ig.datasource#options:settings.sorting.expressions). When groupByUrlKey, [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKey"): string;
 
 	/**
 	 * URL param name which specifies a GroupBy [expression](ig.datasource#options:settings.sorting.expressions). When groupByUrlKey, [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKey", optionValue: string): void;
 
 	/**
 	 * URL param value denoting ascending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), groupByUrlKeyAscValue and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyAscValue"): string;
 
 	/**
 	 * URL param value denoting ascending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), groupByUrlKeyAscValue and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyAscValue", optionValue: string): void;
 
 	/**
 	 * URL param value denoting descending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and groupByUrlKeyDescValue are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyDescValue"): string;
 
 	/**
 	 * URL param value denoting descending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and groupByUrlKeyDescValue are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyDescValue", optionValue: string): void;
 
 	/**
 	 * Gets the settings for GroupBy summaries.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "summarySettings"): IgGridGroupBySummarySettings;
 
 	/**
 	 * Sets the settings for GroupBy summaries.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "summarySettings", optionValue: IgGridGroupBySummarySettings): void;
 
 	/**
 	 * Configures individual column settings.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "columnSettings"): IgGridGroupByColumnSettings;
 
 	/**
 	 * Configures individual column settings.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridGroupByColumnSettings): void;
@@ -47884,63 +45618,54 @@ interface JQuery {
 
 	/**
 	 * Enables/disables immediate column grouping/ungrouping. When false operation is delayed until after "Apply" button is clicked by the user.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogGroupByOnClick"): boolean;
 
 	/**
 	 * Enables/disables immediate column grouping/ungrouping. When false operation is delayed until after "Apply" button is clicked by the user.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogGroupByOnClick", optionValue: boolean): void;
 
 	/**
 	 * Gets width of layouts dropdown in the GroupBy Dialog
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownWidth"): number;
 
 	/**
 	 * Sets width of layouts dropdown in the GroupBy Dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownWidth", optionValue: number): void;
 
 	/**
 	 * Gets width of layouts dropdown in the GroupBy Dialog
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownAreaWidth"): number;
 
 	/**
 	 * Sets width of layouts dropdown in the GroupBy Dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownAreaWidth", optionValue: number): void;
 
 	/**
 	 * Gets time in milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time in milliseconds for animation duration to show/hide modal dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets width of the GroupBy Dialog
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogWidth"): string|number;
@@ -47948,7 +45673,6 @@ interface JQuery {
 	/**
 	 * Sets width of the GroupBy Dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -47956,7 +45680,6 @@ interface JQuery {
 
 	/**
 	 * Gets height of the GroupBy Dialog
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogHeight"): string|number;
@@ -47964,7 +45687,6 @@ interface JQuery {
 	/**
 	 * Sets height of the GroupBy Dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -47972,35 +45694,30 @@ interface JQuery {
 
 	/**
 	 * Format grouped column using the formatter set in [igGrid.columns.formatter](ui.iggrid#options:columns.formatter) or [igGrid.columns.format](ui.iggrid#options:columns.format).
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "useGridColumnFormatter"): boolean;
 
 	/**
 	 * Format grouped column using the formatter set in [igGrid.columns.formatter](ui.iggrid#options:columns.formatter) or [igGrid.columns.format](ui.iggrid#options:columns.format).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "useGridColumnFormatter", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables GroupBy persistence between states. Checkout the [GroupBy Persistence](http://www.igniteui.com/help/iggrid-groupby-overview#groupBy-persistence) topic for details.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables / disables GroupBy persistence between states. Checkout the [GroupBy Persistence](http://www.igniteui.com/help/iggrid-groupby-overview#groupBy-persistence) topic for details.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Controls containment behavior for the GroupBy Dialog.
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByDialogContainment"): string;
@@ -48008,7 +45725,6 @@ interface JQuery {
 	/**
 	 * Controls containment behavior for the GroupBy Dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48016,14 +45732,12 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. Checkout the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic for details.
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. Checkout the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic for details.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -48043,7 +45757,6 @@ interface JQuery {
 	/**
 	 * Gets default summaries that will appear when grouping by a column on the bottom of each group as a row.This option has a lower priority than the groupSummaries defined under columnSettings for each column.
 	 * All default summaries are defined under $.ig.util.defaultSummaryMethods
-	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupSummaries"): any;
 
@@ -48051,14 +45764,12 @@ interface JQuery {
 	 * Sets default summaries that will appear when grouping by a column on the bottom of each group as a row.This option has a lower priority than the groupSummaries defined under columnSettings for each column.
 	 * All default summaries are defined under $.ig.util.defaultSummaryMethods
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupSummaries", optionValue: any): void;
 
 	/**
 	 * Gets the groupSummaries postion inside each group.
-	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupSummariesPosition"): string;
@@ -48066,7 +45777,6 @@ interface JQuery {
 	/**
 	 * Sets the groupSummaries postion inside each group.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48272,25 +45982,21 @@ interface JQuery {
 interface IgGridHidingColumnSetting {
 	/**
 	 * Column key. this is a required property in every column setting if columnIndex is not set.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. the preferred way of populating a column setting is to always use the column keys as identifiers.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Allows the column to be hidden.
-	 *
 	 */
 	allowHiding?: boolean;
 
 	/**
 	 * Sets the initial visibility of the column.
-	 *
 	 */
 	hidden?: boolean;
 
@@ -48303,67 +46009,56 @@ interface IgGridHidingColumnSetting {
 interface IgGridHidingLocale {
 	/**
 	 * The text used in the drop down tools menu(Feature Chooser) to launch the column chooser dialog.
-	 *
 	 */
 	columnChooserDisplayText?: string;
 
 	/**
 	 * The text displayed in the tooltip of the hidden column indicator.
-	 *
 	 */
 	hiddenColumnIndicatorTooltipText?: string;
 
 	/**
 	 * The text used in the drop down tools menu(Feature Chooser) to hide a column.
-	 *
 	 */
 	columnHideText?: string;
 
 	/**
 	 * The caption of the column chooser dialog.
-	 *
 	 */
 	columnChooserCaptionLabel?: string;
 
 	/**
 	 * The close button tooltip of the column chooser dialog.
-	 *
 	 */
 	columnChooserCloseButtonTooltip?: string;
 
 	/**
 	 * Specifies the hiding column icon tooltip.
-	 *
 	 */
 	hideColumnIconTooltip?: string;
 
 	/**
 	 * The text used in the column chooser to show column.
-	 *
 	 */
 	columnChooserShowText?: string;
 
 	/**
 	 * The text used in the column chooser to hide column.
-	 *
 	 */
 	columnChooserHideText?: string;
 
 	/**
 	 * Text label for reset button.
-	 *
 	 */
 	columnChooserResetButtonLabel?: string;
 
 	/**
 	 * Specifies the text of the button which applies changes in the modal dialog.
-	 *
 	 */
 	columnChooserButtonApplyText?: string;
 
 	/**
 	 * Specifies the text of the button which cancels changes in the modal dialog.
-	 *
 	 */
 	columnChooserButtonCancelText?: string;
 
@@ -48672,13 +46367,11 @@ interface ColumnChooserButtonResetClickEventUIParam {
 interface IgGridHiding {
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridHidingColumnSetting[];
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
-	 *
 	 */
 	hiddenColumnIndicatorHeaderWidth?: number;
 
@@ -48692,19 +46385,16 @@ interface IgGridHiding {
 
 	/**
 	 * The default column chooser width.
-	 *
 	 */
 	columnChooserWidth?: string;
 
 	/**
 	 * The default column chooser height.
-	 *
 	 */
 	columnChooserHeight?: string;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
-	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -48765,25 +46455,21 @@ interface IgGridHiding {
 
 	/**
 	 * Specifies on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
-	 *
 	 */
 	columnChooserHideOnClick?: boolean;
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	columnChooserAnimationDuration?: number;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	inherit?: boolean;
 
@@ -48966,28 +46652,24 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnSettings"): IgGridHidingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridHidingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth"): number;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth", optionValue: number): void;
@@ -49012,42 +46694,36 @@ interface JQuery {
 
 	/**
 	 * The default column chooser width.
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth"): string;
 
 	/**
 	 * The default column chooser width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth", optionValue: string): void;
 
 	/**
 	 * The default column chooser height.
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight"): string;
 
 	/**
 	 * The default column chooser height.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight", optionValue: string): void;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -49182,56 +46858,48 @@ interface JQuery {
 
 	/**
 	 * Gets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick"): boolean;
 
 	/**
 	 * Sets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick", optionValue: boolean): void;
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -49436,13 +47104,11 @@ interface JQuery {
 interface IgHierarchicalGridLocale {
 	/**
 	 * Specifies the default tooltip applied to an expand column cell, that is currently collapsed.
-	 *
 	 */
 	expandTooltip?: string;
 
 	/**
 	 * Specifies the default tooltip applied to an expand column cell, that is currently expanded.
-	 *
 	 */
 	collapseTooltip?: string;
 
@@ -49477,20 +47143,17 @@ interface IgHierarchicalGridColumnLayout {
 interface IgHierarchicalGridColumnGroupOptions {
 	/**
 	 * Sets whether the group is expanded or collapsed. Applied only if the allowGroupCollapsing is set to true.
-	 *
 	 */
 	expanded?: boolean;
 
 	/**
 	 * Sets whether expansion indicators are visible in the group header.
-	 *
 	 */
 	allowGroupCollapsing?: boolean;
 
 	/**
 	 * Sets when should the group be hidden. Applied only if the allowGroupCollapsing is set to true.
 	 *
-	 *
 	 * Valid values:
 	 * "never" never hide the group
 	 * "always" always hide the group
@@ -49508,20 +47171,17 @@ interface IgHierarchicalGridColumnGroupOptions {
 interface IgHierarchicalGridColumn {
 	/**
 	 * Header text for the specified column.
-	 *
 	 */
 	headerText?: string;
 
 	/**
 	 * The property in the data source to which the column is bound. Also used to identify the column by, and find specific columns with API methods such as [columnByKey](ui.ighierarchicalgrid#methods:columnByKey).
-	 *
 	 */
 	key?: string;
 
 	/**
 	 * Reference to a function (string or function) which will be used for formatting the cell values. The function should accept a value and return the new formatted value. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * Valid values:
 	 * "string" The name of the function which will be used for formatting the cell values.
 	 * "function" Function which will be used for formatting the cell values. The function should accept a value and return the new formatted value.
@@ -49542,14 +47202,12 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Data type of the column cell values: string, number, bool, date, object.
-	 *
 	 */
 	dataType?: string|number|boolean|Date|Object;
 
 	/**
 	 * Width of the column in pixels or percentage. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).If width is not defined and [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) is set, it is assumed for all columns.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The column width can be set in pixels (px), percentage (%) or as '*' in order to auto-size based on the cells and header content.
 	 * "number" The column width can be set as a number
@@ -49558,38 +47216,32 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Initial visibility of the column. A column can be hidden without the Hiding feature being enabled but there will be no UI for unhiding it. Columns can be defined as hidden in the options of the Hiding feature as well and those definitions take precedence.
-	 *
 	 */
 	hidden?: boolean;
 
 	/**
 	 * Sets a template for an individual column. the contents of the template should be the HTML markup that goes inside the table cell, or the entire table cell markup. [Here's an example of creating a basic column template](http://www.igniteui.com/help/creating-a-basic-column-template-in-the-iggrid)
-	 *
 	 */
 	template?: string;
 
 	/**
 	 * Sets whether column data is derived from the datasource. If set to true, then the cells in this column are not bound to the data source. The data in this column is populated using [formula](ui.ighierarchicalgrid#options:columns.formula), or using [unboundValues](ui.ighierarchicalgrid#options:columns.unboundValues), or through the [setUnboundValues](ui.ighierarchicalgrid#methods:setUnboundValues) API method. [Here's an overview of the unbound columns feature](http://www.igniteui.com/help/iggrid-unboundcolumns-overview)
-	 *
 	 */
 	unbound?: boolean;
 
 	/**
 	 * Options used to configure collapsible column [groups](ui.ighierarchicalgrid#options:columns.group).
-	 *
 	 */
 	groupOptions?: IgHierarchicalGridColumnGroupOptions;
 
 	/**
 	 * Array of child column definitions. If the column has the property group than the grid has multi column headers.
-	 *
 	 */
 	group?: any[];
 
 	/**
 	 * Determines the way in which dates will be displayed in the grid for this column.
 	 *
-	 *
 	 * Valid values:
 	 * "local" The dates for this column will be rendered in the client's local timezone.
 	 * "utc" The dates for this column will be rendered in their UTC representation.
@@ -49605,7 +47257,6 @@ interface IgHierarchicalGridColumn {
 	/**
 	 * A reference to or the name of a JavaScript function, which will calculate the value of the current cell based on other cell values in the same row. Used with [unbound columns](ui.ighierarchicalgrid#options:columns.unbound).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The name of the JavaScript function.
 	 * "function" Reference to the JavaScript function.
@@ -49614,26 +47265,22 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Array of values which will be populated in the column cells at initialization, if the column is [unbound](ui.ighierarchicalgrid#options:columns.unbound).
-	 *
 	 */
 	unboundValues?: any[];
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the header cell of this column.
-	 *
 	 */
 	headerCssClass?: string;
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the data cells of this column. The class is not applied if the column has a column [template](ui.ighierarchicalgrid#options:columns.template) defined, which contains full <td> definition in the template.
-	 *
 	 */
 	columnCssClass?: string;
 
 	/**
 	 * This option is applicable only for columns with [dataType](ui.ighierarchicalgrid#options:columns.dataType) of object. Reference to a function, or the name of the function, that will be used for complex data extraction from the data records, whose return value will be used for all data operations associated with this column and will be displayed as cell value. [Here you can find more examples of how to setup a column mapper](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-mapper)
 	 *
-	 *
 	 * Valid values:
 	 * "string" The name of the mapper function.
 	 * "function" Reference to the mapper function.
@@ -49642,31 +47289,26 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Specifies the row index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	rowIndex?: number;
 
 	/**
 	 * Specifies the column index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Specifies the navigation index of the cell for the TAB sequence when the cells are in edit mode in a Multi-Row Layout grid. Has no effect otherwise. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	navigationIndex?: number;
 
 	/**
 	 * Specifies the colSpan of the cell in a Multi-Row Layout configuration. colSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
-	 *
 	 */
 	colSpan?: number;
 
 	/**
 	 * Specifies the rowSpan of the cell in a Multi-Row Layout configuration. rowSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout). If multi-row-layout is not used but multi-column-header is set then this option is used to adjust span of header cell.
-	 *
 	 */
 	rowSpan?: number;
 
@@ -49691,19 +47333,16 @@ interface IgHierarchicalGridFeature {
 interface IgHierarchicalGridRestSettingsCreate {
 	/**
 	 * Specifies a remote URL to which create requests will be sent. This will be used for both batch and non-batch, however if template is also set, this URL will only be used for batch requests.
-	 *
 	 */
 	url?: string;
 
 	/**
 	 * Specifies a remote URL template. Use ${id} in place of the resource id.
-	 *
 	 */
 	template?: string;
 
 	/**
 	 * Specifies whether create requests will be sent in batches
-	 *
 	 */
 	batch?: boolean;
 
@@ -49760,7 +47399,6 @@ interface IgHierarchicalGridRestSettingsRemove {
 interface IgHierarchicalGridRestSettings {
 	/**
 	 * Settings for create requests
-	 *
 	 */
 	create?: IgHierarchicalGridRestSettingsCreate;
 
@@ -49781,13 +47419,11 @@ interface IgHierarchicalGridRestSettings {
 
 	/**
 	 * Specifies a custom function to serialize content sent to the server. It should accept a single object or an array of objects and return a string. If not specified, JSON.stringify() will be used.
-	 *
 	 */
 	contentSerializer?: Function;
 
 	/**
 	 * Specifies the content type of the request. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	contentType?: string;
 
@@ -49800,49 +47436,41 @@ interface IgHierarchicalGridRestSettings {
 interface IgHierarchicalGridScrollSettings {
 	/**
 	 * Sets gets current vertical position.
-	 *
 	 */
 	scrollTop?: number;
 
 	/**
 	 * Sets gets current horizontal position.
-	 *
 	 */
 	scrollLeft?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using the mouse wheel.
-	 *
 	 */
 	wheelStep?: number;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using the mouse wheel.
-	 *
 	 */
 	smoothing?: boolean;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.ighierarchicalgrid#options:scrollSettings.smoothing).
-	 *
 	 */
 	smoothingStep?: number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.ighierarchicalgrid#options:scrollSettings.smoothing).
-	 *
 	 */
 	smoothingDuration?: number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on touch devices. Note: Value set to 0 would disable touch movements. Value set to -1 would invert them.
-	 *
 	 */
 	inertiaStep?: number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on touch devices.
-	 *
 	 */
 	inertiaDuration?: number;
 
@@ -49994,69 +47622,58 @@ interface ChildGridCreatedEventUIParam {}
 interface IgHierarchicalGrid {
 	/**
 	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will
-	 *
 	 */
 	initialDataBindDepth?: number;
 
 	/**
 	 * No levels will be automatically expanded when the widget is instantiated for the first time
-	 *
 	 */
 	initialExpandDepth?: number;
 
 	/**
 	 * If true, encodes all requests using OData conventions and the $expand syntax
-	 *
 	 */
 	odata?: boolean;
 
 	/**
 	 * If true, load on demand will be achieved using REST compliant resource access with appropriate url-s for
 	 * the ajax GET calls.
-	 *
 	 */
 	rest?: boolean;
 
 	/**
 	 * Specifies the limit on the number of levels to bind to
-	 *
 	 */
 	maxDataBindDepth?: number;
 
 	/**
 	 * Specifies the default property in the response where children will be located
-	 *
 	 */
 	defaultChildrenDataProperty?: string;
 
 	/**
 	 * If true, will autogenerate all layouts assuming default values for "childrenDataProperty"
 	 * When autoGenerateLayouts is enabled, it will automatically generate all columns recursively. (all columns on all levels)
-	 *
 	 */
 	autoGenerateLayouts?: boolean;
 
 	/**
 	 * Applies a linear animation - either expanding or collapsing depending on the parent row state
-	 *
 	 */
 	expandCollapseAnimations?: boolean;
 
 	/**
 	 * Specifies the expand column width
-	 *
 	 */
 	expandColWidth?: number;
 
 	/**
 	 * Specifies the delimiter for constructing paths , for hierarchical lookup of data
-	 *
 	 */
 	pathSeparator?: string;
 
 	/**
 	 * The row expanding/collapsing animation duration in ms.
-	 *
 	 */
 	animationDuration?: number;
 
@@ -50075,14 +47692,12 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * List of columnLayout objects that specify the structure of the child grids. All options that are applicable to a flat grid are also applicable here
-	 *
 	 */
 	columnLayouts?: IgHierarchicalGridColumnLayout[];
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The widget width can be set in pixels as a number. Example values: 800, 700.
@@ -50093,7 +47708,6 @@ interface IgHierarchicalGrid {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -50103,14 +47717,12 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.ighierarchicalgrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.ighierarchicalgrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
-	 *
 	 */
 	autoAdjustHeight?: boolean;
 
 	/**
 	 * Used for [row virtualization](ui.ighierarchicalgrid#options:rowVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The avarage row height can be set in pixels ("25px").
 	 * "number" The avarage row height can be set in pixels as a number (25).
@@ -50120,7 +47732,6 @@ interface IgHierarchicalGrid {
 	/**
 	 * Used for [column virtualization](ui.ighierarchicalgrid#options:columnVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The avarage column width can be set in pixels ("25px").
 	 * "number" The avarage column width can be set in pixels as a number (25).
@@ -50130,7 +47741,6 @@ interface IgHierarchicalGrid {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.ighierarchicalgrid#options:columns.width) defined.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The default column width can be set in pixels ("100px").
 	 * "number" The default column width can be set in pixels as a number (100).
@@ -50141,20 +47751,17 @@ interface IgHierarchicalGrid {
 	 * If no [columns](ui.ighierarchicalgrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.ighierarchicalgrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.ighierarchicalgrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.ighierarchicalgrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) as well.
-	 *
 	 */
 	autoGenerateColumns?: boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
-	 *
 	 */
 	virtualization?: boolean;
 
 	/**
 	 * Determines row virtualization mode.
 	 *
-	 *
 	 * Valid values:
 	 * "fixed" Renders only the visible rows and/or columns in the grid. On scrolling the same rows and/or columns are updated with new data from the data source. Only fixed virtualization can work with column virtualization at the same time. Fixed virtualization is not supported by some grid features: Resizing, Group By, Responsive.
 	 * "continuous" renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
@@ -50163,32 +47770,27 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
-	 *
 	 */
 	rowVirtualization?: boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.ighierarchicalgrid#options:virtualization) to true and [virtualizationMode](ui.ighierarchicalgrid#options:virtualizationMode) to "fixed".
-	 *
 	 */
 	columnVirtualization?: boolean;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight).
-	 *
 	 */
 	virtualizationMouseWheelStep?: number;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
-	 *
 	 */
 	adjustVirtualHeights?: boolean;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.ighierarchicalgrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
-	 *
 	 * Valid values:
 	 * "infragistics" The grid will use the Infragistics Templating engine to render its [column templates](ui.ighierarchicalgrid#options:columns.template) and specific parts of the UI.
 	 * "jsRender" The grid will use jsRender to render its [column templates](ui.ighierarchicalgrid#options:columns.template) and specific parts of the UI.
@@ -50197,115 +47799,96 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
-	 *
 	 */
 	columns?: IgHierarchicalGridColumn[];
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
-	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Specifies a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
-	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
-	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
-	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the requests to a remote data source.
-	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Controls the visibility of the grid header.
-	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
-	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	fixedHeaders?: boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	fixedFooters?: boolean;
 
 	/**
 	 * Caption text that will be shown above the grid header.
-	 *
 	 */
 	caption?: string;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
-	 *
 	 */
 	features?: IgHierarchicalGridFeature[];
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.ighierarchicalgrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.ighierarchicalgrid#options:columns) defined will be extracted in a new object and used.
-	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
-	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
-	 *
 	 */
 	serializeTransactionLog?: boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.ighierarchicalgrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
-	 *
 	 */
 	autoCommit?: boolean;
 
@@ -50315,14 +47898,12 @@ interface IgHierarchicalGrid {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.ighierarchicalgrid#options:autoCommit) is set to false.
-	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * Valid values:
 	 * "date" formats only Date columns
 	 * "number" formats only number columns
@@ -50334,69 +47915,58 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * Gets sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.ighierarchicalgrid#options:columns.template).
-	 *
 	 */
 	renderCheckboxes?: boolean;
 
 	/**
 	 * URL to which updating requests will be made.
-	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Settings related to REST compliant update routines.
-	 *
 	 */
 	restSettings?: IgHierarchicalGridRestSettings;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
-	 *
 	 */
 	alternateRowStyles?: boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
-	 *
 	 */
 	autofitLastColumn?: boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
-	 *
 	 */
 	enableHoverStyles?: boolean;
 
 	/**
 	 * Nables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
-	 *
 	 */
 	enableUTCDates?: boolean;
 
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
-	 *
 	 */
 	mergeUnboundColumns?: boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
-	 *
 	 */
 	jsonpRequest?: boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.ighierarchicalgrid#options:width) and/or [height](ui.ighierarchicalgrid#options:height) is set in percent (%) and grid parent DOM container is resized.
-	 *
 	 */
 	enableResizeContainerCheck?: boolean;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
-	 *
 	 * Valid values:
 	 * "none" Always hide the feature chooser icon; The feature chooser is shown on tapping/clicking the column header.
 	 * "desktopOnly" Always show the icon on desktop but hide when touch device detected.
@@ -50406,7 +47976,6 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * Settings related to content scrolling.
-	 *
 	 */
 	scrollSettings?: IgHierarchicalGridScrollSettings;
 
@@ -50715,42 +48284,36 @@ interface JQuery {
 
 	/**
 	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "initialDataBindDepth"): number;
 
 	/**
 	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "initialDataBindDepth", optionValue: number): void;
 
 	/**
 	 * No levels will be automatically expanded when the widget is instantiated for the first time
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "initialExpandDepth"): number;
 
 	/**
 	 * No levels will be automatically expanded when the widget is instantiated for the first time
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "initialExpandDepth", optionValue: number): void;
 
 	/**
 	 * If true, encodes all requests using OData conventions and the $expand syntax
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "odata"): boolean;
 
 	/**
 	 * If true, encodes all requests using OData conventions and the $expand syntax
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "odata", optionValue: boolean): void;
@@ -50758,7 +48321,6 @@ interface JQuery {
 	/**
 	 * If true, load on demand will be achieved using REST compliant resource access with appropriate url-s for
 	 * the ajax GET calls.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rest"): boolean;
 
@@ -50766,35 +48328,30 @@ interface JQuery {
 	 * If true, load on demand will be achieved using REST compliant resource access with appropriate url-s for
 	 * the ajax GET calls.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rest", optionValue: boolean): void;
 
 	/**
 	 * Gets the limit on the number of levels to bind to
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "maxDataBindDepth"): number;
 
 	/**
 	 * Sets the limit on the number of levels to bind to
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "maxDataBindDepth", optionValue: number): void;
 
 	/**
 	 * Gets the default property in the response where children will be located
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "defaultChildrenDataProperty"): string;
 
 	/**
 	 * Sets the default property in the response where children will be located
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "defaultChildrenDataProperty", optionValue: string): void;
@@ -50802,7 +48359,6 @@ interface JQuery {
 	/**
 	 * If true, will autogenerate all layouts assuming default values for "childrenDataProperty"
 	 * When autoGenerateLayouts is enabled, it will automatically generate all columns recursively. (all columns on all levels)
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateLayouts"): boolean;
 
@@ -50810,63 +48366,54 @@ interface JQuery {
 	 * If true, will autogenerate all layouts assuming default values for "childrenDataProperty"
 	 * When autoGenerateLayouts is enabled, it will automatically generate all columns recursively. (all columns on all levels)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateLayouts", optionValue: boolean): void;
 
 	/**
 	 * Applies a linear animation - either expanding or collapsing depending on the parent row state
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandCollapseAnimations"): boolean;
 
 	/**
 	 * Applies a linear animation - either expanding or collapsing depending on the parent row state
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandCollapseAnimations", optionValue: boolean): void;
 
 	/**
 	 * Gets the expand column width
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandColWidth"): number;
 
 	/**
 	 * Sets the expand column width
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandColWidth", optionValue: number): void;
 
 	/**
 	 * Gets the delimiter for constructing paths , for hierarchical lookup of data
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "pathSeparator"): string;
 
 	/**
 	 * Sets the delimiter for constructing paths , for hierarchical lookup of data
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "pathSeparator", optionValue: string): void;
 
 	/**
 	 * The row expanding/collapsing animation duration in ms.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * The row expanding/collapsing animation duration in ms.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
@@ -50903,21 +48450,18 @@ interface JQuery {
 
 	/**
 	 * List of columnLayout objects that specify the structure of the child grids. All options that are applicable to a flat grid are also applicable here
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnLayouts"): IgHierarchicalGridColumnLayout[];
 
 	/**
 	 * List of columnLayout objects that specify the structure of the child grids. All options that are applicable to a flat grid are also applicable here
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnLayouts", optionValue: IgHierarchicalGridColumnLayout[]): void;
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "width"): string|number;
@@ -50925,7 +48469,6 @@ interface JQuery {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -50933,7 +48476,6 @@ interface JQuery {
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "height"): string|number;
@@ -50941,7 +48483,6 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -50949,21 +48490,18 @@ interface JQuery {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.ighierarchicalgrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data  ( > 1000 rows rendered at once, no [virtualization](ui.ighierarchicalgrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoAdjustHeight"): boolean;
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.ighierarchicalgrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.ighierarchicalgrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoAdjustHeight", optionValue: boolean): void;
 
 	/**
 	 * Used for [row virtualization](ui.ighierarchicalgrid#options:rowVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "avgRowHeight"): string|number;
@@ -50971,7 +48509,6 @@ interface JQuery {
 	/**
 	 * Used for [row virtualization](ui.ighierarchicalgrid#options:rowVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -50979,7 +48516,6 @@ interface JQuery {
 
 	/**
 	 * Used for [column virtualization](ui.ighierarchicalgrid#options:columnVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels for a column width.
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "avgColumnWidth"): string|number;
@@ -50987,7 +48523,6 @@ interface JQuery {
 	/**
 	 * Used for [column virtualization](ui.ighierarchicalgrid#options:columnVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -50995,7 +48530,6 @@ interface JQuery {
 
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.ighierarchicalgrid#options:columns.width) defined.
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "defaultColumnWidth"): string|number;
@@ -51003,7 +48537,6 @@ interface JQuery {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.ighierarchicalgrid#options:columns.width) defined.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51013,7 +48546,6 @@ interface JQuery {
 	 * If no [columns](ui.ighierarchicalgrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.ighierarchicalgrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.ighierarchicalgrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.ighierarchicalgrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) as well.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateColumns"): boolean;
 
@@ -51022,28 +48554,24 @@ interface JQuery {
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) as well.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateColumns", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
 	/**
 	 * Determines row virtualization mode.
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualizationMode"): string;
@@ -51051,7 +48579,6 @@ interface JQuery {
 	/**
 	 * Determines row virtualization mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51059,63 +48586,54 @@ interface JQuery {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rowVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rowVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.ighierarchicalgrid#options:virtualization) to true and [virtualizationMode](ui.ighierarchicalgrid#options:virtualizationMode) to "fixed".
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.ighierarchicalgrid#options:virtualization) to true and [virtualizationMode](ui.ighierarchicalgrid#options:virtualizationMode) to "fixed".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight).
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep"): number;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep", optionValue: number): void;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights"): boolean;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights", optionValue: boolean): void;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.ighierarchicalgrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "templatingEngine"): string;
@@ -51123,7 +48641,6 @@ interface JQuery {
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.ighierarchicalgrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51131,266 +48648,228 @@ interface JQuery {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columns"): IgHierarchicalGridColumn[];
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columns", optionValue: IgHierarchicalGridColumn[]): void;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * Gets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
 
 	/**
 	 * Gets the HTTP verb to be used to issue the requests to a remote data source.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP verb to be used to issue the requests to a remote data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Controls the visibility of the grid header.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * Controls the visibility of the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Controls the visibility of the grid footer.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedHeaders"): boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedHeaders", optionValue: boolean): void;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedFooters"): boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedFooters", optionValue: boolean): void;
 
 	/**
 	 * Caption text that will be shown above the grid header.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "caption"): string;
 
 	/**
 	 * Caption text that will be shown above the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "caption", optionValue: string): void;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "features"): IgHierarchicalGridFeature[];
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "features", optionValue: IgHierarchicalGridFeature[]): void;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.ighierarchicalgrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.ighierarchicalgrid#options:columns) defined will be extracted in a new object and used.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "localSchemaTransform"): boolean;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.ighierarchicalgrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.ighierarchicalgrid#options:columns) defined will be extracted in a new object and used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "localSchemaTransform", optionValue: boolean): void;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "primaryKey"): string;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "primaryKey", optionValue: string): void;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "serializeTransactionLog"): boolean;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "serializeTransactionLog", optionValue: boolean): void;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.ighierarchicalgrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoCommit"): boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.ighierarchicalgrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoCommit", optionValue: boolean): void;
@@ -51401,7 +48880,6 @@ interface JQuery {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.ighierarchicalgrid#options:autoCommit) is set to false.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "aggregateTransactions"): boolean;
 
@@ -51412,14 +48890,12 @@ interface JQuery {
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.ighierarchicalgrid#options:autoCommit) is set to false.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
@@ -51427,7 +48903,6 @@ interface JQuery {
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51435,98 +48910,84 @@ interface JQuery {
 
 	/**
 	 * Gets  ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.ighierarchicalgrid#options:columns.template).
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "renderCheckboxes"): boolean;
 
 	/**
 	 * Sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.ighierarchicalgrid#options:columns.template).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "renderCheckboxes", optionValue: boolean): void;
 
 	/**
 	 * URL to which updating requests will be made.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * URL to which updating requests will be made.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Settings related to REST compliant update routines.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "restSettings"): IgHierarchicalGridRestSettings;
 
 	/**
 	 * Settings related to REST compliant update routines.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "restSettings", optionValue: IgHierarchicalGridRestSettings): void;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "alternateRowStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "alternateRowStyles", optionValue: boolean): void;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autofitLastColumn"): boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autofitLastColumn", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableHoverStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableHoverStyles", optionValue: boolean): void;
 
 	/**
 	 * Nables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
 	/**
 	 * Nables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -51534,7 +48995,6 @@ interface JQuery {
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns"): boolean;
 
@@ -51542,42 +49002,36 @@ interface JQuery {
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns", optionValue: boolean): void;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "jsonpRequest"): boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "jsonpRequest", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.ighierarchicalgrid#options:width) and/or [height](ui.ighierarchicalgrid#options:height) is set in percent (%) and grid parent DOM container is resized.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck"): boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.ighierarchicalgrid#options:width) and/or [height](ui.ighierarchicalgrid#options:height) is set in percent (%) and grid parent DOM container is resized.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck", optionValue: boolean): void;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
-	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "featureChooserIconDisplay"): string;
@@ -51585,7 +49039,6 @@ interface JQuery {
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51593,14 +49046,12 @@ interface JQuery {
 
 	/**
 	 * Settings related to content scrolling.
-	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "scrollSettings"): IgHierarchicalGridScrollSettings;
 
 	/**
 	 * Settings related to content scrolling.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "scrollSettings", optionValue: IgHierarchicalGridScrollSettings): void;
@@ -52248,104 +49699,87 @@ interface JQuery {
 interface IgGridPagingLocale {
 	/**
 	 * Text rendered in front of the page size dropdown, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true.
-	 *
 	 */
 	pageSizeDropDownLabel?: string;
 
 	/**
 	 * Trailing text for the page size dropdown, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true.
-	 *
 	 */
 	pageSizeDropDownTrailingLabel?: string;
 
 	/**
 	 * Text for the next page label.
-	 *
 	 */
 	nextPageLabelText?: string;
 
 	/**
 	 * Text for the previous page label.
-	 *
 	 */
 	prevPageLabelText?: string;
 
 	/**
 	 * Text for the first page label.
-	 *
 	 */
 	firstPageLabelText?: string;
 
 	/**
 	 * Text for the last page label.
-	 *
 	 */
 	lastPageLabelText?: string;
 
 	/**
 	 * Leading label text for the drop down from where the page index can be switched.
-	 *
 	 */
 	currentPageDropDownLeadingLabel?: string;
 
 	/**
 	 * Trailing label text for the drop down from where the page index can be switched.
-	 *
 	 */
 	currentPageDropDownTrailingLabel?: string;
 
 	/**
 	 * Tooltip text for the page index drop down.
-	 *
 	 */
 	currentPageDropDownTooltip?: string;
 
 	/**
 	 * Tooltip text for the page size drop down.
-	 *
 	 */
 	pageSizeDropDownTooltip?: string;
 
 	/**
 	 * Tooltip text for the pager records label.
-	 *
 	 */
 	pagerRecordsLabelTooltip?: string;
 
 	/**
 	 * Tooltip text for the previous page button.
-	 *
 	 */
 	prevPageTooltip?: string;
 
 	/**
 	 * Tooltip text for the next page button.
-	 *
 	 */
 	nextPageTooltip?: string;
 
 	/**
 	 * Tooltip text for the first page button.
-	 *
 	 */
 	firstPageTooltip?: string;
 
 	/**
 	 * Tooltip text for the last page button.
-	 *
 	 */
 	lastPageTooltip?: string;
 
 	/**
 	 * Tooltip text templates of buttons that navigate to a particular page. The format string follows the [igTemplating](http://www.igniteui.com/help/igtemplating-overview) style and syntax.
 	 * See also the [pageCountLimit](ui.iggridpaging#options:pageCountLimit) option.
-	 *
 	 */
 	pageTooltipFormat?: string;
 
 	/**
 	 * Custom pager records label template - in [igTemplating](http://www.igniteui.com/help/igtemplating-overview) style and syntax.
-	 *
 	 */
 	pagerRecordsLabelTemplate?: string;
 
@@ -52459,38 +49893,32 @@ interface PagerRenderedEventUIParam {
 interface IgGridPaging {
 	/**
 	 * Number of records loaded and displayed per page.
-	 *
 	 */
 	pageSize?: number;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
-	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
-	 *
 	 */
 	pageSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
-	 *
 	 */
 	pageIndexUrlKey?: string;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
-	 *
 	 */
 	currentPageIndex?: number;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * Valid values:
 	 * "remote" Paging is performed by a remote end-point.
 	 * "local" Paging is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -52499,7 +49927,6 @@ interface IgGridPaging {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
-	 *
 	 */
 	showPageSizeDropDown?: boolean;
 
@@ -52613,7 +50040,6 @@ interface IgGridPaging {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
-	 *
 	 * Valid values:
 	 * "above" The page size drop down will be rendered above the grid header.
 	 * "inpager" The page size drop down will be rendered next to page links.
@@ -52622,61 +50048,51 @@ interface IgGridPaging {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
-	 *
 	 */
 	showPagerRecordsLabel?: boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
-	 *
 	 */
 	showFirstLastPages?: boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
-	 *
 	 */
 	showPrevNextPages?: boolean;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
-	 *
 	 */
 	pageSizeList?: any;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
-	 *
 	 */
 	pageCountLimit?: number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
-	 *
 	 */
 	visiblePageCount?: number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
-	 *
 	 */
 	defaultDropDownWidth?: number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
-	 *
 	 */
 	delayOnPageChanged?: number;
 
 	/**
 	 * Enables/disables paging persistence between states.
-	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	inherit?: boolean;
 
@@ -52753,77 +50169,66 @@ interface JQuery {
 
 	/**
 	 * Number of records loaded and displayed per page.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSize"): number;
 
 	/**
 	 * Number of records loaded and displayed per page.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSize", optionValue: number): void;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey", optionValue: string): void;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "currentPageIndex"): number;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "currentPageIndex", optionValue: number): void;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 
 	igGridPaging(optionLiteral: 'option', optionName: "type"): string;
@@ -52831,7 +50236,6 @@ interface JQuery {
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -52839,14 +50243,12 @@ interface JQuery {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown"): boolean;
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown", optionValue: boolean): void;
@@ -53101,7 +50503,6 @@ interface JQuery {
 
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
-	 *
 	 */
 
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeDropDownLocation"): string;
@@ -53109,7 +50510,6 @@ interface JQuery {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -53117,140 +50517,120 @@ interface JQuery {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel"): boolean;
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages", optionValue: boolean): void;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeList"): any;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeList", optionValue: any): void;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageCountLimit"): number;
 
 	/**
 	 * Sets/ the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageCountLimit", optionValue: number): void;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "visiblePageCount"): number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "visiblePageCount", optionValue: number): void;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth"): number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth", optionValue: number): void;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged"): number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged", optionValue: number): void;
 
 	/**
 	 * Enables/disables paging persistence between states.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables paging persistence between states.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -53343,31 +50723,26 @@ interface JQuery {
 interface IgGridResizingColumnSetting {
 	/**
 	 * Column key. this is a required property in every column setting if columnIndex is not set.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. the preferred way of populating a column setting is to always use the column keys as identifiers.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Enables disables resizing for the column.
-	 *
 	 */
 	allowResizing?: boolean;
 
 	/**
 	 * Minimum column width in pixels or percents.
-	 *
 	 */
 	minimumWidth?: string|number;
 
 	/**
 	 * Maximum column width in pixels or percents.
-	 *
 	 */
 	maximumWidth?: string|number;
 
@@ -53463,25 +50838,21 @@ interface ColumnResizedEventUIParam {
 interface IgGridResizing {
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
-	 *
 	 */
 	allowDoubleClickToResize?: boolean;
 
 	/**
 	 * Specifies whether the resizing should be deferred until the user finishes resizing or applied immediately.
-	 *
 	 */
 	deferredResizing?: boolean;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridResizingColumnSetting[];
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
-	 *
 	 */
 	handleThreshold?: number;
 
@@ -53534,56 +50905,48 @@ interface JQuery {
 
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
-	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize"): boolean;
 
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize", optionValue: boolean): void;
 
 	/**
 	 * Gets whether the resizing should be deferred until the user finishes resizing or applied immediately.
-	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "deferredResizing"): boolean;
 
 	/**
 	 * Sets whether the resizing should be deferred until the user finishes resizing or applied immediately.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "deferredResizing", optionValue: boolean): void;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
-	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "columnSettings"): IgGridResizingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridResizingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
-	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "handleThreshold"): number;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "handleThreshold", optionValue: number): void;
@@ -53644,25 +51007,21 @@ interface JQuery {
 interface IgGridResponsiveColumnSetting {
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. The preferred way of populating a column setting is to always use the column keys as identifiers.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * A list of predefined classes to decide element's visibility on.
-	 *
 	 */
 	classes?: string;
 
 	/**
 	 * A configuration object to use for the responsive functionality. Uses the keys defined in the widget's responsiveModes object. The classes property is not used if this one is set.
-	 *
 	 */
 	configuration?: any;
 
@@ -53675,31 +51034,26 @@ interface IgGridResponsiveColumnSetting {
 interface IgGridResponsiveAllowedColumnWidthPerType {
 	/**
 	 * Minimal width in pixels string columns can take before forcing vertical rendering
-	 *
 	 */
 	string?: number;
 
 	/**
 	 * Minimal width in pixels number columns can take before forcing vertical rendering
-	 *
 	 */
 	number?: number;
 
 	/**
 	 * Minimal width in pixels bool columns can take before forcing vertical rendering
-	 *
 	 */
 	bool?: number;
 
 	/**
 	 * Minimal width in pixels date columns can take before forcing vertical rendering
-	 *
 	 */
 	date?: number;
 
 	/**
 	 * Minimal width in pixels object columns can take before forcing vertical rendering
-	 *
 	 */
 	object?: number;
 
@@ -53817,44 +51171,37 @@ interface ResponsiveModeChangedEventUIParam {
 interface IgGridResponsive {
 	/**
 	 * A list of column settings that specifies how columns will react based on the environment the grid is run on.
-	 *
 	 */
 	columnSettings?: IgGridResponsiveColumnSetting[];
 
 	/**
 	 * If this option is set to true an igResponsiveContainer widget will be attached to the igGrid control which will notify the feature when changes in the width of the container occur.
-	 *
 	 */
 	reactOnContainerWidthChanges?: boolean;
 
 	/**
 	 * If this option is set to true the widget will ensure the grid's width is always set to 100%.
-	 *
 	 */
 	forceResponsiveGridWidth?: boolean;
 
 	/**
 	 * The amount of pixels the window needs to resize with for the grid to respond.
-	 *
 	 */
 	responsiveSensitivity?: number;
 
 	/**
 	 * The recognized types of environments and their configuration.
-	 *
 	 */
 	responsiveModes?: any;
 
 	/**
 	 * Enable or disable the responsive vertical rendering for the grid.
-	 *
 	 */
 	enableVerticalRendering?: boolean;
 
 	/**
 	 * The window's width under which the grid will render its contents vertically.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width in a (px) string
 	 * "number" The width as a number
@@ -53865,7 +51212,6 @@ interface IgGridResponsive {
 	/**
 	 * The width of the properties column when vertical rendering is enabled
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width in a (%) string
 	 * "number" The width as a number in percents
@@ -53875,7 +51221,6 @@ interface IgGridResponsive {
 	/**
 	 * The width of the values column when vertical rendering is enabled
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width in a (%) string
 	 * "number" The width as a number in percents
@@ -53885,13 +51230,11 @@ interface IgGridResponsive {
 	/**
 	 * When windowWidthToRenderVertically is null, determine minimal widths columns can take before
 	 * forcing vertical rendering for the grid
-	 *
 	 */
 	allowedColumnWidthPerType?: IgGridResponsiveAllowedColumnWidthPerType;
 
 	/**
 	 * Specifies a template to render a record with in a list-view style layout per mode.
-	 *
 	 */
 	singleColumnTemplate?: any;
 
@@ -54013,91 +51356,78 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies how columns will react based on the environment the grid is run on.
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "columnSettings"): IgGridResponsiveColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies how columns will react based on the environment the grid is run on.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridResponsiveColumnSetting[]): void;
 
 	/**
 	 * If this option is set to true an igResponsiveContainer widget will be attached to the igGrid control which will notify the feature when changes in the width of the container occur.
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "reactOnContainerWidthChanges"): boolean;
 
 	/**
 	 * If this option is set to true an igResponsiveContainer widget will be attached to the igGrid control which will notify the feature when changes in the width of the container occur.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "reactOnContainerWidthChanges", optionValue: boolean): void;
 
 	/**
 	 * If this option is set to true the widget will ensure the grid's width is always set to 100%.
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "forceResponsiveGridWidth"): boolean;
 
 	/**
 	 * If this option is set to true the widget will ensure the grid's width is always set to 100%.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "forceResponsiveGridWidth", optionValue: boolean): void;
 
 	/**
 	 * The amount of pixels the window needs to resize with for the grid to respond.
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveSensitivity"): number;
 
 	/**
 	 * The amount of pixels the window needs to resize with for the grid to respond.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveSensitivity", optionValue: number): void;
 
 	/**
 	 * The recognized types of environments and their configuration.
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveModes"): any;
 
 	/**
 	 * The recognized types of environments and their configuration.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveModes", optionValue: any): void;
 
 	/**
 	 * Enable or disable the responsive vertical rendering for the grid.
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "enableVerticalRendering"): boolean;
 
 	/**
 	 * Enable or disable the responsive vertical rendering for the grid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "enableVerticalRendering", optionValue: boolean): void;
 
 	/**
 	 * The window's width under which the grid will render its contents vertically.
-	 *
 	 */
 
 	igGridResponsive(optionLiteral: 'option', optionName: "windowWidthToRenderVertically"): string|number;
@@ -54105,7 +51435,6 @@ interface JQuery {
 	/**
 	 * The window's width under which the grid will render its contents vertically.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54113,7 +51442,6 @@ interface JQuery {
 
 	/**
 	 * The width of the properties column when vertical rendering is enabled
-	 *
 	 */
 
 	igGridResponsive(optionLiteral: 'option', optionName: "propertiesColumnWidth"): string|number;
@@ -54121,7 +51449,6 @@ interface JQuery {
 	/**
 	 * The width of the properties column when vertical rendering is enabled
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54129,7 +51456,6 @@ interface JQuery {
 
 	/**
 	 * The width of the values column when vertical rendering is enabled
-	 *
 	 */
 
 	igGridResponsive(optionLiteral: 'option', optionName: "valuesColumnWidth"): string|number;
@@ -54137,7 +51463,6 @@ interface JQuery {
 	/**
 	 * The width of the values column when vertical rendering is enabled
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54146,7 +51471,6 @@ interface JQuery {
 	/**
 	 * When windowWidthToRenderVertically is null, determine minimal widths columns can take before
 	 * forcing vertical rendering for the grid
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "allowedColumnWidthPerType"): IgGridResponsiveAllowedColumnWidthPerType;
 
@@ -54154,21 +51478,18 @@ interface JQuery {
 	 * When windowWidthToRenderVertically is null, determine minimal widths columns can take before
 	 * forcing vertical rendering for the grid
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "allowedColumnWidthPerType", optionValue: IgGridResponsiveAllowedColumnWidthPerType): void;
 
 	/**
 	 * Gets a template to render a record with in a list-view style layout per mode.
-	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "singleColumnTemplate"): any;
 
 	/**
 	 * Sets a template to render a record with in a list-view style layout per mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "singleColumnTemplate", optionValue: any): void;
@@ -54253,25 +51574,21 @@ interface JQuery {
 interface IgGridRowSelectorsLocale {
 	/**
 	 * Selected records text for the select/deselect all overlay.
-	 *
 	 */
 	selectedRecordsText?: string;
 
 	/**
 	 * Deselected records text for the select/deselect all overlay.
-	 *
 	 */
 	deselectedRecordsText?: string;
 
 	/**
 	 * Select all text for the select/deselect all overlay.
-	 *
 	 */
 	selectAllText?: string;
 
 	/**
 	 * Deselect all text for the select/deselect all overlay.
-	 *
 	 */
 	deselectAllText?: string;
 
@@ -54422,26 +51739,22 @@ interface CheckBoxStateChangedEventUIParam {
 interface IgGridRowSelectors {
 	/**
 	 * Determines whether the row selectors column should contain row numbering
-	 *
 	 */
 	enableRowNumbering?: boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
-	 *
 	 */
 	enableCheckBoxes?: boolean;
 
 	/**
 	 * The seed to be added to the default numbering
-	 *
 	 */
 	rowNumberingSeed?: number;
 
 	/**
 	 * defines width of the row selector`s column in pixels or percentage.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The row selector column width can be set in pixels (px) and percentage (%)
 	 * "number" The row selector width can be set as a number
@@ -54453,13 +51766,11 @@ interface IgGridRowSelectors {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
-	 *
 	 */
 	requireSelection?: boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
-	 *
 	 */
 	showCheckBoxesOnFocus?: boolean;
 
@@ -54470,7 +51781,6 @@ interface IgGridRowSelectors {
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
-	 *
 	 */
 	enableSelectAllForPaging?: boolean;
 
@@ -54480,7 +51790,6 @@ interface IgGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	selectAllForPagingTemplate?: string;
 
@@ -54490,7 +51799,6 @@ interface IgGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	deselectAllForPagingTemplate?: string;
 	locale?: IgGridRowSelectorsLocale;
@@ -54529,49 +51837,42 @@ interface JQuery {
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering", optionValue: boolean): void;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes", optionValue: boolean): void;
 
 	/**
 	 * The seed to be added to the default numbering
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed"): number;
 
 	/**
 	 * The seed to be added to the default numbering
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed", optionValue: number): void;
 
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
-	 *
 	 */
 
 	igGridRowSelectors(optionLiteral: 'option', optionName: "rowSelectorColumnWidth"): string|number;
@@ -54579,7 +51880,6 @@ interface JQuery {
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54589,7 +51889,6 @@ interface JQuery {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection"): boolean;
 
@@ -54598,21 +51897,18 @@ interface JQuery {
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection", optionValue: boolean): void;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus"): boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus", optionValue: boolean): void;
@@ -54631,14 +51927,12 @@ interface JQuery {
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging"): boolean;
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging", optionValue: boolean): void;
@@ -54649,7 +51943,6 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate"): string;
 
@@ -54660,7 +51953,6 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate", optionValue: string): void;
@@ -54671,7 +51963,6 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate"): string;
 
@@ -54682,7 +51973,6 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate", optionValue: string): void;
@@ -54911,20 +52201,17 @@ interface ActiveRowChangedEventUIParam {
 interface IgGridSelection {
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
-	 *
 	 */
 	multipleSelection?: boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
-	 *
 	 */
 	mouseDragSelect?: boolean;
 
 	/**
 	 * Defines type of the selection.
 	 *
-	 *
 	 * Valid values:
 	 * "row" Defines row selection mode.
 	 * "cell" Defines cell selection mode.
@@ -54933,43 +52220,36 @@ interface IgGridSelection {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
-	 *
 	 */
 	activation?: boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
-	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
-	 *
 	 */
 	skipChildren?: boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
-	 *
 	 */
 	multipleCellSelectOnClick?: boolean;
 
 	/**
 	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
-	 *
 	 */
 	touchDragSelect?: boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
-	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
-	 *
 	 */
 	allowMultipleRangeSelection?: boolean;
 
@@ -55268,35 +52548,30 @@ interface JQuery {
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleSelection"): boolean;
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleSelection", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect"): boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect", optionValue: boolean): void;
 
 	/**
 	 * Defines type of the selection.
-	 *
 	 */
 
 	igGridSelection(optionLiteral: 'option', optionName: "mode"): string;
@@ -55304,7 +52579,6 @@ interface JQuery {
 	/**
 	 * Defines type of the selection.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -55312,98 +52586,84 @@ interface JQuery {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "activation"): boolean;
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "activation", optionValue: boolean): void;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "skipChildren"): boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "skipChildren", optionValue: boolean): void;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick"): boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "touchDragSelect"): boolean;
 
 	/**
 	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "touchDragSelect", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection persistance between states.
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
-	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection"): boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection", optionValue: boolean): void;
@@ -55661,13 +52921,6 @@ declare namespace Infragistics {
 class EditorProvider {
 	/**
 	 * Create handlers cache
-	 *
-	 * @param callbacks
-	 * @param key
-	 * @param editorOptions
-	 * @param tabIndex
-	 * @param format
-	 * @param element
 	 */
 	createEditor(callbacks: Object, key: Object, editorOptions: Object, tabIndex: Object, format: Object, element: Object): void;
 	keyDown(evt: Object, ui: Object): void;
@@ -55691,13 +52944,6 @@ declare namespace Infragistics {
 class EditorProviderBase {
 	/**
 	 * Call parent createEditor
-	 *
-	 * @param callbacks
-	 * @param key
-	 * @param editorOptions
-	 * @param tabIndex
-	 * @param format
-	 * @param element
 	 */
 	createEditor(callbacks: Object, key: Object, editorOptions: Object, tabIndex: Object, format: Object, element: Object): void;
 	textChanged(evt: Object, ui: Object): void;
@@ -55906,10 +53152,6 @@ class SortingExpressionsManager {
 	/**
 	 * Insert expr at the first position of the se (sorting expressions) if there are not any other expressions with flag group by
 	 *  otherwise if there are such expressions inserts after the last
-	 *
-	 * @param se
-	 * @param expr
-	 * @param feature
 	 */
 	addSortingExpression(se: Object, expr: Object, feature: Object): void;
 	setFormattersForSortingExprs(exprs: Object, grid: Object): void;
@@ -56114,91 +53356,76 @@ interface JQuery {
 interface IgGridSortingLocale {
 	/**
 	 * Custom sorted column tooltip in [igTemplating](http://www.igniteui.com/help/igtemplating-overview) format.
-	 *
 	 */
 	sortedColumnTooltipFormat?: string;
 
 	/**
 	 * Unsorted column tooltip.
-	 *
 	 */
 	unsortedColumnTooltip?: string;
 
 	/**
 	 * Ascending text used for header title.
-	 *
 	 */
 	ascending?: string;
 
 	/**
 	 * Descending text used for header title.
-	 *
 	 */
 	descending?: string;
 
 	/**
 	 * Specifies sortby button text for each unsorted column in multiple sorting dialog.
-	 *
 	 */
 	modalDialogSortByButtonText?: string;
 
 	/**
 	 * Specifies reset button text in the modal dialog.
-	 *
 	 */
 	modalDialogResetButton?: string;
 
 	/**
 	 * Specifies caption for each descending sorted column in multiple sorting dialog.
-	 *
 	 */
 	modalDialogCaptionButtonDesc?: string;
 
 	/**
 	 * Specifies caption for each ascending sorted column in multiple sorting dialog.
-	 *
 	 */
 	modalDialogCaptionButtonAsc?: string;
 
 	/**
 	 * Specifies caption for unsort button in multiple sorting dialog.
-	 *
 	 */
 	modalDialogCaptionButtonUnsort?: string;
 
 	/**
 	 * Specifies the text of the feature chooser sorting button.
-	 *
 	 */
 	featureChooserText?: string;
 
 	/**
 	 * Specifies caption text for multiple sorting dialog.
-	 *
 	 */
 	modalDialogCaptionText?: string;
 
 	/**
 	 * Specifies text of button which applies changes in modal dialog.
-	 *
 	 */
 	modalDialogButtonApplyText?: string;
 
 	/**
 	 * Specifies text of button which cancels the changes in the advanced sorting modal dialog.
-	 *
 	 */
 	modalDialogButtonCancelText?: string;
 
 	/**
 	 * Specifies the text shown in the feature chooser item for sorting in ascending order (displayed only on touch environment).
-	 *
 	 */
 	featureChooserSortAsc?: string;
 
 	/**
 	 * Specifies the text shown in the feature chooser item for sorting in descending order (displayed only on touch environment).
-	 *
 	 */
 	featureChooserSortDesc?: string;
 
@@ -56211,20 +53438,17 @@ interface IgGridSortingLocale {
 interface IgGridSortingColumnSetting {
 	/**
 	 * Identifies the grid column by key. Either key or index must be set in every column setting.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Identifies the grid column by index. Either key or index must be set in every column setting.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * This will be the first sort direction when the column hasn't been sorted before.
 	 *
-	 *
 	 * Valid values:
 	 * "asc" The first sort of the column data will be in ascending order.
 	 * "desc" The first sort of the column data will be in descending order.
@@ -56234,7 +53458,6 @@ interface IgGridSortingColumnSetting {
 	/**
 	 * The current (or default) sort direction. If this setting is specified, the column will be rendered sorted according to this option.
 	 *
-	 *
 	 * Valid values:
 	 * "asc" The initial sort of the column data will be in ascending order.
 	 * "desc" The initial sort of the column data will be in descending order.
@@ -56243,7 +53466,6 @@ interface IgGridSortingColumnSetting {
 
 	/**
 	 * Enables/disables sorting on the specified column. By default all columns are sortable.
-	 *
 	 */
 	allowSorting?: boolean;
 
@@ -56258,7 +53480,6 @@ interface IgGridSortingColumnSetting {
 	 * 1 - indicating that val1 > val2,
 	 * -1 - indicating that val1 < val2.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The name of the function as a string located in the global window object.
 	 * "function" Function which will be used for custom comparison.
@@ -56395,7 +53616,6 @@ interface IgGridSorting {
 	/**
 	 * Defines local or remote sorting operations.
 	 *
-	 *
 	 * Valid values:
 	 * "remote" Sorting is performed remotely as a server-side operation.
 	 * "local" Sorting is performed locally by the [$.ig.DataSource](ig.datasource) component.
@@ -56404,38 +53624,32 @@ interface IgGridSorting {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
-	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
-	 *
 	 */
 	applySortedColumnCss?: boolean;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
-	 *
 	 */
 	sortUrlKey?: string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
-	 *
 	 */
 	sortUrlKeyAscValue?: string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
-	 *
 	 */
 	sortUrlKeyDescValue?: string;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
-	 *
 	 * Valid values:
 	 * "single" Only a single column can be sorted. Previously sorted columns will not preserve their sorting upon sorting a new column.
 	 * "multi" If enabled, previous sorted state for columns won't be cleared
@@ -56444,14 +53658,12 @@ interface IgGridSorting {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
-	 *
 	 */
 	customSortFunction?: Function;
 
 	/**
 	 * Specifies which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
-	 *
 	 * Valid values:
 	 * "ascending" The first sort of the column data will be in ascending order.
 	 * "descending" The first sort of the column data will be in descending order.
@@ -56460,7 +53672,6 @@ interface IgGridSorting {
 
 	/**
 	 * Specifies whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
-	 *
 	 */
 	modalDialogSortOnClick?: boolean;
 
@@ -56552,7 +53763,6 @@ interface IgGridSorting {
 	/**
 	 * Specifies width of multiple sorting dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specifies the width in pixels as a string ("300px").
 	 * "number" Specifies the width in pixels as a number (300)
@@ -56562,7 +53772,6 @@ interface IgGridSorting {
 	/**
 	 * Specifies height of multiple sorting dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set in pixels as a number.
@@ -56571,19 +53780,16 @@ interface IgGridSorting {
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog.
-	 *
 	 */
 	modalDialogAnimationDuration?: number;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
-	 *
 	 */
 	columnSettings?: IgGridSortingColumnSetting[];
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
-	 *
 	 */
 	persist?: boolean;
 
@@ -56597,13 +53803,11 @@ interface IgGridSorting {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	inherit?: boolean;
 
@@ -56691,7 +53895,6 @@ interface IgGridSortingMethods {
 	 *
 	 * @param index Column key (string) or index (number) - for multi-row grid only column key can be used. Specifies the column which we want to sort. If the mode is multiple, previous sorting states are not cleared.
 	 * @param direction Specifies sorting direction (ascending or descending)
-	 * @param header
 	 */
 	sortColumn(index: Object, direction: Object, header: Object): void;
 
@@ -56732,8 +53935,6 @@ interface IgGridSortingMethods {
 
 	/**
 	 * Renders content of multiple sorting dialog - sorted and unsorted columns.
-	 *
-	 * @param isToCallEvents
 	 */
 	renderMultipleSortingDialogContent(isToCallEvents: Object): void;
 
@@ -56760,7 +53961,6 @@ interface JQuery {
 
 	/**
 	 * Defines local or remote sorting operations.
-	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "type"): string;
@@ -56768,7 +53968,6 @@ interface JQuery {
 	/**
 	 * Defines local or remote sorting operations.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -56776,77 +53975,66 @@ interface JQuery {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss"): boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss", optionValue: boolean): void;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKey"): string;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKey", optionValue: string): void;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue"): string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue", optionValue: string): void;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue"): string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue", optionValue: string): void;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
-	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "mode"): string;
@@ -56854,7 +54042,6 @@ interface JQuery {
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -56862,21 +54049,18 @@ interface JQuery {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "customSortFunction"): Function;
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "customSortFunction", optionValue: Function): void;
 
 	/**
 	 * Gets which direction to use on the first click / keydown, if the column is sorted for the first time.
-	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "firstSortDirection"): string;
@@ -56884,7 +54068,6 @@ interface JQuery {
 	/**
 	 * Sets which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -56892,14 +54075,12 @@ interface JQuery {
 
 	/**
 	 * Gets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick"): boolean;
 
 	/**
 	 * Sets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick", optionValue: boolean): void;
@@ -57100,7 +54281,6 @@ interface JQuery {
 
 	/**
 	 * Gets width of multiple sorting dialog.
-	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogWidth"): string|number;
@@ -57108,7 +54288,6 @@ interface JQuery {
 	/**
 	 * Sets width of multiple sorting dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57116,7 +54295,6 @@ interface JQuery {
 
 	/**
 	 * Gets height of multiple sorting dialog.
-	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogHeight"): string|number;
@@ -57124,7 +54302,6 @@ interface JQuery {
 	/**
 	 * Sets height of multiple sorting dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57132,42 +54309,36 @@ interface JQuery {
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "columnSettings"): IgGridSortingColumnSetting[];
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridSortingColumnSetting[]): void;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
@@ -57192,28 +54363,24 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -57396,14 +54563,12 @@ interface JQuery {
 interface IgGridSummariesColumnSettingSummaryOperand {
 	/**
 	 * Text of the summary method which is shown in summary cell
-	 *
 	 */
 	rowDisplayLabel?: string;
 
 	/**
 	 * Set type of summary operand
 	 *
-	 *
 	 * Valid values:
 	 * "count" calculate count of result rows for the specified column
 	 * "min" calculate min of result rows for the specified column
@@ -57416,19 +54581,16 @@ interface IgGridSummariesColumnSettingSummaryOperand {
 
 	/**
 	 * If it is false the summary operand will be shown in dropdown but it will not be made calculation
-	 *
 	 */
 	active?: boolean;
 
 	/**
 	 * Name of the custom summary function which should be executed when type is custom
-	 *
 	 */
 	summaryCalculator?: string;
 
 	/**
 	 * Specifies the order of elements in dropdown. It is recommended to set order of custom operands and to be greater or equal to 5
-	 *
 	 */
 	order?: number;
 
@@ -57437,7 +54599,6 @@ interface IgGridSummariesColumnSettingSummaryOperand {
 	 * When this option is not set, the [format](ui.iggrid#options:columns.format) of the column it is in will taken into account.
 	 * When this option and the column [format](ui.iggrid#options:columns.format) is not set, the regional settings will be taken depending on the [autoFormat](ui.iggrid#options:autoFormat) option.
 	 * If the column type is not specified in the [autoFormat](ui.iggrid#options:autoFormat) option and no format is set for both column and summary operand, no formatting is applied.
-	 *
 	 */
 	format?: string;
 
@@ -57450,25 +54611,21 @@ interface IgGridSummariesColumnSettingSummaryOperand {
 interface IgGridSummariesColumnSetting {
 	/**
 	 * Enables disables summaries for the column
-	 *
 	 */
 	allowSummaries?: boolean;
 
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. The preferred way of populating a column setting is to always use the column keys as identifiers
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Check defaultSummaryOperands
-	 *
 	 */
 	summaryOperands?: IgGridSummariesColumnSettingSummaryOperand[];
 
@@ -57481,37 +54638,31 @@ interface IgGridSummariesColumnSetting {
 interface IgGridSummariesLocale {
 	/**
 	 * Text of the button OK in the summaries dropdown
-	 *
 	 */
 	dialogButtonOKText?: string;
 
 	/**
 	 * Text of the button Cancel in the summaries dropdown
-	 *
 	 */
 	dialogButtonCancelText?: string;
 
 	/**
 	 * Get or set text that is shown in the feature chooser dropdown when summaries are hidden
-	 *
 	 */
 	featureChooserText?: string;
 
 	/**
 	 * Get or set text that is shown in the feauture chooser dropdown when summaries are shown
-	 *
 	 */
 	featureChooserTextHide?: string;
 
 	/**
 	 * Empty text template to be shown for empty cells
-	 *
 	 */
 	emptyCellText?: string;
 
 	/**
 	 * Tooltip text for header cell button
-	 *
 	 */
 	summariesHeaderButtonTooltip?: string;
 
@@ -57647,7 +54798,6 @@ interface IgGridSummaries {
 	/**
 	 * type of summaries calculating.
 	 *
-	 *
 	 * Valid values:
 	 * "remote" when it is remote summaries calculations are made on the server
 	 * "local"	When it is local calculations are made on the client
@@ -57699,7 +54849,6 @@ interface IgGridSummaries {
 	/**
 	 * Specifies when calculations are made.
 	 *
-	 *
 	 * Valid values:
 	 * "onselect" summaries are updated when checkbox is checked/unchecked
 	 * "okcancelbuttons" summaries are updated only when OK button is clicked
@@ -57711,56 +54860,47 @@ interface IgGridSummaries {
 	 * When true indicates that the summaries may be rendered compactly, even mixing different summaries on the same line.
 	 * False ensures that each summary type is occupying a separate line.
 	 * Auto will use True if the maximum number of visible summaries is one or less and False otherwise.
-	 *
 	 */
 	compactRenderingMode?: any;
 
 	/**
 	 * Show header button icon in the header cell. On click - shows/hides summaries. If false then summary icon should not be shown in the feature chooser(if shown).
-	 *
 	 */
 	showSummariesButton?: boolean;
 
 	/**
 	 * Result key by which we get data from the result returned by remote data source.
-	 *
 	 */
 	summariesResponseKey?: string;
 
 	/**
 	 * Set key in GET Request for summaries - used only when type is remote
-	 *
 	 */
 	summaryExprUrlKey?: string;
 
 	/**
 	 * Function reference - it is called when data is retrieved from the data source
-	 *
 	 */
 	callee?: Function;
 
 	/**
 	 * Height of the dropdown in pixels
-	 *
 	 */
 	dropDownHeight?: number;
 
 	/**
 	 * Width of the dropdown in pixels
-	 *
 	 */
 	dropDownWidth?: number;
 
 	/**
 	 * Show/hide footer button(on click show/hide dropdown)
-	 *
 	 */
 	showDropDownButton?: boolean;
 
 	/**
 	 * Determines when the summary values are calculated when type is local
 	 *
-	 *
 	 * Valid values:
 	 * "priortofilteringandpaging" summaries are calculated prior to filtering and paging
 	 * "afterfilteringbeforepaging" summaries are calculated after filtering and before paging
@@ -57770,25 +54910,21 @@ interface IgGridSummaries {
 
 	/**
 	 * Dropdown animation duration
-	 *
 	 */
 	dropDownDialogAnimationDuration?: number;
 
 	/**
 	 * Result template for summary result(shown in table cell)
-	 *
 	 */
 	resultTemplate?: string;
 
 	/**
 	 * a reference or name of a javascript function - renders summary cell in grid footer.(if not set it is used default render function) It takes 3 parameters - methodName(summary method), columnKey, data(summary data which should be rendered)
-	 *
 	 */
 	renderSummaryCellFunc?: string|Object;
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
-	 *
 	 */
 	columnSettings?: IgGridSummariesColumnSetting[];
 
@@ -57927,7 +55063,6 @@ interface IgGridSummariesMethods {
 	 * @param columnMethods Array of column methods objects
 	 * @param data Object which represents result
 	 * represents dataType for the current column
-	 * @param dataType
 	 */
 	calculateSummaryColumn(ck: string, columnMethods: any[], data: Object, dataType: Object): void;
 
@@ -57938,8 +55073,6 @@ interface IgGridSummariesMethods {
 
 	/**
 	 * Return a JQUERY object which holds all summaries for column with the specified column key
-	 *
-	 * @param columnKey
 	 */
 	summariesFor(columnKey: Object): void;
 }
@@ -57965,7 +55098,6 @@ interface JQuery {
 
 	/**
 	 * Type of summaries calculating.
-	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "type"): string;
@@ -57973,7 +55105,6 @@ interface JQuery {
 	/**
 	 * Type of summaries calculating.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -58077,7 +55208,6 @@ interface JQuery {
 
 	/**
 	 * Gets when calculations are made.
-	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "calculateRenderMode"): string;
@@ -58085,7 +55215,6 @@ interface JQuery {
 	/**
 	 * Sets when calculations are made.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -58096,7 +55225,6 @@ interface JQuery {
 	 * When true indicates that the summaries may be rendered compactly, even mixing different summaries on the same line.
 	 * False ensures that each summary type is occupying a separate line.
 	 * Auto will use True if the maximum number of visible summaries is one or less and False otherwise.
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "compactRenderingMode"): any;
 
@@ -58106,112 +55234,96 @@ interface JQuery {
 	 * False ensures that each summary type is occupying a separate line.
 	 * Auto will use True if the maximum number of visible summaries is one or less and False otherwise.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "compactRenderingMode", optionValue: any): void;
 
 	/**
 	 * Show header button icon in the header cell. On click - shows/hides summaries. If false then summary icon should not be shown in the feature chooser(if shown).
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showSummariesButton"): boolean;
 
 	/**
 	 * Show header button icon in the header cell. On click - shows/hides summaries. If false then summary icon should not be shown in the feature chooser(if shown).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showSummariesButton", optionValue: boolean): void;
 
 	/**
 	 * Result key by which we get data from the result returned by remote data source.
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summariesResponseKey"): string;
 
 	/**
 	 * Result key by which we get data from the result returned by remote data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summariesResponseKey", optionValue: string): void;
 
 	/**
 	 * Set key in GET Request for summaries - used only when type is remote
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summaryExprUrlKey"): string;
 
 	/**
 	 * Set key in GET Request for summaries - used only when type is remote
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summaryExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Function reference - it is called when data is retrieved from the data source
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "callee"): Function;
 
 	/**
 	 * Function reference - it is called when data is retrieved from the data source
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "callee", optionValue: Function): void;
 
 	/**
 	 * Height of the dropdown in pixels
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownHeight"): number;
 
 	/**
 	 * Height of the dropdown in pixels
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownHeight", optionValue: number): void;
 
 	/**
 	 * Width of the dropdown in pixels
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownWidth"): number;
 
 	/**
 	 * Width of the dropdown in pixels
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownWidth", optionValue: number): void;
 
 	/**
 	 * Show/hide footer button(on click show/hide dropdown)
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showDropDownButton"): boolean;
 
 	/**
 	 * Show/hide footer button(on click show/hide dropdown)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showDropDownButton", optionValue: boolean): void;
 
 	/**
 	 * Determines when the summary values are calculated when type is local
-	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "summaryExecution"): string;
@@ -58219,7 +55331,6 @@ interface JQuery {
 	/**
 	 * Determines when the summary values are calculated when type is local
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -58227,35 +55338,30 @@ interface JQuery {
 
 	/**
 	 * Dropdown animation duration
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownDialogAnimationDuration"): number;
 
 	/**
 	 * Dropdown animation duration
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Result template for summary result(shown in table cell)
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "resultTemplate"): string;
 
 	/**
 	 * Result template for summary result(shown in table cell)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "resultTemplate", optionValue: string): void;
 
 	/**
 	 * A reference or name of a javascript function - renders summary cell in grid footer.(if not set it is used default render function) It takes 3 parameters - methodName(summary method), columnKey, data(summary data which should be rendered)
-	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "renderSummaryCellFunc"): string|Object;
@@ -58263,7 +55369,6 @@ interface JQuery {
 	/**
 	 * A reference or name of a javascript function - renders summary cell in grid footer.(if not set it is used default render function) It takes 3 parameters - methodName(summary method), columnKey, data(summary data which should be rendered)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -58271,14 +55376,12 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
-	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "columnSettings"): IgGridSummariesColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridSummariesColumnSetting[]): void;
@@ -58445,25 +55548,21 @@ interface JQuery {
 interface IgGridTooltipsColumnSettings {
 	/**
 	 * Either key or index must be set in every column setting.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Either key or index must be set in every column setting.
-	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Enables / disables tooltips on the specified column. By default tooltips are displayed for each column. Note: This option is mandatory.
-	 *
 	 */
 	allowTooltips?: boolean;
 
 	/**
 	 * Specifies the maximum width (in pixels) of the tooltip when shown for the specified column. If unset the width of the column will be used instead.
-	 *
 	 */
 	maxWidth?: number;
 
@@ -58477,7 +55576,6 @@ interface IgGridTooltips {
 	/**
 	 * determines the tooltip visibility option
 	 *
-	 *
 	 * Valid values:
 	 * "always" tooltips always show for hovered elements
 	 * "never" tooltips do not show automatically
@@ -58488,7 +55586,6 @@ interface IgGridTooltips {
 	/**
 	 * controls the tooltip's style
 	 *
-	 *
 	 * Valid values:
 	 * "tooltip" The tooltip will be positioned according to the mouse cursor. Will render the tooltip content as plain text.
 	 * "popover" The tooltip will be positioned according to the target element with an arrow pointing the element. This style is more suitable for touch-supported environments. Will render the tooltip content as HTML.
@@ -58498,38 +55595,32 @@ interface IgGridTooltips {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
-	 *
 	 */
 	showDelay?: number;
 
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
-	 *
 	 */
 	hideDelay?: number;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
-	 *
 	 */
 	columnSettings?: IgGridTooltipsColumnSettings;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
-	 *
 	 */
 	fadeTimespan?: number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	cursorLeftOffset?: number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	cursorTopOffset?: number;
 
@@ -58584,7 +55675,6 @@ interface JQuery {
 
 	/**
 	 * Determines the tooltip visibility option
-	 *
 	 */
 
 	igGridTooltips(optionLiteral: 'option', optionName: "visibility"): string;
@@ -58592,7 +55682,6 @@ interface JQuery {
 	/**
 	 * Determines the tooltip visibility option
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -58600,7 +55689,6 @@ interface JQuery {
 
 	/**
 	 * Controls the tooltip's style
-	 *
 	 */
 
 	igGridTooltips(optionLiteral: 'option', optionName: "style"): string;
@@ -58608,7 +55696,6 @@ interface JQuery {
 	/**
 	 * Controls the tooltip's style
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -58617,7 +55704,6 @@ interface JQuery {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
-	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "showDelay"): number;
 
@@ -58625,7 +55711,6 @@ interface JQuery {
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "showDelay", optionValue: number): void;
@@ -58633,7 +55718,6 @@ interface JQuery {
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
-	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "hideDelay"): number;
 
@@ -58641,63 +55725,54 @@ interface JQuery {
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "hideDelay", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
-	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "columnSettings"): IgGridTooltipsColumnSettings;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridTooltipsColumnSettings): void;
 
 	/**
 	 * The time tooltip fades in and out when showing/hiding
-	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan"): number;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan", optionValue: number): void;
 
 	/**
 	 * The left position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset"): number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset", optionValue: number): void;
 
 	/**
 	 * The top position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset"): number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset", optionValue: number): void;
@@ -58770,14 +55845,12 @@ interface JQuery {
 interface IgGridUpdatingColumnSetting {
 	/**
 	 * Identifies the grid column by key.
-	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Specifies the type of editor to use for the column.
 	 *
-	 *
 	 * Valid values:
 	 * "text" An igTextEditor will be created
 	 * "mask" An igMaskEditor will be created
@@ -58810,37 +55883,31 @@ interface IgGridUpdatingColumnSetting {
 	 * validate: function (noLabel) {},
 	 * isValid: function () {}
 	 * });
-	 *
 	 */
 	editorProvider?: any;
 
 	/**
 	 * Specifies options to initialize the corresponding editor with.
-	 *
 	 */
 	editorOptions?: any;
 
 	/**
 	 * Specifies if the end-user will be allowed to leave the editor's value empty during edit mode or not.
-	 *
 	 */
 	required?: boolean;
 
 	/**
 	 * Specifies if the column is read-only. In 'cell' and 'row' [editMode](ui.iggridupdating#options:editMode) no editor will be created for read-only columns. In 'dialog' mode enabling [showReadonlyEditors](ui.iggridupdating#options:rowEditDialogOptions.showReadonlyEditors) will display disabled editors for such columns.
-	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Specifies if the column's value should be validated or not. The validation is done based on the rules of the corresponding editor.
-	 *
 	 */
 	validation?: boolean;
 
 	/**
 	 * Specifies the default value for the column when adding new rows. When in edit mode for adding a row the value will be pre-filled in the column's editor (if the column is not read-only). The value should be of the type specified for the column in the grid's [columns](ui.iggrid#options:columns) collection.
-	 *
 	 */
 	defaultValue?: any;
 
@@ -58854,7 +55921,6 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the containment of the dialog's drag operation.
 	 *
-	 *
 	 * Valid values:
 	 * "owner" The row edit dialog will be draggable only in the grid area.
 	 * "window" The row edit dialog will be draggable in the whole window area.
@@ -58864,7 +55930,6 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the default row edit dialog width.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog window width in pixels (400px).
 	 * "number" The dialog window width as a number (400).
@@ -58874,7 +55939,6 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the default row edit dialog height.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog window height in pixels (350px).
 	 * "number" The dialog window height as a number (350).
@@ -58883,26 +55947,22 @@ interface IgGridUpdatingRowEditDialogOptions {
 
 	/**
 	 * Specifies the animation duration for the opening and closing operations.
-	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Controls if editors should be rendered for read-only columns. If rendered, these editors will be disabled.
-	 *
 	 */
 	showReadonlyEditors?: boolean;
 
 	/**
 	 * Controls if editors should be rendered for hidden columns.
-	 *
 	 */
 	showEditorsForHiddenColumns?: boolean;
 
 	/**
 	 * Controls the width of the column containing the column names in the default row edit dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width of the column in pixels (100px) or percents (20%).
 	 * "number" The width of the column as a number (100) in pixels.
@@ -58913,7 +55973,6 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the width of the column containing the editors in the default row edit dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width of the column in pixels (100px) or percents (20%).
 	 * "number" The width of the column as a number (100) in pixels.
@@ -58924,33 +55983,28 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the visibility of the done and cancel buttons for the dialog.
 	 * If disabled the end-user will be able to stop editing only with the Enter and Esc keys.
-	 *
 	 */
 	showDoneCancelButtons?: boolean;
 
 	/**
 	 * Specifies a template to be rendered against the currently edited record (or up-to-date key-value pairs in the case of not yet created records). It may contain an element decorated with the 'data-render-tmpl' attribute to specify where the control should render the editors template specified in the [editorsTemplate](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplate) option. For custom dialogs, the elements can be decorated with 'data-editor-for-<columnKey>' attributes where columnKey is the key of the column that editor or input will be used to edit. If both dialogTemplate and [dialogTemplateSelector](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplateSelector) are specified, dialogTemplateSelector will be used.The default template is '<table><colgroup><col></col><col></col></colgroup><tbody data-render-tmpl></tbody></table>'.
-	 *
 	 */
 	dialogTemplate?: string;
 
 	/**
 	 * Specifies a selector to a template rendered against the currently edited record (or up-to-date key-value pairs in the case of not yet created records). It may contain an element decorated with the 'data-render-tmpl' attribute to specify where the control should render the editors template specified in the [editorsTemplate](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplate) option. For custom dialogs, the elements can be decorated with 'data-editor-for-<columnKey>' attributes where columnKey is the key of the column that editor or input will be used to edit. If both [dialogTemplate](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplate) and dialogTemplateSelector are specified, dialogTemplateSelector will be used.The default template is '<table><colgroup><col></col><col></col></colgroup><tbody data-render-tmpl></tbody></table>'.
-	 *
 	 */
 	dialogTemplateSelector?: string;
 
 	/**
 	 * Specifies a template to be executed for each column in the grid's column collection (or just the read-write columns if [showReadonlyEditors](ui.iggridupdating#options:rowEditDialogOptions.showReadonlyEditors) is false). Decorate the element to be used as an editor with 'data-editor-for-${key}'. The ${key} template tag should be replaced with the chosen templating engine's syntax for rendering values. If any editors for columns are specified in the dialog markup they will be exluded from the data the template will be rendered for. This property is ignored if [dialogTemplate](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplate) does not include an element with the 'data-render-tmpl' attribute. If both editorsTemplate and [editorsTemplateSelector](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplateSelector) are specified, editorsTemplateSelector will be used.
 	 * The default template is '<tr><td>${headerText}</td><td><input data-editor-for-${key} /></td></tr>'
-	 *
 	 */
 	editorsTemplate?: string;
 
 	/**
 	 * Specifies a selector to a template to be executed for each column in the grid's column collection (or just the read-write columns if [showReadonlyEditors](ui.iggridupdating#options:rowEditDialogOptions.showReadonlyEditors) is false). Decorate the element to be used as an editor with 'data-editor-for-${key}'. The ${key} template tag should be replaced with the chosen templating engine's syntax for rendering values. If any editors for columns are specified in the dialog markup they will be exluded from the data the template will be rendered for. This property is ignored if [dialogTemplate](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplate) does not include an element with the 'data-render-tmpl' attribute. If both [editorsTemplate](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplate) and editorsTemplateSelector are specified, editorsTemplateSelector will be used.
 	 * The default template is '<tr><td>${headerText}</td><td><input data-editor-for-${key} /></td></tr>'
-	 *
 	 */
 	editorsTemplateSelector?: string;
 
@@ -58963,49 +56017,41 @@ interface IgGridUpdatingRowEditDialogOptions {
 interface IgGridUpdatingLocale {
 	/**
 	 * Specifies the label for the Done editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.doneLabel is used.
-	 *
 	 */
 	doneLabel?: string;
 
 	/**
 	 * Specifies the title for the Done editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.doneTooltip is used.
-	 *
 	 */
 	doneTooltip?: string;
 
 	/**
 	 * Specifies the label for the Cancel editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.cancelLabel is used.
-	 *
 	 */
 	cancelLabel?: string;
 
 	/**
 	 * Specifies the title for the Cancel editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.cancelTooltip is used.
-	 *
 	 */
 	cancelTooltip?: string;
 
 	/**
 	 * Specifies the label for the button starting edit mode for row adding. If not set, $.ig.GridUpdating.locale.addRowLabel is used.
-	 *
 	 */
 	addRowLabel?: string;
 
 	/**
 	 * Specifies the title for the button starting edit mode for row adding. If not set, $.ig.GridUpdating.locale.addRowTooltip is used.
-	 *
 	 */
 	addRowTooltip?: string;
 
 	/**
 	 * Specifies the label for the delete button. If not set, $.ig.GridUpdating.locale.deleteRowLabel is used.
-	 *
 	 */
 	deleteRowLabel?: string;
 
 	/**
 	 * Specifies the title for the delete button. If not set, $.ig.GridUpdating.locale.deleteRowTooltip is used.
-	 *
 	 */
 	deleteRowTooltip?: string;
 
@@ -59407,14 +56453,12 @@ interface RowEditDialogContentsRenderedEventUIParam {
 interface IgGridUpdating {
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
-	 *
 	 */
 	columnSettings?: IgGridUpdatingColumnSetting[];
 
 	/**
 	 * Specifies the edit mode.
 	 *
-	 *
 	 * Valid values:
 	 * "row" Editors are shown for all columns that are not read-only. The editor of the clicked cell receives initial focus. Done and Cancel buttons may be displayed based on the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) property.
 	 * "cell" An editor is shown for the cell entering edit mode. The Done and Cancel buttons are not supported for this mode.
@@ -59425,19 +56469,16 @@ interface IgGridUpdating {
 
 	/**
 	 * Specifies if deleting rows through the UI is enabled.
-	 *
 	 */
 	enableDeleteRow?: boolean;
 
 	/**
 	 * Specifies if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
-	 *
 	 */
 	enableAddRow?: boolean;
 
 	/**
 	 * Specifies if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
-	 *
 	 */
 	validation?: boolean;
 
@@ -59499,67 +56540,56 @@ interface IgGridUpdating {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
-	 *
 	 */
 	showDoneCancelButtons?: boolean;
 
 	/**
 	 * Specifies if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
-	 *
 	 */
 	enableDataDirtyException?: boolean;
 
 	/**
 	 * Specifies how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
-	 *
 	 */
 	startEditTriggers?: string|Array<any>;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
-	 *
 	 */
 	horizontalMoveOnEnter?: boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
-	 *
 	 */
 	excelNavigationMode?: boolean;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 	saveChangesSuccessHandler?: Function|string;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 	saveChangesErrorHandler?: Function|string;
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
-	 *
 	 */
 	swipeDistance?: string|number;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
-	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
-	 *
 	 */
 	rowEditDialogOptions?: IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
-	 *
 	 */
 	dialogWidget?: string;
 
@@ -59802,21 +56832,18 @@ interface JQuery {
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "columnSettings"): IgGridUpdatingColumnSetting[];
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridUpdatingColumnSetting[]): void;
 
 	/**
 	 * Gets the edit mode.
-	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "editMode"): string;
@@ -59824,7 +56851,6 @@ interface JQuery {
 	/**
 	 * Sets the edit mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -59832,42 +56858,36 @@ interface JQuery {
 
 	/**
 	 * Gets if deleting rows through the UI is enabled.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow"): boolean;
 
 	/**
 	 * Sets if deleting rows through the UI is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableAddRow"): boolean;
 
 	/**
 	 * Sets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableAddRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "validation"): boolean;
 
 	/**
 	 * Sets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "validation", optionValue: boolean): void;
@@ -60002,35 +57022,30 @@ interface JQuery {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons"): boolean;
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons", optionValue: boolean): void;
 
 	/**
 	 * Gets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException"): boolean;
 
 	/**
 	 * Sets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException", optionValue: boolean): void;
 
 	/**
 	 * Gets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
-	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "startEditTriggers"): string|Array<any>;
@@ -60038,7 +57053,6 @@ interface JQuery {
 	/**
 	 * Sets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -60046,35 +57060,30 @@ interface JQuery {
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter"): boolean;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode"): boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode", optionValue: boolean): void;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "saveChangesSuccessHandler"): Function|string;
@@ -60082,7 +57091,6 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -60090,7 +57098,6 @@ interface JQuery {
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "saveChangesErrorHandler"): Function|string;
@@ -60098,7 +57105,6 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -60106,7 +57112,6 @@ interface JQuery {
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
-	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "swipeDistance"): string|number;
@@ -60114,7 +57119,6 @@ interface JQuery {
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -60122,42 +57126,36 @@ interface JQuery {
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions"): IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions", optionValue: IgGridUpdatingRowEditDialogOptions): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
-	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -60498,61 +57496,51 @@ interface WorkspaceResizedEventUIParam {}
 interface IgHtmlEditor {
 	/**
 	 * Shows/hides the "Formatting" toolbar.
-	 *
 	 */
 	showFormattingToolbar?: boolean;
 
 	/**
 	 * Shows/hides the "Text" toolbar.
-	 *
 	 */
 	showTextToolbar?: boolean;
 
 	/**
 	 * Shows/hides the "Insert Object" toolbar.
-	 *
 	 */
 	showInsertObjectToolbar?: boolean;
 
 	/**
 	 * Shows/hides the "Copy Paste" toolbar.
-	 *
 	 */
 	showCopyPasteToolbar?: boolean;
 
 	/**
 	 * The width of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
 	 */
 	width?: string|number;
 
 	/**
 	 * The height of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * The html editor toolbars list.
-	 *
 	 */
 	toolbarSettings?: any[];
 
 	/**
 	 * The html editor custom toolbars list.
-	 *
 	 */
 	customToolbars?: any[];
 
 	/**
 	 * The name attribute of the html editor source view.
-	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Used to render inside the html editor as initial content
-	 *
 	 */
 	value?: string;
 
@@ -60874,63 +57862,54 @@ interface JQuery {
 
 	/**
 	 * Shows/hides the "Formatting" toolbar.
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showFormattingToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Formatting" toolbar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showFormattingToolbar", optionValue: boolean): void;
 
 	/**
 	 * Shows/hides the "Text" toolbar.
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showTextToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Text" toolbar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showTextToolbar", optionValue: boolean): void;
 
 	/**
 	 * Shows/hides the "Insert Object" toolbar.
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showInsertObjectToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Insert Object" toolbar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showInsertObjectToolbar", optionValue: boolean): void;
 
 	/**
 	 * Shows/hides the "Copy Paste" toolbar.
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showCopyPasteToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Copy Paste" toolbar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showCopyPasteToolbar", optionValue: boolean): void;
 
 	/**
 	 * The width of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
 	 */
 
 	igHtmlEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -60938,7 +57917,6 @@ interface JQuery {
 	/**
 	 * The width of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -60946,7 +57924,6 @@ interface JQuery {
 
 	/**
 	 * The height of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
 	 */
 
 	igHtmlEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -60954,7 +57931,6 @@ interface JQuery {
 	/**
 	 * The height of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -60962,56 +57938,48 @@ interface JQuery {
 
 	/**
 	 * The html editor toolbars list.
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "toolbarSettings"): any[];
 
 	/**
 	 * The html editor toolbars list.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "toolbarSettings", optionValue: any[]): void;
 
 	/**
 	 * The html editor custom toolbars list.
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "customToolbars"): any[];
 
 	/**
 	 * The html editor custom toolbars list.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "customToolbars", optionValue: any[]): void;
 
 	/**
 	 * The name attribute of the html editor source view.
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * The name attribute of the html editor source view.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Used to render inside the html editor as initial content
-	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "value"): string;
 
 	/**
 	 * Used to render inside the html editor as initial content
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "value", optionValue: string): void;
@@ -61293,37 +58261,31 @@ interface JQuery {
 interface IgLayoutManagerBorderLayout {
 	/**
 	 * Option specifying the width of the left region, either in px or percentages
-	 *
 	 */
 	leftWidth?: string;
 
 	/**
 	 * Option specifying the width of the right region, either in px or percentages
-	 *
 	 */
 	rightWidth?: string;
 
 	/**
 	 * Option specifying whether the footer region in the border layout will be hidden or shown
-	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Option specifying whether the header region in the border layout will be hidden or shown
-	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Option specifying whether the left region in the border layout will be hidden or shown
-	 *
 	 */
 	showLeft?: boolean;
 
 	/**
 	 * Option specifying whether the right region in the border layout will be hidden or shown
-	 *
 	 */
 	showRight?: boolean;
 
@@ -61336,13 +58298,11 @@ interface IgLayoutManagerBorderLayout {
 interface IgLayoutManagerGridLayout {
 	/**
 	 * Specifies the duration of the animations in the layout manager"s grid layout
-	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Number of columns in the grid
-	 *
 	 */
 	cols?: number;
 
@@ -61351,7 +58311,6 @@ interface IgLayoutManagerGridLayout {
 	 *                         It can also accept an array, specifying height for each column. If more than one column
 	 *                         has an asterisk value, the remaining height will be equally distributed between these columns.
 	 *                     array The column height can be set as an array of heights.
-	 *
 	 */
 	columnHeight?: string|number|Array<any>;
 
@@ -61360,38 +58319,32 @@ interface IgLayoutManagerGridLayout {
 	 *                         It can also accept an array, specifying width for each column. If more than one column
 	 *                         has an asterisk value, the remaining width will be equally distributed between these columns.
 	 *                     array The column width can be set as an array of widths.
-	 *
 	 */
 	columnWidth?: string|number|Array<any>;
 
 	/**
 	 * Specifies the margin left css property for items
-	 *
 	 */
 	marginLeft?: number;
 
 	/**
 	 * Specifies the margin top css property for items
-	 *
 	 */
 	marginTop?: number;
 
 	/**
 	 * Specifies whether the previous set options should be overriden when setting options
-	 *
 	 */
 	overrideConfigOnSetOption?: boolean;
 
 	/**
 	 * Specified whether the items should rearrange to fit in the container when it is resized.
 	 *                         Have effect only when fixed columnWidth option is set.
-	 *
 	 */
 	rearrangeItems?: boolean;
 
 	/**
 	 * Number of rows in the grid
-	 *
 	 */
 	rows?: number;
 
@@ -61404,39 +58357,33 @@ interface IgLayoutManagerGridLayout {
 interface IgLayoutManagerItem {
 	/**
 	 * Column index of the item in the grid
-	 *
 	 */
 	colIndex?: number;
 
 	/**
 	 * ColSpan of the item
-	 *
 	 */
 	colSpan?: number;
 
 	/**
 	 * Gets/Sets individual item height, either in px or percentage
 	 *                         string The default height can be set in pixels (px), %, em and other units.
-	 *
 	 */
 	height?: string;
 
 	/**
 	 * Row index of the item in the grid
-	 *
 	 */
 	rowIndex?: number;
 
 	/**
 	 * RowSpan of the item
-	 *
 	 */
 	rowSpan?: number;
 
 	/**
 	 * Gets/Sets individual item width, either in px or percentage
 	 *                         string The default width can be set in pixels (px), %, em and other units.
-	 *
 	 */
 	width?: number;
 
@@ -61523,25 +58470,21 @@ interface ItemRenderingEventUIParam {
 interface IgLayoutManager {
 	/**
 	 * Options specific to a border layout
-	 *
 	 */
 	borderLayout?: IgLayoutManagerBorderLayout;
 
 	/**
 	 * Options specific to grid layout mode
-	 *
 	 */
 	gridLayout?: IgLayoutManagerGridLayout;
 
 	/**
 	 * Gets/Sets height of the layout container.
-	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * Number of items to render, this is only applicable to layouts: vertical and flow
-	 *
 	 */
 	itemCount?: number;
 
@@ -61553,7 +58496,6 @@ interface IgLayoutManager {
 	 *                     items can have various properties some of which may not be applicable
 	 *                     depending on the layoutMode.
 	 *                     for example rowSpan/colSpan/colIndex/rowIndex are only applicable to gridlayout
-	 *
 	 */
 	items?: IgLayoutManagerItem[];
 
@@ -61565,7 +58507,6 @@ interface IgLayoutManager {
 	 *                 column Column type can be set with column layout
 	 *                 vertical Column type can be set with vertical layout
 	 *
-	 *
 	 * Valid values:
 	 * "grid"
 	 * "border"
@@ -61577,7 +58518,6 @@ interface IgLayoutManager {
 
 	/**
 	 * Gets/Sets width of the layout container.
-	 *
 	 */
 	width?: string|number;
 
@@ -61654,35 +58594,30 @@ interface JQuery {
 
 	/**
 	 * Options specific to a border layout
-	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "borderLayout"): IgLayoutManagerBorderLayout;
 
 	/**
 	 * Options specific to a border layout
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "borderLayout", optionValue: IgLayoutManagerBorderLayout): void;
 
 	/**
 	 * Options specific to grid layout mode
-	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "gridLayout"): IgLayoutManagerGridLayout;
 
 	/**
 	 * Options specific to grid layout mode
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "gridLayout", optionValue: IgLayoutManagerGridLayout): void;
 
 	/**
 	 * Gets/Sets height of the layout container.
-	 *
 	 */
 
 	igLayoutManager(optionLiteral: 'option', optionName: "height"): string|number;
@@ -61690,7 +58625,6 @@ interface JQuery {
 	/**
 	 * /Sets height of the layout container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -61698,14 +58632,12 @@ interface JQuery {
 
 	/**
 	 * Number of items to render, this is only applicable to layouts: vertical and flow
-	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "itemCount"): number;
 
 	/**
 	 * Number of items to render, this is only applicable to layouts: vertical and flow
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "itemCount", optionValue: number): void;
@@ -61718,7 +58650,6 @@ interface JQuery {
 	 *                     items can have various properties some of which may not be applicable
 	 *                     depending on the layoutMode.
 	 *                     for example rowSpan/colSpan/colIndex/rowIndex are only applicable to gridlayout
-	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "items"): IgLayoutManagerItem[];
 
@@ -61731,7 +58662,6 @@ interface JQuery {
 	 *                     depending on the layoutMode.
 	 *                     for example rowSpan/colSpan/colIndex/rowIndex are only applicable to gridlayout
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "items", optionValue: IgLayoutManagerItem[]): void;
@@ -61743,7 +58673,6 @@ interface JQuery {
 	 *                 flow Column type can be set with flow layout
 	 *                 column Column type can be set with column layout
 	 *                 vertical Column type can be set with vertical layout
-	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "layoutMode"): any;
 
@@ -61755,14 +58684,12 @@ interface JQuery {
 	 *                 column Column type can be set with column layout
 	 *                 vertical Column type can be set with vertical layout
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "layoutMode", optionValue: any): void;
 
 	/**
 	 * Gets/Sets width of the layout container.
-	 *
 	 */
 
 	igLayoutManager(optionLiteral: 'option', optionName: "width"): string|number;
@@ -61770,7 +58697,6 @@ interface JQuery {
 	/**
 	 * /Sets width of the layout container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62340,9 +59266,6 @@ interface IgLinearGaugeMethods {
 
 	/**
 	 * Gets the value for the main scale of the gauge for a given point within the bounds of the gauge.
-	 *
-	 * @param x
-	 * @param y
 	 */
 	getValueForPoint(x: Object, y: Object): number;
 
@@ -63515,7 +60438,6 @@ interface IgMapSeries {
 	/**
 	 * Gets or sets the marker type for the current series object.If the MarkerTemplate property is set, the setting of the MarkerType property will be ignored.
 	 *
-	 *
 	 * Valid values:
 	 * "unset"
 	 * "none"
@@ -63957,7 +60879,6 @@ interface IgMap {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
-	 *
 	 * Valid values:
 	 * "deferred" Defer the view update until after the user action is complete.
 	 * "immediate" Update the view immediately while the user action is happening.
@@ -64437,15 +61358,11 @@ interface IgMapMethods {
 
 	/**
 	 * Gets the actual minimum value of the target xAxis or yAxis
-	 *
-	 * @param targetName
 	 */
 	getActualMinimumValue(targetName: Object): void;
 
 	/**
 	 * Gets the actual maximum value of the target xAxis or yAxis
-	 *
-	 * @param targetName
 	 */
 	getActualMaximumValue(targetName: Object): void;
 
@@ -64904,7 +61821,6 @@ interface JQuery {
 
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
-	 *
 	 */
 
 	igMap(optionLiteral: 'option', optionName: "windowResponse"): string;
@@ -64912,7 +61828,6 @@ interface JQuery {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -65620,13 +62535,11 @@ interface JQuery {
 interface IgNotifierHeaderTemplate {
 	/**
 	 * Controls whether the popover renders a functional close button
-	 *
 	 */
 	closeButton?: boolean;
 
 	/**
 	 * Sets the content for the popover header.
-	 *
 	 */
 	title?: string;
 
@@ -65640,7 +62553,6 @@ interface IgNotifier {
 	/**
 	 * Gets/Sets the current state of the igNotifier messages. State controls what CSS classes are applied to the messages and target and has interactions with other options as well.
 	 *
-	 *
 	 * Valid values:
 	 * "success" Messages and target CSS have success styles applied.
 	 * "info" Messages have info applied. Target is unaffected.
@@ -65652,7 +62564,6 @@ interface IgNotifier {
 	/**
 	 * Controls the level of notifications shown by automatic and manual messages using the [notify](ui.ignotifier#methods:notify) method. Use [show](ui.ignotifier#methods:show) to ignore the level.
 	 *
-	 *
 	 * Valid values:
 	 * "success" Show all types of messages
 	 * "info" Show everything from info level messages up
@@ -65664,7 +62575,6 @@ interface IgNotifier {
 	/**
 	 * Controls where the popover DOM should be attached to (only applies to popovers).
 	 *
-	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to the parent jQuery object
@@ -65674,7 +62584,6 @@ interface IgNotifier {
 	/**
 	 * Controls the positioning mode of messages. Setting a mode will override the default behavior which is auto.Note: Inline element uses a block container as is always placed after the target.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" Uses popover for info and warning messages and inline for errors and success.
 	 * "popover" Displays messages in a configurable popover.
@@ -65684,20 +62593,17 @@ interface IgNotifier {
 
 	/**
 	 * Allows setting the respective state CSS on the target element (used to apply border color by default)
-	 *
 	 */
 	allowCSSOnTarget?: boolean;
 
 	/**
 	 * Allows rendering a span with the respective state CSS to display jQuery UI framework icons
-	 *
 	 */
 	showIcon?: boolean;
 
 	/**
 	 * Gets/Sets the content for the popover container. Templated with parameters by default: {0} - icon container class, {1} - the icon class and {2} - message text.
 	 *
-	 *
 	 * Valid values:
 	 * "string" String content of the popover container
 	 * "function" Function which is a callback that should return the content. Use the 'this' value to access the target DOM element and passed argument for state value. Result can also include the same template parametes.
@@ -65706,14 +62612,12 @@ interface IgNotifier {
 
 	/**
 	 * Sets the content for the popover header
-	 *
 	 */
 	headerTemplate?: IgNotifierHeaderTemplate;
 
 	/**
 	 * Sets the event on which the notification will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
-	 *
 	 * Valid values:
 	 * "mouseenter" The popover is shown on mouse enter in the target element
 	 * "click" The popover is shown on click on the target element
@@ -65724,19 +62628,16 @@ interface IgNotifier {
 
 	/**
 	 * Controls whether the popover will close on blur or not. This option has effect only when the corresponding [showOn](ui.ignotifier#options:showOn) is set (manual by default)
-	 *
 	 */
 	closeOnBlur?: boolean;
 
 	/**
 	 * Gets/Sets the time in milliseconds the notification fades in and out when showing/hiding
-	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Gets/Sets the distance in pixels a notification popover slides outwards as it's shown.
-	 *
 	 */
 	animationSlideDistance?: number;
 
@@ -65748,7 +62649,6 @@ interface IgNotifier {
 	/**
 	 * controls the direction in which the control shows relative to the target element
 	 *
-	 *
 	 * Valid values:
 	 * "auto" lets the control show on the side where enough space is available with the priority specified by the [directionPriority](ui.%%WidgetNameLowered%%#options:directionPriority) property
 	 * "left" shows popover on the left side of the target element
@@ -65761,14 +62661,12 @@ interface IgNotifier {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
-	 *
 	 */
 	directionPriority?: any[];
 
 	/**
 	 * controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
-	 *
 	 * Valid values:
 	 * "auto" lets the control choose a position depending on available space with the following priority balanced > end > start
 	 * "balanced" the popover is positioned at the middle of the target element
@@ -65779,37 +62677,31 @@ interface IgNotifier {
 
 	/**
 	 * defines width for the popover. leave null for auto.
-	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * defines height for the popover. leave null for auto
-	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * defines width the popover won't go under the value even if no specific one is set.
-	 *
 	 */
 	minWidth?: number|string;
 
 	/**
 	 * defines width the popover won't exceed even if no specific one is set.
-	 *
 	 */
 	maxWidth?: number|string;
 
 	/**
 	 * defines height the popover won't exceed even if no specific one is set.
-	 *
 	 */
 	maxHeight?: number|string;
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
-	 *
 	 */
 	containment?: any;
 
@@ -65932,7 +62824,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the current state of the igNotifier messages. State controls what CSS classes are applied to the messages and target and has interactions with other options as well.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "state"): string;
@@ -65940,7 +62831,6 @@ interface JQuery {
 	/**
 	 * /Sets the current state of the igNotifier messages. State controls what CSS classes are applied to the messages and target and has interactions with other options as well.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -65948,7 +62838,6 @@ interface JQuery {
 
 	/**
 	 * Controls the level of notifications shown by automatic and manual messages using the [notify](ui.ignotifier#methods:notify) method. Use [show](ui.ignotifier#methods:show) to ignore the level.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "notifyLevel"): string;
@@ -65956,7 +62845,6 @@ interface JQuery {
 	/**
 	 * Controls the level of notifications shown by automatic and manual messages using the [notify](ui.ignotifier#methods:notify) method. Use [show](ui.ignotifier#methods:show) to ignore the level.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -65964,7 +62852,6 @@ interface JQuery {
 
 	/**
 	 * Controls where the popover DOM should be attached to (only applies to popovers).
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "appendTo"): string|Object;
@@ -65972,7 +62859,6 @@ interface JQuery {
 	/**
 	 * Controls where the popover DOM should be attached to (only applies to popovers).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -65980,7 +62866,6 @@ interface JQuery {
 
 	/**
 	 * Controls the positioning mode of messages. Setting a mode will override the default behavior which is auto.Note: Inline element uses a block container as is always placed after the target.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "mode"): string;
@@ -65988,7 +62873,6 @@ interface JQuery {
 	/**
 	 * Controls the positioning mode of messages. Setting a mode will override the default behavior which is auto.Note: Inline element uses a block container as is always placed after the target.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -65996,35 +62880,30 @@ interface JQuery {
 
 	/**
 	 * Allows setting the respective state CSS on the target element (used to apply border color by default)
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "allowCSSOnTarget"): boolean;
 
 	/**
 	 * Allows setting the respective state CSS on the target element (used to apply border color by default)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "allowCSSOnTarget", optionValue: boolean): void;
 
 	/**
 	 * Allows rendering a span with the respective state CSS to display jQuery UI framework icons
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "showIcon"): boolean;
 
 	/**
 	 * Allows rendering a span with the respective state CSS to display jQuery UI framework icons
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "showIcon", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the content for the popover container. Templated with parameters by default: {0} - icon container class, {1} - the icon class and {2} - message text.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "contentTemplate"): string|Function;
@@ -66032,7 +62911,6 @@ interface JQuery {
 	/**
 	 * /Sets the content for the popover container. Templated with parameters by default: {0} - icon container class, {1} - the icon class and {2} - message text.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66040,21 +62918,18 @@ interface JQuery {
 
 	/**
 	 * The content for the popover header
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "headerTemplate"): IgNotifierHeaderTemplate;
 
 	/**
 	 * Sets the content for the popover header
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "headerTemplate", optionValue: IgNotifierHeaderTemplate): void;
 
 	/**
 	 * Sets the event on which the notification will be shown. Predefined values are "mouseenter", "click" and "focus"
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "showOn"): string;
@@ -66062,7 +62937,6 @@ interface JQuery {
 	/**
 	 * Sets the event on which the notification will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66070,42 +62944,36 @@ interface JQuery {
 
 	/**
 	 * Controls whether the popover will close on blur or not. This option has effect only when the corresponding [showOn](ui.ignotifier#options:showOn) is set (manual by default)
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "closeOnBlur"): boolean;
 
 	/**
 	 * Controls whether the popover will close on blur or not. This option has effect only when the corresponding [showOn](ui.ignotifier#options:showOn) is set (manual by default)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "closeOnBlur", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the time in milliseconds the notification fades in and out when showing/hiding
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * /Sets the time in milliseconds the notification fades in and out when showing/hiding
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the distance in pixels a notification popover slides outwards as it's shown.
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationSlideDistance"): number;
 
 	/**
 	 * /Sets the distance in pixels a notification popover slides outwards as it's shown.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationSlideDistance", optionValue: number): void;
@@ -66124,7 +62992,6 @@ interface JQuery {
 
 	/**
 	 * Controls the direction in which the control shows relative to the target element
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "direction"): string;
@@ -66132,7 +62999,6 @@ interface JQuery {
 	/**
 	 * Controls the direction in which the control shows relative to the target element
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66141,7 +63007,6 @@ interface JQuery {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "directionPriority"): any[];
 
@@ -66149,14 +63014,12 @@ interface JQuery {
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "directionPriority", optionValue: any[]): void;
 
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "position"): string;
@@ -66164,7 +63027,6 @@ interface JQuery {
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66172,7 +63034,6 @@ interface JQuery {
 
 	/**
 	 * Defines width for the popover. leave null for auto.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "width"): number|string;
@@ -66180,7 +63041,6 @@ interface JQuery {
 	/**
 	 * Defines width for the popover. leave null for auto.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66188,7 +63048,6 @@ interface JQuery {
 
 	/**
 	 * Defines height for the popover. leave null for auto
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "height"): number|string;
@@ -66196,7 +63055,6 @@ interface JQuery {
 	/**
 	 * Defines height for the popover. leave null for auto
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66204,7 +63062,6 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "minWidth"): number|string;
@@ -66212,7 +63069,6 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66220,7 +63076,6 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "maxWidth"): number|string;
@@ -66228,7 +63083,6 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66236,7 +63090,6 @@ interface JQuery {
 
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
-	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "maxHeight"): number|string;
@@ -66244,7 +63097,6 @@ interface JQuery {
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -66252,14 +63104,12 @@ interface JQuery {
 
 	/**
 	 * The containment for the popover. Accepts a jQuery object
-	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "containment"): any;
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "containment", optionValue: any): void;
@@ -66682,7 +63532,6 @@ interface IgPivotDataSelectorDragAndDropSettings {
 
 	/**
 	 * Specifies the containment for the drag helper. The area inside of which the                                     helper is contained would be scrollable while dragging.
-	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -68211,7 +65060,6 @@ interface IgPivotGridDragAndDropSettings {
 
 	/**
 	 * Specifies the containment for the drag helper. The area inside of which thehelper is contained would be scrollable while dragging.
-	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -68517,7 +65365,6 @@ interface IgPivotGrid {
 	 * superCompact Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on above or below it (Depending on the isParentInFrontForRows setting).
 	 * tree All hierarchies in the rows are displayed in a tree-like structure in a single column (The column's width is dependent on the defaultRowHEaderWidth, which can be set to "null" to enable the built-in auto-sizing functionality).
 	 *
-	 *
 	 * Valid values:
 	 * "standard"
 	 * "superCompact"
@@ -69069,7 +65916,6 @@ interface JQuery {
 	 * A value indicating whether the layout that row headers should be arranged.standard Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on its right.
 	 * superCompact Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on above or below it (Depending on the isParentInFrontForRows setting).
 	 * tree All hierarchies in the rows are displayed in a tree-like structure in a single column (The column's width is dependent on the defaultRowHEaderWidth, which can be set to "null" to enable the built-in auto-sizing functionality).
-	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "rowHeadersLayout"): any;
 
@@ -69078,7 +65924,6 @@ interface JQuery {
 	 * superCompact Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on above or below it (Depending on the isParentInFrontForRows setting).
 	 * tree All hierarchies in the rows are displayed in a tree-like structure in a single column (The column's width is dependent on the defaultRowHEaderWidth, which can be set to "null" to enable the built-in auto-sizing functionality).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "rowHeadersLayout", optionValue: any): void;
@@ -70247,7 +67092,6 @@ interface IgPivotViewPivotGridOptionsLevelSortDirection {
 
 	/**
 	 * optional="true" Specifies the sort direction. If no direction is specified,the level is going to be sorted in the direction specified by the firstLevelSortDirection option.
-	 *
 	 */
 	sortDirection?: any;
 
@@ -70318,7 +67162,6 @@ interface IgPivotViewPivotGridOptionsDragAndDropSettings {
 
 	/**
 	 * Specifies the containment for the drag helper. The area inside of which the helper is contained would be scrollable while dragging.
-	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -70481,7 +67324,6 @@ interface IgPivotViewDataSelectorOptionsDragAndDropSettings {
 
 	/**
 	 * Specifies the containment for the drag helper. The area inside of which the helper is contained would be scrollable while dragging.
-	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -70755,14 +67597,12 @@ interface JQuery {
 interface IgPopover {
 	/**
 	 * Controls whether the popover will close on blur or not
-	 *
 	 */
 	closeOnBlur?: boolean;
 
 	/**
 	 * controls the direction in which the control shows relative to the target element
 	 *
-	 *
 	 * Valid values:
 	 * "auto" lets the control show on the side where enough space is available with the priority specified by the [directionPriority](ui.%%WidgetNameLowered%%#options:directionPriority) property
 	 * "left" shows popover on the left side of the target element
@@ -70775,14 +67615,12 @@ interface IgPopover {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
-	 *
 	 */
 	directionPriority?: any[];
 
 	/**
 	 * controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
-	 *
 	 * Valid values:
 	 * "auto" lets the control choose a position depending on available space with the following priority balanced > end > start
 	 * "balanced" the popover is positioned at the middle of the target element
@@ -70793,44 +67631,37 @@ interface IgPopover {
 
 	/**
 	 * defines width for the popover. leave null for auto.
-	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * defines height for the popover. leave null for auto
-	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * defines width the popover won't go under the value even if no specific one is set.
-	 *
 	 */
 	minWidth?: number|string;
 
 	/**
 	 * defines width the popover won't exceed even if no specific one is set.
-	 *
 	 */
 	maxWidth?: number|string;
 
 	/**
 	 * defines height the popover won't exceed even if no specific one is set.
-	 *
 	 */
 	maxHeight?: number|string;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
-	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * sets the content for the popover container. If left null the content will be get from the target.
 	 *
-	 *
 	 * Valid values:
 	 * "string" String content of the popover container
 	 * "function" Function which is a callback that should return the content. Use the 'this' value to access the target DOM element.
@@ -70839,20 +67670,17 @@ interface IgPopover {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
-	 *
 	 */
 	selectors?: string;
 
 	/**
 	 * Sets the content for the popover header
-	 *
 	 */
 	headerTemplate?: IgPopoverHeaderTemplate;
 
 	/**
 	 * sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
-	 *
 	 * Valid values:
 	 * "mouseenter" the popover is shown on mouse enter in the target element
 	 * "click" the popover is shown on click on the target element
@@ -70862,14 +67690,12 @@ interface IgPopover {
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
-	 *
 	 */
 	containment?: any;
 
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
-	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to the parent jQuery object
@@ -70977,21 +67803,18 @@ interface JQuery {
 
 	/**
 	 * Controls whether the popover will close on blur or not
-	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "closeOnBlur"): boolean;
 
 	/**
 	 * Controls whether the popover will close on blur or not
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "closeOnBlur", optionValue: boolean): void;
 
 	/**
 	 * Controls the direction in which the control shows relative to the target element
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "direction"): string;
@@ -70999,7 +67822,6 @@ interface JQuery {
 	/**
 	 * Controls the direction in which the control shows relative to the target element
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71008,7 +67830,6 @@ interface JQuery {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
-	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "directionPriority"): any[];
 
@@ -71016,14 +67837,12 @@ interface JQuery {
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "directionPriority", optionValue: any[]): void;
 
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "position"): string;
@@ -71031,7 +67850,6 @@ interface JQuery {
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71039,7 +67857,6 @@ interface JQuery {
 
 	/**
 	 * Defines width for the popover. leave null for auto.
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "width"): number|string;
@@ -71047,7 +67864,6 @@ interface JQuery {
 	/**
 	 * Defines width for the popover. leave null for auto.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71055,7 +67871,6 @@ interface JQuery {
 
 	/**
 	 * Defines height for the popover. leave null for auto
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "height"): number|string;
@@ -71063,7 +67878,6 @@ interface JQuery {
 	/**
 	 * Defines height for the popover. leave null for auto
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71071,7 +67885,6 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "minWidth"): number|string;
@@ -71079,7 +67892,6 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71087,7 +67899,6 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "maxWidth"): number|string;
@@ -71095,7 +67906,6 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71103,7 +67913,6 @@ interface JQuery {
 
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "maxHeight"): number|string;
@@ -71111,7 +67920,6 @@ interface JQuery {
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71119,21 +67927,18 @@ interface JQuery {
 
 	/**
 	 * The time popover fades in and out when showing/hiding
-	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * The content for the popover container. If left null the content will be get from the target.
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "contentTemplate"): string|Function;
@@ -71141,7 +67946,6 @@ interface JQuery {
 	/**
 	 * Sets the content for the popover container. If left null the content will be get from the target.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71149,35 +67953,30 @@ interface JQuery {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
-	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "selectors"): string;
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "selectors", optionValue: string): void;
 
 	/**
 	 * The content for the popover header
-	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "headerTemplate"): IgPopoverHeaderTemplate;
 
 	/**
 	 * Sets the content for the popover header
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "headerTemplate", optionValue: IgPopoverHeaderTemplate): void;
 
 	/**
 	 * The event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "showOn"): string;
@@ -71185,7 +67984,6 @@ interface JQuery {
 	/**
 	 * Sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71193,21 +67991,18 @@ interface JQuery {
 
 	/**
 	 * The containment for the popover. Accepts a jQuery object
-	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "containment"): any;
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "containment", optionValue: any): void;
 
 	/**
 	 * Controls where the popover DOM should be attached to.
-	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "appendTo"): string|Object;
@@ -71215,7 +68010,6 @@ interface JQuery {
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -72383,22 +69177,16 @@ interface IgRadialGaugeMethods {
 
 	/**
 	 * Adds a new range to the radial gauge.
-	 *
-	 * @param value
 	 */
 	addRange(value: Object): void;
 
 	/**
 	 * Removes a specified range.
-	 *
-	 * @param value
 	 */
 	removeRange(value: Object): void;
 
 	/**
 	 * Updates the range.
-	 *
-	 * @param value
 	 */
 	updateRange(value: Object): void;
 
@@ -72409,39 +69197,26 @@ interface IgRadialGaugeMethods {
 
 	/**
 	 * Scales a value on the gauge's main scale to an angle around the center point of the gauge, in radians.
-	 *
-	 * @param value
 	 */
 	scaleValue(value: Object): void;
 
 	/**
 	 * Unscales a value from an angle in radians to the represented value along the main scale of the gauge.
-	 *
-	 * @param value
 	 */
 	unscaleValue(value: Object): void;
 
 	/**
 	 * Gets the value for the main scale of the gauge for a given point within the bounds of the gauge.
-	 *
-	 * @param x
-	 * @param y
 	 */
 	getValueForPoint(x: Object, y: Object): number;
 
 	/**
 	 * Gets the point on the gauge for a given scale value and extent.
-	 *
-	 * @param value
-	 * @param extent
 	 */
 	getPointForValue(value: Object, extent: Object): void;
 
 	/**
 	 * Returns true if the main gauge needle bounding box contains the point provided, otherwise false.
-	 *
-	 * @param x
-	 * @param y
 	 */
 	needleContainsPoint(x: Object, y: Object): void;
 
@@ -73426,7 +70201,6 @@ interface IgRadialMenuItem {
 	/**
 	 * Gets or sets a value indicating what type of item is being provided.
 	 *
-	 *
 	 * Valid values:
 	 * "button"
 	 * "coloritem"
@@ -74339,37 +71113,31 @@ interface IgRating {
 	/**
 	 * Gets a vertical or horizontal orientation for the votes.
 	 * Change of that option is not supported after igRating was created.
-	 *
 	 */
 	vertical?: boolean;
 
 	/**
 	 * Gets/Sets value (selected votes or percent). If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the value is used as number of selected votes or as a percent of the votes.
-	 *
 	 */
 	value?: number|string;
 
 	/**
 	 * Gets/Sets value-hover (hovered votes or percent of hovered votes). The default is same as value. If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the valueHover is used as number of hovered votes or as a percent of the hovered votes.
-	 *
 	 */
 	valueHover?: number|string;
 
 	/**
 	 * Gets/Sets number of votes.
-	 *
 	 */
 	voteCount?: number;
 
 	/**
 	 * Gets/Sets custom width of a vote in pixels. In case of 0 the run time style value is used.
-	 *
 	 */
 	voteWidth?: number;
 
 	/**
 	 * Gets/Sets custom height of a vote in pixels. In case of 0 the run time style value is used.
-	 *
 	 */
 	voteHeight?: number;
 
@@ -74377,7 +71145,6 @@ interface IgRating {
 	 * Gets the direction of selected and hovered votes. Change of that option is not supported after igRating was created.
 	 * Value true: from left to right or from top to bottom.
 	 * Value false: from right to left or from bottom to left.
-	 *
 	 */
 	swapDirection?: boolean;
 
@@ -74385,7 +71152,6 @@ interface IgRating {
 	 * Gets/Sets percent or vote number to measure value and value-hover.
 	 * Value true: value is measured as percent (from 0 to 1).
 	 * Value false: value is measured in number of voted (from 0 to voteCount)
-	 *
 	 */
 	valueAsPercent?: boolean;
 
@@ -74393,14 +71159,12 @@ interface IgRating {
 	 * Gets if igRating can have focus. Change of that option is not supported after igRating was created.
 	 * Value true: can get focus and process key events.
 	 * Value false: cannot get focus.
-	 *
 	 */
 	focusable?: boolean;
 
 	/**
 	 * Gets/Sets precision. Precision of value and valueHover.
 	 *
-	 *
 	 * Valid values:
 	 * "exact" Value corresponds location of mouse.
 	 * "half" Value is rounded to the half of vote.
@@ -74413,7 +71177,6 @@ interface IgRating {
 	 * It has effect only when precision is set to "half" or "whole".
 	 * If user clicks between edge of the first vote and (sizeOfVote * precisionZeroVote), then value is set to 0.
 	 * Same is applied for mouseover as well.
-	 *
 	 */
 	precisionZeroVote?: number;
 
@@ -74424,7 +71187,6 @@ interface IgRating {
 	 * If precision is "whole" or "half" and roundedDecimalPlaces is set in range of 0..2, then 3 is used.
 	 * If valueAsPercent is enabled and roundedDecimalPlaces is set to 0, then 1 is used.
 	 * If it is larger than 15, then 15 is used.
-	 *
 	 */
 	roundedDecimalPlaces?: number;
 
@@ -74432,14 +71194,12 @@ interface IgRating {
 	 * Gets/Sets selector for css classes.
 	 * That option allows replacing all default css styles by custom values.
 	 * Application should provide css classes for all members defined in the css options with "theme" selector.
-	 *
 	 */
 	theme?: string;
 
 	/**
 	 * Gets/Sets object which contains options supported by igValidator.
 	 * Note that for onblur validation depends on the [focusable](ui.igrating#options:focusable) option.
-	 *
 	 */
 	validatorOptions?: any;
 
@@ -74455,7 +71215,6 @@ interface IgRating {
 	 * will customize only second vote with [normalCss](ui.igrating#theming:ui-igrating ui-state-default ui-widget-content) for normal state, [hoverCss](ui.igrating#theming:ui-igrating-hover ui-state-hover) for hover state and [selectedCss](ui.igrating#theming:ui-igrating-voteselected) for selected state.
 	 * [[null, 's1', 'h1'], [null, 's2', 'h2'], [null, 's3', 'h3']]
 	 * will customize selected and hover states for first 3 votes with classes h# and s#.
-	 *
 	 */
 	cssVotes?: any;
 
@@ -74544,7 +71303,6 @@ interface JQuery {
 	/**
 	 * Gets a vertical or horizontal orientation for the votes.
 	 * Change of that option is not supported after igRating was created.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "vertical"): boolean;
 
@@ -74552,14 +71310,12 @@ interface JQuery {
 	 * A vertical or horizontal orientation for the votes.
 	 * Change of that option is not supported after igRating was created.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "vertical", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets value (selected votes or percent). If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the value is used as number of selected votes or as a percent of the votes.
-	 *
 	 */
 
 	igRating(optionLiteral: 'option', optionName: "value"): number|string;
@@ -74567,7 +71323,6 @@ interface JQuery {
 	/**
 	 * /Sets value (selected votes or percent). If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the value is used as number of selected votes or as a percent of the votes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -74575,7 +71330,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value-hover (hovered votes or percent of hovered votes). The default is same as value. If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the valueHover is used as number of hovered votes or as a percent of the hovered votes.
-	 *
 	 */
 
 	igRating(optionLiteral: 'option', optionName: "valueHover"): number|string;
@@ -74583,7 +71337,6 @@ interface JQuery {
 	/**
 	 * /Sets value-hover (hovered votes or percent of hovered votes). The default is same as value. If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the valueHover is used as number of hovered votes or as a percent of the hovered votes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -74591,42 +71344,36 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets number of votes.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteCount"): number;
 
 	/**
 	 * /Sets number of votes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets custom width of a vote in pixels. In case of 0 the run time style value is used.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteWidth"): number;
 
 	/**
 	 * /Sets custom width of a vote in pixels. In case of 0 the run time style value is used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets custom height of a vote in pixels. In case of 0 the run time style value is used.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteHeight"): number;
 
 	/**
 	 * /Sets custom height of a vote in pixels. In case of 0 the run time style value is used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteHeight", optionValue: number): void;
@@ -74635,7 +71382,6 @@ interface JQuery {
 	 * Gets the direction of selected and hovered votes. Change of that option is not supported after igRating was created.
 	 * Value true: from left to right or from top to bottom.
 	 * Value false: from right to left or from bottom to left.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "swapDirection"): boolean;
 
@@ -74644,7 +71390,6 @@ interface JQuery {
 	 * Value true: from left to right or from top to bottom.
 	 * Value false: from right to left or from bottom to left.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "swapDirection", optionValue: boolean): void;
@@ -74653,7 +71398,6 @@ interface JQuery {
 	 * Gets/Sets percent or vote number to measure value and value-hover.
 	 * Value true: value is measured as percent (from 0 to 1).
 	 * Value false: value is measured in number of voted (from 0 to voteCount)
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "valueAsPercent"): boolean;
 
@@ -74662,7 +71406,6 @@ interface JQuery {
 	 * Value true: value is measured as percent (from 0 to 1).
 	 * Value false: value is measured in number of voted (from 0 to voteCount)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "valueAsPercent", optionValue: boolean): void;
@@ -74671,7 +71414,6 @@ interface JQuery {
 	 * Gets if igRating can have focus. Change of that option is not supported after igRating was created.
 	 * Value true: can get focus and process key events.
 	 * Value false: cannot get focus.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "focusable"): boolean;
 
@@ -74680,14 +71422,12 @@ interface JQuery {
 	 * Value true: can get focus and process key events.
 	 * Value false: cannot get focus.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "focusable", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets precision. Precision of value and valueHover.
-	 *
 	 */
 
 	igRating(optionLiteral: 'option', optionName: "precision"): string;
@@ -74695,7 +71435,6 @@ interface JQuery {
 	/**
 	 * /Sets precision. Precision of value and valueHover.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -74706,7 +71445,6 @@ interface JQuery {
 	 * It has effect only when precision is set to "half" or "whole".
 	 * If user clicks between edge of the first vote and (sizeOfVote * precisionZeroVote), then value is set to 0.
 	 * Same is applied for mouseover as well.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "precisionZeroVote"): number;
 
@@ -74716,7 +71454,6 @@ interface JQuery {
 	 * If user clicks between edge of the first vote and (sizeOfVote * precisionZeroVote), then value is set to 0.
 	 * Same is applied for mouseover as well.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "precisionZeroVote", optionValue: number): void;
@@ -74728,7 +71465,6 @@ interface JQuery {
 	 * If precision is "whole" or "half" and roundedDecimalPlaces is set in range of 0..2, then 3 is used.
 	 * If valueAsPercent is enabled and roundedDecimalPlaces is set to 0, then 1 is used.
 	 * If it is larger than 15, then 15 is used.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "roundedDecimalPlaces"): number;
 
@@ -74740,7 +71476,6 @@ interface JQuery {
 	 * If valueAsPercent is enabled and roundedDecimalPlaces is set to 0, then 1 is used.
 	 * If it is larger than 15, then 15 is used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "roundedDecimalPlaces", optionValue: number): void;
@@ -74749,7 +71484,6 @@ interface JQuery {
 	 * Gets/Sets selector for css classes.
 	 * That option allows replacing all default css styles by custom values.
 	 * Application should provide css classes for all members defined in the css options with "theme" selector.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "theme"): string;
 
@@ -74758,7 +71492,6 @@ interface JQuery {
 	 * That option allows replacing all default css styles by custom values.
 	 * Application should provide css classes for all members defined in the css options with "theme" selector.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "theme", optionValue: string): void;
@@ -74766,7 +71499,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets object which contains options supported by igValidator.
 	 * Note that for onblur validation depends on the [focusable](ui.igrating#options:focusable) option.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -74774,7 +71506,6 @@ interface JQuery {
 	 * /Sets object which contains options supported by igValidator.
 	 * Note that for onblur validation depends on the [focusable](ui.igrating#options:focusable) option.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
@@ -74791,7 +71522,6 @@ interface JQuery {
 	 * will customize only second vote with [normalCss](ui.igrating#theming:ui-igrating ui-state-default ui-widget-content) for normal state, [hoverCss](ui.igrating#theming:ui-igrating-hover ui-state-hover) for hover state and [selectedCss](ui.igrating#theming:ui-igrating-voteselected) for selected state.
 	 * [[null, 's1', 'h1'], [null, 's2', 'h2'], [null, 's3', 'h3']]
 	 * will customize selected and hover states for first 3 votes with classes h# and s#.
-	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "cssVotes"): any;
 
@@ -74808,7 +71538,6 @@ interface JQuery {
 	 * [[null, 's1', 'h1'], [null, 's2', 'h2'], [null, 's3', 'h3']]
 	 * will customize selected and hover states for first 3 votes with classes h# and s#.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "cssVotes", optionValue: any): void;
@@ -74865,7 +71594,6 @@ interface JQuery {
 interface IgSchedulerAgendaViewSettings {
 	/**
 	 * Gets/Sets the number of days shown in AgendaView mode.
-	 *
 	 */
 	dateRangeInterval?: number;
 
@@ -74887,7 +71615,6 @@ interface IgSchedulerMonthViewSettings {
 
 	/**
 	 * Gets/Sets the visibility of an AgendaView in a MonthView.  When true, the MonthView will display an AgendaView showing the Appointments for the currently selected day at the top of its list of Appointments.
-	 *
 	 */
 	isAgendaVisible?: boolean;
 
@@ -74910,37 +71637,31 @@ interface IgSchedulerMonthViewSettings {
 
 	/**
 	 * Gets/sets the visibility of the horizontal separators between weeks in the MonthView.
-	 *
 	 */
 	isHorizontalSeparatorVisibile?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the vertical separators between days of the week in a MonthView.
-	 *
 	 */
 	isVerticalSeparatorVisibile?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the weekday names in MonthView.
-	 *
 	 */
 	isWeekdayVisible?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the week numbers in a MonthView.
-	 *
 	 */
 	isWeekNumberVisible?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the days from the previous month that occur in the first week of a given month.
-	 *
 	 */
 	isPreviousMonthShown?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the days from the next month that occur in the last week of a given month.
-	 *
 	 */
 	isNextMonthShown?: boolean;
 
@@ -75275,14 +71996,12 @@ interface AppointmentEditedEventUIParam {
 interface IgScheduler {
 	/**
 	 * Lists of all the views, rendered in the Scheduler.
-	 *
 	 */
 	views?: any[];
 
 	/**
 	 * Gets/Sets current view mode in the Scheduler. If this options is not defined, then the first defined view in the views property is taken.
 	 *
-	 *
 	 * Valid values:
 	 * "monthView" Enables MonthView in the Scheduler.
 	 * "agendaView" Enables AgendaView in the Scheduler.
@@ -75291,14 +72010,12 @@ interface IgScheduler {
 
 	/**
 	 * Enables/Disables today button.
-	 *
 	 */
 	selectedDate?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -75307,7 +72024,6 @@ interface IgScheduler {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -75315,25 +72031,21 @@ interface IgScheduler {
 
 	/**
 	 * Gets/Sets AgendaView settings.
-	 *
 	 */
 	agendaViewSettings?: IgSchedulerAgendaViewSettings;
 
 	/**
 	 * Gets/Sets MonthView settings.
-	 *
 	 */
 	monthViewSettings?: IgSchedulerMonthViewSettings;
 
 	/**
 	 * Gets/Sets whether the appointment dialog and the related day and appointment popups should be shown.
-	 *
 	 */
 	appointmentDialogSuppress?: boolean;
 
 	/**
 	 * Gets/Sets dataSource of type $.ig.scheduler.ScheduleListDataSource.
-	 *
 	 */
 	dataSource?: any;
 
@@ -75440,15 +72152,11 @@ interface IgScheduler {
 interface IgSchedulerMethods {
 	/**
 	 * Gets reference to appointment by id
-	 *
-	 * @param id
 	 */
 	getAppointmentById(id: Object): Object;
 
 	/**
 	 * Creates a new appointment and renders it to the scheduler
-	 *
-	 * @param appointment
 	 */
 	createAppointment(appointment: Object): Object;
 
@@ -75517,21 +72225,18 @@ interface JQuery {
 
 	/**
 	 * Lists of all the views, rendered in the Scheduler.
-	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "views"): any[];
 
 	/**
 	 * Lists of all the views, rendered in the Scheduler.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "views", optionValue: any[]): void;
 
 	/**
 	 * Gets/Sets current view mode in the Scheduler. If this options is not defined, then the first defined view in the views property is taken.
-	 *
 	 */
 
 	igScheduler(optionLiteral: 'option', optionName: "viewMode"): string;
@@ -75539,7 +72244,6 @@ interface JQuery {
 	/**
 	 * /Sets current view mode in the Scheduler. If this options is not defined, then the first defined view in the views property is taken.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -75547,21 +72251,18 @@ interface JQuery {
 
 	/**
 	 * Enables/Disables today button.
-	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "selectedDate"): boolean;
 
 	/**
 	 * Enables/Disables today button.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "selectedDate", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
-	 *
 	 */
 
 	igScheduler(optionLiteral: 'option', optionName: "width"): string|number;
@@ -75569,7 +72270,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -75577,7 +72277,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
-	 *
 	 */
 
 	igScheduler(optionLiteral: 'option', optionName: "height"): string|number;
@@ -75585,7 +72284,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -75593,56 +72291,48 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets AgendaView settings.
-	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "agendaViewSettings"): IgSchedulerAgendaViewSettings;
 
 	/**
 	 * /Sets AgendaView settings.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "agendaViewSettings", optionValue: IgSchedulerAgendaViewSettings): void;
 
 	/**
 	 * Gets/Sets MonthView settings.
-	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "monthViewSettings"): IgSchedulerMonthViewSettings;
 
 	/**
 	 * /Sets MonthView settings.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "monthViewSettings", optionValue: IgSchedulerMonthViewSettings): void;
 
 	/**
 	 * Gets/Sets whether the appointment dialog and the related day and appointment popups should be shown.
-	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "appointmentDialogSuppress"): boolean;
 
 	/**
 	 * /Sets whether the appointment dialog and the related day and appointment popups should be shown.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "appointmentDialogSuppress", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets dataSource of type $.ig.scheduler.ScheduleListDataSource.
-	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * /Sets dataSource of type $.ig.scheduler.ScheduleListDataSource.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
@@ -76025,14 +72715,12 @@ interface ResizedEventUIParam {
 interface IgScroll {
 	/**
 	 * Sets or gets if the scrollbars should be always visible (on all environments). Otherwise it will be the default behavior. Note: this option is only for the custom scrollbars set through the scrollbarType option.
-	 *
 	 */
 	alwaysVisible?: boolean;
 
 	/**
 	 * Sets or gets what type of scrollbars should be using the igScroll (on all environments).
 	 *
-	 *
 	 * Valid values:
 	 * "custom" Custom scrollbars with custom ui and events.
 	 * "native" Native scrollbars
@@ -76042,145 +72730,121 @@ interface IgScroll {
 
 	/**
 	 * Sets or gets if igScroll can modify the DOM when it is initialized on certain element so that the content can be scrollable.
-	 *
 	 */
 	modifyDOM?: boolean;
 
 	/**
 	 * Sets custom value for how high is actually the content. Useful when wanting to scroll and update the shown content manually.
-	 *
 	 */
 	scrollHeight?: number;
 
 	/**
 	 * Sets custom value for what width is actually the content. Useful when wanting to scroll and update the shown content manually.
-	 *
 	 */
 	scrollWidth?: number;
 
 	/**
 	 * Sets gets current vertical position of the content.
-	 *
 	 */
 	scrollTop?: number;
 
 	/**
 	 * Sets gets current horizontal position of the content.
-	 *
 	 */
 	scrollLeft?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using mouse wheel
-	 *
 	 */
 	wheelStep?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar arrows
-	 *
 	 */
 	smallIncrementStep?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar track areas.
-	 *
 	 */
 	bigIncrementStep?: number;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using mouse wheel
-	 *
 	 */
 	smoothing?: boolean;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the smooth scrolling behavior.
-	 *
 	 */
 	smoothingStep?: number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the smooth scrolling behavior.
-	 *
 	 */
 	smoothingDuration?: number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on mobile devices
-	 *
 	 */
 	inertiaStep?: number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on mobile devices
-	 *
 	 */
 	inertiaDuration?: number;
 
 	/**
 	 * Sets gets how much pixels of toleration there will be when initially swiping horizontally. This is to improve swiping up/down without scrolling left/right when not intended due to small deviation left/right
-	 *
 	 */
 	swipeToleranceX?: number;
 
 	/**
 	 * Sets gets at least how many times the horizontal speed should be bigger so the inertia proceeds only horizontally without scrolling vertically. This is to improve interactions due to not perfectly swiping left/right with some deviation down/up
-	 *
 	 */
 	inertiaDeltaX?: number;
 
 	/**
 	 * Sets gets at least how many times the vertical speed should be bigger so the inertia proceeds only vertically without scrolling horizontally. This is to improve interactions due to not perfectly swiping down/up with some deviation left/right
-	 *
 	 */
 	inertiaDeltaY?: number;
 
 	/**
 	 * Sets gets elements that are linked to the main content horizontally. When the content is scrolled on X axis the linked elements scroll accordingly.
-	 *
 	 */
 	syncedElemsH?: any[];
 
 	/**
 	 * Sets gets elements that are linked to the main content vertically. When the content is scrolled on Y axis the linked elements scroll accordingly.
-	 *
 	 */
 	syncedElemsV?: any[];
 
 	/**
 	 * Sets gets html or jQuery element which is used for horizontal scrolling.
-	 *
 	 */
 	scrollbarH?: string;
 
 	/**
 	 * Sets gets html or jQuery element which is used for vertical scrolling.
-	 *
 	 */
 	scrollbarV?: string;
 
 	/**
 	 * Sets gets if only the linked horizontal scrollbar should be used for horizontal scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
-	 *
 	 */
 	scrollOnlyHBar?: boolean;
 
 	/**
 	 * Sets gets if only the linked vertical scrollbar should be used for vertical scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
-	 *
 	 */
 	scrollOnlyVBar?: boolean;
 
 	/**
 	 * Sets gets html or jQuery element to which the horizontal scrollbar will be appended to.
-	 *
 	 */
 	scrollbarHParent?: string;
 
 	/**
 	 * Sets gets html or jQuery element to which the vertical scrollbar will be appended to.
-	 *
 	 */
 	scrollbarVParent?: string;
 
@@ -76254,21 +72918,18 @@ interface JQuery {
 
 	/**
 	 * Sets or gets if the scrollbars should be always visible (on all environments). Otherwise it will be the default behavior. Note: this option is only for the custom scrollbars set through the scrollbarType option.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "alwaysVisible"): boolean;
 
 	/**
 	 * Sets or gets if the scrollbars should be always visible (on all environments). Otherwise it will be the default behavior. Note: this option is only for the custom scrollbars set through the scrollbarType option.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "alwaysVisible", optionValue: boolean): void;
 
 	/**
 	 * Sets or gets what type of scrollbars should be using the igScroll (on all environments).
-	 *
 	 */
 
 	igScroll(optionLiteral: 'option', optionName: "scrollbarType"): string;
@@ -76276,7 +72937,6 @@ interface JQuery {
 	/**
 	 * Sets or gets what type of scrollbars should be using the igScroll (on all environments).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -76284,336 +72944,288 @@ interface JQuery {
 
 	/**
 	 * Sets or gets if igScroll can modify the DOM when it is initialized on certain element so that the content can be scrollable.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "modifyDOM"): boolean;
 
 	/**
 	 * Sets or gets if igScroll can modify the DOM when it is initialized on certain element so that the content can be scrollable.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "modifyDOM", optionValue: boolean): void;
 
 	/**
 	 * Sets custom value for how high is actually the content. Useful when wanting to scroll and update the shown content manually.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollHeight"): number;
 
 	/**
 	 * Sets custom value for how high is actually the content. Useful when wanting to scroll and update the shown content manually.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollHeight", optionValue: number): void;
 
 	/**
 	 * Sets custom value for what width is actually the content. Useful when wanting to scroll and update the shown content manually.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollWidth"): number;
 
 	/**
 	 * Sets custom value for what width is actually the content. Useful when wanting to scroll and update the shown content manually.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollWidth", optionValue: number): void;
 
 	/**
 	 * Sets gets current vertical position of the content.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollTop"): number;
 
 	/**
 	 * Sets gets current vertical position of the content.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollTop", optionValue: number): void;
 
 	/**
 	 * Sets gets current horizontal position of the content.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollLeft"): number;
 
 	/**
 	 * Sets gets current horizontal position of the content.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollLeft", optionValue: number): void;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using mouse wheel
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "wheelStep"): number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using mouse wheel
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "wheelStep", optionValue: number): void;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar arrows
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smallIncrementStep"): number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar arrows
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smallIncrementStep", optionValue: number): void;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar track areas.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "bigIncrementStep"): number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar track areas.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "bigIncrementStep", optionValue: number): void;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using mouse wheel
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothing"): boolean;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using mouse wheel
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothing", optionValue: boolean): void;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the smooth scrolling behavior.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingStep"): number;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the smooth scrolling behavior.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingStep", optionValue: number): void;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the smooth scrolling behavior.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingDuration"): number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the smooth scrolling behavior.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingDuration", optionValue: number): void;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on mobile devices
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaStep"): number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on mobile devices
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaStep", optionValue: number): void;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on mobile devices
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDuration"): number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on mobile devices
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDuration", optionValue: number): void;
 
 	/**
 	 * Sets gets how much pixels of toleration there will be when initially swiping horizontally. This is to improve swiping up/down without scrolling left/right when not intended due to small deviation left/right
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "swipeToleranceX"): number;
 
 	/**
 	 * Sets gets how much pixels of toleration there will be when initially swiping horizontally. This is to improve swiping up/down without scrolling left/right when not intended due to small deviation left/right
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "swipeToleranceX", optionValue: number): void;
 
 	/**
 	 * Sets gets at least how many times the horizontal speed should be bigger so the inertia proceeds only horizontally without scrolling vertically. This is to improve interactions due to not perfectly swiping left/right with some deviation down/up
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaX"): number;
 
 	/**
 	 * Sets gets at least how many times the horizontal speed should be bigger so the inertia proceeds only horizontally without scrolling vertically. This is to improve interactions due to not perfectly swiping left/right with some deviation down/up
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaX", optionValue: number): void;
 
 	/**
 	 * Sets gets at least how many times the vertical speed should be bigger so the inertia proceeds only vertically without scrolling horizontally. This is to improve interactions due to not perfectly swiping down/up with some deviation left/right
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaY"): number;
 
 	/**
 	 * Sets gets at least how many times the vertical speed should be bigger so the inertia proceeds only vertically without scrolling horizontally. This is to improve interactions due to not perfectly swiping down/up with some deviation left/right
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaY", optionValue: number): void;
 
 	/**
 	 * Sets gets elements that are linked to the main content horizontally. When the content is scrolled on X axis the linked elements scroll accordingly.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsH"): any[];
 
 	/**
 	 * Sets gets elements that are linked to the main content horizontally. When the content is scrolled on X axis the linked elements scroll accordingly.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsH", optionValue: any[]): void;
 
 	/**
 	 * Sets gets elements that are linked to the main content vertically. When the content is scrolled on Y axis the linked elements scroll accordingly.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsV"): any[];
 
 	/**
 	 * Sets gets elements that are linked to the main content vertically. When the content is scrolled on Y axis the linked elements scroll accordingly.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsV", optionValue: any[]): void;
 
 	/**
 	 * Sets gets html or jQuery element which is used for horizontal scrolling.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarH"): string;
 
 	/**
 	 * Sets gets html or jQuery element which is used for horizontal scrolling.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarH", optionValue: string): void;
 
 	/**
 	 * Sets gets html or jQuery element which is used for vertical scrolling.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarV"): string;
 
 	/**
 	 * Sets gets html or jQuery element which is used for vertical scrolling.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarV", optionValue: string): void;
 
 	/**
 	 * Sets gets if only the linked horizontal scrollbar should be used for horizontal scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyHBar"): boolean;
 
 	/**
 	 * Sets gets if only the linked horizontal scrollbar should be used for horizontal scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyHBar", optionValue: boolean): void;
 
 	/**
 	 * Sets gets if only the linked vertical scrollbar should be used for vertical scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyVBar"): boolean;
 
 	/**
 	 * Sets gets if only the linked vertical scrollbar should be used for vertical scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyVBar", optionValue: boolean): void;
 
 	/**
 	 * Sets gets html or jQuery element to which the horizontal scrollbar will be appended to.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarHParent"): string;
 
 	/**
 	 * Sets gets html or jQuery element to which the horizontal scrollbar will be appended to.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarHParent", optionValue: string): void;
 
 	/**
 	 * Sets gets html or jQuery element to which the vertical scrollbar will be appended to.
-	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarVParent"): string;
 
 	/**
 	 * Sets gets html or jQuery element to which the vertical scrollbar will be appended to.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarVParent", optionValue: string): void;
@@ -78683,19 +75295,16 @@ interface IgSplitButtonItem {
 interface IgSplitButton {
 	/**
 	 * Button items.
-	 *
 	 */
 	items?: IgSplitButtonItem[];
 
 	/**
 	 * Default button item name.
-	 *
 	 */
 	defaultItemName?: string;
 
 	/**
 	 * Specifies whether the default button will be switched when another button is selected.
-	 *
 	 */
 	swapDefaultEnabled?: boolean;
 
@@ -78793,42 +75402,36 @@ interface JQuery {
 
 	/**
 	 * Button items.
-	 *
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "items"): IgSplitButtonItem[];
 
 	/**
 	 * Button items.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "items", optionValue: IgSplitButtonItem[]): void;
 
 	/**
 	 * Default button item name.
-	 *
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "defaultItemName"): string;
 
 	/**
 	 * Default button item name.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "defaultItemName", optionValue: string): void;
 
 	/**
 	 * Gets whether the default button will be switched when another button is selected.
-	 *
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled"): boolean;
 
 	/**
 	 * Sets whether the default button will be switched when another button is selected.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled", optionValue: boolean): void;
@@ -78931,37 +75534,31 @@ interface JQuery {
 interface IgSplitterPanel {
 	/**
 	 * Gets the size of the panel
-	 *
 	 */
 	size?: string|number;
 
 	/**
 	 * Gets the minimum size that the panel can have
-	 *
 	 */
 	min?: string|number;
 
 	/**
 	 * Gets the maximum size that the panel can have
-	 *
 	 */
 	max?: string|number;
 
 	/**
 	 * Gets whether the panel can be resized
-	 *
 	 */
 	resizable?: boolean;
 
 	/**
 	 * Gets whether the panel is initially collapsed
-	 *
 	 */
 	collapsed?: boolean;
 
 	/**
 	 * Gets whether the panel can be collapsed
-	 *
 	 */
 	collapsible?: boolean;
 
@@ -79019,7 +75616,6 @@ interface IgSplitter {
 	/**
 	 * Gets/Sets the width of the container.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -79028,7 +75624,6 @@ interface IgSplitter {
 	/**
 	 * Gets/Sets the height of the container.
 	 *
-	 *
 	 * Valid values:
 	 * "null" will fit the tree inside its parent container, if no other widths are defined.
 	 */
@@ -79037,7 +75632,6 @@ interface IgSplitter {
 	/**
 	 * Specifies the orientation of the splitter.
 	 *
-	 *
 	 * Valid values:
 	 * "vertical"
 	 * "horizontal"
@@ -79046,19 +75640,16 @@ interface IgSplitter {
 
 	/**
 	 * Array of objects options that specify the panels settings. The panels are no more than two. Settings are specified via enumeration.
-	 *
 	 */
 	panels?: IgSplitterPanel[];
 
 	/**
 	 * Specifies drag delta of the split bar. In order to start dragging "move", the mouse has to be moved specific distance from its original position.
-	 *
 	 */
 	dragDelta?: number;
 
 	/**
 	 * Specifies whether the other splitters on the page will be resized as this splitter resizes.
-	 *
 	 */
 	resizeOtherSplitters?: boolean;
 
@@ -79196,7 +75787,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the container.
-	 *
 	 */
 
 	igSplitter(optionLiteral: 'option', optionName: "width"): string|number;
@@ -79204,7 +75794,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -79212,7 +75801,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the container.
-	 *
 	 */
 
 	igSplitter(optionLiteral: 'option', optionName: "height"): string|number;
@@ -79220,7 +75808,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -79228,7 +75815,6 @@ interface JQuery {
 
 	/**
 	 * Gets the orientation of the splitter.
-	 *
 	 */
 
 	igSplitter(optionLiteral: 'option', optionName: "orientation"): string;
@@ -79236,7 +75822,6 @@ interface JQuery {
 	/**
 	 * Sets the orientation of the splitter.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -79244,42 +75829,36 @@ interface JQuery {
 
 	/**
 	 * Array of objects options that specify the panels settings. The panels are no more than two. Settings are specified via enumeration.
-	 *
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "panels"): IgSplitterPanel[];
 
 	/**
 	 * Array of objects options that specify the panels settings. The panels are no more than two. Settings are specified via enumeration.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "panels", optionValue: IgSplitterPanel[]): void;
 
 	/**
 	 * Gets drag delta of the split bar. In order to start dragging "move", the mouse has to be moved specific distance from its original position.
-	 *
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "dragDelta"): number;
 
 	/**
 	 * Sets drag delta of the split bar. In order to start dragging "move", the mouse has to be moved specific distance from its original position.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "dragDelta", optionValue: number): void;
 
 	/**
 	 * Gets whether the other splitters on the page will be resized as this splitter resizes.
-	 *
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "resizeOtherSplitters"): boolean;
 
 	/**
 	 * Sets whether the other splitters on the page will be resized as this splitter resizes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "resizeOtherSplitters", optionValue: boolean): void;
@@ -79674,7 +76253,6 @@ interface IgSpreadsheet {
 	/**
 	 * The width of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) and percentage (%).
 	 * "number" The widget width can be set as a number
@@ -79684,7 +76262,6 @@ interface IgSpreadsheet {
 	/**
 	 * The height of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -79693,7 +76270,6 @@ interface IgSpreadsheet {
 
 	/**
 	 * Returns or sets the A1 format address of the current active cell within the selected worksheet.
-	 *
 	 */
 	activeCell?: string;
 
@@ -79703,37 +76279,31 @@ interface IgSpreadsheet {
 	 * if an arrow key is pressed while the scroll lock is enabled the cell area will be scrolled rather than changing
 	 * the active cell. Note: This property is not maintained/changed by the control. It is just queried when
 	 * performing actions that consider whether the scroll lock is enabled.
-	 *
 	 */
 	isScrollLocked?: boolean;
 
 	/**
 	 * Returns or sets the Worksheet from the workbook whose content should be displayed within the control.
-	 *
 	 */
 	activeWorksheet?: any;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows adding worksheets.
-	 *
 	 */
 	allowAddWorksheet?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows deleting worksheets.
-	 *
 	 */
 	allowDeleteWorksheet?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the grid lines are displayed in the selected worksheets.
-	 *
 	 */
 	areGridlinesVisible?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the row and column headers are displayed for the selected worksheets.
-	 *
 	 */
 	areHeadersVisible?: boolean;
 
@@ -79741,7 +76311,6 @@ interface IgSpreadsheet {
 	 * Returns or sets an enumeration indicating the direction of the cell adjacent to the activeCell that should be activated when the enter key is pressed.This property is only used if the isEnterKeyNavigationEnabled is set to true. Also, the reverse direction is
 	 * navigated when Shift + Enter are pressed.
 	 *
-	 *
 	 * Valid values:
 	 * "down" The cell below should be activated.
 	 * "right" The cell to the right should be activated
@@ -79752,25 +76321,21 @@ interface IgSpreadsheet {
 
 	/**
 	 * Returns or sets the number of decimal places by which a whole number typed in during edit mode should be adjusted when isFixedDecimalEnabled is true
-	 *
 	 */
 	fixedDecimalPlaceCount?: number;
 
 	/**
 	 * Returns or sets a boolean indicating whether the adjacent cell indicated by the enterKeyNavigationDirection should be navigated to when the enter key is pressed.
-	 *
 	 */
 	isEnterKeyNavigationEnabled?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether a fixed decimal place is automatically added when a whole number is entered while in edit mode.
-	 *
 	 */
 	isFixedDecimalEnabled?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the formula bar is displayed within the Spreadsheet.
-	 *
 	 */
 	isFormulaBarVisible?: boolean;
 
@@ -79780,26 +76345,22 @@ interface IgSpreadsheet {
 	 * end mode and one presses the right arrow, the activeCell will be changed to be the first cell to the right of the current ActiveCell
 	 * that has a value (even if the value is ""). If there were no cells to the right with a value then it would activate the right most cell in that row. End
 	 * mode will end automatically such as when one presses an arrow key.
-	 *
 	 */
 	isInEndMode?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether undo is enabled for the control.
-	 *
 	 */
 	isUndoEnabled?: boolean;
 
 	/**
 	 * Returns or sets the width of the name box within the formula bar.
-	 *
 	 */
 	nameBoxWidth?: number;
 
 	/**
 	 * Returns or sets a value indicating how the selection is updated when interacting with the cells via the mouse or keyboard.
 	 *
-	 *
 	 * Valid values:
 	 * "normal" The selection is replaced when dragging the mouse to select a cell or range of cells. Similarly when navigating via the keyboard a new selection is created. One may add a new range by holding the Ctrl key and using the mouse and one may alter the selection range containing the active cell by holding the Shift key down while clicking with the mouse or navigating with the keyboard such as with the arrow keys.
 	 * "extendSelection" The selection range in the cellRanges representing the active cell is updated as one uses the mouse to select a cell or navigating via the keyboard.
@@ -79809,7 +76370,6 @@ interface IgSpreadsheet {
 
 	/**
 	 * Type="ig.excel.Worksheet[]" Returns or sets an array of the Worksheets whose tabs are selected.
-	 *
 	 */
 	selectedWorksheets?: any;
 
@@ -79822,31 +76382,26 @@ interface IgSpreadsheet {
 
 	/**
 	 * Returns or sets the workbook whose information is displayed in the control.
-	 *
 	 */
 	workbook?: any;
 
 	/**
 	 * Returns or sets the magnification of the selected worksheets.
-	 *
 	 */
 	zoomLevel?: number;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -80027,7 +76582,6 @@ interface JQuery {
 
 	/**
 	 * The width of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "width"): string|number;
@@ -80035,7 +76589,6 @@ interface JQuery {
 	/**
 	 * The width of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80043,7 +76596,6 @@ interface JQuery {
 
 	/**
 	 * The height of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "height"): string|number;
@@ -80051,7 +76603,6 @@ interface JQuery {
 	/**
 	 * The height of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80059,14 +76610,12 @@ interface JQuery {
 
 	/**
 	 * Returns  the A1 format address of the current active cell within the selected worksheet.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeCell"): string;
 
 	/**
 	 * Returns or sets the A1 format address of the current active cell within the selected worksheet.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeCell", optionValue: string): void;
@@ -80077,7 +76626,6 @@ interface JQuery {
 	 * if an arrow key is pressed while the scroll lock is enabled the cell area will be scrolled rather than changing
 	 * the active cell. Note: This property is not maintained/changed by the control. It is just queried when
 	 * performing actions that consider whether the scroll lock is enabled.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isScrollLocked"): boolean;
 
@@ -80088,77 +76636,66 @@ interface JQuery {
 	 * the active cell. Note: This property is not maintained/changed by the control. It is just queried when
 	 * performing actions that consider whether the scroll lock is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isScrollLocked", optionValue: boolean): void;
 
 	/**
 	 * Returns  the Worksheet from the workbook whose content should be displayed within the control.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeWorksheet"): any;
 
 	/**
 	 * Returns or sets the Worksheet from the workbook whose content should be displayed within the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeWorksheet", optionValue: any): void;
 
 	/**
 	 * Returns  a boolean indicating whether the spreadsheet allows adding worksheets.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowAddWorksheet"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows adding worksheets.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowAddWorksheet", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating whether the spreadsheet allows deleting worksheets.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowDeleteWorksheet"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows deleting worksheets.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowDeleteWorksheet", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating if the grid lines are displayed in the selected worksheets.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areGridlinesVisible"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the grid lines are displayed in the selected worksheets.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areGridlinesVisible", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating if the row and column headers are displayed for the selected worksheets.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areHeadersVisible"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the row and column headers are displayed for the selected worksheets.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areHeadersVisible", optionValue: boolean): void;
@@ -80166,7 +76703,6 @@ interface JQuery {
 	/**
 	 * Returns  an enumeration indicating the direction of the cell adjacent to the activeCell that should be activated when the enter key is pressed.This property is only used if the isEnterKeyNavigationEnabled is set to true. Also, the reverse direction is
 	 * navigated when Shift + Enter are pressed.
-	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "enterKeyNavigationDirection"): string;
@@ -80175,7 +76711,6 @@ interface JQuery {
 	 * Returns or sets an enumeration indicating the direction of the cell adjacent to the activeCell that should be activated when the enter key is pressed.This property is only used if the isEnterKeyNavigationEnabled is set to true. Also, the reverse direction is
 	 * navigated when Shift + Enter are pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80183,56 +76718,48 @@ interface JQuery {
 
 	/**
 	 * Returns  the number of decimal places by which a whole number typed in during edit mode should be adjusted when isFixedDecimalEnabled is true
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "fixedDecimalPlaceCount"): number;
 
 	/**
 	 * Returns or sets the number of decimal places by which a whole number typed in during edit mode should be adjusted when isFixedDecimalEnabled is true
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "fixedDecimalPlaceCount", optionValue: number): void;
 
 	/**
 	 * Returns  a boolean indicating whether the adjacent cell indicated by the enterKeyNavigationDirection should be navigated to when the enter key is pressed.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isEnterKeyNavigationEnabled"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the adjacent cell indicated by the enterKeyNavigationDirection should be navigated to when the enter key is pressed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isEnterKeyNavigationEnabled", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating whether a fixed decimal place is automatically added when a whole number is entered while in edit mode.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFixedDecimalEnabled"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether a fixed decimal place is automatically added when a whole number is entered while in edit mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFixedDecimalEnabled", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating if the formula bar is displayed within the Spreadsheet.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFormulaBarVisible"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the formula bar is displayed within the Spreadsheet.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFormulaBarVisible", optionValue: boolean): void;
@@ -80243,7 +76770,6 @@ interface JQuery {
 	 * end mode and one presses the right arrow, the activeCell will be changed to be the first cell to the right of the current ActiveCell
 	 * that has a value (even if the value is ""). If there were no cells to the right with a value then it would activate the right most cell in that row. End
 	 * mode will end automatically such as when one presses an arrow key.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isInEndMode"): boolean;
 
@@ -80254,42 +76780,36 @@ interface JQuery {
 	 * that has a value (even if the value is ""). If there were no cells to the right with a value then it would activate the right most cell in that row. End
 	 * mode will end automatically such as when one presses an arrow key.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isInEndMode", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating whether undo is enabled for the control.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isUndoEnabled"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether undo is enabled for the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isUndoEnabled", optionValue: boolean): void;
 
 	/**
 	 * Returns  the width of the name box within the formula bar.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "nameBoxWidth"): number;
 
 	/**
 	 * Returns or sets the width of the name box within the formula bar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "nameBoxWidth", optionValue: number): void;
 
 	/**
 	 * Returns  a value indicating how the selection is updated when interacting with the cells via the mouse or keyboard.
-	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "selectionMode"): string;
@@ -80297,7 +76817,6 @@ interface JQuery {
 	/**
 	 * Returns or sets a value indicating how the selection is updated when interacting with the cells via the mouse or keyboard.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80305,14 +76824,12 @@ interface JQuery {
 
 	/**
 	 * Type="ig.excel.Worksheet[]" Returns  an array of the Worksheets whose tabs are selected.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "selectedWorksheets"): any;
 
 	/**
 	 * Type="ig.excel.Worksheet[]" Returns or sets an array of the Worksheets whose tabs are selected.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "selectedWorksheets", optionValue: any): void;
@@ -80335,63 +76852,54 @@ interface JQuery {
 
 	/**
 	 * Returns  the workbook whose information is displayed in the control.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "workbook"): any;
 
 	/**
 	 * Returns or sets the workbook whose information is displayed in the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "workbook", optionValue: any): void;
 
 	/**
 	 * Returns  the magnification of the selected worksheets.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "zoomLevel"): number;
 
 	/**
 	 * Returns or sets the magnification of the selected worksheets.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "zoomLevel", optionValue: number): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -80399,7 +76907,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80634,25 +77141,21 @@ interface IgTileManagerSplitterOptionsEvents {
 interface IgTileManagerSplitterOptions {
 	/**
 	 * Gets/Sets whether the splitter should be enabled.
-	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Gets whether the splitter can be collapsible.
-	 *
 	 */
 	collapsible?: boolean;
 
 	/**
 	 * Gets whether the splitter should be initially collapsed.
-	 *
 	 */
 	collapsed?: boolean;
 
 	/**
 	 * Gets/Sets splitter events.
-	 *
 	 */
 	events?: IgTileManagerSplitterOptionsEvents;
 
@@ -80770,7 +77273,6 @@ interface TileMinimizedEventUIParam {
 
 interface IgTileManager {
 	/**
-	 *
 	 *
 	 * Valid values:
 	 * "string" The container width can be set in pixels (px) and percentage (%).
@@ -80781,7 +77283,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the height of the container.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The height width can be set in pixels (px) and percentage (%).
 	 * "number" The height width can be set as a number in pixels.
@@ -80792,7 +77293,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the width of each column in the container.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The column width can be set in pixels (px), percentage (%) or asterisk (*) which will distribute all the width between all the columns equally.
 	 * "number" The column width can be set as a number representing value in pixels.
@@ -80804,7 +77304,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the height of each column in the container.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The column height can be set in pixels (px), percentage (%) or asterisk (*) which will distribute all the height between all the columns equally.
 	 * "number" The column height can be set as a number representing value in pixels.
@@ -80816,7 +77315,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the columns count in the container.
 	 *
-	 *
 	 * Valid values:
 	 * "null" The column count will be automatically calculated.
 	 * "number" The column count can be set as a number.
@@ -80826,7 +77324,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the rows count in the container.
 	 *
-	 *
 	 * Valid values:
 	 * "number" The row count can be set as a number.
 	 * "null" The row count will be automatically calculated.
@@ -80849,14 +77346,12 @@ interface IgTileManager {
 
 	/**
 	 * Gets/Sets whether the items will rearrange when the container is resized.
-	 *
 	 */
 	rearrangeItems?: boolean;
 
 	/**
 	 * Gets/Sets the tiles configurations. Every tile is described by rowSpan, colSpan, rowIndex and colIndex.
 	 *
-	 *
 	 * Valid values:
 	 * "array" An array with colSpan, rowSpan, colIndex, rowIndex configurations for each tile.
 	 * "null" Default tile configurations of rowSpan: 1 and colSpan: 1 will be used.
@@ -80865,14 +77360,12 @@ interface IgTileManager {
 
 	/**
 	 * Specifies any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
-	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Gets/Sets the content of the tiles in minimized state.
 	 *
-	 *
 	 * Valid values:
 	 * "string" When initializing on html markup provide jQuery selector specifying what content of the tile to be shown in minimized state. When initializing on data source provide igTemplate that will be rendered for the minimized state.
 	 * "null" The whole content of the tile will be visible in minimized state.
@@ -80882,7 +77375,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the content of the tiles in maximized state.
 	 *
-	 *
 	 * Valid values:
 	 * "string" When initializing on html markup provide jQuery selector specifying which elements of the tile to be shown in maximized state. When initializing on data source provide igTemplate that will be rendered for the maximized state.
 	 * "null" The whole content of the tile will be visible in maximized state.
@@ -80892,7 +77384,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the index of which items configuration will be used for positioning and sizing of the maximized tile.
 	 *
-	 *
 	 * Valid values:
 	 * "number" The maximizedTileindex can be set as a number.
 	 * "null" Option is ignored.
@@ -80902,7 +77393,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets how many columns to be displayed in the right panel when the tiles are minimized.
 	 *
-	 *
 	 * Valid values:
 	 * "number" Set the number of right panel columns as a number. The minimum value is 1.
 	 * "null" Default of 1 column will be used.
@@ -80912,7 +77402,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the width of the minimized tiles in the right panel.
 	 *
-	 *
 	 * Valid values:
 	 * "number" Set the width of the minimized tiles as a number.
 	 * "null" Default value equal to the column width will be used.
@@ -80922,7 +77411,6 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the height of the minimized tiles in the right panel.
 	 *
-	 *
 	 * Valid values:
 	 * "number" Set the height of the minimized tiles as a number.
 	 * "null" Default value equal to the column height will be used.
@@ -80931,38 +77419,32 @@ interface IgTileManager {
 
 	/**
 	 * Gets/Sets whether the right panel should show scrollbar when tiles are overflowing.
-	 *
 	 */
 	showRightPanelScroll?: boolean;
 
 	/**
 	 * Configure the container variable representation, which defines splitter functionality.
-	 *
 	 */
 	splitterOptions?: IgTileManagerSplitterOptions;
 
 	/**
 	 * Gets/Sets JQuery selector that specifies which elements will not trigger maximizing when clicked on.
-	 *
 	 */
 	preventMaximizingSelector?: string;
 
 	/**
 	 * Gets/Sets the duration of the animations in the tile manager.
-	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Specifies a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
-	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped). See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey).
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specifies the name of the property in which data records are held if the response is wrapped.
 	 * "null" Option is ignored.
@@ -80972,7 +77454,6 @@ interface IgTileManager {
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource and its type property.
 	 * "null" Option is ignored.
@@ -80981,19 +77462,16 @@ interface IgTileManager {
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
-	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * Specifies the HTTP request method.
-	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Gets/Sets the HTTP content type for the response object. See [Perform an asynchronous HTTP (Ajax) request](http://api.jquery.com/jQuery.ajax/).
-	 *
 	 */
 	responseContentType?: string;
 
@@ -81194,7 +77672,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the container.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "height"): string|number;
@@ -81202,7 +77679,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81210,7 +77686,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of each column in the container.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "columnWidth"): string|number|Array<any>;
@@ -81218,7 +77693,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of each column in the container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81226,7 +77700,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of each column in the container.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "columnHeight"): string|number|Array<any>;
@@ -81234,7 +77707,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of each column in the container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81242,7 +77714,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the columns count in the container.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "cols"): number;
@@ -81250,7 +77721,6 @@ interface JQuery {
 	/**
 	 * /Sets the columns count in the container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81258,7 +77728,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the rows count in the container.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rows"): number;
@@ -81266,7 +77735,6 @@ interface JQuery {
 	/**
 	 * /Sets the rows count in the container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81306,21 +77774,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets whether the items will rearrange when the container is resized.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "rearrangeItems"): boolean;
 
 	/**
 	 * /Sets whether the items will rearrange when the container is resized.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "rearrangeItems", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the tiles configurations. Every tile is described by rowSpan, colSpan, rowIndex and colIndex.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "items"): Object;
@@ -81328,7 +77793,6 @@ interface JQuery {
 	/**
 	 * /Sets the tiles configurations. Every tile is described by rowSpan, colSpan, rowIndex and colIndex.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81336,21 +77800,18 @@ interface JQuery {
 
 	/**
 	 * Gets any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * Sets any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the content of the tiles in minimized state.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "minimizedState"): string;
@@ -81358,7 +77819,6 @@ interface JQuery {
 	/**
 	 * /Sets the content of the tiles in minimized state.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81366,7 +77826,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the content of the tiles in maximized state.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "maximizedState"): string;
@@ -81374,7 +77833,6 @@ interface JQuery {
 	/**
 	 * /Sets the content of the tiles in maximized state.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81382,7 +77840,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the index of which items configuration will be used for positioning and sizing of the maximized tile.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "maximizedTileIndex"): number;
@@ -81390,7 +77847,6 @@ interface JQuery {
 	/**
 	 * /Sets the index of which items configuration will be used for positioning and sizing of the maximized tile.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81398,7 +77854,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets how many columns to be displayed in the right panel when the tiles are minimized.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rightPanelCols"): number;
@@ -81406,7 +77861,6 @@ interface JQuery {
 	/**
 	 * /Sets how many columns to be displayed in the right panel when the tiles are minimized.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81414,7 +77868,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the minimized tiles in the right panel.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rightPanelTilesWidth"): number;
@@ -81422,7 +77875,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the minimized tiles in the right panel.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81430,7 +77882,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the minimized tiles in the right panel.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rightPanelTilesHeight"): number;
@@ -81438,7 +77889,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the minimized tiles in the right panel.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81446,77 +77896,66 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets whether the right panel should show scrollbar when tiles are overflowing.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "showRightPanelScroll"): boolean;
 
 	/**
 	 * /Sets whether the right panel should show scrollbar when tiles are overflowing.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "showRightPanelScroll", optionValue: boolean): void;
 
 	/**
 	 * Configure the container variable representation, which defines splitter functionality.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "splitterOptions"): IgTileManagerSplitterOptions;
 
 	/**
 	 * Configure the container variable representation, which defines splitter functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "splitterOptions", optionValue: IgTileManagerSplitterOptions): void;
 
 	/**
 	 * Gets/Sets JQuery selector that specifies which elements will not trigger maximizing when clicked on.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "preventMaximizingSelector"): string;
 
 	/**
 	 * /Sets JQuery selector that specifies which elements will not trigger maximizing when clicked on.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "preventMaximizingSelector", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the duration of the animations in the tile manager.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * /Sets the duration of the animations in the tile manager.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * Gets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped). See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey).
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "responseDataKey"): string;
@@ -81524,7 +77963,6 @@ interface JQuery {
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped). See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81532,7 +77970,6 @@ interface JQuery {
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
-	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "responseDataType"): string;
@@ -81540,7 +77977,6 @@ interface JQuery {
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81548,42 +77984,36 @@ interface JQuery {
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * Gets the HTTP request method.
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP request method.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the HTTP content type for the response object. See [Perform an asynchronous HTTP (Ajax) request](http://api.jquery.com/jQuery.ajax/).
-	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * /Sets the HTTP content type for the response object. See [Perform an asynchronous HTTP (Ajax) request](http://api.jquery.com/jQuery.ajax/).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
@@ -81804,13 +78234,11 @@ interface JQuery {
 interface IgToolbarLocale {
 	/**
 	 * Gets/Sets collapse button title.
-	 *
 	 */
 	collapseButtonTitle?: any;
 
 	/**
 	 * Gets/Sets expand button title.
-	 *
 	 */
 	expandButtonTitle?: any;
 
@@ -81877,55 +78305,46 @@ interface WindowResizedEventUIParam {}
 interface IgToolbar {
 	/**
 	 * Set/Get the widget height.
-	 *
 	 */
 	height?: any;
 
 	/**
 	 * Set/Get the widget width.
-	 *
 	 */
 	width?: any;
 
 	/**
 	 * Get/Set whether the toolbar can be collapsed.
-	 *
 	 */
 	allowCollapsing?: boolean;
 
 	/**
 	 * The css class that will be applied to collapseButtonIcon.
-	 *
 	 */
 	collapseButtonIcon?: string;
 
 	/**
 	 * The css class that will be applied to the expand/collapse button icon.
-	 *
 	 */
 	expandButtonIcon?: string;
 
 	/**
 	 * Formal name of the widget.
-	 *
 	 */
 	name?: string;
 
 	/**
 	 * Display Name of the widget.
-	 *
 	 */
 	displayName?: string;
 
 	/**
 	 * Get/Set Toolbar's items.
-	 *
 	 */
 	items?: any[];
 
 	/**
 	 * Get/Set whether the widget is expanded initially.
-	 *
 	 */
 	isExpanded?: boolean;
 	locale?: IgToolbarLocale;
@@ -82071,126 +78490,108 @@ interface JQuery {
 
 	/**
 	 * Set/Get the widget height.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "height"): any;
 
 	/**
 	 * Set/Get the widget height.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "height", optionValue: any): void;
 
 	/**
 	 * Set/Get the widget width.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "width"): any;
 
 	/**
 	 * Set/Get the widget width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "width", optionValue: any): void;
 
 	/**
 	 * Get/Set whether the toolbar can be collapsed.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "allowCollapsing"): boolean;
 
 	/**
 	 * Get/Set whether the toolbar can be collapsed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "allowCollapsing", optionValue: boolean): void;
 
 	/**
 	 * The css class that will be applied to collapseButtonIcon.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "collapseButtonIcon"): string;
 
 	/**
 	 * The css class that will be applied to collapseButtonIcon.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "collapseButtonIcon", optionValue: string): void;
 
 	/**
 	 * The css class that will be applied to the expand/collapse button icon.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "expandButtonIcon"): string;
 
 	/**
 	 * The css class that will be applied to the expand/collapse button icon.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "expandButtonIcon", optionValue: string): void;
 
 	/**
 	 * Formal name of the widget.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "name"): string;
 
 	/**
 	 * Formal name of the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "name", optionValue: string): void;
 
 	/**
 	 * Display Name of the widget.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "displayName"): string;
 
 	/**
 	 * Display Name of the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "displayName", optionValue: string): void;
 
 	/**
 	 * Get/Set Toolbar's items.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "items"): any[];
 
 	/**
 	 * Get/Set Toolbar's items.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "items", optionValue: any[]): void;
 
 	/**
 	 * Get/Set whether the widget is expanded initially.
-	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "isExpanded"): boolean;
 
 	/**
 	 * Get/Set whether the widget is expanded initially.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "isExpanded", optionValue: boolean): void;
@@ -82405,13 +78806,11 @@ interface DeactivatedEventUIParam {
 interface IgToolbarButton {
 	/**
 	 * Enable/Disable the "Toggling" of a button.
-	 *
 	 */
 	allowToggling?: boolean;
 
 	/**
 	 * Get/Set whether the toolbar button is selected.
-	 *
 	 */
 	isSelected?: boolean;
 
@@ -82456,15 +78855,11 @@ interface IgToolbarButtonMethods {
 
 	/**
 	 * Activate toolbar button
-	 *
-	 * @param event
 	 */
 	activate(event: Object): void;
 
 	/**
 	 * Deactivate toolbar button
-	 *
-	 * @param event
 	 */
 	deactivate(event: Object): void;
 
@@ -82491,28 +78886,24 @@ interface JQuery {
 
 	/**
 	 * Gets the "Toggling" of a button.
-	 *
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "allowToggling"): boolean;
 
 	/**
 	 * Enable/Disable the "Toggling" of a button.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "allowToggling", optionValue: boolean): void;
 
 	/**
 	 * Get/Set whether the toolbar button is selected.
-	 *
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "isSelected"): boolean;
 
 	/**
 	 * Get/Set whether the toolbar button is selected.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "isSelected", optionValue: boolean): void;
@@ -82596,63 +78987,53 @@ interface IgTreeBindingsBindings {
 interface IgTreeBindings {
 	/**
 	 * Gets the name of the data source property the value of which would be the node text.
-	 *
 	 */
 	textKey?: string;
 
 	/**
 	 * Gets the XPath to the text attribute/node. Used in client-only binding directly to XML.
-	 *
 	 */
 	textXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be the node value.
-	 *
 	 */
 	valueKey?: string;
 
 	/**
 	 * Gets the XPath to the value attribute/node. Used in client-only binding directly to XML.
-	 *
 	 */
 	valueXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be used as a URL for the node image.
-	 *
 	 */
 	imageUrlKey?: string;
 
 	/**
 	 * Gets the XPath to the image URL attribute/node. Used in client-only binding directly to XML.
-	 *
 	 */
 	imageUrlXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be used as an href attribute for the node anchor.
-	 *
 	 */
 	navigateUrlKey?: string;
 
 	/**
 	 * Gets the XPath to the navigate URL attribute/node. Used in client-only binding directly to XML.
-	 *
 	 */
 	navigateUrlXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be used as a target
 	 * attribute for the node anchor.
-	 *
 	 */
 	targetKey?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would hold the node`s
 	 * expanded state. The expanded state is represented by a boolean.
-	 *
 	 */
 	expandedKey?: string;
 
@@ -82660,7 +79041,6 @@ interface IgTreeBindings {
 	 * Gets the name of the data source property the value of which would hold the node's
 	 * check state. The check state itself is represented by a string enumeration with the
 	 * checked|partially checked|unchecked states being respectively "on|partial|off".
-	 *
 	 */
 	checkedKey?: string;
 
@@ -82668,38 +79048,32 @@ interface IgTreeBindings {
 	 * Gets the name of the data source property the value of which is the primary key attribute
 	 * for the data. This property is used when load on demand is enabled and if specified the node paths
 	 * would be generated using primary keys instead of indices.
-	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * Gets the node content template for the current layer of bindings. The igTree utilizes igTemplating
 	 * for generating node content templates. A good example of how to setup templating can be found here http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/06/17/how-to-use-templates-to-style-the-different-nodes-of-the-ignite-ui-tree-control.aspx
-	 *
 	 */
 	nodeContentTemplate?: string;
 
 	/**
 	 * Gets the name of the data source property that holds the child data of the current layer node.
-	 *
 	 */
 	childDataProperty?: string;
 
 	/**
 	 * Gets the XPath to the child data node. Used in client-only binding directly to XML.
-	 *
 	 */
 	childDataXPath?: string;
 
 	/**
 	 * Gets the XPath to the root data node. Used in client-only binding directly to XML.
-	 *
 	 */
 	searchFieldXPath?: string;
 
 	/**
 	 * Gets the next layer of bindings in a recursive fashion.
-	 *
 	 */
 	bindings?: IgTreeBindingsBindings;
 
@@ -82712,14 +79086,12 @@ interface IgTreeBindings {
 interface IgTreeDragAndDropSettings {
 	/**
 	 * Gets whether the widget will accept drag and drop from other controls.
-	 *
 	 */
 	allowDrop?: boolean;
 
 	/**
 	 * Gets the drag and drop mode.
 	 *
-	 *
 	 * Valid values:
 	 * "default" Performs "copy" when holding the Ctrl key, otherwise "move" is performed.
 	 * "copy" Makes a copy of the dragged node at the drop location.
@@ -82729,51 +79101,43 @@ interface IgTreeDragAndDropSettings {
 
 	/**
 	 * Gets the opacity of the drag helper: 0 is fully transparent while 1 is fully opaque.
-	 *
 	 */
 	dragOpacity?: number;
 
 	/**
 	 * Gets whether the helper would revert to its original position upon an invalid drop.
-	 *
 	 */
 	revert?: boolean;
 
 	/**
 	 * Gets the duration of the revert animation.
-	 *
 	 */
 	revertDuration?: number;
 
 	/**
 	 * Gets the z-index that would be set for the drag helper.
-	 *
 	 */
 	zIndex?: number;
 
 	/**
 	 * Gets the delay between mousedown and the start of the actual drag. Smaller values make the nodes
 	 * more sensitive to drag and may interfere with selection.
-	 *
 	 */
 	dragStartDelay?: number;
 
 	/**
 	 * Gets whether when dragging over a collapsed node with children will trigger the node to expand.
-	 *
 	 */
 	expandOnDragOver?: boolean;
 
 	/**
 	 * Gets the delay after hovering a parent node before expanding that node during drag when [expandOnDragOver](ui.igtree#options:dragAndDropSettings.expandOnDragOver) is set to true.
-	 *
 	 */
 	expandDelay?: number;
 
 	/**
 	 * Gets the type of helper to be rendered for the drag operation.
 	 *
-	 *
 	 * Valid values:
 	 * "function" A function that will return a DOMElement to use while dragging.
 	 * "default" would render the default igTree helper.
@@ -82783,7 +79147,6 @@ interface IgTreeDragAndDropSettings {
 	/**
 	 * Gets the method for custom drop point validation. Returning true from this function would render the drop point valid, while false would make it invalid. The function has one parameter which is the current drop point and the context (this) of the function is the drag element.
 	 *
-	 *
 	 * Valid values:
 	 * "function" A function that will be used for validating drop points.
 	 * "null" Only built-in validation is applied.
@@ -82793,7 +79156,6 @@ interface IgTreeDragAndDropSettings {
 	/**
 	 * Gets the containment for the drag helper. The area inside of which thehelper is contained would be scrollable while dragging.
 	 *
-	 *
 	 * Valid values:
 	 * "boolean" If set to false, then the draggable elements will be contained in their window.
 	 * "selector" The draggable element will be contained to the bounding box of the first element found by the selector. If no element is found, no containment will be set.
@@ -82805,55 +79167,46 @@ interface IgTreeDragAndDropSettings {
 
 	/**
 	 * Gets the HTML markup for the invalid helper.
-	 *
 	 */
 	invalidMoveToMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move to" helper.
-	 *
 	 */
 	moveToMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move between" helper.
-	 *
 	 */
 	moveBetweenMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move after" helper.
-	 *
 	 */
 	moveAfterMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move before" helper.
-	 *
 	 */
 	moveBeforeMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy to" helper.
-	 *
 	 */
 	copyToMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy between" helper.
-	 *
 	 */
 	copyBetweenMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy after" helper.
-	 *
 	 */
 	copyAfterMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy before" helper.
-	 *
 	 */
 	copyBeforeMarkup?: string;
 
@@ -83179,7 +79532,6 @@ interface IgTree {
 	/**
 	 * Gets/Sets the width of the control container.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) and percentage (%).
 	 * "number" The widget width can be set as a number in pixels.
@@ -83190,7 +79542,6 @@ interface IgTree {
 	/**
 	 * Gets/Sets how the height of of the control container.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number in pixels.
@@ -83201,7 +79552,6 @@ interface IgTree {
 	/**
 	 * Gets the behavior and type of the checkboxes rendered for the tree nodes. Can be set only at initialization.
 	 *
-	 *
 	 * Valid values:
 	 * "off" Checkboxes are turned off and are not rendered for the tree.
 	 * "biState" Checkboxes are rendered and support two states (checked and unchecked). Checkboxes do not cascade down or up in this mode.
@@ -83211,20 +79561,17 @@ interface IgTree {
 
 	/**
 	 * Gets/Sets one or more branches to be expanded at a time. If set to true then only one branch at each level of the tree can be expanded at a time. Otherwise multiple branches can be expanded at a time.
-	 *
 	 */
 	singleBranchExpand?: boolean;
 
 	/**
 	 * Gets/Sets whether nodes are hoverable. Setting this option to false would make the tree to not apply hover styles on the nodes when they are hovered.
-	 *
 	 */
 	hotTracking?: boolean;
 
 	/**
 	 * Gets/Sets the image url applied to all parent nodes.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Image with the specified URL will be rendered for each node that has children (If you define both parentNodeImageUrl and parentNodeImageClass the parentNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -83234,7 +79581,6 @@ interface IgTree {
 	/**
 	 * Gets/Sets the CSS class applied to all parent nodes.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specified class with a CSS sprite that would be rendered for each node that has children (If you define both parentNodeImageUrl and parentNodeImageClass the parentNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -83244,7 +79590,6 @@ interface IgTree {
 	/**
 	 * Gets/Sets the tooltip applied to all parent node images.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specified a tooltip that would be rendered for each node that has children.
 	 * "null" Option is ignored
@@ -83254,7 +79599,6 @@ interface IgTree {
 	/**
 	 * Gets/Sets the image url applied to all leaf nodes.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Image with the specified URL will be rendered for each node that has no children (If you define both leafNodeImageUrl and leafNodeImageClass the leafNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -83264,7 +79608,6 @@ interface IgTree {
 	/**
 	 * Gets/Sets the CSS class applied to all leaf nodes.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specified class with a CSS sprite that would be rendered for each node that has no children (If you define both leafNodeImageUrl and leafNodeImageClass the leafNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -83274,7 +79617,6 @@ interface IgTree {
 	/**
 	 * Gets/Sets the tooltip applied to all leaf node images.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specified a tooltip that would be rendered for each node that has no children.
 	 * "null" Option is ignored
@@ -83283,27 +79625,23 @@ interface IgTree {
 
 	/**
 	 * Gets/Sets the duration of each animation such as the expand/collapse.
-	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Gets the node data-path attribute separator character.
-	 *
 	 */
 	pathSeparator?: string;
 
 	/**
 	 * Gets/Sets the igTree data source. Accepts any valid data source accepted by $.ig.DataSource, or an instance of an $.ig.DataSource itself.
 	 * Once the data source is initialized, this option becomes an instance of the $.ig.HierarchicalDataSource.
-	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Gets/Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specifies the remote url.
 	 * "null" Option is ignored.
@@ -83313,7 +79651,6 @@ interface IgTree {
 	/**
 	 * Gets the type of the data source. Delegates the value to [$.ig.DataSource.settings.type](ig.datasource#options:settings.type). Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource.settings.type.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specifies the data source type implicitly.
 	 * "null" Type is inferred.
@@ -83323,7 +79660,6 @@ interface IgTree {
 	/**
 	 * Gets the JSON key at which a remote data source will write the data. Delegates the value to [$.ig.DataSource.settings.responseDataKey](ig.datasource#options:settings.responseDataKey). Please refer to the documentation of $.ig.DataSource.settings.responseDataKey.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specifies the name of the property in which data records are held if the response is wrapped.
 	 * "null" Option is ignored.
@@ -83333,7 +79669,6 @@ interface IgTree {
 	/**
 	 * Gets the data type of the remote data source response. Delegates the value to [$.ig.DataSource.settings.responseDataType](ig.datasource#options:settings.responseDataType). Please refer to the documentation of $.ig.DataSource.settings.responseDataType.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
 	 * "null" Type is inferred.
@@ -83342,55 +79677,46 @@ interface IgTree {
 
 	/**
 	 * Gets the HTTP verb used for remote requests. Specifies the HTTP verb to be used to issue the requests to the [dataSourceUrl](ui.igtree#options:dataSourceUrl).
-	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Gets the type of the content in a remote data source response. Content type of the response from the [dataSourceUrl](ui.igtree#options:dataSourceUrl). See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Gets the initial depth the igTree is going to be expanded to upon initial render.
-	 *
 	 */
 	initialExpandDepth?: number;
 
 	/**
 	 * Gets whether all the data would be bound initially or each child collection would be bound upon expand.
-	 *
 	 */
 	loadOnDemand?: boolean;
 
 	/**
 	 * Gets the data binding properties and keys. The igTree uses these to extract the corresponding data from the dataSource.
-	 *
 	 */
 	bindings?: IgTreeBindings;
 
 	/**
 	 * Gets the default target attribute value for the node anchors.
-	 *
 	 */
 	defaultNodeTarget?: string;
 
 	/**
 	 * Gets/Sets whether drag and drop functionality is enabled.
-	 *
 	 */
 	dragAndDrop?: boolean;
 
 	/**
 	 * Gets the URL to which updating requests will be made.
-	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Gets/Sets specific settings for the drag and drop functionality.
-	 *
 	 */
 	dragAndDropSettings?: IgTreeDragAndDropSettings;
 
@@ -83524,7 +79850,6 @@ interface IgTreeMethods {
 	 * Applies a checked state to a node.
 	 *
 	 * @param nodeObj Specifies the node element to apply the state to.
-	 * @param cascadeDir
 	 */
 	checkNode(nodeObj: Object, cascadeDir: Object): void;
 
@@ -83532,7 +79857,6 @@ interface IgTreeMethods {
 	 * Applies an unchecked state to a node.
 	 *
 	 * @param nodeObj Specifies the node element to apply the state to.
-	 * @param cascadeDir
 	 */
 	uncheckNode(nodeObj: Object, cascadeDir: Object): void;
 
@@ -83540,7 +79864,6 @@ interface IgTreeMethods {
 	 * Applies a partially checked state to a node.
 	 *
 	 * @param nodeObj Specifies the node element to apply the state to.
-	 * @param cascadeDir
 	 */
 	partiallyCheckNode(nodeObj: Object, cascadeDir: Object): void;
 
@@ -83803,7 +80126,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the control container.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "width"): string|number;
@@ -83811,7 +80133,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83819,7 +80140,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets how the height of of the control container.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "height"): string|number;
@@ -83827,7 +80147,6 @@ interface JQuery {
 	/**
 	 * /Sets how the height of of the control container.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83835,7 +80154,6 @@ interface JQuery {
 
 	/**
 	 * Gets the behavior and type of the checkboxes rendered for the tree nodes. Can be set only at initialization.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "checkboxMode"): string;
@@ -83843,7 +80161,6 @@ interface JQuery {
 	/**
 	 * The behavior and type of the checkboxes rendered for the tree nodes. Can be set only at initialization.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83851,35 +80168,30 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets one or more branches to be expanded at a time. If set to true then only one branch at each level of the tree can be expanded at a time. Otherwise multiple branches can be expanded at a time.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "singleBranchExpand"): boolean;
 
 	/**
 	 * /Sets one or more branches to be expanded at a time. If set to true then only one branch at each level of the tree can be expanded at a time. Otherwise multiple branches can be expanded at a time.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "singleBranchExpand", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether nodes are hoverable. Setting this option to false would make the tree to not apply hover styles on the nodes when they are hovered.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "hotTracking"): boolean;
 
 	/**
 	 * /Sets whether nodes are hoverable. Setting this option to false would make the tree to not apply hover styles on the nodes when they are hovered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "hotTracking", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the image url applied to all parent nodes.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "parentNodeImageUrl"): string;
@@ -83887,7 +80199,6 @@ interface JQuery {
 	/**
 	 * /Sets the image url applied to all parent nodes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83895,7 +80206,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the CSS class applied to all parent nodes.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "parentNodeImageClass"): string;
@@ -83903,7 +80213,6 @@ interface JQuery {
 	/**
 	 * /Sets the CSS class applied to all parent nodes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83911,7 +80220,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the tooltip applied to all parent node images.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "parentNodeImageTooltip"): string;
@@ -83919,7 +80227,6 @@ interface JQuery {
 	/**
 	 * /Sets the tooltip applied to all parent node images.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83927,7 +80234,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the image url applied to all leaf nodes.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "leafNodeImageUrl"): string;
@@ -83935,7 +80241,6 @@ interface JQuery {
 	/**
 	 * /Sets the image url applied to all leaf nodes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83943,7 +80248,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the CSS class applied to all leaf nodes.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "leafNodeImageClass"): string;
@@ -83951,7 +80255,6 @@ interface JQuery {
 	/**
 	 * /Sets the CSS class applied to all leaf nodes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83959,7 +80262,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the tooltip applied to all leaf node images.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "leafNodeImageTooltip"): string;
@@ -83967,7 +80269,6 @@ interface JQuery {
 	/**
 	 * /Sets the tooltip applied to all leaf node images.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -83975,28 +80276,24 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the duration of each animation such as the expand/collapse.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * /Sets the duration of each animation such as the expand/collapse.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the node data-path attribute separator character.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "pathSeparator"): string;
 
 	/**
 	 * The node data-path attribute separator character.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "pathSeparator", optionValue: string): void;
@@ -84004,7 +80301,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the igTree data source. Accepts any valid data source accepted by $.ig.DataSource, or an instance of an $.ig.DataSource itself.
 	 * Once the data source is initialized, this option becomes an instance of the $.ig.HierarchicalDataSource.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "dataSource"): any;
 
@@ -84012,14 +80308,12 @@ interface JQuery {
 	 * /Sets the igTree data source. Accepts any valid data source accepted by $.ig.DataSource, or an instance of an $.ig.DataSource itself.
 	 * Once the data source is initialized, this option becomes an instance of the $.ig.HierarchicalDataSource.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * Gets/Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
@@ -84027,7 +80321,6 @@ interface JQuery {
 	/**
 	 * /Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -84035,7 +80328,6 @@ interface JQuery {
 
 	/**
 	 * Gets the type of the data source. Delegates the value to [$.ig.DataSource.settings.type](ig.datasource#options:settings.type). Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource.settings.type.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "dataSourceType"): string;
@@ -84043,7 +80335,6 @@ interface JQuery {
 	/**
 	 * The type of the data source. Delegates the value to [$.ig.DataSource.settings.type](ig.datasource#options:settings.type). Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource.settings.type.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -84051,7 +80342,6 @@ interface JQuery {
 
 	/**
 	 * Gets the JSON key at which a remote data source will write the data. Delegates the value to [$.ig.DataSource.settings.responseDataKey](ig.datasource#options:settings.responseDataKey). Please refer to the documentation of $.ig.DataSource.settings.responseDataKey.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "responseDataKey"): string;
@@ -84059,7 +80349,6 @@ interface JQuery {
 	/**
 	 * The JSON key at which a remote data source will write the data. Delegates the value to [$.ig.DataSource.settings.responseDataKey](ig.datasource#options:settings.responseDataKey). Please refer to the documentation of $.ig.DataSource.settings.responseDataKey.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -84067,7 +80356,6 @@ interface JQuery {
 
 	/**
 	 * Gets the data type of the remote data source response. Delegates the value to [$.ig.DataSource.settings.responseDataType](ig.datasource#options:settings.responseDataType). Please refer to the documentation of $.ig.DataSource.settings.responseDataType.
-	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "responseDataType"): string;
@@ -84075,7 +80363,6 @@ interface JQuery {
 	/**
 	 * The data type of the remote data source response. Delegates the value to [$.ig.DataSource.settings.responseDataType](ig.datasource#options:settings.responseDataType). Please refer to the documentation of $.ig.DataSource.settings.responseDataType.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -84083,126 +80370,108 @@ interface JQuery {
 
 	/**
 	 * Gets the HTTP verb used for remote requests. Gets the HTTP verb to be used to issue the requests to the [dataSourceUrl](ui.igtree#options:dataSourceUrl).
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * The HTTP verb used for remote requests. Sets the HTTP verb to be used to issue the requests to the [dataSourceUrl](ui.igtree#options:dataSourceUrl).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Gets the type of the content in a remote data source response. Content type of the response from the [dataSourceUrl](ui.igtree#options:dataSourceUrl). See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * The type of the content in a remote data source response. Content type of the response from the [dataSourceUrl](ui.igtree#options:dataSourceUrl). See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Gets the initial depth the igTree is going to be expanded to upon initial render.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "initialExpandDepth"): number;
 
 	/**
 	 * The initial depth the igTree is going to be expanded to upon initial render.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "initialExpandDepth", optionValue: number): void;
 
 	/**
 	 * Gets whether all the data would be bound initially or each child collection would be bound upon expand.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "loadOnDemand"): boolean;
 
 	/**
 	 * Whether all the data would be bound initially or each child collection would be bound upon expand.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "loadOnDemand", optionValue: boolean): void;
 
 	/**
 	 * Gets the data binding properties and keys. The igTree uses these to extract the corresponding data from the dataSource.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "bindings"): IgTreeBindings;
 
 	/**
 	 * The data binding properties and keys. The igTree uses these to extract the corresponding data from the dataSource.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "bindings", optionValue: IgTreeBindings): void;
 
 	/**
 	 * Gets the default target attribute value for the node anchors.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "defaultNodeTarget"): string;
 
 	/**
 	 * The default target attribute value for the node anchors.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "defaultNodeTarget", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether drag and drop functionality is enabled.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDrop"): boolean;
 
 	/**
 	 * /Sets whether drag and drop functionality is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDrop", optionValue: boolean): void;
 
 	/**
 	 * Gets the URL to which updating requests will be made.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * The URL to which updating requests will be made.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Gets/Sets specific settings for the drag and drop functionality.
-	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDropSettings"): IgTreeDragAndDropSettings;
 
 	/**
 	 * /Sets specific settings for the drag and drop functionality.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDropSettings", optionValue: IgTreeDragAndDropSettings): void;
@@ -84492,26 +80761,22 @@ interface IgTreeGridColumnFixing {
 
 	/**
 	 * Specifies whether to show the column fixing buttons in header cells/feature chooser.
-	 *
 	 */
 	showFixButtons?: boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
-	 *
 	 */
 	syncRowHeights?: boolean;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
-	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
-	 *
 	 * Valid values:
 	 * "left" Fixed columns are rendered on the left side of the main grid.
 	 * "right" Fixed columns are rendered on the right side of the main grid.
@@ -84520,14 +80785,12 @@ interface IgTreeGridColumnFixing {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width can be set in pixels (px) and percentage (%).
 	 * "number" The width can be set in pixels as a number.
@@ -84536,7 +80799,6 @@ interface IgTreeGridColumnFixing {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
-	 *
 	 */
 	fixNondataColumns?: boolean;
 
@@ -84760,49 +81022,42 @@ interface JQuery {
 
 	/**
 	 * Gets whether to show the column fixing buttons in header cells/feature chooser.
-	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons"): boolean;
 
 	/**
 	 * Sets whether to show the column fixing buttons in header cells/feature chooser.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons", optionValue: boolean): void;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
-	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights"): boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights", optionValue: boolean): void;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
-	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
-	 *
 	 */
 
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "fixingDirection"): string;
@@ -84810,7 +81065,6 @@ interface JQuery {
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -84818,21 +81072,18 @@ interface JQuery {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
-	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnFixingColumnSetting[]): void;
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
-	 *
 	 */
 
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "minimalVisibleAreaWidth"): string|number;
@@ -84840,7 +81091,6 @@ interface JQuery {
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -84848,14 +81098,12 @@ interface JQuery {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
-	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns"): boolean;
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns", optionValue: boolean): void;
@@ -84952,14 +81200,12 @@ interface JQuery {
 interface IgTreeGridColumnMoving {
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
-	 *
 	 * Valid values:
 	 * "immediate" Column headers will rearange as you drag with a space opening under the cursor for the header to be dropped on
 	 * "deferred" A clone of the header dragged will be created and indicators will be shown between columns to help navigate the drop.
@@ -84969,7 +81215,6 @@ interface IgTreeGridColumnMoving {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
-	 *
 	 * Valid values:
 	 * "dom" Columns will be rearranged through dom manipulation
 	 * "render" Columns will not be rearranged but the grid will be rendered again with the new column order. Please note this option is incompatible with immediate move mode.
@@ -84978,56 +81223,47 @@ interface IgTreeGridColumnMoving {
 
 	/**
 	 * Specifies if header cells should include an additional button that opens a moving helper dropdown.
-	 *
 	 */
 	addMovingDropdown?: boolean;
 
 	/**
 	 * Specifies width of column moving dialog
-	 *
 	 */
 	movingDialogWidth?: number;
 
 	/**
 	 * Specifies height of column moving dialog
-	 *
 	 */
 	movingDialogHeight?: number;
 
 	/**
 	 * Specifies time in milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	movingDialogAnimationDuration?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
-	 *
 	 */
 	movingAcceptanceTolerance?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
-	 *
 	 */
 	movingScrollTolerance?: number;
 
 	/**
 	 * Specifies a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
-	 *
 	 */
 	scrollSpeedMultiplier?: number;
 
 	/**
 	 * Specifies the length (in pixels) of each individual scroll operation
-	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Specifies whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
-	 *
 	 */
 	hideHeaderContentsDuringDrag?: boolean;
 
@@ -85035,7 +81271,6 @@ interface IgTreeGridColumnMoving {
 	 * Specifies the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
-	 *
 	 */
 	dragHelperOpacity?: number;
 
@@ -85108,7 +81343,6 @@ interface IgTreeGridColumnMoving {
 
 	/**
 	 * Specifies markup for drop tooltip in column moving dialog
-	 *
 	 */
 	movingDialogDropTooltipMarkup?: string;
 
@@ -85122,7 +81356,6 @@ interface IgTreeGridColumnMoving {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
@@ -85243,21 +81476,18 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnMovingColumnSetting[]): void;
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
-	 *
 	 */
 
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "mode"): string;
@@ -85265,7 +81495,6 @@ interface JQuery {
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85273,7 +81502,6 @@ interface JQuery {
 
 	/**
 	 * Specify the way columns will be rearranged
-	 *
 	 */
 
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "moveType"): string;
@@ -85281,7 +81509,6 @@ interface JQuery {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85289,112 +81516,96 @@ interface JQuery {
 
 	/**
 	 * Gets if header cells should include an additional button that opens a moving helper dropdown.
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown"): boolean;
 
 	/**
 	 * Sets if header cells should include an additional button that opens a moving helper dropdown.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown", optionValue: boolean): void;
 
 	/**
 	 * Gets width of column moving dialog
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth"): number;
 
 	/**
 	 * Sets width of column moving dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth", optionValue: number): void;
 
 	/**
 	 * Gets height of column moving dialog
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight"): number;
 
 	/**
 	 * Sets height of column moving dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight", optionValue: number): void;
 
 	/**
 	 * Gets time in milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time in milliseconds for animation duration to show/hide modal dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance", optionValue: number): void;
 
 	/**
 	 * Gets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier"): number;
 
 	/**
 	 * Sets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) of each individual scroll operation
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Sets the length (in pixels) of each individual scroll operation
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
@@ -85402,7 +81613,6 @@ interface JQuery {
 	/**
 	 * Gets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag"): boolean;
 
@@ -85410,7 +81620,6 @@ interface JQuery {
 	 * Sets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag", optionValue: boolean): void;
@@ -85419,7 +81628,6 @@ interface JQuery {
 	 * Gets the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity"): number;
 
@@ -85428,7 +81636,6 @@ interface JQuery {
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity", optionValue: number): void;
@@ -85591,14 +81798,12 @@ interface JQuery {
 
 	/**
 	 * Gets markup for drop tooltip in column moving dialog
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup"): string;
 
 	/**
 	 * Sets markup for drop tooltip in column moving dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup", optionValue: string): void;
@@ -85623,14 +81828,12 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -85853,7 +82056,6 @@ interface IgTreeGridFilteringLocale {
 	 * ${startRecord} (paging)
 	 * ${endRecord} (paging)
 	 * ${recordCount} (paging)
-	 *
 	 */
 	filterSummaryInPagerTemplate?: string;
 
@@ -85866,25 +82068,21 @@ interface IgTreeGridFilteringLocale {
 interface IgTreeGridFiltering {
 	/**
 	 * The property in the response that will hold the total number of records in the data source
-	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Specifies from which data bound level to be applied filtering - 0 is the first level
-	 *
 	 */
 	fromLevel?: number;
 
 	/**
 	 * Specifies to which data bound level to be applied filtering - if -1 filtering should be applied to the last data bound level
-	 *
 	 */
 	toLevel?: number;
 
 	/**
 	 * If displayMode is showWithAncestorsAndDescendants, show all records that match filtering conditions and their child records, even if child records don"t match filtering conditions. If displayMode is showWithAncestors show only those records that match filtering conditions and do not show child records(if any) that don"t match filtering conditions
-	 *
 	 */
 	displayMode?: any;
 
@@ -85892,7 +82090,6 @@ interface IgTreeGridFiltering {
 	 * Specifies the name of a boolean property in the dataRecord object that indicates whether the dataRow matches the filtering conditions.
 	 * When filtering a boolean flag  with the specified name is added on each data record object with a value of true if it matches the condition or false if it doesn"t.
 	 * This is used mainly for internal purposes.
-	 *
 	 */
 	matchFiltering?: string;
 
@@ -85912,7 +82109,6 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
-	 *
 	 */
 	caseSensitive?: boolean;
 
@@ -85920,13 +82116,11 @@ interface IgTreeGridFiltering {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
-	 *
 	 */
 	filterSummaryAlwaysVisible?: boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
-	 *
 	 */
 	renderFC?: boolean;
 
@@ -85939,7 +82133,6 @@ interface IgTreeGridFiltering {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
-	 *
 	 * Valid values:
 	 * "linear" The column filtering drop downs are shown with a linear animation.
 	 * "none" No animation is used when showing the filtering drop downs.
@@ -85948,14 +82141,12 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
-	 *
 	 */
 	filterDropDownAnimationDuration?: number;
 
 	/**
 	 * Width of the column filter dropdowns.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The width in pixels (0px)
 	 * "number" The width in pixels as a number (0)
@@ -85972,14 +82163,12 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
-	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
-	 *
 	 * Valid values:
 	 * "true" All predefined filters in the filter dropdowns will have icons rendered in front of the text.
 	 * "false" No icons will be rendered.
@@ -85988,14 +82177,12 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridFilteringColumnSetting[];
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * Valid values:
 	 * "remote" Filtering is performed by a remote end-point.
 	 * "local" Filtering is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -86004,14 +82191,12 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
-	 *
 	 */
 	filterDelay?: number;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
-	 *
 	 * Valid values:
 	 * "simple" Renders just a filter row.
 	 * "advanced" Allows to configure multiple filters from a dialog - Excel style.
@@ -86020,14 +82205,12 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
-	 *
 	 */
 	advancedModeEditorsVisible?: boolean;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
-	 *
 	 * Valid values:
 	 * "left"
 	 * "right"
@@ -86037,7 +82220,6 @@ interface IgTreeGridFiltering {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog window width in pixels (370px).
 	 * "number" The dialog window width in pixels as a number (370).
@@ -86047,7 +82229,6 @@ interface IgTreeGridFiltering {
 	/**
 	 * default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog window height in pixels (350px).
 	 * "number" The dialog window height in pixels as a number (350).
@@ -86057,7 +82238,6 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The filtering condition dropdowns width in pixels (80px).
 	 * "number" The filtering condition dropdowns width in pixels as a number (80).
@@ -86067,7 +82247,6 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The filtering expression input boxes width in pixels (80px).
 	 * "number" The filtering expression input boxes width in pixels as a number (80).
@@ -86077,7 +82256,6 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The column chooser dropdowns width in pixels (80px).
 	 * "number" The column chooser dropdowns width in pixels  as a number (80).
@@ -86086,14 +82264,12 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
-	 *
 	 */
 	renderFilterButton?: boolean;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
-	 *
 	 * Valid values:
 	 * "left" The button is rendered on the left.
 	 * "right" The button is rendered on the right.
@@ -86138,13 +82314,11 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
-	 *
 	 */
 	filterDialogAddConditionTemplate?: string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
-	 *
 	 */
 	filterDialogAddConditionDropDownTemplate?: string;
 
@@ -86154,20 +82328,17 @@ interface IgTreeGridFiltering {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
-	 *
 	 */
 	filterDialogFilterTemplate?: string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
-	 *
 	 */
 	filterDialogFilterConditionTemplate?: string;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The dialog Add button width in pixels (100px).
 	 * "number" The dialog Add button width in pixels as a number (100).
@@ -86177,7 +82348,6 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The advanced filter dialog Ok and Cancel buttons width in pixels (120px).
 	 * "number" The advanced filter dialog Ok and Cancel buttons width in pixels as a number (120).
@@ -86186,7 +82356,6 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
-	 *
 	 */
 	filterDialogMaxFilterCount?: number;
 
@@ -86200,31 +82369,26 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
-	 *
 	 */
 	showEmptyConditions?: boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
-	 *
 	 */
 	showNullConditions?: boolean;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables filtering persistence between states.
-	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
-	 *
 	 */
 	inherit?: boolean;
 
@@ -86250,56 +82414,48 @@ interface JQuery {
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Specifies from which data bound level to be applied filtering - 0 is the first level
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "fromLevel"): number;
 
 	/**
 	 * Specifies from which data bound level to be applied filtering - 0 is the first level
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "fromLevel", optionValue: number): void;
 
 	/**
 	 * Specifies to which data bound level to be applied filtering - if -1 filtering should be applied to the last data bound level
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "toLevel"): number;
 
 	/**
 	 * Specifies to which data bound level to be applied filtering - if -1 filtering should be applied to the last data bound level
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "toLevel", optionValue: number): void;
 
 	/**
 	 * If displayMode is showWithAncestorsAndDescendants, show all records that match filtering conditions and their child records, even if child records don"t match filtering conditions. If displayMode is showWithAncestors show only those records that match filtering conditions and do not show child records(if any) that don"t match filtering conditions
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "displayMode"): any;
 
 	/**
 	 * If displayMode is showWithAncestorsAndDescendants, show all records that match filtering conditions and their child records, even if child records don"t match filtering conditions. If displayMode is showWithAncestors show only those records that match filtering conditions and do not show child records(if any) that don"t match filtering conditions
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "displayMode", optionValue: any): void;
@@ -86308,7 +82464,6 @@ interface JQuery {
 	 * Gets the name of a boolean property in the dataRecord object that indicates whether the dataRow matches the filtering conditions.
 	 * When filtering a boolean flag  with the specified name is added on each data record object with a value of true if it matches the condition or false if it doesn"t.
 	 * This is used mainly for internal purposes.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "matchFiltering"): string;
 
@@ -86317,7 +82472,6 @@ interface JQuery {
 	 * When filtering a boolean flag  with the specified name is added on each data record object with a value of true if it matches the condition or false if it doesn"t.
 	 * This is used mainly for internal purposes.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "matchFiltering", optionValue: string): void;
@@ -86354,14 +82508,12 @@ interface JQuery {
 
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
@@ -86370,7 +82522,6 @@ interface JQuery {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible"): boolean;
 
@@ -86379,21 +82530,18 @@ interface JQuery {
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible", optionValue: boolean): void;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFC"): boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFC", optionValue: boolean): void;
@@ -86414,7 +82562,6 @@ interface JQuery {
 
 	/**
 	 * Type of animations for the column filter dropdowns.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimations"): string;
@@ -86422,7 +82569,6 @@ interface JQuery {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86430,21 +82576,18 @@ interface JQuery {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration"): number;
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Width of the column filter dropdowns.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownWidth"): string|number;
@@ -86452,7 +82595,6 @@ interface JQuery {
 	/**
 	 * Width of the column filter dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86478,21 +82620,18 @@ interface JQuery {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey"): string;
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Enable/disable filter icons visibility.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownItemIcons"): boolean;
@@ -86500,7 +82639,6 @@ interface JQuery {
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86508,21 +82646,18 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "columnSettings"): IgGridFilteringColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridFilteringColumnSetting[]): void;
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "type"): string;
@@ -86530,7 +82665,6 @@ interface JQuery {
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86538,21 +82672,18 @@ interface JQuery {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDelay"): number;
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDelay", optionValue: number): void;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "mode"): string;
@@ -86560,7 +82691,6 @@ interface JQuery {
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86568,21 +82698,18 @@ interface JQuery {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible"): boolean;
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible", optionValue: boolean): void;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "advancedModeHeaderButtonLocation"): string;
@@ -86590,7 +82717,6 @@ interface JQuery {
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86598,7 +82724,6 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogWidth"): string|number;
@@ -86606,7 +82731,6 @@ interface JQuery {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86614,7 +82738,6 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogHeight"): string|number;
@@ -86622,7 +82745,6 @@ interface JQuery {
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86630,7 +82752,6 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterDropDownDefaultWidth"): string|number;
@@ -86638,7 +82759,6 @@ interface JQuery {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86646,7 +82766,6 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogExprInputDefaultWidth"): string|number;
@@ -86654,7 +82773,6 @@ interface JQuery {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86662,7 +82780,6 @@ interface JQuery {
 
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogColumnDropDownDefaultWidth"): string|number;
@@ -86670,7 +82787,6 @@ interface JQuery {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86678,21 +82794,18 @@ interface JQuery {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton"): boolean;
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton", optionValue: boolean): void;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterButtonLocation"): string;
@@ -86700,7 +82813,6 @@ interface JQuery {
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86792,28 +82904,24 @@ interface JQuery {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate"): string;
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate"): string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate", optionValue: string): void;
@@ -86824,7 +82932,6 @@ interface JQuery {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate"): string;
 
@@ -86835,28 +82942,24 @@ interface JQuery {
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate"): string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddButtonWidth"): string|number;
@@ -86864,7 +82967,6 @@ interface JQuery {
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86872,7 +82974,6 @@ interface JQuery {
 
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
-	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogOkCancelButtonWidth"): string|number;
@@ -86880,7 +82981,6 @@ interface JQuery {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86888,14 +82988,12 @@ interface JQuery {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount"): number;
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount", optionValue: number): void;
@@ -86920,70 +83018,60 @@ interface JQuery {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions"): boolean;
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions", optionValue: boolean): void;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showNullConditions"): boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showNullConditions", optionValue: boolean): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables filtering persistence between states.
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables filtering persistence between states.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
-	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -86996,13 +83084,11 @@ interface JQuery {
 interface IgTreeGridHiding {
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridHidingColumnSetting[];
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
-	 *
 	 */
 	hiddenColumnIndicatorHeaderWidth?: number;
 
@@ -87016,19 +83102,16 @@ interface IgTreeGridHiding {
 
 	/**
 	 * The default column chooser width.
-	 *
 	 */
 	columnChooserWidth?: string;
 
 	/**
 	 * The default column chooser height.
-	 *
 	 */
 	columnChooserHeight?: string;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
-	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -87089,25 +83172,21 @@ interface IgTreeGridHiding {
 
 	/**
 	 * Specifies on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
-	 *
 	 */
 	columnChooserHideOnClick?: boolean;
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	columnChooserAnimationDuration?: number;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	inherit?: boolean;
 
@@ -87286,28 +83365,24 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnSettings"): IgGridHidingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridHidingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth"): number;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth", optionValue: number): void;
@@ -87332,42 +83407,36 @@ interface JQuery {
 
 	/**
 	 * The default column chooser width.
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth"): string;
 
 	/**
 	 * The default column chooser width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth", optionValue: string): void;
 
 	/**
 	 * The default column chooser height.
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight"): string;
 
 	/**
 	 * The default column chooser height.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight", optionValue: string): void;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -87502,56 +83571,48 @@ interface JQuery {
 
 	/**
 	 * Gets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick"): boolean;
 
 	/**
 	 * Sets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick", optionValue: boolean): void;
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -87757,32 +83818,27 @@ interface IgTreeGridDataSourceSettings {
 	/**
 	 * *** IMPORTANT DEPRECATED *** Use the expandedKey option instead.
 	 * The name of the property that keeps track of the expansion state of a data item. Defaults to __ig_options.expanded.
-	 *
 	 */
 	propertyExpanded?: any;
 
 	/**
 	 * *** IMPORTANT DEPRECATED *** Use the dataLevelKey option instead.
 	 * The name of the property that keeps track of the level in the hierarchy.Defaults to __ig_options.dataLevel.
-	 *
 	 */
 	propertyDataLevel?: any;
 
 	/**
 	 * The name of the property that keeps track of the expansion state of a data item. Defaults to __ig_options.expanded.
-	 *
 	 */
 	expandedKey?: string;
 
 	/**
 	 * The name of the property that keeps track of the level in the hierarchy.Defaults to __ig_options.dataLevel.
-	 *
 	 */
 	dataLevelKey?: string;
 
 	/**
 	 * If set to TRUE it is expected that the source of data is normalized and transformed(has set dataLevel and expansion state). The source of data is used as flatDataView. Usually used when the paging is remote and paging mode is allLevels, or features are remote(and the processing of the returned result should be made on the server)
-	 *
 	 */
 	initialFlatDataView?: boolean;
 
@@ -87795,13 +83851,11 @@ interface IgTreeGridDataSourceSettings {
 interface IgTreeGridLocale {
 	/**
 	 * Specifies the expansion indicator tooltip text.
-	 *
 	 */
 	expandTooltipText?: string;
 
 	/**
 	 * Specifies the collapse indicator tooltip text.
-	 *
 	 */
 	collapseTooltipText?: string;
 
@@ -87814,19 +83868,16 @@ interface IgTreeGridLocale {
 interface IgTreeGrid {
 	/**
 	 * Specifies the indentation (in pixels or percent) for a tree grid row. Nested indentation is achieved by calculating the level times the indentation value. Ex: '10px' or '5%'. Default is 30.
-	 *
 	 */
 	indentation?: string;
 
 	/**
 	 * If initial indentation level is set then it is used to be calculated width of the data skip column(usually used when remote load on demand is enabled)
-	 *
 	 */
 	initialIndentationLevel?: number;
 
 	/**
 	 * Specifies if rows(that have child rows) will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
-	 *
 	 */
 	showExpansionIndicator?: boolean;
 
@@ -87846,55 +83897,46 @@ interface IgTreeGrid {
 
 	/**
 	 * Unique identifier used in a self-referencing flat data source. Used with primaryKey to create a relationship among flat data sources.
-	 *
 	 */
 	foreignKey?: string;
 
 	/**
 	 * Specifies the depth down to which the tree grid would be expanded upon initial render. To expand all rows set value to -1. Default is -1.
-	 *
 	 */
 	initialExpandDepth?: number;
 
 	/**
 	 * Specifies the foreign key value in the data source to treat as the root level once the grid is data bound. Defaults to -1 (which includes the entire data source)
-	 *
 	 */
 	foreignKeyRootValue?: number|string;
 
 	/**
 	 * Specify whether to render non-data column which contains expander indicators
-	 *
 	 */
 	renderExpansionIndicatorColumn?: boolean;
 
 	/**
 	 * a reference or name of a javascript function which changes first data cell - renders indentation according to databound level
-	 *
 	 */
 	renderFirstDataCellFunction?: string|Object;
 
 	/**
 	 * Property name of the array of child data in a hierarchical data source.
-	 *
 	 */
 	childDataKey?: string;
 
 	/**
 	 * a reference or name of a javascript function which renders expand indicators(called ONLY IF option renderExpansionIndicatorColumn is true)
-	 *
 	 */
 	renderExpansionCellFunction?: string|Object;
 
 	/**
 	 * Specifies to the tree grid if data is loaded on demand from a remote server. Default is false.
-	 *
 	 */
 	enableRemoteLoadOnDemand?: boolean;
 
 	/**
 	 * Options object to configure data source-specific settings
-	 *
 	 */
 	dataSourceSettings?: IgTreeGridDataSourceSettings;
 	locale?: IgTreeGridLocale;
@@ -87907,7 +83949,6 @@ interface IgTreeGrid {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The widget width can be set in pixels as a number. Example values: 800, 700.
@@ -87918,7 +83959,6 @@ interface IgTreeGrid {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -87928,14 +83968,12 @@ interface IgTreeGrid {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
-	 *
 	 */
 	autoAdjustHeight?: boolean;
 
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The avarage row height can be set in pixels ("25px").
 	 * "number" The avarage row height can be set in pixels as a number (25).
@@ -87945,7 +83983,6 @@ interface IgTreeGrid {
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The avarage column width can be set in pixels ("25px").
 	 * "number" The avarage column width can be set in pixels as a number (25).
@@ -87955,7 +83992,6 @@ interface IgTreeGrid {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The default column width can be set in pixels ("100px").
 	 * "number" The default column width can be set in pixels as a number (100).
@@ -87966,20 +84002,17 @@ interface IgTreeGrid {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
-	 *
 	 */
 	autoGenerateColumns?: boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
-	 *
 	 */
 	virtualization?: boolean;
 
 	/**
 	 * Determines row virtualization mode.
 	 *
-	 *
 	 * Valid values:
 	 * "fixed" Renders only the visible rows and/or columns in the grid. On scrolling the same rows and/or columns are updated with new data from the data source. Only fixed virtualization can work with column virtualization at the same time. Fixed virtualization is not supported by some grid features: Resizing, Group By, Responsive.
 	 * "continuous" renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
@@ -87988,32 +84021,27 @@ interface IgTreeGrid {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
-	 *
 	 */
 	rowVirtualization?: boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
-	 *
 	 */
 	columnVirtualization?: boolean;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
-	 *
 	 */
 	virtualizationMouseWheelStep?: number;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
-	 *
 	 */
 	adjustVirtualHeights?: boolean;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
-	 *
 	 * Valid values:
 	 * "infragistics" The grid will use the Infragistics Templating engine to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
 	 * "jsRender" The grid will use jsRender to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
@@ -88022,14 +84050,12 @@ interface IgTreeGrid {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
-	 *
 	 */
 	columns?: IgGridColumn[];
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
-	 *
 	 * Valid values:
 	 * "array" dataSource as an array
 	 * "object" ddataSource as an object
@@ -88039,103 +84065,86 @@ interface IgTreeGrid {
 
 	/**
 	 * Specifies a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
-	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
-	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
-	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the requests to a remote data source.
-	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Controls the visibility of the grid header.
-	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
-	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	fixedHeaders?: boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	fixedFooters?: boolean;
 
 	/**
 	 * Caption text that will be shown above the grid header.
-	 *
 	 */
 	caption?: string;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
-	 *
 	 */
 	features?: IgGridFeature[];
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
-	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
-	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
-	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
-	 *
 	 */
 	serializeTransactionLog?: boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
-	 *
 	 */
 	autoCommit?: boolean;
 
@@ -88145,14 +84154,12 @@ interface IgTreeGrid {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
-	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * Valid values:
 	 * "date" formats only Date columns
 	 * "number" formats only number columns
@@ -88164,63 +84171,53 @@ interface IgTreeGrid {
 
 	/**
 	 * Gets sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
-	 *
 	 */
 	renderCheckboxes?: boolean;
 
 	/**
 	 * URL to which updating requests will be made.
-	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
-	 *
 	 */
 	alternateRowStyles?: boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
-	 *
 	 */
 	autofitLastColumn?: boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
-	 *
 	 */
 	enableHoverStyles?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
-	 *
 	 */
 	enableUTCDates?: boolean;
 
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
-	 *
 	 */
 	mergeUnboundColumns?: boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
-	 *
 	 */
 	jsonpRequest?: boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
-	 *
 	 */
 	enableResizeContainerCheck?: boolean;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
-	 *
 	 * Valid values:
 	 * "none" Always hide the feature chooser icon; The feature chooser is shown on tapping/clicking the column header.
 	 * "desktopOnly" Always show the icon on desktop but hide when touch device detected.
@@ -88230,7 +84227,6 @@ interface IgTreeGrid {
 
 	/**
 	 * Settings related to content scrolling.
-	 *
 	 */
 	scrollSettings?: IgGridScrollSettings;
 
@@ -88969,42 +84965,36 @@ interface JQuery {
 
 	/**
 	 * Gets the indentation (in pixels or percent) for a tree grid row. Nested indentation is achieved by calculating the level times the indentation value. Ex: '10px' or '5%'. Default is 30.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "indentation"): string;
 
 	/**
 	 * Sets the indentation (in pixels or percent) for a tree grid row. Nested indentation is achieved by calculating the level times the indentation value. Ex: '10px' or '5%'. Default is 30.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "indentation", optionValue: string): void;
 
 	/**
 	 * If initial indentation level is set then it is used to be calculated width of the data skip column(usually used when remote load on demand is enabled)
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialIndentationLevel"): number;
 
 	/**
 	 * If initial indentation level is set then it is used to be calculated width of the data skip column(usually used when remote load on demand is enabled)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialIndentationLevel", optionValue: number): void;
 
 	/**
 	 * Gets if rows(that have child rows) will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showExpansionIndicator"): boolean;
 
 	/**
 	 * Sets if rows(that have child rows) will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showExpansionIndicator", optionValue: boolean): void;
@@ -89043,35 +85033,30 @@ interface JQuery {
 
 	/**
 	 * Unique identifier used in a self-referencing flat data source. Used with primaryKey to create a relationship among flat data sources.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "foreignKey"): string;
 
 	/**
 	 * Unique identifier used in a self-referencing flat data source. Used with primaryKey to create a relationship among flat data sources.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "foreignKey", optionValue: string): void;
 
 	/**
 	 * Gets the depth down to which the tree grid would be expanded upon initial render. To expand all rows set value to -1. Default is -1.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialExpandDepth"): number;
 
 	/**
 	 * Sets the depth down to which the tree grid would be expanded upon initial render. To expand all rows set value to -1. Default is -1.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialExpandDepth", optionValue: number): void;
 
 	/**
 	 * Gets the foreign key value in the data source to treat as the root level once the grid is data bound. Defaults to -1 (which includes the entire data source)
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "foreignKeyRootValue"): number|string;
@@ -89079,7 +85064,6 @@ interface JQuery {
 	/**
 	 * Sets the foreign key value in the data source to treat as the root level once the grid is data bound. Defaults to -1 (which includes the entire data source)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89087,21 +85071,18 @@ interface JQuery {
 
 	/**
 	 * Specify whether to render non-data column which contains expander indicators
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderExpansionIndicatorColumn"): boolean;
 
 	/**
 	 * Specify whether to render non-data column which contains expander indicators
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderExpansionIndicatorColumn", optionValue: boolean): void;
 
 	/**
 	 * A reference or name of a javascript function which changes first data cell - renders indentation according to databound level
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "renderFirstDataCellFunction"): string|Object;
@@ -89109,7 +85090,6 @@ interface JQuery {
 	/**
 	 * A reference or name of a javascript function which changes first data cell - renders indentation according to databound level
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89117,21 +85097,18 @@ interface JQuery {
 
 	/**
 	 * Property name of the array of child data in a hierarchical data source.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "childDataKey"): string;
 
 	/**
 	 * Property name of the array of child data in a hierarchical data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "childDataKey", optionValue: string): void;
 
 	/**
 	 * A reference or name of a javascript function which renders expand indicators(called ONLY IF option renderExpansionIndicatorColumn is true)
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "renderExpansionCellFunction"): string|Object;
@@ -89139,7 +85116,6 @@ interface JQuery {
 	/**
 	 * A reference or name of a javascript function which renders expand indicators(called ONLY IF option renderExpansionIndicatorColumn is true)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89147,28 +85123,24 @@ interface JQuery {
 
 	/**
 	 * Gets to the tree grid if data is loaded on demand from a remote server. Default is false.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableRemoteLoadOnDemand"): boolean;
 
 	/**
 	 * Sets to the tree grid if data is loaded on demand from a remote server. Default is false.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableRemoteLoadOnDemand", optionValue: boolean): void;
 
 	/**
 	 * Options object to configure data source-specific settings
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceSettings"): IgTreeGridDataSourceSettings;
 
 	/**
 	 * Options object to configure data source-specific settings
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceSettings", optionValue: IgTreeGridDataSourceSettings): void;
@@ -89189,7 +85161,6 @@ interface JQuery {
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "width"): string|number;
@@ -89197,7 +85168,6 @@ interface JQuery {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89205,7 +85175,6 @@ interface JQuery {
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "height"): string|number;
@@ -89213,7 +85182,6 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89221,21 +85189,18 @@ interface JQuery {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data  ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoAdjustHeight"): boolean;
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoAdjustHeight", optionValue: boolean): void;
 
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight"): string|number;
@@ -89243,7 +85208,6 @@ interface JQuery {
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89251,7 +85215,6 @@ interface JQuery {
 
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "avgColumnWidth"): string|number;
@@ -89259,7 +85222,6 @@ interface JQuery {
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89267,7 +85229,6 @@ interface JQuery {
 
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "defaultColumnWidth"): string|number;
@@ -89275,7 +85236,6 @@ interface JQuery {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89285,7 +85245,6 @@ interface JQuery {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoGenerateColumns"): boolean;
 
@@ -89294,28 +85253,24 @@ interface JQuery {
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoGenerateColumns", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
 	/**
 	 * Determines row virtualization mode.
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMode"): string;
@@ -89323,7 +85278,6 @@ interface JQuery {
 	/**
 	 * Determines row virtualization mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89331,63 +85285,54 @@ interface JQuery {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "rowVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "rowVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "columnVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "columnVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep"): number;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep", optionValue: number): void;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights"): boolean;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights", optionValue: boolean): void;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "templatingEngine"): string;
@@ -89395,7 +85340,6 @@ interface JQuery {
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89403,21 +85347,18 @@ interface JQuery {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "columns"): IgGridColumn[];
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "columns", optionValue: IgGridColumn[]): void;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSource"): Array<any>|Object|string;
@@ -89425,7 +85366,6 @@ interface JQuery {
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89433,238 +85373,204 @@ interface JQuery {
 
 	/**
 	 * Gets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
 
 	/**
 	 * Gets the HTTP verb to be used to issue the requests to a remote data source.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP verb to be used to issue the requests to a remote data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Controls the visibility of the grid header.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * Controls the visibility of the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Controls the visibility of the grid footer.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedHeaders"): boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedHeaders", optionValue: boolean): void;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedFooters"): boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedFooters", optionValue: boolean): void;
 
 	/**
 	 * Caption text that will be shown above the grid header.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "caption"): string;
 
 	/**
 	 * Caption text that will be shown above the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "caption", optionValue: string): void;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "features"): IgGridFeature[];
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "features", optionValue: IgGridFeature[]): void;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "localSchemaTransform"): boolean;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "localSchemaTransform", optionValue: boolean): void;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "primaryKey"): string;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "primaryKey", optionValue: string): void;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "serializeTransactionLog"): boolean;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "serializeTransactionLog", optionValue: boolean): void;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoCommit"): boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoCommit", optionValue: boolean): void;
@@ -89675,7 +85581,6 @@ interface JQuery {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "aggregateTransactions"): boolean;
 
@@ -89686,14 +85591,12 @@ interface JQuery {
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
@@ -89701,7 +85604,6 @@ interface JQuery {
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89709,84 +85611,72 @@ interface JQuery {
 
 	/**
 	 * Gets  ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderCheckboxes"): boolean;
 
 	/**
 	 * Sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderCheckboxes", optionValue: boolean): void;
 
 	/**
 	 * URL to which updating requests will be made.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * URL to which updating requests will be made.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "alternateRowStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "alternateRowStyles", optionValue: boolean): void;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autofitLastColumn"): boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autofitLastColumn", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableHoverStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableHoverStyles", optionValue: boolean): void;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -89794,7 +85684,6 @@ interface JQuery {
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns"): boolean;
 
@@ -89802,42 +85691,36 @@ interface JQuery {
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns", optionValue: boolean): void;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "jsonpRequest"): boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "jsonpRequest", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck"): boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck", optionValue: boolean): void;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
-	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "featureChooserIconDisplay"): string;
@@ -89845,7 +85728,6 @@ interface JQuery {
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89853,14 +85735,12 @@ interface JQuery {
 
 	/**
 	 * Settings related to content scrolling.
-	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "scrollSettings"): IgGridScrollSettings;
 
 	/**
 	 * Settings related to content scrolling.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "scrollSettings", optionValue: IgGridScrollSettings): void;
@@ -90365,13 +86245,11 @@ interface JQuery {
 interface IgTreeGridPagingLocale {
 	/**
 	 * Sets/gets the text message shown while loading content of the context row(while processing breadcrumb/immediate parent row). It is set via $.html(). If set to null loading message is not shown.
-	 *
 	 */
 	contextRowLoadingText?: string;
 
 	/**
 	 * Sets/gets the content of the context row when the first record in the page is root(hasn't ancestors) record. It is set via $.html()
-	 *
 	 */
 	contextRowRootText?: string;
 
@@ -90442,7 +86320,6 @@ interface IgTreeGridPaging {
 	/**
 	 * Sets gets paging mode.
 	 *
-	 *
 	 * Valid values:
 	 * "rootLevelOnly" Only pages records at the root of the tree grid are displayed.
 	 * "allLevels" includes all visible records in paging.
@@ -90452,7 +86329,6 @@ interface IgTreeGridPaging {
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is "rootLevelOnly" then the context row always shows the value of the contextRowRootText option.
 	 *
-	 *
 	 * Valid values:
 	 * "none" Does not render the contextual row
 	 * "parent" Renders a read-only representation of the immediate parent row
@@ -90476,57 +86352,48 @@ interface IgTreeGridPaging {
 
 	/**
 	 * Sets/gets the column key of ancestor to be shown in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
-	 *
 	 */
 	breadcrumbKey?: string;
 
 	/**
 	 * Sets/gets (it is set via  $.html()) delimiter between ancestors in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
-	 *
 	 */
 	breadcrumbDelimiter?: string;
 
 	/**
 	 * Reference to the (or name of )function, called before rendering context row content(rendering loading message/bread crumb/parent row). The function takes 4 arguments- dataRow, $textArea- jQuery representation of the text area of the context row(when mode is loading/breadcrumb then it is <span /> otherwise <tr />), array of parent rows and context mode - "loading"|"breadcrumb"|"parent". When the function returns string it is used as html set in $textArea. If the function does not return result or returns false/empty string then rendering of the content of the context row should be handled by the developer(similar to canceling rendering of context row content).
-	 *
 	 */
 	renderContextRowFunc?: Function|string;
 	locale?: IgTreeGridPagingLocale;
 
 	/**
 	 * Number of records loaded and displayed per page.
-	 *
 	 */
 	pageSize?: number;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
-	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
-	 *
 	 */
 	pageSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
-	 *
 	 */
 	pageIndexUrlKey?: string;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
-	 *
 	 */
 	currentPageIndex?: number;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * Valid values:
 	 * "remote" Paging is performed by a remote end-point.
 	 * "local" Paging is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -90535,7 +86402,6 @@ interface IgTreeGridPaging {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
-	 *
 	 */
 	showPageSizeDropDown?: boolean;
 
@@ -90648,7 +86514,6 @@ interface IgTreeGridPaging {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
-	 *
 	 * Valid values:
 	 * "above" The page size drop down will be rendered above the grid header.
 	 * "inpager" The page size drop down will be rendered next to page links.
@@ -90657,61 +86522,51 @@ interface IgTreeGridPaging {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
-	 *
 	 */
 	showPagerRecordsLabel?: boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
-	 *
 	 */
 	showFirstLastPages?: boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
-	 *
 	 */
 	showPrevNextPages?: boolean;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
-	 *
 	 */
 	pageSizeList?: any;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
-	 *
 	 */
 	pageCountLimit?: number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
-	 *
 	 */
 	visiblePageCount?: number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
-	 *
 	 */
 	defaultDropDownWidth?: number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
-	 *
 	 */
 	delayOnPageChanged?: number;
 
 	/**
 	 * Enables/disables paging persistence between states.
-	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	inherit?: boolean;
 
@@ -90811,7 +86666,6 @@ interface JQuery {
 
 	/**
 	 * Sets gets paging mode.
-	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "mode"): string;
@@ -90819,7 +86673,6 @@ interface JQuery {
 	/**
 	 * Sets gets paging mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90827,7 +86680,6 @@ interface JQuery {
 
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is "rootLevelOnly" then the context row always shows the value of the contextRowRootText option.
-	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "contextRowMode"): string;
@@ -90835,7 +86687,6 @@ interface JQuery {
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is "rootLevelOnly" then the context row always shows the value of the contextRowRootText option.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90875,35 +86726,30 @@ interface JQuery {
 
 	/**
 	 * Sets/gets the column key of ancestor to be shown in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbKey"): string;
 
 	/**
 	 * Sets/gets the column key of ancestor to be shown in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbKey", optionValue: string): void;
 
 	/**
 	 * Sets/gets (it is set via  $.html()) delimiter between ancestors in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbDelimiter"): string;
 
 	/**
 	 * Sets/gets (it is set via  $.html()) delimiter between ancestors in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbDelimiter", optionValue: string): void;
 
 	/**
 	 * Reference to the (or name of )function, called before rendering context row content(rendering loading message/bread crumb/parent row). The function takes 4 arguments- dataRow, $textArea- jQuery representation of the text area of the context row(when mode is loading/breadcrumb then it is <span /> otherwise <tr />), array of parent rows and context mode - "loading"|"breadcrumb"|"parent". When the function returns string it is used as html set in $textArea. If the function does not return result or returns false/empty string then rendering of the content of the context row should be handled by the developer(similar to canceling rendering of context row content).
-	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "renderContextRowFunc"): Function|string;
@@ -90911,7 +86757,6 @@ interface JQuery {
 	/**
 	 * Reference to the (or name of )function, called before rendering context row content(rendering loading message/bread crumb/parent row). The function takes 4 arguments- dataRow, $textArea- jQuery representation of the text area of the context row(when mode is loading/breadcrumb then it is <span /> otherwise <tr />), array of parent rows and context mode - "loading"|"breadcrumb"|"parent". When the function returns string it is used as html set in $textArea. If the function does not return result or returns false/empty string then rendering of the content of the context row should be handled by the developer(similar to canceling rendering of context row content).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90921,77 +86766,66 @@ interface JQuery {
 
 	/**
 	 * Number of records loaded and displayed per page.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSize"): number;
 
 	/**
 	 * Number of records loaded and displayed per page.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSize", optionValue: number): void;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey", optionValue: string): void;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "currentPageIndex"): number;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "currentPageIndex", optionValue: number): void;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
-	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "type"): string;
@@ -90999,7 +86833,6 @@ interface JQuery {
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -91007,14 +86840,12 @@ interface JQuery {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown"): boolean;
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown", optionValue: boolean): void;
@@ -91267,7 +87098,6 @@ interface JQuery {
 
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
-	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeDropDownLocation"): string;
@@ -91275,7 +87105,6 @@ interface JQuery {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -91283,140 +87112,120 @@ interface JQuery {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel"): boolean;
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages", optionValue: boolean): void;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeList"): any;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeList", optionValue: any): void;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageCountLimit"): number;
 
 	/**
 	 * Sets/ the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageCountLimit", optionValue: number): void;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "visiblePageCount"): number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "visiblePageCount", optionValue: number): void;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth"): number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth", optionValue: number): void;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged"): number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged", optionValue: number): void;
 
 	/**
 	 * Enables/disables paging persistence between states.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables paging persistence between states.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -91535,25 +87344,21 @@ interface JQuery {
 interface IgTreeGridResizing {
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
-	 *
 	 */
 	allowDoubleClickToResize?: boolean;
 
 	/**
 	 * Specifies whether the resizing should be deferred until the user finishes resizing or applied immediately.
-	 *
 	 */
 	deferredResizing?: boolean;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
-	 *
 	 */
 	columnSettings?: IgGridResizingColumnSetting[];
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
-	 *
 	 */
 	handleThreshold?: number;
 
@@ -91603,56 +87408,48 @@ interface JQuery {
 
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
-	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize"): boolean;
 
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize", optionValue: boolean): void;
 
 	/**
 	 * Gets whether the resizing should be deferred until the user finishes resizing or applied immediately.
-	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "deferredResizing"): boolean;
 
 	/**
 	 * Sets whether the resizing should be deferred until the user finishes resizing or applied immediately.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "deferredResizing", optionValue: boolean): void;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
-	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "columnSettings"): IgGridResizingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridResizingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
-	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "handleThreshold"): number;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "handleThreshold", optionValue: number): void;
@@ -91714,7 +87511,6 @@ interface IgTreeGridRowSelectors {
 	/**
 	 * Determines row numbering format.
 	 *
-	 *
 	 * Valid values:
 	 * "sequential" Defines numbering format to be the index of the visible records.
 	 * "hierarchical" Defines numbering format to be concatenation of the parent and children indexes.
@@ -91724,7 +87520,6 @@ interface IgTreeGridRowSelectors {
 	/**
 	 * Gets the type of checkboxes rendered in the row selector. Can be set only at initialization.
 	 *
-	 *
 	 * Valid values:
 	 * "biState" Checkboxes are rendered and support two states(checked and unchecked). Checkboxes do not cascade down or up in this mode.
 	 * "triState" Checkboxes are rendered and support three states(checked, partial and unchecked). Checkboxes cascade up and down in this mode.
@@ -91733,26 +87528,22 @@ interface IgTreeGridRowSelectors {
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
-	 *
 	 */
 	enableRowNumbering?: boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
-	 *
 	 */
 	enableCheckBoxes?: boolean;
 
 	/**
 	 * The seed to be added to the default numbering
-	 *
 	 */
 	rowNumberingSeed?: number;
 
 	/**
 	 * defines width of the row selector`s column in pixels or percentage.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The row selector column width can be set in pixels (px) and percentage (%)
 	 * "number" The row selector width can be set as a number
@@ -91764,13 +87555,11 @@ interface IgTreeGridRowSelectors {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
-	 *
 	 */
 	requireSelection?: boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
-	 *
 	 */
 	showCheckBoxesOnFocus?: boolean;
 
@@ -91781,7 +87570,6 @@ interface IgTreeGridRowSelectors {
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
-	 *
 	 */
 	enableSelectAllForPaging?: boolean;
 
@@ -91791,7 +87579,6 @@ interface IgTreeGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	selectAllForPagingTemplate?: string;
 
@@ -91801,7 +87588,6 @@ interface IgTreeGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	deselectAllForPagingTemplate?: string;
 	locale?: IgGridRowSelectorsLocale;
@@ -91877,8 +87663,6 @@ interface IgTreeGridRowSelectorsMethods {
 
 	/**
 	 * Returns the check state of the row by id.
-	 *
-	 * @param rowId
 	 */
 	checkStateById(rowId: Object): string;
 }
@@ -91900,7 +87684,6 @@ interface JQuery {
 
 	/**
 	 * Determines row numbering format.
-	 *
 	 */
 
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowSelectorNumberingMode"): string;
@@ -91908,7 +87691,6 @@ interface JQuery {
 	/**
 	 * Determines row numbering format.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -91916,7 +87698,6 @@ interface JQuery {
 
 	/**
 	 * Gets the type of checkboxes rendered in the row selector. Can be set only at initialization.
-	 *
 	 */
 
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "checkBoxMode"): string;
@@ -91924,7 +87705,6 @@ interface JQuery {
 	/**
 	 * The type of checkboxes rendered in the row selector. Can be set only at initialization.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -91932,49 +87712,42 @@ interface JQuery {
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering", optionValue: boolean): void;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes", optionValue: boolean): void;
 
 	/**
 	 * The seed to be added to the default numbering
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed"): number;
 
 	/**
 	 * The seed to be added to the default numbering
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed", optionValue: number): void;
 
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
-	 *
 	 */
 
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowSelectorColumnWidth"): string|number;
@@ -91982,7 +87755,6 @@ interface JQuery {
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -91992,7 +87764,6 @@ interface JQuery {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection"): boolean;
 
@@ -92001,21 +87772,18 @@ interface JQuery {
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection", optionValue: boolean): void;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus"): boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus", optionValue: boolean): void;
@@ -92034,14 +87802,12 @@ interface JQuery {
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging"): boolean;
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging", optionValue: boolean): void;
@@ -92052,7 +87818,6 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate"): string;
 
@@ -92063,7 +87828,6 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate", optionValue: string): void;
@@ -92074,7 +87838,6 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
-	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate"): string;
 
@@ -92085,7 +87848,6 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate", optionValue: string): void;
@@ -92136,20 +87898,17 @@ interface JQuery {
 interface IgTreeGridSelection {
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
-	 *
 	 */
 	multipleSelection?: boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
-	 *
 	 */
 	mouseDragSelect?: boolean;
 
 	/**
 	 * Defines type of the selection.
 	 *
-	 *
 	 * Valid values:
 	 * "row" Defines row selection mode.
 	 * "cell" Defines cell selection mode.
@@ -92158,43 +87917,36 @@ interface IgTreeGridSelection {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
-	 *
 	 */
 	activation?: boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
-	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
-	 *
 	 */
 	skipChildren?: boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
-	 *
 	 */
 	multipleCellSelectOnClick?: boolean;
 
 	/**
 	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
-	 *
 	 */
 	touchDragSelect?: boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
-	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
-	 *
 	 */
 	allowMultipleRangeSelection?: boolean;
 
@@ -92379,35 +88131,30 @@ interface JQuery {
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleSelection"): boolean;
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleSelection", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect"): boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect", optionValue: boolean): void;
 
 	/**
 	 * Defines type of the selection.
-	 *
 	 */
 
 	igTreeGridSelection(optionLiteral: 'option', optionName: "mode"): string;
@@ -92415,7 +88162,6 @@ interface JQuery {
 	/**
 	 * Defines type of the selection.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -92423,98 +88169,84 @@ interface JQuery {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "activation"): boolean;
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "activation", optionValue: boolean): void;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "skipChildren"): boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "skipChildren", optionValue: boolean): void;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick"): boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "touchDragSelect"): boolean;
 
 	/**
 	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "touchDragSelect", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection persistance between states.
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
-	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection"): boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection", optionValue: boolean): void;
@@ -92631,20 +88363,17 @@ interface JQuery {
 interface IgTreeGridSorting {
 	/**
 	 * Specifies from which data bound level to be applied sorting - 0 is the first level
-	 *
 	 */
 	fromLevel?: number;
 
 	/**
 	 * Specifies to which data bound level to be applied sorting - if -1 sorting should be applied to the last data bound level
-	 *
 	 */
 	toLevel?: number;
 
 	/**
 	 * Defines local or remote sorting operations.
 	 *
-	 *
 	 * Valid values:
 	 * "remote" Sorting is performed remotely as a server-side operation.
 	 * "local" Sorting is performed locally by the [$.ig.DataSource](ig.datasource) component.
@@ -92653,38 +88382,32 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
-	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
-	 *
 	 */
 	applySortedColumnCss?: boolean;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
-	 *
 	 */
 	sortUrlKey?: string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
-	 *
 	 */
 	sortUrlKeyAscValue?: string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
-	 *
 	 */
 	sortUrlKeyDescValue?: string;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
-	 *
 	 * Valid values:
 	 * "single" Only a single column can be sorted. Previously sorted columns will not preserve their sorting upon sorting a new column.
 	 * "multi" If enabled, previous sorted state for columns won't be cleared
@@ -92693,14 +88416,12 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
-	 *
 	 */
 	customSortFunction?: Function;
 
 	/**
 	 * Specifies which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
-	 *
 	 * Valid values:
 	 * "ascending" The first sort of the column data will be in ascending order.
 	 * "descending" The first sort of the column data will be in descending order.
@@ -92709,7 +88430,6 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Specifies whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
-	 *
 	 */
 	modalDialogSortOnClick?: boolean;
 
@@ -92801,7 +88521,6 @@ interface IgTreeGridSorting {
 	/**
 	 * Specifies width of multiple sorting dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" Specifies the width in pixels as a string ("300px").
 	 * "number" Specifies the width in pixels as a number (300)
@@ -92811,7 +88530,6 @@ interface IgTreeGridSorting {
 	/**
 	 * Specifies height of multiple sorting dialog.
 	 *
-	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set in pixels as a number.
@@ -92820,19 +88538,16 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog.
-	 *
 	 */
 	modalDialogAnimationDuration?: number;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
-	 *
 	 */
 	columnSettings?: IgGridSortingColumnSetting[];
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
-	 *
 	 */
 	persist?: boolean;
 
@@ -92846,13 +88561,11 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	inherit?: boolean;
 
@@ -92948,7 +88661,6 @@ interface IgTreeGridSortingMethods {
 	 *
 	 * @param index Column key (string) or index (number) - for multi-row grid only column key can be used. Specifies the column which we want to sort. If the mode is multiple, previous sorting states are not cleared.
 	 * @param direction Specifies sorting direction (ascending or descending)
-	 * @param header
 	 */
 	sortColumn(index: Object, direction: Object, header: Object): void;
 
@@ -92984,8 +88696,6 @@ interface IgTreeGridSortingMethods {
 
 	/**
 	 * Renders content of multiple sorting dialog - sorted and unsorted columns.
-	 *
-	 * @param isToCallEvents
 	 */
 	renderMultipleSortingDialogContent(isToCallEvents: Object): void;
 
@@ -93013,35 +88723,30 @@ interface JQuery {
 
 	/**
 	 * Specifies from which data bound level to be applied sorting - 0 is the first level
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "fromLevel"): number;
 
 	/**
 	 * Specifies from which data bound level to be applied sorting - 0 is the first level
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "fromLevel", optionValue: number): void;
 
 	/**
 	 * Specifies to which data bound level to be applied sorting - if -1 sorting should be applied to the last data bound level
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "toLevel"): number;
 
 	/**
 	 * Specifies to which data bound level to be applied sorting - if -1 sorting should be applied to the last data bound level
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "toLevel", optionValue: number): void;
 
 	/**
 	 * Defines local or remote sorting operations.
-	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "type"): string;
@@ -93049,7 +88754,6 @@ interface JQuery {
 	/**
 	 * Defines local or remote sorting operations.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93057,77 +88761,66 @@ interface JQuery {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss"): boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss", optionValue: boolean): void;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKey"): string;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKey", optionValue: string): void;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue"): string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue", optionValue: string): void;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue"): string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue", optionValue: string): void;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
-	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "mode"): string;
@@ -93135,7 +88828,6 @@ interface JQuery {
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93143,21 +88835,18 @@ interface JQuery {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "customSortFunction"): Function;
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "customSortFunction", optionValue: Function): void;
 
 	/**
 	 * Gets which direction to use on the first click / keydown, if the column is sorted for the first time.
-	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "firstSortDirection"): string;
@@ -93165,7 +88854,6 @@ interface JQuery {
 	/**
 	 * Sets which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93173,14 +88861,12 @@ interface JQuery {
 
 	/**
 	 * Gets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick"): boolean;
 
 	/**
 	 * Sets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick", optionValue: boolean): void;
@@ -93381,7 +89067,6 @@ interface JQuery {
 
 	/**
 	 * Gets width of multiple sorting dialog.
-	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogWidth"): string|number;
@@ -93389,7 +89074,6 @@ interface JQuery {
 	/**
 	 * Sets width of multiple sorting dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93397,7 +89081,6 @@ interface JQuery {
 
 	/**
 	 * Gets height of multiple sorting dialog.
-	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogHeight"): string|number;
@@ -93405,7 +89088,6 @@ interface JQuery {
 	/**
 	 * Sets height of multiple sorting dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93413,42 +89095,36 @@ interface JQuery {
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "columnSettings"): IgGridSortingColumnSetting[];
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridSortingColumnSetting[]): void;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
@@ -93473,28 +89149,24 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
@@ -93678,7 +89350,6 @@ interface IgTreeGridTooltips {
 	/**
 	 * determines the tooltip visibility option
 	 *
-	 *
 	 * Valid values:
 	 * "always" tooltips always show for hovered elements
 	 * "never" tooltips do not show automatically
@@ -93689,7 +89360,6 @@ interface IgTreeGridTooltips {
 	/**
 	 * controls the tooltip's style
 	 *
-	 *
 	 * Valid values:
 	 * "tooltip" The tooltip will be positioned according to the mouse cursor. Will render the tooltip content as plain text.
 	 * "popover" The tooltip will be positioned according to the target element with an arrow pointing the element. This style is more suitable for touch-supported environments. Will render the tooltip content as HTML.
@@ -93699,38 +89369,32 @@ interface IgTreeGridTooltips {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
-	 *
 	 */
 	showDelay?: number;
 
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
-	 *
 	 */
 	hideDelay?: number;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
-	 *
 	 */
 	columnSettings?: IgGridTooltipsColumnSettings;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
-	 *
 	 */
 	fadeTimespan?: number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	cursorLeftOffset?: number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	cursorTopOffset?: number;
 
@@ -93782,7 +89446,6 @@ interface JQuery {
 
 	/**
 	 * Determines the tooltip visibility option
-	 *
 	 */
 
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "visibility"): string;
@@ -93790,7 +89453,6 @@ interface JQuery {
 	/**
 	 * Determines the tooltip visibility option
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93798,7 +89460,6 @@ interface JQuery {
 
 	/**
 	 * Controls the tooltip's style
-	 *
 	 */
 
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "style"): string;
@@ -93806,7 +89467,6 @@ interface JQuery {
 	/**
 	 * Controls the tooltip's style
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93815,7 +89475,6 @@ interface JQuery {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
-	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "showDelay"): number;
 
@@ -93823,7 +89482,6 @@ interface JQuery {
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "showDelay", optionValue: number): void;
@@ -93831,7 +89489,6 @@ interface JQuery {
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
-	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "hideDelay"): number;
 
@@ -93839,63 +89496,54 @@ interface JQuery {
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "hideDelay", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
-	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "columnSettings"): IgGridTooltipsColumnSettings;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridTooltipsColumnSettings): void;
 
 	/**
 	 * The time tooltip fades in and out when showing/hiding
-	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan"): number;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan", optionValue: number): void;
 
 	/**
 	 * The left position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset"): number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset", optionValue: number): void;
 
 	/**
 	 * The top position of the tooltip relative to the mouse cursor
-	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset"): number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset", optionValue: number): void;
@@ -93968,13 +89616,11 @@ interface JQuery {
 interface IgTreeGridUpdatingLocale {
 	/**
 	 * Specifies the add child tooltip text.
-	 *
 	 */
 	addChildTooltip?: string;
 
 	/**
 	 * Specifies the label of the add child button in touch environment.
-	 *
 	 */
 	addChildButtonLabel?: string;
 
@@ -93987,7 +89633,6 @@ interface IgTreeGridUpdatingLocale {
 interface IgTreeGridUpdating {
 	/**
 	 * Specifies whether to enable or disable adding children to rows.
-	 *
 	 */
 	enableAddChild?: boolean;
 
@@ -94006,14 +89651,12 @@ interface IgTreeGridUpdating {
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
-	 *
 	 */
 	columnSettings?: IgGridUpdatingColumnSetting[];
 
 	/**
 	 * Specifies the edit mode.
 	 *
-	 *
 	 * Valid values:
 	 * "row" Editors are shown for all columns that are not read-only. The editor of the clicked cell receives initial focus. Done and Cancel buttons may be displayed based on the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) property.
 	 * "cell" An editor is shown for the cell entering edit mode. The Done and Cancel buttons are not supported for this mode.
@@ -94024,19 +89667,16 @@ interface IgTreeGridUpdating {
 
 	/**
 	 * Specifies if deleting rows through the UI is enabled.
-	 *
 	 */
 	enableDeleteRow?: boolean;
 
 	/**
 	 * Specifies if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
-	 *
 	 */
 	enableAddRow?: boolean;
 
 	/**
 	 * Specifies if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
-	 *
 	 */
 	validation?: boolean;
 
@@ -94098,67 +89738,56 @@ interface IgTreeGridUpdating {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
-	 *
 	 */
 	showDoneCancelButtons?: boolean;
 
 	/**
 	 * Specifies if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
-	 *
 	 */
 	enableDataDirtyException?: boolean;
 
 	/**
 	 * Specifies how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
-	 *
 	 */
 	startEditTriggers?: string|Array<any>;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
-	 *
 	 */
 	horizontalMoveOnEnter?: boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
-	 *
 	 */
 	excelNavigationMode?: boolean;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 	saveChangesSuccessHandler?: Function|string;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 	saveChangesErrorHandler?: Function|string;
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
-	 *
 	 */
 	swipeDistance?: string|number;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
-	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
-	 *
 	 */
 	rowEditDialogOptions?: IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
-	 *
 	 */
 	dialogWidget?: string;
 
@@ -94429,14 +90058,12 @@ interface JQuery {
 
 	/**
 	 * Gets whether to enable or disable adding children to rows.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddChild"): boolean;
 
 	/**
 	 * Sets whether to enable or disable adding children to rows.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddChild", optionValue: boolean): void;
@@ -94473,21 +90100,18 @@ interface JQuery {
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "columnSettings"): IgGridUpdatingColumnSetting[];
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridUpdatingColumnSetting[]): void;
 
 	/**
 	 * Gets the edit mode.
-	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "editMode"): string;
@@ -94495,7 +90119,6 @@ interface JQuery {
 	/**
 	 * Sets the edit mode.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -94503,42 +90126,36 @@ interface JQuery {
 
 	/**
 	 * Gets if deleting rows through the UI is enabled.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow"): boolean;
 
 	/**
 	 * Sets if deleting rows through the UI is enabled.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddRow"): boolean;
 
 	/**
 	 * Sets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "validation"): boolean;
 
 	/**
 	 * Sets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "validation", optionValue: boolean): void;
@@ -94673,35 +90290,30 @@ interface JQuery {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons"): boolean;
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons", optionValue: boolean): void;
 
 	/**
 	 * Gets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException"): boolean;
 
 	/**
 	 * Sets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException", optionValue: boolean): void;
 
 	/**
 	 * Gets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
-	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "startEditTriggers"): string|Array<any>;
@@ -94709,7 +90321,6 @@ interface JQuery {
 	/**
 	 * Sets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -94717,35 +90328,30 @@ interface JQuery {
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter"): boolean;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode"): boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode", optionValue: boolean): void;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "saveChangesSuccessHandler"): Function|string;
@@ -94753,7 +90359,6 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -94761,7 +90366,6 @@ interface JQuery {
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
-	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "saveChangesErrorHandler"): Function|string;
@@ -94769,7 +90373,6 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -94777,7 +90380,6 @@ interface JQuery {
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
-	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "swipeDistance"): string|number;
@@ -94785,7 +90387,6 @@ interface JQuery {
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -94793,42 +90394,36 @@ interface JQuery {
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions"): IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions", optionValue: IgGridUpdatingRowEditDialogOptions): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
-	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -95122,205 +90717,171 @@ interface JQuery {
 interface IgUploadLocale {
 	/**
 	 * Get or set label for the first shown browse button. When file is selected for the first time this button is hidden.
-	 *
 	 */
 	labelUploadButton?: string;
 
 	/**
 	 * Get or set label for browse button in main container.
-	 *
 	 */
 	labelAddButton?: string;
 
 	/**
 	 * Get or set label for summary Clear all button. It will be shown only in multiple upload mode.
-	 *
 	 */
 	labelClearAllButton?: string;
 
 	/**
 	 * Get or set template for showing summary template. {0} is count of uploaded files. {1} is total count of file to be uploaded.
-	 *
 	 */
 	labelSummaryTemplate?: string;
 
 	/**
 	 * Get or set template for showing uploading information in summary progress bar. It will be shown only in multiple upload mode. {0} uploaded filesize. {1} - total file size.
-	 *
 	 */
 	labelSummaryProgressBarTemplate?: string;
 
 	/**
 	 * Get or set label for show/hide details button when main container is hidden.
-	 *
 	 */
 	labelShowDetails?: string;
 
 	/**
 	 * Get or set label for show/hide details button when main container is shown.
-	 *
 	 */
 	labelHideDetails?: string;
 
 	/**
 	 * Get or set label for button cancelling all files. Shown only in multiple upload mode.
-	 *
 	 */
 	labelSummaryProgressButtonCancel?: string;
 
 	/**
 	 * Get or set label for start upload batch files. Shown only in multiple upload mode and autostartupload is false.
-	 *
 	 */
 	labelSummaryProgressButtonContinue?: string;
 
 	/**
 	 * Get or set label when upload is finished. Shown only in multiple upload mode.
-	 *
 	 */
 	labelSummaryProgressButtonDone?: string;
 
 	/**
 	 * Get or set filename when it could not be shown the whole file name and should be shorten.
-	 *
 	 */
 	labelProgressBarFileNameContinue?: string;
 
 	/**
 	 * Get or set message shown when max file size of the uploaded file exceeds the limit.
-	 *
 	 */
 	errorMessageFileSizeExceeded?: string;
 
 	/**
 	 * Get or set error message when ajax call to get file status throws error.
-	 *
 	 */
 	errorMessageGetFileStatus?: string;
 
 	/**
 	 * Get or set error message when ajax call to send cancel upload command.
-	 *
 	 */
 	errorMessageCancelUpload?: string;
 
 	/**
 	 * Get or set error message when file is not found.
-	 *
 	 */
 	errorMessageNoSuchFile?: string;
 
 	/**
 	 * Get or set error message different from the other messages.
-	 *
 	 */
 	errorMessageOther?: string;
 
 	/**
 	 * Get or set error message when file extension validation failed.
-	 *
 	 */
 	errorMessageValidatingFileExtension?: string;
 
 	/**
 	 * Get or set error message when AJAX Request to get file size throws error.
-	 *
 	 */
 	errorMessageAJAXRequestFileSize?: string;
 
 	/**
 	 * Get or set error message when maximum allowed files exceeded.
-	 *
 	 */
 	errorMessageMaxUploadedFiles?: string;
 
 	/**
 	 * Get or set error message when maximum simultaneous files is less or equal to 0.
-	 *
 	 */
 	errorMessageMaxSimultaneousFiles?: string;
 
 	/**
 	 * Get or set error message when trying to remove non existing file.
-	 *
 	 */
 	errorMessageTryToRemoveNonExistingFile?: string;
 
 	/**
 	 * Get or set error message when trying to start non existing file.
-	 *
 	 */
 	errorMessageTryToStartNonExistingFile?: string;
 
 	/**
 	 * Get or set error message when trying to drop more than 1 file and mode is single.
-	 *
 	 */
 	errorMessageDropMultipleFilesWhenSingleModel?: string;
 
 	/**
 	 * Get or set title for the first shown browse button. When file is selected for the first time this button is hidden.
-	 *
 	 */
 	titleUploadFileButtonInit?: string;
 
 	/**
 	 * Get or set title for browse button in main container.
-	 *
 	 */
 	titleAddFileButton?: string;
 
 	/**
 	 * Get or set title for the cancel upload button.
-	 *
 	 */
 	titleCancelUploadButton?: string;
 
 	/**
 	 * Get or set title for start upload batch files. Shown only in multiple upload mode and autostartupload is false.
-	 *
 	 */
 	titleSummaryProgressButtonContinue?: string;
 
 	/**
 	 * Get or set title for summary Clear all button. It will be shown only in multiple upload mode.
-	 *
 	 */
 	titleClearUploaded?: string;
 
 	/**
 	 * Get or set title for show details button.
-	 *
 	 */
 	titleShowDetailsButton?: string;
 
 	/**
 	 * Get or set title for hide details button.
-	 *
 	 */
 	titleHideDetailsButton?: string;
 
 	/**
 	 * Get or set title for button cancelling all files. Shown only in multiple upload mode.
-	 *
 	 */
 	titleSummaryProgressButtonCancel?: string;
 
 	/**
 	 * Get or set title when upload is finished. Shown only in multiple upload mode.
-	 *
 	 */
 	titleSummaryProgressButtonDone?: string;
 
 	/**
 	 * Get or set title for Continue button.
-	 *
 	 */
 	titleSingleUploadButtonContinue?: string;
 
 	/**
 	 * Get or set title for summary Clear all button. It will be shown only in multiple upload mode.
-	 *
 	 */
 	titleClearAllButton?: string;
 
@@ -95620,19 +91181,16 @@ interface OnFormDataSubmitEventUIParam {
 interface IgUpload {
 	/**
 	 * Get or set width of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
-	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * Get or set height of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
-	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * Get or set whether the file start upload automatically when it is selected. Default is false.
-	 *
 	 */
 	autostartupload?: boolean;
 
@@ -95800,79 +91358,66 @@ interface IgUpload {
 
 	/**
 	 * Get or set URL for uploading.
-	 *
 	 */
 	uploadUrl?: string;
 
 	/**
 	 * Get or set URL of HTTPHandler to get information about file upload, current size and also to get commands
-	 *
 	 */
 	progressUrl?: string;
 
 	/**
 	 * Get or set file allowed file extensions. When this array is empty - it is not made such validation. Example ["gif", "jpg", "bmp"].
-	 *
 	 */
 	allowedExtensions?: any[];
 
 	/**
 	 * Get or set whether to show File Extension icon
-	 *
 	 */
 	showFileExtensionIcon?: boolean;
 
 	/**
 	 * Get or set control specific CSS options. For example you can override specific control classes with custom ones.
-	 *
 	 */
 	css?: any;
 
 	/**
 	 * Set icon css classes for specified file extension
-	 *
 	 */
 	fileExtensionIcons?: IgUploadFileExtensionIcons;
 
 	/**
 	 * Get or set multiple or single file upload. In single upload it is possible to upload only one file at the same time.
-	 *
 	 */
 	mode?: any;
 
 	/**
 	 * Get or set a bool setting that allows user to select(for upload) more than 1 file from the browse dialog at once. HTML 5+ - it is supported by Chrome, MOzilla FF, Safar, Opera latest versions and IE10+
-	 *
 	 */
 	multipleFiles?: boolean;
 
 	/**
 	 * Get or set the maximum number of allowed files to upload.
-	 *
 	 */
 	maxUploadedFiles?: number;
 
 	/**
 	 * Get or set count of files that could be uploaded at the same time.
-	 *
 	 */
 	maxSimultaneousFilesUploads?: number;
 
 	/**
 	 * Get or set file size metrics how to be shown files size.
-	 *
 	 */
 	fileSizeMetric?: any;
 
 	/**
 	 * UniqueId of the control - should not be changed by developer. Set from server-side wrapper.
-	 *
 	 */
 	controlId?: string;
 
 	/**
 	 * The number of digits after the decimal point.
-	 *
 	 */
 	fileSizeDecimalDisplay?: number;
 
@@ -96055,7 +91600,6 @@ interface JQuery {
 
 	/**
 	 * Get or set width of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
-	 *
 	 */
 
 	igUpload(optionLiteral: 'option', optionName: "width"): number|string;
@@ -96063,7 +91607,6 @@ interface JQuery {
 	/**
 	 * Get or set width of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -96071,7 +91614,6 @@ interface JQuery {
 
 	/**
 	 * Get or set height of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
-	 *
 	 */
 
 	igUpload(optionLiteral: 'option', optionName: "height"): number|string;
@@ -96079,7 +91621,6 @@ interface JQuery {
 	/**
 	 * Get or set height of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -96087,14 +91628,12 @@ interface JQuery {
 
 	/**
 	 * Get or set whether the file start upload automatically when it is selected. Default is false.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "autostartupload"): boolean;
 
 	/**
 	 * Get or set whether the file start upload automatically when it is selected. Default is false.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "autostartupload", optionValue: boolean): void;
@@ -96471,182 +92010,156 @@ interface JQuery {
 
 	/**
 	 * Get or set URL for uploading.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "uploadUrl"): string;
 
 	/**
 	 * Get or set URL for uploading.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "uploadUrl", optionValue: string): void;
 
 	/**
 	 * Get or set URL of HTTPHandler to get information about file upload, current size and also to get commands
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "progressUrl"): string;
 
 	/**
 	 * Get or set URL of HTTPHandler to get information about file upload, current size and also to get commands
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "progressUrl", optionValue: string): void;
 
 	/**
 	 * Get or set file allowed file extensions. When this array is empty - it is not made such validation. Example ["gif", "jpg", "bmp"].
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "allowedExtensions"): any[];
 
 	/**
 	 * Get or set file allowed file extensions. When this array is empty - it is not made such validation. Example ["gif", "jpg", "bmp"].
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "allowedExtensions", optionValue: any[]): void;
 
 	/**
 	 * Get or set whether to show File Extension icon
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "showFileExtensionIcon"): boolean;
 
 	/**
 	 * Get or set whether to show File Extension icon
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "showFileExtensionIcon", optionValue: boolean): void;
 
 	/**
 	 * Get or set control specific CSS options. For example you can override specific control classes with custom ones.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "css"): any;
 
 	/**
 	 * Get or set control specific CSS options. For example you can override specific control classes with custom ones.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "css", optionValue: any): void;
 
 	/**
 	 * Set icon css classes for specified file extension
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileExtensionIcons"): IgUploadFileExtensionIcons;
 
 	/**
 	 * Set icon css classes for specified file extension
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileExtensionIcons", optionValue: IgUploadFileExtensionIcons): void;
 
 	/**
 	 * Get or set multiple or single file upload. In single upload it is possible to upload only one file at the same time.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "mode"): any;
 
 	/**
 	 * Get or set multiple or single file upload. In single upload it is possible to upload only one file at the same time.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "mode", optionValue: any): void;
 
 	/**
 	 * Get or set a bool setting that allows user to select(for upload) more than 1 file from the browse dialog at once. HTML 5+ - it is supported by Chrome, MOzilla FF, Safar, Opera latest versions and IE10+
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "multipleFiles"): boolean;
 
 	/**
 	 * Get or set a bool setting that allows user to select(for upload) more than 1 file from the browse dialog at once. HTML 5+ - it is supported by Chrome, MOzilla FF, Safar, Opera latest versions and IE10+
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "multipleFiles", optionValue: boolean): void;
 
 	/**
 	 * Get or set the maximum number of allowed files to upload.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxUploadedFiles"): number;
 
 	/**
 	 * Get or set the maximum number of allowed files to upload.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxUploadedFiles", optionValue: number): void;
 
 	/**
 	 * Get or set count of files that could be uploaded at the same time.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxSimultaneousFilesUploads"): number;
 
 	/**
 	 * Get or set count of files that could be uploaded at the same time.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxSimultaneousFilesUploads", optionValue: number): void;
 
 	/**
 	 * Get or set file size metrics how to be shown files size.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeMetric"): any;
 
 	/**
 	 * Get or set file size metrics how to be shown files size.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeMetric", optionValue: any): void;
 
 	/**
 	 * UniqueId of the control - should not be changed by developer. Set from server-side wrapper.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "controlId"): string;
 
 	/**
 	 * UniqueId of the control - should not be changed by developer. Set from server-side wrapper.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "controlId", optionValue: string): void;
 
 	/**
 	 * The number of digits after the decimal point.
-	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeDecimalDisplay"): number;
 
 	/**
 	 * The number of digits after the decimal point.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeDecimalDisplay", optionValue: number): void;
@@ -96798,7 +92311,6 @@ interface IgValidatorField {
 	/**
 	 * Gets the target element (input or control target) to be validated. This field setting is required.
 	 *
-	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to a jQuery object
@@ -97237,27 +92749,23 @@ interface IgValidator {
 	 * Gets/Sets whether validation is triggered when the text in editor changes.
 	 * Note that this is more appropriate for selection controls such as checkbox, combo or rating.
 	 * As it can cause excessive messages with text-based fields, the initial validation can be delayed via the [threshold](ui.igvalidator#options:threshold) option.
-	 *
 	 */
 	onchange?: boolean;
 
 	/**
 	 * Gets/Sets whether validation is triggered when the editor loses focus.
-	 *
 	 */
 	onblur?: boolean;
 
 	/**
 	 * Gets/Sets whether validation is triggered when a form containing validation targets is submitting. If any of the validations fail, the submit action will be prevented.
 	 * Note that this doesn't apply to the native JavaScript submit function, but will handle the jQuery equivalent and the browser default action.
-	 *
 	 */
 	onsubmit?: boolean;
 
 	/**
 	 * Gets/Sets option to validate if a value was entered (not empty text, selected item, etc.)
 	 *
-	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field is required.
 	 * "object" A configuration object with optional error message (e.g. required: { errorMessage: "Error!"} )
@@ -97267,7 +92775,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets number validation rule options.Default separators for decimals and thousands are '.' and ',' respectively and are defined in the "$.ui.igValidator.defaults" object.
 	 *
-	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be a number. Default separators are used.
 	 * "object" A configuration object with errorMessage, decimalSeparator and thousandsSeparator. Those properties are all optional.
@@ -97277,7 +92784,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets date validation rule options. This can additionally help guide the [valueRange](ui.igvalidator#options:valueRange) validation.Note: Dependant on JavaScript Date parsing which will accept a wide range of values.
 	 *
-	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be a valid JavaScript Date or can be parsed as one.
 	 * "object" A configuration object with optional error message (e.g. date: { errorMessage: "Enter a valid number"} )
@@ -97287,7 +92793,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets email validation rule options. Uses a RegExp defined in the "$.ui.igValidator.defaults" object.
 	 *
-	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be an email.
 	 * "object" A configuration object with optional error message (e.g. email: { errorMessage: "Enter a valid email"} )
@@ -97297,7 +92802,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets a minimum and/or maximum length of text or number of selected items. Null or 0 values are ignored.
 	 *
-	 *
 	 * Valid values:
 	 * "array" An array of two numbers, where the first value is the minimum and the second is the maximum. (e.g. lengthRange: [ 1, 10] )
 	 * "object" A configuration object with optional error message. Message strings can contain format items for min and max respectively (e.g. lengthRange: { min: 6, max: 20, errorMessage: "Password must be at least {0} long and no more than {1}." } )
@@ -97307,7 +92811,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets a minimum and/or maximum value. Null values are ignored.
 	 *
-	 *
 	 * Valid values:
 	 * "array" An array of two numbers or dates, where the first is the minimum and the second is the maximum. (e.g. valueRange: [ 1, 10] )
 	 * "object" A configuration object with optional error message. Message strings can contain format items for min and max respectively (e.g. lengthRange: { min: 6, max: 20, errorMessage: "Value must be between {0} and {1}." } )
@@ -97317,7 +92820,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets Credit Card number validation rule options.Note: This rule will only validate the checksum of the number using Luhn algorithm irregardless of card type.
 	 *
-	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be a valid Credit Card number.
 	 * "object" A configuration object with optional error message (e.g. creditCard: { errorMessage: "Enter a valid card number"} )
@@ -97327,7 +92829,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets regular expression validation rule options.
 	 *
-	 *
 	 * Valid values:
 	 * "string" A string containing regular expression.
 	 * "object" A RegExp object or an object with expression and errorMessage properties.
@@ -97337,39 +92838,33 @@ interface IgValidator {
 	/**
 	 * Gets/Sets if all rules for a field should be checked, so even if one fails the rest will continue executing.
 	 * Note: This will not force checks on an empty field for rules that don't normally execute without a value.
-	 *
 	 */
 	executeAllRules?: boolean;
 
 	/**
 	 * Gets/Sets a custom jQuery element to be used for validation messages. That inner HTML of the target is modified, can be a SPAN, LABEL or DIV.
-	 *
 	 */
 	messageTarget?: Element;
 
 	/**
 	 * Gets/Sets text for an error message to be used if none is set for the particular rule. Overrides default rule-specific error messages.
-	 *
 	 */
 	errorMessage?: string;
 
 	/**
 	 * Gets/Sets text for a success message. Note that since there is no default, setting this message will enable showing success indication.
-	 *
 	 */
 	successMessage?: string;
 
 	/**
 	 * Gets/Sets validation minimum input length. Validation won't be triggered for input before that value is reached on change and focus loss.
 	 * Note: This will not affect required fields on form submit.
-	 *
 	 */
 	threshold?: number;
 
 	/**
 	 * Gets/Sets a requirement for the value in this field to be the same as another input element or editor control.
 	 *
-	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the target element
 	 * "object" A reference to the jQuery object for the target or an object with selector property and custom errorMessage.
@@ -97379,7 +92874,6 @@ interface IgValidator {
 	/**
 	 * Gets/Sets a custom function to perform validation. Use 'this' to reference the calling validator and the value and optional field settings arguments to determine and return the state of the field.
 	 *
-	 *
 	 * Valid values:
 	 * "function" The function to call
 	 * "string" Function name, must be in global namespace (window["name"])
@@ -97390,27 +92884,23 @@ interface IgValidator {
 	/**
 	 * Gets a list of target field items describing each with validation options and a required selector. Fields can contain any of the validation rules and triggers but not other fields or event handlers.
 	 * Applicable options are also inherited from the global control configuration if not set.
-	 *
 	 */
 	fields?: IgValidatorField[];
 
 	/**
 	 * Gets/Sets the options for the [igNotifier](ui.ignotifier#options) used to show error messages.
-	 *
 	 */
 	notificationOptions?: any;
 
 	/**
 	 * Gets/Sets the option to show an asterisks indication next to required fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
-	 *
 	 */
 	requiredIndication?: boolean;
 
 	/**
 	 * Gets/Sets the option to show a label indication next to optional fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
-	 *
 	 */
 	optionalIndication?: boolean;
 
@@ -97621,15 +93111,11 @@ class IgValidatorBaseRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
-	 *
-	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97676,8 +93162,6 @@ class IgValidatorRequiredRule {
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97702,8 +93186,6 @@ class IgValidatorControlRule {
 
 	/**
 	 * Returns an error message for the rule from options
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): void;
 	shouldRun(options: Object, value: Object): void;
@@ -97731,15 +93213,11 @@ class IgValidatorNumberRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
-	 *
-	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97773,15 +93251,11 @@ class IgValidatorDateRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
-	 *
-	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97815,8 +93289,6 @@ class IgValidatorLengthRule {
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97863,15 +93335,11 @@ class IgValidatorEqualToRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
-	 *
-	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97905,15 +93373,11 @@ class IgValidatorEmailRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
-	 *
-	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97947,15 +93411,11 @@ class IgValidatorPatternRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
-	 *
-	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -97990,8 +93450,6 @@ class IgValidatorCustomRule {
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -98017,24 +93475,17 @@ class IgValidatorCreditCardRule {
 	 * Based on ASP.NET CreditCardAttribute check,
 	 * https://github.com/Microsoft/referencesource/blob/master/System.ComponentModel.DataAnnotations/DataAnnotations/CreditCardAttribute.cs
 	 *    using Luhn algorithm https://en.wikipedia.org/wiki/Luhn_algorithm
-	 *
-	 * @param options
-	 * @param value
 	 */
 	isValid(options: Object, value: Object): void;
 
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
-	 *
-	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
-	 *
-	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -98074,7 +93525,6 @@ interface JQuery {
 	 * Gets/Sets whether validation is triggered when the text in editor changes.
 	 * Note that this is more appropriate for selection controls such as checkbox, combo or rating.
 	 * As it can cause excessive messages with text-based fields, the initial validation can be delayed via the [threshold](ui.igvalidator#options:threshold) option.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onchange"): boolean;
 
@@ -98083,21 +93533,18 @@ interface JQuery {
 	 * Note that this is more appropriate for selection controls such as checkbox, combo or rating.
 	 * As it can cause excessive messages with text-based fields, the initial validation can be delayed via the [threshold](ui.igvalidator#options:threshold) option.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onchange", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether validation is triggered when the editor loses focus.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onblur"): boolean;
 
 	/**
 	 * /Sets whether validation is triggered when the editor loses focus.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onblur", optionValue: boolean): void;
@@ -98105,7 +93552,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether validation is triggered when a form containing validation targets is submitting. If any of the validations fail, the submit action will be prevented.
 	 * Note that this doesn't apply to the native JavaScript submit function, but will handle the jQuery equivalent and the browser default action.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onsubmit"): boolean;
 
@@ -98113,14 +93559,12 @@ interface JQuery {
 	 * /Sets whether validation is triggered when a form containing validation targets is submitting. If any of the validations fail, the submit action will be prevented.
 	 * Note that this doesn't apply to the native JavaScript submit function, but will handle the jQuery equivalent and the browser default action.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onsubmit", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets option to validate if a value was entered (not empty text, selected item, etc.)
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "required"): boolean|Object;
@@ -98128,7 +93572,6 @@ interface JQuery {
 	/**
 	 * /Sets option to validate if a value was entered (not empty text, selected item, etc.)
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98136,7 +93579,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets number validation rule options.Default separators for decimals and thousands are '.' and ',' respectively and are defined in the "$.ui.igValidator.defaults" object.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "number"): boolean|Object;
@@ -98144,7 +93586,6 @@ interface JQuery {
 	/**
 	 * /Sets number validation rule options.Default separators for decimals and thousands are '.' and ',' respectively and are defined in the "$.ui.igValidator.defaults" object.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98152,7 +93593,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets date validation rule options. This can additionally help guide the [valueRange](ui.igvalidator#options:valueRange) validation.Note: Dependant on JavaScript Date parsing which will accept a wide range of values.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "date"): boolean|Object;
@@ -98160,7 +93600,6 @@ interface JQuery {
 	/**
 	 * /Sets date validation rule options. This can additionally help guide the [valueRange](ui.igvalidator#options:valueRange) validation.Note: Dependant on JavaScript Date parsing which will accept a wide range of values.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98168,7 +93607,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets email validation rule options. Uses a RegExp defined in the "$.ui.igValidator.defaults" object.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "email"): boolean|Object;
@@ -98176,7 +93614,6 @@ interface JQuery {
 	/**
 	 * /Sets email validation rule options. Uses a RegExp defined in the "$.ui.igValidator.defaults" object.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98184,7 +93621,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a minimum and/or maximum length of text or number of selected items. Null or 0 values are ignored.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "lengthRange"): Array<any>|Object;
@@ -98192,7 +93628,6 @@ interface JQuery {
 	/**
 	 * /Sets a minimum and/or maximum length of text or number of selected items. Null or 0 values are ignored.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98200,7 +93635,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a minimum and/or maximum value. Null values are ignored.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "valueRange"): Array<any>|Object;
@@ -98208,7 +93642,6 @@ interface JQuery {
 	/**
 	 * /Sets a minimum and/or maximum value. Null values are ignored.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98216,7 +93649,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets Credit Card number validation rule options.Note: This rule will only validate the checksum of the number using Luhn algorithm irregardless of card type.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "creditCard"): boolean|Object;
@@ -98224,7 +93656,6 @@ interface JQuery {
 	/**
 	 * /Sets Credit Card number validation rule options.Note: This rule will only validate the checksum of the number using Luhn algorithm irregardless of card type.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98232,7 +93663,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets regular expression validation rule options.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "pattern"): string|Object;
@@ -98240,7 +93670,6 @@ interface JQuery {
 	/**
 	 * /Sets regular expression validation rule options.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98249,7 +93678,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets if all rules for a field should be checked, so even if one fails the rest will continue executing.
 	 * Note: This will not force checks on an empty field for rules that don't normally execute without a value.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "executeAllRules"): boolean;
 
@@ -98257,49 +93685,42 @@ interface JQuery {
 	 * /Sets if all rules for a field should be checked, so even if one fails the rest will continue executing.
 	 * Note: This will not force checks on an empty field for rules that don't normally execute without a value.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "executeAllRules", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets a custom jQuery element to be used for validation messages. That inner HTML of the target is modified, can be a SPAN, LABEL or DIV.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "messageTarget"): Element;
 
 	/**
 	 * /Sets a custom jQuery element to be used for validation messages. That inner HTML of the target is modified, can be a SPAN, LABEL or DIV.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "messageTarget", optionValue: Element): void;
 
 	/**
 	 * Gets/Sets text for an error message to be used if none is set for the particular rule. Overrides default rule-specific error messages.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "errorMessage"): string;
 
 	/**
 	 * /Sets text for an error message to be used if none is set for the particular rule. Overrides default rule-specific error messages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "errorMessage", optionValue: string): void;
 
 	/**
 	 * Gets/Sets text for a success message. Note that since there is no default, setting this message will enable showing success indication.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "successMessage"): string;
 
 	/**
 	 * /Sets text for a success message. Note that since there is no default, setting this message will enable showing success indication.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "successMessage", optionValue: string): void;
@@ -98307,7 +93728,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets validation minimum input length. Validation won't be triggered for input before that value is reached on change and focus loss.
 	 * Note: This will not affect required fields on form submit.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "threshold"): number;
 
@@ -98315,14 +93735,12 @@ interface JQuery {
 	 * /Sets validation minimum input length. Validation won't be triggered for input before that value is reached on change and focus loss.
 	 * Note: This will not affect required fields on form submit.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "threshold", optionValue: number): void;
 
 	/**
 	 * Gets/Sets a requirement for the value in this field to be the same as another input element or editor control.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "equalTo"): string|Object;
@@ -98330,7 +93748,6 @@ interface JQuery {
 	/**
 	 * /Sets a requirement for the value in this field to be the same as another input element or editor control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98338,7 +93755,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a custom function to perform validation. Use 'this' to reference the calling validator and the value and optional field settings arguments to determine and return the state of the field.
-	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "custom"): Function|string|Object;
@@ -98346,7 +93762,6 @@ interface JQuery {
 	/**
 	 * /Sets a custom function to perform validation. Use 'this' to reference the calling validator and the value and optional field settings arguments to determine and return the state of the field.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -98355,7 +93770,6 @@ interface JQuery {
 	/**
 	 * Gets a list of target field items describing each with validation options and a required selector. Fields can contain any of the validation rules and triggers but not other fields or event handlers.
 	 * Applicable options are also inherited from the global control configuration if not set.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "fields"): IgValidatorField[];
 
@@ -98363,21 +93777,18 @@ interface JQuery {
 	 * A list of target field items describing each with validation options and a required selector. Fields can contain any of the validation rules and triggers but not other fields or event handlers.
 	 * Applicable options are also inherited from the global control configuration if not set.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "fields", optionValue: IgValidatorField[]): void;
 
 	/**
 	 * Gets/Sets the options for the [igNotifier](ui.ignotifier#options) used to show error messages.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "notificationOptions"): any;
 
 	/**
 	 * /Sets the options for the [igNotifier](ui.ignotifier#options) used to show error messages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "notificationOptions", optionValue: any): void;
@@ -98385,7 +93796,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the option to show an asterisks indication next to required fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button  and the igRating control.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "requiredIndication"): boolean;
 
@@ -98393,7 +93803,6 @@ interface JQuery {
 	 * /Sets the option to show an asterisks indication next to required fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "requiredIndication", optionValue: boolean): void;
@@ -98401,7 +93810,6 @@ interface JQuery {
 	/**
 	 * Gets/Sets the option to show a label indication next to optional fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button  and the igRating control.
-	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "optionalIndication"): boolean;
 
@@ -98409,7 +93817,6 @@ interface JQuery {
 	 * /Sets the option to show a label indication next to optional fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "optionalIndication", optionValue: boolean): void;
@@ -98686,19 +94093,16 @@ interface JQuery {
 interface IgVideoPlayerBookmark {
 	/**
 	 * Gets/Sets where the bookmark will be positioned. Should be between 0 and movie duration in seconds.
-	 *
 	 */
 	time?: number;
 
 	/**
 	 * Gets/Sets bookmark title. It is shown as tooltip on hover.
-	 *
 	 */
 	title?: string;
 
 	/**
 	 * Gets/Sets whether the bookmark is disabled or not.
-	 *
 	 */
 	disabled?: boolean;
 
@@ -98711,43 +94115,36 @@ interface IgVideoPlayerBookmark {
 interface IgVideoPlayerRelatedVideo {
 	/**
 	 * Gets/Sets the URL of the related video image.
-	 *
 	 */
 	imageUrl?: string;
 
 	/**
 	 * Gets/Sets the title of the video.
-	 *
 	 */
 	title?: string;
 
 	/**
 	 * Gets/Sets the width of the related video image.
-	 *
 	 */
 	width?: number;
 
 	/**
 	 * Gets/Sets the height of the related video image.
-	 *
 	 */
 	height?: number;
 
 	/**
 	 * Gets/Sets a link to a page that will play the related video. It will be opened in a new window. If there are sources also, the link property has a priority.
-	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the sources of the related video.
-	 *
 	 */
 	sources?: any[];
 
 	/**
 	 * Gets/Sets custom CSS class to be applied on the related video element.
-	 *
 	 */
 	css?: string;
 
@@ -98760,73 +94157,61 @@ interface IgVideoPlayerRelatedVideo {
 interface IgVideoPlayerBanner {
 	/**
 	 * Gets/Sets the banner image url.
-	 *
 	 */
 	imageUrl?: string;
 
 	/**
 	 * Gets/Sets an array of numbers. Each number specifies on which second in the movie the banner will pop.
-	 *
 	 */
 	times?: any[];
 
 	/**
 	 * Gets/Sets whether the user will be able to close the banner or not.
-	 *
 	 */
 	closeBanner?: boolean;
 
 	/**
 	 * Gets/Sets whether to apply animation effects when showing or hiding the banner. If set to true, the animation is played for banner.duration in milliseconds.
-	 *
 	 */
 	animate?: boolean;
 
 	/**
 	 * Gets/Sets whether the banner is visible or not.
-	 *
 	 */
 	visible?: boolean;
 
 	/**
 	 * Gets/Sets the banner animation duration.
-	 *
 	 */
 	duration?: number;
 
 	/**
 	 * Gets/Sets whether to automatically hide the banner. If set to true, the banner is hidden after [hidedelay](ui.igvideoplayer#options:banners.hidedelay) in milliseconds.
-	 *
 	 */
 	autohide?: boolean;
 
 	/**
 	 * Gets/Sets the banner autohide delay in milliseconds. It is taken into account only if the banner.autohide option is set to true.
-	 *
 	 */
 	hidedelay?: number;
 
 	/**
 	 * Gets/Sets the banner link that will open in new window.
-	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the banner width
-	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * Gets/Sets the banner height
-	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * Gets/Sets the banner specific css class, that will be applied on the banner grid.
-	 *
 	 */
 	css?: string;
 
@@ -98839,25 +94224,21 @@ interface IgVideoPlayerBanner {
 interface IgVideoPlayerCommercialsLinkedCommercial {
 	/**
 	 * Gets/Sets the sources of the linked commercial video.
-	 *
 	 */
 	sources?: any[];
 
 	/**
 	 * Gets/Sets the second in the video at which the linked commercial should play.
-	 *
 	 */
 	startTime?: number;
 
 	/**
 	 * Gets/Sets the link to open on linked commercial click.
-	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the tooltip for the linked commercial bookmark.
-	 *
 	 */
 	title?: string;
 
@@ -98870,25 +94251,21 @@ interface IgVideoPlayerCommercialsLinkedCommercial {
 interface IgVideoPlayerCommercialsEmbeddedCommercial {
 	/**
 	 * Gets/Sets the start second of the embedded commercial.
-	 *
 	 */
 	startTime?: number;
 
 	/**
 	 * Gets/Sets the end second of the embedded commercial.
-	 *
 	 */
 	endTime?: number;
 
 	/**
 	 * Gets/Sets the sponsored link of the embedded commercial.
-	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the tooltip for the bookmark of the embedded commercial.
-	 *
 	 */
 	title?: string;
 
@@ -98901,25 +94278,21 @@ interface IgVideoPlayerCommercialsEmbeddedCommercial {
 interface IgVideoPlayerCommercialsAdMessage {
 	/**
 	 * Gets/Sets whether to apply an animation effect when showing or hiding the ad message. If set to true, the animation is played for [animationDuration](ui.igvideoplayer#options:commercials.adMessage.animationDuration) in milliseconds.
-	 *
 	 */
 	animate?: boolean;
 
 	/**
 	 * Gets/Sets the ad message auto hide of the commercial.
-	 *
 	 */
 	autoHide?: boolean;
 
 	/**
 	 * Gets/Sets the ad message hide delay.
-	 *
 	 */
 	hideDelay?: number;
 
 	/**
 	 * Gets/Sets the ad message animation duration of the commercial.
-	 *
 	 */
 	animationDuration?: number;
 
@@ -98932,31 +94305,26 @@ interface IgVideoPlayerCommercialsAdMessage {
 interface IgVideoPlayerCommercials {
 	/**
 	 * Gets/Sets an array of linked commercial objects. A linked commercial is a separate video file that will be played in the specified position of the original movie clip by [startTime](ui.igvideoplayer#options:commercials.linkedCommercials.startTime). This feature is useful if you have frequently changing outside commercial sources.
-	 *
 	 */
 	linkedCommercials?: IgVideoPlayerCommercialsLinkedCommercial[];
 
 	/**
 	 * Gets/Sets an array of embedded commercials objects. An embedded commercial is an ad that is contained in the original video file. It is suitable when you want to mark some sections of the video as commercials.
-	 *
 	 */
 	embeddedCommercials?: IgVideoPlayerCommercialsEmbeddedCommercial[];
 
 	/**
 	 * Gets/Sets whether the commercials will play againg during the repetitive video plays.
-	 *
 	 */
 	alwaysPlayCommercials?: boolean;
 
 	/**
 	 * Gets/Sets whether to show commercial locations or not.
-	 *
 	 */
 	showBookmarks?: boolean;
 
 	/**
 	 * Customizes the ad message settings of the commercial. Ad message shows the duration of the commercial and pops up when the commercial starts playing.
-	 *
 	 */
 	adMessage?: IgVideoPlayerCommercialsAdMessage;
 
@@ -98969,115 +94337,96 @@ interface IgVideoPlayerCommercials {
 interface IgVideoPlayerLocale {
 	/**
 	 * Gets/Sets live stream video title.
-	 *
 	 */
 	liveStream?: boolean;
 
 	/**
 	 * Gets/Sets live video title.
-	 *
 	 */
 	live?: boolean;
 
 	/**
 	 * Gets/Sets paused button title.
-	 *
 	 */
 	paused?: boolean;
 
 	/**
 	 * Gets/Sets playing button title.
-	 *
 	 */
 	playing?: boolean;
 
 	/**
 	 * Gets/Sets play button title.
-	 *
 	 */
 	play?: boolean;
 
 	/**
 	 * Gets/Sets volume button title.
-	 *
 	 */
 	volume?: boolean;
 
 	/**
 	 * Gets/Sets progress label long format.
-	 *
 	 */
 	progressLabelLongFormat?: boolean;
 
 	/**
 	 * Gets/Sets progress label short format.
-	 *
 	 */
 	progressLabelShortFormat?: boolean;
 
 	/**
 	 * Gets/Sets enter fullscreen button title.
-	 *
 	 */
 	enterFullscreen?: boolean;
 
 	/**
 	 * Gets/Sets exit fullscreen button title.
-	 *
 	 */
 	exitFullscreen?: boolean;
 
 	/**
 	 * Gets/Sets skip to button title.
-	 *
 	 */
 	skipTo?: boolean;
 
 	/**
 	 * Gets/Sets buffering label text.
-	 *
 	 */
 	buffering?: boolean;
 
 	/**
 	 * Gets/Sets ad message text.
-	 *
 	 */
 	adMessage?: boolean;
 
 	/**
 	 * Gets/Sets long ad message text.
-	 *
 	 */
 	adMessageLong?: boolean;
 
 	/**
 	 * Gets/Sets ad message text when no duration is specified.
-	 *
 	 */
 	adMessageNoDuration?: boolean;
 
 	/**
 	 * Gets/Sets new ad window title.
-	 *
 	 */
 	adNewWindowTip?: boolean;
 
 	/**
 	 * Gets/Sets related videos text.
-	 *
 	 */
 	relatedVideos?: boolean;
 
 	/**
 	 * Gets/Sets replay button text.
-	 *
 	 */
 	replayButton?: boolean;
 
 	/**
 	 * Gets/Sets replay button tooltip.
-	 *
 	 */
 	replayTooltip?: boolean;
 
@@ -99287,127 +94636,106 @@ interface BannerClickEventUIParam {
 interface IgVideoPlayer {
 	/**
 	 * Gets/Sets a list of video sources to choose from. Best coded/format is automatically detected by the control. Supported types are depending on the browser and could be one of the following mov, mp4, webm, ogg.
-	 *
 	 */
 	sources?: any[];
 
 	/**
 	 * Gets/Sets the width of the control. By default null will stretch the control to fit data, if no other widths are defined.
-	 *
 	 */
 	width?: string|number;
 
 	/**
 	 * Gets/Sets the height of the control. By default null will stretch the control to fit data, if no other heights are defined.
-	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * Gets/Sets a URL to an image to show, when no video data is available.
-	 *
 	 */
 	posterUrl?: string;
 
 	/**
 	 * Gets/Sets whether to preload load initial data for duration of video. If true it may start buffering the video, but this highly depends on the specific browser implementation.
-	 *
 	 */
 	preload?: boolean;
 
 	/**
 	 * Gets/Sets whether the video should start playing immediately after the control is loaded.
-	 *
 	 */
 	autoplay?: boolean;
 
 	/**
 	 * Gets/Sets whether player controls will auto hide when video is not hovered. This is applicable only when Infragistics playback controls are used.
-	 *
 	 */
 	autohide?: boolean;
 
 	/**
 	 * Gets/Sets volume slider auto hide delay. This is applicable only when Infragistics playback controls are used.
-	 *
 	 */
 	volumeAutohideDelay?: number;
 
 	/**
 	 * Gets/Sets the center big button hide delay.
-	 *
 	 */
 	centerButtonHideDelay?: number;
 
 	/**
 	 * Gets/Sets whether the video to start again after it has ended.
-	 *
 	 */
 	loop?: boolean;
 
 	/**
 	 * Gets/Sets whether if you want to use the built in browser controls. By default player uses Infragistics playback controls. Note that you may have different look and feel across different browsers if you use the built in browser controls. When this option is set to true, no [commercials](ui.igvideoplayer#options:commercials) will be displayed as they are not supported.
-	 *
 	 */
 	browserControls?: boolean;
 
 	/**
 	 * Gets/Sets whether the video player to be in full screen or not. This is not a pure full screen, because browsers do not allow that. It just sets 100% width and height to the control.
-	 *
 	 */
 	fullscreen?: boolean;
 
 	/**
 	 * Gets/Sets the video volume. It can be between 0.0 and 1.0.
-	 *
 	 */
 	volume?: number;
 
 	/**
 	 * Gets/Sets whether the video volume is muted.
-	 *
 	 */
 	muted?: boolean;
 
 	/**
 	 * Gets/Sets video title.
-	 *
 	 */
 	title?: string;
 
 	/**
 	 * Gets/Sets whether the control seek tool tip will be shown when hovering the video progress bar.
-	 *
 	 */
 	showSeekTime?: boolean;
 
 	/**
 	 * Gets/Sets the format of the video progress label. You should use ${currentTime} to represent current playback position and ${duration} to represent video duration.
-	 *
 	 */
 	progressLabelFormat?: string;
 
 	/**
 	 * Gets/Sets an array of bookmarks that will be displayed in the video player control.
-	 *
 	 */
 	bookmarks?: IgVideoPlayerBookmark[];
 
 	/**
 	 * Gets/Sets an array of related videos that will be displayed when video playback has ended.
-	 *
 	 */
 	relatedVideos?: IgVideoPlayerRelatedVideo[];
 
 	/**
 	 * Gets/Sets an array of banner objects that will show the banners when the video clip is played.
-	 *
 	 */
 	banners?: IgVideoPlayerBanner[];
 
 	/**
 	 * Gets/Sets an array of commercials objects that will be displayed when the video is playing. Note that [broswerControls](ui.igvideoplayer#options:browserControls) doesn't support commercials.
-	 *
 	 */
 	commercials?: IgVideoPlayerCommercials;
 	locale?: IgVideoPlayerLocale;
@@ -99691,21 +95019,18 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a list of video sources to choose from. Best coded/format is automatically detected by the control. Supported types are depending on the browser and could be one of the following mov, mp4, webm, ogg.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "sources"): any[];
 
 	/**
 	 * /Sets a list of video sources to choose from. Best coded/format is automatically detected by the control. Supported types are depending on the browser and could be one of the following mov, mp4, webm, ogg.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "sources", optionValue: any[]): void;
 
 	/**
 	 * Gets/Sets the width of the control. By default null will stretch the control to fit data, if no other widths are defined.
-	 *
 	 */
 
 	igVideoPlayer(optionLiteral: 'option', optionName: "width"): string|number;
@@ -99713,7 +95038,6 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control. By default null will stretch the control to fit data, if no other widths are defined.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -99721,7 +95045,6 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control. By default null will stretch the control to fit data, if no other heights are defined.
-	 *
 	 */
 
 	igVideoPlayer(optionLiteral: 'option', optionName: "height"): string|number;
@@ -99729,7 +95052,6 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control. By default null will stretch the control to fit data, if no other heights are defined.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -99737,252 +95059,216 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a URL to an image to show, when no video data is available.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "posterUrl"): string;
 
 	/**
 	 * /Sets a URL to an image to show, when no video data is available.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "posterUrl", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether to preload load initial data for duration of video. If true it may start buffering the video, but this highly depends on the specific browser implementation.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "preload"): boolean;
 
 	/**
 	 * /Sets whether to preload load initial data for duration of video. If true it may start buffering the video, but this highly depends on the specific browser implementation.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "preload", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the video should start playing immediately after the control is loaded.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autoplay"): boolean;
 
 	/**
 	 * /Sets whether the video should start playing immediately after the control is loaded.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autoplay", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether player controls will auto hide when video is not hovered. This is applicable only when Infragistics playback controls are used.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autohide"): boolean;
 
 	/**
 	 * /Sets whether player controls will auto hide when video is not hovered. This is applicable only when Infragistics playback controls are used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autohide", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets volume slider auto hide delay. This is applicable only when Infragistics playback controls are used.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volumeAutohideDelay"): number;
 
 	/**
 	 * /Sets volume slider auto hide delay. This is applicable only when Infragistics playback controls are used.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volumeAutohideDelay", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the center big button hide delay.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "centerButtonHideDelay"): number;
 
 	/**
 	 * /Sets the center big button hide delay.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "centerButtonHideDelay", optionValue: number): void;
 
 	/**
 	 * Gets/Sets whether the video to start again after it has ended.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "loop"): boolean;
 
 	/**
 	 * /Sets whether the video to start again after it has ended.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "loop", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether if you want to use the built in browser controls. By default player uses Infragistics playback controls. Note that you may have different look and feel across different browsers if you use the built in browser controls. When this option is set to true, no [commercials](ui.igvideoplayer#options:commercials) will be displayed as they are not supported.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "browserControls"): boolean;
 
 	/**
 	 * /Sets whether if you want to use the built in browser controls. By default player uses Infragistics playback controls. Note that you may have different look and feel across different browsers if you use the built in browser controls. When this option is set to true, no [commercials](ui.igvideoplayer#options:commercials) will be displayed as they are not supported.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "browserControls", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the video player to be in full screen or not. This is not a pure full screen, because browsers do not allow that. It just  100% width and height to the control.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "fullscreen"): boolean;
 
 	/**
 	 * /Sets whether the video player to be in full screen or not. This is not a pure full screen, because browsers do not allow that. It just sets 100% width and height to the control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "fullscreen", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the video volume. It can be between 0.0 and 1.0.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volume"): number;
 
 	/**
 	 * /Sets the video volume. It can be between 0.0 and 1.0.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volume", optionValue: number): void;
 
 	/**
 	 * Gets/Sets whether the video volume is muted.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "muted"): boolean;
 
 	/**
 	 * /Sets whether the video volume is muted.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "muted", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets video title.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "title"): string;
 
 	/**
 	 * /Sets video title.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "title", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether the control seek tool tip will be shown when hovering the video progress bar.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "showSeekTime"): boolean;
 
 	/**
 	 * /Sets whether the control seek tool tip will be shown when hovering the video progress bar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "showSeekTime", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the format of the video progress label. You should use ${currentTime} to represent current playback position and ${duration} to represent video duration.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "progressLabelFormat"): string;
 
 	/**
 	 * /Sets the format of the video progress label. You should use ${currentTime} to represent current playback position and ${duration} to represent video duration.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "progressLabelFormat", optionValue: string): void;
 
 	/**
 	 * Gets/Sets an array of bookmarks that will be displayed in the video player control.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bookmarks"): IgVideoPlayerBookmark[];
 
 	/**
 	 * /Sets an array of bookmarks that will be displayed in the video player control.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bookmarks", optionValue: IgVideoPlayerBookmark[]): void;
 
 	/**
 	 * Gets/Sets an array of related videos that will be displayed when video playback has ended.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "relatedVideos"): IgVideoPlayerRelatedVideo[];
 
 	/**
 	 * /Sets an array of related videos that will be displayed when video playback has ended.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "relatedVideos", optionValue: IgVideoPlayerRelatedVideo[]): void;
 
 	/**
 	 * Gets/Sets an array of banner objects that will show the banners when the video clip is played.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "banners"): IgVideoPlayerBanner[];
 
 	/**
 	 * /Sets an array of banner objects that will show the banners when the video clip is played.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "banners", optionValue: IgVideoPlayerBanner[]): void;
 
 	/**
 	 * Gets/Sets an array of commercials objects that will be displayed when the video is playing. Note that [broswerControls](ui.igvideoplayer#options:browserControls) doesn't support commercials.
-	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "commercials"): IgVideoPlayerCommercials;
 
 	/**
 	 * /Sets an array of commercials objects that will be displayed when the video is playing. Note that [broswerControls](ui.igvideoplayer#options:browserControls) doesn't support commercials.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "commercials", optionValue: IgVideoPlayerCommercials): void;
@@ -100293,19 +95579,16 @@ interface JQuery {
 interface IgWidget {
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 	regional?: string|Object;
 
@@ -100332,35 +95615,30 @@ interface JQuery {
 
 	/**
 	 * Set/Get the locale setting for the widget.
-	 *
 	 */
 	igWidget(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igWidget(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
-	 *
 	 */
 	igWidget(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igWidget(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
-	 *
 	 */
 
 	igWidget(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -100368,7 +95646,6 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -100382,13 +95659,11 @@ interface JQuery {
 interface IgZoombarDefaultZoomWindow {
 	/**
 	 * The left component of the zoom window in percentages.
-	 *
 	 */
 	left?: number;
 
 	/**
 	 * The width of the zoom window in percentages.
-	 *
 	 */
 	width?: string;
 
@@ -100512,7 +95787,6 @@ interface IgZoombar {
 	/**
 	 * Specifies the element on which the widget the Zoombar is attached to is initialized.
 	 * object A valid jQuery object, the first element of which is that element.
-	 *
 	 */
 	target?: string|Object;
 
@@ -100520,7 +95794,6 @@ interface IgZoombar {
 	 * Specifies how the target widget's clone is rendered inside the Zoombar.
 	 * object A valid set of properties to initialize the clone with.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" Options for initializing the clone will be inferred from the target widget. Certain properties will be altered to make the clone more suitable for using inside the Zoombar.
 	 * "none" No clone of the target widget will be initialized inside the Zoombar.
@@ -100530,7 +95803,6 @@ interface IgZoombar {
 	/**
 	 * Specifies the width of the Zoombar.
 	 *
-	 *
 	 * Valid values:
 	 * "auto" The width of the Zoombar will be the same as the widget it is attached to.
 	 * "null" The Zoombar will stretch horizontally to fit its container if it has width set, otherwise assumes auto.
@@ -100540,7 +95812,6 @@ interface IgZoombar {
 	/**
 	 * Specifies the height of the Zoombar.
 	 *
-	 *
 	 * Valid values:
 	 * "null" The Zoombar will stretch vertically to fit its container if it has height set, otherwise assumes 70px.
 	 */
@@ -100549,7 +95820,6 @@ interface IgZoombar {
 	/**
 	 * Specifies when the zoom effect is applied.
 	 *
-	 *
 	 * Valid values:
 	 * "immediate" The zoom action is applied as the end-user interacts with the zoom window.
 	 * "deferred" The zoom action is applied after the interaction with the zoom window completes.
@@ -100558,37 +95828,31 @@ interface IgZoombar {
 
 	/**
 	 * Specifies the distance (in percents) the zoom window moves when the left or right scroll bar buttons are clicked.
-	 *
 	 */
 	zoomWindowMoveDistance?: number;
 
 	/**
 	 * Specifies the default zoom in percentages.
-	 *
 	 */
 	defaultZoomWindow?: IgZoombarDefaultZoomWindow;
 
 	/**
 	 * The minimal width the zoom window can have in percentages.
-	 *
 	 */
 	zoomWindowMinWidth?: number;
 
 	/**
 	 * Specifies the animation duration (in milliseconds) when hover style is applied or removed from elements.
-	 *
 	 */
 	hoverStyleAnimationDuration?: number;
 
 	/**
 	 * Specifies the pan duration (in milliseconds) when the window changes position. Set to 0 for snap.
-	 *
 	 */
 	windowPanDuration?: number;
 
 	/**
 	 * Initial tabIndex for the Zoombar container elements.
-	 *
 	 */
 	tabIndex?: number;
 
@@ -100777,9 +96041,6 @@ class ZoombarProviderDefault {
 
 	/**
 	 * Jshint ignore:line
-	 *
-	 * @param a
-	 * @param b
 	 */
 	update(a: Object, b: Object): void;
 }
@@ -100832,7 +96093,6 @@ interface JQuery {
 	/**
 	 * Gets the element on which the widget the Zoombar is attached to is initialized.
 	 * object A valid jQuery object, the first element of which is that element.
-	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "target"): string|Object;
@@ -100841,7 +96101,6 @@ interface JQuery {
 	 * Sets the element on which the widget the Zoombar is attached to is initialized.
 	 * object A valid jQuery object, the first element of which is that element.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -100850,7 +96109,6 @@ interface JQuery {
 	/**
 	 * Gets how the target widget's clone is rendered inside the Zoombar.
 	 * object A valid set of properties to initialize the clone with.
-	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "clone"): string|Object;
@@ -100859,7 +96117,6 @@ interface JQuery {
 	 * Sets how the target widget's clone is rendered inside the Zoombar.
 	 * object A valid set of properties to initialize the clone with.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -100867,7 +96124,6 @@ interface JQuery {
 
 	/**
 	 * Gets the width of the Zoombar.
-	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "width"): string|number;
@@ -100875,7 +96131,6 @@ interface JQuery {
 	/**
 	 * Sets the width of the Zoombar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -100883,7 +96138,6 @@ interface JQuery {
 
 	/**
 	 * Gets the height of the Zoombar.
-	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "height"): number|string;
@@ -100891,7 +96145,6 @@ interface JQuery {
 	/**
 	 * Sets the height of the Zoombar.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -100899,7 +96152,6 @@ interface JQuery {
 
 	/**
 	 * Gets when the zoom effect is applied.
-	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "zoomAction"): string;
@@ -100907,7 +96159,6 @@ interface JQuery {
 	/**
 	 * Sets when the zoom effect is applied.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -100915,84 +96166,72 @@ interface JQuery {
 
 	/**
 	 * Gets the distance (in percents) the zoom window moves when the left or right scroll bar buttons are clicked.
-	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMoveDistance"): number;
 
 	/**
 	 * Sets the distance (in percents) the zoom window moves when the left or right scroll bar buttons are clicked.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMoveDistance", optionValue: number): void;
 
 	/**
 	 * Gets the default zoom in percentages.
-	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "defaultZoomWindow"): IgZoombarDefaultZoomWindow;
 
 	/**
 	 * Sets the default zoom in percentages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "defaultZoomWindow", optionValue: IgZoombarDefaultZoomWindow): void;
 
 	/**
 	 * The minimal width the zoom window can have in percentages.
-	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMinWidth"): number;
 
 	/**
 	 * The minimal width the zoom window can have in percentages.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMinWidth", optionValue: number): void;
 
 	/**
 	 * Gets the animation duration (in milliseconds) when hover style is applied or removed from elements.
-	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "hoverStyleAnimationDuration"): number;
 
 	/**
 	 * Sets the animation duration (in milliseconds) when hover style is applied or removed from elements.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "hoverStyleAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the pan duration (in milliseconds) when the window changes position. Set to 0 for snap.
-	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "windowPanDuration"): number;
 
 	/**
 	 * Sets the pan duration (in milliseconds) when the window changes position. Set to 0 for snap.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "windowPanDuration", optionValue: number): void;
 
 	/**
 	 * Initial tabIndex for the Zoombar container elements.
-	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex for the Zoombar container elements.
 	 *
-	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
diff --git a/types/ignore-styles/ignore-styles-tests.ts b/types/ignore-styles/ignore-styles-tests.ts
new file mode 100644
index 0000000000..1a7dbc74c1
--- /dev/null
+++ b/types/ignore-styles/ignore-styles-tests.ts
@@ -0,0 +1,15 @@
+import register, { DEFAULT_EXTENSIONS, oldHandlers, noOp, restore } from 'ignore-styles';
+
+register(['.css'], (module, filename) => {}); // $ExpectType void
+register(['.css']); // $ExpectType void
+register(undefined, (module, filename) => {}); // $ExpectType void
+register([1], (module, filename) => {}); // $ExpectError
+register(['.css'], 1); // $ExpectError
+
+DEFAULT_EXTENSIONS[0]; // $ExpectType string
+
+oldHandlers['.css']; // $ExpectType Handler
+
+noOp(); // $ExpectType void
+
+restore(); // $ExpectType void
diff --git a/types/ignore-styles/index.d.ts b/types/ignore-styles/index.d.ts
new file mode 100644
index 0000000000..2eab90b591
--- /dev/null
+++ b/types/ignore-styles/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for ignore-styles 5.0
+// Project: https://github.com/bkonkle/ignore-styles
+// Definitions by: Taiju Muto <https://github.com/tai2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types='node' />
+
+export type Handler = (m: NodeModule, filename: string) => any;
+
+export const DEFAULT_EXTENSIONS: string[];
+
+export let oldHandlers: {
+    [ext: string]: Handler
+};
+
+export function noOp(): void;
+
+export function restore(): void;
+
+export default function register(
+    extensions?: string[],
+    handler?: Handler
+): void;
diff --git a/types/ignore-styles/tsconfig.json b/types/ignore-styles/tsconfig.json
new file mode 100644
index 0000000000..aed3487cf4
--- /dev/null
+++ b/types/ignore-styles/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ignore-styles-tests.ts"
+    ]
+}
diff --git a/types/ignore-styles/tslint.json b/types/ignore-styles/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ignore-styles/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/iltorb/iltorb-tests.ts b/types/iltorb/iltorb-tests.ts
new file mode 100644
index 0000000000..66bda251d4
--- /dev/null
+++ b/types/iltorb/iltorb-tests.ts
@@ -0,0 +1,39 @@
+import { createReadStream, createWriteStream } from 'fs';
+import * as br from 'iltorb';
+
+const opts: br.BrotliEncodeParams = {
+    disable_literal_context_modeling: false,
+    lgblock: 0,
+    lgwin: 22,
+    mode: 0,
+    quality: 11,
+    size_hint: 0
+};
+
+const onCompress = (err1: Error | null | undefined, compressed: Buffer) => {
+    br.decompress(compressed, (err2: Error | null | undefined, decompressed: Buffer) => {
+        console.log(decompressed.toString());
+    });
+};
+
+br.compress(Buffer.from('foo', 'utf8'), onCompress);
+
+br.compress(Buffer.from('foo', 'utf8'), opts, onCompress);
+
+const stream = br.compressStream();
+stream.flush();
+
+createReadStream(__filename)
+    .pipe(stream)
+    .pipe(createWriteStream('foo.ts'));
+
+createReadStream(__dirname)
+    .pipe(br.compressStream(opts))
+    .pipe(createWriteStream('bar.ts'));
+
+createReadStream('bar.ts')
+    .pipe(br.decompressStream())
+    .pipe(createWriteStream('qux.ts'));
+
+br.decompressSync(br.compressSync(Buffer.from('foo', 'utf8')));
+br.decompressSync(br.compressSync(Buffer.from('foo', 'utf8'), opts));
diff --git a/types/iltorb/index.d.ts b/types/iltorb/index.d.ts
new file mode 100644
index 0000000000..5ac707a51b
--- /dev/null
+++ b/types/iltorb/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for iltorb 2.0
+// Project: https://github.com/MayhemYDG/iltorb
+// Definitions by: Arturas Molcanovas <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node"/>
+
+import { Transform } from 'stream';
+
+export interface BrotliEncodeParams {
+    disable_literal_context_modeling?: boolean;
+    lgblock?: number;
+    lgwin?: number;
+    mode?: number;
+    quality?: number;
+    size_hint?: number;
+}
+
+export interface BrotliFlushable {
+	flush(): void;
+}
+
+export type IltorbCallback = (err: Error | null | undefined, output: Buffer) => void;
+
+export function compress(buffer: Buffer, options: BrotliEncodeParams, callback: IltorbCallback): void;
+export function compress(buffer: Buffer, callback: IltorbCallback): void;
+
+export function decompress(buffer: Buffer, callback: IltorbCallback): void;
+
+export function compressSync(buffer: Buffer, options?: BrotliEncodeParams): Buffer;
+export function decompressSync(buffer: Buffer): Buffer;
+
+export function compressStream(options?: BrotliEncodeParams): Transform & BrotliFlushable;
+export function decompressStream(): Transform;
diff --git a/types/iltorb/tsconfig.json b/types/iltorb/tsconfig.json
new file mode 100644
index 0000000000..c12ff988ba
--- /dev/null
+++ b/types/iltorb/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "iltorb-tests.ts"
+    ]
+}
diff --git a/types/iltorb/tslint.json b/types/iltorb/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/iltorb/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/image-size/tslint.json b/types/image-size/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/image-size/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/imagemagick-native/tslint.json b/types/imagemagick-native/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imagemagick-native/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/imagemagick/tslint.json b/types/imagemagick/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imagemagick/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/imagemapster/tslint.json b/types/imagemapster/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imagemapster/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/images/index.d.ts b/types/images/index.d.ts
index 23b10afbe4..c52758b5a1 100644
--- a/types/images/index.d.ts
+++ b/types/images/index.d.ts
@@ -32,12 +32,10 @@ declare namespace images {
     }
 }
 
-/* tslint:disable:unified-signatures */
 declare function images(file: string): images.ImagesStatic;
 declare function images(width: number, height: number): images.ImagesStatic;
 declare function images(buffer: Buffer, start?: number, end?: number): images.ImagesStatic;
-declare function images(image: images.ImagesStatic): images.ImagesStatic;
+declare function images(image: images.ImagesStatic): images.ImagesStatic; // tslint:disable-line unified-signatures
 declare function images(image: images.ImagesStatic, x: number, y: number, width: number, height: number): images.ImagesStatic;
-/* tslint:enable:unified-signatures */
 
 export = images;
diff --git a/types/imagesloaded/tslint.json b/types/imagesloaded/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imagesloaded/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/imap-simple/tslint.json b/types/imap-simple/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imap-simple/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/imap/tslint.json b/types/imap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/imgur-rest-api/tslint.json b/types/imgur-rest-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imgur-rest-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/immutability-helper/immutability-helper-tests.ts b/types/immutability-helper/immutability-helper-tests.ts
deleted file mode 100644
index b30b7b46ef..0000000000
--- a/types/immutability-helper/immutability-helper-tests.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as update from 'immutability-helper';
-import { newContext } from 'immutability-helper';
-
-namespace TestObjectUpdate {
-  update({}, {
-    foo: {
-      bar: { $set: 'baz' }
-    }
-  });
-}
-
-namespace TestArrayUpdate {
-  update([], {
-    foo: {
-      bar: { $set: 'baz' }
-    }
-  });
-}
-
-namespace TestExtend {
-  update.extend('$command', (specValue, originalValue) => originalValue);
-}
-
-namespace TestNewContext {
-  update.newContext().extend('$command', (specValue, originalValue) => originalValue);
-  newContext().extend('$command', (specValue, originalValue) => originalValue);
-
-  // This shouldn't compile, but we can't test negatives.
-  // newContext().newContext();
-}
-
-namespace TestFromReactDocs {
-  // 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: number) { 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/types/immutability-helper/index.d.ts b/types/immutability-helper/index.d.ts
deleted file mode 100644
index 1da6c87b05..0000000000
--- a/types/immutability-helper/index.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for immutability-helper v2.0.0
-// Project: https://github.com/kolodny/immutability-helper
-// Definitions by: Sean Kelley <https://github.com/seansfkelley>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface UpdateSpecCommand {
-    $set?: any;
-    $merge?: {};
-    $apply?(value: any): any;
-    [customCommand: string]: any;
-}
-
-interface UpdateSpecPath {
-    [pathPart: string]: UpdateSpec;
-}
-
-type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
-
-interface UpdateArraySpec extends UpdateSpecCommand {
-    $push?: any[];
-    $unshift?: any[];
-    $splice?: any[][];
-    [customCommand: string]: any;
-}
-
-type CommandHandler = (specValue: any, originalValue: any) => any;
-
-interface UpdateFunction {
-    (value: any[], spec: UpdateArraySpec): any[];
-    (value: {}, spec: UpdateSpec): any;
-    extend: (commandName: string, handler: CommandHandler) => any;
-}
-
-interface Update extends UpdateFunction {
-    newContext(): UpdateFunction;
-}
-
-declare const update: Update;
-export = update;
diff --git a/types/immutability-helper/tsconfig.json b/types/immutability-helper/tsconfig.json
deleted file mode 100644
index a2307c394a..0000000000
--- a/types/immutability-helper/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "immutability-helper-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/impress/tslint.json b/types/impress/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/impress/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/incremental-dom/tslint.json b/types/incremental-dom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/incremental-dom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/inert/index.d.ts b/types/inert/index.d.ts
index 1af500c7cf..e74d1a4ce9 100644
--- a/types/inert/index.d.ts
+++ b/types/inert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/inert/
 // Definitions by: Steve Ognibene <https://github.com/nycdotnet>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as hapi from 'hapi';
 
diff --git a/types/inert/tsconfig.json b/types/inert/tsconfig.json
index ad4e395bca..da982b9122 100644
--- a/types/inert/tsconfig.json
+++ b/types/inert/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "inert-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/inert/tslint.json b/types/inert/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inert/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/inflected/tslint.json b/types/inflected/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inflected/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/inflection/tslint.json b/types/inflection/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inflection/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/inherits/tslint.json b/types/inherits/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inherits/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ini/tslint.json b/types/ini/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ini/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/iniparser/tslint.json b/types/iniparser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/iniparser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/inline-css/tslint.json b/types/inline-css/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inline-css/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/inline-style-prefixer/index.d.ts b/types/inline-style-prefixer/index.d.ts
index f5b496f25a..8c730fff2f 100644
--- a/types/inline-style-prefixer/index.d.ts
+++ b/types/inline-style-prefixer/index.d.ts
@@ -4,15 +4,15 @@
 //                 dpetrezselyova <https://github.com/dpetrezselyova>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export = InlineStylePrefixer;
-
-interface Configuration {
-    userAgent?: string;
-    keepUnprefixed?: boolean;
+declare namespace InlineStylePrefixer {
+    interface Configuration {
+        userAgent?: string;
+        keepUnprefixed?: boolean;
+    }
 }
 
 declare class InlineStylePrefixer {
-    constructor(cfg?: Configuration);
+    constructor(cfg?: InlineStylePrefixer.Configuration);
 
     prefix(style: CSSStyleDeclaration): CSSStyleDeclaration;
 
@@ -24,3 +24,5 @@ declare class InlineStylePrefixer {
     // support for React.CSSProperties
     static prefixAll<T>(style: T): T;
 }
+
+export = InlineStylePrefixer;
diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 2a0b9f60f4..32c54fa99e 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/SBoudrias/Inquirer.js
 // Definitions by: Qubo <https://github.com/tkQubo>
 //                 Parvez <https://github.com/ppathan>
+//                 Jouderian <https://github.com/jouderianjr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="rx" />
@@ -115,6 +116,14 @@ declare namespace inquirer {
          * Add a mask when password will entered
          */
         mask?: string;
+        /**
+         * Change the default prefix message.
+         */
+        prefix?: string;
+        /**
+         * Change the default suffix message.
+         */
+        suffix?: string;
     }
 
     /**
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index d3591b13d2..4a43dcc98e 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -151,13 +151,15 @@ var questions = [
     {
         type: "input",
         name: "first_name",
-        message: "What's your first name"
+        message: "What's your first name",
+        prefix: "1 - ",
     },
     {
         type: "input",
         name: "last_name",
         message: "What's your last name",
-        default: function () { return "Doe"; }
+        default: function () { return "Doe"; },
+        suffix: "!!"
     },
     {
         type: "input",
diff --git a/types/inquirer/tslint.json b/types/inquirer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inquirer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/insight/index.d.ts b/types/insight/index.d.ts
index 255807a37e..55c2611124 100644
--- a/types/insight/index.d.ts
+++ b/types/insight/index.d.ts
@@ -1,13 +1,19 @@
-// Type definitions for insight 0.4.3
+// Type definitions for insight 0.8.0
 // Project: https://github.com/yeoman/insight
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace insight {
+    interface IPackage {
+        name: string;
+        version: string;
+    }
+    
     interface IOptions {
         trackingCode:string;
         trackingProvider?:string;
-        packageName:string;
+        pkg?:IPackage;
+        packageName?:string;
         packageVersion?:string;
         config?:IConfigstore;
     }
@@ -19,11 +25,19 @@ declare namespace insight {
         set(key:string, val:any):void;
         del(key:string):void;
     }
+    
+    interface IEvent {
+        category:string;
+        action:string;
+        label?:string;
+        value?:number|string;
+    }
 }
 
-
+import IPackage = insight.IPackage;
 import IOptions = insight.IOptions;
 import IConfigstore = insight.IConfigstore;
+import IEvent = insight.IEvent;
 
 declare class Insight {
     trackingCode:string;
@@ -41,6 +55,7 @@ declare class Insight {
     constructor(options:IOptions);
 
     track(...args:string[]):void;
+    trackEvent(event:IEvent):void;
 
     askPermission(msg?:string, cb?:Function):void;
 }
diff --git a/types/insight/insight-tests.ts b/types/insight/insight-tests.ts
index 93d50d8dca..adc8430740 100644
--- a/types/insight/insight-tests.ts
+++ b/types/insight/insight-tests.ts
@@ -1,15 +1,13 @@
-
-
-declare var require:any;
-
 import Insight = require('insight');
-var pkg:any = require('./package.json');
+var dummyPackage = {
+    name: 'dummy',
+    version: '1.0.0',
+};
 
 var insight = new Insight({
     // Google Analytics tracking code
     trackingCode: 'UA-XXXXXXXX-X',
-    packageName: pkg.name,
-    packageVersion: pkg.version
+    pkg: dummyPackage,
 });
 
 (()=> {
diff --git a/types/insight/tslint.json b/types/insight/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/insight/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/interact.js/tslint.json b/types/interact.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/interact.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/intercomjs/tslint.json b/types/intercomjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/intercomjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/intl-tel-input/tslint.json b/types/intl-tel-input/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/intl-tel-input/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/intro.js/tslint.json b/types/intro.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/intro.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/invariant/tslint.json b/types/invariant/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/invariant/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/inversify-devtools/package.json b/types/inversify-devtools/package.json
index 91ec52f25a..5f90526bc1 100644
--- a/types/inversify-devtools/package.json
+++ b/types/inversify-devtools/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "inversify": "^2.0.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/inversify-devtools/tslint.json b/types/inversify-devtools/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inversify-devtools/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ion.rangeslider/tslint.json b/types/ion.rangeslider/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ion.rangeslider/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ion.rangeslider/v1/tslint.json b/types/ion.rangeslider/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ion.rangeslider/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ionic/index.d.ts b/types/ionic/index.d.ts
deleted file mode 100644
index 40f7897a9f..0000000000
--- a/types/ionic/index.d.ts
+++ /dev/null
@@ -1,398 +0,0 @@
-// Type definitions for Ionic
-// Project: http://ionicframework.com
-// Definitions by: Spencer Williams <https://github.com/spencerwi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="angular" />
-
-interface IonicStatic {
-    /**
-     * What Ionic package version is.
-     */
-    version: string;
-    Platform: {
-        /**
-        * Trigger a callback once the device is ready, or immediately
-         * if the device is already ready. This method can be run from
-         * anywhere and does not need to be wrapped by any additonal methods.
-         * When the app is within a WebView (Cordova), it’ll fire
-         * the callback once the device is ready. If the app is within
-         * a web browser, it’ll fire the callback after window.load.
-         * Please remember that Cordova features (Camera, FileSystem, etc) still
-         * will not work in a web browser.
-         */
-        ready(callback: ()=>any): void;
-        /**
-         * Set the grade of the device: ‘a’, ‘b’, or ‘c’. ‘a’ is the best
-         * (most css features enabled), ‘c’ is the worst. By default, sets the grade
-         * depending on the current device.
-         */
-        setGrade(grade: string): void;
-        /**
-         * Return the current device (given by cordova).
-         */
-        device(): any;
-        /**
-         * Check if the platform name provided is detected.
-         */
-        is(platformName: string): boolean;
-        /**
-         * Check if we are running within a WebView (such as Cordova).
-         */
-        isWebView(): boolean;
-        /**
-         * Whether we are running on iPad.
-         */
-        isIPad(): boolean;
-        /**
-         * Whether we are running on iOS.
-         */
-        isIOS(): boolean;
-        /**
-         * Whether we are running on Android.
-         */
-        isAndroid(): boolean;
-        /**
-         * Whether we are running on Windows Phone.
-         */
-        isWindowsPhone(): boolean;
-        /**
-         * The name of the current platform.
-         */
-        platform(): string;
-        /**
-         * The version of the current device platform.
-         */
-        version(): number;
-        /**
-         * Exit the app.
-         */
-        exitApp(): void;
-        /**
-         * Shows or hides the device status bar (in Cordova). Requires cordova plugin add org.apache.cordova.statusbar
-         */
-        showStatusBar(shouldShow: boolean): void;
-        /**
-         * Sets whether the app is fullscreen or not (in Cordova).
-         */
-        fullScreen(showFullScreen?: boolean, showStatusBar?: boolean): void;
-        /**
-         * Whether the device is ready.
-         */
-        isReady: boolean;
-        /**
-         * Whether the device is fullscreen.
-         */
-        isFullScreen: boolean;
-        /**
-         * An array of all platforms found.
-         */
-        platforms: Array<string>;
-        /**
-         * What grade the current platform is.
-         */
-        grade: string;
-    };
-}
-
-declare var ionic: IonicStatic;
-
-declare module 'ionic' {
-    export = ionic;
-}
-
-declare namespace ionic {
-    namespace actionSheet {
-        interface IonicActionSheetService {
-            show(options: IonicActionSheetOptions): ()=>void;
-        }
-        interface IonicActionSheetButton {
-            text: string;
-        }
-        interface IonicActionSheetOptions {
-            buttons?: Array<IonicActionSheetButton>;
-            titleText?: string;
-            cancelText?: string;
-            destructiveText?: string;
-            cancel?: ()=>any;
-            buttonClicked?: (index: number)=>boolean;
-            destructiveButtonClicked?: ()=>boolean;
-            cancelOnStateChange?: boolean;
-            cssClass?: string;
-        }
-    }
-    namespace backdrop {
-        interface IonicBackdropService {
-            retain(): void;
-            release(): void;
-        }
-    }
-    namespace gestures {
-        interface IonicGestureService {
-            on(eventType: string, callback: (e: any)=>any, $element: angular.IAugmentedJQuery, options: any): IonicGesture;
-            off(gesture: IonicGesture, eventType: string, callback: (e: any)=>any): void;
-        }
-
-        interface IonicGesture {
-            element: Element;
-            enabled: boolean;
-            options: {stop_browser_behavior: string };
-            on(gesture: string, handler: Function): IonicGesture;
-            off(gesture: string, handler: Function): IonicGesture;
-            trigger(gesture: string, eventData: any): IonicGesture;
-            enable(state: boolean): IonicGesture;
-        }
-
-    }
-    namespace list {
-        interface IonicListDelegate {
-            showReorder(showReorder?: boolean): boolean;
-            showDelete(showDelete?: boolean): boolean;
-            canSwipeItems(canSwipeItems?: boolean): boolean;
-            closeOptionButtons(): void;
-            $getByHandle(handle: string): IonicListDelegate;
-        }
-    }
-    namespace loading {
-        interface IonicLoadingService {
-            show(opts?: IonicLoadingOptions): void;
-            hide(): void;
-        }
-        interface IonicLoadingOptions {
-            template?: string;
-            templateUrl?: string;
-            scope?: any;
-            noBackdrop?: boolean;
-            hideOnStateChange?: boolean;
-            delay?: number;
-            duration?: number;
-        }
-    }
-    namespace modal {
-        interface IonicModalService {
-            fromTemplate(templateString: string, options?: IonicModalOptions): IonicModalController;
-            fromTemplateUrl(templateUrl: string, options?: IonicModalOptions): angular.IPromise<IonicModalController>;
-        }
-
-        interface IonicModalController {
-            initialize(options: IonicModalOptions): void;
-            show(): angular.IPromise<void>;
-            hide(): angular.IPromise<void>;
-            remove(): angular.IPromise<void>;
-            isShown(): boolean;
-        }
-
-        interface IonicModalOptions {
-            scope?: any;
-            animation?: string;
-            focusFirstInput?: boolean;
-            backdropClickToClose?: boolean;
-            hardwareBackButtonClose?: boolean;
-        }
-    }
-    namespace navigation {
-        interface IonicNavBarDelegate {
-            align(direction?: string): void;
-            showBackButton(show?: boolean): boolean;
-            showBar(show?: boolean): boolean;
-            title(title: string): void;
-        }
-
-        interface IonicHistoryService {
-            viewHistory(): any;
-
-            currentView(view?: any): any;
-            currentHistoryId(): string;
-            currentTitle(val?: string): string;
-
-            backView(view?: any): any;
-            backTitle(): string;
-
-            forwardView(view?: any): any;
-
-            currentStateName(): string;
-
-            goBack(backCount?: number): void;
-            removeBackView(): void;
-            clearHistory(): void;
-            clearCache(): angular.IPromise<any>;
-            nextViewOptions(options: IonicHistoryNextViewOptions): void;
-        }
-        interface IonicHistoryNextViewOptions {
-            disableAnimate?: boolean;
-            disableBack?: boolean;
-            historyRoot?: boolean;
-        }
-    }
-    namespace platform {
-        interface IonicPlatformService {
-            onHardwareBackButton(callback: Function): void;
-            offHardwareBackButton(callback: Function): void;
-            registerBackButtonAction(callback: Function, priority: number, actionId?: any): Function;
-            on(type: string, callback: Function): Function;
-            ready(callback?: Function): angular.IPromise<any>;
-        }
-    }
-    namespace popover {
-        interface IonicPopoverService {
-            fromTemplate(templateString: string, options: IonicPopoverOptions): IonicPopoverController;
-            fromTemplateUrl(templateUrl: string, options: IonicPopoverOptions): angular.IPromise<IonicPopoverController>;
-        }
-        interface IonicPopoverController {
-            initialize(options: IonicPopoverOptions): void;
-            show($event?: any): angular.IPromise<any>;
-            hide(): angular.IPromise<any>;
-            isShown(): boolean;
-            remove(): angular.IPromise<any>;
-        }
-        interface IonicPopoverOptions {
-            scope?: any;
-            focusFirstInput?: boolean;
-            backdropClickToClose?: boolean;
-            hardwareBackButtonClose?: boolean;
-        }
-    }
-    namespace popup {
-        interface IonicPopupService {
-            show(options: IonicPopupFullOptions): IonicPopupPromise;
-            alert(options: IonicPopupAlertOptions): IonicPopupPromise;
-            confirm(options: IonicPopupConfirmOptions): IonicPopupConfirmPromise;
-            prompt(options: IonicPopupPromptOptions): IonicPopupPromise;
-        }
-
-        interface IonicPopupConfirmPromise extends angular.IPromise<boolean> {
-            close(value?: boolean): void;
-        }
-        interface IonicPopupPromise extends angular.IPromise<any> {
-            close(value?: any): any;
-        }
-        interface IonicPopupBaseOptions {
-            title?: string;
-            cssClass?: string;
-            subTitle?: string;
-            template?: string;
-            templateUrl?: string;
-        }
-        interface IonicPopupFullOptions extends IonicPopupBaseOptions {
-            scope?: any;
-            buttons?: Array<IonicPopupButton>;
-        }
-        interface IonicPopupButton {
-            text: string;
-            type?: string;
-            onTap?(event?: any): void;
-        }
-        interface IonicPopupAlertOptions extends IonicPopupBaseOptions {
-            okText?: string;
-            okType?: string;
-        }
-        interface IonicPopupConfirmOptions extends IonicPopupBaseOptions {
-            cancelText?: string;
-            cancelType?: string;
-            okText?: string;
-            okType?: string;
-        }
-        interface IonicPopupPromptOptions extends IonicPopupBaseOptions {
-            inputType?: string;
-            inputPlaceholder?: string;
-            cancelText?: string;
-            cancelType?: string;
-            okText?: string;
-            okType?: string;
-        }
-    }
-    namespace scroll {
-        interface IonicScrollDelegate {
-            resize(): void;
-            scrollTop(shouldAnimate?: boolean): void;
-            scrollBottom(shouldAnimate?: boolean): void;
-            scrollTo(left: number, top: number, shouldAnimate?: boolean): void;
-            scrollBy(left: number, top: number, shouldAnimate?: boolean): void;
-            zoomTo(level: number, animate?: boolean, originLeft?: number, originTop?: number): void;
-            zoomBy(factor: number, animate?: boolean, originLeft?: number, originTop?: number): void;
-            getScrollPosition(): {left: number; top: number};
-            anchorScroll(shouldAnimate?: boolean): void;
-            freezeScroll(shouldFreeze?: boolean): boolean;
-            freezeAllScrolls(shouldFreeze?: boolean): boolean;
-            getScrollView(): any;
-            $getByHandle(handle: string): IonicScrollDelegate;
-        }
-    }
-    namespace sideMenu {
-        interface IonicSideMenuDelegate {
-            toggleLeft(isOpen?: boolean): void;
-            toggleRight(isOpen?: boolean): void;
-            getOpenRatio(): number;
-            isOpen(): boolean;
-            isOpenLeft(): boolean;
-            isOpenRight(): boolean;
-            canDragContent(canDrag?: boolean): boolean;
-            edgeDragThreshold(value?: boolean|number): boolean;
-            $getByHandle(handle: string): IonicSideMenuDelegate;
-        }
-    }
-    namespace slideBox {
-        interface IonicSlideBoxDelegate {
-            update(): void;
-            slide(to: number, speed?: number): void;
-            enableSlide(shouldEnable?: boolean): boolean;
-            previous(speed?: number): void;
-            next(speed?: number): void;
-            stop(): void;
-            start(): void;
-            currentIndex(): number;
-            slidesCount(): number;
-            $getByHandle(handle: string): IonicSlideBoxDelegate;
-        }
-    }
-    namespace tabs {
-        interface IonicTabsDelegate {
-            select(index: number): void;
-            selectedIndex(): number;
-            $getByHandle(handle: string): IonicTabsDelegate;
-            showBar(show?: boolean): boolean;
-        }
-    }
-    namespace utility {
-        interface IonicConfigProvider {
-            views: {
-                transition(transition?: string): string;
-                maxCache(maxNumber?: number): number;
-                forwardCache(value?: boolean): boolean;
-                swipeBackEnabled(value?: boolean): boolean;
-            };
-            scrolling: {
-                jsScrolling(value?: boolean): boolean;
-            };
-            backButton: {
-                icon(value?: string): string;
-                text(value?: string): string;
-                previousTitleText(value?: boolean): boolean;
-            };
-            form: {
-                checkbox(value?: string): string;
-                toggle(value?: string): string;
-            };
-            spinner: {
-                icon(value?: string): string;
-            };
-            tabs: {
-                style(value?: string): string;
-                position(value?: string): string;
-            };
-            templates: {
-                maxPrefetch(value?: number): number;
-            };
-            navBar: {
-                alignTitle(value?: string): string;
-                positionPrimaryButtons(value?: string): string;
-                positionSecondaryButtons(value?: string): string;
-            };
-        }
-        interface IonicPositionService {
-            position(element: any): {top: number; left: number; width: number; height: number};
-            offset(element: any): {top: number; left: number; width: number; height: number};
-        }
-    }
-}
diff --git a/types/ionic/ionic-tests.ts b/types/ionic/ionic-tests.ts
deleted file mode 100644
index 89631663d5..0000000000
--- a/types/ionic/ionic-tests.ts
+++ /dev/null
@@ -1,417 +0,0 @@
-
-
-var testIonic = angular.module('testIonic', ['ionic']);
-
-testIonic.config(['$ionicConfigProvider', ($ionicConfigProvider: ionic.utility.IonicConfigProvider)=>{
-    var transition: string = $ionicConfigProvider.views.transition();
-    $ionicConfigProvider.views.transition("transition");
-    var maxCache: number = $ionicConfigProvider.views.maxCache();
-    $ionicConfigProvider.views.maxCache(10);
-    var forwardCache: boolean = $ionicConfigProvider.views.forwardCache();
-    $ionicConfigProvider.views.forwardCache(true);
-    var swipeBackEnabled: boolean = $ionicConfigProvider.views.swipeBackEnabled();
-    $ionicConfigProvider.views.swipeBackEnabled(true);
-
-    var jsScrolling: boolean = $ionicConfigProvider.scrolling.jsScrolling();
-    $ionicConfigProvider.scrolling.jsScrolling(true);
-
-    var backButtonIcon: string = $ionicConfigProvider.backButton.icon();
-    $ionicConfigProvider.backButton.icon("icon");
-    var backButtonText: string = $ionicConfigProvider.backButton.text();
-    $ionicConfigProvider.backButton.text("back");
-    var usePreviousTitleText: boolean = $ionicConfigProvider.backButton.previousTitleText();
-    $ionicConfigProvider.backButton.previousTitleText(false);
-
-    var checkbox: string = $ionicConfigProvider.form.checkbox();
-    $ionicConfigProvider.form.checkbox("square");
-    var toggle: string = $ionicConfigProvider.form.toggle();
-    $ionicConfigProvider.form.toggle("small");
-
-    var spinnerIcon: string = $ionicConfigProvider.spinner.icon();
-    $ionicConfigProvider.spinner.icon("spiral");
-
-    var tabsStyle: string = $ionicConfigProvider.tabs.style();
-    $ionicConfigProvider.tabs.style("standard");
-    var tabsPosition: string = $ionicConfigProvider.tabs.position();
-    $ionicConfigProvider.tabs.position("bottom");
-
-    var maxPrefetch: number = $ionicConfigProvider.templates.maxPrefetch();
-    $ionicConfigProvider.templates.maxPrefetch(10);
-
-    var alignTitle: string = $ionicConfigProvider.navBar.alignTitle();
-    $ionicConfigProvider.navBar.alignTitle("platform");
-    var positionPrimaryButtons: string = $ionicConfigProvider.navBar.positionPrimaryButtons();
-    $ionicConfigProvider.navBar.positionPrimaryButtons("platform");
-    var positionSecondaryButtons: string = $ionicConfigProvider.navBar.positionSecondaryButtons();
-    $ionicConfigProvider.navBar.positionSecondaryButtons("platform");
-}])
-
-class IonicTestController {
-    public static $inject = [
-        '$ionicActionSheet',
-        '$ionicBackdrop',
-        '$ionicGesture',
-        '$ionicListDelegate',
-        '$ionicLoading',
-        '$ionicModal',
-        '$ionicNavBarDelegate',
-        '$ionicHistory',
-        '$ionicPlatform',
-        '$ionicPopover',
-        '$ionicPopup',
-        '$ionicScrollDelegate',
-        '$ionicSideMenuDelegate',
-        '$ionicSlideBoxDelegate',
-        '$ionicTabsDelegate',
-        '$ionicPosition'
-    ];
-    constructor(
-        private $ionicActionSheet: ionic.actionSheet.IonicActionSheetService,
-        private $ionicBackdrop: ionic.backdrop.IonicBackdropService,
-        private $ionicGesture: ionic.gestures.IonicGestureService,
-        private $ionicListDelegate: ionic.list.IonicListDelegate,
-        private $ionicLoading: ionic.loading.IonicLoadingService,
-        private $ionicModal: ionic.modal.IonicModalService,
-        private $ionicNavBarDelegate: ionic.navigation.IonicNavBarDelegate,
-        private $ionicHistory: ionic.navigation.IonicHistoryService,
-        private $ionicPlatform: ionic.platform.IonicPlatformService,
-        private $ionicPopover: ionic.popover.IonicPopoverService,
-        private $ionicPopup: ionic.popup.IonicPopupService,
-        private $ionicScrollDelegate: ionic.scroll.IonicScrollDelegate,
-        private $ionicSideMenuDelegate: ionic.sideMenu.IonicSideMenuDelegate,
-        private $ionicSlideBoxDelegate: ionic.slideBox.IonicSlideBoxDelegate,
-        private $ionicTabsDelegate: ionic.tabs.IonicTabsDelegate,
-        private $ionicPositionService: ionic.utility.IonicPositionService
-    ){}
-
-    private testActionSheet(): void {
-        var closeActionSheetFn: ()=>void = this.$ionicActionSheet.show({
-            buttons: [{ text: 'A button' }],
-            titleText: "titleText",
-            cancelText: "cancelText",
-            destructiveText: "destructiveText",
-            cancel: ()=>{ console.log("cancel"); },
-            buttonClicked: (index)=>{ 
-                console.log("buttonClicked");
-                return index === 0;
-            },
-            destructiveButtonClicked: ()=>{
-                console.log("destructiveButtonClicked");
-                return false;
-            },
-            cancelOnStateChange: true,
-            cssClass: "cssClass"
-        });
-        closeActionSheetFn();
-    }
-    private testBackdrop(): void {
-        this.$ionicBackdrop.retain();
-        this.$ionicBackdrop.release();
-    }
-    private testGesture(): void {
-        var gesture: ionic.gestures.IonicGesture = this.$ionicGesture.on(
-            'eventType',
-            (e)=>{ return e; },
-            angular.element("body"),
-            {}
-        );
-        this.$ionicGesture.off(gesture, "eventType", (e) => { return e; });
-    }
-    private testList(): void {
-            this.$ionicListDelegate.showReorder(true);
-            var showReorder: boolean = this.$ionicListDelegate.showReorder();
-            this.$ionicListDelegate.showDelete(true);
-            var showDelete: boolean = this.$ionicListDelegate.showDelete();
-            this.$ionicListDelegate.canSwipeItems(true);
-            var canSwipeItems: boolean = this.$ionicListDelegate.canSwipeItems();
-            this.$ionicListDelegate.closeOptionButtons();
-            var foo: ionic.list.IonicListDelegate = this.$ionicListDelegate.$getByHandle("handle");
-    }
-    private testLoading(): void {
-        this.$ionicLoading.show({
-            template: "template",
-            templateUrl: "templateUrl",
-            scope: {},
-            noBackdrop: false,
-            hideOnStateChange: true,
-            delay: 500,
-            duration: 8000
-        });
-        this.$ionicLoading.hide();
-    }
-    private testModal(): void {
-        var modalOptions: ionic.modal.IonicModalOptions = {
-            scope: {},
-            animation: "animation",
-            focusFirstInput: true,
-            backdropClickToClose: false,
-            hardwareBackButtonClose: true
-        };
-        var ionicModalController: ionic.modal.IonicModalController = this.$ionicModal.fromTemplate("template", modalOptions);
-        ionicModalController.initialize(modalOptions);
-        ionicModalController.show().then(() => console.log("shown modal"))
-        ionicModalController.hide().then(() => console.log("hid modal"))
-        ionicModalController.remove().then(() => console.log("removed modal"))
-        var isShown: boolean = ionicModalController.isShown();
-
-        this.$ionicModal.fromTemplateUrl("templateUrl", modalOptions)
-                        .then(modalCtrl => ionicModalController = modalCtrl);
-    }
-    private testNavigation(): void {
-        this.$ionicNavBarDelegate.align("right");
-        this.$ionicNavBarDelegate.showBackButton(true);
-        var isBackButtonShown: boolean = this.$ionicNavBarDelegate.showBackButton();
-        this.$ionicNavBarDelegate.showBar(true);
-        var isBarShown: boolean = this.$ionicNavBarDelegate.showBar();
-        this.$ionicNavBarDelegate.title("title");
-
-        var viewHistory = this.$ionicHistory.viewHistory();
-        var currentView = this.$ionicHistory.currentView();
-        this.$ionicHistory.currentView({viewId: 1});
-        var currentHistoryId: string = this.$ionicHistory.currentHistoryId();
-        this.$ionicHistory.currentTitle("currentTitle");
-        var currentTitle: string = this.$ionicHistory.currentTitle();
-        var backView = this.$ionicHistory.backView();
-        this.$ionicHistory.backView({viewId: 1});
-        var backTitle: string = this.$ionicHistory.backTitle();
-        var forwardView = this.$ionicHistory.forwardView();
-        this.$ionicHistory.forwardView({viewId: 1});
-        var currentStateName: string = this.$ionicHistory.currentStateName();
-
-        this.$ionicHistory.goBack(5);
-        this.$ionicHistory.removeBackView();
-        this.$ionicHistory.clearHistory();
-        this.$ionicHistory.clearCache().then(() => console.log("done clearing cache!"));
-        this.$ionicHistory.nextViewOptions({
-            disableAnimate: true,
-            disableBack: true,
-            historyRoot: true
-        });
-    }
-    private testPlatform(): void {
-        var callback: Function = () => console.log("on!");
-        this.$ionicPlatform.onHardwareBackButton(callback);
-        this.$ionicPlatform.offHardwareBackButton(callback);
-        this.$ionicPlatform.registerBackButtonAction(callback, 1, "actionId");
-        this.$ionicPlatform.on("type", callback);
-        this.$ionicPlatform.ready(callback);
-        this.$ionicPlatform.ready().then(() => console.log("ready!"));
-    }
-    private testPopover(): void {
-        var popoverOptions: ionic.popover.IonicPopoverOptions = {
-            scope: {},
-            focusFirstInput: true,
-            backdropClickToClose: false,
-            hardwareBackButtonClose: true
-        };
-        var ionicPopoverController: ionic.popover.IonicPopoverController = this.$ionicPopover.fromTemplate("template", popoverOptions);
-        ionicPopoverController.initialize(popoverOptions);
-        ionicPopoverController.show(angular.element("body")).then(() => console.log("shown popover"));
-        ionicPopoverController.hide().then(() => console.log("hid popover"));
-        ionicPopoverController.remove().then(() => console.log("removed popover"));
-        var isShown: boolean = ionicPopoverController.isShown();
-
-        this.$ionicPopover.fromTemplateUrl("templateUrl", popoverOptions)
-                          .then(popoverCtrl => ionicPopoverController = popoverCtrl);
-    }
-    private testPopup(): void {
-        this.$ionicPopup.show({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            scope: {},
-            buttons: [{text: "text", type: "type", onTap: (e) => {console.log(e)}}]
-        }).then(() => console.log("popover shown"));
-        this.$ionicPopup.show({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            scope: {},
-            buttons: [{text: "text", type: "type", onTap: (e) => {console.log(e)}}]
-        }).close("done");
-
-        this.$ionicPopup.alert({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            okText: "OK",
-            okType: "okType"
-        }).then(() => console.log("popover shown"))
-        this.$ionicPopup.alert({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            okText: "OK",
-            okType: "okType"
-        }).close();
-
-        this.$ionicPopup.confirm({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            okText: "OK",
-            okType: "okType",
-            cancelText: "Cancel",
-            cancelType: "cancelType"
-        }).then((result) => console.log(result === true ? "confirmed": "cancelled"))
-        this.$ionicPopup.confirm({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            okText: "OK",
-            okType: "okType",
-            cancelText: "Cancel",
-            cancelType: "cancelType"
-        }).close();
-
-        this.$ionicPopup.prompt({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            okText: "OK",
-            okType: "okType",
-            cancelText: "Cancel",
-            cancelType: "cancelType",
-            inputType: "text",
-            inputPlaceholder: "Type some text..."
-        }).then(() => console.log("popover shown"))
-        this.$ionicPopup.prompt({
-            title: "title",
-            subTitle: "subTitle",
-            cssClass: "cssClass",
-            template: "template",
-            templateUrl: "templateUrl",
-            okText: "OK",
-            okType: "okType",
-            cancelText: "Cancel",
-            cancelType: "cancelType",
-            inputType: "text",
-            inputPlaceholder: "Type some text..."
-        }).close();
-    }
-
-    private testScroll(): void {
-        this.$ionicScrollDelegate.resize();
-        this.$ionicScrollDelegate.scrollTop();
-        this.$ionicScrollDelegate.scrollTop(true);
-        this.$ionicScrollDelegate.scrollBottom();
-        this.$ionicScrollDelegate.scrollBottom(true);
-        this.$ionicScrollDelegate.scrollTo(0, 0);
-        this.$ionicScrollDelegate.scrollTo(0, 0, true);
-        this.$ionicScrollDelegate.scrollBy(0, 0);
-        this.$ionicScrollDelegate.scrollBy(0, 0, true);
-        this.$ionicScrollDelegate.zoomTo(1);
-        this.$ionicScrollDelegate.zoomTo(1, true);
-        this.$ionicScrollDelegate.zoomTo(1, true, 0);
-        this.$ionicScrollDelegate.zoomTo(1, true, 0, 0);
-        this.$ionicScrollDelegate.zoomBy(0.5);
-        this.$ionicScrollDelegate.zoomBy(0.5, true);
-        this.$ionicScrollDelegate.zoomBy(0.5, true, 50);
-        this.$ionicScrollDelegate.zoomBy(0.5, true, 50, 50);
-        var {top: number, left: number} = this.$ionicScrollDelegate.getScrollPosition();
-        this.$ionicScrollDelegate.anchorScroll();
-        this.$ionicScrollDelegate.anchorScroll(true);
-        var isScrollFrozen: boolean = this.$ionicScrollDelegate.freezeScroll();
-        this.$ionicScrollDelegate.freezeScroll(false);
-        var areAllScrollsFrozen: boolean = this.$ionicScrollDelegate.freezeAllScrolls();
-        this.$ionicScrollDelegate.freezeAllScrolls(false);
-        var scrollView: any = this.$ionicScrollDelegate.getScrollView();
-        var scrollDelegate: ionic.scroll.IonicScrollDelegate = this.$ionicScrollDelegate.$getByHandle("handle");
-    }
-    private testSideMenu(): void {
-        this.$ionicSideMenuDelegate.toggleLeft();
-        this.$ionicSideMenuDelegate.toggleLeft(true);
-        this.$ionicSideMenuDelegate.toggleRight();
-        this.$ionicSideMenuDelegate.toggleRight(true);
-        var openRatio: number = this.$ionicSideMenuDelegate.getOpenRatio();
-        var isOpen: boolean = this.$ionicSideMenuDelegate.isOpen();
-        var isOpenLeft: boolean = this.$ionicSideMenuDelegate.isOpenLeft();
-        var isOpenRight: boolean = this.$ionicSideMenuDelegate.isOpenRight();
-        var canDragContent: boolean = this.$ionicSideMenuDelegate.canDragContent();
-        this.$ionicSideMenuDelegate.canDragContent(false);
-        var edgeDragThreshold: boolean = this.$ionicSideMenuDelegate.edgeDragThreshold();
-        this.$ionicSideMenuDelegate.edgeDragThreshold(true);
-        this.$ionicSideMenuDelegate.edgeDragThreshold(500);
-        var sideMenuDelegate: ionic.sideMenu.IonicSideMenuDelegate = this.$ionicSideMenuDelegate.$getByHandle("handle");
-    }
-    private testSlideBox(): void {
-        this.$ionicSlideBoxDelegate.update();
-        this.$ionicSlideBoxDelegate.slide(1);
-        this.$ionicSlideBoxDelegate.slide(1, 500);
-        var isSlideEnabled: boolean = this.$ionicSlideBoxDelegate.enableSlide();
-        this.$ionicSlideBoxDelegate.enableSlide(true);
-        this.$ionicSlideBoxDelegate.previous();
-        this.$ionicSlideBoxDelegate.previous(500);
-        this.$ionicSlideBoxDelegate.next();
-        this.$ionicSlideBoxDelegate.next(500);
-        this.$ionicSlideBoxDelegate.stop();
-        this.$ionicSlideBoxDelegate.start();
-        var currentIndex: number = this.$ionicSlideBoxDelegate.currentIndex();
-        var slidesCount: number = this.$ionicSlideBoxDelegate.slidesCount();
-        var slideBoxDelegate: ionic.slideBox.IonicSlideBoxDelegate = this.$ionicSlideBoxDelegate.$getByHandle("handle");
-    }
-    private testTabs(): void {
-        this.$ionicTabsDelegate.select(1);
-        var selectedIndex: number = this.$ionicTabsDelegate.selectedIndex();
-        var ionicTabsDelegate: ionic.tabs.IonicTabsDelegate = this.$ionicTabsDelegate.$getByHandle("handle");
-        this.$ionicTabsDelegate.showBar(true);
-        var isBarShown: boolean = this.$ionicTabsDelegate.showBar();
-    }
-    private testUtility(): void {
-        var {top: number, left: number, width: number, height: number} = this.$ionicPositionService.position(angular.element("body"));
-        var {top: number, left: number, width: number, height: number} = this.$ionicPositionService.offset(angular.element("body"));
-    }
-
-    /**
-     * ionic.version
-     */
-    private testStaticVersion(): void {
-        var version: string = ionic.version;
-    }
-
-    /**
-     * ionic.Platform
-     */
-    private testStaticPlaform(): void {
-        var callbackWithoutReturn: ()=>void;
-        var callbackWithReturn: ()=>boolean;
-        var ready: void = ionic.Platform.ready(callbackWithoutReturn);
-        ready = ionic.Platform.ready(callbackWithReturn);
-        var setGrade: void = ionic.Platform.setGrade('iOS');
-        var deviceInformation: string = ionic.Platform.device();
-        var isBrowser: boolean = ionic.Platform.is('browser');
-        var isWebView: boolean = ionic.Platform.isWebView();
-        var isIPad: boolean = ionic.Platform.isIPad();
-        var isIOS: boolean = ionic.Platform.isIOS();
-        var isAndroid: boolean = ionic.Platform.isAndroid();
-        var isWindowsPhone: boolean = ionic.Platform.isWindowsPhone();
-        var currentPlatform: string = ionic.Platform.platform();
-        var currentPlatformVersion: number = ionic.Platform.version();
-        var exitApp: void = ionic.Platform.exitApp();
-        var showStatusBar: void = ionic.Platform.showStatusBar(true);
-        var showStatusBar: void = ionic.Platform.fullScreen();
-        showStatusBar = ionic.Platform.fullScreen(true);
-        showStatusBar = ionic.Platform.fullScreen(true, true);
-        var isReady: boolean = ionic.Platform.isReady;
-        var isFullScreen: boolean = ionic.Platform.isFullScreen;
-        var platforms: Array<string> = ionic.Platform.platforms;
-        var grade: string = ionic.Platform.grade;
-    }
-}
-
-testIonic.controller('ionicTestController', IonicTestController);
-
diff --git a/types/ionic/tsconfig.json b/types/ionic/tsconfig.json
deleted file mode 100644
index 0c0ab4f00c..0000000000
--- a/types/ionic/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ionic-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index 39904b8b53..de71a9f083 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -1,8 +1,12 @@
-// Type definitions for ioredis
+// Type definitions for ioredis 3.2
 // Project: https://github.com/luin/ioredis
-// Definitions by: York Yao <https://github.com/plantain-00/>
+// Definitions by: York Yao <https://github.com/plantain-00>
 //                 Christopher Eck <https://github.com/chrisleck>
+//                 Yoga Aliarham <https://github.com/aliarham11>
+//                 Ebrahim <https://github.com/br8h>
+//                 Shahar Mor <https://github.com/shaharmor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
     import * as Redis from "ioredis";
@@ -11,630 +15,750 @@
 
 /// <reference types="node" />
 
+import Promise = require('bluebird');
+
 interface RedisStatic {
-    new (port?: number, host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
-    new (host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
-    new (options: IORedis.RedisOptions): IORedis.Redis;
-    new (url: string): IORedis.Redis;
+    new(port?: number, host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    new(host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    new(options?: IORedis.RedisOptions): IORedis.Redis;
     (port?: number, host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
     (host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
-    (options: IORedis.RedisOptions): IORedis.Redis;
-    (url: string): IORedis.Redis;
+    (options?: IORedis.RedisOptions): IORedis.Redis;
     Cluster: IORedis.Cluster;
+    Command: IORedis.Command;
 }
 
 declare var IORedis: RedisStatic;
 export = IORedis;
 
-declare module IORedis {
-    interface Commander {
-        new (): Commander;
-        getBuiltinCommands(): string[];
-        createBuiltinCommand(commandName: string): {};
-        defineCommand(name: string, definition: {
-            numberOfKeys?: number;
-            lua?: string;
-        }): any;
-        sendCommand(): void;
+declare class Commander {
+    getBuiltinCommands(): string[];
+    createBuiltinCommand(commandName: string): {};
+    defineCommand(name: string, definition: {
+        numberOfKeys?: number;
+        lua?: string;
+    }): any;
+    sendCommand(): void;
+}
+
+declare namespace IORedis {
+    interface Command {
+        setArgumentTransformer(name: string, fn: (args: any[]) => any[]): void;
+        setReplyTransformer(name: string, fn: (result: any) => any): void;
     }
 
     interface Redis extends NodeJS.EventEmitter, Commander {
         status: string;
-        connect(callback?: Function): Promise<any>;
+        connect(callback?: () => void): Promise<any>;
         disconnect(): void;
         duplicate(): Redis;
-        monitor(calback: (error: Error, monitor: NodeJS.EventEmitter) => void): Promise<NodeJS.EventEmitter>;
 
         send_command(command: string, ...args: any[]): any;
-        auth(password: string, callback?: ResCallbackT<any>): any;
-        ping(callback?: ResCallbackT<number>): any;
-        append(key: string, value: string, callback?: ResCallbackT<number>): any;
-        bitcount(key: string, callback?: ResCallbackT<number>): any;
-        bitcount(key: string, start: number, end: number, callback?: ResCallbackT<number>): any;
-        set(key: string, value: string, callback?: ResCallbackT<string>): any;
-        get(key: string, callback?: ResCallbackT<string>): any;
-        exists(key: string, value: string, callback?: ResCallbackT<number>): any;
-        publish(channel: string, value: any): any;
-        subscribe(channel: string): any;
-        get(args: any[], callback?: ResCallbackT<string>): any;
-        get(...args: any[]): any;
-        getBuffer(key: string, callback?: ResCallbackT<Buffer>): any;
-        set(args: any[], callback?: ResCallbackT<string>): any;
-        set(...args: any[]): any;
-        setnx(args: any[], callback?: ResCallbackT<any>): any;
-        setnx(...args: any[]): any;
-        setex(args: any[], callback?: ResCallbackT<any>): any;
-        setex(...args: any[]): any;
-        psetex(args: any[], callback?: ResCallbackT<any>): any;
-        psetex(...args: any[]): any;
-        append(args: any[], callback?: ResCallbackT<any>): any;
-        append(...args: any[]): any;
-        strlen(args: any[], callback?: ResCallbackT<any>): any;
-        strlen(...args: any[]): any;
-        del(args: any[], callback?: ResCallbackT<any>): any;
-        del(...args: any[]): any;
-        exists(args: any[], callback?: ResCallbackT<any>): any;
-        exists(...args: any[]): any;
-        setbit(args: any[], callback?: ResCallbackT<any>): any;
-        setbit(...args: any[]): any;
-        getbit(args: any[], callback?: ResCallbackT<any>): any;
-        getbit(...args: any[]): any;
-        setrange(args: any[], callback?: ResCallbackT<any>): any;
-        setrange(...args: any[]): any;
-        getrange(args: any[], callback?: ResCallbackT<any>): any;
-        getrange(...args: any[]): any;
-        substr(args: any[], callback?: ResCallbackT<any>): any;
-        substr(...args: any[]): any;
-        incr(args: any[], callback?: ResCallbackT<any>): any;
-        incr(...args: any[]): any;
-        decr(args: any[], callback?: ResCallbackT<any>): any;
-        decr(...args: any[]): any;
-        mget(args: any[], callback?: ResCallbackT<any>): any;
-        mget(...args: any[]): any;
-        rpush(...args: any[]): any;
-        lpush(args: any[], callback?: ResCallbackT<any>): any;
-        lpush(...args: any[]): any;
-        rpushx(args: any[], callback?: ResCallbackT<any>): any;
-        rpushx(...args: any[]): any;
-        lpushx(args: any[], callback?: ResCallbackT<any>): any;
-        lpushx(...args: any[]): any;
-        linsert(args: any[], callback?: ResCallbackT<any>): any;
-        linsert(...args: any[]): any;
-        rpop(args: any[], callback?: ResCallbackT<any>): any;
-        rpop(...args: any[]): any;
-        lpop(args: any[], callback?: ResCallbackT<any>): any;
-        lpop(...args: any[]): any;
-        brpop(args: any[], callback?: ResCallbackT<any>): any;
-        brpop(...args: any[]): any;
-        brpoplpush(args: any[], callback?: ResCallbackT<any>): any;
-        brpoplpush(...args: any[]): any;
-        blpop(args: any[], callback?: ResCallbackT<any>): any;
-        blpop(...args: any[]): any;
-        llen(args: any[], callback?: ResCallbackT<any>): any;
-        llen(...args: any[]): any;
-        lindex(args: any[], callback?: ResCallbackT<any>): any;
-        lindex(...args: any[]): any;
-        lset(args: any[], callback?: ResCallbackT<any>): any;
-        lset(...args: any[]): any;
-        lrange(args: any[], callback?: ResCallbackT<any>): any;
-        lrange(...args: any[]): any;
-        ltrim(args: any[], callback?: ResCallbackT<any>): any;
-        ltrim(...args: any[]): any;
-        lrem(args: any[], callback?: ResCallbackT<any>): any;
-        lrem(...args: any[]): any;
-        rpoplpush(args: any[], callback?: ResCallbackT<any>): any;
-        rpoplpush(...args: any[]): any;
-        sadd(args: any[], callback?: ResCallbackT<any>): any;
-        sadd(...args: any[]): any;
-        srem(args: any[], callback?: ResCallbackT<any>): any;
-        srem(...args: any[]): any;
-        smove(args: any[], callback?: ResCallbackT<any>): any;
-        smove(...args: any[]): any;
-        sismember(args: any[], callback?: ResCallbackT<any>): any;
-        sismember(...args: any[]): any;
-        scard(args: any[], callback?: ResCallbackT<any>): any;
-        scard(...args: any[]): any;
-        spop(args: any[], callback?: ResCallbackT<any>): any;
-        spop(...args: any[]): any;
-        srandmember(args: any[], callback?: ResCallbackT<any>): any;
-        srandmember(...args: any[]): any;
-        sinter(args: any[], callback?: ResCallbackT<any>): any;
-        sinter(...args: any[]): any;
-        sinterstore(args: any[], callback?: ResCallbackT<any>): any;
-        sinterstore(...args: any[]): any;
-        sunion(args: any[], callback?: ResCallbackT<any>): any;
-        sunion(...args: any[]): any;
-        sunionstore(args: any[], callback?: ResCallbackT<any>): any;
-        sunionstore(...args: any[]): any;
-        sdiff(args: any[], callback?: ResCallbackT<any>): any;
-        sdiff(...args: any[]): any;
-        sdiffstore(args: any[], callback?: ResCallbackT<any>): any;
-        sdiffstore(...args: any[]): any;
-        smembers(args: any[], callback?: ResCallbackT<any>): any;
-        smembers(...args: any[]): any;
-        zadd(args: any[], callback?: ResCallbackT<any>): any;
-        zadd(...args: any[]): any;
-        zincrby(args: any[], callback?: ResCallbackT<any>): any;
-        zincrby(...args: any[]): any;
-        zrem(args: any[], callback?: ResCallbackT<any>): any;
-        zrem(...args: any[]): any;
-        zremrangebyscore(args: any[], callback?: ResCallbackT<any>): any;
-        zremrangebyscore(...args: any[]): any;
-        zremrangebyrank(args: any[], callback?: ResCallbackT<any>): any;
-        zremrangebyrank(...args: any[]): any;
-        zunionstore(args: any[], callback?: ResCallbackT<any>): any;
-        zunionstore(...args: any[]): any;
-        zinterstore(args: any[], callback?: ResCallbackT<any>): any;
-        zinterstore(...args: any[]): any;
-        zrange(args: any[], callback?: ResCallbackT<any>): any;
-        zrange(...args: any[]): any;
-        zrangebyscore(args: any[], callback?: ResCallbackT<any>): any;
-        zrangebyscore(...args: any[]): any;
-        zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): any;
-        zrevrangebyscore(...args: any[]): any;
-        zcount(args: any[], callback?: ResCallbackT<any>): any;
-        zcount(...args: any[]): any;
-        zrevrange(args: any[], callback?: ResCallbackT<any>): any;
-        zrevrange(...args: any[]): any;
-        zcard(args: any[], callback?: ResCallbackT<any>): any;
-        zcard(...args: any[]): any;
-        zscore(args: any[], callback?: ResCallbackT<any>): any;
-        zscore(...args: any[]): any;
-        zrank(args: any[], callback?: ResCallbackT<any>): any;
-        zrank(...args: any[]): any;
-        zrevrank(args: any[], callback?: ResCallbackT<any>): any;
-        zrevrank(...args: any[]): any;
-        hset(args: any[], callback?: ResCallbackT<any>): any;
-        hset(...args: any[]): any;
-        hsetnx(args: any[], callback?: ResCallbackT<any>): any;
-        hsetnx(...args: any[]): any;
-        hget(args: any[], callback?: ResCallbackT<any>): any;
-        hget(...args: any[]): any;
-        hmset(args: any[], callback?: ResCallbackT<any>): any;
-        hmset(key: string, hash: any, callback?: ResCallbackT<any>): any;
-        hmset(...args: any[]): any;
-        hmget(args: any[], callback?: ResCallbackT<any>): any;
-        hmget(...args: any[]): any;
-        hincrby(args: any[], callback?: ResCallbackT<any>): any;
-        hincrby(...args: any[]): any;
-        hincrbyfloat(args: any[], callback?: ResCallbackT<any>): any;
-        hincrbyfloat(...args: any[]): any;
-        hdel(args: any[], callback?: ResCallbackT<any>): any;
-        hdel(...args: any[]): any;
-        hlen(args: any[], callback?: ResCallbackT<any>): any;
-        hlen(...args: any[]): any;
-        hkeys(args: any[], callback?: ResCallbackT<any>): any;
-        hkeys(...args: any[]): any;
-        hvals(args: any[], callback?: ResCallbackT<any>): any;
-        hvals(...args: any[]): any;
-        hgetall(args: any[], callback?: ResCallbackT<any>): any;
-        hgetall(...args: any[]): any;
-        hgetall(key: string, callback?: ResCallbackT<any>): any;
-        hexists(args: any[], callback?: ResCallbackT<any>): any;
-        hexists(...args: any[]): any;
-        incrby(args: any[], callback?: ResCallbackT<any>): any;
-        incrby(...args: any[]): any;
-        incrbyfloat(args: any[], callback?: ResCallbackT<any>): any;
-        incrbyfloat(...args: any[]): any;
-        decrby(args: any[], callback?: ResCallbackT<any>): any;
-        decrby(...args: any[]): any;
-        getset(args: any[], callback?: ResCallbackT<any>): any;
-        getset(...args: any[]): any;
-        mset(args: any[], callback?: ResCallbackT<any>): any;
-        mset(...args: any[]): any;
-        msetnx(args: any[], callback?: ResCallbackT<any>): any;
-        msetnx(...args: any[]): any;
-        randomkey(args: any[], callback?: ResCallbackT<any>): any;
-        randomkey(...args: any[]): any;
-        select(args: any[], callback?: ResCallbackT<any>): void;
-        select(...args: any[]): void;
-        move(args: any[], callback?: ResCallbackT<any>): any;
-        move(...args: any[]): any;
-        rename(args: any[], callback?: ResCallbackT<any>): any;
-        rename(...args: any[]): any;
-        renamenx(args: any[], callback?: ResCallbackT<any>): any;
-        renamenx(...args: any[]): any;
-        expire(args: any[], callback?: ResCallbackT<any>): any;
-        expire(...args: any[]): any;
-        pexpire(args: any[], callback?: ResCallbackT<any>): any;
-        pexpire(...args: any[]): any;
-        expireat(args: any[], callback?: ResCallbackT<any>): any;
-        expireat(...args: any[]): any;
-        pexpireat(args: any[], callback?: ResCallbackT<any>): any;
-        pexpireat(...args: any[]): any;
-        keys(args: any[], callback?: ResCallbackT<any>): any;
-        keys(...args: any[]): any;
-        dbsize(args: any[], callback?: ResCallbackT<any>): any;
-        dbsize(...args: any[]): any;
-        auth(args: any[], callback?: ResCallbackT<any>): void;
-        auth(...args: any[]): void;
-        ping(args: any[], callback?: ResCallbackT<any>): any;
-        ping(...args: any[]): any;
-        echo(args: any[], callback?: ResCallbackT<any>): any;
-        echo(...args: any[]): any;
-        save(args: any[], callback?: ResCallbackT<any>): any;
-        save(...args: any[]): any;
-        bgsave(args: any[], callback?: ResCallbackT<any>): any;
-        bgsave(...args: any[]): any;
-        bgrewriteaof(args: any[], callback?: ResCallbackT<any>): any;
-        bgrewriteaof(...args: any[]): any;
-        shutdown(args: any[], callback?: ResCallbackT<any>): any;
-        shutdown(...args: any[]): any;
-        lastsave(args: any[], callback?: ResCallbackT<any>): any;
-        lastsave(...args: any[]): any;
-        type(args: any[], callback?: ResCallbackT<any>): any;
-        type(...args: any[]): any;
-        multi(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        multi(...args: any[]): Pipeline;
-        exec(args: any[], callback?: ResCallbackT<any>): any;
-        exec(...args: any[]): any;
-        discard(args: any[], callback?: ResCallbackT<any>): any;
-        discard(...args: any[]): any;
-        sync(args: any[], callback?: ResCallbackT<any>): any;
-        sync(...args: any[]): any;
-        flushdb(args: any[], callback?: ResCallbackT<any>): any;
-        flushdb(...args: any[]): any;
-        flushall(args: any[], callback?: ResCallbackT<any>): any;
-        flushall(...args: any[]): any;
-        sort(args: any[], callback?: ResCallbackT<any>): any;
-        sort(...args: any[]): any;
-        info(args: any[], callback?: ResCallbackT<any>): any;
-        info(...args: any[]): any;
-        time(args: any[], callback?: ResCallbackT<any>): any;
-        time(...args: any[]): any;
-        monitor(args: any[], callback?: ResCallbackT<any>): any;
-        monitor(...args: any[]): any;
-        ttl(args: any[], callback?: ResCallbackT<any>): any;
-        ttl(...args: any[]): any;
-        persist(args: any[], callback?: ResCallbackT<any>): any;
-        persist(...args: any[]): any;
-        slaveof(args: any[], callback?: ResCallbackT<any>): any;
-        slaveof(...args: any[]): any;
-        debug(args: any[], callback?: ResCallbackT<any>): any;
+
+        bitcount(key: string, callback: (err: Error, res: number) => void): void;
+        bitcount(key: string, start: number, end: number, callback: (err: Error, res: number) => void): void;
+        bitcount(key: string): Promise<number>;
+        bitcount(key: string, start: number, end: number): Promise<number>;
+
+        get(key: string, callback: (err: Error, res: string) => void): void;
+        get(key: string): Promise<string>;
+        getBuffer(key: string, callback: (err: Error, res: Buffer) => void): void;
+        getBuffer(key: string): Promise<Buffer>;
+
+        set(key: string, value: any, ...args: any[]): any;
+
+        setnx(key: string, value: any, callback: (err: Error, res: any) => void): void;
+        setnx(key: string, value: any): Promise<any>;
+
+        setex(key: string, seconds: number, value: any, callback: (err: Error, res: any) => void): void;
+        setex(key: string, seconds: number, value: any): Promise<any>;
+
+        psetex(key: string, milliseconds: number, value: any, callback: (err: Error, res: any) => void): void;
+        psetex(key: string, milliseconds: number, value: any): Promise<any>;
+
+        append(key: string, value: any, callback: (err: Error, res: number) => void): void;
+        append(key: string, value: any): Promise<number>;
+
+        strlen(key: string, callback: (err: Error, res: number) => void): void;
+        strlen(key: string): Promise<number>;
+
+        del(...keys: string[]): any;
+
+        exists(...keys: string[]): any;
+
+        setbit(key: string, offset: number, value: any, callback: (err: Error, res: number) => void): void;
+        setbit(key: string, offset: number, value: any): Promise<number>;
+
+        getbit(key: string, offset: number, callback: (err: Error, res: number) => void): void;
+        getbit(key: string, offset: number): Promise<number>;
+
+        setrange(key: string, offset: number, value: any, callback: (err: Error, res: number) => void): void;
+        setrange(key: string, offset: number, value: any): Promise<number>;
+
+        getrange(key: string, start: number, end: number, callback: (err: Error, res: string) => void): void;
+        getrange(key: string, start: number, end: number): Promise<string>;
+
+        substr(key: string, start: number, end: number, callback: (err: Error, res: string) => void): void;
+        substr(key: string, start: number, end: number): Promise<string>;
+
+        incr(key: string, callback: (err: Error, res: number) => void): void;
+        incr(key: string): Promise<number>;
+
+        decr(key: string, callback: (err: Error, res: number) => void): void;
+        decr(key: string): Promise<number>;
+
+        mget(...keys: string[]): any;
+
+        rpush(key: string, ...values: any[]): any;
+
+        lpush(key: string, ...values: any[]): any;
+
+        rpushx(key: string, value: any, callback: (err: Error, res: number) => void): void;
+        rpushx(key: string, value: any): Promise<number>;
+
+        lpushx(key: string, value: any, callback: (err: Error, res: number) => void): void;
+        lpushx(key: string, value: any): Promise<number>;
+
+        linsert(key: string, direction: "BEFORE" | "AFTER", pivot: string, value: any, callback: (err: Error, res: number) => void): void;
+        linsert(key: string, direction: "BEFORE" | "AFTER", pivot: string, value: any): Promise<number>;
+
+        rpop(key: string, callback: (err: Error, res: string) => void): void;
+        rpop(key: string): Promise<string>;
+
+        lpop(key: string, callback: (err: Error, res: string) => void): void;
+        lpop(key: string): Promise<string>;
+
+        brpop(...keys: string[]): any;
+
+        blpop(...keys: string[]): any;
+
+        brpoplpush(source: string, destination: string, timeout: number, callback: (err: Error, res: any) => void): void;
+        brpoplpush(source: string, destination: string, timeout: number): Promise<any>;
+
+        llen(key: string, callback: (err: Error, res: number) => void): void;
+        llen(key: string): Promise<number>;
+
+        lindex(key: string, index: number, callback: (err: Error, res: string) => void): void;
+        lindex(key: string, index: number): Promise<string>;
+
+        lset(key: string, index: number, value: any, callback: (err: Error, res: any) => void): void;
+        lset(key: string, index: number, value: any): Promise<any>;
+
+        lrange(key: string, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        lrange(key: string, start: number, stop: number): Promise<any>;
+
+        ltrim(key: string, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        ltrim(key: string, start: number, stop: number): Promise<any>;
+
+        lrem(key: string, count: number, value: any, callback: (err: Error, res: number) => void): void;
+        lrem(key: string, count: number, value: any): Promise<number>;
+
+        rpoplpush(source: string, destination: string, callback: (err: Error, res: string) => void): void;
+        rpoplpush(source: string, destination: string): Promise<string>;
+
+        sadd(key: string, ...members: any[]): any;
+
+        srem(key: string, ...members: any[]): any;
+
+        smove(source: string, destination: string, member: string, callback: (err: Error, res: string) => void): void;
+        smove(source: string, destination: string, member: string): Promise<string>;
+
+        sismember(key: string, member: string, callback: (err: Error, res: 1 | 0) => void): void;
+        sismember(key: string, member: string): Promise<1 | 0>;
+
+        scard(key: string, callback: (err: Error, res: number) => void): void;
+        scard(key: string): Promise<number>;
+
+        spop(key: string, callback: (err: Error, res: any) => void): void;
+        spop(key: string, count: number, callback: (err: Error, res: any) => void): void;
+        spop(key: string, count?: number): Promise<any>;
+
+        srandmember(key: string, callback: (err: Error, res: any) => void): void;
+        srandmember(key: string, count: number, callback: (err: Error, res: any) => void): void;
+        srandmember(key: string, count?: number): Promise<any>;
+
+        sinter(...keys: string[]): any;
+
+        sinterstore(destination: string, ...keys: string[]): any;
+
+        sunion(...keys: string[]): any;
+
+        sunionstore(destination: string, ...keys: string[]): any;
+
+        sdiff(...keys: string[]): any;
+
+        sdiffstore(destination: string, ...keys: string[]): any;
+
+        smembers(key: string, callback: (err: Error, res: any) => void): void;
+        smembers(key: string): Promise<any>;
+
+        zadd(key: string, ...args: string[]): any;
+
+        zincrby(key: string, increment: number, member: string, callback: (err: Error, res: any) => void): void;
+        zincrby(key: string, increment: number, member: string): Promise<any>;
+
+        zrem(key: string, ...members: any[]): any;
+
+        zremrangebyscore(key: string, min: number | string, max: number | string, callback: (err: Error, res: any) => void): void;
+        zremrangebyscore(key: string, min: number | string, max: number | string): Promise<any>;
+
+        zremrangebyrank(key: string, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        zremrangebyrank(key: string, start: number, stop: number): Promise<any>;
+
+        zunionstore(destination: string, numkeys: number, key: string, ...args: string[]): any;
+
+        zinterstore(destination: string, numkeys: number, key: string, ...args: string[]): any;
+
+        zrange(key: string, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        zrange(key: string, start: number, stop: number, withScores: "WITHSCORES", callback: (err: Error, res: any) => void): void;
+        zrange(key: string, start: number, stop: number, withScores?: "WITHSCORES"): Promise<any>;
+
+        zrevrange(key: string, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        zrevrange(key: string, start: number, stop: number, withScores: "WITHSCORES", callback: (err: Error, res: any) => void): void;
+        zrevrange(key: string, start: number, stop: number, withScores?: "WITHSCORES"): Promise<any>;
+
+        zrangebyscore(key: string, min: number | string, max: number | string, ...args: string[]): any;
+
+        zrevrangebyscore(key: string, max: number | string, min: number | string, ...args: string[]): any;
+
+        zcount(key: string, min: number | string, max: number | string, callback: (err: Error, res: number) => void): void;
+        zcount(key: string, min: number | string, max: number | string): Promise<number>;
+
+        zcard(key: string, callback: (err: Error, res: number) => void): void;
+        zcard(key: string): Promise<number>;
+
+        zscore(key: string, member: string, callback: (err: Error, res: number) => void): void;
+        zscore(key: string, member: string): Promise<number>;
+
+        zrank(key: string, member: string, callback: (err: Error, res: number) => void): void;
+        zrank(key: string, member: string): Promise<number>;
+
+        zrevrank(key: string, member: string, callback: (err: Error, res: number) => void): void;
+        zrevrank(key: string, member: string): Promise<number>;
+
+        hset(key: string, field: string, value: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hset(key: string, field: string, value: any): Promise<0 | 1>;
+
+        hsetnx(key: string, field: string, value: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hsetnx(key: string, field: string, value: any): Promise<0 | 1>;
+
+        hget(key: string, field: string, callback: (err: Error, res: string) => void): void;
+        hget(key: string, field: string): Promise<string>;
+
+        hmset(key: string, field: string, value: any, ...args: string[]): Promise<0 | 1>;
+        hmset(key: string, data: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hmset(key: string, data: any): Promise<0 | 1>;
+
+        hmget(key: string, ...fields: string[]): any;
+
+        hincrby(key: string, field: string, increment: number, callback: (err: Error, res: number) => void): void;
+        hincrby(key: string, field: string, increment: number): Promise<number>;
+
+        hincrbyfloat(key: string, field: string, increment: number, callback: (err: Error, res: number) => void): void;
+        hincrbyfloat(key: string, field: string, increment: number): Promise<number>;
+
+        hdel(key: string, ...fields: string[]): any;
+
+        hlen(key: string, callback: (err: Error, res: number) => void): void;
+        hlen(key: string): Promise<number>;
+
+        hkeys(key: string, callback: (err: Error, res: any) => void): void;
+        hkeys(key: string): Promise<any>;
+
+        hvals(key: string, callback: (err: Error, res: any) => void): void;
+        hvals(key: string): Promise<any>;
+
+        hgetall(key: string, callback: (err: Error, res: any) => void): void;
+        hgetall(key: string): Promise<any>;
+
+        hexists(key: string, field: string, callback: (err: Error, res: 0 | 1) => void): void;
+        hexists(key: string, field: string): Promise<0 | 1>;
+
+        incrby(key: string, increment: number, callback: (err: Error, res: number) => void): void;
+        incrby(key: string, increment: number): Promise<number>;
+
+        incrbyfloat(key: string, increment: number, callback: (err: Error, res: number) => void): void;
+        incrbyfloat(key: string, increment: number): Promise<number>;
+
+        decrby(key: string, decrement: number, callback: (err: Error, res: number) => void): void;
+        decrby(key: string, decrement: number): Promise<number>;
+
+        getset(key: string, value: any, callback: (err: Error, res: string) => void): void;
+        getset(key: string, value: any): Promise<string>;
+
+        mset(key: string, value: any, ...args: string[]): any;
+
+        msetnx(key: string, value: any, ...args: string[]): any;
+
+        randomkey(callback: (err: Error, res: string) => void): void;
+        randomkey(): Promise<string>;
+
+        select(index: number, callback: (err: Error, res: string) => void): void;
+        select(index: number): Promise<string>;
+
+        move(key: string, db: string, callback: (err: Error, res: 0 | 1) => void): void;
+        move(key: string, db: string): Promise<0 | 1>;
+
+        rename(key: string, newkey: string, callback: (err: Error, res: string) => void): void;
+        rename(key: string, newkey: string): Promise<string>;
+
+        renamenx(key: string, newkey: string, callback: (err: Error, res: 0 | 1) => void): void;
+        renamenx(key: string, newkey: string): Promise<0 | 1>;
+
+        expire(key: string, seconds: number, callback: (err: Error, res: 0 | 1) => void): void;
+        expire(key: string, seconds: number): Promise<0 | 1>;
+
+        pexpire(key: string, milliseconds: number, callback: (err: Error, res: 0 | 1) => void): void;
+        pexpire(key: string, milliseconds: number): Promise<0 | 1>;
+
+        expireat(key: string, timestamp: number, callback: (err: Error, res: 0 | 1) => void): void;
+        expireat(key: string, timestamp: number): Promise<0 | 1>;
+
+        pexpireat(key: string, millisecondsTimestamp: number, callback: (err: Error, res: 0 | 1) => void): void;
+        pexpireat(key: string, millisecondsTimestamp: number): Promise<0 | 1>;
+
+        keys(pattern: string, callback: (err: Error, res: string[]) => void): void;
+        keys(pattern: string): Promise<string[]>;
+
+        dbsize(callback: (err: Error, res: number) => void): void;
+        dbsize(): Promise<number>;
+
+        auth(password: string, callback: (err: Error, res: string) => void): void;
+        auth(password: string): Promise<string>;
+
+        ping(callback: (err: Error, res: string) => void): void;
+        ping(message: string, callback: (err: Error, res: string) => void): void;
+        ping(message?: string): Promise<string>;
+
+        echo(message: string, callback: (err: Error, res: string) => void): void;
+        echo(message: string): Promise<string>;
+
+        save(callback: (err: Error, res: string) => void): void;
+        save(): Promise<string>;
+
+        bgsave(callback: (err: Error, res: string) => void): void;
+        bgsave(): Promise<string>;
+
+        bgrewriteaof(callback: (err: Error, res: string) => void): void;
+        bgrewriteaof(): Promise<string>;
+
+        shutdown(save: "SAVE" | "NOSAVE", callback: (err: Error, res: any) => void): void;
+        shutdown(save: "SAVE" | "NOSAVE"): Promise<any>;
+
+        lastsave(callback: (err: Error, res: number) => void): void;
+        lastsave(): Promise<number>;
+
+        type(key: string, callback: (err: Error, res: string) => void): void;
+        type(key: string): Promise<string>;
+
+        multi(commands?: string[][], options?: MultiOptions): Pipeline;
+        multi(options: { pipeline: false }): Promise<string>;
+
+        exec(callback: (err: Error, res: any) => void): void;
+        exec(): Promise<any>;
+
+        discard(callback: (err: Error, res: any) => void): void;
+        discard(): Promise<any>;
+
+        sync(callback: (err: Error, res: any) => void): void;
+        sync(): Promise<any>;
+
+        flushdb(callback: (err: Error, res: string) => void): void;
+        flushdb(): Promise<string>;
+
+        flushall(callback: (err: Error, res: string) => void): void;
+        flushall(): Promise<string>;
+
+        sort(key: string, ...args: string[]): any;
+
+        info(callback: (err: Error, res: any) => void): void;
+        info(section: string, callback: (err: Error, res: any) => void): void;
+        info(section?: string): Promise<string>;
+
+        time(callback: (err: Error, res: any) => void): void;
+        time(): Promise<any>;
+
+        monitor(callback: (err: Error, res: NodeJS.EventEmitter) => void): void;
+        monitor(): Promise<NodeJS.EventEmitter>;
+
+        ttl(key: string, callback: (err: Error, res: number) => void): void;
+        ttl(key: string): Promise<number>;
+
+        persist(key: string, callback: (err: Error, res: 0 | 1) => void): void;
+        persist(key: string): Promise<0 | 1>;
+
+        slaveof(host: string, port: number, callback: (err: Error, res: string) => void): void;
+        slaveof(host: string, port: number): Promise<string>;
+
         debug(...args: any[]): any;
-        config(args: any[], callback?: ResCallbackT<any>): any;
+
         config(...args: any[]): any;
-        subscribe(args: any[], callback?: ResCallbackT<any>): any;
-        subscribe(...args: any[]): any;
-        unsubscribe(args: any[], callback?: ResCallbackT<any>): any;
-        unsubscribe(...args: any[]): any;
-        psubscribe(args: any[], callback?: ResCallbackT<any>): any;
-        psubscribe(...args: any[]): any;
-        punsubscribe(args: any[], callback?: ResCallbackT<any>): any;
-        punsubscribe(...args: any[]): any;
-        publish(args: any[], callback?: ResCallbackT<any>): any;
-        publish(...args: any[]): any;
-        watch(args: any[], callback?: ResCallbackT<any>): any;
-        watch(...args: any[]): any;
-        unwatch(args: any[], callback?: ResCallbackT<any>): any;
-        unwatch(...args: any[]): any;
-        cluster(args: any[], callback?: ResCallbackT<any>): any;
+
+        subscribe(...channels: any[]): any;
+
+        unsubscribe(...channels: string[]): any;
+
+        psubscribe(...patterns: string[]): any;
+
+        punsubscribe(...patterns: string[]): any;
+
+        publish(channel: string, message: string, callback: (err: Error, res: number) => void): void;
+        publish(channel: string, message: string): Promise<number>;
+
+        watch(...keys: string[]): any;
+
+        unwatch(callback: (err: Error, res: string) => void): void;
+        unwatch(): Promise<string>;
+
         cluster(...args: any[]): any;
-        restore(args: any[], callback?: ResCallbackT<any>): any;
+
         restore(...args: any[]): any;
-        migrate(args: any[], callback?: ResCallbackT<any>): any;
+
         migrate(...args: any[]): any;
-        dump(args: any[], callback?: ResCallbackT<any>): any;
-        dump(...args: any[]): any;
-        object(args: any[], callback?: ResCallbackT<any>): any;
-        object(...args: any[]): any;
-        client(args: any[], callback?: ResCallbackT<any>): any;
+
+        dump(key: string, callback: (err: Error, res: string) => void): void;
+        dump(key: string): Promise<string>;
+
+        object(subcommand: string, ...args: any[]): any;
+
         client(...args: any[]): any;
-        eval(args: any[], callback?: ResCallbackT<any>): any;
+
         eval(...args: any[]): any;
-        evalsha(args: any[], callback?: ResCallbackT<any>): any;
+
         evalsha(...args: any[]): any;
-        script(args: any[], callback?: ResCallbackT<any>): any;
+
         script(...args: any[]): any;
-        script(key: string, callback?: ResCallbackT<any>): any;
-        quit(args: any[], callback?: ResCallbackT<any>): any;
-        quit(...args: any[]): any;
-        scan(...args: any[]): any;
-        scan(args: any[], callback?: ResCallbackT<any>): any;
-        hscan(...args: any[]): any;
-        hscan(args: any[], callback?: ResCallbackT<any>): any;
-        zscan(...args: any[]): any;
-        zscan(args: any[], callback?: ResCallbackT<any>): any;
 
-        pipeline(): Pipeline;
-        pipeline(commands: string[][]): Pipeline;
+        quit(callback: (err: Error, res: string) => void): void;
+        quit(): Promise<string>;
 
-        scanStream(options?: IORedis.ScanStreamOption): NodeJS.EventEmitter;
-        hscanStream(key: string, options?: IORedis.ScanStreamOption): NodeJS.EventEmitter;
-        zscanStream(key: string, options?: IORedis.ScanStreamOption): NodeJS.EventEmitter;
+        scan(cursor: number, ...args: any[]): any;
+
+        hscan(key: string, cursor: number, ...args: any[]): any;
+
+        zscan(key: string, cursor: number, ...args: any[]): any;
+
+        pfmerge(destkey: string, ...sourcekeys: string[]): any;
+
+        pfadd(key: string, ...elements: string[]): any;
+
+        pfcount(...keys: string[]): any;
+
+        pipeline(commands?: string[][]): Pipeline;
+
+        scanStream(options?: ScanStreamOption): NodeJS.EventEmitter;
+        hscanStream(key: string, options?: ScanStreamOption): NodeJS.EventEmitter;
+        zscanStream(key: string, options?: ScanStreamOption): NodeJS.EventEmitter;
     }
 
     interface Pipeline {
-        exec(callback?: ResCallbackT<any[]>): any;
+        bitcount(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        bitcount(key: string, start: number, end: number, callback?: (err: Error, res: number) => void): Pipeline;
+
+        get(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+        getBuffer(key: string, callback?: (err: Error, res: Buffer) => void): Pipeline;
+
+        set(key: string, value: any, ...args: any[]): Pipeline;
+
+        setnx(key: string, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+
+        setex(key: string, seconds: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+
+        psetex(key: string, milliseconds: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+
+        append(key: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+
+        strlen(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        del(...keys: string[]): Pipeline;
+
+        exists(...keys: string[]): Pipeline;
+
+        setbit(key: string, offset: number, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+
+        getbit(key: string, offset: number, callback?: (err: Error, res: number) => void): Pipeline;
+
+        setrange(key: string, offset: number, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+
+        getrange(key: string, start: number, end: number, callback?: (err: Error, res: string) => void): Pipeline;
+
+        substr(key: string, start: number, end: number, callback?: (err: Error, res: string) => void): Pipeline;
+
+        incr(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        decr(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        mget(...keys: string[]): Pipeline;
+
+        rpush(key: string, ...values: any[]): Pipeline;
+
+        lpush(key: string, ...values: any[]): Pipeline;
+
+        rpushx(key: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+
+        lpushx(key: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+
+        linsert(key: string, direction: "BEFORE" | "AFTER", pivot: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+
+        rpop(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        lpop(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        brpop(...keys: string[]): Pipeline;
+
+        blpop(...keys: string[]): Pipeline;
+
+        brpoplpush(source: string, destination: string, timeout: number, callback?: (err: Error, res: any) => void): Pipeline;
+
+        llen(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        lindex(key: string, index: number, callback?: (err: Error, res: string) => void): Pipeline;
+
+        lset(key: string, index: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+
+        lrange(key: string, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
+
+        ltrim(key: string, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
+
+        lrem(key: string, count: number, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+
+        rpoplpush(source: string, destination: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        sadd(key: string, ...members: any[]): Pipeline;
+
+        srem(key: string, ...members: any[]): Pipeline;
+
+        smove(source: string, destination: string, member: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        sismember(key: string, member: string, callback?: (err: Error, res: 1 | 0) => void): Pipeline;
+
+        scard(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        spop(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+        spop(key: string, count: number, callback?: (err: Error, res: any) => void): Pipeline;
+
+        srandmember(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+        srandmember(key: string, count: number, callback?: (err: Error, res: any) => void): Pipeline;
+
+        sinter(...keys: string[]): Pipeline;
+
+        sinterstore(destination: string, ...keys: string[]): Pipeline;
+
+        sunion(...keys: string[]): Pipeline;
+
+        sunionstore(destination: string, ...keys: string[]): Pipeline;
+
+        sdiff(...keys: string[]): Pipeline;
+
+        sdiffstore(destination: string, ...keys: string[]): Pipeline;
+
+        smembers(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+
+        zadd(key: string, ...args: string[]): Pipeline;
+
+        zincrby(key: string, increment: number, member: string, callback?: (err: Error, res: any) => void): Pipeline;
+
+        zrem(key: string, ...members: any[]): Pipeline;
+
+        zremrangebyscore(key: string, min: number | string, max: number | string, callback?: (err: Error, res: any) => void): Pipeline;
+
+        zremrangebyrank(key: string, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
+
+        zunionstore(destination: string, numkeys: number, key: string, ...args: string[]): Pipeline;
+
+        zinterstore(destination: string, numkeys: number, key: string, ...args: string[]): Pipeline;
+
+        zrange(key: string, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
+        zrange(key: string, start: number, stop: number, withScores: "WITHSCORES", callback?: (err: Error, res: any) => void): Pipeline;
+
+        zrevrange(key: string, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
+        zrevrange(key: string, start: number, stop: number, withScores: "WITHSCORES", callback?: (err: Error, res: any) => void): Pipeline;
+
+        zrangebyscore(key: string, min: number | string, max: number | string, ...args: string[]): Pipeline;
+
+        zrevrangebyscore(key: string, max: number | string, min: number | string, ...args: string[]): Pipeline;
+
+        zcount(key: string, min: number | string, max: number | string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        zcard(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        zscore(key: string, member: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        zrank(key: string, member: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        zrevrank(key: string, member: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        hset(key: string, field: string, value: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        hsetnx(key: string, field: string, value: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        hget(key: string, field: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        hmset(key: string, field: string, value: any, ...args: string[]): Pipeline;
+
+        hmget(key: string, ...fields: string[]): Pipeline;
+
+        hincrby(key: string, field: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
+
+        hincrbyfloat(key: string, field: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
+
+        hdel(key: string, ...fields: string[]): Pipeline;
+
+        hlen(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        hkeys(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+
+        hvals(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+
+        hgetall(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+
+        hexists(key: string, field: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        incrby(key: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
+
+        incrbyfloat(key: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
+
+        decrby(key: string, decrement: number, callback?: (err: Error, res: number) => void): Pipeline;
+
+        getset(key: string, value: any, callback?: (err: Error, res: string) => void): Pipeline;
+
+        mset(key: string, value: any, ...args: string[]): Pipeline;
+
+        msetnx(key: string, value: any, ...args: string[]): Pipeline;
+
+        randomkey(callback?: (err: Error, res: string) => void): Pipeline;
+
+        select(index: number, callback?: (err: Error, res: string) => void): Pipeline;
+
+        move(key: string, db: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        rename(key: string, newkey: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        renamenx(key: string, newkey: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        expire(key: string, seconds: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        pexpire(key: string, milliseconds: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        expireat(key: string, timestamp: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        pexpireat(key: string, millisecondsTimestamp: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        keys(pattern: string, callback?: (err: Error, res: string[]) => void): Pipeline;
+
+        dbsize(callback?: (err: Error, res: number) => void): Pipeline;
+
+        auth(password: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        ping(callback?: (err: Error, res: string) => void): Pipeline;
+        ping(message: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        echo(message: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        save(callback?: (err: Error, res: string) => void): Pipeline;
+
+        bgsave(callback?: (err: Error, res: string) => void): Pipeline;
+
+        bgrewriteaof(callback?: (err: Error, res: string) => void): Pipeline;
+
+        shutdown(save: "SAVE" | "NOSAVE", callback?: (err: Error, res: any) => void): Pipeline;
+
+        lastsave(callback?: (err: Error, res: number) => void): Pipeline;
+
+        type(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        multi(callback?: (err: Error, res: string) => void): Pipeline;
+
+        exec(callback?: (err: Error, res: any) => void): Promise<any>;
+
+        discard(callback?: (err: Error, res: any) => void): Pipeline;
+
+        sync(callback?: (err: Error, res: any) => void): Pipeline;
+
+        flushdb(callback?: (err: Error, res: string) => void): Pipeline;
+
+        flushall(callback?: (err: Error, res: string) => void): Pipeline;
+
+        sort(key: string, ...args: string[]): Pipeline;
+
+        info(callback?: (err: Error, res: any) => void): Pipeline;
+        info(section: string, callback?: (err: Error, res: any) => void): Pipeline;
+
+        time(callback?: (err: Error, res: any) => void): Pipeline;
+
+        monitor(callback?: (err: Error, res: NodeJS.EventEmitter) => void): Pipeline;
+
+        ttl(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        persist(key: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+
+        slaveof(host: string, port: number, callback?: (err: Error, res: string) => void): Pipeline;
 
-        get(args: any[], callback?: ResCallbackT<string>): Pipeline;
-        get(...args: any[]): Pipeline;
-        set(args: any[], callback?: ResCallbackT<string>): Pipeline;
-        set(...args: any[]): Pipeline;
-        setnx(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        setnx(...args: any[]): Pipeline;
-        setex(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        setex(...args: any[]): Pipeline;
-        psetex(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        psetex(...args: any[]): Pipeline;
-        append(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        append(...args: any[]): Pipeline;
-        strlen(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        strlen(...args: any[]): Pipeline;
-        del(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        del(...args: any[]): Pipeline;
-        exists(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        exists(...args: any[]): Pipeline;
-        setbit(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        setbit(...args: any[]): Pipeline;
-        getbit(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        getbit(...args: any[]): Pipeline;
-        setrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        setrange(...args: any[]): Pipeline;
-        getrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        getrange(...args: any[]): Pipeline;
-        substr(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        substr(...args: any[]): Pipeline;
-        incr(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        incr(...args: any[]): Pipeline;
-        decr(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        decr(...args: any[]): Pipeline;
-        mget(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        mget(...args: any[]): Pipeline;
-        rpush(...args: any[]): Pipeline;
-        lpush(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lpush(...args: any[]): Pipeline;
-        rpushx(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        rpushx(...args: any[]): Pipeline;
-        lpushx(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lpushx(...args: any[]): Pipeline;
-        linsert(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        linsert(...args: any[]): Pipeline;
-        rpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        rpop(...args: any[]): Pipeline;
-        lpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lpop(...args: any[]): Pipeline;
-        brpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        brpop(...args: any[]): Pipeline;
-        brpoplpush(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        brpoplpush(...args: any[]): Pipeline;
-        blpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        blpop(...args: any[]): Pipeline;
-        llen(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        llen(...args: any[]): Pipeline;
-        lindex(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lindex(...args: any[]): Pipeline;
-        lset(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lset(...args: any[]): Pipeline;
-        lrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lrange(...args: any[]): Pipeline;
-        ltrim(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        ltrim(...args: any[]): Pipeline;
-        lrem(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lrem(...args: any[]): Pipeline;
-        rpoplpush(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        rpoplpush(...args: any[]): Pipeline;
-        sadd(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sadd(...args: any[]): Pipeline;
-        srem(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        srem(...args: any[]): Pipeline;
-        smove(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        smove(...args: any[]): Pipeline;
-        sismember(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sismember(...args: any[]): Pipeline;
-        scard(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        scard(...args: any[]): Pipeline;
-        spop(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        spop(...args: any[]): Pipeline;
-        srandmember(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        srandmember(...args: any[]): Pipeline;
-        sinter(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sinter(...args: any[]): Pipeline;
-        sinterstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sinterstore(...args: any[]): Pipeline;
-        sunion(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sunion(...args: any[]): Pipeline;
-        sunionstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sunionstore(...args: any[]): Pipeline;
-        sdiff(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sdiff(...args: any[]): Pipeline;
-        sdiffstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sdiffstore(...args: any[]): Pipeline;
-        smembers(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        smembers(...args: any[]): Pipeline;
-        zadd(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zadd(...args: any[]): Pipeline;
-        zincrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zincrby(...args: any[]): Pipeline;
-        zrem(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zrem(...args: any[]): Pipeline;
-        zremrangebyscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zremrangebyscore(...args: any[]): Pipeline;
-        zremrangebyrank(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zremrangebyrank(...args: any[]): Pipeline;
-        zunionstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zunionstore(...args: any[]): Pipeline;
-        zinterstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zinterstore(...args: any[]): Pipeline;
-        zrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zrange(...args: any[]): Pipeline;
-        zrangebyscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zrangebyscore(...args: any[]): Pipeline;
-        zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zrevrangebyscore(...args: any[]): Pipeline;
-        zcount(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zcount(...args: any[]): Pipeline;
-        zrevrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zrevrange(...args: any[]): Pipeline;
-        zcard(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zcard(...args: any[]): Pipeline;
-        zscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zscore(...args: any[]): Pipeline;
-        zrank(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zrank(...args: any[]): Pipeline;
-        zrevrank(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zrevrank(...args: any[]): Pipeline;
-        hset(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hset(...args: any[]): Pipeline;
-        hsetnx(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hsetnx(...args: any[]): Pipeline;
-        hget(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hget(...args: any[]): Pipeline;
-        hmset(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hmset(key: string, hash: any, callback?: ResCallbackT<any>): Pipeline;
-        hmset(...args: any[]): Pipeline;
-        hmget(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hmget(...args: any[]): Pipeline;
-        hincrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hincrby(...args: any[]): Pipeline;
-        hincrbyfloat(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hincrbyfloat(...args: any[]): Pipeline;
-        hdel(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hdel(...args: any[]): Pipeline;
-        hlen(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hlen(...args: any[]): Pipeline;
-        hkeys(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hkeys(...args: any[]): Pipeline;
-        hvals(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hvals(...args: any[]): Pipeline;
-        hgetall(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hgetall(...args: any[]): Pipeline;
-        hgetall(key: string, callback?: ResCallbackT<any>): Pipeline;
-        hexists(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hexists(...args: any[]): Pipeline;
-        incrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        incrby(...args: any[]): Pipeline;
-        incrbyfloat(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        incrbyfloat(...args: any[]): Pipeline;
-        decrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        decrby(...args: any[]): Pipeline;
-        getset(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        getset(...args: any[]): Pipeline;
-        mset(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        mset(...args: any[]): Pipeline;
-        msetnx(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        msetnx(...args: any[]): Pipeline;
-        randomkey(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        randomkey(...args: any[]): Pipeline;
-        select(args: any[], callback?: ResCallbackT<any>): void;
-        select(...args: any[]): Pipeline;
-        move(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        move(...args: any[]): Pipeline;
-        rename(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        rename(...args: any[]): Pipeline;
-        renamenx(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        renamenx(...args: any[]): Pipeline;
-        expire(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        expire(...args: any[]): Pipeline;
-        pexpire(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        pexpire(...args: any[]): Pipeline;
-        expireat(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        expireat(...args: any[]): Pipeline;
-        pexpireat(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        pexpireat(...args: any[]): Pipeline;
-        keys(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        keys(...args: any[]): Pipeline;
-        dbsize(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        dbsize(...args: any[]): Pipeline;
-        auth(args: any[], callback?: ResCallbackT<any>): void;
-        auth(...args: any[]): void;
-        ping(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        ping(...args: any[]): Pipeline;
-        echo(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        echo(...args: any[]): Pipeline;
-        save(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        save(...args: any[]): Pipeline;
-        bgsave(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        bgsave(...args: any[]): Pipeline;
-        bgrewriteaof(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        bgrewriteaof(...args: any[]): Pipeline;
-        shutdown(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        shutdown(...args: any[]): Pipeline;
-        lastsave(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        lastsave(...args: any[]): Pipeline;
-        type(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        type(...args: any[]): Pipeline;
-        multi(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        multi(...args: any[]): Pipeline;
-        exec(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        exec(...args: any[]): Pipeline;
-        discard(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        discard(...args: any[]): Pipeline;
-        sync(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sync(...args: any[]): Pipeline;
-        flushdb(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        flushdb(...args: any[]): Pipeline;
-        flushall(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        flushall(...args: any[]): Pipeline;
-        sort(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        sort(...args: any[]): Pipeline;
-        info(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        info(...args: any[]): Pipeline;
-        time(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        time(...args: any[]): Pipeline;
-        monitor(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        monitor(...args: any[]): Pipeline;
-        ttl(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        ttl(...args: any[]): Pipeline;
-        persist(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        persist(...args: any[]): Pipeline;
-        slaveof(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        slaveof(...args: any[]): Pipeline;
-        debug(args: any[], callback?: ResCallbackT<any>): Pipeline;
         debug(...args: any[]): Pipeline;
-        config(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
         config(...args: any[]): Pipeline;
-        subscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        subscribe(...args: any[]): Pipeline;
-        unsubscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        unsubscribe(...args: any[]): Pipeline;
-        psubscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        psubscribe(...args: any[]): Pipeline;
-        punsubscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        punsubscribe(...args: any[]): Pipeline;
-        publish(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        publish(...args: any[]): Pipeline;
-        watch(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        watch(...args: any[]): Pipeline;
-        unwatch(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        unwatch(...args: any[]): Pipeline;
-        cluster(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
+        subscribe(...channels: any[]): Pipeline;
+
+        unsubscribe(...channels: string[]): Pipeline;
+
+        psubscribe(...patterns: string[]): Pipeline;
+
+        punsubscribe(...patterns: string[]): Pipeline;
+
+        publish(channel: string, message: string, callback?: (err: Error, res: number) => void): Pipeline;
+
+        watch(...keys: string[]): Pipeline;
+
+        unwatch(callback?: (err: Error, res: string) => void): Pipeline;
+
         cluster(...args: any[]): Pipeline;
-        restore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
         restore(...args: any[]): Pipeline;
-        migrate(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
         migrate(...args: any[]): Pipeline;
-        dump(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        dump(...args: any[]): Pipeline;
-        object(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        object(...args: any[]): Pipeline;
-        client(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
+        dump(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        object(subcommand: string, ...args: any[]): Pipeline;
+
         client(...args: any[]): Pipeline;
-        eval(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
         eval(...args: any[]): Pipeline;
-        evalsha(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
         evalsha(...args: any[]): Pipeline;
-        quit(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        quit(...args: any[]): Pipeline;
-        scan(...args: any[]): Pipeline;
-        scan(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        hscan(...args: any[]): Pipeline;
-        hscan(args: any[], callback?: ResCallbackT<any>): Pipeline;
-        zscan(...args: any[]): Pipeline;
-        zscan(args: any[], callback?: ResCallbackT<any>): Pipeline;
+
+        script(...args: any[]): Pipeline;
+
+        quit(callback?: (err: Error, res: string) => void): Pipeline;
+
+        scan(cursor: number, ...args: any[]): Pipeline;
+
+        hscan(key: string, cursor: number, ...args: any[]): Pipeline;
+
+        zscan(key: string, cursor: number, ...args: any[]): Pipeline;
+
+        pfmerge(destkey: string, ...sourcekeys: string[]): Pipeline;
+
+        pfadd(key: string, ...elements: string[]): Pipeline;
+
+        pfcount(...keys: string[]): Pipeline;
     }
 
+    interface NodeConfiguration {
+        host?: string;
+        port?: number;
+    }
+
+    type ClusterNode = string | number | NodeConfiguration;
+
     interface Cluster extends NodeJS.EventEmitter, Commander {
-        new (nodes: { host: string; port: number; }[], options?: IORedis.ClusterOptions): Redis;
-        connect(callback: Function): Promise<any>;
+        new(nodes: ClusterNode[], options?: ClusterOptions): Redis;
+        connect(callback: () => void): Promise<any>;
         disconnect(): void;
         nodes(role: string): Redis[];
     }
 
-    interface ResCallbackT<R> {
-        (err: Error, res: R): void;
-    }
-
     interface RedisOptions {
         port?: number;
         host?: string;
@@ -671,8 +795,8 @@ declare module IORedis {
          * When the return value isn't a number, ioredis will stop trying to reconnect.
          * Fixed in: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/15858
          */
-        retryStrategy?: (times: number) => number | false;
-        reconnectOnError?: (error: Error) => boolean;
+        retryStrategy?(times: number): number | false;
+        reconnectOnError?(error: Error): boolean;
         /**
          * By default, if there is no active connection to the Redis server, commands are added to a queue
          * and are executed once the connection is "ready" (when enableReadyCheck is true, "ready" means
@@ -700,7 +824,7 @@ declare module IORedis {
         tls?: {
             ca: Buffer;
         };
-        sentinels?: { host: string; port: number; }[];
+        sentinels?: Array<{ host: string; port: number; }>;
         name?: string;
         /**
          * Enable READONLY mode for the connection. Only available for cluster mode.
@@ -708,9 +832,14 @@ declare module IORedis {
          */
         readOnly?: boolean;
         /**
-        * If you are using the hiredis parser, it's highly recommended to enable this option. Create another instance with dropBufferSupport disabled for other commands that you want to return binary instead of string:
-        */
+         * If you are using the hiredis parser, it's highly recommended to enable this option.
+         * Create another instance with dropBufferSupport disabled for other commands that you want to return binary instead of string
+         */
         dropBufferSupport?: boolean;
+        /**
+         * Whether to show a friendly error stack. Will decrease the performance significantly.
+         */
+        showFriendlyErrorStack?: boolean;
     }
 
     interface ScanStreamOption {
@@ -719,7 +848,7 @@ declare module IORedis {
     }
 
     interface ClusterOptions {
-        clusterRetryStrategy?: (times: number) => number;
+        clusterRetryStrategy?(times: number): number;
         enableOfflineQueue?: boolean;
         enableReadyCheck?: boolean;
         scaleReads?: string;
@@ -729,4 +858,8 @@ declare module IORedis {
         retryDelayOnTryAgain?: number;
         redisOptions?: RedisOptions;
     }
+
+    interface MultiOptions {
+        pipeline: boolean;
+    }
 }
diff --git a/types/ioredis/ioredis-tests.ts b/types/ioredis/ioredis-tests.ts
index 9fbd9ec1bd..2e80cd80e4 100644
--- a/types/ioredis/ioredis-tests.ts
+++ b/types/ioredis/ioredis-tests.ts
@@ -1,15 +1,13 @@
-
-
 import * as Redis from "ioredis";
-var redis = new Redis();
+const redis = new Redis();
 
 redis.set('foo', 'bar');
-redis.get('foo', function(err, result) {
+redis.get('foo', (err, result) => {
     console.log(result);
 });
 
 // Or using a promise if the last argument isn't a function
-redis.get('foo').then(function(result: any) {
+redis.get('foo').then((result: any) => {
     console.log(result);
 });
 
@@ -18,23 +16,24 @@ redis.sadd('set', 1, 3, 5, 7);
 redis.sadd('set', [1, 3, 5, 7]);
 
 // All arguments are passed directly to the redis server:
-redis.set('key', 100, 'EX', 10);
+redis.set('key', '100', 'EX', 10);
 
-new Redis()       // Connect to 127.0.0.1:6379
-new Redis(6380)   // 127.0.0.1:6380
-new Redis(6379, '192.168.1.1')        // 192.168.1.1:6379
-new Redis('/tmp/redis.sock')
+new Redis();       // Connect to 127.0.0.1:6379
+new Redis(6380);   // 127.0.0.1:6380
+new Redis(6379, '192.168.1.1');       // 192.168.1.1:6379
+new Redis('/tmp/redis.sock');
 new Redis({
     port: 6379,          // Redis port
     host: '127.0.0.1',   // Redis host
     family: 4,           // 4 (IPv4) or 6 (IPv6)
     password: 'auth',
     db: 0,
-    retryStrategy: function() { return false; }
-})
+    retryStrategy() { return false; },
+    showFriendlyErrorStack: true
+});
 
-var pub = new Redis();
-redis.subscribe('news', 'music', function(err: any, count: any) {
+const pub = new Redis();
+redis.subscribe('news', 'music', (err: any, count: any) => {
     // Now we are subscribed to both the 'news' and 'music' channels.
     // `count` represents the number of channels we are currently subscribed to.
 
@@ -42,7 +41,7 @@ redis.subscribe('news', 'music', function(err: any, count: any) {
     pub.publish('music', 'Hello again!');
 });
 
-redis.on('message', function(channel: any, message: any) {
+redis.on('message', (channel: any, message: any) => {
     // Receive message Hello world! from channel news
     // Receive message Hello again! from channel music
     console.log('Receive message %s from channel %s', message, channel);
@@ -50,6 +49,82 @@ redis.on('message', function(channel: any, message: any) {
 
 // There's also an event called 'messageBuffer', which is the same as 'message' except
 // it returns buffers instead of strings.
-redis.on('messageBuffer', function(channel: any, message: any) {
+redis.on('messageBuffer', (channel: any, message: any) => {
     // Both `channel` and `message` are buffers.
 });
+
+const pipeline = redis.pipeline();
+pipeline.set('foo', 'bar');
+pipeline.del('cc');
+pipeline.exec((err, results) => {
+    // `err` is always null, and `results` is an array of responses
+    // corresponding to the sequence of queued commands.
+    // Each response follows the format `[err, result]`.
+});
+
+// You can even chain the commands:
+redis.pipeline().set('foo', 'bar').del('cc').exec((err, results) => {
+});
+
+// `exec` also returns a Promise:
+const promise = redis.pipeline().set('foo', 'bar').get('foo').exec();
+promise.then((result) => {
+    // result === [[null, 'OK'], [null, 'bar']]
+});
+
+redis.pipeline().set('foo', 'bar').get('foo', (err, result) => {
+    // result === 'bar'
+}).exec((err, result) => {
+    // result[1][1] === 'bar'
+});
+
+redis.pipeline([
+    ['set', 'foo', 'bar'],
+    ['get', 'foo']
+]).exec(() => { /* ... */ });
+
+Redis.Command.setArgumentTransformer('set', args => {
+    return args;
+});
+
+Redis.Command.setReplyTransformer('get', (result: any) => {
+    return result;
+});
+
+// multi
+redis.multi().set('foo', 'bar').set('foo', 'baz').get('foo', (err, result) => {
+    // result === 'QUEUED'
+}).exec((err, results) => {
+    // results = [[null, 'OK'], [null, 'OK'], [null, 'baz']]
+});
+
+redis.multi([
+    ['set', 'foo', 'bar'],
+    ['get', 'foo']
+]).exec((err, results) => {
+    // results = [[null, 'OK'], [null, 'bar']]
+});
+
+const keys = [ 'foo', 'bar' ];
+redis.mget(...keys);
+
+new Redis.Cluster([
+    'localhost'
+]);
+
+new Redis.Cluster([
+    6379
+]);
+
+new Redis.Cluster([{
+    host: 'localhost'
+}]);
+
+new Redis.Cluster([{
+    port: 6379
+}]);
+
+new Redis.Cluster([{
+    host: 'localhost',
+    port: 6379
+}]);
diff --git a/types/ioredis/tslint.json b/types/ioredis/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ioredis/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/iota.lib.js/index.d.ts b/types/iota.lib.js/index.d.ts
new file mode 100644
index 0000000000..758c6a0b3c
--- /dev/null
+++ b/types/iota.lib.js/index.d.ts
@@ -0,0 +1,486 @@
+// Type definitions for iota.lib.js 0.4
+// Project: https://github.com/iotaledger/iota.lib.js
+// Definitions by: Fogsh <https://github.com/fogsh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class IotaClass {
+   constructor(settings: {
+      provider: string;
+      sandbox?: boolean;
+      token?: boolean;
+   } | {
+      host: string;
+      port: number;
+      sandbox?: boolean;
+      token?: boolean;
+   });
+
+   api: IotaApi;
+   utils: IotaUtils;
+   multisig: IotaMultisig;
+   valid: IotaValid;
+
+   version: string;
+}
+
+export = IotaClass;
+
+//
+// Types
+//
+
+type Security = 1 | 2 | 3;
+type IOTAUnit = "i" | "Ki" | "Mi" | "Gi" | "Ti" | "Pi";
+
+//
+// Objects
+//
+
+interface TransactionObject {
+   hash: string;
+   signatureMessageFragment: string;
+   address: string;
+   value: number;
+   tag: string;
+   timestamp: number;
+   currentIndex: number;
+   lastIndex: number;
+   bundle: number;
+   trunkTransaction: string;
+   branchTransaction: string;
+   attachmentTimestamp: number;
+   attachmentTimestampLowerBound: number;
+   attachmentTimestampUpperBound: number;
+   nonce: string;
+}
+
+interface InputObject {
+   address: string;
+   balance: number;
+   keyIndex: number;
+   security: Security;
+}
+
+interface TransferObject {
+   address: string;
+   value: number;
+   message: string;
+   tag: string;
+}
+
+interface NodeInfo {
+   appName: string;
+   appVersion: string;
+   duration: number;
+   jreAvailableProcessors: number;
+   jreFreeMemory: number;
+   jreVersion: string;
+   jreMaxMemory: number;
+   jreTotalMemory: number;
+   latestMilestone: string;
+   latestMilestoneIndex: number;
+   latestSolidSubtangleMilestone: string;
+   latestSolidSubtangleMilestoneIndex: number;
+   neighbors: number;
+   packetsQueueSize: number;
+   time: number;
+   tips: number;
+   transactionsToRequest: number;
+}
+
+interface Neighbor {
+   address: string;
+   numberOfAllTransactions: number;
+   numberOfRandomTransactionRequests: number;
+   numberOfInvalidTransactions: number;
+   numberOfSentTransactions: number;
+   numberOfNewTransactions: number;
+   connectionType: "udp" | "tcp";
+}
+
+//
+// iota.api
+//
+
+interface IriApi {
+   getNodeInfo(
+      callback: (error: Error, info: NodeInfo) => void
+   ): void;
+
+   getNeighbors(
+      callback: (error: Error, neighbors: Neighbor[]) => void
+   ): void;
+
+   addNeighbors(
+      uris: string[],
+      callback: (error: Error, addedNeighbors: number) => void
+   ): void;
+
+   removeNeighbors(
+      uris: string[],
+      callback: (error: Error, removedNeighbors: number[]) => void
+   ): void;
+
+   getTips(
+      callback: (error: Error, hashes: string[]) => void
+   ): void;
+
+   findTransactions(
+      searchValues: {
+         addresses?: string[]
+         bundles?: string[]
+         tags?: string[]
+         approvees?: string[]
+      },
+      callback: (error: Error, hashes: string[]) => void
+   ): void;
+
+   getTrytes(
+      hashes: string[],
+      callback: (error: Error, trytes: string[]) => void
+   ): void;
+
+   getInclusionStates(
+      transactions: string[],
+      tips: string[],
+      callback: (error: Error, states: boolean[]) => void
+   ): void;
+
+   getBalances(
+      addresses: string[],
+      treshold: number,
+      callback: (error: Error, response: {
+         balances: number[]
+         milestone: string;
+         milestoneIndex: number;
+         duration: number;
+      }) => void
+   ): void;
+
+   getTransactionsToApprove(
+      depth: number,
+      callback: (error: Error, response: {
+         trunkTransaction: string;
+         branchTransaction: string;
+         duration: number;
+      }) => void
+   ): void;
+
+   attachToTangle(
+      trunkTransaction: string,
+      branchTransaction: string,
+      minWeightMagnitude: number,
+      trytes: string[],
+      callback: (error: Error, trytes: string[]) => void
+   ): void;
+
+   interruptAttachingToTangle(
+      callback: (error: Error, response: {}) => void
+   ): void;
+
+   broadcastTransactions(
+      trytes: string[],
+      callback: (error: Error, response: {}) => void
+   ): void;
+
+   storeTransactions(
+      trytes: string[],
+      callback: (error: Error, response: {}) => void
+   ): void;
+}
+
+//
+// iota.api
+//
+
+interface IotaApi extends IriApi {
+   getTransactionsObjects(
+      hashes: string[],
+      callback?: (error: Error, transactions: TransactionObject[]) => void
+   ): void;
+
+   findTransactionObjects(
+      searchValues: {
+         addresses?: string[]
+         bundles?: string[]
+         tags?: string[]
+         approvees?: string[]
+      },
+      callback?: (error: Error, transactions: TransactionObject[]) => void
+   ): void;
+
+   getLatestInclusion(
+      hashes: string[],
+      callback?: (error: Error, states: boolean[]) => void
+   ): void;
+
+   broadcastAndStore(
+      trytes: string[],
+      callback?: (error: Error, response: {}) => void
+   ): void;
+
+   getNewAddress(
+      seed: string,
+      options?: {
+         index?: number;
+         checksum?: boolean;
+         total?: number;
+         security?: Security
+         returnAll?: boolean;
+      },
+      callback?: (error: Error, response: string | string[]) => void
+   ): void;
+
+   getInputs(
+      seed: string,
+      options?: {
+         start?: number;
+         end?: number;
+         security?: Security
+         threshold?: boolean;
+      },
+      callback?: (error: Error, response: {
+         inputs: InputObject[]
+      }) => void
+   ): void;
+
+   prepareTransfers(
+      seed: string,
+      transfers: TransferObject[],
+      options?: {
+         inputs?: string[],
+         address?: string,
+         security?: Security
+      },
+      callback?: (error: Error, response: {
+         trytes: string[]
+      }) => void
+   ): void;
+
+   sendTrytes(
+      trytes: string[],
+      depth: number,
+      minWeightMagnitude: number,
+      callback?: (error: Error, response: {
+         inputs: TransactionObject[]
+      }) => void
+   ): void;
+
+   sendTransfer(
+      seed: string,
+      depth: number,
+      minWeightMagnitude: number,
+      transfers: TransferObject[],
+      options?: {
+         inputs: string[],
+         address: string;
+      },
+      callback?: (error: Error, response: {
+         inputs: TransactionObject[]
+      }) => void
+   ): void;
+
+   replayBundle(
+      transactionHash: string,
+      depth: number,
+      minWeightMagnitude: number,
+      callback?: (error: Error, response: {}) => void
+   ): void;
+
+   broadcastBundle(
+      transactionHash: string,
+      callback?: (error: Error, response: {}) => void
+   ): void;
+
+   getBundle(
+      transactionHash: string,
+      callback?: (error: Error, bundle: TransactionObject[]) => void
+   ): void;
+
+   getTransfers(
+      seed: string,
+      options?: {
+         start?: number;
+         end?: number;
+         security?: Security
+         inclusionStates?: boolean;
+      },
+      callback?: (error: Error, transfers: TransactionObject[][]) => void
+   ): void;
+
+   getAccountData(
+      seed: string,
+      options?: {
+         start: number;
+         end: number;
+         security?: Security
+      },
+      callback?: (error: Error, response: {
+         latestAddress: string;
+         addresses: string[]
+         transfers: string[]
+         inputs: InputObject[]
+         balance: number;
+      }) => void
+   ): void;
+
+   isReattachable(
+      address: string | string[],
+      callback?: (error: Error, response: boolean | boolean[]) => void
+   ): void;
+}
+
+//
+// iota.utils
+//
+
+interface IotaUtils {
+   convertUnits(
+      value: number,
+      fromUnit: IOTAUnit,
+      toUnit: IOTAUnit
+   ): number;
+
+   addChecksum(
+      inputValue: string,
+      checksumLength?: number,
+      isAddress?: boolean
+   ): string;
+
+   addChecksum(
+      inputValue: string[],
+      checksumLength?: number,
+      isAddress?: boolean
+   ): string[];
+
+   noChecksum(
+      address: string
+   ): string;
+
+   isValidChecksum(
+      addressWithChecksum: string
+   ): boolean;
+
+   transactionObject(
+      trytes: string
+   ): TransactionObject;
+
+   transactionTrytes(
+      transaction: TransactionObject
+   ): string;
+
+   categorizeTransfers(
+      transfers: TransactionObject[],
+      addresses: string[]
+   ): {
+         sent: TransactionObject[]
+         received: TransactionObject[]
+      };
+
+   toTrytes(
+      input: string
+   ): string;
+
+   fromTrytes(
+      trytes: string
+   ): string;
+
+   extractJson(
+      bundle: TransactionObject[]
+   ): string;
+
+   validateSignatures(
+      signedBundle: string[],
+      inputAddress: string
+   ): boolean;
+
+   isBundle(
+      bundle: TransactionObject[]
+   ): boolean;
+}
+
+//
+// iota.multisig
+//
+
+interface IotaMultisig {
+   getKey(
+      seed: string,
+      index: number,
+      security: Security
+   ): string;
+
+   getDigest(
+      seed: string,
+      index: number,
+      security: Security
+   ): string;
+
+   address(
+      digestTrytes: string | string[]
+   ): MultisigAddress;
+
+   validateAddress(
+      multisigAddress: string,
+      digests: string[]
+   ): boolean;
+
+   initiateTransfer(
+      securitySum: number,
+      inputAddress: string,
+      remainderAddress: string,
+      transfers: TransferObject[],
+      callback?: (error: Error, bundle: TransactionObject[]) => void
+   ): void;
+
+   addSignature(
+      bundleToSign: TransactionObject[],
+      inputAddress: string,
+      key: string,
+      callback?: (error: Error, bundle: TransactionObject[]) => void
+   ): void;
+}
+
+interface MultisigAddress {
+   absorb(
+      digest: string | string[]
+   ): MultisigAddress;
+
+   finalize(): string;
+}
+
+//
+// iota.valid
+//
+
+interface IotaValid {
+   isAddress(address: string): boolean;
+
+   isTrytes(trytes: string, length?: number): boolean;
+
+   isValue(value: any): boolean;
+
+   isNum(value: any): boolean;
+
+   isHash(hash: any): boolean;
+
+   isTransfersArray(transfers: any): boolean;
+
+   isArrayOfHashes(hashes: any): boolean;
+
+   isArrayOfTrytes(trytes: any): boolean;
+
+   isArrayOfAttachedTrytes(trytes: any): boolean;
+
+   isArrayOfTxObjects(transactions: any): boolean;
+
+   isInputs(inputs: any): boolean;
+
+   isString(string: any): boolean;
+
+   isArray(array: any): boolean;
+
+   isObject(object: any): boolean;
+
+   isUri(uri: any): boolean;
+}
diff --git a/types/iota.lib.js/iota.lib.js-tests.ts b/types/iota.lib.js/iota.lib.js-tests.ts
new file mode 100644
index 0000000000..6b3c3a9b85
--- /dev/null
+++ b/types/iota.lib.js/iota.lib.js-tests.ts
@@ -0,0 +1,94 @@
+import IOTA = require("iota.lib.js");
+
+const config = {
+   node: "https://localhost:14265",
+   address: "999999999999999999999999999999999999999999999999999999999999999999999999999999999",
+   transaction: "999999999999999999999999999999999999999999999999999999999999999999999999999999999"
+};
+
+const iota = new IOTA({
+   provider: config.node
+});
+
+//
+// iota.api
+//
+
+iota.api.getNodeInfo((error, info) => {
+});
+
+iota.api.getNeighbors((error, info) => {
+});
+
+iota.api.addNeighbors(["udp://127.0.0.2:14600"], (error, count) => {
+});
+
+iota.api.removeNeighbors(["udp://127.0.0.2:14600"], (error, count) => {
+});
+
+iota.api.findTransactions({
+   addresses: [config.address]
+}, (error, hashes) => {
+});
+
+iota.api.getTrytes([config.address], (error, trytes) => {
+});
+
+iota.api.getInclusionStates([config.address], [config.transaction], (error, states) => {
+});
+
+iota.api.getBalances([config.address], 1, (error, states) => {
+});
+
+iota.api.getTransactionsToApprove(1, (error, transactions) => {
+});
+
+iota.api.getTransactionsObjects([config.transaction], (err, response) => {
+});
+
+iota.api.findTransactionObjects({
+   addresses: [config.address]
+}, (err, response) => {
+});
+
+iota.api.getLatestInclusion([config.address], (err, response) => {
+});
+
+//
+// iota.utils
+//
+
+iota.utils.convertUnits(1000, "i", "Mi");
+
+const checksum = iota.utils.addChecksum(config.address);
+iota.utils.noChecksum(checksum);
+iota.utils.isValidChecksum(checksum);
+
+const transactionObj = iota.utils.transactionObject(new Array(2674).join("9"));
+iota.utils.transactionTrytes(transactionObj);
+
+const trytes = iota.utils.toTrytes("HELLO TANGLE");
+iota.utils.fromTrytes(trytes);
+
+//
+// iota.valid
+//
+
+iota.valid.isAddress(config.address);
+
+iota.valid.isTrytes(trytes);
+
+iota.valid.isValue(0);
+
+iota.valid.isNum(0);
+
+iota.valid.isHash(config.address);
+
+const transferObj = {
+   address: config.address,
+   message: "",
+   value: 0,
+   tag: ""
+};
+
+iota.valid.isTransfersArray([transferObj]);
diff --git a/types/iota.lib.js/tsconfig.json b/types/iota.lib.js/tsconfig.json
new file mode 100644
index 0000000000..b206b83455
--- /dev/null
+++ b/types/iota.lib.js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+   "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+         "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+         "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+   },
+   "files": [
+      "index.d.ts",
+      "iota.lib.js-tests.ts"
+   ]
+}
\ No newline at end of file
diff --git a/types/iota.lib.js/tslint.json b/types/iota.lib.js/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/iota.lib.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/ip/tslint.json b/types/ip/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ip/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/irc/tslint.json b/types/irc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/irc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/iron/index.d.ts b/types/iron/index.d.ts
new file mode 100644
index 0000000000..f4399434b5
--- /dev/null
+++ b/types/iron/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for iron 5.0
+// Project: https://github.com/hueniverse/iron
+// Definitions by: Simon Schick <https://github.com/simonschick>
+//                 Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+export interface SealOptionsSub {
+    /**
+     * the size of the salt (random buffer used to ensure that two identical objects will generate a different encrypted result.
+     */
+    saltBits: number;
+    /**
+     * the algorithm used ('aes-256-cbc' for encryption and 'sha256' for integrity are the only two supported at this time).
+     */
+    algorithm: keyof Algorithms;
+    /**
+     * the number of iterations used to derive a key from the password. Set to 1 by default. The number of ideal iterations
+     * to use is dependent on your application's performance requirements. More iterations means it takes longer to generate the key.
+     */
+    iterations: number;
+    /**
+     * minimum password size
+     */
+    minPasswordlength: number;
+}
+
+/**
+ * iron provides a few options for customizing the key derivation algorithm used to generate encryption and
+ * integrity verification keys as well as the algorithms and salt sizes used.
+ * For context [See docs](https://github.com/hueniverse/iron#options)
+ */
+export interface SealOptions {
+    /**
+     * defines the options used by the encryption process.
+     */
+    encryption: SealOptionsSub;
+    /**
+     * defines the options used by the HMAC integrity verification process.
+     */
+    integrity: SealOptionsSub;
+    /**
+     * sealed object lifetime in milliseconds where 0 means forever. Defaults to 0.
+     */
+    ttl: number;
+    /**
+     * number of seconds of permitted clock skew for incoming expirations. Defaults to 60 seconds.
+     */
+    timestampSkewSec: number;
+    /**
+     * local clock time offset, expressed in number of milliseconds (positive or negative). Defaults to 0.
+     */
+    localtimeOffsetMsec: number;
+}
+
+export interface Algorithms {
+    'aes-128-ctr': {
+        keyBits: number;
+        ivBits: number;
+    };
+    'aes-256-cbc': {
+        keyBits: number;
+        ivBits: number;
+    };
+    'sha256': {
+        keyBits: number;
+    };
+}
+
+export interface GenerateKeyOptions extends Pick<SealOptionsSub, 'algorithm' | 'iterations' | 'minPasswordlength'> {
+    saltBits?: number;
+    salt?: string;
+    iv?: string;
+}
+
+export interface Key {
+    key: Buffer;
+    salt: string;
+    iv: string;
+}
+
+export interface HMacResult {
+    digest: string;
+    salt: string;
+}
+
+export const defaults: SealOptions;
+export const algorithms: Algorithms;
+export const macFormatVersion: string;
+export const macPrefix: string;
+
+export function generateKey(password: string, options: GenerateKeyOptions): Promise<Key>;
+export function encrypt(password: string, options: GenerateKeyOptions, data: string): Promise<{ data: Buffer, key: Key }>;
+export function decrypt(password: string, options: GenerateKeyOptions, data: string): Promise<Buffer>;
+export function hmacWithPassword(password: string, options: GenerateKeyOptions, data: string): Promise<HMacResult>;
+export function seal(obj: object, password: string, options: SealOptions): Promise<string>;
+export function unseal(data: string, password: string, options: SealOptions): Promise<object>;
diff --git a/types/iron/iron-tests.ts b/types/iron/iron-tests.ts
new file mode 100644
index 0000000000..59c440801f
--- /dev/null
+++ b/types/iron/iron-tests.ts
@@ -0,0 +1,78 @@
+import * as Iron from "iron";
+
+const options: Iron.SealOptions = {
+    encryption: {
+        saltBits: 256,
+        algorithm: 'aes-256-cbc',
+        iterations: 1,
+        minPasswordlength: 32
+    },
+    integrity: {
+        saltBits: 256,
+        algorithm: 'sha256',
+        iterations: 1,
+        minPasswordlength: 32
+    },
+    ttl: 0,
+    timestampSkewSec: 60,
+    localtimeOffsetMsec: 0
+};
+
+const algorithms: Iron.Algorithms = {
+    'aes-128-ctr': { keyBits: 128, ivBits: 128 },
+    'aes-256-cbc': { keyBits: 256, ivBits: 128 },
+    sha256: { keyBits: 256 }
+};
+
+const optionsGenerateKey: Iron.GenerateKeyOptions = {
+    saltBits: 256,
+    salt: '4d8nr9q384nr9q384nr93q8nruq9348run',
+    algorithm: 'aes-128-ctr',
+    iterations: 10000,
+    iv: 'sdfsdfsdfsdfscdrgercgesrcgsercg',
+    minPasswordlength: 32
+};
+
+const obj: object = {
+    a: 1,
+    b: 2,
+    c: [3, 4, 5],
+    d: {
+        e: 'f'
+    }
+};
+
+Iron.seal(obj, 'password', options)
+    .then((sealed: string) => {
+        console.log(sealed);
+    });
+
+Iron.unseal('data', 'password', Iron.defaults)
+    .then((unsealed: object) => {
+        console.log(unsealed);
+    });
+
+Iron.generateKey('password', options.encryption)
+    .then((value: Iron.Key) => {
+        console.log(value);
+    });
+
+Iron.generateKey('password', optionsGenerateKey)
+    .then((value: Iron.Key) => {
+        console.log(value);
+    });
+
+Iron.encrypt('password', Iron.defaults.encryption, 'data')
+    .then((obj: { data: Buffer, key: Iron.Key }) => {
+        console.log(obj);
+    });
+
+Iron.decrypt('password', Iron.defaults.encryption, 'data')
+    .then((buffer: Buffer) => {
+        console.log(buffer);
+    });
+
+Iron.hmacWithPassword('password', Iron.defaults.integrity, 'data')
+    .then((value: Iron.HMacResult) => {
+        console.log(value);
+    });
diff --git a/types/iron/tsconfig.json b/types/iron/tsconfig.json
new file mode 100644
index 0000000000..bddeeac5c0
--- /dev/null
+++ b/types/iron/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "iron-tests.ts"
+    ]
+}
diff --git a/types/iron/tslint.json b/types/iron/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/iron/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/is-glob/index.d.ts b/types/is-glob/index.d.ts
new file mode 100644
index 0000000000..3c478c084b
--- /dev/null
+++ b/types/is-glob/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for is-glob 4.0
+// Project: https://github.com/jonschlinkert/is-glob
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isGlob(pattern?: string | string[] | null, options?: isGlob.Options): boolean;
+
+declare namespace isGlob {
+    interface Options {
+        /**
+         * When `false` the behavior is less strict in determining if a pattern is a glob. Meaning that some patterns
+         * that would return false may return true. This is done so that matching libraries like micromatch
+         * have a chance at determining if the pattern is a glob or not.
+         */
+        strict?: boolean;
+    }
+}
+
+export = isGlob;
diff --git a/types/is-glob/is-glob-tests.ts b/types/is-glob/is-glob-tests.ts
new file mode 100644
index 0000000000..7b9b442173
--- /dev/null
+++ b/types/is-glob/is-glob-tests.ts
@@ -0,0 +1,10 @@
+import * as isGlob from 'is-glob';
+
+// $ExpectType boolean
+isGlob();
+isGlob(null);
+isGlob('abc.js');
+isGlob(['abc.js']);
+
+isGlob('abc.js', {});
+isGlob('abc.js', { strict: false });
diff --git a/types/is-glob/tsconfig.json b/types/is-glob/tsconfig.json
new file mode 100644
index 0000000000..1a408fe456
--- /dev/null
+++ b/types/is-glob/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-glob-tests.ts"
+    ]
+}
diff --git a/types/is-glob/tslint.json b/types/is-glob/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-glob/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/is-ip/index.d.ts b/types/is-ip/index.d.ts
index c706d50397..70d8ebb88e 100644
--- a/types/is-ip/index.d.ts
+++ b/types/is-ip/index.d.ts
@@ -3,32 +3,14 @@
 // Definitions by: coderslagoon <https://github.com/coderslagoon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * Check if input is IPv4 or IPv6.
- *
- * @param {input} input
- *
- * @returns {boolean}
- */
+/** Check if input is IPv4 or IPv6. */
 declare function isIp(input: string): boolean;
 
 declare namespace isIp {
-    /**
-     * Check if input is IPv4.
-     *
-     * @param {input} input
-     *
-     * @returns {boolean}
-     */
+    /** Check if input is IPv4. */
     function v4(input: string): boolean;
 
-    /**
-     * Check if input is IPv6.
-     *
-     * @param {input} input
-     *
-     * @returns {boolean}
-     */
+    /** Check if input is IPv6. */
     function v6(input: string): boolean;
 }
 
diff --git a/types/is-my-json-valid/tslint.json b/types/is-my-json-valid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/is-my-json-valid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/is-negated-glob/index.d.ts b/types/is-negated-glob/index.d.ts
new file mode 100644
index 0000000000..a5a4d3ca53
--- /dev/null
+++ b/types/is-negated-glob/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for is-negated-glob 1.0
+// Project: https://github.com/jonschlinkert/is-negated-glob
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isNegatedGlob(pattern: string): isNegatedGlob.Result;
+declare namespace isNegatedGlob {
+    interface Result {
+        negated: boolean;
+        original: string;
+        pattern: string;
+    }
+}
+export = isNegatedGlob;
diff --git a/types/is-negated-glob/is-negated-glob-tests.ts b/types/is-negated-glob/is-negated-glob-tests.ts
new file mode 100644
index 0000000000..55b190bdd9
--- /dev/null
+++ b/types/is-negated-glob/is-negated-glob-tests.ts
@@ -0,0 +1,6 @@
+import isNegatedGlob = require('is-negated-glob');
+
+const result = isNegatedGlob('!foo.*');
+const negated: boolean = result.negated;
+const original: string = result.original;
+const pattern: string = result.pattern;
diff --git a/types/is-negated-glob/tsconfig.json b/types/is-negated-glob/tsconfig.json
new file mode 100644
index 0000000000..9f8db73020
--- /dev/null
+++ b/types/is-negated-glob/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-negated-glob-tests.ts"
+    ]
+}
diff --git a/types/is-negated-glob/tslint.json b/types/is-negated-glob/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-negated-glob/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/is-number/index.d.ts b/types/is-number/index.d.ts
index 27d7328456..fff535c46a 100644
--- a/types/is-number/index.d.ts
+++ b/types/is-number/index.d.ts
@@ -7,7 +7,7 @@ export = is_number;
 
 /**
  * Will test to see if the argument is a valid number, excluding Infinity and NaN.
- * @param {*} num - Any value that should be tested for being a number
- * @returns {boolean} - true if the parameter is a valid number, otherwise false
+ * @param num Any value that should be tested for being a number
+ * @returns true if the parameter is a valid number, otherwise false
  */
 declare function is_number(num: any): boolean;
diff --git a/types/is-object/index.d.ts b/types/is-object/index.d.ts
new file mode 100644
index 0000000000..1aefc63184
--- /dev/null
+++ b/types/is-object/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for is-object 1.0
+// Project: https://github.com/ljharb/is-object
+// Definitions by: Wilson Hobbs <https://github.com/wbhob>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = isObject;
+
+declare function isObject(a: any): boolean;
+
+declare namespace isObject { }
diff --git a/types/is-object/is-object-tests.ts b/types/is-object/is-object-tests.ts
new file mode 100644
index 0000000000..f04367af63
--- /dev/null
+++ b/types/is-object/is-object-tests.ts
@@ -0,0 +1,8 @@
+import isObject = require('is-object');
+
+isObject({});
+isObject(null);
+isObject(undefined);
+isObject(9);
+isObject(new Object());
+isObject(Array);
diff --git a/types/is-object/tsconfig.json b/types/is-object/tsconfig.json
new file mode 100644
index 0000000000..b3aae5340b
--- /dev/null
+++ b/types/is-object/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-object-tests.ts"
+    ]
+}
diff --git a/types/is-object/tslint.json b/types/is-object/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-object/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/is-plain-object/index.d.ts b/types/is-plain-object/index.d.ts
deleted file mode 100644
index 79ad3cf63a..0000000000
--- a/types/is-plain-object/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for is-plain-object
-// Project: https://github.com/jonschlinkert/is-plain-object
-// Definitions by: Kevin Zeng <https://github.com/zengfenfei>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "is-plain-object" {
-    namespace isPlainObject {}
-    function isPlainObject(obj: any): boolean;
-    export = isPlainObject;
-}
\ No newline at end of file
diff --git a/types/is-plain-object/is-plain-object-tests.ts b/types/is-plain-object/is-plain-object-tests.ts
deleted file mode 100644
index be9470939d..0000000000
--- a/types/is-plain-object/is-plain-object-tests.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as isPlainObject from 'is-plain-object';
-
-isPlainObject(Object.create({}));
-//=> true
-isPlainObject(Object.create(Object.prototype));
-//=> true
-isPlainObject({foo: 'bar'});
-//=> true
-isPlainObject({});
-
-isPlainObject(1);
-//=> false
-isPlainObject(['foo', 'bar']);
-//=> false
-isPlainObject([]);
-//=> false
-class Foo {}
-isPlainObject(new Foo);
-//=> false
-isPlainObject(null);
-//=> false
-isPlainObject(Object.create(null));
-//=> false
\ No newline at end of file
diff --git a/types/is-plain-object/tsconfig.json b/types/is-plain-object/tsconfig.json
deleted file mode 100644
index 1522dc4f0e..0000000000
--- a/types/is-plain-object/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "is-plain-object-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/is-scoped/index.d.ts b/types/is-scoped/index.d.ts
new file mode 100644
index 0000000000..8c35dcdf9c
--- /dev/null
+++ b/types/is-scoped/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-scoped 1.0
+// Project: https://github.com/sindresorhus/is-scoped#readme
+// Definitions by: Leo Friedrichs <https://github.com/postcrafter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = isScoped;
+
+declare function isScoped(input: string): boolean;
diff --git a/types/is-scoped/is-scoped-tests.ts b/types/is-scoped/is-scoped-tests.ts
new file mode 100644
index 0000000000..9fb34bc3d2
--- /dev/null
+++ b/types/is-scoped/is-scoped-tests.ts
@@ -0,0 +1,6 @@
+import isScoped = require('is-scoped');
+
+const tests: boolean[] = [
+	isScoped('is-scoped'),
+	isScoped('@types/is-scoped'),
+];
diff --git a/types/is-scoped/tsconfig.json b/types/is-scoped/tsconfig.json
new file mode 100644
index 0000000000..e6ffa2ab86
--- /dev/null
+++ b/types/is-scoped/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-scoped-tests.ts"
+    ]
+}
diff --git a/types/is-scoped/tslint.json b/types/is-scoped/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-scoped/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/is-url/tslint.json b/types/is-url/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/is-url/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/is/index.d.ts b/types/is/index.d.ts
index 3c0e279eea..b61bd6deee 100644
--- a/types/is/index.d.ts
+++ b/types/is/index.d.ts
@@ -1320,4 +1320,8 @@ declare var is: Is;
 
 declare module 'is' {
     export = is;
-}
\ No newline at end of file
+}
+
+declare module 'is_js' {
+    export = is;
+}
diff --git a/types/is/tslint.json b/types/is/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/is/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/iscroll/tslint.json b/types/iscroll/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/iscroll/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/iscroll/v4/tslint.json b/types/iscroll/v4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/iscroll/v4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ismobilejs/index.d.ts b/types/ismobilejs/index.d.ts
new file mode 100644
index 0000000000..c0f7c4ec8b
--- /dev/null
+++ b/types/ismobilejs/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for ismobilejs 0.4
+// Project: https://github.com/kaimallea/isMobile
+// Definitions by: Maksim Karelov <https://github.com/Ty3uK>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const any: boolean;
+export const phone: boolean;
+export const tablet: boolean;
+export const seven_inch: boolean;
+
+export const apple: {
+    phone: boolean;
+    ipod: boolean;
+    tablet: boolean;
+    device: boolean;
+};
+
+export const android: {
+    phone: boolean;
+    tablet: boolean;
+    device: boolean;
+};
+
+export const amazon: {
+    phone: boolean;
+    tablet: boolean;
+    device: boolean;
+};
+
+export const windows: {
+    phone: boolean;
+    tablet: boolean;
+    device: boolean;
+};
+
+export const other: {
+    blackberry_10: boolean;
+    blackberry: boolean;
+    opera: boolean;
+    firefox: boolean;
+    chrome: boolean;
+    device: boolean;
+};
diff --git a/types/geolib/geolib-tests.ts b/types/ismobilejs/ismobilejs-tests.ts
similarity index 100%
rename from types/geolib/geolib-tests.ts
rename to types/ismobilejs/ismobilejs-tests.ts
diff --git a/types/ismobilejs/tsconfig.json b/types/ismobilejs/tsconfig.json
new file mode 100644
index 0000000000..3e3a1071d3
--- /dev/null
+++ b/types/ismobilejs/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ismobilejs-tests.ts"
+    ]
+}
diff --git a/types/ismobilejs/tslint.json b/types/ismobilejs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ismobilejs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/iso8601-localizer/tslint.json b/types/iso8601-localizer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/iso8601-localizer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/isotope-layout/index.d.ts b/types/isotope-layout/index.d.ts
index 84f14bed06..019aa9ec37 100644
--- a/types/isotope-layout/index.d.ts
+++ b/types/isotope-layout/index.d.ts
@@ -278,7 +278,6 @@ declare var Isotope: {
 };
 
 interface JQuery {
-    // tslint:disable:unified-signatures
     /**
      * Get the Isotope instance from a jQuery object. Isotope instances are useful to access Isotope properties.
      */
@@ -370,5 +369,4 @@ interface JQuery {
      * @param options All options are optional, but itemSelector is recommended. Layout modes have their own separate options.
      */
     isotope(options: IsotopeLibrary.IsotopeOptions): JQuery;
-    // tslint:enable
 }
diff --git a/types/isotope-layout/tslint.json b/types/isotope-layout/tslint.json
index 4f44991c3c..758e484744 100644
--- a/types/isotope-layout/tslint.json
+++ b/types/isotope-layout/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-empty-interface": false
+        "no-empty-interface": false,
+        "unified-signatures": false
     }
 }
diff --git a/types/istanbul-lib-instrument/istanbul-lib-instrument-tests.ts b/types/istanbul-lib-instrument/istanbul-lib-instrument-tests.ts
index 54d66314d4..2a4ac328c2 100644
--- a/types/istanbul-lib-instrument/istanbul-lib-instrument-tests.ts
+++ b/types/istanbul-lib-instrument/istanbul-lib-instrument-tests.ts
@@ -5,6 +5,7 @@ import {
 } from 'istanbul-lib-instrument';
 
 import * as babelTypes from 'babel-types';
+import { RawSourceMap } from 'source-map';
 
 const code = 'foo';
 const filename = 'bar.txt';
@@ -24,8 +25,8 @@ const instrumenter = createInstrumenter({
 	debug: false
 });
 
-const sourceMap = {
-	version: 1,
+const sourceMap: RawSourceMap = {
+	version: 1 as any as string, // Fixed by https://github.com/mozilla/source-map/pull/293 but the fix is not yet published
 	sources: ['foo', 'bar'],
 	names: ['foo', 'bar'],
 	mappings: 'foo',
diff --git a/types/istanbul-lib-instrument/package.json b/types/istanbul-lib-instrument/package.json
new file mode 100644
index 0000000000..100334a89f
--- /dev/null
+++ b/types/istanbul-lib-instrument/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.1"
+    }
+}
diff --git a/types/istanbul-lib-source-maps/istanbul-lib-source-maps-tests.ts b/types/istanbul-lib-source-maps/istanbul-lib-source-maps-tests.ts
index be03e785fc..844205df8d 100644
--- a/types/istanbul-lib-source-maps/istanbul-lib-source-maps-tests.ts
+++ b/types/istanbul-lib-source-maps/istanbul-lib-source-maps-tests.ts
@@ -1,5 +1,6 @@
 import { createSourceMapStore } from 'istanbul-lib-source-maps';
 import { CoverageMap } from 'istanbul-lib-coverage';
+import { RawSourceMap } from 'source-map';
 
 createSourceMapStore();
 createSourceMapStore({});
@@ -12,8 +13,8 @@ const store = createSourceMapStore({
 
 store.data['foo'].type.trim();
 
-const sourceMap = {
-	version: 1,
+const sourceMap: RawSourceMap = {
+	version: 1 as any as string, // Fixed by https://github.com/mozilla/source-map/pull/293 but the fix is not yet published
 	sources: ['foo', 'bar'],
 	names: ['foo', 'bar'],
 	mappings: 'foo',
diff --git a/types/istanbul-lib-source-maps/package.json b/types/istanbul-lib-source-maps/package.json
new file mode 100644
index 0000000000..100334a89f
--- /dev/null
+++ b/types/istanbul-lib-source-maps/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.1"
+    }
+}
diff --git a/types/istanbul-middleware/index.d.ts b/types/istanbul-middleware/index.d.ts
index d9c020d5f8..46a139bdc0 100644
--- a/types/istanbul-middleware/index.d.ts
+++ b/types/istanbul-middleware/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.npmjs.com/package/istanbul-middleware
 // Definitions by: Hookclaw <https://github.com/hookclaw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 
diff --git a/types/istanbul-middleware/tslint.json b/types/istanbul-middleware/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/istanbul-middleware/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/istanbul/tslint.json b/types/istanbul/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/istanbul/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ix.js/tslint.json b/types/ix.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ix.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jade/tslint.json b/types/jade/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jade/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jake/tslint.json b/types/jake/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jake/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine-ajax/jasmine-ajax-tests.ts b/types/jasmine-ajax/jasmine-ajax-tests.ts
index fabd525012..6e783f3eda 100644
--- a/types/jasmine-ajax/jasmine-ajax-tests.ts
+++ b/types/jasmine-ajax/jasmine-ajax-tests.ts
@@ -751,13 +751,12 @@ describe('FakeRequest', () => {
 });
 
 describe("Jasmine Mock Ajax (for toplevel)", () => {
-	// tslint:disable one-variable-per-declaration
-	let request, anotherRequest, response;
-	let success, error, complete;
-	let client, onreadystatechange;
+	// TODO: these are all `any`!
+	let request, anotherRequest, response; // tslint:disable-line one-variable-per-declaration
+	let success, error, complete; // tslint:disable-line one-variable-per-declaration
+	let client, onreadystatechange; // tslint:disable-line one-variable-per-declaration
 	const sharedContext: any = {};
-	let fakeGlobal, mockAjax;
-	// tslint:enable
+	let fakeGlobal, mockAjax; // tslint:disable-line one-variable-per-declaration
 
 	beforeEach(() => {
 		const fakeXMLHttpRequest = jasmine.createSpy('realFakeXMLHttpRequest');
diff --git a/types/jasmine-enzyme/jasmine-enzyme-tests.tsx b/types/jasmine-enzyme/jasmine-enzyme-tests.tsx
index 53ee972ed3..6246618d86 100644
--- a/types/jasmine-enzyme/jasmine-enzyme-tests.tsx
+++ b/types/jasmine-enzyme/jasmine-enzyme-tests.tsx
@@ -254,7 +254,7 @@ describe('toHaveRef', () => {
 describe('toHaveState', () => {
 	class Fixture extends React.Component {
 		constructor() {
-			super();
+			super({});
 			this.state = {
 				foo: false,
 			};
diff --git a/types/jasmine-es6-promise-matchers/tslint.json b/types/jasmine-es6-promise-matchers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jasmine-es6-promise-matchers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine-expect/index.d.ts b/types/jasmine-expect/index.d.ts
deleted file mode 100644
index ca5c2dbfc3..0000000000
--- a/types/jasmine-expect/index.d.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-// Type definitions for jasmine-expect 3.6.0
-// Project: https://github.com/JamieMason/Jasmine-Matchers
-// Definitions by: GeneralCss <https://github.com/GeneralCss>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-/// <reference types="jasmine" />
-
-declare namespace jasmine {
-    interface Matchers<T> {
-        // toBe
-        toBeArray(): boolean;
-        toBeArrayOfBooleans(): boolean;
-        toBeArrayOfNumbers(): boolean;
-        toBeArrayOfObjects(): boolean;
-        toBeArrayOfSize(size: number): boolean;
-        toBeArrayOfStrings(): boolean;
-        toBeEmptyArray(): boolean;
-        toBeNonEmptyArray(): boolean;
-
-        // Booleans
-        toBeBoolean(): boolean;
-        toBeFalse(): boolean;
-        toBeTrue(): boolean;
-
-        // Dates
-        toBeAfter(date: Date): boolean
-        toBeBefore(date: Date): boolean
-        toBeDate(): boolean;
-        toBeValidDate(): boolean;
-
-        // Functions
-        toBeFunction(): boolean;
-        toThrowAnyError(): boolean;
-        toThrowErrorOfType(constructorName: string): boolean
-
-        // Numbers
-        toBeCalculable(): boolean;
-        toBeEvenNumber(): boolean;
-        toBeGreaterThanOrEqualTo(number: number): boolean;
-        toBeLessThanOrEqualTo(number: number): boolean;
-        toBeNear(number: number, epsilon: number): boolean;
-        toBeNumber(): boolean;
-        toBeOddNumber(): boolean
-        toBeWholeNumber(): boolean;
-        toBeWithinRange(floor: number, ceiling: number): boolean;
-
-        // Strings
-        toBeEmptyString(): boolean;
-        toBeHtmlString(): boolean;
-        toBeIso8601(): boolean;
-        toBeJsonString(): boolean;
-        toBeLongerThan(string: string): boolean;
-        toBeNonEmptyString(): boolean;
-        toBeSameLengthAs(string: string): boolean;
-        toBeShorterThan(string: string): boolean;
-        toBeString(): boolean;
-        toBeWhitespace(): boolean;
-        toEndWith(string: string): boolean;
-        toStartWith(string: string): boolean;
-
-        // Objects
-        toBeEmptyObject(): boolean;
-        toBeNonEmptyObject(): boolean;
-        toBeObject(): boolean;
-
-        // Regular Expression
-        toBeRegExp(): boolean;
-
-        // Members, Properties, Methods
-        toHaveArray(memberName: string): boolean;
-        toHaveArrayOfBooleans(memberName: string): boolean;
-        toHaveArrayOfNumbers(memberName: string): boolean;
-        toHaveArrayOfObjects(memberName: string): boolean;
-        toHaveArrayOfSize(memberName: string, size: number): boolean;
-        toHaveArrayOfStrings(memberName: string): boolean;
-        toHaveBoolean(memberName: string): boolean;
-        toHaveCalculable(memberName: string): boolean;
-        toHaveDate(memberName: string): boolean;
-        toHaveDateAfter(memberName: string, date: Date): boolean;
-        toHaveDateBefore(memberName: string, date: Date): boolean;
-        toHaveEmptyArray(memberName: string): boolean;
-        toHaveEmptyObject(memberName: string): boolean;
-        toHaveEmptyString(memberName: string): boolean;
-        toHaveEvenNumber(memberName: string): boolean;
-        toHaveFalse(memberName: string): boolean;
-        toHaveHtmlString(memberName: string): boolean;
-        toHaveIso8601(memberName: string): boolean;
-        toHaveJsonString(memberName: string): boolean;
-        toHaveMember(memberName: string): boolean;
-        toHaveMethod(memberName: string): boolean;
-        toHaveNonEmptyArray(memberName: string): boolean;
-        toHaveNonEmptyObject(memberName: string): boolean;
-        toHaveNonEmptyString(memberName: string): boolean;
-        toHaveNumber(memberName: string): boolean;
-        toHaveNumberWithinRange(memberName: string, floor: number, ceiling: number): boolean;
-        toHaveObject(memberName: string): boolean;
-        toHaveOddNumber(memberName: string): boolean;
-        toHaveString(memberName: string): boolean;
-        toHaveStringLongerThan(memberName: string, string: string): boolean;
-        toHaveStringSameLengthAs(memberName: string, string: string): boolean;
-        toHaveStringShorterThan(memberName: string, string: string): boolean;
-        toHaveTrue(memberName: string): boolean;
-        toHaveUndefined(memberName: string): boolean;
-        toHaveWhitespaceString(memberName: string): boolean;
-        toHaveWholeNumber(memberName: string): boolean;
-    }
-
-    interface AssymetricMatchers {
-
-      // Arrays
-      arrayOfBooleans(): boolean;
-      arrayOfNumbers(): boolean;
-      arrayOfObjects(): boolean;
-      arrayOfSize(number: number): boolean;
-      arrayOfStrings(): boolean;
-      emptyArray(): boolean;
-      nonEmptyArray(): boolean;
-
-      // Dates
-      after(date: Date): boolean;
-      before(date: Date): boolean;
-
-      // Numbers
-      calculable(): boolean;
-      evenNumber(): boolean;
-      greaterThanOrEqualTo(number: number): boolean;
-      lessThanOrEqualTo(number: number): boolean;
-      oddNumber(): boolean;
-      wholeNumber(): boolean;
-      withinRange(floor: number, ceiling: number): boolean;
-
-      // Strings
-      endingWith(string: string): boolean;
-      iso8601(): boolean;
-      jsonString(): boolean;
-      longerThan(string: string): boolean;
-      nonEmptyString(string: string): boolean;
-      sameLengthAs(string: string): boolean;
-      shorterThan(string: string): boolean;
-      startingWith(string: string): boolean;
-      whitespace(): boolean;
-
-      //Objects
-      emptyObject(): boolean;
-      nonEmptyObject(): boolean;
-
-      // Regular expressions
-      regExp(): boolean;
-    }
-}
-
-declare var any: jasmine.AssymetricMatchers;
-
diff --git a/types/jasmine-expect/jasmine-expect-tests.ts b/types/jasmine-expect/jasmine-expect-tests.ts
deleted file mode 100644
index 4a8cbb3855..0000000000
--- a/types/jasmine-expect/jasmine-expect-tests.ts
+++ /dev/null
@@ -1,1959 +0,0 @@
-// 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() {
-        var xpToFail = <any>expect;
-        xpToFail({
-          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('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/types/jasmine-expect/tsconfig.json b/types/jasmine-expect/tsconfig.json
deleted file mode 100644
index 62a373d410..0000000000
--- a/types/jasmine-expect/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "jasmine-expect-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/jasmine-fixture/index.d.ts b/types/jasmine-fixture/index.d.ts
index a49aeca029..82449ffc01 100644
--- a/types/jasmine-fixture/index.d.ts
+++ b/types/jasmine-fixture/index.d.ts
@@ -8,13 +8,14 @@
 
 /**
  * Affixes the given jquery selectors into the body and will be removed after each spec
- * @param {string} selector The JQuery selector to be added to the dom
+ * @param selector The JQuery selector to be added to the dom
  */
 declare function affix(selector: string): JQuery;
 
 interface JQuery {
-    /** Affixes the given jquery selectors into the element and will be removed after each spec
-     * @param {string} selector The JQuery selector to be added to the dom
+    /**
+     * Affixes the given jquery selectors into the element and will be removed after each spec
+     * @param selector The JQuery selector to be added to the dom
      */
     affix(selector: string): JQuery;
 }
diff --git a/types/jasmine-given/index.d.ts b/types/jasmine-given/index.d.ts
index 28338d7664..e2b630eccd 100644
--- a/types/jasmine-given/index.d.ts
+++ b/types/jasmine-given/index.d.ts
@@ -6,5 +6,6 @@
 declare function Given(func: (done?: () => void) => void): void;
 declare function When(func: (done?: () => void) => void): void;
 declare function Then(func: (done?: () => void) => void): void;
+declare function Then(label: string, func: (done?: () => void) => void): void;
 declare function And(func: (done?: () => void) => void): void;
 declare function Invariant(func: (done?: () => void) => void): void;
diff --git a/types/jasmine-given/jasmine-given-tests.ts b/types/jasmine-given/jasmine-given-tests.ts
index e9603e3aaf..7658502b68 100644
--- a/types/jasmine-given/jasmine-given-tests.ts
+++ b/types/jasmine-given/jasmine-given-tests.ts
@@ -4,6 +4,8 @@ When(() => { });
 
 Then(() => { });
 
+Then('expected condition 1', () => { });
+
 And(() => { });
 
 Invariant(() => { });
@@ -20,7 +22,7 @@ When((done) => {
   }
 });
 
-Then((done) => {
+Then('expected condition 2', (done) => {
   if (done) {
     done();
   }
diff --git a/types/jasmine-jquery/tslint.json b/types/jasmine-jquery/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jasmine-jquery/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine-matchers/tslint.json b/types/jasmine-matchers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jasmine-matchers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine-node/tslint.json b/types/jasmine-node/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jasmine-node/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine-promise-matchers/tslint.json b/types/jasmine-promise-matchers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jasmine-promise-matchers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine/index.d.ts b/types/jasmine/index.d.ts
index e5a7cd3ba3..ed068f4775 100644
--- a/types/jasmine/index.d.ts
+++ b/types/jasmine/index.d.ts
@@ -1,10 +1,9 @@
-// Type definitions for Jasmine 2.6.0
+// Type definitions for Jasmine 2.8.0
 // Project: http://jasmine.github.io/
 // Definitions by: Boris Yankov <https://github.com/borisyankov>, Theodore Brown <https://github.com/theodorejb>, David Pärsson <https://github.com/davidparsson>, Gabe Moothart <https://github.com/gmoothart>, Lukas Zech <https://github.com/lukas-zech-software>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-
 // For ddescribe / iit use : https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
 
 /**
@@ -28,7 +27,7 @@ declare function it(expectation: string, assertion?: (done: DoneFn) => void, tim
 /**
  * A focused it
  * If suites or specs are focused, only those that are focused will be executed.
- * @param expectation 
+ * @param expectation
  * @param assertion
  * @param timeout
  */
@@ -39,7 +38,7 @@ declare function xit(expectation: string, assertion?: (done: DoneFn) => void, ti
  * Mark a spec as pending, expectation results will be ignored.
  * If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending.
  * @param reason
- * @returns {} 
+ * @returns {}
  */
 declare function pending(reason?: string): void;
 
@@ -91,6 +90,11 @@ declare function expect<T>(actual: ArrayLike<T>): jasmine.ArrayLikeMatchers<T>;
  */
 declare function expect<T>(actual: T): jasmine.Matchers<T>;
 
+/**
+ * Create an expectation for a spec.
+ */
+declare function expect(): jasmine.NothingMatcher;
+
 /**
  * Explicitly mark a spec as failed.
  * @param e
@@ -118,7 +122,7 @@ declare function spyOn<T>(object: T, method: keyof T): jasmine.Spy;
  * @param property The name of the property to replace with a Spy
  * @param accessType The access type (get|set) of the property to Spy on.
  */
-declare function spyOnProperty<T>(object: T, property: keyof T, accessType: string): jasmine.Spy;
+declare function spyOnProperty<T>(object: T, property: keyof T, accessType?: 'get' | 'set'): jasmine.Spy;
 
 declare function runs(asyncMethod: Function): void;
 declare function waitsFor(latchMethod: () => boolean, failureMessage?: string, timeout?: number): void;
@@ -129,13 +133,16 @@ declare namespace jasmine {
 
     var clock: () => Clock;
 
+    var matchersUtil: MatchersUtil;
+
     function any(aclass: any): Any;
 
     function anything(): Any;
 
-    function arrayContaining(sample: any[]): ArrayContaining;
+    function arrayContaining<T>(sample: ArrayLike<T>): ArrayContaining<T>;
+    function arrayWithExactContents<T>(sample: ArrayLike<T>): ArrayContaining<T>;
     function objectContaining<T>(sample: Partial<T>): ObjectContaining<T>;
-    function createSpy(name: string, originalFn?: Function): Spy;
+    function createSpy(name?: string, originalFn?: Function): Spy;
 
     function createSpyObj(baseName: string, methodNames: any[] | {[methodName: string]: any}): any;
     function createSpyObj<T>(baseName: string, methodNames: any[] | {[methodName: string]: any}): SpyObj<T>;
@@ -171,8 +178,8 @@ declare namespace jasmine {
         [n: number]: T;
     }
 
-    interface ArrayContaining {
-        new (sample: any[]): any;
+    interface ArrayContaining<T> {
+        new (sample: ArrayLike<T>): ArrayLike<T>;
 
         asymmetricMatch(other: any): boolean;
         jasmineToString(): string;
@@ -212,8 +219,8 @@ declare namespace jasmine {
     type CustomEqualityTester = (first: any, second: any) => boolean | void;
 
     interface CustomMatcher {
-        compare<T>(actual: T, expected: T): CustomMatcherResult;
-        compare(actual: any, expected: any): CustomMatcherResult;
+        compare<T>(actual: T, expected: T, ...args: any[]): CustomMatcherResult;
+        compare(actual: any, ...expected: any[]): CustomMatcherResult;
     }
 
     type CustomMatcherFactory = (util: MatchersUtil, customEqualityTesters: CustomEqualityTester[]) => CustomMatcher;
@@ -405,18 +412,18 @@ declare namespace jasmine {
         message(): any;
 
         /**
-         * 
+         *
          * @param expected the actual value to be === to the expected value.
-         * @param expectationFailOutput 
-         * @returns {} 
+         * @param expectationFailOutput
+         * @returns {}
          */
         toBe(expected: Expected<T>, expectationFailOutput?: any): boolean;
 
         /**
-         *  
+         *
          * @param expected the actual value to be equal to the expected, using deep equality comparison.
-         * @param expectationFailOutput 
-         * @returns {} 
+         * @param expectationFailOutput
+         * @returns {}
          */
         toEqual(expected: Expected<T>, expectationFailOutput?: any): boolean;
         toMatch(expected: string | RegExp, expectationFailOutput?: any): boolean;
@@ -439,18 +446,23 @@ declare namespace jasmine {
         toThrow(expected?: any): boolean;
         toThrowError(message?: string | RegExp): boolean;
         toThrowError(expected?: new (...args: any[]) => Error, message?: string | RegExp): boolean;
+
         not: Matchers<T>;
 
         Any: Any;
     }
 
     interface ArrayLikeMatchers<T> extends Matchers<ArrayLike<T>> {
-        toBe(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): boolean;
-        toEqual(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): boolean;
+        toBe(expected: Expected<ArrayLike<T>> | ArrayContaining<T>, expectationFailOutput?: any): boolean;
+        toEqual(expected: Expected<ArrayLike<T>> | ArrayContaining<T>, expectationFailOutput?: any): boolean;
         toContain(expected: Expected<T>, expectationFailOutput?: any): boolean;
         not: ArrayLikeMatchers<T>;
     }
 
+    interface NothingMatcher {
+        nothing(): void;
+    }
+
     interface Reporter {
         reportRunnerStarting(runner: Runner): void;
         reportRunnerResults(runner: Runner): void;
@@ -567,7 +579,7 @@ declare namespace jasmine {
         addBeforesAndAftersToQueue(): void;
         explodes(): void;
         spyOn(obj: any, methodName: string, ignoreMethodDoesntExist: boolean): Spy;
-        spyOnProperty(object: any, property: string, accessType: string): Spy;
+        spyOnProperty(object: any, property: string, accessType?: 'get' | 'set'): Spy;
         removeAllSpies(): void;
         throwOnExpectationFailure: boolean;
     }
diff --git a/types/jasmine/jasmine-tests.ts b/types/jasmine/jasmine-tests.ts
index 8c4fff54f7..b54269aa61 100644
--- a/types/jasmine/jasmine-tests.ts
+++ b/types/jasmine/jasmine-tests.ts
@@ -33,7 +33,7 @@ describe("Included matchers:", () => {
         var b = a;
 
         expect(a).toBe(b);
-        expect(a).not.toBe(null);
+        expect(a).not.toBe(24);
     });
 
     describe("The 'toEqual' matcher", () => {
@@ -54,6 +54,11 @@ describe("Included matchers:", () => {
             };
             expect(foo).toEqual(bar);
         });
+
+        it("should work for optional values", () => {
+            var opt: string | undefined = "s";
+            expect(opt as (string | undefined)).toEqual(undefined);
+        });
     });
 
     it("The 'toMatch' matcher is for regular expressions", () => {
@@ -83,7 +88,7 @@ describe("Included matchers:", () => {
     });
 
     it("The 'toBeNull' matcher compares against null", () => {
-        var a: string = null;
+        var a: string | null = null;
         var foo = "foo";
 
         expect(null).toBeNull();
@@ -92,14 +97,14 @@ describe("Included matchers:", () => {
     });
 
     it("The 'toBeTruthy' matcher is for boolean casting testing", () => {
-        var a: string, foo = "foo";
+        var a: string | undefined, foo = "foo";
 
         expect(foo).toBeTruthy();
         expect(a).not.toBeTruthy();
     });
 
     it("The 'toBeFalsy' matcher is for boolean casting testing", () => {
-        var a: string, foo = "foo";
+        var a: string | undefined, foo = "foo";
 
         expect(a).toBeFalsy();
         expect(foo).not.toBeFalsy();
@@ -665,6 +670,12 @@ describe("Multiple spies, when created manually", () => {
     });
 });
 
+describe("jasmine.nothing", () => {
+    it("matches any value", () => {
+        expect().nothing();
+    });
+});
+
 describe("jasmine.any", () => {
     it("matches any value", () => {
         expect({}).toEqual(jasmine.any(Object));
@@ -754,7 +765,7 @@ describe("jasmine.objectContaining", () => {
 });
 
 describe("jasmine.arrayContaining", () => {
-    var foo: any;
+    var foo: Array<number>;
 
     beforeEach(() => {
         foo = [1, 2, 3, 4];
@@ -763,6 +774,9 @@ describe("jasmine.arrayContaining", () => {
     it("matches arrays with some of the values", () => {
         expect(foo).toEqual(jasmine.arrayContaining([3, 1]));
         expect(foo).not.toEqual(jasmine.arrayContaining([6]));
+
+        expect(foo).toBe(jasmine.arrayContaining([3, 1]));
+        expect(foo).not.toBe(jasmine.arrayContaining([6]));
     });
 
     describe("when used with a spy", () => {
@@ -777,6 +791,33 @@ describe("jasmine.arrayContaining", () => {
     });
 });
 
+describe("jasmine.arrayWithExactContents", () => {
+    var foo: Array<number>;
+
+    beforeEach(() => {
+        foo = [1, 2, 3, 4];
+    });
+
+    it("matches arrays with exactly the same values", () => {
+        expect(foo).toEqual(jasmine.arrayWithExactContents([1, 2, 3, 4]));
+        expect(foo).not.toEqual(jasmine.arrayWithExactContents([6]));
+
+        expect(foo).toBe(jasmine.arrayWithExactContents([1, 2, 3, 4]));
+        expect(foo).not.toBe(jasmine.arrayWithExactContents([6]));
+    });
+
+    describe("when used with a spy", () => {
+        it("is useful when comparing arguments", () => {
+            var callback = jasmine.createSpy('callback');
+
+            callback([1, 2, 3, 4]);
+
+            expect(callback).toHaveBeenCalledWith(jasmine.arrayWithExactContents([1, 2, 3, 4]));
+            expect(callback).not.toHaveBeenCalledWith(jasmine.arrayWithExactContents([5, 2]));
+        });
+    });
+});
+
 describe("Manually ticking the Jasmine Clock", () => {
     var timerCallback: any;
 
@@ -922,6 +963,15 @@ var customMatchers: jasmine.CustomMatcherFactories = {
                 return result;
             }
         };
+    },
+    toBeWithinRange: (util: jasmine.MatchersUtil, customEqualityTesters: jasmine.CustomEqualityTester[]) => {
+        return {
+            compare: (actual: any, floor: number, ceiling: number): jasmine.CustomMatcherResult => {
+                const pass = actual >= floor && actual <= ceiling;
+                const message = `expected ${actual} ${pass ? 'not ' : ''} to be within range ${floor}-${ceiling}`;
+                return { message, pass };
+            }
+        };
     }
 };
 // add the custom matchers to interface jasmine.Matchers via TypeScript declaration merging
@@ -936,6 +986,7 @@ var customMatchers: jasmine.CustomMatcherFactories = {
 declare namespace jasmine {
     interface Matchers<T> {
         toBeGoofy(expected?: jasmine.Expected<T>): boolean;
+        toBeWithinRange(expected?: jasmine.Expected<T>, floor?: number, ceiling?: number): boolean;
     }
 }
 
@@ -956,11 +1007,25 @@ describe("Custom matcher: 'toBeGoofy'", () => {
         }).toBeGoofy({ hyuk: ' is fun' });
     });
 
+    it("can take many 'expected' parameters", () => {
+        expect(2).toBeWithinRange(1, 3);
+    });
+
     it("can be negated", () => {
         expect({
             hyuk: 'this is fun'
         }).not.toBeGoofy();
     });
+
+    it("has a proper message on failure", () => {
+        const actual = { hyuk: 'this is fun' };
+
+        const matcher = customMatchers["toBeGoofy"](jasmine.matchersUtil, []);
+        const result = matcher.compare(actual, null);
+
+        expect(result.pass).toBe(false);
+        expect(result.message).toBe("Expected " + actual + " to be goofy, but it was not very goofy");
+    });
 });
 
 // test based on http://jasmine.github.io/2.5/custom_reporter.html
@@ -980,19 +1045,19 @@ var myReporter: jasmine.CustomReporter = {
     specDone: (result: jasmine.CustomReporterResult) => {
         console.log("Spec: " + result.description + " was " + result.status);
         //tslint:disable-next-line:prefer-for-of
-        for (var i = 0; i < result.failedExpectations.length; i++) {
+        for (var i = 0; result.failedExpectations && i < result.failedExpectations.length; i++) {
             console.log("Failure: " + result.failedExpectations[i].message);
             console.log("Actual: " + result.failedExpectations[i].actual);
             console.log("Expected: " + result.failedExpectations[i].expected);
             console.log(result.failedExpectations[i].stack);
         }
-        console.log(result.passedExpectations.length);
+        console.log(result.passedExpectations && result.passedExpectations.length);
     },
 
     suiteDone: (result: jasmine.CustomReporterResult) => {
         console.log('Suite: ' + result.description + ' was ' + result.status);
         //tslint:disable-next-line:prefer-for-of
-        for (var i = 0; i < result.failedExpectations.length; i++) {
+        for (var i = 0; result.failedExpectations && i < result.failedExpectations.length; i++) {
             console.log('AfterAll ' + result.failedExpectations[i].message);
             console.log(result.failedExpectations[i].stack);
         }
diff --git a/types/jasmine/tsconfig.json b/types/jasmine/tsconfig.json
index 3af72e4d8b..55b83c6d3a 100644
--- a/types/jasmine/tsconfig.json
+++ b/types/jasmine/tsconfig.json
@@ -11,7 +11,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": false,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
\ No newline at end of file
+}
diff --git a/types/jasmine/tslint.json b/types/jasmine/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jasmine/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine/v1/tslint.json b/types/jasmine/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jasmine/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jasmine_dom_matchers/index.d.ts b/types/jasmine_dom_matchers/index.d.ts
index 51f2fa035e..5ab86cc799 100644
--- a/types/jasmine_dom_matchers/index.d.ts
+++ b/types/jasmine_dom_matchers/index.d.ts
@@ -12,8 +12,6 @@ declare namespace jasmine {
      * Checks if element has visibility `hidden` or `height` or `width = 0`.
      *
      * The reverse of {@link toBeVisible}.
-     *
-     * @return {boolean}
      */
     toBeHidden(): boolean;
 
@@ -21,114 +19,76 @@ declare namespace jasmine {
      * Checks if element has visibility style not `hidden` and both `height` and `width > 0`.
      *
      * The reverse of {@link toBeHidden}.
-     *
-     * @return {boolean}
      */
     toBeVisible(): boolean;
 
     /**
      * Checks element attributes.
      * `attributeValue` is optional, if omitted, will check that the attribute exists.
-     *
-     * @param {string} attributeName
-     * @param {string | number | RegExp} attributeValue
-     * @return {boolean}
      */
     toHaveAttr(attributeName: string, attributeValue?: string | number | RegExp): boolean;
 
     /**
      * Checks element properties.
      * `propertyValue` is optional, if omitted, will check that the property exists.
-     *
-     * @param {string} propertyName
-     * @param {string | number | RegExp} propertyValue
-     * @return {boolean}
      */
     toHaveProp(propertyName: string, propertyValue?: string | number | RegExp): boolean;
 
     /**
      * Checks if all styles are present.
      * `styles` is an object, all styles given in that object will be checked.
-     *
-     * @param {{[p: string]: string | number | RegExp}} styles
-     * @return {boolean}
      */
     toHaveCss(styles: { [ cssProperty: string]: string | number | RegExp }): boolean;
 
     /**
      * Checks the `value` of eligible elements (like inputs).
-     *
-     * @param {string | number | RegExp} value
-     * @return {boolean}
      */
     toHaveValue(value: string | number | RegExp): boolean;
 
     /**
      * Checks if element has a `checked` property, only useful for checkbox inputs.
-     *
-     * @return {boolean}
      */
     toBeChecked(): boolean;
 
     /**
      * Checks if element is focused.
-     *
-     * @return {boolean}
      */
     toBeFocused(): boolean;
 
     /**
      * Checks if element has a `selected` property, only useful for options.
-     *
-     * @return {boolean}
      */
     toBeSelected(): boolean;
 
     /**
      * Checks if element has a disabled property.
-     *
-     * @return {boolean}
      */
     toBeDisabled(): boolean;
 
     /**
      * Checks for presence of classes on the element.
      * If `className` is an Array, checks for all classes in the array.
-     *
-     * @param {string | string[]} className
-     * @return {boolean}
      */
     toHaveClass(className: string | string[]): boolean;
 
     /**
      * Checks for exact match with text, after trimming whitespace.
-     *
-     * @param {string | number | RegExp} text
-     * @return {boolean}
      */
     toHaveText(text: string | number | RegExp): boolean;
 
     /**
      * Checks if text substring is contained within element.
-     *
-     * @param {string | number | RegExp} text
-     * @return {boolean}
      */
     toContainText(text: string | number | RegExp): boolean;
 
     /**
      * Checks for length number of html elements.
      * Also works for plain Arrays.
-     *
-     * @param {number} length
-     * @return {boolean}
      */
     toHaveLength(length: number): boolean;
 
     /**
      * True if the element exists, does not have to be in the DOM.
-     *
-     * @return {boolean}
      */
     toExist(): boolean;
   }
diff --git a/types/java-applet/tslint.json b/types/java-applet/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/java-applet/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/java/tslint.json b/types/java/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/java/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/javascript-astar/tslint.json b/types/javascript-astar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/javascript-astar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/javascript-bignum/tslint.json b/types/javascript-bignum/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/javascript-bignum/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/javascript-obfuscator/tslint.json b/types/javascript-obfuscator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/javascript-obfuscator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jbinary/index.d.ts b/types/jbinary/index.d.ts
index 1e9c9c6f03..5b19d0f19f 100644
--- a/types/jbinary/index.d.ts
+++ b/types/jbinary/index.d.ts
@@ -2,13 +2,14 @@
 // Project: https://github.com/jDataView/jBinary
 // Definitions by: Tim Bureck <https://github.com/tbureck>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Additional notes:
 // Method stubs and types are taken from the official jBinary documentation, which can be found here:
 // https://github.com/jDataView/jBinary/wiki/jBinary-Constructor
 // https://github.com/jDataView/jBinary/wiki/jBinary-Methods
 
-/// <reference types="jdataview" />
+import jDataView = require('jdataview');
 
 declare class jBinary
 {
@@ -35,4 +36,6 @@ declare class jBinary
 
     slice(start:number, end:number, forceCopy?:boolean):jBinary;
     as(typeSet:Object, modifyOriginal?:boolean):jBinary;
-}
\ No newline at end of file
+}
+
+export = jBinary;
diff --git a/types/jbinary/jbinary-tests.ts b/types/jbinary/jbinary-tests.ts
index a519fa5819..b833f3ba05 100644
--- a/types/jbinary/jbinary-tests.ts
+++ b/types/jbinary/jbinary-tests.ts
@@ -1,4 +1,4 @@
-
+import jBinary = require('jbinary');
 
 jBinary.loadData([0x05, 0x03, 0x7F, 0x1E]);
 jBinary.load([0x05, 0x03, 0x7F, 0x1E]);
diff --git a/types/jbinary/tslint.json b/types/jbinary/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jbinary/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jcanvas/tslint.json b/types/jcanvas/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jcanvas/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jdataview/index.d.ts b/types/jdataview/index.d.ts
index f80784eb60..9aa1d59dbe 100644
--- a/types/jdataview/index.d.ts
+++ b/types/jdataview/index.d.ts
@@ -105,3 +105,5 @@ declare namespace jDataView {
 		static fromNumber(number: number): Int64
 	}
 }
+
+export = jDataView
diff --git a/types/jdataview/jdataview-tests.ts b/types/jdataview/jdataview-tests.ts
index 1125054ab8..a587b6e2d8 100644
--- a/types/jdataview/jdataview-tests.ts
+++ b/types/jdataview/jdataview-tests.ts
@@ -1,6 +1,7 @@
-
 /// <reference types="jquery" />
 
+import jDataView = require('.');
+
 interface TARMetaData {
 	name: string;
 	mode: number;
@@ -71,4 +72,4 @@ $.get('jquery.tar', function (data) {
 			$('body').append($('<textarea></textarea>').val(content));
 		}
 	}
-});
\ No newline at end of file
+});
diff --git a/types/jdataview/tslint.json b/types/jdataview/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jdataview/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jdenticon/tslint.json b/types/jdenticon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jdenticon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jee-jsf/tslint.json b/types/jee-jsf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jee-jsf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jest-in-case/index.d.ts b/types/jest-in-case/index.d.ts
new file mode 100644
index 0000000000..02d7d08af9
--- /dev/null
+++ b/types/jest-in-case/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for jest-in-case 1.0
+// Project: https://github.com/thinkmill/jest-in-case#readme
+// Definitions by: Geovani de Souza <https://github.com/geovanisouza92>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jest" />
+/// <reference types="node" />
+
+declare const global: NodeJS.Global;
+
+interface Config {
+    name?: string;
+    only?: boolean;
+    skip?: boolean;
+    [key: string]: any;
+}
+
+type Tester<Opts> = (opts: Opts, done: jest.DoneCallback) => any;
+
+type TestCases<Opts> = ReadonlyArray<Opts> | { [name: string]: Opts };
+
+declare function cases<Opts extends Config>(title: string, tester: Tester<Opts>, testCases: TestCases<Opts>): void;
+
+export = cases;
diff --git a/types/jest-in-case/jest-in-case-tests.ts b/types/jest-in-case/jest-in-case-tests.ts
new file mode 100644
index 0000000000..283ade76c1
--- /dev/null
+++ b/types/jest-in-case/jest-in-case-tests.ts
@@ -0,0 +1,118 @@
+declare const global: any;
+
+import cases = require("jest-in-case");
+
+function add(augend: number, addend: number) {
+    return augend + addend;
+}
+
+function subtract(minuend: number, subtrahend: number) {
+    return minuend - subtrahend;
+}
+
+beforeEach(() => {
+    jest.spyOn(global, 'describe').mockImplementation((title, fn) => fn());
+    jest.spyOn(global, 'test').mockImplementation((name, fn) => fn());
+    global.test.skip = jest.fn((name, fn) => fn());
+    global.test.only = jest.fn((name, fn) => fn());
+});
+
+afterEach(() => {
+    global.describe.mockRestore();
+    global.test.mockRestore();
+});
+
+test('array', () => {
+    const title = 'add(augend, addend)';
+
+    const tester = jest.fn(opts => {
+        expect(add(opts.augend, opts.addend)).toBe(opts.total);
+    });
+
+    const testCases = [
+        { name: '1 + 1 = 2', augend: 1, addend: 1, total: 2 },
+        { name: '2 + 1 = 3', augend: 2, addend: 1, total: 3 },
+        { name: '3 + 1 = 4', augend: 3, addend: 1, total: 4 },
+    ];
+
+    cases(title, tester, testCases);
+
+    expect(global.describe).toHaveBeenCalledTimes(1);
+    expect(global.test).toHaveBeenCalledTimes(3);
+    expect(tester).toHaveBeenCalledTimes(3);
+
+    expect(global.describe.mock.calls[0][0]).toBe(title);
+    expect(global.test.mock.calls[0][0]).toBe(testCases[0].name);
+    expect(global.test.mock.calls[1][0]).toBe(testCases[1].name);
+    expect(global.test.mock.calls[2][0]).toBe(testCases[2].name);
+    expect(global.test.mock.calls[0][1]).toHaveLength(0);
+    expect(global.test.mock.calls[1][1]).toHaveLength(0);
+    expect(global.test.mock.calls[2][1]).toHaveLength(0);
+    expect(tester).toHaveBeenCalledWith(testCases[0]);
+    expect(tester).toHaveBeenCalledWith(testCases[1]);
+    expect(tester).toHaveBeenCalledWith(testCases[2]);
+});
+
+test('object', () => {
+    jest.spyOn(global, 'describe').mockImplementation((title, fn) => fn());
+    jest.spyOn(global, 'test').mockImplementation((name, fn) => fn());
+
+    const title = 'add(augend, addend)';
+
+    const tester = jest.fn(opts => {
+        expect(subtract(opts.minuend, opts.subtrahend)).toBe(opts.difference);
+    });
+
+    const testCases = {
+        '1 - 1 = 0': { minuend: 1, subtrahend: 1, difference: 0 },
+        '2 - 1 = 1': { minuend: 2, subtrahend: 1, difference: 1 },
+        '3 - 1 = 2': { minuend: 3, subtrahend: 1, difference: 2 },
+    };
+
+    cases(title, tester, testCases);
+
+    expect(global.describe).toHaveBeenCalledTimes(1);
+    expect(global.test).toHaveBeenCalledTimes(3);
+    expect(tester).toHaveBeenCalledTimes(3);
+
+    expect(global.describe.mock.calls[0][0]).toBe(title);
+    expect(global.test.mock.calls[0][0]).toBe('1 - 1 = 0');
+    expect(global.test.mock.calls[1][0]).toBe('2 - 1 = 1');
+    expect(global.test.mock.calls[2][0]).toBe('3 - 1 = 2');
+    expect(global.test.mock.calls[0][1]).toHaveLength(0);
+    expect(global.test.mock.calls[1][1]).toHaveLength(0);
+    expect(global.test.mock.calls[2][1]).toHaveLength(0);
+    expect(tester.mock.calls[0][0]).toMatchObject(testCases['1 - 1 = 0']);
+    expect(tester.mock.calls[1][0]).toMatchObject(testCases['2 - 1 = 1']);
+    expect(tester.mock.calls[2][0]).toMatchObject(testCases['3 - 1 = 2']);
+});
+
+test('no names', () => {
+    cases('foo', () => { }, [
+        {},
+        {},
+    ]);
+
+    expect(global.test.mock.calls[0][0]).toBe('case: 1');
+    expect(global.test.mock.calls[1][0]).toBe('case: 2');
+});
+
+test('only', () => {
+    cases('foo', () => { }, [
+        {},
+        { only: true },
+    ]);
+
+    expect(global.test.mock.calls[0][0]).toBe('case: 1');
+    expect(global.test.only.mock.calls[0][0]).toBe('case: 2');
+});
+
+test('skip', () => {
+    cases('foo', () => { }, [
+        {},
+        { skip: true },
+    ]);
+
+    expect(global.test.mock.calls[0][0]).toBe('case: 1');
+    expect(global.test.skip.mock.calls[0][0]).toBe('case: 2');
+});
diff --git a/types/jest-in-case/tsconfig.json b/types/jest-in-case/tsconfig.json
new file mode 100644
index 0000000000..a561ae813a
--- /dev/null
+++ b/types/jest-in-case/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-in-case-tests.ts"
+    ]
+}
diff --git a/types/jest-in-case/tslint.json b/types/jest-in-case/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jest-in-case/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jest-json-schema/index.d.ts b/types/jest-json-schema/index.d.ts
new file mode 100644
index 0000000000..67f1c51f7e
--- /dev/null
+++ b/types/jest-json-schema/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for jest-json-schema 1.2
+// Project: https://github.com/americanexpress/jest-json-schema#readme
+// Definitions by: Igor Korolev <https://github.com/deadNightTiger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jest" />
+import * as ajv from "ajv";
+
+declare global {
+    namespace jest {
+        interface Matchers<R> {
+            toMatchSchema(schema: object): R;
+        }
+    }
+}
+
+export const matchers: jest.ExpectExtendMap;
+export function matchersWithOptions(options: ajv.Options): jest.ExpectExtendMap;
diff --git a/types/jest-json-schema/jest-json-schema-tests.ts b/types/jest-json-schema/jest-json-schema-tests.ts
new file mode 100644
index 0000000000..a66c54a7e9
--- /dev/null
+++ b/types/jest-json-schema/jest-json-schema-tests.ts
@@ -0,0 +1,13 @@
+import { matchers } from 'jest-json-schema';
+
+expect.extend(matchers);
+
+it('validates my json', () => {
+    const schema = {
+        properties: {
+            hello: { type: 'string' },
+        },
+        required: ['hello'],
+    };
+    expect({ hello: 'world' }).toMatchSchema(schema);
+});
diff --git a/types/jest-json-schema/package.json b/types/jest-json-schema/package.json
new file mode 100644
index 0000000000..ee16c03768
--- /dev/null
+++ b/types/jest-json-schema/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "ajv": "^4.11.5"
+    }
+}
diff --git a/types/jest-json-schema/tsconfig.json b/types/jest-json-schema/tsconfig.json
new file mode 100644
index 0000000000..e8d55cbd89
--- /dev/null
+++ b/types/jest-json-schema/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-json-schema-tests.ts"
+    ]
+}
diff --git a/types/jest-json-schema/tslint.json b/types/jest-json-schema/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jest-json-schema/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jest-matcher-utils/index.d.ts b/types/jest-matcher-utils/index.d.ts
index 92bc13070b..54e6db67b3 100644
--- a/types/jest-matcher-utils/index.d.ts
+++ b/types/jest-matcher-utils/index.d.ts
@@ -4,19 +4,19 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import * as chalk from 'chalk';
+import { Chalk } from 'chalk';
 
-export const EXPECTED_COLOR: chalk.ChalkChain;
-export const RECEIVED_COLOR: chalk.ChalkChain;
-export const EXPECTED_BG: chalk.ChalkChain; // TODO: removed in b430e51a
-export const RECEIVED_BG: chalk.ChalkChain; // TODO: removed in b430e51a
+export const EXPECTED_COLOR: Chalk;
+export const RECEIVED_COLOR: Chalk;
+export const EXPECTED_BG: Chalk; // TODO: removed in b430e51a
+export const RECEIVED_BG: Chalk; // TODO: removed in b430e51a
 export const SUGGEST_TO_EQUAL: string;
 
 export function stringify(object: any, maxDepth?: number): string;
 
 export function highlightTrailingWhitespace(
     text: string,
-    bgColor: chalk.ChalkChain // removed in b430e51a
+    bgColor: Chalk // removed in b430e51a
 ): string;
 
 export function printReceived(object: any): string;
diff --git a/types/jest-matcher-utils/jest-matcher-utils-tests.ts b/types/jest-matcher-utils/jest-matcher-utils-tests.ts
index 6f9a4ddeab..6c59a7c274 100644
--- a/types/jest-matcher-utils/jest-matcher-utils-tests.ts
+++ b/types/jest-matcher-utils/jest-matcher-utils-tests.ts
@@ -1,8 +1,8 @@
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import * as utils from 'jest-matcher-utils';
 
-utils.EXPECTED_COLOR; // $ExpectType ChalkChain
-utils.RECEIVED_COLOR; // $ExpectType ChalkChain
+utils.EXPECTED_COLOR; // $ExpectType Chalk
+utils.RECEIVED_COLOR; // $ExpectType Chalk
 utils.SUGGEST_TO_EQUAL; // $ExpectType string
 
 utils.stringify({}); // $ExpectType string
diff --git a/types/jest-matcher-utils/package.json b/types/jest-matcher-utils/package.json
new file mode 100644
index 0000000000..2cc9b48ed6
--- /dev/null
+++ b/types/jest-matcher-utils/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "chalk": "^2.2.0"
+    }
+}
diff --git a/types/jest-matchers/index.d.ts b/types/jest-matchers/index.d.ts
index 27e6a5b9f0..3b028f8929 100644
--- a/types/jest-matchers/index.d.ts
+++ b/types/jest-matchers/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/facebook/jest#readme
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jest" />
 export = expect;
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index cf6f2eeb0b..0ba1762485 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 21.1
+// Type definitions for Jest 22.0
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>
@@ -8,8 +8,10 @@
 //                 Allan Lukwago <https://github.com/epicallan>
 //                 Ika <https://github.com/ikatyang>
 //                 Waseem Dahman <https://github.com/wsmd>
+//                 Jamie Mason <https://github.com/JamieMason>
+//                 Douglas Duteil <https://github.com/douglasduteil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 declare var beforeAll: jest.Lifecycle;
 declare var beforeEach: jest.Lifecycle;
@@ -144,15 +146,26 @@ declare namespace jest {
      */
     function runOnlyPendingTimers(): typeof jest;
     /**
-     * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-     * or setInterval() and setImmediate()).
+     * (renamed to `advanceTimersByTime` in Jest 21.3.0+) Executes only the macro
+     * task queue (i.e. all tasks queued by setTimeout() or setInterval() and setImmediate()).
      */
     function runTimersToTime(msToRun: number): typeof jest;
+    /**
+     * Advances all timers by msToRun milliseconds. All pending "macro-tasks" that have been
+     * queued via setTimeout() or setInterval(), and would be executed within this timeframe
+     * will be executed.
+     */
+    function advanceTimersByTime(msToRun: number): typeof jest;
     /**
      * Explicitly supplies the mock object that the module system should return
      * for the specified module.
      */
     function setMock<T>(moduleName: string, moduleExports: T): typeof jest;
+    /**
+     * Set the default timeout interval for tests and before/after hooks in milliseconds.
+     * Note: The default timeout interval is 5 seconds if this method is not called.
+     */
+    function setTimeout(timeout: number): typeof jest;
     /**
      * Creates a mock function similar to jest.fn but also tracks calls to object[methodName]
      */
@@ -193,9 +206,9 @@ declare namespace jest {
         /**
          * Creates a test closure.
          *
-         * @param {string} name The name of your test
-         * @param {fn?} ProvidesCallback The function for your test
-         * @param {timeout?} timeout The timeout for an async function test
+         * @param name The name of your test
+         * @param fn The function for your test
+         * @param timeout The timeout for an async function test
          */
         (name: string, fn?: ProvidesCallback, timeout?: number): void;
         /**
@@ -235,7 +248,7 @@ declare namespace jest {
     }
 
     interface ExpectExtendMap {
-        [key: string]: (this: MatcherUtils, received: any, actual: any) => { message(): string, pass: boolean };
+        [key: string]: (this: MatcherUtils, received: any, ...actual: any[]) => { message(): string, pass: boolean };
     }
 
     interface SnapshotSerializerOptions {
@@ -285,7 +298,7 @@ declare namespace jest {
          * The `expect` function is used every time you want to test a value.
          * You will rarely call `expect` by itself.
          *
-         * @param {any} actual The value to apply matchers against.
+         * @param actual The value to apply matchers against.
          */
         (actual: any): Matchers<void>;
         anything(): any;
@@ -488,12 +501,12 @@ declare namespace jest {
         new (...args: any[]): any;
     }
 
-    interface Mock<T> extends Function, MockInstance<T> {
+    interface Mock<T = {}> extends Function, MockInstance<T> {
         new (...args: any[]): T;
         (...args: any[]): any;
     }
 
-    interface SpyInstance<T> extends MockInstance<T> {
+    interface SpyInstance<T = {}> extends MockInstance<T> {
         mockRestore(): void;
     }
 
@@ -520,6 +533,8 @@ declare namespace jest {
         mockReturnThis(): Mock<T>;
         mockReturnValue(value: any): Mock<T>;
         mockReturnValueOnce(value: any): Mock<T>;
+        mockName(name: string): Mock<T>;
+        getMockName(): string;
     }
 
     interface MockContext<T> {
@@ -549,7 +564,7 @@ declare namespace jasmine {
     function anything(): Any;
     function arrayContaining(sample: any[]): ArrayContaining;
     function objectContaining(sample: any): ObjectContaining;
-    function createSpy(name: string, originalFn?: (...args: any[]) => any): Spy;
+    function createSpy(name?: string, originalFn?: (...args: any[]) => any): Spy;
     function createSpyObj(baseName: string, methodNames: any[]): any;
     function createSpyObj<T>(baseName: string, methodNames: any[]): T;
     function pp(value: any): string;
@@ -702,8 +717,8 @@ declare namespace jasmine {
     type CustomEqualityTester = (first: any, second: any) => boolean;
 
     interface CustomMatcher {
-        compare<T>(actual: T, expected: T): CustomMatcherResult;
-        compare(actual: any, expected: any): CustomMatcherResult;
+        compare<T>(actual: T, expected: T, ...args: any[]): CustomMatcherResult;
+        compare(actual: any, ...expected: any[]): CustomMatcherResult;
     }
 
     interface CustomMatcherResult {
@@ -803,6 +818,10 @@ declare namespace jest {
         cacheDirectory: Path;
         clearMocks: boolean;
         coveragePathIgnorePatterns: string[];
+        cwd: Path;
+        detectLeaks: boolean;
+        displayName: Maybe<string>;
+        forceCoverageMatch: Glob[];
         globals: ConfigGlobals;
         haste: HasteConfig;
         moduleDirectories: string[];
@@ -817,11 +836,14 @@ declare namespace jest {
         resolver: Maybe<Path>;
         rootDir: Path;
         roots: Path[];
+        runner: string;
         setupFiles: Path[];
         setupTestFrameworkScriptFile: Path;
         skipNodeResolution: boolean;
         snapshotSerializers: Path[];
         testEnvironment: string;
+        testEnvironmentOptions: object;
+        testLocationInResults: boolean;
         testMatch: Glob[];
         testPathIgnorePatterns: string[];
         testRegex: string;
@@ -831,6 +853,7 @@ declare namespace jest {
         transform: Array<[string, Path]>;
         transformIgnorePatterns: Glob[];
         unmockedModulePathPatterns: Maybe<string[]>;
+        watchPathIgnorePatterns: string[];
     }
 
     // Console
@@ -861,6 +884,7 @@ declare namespace jest {
         runAllTicks(): void;
         runAllTimers(): void;
         runTimersToTime(msToRun: number): void;
+        advanceTimersByTime(msToRun: number): void;
         runOnlyPendingTimers(): void;
         runWithRealTimers(callback: any): void;
         useFakeTimers(): void;
@@ -1033,6 +1057,8 @@ declare namespace jest {
         path: Path;
     }
 
+    // tslint:disable-next-line:no-empty-interface
+    interface Set<T> {} // To allow non-ES6 users the Set below
     interface Reporter {
         onTestResult?(test: Test, testResult: TestResult, aggregatedResult: AggregatedResult): void;
         onRunStart?(results: AggregatedResult, options: ReporterOnStartOptions): void;
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index a6d062a148..4d8ae05e1c 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -239,6 +239,17 @@ describe('Assymetric matchers', () => {
     });
 });
 
+describe('setTimeout', () => {
+    it('works as expected', done => {
+        jest.setTimeout(1000);
+
+        setTimeout(() => {
+            expect(true).toBeTruthy();
+            done();
+        }, 900);
+    });
+});
+
 describe('Extending extend', () => {
     it('works', () => {
         expect.extend({
@@ -248,6 +259,12 @@ describe('Extending extend', () => {
                     () => `expected ${received} ${pass ? 'not ' : ''} to be ${actual}`;
                 return { message, pass };
             },
+            toBeVariadicMatcher(received: any, floor: number, ceiling: number) {
+                const pass = received >= floor && received <= ceiling;
+                const message =
+                    () => `expected ${received} ${pass ? 'not ' : ''} to be within range ${floor}-${ceiling}`;
+                return { message, pass };
+            },
             toBeTest(received: any, actual: any) {
                 this.utils.ensureNoExpected(received);
                 this.utils.ensureActualIsNumber(received);
@@ -271,7 +288,7 @@ describe('missing tests', () => {
        class Closure<T> {
            private arg: T;
 
-           constructor(private fn: (arg: T) => void) {
+           constructor(private readonly fn: (arg: T) => void) {
                this.fn = fn;
            }
 
@@ -294,7 +311,7 @@ describe('missing tests', () => {
        expect(jest.isMockFunction(spy)).toBeTruthy();
    });
 
-    it('tests all mising Mocks functionality', () => {
+    it('tests all missing Mocks functionality', () => {
        type FruitsGetter = () => string[];
        const mock: jest.Mock<FruitsGetter> = jest.fn<FruitsGetter>();
        mock.mockImplementationOnce(() => ['Orange', 'Apple', 'Plum']);
@@ -311,6 +328,12 @@ describe('missing tests', () => {
        expect(thisMock()).toBe(this);
    });
 
+    it('tests mock name functionality', () => {
+        const mock: jest.Mock = jest.fn();
+        mock.mockName('Carrot');
+        expect(mock.getMockName()).toBe('Carrot');
+    });
+
     it('creates snapshoter', () => {
        jest.disableAutomock().mock('./render', () => jest.fn((): string => "{Link to: \"facebook\"}"), { virtual: true });
        const render: () => string = require('./render');
@@ -499,7 +522,7 @@ describe('beforeEach with timeout', () => {
 class TestApi {
     constructor() { }
     testProp: boolean;
-    private anotherProp: string;
+    private readonly anotherProp: string;
     testMethod(a: number): string { return ""; }
 }
 
diff --git a/types/jest/v16/index.d.ts b/types/jest/v16/index.d.ts
index f376ea5bcc..c1282c2c74 100644
--- a/types/jest/v16/index.d.ts
+++ b/types/jest/v16/index.d.ts
@@ -287,8 +287,8 @@ declare namespace jasmine {
     }
 
     interface CustomMatcher {
-        compare<T>(actual: T, expected: T): CustomMatcherResult;
-        compare(actual: any, expected: any): CustomMatcherResult;
+        compare<T>(actual: T, expected: T, ...args: any[]): CustomMatcherResult;
+        compare(actual: any, ...expected: any[]): CustomMatcherResult;
     }
 
     interface CustomMatcherResult {
diff --git a/types/jest/v16/jest-tests.ts b/types/jest/v16/jest-tests.ts
index 7a58d6e9b1..6acfa77fa8 100644
--- a/types/jest/v16/jest-tests.ts
+++ b/types/jest/v16/jest-tests.ts
@@ -183,7 +183,7 @@ describe('missing tests', function () {
        class Closure<T> {
            private arg: T;
 
-           public constructor(private fn: (arg: T) => void) {
+           public constructor(private readonly fn: (arg: T) => void) {
                this.fn = fn;
            }
 
diff --git a/types/jest/v16/tslint.json b/types/jest/v16/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jest/v16/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jfp/tslint.json b/types/jfp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jfp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jimp/index.d.ts b/types/jimp/index.d.ts
deleted file mode 100644
index 4c39f58796..0000000000
--- a/types/jimp/index.d.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-// Type definitions for jimp 0.2
-// Project: https://github.com/oliver-moran/jimp#readme
-// Definitions by: Jack Works <https://github.com/Jack-Works>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-declare namespace jimp {
-	type Callback<T> = (this: JimpImage, err: Error, data: T) => void;
-	type ResizeMode = string;
-	type PresetFont = string;
-	type FileMINE = string;
-	type AlignMode = number;
-	type FilterType = number;
-
-	// Used in font info provided by parse-bmfont-ascii
-	type FontBoolean = 0 | 1;
-	interface FontChar {
-		id: number;
-		x: number;
-		y: number;
-		weight: number;
-		height: number;
-		xoffset: number;
-		yoffset: number;
-		xadvance: number;
-		page: number;
-		chnl: number;
-	}
-	type Font = {
-		common: {lineHeight: number, base: number, scaleW: number, scaleH: number, pages: number, packed: number},
-		info: {
-			face: string,
-			size: number,
-			bold: FontBoolean,
-			italic: FontBoolean,
-			charset: string,
-			unicode: FontBoolean,
-			stretchH: number,
-			smooth: FontBoolean,
-			aa: number,
-			padding: [number, number, number, number],
-			spacing: [number, number]
-		},
-		kernings: any,
-		pages: JIMP[],
-		chars: {
-			[char: number]: FontChar,
-			[char: string]: FontChar
-		}
-	} | PresetFont;
-
-	class JimpImage {
-		constructor(width: number, height: number, callback?: Callback<JimpImage>);
-		constructor(width: number, height: number, initialColor: number, callback?: Callback<JimpImage>);
-
-		/* Get/set meta data */
-		hash(n?: number): string;
-
-		getExtension(): string;
-		getMIME(): FileMINE;
-
-		getPixelColor(x: number, y: number): number;
-		setPixelColor(hex: number, x: number, y: number): void;
-
-		/* Save */
-		write(path: string, callback?: Callback<undefined>): void;
-		getBase64(mine: FileMINE, callback?: Callback<string>): void;
-		getBuffer(mine: FileMINE, callback?: Callback<Buffer>): void;
-
-		/* Parameter */
-		quality(n: number): JimpImage;
-		rgba(is: boolean): JimpImage;
-		filterType(type: FilterType): JimpImage;
-		deflateLevel(level: number): JimpImage;
-
-		/* Operation */
-		clone(): JimpImage;
-		print(font: Font, x: number, y: number, text: string, width?: number): JimpImage;
-
-		/* Adv */
-		color(
-			params: Array<{
-				apply: 'lighten' | 'brighten' | 'darken' | 'desaturate' | 'saturate' | 'greyscale' | 'spin' | 'hue' | 'tint' | 'shade' | 'red' | 'green' | 'blue',
-				params: [number]
-			} | {
-				apply: 'mix',
-				params: [string, number]
-			} | {
-				apply: 'xor',
-				params: [string]
-			}>): JimpImage;
-
-		convolution(matrix: number[][]): JimpImage;
-		scan(x: number, y: number, width: number, height: number, callback?: (this: JimpImage, x: number, y: number, idx: number) => void): JimpImage;
-
-		/* Low level data */
-		bitmap: {data: Buffer, readonly width: number, readonly height: number};
-		readonly _originalMime: string;
-
-		/* Resize */
-		contain(width: number, height: number, callback?: Callback<JimpImage>): JimpImage;
-		contain(width: number, height: number, alignBitsOrMode?: number | ResizeMode, callback?: Callback<JimpImage>): JimpImage;
-		contain(width: number, height: number, alignBits: number, mode?: ResizeMode, callback?: Callback<JimpImage>): JimpImage;
-
-		cover(width: number, height: number, callback?: Callback<JimpImage>): JimpImage;
-		cover(width: number, height: number, alignBitsOrmode?: ResizeMode | number, callback?: Callback<JimpImage>): JimpImage;
-		cover(width: number, height: number, alignBits: number, mode?: ResizeMode, callback?: Callback<JimpImage>): JimpImage;
-
-		resize(width: number, height: number, callback?: Callback<JimpImage>): JimpImage;
-		resize(width: number, height: number, mode?: ResizeMode, callback?: Callback<JimpImage>): JimpImage;
-
-		scale(factor: any, callback?: Callback<JimpImage>): JimpImage;
-		scale(factor: any, mode?: ResizeMode, callback?: Callback<JimpImage>): JimpImage;
-
-		scaleToFit(width: number, height: number, callback?: Callback<JimpImage>): JimpImage;
-		scaleToFit(width: number, height: number, mode?: ResizeMode, callback?: Callback<JimpImage>): JimpImage;
-
-		/* Crop */
-		autocrop(callback?: Callback<JimpImage>): JimpImage;
-		crop(x: number, y: number, width: number, height: number, callback?: Callback<JimpImage>): JimpImage;
-
-		/* Composing */
-		blit(scr: string, x: number, y: number, callback?: Callback<JimpImage>): JimpImage;
-		blit(scr: string, x: number, y: number, srcx?: number, srcy?: number, callback?: Callback<JimpImage>): JimpImage;
-		blit(scr: string, x: number, y: number, srcx?: number, srcy?: number, srcw?: number, srch?: number, callback?: Callback<JimpImage>): JimpImage;
-
-		composite(scr: string, x: number, y: number, callback?: Callback<JimpImage>): JimpImage;
-		mask(scr: string, x: number, y: number, callback?: Callback<JimpImage>): JimpImage;
-
-		/* Flip and rotate */
-		flip(horz: any, vert: any, callback?: Callback<JimpImage>): JimpImage;
-		mirror(horz: any, vert: any, callback?: Callback<JimpImage>): JimpImage;
-		rotate(deg: number, callback?: Callback<JimpImage>): JimpImage;
-		rotate(deg: number, mode?: any, callback?: Callback<JimpImage>): JimpImage;
-
-		/* Colour */
-		brightness(val: number, callback?: Callback<JimpImage>): JimpImage;
-		contrast(val: number, callback?: Callback<JimpImage>): JimpImage;
-		dither565(callback?: Callback<JimpImage>): JimpImage;
-		greyscale(callback?: Callback<JimpImage>): JimpImage;
-		invert(callback?: Callback<JimpImage>): JimpImage;
-		normalize(callback?: Callback<JimpImage>): JimpImage;
-
-		/* Alpha channel */
-		fade(val: number, callback?: Callback<JimpImage>): JimpImage;
-		opacity(val: number, callback?: Callback<JimpImage>): JimpImage;
-		opaque(callback?: Callback<JimpImage>): JimpImage;
-		background(hex: number, callback?: Callback<JimpImage>): JimpImage;
-
-		/* Blurs */
-		gaussian(pixel: number, callback?: Callback<JimpImage>): JimpImage;
-		blur(pixel: number, callback?: Callback<JimpImage>): JimpImage;
-
-		/* Effects */
-		posterize(level: number, callback?: Callback<JimpImage>): JimpImage;
-		sepia(callback?: Callback<JimpImage>): JimpImage;
-	}
-	class JIMP extends JimpImage {
-		static read(path: string | Buffer, callback?: Callback<JimpImage>): Promise<JimpImage>;
-		static loadFont(path: string | PresetFont, callback?: Callback<Font>): Promise<Font>;
-		static rgbaToInt(r: number, g: number, b: number, alpha: number): number;
-		static intToRGBA(hex: number): {r: number, g: number, b: number, a: number};
-		static distance(image: JimpImage, image2: JimpImage): number;
-		static diff(image1: JimpImage, image2: JimpImage, threshold?: number): {image: JimpImage, percent: number};
-		static deflateStrategy(deflate: number): void;
-
-		static readonly RESIZE_NEAREST_NEIGHBOR: ResizeMode;
-		static readonly RESIZE_BILINEAR: ResizeMode;
-		static readonly RESIZE_BICUBIC: ResizeMode;
-		static readonly RESIZE_HERMITE: ResizeMode;
-		static readonly RESIZE_BEZIER: ResizeMode;
-
-		static readonly FONT_SANS_8_BLACK: PresetFont;
-		static readonly FONT_SANS_16_BLACK: PresetFont;
-		static readonly FONT_SANS_32_BLACK: PresetFont;
-		static readonly FONT_SANS_64_BLACK: PresetFont;
-		static readonly FONT_SANS_128_BLACK: PresetFont;
-
-		static readonly FONT_SANS_8_WHITE: PresetFont;
-		static readonly FONT_SANS_16_WHITE: PresetFont;
-		static readonly FONT_SANS_32_WHITE: PresetFont;
-		static readonly FONT_SANS_64_WHITE: PresetFont;
-		static readonly FONT_SANS_128_WHITE: PresetFont;
-
-		static readonly MIME_PNG: FileMINE;
-		static readonly MIME_JPEG: FileMINE;
-		static readonly MIME_BMP: FileMINE;
-		static readonly AUTO: number;
-
-		static readonly HORIZONTAL_ALIGN_LEFT: AlignMode;
-		static readonly HORIZONTAL_ALIGN_CENTER: AlignMode;
-		static readonly HORIZONTAL_ALIGN_RIGHT: AlignMode;
-		static readonly VERTICAL_ALIGN_TOP: AlignMode;
-		static readonly VERTICAL_ALIGN_MIDDLE: AlignMode;
-		static readonly VERTICAL_ALIGN_BOTTOM: AlignMode;
-
-		static readonly PNG_FILTER_AUTO: FilterType;
-		static readonly PNG_FILTER_NONE: FilterType;
-		static readonly PNG_FILTER_SUB: FilterType;
-		static readonly PNG_FILTER_UP: FilterType;
-		static readonly PNG_FILTER_AVERAGE: FilterType;
-		static readonly PNG_FILTER_PAETH: FilterType;
-	}
-}
-export = jimp.JIMP;
diff --git a/types/jimp/jimp-tests.ts b/types/jimp/jimp-tests.ts
deleted file mode 100644
index 10ee61073e..0000000000
--- a/types/jimp/jimp-tests.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import Jimp = require('jimp');
-
-// All code below is from node-jimp document
-Jimp.read("lenna.png", (err, data) => {
-    if (err) throw err;
-    data.resize(256, 256)            // resize
-         .quality(60)                 // set JPEG quality
-         .greyscale()                 // set greyscale
-         .write("lena-small-bw.jpg"); // save
-});
-
-Jimp.read("lenna.png").then(lenna => {
-    lenna.resize(256, 256)            // resize
-         .quality(60)                 // set JPEG quality
-         .greyscale()                 // set greyscale
-         .write("lena-small-bw.jpg"); // save
-}).catch(err => {
-    console.error(err);
-});
-
-Jimp.read("./path/to/image.jpg", (err, image) => {
-    // do stuff with the image (if no exception)
-});
-
-Jimp.read("./path/to/image.jpg").then(image => {
-    // do stuff with the image
-}).catch(err => {
-    // handle an exception
-});
-
-Jimp.read(new Buffer(''), (err, image) => {
-    // do stuff with the image (if no exception)
-});
-
-Jimp.read("http://www.example.com/path/to/lenna.jpg", (err, image) => {
-    // do stuff with the image (if no exception)
-});
-
-let image = new Jimp(1, 2);
-const w = 0;
-const h = 0;
-const x = 0;
-const y = 0;
-const f = 0;
-const src = '';
-const horz = Jimp.HORIZONTAL_ALIGN_CENTER;
-const vert = Jimp.VERTICAL_ALIGN_BOTTOM;
-const deg = 90;
-const val = 0.5;
-const hex = 0xFFFFFFFF;
-const r = 0;
-const n = 1;
-/* Resize */
-image.contain(w, h);    // scale the image to the given width and height, some parts of the image may be letter boxed
-image.cover(w, h);      // scale the image to the given width and height, some parts of the image may be clipped
-image.resize(w, h);     // resize the image. Jimp.AUTO can be passed as one of the values.
-image.scale(f);         // scale the image by the factor f
-image.scaleToFit(w, h); // scale the image to the largest size that fits inside the given width and height
-
-// An optional resize mode can be passed with all resize methods.
-
-/* Crop */
-image.autocrop();                 // automatically crop same-color borders from image (if any)
-image.crop(x, y, w, h);         // crop to the given region
-
-/* Composing */
-image.blit(src, x, y);
-                                  // blit the image with another Jimp image at x, y, optionally cropped.
-image.composite(src, x, y);     // composites another Jimp image over this image at x, y
-image.mask(src, x, y);          // masks the image with another Jimp image at x, y using average pixel value
-
-/* Flip and rotate */
-image.flip(horz, vert);         // flip the image horizontally or vertically
-image.mirror(horz, vert);       // an alias for flip
-
-// rotate the image clockwise by a number of degrees.
-// Optionally, a resize mode can be passed.
-// If `false` is passed as the second parameter,
-// the image width and height will not be resized.
-image.rotate(deg);
-
-// JPEG images with EXIF orientation data will be automatically re-orientated as appropriate.
-
-/* Colour */
-image.brightness(val);          // adjust the brighness by a value -1 to +1
-image.contrast(val);            // adjust the contrast by a value -1 to +1
-image.dither565();                // ordered dithering of the image and reduce color space to 16-bits (RGB565)
-image.greyscale();                // remove colour from the image
-image.invert();                   // invert the image colours
-image.normalize();                // normalize the channels in an image
-
-/* Alpha channel */
-image.fade(f);                  // an alternative to opacity, fades the image by a factor 0 - 1. 0 will haven no effect. 1 will turn the image
-image.opacity(f);               // multiply the alpha channel by each pixel by the factor f, 0 - 1
-image.opaque();                   // set the alpha channel on every pixel to fully opaque
-image.background(hex);          // set the default new pixel colour (e.g. 0xFFFFFFFF or 0x00000000) for by some operations (e.g. image.contain and
-
-/* Blurs */
-image.gaussian(r);              // Gaussian blur the image by r pixels (VERY slow)
-image.blur(r);                  // fast blur the image by r pixels
-
-/* Effects */
-image.posterize(n);             // apply a posterization effect with n level
-image.sepia();                    // apply a sepia wash to the image
-
-image.clone();           // returns a clone of the image
-image.resize(250, 250);           // resize the image to 250 x 250
-image.resize(Jimp.AUTO, 250);     // resize the height to 250 and scale the width accordingly
-image.resize(250, Jimp.AUTO);     // resize the width to 250 and scale the height accordingly
-
-image.resize(250, 250, Jimp.RESIZE_BEZIER);
-
-image.contain(250, 250, Jimp.HORIZONTAL_ALIGN_LEFT | Jimp.VERTICAL_ALIGN_TOP);
-
-const path = '';
-const str = '';
-const width = 0;
-Jimp.loadFont(path).then(font => { // load font from .fnt file
-    image.print(font, x, y, str);        // print a message on an image
-    image.print(font, x, y, str, width); // print a message on an image with text wrapped at width
-});
-
-const cb = (err: Error, data: any) => {};
-Jimp.loadFont(path, cb); // using a callback pattern
-
-Jimp.loadFont(Jimp.FONT_SANS_32_BLACK).then(font => {
-    image.print(font, 10, 10, "Hello world!");
-});
-
-image.write(path, cb); // Node-style callback will be fired when write is successful
-
-const file = "new_name." + image.getExtension();
-image.write(file);
-
-const mime = 'image/png';
-image.getBuffer(mime, cb); // Node-style callback will be fired with result
-image.getBase64(mime, cb); // Node-style callback will be fired with result
-image.quality(n); // set the quality of saved JPEG, 0 - 100
-
-const bool = true;
-const number = 0;
-image.rgba(bool);             // set whether PNGs are saved as RGBA (true, default) or RGB (false)
-image.filterType(number);     // set the filter type for the saved PNG
-image.deflateLevel(number);   // set the deflate level for the saved PNG
-Jimp.deflateStrategy(number); // set the deflate for the saved PNG (0-3)
-
-image.color([
-    { apply: 'hue', params: [ -90 ] },
-    { apply: 'lighten', params: [ 50 ] },
-    { apply: 'xor', params: [ '#06D' ] }
-]);
-image.convolution([
-    [-2, -1, 0],
-    [-1, 1, 1],
-    [ 0, 1, 2]
-]);
-image.scan(0, 0, image.bitmap.width, image.bitmap.height, function(x, y, idx) {
-    // x, y is the position of this pixel on the image
-    // idx is the position start position of this rgba tuple in the bitmap Buffer
-    // this is the image
-
-    const red   = this.bitmap.data[ idx + 0 ];
-    const green = this.bitmap.data[ idx + 1 ];
-    const blue  = this.bitmap.data[ idx + 2 ];
-    const alpha = this.bitmap.data[ idx + 3 ];
-
-    // rgba values run from 0 - 255
-    // e.g. this.bitmap.data[idx] = 0; // removes red from this pixel
-});
-image.getPixelColor(x, y);      // returns the colour of that pixel e.g. 0xFFFFFFFF
-image.setPixelColor(hex, x, y); // sets the colour of that pixel
-
-const g = 0;
-const b = 0;
-const a = 0;
-Jimp.rgbaToInt(r, g, b, a); // e.g. converts 255, 255, 255, 255 to 0xFFFFFFFF
-Jimp.intToRGBA(hex);        // e.g. converts 0xFFFFFFFF to {r: 255, g: 255, b: 255, a:255}
-
-image = new Jimp(256, 256, (err, image) => {
-    // this image is 256 x 256, every pixel is set to 0x00000000
-});
-
-image = new Jimp(256, 256, 0xFF0000FF, (err, image) => {
-    // this image is 256 x 256, every pixel is set to 0xFF0000FF
-});
-
-image.hash(); // aHgG4GgoFjA
-image.hash(2); // 1010101011010000101010000100101010010000011001001001010011100100
-
-const image1 = new Jimp(0, 1);
-const image2 = new Jimp(0, 1);
-Jimp.distance(image1, image2); // returns a number 0-1, where 0 means the two images are perceived to be identical
-
-const threshold = 0;
-let diff = Jimp.diff(image1, image2, threshold); // threshold ranges 0-1 (default: 0.1)
-diff.image;   // a Jimp image showing differences
-diff.percent; // the proportion of different pixels (0-1), where 0 means the images are pixel identical
-
-const distance = Jimp.distance(image, image2); // perceived distance
-diff = Jimp.diff(image, image2);         // pixel difference
-
-if (distance < 0.15 || diff.percent < 0.15) {
-    // images match
-} else {
-    // not a match
-}
-
-Jimp.read("lenna.png", function(err, image) {
-    this.greyscale().scale(0.5).write("lena-half-bw.png");
-});
-
-Jimp.read("lenna.png", (err, image) => {
-    image.greyscale((err, image) => {
-        image.scale(0.5, (err, image) => {
-            image.write("lena-half-bw.png");
-        });
-    });
-});
diff --git a/types/jimp/tsconfig.json b/types/jimp/tsconfig.json
deleted file mode 100644
index 03ab32095b..0000000000
--- a/types/jimp/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "jimp-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/jjv/tslint.json b/types/jjv/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jjv/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jjve/tslint.json b/types/jjve/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jjve/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jodata/index.d.ts b/types/jodata/index.d.ts
deleted file mode 100644
index 1aa54980fe..0000000000
--- a/types/jodata/index.d.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-// Type definitions for joData v1.1
-// Project: https://github.com/mccow002/joData
-// Definitions by: Chris Wrench <https://github.com/cgwrench>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class jo
-{
-    constructor(baseUri: string);
-
-    baseUri: string;
-    ExpandSettings: jo.ExpandSettings;
-    FilterSettings: jo.InlineCountSettings;
-    FormatSettings: jo.FormatSettings;
-    InlineCountSettings: jo.InlineCountSettings;
-    OrderBySettings: jo.OrderBySettings;
-    SelectSettings: jo.SelectSettings;
-    SkipSettings: jo.SkipSettings;
-    TopSettings: jo.TopSettings;
-
-    currentHashRoute: string;
-    updateHashRoute: (hashRoute: string) => void;
-
-    // Order by
-    setOrderByDefault(property: string, order?: string): jo;
-    toggleOrderBy(property: string, callback?: Function): jo;
-    orderBy(property: string): jo;
-    desc(): jo;
-    asc(): jo;
-    resetOrderBy(): jo;
-
-    // Top
-    setTopDefault(top: number): jo;
-    top(top: number): jo;
-    resetTop(): jo;
-
-    // Skip
-    setSkipDefault(skip: number): jo;
-    skip(skip: number): jo;
-    resetSkip(): jo;
-
-    // Select
-    setSelectDefault(select: string[]): jo;
-    select(select: string[]): jo;
-    resetSelect(): jo;
-
-    // Expand
-    setExpandDefault(expand: string): jo;
-    expand(expand: string): jo;
-    resetExpand(): jo;
-
-    // Format
-    format(): jo.FormatOptions;
-    formatDefault(): jo.FormatOptions;
-    resetFormat(): void;
-
-    // Inline count
-    inlineCount(): jo.InlineCountOptions;
-    inlineCountDefault(): jo.InlineCountOptions;
-    resetInlineCount(): void;
-
-    // Filter
-    filter(filterClause: jo.FilterClause|jo.PrecedenceGroup): jo;
-    andFilter(filterClause: jo.FilterClause|jo.PrecedenceGroup): jo;
-    orFilter(filterClause: jo.FilterClause|jo.PrecedenceGroup): jo;
-    removeFilter(property: string): jo;
-    captureFilter(): void;
-    resetFilter(): jo;
-    resetToCapturedFilter(): jo;
-    defaultFilter(filterClause: jo.FilterClause): jo;
-    defaultAndFilter(filterClause: jo.FilterClause): jo;
-    defaultOrFilter(filterClause: jo.FilterClause): jo;
-
-    // Casts
-    static literal: (stringLiteral: string) => string;
-    static datetime: (stringLiteral: string) => string;
-    static guid: (stringLiteral: string) => string;
-    static decimal: (stringLiteral: number) => string;
-    static double: (stringLiteral: number) => string;
-    static single: (stringLiteral: number) => string;
-
-    toString: () => string;
-    toJson: () => string;
-    saveLocal: (key?: string) => void;
-
-    static loadLocal: (key?: string) => jo;
-}
-
-declare namespace jo {
-    interface FormatOptions {
-        atom(): jo;
-        custom(value: string): jo;
-        json(): jo;
-        xml(): jo;
-    }
-
-    interface InlineCountOptions {
-        allPages(): jo;
-        none(): jo;
-    }
-
-    export class FilterClause {
-        constructor();
-        constructor(property: string);
-
-        toString(): string;
-        isEmpty(): Boolean;
-
-        Property: string;
-        Components: string[];
-        IsClauseEmpty: Boolean;
-        PropertyIncluded: Boolean;
-        UsingNot: Boolean;
-        Value: any;
-        FuncReturnType: any;
-        transformFunc: Function;
-
-        // Logical operators
-        eq(value: string|number|boolean): jo.FilterClause;
-        ne(value: string|number|boolean): jo.FilterClause;
-        gt(value: string|number|boolean): jo.FilterClause;
-        ge(value: string|number|boolean): jo.FilterClause;
-        lt(value: string|number|boolean): jo.FilterClause;
-        le(value: string|number|boolean): jo.FilterClause;
-        not(): jo.FilterClause;
-
-        // Arithmetic methods
-        add(amount: number): jo.FilterClause;
-        sub(amount: number): jo.FilterClause;
-        mul(amount: number): jo.FilterClause;
-        div(amount: number): jo.FilterClause;
-        mod(amount: number): jo.FilterClause;
-
-        // String functions
-        substringof(value: string): jo.FilterClause;
-        substring(position: number, length?: number): jo.FilterClause;
-        toLower(): jo.FilterClause;
-        toUpper(): jo.FilterClause;
-        trim(): jo.FilterClause;
-        endswith(value: string): jo.FilterClause;
-        startswith(value: string): jo.FilterClause;
-        length(): jo.FilterClause;
-        indexof(value: string): jo.FilterClause;
-        replace(find: string, replace: string): jo.FilterClause;
-
-        // Concat
-        Concat(concat: jo.Concat): jo.FilterClause;
-
-        // Date functions
-        day(): jo.FilterClause;
-        hour(): jo.FilterClause;
-        minute(): jo.FilterClause;
-        month(): jo.FilterClause;
-        second(): jo.FilterClause;
-        year(): jo.FilterClause;
-
-        // Math functions
-        round(): jo.FilterClause;
-        floor(): jo.FilterClause;
-        ceiling() : jo.FilterClause;
-    }
-
-    // Precedence groups
-    export class PrecedenceGroup {
-        constructor(filterClause: jo.FilterClause)
-        andFilter(filterClause: jo.FilterClause): jo.FilterClause;
-        orFilter(filterClause: jo.FilterClause): jo.FilterClause;
-    }
-
-    // Concat
-    export class Concat {
-        constructor(value1: string|jo.Concat, value2: string|jo.Concat)
-        LeftSide: string|jo.Concat;
-        RightSide: string|jo.Concat;
-        toString(): string;
-    }
-
-    // TODO What is the most appropriate place for these interfaces?
-    // They are only required by the `jo` class.
-    interface ISettings {
-    	toString: () => string;
-        reset: () => void;
-        isSet: () => Boolean;
-    }
-
-    interface OrderBySettings extends ISettings {
-        Property: string;
-        Order: string;
-        DefaultProperty:string;
-        DefaultOrder: string;
-    }
-
-    interface TopSettings extends ISettings {
-        Top: number;
-        DefaultTop: number;
-    }
-
-    interface SkipSettings extends ISettings {
-        Skip: number;
-        DefaultSkip: number;
-    }
-
-    interface SelectSettings extends ISettings {
-        Select: string[];
-        DefaultSelect: string[];
-    }
-
-    interface ExpandSettings extends ISettings {
-        Expand: string;
-        DefaultExpand: string;
-    }
-
-    interface FormatSettings extends ISettings {
-        Format: string;
-        DefaultFormat: string;
-    }
-
-    interface InlineCountSettings extends ISettings {
-        InlineCount: string;
-        DefaultInlineCount: string;
-    }
-
-    interface FilterSettings extends ISettings {
-        Filters: FilterClause[];
-        DefaultFilters: FilterClause[];
-        CapturedFilter: FilterClause[];
-        fullReset: () => void;
-        loadFromJson: (filterSettings: any) => void;
-    }
-}
diff --git a/types/jodata/jodata-tests.ts b/types/jodata/jodata-tests.ts
deleted file mode 100644
index 3327a23603..0000000000
--- a/types/jodata/jodata-tests.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-var query = new jo('http://test.com');
-
-// Base URI
-query.baseUri;
-
-// To string
-query.toString();
-
-// Order by
-query.orderBy('PropertyName');
-query.orderBy('PropertyName').asc();
-query.orderBy('PropertyName').desc();
-query.orderBy('PropertyName').asc().desc();
-query.resetOrderBy();
-query.setOrderByDefault('PropertyName');
-query.toggleOrderBy('CustomerId'); // TODO Example with callback.
-
-query
-    .setOrderByDefault('p1', 'desc')
-    .orderBy('p2')
-    .asc();
-	
-// Top
-query.top(10);
-query.resetTop();
-query.setTopDefault(5);
-query
-    .setTopDefault(5)
-    .top(10);
-
-// Skip
-query.skip(5);
-query.resetSkip();
-query.setSkipDefault(5);
-query
-    .setSkipDefault(5)
-    .skip(10);
-
-// Select
-query.select(['Property1', 'Property2']);
-query.resetSelect();
-query.setSelectDefault(['CustomerId', 'CustomerName']);
-query
-    .setSelectDefault(['CustomerId', 'CustomerName'])
-    .select(['CustomerId', 'CustomerName', 'Address']);
-
-// Expand
-query.expand('Customer');
-query.resetExpand();
-query.setExpandDefault('Customer');
-query
-    .setExpandDefault('Customer')
-    .expand('Product');
-
-// Format
-query.format().atom();
-query.format().xml();
-query.format().json();
-query.format().custom('text/csv');
-
-query.formatDefault().atom();
-
-query
-    .formatDefault()
-    .atom()
-    .format()
-    .json();
-	
-query.resetFormat();
-
-// Inlinecount
-query.inlineCount().allPages();
-query.inlineCount().none();
-
-query.inlineCountDefault().allPages();
-
-query
-    .inlineCountDefault()
-    .allPages()
-    .inlineCount()
-    .none();
-	
-query.resetInlineCount();
-
-// Filter
-var clause = new jo.FilterClause('PropertyName');
-clause.eq(5);
-query.filter(clause);
-
-query
-    .andFilter(new jo.FilterClause('Property1').eq(5))
-    .andFilter(new jo.FilterClause('Property2').eq(10));
-	
-query
-    .orFilter(new jo.FilterClause('Property1').eq(5))
-    .orFilter(new jo.FilterClause('Property2').eq(10));
-	
-query
-    .filter(new jo.FilterClause('p1').eq(1))
-    .andFilter(new jo.FilterClause('p2').eq(5))
-    .orFilter(new jo.FilterClause('p3').eq(10));
-
-query.removeFilter('CustomerName');
-
-var clause = new jo.FilterClause('CustomerId');
-clause.isEmpty();
-
-var clause = new jo.FilterClause('CustomerId').eq(1);
-clause.isEmpty();
-
-query.andFilter(new jo.FilterClause('Status').eq('Pending'));
-query.captureFilter();
-query.resetToCapturedFilter();
-query.resetFilter();
-
-// Casts
-query.filter(new jo.FilterClause('DateAdded').eq(jo.datetime('2013-03-01')));
-query.filter(new jo.FilterClause('CustomerId').eq(jo.guid('3F2504E0-4F89-11D3-9A0C-0305E82C3301')));
-query.filter(new jo.FilterClause('Price').eq(jo.decimal(24.97)));
-query.filter(new jo.FilterClause('Price').eq(jo.single(24.97)));
-query.filter(new jo.FilterClause('Price').eq(jo.double(24.97)));
-
-// Logical Operators
-query.filter(new jo.FilterClause('PropertyName').eq('test'));
-query.filter(new jo.FilterClause('PropertyName').eq(10));
-query.filter(new jo.FilterClause('CustomerName').not().eq('bob'));
-query.filter(new jo.FilterClause('CustomerName').not().endswith('bob'));
-
-// Precedence Groups
-var group = new jo.PrecedenceGroup(new jo.FilterClause('Name').eq('Bob'));
-query.filter(group);
-
-var group2 = new jo.PrecedenceGroup(new jo.FilterClause('Name').eq('Bob')).orFilter(new jo.FilterClause('Name').eq('George'));
-query.filter(group2);
-
-query
-    .filter(new jo.FilterClause('Id').eq(1))
-    .andFilter(new jo.PrecedenceGroup(new jo.FilterClause('Name').startswith('a').eq(true))
-        .orFilter(new jo.FilterClause('Name').startswith('b').eq(true)));
-		
-// Setting filter defaults
-query.defaultFilter(new jo.FilterClause('Id').eq(1));
-query
-    .defaultFilter(new jo.FilterClause('Id').eq(1))
-    .filter(new jo.FilterClause('Name').eq('bob'));
-query
-    .defaultFilter(new jo.FilterClause('Id').eq(1))
-    .filter(new jo.FilterClause('Name').eq('bob'));
-query.resetFilter();
-
-// Arithmetic Methods
-query.filter(new jo.FilterClause('PropertyName').add(5).eq(10));
-
-// String Functions
-query.filter(new jo.FilterClause('PropertyName').substringof('test').eq(true));
-query.filter(new jo.FilterClause('PropertyName').toLower().substringof('test').eq(true));
-query.filter(new jo.FilterClause('PropertyName').endswith('test').eq(true));
-query.filter(new jo.FilterClause('PropertyName').startswith('test').eq(true));
-query.filter(new jo.FilterClause('PropertyName').length().eq(10));
-query.filter(new jo.FilterClause('PropertyName').indexof('test').eq(1));
-query.filter(new jo.FilterClause('PropertyName').replace('test', 'bob').eq('bob'));
-query.filter(new jo.FilterClause('PropertyName').substring(1).eq('test'));
-query.filter(new jo.FilterClause('PropertyName').substring(1,2).eq('test'));
-query.filter(new jo.FilterClause('PropertyName').toLower().eq('test'));
-query.filter(new jo.FilterClause('PropertyName').toUpper().eq('TEST'));
-query.filter(new jo.FilterClause('PropertyName').trim().eq('test'));
-
-// Concat
-query.filter(new jo.FilterClause().Concat(new jo.Concat('FirstName', 'LastName')).eq('BobSmith'));
-query.filter(new jo.FilterClause().Concat(new jo.Concat(new jo.Concat('City', jo.literal(', ')), 'State')).eq('Birmingham, Alabama'));
-
-// Date Functions
-query.filter(new jo.FilterClause('Birthday').day().eq(2));
-query.filter(new jo.FilterClause('Birthday').hour().eq(2));
-query.filter(new jo.FilterClause('Birthday').minute().eq(2));
-query.filter(new jo.FilterClause('Birthday').month().eq(2));
-query.filter(new jo.FilterClause('Birthday').second().eq(2));
-query.filter(new jo.FilterClause('Birthday').year().eq(2));
-
-// Math Functions
-query.filter(new jo.FilterClause('Price').round().eq(2));
-query.filter(new jo.FilterClause('Price').floor().eq(2));
-query.filter(new jo.FilterClause('Price').ceiling().eq(2));
-
-// Saving Local
-query.saveLocal();
-jo.loadLocal();
-
-query.saveLocal("key");
-jo.loadLocal("key");
\ No newline at end of file
diff --git a/types/jodata/tsconfig.json b/types/jodata/tsconfig.json
deleted file mode 100644
index be177ebe58..0000000000
--- a/types/jodata/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "jodata-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index a2621c352d..95a348429d 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -1,11 +1,11 @@
 // Type definitions for johnny-five
 // Project: https://github.com/rwaldron/johnny-five
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+//                 Zoltan Ujvary <https://github.com/ujvzolee>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 ///<reference types="node"/>
 
-
 export interface AccelerometerOption {
     controller: string;
 }
@@ -32,6 +32,19 @@ export interface AccelerometerMMA7361Option extends AccelerometerGeneralOption {
 
 export declare class Accelerometer {
     constructor(option: AccelerometerGeneralOption | AccelerometerAnalogOption | AccelerometerMPU6050Option | AccelerometerMMA7361Option);
+
+    id: string;
+    zeroV: number;
+    pins: Array<string>;
+    readonly pitch: number;
+    readonly roll: number;
+    readonly x: number;
+    readonly y: number;
+    readonly z: number;
+    readonly acceleration: number;
+    readonly inclination: number;
+    readonly orientation: number;
+
     on(event: string, cb: () => void): this;
     on(event: "change", cb: () => void): this;
     on(event: "data", cb: (freq: any) => void): this;
@@ -40,14 +53,27 @@ export declare class Accelerometer {
     disable(): void;
 }
 
+export interface AltimeterOption {
+    controller: string;
+    address?: number;
+    freq?: number;
+    elevation?: number;
+}
+
+export declare class Altimeter {
+    constructor(option: AltimeterOption);
+
+    id: string;
+    readonly feet: number;
+    readonly meters: number;
+
+    on(event: string, cb: () => void): this;
+    on(event: "change", cb: () => void): this;
+    on(event: "data", cb: (data: any) => void): this;
+}
+
 export declare class Animation {
     constructor(option: Servo | Array<Servo>);
-    enqueue(segment: any): void;
-    play(): void;
-    pause(): void;
-    stop(): void;
-    next(): void;
-    speed(speed: Array<number>): void;
 
     target: number;
     duration: number;
@@ -60,37 +86,34 @@ export declare class Animation {
     progress: number;
     currentSpeed: number;
     fps: number;
+
+    enqueue(segment: any): void;
+    play(): void;
+    pause(): void;
+    stop(): void;
+    next(): void;
+    speed(speed: Array<number>): void;
 }
 
-export interface ButtonOptions {
-    pin: number | string;
-    invert?: boolean;
-    isPullup?: boolean;
-    holdtime?: number;
-}
-
-export declare class Button {
-    constructor(pin: number | string | ButtonOptions);
-    on(event: string, cb: () => void): this;
-    on(event: "hold", cb: (holdTime: number) => void): this;
-    on(event: "down", cb: () => void): this;
-    on(event: "press", cb: () => void): this;
-    on(event: "up", cb: () => void): this;
-    on(event: "release", cb: () => void): this;
-}
-
-export interface BoardOptions {
+export interface BoardOption {
     id?: number | string;
     port?: string | any;
     repl?: boolean;
-}
-
-export interface Repl {
-    inject(object: any): void;
+    debug?: boolean;
+    timeout?: number;
 }
 
 export declare class Board {
-    constructor(option?: BoardOptions);
+    constructor(option?: BoardOption);
+
+    io: any;
+    id: string;
+    repl: any;
+    isReady: boolean;
+    pins: Array<Pin>;
+    port: string;
+    inject: Repl;
+
     on(event: string, cb: () => void): this;
     on(event: "ready", cb: () => void): this;
     on(event: "connect", cb: () => void): this;
@@ -99,25 +122,49 @@ export declare class Board {
     analogRead(pin: number, cb: (item: number) => void): void;
     digitalWrite(pin: number, value: number): void;
     digitalRead(pin: number, cb: (item: number) => void): void;
+    servoWrite(pin: number, angle: number): void;
     shiftOut(dataPin: Pin, clockPin: Pin, isBigEndian: boolean, value: number): void;
     wait(ms: number, cb: () => void): void;
     loop(ms: number, cb: () => void): void;
-
-    isReady: boolean;
-    io: any;
-    id: string;
-    pins: Array<Pin>;
-    port: string;
-    inject: Repl;
+    samplingInterval(ms: number): void;
 }
 
-export interface CompassOptions {
+export interface ButtonOption {
+    pin: number | string;
+    invert?: boolean;
+    isPullup?: boolean;
+    isPulldown?: boolean;
+    holdtime?: number;
+}
+
+export declare class Button {
+    constructor(pin: number | string | ButtonOption);
+
+    id: string;
+    pin: number | string;
+    downValue: number;
+    upValue: number;
+    holdtime: number;
+
+    on(event: string, cb: () => void): this;
+    on(event: "hold", cb: (holdTime: number) => void): this;
+    on(event: "down", cb: () => void): this;
+    on(event: "press", cb: () => void): this;
+    on(event: "up", cb: () => void): this;
+    on(event: "release", cb: () => void): this;
+}
+
+export interface CompassOption {
     controller: string;
     gauss?: number;
 }
 
 export declare class Compass {
-    constructor(option: CompassOptions);
+    constructor(option: CompassOption);
+
+    readonly heading: number;
+    readonly bearing: { name: string, abbr: string, low: number, high: number, heading: number };
+
     on(event: string, cb: () => void): this;
     on(event: "change", cb: () => void): this;
     on(event: "data", cb: (data: any) => void): this;
@@ -127,16 +174,46 @@ export interface ESCOption {
     pin: number | string;
     range?: Array<number>;
     startAt?: number;
+    controller?: string;
+    device?: string;
+    neutral?: number;
 }
 
 export declare class ESC {
     constructor(option: number | string | ESCOption);
+
+    id: string;
+    pin: number | string;
+    range: Array<number>;
+    readonly value: number;
+
     speed(value: number): void;
     min(): void;
     max(): void;
     stop(): void;
 }
 
+export declare class Fn {
+    static constrain(value: number, lower: number, upper: number): number;
+    static inRange(value: number, lower: number, upper: number): boolean;
+    static map(value: number, fromLow: number, fromHigh: number, toLow: number, toHigh: number): number;
+    static fmap(value: number, fromLow: number, fromHigh: number, toLow: number, toHigh: number): number;
+    static range(lower: number, upper: number, tick: number): Array<number>;
+    static scale(value: number, fromLow: number, fromHigh: number, toLow: number, toHigh: number): number;
+    static fscale(value: number, fromLow: number, fromHigh: number, toLow: number, toHigh: number): number;
+    static sum(values: Array<number>): number;
+    static toFixed(number: number, digits: number): number;
+    static uid(): string;
+    static bitSize(n: number): number;
+    static bitValue(bit: number): number;
+    static int16(msb: number, lsb: number): number;
+    static uint16(msb: number, lsb: number): number;
+    static int24(b16: number, b8: number, b0: number): number;
+    static uint24(b16: number, b8: number, b0: number): number;
+    static int32(b24: number, b16: number, b8: number, b0: number): number;
+    static uint32(b24: number, b16: number, b8: number, b0: number): number;
+}
+
 export interface GyroGeneralOption {
     controller?: string;
 }
@@ -153,12 +230,41 @@ export interface GyroMPU6050Option extends GyroGeneralOption {
 
 export declare class Gyro {
     constructor(option: GyroGeneralOption | GyroAnalogOption | GyroMPU6050Option);
+
+    id: string;
+    pins: Array<string>;
+    readonly isCalibrated: boolean;
+    readonly pitch: any;
+    readonly roll: any;
+    readonly yaw: any;
+    readonly rate: any;
+    readonly x: number;
+    readonly y: number;
+    readonly z: number;
+
     on(event: string, cb: () => void): this;
     on(event: "change", cb: () => void): this;
     on(event: "data", cb: (data: any) => void): this;
     recalibrate(): void;
 }
 
+export interface HygrometerOption {
+    controller?: string;
+    freq?: number;
+}
+
+export declare class Hygrometer {
+    constructor(option: HygrometerOption);
+
+    id: string;
+    readonly relativeHumidity: number;
+    readonly RH: number;
+
+    on(event: string, cb: () => void): this;
+    on(event: "change", cb: () => void): this;
+    on(event: "data", cb: (data: any) => void): this;
+}
+
 export interface IMUGeneralOption {
     controller?: string;
     freq?: number;
@@ -170,9 +276,17 @@ export interface IMUMPU6050Option extends IMUGeneralOption {
 
 export declare class IMU {
     constructor(option: IMUGeneralOption | IMUMPU6050Option);
+
+    readonly accelerometer: Accelerometer;
+    readonly compass: Compass
+    readonly gyro: Gyro;
+    readonly orientation: Orientiation;
+    readonly thermometer: Thermometer;
+
     on(event: string, cb: () => void): this;
     on(event: "change", cb: () => void): this;
     on(event: "data", cb: (data: any) => void): this;
+    on(event: "calibrated", cb: () => void): this;
 }
 
 export declare module IR {
@@ -230,20 +344,26 @@ export declare module IR {
 
 export interface JoystickOption {
     pins: Array<string>;
+    invert?: boolean;
+    invertX?: boolean;
+    invertY?: boolean;
 }
 
 export declare class Joystick {
     constructor(option: JoystickOption);
+
+    id: string;
+    readonly x: number;
+    readonly y: number;
+    axis: Array<number>;
+    raw: Array<number>;
+
     on(event: string, cb: () => void): this;
     on(event: "data", cb: (data: any) => void): this;
     on(event: "change", cb: () => void): this;
     on(event: "axismove", cb: (error: Error, date: Date) => void): this;
-
-    axis: Array<number>;
-    raw: Array<number>;
 }
 
-
 export interface LCDGeneralOption {
     rows?: number;
     cols?: number;
@@ -261,17 +381,25 @@ export interface LCDParallelOption extends LCDGeneralOption {
 
 export declare class LCD {
     constructor(option: LCDGeneralOption | LCDI2COption | LCDParallelOption);
+
+    id: string;
+    rows: number;
+    cols: number;
+
     print(message: string): void;
     useChar(char: string): void;
     clear(): void;
     cursor(row: number, col: number): void;
     home(): void;
+    on(): void;
+    off(): void;
     display(): void;
     noDisplay(): void;
     blink(): void;
     noBlink(): void;
     autoscroll(): void;
     noAutoscroll(): void;
+    bgColor(color: any): void;
 }
 
 export interface LedOption {
@@ -284,6 +412,10 @@ export interface LedOption {
 
 export declare class Led {
     constructor(option: number | LedOption);
+
+    id: string;
+    pin: number;
+
     on(): void;
     off(): void;
     toggle(): void;
@@ -299,13 +431,20 @@ export declare class Led {
 }
 
 export declare module Led {
+
     export interface DigitsOption {
         pins: any;
         devices?: number;
+        controller?: string;
     }
 
     export class Digits {
         constructor(option: DigitsOption);
+
+        readonly isMatrix: boolean;
+        readonly devices: number;
+        digitOrder: number;
+
         on(): void;
         on(index: number): void;
         off(): void;
@@ -333,6 +472,10 @@ export declare module Led {
 
     export class Matrix {
         constructor(option: MatrixOption | MatrixIC2Option);
+
+        readonly isMatrix: boolean;
+        readonly devices: number;
+
         on(): void;
         on(index: number): void;
         off(): void;
@@ -359,6 +502,12 @@ export declare module Led {
 
     export class RGB {
         constructor(option: RGBOption);
+
+        red: Led;
+        green: Led;
+        blue: Led;
+        readonly isAnode: boolean;
+
         on(): void;
         off(): void;
         color(value: number): void;
@@ -384,6 +533,9 @@ export interface MotorOption {
 
 export declare class Motor {
     constructor(option: Array<number> | MotorOption);
+
+    readonly isOn: boolean;
+
     forward(speed: number): void;
     fwd(speed: number): void;
     reverse(speed: number): void;
@@ -395,12 +547,35 @@ export declare class Motor {
     release(): void;
 }
 
+export interface OrientiationOption {
+    controller?: string;
+    freq?: number;
+}
+
+export declare class Orientiation {
+    constructor(option: OrientiationOption);
+
+    readonly euler: any;
+    readonly quarternion: any;
+
+    on(event: string, cb: () => void): this;
+    on(event: "change", cb: () => void): this;
+    on(event: "data", cb: (data: any) => void): this;
+    on(event: "calibrated", cb: () => void): this;
+}
+
 export interface PiezoOption {
     pin: number;
 }
 
 export declare class Piezo {
     constructor(option: number | PiezoOption);
+
+    id: string;
+    pin: number;
+    readonly mode: number;
+    readonly isPlaying: boolean;
+
     frequency(frequency: number, duration: number): void;
     play(tune: any, cb?: () => void): void;
     tone(frequency: number, duration: number): void;
@@ -424,13 +599,24 @@ export interface PinState {
 
 export declare class Pin {
     constructor(option: number | string | PinOption);
+
+    id: number | string;
+    pin: number | string;
+    type: "digital" | "analog";
+    value: number;
+    mode: number;
+
+    static write(pin: number, value: number): void;
+    static read(pin: number, cb: (data: number) => void): void;
     query(cb: (pin: PinState) => void): void;
     high(): void;
     low(): void;
     write(value: number): void;
     read(cb: (value: number) => void): void;
-    static write(pin: number, value: number): void;
-    static read(pin: number, cb: (data: number) => void): void;
+    on(event: string, cb: () => void): this;
+    on(event: "high", cb: () => void): this;
+    on(event: "low", cb: () => void): this;
+    on(event: "data", cb: (data: any) => void): this;
 }
 
 export interface PingOption {
@@ -450,11 +636,21 @@ export interface RelayOption {
 
 export declare class Relay {
     constructor(option: number | RelayOption);
+
+    id: string;
+    pin: number | string;
+    readonly isOn: boolean;
+    readonly type: string;
+
     open(): void;
     close(): void;
     toggle(): void;
 }
 
+export interface Repl {
+    inject(object: any): void;
+}
+
 export interface SensorOption {
     pin: number | string;
     freq?: boolean;
@@ -463,14 +659,25 @@ export interface SensorOption {
 
 export declare class Sensor {
     constructor(option: number | string | SensorOption);
-    scale(low: number, high: number): Sensor;
-    scale(range: number[]): Sensor;
-    scale(): Sensor;
+
+    id: string;
+    pin: number | string;
+    threshold: number;
+    readonly boolean: boolean;
+    readonly raw: number;
+    readonly analog: number;
+    readonly constrained: number;
+    readonly value: number;
+
+    scaleTo(low: number, high: number): number;
+    fscaleTo(low: number, high: number): number;
+    scaleTo(range: Array<number>): number
+    fscaleTo(range: Array<number>): number
     booleanAt(barrier: number): boolean;
     within(range: Array<number>, cb: () => void): void;
     on(event: string, cb: () => void): this;
-    on(event: "data", cb: (data: any) => void): this;
     on(event: "change", cb: () => void): this;
+    on(event: "data", cb: (data: any) => void): this;
 }
 
 export interface ServoGeneralOption {
@@ -495,10 +702,24 @@ export interface ServoSweepOpts {
 
 export declare class Servo {
     constructor(option: number | string | ServoGeneralOption);
+
+    id: string;
+    pin: number | string;
+    range: Array<number>;
+    invert: boolean;
+    history: Array<any>;
+    interval: number;
+    isMoving: boolean;
+    readonly last: any;
+    readonly position: number;
+    value: number;
+    startAt: number;
+
     to(degrees: number, ms?: number, rage?: number): void;
     min(): void;
     max(): void;
     center(): void;
+    home(): void;
     sweep(): void;
     sweep(range: Array<number>): void;
     sweep(opt: ServoSweepOpts): void;
@@ -511,11 +732,21 @@ export declare class Servo {
 
 export interface ShiftRegisterOption {
     pins: any;
+    isAnode?: boolean;
 }
 
 export declare class ShiftRegister {
     constructor(option: ShiftRegisterOption);
-    send(...value: number[]): void;
+
+    id: string;
+    pins: any;
+    readonly value: any;
+    readonly isAnode: boolean;
+
+    clear(): void;
+    display(number: number | string): void;
+    reset(): void;
+    send(...value: Array<number>): void;
 }
 
 export interface SonarOption {
@@ -527,11 +758,12 @@ export interface SonarOption {
 
 export declare class Sonar {
     constructor(option: number | string | SonarOption);
+
     within(range: Array<number>, cb: () => void): void;
     within(range: Array<number>, unit: string, cb: () => void): void;
     on(event: string, cb: () => void): this;
-    on(event: "data", cb: (data: any) => void): this;
     on(event: "change", cb: () => void): this;
+    on(event: "data", cb: (data: any) => void): this;
 }
 
 export interface StepperOption {
@@ -552,6 +784,7 @@ export declare module Stepper {
 
 export declare class Stepper {
     constructor(option: number | string | StepperOption);
+
     step(stepsOrOpts: any, cb: () => void): void;
     rpm(): Stepper;
     rpm(value: number): Stepper;
@@ -565,23 +798,49 @@ export declare class Stepper {
     decel(value: number): Stepper;
     cw(): Stepper;
     ccw(): Stepper;
-
     within(range: Array<number>, cb: () => void): void;
     within(range: Array<number>, unit: string, cb: () => void): void;
     on(event: string, cb: () => void): this;
-    on(event: "data", cb: (data: any) => void): this;
     on(event: "change", cb: () => void): this;
+    on(event: "data", cb: (data: any) => void): this;
 }
 
-export interface TemperatureOption {
+export interface SwitchOption {
+    pin: number | string;
+    type?: "NO" | "NC";
+}
+
+export declare class Switch {
+    constructor(option: number | string | SwitchOption);
+
+    id: string;
+    pin: number | string;
+    readonly isClosed: boolean;
+    readonly isOpen: boolean;
+
+    on(event: "open", cb: () => void): this;
+    on(event: "close", cb: () => void): this;
+}
+
+export interface ThermometerOption {
     controller?: string;
     pin: string | number;
     toCelsius?: (val: number) => number;
     freq?: number;
 }
 
-export declare class Temperature {
-    constructor(option: TemperatureOption);
+export declare class Thermometer {
+    constructor(option: ThermometerOption);
+
+    id: string;
+    pin: number | string;
+    readonly celsius: number;
+    readonly fahrenheit: number;
+    readonly kelvin: number;
+    readonly C: number;
+    readonly F: number;
+    readonly K: number;
+
     on(event: string, cb: () => void): this;
     on(event: "data", cb: (data: any) => void): this;
     on(event: "change", cb: () => void): this;
diff --git a/types/johnny-five/johnny-five-tests.ts b/types/johnny-five/johnny-five-tests.ts
index da5cff19f6..72e7d04b07 100644
--- a/types/johnny-five/johnny-five-tests.ts
+++ b/types/johnny-five/johnny-five-tests.ts
@@ -100,7 +100,10 @@ board.on('ready', function(){
     eyes.enable();
 
     var joystick = new five.Joystick({
-        pins: ["A0", "A1"]
+        pins: ["A0", "A1"],
+        invert: false,
+        invertX: false,
+        invertY: false
     });
     joystick.on("data", (value)=>{
         console.log(value);
@@ -210,9 +213,8 @@ board.on('ready', function(){
 
     var sensor = new five.Sensor("A0");
 
-    sensor.scale([ 0, 10 ]).on("data", function() {
-        console.log( this.value );
-    });
+    var value = sensor.scaleTo([ 0, 10 ]);
+    console.log( value );
 
     var servo = new five.Servo({
         pin: 10,
@@ -244,12 +246,26 @@ board.on('ready', function(){
         }
     });
 
-    var temperature = new five.Temperature({
+    var temperature = new five.Thermometer({
         pin: "A0",
         toCelsius: function(raw) { // optional
             return (raw / 100) + 10;
         }
     });
+
+    var hygrometer = new five.Hygrometer({
+        controller: "DHT22_I2C_NANO_BACKPACK"
+    });
+
+    var altimeter =  new five.Altimeter({
+        controller: "MPL3115A2"
+    });
+
+    var Switch = new five.Switch({
+        pin: "A4",
+        type: "NC"
+    });
+
 }).on("ready", function(){
     console.log("Everything is ready!!!");
 });
diff --git a/types/johnny-five/tslint.json b/types/johnny-five/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/johnny-five/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 1b4c3fcbaf..94ffd188cf 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -1,6 +1,15 @@
-// Type definitions for joi v10.4.2
+// Type definitions for joi v13.0.1
 // Project: https://github.com/hapijs/joi
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Laurence Dougal Myers <https://github.com/laurence-myers>, Christopher Glantschnig <https://github.com/cglantschnig>, David Broder-Rodgers <https://github.com/DavidBR-SW>, Gael Magnan de Bornier <https://github.com/GaelMagnan>, Rytis Alekna <https://github.com/ralekna>, Pavel Ivanov <https://github.com/schfkt>, Youngrok Kim <https://github.com/rokoroku>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+//                 Laurence Dougal Myers <https://github.com/laurence-myers>
+//                 Christopher Glantschnig <https://github.com/cglantschnig>
+//                 David Broder-Rodgers <https://github.com/DavidBR-SW>
+//                 Gael Magnan de Bornier <https://github.com/GaelMagnan>
+//                 Rytis Alekna <https://github.com/ralekna>
+//                 Pavel Ivanov <https://github.com/schfkt>
+//                 Youngrok Kim <https://github.com/rokoroku>
+//                 Dan Kraus <https://github.com/dankraus>
+//                 Anjun Wang <https://github.com/wanganjun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -8,7 +17,7 @@
 
 export type Types = 'any' | 'alternatives' | 'array' | 'boolean' | 'binary' | 'date' | 'function' | 'lazy' | 'number' | 'object' | 'string';
 
-export type LanguageOptions = string | false | null | {
+export type LanguageOptions = string | boolean | null | {
     [key: string]: LanguageOptions;
 };
 
@@ -88,7 +97,7 @@ export interface EmailOptions {
     /**
      * Specifies a list of acceptable TLDs.
      */
-    tldWhitelist?: string[] | Object;
+    tldWhitelist?: string[] | object;
     /**
      * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
      */
@@ -120,6 +129,13 @@ export interface UriOptions {
     scheme?: string | RegExp | Array<string | RegExp>;
 }
 
+export interface Base64Options {
+    /**
+     * optional parameter defaulting to true which will require = padding if true or make padding optional if false
+     */
+    paddingRequired?: boolean;
+}
+
 export interface WhenOptions {
     /**
      * the required condition joi type.
@@ -138,6 +154,9 @@ export interface WhenOptions {
 export interface ReferenceOptions {
     separator?: string;
     contextPrefix?: string;
+    default?: any;
+    strict?: boolean;
+    functions?: boolean;
 }
 
 export interface IPOptions {
@@ -158,7 +177,7 @@ export interface ValidationError extends Error, JoiObject {
 export interface ValidationErrorItem {
     message: string;
     type: string;
-    path: string;
+    path: string[];
     options?: ValidationOptions;
     context?: Context;
 }
@@ -167,7 +186,7 @@ export interface ValidationErrorFunction {
     (errors: ValidationErrorItem[]): string | ValidationErrorItem | ValidationErrorItem[] | Error;
 }
 
-export interface ValidationResult<T> {
+export interface ValidationResult<T> extends Pick<Promise<T>, 'then' | 'catch'> {
     error: ValidationError;
     value: T;
 }
@@ -192,6 +211,8 @@ export type Schema = AnySchema
 
 export interface AnySchema extends JoiObject {
 
+    schemaType?: Types | string;
+
     /**
      * Validates a value using the schema and options.
      */
@@ -267,7 +288,7 @@ export interface AnySchema extends JoiObject {
     /**
      * Attaches metadata to the key.
      */
-    meta(meta: Object): this;
+    meta(meta: object): this;
 
     /**
      * Annotates the key with an example value, must be valid.
@@ -343,7 +364,7 @@ export interface AnySchema extends JoiObject {
      *   an instance of `Error` - the override error.
      *   a `function(errors)`, taking an array of errors as argument, where it must either:
      *    return a `string` - substitutes the error message with this text
-     *    return a single `object` or an `Array` of it, where:
+     *    return a single ` object` or an `Array` of it, where:
      *     `type` - optional parameter providing the type of the error (eg. `number.min`).
      *     `message` - optional parameter if `template` is provided, containing the text of the error.
      *     `template` - optional parameter if `message` is provided, containing a template string, using the same format as usual joi language errors.
@@ -381,6 +402,8 @@ export interface Description {
 
 export interface Context {
     [key: string]: any;
+    key?: string;
+    label?: string;
 }
 
 export interface State {
@@ -452,7 +475,7 @@ export interface NumberSchema extends AnySchema {
 
     /**
      * Specifies the maximum number of decimal places where:
-     *  limit - the maximum number of decimal places allowed.
+     * @param limit - the maximum number of decimal places allowed.
      */
     precision(limit: number): this;
 
@@ -494,6 +517,24 @@ export interface StringSchema extends AnySchema {
     max(limit: number, encoding?: string): this;
     max(limit: Reference, encoding?: string): this;
 
+    /**
+     * Specifies whether the string.max() limit should be used as a truncation.
+     * @param enabled - optional parameter defaulting to true which allows you to reset the behavior of truncate by providing a falsy value.
+     */
+    truncate(enabled?: boolean): this;
+
+    /**
+     * Requires the string value to be in a unicode normalized form. If the validation convert option is on (enabled by default), the string will be normalized.
+     * @param form - The unicode normalization form to use. Valid values: NFC [default], NFD, NFKC, NFKD
+     */
+    normalize(form?: 'NFC' | 'NFD' | 'NFKC' | 'NFKD'): this;
+
+    /**
+     * Requires the string value to be a valid base64 string; does not check the decoded value.
+     * @param options - optional settings: The unicode normalization options to use. Valid values: NFC [default], NFD, NFKC, NFKD
+     */
+    base64(options?: Base64Options): this;
+
     /**
      * Requires the number to be a credit card number (Using Lunh Algorithm).
      */
@@ -551,7 +592,7 @@ export interface StringSchema extends AnySchema {
      * Requires the string value to be a valid GUID.
      */
     guid(options?: GuidOptions): this;
-    
+
     /**
      * Alias for `guid` -- Requires the string value to be a valid GUID
      */
@@ -648,6 +689,7 @@ export interface ArraySchema extends AnySchema {
 }
 
 export interface ObjectSchema extends AnySchema {
+
     /**
      * Sets the allowed object keys.
      */
@@ -759,6 +801,19 @@ export interface ObjectSchema extends AnySchema {
      */
     optionalKeys(children: string[]): this;
     optionalKeys(...children: string[]): this;
+
+    /**
+     * Sets the specified children to forbidden.
+     *
+     * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+     *
+     *   const schema = Joi.object().keys({ a: { b: Joi.number().required() }, c: { d: Joi.string().required() } });
+     *   const optionalSchema = schema.forbiddenKeys('a.b', 'c.d');
+     *
+     * The behavior is exactly the same as requiredKeys.
+     */
+    forbiddenKeys(children: string[]): this;
+    forbiddenKeys(...children: string[]): this;
 }
 
 export interface BinarySchema extends AnySchema {
@@ -885,7 +940,7 @@ export type ExtensionBoundSchema = Schema & {
 
 export interface Rules<P extends object = any> {
     name: string;
-    params?: ObjectSchema | { [key in keyof P]: SchemaLike; };
+    params?: ObjectSchema | {[key in keyof P]: SchemaLike; };
     setup?(this: ExtensionBoundSchema, params: P): Schema | void;
     validate?<R = any>(this: ExtensionBoundSchema, params: P, value: any, state: State, options: ValidationOptions): Err | R;
     description?: string | ((params: P) => string);
@@ -962,10 +1017,15 @@ export function string(): StringSchema;
 /**
  * Generates a type that will match one of the provided alternative schemas
  */
-export function alternatives(): AlternativesSchema;
 export function alternatives(types: SchemaLike[]): AlternativesSchema;
 export function alternatives(...types: SchemaLike[]): AlternativesSchema;
 
+/**
+ * Alias for `alternatives`
+ */
+export function alt(types: SchemaLike[]): AlternativesSchema;
+export function alt(...types: SchemaLike[]): AlternativesSchema;
+
 /**
  * Generates a placeholder schema for a schema that you would provide with the fn.
  * Supports the same methods of the any() type.
@@ -1025,9 +1085,142 @@ export function reach<T extends Schema>(schema: ObjectSchema, path: string): T;
 /**
  * Creates a new Joi instance customized with the extension(s) you provide included.
  */
-export function extend(extention: Extension): any;
+export function extend(extension: Extension|Extension[], ...extensions: (Extension|Extension[])[]): any;
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+import * as Module from 'joi';
+export type Root = typeof Module;
+export type DefaultsFunction = (root: Schema) => Schema;
+
+/**
+ * Creates a new Joi instance that will apply defaults onto newly created schemas
+ * through the use of the fn function that takes exactly one argument, the schema being created.
+ *
+ * @param fn - The function must always return a schema, even if untransformed.
+ */
+export function defaults(fn: DefaultsFunction): Root;
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+// Below are undocumented APIs. use at your own risk
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 /**
  * Returns a plain object representing the schema's rules and properties
  */
 export function describe(schema: Schema): Description;
+
+/**
+* Whitelists a value
+*/
+export function allow(value: any, ...values: any[]): Schema;
+export function allow(values: any[]): Schema;
+
+/**
+ * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
+ */
+export function valid(value: any, ...values: any[]): Schema;
+export function valid(values: any[]): Schema;
+export function only(value: any, ...values: any[]): Schema;
+export function only(values: any[]): Schema;
+export function equal(value: any, ...values: any[]): Schema;
+export function equal(values: any[]): Schema;
+
+/**
+ * Blacklists a value
+ */
+export function invalid(value: any, ...values: any[]): Schema;
+export function invalid(values: any[]): Schema;
+export function disallow(value: any, ...values: any[]): Schema;
+export function disallow(values: any[]): Schema;
+export function not(value: any, ...values: any[]): Schema;
+export function not(values: any[]): Schema;
+
+/**
+ * Marks a key as required which will not allow undefined as value. All keys are optional by default.
+ */
+export function required(): Schema;
+
+/**
+ * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
+ */
+export function optional(): Schema;
+
+/**
+ * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
+ */
+export function forbidden(): Schema;
+
+/**
+ * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
+ */
+export function strip(): Schema;
+
+/**
+ * Annotates the key
+ */
+export function description(desc: string): Schema;
+
+/**
+ * Annotates the key
+ */
+export function notes(notes: string): Schema;
+export function notes(notes: string[]): Schema;
+
+/**
+ * Annotates the key
+ */
+export function tags(notes: string): Schema;
+export function tags(notes: string[]): Schema;
+
+/**
+ * Attaches metadata to the key.
+ */
+export function meta(meta: object): Schema;
+
+/**
+ * Annotates the key with an example value, must be valid.
+ */
+export function example(value: any): Schema;
+
+/**
+ * Annotates the key with an unit name.
+ */
+export function unit(name: string): Schema;
+
+/**
+ * Overrides the global validate() options for the current key and any sub-key.
+ */
+export function options(options: ValidationOptions): Schema;
+
+/**
+ * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
+ */
+export function strict(isStrict?: boolean): Schema;
+
+/**
+ * Returns a new type that is the result of adding the rules of one type to another.
+ */
+export function concat<T>(schema: T): T;
+
+/**
+ * Converts the type into an alternatives type where the conditions are merged into the type definition where:
+ */
+export function when(ref: string, options: WhenOptions): AlternativesSchema;
+export function when(ref: Reference, options: WhenOptions): AlternativesSchema;
+
+/**
+ * Overrides the key name in error messages.
+ */
+export function label(name: string): Schema;
+
+/**
+ * Outputs the original untouched value instead of the casted value.
+ */
+export function raw(isRaw?: boolean): Schema;
+
+/**
+ * Considers anything that matches the schema to be empty (undefined).
+ * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
+ */
+export function empty(schema?: any): Schema;
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index 4f49a69b3f..3ee7c45b66 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -2,50 +2,50 @@ import Joi = require('joi');
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var x: any = null;
-var value: any = null;
-var num: number = 0;
-var str: string = '';
-var bool: boolean = false;
-var exp: RegExp = null;
-var obj: object = null;
-var date: Date = null;
-var err: Error = null;
-var func: Function = null;
+let x: any = null;
+let value: any = null;
+let num: number = 0;
+let str: string = '';
+let bool: boolean = false;
+let exp: RegExp = null;
+let obj: object = null;
+let date: Date = null;
+let err: Error = null;
+let func: Function = null;
 
-var anyArr: any[] = [];
-var numArr: number[] = [];
-var strArr: string[] = [];
-var boolArr: boolean[] = [];
-var expArr: RegExp[] = [];
-var objArr: object[] = [];
-var errArr: Error[] = [];
-var funcArr: Function[] = [];
+let anyArr: any[] = [];
+let numArr: number[] = [];
+let strArr: string[] = [];
+let boolArr: boolean[] = [];
+let expArr: RegExp[] = [];
+let objArr: object[] = [];
+let errArr: Error[] = [];
+let funcArr: Function[] = [];
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schema: Joi.Schema = null;
-var schemaLike: Joi.SchemaLike = null;
+let schema: Joi.Schema = null;
+let schemaLike: Joi.SchemaLike = null;
 
-var anySchema: Joi.AnySchema = null;
-var numSchema: Joi.NumberSchema = null;
-var strSchema: Joi.StringSchema = null;
-var arrSchema: Joi.ArraySchema = null;
-var boolSchema: Joi.BooleanSchema = null;
-var binSchema: Joi.BinarySchema = null;
-var dateSchema: Joi.DateSchema = null;
-var funcSchema: Joi.FunctionSchema = null;
-var objSchema: Joi.ObjectSchema = null;
-var altSchema: Joi.AlternativesSchema = null;
+let anySchema: Joi.AnySchema = null;
+let numSchema: Joi.NumberSchema = null;
+let strSchema: Joi.StringSchema = null;
+let arrSchema: Joi.ArraySchema = null;
+let boolSchema: Joi.BooleanSchema = null;
+let binSchema: Joi.BinarySchema = null;
+let dateSchema: Joi.DateSchema = null;
+let funcSchema: Joi.FunctionSchema = null;
+let objSchema: Joi.ObjectSchema = null;
+let altSchema: Joi.AlternativesSchema = null;
 
-var schemaArr: Joi.Schema[] = [];
+let schemaArr: Joi.Schema[] = [];
 
-var ref: Joi.Reference = null;
-var description: Joi.Description = null;
+let ref: Joi.Reference = null;
+let description: Joi.Description = null;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var validOpts: Joi.ValidationOptions = null;
+let validOpts: Joi.ValidationOptions = null;
 
 validOpts = { abortEarly: bool };
 validOpts = { convert: bool };
@@ -77,7 +77,7 @@ validOpts = {
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var renOpts: Joi.RenameOptions = null;
+let renOpts: Joi.RenameOptions = null;
 
 renOpts = { alias: bool };
 renOpts = { multiple: bool };
@@ -86,7 +86,7 @@ renOpts = { ignoreUndefined: bool };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var emailOpts: Joi.EmailOptions = null;
+let emailOpts: Joi.EmailOptions = null;
 
 emailOpts = { errorLevel: num };
 emailOpts = { errorLevel: bool };
@@ -96,7 +96,7 @@ emailOpts = { minDomainAtoms: num };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var ipOpts: Joi.IpOptions = null;
+let ipOpts: Joi.IpOptions = null;
 
 ipOpts = { version: str };
 ipOpts = { version: strArr };
@@ -104,7 +104,7 @@ ipOpts = { cidr: str };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var uriOpts: Joi.UriOptions = null;
+let uriOpts: Joi.UriOptions = null;
 
 uriOpts = { scheme: str };
 uriOpts = { scheme: exp };
@@ -113,7 +113,13 @@ uriOpts = { scheme: expArr };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var whenOpts: Joi.WhenOptions = null;
+let base64Opts: Joi.Base64Options = null;
+
+base64Opts = { paddingRequired: bool };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+let whenOpts: Joi.WhenOptions = null;
 
 whenOpts = { is: x };
 whenOpts = { is: schema, then: schema };
@@ -122,27 +128,27 @@ whenOpts = { is: schemaLike, then: schemaLike, otherwise: schemaLike };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var refOpts: Joi.ReferenceOptions = null;
+let refOpts: Joi.ReferenceOptions = null;
 
 refOpts = { separator: str };
 refOpts = { contextPrefix: str };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var validErr: Joi.ValidationError = null;
-var validErrItem: Joi.ValidationErrorItem;
-var validErrFunc: Joi.ValidationErrorFunction;
+let validErr: Joi.ValidationError = null;
+let validErrItem: Joi.ValidationErrorItem;
+let validErrFunc: Joi.ValidationErrorFunction;
 
 validErrItem = {
     message: str,
     type: str,
-    path: str
+    path: [str]
 };
 
 validErrItem = {
     message: str,
     type: str,
-    path: str,
+    path: [str],
     options: validOpts,
     context: obj
 };
@@ -176,7 +182,7 @@ anySchema = objSchema;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schemaMap: Joi.SchemaMap = null;
+let schemaMap: Joi.SchemaMap = null;
 
 schemaMap = {
     a: numSchema,
@@ -687,6 +693,10 @@ objSchema = objSchema.optionalKeys(str);
 objSchema = objSchema.optionalKeys(str, str);
 objSchema = objSchema.optionalKeys(strArr);
 
+objSchema = objSchema.forbiddenKeys(str);
+objSchema = objSchema.forbiddenKeys(str, str);
+objSchema = objSchema.forbiddenKeys(strArr);
+
 namespace common {
     objSchema = objSchema.allow(x);
     objSchema = objSchema.allow(x, x);
@@ -765,7 +775,7 @@ strSchema = strSchema.ip(ipOpts);
 strSchema = strSchema.uri();
 strSchema = strSchema.uri(uriOpts);
 strSchema = strSchema.guid();
-strSchema = strSchema.guid({ version: ['uuidv1', 'uuidv2', 'uuidv3', 'uuidv4', 'uuidv5'] });
+strSchema = strSchema.guid({ version: ['uuidv1', 'uuidv2', 'uuidv3', 'uuidv4', 'uuidv5'] } as Joi.GuidOptions);
 strSchema = strSchema.guid({ version: 'uuidv4' });
 strSchema = strSchema.hex();
 strSchema = strSchema.hostname();
@@ -773,6 +783,12 @@ strSchema = strSchema.isoDate();
 strSchema = strSchema.lowercase();
 strSchema = strSchema.uppercase();
 strSchema = strSchema.trim();
+strSchema = strSchema.truncate();
+strSchema = strSchema.truncate(false);
+strSchema = strSchema.normalize();
+strSchema = strSchema.normalize('NFKC');
+strSchema = strSchema.base64();
+strSchema = strSchema.base64(base64Opts);
 
 namespace common {
     strSchema = strSchema.allow(x);
@@ -830,6 +846,13 @@ schema = Joi.alternatives().try(schema, schema);
 schema = Joi.alternatives(schemaArr);
 schema = Joi.alternatives(schema, anySchema, boolSchema);
 
+schema = Joi.alt();
+schema = Joi.alt().try(schemaArr);
+schema = Joi.alt().try(schema, schema);
+
+schema = Joi.alt(schemaArr);
+schema = Joi.alt(schema, anySchema, boolSchema);
+
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 schema = Joi.lazy(() => schema)
@@ -844,14 +867,14 @@ namespace validate_tests {
         Joi.validate(value, schema, validOpts, (err, value) => {
             x = value;
             str = err.message;
-            str = err.details[0].path;
+            str = err.details[0].path[0];
             str = err.details[0].message;
             str = err.details[0].type;
         });
         Joi.validate(value, schema, (err, value) => {
             x = value;
             str = err.message;
-            str = err.details[0].path;
+            str = err.details[0].path.join('.');
             str = err.details[0].message;
             str = err.details[0].type;
         });
@@ -889,6 +912,11 @@ namespace validate_tests {
         returnValue = schema.validate(value, validOpts);
         value = schema.validate(value, (err, value) => value);
         value = schema.validate(value, validOpts, (err, value) => value);
+
+        returnValue
+            .then(val => JSON.stringify(val, null, 2))
+            .then(val => { throw 'one error'; })
+            .catch(e => {});
     }
 }
 
@@ -950,3 +978,126 @@ const Joi3 = Joi.extend({
         },
     ],
 });
+
+const Joi4 = Joi.extend([{ name: '', base: schema }, { name: '', base: schema }]);
+
+const Joi5 = Joi.extend({ name: '', base: schema }, { name: '', base: schema });
+
+const Joi6 = Joi.extend({ name: '', base: schema }, [{ name: '', base: schema }, { name: '', base: schema }]);
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+const defaultsJoi = Joi.defaults((schema) => {
+    switch (schema.schemaType) {
+        case 'string':
+            return schema.allow('');
+        case 'object':
+            return (schema as Joi.ObjectSchema).min(1);
+        default:
+            return schema;
+    }
+});
+
+schema = Joi.allow(x, x);
+schema = Joi.allow([x, x, x]);
+schema = Joi.valid(x);
+schema = Joi.valid(x, x);
+schema = Joi.valid([x, x, x]);
+schema = Joi.only(x);
+schema = Joi.only(x, x);
+schema = Joi.only([x, x, x]);
+schema = Joi.equal(x);
+schema = Joi.equal(x, x);
+schema = Joi.equal([x, x, x]);
+schema = Joi.invalid(x);
+schema = Joi.invalid(x, x);
+schema = Joi.invalid([x, x, x]);
+schema = Joi.disallow(x);
+schema = Joi.disallow(x, x);
+schema = Joi.disallow([x, x, x]);
+schema = Joi.not(x);
+schema = Joi.not(x, x);
+schema = Joi.not([x, x, x]);
+
+schema = Joi.required();
+schema = Joi.optional();
+schema = Joi.forbidden();
+schema = Joi.strip();
+
+schema = Joi.description(str);
+schema = Joi.notes(str);
+schema = Joi.notes(strArr);
+schema = Joi.tags(str);
+schema = Joi.tags(strArr);
+
+schema = Joi.meta(obj);
+schema = Joi.example(obj);
+schema = Joi.unit(str);
+
+schema = Joi.options(validOpts);
+schema = Joi.strict();
+schema = Joi.strict(bool);
+schema = Joi.concat(x);
+
+schema = Joi.when(str, whenOpts);
+schema = Joi.when(ref, whenOpts);
+
+schema = Joi.label(str);
+schema = Joi.raw();
+schema = Joi.raw(bool);
+schema = Joi.empty();
+schema = Joi.empty(str);
+schema = Joi.empty(anySchema);
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+schema = Joi.allow(x, x);
+schema = Joi.allow([x, x, x]);
+schema = Joi.valid(x);
+schema = Joi.valid(x, x);
+schema = Joi.valid([x, x, x]);
+schema = Joi.only(x);
+schema = Joi.only(x, x);
+schema = Joi.only([x, x, x]);
+schema = Joi.equal(x);
+schema = Joi.equal(x, x);
+schema = Joi.equal([x, x, x]);
+schema = Joi.invalid(x);
+schema = Joi.invalid(x, x);
+schema = Joi.invalid([x, x, x]);
+schema = Joi.disallow(x);
+schema = Joi.disallow(x, x);
+schema = Joi.disallow([x, x, x]);
+schema = Joi.not(x);
+schema = Joi.not(x, x);
+schema = Joi.not([x, x, x]);
+
+schema = Joi.required();
+schema = Joi.optional();
+schema = Joi.forbidden();
+schema = Joi.strip();
+
+schema = Joi.description(str);
+schema = Joi.notes(str);
+schema = Joi.notes(strArr);
+schema = Joi.tags(str);
+schema = Joi.tags(strArr);
+
+schema = Joi.meta(obj);
+schema = Joi.example(obj);
+schema = Joi.unit(str);
+
+schema = Joi.options(validOpts);
+schema = Joi.strict();
+schema = Joi.strict(bool);
+schema = Joi.concat(x);
+
+schema = Joi.when(str, whenOpts);
+schema = Joi.when(ref, whenOpts);
+
+schema = Joi.label(str);
+schema = Joi.raw();
+schema = Joi.raw(bool);
+schema = Joi.empty();
+schema = Joi.empty(str);
+schema = Joi.empty(anySchema);
diff --git a/types/joi/tsconfig.json b/types/joi/tsconfig.json
index f6b8f170dc..57e6c47881 100644
--- a/types/joi/tsconfig.json
+++ b/types/joi/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "joi-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/joi/tslint.json b/types/joi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/joi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/joi/v10/index.d.ts b/types/joi/v10/index.d.ts
new file mode 100644
index 0000000000..9270c411aa
--- /dev/null
+++ b/types/joi/v10/index.d.ts
@@ -0,0 +1,1178 @@
+// Type definitions for joi v10.6.0
+// Project: https://github.com/hapijs/joi
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+//                 Laurence Dougal Myers <https://github.com/laurence-myers>
+//                 Christopher Glantschnig <https://github.com/cglantschnig>
+//                 David Broder-Rodgers <https://github.com/DavidBR-SW>
+//                 Gael Magnan de Bornier <https://github.com/GaelMagnan>
+//                 Rytis Alekna <https://github.com/ralekna>
+//                 Pavel Ivanov <https://github.com/schfkt>
+//                 Youngrok Kim <https://github.com/rokoroku>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+// TODO express type of Schema in a type-parameter (.default, .valid, .example etc)
+
+export type Types = 'any' | 'alternatives' | 'array' | 'boolean' | 'binary' | 'date' | 'function' | 'lazy' | 'number' | 'object' | 'string';
+
+export type LanguageOptions = string | boolean | null | {
+    [key: string]: LanguageOptions;
+};
+
+export type LanguageRootOptions = {
+    root?: string;
+    key?: string;
+    messages?: { wrapArrays?: boolean; };
+} & Partial<Record<Types, LanguageOptions>> & { [key: string]: LanguageOptions; };
+
+export interface ValidationOptions {
+    /**
+     * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
+     */
+    abortEarly?: boolean;
+    /**
+     * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
+     */
+    convert?: boolean;
+    /**
+     * when true, allows object to contain unknown keys which are ignored. Defaults to false.
+     */
+    allowUnknown?: boolean;
+    /**
+     * when true, ignores unknown keys with a function value. Defaults to false.
+     */
+    skipFunctions?: boolean;
+    /**
+     * remove unknown elements from objects and arrays. Defaults to false
+     * - when true, all unknown elements will be removed
+     * - when an object:
+     *      - arrays - set to true to remove unknown items from arrays.
+     *      - objects - set to true to remove unknown keys from objects
+     */
+    stripUnknown?: boolean | { arrays?: boolean; objects?: boolean };
+    /**
+     * overrides individual error messages. Defaults to no override ({}).
+     */
+    language?: LanguageRootOptions;
+    /**
+     * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
+     */
+    presence?: 'optional' | 'required' | 'forbidden';
+    /**
+     * provides an external data set to be used in references
+     */
+    context?: Context;
+    /**
+     * when true, do not apply default values. Defaults to false.
+     */
+    noDefaults?: boolean;
+}
+
+export interface RenameOptions {
+    /**
+     * if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
+     */
+    alias?: boolean;
+    /**
+     * if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
+     */
+    multiple?: boolean;
+    /**
+     * if true, allows renaming a key over an existing key. Defaults to false.
+     */
+    override?: boolean;
+    /**
+     * if true, skip renaming of a key if it's undefined. Defaults to false.
+     */
+    ignoreUndefined?: boolean;
+}
+
+export interface EmailOptions {
+    /**
+     * Numerical threshold at which an email address is considered invalid
+     */
+    errorLevel?: number | boolean;
+    /**
+     * Specifies a list of acceptable TLDs.
+     */
+    tldWhitelist?: string[] | Object;
+    /**
+     * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
+     */
+    minDomainAtoms?: number;
+}
+
+export interface IpOptions {
+    /**
+     * One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
+     */
+    version?: string | string[];
+    /**
+     * Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
+     */
+    cidr?: string;
+}
+
+export type GuidVersions = 'uuidv1' | 'uuidv2' | 'uuidv3' | 'uuidv4' | 'uuidv5'
+
+export interface GuidOptions {
+    version: GuidVersions[] | GuidVersions;
+}
+
+export interface UriOptions {
+    /**
+     * Specifies one or more acceptable Schemes, should only include the scheme name.
+     * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
+     */
+    scheme?: string | RegExp | Array<string | RegExp>;
+}
+
+export interface WhenOptions {
+    /**
+     * the required condition joi type.
+     */
+    is: SchemaLike;
+    /**
+     * the alternative schema type if the condition is true. Required if otherwise is missing.
+     */
+    then?: SchemaLike;
+    /**
+     * the alternative schema type if the condition is false. Required if then is missing
+     */
+    otherwise?: SchemaLike;
+}
+
+export interface ReferenceOptions {
+    separator?: string;
+    contextPrefix?: string;
+}
+
+export interface IPOptions {
+    version?: Array<string>;
+    cidr?: string
+}
+
+export interface JoiObject {
+    isJoi: boolean;
+}
+
+export interface ValidationError extends Error, JoiObject {
+    details: ValidationErrorItem[];
+    annotate(): string;
+    _object: any;
+}
+
+export interface ValidationErrorItem {
+    message: string;
+    type: string;
+    path: string;
+    options?: ValidationOptions;
+    context?: Context;
+}
+
+export interface ValidationErrorFunction {
+    (errors: ValidationErrorItem[]): string | ValidationErrorItem | ValidationErrorItem[] | Error;
+}
+
+export interface ValidationResult<T> {
+    error: ValidationError;
+    value: T;
+}
+
+export type SchemaLike = string | number | boolean | object | null | Schema | SchemaMap;
+
+export interface SchemaMap {
+    [key: string]: SchemaLike | SchemaLike[];
+}
+
+export type Schema = AnySchema
+    | ArraySchema
+    | AlternativesSchema
+    | BinarySchema
+    | BooleanSchema
+    | DateSchema
+    | FunctionSchema
+    | NumberSchema
+    | ObjectSchema
+    | StringSchema
+    | LazySchema;
+
+export interface AnySchema extends JoiObject {
+
+    /**
+     * Validates a value using the schema and options.
+     */
+    validate<T>(value: T): ValidationResult<T>;
+    validate<T>(value: T, options: ValidationOptions): ValidationResult<T>;
+    validate<T, R>(value: T, callback: (err: ValidationError, value: T) => R): R;
+    validate<T, R>(value: T, options: ValidationOptions, callback: (err: ValidationError, value: T) => R): R;
+
+    /**
+     * Whitelists a value
+     */
+    allow(...values: any[]): this;
+    allow(values: any[]): this;
+
+    /**
+     * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
+     */
+    valid(...values: any[]): this;
+    valid(values: any[]): this;
+    only(...values: any[]): this;
+    only(values: any[]): this;
+    equal(...values: any[]): this;
+    equal(values: any[]): this;
+
+    /**
+     * Blacklists a value
+     */
+    invalid(...values: any[]): this;
+    invalid(values: any[]): this;
+    disallow(...values: any[]): this;
+    disallow(values: any[]): this;
+    not(...values: any[]): this;
+    not(values: any[]): this;
+
+    /**
+     * Marks a key as required which will not allow undefined as value. All keys are optional by default.
+     */
+    required(): this;
+    exist(): this;
+
+    /**
+     * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
+     */
+    optional(): this;
+
+    /**
+     * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
+     */
+    forbidden(): this;
+
+    /**
+     * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
+     */
+    strip(): this;
+
+    /**
+     * Annotates the key
+     */
+    description(desc: string): this;
+
+    /**
+     * Annotates the key
+     */
+    notes(notes: string): this;
+    notes(notes: string[]): this;
+
+    /**
+     * Annotates the key
+     */
+    tags(notes: string): this;
+    tags(notes: string[]): this;
+
+    /**
+     * Attaches metadata to the key.
+     */
+    meta(meta: object): this;
+
+    /**
+     * Annotates the key with an example value, must be valid.
+     */
+    example(value: any): this;
+
+    /**
+     * Annotates the key with an unit name.
+     */
+    unit(name: string): this;
+
+    /**
+     * Overrides the global validate() options for the current key and any sub-key.
+     */
+    options(options: ValidationOptions): this;
+
+    /**
+     * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
+     */
+    strict(isStrict?: boolean): this;
+
+    /**
+     * Sets a default value if the original value is undefined.
+     * @param value - the value.
+     *   value supports references.
+     *   value may also be a function which returns the default value.
+     *   If value is specified as a function that accepts a single parameter, that parameter will be a context
+     *    object that can be used to derive the resulting value. This clones the object however, which incurs some
+     *    overhead so if you don't need access to the context define your method so that it does not accept any
+     *    parameters.
+     *   Without any value, default has no effect, except for object that will then create nested defaults
+     *    (applying inner defaults of that object).
+     *
+     * Note that if value is an object, any changes to the object after default() is called will change the
+     *  reference and any future assignment.
+     *
+     * Additionally, when specifying a method you must either have a description property on your method or the
+     *  second parameter is required.
+     */
+    default(value: any, description?: string): this;
+    default(): this;
+
+    /**
+     * Returns a new type that is the result of adding the rules of one type to another.
+     */
+    concat(schema: this): this;
+
+    /**
+     * Converts the type into an alternatives type where the conditions are merged into the type definition where:
+     */
+    when(ref: string, options: WhenOptions): AlternativesSchema;
+    when(ref: Reference, options: WhenOptions): AlternativesSchema;
+
+    /**
+     * Overrides the key name in error messages.
+     */
+    label(name: string): this;
+
+    /**
+     * Outputs the original untouched value instead of the casted value.
+     */
+    raw(isRaw?: boolean): this;
+
+    /**
+     * Considers anything that matches the schema to be empty (undefined).
+     * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
+     */
+    empty(schema?: SchemaLike): this;
+
+    /**
+     * Overrides the default joi error with a custom error if the rule fails where:
+     * @param err - can be:
+     *   an instance of `Error` - the override error.
+     *   a `function(errors)`, taking an array of errors as argument, where it must either:
+     *    return a `string` - substitutes the error message with this text
+     *    return a single ` object` or an `Array` of it, where:
+     *     `type` - optional parameter providing the type of the error (eg. `number.min`).
+     *     `message` - optional parameter if `template` is provided, containing the text of the error.
+     *     `template` - optional parameter if `message` is provided, containing a template string, using the same format as usual joi language errors.
+     *     `context` - optional parameter, to provide context to your error if you are using the `template`.
+     *    return an `Error` - same as when you directly provide an `Error`, but you can customize the error message based on the errors.
+     *
+     * Note that if you provide an `Error`, it will be returned as-is, unmodified and undecorated with any of the
+     * normal joi error properties. If validation fails and another error is found before the error
+     * override, that error will be returned and the override will be ignored (unless the `abortEarly`
+     * option has been set to `false`).
+     */
+    error?(err: Error | ValidationErrorFunction): this;
+
+    /**
+     * Returns a plain object representing the schema's rules and properties
+     */
+    describe(): Description;
+}
+
+export interface Description {
+    type?: Types | string;
+    label?: string;
+    description?: string;
+    flags?: object;
+    notes?: string[];
+    tags?: string[];
+    meta?: any[];
+    example?: any[];
+    valids?: any[];
+    invalids?: any[];
+    unit?: string;
+    options?: ValidationOptions;
+    [key: string]: any;
+}
+
+export interface Context {
+    [key: string]: any;
+}
+
+export interface State {
+    key?: string;
+    path?: string;
+    parent?: any;
+    reference?: any;
+}
+
+export interface BooleanSchema extends AnySchema {
+
+    /**
+     * Allows for additional values to be considered valid booleans by converting them to true during validation.
+     * Accepts a value or an array of values. String comparisons are by default case insensitive,
+     * see boolean.insensitive() to change this behavior.
+     * @param values - strings, numbers or arrays of them
+     */
+    truthy(...values: Array<string | number | string[] | number[]>): this;
+
+    /**
+     * Allows for additional values to be considered valid booleans by converting them to false during validation.
+     * Accepts a value or an array of values. String comparisons are by default case insensitive,
+     * see boolean.insensitive() to change this behavior.
+     * @param values - strings, numbers or arrays of them
+     */
+    falsy(...values: Array<string | number | string[] | number[]>): this;
+
+    /**
+     * Allows the values provided to truthy and falsy as well as the "true" and "false" default conversion
+     * (when not in strict() mode) to be matched in a case insensitive manner.
+     * @param enabled
+     */
+    insensitive(enabled?: boolean): this;
+}
+
+export interface NumberSchema extends AnySchema {
+    /**
+     * Specifies the minimum value.
+     * It can also be a reference to another field.
+     */
+    min(limit: number): this;
+    min(limit: Reference): this;
+
+    /**
+     * Specifies the maximum value.
+     * It can also be a reference to another field.
+     */
+    max(limit: number): this;
+    max(limit: Reference): this;
+
+    /**
+     * Specifies that the value must be greater than limit.
+     * It can also be a reference to another field.
+     */
+    greater(limit: number): this;
+    greater(limit: Reference): this;
+
+    /**
+     * Specifies that the value must be less than limit.
+     * It can also be a reference to another field.
+     */
+    less(limit: number): this;
+    less(limit: Reference): this;
+
+    /**
+     * Requires the number to be an integer (no floating point).
+     */
+    integer(): this;
+
+    /**
+     * Specifies the maximum number of decimal places where:
+     * @param limit - the maximum number of decimal places allowed.
+     */
+    precision(limit: number): this;
+
+    /**
+     * Specifies that the value must be a multiple of base.
+     */
+    multiple(base: number): this;
+
+    /**
+     * Requires the number to be positive.
+     */
+    positive(): this;
+
+    /**
+     * Requires the number to be negative.
+     */
+    negative(): this;
+}
+
+export interface StringSchema extends AnySchema {
+    /**
+     * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
+     */
+    insensitive(): this;
+
+    /**
+     * Specifies the minimum number string characters.
+     * @param limit - the minimum number of string characters required. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    min(limit: number, encoding?: string): this;
+    min(limit: Reference, encoding?: string): this;
+
+    /**
+     * Specifies the maximum number of string characters.
+     * @param limit - the maximum number of string characters allowed. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    max(limit: number, encoding?: string): this;
+    max(limit: Reference, encoding?: string): this;
+
+
+    /**
+     * Specifies whether the string.max() limit should be used as a truncation.
+     * @param enabled - optional parameter defaulting to true which allows you to reset the behavior of truncate by providing a falsy value.
+     */
+    truncate(enabled?: boolean): this;
+
+    /**
+     * Requires the string value to be in a unicode normalized form. If the validation convert option is on (enabled by default), the string will be normalized.
+     * @param form - The unicode normalization form to use. Valid values: NFC [default], NFD, NFKC, NFKD
+     */
+    normalize(form?: 'NFC' | 'NFD' | 'NFKC' | 'NFKD'): this;
+
+    /**
+     * Requires the number to be a credit card number (Using Lunh Algorithm).
+     */
+    creditCard(): this;
+
+    /**
+     * Specifies the exact string length required
+     * @param limit - the required string length. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    length(limit: number, encoding?: string): this;
+    length(limit: Reference, encoding?: string): this;
+
+    /**
+     * Defines a regular expression rule.
+     * @param pattern - a regular expression object the string value must match against.
+     * @param name - optional name for patterns (useful with multiple patterns). Defaults to 'required'.
+     */
+    regex(pattern: RegExp, name?: string): this;
+
+    /**
+     * Replace characters matching the given pattern with the specified replacement string where:
+     * @param pattern - a regular expression object to match against, or a string of which all occurrences will be replaced.
+     * @param replacement - the string that will replace the pattern.
+     */
+    replace(pattern: RegExp, replacement: string): this;
+    replace(pattern: string, replacement: string): this;
+
+    /**
+     * Requires the string value to only contain a-z, A-Z, and 0-9.
+     */
+    alphanum(): this;
+
+    /**
+     * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
+     */
+    token(): this;
+
+    /**
+     * Requires the string value to be a valid email address.
+     */
+    email(options?: EmailOptions): this;
+
+    /**
+     * Requires the string value to be a valid ip address.
+     */
+    ip(options?: IpOptions): this;
+
+    /**
+     * Requires the string value to be a valid RFC 3986 URI.
+     */
+    uri(options?: UriOptions): this;
+
+    /**
+     * Requires the string value to be a valid GUID.
+     */
+    guid(options?: GuidOptions): this;
+
+    /**
+     * Alias for `guid` -- Requires the string value to be a valid GUID
+     */
+    uuid(options?: GuidOptions): this;
+
+    /**
+     * Requires the string value to be a valid hexadecimal string.
+     */
+    hex(): this;
+
+    /**
+     * Requires the string value to be a valid hostname as per RFC1123.
+     */
+    hostname(): this;
+
+    /**
+     * Requires the string value to be in valid ISO 8601 date format.
+     */
+    isoDate(): this;
+
+    /**
+     * Requires the string value to be all lowercase. If the validation convert option is on (enabled by default), the string will be forced to lowercase.
+     */
+    lowercase(): this;
+
+    /**
+     * Requires the string value to be all uppercase. If the validation convert option is on (enabled by default), the string will be forced to uppercase.
+     */
+    uppercase(): this;
+
+    /**
+     * Requires the string value to contain no whitespace before or after. If the validation convert option is on (enabled by default), the string will be trimmed.
+     */
+    trim(): this;
+}
+
+export interface ArraySchema extends AnySchema {
+    /**
+     * Allow this array to be sparse.
+     * enabled can be used with a falsy value to go back to the default behavior.
+     */
+    sparse(enabled?: any): this;
+
+    /**
+     * Allow single values to be checked against rules as if it were provided as an array.
+     * enabled can be used with a falsy value to go back to the default behavior.
+     */
+    single(enabled?: any): this;
+
+    /**
+     * List the types allowed for the array values.
+     * type can be an array of values, or multiple values can be passed as individual arguments.
+     * If a given type is .required() then there must be a matching item in the array.
+     * If a type is .forbidden() then it cannot appear in the array.
+     * Required items can be added multiple times to signify that multiple items must be found.
+     * Errors will contain the number of items that didn't match.
+     * Any unmatched item having a label will be mentioned explicitly.
+     *
+     * @param type - a joi schema object to validate each array item against.
+     */
+    items(...types: SchemaLike[]): this;
+    items(types: SchemaLike[]): this;
+
+    /**
+     * Lists the types in sequence order for the array values where:
+     * @param type - a joi schema object to validate against each array item in sequence order. type can be an array of values, or multiple values can be passed as individual arguments.
+     * If a given type is .required() then there must be a matching item with the same index position in the array. Errors will contain the number of items that didn't match. Any unmatched item having a label will be mentioned explicitly.
+     */
+    ordered(...types: SchemaLike[]): this;
+    ordered(types: SchemaLike[]): this;
+
+    /**
+     * Specifies the minimum number of items in the array.
+     */
+    min(limit: number): this;
+
+    /**
+     * Specifies the maximum number of items in the array.
+     */
+    max(limit: number): this;
+
+    /**
+     * Specifies the exact number of items in the array.
+     */
+    length(limit: number): this;
+
+    /**
+     * Requires the array values to be unique.
+     * Be aware that a deep equality is performed on elements of the array having a type of object,
+     * a performance penalty is to be expected for this kind of operation.
+     */
+    unique(comparator?: string): this;
+    unique<T = any>(comparator?: (a: T, b: T) => boolean): this;
+}
+
+export interface ObjectSchema extends AnySchema {
+
+    /**
+     * Sets the allowed object keys.
+     */
+    keys(schema?: SchemaMap): this;
+
+    /**
+     * Specifies the minimum number of keys in the object.
+     */
+    min(limit: number): this;
+
+    /**
+     * Specifies the maximum number of keys in the object.
+     */
+    max(limit: number): this;
+
+    /**
+     * Specifies the exact number of keys in the object.
+     */
+    length(limit: number): this;
+
+    /**
+     * Specify validation rules for unknown keys matching a pattern.
+     */
+    pattern(regex: RegExp, schema: SchemaLike): this;
+
+    /**
+     * Defines an all-or-nothing relationship between keys where if one of the peers is present, all of them are required as well.
+     * @param peers - the key names of which if one present, all are required. peers can be a single string value,
+     * an array of string values, or each peer provided as an argument.
+     */
+    and(...peers: string[]): this;
+    and(peers: string[]): this;
+
+    /**
+     * Defines a relationship between keys where not all peers can be present at the same time.
+     * @param peers - the key names of which if one present, the others may not all be present.
+     * peers can be a single string value, an array of string values, or each peer provided as an argument.
+     */
+    nand(...peers: string[]): this;
+    nand(peers: string[]): this;
+
+    /**
+     * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
+     */
+    or(...peers: string[]): this;
+    or(peers: string[]): this;
+
+    /**
+     * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
+     */
+    xor(...peers: string[]): this;
+    xor(peers: string[]): this;
+
+    /**
+     * Requires the presence of other keys whenever the specified key is present.
+     */
+    with(key: string, peers: string): this;
+    with(key: string, peers: string[]): this;
+
+    /**
+     * Forbids the presence of other keys whenever the specified is present.
+     */
+    without(key: string, peers: string): this;
+    without(key: string, peers: string[]): this;
+
+    /**
+     * Renames a key to another name (deletes the renamed key).
+     */
+    rename(from: string, to: string, options?: RenameOptions): this;
+
+    /**
+     * Verifies an assertion where.
+     */
+    assert(ref: string, schema: SchemaLike, message?: string): this;
+    assert(ref: Reference, schema: SchemaLike, message?: string): this;
+
+    /**
+     * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
+     */
+    unknown(allow?: boolean): this;
+
+    /**
+     * Requires the object to be an instance of a given constructor.
+     *
+     * @param constructor - the constructor function that the object must be an instance of.
+     * @param name - an alternate name to use in validation errors. This is useful when the constructor function does not have a name.
+     */
+    type(constructor: Function, name?: string): this;
+
+    /**
+     * Sets the specified children to required.
+     *
+     * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+     *
+     *   var schema = Joi.object().keys({ a: { b: Joi.number() }, c: { d: Joi.string() } });
+     *   var requiredSchema = schema.requiredKeys('', 'a.b', 'c', 'c.d');
+     *
+     * Note that in this example '' means the current object, a is not required but b is, as well as c and d.
+     */
+    requiredKeys(children: string[]): this;
+    requiredKeys(...children: string[]): this;
+
+    /**
+     * Sets the specified children to optional.
+     *
+     * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+     *
+     * The behavior is exactly the same as requiredKeys.
+     */
+    optionalKeys(children: string[]): this;
+    optionalKeys(...children: string[]): this;
+}
+
+export interface BinarySchema extends AnySchema {
+    /**
+     * Sets the string encoding format if a string input is converted to a buffer.
+     */
+    encoding(encoding: string): this;
+
+    /**
+     * Specifies the minimum length of the buffer.
+     */
+    min(limit: number): this;
+
+    /**
+     * Specifies the maximum length of the buffer.
+     */
+    max(limit: number): this;
+
+    /**
+     * Specifies the exact length of the buffer:
+     */
+    length(limit: number): this;
+}
+
+export interface DateSchema extends AnySchema {
+
+    /**
+     * Specifies the oldest date allowed.
+     * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+     * allowing to explicitly ensure a date is either in the past or in the future.
+     * It can also be a reference to another field.
+     */
+    min(date: Date): this;
+    min(date: number): this;
+    min(date: string): this;
+    min(date: Reference): this;
+
+    /**
+     * Specifies the latest date allowed.
+     * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+     * allowing to explicitly ensure a date is either in the past or in the future.
+     * It can also be a reference to another field.
+     */
+    max(date: Date): this;
+    max(date: number): this;
+    max(date: string): this;
+    max(date: Reference): this;
+
+    /**
+     * Specifies the allowed date format:
+     * @param format - string or array of strings that follow the moment.js format.
+     */
+    format(format: string): this;
+    format(format: string[]): this;
+
+    /**
+     * Requires the string value to be in valid ISO 8601 date format.
+     */
+    iso(): this;
+
+    /**
+     * Requires the value to be a timestamp interval from Unix Time.
+     * @param type - the type of timestamp (allowed values are unix or javascript [default])
+     */
+    timestamp(type?: 'javascript' | 'unix'): this;
+}
+
+export interface FunctionSchema extends AnySchema {
+
+    /**
+     * Specifies the arity of the function where:
+     * @param n - the arity expected.
+     */
+    arity(n: number): this;
+
+    /**
+     * Specifies the minimal arity of the function where:
+     * @param n - the minimal arity expected.
+     */
+    minArity(n: number): this;
+
+    /**
+     * Specifies the minimal arity of the function where:
+     * @param n - the minimal arity expected.
+     */
+    maxArity(n: number): this;
+
+    /**
+     * Requires the function to be a Joi reference.
+     */
+    ref(): this;
+}
+
+export interface AlternativesSchema extends AnySchema {
+    try(types: SchemaLike[]): this;
+    try(...types: SchemaLike[]): this;
+    when(ref: string, options: WhenOptions): this;
+    when(ref: Reference, options: WhenOptions): this;
+}
+
+export interface LazySchema extends AnySchema {
+
+}
+
+export interface Reference extends JoiObject {
+    (value: any, validationOptions: ValidationOptions): any;
+    isContext: boolean;
+    key: string;
+    path: string;
+    toString(): string;
+}
+
+export type ExtensionBoundSchema = Schema & {
+    /**
+     * Creates a joi error object.
+     * Used in conjunction with custom rules.
+     * @param type - the type of rule to create the error for.
+     * @param context - provide properties that will be available in the `language` templates.
+     * @param state - should the context passed into the `validate` function in a custom rule
+     * @param options - should the context passed into the `validate` function in a custom rule
+     */
+    createError(type: string, context: Context, state: State, options: ValidationOptions): Err;
+}
+
+export interface Rules<P extends object = any> {
+    name: string;
+    params?: ObjectSchema | {[key in keyof P]: SchemaLike; };
+    setup?(this: ExtensionBoundSchema, params: P): Schema | void;
+    validate?<R = any>(this: ExtensionBoundSchema, params: P, value: any, state: State, options: ValidationOptions): Err | R;
+    description?: string | ((params: P) => string);
+}
+
+export interface Extension {
+    name: string;
+    base?: Schema;
+    language?: LanguageOptions;
+    coerce?<R = any>(this: ExtensionBoundSchema, value: any, state: State, options: ValidationOptions): Err | R;
+    pre?<R = any>(this: ExtensionBoundSchema, value: any, state: State, options: ValidationOptions): Err | R;
+    describe?(this: Schema, description: Description): Description;
+    rules?: Rules[];
+}
+
+export interface Err extends JoiObject {
+    toString(): string;
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+/**
+ * Current version of the joi package.
+ */
+export const version: string;
+
+/**
+ * Generates a schema object that matches any data type.
+ */
+export function any(): AnySchema;
+
+/**
+ * Generates a schema object that matches an array data type.
+ */
+export function array(): ArraySchema;
+
+/**
+ * Generates a schema object that matches a boolean data type (as well as the strings 'true', 'false', 'yes', and 'no'). Can also be called via bool().
+ */
+export function bool(): BooleanSchema;
+
+export function boolean(): BooleanSchema;
+
+/**
+ * Generates a schema object that matches a Buffer data type (as well as the strings which will be converted to Buffers).
+ */
+export function binary(): BinarySchema;
+
+/**
+ * Generates a schema object that matches a date type (as well as a JavaScript date string or number of milliseconds).
+ */
+export function date(): DateSchema;
+
+/**
+ * Generates a schema object that matches a function type.
+ */
+export function func(): FunctionSchema;
+
+/**
+ * Generates a schema object that matches a number data type (as well as strings that can be converted to numbers).
+ */
+export function number(): NumberSchema;
+
+/**
+ * Generates a schema object that matches an object data type (as well as JSON strings that parsed into objects).
+ */
+export function object(schema?: SchemaMap): ObjectSchema;
+
+/**
+ * Generates a schema object that matches a string data type. Note that empty strings are not allowed by default and must be enabled with allow('').
+ */
+export function string(): StringSchema;
+
+/**
+ * Generates a type that will match one of the provided alternative schemas
+ */
+export function alternatives(types: SchemaLike[]): AlternativesSchema;
+export function alternatives(...types: SchemaLike[]): AlternativesSchema;
+
+/**
+ * Alias for `alternatives`
+ */
+export function alt(types: SchemaLike[]): AlternativesSchema;
+export function alt(...types: SchemaLike[]): AlternativesSchema;
+
+/**
+ * Generates a placeholder schema for a schema that you would provide with the fn.
+ * Supports the same methods of the any() type.
+ * This is mostly useful for recursive schemas
+ */
+export function lazy(cb: () => Schema): LazySchema;
+
+/**
+ * Validates a value using the given schema and options.
+ */
+export function validate<T>(value: T, schema: SchemaLike): ValidationResult<T>;
+export function validate<T, R>(value: T, schema: SchemaLike, callback: (err: ValidationError, value: T) => R): R;
+
+export function validate<T>(value: T, schema: SchemaLike, options: ValidationOptions): ValidationResult<T>;
+export function validate<T, R>(value: T, schema: SchemaLike, options: ValidationOptions, callback: (err: ValidationError, value: T) => R): R;
+
+/**
+ * Converts literal schema definition to joi schema object (or returns the same back if already a joi schema object).
+ */
+export function compile(schema: SchemaLike): Schema;
+export function compile<T extends Schema>(schema: SchemaLike): T;
+
+/**
+ * Validates a value against a schema and throws if validation fails.
+ *
+ * @param value - the value to validate.
+ * @param schema - the schema object.
+ * @param message - optional message string prefix added in front of the error message. may also be an Error object.
+ */
+export function assert(value: any, schema: SchemaLike, message?: string | Error): void;
+
+/**
+ * Validates a value against a schema, returns valid object, and throws if validation fails where:
+ *
+ * @param value - the value to validate.
+ * @param schema - the schema object.
+ * @param message - optional message string prefix added in front of the error message. may also be an Error object.
+ */
+export function attempt<T>(value: T, schema: SchemaLike, message?: string | Error): T;
+
+/**
+ * Generates a reference to the value of the named key.
+ */
+export function ref(key: string, options?: ReferenceOptions): Reference;
+
+/**
+ * Checks whether or not the provided argument is a reference. It's especially useful if you want to post-process error messages.
+ */
+export function isRef(ref: any): ref is Reference;
+
+/**
+ * Get a sub-schema of an existing schema based on a path. Path separator is a dot (.).
+ */
+export function reach(schema: ObjectSchema, path: string): Schema;
+export function reach<T extends Schema>(schema: ObjectSchema, path: string): T;
+
+/**
+ * Creates a new Joi instance customized with the extension(s) you provide included.
+ */
+export function extend(extention: Extension): any;
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+// Below are undocumented APIs. use at your own risk
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+/**
+ * Returns a plain object representing the schema's rules and properties
+ */
+export function describe(schema: Schema): Description;
+
+/**
+* Whitelists a value
+*/
+export function allow(value: any, ...values: any[]): Schema;
+export function allow(values: any[]): Schema;
+
+/**
+ * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
+ */
+export function valid(value: any, ...values: any[]): Schema;
+export function valid(values: any[]): Schema;
+export function only(value: any, ...values: any[]): Schema;
+export function only(values: any[]): Schema;
+export function equal(value: any, ...values: any[]): Schema;
+export function equal(values: any[]): Schema;
+
+/**
+ * Blacklists a value
+ */
+export function invalid(value: any, ...values: any[]): Schema;
+export function invalid(values: any[]): Schema;
+export function disallow(value: any, ...values: any[]): Schema;
+export function disallow(values: any[]): Schema;
+export function not(value: any, ...values: any[]): Schema;
+export function not(values: any[]): Schema;
+
+/**
+ * Marks a key as required which will not allow undefined as value. All keys are optional by default.
+ */
+export function required(): Schema;
+
+/**
+ * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
+ */
+export function optional(): Schema;
+
+/**
+ * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
+ */
+export function forbidden(): Schema;
+
+/**
+ * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
+ */
+export function strip(): Schema;
+
+/**
+ * Annotates the key
+ */
+export function description(desc: string): Schema;
+
+/**
+ * Annotates the key
+ */
+export function notes(notes: string): Schema;
+export function notes(notes: string[]): Schema;
+
+/**
+ * Annotates the key
+ */
+export function tags(notes: string): Schema;
+export function tags(notes: string[]): Schema;
+
+/**
+ * Attaches metadata to the key.
+ */
+export function meta(meta: object): Schema;
+
+/**
+ * Annotates the key with an example value, must be valid.
+ */
+export function example(value: any): Schema;
+
+/**
+ * Annotates the key with an unit name.
+ */
+export function unit(name: string): Schema;
+
+/**
+ * Overrides the global validate() options for the current key and any sub-key.
+ */
+export function options(options: ValidationOptions): Schema;
+
+/**
+ * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
+ */
+export function strict(isStrict?: boolean): Schema;
+
+/**
+ * Returns a new type that is the result of adding the rules of one type to another.
+ */
+export function concat<T>(schema: T): T;
+
+/**
+ * Converts the type into an alternatives type where the conditions are merged into the type definition where:
+ */
+export function when(ref: string, options: WhenOptions): AlternativesSchema;
+export function when(ref: Reference, options: WhenOptions): AlternativesSchema;
+
+/**
+ * Overrides the key name in error messages.
+ */
+export function label(name: string): Schema;
+
+/**
+ * Outputs the original untouched value instead of the casted value.
+ */
+export function raw(isRaw?: boolean): Schema;
+
+/**
+ * Considers anything that matches the schema to be empty (undefined).
+ * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
+ */
+export function empty(schema?: any): Schema;
diff --git a/types/joi/v10/joi-tests.ts b/types/joi/v10/joi-tests.ts
new file mode 100644
index 0000000000..bfc6268ef7
--- /dev/null
+++ b/types/joi/v10/joi-tests.ts
@@ -0,0 +1,1016 @@
+import Joi = require('joi');
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var x: any = null;
+var value: any = null;
+var num: number = 0;
+var str: string = '';
+var bool: boolean = false;
+var exp: RegExp = null;
+var obj: object = null;
+var date: Date = null;
+var err: Error = null;
+var func: Function = null;
+
+var anyArr: any[] = [];
+var numArr: number[] = [];
+var strArr: string[] = [];
+var boolArr: boolean[] = [];
+var expArr: RegExp[] = [];
+var objArr: object[] = [];
+var errArr: Error[] = [];
+var funcArr: Function[] = [];
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var schema: Joi.Schema = null;
+var schemaLike: Joi.SchemaLike = null;
+
+var anySchema: Joi.AnySchema = null;
+var numSchema: Joi.NumberSchema = null;
+var strSchema: Joi.StringSchema = null;
+var arrSchema: Joi.ArraySchema = null;
+var boolSchema: Joi.BooleanSchema = null;
+var binSchema: Joi.BinarySchema = null;
+var dateSchema: Joi.DateSchema = null;
+var funcSchema: Joi.FunctionSchema = null;
+var objSchema: Joi.ObjectSchema = null;
+var altSchema: Joi.AlternativesSchema = null;
+
+var schemaArr: Joi.Schema[] = [];
+
+var ref: Joi.Reference = null;
+var description: Joi.Description = null;
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var validOpts: Joi.ValidationOptions = null;
+
+validOpts = { abortEarly: bool };
+validOpts = { convert: bool };
+validOpts = { allowUnknown: bool };
+validOpts = { skipFunctions: bool };
+validOpts = { stripUnknown: bool };
+validOpts = { stripUnknown: { arrays: bool } };
+validOpts = { stripUnknown: { objects: bool } };
+validOpts = { stripUnknown: { arrays: bool, objects: bool } };
+validOpts = { presence: 'optional' || 'required' || 'forbidden' };
+validOpts = { context: obj };
+validOpts = { noDefaults: bool };
+validOpts = {
+    language: {
+        root: str,
+        key: str,
+        messages: { wrapArrays: bool },
+        string: { base: str },
+        number: { base: str },
+        object: {
+            base: false,
+            children: { childRule: str }
+        },
+        customType: {
+            customRule: str
+        }
+    }
+};
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var renOpts: Joi.RenameOptions = null;
+
+renOpts = { alias: bool };
+renOpts = { multiple: bool };
+renOpts = { override: bool };
+renOpts = { ignoreUndefined: bool };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var emailOpts: Joi.EmailOptions = null;
+
+emailOpts = { errorLevel: num };
+emailOpts = { errorLevel: bool };
+emailOpts = { tldWhitelist: strArr };
+emailOpts = { tldWhitelist: obj };
+emailOpts = { minDomainAtoms: num };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var ipOpts: Joi.IpOptions = null;
+
+ipOpts = { version: str };
+ipOpts = { version: strArr };
+ipOpts = { cidr: str };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var uriOpts: Joi.UriOptions = null;
+
+uriOpts = { scheme: str };
+uriOpts = { scheme: exp };
+uriOpts = { scheme: strArr };
+uriOpts = { scheme: expArr };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var whenOpts: Joi.WhenOptions = null;
+
+whenOpts = { is: x };
+whenOpts = { is: schema, then: schema };
+whenOpts = { is: schema, otherwise: schema };
+whenOpts = { is: schemaLike, then: schemaLike, otherwise: schemaLike };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var refOpts: Joi.ReferenceOptions = null;
+
+refOpts = { separator: str };
+refOpts = { contextPrefix: str };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var validErr: Joi.ValidationError = null;
+var validErrItem: Joi.ValidationErrorItem;
+var validErrFunc: Joi.ValidationErrorFunction;
+
+validErrItem = {
+    message: str,
+    type: str,
+    path: str
+};
+
+validErrItem = {
+    message: str,
+    type: str,
+    path: str,
+    options: validOpts,
+    context: obj
+};
+
+validErrFunc = errs => errs;
+validErrFunc = errs => errs[0];
+validErrFunc = errs => 'Some error';
+validErrFunc = errs => err;
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+schema = anySchema;
+schema = numSchema;
+schema = strSchema;
+schema = arrSchema;
+schema = boolSchema;
+schema = binSchema;
+schema = dateSchema;
+schema = funcSchema;
+schema = objSchema;
+
+anySchema = anySchema;
+anySchema = numSchema;
+anySchema = strSchema;
+anySchema = arrSchema;
+anySchema = boolSchema;
+anySchema = binSchema;
+anySchema = dateSchema;
+anySchema = funcSchema;
+anySchema = objSchema;
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+var schemaMap: Joi.SchemaMap = null;
+
+schemaMap = {
+    a: numSchema,
+    b: strSchema
+};
+schemaMap = {
+    a: numSchema,
+    b: {
+        b1: strSchema,
+        b2: anySchema
+    }
+};
+schemaMap = {
+    a: numSchema,
+    b: [
+        { b1: strSchema },
+        { b2: anySchema }
+    ],
+    c: arrSchema,
+    d: schemaLike
+};
+schemaMap = {
+    a: 1,
+    b: {
+        b1: '1',
+        b2: 2
+    },
+    c: [
+        { c1: true },
+        { c2: null }
+    ]
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+anySchema = Joi.any();
+
+namespace common {
+    anySchema = anySchema.allow(x);
+    anySchema = anySchema.allow(x, x);
+    anySchema = anySchema.allow([x, x, x]);
+    anySchema = anySchema.valid(x);
+    anySchema = anySchema.valid(x, x);
+    anySchema = anySchema.valid([x, x, x]);
+    anySchema = anySchema.only(x);
+    anySchema = anySchema.only(x, x);
+    anySchema = anySchema.only([x, x, x]);
+    anySchema = anySchema.equal(x);
+    anySchema = anySchema.equal(x, x);
+    anySchema = anySchema.equal([x, x, x]);
+    anySchema = anySchema.invalid(x);
+    anySchema = anySchema.invalid(x, x);
+    anySchema = anySchema.invalid([x, x, x]);
+    anySchema = anySchema.disallow(x);
+    anySchema = anySchema.disallow(x, x);
+    anySchema = anySchema.disallow([x, x, x]);
+    anySchema = anySchema.not(x);
+    anySchema = anySchema.not(x, x);
+    anySchema = anySchema.not([x, x, x]);
+
+    anySchema = anySchema.default();
+    anySchema = anySchema.default(x);
+    anySchema = anySchema.default(x, str);
+
+    anySchema = anySchema.required();
+    anySchema = anySchema.optional();
+    anySchema = anySchema.forbidden();
+    anySchema = anySchema.strip();
+
+    anySchema = anySchema.description(str);
+    anySchema = anySchema.notes(str);
+    anySchema = anySchema.notes(strArr);
+    anySchema = anySchema.tags(str);
+    anySchema = anySchema.tags(strArr);
+
+    anySchema = anySchema.meta(obj);
+    anySchema = anySchema.example(obj);
+    anySchema = anySchema.unit(str);
+
+    anySchema = anySchema.options(validOpts);
+    anySchema = anySchema.strict();
+    anySchema = anySchema.strict(bool);
+    anySchema = anySchema.concat(x);
+
+    altSchema = anySchema.when(str, whenOpts);
+    altSchema = anySchema.when(ref, whenOpts);
+
+    anySchema = anySchema.label(str);
+    anySchema = anySchema.raw();
+    anySchema = anySchema.raw(bool);
+    anySchema = anySchema.empty();
+    anySchema = anySchema.empty(str);
+    anySchema = anySchema.empty(anySchema);
+
+    anySchema = anySchema.error(err);
+    anySchema = anySchema.error(validErrFunc);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+arrSchema = Joi.array();
+
+arrSchema = arrSchema.sparse();
+arrSchema = arrSchema.sparse(bool);
+arrSchema = arrSchema.single();
+arrSchema = arrSchema.single(bool);
+arrSchema = arrSchema.ordered(anySchema);
+arrSchema = arrSchema.ordered(anySchema, numSchema, strSchema, arrSchema, boolSchema, binSchema, dateSchema, funcSchema, objSchema, schemaLike);
+arrSchema = arrSchema.ordered(schemaMap);
+arrSchema = arrSchema.ordered([schemaMap, schemaMap, schemaLike]);
+arrSchema = arrSchema.min(num);
+arrSchema = arrSchema.max(num);
+arrSchema = arrSchema.length(num);
+arrSchema = arrSchema.unique();
+arrSchema = arrSchema.unique((a, b) => a.test === b.test);
+arrSchema = arrSchema.unique('customer.id');
+
+
+arrSchema = arrSchema.items(numSchema);
+arrSchema = arrSchema.items(numSchema, strSchema, schemaLike);
+arrSchema = arrSchema.items([numSchema, strSchema, schemaLike]);
+arrSchema = arrSchema.items(schemaMap);
+arrSchema = arrSchema.items(schemaMap, schemaMap, schemaLike);
+arrSchema = arrSchema.items([schemaMap, schemaMap, schemaLike]);
+
+// - - - - - - - -
+
+namespace common_copy_paste {
+    // use search & replace from any
+    arrSchema = arrSchema.allow(x);
+    arrSchema = arrSchema.allow(x, x);
+    arrSchema = arrSchema.allow([x, x, x]);
+    arrSchema = arrSchema.valid(x);
+    arrSchema = arrSchema.valid(x, x);
+    arrSchema = arrSchema.valid([x, x, x]);
+    arrSchema = arrSchema.only(x);
+    arrSchema = arrSchema.only(x, x);
+    arrSchema = arrSchema.only([x, x, x]);
+    arrSchema = arrSchema.equal(x);
+    arrSchema = arrSchema.equal(x, x);
+    arrSchema = arrSchema.equal([x, x, x]);
+    arrSchema = arrSchema.invalid(x);
+    arrSchema = arrSchema.invalid(x, x);
+    arrSchema = arrSchema.invalid([x, x, x]);
+    arrSchema = arrSchema.disallow(x);
+    arrSchema = arrSchema.disallow(x, x);
+    arrSchema = arrSchema.disallow([x, x, x]);
+    arrSchema = arrSchema.not(x);
+    arrSchema = arrSchema.not(x, x);
+    arrSchema = arrSchema.not([x, x, x]);
+
+    arrSchema = arrSchema.default(x);
+
+    arrSchema = arrSchema.required();
+    arrSchema = arrSchema.optional();
+    arrSchema = arrSchema.forbidden();
+
+    arrSchema = arrSchema.description(str);
+    arrSchema = arrSchema.notes(str);
+    arrSchema = arrSchema.notes(strArr);
+    arrSchema = arrSchema.tags(str);
+    arrSchema = arrSchema.tags(strArr);
+
+    arrSchema = arrSchema.meta(obj);
+    arrSchema = arrSchema.example(obj);
+    arrSchema = arrSchema.unit(str);
+
+    arrSchema = arrSchema.options(validOpts);
+    arrSchema = arrSchema.strict();
+    arrSchema = arrSchema.concat(x);
+
+    altSchema = arrSchema.when(str, whenOpts);
+    altSchema = arrSchema.when(ref, whenOpts);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+boolSchema = Joi.bool();
+boolSchema = Joi.boolean();
+
+namespace common_copy_paste {
+    boolSchema = boolSchema.allow(x);
+    boolSchema = boolSchema.allow(x, x);
+    boolSchema = boolSchema.allow([x, x, x]);
+    boolSchema = boolSchema.valid(x);
+    boolSchema = boolSchema.valid(x, x);
+    boolSchema = boolSchema.valid([x, x, x]);
+    boolSchema = boolSchema.only(x);
+    boolSchema = boolSchema.only(x, x);
+    boolSchema = boolSchema.only([x, x, x]);
+    boolSchema = boolSchema.equal(x);
+    boolSchema = boolSchema.equal(x, x);
+    boolSchema = boolSchema.equal([x, x, x]);
+    boolSchema = boolSchema.invalid(x);
+    boolSchema = boolSchema.invalid(x, x);
+    boolSchema = boolSchema.invalid([x, x, x]);
+    boolSchema = boolSchema.disallow(x);
+    boolSchema = boolSchema.disallow(x, x);
+    boolSchema = boolSchema.disallow([x, x, x]);
+    boolSchema = boolSchema.not(x);
+    boolSchema = boolSchema.not(x, x);
+    boolSchema = boolSchema.not([x, x, x]);
+
+    boolSchema = boolSchema.default(x);
+
+    boolSchema = boolSchema.required();
+    boolSchema = boolSchema.optional();
+    boolSchema = boolSchema.forbidden();
+
+    boolSchema = boolSchema.description(str);
+    boolSchema = boolSchema.notes(str);
+    boolSchema = boolSchema.notes(strArr);
+    boolSchema = boolSchema.tags(str);
+    boolSchema = boolSchema.tags(strArr);
+
+    boolSchema = boolSchema.meta(obj);
+    boolSchema = boolSchema.example(obj);
+    boolSchema = boolSchema.unit(str);
+
+    boolSchema = boolSchema.options(validOpts);
+    boolSchema = boolSchema.strict();
+    boolSchema = boolSchema.concat(x);
+
+    boolSchema = boolSchema.truthy(str);
+    boolSchema = boolSchema.truthy(num);
+    boolSchema = boolSchema.truthy(strArr);
+    boolSchema = boolSchema.truthy(numArr);
+    boolSchema = boolSchema.truthy(str, str);
+    boolSchema = boolSchema.truthy(strArr, str);
+    boolSchema = boolSchema.truthy(str, strArr);
+    boolSchema = boolSchema.truthy(strArr, strArr);
+    boolSchema = boolSchema.falsy(str);
+    boolSchema = boolSchema.falsy(num);
+    boolSchema = boolSchema.falsy(strArr);
+    boolSchema = boolSchema.falsy(numArr);
+    boolSchema = boolSchema.falsy(str, str);
+    boolSchema = boolSchema.falsy(strArr, str);
+    boolSchema = boolSchema.falsy(str, strArr);
+    boolSchema = boolSchema.falsy(strArr, strArr);
+    boolSchema = boolSchema.insensitive(bool);
+
+    altSchema = boolSchema.when(str, whenOpts);
+    altSchema = boolSchema.when(ref, whenOpts);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+binSchema = Joi.binary();
+
+binSchema = binSchema.encoding(str);
+binSchema = binSchema.min(num);
+binSchema = binSchema.max(num);
+binSchema = binSchema.length(num);
+
+namespace common {
+    binSchema = binSchema.allow(x);
+    binSchema = binSchema.allow(x, x);
+    binSchema = binSchema.allow([x, x, x]);
+    binSchema = binSchema.valid(x);
+    binSchema = binSchema.valid(x, x);
+    binSchema = binSchema.valid([x, x, x]);
+    binSchema = binSchema.only(x);
+    binSchema = binSchema.only(x, x);
+    binSchema = binSchema.only([x, x, x]);
+    binSchema = binSchema.equal(x);
+    binSchema = binSchema.equal(x, x);
+    binSchema = binSchema.equal([x, x, x]);
+    binSchema = binSchema.invalid(x);
+    binSchema = binSchema.invalid(x, x);
+    binSchema = binSchema.invalid([x, x, x]);
+    binSchema = binSchema.disallow(x);
+    binSchema = binSchema.disallow(x, x);
+    binSchema = binSchema.disallow([x, x, x]);
+    binSchema = binSchema.not(x);
+    binSchema = binSchema.not(x, x);
+    binSchema = binSchema.not([x, x, x]);
+
+    binSchema = binSchema.default(x);
+
+    binSchema = binSchema.required();
+    binSchema = binSchema.optional();
+    binSchema = binSchema.forbidden();
+
+    binSchema = binSchema.description(str);
+    binSchema = binSchema.notes(str);
+    binSchema = binSchema.notes(strArr);
+    binSchema = binSchema.tags(str);
+    binSchema = binSchema.tags(strArr);
+
+    binSchema = binSchema.meta(obj);
+    binSchema = binSchema.example(obj);
+    binSchema = binSchema.unit(str);
+
+    binSchema = binSchema.options(validOpts);
+    binSchema = binSchema.strict();
+    binSchema = binSchema.concat(x);
+
+    altSchema = binSchema.when(str, whenOpts);
+    altSchema = binSchema.when(ref, whenOpts);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+dateSchema = Joi.date();
+
+dateSchema = dateSchema.min(date);
+dateSchema = dateSchema.max(date);
+
+dateSchema = dateSchema.min(str);
+dateSchema = dateSchema.max(str);
+
+dateSchema = dateSchema.min(num);
+dateSchema = dateSchema.max(num);
+
+dateSchema = dateSchema.min(ref);
+dateSchema = dateSchema.max(ref);
+
+dateSchema = dateSchema.format(str);
+dateSchema = dateSchema.format(strArr);
+
+dateSchema = dateSchema.iso();
+
+dateSchema = dateSchema.timestamp();
+dateSchema = dateSchema.timestamp('javascript');
+dateSchema = dateSchema.timestamp('unix');
+
+namespace common {
+    dateSchema = dateSchema.allow(x);
+    dateSchema = dateSchema.allow(x, x);
+    dateSchema = dateSchema.allow([x, x, x]);
+    dateSchema = dateSchema.valid(x);
+    dateSchema = dateSchema.valid(x, x);
+    dateSchema = dateSchema.valid([x, x, x]);
+    dateSchema = dateSchema.only(x);
+    dateSchema = dateSchema.only(x, x);
+    dateSchema = dateSchema.only([x, x, x]);
+    dateSchema = dateSchema.equal(x);
+    dateSchema = dateSchema.equal(x, x);
+    dateSchema = dateSchema.equal([x, x, x]);
+    dateSchema = dateSchema.invalid(x);
+    dateSchema = dateSchema.invalid(x, x);
+    dateSchema = dateSchema.invalid([x, x, x]);
+    dateSchema = dateSchema.disallow(x);
+    dateSchema = dateSchema.disallow(x, x);
+    dateSchema = dateSchema.disallow([x, x, x]);
+    dateSchema = dateSchema.not(x);
+    dateSchema = dateSchema.not(x, x);
+    dateSchema = dateSchema.not([x, x, x]);
+
+    dateSchema = dateSchema.default(x);
+
+    dateSchema = dateSchema.required();
+    dateSchema = dateSchema.optional();
+    dateSchema = dateSchema.forbidden();
+
+    dateSchema = dateSchema.description(str);
+    dateSchema = dateSchema.notes(str);
+    dateSchema = dateSchema.notes(strArr);
+    dateSchema = dateSchema.tags(str);
+    dateSchema = dateSchema.tags(strArr);
+
+    dateSchema = dateSchema.meta(obj);
+    dateSchema = dateSchema.example(obj);
+    dateSchema = dateSchema.unit(str);
+
+    dateSchema = dateSchema.options(validOpts);
+    dateSchema = dateSchema.strict();
+    dateSchema = dateSchema.concat(x);
+
+    altSchema = dateSchema.when(str, whenOpts);
+    altSchema = dateSchema.when(ref, whenOpts);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+funcSchema = Joi.func();
+
+funcSchema = funcSchema.arity(num);
+funcSchema = funcSchema.minArity(num);
+funcSchema = funcSchema.maxArity(num);
+funcSchema = funcSchema.ref();
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+numSchema = Joi.number();
+
+numSchema = numSchema.min(num);
+numSchema = numSchema.min(ref);
+numSchema = numSchema.max(num);
+numSchema = numSchema.max(ref);
+numSchema = numSchema.greater(num);
+numSchema = numSchema.greater(ref);
+numSchema = numSchema.less(num);
+numSchema = numSchema.less(ref);
+numSchema = numSchema.integer();
+numSchema = numSchema.precision(num);
+numSchema = numSchema.multiple(num);
+numSchema = numSchema.positive();
+numSchema = numSchema.negative();
+
+namespace common {
+    numSchema = numSchema.allow(x);
+    numSchema = numSchema.allow(x, x);
+    numSchema = numSchema.allow([x, x, x]);
+    numSchema = numSchema.valid(x);
+    numSchema = numSchema.valid(x, x);
+    numSchema = numSchema.valid([x, x, x]);
+    numSchema = numSchema.only(x);
+    numSchema = numSchema.only(x, x);
+    numSchema = numSchema.only([x, x, x]);
+    numSchema = numSchema.equal(x);
+    numSchema = numSchema.equal(x, x);
+    numSchema = numSchema.equal([x, x, x]);
+    numSchema = numSchema.invalid(x);
+    numSchema = numSchema.invalid(x, x);
+    numSchema = numSchema.invalid([x, x, x]);
+    numSchema = numSchema.disallow(x);
+    numSchema = numSchema.disallow(x, x);
+    numSchema = numSchema.disallow([x, x, x]);
+    numSchema = numSchema.not(x);
+    numSchema = numSchema.not(x, x);
+    numSchema = numSchema.not([x, x, x]);
+
+    numSchema = numSchema.default(x);
+
+    numSchema = numSchema.required();
+    numSchema = numSchema.optional();
+    numSchema = numSchema.forbidden();
+
+    numSchema = numSchema.description(str);
+    numSchema = numSchema.notes(str);
+    numSchema = numSchema.notes(strArr);
+    numSchema = numSchema.tags(str);
+    numSchema = numSchema.tags(strArr);
+
+    numSchema = numSchema.meta(obj);
+    numSchema = numSchema.example(obj);
+    numSchema = numSchema.unit(str);
+
+    numSchema = numSchema.options(validOpts);
+    numSchema = numSchema.strict();
+    numSchema = numSchema.concat(x);
+
+    altSchema = numSchema.when(str, whenOpts);
+    altSchema = numSchema.when(ref, whenOpts);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+objSchema = Joi.object();
+objSchema = Joi.object(schemaMap);
+
+objSchema = objSchema.keys();
+objSchema = objSchema.keys(schemaMap);
+
+objSchema = objSchema.min(num);
+objSchema = objSchema.max(num);
+objSchema = objSchema.length(num);
+
+objSchema = objSchema.pattern(exp, schema);
+objSchema = objSchema.pattern(exp, schemaLike);
+
+objSchema = objSchema.and(str);
+objSchema = objSchema.and(str, str);
+objSchema = objSchema.and(str, str, str);
+objSchema = objSchema.and(strArr);
+
+objSchema = objSchema.nand(str);
+objSchema = objSchema.nand(str, str);
+objSchema = objSchema.nand(str, str, str);
+objSchema = objSchema.nand(strArr);
+
+objSchema = objSchema.or(str);
+objSchema = objSchema.or(str, str);
+objSchema = objSchema.or(str, str, str);
+objSchema = objSchema.or(strArr);
+
+objSchema = objSchema.xor(str);
+objSchema = objSchema.xor(str, str);
+objSchema = objSchema.xor(str, str, str);
+objSchema = objSchema.xor(strArr);
+
+objSchema = objSchema.with(str, str);
+objSchema = objSchema.with(str, strArr);
+
+objSchema = objSchema.without(str, str);
+objSchema = objSchema.without(str, strArr);
+
+objSchema = objSchema.rename(str, str);
+objSchema = objSchema.rename(str, str, renOpts);
+
+objSchema = objSchema.assert(str, schema);
+objSchema = objSchema.assert(str, schema, str);
+objSchema = objSchema.assert(ref, schema);
+objSchema = objSchema.assert(ref, schema, str);
+
+objSchema = objSchema.unknown();
+objSchema = objSchema.unknown(bool);
+
+objSchema = objSchema.type(func);
+objSchema = objSchema.type(func, str);
+
+objSchema = objSchema.requiredKeys(str);
+objSchema = objSchema.requiredKeys(str, str);
+objSchema = objSchema.requiredKeys(strArr);
+
+objSchema = objSchema.optionalKeys(str);
+objSchema = objSchema.optionalKeys(str, str);
+objSchema = objSchema.optionalKeys(strArr);
+
+namespace common {
+    objSchema = objSchema.allow(x);
+    objSchema = objSchema.allow(x, x);
+    objSchema = objSchema.allow([x, x, x]);
+    objSchema = objSchema.valid(x);
+    objSchema = objSchema.valid(x, x);
+    objSchema = objSchema.valid([x, x, x]);
+    objSchema = objSchema.only(x);
+    objSchema = objSchema.only(x, x);
+    objSchema = objSchema.only([x, x, x]);
+    objSchema = objSchema.equal(x);
+    objSchema = objSchema.equal(x, x);
+    objSchema = objSchema.equal([x, x, x]);
+    objSchema = objSchema.invalid(x);
+    objSchema = objSchema.invalid(x, x);
+    objSchema = objSchema.invalid([x, x, x]);
+    objSchema = objSchema.disallow(x);
+    objSchema = objSchema.disallow(x, x);
+    objSchema = objSchema.disallow([x, x, x]);
+    objSchema = objSchema.not(x);
+    objSchema = objSchema.not(x, x);
+    objSchema = objSchema.not([x, x, x]);
+
+    objSchema = objSchema.default(x);
+
+    objSchema = objSchema.required();
+    objSchema = objSchema.optional();
+    objSchema = objSchema.forbidden();
+
+    objSchema = objSchema.description(str);
+    objSchema = objSchema.notes(str);
+    objSchema = objSchema.notes(strArr);
+    objSchema = objSchema.tags(str);
+    objSchema = objSchema.tags(strArr);
+
+    objSchema = objSchema.meta(obj);
+    objSchema = objSchema.example(obj);
+    objSchema = objSchema.unit(str);
+
+    objSchema = objSchema.options(validOpts);
+    objSchema = objSchema.strict();
+    objSchema = objSchema.concat(x);
+
+    altSchema = objSchema.when(str, whenOpts);
+    altSchema = objSchema.when(ref, whenOpts);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+strSchema = Joi.string();
+
+strSchema = strSchema.insensitive();
+strSchema = strSchema.min(num);
+strSchema = strSchema.min(num, str);
+strSchema = strSchema.min(ref);
+strSchema = strSchema.min(ref, str);
+strSchema = strSchema.max(num);
+strSchema = strSchema.max(num, str);
+strSchema = strSchema.max(ref);
+strSchema = strSchema.max(ref, str);
+strSchema = strSchema.creditCard();
+strSchema = strSchema.length(num);
+strSchema = strSchema.length(num, str);
+strSchema = strSchema.length(ref);
+strSchema = strSchema.length(ref, str);
+strSchema = strSchema.regex(exp);
+strSchema = strSchema.regex(exp, str);
+strSchema = strSchema.replace(exp, str);
+strSchema = strSchema.replace(str, str);
+strSchema = strSchema.alphanum();
+strSchema = strSchema.token();
+strSchema = strSchema.email();
+strSchema = strSchema.email(emailOpts);
+strSchema = strSchema.ip();
+strSchema = strSchema.ip(ipOpts);
+strSchema = strSchema.uri();
+strSchema = strSchema.uri(uriOpts);
+strSchema = strSchema.guid();
+strSchema = strSchema.guid({ version: ['uuidv1', 'uuidv2', 'uuidv3', 'uuidv4', 'uuidv5'] } as Joi.GuidOptions);
+strSchema = strSchema.guid({ version: 'uuidv4' });
+strSchema = strSchema.hex();
+strSchema = strSchema.hostname();
+strSchema = strSchema.isoDate();
+strSchema = strSchema.lowercase();
+strSchema = strSchema.uppercase();
+strSchema = strSchema.trim();
+strSchema = strSchema.truncate();
+strSchema = strSchema.truncate(false);
+strSchema = strSchema.normalize();
+strSchema = strSchema.normalize('NFKC');
+
+namespace common {
+    strSchema = strSchema.allow(x);
+    strSchema = strSchema.allow(x, x);
+    strSchema = strSchema.allow([x, x, x]);
+    strSchema = strSchema.valid(x);
+    strSchema = strSchema.valid(x, x);
+    strSchema = strSchema.valid([x, x, x]);
+    strSchema = strSchema.only(x);
+    strSchema = strSchema.only(x, x);
+    strSchema = strSchema.only([x, x, x]);
+    strSchema = strSchema.equal(x);
+    strSchema = strSchema.equal(x, x);
+    strSchema = strSchema.equal([x, x, x]);
+    strSchema = strSchema.invalid(x);
+    strSchema = strSchema.invalid(x, x);
+    strSchema = strSchema.invalid([x, x, x]);
+    strSchema = strSchema.disallow(x);
+    strSchema = strSchema.disallow(x, x);
+    strSchema = strSchema.disallow([x, x, x]);
+    strSchema = strSchema.not(x);
+    strSchema = strSchema.not(x, x);
+    strSchema = strSchema.not([x, x, x]);
+
+    strSchema = strSchema.default(x);
+
+    strSchema = strSchema.required();
+    strSchema = strSchema.optional();
+    strSchema = strSchema.forbidden();
+
+    strSchema = strSchema.description(str);
+    strSchema = strSchema.notes(str);
+    strSchema = strSchema.notes(strArr);
+    strSchema = strSchema.tags(str);
+    strSchema = strSchema.tags(strArr);
+
+    strSchema = strSchema.meta(obj);
+    strSchema = strSchema.example(obj);
+    strSchema = strSchema.unit(str);
+
+    strSchema = strSchema.options(validOpts);
+    strSchema = strSchema.strict();
+    strSchema = strSchema.concat(x);
+
+    altSchema = strSchema.when(str, whenOpts);
+    altSchema = strSchema.when(ref, whenOpts);
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+schema = Joi.alternatives();
+schema = Joi.alternatives().try(schemaArr);
+schema = Joi.alternatives().try(schema, schema);
+
+schema = Joi.alternatives(schemaArr);
+schema = Joi.alternatives(schema, anySchema, boolSchema);
+
+schema = Joi.alt();
+schema = Joi.alt().try(schemaArr);
+schema = Joi.alt().try(schema, schema);
+
+schema = Joi.alt(schemaArr);
+schema = Joi.alt(schema, anySchema, boolSchema);
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+schema = Joi.lazy(() => schema)
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+namespace validate_tests {
+    {
+        Joi.validate(value, obj);
+        Joi.validate(value, schema);
+        Joi.validate(value, schema, validOpts);
+        Joi.validate(value, schema, validOpts, (err, value) => {
+            x = value;
+            str = err.message;
+            str = err.details[0].path;
+            str = err.details[0].message;
+            str = err.details[0].type;
+        });
+        Joi.validate(value, schema, (err, value) => {
+            x = value;
+            str = err.message;
+            str = err.details[0].path;
+            str = err.details[0].message;
+            str = err.details[0].type;
+        });
+        // variant
+        Joi.validate(num, schema, validOpts, (err, value) => {
+            num = value;
+        });
+
+        // plain opts
+        Joi.validate(value, {});
+    }
+
+    {
+        let value = { username: 'example', password: 'example' };
+        let schema = Joi.object().keys({
+            username: Joi.string().max(255).required(),
+            password: Joi.string().regex(/^[a-zA-Z0-9]{3,255}$/).required(),
+        });
+        let returnValue: Joi.ValidationResult<typeof value>;
+
+        returnValue = schema.validate(value);
+        value = schema.validate(value, (err, value) => value);
+
+        returnValue = Joi.validate(value, schema);
+        returnValue = Joi.validate(value, obj);
+        value = Joi.validate(value, obj, (err, value) => value);
+        value = Joi.validate(value, schema, (err, value) => value);
+
+        returnValue = Joi.validate(value, schema, validOpts);
+        returnValue = Joi.validate(value, obj, validOpts);
+        value = Joi.validate(value, obj, validOpts, (err, value) => value);
+        value = Joi.validate(value, schema, validOpts, (err, value) => value);
+
+        returnValue = schema.validate(value);
+        returnValue = schema.validate(value, validOpts);
+        value = schema.validate(value, (err, value) => value);
+        value = schema.validate(value, validOpts, (err, value) => value);
+    }
+}
+
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+schema = Joi.compile(obj);
+schema = Joi.compile(schemaMap);
+
+Joi.assert(obj, schema);
+Joi.assert(obj, schema, str);
+Joi.assert(obj, schema, err);
+Joi.assert(obj, schemaLike);
+
+Joi.attempt(obj, schema);
+Joi.attempt(obj, schema, str);
+Joi.attempt(obj, schema, err);
+Joi.attempt(obj, schemaLike);
+
+ref = Joi.ref(str, refOpts);
+ref = Joi.ref(str);
+
+Joi.isRef(ref);
+
+description = Joi.describe(schema);
+description = schema.describe();
+
+schema = Joi.reach(objSchema, '');
+
+const Joi2 = Joi.extend({ name: '', base: schema });
+
+const Joi3 = Joi.extend({
+    base: Joi.string(),
+    name: 'string',
+    language: {
+        asd: 'must be exactly asd(f)',
+    },
+    pre(value, state, options) {
+        return value;
+    },
+    describe(description) {
+        return description;
+    },
+    rules: [
+        {
+            name: 'asd',
+            params: {
+                allowF: Joi.boolean().default(false),
+            },
+            setup(params) {
+                const fIsAllowed = params.allowF;
+            },
+            validate(params, value, state, options) {
+                if (value === 'asd' || params.allowF && value === 'asdf') {
+                    return value;
+                }
+                return this.createError('asd', { v: value }, state, options);
+            },
+        },
+    ],
+});
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+schema = Joi.allow(x, x);
+schema = Joi.allow([x, x, x]);
+schema = Joi.valid(x);
+schema = Joi.valid(x, x);
+schema = Joi.valid([x, x, x]);
+schema = Joi.only(x);
+schema = Joi.only(x, x);
+schema = Joi.only([x, x, x]);
+schema = Joi.equal(x);
+schema = Joi.equal(x, x);
+schema = Joi.equal([x, x, x]);
+schema = Joi.invalid(x);
+schema = Joi.invalid(x, x);
+schema = Joi.invalid([x, x, x]);
+schema = Joi.disallow(x);
+schema = Joi.disallow(x, x);
+schema = Joi.disallow([x, x, x]);
+schema = Joi.not(x);
+schema = Joi.not(x, x);
+schema = Joi.not([x, x, x]);
+
+schema = Joi.required();
+schema = Joi.optional();
+schema = Joi.forbidden();
+schema = Joi.strip();
+
+schema = Joi.description(str);
+schema = Joi.notes(str);
+schema = Joi.notes(strArr);
+schema = Joi.tags(str);
+schema = Joi.tags(strArr);
+
+schema = Joi.meta(obj);
+schema = Joi.example(obj);
+schema = Joi.unit(str);
+
+schema = Joi.options(validOpts);
+schema = Joi.strict();
+schema = Joi.strict(bool);
+schema = Joi.concat(x);
+
+schema = Joi.when(str, whenOpts);
+schema = Joi.when(ref, whenOpts);
+
+schema = Joi.label(str);
+schema = Joi.raw();
+schema = Joi.raw(bool);
+schema = Joi.empty();
+schema = Joi.empty(str);
+schema = Joi.empty(anySchema);
diff --git a/types/joi/v10/tsconfig.json b/types/joi/v10/tsconfig.json
new file mode 100644
index 0000000000..1bd530aff0
--- /dev/null
+++ b/types/joi/v10/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "joi": [
+                "joi/v10"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "joi-tests.ts"
+    ]
+}
diff --git a/types/joi/v10/tslint.json b/types/joi/v10/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/joi/v10/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/joi/v6/tslint.json b/types/joi/v6/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/joi/v6/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/joigoose/index.d.ts b/types/joigoose/index.d.ts
index e1d0fe9919..5852e6628e 100644
--- a/types/joigoose/index.d.ts
+++ b/types/joigoose/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/yoitsro/joigoose
 // Definitions by: Karoline <https://github.com/boothwhack>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 import * as Mongoose from "mongoose";
 import * as Joi from "joi";
diff --git a/types/jointjs/README.md b/types/jointjs/README.md
deleted file mode 100644
index 0974814b34..0000000000
--- a/types/jointjs/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# JointJS Definitions Usage Notes
-
-TypeScript definitions for the JointJS framework available at http://www.jointjs.com
-
-Current version 0.6
-
-## Referencing JointJS definition files in your code
-
-Add `` at the top of your code.
\ No newline at end of file
diff --git a/types/jointjs/index.d.ts b/types/jointjs/index.d.ts
deleted file mode 100644
index c6077c22fa..0000000000
--- a/types/jointjs/index.d.ts
+++ /dev/null
@@ -1,898 +0,0 @@
-// Type definitions for Joint JS 1.0.1
-// Project: http://www.jointjs.com/
-// Definitions by: Aidan Reel <https://github.com/areel>, David Durman <https://github.com/DavidDurman>, Ewout Van Gossum <https://github.com/DenEwout>, Federico Caselli <https://github.com/CaselIT>, Chris Moran <https://github.com/ChrisMoran>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-// typings: https://github.com/CaselIT/typings-jointjs
-
-/// <reference types="backbone" />
-
-import * as Backbone from "backbone";
-
-export as namespace joint;
-
-export var g: any;
-export var V: any;
-
-export namespace dia {
-    interface Size {
-        width: number;
-        height: number;
-    }
-
-    interface Point {
-        x: number;
-        y: number;
-    }
-
-    interface BBox extends Point, Size { }
-
-    interface TranslateOptions {
-        restrictedArea?: BBox;
-        transition?: TransitionOptions;
-    }
-
-    interface TransitionOptions {
-        delay?: number;
-        duration?: number;
-        timingFunction?: (t: number) => number;
-        valueFunction?: (a: any, b: any) => (t: number) => any;
-    }
-
-    interface DfsBfsOptions {
-        inbound?: boolean;
-        outbound?: boolean;
-        deep?: boolean;
-    }
-
-    interface ExploreOptions {
-        breadthFirst?: boolean;
-        deep?: boolean;
-    }
-
-    class Graph extends Backbone.Model {
-        constructor(attributes?: any, options?: { cellNamespace: any });
-        addCell(cell: Cell | Cell[]): this;
-        addCells(cells: Cell[]): this;
-        resetCells(cells: Cell[], options?: any): this;
-        getCell(id: string): Cell;
-        getElements(): Element[];
-        getLinks(): Link[];
-        getCells(): Cell[];
-        getFirstCell(): Cell;
-        getLastCell(): Cell;
-        getConnectedLinks(element: Cell, options?: { inbound?: boolean, outbound?: boolean, deep?: boolean }): Link[];
-        disconnectLinks(cell: Cell, options?: any): void;
-        removeLinks(cell: Cell, options?: any): void;
-        translate(tx: number, ty?: number, options?: TranslateOptions): void;
-        cloneCells(cells: Cell[]): { [id: string]: Cell };
-        getSubgraph(cells: Cell[], options?: { deep?: boolean }): Cell[];
-        cloneSubgraph(cells: Cell[], options?: { deep?: boolean }): { [id: string]: Cell };
-        dfs(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: DfsBfsOptions, visited?: Object, distance?: number): void;
-        bfs(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: DfsBfsOptions): void;
-        search(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: { breadthFirst?: boolean }): void;
-        getSuccessors(element: Element, options?: ExploreOptions): Element[];
-        getPredecessors(element: Element, options?: ExploreOptions): Element[];
-        isSuccessor(elementA: Element, elementB: Element): boolean;
-        isPredecessor(elementA: Element, elementB: Element): boolean;
-        isSource(element: Element): boolean;
-        isSink(element: Element): boolean;
-        getSources(): Element[];
-        getSinks(): Element[];
-        getNeighbors(element: Element, options?: DfsBfsOptions): Element[];
-        isNeighbor(elementA: Element, elementB: Element, options?: { inbound?: boolean, outbound?: boolean; }): boolean;
-        getCommonAncestor(...cells: Cell[]): Element;
-        toJSON(): any;
-        fromJSON(json: any, options?: any): this;
-        clear(options?: any): this;
-        findModelsFromPoint(rect: BBox): Element[];
-        findModelsUnderElement(element: Element, options?: { searchBy?: 'bbox' | 'center' | 'origin' | 'corner' | 'topRight' | 'bottomLeft' }): Element[];
-        getBBox(elements: Element[], options?: any): BBox;
-        toGraphLib(): any; // graphlib graph object
-        findModelsInArea(rect: BBox, options?: any): BBox | boolean;
-        getCellsBBox(cells: Cell[], options?: any): BBox;
-        getInboundEdges(node: string): Object;
-        getOutboundEdges(node: string): Object;
-        hasActiveBatch(name?: string): number | boolean;
-        maxZIndex(): number;
-        removeCells(cells: Cell[], options?: any): this;
-        resize(width: number, height: number, options?: number): this;
-        resizeCells(width: number, height: number, cells: Cell[], options?: number): this;
-        set(key: Object | string, value: any, options?: any): this;
-        startBatch(name: string, data?: Object): any;
-        stopBatch(name: string, data?: Object): any;
-    }
-
-    class Cell extends Backbone.Model {
-        id: string;
-        toJSON(): any;
-        remove(options?: { disconnectLinks?: boolean }): this;
-        toFront(options?: { deep?: boolean }): this;
-        toBack(options?: { deep?: boolean }): this;
-        getAncestors(): Cell[];
-        isEmbeddedIn(element: Element, options?: { deep: boolean }): boolean;
-        prop(key: string): any;
-        prop(object: any): this;
-        prop(key: string, value: any, options?: any): this;
-        removeProp(path: string, options?: any): this;
-        attr(key: string): any;
-        attr(object: SVGAttributes): this;
-        attr(key: string, value: any): this;
-        clone(): Cell;
-        clone(opt: { deep?: boolean }): Cell | Cell[];
-        removeAttr(path: string | string[], options?: any): this;
-        transition(path: string, value?: any, options?: TransitionOptions, delim?: string): number;
-        getTransitions(): string[];
-        stopTransitions(path?: string, delim?: string): this;
-        addTo(graph: Graph, options?: any): this;
-        isLink(): boolean;
-        embed(cell: Cell, options?: any): this;
-        findView(paper: Paper): CellView;
-        getEmbeddedCells(options?: any): Cell[];
-        initialize(options?: any): void;
-        isElement(): boolean;
-        isEmbedded(): boolean;
-        processPorts(): void;
-        startBatch(name: string, options?: any): this;
-        stopBatch(name: string, options?: any): this;
-        unembed(cell: Cell, options?: any): this;
-    }
-
-    type Padding = number | {
-        top?: number;
-        right?: number;
-        bottom?: number;
-        left?: number
-    };
-
-    class Element extends Cell {
-        translate(tx: number, ty?: number, options?: TranslateOptions): this;
-        position(options?: { parentRelative: boolean }): Point;
-        position(x: number, y: number, options?: { parentRelative?: boolean }): this;
-        resize(width: number, height: number, options?: { direction?: 'left' | 'right' | 'top' | 'bottom' | 'top-right' | 'top-left' | 'bottom-left' | 'bottom-right' }): this;
-        rotate(deg: number, absolute?: boolean, origin?: Point): this;
-        embed(cell: Cell): this;
-        unembed(cell: Cell): this;
-        getEmbeddedCells(options?: ExploreOptions): Cell[];
-        fitEmbeds(options?: { deep?: boolean, padding?: Padding }): this;
-        getBBox(options?: any): BBox;
-        findView(paper: Paper): ElementView;
-        isElement(): boolean;
-        scale(scaleX: number, scaleY: number, origin?: Point, options?: any): this;
-        addPort(port: any, opt?: any): this;
-        addPorts(ports: any[], opt?: any): this;
-        removePort(port: any, opt?: any): this;
-        hasPorts(): boolean;
-        hasPort(id: string): boolean;
-        getPorts(): any[];
-        getPort(id: string): any;
-        getPortIndex(port: any): number;
-        portProp(portId: string, path: any, value?: any, opt?: any): joint.dia.Element;
-    }
-
-    interface CSSSelector {
-        [key: string]: string | number | Object; // Object added to support special attributes like filter http://jointjs.com/api#SpecialAttributes:filter
-    }
-
-    interface SVGAttributes {
-        [selector: string]: CSSSelector;
-    }
-
-    interface CellAttributes {
-        [key: string]: any;
-    }
-
-    interface TextAttrs extends SVGAttributes {
-        text?: {
-            [key: string]: string | number;
-            text?: string;
-        };
-    }
-
-    interface Label {
-        position: number;
-        attrs?: TextAttrs;
-    }
-    interface LinkAttributes extends CellAttributes {
-        source?: Point | { id: string, selector?: string, port?: string };
-        target?: Point | { id: string, selector?: string, port?: string };
-        labels?: Label[];
-        vertices?: Point[];
-        smooth?: boolean;
-        attrs?: TextAttrs;
-        z?: number;
-    }
-
-    class Link extends Cell {
-        markup: string;
-        labelMarkup: string;
-        toolMakup: string;
-        vertexMarkup: string;
-        arrowHeadMarkup: string;
-
-        constructor(attributes?: LinkAttributes, options?: Object);
-        disconnect(): this;
-        label(index?: number): any;
-        label(index: number, value: Label): this;
-        reparent(options?: any): Element;
-        findView(paper: Paper): LinkView;
-        getSourceElement(): Element;
-        getTargetElement(): Element;
-        hasLoop(options?: { deep?: boolean }): boolean;
-        applyToPoints(fn: Function, options?: any): this;
-        getRelationshipAncestor(): Element;
-        isLink(): boolean;
-        isRelationshipEmbeddedIn(element: Element): boolean;
-        scale(sx: number, sy: number, origin: Point, optionts?: any): this;
-        translate(tx: number, ty: number, options?: any): this;
-    }
-
-    interface ManhattanRouterArgs {
-        excludeTypes?: string[];
-        excludeEnds?: 'source' | 'target';
-        startDirections?: ['left' | 'right' | 'top' | 'bottom'];
-        endDirections?: ['left' | 'right' | 'top' | 'bottom'];
-    }
-
-    interface PaperOptions extends Backbone.ViewOptions<Graph> {
-        el?: string | JQuery | HTMLElement;
-        width?: number;
-        height?: number;
-        origin?: Point;
-        gridSize?: number;
-        perpendicularLinks?: boolean;
-        elementView?: (element: Element) => ElementView | ElementView;
-        linkView?: (link: Link) => LinkView | LinkView;
-        defaultLink?: ((cellView: CellView, magnet: SVGElement) => Link) | Link;
-        defaultRouter?: ((vertices: Point[], args: Object, linkView: LinkView) => Point[]) | { name: string, args?: ManhattanRouterArgs };
-        defaultConnector?: ((sourcePoint: Point, targetPoint: Point, vertices: Point[], args: Object, linkView: LinkView) => string) | { name: string, args?: { radius?: number } };
-        interactive?: ((cellView: CellView, event: string) => boolean) | boolean | { vertexAdd?: boolean, vertexMove?: boolean, vertexRemove?: boolean, arrowheadMove?: boolean };
-        validateMagnet?: (cellView: CellView, magnet: SVGElement) => boolean;
-        validateConnection?: (cellViewS: CellView, magnetS: SVGElement, cellViewT: CellView, magnetT: SVGElement, end: 'source' | 'target', linkView: LinkView) => boolean;
-        linkConnectionPoint?: (linkView: LinkView, view: ElementView, magnet: SVGElement, reference: Point) => Point;
-        snapLinks?: boolean | { radius: number };
-        linkPinning?: boolean;
-        markAvailable?: boolean;
-        async?: boolean | { batchZise: number };
-        embeddingMode?: boolean;
-        validateEmbedding?: (childView: ElementView, parentView: ElementView) => boolean;
-        restrictTranslate?: ((elementView: ElementView) => BBox) | boolean;
-        guard?: (evt: Event, view: CellView) => boolean;
-        multiLinks?: boolean;
-        cellViewNamespace?: Object;
-        /** useful undocumented option */
-        clickThreshold?: number;
-        highlighting?: any;
-    }
-
-    interface ScaleContentOptions {
-        padding?: number;
-        preserveAspectRatio?: boolean;
-        minScale?: number;
-        minScaleX?: number;
-        minScaleY?: number;
-        maxScale?: number;
-        maxScaleX?: number;
-        maxScaleY?: number;
-        scaleGrid?: number;
-        fittingBBox?: BBox;
-    }
-
-    interface FitToContentOptions {
-        gridWidth?: number;
-        gridHeight?: number;
-        padding?: Padding;
-        allowNewOrigin?: 'negative' | 'positive' | 'any';
-        minWidth?: number;
-        minHeight?: number;
-        maxWidth?: number;
-        maxHeight?: number;
-    }
-
-    class Paper extends Backbone.View<Graph> {
-        constructor(options?: PaperOptions);
-        options: PaperOptions;
-        svg: SVGElement;
-        viewport: SVGGElement;
-        defs: SVGDefsElement;
-        setDimensions(width: number, height: number): void;
-        setOrigin(x: number, y: number): void;
-        scale(sx: number, sy?: number, ox?: number, oy?: number): this;
-        findView(element: any): CellView;
-        findViewByModel(model: Cell | string): CellView;
-        findViewsFromPoint(point: Point): ElementView[];
-        findViewsInArea(rect: BBox, options?: { strict?: boolean }): CellView[];
-        fitToContent(options?: FitToContentOptions): void;
-        scaleContentToFit(options?: ScaleContentOptions): void;
-        getContentBBox(): BBox;
-        clientToLocalPoint(p: Point): Point;
-
-        rotate(deg: number, ox?: number, oy?: number): Paper;      // @todo not released yet though it's in the source code already
-
-        afterRenderViews(): void;
-        asyncRenderViews(cells: Cell[], options?: any): void;
-        beforeRenderViews(cells: Cell[]): Cell[];
-        cellMouseout(evt: Event): void;
-        cellMouseover(evt: Event): void;
-        clearGrid(): this;
-        contextmenu(evt: Event): void;
-        createViewForModel(cell: Cell): CellView;
-        drawGrid(options?: any): this;
-        fitToContent(gridWidth?: number, gridHeight?: number, padding?: number, options?: any): void;
-        getArea(): BBox;
-        getDefaultLink(cellView: CellView, magnet: HTMLElement): Link;
-        getModelById(id: string): Cell;
-        getRestrictedArea(): BBox;
-        guard(evt: Event, view: CellView): boolean;
-        linkAllowed(linkViewOrModel: LinkView | Link): boolean;
-        mouseclick(evt: Event): void;
-        mousedblclick(evt: Event): void;
-        mousewheel(evt: Event): void;
-        onCellAdded(cell: Cell, graph: Graph, options: Object): void;
-        onCellHighlight(cellView: CellView, magnetEl: HTMLElement, options?: any): void;
-        onCellUnhighlight(cellView: CellView, magnetEl: HTMLElement, options?: any): void;
-        onRemove(): void;
-        pointerdown(evt: Event): void;
-        pointermove(evt: Event): void;
-        pointerup(evt: Event): void;
-        remove(): this;
-        removeView(cell: Cell): CellView;
-        removeViews(): void;
-        renderView(cell: Cell): CellView;
-        resetViews(cellsCollection: Cell[], options: any): void;
-        resolveHighlighter(options?: any): boolean | Object;
-        setGridSize(gridSize: number): this;
-        setInteractivity(value: any): void;
-        snapToGrid(p: Point): Point;
-        sortViews(): void;
-    }
-
-
-    interface GradientOptions {
-        type: 'linearGradient' | 'radialGradient';
-        stops: Array<{
-            offset: string;
-            color: string;
-            opacity?: number;
-        }>;
-    }
-    class CellViewGeneric<T extends Backbone.Model> extends Backbone.View<T> {
-        getBBox(options?: { useModelGeometry?: boolean }): BBox;
-        highlight(el?: any, options?: any): this;
-        unhighlight(el?: any, options?: any): this;
-        applyFilter(selector: string | HTMLElement, filter: Object): void;
-        applyGradient(selector: string | HTMLElement, attr: 'fill' | 'stroke', gradient: GradientOptions): void;
-        can(feature: string): boolean;
-        findBySelector(selector: string): JQuery;
-        findMagnet(el: any): HTMLElement;
-        getSelector(el: HTMLElement, prevSelector: string): string;
-        getStrokeBBox(el: any): BBox; // string|HTMLElement|Vectorizer
-        mouseout(evt: Event): void;
-        mouseover(evt: Event): void;
-        mousewheel(evt: Event, x: number, y: number, delta: number): void
-        notify(eventName: string): void;
-        onChangeAttrs(cell: Cell, attrs: Backbone.ViewOptions<T>, options?: any): this;
-        onSetTheme(oldTheme: string, newTheme: string): void;
-        pointerclick(evt: Event, x: number, y: number): void;
-        pointerdblclick(evt: Event, x: number, y: number): void;
-        pointerdown(evt: Event, x: number, y: number): void;
-        pointermove(evt: Event, x: number, y: number): void;
-        pointerup(evt: Event, x: number, y: number): void;
-        remove(): this;
-        setInteractivity(value: any): void;
-        setTheme(theme: string, options?: any): this;
-    }
-
-    class CellView extends CellViewGeneric<Cell> { }
-
-    interface ElementViewAttributes {
-        style?: string;
-        text?: string;
-        html?: string;
-        "ref-x"?: string | number;
-        "ref-y"?: string | number;
-        "ref-dx"?: number;
-        "ref-dy"?: number;
-        "ref-width"?: string | number;
-        "ref-height"?: string | number;
-        ref?: string;
-        "x-alignment"?: 'middle' | 'right' | number;
-        "y-alignment"?: 'middle' | 'bottom' | number;
-        port?: string;
-    }
-    class ElementView extends CellViewGeneric<Element> {
-        scale(sx: number, sy: number): void; // @todo Documented in source but not released
-        finalizeEmbedding(options?: any): void;
-        getBBox(options?: any): BBox;
-        pointerdown(evt: Event, x: number, y: number): void;
-        pointermove(evt: Event, x: number, y: number): void;
-        pointerup(evt: Event, x: number, y: number): void;
-        positionRelative(vel: any, bbox: BBox, attributes: ElementViewAttributes, nodesBySelector?: Object): void; // Vectorizer
-        prepareEmbedding(options?: any): void;
-        processEmbedding(options?: any): void;
-        render(): this;
-        renderMarkup(): void;
-        resize(): void;
-        rotate(): void;
-        translate(model: Backbone.Model, changes?: any, options?: any): void;
-        update(cell: Cell, renderingOnlyAttrs?: Object): void;
-    }
-
-    class LinkView extends CellViewGeneric<Link> {
-        options: {
-            shortLinkLength?: number,
-            doubleLinkTools?: boolean,
-            longLinkLength?: number,
-            linkToolsOffset?: number,
-            doubleLinkToolsOffset?: number,
-            sampleInterval: number
-        };
-        getConnectionLength(): number;
-        sendToken(token: SVGElement, duration?: number, callback?: () => void): void;
-        addVertex(vertex: Point): number;
-        getPointAtLength(length: number): Point; // Marked as public api in source but not in the documents
-        createWatcher(endType: { id: string }): Function;
-        findRoute(oldVertices: Point[]): Point[];
-        getConnectionPoint(end: 'source' | 'target', selectorOrPoint: Element | Point, referenceSelectorOrPoint: Element | Point): Point;
-        getPathData(vertices: Point[]): any;
-        onEndModelChange(endType: 'source' | 'target', endModel?: Element, opt?: any): void;
-        onLabelsChange(): void;
-        onSourceChange(cell: Cell, sourceEnd: { id: string }, options: any): void;
-        onTargetChange(cell: Cell, targetEnd: { id: string }, options: any): void;
-        onToolsChange(): void;
-        onVerticesChange(cell: Cell, changed: any, options: any): void;
-        pointerdown(evt: Event, x: number, y: number): void;
-        pointermove(evt: Event, x: number, y: number): void;
-        pointerup(evt: Event, x: number, y: number): void;
-        removeVertex(idx: number): this;
-        render(): this;
-        renderArrowheadMarkers(): this;
-        renderLabels(): this;
-        renderTools(): this;
-        renderVertexMarkers(): this;
-        startArrowheadMove(end: 'source' | 'target', options?: any): void;
-        startListening(): void;
-        update(model: any, attributes: any, options?: any): this;
-        updateArrowheadMarkers(): this;
-        updateAttributes(): void;
-        updateConnection(options?: any): void;
-        updateLabelPositions(): this;
-        updateToolsPosition(): this;
-    }
-}
-
-export namespace ui { }
-
-export namespace shapes {
-    interface GenericAttributes<T> extends dia.CellAttributes {
-        position?: dia.Point;
-        size?: dia.Size;
-        angle?: number;
-        attrs?: T;
-    }
-    interface ShapeAttrs extends dia.CSSSelector {
-        fill?: string;
-        stroke?: string;
-        r?: string | number;
-        rx?: string | number;
-        ry?: string | number;
-        cx?: string | number;
-        cy?: string | number;
-        height?: string | number;
-        width?: string | number;
-        transform?: string;
-        points?: string;
-        'stroke-width'?: string | number;
-        'ref-x'?: string | number;
-        'ref-y'?: string | number;
-        ref?: string
-    }
-
-    namespace basic {
-        class Generic extends dia.Element {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        interface RectAttrs extends dia.TextAttrs {
-            rect?: ShapeAttrs;
-        }
-        class Rect extends Generic {
-            constructor(attributes?: GenericAttributes<RectAttrs>, options?: Object);
-        }
-        class Text extends Generic {
-            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-        }
-        interface CircleAttrs extends dia.TextAttrs {
-            circle?: ShapeAttrs;
-        }
-        class Circle extends Generic {
-            constructor(attributes?: GenericAttributes<CircleAttrs>, options?: Object);
-        }
-        interface EllipseAttrs extends dia.TextAttrs {
-            ellipse?: ShapeAttrs;
-        }
-        class Ellipse extends Generic {
-            constructor(attributes?: GenericAttributes<EllipseAttrs>, options?: Object);
-        }
-        interface PolygonAttrs extends dia.TextAttrs {
-            polygon?: ShapeAttrs;
-        }
-        class Polygon extends Generic {
-            constructor(attributes?: GenericAttributes<PolygonAttrs>, options?: Object);
-        }
-        interface PolylineAttrs extends dia.TextAttrs {
-            polyline?: ShapeAttrs;
-        }
-        class Polyline extends Generic {
-            constructor(attributes?: GenericAttributes<PolylineAttrs>, options?: Object);
-        }
-        class Image extends Generic {
-            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-        }
-        interface PathAttrs extends dia.TextAttrs {
-            path?: ShapeAttrs;
-        }
-        class Path extends Generic {
-            constructor(attributes?: GenericAttributes<PathAttrs>, options?: Object);
-        }
-        interface RhombusAttrs extends dia.TextAttrs {
-            path?: ShapeAttrs;
-        }
-        class Rhombus extends Generic {
-            constructor(attributes?: GenericAttributes<RhombusAttrs>, options?: Object);
-        }
-        interface TextBlockAttrs extends dia.TextAttrs {
-            rect?: ShapeAttrs;
-        }
-        class TextBlock extends Generic {
-            constructor(attributes?: GenericAttributes<TextBlockAttrs>, options?: Object);
-            updateSize(cell: dia.Cell, size: dia.Size): void;
-            updateContent(cell: dia.Cell, content: string): void;
-        }
-    }
-
-    namespace chess {
-        class KingWhite extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class KingBlack extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class QueenWhite extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class QueenBlack extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class RookWhite extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class RookBlack extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class BishopWhite extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class BishopBlack extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class KnightWhite extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class KnightBlack extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class PawnWhite extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class PawnBlack extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-    }
-
-    namespace devs {
-        interface ModelAttributes extends GenericAttributes<dia.SVGAttributes> {
-            inPorts?: string[];
-            outPorts?: string[];
-            ports?: Object;
-        }
-        class Model extends basic.Generic {
-            constructor(attributes?: ModelAttributes, options?: Object);
-            changeInGroup(properties: any, opt?: any): boolean;
-            changeOutGroup(properties: any, opt?: any): boolean;
-            createPortItem(group: string, port: string): any;
-            createPortItems(group: string, ports: string[]): any[];
-            addOutPort(port: string, opt?: any): this;
-            addInPort(port: string, opt?: any): this;
-            removeOutPort(port: string, opt?: any): this;
-            removeInPort(port: string, opt?: any): this;
-        }
-        class Coupled extends Model {
-            constructor(attributes?: ModelAttributes, options?: Object);
-        }
-        class Atomic extends Model {
-            constructor(attributes?: ModelAttributes, options?: Object);
-        }
-        class Link extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-    }
-
-    namespace erd {
-        class Entity extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-        }
-        class WeakEntity extends Entity {
-            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-        }
-        class Relationship extends dia.Element {
-            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-        }
-        class IdentifyingRelationship extends Relationship {
-            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-        }
-        interface AttributeAttrs extends dia.TextAttrs {
-            ellipse?: ShapeAttrs;
-        }
-        class Attribute extends dia.Element {
-            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-        }
-        class Multivalued extends Attribute {
-            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-        }
-        class Derived extends Attribute {
-            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-        }
-        class Key extends Attribute {
-            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-        }
-        class Normal extends Attribute {
-            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-        }
-        interface ISAAttrs extends dia.Element {
-            polygon?: ShapeAttrs;
-        }
-        class ISA extends dia.Element {
-            constructor(attributes?: GenericAttributes<ISAAttrs>, options?: Object);
-        }
-        class Line extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-            cardinality(value: string | number): void;
-        }
-    }
-
-    namespace fsa {
-        class State extends basic.Circle {
-            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-        }
-        class StartState extends dia.Element {
-            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-        }
-        class EndState extends dia.Element {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class Arrow extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-    }
-
-    namespace logic {
-        interface LogicAttrs extends ShapeAttrs {
-            ref?: string;
-            'ref-x'?: number | string;
-            'ref-dx'?: number | string;
-            'ref-y'?: number | string;
-            'ref-dy'?: number | string;
-            magnet?: boolean;
-            'class'?: string;
-            port?: string;
-        }
-        interface IOAttrs extends dia.TextAttrs {
-            circle?: LogicAttrs;
-        }
-        class Gate extends basic.Generic {
-            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-        }
-        class IO extends Gate {
-            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-        }
-        class Input extends IO {
-            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-        }
-        class Output extends IO {
-            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-        }
-        class Gate11 extends Gate {
-            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-        }
-        class Gate21 extends Gate {
-            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-        }
-        interface Image {
-            'xlink:href'?: string;
-        }
-        interface ImageAttrs extends LogicAttrs {
-            image?: Image;
-        }
-        class Repeater extends Gate11 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input: any): any;
-        }
-        class Note extends Gate11 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input: any): boolean;
-        }
-        class Or extends Gate21 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input1: any, input2: any): boolean;
-        }
-        class And extends Gate21 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input1: any, input2: any): boolean;
-        }
-        class Nor extends Gate21 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input1: any, input2: any): boolean;
-        }
-        class Nand extends Gate21 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input1: any, input2: any): boolean;
-        }
-        class Xor extends Gate21 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input1: any, input2: any): boolean;
-        }
-        class Xnor extends Gate21 {
-            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-            operation(input1: any, input2: any): boolean;
-        }
-        interface WireArgs extends dia.LinkAttributes {
-            router?: Object;
-            connector?: Object;
-        }
-        class Wire extends dia.Link {
-            constructor(attributes?: WireArgs, options?: Object);
-        }
-    }
-
-    namespace org {
-        interface MemberAttrs {
-            rect?: ShapeAttrs;
-            image?: ShapeAttrs;
-        }
-        class Member extends dia.Element {
-            constructor(attributes?: GenericAttributes<MemberAttrs>, options?: Object);
-        }
-        class Arrow extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-    }
-
-    namespace pn {
-        class Place extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class PlaceView extends dia.ElementView {
-            renderTokens(): void;
-        }
-        class Transition extends basic.Generic {
-            constructor(attributes?: GenericAttributes<basic.RectAttrs>, options?: Object);
-        }
-        class Link extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-    }
-
-    namespace uml {
-        interface ClassAttributes extends GenericAttributes<basic.RectAttrs> {
-            name: string[];
-            attributes: string[];
-            methods: string[];
-        }
-        class Class extends basic.Generic {
-            constructor(attributes?: ClassAttributes, options?: Object);
-            getClassName(): string[];
-            updateRectangles(): void;
-        }
-        class ClassView extends dia.ElementView {
-        }
-        class Abstract extends Class {
-            constructor(attributes?: ClassAttributes, options?: Object);
-        }
-        class AbstractView extends ClassView {
-            constructor(attributes?: ClassAttributes, options?: Object);
-        }
-        class Interface extends Class {
-            constructor(attributes?: ClassAttributes, options?: Object);
-        }
-        class InterfaceView extends ClassView {
-            constructor(attributes?: ClassAttributes, options?: Object);
-        }
-        class Generalization extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-        class Implementation extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-        class Aggregation extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-        class Composition extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-        class Association extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-        interface StateAttributes extends GenericAttributes<ShapeAttrs> {
-            events?: string[];
-        }
-        class State extends basic.Generic {
-            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-            updateName(): void;
-            updateEvents(): void;
-            updatePath(): void;
-        }
-        class StartState extends basic.Circle {
-            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-        }
-        class EndState extends basic.Generic {
-            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-        }
-        class Transition extends dia.Link {
-            constructor(attributes?: dia.LinkAttributes, options?: Object);
-        }
-    }
-}
-
-export namespace util {
-
-    namespace format {
-        export function number(specifier: string, value: number): string;
-    }
-
-    export function uuid(): string;
-    export function guid(obj?: Object): string;
-    export function nextFrame(callback: () => void, context?: Object): number;
-    export function cancelFrame(requestId: number): void;
-    export function flattenObject(object: Object, delim: string, stop: (node: any) => boolean): any;
-    export function getByPath(object: Object, path: string, delim: string): any;
-    export function setByPath(object: Object, path: string, value: Object, delim: string): any;
-    export function unsetByPath(object: Object, path: string, delim: string): any;
-    export function breakText(text: string, size: dia.Size, attrs?: dia.SVGAttributes, options?: { svgDocument?: SVGElement }): string;
-    export function normalizeSides(box: number | { x?: number, y?: number, height?: number, width?: number }): dia.BBox;
-    export function getElementBBox(el: Element): dia.BBox;
-    export function setAttributesBySelector(el: Element, attrs: dia.SVGAttributes): void;
-    export function sortElements(elements: Element[] | string | JQuery, comparator: (a: Element, b: Element) => number): Element[];
-    export function shapePerimeterConnectionPoint(linkView: dia.LinkView, view: dia.ElementView, magnet: SVGElement, ref: dia.Point): dia.Point;
-    export function imageToDataUri(url: string, callback: (err: Error, dataUri: string) => void): void;
-
-    // Not documented but used in examples
-    /** @deprecated use lodash _.defaultsDeep */
-    export function deepSupplement(objects: any, defaultIndicator?: any): any;
-
-    // Private functions
-    /** @deprecated use lodash _.assign */
-    export function mixin(objects: any[]): any;
-    /** @deprecated use lodash _.defaults */
-    export function supplement(objects: any[]): any;
-    /** @deprecated use lodash _.mixin  */
-    export function deepMixin(objects: any[]): any;
-}
-
-export namespace layout {
-
-    interface LayoutOptions {
-        nodeSep?: number;
-        edgeSep?: number;
-        rankSep?: number;
-        rankDir?: 'TB' | 'BT' | 'LR' | 'RL';
-        marginX?: number;
-        marginY?: number;
-        resizeCluster?: boolean;
-        setPosition?: (element: dia.Element, position: dia.BBox) => void;
-        setLinkVertices?: (link: dia.Link, vertices: Position[]) => void;
-    }
-
-    class DirectedGraph {
-        static layout(graph: dia.Graph | dia.Cell[], options?: LayoutOptions): dia.BBox;
-    }
-}
diff --git a/types/jointjs/tsconfig.json b/types/jointjs/tsconfig.json
deleted file mode 100644
index 82e6284376..0000000000
--- a/types/jointjs/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/jpm/tslint.json b/types/jpm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jpm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jqgrid/tslint.json b/types/jqgrid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jqgrid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jqrangeslider/tslint.json b/types/jqrangeslider/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jqrangeslider/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-ajax-chain/tslint.json b/types/jquery-ajax-chain/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-ajax-chain/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-alertable/tslint.json b/types/jquery-alertable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-alertable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-backstretch/tslint.json b/types/jquery-backstretch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-backstretch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-cropbox/tslint.json b/types/jquery-cropbox/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-cropbox/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-deparam/tslint.json b/types/jquery-deparam/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-deparam/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-easy-loading/tslint.json b/types/jquery-easy-loading/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-easy-loading/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-fullscreen/tslint.json b/types/jquery-fullscreen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-fullscreen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-galleria/tslint.json b/types/jquery-galleria/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-galleria/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-handsontable/tslint.json b/types/jquery-handsontable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-handsontable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-jcrop/index.d.ts b/types/jquery-jcrop/index.d.ts
new file mode 100644
index 0000000000..af2afaf9d7
--- /dev/null
+++ b/types/jquery-jcrop/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for jcrop 2.0
+// Project: https://github.com/tapmodo/Jcrop/
+// Definitions by: Joe Skeen <https://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+/// <reference types="jquery" />
+
+declare namespace JQuery.Jcrop {
+  interface Options {
+    /** Aspect ratio of w/h (e.g. 1 for square)  */
+    aspectRatio?: number;
+    /** Minimum width/height, use 0 for unbounded dimension; [width, height] */
+    minSize?: [number, number];
+    /** Maximum width/height, use 0 for unbounded dimension; [width, height] */
+    maxSize?: [number, number];
+    minSelect?: [number, number];
+    /** Set an initial selection area; [x, y, x2, y2] */
+    setSelect?: [number, number, number, number];
+
+    /** Set color of background container @default 'black' */
+    bgColor?: string;
+    /** Opacity of outer image when cropping; between 0 and 1 @default .6 */
+    bgOpacity?: number;
+    baseClass?: string;
+    addClass?: string;
+    bgFade?: boolean;
+    borderOpacity?: number;
+    handleOpacity?: number;
+    handleSize?: number | null;
+
+    /** Called when selection is completed */
+    onSelect?: JCropEventHandler;
+    /** Called when the selection is moving */
+    onChange?: JCropEventHandler;
+    /** Called when double-clicked */
+    onDblClick?: JCropEventHandler;
+    /** Called when the selection is released */
+    onRelease?: JCropEventHandler;
+
+    /** Maximum width of cropping area @default 0 (no limit) */
+    boxWidth?: number;
+    /** Maximum height of cropping area @default 0 (no limit) */
+    boxHeight?: number;
+    boundary?: number;
+    fadeTime?: number;
+    animationDelay?: number;
+    swingSpeed?: number;
+
+    /** Specify the true size of the image */
+    trueSize?: [number, number];
+
+    // Basic Settings
+    allowSelect?: boolean;
+    allowMove?: boolean;
+    allowResize?: boolean;
+
+    trackDocument?: boolean;
+
+    keySupport?: boolean;
+    createHandles?: Array<CardinalDirection | IntermediateDirection>;
+    createDragbars?: CardinalDirection[];
+    createBorders?: CardinalDirection[];
+    drawBorders?: boolean;
+    dragEdges?: boolean;
+    fixedSupport?: boolean;
+    touchSupport?: boolean | null;
+    shade?: boolean | null;
+  }
+
+  type CardinalDirection = 'n' | 's' | 'e' | 'w';
+  type IntermediateDirection = 'nw' | 'ne' | 'se' | 'sw';
+  type JCropEventHandler = (c: SelectionInfo) => void;
+  interface SelectionInfo {
+    x: number;
+    y: number;
+    x2: number;
+    y2: number;
+    w: number;
+    h: number;
+  }
+
+  interface Api {
+    /** Set selection, format: [ x,y,x2,y2 ] */
+    setSelect: (selection: [number, number, number, number]) => void;
+    /** Animate selection to new selection, format: [ x,y,x2,y2 ] */
+    animateTo: (selection: [number, number, number, number]) => void;
+    /** Release current selection */
+    release: () => void;
+
+    /** Query current selection values (true size) */
+    tellSelect: () => SelectionInfo;
+    /** Query current selection values (interface)  */
+    tellScaled: () => SelectionInfo;
+
+    /** Disables Jcrop interactivity */
+    disable: () => void;
+    /** Enables Jcrop interactivity */
+    enable: () => void;
+    /** Remove Jcrop entirely */
+    remove: () => void;
+  }
+}
+
+interface JQuery {
+  Jcrop(options?: JQuery.Jcrop.Options, callback?: (this: JQuery.Jcrop.Api) => void): JQuery;
+}
diff --git a/types/jquery-jcrop/jquery-jcrop-tests.ts b/types/jquery-jcrop/jquery-jcrop-tests.ts
new file mode 100644
index 0000000000..f5fb25f39c
--- /dev/null
+++ b/types/jquery-jcrop/jquery-jcrop-tests.ts
@@ -0,0 +1,54 @@
+jQuery(($) => {
+  $('#target').Jcrop();
+});
+
+function showCoords(c: { x: number, y: number, x2: number; y2: number; w: number; h: number; }) {
+  // variables can be accessed here as
+  // c.x, c.y, c.x2, c.y2, c.w, c.h
+}
+
+jQuery(($) => {
+  $('#target').Jcrop({
+    onSelect: showCoords,
+    onChange: showCoords
+  });
+});
+
+jQuery(($) => {
+  $('#target').Jcrop({
+    onSelect: showCoords,
+    bgColor: 'black',
+    bgOpacity: .4,
+    setSelect: [100, 100, 50, 50],
+    aspectRatio: 16 / 9
+  });
+});
+
+let jcrop_api;
+$('#target').Jcrop({}, function() {
+  jcrop_api = this;
+});
+
+jQuery(($) => {
+  let jcrop_api: JQuery.Jcrop.Api;
+
+  $('#target').Jcrop({
+    bgColor: 'red'
+  }, function() {
+    jcrop_api = this;
+  });
+
+  $('#animbutton').click((e) => {
+    jcrop_api.animateTo([120, 120, 80, 80]);
+    return false;
+  });
+
+  $('#delselect').click((e) => {
+    jcrop_api.release();
+    return false;
+  });
+});
+
+(() => {
+  $('#cropbox').Jcrop({ boxWidth: 450, boxHeight: 400 });
+});
diff --git a/types/jquery-jcrop/tsconfig.json b/types/jquery-jcrop/tsconfig.json
new file mode 100644
index 0000000000..add23691c0
--- /dev/null
+++ b/types/jquery-jcrop/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6",
+          "dom"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+          "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+      "index.d.ts",
+      "jquery-jcrop-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/jquery-jcrop/tslint.json b/types/jquery-jcrop/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/jquery-jcrop/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/jquery-jsonrpcclient/tslint.json b/types/jquery-jsonrpcclient/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-jsonrpcclient/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-knob/index.d.ts b/types/jquery-knob/index.d.ts
index 6ca43cd66b..3f3deebddf 100644
--- a/types/jquery-knob/index.d.ts
+++ b/types/jquery-knob/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery Knob 1.2.11
+// Type definitions for jQuery Knob 1.2.13
 // Project: http://anthonyterrien.com/knob/
 // Definitions by: Iain Buchanan <https://github.com/iain8>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -58,6 +58,10 @@ declare namespace JQueryKnob {
 		 * dial width
 		 */
 		width?: number;
+		/**
+		 * dial height
+		 */
+		height?: number;
 		/**
 		 * default=true | false=hide input
 		 */
diff --git a/types/jquery-knob/tslint.json b/types/jquery-knob/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-knob/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-match-height/index.d.ts b/types/jquery-match-height/index.d.ts
index 491a0dbe1d..2c2a69db67 100644
--- a/types/jquery-match-height/index.d.ts
+++ b/types/jquery-match-height/index.d.ts
@@ -14,8 +14,6 @@ interface JQueryMatchHeight {
     /**
      * Set all selected elements to the height of the tallest.
      * If the items are on multiple rows, the items of each row will be set to the tallest of that row.
-     *
-     * @param options
      */
     (options?: JQueryMatchHeight.Options): JQuery;
     _update(): void;
diff --git a/types/jquery-mockjax/tslint.json b/types/jquery-mockjax/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-mockjax/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-mousewheel/tslint.json b/types/jquery-mousewheel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-mousewheel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-notifier/index.d.ts b/types/jquery-notifier/index.d.ts
new file mode 100644
index 0000000000..bf9d0ff93b
--- /dev/null
+++ b/types/jquery-notifier/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for notifier 1.0
+// Project: https://github.com/allipierre/jquery-notifier
+// Definitions by: Alli Pierre Yotti <https://github.com/allipierre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace notifier {
+    /**
+     * notifier.show(title, msg, type, icon, timeout);
+     * {title} title
+     * {msg} msg
+     *  {type} type
+     * {icon} icon
+     * {timeout} timeout
+     */
+    function show(title: string, msg: string, type: string, icon: string, timeout?: number): string | number;
+
+    function hide(notificationId: string | number): boolean;
+}
diff --git a/types/jquery-notifier/jquery-notifier-tests.ts b/types/jquery-notifier/jquery-notifier-tests.ts
new file mode 100644
index 0000000000..18804758be
--- /dev/null
+++ b/types/jquery-notifier/jquery-notifier-tests.ts
@@ -0,0 +1,31 @@
+notifier.show('Hello!', 'I am a default notification.', '', '', 0);
+notifier.show('Reminder!', 'You have a meeting at 10:30 AM.', '', '', 0);
+notifier.show('Well Done!', 'You just submit your resume successfuly.', '', '', 0);
+notifier.show('Warning!', 'The data presented here can be change.', '', '', 0);
+notifier.show('Sorry!', 'Could not complete your transaction.', '', '', 0);
+
+notifier.show('Default!', 'I am a default notification.', '', 'img/clock-48.png', 0);
+notifier.show('Reminder!', 'You have a meeting at 10:30 AM.', '', 'img/survey-48.png', 0);
+notifier.show('Well Done!', 'You just submit your resume successfuly.', '', 'img/ok-48.png', 0);
+notifier.show('Warning!', 'The data presented here can be change.', '', 'img/medium_priority-48.png', 0);
+notifier.show('Sorry!', 'Could not complete your transaction.', '', 'img/high_priority-48.png', 0);
+
+notifier.show('Default!', 'I am a default notification.', '', 'img/clock-48.png', 4000);
+notifier.show('Reminder!', 'You have a meeting at 10:30 AM.', '', 'img/survey-48.png', 4000);
+notifier.show('Well Done!', 'You just submit your resume successfuly.', '', 'img/ok-48.png', 4000);
+notifier.show('Warning!', 'The data presented here can be change.', '', 'img/medium_priority-48.png', 4000);
+notifier.show('Sorry!', 'Could not complete your transaction.', '', 'img/high_priority-48.png', 4000);
+
+let notificationId: string | number;
+
+let showNotification = () => {
+    notificationId = notifier.show('Reminder!', 'You have a meeting at 10:30 AM.', '', 'img/survey-48.png', 4000);
+};
+
+let hideNotification = () => {
+    notifier.hide(notificationId);
+};
+
+document.querySelector('#btn-nt-show').addEventListener('click', showNotification);
+
+document.querySelector('#btn-nt-hide').addEventListener('click', hideNotification);
diff --git a/types/jquery-notifier/tsconfig.json b/types/jquery-notifier/tsconfig.json
new file mode 100644
index 0000000000..b2178bf718
--- /dev/null
+++ b/types/jquery-notifier/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-notifier-tests.ts"
+    ]
+}
diff --git a/types/jquery-notifier/tslint.json b/types/jquery-notifier/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jquery-notifier/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jquery-param/tslint.json b/types/jquery-param/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-param/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-sortable/tslint.json b/types/jquery-sortable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-sortable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-steps/tslint.json b/types/jquery-steps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-steps/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-timeentry/tslint.json b/types/jquery-timeentry/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-timeentry/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-truncate-html/tslint.json b/types/jquery-truncate-html/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-truncate-html/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-urlparam/tslint.json b/types/jquery-urlparam/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-urlparam/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery-validation-unobtrusive/tslint.json b/types/jquery-validation-unobtrusive/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery-validation-unobtrusive/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.address/tslint.json b/types/jquery.address/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.address/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.are-you-sure/tslint.json b/types/jquery.are-you-sure/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.are-you-sure/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.autosize/tslint.json b/types/jquery.autosize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.autosize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.base64/tslint.json b/types/jquery.base64/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.base64/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.bbq/tslint.json b/types/jquery.bbq/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.bbq/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.blockui/tslint.json b/types/jquery.blockui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.blockui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.bootstrap.wizard/index.d.ts b/types/jquery.bootstrap.wizard/index.d.ts
index 465d7cd095..a84c9ca4c4 100644
--- a/types/jquery.bootstrap.wizard/index.d.ts
+++ b/types/jquery.bootstrap.wizard/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for twitter-bootstrap-wizard
 // Project: https://github.com/VinceG/twitter-bootstrap-wizard
 // Definitions by: Blake Niemyjski <https://github.com/niemyjski>
+//                 Dennis Ã…hlin <https://github.com/dennisahlin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -41,6 +42,11 @@ interface Wizard {
 }
 
 interface JQuery {
+    bootstrapWizard(method: 'next' | 'previous' | 'first' | 'last' | 'back' | 'finish'): void;
+    bootstrapWizard(method: 'currentIndex' | 'navigationLength'): number;
+    bootstrapWizard(method: 'show', indexOrId: number | string): void;
+    bootstrapWizard(method: 'enable' | 'disable' | 'display' | 'hide', index: number): void;
+    bootstrapWizard(method: 'remove', index: number, removeTabPane?: boolean): void;
     bootstrapWizard(options?: WizardOptions): Wizard;
 }
 
diff --git a/types/jquery.bootstrap.wizard/tslint.json b/types/jquery.bootstrap.wizard/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.bootstrap.wizard/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.cleditor/tslint.json b/types/jquery.cleditor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.cleditor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.clientsidelogging/tslint.json b/types/jquery.clientsidelogging/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.clientsidelogging/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.color/tslint.json b/types/jquery.color/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.color/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.colorbox/tslint.json b/types/jquery.colorbox/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.colorbox/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.colorpicker/tslint.json b/types/jquery.colorpicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.colorpicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.contextmenu/tslint.json b/types/jquery.contextmenu/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.contextmenu/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.cookie/tslint.json b/types/jquery.cookie/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.cookie/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.customselect/tslint.json b/types/jquery.customselect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.customselect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.cycle/tslint.json b/types/jquery.cycle/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.cycle/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.cycle2/tslint.json b/types/jquery.cycle2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.cycle2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.dropotron/tslint.json b/types/jquery.dropotron/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.dropotron/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.dynatree/tslint.json b/types/jquery.dynatree/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.dynatree/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.elang/tslint.json b/types/jquery.elang/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.elang/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.fancytree/index.d.ts b/types/jquery.fancytree/index.d.ts
index 34d90d9e8f..9c793a2c19 100644
--- a/types/jquery.fancytree/index.d.ts
+++ b/types/jquery.fancytree/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mar10/fancytree
 // Definitions by: Peter Palotas <https://github.com/alphaleonis>
 //                 Mahdi Abedi <https://github.com/abedi-ir>
+//                 Nitecube <https://github.com/Nitecube>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -93,6 +94,12 @@ declare namespace Fancytree {
          */
         findNextNode(match: (node: FancytreeNode) => boolean, startNode?: FancytreeNode): FancytreeNode;
 
+        /** Find all nodes that matches condition.
+         * 
+         * @returns array of nodes (may be empty)
+         */
+        findAll(match: string|((node: FancytreeNode) => boolean|undefined)): FancytreeNode[];
+
         /** Generate INPUT elements that can be submitted with html forms. In selectMode 3 only the topmost selected nodes are considered. */
         generateFormElements(selected?: boolean, active?: boolean): void;
 
@@ -283,6 +290,11 @@ declare namespace Fancytree {
         addChildren(child: Fancytree.NodeData, insertBefore?: number): FancytreeNode;
 
 
+        /** Add class to node's span tag and to .extraClasses.
+         * @param className class name
+         */
+        addClass(className: string): void;
+
         /** Append or prepend a node, or append a child node. This a convenience function that calls addChildren()
          *
          * @param mode 'before', 'after', 'firstChild', or 'child' ('over' is a synonym for 'child') (default='child')
@@ -508,6 +520,11 @@ declare namespace Fancytree {
          */
         removeChildren(): void;
 
+        /** Remove class from node's span tag and .extraClasses.
+         * @param className class name
+         */
+        removeClass(className: string): void;
+
         /** This method renders and updates all HTML markup that is required to display this node in its current state.
          *
          * @param force re-render, even if html markup was already created
@@ -594,6 +611,13 @@ declare namespace Fancytree {
          */
         toDict(recursive?: boolean, callback?: (dict: NodeData) => void): NodeData;
 
+        /** Set, clear, or toggle class of node's span tag and .extraClasses.
+         * @param {string} className class name (separate multiple classes by space)
+         * @param {boolean} [flag] true/false to add/remove class. If omitted, class is toggled.
+         * @return true if a class was added
+         */
+        toggleClass(className: string, flag?: boolean): boolean;
+
         /** Flip expanded status. */
         toggleExpanded(): void;
 
@@ -747,7 +771,7 @@ declare namespace Fancytree {
         /** Scroll node into visible area, when focused by keyboard (default: false). */
         autoScroll?: boolean;
         /** Display checkboxes to allow selection (default: false) */
-        checkbox?: boolean;
+        checkbox?: boolean|string|((event: JQueryEventObject, data: EventData) => boolean);
         /** Defines what happens, when the user click a folder node. (default: activate_dblclick_expands) */
         clickFolderMode?: FancytreeClickFolderMode;
         /** 0..2 (null: use global setting $.ui.fancytree.debugInfo) */
@@ -792,13 +816,20 @@ declare namespace Fancytree {
         titlesTabbable?: boolean;
         /** Animation options, false:off (default: { effect: "blind", options: {direction: "vertical", scale: "box"}, duration: 200 }) */
         toggleEffect?: JQueryUI.EffectOptions;
+
+        /** (dynamic Option)Prevent (de-)selection using mouse or keyboard. */
+        unselectable?: boolean|((event: JQueryEventObject, data: Fancytree.EventData) => boolean|undefined);
+        /** (dynamic Option)Ignore this node when calculating the partsel status of parent nodes in selectMode 3 propagation. */
+        unselectableIgnore?: boolean|((event: JQueryEventObject, data: Fancytree.EventData) => boolean|undefined);
+        /** (dynamic Option)Use this as constant selected value (overriding selectMode 3 propagation). */
+        unselectableStatus?: boolean|((event: JQueryEventObject, data: Fancytree.EventData) => boolean|undefined);
     }
 
     /** Data object passed to FancytreeNode() constructor. Note: typically these attributes are accessed by meber methods, e.g. `node.isExpanded()` and `node.setSelected(false)`.  */
     interface NodeData {
         /** node text (may contain HTML tags) */
         title: string;
-        icon?: string;
+        icon?: boolean|string;
         /** unique key for this node (auto-generated if omitted) */
         key?: string;
         /** (reserved) */
@@ -820,6 +851,21 @@ declare namespace Fancytree {
         extraClasses?: string;
         /** all properties from will be copied to `node.data` */
         data?: Object;
+
+        /** Will be added as title attribute of the node's icon span,thus enabling a tooltip. */
+        iconTooltip?: string;
+
+        /** If set, make this node a status node. Values: 'error', 'loading', 'nodata', 'paging'. */
+        statusNodeType?: string;
+
+        /** Made available as node.type. */
+        type?: string;
+
+        /** Ignore this node when calculating the partsel status of parent nodes in selectMode 3 propagation. */
+        unselectableIgnore?: boolean;
+
+        /** Use this as constant selected value(overriding selectMode 3 propagation). */
+        unselectableStatus?: boolean;
     }
 
     /** Data object similar to NodeData, but with additional options.
diff --git a/types/jquery.fancytree/jquery.fancytree-tests.ts b/types/jquery.fancytree/jquery.fancytree-tests.ts
index 4fa52c790a..de1489de42 100644
--- a/types/jquery.fancytree/jquery.fancytree-tests.ts
+++ b/types/jquery.fancytree/jquery.fancytree-tests.ts
@@ -13,7 +13,8 @@ $("#tree").fancytree({
 						{
 							title: "Folder 2", key: "2", folder: true, children: [
 							{ title: "Node 2.1", key: "3" },
-							{ title: "Node 2.2", key: "4" }
+							{ title: "Node 2.2", key: "4" },
+							{ title: "NOde 2.3", key: "5", icon: "./icon.svg", checkbox: "radio"}
 						]
 						}
 					]
@@ -24,7 +25,7 @@ $("#tree").fancytree({
 	click: (ev: JQueryEventObject, node: Fancytree.EventData) => {
 		return true;
 	},
-	checkbox: true,
+	checkbox: "radio",//boolean or "radio"
 	expand: () => {
 		console.log("expanded");
 	},
@@ -38,8 +39,14 @@ $("#tree").fancytree({
 		if (data.node.isFolder()) {
 			return false;
 		}
+	},
+	unselectable: function (event, data) {
+		return true;
+	},
+	unselectableIgnore: false,
+	unselectableStatus: function (event, data) {
+		return false;
 	}
-
 });
 
 //$("#tree").fancytree();
@@ -91,3 +98,26 @@ alert("We have " + tree.count() + " nodes.");
 
 // Use the API
 node.setTitle("New title");
+
+// add/remove/toggle class
+activeNode.addClass("test-class");
+activeNode.removeClass("test-class");
+activeNode.toggleClass("test-class");
+activeNode.toggleClass("test-class", true);
+
+// Fancytree.findAll()
+var nodes: Fancytree.FancytreeNode[];
+nodes = tree.findAll((node) => {
+	return true;
+});
+nodes = tree.findAll("Node");
+
+node.addChildren({
+	title: "New Node",
+	key: "15",
+	type: "book",
+	iconTooltip: "Icon toolip",
+	statusNodeType: "loading",
+	unselectableIgnore: true,
+	unselectableStatus: false,
+}, 0);
\ No newline at end of file
diff --git a/types/jquery.fancytree/tslint.json b/types/jquery.fancytree/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.fancytree/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.fileupload/tslint.json b/types/jquery.fileupload/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.fileupload/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.filtertable/tslint.json b/types/jquery.filtertable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.filtertable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.finger/tslint.json b/types/jquery.finger/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.finger/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.flagstrap/tslint.json b/types/jquery.flagstrap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.flagstrap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.form/tslint.json b/types/jquery.form/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.form/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.fullscreen/tslint.json b/types/jquery.fullscreen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.fullscreen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.gridster/tslint.json b/types/jquery.gridster/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.gridster/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.highlight-bartaz/tslint.json b/types/jquery.highlight-bartaz/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.highlight-bartaz/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.jnotify/tslint.json b/types/jquery.jnotify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.jnotify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.joyride/tslint.json b/types/jquery.joyride/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.joyride/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.jsignature/tslint.json b/types/jquery.jsignature/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.jsignature/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.leanmodal/tslint.json b/types/jquery.leanmodal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.leanmodal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.livestampjs/package.json b/types/jquery.livestampjs/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/jquery.livestampjs/package.json
+++ b/types/jquery.livestampjs/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/jquery.livestampjs/tslint.json b/types/jquery.livestampjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.livestampjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.menuaim/tslint.json b/types/jquery.menuaim/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.menuaim/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.mmenu/tslint.json b/types/jquery.mmenu/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.mmenu/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.notifybar/tslint.json b/types/jquery.notifybar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.notifybar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.noty/index.d.ts b/types/jquery.noty/index.d.ts
index 0e54c7a750..ec2f9c36dd 100644
--- a/types/jquery.noty/index.d.ts
+++ b/types/jquery.noty/index.d.ts
@@ -2,9 +2,10 @@
 // Project: http://needim.github.io/noty/
 // Definitions by: Aaron King <https://github.com/kingdango>, Tim Helfensdörfer <https://github.com/thelfensdrfer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Project by: Nedim Carter <http://needim.github.io>
 // TypeScript Version: 2.3
 
+// Project by: Nedim Carter <http://needim.github.io>
+
 /// <reference types="jquery"/>
 
 interface NotyOptions {
diff --git a/types/jquery.noty/tslint.json b/types/jquery.noty/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.noty/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.payment/tslint.json b/types/jquery.payment/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.payment/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.pjax/tslint.json b/types/jquery.pjax/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.pjax/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.placeholder/tslint.json b/types/jquery.placeholder/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.placeholder/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.pnotify/tslint.json b/types/jquery.pnotify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.pnotify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.postmessage/tslint.json b/types/jquery.postmessage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.postmessage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.prettyphoto/tslint.json b/types/jquery.prettyphoto/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.prettyphoto/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.qrcode/tslint.json b/types/jquery.qrcode/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.qrcode/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.rateit/tslint.json b/types/jquery.rateit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.rateit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.rowgrid/tslint.json b/types/jquery.rowgrid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.rowgrid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.scrollto/tslint.json b/types/jquery.scrollto/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.scrollto/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.simplemodal/tslint.json b/types/jquery.simplemodal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.simplemodal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.simplepagination/tslint.json b/types/jquery.simplepagination/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.simplepagination/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.simulate/tslint.json b/types/jquery.simulate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.simulate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.slimscroll/tslint.json b/types/jquery.slimscroll/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.slimscroll/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.soap/tslint.json b/types/jquery.soap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.soap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.sortelements/tslint.json b/types/jquery.sortelements/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.sortelements/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.superlink/tslint.json b/types/jquery.superlink/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.superlink/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.tagsmanager/tslint.json b/types/jquery.tagsmanager/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.tagsmanager/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.tile/tslint.json b/types/jquery.tile/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.tile/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.timeago/tslint.json b/types/jquery.timeago/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.timeago/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.timepicker/tslint.json b/types/jquery.timepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.timepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.timer/tslint.json b/types/jquery.timer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.timer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.tinycarousel/tslint.json b/types/jquery.tinycarousel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.tinycarousel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.tinyscrollbar/tslint.json b/types/jquery.tinyscrollbar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.tinyscrollbar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.tipsy/tslint.json b/types/jquery.tipsy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.tipsy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.tooltipster/index.d.ts b/types/jquery.tooltipster/index.d.ts
deleted file mode 100644
index 44536908ff..0000000000
--- a/types/jquery.tooltipster/index.d.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-// Type definitions for jQuery Tooltipster 3.3.0
-// Project: https://github.com/iamceege/tooltipster
-// Definitions by: Patrick Magee <https://github.com/pjmagee>,
-//                 Dmitry Pesterev <https://github.com/VorobeY1326>,
-//                 Leonard Thieu <https://github.com/leonard-thieu>,
-//                 Jan Hirzel <https://github.com/janhi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery" />
-
-interface JQueryTooltipsterOptions {
-    /**
-    * Determines how the tooltip will animate in and out. Feel free to modify or create custom transitions in the tooltipster.css file. In IE9 and 8, all animations default to a JavaScript generated, fade animation. Default: 'fade'
-    * fade, grow, swing, slide, fall
-    */
-    animation?: string;
-    /**
-    * Adds the "speech bubble arrow" to the tooltip. Default: true
-    */
-    arrow?: boolean;
-    /**
-    * Select a specific color for the "speech bubble arrow". Default: will inherit the tooltip's background color
-    * hex code / rgb
-    */
-    arrowColor?: string;
-    /**
-    * If autoClose is set to false, the tooltip will never close unless you call the 'close' method yourself. Default: true
-    */
-    autoClose?: boolean;
-    /**
-    * If set, this will override the content of the tooltip. Default: null
-    * @type string, jQuery object
-    */
-    content?: string | JQuery;
-    /**
-    * If the content of the tooltip is provided as a string, it is displayed as plain text by default. If this content should actually be interpreted as HTML, set this option to true. Default: false
-    */
-    contentAsHTML?: boolean;
-    /**
-    * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object that should actually be used. Default: true
-    */
-    contentCloning?: boolean;
-    /**
-    * Tooltipster logs notices into the console when you're doing something you ideally shouldn't be doing. Set to false to disable logging. Default: true
-    */
-    debug?: boolean;
-    /**
-    * Delay how long it takes (in milliseconds) for the tooltip to start animating in. Default: 200
-    */
-    delay?: number;
-    /**
-    * Set a minimum width for the tooltip. Default: 0 (auto width)
-    */
-    minWidth?: number;
-    /**
-    * Set a max width for the tooltip. If the tooltip ends up being smaller than the set max width, the tooltip's width will be set automatically. Default: 0 (no max width)
-    */
-    maxWidth?: number;
-    /**
-    * Create a custom function to be fired only once at instantiation. If the function returns a value, this value will become the content of the tooltip. See the advanced section to learn more. Default: function(origin, content) {}
-    */
-    functionInit?: (origin: JQuery, content: string) => void | string;
-    /**
-    * Create a custom function to be fired before the tooltip opens. This function may prevent or hold off the opening. See the advanced section to learn more. Default: function(origin, continueTooltip) { continueTooltip(); }
-    */
-    functionBefore?: (origin: JQuery, continueTooltip: Function) => void;
-    /**
-    * Create a custom function to be fired when the tooltip and its contents have been added to the DOM. Default: function(origin, tooltip) {}
-    */
-    functionReady?: (origin: JQuery, tooltip: JQuery) => void;
-    /**
-    * Create a custom function to be fired once the tooltip has been closed and removed from the DOM. Default: function(origin) {}
-    */
-    functionAfter?: (origin: JQuery) => void;
-    /**
-    * If true, the tooltip will close if its origin is clicked. This option only applies when 'trigger' is 'hover' and 'autoClose' is false. Default: false
-    */
-    hideOnClick?: boolean;
-    /**
-    * If using the iconDesktop or iconTouch options, this sets the content for your icon. Default: '(?)'
-    * @type string, jQuery object
-    */
-    icon?: string | JQuery;
-    /**
-    * If you provide a jQuery object to the 'icon' option, this sets if it is a clone of this object that should actually be used. Default: true
-    */
-    iconCloning?: boolean;
-    /**
-    * Generate an icon next to your content that is responsible for activating the tooltip on non-touch devices. Default: false
-    */
-    iconDesktop?: boolean;
-    /**
-    * If using the iconDesktop or iconTouch options, this sets the class on the icon (used to style the icon). Default: 'tooltipster-icon'
-    */
-    iconTheme?: string;
-    /**
-    * Generate an icon next to your content that is responsible for activating the tooltip on touch devices (tablets, phones, etc). Default: false
-    */
-    iconTouch?: boolean;
-    /**
-    * Give users the possibility to interact with the tooltip. Unless autoClose is set to false, the tooltip will still close if the user moves away from or clicks out of the tooltip. Default: false
-    */
-    interactive?: boolean;
-    /**
-    * If the tooltip is interactive and activated by a hover event, set the amount of time (milliseconds) allowed for a user to hover off of the tooltip activator (origin) on to the tooltip itself - keeping the tooltip from closing. Default: 350
-    */
-    interactiveTolerance?: number;
-    /**
-    * Allows you to put multiple tooltips on a single element. Read further instructions down this page. Default: false
-    */
-    multiple?: boolean;
-    /**
-    * Offsets the tooltip (in pixels) farther left/right from the origin. Default: 0
-    */
-    offsetX?: number;
-    /**
-    * Offsets the tooltip (in pixels) farther up/down from the origin. Default: 0
-    */
-    offsetY?: number;
-    /**
-    * If true, only one tooltip will be allowed to be active at a time. Non-autoclosing tooltips will not be closed though. Default: false
-    */
-    onlyOne?: boolean;
-    /**
-    * Set the position of the tooltip. Default: 'top'
-    * right, left, top, top-right, top-left, bottom, bottom-right, bottom-left
-    */
-    position?: string;
-    /**
-    * Will reposition the tooltip if the origin moves. As this option may have an impact on performance, we suggest you enable it only if you need to. Default: false
-    */
-    positionTracker?: boolean;
-    /**
-    * Called after the tooltip has been repositioned by the position tracker (if enabled). Default: A function that will close the tooltip if the trigger is 'hover' and autoClose is false.
-    */
-    positionTrackerCallback?:  (origin: JQuery) => void;
-    /**
-    * Specify if a TITLE attribute should be restored on the HTML element after a call to the 'destroy' method. This attribute may be omitted, or be restored with the value that existed before Tooltipster was initialized, or be restored with the stringified value of the current content. Note: in case of multiple tooltips on a single element, only the last destroyed tooltip may trigger a restoration. Default: 'current'
-    */
-    restoration?: string;
-    /**
-    * Sets the side of the tooltip. The value may one of the following: 'top', 'bottom', 'left', 'right'. It may also be an array containing one or more of these values. When using an array, the order of values is taken into account as order of fallbacks and the absence of a side disables it (see the sides section). Default: ['top', 'bottom', 'right', 'left']
-    */
-    side?: string | string[];
-    /**
-    * Set the speed of the animation. Default: 350
-    */
-    speed?: number;
-    /**
-    * How long the tooltip should be allowed to live before closing. Default: 0 (disabled)
-    */
-    timer?: number;
-    /**
-    * Set the theme used for your tooltip. Default: 'tooltipster-default'
-    */
-    theme?: string;
-    /**
-    * If set to false, tooltips will not show on pure-touch devices, unless you open them yourself with the 'show' method. Touch gestures on devices which also have a mouse will still open the tooltips though. Default: true
-    */
-    touchDevices?: boolean;
-    /**
-    * Set how tooltips should be activated and closed. See the advanced section to learn how to build custom triggers. Default: 'hover'
-    * hover, click, custom
-    */
-    trigger?: string;
-    /**
-    * If a tooltip is open while its content is updated, play a subtle animation when the content changes. Default: true
-    */
-    updateAnimation?: boolean;
-}
-
-interface JQuery {
-
-    /**
-     * Show a tooltip (the 'callback' argument is optional)
-     * @param methodName show
-     * @param callback Function for call back
-    */
-    tooltipster(methodName: "show", callback?: Function): JQuery;
-
-    /**
-     * Hide a tooltip (the 'callback' argument is optional)
-     * @param methodName hide
-     * @param callback Function for call back
-    */
-    tooltipster(methodName: "hide", callback?: Function): JQuery;
-
-    /**
-     * Update tooltip content
-     * @param methodName content
-     * @param newContent New content
-     */
-    tooltipster(methodName: "content", newContent: string): JQuery;
-
-    /**
-     * Update tooltip content
-     * @param methodName option
-     * @param optionName Option name
-     */
-    tooltipster(methodName: "option", optionName: string): JQuery;
-
-    /**
-     * Set the value of an option (use at your own risk, we do not provide support for issues you may encounter when using this method)
-     * @param methodName option
-     * @param optionName Option name
-     * @param optionValue New vale for option
-     */
-    tooltipster(methodName: "option", optionName: string, optionValue: string): JQuery;
-
-
-    /**
-     * Temporarily disable a tooltip from being able to open
-     * @param methodName disable
-     */
-    tooltipster(methodName: "disable"): JQuery;
-
-    /**
-     * Temporarily disable a tooltip from being able to open
-     * @param methodName enable
-     */
-    tooltipster(methodName: "enable"): JQuery;
-
-    /**
-     * Hide and destroy tooltip functionality
-     * @param methodName destroy
-     */
-    tooltipster(methodName: "destroy"): JQuery;
-
-    /**
-     * Return a tooltip's current content (if selector contains multiple origins, only the value of the first will be returned)
-     * @param methodName content
-     */
-    tooltipster(methodName: "content"): string;
-
-    /**
-     * Reposition and resize the tooltip
-     * @param methodName reposition
-     */
-    tooltipster(methodName: "reposition"): JQuery;
-
-    /**
-     * Return the HTML root element of the tooltip
-     * @param methodName elementTooltip
-     */
-    tooltipster(methodName: "elementTooltip"): JQuery;
-
-    /**
-     * Return the HTML root element of the icon if there is one, 'undefined' otherwise
-     * @param methodName elementIcon
-     */
-    tooltipster(methodName: "elementIcon"): JQuery;
-
-    /**
-     * Change default options for all future instances
-     * @param methodName setDefaults
-     * @param {object} options The options that should be made defaults
-     */
-    tooltipster(methodName: 'setDefaults', options: JQueryTooltipsterOptions): JQuery;
-
-    /**
-     * Generics
-     */
-    tooltipster(methodName: string, optionName: string, optionValue?: string): JQuery;
-    tooltipster(methodName: string): JQuery | string;
-
-    /**
-     * Creates a new tooltip with the specified, or default, options.
-     * @param options The options
-     * @example
-     * $('.tooltip').tooltipster({
-    *   animation: 'fade',
-    *   delay: 200,
-    *   theme: 'tooltipster-default',
-    *   touchDevices: false,
-    *   trigger: 'hover'
-    * });
-     */
-    tooltipster(options?: JQueryTooltipsterOptions): JQuery;
-
-    /**
-     * Initiate the Tooltipster plugin
-     */
-    tooltipster(): JQuery;
-}
diff --git a/types/jquery.tooltipster/jquery.tooltipster-tests.ts b/types/jquery.tooltipster/jquery.tooltipster-tests.ts
deleted file mode 100644
index 3d48c29bcc..0000000000
--- a/types/jquery.tooltipster/jquery.tooltipster-tests.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-// Type definition tests for jQuery Tooltipster 3.3.0
-// Project: https://github.com/iamceege/tooltipster
-// Definitions by: Patrick Magee <https://github.com/pjmagee/>, Dmitry Pesterev <https://github.com/VorobeY1326/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Tests taken from the getting started section of the Tooltipster website
-
-$(document).ready(function () {
-
-    $('.tooltip').tooltipster();
-
-    $('#my-tooltip').tooltipster({
-        content: $('<span><img src="my-image.png" /> <strong>This text is in bold case !</strong></span>')
-    });
-
-    $('#my-tooltip').tooltipster({
-        content: 'string test'
-    });
-});
-
-
-$(document).ready(function () {
-    $('.tooltip').tooltipster({
-        contentAsHTML: true
-    });
-});
-
-$('.tooltip').tooltipster({
-    theme: 'tooltipster-noir'
-});
-
-$('.tooltip').tooltipster({
-    animation: 'fade',
-    delay: 200,
-    theme: 'tooltipster-default',
-    touchDevices: false,
-    trigger: 'hover'
-});
-
-$.fn.tooltipster('setDefaults', {
-    position: 'bottom'
-});
-
-var myNewContent = '';
-
-function callback(): void {
-
-}
-
-// temporarily disable a tooltip from being able to open
-$('.tooltip').tooltipster('disable');
-
-// if a tooltip was disabled from opening, reenable its previous functionality
-$('.tooltip').tooltipster('enable');
-
-// hide and destroy tooltip functionality
-$('.tooltip').tooltipster('destroy');
-
-// return a tooltip's current content (if selector contains multiple origins, only the value of the first will be returned)
-$('.tooltip').tooltipster('content');
-
-// update tooltip content
-$('.tooltip').tooltipster('content', myNewContent);
-
-//update option
-$('.tooltip').tooltipster('option', 'delay', '200');
-
-// reposition and resize the tooltip
-$('.tooltip').tooltipster('reposition');
-
-// return the HTML root element of the tooltip
-$('.tooltip').tooltipster('elementTooltip');
-
-// return the HTML root element of the icon if there is one, 'undefined' otherwise
-$('.tooltip').tooltipster('elementIcon');
-
-$('.tooltip').tooltipster({
-    content: 'Loading...',
-    functionBefore: function (origin, continueTooltip) {
-
-        // we'll make this function asynchronous and allow the tooltip to go ahead and show the loading notification while fetching our data
-        continueTooltip();
-
-        // next, we want to check if our data has already been cached
-        if (origin.data('ajax') !== 'cached') {
-            $.ajax({
-                type: 'POST',
-                url: 'example.php',
-                success: function (data) {
-                    // update our tooltip content with our returned data and cache it
-                    origin.tooltipster('content', data).data('ajax', 'cached');
-                }
-            });
-        }
-    }
-});
-
-
-
-$('.tooltip').tooltipster({
-    content: 'Loading...',
-    functionBefore: (origin, continueTooltip) => {
-
-        // we'll make this function asynchronous and allow the tooltip to go ahead and show the loading notification while fetching our data
-        continueTooltip();
-
-        // next, we want to check if our data has already been cached
-        if (origin.data('ajax') !== 'cached') {
-            $.ajax({
-                type: 'POST',
-                url: 'example.php',
-                success: function (data) {
-                    // update our tooltip content with our returned data and cache it
-                    origin.tooltipster('content', data).data('ajax', 'cached');
-                }
-            });
-        }
-    }
-});
-
-$('.tooltip').tooltipster({
-    functionInit: function (origin, content) {
-
-        if (content === 'This is bad content') {
-
-            // when the request has finished loading, we will change the tooltip's content
-            $.ajax({
-                type: 'POST',
-                url: 'example.php',
-                success: function (data) {
-                    origin.tooltipster('content', 'New content has been loaded : ' + data);
-                }
-            });
-
-            // this returned string will overwrite the content of the tooltip for the time being
-            return 'Wait while we load new content...';
-        }
-        else {
-            // return nothing : the initialization continues normally with its content unchanged.
-        }
-    }
-});
-
-$('.tooltip').tooltipster({
-    functionInit: (origin, content) => {
-
-        if (content === 'This is bad content') {
-
-            // when the request has finished loading, we will change the tooltip's content
-            $.ajax({
-                type: 'POST',
-                url: 'example.php',
-                success: function (data) {
-                    origin.tooltipster('content', 'New content has been loaded : ' + data);
-                }
-            });
-
-            // this returned string will overwrite the content of the tooltip for the time being
-            return 'Wait while we load new content...';
-        }
-        else {
-            // return nothing : the initialization continues normally with its content unchanged.
-        }
-    }
-});
-
-$(document).ready(function () {
-
-    // first on page load, initiate the Tooltipster plugin
-    $('.tooltip').tooltipster();
-
-    $('.tooltip').tooltipster({
-        contentAsHTML: true
-    });
-
-    $('.tooltip').tooltipster({
-        content: $('<span><img src="my-image.png" /> <strong>This text is in bold case !</strong></span>')
-    });
-
-    // then immediately show the tooltip
-    $('#example').tooltipster('show');
-
-    // as soon as a key is pressed on the keyboard, hide the tooltip.
-    $(window).keypress(function () {
-        $('#example').tooltipster('hide');
-    });
-
-    $('#example').tooltipster('show', function () {
-        alert('The tooltip is now fully open. The content is: ' + this.tooltipster('content'));
-    });
-
-    $('#example').tooltipster('show', () => {
-        alert('The tooltip is now fully open. The content is: ' + this.tooltipster('content'));
-    });
-
-    $(window).keypress(function () {
-        $('#example').tooltipster('hide', function () {
-            alert('The tooltip is now fully closed');
-        });
-    });
-});
diff --git a/types/jquery.tooltipster/tsconfig.json b/types/jquery.tooltipster/tsconfig.json
deleted file mode 100644
index edc2812c82..0000000000
--- a/types/jquery.tooltipster/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": false,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "jquery.tooltipster-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/jquery.total-storage/tslint.json b/types/jquery.total-storage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.total-storage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.transit/tslint.json b/types/jquery.transit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.transit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.ui.datetimepicker/tslint.json b/types/jquery.ui.datetimepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.ui.datetimepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.ui.layout/tslint.json b/types/jquery.ui.layout/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.ui.layout/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.uniform/tslint.json b/types/jquery.uniform/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.uniform/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.validation/index.d.ts b/types/jquery.validation/index.d.ts
index 95be732332..bcd4bb7f9d 100644
--- a/types/jquery.validation/index.d.ts
+++ b/types/jquery.validation/index.d.ts
@@ -279,25 +279,23 @@ interface JQuery {
      * @param attributes A space-separated list of attribute names to remove.
      */
     removeAttrs(attributes: string): any;
-    // tslint:disable:unified-signatures
     /**
      * Adds the specified rules and returns all rules for the first matched element. Requires that the parent form is validated, that is, $( "form" ).validate() is called first.
      *
      * @param command "remove" or "add"
      * @param rules The rules to add. Accepts the same format as the rules-option of the validate-method.
      */
-    rules(command: "add", rules?: JQueryValidation.RulesDictionary): any;
+    rules(command: "add", rules?: JQueryValidation.RulesDictionary): any; // tslint:disable-line unified-signatures
     /**
      * Removes the specified rules and returns all rules for the first matched element.
      * @param command "remove"
      * @param rules The space-seperated names of rules to remove and return. If left unspecified, removes and returns all rules. Manipulates only rules specified via rules-option or via rules("add").
      */
-    rules(command: "remove", rules?: string): any;
+    rules(command: "remove", rules?: string): any; // tslint:disable-line unified-signatures
     /**
      * Returns the validation rules for teh first selected element.
      */
     rules(): any;
-    // tslint:enable
     /**
      * Checks whether the selected form is valid or whether all selected elements are valid.
      */
diff --git a/types/jquery.watermark/tslint.json b/types/jquery.watermark/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.watermark/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery.window/tslint.json b/types/jquery.window/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery.window/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index e557103e47..c4abf6db7b 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -41,6 +41,11 @@ type _Event = Event;
 type _Promise<T> = Promise<T>;
 
 interface JQueryStatic<TElement extends Node = HTMLElement> {
+    /**
+     * @see {@link http://api.jquery.com/jquery.ajax/#jQuery-ajax1}
+     * @deprecated Use jQuery.ajaxSetup(options)
+     */
+    ajaxSettings: JQuery.AjaxSettings;
     /**
      * A factory function that returns a chainable utility object with methods to register multiple
      * callbacks into callback queues, invoke callback queues, and relay the success or failure state of
@@ -230,7 +235,6 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param element The DOM element to query for the data.
      * @param key Name of the data stored.
-     * @param undefined
      * @see {@link https://api.jquery.com/jQuery.data/}
      * @since 1.2.3
      */
@@ -723,7 +727,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.parseHTML/}
      * @since 1.8
      */
-    parseHTML(data: string, context_keepScripts?: Document | null | undefined | boolean): JQuery.Node[];
+    parseHTML(data: string, context_keepScripts?: Document | null | boolean): JQuery.Node[];
     /**
      * Takes a well-formed JSON string and returns the resulting JavaScript value.
      *
@@ -3019,7 +3023,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @see {@link https://api.jquery.com/after/}
      * @since 1.0
      */
-    after(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>>): this;
+    after(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
     /**
      * Insert content, specified by the parameter, after each element in the set of matched elements.
      *
@@ -3031,7 +3035,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @since 1.4
      * @since 1.10
      */
-    after(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>): this;
+    after(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>): this;
     /**
      * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
      *
@@ -3135,7 +3139,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @see {@link https://api.jquery.com/append/}
      * @since 1.0
      */
-    append(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>>): this;
+    append(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
     /**
      * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
      *
@@ -3146,7 +3150,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @see {@link https://api.jquery.com/append/}
      * @since 1.4
      */
-    append(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>): this;
+    append(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>): this;
     /**
      * Insert every element in the set of matched elements to the end of the target.
      *
@@ -3193,7 +3197,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @see {@link https://api.jquery.com/before/}
      * @since 1.0
      */
-    before(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>>): this;
+    before(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
     /**
      * Insert content, specified by the parameter, before each element in the set of matched elements.
      *
@@ -3205,7 +3209,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @since 1.4
      * @since 1.10
      */
-    before(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>): this;
+    before(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>): this;
     // [bind() overloads] https://github.com/jquery/api.jquery.com/issues/1048
     /**
      * Attach a handler to an event for the elements.
@@ -3417,7 +3421,6 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * data(name, value) or by an HTML5 data-* attribute.
      *
      * @param key Name of the data stored.
-     * @param undefined
      * @see {@link https://api.jquery.com/data/}
      * @since 1.2.3
      */
@@ -3889,6 +3892,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @since 1.0
      * @since 1.4
      */
+    // HACK: The type parameter T is not used but ensures the 'event' callback parameter is typed correctly.
     hover<T>(handlerInOut: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false,
              handlerOut?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4597,7 +4601,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @see {@link https://api.jquery.com/prepend/}
      * @since 1.0
      */
-    prepend(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>>): this;
+    prepend(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
     /**
      * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
      *
@@ -4608,7 +4612,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @see {@link https://api.jquery.com/prepend/}
      * @since 1.4
      */
-    prepend(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node> | JQuery<JQuery.Node>): this;
+    prepend(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>): this;
     /**
      * Insert every element in the set of matched elements to the beginning of the target.
      *
@@ -5366,6 +5370,9 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     [n: number]: TElement;
 }
 
+// ES5 compatibility
+interface Iterable<T> { }
+
 declare namespace JQuery {
     type TypeOrArray<T> = T | T[];
     type Node = Element | Text | Comment;
@@ -5401,6 +5408,14 @@ declare namespace JQuery {
          * A string containing the URL to which the request is sent.
          */
         url?: string;
+        /**
+         * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x,
+         * XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and
+         * settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend
+         * function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless
+         * of the type of request.
+         */
+        beforeSend?(this: TContext, jqXHR: jqXHR, settings: AjaxSettings<TContext>): false | void;
     }
 
     interface UrlAjaxSettings<TContext = any> extends Ajax.AjaxSettingsBase<TContext> {
@@ -5408,6 +5423,14 @@ declare namespace JQuery {
          * A string containing the URL to which the request is sent.
          */
         url: string;
+        /**
+         * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x,
+         * XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and
+         * settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend
+         * function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless
+         * of the type of request.
+         */
+        beforeSend?(this: TContext, jqXHR: jqXHR, settings: UrlAjaxSettings<TContext>): false | void;
     }
 
     namespace Ajax {
@@ -6768,7 +6791,7 @@ declare namespace JQuery {
             (failFilter?: ((t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
                 BRF, BJF, BNF,
                 CRF, CJF, CNF,
-                RRF, RJF, RNF> | Thenable<ARF> | ARF) | undefined | null): PromiseBase<ARF, AJF, ANF,
+                RRF, RJF, RNF> | Thenable<ARF> | ARF) | null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
@@ -7349,7 +7372,7 @@ declare namespace JQuery {
             (failFilter?: ((...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
                 BRF, BJF, BNF,
                 CRF, CJF, CNF,
-                RRF, RJF, RNF> | Thenable<ARF> | ARF) | undefined | null): PromiseBase<ARF, AJF, ANF,
+                RRF, RJF, RNF> | Thenable<ARF> | ARF) | null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 0694ce2502..338509a37a 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -1,5 +1,3 @@
-// tslint:disable:interface-name
-
 function JQueryStatic() {
     function type_assertion() {
         const $Canvas = $ as JQueryStatic<HTMLCanvasElement>;
@@ -62,6 +60,11 @@ function JQueryStatic() {
         $();
     }
 
+    function ajaxSettings() {
+        // $ExpectType AjaxSettings<any>
+        $.ajaxSettings;
+    }
+
     function Event() {
         // $ExpectType EventStatic<HTMLElement>
         $.Event;
@@ -1654,8 +1657,8 @@ function JQueryStatic() {
     }
 
     function type() {
-        // $ExpectType "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" | "array" | "date" | "error" | "null" | "regexp"
-        $.type({});
+        // // $ExpectType "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" | "array" | "date" | "error" | "null" | "regexp"
+        // $.type({});
     }
 
     function unique() {
@@ -2127,8 +2130,8 @@ function JQuery() {
                 this;
                 // $ExpectType string
                 responseText;
-                // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-                textStatus;
+                // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+                // textStatus;
                 // $ExpectType jqXHR<any>
                 jqXHR;
             });
@@ -2139,8 +2142,8 @@ function JQuery() {
                 this;
                 // $ExpectType string
                 responseText;
-                // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-                textStatus;
+                // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+                // textStatus;
                 // $ExpectType jqXHR<any>
                 jqXHR;
             });
@@ -2151,8 +2154,8 @@ function JQuery() {
                 this;
                 // $ExpectType string
                 responseText;
-                // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-                textStatus;
+                // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+                // textStatus;
                 // $ExpectType jqXHR<any>
                 jqXHR;
             });
@@ -5130,7 +5133,7 @@ function JQuery() {
     function manipulation() {
         function after() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').after('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text()]);
+            $('p').after('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()]);
 
             // $ExpectType JQuery<HTMLElement>
             $('p').after(function(index, html) {
@@ -5168,18 +5171,6 @@ function JQuery() {
                 return new Text();
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').after(function(index, html) {
-                // $ExpectType HTMLElement
-                this;
-                // $ExpectType number
-                index;
-                // $ExpectType string
-                html;
-
-                return [new Element(), new Text()];
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').after(function(index, html) {
                 // $ExpectType HTMLElement
@@ -5191,11 +5182,23 @@ function JQuery() {
 
                 return $('p').contents();
             });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').after(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return [new Element(), new Text(), $('p').contents()];
+            });
         }
 
         function append() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').append('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text()]);
+            $('p').append('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()]);
 
             // $ExpectType JQuery<HTMLElement>
             $('p').append(function(index, html) {
@@ -5233,18 +5236,6 @@ function JQuery() {
                 return new Text();
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').append(function(index, html) {
-                // $ExpectType HTMLElement
-                this;
-                // $ExpectType number
-                index;
-                // $ExpectType string
-                html;
-
-                return [new Element(), new Text()];
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').append(function(index, html) {
                 // $ExpectType HTMLElement
@@ -5259,11 +5250,23 @@ function JQuery() {
 
             // $ExpectType JQuery<HTMLElement>
             $('p').append($.parseHTML('<span>myTextNode <!-- myComment --></span>'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').append(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return [new Element(), new Text(), $('p').contents()];
+            });
         }
 
         function before() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').before('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text()]);
+            $('p').before('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()]);
 
             // $ExpectType JQuery<HTMLElement>
             $('p').before(function(index, html) {
@@ -5310,7 +5313,7 @@ function JQuery() {
                 // $ExpectType string
                 html;
 
-                return [new Element(), new Text()];
+                return $('p').contents();
             });
 
             // $ExpectType JQuery<HTMLElement>
@@ -5322,13 +5325,13 @@ function JQuery() {
                 // $ExpectType string
                 html;
 
-                return $('p').contents();
+                return [new Element(), new Text(), $('p').contents()];
             });
         }
 
         function prepend() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').prepend('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text()]);
+            $('p').prepend('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text()], [new Element(), $('p').contents()]);
 
             // $ExpectType JQuery<HTMLElement>
             $('p').prepend(function(index, html) {
@@ -5375,7 +5378,7 @@ function JQuery() {
                 // $ExpectType string
                 html;
 
-                return [new Element(), new Text()];
+                return $('p').contents();
             });
 
             // $ExpectType JQuery<HTMLElement>
@@ -5387,7 +5390,7 @@ function JQuery() {
                 // $ExpectType string
                 html;
 
-                return $('p').contents();
+                return [new Element(), new Text(), $('p').contents()];
             });
         }
 
@@ -6190,7 +6193,7 @@ function JQuery_AjaxSettings() {
             this;
             // $ExpectType jqXHR<any>
             jqXHR;
-            // $ExpectType AjaxSettingsBase<any>
+            // $ExpectType AjaxSettings<any>
             settings;
         },
         cache: false,
@@ -6199,8 +6202,8 @@ function JQuery_AjaxSettings() {
             this;
             // $ExpectType jqXHR<any>
             jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
         },
         contents: {
             mycustomtype: /mycustomtype/
@@ -6300,7 +6303,7 @@ function JQuery_AjaxSettings() {
             this;
             // $ExpectType jqXHR<any>
             jqXHR;
-            // $ExpectType AjaxSettingsBase<any>
+            // $ExpectType AjaxSettings<any>
             settings;
 
             return false;
@@ -6310,8 +6313,8 @@ function JQuery_AjaxSettings() {
             this;
             // $ExpectType jqXHR<any>
             jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
         }],
         contentType: false,
         data: 'myData',
@@ -6519,22 +6522,22 @@ function JQuery_jqXHR() {
         $.ajax('/echo/json').always((data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         }, [(data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         }], (data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         });
@@ -6543,15 +6546,15 @@ function JQuery_jqXHR() {
         $.ajax('/echo/json').always((data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         }, [(data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         }]);
@@ -6560,15 +6563,15 @@ function JQuery_jqXHR() {
         $.ajax('/echo/json').always([(data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         }], (data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         });
@@ -6577,8 +6580,8 @@ function JQuery_jqXHR() {
         $.ajax('/echo/json').always((data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         });
@@ -6587,8 +6590,8 @@ function JQuery_jqXHR() {
         $.ajax('/echo/json').always([(data_jqXHR, textStatus, jqXHR_errorThrown) => {
             // $ExpectType any
             data_jqXHR;
-            // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
-            textStatus;
+            // // $ExpectType "success" | "notmodified" | "nocontent" | "error" | "timeout" | "abort" | "parsererror"
+            // textStatus;
             // $ExpectType string | jqXHR<any>
             jqXHR_errorThrown;
         }]);
@@ -7188,7 +7191,8 @@ function JQuery_Promise3() {
     }
 
     async function testAsync(p: JQuery.Promise3<string, {}, {}, {}, {}, {}, {}, {}, {}>): Promise<string> {
-        return await p;
+        const s: string = await p;
+        return s;
     }
 
     function compatibleWithPromise(): Promise<any> {
@@ -7331,7 +7335,8 @@ function JQuery_Promise2(p: JQuery.Promise2<string, Error, number, JQuery, strin
     }
 
     async function testAsync(p: JQuery.Promise2<string, {}, {}, {}, {}, {}>): Promise<string> {
-        return await p;
+        const s: string = await p;
+        return s;
     }
 
     function compatibleWithPromise(): Promise<any> {
@@ -7451,7 +7456,8 @@ function JQuery_Promise(p: JQuery.Promise<string, Error, number>) {
     }
 
     async function testAsync(p: JQuery.Promise<string, Error, number>): Promise<string> {
-        return await p;
+        const s: string = await p;
+        return s;
     }
 
     function compatibleWithPromise(): Promise<any> {
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index f32a2c3723..728a42b3d6 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -1,5 +1,3 @@
-/* tslint:disable:no-arg object-literal-shorthand one-variable-per-declaration only-arrow-functions prefer-const prefer-for-of triple-equals no-var */
-
 function examples() {
     function add_0() {
         $('div').css('border', '2px solid red')
diff --git a/types/jquery/test/longdesc-tests.ts b/types/jquery/test/longdesc-tests.ts
index bf63445c16..23ff500d24 100644
--- a/types/jquery/test/longdesc-tests.ts
+++ b/types/jquery/test/longdesc-tests.ts
@@ -1,5 +1,3 @@
-/* tslint:disable:object-literal-key-quotes object-literal-shorthand one-variable-per-declaration only-arrow-functions prefer-const prefer-for-of triple-equals no-var */
-
 function longdesc() {
     function add_0() {
         $('p').add('div').addClass('widget');
diff --git a/types/jquery/tslint.json b/types/jquery/tslint.json
index da57c7462f..dea67c016f 100644
--- a/types/jquery/tslint.json
+++ b/types/jquery/tslint.json
@@ -5,18 +5,31 @@
         "await-promise": false,
         "ban-types": false,
         "callable-types": false,
+        "interface-name": false,
+        "no-any-union": false,
+        "no-arg": false,
         "no-boolean-literal-compare": false,
+        "no-declare-current-package": false,
         "no-empty-interface": false,
         "no-misused-new": false,
         "no-object-literal-type-assertion": false,
+        "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,
         "no-unnecessary-type-assertion": false,
+        "no-var": false,
         "no-var-keyword": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
         "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-for-of": false,
         "prefer-switch": false,
         "prefer-template": false,
         "space-before-function-paren": false,
         "space-within-parens": false,
+        "triple-equals": false,
         "use-default-type-parameter": false
     }
 }
diff --git a/types/jquery/v1/jquery-tests.ts b/types/jquery/v1/jquery-tests.ts
index 4b6fc4e0db..d00c075125 100644
--- a/types/jquery/v1/jquery-tests.ts
+++ b/types/jquery/v1/jquery-tests.ts
@@ -2215,8 +2215,8 @@ function test_hide() {
         $("p").hide("slow");
     });
     $("#hidr").click(function () {
-        $("span:last-child").hide("fast", function () {
-            $(this).prev().hide("fast", arguments.callee);
+        $("span:last-child").hide("fast", function f() {
+            $(this).prev().hide("fast", f);
         });
     });
     $("#showr").click(function () {
@@ -3126,20 +3126,21 @@ function test_map() {
     }).get().join(", "));
     var mappedItems = $("li").map(function (index) {
         var replacement:any = $("<li>").text($(this).text()).get(0);
-        if (index === 0) {
-
-            // Make the first item all caps
-            $(replacement).text($(replacement).text().toUpperCase());
-        } else if (index === 1 || index === 3) {
-
-            // Delete the second and fourth items
-            replacement = null;
-        } else if (index === 2) {
-
-            // Make two of the third item and add some text
-            replacement = [replacement, $("<li>").get(0)];
-            $(replacement[0]).append("<b> - A</b>");
-            $(replacement[1]).append("Extra <b> - B</b>");
+        switch (index) {
+            case 0:
+                // Make the first item all caps
+                $(replacement).text($(replacement).text().toUpperCase());
+                break;
+            case 1:
+            case 3:
+                // Delete the second and fourth items
+                replacement = null;
+                break;
+            case 2:
+                // Make two of the third item and add some text
+                replacement = [replacement, $("<li>").get(0)];
+                $(replacement[0]).append("<b> - A</b>");
+                $(replacement[1]).append("Extra <b> - B</b>");
         }
 
         // Replacement will be a dom element, null,
diff --git a/types/jquery/v1/tslint.json b/types/jquery/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquery/v2/jquery-tests.ts b/types/jquery/v2/jquery-tests.ts
index 4b6fc4e0db..d00c075125 100644
--- a/types/jquery/v2/jquery-tests.ts
+++ b/types/jquery/v2/jquery-tests.ts
@@ -2215,8 +2215,8 @@ function test_hide() {
         $("p").hide("slow");
     });
     $("#hidr").click(function () {
-        $("span:last-child").hide("fast", function () {
-            $(this).prev().hide("fast", arguments.callee);
+        $("span:last-child").hide("fast", function f() {
+            $(this).prev().hide("fast", f);
         });
     });
     $("#showr").click(function () {
@@ -3126,20 +3126,21 @@ function test_map() {
     }).get().join(", "));
     var mappedItems = $("li").map(function (index) {
         var replacement:any = $("<li>").text($(this).text()).get(0);
-        if (index === 0) {
-
-            // Make the first item all caps
-            $(replacement).text($(replacement).text().toUpperCase());
-        } else if (index === 1 || index === 3) {
-
-            // Delete the second and fourth items
-            replacement = null;
-        } else if (index === 2) {
-
-            // Make two of the third item and add some text
-            replacement = [replacement, $("<li>").get(0)];
-            $(replacement[0]).append("<b> - A</b>");
-            $(replacement[1]).append("Extra <b> - B</b>");
+        switch (index) {
+            case 0:
+                // Make the first item all caps
+                $(replacement).text($(replacement).text().toUpperCase());
+                break;
+            case 1:
+            case 3:
+                // Delete the second and fourth items
+                replacement = null;
+                break;
+            case 2:
+                // Make two of the third item and add some text
+                replacement = [replacement, $("<li>").get(0)];
+                $(replacement[0]).append("<b> - A</b>");
+                $(replacement[1]).append("Extra <b> - B</b>");
         }
 
         // Replacement will be a dom element, null,
diff --git a/types/jquery/v2/tslint.json b/types/jquery/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquery/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jquerymobile/tslint.json b/types/jquerymobile/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jquerymobile/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jqueryui/index.d.ts b/types/jqueryui/index.d.ts
index f32c55eb48..e3f390a4a2 100644
--- a/types/jqueryui/index.d.ts
+++ b/types/jqueryui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQueryUI 1.11
+// Type definitions for jQueryUI 1.12
 // Project: http://jqueryui.com/
 // Definitions by: Boris Yankov <https://github.com/borisyankov>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -51,6 +51,12 @@ declare namespace JQueryUI {
         minLength?: number;
         position?: any; // object
         source?: any; // [], string or ()
+        classes?: AutocompleteClasses;
+    }
+
+    interface AutocompleteClasses {
+        "ui-autocomplete"?: string;
+        "ui-autocomplete-input"?: string;
     }
 
     interface AutocompleteUIParams {
@@ -377,7 +383,7 @@ declare namespace JQueryUI {
 		open?: DialogEvent;
         close?: DialogEvent;
     }
-    
+
     interface DialogClasses {
         "ui-dialog"?: string;
         "ui-dialog-content"?: string;
@@ -1384,8 +1390,8 @@ interface JQuery {
       * @param optionName 'autohide'
       */
       datepicker(methodName: 'option', optionName: 'autohide'): boolean;
-    
-   
+
+
       /**
       * Get the endDate after initialization
       *
@@ -1799,7 +1805,7 @@ interface JQuery {
     sortable(methodName: 'disable'): void;
     sortable(methodName: 'enable'): void;
     sortable(methodName: 'widget'): JQuery;
-    sortable(methodName: 'toArray'): string[];
+    sortable(methodName: 'toArray', options?: { attribute?: string; }): string[];
     sortable(methodName: string): JQuery;
     sortable(options: JQueryUI.SortableOptions): JQuery;
     sortable(optionLiteral: string, optionName: string): any;
diff --git a/types/jqueryui/jqueryui-tests.ts b/types/jqueryui/jqueryui-tests.ts
index c2067574cd..a9f6f0b5ff 100644
--- a/types/jqueryui/jqueryui-tests.ts
+++ b/types/jqueryui/jqueryui-tests.ts
@@ -911,7 +911,12 @@ function test_autocomplete() {
                 "Nothing selected, input was " + this.value);
         }
     });
-
+    $("#birds").autocomplete({
+        classes: {
+            'ui-autocomplete': 'foo',
+            'ui-autocomplete-input': 'bar'
+        }
+    })
 }
 
 
diff --git a/types/jqueryui/tslint.json b/types/jqueryui/tslint.json
new file mode 100644
index 0000000000..22ecc7ce6f
--- /dev/null
+++ b/types/jqueryui/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-switch": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-base64/index.d.ts b/types/js-base64/index.d.ts
index bd195e3885..95fa5ccd8c 100644
--- a/types/js-base64/index.d.ts
+++ b/types/js-base64/index.d.ts
@@ -1,54 +1,43 @@
-// Type definitions for js-base64 v2.1.9
+// Type definitions for js-base64 2.3
 // Project: https://github.com/dankogai/js-base64
-// Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+// Definitions by: Denis Carriere <https://github.com/DenisCarriere>, Tommy Lent <https://github.com/tlent>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
-## TODO
+export namespace Base64 {
+    const VERSION: string;
 
-add methods:
-- [x] encode
-- [x] encodeURI
-- [x] decode
-- [ ] atob
-- [ ] btoa
-- [ ] fromBase64
-- [ ] toBase64
-- [ ] utob
-- [ ] btou
-- [ ] noConflict
- */
+    function encode(s: string, uriSafe?: boolean): string;
 
-declare module 'js-base64' {
-    namespace JSBase64 {
-        const Base64: Base64Static
-        interface Base64Static {
-            /**
-             * .encode
-             * @param {String} string
-             * @return {String}
-             */
-            encode(base64: string): string;
+    function encodeURI(s: string): string;
 
-            /**
-             * .encodeURI
-             * @param {String} string
-             * @return {String}
-             */
-            encodeURI(base64: string): string
+    function decode(base64: string): string;
 
-            /**
-             * .decode
-             * @param {String} string
-             * @return {String}
-             */
-            decode(base64: string): string
+    function atob(base64: string): string;
 
-            /**
-             * Library version
-             */
-            VERSION:string
-        }
+    function btoa(s: string): string;
+
+    function fromBase64(base64: string): string;
+
+    function toBase64(s: string, uriSafe?: boolean): string;
+
+    function btou(s: string): string;
+
+    function utob(s: string): string;
+
+    function noConflict(): typeof Base64;
+
+    function extendString(): void;
+}
+
+// Helper to allow referencing Base64 from inside the global declaration without creating a self reference
+export type Base64_ = typeof Base64;
+
+declare global {
+    interface String {
+        fromBase64(): string;
+        toBase64(uriSafe?: boolean): string;
+        toBase64URI(): string;
     }
-    export = JSBase64
+
+    const Base64: Base64_;
 }
diff --git a/types/js-base64/js-base64-tests.ts b/types/js-base64/js-base64-tests.ts
deleted file mode 100644
index 275547d296..0000000000
--- a/types/js-base64/js-base64-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Base64 } from 'js-base64'
-
-Base64.encode('dankogai');  // ZGFua29nYWk=
-Base64.encode('�飼弾');    // 5bCP6aO85by+
-Base64.encodeURI('�飼弾'); // 5bCP6aO85by-
-
-Base64.decode('ZGFua29nYWk=');  // dankogai
-Base64.decode('5bCP6aO85by+');  // �飼弾
-// note .decodeURI() is unnecessary since it accepts both flavors
-Base64.decode('5bCP6aO85by-');  // �飼弾
diff --git a/types/js-base64/test/js-base64-global.test.ts b/types/js-base64/test/js-base64-global.test.ts
new file mode 100644
index 0000000000..25c7837697
--- /dev/null
+++ b/types/js-base64/test/js-base64-global.test.ts
@@ -0,0 +1,19 @@
+Base64.encode(''); // $ExpectType string
+Base64.encode('', true); // $ExpectType string
+Base64.encodeURI(''); // $ExpectType string
+Base64.decode(''); // $ExpectType string
+Base64.atob(''); // $ExpectType string
+Base64.btoa(''); // $ExpectType string
+Base64.fromBase64(''); // $ExpectType string
+Base64.toBase64(''); // $ExpectType string
+Base64.toBase64('', true); // $ExpectType string
+Base64.btou(''); // $ExpectType string
+Base64.utob(''); // $ExpectType string
+
+Base64.noConflict(); // $ExpectType typeof Base64
+
+Base64.extendString(); // $ExpectType void
+''.toBase64(); // $ExpectType string
+''.toBase64(true); // $ExpectType string
+''.toBase64URI(); // $ExpectType string
+''.fromBase64(); // $ExpectType string
diff --git a/types/js-base64/test/js-base64-module.test.ts b/types/js-base64/test/js-base64-module.test.ts
new file mode 100644
index 0000000000..fc7f7a696e
--- /dev/null
+++ b/types/js-base64/test/js-base64-module.test.ts
@@ -0,0 +1,21 @@
+import { Base64 } from 'js-base64';
+
+Base64.encode(''); // $ExpectType string
+Base64.encode('', true); // $ExpectType string
+Base64.encodeURI(''); // $ExpectType string
+Base64.decode(''); // $ExpectType string
+Base64.atob(''); // $ExpectType string
+Base64.btoa(''); // $ExpectType string
+Base64.fromBase64(''); // $ExpectType string
+Base64.toBase64(''); // $ExpectType string
+Base64.toBase64('', true); // $ExpectType string
+Base64.btou(''); // $ExpectType string
+Base64.utob(''); // $ExpectType string
+
+Base64.noConflict(); // $ExpectType typeof Base64
+
+Base64.extendString(); // $ExpectType void
+''.toBase64(); // $ExpectType string
+''.toBase64(true); // $ExpectType string
+''.toBase64URI(); // $ExpectType string
+''.fromBase64(); // $ExpectType string
diff --git a/types/js-base64/tsconfig.json b/types/js-base64/tsconfig.json
index f0622b7bc8..2e325222f7 100644
--- a/types/js-base64/tsconfig.json
+++ b/types/js-base64/tsconfig.json
@@ -1,23 +1,20 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "js-base64-tests.ts"
+        "test/js-base64-module.test.ts",
+        "test/js-base64-global.test.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/js-base64/tslint.json b/types/js-base64/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/js-base64/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/js-beautify/tslint.json b/types/js-beautify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-beautify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-clipper/tslint.json b/types/js-clipper/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-clipper/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-combinatorics/tslint.json b/types/js-combinatorics/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-combinatorics/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-data-angular/package.json b/types/js-data-angular/package.json
new file mode 100644
index 0000000000..f932c0aa52
--- /dev/null
+++ b/types/js-data-angular/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/js-data": "^2.8.31"
+    }
+}
diff --git a/types/js-data-angular/tslint.json b/types/js-data-angular/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-data-angular/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-data-http/index.d.ts b/types/js-data-http/index.d.ts
deleted file mode 100644
index 62a2c1e25b..0000000000
--- a/types/js-data-http/index.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for JSData Http Adapter 1.2
-// Project: https://github.com/js-data/js-data-http 2.2
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as JSData from 'js-data';
-
-declare module 'js-data' {
-    interface DSHttpAdapterOptions {
-        serialize?(resourceName: string, data: any): any;
-        deserialize?(resourceName: string, data: any): any;
-        queryTransform?(resourceName: string, params: DSFilterParams): any;
-        httpConfig?: any;
-        forceTrailingSlash?: boolean;
-        log?: boolean | ((message?: any, ...optionalParams: any[]) => void);
-        error?: boolean | ((message?: any, ...optionalParams: any[]) => void);
-        basePath?: string;
-        verbsUseBasePath?: string;
-    }
-
-    interface DSHttpAdapterPromiseResolveType {
-        data: any;
-        headers: any;
-        status: number;
-        config: any;
-    }
-
-    interface DSHttpAdapter extends IDSAdapter {
-        new(options?: DSHttpAdapterOptions): DSHttpAdapter;
-
-        defaults: DSHttpAdapterOptions;
-        http: any;
-
-        // DSHttpAdapter uses axios so options are axios config objects.
-        HTTP(options?: Object): JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        DEL(url: string, data?: Object, options?: Object): JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        GET(url: string, data?: Object, options?: Object): JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        POST(url: string, data?: Object, options?: Object): JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        PUT(url: string, data?: Object, options?: Object): JSDataPromise<DSHttpAdapterPromiseResolveType>;
-    }
-}
-
-declare var DSHttpAdapter: JSData.DSHttpAdapter;
-export = DSHttpAdapter;
-export as namespace DSHttpAdapter;
diff --git a/types/js-data-http/js-data-http-tests.ts b/types/js-data-http/js-data-http-tests.ts
deleted file mode 100644
index 082d34a71f..0000000000
--- a/types/js-data-http/js-data-http-tests.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import * as JSData from 'js-data';
-import DSHttpAdapter = require("js-data-http");
-
-declare var axios: any;
-
-const adapter = new DSHttpAdapter();
-const store = new JSData.DS();
-store.registerAdapter('http', adapter, { default: true });
-
-adapter.defaults.basePath = '/api';
-adapter.http = axios;
-
-const ADocument: JSData.DSResourceDefinition<any> = store.defineResource<any>('document');
-
-ADocument.inject({ id: 5, author: 'John' });
-
-// bypass the data store
-adapter.update(ADocument, 5, { author: 'Johnny' }).then((document: any) => {
-    document; // { id: 5, author: 'Johnny' }
-
-    // The updated document has NOT been injected into the data store because we bypassed the data store
-    ADocument.get(document.id); // { id: 5, author: 'John' }
-});
-
-// Normally you would just go through the data store
-ADocument.update(5, { author: 'Johnny' }).then((document: any) => {
-    document; // { id: 5, author: 'Johnny' }
-
-    // the updated document has been injected into the data store
-    ADocument.get(document.id); // { id: 5, author: 'Johnny' }
-});
-
-ADocument.inject({ id: 5, author: 'John' });
-ADocument.inject({ id: 6, author: 'John' });
-
-// bypass the data store
-adapter.updateAll(ADocument, { author: 'Johnny' }, { author: 'John' }).then(documents => {
-    documents[0]; // { id: 5, author: 'Johnny' }
-
-    // The updated documents have NOT been injected into the data store because we bypassed the data store
-    ADocument.filter({ author: 'John' }); // [{...}, {...}]
-    ADocument.filter({ author: 'Johnny' }); // []
-});
-
-// Normally you would just go through the data store
-ADocument.updateAll({ author: 'Johnny' }, { author: 'John' }).then(documents => {
-    documents[0]; // { id: 5, author: 'Johnny' }
-
-    // the updated documents have been injected into the data store
-    ADocument.filter({ author: 'John' }); // []
-    ADocument.filter({ author: 'Johnny' }); // [{...}, {...}]
-});
-
-adapter.PUT('/user/1', { name: 'Johnny' }).then(data => {
-    data.data; // { id: 1, name: 'Johnny', ... }
-    data.headers; // {...}
-    data.status; // 200
-    data.config; // {...}
-});
-
-adapter.POST('/user/1', { name: 'John' }).then(data => {
-    data.data; // { id: 1, name: 'John', ... }
-    data.headers; // {...}
-    data.status; // 200
-    data.config; // {...}
-});
-
-adapter.HTTP({ url: '/user/1', method: 'put', data: { name: 'Johnny' }}).then(data => {
-    data.data; // { id: 1, name: 'Johnny', ... }
-    data.headers; // {...}
-    data.status; // 200
-    data.config; // {...}
-});
-
-adapter.GET('/user/1').then(data => {
-    data.data; // { id: 1, ... }
-    data.headers; // {...}
-    data.status; // 200
-    data.config; // {...}
-});
-
-const User: JSData.DSResourceDefinition<any> = store.defineResource('user');
-
-let params: any = {
-    age: {
-        '>': 30
-    }
-};
-
-// bypass the data store
-adapter.findAll(User, params).then(users => {
-    // users[0].age; 55 // etc., etc.
-
-    // the users have NOT been injected into the data store because we bypassed the data store
-    User.filter(params); // []
-});
-
-// normally you would go through the data store
-User.findAll(params).then(users => {
-    // users[0].age; 55 // etc., etc.
-
-    // the users have been injected into the data store
-    User.filter(params); // [{...}, {...}, ...]
-});
-
-// bypass the data store
-adapter.find(ADocument, 5).then((document: any) => {
-    document; // { id: 5, author: 'John Anderson' }
-
-    // the document has NOT been injected into the data store because we bypassed the data store
-    ADocument.get(document.id); // undefined
-});
-
-// Normally you would just go through the data store
-ADocument.find(5).then((document: any) => {
-    document; // { id: 5, author: 'John Anderson' }
-
-    // the document has been injected into the data store
-    ADocument.get(document.id); // { id: 5, author: 'John Anderson' }
-});
-
-params = {
-    author: 'John'
-};
-
-// bypass the data store
-adapter.destroyAll(ADocument, params).then(() => {
-    // the documents have NOT been ejected from the data store because we bypassed the data store
-    ADocument.filter(params); // [{...}, {...}, ...]
-});
-
-// normally you would go through the data store
-ADocument.destroyAll(params).then(() => {
-    // the documents have been ejected from the data store
-    ADocument.filter(params); // []
-});
-
-ADocument.inject({ id: 5, author: 'John' });
-
-// bypass the data store
-adapter.destroy(ADocument, 5).then(() => {
-    // the document is still in the data store because we bypassed the data store
-    // ADocument.get(document.id); // { id: 5, author: 'John' }
-});
-
-// Normally you would just go through the data store
-ADocument.destroy(5).then(() => {
-    // the document has been ejected from the data store
-    // ADocument.get(document.id); // undefined
-});
-
-adapter.DEL('/user/1').then(data => {
-    data.data; // 1
-    data.headers; // {...}
-    data.status; // 204
-    data.config; // {...}
-});
-
-// bypass the data store
-adapter.create(ADocument, { author: 'John' }).then((document: any) => {
-    document; // { id: 5, author: 'John' }
-
-    // The new document has NOT been injected into the data store because we bypassed the data store
-    ADocument.get(document.id); // undefined
-});
-
-// Normally you would just go through the data store
-ADocument.create({ author: 'John' }).then((document: any) => {
-    document; // { id: 5, author: 'John' }
-
-    // the new document has been injected into the data store
-    ADocument.get(document.id); // { id: 5, author: 'John' }
-});
diff --git a/types/js-data-http/tsconfig.json b/types/js-data-http/tsconfig.json
deleted file mode 100644
index 2dcba49575..0000000000
--- a/types/js-data-http/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "js-data-http-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/js-data-http/tslint.json b/types/js-data-http/tslint.json
deleted file mode 100644
index 38c1ea8606..0000000000
--- a/types/js-data-http/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "ban-types": false,
-        "no-misused-new": false
-    }
-}
diff --git a/types/js-fixtures/tslint.json b/types/js-fixtures/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-fixtures/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-git/tslint.json b/types/js-git/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-git/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-priority-queue/tslint.json b/types/js-priority-queue/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-priority-queue/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-schema/tslint.json b/types/js-schema/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-schema/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-search/tslint.json b/types/js-search/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-search/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-url/tslint.json b/types/js-url/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/js-url/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index 8f7c0a346d..2fa264cbd9 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -1,96 +1,103 @@
-// Type definitions for js-yaml 3.9.1
+// Type definitions for js-yaml 3.10
 // Project: https://github.com/nodeca/js-yaml
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Sebastian Clausen <https://github.com/sclausen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-declare namespace jsyaml {
-	export function safeLoad(str: string, opts?: LoadOptions): any;
-	export function load(str: string, opts?: LoadOptions): any;
+export function safeLoad(str: string, opts?: LoadOptions): any;
+export function load(str: string, opts?: LoadOptions): any;
 
-        export interface Type extends TypeConstructorOptions { }
-	export class Type {
-			constructor(tag: string, opts?: TypeConstructorOptions);
-			tag: string;
-	}
-	export class Schema {
-		constructor(definition: SchemaDefinition);
-		public static create(types: Type[] | Type): Schema;
-		public static create(schemas: Schema[] | Schema, types: Type[] | Type): Schema;
-	}
-
-	export function safeLoadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
-	export function loadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
-
-	export function safeDump(obj: any, opts?: DumpOptions): string;
-	export function dump(obj: any, opts?: DumpOptions): string;
-
-	export interface LoadOptions {
-		// string to be used as a file path in error/warning messages.
-		filename?: string;
-		// makes the loader to throw errors instead of warnings.
-		strict?: boolean;
-		// specifies a schema to use.
-		schema?: any;
-	}
-
-	export interface DumpOptions {
-		// indentation width to use (in spaces).
-		indent?: number;
-		// do not throw on invalid types (like function in the safe schema) and skip pairs and single values with such types.
-		skipInvalid?: boolean;
-		// specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere
-		flowLevel?: number;
-		// Each tag may have own set of styles.	- "tag" => "style" map.
-		styles?: Object;
-		// specifies a schema to use.
-		schema?: any;
-		// if true, sort keys when dumping YAML. If a function, use the function to sort the keys. (default: false)
-		sortKeys?: boolean | ((a: any, b: any) => number);
-		// set max line width. (default: 80)
-		lineWidth?: number;
-		// if true, don't convert duplicate objects into references (default: false)
-		noRefs?: boolean;
-		// if true don't try to be compatible with older yaml versions. Currently: don't quote "yes", "no" and so on, as required for YAML 1.1 (default: false)
-		noCompatMode?: boolean;
-		// if true flow sequences will be condensed, omitting the space between `key: value` or `a, b`. Eg. `'[a,b]'` or `{a:{b:c}}`. Can be useful when using yaml for pretty URL query params as spaces are %-encoded. (default: false)
-		condenseFlow?: boolean;
-	}
-
-	export interface TypeConstructorOptions {
-		kind?: string;
-		resolve?: Function;
-		construct?: Function;
-		instanceOf?: Object;
-		predicate?: string;
-		represent?: Function;
-		defaultStyle?: string;
-		styleAliases?: Object;
-	}
-
-	export interface SchemaDefinition {
-		implicit?: any[];
-		explicit?: any[];
-		include?: any[];
-	}
-
-	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
-	export var FAILSAFE_SCHEMA: any;
-	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
-	export var JSON_SCHEMA: any;
-	// same as JSON_SCHEMA: http://www.yaml.org/spec/1.2/spec.html#id2804923
-	export var CORE_SCHEMA: any;
-	// all supported YAML types, without unsafe ones (!!js/undefined, !!js/regexp and !!js/function): http://yaml.org/type/
-	export var DEFAULT_SAFE_SCHEMA: any;
-	// all supported YAML types.
-	export var DEFAULT_FULL_SCHEMA: any;
-	export var MINIMAL_SCHEMA: any;
-	export var SAFE_SCHEMA: any;
-
-	export class YAMLException extends Error {
-		constructor(reason?: any, mark?: any);
-		toString(compact?: boolean): string;
-	}
+export class Type {
+	constructor(tag: string, opts?: TypeConstructorOptions);
+	kind: 'sequence' | 'scalar' | 'mapping' | null;
+	resolve(data: any): boolean;
+	construct(data: any): any;
+	instanceOf: object | null;
+	predicate: string | null;
+	represent: ((data: object) => any) | { [x: string]: (data: object) => any; } | null;
+	defaultStyle: string | null;
+	styleAliases: { [x: string]: any; };
 }
 
-export = jsyaml;
-export as namespace jsyaml;
+/* tslint:disable-next-line:no-unnecessary-class */
+export class Schema implements SchemaDefinition {
+	constructor(definition: SchemaDefinition);
+	static create(types: Type[] | Type): Schema;
+	static create(schemas: Schema[] | Schema, types: Type[] | Type): Schema;
+}
+
+export function safeLoadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
+export function loadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
+
+export function safeDump(obj: any, opts?: DumpOptions): string;
+export function dump(obj: any, opts?: DumpOptions): string;
+
+export interface LoadOptions {
+	// string to be used as a file path in error/warning messages.
+	filename?: string;
+	// makes the loader to throw errors instead of warnings.
+	strict?: boolean;
+	// specifies a schema to use.
+	schema?: any;
+	// compatibility with JSON.parse behaviour.
+	json?: boolean;
+}
+
+export interface DumpOptions {
+	// indentation width to use (in spaces).
+	indent?: number;
+	// do not throw on invalid types (like function in the safe schema) and skip pairs and single values with such types.
+	skipInvalid?: boolean;
+	// specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere
+	flowLevel?: number;
+	// Each tag may have own set of styles.	- "tag" => "style" map.
+	styles?: { [x: string]: any; };
+	// specifies a schema to use.
+	schema?: any;
+	// if true, sort keys when dumping YAML. If a function, use the function to sort the keys. (default: false)
+	sortKeys?: boolean | ((a: any, b: any) => number);
+	// set max line width. (default: 80)
+	lineWidth?: number;
+	// if true, don't convert duplicate objects into references (default: false)
+	noRefs?: boolean;
+	// if true don't try to be compatible with older yaml versions. Currently: don't quote "yes", "no" and so on, as required for YAML 1.1 (default: false)
+	noCompatMode?: boolean;
+	// if true flow sequences will be condensed, omitting the space between `key: value` or `a, b`. Eg. `'[a,b]'` or `{a:{b:c}}`.
+	// Can be useful when using yaml for pretty URL query params as spaces are %-encoded. (default: false)
+	condenseFlow?: boolean;
+}
+
+export interface TypeConstructorOptions {
+	kind?: 'sequence' | 'scalar' | 'mapping';
+	resolve?: (data: any) => boolean;
+	construct?: (data: any) => any;
+	instanceOf?: object;
+	predicate?: string;
+	represent?: ((data: object) => any) | { [x: string]: (data: object) => any };
+	defaultStyle?: string;
+	styleAliases?: { [x: string]: any; };
+}
+
+export interface SchemaDefinition {
+	implicit?: any[];
+	explicit?: Type[];
+	include?: Schema[];
+}
+
+// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
+export let FAILSAFE_SCHEMA: Schema;
+// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
+export let JSON_SCHEMA: Schema;
+// same as JSON_SCHEMA: http://www.yaml.org/spec/1.2/spec.html#id2804923
+export let CORE_SCHEMA: Schema;
+// all supported YAML types, without unsafe ones (!!js/undefined, !!js/regexp and !!js/function): http://yaml.org/type/
+export let DEFAULT_SAFE_SCHEMA: Schema;
+// all supported YAML types.
+export let DEFAULT_FULL_SCHEMA: Schema;
+export let MINIMAL_SCHEMA: Schema;
+export let SAFE_SCHEMA: Schema;
+
+export class YAMLException extends Error {
+	constructor(reason?: any, mark?: any);
+	toString(compact?: boolean): string;
+}
diff --git a/types/js-yaml/js-yaml-tests.ts b/types/js-yaml/js-yaml-tests.ts
index aff53acd3c..3d5ecc17bf 100644
--- a/types/js-yaml/js-yaml-tests.ts
+++ b/types/js-yaml/js-yaml-tests.ts
@@ -1,45 +1,55 @@
-
-
 import yaml = require('js-yaml');
 import LoadOptions = yaml.LoadOptions;
 import DumpOptions = yaml.DumpOptions;
 import TypeConstructorOptions = yaml.TypeConstructorOptions;
 import SchemaDefinition = yaml.SchemaDefinition;
 
-var bool: boolean;
-var num: number;
-var str: string;
-var obj: Object;
-var value: any;
-var array: any[];
-var fn: Function;
-var schemaDefinition: SchemaDefinition = {
+const bool = true;
+const num = 0;
+const str = "";
+const obj: object = {};
+const map: { [x: string]: any; } = {};
+const array: any[] = [];
+const fn: (...args: any[]) => any = () => {};
+const type = new yaml.Type(str);
+
+const schemaDefinition: SchemaDefinition = {
 	implicit: array,
 	explicit: array,
 	include: array
 };
-var typeConstructorOptions: TypeConstructorOptions = {
-	kind: str,
+const typeConstructorOptions: TypeConstructorOptions = {
+	kind: "scalar",
 	resolve: fn,
 	construct: fn,
 	instanceOf: obj,
 	predicate: str,
 	represent: fn,
 	defaultStyle: str,
-	styleAliases: obj
+	styleAliases: map
 };
 
-var loadOpts: LoadOptions;
-var dumpOpts: DumpOptions;
+const schema: yaml.Schema = new yaml.Schema(schemaDefinition);
+
+let value: any;
+let loadOpts: LoadOptions;
+let dumpOpts: DumpOptions;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
+// $ExpectType Schema
 yaml.FAILSAFE_SCHEMA;
+// $ExpectType Schema
 yaml.JSON_SCHEMA;
+// $ExpectType Schema
 yaml.CORE_SCHEMA;
+// $ExpectType Schema
 yaml.DEFAULT_SAFE_SCHEMA;
+// $ExpectType Schema
 yaml.DEFAULT_FULL_SCHEMA;
+// $ExpectType Schema
 yaml.MINIMAL_SCHEMA;
+// $ExpectType Schema
 yaml.SAFE_SCHEMA;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -53,6 +63,9 @@ loadOpts = {
 loadOpts = {
 	schema: bool
 };
+loadOpts = {
+	json: bool
+};
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
@@ -74,42 +87,87 @@ dumpOpts = {
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-value = yaml.safeLoad(str);
-value = yaml.safeLoad(str, loadOpts);
+// $ExpectType Type
+new yaml.Type(str, typeConstructorOptions);
 
-value = yaml.load(str);
-value = yaml.load(str, loadOpts);
+// $ExpectType "sequence" | "scalar" | "mapping" | null
+type.kind;
+// $ExpectType (data: any) => boolean
+type.resolve;
+// $ExpectType (data: any) => any
+type.construct;
+// $ExpectType object | null
+type.instanceOf;
+// $ExpectType string | null
+type.predicate;
+// $ExpectType ((data: object) => any) | { [x: string]: (data: object) => any; } | null
+type.represent;
+// $ExpectType string | null
+type.defaultStyle;
+// $ExpectType { [x: string]: any; }
+type.styleAliases;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-value = yaml.safeLoadAll(str, (doc) => {
-	value = doc;
-});
-value = yaml.safeLoadAll(str, (doc) => {
-	value = doc;
-}, loadOpts);
+// $ExpectType any
+yaml.safeLoad(str);
+// $ExpectType any
+yaml.safeLoad(str, loadOpts);
 
-value = yaml.loadAll(str, (doc) => {
-	value = doc;
-});
-value = yaml.loadAll(str, (doc) => {
-	value = doc;
-}, loadOpts);
+// $ExpectType any
+yaml.load(str);
+// $ExpectType any
+yaml.load(str, loadOpts);
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-value = yaml.safeDump(str);
-value = yaml.safeDump(str, dumpOpts);
+// $ExpectType any
+yaml.safeLoadAll(str);
+// $ExpectType any
+yaml.safeLoadAll(str, (doc) => {
+	value = doc;
+});
+// $ExpectType any
+yaml.safeLoadAll(str, (doc) => {
+	value = doc;
+}, loadOpts);
+value = yaml.safeLoadAll(str, undefined, loadOpts);
 
-value = yaml.dump(str);
-value = yaml.dump(str, dumpOpts);
+// $ExpectType any
+value = yaml.loadAll(str);
+// $ExpectType any
+yaml.loadAll(str, (doc) => {
+	value = doc;
+});
+// $ExpectType any
+yaml.loadAll(str, (doc) => {
+	value = doc;
+}, loadOpts);
+value = yaml.loadAll(str, undefined, loadOpts);
 
-value = new yaml.YAMLException();
-value = new yaml.Type(str, typeConstructorOptions);
-value = new yaml.Schema(schemaDefinition);
-value = yaml.Schema.create([new yaml.Type(str)]);
-value = yaml.Schema.create(new yaml.Type(str));
-value = yaml.Schema.create(new yaml.Schema(schemaDefinition), [new yaml.Type(str)]);
-value = yaml.Schema.create([new yaml.Schema(schemaDefinition)], [new yaml.Type(str)]);
-value = yaml.Schema.create(new yaml.Schema(schemaDefinition), new yaml.Type(str));
-value = yaml.Schema.create([new yaml.Schema(schemaDefinition)], new yaml.Type(str));
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+// $ExpectType string
+yaml.safeDump(str);
+// $ExpectType string
+yaml.safeDump(str, dumpOpts);
+
+// $ExpectType string
+yaml.dump(str);
+// $ExpectType string
+yaml.dump(str, dumpOpts);
+
+new yaml.YAMLException();
+
+// $ExpectType Schema
+yaml.Schema.create([type]);
+// $ExpectType Schema
+yaml.Schema.create(type);
+// $ExpectType Schema
+yaml.Schema.create(schema, [type]);
+// $ExpectType Schema
+yaml.Schema.create([schema], [type]);
+// $ExpectType Schema
+yaml.Schema.create(schema, type);
+// $ExpectType Schema
+yaml.Schema.create([schema], type);
diff --git a/types/js-yaml/tsconfig.json b/types/js-yaml/tsconfig.json
index b1e787d1b3..c36931fa61 100644
--- a/types/js-yaml/tsconfig.json
+++ b/types/js-yaml/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "js-yaml-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/js-yaml/tslint.json b/types/js-yaml/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/js-yaml/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/js.spec/index.d.ts b/types/js.spec/index.d.ts
index b33a0fd475..e7b3dfe753 100644
--- a/types/js.spec/index.d.ts
+++ b/types/js.spec/index.d.ts
@@ -21,14 +21,14 @@ export interface Spec {
     /**
      * Returns the conformed value to this spec.
      * @param value the value to test for conformance
-     * @returns {symbol.invalid} if the value does not conform to the spec, or the value if it does.
+     * @returns if the value does not conform to the spec, or the value if it does.
      */
     conform(value: any): any;
 
     /**
      * Explain why a value does not conform to this spec.
      * @param value the value to examine
-     * @returns {Problem[]} list of problems or null if none
+     * @returns list of problems or null if none
      */
     explain(value: any): Problem[];
 }
@@ -67,49 +67,58 @@ export interface Problem {
 
 /**
  * Given a Spec, tests the value for confomrance. If it passes, then returns true.
- * @param {Spec} spec the spec to test with
+ * @param spec the spec to test with
  * @param value the value to test
- * @returns {boolean} true if valid
+ * @returns true if valid
  */
-export function valid(spec: Spec, value: any): boolean;
+export function valid(spec: spec.SpecInput, value: any): boolean;
 
 /**
  * Returns the conformed value to this spec.
- * @param {Spec} spec the spec to test with
+ * @param spec the spec to test with
  * @param value the value to test
- * @returns {symbol.invalid} if the value does not conform to the spec, or the conformed value if it does.
+ * @returns if the value does not conform to the spec, or the conformed value if it does.
  */
-export function conform(spec: Spec, value: any): any;
+export function conform(spec: spec.SpecInput, value: any): any;
 
 /**
  * Like explain(), but returns Problems array.
- * @param {Spec} spec the spec to test with
+ * @param spec the spec to test with
  * @param value the value to test
- * @returns {Problem[]} list of problems or null if none
+ * @returns list of problems or null if none
  */
-export function explainData(spec: Spec, value: any): Problem[];
+export function explainData(spec: spec.SpecInput, value: any): Problem[];
 
 /**
  * Prints, to the console, reasons why the value did not conform to this spec.
- * @param {Spec} spec the spec to test with
+ * @param spec the spec to test with
  * @param value the value to test
  */
-export function explain(spec: Spec, value: any): void;
+export function explain(spec: spec.SpecInput, value: any): void;
 
 /**
  * Returns a multiline string with reasons why the value did not conform to this spec.
- * @param {Spec} spec the spec to test with
+ * @param spec the spec to test with
  * @param value the value to test
  */
-export function explainStr(spec: Spec, value: any): string;
+export function explainStr(spec: spec.SpecInput, value: any): string;
+
+/**
+ * Returns a string with the problem statement from the given Problem.
+ * @param problem the problem
+ */
+export function problemStr(problem: Problem): string;
 
 /**
  * Tests if a value conforms to a spec, and if not, throws an Error.
- * @param {Spec} spec the spec to test with
+ * @param spec the spec to test with
  * @param value the value to test
  */
-export function assert(spec: Spec, value: any): void;
+export function assert(spec: spec.SpecInput, value: any): void;
 
+/**
+ * Symbols used
+ */
 export namespace symbol {
     /**
      * Returned by conform() to indicate a value does not conform to a spec.
@@ -150,26 +159,26 @@ export namespace spec {
 
     /**
      * Data must conform to every provided spec.
-     * @param {string} name the name of the spec
-     * @param {spec.SpecInput} specs the array of specs that must all match
-     * @returns {Spec} the constructed Spec
+     * @param name the name of the spec
+     * @param specs the array of specs that must all match
+     * @returns the constructed Spec
      */
     function and(name: string, ...specs: SpecInput[]): Spec;
 
     /**
      * Data must conform to at least one provided spec. The order in which they are validated is not defined.
      * The conform() function returns matched branches along with input data.
-     * @param {string} name the name of the spec
-     * @param {object} alts map of alternative keys with their respective SpecInputs
-     * @returns {Spec} the constructed Spec
+     * @param name the name of the spec
+     * @param alts map of alternative keys with their respective SpecInputs
+     * @returns the constructed Spec
      */
     function or(name: string, alts: {[key: string]: SpecInput}): Spec;
 
     /**
      * By default no spec accepts null or undefined as valid input. Wrap your spec in nilable() to change this.
-     * @param {string} name the name of the spec
-     * @param {spec.SpecInput} spec the spec to apply if a value is non-nil
-     * @returns {Spec} the constructed spec
+     * @param name the name of the spec
+     * @param spec the spec to apply if a value is non-nil
+     * @returns the constructed spec
      */
     function nilable(name: string, spec: SpecInput): Spec;
 
@@ -179,38 +188,45 @@ export namespace spec {
      * Accepts an option map as optional second parameter.
      * NOTE: the keys in this option map are symbols but Typescript will not allow 'symbol' to be specified
      * as a key type but the TS compiler will allow it.
-     * @param {string} name the name of the spec
-     * @param {spec.SpecInput} spec the spec to apply to values in the collection
-     * @param {object} options symbol.count or symbol.minCount / symbol.maxCount
-     * @returns {Spec}
+     * @param name the name of the spec
+     * @param spec the spec to apply to values in the collection
+     * @param options symbol.count or symbol.minCount / symbol.maxCount
      */
     function collection(name: string, spec: SpecInput, options?: {[option: string]: number}): Spec;
 
     /**
      * Used to define collections with items of possibly different types. Works only with arrays as order is important.
-     * @param {string} name the name of the spec
-     * @param {spec.SpecInput} specs the specs to test the value array
-     * @returns {Spec} the constructed spec
+     * @param name the name of the spec
+     * @param specs the specs to test the value array
+     * @returns the constructed spec
      */
     function tuple(name: string, ...specs: SpecInput[]): Spec;
 
     /**
      * Used to define the shape of maps. By default all keys are required. Use {symbol.optional} key to define
      * optional keys. Shape map can contain nested key specs.
-     * @param {string} name the name of the spec
-     * @param {Object} shape the shape map with keys and associated specs
-     * @returns {Spec} the constructed spec
+     * @param name the name of the spec
+     * @param shape the shape map with keys and associated specs
+     * @returns the constructed spec
      */
     function map(name: string, shape: object): Spec;
 
     /**
      * Used to define "one out of these values", like an enum. (It's called oneOf because enum is a reserved word.)
-     * @param {string} name the name of the spec
+     * @param name the name of the spec
      * @param values the emum of values
-     * @returns {Spec} the constructed spec
+     * @returns the constructed spec
      */
     function oneOf(name: string, ...values: any[]): Spec;
 
+    /**
+     * Used to define a predicate function as a Spec.
+     * @param name the name of the spec
+     * @param predicate the predicate function
+     * @returns the constructed spec
+     */
+    function predicate(name: string, predicate: PredFn): Spec;
+
     // Predicates
     /**
      * Returns true if data is an integer.
diff --git a/types/js.spec/js.spec-tests.ts b/types/js.spec/js.spec-tests.ts
index 8bb9611e87..17e49cfea6 100644
--- a/types/js.spec/js.spec-tests.ts
+++ b/types/js.spec/js.spec-tests.ts
@@ -7,20 +7,30 @@ const name: string = spec.name;
 const options: object = spec.options;
 
 const isValid: boolean = S.valid(S.spec.boolean, true);
+S.valid((value) => true, "a value");
 
 const result = S.conform(S.spec.map("dancing", {field: S.spec.string}), "not a map");
+S.conform((value) => true, "a value");
 
 const problems: S.Problem[] = S.explainData(S.spec.int, "not a number");
+S.explainData((value) => true, "a value");
 
 const {path, via, value, predicate}: {path: string[], via: string[], value: any, predicate: S.Predicate} = problems[0];
 
-const problemStr: string = S.explainStr(S.spec.even, 3);
+const problemStr: string = S.problemStr(problems[0]);
+
+const explainStr: string = S.explainStr(S.spec.even, 3);
+S.explainStr((value) => true, "a value");
 
 // $ExpectType void
 S.explain(S.spec.positive, true);
+// $ExpectType void
+S.explain((value) => true, "a value");
 
 // $ExpectType void
 S.assert(S.spec.string, "things");
+// $ExpectType void
+S.assert((value) => true, "a value");
 
 const symbols: symbol[] = [S.symbol.count, S.symbol.invalid, S.symbol.maxCount, S.symbol.minCount, S.symbol.optional];
 
@@ -38,6 +48,8 @@ const mapSpec: S.Spec = S.spec.map("map test", { email: S.spec.string, [S.symbol
 
 const oneOfSpec: S.Spec = S.spec.oneOf("oneOf test", "a", "b", "c");
 
+const predicateSpec: S.Spec = S.spec.predicate("predicate test", (value) => true);
+
 // Predicates
 
 const intPred: S.Predicate = S.spec.int;
diff --git a/types/jsbn/index.d.ts b/types/jsbn/index.d.ts
index cde50e0df2..b6e5f52ab6 100644
--- a/types/jsbn/index.d.ts
+++ b/types/jsbn/index.d.ts
@@ -1,250 +1,249 @@
-// Type definitions for jsbn v1.2
+// Type definitions for jsbn v1.2.29
 // Project: http://www-cs-students.stanford.edu/%7Etjw/jsbn/
-// Definitions by: Eugene Chernyshov <https://github.com/Evgenus>
+// Definitions by: Eugene Chernyshov <https://github.com/Evgenus>, Al Tabayoyon <https://github.com/al2xed>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace jsbn {
-
-    interface RandomGenerator {
-        nextBytes(bytes: number[]): void;
-    }
-
-    export class BigInteger {
-        constructor(a: number, c: RandomGenerator);
-        constructor(a: number, b: number, c: RandomGenerator);
-        constructor(a: string, b?: number);
-        constructor(a: number[], b?: number);
-        constructor(a: BigInteger);
-
-        s: number;
-        t: number;
-        data: number[]; // forge specific
-
-        DB: number;
-        DM: number;
-        DV: number;
-
-        FV: number;
-        F1: number;
-        F2: number;
-
-        // am: Compute w_j += (x*this_i), propagate carries,
-        am(i: number, x: number, w: BigInteger, j: number, c: number, n: number): number;
-
-        // (protected) copy this to r
-        copyTo(r: BigInteger): void;
-
-        // (protected) set from integer value x, -DV <= x < DV
-        fromInt(x: number): void;
-
-        // (protected) set from string and radix
-        fromString(x: string, b: number): void;
-
-        // (protected) clamp off excess high words
-        clamp(): void;
-
-        // (public) return string representation in given radix
-        toString(b?: number): string;
-
-        // (public) -this
-        negate(): BigInteger;
-
-        // (public) |this|
-        abs(): BigInteger;
-
-        // (public) return + if this > a, - if this < a, 0 if equal
-        compareTo(a: BigInteger): number;
-
-        // (public) return the number of bits in "this"
-        bitLength(): number;
-
-        // (protected) r = this << n*DB
-        dlShiftTo(n: number, r: BigInteger): void;
-
-        // (protected) r = this >> n*DB
-        drShiftTo(n: number, r: BigInteger): void;
-
-        // (protected) r = this << n
-        lShiftTo(n: number, r: BigInteger): void;
-
-        // (protected) r = this >> n
-        rShiftTo(n: number, r: BigInteger): void;
-
-        // (protected) r = this - a
-        subTo(a: BigInteger, r: BigInteger): void;
-
-        // (protected) r = this * a, r != this,a (HAC 14.12)
-        multiplyTo(a: BigInteger, r: BigInteger): void;
-
-        // (protected) r = this^2, r != this (HAC 14.16)
-        squareTo(r: BigInteger): void;
-
-        // (protected) divide this by m, quotient and remainder to q, r (HAC 14.20)
-        // r != q, this != m.  q or r may be null.
-        divRemTo(m: BigInteger, q: BigInteger, r: BigInteger): void;
-
-        // (public) this mod a
-        mod(a: BigInteger): BigInteger;
-
-        // (protected) return "-1/this % 2^DB"; useful for Mont. reduction
-        invDigit(): number;
-
-        // (protected) true iff this is even
-        isEven(): boolean;
-
-        // (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79)
-        exp(e: number, z: Reduction): BigInteger;
-
-        // (public) this^e % m, 0 <= e < 2^32
-        modPowInt(e: number, m: BigInteger): BigInteger;
-
-        // (public)
-        clone(): BigInteger;
-
-        // (public) return value as integer
-        intValue(): number;
-
-        // (public) return value as byte
-        byteValue(): number;
-
-        // (public) return value as short (assumes DB>=16)
-        shortValue(): number;
-
-        // (protected) return x s.t. r^x < DV
-        chunkSize(r: number): number;
-
-        // (public) 0 if this == 0, 1 if this > 0
-        signum(): number;
-
-        // (protected) convert to radix string
-        toRadix(b: number): string;
-
-        // (protected) convert from radix string
-        fromRadix(s: string, b: number): void;
-
-        // (protected) alternate constructor
-        fromNumber(a: number, b?: number, c?: number): void;
-
-        // (public) convert to bigendian byte array
-        toByteArray(): number[];
-
-        equals(a: BigInteger): boolean;
-
-        min(a: BigInteger): BigInteger;
-
-        max(a: BigInteger): BigInteger;
-
-        // (protected) r = this op a (bitwise)
-        bitwiseTo(a: BigInteger, op: (x: number, y: number) => number, r: BigInteger): void;
-
-        // (public) this & a
-        and(a: BigInteger): BigInteger;
-
-        // (public) this | a
-        or(a: BigInteger): BigInteger;
-
-        // (public) this ^ a
-        xor(a: BigInteger): BigInteger;
-
-        // (public) this & ~a
-        andNot(a: BigInteger): BigInteger;
-
-        // (public) ~this
-        not(): BigInteger;
-
-        // (public) this << n
-        shiftLeft(n: number): BigInteger;
-
-        // (public) this >> n
-        shiftRight(n: number): BigInteger;
-
-        // (public) returns index of lowest 1-bit (or -1 if none)
-        getLowestSetBit(): number;
-
-        // (public) return number of set bits
-        bitCount(): number;
-
-        // (public) true iff nth bit is set
-        testBit(n: number): boolean;
-
-        // (protected) this op (1<<n)
-        changeBit(n: number, op: (x: number, y: number) => number): BigInteger;
-
-        // (protected) this op (1<<n)
-        setBit(n: number): BigInteger;
-
-        // (public) this & ~(1<<n)
-        clearBit(n: number): BigInteger
-
-        // (public) this ^ (1<<n)
-        flipBit(n: number): BigInteger
-
-        // (protected) r = this + a
-        addTo(a: BigInteger, r: BigInteger): void;
-
-        // (public) this + a
-        add(a: BigInteger): BigInteger;
-
-        // (public) this - a
-        subtract(a: BigInteger): BigInteger;
-
-        // (public) this * a
-        multiply(a: BigInteger): BigInteger;
-
-        // (public) this^2
-        square(): BigInteger;
-
-        // (public) this / a
-        divide(a: BigInteger): BigInteger;
-
-        // (public) this % a
-        remainder(a: BigInteger): BigInteger;
-
-        // (public) [this/a,this%a]
-        divideAndRemainder(a: BigInteger): BigInteger[]; // Array of 2 items
-
-        // (protected) this *= n, this >= 0, 1 < n < DV
-        dMultiply(n: number): void;
-
-        // (protected) this += n << w words, this >= 0
-        dAddOffset(n: number, w: number): void;
-
-        // (public) this^e
-        pow(e: number): BigInteger;
-
-        // (protected) r = lower n words of "this * a", a.t <= n
-        multiplyLowerTo(a: BigInteger, n: number, r: BigInteger): void;
-
-        // (protected) r = "this * a" without lower n words, n > 0
-        multiplyUpperTo(a: BigInteger, n: number, r: BigInteger): void;
-
-        // (public) this^e % m (HAC 14.85)
-        modPow(e: BigInteger, m: BigInteger): BigInteger;
-
-        // (public) gcd(this,a) (HAC 14.54)
-        gcd(a: BigInteger): BigInteger;
-
-        // (protected) this % n, n < 2^26
-        modInt(n: number): number;
-
-        // (public) 1/this % m (HAC 14.61)
-        modInverse(m: BigInteger): BigInteger;
-
-        // (public) test primality with certainty >= 1-.5^t
-        isProbablePrime(t: number): boolean;
-
-        // (protected) true if probably prime (HAC 4.24, Miller-Rabin)
-        millerRabin(t: number): boolean;
-
-        static ZERO: BigInteger;
-        static ONE: BigInteger;
-    }
-
-    interface Reduction {
-        convert(x: BigInteger): BigInteger;
-        revert(x: BigInteger): BigInteger;
-        reduce(x: BigInteger): void;
-        mulTo(x: BigInteger, y: BigInteger, r: BigInteger): void;
-        sqrTo(x: BigInteger, r: BigInteger): void;
-    }
+export interface RandomGenerator {
+    nextBytes(bytes: number[]): void;
 }
+
+export class BigInteger {
+    constructor(a: number, c: RandomGenerator);
+    constructor(a: number, b: number, c: RandomGenerator);
+    constructor(a: string, b?: number);
+    constructor(a: number[], b?: number);
+    constructor(a: BigInteger);
+
+    s: number;
+    t: number;
+    data: number[]; // forge specific
+
+    DB: number;
+    DM: number;
+    DV: number;
+
+    FV: number;
+    F1: number;
+    F2: number;
+
+    // am: Compute w_j += (x*this_i), propagate carries,
+    am(i: number, x: number, w: BigInteger, j: number, c: number, n: number): number;
+
+    // (protected) copy this to r
+    copyTo(r: BigInteger): void;
+
+    // (protected) set from integer value x, -DV <= x < DV
+    fromInt(x: number): void;
+
+    // (protected) set from string and radix
+    fromString(x: string, b: number): void;
+
+    // (protected) clamp off excess high words
+    clamp(): void;
+
+    // (public) return string representation in given radix
+    toString(b?: number): string;
+
+    // (public) -this
+    negate(): BigInteger;
+
+    // (public) |this|
+    abs(): BigInteger;
+
+    // (public) return + if this > a, - if this < a, 0 if equal
+    compareTo(a: BigInteger): number;
+
+    // (public) return the number of bits in "this"
+    bitLength(): number;
+
+    // (protected) r = this << n*DB
+    dlShiftTo(n: number, r: BigInteger): void;
+
+    // (protected) r = this >> n*DB
+    drShiftTo(n: number, r: BigInteger): void;
+
+    // (protected) r = this << n
+    lShiftTo(n: number, r: BigInteger): void;
+
+    // (protected) r = this >> n
+    rShiftTo(n: number, r: BigInteger): void;
+
+    // (protected) r = this - a
+    subTo(a: BigInteger, r: BigInteger): void;
+
+    // (protected) r = this * a, r != this,a (HAC 14.12)
+    multiplyTo(a: BigInteger, r: BigInteger): void;
+
+    // (protected) r = this^2, r != this (HAC 14.16)
+    squareTo(r: BigInteger): void;
+
+    // (protected) divide this by m, quotient and remainder to q, r (HAC 14.20)
+    // r != q, this != m.  q or r may be null.
+    divRemTo(m: BigInteger, q: BigInteger, r: BigInteger): void;
+
+    // (public) this mod a
+    mod(a: BigInteger): BigInteger;
+
+    // (protected) return "-1/this % 2^DB"; useful for Mont. reduction
+    invDigit(): number;
+
+    // (protected) true iff this is even
+    isEven(): boolean;
+
+    // (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79)
+    exp(e: number, z: Reduction): BigInteger;
+
+    // (public) this^e % m, 0 <= e < 2^32
+    modPowInt(e: number, m: BigInteger): BigInteger;
+
+    // (public)
+    clone(): BigInteger;
+
+    // (public) return value as integer
+    intValue(): number;
+
+    // (public) return value as byte
+    byteValue(): number;
+
+    // (public) return value as short (assumes DB>=16)
+    shortValue(): number;
+
+    // (protected) return x s.t. r^x < DV
+    chunkSize(r: number): number;
+
+    // (public) 0 if this == 0, 1 if this > 0
+    signum(): number;
+
+    // (protected) convert to radix string
+    toRadix(b: number): string;
+
+    // (protected) convert from radix string
+    fromRadix(s: string, b: number): void;
+
+    // (protected) alternate constructor
+    fromNumber(a: number, b?: number, c?: number): void;
+
+    // (public) convert to bigendian byte array
+    toByteArray(): number[];
+
+    equals(a: BigInteger): boolean;
+
+    min(a: BigInteger): BigInteger;
+
+    max(a: BigInteger): BigInteger;
+
+    // (protected) r = this op a (bitwise)
+    bitwiseTo(a: BigInteger, op: (x: number, y: number) => number, r: BigInteger): void;
+
+    // (public) this & a
+    and(a: BigInteger): BigInteger;
+
+    // (public) this | a
+    or(a: BigInteger): BigInteger;
+
+    // (public) this ^ a
+    xor(a: BigInteger): BigInteger;
+
+    // (public) this & ~a
+    andNot(a: BigInteger): BigInteger;
+
+    // (public) ~this
+    not(): BigInteger;
+
+    // (public) this << n
+    shiftLeft(n: number): BigInteger;
+
+    // (public) this >> n
+    shiftRight(n: number): BigInteger;
+
+    // (public) returns index of lowest 1-bit (or -1 if none)
+    getLowestSetBit(): number;
+
+    // (public) return number of set bits
+    bitCount(): number;
+
+    // (public) true iff nth bit is set
+    testBit(n: number): boolean;
+
+    // (protected) this op (1<<n)
+    changeBit(n: number, op: (x: number, y: number) => number): BigInteger;
+
+    // (protected) this op (1<<n)
+    setBit(n: number): BigInteger;
+
+    // (public) this & ~(1<<n)
+    clearBit(n: number): BigInteger
+
+    // (public) this ^ (1<<n)
+    flipBit(n: number): BigInteger
+
+    // (protected) r = this + a
+    addTo(a: BigInteger, r: BigInteger): void;
+
+    // (public) this + a
+    add(a: BigInteger): BigInteger;
+
+    // (public) this - a
+    subtract(a: BigInteger): BigInteger;
+
+    // (public) this * a
+    multiply(a: BigInteger): BigInteger;
+
+    // (public) this^2
+    square(): BigInteger;
+
+    // (public) this / a
+    divide(a: BigInteger): BigInteger;
+
+    // (public) this % a
+    remainder(a: BigInteger): BigInteger;
+
+    // (public) [this/a,this%a]
+    divideAndRemainder(a: BigInteger): BigInteger[]; // Array of 2 items
+
+    // (protected) this *= n, this >= 0, 1 < n < DV
+    dMultiply(n: number): void;
+
+    // (protected) this += n << w words, this >= 0
+    dAddOffset(n: number, w: number): void;
+
+    // (public) this^e
+    pow(e: number): BigInteger;
+
+    // (protected) r = lower n words of "this * a", a.t <= n
+    multiplyLowerTo(a: BigInteger, n: number, r: BigInteger): void;
+
+    // (protected) r = "this * a" without lower n words, n > 0
+    multiplyUpperTo(a: BigInteger, n: number, r: BigInteger): void;
+
+    // (public) this^e % m (HAC 14.85)
+    modPow(e: BigInteger, m: BigInteger): BigInteger;
+
+    // (public) gcd(this,a) (HAC 14.54)
+    gcd(a: BigInteger): BigInteger;
+
+    // (protected) this % n, n < 2^26
+    modInt(n: number): number;
+
+    // (public) 1/this % m (HAC 14.61)
+    modInverse(m: BigInteger): BigInteger;
+
+    // (public) test primality with certainty >= 1-.5^t
+    isProbablePrime(t: number): boolean;
+
+    // (protected) true if probably prime (HAC 4.24, Miller-Rabin)
+    millerRabin(t: number): boolean;
+
+    static ZERO: BigInteger;
+    static ONE: BigInteger;
+}
+
+export interface Reduction {
+    convert(x: BigInteger): BigInteger;
+    revert(x: BigInteger): BigInteger;
+    reduce(x: BigInteger): void;
+    mulTo(x: BigInteger, y: BigInteger, r: BigInteger): void;
+    sqrTo(x: BigInteger, r: BigInteger): void;
+}
+
+export as namespace jsbn;
diff --git a/types/jsbn/jsbn-tests.ts b/types/jsbn/jsbn-tests.ts
index 76088a32b6..eb5959173f 100644
--- a/types/jsbn/jsbn-tests.ts
+++ b/types/jsbn/jsbn-tests.ts
@@ -1,16 +1,15 @@
-
-var BigInteger = jsbn.BigInteger;
+import {BigInteger} from 'jsbn';
 
 // constructor tests
 var x = new BigInteger("AABB", 16);
 x = new BigInteger("75643564363473453456342378564387956906736546456235345");
 
 // method tests
-var isBigInteger: jsbn.BigInteger;
+var isBigInteger: BigInteger;
 var isNumber: number;
 var isBoolean: boolean;
 var isString: string;
-var isDivmod: jsbn.BigInteger[];
+var isDivmod: BigInteger[];
 var isByteArray: number[];
 
 x.copyTo(x);
diff --git a/types/jsbn/tslint.json b/types/jsbn/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsbn/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jschannel/index.d.ts b/types/jschannel/index.d.ts
new file mode 100644
index 0000000000..42145531ea
--- /dev/null
+++ b/types/jschannel/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for jschannel 1.0
+// Project: https://github.com/yochannah/jschannel
+// Definitions by: Yitzchok Gottlieb <https://github.com/yitzchok>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export as namespace Channel;
+
+export function build(config: ChannelConfiguration): MessagingChannel;
+
+export interface MessagingChannel {
+    unbind: (method: string, doNotPublish?: boolean) => boolean;
+    bind: (method: string, callback?: (transaction: MessageTransaction, params: any) => void, doNotPublish?: boolean) => MessagingChannel;
+    call: (message: Message) => void;
+    notify: (message: Message) => void;
+    destroy: () => void;
+}
+
+export interface Message {
+    method: string;
+    success?: (result: any) => void;
+    params?: any;
+    timeout?: number;
+    error?: (error: any, message: string) => void;
+}
+
+export interface ChannelConfiguration {
+    window: any;
+    origin: string;
+    scope: string;
+    debugOutput?: boolean;
+    postMessageObserver?: (origin: string, message: Message) => void;
+    gotMessageObserver?: (origin: string, message: Message) => void;
+    onReady?: (channel: MessagingChannel) => void;
+    reconnect?: boolean;
+    publish?: boolean;
+    remote?: string | ReadonlyArray<string>;
+}
+
+export interface MessageTransaction {
+    delayReturn: (delay: boolean) => boolean;
+    complete: (result: any) => void;
+    error: (error: any, message: string) => void;
+    invoke: (callbackName: string, params: any) => void;
+    completed: () => boolean;
+}
diff --git a/types/jschannel/jschannel-tests.ts b/types/jschannel/jschannel-tests.ts
new file mode 100644
index 0000000000..eabd150bf2
--- /dev/null
+++ b/types/jschannel/jschannel-tests.ts
@@ -0,0 +1,3 @@
+import { build } from 'jschannel';
+
+build({ window: null, origin: "*", scope: "testScope"});
diff --git a/types/jschannel/tsconfig.json b/types/jschannel/tsconfig.json
new file mode 100644
index 0000000000..83727a281c
--- /dev/null
+++ b/types/jschannel/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jschannel-tests.ts"
+    ]
+}
diff --git a/types/jschannel/tslint.json b/types/jschannel/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jschannel/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jscrollpane/tslint.json b/types/jscrollpane/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jscrollpane/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsdeferred/tslint.json b/types/jsdeferred/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsdeferred/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsdom/index.d.ts b/types/jsdom/index.d.ts
index ca2a1aad41..cfb54fa25f 100644
--- a/types/jsdom/index.d.ts
+++ b/types/jsdom/index.d.ts
@@ -103,7 +103,153 @@ export type ConstructorOptions = Options & {
     contentType?: string;
 };
 
-export interface DOMWindow extends Window { eval(script: string): void; }
+export interface DOMWindow extends Window {
+    eval(script: string): void;
+
+    /* node_modules/jsdom/living/index.js */
+    DOMException: typeof DOMException;
+    Attr: typeof Attr;
+    Node: typeof Node;
+    Element: typeof Element;
+    DocumentFragment: typeof DocumentFragment;
+    Document: typeof Document;
+    HTMLDocument: typeof HTMLDocument;
+    XMLDocument: typeof XMLDocument;
+    CharacterData: typeof CharacterData;
+    Text: typeof Text;
+    CDATASection: typeof CDATASection;
+    ProcessingInstruction: typeof ProcessingInstruction;
+    Comment: typeof Comment;
+    DocumentType: typeof DocumentType;
+    DOMImplementation: typeof DOMImplementation;
+    NodeList: typeof NodeList;
+    HTMLCollection: typeof HTMLCollection;
+    HTMLOptionsCollection: typeof HTMLOptionsCollection;
+    DOMStringMap: typeof DOMStringMap;
+    DOMTokenList: typeof DOMTokenList;
+    Event: typeof Event;
+    CustomEvent: typeof CustomEvent;
+    MessageEvent: typeof MessageEvent;
+    ErrorEvent: typeof ErrorEvent;
+    HashChangeEvent: typeof HashChangeEvent;
+    FocusEvent: typeof FocusEvent;
+    PopStateEvent: typeof PopStateEvent;
+    UIEvent: typeof UIEvent;
+    MouseEvent: typeof MouseEvent;
+    KeyboardEvent: typeof KeyboardEvent;
+    TouchEvent: typeof TouchEvent;
+    ProgressEvent: typeof ProgressEvent;
+    CompositionEvent: typeof CompositionEvent;
+    WheelEvent: typeof WheelEvent;
+    EventTarget: typeof EventTarget;
+    Location: typeof Location;
+    History: typeof History;
+    Blob: typeof Blob;
+    File: typeof File;
+    FileList: typeof FileList;
+    DOMParser: typeof DOMParser;
+    FormData: typeof FormData;
+    XMLHttpRequestEventTarget: XMLHttpRequestEventTarget;
+    XMLHttpRequestUpload: typeof XMLHttpRequestUpload;
+    NodeIterator: typeof NodeIterator;
+    TreeWalker: typeof TreeWalker;
+    NamedNodeMap: typeof NamedNodeMap;
+    URL: typeof URL;
+    URLSearchParams: typeof URLSearchParams;
+
+    /* node_modules/jsdom/living/register-elements.js */
+    HTMLElement: typeof HTMLElement;
+    HTMLAnchorElement: typeof HTMLAnchorElement;
+    HTMLAppletElement: typeof HTMLAppletElement;
+    HTMLAreaElement: typeof HTMLAreaElement;
+    HTMLAudioElement: typeof HTMLAudioElement;
+    HTMLBaseElement: typeof HTMLBaseElement;
+    HTMLBodyElement: typeof HTMLBodyElement;
+    HTMLBRElement: typeof HTMLBRElement;
+    HTMLButtonElement: typeof HTMLButtonElement;
+    HTMLCanvasElement: typeof HTMLCanvasElement;
+    HTMLDataElement: typeof HTMLDataElement;
+    HTMLDataListElement: typeof HTMLDataListElement;
+    // HTMLDetailsElement: typeof HTMLDetailsElement;
+    // HTMLDialogElement: typeof HTMLDialogElement;
+    HTMLDirectoryElement: typeof HTMLDirectoryElement;
+    HTMLDivElement: typeof HTMLDivElement;
+    HTMLDListElement: typeof HTMLDListElement;
+    HTMLEmbedElement: typeof HTMLEmbedElement;
+    HTMLFieldSetElement: typeof HTMLFieldSetElement;
+    HTMLFontElement: typeof HTMLFontElement;
+    HTMLFormElement: typeof HTMLFormElement;
+    HTMLFrameElement: typeof HTMLFrameElement;
+    HTMLFrameSetElement: typeof HTMLFrameSetElement;
+    HTMLHeadingElement: typeof HTMLHeadingElement;
+    HTMLHeadElement: typeof HTMLHeadElement;
+    HTMLHRElement: typeof HTMLHRElement;
+    HTMLHtmlElement: typeof HTMLHtmlElement;
+    HTMLIFrameElement: typeof HTMLIFrameElement;
+    HTMLImageElement: typeof HTMLImageElement;
+    HTMLInputElement: typeof HTMLInputElement;
+    HTMLLabelElement: typeof HTMLLabelElement;
+    HTMLLegendElement: typeof HTMLLegendElement;
+    HTMLLIElement: typeof HTMLLIElement;
+    HTMLLinkElement: typeof HTMLLinkElement;
+    HTMLMapElement: typeof HTMLMapElement;
+    HTMLMarqueeElement: typeof HTMLMarqueeElement;
+    HTMLMediaElement: typeof HTMLMediaElement;
+    HTMLMenuElement: typeof HTMLMenuElement;
+    HTMLMetaElement: typeof HTMLMetaElement;
+    HTMLMeterElement: typeof HTMLMeterElement;
+    HTMLModElement: typeof HTMLModElement;
+    HTMLObjectElement: typeof HTMLObjectElement;
+    HTMLOListElement: typeof HTMLOListElement;
+    HTMLOptGroupElement: typeof HTMLOptGroupElement;
+    HTMLOptionElement: typeof HTMLOptionElement;
+    HTMLOutputElement: typeof HTMLOutputElement;
+    HTMLParagraphElement: typeof HTMLParagraphElement;
+    HTMLParamElement: typeof HTMLParamElement;
+    HTMLPictureElement: typeof HTMLPictureElement;
+    HTMLPreElement: typeof HTMLPreElement;
+    HTMLProgressElement: typeof HTMLProgressElement;
+    HTMLQuoteElement: typeof HTMLQuoteElement;
+    HTMLScriptElement: typeof HTMLScriptElement;
+    HTMLSelectElement: typeof HTMLSelectElement;
+    HTMLSourceElement: typeof HTMLSourceElement;
+    HTMLSpanElement: typeof HTMLSpanElement;
+    HTMLStyleElement: typeof HTMLStyleElement;
+    HTMLTableCaptionElement: typeof HTMLTableCaptionElement;
+    HTMLTableCellElement: typeof HTMLTableCellElement;
+    HTMLTableColElement: typeof HTMLTableColElement;
+    HTMLTableElement: typeof HTMLTableElement;
+    HTMLTimeElement: typeof HTMLTimeElement;
+    HTMLTitleElement: typeof HTMLTitleElement;
+    HTMLTableRowElement: typeof HTMLTableRowElement;
+    HTMLTableSectionElement: typeof HTMLTableSectionElement;
+    HTMLTemplateElement: typeof HTMLTemplateElement;
+    HTMLTextAreaElement: typeof HTMLTextAreaElement;
+    HTMLTrackElement: typeof HTMLTrackElement;
+    HTMLUListElement: typeof HTMLUListElement;
+    HTMLUnknownElement: typeof HTMLUnknownElement;
+    HTMLVideoElement: typeof HTMLVideoElement;
+
+    /* node_modules/jsdom/level2/style.js */
+    StyleSheet: typeof StyleSheet;
+    MediaList: typeof MediaList;
+    CSSStyleSheet: typeof CSSStyleSheet;
+    CSSRule: typeof CSSRule;
+    CSSStyleRule: typeof CSSStyleRule;
+    CSSMediaRule: typeof CSSMediaRule;
+    CSSImportRule: typeof CSSImportRule;
+    CSSStyleDeclaration: typeof CSSStyleDeclaration;
+    StyleSheetList: typeof StyleSheetList;
+
+    /* node_modules/jsdom/level3/xpath.js */
+    // XPathException: typeof XPathException;
+    XPathExpression: typeof XPathExpression;
+    XPathResult: typeof XPathResult;
+    XPathEvaluator: typeof XPathEvaluator;
+
+    /* node_modules/jsdom/living/node-filter.js */
+    NodeFilter: typeof NodeFilter;
+}
 
 export type BinaryData = ArrayBuffer | DataView | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
 
diff --git a/types/jsdom/package.json b/types/jsdom/package.json
index 8f98c6256e..c208056015 100644
--- a/types/jsdom/package.json
+++ b/types/jsdom/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "parse5": "^3.0.2"
     }
-}
\ No newline at end of file
+}
diff --git a/types/jsdom/v2/tslint.json b/types/jsdom/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsdom/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsen/tslint.json b/types/jsen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsend/tslint.json b/types/jsend/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsend/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsesc/tslint.json b/types/jsesc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsesc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsfl/tslint.json b/types/jsfl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsfl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index c7d39c9499..73a848b79f 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>
 //                 Kamil Ejsymont <https://github.com/netes>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 import * as fs from 'fs';
 import * as stream from 'stream';
diff --git a/types/jsforce/query.d.ts b/types/jsforce/query.d.ts
index d0353ec638..242d89b358 100644
--- a/types/jsforce/query.d.ts
+++ b/types/jsforce/query.d.ts
@@ -47,8 +47,8 @@ export class Query<T> extends Readable implements Promise<T> {
     where(conditions: Object | string): Query<T>;
 
     // Implementing promise methods
-    then<T, never>(onfulfilled?: any | undefined | null): Promise<T | never>;
-    catch<never>(onrejected?: any | undefined | null): Promise<T>;
+    then<T, never>(onfulfilled?: any): Promise<T | never>;
+    catch<never>(onrejected?: any): Promise<T>;
     [Symbol.toStringTag]: "Promise";
 }
 
diff --git a/types/jsforce/tslint.json b/types/jsforce/tslint.json
index 5fdd35f19c..3b1f082eb2 100644
--- a/types/jsforce/tslint.json
+++ b/types/jsforce/tslint.json
@@ -4,6 +4,7 @@
         // TODOs
         "ban-types": false,
         "no-any-union": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/jshamcrest/tslint.json b/types/jshamcrest/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jshamcrest/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsmockito/tslint.json b/types/jsmockito/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsmockito/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsnox/jsnox-tests.ts b/types/jsnox/jsnox-tests.ts
index c274a6f491..d545581591 100644
--- a/types/jsnox/jsnox-tests.ts
+++ b/types/jsnox/jsnox-tests.ts
@@ -8,9 +8,9 @@ interface PersonProps {
     age: number;
 }
 
-const Person: React.ClassicComponentClass<PersonProps> = React.createClass<PersonProps, {}>({
+class Person extends React.Component<PersonProps> {
     render(): React.ReactElement<any> { return null; }
-});
+}
 
 const PersonTag = React.createFactory(Person);
 
diff --git a/types/json-editor/tslint.json b/types/json-editor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/json-editor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/json-js/index.d.ts b/types/json-js/index.d.ts
new file mode 100644
index 0000000000..125308ad09
--- /dev/null
+++ b/types/json-js/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for json-js 1.1
+// Project: https://github.com/cangosta/JSON-js
+// Definitions by: NN <https://github.com/NN--->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare const json: typeof JSON;
+export = json;
diff --git a/types/json-js/json-js-tests.ts b/types/json-js/json-js-tests.ts
new file mode 100644
index 0000000000..3d40057992
--- /dev/null
+++ b/types/json-js/json-js-tests.ts
@@ -0,0 +1,4 @@
+import JSON2 = require("json-js");
+
+const a = JSON2.stringify([]);
+const b = JSON2.parse(a);
diff --git a/types/json-js/tsconfig.json b/types/json-js/tsconfig.json
new file mode 100644
index 0000000000..0bac144d32
--- /dev/null
+++ b/types/json-js/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es2017",
+            "dom",
+            "dom.iterable"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "json-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/json-js/tslint.json b/types/json-js/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/json-js/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/json-merge-patch/tslint.json b/types/json-merge-patch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/json-merge-patch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/json-patch/tslint.json b/types/json-patch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/json-patch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/json-pointer/tslint.json b/types/json-pointer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/json-pointer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/json-query/index.d.ts b/types/json-query/index.d.ts
new file mode 100644
index 0000000000..929ab738ae
--- /dev/null
+++ b/types/json-query/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for json-query 2.2
+// Project: http://github.com/mmckegg/json-query#readme
+// Definitions by: Matt Traynham <https://github.com/mtraynham>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = JsonQuery;
+
+declare function JsonQuery(
+    selector: JsonQuery.Selector | JsonQuery.SelectorWithQueryParams,
+    options: JsonQuery.Options
+): JsonQuery.Result;
+
+declare namespace JsonQuery {
+    type Selector = string;
+
+    type QueryParam = any;
+    // No way to support [Selector, ...QueryParam[]]?
+    // 10 params should be more than enough, hopefully.
+    type SelectorWithQueryParams =
+        [Selector, QueryParam]
+        | [Selector, QueryParam]
+        | [Selector, QueryParam]
+        | [Selector, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam]
+        | [Selector, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam, QueryParam];
+
+    type Context = any;
+
+    type Filter = (input: Context, ...args: any[]) => Context;
+    interface Locals {
+        [filterName: string]: Filter;
+    }
+
+    interface Options {
+        data?: Context;
+        rootContext?: Context;
+        source?: Context;
+        context?: Context;
+        parent?: Context;
+        locals?: Locals;
+        globals?: boolean;
+        force?: boolean;
+        allowRegexp?: boolean;
+    }
+
+    interface Result {
+        value: any;
+        key: string;
+        references: any[];
+        parents: string[];
+    }
+}
diff --git a/types/json-query/json-query-tests.ts b/types/json-query/json-query-tests.ts
new file mode 100644
index 0000000000..5da1ca9e78
--- /dev/null
+++ b/types/json-query/json-query-tests.ts
@@ -0,0 +1,123 @@
+import jsonQuery = require('json-query');
+
+// API
+let data: jsonQuery.Context = {
+    people: [
+        {name: 'Matt', country: 'NZ'},
+        {name: 'Pete', country: 'AU'},
+        {name: 'Mikey', country: 'NZ'}
+    ]
+};
+jsonQuery('people[country=NZ].name', {data}); // => {value: 'Matt', parents: [...], key: 0} ... etc
+
+// Deep Queries
+data = {
+    grouped_people: {
+        friends: [
+            {name: 'Steve', country: 'NZ'},
+            {name: 'Jane', country: 'US'},
+            {name: 'Mike', country: 'AU'},
+            {name: 'Mary', country: 'NZ'}
+        ],
+        enemies: [
+            {name: 'Evil Steve', country: 'AU'},
+            {name: 'Betty', country: 'NZ'}
+        ]
+    }
+};
+const result: any = jsonQuery('grouped_people[**][*country=NZ]', {data}).value;
+
+// Inner Queries
+data = {
+    page: {
+        id: 'page_1',
+        title: 'Test'
+    },
+    comments_lookup: {
+        page_1: [
+            {id: 'comment_1', parent_id: 'page_1', content: "I am a comment"}
+        ]
+    }
+};
+jsonQuery('comments_lookup[{page.id}]', {data});
+
+// Local functions (helpers)
+const locals: jsonQuery.Locals = {
+    greetingName: (input: jsonQuery.Context) => {
+        if (input.known_as) {
+            return input.known_as;
+        } else {
+            return input.name;
+        }
+    },
+    and: (inputA: jsonQuery.Context, inputB: boolean) => {
+        return inputA && inputB;
+    },
+    text: (input: jsonQuery.Context, text: string) => {
+        return text;
+    },
+    then: (input: jsonQuery.Context, thenValue: string, elseValue: string) => {
+        if (input) {
+            return thenValue;
+        } else {
+            return elseValue;
+        }
+    }
+};
+data = {
+    is_fullscreen: true,
+    is_playing: false,
+    user: {
+        name: "Matthew McKegg",
+        known_as: "Matt"
+    }
+};
+jsonQuery('user:greetingName', {data, locals}).value; // => "Matt"
+jsonQuery(['is_fullscreen:and({is_playing}):then(?, ?)', "Playing big!", "Not so much"], {data, locals}).value; // => "Not so much"
+jsonQuery(':text(This displays text cos we made it so)', {locals}).value; // => "This displays text cos we made it so"
+jsonQuery('people:select(name, country)', {
+    data,
+    locals: {
+        select: (input: jsonQuery.Context, ...keys: string[]) => {
+            if (Array.isArray(input)) {
+                return input.map((item: any) => {
+                    return Object.keys(item).reduce((result: {[p: string]: any}, key: string) => {
+                        if (~keys.indexOf(key)) {
+                            result[key] = item[key];
+                        }
+                        return result;
+                    }, {});
+                });
+            }
+        }
+    }
+});
+jsonQuery('people[*:recentlyUpdated]', {
+    data,
+    locals: {
+        recentlyUpdated: (item: {updatedAt: number}) => {
+            return item.updatedAt < Date.now() - (30 * 24 * 60 * 60 * 1000);
+        }
+    }
+});
+
+// Context
+data = {
+    styles: {
+        bold: 'font-weight:strong',
+        red: 'color: red'
+    },
+    paragraphs: [
+        {content: "I am a red paragraph", style: 'red'},
+        {content: "I am a bold paragraph", style: 'bold'},
+    ],
+};
+let pageHtml = '';
+data.paragraphs.forEach((paragraph: {content: string, style: string}) => {
+    const style = jsonQuery('styles[{.style}]', {data, source: paragraph}).value;
+    const content = jsonQuery('.content', {data, source: paragraph}).value; // pretty pointless :)
+    pageHtml += `<p style='${style}'>${content}</p>`;
+});
+
+// Query Params
+jsonQuery(['people[country=?]', 'NZ'], {data});
diff --git a/types/json-query/tsconfig.json b/types/json-query/tsconfig.json
new file mode 100644
index 0000000000..9a317f4d83
--- /dev/null
+++ b/types/json-query/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "json-query-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/json-query/tslint.json b/types/json-query/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/json-query/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/json-rpc-ws/index.d.ts b/types/json-rpc-ws/index.d.ts
index c3023c409e..9faaeefd66 100644
--- a/types/json-rpc-ws/index.d.ts
+++ b/types/json-rpc-ws/index.d.ts
@@ -80,8 +80,6 @@ export class Base<TConnection extends Connection> {
     getConnection(id: string): Connection;
     /**
      * Shut down all existing connections
-     *
-     * @public
      */
     hangup(): void;
 }
diff --git a/types/json-schema/index.d.ts b/types/json-schema/index.d.ts
index 016db75a25..7f02b671a0 100644
--- a/types/json-schema/index.d.ts
+++ b/types/json-schema/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for json-schema 4.0
+// Type definitions for json-schema 4.0 and 6.0
 // Project: https://www.npmjs.com/package/json-schema
-// Definitions by: Boris Cherny <https://github.com/bcherny>
+// Definitions by: Boris Cherny <https://github.com/bcherny>, Cyrille Tuzi <https://github.com/cyrilletuzi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-/// <reference types="node"/>
+/* JSON Schema 4 */
 
 /**
  * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.1
@@ -198,3 +198,276 @@ export interface JSONSchema4 {
    */
   [k: string]: any
 }
+
+/* JSON Schema 6 */
+
+export type JSONSchema6TypeName = 'string' | 'number' | 'integer' | 'boolean' | 'object' | 'array' | 'null' | 'any'
+
+export type JSONSchema6Type = any[] | boolean | number | null | object | string
+
+/**
+ * JSON Schema V6
+ * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01
+ */
+export interface JSONSchema6 {
+  $id?: string
+  $ref?: string
+  $schema?: 'http://json-schema.org/schema#' | 'http://json-schema.org/hyper-schema#' |
+  'http://json-schema.org/draft-06/schema#' | 'http://json-schema.org/draft-06/hyper-schema#'
+
+  /**
+   * Must be strictly greater than 0.
+   * A numeric instance is valid only if division by this keyword's value results in an integer.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.1
+   */
+  multipleOf?: number
+
+  /**
+   * Representing an inclusive upper limit for a numeric instance.
+   * This keyword validates only if the instance is less than or exactly equal to "maximum".
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.2
+   */
+  maximum?: number
+
+  /**
+   * Representing an exclusive upper limit for a numeric instance.
+   * This keyword validates only if the instance is strictly less than (not equal to) to "exclusiveMaximum".
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.3
+   */
+  exclusiveMaximum?: number
+
+  /**
+   * Representing an inclusive lower limit for a numeric instance.
+   * This keyword validates only if the instance is greater than or exactly equal to "minimum".
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.4
+   */
+  minimum?: number
+
+  /**
+   * Representing an exclusive lower limit for a numeric instance.
+   * This keyword validates only if the instance is strictly greater than (not equal to) to "exclusiveMinimum".
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.5
+   */
+  exclusiveMinimum?: number
+
+  /**
+   * Must be a non-negative integer.
+   * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.6
+   */
+  maxLength?: number
+
+  /**
+   * Must be a non-negative integer.
+   * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.
+   * Omitting this keyword has the same behavior as a value of 0.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.7
+   */
+  minLength?: number
+
+  /**
+   * Should be a valid regular expression, according to the ECMA 262 regular expression dialect.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.8
+   */
+  pattern?: string
+
+  /**
+   * This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself.
+   * Omitting this keyword has the same behavior as an empty schema.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.9
+   */
+  items?: boolean | JSONSchema6 | JSONSchema6[]
+
+  /**
+   * This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself.
+   * If "items" is an array of schemas, validation succeeds if every instance element
+   * at a position greater than the size of "items" validates against "additionalItems".
+   * Otherwise, "additionalItems" MUST be ignored, as the "items" schema
+   * (possibly the default value of an empty schema) is applied to all elements.
+   * Omitting this keyword has the same behavior as an empty schema.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.10
+   */
+  additionalItems?: boolean | JSONSchema6
+
+  /**
+   * Must be a non-negative integer.
+   * An array instance is valid against "maxItems" if its size is less than, or equal to, the value of this keyword.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.11
+   */
+  maxItems?: number
+
+  /**
+   * Must be a non-negative integer.
+   * An array instance is valid against "maxItems" if its size is greater than, or equal to, the value of this keyword.
+   * Omitting this keyword has the same behavior as a value of 0.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.12
+   */
+  minItems?: number
+
+  /**
+   * If this keyword has boolean value false, the instance validates successfully.
+   * If it has boolean value true, the instance validates successfully if all of its elements are unique.
+   * Omitting this keyword has the same behavior as a value of false.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.13
+   */
+  uniqueItems?: boolean
+
+  /**
+   * An array instance is valid against "contains" if at least one of its elements is valid against the given schema.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.14
+   */
+  contains?: boolean | JSONSchema6
+
+  /**
+   * Must be a non-negative integer.
+   * An object instance is valid against "maxProperties" if its number of properties is less than, or equal to, the value of this keyword.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.15
+   */
+  maxProperties?: number
+
+  /**
+   * Must be a non-negative integer.
+   * An object instance is valid against "maxProperties" if its number of properties is greater than,
+   * or equal to, the value of this keyword.
+   * Omitting this keyword has the same behavior as a value of 0.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.16
+   */
+  minProperties?: number
+
+  /**
+   * Elements of this array must be unique.
+   * An object instance is valid against this keyword if every item in the array is the name of a property in the instance.
+   * Omitting this keyword has the same behavior as an empty array.
+   *
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.17
+   */
+  required?: string[]
+
+  /**
+   * This keyword determines how child instances validate for objects, and does not directly validate the immediate instance itself.
+   * Validation succeeds if, for each name that appears in both the instance and as a name within this keyword's value,
+   * the child instance for that name successfully validates against the corresponding schema.
+   * Omitting this keyword has the same behavior as an empty object.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.18
+   */
+  properties?: {
+    [k: string]: boolean | JSONSchema6
+  }
+
+  /**
+   * This attribute is an object that defines the schema for a set of property names of an object instance.
+   * The name of each property of this attribute's object is a regular expression pattern in the ECMA 262, while the value is a schema.
+   * If the pattern matches the name of a property on the instance object, the value of the instance's property
+   * MUST be valid against the pattern name's schema value.
+   * Omitting this keyword has the same behavior as an empty object.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.19
+   */
+  patternProperties?: {
+    [k: string]: boolean | JSONSchema6
+  }
+
+  /**
+   * This attribute defines a schema for all properties that are not explicitly defined in an object type definition.
+   * If specified, the value MUST be a schema or a boolean.
+   * If false is provided, no additional properties are allowed beyond the properties defined in the schema.
+   * The default value is an empty schema which allows any value for additional properties.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.20
+   */
+  additionalProperties?: boolean | JSONSchema6
+
+  /**
+   * This keyword specifies rules that are evaluated if the instance is an object and contains a certain property.
+   * Each property specifies a dependency.
+   * If the dependency value is an array, each element in the array must be unique.
+   * Omitting this keyword has the same behavior as an empty object.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.21
+   */
+  dependencies?: {
+    [k: string]: boolean | JSONSchema6 | string[]
+  }
+
+  /**
+   * Takes a schema which validates the names of all properties rather than their values.
+   * Note the property name that the schema is testing will always be a string.
+   * Omitting this keyword has the same behavior as an empty schema.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.22
+   */
+  propertyNames?: boolean | JSONSchema6
+
+  /**
+   * This provides an enumeration of all possible values that are valid
+   * for the instance property. This MUST be an array, and each item in
+   * the array represents a possible value for the instance value. If
+   * this attribute is defined, the instance value MUST be one of the
+   * values in the array in order for the schema to be valid.
+   *
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.23
+   */
+  enum?: JSONSchema6Type[]
+
+  /**
+   * More readible form of a one-element "enum"
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.24
+   */
+  const?: JSONSchema6Type
+
+  /**
+   * A single type, or a union of simple types
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.25
+   */
+  type?: JSONSchema6TypeName | JSONSchema6TypeName[]
+
+  /**
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
+   */
+  allOf?: JSONSchema6[]
+
+  /**
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
+   */
+  anyOf?: JSONSchema6[]
+
+  /**
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
+   */
+  oneOf?: JSONSchema6[]
+
+  /**
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.29
+   */
+  not?: boolean | JSONSchema6
+
+  /**
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.1
+   */
+  definitions?: {
+    [k: string]: boolean | JSONSchema6
+  }
+
+  /**
+   * This attribute is a string that provides a short description of the instance property.
+   *
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.2
+   */
+  title?: string
+
+  /**
+   * This attribute is a string that provides a full description of the of purpose the instance property.
+   *
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.2
+   */
+  description?: string
+
+  /**
+   * This keyword can be used to supply a default JSON value associated with a particular schema.
+   * It is RECOMMENDED that a default value be valid against the associated schema.
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.3
+   */
+  default?: JSONSchema6Type
+
+  /**
+   * Array of examples with no validation effect the value of "default" is usable as an example without repeating it under this keyword
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.4
+   */
+  examples?: JSONSchema6Type[]
+}
diff --git a/types/json-schema/json-schema-tests.ts b/types/json-schema/json-schema-tests.ts
index 58264668b0..0fd15f5de9 100644
--- a/types/json-schema/json-schema-tests.ts
+++ b/types/json-schema/json-schema-tests.ts
@@ -1,4 +1,6 @@
-import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName } from 'json-schema'
+import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSchema6Type, JSONSchema6TypeName } from 'json-schema'
+
+/* JSON Schema 4 */
 
 // SimpleType
 () => {
@@ -56,7 +58,7 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName } from 'json-schema'
       baz: { type: 'integer' }
     },
     enum: ['foo', 42],
-    type: ['string', 'array'],
+    type: 'string',
     allOf: [{}],
     anyOf: [{}],
     oneOf: [{}],
@@ -65,3 +67,73 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName } from 'json-schema'
     bar: 4
   }
 }
+
+/* JSON Schema 6 */
+
+// SimpleType
+() => {
+  const a: JSONSchema6TypeName = 'string'
+  const b: JSONSchema6TypeName = 'null'
+  const c: JSONSchema6TypeName = 'any'
+}
+
+// Type
+() => {
+  const a: JSONSchema6Type = 'foo'
+  const b: JSONSchema6Type = null
+  const c: JSONSchema6Type = [1, 2]
+}
+
+// JSONSchema4
+() => {
+  const a: JSONSchema6 = {}
+  const b: JSONSchema6 = {
+    $id: 'foo',
+    $ref: 'foo/bar',
+    $schema: 'http://json-schema.org/schema#',
+    title: 'foo',
+    description: 'bar',
+    default: 42,
+    multipleOf: 3,
+    maximum: 4,
+    exclusiveMaximum: 4,
+    minimum: 5,
+    exclusiveMinimum: 5,
+    maxLength: 6,
+    minLength: 7,
+    pattern: 'baz',
+    additionalItems: true,
+    items: [
+      { items: [{ minLength: 4 }] }
+    ],
+    maxItems: 4,
+    minItems: 5,
+    uniqueItems: true,
+    maxProperties: 10,
+    minProperties: 11,
+    required: ['foo', 'bar'],
+    additionalProperties: false,
+    definitions: {
+      foo: { type: 'string' }
+    },
+    properties: {
+      bar: { type: 'boolean' }
+    },
+    patternProperties: {
+      foo: { type: 'integer' }
+    },
+    dependencies: {
+      baz: { type: 'integer' }
+    },
+    enum: ['foo', 42],
+    type: 'string',
+    allOf: [{}],
+    anyOf: [{}],
+    oneOf: [{}],
+    not: {},
+    const: 'foo',
+    contains: {},
+    examples: [{}],
+    propertyNames: {}
+  }
+}
diff --git a/types/json-socket/tslint.json b/types/json-socket/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/json-socket/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/json5/tslint.json b/types/json5/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/json5/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsoneditor/tslint.json b/types/jsoneditor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsoneditor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsoneditoronline/tslint.json b/types/jsoneditoronline/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsoneditoronline/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsonfile/index.d.ts b/types/jsonfile/index.d.ts
index bed60556a1..62227c9e84 100644
--- a/types/jsonfile/index.d.ts
+++ b/types/jsonfile/index.d.ts
@@ -8,13 +8,13 @@
 import { Url } from 'url';
 
 export type FSReadOptions = {
-    encoding?: null | undefined;
-    flag?: string | undefined;
+    encoding?: null;
+    flag?: string;
     } | null | undefined;
 export type FSWriteOptions = string | {
-    encoding?: string | null | undefined;
-    mode?: string | number | undefined;
-    flag?: string | undefined;
+    encoding?: string | null;
+    mode?: string | number;
+    flag?: string;
     } | null | undefined;
 
 export type ReadCallback = (err: NodeJS.ErrnoException | null, data: Buffer) => void;
@@ -29,23 +29,23 @@ export interface FS {
 }
 
 export type JFReadOptions = {
-    encoding?: null | undefined;
-    flag?: string | undefined;
+    encoding?: null;
+    flag?: string;
     throws?: boolean;
     fs?: FS;
-    reviver?: ((key: any, value: any) => any) | undefined;
+    reviver?: (key: any, value: any) => any;
     } | null | undefined;
 
 export type JFWriteOptions = string | {
-    encoding?: string | null | undefined;
-    mode?: string | number | undefined;
-    flag?: string | undefined;
+    encoding?: string | null;
+    mode?: string | number;
+    flag?: string;
     throws?: boolean;
     fs?: FS;
     EOL?: string;
-    spaces?: string | number | undefined;
-    replacer?: ((key: string, value: any) => any) | undefined;
-    } | null | undefined;
+    spaces?: string | number;
+    replacer?: (key: string, value: any) => any;
+    } | null;
 
 export type JFReadCallback = (err: NodeJS.ErrnoException | null, data: any) => void;
 
diff --git a/types/jsonminify/tslint.json b/types/jsonminify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsonminify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsonnet/tslint.json b/types/jsonnet/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsonnet/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsonpath/tslint.json b/types/jsonpath/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsonpath/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsonstream/index.d.ts b/types/jsonstream/index.d.ts
index cf0f0fdd43..3e9bdd4b12 100644
--- a/types/jsonstream/index.d.ts
+++ b/types/jsonstream/index.d.ts
@@ -14,7 +14,25 @@ export interface Options {
 export declare function parse(pattern: any): NodeJS.ReadWriteStream;
 export declare function parse(patterns: any[]): NodeJS.ReadWriteStream;
 
+
+/**
+ * Create a writable stream.
+ * you may pass in custom open, close, and seperator strings. But, by default, 
+ * JSONStream.stringify() will create an array, 
+ * (with default options open='[\n', sep='\n,\n', close='\n]\n')
+ */
 export declare function stringify(): NodeJS.ReadWriteStream;
+
+/** If you call JSONStream.stringify(false) the elements will only be seperated by a newline. */
+export declare function stringify(newlineOnly: NewlineOnlyIndicator): NodeJS.ReadWriteStream;
+type NewlineOnlyIndicator = false
+
+/**
+ * Create a writable stream.
+ * you may pass in custom open, close, and seperator strings. But, by default, 
+ * JSONStream.stringify() will create an array, 
+ * (with default options open='[\n', sep='\n,\n', close='\n]\n')
+ */
 export declare function stringify(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
 
 export declare function stringifyObject(): NodeJS.ReadWriteStream;
diff --git a/types/jsonstream/jsonstream-tests.ts b/types/jsonstream/jsonstream-tests.ts
index d42ab0d845..68c8e858ac 100644
--- a/types/jsonstream/jsonstream-tests.ts
+++ b/types/jsonstream/jsonstream-tests.ts
@@ -8,6 +8,7 @@ read = read.pipe(json.parse('*'));
 read = read.pipe(json.parse(['foo/*', 'bar/*']));
 
 read = json.stringify();
+read = json.stringify(false);
 read = json.stringify('{', ',', '}');
 
 read = json.stringifyObject();
diff --git a/types/jsonstream/tslint.json b/types/jsonstream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsonstream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index 335a6f52b7..26e223df53 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for jsonwebtoken 7.2.0
+// Type definitions for jsonwebtoken 7.2.1
 // Project: https://github.com/auth0/node-jsonwebtoken
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>, Daniel Heim <https://github.com/danielheim>
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>,
+//                 Daniel Heim <https://github.com/danielheim>,
+//                 Brice BERNARD <https://github.com/brikou>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -51,17 +53,17 @@ export interface SignOptions {
     noTimestamp?: boolean;
     header?: object;
     encoding?: string;
-
 }
 
 export interface VerifyOptions {
     algorithms?: string[];
     audience?: string | string[];
+    clockTimestamp?: number;
     clockTolerance?: number;
     issuer?: string | string[];
     ignoreExpiration?: boolean;
     ignoreNotBefore?: boolean;
-    jwtId?: string;
+    jwtid?: string;
     subject?: string;
     /**
      *@deprecated
@@ -76,14 +78,17 @@ export interface DecodeOptions {
 }
 
 export interface VerifyCallback {
-    (err: JsonWebTokenError | NotBeforeError | TokenExpiredError, decoded: object | string): void;
+    (
+        err: JsonWebTokenError | NotBeforeError | TokenExpiredError,
+        decoded: object | string,
+    ): void;
 }
 
 export interface SignCallback {
     (err: Error, encoded: string): void;
 }
 
-export type Secret = string | Buffer | {key: string, passphrase: string}
+export type Secret = string | Buffer | { key: string; passphrase: string };
 
 /**
  * Synchronously sign the given payload into a JSON Web Token string
@@ -92,7 +97,11 @@ export type Secret = string | Buffer | {key: string, passphrase: string}
  * @param {SignOptions} [options] - Options for the signature
  * @returns {String} The JSON Web Token string
  */
-export declare function sign(payload: string | Buffer | object, secretOrPrivateKey: Secret, options?: SignOptions): string;
+export declare function sign(
+    payload: string | Buffer | object,
+    secretOrPrivateKey: Secret,
+    options?: SignOptions,
+): string;
 
 /**
  * Sign the given payload into a JSON Web Token string
@@ -101,8 +110,17 @@ export declare function sign(payload: string | Buffer | object, secretOrPrivateK
  * @param {SignOptions} [options] - Options for the signature
  * @param {Function} callback - Callback to get the encoded token on
  */
-export declare function sign(payload: string | Buffer | object, secretOrPrivateKey: Secret, callback: SignCallback): void;
-export declare function sign(payload: string | Buffer | object, secretOrPrivateKey: Secret, options: SignOptions, callback: SignCallback): void;
+export declare function sign(
+    payload: string | Buffer | object,
+    secretOrPrivateKey: Secret,
+    callback: SignCallback,
+): void;
+export declare function sign(
+    payload: string | Buffer | object,
+    secretOrPrivateKey: Secret,
+    options: SignOptions,
+    callback: SignCallback,
+): void;
 
 /**
  * Synchronously verify given token using a secret or a public key to get a decoded token
@@ -111,8 +129,15 @@ export declare function sign(payload: string | Buffer | object, secretOrPrivateK
  * @param {VerifyOptions} [options] - Options for the verification
  * @returns The decoded token.
  */
-declare function verify(token: string, secretOrPublicKey: string | Buffer): object | string;
-declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions): object | string;
+declare function verify(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+): object | string;
+declare function verify(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+    options?: VerifyOptions,
+): object | string;
 
 /**
  * Asynchronously verify given token using a secret or a public key to get a decoded token
@@ -121,8 +146,17 @@ declare function verify(token: string, secretOrPublicKey: string | Buffer, optio
  * @param {VerifyOptions} [options] - Options for the verification
  * @param {Function} callback - Callback to get the decoded token on
  */
-declare function verify(token: string, secretOrPublicKey: string | Buffer, callback?: VerifyCallback): void;
-declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions, callback?: VerifyCallback): void;
+declare function verify(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+    callback?: VerifyCallback,
+): void;
+declare function verify(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+    options?: VerifyOptions,
+    callback?: VerifyCallback,
+): void;
 
 /**
  * Returns the decoded payload without verifying if the signature is valid.
@@ -130,4 +164,7 @@ declare function verify(token: string, secretOrPublicKey: string | Buffer, optio
  * @param {DecodeOptions} [options] - Options for decoding
  * @returns {Object} The decoded Token
  */
-declare function decode(token: string, options?: DecodeOptions): null | object | string;
+declare function decode(
+    token: string,
+    options?: DecodeOptions,
+): null | object | string;
diff --git a/types/jsonwebtoken/jsonwebtoken-tests.ts b/types/jsonwebtoken/jsonwebtoken-tests.ts
index 9e495d31cb..0b04c23e63 100644
--- a/types/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/types/jsonwebtoken/jsonwebtoken-tests.ts
@@ -57,6 +57,13 @@ jwt.verify(token, 'shhhhh', function(err, decoded) {
   console.log(result.foo) // bar
 });
 
+// use external time for verifying
+jwt.verify(token, 'shhhhh', { clockTimestamp: 1 }, function(err, decoded) {
+  const result = decoded as ITestObject
+
+  console.log(result.foo) // bar
+});
+
 // invalid token
 jwt.verify(token, 'wrong-secret', function(err, decoded) {
   // err
diff --git a/types/jsonwebtoken/tslint.json b/types/jsonwebtoken/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsonwebtoken/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jspdf/tslint.json b/types/jspdf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jspdf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsplumb/index.d.ts b/types/jsplumb/index.d.ts
deleted file mode 100644
index 7e195888c1..0000000000
--- a/types/jsplumb/index.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-// Type definitions for jsPlumb jQuery adapter 1.3
-// Project: http://jsplumb.org
-// Definitions by: Steve Shearn <https://github.com/shearnie>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery"/>
-
-declare var jsPlumb: jsPlumbInstance;
-
-interface jsPlumbInstance {
-	setRenderMode(renderMode: string): string;
-	bind(event: string, callback: (e: any) => void ): void;
-	unbind(event?: string): void;
-	ready(callback: () => void): void;
-	importDefaults(defaults: Defaults): void;
-	Defaults: Defaults;
-	restoreDefaults(): void;
-	addClass(el: any, clazz: string): void;
-	addEndpoint(ep: string): any;
-	removeClass(el: any, clazz: string): void;
-	hasClass(el: any, clazz: string): void;
-    	draggable(el: string, options?: DragOptions): jsPlumbInstance;
-    	draggable(ids: string[], options?: DragOptions): jsPlumbInstance;
-    	connect(connection: ConnectParams, referenceParams?: ConnectParams): Connection;
-    	makeSource(el: string, options: SourceOptions): void;
-    	makeTarget(el: string, options: TargetOptions): void;
-    	repaintEverything(): void;
-    	detachEveryConnection(): void;
-	detachAllConnections(el: string): void;
-    	removeAllEndpoints(el: string, recurse?: boolean): jsPlumbInstance;
-    	removeAllEndpoints(el: Element, recurse?: boolean): jsPlumbInstance;
-    	select(params: SelectParams): Connections;
-    	getConnections(options?: any, flat?: any): any[];
-    	deleteEndpoint(uuid: string, doNotRepaintAfterwards?: boolean): jsPlumbInstance;
-    	deleteEndpoint(endpoint: Endpoint, doNotRepaintAfterwards?: boolean): jsPlumbInstance;
-    	repaint(el: string): jsPlumbInstance;
-    	repaint(el: Element): jsPlumbInstance;
-    	getInstance(): jsPlumbInstance;
-	getInstance(defaults: Defaults): jsPlumbInstance;
-	getInstanceIndex(): number;
-
-    SVG: string;
-    CANVAS: string;
-    VML: string;
-}
-
-interface Defaults {
-	Endpoint?: any[];
-	PaintStyle?: PaintStyle;
-	HoverPaintStyle?: PaintStyle;
-	ConnectionsDetachable?: boolean;
-	ReattachConnections?: boolean;
-	ConnectionOverlays?: any[][];
-    Container?: any; // string(selector or id) or element
-    DragOptions?: DragOptions;
-}
-
-interface PaintStyle {
-	strokeStyle: string;
-	lineWidth: number;
-}
-
-interface ArrowOverlay {
-	location: number;
-	id: string;
-	length: number;
-	foldback: number;
-}
-
-interface LabelOverlay {
-	label: string;
-	id: string;
-	location: number;
-}
-
-interface Connections {
-	detach(): void;
-	length: number;
-}
-
-interface ConnectParams {
-    source?: any; // string, element or endpoint
-    target?: any; // string, element or endpoint
-	detachable?: boolean;
-	deleteEndpointsOnDetach?: boolean;
-	endPoint?: string;
-	anchor?: string;
-	anchors?: any[];
-	label?: string;
-}
-
-interface DragOptions {
-	containment?: string;
-}
-
-interface SourceOptions {
-	parent: string;
-	endpoint?: string;
-	anchor?: string;
-	connector?: any[];
-	connectorStyle?: PaintStyle;
-}
-
-interface TargetOptions {
-	isTarget?: boolean;
-	maxConnections?: number;
-	uniqueEndpoint?: boolean;
-	deleteEndpointsOnDetach?: boolean;
-	endpoint?: string;
-	dropOptions?: DropOptions;
-	anchor?: any;
-}
-
-interface DropOptions {
-	hoverClass: string;
-}
-
-interface SelectParams {
-	scope?: string;
-	source: string;
-	target: string;
-}
-
-interface Connection {
-    setDetachable(detachable: boolean): void;
-    setParameter<T>(name: string, value: T): void;
-    endpoints: Endpoint[];
-}
-
-interface Endpoint {
-}
diff --git a/types/jsplumb/tsconfig.json b/types/jsplumb/tsconfig.json
deleted file mode 100644
index 82e6284376..0000000000
--- a/types/jsplumb/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/jsrender/tslint.json b/types/jsrender/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsrender/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsrp/index.d.ts b/types/jsrp/index.d.ts
index 27f52c9e91..6cdb2abd7f 100644
--- a/types/jsrp/index.d.ts
+++ b/types/jsrp/index.d.ts
@@ -28,58 +28,58 @@ export class client {
 
     /**
      * Initialise the client SRP and calculate needed SRP values
-     * @param {ClientOptions} options - the client options including the username and password
-     * @param {function(): any} callback - called when the client instance is ready to use
+     * @param options - the client options including the username and password
+     * @param callback - called when the client instance is ready to use
      */
     init(options: ClientOptions, callback: () => any): void;
 
     /**
      * Returns the hex representation of the client's A value
-     * @returns {string} - hex representation of A
+     * @returns hex representation of A
      */
     getPublicKey(): string;
 
     /**
      * Set the salt generated by the server for later computations
-     * @param {string} hexSalt - hex value of the salt
+     * @param hexSalt - hex value of the salt
      */
     setSalt(hexSalt: string): void;
 
     /**
      * Sets the server's B value on the client and compute values to complete authentication
-     * @param {string} hexB - hex representation of B
+     * @param hexB - hex representation of B
      * @throws Will throw an error if the server provides an incorrect value
      */
     setServerPublicKey(hexB: string): void;
 
     /**
      * Returns the hex representation of the client's M1 proof
-     * @returns {string} - hex representation of M1
+     * @returns hex representation of M1
      */
     getProof(): string;
 
     /**
      * Verifies the server's M2 proof against the client's. Only call after using {@link getProof}.
-     * @param {string} hexM2 - hex representation of M2
-     * @returns {boolean} - true if it matches the client's proof, false if it doesn't
+     * @param hexM2 - hex representation of M2
+     * @returns true if it matches the client's proof, false if it doesn't
      */
     checkServerProof(hexM2: string): boolean;
 
     /**
      * Returns the hex representation of the shared secret key, K
-     * @returns {string} - hex representation of K
+     * @returns hex representation of K
      */
     getSharedKey(): string;
 
     /**
      * Generate the v and salt values from values passed into init().
-     * @param {function(*, Verifier): *} callback - callback has an error as the first argument, or an object containing the verifier and salt as the second.
+     * @param callback - callback has an error as the first argument, or an object containing the verifier and salt as the second.
      */
     createVerifier(callback: (error: any, result: Verifier) => any): void;
 
     /**
      * Returns the hex representation of the salt
-     * @returns {string} - hex representation of the salt
+     * @returns hex representation of the salt
      */
     getSalt(): string;
 }
@@ -90,46 +90,46 @@ export class server {
 
     /**
      * Initialise the server SRP and calculate needed SRP values
-     * @param {ServerOptions} options - the server options including the verifier and salt
-     * @param {function(): void} callback - called when the server instance is ready to use
+     * @param options - the server options including the verifier and salt
+     * @param callback - called when the server instance is ready to use
      */
     init(options: ServerOptions, callback: () => any): void;
 
     /**
      * Returns the hex representation of the server's B value
-     * @returns {string} - hex representation of B
+     * @returns hex representation of B
      */
     getPublicKey(): string;
 
     /**
      * Returns the hex representation of the salt, as was passed into {@link init}
-     * @returns {string} - hex representation of the salt
+     * @returns hex representation of the salt
      */
     getSalt(): string;
 
     /**
      * Sets the client's A value on the server, and compute values to complete authentication
-     * @param {string} hexA - hex representation of A
+     * @param hexA - hex representation of A
      * @throws Will throw an error if the client provides an incorrect value
      */
     setClientPublicKey(hexA: string): void;
 
     /**
      * Returns the hex representation of the shared secret key, K
-     * @returns {string} - hex representation of K
+     * @returns hex representation of K
      */
     getSharedKey(): string;
 
     /**
      * Verifies the clients's M1 proof against the server's.
-     * @param {string} M1hex - hex representation of M1
-     * @returns {boolean} - true if it matches the server's proof, false if it doesn't
+     * @param M1hex - hex representation of M1
+     * @returns true if it matches the server's proof, false if it doesn't
      */
     checkClientProof(M1hex: string): boolean;
 
     /**
      * Returns the hex representation of the server's M2 proof
-     * @returns {string} - hex representation of M2
+     * @returns hex representation of M2
      */
     getProof(): string;
 }
diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 18278d80d1..d0136216ed 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -1,50 +1,127 @@
-// Type definitions for jss v0.6
-// Project: https://github.com/Box9/jss
-// Definitions by: Valentin Robert <https://github.com/Ptival>
+// Type definitions for jss 9.3
+// Project: https://github.com/cssinjs/jss#readme
+// Definitions by: Brenton Simpson <https://github.com/appsforartists>
+//                 Oleg Slobodskoi <https://github.com/kof>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-interface Properties {
-    [name: string]: string;
+export interface Rule {
+	className: string;
+	selector: string;
+	applyTo(element: HTMLElement): void;
+	prop(key: string): string;
+	prop(key: string, value: any): this;
+	toJSON(): string;
 }
-
-interface Selectors {
-    [selector: string]: Properties;
+export interface StyleSheet<T> {
+	// Gives auto-completion on the rules declared in `createStyleSheet` without
+	// causing errors for rules added dynamically after creation.
+	classes: {
+		[K in keyof T]: string;
+	} & { [key: string]: string };
+	options: any;
+	linked: boolean;
+	attached: boolean;
+	/**
+	 * Attach renderable to the render tree.
+	 */
+	attach(): this;
+	/**
+	 * Remove renderable from render tree.
+	 */
+	detach(): this;
+	/**
+	 * Add a rule to the current stylesheet.
+	 * Will insert a rule also after the stylesheet has been rendered first time.
+	 */
+	addRule(style: Style, options?: Partial<RuleOptions>): Rule;
+	addRule(name: string, style: Style, options?: Partial<RuleOptions>): Rule;
+	/**
+	 * Create and add rules.
+	 * Will render also after Style Sheet was rendered the first time.
+	 */
+	addRules(styles: { [key: string]: Style }, options?: Partial<RuleOptions>): Rule[];
+	/**
+	 * Get a rule by name.
+	 */
+	getRule(name: string): Rule;
+	/**
+	 * Delete a rule by name.
+	 * Returns `true`: if rule has been deleted from the DOM.
+	 */
+	deleteRule(name: string): boolean;
+	/**
+	 * Get index of a rule.
+	 */
+	indexOf(rule: Rule): number;
+	/**
+	 * Update the function values with a new data.
+	 */
+	update(data?: {}): this;
+	update(name: string, data: {}): this;
+	/**
+	 * Convert rules to a CSS string.
+	 */
+	toString(options?: { indent?: number }): string;
 }
-
-interface JSS {
-    /**
-     * Retrieve all rules added via JSS, organized by selectors
-     */
-    get(): Selectors;
-
-    /**
-     * Retrieve rules added via JSS for a given selector
-     * @param s CSS selector
-     */
-    get(s: string): Properties;
-
-    /**
-     * Retrieve all rules specified for a given selector (not necessarily added via JSS)
-     * @param s CSS selector
-     */
-    getAll(s: string): Properties;
-
-    /**
-     * Remove all rules added via JSS
-     */
-    remove(): void;
-
-    /**
-     * Remove all rules added via JSS for the given selector
-     */
-    remove(s: string): void;
-
-    /**
-     * Add or extend an existing rule
-     * @param s CSS selector
-     * @param p CSS properties
-     */
-    set(s: string, p: Properties): void;
+export type GenerateClassName<T> = (rule: Rule, sheet?: StyleSheet<T>) => string;
+export interface Style {
+	[key: string]: any;
 }
-
-declare var jss: JSS;
+export interface JSSPlugin {
+	[key: string]: () => Partial<{
+		onCreateRule(name: string, style: Style, options: RuleOptions): Rule,
+		onProcessRule(rule: Rule, sheet: StyleSheet<any>): void,
+		onProcessStyle(style: Style, rule: Rule, sheet: StyleSheet<any>): Style,
+		onProcessSheet(sheet: StyleSheet<any>): void,
+		onChangeValue(value: any, prop: string, rule: Rule): any,
+		onUpdate(data: {}, rule: Rule, sheet: StyleSheet<any>): void,
+	}>;
+}
+export interface JSSOptions {
+	createGenerateClassName(): GenerateClassName<any>;
+	plugins: ReadonlyArray<JSSPlugin>;
+	virtual: boolean;
+	insertionPoint: string | HTMLElement;
+}
+export interface RuleFactoryOptions {
+	selector: string;
+	classes: { [key: string]: string };
+	sheet: StyleSheet<any>;
+	index: number;
+	jss: JSS;
+	generateClassName: GenerateClassName<any>;
+}
+export interface RuleOptions {
+	index: number;
+	className: string;
+}
+declare class JSS {
+	constructor(options?: Partial<JSSOptions>);
+	createStyleSheet<T>(
+		styles: T,
+		options?: Partial<{
+			media: string,
+			meta: string,
+			link: boolean,
+			element: HTMLStyleElement,
+			index: number,
+			generateClassName: GenerateClassName<T>,
+			classNamePrefix: string,
+		}>,
+	): StyleSheet<T>;
+	removeStyleSheet(sheet: StyleSheet<any>): this;
+	setup(options?: Partial<JSSOptions>): this;
+	use(plugin: JSSPlugin): this;
+	createRule(style: Style, options?: Partial<RuleFactoryOptions>): Rule;
+	createRule(name: string, style: Style, options?: Partial<RuleFactoryOptions>): Rule;
+}
+/**
+ * Creates a new instance of JSS.
+ */
+export function create(options?: Partial<JSSOptions>): JSS;
+declare const sharedInstance: JSS;
+/**
+ * A global JSS instance.
+ */
+export default sharedInstance;
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 2863bbfb66..0cf3f51350 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -1,16 +1,62 @@
+// API docs at http://cssinjs.org/js-api
 
+import {
+	create as createJSS,
+	default as sharedInstance
+} from 'jss';
 
-jss.set('.demo', {
-    'font-size': '15px',
-    'color': 'red'
+const jss = createJSS().setup({});
+
+const styleSheet = jss.createStyleSheet(
+	{
+		ruleWithMockObservable: {
+			subscribe() {}
+		},
+		container: {
+			display: 'flex',
+			width: 100,
+			opacity: .5,
+		},
+	},
+	{
+		link: true,
+	}
+).attach();
+
+styleSheet.classes.container; // $ExpectType string
+styleSheet.classes.ruleWithMockObservable; // $ExpectType string
+
+const rule = styleSheet.addRule('dynamicRule', { color: 'indigo' });
+rule.prop('border-radius', 5).prop('color'); // $ExpectType string
+styleSheet.classes.dynamicRule; // $ExpectType string
+
+styleSheet.deleteRule('dynamicRule');
+
+// test that `addRule` supports the shorthand signature
+const dynamicRule = styleSheet.addRule({ color: 'red' });
+
+const div = document.createElement('div');
+dynamicRule.applyTo(div);
+
+const containerRule = styleSheet.getRule('container');
+const containerJSON = containerRule.toJSON();
+const css = styleSheet.toString();
+
+styleSheet.addRules({
+	rule1: {
+		fontFamily: 'Roboto',
+		color: '#FFFFFF',
+	},
+	rule2: {
+		fontFamily: 'Inconsolata',
+		fontSize: 17,
+	},
 });
 
-jss.get('.demo');
+styleSheet.detach();
 
-jss.get();
-
-jss.getAll('.demo');
-
-jss.remove('.demo');
-
-jss.remove();
+sharedInstance.createStyleSheet({
+	container: {
+		background: '#000099',
+	}
+});
diff --git a/types/jss/tsconfig.json b/types/jss/tsconfig.json
index d22eb9d75e..f34791192c 100644
--- a/types/jss/tsconfig.json
+++ b/types/jss/tsconfig.json
@@ -2,11 +2,12 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +21,4 @@
         "index.d.ts",
         "jss-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jss/tslint.json b/types/jss/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jss/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jssha/tslint.json b/types/jssha/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jssha/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jstimezonedetect/tslint.json b/types/jstimezonedetect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jstimezonedetect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jstorage/tslint.json b/types/jstorage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jstorage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jstree/index.d.ts b/types/jstree/index.d.ts
index 21e07de80d..6bbbb43d2a 100644
--- a/types/jstree/index.d.ts
+++ b/types/jstree/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jsTree v3.3.3
+// Type definitions for jsTree v3.3.4
 // Project: http://www.jstree.com/
 // Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -15,6 +15,11 @@ interface JQueryStatic {
     * @type {JSTreeStatic}
     */
     jstree?: JSTreeStatic;
+
+    /**
+     * helpers
+     */
+    vakata?: VakataStatic;
 }
 
 interface JQuery {
@@ -96,25 +101,25 @@ interface JSTreeStatic {
     core(id: number): void;
 
     /**
-    * get a reference to an existing instance
-    *
-    * __Examples__
-    *
-    *	// provided a container with an ID of "tree", and a nested node with an ID of "branch"
-	*	// all of there will return the same instance
-    * $.jstree.reference('tree');
-    * $.jstree.reference('#tree');
+	 * get a reference to an existing instance
+	 *
+	 * __Examples__
+	 *
+	 *	// provided a container with an ID of "tree", and a nested node with an ID of "branch"
+	 *	// all of there will return the same instance
+	 *	$.jstree.reference('tree');
+	 *	$.jstree.reference('#tree');
 	 *	$.jstree.reference($('#tree'));
 	 *	$.jstree.reference(document.getElementByID('tree'));
-    * $.jstree.reference('branch');
-    * $.jstree.reference('#branch');
-    * $.jstree.reference($('#branch'));
+	 *	$.jstree.reference('branch');
+	 *	$.jstree.reference('#branch');
+	 *	$.jstree.reference($('#branch'));
 	 *	$.jstree.reference(document.getElementByID('branch'));
-    *
+	 *
 	 * @name $.jstree.reference(needle)
 	 * @param {DOMElement|jQuery|String} needle
 	 * @return {jsTree|null} the instance or `null` if not found
-    */
+	 */
     reference(needle: HTMLElement|JQuery|string): JSTree;
 }
 
@@ -282,7 +287,7 @@ interface JSTreeStaticDefaultsCore {
     *	$('#tree').jstree({
     *		'core' : {
     *			'check_callback' : function (operation, node, node_parent, node_position, more) {
-    *				// operation can be 'create_node', 'rename_node', 'delete_node', 'move_node' or 'copy_node'
+    *				// operation can be 'create_node', 'rename_node', 'delete_node', 'move_node', 'copy_node' or 'edit'
     *				// in case of 'rename_node' node_position is filled with the new node name
     *				return operation === 'rename_node' ? true : false;
     *			}
@@ -445,6 +450,20 @@ interface JSTreeStaticDefaultsCheckbox {
     * @plugin checkbox
     */
     tie_selection: boolean;
+
+    /**
+     * This setting controls if cascading down affects disabled checkboxes
+     * @name $.jstree.defaults.checkbox.cascade_to_disabled
+     * @plugin checkbox
+     */
+    cascade_to_disabled : boolean;
+        
+    /**
+     * This setting controls if cascading down affects hidden checkboxes
+     * @name $.jstree.defaults.checkbox.cascade_to_hidden
+     * @plugin checkbox
+     */
+    cascade_to_hidden : boolean;
 }
 
 interface JSTreeStaticDefaultsContextMenu {
@@ -708,6 +727,43 @@ interface JSTreeStaticDefaultsUnique {
     duplicate: (name: string, counter: number) => string;
 }
 
+interface VakataStatic {
+    /**
+     * collect attributes
+     */
+    attributes: (node: any, with_values: any) => any;
+
+    /**
+     * returns array with unique elements
+     */
+    array_unique: (array: Array<any>) => Array<any>;
+
+    /**
+     * remove item from array
+     */
+    array_remove: (array: Array<any>, from: number) => Array<any>;
+    
+    /**
+     * remove item from array
+     */
+    array_remove_item: (array: Array<any>, item: any) => Array<any>;
+
+    /**
+     * filter array
+     */
+    array_filter: (c: any, a: any, b: any, d: Array<any>, e: any) => Array<any>;
+
+    context: any;
+
+    html: any;
+
+    dnd: any;
+
+    search: any;
+
+    storage: any;
+}
+
 interface JSTree extends JQuery {
     /**
     * used to decorate an instance with a plugin. Used internally.
@@ -871,12 +927,12 @@ interface JSTree extends JQuery {
     get_parent: (obj: any) => string;
 
     /**
-    * get a jQuery collection of all the children of a node (node must be rendered)
+    * get a jQuery collection of all the children of a node (node must be rendered), returns false on error
     * @name get_children_dom(obj)
     * @param  {mixed} obj
     * @return {jQuery}
     */
-    get_children_dom: (obj: any) => JQuery;
+    get_children_dom: (obj: any) => JQuery|boolean;
 
     /**
     * checks if a node has children
@@ -1686,6 +1742,21 @@ interface JSTree extends JQuery {
     */
     enable_checkbox: (obj: any) => boolean;
 
+    /**
+     * Unchecks a node and all its descendants. This function does NOT affect hidden and disabled nodes (or their descendants).
+     * However if these unaffected nodes are already selected their ids will be included in the returned array.
+     * @param id
+     * @param checkedState
+     * @returns {Array} Array of all node id's (in this tree branch) that are checked.
+     */
+    _cascade_new_checked_state: (id: string, checkedState: string) => string[];
+
+    /**
+     * Gets ids of nodes selected in branch (of tree) specified by id (does not include the node specified by id)
+     * @param id
+     */
+    get_checked_descendants: (id: string) => string[];
+
     /**
     * check a node (only if tie_selection in checkbox settings is false, otherwise select_node will be called internally)
     * @name check_node(obj)
diff --git a/types/jstree/jstree-tests.ts b/types/jstree/jstree-tests.ts
index 208ae9b979..57ef47cb8c 100644
--- a/types/jstree/jstree-tests.ts
+++ b/types/jstree/jstree-tests.ts
@@ -1,5 +1,3 @@
-
-
 // gets version of lib
 var version: string = $.jstree.version;
 
@@ -126,3 +124,9 @@ var treeWithNewCoreProperties = $('#treeWithNewEllipsisProperties').jstree({
         themes: coreThemes
     }
 });
+
+var vakata: VakataStatic = $.vakata;
+
+var testArray: Array<any> = [];
+vakata.attributes(tree.get_node(null), true);
+var storage = vakata.storage;
\ No newline at end of file
diff --git a/types/jstree/tslint.json b/types/jstree/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jstree/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsts/tslint.json b/types/jsts/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsts/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsuite/tslint.json b/types/jsuite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsuite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsuri/tslint.json b/types/jsuri/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsuri/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsurl/jsurl-tests.ts b/types/jsurl/jsurl-tests.ts
index abdbb45851..a8adcfa90c 100644
--- a/types/jsurl/jsurl-tests.ts
+++ b/types/jsurl/jsurl-tests.ts
@@ -40,8 +40,6 @@ else { // if not an array but scalar value here is a way how to convert to array
 
 // The way to remove the parameter:
 delete u.query.a
-// or:
-delete u.query["a"]
 
 // If you need to remove all query string params:
 u.query.clear();
diff --git a/types/jsurl/tslint.json b/types/jsurl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsurl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jsx-chai/tslint.json b/types/jsx-chai/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jsx-chai/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jszip/index.d.ts b/types/jszip/index.d.ts
index 7ea6180080..bca2b6899c 100644
--- a/types/jszip/index.d.ts
+++ b/types/jszip/index.d.ts
@@ -28,7 +28,7 @@ interface InputByType {
     text: string;
     binarystring: string;
     array: number[];
-    unit8array: Uint8Array;
+    uint8array: Uint8Array;
     arraybuffer: ArrayBuffer;
     blob: Blob;
 }
@@ -38,7 +38,7 @@ interface OutputByType {
     text: string;
     binarystring: string;
     array: number[];
-    unit8array: Uint8Array;
+    uint8array: Uint8Array;
     arraybuffer: ArrayBuffer;
     blob: Blob;
     nodebuffer: Buffer;
@@ -64,8 +64,8 @@ declare namespace JSZip {
 
         /**
          * Prepare the content in the asked type.
-         * @param {String} type the type of the result.
-         * @param {OnUpdateCallback} onUpdate a function to call on each internal update.
+         * @param type the type of the result.
+         * @param onUpdate a function to call on each internal update.
          * @return Promise the promise of the result.
          */
         async<T extends OutputType>(type: T, onUpdate?: OnUpdateCallback): Promise<OutputByType[T]>;
@@ -75,7 +75,8 @@ declare namespace JSZip {
     interface JSZipFileOptions {
         /** Set to `true` if the data is `base64` encoded. For example image data from a `<canvas>` element. Plain text and HTML do not need this option. */
         base64?: boolean;
-        /** Set to `true` if the data should be treated as raw content, `false` if this is a text. If `base64` is used,
+        /**
+         * Set to `true` if the data should be treated as raw content, `false` if this is a text. If `base64` is used,
          * this defaults to `true`, if the data is not a `string`, this will be set to `true`.
          */
         binary?: boolean;
@@ -218,7 +219,7 @@ interface JSZip {
      * @param onUpdate The optional function called on each internal update with the metadata.
      * @return A Node.js `ReadableStream`
      */
-    generateNodeStream(options?: JSZip.JSZipGeneratorOptions<'nodebuffer'>, onUpdate?: OnUpdateCallback): NodeJS.ReadStream;
+    generateNodeStream(options?: JSZip.JSZipGeneratorOptions<'nodebuffer'>, onUpdate?: OnUpdateCallback): NodeJS.ReadableStream;
 
     /**
      * Deserialize zip file asynchronously
diff --git a/types/jug/tslint.json b/types/jug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jui-core/index.d.ts b/types/jui-core/index.d.ts
index c3c2cb895a..5a607f5721 100644
--- a/types/jui-core/index.d.ts
+++ b/types/jui-core/index.d.ts
@@ -9,206 +9,126 @@
 export const jui: JuiStatic;
 
 export interface UtilBase {
-    /**
-     * @property browser check browser agent
-     * @property {Boolean} browser.webkit  Webkit 브�우저 체�
-     * @property {Boolean} browser.mozilla  Mozilla 브�우저 체�
-     * @property {Boolean} browser.msie  IE 브�우저 체�
-     */
+    /** check browser agent */
     browser: {
+        /** Webkit 브�우저 체� */
         webkit: boolean,
+        /** Mozilla 브�우저 체� */
         mozilla: boolean,
+        /** IE 브�우저 체� */
         msie: boolean
     };
 
-    /**
-     * @property {Boolean} isTouch
-     * check touch device
-     */
     isTouch: boolean;
 
     /**
-     * @method inherit
-     *
      * 프로토타입 기반� �� 제공
      *
-     * @param {Function} ctor base Class
-     * @param {Function} superCtor super Class
+     * @param ctor base Class
+     * @param superCtor super Class
      */
     inherit(ctor: ((...args: any[]) => any), superCtor: ((...args: any[]) => any)): void;
 
     /**
-     * @method extend
-     *
      * implements object extend
-     *
-     * @param {Object|Function} origin
-     * @param {Object|Function} add
-     * @param {Boolean} skip
-     * @return {Object}
      */
     extend(origin: any, add: any, skip: boolean): any;
 
     /**
      * convert px to integer
-     * @param {String or Number} px
-     * @return {Number}
      */
     pxToInt(px: string | number): number;
 
     /**
-     * @method clone
      * implements object clone
-     * @param {Array/Object} obj 복사할 �체
-     * @return {Array}
+     * @param obj 복사할 �체
      */
     clone(obj: any): any[];
 
     /**
-     * @method deepClone
      * implements object deep clone
-     * @param obj
-     * @param emit
-     * @return {*}
      */
     deepClone(obj: any, emit: any): any[];
 
     /**
-     * @method sort
      * use QuickSort
-     * @param {Array} array
-     * @return {QuickSort}
      */
     sort(array: any[]): UtilQuickSort;
 
     /**
-     * @method runtime
-     *
      * caculate callback runtime
-     *
-     * @param {String} name
-     * @param {Function} callback
      */
     runtime(name: string, callback: ((...args: any[]) => void)): void;
 
     /**
-     * @method template
      * parsing template string
-     * @param html
-     * @param obj
      */
     template(html: string, obj?: any): ((obj: any) => string) | string;
 
     /**
-     * @method resize
      * add event in window resize event
-     * @param {Function} callback
-     * @param {Number} ms delay time
+     * @param ms delay time
      */
     resize(callback: ((...args: any[]) => void), ms: number): void;
 
     /**
-     * @method index
-     *
      * IndexParser �체 �성
-     *
-     * @return {KeyParser}
      */
     index(): UtilKeyParser;
 
     /**
-     * @method chunk
      * split array by length
-     * @param {Array} arr
-     * @param {Number} len
-     * @return {Array}
      */
     chunk(arr: any[], len: number): any[];
 
     /**
-     * @method typeCheck
      * check data  type
-     * @param {String} t  type string
-     * @param {Object} v value object
-     * @return {Boolean}
+     * @param t  type string
+     * @param v value object
      */
     typeCheck(typeName: string, value: any): boolean;
 
     typeCheckObj(uiObj: any, list: any): void;
 
     /**
-     * @method dataToCsv
-     *
      * data 를 csv 로 변환한다.
      *
-     * @param {Array} keys
-     * @param {Array} dataList
-     * @param {Number} dataSize
-     * @return {String}  변환� csv 문�열
+     * @return  변환� csv 문�열
      */
     dataToCsv(keys: string[], dataList: any[], dataSize: number): string;
 
-    /**
-     * @method dataToCsv2
-     *
-     * @param {Object} options
-     * @return {String}
-     */
     dataToCsv2(options: any): string;
 
     /**
-     * @method fileToCsv
-     *
      * file �서 csv 컨�츠 로드
-     *
-     * @param {File} file
-     * @param {Function} callback
      */
     fileToCsv(fileText: string, callback: ((data: any) => void)): void;
 
     /**
-     * @method csvToBase64
-     *
      * csv 다운로드 ��로 변환
      *
-     * @param {String} csv
-     * @return {String} data uri string
+     * @return data uri string
      */
     csvToBase64(csv: string): string;
 
-    /**
-     * @method csvToData
-     *
-     * @param {Array} keys
-     * @param {String} csv
-     * @param {Number} csvNumber
-     * @return {Array}
-     */
     csvToData(keys: string[], csv: string, csvNumber: number): any[];
 
     /**
-     * @method getCsvFields
      *
      * csv �서 필드 얻어오기
      *
-     * @param {Array} fields
-     * @param {Array} csvFields
-     * @return {Array}
      */
     getCsvFields(fields: string[], csvFields: string[]): string[];
 
     /**
-     * @method svgToBase64
      *
      * xml 문�열로 svg datauri �성
      *
-     * @param {String} xml
-     * @return {String} 변환� data uri ��
+     * @return 변환� data uri ��
      */
     svgToBase64(xml: string): string;
 
     /**
-     * @method dateFormat
      *
      * implements date format function
      *
@@ -216,104 +136,73 @@ export interface UtilBase {
      * yy : 2 digits year
      * y : 1 digit year
      *
-     * @param {Date} date
-     * @param {String} format   date format string
-     * @param {Boolean} utc
-     * @return {string}
+     * @param format   date format string
      */
     dateFormat(date: Date, format: string, utc?: boolean): string;
 
     /**
-     * @method createId
      *
      * 유니� 아�디 �성
      *
-     * @param {String} key  prefix string
-     * @return {String} �성� 아�디 문�열
+     * @param key  prefix string
+     * @return �성� 아�디 문�열
      */
     createId(key: string): string;
 
     /**
-     * @method btoa
-     *
      * Base64 �코딩
-     *
-     * @return {String}
      */
     btoa(input: any): string;
 
     /**
-     * @method atob
-     *
      * Base64 디코딩
-     *
-     * @return {Any}
      */
     atob(input: string): any;
 
     /**
      * implement async loop without blocking ui
      *
-     * @param {Number} total   loop count
-     * @param {Object} context
-     * @returns {Function}
+     * @param total   loop count
      */
     timeLoop(total: number, context?: any): ((index: number) => void);
 
     /**
-     * @method loop
-     *
      * 최�화� 루프 �성 (5단계로 나눔)
      *
-     * @param {Number} total   loop count
-     * @param {Object} [context=null]
-     * @return {Function} 최�화� 루프 콜백 (index, groupIndex 2가지 파�미터를 받는다.)
+     * @param total   loop count
+     * @return 최�화� 루프 콜백 (index, groupIndex 2가지 파�미터를 받는다.)
      */
     loop(total: number, context?: any): ((index: number, groupIndex: number) => void);
 
     /**
-     * @method loopArray
-     *
      * 배열� 사용해서 최�화� 루프로 �성한다.
      *
      *
-     * @param {Array} data 루프로 �성� 배열
-     * @param {Object} [context=null]
-     * @return {Function} 최�화� 루프 콜백 (data, index, groupIndex 3가지 파�미터를 받는다.)
+     * @param data 루프로 �성� 배열
+     * @return 최�화� 루프 콜백 (data, index, groupIndex 3가지 파�미터를 받는다.)
      */
     loopArray(data: any[], context?: any): ((data: any, index: number, groupIndex: number) => void);
 
     /**
-     * @method makeIndex
-     *
      * 배열� 키 기반 ��스를 �성한다.
      *
      * 개별 값 별로 멀티 ��스를 �성한다.
      *
-     * @param {Array} data
-     * @param {String} keyField
-     * @return {Object} �성� ��스
+     * @return �성� ��스
      */
     makeIndex(data: any[], keyField: string): any;
 
     /**
-     * @method startsWith
      * Check that it matches the starting string search string.
      *
-     * @param {String} string
-     * @param {String} searchString
-     * @param {Number} [position=0]
-     * @return {Number} position
+     * @return position
      */
     startsWith(str: string, searchString: string, position?: number): number;
 
     /**
-     * @method endsWith
      * Check that it matches the end of a string search string.
      *
-     * @param {String} string
-     * @param {String} searchString
-     * @return {Number} position
+     * @return position
      */
     endsWith(str: string, searchString: string, position?: number): number;
 
@@ -332,46 +221,36 @@ export interface UtilBase {
 
 export interface JuiStatic {
     /**
-     * @method ready
-     *
      * ready 타임� 실행� callback 정�
-     *
-     * @param {Function} callback
      */
     ready(depends?: string[], callback?: (...args: any[]) => void): void;
 
     /**
-     * @method defineUI
-     *
      * 사용�가 실제로 사용할 수 있는 UI �래스를 정�
      *
-     * @param {String} name 모듈 로드와 ��� 사용� �름� 정한다.
-     * @param {Array} depends 'define'�나 'defineUI'로 정�� �래스나 �체를 ��로 받� 수 있다.
-     * @param {Function} callback UI �래스를 해당 콜백 함수 내�서 �래스 형태로 구현하고 리턴해야 한다.
+     * @param name 모듈 로드와 ��� 사용� �름� 정한다.
+     * @param depends 'define'�나 'defineUI'로 정�� �래스나 �체를 ��로 받� 수 있다.
+     * @param callback UI �래스를 해당 콜백 함수 내�서 �래스 형태로 구현하고 리턴해야 한다.
      */
     defineUI(name: string, depends: string[], callback: () => void, parent?: string): void;
 
     /**
-     * @method define
-     *
      * UI �래스�서 사용� �래스를 정�하고, �유롭게 ��할 수 있는 �래스를 정�
      *
-     * @param {String} name 모듈 로드와 ��� 사용� �름� 정한다.
-     * @param {Array} depends 'define'�나 'defineUI'로 정�� �래스나 �체를 ��로 받� 수 있다.
-     * @param {Function} callback UI �래스를 해당 콜백 함수 내�서 �래스 형태로 구현하고 리턴해야 한다.
-     * @param {String} parent ��받� �래스
+     * @param name 모듈 로드와 ��� 사용� �름� 정한다.
+     * @param depends 'define'�나 'defineUI'로 정�� �래스나 �체를 ��로 받� 수 있다.
+     * @param callback UI �래스를 해당 콜백 함수 내�서 �래스 형태로 구현하고 리턴해야 한다.
+     * @param parent ��받� �래스
      */
     define(name: string, depends: string[], callback: () => void, parent?: string): void;
 
     /**
-     * @method redefine
-     *
      * UI �래스�서 사용� �래스를 정�하고, �유롭게 ��할 수 있는 �래스를 정�
      *
-     * @param {String} name 모듈 로드와 ��� 사용� �름� 정한다.
-     * @param {Array} depends 'define'�나 'defineUI'로 정�� �래스나 �체를 ��로 받� 수 있다.
-     * @param {Function} callback UI �래스를 해당 콜백 함수 내�서 �래스 형태로 구현하고 리턴해야 한다.
-     * @param {String} parent ��받� �래스
+     * @param name 모듈 로드와 ��� 사용� �름� 정한다.
+     * @param depends 'define'�나 'defineUI'로 정�� �래스나 �체를 ��로 받� 수 있다.
+     * @param callback UI �래스를 해당 콜백 함수 내�서 �래스 형태로 구현하고 리턴해야 한다.
+     * @param parent ��받� �래스
      */
     redefine(name: string, depends: string[], callback: () => void, parent?: string): void;
 
@@ -379,60 +258,48 @@ export interface JuiStatic {
      * define과 defineUI로 정�� �래스 �는 �체를 가져온다.
      *
      * @param name 가져온 �래스 �는 �체� �름
-     * @return {*}
      */
     include(name: string): any;
 
     /**
      * define과 defineUI로 정�� 모든 �래스와 �체를 가져온다.
-     *
-     * @return {Array}
      */
     includeAll(): any[];
 
     /**
-     * @method add
      * Adds a component object created
      *
-     * @param {Object} ui UI instance
+     * @param ui UI instance
      */
     add(uiIns: any): void;
 
     /**
-     * @method emit
      * Generates a custom event to an applicable component
      *
-     * @param {String} key Selector or UI type
-     * @param {String} type Event type
-     * @param {Array} args Event arguments
+     * @param key Selector or UI type
+     * @param type Event type
+     * @param args Event arguments
      */
     emit(key: string, type: string, args: any[]): void;
 
     /**
-     * @method get
      * Gets a component currently created
      *
-     * @param {Integer/String} key
-     * @returns {Object/Array} UI instance
+     * @returns UI instance
      */
     get(key: number | string): any;
 
     /**
-     * @method getAll
      * Gets all components currently created
      *
-     * @return {Array} UI instances
+     * @return UI instances
      */
     getAll(): any[];
 
     /**
-     * @method create
      * It is possible to create a component dynamically after the ready point
      *
-     * @param {String} type UI type
-     * @param {String/DOMElement} selector
-     * @param {Object} options
-     * @return {Object}
+     * @param type UI type
      */
     create(type: string, selector: any, options?: {}): any;
 }
@@ -449,93 +316,69 @@ export interface UICore {
     root?: any;
 
     /**
-     * @method emit
      * Generates a custom event. The first parameter is the type of a custom event. A function defined as an option or on method is called
      *
-     * @param {String} type Event type
-     * @param {Function} args Event Arguments
-     * @return {Mixed}
+     * @param type Event type
+     * @param args Event Arguments
      */
     emit(type: string, args: () => void): any;
 
     /**
-     * @method on
      * A callback function defined as an on method is run when an emit method is called
      *
-     * @param {String} type Event type
-     * @param {Function} callback
+     * @param type Event type
      */
     on(type: string, callback: () => void): void;
 
     /**
-     * @method off
      * Removes a custom event of an applicable type or callback handler
      *
-     * @param {String} type Event type
+     * @param type Event type
      */
     off(type: string): void;
 
     /**
-     * @method addValid
      * Check the parameter type of a UI method and generates an alarm when a wrong value is entered
      *
-     * @param {String} name Method name
-     * @param {Array} params Parameters
+     * @param name Method name
+     * @param params Parameters
      */
     addValid(name: string, params: any[]): void;
 
     /**
-     * @method callBefore
      * Sets a callback function that is called before a UI method is run
      *
-     * @param {String} name Method name
-     * @param {Function} callback
-     * @return {Mixed}
+     * @param name Method name
      */
     callBefore(name: string, callback: () => void): void;
 
     /**
-     * @method callAfter
      * Sets a callback function that is called after a UI method is run
      *
-     * @param {String} name Method name
-     * @param {Function} callback
-     * @return {Mixed}
+     * @param name Method name
      */
     callAfter(name: string, callback: () => void): void;
 
     /**
-     * @method callDelay
      * Sets a callback function and the delay time before/after a UI method is run
      *
-     * @param {String} name Method name
-     * @param {Function} callback
+     * @param name Method name
      */
     callDelay(name: string, callObj: () => void): void;
 
     /**
-     * @method setTpl
      * Dynamically defines the template method of a UI
      *
-     * @param {String} name Template name
-     * @param {String} html Template markup
+     * @param name Template name
+     * @param html Template markup
      */
     setTpl(name: string, html: string): void;
 
     /**
-     * @method setOption
      * Dynamically defines the options of a UI
-     *
-     * @param {String} key
-     * @param {Mixed} value
      */
     setOption(key: string, value: any): void;
 
-    /**
-     * @method destroy
-     * Removes all events set in a UI obejct and the DOM element
-     *
-     */
     destroy(): void;
 }
 
@@ -544,11 +387,7 @@ export interface UIEvent extends UICore {
     root?: any;
 
     /**
-     * @method find
      * Get the child element of the root element
-     *
-     * @param {String/HTMLElement} Selector
-     * @returns {*|jQuery}
      */
     find(selector: any): JQuery;
 }
@@ -560,8 +399,6 @@ export class ColorScale {
 
 export interface UtilColor {
     /**
-     * @method format
-     *
      * convert color to format string
      *
      *     // hex
@@ -573,15 +410,12 @@ export interface UtilColor {
      *     // rgba
      *     color.format({ r : 255, g : 255, b : 255, a : 0.5 }, 'rgb') // rgba(255, 255, 255, 0.5);
      *
-     * @param {Object} obj  obj has r, g, b and a attributes
-     * @param {"hex"/"rgb"} type  format string type
-     * @returns {*}
+     * @param obj  obj has r, g, b and a attributes
+     * @param type  format string type
      */
     format(obj: any, type: string): string;
 
     /**
-     * @method scale
-     *
      * get color scale
      *
      * 		var c = color.scale().domain('#FF0000', '#00FF00');
@@ -592,84 +426,68 @@ export interface UtilColor {
      * 		// get middle color list
      * 		c.ticks(20);  // return array ,    [startColor, ......, endColor ]
      *
-     * @returns {func} scale function
+     * @returns scale function
      */
     scale(): ColorScale;
 
     /**
-     * @method map
-     *
      * create color map
      *
      * 		var colorList = color.map(['#352a87', '#0f5cdd', '#00b5a6', '#ffc337', '#fdff00'], count)
      *
-     * @param {Array} color_list
-     * @param {Number} count  a divide number
-     * @returns {Array} converted color list
+     * @param count  a divide number
+     * @returns converted color list
      */
     map(color_list: string[], count: number): string[];
 
     /**
-     * @method rgb
-     *
      * parse string to rgb color
      *
      * 		color.rgb("#FF0000") === { r : 255, g : 0, b : 0 }
      *
      * 		color.rgb("rgb(255, 0, 0)") == { r : 255, g : 0, b : }
      *
-     * @param {String} str color string
-     * @returns {Object}  rgb object
+     * @param str color string
+     * @returns  rgb object
      */
     rgb(str: string): any;
 
     /**
-     * @method HSVtoRGB
-     *
      * convert hsv to rgb
      *
      * 		color.HSVtoRGB(0,0,1) === #FFFFF === { r : 255, g : 0, b : 0 }
      *
-     * @param {Number} H  hue color number  (min : 0, max : 360)
-     * @param {Number} S  Saturation number  (min : 0, max : 1)
-     * @param {Number} V  Value number 		(min : 0, max : 1 )
-     * @returns {Object}
+     * @param H  hue color number  (min : 0, max : 360)
+     * @param S  Saturation number  (min : 0, max : 1)
+     * @param V  Value number 		(min : 0, max : 1 )
      */
     HSVtoRGB(H: number, S: number, V: number): any;
 
     /**
-     * @method RGBtoHSV
-     *
      * convert rgb to hsv
      *
      * 		color.RGBtoHSV(0, 0, 255) === { h : 240, s : 1, v : 1 } === '#FFFF00'
      *
-     * @param {Number} R  red color value
-     * @param {Number} G  green color value
-     * @param {Number} B  blue color value
-     * @return {Object}  hsv color code
+     * @param R  red color value
+     * @param G  green color value
+     * @param B  blue color value
+     * @return  hsv color code
      */
     RGBtoHSV(R: number, G: number, B: number): any;
 
     /**
-     * @method lighten
-     *
      * rgb 컬러 �� ��로 변환
      *
-     * @param {String} color   RGB color code
-     * @param {Number} rate �� ��
-     * @return {String}
+     * @param color   RGB color code
+     * @param rate �� ��
      */
     lighten(color: string, rate: number): string;
 
     /**
-     * @method darken
-     *
      * rgb 컬러 어�운 ��로 변환
      *
-     * @param {String} color   RGB color code
-     * @param {Number} rate 어�운 ��
-     * @return {String}
+     * @param color   RGB color code
+     * @param rate 어�운 ��
      */
     darken(color: string, rate: number): string;
 }
@@ -680,63 +498,20 @@ export interface UtilBase64 {
 }
 
 export interface UtilKeyParser {
-    /**
-     * @method isIndexDepth
-     *
-     * @param {String} index
-     * @return {Boolean}
-     */
     isIndexDepth(index: string): boolean;
-
-    /**
-     * @method getIndexList
-     *
-     * @param {String} index
-     * @return {Array}
-     */
     getIndexList(index: string): boolean;
-
-    /**
-     * @method changeIndex
-     *
-     *
-     * @param {String} index
-     * @param {String} targetIndex
-     * @param {String} rootIndex
-     * @return {String}
-     */
     changeIndex(index: string, targetIndex: string, rootIndex: string): string;
-
-    /**
-     * @method getNextIndex
-     *
-     * @param {String} index
-     * @return {String}
-     */
     getNextIndex(index: string): string;
-
-    /**
-     * @method getParentIndex
-     *
-     *
-     * @param {String} index
-     * @returns {*}
-     */
     getParentIndex(index: string): string;
 }
 
 export interface UtilMath {
     /**
-     * @method rotate
-     *
      * 2d rotate
      *
-     * @param {Number} x
-     * @param {Number} y
-     * @param {Number} radian	roate í•  radian
-     * @return {Object}
-     * @return {Number} return.x  변환� x
-     * @return {Number} return.y  변환� y
+     * @param radian	roate í•  radian
+     * @return return.x  변환� x
+     * @return return.y  변환� y
      *
      */
     rotate(x: number, y: number, radian: number): any;
@@ -744,35 +519,26 @@ export interface UtilMath {
     resize(maxWidth: number, maxHeight: number, objectWidth: number, objectHeight: number): any;
 
     /**
-     * @method radian
-     *
      * convert degree to radian
      *
-     * @param {Number} degree
-     * @return {Number} radian
+     * @return radian
      */
     radian(degree: number): number;
 
     /**
-     * @method degree
-     *
      * convert radian to degree
      *
-     * @param {Number} radian
-     * @return {Number} degree
+     * @return degree
      */
     degree(radian: number): number;
 
     angle(x1: number, y1: number, x2: number, y2: number): number;
 
     /**
-     * @method interpolateNumber
-     *
      * a, b � 중간값 계산� 위한 callback 함수 만들기
      *
-     * @param {Number} a	first value
-     * @param {Number} b 	second value
-     * @return {Function}
+     * @param a	first value
+     * @param b 	second value
      */
     interpolateNumber(a: number, b: number): () => void;
 
@@ -793,11 +559,6 @@ export interface UtilMath {
 
     /**
      * 특정 구간� 값� ��으로 계산
-     *
-     * @param {Object} min
-     * @param {Object} max
-     * @param {Object} ticks
-     * @param {Object} isNice
      */
     nice(min: number, max: number, ticks: number, isNice: boolean): any;
 
diff --git a/types/jui-grid/index.d.ts b/types/jui-grid/index.d.ts
index 5da7d23c43..7ffae14ace 100644
--- a/types/jui-grid/index.d.ts
+++ b/types/jui-grid/index.d.ts
@@ -2,77 +2,98 @@
 // Project: https://github.com/juijs/jui-grid
 // Definitions by: Jin-Ho Park <https://github.com/easylogic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { UIEvent } from 'jui-core';
-
 export interface GridColumn {
     (index: number | string): this;
 
-    /** @property {HTMLElement} [element=null] TH element of a specified column */
+    /**
+     * TH element of a specified column
+     * @default null
+     */
     element: any;
 
-    /** @property {String} [order="asc"] Column sort state */
+    /**
+     * Column sort state
+     * @default "asc"
+     */
     order: "asc" | "desc";
 
-    /** @property {String} [name=null] Column name */
+    /**
+     * Column name
+     * @default null
+     */
     name?: string;
 
-    /** @property {Array} data Data from all rows belonging for a specified column */
+    /** Data from all rows belonging for a specified column */
     data: any[];
 
-    /** @property {Array} list TD element of all rows belonging to a specified column */
+    /** TD element of all rows belonging to a specified column */
     list: any[];
 
-    /** @property {Integer} index Column index */
+    /** Column index */
     index: number;
 
-    /** @property {"show"/"hide"/"resize"} [type="show"] The current column state */
+    /**
+     * The current column state
+     * @default "show"
+     */
     type: "show" | "hide" | "resize";
 
-    /** @property {Integer} [width=null] Column width */
+    /**
+     * Column width
+     * @default null
+     */
     width?: number;
-
     hide(): void;
     show(): void;
 }
 
 export interface GridRow {
-    /** @property {Array} data Data of a specifiedrow. */
+    /** Data of a specified row. */
     data: any[];
 
-    /** @property {Integer} seq Data of a sequence. */
+    /** Data of a sequence. */
     seq: number;
 
-    /** @property {Integer} [rownum=null] The unique number of a child row under the specified parent row if a parent row exists. */
+    /** The unique number of a child row under the specified parent row if a parent row exists. */
     rownum?: number;
 
-    /** @property {String/Integer} [index=null] Index of a specified row. In the case of a tree structure, a depth is given. */
+    /** Index of a specified row. In the case of a tree structure, a depth is given. */
     index: number | string;
 
-    /** @property {HTMLElement} [element=null] TR element of a specified row. */
+    /** TR element of a specified row. */
     element: any;
 
-    /** @property {Array} list List of TD elements of a specified row. */
+    /** List of TD elements of a specified row. */
     list: any[];
 
-    /** @property {Object} list List of hidden TD element. */
+    /** List of hidden TD element. */
     hidden: {};
 
-    /** @property {uix.table.row} parent Variable that refers to the parent row. */
+    /** Variable that refers to the parent row. */
     parent?: GridRow;
 
-    /** @property {Array} children List of child rows. */
+    /** List of child rows. */
     children: any[];
 
-    /** @property {Integer} [depth=0] The depth of the current row in the case of a tree structure. */
+    /**
+     * The depth of the current row in the case of a tree structure.
+     * @default 0
+     */
     depth: number;
 
-    /** @property {"open"/"fold"} [type="fold"] State value that indicates whether a child row is shown or hidden. */
+    /**
+     * State value that indicates whether a child row is shown or hidden.
+     * @default "fold"
+     */
     type: "open" | "fold";
 
-    /** @property {Function} [type="null"] State value that indicates whether a child row is shown or hidden. */
+    /**
+     * State value that indicates whether a child row is shown or hidden.
+     */
     tpl?(): void;
-
     setIndex(rownum: number | string): void;
     reload(columns: GridColumn[], seq: any, xssFilter: any): void;
     destroy(): void;
@@ -117,877 +138,530 @@ export interface GridBase {
 export interface GridTable extends UIEvent {
     (selector: any, options?: {
         tpl?: any,
-
         event?: any,
         /**
          * @cfg {Array} [fields=null]
          * Sets the name of columns in the order of being displayed on the table screen.
          */
         fields?: any[],
-
         /**
          * @cfg {Array} [csv=null]
          * Sets the column key shown when converted to a CSV string.
          */
         csv?: any[],
-
         /**
          * @cfg {Array} [csvNames=null]
          * Sets the name of a column shown when converting to a CSV string, which must be defined in the same order as the CSV option.
          */
         csvNames?: any[],
-
         /**
          * @cfg {Array} [csvNumber=null]
          * Sets the column key to be changed to a number form when converted to a CSV string.
          */
         csvNumber?: any[],
-
         /**
          * @cfg {Array} data
          * Sets the initial row list of a table.
          */
         data?: any[],
-
         /**
          * @cfg {Boolean/Array} [colshow=false]
          * Sets a column index shown when the Show/Hide Column menu is enabled.
          */
         colshow?: boolean | any[],
-
         /**
          * @cfg {Boolean} [scroll=false]
          * Determines whether to use a table scroll.
          */
         scroll?: boolean,
-
         /**
          * @cfg {Integer} [scrollHeight=200]
          * Sets the reference height of a body area when using a table scroll.
          */
         scrollHeight?: number,
-
         /**
          * @cfg {Integer} [width=0]
          * Sets the area of a table.
          */
         width?: number,
-
         /**
          * @cfg {Boolean} [expand=false]
          * Determines whether to use an extended row area.
          */
         expand?: boolean,
-
         /**
          * @cfg {Boolean} [expandEvent=true]
          * Sets the Show/Hide state of an extended row area when clicking on a row.
          */
         expandEvent?: boolean,
-
         /**
          * @cfg {Boolean|Array} [editRow=false]
          * Determines whether to use a modified row area.
          */
         editRow?: boolean | any[],
-
         /**
          * @cfg {Boolean} [editEvent=true]
          * Sets the Show/Hide state of an extended row area when doubleclicking on a row/cell.
          */
         editEvent?: boolean,
-
         /**
          * @cfg {Boolean} [resize=false]
          * Determines whether to use the column resizing function.
          */
         resize?: boolean,
-
         /**
          * @cfg {Boolean/Array} [sort=false]
          * Determines whether to use the table sort function.
          */
         sort?: boolean | any[],
-
         /**
          * @cfg {Integer} [sortIndex=null]
          * Determines whether to use the table sort function.
          */
         sortIndex?: number,
-
         /**
          * @cfg {String} [sortOrder="asc"]
          * Determines whether to use the table sort function.
          */
         sortOrder?: "asc" | "desc",
-
         /**
          * @cfg {Boolean} [sortEvent=true]
          * Determines whether to use the sort function when you click on a column.
          */
         sortEvent?: boolean,
-
         /**
          * @cfg {Boolean} [moveRow=false]
          * Determines whether to use the move function when you fire row draggable event.
          */
         moveRow?: boolean,
     }): this;
-
     root?: any;
-
     /**
-     * @method update
      * Updates the list of rows or modifies the row at a specified index.
-     *
-     * @param {Array} rows
      */
     update(indexOrRows?: any, rows?: any): void;
     /**
-     * @method updateTree
      * It is possible to configure a tree table using an object array with the index and data properties.
-     *
-     * @param {Array} rows
      */
     updateTree(rows: any[]): void;
-
     /**
-     * @method append
      * Add a row or a child row to at a specified index.
-     *
-     * @param {RowObject} row
      */
     append(rowOrIndex?: number | any, row?: any): void;
-
     /**
-     * @method insert
      * Adds a row at a specified index.
-     *
-     * @param {Integer} index
-     * @param {RowObject} row
      */
     insert(index: number, dataList: {}): void;
-
     /**
-     * @method select
      * Adds a selected class to a row at a specified index and gets an instance of the applicable row.
      *
-     * @param {Integer} index
-     * @return {RowObject} row
+     * @return row
      */
     select(index: number): GridRow;
-
     /**
-     * @method unselect
      * Removes a selected class from a selected row and gets an instance of the row in question.
      *
-     * @return {RowObject} row
+     * @return row
      */
     unselect(): GridRow;
-
     /**
-     * @method check
      * Add a checked class to a row at a specified index.
-     *
-     * @param {Integer} index
      */
     check(index: number): void;
-
     /**
-     * @method uncheck
      * Removes a checked class from a row at a specified index.
-     *
-     * @param {Integer} index
      */
     uncheck(index: number): void;
 
-    /**
-     * @method uncheckAll
-     * Removes checked classes from all rows.
-     */
     uncheckAll(): void;
-
     /**
-     * @method remove
      * Remove a row at a specified index.
-     *
-     * @param {Integer} index
      */
     remove(index: number): void;
 
-    /**
-     * @method reset
-     * Removes all rows.
-     */
     reset(): void;
-
     /**
-     * @method move
      * Moves a row iat a specified index to the target index.
-     *
-     * @param {Integer} index
-     * @param {Integer} targetIndex
      */
     move(index: number, targetIndex: number): void;
-
     /**
-     * @method sort
      * Moves a row iat a specified index to the target index.
      *
-     * @param {Integer} index
-     * @param {String} order  "asc" or "desc"
+     * @param order  "asc" or "desc"
      */
     sort(index: number, order: string, e?: any): void;
-
     /**
-     * @method scroll
      * Sets the scroll based on the height of a table.
-     *
-     * @param {Integer} height
      */
     scroll(height: number): void;
-
     /**
-     * @method open
      * Shows a child row of a specified index.
-     *
-     * @param {Integer} index
      */
     open(index: number): void;
-
     /**
-     * @method fold
      * Hides a child row of a specified index.
-     *
-     * @param {Integer} index
      */
     fold(index: number): void;
 
-    /**
-     * @method openAll
-     * Shows all child rows of a specified index.
-     */
     openAll(): void;
 
-    /**
-     * @method foldAll
-     * Hides all child rows of a specified index.
-     */
     foldAll(): void;
 
-    /**
-     * @method resize
-     * Resets the inner scroll and columns of a table.
-     */
     resize(): void;
 
-    /**
-     * @method resizeColumns
-     * Resets the sizes of all columns of a table.
-     */
     resizeColumns(): void;
-
     /**
-     * @method size
      * Gets the size of all the rows of a table.
      *
-     * @return {Integer} size
+     * @return size
      */
     size(): number;
-
     /**
-     * @method count
      * Gets the number of trows of a table.
      *
-     * @return {Integer} count
+     * @return count
      */
     count(): number;
-
     /**
-     * @method list
      * Gets all the rows of a table.
      *
-     * @return {Array} rows
+     * @return rows
      */
     list(): GridRow[];
-
     /**
-     * @method listData
      * Gets the data of all the rows of a table.
      *
-     * @return {Array} datas
+     * @return datas
      */
     listData(): any[];
-
     /**
-     * @method listAll
      * Gets all the rows of a table including child rows.
      *
-     * @return {Array} rows
+     * @return rows
      */
     listAll(): GridRow[];
-
     /**
-     * @method listChecked
      * Gets all rows in a check state.
      *
-     * @return {Array} rows
+     * @return rows
      */
     listChecked(): GridRow[];
-
     /**
-     * @method listColumn
      * Gets all columns.
      *
-     * @return {Array} columns
+     * @return columns
      */
     listColumn(): GridColumn;
-
     /**
-     * @method get
      * Gets the row at the specified index.
      *
-     * @param {Integer} index
-     * @return {RowObject} row
+     * @return row
      */
     get(index: number): GridRow;
-
     /**
-     * @method getAll
      * Gets all rows of at the specified index including child rows.
      *
-     * @param {Integer} index
-     * @return {Array} rows
+     * @return rows
      */
     getAll(index: number): GridRow[];
-
     /**
-     * @method getColumn
      * Gets the column at the specified index.
      *
-     * @param {"Integer"/"String"} key index or column key
-     * @return {ColumnObject} column
+     * @param key index or column key
+     * @return column
      */
     getColumn(index: number | string): GridColumn;
-
     /**
-     * @method showColumn
      * Shows the column index (or column name).
      *
-     * @param {"Integer"/"String"} key index or column name
+     * @param key index or column name
      */
     showColumn(index: number | string, e?: any): void;
-
     /**
-     * @method hideColumn
      * Hides the column index (or column name).
      *
-     * @param {"Integer"/"String"} key index or column name
+     * @param key index or column name
      */
     hideColumn(index: number | string, e?: any): void;
-
     /**
-     * @method initColumns
      * It is possible to determine the index or name of the column to be shown in an array.
      *
-     * @param {"Integer"/"String"} key index or column name
+     * @param key index or column name
      */
     initColumns(keys: any): void;
-
     /**
-     * @method showColumnMenu
      * Shows the Show/Hide Column menu at specified coordinates.
-     *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     showColumnMenu(x: number, y: number): void;
 
-    /**
-     * @method hideColumnMenu
-     * Hides the Show/Hide Column menu.
-     */
     hideColumnMenu(): void;
-
     /**
-     * @method toggleColumnMenu
      * Shows or hides the Show/Hide Column menu.
-     *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     toggleColumnMenu(x: number, y: number): void;
-
     /**
-     * @method showExpand
      * Shows the extended row area of a specified index.
-     *
-     * @param {Integer} index
      */
     showExpand(index: number, obj?: any, e?: any): void;
 
-    /**
-     * @method hideExpand
-     * Hides the extended row area of a specified index.
-     */
     hideExpand(e?: any): void;
-
     /**
-     * @method getExpand
      * Get a row in which the extended area is currently activated.
      *
-     * @return {RowObject} row
+     * @return row
      */
     getExpand(): GridRow;
-
     /**
-     * @method showEditRow
      * Shows the modified row area of a specified index.
-     *
-     * @param {Integer} index
      */
     showEditRow(index: number, e?: any): void;
 
-    /**
-     * @method hideEditRow
-     * Hides the modified row area of a specified index.
-     */
     hideEditRow(data?: any): void;
-
     /**
-     * @method getEditRow
      * Get a row in which the modified area is currently activated.
      *
-     * @return {RowObject} row
+     * @return row
      */
     getEditRow(): GridRow;
 
-    /**
-     * @method setCsv
-     * Updates a table using a CVS string.
-     */
     setCsv(csvOrKey: any, key?: any): void;
 
-    /**
-     * @method setCsvFile
-     * Updates a table using a CVS file.
-     */
     setCsvFile(fileOrKey: any, key?: any): void;
-
     /**
-     * @method getCsv
      * Gets the data of a table as a CSV string.
      *
-     * @param {Boolean} isTree
-     * @return {String} csv
+     * @return csv
      */
     getCsv(isTree: boolean): string;
-
     /**
-     * @method getCsvBase64
      * Gets the data of a table as a CSV string encoded as base64.
      *
-     * @param {Boolean} isTree
-     * @return {String} base64
+     * @return base64
      */
     getCsvBase64(isTree: boolean): string;
-
     /**
-     * @method downloadCsv
      * Downloads the data of a table as a CSV file.
-     *
-     * @param {String} name
-     * @param {Boolean} isTree
      */
     downloadCsv(name: string, isTree: boolean): void;
-
     /**
-     * @method activeIndex
      * Gets the index of a row that is activated in an extended/modified/selected state.
      *
-     * @return {Integer} index
+     * @return index
      */
     activeIndex(): number;
 }
 
 export interface GridXTable extends UIEvent {
     (selector: any, options?: {}): this;
-
     render(isTree?: boolean): void;
-
     /**
-     * @method select
      * Adds a selected class to a row at a specified index and gets an instance of the applicable row.
      *
-     * @param {Integer} index
-     * @return {RowObject} row
+     * @return row
      */
     select(index: number): GridRow;
-
     /**
-     * @method unselect
      * Removes a selected class from a selected row and gets an instance of the row in question.
      *
-     * @return {RowObject} row
+     * @return row
      */
     unselect(): GridRow;
-
     /**
-     * @method update
      * Updates the list of rows or modifies the row at a specified index.
-     *
-     * @param {Array} rows
      */
     update(dataList: any[]): void;
-
     /**
-     * @method updateTree
      * It is possible to configure a tree table using an object array with the index and data properties.
-     *
-     * @param {Array} rows
      */
     updateTree(tree: any[]): void;
-
     /**
-     * @method append
      * Add a row or a child row to at a specified index.
-     *
-     * @param {RowObject} row
-     * @param {RowObject} row
      */
     append(index: number, data: {}): void;
     /**
-     * @method open
      * Shows a child row of a specified index.
-     *
-     * @param {Integer} index
      */
     open(index: number | string): void;
-
     /**
-     * @method fold
      * Hides a child row of a specified index.
-     *
-     * @param {Integer} index
      */
     fold(index: number | string): void;
 
-    /**
-     * @method openAll
-     * Shows all child rows of a specified index.
-     */
     openAll(index: number | string): void;
 
-    /**
-     * @method foldAll
-     * Hides all child rows of a specified index.
-     */
     foldAll(index: number | string): void;
 
-    /**
-     * @method next
-     * Changes to the next page.
-     */
     next(): void;
-
     /**
-     * @method page
      * Changes to the page of at a specified index.
-     *
-     * @param {Integer} index
      */
     page(pNo: number): void;
-
     /**
-     * @method sort
      * Moves a row iat a specified index to the target index.
      *
-     * @param {Integer} index
-     * @param {String} order  "asc" or "desc"
+     * @param order  "asc" or "desc"
      */
     sort(index: number, order: "asc" | "desc", e?: any, isNotLoading?: any): void;
-
     /**
-     * @method filter
      * Filters columns at a specified to locate rows that contain keywords in the cell value.
-     *
-     * @param {Function} callback
      */
     filter(callback: (data: any) => void): void;
 
-    /**
-     * @method rollback
-     * Returns filtered rows to the original state.
-     */
     rollback(): void;
 
-    /**
-     * @method clear
-     * Remove all row elements.
-     */
     clear(): void;
 
-    /**
-     * @method clear
-     * Remove all data
-     */
     reset(): void;
 
-    /**
-     * @method resize
-     * Resets the inner scroll and columns of a table.
-     */
     resize(): void;
-
     /**
-     * @method scrollWidth
      * Sets the scroll based on the width of a table.
-     *
-     * @param {Integer} width
      */
     scrollWidth(scrollWidth: number, isInit?: boolean): void;
-
     /**
-     * @method scrollHeight
      * Sets the scroll based on the height of a table.
-     *
-     * @param {Integer} height
      */
     scrollHeight(h: number): void;
-
     /**
-     * @method scrollTop
      * Sets the scroll based on the height of a table.
-     *
-     * @param {Integer|String} index
-     * @param {Integer} dist
      */
     scrollTop(index: number | string, dist: number): void;
-
     /**
      * @deprecated
-     * @method height
      * Sets the scroll based on the height of a table.
-     *
-     * @param {Integer} height
      */
     height(h: number): void;
-
     /**
-     * @method size
      * Gets the size of all the rows of a table.
      *
-     * @return {Integer} size
+     * @return size
      */
     size(): number;
-
     /**
-     * @method count
      * Gets the number of trows of a table.
      *
-     * @return {Integer} count
+     * @return count
      */
     count(): number;
-
     /**
-     * @method list
      * Gets all the rows of a table.
      *
-     * @return {Array} rows
+     * @return rows
      */
     list(): GridRow[];
-
     /**
-     * @method listColumn
      * Gets all columns.
      *
-     * @return {Array} columns
+     * @return columns
      */
     listColumn(): GridColumn[];
-
     /**
-     * @method listData
      * Gets the data of all the rows of a table.
      *
-     * @return {Array} datas
+     * @return datas
      */
     listData(): any[];
-
     /**
-     * @method get
      * Gets the row at the specified index.
      *
-     * @param {Integer|String} index
-     * @return {RowObject} row
+     * @return row
      */
     get(index: number): GridRow;
-
     getAll(index: number, _result?: any): GridRow[];
-
     /**
-     * @method getColumn
      * Gets the column at the specified index.
      *
-     * @param {"Integer"/"String"} key index or column key
-     * @return {ColumnObject} column
+     * @param key index or column key
+     * @return column
      */
     getColumn(index: number | string): GridColumn;
-
     /**
-     * @method getData
      * Gets the data at the specified index.
      *
-     * @param {"Integer"/"String"} key index
-     * @return {ColumnObject} data
+     * @param key index
+     * @return data
      */
     getData(index: number | string): any;
-
     /**
-     * @method showColumn
      * Shows the column index (or column name).
      *
-     * @param {"Integer"/"String"} key index or column name
+     * @param key index or column name
      */
     showColumn(index: number | string): void;
-
     /**
-     * @method hideColumn
      * Hides the column index (or column name).
      *
-     * @param {"Integer"/"String"} key index or column name
+     * @param key index or column name
      */
     hideColumn(index: number | string): void;
-
     /**
-     * @method initColumns
      * It is possible to determine the index or name of the column to be shown in an array.
      *
-     * @param {"Integer"/"String"} key index or column name
+     * @param key index or column name
      */
     initColumns(keys: number | string): void;
-
     /**
-     * @method showColumnMenu
      * Shows the Show/Hide Column menu at specified coordinates.
-     *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     showColumnMenu(x: number, y: number): void;
 
-    /**
-     * @method hideColumnMenu
-     * Hides the Show/Hide Column menu.
-     */
     hideColumnMenu(): void;
-
     /**
-     * @method toggleColumnMenu
      * Shows or hides the Show/Hide Column menu.
-     *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     toggleColumnMenu(x: number, y: number): void;
-
     /**
-     * @method showExpand
      * Shows the extended row area of a specified index.
-     *
-     * @param {Integer} index
      */
     showExpand(index: number, obj: any): void;
 
-    /**
-     * @method hideExpand
-     * Hides the extended row area of a specified index.
-     */
     hideExpand(index: number): void;
-
     /**
-     * @method getExpand
      * Get a row in which the extended area is currently activated.
      *
-     * @return {RowObject} row
+     * @return row
      */
     getExpand(): GridRow;
-
     /**
-     * @method showLoading
      * Shows the loading screen for the specified delay time.
-     *
-     * @param {Integer} delay
      */
     showLoading(delay: number): void;
 
-    /**
-     * @method hideLoading
-     * Hides the loading screen.
-     */
     hideLoading(): void;
 
-    /**
-     * @method setCsv
-     * Updates a table using a CVS string.
-     */
     setCsv(csv: string): void;
 
-    /**
-     * @method setCsvFile
-     * Updates a table using a CVS file.
-     */
     setCsvFile(file: any): void;
-
     /**
-     * @method getCsv
      * Gets the data of a table as a CSV string.
      *
-     * @param {Boolean} isTree
-     * @return {String} csv
+     * @return csv
      */
     getCsv(): string;
-
     /**
-     * @method getCsvBase64
      * Gets the data of a table as a CSV string encoded as base64.
      *
-     * @param {Boolean} isTree
-     * @return {String} base64
+     * @return base64
      */
     getCsvBase64(): string;
-
     /**
-     * @method downloadCsv
      * Downloads the data of a table as a CSV file.
-     *
-     * @param {String} name
-     * @param {Boolean} isTree
      */
     downloadCsv(name: string): void;
-
     /**
-     * @method rowFunc
      * Ir is possible to use a function for all row data applicable to the column (or column name) of a specified column (or column name). Currently only SUM and AVG are supported.
-     *
-     * @param {"sum"/"svg"} funcType
-     * @param {Integer} columnIndex
-     * @param {Function} callback
      */
     rowFunc(type: "sum" | "avg", index: number, callback: (data: any) => void): any;
-
     /**
-     * @method getPage
      * Gets the current page of a table.
      *
-     * @return {Integer} page
+     * @return page
      */
     getPage(): number;
-
     /**
-     * @method activeIndex
      * Gets the index of a row that is activated in an extended/modified/selected state.
      *
-     * @return {Integer} index
+     * @return index
      */
     activeIndex(): number;
 }
diff --git a/types/jui/index.d.ts b/types/jui/index.d.ts
index 93372f898d..d87fddc241 100644
--- a/types/jui/index.d.ts
+++ b/types/jui/index.d.ts
@@ -2,9 +2,9 @@
 // Project: https://github.com/juijs/jui#readme
 // Definitions by: Jin-Ho Park <https://github.com/easylogic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { UIEvent } from 'jui-core';
-
 export interface UIAccordion extends UIEvent {
     (selector: any, options?: {
         tpl?: any,
@@ -14,25 +14,20 @@ export interface UIAccordion extends UIEvent {
          * Sets an enabled node
          */
         index?: number,
-
         /**
          * @cfg {Boolean} [autoFold=false]
          * When you click on a node, the node folding
          */
         autoFold?: boolean,
-
         /**
          * @cfg {Boolean} [multipanel=false]
-         *
          */
         multipanel?: boolean
     }): this;
-
     /**
-     * @method activeIndex
      * Gets the index of the currently enabled node
      *
-     * @return {Integer} Index
+     * @return Index
      */
     activeIndex(): number;
 }
@@ -46,35 +41,23 @@ export interface UIAutoComplete {
          * Designates a target selector when an autofill route is not a target
          */
         target?: any,
-
         /**
          * @cfg {Array} words
          * Designates words subject to autofill
          */
         words?: string[]
     }): this;
-
     /**
-     * @method update
      * Updates words subject to autofill
      *
-     * @param {Array} words
      *
      */
     update(newWords: string[]): void;
-
-    /**
-     * @method close
-     * Close the active drop-down
-     *
-     */
     close(): void;
-
     /**
-     * @method list
      * Gets filtered words subject to autofill
      *
-     * @return {Array} words
+     * @return words
      */
     list(): string[];
 }
@@ -86,9 +69,7 @@ export interface UIColorPicker {
         type?: string,
         color?: string
     }): this;
-
     getColor(type: string): string | {};
-
     setColor(value: string | {}): void;
 }
 
@@ -101,100 +82,67 @@ export interface UICombo {
          * Determines an initial selection button with a specified index
          */
         index?: number,
-
         /**
          * @cfg {String} [value=0]
          * Determines an initial selection button with a specified value
          */
         value?: string,
-
         /**
          * @cfg {Integer} [width=0]
          * Determines the horizontal size of a combo box
          */
         width?: number,
-
         /**
          * @cfg {Integer} [height=100]
          * Determines an initial selection button with a specified value
          */
         height?: number,
-
         /**
          * @cfg {Boolean} [keydown=false]
          * It is possible to select a node using the keyboard
          */
         keydown?: boolean,
-
         /**
          * @cfg {"top"/"bottom"} [position="bottom"]
          * It is possible to determine an initial selection button with a specified value
          */
         position?: "top" | "bottom",
-
         /**
          * @cfg {Boolean} [flex=true]
          * Drop-down menu is varied by changing the width function
          */
         flex?: boolean
     }): this;
-
     /**
-     * @method setIndex
      * Selects a button of a specified index
      *
-     * @param {Number} index
      */
     setIndex(index: number): void;
-
     /**
-     * @method setValue
      * Selects a button having a specified value
      *
-     * @param {Mixed} value
      */
     setValue(value: any): void;
-
     /**
-     * @method getData
      * Gets the data of the button currently selected
      *
-     * @return {Object}
      */
     getData(): {};
-
     /**
-     * @method getValue
      * Gets the value of the button currently selected
      *
-     * @return {Mixed}
      */
     getValue(): any;
-
     /**
-     * @method getText
      * Gets the markup text of the button currently selected
      *
-     * @return {String}
      */
     getText(): string;
 
-    /**
-     * @method open
-     * Shows the element list of a combo box
-     */
     open(e: any): void;
 
-    /**
-     * @method fold
-     * Hides the element list of a combo box
-     */
     fold(): void;
 
-    /**
-     * @method reload
-     * Re-defines a combo box
-     */
     reload(): void;
 }
 
@@ -207,105 +155,72 @@ export interface UIDatePicker {
          * Determines the type of a calendar
          */
         type?: "daily" | "monthly" | "yearly",
-
         /**
          * @cfg {String} [titleFormat="yyyy.MM"]
          * Title format of a calendar
          */
         titleFormat?: string,
-
         /**
          * @cfg {String} [format="yyyy-MM-dd"]
          * Format of the date handed over when selecting a specific date
          */
         format?: string,
-
         /**
          * @cfg {Date} [date="now"]
          * Selects a specific date as a basic
          */
         date?: "now" | Date,
-
         /**
          * @cfg {Date} [minDate="null"]
          * Selects a specific minimum date
          */
         minDate?: Date,
-
         /**
          * @cfg {Date} [maxDate="null"]
          * Selects a specific maximum date
          */
         maxDate?: Date
     }): this;
-
     /**
-     * @method page
      * Outputs a calendar that fits the year/month entered
      *
-     * @param {Integer} year
-     * @param {Integer} month
      */
     page(y: number, m: number): void;
 
-    /**
-     * @method prev
-     * Outputs a calendar that fits the previous year/month
-     *
-     */
     prev(e: any, moveYear?: boolean): void;
 
-    /**
-     * @method next
-     * Outputs a calendar that fits the next year/month
-     *
-     */
     next(e: any, moveYear?: boolean): void;
-
     /**
-     * @method select
      * Selects today if there is no value, or selects a date applicable to a timestamp or year/month/date
      *
-     * @param {"year"/"month"/"date"/"timestamp"/"Date"}
+     * @param "year"/"month"/"date"/"timestamp"/"Date"
      */
     select(...args: any[]): void;
-
     /**
-     * @method addTime
      * Selects a date corresponding to the time added to the currently selected date
      *
-     * @param {"Integer"/"Date"} time Timestamp or Date
+     * @param time Timestamp or Date
      */
     addTime(time: number | Date): void;
-
     /**
-     * @method getDate
      * Gets the value of the date currently selected
      *
-     * @return {Date} Date object
+     * @return Date object
      */
     getDate(): Date;
-
     /**
-     * @method getTime
      * Gets the timestamp value of the date currently selected
      *
-     * @return {Integer} Timestamp
+     * @return Timestamp
      */
     getTime(): number;
-
     /**
-     * @method getFormat
      * Gets a date string that fits the format entered
      *
-     * @return {String} format Formatted date string
+     * @return format Formatted date string
      */
     getFormat(format: string): string;
 
-    /**
-     * @method reload
-     * Reloads the datepicker
-     */
     reload(): void;
 }
 
@@ -318,80 +233,56 @@ export interface UIDropdown {
          * Closes the Auto when clicking on the dropdown list
          */
         close?: boolean,
-
         /**
          * @cfg {Boolean} [keydown=false]
          * It is possible to choose anything on the dropdown list with the arrow keys on the keyboard
          */
         keydown?: boolean,
-
         /**
          * @cfg {Integer} [left=0]
          * Sets the X coordinate of the dropdown list
          */
         left?: number,
-
         /**
          * @cfg {Integer} [top=0]
          * Sets the Y coordinate of the dropdown list
          */
         top?: number,
-
         /**
          * @cfg {Integer} [width=0]
          * Determines the horizontal size of a dropdown list
          */
         width?: number,
-
         /**
          * @cfg {Integer} [height=0]
          * Determines the vertical size of a dropdown list
          */
         height?: number,
-
         /**
          * @cfg {Array} nodes
          * Sets a dropdown list to data rather than markup
          */
         nodes?: any[]
     }): this;
-
     /**
-     * @method update
      * Changes the dropdown list
      *
-     * @param {Array} nodes Dropdown list
+     * @param nodes Dropdown list
      */
     update(nodes: any[]): void;
 
-    /**
-     * @method hide
-     * Hides the dropdown
-     */
     hide(): void;
-
     /**
-     * @method show
      * Shows a dropdown at the specified coordinates
      *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     show(x: number, y: number): void;
-
     /**
-     * @method move
      * Moves a dropdown to the specified coordinates
      *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     move(x: number, y: number): void;
 
-    /**
-     * @method reload
-     * Reloads the dropdown list
-     */
     reload(): void;
 }
 
@@ -404,31 +295,26 @@ export interface UIModal {
          * Determines the color of a modal
          */
         color?: "black" | "gray",
-
         /**
          * @cfg {Float} [opacity=0.4]
          * Sets the transparency of a modal
          */
         opacity?: number,
-
         /**
          * @cfg {String/DOMElement} [target="body"]
          * Sets a selector on which a modal is shown
          */
         target?: string | any,
-
         /**
          * @cfg {Integer} [index=0]
          * Determines the sequence (index) of a modal
          */
         index?: number,
-
         /**
          * @cfg {Boolean} [clone=false]
          * Copies an existing modal and shows it
          */
         clone?: boolean,
-
         /**
          * @cfg {Boolean} [autoHide=true]
          * Automatically hides a modal when clicking on it
@@ -436,22 +322,10 @@ export interface UIModal {
         autoHide?: boolean
     }): this;
 
-    /**
-     * @method hide
-     * Hides a modal
-     */
     hide(): void;
 
-    /**
-     * @method show
-     * Shows a modal
-     */
     show(): void;
 
-    /**
-     * @method resize
-     * Re-adjust the location of a modal
-     */
     resize(): void;
 }
 
@@ -464,63 +338,48 @@ export interface UINotify {
          * Designates the location where a notice message is added
          */
         position?: "top" | "top-lefet" | "top-right" | "bottom" | "bottom-left" | "bottom-right",
-
         /**
          * @cfg {Integer} [padding=12]
          * Determines the margin value of a notice message (the margin value may be in object form rather than a numeric value)
          */
         padding?: number,
-
         /**
          * @cfg {Integer} [distance=5]
          * Determines each margin value when there are multiple notice messages
          */
         distance?: number,
-
         /**
          * @cfg {Integer} [timeout=3000]
          * Determines the duration for which a notice message is displayed (the message does not disappear when the value is 0)
          */
         timeout?: number,
-
         /**
          * @cfg {Integer} [showDuration=500]
          * Determines the duration of an effect when a notice message is shown
          */
         showDuration?: number,
-
         /**
          * @cfg {Integer} [hideDuration=500]
          * Determines the duration of an effect when a notice message disappears
          */
         hideDuration?: number,
-
         /**
          * @cfg {String} [showEasing="swing"]
          * Determines an effect when a notice message is shown (see CSS3 specifications)
          */
         showEasing?: string,
-
         /**
          * @cfg {String} [hideEasing="linear"]
          * Determines an effect when a notice message disappears (see CSS3 specifications)
          */
         hideEasing?: string
     }): this;
-
     /**
-     * @method add
      * Adds a notice message. The value passed is the data object shown by the notice template
      *
-     * @param {Object} data
-     * @param {Integer} timeout
      */
     add(data: {}, timeout: number): void;
 
-    /**
-     * @method reset
-     * Removes all notice messages that are enabled
-     */
     reset(): void;
 }
 
@@ -533,58 +392,36 @@ export interface UIPaging {
          * Total number of data records subject to paging)
          */
         count?: number,
-
         /**
          * @cfg {Integer} [pageCount=10]
          * Number of data records per page
          */
         pageCount?: number,
-
         /**
          * @cfg {Integer} [screenCount=5]
          * Number of pages shown on the paging screen
          */
         screenCount?: number
     }): this;
-
     /**
-     * @method reload
      * Reloads the number of specified data records, or reloads the initially configured number of data records if there is no parameter
      *
-     * @param {Integer} count Data total count
+     * @param count Data total count
      */
     reload(count: number): void;
-
     /**
-     * @method page
      * Changes to a specified page number, and gets the currently enabled page number if there is no parameter
      *
-     * @param {Integer} pNo Page number
+     * @param pNo Page number
      */
     page(pNo: number): void;
 
-    /**
-     * @method next
-     * Changes to the next page
-     */
     next(): void;
 
-    /**
-     * @method prev
-     * Changes to the previous page
-     */
     prev(): void;
 
-    /**
-     * @method first
-     * Changes to the first page
-     */
     first(): void;
 
-    /**
-     * @method last
-     * Changes to the last page
-     */
     last(): void;
 }
 
@@ -600,7 +437,6 @@ export interface UIProgress {
         striped?: boolean,   // or true
         animated?: boolean     // or true
     }): this;
-
     setAnimated(isAnimated: boolean): void;
     setStriped(isStriped: boolean): void;
     setValue(v: number): void;
@@ -615,61 +451,39 @@ export interface UIProperty {
         viewport?: string,
         items?: any[]
     }): this;
-
     loadItems(newItems: any[]): void;
-
     addItem(item: {} | any[]): void;
-
     // remove item by key or title
     removeItem(item: {}): void;
 
-    /**
-     * @method getGroupList
-     *
-     * get a list of  group's title.
-     */
     getGroupList(): any[];
-
     /**
-     * @method collapsed
      *
      * collapse group's children
      *
-     * @param {String} id
      */
     collapsed(id: string): void;
-
     /**
-     * @method expanded
      *
      * expand group's children
      *
-     * @param {String} id
      */
     expanded(id: string): void;
-
     /**
-     * @method getValue
      *
      * get a list of property's value
      *
-     * @param {String} [key=null]  if key is null, value is all properties.
+     * @param [key=null]  if key is null, value is all properties.
      */
     getValue(key?: string): {} | any[];
-
     getDefaultValue(): any[];
-
     initValue(obj: {}): void;
-
     /**
-     * @method getValue
      *
      * set a list of property's value
      *
-     * @param {Object} obj
      */
     setValue(obj: {}): void;
-
     findRender(key: string): any;
     findItem(key: string): any;
     updateValue(key: string, value: any): void;
@@ -687,7 +501,6 @@ export interface UISelect {
         valign?: 'top' | 'bottom',
         multi?: boolean
     }): this;
-
     setValue(value: any | any[]): void;
     getValue(): any | any[];
     setSelectedIndex(index: number): void;
@@ -710,36 +523,24 @@ export interface UISlider {
         format?: string,
         progress?: boolean
     }): this;
-
     /**
-     * @method setFromValue
      * set FromHandle's value
-     *
-     * @param {Number}
      */
     setFromValue(value: number): void;
-
     /**
-     * @method setToValue
      * set ToHandle's value
-     *
-     * @param {Number}
      */
     setToValue(value: number): void;
-
     /**
-     * @method getFromValue
      * get FromHandle's value
      *
-     * @return {Number} value
+     * @return value
      */
     getFromValue(): number;
-
     /**
-     * @method getToValue
      * get ToHandle's value
      *
-     * @return {Number} value
+     * @return value
      */
     getToValue(): number;
 }
@@ -753,37 +554,31 @@ export interface UISplitter {
          * set splitter's class for design
          */
         splitterClass?: string,
-
         /**
          * @cfg {String} [hideClass='hide']
          * set splitter's hide class for design
          */
         hideClass?: string,
-
         /**
          * @cfg {Number} [barSize=4]
          * set splitter's bar size
          */
         barSize?: number,
-
         /**
          * @cfg {Object} [barStyle={}]
          * set custom splitter bar style
          */
         barStyle?: {},
-
         /**
          * @cfg {"vertical"/"horizontal"} [direction='vertical']
          * set bar's direction
          */
         direction?: 'vertical' | 'horizontal',
-
         /**
          * @cfg {String/Number} [initSize='50%']
          * set first panel's default width or height
          */
         initSize?: string | number,
-
         /**
          * @cfg {Number/Array} [minSize=30]
          * set panel's minimum width or height
@@ -795,7 +590,6 @@ export interface UISplitter {
          *
          */
         minSize?: number | number[],
-
         /**
          * @cfg {String} [items=[]]
          *
@@ -805,7 +599,6 @@ export interface UISplitter {
          *
          */
         items?: any[],
-
         /**
          * @cfg {Boolean} [fixed=false]
          *
@@ -814,9 +607,7 @@ export interface UISplitter {
          */
         fixed?: boolean
     }): this;
-
     setDirection(d: 'horizontal' | 'vertical'): void;
-
     setInitSize(size: number): void;
     setHide(index: number): void;
     setShow(index: number): void;
@@ -830,11 +621,8 @@ export interface UISwitch {
         checked?: boolean,
         toggleEvent?: string
     }): this;
-
     getValue(): boolean;
-
     setValue(value: boolean): void;
-
     toggle(): void;
 }
 
@@ -847,19 +635,16 @@ export interface UITab {
          * Determines a selector in the area to become the content of a tab
          */
         target?: string | any,
-
         /**
          * @cfg {Integer} [index=0]
          * Sets an enabled tab
          */
         index?: number,
-
         /**
          * @cfg {Boolean} [drag=false]
          * Changes the tab location through dragging
          */
         drag?: boolean,
-
         /**
          * @cfg {Array} nodes
          * Sets a tab list to data rather than markup
@@ -867,84 +652,53 @@ export interface UITab {
         nodes?: any[]
     }): this;
     /**
-     * @method update
      * Changes the tab list
      *
-     * @param {Array} nodes
      */
     update(nodes: any[]): void;
-
     /**
-     * @method insert
      * Adds a tab at a specified index
      *
-     * @param {Integer} index
-     * @param {Object} node
      */
     insert(index: number, node: {}): void;
-
     /**
-     * @method append
      * Adds a tab to the last node
      *
-     * @param {Object} node
      */
     append(node: {}): void;
-
     /**
-     * @method prepend
      * Adds a tab to the first node
      *
-     * @param {Object} node
      */
     prepend(node: {}): void;
-
     /**
-     * @method remove
      * Removes a tab at a specified index
      *
-     * @param {Integer} index
      */
     remove(index: number): void;
-
     /**
-     * @method move
      * Changes a specified tab to a tab at a target index
      *
-     * @param {Integer} index
-     * @param {Integer} targetIndex
      */
     move(index: number, targetIndex: number): void;
-
     /**
-     * @method show
      * Enables the tab at a specified index
      *
-     * @param {Integer} index
      */
     show(index: number): void;
-
     /**
-     * @method enable
      * Enables the tab at a specified index
      *
-     * @param {Integer} index
      */
     enable(index: number): void;
-
     /**
-     * @method disable
      * Disables the tab at a specified index
      *
-     * @param {Integer} index
      */
     disable(index: number): void;
-
     /**
-     * @method activeIndex
      * Gets the index of the currently enabled tab
      *
-     * @return {Integer}
      */
     activeIndex(): number;
 }
@@ -958,82 +712,72 @@ export interface UITooltip {
          * Determines the color of a tooltip
          */
         color?: string,
-
         /**
          * @cfg {"top"/"bottom"/"left"/"right"} [position="top"]
          * Determines the location where a tooltip is shown
          */
         position?: "top" | "bottom" | "left" | "right",
-
         /**
          * @cfg {Integer} [width=150]
          * Determines the horizontal size of a tooltip
          */
         width?: number,
-
         /**
          * @cfg {"left"/"right"/"center"} [align="left"]
          * Determines the alignment state inside a tooltip
          */
         align?: "left" | "right" | "center",
-
         /**
          * @cfg {Integer} [delay=0]
          * Determines the event time when a tooltip is shown
          */
         delay?: number,
-
         /**
          * @cfg {String} [showType="mouseover"]
          * Determines the type of event that triggers a tooltip
          */
         showType?: string,
-
         /**
          * @cfg {String} [hideType="mouseout"]
          * Determines the type of event that hides a tooltip
          */
         hideType?: string,
-
         /**
          * @cfg {String} [title=""]
          * Sets the content of a tooltip (referring to the title properties in markup)
          */
         title?: string,
     }): this;
-
     /**
-     * @method update
      * Changes the content of a tooltip
      *
-     * @param {String} text
      */
     update(newTitle: string): void;
 }
 
 export interface UITreeNode {
-    /** @property {Array} [data=null] Data of a specifiednode */
+    /** Data of a specified node */
     data?: any[];
 
-    /** @property {HTMLElement} [element=null] LI element of a specified node */
+    /** LI element of a specified node */
     element?: any;
 
-    /** @property {Integer} [index=null] Index of a specified node */
+    /** Index of a specified node  */
     index?: number;
 
-    /** @property {Integer} [nodenum=null] Unique number of a specifiede node at the current depth */
+    /** Unique number of a specifiede node at the current depth */
     nodenum?: number;
 
-    /** @property {ui.tree.node} [parent=null] Variable that refers to the parent of the current node */
+    /** Variable that refers to the parent of the current node */
     parent?: UITreeNode;
 
-    /** @property {Array} [children=null] List of child nodes of a specified node */
+    /** List of child nodes of a specified node */
     children?: UITreeNode[];
 
-    /** @property {Integer} [depth=0] Depth of a specified node */
+    /** Depth of a specified node */
     depth?: number;
 
-    /** @property {String} [type='open'] State value that indicates whether a child node is shown or hidden */
+    /** State value that indicates whether a child node is shown or hidden */
     type?: string;
 }
 
@@ -1047,15 +791,10 @@ export interface UITreeBase {
     foldNode(index: string): void;
     openNodeAll(index: string): void;
     foldNodeAll(index: string): void;
-
     moveNode(index: string, targetIndex: number): void;
-
     getNode(index: string): UITreeNode;
-
     getNodeAll(index: string): UITreeNode[];
-
     getNodeParent(index: string): UITreeNode;
-
     getRoot(): UITreeNode;
 }
 
@@ -1068,178 +807,120 @@ export interface UITree {
          * Adds a root node (required).
          */
         root?: UITreeNode,
-
         /**
          * @cfg {Boolean} [rootHide=false]
          * Hides a root node.
          */
         rootHide?: boolean,
-
         /**
          * @cfg {Boolean} [rootFold=false]
          * Folds up a root node.
          */
         rootFold?: boolean,
-
         /**
          * @cfg {Boolean} [drag=false]
          * It is possible to drag the movement of a node.
          */
         drag?: boolean,
-
         /**
          * @cfg {Boolean} [dragChild=true]
          * It is possible to drag the node movement but the node is not changed to a child node of the target node.
          */
         dragChild?: boolean
     }): this;
-
     /**
-     * @method update
      * Changes to the node at a specified index.
      *
-     * @param {String} index
-     * @param {Array} data
      */
     update(index: string, data: any[]): void;
-
     /**
-     * @method append
      * Adds to a child node at a specified index.
      *
-     * @param {Array/String} param1 index or data
-     * @param {Array} param2 null or data
+     * @param param1 index or data (Array/String)
+     * @param param2 null or data
      */
     append(...args: any[]): void;
-
     /**
-     * @method insert
      * Adds a node at a specified index.
      *
-     * @param {String} index
-     * @param {Array} data
      */
     insert(index: string, data: any[]): void;
-
     /**
-     * @method select
      * Adds a node at a specified index.
      *
-     * @param {String} index
-     * @return {NodeObject} node
+     * @return node
      */
     select(index: string): UITreeNode;
 
-    /**
-     * @method unselect
-     * Removes the 'active' class from a selected node and gets an instance of the specified node.
-     */
     unselect(): void;
-
     /**
-     * @method remove
      * Deletes a node at a specified index.
      *
-     * @param {String} index
      */
     remove(index: string): void;
-    /**
-     * @method reset
-     * Deletes all child nodes except for a root.
-     */
     reset(): void;
-
     /**
-     * @method move
      * Moves a node at a specified index to the target index.
      *
-     * @param {String} index
-     * @param {String} targetIndex
      */
     move(index: string, targetIndex: string): void;
     /**
-     * @method open
      * Shows a child node at a specified index.
      *
-     * @param {String} index
      */
     open(index: string, e: any): void;
-
     /**
-     * @method fold
      * Folds up a child node at a specified index.
      *
-     * @param {String} index
      */
     fold(index: string, e: any): void;
     /**
-     * @method openAll
      * Shows all child nodes at a specified index.
      *
-     * @param {String} index
      */
     openAll(index: string): void;
-
     /**
-     * @method foldAll
      * Folds up all child nodes at a specified index.
      *
-     * @param {String} index
      */
     foldAll(index: string): void;
-
     /**
-     * @method list
      * Return all nodes of the root.
      *
-     * @return {Array} nodes
+     * @return nodes
      */
     list(): UITreeNode[];
-
     /**
-     * @method listAll
      * Returns all child nodes.
      *
-     * @return {Array} nodes
+     * @return nodes
      */
     listAll(): UITreeNode[];
-
     /**
-     * @method listParent
      * Returns all parent nodes at a specified index.
      *
-     * @param {String} index
-     * @return {Array} nodes
+     * @return nodes
      */
     listParents(index: string): UITreeNode[];
-
     /**
-     * @method get
      * Gets a node at a specified index
      *
-     * @param {String} index
-     * @return {NodeObject} node
+     * @return node
      */
     get(index: string): UITreeNode;
-
     /**
-     * @method getAll
      * Gets all nodes at a specified index including child nodes.
      *
-     * @param {String} index
-     * @return {Array} nodes
+     * @return nodes
      */
     getAll(index: string): UITreeNode[];
-
     /**
-     * @method activeIndex
      * Gets the index of a node that is activated in an active state.
      *
-     * @return {Integer} index
+     * @return index
      */
     activeIndex(): number;
 }
-
 export interface UIWindow {
     (selector: any, options?: {
         tpl?: any,
@@ -1249,55 +930,46 @@ export interface UIWindow {
          * Determines the horizontal size of a window
          */
         width?: number,
-
         /**
          * @cfg {Integer} [height=300]
          * Determines the height of a window
          */
         height?: number,
-
         /**
          * @cfg {String/Integer} [left="auto"]
          * Determines the X coordinate of a window
          */
         left?: string | number,
-
         /**
          * @cfg {String/Integer} [top="auto"]
          * Determines the Y coordinate of a window
          */
         top?: string | number,
-
         /**
          * @cfg {String/Integer} [right="auto"]
          * Determines the X coordinate based on the right side of a window
          */
         right?: string | number,
-
         /**
          * @cfg {String/Integer} [bottom="auto"]
          * Determines the Y coordinate based on the bottom side of a window
          */
         bottom?: string | number,
-
         /**
          * @cfg {Boolean} [modal=false]
          * Applies a modal UI to a window
          */
         modal?: boolean,
-
         /**
          * @cfg {Boolean} [move=true]
          * It is possible to move a window
          */
         move?: boolean,
-
         /**
          * @cfg {Boolean} [resize=true]
          * It is possible to resize a window
          */
         resize?: boolean,
-
         /**
          * @cfg {Integer} [modalIndex=0]
          * Determines the z-index property of a modal UI
@@ -1305,64 +977,34 @@ export interface UIWindow {
         modalIndex?: number
     }): this;
 
-    /**
-     * @method hide
-     * Hides a window
-     */
     hide(): void;
-
     /**
-     * @method show
      * Shows a window at specified coordinates
      *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     show(x: number, y: number): void;
-
     /**
-     * @method move
      * Moves a window at specified coordinates
      *
-     * @param {Integer} x
-     * @param {Integer} y
      */
     move(x: number, y: number): void;
-
     /**
-     * @method update
      * Changes the markup in the body area of a window
      *
-     * @param {String} html
      */
     update(html: string): void;
-
     /**
-     * @method setTitle
      * Changes the markup of the title tag in the head area of a window
      *
-     * @param {String} title
      */
     setTitle(html: string): void;
-
     /**
-     * @method setSize
      * Changes the horizontal/vertical size of a window
      *
-     * @param {Integer} width
-     * @param {Integer} height
      */
     setSize(w: number, h: number): void;
 
-    /**
-     * @method resize
-     * Designates a scroll area if there is a lot of content in the window body area
-     */
     resize(): void;
 
-    /**
-     * @method resizeModal
-     * Re-adjust the location of a modal window
-     */
     resizeModal(): void;
 }
diff --git a/types/jweixin/index.d.ts b/types/jweixin/index.d.ts
index ef6e3a9b41..6db4ac213f 100644
--- a/types/jweixin/index.d.ts
+++ b/types/jweixin/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for jweixin 1.0
 // Project: https://mp.weixin.qq.com/wiki/11/74ad127cc054f6b80759c40f77ec03db.html
 // Definitions by: taoqf <https://github.com/taoqf>
+// 					gomydodo <https://github.com/gomydodo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /* =================== USAGE ===================
 import * as wx from 'jweixin';
@@ -245,6 +246,17 @@ declare namespace wx {
 	 * 下载图片接�
 	 */
 	function downloadImage(params: IdownloadImage): void;
+
+	interface IgetLocalImgData extends BaseParams {
+		localId: string; // 图片的localID
+		// localData是图片的base64数�，�以用img标签显示
+		success(res: { localData: string }): void;
+	}
+
+	/**
+	 * 获�本地图片接�
+	 */
+	function getLocalImgData(params: IgetLocalImgData): void;
 	/*=============================图�接�================================*/
 	/*=============================音频接�================================*/
 	/**
diff --git a/types/jwplayer/tslint.json b/types/jwplayer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jwplayer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jws/index.d.ts b/types/jws/index.d.ts
new file mode 100644
index 0000000000..f384fadefc
--- /dev/null
+++ b/types/jws/index.d.ts
@@ -0,0 +1,152 @@
+// Type definitions for jws 3.1
+// Project: https://github.com/brianloveswords/node-jws
+// Definitions by: Justin Beckwith <https://github.com/JustinBeckwith>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as events from 'events';
+import * as stream from 'stream';
+
+/**
+ * (Synchronous) Return a JSON Web Signature for a header
+ * and a payload.
+ */
+export function sign(options: SignOptions): string;
+
+/**
+ * (Synchronous) Returns true or false for whether a signature
+ * matches a secret or key.
+ * @param signature JWS Signature
+ * @param algorithm Algorithm
+ * @param secretOrKey string or buffer containing either the secret
+ * for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA
+ */
+export function verify(signature: string, algorithm: Algorithm, secretOrKey: string|Buffer): boolean;
+
+/**
+ * (Synchronous) Returns the decoded header, decoded payload,
+ * and signature parts of the JWS Signature.
+ */
+export function decode(signature: string): Signature;
+
+/**
+ * Returns a new SignStream object.
+ */
+export function createSign(options: SignOptions): SignStream;
+
+/**
+ * Returns a new VerifyStream object.
+ */
+export function createVerify(options?: VerifyOptions): VerifyStream;
+
+/**
+ * A Readable Stream that emits a single data event, the
+ * calculated signature, when done.
+ */
+export interface SignStream extends stream.Readable {
+    /**
+     * A Writable Stream that expects the JWS payload. Do not
+     * use if you passed a payload option to the constructor.
+     *
+     *  Example: payloadStream.pipe(signer.payload);
+     */
+    payload: stream.Writable;
+
+    /**
+     * Can be a string, Buffer, Readable stream, or object.
+     */
+    secret: any;
+
+    /**
+     * Can be a string, Buffer, Readable stream, or object.
+     */
+    key: any;
+
+    /**
+     * A Writable Stream. Expects the JWS secret for HMAC, or
+     * the privateKey for ECDSA and RSA. Do not use if you
+     * passed a secret or key option to the constructor.
+     *
+     * Example: privateKeyStream.pipe(signer.privateKey);
+     */
+    privateKey: any;
+}
+
+/**
+ * This is a Readable Stream that emits a single data event,
+ * the result of whether or not that signature was valid.
+ */
+export interface VerifyStream extends events.EventEmitter {
+    /**
+     * A Writable Stream that expects a JWS Signature. Do not
+     * use if you passed a signature option to the constructor.
+     */
+    signature: stream.Writable;
+
+    /**
+     * Secret.  Can be a string, buffer, or object.
+     */
+    secret: any;
+
+    /**
+     * Key.  Can be a string, buffer, or object.
+     */
+    key: any;
+
+    /**
+     * A Writable Stream that expects a public key or secret.
+     * Do not use if you passed a key or secret option to the
+     * constructor.
+     */
+    publicKey: stream.Writable;
+}
+
+export interface Signature {
+    header: Header;
+    payload: any;
+    signature: string;
+}
+
+export interface SignOptions {
+    header: Header;
+
+    /**
+     * Can be a string, Buffer, Readable stream, or object.
+     */
+    payload?: any;
+
+    /**
+     * Can be a string, Buffer, Readable stream, or object.
+     */
+    key?: any;
+
+    /**
+     * Can be a string, Buffer, Readable stream, or object.
+     */
+    secret?: any;
+
+    /**
+     * Can be a string, Buffer, Readable stream, or object.
+     */
+    privateKey?: any;
+
+    encoding?: string|Buffer|stream.Readable;
+}
+
+export interface VerifyOptions {
+    signature?: string|Buffer|stream.Readable;
+    algorithm?: Algorithm|Buffer|stream.Readable;
+    key?: string|stream.Readable|Buffer;
+    secret?: string|stream.Readable|Buffer;
+    publicKey?: string|stream.Readable|Buffer;
+    encoding?: string|Buffer|stream.Readable;
+}
+
+export type Algorithm = 'HS256' | 'HS384' | 'HS512' | 'RS256' |
+                        'RS384' | 'RS512' | 'ES256' | 'ES384' |
+                        'ES512' | 'none';
+
+export interface Header {
+    alg: Algorithm;
+}
diff --git a/types/jws/jws-tests.ts b/types/jws/jws-tests.ts
new file mode 100644
index 0000000000..d5271b24ca
--- /dev/null
+++ b/types/jws/jws-tests.ts
@@ -0,0 +1,51 @@
+/**
+ * Tests are built by copying samples from the github repository:
+ * https://github.com/brianloveswords/node-jws
+ */
+
+import * as jws from 'jws';
+import * as fs from "fs";
+
+// set up mock objects
+const fakeStream = fs.createReadStream('fakefile');
+const privateKeyStream = fakeStream;
+const payloadStream = fakeStream;
+const pubKeyStream = fakeStream;
+const sigStream = fakeStream;
+
+// jws.sign
+const signature = jws.sign({
+  header: { alg: 'HS256' },
+  payload: 'h. jon benjamin',
+  secret: 'has a van',
+});
+
+// jws.decode
+const message = jws.decode('djfakdid');
+
+// jws.createSign
+jws.createSign({
+  header: { alg: 'RS256' },
+  privateKey: privateKeyStream,
+  payload: payloadStream,
+}).on('done', signature => {});
+
+// jws.createSign no params
+const signer = jws.createSign({
+  header: { alg: 'RS256' },
+});
+privateKeyStream.pipe(signer.privateKey);
+payloadStream.pipe(signer.payload);
+signer.on('done', signature => {});
+
+// jws.createVerify
+jws.createVerify({
+  publicKey: pubKeyStream,
+  signature: sigStream,
+}).on('done', (verified, obj) => {});
+
+// jws.createVerify with no options
+const verifier = jws.createVerify();
+pubKeyStream.pipe(verifier.publicKey);
+sigStream.pipe(verifier.signature);
+verifier.on('done', (verified, obj) => {});
diff --git a/types/jws/tsconfig.json b/types/jws/tsconfig.json
new file mode 100644
index 0000000000..a8a2f625d3
--- /dev/null
+++ b/types/jws/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jws-tests.ts"
+    ]
+}
diff --git a/types/jws/tslint.json b/types/jws/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jws/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jwt-client/tslint.json b/types/jwt-client/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jwt-client/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/jwt-simple/tslint.json b/types/jwt-simple/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/jwt-simple/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/kafka-node/index.d.ts b/types/kafka-node/index.d.ts
index 6a4fe33456..4f566a8587 100644
--- a/types/kafka-node/index.d.ts
+++ b/types/kafka-node/index.d.ts
@@ -10,13 +10,13 @@ export class Client {
     topicExists(topics: string[], cb: (error?: TopicsNotExistError | any) => any): void;
     refreshMetadata(topics: string[], cb?: (error?: any) => any): void;
     sendOffsetCommitV2Request(group: string, generationId: number, memberId: string, commits: OffsetCommitRequest[], cb: (error: any, data: any) => any): void;
+    // Note: socket_error is currently KafkaClient only, and zkReconnect is currently Client only.
+    on(eventName: "brokersChanged" | "close" | "connect" | "ready" | "reconnect" | "zkReconnect", cb: () => any): this;
+    on(eventName: "error" | "socket_error", cb: (error: any) => any): this;
 }
 
 export class KafkaClient extends Client {
     constructor(options?: KafkaClientOptions);
-    on(eventName: "ready", cb: () => any): this;
-    on(eventName: "reconnect", cb: () => void): this;
-    on(eventName: "error", cb: (error: any) => any): this;
     connect(): void;
 }
 
diff --git a/types/kafka-node/tslint.json b/types/kafka-node/tslint.json
index b1439230db..75a24b3163 100644
--- a/types/kafka-node/tslint.json
+++ b/types/kafka-node/tslint.json
@@ -1,7 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "no-any-union": false
+        // TODOs
+        "no-any-union": false,
+        "no-unnecessary-class": false
     }
 }
diff --git a/types/karma-chai-sinon/index.d.ts b/types/karma-chai-sinon/index.d.ts
index 70680f2ac7..76ee313a40 100644
--- a/types/karma-chai-sinon/index.d.ts
+++ b/types/karma-chai-sinon/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tubalmartin/karma-chai-sinon
 // Definitions by: Václav Ostrožlík <https://github.com/vasek17>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="chai" />
 import Sinon = require("sinon");
diff --git a/types/karma-chai-sinon/tslint.json b/types/karma-chai-sinon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/karma-chai-sinon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/karma-coverage/tsconfig.json b/types/karma-coverage/tsconfig.json
index 02a491bc01..fe130be15a 100644
--- a/types/karma-coverage/tsconfig.json
+++ b/types/karma-coverage/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/karma-coverage/tslint.json b/types/karma-coverage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/karma-coverage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/karma-fixture/tslint.json b/types/karma-fixture/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/karma-fixture/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/karma-jasmine/tslint.json b/types/karma-jasmine/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/karma-jasmine/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/karma-webpack/index.d.ts b/types/karma-webpack/index.d.ts
index 0042ff01a3..988e510b56 100644
--- a/types/karma-webpack/index.d.ts
+++ b/types/karma-webpack/index.d.ts
@@ -2,12 +2,15 @@
 // Project: http://github.com/webpack/karma-webpack
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import * as m from 'karma';
-import webpack = require('webpack');
-import webpackDevMiddleware = require('webpack-dev-middleware');
+import 'karma';
+import * as Webpack from 'webpack';
+import { Reporter, Logger } from 'webpack-dev-middleware';
 
 declare module 'karma' {
+    type Logger = (message?: any, ...optionalParams: any[]) => void;
+
     // Note: karma-webpack will set publicPath for us, so it is optional here.
     // Unfortuantely, Typescript doesn't let you overload properties, so
     // the entire definition is duplicated here.
@@ -15,24 +18,24 @@ declare module 'karma' {
         noInfo?: boolean;
         quiet?: boolean;
         lazy?: boolean;
-        watchOptions?: webpack.Options.WatchOptions;
+        watchOptions?: Webpack.Options.WatchOptions;
         publicPath?: string;
         index?: string;
         headers?: {
             [name: string]: string;
         };
-        stats?: webpack.Options.Stats;
-        reporter?: webpackDevMiddleware.Reporter | null;
+        stats?: Webpack.Options.Stats;
+        reporter?: Reporter | null;
         serverSideRender?: boolean;
 
-        log?: webpackDevMiddleware.Logger;
-        warn?: webpackDevMiddleware.Logger;
-        error?: webpackDevMiddleware.Logger;
+        log?: Logger;
+        warn?: Logger;
+        error?: Logger;
         filename?: string;
     }
 
     interface ConfigOptions {
-        webpack: webpack.Configuration;
+        webpack: Webpack.Configuration;
         webpackMiddlewareOptions: KarmaWebpackMiddlewareOptions;
     }
 }
diff --git a/types/karma-webpack/tsconfig.json b/types/karma-webpack/tsconfig.json
index d91714d8bc..86996cdcfa 100644
--- a/types/karma-webpack/tsconfig.json
+++ b/types/karma-webpack/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/karma/index.d.ts b/types/karma/index.d.ts
index 6dabc5218d..e2cce2c340 100644
--- a/types/karma/index.d.ts
+++ b/types/karma/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for karma 1.7
 // Project: https://github.com/karma-runner/karma
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+//                 James Garbutt <https://github.com/43081j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -9,7 +10,6 @@
 // See Karma public API https://karma-runner.github.io/0.13/dev/public-api.html
 import Promise = require('bluebird');
 import https = require('https');
-import log4js = require('log4js');
 
 declare namespace karma {
     interface Karma {
@@ -144,6 +144,16 @@ declare namespace karma {
         configFile: string;
     }
 
+    // taken from log4js 1.x typings which are gone...
+    interface Log4jsAppenderConfigBase {
+        type: string;
+        category?: string;
+        layout?: {
+            type: string;
+            [key: string]: any
+        }
+    }
+
     interface ConfigOptions {
         /**
          * @description Enable or disable watching files and executing the tests whenever one of these files changes.
@@ -283,7 +293,7 @@ declare namespace karma {
          * @default [{type: 'console'}]
          * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
          */
-        loggers?: log4js.AppenderConfigBase[];
+        loggers?: Log4jsAppenderConfigBase[];
         /**
          * @default {}
          * @description Redefine default mapping from file extensions to MIME-type.
@@ -405,6 +415,19 @@ declare namespace karma {
          * @description Capture all console output and pipe it to the terminal.
          */
         captureConsole?: boolean;
+        /**
+         * @default false
+         * @description Run the tests on the same window as the client, without using iframe or a new window
+         */
+        runInParent?: boolean;
+        /**
+         * @default true
+         * @description Clear the context window
+         * If true, Karma clears the context window upon the completion of running the tests.
+         * If false, Karma does not clear the context window upon the completion of running the tests.
+         * Setting this to false is useful when embedding a Jasmine Spec Runner Template.
+         */
+        clearContext?: boolean;
     }
 
     interface FilePattern {
diff --git a/types/karma/karma-tests.ts b/types/karma/karma-tests.ts
index 2eeed9b480..b21fa88e50 100644
--- a/types/karma/karma-tests.ts
+++ b/types/karma/karma-tests.ts
@@ -51,7 +51,7 @@ server.on('run_complete', (browsers, results) => {
    results.error = false;
    results.exitCode = 0;
    results.failed = 9;
-   results.success = 10; 
+   results.success = 10;
 });
 
 //var runner = require('karma').runner; => cannot use this syntax otherwise runner is of type any
@@ -108,3 +108,15 @@ module.exports = function(config: karma.Config) {
     singleRun: true
   });
 };
+
+const foo = (config: karma.Config) => {
+  config.set({
+    client: {
+      args: ['a', 'b'],
+      useIframe: true,
+      runInParent: true,
+      captureConsole: true,
+      clearContext: true
+    }
+  });
+};
diff --git a/types/karma/tsconfig.json b/types/karma/tsconfig.json
index 50bbc0c60b..23c81534d2 100644
--- a/types/karma/tsconfig.json
+++ b/types/karma/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/karma/tslint.json b/types/karma/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/karma/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/katex/tslint.json b/types/katex/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/katex/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/kcors/index.d.ts b/types/kcors/index.d.ts
index e4e9e53fa6..04c45d365a 100644
--- a/types/kcors/index.d.ts
+++ b/types/kcors/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/cors
 // Definitions by: Xavier Stouder <https://github.com/Xstoudi>, Izayoi Ko <https://github.com/izayoiko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 
diff --git a/types/kefir/tslint.json b/types/kefir/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/kefir/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index 4ecb8e0ab0..2ef00bd75a 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -3748,7 +3748,7 @@ declare namespace kendo.ui {
         aggregates?: any;
         attributes?: any;
         columns?: any;
-        command?: GridColumnCommandItem[];
+        command?: string|(string|GridColumnCommandItem)[];
         editable?: Function;
         encoded?: boolean;
         field?: string;
@@ -11178,8 +11178,8 @@ declare namespace kendo.dataviz.ui {
         border?: ChartXAxisItemTitleBorder;
         color?: string;
         font?: string;
-        margin?: ChartXAxisItemTitleMargin;
-        padding?: ChartXAxisItemTitlePadding;
+        margin?: ChartXAxisItemTitleMargin | number;
+        padding?: ChartXAxisItemTitlePadding | number;
         position?: string;
         rotation?: number;
         text?: string;
diff --git a/types/kendo-ui/tslint.json b/types/kendo-ui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/kendo-ui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/keyboardjs/tslint.json b/types/keyboardjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/keyboardjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/keycloak-js/index.d.ts b/types/keycloak-js/index.d.ts
deleted file mode 100644
index ee1ef73deb..0000000000
--- a/types/keycloak-js/index.d.ts
+++ /dev/null
@@ -1,463 +0,0 @@
-// Type definitions for keycloak-js 2.5
-// Project: https://github.com/keycloak/keycloak
-// Definitions by: Brett Epps <https://github.com/eppsilon>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export as namespace Keycloak;
-
-export = Keycloak;
-
-/**
- * Creates a new Keycloak client instance.
- * @param config Path to a JSON config file or a plain config object.
- */
-declare function Keycloak(config?: string|{}): Keycloak.KeycloakInstance;
-
-declare namespace Keycloak {
-	type KeycloakAdapterName = 'cordova'|'default';
-	type KeycloakOnLoad = 'login-required'|'check-sso';
-	type KeycloakResponseMode = 'query'|'fragment';
-	type KeycloakResponseType = 'code'|'id_token token'|'code id_token token';
-	type KeycloakFlow = 'standard'|'implicit'|'hybrid';
-
-	interface KeycloakInitOptions {
-		/**
-		 * @private Undocumented.
-		 */
-		adapter?: KeycloakAdapterName;
-
-		/**
-		 * Specifies an action to do on load.
-		 */
-		onLoad?: KeycloakOnLoad;
-
-		/**
-		 * Set an initial value for the token.
-		 */
-		token?: string;
-
-		/**
-		 * Set an initial value for the refresh token.
-		 */
-		refreshToken?: string;
-
-		/**
-		 * Set an initial value for the id token (only together with `token` or
-		 * `refreshToken`).
-		 */
-		idToken?: string;
-
-		/**
-		 * Set an initial value for skew between local time and Keycloak server in
-		 * seconds (only together with `token` or `refreshToken`).
-		 */
-		timeSkew?: number;
-
-		/**
-		 * Set to enable/disable monitoring login state.
-		 * @default true
-		 */
-		checkLoginIframe?: boolean;
-
-		/**
-		 * Set the interval to check login state (in seconds).
-		 * @default 5
-		 */
-		checkLoginIframeInterval?: boolean;
-
-		/**
-		 * Set the OpenID Connect response mode to send to Keycloak upon login.
-		 * @default fragment After successful authentication Keycloak will redirect
-		 *                   to JavaScript application with OpenID Connect parameters
-		 *                   added in URL fragment. This is generally safer and
-		 *                   recommended over query.
-		 */
-		responseMode?: KeycloakResponseMode;
-
-		/**
-		 * Set the OpenID Connect flow.
-		 * @default standard
-		 */
-		flow?: KeycloakFlow;
-	}
-
-	interface KeycloakLoginOptions {
-		/**
-		 * @private Undocumented.
-		 */
-		scope?: string;
-
-		/**
-		 * Specifies the uri to redirect to after login.
-		 */
-		redirectUri?: string;
-
-		/**
-		 * By default the login screen is displayed if the user is not logged into
-		 * Keycloak. To only authenticate to the application if the user is already
-		 * logged in and not display the login page if the user is not logged in, set
-		 * this option to `'none'`. To always require re-authentication and ignore
-		 * SSO, set this option to `'login'`.
-		 */
-		prompt?: 'none'|'login';
-
-		/**
-		 * If value is `'register'` then user is redirected to registration page,
-		 * otherwise to login page.
-		 */
-		action?: 'register';
-
-		/**
-		 * Used just if user is already authenticated. Specifies maximum time since
-		 * the authentication of user happened. If user is already authenticated for
-		 * longer time than `'maxAge'`, the SSO is ignored and he will need to
-		 * authenticate again.
-		 */
-		maxAge?: number;
-
-		/**
-		 * Used to pre-fill the username/email field on the login form.
-		 */
-		loginHint?: string;
-
-		/**
-		 * Used to tell Keycloak which IDP the user wants to authenticate with.
-		 */
-		idpHint?: string;
-
-		/**
-		 * Specifies the desired locale for the UI.
-		 */
-		locale?: string;
-	}
-
-	type KeycloakPromiseCallback<T> = (result: T) => void;
-
-	interface KeycloakPromise<TSuccess, TError> {
-		/**
-		 * Function to call if the promised action succeeds.
-		 */
-		success(callback: KeycloakPromiseCallback<TSuccess>): KeycloakPromise<TSuccess, TError>;
-
-		/**
-		 * Function to call if the promised action throws an error.
-		 */
-		error(callback: KeycloakPromiseCallback<TError>): KeycloakPromise<TSuccess, TError>;
-	}
-
-	interface KeycloakError {
-		error: string;
-		error_description: string;
-	}
-
-	interface KeycloakAdapter {
-		login(options?: KeycloakLoginOptions): KeycloakPromise<void, void>;
-		logout(options?: any): KeycloakPromise<void, void>;
-		register(options?: KeycloakLoginOptions): KeycloakPromise<void, void>;
-		accountManagement(): KeycloakPromise<void, void>;
-		redirectUri(options: { redirectUri: string; }, encodeHash: boolean): string;
-	}
-
-	interface KeycloakProfile {
-		id?: string;
-		username?: string;
-		email?: string;
-		firstName?: string;
-		lastName?: string;
-		enabled?: boolean;
-		emailVerified?: boolean;
-		totp?: boolean;
-		createdTimestamp?: number;
-	}
-
-	// export interface KeycloakUserInfo {}
-
-	/**
-	 * A client for the Keycloak authentication server.
-	 * @see {@link https://keycloak.gitbooks.io/securing-client-applications-guide/content/topics/oidc/javascript-adapter.html|Keycloak JS adapter documentation}
-	 */
-	interface KeycloakInstance {
-		/**
-		 * Is true if the user is authenticated, false otherwise.
-		 */
-		authenticated?: boolean;
-
-		/**
-		 * The user id.
-		 */
-		subject?: string;
-
-		/**
-		 * Response mode passed in init (default value is `'fragment'`).
-		 */
-		responseMode?: KeycloakResponseMode;
-
-		/**
-		 * Response type sent to Keycloak with login requests. This is determined
-		 * based on the flow value used during initialization, but can be overridden
-		 * by setting this value.
-		 */
-		responseType?: KeycloakResponseType;
-
-		/**
-		 * Flow passed in init.
-		 */
-		flow?: KeycloakFlow;
-
-		/**
-		 * The realm roles associated with the token.
-		 */
-		realmAccess?: { roles: string[] };
-
-		/**
-		 * The resource roles associated with the token.
-		 */
-		resourceAccess?: string[];
-
-		/**
-		 * The base64 encoded token that can be sent in the Authorization header in
-		 * requests to services.
-		 */
-		token?: string;
-
-		/**
-		 * The parsed token as a JavaScript object.
-		 */
-		tokenParsed?: {
-			exp?: number;
-			iat?: number;
-			nonce?: string;
-			sub?: string;
-			session_state?: string;
-			realm_access?: { roles: string[] };
-			resource_access?: string[];
-		};
-
-		/**
-		 * The base64 encoded refresh token that can be used to retrieve a new token.
-		 */
-		refreshToken?: string;
-
-		/**
-		 * The parsed refresh token as a JavaScript object.
-		 */
-		refreshTokenParsed?: { nonce?: string };
-
-		/**
-		 * The base64 encoded ID token.
-		 */
-		idToken?: string;
-
-		/**
-		 * The parsed id token as a JavaScript object.
-		 */
-		idTokenParsed?: { nonce?: string };
-
-		/**
-		 * The estimated time difference between the browser time and the Keycloak
-		 * server in seconds. This value is just an estimation, but is accurate
-		 * enough when determining if a token is expired or not.
-		 */
-		timeSkew?: number;
-
-		/**
-		 * @private Undocumented.
-		 */
-		loginRequired?: boolean;
-
-		/**
-		 * @private Undocumented.
-		 */
-		authServerUrl?: string;
-
-		/**
-		 * @private Undocumented.
-		 */
-		realm?: string;
-
-		/**
-		 * @private Undocumented.
-		 */
-		clientId?: string;
-
-		/**
-		 * @private Undocumented.
-		 */
-		clientSecret?: string;
-
-		/**
-		 * @private Undocumented.
-		 */
-		redirectUri?: string;
-
-		/**
-		 * @private Undocumented.
-		 */
-		sessionId?: string;
-
-		/**
-		 * @private Undocumented.
-		 */
-		profile?: KeycloakProfile;
-
-		/**
-		 * @private Undocumented.
-		 */
-		userInfo?: {}; // KeycloakUserInfo;
-
-		/**
-		 * Called when the adapter is initialized.
-		 */
-		onReady?(authenticated?: boolean): void;
-
-		/**
-		 * Called when a user is successfully authenticated.
-		 */
-		onAuthSuccess?(): void;
-
-		/**
-		 * Called if there was an error during authentication.
-		 */
-		onAuthError?(errorData: KeycloakError): void;
-
-		/**
-		 * Called when the token is refreshed.
-		 */
-		onAuthRefreshSuccess?(): void;
-
-		/**
-		 * Called if there was an error while trying to refresh the token.
-		 */
-		onAuthRefreshError?(): void;
-
-		/**
-		 * Called if the user is logged out (will only be called if the session
-		 * status iframe is enabled, or in Cordova mode).
-		 */
-		onAuthLogout?(): void;
-
-		/**
-		 * Called when the access token is expired. If a refresh token is available
-		 * the token can be refreshed with Keycloak#updateToken, or in cases where
-		 * it's not (ie. with implicit flow) you can redirect to login screen to
-		 * obtain a new access token.
-		 */
-		onTokenExpired?(): void;
-
-		/**
-		 * Called to initialize the adapter.
-		 * @param initOptions Initialization options.
-		 * @returns A promise to set functions to be invoked on success or error.
-		 */
-		init(initOptions: KeycloakInitOptions): KeycloakPromise<boolean, KeycloakError>;
-
-		/**
-		 * Redirects to login form.
-		 * @param options Login options.
-		 */
-		login(options?: KeycloakLoginOptions): KeycloakPromise<void, void>;
-
-		/**
-		 * Redirects to logout.
-		 * @param options Logout options.
-		 * @param options.redirectUri Specifies the uri to redirect to after logout.
-		 */
-		logout(options?: any): KeycloakPromise<void, void>;
-
-		/**
-		 * Redirects to registration form.
-		 * @param options Supports same options as Keycloak#login but `action` is
-		 *                set to `'register'`.
-		 */
-		register(options?: any): KeycloakPromise<void, void>;
-
-		/**
-		 * Redirects to the Account Management Console.
-		 */
-		accountManagement(): KeycloakPromise<void, void>;
-
-		/**
-		 * Returns the URL to login form.
-		 * @param options Supports same options as Keycloak#login.
-		 */
-		createLoginUrl(options?: KeycloakLoginOptions): string;
-
-		/**
-		 * Returns the URL to logout the user.
-		 * @param options Logout options.
-		 * @param options.redirectUri Specifies the uri to redirect to after logout.
-		 */
-		createLogoutUrl(options?: any): string;
-
-		/**
-		 * Returns the URL to registration page.
-		 * @param options Supports same options as Keycloak#createLoginUrl but
-		 *                `action` is set to `'register'`.
-		 */
-		createRegisterUrl(options?: KeycloakLoginOptions): string;
-
-		/**
-		 * Returns the URL to the Account Management Console.
-		 */
-		createAccountUrl(): string;
-
-		/**
-		 * Returns true if the token has less than `minValidity` seconds left before
-		 * it expires.
-		 * @param minValidity If not specified, `0` is used.
-		 */
-		isTokenExpired(minValidity?: number): boolean;
-
-		/**
-		 * If the token expires within `minValidity` seconds, the token is refreshed.
-		 * If the session status iframe is enabled, the session status is also
-		 * checked.
-		 * @returns A promise to set functions that can be invoked if the token is
-		 *          still valid, or if the token is no longer valid.
-		 * @example
-		 * ```js
-		 * keycloak.updateToken(5).success(function(refreshed) {
-		 *   if (refreshed) {
-		 *     alert('Token was successfully refreshed');
-		 *   } else {
-		 *     alert('Token is still valid');
-		 *   }
-		 * }).error(function() {
-		 *   alert('Failed to refresh the token, or the session has expired');
-		 * });
-		 */
-		updateToken(minValidity: number): KeycloakPromise<boolean, boolean>;
-
-		/**
-		 * Clears authentication state, including tokens. This can be useful if
-		 * the application has detected the session was expired, for example if
-		 * updating token fails. Invoking this results in Keycloak#onAuthLogout
-		 * callback listener being invoked.
-		 */
-		clearToken(): void;
-
-		/**
-		 * Returns true if the token has the given realm role.
-		 * @param role A realm role name.
-		 */
-		hasRealmRole(role: string): boolean;
-
-		/**
-		 * Returns true if the token has the given role for the resource.
-		 * @param role A role name.
-		 * @param resource If not specified, `clientId` is used.
-		 */
-		hasResourceRole(role: string, resource?: string): boolean;
-
-		/**
-		 * Loads the user's profile.
-		 * @returns A promise to set functions to be invoked on success or error.
-		 */
-		loadUserProfile(): KeycloakPromise<KeycloakProfile, void>;
-
-		/**
-		 * @private Undocumented.
-		 */
-		loadUserInfo(): KeycloakPromise<{}, void>;
-	}
-}
diff --git a/types/keycloak-js/keycloak-authz.d.ts b/types/keycloak-js/keycloak-authz.d.ts
deleted file mode 100644
index 0ee42180b4..0000000000
--- a/types/keycloak-js/keycloak-authz.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import * as Keycloak from '.';
-
-export as namespace KeycloakAuthorization;
-
-export = KeycloakAuthorization;
-
-/**
- * Creates a new Keycloak client instance.
- * @param config Path to a JSON config file or a plain config object.
- */
-declare function KeycloakAuthorization(keycloak: Keycloak.KeycloakInstance): KeycloakAuthorization.KeycloakAuthorizationInstance;
-
-declare namespace KeycloakAuthorization {
-	interface KeycloakAuthorizationPromise {
-		then(onGrant: (rpt: string) => void, onDeny: () => void, onError: () => void): void;
-	}
-
-	interface KeycloakAuthorizationInstance {
-		rpt: any;
-		config: { rpt_endpoint: string };
-
-		init(): void;
-
-		/**
-		 * This method enables client applications to better integrate with resource servers protected by a Keycloak
-		 * policy enforcer.
-		 *
-		 * In this case, the resource server will respond with a 401 status code and a WWW-Authenticate header holding the
-		 * necessary information to ask a Keycloak server for authorization data using both UMA and Entitlement protocol,
-		 * depending on how the policy enforcer at the resource server was configured.
-		 */
-		authorize(wwwAuthenticateHeader: string): KeycloakAuthorizationPromise;
-
-		/**
-		 * Obtains all entitlements from a Keycloak server based on a given resourceServerId.
-		 */
-		entitlement(resourceServerId: string, entitlementRequest: {}): KeycloakAuthorizationPromise;
-	}
-}
diff --git a/types/keycloak-js/keycloak-js-tests.ts b/types/keycloak-js/keycloak-js-tests.ts
deleted file mode 100644
index f0c78392b7..0000000000
--- a/types/keycloak-js/keycloak-js-tests.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as Keycloak from 'keycloak-js';
-import {
-  KeycloakInstance,
-  KeycloakError,
-  KeycloakFlow,
-  KeycloakInitOptions,
-  KeycloakLoginOptions,
-  KeycloakProfile,
-  KeycloakPromise,
-  KeycloakResponseMode,
-  KeycloakResponseType
-} from 'keycloak-js';
-
-import * as KeycloakAuthorization from 'keycloak-js/keycloak-authz';
-import { KeycloakAuthorizationPromise } from 'keycloak-js/keycloak-authz';
-
-const keycloak = Keycloak();
-const keycloakAuthz = KeycloakAuthorization(keycloak);
diff --git a/types/keycloak-js/tsconfig.json b/types/keycloak-js/tsconfig.json
deleted file mode 100644
index 7c2834a781..0000000000
--- a/types/keycloak-js/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "keycloak-authz.d.ts",
-        "keycloak-js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/keycloak-js/tslint.json b/types/keycloak-js/tslint.json
deleted file mode 100644
index f2ffe2445b..0000000000
--- a/types/keycloak-js/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		"no-duplicate-imports": false
-	}
-}
diff --git a/types/keymaster/tslint.json b/types/keymaster/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/keymaster/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/keymirror/tslint.json b/types/keymirror/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/keymirror/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/keypress.js/index.d.ts b/types/keypress.js/index.d.ts
index 1a1dae9158..202990da93 100644
--- a/types/keypress.js/index.d.ts
+++ b/types/keypress.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Keypress 2.0
+// Type definitions for Keypress 2.1
 // Project: https://github.com/dmauro/Keypress/
 // Definitions by: Roger Chen <https://github.com/rcchen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -19,18 +19,18 @@ export interface ListenerDefaults {
 }
 
 export interface Combo {
-    keys: string;
-    on_keydown(event?: KeyboardEvent, count?: number): any;
-    on_keyup(event?: KeyboardEvent): any;
-    on_release(event?: KeyboardEvent): any;
-    this: Element;
-    prevent_default: boolean;
-    prevent_repeat: boolean;
-    is_unordered: boolean;
-    is_counting: boolean;
-    is_exclusive: boolean;
-    is_sequence: boolean;
-    is_solitary: boolean;
+    keys?: string;
+    on_keydown?(event?: KeyboardEvent, count?: number): any;
+    on_keyup?(event?: KeyboardEvent): any;
+    on_release?(event?: KeyboardEvent): any;
+    this?: Element;
+    prevent_default?: boolean;
+    prevent_repeat?: boolean;
+    is_unordered?: boolean;
+    is_counting?: boolean;
+    is_exclusive?: boolean;
+    is_sequence?: boolean;
+    is_solitary?: boolean;
 }
 
 export class Listener {
@@ -39,9 +39,9 @@ export class Listener {
     simple_combo(keys: string, on_keydown_callback: (event?: KeyboardEvent, count?: number) => any): void;
     counting_combo(keys: string, on_count_callback: (event?: KeyboardEvent, count?: number) => any): void;
     sequence_combo(keys: string, callback: (event?: KeyboardEvent, count?: number) => any): void;
-    register_combo(combo: Combo): void;
+    register_combo(combo: Combo): Combo;
     unregister_combo(combo: Combo | string): void;
-    register_many(combos: Combo[]): void;
+    register_many(combos: Combo[]): Combo[];
     unregister_many(combos: Combo[] | string[]): void;
     get_registered_combos(): Combo[];
     destroy(): void;
diff --git a/types/keysym/index.d.ts b/types/keysym/index.d.ts
index 15f814f51a..83ca0abe6d 100644
--- a/types/keysym/index.d.ts
+++ b/types/keysym/index.d.ts
@@ -10,30 +10,27 @@ export interface Record {
     unicode: number;
 }
 
-/**
- * Contains all associated keysyms, unicode characters, names, and their status
- * @type {Record}
- */
+/** Contains all associated keysyms, unicode characters, names, and their status */
 export const records: Record[];
 
 /**
  * Converts a keysym into an associated record describing all representations of the key
- * @param {number} keysym - Keysym of the key
- * @returns {Record | undefined} - Associated record or undefined if one couldn't be found
+ * @param keysym - Keysym of the key
+ * @returns - Associated record or undefined if one couldn't be found
  */
 export function fromKeysym(keysym: number): Record | undefined;
 
 /**
  * Converts a key name into an associated record describing all representations of the key
- * @param {string} name - Name of the key
- * @returns {Record | undefined} - Associated record or undefined if one couldn't be found
+ * @param name - Name of the key
+ * @returns - Associated record or undefined if one couldn't be found
  */
 export function fromName(name: string): Record | undefined;
 
 /**
  * Converts a unicode character or value into an array of all matching records describing all possible representations of the key
- * @param {string | number} code - Unicode character or value
- * @returns {Record[]} - Associated records, will be empty if no matches were found
+ * @param code - Unicode character or value
+ * @returns - Associated records, will be empty if no matches were found
  * @throws Will throw an error if string is not one character
  */
 export function fromUnicode(code: string | number): Record[];
diff --git a/types/keytar/tslint.json b/types/keytar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/keytar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/kii-cloud-sdk/index.d.ts b/types/kii-cloud-sdk/index.d.ts
index 23924b5dab..a3a7991bcc 100644
--- a/types/kii-cloud-sdk/index.d.ts
+++ b/types/kii-cloud-sdk/index.d.ts
@@ -833,7 +833,6 @@ declare namespace KiiCloud {
         /**
          * Get the action that is being permitted/restricted in this entry
          *
-         * @return
          */
         getAction(): KiiACLAction;
 
@@ -851,7 +850,6 @@ declare namespace KiiCloud {
         /**
          * Get the subject that is being permitted/restricted in this entry
          *
-         * @return
          */
         getSubject<T extends KiiACLSubject>(): T;
 
@@ -869,7 +867,6 @@ declare namespace KiiCloud {
         /**
          * Get whether or not the action is being permitted to the subject
          *
-         * @return
          */
         getGrant(): boolean;
 
@@ -1283,7 +1280,6 @@ declare namespace KiiCloud {
          * @param groupName Name of the KiiGroup
          * @param user id of owner
          * @param members An array of KiiUser objects to add to the group
-         * @param callbacks
          *
          * @return return promise object.
          *       <ul>
@@ -1987,7 +1983,6 @@ declare namespace KiiCloud {
         /**
          * The name of this bucket
          *
-         * @return
          */
         getBucketName(): string;
 
@@ -2614,7 +2609,6 @@ declare namespace KiiCloud {
          * @deprecated Use {@link KiiGroup.getId} instead.
          *   Get the UUID of the given group, assigned by the server
          *
-         * @return
          */
         getUUID(): string;
 
@@ -2628,7 +2622,6 @@ declare namespace KiiCloud {
         /**
          * The name of this group
          *
-         * @return
          */
         getName(): string;
 
@@ -3314,28 +3307,24 @@ declare namespace KiiCloud {
         /**
          * Get the UUID of the given object, assigned by the server
          *
-         * @return
          */
         getUUID(): string;
 
         /**
          * Get Id of the object or null if the object ID hasn't been assigned.
          *
-         * @return
          */
         getID(): string;
 
         /**
          * Get the server's creation date of this object
          *
-         * @return
          */
         getCreated(): number;
 
         /**
          * Get the modified date of the given object, assigned by the server
          *
-         * @return
          */
         getModified(): string;
 
@@ -4429,7 +4418,6 @@ declare namespace KiiCloud {
          * If this method is not called, no collapse_key is applied.
          * For details please refer to GCM document of collapse_key.
          *
-         * @param collapseKey
          *
          * @return builder instance.
          */
@@ -4442,7 +4430,6 @@ declare namespace KiiCloud {
          * If this method is not called, no delay_while_idle is applied.
          * For details please refer to GCM document of delay_while_idle.
          *
-         * @param delayWhileIdle
          *
          * @return builder instance.
          */
@@ -4455,7 +4442,6 @@ declare namespace KiiCloud {
          * If this method is not called, no time_to_live is applied.
          * For details please refer to GCM document of time_to_live.
          *
-         * @param timeToLive
          *
          * @return builder instance.
          */
@@ -4468,7 +4454,6 @@ declare namespace KiiCloud {
          * If this method is not called, no restricted_package_name is applied.
          * For details please refer to GCM document of restricted_package_name.
          *
-         * @param restrictedPackageName
          *
          * @return builder instance.
          */
@@ -4509,7 +4494,6 @@ declare namespace KiiCloud {
          * If this method is not called, no sound is applied.
          * For details please refer to APNS document of sound.
          *
-         * @param sound
          *
          * @return builder instance.
          */
@@ -4522,7 +4506,6 @@ declare namespace KiiCloud {
          * If this method is not called, no badge is applied.
          * For details please refer to APNS document of badge.
          *
-         * @param badge
          *
          * @return builder instance.
          */
@@ -4549,7 +4532,6 @@ declare namespace KiiCloud {
          * If this method is not called, no category is applied.
          * For details please refer to APNS document of category.
          *
-         * @param category
          *
          * @return builder instance.
          */
@@ -4774,7 +4756,6 @@ declare namespace KiiCloud {
         /**
          * Get the limit of the current query
          *
-         * @return
          */
         getLimit(): number;
 
@@ -6821,7 +6802,6 @@ declare namespace KiiCloud {
          * @deprecated Use {@link KiiUser.getId} instead.
          *   Get the UUID of the given user, assigned by the server
          *
-         * @return
          */
         getUUID(): string;
 
@@ -6835,7 +6815,6 @@ declare namespace KiiCloud {
         /**
          * Get the username of the given user
          *
-         * @return
          */
         getUsername(): string;
 
@@ -6850,7 +6829,6 @@ declare namespace KiiCloud {
         /**
          * Get the display name associated with this user
          *
-         * @return
          */
         getDisplayName(): string;
 
@@ -6877,7 +6855,6 @@ declare namespace KiiCloud {
         /**
          * Get the email address associated with this user
          *
-         * @return
          */
         getEmailAddress(): string;
 
@@ -6896,7 +6873,6 @@ declare namespace KiiCloud {
         /**
          * Get the phone number associated with this user
          *
-         * @return
          */
         getPhoneNumber(): string;
 
@@ -6915,7 +6891,6 @@ declare namespace KiiCloud {
         /**
          * Get the country code associated with this user
          *
-         * @return
          */
         getCountry(): string;
 
@@ -6933,7 +6908,6 @@ declare namespace KiiCloud {
         /**
          * Get the locale associated with this user
          *
-         * @return
          */
         getLocale(): string;
 
@@ -6954,7 +6928,6 @@ declare namespace KiiCloud {
         /**
          * Get the server's creation date of this user
          *
-         * @return
          */
         getCreated(): string;
 
@@ -6963,7 +6936,6 @@ declare namespace KiiCloud {
          *
          * @deprecated Get the modified date of the given user, assigned by the server
          *
-         * @return
          */
         getModified(): string;
 
@@ -6997,7 +6969,6 @@ declare namespace KiiCloud {
         /**
          * Get the access token for the user - only available if the user is currently logged in
          *
-         * @return
          */
         getAccessToken(): string;
 
@@ -7073,8 +7044,6 @@ declare namespace KiiCloud {
         /**
          * The currently authenticated user
          *
-         * @return
-         *
          * @example
          *         var user = KiiUser.getCurrentUser();
          */
@@ -7538,7 +7507,6 @@ declare namespace KiiCloud {
          * <br><br>This method is exclusive to pseudo user.
          * <br>password is mandatory and needs to provide at least one of login name, email address or phone number.
          *
-         * @param identityData
          * @param password The user's password. Valid pattern is ^[\x20-\x7E]{4,50}$.
          * @param callbacks An object with callback methods defined.
          *   This argument is mandatory and can't be ommited.
@@ -7610,7 +7578,6 @@ declare namespace KiiCloud {
          *
          * <br><br>If you want to update identity data of pseudo user, you must use KiiUser.putIdentity instead.
          *
-         * @param identityData
          * @param callbacks An object with callback methods defined.
          *   This argument is mandatory and can't be ommited.
          * @param userFields Custom Fields to add to the user.
@@ -8715,7 +8682,6 @@ declare namespace KiiCloud {
          * <br><br>Create a KiiUser builder with global phone number.
          *
          * @param phoneNumber global phone number.
-         * @param password
          *
          * @return KiiUser object builder.
          *
diff --git a/types/kii-cloud-sdk/tslint.json b/types/kii-cloud-sdk/tslint.json
index c4fd1ce0bb..4184ebb791 100644
--- a/types/kii-cloud-sdk/tslint.json
+++ b/types/kii-cloud-sdk/tslint.json
@@ -1,7 +1,9 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
+        // TODOs
         "dt-header": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/kik-browser/tslint.json b/types/kik-browser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/kik-browser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/kineticjs/tslint.json b/types/kineticjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/kineticjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/klaw/index.d.ts b/types/klaw/index.d.ts
index cbe78af067..7b4e586842 100644
--- a/types/klaw/index.d.ts
+++ b/types/klaw/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for klaw v1.3.0
+// Type definitions for klaw v2.1.1
 // Project: https://github.com/jprichardson/node-klaw
 // Definitions by: Matthew McEachen <https://github.com/mceachen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -25,11 +25,12 @@ declare module "klaw" {
             pathSorter?: (pathA: string, pathB: string) => number
             fs?: any // fs or mock-fs
             filter?: (path: string) => boolean
+            depthLimit?: number
         }
 
         type Event = "close" | "data" | "end" | "readable" | "error"
 
-        interface Walker {
+        interface Walker extends Readable {
             on(event: Event, listener: Function): this
             on(event: "close", listener: () => void): this
             on(event: "data", listener: (item: Item) => void): this
diff --git a/types/klaw/tslint.json b/types/klaw/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/klaw/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/klaw/v1/index.d.ts b/types/klaw/v1/index.d.ts
new file mode 100644
index 0000000000..74939f30c2
--- /dev/null
+++ b/types/klaw/v1/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for klaw 1.3
+// Project: https://github.com/jprichardson/node-klaw
+// Definitions by: Matthew McEachen <https://github.com/mceachen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as fs from "fs";
+import { Readable, ReadableOptions } from 'stream';
+
+declare function K(root: string, options?: K.Options): K.Walker;
+
+declare namespace K {
+    interface Item {
+        path: string;
+        stats: fs.Stats;
+    }
+
+    type QueueMethod = "shift" | "pop";
+
+    interface Options extends ReadableOptions {
+        queueMethod?: QueueMethod;
+        pathSorter?: (pathA: string, pathB: string) => number;
+        fs?: any; // fs or mock-fs
+        filter?: (path: string) => boolean;
+    }
+
+    type Event = "close" | "data" | "end" | "readable" | "error";
+
+    interface Walker {
+        on(event: Event, listener: Function): this;
+        on(event: "close" | "end" | "readable", listener: () => void): this;
+        on(event: "data", listener: (item: Item) => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        read(): Item;
+    }
+}
+
+export = K;
diff --git a/types/klaw/v1/klaw-tests.ts b/types/klaw/v1/klaw-tests.ts
new file mode 100644
index 0000000000..5e425a714a
--- /dev/null
+++ b/types/klaw/v1/klaw-tests.ts
@@ -0,0 +1,44 @@
+import * as klaw from "klaw";
+import * as  path from "path";
+
+// README.md: Streams 1 (push) example:
+
+const items: klaw.Item[] = []; // files, directories, symlinks, etc
+
+klaw('/some/dir')
+    .on('data', (item: klaw.Item) => {
+        items.push(item);
+    })
+    .on('end', () => {
+        console.dir(items); // => [ ... array of files]
+    });
+
+// README.md: Streams 2 & 3 (pull) with error handling
+
+klaw('/some/dir')
+    .on('readable', () => {
+        while (true) {
+            const item = this.read();
+            if (!item) break;
+            items.push(item);
+        }
+    })
+    .on('error', (err: Error, item: klaw.Item) => {
+        console.log(err.message);
+        console.log(item.path); // the file the error occurred on
+    })
+    .on('end', () => {
+        console.log(items); // => [ ... array of files]
+    });
+
+// README.md: Example (ignore hidden directories):
+
+function filterFunc(item: string): boolean {
+    const basename = path.basename(item);
+    return basename === '.' || basename[0] !== '.';
+}
+
+klaw('/some/dir', { filter: filterFunc })
+    .on('data', (item: klaw.Item) => {
+        // only items of none hidden folders will reach here
+    });
diff --git a/types/klaw/v1/tsconfig.json b/types/klaw/v1/tsconfig.json
new file mode 100644
index 0000000000..35caa3f9ea
--- /dev/null
+++ b/types/klaw/v1/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "paths": {
+            "klaw": [
+                "klaw/v1"
+            ]
+        },
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "klaw-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/klaw/v1/tslint.json b/types/klaw/v1/tslint.json
new file mode 100644
index 0000000000..d4a3f680ce
--- /dev/null
+++ b/types/klaw/v1/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "ban-types": false
+    }
+}
diff --git a/types/knex-postgis/index.d.ts b/types/knex-postgis/index.d.ts
index 93105208c4..b63c1f11dd 100644
--- a/types/knex-postgis/index.d.ts
+++ b/types/knex-postgis/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jfgodoy/knex-postgis
 // Definitions by: Vesa Poikajärvi <https://github.com/vesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as GeoJSON from 'geojson';
 import * as Knex from 'knex';
diff --git a/types/knex-postgis/knex-postgis-tests.ts b/types/knex-postgis/knex-postgis-tests.ts
index 4639a55ea6..43a6c2f58b 100644
--- a/types/knex-postgis/knex-postgis-tests.ts
+++ b/types/knex-postgis/knex-postgis-tests.ts
@@ -7,13 +7,7 @@ const st: KPG.KnexPostgis = KPG(knex);
 
 const point: GeoJSON.Point = {
   type: 'Point',
-  coordinates: [23.773206, 61.506005],
-  crs: {
-    type: 'name',
-    properties: {
-      name: 'EPSG:4326'
-    }
-  }
+  coordinates: [23.773206, 61.506005]
 };
 
 const wktPoint = 'POINT(23.773206 61.506005)';
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 926e3b84db..58dafaf788 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -1,6 +1,10 @@
-// Type definitions for Knex.js
+// Type definitions for Knex.js 0.14
 // Project: https://github.com/tgriesser/knex
-// Definitions by: Qubo <https://github.com/tkQubo>, Baronfel <https://github.com/baronfel>
+// Definitions by: Qubo <https://github.com/tkQubo>
+//                 Baronfel <https://github.com/baronfel>
+//                 Pablo Rodríguez <https://github.com/MeLlamoPablo>
+//                 Matt R. Wilson <https://github.com/mastermatt>
+//                 Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -8,7 +12,7 @@
 
 import events = require("events");
 import stream = require ("stream");
-import Promise = require("bluebird");
+import Bluebird = require("bluebird");
 
 type Callback = Function;
 type Client = Function;
@@ -22,10 +26,10 @@ interface Knex extends Knex.QueryInterface {
     __knex__: string;
 
     raw: Knex.RawBuilder;
-    transaction(transactionScope: (trx: Knex.Transaction) => any): Promise<any>;
+    transaction<T>(transactionScope: (trx: Knex.Transaction) => Promise<T> | Bluebird<T> | void): Bluebird<T>;
     destroy(callback: Function): void;
-    destroy(): Promise<void>;
-    batchInsert(tableName : TableName, data: any[], chunkSize : number) : Knex.QueryBuilder;
+    destroy(): Bluebird<void>;
+    batchInsert(tableName: TableName, data: any[], chunkSize: number): Knex.QueryBuilder;
     schema: Knex.SchemaBuilder;
     queryBuilder(): Knex.QueryBuilder;
 
@@ -156,7 +160,7 @@ declare namespace Knex {
         delete(returning?: string | string[]): QueryBuilder;
         truncate(): QueryBuilder;
 
-        transacting(trx: Transaction): QueryBuilder;
+        transacting(trx?: Transaction): QueryBuilder;
         connection(connection: any): QueryBuilder;
 
         clone(): QueryBuilder;
@@ -179,7 +183,7 @@ declare namespace Knex {
 
     interface Join {
         (raw: Raw): QueryBuilder;
-        (tableName: TableName, clause: (this: JoinClause) => void): QueryBuilder;
+        (tableName: TableName, clause: (this: JoinClause, join: JoinClause) => void): QueryBuilder;
         (tableName: TableName, columns: { [key: string]: string | number | Raw }): QueryBuilder;
         (tableName: TableName, raw: Raw): QueryBuilder;
         (tableName: TableName, column1: string, column2: string): QueryBuilder;
@@ -193,19 +197,43 @@ declare namespace Knex {
         on(columns: { [key: string]: string | Raw }): JoinClause;
         on(column1: string, column2: string): JoinClause;
         on(column1: string, raw: Raw): JoinClause;
-        on(column1: string, operator: string, column2: string): JoinClause;
+        on(column1: string, operator: string, column2: string | Raw): JoinClause;
         andOn(raw: Raw): JoinClause;
         andOn(callback: Function): JoinClause;
         andOn(columns: { [key: string]: string | Raw }): JoinClause;
         andOn(column1: string, column2: string): JoinClause;
         andOn(column1: string, raw: Raw): JoinClause;
-        andOn(column1: string, operator: string, column2: string): JoinClause;
+        andOn(column1: string, operator: string, column2: string | Raw): JoinClause;
         orOn(raw: Raw): JoinClause;
         orOn(callback: Function): JoinClause;
         orOn(columns: { [key: string]: string | Raw }): JoinClause;
         orOn(column1: string, column2: string): JoinClause;
         orOn(column1: string, raw: Raw): JoinClause;
-        orOn(column1: string, operator: string, column2: string): JoinClause;
+        orOn(column1: string, operator: string, column2: string | Raw): JoinClause;
+        onIn(column1: string, values: any[]): JoinClause;
+        andOnIn(column1: string, values: any[]): JoinClause;
+        orOnIn(column1: string, values: any[]): JoinClause;
+        onNotIn(column1: string, values: any[]): JoinClause;
+        andOnNotIn(column1: string, values: any[]): JoinClause;
+        orOnNotIn(column1: string, values: any[]): JoinClause;
+        onNull(column1: string): JoinClause;
+        andOnNull(column1: string): JoinClause;
+        orOnNull(column1: string): JoinClause;
+        onNotNull(column1: string): JoinClause;
+        andOnNotNull(column1: string): JoinClause;
+        orOnNotNull(column1: string): JoinClause;
+        onExists(callback: () => void): JoinClause;
+        andOnExists(callback: () => void): JoinClause;
+        orOnExists(callback: () => void): JoinClause;
+        onNotExists(callback: () => void): JoinClause;
+        andOnNotExists(callback: () => void): JoinClause;
+        orOnNotExists(callback: () => void): JoinClause;
+        onBetween(column1: string, range: [any, any]): JoinClause;
+        andOnBetween(column1: string, range: [any, any]): JoinClause;
+        orOnBetween(column1: string, range: [any, any]): JoinClause;
+        onNotBetween(column1: string, range: [any, any]): JoinClause;
+        andOnNotBetween(column1: string, range: [any, any]): JoinClause;
+        orOnNotBetween(column1: string, range: [any, any]): JoinClause;
         using(column: string | string[] | Raw | { [key: string]: string | Raw }): JoinClause;
         type(type: string): JoinClause;
     }
@@ -223,7 +251,7 @@ declare namespace Knex {
     }
 
     interface WithSchema {
-        (schema: string): QueryBuilder
+        (schema: string): QueryBuilder;
     }
 
     interface WithWrapped {
@@ -327,7 +355,7 @@ declare namespace Knex {
         and: QueryBuilder;
 
         //TODO: Promise?
-        columnInfo(column?: string): Promise<ColumnInfo>;
+        columnInfo(column?: string): Bluebird<ColumnInfo>;
 
         forUpdate(): QueryBuilder;
         forShare(): QueryBuilder;
@@ -348,18 +376,18 @@ declare namespace Knex {
     // Chainable interface
     //
 
-    interface ChainableInterface extends Promise<any> {
+    interface ChainableInterface extends Bluebird<any> {
         toQuery(): string;
         options(options: any): QueryBuilder;
-        stream(callback: (readable: stream.PassThrough) => any): Promise<any>;
+        stream(callback: (readable: stream.PassThrough) => any): Bluebird<any>;
         stream(options?: { [key: string]: any }): stream.PassThrough;
-        stream(options: { [key: string]: any }, callback: (readable: stream.PassThrough) => any): Promise<any>;
+        stream(options: { [key: string]: any }, callback: (readable: stream.PassThrough) => any): Bluebird<any>;
         pipe(writable: any): stream.PassThrough;
         exec(callback: Function): QueryBuilder;
     }
 
     interface Transaction extends Knex {
-        savepoint(transactionScope: (trx: Transaction) => any): Promise<any>;
+        savepoint(transactionScope: (trx: Transaction) => any): Bluebird<any>;
         commit(value?: any): QueryBuilder;
         rollback(error?: any): QueryBuilder;
     }
@@ -368,14 +396,14 @@ declare namespace Knex {
     // Schema builder
     //
 
-    interface SchemaBuilder extends Promise<any> {
+    interface SchemaBuilder extends Bluebird<any> {
         createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
         createTableIfNotExists(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
-        renameTable(oldTableName: string, newTableName: string): Promise<void>;
+        renameTable(oldTableName: string, newTableName: string): Bluebird<void>;
         dropTable(tableName: string): SchemaBuilder;
-        hasTable(tableName: string): Promise<boolean>;
-        hasColumn(tableName: string, columnName: string): Promise<boolean>;
-        table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Promise<void>;
+        hasTable(tableName: string): Bluebird<boolean>;
+        hasColumn(tableName: string, columnName: string): Bluebird<boolean>;
+        table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Bluebird<void>;
         dropTableIfExists(tableName: string): SchemaBuilder;
         raw(statement: string): SchemaBuilder;
         withSchema(schemaName: string): SchemaBuilder;
@@ -486,8 +514,9 @@ declare namespace Knex {
 
     interface Config {
         debug?: boolean;
-        client?: string;
+        client?: string | typeof Client;
         dialect?: string;
+        version?: string;
         connection?: string | ConnectionConfig | MariaSqlConnectionConfig |
             MySqlConnectionConfig | MsSqlConnectionConfig | Sqlite3ConnectionConfig | SocketConnectionConfig;
         pool?: PoolConfig;
@@ -495,7 +524,7 @@ declare namespace Knex {
         seeds?: SeedsConfig;
         acquireConnectionTimeout?: number;
         useNullAsDefault?: boolean;
-        searchPath?: string;
+        searchPath?: string | string[];
     }
 
     interface ConnectionConfig {
@@ -563,7 +592,7 @@ declare namespace Knex {
         connectTimeout?: number;
         stringifyObjects?: boolean;
         insecureAuth?: boolean;
-        typeCast?: boolean;
+        typeCast?: any;
         queryFormat?: (query: string, values: any) => string;
         supportBigNumbers?: boolean;
         bigNumberStrings?: boolean;
@@ -641,16 +670,32 @@ declare namespace Knex {
     }
 
     interface Migrator {
-        make(name: string, config?: MigratorConfig): Promise<string>;
-        latest(config?: MigratorConfig): Promise<any>;
-        rollback(config?: MigratorConfig): Promise<any>;
-        status(config?: MigratorConfig): Promise<number>;
-        currentVersion(config?: MigratorConfig): Promise<string>;
+        make(name: string, config?: MigratorConfig): Bluebird<string>;
+        latest(config?: MigratorConfig): Bluebird<any>;
+        rollback(config?: MigratorConfig): Bluebird<any>;
+        status(config?: MigratorConfig): Bluebird<number>;
+        currentVersion(config?: MigratorConfig): Bluebird<string>;
     }
 
     interface FunctionHelper {
         now(): Raw;
     }
+
+    //
+    // Clients
+    //
+
+    class Client extends events.EventEmitter {
+      constructor(config: Config);
+      config: Config;
+      dialect: string;
+      driverName: string;
+      connectionSettings: object;
+
+      acquireRawConnection(): Promise<any>;
+      destroyRawConnection(connection: any): Promise<void>;
+      validateConnection(connection: any): Promise<boolean>;
+    }
 }
 
 export = Knex;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index c3d2981d9c..3f9f20ab72 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -22,6 +22,20 @@ var knex = Knex({
   }
 });
 
+var knex = Knex({
+  debug: true,
+  client: 'pg',
+  version: '9.5',
+  connection: {
+    user    : 'your_database_user',
+    password: 'your_database_password',
+    server  : 'your_database_server',
+    options : {
+      database: 'myapp_test'
+    }
+  }
+});
+
 var knex = Knex({
   debug: true,
   client: 'mssql',
@@ -104,8 +118,12 @@ var knex = Knex({
 
 // searchPath
 var knex = Knex({
-  client: 'pg',
-  searchPath: 'public',
+    client: 'pg',
+    searchPath: 'public',
+});
+var knex = Knex({
+    client: 'pg',
+    searchPath: ['public', 'private'],
 });
 
 // useNullAsDefault
@@ -114,6 +132,13 @@ var knex = Knex({
   useNullAsDefault: true,
 });
 
+// Using custom client
+class TestClient extends Knex.Client {}
+
+var knex = Knex({
+  client: TestClient,
+});
+
 knex('books').insert({title: 'Test'}).returning('*').toString();
 
 // Migrations
@@ -138,7 +163,7 @@ knex.select('title', 'author', 'year').from('books');
 knex.select().table('books');
 
 knex.avg('sum_column1').from(function() {
-  this.sum('column1 as sum_column1').from('t1').groupBy('column1').as('t1')
+  this.sum('column1 as sum_column1').from('t1').groupBy('column1').as('t1');
 }).as('ignored_alias');
 
 knex.column('title', 'author', 'year').select().from('books');
@@ -153,7 +178,7 @@ knex('users').where({
 knex('users').where('id', 1);
 
 knex('users').where(() => {
-  this.where('id', 1).orWhere('id', '>', 10)
+  this.where('id', 1).orWhere('id', '>', 10);
 }).orWhere({name: 'Tester'});
 
 knex('users').where('votes', '>', 100);
@@ -221,11 +246,141 @@ knex('users')
   .select('users.id', 'contacts.phone');
 
 knex.select('*').from('users').join(knex('accounts').select('id', 'owner_id').as('accounts'), function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').join('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+});
+
+knex.select('*').from('users').join('accounts', function(join: Knex.JoinClause) {
+  if (this !== join) {
+    throw new Error("join() callback call semantics wrong");
+  }
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+});
+
+knex.select('*').from('user').join('contacts', () => {
+  this.on('users.id', '=', knex.raw(7));
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onIn('contacts.id', [7, 15, 23, 41]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnIn('contacts.id', [7, 15, 23, 41]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnIn('contacts.id', [7, 15, 23, 41]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onNotIn('contacts.id', [7, 15, 23, 41]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnNotIn('contacts.id', [7, 15, 23, 41]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnNotIn('contacts.id', [7, 15, 23, 41]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onNull('contacts.email');
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnNull('contacts.email');
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnNull('contacts.email');
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onNotNull('contacts.email');
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnNotNull('contacts.email');
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnNotNull('contacts.email');
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onExists(function() {
+    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
+  });
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnExists(function() {
+    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
+  });
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnExists(function() {
+    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
+  });
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onNotExists(function() {
+    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
+  });
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnNotExists(function() {
+    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
+  });
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnNotExists(function() {
+    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
+  });
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onBetween('contacts.id', [5, 30]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnBetween('contacts.id', [5, 30]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnBetween('contacts.id', [5, 30]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onNotBetween('contacts.id', [5, 30]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').andOnNotBetween('contacts.id', [5, 30]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').orOnNotBetween('contacts.id', [5, 30]);
+});
+
+knex.select('*').from('users').join('contacts', function() {
+  this.on('users.id', '=', 'contacts.id').onNotExists(function() {
+    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
+  });
+});
+
+knex.select('*').from('users').join('accounts', (join: Knex.JoinClause) => {
+  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').join('accounts', 'accounts.type', knex.raw('?', ['admin']));
@@ -237,43 +392,63 @@ knex.from('users').innerJoin('accounts', 'users.id', 'accounts.user_id');
 knex.table('users').innerJoin('accounts', 'users.id', '=', 'accounts.user_id');
 
 knex('users').innerJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+});
+
+knex('users').innerJoin('accounts', (join: Knex.JoinClause) => {
+  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').leftJoin('accounts', 'users.id', 'accounts.user_id');
 
 knex.select('*').from('users').leftJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+});
+
+knex.select('*').from('users').leftJoin('accounts', (join: Knex.JoinClause) => {
+  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').leftOuterJoin('accounts', 'users.id', 'accounts.user_id');
 
 knex.select('*').from('users').leftOuterJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').rightJoin('accounts', 'users.id', 'accounts.user_id');
 
 knex.select('*').from('users').rightJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+});
+
+knex.select('*').from('users').rightJoin('accounts', (join: Knex.JoinClause) => {
+  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').rightOuterJoin('accounts', 'users.id', 'accounts.user_id');
 
 knex.select('*').from('users').rightOuterJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').outerJoin('accounts', 'users.id', 'accounts.user_id');
 
 knex.select('*').from('users').outerJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+});
+
+knex.select('*').from('users').outerJoin('accounts', (join: Knex.JoinClause) => {
+  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').fullOuterJoin('accounts', 'users.id', 'accounts.user_id');
 
 knex.select('*').from('users').fullOuterJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
+  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
+});
+
+knex.select('*').from('users').fullOuterJoin('accounts', (join: Knex.JoinClause) => {
+  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
 });
 
 knex.select('*').from('users').crossJoin('accounts', 'users.id', 'accounts.user_id');
@@ -309,7 +484,7 @@ knex('books')
   .returning('id')
   .insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}]);
 
-knex.batchInsert('books', [{title:'Great Gatsby'}, {title: 'Fahrenheit 451'}], 200);
+knex.batchInsert('books', [{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}], 200);
 knex.queryBuilder().table('books');
 
 knex('books').where('published_date', '<', 2000).update({status: 'archived'});
@@ -360,7 +535,6 @@ knex.transaction(function(trx) {
     })
     .then(trx.commit)
     .catch(trx.rollback);
-
 }).then(function() {
   console.log('Transaction complete.');
 }).catch(function(err) {
@@ -376,9 +550,19 @@ knex.transaction(function(trx) {
   knex('tableName')
     .transacting(trx)
     .forShare()
-    .select('*')
+    .select('*');
 });
 
+const transactionReturnValue = knex.transaction(function(trx) {
+  return knex("table")
+    .insert({ foo: "bar" })
+    .returning(["id"])
+    .then(function(result) { return result[0].id as number; });
+});
+
+// Tests that the transaction has kept the type of its return value by referencing a method of number
+transactionReturnValue.then(value => value.toExponential);
+
 knex('users').count('active');
 
 knex('users').min('age');
@@ -456,7 +640,7 @@ knex.transaction(function(trx) {
 });
 
 // Using trx as a transaction object:
-knex.transaction(function(trx) {
+knex.transaction<{ length: number }>(function(trx) {
 
   trx.raw('');
 
@@ -503,6 +687,9 @@ knex.transaction(function(trx) {
   console.error(error);
 });
 
+// transacting handles undefined
+knex.insert({ name: 'Old Books'}).transacting(undefined);
+
 knex.schema.withSchema("public").hasTable("table") as Promise<boolean>;
 
 knex.schema.createTable('users', function (table) {
@@ -598,7 +785,7 @@ knex.select('name').from('users')
     console.log(rows);
   })
   .catch(function(error) {
-    console.error(error)
+    console.error(error);
   });
 
 knex.select('*').from('users').where({name: 'Tim'})
@@ -642,7 +829,7 @@ knex.select('name').from('users').limit(10).then(function (rows: any[]) {
     memo.names.push(row.name);
     memo.count++;
     return memo;
-  }, {count: 0, names: []})
+  }, {count: 0, names: []});
 }).then(function(obj: any) {
   console.log(obj);
 }).catch(function(e: Error) {
diff --git a/types/knex/tsconfig.json b/types/knex/tsconfig.json
index 8f0b7771d9..41e9ae905e 100644
--- a/types/knex/tsconfig.json
+++ b/types/knex/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "knex-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/knex/tslint.json b/types/knex/tslint.json
new file mode 100644
index 0000000000..cf7f07f094
--- /dev/null
+++ b/types/knex/tslint.json
@@ -0,0 +1,75 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/knockback/tslint.json b/types/knockback/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockback/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout-amd-helpers/index.d.ts b/types/knockout-amd-helpers/index.d.ts
index d12c8d9a8f..6f3a5493e1 100644
--- a/types/knockout-amd-helpers/index.d.ts
+++ b/types/knockout-amd-helpers/index.d.ts
@@ -2,10 +2,10 @@
 // Project: https://github.com/rniemeyer/knockout-amd-helpers
 // Definitions by: David Sichau <https://github.com/DavidSichau>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
-
 interface KnockoutAMDModule {
     baseDir: string;
     initializer: string;
diff --git a/types/knockout-amd-helpers/tslint.json b/types/knockout-amd-helpers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout-amd-helpers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout-secure-binding/index.d.ts b/types/knockout-secure-binding/index.d.ts
index 84a432738b..f7c7500cff 100644
--- a/types/knockout-secure-binding/index.d.ts
+++ b/types/knockout-secure-binding/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/brianmhunt/knockout-secure-binding
 // Definitions by: Pine Mizune <https://github.com/pine613>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
@@ -28,4 +29,4 @@ declare module "knockout-secure-binding" {
     };
 
     export = klass;
-}
\ No newline at end of file
+}
diff --git a/types/knockout-secure-binding/tslint.json b/types/knockout-secure-binding/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout-secure-binding/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout-transformations/index.d.ts b/types/knockout-transformations/index.d.ts
index 958eb99fb6..5fab318c1b 100644
--- a/types/knockout-transformations/index.d.ts
+++ b/types/knockout-transformations/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/One-com/knockout-transformations
 // Definitions by: John Reilly <https://github.com/johnnyreilly>, Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout-transformations/tslint.json b/types/knockout-transformations/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout-transformations/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.deferred.updates/index.d.ts b/types/knockout.deferred.updates/index.d.ts
index 89fb752089..c02f371277 100644
--- a/types/knockout.deferred.updates/index.d.ts
+++ b/types/knockout.deferred.updates/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mbest/knockout-deferred-updates
 // Definitions by: Sebastián Galiano <https://github.com/sgaliano>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
@@ -42,4 +43,4 @@ interface KnockoutUtils {
 // Deferred extender
 interface KnockoutExtenders {
     deferred(target: any, value: boolean): any;
-}
\ No newline at end of file
+}
diff --git a/types/knockout.deferred.updates/tslint.json b/types/knockout.deferred.updates/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.deferred.updates/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.editables/index.d.ts b/types/knockout.editables/index.d.ts
index 4a4ed59d3b..5167287e7e 100644
--- a/types/knockout.editables/index.d.ts
+++ b/types/knockout.editables/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://romanych.github.com/ko.editables/
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout.editables/tslint.json b/types/knockout.editables/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.editables/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.es5/index.d.ts b/types/knockout.es5/index.d.ts
index ce41db0d73..0ae2526c25 100644
--- a/types/knockout.es5/index.d.ts
+++ b/types/knockout.es5/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/SteveSanderson/knockout-es5
 // Definitions by: Sebastián Galiano <https://github.com/sgaliano>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout.es5/tslint.json b/types/knockout.es5/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.es5/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.kogrid/tslint.json b/types/knockout.kogrid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.kogrid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.mapper/index.d.ts b/types/knockout.mapper/index.d.ts
index 747a3d1f4a..d77f3e8f22 100644
--- a/types/knockout.mapper/index.d.ts
+++ b/types/knockout.mapper/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/LucasLorentz/knockout.mapper
 // Definitions by: Brandon Meyer <https://github.com/BMeyerKC>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout.mapper/tslint.json b/types/knockout.mapper/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.mapper/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.mapping/index.d.ts b/types/knockout.mapping/index.d.ts
index 23f7aae8b5..e6d5fe2f6c 100644
--- a/types/knockout.mapping/index.d.ts
+++ b/types/knockout.mapping/index.d.ts
@@ -1,7 +1,9 @@
 // Type definitions for Knockout.Mapping 2.0
 // Project: https://github.com/SteveSanderson/knockout.mapping
-// Definitions by: Boris Yankov <https://github.com/borisyankov>
+// Definitions by: Boris Yankov <https://github.com/borisyankov>, 
+//                 Mathias Lorenzen <https://github.com/ffMathy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
@@ -33,17 +35,25 @@ declare global {
         update?: (options: KnockoutMappingUpdateOptions) => void;
         key?: (data: any) => any;
     }
+    
+    type KnockoutObservableType<T> = {
+        [P in keyof T]: KnockoutObservable<T[P]>;
+    };
 
     interface KnockoutMapping {
         isMapped(viewModel: any): boolean;
-        fromJS(jsObject: any): any;
-        fromJS(jsObject: any, targetOrOptions: any): any;
-        fromJS(jsObject: any, inputOptions: any, target: any): any;
+        fromJS<T>(jsObject: T[]): KnockoutObservableType<T>[];
+        fromJS<T>(jsObject: T[], targetOrOptions: any): KnockoutObservableType<T>[];
+        fromJS<T>(jsObject: T[], inputOptions: any, target: any): KnockoutObservableType<T>[];
+        fromJS<T>(jsObject: T): KnockoutObservableType<T>;
+        fromJS<T>(jsObject: T, targetOrOptions: any): KnockoutObservableType<T>;
+        fromJS<T>(jsObject: T, inputOptions: any, target: any): KnockoutObservableType<T>;
         fromJSON(jsonString: string): any;
         fromJSON(jsonString: string, targetOrOptions: any): any;
         fromJSON(jsonString: string, inputOptions: any, target: any): any;
-        toJS(rootObject: any, options?: KnockoutMappingOptions): any;
-        toJSON(rootObject: any, options?: KnockoutMappingOptions): any;
+        toJS<T>(rootObject: KnockoutObservableArray<T>|T, options?: KnockoutMappingOptions): T[];
+        toJS<T>(rootObject: KnockoutObservableType<T>|T, options?: KnockoutMappingOptions): T;
+        toJSON(rootObject: any, options?: KnockoutMappingOptions): string;
         defaultOptions(): KnockoutMappingOptions;
         resetDefaultOptions(): void;
         getType(x: any): any;
diff --git a/types/knockout.mapping/tslint.json b/types/knockout.mapping/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.mapping/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.postbox/index.d.ts b/types/knockout.postbox/index.d.ts
index 56afa3a2b6..d7e967bcb9 100644
--- a/types/knockout.postbox/index.d.ts
+++ b/types/knockout.postbox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/rniemeyer/knockout-postbox
 // Definitions by: Judah Gabriel Himango <https://debuggerdotbreak.wordpress.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout.postbox/tslint.json b/types/knockout.postbox/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.postbox/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.projections/index.d.ts b/types/knockout.projections/index.d.ts
index aae8b55f57..bed2ac82ca 100644
--- a/types/knockout.projections/index.d.ts
+++ b/types/knockout.projections/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/stevesanderson/knockout-projections
 // Definitions by: John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout.projections/tslint.json b/types/knockout.projections/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.projections/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.punches/index.d.ts b/types/knockout.punches/index.d.ts
index aec2860bd9..c378d68c37 100644
--- a/types/knockout.punches/index.d.ts
+++ b/types/knockout.punches/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mbest/knockout.punches
 // Definitions by: Stephen Lautier <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout.punches/tslint.json b/types/knockout.punches/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.punches/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.rx/index.d.ts b/types/knockout.rx/index.d.ts
index 82a5473f1c..fea2c5175b 100644
--- a/types/knockout.rx/index.d.ts
+++ b/types/knockout.rx/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Igorbek/knockout.rx
 // Definitions by: Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout"/>
 /// <reference types="rx"/>
diff --git a/types/knockout.rx/tslint.json b/types/knockout.rx/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.rx/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.validation/index.d.ts b/types/knockout.validation/index.d.ts
index 8b0300bd7f..f16b88e607 100644
--- a/types/knockout.validation/index.d.ts
+++ b/types/knockout.validation/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ericmbarnard/Knockout-Validation
 // Definitions by: Dan Ludwig <https://github.com/danludwig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
@@ -95,6 +96,11 @@ interface KnockoutValidationConfiguration {
      * that ko observable's are bound to
      */
     writeInputAttributes?: boolean;
+    /**
+     * Supply the HTML5 input types validation will be
+     * added to. Defaults to ["email", "number", "date"]
+     */
+    html5InputTypes?: string[];
 }
 
 interface KnockoutValidationUtils {
diff --git a/types/knockout.validation/tslint.json b/types/knockout.validation/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.validation/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout.viewmodel/index.d.ts b/types/knockout.viewmodel/index.d.ts
index 5e57afb449..2ea6815531 100644
--- a/types/knockout.viewmodel/index.d.ts
+++ b/types/knockout.viewmodel/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://coderenaissance.github.com/knockout.viewmodel/
 // Definitions by: Oisin Grehan <https://github.com/oising>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/knockout.viewmodel/tslint.json b/types/knockout.viewmodel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockout.viewmodel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 4ef3bc8739..8d035ed8d2 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -1,12 +1,13 @@
 // Type definitions for Knockout v3.4.0
 // Project: http://knockoutjs.com
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-//                 Igor Oleinikov <https://github.com/Igorbek/>
-//                 Clément Bourgeois <https://github.com/moonpyk/>
-//                 Matt Brooks <https://github.com/EnableSoftware>
-//                 Benjamin Eckardt <https://github.com/BenjaminEckardt>
+// Definitions by: Boris Yankov <https://github.com/borisyankov>, 
+//                 Igor Oleinikov <https://github.com/Igorbek>, 
+//                 Clément Bourgeois <https://github.com/moonpyk>, 
+//                 Matt Brooks <https://github.com/EnableSoftware>, 
+//                 Benjamin Eckardt <https://github.com/BenjaminEckardt>, 
+//                 Mathias Lorenzen <https://github.com/ffMathy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 interface KnockoutExtensionFunctions {
     [key: string]: any;
diff --git a/types/knockout/test/index.ts b/types/knockout/test/index.ts
index e3f7820f94..36db7657ed 100644
--- a/types/knockout/test/index.ts
+++ b/types/knockout/test/index.ts
@@ -90,7 +90,7 @@ function test_computed() {
 }
 
 class GetterViewModel {
-    private _selectedRange: KnockoutObservable<any>;
+    private readonly _selectedRange: KnockoutObservable<any>;
 
     constructor() {
         this._selectedRange = ko.observable();
@@ -484,8 +484,8 @@ function test_mappingplugin() {
     ko.mapping.fromJS(data, {}, this);
 
     var alice, aliceMappingOptions, bob, bobMappingOptions;
-    var viewModel = ko.mapping.fromJS(alice, aliceMappingOptions);
-    ko.mapping.fromJS(bob, bobMappingOptions, viewModel);
+    var aliceViewModel = ko.mapping.fromJS(alice, aliceMappingOptions);
+    ko.mapping.fromJS(bob, bobMappingOptions, aliceViewModel);
 
     var obj;
     var result = ko.mapping.fromJS(obj, {
diff --git a/types/knockout/tslint.json b/types/knockout/tslint.json
new file mode 100644
index 0000000000..ece4c342d1
--- /dev/null
+++ b/types/knockout/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-eval": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knockstrap/tslint.json b/types/knockstrap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/knockstrap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts b/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts
index bf0933a5e1..4ee25c84ec 100644
--- a/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts
+++ b/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts
@@ -1,9 +1,9 @@
 class Server implements App {
-	private usersPlaying: { [nick: string]: number } = {};
+	private readonly usersPlaying = new Map<string, number>();
 	private isShuttingDown = false;
 
-	private htmlFile: HTMLFile = new HTMLFile('start.html');
-	private appContent: AppContent = AppContent.overlayContent(this.htmlFile, 243, 266);
+	private readonly htmlFile: HTMLFile = new HTMLFile('start.html');
+	private readonly appContent: AppContent = AppContent.overlayContent(this.htmlFile, 243, 266);
 
 	onAppStart() {
 		KnuddelsServer.getChannel()
@@ -21,11 +21,11 @@ class Server implements App {
 	}
 
 	onUserLeft(user: User) {
-		if (this.usersPlaying[user.getNick()] === 1) {
+		if (this.usersPlaying.get(user.getNick()) === 1) {
 			KnuddelsServer.getDefaultBotUser()
 				.transferKnuddel(user, new KnuddelAmount(1), 'Du hast den Channel verlassen.');
 
-			delete this.usersPlaying[user.getNick()];
+			this.usersPlaying.delete(user.getNick());
 		}
 	}
 
@@ -46,7 +46,7 @@ class Server implements App {
 						session.remove();
 					});
 
-				delete this.usersPlaying[key];
+				this.usersPlaying.delete(key);
 			}
 		}
 	}
@@ -61,7 +61,7 @@ class Server implements App {
 			knuddelTransfer.accept();
 		} else if (this.isShuttingDown) {
 			knuddelTransfer.reject('Du App nimmt gerade keine neuen Spieler an.');
-		} else if (this.usersPlaying[sender.getNick()]) {
+		} else if (this.usersPlaying.get(sender.getNick())) {
 			knuddelTransfer.reject('Du spielst bereits.');
 		} else if (knuddelTransfer.getKnuddelAmount().asNumber() !== 1) {
 			const botNick = KnuddelsServer.getDefaultBotUser()
@@ -75,7 +75,7 @@ class Server implements App {
 
 	onKnuddelReceived(user: User, receiver: User, knuddelAmount: KnuddelAmount) {
 		if (knuddelAmount.asNumber() === 1) {
-			this.usersPlaying[user.getNick()] = 1;
+			this.usersPlaying.set(user.getNick(), 1);
 			user.sendAppContent(this.appContent);
 		} else {
 			user.sendPrivateMessage('Vielen Dank für die Einzahlung.');
@@ -83,8 +83,8 @@ class Server implements App {
 	}
 
 	onEventReceived(user: User, key: string, data: string) {
-		if (key === 'selectedEntry' && this.usersPlaying[user.getNick()] === 1) {
-			this.usersPlaying[user.getNick()] = 2;
+		if (key === 'selectedEntry' && this.usersPlaying.get(user.getNick()) === 1) {
+			this.usersPlaying.set(user.getNick(), 2);
 
 			setTimeout(() => {
 				const doorNumber = parseInt(data[data.length - 1], 10);
@@ -116,7 +116,7 @@ class Server implements App {
 						.forEach((session: AppContentSession) => {
 							session.remove();
 						});
-					delete this.usersPlaying[user.getNick()];
+					this.usersPlaying.delete(user.getNick());
 				}, 4000);
 			}, 1500);
 		}
diff --git a/types/knuddels-userapps-api/tslint.json b/types/knuddels-userapps-api/tslint.json
index 07a8255955..3c7d3fe9c7 100644
--- a/types/knuddels-userapps-api/tslint.json
+++ b/types/knuddels-userapps-api/tslint.json
@@ -1,7 +1,10 @@
 {
 	"extends": "dtslint/dt.json",
 	"rules": {
-		// TODO
-		"no-mergeable-namespace": false
+		// TODOs
+		"no-mergeable-namespace": false,
+		"no-redundant-jsdoc": false,
+		"no-redundant-jsdoc-2": false,
+		"no-unnecessary-class": false
 	}
 }
diff --git a/types/ko.plus/tslint.json b/types/ko.plus/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ko.plus/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-basic-auth/index.d.ts b/types/koa-basic-auth/index.d.ts
index 9d3433f006..2e76f6325a 100644
--- a/types/koa-basic-auth/index.d.ts
+++ b/types/koa-basic-auth/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/basic-auth
 // Definitions by: Tobias Wolff <https://github.com/Tobias4872>
 // Definitions: https://github.com/Tobias4872/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 
diff --git a/types/koa-bodyparser/index.d.ts b/types/koa-bodyparser/index.d.ts
index fe6e3f23f9..042aa99ea3 100644
--- a/types/koa-bodyparser/index.d.ts
+++ b/types/koa-bodyparser/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/bodyparser
 // Definitions by: Jerry Chin <https://github.com/hellopao>
 // Definitions: https://github.com/hellopao/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/koa-bodyparser/tslint.json b/types/koa-bodyparser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-bodyparser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-cache-control/index.d.ts b/types/koa-cache-control/index.d.ts
index 19329fcfec..4a65630fad 100644
--- a/types/koa-cache-control/index.d.ts
+++ b/types/koa-cache-control/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/DaMouse404/koa-cache-control
 // Definitions by: Peter Safranek <https://github.com/pe8ter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 
diff --git a/types/koa-compress/index.d.ts b/types/koa-compress/index.d.ts
index 16ade4120f..24b7a1e1af 100644
--- a/types/koa-compress/index.d.ts
+++ b/types/koa-compress/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/compress
 // Definitions by: Jerry Chin <https://github.com/hellopao>
 // Definitions: https://github.com/hellopao/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/koa-compress/tslint.json b/types/koa-compress/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-compress/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-conditional-get/index.d.ts b/types/koa-conditional-get/index.d.ts
new file mode 100644
index 0000000000..3e4839fc88
--- /dev/null
+++ b/types/koa-conditional-get/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for koa-conditional-get 2.0
+// Project: https://github.com/koajs/conditional-get#readme
+// Definitions by: Matthew Bull <https://github.com/wingsbob>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as koa from 'koa';
+
+declare function koaConditionalGet(): koa.Middleware;
+
+export = koaConditionalGet;
diff --git a/types/koa-conditional-get/koa-conditional-get-tests.ts b/types/koa-conditional-get/koa-conditional-get-tests.ts
new file mode 100644
index 0000000000..a197ba7398
--- /dev/null
+++ b/types/koa-conditional-get/koa-conditional-get-tests.ts
@@ -0,0 +1,4 @@
+import Koa = require('koa');
+import conditional = require('koa-conditional-get');
+
+new Koa().use(conditional());
diff --git a/types/koa-conditional-get/tsconfig.json b/types/koa-conditional-get/tsconfig.json
new file mode 100644
index 0000000000..111408f39b
--- /dev/null
+++ b/types/koa-conditional-get/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-conditional-get-tests.ts"
+    ]
+}
diff --git a/types/koa-conditional-get/tslint.json b/types/koa-conditional-get/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-conditional-get/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-csrf/index.d.ts b/types/koa-csrf/index.d.ts
new file mode 100644
index 0000000000..268e261134
--- /dev/null
+++ b/types/koa-csrf/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for koa-csrf 3.0
+// Project: https://github.com/koajs/csrf
+// Definitions by: Haskaalo <https://github.com/haskaalo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/* =================== USAGE ===================
+import * as koaCsrf from 'koa-csrf';
+import * as Koa from "koa";
+const app = new Koa();
+
+app.use(new koaCsrf({
+    invalidSessionSecretMessage: 'Invalid session secret',
+    invalidSessionSecretStatusCode: 403,
+    invalidTokenMessage: 'Invalid CSRF token',
+    invalidTokenStatusCode: 403,
+    excludedMethods: [ 'GET', 'HEAD', 'OPTIONS' ],
+    disableQuery: false
+}));
+ =============================================== */
+
+export = koaCsrf;
+
+import { Middleware } from 'koa';
+
+declare module "koa" {
+    interface Request {
+        csrf: string;
+    }
+}
+
+declare const koaCsrf: {
+    new (opts?: {
+        invalidSessionSecretMessage?: string;
+        invalidSessionSecretStatusCode?: number;
+        invalidTokenMessage?: string;
+        invalidTokenStatusCode?: number;
+        excludedMethods?: string[];
+        disableQuery?: boolean;
+    }): Middleware;
+};
diff --git a/types/koa-csrf/koa-csrf-tests.ts b/types/koa-csrf/koa-csrf-tests.ts
new file mode 100644
index 0000000000..d0bb211b01
--- /dev/null
+++ b/types/koa-csrf/koa-csrf-tests.ts
@@ -0,0 +1,12 @@
+import koaCsrf = require("koa-csrf");
+import * as Koa from "koa";
+const app = new Koa();
+
+app.use(new koaCsrf({
+    invalidSessionSecretMessage: 'Invalid session secret',
+    invalidSessionSecretStatusCode: 403,
+    invalidTokenMessage: 'Invalid CSRF token',
+    invalidTokenStatusCode: 403,
+    excludedMethods: [ 'GET', 'HEAD', 'OPTIONS' ],
+    disableQuery: false
+}));
diff --git a/types/koa-csrf/tsconfig.json b/types/koa-csrf/tsconfig.json
new file mode 100644
index 0000000000..56e1cf81a8
--- /dev/null
+++ b/types/koa-csrf/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "strictFunctionTypes": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-csrf-tests.ts"
+    ]
+}
diff --git a/types/koa-csrf/tslint.json b/types/koa-csrf/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-csrf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-etag/index.d.ts b/types/koa-etag/index.d.ts
new file mode 100644
index 0000000000..807fd7803b
--- /dev/null
+++ b/types/koa-etag/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for koa-etag 3.0
+// Project: https://github.com/koajs/etag#readme
+// Definitions by: Matthew Bull <https://github.com/wingsbob>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as koa from 'koa';
+import * as etag from 'etag';
+
+declare function koaEtag(options?: etag.Options): koa.Middleware;
+
+export = koaEtag;
diff --git a/types/koa-etag/koa-etag-tests.ts b/types/koa-etag/koa-etag-tests.ts
new file mode 100644
index 0000000000..fa2d5515d6
--- /dev/null
+++ b/types/koa-etag/koa-etag-tests.ts
@@ -0,0 +1,8 @@
+import koaEtag = require('koa-etag');
+import * as Koa from 'koa';
+
+new Koa().use(koaEtag());
+
+new Koa().use(koaEtag({}));
+
+new Koa().use(koaEtag({ weak: true }));
diff --git a/types/koa-etag/tsconfig.json b/types/koa-etag/tsconfig.json
new file mode 100644
index 0000000000..d6b1feb52c
--- /dev/null
+++ b/types/koa-etag/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-etag-tests.ts"
+    ]
+}
diff --git a/types/koa-etag/tslint.json b/types/koa-etag/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-etag/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-favicon/index.d.ts b/types/koa-favicon/index.d.ts
index 57b3ae7ed3..3cb6af4551 100644
--- a/types/koa-favicon/index.d.ts
+++ b/types/koa-favicon/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/favicon
 // Definitions by: Jerry Chin <https://github.com/hellopao>
 // Definitions: https://github.com/hellopao/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/koa-favicon/tslint.json b/types/koa-favicon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-favicon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-hbs/tslint.json b/types/koa-hbs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-hbs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-helmet/index.d.ts b/types/koa-helmet/index.d.ts
index 3e862fe6e6..df4c880ba9 100644
--- a/types/koa-helmet/index.d.ts
+++ b/types/koa-helmet/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/venables/koa-helmet#readme
 // Definitions by: Nick Simmons <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import {
     IHelmetConfiguration,
diff --git a/types/koa-joi-router/index.d.ts b/types/koa-joi-router/index.d.ts
new file mode 100644
index 0000000000..bf3f387d31
--- /dev/null
+++ b/types/koa-joi-router/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for koa-joi-router 5.0
+// Project: https://github.com/koajs/joi-router
+// Definitions by: Matthew Bull <https://github.com/wingsbob>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import * as Koa from 'koa';
+import * as Joi from 'joi';
+
+interface Spec {
+    method: string;
+    path: string|RegExp;
+    handler: (ctx: createRouter.Context) => void;
+    validate?: {
+        type: string;
+        body?: Joi.AnySchema;
+        params?: Joi.AnySchema;
+        output?: {[status: number]: Joi.AnySchema};
+    };
+}
+
+interface createRouter {
+    (): createRouter.Router;
+    Joi: typeof Joi;
+}
+
+declare namespace createRouter {
+    interface Request extends Koa.Request {
+        body: any;
+        params: {[key: string]: string};
+    }
+
+    interface Context extends Koa.Context {
+        request: Request;
+    }
+
+    interface Router {
+        routes: Spec[];
+        route(spec: Spec|Spec[]): Router;
+        middleware(): Koa.Middleware;
+    }
+}
+
+declare var createRouter: createRouter;
+
+export = createRouter;
diff --git a/types/koa-joi-router/koa-joi-router-tests.ts b/types/koa-joi-router/koa-joi-router-tests.ts
new file mode 100644
index 0000000000..76a392bdec
--- /dev/null
+++ b/types/koa-joi-router/koa-joi-router-tests.ts
@@ -0,0 +1,77 @@
+import router = require('koa-joi-router');
+
+const { Joi } = router;
+
+const spec1 = {
+    path: '/user',
+    method: 'POST',
+    handler: (ctx: router.Context) => ctx.body = '',
+};
+
+router().route(spec1);
+
+const spec2 = {
+  method: 'PATCH',
+  path: '/user',
+  validate: {
+    type: 'json',
+  },
+  handler: (ctx: router.Context) => ctx.status = 201,
+};
+
+router().route(spec2);
+
+const spec3 = {
+  method: 'PATCH',
+  path: '/user',
+  validate: {
+    type: 'json',
+    body: Joi.any(),
+  },
+  handler: (ctx: router.Context) => ctx.status = 201,
+};
+
+router().route(spec3);
+
+const spec4 = {
+  method: 'PATCH',
+  path: '/user',
+  validate: {
+    type: 'json',
+    output: {
+      201: Joi.object(),
+    }
+  },
+  handler: (ctx: router.Context) => {
+    ctx.status = 201;
+    ctx.body = {};
+  },
+};
+
+router().route(spec4);
+
+const spec5 = {
+  method: 'PUT',
+  path: '/user',
+  handler: (ctx: router.Context) => {
+    ctx.status = 201;
+    ctx.body = ctx.request.body;
+  },
+};
+
+router().route(spec5);
+
+const spec6 = {
+  method: 'GET',
+  path: '/user',
+  handler: (ctx: router.Context) => {
+    ctx.status = 201;
+    ctx.body = ctx.request.params;
+  },
+};
+
+router().route(spec6);
+
+router().route([spec1, spec2, spec3]);
+
+router().routes.map(({ path }) => path);
diff --git a/types/koa-joi-router/tsconfig.json b/types/koa-joi-router/tsconfig.json
new file mode 100644
index 0000000000..a872570270
--- /dev/null
+++ b/types/koa-joi-router/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "files": [
+        "index.d.ts",
+        "koa-joi-router-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/koa-joi-router/tslint.json b/types/koa-joi-router/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/koa-joi-router/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/koa-json-error/index.d.ts b/types/koa-json-error/index.d.ts
index 5fc9618edf..b660e4c55f 100644
--- a/types/koa-json-error/index.d.ts
+++ b/types/koa-json-error/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/koajs/json-error
 // Definitions by: Mudkip <https://github.com/mudkipme>
 // Definitions: https://github.com/mudkipme/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 
diff --git a/types/koa-json/index.d.ts b/types/koa-json/index.d.ts
index aceecf721f..670b33be39 100644
--- a/types/koa-json/index.d.ts
+++ b/types/koa-json/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/json
 // Definitions by: Alex Friedman <https://github.com/brooklyndev>
 // Definitions: https://github.com/brooklyndev/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/koa-json/tslint.json b/types/koa-json/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-json/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-jwt/index.d.ts b/types/koa-jwt/index.d.ts
deleted file mode 100644
index 87b64bea58..0000000000
--- a/types/koa-jwt/index.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for koa-jwt 3.2
-// Project: https://github.com/koajs/jwt
-// Definitions by: Bruno Krebs <https://github.com/brunokrebs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import Koa = require("koa");
-
-export = jwt;
-
-declare function jwt(options: jwt.Options): jwt.Middleware;
-
-declare namespace jwt {
-    interface Options {
-        secret: string | Buffer | SecretProvider;
-        key?: string;
-        getToken?(opts: Options): string;
-        passthrough?: boolean;
-        cookie?: string;
-        debug?: boolean;
-    }
-
-    interface UnlessOptions {
-        method?: string | string[];
-        path?: string | string[] | RegExp | RegExp[];
-        ext?: string| string[];
-        custom?(ctx?: Koa.Context): boolean;
-        useOriginalUrl?: boolean;
-    }
-
-    type Middleware = Koa.Middleware & {
-        unless(options?: UnlessOptions): any;
-    };
-
-    type SecretProvider = (header: TokenHeader) => Promise<string>;
-
-    interface TokenHeader {
-      alg: string;
-      kid: string;
-      typ: string;
-    }
-}
diff --git a/types/koa-jwt/koa-jwt-tests.ts b/types/koa-jwt/koa-jwt-tests.ts
deleted file mode 100644
index cdfc25fffa..0000000000
--- a/types/koa-jwt/koa-jwt-tests.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import koa = require('koa');
-import jwt = require('koa-jwt');
-
-const app = new koa();
-
-app.use(jwt({
-    secret: 'some-secret-key'
-}));
-
-app.use(jwt({
-    secret: 'some-secret-key',
-    key: 'auth'
-}));
-
-app.use(jwt({
-    secret: 'some-secret-key'
-}).unless({method: 'OPTIONS'}));
-
-app.use(jwt({
-    secret: (header: jwt.TokenHeader): Promise<string> => {
-    	return Promise.resolve("some-secret-key");
-    }
-}));
diff --git a/types/koa-jwt/tsconfig.json b/types/koa-jwt/tsconfig.json
deleted file mode 100644
index 0348b0636b..0000000000
--- a/types/koa-jwt/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "koa-jwt-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/koa-logger-winston/index.d.ts b/types/koa-logger-winston/index.d.ts
index 687c3494fa..ccb63ccd68 100644
--- a/types/koa-logger-winston/index.d.ts
+++ b/types/koa-logger-winston/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/selbyk/koa-logger-winston#readme
 // Definitions by: Steve Hipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 
diff --git a/types/koa-logger/index.d.ts b/types/koa-logger/index.d.ts
index bd0d4174b0..4d593786c6 100644
--- a/types/koa-logger/index.d.ts
+++ b/types/koa-logger/index.d.ts
@@ -1,12 +1,14 @@
-// Type definitions for koa-logger v2.0
+// Type definitions for koa-logger 3.1
 // Project: https://github.com/koajs/logger
 // Definitions by: Joshua DeVinney <https://github.com/geoffreak>
+//                 Tomek �aziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-/// <reference types="koa"/>
+import {
+    Middleware,
+} from 'koa';
 
-import * as Koa from 'koa';
-
-declare function KoaLogger(): Koa.Middleware;
-declare namespace KoaLogger {}
+declare function KoaLogger(): Middleware;
+declare namespace KoaLogger { }
 export = KoaLogger;
diff --git a/types/koa-logger/tslint.json b/types/koa-logger/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/koa-logger/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/koa-morgan/index.d.ts b/types/koa-morgan/index.d.ts
index f9cbc249c0..f52baa788c 100644
--- a/types/koa-morgan/index.d.ts
+++ b/types/koa-morgan/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/koa-modules/morgan
 // Definitions by: Vesa Poikajärvi <https://github.com/vesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { IncomingMessage, ServerResponse } from 'http';
 import * as Koa from 'koa';
@@ -23,28 +23,22 @@ declare namespace morgan {
      * Public interface of morgan logger
      */
     interface KoaMorgan {
-        /***
+        /**
          * Create a new morgan logger middleware function using the given format and options. The
          * format argument may be a string of a predefined name (see below for the names),
          * or a string of a format string containing defined tokens.
-         * @param format
-         * @param options
          */
         (format: string, options?: Options): Koa.Middleware;
 
-        /***
+        /**
          * Standard Apache combined log output.
          * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
-         * @param format
-         * @param options
          */
         (format: 'combined', options?: Options): Koa.Middleware;
 
-        /***
+        /**
          * Standard Apache common log output.
          * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
-         * @param format
-         * @param options
          */
         (format: 'common', options?: Options): Koa.Middleware;
 
@@ -52,32 +46,24 @@ declare namespace morgan {
          * Concise output colored by response status for development use. The :status token will be colored red for
          * server error codes, yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
          * :method :url :status :response-time ms - :res[content-length]
-         * @param format
-         * @param options
          */
         (format: 'dev', options?: Options): Koa.Middleware;
 
-        /***
+        /**
          * Shorter than default, also including response time.
          * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
-         * @param format
-         * @param options
          */
         (format: 'short', options?: Options): Koa.Middleware;
 
-        /***
+        /**
          * The minimal output.
          * :method :url :status :res[content-length] - :response-time ms
-         * @param format
-         * @param options
          */
         (format: 'tiny', options?: Options): Koa.Middleware;
 
-        /***
+        /**
          * Create a new morgan logger middleware function using the given format and options. The format argument may be a
          * custom format function which adheres to the signature.
-         * @param format
-         * @param options
          */
         (format: FormatFn, options?: Options): Koa.Middleware;
 
@@ -124,88 +110,73 @@ declare namespace morgan {
 
     type StreamOptions = originalMorgan.StreamOptions;
 
-    /***
+    /**
      * Morgan accepts these properties in the options object.
      */
     interface Options {
-        /***
+        /**
          * Buffer duration before writing logs to the stream, defaults to false. When set to true, defaults to 1000 ms.
          */
         buffer?: boolean;
 
-        /***
+        /**
          * Write log line on request instead of response. This means that a requests will be logged even if the server
          * crashes, but data from the response cannot be logged (like the response code).
          */
         immediate?: boolean;
 
-        /***
+        /**
          * Function to determine if logging is skipped, defaults to false. This function will be called as skip(req, res).
          */
         skip?: (req: IncomingMessage, res: ServerResponse) => boolean;
 
-        /***
+        /**
          * Output stream for writing log lines, defaults to process.stdout.
-         * @param str
          */
         stream?: StreamOptions;
     }
 }
 
-/***
+/**
  * Create a new morgan logger middleware function using the given format and options. The format argument may be a string
  * of a predefined name (see below for the names), or a string of a format string containing defined tokens.
- * @param format
- * @param options
  */
 declare function morgan(format: string, options?: morgan.Options): Koa.Middleware;
 
-/***
+/**
  * Standard Apache combined log output.
  * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
- * @param format
- * @param options
  */
 declare function morgan(format: 'combined', options?: morgan.Options): Koa.Middleware;
 
-/***
+/**
  * Standard Apache common log output.
  * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
- * @param format
- * @param options
  */
 declare function morgan(format: 'common', options?: morgan.Options): Koa.Middleware;
 
-/***
+/**
  * Concise output colored by response status for development use. The :status token will be colored red for server error codes,
  * yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
  * :method :url :status :response-time ms - :res[content-length]
- * @param format
- * @param options
  */
 declare function morgan(format: 'dev', options?: morgan.Options): Koa.Middleware;
 
-/***
+/**
  * Shorter than default, also including response time.
  * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
- * @param format
- * @param options
  */
 declare function morgan(format: 'short', options?: morgan.Options): Koa.Middleware;
 
-/***
+/**
  * The minimal output.
  * :method :url :status :res[content-length] - :response-time ms
- * @param format
- * @param options
  */
 declare function morgan(format: 'tiny', options?: morgan.Options): Koa.Middleware;
 
-/***
+/**
  * Create a new morgan logger middleware function using the given format and options. The format argument may be a
  * custom format function which adheres to the signature.
- * @param format
- * @param options
  */
 declare function morgan(custom: (req: IncomingMessage, res: ServerResponse) => string): Koa.Middleware;
 
diff --git a/types/koa-mount/index.d.ts b/types/koa-mount/index.d.ts
index f0cec6f938..d408932bfc 100644
--- a/types/koa-mount/index.d.ts
+++ b/types/koa-mount/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/koajs/mount
 // Definitions by: AmirSaber Sharifi <https://github.com/amirsaber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 
diff --git a/types/koa-mount/tslint.json b/types/koa-mount/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-mount/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-passport/index.d.ts b/types/koa-passport/index.d.ts
index e3a318004a..d00635a462 100644
--- a/types/koa-passport/index.d.ts
+++ b/types/koa-passport/index.d.ts
@@ -1,7 +1,10 @@
-// Type definitions for koa-passport 2.x
+// Type definitions for koa-passport 4.0
 // Project: https://github.com/rkusa/koa-passport
 // Definitions by: horiuchi <https://github.com/horiuchi>
+//                 Tomek �aziuk <https://github.com/tlaziuk>
+//                 Tümay Çeber <https://github.com/brendtumi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
@@ -11,52 +14,51 @@
 
  =============================================== */
 
-import * as Koa from "koa";
+import {
+    Middleware,
+} from "koa";
+
+import * as passport from "passport";
+
 declare module "koa" {
     interface Context {
-        authInfo?: any;
-        user?: any;
-
-        login(user: any): Promise<void>;
-        login(user: any, options: Object): Promise<void>;
-        logIn(user: any): Promise<void>;
-        logIn(user: any, options: Object): Promise<void>;
+        login(user: any, options?: any): Promise<void>;
+        logIn: Context["login"];
 
         logout(): void;
-        logOut(): void;
+        logOut: Context["logout"];
 
         isAuthenticated(): boolean;
         isUnauthenticated(): boolean;
     }
 }
 
-import * as passport from "passport";
-
-interface KoaPassport {
-    use(strategy: passport.Strategy): this;
-    use(name: string, strategy: passport.Strategy): this;
-    unuse(name: string): this;
-    framework(fw: passport.Framework): this;
-    initialize(options?: { userProperty: string; }): Koa.Middleware;
-    session(options?: { pauseStream: boolean; }): Koa.Middleware;
-
-    authenticate(strategy: string, callback?: Function): Koa.Middleware;
-    authenticate(strategy: string, options: Object, callback?: Function): Koa.Middleware;
-    authenticate(strategies: string[], callback?: Function): Koa.Middleware;
-    authenticate(strategies: string[], options: Object, callback?: Function): Koa.Middleware;
-    authorize(strategy: string, callback?: Function): Koa.Middleware;
-    authorize(strategy: string, options: Object, callback?: Function): Koa.Middleware;
-    authorize(strategies: string[], callback?: Function): Koa.Middleware;
-    authorize(strategies: string[], options: Object, callback?: Function): Koa.Middleware;
-    serializeUser(fn: (user: any, done: (err: any, id: any) => void) => void): void;
-    deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
-    transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
-}
-declare const koaPassport: KoaPassport;
-
 declare namespace KoaPassport {
-    interface Profile extends passport.Profile { }
-    interface Framework extends passport.Framework { }
+    class KoaPassport {
+        use(strategy: passport.Strategy): this;
+        use(name: string, strategy: passport.Strategy): this;
+        unuse(name: string): this;
+        framework(fw: passport.Framework): this;
+        initialize(options?: { userProperty: string; }): Middleware;
+        session(options?: { pauseStream: boolean; }): Middleware;
+
+        authenticate(strategy: string | string[], callback?: (...args: any[]) => any): Middleware;
+        authenticate(strategy: string | string[], options: passport.AuthenticateOptions, callback?: (...args: any[]) => any): Middleware;
+        authorize(strategy: string | string[], callback?: (...args: any[]) => any): Middleware;
+        authorize(strategy: string | string[], options: any, callback?: (...args: any[]) => any): Middleware;
+
+        serializeUser: passport.Authenticator["serializeUser"];
+        deserializeUser: passport.Authenticator["deserializeUser"];
+        transformAuthInfo: passport.Authenticator["transformAuthInfo"];
+    }
+
+    interface Static extends KoaPassport {
+        KoaPassport: typeof KoaPassport;
+        Passport: typeof passport.Passport;
+        Authenticator: Static["Passport"];
+    }
 }
 
+declare const koaPassport: KoaPassport.Static;
+
 export = koaPassport;
diff --git a/types/koa-passport/koa-passport-tests.ts b/types/koa-passport/koa-passport-tests.ts
index eebb67a3b1..42827a85ba 100644
--- a/types/koa-passport/koa-passport-tests.ts
+++ b/types/koa-passport/koa-passport-tests.ts
@@ -2,13 +2,11 @@ import * as Koa from 'koa';
 import * as passport from 'koa-passport';
 
 const app = new Koa();
-let ctx: Koa.Context;
-
 
 app.use(passport.initialize());
 app.use(passport.session());
 
-app.use(async (ctx: Koa.Context): Promise<void> => {
+app.use(async (ctx): Promise<void> => {
     ctx.isAuthenticated();
     ctx.isUnauthenticated();
     ctx.login({});
@@ -16,8 +14,7 @@ app.use(async (ctx: Koa.Context): Promise<void> => {
     ctx.state.user;
 });
 
-
-app.use(async (ctx: Koa.Context, next: () => Promise<any>) => {
+app.use(async (ctx, next) => {
     return passport.authenticate('local', (user: any, info: any, status: any) => {
         if (user === false) {
             ctx.status = 401;
@@ -36,3 +33,4 @@ app.use(
     })
 );
 
+class KoaPasspordChild extends passport.KoaPassport { }
diff --git a/types/koa-passport/tslint.json b/types/koa-passport/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/koa-passport/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/koa-pino-logger/index.d.ts b/types/koa-pino-logger/index.d.ts
index 2ea66937b6..0994e7584a 100644
--- a/types/koa-pino-logger/index.d.ts
+++ b/types/koa-pino-logger/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/pinojs/koa-pino-logger
 // Definitions by: Cameron Yan <https://github.com/khell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 
diff --git a/types/koa-pug/index.d.ts b/types/koa-pug/index.d.ts
index f478072953..347e4004c7 100644
--- a/types/koa-pug/index.d.ts
+++ b/types/koa-pug/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/chrisyip/koa-pug
 // Definitions by: Xavier Stouder <https://github.com/Xstoudi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as koa from "koa";
 
diff --git a/types/koa-range/index.d.ts b/types/koa-range/index.d.ts
index f2b109b899..9240491f04 100644
--- a/types/koa-range/index.d.ts
+++ b/types/koa-range/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/koa-range
 // Definitions by: Sami Kukkonen <https://github.com/strax>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 declare const KoaRange: Koa.Middleware;
diff --git a/types/koa-redis/index.d.ts b/types/koa-redis/index.d.ts
index 1103665858..bdc3b99bfa 100644
--- a/types/koa-redis/index.d.ts
+++ b/types/koa-redis/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/koa-redis
 // Definitions by: Nick Simmons <https://github.com/nsimmons>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { ClientOpts } from 'redis';
 import { SessionStore } from 'koa-generic-session';
diff --git a/types/koa-route/index.d.ts b/types/koa-route/index.d.ts
index 4ee63b7b14..33840d2842 100644
--- a/types/koa-route/index.d.ts
+++ b/types/koa-route/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/koajs/route#readme
 // Definitions by: Mike Cook <https://github.com/migstopheles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Koa from 'koa';
 import * as pathToRegexp from 'path-to-regexp';
diff --git a/types/koa-route/package.json b/types/koa-route/package.json
index 9842b1ee29..4d72f691c8 100644
--- a/types/koa-route/package.json
+++ b/types/koa-route/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "path-to-regexp": "^1.7.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/koa-router/index.d.ts b/types/koa-router/index.d.ts
index 972c02014c..ab61772835 100644
--- a/types/koa-router/index.d.ts
+++ b/types/koa-router/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/alexmingoia/koa-router/
 // Definitions by: Jerry Chin <https://github.com/hellopao>, Pavel Ivanov <https://github.com/schfkt>
 // Definitions: https://github.com/hellopao/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
@@ -33,15 +34,25 @@ declare module Router {
 
     export interface IRouterOptions {
         /**
-         * Router prefixes 
+         * Prefix for all routes.
          */
         prefix?: string;
         /**
-         * HTTP verbs
+         * Methods which should be supported by the router.
          */
         methods?: string[];
         routerPath?: string;
+        /**
+         * Whether or not routing should be case-sensitive.
+         */
         sensitive?: boolean;
+        /**
+         * Whether or not routes should matched strictly.
+         *
+         * If strict matching is enabled, the trailing slash is taken into
+         * account when matching routes.
+         */
+        strict?: boolean;
     }
 
     export interface IRouterContext extends Koa.Context {
@@ -139,7 +150,7 @@ declare class Router {
      * "down" the middleware stack.
      */
     use(...middleware: Array<Router.IMiddleware>): Router;
-    use(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+    use(path: string | string[] | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
     /**
      * HTTP get method
@@ -208,7 +219,7 @@ declare class Router {
     /**
      * Returns router middleware which dispatches a route matching the request.
      */
-    middlewares(): Router.IMiddleware;
+    middleware(): Router.IMiddleware;
 
     /**
      * Returns separate middleware for responding to `OPTIONS` requests with
diff --git a/types/koa-router/tslint.json b/types/koa-router/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-router/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-send/index.d.ts b/types/koa-send/index.d.ts
index 521e96036e..a4b090e1ea 100644
--- a/types/koa-send/index.d.ts
+++ b/types/koa-send/index.d.ts
@@ -1,23 +1,46 @@
-// Type definitions for koa-send v3.3
+// Type definitions for koa-send 4.1
 // Project: https://github.com/koajs/send
 // Definitions by: Peter Safranek <https://github.com/pe8ter>
+//                 Tomek �aziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import * as Koa from 'koa';
+import {
+    Context,
+} from "koa";
 
-interface ISendOptions {
-    root?: string;
-    index?: string;
-    maxAge?: number;
-    hidden?: boolean;
-    format?: boolean;
-    gzip?: boolean;
-    setHeaders?: Function;
-    extensions?: string[];
+import {
+    Stats,
+} from "fs";
+
+declare function send(ctx: Context, path: string, opts?: send.SendOptions): Promise<string>;
+
+declare namespace send {
+    type SetHeaders = (res: Context["res"], path: string, stats: Stats) => any;
+
+    interface SendOptions {
+        /** Browser cache max-age in milliseconds. (defaults to 0) */
+        maxage?: number;
+        maxAge?: SendOptions["maxage"];
+        /** Tell the browser the resource is immutable and can be cached indefinitely. (defaults to false) */
+        immutable?: boolean;
+        /** Allow transfer of hidden files. (defaults to false) */
+        hidden?: boolean;
+        /** Root directory to restrict file access. (defaults to '') */
+        root?: string;
+        /** Name of the index file to serve automatically when visiting the root location. (defaults to none) */
+        index?: string | false;
+        /** Try to serve the gzipped version of a file automatically when gzip is supported by a client and if the requested file with .gz extension exists. (defaults to true). */
+        gzip?: boolean;
+        /** Try to serve the brotli version of a file automatically when brotli is supported by a client and if the requested file with .br extension exists. (defaults to true). */
+        brotli?: boolean;
+        /** If not false (defaults to true), format the path to serve static file servers and not require a trailing slash for directories, so that you can do both /directory and /directory/. */
+        format?: boolean;
+        /** Function to set custom headers on response. */
+        setHeaders?: SetHeaders;
+        /** Try to match extensions from passed array to search for file when no extension is sufficed in URL. First found is served. (defaults to false) */
+        extensions?: string[] | false;
+    }
 }
 
-declare function send(ctx: Koa.Context, path: string, opts?: ISendOptions): Promise<string>;
-
-declare namespace send {}
-
 export = send;
diff --git a/types/koa-send/koa-send-tests.ts b/types/koa-send/koa-send-tests.ts
index 88a6f16abb..a3b136ea9a 100644
--- a/types/koa-send/koa-send-tests.ts
+++ b/types/koa-send/koa-send-tests.ts
@@ -1,4 +1,3 @@
-
 import * as Koa from 'koa';
 import * as send from 'koa-send';
 
@@ -16,7 +15,7 @@ app.use(async (ctx: Koa.Context) => {
         hidden: true,
         format: true,
         gzip: true,
-        setHeaders: () => {},
+        setHeaders: () => { },
         extensions: ['shemp'],
     });
 });
diff --git a/types/koa-send/tslint.json b/types/koa-send/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/koa-send/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/koa-session-minimal/index.d.ts b/types/koa-session-minimal/index.d.ts
index 02d3a68004..dd3cf141b4 100644
--- a/types/koa-session-minimal/index.d.ts
+++ b/types/koa-session-minimal/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/longztian/koa-session-minimal
 // Definitions by: Longzhang Tian <https://github.com/longztian>
 // Definitions: https://github.com/hellopao/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/koa-session-minimal/tslint.json b/types/koa-session-minimal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa-session-minimal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa-session/index.d.ts b/types/koa-session/index.d.ts
index da08cc6464..bdc7d6b25b 100644
--- a/types/koa-session/index.d.ts
+++ b/types/koa-session/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/session
 // Definitions by: Yu Hsin Lu <https://github.com/kerol2r20>
 // Definitions: https://github.com/kerol2r20/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/koa-sslify/index.d.ts b/types/koa-sslify/index.d.ts
new file mode 100644
index 0000000000..0bf6c0a1ff
--- /dev/null
+++ b/types/koa-sslify/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for koa-sslify 2.1
+// Project: https://github.com/turboMaCk/koa-sslify#readme
+// Definitions by: Matthew Bull <https://github.com/wingsbob>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as koa from 'koa';
+
+declare namespace sslify {
+  interface Options {
+    trustProtoHeader?: boolean;
+    trustAzureHeader?: boolean;
+    port?: number;
+    hostname?: string;
+    ignoreUrl?: boolean;
+    temporary?: boolean;
+    redirectMethods?: string[];
+    internalRedirectMethods?: string[];
+    specCompliantDisallow?: boolean;
+  }
+}
+
+declare function sslify(options: sslify.Options): koa.Middleware;
+
+export = sslify;
diff --git a/types/koa-sslify/koa-sslify-tests.ts b/types/koa-sslify/koa-sslify-tests.ts
new file mode 100644
index 0000000000..c8dae23bb4
--- /dev/null
+++ b/types/koa-sslify/koa-sslify-tests.ts
@@ -0,0 +1,40 @@
+import Koa = require('koa');
+import sslify = require('koa-sslify');
+
+new Koa().use(sslify({}));
+
+new Koa().use(sslify({
+  trustAzureHeader: true,
+}));
+
+new Koa().use(sslify({
+  trustProtoHeader: true,
+}));
+
+new Koa().use(sslify({
+  specCompliantDisallow: true,
+}));
+
+new Koa().use(sslify({
+  port: 1234,
+}));
+
+new Koa().use(sslify({
+  hostname: 'my-host',
+}));
+
+new Koa().use(sslify({
+  temporary: false,
+}));
+
+new Koa().use(sslify({
+  internalRedirectMethods: ['GET'],
+}));
+
+new Koa().use(sslify({
+  redirectMethods: ['GET'],
+}));
+
+new Koa().use(sslify({
+  ignoreUrl: true,
+}));
diff --git a/types/koa-sslify/tsconfig.json b/types/koa-sslify/tsconfig.json
new file mode 100644
index 0000000000..64615e2ab9
--- /dev/null
+++ b/types/koa-sslify/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-sslify-tests.ts"
+    ]
+}
diff --git a/types/koa-sslify/tslint.json b/types/koa-sslify/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-sslify/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-static/index.d.ts b/types/koa-static/index.d.ts
index 06e8e09bf6..eaba7866c4 100644
--- a/types/koa-static/index.d.ts
+++ b/types/koa-static/index.d.ts
@@ -1,7 +1,9 @@
-// Type definitions for koa-static 3.0
+// Type definitions for koa-static 4.0
 // Project: https://github.com/koajs/static
 // Definitions by: Jerry Chin <https://github.com/hellopao>
-// Definitions: https://github.com/hellopao/DefinitelyTyped
+//                 Tomek �aziuk <https://github.com/tlaziuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
@@ -13,38 +15,17 @@
 
  =============================================== */
 
-import * as Koa from "koa";
+import { Middleware } from "koa";
 
-declare function serve(root: string, opts?: {
-    /**
-     * Default file name, defaults to 'index.html'
-     */
-    index?: boolean | string;
+import { SendOptions } from "koa-send";
 
-    /**
-     * If true, serves after return next(),allowing any downstream middleware to respond first.
-     */
-    defer?: boolean;
+declare function serve(root: string, opts?: serve.Options): Middleware;
 
-    /**
-     * Browser cache max-age in milliseconds. defaults to 0
-     */
-    maxage?: number;
+declare namespace serve {
+    interface Options extends SendOptions {
+        /** If true, serves after return next(), allowing any downstream middleware to respond first. */
+        defer?: boolean;
+    }
+}
 
-    /**
-     * Allow transfer of hidden files. defaults to false
-     */
-    hidden?: boolean;
-
-    /**
-     * Try to serve the gzipped version of a file automatically when gzip is supported by a client and if the requested file with .gz extension exists. defaults to true.
-     */
-    gzip?: boolean;
-
-    /**
-     * Try to match extensions from passed array to search for file when no extension is sufficed in URL. First found is served. (defaults to `false`)
-     */
-    extensions?: string[];
-}): Koa.Middleware;
-declare namespace serve {}
 export = serve;
diff --git a/types/koa-static/koa-static-tests.ts b/types/koa-static/koa-static-tests.ts
index 2bcb0ae030..9b0d756f7d 100644
--- a/types/koa-static/koa-static-tests.ts
+++ b/types/koa-static/koa-static-tests.ts
@@ -4,9 +4,9 @@ import serve = require("koa-static");
 const app = new Koa();
 
 app.use(serve('.', {
-  index: false,
-  defer: false,
-  extensions: ['html']
+    index: false,
+    defer: false,
+    extensions: ['html'],
 }));
 
 app.listen(80);
diff --git a/types/koa-views/index.d.ts b/types/koa-views/index.d.ts
index e89a2d7cf8..ecbf019a59 100644
--- a/types/koa-views/index.d.ts
+++ b/types/koa-views/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/queckezz/koa-views
 // Definitions by: Alex Friedman <https://github.com/brooklyndev>
 // Definitions: https://github.com/brooklyndev/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
diff --git a/types/koa-webpack/index.d.ts b/types/koa-webpack/index.d.ts
new file mode 100644
index 0000000000..b425956f03
--- /dev/null
+++ b/types/koa-webpack/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for koa-webpack 1.0
+// Project: https://github.com/shellscape/koa-webpack#readme
+// Definitions by: Luka Maljic <https://github.com/malj>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import Koa = require('koa');
+import webpack = require('webpack');
+import webpackDevMiddleware = require('webpack-dev-middleware');
+import webpackHotMiddleware = require('webpack-hot-middleware');
+import connect = require('connect');
+
+declare function koaWebpack(
+    options?: koaWebpack.Options
+): Koa.Middleware & koaWebpack.CombinedWebpackMiddleware;
+
+declare namespace koaWebpack {
+    interface Options {
+        compiler?: webpack.Compiler;
+        config?: webpack.Configuration;
+        dev?: webpackDevMiddleware.Options;
+        hot?: webpackHotMiddleware.Options;
+    }
+
+    interface CombinedWebpackMiddleware {
+        dev: connect.NextHandleFunction & webpackDevMiddleware.WebpackDevMiddleware;
+        hot: connect.NextHandleFunction & webpackHotMiddleware.EventStream;
+    }
+}
+
+export = koaWebpack;
diff --git a/types/koa-webpack/koa-webpack-tests.ts b/types/koa-webpack/koa-webpack-tests.ts
new file mode 100644
index 0000000000..12062302de
--- /dev/null
+++ b/types/koa-webpack/koa-webpack-tests.ts
@@ -0,0 +1,45 @@
+import Koa = require('koa');
+import webpack = require('webpack');
+import koaWebpack = require('koa-webpack');
+
+const app = new Koa();
+const config: webpack.Configuration = {};
+const compiler = webpack(config);
+
+// Using the middleware
+
+const middleware = koaWebpack({
+    compiler,
+    config,
+    dev: {
+        lazy: true,
+        watchOptions: {
+            aggregateTimeout: 300,
+            poll: true,
+        },
+        publicPath: '/assets/',
+        index: 'index.html',
+        headers: {
+            'X-Custom-Header': 'yes'
+        },
+        stats: {
+            colors: true,
+        },
+        reporter: null,
+        serverSideRender: false
+    },
+    hot: {
+        log: console.log.bind(console),
+        path: '/__what',
+        heartbeat: 2000
+    }
+});
+
+app.use(middleware);
+
+// Accessing the underlying middleware
+
+middleware.dev.close();
+middleware.dev.invalidate();
+middleware.dev.waitUntilValid();
+middleware.hot.publish(null);
diff --git a/types/koa-webpack/tsconfig.json b/types/koa-webpack/tsconfig.json
new file mode 100644
index 0000000000..d3cef374db
--- /dev/null
+++ b/types/koa-webpack/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-webpack-tests.ts"
+    ]
+}
diff --git a/types/koa-webpack/tslint.json b/types/koa-webpack/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-webpack/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-websocket/index.d.ts b/types/koa-websocket/index.d.ts
index 115dbb43f6..326f098ae5 100644
--- a/types/koa-websocket/index.d.ts
+++ b/types/koa-websocket/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kudos/koa-websocket
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Koa from 'koa';
 import * as ws from 'ws';
diff --git a/types/koa/index.d.ts b/types/koa/index.d.ts
index 0fd2b73edd..1203864c8c 100644
--- a/types/koa/index.d.ts
+++ b/types/koa/index.d.ts
@@ -1,7 +1,10 @@
 // Type definitions for Koa 2.x
 // Project: http://koajs.com
-// Definitions by: DavidCai1993 <https://github.com/DavidCai1993>, jKey Lu <https://github.com/jkeylu>
+// Definitions by: DavidCai1993 <https://github.com/DavidCai1993>
+//                 jKey Lu <https://github.com/jkeylu>
+//                 Brice Bernard <https://github.com/brikou>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
@@ -14,20 +17,22 @@
 
  =============================================== */
 /// <reference types="node" />
-import { EventEmitter } from 'events';
-import { IncomingMessage, ServerResponse, Server } from 'http';
-import { Socket, ListenOptions } from 'net';
-import * as compose from 'koa-compose';
-import * as Keygrip from 'keygrip';
-import * as httpAssert from 'http-assert';
-import * as Cookies from 'cookies';
-import * as accepts from 'accepts';
+import * as accepts from "accepts";
+import * as Cookies from "cookies";
+import { EventEmitter } from "events";
+import { IncomingMessage, ServerResponse, Server } from "http";
+import * as httpAssert from "http-assert";
+import * as Keygrip from "keygrip";
+import * as compose from "koa-compose";
+import { Socket, ListenOptions } from "net";
+import * as url from "url";
 
 declare interface ContextDelegatedRequest {
     /**
      * Return request header.
      */
     header: any;
+
     /**
      * Return request header, alias as request.header
      */
@@ -79,7 +84,6 @@ declare interface ContextDelegatedRequest {
      */
     search: string;
 
-
     /**
      * Parse the "Host" header field host
      * and support X-Forwarded-Host when a
@@ -94,6 +98,11 @@ declare interface ContextDelegatedRequest {
      */
     hostname: string;
 
+    /**
+     * Get WHATWG parsed URL object.
+     */
+    URL: url.URL;
+
     /**
      * Check if the request is fresh, aka
      * Last-Modified and/or the ETag
@@ -135,6 +144,11 @@ declare interface ContextDelegatedRequest {
      */
     secure: boolean;
 
+    /**
+     * Request remote address. Supports X-Forwarded-For when app.proxy is true.
+     */
+    ip: string;
+
     /**
      * When `app.proxy` is `true`, parse
      * the "X-Forwarded-For" ip address list.
@@ -382,7 +396,7 @@ declare interface ContextDelegatedResponse {
      *    this.set('Accept', 'application/json');
      *    this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
      */
-    set(field: { [key: string]: string; }): void;
+    set(field: { [key: string]: string }): void;
     set(field: string, val: string | string[]): void;
 
     /**
@@ -434,17 +448,36 @@ declare class Application extends EventEmitter {
      *
      *    http.createServer(app.callback()).listen(...)
      */
-    listen(port?: number, hostname?: string, backlog?: number, listeningListener?: () => void): Server;
-    listen(port: number, hostname?: string, listeningListener?: () => void): Server;
-    /* tslint:disable:unified-signatures */
-    listen(port: number, backlog?: number, listeningListener?: () => void): Server;
+    listen(
+        port?: number,
+        hostname?: string,
+        backlog?: number,
+        listeningListener?: () => void,
+    ): Server;
+    listen(
+        port: number,
+        hostname?: string,
+        listeningListener?: () => void,
+    ): Server;
+    listen(
+        port: number,
+        backlog?: number,
+        listeningListener?: () => void,
+    ): Server;
     listen(port: number, listeningListener?: () => void): Server;
-    listen(path: string, backlog?: number, listeningListener?: () => void): Server;
+    listen(
+        path: string,
+        backlog?: number,
+        listeningListener?: () => void,
+    ): Server;
     listen(path: string, listeningListener?: () => void): Server;
     listen(options: ListenOptions, listeningListener?: () => void): Server;
-    listen(handle: any, backlog?: number, listeningListener?: () => void): Server;
+    listen(
+        handle: any,
+        backlog?: number,
+        listeningListener?: () => void,
+    ): Server;
     listen(handle: any, listeningListener?: () => void): Server;
-    /* tslint:enable:unified-signatures*/
 
     /**
      * Return JSON representation.
@@ -476,7 +509,10 @@ declare class Application extends EventEmitter {
      *
      * @api private
      */
-    createContext(req: IncomingMessage, res: ServerResponse): Application.Context;
+    createContext(
+        req: IncomingMessage,
+        res: ServerResponse,
+    ): Application.Context;
 
     /**
      * Default error handler.
@@ -572,7 +608,9 @@ declare namespace Application {
         toJSON(): any;
     }
 
-    interface BaseContext extends ContextDelegatedRequest, ContextDelegatedResponse {
+    interface BaseContext
+        extends ContextDelegatedRequest,
+            ContextDelegatedResponse {
         /**
          * util.inspect() implementation, which
          * just returns the JSON output.
@@ -620,6 +658,8 @@ declare namespace Application {
          * Default error handling.
          */
         onerror(err: Error): void;
+
+        [key: string]: any;
     }
 
     interface Request extends BaseRequest {
diff --git a/types/koa/koa-tests.ts b/types/koa/koa-tests.ts
index 1b261fdf44..6dbc073bea 100644
--- a/types/koa/koa-tests.ts
+++ b/types/koa/koa-tests.ts
@@ -1,21 +1,27 @@
-
 import * as Koa from "koa";
 
 const app = new Koa();
 
+app.context.db = () => {};
+
+app.use(async ctx => {
+    console.log(ctx.db);
+});
+
 app.use((ctx, next) => {
-  const start: any = new Date();
-  return next().then(() => {
-    const end: any = new Date();
-    const ms = end - start;
-    console.log(`${ctx.method} ${ctx.url} - ${ms}ms`);
-    ctx.assert(true, 404, 'Yep!');
-  });
+    const start: any = new Date();
+    return next().then(() => {
+        const end: any = new Date();
+        const ms = end - start;
+        console.log(`${ctx.method} ${ctx.url} - ${ms}ms`);
+        ctx.assert(true, 404, "Yep!");
+    });
 });
 
 // response
 app.use(ctx => {
-  ctx.body = "Hello World";
+    ctx.body = "Hello World";
+    ctx.body = ctx.URL.toString();
 });
 
 app.listen(3000);
diff --git a/types/koa/tslint.json b/types/koa/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/koa/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/koa2-cors/index.d.ts b/types/koa2-cors/index.d.ts
new file mode 100644
index 0000000000..93409e846e
--- /dev/null
+++ b/types/koa2-cors/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for koa2-cors 2.0
+// Project: https://github.com/zadzbw/koa2-cors#readme
+// Definitions by: xialeistudio <https://github.com/xialeistudio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as Koa from 'koa';
+declare namespace cors {
+    interface Options {
+        origin?: string | ((ctx: Koa.Context) => boolean | string);
+        exposeHeaders?: string[];
+        maxAge?: number;
+        credentials?: boolean;
+        allowMethods?: string[];
+        allowHeaders?: string[];
+    }
+}
+
+declare function cors(options?: cors.Options): Koa.Middleware;
+
+export = cors;
diff --git a/types/koa2-cors/koa2-cors-tests.ts b/types/koa2-cors/koa2-cors-tests.ts
new file mode 100644
index 0000000000..820722d635
--- /dev/null
+++ b/types/koa2-cors/koa2-cors-tests.ts
@@ -0,0 +1,18 @@
+import * as Koa from 'koa';
+import * as cors from 'koa2-cors';
+
+const app = new Koa();
+app.use(cors({
+    origin(ctx: Koa.Context) {
+        if (ctx.url === '/test') {
+            return false;
+        }
+        return '*';
+    },
+    exposeHeaders: ['WWW-Authenticate', 'Server-Authorization'],
+    maxAge: 5,
+    credentials: true,
+    allowMethods: ['GET', 'POST', 'DELETE'],
+    allowHeaders: ['Content-Type', 'Authorization', 'Accept'],
+}));
+app.listen(3000);
diff --git a/types/koa2-cors/tsconfig.json b/types/koa2-cors/tsconfig.json
new file mode 100644
index 0000000000..6c1a4b2374
--- /dev/null
+++ b/types/koa2-cors/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "strictFunctionTypes": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa2-cors-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/koa2-cors/tslint.json b/types/koa2-cors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa2-cors/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa__cors/index.d.ts b/types/koa__cors/index.d.ts
index c7dc10bad4..25d337716e 100644
--- a/types/koa__cors/index.d.ts
+++ b/types/koa__cors/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/koajs/cors
 // Definitions by: Xavier Stouder <https://github.com/Xstoudi>, Izayoi Ko <https://github.com/izayoiko>, Steve Hipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 
diff --git a/types/kolite/knockout.activity.d.ts b/types/kolite/knockout.activity.d.ts
index 8a1f1a0fac..8022e18cff 100644
--- a/types/kolite/knockout.activity.d.ts
+++ b/types/kolite/knockout.activity.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/CodeSeven/kolite
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="knockout" />
diff --git a/types/kolite/knockout.command.d.ts b/types/kolite/knockout.command.d.ts
index ff509dbd16..786bbcfaae 100644
--- a/types/kolite/knockout.command.d.ts
+++ b/types/kolite/knockout.command.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/CodeSeven/kolite
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="knockout" />
diff --git a/types/kolite/knockout.dirtyFlag.d.ts b/types/kolite/knockout.dirtyFlag.d.ts
index 1c63ce8b7d..3999f833ae 100644
--- a/types/kolite/knockout.dirtyFlag.d.ts
+++ b/types/kolite/knockout.dirtyFlag.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/CodeSeven/kolite
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="knockout" />
@@ -10,9 +10,14 @@
 // DirtyFlag /////////////////////////////////////////////
 
 interface DirtyFlag {
-    isDirty: KnockoutComputed<boolean>;
     new (objectToTrack: any, isInitiallyDirty?: boolean, hashFunction?: () => any): any;
+    (): DirtyFlagResult;
+}
+
+interface DirtyFlagResult {
+    isDirty: KnockoutComputed<boolean>;
     reset(): void;
+    forceDirty(): void; 
 }
 
 interface KnockoutStatic {
diff --git a/types/kolite/tslint.json b/types/kolite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/kolite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/konami.js/tslint.json b/types/konami.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/konami.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/kraken-js/index.d.ts b/types/kraken-js/index.d.ts
new file mode 100644
index 0000000000..0980e31eb1
--- /dev/null
+++ b/types/kraken-js/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for krakenjs 2.2
+// Project: http://krakenjs.com
+// Definitions by: Timur Manyanov <https://github.com/darkwebdev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { Express } from 'express';
+import { EventEmitter } from 'events';
+
+declare function k(options?: k.Options | string): Express;
+
+declare namespace k {
+    interface Kraken extends Express, EventEmitter {
+        kraken: Kraken;
+    }
+
+    interface Options {
+        protocols?: object;
+        basedir?: string;
+        configdir?: string;
+        mountpath?: string;
+        inheritViews?: boolean;
+        startupHeaders?: { [key: string]: string; };
+        onconfig?(config: Map<string, any>, next: (err: Error | null, config?: object) => any): any;
+        uncaughtException?(err: Error): any;
+    }
+}
+
+export = k;
diff --git a/types/kraken-js/kraken-js-tests.ts b/types/kraken-js/kraken-js-tests.ts
new file mode 100644
index 0000000000..f3b7eea8c7
--- /dev/null
+++ b/types/kraken-js/kraken-js-tests.ts
@@ -0,0 +1,72 @@
+import express = require('express');
+import kraken = require('kraken-js');
+import * as http from 'http';
+import * as https from 'https';
+import { readFile } from 'fs';
+
+const app = express() as kraken.Kraken;
+
+// $ExpectType Express
+kraken();
+
+// $ExpectType Express
+kraken('path/to/options');
+
+// $ExpectType Express
+kraken({
+    basedir: __dirname,
+    onconfig(config, next) {
+        config.get('view engines:js:renderer:arguments').push(app);
+        config.set('some:string', '/foo');
+        config.set('some:complex:type', [{
+            uncaughtException(error: Error) {
+                next(error);
+            }
+        }]);
+        next(null, config);
+    },
+    protocols: {
+        file(value: string, callback: any) {
+            readFile(value, 'utf8', callback);
+        }
+    },
+    startupHeaders: {
+        'Custom-Header1': 'Header1',
+        'Custom-Header2': 'Header2'
+    },
+    uncaughtException(err) {
+        console.error(err);
+    }
+});
+
+// $ExpectType Kraken
+app.use(kraken());
+
+// $ExpectType Kraken
+app.use(kraken(__dirname));
+
+// $ExpectType Kraken
+app.use(kraken({
+    configdir: 'config',
+    protocols: {
+        custom(value: any) {
+            return `Hello, ${ value }!`;
+        }
+    }
+}));
+
+app.listen(8080, (err?: Error) => {
+    console.log('[%s] Listening on http://localhost:%d', app.settings.env, 8080);
+});
+
+new Promise(resolve => {
+    // $ExpectType Kraken
+    app.once('event', resolve);
+});
+
+// $ExpectType any
+app.kraken.get('configProp');
+
+http.createServer(app);
+
+https.createServer({}, app);
diff --git a/types/kraken-js/tsconfig.json b/types/kraken-js/tsconfig.json
new file mode 100644
index 0000000000..2fce7a799d
--- /dev/null
+++ b/types/kraken-js/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "kraken-js-tests.ts"
+    ]
+}
diff --git a/types/kraken-js/tslint.json b/types/kraken-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/kraken-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/kue/index.d.ts b/types/kue/index.d.ts
index 2b7d7015b8..35c7a1c475 100644
--- a/types/kue/index.d.ts
+++ b/types/kue/index.d.ts
@@ -4,6 +4,7 @@
 //                 Amiram Korach <https://github.com/amiram>
 //                 Christian D. <https://github.com/pc-jedi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/kue/tslint.json b/types/kue/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/kue/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lab/tslint.json b/types/lab/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lab/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ladda/tslint.json b/types/ladda/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ladda/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lasso/index.d.ts b/types/lasso/index.d.ts
new file mode 100644
index 0000000000..a29f0af431
--- /dev/null
+++ b/types/lasso/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for lasso 2.4
+// Project: https://github.com/lasso-js/lasso
+// Definitions by: Timur Manyanov <https://github.com/darkwebdev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export * from './lib';
diff --git a/types/lasso/lasso-tests.ts b/types/lasso/lasso-tests.ts
new file mode 100644
index 0000000000..a41deb0aed
--- /dev/null
+++ b/types/lasso/lasso-tests.ts
@@ -0,0 +1,219 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { transforms, configure, create, lassoPage, getDefaultLasso, writers } from 'lasso';
+import LassoContext from 'lasso/lib/LassoContext';
+import LassoPageResult from 'lasso/lib/LassoPageResult';
+import { serveStatic } from 'lasso/middleware';
+import { enable } from 'lasso/node-require-no-op';
+
+// configure() tests
+
+// $ExpectType void
+configure('lasso-config.json');
+
+// $ExpectType void
+configure({});
+
+// $ExpectType void
+configure({
+    cspNonceProvider(out) {
+        const res = out.stream;
+
+        return res.csp && res.csp.nonce;
+    }
+});
+
+// $ExpectType void
+configure({
+    require: {
+        extensions: [ '.js' ],
+        transforms: [ 'deamdify' ]
+    }
+});
+
+// $ExpectType Lasso
+create({});
+
+const lasso = getDefaultLasso();
+// $ExpectType Lasso
+lasso;
+
+// $ExpectType Promise<any>
+lassoPage({
+    name: 'my-page',
+    dependencies: [
+        './style.less',
+        'require-run: ./main'
+    ]
+},
+(err, lassoPageResult) => {
+    if (err) {
+        console.log('Failed to lasso page: ', err);
+        return;
+    }
+
+    // $ExpectType string
+    lassoPageResult.getHeadHtml();
+
+    // $ExpectType string
+    lassoPageResult.getBodyHtml();
+});
+
+lassoPage({
+    dependencies: [{
+        path: './hello-mobile.js',
+        'if-flag': 'mobile'
+    }],
+    flags: ['mobile', 'foo', 'bar']
+});
+
+// $ExpectType Lasso
+lasso.on('afterLassoPage', (event) => {
+    const lassoPageResult: LassoPageResult = event.result;
+    const fingerprints = lassoPageResult.getInlineCodeFingerprints();
+    // $ExpectType string
+    fingerprints.map(fingerprint => `script-src 'self' 'sha256-${fingerprint}'`).join('; ');
+});
+
+const dependencies = lasso.dependencies;
+
+// Register new types
+
+// $ExpectType void
+dependencies.registerJavaScriptType('my-js-type', require('./dependency-my-js-type')); // tslint:disable-line: no-var-requires
+
+// $ExpectType void
+dependencies.registerJavaScriptType('my-custom-type', {
+    properties: {
+        path: 'string'
+    },
+
+    init(context: any, callback: any) {
+        if (!this.path) {
+            throw new Error('"path" is required');
+        }
+
+        this.path = this.resolvePath(this.path);
+        callback();
+    },
+
+    read(context: any, callback: any) {
+        const path = this.path;
+
+        fs.readFile(path, {encoding: 'utf8'}, (err, src) => {
+            if (err) {
+                return callback(err);
+            }
+
+            // myCompiler.compile(src, callback);
+        });
+    },
+
+    getSourceFile() {
+        return this.path;
+    }
+});
+
+// $ExpectType void
+dependencies.registerStyleSheetType('my-custom-type', {});
+
+// $ExpectType void
+dependencies.registerPackageType('dir', {
+    properties: {
+        path: 'string'
+    },
+
+    init(context: any, callback: any) {
+        let path = this.path;
+
+        if (!path) {
+            callback(new Error('"path" is required'));
+        }
+
+        this.path = path = this.resolvePath(path);
+
+        fs.stat(path, (err, stat) => {
+            if (err) {
+                return callback(err);
+            }
+
+            if (!stat.isDirectory()) {
+                return callback(new Error('Directory expected: ' + path));
+            }
+
+            callback();
+        });
+    },
+
+    getDependencies(context: any, callback: any) {
+        const dir = this.path;
+
+        fs.readdir(dir, (err, filenames) => {
+            if (err) {
+                return callback(err);
+            }
+
+            const dependencies = filenames.map(filename => path.join(dir, filename));
+
+            callback(null, dependencies);
+        });
+    },
+
+    getDir() {
+        return this.path;
+    }
+});
+
+// $ExpectType void
+dependencies.registerRequireExtension('test', (path: string, context: any, callback: any) => {
+    callback(null, "exports.sayHello = function() { console.log('Hello!'); }");
+});
+
+// $ExpectType void
+lasso.lassoResource('path/to/foo.png', (err: any, result: any) => {
+    if (err) {
+        console.log(err);
+    } else {
+        const url = result.url;
+    }
+});
+
+// Transformer tests
+
+// $ExpectType void
+lasso.addTransform(require('./my-transform')); // tslint:disable-line: no-var-requires
+
+// $ExpectType void
+lasso.addTransform({
+    contentType: 'js',
+    name: module.id,
+    stream: false,
+    transform(code: string, lassoContext: LassoContext) {
+        return code.toUpperCase();
+    }
+});
+
+// $ExpectType void
+transforms.createTransformer([], new LassoContext(), (err, result) => {});
+
+// Middleware tests
+
+// $ExpectType RequestHandler
+serveStatic();
+
+// $ExpectType RequestHandler
+serveStatic({
+    lasso,
+    sendOptions: {}
+});
+
+// node-require-no-op tests
+
+// $ExpectType void
+enable();
+
+// Writer tests
+
+// $ExpectType Writer
+writers.createWriter({});
diff --git a/types/lasso/lib/Lasso.d.ts b/types/lasso/lib/Lasso.d.ts
new file mode 100644
index 0000000000..56e0d195f5
--- /dev/null
+++ b/types/lasso/lib/Lasso.d.ts
@@ -0,0 +1,79 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import LassoContext from './LassoContext';
+import { Bundle, DependencyConfig, DependencyRegistry } from './dependencies';
+import { writers } from '../index';
+import LassoPageResult from './LassoPageResult';
+
+export interface PageConfig {
+    name?: string;
+    dependencies: DependencyConfig[] | string[] | string | null;
+    flags?: string[];
+    from?: string;
+    packagePath?: string;
+    packagePaths?: string[];
+    lassoContext?: LassoContext;
+    cache?: any;
+    cacheKey?: string;
+    pageName?: string;
+    data?: any;
+}
+
+export type Callback = (err: Error | null, result?: any) => any;
+export type LassoPage = (options: PageConfig, callback?: (err: Error | null, result: LassoPageResult) => void) => Promise<any>;
+export type LassoResource = (path: string, options?: any, callback?: Callback) => void;
+
+export interface CustomPlugin {
+    plugin: string;
+    config: any;
+}
+
+export interface LassoConfig {
+    baseDir?: string;
+    plugins?: string[] | CustomPlugin[];
+    require?: any;
+    outputDir?: string;
+    urlPrefix?: string;
+    fingerprintsEnabled?: boolean;
+    includeSlotNames?: boolean;
+    minify?: boolean;
+    minifyJS?: boolean;
+    minifyCSS?: boolean;
+    minifyInlineOnly?: boolean;
+    minifyInlineJSOnly?: boolean;
+    minifyInlineCSSOnly?: boolean;
+    resolveCssUrls?: boolean;
+    relativeUrlsEnabled?: boolean;
+    bundlingEnabled?: boolean;
+    bundles?: Bundle[];
+    noConflict?: string;
+
+    cspNonceProvider?(out: any): string;
+    fingerprintInlineCode?(code: any): string;
+}
+
+export default class Lasso extends EventEmitter {
+    constructor(config: LassoConfig);
+
+    config: LassoConfig;
+    lassoCacheLookup: any;
+    dependencies: DependencyRegistry;
+    writer: writers.Writer;
+
+    initPlugins(): void;
+    createAppBundleMappings(bundleSetConfig: any, lassoContext: LassoContext, callback: Callback): any;
+    buildPageBundles(options: any, lassoContext: LassoContext, callback: Callback): void;
+    getAppBundleMappingsCached(bundleSetConfig: any, lassoContext: LassoContext, callback: Callback): void;
+    buildLassoCacheKey(lassoContext: LassoContext): { value: string; parts: string[]; };
+    getLassoCache(lassoContext: LassoContext): any;
+    getConfig(): LassoConfig;
+    getJavaScriptDependencyHtml(url: string, attributes?: any): string;
+    getCSSDependencyHtml(url: string, attributes?: any): string;
+    createLassoContext(options?: any): LassoContext;
+    setCSPNonceProvider(func: any): any;
+    addTransform(transform: any): void;
+    getDependencyRegistry(): DependencyRegistry;
+    lassoPage: LassoPage;
+    lassoResource: LassoResource;
+}
diff --git a/types/lasso/lib/LassoContext.d.ts b/types/lasso/lib/LassoContext.d.ts
new file mode 100644
index 0000000000..ae01277558
--- /dev/null
+++ b/types/lasso/lib/LassoContext.d.ts
@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import Lasso from './Lasso';
+import { DependencyRegistry } from './dependencies';
+import { writers } from '../index';
+
+export default class LassoContext extends EventEmitter {
+  constructor();
+
+  LassoContext: boolean;
+  basePath?: string;
+  contentType?: string;
+  data?: any;
+  dependencyRegistry: DependencyRegistry;
+  flags: any[];
+  config: any;
+  writer: writers.Writer;
+  lasso: Lasso;
+  cache: any;
+  options: any;
+}
diff --git a/types/lasso/lib/LassoPageResult.d.ts b/types/lasso/lib/LassoPageResult.d.ts
new file mode 100644
index 0000000000..8d51ae052f
--- /dev/null
+++ b/types/lasso/lib/LassoPageResult.d.ts
@@ -0,0 +1,32 @@
+import LassoContext from './LassoContext';
+
+export default interface LassoPageResult {
+    addFile(filePath: string, contentType: string, isAsync: boolean, slot: any): void;
+    addUrl(url: string, slot: any, contentType: string, isAsync: boolean): void;
+    deserialize(reader: any, callback: any): void;
+    getBodyHtml(data?: any): string;
+    getCSSFiles(): any[];
+    getCSSUrls(): any[];
+    getFileByAsyncBundleName(bundleName: string): any;
+    getFileByBundleName(bundleName: string): any;
+    getFilePathsByContentType(...args: any[]): void;
+    getHeadHtml(data?: any): string;
+    getHtmlBySlot(): any;
+    getHtmlForSlot(slotName: string, data?: any): any;
+    getInlineCodeFingerprints(): string[];
+    getJavaScriptFiles(): any[];
+    getJavaScriptUrls(): any[];
+    getOutputFiles(): any[];
+    getOutputFilesWithInfo(...args: any[]): void;
+    getSlotHtml(slotName: string, data?: any): any;
+    getUrlByAsyncBundleName(bundleName: string): any;
+    getUrlByBundleName(bundleName: string): any;
+    getUrlsForSlot(slot: any): any;
+    htmlSlotsToJSON(indentation: any): any;
+    registerBundle(bundle: any, async: any, lassoContext: LassoContext): void;
+    registerResource(resource: any): void;
+    serialize(lassoPageResult: LassoPageResult): any;
+    setHtmlBySlot(htmlBySlot: any): void;
+    setInlineCodeFingerprints(inlineCodeFingerprints: string[]): void;
+    toJSON(): any;
+}
diff --git a/types/lasso/lib/dependencies.d.ts b/types/lasso/lib/dependencies.d.ts
new file mode 100644
index 0000000000..682b6b3c30
--- /dev/null
+++ b/types/lasso/lib/dependencies.d.ts
@@ -0,0 +1,112 @@
+/// <reference types="node" />
+
+import LassoContext from './LassoContext';
+import { EventEmitter } from 'events';
+
+export type Callback = (err: Error | null, result?: any) => any;
+
+export interface Bundle {
+    name: string;
+    dependencies: Array<DependencyConfig | string>;
+}
+
+export interface DependencyConfig {
+    type?: string;
+    attributes?: {
+        integrity: string;
+        crossorigin: string;
+    };
+    inline?: string;
+    slot?: string;
+    'css-slot'?: string;
+    'js-slot'?: string;
+    url?: string;
+    path?: string;
+    external?: boolean;
+    'if-flag'?: string;
+    'if-not-flag'?: string;
+    if?: string;
+    from?: string;
+    to?: string;
+    require?: string;
+    'require-run'?: string;
+    dependencies?: Array<DependencyConfig | string>;
+}
+
+export interface Dependency extends EventEmitter, DependencyConfig {
+    _packageDependency?: boolean;
+    contentType?: string;
+    properties?: { [key: string]: string };
+
+    (dependencyConfig: DependencyConfig, dirname: string, filename?: string): Dependency;
+    calculateKey(lassoContext: LassoContext, callback: Callback): any;
+    doCalculateKey(lassoContext: LassoContext, callback: Callback): any;
+    calculateKeyFromProps(): string;
+    createPackageManifest(manifest?: any, dirname?: string, filename?: string): any;
+    createReadStream(lassoContext: LassoContext): any;
+    doGetLastModified(lassoContext: any, callback: Callback): any;
+    getContentType(): any;
+    getDefaultBundleName(pageBundleName?: string, lassoContext?: LassoContext): string;
+    getDir(): string | null;
+    getFileLastModified(path: string, callback: Callback): any;
+    getJavaScriptSlot(): any;
+    getKey(): any;
+    getLastModified(lassoContext: LassoContext, callback: Callback): any;
+    getPackageManifest(lassoContext: LassoContext, callback: Callback): any;
+    getParentManifestDir(): string;
+    getParentManifestPath(): string;
+    getPropsKey(): any;
+    getReadCacheKey(): any;
+    getSlot(): any;
+    getSourceFile(): any;
+    getStyleSheetSlot(): any;
+    hasContent(): boolean;
+    hasModifiedFingerprint(): boolean;
+    init(lassoContext: LassoContext, callback: Callback): any;
+    doInit(lassoContext: LassoContext, callback: Callback): void;
+    inspect(): any;
+    isCompiled(): boolean;
+    isExternalResource(): boolean;
+    isInPlaceDeploymentAllowed(): boolean;
+    isJavaScript(): boolean;
+    isPackageDependency(): boolean;
+    isPageBundleOnlyDependency(): boolean;
+    isStyleSheet(): boolean;
+    onAddToAsyncPageBundle(bundle: Bundle, lassoContext: LassoContext): void;
+    onAddToPageBundle(bundle: Bundle, lassoContext: LassoContext): void;
+    read(context: any, callback: Callback): any;
+    resolvePath(path: string, from?: string): string;
+    set(props: any): void;
+    shouldCache(lassoContext: LassoContext): boolean;
+}
+
+export interface DependencyRegistry {
+    registeredTypes: any;
+    extensions: any;
+    requireExtensions: any;
+    requireExtensionNames: any;
+
+    addNormalizer(normalizerFunc: any): any;
+    createDependency(config: any, dirname: string, filename?: string): any;
+    createRequireHandler(path: string, lassoContext: LassoContext, userOptions: any): any;
+    createResourceTransformType(transformFunc: any): any;
+    getRequireExtensionNames(): any;
+    getRequireHandler(path: string, lassoContext: LassoContext): any;
+    getType(type: string): any;
+    normalizeDependencies(dependencies: any[], dirname: string, filename: string, callback: Callback): any;
+    registerDefaults(): void;
+    registerExtension(extension: string, type: string): void;
+    registerJavaScriptType(type: string, mixins: any): void;
+    registerPackageType(type: string, mixins: any): void;
+    registerRequireExtension(ext: string, options: any): void;
+    registerRequireType(type: string, options: any): void;
+    registerStyleSheetType(type: string, mixins: any): void;
+    registerType(type: string, mixins: any): void;
+    typeForPath(path: string): string;
+}
+
+export function createRegistry(): DependencyRegistry;
+
+export function isRegistry(o: any): boolean;
+
+export function isDependency(d: any): boolean;
diff --git a/types/lasso/lib/index.d.ts b/types/lasso/lib/index.d.ts
new file mode 100644
index 0000000000..1331872c68
--- /dev/null
+++ b/types/lasso/lib/index.d.ts
@@ -0,0 +1,39 @@
+import Lasso, { LassoConfig, LassoPage, LassoResource } from './Lasso';
+import LassoContext from './LassoContext';
+import * as _writers from './writers';
+
+export namespace transforms {
+  function createTransformer(unfilteredTransforms: any[], lassoContext: LassoContext, callback: (err: Error | null, result?: any) => any): void;
+}
+
+export { _writers as writers };
+
+export const defaultConfig: LassoConfig;
+
+export const defaultConfigBaseDir: string;
+
+export const defaultConfigFilename: string | null;
+
+export const lassoPage: LassoPage;
+
+export const lassoResource: LassoResource;
+
+export function getDefaultLasso(): Lasso;
+
+export function create(config?: LassoConfig | string, baseDir?: string, filename?: string): Lasso;
+
+export function configure(config?: LassoConfig | string, baseDir?: string, filename?: string): void;
+
+export function setDevelopmentMode(): void;
+
+export function createFlagSet(flags: any): any;
+
+export function isFlagSet(o: any): boolean;
+
+export function flushAllCaches(callback?: any): void;
+
+export function handleWatchedFileChanged(path: string): void;
+
+export function clearCaches(): void;
+
+export function getClientPath(path: string, options?: any): string;
diff --git a/types/lasso/lib/writers/Writer.d.ts b/types/lasso/lib/writers/Writer.d.ts
new file mode 100644
index 0000000000..1ebaa55f24
--- /dev/null
+++ b/types/lasso/lib/writers/Writer.d.ts
@@ -0,0 +1,23 @@
+import { EventEmitter } from 'events';
+
+import Lasso, { LassoConfig } from '../Lasso';
+import LassoContext from '../LassoContext';
+import { Bundle } from '../dependencies';
+
+export default interface Writer extends EventEmitter {
+    impl: any;
+    lasso: Lasso;
+    config: LassoConfig;
+
+    (impl: any): Writer;
+    getLasso(): Lasso;
+    setLasso(lasso: Lasso): void;
+    getInPlaceUrlForFile(path: string, lassoContext: LassoContext): string | null;
+    getInPlaceUrlForBundle(bundle: Bundle, lassoContext: LassoContext): string;
+    writeBundle(bundle: Bundle, onBundleWrittenCallback: any, lassoContext: LassoContext, callback: any): any;
+    writeResource(path: string, lassoContext: LassoContext, callback: any): any;
+    checkBundleUpToDate(bundle: Bundle, lassoContext: LassoContext, callback: any): any;
+    checkResourceUpToDate(path: string, lassoContext: LassoContext, callback: any): any;
+    writeBundles(iteratorFunc: any, onBundleWrittenCallback: any, lassoContext: LassoContext, callback: any): void;
+    buildResourceCacheKey(cacheKey: string, lassoContext: LassoContext): string;
+}
diff --git a/types/lasso/lib/writers/index.d.ts b/types/lasso/lib/writers/index.d.ts
new file mode 100644
index 0000000000..087397f03b
--- /dev/null
+++ b/types/lasso/lib/writers/index.d.ts
@@ -0,0 +1,8 @@
+import { LassoConfig } from '../Lasso';
+import _Writer from './Writer';
+
+export interface Writer extends _Writer {}
+
+export function fileWriter(fileWriterConfig: any, lassoConfig: LassoConfig): any;
+
+export function createWriter(writerImpl: any): Writer;
diff --git a/types/lasso/middleware/index.d.ts b/types/lasso/middleware/index.d.ts
new file mode 100644
index 0000000000..1d502980dc
--- /dev/null
+++ b/types/lasso/middleware/index.d.ts
@@ -0,0 +1,4 @@
+import { RequestHandler } from 'express';
+import Lasso from '../lib/Lasso';
+
+export function serveStatic(options?: { lasso?: Lasso; sendOptions?: any; }): RequestHandler;
diff --git a/types/lasso/node-require-no-op.d.ts b/types/lasso/node-require-no-op.d.ts
new file mode 100644
index 0000000000..713a4aafe4
--- /dev/null
+++ b/types/lasso/node-require-no-op.d.ts
@@ -0,0 +1 @@
+export function enable(...extensions: string[]): void;
diff --git a/types/lasso/tsconfig.json b/types/lasso/tsconfig.json
new file mode 100644
index 0000000000..210de56a0d
--- /dev/null
+++ b/types/lasso/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "lasso-tests.ts",
+        "node-require-no-op.d.ts",
+        "index.d.ts",
+        "lib/index.d.ts",
+        "lib/dependencies.d.ts",
+        "lib/Lasso.d.ts",
+        "lib/LassoContext.d.ts",
+        "lib/writers/index.d.ts",
+        "lib/writers/Writer.d.ts",
+        "middleware/index.d.ts"
+    ]
+}
diff --git a/types/lasso/tslint.json b/types/lasso/tslint.json
new file mode 100644
index 0000000000..4f44991c3c
--- /dev/null
+++ b/types/lasso/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}
diff --git a/types/later/index.d.ts b/types/later/index.d.ts
index 66bf8e5dae..71d53983b0 100644
--- a/types/later/index.d.ts
+++ b/types/later/index.d.ts
@@ -23,115 +23,79 @@ declare namespace later {
     }
 
     interface Recurrence {
-        /** Time in seconds from midnight.
-         */
+        /** Time in seconds from midnight. */
         t?: number[];
-        /** Seconds in minute.
-         */
+        /** Seconds in minute. */
         s?: number[];
-        /** Minutes in hour.
-         */
+        /** Minutes in hour. */
         m?: number[];
-        /** Hour in day.
-         */
+        /** Hour in day. */
         h?: number[];
-        /** Day of the month.
-         */
+        /** Day of the month. */
         D?: number[];
-        /** Day in week.
-         */
+        /** Day in week. */
         dw?: number[];
-        /** Nth day of the week in month.
-         */
+        /** Nth day of the week in month. */
         dc?: number[];
-        /** Day in year.
-         */
+        /** Day in year. */
         dy?: number[];
-        /** Week in month.
-         */
+        /** Week in month. */
         wm?: number[];
-        /** ISO week in year.
-         */
+        /** ISO week in year. */
         wy?: number[];
-        /** Month in year.
-         */
+        /** Month in year. */
         M?: number[];
-        /** Year.
-         */
+        /** Year. */
         Y?: number[];
 
-        /** After modifiers.
-         */
+        /** After modifiers. */
         t_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         s_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         m_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         h_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         D_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         dw_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         dc_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         dy_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         wm_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         wy_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         M_a?: number[];
-        /** After modifiers.
-         */
+        /** After modifiers. */
         Y_a?: number[];
 
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         t_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         s_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         m_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         h_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         D_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         dw_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         dc_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         dy_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         wm_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         wy_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         M_b?: number[];
-        /** Before modifiers.
-         */
+        /** Before modifiers. */
         Y_b?: number[];
 
         /*
@@ -151,15 +115,15 @@ declare namespace later {
         /**
          * Create schedule data by parsing a cron string
          *
-         * @param {string} [input] - A string value to parse.
-         * @param {boolean} [hasSeconds] - Whether the cron expression has second part.
+         * @param [input] - A string value to parse.
+         * @param [hasSeconds] - Whether the cron expression has second part.
          */
         cron(input?: string, hasSeconds?: boolean): ScheduleData;
 
         /**
          * Create schedule data by paring a human readable string.
          *
-         * @param {string} [input] - A string value to parse.
+         * @param [input] - A string value to parse.
          */
         text(input?: string): ScheduleData;
     }
@@ -178,9 +142,9 @@ declare namespace later {
          * Date.now() by default, end date is unspecified. Start date must be
          * smaller than end date.
          *
-         * @param {number} numberOfInst: The number of instances to return
-         * @param {Date} dateFrom: The earliest a valid instance can occur
-         * @param {Date} dateTo: The latest a valid instance can occur
+         * @param numberOfInst: The number of instances to return
+         * @param dateFrom: The earliest a valid instance can occur
+         * @param dateTo: The latest a valid instance can occur
          */
         next(numberOfInst: number, dateFrom?: Date, dateTo?: Date): Date[];
 
@@ -190,9 +154,9 @@ declare namespace later {
          * Date.now() by default, end date is unspecified. Start date must be
          * greater than end date.
          *
-         * @param {number} numberOfInst: The number of ranges to return
-         * @param {Date} dateFrom: The earliest a valid range can occur
-         * @param {Date} dateTo: The latest a valid range can occur
+         * @param numberOfInst: The number of ranges to return
+         * @param dateFrom: The earliest a valid range can occur
+         * @param dateTo: The latest a valid range can occur
          */
         nextRange(numberOfInst: number, dateFrom?: Date, dateTo?: Date): Date[];
 
@@ -202,9 +166,9 @@ declare namespace later {
          * Date.now() by default, end date is unspecified. Start date must be
          * greater than end date.
          *
-         * @param {number} numberOfInst: The number of instances to return
-         * @param {Date} dateFrom: The earliest a valid instance can occur
-         * @param {Date} dateTo: The latest a valid instance can occur
+         * @param numberOfInst: The number of instances to return
+         * @param dateFrom: The earliest a valid instance can occur
+         * @param dateTo: The latest a valid instance can occur
          */
         prev(numberOfInst: number, dateFrom?: Date, dateTo?: Date): Date[];
 
@@ -214,59 +178,46 @@ declare namespace later {
          * Date.now() by default, end date is unspecified. Start date must be
          * greater than end date.
          *
-         * @param {number} numberOfInst: The number of ranges to return
-         * @param {Date} dateFrom: The earliest a valid range can occur
-         * @param {Date} dateTo: The latest a valid range can occur
+         * @param numberOfInst: The number of ranges to return
+         * @param dateFrom: The earliest a valid range can occur
+         * @param dateTo: The latest a valid range can occur
          */
         prevRange(numberOfInst: number, dateFrom?: Date, dateTo?: Date): Date[];
     }
 
     interface RecurrenceBuilder extends ScheduleData {
-        /** a time period
-         */
+        /** a time period */
         second(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         minute(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         hour(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         time(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         dayOfWeek(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         dayOfWeekCount(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         dayOfMonth(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         dayOfYear(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         weekOfMonth(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         weekOfYear(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         month(): RecurrenceBuilder;
-        /** a time period
-         */
+        /** a time period */
         year(): RecurrenceBuilder;
 
-        /** a time period
-         */
+        /** a time period */
         fullDate(): RecurrenceBuilder;
         /**
          * Specifies one or more specific vals of a time period information provider.
          * When used to specify a time, a string indicating the 24-hour time may be used.
          *
-         * @param {number[]} values - A list of values.
+         * @param values - A list of values.
          */
         on(...values: number[]): RecurrenceBuilder;
         /**
@@ -287,15 +238,15 @@ declare namespace later {
         /**
          * Preceed a time period.
          *
-         * @param {number} start - A number representing your start value.
-         * @param {number} end - A number representing your end value.
+         * @param start - A number representing your start value.
+         * @param end - A number representing your end value.
          */
         between(start: number, end: number): RecurrenceBuilder;
         /**
          * Preceed a time period.
          *
-         * @param {string} start - A string representing your start value.
-         * @param {string} end - A string representing your end value.
+         * @param start - A string representing your start value.
+         * @param end - A string representing your end value.
          */
         between(start: string, end: string): RecurrenceBuilder;
 
@@ -378,12 +329,12 @@ declare namespace later {
          * Builds and returns a new Date using the specified values.  Date
          * returned is either using Local time or UTC based on isLocal.
          *
-         * @param {number} [Y]: Four digit year
-         * @param {number} [M]: Month between 1 and 12, defaults to 1
-         * @param {number} [D]: Date between 1 and 31, defaults to 1
-         * @param {number} [h]: Hour between 0 and 23, defaults to 0
-         * @param {number} [m]: Minute between 0 and 59, defaults to 0
-         * @param {number} [s]: Second between 0 and 59, defaults to 0
+         * @param [Y]: Four digit year
+         * @param [M]: Month between 1 and 12, defaults to 1
+         * @param [D]: Date between 1 and 31, defaults to 1
+         * @param [h]: Hour between 0 and 23, defaults to 0
+         * @param [m]: Minute between 0 and 59, defaults to 0
+         * @param [s]: Second between 0 and 59, defaults to 0
          */
         next(Y?: number, M?: number, D?: number, h?: number, m?: number, s?: number): Date;
 
@@ -391,12 +342,12 @@ declare namespace later {
          * Builds and returns a new Date using the specified values.  Date
          * returned is either using Local time or UTC based on isLocal.
          *
-         * @param {number} [Y]: Four digit year
-         * @param {number} [M]: Month between 0 and 11, defaults to 11
-         * @param {number} [D]: Date between 1 and 31, defaults to last day of month
-         * @param {number} [h]: Hour between 0 and 23, defaults to 23
-         * @param {number} [m]: Minute between 0 and 59, defaults to 59
-         * @param {number} [s]: Second between 0 and 59, defaults to 59
+         * @param [Y]: Four digit year
+         * @param [M]: Month between 0 and 11, defaults to 11
+         * @param [D]: Date between 1 and 31, defaults to last day of month
+         * @param [h]: Hour between 0 and 23, defaults to 23
+         * @param [m]: Minute between 0 and 59, defaults to 59
+         * @param [s]: Second between 0 and 59, defaults to 59
          */
         prev(Y?: number, M?: number, D?: number, h?: number, m?: number, s?: number): Date;
 
@@ -405,10 +356,10 @@ declare namespace later {
          * next largest time period. Used primarily when a constraint has a
          * variable extent.
          *
-         * @param {Date} d: Date
-         * @param {number} val: Value
-         * @param {IModifier} constraint: A modifier
-         * @param {ITimePeriod} period: A time period
+         * @param d: Date
+         * @param val: Value
+         * @param constraint: A modifier
+         * @param period: A time period
          */
         nextRollover(d: Date, val: number, constraint: Modifier, period: TimePeriod): Date;
 
@@ -417,10 +368,10 @@ declare namespace later {
          * previous largest time period. Used primarily when a constraint has a
          * variable extent.
          *
-         * @param {Date} d: Date
-         * @param {number} val: Value
-         * @param {IModifier} constraint: A modifier
-         * @param {ITimePeriod} period: A time period
+         * @param d: Date
+         * @param val: Value
+         * @param constraint: A modifier
+         * @param period: A time period
          */
         prevRollover(d: Date, val: number, constraint: Modifier, period: TimePeriod): Date;
     }
@@ -439,15 +390,15 @@ declare namespace later {
         /**
          * The value of this time period for the date specified.
          *
-         * @param {Date} date - The given date.
+         * @param date - The given date.
          */
         val(date: Date): number;
 
         /**
          * True if the specified value is valid for the specified date, false otherwise.
          *
-         * @param {Date} date - The given date.
-         * @param {any} value - The value to test for the date.
+         * @param date - The given date.
+         * @param value - The value to test for the date.
          */
         isValid(date: Date, value: any): boolean;
 
@@ -456,7 +407,7 @@ declare namespace later {
          * If the minimum value is not 0, 0 can be specified in schedules to indicate the maximum value.
          * This makes working with non - constant extents(like days in a month) easier.
          *
-         * @param {Date} [date] - The given date.
+         * @param [date] - The given date.
          */
         extent(date?: Date): number[];
 
@@ -464,7 +415,7 @@ declare namespace later {
          * The first second in which the value is the same as the value of the specified date.
          *  For example, the start of an hour would be the hour with 0 minutes and 0 seconds.
          *
-         * @param {Date} date - The given date.
+         * @param date - The given date.
          */
         start(date: Date): Date;
 
@@ -472,7 +423,7 @@ declare namespace later {
          * The last second in which the value is the same as the value of the specified date.
          * For example, the end of an hour would be the hour with 59 minutes and 59 seconds.
          *
-         * @param {Date} date - The given date.
+         * @param date - The given date.
          */
         end(date: Date): Date;
 
@@ -480,8 +431,8 @@ declare namespace later {
          * Returns the next date where the value is the value specified.
          * Sets the value to 1 if value specified is greater than the max allowed value.
          *
-         * @param {Date} date - The given date.
-         * @param {any} value - The value to test for the date.
+         * @param date - The given date.
+         * @param value - The value to test for the date.
          */
         next(date: Date, value: any): Date;
 
@@ -489,8 +440,8 @@ declare namespace later {
          * Returns the previous date where the value is the value specified.
          * Sets the value to the max allowed value if the value specified is greater than the max allowed value.
          *
-         * @param {Date} date - The given date.
-         * @param {any} value - The value to test for the date.
+         * @param date - The given date.
+         * @param value - The value to test for the date.
          */
         prev(date: Date, value: any): Date;
     }
@@ -499,8 +450,8 @@ declare namespace later {
         /**
          * Creates a new modified constraint.
          *
-         * @param {ITimePeriod} constraint: The constraint to be modified
-         * @param {number} value: The starting value of the after constraint
+         * @param constraint: The constraint to be modified
+         * @param value: The starting value of the after constraint
          */
         (constraint: TimePeriod, value: number): TimePeriod;
     }
@@ -530,22 +481,21 @@ declare namespace later {
          */
         parse: ParseStatic;
 
-        /** Date Provider
-         */
+        /** Date Provider */
         date: DateProvider;
 
         /**
          * Set timeout on window using given recurrence next.
          *
-         * @param {function} callback - A callback called after first instance of recurrence pattern.
-         * @param {Later.IReccurence} - A recurrence instance.
+         * @param callback - A callback called after first instance of recurrence pattern.
+         * @param - A recurrence instance.
          */
         setTimeout(callback: () => void, time: ScheduleData): Timer;
         /**
          * Set interval on window using given recurrence
          *
-         * @param {function} callback - A callback called after each instance of recurrence pattern.
-         * @param {Later.IReccurence} - A recurrence instance.
+         * @param callback - A callback called after each instance of recurrence pattern.
+         * @param - A recurrence instance.
          */
         setInterval(callback: () => void, time: ScheduleData): Timer;
 
diff --git a/types/latinize/tslint.json b/types/latinize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/latinize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/latlon-geohash/index.d.ts b/types/latlon-geohash/index.d.ts
new file mode 100644
index 0000000000..a7d843c30c
--- /dev/null
+++ b/types/latlon-geohash/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for latlon-geohash 1.1
+// Project: https://github.com/chrisveness/latlon-geohash
+// Definitions by: Robert Imig <https://github.com/rimig>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export enum Direction {
+    North = "N",
+    South = "S",
+    East = "E",
+    West = "W"
+}
+
+export interface Neighbours {
+    n: string;
+    ne: string;
+    e: string;
+    se: string;
+    s: string;
+    sw: string;
+    w: string;
+    nw: string;
+}
+
+export interface Bounds {
+    sw: Point;
+    ne: Point;
+}
+
+export interface Point {
+    lat: number;
+    lon: number;
+}
+
+/**
+ * Encodes latitude/longitude to geohash, either to specified precision or to automatically
+ * evaluated precision.
+ *
+ * @param   lat - Latitude in degrees.
+ * @param   lon - Longitude in degrees.
+ * @param   [precision] - Number of characters in resulting geohash.
+ * @returns Geohash of supplied latitude/longitude.
+ * @throws  Invalid geohash.
+ *
+ * @example
+ *     var geohash = Geohash.encode(52.205, 0.119, 7); // geohash: 'u120fxw'
+ */
+
+export function encode(
+    latitude: number,
+    longitude: number,
+    precision?: number
+): string;
+
+/**
+ * Decode geohash to latitude/longitude (location is approximate centre of geohash cell,
+ *     to reasonable precision).
+ *
+ * @param   geohash - Geohash string to be converted to latitude/longitude.
+ * @returns (Center of) geohashed location.
+ * @throws  Invalid geohash.
+ *
+ * @example
+ *     var latlon = Geohash.decode('u120fxw'); // latlon: { lat: 52.205, lon: 0.1188 }
+ */
+export function decode(geohash: string): Point;
+
+/**
+ * Returns SW/NE latitude/longitude bounds of specified geohash.
+ *
+ * @param   geohash - Cell that bounds are required of.
+ * @returns The Bounds
+ * @throws  Invalid geohash.
+ */
+export function bounds(geohash: string): Bounds;
+
+/**
+ * Determines adjacent cell in given direction.
+ *
+ * @param   geohash - Cell to which adjacent cell is required.
+ * @param   direction - Direction from geohash (N/S/E/W).
+ * @returns Geocode of adjacent cell.
+ * @throws  Invalid geohash.
+ */
+export function adjacent(geohash: string, direction: Direction | string): string;
+
+/**
+ * Returns all 8 adjacent cells to specified geohash.
+ *
+ * @param   geohash - Geohash neighbours are required of.
+ * @returns The neighbours
+ * @throws  Invalid geohash.
+ */
+export function neighbours(geohash: string): Neighbours;
diff --git a/types/latlon-geohash/latlon-geohash-tests.ts b/types/latlon-geohash/latlon-geohash-tests.ts
new file mode 100644
index 0000000000..632c7e64ed
--- /dev/null
+++ b/types/latlon-geohash/latlon-geohash-tests.ts
@@ -0,0 +1,19 @@
+import * as Geohash from "latlon-geohash";
+
+// Encoding
+const atx_geohash: string = Geohash.encode(30.2672, -97.7431);
+const atx_geohash_p3: string = Geohash.encode(30.2672, -97.7431, 3);
+
+// Decoding
+const atx_latlong: Geohash.Point = Geohash.decode(atx_geohash);
+
+// Bounds
+const atx_bounds: Geohash.Bounds = Geohash.bounds(atx_geohash);
+
+// Adjacent
+const atx_adj_cell1: string = Geohash.adjacent(atx_geohash, Geohash.Direction.North);
+const atx_adj_cell2: string = Geohash.adjacent(atx_geohash, "N");
+
+// Neighbors
+const atx_neighbors: Geohash.Neighbours = Geohash.neighbours(atx_geohash);
+const atx_adj_cell3: string = atx_neighbors.n;
diff --git a/types/latlon-geohash/tsconfig.json b/types/latlon-geohash/tsconfig.json
new file mode 100644
index 0000000000..10d9c00791
--- /dev/null
+++ b/types/latlon-geohash/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "latlon-geohash-tests.ts"
+    ]
+}
diff --git a/types/latlon-geohash/tslint.json b/types/latlon-geohash/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/latlon-geohash/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/launchpad/tslint.json b/types/launchpad/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/launchpad/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lazy.js/tslint.json b/types/lazy.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lazy.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lazypipe/tsconfig.json b/types/lazypipe/tsconfig.json
index 31a6b4b294..7eb8c93b6a 100644
--- a/types/lazypipe/tsconfig.json
+++ b/types/lazypipe/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/lazypipe/tslint.json b/types/lazypipe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lazypipe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ldapjs/index.d.ts b/types/ldapjs/index.d.ts
index 0afbf16046..8034add042 100644
--- a/types/ldapjs/index.d.ts
+++ b/types/ldapjs/index.d.ts
@@ -71,6 +71,10 @@ export interface Change {
 	};
 }
 
+export var Change: {
+	new(change: Change): Change;
+}
+
 export interface SearchCallBack {
 	(error: Error, result: EventEmitter): void;
 }
diff --git a/types/ldapjs/ldapjs-tests.ts b/types/ldapjs/ldapjs-tests.ts
index 6b2d879142..ec106fd29a 100644
--- a/types/ldapjs/ldapjs-tests.ts
+++ b/types/ldapjs/ldapjs-tests.ts
@@ -18,3 +18,14 @@ let opts: ldap.SearchOptions = {
 client.search('o=example', opts, (err: Error, res: NodeJS.EventEmitter): void => {
 	// nothing
 });
+
+let change = new ldap.Change({
+    operation: 'add',
+    modification: {
+        pets: ['cat', 'dog']
+    }
+});
+
+client.modify('cn=foo, o=example', change, function(err) {
+    // nothing
+});
diff --git a/types/ldapjs/tsconfig.json b/types/ldapjs/tsconfig.json
index 1f1d5bafc9..a0df7615fd 100644
--- a/types/ldapjs/tsconfig.json
+++ b/types/ldapjs/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "ldapjs-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/ldapjs/tslint.json b/types/ldapjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ldapjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ldclient-js/index.d.ts b/types/ldclient-js/index.d.ts
deleted file mode 100644
index 47792db29a..0000000000
--- a/types/ldclient-js/index.d.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-// Type definitions for ldclient-js v1.1.2
-// Project: https://github.com/launchdarkly/js-client
-// Definitions by: Isaac Sukin <https://isaacsukin.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * The LaunchDarkly JavaScript client interfaces.
- *
- * Documentation: http://docs.launchdarkly.com/docs/js-sdk-reference
- */
-declare namespace LaunchDarkly {
-    /**
-     * The names of events to which users of the client can subscribe.
-     */
-    export type LDEventName = 'ready' | 'change';
-
-    /**
-     * The types of values a feature flag can have.
-     *
-     * Flags can have any JSON-serializable value.
-     */
-    export type LDFlagValue = any;
-
-    /**
-     * A map of feature flags from their keys to their values.
-     */
-    export type LDFlagSet = {
-        [key: string]: LDFlagValue,
-    };
-
-    /**
-     * A map of feature flag keys to objects holding changes in their values.
-     */
-    export type LDFlagChangeset = {
-        [key: string]: {
-            current: LDFlagValue,
-            previous: LDFlagValue,
-        },
-    };
-
-    /**
-     * The parameters required to (un)subscribe to/from LaunchDarkly events.
-     *
-     * See LDClient#on and LDClient#off.
-     */
-    type LDEventSignature = (
-            key: LDEventName,
-            callback: (current?: LDFlagValue | LDFlagChangeset, previous?: LDFlagValue) => void,
-            context?: any
-        ) => void;
-
-    /**
-     * LaunchDarkly initialization options.
-     */
-    export interface LDOptions {
-        /**
-         * The signed user key for Secure Mode.
-         *
-         * @see http://docs.launchdarkly.com/docs/js-sdk-reference#secure-mode
-         */
-        hash: string;
-
-        /**
-         * The initial set of flags to use until the remote set is retrieved.
-         *
-         * If "localStorage" is specified, the flags will be saved locally and
-         * retrieved from storage. Alternatively an LDFlagSet can be specified
-         * which will be used as the initial source of flag values.
-         */
-        bootstrap?: 'localStorage' | LDFlagSet;
-    }
-
-    /**
-     * A LaunchDarkly user object.
-     */
-    export interface LDUser {
-        /**
-         * A unique string identifying a user.
-         */
-        key: string;
-
-        /**
-         * The user's name.
-         *
-         * You can search for users on the User page by name.
-         */
-        name?: string;
-
-        /**
-         * The user's first name.
-         */
-        firstName?: string;
-
-        /**
-         * The user's last name.
-         */
-        lastName?: string;
-
-        /**
-         * The user's email address.
-         *
-         * If an `avatar` URL is not provided, LaunchDarkly will use Gravatar
-         * to try to display an avatar for the user on the Users page.
-         */
-        email?: string;
-
-        /**
-         * An absolute URL to an avatar image for the user.
-         */
-        avatar?: string;
-
-        /**
-         * The user's IP address.
-         *
-         * If you provide an IP, LaunchDarkly will use a geolocation service to
-         * automatically infer a `country` for the user, unless you've already
-         * specified one.
-         */
-        ip?: string;
-
-        /**
-         * The country associated with the user.
-         */
-        country?: string;
-
-        /**
-         * Whether to show the user on the Users page in LaunchDarkly.
-         */
-        anonymous?: boolean;
-
-        /**
-         * Any additional attributes associated with the user.
-         */
-        custom?: {
-            [key: string]: string | boolean | number | Array<string | boolean | number>,
-        };
-    }
-
-    /**
-     * The LaunchDarkly client's instance interface.
-     *
-     * @see http://docs.launchdarkly.com/docs/js-sdk-reference
-     */
-    export interface LDClient {
-        /**
-         * Identifies a user to LaunchDarkly.
-         *
-         * This only needs to be called if the user changes identities because
-         * normally the user's identity is set during client initialization.
-         *
-         * @param user
-         *   A map of user options. Must contain at least the `key` property
-         *   which identifies the user.
-         * @param hash
-         *   The signed user key for Secure Mode; see
-         *   http://docs.launchdarkly.com/docs/js-sdk-reference#secure-mode
-         * @param onDone
-         *   A callback to invoke after the user is identified.
-         */
-        identify: (user: LDUser, hash?: string, onDone?: () => void) => void;
-
-        /**
-         * Retrieves a flag's value.
-         *
-         * @param key
-         *   The key of the flag for which to retrieve the corresponding value.
-         * @param defaultValue
-         *   The value to use if the flag is not available (for example, if the
-         *   user is offline or a flag is requested that does not exist).
-         *
-         * @returns
-         *   The flag's value.
-         */
-        variation: (key: string, defaultValue?: LDFlagValue) => LDFlagValue;
-
-        /**
-         * Registers an event listener.
-         *
-         * @param key
-         *   The name of the event for which to listen. This can be "ready",
-         *   "change", or "change:FLAG-KEY".
-         * @param callback
-         *   The function to execute when the event fires. For the "change"
-         *   event, the callback receives one parameter: an LDFlagChangeset
-         *   describing the changes. For "change:FLAG-KEY" events, the callback
-         *   receives two parameters: the current (new) value and the previous
-         *   value of the relevant flag.
-         * @param context
-         *   The "this" context to use for the callback.
-         */
-        on: LDEventSignature;
-
-        /**
-         * Deregisters an event listener.
-         *
-         * @param key
-         *   The name of the event for which to stop listening. This can be
-         *   "ready", "change", or "change:FLAG-KEY".
-         * @param callback
-         *   The function to deregister.
-         * @param context
-         *   The "this" context for the callback.
-         */
-        off: LDEventSignature;
-
-        /**
-         * Track page events to use in goals or A/B tests.
-         *
-         * LaunchDarkly automatically tracks pageviews and clicks that are
-         * specified in the Goals section of their dashboard. This can be used
-         * to track custom goals or other events that do not currently have
-         * goals.
-         *
-         * @param key
-         *   The event to record.
-         * @param data
-         *   Additional information to associate with the event.
-         */
-        track: (key: string, data?: any) => void;
-
-        /**
-         * Returns a map of all available flags to the current user's values.
-         */
-        allFlags: () => LDFlagSet;
-    }
-
-}
-
-/**
- * The LaunchDarkly static global.
- */
-declare var LDClient: {
-    initialize: (
-            key: string,
-            user: LaunchDarkly.LDUser,
-            options?: LaunchDarkly.LDOptions
-        ) => LaunchDarkly.LDClient;
-};
diff --git a/types/ldclient-js/ldclient-js-tests.ts b/types/ldclient-js/ldclient-js-tests.ts
deleted file mode 100644
index 3b7ea30125..0000000000
--- a/types/ldclient-js/ldclient-js-tests.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Implicitly calls LDClient#identify
-const ldClient = LDClient.initialize(
-    'ENV KEY',
-    {
-        key: 'USER KEY',
-        name: 'USER NAME',
-        custom: {
-            'CUSTOM ATTRIBUTE': ['CUSTOM VALUE'],
-        },
-    },
-    {
-        hash: 'SECURE USER HASH',
-    }
-);
-
-ldClient.on('ready', () => {
-    const defaultValue = false;
-    ldClient.variation('FLAG-KEY', defaultValue);
-    console.log('All flag values:', ldClient.allFlags());
-});
-
-function changeCallback(changes: LaunchDarkly.LDFlagChangeset) {
-    console.log('Flags changed:', changes);
-}
-
-ldClient.on('change', changeCallback);
-
-document.getElementById('disable-change-tracking')!.addEventListener('click', () => {
-    ldClient.off('change', changeCallback);
-});
diff --git a/types/ldclient-js/tsconfig.json b/types/ldclient-js/tsconfig.json
deleted file mode 100644
index a43d586229..0000000000
--- a/types/ldclient-js/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ldclient-js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/leadfoot/tslint.json b/types/leadfoot/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/leadfoot/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/leaflet-areaselect/index.d.ts b/types/leaflet-areaselect/index.d.ts
index 50b0202f6a..ae7f4e042d 100644
--- a/types/leaflet-areaselect/index.d.ts
+++ b/types/leaflet-areaselect/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/heyman/leaflet-areaselect
 // Definitions by: André Wallat <https://github.com/awallat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet-curve/index.d.ts b/types/leaflet-curve/index.d.ts
index 58e4551dec..aaf9fa1c38 100644
--- a/types/leaflet-curve/index.d.ts
+++ b/types/leaflet-curve/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/onikiienko/Leaflet.curve
 // Definitions by: Onikiienko <https://github.com/onikiienko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet-draw/index.d.ts b/types/leaflet-draw/index.d.ts
index de0767d462..35d014b699 100644
--- a/types/leaflet-draw/index.d.ts
+++ b/types/leaflet-draw/index.d.ts
@@ -66,6 +66,13 @@ declare module 'leaflet' {
 			 */
 			circle?: DrawOptions.CircleOptions | false;
 
+			/**
+			 * Circle marker draw handler options. Set to false to disable handler.
+			 *
+			 *  Default value: {}
+			 */
+			circlemarker?: DrawOptions.CircleMarkerOptions | false;
+
 			/**
 			 * Marker draw handler options. Set to false to disable handler.
 			 *
@@ -201,6 +208,71 @@ declare module 'leaflet' {
 			repeatMode?: boolean;
 		}
 
+		interface CircleMarkerOptions {
+			/**
+			 * Whether to draw stroke around the circle marker.
+			 *
+			 * Default value: true
+			 */
+			stroke?: boolean;
+
+			/**
+			 * The stroke color of the circle marker.
+			 *
+			 * Default value: '#3388ff'
+			 */
+			color?: string;
+
+			/**
+			 * The stroke width in pixels of the circle marker.
+			 *
+			 * Default value: 4
+			 */
+			weight?: number;
+
+			/**
+			 * The stroke opacity of the circle marker.
+			 *
+			 * Default value: 0.5
+			 */
+			opacity?: number;
+
+			/**
+			 * Whether to fill the circle marker with color.
+			 *
+			 * Default value: true
+			 */
+			fill?: boolean;
+
+			/**
+			 * The fill color of the circle marker. Defaults to the value of the color option.
+			 *
+			 * Default value: null
+			 */
+			fillColor?: string;
+
+			/**
+			 * The opacity of the circle marker.
+			 *
+			 * Default value: 0.2
+			 */
+			fillOpacity?: number;
+
+			/**
+			 * Whether you can click the circle marker.
+			 *
+			 * Default value: true
+			 */
+			clickable?: boolean;
+
+			/**
+			 * This should be a high number to ensure that you can draw over all other layers on the map.
+			 *
+			 * Default value: 2000
+			 */
+			zIndexOffset?: number;
+		}
+
 		interface MarkerOptions {
 			/**
 			 * TThe icon displayed when drawing a marker.
diff --git a/types/leaflet-draw/tslint.json b/types/leaflet-draw/tslint.json
index 4f44991c3c..ccc381f52f 100644
--- a/types/leaflet-draw/tslint.json
+++ b/types/leaflet-draw/tslint.json
@@ -1,6 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-empty-interface": false
+        // TODOs
+        "no-empty-interface": false,
+        "no-unnecessary-class": false
     }
 }
diff --git a/types/leaflet-editable/index.d.ts b/types/leaflet-editable/index.d.ts
index ee42cb1fb1..932ca33fd2 100644
--- a/types/leaflet-editable/index.d.ts
+++ b/types/leaflet-editable/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yohanboniface/Leaflet.Editable
 // Definitions by: Dominic Alie <https://github.com/dalie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Leaflet from 'leaflet';
 
diff --git a/types/leaflet-fullscreen/index.d.ts b/types/leaflet-fullscreen/index.d.ts
index bf354e9155..b9248092e1 100644
--- a/types/leaflet-fullscreen/index.d.ts
+++ b/types/leaflet-fullscreen/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Leaflet/Leaflet.fullscreen
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet-geocoder-mapzen/index.d.ts b/types/leaflet-geocoder-mapzen/index.d.ts
index d4f8b445d9..c6b5444c3e 100644
--- a/types/leaflet-geocoder-mapzen/index.d.ts
+++ b/types/leaflet-geocoder-mapzen/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mapzen/leaflet-geocoder
 // Definitions by: Leonard Lausen <https://github.com/leezu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet-gpx/index.d.ts b/types/leaflet-gpx/index.d.ts
index 7eac361403..1071ef7b2f 100644
--- a/types/leaflet-gpx/index.d.ts
+++ b/types/leaflet-gpx/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for leaflet-polylinedecorator 1.1
-// Project: https://github.com/bbecquet/Leaflet.PolylineDecorator#readme
+// Type definitions for leaflet-gpx 1.1
+// Project: https://github.com/mpetazzoni/leaflet-gpx
 // Definitions by: Viktor Soucek <https://github.com/soucekv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/leaflet-imageoverlay-rotated/index.d.ts b/types/leaflet-imageoverlay-rotated/index.d.ts
index 6a37345ca5..a40fb7861c 100644
--- a/types/leaflet-imageoverlay-rotated/index.d.ts
+++ b/types/leaflet-imageoverlay-rotated/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/IvanSanchez/Leaflet.ImageOverlay.Rotated
 // Definitions by: Thomas Kleinke <https://github.com/tkleinke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet-label/index.d.ts b/types/leaflet-label/index.d.ts
index 60f2b6b398..0a651a0d0c 100644
--- a/types/leaflet-label/index.d.ts
+++ b/types/leaflet-label/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Leaflet/Leaflet.label
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet-mouse-position/index.d.ts b/types/leaflet-mouse-position/index.d.ts
new file mode 100644
index 0000000000..46d48eb413
--- /dev/null
+++ b/types/leaflet-mouse-position/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for leaflet-mouse-position 1.1
+// Project: https://github.com/danwild/Leaflet.MousePosition
+// Definitions by: Hanyon <https://github.com/Hanyon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ControlOptions, Control as LControl } from 'leaflet';
+
+declare module 'leaflet' {
+    interface MapOptions {
+        positionControl?: boolean;
+    }
+
+    namespace control {
+        function mousePosition(options?: Control.MousePositionControlOptions): Control.MousePosition;
+    }
+
+    namespace Control {
+        interface MousePositionControlOptions extends ControlOptions {
+            separator?: string;
+            emptyString?: string;
+            lngFirst?: boolean;
+            numDigits?: number;
+            lngFormatter?: (lng: number) => string;
+            latFormatter?: (lat: number) => string;
+            prefix?: string;
+        }
+
+        class MousePosition extends LControl {
+            options: MousePositionControlOptions;
+
+            constructor(options?: MousePositionControlOptions);
+        }
+    }
+}
diff --git a/types/leaflet-mouse-position/leaflet-mouse-position-tests.ts b/types/leaflet-mouse-position/leaflet-mouse-position-tests.ts
new file mode 100644
index 0000000000..b7a3a64333
--- /dev/null
+++ b/types/leaflet-mouse-position/leaflet-mouse-position-tests.ts
@@ -0,0 +1,8 @@
+import * as L from 'leaflet';
+
+const map = L.map('map', {
+    center: [51.505, -0.09],
+    zoom: 13,
+});
+const mousePosition = L.control.mousePosition({position: 'topright', emptyString: 'Unavailable'});
+map.addControl(mousePosition);
diff --git a/types/leaflet-mouse-position/tsconfig.json b/types/leaflet-mouse-position/tsconfig.json
new file mode 100644
index 0000000000..a853ad3c56
--- /dev/null
+++ b/types/leaflet-mouse-position/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-mouse-position-tests.ts"
+    ]
+}
diff --git a/types/leaflet-mouse-position/tslint.json b/types/leaflet-mouse-position/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/leaflet-mouse-position/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/leaflet-polylinedecorator/tslint.json b/types/leaflet-polylinedecorator/tslint.json
index 3db14f85ea..6a82dd0467 100644
--- a/types/leaflet-polylinedecorator/tslint.json
+++ b/types/leaflet-polylinedecorator/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODO
+		"no-unnecessary-class": false
+	}
+}
diff --git a/types/leaflet-providers/index.d.ts b/types/leaflet-providers/index.d.ts
index aa5af026a1..bc9a4576de 100644
--- a/types/leaflet-providers/index.d.ts
+++ b/types/leaflet-providers/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/leaflet-extras/leaflet-providers#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet-rotatedmarker/index.d.ts b/types/leaflet-rotatedmarker/index.d.ts
index d11a82ae56..dfbf8966de 100644
--- a/types/leaflet-rotatedmarker/index.d.ts
+++ b/types/leaflet-rotatedmarker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bbecquet/Leaflet.RotatedMarker
 // Definitions by: Robert Prib <https://github.com/robert-prib-polestar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet.awesome-markers/v0/index.d.ts b/types/leaflet.awesome-markers/v0/index.d.ts
index b695d3918b..154c7852a4 100644
--- a/types/leaflet.awesome-markers/v0/index.d.ts
+++ b/types/leaflet.awesome-markers/v0/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sigma-geosistemas/Leaflet.awesome-markers#properties
 // Definitions by: Egor Komarov <https://github.com/Odrin>, Marcel Sebek <https://github.com/sebek64>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Leaflet from "leaflet";
 
diff --git a/types/leaflet.awesome-markers/v0/tslint.json b/types/leaflet.awesome-markers/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/leaflet.awesome-markers/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/leaflet.fullscreen/index.d.ts b/types/leaflet.fullscreen/index.d.ts
index 4e58ede10c..79ab81114b 100644
--- a/types/leaflet.fullscreen/index.d.ts
+++ b/types/leaflet.fullscreen/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/brunob/leaflet.fullscreen
 // Definitions by: William Comartin <https://github.com/wcomartin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet.gridlayer.googlemutant/index.d.ts b/types/leaflet.gridlayer.googlemutant/index.d.ts
index 00fd9fdce0..29a1e69a6b 100644
--- a/types/leaflet.gridlayer.googlemutant/index.d.ts
+++ b/types/leaflet.gridlayer.googlemutant/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant#README
 // Definitions by: Ernest Rhinozeros <https://github.com/ernest-rhinozeros>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet.heat/index.d.ts b/types/leaflet.heat/index.d.ts
new file mode 100644
index 0000000000..224b6f7c35
--- /dev/null
+++ b/types/leaflet.heat/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for Leaflet.heat 0.2
+// Project: https://github.com/Leaflet/Leaflet.heat
+// Definitions by: Önder Ceylan <https://github.com/onderceylan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as L from 'leaflet';
+
+declare module 'leaflet' {
+    type HeatLatLngTuple = [number, number, number];
+
+    interface ColorGradientConfig {
+        [key: number]: string;
+    }
+
+    interface HeatMapOptions {
+        minOpacity?: number;
+        maxZoom?: number;
+        max?: number;
+        radius?: number;
+        blur?: number;
+        gradient?: ColorGradientConfig;
+    }
+
+    interface HeatLayer extends TileLayer {
+        setOptions(options: HeatMapOptions): HeatLayer;
+        addLatLng(latlng: LatLng | HeatLatLngTuple): HeatLayer;
+        setLatLngs(latlngs: Array<LatLng | HeatLatLngTuple>): HeatLayer;
+    }
+
+    function heatLayer(latlngs: Array<LatLng | HeatLatLngTuple>, options: HeatMapOptions): HeatLayer;
+}
diff --git a/types/leaflet.heat/leaflet.heat-tests.ts b/types/leaflet.heat/leaflet.heat-tests.ts
new file mode 100644
index 0000000000..b715255e78
--- /dev/null
+++ b/types/leaflet.heat/leaflet.heat-tests.ts
@@ -0,0 +1,43 @@
+import * as L from 'leaflet';
+import 'leaflet.heat';
+
+const osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+const osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors';
+const osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
+const map = new L.Map('map', {
+    layers: [osm],
+    center: new L.LatLng(50.5, 30.5),
+    zoom: 15,
+});
+
+// Each point in the input array can be either an array like [50.5, 30.5, 0.5], or a Leaflet LatLng object.
+const heat: L.HeatLayer = L.heatLayer([
+    [50.5, 30.5, 0.2], // lat, lng, intensity
+    [50.6, 30.4, 0.5],
+    new L.LatLng(50.7, 30.3),
+], {radius: 25}).addTo(map);
+
+// Set options on the heat layer
+heat.setOptions({
+    minOpacity: 0.05,
+    maxZoom: 18,
+    max: 1.0,
+    radius: 25,
+    blur: 15,
+    gradient: {0.4: 'blue', 0.65: 'lime', 1: 'red'},
+});
+
+// Add new point to heat layer
+const newLatLng = new L.LatLng(50.8, 30.2);
+heat.addLatLng(newLatLng);
+
+// Set new latLng list to the heat layer
+heat.setLatLngs([
+    newLatLng,
+    newLatLng,
+    newLatLng,
+    [50.6, 30.4, 0.5],
+]);
+
+// Redraw the heat layer
+heat.redraw();
diff --git a/types/leaflet.heat/tsconfig.json b/types/leaflet.heat/tsconfig.json
new file mode 100644
index 0000000000..482c984b8c
--- /dev/null
+++ b/types/leaflet.heat/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "leaflet.heat-tests.ts"
+  ]
+}
diff --git a/types/leaflet.heat/tslint.json b/types/leaflet.heat/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/leaflet.heat/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/leaflet.locatecontrol/index.d.ts b/types/leaflet.locatecontrol/index.d.ts
index 4b8225dec2..35c88be5be 100644
--- a/types/leaflet.locatecontrol/index.d.ts
+++ b/types/leaflet.locatecontrol/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/domoritz/leaflet-locatecontrol
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as L from 'leaflet';
 
diff --git a/types/leaflet.markercluster/index.d.ts b/types/leaflet.markercluster/index.d.ts
index f60a7a2891..e2f317dd46 100644
--- a/types/leaflet.markercluster/index.d.ts
+++ b/types/leaflet.markercluster/index.d.ts
@@ -29,7 +29,7 @@ declare module 'leaflet' {
         getBounds(): LatLngBounds;
     }
 
-    interface MarkerClusterGroupOptions {
+    interface MarkerClusterGroupOptions extends LayerOptions {
         /*
         * When you mouse over a cluster it shows the bounds of its markers.
         */
diff --git a/types/leaflet.pancontrol/index.d.ts b/types/leaflet.pancontrol/index.d.ts
new file mode 100644
index 0000000000..6e06aa9c54
--- /dev/null
+++ b/types/leaflet.pancontrol/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for leaflet.pancontrol 1.0
+// Project: https://github.com/kartena/Leaflet.Pancontrol
+// Definitions by: Brictarus <https://github.com/Brictarus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ControlOptions, Control as LControl } from 'leaflet';
+
+declare module 'leaflet' {
+  interface MapOptions {
+    panControl?: boolean;
+  }
+
+  namespace control {
+    function pan(options?: Control.PanControlOptions): Control.Pan;
+  }
+
+  namespace Control {
+    interface PanControlOptions extends ControlOptions {
+      panOffset?: number;
+    }
+
+    class Pan extends LControl {
+      options: PanControlOptions;
+
+      constructor(options?: PanControlOptions);
+    }
+  }
+}
diff --git a/types/leaflet.pancontrol/leaflet.pancontrol-tests.ts b/types/leaflet.pancontrol/leaflet.pancontrol-tests.ts
new file mode 100644
index 0000000000..029fcfa890
--- /dev/null
+++ b/types/leaflet.pancontrol/leaflet.pancontrol-tests.ts
@@ -0,0 +1,9 @@
+import * as L from 'leaflet';
+
+const map = L.map('map', {
+    center: [51.505, -0.09],
+    zoom: 13,
+});
+
+const panControl = L.control.pan({position: 'topright'});
+map.addControl(panControl);
diff --git a/types/leaflet.pancontrol/tsconfig.json b/types/leaflet.pancontrol/tsconfig.json
new file mode 100644
index 0000000000..ec286c0305
--- /dev/null
+++ b/types/leaflet.pancontrol/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet.pancontrol-tests.ts"
+    ]
+}
diff --git a/types/leaflet.pancontrol/tslint.json b/types/leaflet.pancontrol/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/leaflet.pancontrol/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/leaflet.polylinemeasure/index.d.ts b/types/leaflet.polylinemeasure/index.d.ts
new file mode 100644
index 0000000000..ea647b1266
--- /dev/null
+++ b/types/leaflet.polylinemeasure/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for leaflet.polylinemeasure 1.0
+// Project: https://github.com/ppete2/Leaflet.PolylineMeasure#readme
+// Definitions by: Rinat Sultanov <https://github.com/RiON69>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as L from 'leaflet';
+
+declare module 'leaflet' {
+    namespace Control {
+        interface PolylineMeasure extends Control {
+            new (options?: PolylineMeasureOptions): any;
+        }
+
+        interface PolylineMeasureOptions {
+            position?: string;
+            unit?: string;
+            measureControlTitleOn?: string;
+            measureControlTitleOff?: string;
+            measureControlLabel?: string;
+            measureControlClasses?: any[];
+            backgroundColor?: string;
+            cursor?: string;
+            clearMeasurementsOnStop?: boolean;
+            showMeasurementsClearControl?: boolean;
+            clearControlTitle?: string;
+            clearControlLabel?: string;
+            clearControlClasses?: any[];
+            showUnitControl?: boolean;
+            tempLine?: any;
+            fixedLine?: any;
+            startCircle?: any;
+            intermedCircle?: any;
+            currentCircle?: any;
+            endCircle?: any;
+        }
+    }
+
+    namespace control {
+        function polylineMeasure(options?: Control.PolylineMeasureOptions): Control.PolylineMeasure;
+    }
+}
diff --git a/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts
new file mode 100644
index 0000000000..c659a77b1c
--- /dev/null
+++ b/types/leaflet.polylinemeasure/leaflet.polylinemeasure-tests.ts
@@ -0,0 +1,11 @@
+import * as L from 'leaflet';
+import 'leaflet.polylinemeasure';
+
+const map = L.map('map', {center: L.latLng(43.24209, 76.87743), zoom: 15});
+
+L.tileLayer("http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", {
+    subdomains: ['a', 'b', 'c'],
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+}).addTo(map);
+
+L.control.polylineMeasure().addTo(map);
diff --git a/types/leaflet.polylinemeasure/tsconfig.json b/types/leaflet.polylinemeasure/tsconfig.json
new file mode 100644
index 0000000000..b1db5e086d
--- /dev/null
+++ b/types/leaflet.polylinemeasure/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "DOM"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet.polylinemeasure-tests.ts"
+    ]
+}
diff --git a/types/leaflet.polylinemeasure/tslint.json b/types/leaflet.polylinemeasure/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/leaflet.polylinemeasure/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index aa0a0e2e92..eabb98c710 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Leaflet.js 1.2
 // Project: https://github.com/Leaflet/Leaflet
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
+//                 Arne Schubert <https://github.com/atd-schubert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -17,18 +18,15 @@ export class Class {
 
 export class Transformation {
     constructor(a: number, b: number, c: number, d: number);
-
     transform(point: Point, scale?: number): Point;
-
     untransform(point: Point, scale?: number): Point;
 }
 
 export namespace LineUtil {
     function simplify(points: Point[], tolerance: number): Point[];
-
     function pointToSegmentDistance(p: Point, p1: Point, p2: Point): number;
-
     function closestPointOnSegment(p: Point, p1: Point, p2: Point): Point;
+    function isFlat(latlngs: LatLngExpression[]): boolean;
 }
 
 export namespace PolyUtil {
@@ -240,20 +238,22 @@ export abstract class Evented extends Class {
      */
     on(eventMap: LeafletEventHandlerFnMap): this;
 
-    /* tslint:disable:unified-signatures */ // With an eventMap there are no additional arguments allowed
     /**
      * Removes a previously added listener function. If no function is specified,
      * it will remove all the listeners of that particular event from the object.
      * Note that if you passed a custom context to on, you must pass the same context
      * to off in order to remove the listener.
      */
+     // With an eventMap there are no additional arguments allowed
+    // tslint:disable-next-line:unified-signatures
     off(type: string, fn?: LeafletEventHandlerFn, context?: any): this;
 
     /**
      * Removes a set of type/listener pairs.
      */
+     // With an eventMap there are no additional arguments allowed
+    // tslint:disable-next-line:unified-signatures
     off(eventMap: LeafletEventHandlerFnMap): this;
-    /* tslint:enable */
     /**
      * Removes all listeners to all events on the object.
      */
@@ -580,9 +580,9 @@ export interface PolylineOptions extends PathOptions {
     noClip?: boolean;
 }
 
-export class Polyline<T extends geojson.GeometryObject = geojson.LineString | geojson.MultiLineString> extends Path {
+export class Polyline<T extends geojson.GeometryObject = geojson.LineString | geojson.MultiLineString, P = any> extends Path {
     constructor(latlngs: LatLngExpression[], options?: PolylineOptions);
-    toGeoJSON(): geojson.Feature<T>;
+    toGeoJSON(): geojson.Feature<T, P>;
     getLatLngs(): LatLng[];
     setLatLngs(latlngs: LatLngExpression[]): this;
     isEmpty(): boolean;
@@ -590,19 +590,19 @@ export class Polyline<T extends geojson.GeometryObject = geojson.LineString | ge
     getBounds(): LatLngBounds;
     addLatLng(latlng: LatLngExpression | LatLngExpression[]): this;
 
-    feature?: geojson.Feature<T>;
+    feature?: geojson.Feature<T, P>;
     options: PolylineOptions;
 }
 
 export function polyline(latlngs: LatLngExpression[], options?: PolylineOptions): Polyline;
 
-export class Polygon extends Polyline<geojson.Polygon | geojson.MultiPolygon> {
+export class Polygon<P = any> extends Polyline<geojson.Polygon | geojson.MultiPolygon, P> {
     constructor(latlngs: LatLngExpression[] | LatLngExpression[][], options?: PolylineOptions);
 }
 
 export function polygon(latlngs: LatLngExpression[] | LatLngExpression[][], options?: PolylineOptions): Polygon;
 
-export class Rectangle extends Polygon {
+export class Rectangle<P = any> extends Polygon<P> {
     constructor(latLngBounds: LatLngBoundsExpression, options?: PolylineOptions);
     setBounds(latLngBounds: LatLngBoundsExpression): this;
 }
@@ -613,21 +613,21 @@ export interface CircleMarkerOptions extends PathOptions {
     radius?: number;
 }
 
-export class CircleMarker extends Path {
+export class CircleMarker<P = any> extends Path {
     constructor(latlng: LatLngExpression, options?: CircleMarkerOptions);
-    toGeoJSON(): geojson.Feature<geojson.Point>;
+    toGeoJSON(): geojson.Feature<geojson.Point, P>;
     setLatLng(latLng: LatLngExpression): this;
     getLatLng(): LatLng;
     setRadius(radius: number): this;
     getRadius(): number;
 
     options: CircleMarkerOptions;
-    feature?: geojson.Feature<geojson.Point>;
+    feature?: geojson.Feature<geojson.Point, P>;
 }
 
 export function circleMarker(latlng: LatLngExpression, options?: CircleMarkerOptions): CircleMarker;
 
-export class Circle extends CircleMarker {
+export class Circle<P = any> extends CircleMarker<P> {
     constructor(latlng: LatLngExpression, options?: CircleMarkerOptions);
     constructor(latlng: LatLngExpression, radius: number, options?: CircleMarkerOptions); // deprecated!
     getBounds(): LatLngBounds;
@@ -665,12 +665,13 @@ export function canvas(options?: RendererOptions): Canvas;
  * If you add it to the map, any layers added or removed from the group will be
  * added/removed on the map as well. Extends Layer.
  */
-export class LayerGroup extends Layer {
-    constructor(layers?: Layer[]);
+export class LayerGroup<P = any> extends Layer {
+    constructor(layers?: Layer[], options?: LayerOptions);
+
     /**
      * Returns a GeoJSON representation of the layer group (as a GeoJSON GeometryCollection, GeoJSONFeatureCollection or Multipoint).
      */
-    toGeoJSON(): geojson.FeatureCollection<geojson.GeometryObject> | geojson.Feature<geojson.MultiPoint> | geojson.GeometryCollection;
+    toGeoJSON(): geojson.FeatureCollection<geojson.GeometryObject, P> | geojson.Feature<geojson.MultiPoint, P> | geojson.GeometryCollection;
 
     /**
      * Adds the given layer to the group.
@@ -724,23 +725,23 @@ export class LayerGroup extends Layer {
      */
     getLayerId(layer: Layer): number;
 
-    feature?: geojson.FeatureCollection<geojson.GeometryObject> | geojson.Feature<geojson.MultiPoint> | geojson.GeometryCollection;
+    feature?: geojson.FeatureCollection<geojson.GeometryObject, P> | geojson.Feature<geojson.MultiPoint, P> | geojson.GeometryCollection;
 }
 
 /**
- * Create a layer group, optionally given an initial set of layers.
+ * Create a layer group, optionally given an initial set of layers and an `options` object.
  */
-export function layerGroup(layers: Layer[]): LayerGroup;
+export function layerGroup(layers?: Layer[], options?: LayerOptions): LayerGroup;
 
 /**
  * Extended LayerGroup that also has mouse events (propagated from
  * members of the group) and a shared bindPopup method.
  */
-export class FeatureGroup extends LayerGroup {
+export class FeatureGroup<P = any> extends LayerGroup<P> {
     /**
      * Sets the given path options to each layer of the group that has a setStyle method.
      */
-    setStyle(style: StyleFunction): this;
+    setStyle(style: PathOptions): this;
 
     /**
      * Brings the layer group to the top of all other layers
@@ -764,9 +765,9 @@ export class FeatureGroup extends LayerGroup {
  */
 export function featureGroup(layers?: Layer[]): FeatureGroup;
 
-export type StyleFunction = (feature?: geojson.Feature<geojson.GeometryObject>) => PathOptions;
+export type StyleFunction<P = any> = (feature?: geojson.Feature<geojson.GeometryObject, P>) => PathOptions;
 
-export interface GeoJSONOptions extends LayerOptions {
+export interface GeoJSONOptions<P = any> extends LayerOptions {
     /**
      * A Function defining how GeoJSON points spawn Leaflet layers.
      * It is internally called when data is added, passing the GeoJSON point
@@ -780,7 +781,7 @@ export interface GeoJSONOptions extends LayerOptions {
      * }
      * ```
      */
-    pointToLayer?(geoJsonPoint: geojson.Feature<geojson.Point>, latlng: LatLng): Layer; // should import GeoJSON typings
+    pointToLayer?(geoJsonPoint: geojson.Feature<geojson.Point, P>, latlng: LatLng): Layer; // should import GeoJSON typings
 
     /**
      * A Function defining the Path options for styling GeoJSON lines and polygons,
@@ -794,7 +795,7 @@ export interface GeoJSONOptions extends LayerOptions {
      * }
      * ```
      */
-    style?: StyleFunction;
+    style?: StyleFunction<P>;
 
     /**
      * A Function that will be called once for each created Feature, after it
@@ -806,7 +807,7 @@ export interface GeoJSONOptions extends LayerOptions {
      * function (feature, layer) {}
      * ```
      */
-    onEachFeature?(feature: geojson.Feature<geojson.GeometryObject>, layer: Layer): void;
+    onEachFeature?(feature: geojson.Feature<geojson.GeometryObject, P>, layer: Layer): void;
 
     /**
      * A Function that will be used to decide whether to show a feature or not.
@@ -819,7 +820,7 @@ export interface GeoJSONOptions extends LayerOptions {
      * }
      * ```
      */
-    filter?(geoJsonFeature: geojson.Feature<geojson.GeometryObject>): boolean;
+    filter?(geoJsonFeature: geojson.Feature<geojson.GeometryObject, P>): boolean;
 
     /**
      * A Function that will be used for converting GeoJSON coordinates to LatLngs.
@@ -832,12 +833,12 @@ export interface GeoJSONOptions extends LayerOptions {
  * Represents a GeoJSON object or an array of GeoJSON objects.
  * Allows you to parse GeoJSON data and display it on the map. Extends FeatureGroup.
  */
-export class GeoJSON extends FeatureGroup {
+export class GeoJSON<P = any> extends FeatureGroup<P> {
     /**
      * Creates a Layer from a given GeoJSON feature. Can use a custom pointToLayer
      * and/or coordsToLatLng functions if provided as options.
      */
-    static geometryToLayer(featureData: geojson.Feature<geojson.GeometryObject>, options?: GeoJSONOptions): Layer;
+    static geometryToLayer<P = any>(featureData: geojson.Feature<geojson.GeometryObject, P>, options?: GeoJSONOptions<P>): Layer;
 
     /**
      * Creates a LatLng object from an array of 2 numbers (longitude, latitude) or
@@ -871,9 +872,9 @@ export class GeoJSON extends FeatureGroup {
     /**
      * Normalize GeoJSON geometries/features into GeoJSON features.
      */
-    static asFeature(geojson: geojson.Feature<geojson.GeometryObject> | geojson.GeometryObject): geojson.Feature<geojson.GeometryObject>;
+    static asFeature<P = any>(geojson: geojson.Feature<geojson.GeometryObject, P> | geojson.GeometryObject): geojson.Feature<geojson.GeometryObject, P>;
 
-    constructor(geojson?: geojson.GeoJsonObject, options?: GeoJSONOptions)
+    constructor(geojson?: geojson.GeoJsonObject, options?: GeoJSONOptions<P>)
     /**
      * Adds a GeoJSON object to the layer.
      */
@@ -885,12 +886,7 @@ export class GeoJSON extends FeatureGroup {
      */
     resetStyle(layer: Layer): Layer;
 
-    /**
-     * Changes styles of GeoJSON vector layers with the given style function.
-     */
-    setStyle(style: StyleFunction): this;
-
-    options: GeoJSONOptions;
+    options: GeoJSONOptions<P>;
 }
 
 /**
@@ -900,7 +896,7 @@ export class GeoJSON extends FeatureGroup {
  * map (you can alternatively add it later with addData method) and
  * an options object.
  */
-export function geoJSON(geojson?: geojson.GeoJsonObject, options?: GeoJSONOptions): GeoJSON;
+export function geoJSON<P = any>(geojson?: geojson.GeoJsonObject, options?: GeoJSONOptions<P>): GeoJSON<P>;
 
 export type Zoom = boolean | 'center';
 
@@ -1132,9 +1128,8 @@ export interface PanOptions {
     noMoveStart?: boolean;
 }
 
-/* tslint:disable:no-empty-interface */ // This is not empty, it extends two interfaces into one...
+// This is not empty, it extends two interfaces into one...
 export interface ZoomPanOptions extends ZoomOptions, PanOptions {}
-/* tslint:enable */
 
 export interface FitBoundsOptions extends ZoomOptions, PanOptions {
     paddingTopLeft?: PointExpression;
@@ -1327,7 +1322,7 @@ export class Map extends Evented {
     flyToBounds(bounds: LatLngBoundsExpression, options?: FitBoundsOptions): this;
 
     // Other methods
-    addHandler(name: string, HandlerClass: () => Handler): this; // HandlerClass is actually a constructor function, is this the right way?
+    addHandler(name: string, HandlerClass: typeof Handler): this; // Alternatively, HandlerClass: new(map: Map) => Handler
     remove(): this;
     createPane(name: string, container?: HTMLElement): HTMLElement;
     /**
@@ -1395,6 +1390,7 @@ export interface BaseIconOptions extends LayerOptions {
     iconSize?: PointExpression;
     iconAnchor?: PointExpression;
     popupAnchor?: PointExpression;
+    tooltipAnchor?: PointExpression;
     shadowUrl?: string;
     shadowRetinaUrl?: string;
     shadowSize?: PointExpression;
@@ -1455,8 +1451,9 @@ export interface MarkerOptions extends InteractiveLayerOptions {
     riseOffset?: number;
 }
 
-export class Marker extends Layer {
+export class Marker<P = any> extends Layer {
     constructor(latlng: LatLngExpression, options?: MarkerOptions);
+    toGeoJSON(): geojson.Feature<geojson.Point, P>;
     getLatLng(): LatLng;
     setLatLng(latlng: LatLngExpression): this;
     setZIndexOffset(offset: number): this;
@@ -1467,6 +1464,7 @@ export class Marker extends Layer {
     // Properties
     options: MarkerOptions;
     dragging?: Handler;
+    feature?: geojson.Feature<geojson.Point, P>;
 }
 
 export function marker(latlng: LatLngExpression, options?: MarkerOptions): Marker;
diff --git a/types/leaflet/leaflet-tests.ts b/types/leaflet/leaflet-tests.ts
index b85c8bf4d7..c4f73e5b84 100644
--- a/types/leaflet/leaflet-tests.ts
+++ b/types/leaflet/leaflet-tests.ts
@@ -368,7 +368,7 @@ map = map
 	.flyToBounds(latLngBounds, fitBoundsOptions)
 	.flyToBounds(latLngBoundsLiteral)
 	.flyToBounds(latLngBoundsLiteral, fitBoundsOptions)
-	// addHandler
+	.addHandler('Hello World', L.Handler)
 	.remove()
 	.whenReady(() => {})
 	.whenReady(() => {}, {});
@@ -381,11 +381,11 @@ draggable.on('drag', () => {});
 
 let twoCoords: [number, number] = [1, 2];
 latLng = L.GeoJSON.coordsToLatLng(twoCoords);
-twoCoords = L.GeoJSON.latLngToCoords(latLng);
+twoCoords = L.GeoJSON.latLngToCoords(latLng) as [number, number];
 
-let threeCoords: [number, number] = [1, 2];
+let threeCoords: [number, number, number] = [1, 2, 3];
 latLng = L.GeoJSON.coordsToLatLng(threeCoords);
-threeCoords = L.GeoJSON.latLngToCoords(latLng);
+threeCoords = L.GeoJSON.latLngToCoords(latLng) as [number, number, number];
 
 let nestedTwoCoords = [ [12, 13], [13, 14], [14, 15] ];
 const nestedLatLngs: L.LatLng[] = L.GeoJSON.coordsToLatLngs(nestedTwoCoords, 1);
@@ -484,3 +484,29 @@ L.Util.requestAnimFrame(() => {}, {});
 L.Util.requestAnimFrame(() => {}, {}, true);
 L.Util.cancelAnimFrame(1);
 L.Util.emptyImageUrl;
+
+interface MyProperties {
+	testProperty: string;
+}
+
+(L.polygon(latLngs) as L.Polygon<MyProperties>).feature.properties.testProperty = "test";
+
+(L.marker([1, 2], {
+	icon: L.icon({
+		iconUrl: 'my-icon.png'
+	})
+}) as L.Marker<MyProperties>).feature.properties.testProperty = "test";
+
+let lg = L.layerGroup();
+lg = L.layerGroup([new L.Layer(), new L.Layer()]);
+lg = L.layerGroup([new L.Layer(), new L.Layer()], {
+	pane: 'overlayPane',
+	attribution: 'test'
+});
+
+lg = new L.LayerGroup();
+lg = new L.LayerGroup([new L.Layer(), new L.Layer()]);
+lg = new L.LayerGroup([new L.Layer(), new L.Layer()], {
+	pane: 'overlayPane',
+	attribution: 'test'
+});
diff --git a/types/leaflet/tslint.json b/types/leaflet/tslint.json
index a7cf035dfc..e504c08f8d 100644
--- a/types/leaflet/tslint.json
+++ b/types/leaflet/tslint.json
@@ -2,6 +2,7 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // TODOs
+        "no-unnecessary-class": false,
         "no-object-literal-type-assertion": false,
         "no-single-declare-module": false
     }
diff --git a/types/leaflet/v0/index.d.ts b/types/leaflet/v0/index.d.ts
index b33d19c5bb..efadd88e8f 100644
--- a/types/leaflet/v0/index.d.ts
+++ b/types/leaflet/v0/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Leaflet/Leaflet
 // Definitions by: Vladimir Zotov <https://github.com/rgripper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="geojson" />
 
diff --git a/types/leaflet/v0/tslint.json b/types/leaflet/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/leaflet/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/leapmotionts/tslint.json b/types/leapmotionts/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/leapmotionts/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/left-pad/index.d.ts b/types/left-pad/index.d.ts
deleted file mode 100644
index 1296c4fe02..0000000000
--- a/types/left-pad/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for left-pad 1.1
-// Project: https://github.com/stevemao/left-pad
-// Definitions by: Zlatko Andonovski <https://github.com/Goldsmith42>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function leftPad(str: string|number, len: number, ch?: string|number): string;
-
-export = leftPad;
diff --git a/types/left-pad/left-pad-tests.ts b/types/left-pad/left-pad-tests.ts
deleted file mode 100644
index a3749feb16..0000000000
--- a/types/left-pad/left-pad-tests.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import leftPad = require("left-pad");
-
-// Tests based on examples in https://github.com/stevemao/left-pad#usage
-
-leftPad("foo", 5);
-// => "  foo"
-
-leftPad("foobar", 6);
-// => "foobar"'
-
-leftPad(1, 2, "0");
-// => "01"
-
-leftPad(17, 5, 0);
-// => "00017"
diff --git a/types/left-pad/tsconfig.json b/types/left-pad/tsconfig.json
deleted file mode 100644
index 383ebedf76..0000000000
--- a/types/left-pad/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "left-pad-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/legal-eagle/index.d.ts b/types/legal-eagle/index.d.ts
new file mode 100644
index 0000000000..36603efdee
--- /dev/null
+++ b/types/legal-eagle/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for legal-eagle 0.15
+// Project: https://github.com/atom/legal-eagle
+// Definitions by: Jed Fox <https://github.com/j-f1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function legalEagle(
+    options: legalEagle.Options,
+    cb: (err: Error | null, licenseSummary: legalEagle.LicenseLookup) => void
+): void;
+
+declare namespace legalEagle {
+    interface Options {
+        path: string;
+        overrides?: LicenseLookup;
+        omitPermissive?: boolean;
+    }
+    interface LicenseLookup {
+        [id: string]: Entry;
+    }
+    interface Entry {
+        license: string;
+        source: string;
+        repository: string;
+        sourceText: string;
+    }
+}
+
+export = legalEagle;
diff --git a/types/legal-eagle/legal-eagle-tests.ts b/types/legal-eagle/legal-eagle-tests.ts
new file mode 100644
index 0000000000..59622c4254
--- /dev/null
+++ b/types/legal-eagle/legal-eagle-tests.ts
@@ -0,0 +1,44 @@
+/// <reference types="node" />
+
+import legalEagle = require('legal-eagle');
+
+// from the package's README
+legalEagle({path: process.cwd()}, (err, summary) => {
+    if (err != null) {
+        console.error(err);
+        return;
+    }
+    console.log(summary);
+});
+
+// from GitHub desktop
+declare var appRoot: string;
+legalEagle(
+    {
+        path: appRoot,
+        overrides: {
+            'foo@1.2.3': {
+                repository: 'git+ssh://git@github.com/foo/bar',
+                license: '...',
+                source: '...',
+                sourceText: '...',
+            }
+        },
+        omitPermissive: true
+    }, (err, summary) => {
+        if (err) {
+            console.error(err);
+            return;
+        }
+
+        if (Object.keys(summary).length > 0) {
+            let licensesMessage = '';
+            for (const key in summary) {
+                const license = summary[key];
+                licensesMessage += `${key} (${license.repository}): ${license.license}\n`;
+            }
+
+            throw new Error(licensesMessage);
+        }
+    }
+);
diff --git a/types/legal-eagle/tsconfig.json b/types/legal-eagle/tsconfig.json
new file mode 100644
index 0000000000..380eaaed72
--- /dev/null
+++ b/types/legal-eagle/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "legal-eagle-tests.ts"
+    ]
+}
diff --git a/types/legal-eagle/tslint.json b/types/legal-eagle/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/legal-eagle/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/less-middleware/index.d.ts b/types/less-middleware/index.d.ts
index 1dc1da65c5..5c444919f8 100644
--- a/types/less-middleware/index.d.ts
+++ b/types/less-middleware/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/emberfeather/less.js-middleware
 // Definitions by: Federico Bond <https://github.com/federicobond>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 
@@ -98,7 +99,7 @@ declare function lessMiddleware(source: string, options?: {
      * Path to a JSON file that will be used to cache less data across server restarts.
      * This can greatly speed up initial load time after a server restart - if the less
      * files haven't changed and the css files still exist, specifying this option will
-     * mean that the less files don't need to be recompiled after a server restart.  
+     * mean that the less files don't need to be recompiled after a server restart.
      */
     cacheFile?: string;
 
diff --git a/types/less-middleware/tslint.json b/types/less-middleware/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/less-middleware/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/less/tslint.json b/types/less/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/less/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/less2sass/index.d.ts b/types/less2sass/index.d.ts
new file mode 100644
index 0000000000..25848117f2
--- /dev/null
+++ b/types/less2sass/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for less2sass 1.0
+// Project: https://github.com/ekryski/less2sass
+// Definitions by: William Lohan <https://github.com/gatimus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Less2Sass {
+    convert(file: string): string;
+}
+
+declare const less2sass: Less2Sass;
+export = less2sass;
diff --git a/types/less2sass/less2sass-tests.ts b/types/less2sass/less2sass-tests.ts
new file mode 100644
index 0000000000..578b731887
--- /dev/null
+++ b/types/less2sass/less2sass-tests.ts
@@ -0,0 +1,4 @@
+import * as less2sass from 'less2sass';
+
+let scss: string;
+scss = less2sass.convert('@myColor: #f938ab; .myClass { color: @myColor; }');
diff --git a/types/less2sass/tsconfig.json b/types/less2sass/tsconfig.json
new file mode 100644
index 0000000000..e70848dca8
--- /dev/null
+++ b/types/less2sass/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "less2sass-tests.ts"
+    ]
+}
diff --git a/types/less2sass/tslint.json b/types/less2sass/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/less2sass/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/level-sublevel/tslint.json b/types/level-sublevel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/level-sublevel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/levelup/tslint.json b/types/levelup/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/levelup/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/levenshtein/tslint.json b/types/levenshtein/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/levenshtein/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/libpq/index.d.ts b/types/libpq/index.d.ts
index 1ad194eb14..2897eb3aab 100644
--- a/types/libpq/index.d.ts
+++ b/types/libpq/index.d.ts
@@ -45,7 +45,7 @@ declare class Libpq extends EventEmitter {
     /**
      * Issues a request to cancel the currently executing query on this instance of libpq.
      *
-     * @returns {(boolean|string)} true if the cancel request was sent; a string error message if
+     * @returns true if the cancel request was sent; a string error message if
      *                             the cancel request failed for any reason. The string will
      *                             contain the error message provided by libpq.
      */
@@ -58,13 +58,13 @@ declare class Libpq extends EventEmitter {
     clear(): void;
 
     /**
-     * @returns {string} the status string associated with a result. Something akin to INSERT 3 0
+     * @returns the status string associated with a result. Something akin to INSERT 3 0
      *                   if you inserted 3 rows.
      */
     cmdStatus(): string;
 
     /**
-     * @returns {string} the number of tuples (rows) affected by the command. Even though this is a
+     * @returns the number of tuples (rows) affected by the command. Even though this is a
      *                   number, it is returned as a string to mirror libpq's behavior.
      */
     cmdTuples(): string;
@@ -80,8 +80,8 @@ declare class Libpq extends EventEmitter {
      * libuv_queue_work and let node do it's magic and so that's what I do. This function does
      * not block.
      *
-     * @param {string} connectParams an optional string
-     * @param {Function} callback mandatory. It is called when the connection has successfully been
+     * @param connectParams an optional string
+     * @param callback mandatory. It is called when the connection has successfully been
      *                            established.
      */
     connect(connectParams: string, callback: (err?: Error) => void): void;
@@ -91,7 +91,7 @@ declare class Libpq extends EventEmitter {
      * (sync) Attempts to connect to a PostgreSQL server. BLOCKS until it either succeedes, or
      * fails. If it fails it will throw an exception.
      *
-     * @param {string} connectionParams an optional string
+     * @param connectionParams an optional string
      */
     connectSync(connectionParams?: string): void;
 
@@ -99,7 +99,7 @@ declare class Libpq extends EventEmitter {
      * Reads waiting data from the socket. If the socket is not readable and you call this it will
      * block so be careful and only call it within the readable callback for the most part.
      *
-     * @returns {boolean} true if data was read; false if there was an error. You can access
+     * @returns true if data was read; false if there was an error. You can access
      *                    error details with [[Libpq.errorMessage]].
      */
     consumeInput(): boolean;
@@ -109,39 +109,33 @@ declare class Libpq extends EventEmitter {
      * functions which return an error code to get more detailed error information about the
      * connection. You can also check this before issuing queries to see if your connection has
      * been lost.
-     *
-     * @returns {string}
      */
     errorMessage(): string;
 
     /**
      * Exact copy of the PQescapeIdentifier function within libpq. Requires an established
      * connection but does not perform any I/O.
-     *
-     * @param {string} input
      */
     escapeIdentifier(input: string): string;
 
     /**
      * Exact copy of the PQescapeLiteral function within libpq. Requires an established connection
      * but does not perform any I/O.
-     *
-     * @param {string} input
      */
     escapeLiteral(input: string): string;
 
     /**
      * (sync) Sends a command to the backend and blocks until a result is received.
      *
-     * @param {string} [commandText=""] a required string of the query.
+     * @param [commandText=""] a required string of the query.
      */
     exec(commandText?: string): void;
 
     /**
      * (sync) Sends a command and parameters to the backend and blocks until a result is received.
      *
-     * @param {string} [commandText=""] a required string of the query.
-     * @param {Array.<(string|number)>} [parameters=[]] a required array of string values
+     * @param [commandText=""] a required string of the query.
+     * @param [parameters=[]] a required array of string values
      *                                                  corresponding to each parameter in the
      *                                                  commandText.
      */
@@ -151,8 +145,8 @@ declare class Libpq extends EventEmitter {
      * (sync) Sends a command to the server to execute a previously prepared statement. Blocks
      * until the results are returned.
      *
-     * @param {string} [statementName=""] a required string of the name of the prepared statement.
-     * @param {Array.<(string|number)>} [parameters=[]] the parameters to pass to the prepared
+     * @param [statementName=""] a required string of the name of the prepared statement.
+     * @param [parameters=[]] the parameters to pass to the prepared
      *                                                  statement.
      */
     execPrepared(statementName?: string, parameters?: Array<string|number>): void;
@@ -165,7 +159,7 @@ declare class Libpq extends EventEmitter {
     /**
      * Flushes buffered data to the socket.
      *
-     * @returns {number} 1 if socket is not write-ready at which case you should call
+     * @returns 1 if socket is not write-ready at which case you should call
      *                   [[Libpq.writable]] with a callback and wait for the socket to be writable
      *                   and then call [[Libpq.flush]] again; 0 if all data was flushed; -1 if
      *                   there was an error.
@@ -174,17 +168,11 @@ declare class Libpq extends EventEmitter {
 
     /**
      * Retrieve the name of the field (column) at the given offset. Offset starts at 0.
-     *
-     * @param {number} fieldNumber
-     * @returns {string}
      */
     fname(fieldNumber: number): string;
 
     /**
      * Retrieve the Oid of the field (column) at the given offset. Offset starts at 0.
-     *
-     * @param {number} fieldNumber
-     * @returns {number}
      */
     ftype(fieldNumber: number): number;
 
@@ -192,19 +180,17 @@ declare class Libpq extends EventEmitter {
      * After issuing a successfuly command like COPY table TO stdout gets copy data from the
      * connection.
      *
-     * @param {boolean} [async=false] a boolean. Pass false to block waiting for data from the
+     * @param [async=false] a boolean. Pass false to block waiting for data from the
      *                                backend. Defaults to false.
      *
-     * @returns {Buffer|number} a node buffer if there is data available; 0 if the copy is still in
+     * @returns a node buffer if there is data available; 0 if the copy is still in
      *                          progress (only if you have called [[Libpq.setNonBlocking]](true));
      *                          -1 if the copy is completed; -2 if there was an error.
      */
     getCopyData(async?: boolean): Buffer|number;
 
     /**
-     * @param {number} tupleNumber
-     * @param {number} fieldNumber
-     * @returns {boolean} true if the value at the given offsets is actually null. Otherwise
+     * @returns true if the value at the given offsets is actually null. Otherwise
      *                    returns false. This is because [[Libpq.getvalue]] returns an empty
      *                    string for both an actual empty string and for a null value. Weird, huh?
      */
@@ -217,7 +203,7 @@ declare class Libpq extends EventEmitter {
      * Warning: this function will block if libpq is waiting on async results to be returned from
      * the server. Call [[Libpq.isBusy]] to determine if this command will block.
      *
-     * @returns {boolean} true if libpq was able to read buffered data & parse a result object;
+     * @returns true if libpq was able to read buffered data & parse a result object;
      *                    false if there are no results waiting to be parsed. Generally doing async
      *                    style queries you'll call this repeadedly until it returns false and then
      *                    use the result accessor methods to pull results out of the current result
@@ -228,29 +214,23 @@ declare class Libpq extends EventEmitter {
     /**
      * Retrieve the text value at a given tuple (row) and field (column) offset. Both offsets start
      * at 0. A null value is returned as the empty string ''.
-     *
-     * @param {number} tupleNumber
-     * @param {number} [fieldNumber]
-     * @returns {string}
      */
     getvalue(tupleNumber: number, fieldNumber?: number): string;
 
     /**
-     * @returns {boolean} true if calling [[Libpq.consumeInput]] would block waiting for more
+     * @returns true if calling [[Libpq.consumeInput]] would block waiting for more
      * data; false if all data has been read from the socket. Once this returns false it is
      * safe to call [[Libpq.getResult]].
      */
     isBusy(): boolean;
 
     /**
-     * @returns {boolean} true if non-blocking mode is enabled; false if disabled.
+     * @returns true if non-blocking mode is enabled; false if disabled.
      */
     isNonBlocking(): boolean;
 
     /**
      * Retrieve the number of fields (columns) from the result.
-     *
-     * @returns {number}
      */
     nfields(): number;
 
@@ -266,15 +246,11 @@ declare class Libpq extends EventEmitter {
      *   be_pid: 130
      * }
      * ```
-     *
-     * @returns {Libpq.NotifyMsg}
      */
     notifies(): Libpq.NotifyMsg;
 
     /**
      * Retrieve the number of tuples (rows) from the result.
-     *
-     * @returns {number}
      */
     ntuples(): number;
 
@@ -282,10 +258,10 @@ declare class Libpq extends EventEmitter {
      * After issuing a successful command like COPY table FROM stdin you can start putting buffers
      * directly into the databse with this function.
      *
-     * @param {Buffer} buffer a required node buffer of text data such as
+     * @param buffer a required node buffer of text data such as
      *                        Buffer('column1\tcolumn2\n')
      *
-     * @returns {number} 1 if sent succesfully; 0 if the command would block (only if you have
+     * @returns 1 if sent succesfully; 0 if the command would block (only if you have
      *                   called [[Libpq.setNonBlocking]](true)); -1 if there was an error sending
      *                   the command.
      */
@@ -295,9 +271,9 @@ declare class Libpq extends EventEmitter {
      * Signals the backed your copy procedure is complete. If you pass errorMessage it will be sent
      * to the backend and effectively cancel the copy operation.
      *
-     * @param {string} [errorMessage] an optional string you can pass to cancel the copy operation.
+     * @param [errorMessage] an optional string you can pass to cancel the copy operation.
      *
-     * @returns {number} 1 if sent succesfully; 0 if the command would block (only if you have
+     * @returns 1 if sent succesfully; 0 if the command would block (only if you have
      *                   called [[Libpq.setNonBlocking]](true)); -1 if there was an error sending
      *                   the command.
      */
@@ -307,9 +283,9 @@ declare class Libpq extends EventEmitter {
      * (sync) Sends a named statement to the server to be prepared for later execution. blocks
      * until a result from the prepare operation is received.
      *
-     * @param {string} statementName a required string of name of the statement to prepare.
-     * @param {string} commandText a required string of the query.
-     * @param {number} nParams a count of the number of parameters in the commandText.
+     * @param statementName a required string of name of the statement to prepare.
+     * @param commandText a required string of the query.
+     * @param nParams a count of the number of parameters in the commandText.
      */
     prepare(statementName: string, commandText: string, nParams: number): void;
 
@@ -324,20 +300,17 @@ declare class Libpq extends EventEmitter {
      *
      * console.log(pq.errorFields().messageDetail);
      * ```
-     * @returns {Libpq.ResultError}
      */
     resultErrorFields(): Libpq.ResultError;
 
     /**
      * Retrieves the error message from the result. This will return null if the result does not
      * have an error.
-     *
-     * @returns {string}
      */
     resultErrorMessage(): string;
 
     /**
-     * @returns {string} either PGRES_COMMAND_OK or PGRES_FATAL_ERROR depending on the status of
+     * @returns either PGRES_COMMAND_OK or PGRES_FATAL_ERROR depending on the status of
      * the last executed command.
      */
     resultStatus(): string;
@@ -345,37 +318,37 @@ declare class Libpq extends EventEmitter {
     /**
      * (async) Sends a query to the server to be processed.
      *
-     * @param {string} [commandText=""] a required string containing the query text.
-     * @returns {boolean} true if the command was sent succesfully or false if it failed to send.
+     * @param [commandText=""] a required string containing the query text.
+     * @returns true if the command was sent succesfully or false if it failed to send.
      */
     sendQuery(commandText?: string): boolean;
 
     /**
      * (async) Sends a query and to the server to be processed.
      *
-     * @param {string} [commandText=""] a required string containing the query text.
-     * @param {Array.<(string|number)>} [parameters=[]] an array of parameters as strings used in
+     * @param [commandText=""] a required string containing the query text.
+     * @param [parameters=[]] an array of parameters as strings used in
      *                                                  the parameterized query.
-     * @returns {boolean} true if the command was sent succesfully or false if it failed to send.
+     * @returns true if the command was sent succesfully or false if it failed to send.
      */
     sendQueryParams(commandText?: string, parameters?: Array<string|number>): boolean;
 
     /**
      * (async) Sends a request to the backend to prepare a named statement with the given name.
      *
-     * @param {string} statementName a required string of name of the statement to prepare.
-     * @param {string} commandText a required string of the query.
-     * @param {number} nParams a count of the number of parameters in the commandText.
-     * @returns {boolean} true if the command was sent succesfully or false if it failed to send.
+     * @param statementName a required string of name of the statement to prepare.
+     * @param commandText a required string of the query.
+     * @param nParams a count of the number of parameters in the commandText.
+     * @returns true if the command was sent succesfully or false if it failed to send.
      */
     sendPrepare(statementName: string, commandText: string, nParams: number): boolean;
 
     /**
      * (async) Sends a request to execute a previously prepared statement.
      *
-     * @param {string} [statementName=""] a required string of the name of the prepared statement.
-     * @param {string[]} [parameters=[]] the parameters to pass to the prepared statement.
-     * @returns {boolean} true if the command was sent succesfully or false if it failed to send.
+     * @param [statementName=""] a required string of the name of the prepared statement.
+     * @param [parameters=[]] the parameters to pass to the prepared statement.
+     * @returns true if the command was sent succesfully or false if it failed to send.
      */
     sendQueryPrepared(statementName?: string, parameters?: string[]): boolean;
 
@@ -387,16 +360,16 @@ declare class Libpq extends EventEmitter {
     /**
      * Toggle the socket blocking on write.
      *
-     * @param {boolean} [nonBlocking] true to set the connection to use non-blocking writes, false to
+     * @param [nonBlocking] true to set the connection to use non-blocking writes, false to
      *                                use blocking writes.
      *
-     * @returns {boolean} true if the socket's state was succesfully toggled, false if there was
+     * @returns true if the socket's state was succesfully toggled, false if there was
      *                    an error.
      */
     setNonBlocking(nonBlocking?: boolean): boolean;
 
     /**
-     * @returns {number} an int representing the file descriptor for the socket used internally by
+     * @returns an int representing the file descriptor for the socket used internally by
      *                   the connection.
      */
     socket(): number;
@@ -419,10 +392,6 @@ declare class Libpq extends EventEmitter {
      * Call this to make sure the socket has flushed all data to the operating system. Once the
      * socket is writable, your callback will be called. Usefully when using PQsetNonBlocking
      * and PQflush for async writing.
-     *
-     * @param {Function} callback
-     *
-     * @returns {Libpq}
      */
     writable(callback: () => void): this;
 }
diff --git a/types/libxmljs/index.d.ts b/types/libxmljs/index.d.ts
index c928f57362..ceeb1a3783 100644
--- a/types/libxmljs/index.d.ts
+++ b/types/libxmljs/index.d.ts
@@ -11,7 +11,7 @@ import events = require('events');
 
 export declare function parseXml(source: string): XMLDocument;
 export declare function parseHtml(source: string): HTMLDocument;
-export declare function parseXmlString(source: string): XMLDocument;
+export declare function parseXmlString(source: string, options?: { [key: string]: string }): XMLDocument;
 export declare function parseHtmlString(source: string): HTMLDocument;
 
 
diff --git a/types/libxmljs/tslint.json b/types/libxmljs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/libxmljs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/libxslt/tslint.json b/types/libxslt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/libxslt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/license-checker/index.d.ts b/types/license-checker/index.d.ts
index ec4ec39658..4ae2995ea0 100644
--- a/types/license-checker/index.d.ts
+++ b/types/license-checker/index.d.ts
@@ -1,87 +1,117 @@
-// Type definitions for license-checker 11.0
+// Type definitions for license-checker 15.0
 // Project: https://github.com/davglass/license-checker
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>, Daniel Perez Alvarez <https://github.com/unindented>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /**
  * Options struct for the init() function
  */
 export interface InitOpts {
-	/**
-	 * Path to start checking dependencies from
-	 */
-	start: string;
-	/**
-	 * only show production dependencies
-	 */
-	production?: boolean;
-	/**
-	 * only show development dependencies
-	 */
-	development?: boolean;
-	/**
-	 * report guessed licenses as unknown licenses
-	 */
-	unknown?: boolean;
-	/**
-	 * only list packages with unknown or guessed licenses
-	 */
-	onlyunknown?: boolean;
-	/**
-	 * to add a custom Format file in JSON
-	 */
-	customPath?: string;
-	/**
-	 * exclude modules which licenses are in the comma-separated list from the output
-	 */
-	exclude?: string[];
-	/**
-	 * Use chalk to colorize the licenses member of each returned module info. Unknown licenses become red.
-	 */
-	color?: boolean;
-	/**
-	 * output the location of the license files as relative paths
-	 */
-	relativeLicensePath?: boolean;
+    /**
+     * Path to start checking dependencies from
+     */
+    start: string;
+    /**
+     * Only show production dependencies
+     */
+    production?: boolean;
+    /**
+     * Only show development dependencies
+     */
+    development?: boolean;
+    /**
+     * Report guessed licenses as unknown licenses
+     */
+    unknown?: boolean;
+    /**
+     * Only list packages with unknown or guessed licenses
+     */
+    onlyunknown?: boolean;
+    /**
+     * to add a custom Format file in JSON
+     */
+    customPath?: string | ModuleInfo;
+    /**
+     * Exclude modules which licenses are in the comma-separated list from the output
+     */
+    exclude?: string[];
+    /**
+     * Output the location of the license files as relative paths
+     */
+    relativeLicensePath?: boolean;
+    /**
+     * Output a summary of the license usage
+     */
+    summary?: boolean;
+    /**
+     * Fail (exit with code 1) on the first occurrence of the licenses of the comma-separated list
+     */
+    failOn?: string[];
+    /**
+     * Use chalk to colorize the licenses member of each returned module info. Unknown licenses become red.
+     */
+    color?: boolean;
 }
 
 /**
  * Information about one dependency
  */
 export interface ModuleInfo {
-	/**
-	 * licenses, either one string or an array of multiple licenses
-	 */
-	licenses: string | string[];
-	/**
-	 * Repository URL
-	 */
-	repository: string;
-	/**
-	 * Publisher name
-	 */
-	publisher?: string;
-	/**
-	 * Publisher e-mail
-	 */
-	email?: string;
-	/**
-	 * Publisher URL
-	 */
-	url?: string;
-	/**
-	 * Path to license file, if available
-	 */
-	licenseFile?: string;
+    /**
+     * Module name
+     */
+    name?: string;
+    /**
+     * Module version
+     */
+    version?: string;
+    /**
+     * Module description
+     */
+    description?: string;
+    /**
+     * Repository URL
+     */
+    repository?: string;
+    /**
+     * Publisher name
+     */
+    publisher?: string;
+    /**
+     * Publisher e-mail
+     */
+    email?: string;
+    /**
+     * Publisher URL
+     */
+    url?: string;
+    /**
+     * Array of licenses
+     */
+    licenses?: string | string[];
+    /**
+     * Path to license file, if available
+     */
+    licenseFile?: string;
+    /**
+     * Contents of the license
+     */
+    licenseText?: string;
+    /**
+     * Whether the license is modified
+     */
+    licenseModified?: string;
 }
 
 export interface ModuleInfos {
-	[packageName: string]: ModuleInfo;
+    [packageName: string]: ModuleInfo;
 }
 
 /**
  * Run the license check
  * @param opts specifies the path to the module to check dependencies of
- * @param callback
  */
-export function init(opts: InitOpts, callback: (err: Error, ret: ModuleInfos) => void): void;
+export function init(
+    opts: InitOpts,
+    callback: (err: Error, ret: ModuleInfos) => void
+): void;
diff --git a/types/license-checker/license-checker-tests.ts b/types/license-checker/license-checker-tests.ts
index 0caf98a373..ab9039837f 100644
--- a/types/license-checker/license-checker-tests.ts
+++ b/types/license-checker/license-checker-tests.ts
@@ -1,13 +1,31 @@
 // From README.md:
 
-import * as checker from 'license-checker';
+import * as checker from "license-checker";
 
-checker.init({
-    start: '/path/to/start/looking'
-}, (err: Error, json: checker.ModuleInfos): void => {
-    if (err) {
-        // Handle error
-    } else {
-        // The sorted json data
+checker.init(
+    {
+        start: "/path/to/start/looking",
+        production: true,
+        customPath: {
+            licenseText: ""
+        }
+    },
+    (err: Error, json: checker.ModuleInfos): void => {
+        if (err) {
+            throw err;
+        } else {
+            const licenses = Object.keys(json).reduce(
+                (memo, key) => {
+                    const license = json[key];
+                    const { name, version, repository, licenseText } = license;
+                    if (licenseText == null) {
+                        return memo;
+                    }
+                    memo.push(license);
+                    return memo;
+                },
+                [] as checker.ModuleInfo[]
+            );
+        }
     }
-});
+);
diff --git a/types/lil-uuid/index.d.ts b/types/lil-uuid/index.d.ts
new file mode 100644
index 0000000000..fb0a783142
--- /dev/null
+++ b/types/lil-uuid/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for lil-uuid 0.1
+// Project: https://github.com/lil-js/uuid
+// Definitions by: Pr1st0n <https://github.com/Pr1st0n>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Generate a random UUID
+ *
+ * @returns UUID string.
+ */
+export function uuid(): string;
+
+/**
+ * Check if a given string has a valid UUID format. It supports multiple version (3, 4 and 5).
+ *
+ * @param uuid UUID string.
+ * @returns True if string is valid UUID, false otherwise.
+ */
+export function  isUUID(uuid: string): boolean;
diff --git a/types/lil-uuid/lil-uuid-tests.ts b/types/lil-uuid/lil-uuid-tests.ts
new file mode 100644
index 0000000000..8b39216e67
--- /dev/null
+++ b/types/lil-uuid/lil-uuid-tests.ts
@@ -0,0 +1,4 @@
+import * as lil from 'lil-uuid';
+
+lil.uuid();
+lil.isUUID('f47ac10b-58cc-4372-a567-0e02b2c3d479');
diff --git a/types/lil-uuid/tsconfig.json b/types/lil-uuid/tsconfig.json
new file mode 100644
index 0000000000..889bd07cca
--- /dev/null
+++ b/types/lil-uuid/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "lil-uuid-tests.ts"
+    ]
+}
diff --git a/types/lil-uuid/tslint.json b/types/lil-uuid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/lil-uuid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/lime-js/index.d.ts b/types/lime-js/index.d.ts
index 28a844e924..96b8c12ffd 100644
--- a/types/lime-js/index.d.ts
+++ b/types/lime-js/index.d.ts
@@ -1,8 +1,14 @@
-// Type definitions for lime-js 0.0.3
+// Type definitions for lime-js 0.0.4
 // Project: https://github.com/takenet/lime-js
 // Definitions by: Arthur Xavier <https://github.com/arthur-xavier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// Support for painless dependency injection
+export as namespace Lime;
+
+// Support AMD require
+export = Lime;
+
 declare namespace Lime {
 
     interface Envelope {
diff --git a/types/lime-js/lime-js-tests.ts b/types/lime-js/lime-js-tests.ts
index c81b3db1da..21d03e3099 100644
--- a/types/lime-js/lime-js-tests.ts
+++ b/types/lime-js/lime-js-tests.ts
@@ -1,4 +1,4 @@
-
+import * as Lime from 'lime-js';
 
 var transport = new Lime.WebSocketTransport(true);
 var clientChannel = new Lime.ClientChannel(transport, true, true);
diff --git a/types/lime-js/tslint.json b/types/lime-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lime-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/line-by-line/index.d.ts b/types/line-by-line/index.d.ts
index 605c5cd07e..9cfeab723c 100644
--- a/types/line-by-line/index.d.ts
+++ b/types/line-by-line/index.d.ts
@@ -13,7 +13,6 @@ export = LineByLineReader;
 interface LineByLineReader extends EventEmitter {
     /**
      * subscribe to an event emitted by reader
-     * @param event {@link LineByLineReaderEvent}
      * @param listener A void function with one param
      */
     on(event: LineByLineReaderEvent, listener: (value: any) => void): this;
diff --git a/types/line-reader/tslint.json b/types/line-reader/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/line-reader/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/linq4js/tslint.json b/types/linq4js/tslint.json
index 3393f9dcca..bb491510c7 100644
--- a/types/linq4js/tslint.json
+++ b/types/linq4js/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "no-any-union": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/lls/tslint.json b/types/lls/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lls/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/load-json-file/index.d.ts b/types/load-json-file/index.d.ts
index d52a24d8fe..ec554289a5 100644
--- a/types/load-json-file/index.d.ts
+++ b/types/load-json-file/index.d.ts
@@ -6,15 +6,11 @@
 interface LoadJsonFile {
     /**
      * Returns a promise for the parsed JSON.
-     *
-     * @param filepath
      */
     (filepath: string): Promise<any>;
 
     /**
      * Returns the parsed JSON.
-     *
-     * @param filepath
      */
     sync(filepath: string): any;
 }
diff --git a/types/loader-runner/tslint.json b/types/loader-runner/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/loader-runner/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/loader-utils/index.d.ts b/types/loader-utils/index.d.ts
index ba6be659f1..a178ada777 100644
--- a/types/loader-utils/index.d.ts
+++ b/types/loader-utils/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for loader-utils 1.1
 // Project: https://github.com/webpack/loader-utils#readme
 // Definitions by: Gyusun Yeom <https://github.com/Perlmint>
+//                 Totooria Hyperion <https://github.com/TotooriaHyperion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node" />
 
@@ -20,6 +21,10 @@ export type DigestType = "hex" | "base26" | "base32" | "base36" | "base49" | "ba
 export function getOptions(loaderContext: loader.LoaderContext): OptionObject;
 export function parseQuery(optionString: string): OptionObject;
 export function stringifyRequest(loaderContext: loader.LoaderContext, resource: string): string;
+export function getRemainingRequest(loaderContext: loader.LoaderContext): string;
+export function getCurrentRequest(loaderContext: loader.LoaderContext): string;
+export function isUrlRequest(url: string, root?: string): boolean;
+export function parseString(str: string): string;
 export function urlToRequest(url: string, root?: string): string;
 export function interpolateName(loaderContext: loader.LoaderContext, name: string, options?: any): string;
 export function getHashDigest(buffer: Buffer, hashType: HashType, digestType: DigestType, maxLength: number): string;
diff --git a/types/loader-utils/loader-utils-tests.ts b/types/loader-utils/loader-utils-tests.ts
index 6ce002a5d1..d54e773eec 100644
--- a/types/loader-utils/loader-utils-tests.ts
+++ b/types/loader-utils/loader-utils-tests.ts
@@ -1,11 +1,32 @@
 import { loader } from "webpack";
-import { getOptions, parseQuery, stringifyRequest, urlToRequest, interpolateName, getHashDigest } from "loader-utils";
+import {
+    getOptions,
+    parseQuery,
+    stringifyRequest,
+    urlToRequest,
+    interpolateName,
+    getHashDigest,
+    getRemainingRequest,
+    getCurrentRequest,
+    isUrlRequest,
+    parseString,
+} from "loader-utils";
 
 parseQuery("?{data:{a:1},isJSON5:true}");
+parseString(`"123"`); // "123"
+parseString(`'123'`); // "123"
+parseString(`123`); // "123"
+const jsonStr = JSON.stringify({ a: 1, b: 2 });
+const parsed = parseString(jsonStr);
+jsonStr === parsed; // true
 
 function loader(this: loader.LoaderContext) {
     getOptions(this);
 
+    getRemainingRequest(this);
+
+    getCurrentRequest(this);
+
     stringifyRequest(this, "./test.js");
     // "\"./test.js\""
 
@@ -35,6 +56,10 @@ urlToRequest("path/to/module.js"); // "./path/to/module.js"
 urlToRequest("~path/to/module.js"); // "path/to/module.js"
 urlToRequest("/path/to/module.js", "./root"); // "./root/path/to/module.js"
 urlToRequest("/path/to/module.js", "~"); // "path/to/module.js"
+isUrlRequest("path/to/module.js");
+isUrlRequest("~path/to/module.js");
+isUrlRequest("/path/to/module.js", "./root");
+isUrlRequest("/path/to/module.js", "~");
 
 function loader2(this: loader.LoaderContext) {
 // loaderContext.resourcePath = "/app/js/javascript.js"
diff --git a/types/loadware/index.d.ts b/types/loadware/index.d.ts
new file mode 100644
index 0000000000..7c45225d44
--- /dev/null
+++ b/types/loadware/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for loadware 2.0
+// Project: https://github.com/franciscop/loadware
+// Definitions by: A.J.J. Lyman <https://github.com/ALyman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// tslint:disable-next-line:ban-types
+type AnyFunction = Function;
+
+declare function loadware<F extends AnyFunction>(...loadable: Array<loadware.Loadable<F>>): ReadonlyArray<F>;
+
+declare namespace loadware {
+    type Loadable<F extends AnyFunction> = string | F | RecursiveLoadable<F>;
+    interface RecursiveLoadable<F extends AnyFunction> extends Array<F | Loadable<F>> { }
+}
+
+export = loadware;
diff --git a/types/loadware/loadware-tests.ts b/types/loadware/loadware-tests.ts
new file mode 100644
index 0000000000..630d3fd351
--- /dev/null
+++ b/types/loadware/loadware-tests.ts
@@ -0,0 +1,20 @@
+import loadware = require("loadware");
+
+interface Context { __ContextMarker: never; }
+interface Response { __ResponseMarker: never; }
+type Middleware = (ctx: Context) => void;
+
+loadware<Middleware>(
+    (_: Context) => {},
+    [
+        (_: Context) => {},
+        'loadware/requires-strings'
+    ],
+    [
+        [
+            [
+                (_: Context) => {}
+            ]
+        ]
+    ]
+);
diff --git a/types/loadware/tsconfig.json b/types/loadware/tsconfig.json
new file mode 100644
index 0000000000..5921615bf8
--- /dev/null
+++ b/types/loadware/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "loadware-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/loadware/tslint.json b/types/loadware/tslint.json
new file mode 100644
index 0000000000..6746359dda
--- /dev/null
+++ b/types/loadware/tslint.json
@@ -0,0 +1,3 @@
+{ 
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/lobibox/tslint.json b/types/lobibox/tslint.json
new file mode 100644
index 0000000000..22ecc7ce6f
--- /dev/null
+++ b/types/lobibox/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-switch": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/local-dynamo/index.d.ts b/types/local-dynamo/index.d.ts
new file mode 100644
index 0000000000..3ceb1d35bf
--- /dev/null
+++ b/types/local-dynamo/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for local-dynamo 0.5
+// Project: https://github.com/Medium/local-dynamo
+// Definitions by: Matt Rollins <https://github.com/Sicilica>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { ChildProcess } from 'child_process';
+
+export interface Options {
+  port: number;
+  dir?: string;
+  heap?: string;
+  detached?: boolean;
+  stdio?: string;
+  cors?: string|string[];
+  sharedDb?: boolean;
+}
+
+export function launch(options?: Options|string, port?: number): ChildProcess;
diff --git a/types/local-dynamo/local-dynamo-tests.ts b/types/local-dynamo/local-dynamo-tests.ts
new file mode 100644
index 0000000000..18bc22187a
--- /dev/null
+++ b/types/local-dynamo/local-dynamo-tests.ts
@@ -0,0 +1,18 @@
+import * as localDynamo from 'local-dynamo';
+
+// From launch_test.js
+localDynamo.launch({
+  port: 8676,
+  heap: '512m',
+  stdio: 'pipe'
+});
+localDynamo.launch({
+  port: 8676,
+  sharedDb: true,
+  stdio: 'pipe'
+});
+localDynamo.launch({
+  port: 8676,
+  cors: 'medium.com',
+  stdio: 'pipe'
+});
diff --git a/types/local-dynamo/tsconfig.json b/types/local-dynamo/tsconfig.json
new file mode 100644
index 0000000000..fe3803ac8c
--- /dev/null
+++ b/types/local-dynamo/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "local-dynamo-tests.ts"
+    ]
+}
diff --git a/types/local-dynamo/tslint.json b/types/local-dynamo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/local-dynamo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/localforage-cordovasqlitedriver/package.json b/types/localforage-cordovasqlitedriver/package.json
index 22ff6e6118..9ef28aa765 100644
--- a/types/localforage-cordovasqlitedriver/package.json
+++ b/types/localforage-cordovasqlitedriver/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "localforage": "^1.5.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/lockr/tslint.json b/types/lockr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lockr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/locutus/tslint.json b/types/locutus/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/locutus/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lodash-es/README.md b/types/lodash-es/README.md
new file mode 100644
index 0000000000..1116eee9f3
--- /dev/null
+++ b/types/lodash-es/README.md
@@ -0,0 +1 @@
+TODO: There is not much use cases for `seq`-like functions when using `lodash-es`, So I quit adding types for `seq`-like functions. If someone wants this kink of types, you can setup another PR. Also see Here https://github.com/lodash/lodash/issues/3298.
diff --git a/types/lodash-es/array.d.ts b/types/lodash-es/array.d.ts
new file mode 100644
index 0000000000..968a9649f8
--- /dev/null
+++ b/types/lodash-es/array.d.ts
@@ -0,0 +1,67 @@
+import { default as chunk } from "./chunk";
+import { default as compact } from "./compact";
+import { default as concat } from "./concat";
+import { default as difference } from "./difference";
+import { default as differenceBy } from "./differenceBy";
+import { default as differenceWith } from "./differenceWith";
+import { default as drop } from "./drop";
+import { default as dropRight } from "./dropRight";
+import { default as dropRightWhile } from "./dropRightWhile";
+import { default as dropWhile } from "./dropWhile";
+import { default as fill } from "./fill";
+import { default as findIndex } from "./findIndex";
+import { default as findLastIndex } from "./findLastIndex";
+import { default as first } from "./first";
+import { default as flatten } from "./flatten";
+import { default as flattenDeep } from "./flattenDeep";
+import { default as flattenDepth } from "./flattenDepth";
+import { default as fromPairs } from "./fromPairs";
+import { default as head } from "./head";
+import { default as indexOf } from "./indexOf";
+import { default as initial } from "./initial";
+import { default as intersection } from "./intersection";
+import { default as intersectionBy } from "./intersectionBy";
+import { default as intersectionWith } from "./intersectionWith";
+import { default as join } from "./join";
+import { default as last } from "./last";
+import { default as lastIndexOf } from "./lastIndexOf";
+import { default as nth } from "./nth";
+import { default as pull } from "./pull";
+import { default as pullAll } from "./pullAll";
+import { default as pullAllBy } from "./pullAllBy";
+import { default as pullAllWith } from "./pullAllWith";
+import { default as pullAt } from "./pullAt";
+import { default as remove } from "./remove";
+import { default as reverse } from "./reverse";
+import { default as slice } from "./slice";
+import { default as sortedIndex } from "./sortedIndex";
+import { default as sortedIndexBy } from "./sortedIndexBy";
+import { default as sortedIndexOf } from "./sortedIndexOf";
+import { default as sortedLastIndex } from "./sortedLastIndex";
+import { default as sortedLastIndexBy } from "./sortedLastIndexBy";
+import { default as sortedLastIndexOf } from "./sortedLastIndexOf";
+import { default as sortedUniq } from "./sortedUniq";
+import { default as sortedUniqBy } from "./sortedUniqBy";
+import { default as tail } from "./tail";
+import { default as take } from "./take";
+import { default as takeRight } from "./takeRight";
+import { default as takeRightWhile } from "./takeRightWhile";
+import { default as takeWhile } from "./takeWhile";
+import { default as union } from "./union";
+import { default as unionBy } from "./unionBy";
+import { default as unionWith } from "./unionWith";
+import { default as uniq } from "./uniq";
+import { default as uniqBy } from "./uniqBy";
+import { default as uniqWith } from "./uniqWith";
+import { default as unzip } from "./unzip";
+import { default as unzipWith } from "./unzipWith";
+import { default as without } from "./without";
+import { default as xor } from "./xor";
+import { default as xorBy } from "./xorBy";
+import { default as xorWith } from "./xorWith";
+import { default as zip } from "./zip";
+import { default as zipObject } from "./zipObject";
+import { default as zipObjectDeep } from "./zipObjectDeep";
+import { default as zipWith } from "./zipWith";
+
+export { default } from "./array.default";
diff --git a/types/lodash-es/array.default.d.ts b/types/lodash-es/array.default.d.ts
new file mode 100644
index 0000000000..d0abfaff10
--- /dev/null
+++ b/types/lodash-es/array.default.d.ts
@@ -0,0 +1,134 @@
+import chunk from "./chunk";
+import compact from "./compact";
+import concat from "./concat";
+import difference from "./difference";
+import differenceBy from "./differenceBy";
+import differenceWith from "./differenceWith";
+import drop from "./drop";
+import dropRight from "./dropRight";
+import dropRightWhile from "./dropRightWhile";
+import dropWhile from "./dropWhile";
+import fill from "./fill";
+import findIndex from "./findIndex";
+import findLastIndex from "./findLastIndex";
+import first from "./first";
+import flatten from "./flatten";
+import flattenDeep from "./flattenDeep";
+import flattenDepth from "./flattenDepth";
+import fromPairs from "./fromPairs";
+import head from "./head";
+import indexOf from "./indexOf";
+import initial from "./initial";
+import intersection from "./intersection";
+import intersectionBy from "./intersectionBy";
+import intersectionWith from "./intersectionWith";
+import join from "./join";
+import last from "./last";
+import lastIndexOf from "./lastIndexOf";
+import nth from "./nth";
+import pull from "./pull";
+import pullAll from "./pullAll";
+import pullAllBy from "./pullAllBy";
+import pullAllWith from "./pullAllWith";
+import pullAt from "./pullAt";
+import remove from "./remove";
+import reverse from "./reverse";
+import slice from "./slice";
+import sortedIndex from "./sortedIndex";
+import sortedIndexBy from "./sortedIndexBy";
+import sortedIndexOf from "./sortedIndexOf";
+import sortedLastIndex from "./sortedLastIndex";
+import sortedLastIndexBy from "./sortedLastIndexBy";
+import sortedLastIndexOf from "./sortedLastIndexOf";
+import sortedUniq from "./sortedUniq";
+import sortedUniqBy from "./sortedUniqBy";
+import tail from "./tail";
+import take from "./take";
+import takeRight from "./takeRight";
+import takeRightWhile from "./takeRightWhile";
+import takeWhile from "./takeWhile";
+import union from "./union";
+import unionBy from "./unionBy";
+import unionWith from "./unionWith";
+import uniq from "./uniq";
+import uniqBy from "./uniqBy";
+import uniqWith from "./uniqWith";
+import unzip from "./unzip";
+import unzipWith from "./unzipWith";
+import without from "./without";
+import xor from "./xor";
+import xorBy from "./xorBy";
+import xorWith from "./xorWith";
+import zip from "./zip";
+import zipObject from "./zipObject";
+import zipObjectDeep from "./zipObjectDeep";
+import zipWith from "./zipWith";
+
+declare const defaultExport: {
+  chunk: typeof chunk;
+  compact: typeof compact;
+  concat: typeof concat;
+  difference: typeof difference;
+  differenceBy: typeof differenceBy;
+  differenceWith: typeof differenceWith;
+  drop: typeof drop;
+  dropRight: typeof dropRight;
+  dropRightWhile: typeof dropRightWhile;
+  dropWhile: typeof dropWhile;
+  fill: typeof fill;
+  findIndex: typeof findIndex;
+  findLastIndex: typeof findLastIndex;
+  first: typeof first;
+  flatten: typeof flatten;
+  flattenDeep: typeof flattenDeep;
+  flattenDepth: typeof flattenDepth;
+  fromPairs: typeof fromPairs;
+  head: typeof head;
+  indexOf: typeof indexOf;
+  initial: typeof initial;
+  intersection: typeof intersection;
+  intersectionBy: typeof intersectionBy;
+  intersectionWith: typeof intersectionWith;
+  join: typeof join;
+  last: typeof last;
+  lastIndexOf: typeof lastIndexOf;
+  nth: typeof nth;
+  pull: typeof pull;
+  pullAll: typeof pullAll;
+  pullAllBy: typeof pullAllBy;
+  pullAllWith: typeof pullAllWith;
+  pullAt: typeof pullAt;
+  remove: typeof remove;
+  reverse: typeof reverse;
+  slice: typeof slice;
+  sortedIndex: typeof sortedIndex;
+  sortedIndexBy: typeof sortedIndexBy;
+  sortedIndexOf: typeof sortedIndexOf;
+  sortedLastIndex: typeof sortedLastIndex;
+  sortedLastIndexBy: typeof sortedLastIndexBy;
+  sortedLastIndexOf: typeof sortedLastIndexOf;
+  sortedUniq: typeof sortedUniq;
+  sortedUniqBy: typeof sortedUniqBy;
+  tail: typeof tail;
+  take: typeof take;
+  takeRight: typeof takeRight;
+  takeRightWhile: typeof takeRightWhile;
+  takeWhile: typeof takeWhile;
+  union: typeof union;
+  unionBy: typeof unionBy;
+  unionWith: typeof unionWith;
+  uniq: typeof uniq;
+  uniqBy: typeof uniqBy;
+  uniqWith: typeof uniqWith;
+  unzip: typeof unzip;
+  unzipWith: typeof unzipWith;
+  without: typeof without;
+  xor: typeof xor;
+  xorBy: typeof xorBy;
+  xorWith: typeof xorWith;
+  zip: typeof zip;
+  zipObject: typeof zipObject;
+  zipObjectDeep: typeof zipObjectDeep;
+  zipWith: typeof zipWith;
+};
+export default defaultExport;
diff --git a/types/lodash-es/chain.d.ts b/types/lodash-es/chain.d.ts
deleted file mode 100644
index 968e2c0a4e..0000000000
--- a/types/lodash-es/chain.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { chain } from "lodash";
-export default chain;
diff --git a/types/lodash-es/collection.d.ts b/types/lodash-es/collection.d.ts
new file mode 100644
index 0000000000..14f6ab3987
--- /dev/null
+++ b/types/lodash-es/collection.d.ts
@@ -0,0 +1,30 @@
+import { default as countBy } from "./countBy";
+import { default as each } from "./each";
+import { default as eachRight } from "./eachRight";
+import { default as every } from "./every";
+import { default as filter } from "./filter";
+import { default as find } from "./find";
+import { default as findLast } from "./findLast";
+import { default as flatMap } from "./flatMap";
+import { default as flatMapDeep } from "./flatMapDeep";
+import { default as flatMapDepth } from "./flatMapDepth";
+import { default as forEach } from "./forEach";
+import { default as forEachRight } from "./forEachRight";
+import { default as groupBy } from "./groupBy";
+import { default as includes } from "./includes";
+import { default as invokeMap } from "./invokeMap";
+import { default as keyBy } from "./keyBy";
+import { default as map } from "./map";
+import { default as orderBy } from "./orderBy";
+import { default as partition } from "./partition";
+import { default as reduce } from "./reduce";
+import { default as reduceRight } from "./reduceRight";
+import { default as reject } from "./reject";
+import { default as sample } from "./sample";
+import { default as sampleSize } from "./sampleSize";
+import { default as shuffle } from "./shuffle";
+import { default as size } from "./size";
+import { default as some } from "./some";
+import { default as sortBy } from "./sortBy";
+
+export { default } from "./collection.default";
diff --git a/types/lodash-es/collection.default.d.ts b/types/lodash-es/collection.default.d.ts
new file mode 100644
index 0000000000..80849edfc0
--- /dev/null
+++ b/types/lodash-es/collection.default.d.ts
@@ -0,0 +1,60 @@
+import countBy from "./countBy";
+import each from "./each";
+import eachRight from "./eachRight";
+import every from "./every";
+import filter from "./filter";
+import find from "./find";
+import findLast from "./findLast";
+import flatMap from "./flatMap";
+import flatMapDeep from "./flatMapDeep";
+import flatMapDepth from "./flatMapDepth";
+import forEach from "./forEach";
+import forEachRight from "./forEachRight";
+import groupBy from "./groupBy";
+import includes from "./includes";
+import invokeMap from "./invokeMap";
+import keyBy from "./keyBy";
+import map from "./map";
+import orderBy from "./orderBy";
+import partition from "./partition";
+import reduce from "./reduce";
+import reduceRight from "./reduceRight";
+import reject from "./reject";
+import sample from "./sample";
+import sampleSize from "./sampleSize";
+import shuffle from "./shuffle";
+import size from "./size";
+import some from "./some";
+import sortBy from "./sortBy";
+
+declare const defaultExport: {
+  countBy: typeof countBy;
+  each: typeof each;
+  eachRight: typeof eachRight;
+  every: typeof every;
+  filter: typeof filter;
+  find: typeof find;
+  findLast: typeof findLast;
+  flatMap: typeof flatMap;
+  flatMapDeep: typeof flatMapDeep;
+  flatMapDepth: typeof flatMapDepth;
+  forEach: typeof forEach;
+  forEachRight: typeof forEachRight;
+  groupBy: typeof groupBy;
+  includes: typeof includes;
+  invokeMap: typeof invokeMap;
+  keyBy: typeof keyBy;
+  map: typeof map;
+  orderBy: typeof orderBy;
+  partition: typeof partition;
+  reduce: typeof reduce;
+  reduceRight: typeof reduceRight;
+  reject: typeof reject;
+  sample: typeof sample;
+  sampleSize: typeof sampleSize;
+  shuffle: typeof shuffle;
+  size: typeof size;
+  some: typeof some;
+  sortBy: typeof sortBy;
+};
+export default defaultExport;
diff --git a/types/lodash-es/conforms.d.ts b/types/lodash-es/conforms.d.ts
new file mode 100644
index 0000000000..f2cc0fe6ea
--- /dev/null
+++ b/types/lodash-es/conforms.d.ts
@@ -0,0 +1,2 @@
+import { conforms } from "lodash";
+export default conforms;
diff --git a/types/lodash-es/conformsTo.d.ts b/types/lodash-es/conformsTo.d.ts
new file mode 100644
index 0000000000..23bf438ebe
--- /dev/null
+++ b/types/lodash-es/conformsTo.d.ts
@@ -0,0 +1,2 @@
+import { conformsTo } from "lodash";
+export default conformsTo;
diff --git a/types/lodash-es/date.d.ts b/types/lodash-es/date.d.ts
new file mode 100644
index 0000000000..63dfcfc79d
--- /dev/null
+++ b/types/lodash-es/date.d.ts
@@ -0,0 +1,3 @@
+import { default as now } from "./now";
+
+export { default } from "./date.default";
diff --git a/types/lodash-es/date.default.d.ts b/types/lodash-es/date.default.d.ts
new file mode 100644
index 0000000000..cc7ad11223
--- /dev/null
+++ b/types/lodash-es/date.default.d.ts
@@ -0,0 +1,6 @@
+import now from "./now";
+
+declare const defaultExport: {
+  now: typeof now;
+};
+export default defaultExport;
diff --git a/types/lodash-es/defaultTo.d.ts b/types/lodash-es/defaultTo.d.ts
new file mode 100644
index 0000000000..a514d56369
--- /dev/null
+++ b/types/lodash-es/defaultTo.d.ts
@@ -0,0 +1,2 @@
+import { defaultTo } from "lodash";
+export default defaultTo;
diff --git a/types/lodash-es/function.d.ts b/types/lodash-es/function.d.ts
new file mode 100644
index 0000000000..3f60c35a06
--- /dev/null
+++ b/types/lodash-es/function.d.ts
@@ -0,0 +1,25 @@
+import { default as after } from "./after";
+import { default as ary } from "./ary";
+import { default as before } from "./before";
+import { default as bind } from "./bind";
+import { default as bindKey } from "./bindKey";
+import { default as curry } from "./curry";
+import { default as curryRight } from "./curryRight";
+import { default as debounce } from "./debounce";
+import { default as defer } from "./defer";
+import { default as delay } from "./delay";
+import { default as flip } from "./flip";
+import { default as memoize } from "./memoize";
+import { default as negate } from "./negate";
+import { default as once } from "./once";
+import { default as overArgs } from "./overArgs";
+import { default as partial } from "./partial";
+import { default as partialRight } from "./partialRight";
+import { default as rearg } from "./rearg";
+import { default as rest } from "./rest";
+import { default as spread } from "./spread";
+import { default as throttle } from "./throttle";
+import { default as unary } from "./unary";
+import { default as wrap } from "./wrap";
+
+export { default } from "./function.default";
diff --git a/types/lodash-es/function.default.d.ts b/types/lodash-es/function.default.d.ts
new file mode 100644
index 0000000000..1e3766e959
--- /dev/null
+++ b/types/lodash-es/function.default.d.ts
@@ -0,0 +1,50 @@
+import after from "./after";
+import ary from "./ary";
+import before from "./before";
+import bind from "./bind";
+import bindKey from "./bindKey";
+import curry from "./curry";
+import curryRight from "./curryRight";
+import debounce from "./debounce";
+import defer from "./defer";
+import delay from "./delay";
+import flip from "./flip";
+import memoize from "./memoize";
+import negate from "./negate";
+import once from "./once";
+import overArgs from "./overArgs";
+import partial from "./partial";
+import partialRight from "./partialRight";
+import rearg from "./rearg";
+import rest from "./rest";
+import spread from "./spread";
+import throttle from "./throttle";
+import unary from "./unary";
+import wrap from "./wrap";
+
+declare const defaultExport: {
+  after: typeof after;
+  ary: typeof ary;
+  before: typeof before;
+  bind: typeof bind;
+  bindKey: typeof bindKey;
+  curry: typeof curry;
+  curryRight: typeof curryRight;
+  debounce: typeof debounce;
+  defer: typeof defer;
+  delay: typeof delay;
+  flip: typeof flip;
+  memoize: typeof memoize;
+  negate: typeof negate;
+  once: typeof once;
+  overArgs: typeof overArgs;
+  partial: typeof partial;
+  partialRight: typeof partialRight;
+  rearg: typeof rearg;
+  rest: typeof rest;
+  spread: typeof spread;
+  throttle: typeof throttle;
+  unary: typeof unary;
+  wrap: typeof wrap;
+};
+export default defaultExport;
diff --git a/types/lodash-es/index.d.ts b/types/lodash-es/index.d.ts
index 7389fc7900..13695ae66b 100644
--- a/types/lodash-es/index.d.ts
+++ b/types/lodash-es/index.d.ts
@@ -1,306 +1,307 @@
-// Type definitions for lodash-es 4.14
+// Type definitions for lodash-es 4.17
 // Project: http://lodash.com/
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-// Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
-
-export {
-    add,
-    after,
-    ary,
-    assign,
-    assignIn,
-    assignInWith,
-    assignWith,
-    at,
-    attempt,
-    before,
-    bind,
-    bindAll,
-    bindKey,
-    camelCase,
-    capitalize,
-    castArray,
-    ceil,
-    chain,
-    chunk,
-    clamp,
-    clone,
-    cloneDeep,
-    cloneDeepWith,
-    cloneWith,
-    compact,
-    concat,
-    cond,
-    constant,
-    countBy,
-    create,
-    curry,
-    curryRight,
-    debounce,
-    deburr,
-    defaults,
-    defaultsDeep,
-    defer,
-    delay,
-    difference,
-    differenceBy,
-    differenceWith,
-    divide,
-    drop,
-    dropRight,
-    dropRightWhile,
-    dropWhile,
-    each,
-    eachRight,
-    endsWith,
-    entries,
-    entriesIn,
-    eq,
-    escape,
-    escapeRegExp,
-    every,
-    extend,
-    extendWith,
-    fill,
-    filter,
-    find,
-    findIndex,
-    findKey,
-    findLast,
-    findLastIndex,
-    findLastKey,
-    first,
-    flatMap,
-    flatMapDeep,
-    flatMapDepth,
-    flatten,
-    flattenDeep,
-    flattenDepth,
-    flip,
-    floor,
-    flow,
-    flowRight,
-    forEach,
-    forEachRight,
-    forIn,
-    forInRight,
-    forOwn,
-    forOwnRight,
-    fromPairs,
-    functions,
-    functionsIn,
-    get,
-    groupBy,
-    gt,
-    gte,
-    has,
-    hasIn,
-    head,
-    identity,
-    includes,
-    indexOf,
-    initial,
-    inRange,
-    intersection,
-    intersectionBy,
-    intersectionWith,
-    invert,
-    invertBy,
-    invoke,
-    invokeMap,
-    isArguments,
-    isArray,
-    isArrayBuffer,
-    isArrayLike,
-    isArrayLikeObject,
-    isBoolean,
-    isBuffer,
-    isDate,
-    isElement,
-    isEmpty,
-    isEqual,
-    isEqualWith,
-    isError,
-    isFinite,
-    isFunction,
-    isInteger,
-    isLength,
-    isMap,
-    isMatch,
-    isMatchWith,
-    isNaN,
-    isNative,
-    isNil,
-    isNull,
-    isNumber,
-    isObject,
-    isObjectLike,
-    isPlainObject,
-    isRegExp,
-    isSafeInteger,
-    isSet,
-    isString,
-    isSymbol,
-    isTypedArray,
-    isUndefined,
-    isWeakMap,
-    isWeakSet,
-    iteratee,
-    join,
-    kebabCase,
-    keyBy,
-    keys,
-    keysIn,
-    last,
-    lastIndexOf,
-    lowerCase,
-    lowerFirst,
-    lt,
-    lte,
-    map,
-    mapKeys,
-    mapValues,
-    matches,
-    matchesProperty,
-    max,
-    maxBy,
-    mean,
-    meanBy,
-    memoize,
-    merge,
-    mergeWith,
-    method,
-    methodOf,
-    min,
-    minBy,
-    mixin,
-    negate,
-    noConflict,
-    noop,
-    now,
-    nth,
-    nthArg,
-    omit,
-    omitBy,
-    once,
-    orderBy,
-    over,
-    overArgs,
-    overEvery,
-    overSome,
-    pad,
-    padEnd,
-    padStart,
-    parseInt,
-    partial,
-    partialRight,
-    partition,
-    pick,
-    pickBy,
-    property,
-    propertyOf,
-    pull,
-    pullAll,
-    pullAllBy,
-    pullAllWith,
-    pullAt,
-    random,
-    range,
-    rangeRight,
-    rearg,
-    reduce,
-    reduceRight,
-    reject,
-    remove,
-    repeat,
-    replace,
-    rest,
-    result,
-    reverse,
-    round,
-    runInContext,
-    sample,
-    sampleSize,
-    set,
-    setWith,
-    shuffle,
-    size,
-    slice,
-    snakeCase,
-    some,
-    sortBy,
-    sortedIndex,
-    sortedIndexBy,
-    sortedIndexOf,
-    sortedLastIndex,
-    sortedLastIndexBy,
-    sortedLastIndexOf,
-    sortedUniq,
-    sortedUniqBy,
-    split,
-    spread,
-    startCase,
-    startsWith,
-    subtract,
-    sum,
-    sumBy,
-    tail,
-    take,
-    takeRight,
-    takeRightWhile,
-    takeWhile,
-    tap,
-    template,
-    throttle,
-    thru,
-    times,
-    toArray,
-    toFinite,
-    toInteger,
-    toLength,
-    toLower,
-    toNumber,
-    toPairs,
-    toPairsIn,
-    toPath,
-    toPlainObject,
-    toSafeInteger,
-    toString,
-    toUpper,
-    transform,
-    trim,
-    trimEnd,
-    trimStart,
-    truncate,
-    unary,
-    unescape,
-    union,
-    unionBy,
-    unionWith,
-    uniq,
-    uniqBy,
-    uniqueId,
-    uniqWith,
-    unset,
-    unzip,
-    unzipWith,
-    update,
-    updateWith,
-    upperCase,
-    upperFirst,
-    values,
-    valuesIn,
-    without,
-    words,
-    wrap,
-    xor,
-    xorBy,
-    xorWith,
-    zip,
-    zipObject,
-    zipObjectDeep,
-    zipWith
-} from "lodash";
+export { default as add } from "./add";
+export { default as after } from "./after";
+export { default as ary } from "./ary";
+export { default as assign } from "./assign";
+export { default as assignIn } from "./assignIn";
+export { default as assignInWith } from "./assignInWith";
+export { default as assignWith } from "./assignWith";
+export { default as at } from "./at";
+export { default as attempt } from "./attempt";
+export { default as before } from "./before";
+export { default as bind } from "./bind";
+export { default as bindAll } from "./bindAll";
+export { default as bindKey } from "./bindKey";
+export { default as camelCase } from "./camelCase";
+export { default as capitalize } from "./capitalize";
+export { default as castArray } from "./castArray";
+export { default as ceil } from "./ceil";
+export { default as chunk } from "./chunk";
+export { default as clamp } from "./clamp";
+export { default as clone } from "./clone";
+export { default as cloneDeep } from "./cloneDeep";
+export { default as cloneDeepWith } from "./cloneDeepWith";
+export { default as cloneWith } from "./cloneWith";
+export { default as compact } from "./compact";
+export { default as concat } from "./concat";
+export { default as cond } from "./cond";
+export { default as conforms } from "./conforms";
+export { default as conformsTo } from "./conformsTo";
+export { default as constant } from "./constant";
+export { default as countBy } from "./countBy";
+export { default as create } from "./create";
+export { default as curry } from "./curry";
+export { default as curryRight } from "./curryRight";
+export { default as debounce } from "./debounce";
+export { default as deburr } from "./deburr";
+export { default as defaultTo } from "./defaultTo";
+export { default as defaults } from "./defaults";
+export { default as defaultsDeep } from "./defaultsDeep";
+export { default as defer } from "./defer";
+export { default as delay } from "./delay";
+export { default as difference } from "./difference";
+export { default as differenceBy } from "./differenceBy";
+export { default as differenceWith } from "./differenceWith";
+export { default as divide } from "./divide";
+export { default as drop } from "./drop";
+export { default as dropRight } from "./dropRight";
+export { default as dropRightWhile } from "./dropRightWhile";
+export { default as dropWhile } from "./dropWhile";
+export { default as each } from "./each";
+export { default as eachRight } from "./eachRight";
+export { default as endsWith } from "./endsWith";
+export { default as entries } from "./entries";
+export { default as entriesIn } from "./entriesIn";
+export { default as eq } from "./eq";
+export { default as escape } from "./escape";
+export { default as escapeRegExp } from "./escapeRegExp";
+export { default as every } from "./every";
+export { default as extend } from "./extend";
+export { default as extendWith } from "./extendWith";
+export { default as fill } from "./fill";
+export { default as filter } from "./filter";
+export { default as find } from "./find";
+export { default as findIndex } from "./findIndex";
+export { default as findKey } from "./findKey";
+export { default as findLast } from "./findLast";
+export { default as findLastIndex } from "./findLastIndex";
+export { default as findLastKey } from "./findLastKey";
+export { default as first } from "./first";
+export { default as flatMap } from "./flatMap";
+export { default as flatMapDeep } from "./flatMapDeep";
+export { default as flatMapDepth } from "./flatMapDepth";
+export { default as flatten } from "./flatten";
+export { default as flattenDeep } from "./flattenDeep";
+export { default as flattenDepth } from "./flattenDepth";
+export { default as flip } from "./flip";
+export { default as floor } from "./floor";
+export { default as flow } from "./flow";
+export { default as flowRight } from "./flowRight";
+export { default as forEach } from "./forEach";
+export { default as forEachRight } from "./forEachRight";
+export { default as forIn } from "./forIn";
+export { default as forInRight } from "./forInRight";
+export { default as forOwn } from "./forOwn";
+export { default as forOwnRight } from "./forOwnRight";
+export { default as fromPairs } from "./fromPairs";
+export { default as functions } from "./functions";
+export { default as functionsIn } from "./functionsIn";
+export { default as get } from "./get";
+export { default as groupBy } from "./groupBy";
+export { default as gt } from "./gt";
+export { default as gte } from "./gte";
+export { default as has } from "./has";
+export { default as hasIn } from "./hasIn";
+export { default as head } from "./head";
+export { default as identity } from "./identity";
+export { default as inRange } from "./inRange";
+export { default as includes } from "./includes";
+export { default as indexOf } from "./indexOf";
+export { default as initial } from "./initial";
+export { default as intersection } from "./intersection";
+export { default as intersectionBy } from "./intersectionBy";
+export { default as intersectionWith } from "./intersectionWith";
+export { default as invert } from "./invert";
+export { default as invertBy } from "./invertBy";
+export { default as invoke } from "./invoke";
+export { default as invokeMap } from "./invokeMap";
+export { default as isArguments } from "./isArguments";
+export { default as isArray } from "./isArray";
+export { default as isArrayBuffer } from "./isArrayBuffer";
+export { default as isArrayLike } from "./isArrayLike";
+export { default as isArrayLikeObject } from "./isArrayLikeObject";
+export { default as isBoolean } from "./isBoolean";
+export { default as isBuffer } from "./isBuffer";
+export { default as isDate } from "./isDate";
+export { default as isElement } from "./isElement";
+export { default as isEmpty } from "./isEmpty";
+export { default as isEqual } from "./isEqual";
+export { default as isEqualWith } from "./isEqualWith";
+export { default as isError } from "./isError";
+export { default as isFinite } from "./isFinite";
+export { default as isFunction } from "./isFunction";
+export { default as isInteger } from "./isInteger";
+export { default as isLength } from "./isLength";
+export { default as isMap } from "./isMap";
+export { default as isMatch } from "./isMatch";
+export { default as isMatchWith } from "./isMatchWith";
+export { default as isNaN } from "./isNaN";
+export { default as isNative } from "./isNative";
+export { default as isNil } from "./isNil";
+export { default as isNull } from "./isNull";
+export { default as isNumber } from "./isNumber";
+export { default as isObject } from "./isObject";
+export { default as isObjectLike } from "./isObjectLike";
+export { default as isPlainObject } from "./isPlainObject";
+export { default as isRegExp } from "./isRegExp";
+export { default as isSafeInteger } from "./isSafeInteger";
+export { default as isSet } from "./isSet";
+export { default as isString } from "./isString";
+export { default as isSymbol } from "./isSymbol";
+export { default as isTypedArray } from "./isTypedArray";
+export { default as isUndefined } from "./isUndefined";
+export { default as isWeakMap } from "./isWeakMap";
+export { default as isWeakSet } from "./isWeakSet";
+export { default as iteratee } from "./iteratee";
+export { default as join } from "./join";
+export { default as kebabCase } from "./kebabCase";
+export { default as keyBy } from "./keyBy";
+export { default as keys } from "./keys";
+export { default as keysIn } from "./keysIn";
+export { default as last } from "./last";
+export { default as lastIndexOf } from "./lastIndexOf";
+export { default as lowerCase } from "./lowerCase";
+export { default as lowerFirst } from "./lowerFirst";
+export { default as lt } from "./lt";
+export { default as lte } from "./lte";
+export { default as map } from "./map";
+export { default as mapKeys } from "./mapKeys";
+export { default as mapValues } from "./mapValues";
+export { default as matches } from "./matches";
+export { default as matchesProperty } from "./matchesProperty";
+export { default as max } from "./max";
+export { default as maxBy } from "./maxBy";
+export { default as mean } from "./mean";
+export { default as meanBy } from "./meanBy";
+export { default as memoize } from "./memoize";
+export { default as merge } from "./merge";
+export { default as mergeWith } from "./mergeWith";
+export { default as method } from "./method";
+export { default as methodOf } from "./methodOf";
+export { default as min } from "./min";
+export { default as minBy } from "./minBy";
+export { default as mixin } from "./mixin";
+export { default as multiply } from "./multiply";
+export { default as negate } from "./negate";
+export { default as noop } from "./noop";
+export { default as now } from "./now";
+export { default as nth } from "./nth";
+export { default as nthArg } from "./nthArg";
+export { default as omit } from "./omit";
+export { default as omitBy } from "./omitBy";
+export { default as once } from "./once";
+export { default as orderBy } from "./orderBy";
+export { default as over } from "./over";
+export { default as overArgs } from "./overArgs";
+export { default as overEvery } from "./overEvery";
+export { default as overSome } from "./overSome";
+export { default as pad } from "./pad";
+export { default as padEnd } from "./padEnd";
+export { default as padStart } from "./padStart";
+export { default as parseInt } from "./parseInt";
+export { default as partial } from "./partial";
+export { default as partialRight } from "./partialRight";
+export { default as partition } from "./partition";
+export { default as pick } from "./pick";
+export { default as pickBy } from "./pickBy";
+export { default as property } from "./property";
+export { default as propertyOf } from "./propertyOf";
+export { default as pull } from "./pull";
+export { default as pullAll } from "./pullAll";
+export { default as pullAllBy } from "./pullAllBy";
+export { default as pullAllWith } from "./pullAllWith";
+export { default as pullAt } from "./pullAt";
+export { default as random } from "./random";
+export { default as range } from "./range";
+export { default as rangeRight } from "./rangeRight";
+export { default as rearg } from "./rearg";
+export { default as reduce } from "./reduce";
+export { default as reduceRight } from "./reduceRight";
+export { default as reject } from "./reject";
+export { default as remove } from "./remove";
+export { default as repeat } from "./repeat";
+export { default as replace } from "./replace";
+export { default as rest } from "./rest";
+export { default as result } from "./result";
+export { default as reverse } from "./reverse";
+export { default as round } from "./round";
+export { default as sample } from "./sample";
+export { default as sampleSize } from "./sampleSize";
+export { default as set } from "./set";
+export { default as setWith } from "./setWith";
+export { default as shuffle } from "./shuffle";
+export { default as size } from "./size";
+export { default as slice } from "./slice";
+export { default as snakeCase } from "./snakeCase";
+export { default as some } from "./some";
+export { default as sortBy } from "./sortBy";
+export { default as sortedIndex } from "./sortedIndex";
+export { default as sortedIndexBy } from "./sortedIndexBy";
+export { default as sortedIndexOf } from "./sortedIndexOf";
+export { default as sortedLastIndex } from "./sortedLastIndex";
+export { default as sortedLastIndexBy } from "./sortedLastIndexBy";
+export { default as sortedLastIndexOf } from "./sortedLastIndexOf";
+export { default as sortedUniq } from "./sortedUniq";
+export { default as sortedUniqBy } from "./sortedUniqBy";
+export { default as split } from "./split";
+export { default as spread } from "./spread";
+export { default as startCase } from "./startCase";
+export { default as startsWith } from "./startsWith";
+export { default as stubArray } from "./stubArray";
+export { default as stubFalse } from "./stubFalse";
+export { default as stubObject } from "./stubObject";
+export { default as stubString } from "./stubString";
+export { default as stubTrue } from "./stubTrue";
+export { default as subtract } from "./subtract";
+export { default as sum } from "./sum";
+export { default as sumBy } from "./sumBy";
+export { default as tail } from "./tail";
+export { default as take } from "./take";
+export { default as takeRight } from "./takeRight";
+export { default as takeRightWhile } from "./takeRightWhile";
+export { default as takeWhile } from "./takeWhile";
+export { default as template } from "./template";
+export { default as templateSettings } from "./templateSettings";
+export { default as throttle } from "./throttle";
+export { default as times } from "./times";
+export { default as toArray } from "./toArray";
+export { default as toFinite } from "./toFinite";
+export { default as toInteger } from "./toInteger";
+export { default as toLength } from "./toLength";
+export { default as toLower } from "./toLower";
+export { default as toNumber } from "./toNumber";
+export { default as toPairs } from "./toPairs";
+export { default as toPairsIn } from "./toPairsIn";
+export { default as toPath } from "./toPath";
+export { default as toPlainObject } from "./toPlainObject";
+export { default as toSafeInteger } from "./toSafeInteger";
+export { default as toString } from "./toString";
+export { default as toUpper } from "./toUpper";
+export { default as transform } from "./transform";
+export { default as trim } from "./trim";
+export { default as trimEnd } from "./trimEnd";
+export { default as trimStart } from "./trimStart";
+export { default as truncate } from "./truncate";
+export { default as unary } from "./unary";
+export { default as unescape } from "./unescape";
+export { default as union } from "./union";
+export { default as unionBy } from "./unionBy";
+export { default as unionWith } from "./unionWith";
+export { default as uniq } from "./uniq";
+export { default as uniqBy } from "./uniqBy";
+export { default as uniqWith } from "./uniqWith";
+export { default as uniqueId } from "./uniqueId";
+export { default as unset } from "./unset";
+export { default as unzip } from "./unzip";
+export { default as unzipWith } from "./unzipWith";
+export { default as update } from "./update";
+export { default as updateWith } from "./updateWith";
+export { default as upperCase } from "./upperCase";
+export { default as upperFirst } from "./upperFirst";
+export { default as values } from "./values";
+export { default as valuesIn } from "./valuesIn";
+export { default as without } from "./without";
+export { default as words } from "./words";
+export { default as wrap } from "./wrap";
+export { default as xor } from "./xor";
+export { default as xorBy } from "./xorBy";
+export { default as xorWith } from "./xorWith";
+export { default as zip } from "./zip";
+export { default as zipObject } from "./zipObject";
+export { default as zipObjectDeep } from "./zipObjectDeep";
+export { default as zipWith } from "./zipWith";
diff --git a/types/lodash-es/lang.d.ts b/types/lodash-es/lang.d.ts
new file mode 100644
index 0000000000..c3566b5da2
--- /dev/null
+++ b/types/lodash-es/lang.d.ts
@@ -0,0 +1,58 @@
+import { default as castArray } from "./castArray";
+import { default as clone } from "./clone";
+import { default as cloneDeep } from "./cloneDeep";
+import { default as cloneDeepWith } from "./cloneDeepWith";
+import { default as cloneWith } from "./cloneWith";
+import { default as conformsTo } from "./conformsTo";
+import { default as eq } from "./eq";
+import { default as gt } from "./gt";
+import { default as gte } from "./gte";
+import { default as isArguments } from "./isArguments";
+import { default as isArray } from "./isArray";
+import { default as isArrayBuffer } from "./isArrayBuffer";
+import { default as isArrayLike } from "./isArrayLike";
+import { default as isArrayLikeObject } from "./isArrayLikeObject";
+import { default as isBoolean } from "./isBoolean";
+import { default as isBuffer } from "./isBuffer";
+import { default as isDate } from "./isDate";
+import { default as isElement } from "./isElement";
+import { default as isEmpty } from "./isEmpty";
+import { default as isEqual } from "./isEqual";
+import { default as isEqualWith } from "./isEqualWith";
+import { default as isError } from "./isError";
+import { default as isFinite } from "./isFinite";
+import { default as isFunction } from "./isFunction";
+import { default as isInteger } from "./isInteger";
+import { default as isLength } from "./isLength";
+import { default as isMap } from "./isMap";
+import { default as isMatch } from "./isMatch";
+import { default as isMatchWith } from "./isMatchWith";
+import { default as isNaN } from "./isNaN";
+import { default as isNative } from "./isNative";
+import { default as isNil } from "./isNil";
+import { default as isNull } from "./isNull";
+import { default as isNumber } from "./isNumber";
+import { default as isObject } from "./isObject";
+import { default as isObjectLike } from "./isObjectLike";
+import { default as isPlainObject } from "./isPlainObject";
+import { default as isRegExp } from "./isRegExp";
+import { default as isSafeInteger } from "./isSafeInteger";
+import { default as isSet } from "./isSet";
+import { default as isString } from "./isString";
+import { default as isSymbol } from "./isSymbol";
+import { default as isTypedArray } from "./isTypedArray";
+import { default as isUndefined } from "./isUndefined";
+import { default as isWeakMap } from "./isWeakMap";
+import { default as isWeakSet } from "./isWeakSet";
+import { default as lt } from "./lt";
+import { default as lte } from "./lte";
+import { default as toArray } from "./toArray";
+import { default as toFinite } from "./toFinite";
+import { default as toInteger } from "./toInteger";
+import { default as toLength } from "./toLength";
+import { default as toNumber } from "./toNumber";
+import { default as toPlainObject } from "./toPlainObject";
+import { default as toSafeInteger } from "./toSafeInteger";
+import { default as toString } from "./toString";
+
+export { default } from "./lang.default";
diff --git a/types/lodash-es/lang.default.d.ts b/types/lodash-es/lang.default.d.ts
new file mode 100644
index 0000000000..f69042a062
--- /dev/null
+++ b/types/lodash-es/lang.default.d.ts
@@ -0,0 +1,116 @@
+import castArray from "./castArray";
+import clone from "./clone";
+import cloneDeep from "./cloneDeep";
+import cloneDeepWith from "./cloneDeepWith";
+import cloneWith from "./cloneWith";
+import conformsTo from "./conformsTo";
+import eq from "./eq";
+import gt from "./gt";
+import gte from "./gte";
+import isArguments from "./isArguments";
+import isArray from "./isArray";
+import isArrayBuffer from "./isArrayBuffer";
+import isArrayLike from "./isArrayLike";
+import isArrayLikeObject from "./isArrayLikeObject";
+import isBoolean from "./isBoolean";
+import isBuffer from "./isBuffer";
+import isDate from "./isDate";
+import isElement from "./isElement";
+import isEmpty from "./isEmpty";
+import isEqual from "./isEqual";
+import isEqualWith from "./isEqualWith";
+import isError from "./isError";
+import isFinite from "./isFinite";
+import isFunction from "./isFunction";
+import isInteger from "./isInteger";
+import isLength from "./isLength";
+import isMap from "./isMap";
+import isMatch from "./isMatch";
+import isMatchWith from "./isMatchWith";
+import isNaN from "./isNaN";
+import isNative from "./isNative";
+import isNil from "./isNil";
+import isNull from "./isNull";
+import isNumber from "./isNumber";
+import isObject from "./isObject";
+import isObjectLike from "./isObjectLike";
+import isPlainObject from "./isPlainObject";
+import isRegExp from "./isRegExp";
+import isSafeInteger from "./isSafeInteger";
+import isSet from "./isSet";
+import isString from "./isString";
+import isSymbol from "./isSymbol";
+import isTypedArray from "./isTypedArray";
+import isUndefined from "./isUndefined";
+import isWeakMap from "./isWeakMap";
+import isWeakSet from "./isWeakSet";
+import lt from "./lt";
+import lte from "./lte";
+import toArray from "./toArray";
+import toFinite from "./toFinite";
+import toInteger from "./toInteger";
+import toLength from "./toLength";
+import toNumber from "./toNumber";
+import toPlainObject from "./toPlainObject";
+import toSafeInteger from "./toSafeInteger";
+import toString from "./toString";
+
+declare const defaultExport: {
+  castArray: typeof castArray;
+  clone: typeof clone;
+  cloneDeep: typeof cloneDeep;
+  cloneDeepWith: typeof cloneDeepWith;
+  cloneWith: typeof cloneWith;
+  conformsTo: typeof conformsTo;
+  eq: typeof eq;
+  gt: typeof gt;
+  gte: typeof gte;
+  isArguments: typeof isArguments;
+  isArray: typeof isArray;
+  isArrayBuffer: typeof isArrayBuffer;
+  isArrayLike: typeof isArrayLike;
+  isArrayLikeObject: typeof isArrayLikeObject;
+  isBoolean: typeof isBoolean;
+  isBuffer: typeof isBuffer;
+  isDate: typeof isDate;
+  isElement: typeof isElement;
+  isEmpty: typeof isEmpty;
+  isEqual: typeof isEqual;
+  isEqualWith: typeof isEqualWith;
+  isError: typeof isError;
+  isFinite: typeof isFinite;
+  isFunction: typeof isFunction;
+  isInteger: typeof isInteger;
+  isLength: typeof isLength;
+  isMap: typeof isMap;
+  isMatch: typeof isMatch;
+  isMatchWith: typeof isMatchWith;
+  isNaN: typeof isNaN;
+  isNative: typeof isNative;
+  isNil: typeof isNil;
+  isNull: typeof isNull;
+  isNumber: typeof isNumber;
+  isObject: typeof isObject;
+  isObjectLike: typeof isObjectLike;
+  isPlainObject: typeof isPlainObject;
+  isRegExp: typeof isRegExp;
+  isSafeInteger: typeof isSafeInteger;
+  isSet: typeof isSet;
+  isString: typeof isString;
+  isSymbol: typeof isSymbol;
+  isTypedArray: typeof isTypedArray;
+  isUndefined: typeof isUndefined;
+  isWeakMap: typeof isWeakMap;
+  isWeakSet: typeof isWeakSet;
+  lt: typeof lt;
+  lte: typeof lte;
+  toArray: typeof toArray;
+  toFinite: typeof toFinite;
+  toInteger: typeof toInteger;
+  toLength: typeof toLength;
+  toNumber: typeof toNumber;
+  toPlainObject: typeof toPlainObject;
+  toSafeInteger: typeof toSafeInteger;
+  toString: typeof toString;
+};
+export default defaultExport;
diff --git a/types/lodash-es/lodash-es-tests.ts b/types/lodash-es/lodash-es-tests.ts
index f849e811b6..741526c851 100644
--- a/types/lodash-es/lodash-es-tests.ts
+++ b/types/lodash-es/lodash-es-tests.ts
@@ -1,3 +1,605 @@
+import add from "lodash-es/add";
+import after from "lodash-es/after";
+import ary from "lodash-es/ary";
+import assign from "lodash-es/assign";
+import assignIn from "lodash-es/assignIn";
+import assignInWith from "lodash-es/assignInWith";
+import assignWith from "lodash-es/assignWith";
+import at from "lodash-es/at";
+import attempt from "lodash-es/attempt";
+import before from "lodash-es/before";
+import bind from "lodash-es/bind";
+import bindAll from "lodash-es/bindAll";
+import bindKey from "lodash-es/bindKey";
+import camelCase from "lodash-es/camelCase";
+import capitalize from "lodash-es/capitalize";
+import castArray from "lodash-es/castArray";
+import ceil from "lodash-es/ceil";
+import chunk from "lodash-es/chunk";
+import clamp from "lodash-es/clamp";
+import clone from "lodash-es/clone";
+import cloneDeep from "lodash-es/cloneDeep";
+import cloneDeepWith from "lodash-es/cloneDeepWith";
+import cloneWith from "lodash-es/cloneWith";
+import compact from "lodash-es/compact";
+import concat from "lodash-es/concat";
+import cond from "lodash-es/cond";
+import conforms from "lodash-es/conforms";
+import conformsTo from "lodash-es/conformsTo";
+import constant from "lodash-es/constant";
+import countBy from "lodash-es/countBy";
+import create from "lodash-es/create";
+import curry from "lodash-es/curry";
+import curryRight from "lodash-es/curryRight";
+import debounce from "lodash-es/debounce";
+import deburr from "lodash-es/deburr";
+import defaultTo from "lodash-es/defaultTo";
+import defaults from "lodash-es/defaults";
+import defaultsDeep from "lodash-es/defaultsDeep";
+import defer from "lodash-es/defer";
+import delay from "lodash-es/delay";
+import difference from "lodash-es/difference";
+import differenceBy from "lodash-es/differenceBy";
+import differenceWith from "lodash-es/differenceWith";
+import divide from "lodash-es/divide";
+import drop from "lodash-es/drop";
+import dropRight from "lodash-es/dropRight";
+import dropRightWhile from "lodash-es/dropRightWhile";
+import dropWhile from "lodash-es/dropWhile";
+import each from "lodash-es/each";
+import eachRight from "lodash-es/eachRight";
+import endsWith from "lodash-es/endsWith";
+import entries from "lodash-es/entries";
+import entriesIn from "lodash-es/entriesIn";
+import eq from "lodash-es/eq";
+import escape from "lodash-es/escape";
+import escapeRegExp from "lodash-es/escapeRegExp";
+import every from "lodash-es/every";
+import extend from "lodash-es/extend";
+import extendWith from "lodash-es/extendWith";
+import fill from "lodash-es/fill";
+import filter from "lodash-es/filter";
+import find from "lodash-es/find";
+import findIndex from "lodash-es/findIndex";
+import findKey from "lodash-es/findKey";
+import findLast from "lodash-es/findLast";
+import findLastIndex from "lodash-es/findLastIndex";
+import findLastKey from "lodash-es/findLastKey";
+import first from "lodash-es/first";
+import flatMap from "lodash-es/flatMap";
+import flatMapDeep from "lodash-es/flatMapDeep";
+import flatMapDepth from "lodash-es/flatMapDepth";
+import flatten from "lodash-es/flatten";
+import flattenDeep from "lodash-es/flattenDeep";
+import flattenDepth from "lodash-es/flattenDepth";
+import flip from "lodash-es/flip";
+import floor from "lodash-es/floor";
+import flow from "lodash-es/flow";
+import flowRight from "lodash-es/flowRight";
+import forEach from "lodash-es/forEach";
+import forEachRight from "lodash-es/forEachRight";
+import forIn from "lodash-es/forIn";
+import forInRight from "lodash-es/forInRight";
+import forOwn from "lodash-es/forOwn";
+import forOwnRight from "lodash-es/forOwnRight";
+import fromPairs from "lodash-es/fromPairs";
+import functions from "lodash-es/functions";
+import functionsIn from "lodash-es/functionsIn";
+import get from "lodash-es/get";
+import groupBy from "lodash-es/groupBy";
+import gt from "lodash-es/gt";
+import gte from "lodash-es/gte";
+import has from "lodash-es/has";
+import hasIn from "lodash-es/hasIn";
+import head from "lodash-es/head";
+import identity from "lodash-es/identity";
+import inRange from "lodash-es/inRange";
+import includes from "lodash-es/includes";
+import indexOf from "lodash-es/indexOf";
+import initial from "lodash-es/initial";
+import intersection from "lodash-es/intersection";
+import intersectionBy from "lodash-es/intersectionBy";
+import intersectionWith from "lodash-es/intersectionWith";
+import invert from "lodash-es/invert";
+import invertBy from "lodash-es/invertBy";
+import invoke from "lodash-es/invoke";
+import invokeMap from "lodash-es/invokeMap";
+import isArguments from "lodash-es/isArguments";
+import isArray from "lodash-es/isArray";
+import isArrayBuffer from "lodash-es/isArrayBuffer";
+import isArrayLike from "lodash-es/isArrayLike";
+import isArrayLikeObject from "lodash-es/isArrayLikeObject";
+import isBoolean from "lodash-es/isBoolean";
+import isBuffer from "lodash-es/isBuffer";
+import isDate from "lodash-es/isDate";
+import isElement from "lodash-es/isElement";
+import isEmpty from "lodash-es/isEmpty";
+import isEqual from "lodash-es/isEqual";
+import isEqualWith from "lodash-es/isEqualWith";
+import isError from "lodash-es/isError";
+import isFinite from "lodash-es/isFinite";
+import isFunction from "lodash-es/isFunction";
+import isInteger from "lodash-es/isInteger";
+import isLength from "lodash-es/isLength";
+import isMap from "lodash-es/isMap";
+import isMatch from "lodash-es/isMatch";
+import isMatchWith from "lodash-es/isMatchWith";
+import isNaN from "lodash-es/isNaN";
+import isNative from "lodash-es/isNative";
+import isNil from "lodash-es/isNil";
+import isNull from "lodash-es/isNull";
+import isNumber from "lodash-es/isNumber";
+import isObject from "lodash-es/isObject";
+import isObjectLike from "lodash-es/isObjectLike";
+import isPlainObject from "lodash-es/isPlainObject";
+import isRegExp from "lodash-es/isRegExp";
+import isSafeInteger from "lodash-es/isSafeInteger";
+import isSet from "lodash-es/isSet";
+import isString from "lodash-es/isString";
+import isSymbol from "lodash-es/isSymbol";
+import isTypedArray from "lodash-es/isTypedArray";
+import isUndefined from "lodash-es/isUndefined";
+import isWeakMap from "lodash-es/isWeakMap";
+import isWeakSet from "lodash-es/isWeakSet";
+import iteratee from "lodash-es/iteratee";
+import join from "lodash-es/join";
 import kebabCase from "lodash-es/kebabCase";
+import keyBy from "lodash-es/keyBy";
+import keys from "lodash-es/keys";
+import keysIn from "lodash-es/keysIn";
+import last from "lodash-es/last";
+import lastIndexOf from "lodash-es/lastIndexOf";
+import lowerCase from "lodash-es/lowerCase";
+import lowerFirst from "lodash-es/lowerFirst";
+import lt from "lodash-es/lt";
+import lte from "lodash-es/lte";
+import map from "lodash-es/map";
+import mapKeys from "lodash-es/mapKeys";
+import mapValues from "lodash-es/mapValues";
+import matches from "lodash-es/matches";
+import matchesProperty from "lodash-es/matchesProperty";
+import max from "lodash-es/max";
+import maxBy from "lodash-es/maxBy";
+import mean from "lodash-es/mean";
+import meanBy from "lodash-es/meanBy";
+import memoize from "lodash-es/memoize";
+import merge from "lodash-es/merge";
+import mergeWith from "lodash-es/mergeWith";
+import method from "lodash-es/method";
+import methodOf from "lodash-es/methodOf";
+import min from "lodash-es/min";
+import minBy from "lodash-es/minBy";
+import mixin from "lodash-es/mixin";
+import multiply from "lodash-es/multiply";
+import negate from "lodash-es/negate";
+import noop from "lodash-es/noop";
+import now from "lodash-es/now";
+import nth from "lodash-es/nth";
+import nthArg from "lodash-es/nthArg";
+import omit from "lodash-es/omit";
+import omitBy from "lodash-es/omitBy";
+import once from "lodash-es/once";
+import orderBy from "lodash-es/orderBy";
+import over from "lodash-es/over";
+import overArgs from "lodash-es/overArgs";
+import overEvery from "lodash-es/overEvery";
+import overSome from "lodash-es/overSome";
+import pad from "lodash-es/pad";
+import padEnd from "lodash-es/padEnd";
+import padStart from "lodash-es/padStart";
+import parseInt from "lodash-es/parseInt";
+import partial from "lodash-es/partial";
+import partialRight from "lodash-es/partialRight";
+import partition from "lodash-es/partition";
+import pick from "lodash-es/pick";
+import pickBy from "lodash-es/pickBy";
+import property from "lodash-es/property";
+import propertyOf from "lodash-es/propertyOf";
+import pull from "lodash-es/pull";
+import pullAll from "lodash-es/pullAll";
+import pullAllBy from "lodash-es/pullAllBy";
+import pullAllWith from "lodash-es/pullAllWith";
+import pullAt from "lodash-es/pullAt";
+import random from "lodash-es/random";
+import range from "lodash-es/range";
+import rangeRight from "lodash-es/rangeRight";
+import rearg from "lodash-es/rearg";
+import reduce from "lodash-es/reduce";
+import reduceRight from "lodash-es/reduceRight";
+import reject from "lodash-es/reject";
+import remove from "lodash-es/remove";
+import repeat from "lodash-es/repeat";
+import replace from "lodash-es/replace";
+import rest from "lodash-es/rest";
+import result from "lodash-es/result";
+import reverse from "lodash-es/reverse";
+import round from "lodash-es/round";
+import sample from "lodash-es/sample";
+import sampleSize from "lodash-es/sampleSize";
+import set from "lodash-es/set";
+import setWith from "lodash-es/setWith";
+import shuffle from "lodash-es/shuffle";
+import size from "lodash-es/size";
+import slice from "lodash-es/slice";
+import snakeCase from "lodash-es/snakeCase";
+import some from "lodash-es/some";
+import sortBy from "lodash-es/sortBy";
+import sortedIndex from "lodash-es/sortedIndex";
+import sortedIndexBy from "lodash-es/sortedIndexBy";
+import sortedIndexOf from "lodash-es/sortedIndexOf";
+import sortedLastIndex from "lodash-es/sortedLastIndex";
+import sortedLastIndexBy from "lodash-es/sortedLastIndexBy";
+import sortedLastIndexOf from "lodash-es/sortedLastIndexOf";
+import sortedUniq from "lodash-es/sortedUniq";
+import sortedUniqBy from "lodash-es/sortedUniqBy";
+import split from "lodash-es/split";
+import spread from "lodash-es/spread";
+import startCase from "lodash-es/startCase";
+import startsWith from "lodash-es/startsWith";
+import stubArray from "lodash-es/stubArray";
+import stubFalse from "lodash-es/stubFalse";
+import stubObject from "lodash-es/stubObject";
+import stubString from "lodash-es/stubString";
+import stubTrue from "lodash-es/stubTrue";
+import subtract from "lodash-es/subtract";
+import sum from "lodash-es/sum";
+import sumBy from "lodash-es/sumBy";
+import tail from "lodash-es/tail";
+import take from "lodash-es/take";
+import takeRight from "lodash-es/takeRight";
+import takeRightWhile from "lodash-es/takeRightWhile";
+import takeWhile from "lodash-es/takeWhile";
+import template from "lodash-es/template";
+import templateSettings from "lodash-es/templateSettings";
+import throttle from "lodash-es/throttle";
+import times from "lodash-es/times";
+import toArray from "lodash-es/toArray";
+import toFinite from "lodash-es/toFinite";
+import toInteger from "lodash-es/toInteger";
+import toLength from "lodash-es/toLength";
+import toLower from "lodash-es/toLower";
+import toNumber from "lodash-es/toNumber";
+import toPairs from "lodash-es/toPairs";
+import toPairsIn from "lodash-es/toPairsIn";
+import toPath from "lodash-es/toPath";
+import toPlainObject from "lodash-es/toPlainObject";
+import toSafeInteger from "lodash-es/toSafeInteger";
+import toString from "lodash-es/toString";
+import toUpper from "lodash-es/toUpper";
+import transform from "lodash-es/transform";
+import trim from "lodash-es/trim";
+import trimEnd from "lodash-es/trimEnd";
+import trimStart from "lodash-es/trimStart";
+import truncate from "lodash-es/truncate";
+import unary from "lodash-es/unary";
+import unescape from "lodash-es/unescape";
+import union from "lodash-es/union";
+import unionBy from "lodash-es/unionBy";
+import unionWith from "lodash-es/unionWith";
+import uniq from "lodash-es/uniq";
+import uniqBy from "lodash-es/uniqBy";
+import uniqWith from "lodash-es/uniqWith";
+import uniqueId from "lodash-es/uniqueId";
+import unset from "lodash-es/unset";
+import unzip from "lodash-es/unzip";
+import unzipWith from "lodash-es/unzipWith";
+import update from "lodash-es/update";
+import updateWith from "lodash-es/updateWith";
+import upperCase from "lodash-es/upperCase";
+import upperFirst from "lodash-es/upperFirst";
+import values from "lodash-es/values";
+import valuesIn from "lodash-es/valuesIn";
+import without from "lodash-es/without";
+import words from "lodash-es/words";
+import wrap from "lodash-es/wrap";
+import xor from "lodash-es/xor";
+import xorBy from "lodash-es/xorBy";
+import xorWith from "lodash-es/xorWith";
+import zip from "lodash-es/zip";
+import zipObject from "lodash-es/zipObject";
+import zipObjectDeep from "lodash-es/zipObjectDeep";
+import zipWith from "lodash-es/zipWith";
 
-kebabCase("chickenWings");
+import {
+  add as add1,
+  after as after1,
+  ary as ary1,
+  assign as assign1,
+  assignIn as assignIn1,
+  assignInWith as assignInWith1,
+  assignWith as assignWith1,
+  at as at1,
+  attempt as attempt1,
+  before as before1,
+  bind as bind1,
+  bindAll as bindAll1,
+  bindKey as bindKey1,
+  camelCase as camelCase1,
+  capitalize as capitalize1,
+  castArray as castArray1,
+  ceil as ceil1,
+  chunk as chunk1,
+  clamp as clamp1,
+  clone as clone1,
+  cloneDeep as cloneDeep1,
+  cloneDeepWith as cloneDeepWith1,
+  cloneWith as cloneWith1,
+  compact as compact1,
+  concat as concat1,
+  cond as cond1,
+  conforms as conforms1,
+  conformsTo as conformsTo1,
+  constant as constant1,
+  countBy as countBy1,
+  create as create1,
+  curry as curry1,
+  curryRight as curryRight1,
+  debounce as debounce1,
+  deburr as deburr1,
+  defaultTo as defaultTo1,
+  defaults as defaults1,
+  defaultsDeep as defaultsDeep1,
+  defer as defer1,
+  delay as delay1,
+  difference as difference1,
+  differenceBy as differenceBy1,
+  differenceWith as differenceWith1,
+  divide as divide1,
+  drop as drop1,
+  dropRight as dropRight1,
+  dropRightWhile as dropRightWhile1,
+  dropWhile as dropWhile1,
+  each as each1,
+  eachRight as eachRight1,
+  endsWith as endsWith1,
+  entries as entries1,
+  entriesIn as entriesIn1,
+  eq as eq1,
+  escape as escape1,
+  escapeRegExp as escapeRegExp1,
+  every as every1,
+  extend as extend1,
+  extendWith as extendWith1,
+  fill as fill1,
+  filter as filter1,
+  find as find1,
+  findIndex as findIndex1,
+  findKey as findKey1,
+  findLast as findLast1,
+  findLastIndex as findLastIndex1,
+  findLastKey as findLastKey1,
+  first as first1,
+  flatMap as flatMap1,
+  flatMapDeep as flatMapDeep1,
+  flatMapDepth as flatMapDepth1,
+  flatten as flatten1,
+  flattenDeep as flattenDeep1,
+  flattenDepth as flattenDepth1,
+  flip as flip1,
+  floor as floor1,
+  flow as flow1,
+  flowRight as flowRight1,
+  forEach as forEach1,
+  forEachRight as forEachRight1,
+  forIn as forIn1,
+  forInRight as forInRight1,
+  forOwn as forOwn1,
+  forOwnRight as forOwnRight1,
+  fromPairs as fromPairs1,
+  functions as functions1,
+  functionsIn as functionsIn1,
+  get as get1,
+  groupBy as groupBy1,
+  gt as gt1,
+  gte as gte1,
+  has as has1,
+  hasIn as hasIn1,
+  head as head1,
+  identity as identity1,
+  inRange as inRange1,
+  includes as includes1,
+  indexOf as indexOf1,
+  initial as initial1,
+  intersection as intersection1,
+  intersectionBy as intersectionBy1,
+  intersectionWith as intersectionWith1,
+  invert as invert1,
+  invertBy as invertBy1,
+  invoke as invoke1,
+  invokeMap as invokeMap1,
+  isArguments as isArguments1,
+  isArray as isArray1,
+  isArrayBuffer as isArrayBuffer1,
+  isArrayLike as isArrayLike1,
+  isArrayLikeObject as isArrayLikeObject1,
+  isBoolean as isBoolean1,
+  isBuffer as isBuffer1,
+  isDate as isDate1,
+  isElement as isElement1,
+  isEmpty as isEmpty1,
+  isEqual as isEqual1,
+  isEqualWith as isEqualWith1,
+  isError as isError1,
+  isFinite as isFinite1,
+  isFunction as isFunction1,
+  isInteger as isInteger1,
+  isLength as isLength1,
+  isMap as isMap1,
+  isMatch as isMatch1,
+  isMatchWith as isMatchWith1,
+  isNaN as isNaN1,
+  isNative as isNative1,
+  isNil as isNil1,
+  isNull as isNull1,
+  isNumber as isNumber1,
+  isObject as isObject1,
+  isObjectLike as isObjectLike1,
+  isPlainObject as isPlainObject1,
+  isRegExp as isRegExp1,
+  isSafeInteger as isSafeInteger1,
+  isSet as isSet1,
+  isString as isString1,
+  isSymbol as isSymbol1,
+  isTypedArray as isTypedArray1,
+  isUndefined as isUndefined1,
+  isWeakMap as isWeakMap1,
+  isWeakSet as isWeakSet1,
+  iteratee as iteratee1,
+  join as join1,
+  kebabCase as kebabCase1,
+  keyBy as keyBy1,
+  keys as keys1,
+  keysIn as keysIn1,
+  last as last1,
+  lastIndexOf as lastIndexOf1,
+  lowerCase as lowerCase1,
+  lowerFirst as lowerFirst1,
+  lt as lt1,
+  lte as lte1,
+  map as map1,
+  mapKeys as mapKeys1,
+  mapValues as mapValues1,
+  matches as matches1,
+  matchesProperty as matchesProperty1,
+  max as max1,
+  maxBy as maxBy1,
+  mean as mean1,
+  meanBy as meanBy1,
+  memoize as memoize1,
+  merge as merge1,
+  mergeWith as mergeWith1,
+  method as method1,
+  methodOf as methodOf1,
+  min as min1,
+  minBy as minBy1,
+  mixin as mixin1,
+  multiply as multiply1,
+  negate as negate1,
+  noop as noop1,
+  now as now1,
+  nth as nth1,
+  nthArg as nthArg1,
+  omit as omit1,
+  omitBy as omitBy1,
+  once as once1,
+  orderBy as orderBy1,
+  over as over1,
+  overArgs as overArgs1,
+  overEvery as overEvery1,
+  overSome as overSome1,
+  pad as pad1,
+  padEnd as padEnd1,
+  padStart as padStart1,
+  parseInt as parseInt1,
+  partial as partial1,
+  partialRight as partialRight1,
+  partition as partition1,
+  pick as pick1,
+  pickBy as pickBy1,
+  property as property1,
+  propertyOf as propertyOf1,
+  pull as pull1,
+  pullAll as pullAll1,
+  pullAllBy as pullAllBy1,
+  pullAllWith as pullAllWith1,
+  pullAt as pullAt1,
+  random as random1,
+  range as range1,
+  rangeRight as rangeRight1,
+  rearg as rearg1,
+  reduce as reduce1,
+  reduceRight as reduceRight1,
+  reject as reject1,
+  remove as remove1,
+  repeat as repeat1,
+  replace as replace1,
+  rest as rest1,
+  result as result1,
+  reverse as reverse1,
+  round as round1,
+  sample as sample1,
+  sampleSize as sampleSize1,
+  set as set1,
+  setWith as setWith1,
+  shuffle as shuffle1,
+  size as size1,
+  slice as slice1,
+  snakeCase as snakeCase1,
+  some as some1,
+  sortBy as sortBy1,
+  sortedIndex as sortedIndex1,
+  sortedIndexBy as sortedIndexBy1,
+  sortedIndexOf as sortedIndexOf1,
+  sortedLastIndex as sortedLastIndex1,
+  sortedLastIndexBy as sortedLastIndexBy1,
+  sortedLastIndexOf as sortedLastIndexOf1,
+  sortedUniq as sortedUniq1,
+  sortedUniqBy as sortedUniqBy1,
+  split as split1,
+  spread as spread1,
+  startCase as startCase1,
+  startsWith as startsWith1,
+  stubArray as stubArray1,
+  stubFalse as stubFalse1,
+  stubObject as stubObject1,
+  stubString as stubString1,
+  stubTrue as stubTrue1,
+  subtract as subtract1,
+  sum as sum1,
+  sumBy as sumBy1,
+  tail as tail1,
+  take as take1,
+  takeRight as takeRight1,
+  takeRightWhile as takeRightWhile1,
+  takeWhile as takeWhile1,
+  template as template1,
+  templateSettings as templateSettings1,
+  throttle as throttle1,
+  times as times1,
+  toArray as toArray1,
+  toFinite as toFinite1,
+  toInteger as toInteger1,
+  toLength as toLength1,
+  toLower as toLower1,
+  toNumber as toNumber1,
+  toPairs as toPairs1,
+  toPairsIn as toPairsIn1,
+  toPath as toPath1,
+  toPlainObject as toPlainObject1,
+  toSafeInteger as toSafeInteger1,
+  toString as toString1,
+  toUpper as toUpper1,
+  transform as transform1,
+  trim as trim1,
+  trimEnd as trimEnd1,
+  trimStart as trimStart1,
+  truncate as truncate1,
+  unary as unary1,
+  unescape as unescape1,
+  union as union1,
+  unionBy as unionBy1,
+  unionWith as unionWith1,
+  uniq as uniq1,
+  uniqBy as uniqBy1,
+  uniqWith as uniqWith1,
+  uniqueId as uniqueId1,
+  unset as unset1,
+  unzip as unzip1,
+  unzipWith as unzipWith1,
+  update as update1,
+  updateWith as updateWith1,
+  upperCase as upperCase1,
+  upperFirst as upperFirst1,
+  values as values1,
+  valuesIn as valuesIn1,
+  without as without1,
+  words as words1,
+  wrap as wrap1,
+  xor as xor1,
+  xorBy as xorBy1,
+  xorWith as xorWith1,
+  zip as zip1,
+  zipObject as zipObject1,
+  zipObjectDeep as zipObjectDeep1,
+  zipWith as zipWith1
+} from "lodash-es";
diff --git a/types/lodash-es/math.d.ts b/types/lodash-es/math.d.ts
new file mode 100644
index 0000000000..76a54e63cd
--- /dev/null
+++ b/types/lodash-es/math.d.ts
@@ -0,0 +1,17 @@
+import { default as add } from "./add";
+import { default as ceil } from "./ceil";
+import { default as divide } from "./divide";
+import { default as floor } from "./floor";
+import { default as max } from "./max";
+import { default as maxBy } from "./maxBy";
+import { default as mean } from "./mean";
+import { default as meanBy } from "./meanBy";
+import { default as min } from "./min";
+import { default as minBy } from "./minBy";
+import { default as multiply } from "./multiply";
+import { default as round } from "./round";
+import { default as subtract } from "./subtract";
+import { default as sum } from "./sum";
+import { default as sumBy } from "./sumBy";
+
+export { default } from "./math.default";
diff --git a/types/lodash-es/math.default.d.ts b/types/lodash-es/math.default.d.ts
new file mode 100644
index 0000000000..59e31e5788
--- /dev/null
+++ b/types/lodash-es/math.default.d.ts
@@ -0,0 +1,34 @@
+import add from "./add";
+import ceil from "./ceil";
+import divide from "./divide";
+import floor from "./floor";
+import max from "./max";
+import maxBy from "./maxBy";
+import mean from "./mean";
+import meanBy from "./meanBy";
+import min from "./min";
+import minBy from "./minBy";
+import multiply from "./multiply";
+import round from "./round";
+import subtract from "./subtract";
+import sum from "./sum";
+import sumBy from "./sumBy";
+
+declare const defaultExport: {
+  add: typeof add;
+  ceil: typeof ceil;
+  divide: typeof divide;
+  floor: typeof floor;
+  max: typeof max;
+  maxBy: typeof maxBy;
+  mean: typeof mean;
+  meanBy: typeof meanBy;
+  min: typeof min;
+  minBy: typeof minBy;
+  multiply: typeof multiply;
+  round: typeof round;
+  subtract: typeof subtract;
+  sum: typeof sum;
+  sumBy: typeof sumBy;
+};
+export default defaultExport;
diff --git a/types/lodash-es/multiply.d.ts b/types/lodash-es/multiply.d.ts
new file mode 100644
index 0000000000..1098871600
--- /dev/null
+++ b/types/lodash-es/multiply.d.ts
@@ -0,0 +1,2 @@
+import { multiply } from "lodash";
+export default multiply;
diff --git a/types/lodash-es/noConflict.d.ts b/types/lodash-es/noConflict.d.ts
deleted file mode 100644
index 75499c13e3..0000000000
--- a/types/lodash-es/noConflict.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { noConflict } from "lodash";
-export default noConflict;
diff --git a/types/lodash-es/number.d.ts b/types/lodash-es/number.d.ts
new file mode 100644
index 0000000000..32a19d3c39
--- /dev/null
+++ b/types/lodash-es/number.d.ts
@@ -0,0 +1,5 @@
+import { default as clamp } from "./clamp";
+import { default as inRange } from "./inRange";
+import { default as random } from "./random";
+
+export { default } from "./number.default";
diff --git a/types/lodash-es/number.default.d.ts b/types/lodash-es/number.default.d.ts
new file mode 100644
index 0000000000..0c96c62d27
--- /dev/null
+++ b/types/lodash-es/number.default.d.ts
@@ -0,0 +1,10 @@
+import clamp from "./clamp";
+import inRange from "./inRange";
+import random from "./random";
+
+declare const defaultExport: {
+  clamp: typeof clamp;
+  inRange: typeof inRange;
+  random: typeof random;
+};
+export default defaultExport;
diff --git a/types/lodash-es/object.d.ts b/types/lodash-es/object.d.ts
new file mode 100644
index 0000000000..34b2bbea2d
--- /dev/null
+++ b/types/lodash-es/object.d.ts
@@ -0,0 +1,49 @@
+import { default as assign } from "./assign";
+import { default as assignIn } from "./assignIn";
+import { default as assignInWith } from "./assignInWith";
+import { default as assignWith } from "./assignWith";
+import { default as at } from "./at";
+import { default as create } from "./create";
+import { default as defaults } from "./defaults";
+import { default as defaultsDeep } from "./defaultsDeep";
+import { default as entries } from "./entries";
+import { default as entriesIn } from "./entriesIn";
+import { default as extend } from "./extend";
+import { default as extendWith } from "./extendWith";
+import { default as findKey } from "./findKey";
+import { default as findLastKey } from "./findLastKey";
+import { default as forIn } from "./forIn";
+import { default as forInRight } from "./forInRight";
+import { default as forOwn } from "./forOwn";
+import { default as forOwnRight } from "./forOwnRight";
+import { default as functions } from "./functions";
+import { default as functionsIn } from "./functionsIn";
+import { default as get } from "./get";
+import { default as has } from "./has";
+import { default as hasIn } from "./hasIn";
+import { default as invert } from "./invert";
+import { default as invertBy } from "./invertBy";
+import { default as invoke } from "./invoke";
+import { default as keys } from "./keys";
+import { default as keysIn } from "./keysIn";
+import { default as mapKeys } from "./mapKeys";
+import { default as mapValues } from "./mapValues";
+import { default as merge } from "./merge";
+import { default as mergeWith } from "./mergeWith";
+import { default as omit } from "./omit";
+import { default as omitBy } from "./omitBy";
+import { default as pick } from "./pick";
+import { default as pickBy } from "./pickBy";
+import { default as result } from "./result";
+import { default as set } from "./set";
+import { default as setWith } from "./setWith";
+import { default as toPairs } from "./toPairs";
+import { default as toPairsIn } from "./toPairsIn";
+import { default as transform } from "./transform";
+import { default as unset } from "./unset";
+import { default as update } from "./update";
+import { default as updateWith } from "./updateWith";
+import { default as values } from "./values";
+import { default as valuesIn } from "./valuesIn";
+
+export { default } from "./object.default";
diff --git a/types/lodash-es/object.default.d.ts b/types/lodash-es/object.default.d.ts
new file mode 100644
index 0000000000..16cf6a9157
--- /dev/null
+++ b/types/lodash-es/object.default.d.ts
@@ -0,0 +1,98 @@
+import assign from "./assign";
+import assignIn from "./assignIn";
+import assignInWith from "./assignInWith";
+import assignWith from "./assignWith";
+import at from "./at";
+import create from "./create";
+import defaults from "./defaults";
+import defaultsDeep from "./defaultsDeep";
+import entries from "./entries";
+import entriesIn from "./entriesIn";
+import extend from "./extend";
+import extendWith from "./extendWith";
+import findKey from "./findKey";
+import findLastKey from "./findLastKey";
+import forIn from "./forIn";
+import forInRight from "./forInRight";
+import forOwn from "./forOwn";
+import forOwnRight from "./forOwnRight";
+import functions from "./functions";
+import functionsIn from "./functionsIn";
+import get from "./get";
+import has from "./has";
+import hasIn from "./hasIn";
+import invert from "./invert";
+import invertBy from "./invertBy";
+import invoke from "./invoke";
+import keys from "./keys";
+import keysIn from "./keysIn";
+import mapKeys from "./mapKeys";
+import mapValues from "./mapValues";
+import merge from "./merge";
+import mergeWith from "./mergeWith";
+import omit from "./omit";
+import omitBy from "./omitBy";
+import pick from "./pick";
+import pickBy from "./pickBy";
+import result from "./result";
+import set from "./set";
+import setWith from "./setWith";
+import toPairs from "./toPairs";
+import toPairsIn from "./toPairsIn";
+import transform from "./transform";
+import unset from "./unset";
+import update from "./update";
+import updateWith from "./updateWith";
+import values from "./values";
+import valuesIn from "./valuesIn";
+
+declare const defaultExport: {
+  assign: typeof assign;
+  assignIn: typeof assignIn;
+  assignInWith: typeof assignInWith;
+  assignWith: typeof assignWith;
+  at: typeof at;
+  create: typeof create;
+  defaults: typeof defaults;
+  defaultsDeep: typeof defaultsDeep;
+  entries: typeof entries;
+  entriesIn: typeof entriesIn;
+  extend: typeof extend;
+  extendWith: typeof extendWith;
+  findKey: typeof findKey;
+  findLastKey: typeof findLastKey;
+  forIn: typeof forIn;
+  forInRight: typeof forInRight;
+  forOwn: typeof forOwn;
+  forOwnRight: typeof forOwnRight;
+  functions: typeof functions;
+  functionsIn: typeof functionsIn;
+  get: typeof get;
+  has: typeof has;
+  hasIn: typeof hasIn;
+  invert: typeof invert;
+  invertBy: typeof invertBy;
+  invoke: typeof invoke;
+  keys: typeof keys;
+  keysIn: typeof keysIn;
+  mapKeys: typeof mapKeys;
+  mapValues: typeof mapValues;
+  merge: typeof merge;
+  mergeWith: typeof mergeWith;
+  omit: typeof omit;
+  omitBy: typeof omitBy;
+  pick: typeof pick;
+  pickBy: typeof pickBy;
+  result: typeof result;
+  set: typeof set;
+  setWith: typeof setWith;
+  toPairs: typeof toPairs;
+  toPairsIn: typeof toPairsIn;
+  transform: typeof transform;
+  unset: typeof unset;
+  update: typeof update;
+  updateWith: typeof updateWith;
+  values: typeof values;
+  valuesIn: typeof valuesIn;
+};
+export default defaultExport;
diff --git a/types/lodash-es/runInContext.d.ts b/types/lodash-es/runInContext.d.ts
deleted file mode 100644
index dcfba9ffed..0000000000
--- a/types/lodash-es/runInContext.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { runInContext } from "lodash";
-export default runInContext;
diff --git a/types/lodash-es/scripts/generate-modules.ts b/types/lodash-es/scripts/generate-modules.ts
new file mode 100644
index 0000000000..2b74b55b33
--- /dev/null
+++ b/types/lodash-es/scripts/generate-modules.ts
@@ -0,0 +1,180 @@
+// Usage: ts-node generate-modules.ts
+
+/// <reference types="node" />
+
+import * as fs from "fs";
+import { STATUS_CODES } from "http";
+import { get } from "https";
+import * as path from "path";
+import * as prettier from 'prettier';
+
+const GROUP_WITH_DEFAULTS = [
+    'array',
+    'collection',
+    'function',
+    'date',
+    'lang',
+    'math',
+    'number',
+    'object',
+    'string',
+    'util',
+];
+
+const SPECIAL_DEFAULTS = ['seq'];
+
+const SPECIAL_DEFAULTS_OF_SEQ = [
+    'at',
+    'lodash',
+    'reverse',
+    'value',
+];
+
+const SRC_REGEXP = /default\s\{([^\}]+)}/;
+
+main().catch(console.error);
+
+async function main() {
+    const versionObject = await getPackageVersion();
+
+    const results = await getDefaultsDefinitions(versionObject.fullVersion);
+
+    const extractedResults = results.map(extractDefaults).map(arr => arr.sort());
+
+    const tsFiles = [];
+
+    GROUP_WITH_DEFAULTS.forEach((group, index) => {
+        console.log(group);
+
+        // output per file per module
+        extractedResults[index].forEach((module) => {
+            console.log(`    ${module}`);
+            // Generate local module
+            const moduleFilename = `${module}.d.ts`;
+            tsFiles.push(moduleFilename);
+            writeFileSync(path.join("..", moduleFilename), `import { ${module} } from "lodash";\nexport default ${module};\n`);
+        });
+
+        // output default
+        const defaultModule = `${group}.default.d.ts`;
+        tsFiles.push(defaultModule);
+
+        console.log('  ' + defaultModule);
+
+        writeFileSync(path.join("..", defaultModule), `${extractedResults[index].map(val => `import ${val} from "./${val}";`).join('\n')}\n
+declare const defaultExport: {\n${extractedResults[index].map(val => `${val}: typeof ${val};`).join('\n')} };
+export default defaultExport;\n`);
+
+        // output group file
+        const groupFilename = `${group}.d.ts`;
+        tsFiles.push(groupFilename);
+
+        console.log('  ' + groupFilename);
+
+        writeFileSync(path.join("..", groupFilename), `${extractedResults[index].map(val => `import { default as ${val} } from "./${val}";`).join('\n')}\n
+export { default } from './${group}.default';\n`);
+    });
+
+    const flattenModules = extractedResults.reduce((acc, cur) => acc.concat(cur), []).sort();
+
+    // output full
+    console.log('index.d.ts');
+    writeFileSync(path.join('..', 'index.d.ts'), globalDefinitionText('lodash-es', versionObject.majorMinor,
+        `${flattenModules.map(val => `export { default as ${val} } from "./${val}";`).join('\n')}\n`));
+
+    // output test file
+    console.log('lodash-es-tests.ts');
+    writeFileSync(path.join('..', 'lodash-es-tests.ts'), `${flattenModules.map(val => `import ${val} from "lodash-es/${val}";`).join('\n')}\n
+import { ${flattenModules.map(val => `${val} as ${val}1`).join(',')}} from 'lodash-es';\n`);
+
+    // output tsconfig
+    console.log('tsconfig.json');
+    tsFiles.sort().unshift('index.d.ts', 'lodash-es-tests.ts');
+    writeFileSync(path.join('..', 'tsconfig.json'), tsconfig(tsFiles));
+}
+
+function formatFile(contents) {
+    return prettier.format(contents, {
+        parser: 'typescript'
+    });
+}
+
+function writeFileSync(filePath: string, contents) {
+    const source = filePath.endsWith('ts') ? formatFile(contents) : contents;
+    fs.writeFileSync(filePath, source);
+}
+
+function extractDefaults(source) {
+    return SRC_REGEXP.exec(source)[1].split(',').map((val) => val.trim());
+}
+
+async function getDefaultsDefinitions(fullVersion) {
+    return Promise.all(GROUP_WITH_DEFAULTS.map(
+        (group) => loadString(`https://unpkg.com/lodash-es@${fullVersion}/${group}.default.js`)
+    ));
+}
+
+async function getPackageVersion() {
+    const fullName = "lodash-es";
+    const url = `https://registry.npmjs.org/${fullName.toLowerCase()}`;
+    const npmInfo = JSON.parse(await loadString(url));
+    const fullVersion = npmInfo["dist-tags"].latest;
+    const majorMinor = fullVersion.split(".").slice(0, 2).join(".");
+
+    return {
+        fullVersion,
+        majorMinor
+    };
+}
+
+function globalDefinitionText(fullName, majorMinor, allModulesImports): string {
+    return `
+// Type definitions for ${fullName} ${majorMinor}
+// Project: http://lodash.com/
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>, e-cloud <https://github.com/e-cloud>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+${allModulesImports}
+`.trim() + '\n';
+}
+
+function tsconfig(files) {
+    return JSON.stringify({
+        compilerOptions: {
+            module: "commonjs",
+            lib: [
+                "es6"
+            ],
+            noImplicitAny: true,
+            noImplicitThis: true,
+            strictNullChecks: true,
+            strictFunctionTypes: true,
+            baseUrl: "../",
+            typeRoots: [
+                "../"
+            ],
+            types: [],
+            noEmit: true,
+            forceConsistentCasingInFileNames: true
+        },
+        files
+    }, undefined, 4) + '\n';
+}
+
+function tslint() {
+    return `{ "extends": "dtslint/dt.json" }\n`;
+}
+
+function loadString(url: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+        get(url, (res) => {
+            if (res.statusCode !== 200) {
+                return reject(new Error(`HTTP Error ${res.statusCode}: ${STATUS_CODES[res.statusCode || 500]} for ${url}`));
+            }
+            let rawData = "";
+            res.on("data", chunk => rawData += chunk);
+            res.on("end", () => resolve(rawData));
+        }).on("error", reject);
+    });
+}
diff --git a/types/lodash-es/scripts/tsconfig.json b/types/lodash-es/scripts/tsconfig.json
new file mode 100644
index 0000000000..a06b8ed24f
--- /dev/null
+++ b/types/lodash-es/scripts/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "baseUrl": "../..",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": []
+    }
+}
\ No newline at end of file
diff --git a/types/lodash-es/string.d.ts b/types/lodash-es/string.d.ts
new file mode 100644
index 0000000000..9093015217
--- /dev/null
+++ b/types/lodash-es/string.d.ts
@@ -0,0 +1,33 @@
+import { default as camelCase } from "./camelCase";
+import { default as capitalize } from "./capitalize";
+import { default as deburr } from "./deburr";
+import { default as endsWith } from "./endsWith";
+import { default as escape } from "./escape";
+import { default as escapeRegExp } from "./escapeRegExp";
+import { default as kebabCase } from "./kebabCase";
+import { default as lowerCase } from "./lowerCase";
+import { default as lowerFirst } from "./lowerFirst";
+import { default as pad } from "./pad";
+import { default as padEnd } from "./padEnd";
+import { default as padStart } from "./padStart";
+import { default as parseInt } from "./parseInt";
+import { default as repeat } from "./repeat";
+import { default as replace } from "./replace";
+import { default as snakeCase } from "./snakeCase";
+import { default as split } from "./split";
+import { default as startCase } from "./startCase";
+import { default as startsWith } from "./startsWith";
+import { default as template } from "./template";
+import { default as templateSettings } from "./templateSettings";
+import { default as toLower } from "./toLower";
+import { default as toUpper } from "./toUpper";
+import { default as trim } from "./trim";
+import { default as trimEnd } from "./trimEnd";
+import { default as trimStart } from "./trimStart";
+import { default as truncate } from "./truncate";
+import { default as unescape } from "./unescape";
+import { default as upperCase } from "./upperCase";
+import { default as upperFirst } from "./upperFirst";
+import { default as words } from "./words";
+
+export { default } from "./string.default";
diff --git a/types/lodash-es/string.default.d.ts b/types/lodash-es/string.default.d.ts
new file mode 100644
index 0000000000..99a3848abb
--- /dev/null
+++ b/types/lodash-es/string.default.d.ts
@@ -0,0 +1,66 @@
+import camelCase from "./camelCase";
+import capitalize from "./capitalize";
+import deburr from "./deburr";
+import endsWith from "./endsWith";
+import escape from "./escape";
+import escapeRegExp from "./escapeRegExp";
+import kebabCase from "./kebabCase";
+import lowerCase from "./lowerCase";
+import lowerFirst from "./lowerFirst";
+import pad from "./pad";
+import padEnd from "./padEnd";
+import padStart from "./padStart";
+import parseInt from "./parseInt";
+import repeat from "./repeat";
+import replace from "./replace";
+import snakeCase from "./snakeCase";
+import split from "./split";
+import startCase from "./startCase";
+import startsWith from "./startsWith";
+import template from "./template";
+import templateSettings from "./templateSettings";
+import toLower from "./toLower";
+import toUpper from "./toUpper";
+import trim from "./trim";
+import trimEnd from "./trimEnd";
+import trimStart from "./trimStart";
+import truncate from "./truncate";
+import unescape from "./unescape";
+import upperCase from "./upperCase";
+import upperFirst from "./upperFirst";
+import words from "./words";
+
+declare const defaultExport: {
+  camelCase: typeof camelCase;
+  capitalize: typeof capitalize;
+  deburr: typeof deburr;
+  endsWith: typeof endsWith;
+  escape: typeof escape;
+  escapeRegExp: typeof escapeRegExp;
+  kebabCase: typeof kebabCase;
+  lowerCase: typeof lowerCase;
+  lowerFirst: typeof lowerFirst;
+  pad: typeof pad;
+  padEnd: typeof padEnd;
+  padStart: typeof padStart;
+  parseInt: typeof parseInt;
+  repeat: typeof repeat;
+  replace: typeof replace;
+  snakeCase: typeof snakeCase;
+  split: typeof split;
+  startCase: typeof startCase;
+  startsWith: typeof startsWith;
+  template: typeof template;
+  templateSettings: typeof templateSettings;
+  toLower: typeof toLower;
+  toUpper: typeof toUpper;
+  trim: typeof trim;
+  trimEnd: typeof trimEnd;
+  trimStart: typeof trimStart;
+  truncate: typeof truncate;
+  unescape: typeof unescape;
+  upperCase: typeof upperCase;
+  upperFirst: typeof upperFirst;
+  words: typeof words;
+};
+export default defaultExport;
diff --git a/types/lodash-es/stubArray.d.ts b/types/lodash-es/stubArray.d.ts
new file mode 100644
index 0000000000..569f1671c4
--- /dev/null
+++ b/types/lodash-es/stubArray.d.ts
@@ -0,0 +1,2 @@
+import { stubArray } from "lodash";
+export default stubArray;
diff --git a/types/lodash-es/stubFalse.d.ts b/types/lodash-es/stubFalse.d.ts
new file mode 100644
index 0000000000..b5f3f56e4c
--- /dev/null
+++ b/types/lodash-es/stubFalse.d.ts
@@ -0,0 +1,2 @@
+import { stubFalse } from "lodash";
+export default stubFalse;
diff --git a/types/lodash-es/stubObject.d.ts b/types/lodash-es/stubObject.d.ts
new file mode 100644
index 0000000000..118c59e7d0
--- /dev/null
+++ b/types/lodash-es/stubObject.d.ts
@@ -0,0 +1,2 @@
+import { stubObject } from "lodash";
+export default stubObject;
diff --git a/types/lodash-es/stubString.d.ts b/types/lodash-es/stubString.d.ts
new file mode 100644
index 0000000000..c1b6ffb801
--- /dev/null
+++ b/types/lodash-es/stubString.d.ts
@@ -0,0 +1,2 @@
+import { stubString } from "lodash";
+export default stubString;
diff --git a/types/lodash-es/stubTrue.d.ts b/types/lodash-es/stubTrue.d.ts
new file mode 100644
index 0000000000..fd701f4752
--- /dev/null
+++ b/types/lodash-es/stubTrue.d.ts
@@ -0,0 +1,2 @@
+import { stubTrue } from "lodash";
+export default stubTrue;
diff --git a/types/lodash-es/tap.d.ts b/types/lodash-es/tap.d.ts
deleted file mode 100644
index f6e1710b43..0000000000
--- a/types/lodash-es/tap.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { tap } from "lodash";
-export default tap;
diff --git a/types/lodash-es/templateSettings.d.ts b/types/lodash-es/templateSettings.d.ts
new file mode 100644
index 0000000000..9ed8ffd880
--- /dev/null
+++ b/types/lodash-es/templateSettings.d.ts
@@ -0,0 +1,2 @@
+import { templateSettings } from "lodash";
+export default templateSettings;
diff --git a/types/lodash-es/thru.d.ts b/types/lodash-es/thru.d.ts
deleted file mode 100644
index 4140290e7e..0000000000
--- a/types/lodash-es/thru.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { thru } from "lodash";
-export default thru;
diff --git a/types/lodash-es/tsconfig.json b/types/lodash-es/tsconfig.json
index a3f03eab48..7f69811c3c 100644
--- a/types/lodash-es/tsconfig.json
+++ b/types/lodash-es/tsconfig.json
@@ -21,6 +21,8 @@
         "lodash-es-tests.ts",
         "add.d.ts",
         "after.d.ts",
+        "array.d.ts",
+        "array.default.d.ts",
         "ary.d.ts",
         "assign.d.ts",
         "assignIn.d.ts",
@@ -36,23 +38,29 @@
         "capitalize.d.ts",
         "castArray.d.ts",
         "ceil.d.ts",
-        "chain.d.ts",
         "chunk.d.ts",
         "clamp.d.ts",
         "clone.d.ts",
         "cloneDeep.d.ts",
         "cloneDeepWith.d.ts",
         "cloneWith.d.ts",
+        "collection.d.ts",
+        "collection.default.d.ts",
         "compact.d.ts",
         "concat.d.ts",
         "cond.d.ts",
+        "conforms.d.ts",
+        "conformsTo.d.ts",
         "constant.d.ts",
         "countBy.d.ts",
         "create.d.ts",
         "curry.d.ts",
         "curryRight.d.ts",
+        "date.d.ts",
+        "date.default.d.ts",
         "debounce.d.ts",
         "deburr.d.ts",
+        "defaultTo.d.ts",
         "defaults.d.ts",
         "defaultsDeep.d.ts",
         "defer.d.ts",
@@ -102,6 +110,8 @@
         "forOwn.d.ts",
         "forOwnRight.d.ts",
         "fromPairs.d.ts",
+        "function.d.ts",
+        "function.default.d.ts",
         "functions.d.ts",
         "functionsIn.d.ts",
         "get.d.ts",
@@ -112,10 +122,10 @@
         "hasIn.d.ts",
         "head.d.ts",
         "identity.d.ts",
+        "inRange.d.ts",
         "includes.d.ts",
         "indexOf.d.ts",
         "initial.d.ts",
-        "inRange.d.ts",
         "intersection.d.ts",
         "intersectionBy.d.ts",
         "intersectionWith.d.ts",
@@ -166,6 +176,8 @@
         "keyBy.d.ts",
         "keys.d.ts",
         "keysIn.d.ts",
+        "lang.d.ts",
+        "lang.default.d.ts",
         "last.d.ts",
         "lastIndexOf.d.ts",
         "lowerCase.d.ts",
@@ -177,6 +189,8 @@
         "mapValues.d.ts",
         "matches.d.ts",
         "matchesProperty.d.ts",
+        "math.d.ts",
+        "math.default.d.ts",
         "max.d.ts",
         "maxBy.d.ts",
         "mean.d.ts",
@@ -189,12 +203,16 @@
         "min.d.ts",
         "minBy.d.ts",
         "mixin.d.ts",
+        "multiply.d.ts",
         "negate.d.ts",
-        "noConflict.d.ts",
         "noop.d.ts",
         "now.d.ts",
         "nth.d.ts",
         "nthArg.d.ts",
+        "number.d.ts",
+        "number.default.d.ts",
+        "object.d.ts",
+        "object.default.d.ts",
         "omit.d.ts",
         "omitBy.d.ts",
         "once.d.ts",
@@ -233,7 +251,6 @@
         "result.d.ts",
         "reverse.d.ts",
         "round.d.ts",
-        "runInContext.d.ts",
         "sample.d.ts",
         "sampleSize.d.ts",
         "set.d.ts",
@@ -256,6 +273,13 @@
         "spread.d.ts",
         "startCase.d.ts",
         "startsWith.d.ts",
+        "string.d.ts",
+        "string.default.d.ts",
+        "stubArray.d.ts",
+        "stubFalse.d.ts",
+        "stubObject.d.ts",
+        "stubString.d.ts",
+        "stubTrue.d.ts",
         "subtract.d.ts",
         "sum.d.ts",
         "sumBy.d.ts",
@@ -264,10 +288,9 @@
         "takeRight.d.ts",
         "takeRightWhile.d.ts",
         "takeWhile.d.ts",
-        "tap.d.ts",
         "template.d.ts",
+        "templateSettings.d.ts",
         "throttle.d.ts",
-        "thru.d.ts",
         "times.d.ts",
         "toArray.d.ts",
         "toFinite.d.ts",
@@ -294,8 +317,8 @@
         "unionWith.d.ts",
         "uniq.d.ts",
         "uniqBy.d.ts",
-        "uniqueId.d.ts",
         "uniqWith.d.ts",
+        "uniqueId.d.ts",
         "unset.d.ts",
         "unzip.d.ts",
         "unzipWith.d.ts",
@@ -303,6 +326,8 @@
         "updateWith.d.ts",
         "upperCase.d.ts",
         "upperFirst.d.ts",
+        "util.d.ts",
+        "util.default.d.ts",
         "values.d.ts",
         "valuesIn.d.ts",
         "without.d.ts",
@@ -316,4 +341,4 @@
         "zipObjectDeep.d.ts",
         "zipWith.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/lodash-es/util.d.ts b/types/lodash-es/util.d.ts
new file mode 100644
index 0000000000..aa043a6138
--- /dev/null
+++ b/types/lodash-es/util.d.ts
@@ -0,0 +1,34 @@
+import { default as attempt } from "./attempt";
+import { default as bindAll } from "./bindAll";
+import { default as cond } from "./cond";
+import { default as conforms } from "./conforms";
+import { default as constant } from "./constant";
+import { default as defaultTo } from "./defaultTo";
+import { default as flow } from "./flow";
+import { default as flowRight } from "./flowRight";
+import { default as identity } from "./identity";
+import { default as iteratee } from "./iteratee";
+import { default as matches } from "./matches";
+import { default as matchesProperty } from "./matchesProperty";
+import { default as method } from "./method";
+import { default as methodOf } from "./methodOf";
+import { default as mixin } from "./mixin";
+import { default as noop } from "./noop";
+import { default as nthArg } from "./nthArg";
+import { default as over } from "./over";
+import { default as overEvery } from "./overEvery";
+import { default as overSome } from "./overSome";
+import { default as property } from "./property";
+import { default as propertyOf } from "./propertyOf";
+import { default as range } from "./range";
+import { default as rangeRight } from "./rangeRight";
+import { default as stubArray } from "./stubArray";
+import { default as stubFalse } from "./stubFalse";
+import { default as stubObject } from "./stubObject";
+import { default as stubString } from "./stubString";
+import { default as stubTrue } from "./stubTrue";
+import { default as times } from "./times";
+import { default as toPath } from "./toPath";
+import { default as uniqueId } from "./uniqueId";
+
+export { default } from "./util.default";
diff --git a/types/lodash-es/util.default.d.ts b/types/lodash-es/util.default.d.ts
new file mode 100644
index 0000000000..62eb3c070a
--- /dev/null
+++ b/types/lodash-es/util.default.d.ts
@@ -0,0 +1,68 @@
+import attempt from "./attempt";
+import bindAll from "./bindAll";
+import cond from "./cond";
+import conforms from "./conforms";
+import constant from "./constant";
+import defaultTo from "./defaultTo";
+import flow from "./flow";
+import flowRight from "./flowRight";
+import identity from "./identity";
+import iteratee from "./iteratee";
+import matches from "./matches";
+import matchesProperty from "./matchesProperty";
+import method from "./method";
+import methodOf from "./methodOf";
+import mixin from "./mixin";
+import noop from "./noop";
+import nthArg from "./nthArg";
+import over from "./over";
+import overEvery from "./overEvery";
+import overSome from "./overSome";
+import property from "./property";
+import propertyOf from "./propertyOf";
+import range from "./range";
+import rangeRight from "./rangeRight";
+import stubArray from "./stubArray";
+import stubFalse from "./stubFalse";
+import stubObject from "./stubObject";
+import stubString from "./stubString";
+import stubTrue from "./stubTrue";
+import times from "./times";
+import toPath from "./toPath";
+import uniqueId from "./uniqueId";
+
+declare const defaultExport: {
+  attempt: typeof attempt;
+  bindAll: typeof bindAll;
+  cond: typeof cond;
+  conforms: typeof conforms;
+  constant: typeof constant;
+  defaultTo: typeof defaultTo;
+  flow: typeof flow;
+  flowRight: typeof flowRight;
+  identity: typeof identity;
+  iteratee: typeof iteratee;
+  matches: typeof matches;
+  matchesProperty: typeof matchesProperty;
+  method: typeof method;
+  methodOf: typeof methodOf;
+  mixin: typeof mixin;
+  noop: typeof noop;
+  nthArg: typeof nthArg;
+  over: typeof over;
+  overEvery: typeof overEvery;
+  overSome: typeof overSome;
+  property: typeof property;
+  propertyOf: typeof propertyOf;
+  range: typeof range;
+  rangeRight: typeof rangeRight;
+  stubArray: typeof stubArray;
+  stubFalse: typeof stubFalse;
+  stubObject: typeof stubObject;
+  stubString: typeof stubString;
+  stubTrue: typeof stubTrue;
+  times: typeof times;
+  toPath: typeof toPath;
+  uniqueId: typeof uniqueId;
+};
+export default defaultExport;
diff --git a/types/lodash/conformsTo.d.ts b/types/lodash/conformsTo.d.ts
new file mode 100644
index 0000000000..320b1806e0
--- /dev/null
+++ b/types/lodash/conformsTo.d.ts
@@ -0,0 +1,2 @@
+import { conformsTo } from "./index";
+export = conformsTo;
diff --git a/types/lodash/defaultTo.d.ts b/types/lodash/defaultTo.d.ts
new file mode 100644
index 0000000000..89fb56505f
--- /dev/null
+++ b/types/lodash/defaultTo.d.ts
@@ -0,0 +1,2 @@
+import { defaultTo } from "./index";
+export = defaultTo;
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index 58698cb4f3..00a1cd63b2 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -6,9 +6,11 @@
 //                 Eric L Anderson <https://github.com/ericanderson>,
 //                 AJ Richardson <https://github.com/aj-r>,
 //                 Junyoung Clare Jang <https://github.com/ailrun>,
-//                 e-cloud <https://github.com/e-cloud>
+//                 e-cloud <https://github.com/e-cloud>,
+//                 Georgii Dolzhykov <https://github.com/thorn0>,
+//                 Jack Moore <https://github.com/jtmthf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.2
 
 /**
 ### 4.0.0 Changelog (https://github.com/lodash/lodash/wiki/Changelog)
@@ -244,7 +246,7 @@ Methods:
 export = _;
 export as namespace _;
 
-declare var _: _.LoDashStatic;
+declare let _: _.LoDashStatic;
 
 type PartialObject<T> = Partial<T>;
 
@@ -253,46 +255,74 @@ declare namespace _ {
 
     interface LoDashStatic {
         /**
-        * Creates a lodash object which wraps the given value to enable intuitive method chaining.
+        * Creates a lodash object which wraps value to enable implicit method chain sequences.
+        * Methods that operate on and return arrays, collections, and functions can be chained together.
+        * Methods that retrieve a single value or may return a primitive value will automatically end the
+        * chain sequence and return the unwrapped value. Otherwise, the value must be unwrapped with value().
         *
-        * In addition to Lo-Dash methods, wrappers also have the following Array methods:
-        * concat, join, pop, push, reverse, shift, slice, sort, splice, and unshift
+        * Explicit chain sequences, which must be unwrapped with value(), may be enabled using _.chain.
         *
-        * Chaining is supported in custom builds as long as the value method is implicitly or
-        * explicitly included in the build.
+        * The execution of chained methods is lazy, that is, it's deferred until value() is
+        * implicitly or explicitly called.
         *
-        * The chainable wrapper functions are:
-        * after, assign, bind, bindAll, bindKey, chain, chunk, compact, compose, concat, countBy,
-        * createCallback, curry, debounce, defaults, defer, delay, difference, filter, flatten,
-        * forEach, forEachRight, forIn, forInRight, forOwn, forOwnRight, functions, groupBy,
-        * keyBy, initial, intersection, invert, invoke, keys, map, max, memoize, merge, min,
-        * object, omit, once, pairs, partial, partialRight, pick, pluck, pull, push, range, reject,
-        * remove, rest, reverse, sample, shuffle, slice, sort, sortBy, splice, tap, throttle, times,
-        * toArray, transform, union, uniq, unset, unshift, unzip, values, where, without, wrap, and zip
+        * Lazy evaluation allows several methods to support shortcut fusion. Shortcut fusion
+        * is an optimization to merge iteratee calls; this avoids the creation of intermediate
+        * arrays and can greatly reduce the number of iteratee executions. Sections of a chain
+        * sequence qualify for shortcut fusion if the section is applied to an array and iteratees
+        * accept only one argument. The heuristic for whether a section qualifies for shortcut
+        * fusion is subject to change.
         *
-        * The non-chainable wrapper functions are:
-        * clone, cloneDeep, contains, escape, every, find, findIndex, findKey, findLast,
-        * findLastIndex, findLastKey, has, identity, indexOf, isArguments, isArray, isBoolean,
-        * isDate, isElement, isEmpty, isEqual, isFinite, isFunction, isNaN, isNull, isNumber,
-        * isObject, isPlainObject, isRegExp, isString, isUndefined, join, lastIndexOf, mixin,
-        * noConflict, parseInt, pop, random, reduce, reduceRight, result, shift, size, some,
-        * sortedIndex, runInContext, template, unescape, uniqueId, and value
+        * Chaining is supported in custom builds as long as the value() method is directly or
+        * indirectly included in the build.
         *
-        * The wrapper functions first and last return wrapped values when n is provided, otherwise
-        * they return unwrapped values.
+        * In addition to lodash methods, wrappers have Array and String methods.
+        * The wrapper Array methods are:
+        * concat, join, pop, push, shift, sort, splice, and unshift.
+        * The wrapper String methods are:
+        * replace and split.
         *
-        * Explicit chaining can be enabled by using the _.chain method.
+        * The wrapper methods that support shortcut fusion are:
+        * at, compact, drop, dropRight, dropWhile, filter, find, findLast, head, initial, last,
+        * map, reject, reverse, slice, tail, take, takeRight, takeRightWhile, takeWhile, and toArray
+        *
+        * The chainable wrapper methods are:
+        * after, ary, assign, assignIn, assignInWith, assignWith, at, before, bind, bindAll, bindKey,
+        * castArray, chain, chunk, commit, compact, concat, conforms, constant, countBy, create,
+        * curry, debounce, defaults, defaultsDeep, defer, delay, difference, differenceBy, differenceWith,
+        * drop, dropRight, dropRightWhile, dropWhile, extend, extendWith, fill, filter, flatMap,
+        * flatMapDeep, flatMapDepth, flatten, flattenDeep, flattenDepth, flip, flow, flowRight,
+        * fromPairs, functions, functionsIn, groupBy, initial, intersection, intersectionBy, intersectionWith,
+        * invert, invertBy, invokeMap, iteratee, keyBy, keys, keysIn, map, mapKeys, mapValues,
+        * matches, matchesProperty, memoize, merge, mergeWith, method, methodOf, mixin, negate,
+        * nthArg, omit, omitBy, once, orderBy, over, overArgs, overEvery, overSome, partial, partialRight,
+        * partition, pick, pickBy, plant, property, propertyOf, pull, pullAll, pullAllBy, pullAllWith, pullAt,
+        * push, range, rangeRight, rearg, reject, remove, rest, reverse, sampleSize, set, setWith,
+        * shuffle, slice, sort, sortBy, sortedUniq, sortedUniqBy, splice, spread, tail, take,
+        * takeRight, takeRightWhile, takeWhile, tap, throttle, thru, toArray, toPairs, toPairsIn,
+        * toPath, toPlainObject, transform, unary, union, unionBy, unionWith, uniq, uniqBy, uniqWith,
+        * unset, unshift, unzip, unzipWith, update, updateWith, values, valuesIn, without, wrap,
+        * xor, xorBy, xorWith, zip, zipObject, zipObjectDeep, and zipWith.
+        *
+        * The wrapper methods that are not chainable by default are:
+        * add, attempt, camelCase, capitalize, ceil, clamp, clone, cloneDeep, cloneDeepWith, cloneWith,
+        * conformsTo, deburr, defaultTo, divide, each, eachRight, endsWith, eq, escape, escapeRegExp,
+        * every, find, findIndex, findKey, findLast, findLastIndex, findLastKey, first, floor, forEach,
+        * forEachRight, forIn, forInRight, forOwn, forOwnRight, get, gt, gte, has, hasIn, head,
+        * identity, includes, indexOf, inRange, invoke, isArguments, isArray, isArrayBuffer,
+        * isArrayLike, isArrayLikeObject, isBoolean, isBuffer, isDate, isElement, isEmpty, isEqual, isEqualWith,
+        * isError, isFinite, isFunction, isInteger, isLength, isMap, isMatch, isMatchWith, isNaN,
+        * isNative, isNil, isNull, isNumber, isObject, isObjectLike, isPlainObject, isRegExp,
+        * isSafeInteger, isSet, isString, isUndefined, isTypedArray, isWeakMap, isWeakSet, join,
+        * kebabCase, last, lastIndexOf, lowerCase, lowerFirst, lt, lte, max, maxBy, mean, meanBy,
+        * min, minBy, multiply, noConflict, noop, now, nth, pad, padEnd, padStart, parseInt, pop,
+        * random, reduce, reduceRight, repeat, result, round, runInContext, sample, shift, size,
+        * snakeCase, some, sortedIndex, sortedIndexBy, sortedLastIndex, sortedLastIndexBy, startCase,
+        * startsWith, stubArray, stubFalse, stubObject, stubString, stubTrue, subtract, sum, sumBy,
+        * template, times, toFinite, toInteger, toJSON, toLength, toLower, toNumber, toSafeInteger,
+        * toString, toUpper, trim, trimEnd, trimStart, truncate, unescape, uniqueId, upperCase,
+        * upperFirst, value, and words.
         **/
-        (value: number): LoDashImplicitWrapper<number>;
-        (value: string): LoDashImplicitStringWrapper;
-        (value: boolean): LoDashImplicitWrapper<boolean>;
-        (value: null | undefined): LoDashImplicitWrapper<null | undefined>;
-        (value: number[]): LoDashImplicitNumberArrayWrapper;
-        <T>(value: T[]): LoDashImplicitArrayWrapper<T>;
-        <T>(value: T[] | null | undefined): LoDashImplicitNillableArrayWrapper<T>;
-        <T extends {}>(value: T): LoDashImplicitObjectWrapper<T>;
-        <T extends {}>(value: T | null | undefined): LoDashImplicitNillableObjectWrapper<T>;
-        (value: any): LoDashImplicitWrapper<any>;
+        <T>(value: T): LoDashImplicitWrapper<T>;
 
         /**
         * The semantic version number.
@@ -368,7 +398,7 @@ declare namespace _ {
          * @param value The value to cache.
          * @return Returns the cache object.
          */
-        set(key: string, value: any): _.Dictionary<any>;
+        set(key: string, value: any): Dictionary<any>;
 
         /**
          * Removes all key-value entries from the map.
@@ -379,66 +409,26 @@ declare namespace _ {
         new (): MapCache;
     }
 
-    interface LoDashWrapperBase<T, TWrapper> { }
+    interface LoDashWrapper<TValue> { }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> extends LoDashWrapperBase<T, TWrapper> { }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> extends LoDashWrapperBase<T, TWrapper> { }
-
-    interface LoDashImplicitWrapper<T> extends LoDashImplicitWrapperBase<T, LoDashImplicitWrapper<T>> { }
-
-    interface LoDashExplicitWrapper<T> extends LoDashExplicitWrapperBase<T, LoDashExplicitWrapper<T>> { }
-
-    interface LoDashImplicitStringWrapper extends LoDashImplicitWrapper<string> { }
-
-    interface LoDashExplicitStringWrapper extends LoDashExplicitWrapper<string> { }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> extends LoDashImplicitWrapperBase<TObject, TWrapper> { }
-
-    interface LoDashImplicitObjectWrapper<T> extends LoDashImplicitObjectWrapperBase<T, T, LoDashImplicitObjectWrapper<T>> { }
-
-    interface LoDashImplicitNillableObjectWrapper<T> extends LoDashImplicitObjectWrapperBase<T, T | null | undefined, LoDashImplicitNillableObjectWrapper<T>> { }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> extends LoDashExplicitWrapperBase<TObject, TWrapper> { }
-
-    interface LoDashExplicitObjectWrapper<T> extends LoDashExplicitObjectWrapperBase<T, T, LoDashExplicitObjectWrapper<T>> { }
-
-    interface LoDashExplicitNillableObjectWrapper<T> extends LoDashExplicitObjectWrapperBase<T, T | null | undefined, LoDashExplicitNillableObjectWrapper<T>> { }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> extends LoDashImplicitWrapperBase<TArray, TWrapper> {
-        pop(): T | undefined;
-        push(...items: T[]): TWrapper;
-        shift(): T | undefined;
-        sort(compareFn?: (a: T, b: T) => number): TWrapper;
-        splice(start: number): TWrapper;
-        splice(start: number, deleteCount: number, ...items: T[]): TWrapper;
-        unshift(...items: T[]): TWrapper;
+    interface LoDashImplicitWrapper<TValue> extends LoDashWrapper<TValue> {
+        pop<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
+        push<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, ...items: T[]): this;
+        shift<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
+        sort<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, compareFn?: (a: T, b: T) => number): this;
+        splice<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, start: number, deleteCount?: number, ...items: T[]): this;
+        unshift<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, ...items: T[]): this;
     }
 
-    interface LoDashImplicitArrayWrapper<T> extends LoDashImplicitArrayWrapperBase<T, T[], LoDashImplicitArrayWrapper<T>> { }
-
-    interface LoDashImplicitNillableArrayWrapper<T> extends LoDashImplicitArrayWrapperBase<T, T[] | null | undefined, LoDashImplicitNillableArrayWrapper<T>> { }
-
-    interface LoDashImplicitNumberArrayWrapperBase<TArray extends number[] | null | undefined, TWrapper> extends LoDashImplicitArrayWrapperBase<number, TArray, TWrapper> { }
-
-    interface LoDashImplicitNumberArrayWrapper extends LoDashImplicitArrayWrapper<number> { }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> extends LoDashExplicitWrapperBase<TArray, TWrapper> {
-        pop(): LoDashExplicitObjectWrapper<T | undefined>;
-        push(...items: T[]): TWrapper;
-        shift(): LoDashExplicitObjectWrapper<T | undefined>;
-        sort(compareFn?: (a: T, b: T) => number): TWrapper;
-        splice(start: number): TWrapper;
-        splice(start: number, deleteCount: number, ...items: T[]): TWrapper;
-        unshift(...items: T[]): TWrapper;
+    interface LoDashExplicitWrapper<TValue> extends LoDashWrapper<TValue> {
+        pop<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
+        push<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, ...items: T[]): this;
+        shift<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
+        sort<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, compareFn?: (a: T, b: T) => number): this;
+        splice<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, start: number, deleteCount?: number, ...items: T[]): this;
+        unshift<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, ...items: T[]): this;
     }
 
-    interface LoDashExplicitArrayWrapper<T> extends LoDashExplicitArrayWrapperBase<T, T[], LoDashExplicitArrayWrapper<T>> { }
-
-    interface LoDashExplicitNillableArrayWrapper<T> extends LoDashExplicitArrayWrapperBase<T, T[] | null | undefined, LoDashExplicitNillableArrayWrapper<T>> { }
-
-    interface LoDashExplicitNumberArrayWrapper extends LoDashExplicitArrayWrapper<number> { }
-
     /*********
      * Array *
      *********/
@@ -459,32 +449,24 @@ declare namespace _ {
         ): T[][];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.chunk
          */
-        chunk(size?: number): LoDashImplicitArrayWrapper<T[]>;
+        chunk<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            size?: number,
+        ): LoDashImplicitWrapper<T[][]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.chunk
          */
-        chunk<TResult>(size?: number): LoDashImplicitArrayWrapper<TResult[]>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.chunk
-         */
-        chunk(size?: number): LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.chunk
-         */
-        chunk<TResult>(size?: number): LoDashExplicitArrayWrapper<TResult[]>;
+        chunk<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            size?: number,
+        ): LoDashExplicitWrapper<T[][]>;
     }
 
     //_.compact
@@ -494,51 +476,35 @@ declare namespace _ {
          * falsey.
          *
          * @param array The array to compact.
-         * @return (Array) Returns the new array of filtered values.
+         * @return Returns the new array of filtered values.
          */
-        compact<T>(array?: List<T | null | undefined | false | "" | 0> | null | undefined): T[];
+        compact<T>(array: List<T | null | undefined | false | "" | 0> | null | undefined): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.compact
          */
-        compact(): LoDashImplicitArrayWrapper<T>;
+        compact<T>(this: LoDashImplicitWrapper<List<T | null | undefined | false | "" | 0> | null | undefined>): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.compact
          */
-        compact<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+        compact<T>(this: LoDashExplicitWrapper<List<T | null | undefined | false | "" | 0> | null | undefined>): LoDashExplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.compact
-         */
-        compact(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.compact
-         */
-        compact<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.concat DUMMY
+    //_.concat
     interface LoDashStatic {
         /**
          * Creates a new array concatenating `array` with any additional arrays
          * and/or values.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to concatenate.
-         * @param {...*} [values] The values to concatenate.
-         * @returns {Array} Returns the new concatenated array.
+         * @param array The array to concatenate.
+         * @param [values] The values to concatenate.
+         * @returns Returns the new concatenated array.
          * @example
          *
          * var array = [1];
@@ -550,7 +516,21 @@ declare namespace _ {
          * console.log(array);
          * // => [1]
          */
-         concat<T>(array: List<T>, ...values: Array<T|List<T>>): T[];
+         concat<T>(array: Many<T>, ...values: Array<Many<T>>): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.compact
+         */
+        concat<T>(this: LoDashImplicitWrapper<Many<T>>, ...values: Array<Many<T>>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.compact
+         */
+        concat<T>(this: LoDashExplicitWrapper<Many<T>>, ...values: Array<Many<T>>): LoDashExplicitWrapper<T[]>;
     }
 
     //_.difference
@@ -569,32 +549,24 @@ declare namespace _ {
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.difference
          */
-        difference(...values: Array<List<T>>): LoDashImplicitArrayWrapper<T>;
+        difference<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.difference
          */
-        difference<TValue>(...values: Array<List<TValue>>): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.difference
-         */
-        difference(...values: Array<List<T>>): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.difference
-         */
-        difference<TValue>(...values: Array<List<TValue>>): LoDashExplicitArrayWrapper<TValue>;
+        difference<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.differenceBy
@@ -609,580 +581,365 @@ declare namespace _ {
          * @param iteratee The iteratee invoked per element.
          * @returns Returns the new array of filtered values.
          */
-        differenceBy<T>(
-            array: List<T> | null | undefined,
-            values?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
+        differenceBy<T1, T2>(
+            array: List<T1> | null | undefined,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): T1[];
 
         /**
          * @see _.differenceBy
          */
-        differenceBy<T, W extends Object>(
-            array: List<T> | null | undefined,
-            values?: List<T>,
-            iteratee?: W
-        ): T[];
+        differenceBy<T1, T2, T3>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
+        ): T1[];
 
         /**
          * @see _.differenceBy
          */
         differenceBy<T>(
             array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: List<T> | null | undefined,
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: List<T> | null | undefined,
-            ...values: any[]
+            ...values: Array<List<T>>
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.differenceBy
          */
-        differenceBy<T>(
-            values?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
+        differenceBy<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashImplicitWrapper<T1[]>;
 
         /**
          * @see _.differenceBy
          */
-        differenceBy<T, W extends Object>(
-            values?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
+        differenceBy<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
+        ): LoDashImplicitWrapper<T1[]>;
 
         /**
          * @see _.differenceBy
          */
         differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashImplicitArrayWrapper<T>;
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.differenceBy
          */
-        differenceBy<T>(
-            values?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
+        differenceBy<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashExplicitWrapper<T1[]>;
 
         /**
          * @see _.differenceBy
          */
-        differenceBy<T, W extends Object>(
-            values?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
+        differenceBy<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
+        ): LoDashExplicitWrapper<T1[]>;
 
         /**
          * @see _.differenceBy
          */
         differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashImplicitArrayWrapper<T>;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: List<T>,
-            values2?: List<T>,
-            values3?: List<T>,
-            values4?: List<T>,
-            values5?: List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.differenceWith DUMMY
+    //_.differenceWith
     interface LoDashStatic {
         /**
          * Creates an array of unique `array` values not included in the other
          * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
          * for equality comparisons.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {...Array} [values] The values to exclude.
-         * @returns {Array} Returns the new array of filtered values.
+         * @param [values] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of filtered values.
          * @example
          *
-         * _.difference([3, 2, 1], [4, 2]);
-         * // => [3, 1]
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+         * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+         * // => [{ 'x': 2, 'y': 1 }]
          */
-        differenceWith(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+        differenceWith<T1, T2>(
+            array: List<T1> | null | undefined,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): T1[];
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): T1[];
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T>(
+            array: List<T> | null | undefined,
+            ...values: Array<List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.drop
@@ -1197,32 +954,18 @@ declare namespace _ {
         drop<T>(array: List<T> | null | undefined, n?: number): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.drop
          */
-        drop(n?: number): LoDashImplicitArrayWrapper<T>;
+        drop<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, n?: number): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.drop
          */
-        drop<T>(n?: number): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.drop
-         */
-        drop(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.drop
-         */
-        drop<T>(n?: number): LoDashExplicitArrayWrapper<T>;
+        drop<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, n?: number): LoDashExplicitWrapper<T[]>;
     }
 
     //_.dropRight
@@ -1240,32 +983,18 @@ declare namespace _ {
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.dropRight
          */
-        dropRight(n?: number): LoDashImplicitArrayWrapper<T>;
+        dropRight<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, n?: number): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.dropRight
          */
-        dropRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
+        dropRight<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, n?: number): LoDashExplicitWrapper<T[]>;
     }
 
     //_.dropRightWhile
@@ -1288,118 +1017,30 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the slice of array.
          */
-        dropRightWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: ListIterator<TValue, boolean>
-        ): TValue[];
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: string
-        ): TValue[];
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere, TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: TWhere
-        ): TValue[];
+        dropRightWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.dropRightWhile
          */
-        dropRightWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
+        dropRightWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.dropRightWhile
          */
-        dropRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
+        dropRightWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.dropWhile
@@ -1422,118 +1063,30 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the slice of array.
          */
-        dropWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: ListIterator<TValue, boolean>
-        ): TValue[];
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: string
-        ): TValue[];
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere, TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: TWhere
-        ): TValue[];
+        dropWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.dropWhile
          */
-        dropWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
+        dropWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.dropWhile
          */
-        dropWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
+        dropWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.fill
@@ -1551,9 +1104,7 @@ declare namespace _ {
          */
         fill<T>(
             array: any[] | null | undefined,
-            value: T,
-            start?: number,
-            end?: number
+            value: T
         ): T[];
 
         /**
@@ -1561,54 +1112,104 @@ declare namespace _ {
          */
         fill<T>(
             array: List<any> | null | undefined,
-            value: T,
-            start?: number,
-            end?: number
+            value: T
         ): List<T>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            array: U[] | null | undefined,
+            value: T,
+            start?: number,
+            end?: number
+        ): Array<T | U>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            array: List<U> | null | undefined,
+            value: T,
+            start?: number,
+            end?: number
+        ): List<T | U>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.fill
          */
         fill<T>(
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashImplicitArrayWrapper<T>;
-    }
+            this: LoDashImplicitWrapper<any[] | null | undefined>,
+            value: T
+        ): LoDashImplicitWrapper<T[]>;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.fill
          */
         fill<T>(
+            this: LoDashImplicitWrapper<List<any> | null | undefined>,
+            value: T
+        ): LoDashImplicitWrapper<List<T>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashImplicitWrapper<U[] | null | undefined>,
             value: T,
             start?: number,
             end?: number
-        ): LoDashImplicitObjectWrapper<List<T>>;
+        ): LoDashImplicitWrapper<Array<T | U>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashImplicitWrapper<List<U> | null | undefined>,
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashImplicitWrapper<List<T | U>>;
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.fill
          */
         fill<T>(
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashExplicitArrayWrapper<T>;
-    }
+            this: LoDashExplicitWrapper<any[] | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<T[]>;
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.fill
          */
         fill<T>(
+            this: LoDashExplicitWrapper<List<any> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<List<T>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashExplicitWrapper<U[] | null | undefined>,
             value: T,
             start?: number,
             end?: number
-        ): LoDashExplicitObjectWrapper<List<T>>;
+        ): LoDashExplicitWrapper<Array<T | U>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashExplicitWrapper<List<U> | null | undefined>,
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashExplicitWrapper<List<T | U>>;
     }
 
     //_.findIndex
@@ -1633,129 +1234,29 @@ declare namespace _ {
          */
         findIndex<T>(
             array: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
+    }
 
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.findIndex
          */
         findIndex<T>(
-            array: List<T> | null | undefined,
-            predicate?: string,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W, T>(
-            array: List<T> | null | undefined,
-            predicate?: W,
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.findIndex
          */
-        findIndex(
-            predicate?: ListIterator<T, boolean>,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: ListIterator<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W,
+        findIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
@@ -1781,185 +1282,53 @@ declare namespace _ {
          */
         findLastIndex<T>(
             array: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
+    }
 
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.findLastIndex
          */
         findLastIndex<T>(
-            array: List<T> | null | undefined,
-            predicate?: string,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W, T>(
-            array: List<T> | null | undefined,
-            predicate?: W,
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.findLastIndex
          */
-        findLastIndex(
-            predicate?: ListIterator<T, boolean>,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: ListIterator<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W,
+        findLastIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
 
     //_.first
     interface LoDashStatic {
-        /**
-         * @see _.head
-         */
-        first<T>(array: List<T> | null | undefined): T | undefined;
+        first: typeof _.head; // tslint:disable-line:no-unnecessary-qualifier
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.head
          */
-        first(): string | undefined;
+        first<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.head
          */
-        first(): T | undefined;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.head
-         */
-        first<T>(): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.head
-         */
-        first(): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.head
-         */
-        first<T>(): T;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.head
-         */
-        first<T>(): T;
+        first<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
     }
 
     interface RecursiveArray<T> extends Array<T|RecursiveArray<T>> {}
-
     interface ListOfRecursiveArraysOrValues<T> extends List<T|RecursiveArray<T>> {}
 
     //_.flatten
@@ -1978,53 +1347,30 @@ declare namespace _ {
          * @see _.flatten
          */
         flatten<T>(array: List<Many<T>> | null | undefined): T[];
-
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined): RecursiveArray<T>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.flatten
          */
-        flatten(): LoDashImplicitArrayWrapper<string>;
+        flatten<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(this: LoDashImplicitWrapper<List<Many<T>> | null | undefined>): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.flatten
          */
-        flatten<TResult>(isDeep?: boolean): LoDashImplicitArrayWrapper<TResult>;
-    }
+        flatten<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashExplicitWrapper<T[]>;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatten
          */
-        flatten<TResult>(isDeep?: boolean): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flatten
-         */
-        flatten(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flatten
-         */
-        flatten<TResult>(isDeep?: boolean): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.flatten
-         */
-        flatten<TResult>(isDeep?: boolean): LoDashExplicitArrayWrapper<TResult>;
+        flatten<T>(this: LoDashExplicitWrapper<List<Many<T>> | null | undefined>): LoDashExplicitWrapper<T[]>;
     }
 
     //_.flattenDeep
@@ -2038,46 +1384,18 @@ declare namespace _ {
         flattenDeep<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.flattenDeep
          */
-        flattenDeep(): LoDashImplicitArrayWrapper<string>;
+        flattenDeep<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.flattenDeep
          */
-        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
+        flattenDeep<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
     }
 
     // _.flattenDepth
@@ -2092,48 +1410,77 @@ declare namespace _ {
         flattenDepth<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, depth?: number): T[];
     }
 
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDepth<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDepth<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitWrapper<T[]>;
+    }
+
     //_.fromPairs
     interface LoDashStatic {
         /**
          * The inverse of `_.toPairs`; this method returns an object composed
          * from key-value `pairs`.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} pairs The key-value pairs.
-         * @returns {Object} Returns the new object.
+         * @param pairs The key-value pairs.
+         * @returns Returns the new object.
          * @example
          *
          * _.fromPairs([['fred', 30], ['barney', 40]]);
          * // => { 'fred': 30, 'barney': 40 }
          */
         fromPairs<T>(
-          array: List<[_.StringRepresentable, T]> | null | undefined
+            pairs: List<[PropertyName, T]> | null | undefined
         ): Dictionary<T>;
 
         /**
          @see _.fromPairs
          */
         fromPairs(
-            array: List<any[]> | null | undefined
+            pairs: List<any[]> | null | undefined
         ): Dictionary<any>;
     }
 
-    //_.fromPairs DUMMY
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    //_.fromPairs
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.fromPairs
          */
-        fromPairs(): LoDashImplicitObjectWrapper<any>;
-    }
+        fromPairs<T>(
+          this: LoDashImplicitWrapper<List<[PropertyName, T]> | null | undefined>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
 
-    //_.fromPairs DUMMY
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+        /**
+         @see _.fromPairs
+         */
+        fromPairs(
+            this: LoDashImplicitWrapper<List<any[]> | null | undefined>
+        ): LoDashImplicitWrapper<Dictionary<any>>;
+    }
+    //_.fromPairs
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.fromPairs
          */
-        fromPairs(): LoDashExplicitObjectWrapper<any>;
+        fromPairs<T>(
+          this: LoDashExplicitWrapper<List<[PropertyName, T]> | null | undefined>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         @see _.fromPairs
+         */
+        fromPairs(
+            this: LoDashExplicitWrapper<List<any[]> | null | undefined>
+        ): LoDashExplicitWrapper<Dictionary<any>>;
     }
 
     //_.head
@@ -2149,46 +1496,18 @@ declare namespace _ {
         head<T>(array: List<T> | null | undefined): T | undefined;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.head
          */
-        head(): string | undefined;
+        head<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.head
          */
-        head(): T | undefined;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.head
-         */
-        head<T>(): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.head
-         */
-        head(): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.head
-         */
-        head<T>(): T;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.head
-         */
-        head<T>(): T;
+        head<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
     }
 
     //_.indexOf
@@ -2200,13 +1519,11 @@ declare namespace _ {
          * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
          * performs a faster binary search.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to search.
-         * @param {*} value The value to search for.
-         * @param {number} [fromIndex=0] The index to search from.
-         * @returns {number} Returns the index of the matched value, else `-1`.
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @param [fromIndex=0] The index to search from.
+         * @returns Returns the index of the matched value, else `-1`.
          * @example
          *
          * _.indexOf([1, 2, 1, 2], 2);
@@ -2223,59 +1540,137 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.indexOf
          */
-        indexOf(
+        indexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             value: T,
             fromIndex?: boolean|number
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.indexOf
          */
-        indexOf<TValue>(
-            value: TValue,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.indexOf
-         */
-        indexOf(
+        indexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             value: T,
             fromIndex?: boolean|number
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    //_.sortedIndexOf
+    interface LoDashStatic {
         /**
-         * @see _.indexOf
+         * This method is like `_.indexOf` except that it performs a binary
+         * search on a sorted `array`.
+         *
+         * @category Array
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @returns Returns the index of the matched value, else `-1`.
+         * @example
+         *
+         * _.sortedIndexOf([1, 1, 2, 2], 2);
+         * // => 2
          */
-        indexOf<TValue>(
-            value: TValue,
-            fromIndex?: boolean|number
+        sortedIndexOf<T>(
+            array: List<T> | null | undefined,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T
         ): LoDashExplicitWrapper<number>;
     }
 
-    //_.intersectionBy DUMMY
+    //_.initial
+    interface LoDashStatic {
+        /**
+         * Gets all but the last element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the slice of array.
+         */
+        initial<T>(array: List<T> | null | undefined): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.initial
+         */
+        initial<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.initial
+         */
+        initial<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    //_.intersection
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of shared values.
+         */
+        intersection<T>(...arrays: Array<List<T>>): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.intersection
+         */
+        intersection<T>(
+            this: LoDashImplicitWrapper<List<T>>,
+            ...arrays: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.intersection
+         */
+        intersection<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            ...arrays: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    //_.intersectionBy
     interface LoDashStatic {
         /**
          * This method is like `_.intersection` except that it accepts `iteratee`
          * which is invoked for each element of each `arrays` to generate the criterion
          * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns the new array of shared values.
+         * @param [arrays] The arrays to inspect.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the new array of shared values.
          * @example
          *
          * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
@@ -2285,37 +1680,249 @@ declare namespace _ {
          * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
          * // => [{ 'x': 1 }]
          */
-        intersectionBy(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+        intersectionBy<T1, T2>(
+            array: List<T1> | null,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): T1[];
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3>(
+            array: List<T1> | null,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
+        ): T1[];
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T>(
+            array?: List<T> | null,
+            ...values: Array<List<T>>
+        ): T[];
     }
 
-    //_.intersectionWith DUMMY
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    //_.intersectionWith
     interface LoDashStatic {
         /**
-         * This method is like `_.intersection` except that it accepts `comparator`
-         * which is invoked to compare elements of `arrays`. The comparator is invoked
-         * with two arguments: (arrVal, othVal).
+         * Creates an array of unique `array` values not included in the other
+         * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new array of shared values.
+         * @param [values] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of filtered values.
          * @example
          *
          * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
          * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-         *
+
          * _.intersectionWith(objects, others, _.isEqual);
          * // => [{ 'x': 1, 'y': 2 }]
          */
-        intersectionWith(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+        intersectionWith<T1, T2>(
+            array: List<T1> | null | undefined,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): T1[];
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): T1[];
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T>(
+            array?: List<T> | null,
+            ...values: Array<List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.join
@@ -2333,140 +1940,21 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.join
          */
         join(separator?: string): string;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): string;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.join
          */
         join(separator?: string): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): LoDashExplicitWrapper<string>;
-    }
-
-    //_.pullAll DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pull` except that it accepts an array of values to remove.
-         *
-         * **Note:** Unlike `_.difference`, this method mutates `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to modify.
-         * @param {Array} values The values to remove.
-         * @returns {Array} Returns `array`.
-         * @example
-         *
-         * var array = [1, 2, 3, 1, 2, 3];
-         *
-         * _.pull(array, [2, 3]);
-         * console.log(array);
-         * // => [1, 1]
-         */
-        pullAll(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.pullAllBy DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pullAll` except that it accepts `iteratee` which is
-         * invoked for each element of `array` and `values` to to generate the criterion
-         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to modify.
-         * @param {Array} values The values to remove.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns `array`.
-         * @example
-         *
-         * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-         *
-         * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-         * console.log(array);
-         * // => [{ 'x': 2 }]
-         */
-        pullAllBy(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    type Comparator<T> = (arrVal: T, othVal: T) => boolean;
-
-    //_.pullAllWith
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pullAll` except that it accepts `comparator` which
-         * is invoked to compare elements of `array` to `values`. The comparator is
-         * invoked with two arguments: (arrVal, othVal).
-         *
-         * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-         *
-         * @static
-         * @memberOf _
-         * @since 4.6.0
-         * @category Array
-         * @param {Array} array The array to modify.
-         * @param {Array} values The values to remove.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns `array`.
-         * @example
-         *
-         * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-         *
-         * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-         * console.log(array);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-         */
-        pullAllWith<T>(
-            array: List<T>,
-            values: List<T>,
-            comparator?: Comparator<T>
-        ): List<T>;
-    }
-
-    //_.reverse DUMMY
+    //_.reverse
     interface LoDashStatic {
         /**
          * Reverses `array` so that the first element becomes the last, the second
@@ -2475,9 +1963,8 @@ declare namespace _ {
          * **Note:** This method mutates `array` and is based on
          * [`Array#reverse`](https://mdn.io/Array/reverse).
          *
-         * @memberOf _
          * @category Array
-         * @returns {Array} Returns `array`.
+         * @returns Returns `array`.
          * @example
          *
          * var array = [1, 2, 3];
@@ -2488,148 +1975,22 @@ declare namespace _ {
          * console.log(array);
          * // => [3, 2, 1]
          */
-        reverse(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+        reverse<TList extends List<any>>(
+            array: TList,
+        ): TList;
     }
 
-    //_.sortedIndexOf
-    interface LoDashStatic {
+    //_.prototype.reverse
+    interface LoDashWrapper<TValue> {
         /**
-         * This method is like `_.indexOf` except that it performs a binary
-         * search on a sorted `array`.
+         * Reverses the wrapped array so the first element becomes the last, the second element becomes the second to
+         * last, and so on.
          *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to search.
-         * @param {*} value The value to search for.
-         * @returns {number} Returns the index of the matched value, else `-1`.
-         * @example
+         * Note: This method mutates the wrapped array.
          *
-         * _.sortedIndexOf([1, 1, 2, 2], 2);
-         * // => 2
+         * @return Returns the new reversed lodash wrapper instance.
          */
-        sortedIndexOf<T>(
-            array: List<T> | null | undefined,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf(
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf<TValue>(
-            value: TValue
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf<TValue>(
-            value: TValue
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.initial
-    interface LoDashStatic {
-        /**
-         * Gets all but the last element of array.
-         *
-         * @param array The array to query.
-         * @return Returns the slice of array.
-         */
-        initial<T>(array: List<T> | null | undefined): T[];
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.initial
-         */
-        initial(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.initial
-         */
-        initial<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.initial
-         */
-        initial(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.initial
-         */
-        initial<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.intersection
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-         * equality comparisons.
-         *
-         * @param arrays The arrays to inspect.
-         * @return Returns the new array of shared values.
-         */
-        intersection<T>(...arrays: Array<List<T> | null | undefined>): T[];
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: Array<List<TResult>>): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: Array<List<TResult>>): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: Array<List<TResult>>): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: Array<List<TResult>>): LoDashExplicitArrayWrapper<TResult>;
+        reverse(): this;
     }
 
     //_.last
@@ -2643,46 +2004,18 @@ declare namespace _ {
         last<T>(array: List<T> | null | undefined): T | undefined;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.last
          */
-        last(): string | undefined;
+        last<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.last
          */
-        last(): T | undefined;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.last
-         */
-        last<T>(): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.last
-         */
-        last(): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.last
-         */
-        last<T>(): T;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.last
-         */
-        last<T>(): T;
+        last<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
     }
 
     //_.lastIndexOf
@@ -2698,47 +2031,29 @@ declare namespace _ {
         lastIndexOf<T>(
             array: List<T> | null | undefined,
             value: T,
-            fromIndex?: boolean|number
+            fromIndex?: true|number
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
-         * @see _.lastIndexOf
+         * @see _.indexOf
          */
-        lastIndexOf(
+        lastIndexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             value: T,
-            fromIndex?: boolean|number
+            fromIndex?: true|number
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
-         * @see _.lastIndexOf
+         * @see _.indexOf
          */
-        lastIndexOf<TResult>(
-            value: TResult,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.lastIndexOf
-         */
-        lastIndexOf(
+        lastIndexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             value: T,
-            fromIndex?: boolean|number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.lastIndexOf
-         */
-        lastIndexOf<TResult>(
-            value: TResult,
-            fromIndex?: boolean|number
+            fromIndex?: true|number
         ): LoDashExplicitWrapper<number>;
     }
 
@@ -2757,40 +2072,24 @@ declare namespace _ {
         ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.nth
          */
-        nth(
+        nth<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             n?: number
         ): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.nth
          */
-        nth<TResult>(
-            n?:number
-        ): TResult | undefined;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.nth
-         */
-        nth(
-            n?:number
-        ): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.nth
-         */
-        nth<TResult>(
-            n?:number
-        ): LoDashExplicitWrapper<TResult>;
+        nth<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<T | undefined>;
     }
 
     //_.pull
@@ -2818,32 +2117,24 @@ declare namespace _ {
         ): List<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.pull
          */
-        pull(...values: T[]): LoDashImplicitArrayWrapper<T>;
+        pull<T>(
+            this: LoDashImplicitWrapper<List<T>>,
+            ...values: T[]
+        ): this;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.pull
          */
-        pull<TValue>(...values: TValue[]): LoDashImplicitObjectWrapper<List<TValue>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.pull
-         */
-        pull(...values: T[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.pull
-         */
-        pull<TValue>(...values: TValue[]): LoDashExplicitObjectWrapper<List<TValue>>;
+        pull<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            ...values: T[]
+        ): this;
     }
 
     //_.pullAt
@@ -2859,37 +2150,229 @@ declare namespace _ {
          * @return Returns the new array of removed elements.
          */
         pullAt<T>(
-            array: List<T>,
+            array: T[],
             ...indexes: Array<Many<number>>
         ): T[];
-    }
 
-    interface LoDashImplicitArrayWrapper<T> {
         /**
          * @see _.pullAt
          */
-        pullAt(...indexes: Array<Many<number>>): LoDashImplicitArrayWrapper<T>;
+        pullAt<T>(
+            array: List<T>,
+            ...indexes: Array<Many<number>>
+        ): List<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.pullAt
          */
-        pullAt<T>(...indexes: Array<Many<number>>): LoDashImplicitArrayWrapper<T>;
+        pullAt(...indexes: Array<Many<number>>): this;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    //_.pullAll
+    interface LoDashStatic {
         /**
-         * @see _.pullAt
+         * This method is like `_.pull` except that it accepts an array of values to remove.
+         *
+         * **Note:** Unlike `_.difference`, this method mutates `array`.
+         *
+         * @category Array
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @returns Returns `array`.
+         * @example
+         *
+         * var array = [1, 2, 3, 1, 2, 3];
+         *
+         * _.pull(array, [2, 3]);
+         * console.log(array);
+         * // => [1, 1]
          */
-        pullAt(...indexes: Array<Many<number>>): LoDashExplicitArrayWrapper<T>;
+        pullAll<T>(
+            array: T[],
+            values?: List<T>,
+        ): T[];
+
+        /**
+         * @see _.pullAll
+         */
+        pullAll<T>(
+            array: List<T>,
+            values?: List<T>,
+        ): List<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
-         * @see _.pullAt
+         * @see _.pullAll
          */
-        pullAt<T>(...indexes: Array<Many<number>>): LoDashExplicitArrayWrapper<T>;
+        pullAll<T>(
+            this: LoDashImplicitWrapper<List<T>>,
+            values?: List<T>
+        ): this;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pullAll
+         */
+        pullAll<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            values?: List<T>
+        ): this;
+    }
+
+    //_.pullAllBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.pullAll` except that it accepts `iteratee` which is
+         * invoked for each element of `array` and `values` to to generate the criterion
+         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+         *
+         * @category Array
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns `array`.
+         * @example
+         *
+         * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+         *
+         * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+         * console.log(array);
+         * // => [{ 'x': 2 }]
+         */
+        pullAllBy<T>(
+            array: T[],
+            values?: List<T>,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T>(
+            array: List<T>,
+            values?: List<T>,
+            iteratee?: ValueIteratee<T>
+        ): List<T>;
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T1, T2>(
+            array: T1[],
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): T1[];
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T1, T2>(
+            array: List<T1>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): List<T1>;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T>(
+            this: LoDashWrapper<List<T>>,
+            values?: List<T>,
+            iteratee?: ValueIteratee<T>
+        ): this;
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T1, T2>(
+            this: LoDashWrapper<List<T1>>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): this;
+    }
+
+    //_.pullAllWith
+    interface LoDashStatic {
+        /**
+         * This method is like `_.pullAll` except that it accepts `comparator` which is
+         * invoked to compare elements of array to values. The comparator is invoked with
+         * two arguments: (arrVal, othVal).
+         *
+         * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+         *
+         * @category Array
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns `array`.
+         * @example
+         *
+         * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+         *
+         * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+         * console.log(array);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+         */
+        pullAllWith<T>(
+            array: T[],
+            values?: List<T>,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T>(
+            array: List<T>,
+            values?: List<T>,
+            comparator?: Comparator<T>
+        ): List<T>;
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T1, T2>(
+            array: T1[],
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): T1[];
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T1, T2>(
+            array: List<T1>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): List<T1>;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T>(
+            this: LoDashWrapper<List<T>>,
+            values?: List<T>,
+            comparator?: Comparator<T>
+        ): this;
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T1, T2>(
+            this: LoDashWrapper<List<T1>>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): this;
     }
 
     //_.remove
@@ -2916,116 +2399,28 @@ declare namespace _ {
          */
         remove<T>(
             array: List<T>,
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIteratee<T>
         ): T[];
+    }
 
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.remove
          */
         remove<T>(
-            array: List<T>,
-            predicate?: string
-        ): T[];
-
-        /**
-         * @see _.remove
-         */
-        remove<W, T>(
-            array: List<T>,
-            predicate?: W
-        ): T[];
+            this: LoDashImplicitWrapper<List<T>>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.remove
          */
-        remove(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W>(
-            predicate?: W
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: ListIterator<TResult, boolean>
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W, TResult>(
-            predicate?: W
-        ): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W>(
-            predicate?: W
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: ListIterator<TResult, boolean>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W, TResult>(
-            predicate?: W
-        ): LoDashExplicitArrayWrapper<TResult>;
+        remove<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.tail
@@ -3033,40 +2428,24 @@ declare namespace _ {
         /**
          * Gets all but the first element of array.
          *
-         * @alias _.tail
-         *
          * @param array The array to query.
          * @return Returns the slice of array.
          */
         tail<T>(array: List<T> | null | undefined): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.tail
          */
-        tail(): LoDashImplicitArrayWrapper<T>;
+        tail<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.tail
          */
-        tail<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.tail
-         */
-        tail(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.tail
-         */
-        tail<T>(): LoDashExplicitArrayWrapper<T>;
+        tail<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
     }
 
     //_.slice
@@ -3080,30 +2459,32 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         slice<T>(
-            array: T[] | null | undefined,
+            array: List<T> | null | undefined,
             start?: number,
             end?: number
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.slice
          */
-        slice(
+        slice<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             start?: number,
             end?: number
-        ): LoDashImplicitArrayWrapper<T>;
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.slice
          */
-        slice(
+        slice<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             start?: number,
             end?: number
-        ): LoDashExplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.sortedIndex
@@ -3112,12 +2493,10 @@ declare namespace _ {
          * Uses a binary search to determine the lowest index at which `value` should
          * be inserted into `array` in order to maintain its sort order.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @returns Returns the index at which `value` should be inserted into `array`.
          * @example
          *
          * _.sortedIndex([30, 50], 40);
@@ -3132,56 +2511,22 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: string
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex(
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sortedIndex
          */
         sortedIndex<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             value: T
         ): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: string
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sortedIndex
          */
         sortedIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             value: T
         ): LoDashExplicitWrapper<number>;
     }
@@ -3193,13 +2538,11 @@ declare namespace _ {
          * which is invoked for `value` and each element of `array` to compute their
          * sort ranking. The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the index at which `value` should be inserted into `array`.
          * @example
          *
          * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
@@ -3211,202 +2554,32 @@ declare namespace _ {
          * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
          * // => 0
          */
-        sortedIndexBy<T, TSort>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
         sortedIndexBy<T>(
             array: List<T> | null | undefined,
             value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W, T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: Object
+            iteratee?: ValueIteratee<T>
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sortedIndexBy
          */
-        sortedIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
+        sortedIndexBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            iteratee?: ValueIteratee<T>
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sortedIndexBy
          */
         sortedIndexBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: Object
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: (x: T) => any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: Object
+            iteratee?: ValueIteratee<T>
         ): LoDashExplicitWrapper<number>;
     }
 
@@ -3417,12 +2590,10 @@ declare namespace _ {
          * index at which `value` should be inserted into `array` in order to
          * maintain its sort order.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @returns Returns the index at which `value` should be inserted into `array`.
          * @example
          *
          * _.sortedLastIndex([4, 5], 4);
@@ -3434,56 +2605,22 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex(
-            value: string
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex(
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sortedLastIndex
          */
         sortedLastIndex<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             value: T
         ): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex(
-            value: string
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sortedLastIndex
          */
         sortedLastIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             value: T
         ): LoDashExplicitWrapper<number>;
     }
@@ -3495,230 +2632,56 @@ declare namespace _ {
          * which is invoked for `value` and each element of `array` to compute their
          * sort ranking. The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the index at which `value` should be inserted into `array`.
          * @example
          *
          * // using the `_.property` iteratee shorthand
          * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
          * // => 1
          */
-        sortedLastIndexBy<T, TSort>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
         sortedLastIndexBy<T>(
             array: List<T> | null | undefined,
             value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W, T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: Object
+            iteratee: ValueIteratee<T>
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sortedLastIndexBy
          */
         sortedLastIndexBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: Object
+            iteratee: ValueIteratee<T>
         ): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sortedLastIndexBy
          */
         sortedLastIndexBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             value: T,
-            iteratee: (x: T) => any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: Object
+            iteratee: ValueIteratee<T>
         ): LoDashExplicitWrapper<number>;
     }
 
-    //_.sortedLastIndexOf DUMMY
+    //_.sortedLastIndexOf
     interface LoDashStatic {
         /**
          * This method is like `_.lastIndexOf` except that it performs a binary
          * search on a sorted `array`.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to search.
-         * @param {*} value The value to search for.
-         * @returns {number} Returns the index of the matched value, else `-1`.
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @returns Returns the index of the matched value, else `-1`.
          * @example
          *
          * _.sortedLastIndexOf([1, 1, 2, 2], 2);
@@ -3730,40 +2693,24 @@ declare namespace _ {
         ): number;
     }
 
-    //_.tail
-    interface LoDashStatic {
+    interface LoDashImplicitWrapper<TValue> {
         /**
-         * @see _.rest
+         * @see _.sortedLastIndexOf
          */
-        tail<T>(array: List<T> | null | undefined): T[];
+        sortedLastIndexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
-         * @see _.rest
+         * @see _.sortedLastIndexOf
          */
-        tail(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.rest
-         */
-        tail<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.rest
-         */
-        tail(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.rest
-         */
-        tail<T>(): LoDashExplicitArrayWrapper<T>;
+        sortedLastIndexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<number>;
     }
 
     //_.take
@@ -3781,32 +2728,24 @@ declare namespace _ {
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.take
          */
-        take(n?: number): LoDashImplicitArrayWrapper<T>;
+        take<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.take
          */
-        take<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.take
-         */
-        take(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.take
-         */
-        take<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
+        take<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.takeRight
@@ -3824,32 +2763,24 @@ declare namespace _ {
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.takeRight
          */
-        takeRight(n?: number): LoDashImplicitArrayWrapper<T>;
+        takeRight<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.takeRight
          */
-        takeRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
+        takeRight<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.takeRightWhile
@@ -3872,118 +2803,30 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the slice of array.
          */
-        takeRightWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: ListIterator<TValue, boolean>
-        ): TValue[];
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: string
-        ): TValue[];
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere, TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: TWhere
-        ): TValue[];
+        takeRightWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.takeRightWhile
          */
-        takeRightWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
+        takeRightWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.takeRightWhile
          */
-        takeRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
+        takeRightWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.takeWhile
@@ -4006,118 +2849,30 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the slice of array.
          */
-        takeWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: ListIterator<TValue, boolean>
-        ): TValue[];
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: string
-        ): TValue[];
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere, TValue>(
-            array: List<TValue> | null | undefined,
-            predicate?: TWhere
-        ): TValue[];
+        takeWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.takeWhile
          */
-        takeWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
+        takeWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.takeWhile
          */
-        takeWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            predicate?: string
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile(
-            predicate?: ListIterator<T, boolean>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            predicate?: string
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
+        takeWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.union
@@ -4132,42 +2887,24 @@ declare namespace _ {
         union<T>(...arrays: Array<List<T> | null | undefined>): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.union
          */
-        union(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.union
-         */
-        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
+        union<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.union
          */
-        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.union
-         */
-        union(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.union
-         */
-        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.union
-         */
-        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
+        union<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.unionBy
@@ -4183,504 +2920,256 @@ declare namespace _ {
          */
         unionBy<T>(
             arrays: List<T> | null | undefined,
-            iteratee?: (value: T) => any
+            iteratee?: ValueIteratee<T>
         ): T[];
 
         /**
          * @see _.unionBy
          */
-        unionBy<T, W extends Object>(
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    //_.unionWith
+    interface LoDashStatic {
+        /**
+         * This method is like `_.union` except that it accepts `comparator` which
+         * is invoked to compare elements of `arrays`. The comparator is invoked
+         * with two arguments: (arrVal, othVal).
+         *
+         * @category Array
+         * @param [arrays] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of combined values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+         *
+         * _.unionWith(objects, others, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+         */
+        unionWith<T>(
             arrays: List<T> | null | undefined,
-            iteratee?: W
+            comparator?: Comparator<T>
         ): T[];
 
         /**
          * @see _.unionBy
          */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
+        unionWith<T>(
             arrays: List<T> | null | undefined,
-            ...iteratee: any[]
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
-         * @see _.unionBy
+         * @see _.unionWith
          */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
+        unionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
 
         /**
-         * @see _.unionBy
+         * @see _.unionWith
          */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
+        unionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             arrays2: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
 
         /**
-         * @see _.unionBy
+         * @see _.unionWith
          */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
+        unionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             arrays2: List<T> | null | undefined,
             arrays3: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashImplicitArrayWrapper<T>;
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
-         * @see _.unionBy
+         * @see _.unionWith
          */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
+        unionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
 
         /**
-         * @see _.unionBy
+         * @see _.unionWith
          */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
+        unionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             arrays2: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
 
         /**
-         * @see _.unionBy
+         * @see _.unionWith
          */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
+        unionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             arrays2: List<T> | null | undefined,
             arrays3: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashExplicitArrayWrapper<T>;
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.uniq
@@ -4691,11 +3180,9 @@ declare namespace _ {
          * for equality comparisons, in which only the first occurrence of each element
          * is kept.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to inspect.
-         * @returns {Array} Returns the new duplicate free array.
+         * @param array The array to inspect.
+         * @returns Returns the new duplicate free array.
          * @example
          *
          * _.uniq([2, 1, 2]);
@@ -4704,72 +3191,20 @@ declare namespace _ {
         uniq<T>(
             array: List<T> | null | undefined
         ): T[];
-
-        /**
-         * @see _.uniq
-         */
-        uniq<T, TSort>(
-            array: List<T> | null | undefined
-        ): T[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.uniq
          */
-        uniq<TSort>(): LoDashImplicitArrayWrapper<T>;
+        uniq<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.uniq
          */
-        uniq<TSort>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        uniq<T>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq<T, TSort>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.uniq
-         */
-        uniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.uniq
-         */
-        uniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.uniq
-         */
-        uniq<T>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq<T, TSort>(): LoDashExplicitArrayWrapper<T>;
+        uniq<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
     }
 
     //_.uniqBy
@@ -4779,12 +3214,10 @@ declare namespace _ {
          * invoked for each element in `array` to generate the criterion by which
          * uniqueness is computed. The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns the new duplicate free array.
+         * @param array The array to inspect.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the new duplicate free array.
          * @example
          *
          * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
@@ -4794,206 +3227,98 @@ declare namespace _ {
          * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
          * // => [{ 'x': 1 }, { 'x': 2 }]
          */
-        uniqBy<TString extends string | null | undefined>(
-            array: TString,
-            iteratee: StringIterator<any>
-        ): TString[];
+        uniqBy(
+            array: string | null | undefined,
+            iteratee: StringIterator<NotVoid>
+        ): string[];
 
         /**
          * @see _.uniqBy
          */
         uniqBy<T>(
             array: List<T> | null | undefined,
-            iteratee: ListIterator<T, any>
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T, TSort>(
-            array: List<T> | null | undefined,
-            iteratee: ListIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            array: List<T> | null | undefined,
-            iteratee: string
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            array: List<T> | null | undefined,
-            iteratee: Object
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}, T>(
-            array: List<T> | null | undefined,
-            iteratee: TWhere
+            iteratee: ListIteratee<T>
         ): T[];
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.uniqBy
          */
         uniqBy(
-            iteratee: StringIterator<any>
-        ): LoDashImplicitArrayWrapper<string>;
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashImplicitWrapper<string[]>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitStringWrapper {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.uniqBy
          */
         uniqBy(
-            iteratee: StringIterator<any>
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashExplicitWrapper<string[]>;
 
         /**
          * @see _.uniqBy
          */
         uniqBy<T>(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: Object
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    //_.uniqWith
+    interface LoDashStatic {
         /**
-         * @see _.uniqBy
+         * This method is like `_.uniq` except that it accepts `comparator` which
+         * is invoked to compare elements of `array`. The comparator is invoked with
+         * two arguments: (arrVal, othVal).
+         *
+         * @category Array
+         * @param array The array to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new duplicate free array.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+         *
+         * _.uniqWith(objects, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
          */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
+        uniqWith<T>(
+            array: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
-         * @see _.uniqBy
+         * @see _.uniqWith
          */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
+        uniqWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
-         * @see _.uniqBy
+         * @see _.uniqWith
          */
-        uniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: Object
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
+        uniqWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.sortedUniq
@@ -5002,11 +3327,9 @@ declare namespace _ {
          * This method is like `_.uniq` except that it's designed and optimized
          * for sorted arrays.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to inspect.
-         * @returns {Array} Returns the new duplicate free array.
+         * @param array The array to inspect.
+         * @returns Returns the new duplicate free array.
          * @example
          *
          * _.sortedUniq([1, 1, 2]);
@@ -5015,72 +3338,20 @@ declare namespace _ {
         sortedUniq<T>(
             array: List<T> | null | undefined
         ): T[];
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T, TSort>(
-            array: List<T> | null | undefined
-        ): T[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sortedUniq
          */
-        sortedUniq<TSort>(): LoDashImplicitArrayWrapper<T>;
+        sortedUniq<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sortedUniq
          */
-        sortedUniq<TSort>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        sortedUniq<T>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T, TSort>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T, TSort>(): LoDashExplicitArrayWrapper<T>;
+        sortedUniq<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
     }
 
     //_.sortedUniqBy
@@ -5089,270 +3360,63 @@ declare namespace _ {
          * This method is like `_.uniqBy` except that it's designed and optimized
          * for sorted arrays.
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {Function} [iteratee] The iteratee invoked per element.
-         * @returns {Array} Returns the new duplicate free array.
+         * @param array The array to inspect.
+         * @param [iteratee] The iteratee invoked per element.
+         * @returns Returns the new duplicate free array.
          * @example
          *
          * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
          * // => [1.1, 2.2]
          */
-        sortedUniqBy<TString extends string | null | undefined>(
-            array: TString,
-            iteratee: StringIterator<any>
-        ): TString[];
+        sortedUniqBy(
+            array: string | null | undefined,
+            iteratee: StringIterator<NotVoid>
+        ): string[];
 
         /**
          * @see _.sortedUniqBy
          */
         sortedUniqBy<T>(
             array: List<T> | null | undefined,
-            iteratee: ListIterator<T, any>
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T, TSort>(
-            array: List<T> | null | undefined,
-            iteratee: ListIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            array: List<T> | null | undefined,
-            iteratee: string
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            array: List<T> | null | undefined,
-            iteratee: Object
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}, T>(
-            array: List<T> | null | undefined,
-            iteratee: TWhere
+            iteratee: ListIteratee<T>
         ): T[];
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sortedUniqBy
          */
         sortedUniqBy(
-            iteratee: StringIterator<any>
-        ): LoDashImplicitArrayWrapper<string>;
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashImplicitWrapper<string[]>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitStringWrapper {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sortedUniqBy
          */
         sortedUniqBy(
-            iteratee: StringIterator<any>
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashExplicitWrapper<string[]>;
 
         /**
          * @see _.sortedUniqBy
          */
         sortedUniqBy<T>(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: Object
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: Object
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.unionWith DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.union` except that it accepts `comparator` which
-         * is invoked to compare elements of `arrays`. The comparator is invoked
-         * with two arguments: (arrVal, othVal).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new array of combined values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-         *
-         * _.unionWith(objects, others, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-         */
-        unionWith(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.uniqWith DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniq` except that it accepts `comparator` which
-         * is invoked to compare elements of `array`. The comparator is invoked with
-         * two arguments: (arrVal, othVal).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new duplicate free array.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-         *
-         * _.uniqWith(objects, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-         */
-        uniqWith(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.unzip
@@ -5364,35 +3428,21 @@ declare namespace _ {
          * @param array The array of grouped elements to process.
          * @return Returns the new array of regrouped elements.
          */
-        unzip<T>(array: List<List<T>> | null | undefined): T[][];
+        unzip<T>(array: T[][] | List<List<T>> | null | undefined): T[][];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.unzip
          */
-        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
+        unzip<T>(this: LoDashImplicitWrapper<T[][] | List<List<T>> | null | undefined>): LoDashImplicitWrapper<T[][]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.unzip
          */
-        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
+        unzip<T>(this: LoDashExplicitWrapper<T[][] | List<List<T>> | null | undefined>): LoDashExplicitWrapper<T[][]>;
     }
 
     //_.unzipWith
@@ -5407,28 +3457,51 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the new array of regrouped elements.
          */
-        unzipWith<TArray, TResult>(
-            array: List<List<TArray>> | null | undefined,
-            iteratee?: MemoIterator<TArray, TResult>
+        unzipWith<T, TResult>(
+            array: List<List<T>> | null | undefined,
+            iteratee: (...values: T[]) => TResult
         ): TResult[];
-    }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.unzipWith
          */
-        unzipWith<TArr, TResult>(
-            iteratee?: MemoIterator<TArr, TResult>
-        ): LoDashImplicitArrayWrapper<TResult>;
+        unzipWith<T>(
+            array: List<List<T>> | null | undefined
+        ): T[][];
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.unzipWith
          */
-        unzipWith<TArr, TResult>(
-            iteratee?: MemoIterator<TArr, TResult>
-        ): LoDashImplicitArrayWrapper<TResult>;
+        unzipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<List<T>> | null | undefined>,
+            iteratee: (...values: T[]) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T>(
+            this: LoDashImplicitWrapper<List<List<T>> | null | undefined>
+        ): LoDashImplicitWrapper<T[][]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<List<T>> | null | undefined>,
+            iteratee: (...values: T[]) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T>(
+            this: LoDashExplicitWrapper<List<List<T>> | null | undefined>
+        ): LoDashExplicitWrapper<T[][]>;
     }
 
     //_.without
@@ -5446,32 +3519,24 @@ declare namespace _ {
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.without
          */
-        without(...values: T[]): LoDashImplicitArrayWrapper<T>;
+        without<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: T[]
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.without
          */
-        without<T>(...values: T[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.without
-         */
-        without(...values: T[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.without
-         */
-        without<T>(...values: T[]): LoDashExplicitArrayWrapper<T>;
+        without<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: T[]
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.xor
@@ -5485,47 +3550,37 @@ declare namespace _ {
         xor<T>(...arrays: Array<List<T> | null | undefined>): T[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.xor
          */
-        xor(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
+        xor<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.xor
          */
-        xor<T>(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
+        xor<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.xor
-         */
-        xor(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.xor
-         */
-        xor<T>(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.xorBy DUMMY
+    //_.xorBy
     interface LoDashStatic {
         /**
          * This method is like `_.xor` except that it accepts `iteratee` which is
          * invoked for each element of each `arrays` to generate the criterion by which
          * uniqueness is computed. The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns the new array of values.
+         * @param [arrays] The arrays to inspect.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the new array of values.
          * @example
          *
          * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
@@ -5535,25 +3590,100 @@ declare namespace _ {
          * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
          * // => [{ 'x': 2 }]
          */
-        xorBy(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+        xorBy<T>(
+            arrays: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): T[];
     }
 
-    //_.xorWith DUMMY
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.xor
+         */
+        xorBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    //_.xorWith
     interface LoDashStatic {
         /**
          * This method is like `_.xor` except that it accepts `comparator` which is
          * invoked to compare elements of `arrays`. The comparator is invoked with
          * two arguments: (arrVal, othVal).
          *
-         * @static
-         * @memberOf _
          * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new array of values.
+         * @param [arrays] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of values.
          * @example
          *
          * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
@@ -5562,10 +3692,87 @@ declare namespace _ {
          * _.xorWith(objects, others, _.isEqual);
          * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
          */
-        xorWith(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+        xorWith<T>(
+            arrays: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     //_.zip
@@ -5580,32 +3787,24 @@ declare namespace _ {
         zip<T>(...arrays: Array<List<T> | null | undefined>): T[][];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.zip
          */
-        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashImplicitArrayWrapper<T[]>;
+        zip<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[][]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.zip
          */
-        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.zip
-         */
-        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.zip
-         */
-        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashExplicitArrayWrapper<T[]>;
+        zip<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[][]>;
     }
 
     //_.zipObject
@@ -5618,215 +3817,79 @@ declare namespace _ {
          * @param values The property values.
          * @return Returns the new object.
          */
-        zipObject<TValues, TResult extends {}>(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<TValues>
-        ): TResult;
+        zipObject<T>(
+            props: List<PropertyName>,
+            values: List<T>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            props?: List<PropertyName>
+        ): Dictionary<undefined>;
+
         /**
          * This method is like _.zipObject except that it supports property paths.
          *
-         * @param props The property names.
+         * @param paths The property names.
          * @param values The property values.
          * @return Returns the new object.
          */
-        zipObjectDeep<TValues, TResult extends {}>(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<TValues>
-        ): TResult;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<any>
-        ): TResult;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TResult extends {}>(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<any>
-        ): TResult;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<any>
-        ): _.Dictionary<any>;
-        /**
-         * @see _.zipObjectDeep
-         */
         zipObjectDeep(
-            props: List<StringRepresentable>|List<List<any>>,
+            paths?: List<PropertyPath>,
             values?: List<any>
-        ): _.Dictionary<any>;
+        ): object;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.zipObject
          */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
+        zipObject<T>(
+            this: LoDashImplicitWrapper<List<PropertyName>>,
+            values: List<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.zipObject
          */
         zipObject(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
+            this: LoDashImplicitWrapper<List<PropertyName>>
+        ): LoDashImplicitWrapper<Dictionary<undefined>>;
+
         /**
          * @see _.zipObjectDeep
          */
         zipObjectDeep(
+            this: LoDashImplicitWrapper<List<PropertyPath>>,
             values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
+        ): LoDashImplicitWrapper<object>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.zipObject
          */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
+        zipObject<T>(
+            this: LoDashExplicitWrapper<List<PropertyName>>,
+            values: List<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.zipObject
          */
         zipObject(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
+            this: LoDashExplicitWrapper<List<PropertyName>>
+        ): LoDashExplicitWrapper<Dictionary<undefined>>;
+
         /**
          * @see _.zipObjectDeep
          */
         zipObjectDeep(
+            this: LoDashExplicitWrapper<List<PropertyPath>>,
             values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+        ): LoDashExplicitWrapper<object>;
     }
 
     //_.zipWith
@@ -5835,19 +3898,188 @@ declare namespace _ {
          * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
          * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
          * group).
-         * @param {...Array} [arrays] The arrays to process.
-         * @param {Function} [iteratee] The function to combine grouped values.
-         * @param {*} [thisArg] The `this` binding of `iteratee`.
+         * @param [arrays] The arrays to process.
+         * @param [iteratee] The function to combine grouped values.
+         * @param [thisArg] The `this` binding of `iteratee`.
          * @return Returns the new array of grouped elements.
          */
-        zipWith<TResult>(...args: any[]): TResult[];
-    }
+        zipWith<T>(
+            ...arrays: Array<List<T> | null | undefined>
+        ): T[][];
 
-    interface LoDashImplicitArrayWrapper<T> {
         /**
          * @see _.zipWith
          */
-        zipWith<TResult>(...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+        zipWith<T, TResult>(
+            arrays: List<T> | null | undefined,
+            iteratee: (value1: T) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T, value3: T) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T, value3: T, value4: T) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T, value3: T, value4: T, value5: T) => TResult
+        ): TResult[];
+
+        zipWith<T, TResult>(
+            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
+        ): TResult[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[][]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: (value1: T) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T, value3: T) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T, value3: T, value4: T) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<TResult[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[][]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: (value1: T) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T, value3: T) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee: (value1: T, value2: T, value3: T, value4: T) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<TResult[]>;
     }
 
     /*********
@@ -5862,66 +4094,21 @@ declare namespace _ {
          * @param value The value to wrap.
          * @return Returns the new lodash wrapper instance.
          */
-        chain(value: number): LoDashExplicitWrapper<number>;
-        chain(value: string): LoDashExplicitWrapper<string>;
-        chain(value: boolean): LoDashExplicitWrapper<boolean>;
-        chain(value: null | undefined): LoDashExplicitWrapper<null | undefined>;
-        chain<T>(value: T[]): LoDashExplicitArrayWrapper<T>;
-        chain<T>(value: ReadonlyArray<T>): LoDashExplicitArrayWrapper<T>;
-        chain<T>(value: T[] | null | undefined): LoDashExplicitNillableArrayWrapper<T>;
-        chain<T>(value: ReadonlyArray<T> | null | undefined): LoDashExplicitNillableArrayWrapper<T>;
-        chain<T extends {}>(value: T): LoDashExplicitObjectWrapper<T>;
-        chain<T extends {}>(value: T | null | undefined): LoDashExplicitObjectWrapper<T | null | undefined>;
-        chain(value: any): LoDashExplicitWrapper<any>;
+        chain<T>(value: T): LoDashExplicitWrapper<T>;
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.chain
          */
-        chain(): LoDashExplicitStringWrapper;
+        chain(): LoDashExplicitWrapper<TValue>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.chain
          */
-        chain(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitNillableArrayWrapper<T> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitNillableArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    interface LoDashImplicitNillableObjectWrapper<T> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitNillableObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.chain
-         */
-        chain(): TWrapper;
+        chain(): this;
     }
 
     //_.tap
@@ -5942,22 +4129,13 @@ declare namespace _ {
         ): T;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.tap
          */
         tap(
-            interceptor: (value: T) => void
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.tap
-         */
-        tap(
-            interceptor: (value: T) => void
-        ): TWrapper;
+            interceptor: (value: TValue) => void
+        ): this;
     }
 
     //_.thru
@@ -5976,237 +4154,57 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.thru
          */
-        thru<TResult extends number>(
-            interceptor: (value: T) => TResult): LoDashImplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends string>(
-            interceptor: (value: T) => TResult): LoDashImplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends boolean>(
-            interceptor: (value: T) => TResult): LoDashImplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends {}>(
-            interceptor: (value: T) => TResult): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult>(
-            interceptor: (value: T) => TResult[]): LoDashImplicitArrayWrapper<TResult>;
+        thru<TResult>(interceptor: (value: TValue) => TResult): LoDashImplicitWrapper<TResult>;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.thru
          */
-        thru<TResult extends number>(
-            interceptor: (value: T) => TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends string>(
-            interceptor: (value: T) => TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends boolean>(
-            interceptor: (value: T) => TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends {}>(
-            interceptor: (value: T) => TResult
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult>(
-            interceptor: (value: T) => TResult[]
-        ): LoDashExplicitArrayWrapper<TResult>;
+        thru<TResult>(interceptor: (value: TValue) => TResult): LoDashExplicitWrapper<TResult>;
     }
 
     //_.prototype.commit
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * Executes the chained sequence and returns the wrapped result.
          *
          * @return Returns the new lodash wrapper instance.
          */
-        commit(): TWrapper;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.commit
-         */
-        commit(): TWrapper;
-    }
-
-    //_.prototype.concat
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * Creates a new array joining a wrapped array with any additional arrays and/or values.
-         *
-         * @param items
-         * @return Returns the new concatenated array.
-         */
-        concat<TItem>(...items: Array<Many<TItem>>): LoDashImplicitArrayWrapper<TItem>;
-
-        /**
-         * @see _.concat
-         */
-        concat(...items: Array<Many<T>>): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.concat
-         */
-        concat<TItem>(...items: Array<Many<TItem>>): LoDashExplicitArrayWrapper<TItem>;
-
-        /**
-         * @see _.concat
-         */
-        concat(...items: Array<Many<T>>): LoDashExplicitArrayWrapper<T>;
+        commit(): this;
     }
 
     //_.prototype.plant
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * Creates a clone of the chained sequence planting value as the wrapped value.
          * @param value The value to plant as the wrapped value.
          * @return Returns the new lodash wrapper instance.
          */
-        plant(value: number): LoDashImplicitWrapper<number>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: string): LoDashImplicitStringWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: boolean): LoDashImplicitWrapper<boolean>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: number[]): LoDashImplicitNumberArrayWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant<T>(value: T[]): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant<T>(value: ReadonlyArray<T>): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant<T extends {}>(value: T): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: any): LoDashImplicitWrapper<any>;
+        plant<T>(value: T): LoDashImplicitWrapper<T>;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.plant
          */
-        plant(value: number): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: string): LoDashExplicitStringWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: boolean): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: number[]): LoDashExplicitNumberArrayWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant<T>(value: T[]): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant<T>(value: ReadonlyArray<T>): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant<T extends {}>(value: T): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: any): LoDashExplicitWrapper<any>;
-    }
-
-    //_.prototype.reverse
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * Reverses the wrapped array so the first element becomes the last, the second element becomes the second to
-         * last, and so on.
-         *
-         * Note: This method mutates the wrapped array.
-         *
-         * @return Returns the new reversed lodash wrapper instance.
-         */
-        reverse(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.reverse
-         */
-        reverse(): LoDashExplicitArrayWrapper<T>;
+        plant<T>(value: T): LoDashExplicitWrapper<T>;
     }
 
     //_.prototype.toJSON
-    interface LoDashWrapperBase<T, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.value
          */
-        toJSON(): T;
+        toJSON(): TValue;
     }
 
     //_.prototype.toString
-    interface LoDashWrapperBase<T, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * Produces the result of coercing the unwrapped value to a string.
          *
@@ -6216,7 +4214,7 @@ declare namespace _ {
     }
 
     //_.prototype.value
-    interface LoDashWrapperBase<T, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * Executes the chained sequence to extract the unwrapped value.
          *
@@ -6224,15 +4222,15 @@ declare namespace _ {
          *
          * @return Returns the resolved unwrapped value.
          */
-        value(): T;
+        value(): TValue;
     }
 
     //_.valueOf
-    interface LoDashWrapperBase<T, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.value
          */
-        valueOf(): T;
+        valueOf(): TValue;
     }
 
     /**************
@@ -6245,42 +4243,58 @@ declare namespace _ {
          * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
          * specified as individual arguments or as arrays of keys.
          *
-         * @param collection The collection to iterate over.
+         * @param object The object to iterate over.
          * @param props The property names or indexes of elements to pick, specified individually or in arrays.
          * @return Returns the new array of picked elements.
          */
         at<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            ...props: Array<Many<number|string>>
+            object: List<T> | Dictionary<T> | null | undefined,
+            ...props: PropertyPath[]
         ): T[];
-    }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.at
          */
-        at(...props: Array<Many<number|string>>): LoDashImplicitArrayWrapper<T>;
+        at<T extends object>(
+            object: T | null | undefined,
+            ...props: Array<Many<keyof T>>
+        ): Array<T[keyof T]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.at
          */
-        at<T>(...props: Array<Many<number|string>>): LoDashImplicitArrayWrapper<T>;
-    }
+        at<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashImplicitWrapper<T[]>;
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.at
          */
-        at(...props: Array<Many<number|string>>): LoDashExplicitArrayWrapper<T>;
+        at<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<keyof T>>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.at
          */
-        at<T>(...props: Array<Many<number|string>>): LoDashExplicitArrayWrapper<T>;
+        at<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.at
+         */
+        at<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<keyof T>>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.countBy
@@ -6306,16 +4320,16 @@ declare namespace _ {
          * @return Returns the composed aggregate object.
          */
         countBy<T>(
-            collection: List<T> | null | undefined,
-            iteratee?: ListIterator<T, any>
+            collection: string | null | undefined,
+            iteratee?: StringIterator<T>
         ): Dictionary<number>;
 
         /**
          * @see _.countBy
          */
         countBy<T>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
+            collection: List<T> | null | undefined,
+            iteratee?: ListIteratee<T>
         ): Dictionary<number>;
 
         /**
@@ -6323,260 +4337,162 @@ declare namespace _ {
          */
         countBy<T>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterator<T, any>
+            iteratee?: NumericDictionaryIteratee<T>
         ): Dictionary<number>;
 
         /**
          * @see _.countBy
          */
-        countBy<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: string
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W, T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: W
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: Object
+        countBy<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIteratee<T>
         ): Dictionary<number>;
     }
 
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.countBy
          */
         countBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>|NumericDictionaryIterator<T, any>
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
 
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.countBy
          */
         countBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>|NumericDictionaryIterator<T, any>
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
 
         /**
          * @see _.countBy
          */
-        countBy(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+        countBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
 
         /**
          * @see _.countBy
          */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+        countBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
     }
 
     //_.each
     interface LoDashStatic {
-        each: typeof _.forEach;
+        each: typeof _.forEach; // tslint:disable-line:no-unnecessary-qualifier
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
+
         /**
          * @see _.forEach
          */
         each(
-            iteratee: StringIterator<any>
-        ): LoDashImplicitWrapper<string>;
-    }
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
-        each(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
+        each<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
-        each<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        each(
-            iteratee: StringIterator<any>
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.forEach
-         */
-        each(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forEach
-         */
-        each<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
+        each<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.eachRight
     interface LoDashStatic {
-        eachRight: typeof _.forEachRight;
+        eachRight: typeof _.forEachRight; // tslint:disable-line:no-unnecessary-qualifier
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
+
         /**
          * @see _.forEachRight
          */
         eachRight(
-            iteratee: StringIterator<any>
-        ): LoDashImplicitWrapper<string>;
-    }
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
-        eachRight(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
+        eachRight<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
-        eachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            iteratee: StringIterator<any>
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
+        eachRight<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.every
@@ -6591,15 +4507,7 @@ declare namespace _ {
          */
         every<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate?: DictionaryIterator<T, boolean>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -6607,107 +4515,67 @@ declare namespace _ {
          */
         every<T>(
             collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterator<T, boolean>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.every
+         */
+        every<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
          * @see _.every
          */
         every<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            predicate?: string|any[]|PartialObject<T>
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.every
          */
-        every(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: string|any[]
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: PartialObject<T>
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.every
-         */
-        every<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: string|any[]
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<TResult>(
-            predicate?: PartialObject<TResult>
-        ): boolean;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
+        every<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
          * @see _.every
          */
-        every(
-            predicate?: string|any[]
+        every<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
          * @see _.every
          */
-        every(
-            predicate?: PartialObject<T>
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.every
-         */
-        every<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: string|any[]
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<TResult>(
-            predicate?: PartialObject<TResult>
+        every<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
     }
 
@@ -6731,132 +4599,126 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the new filtered array.
          */
-        filter<T, S extends T>(
-            collection: List<T> | null | undefined,
-            predicate: ListIteratorTypeGuard<T, S>
-        ): S[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>
-        ): T[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T, S extends T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate: DictionaryIteratorTypeGuard<T, S>
-        ): S[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate?: DictionaryIterator<T, boolean>
-        ): T[];
-
-        /**
-         * @see _.filter
-         */
         filter(
             collection: string | null | undefined,
             predicate?: StringIterator<boolean>
         ): string[];
 
+        /**
+         * @see _.filter
+         */
+        filter<T, S extends T>(
+            collection: List<T> | null | undefined,
+            predicate: ListIteratorTypeGuard<T, S>
+        ): S[];
+
         /**
          * @see _.filter
          */
         filter<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            predicate: string | [string, any] | RegExp | PartialObject<T>
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>
         ): T[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object, S extends T[keyof T]>(
+            collection: T | null | undefined,
+            predicate: ObjectIteratorTypeGuard<T, S>
+        ): S[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): Array<T[keyof T]>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.filter
          */
         filter(
+            this: LoDashImplicitWrapper<string | null | undefined>,
             predicate?: StringIterator<boolean>
-        ): LoDashImplicitArrayWrapper<string>;
-    }
+        ): LoDashImplicitWrapper<string[]>;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.filter
-         */
-        filter<S extends T>(
-            predicate: ListIteratorTypeGuard<T, S>
-        ): LoDashImplicitArrayWrapper<S>;
-
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate: ListIterator<T, boolean> | string | [string, any] | RegExp | PartialObject<T>
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.filter
          */
         filter<T, S extends T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             predicate: ListIteratorTypeGuard<T, S>
-        ): LoDashImplicitArrayWrapper<S>;
+        ): LoDashImplicitWrapper<S[]>;
 
         /**
          * @see _.filter
          */
         filter<T>(
-            predicate: ListIterator<T, boolean> | DictionaryIterator<T, boolean> | string | [string, any] | RegExp | PartialObject<T>
-        ): LoDashImplicitArrayWrapper<T>;
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object, S extends T[keyof T]>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>
+        ): LoDashImplicitWrapper<S[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.filter
          */
         filter(
+            this: LoDashExplicitWrapper<string | null | undefined>,
             predicate?: StringIterator<boolean>
-        ): LoDashExplicitArrayWrapper<string>;
-    }
+        ): LoDashExplicitWrapper<string[]>;
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.filter
-         */
-        filter<S extends T>(
-            predicate: ListIteratorTypeGuard<T, S>
-        ): LoDashExplicitArrayWrapper<S>;
-
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate: ListIterator<T, boolean> | string | [string, any] | RegExp | PartialObject<T>
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.filter
          */
         filter<T, S extends T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             predicate: ListIteratorTypeGuard<T, S>
-        ): LoDashExplicitArrayWrapper<S>;
+        ): LoDashExplicitWrapper<S[]>;
 
         /**
          * @see _.filter
          */
         filter<T>(
-            predicate: ListIterator<T, boolean> | DictionaryIterator<T, boolean> | string | [string, any] | RegExp | PartialObject<T>
-        ): LoDashExplicitArrayWrapper<T>;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object, S extends T[keyof T]>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>
+        ): LoDashExplicitWrapper<S[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.find
@@ -6890,43 +4752,35 @@ declare namespace _ {
          */
         find<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
         /**
          * @see _.find
          */
-        find<T, S extends T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate: DictionaryIteratorTypeGuard<T, S>,
+        find<T extends object, S extends T[keyof T]>(
+            collection: T | null | undefined,
+            predicate: ObjectIteratorTypeGuard<T, S>,
             fromIndex?: number
         ): S|undefined;
 
         /**
          * @see _.find
          */
-        find<T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate?: DictionaryIterator<T, boolean>,
+        find<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
-        ): T|undefined;
-
-        /**
-         * @see _.find
-         */
-        find<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            predicate?: string | PartialObject<T> | [string, any],
-            fromIndex?: number
-        ): T|undefined;
+        ): T[keyof T]|undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.find
          */
-        find<S extends T>(
+        find<T, S extends T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             predicate: ListIteratorTypeGuard<T, S>,
             fromIndex?: number
         ): S|undefined;
@@ -6934,30 +4788,67 @@ declare namespace _ {
         /**
          * @see _.find
          */
-        find(
-            predicate?: ListIterator<T, boolean> | string | PartialObject<T> | [string, any],
+        find<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
-    }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.find
          */
-        find<TResult>(
-            predicate?: ListIterator<TResult, boolean> | DictionaryIterator<TResult, boolean> | string | PartialObject<TResult> | [string, any],
+        find<T extends object, S extends T[keyof T]>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
             fromIndex?: number
-        ): TResult|undefined;
-    }
+        ): S|undefined;
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.find
          */
-        find(
-            predicate?: ListIterator<T, boolean> | string | PartialObject<T> | [string, any],
+        find<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
-        ): any;
+        ): T[keyof T]|undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.find
+         */
+        find<T, S extends T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<S|undefined>;
+
+        /**
+         * @see _.find
+         */
+        find<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<T|undefined>;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object, S extends T[keyof T]>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<S|undefined>;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<T[keyof T]|undefined>;
     }
 
     //_.findLast
@@ -6981,74 +4872,103 @@ declare namespace _ {
          */
         findLast<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object, S extends T[keyof T]>(
+            collection: T | null | undefined,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T[keyof T]|undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.findLast
          */
         findLast<T, S extends T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate: DictionaryIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate?: DictionaryIterator<T, boolean>,
-            fromIndex?: number
-        ): T|undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            predicate?: string | PartialObject<T> | [string, any],
-            fromIndex?: number
-        ): T|undefined;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.findLast
-         */
-        findLast<S extends T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             predicate: ListIteratorTypeGuard<T, S>,
             fromIndex?: number
+        ): S | undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T | undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object, S extends T[keyof T]>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
         ): S|undefined;
 
         /**
          * @see _.findLast
          */
-        findLast(
-            predicate?: ListIterator<T, boolean> | string | PartialObject<T> | [string, any],
+        findLast<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
-        ): T|undefined;
+        ): T[keyof T]|undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.findLast
          */
-        findLast<TResult>(
-            predicate?: ListIterator<TResult, boolean> | DictionaryIterator<TResult, boolean> | string | PartialObject<TResult> | [string, any],
+        findLast<T, S extends T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>,
             fromIndex?: number
-        ): TResult|undefined;
-    }
+        ): LoDashExplicitWrapper<S | undefined>;
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.findLast
          */
-        findLast(
-            predicate?: ListIterator<T, boolean> | string | PartialObject<T> | [string, any],
+        findLast<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
-        ): any;
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object, S extends T[keyof T]>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<S|undefined>;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<T[keyof T]|undefined>;
     }
 
     //_.flatMap
@@ -7069,17 +4989,16 @@ declare namespace _ {
         /**
          * @see _.flatMap
          */
-        flatMap<T, TResult>(
-            collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, Many<TResult>> | string
-        ): TResult[];
+        flatMap(
+            collection: object | null | undefined
+        ): any[];
 
         /**
          * @see _.flatMap
          */
         flatMap<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee: DictionaryIterator<T, Many<TResult>> | string
+            collection: List<T> | null | undefined,
+            iteratee: ListIterator<T, Many<TResult>>
         ): TResult[];
 
         /**
@@ -7087,17 +5006,25 @@ declare namespace _ {
          */
         flatMap<T, TResult>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>> | string
+            iteratee: NumericDictionaryIterator<T, Many<TResult>>
         ): TResult[];
 
         /**
          * @see _.flatMap
          */
-        flatMap<TResult>(
-            collection: object | null | undefined,
-            iteratee?: ObjectIterator<any, Many<TResult>> | string
+        flatMap<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, Many<TResult>>
         ): TResult[];
 
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            collection: object | null | undefined,
+            iteratee: string
+        ): any[];
+
         /**
          * @see _.flatMap
          */
@@ -7107,130 +5034,104 @@ declare namespace _ {
         ): boolean[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.flatMap
          */
-        flatMap<TResult>(
-            iteratee: StringIterator<Many<TResult>>
-        ): LoDashImplicitArrayWrapper<TResult>;
+        flatMap<T>(this: LoDashImplicitWrapper<List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined>): LoDashImplicitWrapper<T[]>;
 
         /**
          * @see _.flatMap
          */
-        flatMap(): LoDashImplicitArrayWrapper<string>;
-    }
+        flatMap(): LoDashImplicitWrapper<any[]>;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ListIterator<T, Many<TResult>>|string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: object
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMap
          */
         flatMap<T, TResult>(
-            iteratee: ListIterator<T, Many<TResult>>|DictionaryIterator<T, Many<TResult>>|NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashImplicitArrayWrapper<TResult>;
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, Many<TResult>>
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.flatMap
          */
-        flatMap<TResult>(
-            iteratee: ObjectIterator<any, Many<TResult>>|string
-        ): LoDashImplicitArrayWrapper<TResult>;
+        flatMap<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, Many<TResult>>
+        ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: object
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: StringIterator<Many<TResult>>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ListIterator<T, Many<TResult>>|string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: object
-        ): LoDashExplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMap
          */
         flatMap<T, TResult>(
-            iteratee: ListIterator<T, Many<TResult>>|DictionaryIterator<T, Many<TResult>>|NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashExplicitArrayWrapper<TResult>;
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, Many<TResult>>
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.flatMap
          */
-        flatMap<TResult>(
-            iteratee: ObjectIterator<any, Many<TResult>>|string
-        ): LoDashExplicitArrayWrapper<TResult>;
+        flatMap(
+            iteratee: string
+        ): LoDashImplicitWrapper<any[]>;
 
         /**
          * @see _.flatMap
          */
         flatMap(
             iteratee: object
-        ): LoDashExplicitArrayWrapper<boolean>;
+        ): LoDashImplicitWrapper<boolean[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T>(this: LoDashExplicitWrapper<List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined>): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.flatMap
          */
-        flatMap<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+        flatMap(): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, Many<TResult>>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, Many<TResult>>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, Many<TResult>>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: string
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: object
+        ): LoDashExplicitWrapper<boolean[]>;
     }
 
     //_.flatMapDeep
@@ -7239,13 +5140,11 @@ declare namespace _ {
          * This method is like `_.flatMap` except that it recursively flattens the
          * mapped results.
          *
-         * @static
-         * @memberOf _
          * @since 4.7.0
          * @category Collection
-         * @param {Array|Object} collection The collection to iterate over.
-         * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-         * @returns {Array} Returns the new flattened array.
+         * @param collection The collection to iterate over.
+         * @param [iteratee=_.identity] The function invoked per iteration.
+         * @returns Returns the new flattened array.
          * @example
          *
          * function duplicate(n) {
@@ -7256,7 +5155,7 @@ declare namespace _ {
          * // => [1, 1, 2, 2]
          */
         flatMapDeep<T>(
-            collection: List<ListOfRecursiveArraysOrValues<T>> | Dictionary<ListOfRecursiveArraysOrValues<T>> | NumericDictionary<ListOfRecursiveArraysOrValues<T>> | null | undefined
+            collection: List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined
         ): T[];
 
         /**
@@ -7264,15 +5163,7 @@ declare namespace _ {
          */
         flatMapDeep<T, TResult>(
             collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>> | string
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee: DictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>> | string
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): TResult[];
 
         /**
@@ -7280,17 +5171,25 @@ declare namespace _ {
          */
         flatMapDeep<T, TResult>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>> | string
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): TResult[];
 
         /**
          * @see _.flatMapDeep
          */
-        flatMapDeep<TResult>(
-            collection: object | null | undefined,
-            iteratee?: ObjectIterator<any, ListOfRecursiveArraysOrValues<TResult>> | string
+        flatMapDeep<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): TResult[];
 
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            collection: object | null | undefined,
+            iteratee: string
+        ): any[];
+
         /**
          * @see _.flatMapDeep
          */
@@ -7300,130 +5199,102 @@ declare namespace _ {
         ): boolean[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.flatMapDeep
          */
-        flatMapDeep<TResult>(
-            iteratee: StringIterator<ListOfRecursiveArraysOrValues<TResult>>
-        ): LoDashImplicitArrayWrapper<TResult>;
+        flatMapDeep<T>(
+            this: LoDashImplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            iteratee: object
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMapDeep
          */
         flatMapDeep<T, TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|DictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>|NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>
-        ): LoDashImplicitArrayWrapper<TResult>;
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<TResult>(
-            iteratee: ObjectIterator<any, ListOfRecursiveArraysOrValues<TResult>>|string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            iteratee: object
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<TResult>(
-            iteratee: StringIterator<ListOfRecursiveArraysOrValues<TResult>>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            iteratee: object
-        ): LoDashExplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMapDeep
          */
         flatMapDeep<T, TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|DictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>|NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>
-        ): LoDashExplicitArrayWrapper<TResult>;
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.flatMapDeep
          */
-        flatMapDeep<TResult>(
-            iteratee: ObjectIterator<any, ListOfRecursiveArraysOrValues<TResult>>|string
-        ): LoDashExplicitArrayWrapper<TResult>;
+        flatMapDeep<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.flatMapDeep
          */
         flatMapDeep(
-            iteratee: object
-        ): LoDashExplicitArrayWrapper<boolean>;
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: string
+        ): LoDashImplicitWrapper<any[]>;
 
         /**
          * @see _.flatMapDeep
          */
-        flatMapDeep<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+        flatMapDeep(
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: object
+        ): LoDashImplicitWrapper<boolean[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T>(
+            this: LoDashExplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: string
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: object
+        ): LoDashExplicitWrapper<boolean[]>;
     }
 
     //_.flatMapDepth
@@ -7432,14 +5303,12 @@ declare namespace _ {
          * This method is like `_.flatMap` except that it recursively flattens the
          * mapped results up to `depth` times.
          *
-         * @static
-         * @memberOf _
          * @since 4.7.0
          * @category Collection
-         * @param {Array|Object} collection The collection to iterate over.
-         * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-         * @param {number} [depth=1] The maximum recursion depth.
-         * @returns {Array} Returns the new flattened array.
+         * @param collection The collection to iterate over.
+         * @param [iteratee=_.identity] The function invoked per iteration.
+         * @param [depth=1] The maximum recursion depth.
+         * @returns Returns the new flattened array.
          * @example
          *
          * function duplicate(n) {
@@ -7450,8 +5319,7 @@ declare namespace _ {
          * // => [[1, 1], [2, 2]]
          */
         flatMapDepth<T>(
-            collection: List<ListOfRecursiveArraysOrValues<T>> | Dictionary<ListOfRecursiveArraysOrValues<T>> | NumericDictionary<ListOfRecursiveArraysOrValues<T>> | null | undefined,
-            depth?: number
+            collection: List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined
         ): T[];
 
         /**
@@ -7459,16 +5327,7 @@ declare namespace _ {
          */
         flatMapDepth<T, TResult>(
             collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>> | string,
-            depth?: number
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee: DictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>> | string,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
             depth?: number
         ): TResult[];
 
@@ -7477,19 +5336,28 @@ declare namespace _ {
          */
         flatMapDepth<T, TResult>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>> | string,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
             depth?: number
         ): TResult[];
 
         /**
          * @see _.flatMapDepth
          */
-        flatMapDepth<TResult>(
-            collection: object | null | undefined,
-            iteratee?: ObjectIterator<any, ListOfRecursiveArraysOrValues<TResult>> | string,
+        flatMapDepth<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
             depth?: number
         ): TResult[];
 
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            collection: object | null | undefined,
+            iteratee: string,
+            depth?: number
+        ): any[];
+
         /**
          * @see _.flatMapDepth
          */
@@ -7500,142 +5368,112 @@ declare namespace _ {
         ): boolean[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.flatMapDepth
          */
-        flatMapDepth<TResult>(
-            iteratee: StringIterator<ListOfRecursiveArraysOrValues<TResult>>,
-            depth?: number
-        ): LoDashImplicitArrayWrapper<TResult>;
+        flatMapDepth<T>(
+            this: LoDashImplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|string,
-            depth?: number
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            iteratee: object,
-            depth?: number
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMapDepth
          */
         flatMapDepth<T, TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|DictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>|NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>,
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
             depth?: number
-        ): LoDashImplicitArrayWrapper<TResult>;
+        ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<TResult>(
-            iteratee: ObjectIterator<any, ListOfRecursiveArraysOrValues<TResult>>|string,
-            depth?: number
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            iteratee: object,
-            depth?: number
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<TResult>(
-            iteratee: StringIterator<ListOfRecursiveArraysOrValues<TResult>>,
-            depth?: number
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|string,
-            depth?: number
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            iteratee: object,
-            depth?: number
-        ): LoDashExplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMapDepth
          */
         flatMapDepth<T, TResult>(
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult>>|DictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>|NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult>>,
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
             depth?: number
-        ): LoDashExplicitArrayWrapper<TResult>;
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.flatMapDepth
          */
-        flatMapDepth<TResult>(
-            iteratee: ObjectIterator<any, ListOfRecursiveArraysOrValues<TResult>>|string,
+        flatMapDepth<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
             depth?: number
-        ): LoDashExplicitArrayWrapper<TResult>;
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.flatMapDepth
          */
         flatMapDepth(
-            iteratee: object,
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: string,
             depth?: number
-        ): LoDashExplicitArrayWrapper<boolean>;
+        ): LoDashImplicitWrapper<any[]>;
 
         /**
          * @see _.flatMapDepth
          */
-        flatMapDepth<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+        flatMapDepth(
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: object,
+            depth?: number
+        ): LoDashImplicitWrapper<boolean[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T>(
+            this: LoDashExplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: string,
+            depth?: number
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: object,
+            depth?: number
+        ): LoDashExplicitWrapper<boolean[]>;
     }
 
     //_.forEach
@@ -7654,6 +5492,46 @@ declare namespace _ {
          * @param iteratee The function invoked per iteration.
          * @param thisArg The this binding of iteratee.
          */
+        forEach<T>(
+            collection: T[],
+            iteratee?: ArrayIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            collection: string,
+            iteratee?: StringIterator<any>
+        ): string;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends object>(
+            collection: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T, TArray extends T[] | null | undefined>(
+            collection: TArray & (T[] | null | undefined),
+            iteratee?: ArrayIterator<T, any>
+        ): TArray;
+
+        /**
+         * @see _.forEach
+         */
         forEach<TString extends string | null | undefined>(
             collection: TString,
             iteratee?: StringIterator<any>
@@ -7670,72 +5548,44 @@ declare namespace _ {
         /**
          * @see _.forEach
          */
-        forEach<T, TDictionary extends Dictionary<T> | null | undefined>(
-            collection: TDictionary & (Dictionary<T> | null | undefined),
-            iteratee?: DictionaryIterator<T, any>
-        ): TDictionary;
+        forEach<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
 
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.forEach
          */
-        forEach<T extends {} | null | undefined>(
-            collection: T,
-            iteratee?: ObjectIterator<any, any>
-        ): T;
-    }
+        forEach<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
 
-    interface LoDashImplicitWrapper<T> {
         /**
          * @see _.forEach
          */
         forEach(
-            iteratee: StringIterator<any>
-        ): LoDashImplicitWrapper<string>;
-    }
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
-        forEach(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
+        forEach<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
-        forEach<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            iteratee: StringIterator<any>
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forEach
-         */
-        forEach<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
+        forEach<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.forEachRight
@@ -7749,6 +5599,46 @@ declare namespace _ {
          * @param iteratee The function called per iteration.
          * @param thisArg The this binding of callback.
          */
+        forEachRight<T>(
+            collection: T[],
+            iteratee?: ArrayIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            collection: string,
+            iteratee?: StringIterator<any>
+        ): string;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends object>(
+            collection: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T, TArray extends T[] | null | undefined>(
+            collection: TArray & (T[] | null | undefined),
+            iteratee?: ArrayIterator<T, any>
+        ): TArray;
+
+        /**
+         * @see _.forEachRight
+         */
         forEachRight<TString extends string | null | undefined>(
             collection: TString,
             iteratee?: StringIterator<any>
@@ -7765,72 +5655,44 @@ declare namespace _ {
         /**
          * @see _.forEachRight
          */
-        forEachRight<T, TDictionary extends Dictionary<T> | null | undefined>(
-            collection: TDictionary & (Dictionary<T> | null | undefined),
-            iteratee?: DictionaryIterator<T, any>
-        ): TDictionary;
+        forEachRight<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
 
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.forEachRight
          */
-        forEachRight<T extends {} | null | undefined>(
-            collection: T,
-            iteratee?: ObjectIterator<any, any>
-        ): T;
-    }
+        forEachRight<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
 
-    interface LoDashImplicitWrapper<T> {
         /**
          * @see _.forEachRight
          */
         forEachRight(
-            iteratee: StringIterator<any>
-        ): LoDashImplicitWrapper<string>;
-    }
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
-        forEachRight(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
+        forEachRight<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
-        forEachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            iteratee: StringIterator<any>
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            iteratee: ListIterator<T, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): TWrapper;
+        forEachRight<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.groupBy
@@ -7855,226 +5717,102 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the composed aggregate object.
          */
-        groupBy<TString extends string | null | undefined, TKey>(
-            collection: TString,
-            iteratee?: StringIterator<TKey>
-        ): Dictionary<TString[]>;
+        groupBy(
+            collection: string | null | undefined,
+            iteratee?: StringIterator<NotVoid>
+        ): Dictionary<string[]>;
 
         /**
          * @see _.groupBy
          */
-        groupBy<T, TKey>(
+        groupBy<T>(
             collection: List<T> | null | undefined,
-            iteratee?: ListIterator<T, TKey>
+            iteratee?: ListIteratee<T>
         ): Dictionary<T[]>;
 
         /**
          * @see _.groupBy
          */
         groupBy<T>(
-            collection: List<any> | null | undefined,
-            iteratee?: ListIterator<T, any>
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee?: NumericDictionaryIteratee<T>
         ): Dictionary<T[]>;
 
         /**
          * @see _.groupBy
          */
-        groupBy<T, TKey>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, TKey>
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: Dictionary<any> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TValue>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: string
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: string
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere, T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: TWhere
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: Object
-        ): Dictionary<T[]>;
+        groupBy<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIteratee<T>
+        ): Dictionary<Array<T[keyof T]>>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.groupBy
          */
-        groupBy<TKey>(
-            iteratee?: ListIterator<T, TKey>
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+        groupBy(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<NotVoid>
+        ): LoDashImplicitWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<Array<T[keyof T]>>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T[]>>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.groupBy
          */
-        groupBy<TKey>(
-            iteratee?: ListIterator<T, TKey>
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TValue>(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere>(
-            iteratee?: TWhere
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TKey>(
-            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+        groupBy(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<NotVoid>
+        ): LoDashExplicitWrapper<Dictionary<string[]>>;
 
         /**
          * @see _.groupBy
          */
         groupBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TValue>(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T[]>>;
 
         /**
          * @see _.groupBy
          */
         groupBy<T>(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashExplicitWrapper<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>
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TKey>(
-            iteratee?: ListIterator<T, TKey>
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TValue>(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere>(
-            iteratee?: TWhere
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TKey>(
-            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TValue>(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere, T>(
-            iteratee?: TWhere
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: Object
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+        groupBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<Array<T[keyof T]>>>;
     }
 
     //_.includes
@@ -8093,77 +5831,30 @@ declare namespace _ {
             target: T,
             fromIndex?: number
         ): boolean;
-
-        /**
-         * @see _.includes
-         */
-        includes(
-            collection: string | null | undefined,
-            target: string,
-            fromIndex?: number
-        ): boolean;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.includes
          */
-        includes(
+        includes<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.includes
          */
-        includes<TValue>(
-            target: TValue,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes(
-            target: string,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.includes
-         */
-        includes(
+        includes<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): LoDashExplicitWrapper<boolean>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.includes
-         */
-        includes<TValue>(
-            target: TValue,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes(
-            target: string,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
     //_.keyBy
     interface LoDashStatic {
         /**
@@ -8186,192 +5877,102 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the composed aggregate object.
          */
+        keyBy(
+            collection: string | null | undefined,
+            iteratee?: StringIterator<PropertyName>
+        ): Dictionary<string>;
+
+        /**
+         * @see _.keyBy
+         */
         keyBy<T>(
             collection: List<T> | null | undefined,
-            iteratee?: ListIterator<T, any>
+            iteratee?: ListIterateeCustom<T, PropertyName>
         ): Dictionary<T>;
 
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
+        ): Dictionary<T[keyof T]>;
+
         /**
          * @see _.keyBy
          */
         keyBy<T>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterator<T, any>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T> | null | undefined,
-            iteratee?: string
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object, T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T> | null | undefined,
-            iteratee?: W
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T> | null | undefined,
-            iteratee?: Object
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
         ): Dictionary<T>;
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.keyBy
          */
         keyBy(
-            iteratee?: StringIterator<any> | undefined
-        ): LoDashImplicitObjectWrapper<Dictionary<string>>
-    }
-
-    interface LoDashExplicitStringWrapper {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: StringIterator<any> | undefined
-        ): LoDashExplicitObjectWrapper<Dictionary<string>>
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: ListIterator<T, any>|NumericDictionaryIterator<T, any>|DictionaryIterator<T, any>
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<string>>;
 
         /**
          * @see _.keyBy
          */
         keyBy<T>(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterateeCustom<T, PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.keyBy
          */
-        keyBy<W extends Object, T>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+        keyBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
 
         /**
          * @see _.keyBy
          */
         keyBy<T>(
-            iteratee?: Object
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.keyBy
          */
         keyBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: ListIterator<T, any>
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: ListIterator<T, any>|NumericDictionaryIterator<T, any>|DictionaryIterator<T, any>
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<string>>;
 
         /**
          * @see _.keyBy
          */
         keyBy<T>(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterateeCustom<T, PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.keyBy
          */
-        keyBy<W extends Object, T>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+        keyBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
 
         /**
          * @see _.keyBy
          */
         keyBy<T>(
-            iteratee?: Object
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
     }
 
     //_.invoke
@@ -8382,62 +5983,28 @@ declare namespace _ {
         * @param path The path of the method to invoke.
         * @param args The arguments to invoke the method with.
         **/
-        invoke<TObject extends Object, TResult>(
-            object: TObject,
-            path: Many<StringRepresentable>,
-            ...args: any[]): TResult;
-
-        /**
-        * @see _.invoke
-        **/
-        invoke<TValue, TResult>(
-            object: Dictionary<TValue>|TValue[],
-            path: Many<StringRepresentable>,
-            ...args: any[]): TResult;
-
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
+        invoke(
             object: any,
-            path: Many<StringRepresentable>,
-            ...args: any[]): TResult;
+            path: PropertyPath,
+            ...args: any[]): any;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
         * @see _.invoke
         **/
-        invoke<TResult>(
-            path: Many<StringRepresentable>,
-            ...args: any[]): TResult;
+        invoke(
+            path: PropertyPath,
+            ...args: any[]): any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
         * @see _.invoke
         **/
-        invoke<TResult>(
-            path: Many<StringRepresentable>,
-            ...args: any[]): TResult;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
-            path: Many<StringRepresentable>,
-            ...args: any[]): TResult;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
-            path: Many<StringRepresentable>,
-            ...args: any[]): TResult;
+        invoke(
+            path: PropertyPath,
+            ...args: any[]): LoDashExplicitWrapper<any>;
     }
 
     //_.invokeMap
@@ -8451,130 +6018,50 @@ declare namespace _ {
         * @param methodName The name of the method to invoke.
         * @param args Arguments to invoke the method with.
         **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: TValue[] | null | undefined,
+        invokeMap(
+            collection: object | null | undefined,
             methodName: string,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: Dictionary<TValue> | null | undefined,
-            methodName: string,
-            ...args: any[]): TResult[];
+            ...args: any[]): any[];
 
         /**
         * @see _.invokeMap
         **/
         invokeMap<TResult>(
-            collection: Array<{}> | null | undefined,
-            methodName: string,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: Dictionary<{}> | null | undefined,
-            methodName: string,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: TValue[] | null | undefined,
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: Dictionary<TValue> | null | undefined,
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: Array<{}> | null | undefined,
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: Dictionary<{}> | null | undefined,
+            collection: object | null | undefined,
             method: (...args: any[]) => TResult,
             ...args: any[]): TResult[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
         * @see _.invokeMap
         **/
-        invokeMap<TResult>(
+        invokeMap(
             methodName: string,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+            ...args: any[]): LoDashImplicitWrapper<any[]>;
 
         /**
         * @see _.invokeMap
         **/
         invokeMap<TResult>(
             method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+            ...args: any[]): LoDashImplicitWrapper<TResult[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
         * @see _.invokeMap
         **/
-        invokeMap<TResult>(
+        invokeMap(
             methodName: string,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+            ...args: any[]): LoDashExplicitWrapper<any[]>;
 
         /**
         * @see _.invokeMap
         **/
         invokeMap<TResult>(
             method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            methodName: string,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            methodName: string,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
+            ...args: any[]): LoDashExplicitWrapper<TResult[]>;
     }
 
     //_.map
@@ -8613,33 +6100,28 @@ declare namespace _ {
         /**
          * @see _.map
          */
-        map<T>(collection: List<T> | null | undefined): T[];
+        map<T>(collection: List<T> | Dictionary<T> | null | undefined): T[];
 
         /**
          * @see _.map
          */
-        map<T extends {}, TResult>(
+        map<T, TResult>(
             collection: Dictionary<T> | null | undefined,
             iteratee: DictionaryIterator<T, TResult>
         ): TResult[];
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            collection: Dictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | null | undefined,
             iteratee: K
-        ): T[K][];
+        ): Array<T[K]>;
 
         /** @see _.map */
-        map<T>(collection: Dictionary<T> | null | undefined): T[];
-
-        map<T extends {}, TResult>(
+        map<T, TResult>(
             collection: NumericDictionary<T> | null | undefined,
             iteratee?: NumericDictionaryIterator<T, TResult>
         ): TResult[];
 
-        /** @see _.map */
-        map<T, K extends keyof T>(collection: List<T> | null | undefined, iteratee: K): T[K][];
-
         /**
          * @see _.map
          */
@@ -8651,125 +6133,114 @@ declare namespace _ {
         /**
          * @see _.map
          */
-        map<T, TObject extends {}>(
+        map<T>(
             collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: TObject
+            iteratee?: object
         ): boolean[];
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.map
          */
-        map<TResult>(
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
             iteratee: ListIterator<T, TResult>
-        ): LoDashImplicitArrayWrapper<TResult>;
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.map
          */
-        map(): LoDashImplicitArrayWrapper<T>;
+        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: DictionaryIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /** @see _.map */
-        map<K extends keyof T>(iteratee: K): LoDashImplicitArrayWrapper<T[K]>;
+        map<T, K extends keyof T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            iteratee: K
+        ): LoDashImplicitWrapper<Array<T[K]>>;
+
+        /** @see _.map */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.map
          */
-        map<TResult>(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<TResult>;
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: string
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.map
          */
-        map<TObject extends {}>(
-            iteratee: TObject
-        ): LoDashImplicitArrayWrapper<boolean>;
+        map<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: object
+        ): LoDashImplicitWrapper<boolean[]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.map
          */
-        map<TValue, TResult>(
-            iteratee: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /** @see _.map */
-        map(): LoDashImplicitArrayWrapper<T[keyof T]>;
-
-        /** @see _.map */
-        map<K extends keyof T>(iteratee: K): LoDashImplicitArrayWrapper<T[K]>;
-
-        /**
-         * @see _.map
-         */
-        map<TValue, TResult>(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TObject extends {}>(
-            iteratee: TObject
-        ): LoDashImplicitArrayWrapper<boolean>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.map
-         */
-        map<TResult>(
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
             iteratee: ListIterator<T, TResult>
-        ): LoDashExplicitArrayWrapper<TResult>;
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: DictionaryIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
 
         /** @see _.map */
-        map(): LoDashExplicitArrayWrapper<T>;
-
-        /** @see _.map */
-        map<K extends keyof T>(iteratee: K): LoDashExplicitArrayWrapper<T[K]>;
+        map<T, K extends keyof T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            iteratee: K
+        ): LoDashExplicitWrapper<Array<T[K]>>;
 
         /**
          * @see _.map
          */
-        map<TResult>(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<TResult>;
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
 
         /**
          * @see _.map
          */
-        map<TObject extends {}>(
-            iteratee: TObject
-        ): LoDashExplicitArrayWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.map
-         */
-        map<TValue, TResult>(
-            iteratee: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /** @see _.map */
-        map(): LoDashExplicitArrayWrapper<T[keyof T]>;
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: string
+        ): LoDashExplicitWrapper<TResult[]>;
 
         /**
          * @see _.map
          */
-        map<TValue, TResult>(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TObject extends {}>(
-            iteratee: TObject
-        ): LoDashExplicitArrayWrapper<boolean>;
+        map<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: object
+        ): LoDashExplicitWrapper<boolean[]>;
     }
 
     //_.partition
@@ -8795,123 +6266,52 @@ declare namespace _ {
         **/
         partition<T>(
             collection: List<T> | null | undefined,
-            callback: ListIterator<T, boolean>): T[][];
+            callback: ValueIteratee<T>
+        ): [T[], T[]];
 
         /**
          * @see _.partition
-         **/
-        partition<T>(
-            collection: Dictionary<T> | null | undefined,
-            callback: DictionaryIterator<T, boolean>): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<W, T>(
-            collection: List<T> | null | undefined,
-            whereValue: W): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<W, T>(
-            collection: Dictionary<T> | null | undefined,
-            whereValue: W): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: List<T> | null | undefined,
-            path: string,
-            srcValue: any): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: Dictionary<T> | null | undefined,
-            path: string,
-            srcValue: any): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: List<T> | null | undefined,
-            pluckValue: string): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: Dictionary<T> | null | undefined,
-            pluckValue: string): T[][];
+         */
+        partition<T extends object>(
+            collection: T | null | undefined,
+            callback: ValueIteratee<T[keyof T]>
+        ): [Array<T[keyof T]>, Array<T[keyof T]>];
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.partition
          */
-        partition(
-            callback: ListIterator<string, boolean>): LoDashImplicitArrayWrapper<string[]>;
+        partition<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: ValueIteratee<T>
+        ): LoDashImplicitWrapper<[T[], T[]]>;
+
+        /**
+         * @see _.partition
+         */
+        partition<T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: ValueIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<[Array<T[keyof T]>, Array<T[keyof T]>]>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.partition
          */
-        partition(
-            callback: ListIterator<T, boolean>): LoDashImplicitArrayWrapper<T[]>;
-        /**
-         * @see _.partition
-         */
-        partition<W>(
-            whereValue: W): LoDashImplicitArrayWrapper<T[]>;
-        /**
-         * @see _.partition
-         */
-        partition(
-            path: string,
-            srcValue: any): LoDashImplicitArrayWrapper<T[]>;
-        /**
-         * @see _.partition
-         */
-        partition(
-            pluckValue: string): LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.partition
-         */
-        partition<TResult>(
-            callback: ListIterator<TResult, boolean>): LoDashImplicitArrayWrapper<TResult[]>;
+        partition<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: ValueIteratee<T>
+        ): LoDashExplicitWrapper<[T[], T[]]>;
 
         /**
          * @see _.partition
          */
-        partition<TResult>(
-            callback: DictionaryIterator<TResult, boolean>): LoDashImplicitArrayWrapper<TResult[]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<W, TResult>(
-            whereValue: W): LoDashImplicitArrayWrapper<TResult[]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<TResult>(
-            path: string,
-            srcValue: any): LoDashImplicitArrayWrapper<TResult[]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<TResult>(
-            pluckValue: string): LoDashImplicitArrayWrapper<TResult[]>;
+        partition<T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: ValueIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<[Array<T[keyof T]>, Array<T[keyof T]>]>;
     }
 
     //_.reduce
@@ -8925,125 +6325,212 @@ declare namespace _ {
         * @param collection The collection to iterate over.
         * @param callback The function called per iteration.
         * @param accumulator Initial value of the accumulator.
-        * @param thisArg The this binding of callback.
         * @return Returns the accumulated value.
         **/
         reduce<T, TResult>(
             collection: T[] | null | undefined,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
 
         /**
-         * @see _.reduce
-         **/
+        * @see _.reduce
+        **/
         reduce<T, TResult>(
             collection: List<T> | null | undefined,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
 
         /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
 
         /**
-         * @see _.reduce
-         **/
+        * @see _.reduce
+        **/
         reduce<T, TResult>(
             collection: NumericDictionary<T> | null | undefined,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
 
         /**
-         * @see _.reduce
-         **/
+        * @see _.reduce
+        **/
         reduce<T, TResult>(
             collection: T[] | null | undefined,
-            callback: MemoIterator<T, TResult>): TResult | undefined;
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
 
         /**
          * @see _.reduce
          **/
         reduce<T, TResult>(
             collection: List<T> | null | undefined,
-            callback: MemoIterator<T, TResult>): TResult | undefined;
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
 
         /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            callback: MemoIterator<T, TResult>): TResult | undefined;
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
 
         /**
          * @see _.reduce
          **/
         reduce<T, TResult>(
             collection: NumericDictionary<T> | null | undefined,
-            callback: MemoIterator<T, TResult>): TResult | undefined;
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
          /**
         * @see _.reduce
         **/
-        reduce<TResult>(
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<TResult>(
-            callback: MemoIterator<T, TResult>): TResult | undefined;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-         /**
-        * @see _.reduce
-        **/
-        reduce<TValue, TResult>(
-            callback: MemoIterator<TValue, TResult>,
-            accumulator: TResult): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<TValue, TResult>(
-            callback: MemoIterator<TValue, TResult>): TResult | undefined;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-        * @see _.reduce
-        **/
-        reduce<TValue, TResult>(
-            callback: MemoIterator<TValue, TResult>,
-            accumulator: TResult): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<TValue, TResult>(
-            callback: MemoIterator<TValue, TResult>): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**LoDashExplicitWrapper
-         * @see _.reduce
-         */
-        reduce<TResult>(
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): LoDashExplicitWrapper<TResult>;
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
 
         /**
          * @see _.reduce
-         */
-        reduce<TResult>(
-            callback: MemoIterator<T, TResult>): LoDashExplicitWrapper<TResult>;
+         **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+         * @see _.reduce
+         **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+         * @see _.reduce
+         **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     //_.reduceRight
@@ -9054,50 +6541,212 @@ declare namespace _ {
         * @param collection The collection to iterate over.
         * @param callback The function called per iteration.
         * @param accumulator Initial value of the accumulator.
-        * @param thisArg The this binding of callback.
         * @return The accumulated value.
         **/
         reduceRight<T, TResult>(
             collection: T[] | null | undefined,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
 
         /**
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
             collection: List<T> | null | undefined,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
 
         /**
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult): TResult;
+            collection: NumericDictionary<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
 
         /**
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
             collection: T[] | null | undefined,
-            callback: MemoIterator<T, TResult>): TResult | undefined;
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
 
         /**
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
             collection: List<T> | null | undefined,
-            callback: MemoIterator<T, TResult>): TResult | undefined;
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
 
         /**
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            callback: MemoIterator<T, TResult>): TResult | undefined;
+            collection: NumericDictionary<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+         /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+         * @see _.reduceRight
+         **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     //_.reject
@@ -9111,22 +6760,6 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the new filtered array.
          */
-        reject<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>
-        ): T[];
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate?: DictionaryIterator<T, boolean>
-        ): T[];
-
-        /**
-         * @see _.reject
-         */
         reject(
             collection: string | null | undefined,
             predicate?: StringIterator<boolean>
@@ -9136,119 +6769,69 @@ declare namespace _ {
          * @see _.reject
          */
         reject<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            predicate: string
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>
         ): T[];
 
         /**
          * @see _.reject
          */
-        reject<W extends {}, T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            predicate: W
-        ): T[];
+        reject<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): Array<T[keyof T]>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.reject
          */
         reject(
+            this: LoDashImplicitWrapper<string | null | undefined>,
             predicate?: StringIterator<boolean>
-        ): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: ListIterator<T, boolean>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): LoDashImplicitWrapper<string[]>;
 
         /**
          * @see _.reject
          */
         reject<T>(
-            predicate: string
-        ): LoDashImplicitArrayWrapper<T>;
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<T[]>;
 
         /**
          * @see _.reject
          */
-        reject<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
+        reject<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.reject
          */
         reject(
+            this: LoDashExplicitWrapper<string | null | undefined>,
             predicate?: StringIterator<boolean>
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: ListIterator<T, boolean>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>
-        ): LoDashExplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<string[]>;
 
         /**
          * @see _.reject
          */
         reject<T>(
-            predicate: string
-        ): LoDashExplicitArrayWrapper<T>;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.reject
          */
-        reject<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
+        reject<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.sample
@@ -9260,50 +6843,68 @@ declare namespace _ {
          * @return Returns the random element.
          */
         sample<T>(
-            collection: List<T> | Dictionary<T> | NumericDictionary<T> | object | null | undefined
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined
         ): T | undefined;
-    }
 
-    interface LoDashImplicitWrapper<T> {
         /**
          * @see _.sample
          */
-        sample(): string | undefined;
-    }
+        sample<T extends object>(
+            collection: T
+        ): T[keyof T];
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sample
          */
-        sample(): T | undefined;
+        sample<T extends object>(
+            collection: T | null | undefined
+        ): T[keyof T] | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sample
          */
-        sample<T>(): T | undefined;
-    }
+        sample<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
+        ): T | undefined;
 
-    interface LoDashExplicitWrapper<T> {
         /**
          * @see _.sample
          */
-        sample(): LoDashExplicitWrapper<string>;
-    }
+        sample<T extends object>(
+            this: LoDashImplicitWrapper<T>,
+        ): T[keyof T];
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sample
          */
-        sample<TWrapper>(): TWrapper;
+        sample<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>
+        ): T[keyof T] | undefined;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sample
          */
-        sample<TWrapper>(): TWrapper;
+        sample<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            this: LoDashExplicitWrapper<T>,
+        ): LoDashExplicitWrapper<T[keyof T]>;
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>
+        ): LoDashExplicitWrapper<T[keyof T] | undefined>;
     }
 
     //_.sampleSize
@@ -9323,72 +6924,46 @@ declare namespace _ {
         /**
          * @see _.sampleSize
          */
-        sampleSize<O extends Object, T>(
-            collection: O | null | undefined,
+        sampleSize<T extends object>(
+            collection: T | null | undefined,
             n?: number
-        ): T[];
+        ): Array<T[keyof T]>;
+    }
 
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sampleSize
          */
         sampleSize<T>(
-            collection: Object | null | undefined,
+            this: LoDashImplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
             n?: number
-        ): T[];
-    }
+        ): LoDashImplicitWrapper<T[]>;
 
-    interface LoDashImplicitWrapper<T> {
         /**
          * @see _.sampleSize
          */
-        sampleSize(
+        sampleSize<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
             n?: number
-        ): LoDashImplicitArrayWrapper<string>;
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize(
-            n?: number
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sampleSize
          */
         sampleSize<T>(
+            this: LoDashExplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
             n?: number
-        ): LoDashImplicitArrayWrapper<T>;
-    }
+        ): LoDashExplicitWrapper<T[]>;
 
-    interface LoDashExplicitWrapper<T> {
         /**
          * @see _.sampleSize
          */
-        sampleSize(
+        sampleSize<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
             n?: number
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize(
-            n?: number
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T>(
-            n?: number
-        ): LoDashExplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.shuffle
@@ -9399,54 +6974,36 @@ declare namespace _ {
          * @param collection The collection to shuffle.
          * @return Returns the new shuffled array.
          */
-        shuffle<T>(collection: List<T>|Dictionary<T> | null | undefined): T[];
+        shuffle<T>(collection: List<T> | null | undefined): T[];
 
         /**
          * @see _.shuffle
          */
-        shuffle(collection: string | null | undefined): string[];
+        shuffle<T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.shuffle
          */
-        shuffle(): LoDashImplicitArrayWrapper<string>;
+        shuffle<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.shuffle
          */
-        shuffle(): LoDashImplicitArrayWrapper<T>;
-    }
+        shuffle<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.shuffle
          */
-        shuffle<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T>(): LoDashExplicitArrayWrapper<T>;
+        shuffle<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.size
@@ -9458,50 +7015,17 @@ declare namespace _ {
          * @param collection The collection to inspect.
          * @return Returns the size of collection.
          */
-        size<T>(collection: List<T>|Dictionary<T> | null | undefined): number;
-
-        /**
-         * @see _.size
-         */
-        size(collection: string | null | undefined): number;
+        size(collection: object | string | null | undefined): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.size
          */
         size(): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.size
-         */
-        size(): number;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.size
-         */
-        size(): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.size
-         */
-        size(): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.size
-         */
-        size(): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.size
          */
@@ -9520,15 +7044,15 @@ declare namespace _ {
          */
         some<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
          * @see _.some
          */
-        some<T>(
-            collection: Dictionary<T> | null | undefined,
-            predicate?: DictionaryIterator<T, boolean>
+        some<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -9536,146 +7060,59 @@ declare namespace _ {
          */
         some<T>(
             collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterator<T, boolean>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.some
+         */
+        some<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
          * @see _.some
          */
-        some(
-            collection: Object | null | undefined,
-            predicate?: ObjectIterator<any, boolean>
+        some<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
          * @see _.some
          */
         some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            predicate?: string|[string, any]
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.some
+         */
+        some<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
 
         /**
          * @see _.some
          */
-        some(
-            collection: Object | null | undefined,
-            predicate?: string|[string, any]
-        ): boolean;
+        some<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
 
         /**
          * @see _.some
          */
         some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            predicate?: PartialObject<T>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            predicate?: PartialObject<T>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: Object | null | undefined,
-            predicate?: PartialObject<T>
-        ): boolean;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: PartialObject<T>
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.some
-         */
-        some<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>|ObjectIterator<any, boolean>
-        ): boolean;
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<TResult>(
-            predicate?: PartialObject<TResult>
-        ): boolean;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: PartialObject<T>
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.some
-         */
-        some<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>|ObjectIterator<any, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<TResult>(
-            predicate?: PartialObject<TResult>
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
     }
 
@@ -9687,13 +7124,11 @@ declare namespace _ {
          * performs a stable sort, that is, it preserves the original sort order of
          * equal elements. The iteratees are invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Collection
-         * @param {Array|Object} collection The collection to iterate over.
-         * @param {...(Function|Function[]|Object|Object[]|string|string[])} [iteratees=[_.identity]]
+         * @param collection The collection to iterate over.
+         * @param [iteratees=[_.identity]]
          *  The iteratees to sort by, specified individually or in arrays.
-         * @returns {Array} Returns the new sorted array.
+         * @returns Returns the new sorted array.
          * @example
          *
          * var users = [
@@ -9714,163 +7149,54 @@ declare namespace _ {
          * });
          * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
          */
-        sortBy<T, TSort>(
-            collection: List<T> | null | undefined,
-            iteratee?: ListIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T, TSort>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            iteratee: string
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}, T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            whereValue: W
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            collection: List<T>|Dictionary<T> | null | undefined
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
         sortBy<T>(
             collection: List<T> | null | undefined,
-            iteratees: Array<ListIterator<T, any>|string|Object>
+            ...iteratees: Array<Many<ListIteratee<T>>>
         ): T[];
 
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T extends object>(
+            collection: T | null | undefined,
+            ...iteratees: Array<Many<ObjectIteratee<T>>>
+        ): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sortBy
          */
         sortBy<T>(
-            collection: List<T> | null | undefined,
-            ...iteratees: Array<ListIterator<T, boolean>|Object|string>
-        ): T[];
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...iteratees: Array<Many<ListIteratee<T>>>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...iteratees: Array<Many<ObjectIteratee<T>>>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sortBy
          */
-        sortBy<TSort>(
-            iteratee?: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
+        sortBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...iteratees: Array<Many<ListIteratee<T>>>
+        ): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.sortBy
          */
-        sortBy(iteratee: string): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}>(whereValue: W): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(...iteratees: Array<ListIterator<T, boolean>|Object|string>): LoDashImplicitArrayWrapper<T>;
-
-        /**
-        * @see _.sortBy
-        **/
-        sortBy(iteratees: Array<ListIterator<T, any>|string|Object>): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T, TSort>(
-            iteratee?: ListIterator<T, TSort>|DictionaryIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(iteratee: string): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}, T>(whereValue: W): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<TSort>(
-            iteratee?: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(iteratee: string): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}>(whereValue: W): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T, TSort>(
-            iteratee?: ListIterator<T, TSort>|DictionaryIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(iteratee: string): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}, T>(whereValue: W): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(): LoDashExplicitArrayWrapper<T>;
+        sortBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...iteratees: Array<Many<ObjectIteratee<T>>>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.orderBy
@@ -9881,14 +7207,12 @@ declare namespace _ {
          * are sorted in ascending order. Otherwise, specify an order of "desc" for
          * descending or "asc" for ascending sort order of corresponding values.
          *
-         * @static
-         * @memberOf _
          * @category Collection
-         * @param {Array|Object} collection The collection to iterate over.
-         * @param {Function[]|Object[]|string[]} [iteratees=[_.identity]] The iteratees to sort by.
-         * @param {string[]} [orders] The sort orders of `iteratees`.
+         * @param collection The collection to iterate over.
+         * @param [iteratees=[_.identity]] The iteratees to sort by.
+         * @param [orders] The sort orders of `iteratees`.
          * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-         * @returns {Array} Returns the new sorted array.
+         * @returns Returns the new sorted array.
          * @example
          *
          * var users = [
@@ -9902,9 +7226,9 @@ declare namespace _ {
          * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
          * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
          */
-        orderBy<W extends Object, T>(
+        orderBy<T>(
             collection: List<T> | null | undefined,
-            iteratees?: Many<ListIterator<T, any>|string|W>,
+            iteratees?: Many<ListIterator<T, NotVoid>>,
             orders?: Many<boolean|string>
         ): T[];
 
@@ -9913,16 +7237,34 @@ declare namespace _ {
          */
         orderBy<T>(
             collection: List<T> | null | undefined,
-            iteratees?: Many<ListIterator<T, any>|string|Object>,
+            iteratees?: Many<ListIteratee<T>>,
             orders?: Many<boolean|string>
         ): T[];
 
         /**
          * @see _.orderBy
          */
-        orderBy<W extends Object, T>(
+        orderBy<T extends object>(
+            collection: T | null | undefined,
+            iteratees?: Many<ObjectIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): Array<T[keyof T]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            collection: T | null | undefined,
+            iteratees?: Many<ObjectIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): Array<T[keyof T]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIterator<T, any>|string|W>,
+            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
             orders?: Many<boolean|string>
         ): T[];
 
@@ -9931,167 +7273,121 @@ declare namespace _ {
          */
         orderBy<T>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIterator<T, any>|string|Object>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            collection: Dictionary<T> | null | undefined,
-            iteratees?: Many<DictionaryIterator<T, any>|string|W>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: Dictionary<T> | null | undefined,
-            iteratees?: Many<DictionaryIterator<T, any>|string|Object>,
+            iteratees?: Many<NumericDictionaryIteratee<T>>,
             orders?: Many<boolean|string>
         ): T[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.orderBy
          */
-        orderBy(
-            iteratees?: Many<ListIterator<T, any>|string>,
+        orderBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIterator<T, NotVoid>>,
             orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.orderBy
          */
-        orderBy<W extends Object>(
-            iteratees?: Many<ListIterator<T, any>|string|W>,
+        orderBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIterator<T, NotVoid>>,
             orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees?: Many<ListIterator<T, any>|string|W>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.orderBy
          */
         orderBy<T>(
-            iteratees?: Many<ListIterator<T, any>|string|Object>,
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIteratee<T>>,
             orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.orderBy
          */
-        orderBy<W extends Object, T>(
-            iteratees?: Many<NumericDictionaryIterator<T, any>|string|W>,
+        orderBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIterator<T, NotVoid>>,
             orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
 
         /**
          * @see _.orderBy
          */
         orderBy<T>(
-            iteratees?: Many<NumericDictionaryIterator<T, any>|string|Object>,
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
             orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees?: Many<DictionaryIterator<T, any>|string|W>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.orderBy
          */
         orderBy<T>(
-            iteratees?: Many<DictionaryIterator<T, any>|string|Object>,
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIteratee<T>>,
             orders?: Many<boolean|string>
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy(
-            iteratees?: Many<ListIterator<T, any>|string>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object>(
-            iteratees?: Many<ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees?: Many<ListIterator<T, any>|string|W>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees?: Many<ListIterator<T, any>|string|Object>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees?: Many<NumericDictionaryIterator<T, any>|string|W>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees?: Many<NumericDictionaryIterator<T, any>|string|Object>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees?: Many<DictionaryIterator<T, any>|string|W>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees?: Many<DictionaryIterator<T, any>|string|Object>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitArrayWrapper<T>;
+        ): LoDashExplicitWrapper<T[]>;
     }
 
     /********
@@ -10108,14 +7404,14 @@ declare namespace _ {
         now(): number;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.now
          */
         now(): number;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.now
          */
@@ -10135,24 +7431,24 @@ declare namespace _ {
          * @param func The function to restrict.
          * @return Returns the new restricted function.
          */
-        after<TFunc extends Function>(
+        after<TFunc extends (...args: any[]) => any>(
             n: number,
             func: TFunc
         ): TFunc;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
         * @see _.after
         **/
-        after<TFunc extends Function>(func: TFunc): LoDashImplicitObjectWrapper<TFunc>;
+        after<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashImplicitWrapper<TFunc>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.after
          **/
-        after<TFunc extends Function>(func: TFunc): LoDashExplicitObjectWrapper<TFunc>;
+        after<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashExplicitWrapper<TFunc>;
     }
 
     //_.ary
@@ -10164,29 +7460,24 @@ declare namespace _ {
          * @param n The arity cap.
          * @returns Returns the new function.
          */
-        ary<TResult extends Function>(
-            func: Function,
+        ary(
+            func: (...args: any[]) => any,
             n?: number
-        ): TResult;
-
-        ary<T extends Function, TResult extends Function>(
-            func: T,
-            n?: number
-        ): TResult;
+        ): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.ary
          */
-        ary<TResult extends Function>(n?: number): LoDashImplicitObjectWrapper<TResult>;
+        ary(n?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.ary
          */
-        ary<TResult extends Function>(n?: number): LoDashExplicitObjectWrapper<TResult>;
+        ary(n?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.before
@@ -10200,41 +7491,35 @@ declare namespace _ {
          * @param func The function to restrict.
          * @return Returns the new restricted function.
          */
-        before<TFunc extends Function>(
+        before<TFunc extends (...args: any[]) => any>(
             n: number,
             func: TFunc
         ): TFunc;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.before
          **/
-        before<TFunc extends Function>(func: TFunc): LoDashImplicitObjectWrapper<TFunc>;
+        before<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashImplicitWrapper<TFunc>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.before
          **/
-        before<TFunc extends Function>(func: TFunc): LoDashExplicitObjectWrapper<TFunc>;
+        before<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashExplicitWrapper<TFunc>;
     }
 
     //_.bind
     interface FunctionBind {
         placeholder: any;
 
-        <T extends Function, TResult extends Function>(
-            func: T,
+        (
+            func: (...args: any[]) => any,
             thisArg: any,
             ...partials: any[]
-        ): TResult;
-
-        <TResult extends Function>(
-            func: Function,
-            thisArg: any,
-            ...partials: any[]
-        ): TResult;
+        ): (...args: any[]) => any;
     }
 
     interface LoDashStatic {
@@ -10255,24 +7540,24 @@ declare namespace _ {
         bind: FunctionBind;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.bind
          */
-        bind<TResult extends Function>(
+        bind(
             thisArg: any,
             ...partials: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
+        ): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.bind
          */
-        bind<TResult extends Function>(
+        bind(
             thisArg: any,
             ...partials: any[]
-        ): LoDashExplicitObjectWrapper<TResult>;
+        ): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.bindAll
@@ -10295,35 +7580,22 @@ declare namespace _ {
         ): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.bindAll
          */
-        bindAll(...methodNames: Array<Many<string>>): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.bindAll
-         */
-        bindAll(...methodNames: Array<Many<string>>): LoDashExplicitObjectWrapper<T>;
+        bindAll(...methodNames: Array<Many<string>>): this;
     }
 
     //_.bindKey
     interface FunctionBindKey {
         placeholder: any;
 
-        <T extends Object, TResult extends Function>(
-            object: T,
-            key: any,
+        (
+            object: object,
+            key: string,
             ...partials: any[]
-        ): TResult;
-
-        <TResult extends Function>(
-            object: Object,
-            key: any,
-            ...partials: any[]
-        ): TResult;
+        ): (...args: any[]) => any;
     }
 
     interface LoDashStatic {
@@ -10345,64 +7617,24 @@ declare namespace _ {
         bindKey: FunctionBindKey;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.bindKey
          */
-        bindKey<TResult extends Function>(
-            key: any,
+        bindKey(
+            key: string,
             ...partials: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
+        ): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.bindKey
          */
-        bindKey<TResult extends Function>(
-            key: any,
+        bindKey(
+            key: string,
             ...partials: any[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.createCallback
-    interface LoDashStatic {
-        /**
-        * Produces a callback bound to an optional thisArg. If func is a property name the created
-        * callback will return the property value for a given element. If func is an object the created
-        * callback will return true for elements that contain the equivalent object properties,
-        * otherwise it will return false.
-        * @param func The value to convert to a callback.
-        * @param thisArg The this binding of the created callback.
-        * @param argCount The number of arguments the callback accepts.
-        * @return A callback function.
-        **/
-        createCallback(
-            func: string,
-            argCount?: number): () => any;
-
-        /**
-        * @see _.createCallback
-        **/
-        createCallback(
-            func: Dictionary<any>,
-            argCount?: number): () => boolean;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-        * @see _.createCallback
-        **/
-        createCallback(
-            argCount?: number): LoDashImplicitObjectWrapper<() => any>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-        * @see _.createCallback
-        **/
-        createCallback(
-            argCount?: number): LoDashImplicitObjectWrapper<() => any>;
+        ): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.curry
@@ -10412,45 +7644,50 @@ declare namespace _ {
          * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
          * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, R>(func: (t1: T1) => R):
+        curry<T1, R>(func: (t1: T1) => R, arity?: number):
             CurriedFunction1<T1, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
          * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
          * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, R>(func: (t1: T1, t2: T2) => R):
+        curry<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
             CurriedFunction2<T1, T2, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
          * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
          * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R):
+        curry<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
             CurriedFunction3<T1, T2, T3, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
          * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
          * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R):
+        curry<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
             CurriedFunction4<T1, T2, T3, T4, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
          * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
          * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R):
+        curry<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
             CurriedFunction5<T1, T2, T3, T4, T5, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
@@ -10460,9 +7697,7 @@ declare namespace _ {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<TResult extends Function>(
-          func: Function,
-          arity?: number): TResult;
+        curry(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
     }
 
     interface CurriedFunction1<T1, R> {
@@ -10499,42 +7734,109 @@ declare namespace _ {
         (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction1<T5, R>;
         (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
     }
-    interface RightCurriedFunction1<T1, R>{
-        ():RightCurriedFunction1<T1, R>
-        (t1:T1):R
-        }
-    interface RightCurriedFunction2<T1,T2, R>{
-        ():RightCurriedFunction2<T1,T2, R>
-        (t2:T2):RightCurriedFunction1<T1, R>
-        (t1:T1,t2:T2):R
+    interface RightCurriedFunction1<T1, R> {
+        (): RightCurriedFunction1<T1, R>;
+        (t1: T1): R;
     }
-    interface RightCurriedFunction3<T1,T2,T3, R>{
-        ():RightCurriedFunction3<T1,T2,T3, R>
-        (t3:T3):RightCurriedFunction2<T1,T2, R>
-        (t2:T2,t3:T3):RightCurriedFunction1<T1, R>
-        (t1:T1,t2:T2,t3:T3):R
+    interface RightCurriedFunction2<T1, T2, R> {
+        (): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2): R;
     }
-    interface RightCurriedFunction4<T1,T2,T3,T4, R>{
-        ():RightCurriedFunction4<T1,T2,T3,T4, R>
-        (t4:T4):RightCurriedFunction3<T1,T2,T3, R>
-        (t3:T3,t4:T4):RightCurriedFunction2<T1,T2, R>
-        (t2:T2,t3:T3,t4:T4):RightCurriedFunction1<T1, R>
-        (t1:T1,t2:T2,t3:T3,t4:T4):R
+    interface RightCurriedFunction3<T1, T2, T3, R> {
+        (): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: T3): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2, t3: T3): R;
     }
-    interface RightCurriedFunction5<T1,T2,T3,T4,T5, R>{
-        ():RightCurriedFunction5<T1,T2,T3,T4,T5, R>
-        (t5:T5):RightCurriedFunction4<T1,T2,T3,T4, R>
-        (t4:T4,t5:T5):RightCurriedFunction3<T1,T2,T3, R>
-        (t3:T3,t4:T4,t5:T5):RightCurriedFunction2<T1,T2, R>
-        (t2:T2,t3:T3,t4:T4,t5:T5):RightCurriedFunction1<T1, R>
-        (t1:T1,t2:T2,t3:T3,t4:T4,t5:T5):R
+    interface RightCurriedFunction4<T1, T2, T3, T4, R> {
+        (): RightCurriedFunction4<T1, T2, T3, T4, R>;
+        (t4: T4): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3, t4: T4): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: T3, t4: T4): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): R;
+    }
+    interface RightCurriedFunction5<T1, T2, T3, T4, T5, R> {
+        (): RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (t5: T5): RightCurriedFunction4<T1, T2, T3, T4, R>;
+        (t4: T4, t5: T5): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3, t4: T4, t5: T5): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: T3, t4: T4, t5: T5): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
         * @see _.curry
         **/
-        curry<TResult extends Function>(arity?: number): LoDashImplicitObjectWrapper<TResult>;
+        curry<T1, R>(this: LoDashImplicitWrapper<(t1: T1) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction1<T1, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction2<T1, T2, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, T5, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry(arity?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.curry
+        **/
+        curry<T1, R>(this: LoDashExplicitWrapper<(t1: T1) => R>):
+            LoDashExplicitWrapper<CurriedFunction1<T1, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2) => R>):
+            LoDashExplicitWrapper<CurriedFunction2<T1, T2, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>):
+            LoDashExplicitWrapper<CurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>):
+            LoDashExplicitWrapper<CurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, T5, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>):
+            LoDashExplicitWrapper<CurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry(arity?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.curryRight
@@ -10543,41 +7845,46 @@ declare namespace _ {
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, R>(func: (t1: T1) => R):
+        curryRight<T1, R>(func: (t1: T1) => R, arity?: number):
             RightCurriedFunction1<T1, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R):
+        curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
             RightCurriedFunction2<T1, T2, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R):
+        curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
             RightCurriedFunction3<T1, T2, T3, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R):
+        curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
             RightCurriedFunction4<T1, T2, T3, T4, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
          * @param func The function to curry.
+         * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R):
+        curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
             RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
@@ -10586,16 +7893,81 @@ declare namespace _ {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<TResult extends Function>(
-          func: Function,
-          arity?: number): TResult;
+        curryRight(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.curryRight
          **/
-        curryRight<TResult extends Function>(arity?: number): LoDashImplicitObjectWrapper<TResult>;
+        curryRight<T1, R>(this: LoDashImplicitWrapper<(t1: T1) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction1<T1, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction2<T1, T2, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, T5, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight(arity?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, R>(this: LoDashExplicitWrapper<(t1: T1) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction1<T1, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction2<T1, T2, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, T5, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight(arity?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.debounce
@@ -10637,31 +8009,31 @@ declare namespace _ {
          * @param options.trailing Specify invoking on the trailing edge of the timeout.
          * @return Returns the new debounced function.
          */
-        debounce<T extends Function>(
+        debounce<T extends (...args: any[]) => any>(
             func: T,
             wait?: number,
             options?: DebounceSettings
         ): T & Cancelable;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.debounce
          */
         debounce(
             wait?: number,
             options?: DebounceSettings
-        ): LoDashImplicitObjectWrapper<T & Cancelable>;
+        ): LoDashImplicitWrapper<TValue & Cancelable>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.debounce
          */
         debounce(
             wait?: number,
             options?: DebounceSettings
-        ): LoDashExplicitObjectWrapper<T & Cancelable>;
+        ): LoDashExplicitWrapper<TValue & Cancelable>;
     }
 
     //_.defer
@@ -10674,20 +8046,20 @@ declare namespace _ {
          * @param args The arguments to invoke the function with.
          * @return Returns the timer id.
          */
-        defer<T extends Function>(
-            func: T,
+        defer(
+            func: (...args: any[]) => any,
             ...args: any[]
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.defer
          */
         defer(...args: any[]): LoDashImplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.defer
          */
@@ -10704,14 +8076,14 @@ declare namespace _ {
          * @param args The arguments to invoke the function with.
          * @return Returns the timer id.
          */
-        delay<T extends Function>(
-            func: T,
+        delay(
+            func: (...args: any[]) => any,
             wait: number,
             ...args: any[]
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.delay
          */
@@ -10721,7 +8093,7 @@ declare namespace _ {
         ): LoDashImplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.delay
          */
@@ -10735,11 +8107,9 @@ declare namespace _ {
         /**
          * Creates a function that invokes `func` with arguments reversed.
          *
-         * @static
-         * @memberOf _
          * @category Function
-         * @param {Function} func The function to flip arguments for.
-         * @returns {Function} Returns the new function.
+         * @param func The function to flip arguments for.
+         * @returns Returns the new function.
          * @example
          *
          * var flipped = _.flip(function() {
@@ -10749,21 +8119,14 @@ declare namespace _ {
          * flipped('a', 'b', 'c', 'd');
          * // => ['d', 'c', 'b', 'a']
          */
-        flip<T extends Function>(func: T): T;
+        flip<T extends (...args: any[]) => any>(func: T): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.flip
          */
-        flip(): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.flip
-         */
-        flip(): LoDashExplicitObjectWrapper<T>;
+        flip(): this;
     }
 
     //_.flow
@@ -10782,6 +8145,7 @@ declare namespace _ {
         flow<R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
         flow<R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
         flow<R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
+        flow<R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): () => any;
         // 1-argument first function
         flow<A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
         flow<A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
@@ -10789,6 +8153,7 @@ declare namespace _ {
         flow<A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
         flow<A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
         flow<A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1) => any;
         // 2-argument first function
         flow<A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
         flow<A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
@@ -10796,6 +8161,7 @@ declare namespace _ {
         flow<A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
         flow<A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
         flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
         // 3-argument first function
         flow<A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
         flow<A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
@@ -10803,6 +8169,7 @@ declare namespace _ {
         flow<A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
         flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
         flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
         // 4-argument first function
         flow<A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
         flow<A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
@@ -10810,31 +8177,126 @@ declare namespace _ {
         flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
         flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
         flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
-        // generic function
-        flow<TResult extends Function>(...funcs: Function[]): TResult;
-        flow<TResult extends Function>(funcs: Function[]): TResult;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
+        // any-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
+        flow<A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
+        flow(funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.flow
          */
-        flow<TResult extends Function>(...funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
-        /**
-         * @see _.flow
-         */
-        flow<TResult extends Function>(funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
+        // 0-argument first function
+        flow<R1, R2>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<() => R2>;
+        flow<R1, R2, R3>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<() => R3>;
+        flow<R1, R2, R3, R4>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<() => R4>;
+        flow<R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<() => R5>;
+        flow<R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<() => R6>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<() => R7>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<() => any>;
+        // 1-argument first function
+        flow<A1, R1, R2>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1) => R2>;
+        flow<A1, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1) => R3>;
+        flow<A1, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1) => R4>;
+        flow<A1, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1) => R5>;
+        flow<A1, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1) => R6>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1) => R7>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1) => any>;
+        // 2-argument first function
+        flow<A1, A2, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flow<A1, A2, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flow<A1, A2, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flow<A1, A2, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2) => R7>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2) => any>;
+        // 3-argument first function
+        flow<A1, A2, A3, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flow<A1, A2, A3, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flow<A1, A2, A3, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => any>;
+        // 4-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => any>;
+        // any-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any>;
+        flow(this: LoDashImplicitWrapper<(...args: any[]) => any>, funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.flow
          */
-        flow<TResult extends Function>(...funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
-        /**
-         * @see _.flow
-         */
-        flow<TResult extends Function>(funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
+        // 0-argument first function
+        flow<R1, R2>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<() => R2>;
+        flow<R1, R2, R3>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<() => R3>;
+        flow<R1, R2, R3, R4>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<() => R4>;
+        flow<R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<() => R5>;
+        flow<R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<() => R6>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<() => R7>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<() => any>;
+        // 1-argument first function
+        flow<A1, R1, R2>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1) => R2>;
+        flow<A1, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1) => R3>;
+        flow<A1, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1) => R4>;
+        flow<A1, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1) => R5>;
+        flow<A1, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1) => R6>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1) => R7>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1) => any>;
+        // 2-argument first function
+        flow<A1, A2, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flow<A1, A2, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flow<A1, A2, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flow<A1, A2, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2) => R7>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2) => any>;
+        // 3-argument first function
+        flow<A1, A2, A3, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flow<A1, A2, A3, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flow<A1, A2, A3, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => any>;
+        // 4-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => any>;
+        // any-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any>;
+        flow(this: LoDashExplicitWrapper<(...args: any[]) => any>, funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.flowRight
@@ -10846,37 +8308,154 @@ declare namespace _ {
          * @param funcs Functions to invoke.
          * @return Returns the new function.
          */
-        flowRight<TResult extends Function>(...funcs: Function[]): TResult;
-        /**
-         * @see _.flowRight
-         */
-        flowRight<TResult extends Function>(funcs: Function[]): TResult;
+        // 0-argument first function
+        flowRight<R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
+        flowRight<R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
+        flowRight<R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
+        flowRight<R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
+        flowRight<R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
+        // 1-argument first function
+        flowRight<A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
+        flowRight<A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
+        flowRight<A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
+        flowRight<A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
+        flowRight<A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
+        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
+        // 2-argument first function
+        flowRight<A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
+        flowRight<A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
+        flowRight<A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
+        flowRight<A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
+        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
+        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
+        // 3-argument first function
+        flowRight<A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
+        flowRight<A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
+        flowRight<A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
+        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
+        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
+        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
+        // 4-argument first function
+        flowRight<A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+        flowRight<A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+        // any-argument first function
+        flowRight<R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
+        flowRight<R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
+        flowRight<R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
+        flowRight<R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
+        flowRight<R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
+        flowRight(f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
+        flowRight(funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.flowRight
          */
-        flowRight<TResult extends Function>(...funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
-        /**
-         * @see _.flowRight
-         */
-        flowRight<TResult extends Function>(funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
+        // 0-argument first function
+        flowRight<R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: () => R1): LoDashImplicitWrapper<() => R2>;
+        flowRight<R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R7>;
+        // 1-argument first function
+        flowRight<A1, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R2>;
+        flowRight<A1, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R3>;
+        flowRight<A1, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R4>;
+        flowRight<A1, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R5>;
+        flowRight<A1, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R6>;
+        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R7>;
+        // 2-argument first function
+        flowRight<A1, A2, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flowRight<A1, A2, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flowRight<A1, A2, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flowRight<A1, A2, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R7>;
+        // 3-argument first function
+        flowRight<A1, A2, A3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flowRight<A1, A2, A3, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flowRight<A1, A2, A3, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        // 4-argument first function
+        flowRight<A1, A2, A3, A4, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flowRight<A1, A2, A3, A4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        // any-argument first function
+        flowRight<R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R2>;
+        flowRight<R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R7>;
+        flowRight(this: LoDashImplicitWrapper<(a: any) => any>, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+        flowRight(this: LoDashImplicitWrapper<(a: any) => any>, funcs: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.flowRight
          */
-        flowRight<TResult extends Function>(...funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
-        /**
-         * @see _.flowRight
-         */
-        flowRight<TResult extends Function>(funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
+        // 0-argument first function
+        flowRight<R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: () => R1): LoDashExplicitWrapper<() => R2>;
+        flowRight<R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R7>;
+        // 1-argument first function
+        flowRight<A1, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R2>;
+        flowRight<A1, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R3>;
+        flowRight<A1, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R4>;
+        flowRight<A1, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R5>;
+        flowRight<A1, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R6>;
+        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R7>;
+        // 2-argument first function
+        flowRight<A1, A2, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flowRight<A1, A2, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flowRight<A1, A2, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flowRight<A1, A2, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R7>;
+        // 3-argument first function
+        flowRight<A1, A2, A3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flowRight<A1, A2, A3, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flowRight<A1, A2, A3, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        // 4-argument first function
+        flowRight<A1, A2, A3, A4, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flowRight<A1, A2, A3, A4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        // any-argument first function
+        flowRight<R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R2>;
+        flowRight<R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R7>;
+        flowRight(this: LoDashExplicitWrapper<(a: any) => any>, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
+        flowRight(this: LoDashExplicitWrapper<(a: any) => any>, funcs: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.memoize
-    interface MemoizedFunction extends Function {
+    interface MemoizedFunction {
         cache: MapCache;
     }
 
@@ -10892,23 +8471,23 @@ declare namespace _ {
          * @return Returns the new memoizing function.
          */
         memoize: {
-            <T extends Function>(func: T, resolver?: Function): T & MemoizedFunction;
+            <T extends (...args: any[]) => any>(func: T, resolver?: (...args: any[]) => any): T & MemoizedFunction;
             Cache: MapCacheConstructor;
         };
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.memoize
          */
-        memoize(resolver?: Function): LoDashImplicitObjectWrapper<T & MemoizedFunction>;
+        memoize(resolver?: (...args: any[]) => any): LoDashImplicitWrapper<TValue & MemoizedFunction>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.memoize
          */
-        memoize(resolver?: Function): LoDashExplicitObjectWrapper<T & MemoizedFunction>;
+        memoize(resolver?: (...args: any[]) => any): LoDashExplicitWrapper<TValue & MemoizedFunction>;
     }
 
     //_.overArgs (was _.modArgs)
@@ -10921,42 +8500,24 @@ declare namespace _ {
          * of functions.
          * @return Returns the new function.
          */
-        overArgs<T extends Function, TResult extends Function>(
-            func: T,
-            ...transforms: Function[]
-        ): TResult;
-
-        /**
-         * @see _.overArgs
-         */
-        overArgs<T extends Function, TResult extends Function>(
-            func: T,
-            transforms: Function[]
-        ): TResult;
+        overArgs(
+            func: (...args: any[]) => any,
+            ...transforms: Array<Many<(...args: any[]) => any>>
+        ): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.overArgs
          */
-        overArgs<TResult extends Function>(...transforms: Function[]): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.overArgs
-         */
-        overArgs<TResult extends Function>(transforms: Function[]): LoDashImplicitObjectWrapper<TResult>;
+        overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.overArgs
          */
-        overArgs<TResult extends Function>(...transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.overArgs
-         */
-        overArgs<TResult extends Function>(transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
+        overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.negate
@@ -10968,36 +8529,14 @@ declare namespace _ {
          * @param predicate The predicate to negate.
          * @return Returns the new function.
          */
-        negate<T extends Function>(predicate: T): (...args: any[]) => boolean;
-
-        /**
-         * @see _.negate
-         */
-        negate<T extends Function, TResult extends Function>(predicate: T): TResult;
+        negate<T extends (...args: any[]) => any>(predicate: T): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.negate
          */
-        negate(): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-
-        /**
-         * @see _.negate
-         */
-        negate<TResult extends Function>(): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.negate
-         */
-        negate(): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-
-        /**
-         * @see _.negate
-         */
-        negate<TResult extends Function>(): LoDashExplicitObjectWrapper<TResult>;
+        negate(): this;
     }
 
     //_.once
@@ -11009,21 +8548,14 @@ declare namespace _ {
          * @param func The function to restrict.
          * @return Returns the new restricted function.
          */
-        once<T extends Function>(func: T): T;
+        once<T extends (...args: any[]) => any>(func: T): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.once
          */
-        once(): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.once
-         */
-        once(): LoDashExplicitObjectWrapper<T>;
+        once(): this;
     }
 
     //_.partial
@@ -11039,6 +8571,20 @@ declare namespace _ {
         partial: Partial;
     }
 
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.partial
+         */
+        partial: ImplicitPartial;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.partial
+         */
+        partial: ExplicitPartial;
+    }
+
     type PH = LoDashStatic;
 
     type Function0<R> = () => R;
@@ -11085,7 +8631,89 @@ declare namespace _ {
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
         // catch-all
-        (func: Function, ...args: any[]): Function;
+        (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+    }
+
+    interface ImplicitPartial {
+        // arity 0
+        <R>(this: LoDashImplicitWrapper<Function0<R>>): LoDashImplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>): LoDashImplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashImplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashImplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashImplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashImplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashImplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashImplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface ExplicitPartial {
+        // arity 0
+        <R>(this: LoDashExplicitWrapper<Function0<R>>): LoDashExplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>): LoDashExplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashExplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashExplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashExplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashExplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashExplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashExplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.partialRight
@@ -11100,6 +8728,20 @@ declare namespace _ {
         partialRight: PartialRight;
     }
 
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.partialRight
+         */
+        partialRight: ImplicitPartialRight;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.partialRight
+         */
+        partialRight: ExplicitPartialRight;
+    }
+
     interface PartialRight {
         // arity 0
         <R>(func: Function0<R>): Function0<R>;
@@ -11138,7 +8780,89 @@ declare namespace _ {
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
         // catch-all
-        (func: Function, ...args: any[]): Function;
+        (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+    }
+
+    interface ImplicitPartialRight {
+        // arity 0
+        <R>(this: LoDashImplicitWrapper<Function0<R>>): LoDashImplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>): LoDashImplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashImplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashImplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashImplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface ExplicitPartialRight {
+        // arity 0
+        <R>(this: LoDashExplicitWrapper<Function0<R>>): LoDashExplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>): LoDashExplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashExplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashExplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashExplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.rearg
@@ -11151,24 +8875,21 @@ declare namespace _ {
          * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
          * @return Returns the new function.
          */
-        rearg<TResult extends Function>(func: Function, indexes: number[]): TResult;
-
-        /**
-         * @see _.rearg
-         */
-        rearg<TResult extends Function>(func: Function, ...indexes: number[]): TResult;
+        rearg(func: (...args: any[]) => any, ...indexes: Array<Many<number>>): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.rearg
          */
-        rearg<TResult extends Function>(indexes: number[]): LoDashImplicitObjectWrapper<TResult>;
+        rearg(...indexes: Array<Many<number>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
 
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.rearg
          */
-        rearg<TResult extends Function>(...indexes: number[]): LoDashImplicitObjectWrapper<TResult>;
+        rearg(...indexes: Array<Many<number>>): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.rest
@@ -11183,32 +8904,24 @@ declare namespace _ {
          * @param start The start position of the rest parameter.
          * @return Returns the new function.
          */
-        rest<TResult extends Function>(
-            func: Function,
+        rest(
+            func: (...args: any[]) => any,
             start?: number
-        ): TResult;
-
-        /**
-         * @see _.rest
-         */
-        rest<TResult extends Function, TFunc extends Function>(
-            func: TFunc,
-            start?: number
-        ): TResult;
+        ): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.rest
          */
-        rest<TResult extends Function>(start?: number): LoDashImplicitObjectWrapper<TResult>;
+        rest(start?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.rest
          */
-        rest<TResult extends Function>(start?: number): LoDashExplicitObjectWrapper<TResult>;
+        rest(start?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.spread
@@ -11222,26 +8935,36 @@ declare namespace _ {
          * @param func The function to spread arguments over.
          * @return Returns the new function.
          */
-        spread<F extends Function, T extends Function>(func: F): T;
+        spread<TResult>(func: (...args: any[]) => TResult): (...args: any[]) => TResult;
 
         /**
          * @see _.spread
          */
-        spread<T extends Function>(func: Function): T;
+        spread<TResult>(func: (...args: any[]) => TResult, start: number): (...args: any[]) => TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.spread
          */
-        spread<T extends Function>(): LoDashImplicitObjectWrapper<T>;
+        spread<TResult>(this: LoDashImplicitWrapper<(...args: any[]) => TResult>): LoDashImplicitWrapper<(...args: any[]) => TResult>;
+
+        /**
+         * @see _.spread
+         */
+        spread<TResult>(this: LoDashImplicitWrapper<(...args: any[]) => TResult>, start: number): LoDashImplicitWrapper<(...args: any[]) => TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.spread
          */
-        spread<T extends Function>(): LoDashExplicitObjectWrapper<T>;
+        spread<TResult>(this: LoDashExplicitWrapper<(...args: any[]) => TResult>): LoDashExplicitWrapper<(...args: any[]) => TResult>;
+
+        /**
+         * @see _.spread
+         */
+        spread<TResult>(this: LoDashExplicitWrapper<(...args: any[]) => TResult>, start: number): LoDashExplicitWrapper<(...args: any[]) => TResult>;
     }
 
     //_.throttle
@@ -11274,31 +8997,31 @@ declare namespace _ {
          * @param options.trailing Specify invoking on the trailing edge of the timeout.
          * @return Returns the new throttled function.
          */
-        throttle<T extends Function>(
+        throttle<T extends (...args: any[]) => any>(
             func: T,
             wait?: number,
             options?: ThrottleSettings
         ): T & Cancelable;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.throttle
          */
         throttle(
             wait?: number,
             options?: ThrottleSettings
-        ): LoDashImplicitObjectWrapper<T & Cancelable>;
+        ): LoDashImplicitWrapper<TValue & Cancelable>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.throttle
          */
         throttle(
             wait?: number,
             options?: ThrottleSettings
-        ): LoDashExplicitObjectWrapper<T & Cancelable>;
+        ): LoDashExplicitWrapper<TValue & Cancelable>;
     }
 
     //_.unary
@@ -11307,31 +9030,29 @@ declare namespace _ {
          * Creates a function that accepts up to one argument, ignoring any
          * additional arguments.
          *
-         * @static
-         * @memberOf _
          * @category Function
-         * @param {Function} func The function to cap arguments for.
-         * @returns {Function} Returns the new function.
+         * @param func The function to cap arguments for.
+         * @returns Returns the new function.
          * @example
          *
          * _.map(['6', '8', '10'], _.unary(parseInt));
          * // => [6, 8, 10]
          */
-        unary<T extends Function>(func: T): T;
+        unary<T, TResult>(func: (arg1: T, ...args: any[]) => TResult): (arg1: T) => TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.unary
          */
-        unary(): LoDashImplicitObjectWrapper<T>;
+        unary<T, TResult>(this: LoDashImplicitWrapper<(arg1: T, ...args: any[]) => TResult>): LoDashImplicitWrapper<(arg1: T) => TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.unary
          */
-        unary(): LoDashExplicitObjectWrapper<T>;
+        unary<T, TResult>(this: LoDashExplicitWrapper<(arg1: T, ...args: any[]) => TResult>): LoDashExplicitWrapper<(arg1: T) => TResult>;
     }
 
     //_.wrap
@@ -11345,98 +9066,53 @@ declare namespace _ {
          * @param wrapper The wrapper function.
          * @return Returns the new function.
          */
-        wrap<V, W extends Function, R extends Function>(
-            value: V,
-            wrapper: W
-        ): R;
+        wrap<T, TArgs, TResult>(
+            value: T,
+            wrapper: (value: T, ...args: TArgs[]) => TResult
+        ): (...args: TArgs[]) => TResult;
 
         /**
          * @see _.wrap
          */
-        wrap<V, R extends Function>(
-            value: V,
-            wrapper: Function
-        ): R;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(
-            value: any,
-            wrapper: Function
-        ): R;
+        wrap<T, TResult>(
+            value: T,
+            wrapper: (value: T, ...args: any[]) => TResult
+        ): (...args: any[]) => TResult;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.wrap
          */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
+        wrap<TArgs, TResult>(
+            wrapper: (value: TValue, ...args: TArgs[]) => TResult
+        ): LoDashImplicitWrapper<(...args: TArgs[]) => TResult>;
 
         /**
          * @see _.wrap
          */
-        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
+        wrap<TResult>(
+            wrapper: (value: TValue, ...args: any[]) => TResult
+        ): LoDashImplicitWrapper<(...args: any[]) => TResult>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.wrap
          */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
+        /**
+         * @see _.wrap
+         */
+        wrap<TArgs, TResult>(
+            wrapper: (value: TValue, ...args: TArgs[]) => TResult
+        ): LoDashExplicitWrapper<(...args: TArgs[]) => TResult>;
 
         /**
          * @see _.wrap
          */
-        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
+        wrap<TResult>(
+            wrapper: (value: TValue, ...args: any[]) => TResult
+        ): LoDashExplicitWrapper<(...args: any[]) => TResult>;
     }
 
     /********
@@ -11454,46 +9130,18 @@ declare namespace _ {
         castArray<T>(value?: Many<T>): T[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.castArray
          */
-        castArray(): LoDashImplicitArrayWrapper<T>;
+        castArray<T>(this: LoDashImplicitWrapper<Many<T>>): LoDashImplicitWrapper<T[]>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.castArray
          */
-        castArray(): TWrapper;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashImplicitArrayWrapper<TObject>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashExplicitArrayWrapper<TObject>;
+        castArray<T>(this: LoDashExplicitWrapper<Many<T>>): LoDashExplicitWrapper<T[]>;
     }
 
     //_.clone
@@ -11512,46 +9160,18 @@ declare namespace _ {
         clone<T>(value: T): T;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.clone
          */
-        clone(): T;
+        clone(): TValue;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.clone
          */
-        clone(): TArray;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.clone
-         */
-        clone(): TObject;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.clone
-         */
-        clone(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.clone
-         */
-        clone(): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.clone
-         */
-        clone(): TWrapper;
+        clone(): this;
     }
 
     //_.cloneDeep
@@ -11565,50 +9185,22 @@ declare namespace _ {
         cloneDeep<T>(value: T): T;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(): T;
+        cloneDeep(): TValue;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(): TArray;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): TObject;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): TWrapper;
+        cloneDeep(): this;
     }
 
     //_.cloneDeepWith
-    type CloneDeepWithCustomizer<TValue, TResult> = (value: TValue, key?: number|string, object?: any, stack?: any) => TResult;
+    type CloneDeepWithCustomizer<TObject> = (value: any, key: number | string | undefined, object: TObject | undefined, stack: any) => any;
 
     interface LoDashStatic {
         /**
@@ -11618,118 +9210,47 @@ declare namespace _ {
          * @param customizer The function to customize cloning.
          * @return Returns the deep cloned value.
          */
-        cloneDeepWith<TResult>(
-            value: any,
-            customizer?: CloneDeepWithCustomizer<any, TResult>
-        ): TResult;
-
-        /**
-         * @see _.clonDeepeWith
-         */
-        cloneDeepWith<T, TResult>(
+        cloneDeepWith<T>(
             value: T,
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): TResult;
+            customizer: CloneDeepWithCustomizer<T>
+        ): any;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<T>(value: T): T;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.cloneDeepWith
          */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): TResult;
+        cloneDeepWith(
+            customizer: CloneDeepWithCustomizer<TValue>
+        ): any;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith(): TValue;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.cloneDeepWith
          */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<TArray, TResult>
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<TObject, TResult>
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitWrapper<TResult>;
+        cloneDeepWith(
+            customizer: CloneDeepWithCustomizer<TValue>
+        ): LoDashExplicitWrapper<any>;
 
         /**
          * @see _.cloneDeepWith
          */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends Object>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneDeepWithCustomizer<TArray, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends Object>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends Object>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
+        cloneDeepWith(): this;
     }
 
     //_.cloneWith
-    type CloneWithCustomizer<TValue, TResult> = (value: TValue, key?: number|string, object?: any, stack?: any) => TResult;
+    type CloneWithCustomizer<TValue, TResult> = (value: TValue, key: number | string | undefined, object: any, stack: any) => TResult;
 
     interface LoDashStatic {
         /**
@@ -11740,9 +9261,9 @@ declare namespace _ {
          * @param customizer The function to customize cloning.
          * @return Returns the cloned value.
          */
-        cloneWith<TResult>(
-            value: any,
-            customizer?: CloneWithCustomizer<any, TResult>
+        cloneWith<T, TResult extends object | string | number | boolean | null>(
+            value: T,
+            customizer: CloneWithCustomizer<T, TResult>
         ): TResult;
 
         /**
@@ -11750,111 +9271,62 @@ declare namespace _ {
          */
         cloneWith<T, TResult>(
             value: T,
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): TResult;
+            customizer: CloneWithCustomizer<T, TResult | undefined>
+        ): TResult | T;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<T>(value: T): T;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends object | string | number | boolean | null>(
+            customizer: CloneWithCustomizer<TValue, TResult>
+        ): TResult;
+
         /**
          * @see _.cloneWith
          */
         cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): TResult;
-    }
+            customizer: CloneWithCustomizer<TValue, TResult | undefined>
+        ): TResult | TValue;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.cloneWith
          */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<TArray, TResult>
-        ): TResult;
+        cloneWith(): TValue;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.cloneWith
          */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<TObject, TResult>
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneWithCustomizer<T, TResult>
+        cloneWith<TResult extends object | string | number | boolean | null>(
+            customizer: CloneWithCustomizer<TValue, TResult>
         ): LoDashExplicitWrapper<TResult>;
 
         /**
          * @see _.cloneWith
          */
         cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
+            customizer: CloneWithCustomizer<TValue, TResult | undefined>
+        ): LoDashExplicitWrapper<TResult | TValue>;
 
         /**
          * @see _.cloneWith
          */
-        cloneWith<TResult extends Object>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneWithCustomizer<TArray, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T[], TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends Object>(
-            customizer?: CloneWithCustomizer<T[], TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends Object>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
+        cloneWith(): this;
     }
 
     /**
      * An object containing predicate functions for each property of T
      */
     type ConformsPredicateObject<T> = {
-        [P in keyof T]: (val: T[P]) => boolean;
+        [P in keyof T]?: (val: T[P]) => boolean;
     };
 
     //_.conforms
@@ -11863,7 +9335,21 @@ declare namespace _ {
          * Creates a function that invokes the predicate properties of `source` with the corresponding
          * property values of a given object, returning true if all predicates return truthy, else false.
          */
-        conforms<T>(source: ConformsPredicateObject<T>): (Target: T) => boolean;
+        conforms<T>(source: ConformsPredicateObject<T>): (value: T) => boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.conforms
+         */
+        conforms<T>(this: LoDashImplicitWrapper<ConformsPredicateObject<T>>): LoDashImplicitWrapper<(value: T) => boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.conforms
+         */
+        conforms<T>(this: LoDashExplicitWrapper<ConformsPredicateObject<T>>): LoDashExplicitWrapper<(value: T) => boolean>;
     }
 
     //_.conformsTo
@@ -11877,6 +9363,22 @@ declare namespace _ {
         conformsTo<T>(object: T, source: ConformsPredicateObject<T>): boolean;
     }
 
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.conformsTo
+         */
+        conformsTo<T>(this: LoDashImplicitWrapper<T>, source: ConformsPredicateObject<T>): boolean;
+        // Note: we can't use TValue here,  because it generates a typescript error when strictFunctionTypes is enabled.
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.conformsTo
+         */
+        conformsTo<T>(this: LoDashImplicitWrapper<T>, source: ConformsPredicateObject<T>): LoDashExplicitWrapper<boolean>;
+        // Note: we can't use TValue here,  because it generates a typescript error when strictFunctionTypes is enabled.
+    }
+
     type CondPair<T, R> = [(val: T) => boolean, (val: T) => R]
 
     //_.cond
@@ -11887,12 +9389,10 @@ declare namespace _ {
          * pairs are invoked with the `this` binding and arguments of the created
          * function.
          *
-         * @static
-         * @memberOf _
          * @since 4.0.0
          * @category Util
-         * @param {Array} pairs The predicate-function pairs.
-         * @returns {Function} Returns the new composite function.
+         * @param pairs The predicate-function pairs.
+         * @returns Returns the new composite function.
          * @example
          *
          * var func = _.cond([
@@ -11919,12 +9419,10 @@ declare namespace _ {
          * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
          * comparison between two values to determine if they are equivalent.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to compare.
-         * @param {*} other The other value to compare.
-         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @returns Returns `true` if the values are equivalent, else `false`.
          * @example
          *
          * var object = { 'user': 'fred' };
@@ -11951,18 +9449,18 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
-         * @see _.isEqual
+         * @see _.eq
          */
         eq(
             other: any
         ): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
-         * @see _.isEqual
+         * @see _.eq
          */
         eq(
             other: any
@@ -11984,14 +9482,14 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.gt
          */
         gt(other: any): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.gt
          */
@@ -12013,14 +9511,14 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.gte
          */
         gte(other: any): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.gte
          */
@@ -12038,14 +9536,14 @@ declare namespace _ {
         isArguments(value?: any): value is IArguments;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isArguments
          */
         isArguments(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isArguments
          */
@@ -12068,14 +9566,14 @@ declare namespace _ {
         isArray<T>(value?: any): value is any[];
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isArray
          */
         isArray(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isArray
          */
@@ -12093,14 +9591,14 @@ declare namespace _ {
         isArrayBuffer(value?: any): value is ArrayBuffer;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isArrayBuffer
          */
         isArrayBuffer(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isArrayBuffer
          */
@@ -12114,12 +9612,9 @@ declare namespace _ {
          * not a function and has a `value.length` that's an integer greater than or
          * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
          *
-         * @static
-         * @memberOf _
-         * @type Function
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is array-like, else `false`.
          * @example
          *
          * _.isArrayLike([1, 2, 3]);
@@ -12139,27 +9634,22 @@ declare namespace _ {
         /**
          * @see _.isArrayLike
          */
-        isArrayLike(value?: Function): value is never;
+        isArrayLike(value: ((...args: any[]) => any) | Function | null | undefined): value is never;
 
         /**
          * @see _.isArrayLike
          */
-        isArrayLike<T>(value: T | Function): value is T & { length: number };
-
-        /**
-         * DEPRECATED
-         */
-        isArrayLike<T>(value?: any): value is any[];
+        isArrayLike(value: any): value is { length: number };
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isArrayLike
          */
         isArrayLike(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isArrayLike
          */
@@ -12172,12 +9662,9 @@ declare namespace _ {
          * This method is like `_.isArrayLike` except that it also checks if `value`
          * is an object.
          *
-         * @static
-         * @memberOf _
-         * @type Function
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is an array-like object, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is an array-like object, else `false`.
          * @example
          *
          * _.isArrayLikeObject([1, 2, 3]);
@@ -12197,27 +9684,22 @@ declare namespace _ {
         /**
          * @see _.isArrayLike
          */
-        isArrayLikeObject(value?: Function | string | boolean | number): value is never;
+        isArrayLikeObject(value: ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is never;
 
         /**
          * @see _.isArrayLike
          */
-        isArrayLikeObject<T>(value: T | Function | string | boolean | number): value is T & { length: number };
-
-        /**
-         * DEPRECATED
-         */
-        isArrayLikeObject<T>(value?: any): value is any[];
+        isArrayLikeObject<T extends object>(value: T | string | boolean | number | null | undefined): value is T & { length: number };
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isArrayLikeObject
          */
         isArrayLikeObject(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isArrayLikeObject
          */
@@ -12235,14 +9717,14 @@ declare namespace _ {
         isBoolean(value?: any): value is boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isBoolean
          */
         isBoolean(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isBoolean
          */
@@ -12260,14 +9742,14 @@ declare namespace _ {
         isBuffer(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isBuffer
          */
         isBuffer(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isBuffer
          */
@@ -12285,14 +9767,14 @@ declare namespace _ {
         isDate(value?: any): value is Date;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isDate
          */
         isDate(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isDate
          */
@@ -12310,14 +9792,14 @@ declare namespace _ {
         isElement(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isElement
          */
         isElement(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isElement
          */
@@ -12336,14 +9818,14 @@ declare namespace _ {
         isEmpty(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isEmpty
          */
         isEmpty(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isEmpty
          */
@@ -12362,12 +9844,10 @@ declare namespace _ {
          * by their own, not inherited, enumerable properties. Functions and DOM
          * nodes are **not** supported.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to compare.
-         * @param {*} other The other value to compare.
-         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @returns Returns `true` if the values are equivalent, else `false`.
          * @example
          *
          * var object = { 'user': 'fred' };
@@ -12385,7 +9865,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isEqual
          */
@@ -12394,7 +9874,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isEqual
          */
@@ -12404,7 +9884,7 @@ declare namespace _ {
     }
 
     // _.isEqualWith
-    type IsEqualCustomizer = (value: any, other: any, indexOrKey: number|string|undefined, parent: any, otherParent: any, stack: any) => boolean|undefined;
+    type IsEqualCustomizer = (value: any, other: any, indexOrKey: PropertyName | undefined, parent: any, otherParent: any, stack: any) => boolean|undefined;
 
     interface LoDashStatic {
         /**
@@ -12413,13 +9893,11 @@ declare namespace _ {
          * handled by the method instead. The `customizer` is invoked with up to seven arguments:
          * (objValue, othValue [, index|key, object, other, stack]).
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to compare.
-         * @param {*} other The other value to compare.
-         * @param {Function} [customizer] The function to customize comparisons.
-         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @param [customizer] The function to customize comparisons.
+         * @returns Returns `true` if the values are equivalent, else `false`.
          * @example
          *
          * function isGreeting(value) {
@@ -12445,7 +9923,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isEqualWith
          */
@@ -12455,7 +9933,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isEqualWith
          */
@@ -12477,14 +9955,14 @@ declare namespace _ {
         isError(value: any): value is Error;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isError
          */
         isError(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isError
          */
@@ -12504,14 +9982,14 @@ declare namespace _ {
         isFinite(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isFinite
          */
         isFinite(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isFinite
          */
@@ -12521,22 +9999,22 @@ declare namespace _ {
     //_.isFunction
     interface LoDashStatic {
         /**
-         * Checks if value is classified as a Function object.
+         * Checks if value is a callable function.
          *
          * @param value The value to check.
          * @return Returns true if value is correctly classified, else false.
          */
-        isFunction(value?: any): value is Function;
+        isFunction(value: any): value is (...args: any[]) => any;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isFunction
          */
         isFunction(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isFunction
          */
@@ -12550,11 +10028,9 @@ declare namespace _ {
          *
          * **Note:** This method is based on [`Number.isInteger`](https://mdn.io/Number/isInteger).
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is an integer, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is an integer, else `false`.
          * @example
          *
          * _.isInteger(3);
@@ -12572,14 +10048,14 @@ declare namespace _ {
         isInteger(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isInteger
          */
         isInteger(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isInteger
          */
@@ -12593,11 +10069,9 @@ declare namespace _ {
          *
          * **Note:** This function is loosely based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is a valid length, else `false`.
          * @example
          *
          * _.isLength(3);
@@ -12615,14 +10089,14 @@ declare namespace _ {
         isLength(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isLength
          */
         isLength(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isLength
          */
@@ -12637,17 +10111,17 @@ declare namespace _ {
          * @param value The value to check.
          * @returns Returns true if value is correctly classified, else false.
          */
-        isMap<K, V>(value?: any): value is Map<K, V>;
+        isMap(value?: any): value is Map<any, any>;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isMap
          */
         isMap(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isMap
          */
@@ -12655,7 +10129,7 @@ declare namespace _ {
     }
 
     //_.isMatch
-    type isMatchCustomizer = (value: any, other: any, indexOrKey?: number|string) => boolean;
+    type isMatchCustomizer = (value: any, other: any, indexOrKey?: PropertyName) => boolean;
 
     interface LoDashStatic {
         /**
@@ -12664,12 +10138,10 @@ declare namespace _ {
          *
          * **Note:** This method supports comparing the same values as `_.isEqual`.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {Object} object The object to inspect.
-         * @param {Object} source The object of property values to match.
-         * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+         * @param object The object to inspect.
+         * @param source The object of property values to match.
+         * @returns Returns `true` if `object` is a match, else `false`.
          * @example
          *
          * var object = { 'user': 'fred', 'age': 40 };
@@ -12680,18 +10152,18 @@ declare namespace _ {
          * _.isMatch(object, { 'age': 36 });
          * // => false
          */
-        isMatch(object: Object, source: Object): boolean;
+        isMatch(object: object, source: object): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isMatch
          */
-        isMatch(source: Object): boolean;
+        isMatch(source: object): boolean;
     }
 
     //_.isMatchWith
-    type isMatchWithCustomizer = (value: any, other: any, indexOrKey: number|string) => boolean;
+    type isMatchWithCustomizer = (value: any, other: any, indexOrKey: PropertyName) => boolean;
 
     interface LoDashStatic {
         /**
@@ -12700,13 +10172,11 @@ declare namespace _ {
          * are handled by the method instead. The `customizer` is invoked with three
          * arguments: (objValue, srcValue, index|key, object, source).
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {Object} object The object to inspect.
-         * @param {Object} source The object of property values to match.
-         * @param {Function} [customizer] The function to customize comparisons.
-         * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+         * @param object The object to inspect.
+         * @param source The object of property values to match.
+         * @param [customizer] The function to customize comparisons.
+         * @returns Returns `true` if `object` is a match, else `false`.
          * @example
          *
          * function isGreeting(value) {
@@ -12725,14 +10195,14 @@ declare namespace _ {
          * _.isMatchWith(object, source, customizer);
          * // => true
          */
-        isMatchWith(object: Object, source: Object, customizer: isMatchWithCustomizer): boolean;
+        isMatchWith(object: object, source: object, customizer: isMatchWithCustomizer): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isMatchWith
          */
-        isMatchWith(source: Object, customizer: isMatchWithCustomizer): boolean;
+        isMatchWith(source: object, customizer: isMatchWithCustomizer): boolean;
     }
 
     //_.isNaN
@@ -12748,14 +10218,14 @@ declare namespace _ {
         isNaN(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isNaN
          */
         isNaN(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isNaN
          */
@@ -12770,17 +10240,17 @@ declare namespace _ {
          *
          * @retrun Returns true if value is a native function, else false.
          */
-        isNative(value: any): value is Function;
+        isNative(value: any): value is ((...args: any[]) => any) | Function;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isNative
          */
         isNative(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isNative
          */
@@ -12792,11 +10262,9 @@ declare namespace _ {
         /**
          * Checks if `value` is `null` or `undefined`.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is nullish, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is nullish, else `false`.
          * @example
          *
          * _.isNil(null);
@@ -12811,14 +10279,14 @@ declare namespace _ {
         isNil(value: any): value is null | undefined;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isNil
          */
         isNil(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isNil
          */
@@ -12836,14 +10304,14 @@ declare namespace _ {
         isNull(value: any): value is null;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isNull
          */
         isNull(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isNull
          */
@@ -12863,14 +10331,14 @@ declare namespace _ {
         isNumber(value?: any): value is number;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isNumber
          */
         isNumber(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isNumber
          */
@@ -12889,14 +10357,14 @@ declare namespace _ {
         isObject(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isObject
          */
         isObject(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isObject
          */
@@ -12909,11 +10377,9 @@ declare namespace _ {
          * Checks if `value` is object-like. A value is object-like if it's not `null`
          * and has a `typeof` result of "object".
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is object-like, else `false`.
          * @example
          *
          * _.isObjectLike({});
@@ -12931,14 +10397,14 @@ declare namespace _ {
         isObjectLike(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isObjectLike
          */
         isObjectLike(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isObjectLike
          */
@@ -12959,14 +10425,14 @@ declare namespace _ {
         isPlainObject(value?: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isPlainObject
          */
         isPlainObject(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isPlainObject
          */
@@ -12984,14 +10450,14 @@ declare namespace _ {
         isRegExp(value?: any): value is RegExp;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isRegExp
          */
         isRegExp(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isRegExp
          */
@@ -13006,11 +10472,9 @@ declare namespace _ {
          *
          * **Note:** This method is based on [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is a safe integer, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is a safe integer, else `false`.
          * @example
          *
          * _.isSafeInteger(3);
@@ -13028,14 +10492,14 @@ declare namespace _ {
         isSafeInteger(value: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isSafeInteger
          */
         isSafeInteger(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isSafeInteger
          */
@@ -13050,17 +10514,17 @@ declare namespace _ {
          * @param value The value to check.
          * @returns Returns true if value is correctly classified, else false.
          */
-        isSet<T>(value?: any): value is Set<T>;
+        isSet(value?: any): value is Set<any>;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isSet
          */
         isSet(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isSet
          */
@@ -13078,14 +10542,14 @@ declare namespace _ {
         isString(value?: any): value is string;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isString
          */
         isString(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isString
          */
@@ -13097,11 +10561,9 @@ declare namespace _ {
         /**
          * Checks if `value` is classified as a `Symbol` primitive or object.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is correctly classified, else `false`.
          * @example
          *
          * _.isSymbol(Symbol.iterator);
@@ -13113,14 +10575,14 @@ declare namespace _ {
         isSymbol(value: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isSymbol
          */
         isSymbol(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isSymbol
          */
@@ -13138,14 +10600,14 @@ declare namespace _ {
         isTypedArray(value: any): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isTypedArray
          */
         isTypedArray(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isTypedArray
          */
@@ -13163,14 +10625,14 @@ declare namespace _ {
         isUndefined(value: any): value is undefined;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * see _.isUndefined
          */
         isUndefined(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * see _.isUndefined
          */
@@ -13185,17 +10647,17 @@ declare namespace _ {
          * @param value The value to check.
          * @returns Returns true if value is correctly classified, else false.
          */
-        isWeakMap<K extends object, V>(value?: any): value is WeakMap<K, V>;
+        isWeakMap(value?: any): value is WeakMap<object, any>;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isSet
          */
         isWeakMap(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isSet
          */
@@ -13210,17 +10672,17 @@ declare namespace _ {
          * @param value The value to check.
          * @returns Returns true if value is correctly classified, else false.
          */
-        isWeakSet<T>(value?: any): value is WeakSet<T>;
+        isWeakSet(value?: any): value is WeakSet<object>;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.isWeakSet
          */
         isWeakSet(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.isWeakSet
          */
@@ -13242,14 +10704,14 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.lt
          */
         lt(other: any): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.lt
          */
@@ -13271,14 +10733,14 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.lte
          */
         lte(other: any): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.lte
          */
@@ -13293,59 +10755,41 @@ declare namespace _ {
          * @param value The value to convert.
          * @return Returns the converted array.
          */
-        toArray<T>(value: List<T>|Dictionary<T>|NumericDictionary<T>): T[];
+        toArray<T>(value: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined): T[];
 
         /**
          * @see _.toArray
          */
-        toArray<TValue, TResult>(value: TValue): TResult[];
+        toArray<T>(value: T): Array<T[keyof T]>;
 
         /**
          * @see _.toArray
          */
-        toArray<TResult>(value?: any): TResult[];
+        toArray(): any[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toArray
          */
-        toArray<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+        toArray<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.toArray
+         */
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toArray
          */
-        toArray(): LoDashImplicitArrayWrapper<T>;
-    }
+        toArray<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.toArray
          */
-        toArray<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.toArray
-         */
-        toArray<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.toArray
-         */
-        toArray(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.toArray
-         */
-        toArray<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.toPlainObject
@@ -13357,14 +10801,21 @@ declare namespace _ {
          * @param value The value to convert.
          * @return Returns the converted plain object.
          */
-        toPlainObject<TResult extends {}>(value?: any): TResult;
+        toPlainObject(value?: any): any;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toPlainObject
          */
-        toPlainObject<TResult extends {}>(): LoDashImplicitObjectWrapper<TResult>;
+        toPlainObject(): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPlainObject
+         */
+        toPlainObject(): LoDashExplicitWrapper<any>;
     }
 
     //_.toFinite
@@ -13372,12 +10823,10 @@ declare namespace _ {
         /**
          * Converts `value` to a finite number.
          *
-         * @static
-         * @memberOf _
          * @since 4.12.0
          * @category Lang
-         * @param {*} value The value to convert.
-         * @returns {number} Returns the converted number.
+         * @param value The value to convert.
+         * @returns Returns the converted number.
          * @example
          *
          * _.toFinite(3.2);
@@ -13395,14 +10844,14 @@ declare namespace _ {
         toFinite(value: any): number;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toFinite
          */
-        toFinite(): LoDashImplicitWrapper<number>;
+        toFinite(): number;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toFinite
          */
@@ -13416,11 +10865,9 @@ declare namespace _ {
          *
          * **Note:** This function is loosely based on [`ToInteger`](http://www.ecma-international.org/ecma-262/6.0/#sec-tointeger).
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to convert.
-         * @returns {number} Returns the converted integer.
+         * @param value The value to convert.
+         * @returns Returns the converted integer.
          * @example
          *
          * _.toInteger(3);
@@ -13438,14 +10885,14 @@ declare namespace _ {
         toInteger(value: any): number;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toInteger
          */
-        toInteger(): LoDashImplicitWrapper<number>;
+        toInteger(): number;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toInteger
          */
@@ -13460,11 +10907,9 @@ declare namespace _ {
          *
          * **Note:** This method is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to convert.
-         * @return {number} Returns the converted integer.
+         * @param value The value to convert.
+         * @return Returns the converted integer.
          * @example
          *
          * _.toLength(3);
@@ -13482,14 +10927,14 @@ declare namespace _ {
         toLength(value: any): number;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toLength
          */
-        toLength(): LoDashImplicitWrapper<number>;
+        toLength(): number;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toLength
          */
@@ -13501,11 +10946,9 @@ declare namespace _ {
         /**
          * Converts `value` to a number.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to process.
-         * @returns {number} Returns the number.
+         * @param value The value to process.
+         * @returns Returns the number.
          * @example
          *
          * _.toNumber(3);
@@ -13523,14 +10966,14 @@ declare namespace _ {
         toNumber(value: any): number;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toNumber
          */
-        toNumber(): LoDashImplicitWrapper<number>;
+        toNumber(): number;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toNumber
          */
@@ -13543,11 +10986,9 @@ declare namespace _ {
          * Converts `value` to a safe integer. A safe integer can be compared and
          * represented correctly.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to convert.
-         * @returns {number} Returns the converted integer.
+         * @param value The value to convert.
+         * @returns Returns the converted integer.
          * @example
          *
          * _.toSafeInteger(3);
@@ -13565,31 +11006,29 @@ declare namespace _ {
         toSafeInteger(value: any): number;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toSafeInteger
          */
-        toSafeInteger(): LoDashImplicitWrapper<number>;
+        toSafeInteger(): number;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toSafeInteger
          */
         toSafeInteger(): LoDashExplicitWrapper<number>;
     }
 
-    //_.toString DUMMY
+    //_.toString
     interface LoDashStatic {
         /**
          * Converts `value` to a string if it's not one. An empty string is returned
          * for `null` and `undefined` values. The sign of `-0` is preserved.
          *
-         * @static
-         * @memberOf _
          * @category Lang
-         * @param {*} value The value to process.
-         * @returns {string} Returns the string.
+         * @param value The value to process.
+         * @returns Returns the string.
          * @example
          *
          * _.toString(null);
@@ -13623,14 +11062,14 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.add
          */
         add(addend: number): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.add
          */
@@ -13652,14 +11091,14 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.ceil
          */
         ceil(precision?: number): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.ceil
          */
@@ -13681,14 +11120,14 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.divide
          */
         divide(divisor: number): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.divide
          */
@@ -13710,14 +11149,14 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.floor
          */
         floor(precision?: number): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.floor
          */
@@ -13730,29 +11169,27 @@ declare namespace _ {
           * Computes the maximum value of `array`. If `array` is empty or falsey
           * `undefined` is returned.
           *
-          * @static
-          * @memberOf _
           * @category Math
-          * @param {Array} array The array to iterate over.
-          * @returns {*} Returns the maximum value.
+          * @param array The array to iterate over.
+          * @returns Returns the maximum value.
           */
         max<T>(
             collection: List<T> | null | undefined
         ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.max
          */
-        max(): T | undefined;
+        max<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.max
          */
-        max<T>(): T | undefined;
+        max<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
     }
 
     //_.maxBy
@@ -13762,12 +11199,10 @@ declare namespace _ {
          * invoked for each element in `array` to generate the criterion by which
          * the value is ranked. The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Math
-         * @param {Array} array The array to iterate over.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {*} Returns the maximum value.
+         * @param array The array to iterate over.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the maximum value.
          * @example
          *
          * var objects = [{ 'n': 1 }, { 'n': 2 }];
@@ -13781,78 +11216,28 @@ declare namespace _ {
          */
         maxBy<T>(
             collection: List<T> | null | undefined,
-            iteratee?: ListIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: string
-        ): T | undefined;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            whereValue?: TObject
+            iteratee?: ListIteratee<T>
         ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.maxBy
          */
-        maxBy(
-            iteratee?: ListIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy(
-            iteratee?: string
-        ): T | undefined;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<TObject extends {}>(
-            whereValue?: TObject
+        maxBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
         ): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.maxBy
          */
         maxBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            iteratee?: string
-        ): T | undefined;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<TObject extends {}, T>(
-            whereValue?: TObject
-        ): T | undefined;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T | undefined>;
     }
 
     //_.mean
@@ -13860,58 +11245,71 @@ declare namespace _ {
         /**
          * Computes the mean of the values in `array`.
          *
-         * @static
-         * @memberOf _
          * @category Math
-         * @param {Array} array The array to iterate over.
-         * @returns {number} Returns the mean.
+         * @param array The array to iterate over.
+         * @returns Returns the mean.
          * @example
          *
          * _.mean([4, 2, 8, 6]);
          * // => 5
          */
-        mean<T>(
-            collection: List<T> | null | undefined
+        mean(
+            collection: List<any> | null | undefined
         ): number;
     }
 
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mean
+         */
+        mean(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mean
+         */
+        mean(): LoDashExplicitWrapper<number>;
+    }
+
     //_.meanBy
     interface LoDashStatic {
       /**
        * Computes the mean of the provided propties of the objects in the `array`
        *
-       * @static
-       * @memberOf _
        * @category Math
-       * @param {Array} array The array to iterate over.
-       * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-       * @returns {number} Returns the mean.
+       * @param array The array to iterate over.
+       * @param [iteratee=_.identity] The iteratee invoked per element.
+       * @returns Returns the mean.
        * @example
        *
        * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
        * // => 5
        */
-      meanBy<T>(
-        collection: List<T> | null | undefined,
-        iteratee?: ListIterator<T, any> | string
-      ): number;
-
-      meanBy<T>(
-        collection: Dictionary<T> | null | undefined,
-        iteratee?: DictionaryIterator<T, any> | string
-      ): number;
+        meanBy<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIteratee<T>
+        ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
-         * @see _.mean
+         * @see _.meanBy
          */
-        mean<T>(): number;
+        meanBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): number;
+    }
 
+    interface LoDashExplicitWrapper<TValue> {
         /**
-         * @see _.mean
+         * @see _.meanBy
          */
-        mean(): number;
+        meanBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<number>;
     }
 
     //_.min
@@ -13920,29 +11318,27 @@ declare namespace _ {
          * Computes the minimum value of `array`. If `array` is empty or falsey
          * `undefined` is returned.
          *
-         * @static
-         * @memberOf _
          * @category Math
-         * @param {Array} array The array to iterate over.
-         * @returns {*} Returns the minimum value.
+         * @param array The array to iterate over.
+         * @returns Returns the minimum value.
          */
         min<T>(
             collection: List<T> | null | undefined
         ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.min
          */
-        min(): T | undefined;
+        min<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.min
          */
-        min<T>(): T | undefined;
+        min<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
     }
 
     //_.minBy
@@ -13952,12 +11348,10 @@ declare namespace _ {
          * invoked for each element in `array` to generate the criterion by which
          * the value is ranked. The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Math
-         * @param {Array} array The array to iterate over.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {*} Returns the minimum value.
+         * @param array The array to iterate over.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the minimum value.
          * @example
          *
          * var objects = [{ 'n': 1 }, { 'n': 2 }];
@@ -13971,78 +11365,28 @@ declare namespace _ {
          */
         minBy<T>(
             collection: List<T> | null | undefined,
-            iteratee?: ListIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: string
-        ): T | undefined;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            whereValue?: TObject
+            iteratee?: ListIteratee<T>
         ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.minBy
          */
-        minBy(
-            iteratee?: ListIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.minBy
-         */
-        minBy(
-            iteratee?: string
-        ): T | undefined;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<TObject extends {}>(
-            whereValue?: TObject
+        minBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
         ): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.minBy
          */
         minBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
-        ): T | undefined;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            iteratee?: string
-        ): T | undefined;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<TObject extends {}, T>(
-            whereValue?: TObject
-        ): T | undefined;
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T | undefined>;
     }
 
     //_.multiply
@@ -14059,14 +11403,14 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.multiply
          */
         multiply(multiplicand: number): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.multiply
          */
@@ -14088,14 +11432,14 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.round
          */
         round(precision?: number): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.round
          */
@@ -14107,56 +11451,25 @@ declare namespace _ {
         /**
          * Computes the sum of the values in `array`.
          *
-         * @static
-         * @memberOf _
          * @category Math
-         * @param {Array} array The array to iterate over.
-         * @returns {number} Returns the sum.
+         * @param array The array to iterate over.
+         * @returns Returns the sum.
          * @example
          *
          * _.sum([4, 2, 8, 6]);
          * // => 20
          */
-        sum<T>(collection: List<T> | null | undefined): number;
-
-        /**
-         * @see _.sum
-         */
-        sum(collection: List<number>|Dictionary<number> | null | undefined): number;
+        sum(collection: List<any> | null | undefined): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sum
          */
         sum(): number;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sum
-         **/
-        sum<TValue>(): number;
-
-        /**
-         * @see _.sum
-         */
-        sum(): number;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sum
-         */
-        sum(): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sum
-         */
-        sum<TValue>(): LoDashExplicitWrapper<number>;
-
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sum
          */
@@ -14170,12 +11483,10 @@ declare namespace _ {
          * invoked for each element in `array` to generate the value to be summed.
          * The iteratee is invoked with one argument: (value).
          *
-         * @static
-         * @memberOf _
          * @category Math
-         * @param {Array} array The array to iterate over.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {number} Returns the sum.
+         * @param array The array to iterate over.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the sum.
          * @example
          *
          * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
@@ -14189,112 +11500,28 @@ declare namespace _ {
          */
         sumBy<T>(
             collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, number>
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(
-            collection: List<{}> | null | undefined,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(
-            collection: List<number> | null | undefined
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(
-            collection: List<{}> | null | undefined,
-            iteratee: Dictionary<{}>
+            iteratee?: ((value: T) => number) | string
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.sumBy
          */
-        sumBy(
-            iteratee: ListIterator<T, number>
+        sumBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ((value: T) => number) | string
         ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: Dictionary<{}>): number;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.sumBy
          */
-        sumBy(
-            iteratee: ListIterator<TObject, number>
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: Dictionary<{}>): number;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.sumBy
-         */
-        sumBy(
-            iteratee: ListIterator<T, number>
+        sumBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ((value: T) => number) | string
         ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: Dictionary<{}>): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.sumBy
-         */
-        sumBy(
-            iteratee: ListIterator<TObject, number>
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: Dictionary<{}>): LoDashExplicitWrapper<number>;
     }
 
     /**********
@@ -14306,12 +11533,10 @@ declare namespace _ {
         /**
          * Subtract two numbers.
          *
-         * @static
-         * @memberOf _
          * @category Math
-         * @param {number} minuend The first number in a subtraction.
-         * @param {number} subtrahend The second number in a subtraction.
-         * @returns {number} Returns the difference.
+         * @param minuend The first number in a subtraction.
+         * @param subtrahend The second number in a subtraction.
+         * @returns Returns the difference.
          * @example
          *
          * _.subtract(6, 4);
@@ -14323,7 +11548,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.subtract
          */
@@ -14332,7 +11557,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.subtract
          */
@@ -14346,13 +11571,11 @@ declare namespace _ {
         /**
          * Clamps `number` within the inclusive `lower` and `upper` bounds.
          *
-         * @static
-         * @memberOf _
          * @category Number
-         * @param {number} number The number to clamp.
-         * @param {number} [lower] The lower bound.
-         * @param {number} upper The upper bound.
-         * @returns {number} Returns the clamped number.
+         * @param number The number to clamp.
+         * @param [lower] The lower bound.
+         * @param upper The upper bound.
+         * @returns Returns the clamped number.
          * @example
          *
          * _.clamp(-10, -5, 5);
@@ -14366,9 +11589,13 @@ declare namespace _ {
             lower: number,
             upper: number
         ): number;
+        clamp(
+            number: number,
+            upper: number
+        ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.clamp
          */
@@ -14376,9 +11603,12 @@ declare namespace _ {
             lower: number,
             upper: number
         ): number;
+        clamp(
+            upper: number
+        ): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.clamp
          */
@@ -14386,6 +11616,9 @@ declare namespace _ {
             lower: number,
             upper: number
         ): LoDashExplicitWrapper<number>;
+        clamp(
+            upper: number
+        ): LoDashExplicitWrapper<number>;
     }
 
     //_.inRange
@@ -14402,46 +11635,28 @@ declare namespace _ {
         inRange(
             n: number,
             start: number,
-            end: number
-        ): boolean;
-
-        /**
-         * @see _.inRange
-         */
-        inRange(
-            n: number,
-            end: number
+            end?: number
         ): boolean;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.inRange
          */
         inRange(
             start: number,
-            end: number
+            end?: number
         ): boolean;
-
-        /**
-         * @see _.inRange
-         */
-        inRange(end: number): boolean;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.inRange
          */
         inRange(
             start: number,
-            end: number
+            end?: number
         ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.inRange
-         */
-        inRange(end: number): LoDashExplicitWrapper<boolean>;
     }
 
     //_.random
@@ -14457,8 +11672,6 @@ declare namespace _ {
          * @return Returns the random number.
          */
         random(
-            min?: number,
-            max?: number,
             floating?: boolean
         ): number;
 
@@ -14466,44 +11679,64 @@ declare namespace _ {
          * @see _.random
          */
         random(
-            min?: number,
+            max: number,
             floating?: boolean
         ): number;
 
+        /**
+         * @see _.random
+         */
+        random(
+            min: number,
+            max: number,
+            floating?: boolean
+        ): number;
+
+        /**
+         * Produces a random number between min and max (inclusive). If only one argument is provided a number between
+         * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
+         * number is returned instead of an integer.
+         *
+         * @param min The minimum possible value.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the random number.
+         */
+        random(
+            min: number,
+            index: string | number,
+            guard: object
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.random
          */
         random(floating?: boolean): number;
-    }
 
-    interface LoDashImplicitWrapper<T> {
         /**
          * @see _.random
          */
         random(
-            max?: number,
+            max: number,
             floating?: boolean
         ): number;
-
-        /**
-         * @see _.random
-         */
-        random(floating?: boolean): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.random
-         */
-        random(
-            max?: number,
-            floating?: boolean
-        ): LoDashExplicitWrapper<number>;
-
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.random
          */
         random(floating?: boolean): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.random
+         */
+        random(
+            max: number,
+            floating?: boolean
+        ): LoDashExplicitWrapper<number>;
     }
 
     /**********
@@ -14520,12 +11753,10 @@ declare namespace _ {
          * **Note:** This method mutates `object` and is loosely based on
          * [`Object.assign`](https://mdn.io/Object/assign).
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} [sources] The source objects.
-         * @returns {Object} Returns `object`.
+         * @param object The destination object.
+         * @param [sources] The source objects.
+         * @returns Returns `object`.
          * @example
          *
          * function Foo() {
@@ -14585,19 +11816,19 @@ declare namespace _ {
         /**
          * @see _.assign
          */
-        assign<TResult>(
+        assign(
             object: any,
             ...otherArgs: any[]
-        ): TResult;
+        ): any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.assign
          */
         assign<TSource>(
             source: TSource
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see assign
@@ -14605,7 +11836,7 @@ declare namespace _ {
         assign<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assign
@@ -14614,7 +11845,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assign
@@ -14624,26 +11855,26 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assign
          */
-        assign(): LoDashImplicitObjectWrapper<T>;
+        assign(): LoDashImplicitWrapper<TValue>;
 
         /**
          * @see _.assign
          */
-        assign<TResult>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+        assign(...otherArgs: any[]): LoDashImplicitWrapper<any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.assign
          */
         assign<TSource>(
             source: TSource
-        ): LoDashExplicitObjectWrapper<T & TSource>;
+        ): LoDashExplicitWrapper<TValue & TSource>;
 
         /**
          * @see assign
@@ -14651,7 +11882,7 @@ declare namespace _ {
         assign<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assign
@@ -14660,7 +11891,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assign
@@ -14670,17 +11901,17 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assign
          */
-        assign(): LoDashExplicitObjectWrapper<T>;
+        assign(): LoDashExplicitWrapper<TValue>;
 
         /**
          * @see _.assign
          */
-        assign<TResult>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+        assign(...otherArgs: any[]): LoDashExplicitWrapper<any>;
     }
 
     interface LoDashStatic {
@@ -14692,13 +11923,11 @@ declare namespace _ {
          *
          * **Note:** This method mutates `object`.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} sources The source objects.
-         * @param {Function} [customizer] The function to customize assigned values.
-         * @returns {Object} Returns `object`.
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @param [customizer] The function to customize assigned values.
+         * @returns Returns `object`.
          * @example
          *
          * function customizer(objValue, srcValue) {
@@ -14763,14 +11992,14 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.assignWith
          */
         assignWith<TSource>(
             source: TSource,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see assignWith
@@ -14779,7 +12008,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assignWith
@@ -14789,7 +12018,7 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assignWith
@@ -14800,27 +12029,27 @@ declare namespace _ {
             source3: TSource3,
             source4: TSource4,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignWith
          */
-        assignWith(): LoDashImplicitObjectWrapper<T>;
+        assignWith(): LoDashImplicitWrapper<TValue>;
 
         /**
          * @see _.assignWith
          */
-        assignWith<TResult>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+        assignWith<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.assignWith
          */
         assignWith<TSource>(
             source: TSource,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource>;
+        ): LoDashExplicitWrapper<TValue & TSource>;
 
         /**
          * @see assignWith
@@ -14829,7 +12058,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assignWith
@@ -14839,7 +12068,7 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assignWith
@@ -14850,17 +12079,17 @@ declare namespace _ {
             source3: TSource3,
             source4: TSource4,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignWith
          */
-        assignWith(): LoDashExplicitObjectWrapper<T>;
+        assignWith(): LoDashExplicitWrapper<TValue>;
 
         /**
          * @see _.assignWith
          */
-        assignWith<TResult>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+        assignWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
     }
 
     //_.assignIn
@@ -14871,13 +12100,11 @@ declare namespace _ {
          *
          * **Note:** This method mutates `object`.
          *
-         * @static
-         * @memberOf _
          * @alias extend
          * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} [sources] The source objects.
-         * @returns {Object} Returns `object`.
+         * @param object The destination object.
+         * @param [sources] The source objects.
+         * @returns Returns `object`.
          * @example
          *
          * function Foo() {
@@ -14943,13 +12170,13 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.assignIn
          */
         assignIn<TSource>(
             source: TSource
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see assignIn
@@ -14957,7 +12184,7 @@ declare namespace _ {
         assignIn<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assignIn
@@ -14966,7 +12193,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assignIn
@@ -14976,26 +12203,26 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignIn
          */
-        assignIn(): LoDashImplicitObjectWrapper<T>;
+        assignIn(): LoDashImplicitWrapper<TValue>;
 
         /**
          * @see _.assignIn
          */
-        assignIn<TResult>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+        assignIn<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.assignIn
          */
         assignIn<TSource>(
             source: TSource
-        ): LoDashExplicitObjectWrapper<T & TSource>;
+        ): LoDashExplicitWrapper<TValue & TSource>;
 
         /**
          * @see assignIn
@@ -15003,7 +12230,7 @@ declare namespace _ {
         assignIn<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assignIn
@@ -15012,7 +12239,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assignIn
@@ -15022,17 +12249,17 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignIn
          */
-        assignIn(): LoDashExplicitObjectWrapper<T>;
+        assignIn(): LoDashExplicitWrapper<TValue>;
 
         /**
          * @see _.assignIn
          */
-        assignIn<TResult>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+        assignIn(...otherArgs: any[]): LoDashExplicitWrapper<any>;
     }
 
     //_.assignInWith
@@ -15047,14 +12274,12 @@ declare namespace _ {
          *
          * **Note:** This method mutates `object`.
          *
-         * @static
-         * @memberOf _
          * @alias extendWith
          * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} sources The source objects.
-         * @param {Function} [customizer] The function to customize assigned values.
-         * @returns {Object} Returns `object`.
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @param [customizer] The function to customize assigned values.
+         * @returns Returns `object`.
          * @example
          *
          * function customizer(objValue, srcValue) {
@@ -15119,14 +12344,14 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.assignInWith
          */
         assignInWith<TSource>(
             source: TSource,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see assignInWith
@@ -15135,7 +12360,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assignInWith
@@ -15145,7 +12370,7 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assignInWith
@@ -15156,27 +12381,27 @@ declare namespace _ {
             source3: TSource3,
             source4: TSource4,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignInWith
          */
-        assignInWith(): LoDashImplicitObjectWrapper<T>;
+        assignInWith(): LoDashImplicitWrapper<TValue>;
 
         /**
          * @see _.assignInWith
          */
-        assignInWith<TResult>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+        assignInWith<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.assignInWith
          */
         assignInWith<TSource>(
             source: TSource,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource>;
+        ): LoDashExplicitWrapper<TValue & TSource>;
 
         /**
          * @see assignInWith
@@ -15185,7 +12410,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see assignInWith
@@ -15195,7 +12420,7 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see assignInWith
@@ -15206,17 +12431,17 @@ declare namespace _ {
             source3: TSource3,
             source4: TSource4,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignInWith
          */
-        assignInWith(): LoDashExplicitObjectWrapper<T>;
+        assignInWith(): LoDashExplicitWrapper<TValue>;
 
         /**
          * @see _.assignInWith
          */
-        assignInWith<TResult>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+        assignInWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
     }
 
     //_.create
@@ -15229,24 +12454,24 @@ declare namespace _ {
          * @param properties The properties to assign to the object.
          * @return Returns the new object.
          */
-        create<T extends Object, U extends Object>(
+        create<T extends object, U extends object>(
             prototype: T,
             properties?: U
         ): T & U;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.create
          */
-        create<U extends Object>(properties?: U): LoDashImplicitObjectWrapper<T & U>;
+        create<U extends object>(properties?: U): LoDashImplicitWrapper<TValue & U>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.create
          */
-        create<U extends Object>(properties?: U): LoDashExplicitObjectWrapper<T & U>;
+        create<U extends object>(properties?: U): LoDashExplicitWrapper<TValue & U>;
     }
 
     //_.defaults
@@ -15305,19 +12530,19 @@ declare namespace _ {
         /**
          * @see _.defaults
          */
-        defaults<TResult>(
+        defaults(
             object: any,
             ...sources: any[]
-        ): TResult;
+        ): any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.defaults
          */
         defaults<TSource>(
             source: TSource
-        ): LoDashImplicitObjectWrapper<TSource & T>;
+        ): LoDashImplicitWrapper<TSource & TValue>;
 
         /**
          * @see _.defaults
@@ -15325,7 +12550,7 @@ declare namespace _ {
         defaults<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashImplicitObjectWrapper<TSource2 & TSource1 & T>;
+        ): LoDashImplicitWrapper<TSource2 & TSource1 & TValue>;
 
         /**
          * @see _.defaults
@@ -15334,7 +12559,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashImplicitObjectWrapper<TSource3 & TSource2 & TSource1 & T>;
+        ): LoDashImplicitWrapper<TSource3 & TSource2 & TSource1 & TValue>;
 
         /**
          * @see _.defaults
@@ -15344,26 +12569,26 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashImplicitObjectWrapper<TSource4 & TSource3 & TSource2 & TSource1 & T>;
+        ): LoDashImplicitWrapper<TSource4 & TSource3 & TSource2 & TSource1 & TValue>;
 
         /**
          * @see _.defaults
          */
-        defaults(): LoDashImplicitObjectWrapper<T>;
+        defaults(): LoDashImplicitWrapper<TValue>;
 
         /**
          * @see _.defaults
          */
-        defaults<TResult>(...sources: any[]): LoDashImplicitObjectWrapper<TResult>;
+        defaults(...sources: any[]): LoDashImplicitWrapper<any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.defaults
          */
         defaults<TSource>(
             source: TSource
-        ): LoDashExplicitObjectWrapper<TSource & T>;
+        ): LoDashExplicitWrapper<TSource & TValue>;
 
         /**
          * @see _.defaults
@@ -15371,7 +12596,7 @@ declare namespace _ {
         defaults<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashExplicitObjectWrapper<TSource2 & TSource1 & T>;
+        ): LoDashExplicitWrapper<TSource2 & TSource1 & TValue>;
 
         /**
          * @see _.defaults
@@ -15380,7 +12605,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashExplicitObjectWrapper<TSource3 & TSource2 & TSource1 & T>;
+        ): LoDashExplicitWrapper<TSource3 & TSource2 & TSource1 & TValue>;
 
         /**
          * @see _.defaults
@@ -15390,17 +12615,17 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashExplicitObjectWrapper<TSource4 & TSource3 & TSource2 & TSource1 & T>;
+        ): LoDashExplicitWrapper<TSource4 & TSource3 & TSource2 & TSource1 & TValue>;
 
         /**
          * @see _.defaults
          */
-        defaults(): LoDashExplicitObjectWrapper<T>;
+        defaults(): LoDashExplicitWrapper<TValue>;
 
         /**
          * @see _.defaults
          */
-        defaults<TResult>(...sources: any[]): LoDashExplicitObjectWrapper<TResult>;
+        defaults(...sources: any[]): LoDashExplicitWrapper<any>;
     }
 
     //_.defaultsDeep
@@ -15411,16 +12636,23 @@ declare namespace _ {
          * @param sources The source objects.
          * @return Returns object.
          **/
-        defaultsDeep<T, TResult>(
-            object: T,
-            ...sources: any[]): TResult;
+        defaultsDeep(
+            object: any,
+            ...sources: any[]): any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.defaultsDeep
          **/
-        defaultsDeep<TResult>(...sources: any[]): LoDashImplicitObjectWrapper<TResult>;
+        defaultsDeep(...sources: any[]): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.defaultsDeep
+         **/
+        defaultsDeep(...sources: any[]): LoDashExplicitWrapper<any>;
     }
 
     //_.entries
@@ -15428,23 +12660,36 @@ declare namespace _ {
         /**
          * @see _.toPairs
          */
-        entries<T extends {}>(object?: T): [string, any][];
+        entries<T>(object?: Dictionary<T>): Array<[string, T]>;
 
-        entries<T extends {}, TResult>(object?: T): [string, TResult][];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.toPairs
          */
-        entries<TResult>(): LoDashImplicitArrayWrapper<[string, TResult]>;
+        entries(object?: object): Array<[string, any]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toPairs
          */
-        entries<TResult>(): LoDashExplicitArrayWrapper<[string, TResult]>;
+        entries<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        entries(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPairs
+         */
+        entries<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        entries(): LoDashExplicitWrapper<Array<[string, any]>>;
     }
 
     //_.entriesIn
@@ -15452,23 +12697,36 @@ declare namespace _ {
         /**
          * @see _.toPairsIn
          */
-        entriesIn<T extends {}>(object?: T): [string, any][];
+        entriesIn<T>(object?: Dictionary<T>): Array<[string, T]>;
 
-        entriesIn<T extends {}, TResult>(object?: T): [string, TResult][];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.toPairsIn
          */
-        entriesIn<TResult>(): LoDashImplicitArrayWrapper<[string, TResult]>;
+        entriesIn(object?: object): Array<[string, any]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toPairsIn
          */
-        entriesIn<TResult>(): LoDashExplicitArrayWrapper<[string, TResult]>;
+        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairsIn
+         */
+        entriesIn(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPairsIn
+         */
+        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairsIn
+         */
+        entriesIn(): LoDashExplicitWrapper<Array<[string, any]>>;
     }
 
     // _.extend
@@ -15525,13 +12783,13 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.assignIn
          */
         extend<TSource>(
             source: TSource
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see _.assignIn
@@ -15539,7 +12797,7 @@ declare namespace _ {
         extend<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see _.assignIn
@@ -15548,7 +12806,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see _.assignIn
@@ -15558,26 +12816,26 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignIn
          */
-        extend(): LoDashImplicitObjectWrapper<T>;
+        extend(): LoDashImplicitWrapper<TValue>;
 
         /**
          * @see _.assignIn
          */
-        extend<TResult>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+        extend(...otherArgs: any[]): LoDashImplicitWrapper<any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.assignIn
          */
         extend<TSource>(
             source: TSource
-        ): LoDashExplicitObjectWrapper<T & TSource>;
+        ): LoDashExplicitWrapper<TValue & TSource>;
 
         /**
          * @see _.assignIn
@@ -15585,7 +12843,7 @@ declare namespace _ {
         extend<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see _.assignIn
@@ -15594,7 +12852,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see _.assignIn
@@ -15604,17 +12862,17 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignIn
          */
-        extend(): LoDashExplicitObjectWrapper<T>;
+        extend(): LoDashExplicitWrapper<TValue>;
 
         /**
          * @see _.assignIn
          */
-        extend<TResult>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+        extend(...otherArgs: any[]): LoDashExplicitWrapper<any>;
     }
 
     interface LoDashStatic {
@@ -15674,14 +12932,14 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.assignInWith
          */
         extendWith<TSource>(
             source: TSource,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see _.assignInWith
@@ -15690,7 +12948,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see _.assignInWith
@@ -15700,7 +12958,7 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see _.assignInWith
@@ -15711,27 +12969,27 @@ declare namespace _ {
             source3: TSource3,
             source4: TSource4,
             customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignInWith
          */
-        extendWith(): LoDashImplicitObjectWrapper<T>;
+        extendWith(): LoDashImplicitWrapper<TValue>;
 
         /**
          * @see _.assignInWith
          */
-        extendWith<TResult>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+        extendWith(...otherArgs: any[]): LoDashImplicitWrapper<any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.assignInWith
          */
         extendWith<TSource>(
             source: TSource,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource>;
+        ): LoDashExplicitWrapper<TValue & TSource>;
 
         /**
          * @see _.assignInWith
@@ -15740,7 +12998,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see _.assignInWith
@@ -15750,7 +13008,7 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see _.assignInWith
@@ -15761,17 +13019,17 @@ declare namespace _ {
             source3: TSource3,
             source4: TSource4,
             customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.assignInWith
          */
-        extendWith(): LoDashExplicitObjectWrapper<T>;
+        extendWith(): LoDashExplicitWrapper<TValue>;
 
         /**
          * @see _.assignInWith
          */
-        extendWith<TResult>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+        extendWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
     }
 
     //_.findKey
@@ -15794,93 +13052,29 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the key of the matched element, else undefined.
          */
-        findKey<TValues, TObject>(
-            object: TObject,
-            predicate?: DictionaryIterator<TValues, boolean>
-        ): string | undefined;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TObject>(
-            object: TObject,
-            predicate?: ObjectIterator<any, boolean>
-        ): string | undefined;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TObject>(
-            object: TObject,
-            predicate?: string
-        ): string | undefined;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TWhere extends Dictionary<any>, TObject>(
-            object: TObject,
-            predicate?: TWhere
+        findKey<T>(
+            object: T | null | undefined,
+            predicate?: ObjectIteratee<T>
         ): string | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.findKey
          */
-        findKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>
-        ): string | undefined;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: ObjectIterator<any, boolean>
-        ): string | undefined;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: string
-        ): string | undefined;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
+        findKey<T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
         ): string | undefined;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.findKey
          */
-        findKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>
-        ): LoDashExplicitWrapper<string | undefined>;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: ObjectIterator<any, boolean>
-        ): LoDashExplicitWrapper<string | undefined>;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: string
-        ): LoDashExplicitWrapper<string | undefined>;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
+        findKey<T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
         ): LoDashExplicitWrapper<string | undefined>;
     }
 
@@ -15903,93 +13097,29 @@ declare namespace _ {
          * @param thisArg The this binding of predicate.
          * @return Returns the key of the matched element, else undefined.
          */
-        findLastKey<TValues, TObject>(
-            object: TObject,
-            predicate?: DictionaryIterator<TValues, boolean>
-        ): string | undefined;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TObject>(
-            object: TObject,
-            predicate?: ObjectIterator<any, boolean>
-        ): string | undefined;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TObject>(
-            object: TObject,
-            predicate?: string
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TWhere extends Dictionary<any>, TObject>(
-            object: TObject,
-            predicate?: TWhere
+        findLastKey<T>(
+            object: T | null | undefined,
+            predicate?: ObjectIteratee<T>
         ): string | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.findLastKey
          */
-        findLastKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: ObjectIterator<any, boolean>
-        ): string | undefined;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: string
-        ): string | undefined;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
+        findLastKey<T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
         ): string | undefined;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.findLastKey
          */
-        findLastKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>
-        ): LoDashExplicitWrapper<string | undefined>;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: ObjectIterator<any, boolean>
-        ): LoDashExplicitWrapper<string | undefined>;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: string
-        ): LoDashExplicitWrapper<string | undefined>;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
+        findLastKey<T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
         ): LoDashExplicitWrapper<string | undefined>;
     }
 
@@ -16006,43 +13136,27 @@ declare namespace _ {
          * @return Returns object.
          */
         forIn<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T>;
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
 
         /**
          * @see _.forIn
          */
         forIn<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T> | null | undefined;
-
-        /**
-         * @see _.forIn
-         */
-        forIn<T extends {} | null | undefined>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>
-        ): T;
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.forIn
          */
-        forIn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forIn
-         */
-        forIn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
+        forIn<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.forInRight
@@ -16056,43 +13170,27 @@ declare namespace _ {
          * @return Returns object.
          */
         forInRight<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T>;
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
 
         /**
          * @see _.forInRight
          */
         forInRight<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T> | null | undefined;
-
-        /**
-         * @see _.forInRight
-         */
-        forInRight<T extends {} | null | undefined>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>
-        ): T;
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.forInRight
          */
-        forInRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forInRight
-         */
-        forInRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
+        forInRight<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.forOwn
@@ -16108,43 +13206,27 @@ declare namespace _ {
          * @return Returns object.
          */
         forOwn<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T>;
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
 
         /**
          * @see _.forOwn
          */
         forOwn<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T> | null | undefined;
-
-        /**
-         * @see _.forOwn
-         */
-        forOwn<T extends {} | null | undefined>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>
-        ): T;
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.forOwn
          */
-        forOwn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forOwn
-         */
-        forOwn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
+        forOwn<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.forOwnRight
@@ -16158,43 +13240,27 @@ declare namespace _ {
          * @return Returns object.
          */
         forOwnRight<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T>;
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
 
         /**
          * @see _.forOwnRight
          */
         forOwnRight<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, any>
-        ): Dictionary<T> | null | undefined;
-
-        /**
-         * @see _.forOwnRight
-         */
-        forOwnRight<T extends {} | null | undefined>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>
-        ): T;
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashWrapper<TValue> {
         /**
          * @see _.forOwnRight
          */
-        forOwnRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.forOwnRight
-         */
-        forOwnRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>
-        ): TWrapper;
+        forOwnRight<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
     }
 
     //_.functions
@@ -16203,11 +13269,9 @@ declare namespace _ {
          * Creates an array of function property names from own enumerable properties
          * of `object`.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The object to inspect.
-         * @returns {Array} Returns the new array of property names.
+         * @param object The object to inspect.
+         * @returns Returns the new array of property names.
          * @example
          *
          * function Foo() {
@@ -16220,21 +13284,21 @@ declare namespace _ {
          * _.functions(new Foo);
          * // => ['a', 'b']
          */
-        functions<T extends {}>(object: any): string[];
+        functions(object: any): string[];
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.functions
          */
-        functions(): _.LoDashImplicitArrayWrapper<string>;
+        functions(): LoDashImplicitWrapper<string[]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.functions
          */
-        functions(): _.LoDashExplicitArrayWrapper<string>;
+        functions(): LoDashExplicitWrapper<string[]>;
     }
 
     //_.functionsIn
@@ -16243,11 +13307,9 @@ declare namespace _ {
          * Creates an array of function property names from own and inherited
          * enumerable properties of `object`.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The object to inspect.
-         * @returns {Array} Returns the new array of property names.
+         * @param object The object to inspect.
+         * @returns Returns the new array of property names.
          * @example
          *
          * function Foo() {
@@ -16263,18 +13325,18 @@ declare namespace _ {
         functionsIn<T extends {}>(object: any): string[];
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.functionsIn
          */
-        functionsIn(): _.LoDashImplicitArrayWrapper<string>;
+        functionsIn(): LoDashImplicitWrapper<string[]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.functionsIn
          */
-        functionsIn(): _.LoDashExplicitArrayWrapper<string>;
+        functionsIn(): LoDashExplicitWrapper<string[]>;
     }
 
     //_.get
@@ -16288,80 +13350,230 @@ declare namespace _ {
          * @param defaultValue The value returned if the resolved value is undefined.
          * @return Returns the resolved value.
          */
-        get<TObject, TResult>(
+        get<TObject extends object, TKey extends keyof TObject>(
             object: TObject,
-            path: Many<StringRepresentable>,
-            defaultValue?: TResult
-        ): TResult;
+            path: TKey | [TKey]
+        ): TObject[TKey];
 
         /**
          * @see _.get
          */
-        get<TResult>(
+        get<TObject extends object, TKey extends keyof TObject>(
+            object: TObject | null | undefined,
+            path: TKey | [TKey]
+        ): TObject[TKey] | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject, TDefault>(
+            object: TObject | null | undefined,
+            path: TKey | [TKey],
+            defaultValue: TDefault
+        ): TObject[TKey] | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            object: NumericDictionary<T>,
+            path: number
+        ): T;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            object: NumericDictionary<T> | null | undefined,
+            path: number
+        ): T | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            object: NumericDictionary<T> | null | undefined,
+            path: number,
+            defaultValue: TDefault
+        ): T | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<TDefault>(
+            object: null | undefined,
+            path: PropertyPath,
+            defaultValue: TDefault
+        ): TDefault;
+
+        /**
+         * @see _.get
+         */
+        get(
+            object: null | undefined,
+            path: PropertyPath
+        ): undefined;
+
+        /**
+         * @see _.get
+         */
+        get(
             object: any,
-            path: Many<StringRepresentable>,
-            defaultValue?: TResult
-        ): TResult;
+            path: PropertyPath,
+            defaultValue?: any
+        ): any;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.get
+         */
+        get<TKey extends keyof TValue>(
+            path: TKey | [TKey]
+        ): TValue[TKey];
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject>(
+            this: LoDashImplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+        ): TObject[TKey] | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject, TDefault>(
+            this: LoDashImplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+            defaultValue: TDefault
+        ): TObject[TKey] | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T>>,
+            path: number
+        ): T;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number
+        ): T | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number,
+            defaultValue: TDefault
+        ): T | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<TDefault>(
+            this: LoDashImplicitWrapper<null | undefined>,
+            path: PropertyPath,
+            defaultValue: TDefault
+        ): TDefault;
+
+        /**
+         * @see _.get
+         */
+        get(
+            this: LoDashImplicitWrapper<null | undefined>,
+            path: PropertyPath
+        ): undefined;
+
         /**
          * @see _.get
          */
         get<TResult>(
-            path: Many<StringRepresentable>,
-            defaultValue?: TResult
-        ): TResult;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.get
-         */
-        get<TResult>(
-            path: Many<StringRepresentable>,
-            defaultValue?: TResult
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.get
-         */
-        get<TResult>(
-            path: Many<StringRepresentable>,
-            defaultValue?: TResult
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.get
-         */
-        get<TResultWrapper>(
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             defaultValue?: any
-        ): TResultWrapper;
+        ): any;
     }
 
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.get
          */
-        get<TResultWrapper>(
-            path: Many<StringRepresentable>,
-            defaultValue?: any
-        ): TResultWrapper;
-    }
+        get<TKey extends keyof TValue>(
+            path: TKey | [TKey]
+        ): LoDashExplicitWrapper<TValue[TKey]>;
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.get
          */
-        get<TResultWrapper>(
-            path: Many<StringRepresentable>,
+        get<TObject extends object, TKey extends keyof TObject>(
+            this: LoDashExplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+        ): LoDashExplicitWrapper<TObject[TKey] | undefined>;
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject, TDefault>(
+            this: LoDashExplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<TObject[TKey] | TDefault>;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T>>,
+            path: number
+        ): LoDashExplicitWrapper<T>;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number,
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.get
+         */
+        get<TDefault>(
+            this: LoDashExplicitWrapper<null | undefined>,
+            path: PropertyPath,
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<TDefault>;
+
+        /**
+         * @see _.get
+         */
+        get(
+            this: LoDashExplicitWrapper<null | undefined>,
+            path: PropertyPath
+        ): LoDashExplicitWrapper<undefined>;
+
+        /**
+         * @see _.get
+         */
+        get(
+            path: PropertyPath,
             defaultValue?: any
-        ): TResultWrapper;
+        ): LoDashExplicitWrapper<any>;
     }
 
     //_.has
@@ -16369,12 +13581,10 @@ declare namespace _ {
         /**
          * Checks if `path` is a direct property of `object`.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The object to query.
-         * @param {Array|string} path The path to check.
-         * @returns {boolean} Returns `true` if `path` exists, else `false`.
+         * @param object The object to query.
+         * @param path The path to check.
+         * @returns Returns `true` if `path` exists, else `false`.
          * @example
          *
          * var object = { 'a': { 'b': { 'c': 3 } } };
@@ -16392,24 +13602,24 @@ declare namespace _ {
          * _.has(other, 'a');
          * // => false
          */
-        has<T extends {}>(
+        has<T>(
             object: T,
-            path: Many<StringRepresentable>
+            path: PropertyPath
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.has
          */
-        has(path: Many<StringRepresentable>): boolean;
+        has(path: PropertyPath): boolean;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.has
          */
-        has(path: Many<StringRepresentable>): LoDashExplicitWrapper<boolean>;
+        has(path: PropertyPath): LoDashExplicitWrapper<boolean>;
     }
 
     //_.hasIn
@@ -16417,12 +13627,10 @@ declare namespace _ {
         /**
          * Checks if `path` is a direct or inherited property of `object`.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The object to query.
-         * @param {Array|string} path The path to check.
-         * @returns {boolean} Returns `true` if `path` exists, else `false`.
+         * @param object The object to query.
+         * @param path The path to check.
+         * @returns Returns `true` if `path` exists, else `false`.
          * @example
          *
          * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
@@ -16439,24 +13647,24 @@ declare namespace _ {
          * _.hasIn(object, 'b');
          * // => false
          */
-        hasIn<T extends {}>(
+        hasIn<T>(
             object: T,
-            path: Many<StringRepresentable>
+            path: PropertyPath
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.hasIn
          */
-        hasIn(path: Many<StringRepresentable>): boolean;
+        hasIn(path: PropertyPath): boolean;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.hasIn
          */
-        hasIn(path: Many<StringRepresentable>): LoDashExplicitWrapper<boolean>;
+        hasIn(path: PropertyPath): LoDashExplicitWrapper<boolean>;
     }
 
     //_.invert
@@ -16469,37 +13677,26 @@ declare namespace _ {
          * @param multiValue Allow multiple values per key.
          * @return Returns the new inverted object.
          */
-        invert<T extends {}, TResult extends {}>(
-            object: T,
-            multiValue?: boolean
-        ): TResult;
+        invert(
+            object: object
+        ): Dictionary<string>;
+    }
 
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.invert
          */
-        invert<TResult extends {}>(
-            object: Object,
-            multiValue?: boolean
-        ): TResult;
+        invert(): LoDashImplicitWrapper<Dictionary<string>>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.invert
          */
-        invert<TResult extends {}>(multiValue?: boolean): LoDashImplicitObjectWrapper<TResult>;
+        invert(): LoDashExplicitWrapper<Dictionary<string>>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.invert
-         */
-        invert<TResult extends {}>(multiValue?: boolean): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.inverBy
-    type InvertByIterator<T> = (value: T) => any;
-
+    //_.invertBy
     interface LoDashStatic {
         /**
          * This method is like _.invert except that the inverted object is generated from the results of running each
@@ -16510,116 +13707,54 @@ declare namespace _ {
          * @param interatee The iteratee invoked per element.
          * @return Returns the new inverted object.
          */
-        invertBy(
-            object: Object,
-            interatee?: InvertByIterator<any>|string
+        invertBy<T>(
+            object: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
+            interatee?: ValueIteratee<T>
         ): Dictionary<string[]>;
 
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T extends object>(
+            object: T | null | undefined,
+            interatee?: ValueIteratee<T[keyof T]>
+        ): Dictionary<string[]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.invertBy
          */
         invertBy<T>(
-            object: _.Dictionary<T>|_.NumericDictionary<T>,
-            interatee?: InvertByIterator<T>|string
-        ): Dictionary<string[]>;
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            interatee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<string[]>>;
 
         /**
          * @see _.invertBy
          */
-        invertBy<W>(
-            object: Object,
-            interatee?: W
-        ): Dictionary<string[]>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T, W>(
-            object: _.Dictionary<T>,
-            interatee?: W
-        ): Dictionary<string[]>;
+        invertBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            interatee?: ValueIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<Dictionary<string[]>>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.invertBy
          */
-        invertBy(
-            interatee?: InvertByIterator<any>
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<T>|string
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+        invertBy<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            interatee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<string[]>>;
 
         /**
          * @see _.invertBy
          */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<any>|string
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<any>
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<T>|string
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<any>|string
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+        invertBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            interatee?: ValueIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<Dictionary<string[]>>;
     }
 
     //_.keys
@@ -16635,18 +13770,18 @@ declare namespace _ {
         keys(object?: any): string[];
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.keys
          */
-        keys(): LoDashImplicitArrayWrapper<string>;
+        keys(): LoDashImplicitWrapper<string[]>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.keys
          */
-        keys(): LoDashExplicitArrayWrapper<string>;
+        keys(): LoDashExplicitWrapper<string[]>;
     }
 
     //_.keysIn
@@ -16662,18 +13797,18 @@ declare namespace _ {
         keysIn(object?: any): string[];
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.keysIn
          */
-        keysIn(): LoDashImplicitArrayWrapper<string>;
+        keysIn(): LoDashImplicitWrapper<string[]>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.keysIn
          */
-        keysIn(): LoDashExplicitArrayWrapper<string>;
+        keysIn(): LoDashExplicitWrapper<string[]>;
     }
 
     //_.mapKeys
@@ -16687,126 +13822,78 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the new mapped object.
          */
-        mapKeys<T, TKey>(
+        mapKeys<T>(
             object: List<T> | null | undefined,
-            iteratee?: ListIterator<T, TKey>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T, TKey>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIterator<T, TKey>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T, TObject extends {}>(
-            object: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: TObject
+            iteratee?: ListIteratee<T>
         ): Dictionary<T>;
 
         /**
          * @see _.mapKeys
          */
         mapKeys<T>(
-            object: List<T>|Dictionary<T> | null | undefined,
-            iteratee?: string
+            object: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIteratee<T>
         ): Dictionary<T>;
-    }
-
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TKey>(
-            iteratee?: ListIterator<T, TKey>
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapKeys
          */
         mapKeys(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+            object: object | null | undefined,
+            iteratee?: ObjectIteratee<any>
+        ): Dictionary<any>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.mapKeys
          */
-        mapKeys<TResult, TKey>(
-            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+        mapKeys<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapKeys
          */
-        mapKeys<TResult, TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TResult>(
-            iteratee?: string
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TKey>(
-            iteratee?: ListIterator<T, TKey>
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+        mapKeys<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee?: DictionaryIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapKeys
          */
         mapKeys(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee?: ObjectIteratee<any>
+        ): LoDashImplicitWrapper<Dictionary<any>>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.mapKeys
          */
-        mapKeys<TResult, TKey>(
-            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>
-        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+        mapKeys<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapKeys
          */
-        mapKeys<TResult, TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+        mapKeys<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee?: DictionaryIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapKeys
          */
-        mapKeys<TResult>(
-            iteratee?: string
-        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+        mapKeys(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee?: ObjectIteratee<any>
+        ): LoDashExplicitWrapper<Dictionary<any>>;
     }
 
     //_.mapValues
@@ -16825,61 +13912,176 @@ declare namespace _ {
         * 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 {Object} object The object to iterate over.
-        * @param {Function|Object|string} [iteratee=_.identity]  The function invoked per iteration.
-        * @param {Object} [thisArg] The `this` binding of `iteratee`.
-        * @return {Object} Returns the new mapped object.
+        * @param object The object to iterate over.
+        * @param [iteratee=_.identity]  The function invoked per iteration.
+        * @param [thisArg] The `this` binding of `iteratee`.
+        * @return Returns the new mapped object.
         */
-        mapValues<T, TResult>(obj: Dictionary<T> | null | undefined, callback: ObjectIterator<T, TResult>): Dictionary<TResult>;
-        mapValues<T>(obj: Dictionary<T> | null | undefined, where: Dictionary<T>): Dictionary<boolean>;
-        mapValues<T, TMapped>(obj: T | null | undefined, pluck?: string): TMapped;
-        mapValues<T>(obj: T | null | undefined, callback: ObjectIterator<any, any>): T;
+        mapValues<T extends object, TResult>(obj: T | null | undefined, callback: ObjectIterator<T, TResult>): { [P in keyof T]: TResult };
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(obj: T | null | undefined, iteratee: object): { [P in keyof T]: boolean };
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TKey extends keyof T>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T>(obj: Dictionary<T> | null | undefined): Dictionary<T>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(obj: T): T;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(obj: T | null | undefined): T | {};
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues(obj: string | null | undefined): NumericDictionary<string>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.mapValues
-         * TValue is the type of the property values of T.
-         * TResult is the type output by the ObjectIterator function
          */
-        mapValues<TValue, TResult>(callback: ObjectIterator<TValue, TResult>): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+        mapValues<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: ObjectIterator<T, TResult>
+        ): LoDashImplicitWrapper<{ [P in keyof T]: TResult }>;
 
         /**
          * @see _.mapValues
-         * TResult is the type of the property specified by pluck.
-         * T should be a Dictionary<Dictionary<TResult>>
          */
-        mapValues<TResult>(pluck?: string): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+        mapValues<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: object
+        ): LoDashImplicitWrapper<{ [P in keyof T]: boolean }>;
 
         /**
          * @see _.mapValues
-         * TResult is the type of the properties of each object in the values of T
-         * T should be a Dictionary<Dictionary<TResult>>
          */
-        mapValues<TResult>(where: Dictionary<TResult>): LoDashImplicitArrayWrapper<boolean>;
+        mapValues<T, TKey extends keyof T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: TKey
+        ): LoDashImplicitWrapper<Dictionary<T[TKey]>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TKey extends keyof T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: string
+        ): LoDashImplicitWrapper<{ [P in keyof T]: any }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<T>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<T | {}>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.mapValues
-         * TValue is the type of the property values of T.
-         * TResult is the type output by the ObjectIterator function
          */
-        mapValues<TValue, TResult>(callback: ObjectIterator<TValue, TResult>): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+        mapValues<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: ObjectIterator<T, TResult>
+        ): LoDashExplicitWrapper<{ [P in keyof T]: TResult }>;
 
         /**
          * @see _.mapValues
-         * TResult is the type of the property specified by pluck.
-         * T should be a Dictionary<Dictionary<TResult>>
          */
-        mapValues<TResult>(pluck?: string): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+        mapValues<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: object
+        ): LoDashExplicitWrapper<{ [P in keyof T]: boolean }>;
 
         /**
          * @see _.mapValues
-         * TResult is the type of the properties of each object in the values of T
-         * T should be a Dictionary<Dictionary<TResult>>
          */
-        mapValues<TResult>(where: Dictionary<TResult>): LoDashExplicitObjectWrapper<boolean>;
+        mapValues<T, TKey extends keyof T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: TKey
+        ): LoDashExplicitWrapper<Dictionary<T[TKey]>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TKey extends keyof T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: string
+        ): LoDashExplicitWrapper<{ [P in keyof T]: any }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashExplicitWrapper<T>): LoDashExplicitWrapper<T>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<T | {}>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
     }
 
     //_.merge
@@ -16894,12 +14096,10 @@ declare namespace _ {
          *
          * **Note:** This method mutates `object`.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} [sources] The source objects.
-         * @returns {Object} Returns `object`.
+         * @param object The destination object.
+         * @param [sources] The source objects.
+         * @returns Returns `object`.
          * @example
          *
          * var users = {
@@ -16951,19 +14151,19 @@ declare namespace _ {
         /**
          * @see _.merge
          */
-        merge<TResult>(
+        merge(
             object: any,
             ...otherArgs: any[]
-        ): TResult;
+        ): any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.merge
          */
         merge<TSource>(
             source: TSource
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see _.merge
@@ -16971,7 +14171,7 @@ declare namespace _ {
         merge<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see _.merge
@@ -16980,7 +14180,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see _.merge
@@ -16990,23 +14190,23 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             source4: TSource4
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.merge
          */
-        merge<TResult>(
+        merge(
             ...otherArgs: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
+        ): LoDashImplicitWrapper<any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.merge
          */
         merge<TSource>(
             source: TSource
-        ): LoDashExplicitObjectWrapper<T & TSource>;
+        ): LoDashExplicitWrapper<TValue & TSource>;
 
         /**
          * @see _.merge
@@ -17014,7 +14214,7 @@ declare namespace _ {
         merge<TSource1, TSource2>(
             source1: TSource1,
             source2: TSource2
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see _.merge
@@ -17023,20 +14223,20 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             source3: TSource3
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see _.merge
          */
         merge<TSource1, TSource2, TSource3, TSource4>(
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.merge
          */
-        merge<TResult>(
+        merge(
             ...otherArgs: any[]
-        ): LoDashExplicitObjectWrapper<TResult>;
+        ): LoDashExplicitWrapper<any>;
     }
 
     //_.mergeWith
@@ -17050,13 +14250,11 @@ declare namespace _ {
          * method instead. The `customizer` is invoked with seven arguments:
          * (objValue, srcValue, key, object, source, stack).
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} sources The source objects.
-         * @param {Function} customizer The function to customize assigned values.
-         * @returns {Object} Returns `object`.
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @param customizer The function to customize assigned values.
+         * @returns Returns `object`.
          * @example
          *
          * function customizer(objValue, srcValue) {
@@ -17120,20 +14318,20 @@ declare namespace _ {
         /**
          * @see _.mergeWith
          */
-        mergeWith<TResult>(
+        mergeWith(
             object: any,
             ...otherArgs: any[]
-        ): TResult;
+        ): any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.mergeWith
          */
         mergeWith<TSource>(
             source: TSource,
             customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource>;
+        ): LoDashImplicitWrapper<TValue & TSource>;
 
         /**
          * @see _.mergeWith
@@ -17142,7 +14340,7 @@ declare namespace _ {
             source1: TSource1,
             source2: TSource2,
             customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
 
         /**
          * @see _.mergeWith
@@ -17152,7 +14350,7 @@ declare namespace _ {
             source2: TSource2,
             source3: TSource3,
             customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
 
         /**
          * @see _.mergeWith
@@ -17163,14 +14361,14 @@ declare namespace _ {
             source3: TSource3,
             source4: TSource4,
             customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
          * @see _.mergeWith
          */
-        mergeWith<TResult>(
+        mergeWith(
             ...otherArgs: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
+        ): LoDashImplicitWrapper<any>;
     }
 
     //_.omit
@@ -17179,13 +14377,11 @@ declare namespace _ {
          * The opposite of `_.pick`; this method creates an object composed of the
          * own and inherited enumerable properties of `object` that are not omitted.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The source object.
-         * @param {...(string|string[])} [props] The property names to omit, specified
+         * @param object The source object.
+         * @param [paths] The property names to omit, specified
          *  individually or in arrays..
-         * @returns {Object} Returns the new object.
+         * @returns Returns the new object.
          * @example
          *
          * var object = { 'a': 1, 'b': '2', 'c': 3 };
@@ -17193,29 +14389,54 @@ declare namespace _ {
          * _.omit(object, ['a', 'c']);
          * // => { 'b': '2' }
          */
+        omit<T>(
+            object: Dictionary<T>,
+            ...paths: PropertyPath[]
+        ): Dictionary<T>;
 
-        omit<TResult extends {}, T extends {}>(
+        /**
+         * @see _.omit
+         */
+        omit<T extends object>(
             object: T | null | undefined,
-            ...predicate: Array<Many<StringRepresentable>>
-        ): TResult;
+            ...paths: PropertyPath[]
+        ): PartialObject<T>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.omit
          */
-        omit<TResult extends {}>(
-            ...predicate: Array<Many<StringRepresentable>>
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
+        omit<T>(
+            this: LoDashImplicitWrapper<Dictionary<T>>,
+            ...paths: PropertyPath[]
+        ): LoDashImplicitWrapper<Dictionary<T>>;
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.omit
          */
-        omit<TResult extends {}>(
-            ...predicate: Array<Many<StringRepresentable>>
-        ): LoDashExplicitObjectWrapper<TResult>;
+        omit<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...paths: PropertyPath[]
+        ): LoDashImplicitWrapper<PartialObject<T>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.omit
+         */
+        omit<T>(
+            this: LoDashExplicitWrapper<Dictionary<T>>,
+            ...paths: PropertyPath[]
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.omit
+         */
+        omit<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...paths: PropertyPath[]
+        ): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
     //_.omitBy
@@ -17225,12 +14446,10 @@ declare namespace _ {
          * own and inherited enumerable properties of `object` that `predicate`
          * doesn't return truthy for.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The source object.
-         * @param {Function|Object|string} [predicate=_.identity] The function invoked per property.
-         * @returns {Object} Returns the new object.
+         * @param object The source object.
+         * @param [predicate=_.identity] The function invoked per property.
+         * @returns Returns the new object.
          * @example
          *
          * var object = { 'a': 1, 'b': '2', 'c': 3 };
@@ -17238,28 +14457,30 @@ declare namespace _ {
          * _.omitBy(object, _.isNumber);
          * // => { 'b': '2' }
          */
-        omitBy<TResult extends {}, T extends {}>(
+        omitBy<T extends object>(
             object: T | null | undefined,
-            predicate: ObjectIterator<any, boolean>
-        ): TResult;
+            predicate: ValueKeyIteratee<T[keyof T]>
+        ): PartialObject<T>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.omitBy
          */
-        omitBy<TResult extends {}>(
-            predicate: ObjectIterator<any, boolean>
-        ): LoDashImplicitObjectWrapper<TResult>;
+        omitBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ValueKeyIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<PartialObject<T>>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.omitBy
          */
-        omitBy<TResult extends {}>(
-            predicate: ObjectIterator<any, boolean>
-        ): LoDashExplicitObjectWrapper<TResult>;
+        omitBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ValueKeyIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
     //_.pick
@@ -17267,13 +14488,11 @@ declare namespace _ {
         /**
          * Creates an object composed of the picked `object` properties.
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The source object.
-         * @param {...(string|string[])} [props] The property names to pick, specified
+         * @param object The source object.
+         * @param [props] The property names to pick, specified
          *  individually or in arrays.
-         * @returns {Object} Returns the new object.
+         * @returns Returns the new object.
          * @example
          *
          * var object = { 'a': 1, 'b': '2', 'c': 3 };
@@ -17281,42 +14500,66 @@ declare namespace _ {
          * _.pick(object, ['a', 'c']);
          * // => { 'a': 1, 'c': 3 }
          */
-        pick<TResult extends {}, T extends {}>(
+        pick<T extends object, U extends keyof T>(
+            object: T,
+             ...props: Array<Many<U>>
+        ): Pick<T, U>;
+
+        /**
+         * @see _.pick
+         */
+        pick<T>(
             object: T | null | undefined,
-            ...predicate: Array<Many<StringRepresentable>>
-        ): TResult;
+            ...props: PropertyPath[]
+        ): PartialDeep<T>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.pick
          */
-        pick<TResult extends {}>(
-            ...predicate: Array<Many<StringRepresentable>>
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
+        pick<T extends object, U extends keyof T>(
+            this: LoDashImplicitWrapper<T>,
+            ...props: Array<Many<U>>
+        ): LoDashImplicitWrapper<Pick<T, U>>;
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.pick
          */
-        pick<TResult extends {}>(
-            ...predicate: Array<Many<StringRepresentable>>
-        ): LoDashExplicitObjectWrapper<TResult>;
+        pick<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashImplicitWrapper<PartialObject<T>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pick
+         */
+        pick<T extends object, U extends keyof T>(
+            this: LoDashExplicitWrapper<T>,
+            ...props: Array<Many<U>>
+        ): LoDashExplicitWrapper<Pick<T, U>>;
+
+        /**
+         * @see _.pick
+         */
+        pick<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
     //_.pickBy
     interface LoDashStatic {
         /**
          * Creates an object composed of the `object` properties `predicate` returns
-         * truthy for. The predicate is invoked with one argument: (value).
+         * truthy for. The predicate is invoked with two arguments: (value, key).
          *
-         * @static
-         * @memberOf _
          * @category Object
-         * @param {Object} object The source object.
-         * @param {Function|Object|string} [predicate=_.identity] The function invoked per property.
-         * @returns {Object} Returns the new object.
+         * @param object The source object.
+         * @param [predicate=_.identity] The function invoked per property.
+         * @returns Returns the new object.
          * @example
          *
          * var object = { 'a': 1, 'b': '2', 'c': 3 };
@@ -17324,28 +14567,30 @@ declare namespace _ {
          * _.pickBy(object, _.isNumber);
          * // => { 'a': 1, 'c': 3 }
          */
-        pickBy<TResult extends {}, T extends {}>(
+        pickBy<T extends object>(
             object: T | null | undefined,
-            predicate?: ObjectIterator<any, boolean>
-        ): TResult;
+            predicate?: ValueKeyIteratee<T[keyof T]>
+        ): PartialObject<T>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.pickBy
          */
-        pickBy<TResult extends {}>(
-            predicate?: ObjectIterator<any, boolean>
-        ): LoDashImplicitObjectWrapper<TResult>;
+        pickBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ValueKeyIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<PartialObject<T>>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.pickBy
          */
-        pickBy<TResult extends {}>(
-            predicate?: ObjectIterator<any, boolean>
-        ): LoDashExplicitObjectWrapper<TResult>;
+        pickBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ValueKeyIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
     //_.result
@@ -17359,80 +14604,31 @@ declare namespace _ {
          * @param defaultValue The value returned if the resolved value is undefined.
          * @return Returns the resolved value.
          */
-        result<TObject, TResult>(
-            object: TObject,
-            path: Many<StringRepresentable>,
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-
-        /**
-         * @see _.result
-         */
         result<TResult>(
             object: any,
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             defaultValue?: TResult|((...args: any[]) => TResult)
         ): TResult;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.result
          */
         result<TResult>(
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             defaultValue?: TResult|((...args: any[]) => TResult)
         ): TResult;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.result
          */
         result<TResult>(
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.result
-         */
-        result<TResult>(
-            path: Many<StringRepresentable>,
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResultWrapper>(
-            path: Many<StringRepresentable>,
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.result
-         */
-        result<TResultWrapper>(
-            path: Many<StringRepresentable>,
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResultWrapper>(
-            path: Many<StringRepresentable>,
-            defaultValue?: any
-        ): TResultWrapper;
+        ): LoDashExplicitWrapper<TResult>;
     }
 
     //_.set
@@ -17447,65 +14643,56 @@ declare namespace _ {
          * @param value The value to set.
          * @return Returns object.
          */
-        set<TResult>(
-            object: Object,
-            path: Many<StringRepresentable>,
+        set<T extends object>(
+            object: T,
+            path: PropertyPath,
             value: any
-        ): TResult;
+        ): T;
 
         /**
          * @see _.set
          */
-        set<V, TResult>(
-            object: Object,
-            path: Many<StringRepresentable>,
-            value: V
-        ): TResult;
-
-        /**
-         * @see _.set
-         */
-        set<O, V, TResult>(
-            object: O,
-            path: Many<StringRepresentable>,
-            value: V
+        set<TResult>(
+            object: object,
+            path: PropertyPath,
+            value: any
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.set
          */
-        set<TResult>(
-            path: Many<StringRepresentable>,
+        set(
+            path: PropertyPath,
             value: any
-        ): LoDashImplicitObjectWrapper<TResult>;
+        ): this;
 
         /**
          * @see _.set
          */
-        set<V, TResult>(
-            path: Many<StringRepresentable>,
-            value: V
-        ): LoDashImplicitObjectWrapper<TResult>;
+        set<TResult>(
+            path: PropertyPath,
+            value: any
+        ): LoDashImplicitWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.set
          */
-        set<TResult>(
-            path: Many<StringRepresentable>,
+        set(
+            path: PropertyPath,
             value: any
-        ): LoDashExplicitObjectWrapper<TResult>;
+        ): this;
 
         /**
          * @see _.set
          */
-        set<V, TResult>(
-            path: Many<StringRepresentable>,
-            value: V
-        ): LoDashExplicitObjectWrapper<TResult>;
+        set<TResult>(
+            path: PropertyPath,
+            value: any
+        ): LoDashExplicitWrapper<TResult>;
     }
 
     //_.setWith
@@ -17523,72 +14710,59 @@ declare namespace _ {
          * @parem customizer The function to customize assigned values.
          * @return Returns object.
          */
-        setWith<O, V, TResult>(
-            object: O,
-            path: Many<StringRepresentable>,
-            value: V,
-            customizer?: SetWithCustomizer<O>
-        ): TResult;
-
-        /**
-         * @see _.setWith
-         */
-        setWith<TResult>(
-            object: any,
-            path: Many<StringRepresentable>,
+        setWith<T extends object>(
+            object: T,
+            path: PropertyPath,
             value: any,
-            customizer?: SetWithCustomizer<any>
-        ): TResult;
+            customizer?: SetWithCustomizer<T>
+        ): T;
 
-        /**
-         * @see _.setWith
-         */
-        setWith<V, TResult>(
-            object: any,
-            path: Many<StringRepresentable>,
-            value: V,
-            customizer?: SetWithCustomizer<any>
+        setWith<T extends object, TResult>(
+            object: T,
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<T>
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.setWith
          */
-        setWith<TResult>(
-            path: Many<StringRepresentable>,
+        setWith(
+            path: PropertyPath,
             value: any,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashImplicitObjectWrapper<TResult>;
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
 
         /**
          * @see _.setWith
          */
-        setWith<V, TResult>(
-            path: Many<StringRepresentable>,
-            value: V,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashImplicitObjectWrapper<TResult>;
+        setWith<TResult>(
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashImplicitWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.setWith
          */
-        setWith<TResult>(
-            path: Many<StringRepresentable>,
+        setWith(
+            path: PropertyPath,
             value: any,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashExplicitObjectWrapper<TResult>;
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
 
         /**
          * @see _.setWith
          */
-        setWith<V, TResult>(
-            path: Many<StringRepresentable>,
-            value: V,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashExplicitObjectWrapper<TResult>;
+        setWith<TResult>(
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashExplicitWrapper<TResult>;
     }
 
     //_.toPairs
@@ -17599,23 +14773,36 @@ declare namespace _ {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairs<T extends {}>(object?: T): [string, any][];
+        toPairs<T>(object?: Dictionary<T>): Array<[string, T]>;
 
-        toPairs<T extends {}, TResult>(object?: T): [string, TResult][];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.toPairs
          */
-        toPairs<TResult>(): LoDashImplicitArrayWrapper<[string, TResult]>;
+        toPairs(object?: object): Array<[string, any]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toPairs
          */
-        toPairs<TResult>(): LoDashExplicitArrayWrapper<[string, TResult]>;
+        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        toPairs(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPairs
+         */
+        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        toPairs(): LoDashExplicitWrapper<Array<[string, any]>>;
     }
 
     //_.toPairsIn
@@ -17626,23 +14813,36 @@ declare namespace _ {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairsIn<T extends {}>(object?: T): [string, any][];
+        toPairsIn<T>(object?: Dictionary<T>): Array<[string, T]>;
 
-        toPairsIn<T extends {}, TResult>(object?: T): [string, TResult][];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<TResult>(): LoDashImplicitArrayWrapper<[string, TResult]>;
+        toPairsIn(object?: object): Array<[string, any]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<TResult>(): LoDashExplicitArrayWrapper<[string, TResult]>;
+        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn(): LoDashExplicitWrapper<Array<[string, any]>>;
     }
 
     //_.transform
@@ -17661,7 +14861,7 @@ declare namespace _ {
          */
         transform<T, TResult>(
             object: T[],
-            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
+            iteratee: MemoVoidArrayIterator<T, TResult[]>,
             accumulator?: TResult[]
         ): TResult[];
 
@@ -17670,7 +14870,16 @@ declare namespace _ {
          */
         transform<T, TResult>(
             object: T[],
-            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator: Dictionary<TResult>
+        ): Dictionary<TResult>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: Dictionary<T>,
+            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
             accumulator?: Dictionary<TResult>
         ): Dictionary<TResult>;
 
@@ -17679,54 +14888,123 @@ declare namespace _ {
          */
         transform<T, TResult>(
             object: Dictionary<T>,
-            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>
-        ): Dictionary<TResult>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            object: Dictionary<T>,
-            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
-            accumulator?: TResult[]
+            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator: TResult[]
         ): TResult[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.transform
-         */
-        transform<TResult>(
-            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
-            accumulator?: TResult[]
-        ): LoDashImplicitArrayWrapper<TResult>;
 
         /**
          * @see _.transform
          */
-        transform<TResult>(
-            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+        transform(
+            object: any[],
+        ): any[];
+
+        /**
+         * @see _.transform
+         */
+        transform(
+            object: object,
+        ): Dictionary<any>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.transform
          */
         transform<T, TResult>(
-            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+            this: LoDashImplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): LoDashImplicitWrapper<TResult[]>;
 
         /**
          * @see _.transform
          */
         transform<T, TResult>(
-            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
+            this: LoDashImplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator: Dictionary<TResult>
+        ): LoDashImplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashImplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator: TResult[]
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(
+            this: LoDashImplicitWrapper<any[]>,
+        ): LoDashImplicitWrapper<any[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(): LoDashImplicitWrapper<Dictionary<any>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, TResult[]>,
             accumulator?: TResult[]
-        ): LoDashImplicitArrayWrapper<TResult>;
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashExplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashExplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(
+            this: LoDashExplicitWrapper<any[]>,
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(): LoDashExplicitWrapper<Dictionary<any>>;
     }
 
     //_.unset
@@ -17740,24 +15018,24 @@ declare namespace _ {
          * @param path The path of the property to unset.
          * @return Returns true if the property is deleted, else false.
          */
-        unset<T>(
-            object: T,
-            path: Many<StringRepresentable>
+        unset(
+            object: any,
+            path: PropertyPath
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.unset
          */
-        unset(path: Many<StringRepresentable>): LoDashImplicitWrapper<boolean>;
+        unset(path: PropertyPath): LoDashImplicitWrapper<boolean>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.unset
          */
-        unset(path: Many<StringRepresentable>): LoDashExplicitWrapper<boolean>;
+        unset(path: PropertyPath): LoDashExplicitWrapper<boolean>;
     }
 
     //_.update
@@ -17771,74 +15049,31 @@ declare namespace _ {
          * @param updater The function to produce the updated value.
          * @return Returns object.
          */
-        update<TResult>(
-            object: Object,
-            path: Many<StringRepresentable>,
-            updater: Function
-        ): TResult;
-
-        /**
-         * @see _.update
-         */
-        update<U extends Function, TResult>(
-            object: Object,
-            path: Many<StringRepresentable>,
-            updater: U
-        ): TResult;
-
-        /**
-         * @see _.update
-         */
-        update<O extends {}, TResult>(
-            object: O,
-            path: Many<StringRepresentable>,
-            updater: Function
-        ): TResult;
-
-        /**
-         * @see _.update
-         */
-        update<O, U extends Function, TResult>(
-            object: O,
-            path: Many<StringRepresentable>,
-            updater: U
-        ): TResult;
+        update(
+            object: object,
+            path: PropertyPath,
+            updater: (value: any) => any
+        ): any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.update
          */
-        update<TResult>(
-            path: Many<StringRepresentable>,
-            updater: any
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.update
-         */
-        update<U extends Function, TResult>(
-            path: Many<StringRepresentable>,
-            updater: U
-        ): LoDashImplicitObjectWrapper<TResult>;
+        update(
+            path: PropertyPath,
+            updater: (value: any) => any
+        ): LoDashImplicitWrapper<any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.update
          */
-        update<TResult>(
-            path: Many<StringRepresentable>,
-            updater: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.update
-         */
-        update<U extends Function, TResult>(
-            path: Many<StringRepresentable>,
-            updater: U
-        ): LoDashExplicitObjectWrapper<TResult>;
+        update(
+            path: PropertyPath,
+            updater: (value: any) => any
+        ): LoDashExplicitWrapper<any>;
     }
 
     //_.updateWith
@@ -17851,15 +15086,13 @@ declare namespace _ {
          *
          * **Note:** This method mutates `object`.
          *
-         * @static
-         * @memberOf _
          * @since 4.6.0
          * @category Object
-         * @param {Object} object The object to modify.
-         * @param {Array|string} path The path of the property to set.
-         * @param {Function} updater The function to produce the updated value.
-         * @param {Function} [customizer] The function to customize assigned values.
-         * @returns {Object} Returns `object`.
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param updater The function to produce the updated value.
+         * @param [customizer] The function to customize assigned values.
+         * @returns Returns `object`.
          * @example
          *
          * var object = {};
@@ -17867,44 +15100,62 @@ declare namespace _ {
          * _.updateWith(object, '[0][1]', _.constant('a'), Object);
          * // => { '0': { '1': 'a' } }
          */
-        updateWith<O extends {}, TResult>(
-            object: O,
-            path: Many<StringRepresentable>,
+        updateWith<T extends object>(
+            object: T,
+            path: PropertyPath,
             updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<O>
-        ): TResult;
+            customizer?: SetWithCustomizer<T>
+        ): T;
 
         /**
          * @see _.updateWith
          */
-        updateWith<TResult>(
-            object: any,
-            path: Many<StringRepresentable>,
+        updateWith<T extends object, TResult>(
+            object: T,
+            path: PropertyPath,
             updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<any>
+            customizer?: SetWithCustomizer<T>
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.updateWith
+         */
+        updateWith(
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
+
         /**
          * @see _.updateWith
          */
         updateWith<TResult>(
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashImplicitObjectWrapper<TResult>;
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashImplicitWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.updateWith
+         */
+        updateWith(
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
+
         /**
          * @see _.updateWith
          */
         updateWith<TResult>(
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashExplicitObjectWrapper<TResult>;
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashExplicitWrapper<TResult>;
     }
 
     //_.values
@@ -17915,61 +15166,51 @@ declare namespace _ {
          * @param object The object to query.
          * @return Returns an array of property values.
          */
-        values<T>(object?: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
+        values<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
 
         /**
          * @see _.values
          */
-        values<T>(object?: any): T[];
+        values<T extends object>(object: T | null | undefined): Array<T[keyof T]>;
+
+        /**
+         * @see _.values
+         */
+        values(object: any): any[];
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.values
          */
-        values(): LoDashImplicitArrayWrapper<string>;
+        values<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.values
+         */
+        values<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.values
+         */
+        values(): LoDashImplicitWrapper<any[]>;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.values
          */
-        values(): LoDashImplicitArrayWrapper<any>;
-    }
+        values<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.values
          */
-        values(): LoDashImplicitArrayWrapper<T>;
-    }
+        values<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.values
          */
-        values<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.values
-         */
-        values<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.values
-         */
-        values(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.values
-         */
-        values<T>(): LoDashExplicitArrayWrapper<T>;
+        values(): LoDashExplicitWrapper<any[]>;
     }
 
     //_.valuesIn
@@ -17980,26 +15221,36 @@ declare namespace _ {
          * @param object The object to query.
          * @return Returns the array of property values.
          */
-        valuesIn<T>(object?: Dictionary<T>): T[];
+        valuesIn<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
 
         /**
          * @see _.valuesIn
          */
-        valuesIn<T>(object?: any): T[];
+        valuesIn<T extends object>(object: T | null | undefined): Array<T[keyof T]>;
     }
 
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.valuesIn
          */
-        valuesIn<T>(): LoDashImplicitArrayWrapper<T>;
+        valuesIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.valuesIn
          */
-        valuesIn<T>(): LoDashExplicitArrayWrapper<T>;
+        valuesIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     /**********
@@ -18017,14 +15268,14 @@ declare namespace _ {
         camelCase(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.camelCase
          */
         camelCase(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.camelCase
          */
@@ -18042,14 +15293,14 @@ declare namespace _ {
         capitalize(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.capitalize
          */
         capitalize(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.capitalize
          */
@@ -18068,14 +15319,14 @@ declare namespace _ {
         deburr(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.deburr
          */
         deburr(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.deburr
          */
@@ -18099,7 +15350,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.endsWith
          */
@@ -18109,7 +15360,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.endsWith
          */
@@ -18141,14 +15392,14 @@ declare namespace _ {
         escape(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.escape
          */
         escape(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.escape
          */
@@ -18167,14 +15418,14 @@ declare namespace _ {
         escapeRegExp(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.escapeRegExp
          */
         escapeRegExp(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.escapeRegExp
          */
@@ -18192,14 +15443,14 @@ declare namespace _ {
         kebabCase(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.kebabCase
          */
         kebabCase(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.kebabCase
          */
@@ -18217,14 +15468,14 @@ declare namespace _ {
         lowerCase(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.lowerCase
          */
         lowerCase(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.lowerCase
          */
@@ -18242,14 +15493,14 @@ declare namespace _ {
         lowerFirst(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.lowerFirst
          */
         lowerFirst(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.lowerFirst
          */
@@ -18274,7 +15525,7 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.pad
          */
@@ -18284,7 +15535,7 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.pad
          */
@@ -18312,7 +15563,7 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.padEnd
          */
@@ -18322,7 +15573,7 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.padEnd
          */
@@ -18350,7 +15601,7 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.padStart
          */
@@ -18360,7 +15611,7 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.padStart
          */
@@ -18388,14 +15639,14 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.parseInt
          */
         parseInt(radix?: number): number;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.parseInt
          */
@@ -18417,20 +15668,22 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.repeat
          */
         repeat(n?: number): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.repeat
          */
         repeat(n?: number): LoDashExplicitWrapper<string>;
     }
 
+    type ReplaceFunction = (match: string, ...args: any[]) => string;
+
     //_.replace
     interface LoDashStatic {
         /**
@@ -18438,91 +15691,54 @@ declare namespace _ {
          *
          * Note: This method is based on String#replace.
          *
-         * @param string
-         * @param pattern
-         * @param replacement
          * @return Returns the modified string.
          */
         replace(
             string: string,
+            pattern: RegExp | string,
+            replacement: ReplaceFunction | string
+        ): string;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern: RegExp | string,
+            replacement: ReplaceFunction | string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.replace
+         */
+        replace(
             pattern: RegExp|string,
-            replacement: Function|string
+            replacement: ReplaceFunction | string
         ): string;
 
         /**
          * @see _.replace
          */
         replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
+            replacement: ReplaceFunction | string
         ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.replace
          */
         replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): string;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement?: Function|string
-        ): string;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): string;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement?: Function|string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
+            pattern: RegExp | string,
+            replacement: ReplaceFunction | string
         ): LoDashExplicitWrapper<string>;
 
         /**
          * @see _.replace
          */
         replace(
-            replacement?: Function|string
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement?: Function|string
+            replacement: ReplaceFunction | string
         ): LoDashExplicitWrapper<string>;
     }
 
@@ -18537,14 +15753,14 @@ declare namespace _ {
         snakeCase(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.snakeCase
          */
         snakeCase(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.snakeCase
          */
@@ -18558,9 +15774,9 @@ declare namespace _ {
          *
          * Note: This method is based on String#split.
          *
-         * @param string
-         * @param separator
-         * @param limit
+         * @param string The string to trim.
+         * @param separator The separator pattern to split by.
+         * @param limit The length to truncate results to.
          * @return Returns the new array of string segments.
          */
         split(
@@ -18568,26 +15784,42 @@ declare namespace _ {
             separator?: RegExp|string,
             limit?: number
         ): string[];
+
+        /**
+         * Splits string by separator.
+         *
+         * Note: This method is based on String#split.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the new array of string segments.
+         */
+        split(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.split
          */
         split(
             separator?: RegExp|string,
             limit?: number
-        ): LoDashImplicitArrayWrapper<string>;
+        ): LoDashImplicitWrapper<string[]>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.split
          */
         split(
             separator?: RegExp|string,
             limit?: number
-        ): LoDashExplicitArrayWrapper<string>;
+        ): LoDashExplicitWrapper<string[]>;
     }
 
     //_.startCase
@@ -18601,14 +15833,14 @@ declare namespace _ {
         startCase(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.startCase
          */
         startCase(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.startCase
          */
@@ -18632,7 +15864,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.startsWith
          */
@@ -18642,7 +15874,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.startsWith
          */
@@ -18661,7 +15893,7 @@ declare namespace _ {
     }
 
     interface TemplateExecutor {
-        (data?: Object): string;
+        (data?: object): string;
         source: string;
     }
 
@@ -18693,23 +15925,23 @@ declare namespace _ {
          * @return Returns the compiled template function.
          */
         template(
-            string: string,
+            string?: string,
             options?: TemplateOptions
         ): TemplateExecutor;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.template
          */
         template(options?: TemplateOptions): TemplateExecutor;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.template
          */
-        template(options?: TemplateOptions): LoDashExplicitObjectWrapper<TemplateExecutor>;
+        template(options?: TemplateOptions): LoDashExplicitWrapper<TemplateExecutor>;
     }
 
     //_.toLower
@@ -18723,14 +15955,14 @@ declare namespace _ {
         toLower(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toLower
          */
         toLower(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toLower
          */
@@ -18748,14 +15980,14 @@ declare namespace _ {
         toUpper(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toUpper
          */
         toUpper(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toUpper
          */
@@ -18775,16 +16007,30 @@ declare namespace _ {
             string?: string,
             chars?: string
         ): string;
+
+        /**
+         * Removes leading and trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the trimmed string.
+         */
+        trim(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.trim
          */
         trim(chars?: string): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.trim
          */
@@ -18804,16 +16050,30 @@ declare namespace _ {
             string?: string,
             chars?: string
         ): string;
+
+        /**
+         * Removes trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the trimmed string.
+         */
+        trimEnd(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.trimEnd
          */
         trimEnd(chars?: string): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.trimEnd
          */
@@ -18833,16 +16093,30 @@ declare namespace _ {
             string?: string,
             chars?: string
         ): string;
+
+        /**
+         * Removes leading whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the trimmed string.
+         */
+        trimStart(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.trimStart
          */
         trimStart(chars?: string): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.trimStart
          */
@@ -18874,14 +16148,14 @@ declare namespace _ {
         ): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.truncate
          */
         truncate(options?: TruncateOptions): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.truncate
          */
@@ -18903,14 +16177,14 @@ declare namespace _ {
         unescape(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.unescape
          */
         unescape(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.unescape
          */
@@ -18928,14 +16202,14 @@ declare namespace _ {
         upperCase(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.upperCase
          */
         upperCase(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.upperCase
          */
@@ -18953,14 +16227,14 @@ declare namespace _ {
         upperFirst(string?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.upperFirst
          */
         upperFirst(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.upperFirst
          */
@@ -18980,20 +16254,34 @@ declare namespace _ {
             string?: string,
             pattern?: string|RegExp
         ): string[];
+
+        /**
+         * Splits `string` into an array of its words.
+         *
+         * @param string The string to inspect.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the words of `string`.
+         */
+        words(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.words
          */
         words(pattern?: string|RegExp): string[];
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.words
          */
-        words(pattern?: string|RegExp): LoDashExplicitArrayWrapper<string>;
+        words(pattern?: string|RegExp): LoDashExplicitWrapper<string[]>;
     }
 
     /***********
@@ -19012,18 +16300,18 @@ declare namespace _ {
         attempt<TResult>(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.attempt
          */
         attempt<TResult>(...args: any[]): TResult|Error;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.attempt
          */
-        attempt<TResult>(...args: any[]): LoDashExplicitObjectWrapper<TResult|Error>;
+        attempt<TResult>(...args: any[]): LoDashExplicitWrapper<TResult|Error>;
     }
 
     //_.constant
@@ -19037,18 +16325,18 @@ declare namespace _ {
         constant<T>(value: T): () => T;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.constant
          */
-        constant<TResult>(): LoDashImplicitObjectWrapper<() => TResult>;
+        constant(): LoDashImplicitWrapper<() => TValue>;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.constant
          */
-        constant<TResult>(): LoDashExplicitObjectWrapper<() => TResult>;
+        constant(): LoDashExplicitWrapper<() => TValue>;
     }
 
     //_.defaultTo
@@ -19063,20 +16351,44 @@ declare namespace _ {
          * @returns Returns the resolved value.
          */
         defaultTo<T>(value: T | null | undefined, defaultValue: T): T;
-    }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.defaultTo
          */
-        defaultTo<TResult>(value: TResult): LoDashImplicitObjectWrapper<TResult>;
+        defaultTo<T, TDefault>(
+            value: T | null | undefined,
+            defaultValue: TDefault
+        ): T | TDefault;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.defaultTo
          */
-        defaultTo<TResult>(value: TResult): LoDashExplicitObjectWrapper<TResult>;
+        defaultTo<T>(this: LoDashImplicitWrapper<T | null | undefined>, defaultValue: T): T;
+
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T, TDefault>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            defaultValue: TDefault
+        ): T | TDefault;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T>(this: LoDashExplicitWrapper<T | null | undefined>, defaultValue: T): LoDashExplicitWrapper<T>;
+
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T, TDefault>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<T | TDefault>;
     }
 
     //_.identity
@@ -19095,46 +16407,18 @@ declare namespace _ {
         identity(): undefined;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.identity
          */
-        identity(): T;
+        identity(): TValue;
     }
 
-    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.identity
          */
-        identity(): TArray;
-    }
-
-    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.identity
-         */
-        identity(): TObject;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.identity
-         */
-        identity(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
-        /**
-         * @see _.identity
-         */
-        identity(): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
-        /**
-         * @see _.identity
-         */
-        identity(): TWrapper;
+        identity(): this;
     }
 
     //_.iteratee
@@ -19145,11 +16429,9 @@ declare namespace _ {
          * property value for a given element. If `func` is an object the created
          * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
          *
-         * @static
-         * @memberOf _
          * @category Util
-         * @param {*} [func=_.identity] The value to convert to a callback.
-         * @returns {Function} Returns the callback.
+         * @param [func=_.identity] The value to convert to a callback.
+         * @returns Returns the callback.
          * @example
          *
          * var users = [
@@ -19168,66 +16450,32 @@ declare namespace _ {
          * _.filter(users, 'age > 36');
          * // => [{ 'user': 'fred', 'age': 40 }]
          */
-        iteratee<TFunction extends Function>(
-            func: TFunction
+        iteratee<TFunction extends (...args: any[]) => any>(
+            func: TFunction | string | object
         ): TFunction;
 
         /**
          * @see _.iteratee
          */
-        iteratee<TResult>(
-            func: string
-        ): (object: any) => TResult;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee(
-            func: Object
-        ): (object: any) => boolean;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(): (value: TResult) => TResult;
+        iteratee(): typeof _.identity; // tslint:disable-line:no-unnecessary-qualifier
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.iteratee
          */
-        iteratee<TResult>(): LoDashImplicitObjectWrapper<(object: any) => TResult>;
+        iteratee<TFunction extends (...args: any[]) => any>(
+            this: LoDashImplicitWrapper<TFunction | string | object>
+        ): LoDashImplicitWrapper<TFunction>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.iteratee
          */
-        iteratee(): LoDashImplicitObjectWrapper<(object: any) => boolean>;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(): LoDashImplicitObjectWrapper<(...args: any[]) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(): LoDashExplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee(): LoDashExplicitObjectWrapper<(object: any) => boolean>;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(): LoDashExplicitObjectWrapper<(...args: any[]) => TResult>;
+        iteratee<TFunction extends (...args: any[]) => any>(
+            this: LoDashExplicitWrapper<TFunction | string | object>
+        ): LoDashExplicitWrapper<TFunction>;
     }
 
     //_.matches
@@ -19251,18 +16499,18 @@ declare namespace _ {
         matches<T, V>(source: T): (value: V) => boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.matches
          */
-        matches<V>(): LoDashImplicitObjectWrapper<(value: V) => boolean>;
+        matches<V>(): LoDashImplicitWrapper<(value: V) => boolean>;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.matches
          */
-        matches<V>(): LoDashExplicitObjectWrapper<(value: V) => boolean>;
+        matches<V>(): LoDashExplicitWrapper<(value: V) => boolean>;
     }
 
     //_.matchesProperty
@@ -19278,7 +16526,7 @@ declare namespace _ {
          * @return Returns the new function.
          */
         matchesProperty<T>(
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             srcValue: T
         ): (value: any) => boolean;
 
@@ -19286,41 +16534,41 @@ declare namespace _ {
          * @see _.matchesProperty
          */
         matchesProperty<T, V>(
-            path: Many<StringRepresentable>,
+            path: PropertyPath,
             srcValue: T
         ): (value: V) => boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.matchesProperty
          */
         matchesProperty<SrcValue>(
             srcValue: SrcValue
-        ): LoDashImplicitObjectWrapper<(value: any) => boolean>;
+        ): LoDashImplicitWrapper<(value: any) => boolean>;
 
         /**
          * @see _.matchesProperty
          */
         matchesProperty<SrcValue, Value>(
             srcValue: SrcValue
-        ): LoDashImplicitObjectWrapper<(value: Value) => boolean>;
+        ): LoDashImplicitWrapper<(value: Value) => boolean>;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.matchesProperty
          */
         matchesProperty<SrcValue>(
             srcValue: SrcValue
-        ): LoDashExplicitObjectWrapper<(value: any) => boolean>;
+        ): LoDashExplicitWrapper<(value: any) => boolean>;
 
         /**
          * @see _.matchesProperty
          */
         matchesProperty<SrcValue, Value>(
             srcValue: SrcValue
-        ): LoDashExplicitObjectWrapper<(value: Value) => boolean>;
+        ): LoDashExplicitWrapper<(value: Value) => boolean>;
     }
 
     //_.method
@@ -19333,66 +16581,24 @@ declare namespace _ {
          * @param args The arguments to invoke the method with.
          * @return Returns the new function.
          */
-        method<TObject, TResult>(
-            path: string|StringRepresentable[],
+        method(
+            path: PropertyPath,
             ...args: any[]
-        ): (object: TObject) => TResult;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(
-            path: string|StringRepresentable[],
-            ...args: any[]
-        ): (object: any) => TResult;
+        ): (object: any) => any;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.method
          */
-        method<TObject, TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: any) => TResult>;
+        method(...args: any[]): LoDashImplicitWrapper<(object: any) => any>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.method
          */
-        method<TObject, TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.method
-         */
-        method<TObject, TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.method
-         */
-        method<TObject, TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: any) => TResult>;
+        method(...args: any[]): LoDashExplicitWrapper<(object: any) => any>;
     }
 
     //_.methodOf
@@ -19405,36 +16611,28 @@ declare namespace _ {
          * @param args The arguments to invoke the method with.
          * @return Returns the new function.
          */
-        methodOf<TObject extends {}, TResult>(
-            object: TObject,
+        methodOf(
+            object: object,
             ...args: any[]
-        ): (path: Many<StringRepresentable>) => TResult;
-
-        /**
-         * @see _.methodOf
-         */
-        methodOf<TResult>(
-            object: {},
-            ...args: any[]
-        ): (path: Many<StringRepresentable>) => TResult;
+        ): (path: PropertyPath) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.methodOf
          */
-        methodOf<TResult>(
+        methodOf(
             ...args: any[]
-        ): LoDashImplicitObjectWrapper<(path: Many<StringRepresentable>) => TResult>;
+        ): LoDashImplicitWrapper<(path: PropertyPath) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.methodOf
          */
-        methodOf<TResult>(
+        methodOf(
             ...args: any[]
-        ): LoDashExplicitObjectWrapper<(path: Many<StringRepresentable>) => TResult>;
+        ): LoDashExplicitWrapper<(path: PropertyPath) => any>;
     }
 
     //_.mixin
@@ -19456,53 +16654,53 @@ declare namespace _ {
          * @param options.chain Specify whether the functions added are chainable.
          * @return Returns object.
          */
-        mixin<TResult, TObject>(
+        mixin<TObject>(
             object: TObject,
-            source: Dictionary<Function>,
+            source: Dictionary<(...args: any[]) => any>,
             options?: MixinOptions
-        ): TResult;
+        ): TObject;
 
         /**
          * @see _.mixin
          */
         mixin<TResult>(
-            source: Dictionary<Function>,
+            source: Dictionary<(...args: any[]) => any>,
             options?: MixinOptions
-        ): TResult;
+        ): LoDashStatic;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.mixin
          */
-        mixin<TResult>(
-            source: Dictionary<Function>,
+        mixin(
+            source: Dictionary<(...args: any[]) => any>,
             options?: MixinOptions
-        ): LoDashImplicitObjectWrapper<TResult>;
+        ): this;
 
         /**
          * @see _.mixin
          */
-        mixin<TResult>(
+        mixin(
             options?: MixinOptions
-        ): LoDashImplicitObjectWrapper<TResult>;
+        ): LoDashImplicitWrapper<LoDashStatic>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.mixin
          */
-        mixin<TResult>(
-            source: Dictionary<Function>,
+        mixin(
+            source: Dictionary<(...args: any[]) => any>,
             options?: MixinOptions
-        ): LoDashExplicitObjectWrapper<TResult>;
+        ): this;
 
         /**
          * @see _.mixin
          */
-        mixin<TResult>(
+        mixin(
             options?: MixinOptions
-        ): LoDashExplicitObjectWrapper<TResult>;
+        ): LoDashExplicitWrapper<LoDashStatic>;
     }
 
     //_.noConflict
@@ -19515,18 +16713,18 @@ declare namespace _ {
         noConflict(): typeof _;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.noConflict
          */
         noConflict(): typeof _;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.noConflict
          */
-        noConflict(): LoDashExplicitObjectWrapper<typeof _>;
+        noConflict(): LoDashExplicitWrapper<typeof _>;
     }
 
     //_.noop
@@ -19539,18 +16737,18 @@ declare namespace _ {
         noop(...args: any[]): void;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.noop
          */
         noop(...args: any[]): void;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.noop
          */
-        noop(...args: any[]): _.LoDashExplicitWrapper<void>;
+        noop(...args: any[]): LoDashExplicitWrapper<undefined>;
     }
 
     //_.nthArg
@@ -19561,21 +16759,21 @@ declare namespace _ {
          * @param n The index of the argument to return.
          * @return Returns the new function.
          */
-        nthArg<TResult extends Function>(n?: number): TResult;
+        nthArg(n?: number): (...args: any[]) => any;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.nthArg
          */
-        nthArg<TResult extends Function>(): LoDashImplicitObjectWrapper<TResult>;
+        nthArg(): LoDashImplicitWrapper<(...args: any[]) => any>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.nthArg
          */
-        nthArg<TResult extends Function>(): LoDashExplicitObjectWrapper<TResult>;
+        nthArg(): LoDashExplicitWrapper<(...args: any[]) => any>;
     }
 
     //_.over
@@ -19587,35 +16785,27 @@ declare namespace _ {
          * @param iteratees The iteratees to invoke.
          * @return Returns the new function.
          */
-        over<TResult>(...iteratees: Array<Many<Function>>): (...args: any[]) => TResult[];
+        over<TResult>(...iteratees: Array<Many<(...args: any[]) => TResult>>): (...args: any[]) => TResult[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.over
          */
-        over<TResult>(...iteratees: Array<Many<Function>>): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
+        over<TResult>(
+            this: LoDashImplicitWrapper<Many<(...args: any[]) => TResult>>,
+            ...iteratees: Array<Many<(...args: any[]) => TResult>>
+        ): LoDashImplicitWrapper<(...args: any[]) => TResult[]>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.over
          */
-        over<TResult>(...iteratees: Array<Many<Function>>): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(...iteratees: Array<Many<Function>>): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(...iteratees: Array<Many<Function>>): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
+        over<TResult>(
+            this: LoDashExplicitWrapper<Many<(...args: any[]) => TResult>>,
+            ...iteratees: Array<Many<(...args: any[]) => TResult>>
+        ): LoDashExplicitWrapper<(...args: any[]) => TResult[]>;
     }
 
     //_.overEvery
@@ -19627,35 +16817,21 @@ declare namespace _ {
          * @param predicates The predicates to check.
          * @return Returns the new function.
          */
-        overEvery(...predicates: Array<Many<Function>>): (...args: any[]) => boolean;
+        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): (...args: T[]) => boolean;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.overEvery
          */
-        overEvery(...predicates: Array<Many<Function>>): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashImplicitWrapper<(...args: T[]) => boolean>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.overEvery
          */
-        overEvery(...predicates: Array<Many<Function>>): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery(...predicates: Array<Many<Function>>): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery(...predicates: Array<Many<Function>>): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashExplicitWrapper<(...args: T[]) => boolean>;
     }
 
     //_.overSome
@@ -19667,35 +16843,21 @@ declare namespace _ {
          * @param predicates The predicates to check.
          * @return Returns the new function.
          */
-        overSome(...predicates: Array<Many<Function>>): (...args: any[]) => boolean;
+        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): (...args: T[]) => boolean;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.overSome
          */
-        overSome(...predicates: Array<Many<Function>>): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashImplicitWrapper<(...args: T[]) => boolean>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.overSome
          */
-        overSome(...predicates: Array<Many<Function>>): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.overSome
-         */
-        overSome(...predicates: Array<Many<Function>>): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.overSome
-         */
-        overSome(...predicates: Array<Many<Function>>): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashExplicitWrapper<(...args: T[]) => boolean>;
     }
 
     //_.property
@@ -19706,35 +16868,21 @@ declare namespace _ {
          * @param path The path of the property to get.
          * @return Returns the new function.
          */
-        property<TObj, TResult>(path: Many<StringRepresentable>): (obj: TObj) => TResult;
+        property<TObj, TResult>(path: PropertyPath): (obj: TObj) => TResult;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.property
          */
-        property<TObj, TResult>(): LoDashImplicitObjectWrapper<(obj: TObj) => TResult>;
+        property<TObj, TResult>(): LoDashImplicitWrapper<(obj: TObj) => TResult>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.property
          */
-        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>;
+        property<TObj, TResult>(): LoDashExplicitWrapper<(obj: TObj) => TResult>;
     }
 
     //_.propertyOf
@@ -19746,21 +16894,21 @@ declare namespace _ {
          * @param object The object to query.
          * @return Returns the new function.
          */
-        propertyOf<T extends {}>(object: T): (path: Many<string>) => any;
+        propertyOf<T extends {}>(object: T): (path: PropertyPath) => any;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.propertyOf
          */
-        propertyOf(): LoDashImplicitObjectWrapper<(path: Many<string>) => any>;
+        propertyOf(): LoDashImplicitWrapper<(path: PropertyPath) => any>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.propertyOf
          */
-        propertyOf(): LoDashExplicitObjectWrapper<(path: Many<string>) => any>;
+        propertyOf(): LoDashExplicitWrapper<(path: PropertyPath) => any>;
     }
 
     //_.range
@@ -19777,37 +16925,45 @@ declare namespace _ {
          */
         range(
             start: number,
-            end: number,
+            end?: number,
             step?: number
         ): number[];
 
         /**
-         * @see _.range
+         * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+         * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+         * range is created unless a negative step is specified.
+         *
+         * @param start The start of the range.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns a new range array.
          */
         range(
             end: number,
-            step?: number
+            index: string | number,
+            guard: object
         ): number[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.range
          */
         range(
             end?: number,
             step?: number
-        ): LoDashImplicitArrayWrapper<number>;
+        ): LoDashImplicitWrapper<number[]>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.range
          */
         range(
             end?: number,
             step?: number
-        ): LoDashExplicitArrayWrapper<number>;
+        ): LoDashExplicitWrapper<number[]>;
     }
 
     //_.rangeRight
@@ -19816,13 +16972,11 @@ declare namespace _ {
          * This method is like `_.range` except that it populates values in
          * descending order.
          *
-         * @static
-         * @memberOf _
          * @category Util
-         * @param {number} [start=0] The start of the range.
-         * @param {number} end The end of the range.
-         * @param {number} [step=1] The value to increment or decrement by.
-         * @returns {Array} Returns the new array of numbers.
+         * @param start The start of the range.
+         * @param end The end of the range.
+         * @param step The value to increment or decrement by.
+         * @returns Returns the new array of numbers.
          * @example
          *
          * _.rangeRight(4);
@@ -19848,37 +17002,44 @@ declare namespace _ {
          */
         rangeRight(
             start: number,
-            end: number,
+            end?: number,
             step?: number
         ): number[];
 
         /**
-         * @see _.rangeRight
+         * This method is like _.range except that it populates values in
+         * descending order.
+         *
+         * @param start The start of the range.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns a new range array.
          */
         rangeRight(
             end: number,
-            step?: number
+            index: string | number,
+            guard: object
         ): number[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.rangeRight
          */
         rangeRight(
             end?: number,
             step?: number
-        ): LoDashImplicitArrayWrapper<number>;
+        ): LoDashImplicitWrapper<number[]>;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.rangeRight
          */
         rangeRight(
             end?: number,
             step?: number
-        ): LoDashExplicitArrayWrapper<number>;
+        ): LoDashExplicitWrapper<number[]>;
     }
 
     //_.runInContext
@@ -19889,10 +17050,10 @@ declare namespace _ {
          * @param context The context object.
          * @return Returns a new lodash function.
          */
-        runInContext(context?: Object): typeof _;
+        runInContext(context?: object): typeof _;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.runInContext
          */
@@ -19909,18 +17070,18 @@ declare namespace _ {
         stubArray(): any[];
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.stubArray
          */
         stubArray(): any[];
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.stubArray
          */
-        stubArray(): _.LoDashExplicitArrayWrapper<any>;
+        stubArray(): LoDashExplicitWrapper<any[]>;
     }
 
     // _.stubFalse
@@ -19933,18 +17094,18 @@ declare namespace _ {
         stubFalse(): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.stubFalse
          */
         stubFalse(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.stubFalse
          */
-        stubFalse(): _.LoDashExplicitWrapper<boolean>;
+        stubFalse(): LoDashExplicitWrapper<boolean>;
     }
 
     interface LoDashStatic {
@@ -19953,21 +17114,21 @@ declare namespace _ {
          *
          * @returns Returns the new empty object.
          */
-        stubObject(): Object;
+        stubObject(): any;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.stubObject
          */
-        stubObject(): Object;
+        stubObject(): any;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.stubObject
          */
-        stubObject(): _.LoDashExplicitObjectWrapper<Object>;
+        stubObject(): LoDashExplicitWrapper<any>;
     }
 
     interface LoDashStatic {
@@ -19979,18 +17140,18 @@ declare namespace _ {
         stubString(): string;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.stubString
          */
         stubString(): string;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.stubString
          */
-        stubString(): _.LoDashExplicitWrapper<string>;
+        stubString(): LoDashExplicitWrapper<string>;
     }
 
     interface LoDashStatic {
@@ -20002,18 +17163,18 @@ declare namespace _ {
         stubTrue(): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.stubTrue
          */
         stubTrue(): boolean;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.stubTrue
          */
-        stubTrue(): _.LoDashExplicitWrapper<boolean>;
+        stubTrue(): LoDashExplicitWrapper<boolean>;
     }
 
     //_.times
@@ -20037,7 +17198,7 @@ declare namespace _ {
         times(n: number): number[];
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.times
          */
@@ -20051,18 +17212,18 @@ declare namespace _ {
         times(): number[];
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.times
          */
         times<TResult>(
             iteratee: (num: number) => TResult
-        ): LoDashExplicitArrayWrapper<TResult>;
+        ): LoDashExplicitWrapper<TResult[]>;
 
         /**
          * @see _.times
          */
-        times(): LoDashExplicitArrayWrapper<number>;
+        times(): LoDashExplicitWrapper<number[]>;
     }
 
     //_.toPath
@@ -20070,11 +17231,9 @@ declare namespace _ {
         /**
          * Converts `value` to a property path array.
          *
-         * @static
-         * @memberOf _
          * @category Util
-         * @param {*} value The value to convert.
-         * @returns {Array} Returns the new property path array.
+         * @param value The value to convert.
+         * @returns Returns the new property path array.
          * @example
          *
          * _.toPath('a.b.c');
@@ -20095,14 +17254,14 @@ declare namespace _ {
         toPath(value: any): string[];
     }
 
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.toPath
          */
         toPath(): LoDashImplicitWrapper<string[]>;
     }
 
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.toPath
          */
@@ -20120,41 +17279,61 @@ declare namespace _ {
         uniqueId(prefix?: string): string;
     }
 
-    interface LoDashImplicitWrapper<T> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.uniqueId
          */
         uniqueId(): string;
     }
 
-    interface LoDashExplicitWrapper<T> {
+    interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.uniqueId
          */
         uniqueId(): LoDashExplicitWrapper<string>;
     }
 
+    type NotVoid = {} | null | undefined;
+    type ArrayIterator<T, TResult> = (value: T, index: number, collection: T[]) => TResult;
     type ListIterator<T, TResult> = (value: T, index: number, collection: List<T>) => TResult;
-
+    type ListIteratee<T> = ListIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
+    type ListIterateeCustom<T, TResult> = ListIterator<T, TResult> | string | object | [string, any] | PartialDeep<T>;
     type ListIteratorTypeGuard<T, S extends T> = (value: T, index: number, collection: List<T>) => value is S;
 
-    type DictionaryIterator<T, TResult> = (value: T, key: string, collection: Dictionary<T>) => TResult;
+    // Note: key should be string, not keyof T, because the actual object may contain extra properties that were not specified in the type.
+    type ObjectIterator<TObject, TResult> = (value: TObject[keyof TObject], key: string, collection: TObject) => TResult;
+    type ObjectIteratee<TObject> = ObjectIterator<TObject, NotVoid> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
+    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | object | [string, any] | PartialDeep<TObject[keyof TObject]>;
+    type ObjectIteratorTypeGuard<TObject, S extends TObject[keyof TObject]> = (value: TObject[keyof TObject], key: string, collection: TObject) => value is S;
 
-    type DictionaryIteratorTypeGuard<T, S extends T> = (value: T, key: string, collection: Dictionary<T>) => value is S;
+    type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
+    type DictionaryIteratee<T> = ObjectIteratee<Dictionary<T>>;
+    type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
 
-    type NumericDictionaryIterator<T, TResult> = (value: T, key: number, collection: Dictionary<T>) => TResult;
-
-    type ObjectIterator<T, TResult> = (element: T, key: string, collection: any) => TResult;
+    type NumericDictionaryIterator<T, TResult> = (value: T, key: number, collection: NumericDictionary<T>) => TResult;
+    type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
+    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
 
     type StringIterator<TResult> = (char: string, index: number, string: string) => TResult;
 
     type MemoVoidIterator<T, TResult> = (prev: TResult, curr: T, indexOrKey: any, list: T[]) => void;
 
+    /** @deprecated Use MemoListIterator or MemoObjectIterator instead.  */
     type MemoIterator<T, TResult> = (prev: TResult, curr: T, indexOrKey: any, list: T[]) => TResult;
+    type MemoListIterator<T, TResult, TList> = (prev: TResult, curr: T, index: number, list: TList) => TResult;
+    type MemoObjectIterator<T, TResult, TList> = (prev: TResult, curr: T, key: string, list: TList) => TResult;
 
     type MemoVoidArrayIterator<T, TResult> = (acc: TResult, curr: T, index: number, arr: T[]) => void;
     type MemoVoidDictionaryIterator<T, TResult> = (acc: TResult, curr: T, key: string, dict: Dictionary<T>) => void;
 
+    type ValueIteratee<T> = ((value: T) => NotVoid) | string | [string, any] | PartialDeep<T>;
+    type ValueKeyIteratee<T> = ((value: T, key: string) => NotVoid) | string | [string, any] | PartialDeep<T>;
+    type Comparator<T> = (a: T, b: T) => boolean;
+    type Comparator2<T1, T2> = (a: T1, b: T2) => boolean;
+
+    type PropertyName = string | number | symbol;
+    type PropertyPath = Many<PropertyName>;
+
     /** Common interface between Arrays and jQuery objects */
     type List<T> = ArrayLike<T>;
 
@@ -20166,14 +17345,28 @@ declare namespace _ {
         [index: number]: T;
     }
 
-    interface StringRepresentable {
-        toString(): string;
-    }
-
     interface Cancelable {
         cancel(): void;
         flush(): void;
     }
+
+    type PartialDeep<T> = {
+        [P in keyof T]?: PartialDeep<T[P]>;
+    };
+
+    // For backwards compatibility
+    type LoDashImplicitArrayWrapper<T> = LoDashImplicitWrapper<T[]>;
+    type LoDashImplicitNillableArrayWrapper<T> = LoDashImplicitWrapper<T[] | null | undefined>;
+    type LoDashImplicitObjectWrapper<T> = LoDashImplicitWrapper<T>;
+    type LoDashImplicitNillableObjectWrapper<T> = LoDashImplicitWrapper<T | null | undefined>;
+    type LoDashImplicitNumberArrayWrapper = LoDashImplicitWrapper<number[]>;
+    type LoDashImplicitStringWrapper = LoDashImplicitWrapper<string>;
+    type LoDashExplicitArrayWrapper<T> = LoDashExplicitWrapper<T[]>;
+    type LoDashExplicitNillableArrayWrapper<T> = LoDashExplicitWrapper<T[] | null | undefined>;
+    type LoDashExplicitObjectWrapper<T> = LoDashExplicitWrapper<T>;
+    type LoDashExplicitNillableObjectWrapper<T> = LoDashExplicitWrapper<T | null | undefined>;
+    type LoDashExplicitNumberArrayWrapper = LoDashExplicitWrapper<number[]>;
+    type LoDashExplicitStringWrapper = LoDashExplicitWrapper<string>;
 }
 
 // Backward compatibility with --target es5
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 7ebd31f2c7..69fe88b341 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -1,91 +1,22 @@
-declare const $: any, jQuery: any;
-
-let x = 0
+declare const $: any;
 
 interface IFoodOrganic {
     name: string;
     organic: boolean;
 }
-
-interface IFoodType {
-    name: string;
-    type: string;
-}
-
-interface IFoodCombined {
-    name: string;
-    organic: boolean;
-    type: string;
-}
-
-interface IStoogesQuote {
-    name: string;
-    quotes: string[];
-}
-
 interface IStoogesAge {
     name: string;
     age: number;
 }
 
-interface IStoogesCombined {
-    name: string;
-    age: number;
-    quotes: string[];
-}
-
-interface IKey {
-    dir: string;
-    code: number;
-}
-
-interface IDictionary<T> {
-    [index: string]: T;
-}
-
 const foodsOrganic: IFoodOrganic[] = [
     { name: 'banana', organic: true },
     { name: 'beet', organic: false },
 ];
-const foodsType: IFoodType[] = [
-    { name: 'apple', type: 'fruit' },
-    { name: 'banana', type: 'fruit' },
-    { name: 'beet', type: 'vegetable' }
-];
-const foodsCombined: IFoodCombined[] = [
-    { 'name': 'apple', 'organic': false, 'type': 'fruit' },
-    { 'name': 'carrot', 'organic': true, 'type': 'vegetable' }
-];
-
-const stoogesQuotes: IStoogesQuote[] = [
-    { 'name': 'curly', 'quotes': ['Oh, a wise guy, eh?', 'Poifect!'] },
-    { 'name': 'moe', 'quotes': ['Spread out!', 'You knucklehead!'] }
-];
 const stoogesAges: IStoogesAge[] = [
     { 'name': 'moe', 'age': 40 },
     { 'name': 'larry', 'age': 50 }
 ];
-const stoogesAgesDict: IDictionary<IStoogesAge> = {
-    first: { 'name': 'moe', 'age': 40 },
-    second: { 'name': 'larry', 'age': 50 }
-};
-const stoogesCombined: IStoogesCombined[] = [
-    { 'name': 'curly', 'age': 30, 'quotes': ['Oh, a wise guy, eh?', 'Poifect!'] },
-    { 'name': 'moe', 'age': 40, 'quotes': ['Spread out!', 'You knucklehead!'] }
-];
-
-const keys: IKey[] = [
-    { 'dir': 'left', 'code': 97 },
-    { 'dir': 'right', 'code': 100 }
-];
-
-class Dog {
-    constructor(public name: string) { }
-
-    bark() {
-        // Woof
-    }
-}
 
 let result: any;
 
@@ -130,7 +61,7 @@ namespace TestWrapper {
 
     {
         let result: _.LoDashImplicitArrayWrapper<string>;
-        result = _<string>(['']);
+        result = _(['']);
     }
 
     {
@@ -140,12 +71,12 @@ namespace TestWrapper {
 
     {
         let a: TResult[] = [];
-        _(a) // $ExpectType LoDashImplicitArrayWrapper<TResult>
+        _(a); // $ExpectType LoDashImplicitWrapper<TResult[]>
     }
 
     {
         let a: TResult[] | null | undefined = any;
-        _(a) // $ExpectType LoDashImplicitNillableArrayWrapper<TResult>
+        _(a); // $ExpectType LoDashImplicitWrapper<TResult[] | null | undefined>
     }
 }
 
@@ -217,7 +148,6 @@ namespace TestCompact {
     {
         let result: TResult[];
 
-        result = _.compact<TResult>();
         result = _.compact<TResult>(array);
         result = _.compact<TResult>(list);
         result = _.compact(array2);
@@ -227,14 +157,14 @@ namespace TestCompact {
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
-        result = _<TResult>(array).compact();
+        result = _(array).compact();
         result = _(list).compact<TResult>();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
-        result = _<TResult>(array).chain().compact();
+        result = _(array).chain().compact();
         result = _(list).chain().compact<TResult>();
     }
 }
@@ -300,181 +230,419 @@ namespace TestDifferenceBy {
     {
         let result: TResult[];
 
-        result = _.differenceBy<TResult>(array, array);
-        result = _.differenceBy<TResult>(array, list, array);
-        result = _.differenceBy<TResult>(array, array, list, array);
-        result = _.differenceBy<TResult>(array, list, array, list, array);
-        result = _.differenceBy<TResult>(array, array, list, array, list, array);
-        result = _.differenceBy<TResult>(array, list, array, list, array, list, array);
+        result = _.differenceBy(array);
+        result = _.differenceBy<TResult>(array, arrayParam);
+        result = _.differenceBy<TResult>(array, listParam, arrayParam);
+        result = _.differenceBy<TResult>(array, arrayParam, listParam, arrayParam);
+        result = _.differenceBy<TResult>(array, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy<TResult>(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy<TResult>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
-        result = _.differenceBy<TResult>(array, array, iteratee);
-        result = _.differenceBy<TResult>(array, list, array, iteratee);
-        result = _.differenceBy<TResult>(array, array, list, array, iteratee);
-        result = _.differenceBy<TResult>(array, list, array, list, array, iteratee);
-        result = _.differenceBy<TResult>(array, array, list, array, list, array, iteratee);
-        result = _.differenceBy<TResult>(array, list, array, list, array, list, array, iteratee);
+        result = _.differenceBy(array, arrayParam, iteratee);
+        result = _.differenceBy(array, listParam, arrayParam, iteratee);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, iteratee);
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, iteratee);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
+        result = _.differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
 
-        result = _.differenceBy<TResult>(array, array, 'a');
-        result = _.differenceBy<TResult>(array, list, array, 'a');
-        result = _.differenceBy<TResult>(array, array, list, array, 'a');
-        result = _.differenceBy<TResult>(array, list, array, list, array, 'a');
-        result = _.differenceBy<TResult>(array, array, list, array, list, array, 'a');
-        result = _.differenceBy<TResult>(array, list, array, list, array, list, array, 'a');
+        result = _.differenceBy(array, arrayParam, 'a');
+        result = _.differenceBy(array, listParam, arrayParam, 'a');
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, 'a');
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, 'a');
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
+        result = _.differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
 
-        result = _.differenceBy<TResult, {a: number}>(array, arrayParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, listParam, arrayParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, arrayParam, listParam, arrayParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _.differenceBy<TResult>(array, list, array, list, array, list, array, {a: 1});
+        result = _.differenceBy(array, arrayParam, {a: 1});
+        result = _.differenceBy(array, listParam, arrayParam, {a: 1});
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, {a: 1});
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _.differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _.differenceBy<TResult>(list, list);
-        result = _.differenceBy<TResult>(list, array, list);
-        result = _.differenceBy<TResult>(list, list, array, list);
-        result = _.differenceBy<TResult>(list, array, list, array, list);
-        result = _.differenceBy<TResult>(list, list, array, list, array, list);
-        result = _.differenceBy<TResult>(list, array, list, array, list, array, list);
+        result = _.differenceBy(list);
+        result = _.differenceBy<TResult>(list, listParam);
+        result = _.differenceBy<TResult>(list, arrayParam, listParam);
+        result = _.differenceBy<TResult>(list, listParam, arrayParam, listParam);
+        result = _.differenceBy<TResult>(list, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy<TResult>(list, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy<TResult>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
-        result = _.differenceBy<TResult>(list, list, iteratee);
-        result = _.differenceBy<TResult>(list, array, list, iteratee);
-        result = _.differenceBy<TResult>(list, list, array, list, iteratee);
-        result = _.differenceBy<TResult>(list, array, list, array, list, iteratee);
-        result = _.differenceBy<TResult>(list, list, array, list, array, list, iteratee);
-        result = _.differenceBy<TResult>(list, array, list, array, list, array, list, iteratee);
+        result = _.differenceBy(list, listParam, iteratee);
+        result = _.differenceBy(list, arrayParam, listParam, iteratee);
+        result = _.differenceBy(list, listParam, arrayParam, listParam, iteratee);
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, iteratee);
+        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
+        result = _.differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
 
-        result = _.differenceBy<TResult>(list, list, 'a');
-        result = _.differenceBy<TResult>(list, array, list, 'a');
-        result = _.differenceBy<TResult>(list, list, array, list, 'a');
-        result = _.differenceBy<TResult>(list, array, list, array, list, 'a');
-        result = _.differenceBy<TResult>(list, list, array, list, array, list, 'a');
-        result = _.differenceBy<TResult>(list, array, list, array, list, array, list, 'a');
+        result = _.differenceBy(list, listParam, 'a');
+        result = _.differenceBy(list, arrayParam, listParam, 'a');
+        result = _.differenceBy(list, listParam, arrayParam, listParam, 'a');
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, 'a');
+        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
+        result = _.differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
 
-        result = _.differenceBy<TResult, {a: number}>(list, listParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, arrayParam, listParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, listParam, arrayParam, listParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _.differenceBy<TResult>(list, array, list, array, list, array, list, {a: 1});
+        result = _.differenceBy(list, listParam, {a: 1});
+        result = _.differenceBy(list, arrayParam, listParam, {a: 1});
+        result = _.differenceBy(list, listParam, arrayParam, listParam, {a: 1});
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _.differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<TResult>;
+        let result: _.LoDashImplicitWrapper<TResult[]>;
 
-        result = _(array).differenceBy<TResult>(array);
-        result = _(array).differenceBy<TResult>(list, array);
-        result = _(array).differenceBy<TResult>(array, list, array);
-        result = _(array).differenceBy<TResult>(list, array, list, array);
-        result = _(array).differenceBy<TResult>(array, list, array, list, array);
-        result = _(array).differenceBy<TResult>(list, array, list, array, list, array);
+        result = _(array).differenceBy<TResult>(arrayParam);
+        result = _(array).differenceBy<TResult>(listParam, arrayParam);
+        result = _(array).differenceBy<TResult>(arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy<TResult>(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy<TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy<TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
-        result = _(array).differenceBy<TResult>(array, iteratee);
-        result = _(array).differenceBy<TResult>(list, array, iteratee);
-        result = _(array).differenceBy<TResult>(array, list, array, iteratee);
-        result = _(array).differenceBy<TResult>(list, array, list, array, iteratee);
-        result = _(array).differenceBy<TResult>(array, list, array, list, array, iteratee);
-        result = _(array).differenceBy<TResult>(list, array, list, array, list, array, iteratee);
+        result = _(array).differenceBy(arrayParam, iteratee);
+        result = _(array).differenceBy(listParam, arrayParam, iteratee);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, iteratee);
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, iteratee);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
+        result = _(array).differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
 
-        result = _(array).differenceBy<TResult>(array, 'a');
-        result = _(array).differenceBy<TResult>(list, array, 'a');
-        result = _(array).differenceBy<TResult>(array, list, array, 'a');
-        result = _(array).differenceBy<TResult>(list, array, list, array, 'a');
-        result = _(array).differenceBy<TResult>(array, list, array, list, array, 'a');
-        result = _(array).differenceBy<TResult>(list, array, list, array, list, array, 'a');
+        result = _(array).differenceBy(arrayParam, 'a');
+        result = _(array).differenceBy(listParam, arrayParam, 'a');
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, 'a');
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, 'a');
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
+        result = _(array).differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
 
-        result = _(array).differenceBy<TResult, {a: number}>(arrayParam, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy<TResult>(list, array, list, array, list, array, {a: 1});
+        result = _(array).differenceBy(arrayParam, {a: 1});
+        result = _(array).differenceBy(listParam, arrayParam, {a: 1});
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).differenceBy<TResult>(list);
-        result = _(list).differenceBy<TResult>(array, list);
-        result = _(list).differenceBy<TResult>(list, array, list);
-        result = _(list).differenceBy<TResult>(array, list, array, list);
-        result = _(list).differenceBy<TResult>(list, array, list, array, list);
-        result = _(list).differenceBy<TResult>(array, list, array, list, array, list);
+        result = _(list).differenceBy<TResult>(listParam);
+        result = _(list).differenceBy<TResult>(arrayParam, listParam);
+        result = _(list).differenceBy<TResult>(listParam, arrayParam, listParam);
+        result = _(list).differenceBy<TResult>(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy<TResult>(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy<TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
-        result = _(list).differenceBy<TResult>(list, iteratee);
-        result = _(list).differenceBy<TResult>(array, list, iteratee);
-        result = _(list).differenceBy<TResult>(list, array, list, iteratee);
-        result = _(list).differenceBy<TResult>(array, list, array, list, iteratee);
-        result = _(list).differenceBy<TResult>(list, array, list, array, list, iteratee);
-        result = _(list).differenceBy<TResult>(array, list, array, list, array, list, iteratee);
+        result = _(list).differenceBy(listParam, iteratee);
+        result = _(list).differenceBy(arrayParam, listParam, iteratee);
+        result = _(list).differenceBy(listParam, arrayParam, listParam, iteratee);
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, iteratee);
+        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
+        result = _(list).differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
 
-        result = _(list).differenceBy<TResult>(list, 'a');
-        result = _(list).differenceBy<TResult>(array, list, 'a');
-        result = _(list).differenceBy<TResult>(list, array, list, 'a');
-        result = _(list).differenceBy<TResult>(array, list, array, list, 'a');
-        result = _(list).differenceBy<TResult>(list, array, list, array, list, 'a');
-        result = _(list).differenceBy<TResult>(array, list, array, list, array, list, 'a');
+        result = _(list).differenceBy(listParam, 'a');
+        result = _(list).differenceBy(arrayParam, listParam, 'a');
+        result = _(list).differenceBy(listParam, arrayParam, listParam, 'a');
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, 'a');
+        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, 'a');
+        result = _(list).differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
 
-        result = _(list).differenceBy<TResult, {a: number}>(listParam, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy<TResult>(array, list, array, list, array, list, {a: 1});
+        result = _(list).differenceBy(listParam, {a: 1});
+        result = _(list).differenceBy(arrayParam, listParam, {a: 1});
+        result = _(list).differenceBy(listParam, arrayParam, listParam, {a: 1});
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _(list).differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<TResult[]>;
 
-        result = _(array).chain().differenceBy<TResult>(array);
-        result = _(array).chain().differenceBy<TResult>(list, array);
-        result = _(array).chain().differenceBy<TResult>(array, list, array);
-        result = _(array).chain().differenceBy<TResult>(list, array, list, array);
-        result = _(array).chain().differenceBy<TResult>(array, list, array, list, array);
-        result = _(array).chain().differenceBy<TResult>(list, array, list, array, list, array);
+        result = _(array).chain().differenceBy<TResult>(arrayParam);
+        result = _(array).chain().differenceBy<TResult>(listParam, arrayParam);
+        result = _(array).chain().differenceBy<TResult>(arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy<TResult>(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy<TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy<TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
-        result = _(array).chain().differenceBy<TResult>(array, iteratee);
-        result = _(array).chain().differenceBy<TResult>(list, array, iteratee);
-        result = _(array).chain().differenceBy<TResult>(array, list, array, iteratee);
-        result = _(array).chain().differenceBy<TResult>(list, array, list, array, iteratee);
-        result = _(array).chain().differenceBy<TResult>(array, list, array, list, array, iteratee);
-        result = _(array).chain().differenceBy<TResult>(list, array, list, array, list, array, iteratee);
+        result = _(array).chain().differenceBy(arrayParam, iteratee);
+        result = _(array).chain().differenceBy(listParam, arrayParam, iteratee);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, iteratee);
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, iteratee);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
+        result = _(array).chain().differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
 
-        result = _(array).chain().differenceBy<TResult>(array, 'a');
-        result = _(array).chain().differenceBy<TResult>(list, array, 'a');
-        result = _(array).chain().differenceBy<TResult>(array, list, array, 'a');
-        result = _(array).chain().differenceBy<TResult>(list, array, list, array, 'a');
-        result = _(array).chain().differenceBy<TResult>(array, list, array, list, array, 'a');
-        result = _(array).chain().differenceBy<TResult>(list, array, list, array, list, array, 'a');
+        result = _(array).chain().differenceBy(arrayParam, 'a');
+        result = _(array).chain().differenceBy(listParam, arrayParam, 'a');
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, 'a');
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, 'a');
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
+        result = _(array).chain().differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
 
-        result = _(array).chain().differenceBy<TResult, {a: number}>(arrayParam, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy<TResult>(list, array, list, array, list, array, {a: 1});
+        result = _(array).chain().differenceBy(arrayParam, {a: 1});
+        result = _(array).chain().differenceBy(listParam, arrayParam, {a: 1});
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).chain().differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).chain().differenceBy<TResult>(list);
-        result = _(list).chain().differenceBy<TResult>(array, list);
-        result = _(list).chain().differenceBy<TResult>(list, array, list);
-        result = _(list).chain().differenceBy<TResult>(array, list, array, list);
-        result = _(list).chain().differenceBy<TResult>(list, array, list, array, list);
-        result = _(list).chain().differenceBy<TResult>(array, list, array, list, array, list);
+        result = _(list).chain().differenceBy<TResult>(listParam);
+        result = _(list).chain().differenceBy<TResult>(arrayParam, listParam);
+        result = _(list).chain().differenceBy<TResult>(listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy<TResult>(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy<TResult>(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy<TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
-        result = _(list).chain().differenceBy<TResult>(list, iteratee);
-        result = _(list).chain().differenceBy<TResult>(array, list, iteratee);
-        result = _(list).chain().differenceBy<TResult>(list, array, list, iteratee);
-        result = _(list).chain().differenceBy<TResult>(array, list, array, list, iteratee);
-        result = _(list).chain().differenceBy<TResult>(list, array, list, array, list, iteratee);
-        result = _(list).chain().differenceBy<TResult>(array, list, array, list, array, list, iteratee);
+        result = _(list).chain().differenceBy(listParam, iteratee);
+        result = _(list).chain().differenceBy(arrayParam, listParam, iteratee);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, iteratee);
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, iteratee);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
+        result = _(list).chain().differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
 
-        result = _(list).chain().differenceBy<TResult>(list, 'a');
-        result = _(list).chain().differenceBy<TResult>(array, list, 'a');
-        result = _(list).chain().differenceBy<TResult>(list, array, list, 'a');
-        result = _(list).chain().differenceBy<TResult>(array, list, array, list, 'a');
-        result = _(list).chain().differenceBy<TResult>(list, array, list, array, list, 'a');
-        result = _(list).chain().differenceBy<TResult>(array, list, array, list, array, list, 'a');
+        result = _(list).chain().differenceBy(listParam, 'a');
+        result = _(list).chain().differenceBy(arrayParam, listParam, 'a');
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, 'a');
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, 'a');
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, 'a');
+        result = _(list).chain().differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
 
-        result = _(list).chain().differenceBy<TResult, {a: number}>(listParam, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy<TResult>(array, list, array, list, array, list, {a: 1});
+        result = _(list).chain().differenceBy(listParam, {a: 1});
+        result = _(list).chain().differenceBy(arrayParam, listParam, {a: 1});
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, {a: 1});
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _(list).chain().differenceBy<TResult, TResult, TResult, TResult, TResult, TResult, TResult>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
+    }
+
+    {
+        interface T1 {
+            a: string;
+            b: string;
+        }
+        interface T2 {
+            a: string;
+            b: number;
+        }
+        interface T3 {
+            a: string;
+            b: boolean;
+        }
+        interface T4 {
+            a: string;
+            b: any[];
+        }
+
+        const t1: T1 = { a: 'a', b: 'b' };
+        const t2: T2 = { a: 'a', b: 30 };
+        const t3: T3 = { a: 'a', b: true };
+        const t4: T4 = { a: 'a', b: [] };
+
+        // $ExpectType T1[]
+        _.differenceBy([t1], [t2], 'name');
+        // $ExpectType T1[]
+        _.differenceBy([t1], [t2], (value) => {
+            value; // $ExpectType T1 | T2
+            return 0;
+        });
+        // $ExpectType T1[]
+        _.differenceBy([t1], [t2, t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType (T1 | T2)[]
+        _.differenceBy([t1, t2], [t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType T1[]
+        _.differenceBy([t1], [t2], [t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType T1[]
+        _.differenceBy([t1], [t2], [t3], [t4], (value) => {
+            value; // $ExpectType T1 | T2 | T3 | T4
+            return 0;
+        });
+        // $ExpectType T1[]
+        _.differenceBy([t1], [t2], [t3], [t4], [''], (value) => {
+            value; // $ExpectType string | T1 | T2 | T3 | T4
+            return 0;
+        });
+        // $ExpectType T1[]
+        _.differenceBy([t1], [t2], [t3], [t4], [''], [42], (value) => {
+            value; // $ExpectType string | number | T1 | T2 | T3 | T4
+            return 0;
+        });
+
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceBy([t2], 'name');
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceBy([t2], (value) => {
+            value; // $ExpectType T1 | T2
+            return 0;
+        });
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceBy([t2, t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType LoDashImplicitWrapper<(T1 | T2)[]>
+        _([t1, t2]).differenceBy([t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceBy([t2], [t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceBy([t2], [t3], [t4], (value) => {
+            value; // $ExpectType T1 | T2 | T3 | T4
+            return 0;
+        });
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceBy([t2], [t3], [t4], [''], (value) => {
+            value; // $ExpectType string | T1 | T2 | T3 | T4
+            return 0;
+        });
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceBy([t2], [t3], [t4], [''], [42], (value) => {
+            value; // $ExpectType string | number | T1 | T2 | T3 | T4
+            return 0;
+        });
+
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceBy([t2], 'name');
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceBy([t2], (value) => {
+            value; // $ExpectType T1 | T2
+            return 0;
+        });
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceBy([t2, t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType LoDashExplicitWrapper<(T1 | T2)[]>
+        _.chain([t1, t2]).differenceBy([t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceBy([t2], [t3], (value) => {
+            value; // $ExpectType T1 | T2 | T3
+            return 0;
+        });
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceBy([t2], [t3], [t4], (value) => {
+            value; // $ExpectType T1 | T2 | T3 | T4
+            return 0;
+        });
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceBy([t2], [t3], [t4], [''], (value) => {
+            value; // $ExpectType string | T1 | T2 | T3 | T4
+            return 0;
+        });
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceBy([t2], [t3], [t4], [''], [42], (value) => {
+            value; // $ExpectType string | number | T1 | T2 | T3 | T4
+            return 0;
+        });
+    }
+}
+
+// _.differenceWith
+{
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let arrayParam: TResult[] = [];
+    let listParam: _.List<TResult> = [];
+    let comparator = (a: TResult, b: TResult) => true;
+
+    {
+        // $ExpectType TResult[]
+        _.differenceWith(array);
+        // $ExpectType TResult[]
+        _.differenceWith(array, arrayParam);
+        // $ExpectType TResult[]
+        _.differenceWith(array, listParam, arrayParam);
+        // $ExpectType TResult[]
+        _.differenceWith(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+
+        // $ExpectType TResult[]
+        _.differenceWith(array, arrayParam, comparator);
+        // $ExpectType TResult[]
+        _.differenceWith(array, listParam, arrayParam, comparator);
+        // $ExpectType TResult[]
+        _.differenceWith(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator);
+    }
+
+    {
+        // $ExpectType LoDashImplicitWrapper<TResult[]>
+        _(array).differenceWith(arrayParam);
+        // $ExpectType LoDashImplicitWrapper<TResult[]>
+        _(array).differenceWith(listParam, arrayParam);
+        // $ExpectType LoDashImplicitWrapper<TResult[]>
+        _(array).differenceWith(arrayParam, listParam, arrayParam);
+        // $ExpectType LoDashImplicitWrapper<TResult[]>
+        _(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+
+        // $ExpectType LoDashImplicitWrapper<TResult[]>
+        _(array).differenceWith(arrayParam, comparator);
+        // $ExpectType LoDashImplicitWrapper<TResult[]>
+        _(array).differenceWith(listParam, arrayParam, comparator);
+        // $ExpectType LoDashImplicitWrapper<TResult[]>
+        _(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator);
+    }
+
+    {
+        // $ExpectType LoDashExplicitWrapper<TResult[]>
+        _.chain(array).differenceWith(arrayParam);
+        // $ExpectType LoDashExplicitWrapper<TResult[]>
+        _.chain(array).differenceWith(listParam, arrayParam);
+        // $ExpectType LoDashExplicitWrapper<TResult[]>
+        _.chain(array).differenceWith(arrayParam, listParam, arrayParam);
+        // $ExpectType LoDashExplicitWrapper<TResult[]>
+        _.chain(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+
+        // $ExpectType LoDashExplicitWrapper<TResult[]>
+        _.chain(array).differenceWith(arrayParam, comparator);
+        // $ExpectType LoDashExplicitWrapper<TResult[]>
+        _.chain(array).differenceWith(listParam, arrayParam, comparator);
+        // $ExpectType LoDashExplicitWrapper<TResult[]>
+        _.chain(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator);
+    }
+
+    {
+        interface T1 {
+            a: string;
+            b: string;
+        }
+        interface T2 {
+            a: string;
+            b: number;
+        }
+
+        const t1: T1 = { a: 'a', b: 'b' };
+        const t2: T2 | undefined = any;
+
+        // $ExpectType T1[]
+        _.differenceWith([t1], [t2], (a, b) => {
+            a; // $ExpectType T1
+            b; // $ExpectType T2 | undefined
+            return true;
+        });
+
+        // $ExpectType LoDashImplicitWrapper<T1[]>
+        _([t1]).differenceWith([t2], (a, b) => {
+            a; // $ExpectType T1
+            b; // $ExpectType T2 | undefined
+            return true;
+        });
+
+        // $ExpectType LoDashExplicitWrapper<T1[]>
+        _.chain([t1]).differenceWith([t2], (a, b) => {
+            a; // $ExpectType T1
+            b; // $ExpectType T2 | undefined
+            return true;
+        });
     }
 }
 
@@ -561,12 +729,12 @@ namespace TestDropRightWhile {
         result = _.dropRightWhile<TResult>(array);
         result = _.dropRightWhile<TResult>(array, predicateFn);
         result = _.dropRightWhile<TResult>(array, '');
-        result = _.dropRightWhile<{a: number;}, TResult>(array, {a: 42});
+        result = _.dropRightWhile(array, {a: 42});
 
         result = _.dropRightWhile<TResult>(list);
         result = _.dropRightWhile<TResult>(list, predicateFn);
         result = _.dropRightWhile<TResult>(list, '');
-        result = _.dropRightWhile<{a: number;}, TResult>(list, {a: 42});
+        result = _.dropRightWhile(list, {a: 42});
     }
 
     {
@@ -575,12 +743,12 @@ namespace TestDropRightWhile {
         result = _(array).dropRightWhile();
         result = _(array).dropRightWhile(predicateFn);
         result = _(array).dropRightWhile('');
-        result = _(array).dropRightWhile<{a: number;}>({a: 42});
+        result = _(array).dropRightWhile({a: 42});
 
         result = _(list).dropRightWhile<TResult>();
         result = _(list).dropRightWhile<TResult>(predicateFn);
         result = _(list).dropRightWhile<TResult>('');
-        result = _(list).dropRightWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).dropRightWhile({a: 42});
     }
 
     {
@@ -589,12 +757,12 @@ namespace TestDropRightWhile {
         result = _(array).chain().dropRightWhile();
         result = _(array).chain().dropRightWhile(predicateFn);
         result = _(array).chain().dropRightWhile('');
-        result = _(array).chain().dropRightWhile<{a: number;}>({a: 42});
+        result = _(array).chain().dropRightWhile({a: 42});
 
         result = _(list).chain().dropRightWhile<TResult>();
         result = _(list).chain().dropRightWhile<TResult>(predicateFn);
         result = _(list).chain().dropRightWhile<TResult>('');
-        result = _(list).chain().dropRightWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).chain().dropRightWhile({a: 42});
     }
 }
 
@@ -610,12 +778,12 @@ namespace TestDropWhile {
         result = _.dropWhile<TResult>(array);
         result = _.dropWhile<TResult>(array, predicateFn);
         result = _.dropWhile<TResult>(array, '');
-        result = _.dropWhile<{a: number;}, TResult>(array, {a: 42});
+        result = _.dropWhile(array, {a: 42});
 
         result = _.dropWhile<TResult>(list);
         result = _.dropWhile<TResult>(list, predicateFn);
         result = _.dropWhile<TResult>(list, '');
-        result = _.dropWhile<{a: number;}, TResult>(list, {a: 42});
+        result = _.dropWhile(list, {a: 42});
     }
 
     {
@@ -624,12 +792,12 @@ namespace TestDropWhile {
         result = _(array).dropWhile();
         result = _(array).dropWhile(predicateFn);
         result = _(array).dropWhile('');
-        result = _(array).dropWhile<{a: number;}>({a: 42});
+        result = _(array).dropWhile({a: 42});
 
         result = _(list).dropWhile<TResult>();
         result = _(list).dropWhile<TResult>(predicateFn);
         result = _(list).dropWhile<TResult>('');
-        result = _(list).dropWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).dropWhile({a: 42});
     }
 
     {
@@ -638,66 +806,66 @@ namespace TestDropWhile {
         result = _(array).chain().dropWhile();
         result = _(array).chain().dropWhile(predicateFn);
         result = _(array).chain().dropWhile('');
-        result = _(array).chain().dropWhile<{a: number;}>({a: 42});
+        result = _(array).chain().dropWhile({a: 42});
 
         result = _(list).chain().dropWhile<TResult>();
         result = _(list).chain().dropWhile<TResult>(predicateFn);
         result = _(list).chain().dropWhile<TResult>('');
-        result = _(list).chain().dropWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).chain().dropWhile({a: 42});
     }
 }
 
 // _.fill
 namespace TestFill {
-    let array: TResult[] | null | undefined = [] as any;
-    let list: _.List<TResult> | null | undefined = [] as any;
+    let array: number[] | null | undefined = [] as any;
+    let list: _.List<number> | null | undefined = [] as any;
 
     {
         let result: number[];
 
         result = _.fill<number>(array, 42);
-        result = _.fill<number>(array, 42, 0);
-        result = _.fill<number>(array, 42, 0, 10);
+        result = _.fill(array, 42, 0);
+        result = _.fill(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);
+        result = _.fill(list, 42, 0);
+        result = _.fill(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);
+        result = _(array).fill(42, 0);
+        result = _(array).fill(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);
+        result = _(list).fill(42, 0);
+        result = _(list).fill(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);
+        result = _(array).chain().fill(42, 0);
+        result = _(array).chain().fill(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);
+        result = _(list).chain().fill(42, 0);
+        result = _(list).chain().fill(42, 0, 10);
     }
 }
 
@@ -714,21 +882,21 @@ namespace TestFindIndex {
         result = _.findIndex<TResult>(array);
         result = _.findIndex<TResult>(array, predicateFn);
         result = _.findIndex<TResult>(array, '');
-        result = _.findIndex<{a: number}, TResult>(array, {a: 42});
+        result = _.findIndex(array, {a: 42});
         result = _.findIndex<TResult>(array, predicateFn, fromIndex);
 
         result = _.findIndex<TResult>(list);
         result = _.findIndex<TResult>(list, predicateFn);
         result = _.findIndex<TResult>(list, '');
-        result = _.findIndex<{a: number}, TResult>(list, {a: 42});
+        result = _.findIndex(list, {a: 42});
         result = _.findIndex<TResult>(list, predicateFn, fromIndex);
         result = _.findIndex([{ b: 5 }], ['b', 5]);
 
-        result = _<TResult>(array).findIndex();
-        result = _<TResult>(array).findIndex(predicateFn);
-        result = _<TResult>(array).findIndex('');
-        result = _<TResult>(array).findIndex<{a: number}>({a: 42});
-        result = _<TResult>(array).findIndex(predicateFn, fromIndex);
+        result = _(array).findIndex();
+        result = _(array).findIndex(predicateFn);
+        result = _(array).findIndex('');
+        result = _(array).findIndex<{a: number}>({a: 42});
+        result = _(array).findIndex(predicateFn, fromIndex);
 
         result = _(list).findIndex();
         result = _(list).findIndex<TResult>(predicateFn);
@@ -740,11 +908,11 @@ namespace TestFindIndex {
     {
         let result: _.LoDashExplicitWrapper<number>;
 
-        result = _<TResult>(array).chain().findIndex();
-        result = _<TResult>(array).chain().findIndex(predicateFn);
-        result = _<TResult>(array).chain().findIndex('');
-        result = _<TResult>(array).chain().findIndex<{a: number}>({a: 42});
-        result = _<TResult>(array).chain().findIndex(predicateFn, fromIndex);
+        result = _(array).chain().findIndex();
+        result = _(array).chain().findIndex(predicateFn);
+        result = _(array).chain().findIndex('');
+        result = _(array).chain().findIndex<{a: number}>({a: 42});
+        result = _(array).chain().findIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findIndex();
         result = _(list).chain().findIndex<TResult>(predicateFn);
@@ -768,21 +936,21 @@ namespace TestFindLastIndex {
         result = _.findLastIndex<TResult>(array);
         result = _.findLastIndex<TResult>(array, predicateFn);
         result = _.findLastIndex<TResult>(array, '');
-        result = _.findLastIndex<{a: number}, TResult>(array, {a: 42});
+        result = _.findLastIndex(array, {a: 42});
         result = _.findLastIndex<TResult>(array, predicateFn, fromIndex);
 
         result = _.findLastIndex<TResult>(list);
         result = _.findLastIndex<TResult>(list, predicateFn);
         result = _.findLastIndex<TResult>(list, '');
-        result = _.findLastIndex<{a: number}, TResult>(list, {a: 42});
+        result = _.findLastIndex(list, {a: 42});
         result = _.findLastIndex<TResult>(list, predicateFn, fromIndex);
         result = _.findLastIndex([{ b: 5 }], ['b', 5]);
 
-        result = _<TResult>(array).findLastIndex();
-        result = _<TResult>(array).findLastIndex(predicateFn);
-        result = _<TResult>(array).findLastIndex('');
-        result = _<TResult>(array).findLastIndex<{a: number}>({a: 42});
-        result = _<TResult>(array).findLastIndex(predicateFn, fromIndex);
+        result = _(array).findLastIndex();
+        result = _(array).findLastIndex(predicateFn);
+        result = _(array).findLastIndex('');
+        result = _(array).findLastIndex<{a: number}>({a: 42});
+        result = _(array).findLastIndex(predicateFn, fromIndex);
 
         result = _(list).findLastIndex();
         result = _(list).findLastIndex<TResult>(predicateFn);
@@ -794,11 +962,11 @@ namespace TestFindLastIndex {
     {
         let result: _.LoDashExplicitWrapper<number>;
 
-        result = _<TResult>(array).chain().findLastIndex();
-        result = _<TResult>(array).chain().findLastIndex(predicateFn);
-        result = _<TResult>(array).chain().findLastIndex('');
-        result = _<TResult>(array).chain().findLastIndex<{a: number}>({a: 42});
-        result = _<TResult>(array).chain().findLastIndex(predicateFn, fromIndex);
+        result = _(array).chain().findLastIndex();
+        result = _(array).chain().findLastIndex(predicateFn);
+        result = _(array).chain().findLastIndex('');
+        result = _(array).chain().findLastIndex<{a: number}>({a: 42});
+        result = _(array).chain().findLastIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findLastIndex();
         result = _(list).chain().findLastIndex<TResult>(predicateFn);
@@ -831,16 +999,16 @@ namespace TestFirst {
     }
 
     {
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _('abc').chain().first();
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<TResult | undefined>;
 
-        result = _(array).chain().first<_.LoDashExplicitObjectWrapper<TResult>>();
-        result = _(list).chain().first<_.LoDashExplicitObjectWrapper<TResult>>();
+        result = _(array).chain().first();
+        result = _(list).chain().first();
     }
 }
 
@@ -876,11 +1044,11 @@ namespace TestFlatten {
     {
         let result: _.RecursiveArray<number>;
 
-        result = _.flatten<number>([1, [2, [3]]]);
-        result = _.flatten<number>([1, [2, [3]], [[4]]]);
+        result = _.flatten([1, [2, [3]]]);
+        result = _.flatten([1, [2, [3]], [[4]]]);
 
-        result = _.flatten<number>({0: 1, 1: [2, [3]], length: 2});
-        result = _.flatten<number>({0: 1, 1: [2, [3]], 2: [[4]], length: 3});
+        result = _.flatten({0: 1, 1: [2, [3]], length: 2});
+        result = _.flatten({0: 1, 1: [2, [3]], 2: [[4]], length: 3});
     }
 
     {
@@ -1080,16 +1248,16 @@ namespace TestHead {
     }
 
     {
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _('abc').chain().head();
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<TResult | undefined>;
 
-        result = _(array).chain().head<_.LoDashExplicitObjectWrapper<TResult>>();
-        result = _(list).chain().head<_.LoDashExplicitObjectWrapper<TResult>>();
+        result = _(array).chain().head();
+        result = _(list).chain().head();
     }
 }
 
@@ -1184,8 +1352,8 @@ namespace TestInitial {
 
 // _.intersection
 namespace TestIntersection {
-    let array: TResult[] | null | undefined = [] as any;
-    let list: _.List<TResult> | null | undefined = [] as any;
+    let array: TResult[] = [] as any;
+    let list: _.List<TResult> = [] as any;
     let arrayParam: TResult[] = [] as any;
     let listParam: _.List<TResult> = [] as any;
 
@@ -1217,6 +1385,197 @@ namespace TestIntersection {
     }
 }
 
+// _.intersectionBy
+{
+    let array: TResult[] = [] as any;
+    let list: _.List<TResult> = [] as any;
+    let arrayParam: TResult[] = [] as any;
+    let listParam: _.List<TResult> = [] as any;
+
+    // $ExpectType TResult[]
+    result = _.intersectionBy(array, list);
+    // $ExpectType TResult[]
+    result = _.intersectionBy(list, array, list);
+    // $ExpectType TResult[]
+    result = _.intersectionBy(array, list, 'a');
+    // $ExpectType TResult[]
+    result = _.intersectionBy(array, list, { a: 42 });
+    // $ExpectType TResult[]
+    result = _.intersectionBy(list, array, list, { a: 42 });
+    // $ExpectType TResult[]
+    result = _.intersectionBy(array, list, ['a', 42]);
+    // $ExpectType TResult[]
+    result = _.intersectionBy(array, list, (value) => {
+        value; // $ExpectType TResult
+        return 0;
+    });
+    // $ExpectType TResult[]
+    result = _.intersectionBy(list, array, list, (value) => {
+        value; // $ExpectType TResult
+        return 0;
+    });
+
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionBy(arrayParam);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionBy(listParam, arrayParam);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionBy(list, 'a');
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionBy(list, { a: 42 });
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(list).intersectionBy(array, list, { a: 42 });
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionBy(list, ['a', 42]);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionBy(list, (value) => {
+        value; // $ExpectType TResult
+        return "";
+    });
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(list).intersectionBy(array, list, (value) => {
+        value; // $ExpectType TResult
+        return 1;
+    });
+
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionBy(arrayParam);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionBy(listParam, arrayParam);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionBy(list, 'a');
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionBy(list, { a: 42 });
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(list).intersectionBy(array, list, { a: 42 });
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionBy(list, ['a', 42]);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionBy(list, (value) => {
+        value; // $ExpectType TResult
+        return false;
+    });
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(list).intersectionBy(array, list, (value) => {
+        value; // $ExpectType TResult
+        return null;
+    });
+
+    interface T1 {
+        a: string;
+        b: string;
+    }
+    interface T2 {
+        a: string;
+        b: number;
+    }
+    const t1: T1 = { a: 'a', b: 'b' };
+    const t2: T2 = { a: 'a', b: 1 };
+    // $ExpectType T1[]
+    result = _.intersectionBy([t1], [t2], (value) => {
+        value; // $ExpectType T1 | T2
+        return undefined;
+    });
+    // $ExpectType LoDashImplicitWrapper<T1[]>
+    result = _([t1]).intersectionBy([t2], (value) => {
+        value; // $ExpectType T1 | T2
+        return {};
+    });
+    // $ExpectType LoDashExplicitWrapper<T1[]>
+    result = _.chain([t1]).intersectionBy([t2], (value) => {
+        value; // $ExpectType T1 | T2
+        return {};
+    });
+}
+
+// _.intersectionWith
+{
+    let array: TResult[] = [] as any;
+    let list: _.List<TResult> = [] as any;
+    let arrayParam: TResult[] = [] as any;
+    let listParam: _.List<TResult> = [] as any;
+
+    // $ExpectType TResult[]
+    result = _.intersectionWith(array, list);
+    // $ExpectType TResult[]
+    result = _.intersectionWith(list, array, list);
+    // $ExpectType TResult[]
+    result = _.intersectionWith(array, list, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+    // $ExpectType TResult[]
+    result = _.intersectionWith(list, array, list, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionWith(arrayParam);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionWith(listParam, arrayParam);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(array).intersectionWith(list, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    result = _(list).intersectionWith(array, list, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionWith(arrayParam);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionWith(listParam, arrayParam);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(array).intersectionWith(list, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    result = _.chain(list).intersectionWith(array, list, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+
+    interface T1 {
+        a: string;
+        b: string;
+    }
+    interface T2 {
+        a: string;
+        b: number;
+    }
+    const t1: T1 = { a: 'a', b: 'b' };
+    const t2: T2 = { a: 'a', b: 1 };
+    // $ExpectType T1[]
+    result = _.intersectionWith([t1], [t2], (a, b) => {
+        a; // $ExpectType T1
+        b; // $ExpectType T2
+        return true;
+    });
+    // $ExpectType LoDashImplicitWrapper<T1[]>
+    result = _([t1]).intersectionWith([t2], (a, b) => {
+        a; // $ExpectType T1
+        b; // $ExpectType T2
+        return true;
+    });
+    // $ExpectType LoDashExplicitWrapper<T1[]>
+    result = _.chain([t1]).intersectionWith([t2], (a, b) => {
+        a; // $ExpectType T1
+        b; // $ExpectType T2
+        return true;
+    });
+}
+
 // _.join
 namespace TestJoin {
     let array = [1, 2];
@@ -1281,21 +1640,21 @@ namespace TestLast {
     }
 
     {
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _('abc').chain().last();
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<TResult | undefined>;
 
-        result = _(array).chain().last<_.LoDashExplicitObjectWrapper<TResult>>();
+        result = _(array).chain().last();
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<TResult | undefined>;
 
-        result = _(list).chain().last<_.LoDashExplicitObjectWrapper<TResult>>();
+        result = _(list).chain().last();
     }
 }
 
@@ -1359,7 +1718,7 @@ namespace TestNth {
     }
 
     {
-        let result: _.LoDashExplicitWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<TResult | undefined>;
 
         result = _(array).chain().nth();
         result = _(array).chain().nth(42);
@@ -1442,6 +1801,10 @@ namespace TestPullAt {
         result = _.pullAt<TResult>(array, 1);
         result = _.pullAt<TResult>(array, [2, 3], 1);
         result = _.pullAt<TResult>(array, 4, [2, 3], 1);
+    }
+
+    {
+        let result: ArrayLike<TResult>;
 
         result = _.pullAt<TResult>(list);
         result = _.pullAt<TResult>(list, 1);
@@ -1456,11 +1819,15 @@ namespace TestPullAt {
         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: _.LoDashImplicitWrapper<ArrayLike<TResult>>;
+
+        result = _(list).pullAt();
+        result = _(list).pullAt(1);
+        result = _(list).pullAt([2, 3], 1);
+        result = _(list).pullAt(4, [2, 3], 1);
     }
 
     {
@@ -1470,12 +1837,275 @@ namespace TestPullAt {
         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);
     }
+
+    {
+        let result: _.LoDashExplicitWrapper<ArrayLike<TResult>>;
+
+        result = _(list).chain().pullAt();
+        result = _(list).chain().pullAt(1);
+        result = _(list).chain().pullAt([2, 3], 1);
+        result = _(list).chain().pullAt(4, [2, 3], 1);
+    }
+}
+
+// _.pullAll
+{
+    let array: TResult[] = any;
+    let list: _.List<TResult> = any;
+    let values: _.List<TResult> = any;
+
+    // $ExpectType TResult[]
+    _.pullAll(array);
+    // $ExpectType TResult[]
+    _.pullAll(array, values);
+    // $ExpectType ArrayLike<TResult>
+    _.pullAll(list);
+    // $ExpectType ArrayLike<TResult>
+    _.pullAll(list, values);
+
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAll();
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAll(values);
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAll();
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAll(values);
+
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAll();
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAll(values);
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAll();
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAll(values);
+}
+
+// _.pullAllBy
+{
+    let array: TResult[] = any;
+    let list: _.List<TResult> = any;
+    let values: _.List<TResult> = any;
+
+    // $ExpectType TResult[]
+    _.pullAllBy(array);
+    // $ExpectType TResult[]
+    _.pullAllBy(array, values);
+    // $ExpectType TResult[]
+    _.pullAllBy(array, values, 'a');
+    // $ExpectType TResult[]
+    _.pullAllBy(array, values, { a: 42 });
+    // $ExpectType TResult[]
+    _.pullAllBy(array, values, ['a', 42]);
+    // $ExpectType TResult[]
+    _.pullAllBy(array, values, (value) => {
+        value; // $ExpectType TResult
+        return [];
+    });
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllBy(list);
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllBy(list, values);
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllBy(list, values, 'a');
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllBy(list, values, { a: 42 });
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllBy(list, values, ['a', 42]);
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllBy(list, values, (value) => {
+        value; // $ExpectType TResult
+        return () => {};
+    });
+
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllBy();
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllBy(values);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllBy(values, 'a');
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllBy(values, { a: 42 });
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllBy(values, ['a', 42]);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllBy(values, (value) => {
+        value; // $ExpectType TResult
+        return 0;
+    });
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllBy();
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllBy(values);
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllBy(values, 'a');
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllBy(values, { a: 42 });
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllBy(values, ['a', 42]);
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllBy(values, (value) => {
+        value; // $ExpectType TResult
+        return 0;
+    });
+
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllBy();
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllBy(values);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllBy(values, 'a');
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllBy(values, { a: 42 });
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllBy(values, ['a', 42]);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllBy(values, (value) => {
+        value; // $ExpectType TResult
+        return 0;
+    });
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllBy();
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllBy(values);
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllBy(values, 'a');
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllBy(values, { a: 42 });
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllBy(values, ['a', 42]);
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllBy(values, (value) => {
+        value; // $ExpectType TResult
+        return 0;
+    });
+
+    interface T1 {
+        a: string;
+        b: string;
+    }
+    interface T2 {
+        a: string;
+        b: number;
+    }
+    const t1: T1 = { a: 'a', b: 'b' };
+    const t2: T2 = { a: 'a', b: 1 };
+    // $ExpectType T1[]
+    result = _.pullAllBy([t1], [t2], (value) => {
+        value; // $ExpectType T1 | T2
+        return "";
+    });
+    // $ExpectType LoDashImplicitWrapper<T1[]>
+    result = _([t1]).pullAllBy([t2], (value) => {
+        value; // $ExpectType T1 | T2
+        return "";
+    });
+    // $ExpectType LoDashExplicitWrapper<T1[]>
+    result = _.chain([t1]).pullAllBy([t2], (value) => {
+        value; // $ExpectType T1 | T2
+        return "";
+    });
+}
+
+// _.pullAllWith
+{
+    let array: TResult[] = any;
+    let list: _.List<TResult> = any;
+    let values: _.List<TResult> = any;
+
+    // $ExpectType TResult[]
+    _.pullAllWith(array);
+    // $ExpectType TResult[]
+    _.pullAllWith(array, values);
+    // $ExpectType TResult[]
+    _.pullAllWith(array, values, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllWith(list);
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllWith(list, values);
+    // $ExpectType ArrayLike<TResult>
+    _.pullAllWith(list, values, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllWith();
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllWith(values);
+    // $ExpectType LoDashImplicitWrapper<TResult[]>
+    _(array).pullAllWith(values, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllWith();
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllWith(values);
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<TResult>>
+    _(list).pullAllWith(values, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllWith();
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllWith(values);
+    // $ExpectType LoDashExplicitWrapper<TResult[]>
+    _.chain(array).pullAllWith(values, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllWith();
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllWith(values);
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<TResult>>
+    _.chain(list).pullAllWith(values, (a, b) => {
+        a; // $ExpectType TResult
+        b; // $ExpectType TResult
+        return true;
+    });
+
+    interface T1 {
+        a: string;
+        b: string;
+    }
+    interface T2 {
+        a: string;
+        b: number;
+    }
+    const t1: T1 = { a: 'a', b: 'b' };
+    const t2: T2 = { a: 'a', b: 1 };
+    // $ExpectType T1[]
+    result = _.pullAllWith([t1], [t2], (a, b) => {
+        a; // $ExpectType T1
+        b; // $ExpectType T2
+        return true;
+    });
+    // $ExpectType LoDashImplicitWrapper<T1[]>
+    result = _([t1]).pullAllWith([t2], (a, b) => {
+        a; // $ExpectType T1
+        b; // $ExpectType T2
+        return true;
+    });
+    // $ExpectType LoDashExplicitWrapper<T1[]>
+    result = _.chain([t1]).pullAllWith([t2], (a, b) => {
+        a; // $ExpectType T1
+        b; // $ExpectType T2
+        return true;
+    });
 }
 
 // _.remove
@@ -1490,40 +2120,40 @@ namespace TestRemove {
         result = _.remove<TResult>(array);
         result = _.remove<TResult>(array, predicateFn);
         result = _.remove<TResult>(array, '');
-        result = _.remove<{a: number}, TResult>(array, {a: 42});
+        result = _.remove(array, {a: 42});
 
         result = _.remove<TResult>(list);
         result = _.remove<TResult>(list, predicateFn);
         result = _.remove<TResult>(list, '');
-        result = _.remove<{a: number}, TResult>(list, {a: 42});
+        result = _.remove(list, {a: 42});
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
-        result = _<TResult>(array).remove();
-        result = _<TResult>(array).remove(predicateFn);
-        result = _<TResult>(array).remove('');
-        result = _<TResult>(array).remove<{a: number}>({a: 42});
+        result = _(array).remove();
+        result = _(array).remove(predicateFn);
+        result = _(array).remove('');
+        result = _(array).remove({a: 42});
 
         result = _(list).remove<TResult>();
         result = _(list).remove<TResult>(predicateFn);
         result = _(list).remove<TResult>('');
-        result = _(list).remove<{a: number}, TResult>({a: 42});
+        result = _(list).remove({a: 42});
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
-        result = _<TResult>(array).chain().remove();
-        result = _<TResult>(array).chain().remove(predicateFn);
-        result = _<TResult>(array).chain().remove('');
-        result = _<TResult>(array).chain().remove<{a: number}>({a: 42});
+        result = _(array).chain().remove();
+        result = _(array).chain().remove(predicateFn);
+        result = _(array).chain().remove('');
+        result = _(array).chain().remove({a: 42});
 
         result = _(list).chain().remove<TResult>();
         result = _(list).chain().remove<TResult>(predicateFn);
         result = _(list).chain().remove<TResult>('');
-        result = _(list).chain().remove<{a: number}, TResult>({a: 42});
+        result = _(list).chain().remove({a: 42});
     }
 }
 
@@ -1640,47 +2270,38 @@ namespace TestSortedIndexBy {
         let result: number;
 
         result = _.sortedIndexBy<string>('', '', stringIterator);
-        result = _.sortedIndexBy<string, number>('', '', stringIterator);
 
         result = _.sortedIndexBy<SampleType>(array, value, arrayIterator);
         result = _.sortedIndexBy<SampleType>(array, value, '');
         result = _.sortedIndexBy<SampleType>(array, value, {a: 42});
-        result = _.sortedIndexBy<SampleType, number>(array, value, arrayIterator);
-        result = _.sortedIndexBy<{a: number}, SampleType>(array, value, {a: 42});
 
         result = _.sortedIndexBy<SampleType>(list, value, listIterator);
         result = _.sortedIndexBy<SampleType>(list, value, '');
         result = _.sortedIndexBy<SampleType>(list, value, {a: 42});
-        result = _.sortedIndexBy<SampleType, number>(list, value, listIterator);
-        result = _.sortedIndexBy<{a: number}, SampleType>(list, value, {a: 42});
 
-        result = _('').sortedIndexBy<number>('', stringIterator);
+        result = _('').sortedIndexBy('', stringIterator);
 
-        result = _(array).sortedIndexBy<number>(value, arrayIterator);
+        result = _(array).sortedIndexBy(value, arrayIterator);
         result = _(array).sortedIndexBy(value, '');
-        result = _(array).sortedIndexBy<{a: number}>(value, {a: 42});
+        result = _(array).sortedIndexBy(value, {a: 42});
 
         result = _(list).sortedIndexBy<SampleType>(value, listIterator);
         result = _(list).sortedIndexBy<SampleType>(value, '');
         result = _(list).sortedIndexBy<SampleType>(value, {a: 42});
-        result = _(list).sortedIndexBy<SampleType, number>(value, listIterator);
-        result = _(list).sortedIndexBy<{a: number}, SampleType>(value, {a: 42});
     }
 
     {
         let result: _.LoDashExplicitWrapper<number>;
 
-        result = _('').chain().sortedIndexBy<number>('', stringIterator);
+        result = _('').chain().sortedIndexBy('', stringIterator);
 
-        result = _(array).chain().sortedIndexBy<number>(value, arrayIterator);
+        result = _(array).chain().sortedIndexBy(value, arrayIterator);
         result = _(array).chain().sortedIndexBy(value, '');
-        result = _(array).chain().sortedIndexBy<{a: number}>(value, {a: 42});
+        result = _(array).chain().sortedIndexBy(value, {a: 42});
 
         result = _(list).chain().sortedIndexBy<SampleType>(value, listIterator);
         result = _(list).chain().sortedIndexBy<SampleType>(value, '');
         result = _(list).chain().sortedIndexBy<SampleType>(value, {a: 42});
-        result = _(list).chain().sortedIndexBy<SampleType, number>(value, listIterator);
-        result = _(list).chain().sortedIndexBy<{a: number}, SampleType>(value, {a: 42});
     }
 }
 
@@ -1741,47 +2362,38 @@ namespace TestSortedLastIndexBy {
         let result: number;
 
         result = _.sortedLastIndexBy<string>('', '', stringIterator);
-        result = _.sortedLastIndexBy<string, number>('', '', stringIterator);
 
         result = _.sortedLastIndexBy<SampleType>(array, value, arrayIterator);
         result = _.sortedLastIndexBy<SampleType>(array, value, '');
         result = _.sortedLastIndexBy<SampleType>(array, value, {a: 42});
-        result = _.sortedLastIndexBy<SampleType, number>(array, value, arrayIterator);
-        result = _.sortedLastIndexBy<{a: number}, SampleType>(array, value, {a: 42});
 
         result = _.sortedLastIndexBy<SampleType>(list, value, listIterator);
         result = _.sortedLastIndexBy<SampleType>(list, value, '');
         result = _.sortedLastIndexBy<SampleType>(list, value, {a: 42});
-        result = _.sortedLastIndexBy<SampleType, number>(list, value, listIterator);
-        result = _.sortedLastIndexBy<{a: number}, SampleType>(list, value, {a: 42});
 
-        result = _('').sortedLastIndexBy<number>('', stringIterator);
+        result = _('').sortedLastIndexBy('', stringIterator);
 
-        result = _(array).sortedLastIndexBy<number>(value, arrayIterator);
+        result = _(array).sortedLastIndexBy(value, arrayIterator);
         result = _(array).sortedLastIndexBy(value, '');
-        result = _(array).sortedLastIndexBy<{a: number}>(value, {a: 42});
+        result = _(array).sortedLastIndexBy(value, {a: 42});
 
         result = _(list).sortedLastIndexBy<SampleType>(value, listIterator);
         result = _(list).sortedLastIndexBy<SampleType>(value, '');
         result = _(list).sortedLastIndexBy<SampleType>(value, {a: 42});
-        result = _(list).sortedLastIndexBy<SampleType, number>(value, listIterator);
-        result = _(list).sortedLastIndexBy<{a: number}, SampleType>(value, {a: 42});
     }
 
     {
         let result: _.LoDashExplicitWrapper<number>;
 
-        result = _('').chain().sortedLastIndexBy<number>('', stringIterator);
+        result = _('').chain().sortedLastIndexBy('', stringIterator);
 
-        result = _(array).chain().sortedLastIndexBy<number>(value, arrayIterator);
+        result = _(array).chain().sortedLastIndexBy(value, arrayIterator);
         result = _(array).chain().sortedLastIndexBy(value, '');
-        result = _(array).chain().sortedLastIndexBy<{a: number}>(value, {a: 42});
+        result = _(array).chain().sortedLastIndexBy(value, {a: 42});
 
         result = _(list).chain().sortedLastIndexBy<SampleType>(value, listIterator);
         result = _(list).chain().sortedLastIndexBy<SampleType>(value, '');
         result = _(list).chain().sortedLastIndexBy<SampleType>(value, {a: 42});
-        result = _(list).chain().sortedLastIndexBy<SampleType, number>(value, listIterator);
-        result = _(list).chain().sortedLastIndexBy<{a: number}, SampleType>(value, {a: 42});
     }
 }
 
@@ -1896,12 +2508,12 @@ namespace TestTakeRightWhile {
         result = _.takeRightWhile<TResult>(array);
         result = _.takeRightWhile<TResult>(array, predicateFn);
         result = _.takeRightWhile<TResult>(array, '');
-        result = _.takeRightWhile<{a: number;}, TResult>(array, {a: 42});
+        result = _.takeRightWhile(array, {a: 42});
 
         result = _.takeRightWhile<TResult>(list);
         result = _.takeRightWhile<TResult>(list, predicateFn);
         result = _.takeRightWhile<TResult>(list, '');
-        result = _.takeRightWhile<{a: number;}, TResult>(list, {a: 42});
+        result = _.takeRightWhile(list, {a: 42});
     }
 
     {
@@ -1910,12 +2522,12 @@ namespace TestTakeRightWhile {
         result = _(array).takeRightWhile();
         result = _(array).takeRightWhile(predicateFn);
         result = _(array).takeRightWhile('');
-        result = _(array).takeRightWhile<{a: number;}>({a: 42});
+        result = _(array).takeRightWhile({a: 42});
 
         result = _(list).takeRightWhile<TResult>();
         result = _(list).takeRightWhile<TResult>(predicateFn);
         result = _(list).takeRightWhile<TResult>('');
-        result = _(list).takeRightWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).takeRightWhile({a: 42});
     }
 
     {
@@ -1924,12 +2536,12 @@ namespace TestTakeRightWhile {
         result = _(array).chain().takeRightWhile();
         result = _(array).chain().takeRightWhile(predicateFn);
         result = _(array).chain().takeRightWhile('');
-        result = _(array).chain().takeRightWhile<{a: number;}>({a: 42});
+        result = _(array).chain().takeRightWhile({a: 42});
 
         result = _(list).chain().takeRightWhile<TResult>();
         result = _(list).chain().takeRightWhile<TResult>(predicateFn);
         result = _(list).chain().takeRightWhile<TResult>('');
-        result = _(list).chain().takeRightWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).chain().takeRightWhile({a: 42});
     }
 }
 
@@ -1945,12 +2557,12 @@ namespace TestTakeWhile {
         result = _.takeWhile<TResult>(array);
         result = _.takeWhile<TResult>(array, predicateFn);
         result = _.takeWhile<TResult>(array, '');
-        result = _.takeWhile<{a: number;}, TResult>(array, {a: 42});
+        result = _.takeWhile(array, {a: 42});
 
         result = _.takeWhile<TResult>(list);
         result = _.takeWhile<TResult>(list, predicateFn);
         result = _.takeWhile<TResult>(list, '');
-        result = _.takeWhile<{a: number;}, TResult>(list, {a: 42});
+        result = _.takeWhile(list, {a: 42});
     }
 
     {
@@ -1959,12 +2571,12 @@ namespace TestTakeWhile {
         result = _(array).takeWhile();
         result = _(array).takeWhile(predicateFn);
         result = _(array).takeWhile('');
-        result = _(array).takeWhile<{a: number;}>({a: 42});
+        result = _(array).takeWhile({a: 42});
 
         result = _(list).takeWhile<TResult>();
         result = _(list).takeWhile<TResult>(predicateFn);
         result = _(list).takeWhile<TResult>('');
-        result = _(list).takeWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).takeWhile({a: 42});
     }
 
     {
@@ -1973,12 +2585,12 @@ namespace TestTakeWhile {
         result = _(array).chain().takeWhile();
         result = _(array).chain().takeWhile(predicateFn);
         result = _(array).chain().takeWhile('');
-        result = _(array).chain().takeWhile<{a: number;}>({a: 42});
+        result = _(array).chain().takeWhile({a: 42});
 
         result = _(list).chain().takeWhile<TResult>();
         result = _(list).chain().takeWhile<TResult>(predicateFn);
         result = _(list).chain().takeWhile<TResult>('');
-        result = _(list).chain().takeWhile<{a: number;}, TResult>({a: 42});
+        result = _(list).chain().takeWhile({a: 42});
     }
 }
 
@@ -2061,10 +2673,10 @@ namespace TestUnionBy {
         result = _.unionBy<TResult>(array, list, array, list, array, 'a');
         result = _.unionBy<TResult>(array, array, list, array, list, array, 'a');
 
-        result = _.unionBy<TResult, {a: number}>(array, array, {a: 1});
-        result = _.unionBy<TResult, {a: number}>(array, list, array, {a: 1});
-        result = _.unionBy<TResult, {a: number}>(array, array, list, array, {a: 1});
-        result = _.unionBy<TResult, {a: number}>(array, list, array, list, array, {a: 1});
+        result = _.unionBy(array, array, {a: 1});
+        result = _.unionBy(array, list, array, {a: 1});
+        result = _.unionBy(array, array, list, array, {a: 1});
+        result = _.unionBy(array, list, array, list, array, {a: 1});
         result = _.unionBy<TResult>(array, list, array, list, array, list, {a: 1});
 
         result = _.unionBy<TResult>(list, list);
@@ -2085,10 +2697,10 @@ namespace TestUnionBy {
         result = _.unionBy<TResult>(list, array, list, array, list, 'a');
         result = _.unionBy<TResult>(list, list, array, list, array, list, 'a');
 
-        result = _.unionBy<TResult, {a: number}>(list, list, {a: 1});
-        result = _.unionBy<TResult, {a: number}>(list, array, list, {a: 1});
-        result = _.unionBy<TResult, {a: number}>(list, list, array, list, {a: 1});
-        result = _.unionBy<TResult, {a: number}>(list, array, list, array, list, {a: 1});
+        result = _.unionBy(list, list, {a: 1});
+        result = _.unionBy(list, array, list, {a: 1});
+        result = _.unionBy(list, list, array, list, {a: 1});
+        result = _.unionBy(list, array, list, array, list, {a: 1});
         result = _.unionBy<TResult>(list, array, list, array, list, array, {a: 1});
     }
 
@@ -2113,10 +2725,10 @@ namespace TestUnionBy {
         result = _(array).unionBy<TResult>(list, array, list, array, 'a');
         result = _(array).unionBy<TResult>(array, list, array, list, array, 'a');
 
-        result = _(array).unionBy<TResult, {a: number}>(array, {a: 1});
-        result = _(array).unionBy<TResult, {a: number}>(list, array, {a: 1});
-        result = _(array).unionBy<TResult, {a: number}>(array, list, array, {a: 1});
-        result = _(array).unionBy<TResult, {a: number}>(list, array, list, array, {a: 1});
+        result = _(array).unionBy(array, {a: 1});
+        result = _(array).unionBy(list, array, {a: 1});
+        result = _(array).unionBy(array, list, array, {a: 1});
+        result = _(array).unionBy(list, array, list, array, {a: 1});
         result = _(array).unionBy<TResult>(list, array, list, array, list, {a: 1});
 
         result = _(list).unionBy<TResult>(list);
@@ -2137,10 +2749,10 @@ namespace TestUnionBy {
         result = _(list).unionBy<TResult>(array, list, array, list, 'a');
         result = _(list).unionBy<TResult>(list, array, list, array, list, 'a');
 
-        result = _(list).unionBy<TResult, {a: number}>(list, {a: 1});
-        result = _(list).unionBy<TResult, {a: number}>(array, list, {a: 1});
-        result = _(list).unionBy<TResult, {a: number}>(list, array, list, {a: 1});
-        result = _(list).unionBy<TResult, {a: number}>(array, list, array, list, {a: 1});
+        result = _(list).unionBy(list, {a: 1});
+        result = _(list).unionBy(array, list, {a: 1});
+        result = _(list).unionBy(list, array, list, {a: 1});
+        result = _(list).unionBy(array, list, array, list, {a: 1});
         result = _(list).unionBy<TResult>(array, list, array, list, array, {a: 1});
     }
 
@@ -2165,10 +2777,10 @@ namespace TestUnionBy {
         result = _(array).chain().unionBy<TResult>(list, array, list, array, 'a');
         result = _(array).chain().unionBy<TResult>(array, list, array, list, array, 'a');
 
-        result = _(array).chain().unionBy<TResult, {a: number}>(array, {a: 1});
-        result = _(array).chain().unionBy<TResult, {a: number}>(list, array, {a: 1});
-        result = _(array).chain().unionBy<TResult, {a: number}>(array, list, array, {a: 1});
-        result = _(array).chain().unionBy<TResult, {a: number}>(list, array, list, array, {a: 1});
+        result = _(array).chain().unionBy(array, {a: 1});
+        result = _(array).chain().unionBy(list, array, {a: 1});
+        result = _(array).chain().unionBy(array, list, array, {a: 1});
+        result = _(array).chain().unionBy(list, array, list, array, {a: 1});
         result = _(array).chain().unionBy<TResult>(list, array, list, array, list, {a: 1});
 
         result = _(list).chain().unionBy<TResult>(list);
@@ -2189,10 +2801,10 @@ namespace TestUnionBy {
         result = _(list).chain().unionBy<TResult>(array, list, array, list, 'a');
         result = _(list).chain().unionBy<TResult>(list, array, list, array, list, 'a');
 
-        result = _(list).chain().unionBy<TResult, {a: number}>(list, {a: 1});
-        result = _(list).chain().unionBy<TResult, {a: number}>(array, list, {a: 1});
-        result = _(list).chain().unionBy<TResult, {a: number}>(list, array, list, {a: 1});
-        result = _(list).chain().unionBy<TResult, {a: number}>(array, list, array, list, {a: 1});
+        result = _(list).chain().unionBy(list, {a: 1});
+        result = _(list).chain().unionBy(array, list, {a: 1});
+        result = _(list).chain().unionBy(list, array, list, {a: 1});
+        result = _(list).chain().unionBy(array, list, array, list, {a: 1});
         result = _(list).chain().unionBy<TResult>(array, list, array, list, array, {a: 1});
     }
 }
@@ -2255,7 +2867,6 @@ namespace TestUniqBy {
     {
         let result: string[];
 
-        result = _.uniqBy<string>('abc', stringIterator);
         result = _.uniqBy('abc', stringIterator);
     }
 
@@ -2263,16 +2874,12 @@ namespace TestUniqBy {
         let result: SampleObject[];
 
         result = _.uniqBy<SampleObject>(array, listIterator);
-        result = _.uniqBy<SampleObject, number>(array, listIterator);
         result = _.uniqBy<SampleObject>(array, 'a');
         result = _.uniqBy<SampleObject>(array, {a: 42});
-        result = _.uniqBy<{a: number}, SampleObject>(array, {a: 42});
 
         result = _.uniqBy<SampleObject>(list, listIterator);
-        result = _.uniqBy<SampleObject, number>(list, listIterator);
         result = _.uniqBy<SampleObject>(list, 'a');
         result = _.uniqBy<SampleObject>(list, {a: 42});
-        result = _.uniqBy<{a: number}, SampleObject>(list, {a: 42});
     }
 
     {
@@ -2284,15 +2891,13 @@ namespace TestUniqBy {
     {
         let result: _.LoDashImplicitArrayWrapper<SampleObject>;
 
-        result = _(array).uniqBy<number>(listIterator);
+        result = _(array).uniqBy(listIterator);
         result = _(array).uniqBy('a');
-        result = _(array).uniqBy<{a: number}>({a: 42});
+        result = _(array).uniqBy({a: 42});
 
         result = _(list).uniqBy<SampleObject>(listIterator);
-        result = _(list).uniqBy<SampleObject, number>(listIterator);
         result = _(list).uniqBy<SampleObject>('a');
         result = _(list).uniqBy<SampleObject>({a: 42});
-        result = _(list).uniqBy<{a: number}, SampleObject>({a: 42});
     }
 
     {
@@ -2304,15 +2909,13 @@ namespace TestUniqBy {
     {
         let result: _.LoDashExplicitArrayWrapper<SampleObject>;
 
-        result = _(array).chain().uniqBy<number>(listIterator);
+        result = _(array).chain().uniqBy(listIterator);
         result = _(array).chain().uniqBy('a');
-        result = _(array).chain().uniqBy<{a: number}>({a: 42});
+        result = _(array).chain().uniqBy({a: 42});
 
         result = _(list).chain().uniqBy<SampleObject>(listIterator);
-        result = _(list).chain().uniqBy<SampleObject, number>(listIterator);
         result = _(list).chain().uniqBy<SampleObject>('a');
         result = _(list).chain().uniqBy<SampleObject>({a: 42});
-        result = _(list).chain().uniqBy<{a: number}, SampleObject>({a: 42});
     }
 }
 
@@ -2370,7 +2973,6 @@ namespace TestSortedUniqBy {
     {
         let result: string[];
 
-        result = _.sortedUniqBy<string>('abc', stringIterator);
         result = _.sortedUniqBy('abc', stringIterator);
     }
 
@@ -2378,16 +2980,12 @@ namespace TestSortedUniqBy {
         let result: SampleObject[];
 
         result = _.sortedUniqBy<SampleObject>(array, listIterator);
-        result = _.sortedUniqBy<SampleObject, number>(array, listIterator);
         result = _.sortedUniqBy<SampleObject>(array, 'a');
         result = _.sortedUniqBy<SampleObject>(array, {a: 42});
-        result = _.sortedUniqBy<{a: number}, SampleObject>(array, {a: 42});
 
         result = _.sortedUniqBy<SampleObject>(list, listIterator);
-        result = _.sortedUniqBy<SampleObject, number>(list, listIterator);
         result = _.sortedUniqBy<SampleObject>(list, 'a');
         result = _.sortedUniqBy<SampleObject>(list, {a: 42});
-        result = _.sortedUniqBy<{a: number}, SampleObject>(list, {a: 42});
     }
 
     {
@@ -2399,15 +2997,13 @@ namespace TestSortedUniqBy {
     {
         let result: _.LoDashImplicitArrayWrapper<SampleObject>;
 
-        result = _(array).sortedUniqBy<number>(listIterator);
+        result = _(array).sortedUniqBy(listIterator);
         result = _(array).sortedUniqBy('a');
-        result = _(array).sortedUniqBy<{a: number}>({a: 42});
+        result = _(array).sortedUniqBy({a: 42});
 
         result = _(list).sortedUniqBy<SampleObject>(listIterator);
-        result = _(list).sortedUniqBy<SampleObject, number>(listIterator);
         result = _(list).sortedUniqBy<SampleObject>('a');
         result = _(list).sortedUniqBy<SampleObject>({a: 42});
-        result = _(list).sortedUniqBy<{a: number}, SampleObject>({a: 42});
     }
 
     {
@@ -2419,15 +3015,13 @@ namespace TestSortedUniqBy {
     {
         let result: _.LoDashExplicitArrayWrapper<SampleObject>;
 
-        result = _(array).chain().sortedUniqBy<number>(listIterator);
+        result = _(array).chain().sortedUniqBy(listIterator);
         result = _(array).chain().sortedUniqBy('a');
-        result = _(array).chain().sortedUniqBy<{a: number}>({a: 42});
+        result = _(array).chain().sortedUniqBy({a: 42});
 
         result = _(list).chain().sortedUniqBy<SampleObject>(listIterator);
-        result = _(list).chain().sortedUniqBy<SampleObject, number>(listIterator);
         result = _(list).chain().sortedUniqBy<SampleObject>('a');
         result = _(list).chain().sortedUniqBy<SampleObject>({a: 42});
-        result = _(list).chain().sortedUniqBy<{a: number}, SampleObject>({a: 42});
     }
 }
 
@@ -2475,16 +3069,62 @@ namespace TestUnzip {
 
 // _.unzipWith
 {
-    let testUnzipWithArray: (number[]|_.List<number>)[] | null | undefined = [] as any;
+    let testUnzipWithArray: Array<number[]|_.List<number>> | null | undefined = [] as any;
     let testUnzipWithList: _.List<number[]|_.List<number>> | null | undefined = [] as any;
-    let testUnzipWithIterator: {(prev: TResult, curr: number, index?: number, list?: number[]): TResult} = (prev: TResult, curr: number, index?: number, list?: number[]) => ({ a: 1, b: "", c: true });
-    let result: TResult[];
-    result = _.unzipWith<number, TResult>(testUnzipWithArray);
-    result = _.unzipWith<number, TResult>(testUnzipWithArray, testUnzipWithIterator);
-    result = _.unzipWith<number, TResult>(testUnzipWithList);
-    result = _.unzipWith<number, TResult>(testUnzipWithList, testUnzipWithIterator);
-    result = _(testUnzipWithArray).unzipWith<number, TResult>(testUnzipWithIterator).value();
-    result = _(testUnzipWithList).unzipWith<number, TResult>(testUnzipWithIterator).value();
+
+    {
+        _.unzipWith(testUnzipWithArray); // $ExpectType number[][]
+        _.unzipWith(testUnzipWithList); // $ExpectType number[][]
+        _(testUnzipWithArray).unzipWith(); // $ExpectType LoDashImplicitWrapper<number[][]>
+        _(testUnzipWithList).unzipWith(); // $ExpectType LoDashImplicitWrapper<number[][]>
+        _.chain(testUnzipWithArray).unzipWith(); // $ExpectType LoDashExplicitWrapper<number[][]>
+        _.chain(testUnzipWithList).unzipWith(); // $ExpectType LoDashExplicitWrapper<number[][]>
+    }
+
+    {
+        let result: TResult[];
+        result = _.unzipWith(testUnzipWithArray, (...group) => {
+            group; // $ExpectType number[]
+            return any as TResult;
+        });
+        result = _.unzipWith(testUnzipWithArray, (value1, value2, value3) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            return any as TResult;
+        });
+        result = _.unzipWith(testUnzipWithList, (...group) => {
+            group; // $ExpectType number[]
+            return any as TResult;
+        });
+        result = _.unzipWith(testUnzipWithList, (value1, value2, value3) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            return any as TResult;
+        });
+
+        result = _(testUnzipWithArray).unzipWith((...group): TResult => {
+            group; // $ExpectType number[]
+            return any as TResult;
+        }).value();
+        result = _(testUnzipWithArray).unzipWith((value1, value2, value3) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            return any as TResult;
+        }).value();
+        result = _(testUnzipWithList).unzipWith((...group): TResult => {
+            group; // $ExpectType number[]
+            return any as TResult;
+        }).value();
+        result = _(testUnzipWithList).unzipWith((value1, value2, value3) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            return any as TResult;
+        }).value();
+    }
 }
 
 // _.without
@@ -2618,36 +3258,34 @@ namespace TestZip {
 
 // _.zipObject
 namespace TestZipObject {
+    const zipObjectResult = _.zipObject(['a', 'b'], [1, 2]);
+    const zipObjectDeepResult = _.zipObjectDeep(['a.b[0].c', 'a.b[1].d'], [1, 2]);
+
     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 = _.zipObject(arrayOfKeys);
+        result = _.zipObject(listOfKeys);
     }
 
     {
         let result: _.Dictionary<number>;
 
-        result = _.zipObject<_.Dictionary<number>>(arrayOfKeys, arrayOfValues);
-        result = _.zipObject<_.Dictionary<number>>(arrayOfKeys, listOfValues);
-        result = _.zipObject<_.Dictionary<number>>(listOfKeys, listOfValues);
-        result = _.zipObject<_.Dictionary<number>>(listOfKeys, arrayOfValues);
+        result = _.zipObject(arrayOfKeys, arrayOfValues);
+        result = _.zipObject(arrayOfKeys, listOfValues);
+        result = _.zipObject(listOfKeys, listOfValues);
+        result = _.zipObject(listOfKeys, arrayOfValues);
 
-        result = _.zipObject<number, _.Dictionary<number>>(arrayOfKeys, arrayOfValues);
-        result = _.zipObject<number, _.Dictionary<number>>(arrayOfKeys, listOfValues);
-        result = _.zipObject<number, _.Dictionary<number>>(listOfKeys, listOfValues);
-        result = _.zipObject<number, _.Dictionary<number>>(listOfKeys, arrayOfValues);
-
-        result = _.zipObject<_.Dictionary<number>>(arrayOfKeyValuePairs);
-        result = _.zipObject<_.Dictionary<number>>(listOfKeyValuePairs);
+        result = _.zipObject(arrayOfKeys, arrayOfValues);
+        result = _.zipObject(arrayOfKeys, listOfValues);
+        result = _.zipObject(listOfKeys, listOfValues);
+        result = _.zipObject(listOfKeys, arrayOfValues);
     }
 
     {
@@ -2666,33 +3304,27 @@ namespace TestZipObject {
         result = _.zipObjectDeep(listOfKeys, listOfValues);
         result = _.zipObject(listOfKeys, arrayOfValues);
         result = _.zipObjectDeep(listOfKeys, arrayOfValues);
-
-        result = _.zipObject<_.Dictionary<number>>(arrayOfKeyValuePairs);
-        result = _.zipObject<_.Dictionary<number>>(listOfKeyValuePairs);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<void>>;
 
-        result = _(arrayOfKeys).zipObject<_.Dictionary<void>>();
-        result = _(listOfKeys).zipObject<_.Dictionary<void>>();
+        result = _(arrayOfKeys).zipObject();
+        result = _(listOfKeys).zipObject();
     }
 
     {
         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(arrayOfValues);
+        result = _(arrayOfKeys).zipObject(listOfValues);
+        result = _(listOfKeys).zipObject(listOfValues);
+        result = _(listOfKeys).zipObject(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);
+        result = _(arrayOfKeys).zipObject(arrayOfValues);
+        result = _(arrayOfKeys).zipObject(listOfValues);
+        result = _(listOfKeys).zipObject(listOfValues);
+        result = _(listOfKeys).zipObject(arrayOfValues);
     }
 
     {
@@ -2711,35 +3343,27 @@ namespace TestZipObject {
         result = _(listOfKeys).zipObjectDeep(listOfValues);
         result = _(listOfKeys).zipObject(arrayOfValues);
         result = _(listOfKeys).zipObjectDeep(arrayOfValues);
-
-        result = _(listOfKeys).zipObject(arrayOfKeyValuePairs);
-        result = _(listOfKeys).zipObjectDeep(arrayOfKeyValuePairs);
-        result = _(listOfKeys).zipObject(listOfKeyValuePairs);
-        result = _(listOfKeys).zipObjectDeep(listOfKeyValuePairs);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<void>>;
 
-        result = _(arrayOfKeys).chain().zipObject<_.Dictionary<void>>();
-        result = _(listOfKeys).chain().zipObject<_.Dictionary<void>>();
+        result = _(arrayOfKeys).chain().zipObject();
+        result = _(listOfKeys).chain().zipObject();
     }
 
     {
         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(arrayOfValues);
+        result = _(arrayOfKeys).chain().zipObject(listOfValues);
+        result = _(listOfKeys).chain().zipObject(listOfValues);
+        result = _(listOfKeys).chain().zipObject(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);
+        result = _(arrayOfKeys).chain().zipObject(arrayOfValues);
+        result = _(arrayOfKeys).chain().zipObject(listOfValues);
+        result = _(listOfKeys).chain().zipObject(listOfValues);
+        result = _(listOfKeys).chain().zipObject(arrayOfValues);
     }
 
     {
@@ -2758,27 +3382,164 @@ namespace TestZipObject {
         result = _(listOfKeys).chain().zipObjectDeep(listOfValues);
         result = _(listOfKeys).chain().zipObject(arrayOfValues);
         result = _(listOfKeys).chain().zipObjectDeep(arrayOfValues);
-
-        result = _(listOfKeys).chain().zipObject(arrayOfKeyValuePairs);
-        result = _(listOfKeys).chain().zipObjectDeep(arrayOfKeyValuePairs);
-        result = _(listOfKeys).chain().zipObject(listOfKeyValuePairs);
-        result = _(listOfKeys).chain().zipObjectDeep(listOfKeyValuePairs);
     }
 }
 
 // _.zipWith
-interface TestZipWithFn {
-    (a1: number, a2: number): number;
+namespace TestZipWith {
+    type TestZipWithFn = (a1: number, a2: number) => number;
+
+    {
+        let result: number[][];
+        result = _.zipWith([1, 2]);
+        result = _.zipWith([1, 2], [3, 4], [5, 6]);
+        result = _([1, 2]).zipWith().value();
+        result = _([1, 2]).zipWith([3, 4], [5, 6]).value();
+        result = _.chain([1, 2]).zipWith().value();
+        result = _.chain([1, 2]).zipWith([3, 4], [5, 6]).value();
+    }
+    {
+        let result: number[];
+
+        result = _.zipWith([1, 2], (value1) => {
+            value1; // $ExpectType number
+            return 1;
+        });
+        result = _.zipWith([1, 2], [1, 2], (value1, value2) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            return 1;
+        });
+        result = _.zipWith([1, 2], [1, 2], [1, 2], (value1, value2, value3) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            return 1;
+        });
+        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            return 1;
+        });
+        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            value5; // $ExpectType number
+            return 1;
+        });
+        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5, value6) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            value5; // $ExpectType number
+            value6; // $ExpectType number
+            return 1;
+        });
+        result = _.zipWith([1, 2], [1, 2], [1, 2], (...group: number[]) => 1);
+        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
+            group; // $ExpectType number[]
+            return 1;
+        });
+
+        let mat = [[1, 2], [1, 2], [1, 2]];
+        result = _.zipWith(...mat, (...group: number[]) => 1);
+
+        result = _([1, 2]).zipWith((value1) => {
+            value1; // $ExpectType number
+            return 1;
+        }).value();
+        result = _([1, 2]).zipWith([1, 2], (value1, value2) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            return 1;
+        }).value();
+        result = _([1, 2]).zipWith([1, 2], [1, 2], (value1, value2, value3) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            return 1;
+        }).value();
+        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], (value1, value2, value3, value4) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            return 1;
+        }).value();
+        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            value5; // $ExpectType number
+            return 1;
+        }).value();
+        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5, value6) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            value5; // $ExpectType number
+            value6; // $ExpectType number
+            return 1;
+        }).value();
+        result = _([1, 2]).zipWith([1, 2], [1, 2], (...group: number[]) => 1).value();
+        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
+            group; // $ExpectType number[]
+            return 1;
+        }).value();
+
+        result = _.chain([1, 2]).zipWith((value1) => {
+            value1; // $ExpectType number
+            return 1;
+        }).value();
+        result = _.chain([1, 2]).zipWith([1, 2], (value1, value2) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            return 1;
+        }).value();
+        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], (value1, value2, value3) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            return 1;
+        }).value();
+        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], (value1, value2, value3, value4) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            return 1;
+        }).value();
+        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            value5; // $ExpectType number
+            return 1;
+        }).value();
+        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5, value6) => {
+            value1; // $ExpectType number
+            value2; // $ExpectType number
+            value3; // $ExpectType number
+            value4; // $ExpectType number
+            value5; // $ExpectType number
+            value6; // $ExpectType number
+            return 1;
+        }).value();
+        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], (...group: number[]) => 1).value();
+        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
+            group; // $ExpectType number[]
+            return 1;
+        }).value();
+    }
 }
-let testZipWithFn: TestZipWithFn = (a1, a2) => 1;
-result = <number[]>_.zipWith<number>([1, 2]);
-result = <number[]>_.zipWith<number>([1, 2], testZipWithFn);
-result = <number[]>_.zipWith<number>([1, 2], [1, 2], testZipWithFn);
-result = <number[]>_.zipWith<number>([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], testZipWithFn);
-result = <number[]>_([1, 2]).zipWith<number>().value();
-result = <number[]>_([1, 2]).zipWith<number>(testZipWithFn).value();
-result = <number[]>_([1, 2]).zipWith<number>([1, 2], testZipWithFn).value();
-result = <number[]>_([1, 2]).zipWith<number>([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], testZipWithFn).value();
 
 /*********
  * Chain *
@@ -2868,7 +3629,7 @@ namespace TestTap {
 
     {
         let interceptor = (value: {a: string}) => {};
-        let result: _.LoDashImplicitObjectWrapper<{a: string}>;
+        let result: _.LoDashImplicitWrapper<{a: string}>;
 
         _.chain({a: ''}).tap(interceptor);
 
@@ -2895,7 +3656,7 @@ namespace TestTap {
 
     {
         let interceptor = (value: {a: string}) => {};
-        let result: _.LoDashExplicitObjectWrapper<{a: string}>;
+        let result: _.LoDashExplicitWrapper<{a: string}>;
 
         _.chain({a: ''}).tap(interceptor);
 
@@ -2948,7 +3709,7 @@ namespace TestThru {
         let interceptor: Interceptor<number[]> = (x) => x;
         let result: _.LoDashImplicitArrayWrapper<number>;
 
-        result = _([1, 2, 3]).thru<number>(interceptor);
+        result = _([1, 2, 3]).thru(interceptor);
     }
 
     {
@@ -2983,7 +3744,7 @@ namespace TestThru {
         let interceptor: Interceptor<number[]> = (x) => x;
         let result: _.LoDashExplicitArrayWrapper<number>;
 
-        result = _([1, 2, 3]).chain().thru<number>(interceptor);
+        result = _([1, 2, 3]).chain().thru(interceptor);
     }
 }
 
@@ -3037,13 +3798,13 @@ namespace TestConcat {
     {
         let result: _.LoDashImplicitArrayWrapper<string>;
 
-        result = _<string>(['']).concat<string>(['']);
-        result = _<string>(['']).concat<string>([''], ['']);
-        result = _<string>(['']).concat<string>([''], [''], ['']);
+        result = _(['']).concat<string>(['']);
+        result = _(['']).concat<string>([''], ['']);
+        result = _(['']).concat<string>([''], [''], ['']);
 
-        result = _<string>(['']).concat(['']);
-        result = _<string>(['']).concat([''], ['']);
-        result = _<string>(['']).concat([''], [''], ['']);
+        result = _(['']).concat(['']);
+        result = _(['']).concat([''], ['']);
+        result = _(['']).concat([''], [''], ['']);
     }
 
     {
@@ -3073,13 +3834,13 @@ namespace TestConcat {
     {
         let result: _.LoDashExplicitArrayWrapper<string>;
 
-        result = _<string>(['']).chain().concat<string>(['']);
-        result = _<string>(['']).chain().concat<string>([''], ['']);
-        result = _<string>(['']).chain().concat<string>([''], [''], ['']);
+        result = _(['']).chain().concat<string>(['']);
+        result = _(['']).chain().concat<string>([''], ['']);
+        result = _(['']).chain().concat<string>([''], [''], ['']);
 
-        result = _<string>(['']).chain().concat(['']);
-        result = _<string>(['']).chain().concat([''], ['']);
-        result = _<string>(['']).chain().concat([''], [''], ['']);
+        result = _(['']).chain().concat(['']);
+        result = _(['']).chain().concat([''], ['']);
+        result = _(['']).chain().concat([''], [''], ['']);
     }
 
     {
@@ -3123,7 +3884,7 @@ namespace TestPlant {
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<{}>;
+        let result: _.LoDashImplicitWrapper<{}>;
         result = _(any).plant<{}>({});
     }
 
@@ -3153,7 +3914,7 @@ namespace TestPlant {
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<{}>;
+        let result: _.LoDashExplicitWrapper<{}>;
         result = _(any).chain().plant<{}>({});
     }
 }
@@ -3197,8 +3958,8 @@ namespace TestToJSON {
     {
         let result: string[];
 
-        result = _<string>([]).toJSON();
-        result = _<string>([]).chain().toJSON();
+        result = _(['']).toJSON();
+        result = _(['']).chain().toJSON();
     }
 
     {
@@ -3216,13 +3977,13 @@ namespace TestToString {
     result = _('').toString();
     result = _(42).toString();
     result = _(true).toString();
-    result = _<string>(['']).toString();
+    result = _(['']).toString();
     result = _({}).toString();
 
     result = _('').chain().toString();
     result = _(42).chain().toString();
     result = _(true).chain().toString();
-    result = _<string>(['']).chain().toString();
+    result = _(['']).chain().toString();
     result = _({}).chain().toString();
 }
 
@@ -3252,8 +4013,8 @@ namespace TestValue {
     {
         let result: string[];
 
-        result = _<string>([]).value();
-        result = _<string>([]).chain().value();
+        result = _(['']).value();
+        result = _(['']).chain().value();
     }
 
     {
@@ -3290,8 +4051,8 @@ namespace TestValueOf {
     {
         let result: string[];
 
-        result = _<string>([]).valueOf();
-        result = _<string>([]).chain().valueOf();
+        result = _(['']).valueOf();
+        result = _(['']).chain().valueOf();
     }
 
     {
@@ -3345,7 +4106,7 @@ namespace TestCountBy {
     let dictionary: _.Dictionary<TResult> | null | undefined = obj;
     let numericDictionary: _.NumericDictionary<TResult> | null | undefined = obj;
 
-    let stringIterator: (value: string, index: number, collection: ArrayLike<string>) => any = (value: string, index: number, collection: ArrayLike<string>) => 1;
+    let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
     let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 1;
     let numericDictionaryIterator: (value: TResult, key: number, collection: _.NumericDictionary<TResult>) => any = (value: TResult, key: number, collection: _.NumericDictionary<TResult>) => 1;
@@ -3359,25 +4120,25 @@ namespace TestCountBy {
         result = _.countBy<TResult>(array);
         result = _.countBy<TResult>(array, listIterator);
         result = _.countBy<TResult>(array, '');
-        result = _.countBy<{a: number}, TResult>(array, {a: 42});
+        result = _.countBy(array, {a: 42});
         result = _.countBy<TResult>(array, {a: 42});
 
         result = _.countBy<TResult>(list);
         result = _.countBy<TResult>(list, listIterator);
         result = _.countBy<TResult>(list, '');
-        result = _.countBy<{a: number}, TResult>(list, {a: 42});
+        result = _.countBy(list, {a: 42});
         result = _.countBy<TResult>(list, {a: 42});
 
         result = _.countBy<TResult>(dictionary);
-        result = _.countBy<TResult>(dictionary, dictionaryIterator);
+        result = _.countBy(dictionary, dictionaryIterator);
         result = _.countBy<TResult>(dictionary, '');
-        result = _.countBy<{a: number}, TResult>(dictionary, {a: 42});
+        result = _.countBy(dictionary, {a: 42});
         result = _.countBy<TResult>(dictionary, {a: 42});
 
         result = _.countBy<TResult>(numericDictionary);
         result = _.countBy<TResult>(numericDictionary, numericDictionaryIterator);
         result = _.countBy<TResult>(numericDictionary, '');
-        result = _.countBy<{a: number}, TResult>(numericDictionary, {a: 42});
+        result = _.countBy(numericDictionary, {a: 42});
         result = _.countBy<TResult>(numericDictionary, {a: 42});
     }
 
@@ -3400,7 +4161,7 @@ namespace TestCountBy {
         result = _(list).countBy({a: 42});
 
         result = _(dictionary).countBy();
-        result = _(dictionary).countBy<TResult>(dictionaryIterator);
+        result = _(dictionary).countBy(dictionaryIterator);
         result = _(dictionary).countBy('');
         result = _(dictionary).countBy<{a: number}>({a: 42});
         result = _(dictionary).countBy({a: 42});
@@ -3431,7 +4192,7 @@ namespace TestCountBy {
         result = _(list).chain().countBy({a: 42});
 
         result = _(dictionary).chain().countBy();
-        result = _(dictionary).chain().countBy<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().countBy(dictionaryIterator);
         result = _(dictionary).chain().countBy('');
         result = _(dictionary).chain().countBy<{a: number}>({a: 42});
         result = _(dictionary).chain().countBy({a: 42});
@@ -3526,7 +4287,7 @@ namespace TestEach {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).each<TResult>(dictionaryIterator);
+        result = _(dictionary).each(dictionaryIterator);
     }
 
     {
@@ -3550,7 +4311,7 @@ namespace TestEach {
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).chain().each<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().each(dictionaryIterator);
     }
 }
 
@@ -3636,7 +4397,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).eachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).eachRight(dictionaryIterator);
     }
 
     {
@@ -3660,7 +4421,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).chain().eachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().eachRight(dictionaryIterator);
     }
 }
 
@@ -3694,7 +4455,7 @@ namespace TestEvery {
         result = _.every<SampleObject>(list, {a: 42});
 
         result = _.every<SampleObject>(dictionary);
-        result = _.every<SampleObject>(dictionary, dictionaryIterator);
+        result = _.every(dictionary, dictionaryIterator);
         result = _.every<SampleObject>(dictionary, 'a');
         result = _.every<SampleObject>(dictionary, ['a', 42]);
         result = _.every<SampleObject>(dictionary, {a: 42});
@@ -3718,7 +4479,7 @@ namespace TestEvery {
         result = _(list).every({a: 42});
 
         result = _(dictionary).every<SampleObject>();
-        result = _(dictionary).every<SampleObject>(dictionaryIterator);
+        result = _(dictionary).every(dictionaryIterator);
         result = _(dictionary).every('a');
         result = _(dictionary).every(['a', 42]);
         result = _(dictionary).every({a: 42});
@@ -3746,7 +4507,7 @@ namespace TestEvery {
         result = _(list).chain().every<SampleObject>({a: 42});
 
         result = _(dictionary).chain().every<SampleObject>();
-        result = _(dictionary).chain().every<SampleObject>(dictionaryIterator);
+        result = _(dictionary).chain().every(dictionaryIterator);
         result = _(dictionary).chain().every('a');
         result = _(dictionary).chain().every(['a', 42]);
         result = _(dictionary).chain().every<SampleObject>({a: 42});
@@ -3766,9 +4527,9 @@ namespace TestFilter {
     let obj: any = {};
     let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
-    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 1;
+    let stringIterator = (char: string, index: number, string: string) => true;
+    let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => true;
+    let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => true;
 
     {
         let result: string[];
@@ -3781,21 +4542,18 @@ namespace TestFilter {
 
         result = _.filter<TResult>(array, listIterator);
         result = _.filter<TResult>(array, '');
-        result = _.filter<TResult>(array, /./);
         result = _.filter<TResult>(array, {a: 42});
         result = _.filter<TResult>(array, ["a", 42]);
 
         result = _.filter<TResult>(list, listIterator);
         result = _.filter<TResult>(list, '');
-        result = _.filter<TResult>(list, /./);
         result = _.filter<TResult>(list, {a: 42});
         result = _.filter<TResult>(list, ["a", 42]);
 
-        result = _.filter<TResult>(dictionary, dictionaryIterator);
-        result = _.filter<TResult>(dictionary, '');
-        result = _.filter<TResult>(dictionary, /./);
-        result = _.filter<TResult>(dictionary, {a: 42});
-        result = _.filter<TResult>(dictionary, ["a", 42]);
+        result = _.filter(dictionary, dictionaryIterator);
+        result = _.filter(dictionary, '');
+        result = _.filter(dictionary, {a: 42});
+        result = _.filter(dictionary, ["a", 42]);
     }
 
     {
@@ -3809,21 +4567,18 @@ namespace TestFilter {
 
         result = _(array).filter(listIterator);
         result = _(array).filter('');
-        result = _(array).filter(/./);
         result = _(array).filter({a: 42});
         result = _(array).filter(["a", 42]);
 
         result = _(list).filter<TResult>(listIterator);
         result = _(list).filter<TResult>('');
-        result = _(list).filter<TResult>(/./);
         result = _(list).filter<TResult>({a: 42});
         result = _(list).filter<TResult>(["a", 42]);
 
-        result = _(dictionary).filter<TResult>(dictionaryIterator);
-        result = _(dictionary).filter<TResult>('');
-        result = _(dictionary).filter<TResult>(/./);
-        result = _(dictionary).filter<TResult>({a: 42});
-        result = _(dictionary).filter<TResult>(["a", 42]);
+        result = _(dictionary).filter(dictionaryIterator);
+        result = _(dictionary).filter('');
+        result = _(dictionary).filter({a: 42});
+        result = _(dictionary).filter(["a", 42]);
     }
 
     {
@@ -3837,21 +4592,18 @@ namespace TestFilter {
 
         result = _(array).chain().filter(listIterator);
         result = _(array).chain().filter('');
-        result = _(array).chain().filter(/./);
         result = _(array).chain().filter({a: 42});
         result = _(array).chain().filter(["a", 42]);
 
         result = _(list).chain().filter<TResult>(listIterator);
         result = _(list).chain().filter<TResult>('');
-        result = _(list).chain().filter<TResult>(/./);
         result = _(list).chain().filter<TResult>({a: 42});
         result = _(list).chain().filter<TResult>(["a", 42]);
 
-        result = _(dictionary).chain().filter<TResult>(dictionaryIterator);
-        result = _(dictionary).chain().filter<TResult>('');
-        result = _(dictionary).chain().filter<TResult>(/./);
-        result = _(dictionary).chain().filter<TResult>({a: 42});
-        result = _(dictionary).chain().filter<TResult>(["a", 42]);
+        result = _(dictionary).chain().filter(dictionaryIterator);
+        result = _(dictionary).chain().filter('');
+        result = _(dictionary).chain().filter({a: 42});
+        result = _(dictionary).chain().filter(["a", 42]);
     }
 
     {
@@ -3861,10 +4613,10 @@ namespace TestFilter {
 
         _.filter(a2, (item: string | number): item is number => typeof item === "number"); // $ExpectType number[]
         _.filter(d2, (item: string | number): item is number => typeof item === "number"); // $ExpectType number[]
-        _(a2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitArrayWrapper<number>
-        _(d2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitArrayWrapper<number>
-        _(a2).chain().filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitArrayWrapper<number>
-        _(d2).chain().filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitArrayWrapper<number>
+        _(a2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(d2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(a2).chain().filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(d2).chain().filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitWrapper<number[]>
     }
 }
 
@@ -3903,13 +4655,13 @@ namespace TestFind {
     result = _.find(list, ['a', 5], 1);
 
     result = _.find(dictionary);
-    result = _.find<TResult>(dictionary);
-    result = _.find<TResult>(dictionary, dictionaryIterator);
-    result = _.find<TResult>(dictionary, dictionaryIterator, 1);
-    result = _.find<TResult>(dictionary, '');
-    result = _.find<TResult>(dictionary, '', 1);
-    result = _.find<TResult>(dictionary, {a: 42});
-    result = _.find<TResult>(dictionary, {a: 42}, 1);
+    result = _.find(dictionary);
+    result = _.find(dictionary, dictionaryIterator);
+    result = _.find(dictionary, dictionaryIterator, 1);
+    result = _.find(dictionary, '');
+    result = _.find(dictionary, '', 1);
+    result = _.find(dictionary, {a: 42});
+    result = _.find(dictionary, {a: 42}, 1);
     result = _.find(dictionary, ['a', 5]);
     result = _.find(dictionary, ['a', 5], 1);
 
@@ -3933,15 +4685,15 @@ namespace TestFind {
     result = _(list).find<TResult>(['a', 5]);
     result = _(list).find<TResult>(['a', 5], 1);
 
-    result = _(dictionary).find<TResult>();
-    result = _(dictionary).find<TResult>(dictionaryIterator);
-    result = _(dictionary).find<TResult>(dictionaryIterator, 1);
-    result = _(dictionary).find<TResult>('');
-    result = _(dictionary).find<TResult>('', 1);
-    result = _(dictionary).find<TResult>({a: 42});
-    result = _(dictionary).find<TResult>({a: 42}, 1);
-    result = _(dictionary).find<TResult>(['a', 5]);
-    result = _(dictionary).find<TResult>(['a', 5], 1);
+    result = _(dictionary).find();
+    result = _(dictionary).find(dictionaryIterator);
+    result = _(dictionary).find(dictionaryIterator, 1);
+    result = _(dictionary).find('');
+    result = _(dictionary).find('', 1);
+    result = _(dictionary).find({a: 42});
+    result = _(dictionary).find({a: 42}, 1);
+    result = _(dictionary).find(['a', 5]);
+    result = _(dictionary).find(['a', 5], 1);
 
     result = _.find([any as TResult, null, undefined], (value: TResult | null | undefined): value is TResult | undefined => value !== null);
     result = _([any as TResult, null, undefined]).find((value: TResult | null | undefined): value is TResult | undefined => value !== null);
@@ -3982,13 +4734,13 @@ namespace TestFindLast {
     result = _.findLast(list, ['a', 5], 1);
 
     result = _.findLast(dictionary);
-    result = _.findLast<TResult>(dictionary);
-    result = _.findLast<TResult>(dictionary, dictionaryIterator);
-    result = _.findLast<TResult>(dictionary, dictionaryIterator, 1);
-    result = _.findLast<TResult>(dictionary, '');
-    result = _.findLast<TResult>(dictionary, '', 1);
-    result = _.findLast<TResult>(dictionary, {a: 42});
-    result = _.findLast<TResult>(dictionary, {a: 42}, 1);
+    result = _.findLast(dictionary);
+    result = _.findLast(dictionary, dictionaryIterator);
+    result = _.findLast(dictionary, dictionaryIterator, 1);
+    result = _.findLast(dictionary, '');
+    result = _.findLast(dictionary, '', 1);
+    result = _.findLast(dictionary, {a: 42});
+    result = _.findLast(dictionary, {a: 42}, 1);
     result = _.findLast(dictionary, ['a', 5]);
     result = _.findLast(dictionary, ['a', 5], 1);
 
@@ -4012,15 +4764,15 @@ namespace TestFindLast {
     result = _(list).findLast<TResult>(['a', 5]);
     result = _(list).findLast<TResult>(['a', 5], 1);
 
-    result = _(dictionary).findLast<TResult>();
-    result = _(dictionary).findLast<TResult>(dictionaryIterator);
-    result = _(dictionary).findLast<TResult>(dictionaryIterator, 1);
-    result = _(dictionary).findLast<TResult>('');
-    result = _(dictionary).findLast<TResult>('', 1);
-    result = _(dictionary).findLast<TResult>({a: 42});
-    result = _(dictionary).findLast<TResult>({a: 42}, 1);
-    result = _(dictionary).findLast<TResult>(['a', 5]);
-    result = _(dictionary).findLast<TResult>(['a', 5], 1);
+    result = _(dictionary).findLast();
+    result = _(dictionary).findLast(dictionaryIterator);
+    result = _(dictionary).findLast(dictionaryIterator, 1);
+    result = _(dictionary).findLast('');
+    result = _(dictionary).findLast('', 1);
+    result = _(dictionary).findLast({a: 42});
+    result = _(dictionary).findLast({a: 42}, 1);
+    result = _(dictionary).findLast(['a', 5]);
+    result = _(dictionary).findLast(['a', 5], 1);
 
     result = _.findLast([any as TResult, null, undefined], (value: TResult | null | undefined): value is TResult | undefined => value !== null);
     result = _([any as TResult, null, undefined]).findLast((value: TResult | null | undefined): value is TResult | undefined => value !== null);
@@ -4068,7 +4820,7 @@ namespace TestFlatMap {
         result = _.flatMap(numArray, listIterator);
         result = _.flatMap<number|number[], number>(numArray, listIterator);
 
-        result = _.flatMap<number>(objArray, 'a');
+        result = _.flatMap(objArray, 'a');
 
         result = _.flatMap(numList);
         result = _.flatMap<number>(numList);
@@ -4076,15 +4828,14 @@ namespace TestFlatMap {
         result = _.flatMap(numList, listIterator);
         result = _.flatMap<number|number[], number>(numList, listIterator);
 
-        result = _.flatMap<number>(objList, 'a');
+        result = _.flatMap(objList, 'a');
 
         result = _.flatMap(numDictionary);
         result = _.flatMap<number>(numDictionary);
 
         result = _.flatMap(numDictionary, dictionaryIterator);
-        result = _.flatMap<number|number[], number>(numDictionary, dictionaryIterator);
 
-        result = _.flatMap<number>(objDictionary, 'a');
+        result = _.flatMap(objDictionary, 'a');
 
         result = _.flatMap(numNumericDictionary);
         result = _.flatMap<number>(numNumericDictionary);
@@ -4092,7 +4843,7 @@ namespace TestFlatMap {
         result = _.flatMap(numNumericDictionary, numericDictionaryIterator);
         result = _.flatMap<number|number[], number>(numNumericDictionary, numericDictionaryIterator);
 
-        result = _.flatMap<_.NumericDictionary<{a: number}|{a: number}[]>, number>(objNumericDictionary, 'a');
+        result = _.flatMap(objNumericDictionary, 'a');
     }
 
     {
@@ -4115,27 +4866,26 @@ namespace TestFlatMap {
         let result: _.LoDashImplicitArrayWrapper<string>;
 
         result = _('abc').flatMap();
-        result = _('abc').flatMap<string>(stringIterator);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<number>;
 
         result = _(numArray).flatMap<number>();
-        result = _(numArray).flatMap<number>(listIterator);
-        result = _(objArray).flatMap<number>('a');
+        result = _(numArray).flatMap(listIterator);
+        result = _(objArray).flatMap('a');
 
         result = _(numList).flatMap<number>();
         result = _(numList).flatMap<number|number[], number>(listIterator);
-        result = _(objList).flatMap<number>('a');
+        result = _(objList).flatMap('a');
 
         result = _(numDictionary).flatMap<number>();
-        result = _(numDictionary).flatMap<number|number[], number>(dictionaryIterator);
-        result = _(objDictionary).flatMap<number>('a');
+        result = _(numDictionary).flatMap(dictionaryIterator);
+        result = _(objDictionary).flatMap('a');
 
         result = _(numNumericDictionary).flatMap<number>();
         result = _(numNumericDictionary).flatMap<number|number[], number>(numericDictionaryIterator);
-        result = _(objNumericDictionary).flatMap<number>('a');
+        result = _(objNumericDictionary).flatMap('a');
     }
 
     {
@@ -4158,27 +4908,26 @@ namespace TestFlatMap {
         let result: _.LoDashExplicitArrayWrapper<string>;
 
         result = _('abc').chain().flatMap();
-        result = _('abc').chain().flatMap<string>(stringIterator);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<number>;
 
         result = _(numArray).chain().flatMap<number>();
-        result = _(numArray).chain().flatMap<number>(listIterator);
-        result = _(objArray).chain().flatMap<number>('a');
+        result = _(numArray).chain().flatMap(listIterator);
+        result = _(objArray).chain().flatMap('a');
 
         result = _(numList).chain().flatMap<number>();
         result = _(numList).chain().flatMap<number|number[], number>(listIterator);
-        result = _(objList).chain().flatMap<number>('a');
+        result = _(objList).chain().flatMap('a');
 
         result = _(numDictionary).chain().flatMap<number>();
-        result = _(numDictionary).chain().flatMap<number|number[], number>(dictionaryIterator);
-        result = _(objDictionary).chain().flatMap<number>('a');
+        result = _(numDictionary).chain().flatMap(dictionaryIterator);
+        result = _(objDictionary).chain().flatMap('a');
 
         result = _(numNumericDictionary).chain().flatMap<number>();
         result = _(numNumericDictionary).chain().flatMap<number|number[], number>(numericDictionaryIterator);
-        result = _(objNumericDictionary).chain().flatMap<number>('a');
+        result = _(objNumericDictionary).chain().flatMap('a');
     }
 
     {
@@ -4196,6 +4945,21 @@ namespace TestFlatMap {
         result = _(objNumericDictionary).chain().flatMap(['a', 42]);
         result = _(objNumericDictionary).chain().flatMap({a: 42});
     }
+
+    {
+        interface SampleObject {
+            bar: number;
+            foo: string[];
+        }
+        const obj: SampleObject = {
+            bar: 1,
+            foo: [''],
+        };
+
+        const result1: Array<string | number> = _.flatMap(obj);
+        const result2: _.LoDashImplicitWrapper<Array<string | number>> = _(obj).flatMap();
+        const result3: _.LoDashExplicitWrapper<Array<string | number>> = _.chain(obj).flatMap();
+    }
 }
 
 // _.flatMapDeep
@@ -4232,25 +4996,25 @@ namespace TestFlatMapDeep {
     {
         let result: number[];
 
-        result = _.flatMapDeep(numArray);
+        result = _.flatMapDeep<number>(numArray);
 
         result = _.flatMapDeep(numArray, listIterator);
 
         result = _.flatMapDeep(objArray, 'a');
 
-        result = _.flatMapDeep(numList);
+        result = _.flatMapDeep<number>(numList);
 
         result = _.flatMapDeep(numList, listIterator);
 
         result = _.flatMapDeep(objList, 'a');
 
-        result = _.flatMapDeep(numDictionary);
+        result = _.flatMapDeep<number>(numDictionary);
 
         result = _.flatMapDeep(numDictionary, dictionaryIterator);
 
         result = _.flatMapDeep(objDictionary, 'a');
 
-        result = _.flatMapDeep(numNumericDictionary);
+        result = _.flatMapDeep<number>(numNumericDictionary);
 
         result = _.flatMapDeep(numNumericDictionary, numericDictionaryIterator);
 
@@ -4283,19 +5047,19 @@ namespace TestFlatMapDeep {
     {
         let result: _.LoDashImplicitArrayWrapper<number>;
 
-        result = _(numArray).flatMapDeep();
+        result = _(numArray).flatMapDeep<number>();
         result = _(numArray).flatMapDeep(listIterator);
         result = _(objArray).flatMapDeep('a');
 
-        result = _(numList).flatMapDeep();
+        result = _(numList).flatMapDeep<number>();
         result = _(numList).flatMapDeep(listIterator);
         result = _(objList).flatMapDeep('a');
 
-        result = _(numDictionary).flatMapDeep();
+        result = _(numDictionary).flatMapDeep<number>();
         result = _(numDictionary).flatMapDeep(dictionaryIterator);
         result = _(objDictionary).flatMapDeep('a');
 
-        result = _(numNumericDictionary).flatMapDeep();
+        result = _(numNumericDictionary).flatMapDeep<number>();
         result = _(numNumericDictionary).flatMapDeep(numericDictionaryIterator);
         result = _(objNumericDictionary).flatMapDeep('a');
     }
@@ -4326,19 +5090,19 @@ namespace TestFlatMapDeep {
     {
         let result: _.LoDashExplicitArrayWrapper<number>;
 
-        result = _(numArray).chain().flatMapDeep();
+        result = _(numArray).chain().flatMapDeep<number>();
         result = _(numArray).chain().flatMapDeep(listIterator);
         result = _(objArray).chain().flatMapDeep('a');
 
-        result = _(numList).chain().flatMapDeep();
+        result = _(numList).chain().flatMapDeep<number>();
         result = _(numList).chain().flatMapDeep(listIterator);
         result = _(objList).chain().flatMapDeep('a');
 
-        result = _(numDictionary).chain().flatMapDeep();
+        result = _(numDictionary).chain().flatMapDeep<number>();
         result = _(numDictionary).chain().flatMapDeep(dictionaryIterator);
         result = _(objDictionary).chain().flatMapDeep('a');
 
-        result = _(numNumericDictionary).chain().flatMapDeep();
+        result = _(numNumericDictionary).chain().flatMapDeep<number>();
         result = _(numNumericDictionary).chain().flatMapDeep(numericDictionaryIterator);
         result = _(objNumericDictionary).chain().flatMapDeep('a');
     }
@@ -4379,7 +5143,7 @@ namespace TestFlatMapDepth {
 
     let listIterator: (value: number|number[], index: number, collection: _.List<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) =>[ 1];
 
-    let dictionaryIterator: (value: number|number[], key: number, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
@@ -4394,25 +5158,25 @@ namespace TestFlatMapDepth {
     {
         let result: number[];
 
-        result = _.flatMapDepth(numArray);
+        result = _.flatMapDepth<number>(numArray);
 
         result = _.flatMapDepth(numArray, listIterator, 1);
 
         result = _.flatMapDepth(objArray, 'a');
 
-        result = _.flatMapDepth(numList);
+        result = _.flatMapDepth<number>(numList);
 
         result = _.flatMapDepth(numList, listIterator, 1);
 
         result = _.flatMapDepth(objList, 'a', 1);
 
-        result = _.flatMapDepth(numDictionary);
+        result = _.flatMapDepth<number>(numDictionary);
 
         result = _.flatMapDepth(numDictionary, dictionaryIterator, 1);
 
         result = _.flatMapDepth(objDictionary, 'a', 1);
 
-        result = _.flatMapDepth(numNumericDictionary);
+        result = _.flatMapDepth<number>(numNumericDictionary);
 
         result = _.flatMapDepth(numNumericDictionary, numericDictionaryIterator, 1);
 
@@ -4445,19 +5209,19 @@ namespace TestFlatMapDepth {
     {
         let result: _.LoDashImplicitArrayWrapper<number>;
 
-        result = _(numArray).flatMapDepth();
+        result = _(numArray).flatMapDepth<number>();
         result = _(numArray).flatMapDepth(listIterator, 1);
         result = _(objArray).flatMapDepth('a', 1);
 
-        result = _(numList).flatMapDepth();
+        result = _(numList).flatMapDepth<number>();
         result = _(numList).flatMapDepth(listIterator, 1);
         result = _(objList).flatMapDepth('a', 1);
 
-        result = _(numDictionary).flatMapDepth();
+        result = _(numDictionary).flatMapDepth<number>();
         result = _(numDictionary).flatMapDepth(dictionaryIterator, 1);
         result = _(objDictionary).flatMapDepth('a', 1);
 
-        result = _(numNumericDictionary).flatMapDepth();
+        result = _(numNumericDictionary).flatMapDepth<number>();
         result = _(numNumericDictionary).flatMapDepth(numericDictionaryIterator, 1);
         result = _(objNumericDictionary).flatMapDepth('a', 1);
     }
@@ -4488,19 +5252,19 @@ namespace TestFlatMapDepth {
     {
         let result: _.LoDashExplicitArrayWrapper<number>;
 
-        result = _(numArray).chain().flatMapDepth();
+        result = _(numArray).chain().flatMapDepth<number>();
         result = _(numArray).chain().flatMapDepth(listIterator, 1);
         result = _(objArray).chain().flatMapDepth('a', 1);
 
-        result = _(numList).chain().flatMapDepth();
+        result = _(numList).chain().flatMapDepth<number>();
         result = _(numList).chain().flatMapDepth(listIterator, 1);
         result = _(objList).chain().flatMapDepth('a', 1);
 
-        result = _(numDictionary).chain().flatMapDepth();
+        result = _(numDictionary).chain().flatMapDepth<number>();
         result = _(numDictionary).chain().flatMapDepth(dictionaryIterator, 1);
         result = _(objDictionary).chain().flatMapDepth('a', 1);
 
-        result = _(numNumericDictionary).chain().flatMapDepth();
+        result = _(numNumericDictionary).chain().flatMapDepth<number>();
         result = _(numNumericDictionary).chain().flatMapDepth(numericDictionaryIterator, 1);
         result = _(objNumericDictionary).chain().flatMapDepth('a', 1);
     }
@@ -4564,8 +5328,7 @@ namespace TestForEach {
         result = _.forEach(array, (value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            // Note: ideally we'd like collection TResult[], but it seems the best we can get is List<TResult>.
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4579,8 +5342,7 @@ namespace TestForEach {
         result = _.forEach(nilArray, (value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            // Note: ideally we'd like collection TResult[], but it seems the best we can get is List<TResult>.
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4648,7 +5410,7 @@ namespace TestForEach {
         result = _(array).forEach((value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4658,7 +5420,7 @@ namespace TestForEach {
         result = _(nilArray).forEach((value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4677,13 +5439,13 @@ namespace TestForEach {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).forEach<TResult>(dictionaryIterator);
+        result = _(dictionary).forEach(dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(nilDictionary).forEach<TResult>(dictionaryIterator);
+        result = _(nilDictionary).forEach(dictionaryIterator);
     }
 
     {
@@ -4702,7 +5464,7 @@ namespace TestForEach {
         result = _(array).chain().forEach((value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4712,7 +5474,7 @@ namespace TestForEach {
         result = _(nilArray).chain().forEach((value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4731,13 +5493,13 @@ namespace TestForEach {
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).chain().forEach<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().forEach(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(nilDictionary).chain().forEach<TResult>(dictionaryIterator);
+        result = _(nilDictionary).chain().forEach(dictionaryIterator);
     }
 }
 
@@ -4779,7 +5541,7 @@ namespace TestForEachRight {
         result = _.forEachRight(array, (value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4789,7 +5551,7 @@ namespace TestForEachRight {
         result = _.forEachRight(nilArray, (value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4870,13 +5632,13 @@ namespace TestForEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).forEachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).forEachRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(nilDictionary).forEachRight<TResult>(dictionaryIterator);
+        result = _(nilDictionary).forEachRight(dictionaryIterator);
     }
 
     {
@@ -4895,7 +5657,7 @@ namespace TestForEachRight {
         result = _(array).chain().forEachRight((value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4905,7 +5667,7 @@ namespace TestForEachRight {
         result = _(nilArray).chain().forEachRight((value, index, collection) => {
             value; // $ExpectType TResult
             index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<TResult>
+            collection; // $ExpectType TResult[]
         });
     }
 
@@ -4924,13 +5686,13 @@ namespace TestForEachRight {
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(dictionary).chain().forEachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().forEachRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(nilDictionary).chain().forEachRight<TResult>(dictionaryIterator);
+        result = _(nilDictionary).chain().forEachRight(dictionaryIterator);
     }
 }
 
@@ -4950,9 +5712,8 @@ namespace TestGroupBy {
     {
         let result: _.Dictionary<string[]>;
 
-        result = _.groupBy<string>('');
-        result = _.groupBy<string>('', stringIterator);
-        result = _.groupBy<string, number>('', stringIterator);
+        result = _.groupBy('');
+        result = _.groupBy('', stringIterator);
     }
 
     {
@@ -4963,97 +5724,67 @@ namespace TestGroupBy {
         result = _.groupBy<SampleType>(array, '');
         result = _.groupBy<SampleType>(array, {a: 42});
 
-        result = _.groupBy<SampleType, number>(array, listIterator);
-        result = _.groupBy<SampleType, boolean>(array, '');
-        result = _.groupBy<{a: number}, SampleType>(array, {a: 42});
-
         result = _.groupBy<SampleType>(list);
         result = _.groupBy<SampleType>(list, listIterator);
         result = _.groupBy<SampleType>(list, '');
         result = _.groupBy<SampleType>(list, {a: 42});
 
-        result = _.groupBy<SampleType, number>(list, listIterator);
-        result = _.groupBy<SampleType, boolean>(list, '');
-        result = _.groupBy<{a: number}, SampleType>(list, {a: 42});
-
-        result = _.groupBy<SampleType>(dictionary);
-        result = _.groupBy<SampleType>(dictionary, dictionaryIterator);
-        result = _.groupBy<SampleType>(dictionary, '');
-        result = _.groupBy<SampleType>(dictionary, {a: 42});
-
-        result = _.groupBy<SampleType, number>(dictionary, dictionaryIterator);
-        result = _.groupBy<SampleType, boolean>(dictionary, '');
-        result = _.groupBy<{a: number}, SampleType>(dictionary, {a: 42});
+        result = _.groupBy(dictionary);
+        result = _.groupBy(dictionary, dictionaryIterator);
+        result = _.groupBy(dictionary, '');
+        result = _.groupBy(dictionary, {a: 42});
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string[]>>;
 
         result = _('').groupBy();
-        result = _('').groupBy<number>((char: string, index: number, string: ArrayLike<string>) => 0);
+        result = _('').groupBy((char: string, index: number, string: ArrayLike<string>) => 0);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<SampleType[]>>;
 
         result = _(array).groupBy();
-        result = _(array).groupBy<number>(listIterator);
+        result = _(array).groupBy(listIterator);
         result = _(array).groupBy('');
-        result = _(array).groupBy<boolean>('');
-        result = _(array).groupBy<{a: number}>({a: 42});
+        result = _(array).groupBy({a: 42});
 
         result = _(list).groupBy<SampleType>();
         result = _(list).groupBy<SampleType>(listIterator);
         result = _(list).groupBy<SampleType>('');
         result = _(list).groupBy<SampleType>({a: 42});
 
-        result = _(list).groupBy<SampleType, number>(listIterator);
-        result = _(list).groupBy<SampleType, boolean>('');
-        result = _(list).groupBy<{a: number}, SampleType>({a: 42});
-
         result = _(dictionary).groupBy<SampleType>();
-        result = _(dictionary).groupBy<SampleType>(dictionaryIterator);
+        result = _(dictionary).groupBy(dictionaryIterator);
         result = _(dictionary).groupBy<SampleType>('');
         result = _(dictionary).groupBy<SampleType>({a: 42});
-
-        result = _(dictionary).groupBy<SampleType, number>(dictionaryIterator);
-        result = _(dictionary).groupBy<SampleType, boolean>('');
-        result = _(dictionary).groupBy<{a: number}, SampleType>({a: 42});
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string[]>>;
 
         result = _('').chain().groupBy();
-        result = _('').chain().groupBy<number>((char: string, index: number, string: ArrayLike<string>) => 0);
+        result = _('').chain().groupBy((char: string, index: number, string: ArrayLike<string>) => 0);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<SampleType[]>>;
 
         result = _(array).chain().groupBy();
-        result = _(array).chain().groupBy<number>(listIterator);
+        result = _(array).chain().groupBy(listIterator);
         result = _(array).chain().groupBy('');
-        result = _(array).chain().groupBy<boolean>('');
-        result = _(array).chain().groupBy<{a: number}>({a: 42});
+        result = _(array).chain().groupBy({a: 42});
 
         result = _(list).chain().groupBy<SampleType>();
         result = _(list).chain().groupBy<SampleType>(listIterator);
         result = _(list).chain().groupBy<SampleType>('');
         result = _(list).chain().groupBy<SampleType>({a: 42});
 
-        result = _(list).chain().groupBy<SampleType, number>(listIterator);
-        result = _(list).chain().groupBy<SampleType, boolean>('');
-        result = _(list).chain().groupBy<{a: number}, SampleType>({a: 42});
-
         result = _(dictionary).chain().groupBy<SampleType>();
-        result = _(dictionary).chain().groupBy<SampleType>(dictionaryIterator);
+        result = _(dictionary).chain().groupBy(dictionaryIterator);
         result = _(dictionary).chain().groupBy<SampleType>('');
         result = _(dictionary).chain().groupBy<SampleType>({a: 42});
-
-        result = _(dictionary).chain().groupBy<SampleType, number>(dictionaryIterator);
-        result = _(dictionary).chain().groupBy<SampleType, boolean>('');
-        result = _(dictionary).chain().groupBy<{a: number}, SampleType>({a: 42});
     }
 }
 
@@ -5114,16 +5845,16 @@ namespace TestKeyBy {
     let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
     let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
 
-    let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
-    let listIterator: (value: SampleObject, index: number, collection: _.List<SampleObject>) => any = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
-    let dictionaryIterator: (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => any = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => 1;
-    let numericDictionaryIterator: (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => any = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => 1;
+    let stringIterator = (value: string, index: number, collection: string) => "a";
+    let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
+    let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => Symbol.name;
+    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => "a";
 
     {
         let result: _.Dictionary<string>;
 
-        result = _.keyBy<string>('abcd');
-        result = _.keyBy<string>('abcd', stringIterator);
+        result = _.keyBy('abcd');
+        result = _.keyBy('abcd', stringIterator);
     }
 
     {
@@ -5132,26 +5863,22 @@ namespace TestKeyBy {
         result = _.keyBy<SampleObject>(array);
         result = _.keyBy<SampleObject>(array, listIterator);
         result = _.keyBy<SampleObject>(array, 'a');
-        result = _.keyBy<{a: number}, SampleObject>(array, {a: 42});
         result = _.keyBy<SampleObject>(array, {a: 42});
 
         result = _.keyBy<SampleObject>(list);
         result = _.keyBy<SampleObject>(list, listIterator);
         result = _.keyBy<SampleObject>(list, 'a');
-        result = _.keyBy<{a: number}, SampleObject>(list, {a: 42});
         result = _.keyBy<SampleObject>(list, {a: 42});
 
         result = _.keyBy<SampleObject>(numericDictionary);
         result = _.keyBy<SampleObject>(numericDictionary, numericDictionaryIterator);
         result = _.keyBy<SampleObject>(numericDictionary, 'a');
-        result = _.keyBy<{a: number}, SampleObject>(numericDictionary, {a: 42});
         result = _.keyBy<SampleObject>(numericDictionary, {a: 42});
 
-        result = _.keyBy<SampleObject>(dictionary);
-        result = _.keyBy<SampleObject>(dictionary, dictionaryIterator);
-        result = _.keyBy<SampleObject>(dictionary, 'a');
-        result = _.keyBy<{a: number}, SampleObject>(dictionary, {a: 42});
-        result = _.keyBy<SampleObject>(dictionary, {a: 42});
+        result = _.keyBy(dictionary);
+        result = _.keyBy(dictionary, dictionaryIterator);
+        result = _.keyBy(dictionary, 'a');
+        result = _.keyBy(dictionary, {a: 42});
     }
 
     {
@@ -5167,25 +5894,22 @@ namespace TestKeyBy {
         result = _(array).keyBy();
         result = _(array).keyBy(listIterator);
         result = _(array).keyBy('a');
-        result = _(array).keyBy<{a: number}>({a: 42});
+        result = _(array).keyBy({a: 42});
 
         result = _(list).keyBy<SampleObject>();
         result = _(list).keyBy<SampleObject>(listIterator);
         result = _(list).keyBy<SampleObject>('a');
-        result = _(list).keyBy<{a: number}, SampleObject>({a: 42});
         result = _(list).keyBy<SampleObject>({a: 42});
 
         result = _(numericDictionary).keyBy<SampleObject>();
         result = _(numericDictionary).keyBy<SampleObject>(numericDictionaryIterator);
         result = _(numericDictionary).keyBy<SampleObject>('a');
-        result = _(numericDictionary).keyBy<{a: number}, SampleObject>({a: 42});
         result = _(numericDictionary).keyBy<SampleObject>({a: 42});
 
-        result = _(dictionary).keyBy<SampleObject>();
-        result = _(dictionary).keyBy<SampleObject>(dictionaryIterator);
-        result = _(dictionary).keyBy<SampleObject>('a');
-        result = _(dictionary).keyBy<{a: number}, SampleObject>({a: 42});
-        result = _(dictionary).keyBy<SampleObject>({a: 42});
+        result = _(dictionary).keyBy();
+        result = _(dictionary).keyBy(dictionaryIterator);
+        result = _(dictionary).keyBy('a');
+        result = _(dictionary).keyBy({a: 42});
     }
 
     {
@@ -5201,25 +5925,22 @@ namespace TestKeyBy {
         result = _(array).chain().keyBy();
         result = _(array).chain().keyBy(listIterator);
         result = _(array).chain().keyBy('a');
-        result = _(array).chain().keyBy<{a: number}>({a: 42});
+        result = _(array).chain().keyBy({a: 42});
 
         result = _(list).chain().keyBy<SampleObject>();
         result = _(list).chain().keyBy<SampleObject>(listIterator);
         result = _(list).chain().keyBy<SampleObject>('a');
-        result = _(list).chain().keyBy<{a: number}, SampleObject>({a: 42});
         result = _(list).chain().keyBy<SampleObject>({a: 42});
 
         result = _(numericDictionary).chain().keyBy<SampleObject>();
         result = _(numericDictionary).chain().keyBy<SampleObject>(numericDictionaryIterator);
         result = _(numericDictionary).chain().keyBy<SampleObject>('a');
-        result = _(numericDictionary).chain().keyBy<{a: number}, SampleObject>({a: 42});
         result = _(numericDictionary).chain().keyBy<SampleObject>({a: 42});
 
-        result = _(dictionary).chain().keyBy<SampleObject>();
-        result = _(dictionary).chain().keyBy<SampleObject>(dictionaryIterator);
-        result = _(dictionary).chain().keyBy<SampleObject>('a');
-        result = _(dictionary).chain().keyBy<{a: number}, SampleObject>({a: 42});
-        result = _(dictionary).chain().keyBy<SampleObject>({a: 42});
+        result = _(dictionary).chain().keyBy();
+        result = _(dictionary).chain().keyBy(dictionaryIterator);
+        result = _(dictionary).chain().keyBy('a');
+        result = _(dictionary).chain().keyBy({a: 42});
     }
 }
 
@@ -5240,68 +5961,68 @@ namespace TestInvoke {
 
     let result: string;
 
-    result = _.invoke<string>(boolArray, "[1]");
-    result = _.invoke<string>(boolArray, "[1]", 2);
-    result = _.invoke<string>(boolArray, [1, "toString"]);
-    result = _.invoke<string>(boolArray, [1, "toString"], 2);
+    result = _.invoke(boolArray, "[1]");
+    result = _.invoke(boolArray, "[1]", 2);
+    result = _.invoke(boolArray, [1, "toString"]);
+    result = _.invoke(boolArray, [1, "toString"], 2);
 
-    result = _.invoke<boolean, string>(boolArray, "[1]");
-    result = _.invoke<boolean, string>(boolArray, "[1]", 2);
-    result = _.invoke<boolean, string>(boolArray, [1, "toString"]);
-    result = _.invoke<boolean, string>(boolArray, [1, "toString"], 2);
+    result = _.invoke(boolArray, "[1]");
+    result = _.invoke(boolArray, "[1]", 2);
+    result = _.invoke(boolArray, [1, "toString"]);
+    result = _.invoke(boolArray, [1, "toString"], 2);
 
-    result = _.invoke<string>(numDict, "a.toString");
-    result = _.invoke<string>(numDict, "a.toString", 2);
-    result = _.invoke<string>(numDict, ["a", "toString"]);
-    result = _.invoke<string>(numDict, ["a", "toString"], 2);
+    result = _.invoke(numDict, "a.toString");
+    result = _.invoke(numDict, "a.toString", 2);
+    result = _.invoke(numDict, ["a", "toString"]);
+    result = _.invoke(numDict, ["a", "toString"], 2);
 
-    result = _.invoke<number, string>(numDict, "a.toString");
-    result = _.invoke<number, string>(numDict, "a.toString", 2);
-    result = _.invoke<number, string>(numDict, ["a", "toString"]);
-    result = _.invoke<number, string>(numDict, ["a", "toString"], 2);
+    result = _.invoke(numDict, "a.toString");
+    result = _.invoke(numDict, "a.toString", 2);
+    result = _.invoke(numDict, ["a", "toString"]);
+    result = _.invoke(numDict, ["a", "toString"], 2);
 
-    result = _.invoke<string>(nestedDict, ["a[0].toString"]);
-    result = _.invoke<string>(nestedDict, ["a[0].toString"], 2);
-    result = _.invoke<string>(nestedDict, ["a", 0, "toString"]);
-    result = _.invoke<string>(nestedDict, ["a", 0, "toString"], 2);
+    result = _.invoke(nestedDict, ["a[0].toString"]);
+    result = _.invoke(nestedDict, ["a[0].toString"], 2);
+    result = _.invoke(nestedDict, ["a", 0, "toString"]);
+    result = _.invoke(nestedDict, ["a", 0, "toString"], 2);
 
-    result = _.invoke<Array<number>, string>(nestedDict, ["a[0].toString"]);
-    result = _.invoke<Array<number>, string>(nestedDict, ["a[0].toString"], 2);
-    result = _.invoke<Array<number>, string>(nestedDict, ["a", 0, "toString"]);
-    result = _.invoke<Array<number>, string>(nestedDict, ["a", 0, "toString"], 2);
+    result = _.invoke(nestedDict, ["a[0].toString"]);
+    result = _.invoke(nestedDict, ["a[0].toString"], 2);
+    result = _.invoke(nestedDict, ["a", 0, "toString"]);
+    result = _.invoke(nestedDict, ["a", 0, "toString"], 2);
 
-    result = _(boolArray).invoke<string>("[1]");
-    result = _(boolArray).invoke<string>("[1]", 2);
-    result = _(boolArray).invoke<string>([1, "toString"]);
-    result = _(boolArray).invoke<string>([1, "toString"], 2);
+    result = _(boolArray).invoke("[1]");
+    result = _(boolArray).invoke("[1]", 2);
+    result = _(boolArray).invoke([1, "toString"]);
+    result = _(boolArray).invoke([1, "toString"], 2);
 
-    result = _(numDict).invoke<string>("a.toString");
-    result = _(numDict).invoke<string>("a.toString", 2);
-    result = _(numDict).invoke<string>(["a", "toString"]);
-    result = _(numDict).invoke<string>(["a", "toString"], 2);
+    result = _(numDict).invoke("a.toString");
+    result = _(numDict).invoke("a.toString", 2);
+    result = _(numDict).invoke(["a", "toString"]);
+    result = _(numDict).invoke(["a", "toString"], 2);
 
-    result = _(nestedDict).invoke<string>("a[0].toString");
-    result = _(nestedDict).invoke<string>("a[0].toString", 2);
-    result = _(nestedDict).invoke<string>(["a", 0, "toString"]);
-    result = _(nestedDict).invoke<string>(["a", 0, "toString"], 2);
+    result = _(nestedDict).invoke("a[0].toString");
+    result = _(nestedDict).invoke("a[0].toString", 2);
+    result = _(nestedDict).invoke(["a", 0, "toString"]);
+    result = _(nestedDict).invoke(["a", 0, "toString"], 2);
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
-        result = _(boolArray).chain().invoke<_.LoDashExplicitWrapper<string>>("[1]");
-        result = _(boolArray).chain().invoke<_.LoDashExplicitWrapper<string>>("[1]", 2);
-        result = _(boolArray).chain().invoke<_.LoDashExplicitWrapper<string>>([1, "toString"]);
-        result = _(boolArray).chain().invoke<_.LoDashExplicitWrapper<string>>([1, "toString"], 2);
+        result = _(boolArray).chain().invoke("[1]");
+        result = _(boolArray).chain().invoke("[1]", 2);
+        result = _(boolArray).chain().invoke([1, "toString"]);
+        result = _(boolArray).chain().invoke([1, "toString"], 2);
 
-        result = _(numDict).chain().invoke<_.LoDashExplicitWrapper<string>>("a.toString");
-        result = _(numDict).chain().invoke<_.LoDashExplicitWrapper<string>>("a.toString", 2);
-        result = _(numDict).chain().invoke<_.LoDashExplicitWrapper<string>>(["a", "toString"]);
-        result = _(numDict).chain().invoke<_.LoDashExplicitWrapper<string>>(["a", "toString"], 2);
+        result = _(numDict).chain().invoke("a.toString");
+        result = _(numDict).chain().invoke("a.toString", 2);
+        result = _(numDict).chain().invoke(["a", "toString"]);
+        result = _(numDict).chain().invoke(["a", "toString"], 2);
 
-        result = _(nestedDict).chain().invoke<_.LoDashExplicitWrapper<string>>("a[0].toString");
-        result = _(nestedDict).chain().invoke<_.LoDashExplicitWrapper<string>>("a[0].toString", 2);
-        result = _(nestedDict).chain().invoke<_.LoDashExplicitWrapper<string>>(["a", 0, "toString"]);
-        result = _(nestedDict).chain().invoke<_.LoDashExplicitWrapper<string>>(["a", 0, "toString"], 2);
+        result = _(nestedDict).chain().invoke("a[0].toString");
+        result = _(nestedDict).chain().invoke("a[0].toString", 2);
+        result = _(nestedDict).chain().invoke(["a", 0, "toString"]);
+        result = _(nestedDict).chain().invoke(["a", 0, "toString"], 2);
     }
 }
 
@@ -5317,17 +6038,17 @@ namespace TestInvokeMap {
     let numDict: _.Dictionary<number> | null | undefined = obj as any;
 
     let result: string[];
-    result = _.invokeMap<number, string>(numArray, 'toString');
-    result = _.invokeMap<number, string>(numArray, 'toString', 2);
-    result = _.invokeMap<string>(numArray, 'toString');
-    result = _.invokeMap<string>(numArray, 'toString', 2);
-    result = _(numArray).invokeMap<string>('toString').value();
-    result = _(numArray).invokeMap<string>('toString', 2).value();
-    result = _(numArray).chain().invokeMap<string>('toString').value();
-    result = _(numArray).chain().invokeMap<string>('toString', 2).value();
+    result = _.invokeMap(numArray, 'toString');
+    result = _.invokeMap(numArray, 'toString', 2);
+    result = _.invokeMap(numArray, 'toString');
+    result = _.invokeMap(numArray, 'toString', 2);
+    result = _(numArray).invokeMap('toString').value();
+    result = _(numArray).invokeMap('toString', 2).value();
+    result = _(numArray).chain().invokeMap('toString').value();
+    result = _(numArray).chain().invokeMap('toString', 2).value();
 
-    result = _.invokeMap<number, string>(numArray, Number.prototype.toString);
-    result = _.invokeMap<number, string>(numArray, Number.prototype.toString, 2);
+    result = _.invokeMap(numArray, Number.prototype.toString);
+    result = _.invokeMap(numArray, Number.prototype.toString, 2);
     result = _.invokeMap<string>(numArray, Number.prototype.toString);
     result = _.invokeMap<string>(numArray, Number.prototype.toString, 2);
     result = _(numArray).invokeMap<string>(Number.prototype.toString).value();
@@ -5335,17 +6056,17 @@ namespace TestInvokeMap {
     result = _(numArray).chain().invokeMap<string>(Number.prototype.toString).value();
     result = _(numArray).chain().invokeMap<string>(Number.prototype.toString, 2).value();
 
-    result = _.invokeMap<number, string>(numDict, 'toString');
-    result = _.invokeMap<number, string>(numDict, 'toString', 2);
-    result = _.invokeMap<string>(numDict, 'toString');
-    result = _.invokeMap<string>(numDict, 'toString', 2);
-    result = _(numDict).invokeMap<string>('toString').value();
-    result = _(numDict).invokeMap<string>('toString', 2).value();
-    result = _(numDict).chain().invokeMap<string>('toString').value();
-    result = _(numDict).chain().invokeMap<string>('toString', 2).value();
+    result = _.invokeMap(numDict, 'toString');
+    result = _.invokeMap(numDict, 'toString', 2);
+    result = _.invokeMap(numDict, 'toString');
+    result = _.invokeMap(numDict, 'toString', 2);
+    result = _(numDict).invokeMap('toString').value();
+    result = _(numDict).invokeMap('toString', 2).value();
+    result = _(numDict).chain().invokeMap('toString').value();
+    result = _(numDict).chain().invokeMap('toString', 2).value();
 
-    result = _.invokeMap<number, string>(numDict, Number.prototype.toString);
-    result = _.invokeMap<number, string>(numDict, Number.prototype.toString, 2);
+    result = _.invokeMap(numDict, Number.prototype.toString);
+    result = _.invokeMap(numDict, Number.prototype.toString, 2);
     result = _.invokeMap<string>(numDict, Number.prototype.toString);
     result = _.invokeMap<string>(numDict, Number.prototype.toString, 2);
     result = _(numDict).invokeMap<string>(Number.prototype.toString).value();
@@ -5413,7 +6134,7 @@ namespace TestMap {
     {
         let result: _.LoDashExplicitArrayWrapper<boolean>;
 
-        result = _<number>(array).chain().map({});
+        result = _(array).chain().map({});
         result = _(list).chain().map({});
         result = _(dictionary).chain().map({});
     }
@@ -5438,33 +6159,148 @@ namespace TestMap {
 }
 
 // _.partition
-result = <string[][]>_.partition<string>('abcd', (n) => n < 'c');
-result = <string[][]>_.partition<string>(['a', 'b', 'c', 'd'], (n) => n < 'c');
-result = <number[][]>_.partition<number>([1, 2, 3, 4], (n) => n < 3);
-result = <number[][]>_.partition<number>({0: 1, 1: 2, 2: 3, 3: 4, length: 4}, (n) => n < 3);
-result = <number[][]>_.partition<number>({a: 1, b: 2, c: 3, d: 4}, (n) => n < 3);
-result = <{a: number}[][]>_.partition<{a: number}, {a: number}>([{a: 1}, {a: 2}], {a: 2});
-result = <{a: number}[][]>_.partition<{a: number}, {a: number}>({0: {a: 1}, 1: {a: 2}, length: 2}, {a: 2});
-result = <{a: number}[][]>_.partition<{a: number}, {a: number}>({0: {a: 1}, 1: {a: 2}}, {a: 2});
-result = <{a: number}[][]>_.partition<{a: number}>([{a: 1}, {a: 2}], 'a');
-result = <{a: number}[][]>_.partition<{a: number}>([{a: 1}, {a: 2}], 'a', 2);
-result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}, length: 2}, 'a');
-result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}, length: 2}, 'a', 2);
-result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}}, 'a');
-result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}}, 'a', 2);
-result = <{a: number}[][]>_.partition<{a: number}>(null, 'a');
-result = <string[][]>_('abcd').partition((n) => n < 'c').value();
-result = <string[][]>_(['a', 'b', 'c', 'd']).partition((n) => n < 'c').value();
-result = <number[][]>_([1, 2, 3, 4]).partition((n) => n < 3).value();
-result = <number[][]>_({0: 1, 1: 2, 2: 3, 3: 4, length: 4}).partition<number>((n) => n < 3).value();
-result = <number[][]>_({a: 1, b: 2, c: 3, d: 4}).partition<number>((n) => n < 3).value();
-result = <{a: number}[][]>_([{a: 1}, {a: 2}]).partition<{a: number}>({a: 2}).value();
-result = <{a: number}[][]>_({0: {a: 1}, 1: {a: 2}, length: 2}).partition<{a: number}, {a: number}>({a: 2}).value();
-result = <{a: number}[][]>_({0: {a: 1}, 1: {a: 2}}).partition<{a: number}, {a: number}>({a: 2}).value();
-result = <{a: number}[][]>_([{a: 1}, {a: 2}]).partition('a').value();
-result = <{a: number}[][]>_([{a: 1}, {a: 2}]).partition('a', 2).value();
-result = <{a: number}[][]>_({0: {a: 1}, 1: {a: 2}}).partition<{a: number}>('a').value();
-result = <{a: number}[][]>_({0: {a: 1}, 1: {a: 2}}).partition<{a: number}>('a', 2).value();
+namespace TestPartition {
+    {
+        let result: any[][];
+
+        result = _.partition(any, (n) => {
+            n; // $ExpectType any
+            return n < 'c';
+        });
+    }
+
+    {
+        let result: string[][];
+
+        result = _.partition('abcd', (n) => {
+            n; // $ExpectType string
+            return n < 'c';
+        });
+        result = _.partition(['a', 'b', 'c', 'd'], (n) => {
+            n; // $ExpectType string
+            return n < 'c';
+        });
+    }
+
+    {
+        let result: number[][];
+
+        result = _.partition([1, 2, 3, 4], (n) => n < 3);
+        result = _.partition({0: 1, 1: 2, 2: 3, 3: 4, length: 4}, (n) => n < 3);
+        result = _.partition({a: 1, b: 2, c: 3, d: 4}, (n) => {
+            n; // $ExpectType number
+            return n < 3;
+        });
+    }
+
+    {
+        let result: Array<Array<{ a: number }>>;
+
+        result = _.partition([{a: 1}, {a: 2}], {a: 2});
+        result = _.partition({0: {a: 1}, 1: {a: 2}, length: 2}, {a: 2});
+        result = _.partition({0: {a: 1}, 1: {a: 2}}, {a: 2});
+        result = _.partition([{a: 1}, {a: 2}], 'a');
+        result = _.partition([{a: 1}, {a: 2}], ['a', 2]);
+        result = _.partition({0: {a: 1}, 1: {a: 2}, length: 2}, 'a');
+        result = _.partition({0: {a: 1}, 1: {a: 2}, length: 2}, ['a', 2]);
+        result = _.partition({0: {a: 1}, 1: {a: 2}}, 'a');
+        result = _.partition({0: {a: 1}, 1: {a: 2}}, ['a', 2]);
+    }
+
+    {
+        _.partition(null, 'a');
+    }
+
+    {
+        let result: _.LoDashImplicitWrapper<any[][]>;
+
+        result = _(any).partition((n) => {
+            n; // $ExpectType any
+            return n < 'c';
+        });
+    }
+
+    {
+        let result: _.LoDashImplicitWrapper<string[][]>;
+
+        result = _('abcd').partition((n) => {
+            n; // $ExpectType string
+            return n < 'c';
+        });
+        result = _(['a', 'b', 'c', 'd']).partition((n) => {
+            n; // $ExpectType string
+            return n < 'c';
+        });
+    }
+
+    {
+        let result: _.LoDashImplicitWrapper<number[][]>;
+
+        result = _([1, 2, 3, 4]).partition((n) => n < 3);
+        result = _({0: 1, 1: 2, 2: 3, 3: 4, length: 4}).partition((n) => n < 3);
+        result = _({a: 1, b: 2, c: 3, d: 4}).partition((n) => {
+            n; // $ExpectType number
+            return n < 3;
+        });
+    }
+
+    {
+        let result: _.LoDashImplicitWrapper<Array<Array<{ a: number }>>>;
+
+        result = _([{a: 1}, {a: 2}]).partition({a: 2});
+        result = _({0: {a: 1}, 1: {a: 2}, length: 2}).partition({a: 2});
+        result = _({0: {a: 1}, 1: {a: 2}}).partition({a: 2});
+        result = _([{a: 1}, {a: 2}]).partition('a');
+        result = _([{a: 1}, {a: 2}]).partition(['a', 2]);
+        result = _({0: {a: 1}, 1: {a: 2}}).partition('a');
+        result = _({0: {a: 1}, 1: {a: 2}}).partition(['a', 2]);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<any[][]>;
+
+        result = _.chain(any).partition((n) => {
+            n; // $ExpectType any
+            return n < 'c';
+        });
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<string[][]>;
+
+        result = _.chain('abcd').partition((n) => {
+            n; // $ExpectType string
+            return n < 'c';
+        });
+        result = _.chain(['a', 'b', 'c', 'd']).partition((n) => {
+            n; // $ExpectType string
+            return n < 'c';
+        });
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<number[][]>;
+
+        result = _.chain([1, 2, 3, 4]).partition((n) => n < 3);
+        result = _.chain({0: 1, 1: 2, 2: 3, 3: 4, length: 4}).partition((n) => n < 3);
+        result = _.chain({a: 1, b: 2, c: 3, d: 4}).partition((n) => {
+            n; // $ExpectType number
+            return n < 3;
+        });
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<Array<Array<{ a: number }>>>;
+
+        result = _.chain([{a: 1}, {a: 2}]).partition({a: 2});
+        result = _.chain({0: {a: 1}, 1: {a: 2}, length: 2}).partition({a: 2});
+        result = _.chain({0: {a: 1}, 1: {a: 2}}).partition({a: 2});
+        result = _.chain([{a: 1}, {a: 2}]).partition('a');
+        result = _.chain([{a: 1}, {a: 2}]).partition(['a', 2]);
+        result = _.chain({0: {a: 1}, 1: {a: 2}}).partition('a');
+        result = _.chain({0: {a: 1}, 1: {a: 2}}).partition(['a', 2]);
+    }
+}
 
 // TODO
 // _.map with iteratee shorthand
@@ -5549,8 +6385,8 @@ namespace TestReduce {
         return r;
     }, {} as ABC); // tslint:disable-line no-object-literal-type-assertion
 
-    result = <number>_([1, 2, 3]).reduce<number>((sum: number, num: number) => sum + num);
-    result = <ABC>_({ 'a': 1, 'b': 2, 'c': 3 }).reduce<number, ABC>((r: ABC, num: number, key: string) => {
+    result = <number>_([1, 2, 3]).reduce((sum: number, num: number) => sum + num);
+    result = <ABC>_({ 'a': 1, 'b': 2, 'c': 3 }).reduce((r: ABC, num: number, key: string) => {
         r[key] = num * 3;
         return r;
     }, { a: 1, b: 2, c: 3 });
@@ -5564,9 +6400,9 @@ namespace TestReject {
     let obj: any = {};
     let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
-    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 1;
+    let stringIterator = (char: string, index: number, string: string) => true;
+    let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => true;
+    let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => true;
 
     {
         let result: string[];
@@ -5579,15 +6415,15 @@ namespace TestReject {
 
         result = _.reject<TResult>(array, listIterator);
         result = _.reject<TResult>(array, '');
-        result = _.reject<{a: number}, TResult>(array, {a: 42});
+        result = _.reject(array, {a: 42});
 
         result = _.reject<TResult>(list, listIterator);
         result = _.reject<TResult>(list, '');
-        result = _.reject<{a: number}, TResult>(list, {a: 42});
+        result = _.reject(list, {a: 42});
 
-        result = _.reject<TResult>(dictionary, dictionaryIterator);
-        result = _.reject<TResult>(dictionary, '');
-        result = _.reject<{a: number}, TResult>(dictionary, {a: 42});
+        result = _.reject(dictionary, dictionaryIterator);
+        result = _.reject(dictionary, '');
+        result = _.reject(dictionary, {a: 42});
     }
 
     {
@@ -5601,15 +6437,15 @@ namespace TestReject {
 
         result = _(array).reject(listIterator);
         result = _(array).reject('');
-        result = _(array).reject<{a: number}>({a: 42});
+        result = _(array).reject({a: 42});
 
         result = _(list).reject<TResult>(listIterator);
         result = _(list).reject<TResult>('');
-        result = _(list).reject<{a: number}, TResult>({a: 42});
+        result = _(list).reject({a: 42});
 
-        result = _(dictionary).reject<TResult>(dictionaryIterator);
-        result = _(dictionary).reject<TResult>('');
-        result = _(dictionary).reject<{a: number}, TResult>({a: 42});
+        result = _(dictionary).reject(dictionaryIterator);
+        result = _(dictionary).reject('');
+        result = _(dictionary).reject({a: 42});
     }
 
     {
@@ -5623,15 +6459,15 @@ namespace TestReject {
 
         result = _(array).chain().reject(listIterator);
         result = _(array).chain().reject('');
-        result = _(array).chain().reject<{a: number}>({a: 42});
+        result = _(array).chain().reject({a: 42});
 
         result = _(list).chain().reject<TResult>(listIterator);
         result = _(list).chain().reject<TResult>('');
-        result = _(list).chain().reject<{a: number}, TResult>({a: 42});
+        result = _(list).chain().reject({a: 42});
 
-        result = _(dictionary).chain().reject<TResult>(dictionaryIterator);
-        result = _(dictionary).chain().reject<TResult>('');
-        result = _(dictionary).chain().reject<{a: number}, TResult>({a: 42});
+        result = _(dictionary).chain().reject(dictionaryIterator);
+        result = _(dictionary).chain().reject('');
+        result = _(dictionary).chain().reject({a: 42});
     }
 }
 
@@ -5663,14 +6499,14 @@ namespace TestSample {
     }
 
     {
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _('abc').chain().sample();
-        result = _(array).chain().sample<_.LoDashExplicitWrapper<string>>();
-        result = _(list).chain().sample<_.LoDashExplicitWrapper<string>>();
-        result = _(dictionary).chain().sample<_.LoDashExplicitWrapper<string>>();
-        result = _(numericDictionary).chain().sample<_.LoDashExplicitWrapper<string>>();
-        result = _({a: 'foo'}).chain().sample<_.LoDashExplicitWrapper<string>>();
+        result = _(array).chain().sample();
+        result = _(list).chain().sample();
+        result = _(dictionary).chain().sample();
+        result = _(numericDictionary).chain().sample();
+        result = _({a: 'foo'}).chain().sample();
     }
 }
 
@@ -5695,8 +6531,8 @@ namespace TestSampleSize {
         result = _.sampleSize(dictionary, 42);
         result = _.sampleSize(numericDictionary);
         result = _.sampleSize(numericDictionary, 42);
-        result = _.sampleSize<{a: string}, string>({a: 'foo'});
-        result = _.sampleSize<{a: string}, string>({a: 'foo'}, 42);
+        result = _.sampleSize({a: 'foo'});
+        result = _.sampleSize({a: 'foo'}, 42);
         result = _.sampleSize<string>({a: 'foo'});
         result = _.sampleSize<string>({a: 'foo'}, 42);
     }
@@ -5754,7 +6590,7 @@ namespace TestShuffle {
 
         result = _.shuffle<TResult>(array);
         result = _.shuffle<TResult>(list);
-        result = _.shuffle<TResult>(dictionary);
+        result = _.shuffle(dictionary);
     }
 
     {
@@ -5768,7 +6604,7 @@ namespace TestShuffle {
 
         result = _(array).shuffle();
         result = _(list).shuffle<TResult>();
-        result = _(dictionary).shuffle<TResult>();
+        result = _(dictionary).shuffle();
     }
 
     {
@@ -5782,7 +6618,7 @@ namespace TestShuffle {
 
         result = _(array).chain().shuffle();
         result = _(list).chain().shuffle<TResult>();
-        result = _(dictionary).chain().shuffle<TResult>();
+        result = _(dictionary).chain().shuffle();
     }
 }
 
@@ -5798,9 +6634,9 @@ namespace TestSize {
     {
         let result: number;
 
-        result = _.size<SampleType>(array);
-        result = _.size<SampleType>(list);
-        result = _.size<SampleType>(dictionary);
+        result = _.size(array);
+        result = _.size(list);
+        result = _.size(dictionary);
         result = _.size('');
 
         result = _(array).size();
@@ -5852,10 +6688,10 @@ namespace TestSome {
 
         result = _.some<SampleObject>(dictionary);
         result = _.some<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.some<SampleObject>(dictionary, (value, key, collection) => {
-            value.a--;
-            key.substr(0);
-            value = collection[key];
+        result = _.some(dictionary, (value, key, collection) => {
+            value; // $ExpectType SampleObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<SampleObject>
             return true;
         });
         result = _.some<SampleObject>(dictionary, 'a');
@@ -5887,7 +6723,7 @@ namespace TestSome {
         result = _(list).some<SampleObject>({a: 42});
 
         result = _(dictionary).some<SampleObject>();
-        result = _(dictionary).some<SampleObject>(dictionaryIterator);
+        result = _(dictionary).some(dictionaryIterator);
         result = _(dictionary).some('a');
         result = _(dictionary).some(['a', 42]);
         result = _(dictionary).some<SampleObject>({a: 42});
@@ -5921,7 +6757,7 @@ namespace TestSome {
         result = _(list).chain().some<SampleObject>({a: 42});
 
         result = _(dictionary).chain().some<SampleObject>();
-        result = _(dictionary).chain().some<SampleObject>(dictionaryIterator);
+        result = _(dictionary).chain().some(dictionaryIterator);
         result = _(dictionary).chain().some('a');
         result = _(dictionary).chain().some(['a', 42]);
         result = _(dictionary).chain().some<SampleObject>({a: 42});
@@ -5953,58 +6789,58 @@ namespace TestSortBy {
     {
         let result: TResult[];
 
-        result = _.sortBy<TResult>(array);
-        result = _.sortBy<TResult, number>(array, listIterator);
-        result = _.sortBy<TResult>(array, '');
-        result = _.sortBy<{a: number}, TResult>(array, {a: 42});
+        result = _.sortBy(array);
+        result = _.sortBy(array, listIterator);
+        result = _.sortBy(array, '');
+        result = _.sortBy(array, {a: 42});
 
-        result = _.sortBy<TResult>(list);
-        result = _.sortBy<TResult, number>(list, listIterator);
-        result = _.sortBy<TResult>(list, '');
-        result = _.sortBy<{a: number}, TResult>(list, {a: 42});
+        result = _.sortBy(list);
+        result = _.sortBy(list, listIterator);
+        result = _.sortBy(list, '');
+        result = _.sortBy(list, {a: 42});
 
-        result = _.sortBy<TResult>(dictionary);
-        result = _.sortBy<TResult, number>(dictionary, dictionaryIterator);
-        result = _.sortBy<TResult>(dictionary, '');
-        result = _.sortBy<{a: number}, TResult>(dictionary, {a: 42});
+        result = _.sortBy(dictionary);
+        result = _.sortBy(dictionary, dictionaryIterator);
+        result = _.sortBy(dictionary, '');
+        result = _.sortBy(dictionary, {a: 42});
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         result = _(array).sortBy();
-        result = _(array).sortBy<number>(listIterator);
+        result = _(array).sortBy(listIterator);
         result = _(array).sortBy('');
-        result = _(array).sortBy<{a: number}>({a: 42});
+        result = _(array).sortBy({a: 42});
 
-        result = _(list).sortBy<TResult>();
-        result = _(list).sortBy<TResult, number>(listIterator);
-        result = _(list).sortBy<TResult>('');
-        result = _(list).sortBy<{a: number}, TResult>({a: 42});
+        result = _(list).sortBy();
+        result = _(list).sortBy(listIterator);
+        result = _(list).sortBy('');
+        result = _(list).sortBy({a: 42});
 
-        result = _(dictionary).sortBy<TResult>();
-        result = _(dictionary).sortBy<TResult, number>(dictionaryIterator);
-        result = _(dictionary).sortBy<TResult>('');
-        result = _(dictionary).sortBy<{a: number}, TResult>({a: 42});
+        result = _(dictionary).sortBy();
+        result = _(dictionary).sortBy(dictionaryIterator);
+        result = _(dictionary).sortBy('');
+        result = _(dictionary).sortBy({a: 42});
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         result = _(array).chain().sortBy();
-        result = _(array).chain().sortBy<number>(listIterator);
+        result = _(array).chain().sortBy(listIterator);
         result = _(array).chain().sortBy('');
-        result = _(array).chain().sortBy<{a: number}>({a: 42});
+        result = _(array).chain().sortBy({a: 42});
 
-        result = _(list).chain().sortBy<TResult>();
-        result = _(list).chain().sortBy<TResult, number>(listIterator);
-        result = _(list).chain().sortBy<TResult>('');
-        result = _(list).chain().sortBy<{a: number}, TResult>({a: 42});
+        result = _(list).chain().sortBy();
+        result = _(list).chain().sortBy(listIterator);
+        result = _(list).chain().sortBy('');
+        result = _(list).chain().sortBy({a: 42});
 
-        result = _(dictionary).chain().sortBy<TResult>();
-        result = _(dictionary).chain().sortBy<TResult, number>(dictionaryIterator);
-        result = _(dictionary).chain().sortBy<TResult>('');
-        result = _(dictionary).chain().sortBy<{a: number}, TResult>({a: 42});
+        result = _(dictionary).chain().sortBy();
+        result = _(dictionary).chain().sortBy(dictionaryIterator);
+        result = _(dictionary).chain().sortBy('');
+        result = _(dictionary).chain().sortBy({a: 42});
     }
 }
 
@@ -6018,12 +6854,11 @@ result = <IFoodOrganic[]>_(foodsOrganic).sortBy('organic', (food) => food.name,
 namespace TestorderBy {
     type SampleObject = {a: number; b: string; c: boolean};
 
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
-    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
-    let orders: boolean|string|(boolean|string)[] = true as any;
+    const array: SampleObject[] | null | undefined = any;
+    const list: _.List<SampleObject> | null | undefined = any;
+    const numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = any;
+    const dictionary: _.Dictionary<SampleObject> | null | undefined = any;
+    const orders: boolean|string|Array<boolean|string> = any;
 
     {
         let iteratees: (value: string) => any|((value: string) => any)[] = (value) => 1;
@@ -6034,72 +6869,72 @@ namespace TestorderBy {
     }
 
     {
-        let iteratees: (value: SampleObject) => any|string|{a: number}|((value: SampleObject) => any|string|{a: number})[] = (value) => 1;
+        const iteratees: ((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>|Array<((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>> = any;
         let result: SampleObject[];
 
-        result = _.orderBy<{a: number}, SampleObject>(array, iteratees);
-        result = _.orderBy<{a: number}, SampleObject>(array, iteratees, orders);
+        result = _.orderBy(array, iteratees);
+        result = _.orderBy(array, iteratees, orders);
         result = _.orderBy<SampleObject>(array, iteratees);
         result = _.orderBy<SampleObject>(array, iteratees, orders);
 
-        result = _.orderBy<{a: number}, SampleObject>(list, iteratees);
-        result = _.orderBy<{a: number}, SampleObject>(list, iteratees, orders);
+        result = _.orderBy(list, iteratees);
+        result = _.orderBy(list, iteratees, orders);
         result = _.orderBy<SampleObject>(list, iteratees);
         result = _.orderBy<SampleObject>(list, iteratees, orders);
 
-        result = _.orderBy<{a: number}, SampleObject>(numericDictionary, iteratees);
-        result = _.orderBy<{a: number}, SampleObject>(numericDictionary, iteratees, orders);
+        result = _.orderBy(numericDictionary, iteratees);
+        result = _.orderBy(numericDictionary, iteratees, orders);
         result = _.orderBy<SampleObject>(numericDictionary, iteratees);
         result = _.orderBy<SampleObject>(numericDictionary, iteratees, orders);
 
-        result = _.orderBy<{a: number}, SampleObject>(dictionary, iteratees);
-        result = _.orderBy<{a: number}, SampleObject>(dictionary, iteratees, orders);
+        result = _.orderBy(dictionary, iteratees);
+        result = _.orderBy(dictionary, iteratees, orders);
         result = _.orderBy<SampleObject>(dictionary, iteratees);
         result = _.orderBy<SampleObject>(dictionary, iteratees, orders);
     }
 
     {
-        let iteratees: (value: SampleObject) => any|string|{a: number}|((value: SampleObject) => any|string|{a: number})[] = (value) => "";
+        const iteratees: ((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>|Array<((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>> = any;
         let result: _.LoDashImplicitArrayWrapper<SampleObject>;
 
-        result = _(array).orderBy<{a: number}>(iteratees);
-        result = _(array).orderBy<{a: number}>(iteratees, orders);
+        result = _(array).orderBy(iteratees);
+        result = _(array).orderBy(iteratees, orders);
 
-        result = _(list).orderBy<{a: number}, SampleObject>(iteratees);
-        result = _(list).orderBy<{a: number}, SampleObject>(iteratees, orders);
+        result = _(list).orderBy(iteratees);
+        result = _(list).orderBy(iteratees, orders);
         result = _(list).orderBy<SampleObject>(iteratees);
         result = _(list).orderBy<SampleObject>(iteratees, orders);
 
-        result = _(numericDictionary).orderBy<{a: number}, SampleObject>(iteratees);
-        result = _(numericDictionary).orderBy<{a: number}, SampleObject>(iteratees, orders);
+        result = _(numericDictionary).orderBy(iteratees);
+        result = _(numericDictionary).orderBy(iteratees, orders);
         result = _(numericDictionary).orderBy<SampleObject>(iteratees);
         result = _(numericDictionary).orderBy<SampleObject>(iteratees, orders);
 
-        result = _(dictionary).orderBy<{a: number}, SampleObject>(iteratees);
-        result = _(dictionary).orderBy<{a: number}, SampleObject>(iteratees, orders);
+        result = _(dictionary).orderBy(iteratees);
+        result = _(dictionary).orderBy(iteratees, orders);
         result = _(dictionary).orderBy<SampleObject>(iteratees);
         result = _(dictionary).orderBy<SampleObject>(iteratees, orders);
     }
 
     {
-        let iteratees: (value: SampleObject) => any|string|{a: number}|((value: SampleObject) => any|string|{a: number})[] = (value) => "";
+        const iteratees: ((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>|Array<((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>> = any;
         let result: _.LoDashExplicitArrayWrapper<SampleObject>;
 
-        result = _(array).chain().orderBy<{a: number}>(iteratees);
-        result = _(array).chain().orderBy<{a: number}>(iteratees, orders);
+        result = _(array).chain().orderBy(iteratees);
+        result = _(array).chain().orderBy(iteratees, orders);
 
-        result = _(list).chain().orderBy<{a: number}, SampleObject>(iteratees);
-        result = _(list).chain().orderBy<{a: number}, SampleObject>(iteratees, orders);
+        result = _(list).chain().orderBy(iteratees);
+        result = _(list).chain().orderBy(iteratees, orders);
         result = _(list).chain().orderBy<SampleObject>(iteratees);
         result = _(list).chain().orderBy<SampleObject>(iteratees, orders);
 
-        result = _(numericDictionary).chain().orderBy<{a: number}, SampleObject>(iteratees);
-        result = _(numericDictionary).chain().orderBy<{a: number}, SampleObject>(iteratees, orders);
+        result = _(numericDictionary).chain().orderBy(iteratees);
+        result = _(numericDictionary).chain().orderBy(iteratees, orders);
         result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees);
         result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees, orders);
 
-        result = _(dictionary).chain().orderBy<{a: number}, SampleObject>(iteratees);
-        result = _(dictionary).chain().orderBy<{a: number}, SampleObject>(iteratees, orders);
+        result = _(dictionary).chain().orderBy(iteratees);
+        result = _(dictionary).chain().orderBy(iteratees, orders);
         result = _(dictionary).chain().orderBy<SampleObject>(iteratees);
         result = _(dictionary).chain().orderBy<SampleObject>(iteratees, orders);
     }
@@ -6167,24 +7002,24 @@ namespace TestAry {
     {
         let result: SampleFunc;
 
-        result = _.ary<SampleFunc>(func);
-        result = _.ary<SampleFunc>(func, 2);
-        result = _.ary<SampleFunc, SampleFunc>(func);
-        result = _.ary<SampleFunc, SampleFunc>(func, 2);
+        result = _.ary(func);
+        result = _.ary(func, 2);
+        result = _.ary(func);
+        result = _.ary(func, 2);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<SampleFunc>;
 
-        result = _(func).ary<SampleFunc>();
-        result = _(func).ary<SampleFunc>(2);
+        result = _(func).ary();
+        result = _(func).ary(2);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<SampleFunc>;
 
-        result = _(func).chain().ary<SampleFunc>();
-        result = _(func).chain().ary<SampleFunc>(2);
+        result = _(func).chain().ary();
+        result = _(func).chain().ary(2);
     }
 }
 
@@ -6226,8 +7061,8 @@ namespace TestBind {
 
         let result: SampleResult;
 
-        result = _.bind<SampleFunc, SampleResult>(func, any);
-        result = _.bind<SampleResult>(func, any);
+        result = _.bind(func, any);
+        result = _.bind(func, any);
     }
 
     {
@@ -6235,8 +7070,8 @@ namespace TestBind {
 
         let result: SampleResult;
 
-        result = _.bind<SampleFunc, SampleResult>(func, any, 42);
-        result = _.bind<SampleResult>(func, any, 42);
+        result = _.bind(func, any, 42);
+        result = _.bind(func, any, 42);
     }
 
     {
@@ -6244,8 +7079,8 @@ namespace TestBind {
 
         let result: SampleResult;
 
-        result = _.bind<SampleFunc, SampleResult>(func, any, 42, '');
-        result = _.bind<SampleResult>(func, any, 42, '');
+        result = _.bind(func, any, 42, '');
+        result = _.bind(func, any, 42, '');
     }
 
     {
@@ -6253,7 +7088,7 @@ namespace TestBind {
 
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(func).bind<SampleResult>(any);
+        result = _(func).bind(any);
     }
 
     {
@@ -6261,7 +7096,7 @@ namespace TestBind {
 
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(func).bind<SampleResult>(any, 42);
+        result = _(func).bind(any, 42);
     }
 
     {
@@ -6269,7 +7104,7 @@ namespace TestBind {
 
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(func).bind<SampleResult>(any, 42, '');
+        result = _(func).bind(any, 42, '');
     }
 
     {
@@ -6277,23 +7112,23 @@ namespace TestBind {
 
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(func).chain().bind<SampleResult>(any);
+        result = _(func).chain().bind(any);
     }
 
     {
         type SampleResult = (b: string) => boolean;
 
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
+        let result: _.LoDashExplicitWrapper<SampleResult>;
 
-        result = _(func).chain().bind<SampleResult>(any, 42);
+        result = _(func).chain().bind(any, 42);
     }
 
     {
         type SampleResult = () => boolean;
 
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
+        let result: _.LoDashExplicitWrapper<SampleResult>;
 
-        result = _(func).chain().bind<SampleResult>(any, 42, '');
+        result = _(func).chain().bind(any, 42, '');
     }
 }
 
@@ -6346,8 +7181,7 @@ namespace TestBindKey {
 
         let result: SampleResult;
 
-        result = _.bindKey<Object, SampleResult>(object, 'foo');
-        result = _.bindKey<SampleResult>(object, 'foo');
+        result = _.bindKey(object, 'foo');
     }
 
     {
@@ -6355,8 +7189,7 @@ namespace TestBindKey {
 
         let result: SampleResult;
 
-        result = _.bindKey<Object, SampleResult>(object, 'foo', 42);
-        result = _.bindKey<SampleResult>(object, 'foo', 42);
+        result = _.bindKey(object, 'foo', 42);
     }
 
     {
@@ -6364,8 +7197,7 @@ namespace TestBindKey {
 
         let result: SampleResult;
 
-        result = _.bindKey<Object, SampleResult>(object, 'foo', 42, '');
-        result = _.bindKey<SampleResult>(object, 'foo', 42, '');
+        result = _.bindKey(object, 'foo', 42, '');
     }
 
     {
@@ -6373,7 +7205,7 @@ namespace TestBindKey {
 
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(object).bindKey<SampleResult>('foo');
+        result = _(object).bindKey('foo');
     }
 
     {
@@ -6381,7 +7213,7 @@ namespace TestBindKey {
 
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(object).bindKey<SampleResult>('foo', 42);
+        result = _(object).bindKey('foo', 42);
     }
 
     {
@@ -6389,7 +7221,7 @@ namespace TestBindKey {
 
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(object).bindKey<SampleResult>('foo', 42, '');
+        result = _(object).bindKey('foo', 42, '');
     }
 
     {
@@ -6397,7 +7229,7 @@ namespace TestBindKey {
 
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(object).chain().bindKey<SampleResult>('foo');
+        result = _(object).chain().bindKey('foo');
     }
 
     {
@@ -6405,7 +7237,7 @@ namespace TestBindKey {
 
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(object).chain().bindKey<SampleResult>('foo', 42);
+        result = _(object).chain().bindKey('foo', 42);
     }
 
     {
@@ -6413,16 +7245,10 @@ namespace TestBindKey {
 
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(object).chain().bindKey<SampleResult>('foo', 42, '');
+        result = _(object).chain().bindKey('foo', 42, '');
     }
 }
 
-const createCallbackObj: { [index: string]: string; } = { name: 'Joe' };
-result = <() => any>_.createCallback('name');
-result = <() => boolean>_.createCallback(createCallbackObj);
-result = <_.LoDashImplicitObjectWrapper<() => any>>_('name').createCallback();
-result = <_.LoDashImplicitObjectWrapper<() => boolean>>_(createCallbackObj).createCallback();
-
 // _.curry
 const testCurryFn = (a: number, b: number, c: number) => [a, b, c];
 let curryResult0: number[]
@@ -6527,10 +7353,10 @@ namespace TestDefer {
     {
         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);
+        result = _.defer(func);
+        result = _.defer(func, any);
+        result = _.defer(func, any, any);
+        result = _.defer(func, any, any, any);
     }
 
     {
@@ -6561,9 +7387,9 @@ namespace TestDelay {
     {
         let result: number;
 
-        result = _.delay<SampleFunc>(func, 1);
-        result = _.delay<SampleFunc>(func, 1, 2);
-        result = _.delay<SampleFunc>(func, 1, 2, '');
+        result = _.delay(func, 1);
+        result = _.delay(func, 1, 2);
+        result = _.delay(func, 1, 2, '');
     }
 
     {
@@ -6628,34 +7454,34 @@ namespace TestFlow {
         result = _.flow(Fn2, Fn1, Fn1, Fn1, Fn1, Fn1);
         result = _.flow(Fn2, Fn1, Fn1, Fn1, Fn1, Fn1, Fn1);
         result = _.flow(Fn2, Fn1, Fn3, Fn4);
-        result = _.flow<(m: number, n: number) => number>([Fn2, Fn1, Fn3, Fn4]);
+        result = _.flow([Fn2, Fn1, Fn3, Fn4]);
     }
 
     {
         let result: (m: number, n: number) => number;
 
-        result = _.flow<(m: number, n: number) => number>(Fn1, Fn2);
-        result = _.flow<(m: number, n: number) => number>(Fn1, Fn1, Fn2);
-        result = _.flow<(m: number, n: number) => number>(Fn1, Fn1, Fn1, Fn2);
-        result = _.flow<(m: number, n: number) => number>([Fn1, Fn1, Fn1, Fn2]);
+        result = _.flow(Fn2, Fn1);
+        result = _.flow(Fn2, Fn1, Fn1);
+        result = _.flow(Fn2, Fn1, Fn1, Fn1);
+        result = _.flow([Fn1, Fn1, Fn1, Fn2]);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(m: number, n: number) => number>;
 
-        result = _(Fn1).flow<(m: number, n: number) => number>(Fn2);
-        result = _(Fn1).flow<(m: number, n: number) => number>(Fn1, Fn2);
-        result = _(Fn1).flow<(m: number, n: number) => number>(Fn1, Fn1, Fn2);
-        result = _(Fn1).flow<(m: number, n: number) => number>([Fn1, Fn1, Fn2]);
+        result = _(Fn2).flow(Fn1);
+        result = _(Fn2).flow(Fn1, Fn1);
+        result = _(Fn2).flow(Fn1, Fn1, Fn1);
+        result = _(Fn2).flow([Fn1, Fn1, Fn1]);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(m: number, n: number) => number>;
 
-        result = _(Fn1).chain().flow<(m: number, n: number) => number>(Fn2);
-        result = _(Fn1).chain().flow<(m: number, n: number) => number>(Fn1, Fn2);
-        result = _(Fn1).chain().flow<(m: number, n: number) => number>(Fn1, Fn1, Fn2);
-        result = _(Fn1).chain().flow<(m: number, n: number) => number>([Fn1, Fn1, Fn2]);
+        result = _(Fn2).chain().flow(Fn1);
+        result = _(Fn2).chain().flow(Fn1, Fn1);
+        result = _(Fn2).chain().flow(Fn1, Fn1, Fn1);
+        result = _(Fn2).chain().flow([Fn1, Fn1, Fn1]);
     }
 }
 
@@ -6667,28 +7493,28 @@ namespace TestFlowRight {
     {
         let result: (m: number, n: number) => number;
 
-        result = _.flowRight<(m: number, n: number) => number>(Fn1, Fn2);
-        result = _.flowRight<(m: number, n: number) => number>(Fn1, Fn1, Fn2);
-        result = _.flowRight<(m: number, n: number) => number>(Fn1, Fn1, Fn1, Fn2);
-        result = _.flowRight<(m: number, n: number) => number>([Fn1, Fn1, Fn1, Fn2]);
+        result = _.flowRight(Fn1, Fn2);
+        result = _.flowRight(Fn1, Fn1, Fn2);
+        result = _.flowRight(Fn1, Fn1, Fn1, Fn2);
+        result = _.flowRight([Fn1, Fn1, Fn1, Fn2]);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(m: number, n: number) => number>;
 
-        result = _(Fn1).flowRight<(m: number, n: number) => number>(Fn2);
-        result = _(Fn1).flowRight<(m: number, n: number) => number>(Fn1, Fn2);
-        result = _(Fn1).flowRight<(m: number, n: number) => number>(Fn1, Fn1, Fn2);
-        result = _(Fn1).flowRight<(m: number, n: number) => number>([Fn1, Fn1, Fn2]);
+        result = _(Fn1).flowRight(Fn2);
+        result = _(Fn1).flowRight(Fn1, Fn2);
+        result = _(Fn1).flowRight(Fn1, Fn1, Fn2);
+        result = _(Fn1).flowRight([Fn1, Fn1, Fn2]);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(m: number, n: number) => number>;
 
-        result = _(Fn1).chain().flowRight<(m: number, n: number) => number>(Fn2);
-        result = _(Fn1).chain().flowRight<(m: number, n: number) => number>(Fn1, Fn2);
-        result = _(Fn1).chain().flowRight<(m: number, n: number) => number>(Fn1, Fn1, Fn2);
-        result = _(Fn1).chain().flowRight<(m: number, n: number) => number>([Fn1, Fn1, Fn2]);
+        result = _(Fn1).chain().flowRight(Fn2);
+        result = _(Fn1).chain().flowRight(Fn1, Fn2);
+        result = _(Fn1).chain().flowRight(Fn1, Fn1, Fn2);
+        result = _(Fn1).chain().flowRight([Fn1, Fn1, Fn2]);
     }
 }
 
@@ -6763,43 +7589,43 @@ namespace TestOverArgs {
     {
         let result: (a: string) => boolean;
 
-        result = _.overArgs<Func1, (a: string) => boolean>(func1, transform1);
-        result = _.overArgs<Func1, (a: string) => boolean>(func1, [transform1]);
+        result = _.overArgs(func1, transform1);
+        result = _.overArgs(func1, [transform1]);
     }
 
     {
         let result: (a: string, b: number) => boolean;
 
-        result = _.overArgs<Func2, (a: string, b: number) => boolean>(func2, transform1, transform2);
-        result = _.overArgs<Func2, (a: string, b: number) => boolean>(func2, [transform1, transform2]);
+        result = _.overArgs(func2, transform1, transform2);
+        result = _.overArgs(func2, [transform1, transform2]);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(a: string) => boolean>;
 
-        result = _(func1).overArgs<(a: string) => boolean>(transform1);
-        result = _(func1).overArgs<(a: string) => boolean>([transform1]);
+        result = _(func1).overArgs(transform1);
+        result = _(func1).overArgs([transform1]);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(a: string, b: number) => boolean>;
 
-        result = _(func2).overArgs<(a: string, b: number) => boolean>(transform1, transform2);
-        result = _(func2).overArgs<(a: string, b: number) => boolean>([transform1, transform2]);
+        result = _(func2).overArgs(transform1, transform2);
+        result = _(func2).overArgs([transform1, transform2]);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(a: string) => boolean>;
 
-        result = _(func1).chain().overArgs<(a: string) => boolean>(transform1);
-        result = _(func1).chain().overArgs<(a: string) => boolean>([transform1]);
+        result = _(func1).chain().overArgs(transform1);
+        result = _(func1).chain().overArgs([transform1]);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(a: string, b: number) => boolean>;
 
-        result = _(func2).chain().overArgs<(a: string, b: number) => boolean>(transform1, transform2);
-        result = _(func2).chain().overArgs<(a: string, b: number) => boolean>([transform1, transform2]);
+        result = _(func2).chain().overArgs(transform1, transform2);
+        result = _(func2).chain().overArgs([transform1, transform2]);
     }
 }
 
@@ -6819,21 +7645,18 @@ namespace TestNegate {
         let result: ResultFn;
 
         result = _.negate<PredicateFn>(predicate);
-        result = _.negate<PredicateFn, ResultFn>(predicate);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<ResultFn>;
 
         result = _(predicate).negate();
-        result = _(predicate).negate<ResultFn>();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<ResultFn>;
 
         result = _(predicate).chain().negate();
-        result = _(predicate).chain().negate<ResultFn>();
     }
 }
 
@@ -6882,10 +7705,10 @@ const testReargFn = (a: string, b: string, c: string) => [a, b, c];
 interface TestReargResultFn {
     (b: string, c: string, a: string): string[];
 }
-result = <string[]>(_.rearg<TestReargResultFn>(testReargFn, 2, 0, 1))('b', 'c', 'a');
-result = <string[]>(_.rearg<TestReargResultFn>(testReargFn, [2, 0, 1]))('b', 'c', 'a');
-result = <string[]>(_(testReargFn).rearg<TestReargResultFn>(2, 0, 1).value())('b', 'c', 'a');
-result = <string[]>(_(testReargFn).rearg<TestReargResultFn>([2, 0, 1]).value())('b', 'c', 'a');
+result = <string[]>(_.rearg(testReargFn, 2, 0, 1))('b', 'c', 'a');
+result = <string[]>(_.rearg(testReargFn, [2, 0, 1]))('b', 'c', 'a');
+result = <string[]>(_(testReargFn).rearg(2, 0, 1).value())('b', 'c', 'a');
+result = <string[]>(_(testReargFn).rearg([2, 0, 1]).value())('b', 'c', 'a');
 
 // _.rest
 namespace TestRest {
@@ -6897,25 +7720,22 @@ namespace TestRest {
     {
         let result: ResultFunc;
 
-        result = _.rest<ResultFunc>(func);
-        result = _.rest<ResultFunc>(func, 1);
-
-        result = _.rest<ResultFunc, Func>(func);
-        result = _.rest<ResultFunc, Func>(func, 1);
+        result = _.rest(func);
+        result = _.rest(func, 1);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<ResultFunc>;
 
-        result = _(func).rest<ResultFunc>();
-        result = _(func).rest<ResultFunc>(1);
+        result = _(func).rest();
+        result = _(func).rest(1);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<ResultFunc>;
 
-        result = _(func).chain().rest<ResultFunc>();
-        result = _(func).chain().rest<ResultFunc>(1);
+        result = _(func).chain().rest();
+        result = _(func).chain().rest(1);
     }
 }
 
@@ -6929,20 +7749,19 @@ namespace TestSpread {
     {
         let result: SampleResult;
 
-        result = _.spread<SampleFunc, SampleResult>(func);
-        result = _.spread<SampleResult>(func);
+        result = _.spread(func);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(func).spread<SampleResult>();
+        result = _(func).spread();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(func).chain().spread<SampleResult>();
+        result = _(func).chain().spread();
     }
 }
 
@@ -7030,9 +7849,7 @@ namespace TestWrap {
         let wrapper: SampleWrapper = (a, b, c) => true;
         let result: SampleResult;
 
-        result = _.wrap<SampleValue, SampleWrapper, SampleResult>(value, wrapper);
-        result = _.wrap<SampleValue, SampleResult>(value, wrapper);
-        result = _.wrap<SampleResult>(value, wrapper);
+        result = _.wrap(value, wrapper);
     }
 
     {
@@ -7042,8 +7859,7 @@ namespace TestWrap {
         let wrapper: SampleWrapper = (a, b, c) => true;
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(value).wrap<SampleWrapper, SampleResult>(wrapper);
-        result = _(value).wrap<SampleResult>(wrapper);
+        result = _(value).wrap(wrapper);
     }
 
     {
@@ -7053,8 +7869,7 @@ namespace TestWrap {
         let wrapper: SampleWrapper = (a, b, c) => true;
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(value).wrap<SampleWrapper, SampleResult>(wrapper);
-        result = _(value).wrap<SampleResult>(wrapper);
+        result = _(value).wrap(wrapper);
     }
 
     {
@@ -7064,8 +7879,7 @@ namespace TestWrap {
         let wrapper: SampleWrapper = (a, b, c) => true;
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(value).wrap<SampleWrapper, SampleResult>(wrapper);
-        result = _(value).wrap<SampleResult>(wrapper);
+        result = _(value).wrap(wrapper);
     }
 
     {
@@ -7075,8 +7889,7 @@ namespace TestWrap {
         let wrapper: SampleWrapper = (a, b, c) => true;
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(value).chain().wrap<SampleWrapper, SampleResult>(wrapper);
-        result = _(value).chain().wrap<SampleResult>(wrapper);
+        result = _(value).chain().wrap(wrapper);
     }
 
     {
@@ -7086,8 +7899,7 @@ namespace TestWrap {
         let wrapper: SampleWrapper = (a, b, c) => true;
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(value).chain().wrap<SampleWrapper, SampleResult>(wrapper);
-        result = _(value).chain().wrap<SampleResult>(wrapper);
+        result = _(value).chain().wrap(wrapper);
     }
 
     {
@@ -7097,8 +7909,7 @@ namespace TestWrap {
         let wrapper: SampleWrapper = (a, b, c) => true;
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(value).chain().wrap<SampleWrapper, SampleResult>(wrapper);
-        result = _(value).chain().wrap<SampleResult>(wrapper);
+        result = _(value).chain().wrap(wrapper);
     }
 }
 
@@ -7160,7 +7971,7 @@ namespace TestClone {
         let result: string[];
 
         result = _.clone<string[]>(['']);
-        result = _<string>(['']).clone();
+        result = _(['']).clone();
     }
 
     {
@@ -7202,7 +8013,7 @@ namespace TestCloneDeep {
         let result: string[];
 
         result = _.cloneDeep<string[]>(['']);
-        result = _<string>(['']).cloneDeep();
+        result = _(['']).cloneDeep();
     }
 
     {
@@ -7235,48 +8046,45 @@ namespace TestCloneDeepWith {
         let customizer: CloneDeepWithCustomizer<number, string> = (x) => "";
         let reslut: string;
 
-        result = _.cloneDeepWith<string>(42, customizer);
-        result = _.cloneDeepWith<number, string>(42, customizer);
-        result = _(42).cloneDeepWith<string>(customizer);
+        result = _.cloneDeepWith(42, customizer);
+        result = _(42).cloneDeepWith(customizer);
     }
 
     {
         let customizer: CloneDeepWithCustomizer<number, string> = (x) => "";
         let result: _.LoDashExplicitWrapper<string>;
 
-        result = _(42).chain().cloneDeepWith<string>(customizer);
+        result = _(42).chain().cloneDeepWith(customizer);
     }
 
     {
         let customizer: CloneDeepWithCustomizer<number[], string[]> = (x) => [];
         let reslut: string[];
 
-        result = _.cloneDeepWith<string[]>([42], customizer);
-        result = _.cloneDeepWith<number[], string[]>([42], customizer);
-        result = _([42]).cloneDeepWith<string[]>(customizer);
+        result = _.cloneDeepWith([42], customizer);
+        result = _([42]).cloneDeepWith(customizer);
     }
 
     {
         let customizer: CloneDeepWithCustomizer<number[], string[]> = (x) => [];
         let result: _.LoDashExplicitArrayWrapper<string>;
 
-        result = _([42]).chain().cloneDeepWith<string>(customizer);
+        result = _([42]).chain().cloneDeepWith(customizer);
     }
 
     {
         let customizer: CloneDeepWithCustomizer<{a: {b: number;};}, {a: {b: string;};}> = (x) => ({ a: { b: "" } });
         let reslut: {a: {b: string;};};
 
-        result = _.cloneDeepWith<{a: {b: string;};}>({a: {b: 42}}, customizer);
-        result = _.cloneDeepWith<{a: {b: number;};}, {a: {b: string;};}>({a: {b: 42}}, customizer);
-        result = _({a: {b: 42}}).cloneDeepWith<{a: {b: string;};}>(customizer);
+        result = _.cloneDeepWith({a: {b: 42}}, customizer);
+        result = _({a: {b: 42}}).cloneDeepWith(customizer);
     }
 
     {
         let customizer: CloneDeepWithCustomizer<{a: {b: number;};}, {a: {b: string;};}> = (x) => ({ a: { b: "" } });
         let result: _.LoDashExplicitObjectWrapper<{a: {b: string;};}>;
 
-        result = _({a: {b: 42}}).chain().cloneDeepWith<{a: {b: string;};}>(customizer);
+        result = _({a: {b: 42}}).chain().cloneDeepWith(customizer);
     }
 }
 
@@ -7290,7 +8098,7 @@ namespace TestCloneWith {
         let customizer: CloneWithCustomizer<number, string> = (x) => "";
         let reslut: string;
 
-        result = _.cloneWith<string>(42, customizer);
+        result = _.cloneWith(42, customizer);
         result = _.cloneWith<number, string>(42, customizer);
         result = _(42).cloneWith<string>(customizer);
     }
@@ -7306,7 +8114,7 @@ namespace TestCloneWith {
         let customizer: CloneWithCustomizer<number[], string[]> = (x) => [];
         let reslut: string[];
 
-        result = _.cloneWith<string[]>([42], customizer);
+        result = _.cloneWith([42], customizer);
         result = _.cloneWith<number[], string[]>([42], customizer);
         result = _([42]).cloneWith<string[]>(customizer);
     }
@@ -7315,14 +8123,14 @@ namespace TestCloneWith {
         let customizer: CloneWithCustomizer<number[], string[]> = (x) => [];
         let result: _.LoDashExplicitArrayWrapper<string>;
 
-        result = _([42]).chain().cloneWith<string>(customizer);
+        result = _([42]).chain().cloneWith(customizer);
     }
 
     {
         let customizer: CloneWithCustomizer<{a: {b: number;};}, {a: {b: string;};}> = (x) => ({ a: { b: "" } });
         let reslut: {a: {b: string;};};
 
-        result = _.cloneWith<{a: {b: string;};}>({a: {b: 42}}, customizer);
+        result = _.cloneWith({a: {b: 42}}, customizer);
         result = _.cloneWith<{a: {b: number;};}, {a: {b: string;};}>({a: {b: 42}}, customizer);
         result = _({a: {b: 42}}).cloneWith<{a: {b: string;};}>(customizer);
     }
@@ -7503,14 +8311,13 @@ namespace TestIsArrayBuffer {
 namespace TestIsArrayLike {
     {
         let value: string | string[] | { [index: number]: boolean, length: number } | [number, boolean]
-            | number | Function | { length: string } | { a: string }
+            | number | { length: string } | { a: string } | null | undefined
             = any;
 
         if (_.isArrayLike(value)) {
             let result: string | string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
-        }
-        else {
-            let result: number | Function | { length: string } | { a: string; } = value;
+        } else {
+            let result: number | { length: string } | { a: string; } | null | undefined = value;
         }
     }
 
@@ -7530,8 +8337,7 @@ namespace TestIsArrayLike {
 
         if (_.isArrayLike(value)) {
             value; // $ExpectType never
-        }
-        else {
+        } else {
             value; // $ExpectType Function
         }
     }
@@ -7580,14 +8386,13 @@ namespace TestIsArrayLike {
 namespace TestIsArrayLikeObject {
     {
         let value: string[] | { [index: number]: boolean, length: number } | [number, boolean]
-            | number | string | Function | { length: string } | { a: string }
+            | number | string | { length: string } | { a: string } | null | undefined
             = any;
 
         if (_.isArrayLikeObject(value)) {
             let result: string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
-        }
-        else {
-            let result: string | number | Function | { length: string; } | { a: string; } = value;
+        } else {
+            let result: string | number | { length: string; } | { a: string; } | null | undefined = value;
         }
     }
 
@@ -7607,8 +8412,7 @@ namespace TestIsArrayLikeObject {
 
         if (_.isArrayLikeObject(value)) {
             value; // $ExpectType never
-        }
-        else {
+        } else {
             value; // $ExpectType string | Function
         }
     }
@@ -7799,9 +8603,7 @@ namespace TestIsEqual {
 
 // _.isEqualWith
 namespace TestIsEqualWith {
-    let customizer = (value: any, other: any, indexOrKey: number|string|undefined, parent: any, otherParent: any, stack: any) => {
-        return value ? undefined : true;
-    };
+    let customizer = (value: any, other: any, indexOrKey: number|string|symbol|undefined, parent: any, otherParent: any, stack: any) => true;
 
     {
         let result: boolean;
@@ -7894,7 +8696,11 @@ namespace TestIsFunction {
             let result: Function = value;
         }
         else {
-            let result: number = value;
+            let result: number|Function = value;
+        }
+
+        if (_.isFunction(any)) {
+            any();
         }
     }
 
@@ -7963,7 +8769,7 @@ namespace TestIsMap {
     {
         let value: number|Map<string, number> = 0;
 
-        if (_.isMap<string, number>(value)) {
+        if (_.isMap(value)) {
             let result: Map<string, number> = value;
         }
         else {
@@ -8001,7 +8807,7 @@ namespace TestIsMatch {
 
 // _.isMatchWith
 namespace TestIsMatchWith {
-    let testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string) => true;
+    let testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string|symbol) => true;
 
     let result: boolean;
 
@@ -8253,7 +9059,7 @@ namespace TestIsSet {
     {
         let value: number|Set<string> = 0;
 
-        if (_.isSet<string>(value)) {
+        if (_.isSet(value)) {
             let result: Set<string> = value;
         }
         else {
@@ -8371,12 +9177,10 @@ namespace TestIsUndefined {
 // _.isWeakMap
 namespace TestIsWeakMap {
     {
-        interface Obj { a: string };
+        let value: number | WeakMap<object, number> = 0;
 
-        let value: number|WeakMap<Obj, number> = 0;
-
-        if (_.isWeakMap<Obj, number>(value)) {
-            let result: WeakMap<Obj, number> = value;
+        if (_.isWeakMap(value)) {
+            let result: WeakMap<object, number> = value;
         }
         else {
             let result: number = value;
@@ -8404,10 +9208,10 @@ namespace TestIsWeakMap {
 // _.isWeakSet
 namespace TestIsWeakSet {
     {
-        let value: number|WeakSet<string> = 0;
+        let value: number | WeakSet<object> = 0;
 
-        if (_.isWeakSet<string>(value)) {
-            let result: WeakSet<string> = value;
+        if (_.isWeakSet(value)) {
+            let result: WeakSet<object> = value;
         }
         else {
             let result: number = value;
@@ -8531,23 +9335,23 @@ namespace TestToArray {
 namespace TestToPlainObject {
     {
         let result: TResult;
-        result = _.toPlainObject<TResult>();
-        result = _.toPlainObject<TResult>(true);
-        result = _.toPlainObject<TResult>(1);
-        result = _.toPlainObject<TResult>('a');
-        result = _.toPlainObject<TResult>([]);
-        result = _.toPlainObject<TResult>({});
+        result = _.toPlainObject();
+        result = _.toPlainObject(true);
+        result = _.toPlainObject(1);
+        result = _.toPlainObject('a');
+        result = _.toPlainObject([]);
+        result = _.toPlainObject({});
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<TResult>;
 
-        result = _(true).toPlainObject<TResult>();
-        result = _(1).toPlainObject<TResult>();
-        result = _('a').toPlainObject<TResult>();
-        result = _([1]).toPlainObject<TResult>();
-        result = _<string>([]).toPlainObject<TResult>();
-        result = _({}).toPlainObject<TResult>();
+        result = _(true).toPlainObject();
+        result = _(1).toPlainObject();
+        result = _('a').toPlainObject();
+        result = _([1]).toPlainObject();
+        result = _(['']).toPlainObject();
+        result = _({}).toPlainObject();
     }
 }
 
@@ -8563,13 +9367,13 @@ namespace TestToFinite {
    }
 
    {
-       let result: _.LoDashImplicitWrapper<number>;
+       let result: number;
 
        result = _(true).toFinite();
        result = _(1).toFinite();
        result = _('3.2').toFinite();
        result = _([1]).toFinite();
-       result = _<string>([]).toFinite();
+       result = _([]).toFinite();
        result = _({}).toFinite();
    }
 }
@@ -8586,13 +9390,13 @@ namespace TestToInteger {
    }
 
    {
-       let result: _.LoDashImplicitWrapper<number>;
+       let result: number;
 
        result = _(true).toInteger();
        result = _(1).toInteger();
        result = _('a').toInteger();
        result = _([1]).toInteger();
-       result = _<string>([]).toInteger();
+       result = _(['']).toInteger();
        result = _({}).toInteger();
    }
 }
@@ -8609,13 +9413,13 @@ namespace TestToLength {
    }
 
    {
-       let result: _.LoDashImplicitWrapper<number>;
+       let result: number;
 
        result = _(true).toLength();
        result = _(1).toLength();
        result = _('a').toLength();
        result = _([1]).toLength();
-       result = _<string>([]).toLength();
+       result = _(['']).toLength();
        result = _({}).toLength();
    }
 }
@@ -8632,13 +9436,13 @@ namespace TestToNumber {
    }
 
    {
-       let result: _.LoDashImplicitWrapper<number>;
+       let result: number;
 
        result = _(true).toNumber();
        result = _(1).toNumber();
        result = _('a').toNumber();
        result = _([1]).toNumber();
-       result = _<string>([]).toNumber();
+       result = _(['']).toNumber();
        result = _({}).toNumber();
    }
 }
@@ -8655,13 +9459,13 @@ namespace TestToSafeInteger {
    }
 
    {
-       let result: _.LoDashImplicitWrapper<number>;
+       let result: number;
 
        result = _(true).toSafeInteger();
        result = _(1).toSafeInteger();
        result = _('a').toSafeInteger();
        result = _([1]).toSafeInteger();
-       result = _<string>([]).toSafeInteger();
+       result = _(['']).toSafeInteger();
        result = _({}).toSafeInteger();
    }
 }
@@ -8764,42 +9568,33 @@ namespace TestMax {
 namespace TestMaxBy {
     let array: number[] = [];
     let list: _.List<number> = [];
-    let dictionary: _.Dictionary<number> = {};
+    let array2: TResult[] = [];
+    let list2: _.List<TResult> = [];
 
     let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
-    let dictionaryIterator = (value: number, key: string, collection: _.Dictionary<number>) => 0;
 
     let result: number | undefined;
+    let result2: TResult | undefined;
 
     result = _.maxBy<number>(array);
     result = _.maxBy<number>(array, listIterator);
     result = _.maxBy<number>(array, '');
-    result = _.maxBy<{a: number}, number>(array, {a: 42});
+    result2 = _.maxBy(array2, {a: 42});
 
     result = _.maxBy<number>(list);
     result = _.maxBy<number>(list, listIterator);
     result = _.maxBy<number>(list, '');
-    result = _.maxBy<{a: number}, number>(list, {a: 42});
-
-    result = _.maxBy<number>(dictionary);
-    result = _.maxBy<number>(dictionary, dictionaryIterator);
-    result = _.maxBy<number>(dictionary, '');
-    result = _.maxBy<{a: number}, number>(dictionary, {a: 42});
+    result2 = _.maxBy(list2, {a: 42});
 
     result = _(array).maxBy();
     result = _(array).maxBy(listIterator);
     result = _(array).maxBy('');
-    result = _(array).maxBy<{a: number}>({a: 42});
+    result2 = _(array2).maxBy({a: 42});
 
     result = _(list).maxBy<number>();
     result = _(list).maxBy<number>(listIterator);
     result = _(list).maxBy<number>('');
-    result = _(list).maxBy<{a: number}, number>({a: 42});
-
-    result = _(dictionary).maxBy<number>();
-    result = _(dictionary).maxBy<number>(dictionaryIterator);
-    result = _(dictionary).maxBy<number>('');
-    result = _(dictionary).maxBy<{a: number}, number>({a: 42});
+    result2 = _(list2).maxBy({a: 42});
 }
 
 // _.mean
@@ -8809,7 +9604,6 @@ namespace TestMean {
     let result: number;
 
     result = _.mean(array);
-    result = _.mean<number>(array);
 
     result = _(array).mean();
 }
@@ -8844,42 +9638,33 @@ namespace TestMin {
 namespace TestMinBy {
     let array: number[] = [];
     let list: _.List<number> = [];
-    let dictionary: _.Dictionary<number> = {};
+    let array2: TResult[] = [];
+    let list2: _.List<TResult> = [];
 
     let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
-    let dictionaryIterator = (value: number, key: string, collection: _.Dictionary<number>) => 0;
 
     let result: number | undefined;
+    let result2: TResult | undefined;
 
     result = _.minBy<number>(array);
     result = _.minBy<number>(array, listIterator);
     result = _.minBy<number>(array, '');
-    result = _.minBy<{a: number}, number>(array, {a: 42});
+    result2 = _.minBy(array2, {a: 42});
 
     result = _.minBy<number>(list);
     result = _.minBy<number>(list, listIterator);
     result = _.minBy<number>(list, '');
-    result = _.minBy<{a: number}, number>(list, {a: 42});
-
-    result = _.minBy<number>(dictionary);
-    result = _.minBy<number>(dictionary, dictionaryIterator);
-    result = _.minBy<number>(dictionary, '');
-    result = _.minBy<{a: number}, number>(dictionary, {a: 42});
+    result2 = _.minBy(list2, {a: 42});
 
     result = _(array).minBy();
     result = _(array).minBy(listIterator);
     result = _(array).minBy('');
-    result = _(array).minBy<{a: number}>({a: 42});
+    result2 = _(array2).minBy({a: 42});
 
     result = _(list).minBy<number>();
     result = _(list).minBy<number>(listIterator);
     result = _(list).minBy<number>('');
-    result = _(list).minBy<{a: number}, number>({a: 42});
-
-    result = _(dictionary).minBy<number>();
-    result = _(dictionary).minBy<number>(dictionaryIterator);
-    result = _(dictionary).minBy<number>('');
-    result = _(dictionary).minBy<{a: number}, number>({a: 42});
+    result2 = _(list2).minBy({a: 42});
 }
 
 // _.multiply
@@ -8933,10 +9718,8 @@ namespace TestSum {
         let result: number;
 
         result = _.sum(array);
-        result = _.sum<number>(array);
 
         result = _.sum(list);
-        result = _.sum<number>(list);
 
         result = _(array).sum();
 
@@ -8964,7 +9747,7 @@ namespace TestSumBy {
     let list: _.List<number> | null | undefined = [] as any;
     let objectList: _.List<{ 'age': number }> | null | undefined = [] as any;
 
-    let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
+    let listIterator = (value: number) => 0;
 
     {
         let result: number;
@@ -8972,17 +9755,15 @@ namespace TestSumBy {
         result = _.sumBy(array);
         result = _.sumBy(array, listIterator);
         result = _.sumBy(objectArray, 'age');
-        result = _.sumBy(objectArray, { 'age': 30 });
 
         result = _.sumBy(list);
         result = _.sumBy(list, listIterator);
         result = _.sumBy(objectList, 'age');
-        result = _.sumBy(objectList, { 'age': 30 });
 
         result = _(array).sumBy(listIterator);
         result = _(objectArray).sumBy('age');
 
-        result = _(list).sumBy((value: _.List<number> | null | undefined, index: number, collection: _.List<_.List<number> | null | undefined>) => 0);
+        result = _(list).sumBy(listIterator);
         result = _(objectList).sumBy('age');
     }
 
@@ -8992,7 +9773,7 @@ namespace TestSumBy {
         result = _(array).chain().sumBy(listIterator);
         result = _(objectArray).chain().sumBy('age');
 
-        result = _(list).chain().sumBy((value: _.List<number> | null | undefined, index: number, collection: _.List<_.List<number> | null | undefined>) => 0);
+        result = _(list).chain().sumBy(listIterator);
         result = _(objectList).chain().sumBy('age');
     }
 }
@@ -9024,8 +9805,10 @@ namespace TestInClamp {
         let result: number;
 
         result = _.clamp(3, 2, 4);
+        result = _.clamp(3, 4);
 
         result = _(3).clamp(2, 4);
+        result = _(3).clamp(4);
     }
 
     {
@@ -9083,6 +9866,9 @@ namespace TestRandom {
         result = _(1).chain().random(true);
         result = _(true).chain().random();
     }
+
+    // $ExpectType number[]
+    _.map([5, 5], _.random);
 }
 
 /**********
@@ -9138,7 +9924,7 @@ namespace TestAssign {
     {
         let result: { a: number, b: number, c: number, d: number, e: number };
 
-        result = _.assign<{ a: number, b: number, c: number, d: number, e: number }>(obj, s1, s2, s3, s4, s5);
+        result = _.assign(obj, s1, s2, s3, s4, s5);
     }
 
     {
@@ -9174,7 +9960,7 @@ namespace TestAssign {
     {
         let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
 
-        result = _(obj).assign<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
+        result = _(obj).assign(s1, s2, s3, s4, s5);
     }
 
     {
@@ -9210,7 +9996,7 @@ namespace TestAssign {
     {
         let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
 
-        result = _(obj).chain().assign<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
+        result = _(obj).chain().assign(s1, s2, s3, s4, s5);
     }
 }
 
@@ -9322,7 +10108,7 @@ namespace TestAssignWith {
 
     {
         let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-        result = _(obj).chain().assignWith<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5, customizer);
+        result = _(obj).chain().assignWith(s1, s2, s3, s4, s5, customizer);
     }
 }
 
@@ -9449,7 +10235,7 @@ namespace TestAssignIn {
     {
         let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
 
-        result = _(obj).chain().assignIn<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
+        result = _(obj).chain().assignIn(s1, s2, s3, s4, s5);
     }
 }
 
@@ -9561,7 +10347,7 @@ namespace TestAssignInWith {
 
     {
         let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-        result = _(obj).chain().assignInWith<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5, customizer);
+        result = _(obj).chain().assignInWith(s1, s2, s3, s4, s5, customizer);
     }
 }
 
@@ -9644,7 +10430,7 @@ namespace TestDefaults {
     {
     let result: { a: string, b: number, c: number, d: number, e: number };
 
-    result = _.defaults<{ a: string, b: number, c: number, d: number, e: number }>(obj, s1, s2, s3, s4, s5);
+    result = _.defaults(obj, s1, s2, s3, s4, s5);
     }
 
     {
@@ -9680,7 +10466,7 @@ namespace TestDefaults {
     {
     let result: _.LoDashImplicitObjectWrapper<{ a: string, b: number, c: number, d: number, e: number }>;
 
-    result = _(obj).defaults<{ a: string, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
+    result = _(obj).defaults(s1, s2, s3, s4, s5);
     }
 
     {
@@ -9716,7 +10502,7 @@ namespace TestDefaults {
     {
     let result: _.LoDashExplicitObjectWrapper<{ a: string, b: number, c: number, d: number, e: number }>;
 
-    result = _(obj).chain().defaults<{ a: string, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
+    result = _(obj).chain().defaults(s1, s2, s3, s4, s5);
     }
 }
 
@@ -9730,45 +10516,27 @@ interface DefaultsDeepResult {
 const TestDefaultsDeepObject = { 'user': { 'name': 'barney' } };
 const TestDefaultsDeepSource = { 'user': { 'name': 'fred', 'age': 36 } };
 result = <DefaultsDeepResult>_.defaultsDeep(TestDefaultsDeepObject, TestDefaultsDeepSource);
-result = <DefaultsDeepResult>_(TestDefaultsDeepObject).defaultsDeep<DefaultsDeepResult>(TestDefaultsDeepSource).value();
+result = <DefaultsDeepResult>_(TestDefaultsDeepObject).defaultsDeep(TestDefaultsDeepSource).value();
 
 // _.entries
 namespace TestEntries {
     let object: _.Dictionary<string> = {};
 
-    {
-        let result: [string, any][];
-
-        result = _.entries<_.Dictionary<string>>(object);
-    }
-
     {
         let result: [string, string][];
 
-        result = _.entries<_.Dictionary<string>, string>(object);
+        result = _.entries(object);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<[string, string]>;
 
-        result = _(object).entries<string>();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<[string, any]>;
-
         result = _(object).entries();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<[string, string]>;
 
-        result = _(object).chain().entries<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
         result = _(object).chain().entries();
     }
 }
@@ -9777,27 +10545,15 @@ namespace TestEntries {
 namespace TestEntriesIn {
     let object: _.Dictionary<string> = {};
 
-    {
-        let result: [string, any][];
-
-        result = _.entriesIn<_.Dictionary<string>>(object);
-    }
-
     {
         let result: [string, string][];
 
-        result = _.entriesIn<_.Dictionary<string>, string>(object);
+        result = _.entriesIn(object);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<[string, string]>;
 
-        result = _(object).entriesIn<string>();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<[string, any]>;
-
         result = _(object).entriesIn();
     }
 
@@ -9901,7 +10657,7 @@ namespace TestExtend {
     {
         let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
 
-        result = _(obj).extend<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
+        result = _(obj).extend(s1, s2, s3, s4, s5);
     }
 
     {
@@ -9937,7 +10693,7 @@ namespace TestExtend {
     {
         let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
 
-        result = _(obj).chain().extend<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
+        result = _(obj).chain().extend(s1, s2, s3, s4, s5);
     }
 }
 
@@ -10028,7 +10784,7 @@ namespace TestExtendWith {
     {
         let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
 
-        result = _(obj).extendWith<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5, customizer);
+        result = _(obj).extendWith(s1, s2, s3, s4, s5, customizer);
     }
 
     {
@@ -10064,7 +10820,7 @@ namespace TestExtendWith {
     {
         let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
 
-        result = _(obj).chain().extendWith<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5, customizer);
+        result = _(obj).chain().extendWith(s1, s2, s3, s4, s5, customizer);
     }
 }
 
@@ -10081,7 +10837,7 @@ namespace TestFindKey {
 
         result = _.findKey<{a: string;}>({a: ''}, '');
 
-        result = _.findKey<{a: number;}, {a: string;}>({a: ''}, {a: 42});
+        result = _.findKey({a: { b: 5 }}, {b: 42});
 
         result = _.findKey({a: { b: 5 }}, ['b', 5]);
 
@@ -10091,16 +10847,16 @@ namespace TestFindKey {
 
         result = _<{a: string;}>({a: ''}).findKey('');
 
-        result = _<{a: string;}>({a: ''}).findKey<{a: number;}>({a: 42});
+        result = _({a: { b: 5 }}).findKey({b: 42});
     }
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
         let result: string | undefined;
 
-        result = _.findKey<string, {a: string;}>({a: ''}, predicateFn);
+        result = _.findKey({a: ''}, predicateFn);
 
-        result = _<{a: string;}>({a: ''}).findKey<string>(predicateFn);
+        result = _({a: ''}).findKey(predicateFn);
     }
 
     {
@@ -10113,14 +10869,14 @@ namespace TestFindKey {
 
         result = _<{a: string;}>({a: ''}).chain().findKey('');
 
-        result = _<{a: string;}>({a: ''}).chain().findKey<{a: number;}>({a: 42});
+        result = _({a: { b: 5 }}).chain().findKey({b: 42});
     }
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
         let result: _.LoDashExplicitWrapper<string | undefined>;
 
-        result = _<{a: string;}>({a: ''}).chain().findKey<string>(predicateFn);
+        result = _({a: ''}).chain().findKey(predicateFn);
     }
 }
 
@@ -10136,7 +10892,7 @@ namespace TestFindLastKey {
 
         result = _.findLastKey<{a: string;}>({a: ''}, '');
 
-        result = _.findLastKey<{a: number;}, {a: string;}>({a: ''}, {a: 42});
+        result = _.findLastKey({a: { b: 5 }}, {b: 42});
 
         result = _.findLastKey({a: { b: 5 }}, ['b', 5]);
 
@@ -10146,16 +10902,16 @@ namespace TestFindLastKey {
 
         result = _<{a: string;}>({a: ''}).findLastKey('');
 
-        result = _<{a: string;}>({a: ''}).findLastKey<{a: number;}>({a: 42});
+        result = _({a: { b: 5 }}).findLastKey({b: 42});
     }
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
         let result: string | undefined;
 
-        result = _.findLastKey<string, {a: string;}>({a: ''}, predicateFn);
+        result = _.findLastKey({a: ''}, predicateFn);
 
-        result = _<{a: string;}>({a: ''}).findLastKey<string>(predicateFn);
+        result = _({a: ''}).findLastKey(predicateFn);
     }
 
     {
@@ -10168,14 +10924,14 @@ namespace TestFindLastKey {
 
         result = _<{a: string;}>({a: ''}).chain().findLastKey('');
 
-        result = _<{a: string;}>({a: ''}).chain().findLastKey<{a: number;}>({a: 42});
+        result = _({a: { b: 5 }}).chain().findLastKey({b: 42});
     }
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
         let result: _.LoDashExplicitWrapper<string | undefined>;
 
-        result = _<{a: string;}>({a: ''}).chain().findLastKey<string>(predicateFn);
+        result = _({a: ''}).chain().findLastKey(predicateFn);
     }
 }
 
@@ -10194,15 +10950,15 @@ namespace TestForIn {
     {
         let result: _.Dictionary<number>;
 
-        result = _.forIn<number>(dictionary);
-        result = _.forIn<number>(dictionary, dictionaryIterator);
+        result = _.forIn(dictionary);
+        result = _.forIn(dictionary, dictionaryIterator);
     }
 
     {
         let result: _.Dictionary<number> | null | undefined;
 
-        result = _.forIn<number>(nilDictionary);
-        result = _.forIn<number>(nilDictionary, dictionaryIterator);
+        result = _.forIn(nilDictionary);
+        result = _.forIn(nilDictionary, dictionaryIterator);
     }
 
     {
@@ -10222,29 +10978,29 @@ namespace TestForIn {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).forIn<number>();
-        result = _(dictionary).forIn<number>(dictionaryIterator);
+        result = _(dictionary).forIn();
+        result = _(dictionary).forIn(dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).forIn<number>();
-        result = _(nilDictionary).forIn<number>(dictionaryIterator);
+        result = _(nilDictionary).forIn();
+        result = _(nilDictionary).forIn(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).chain().forIn<number>();
-        result = _(dictionary).chain().forIn<number>(dictionaryIterator);
+        result = _(dictionary).chain().forIn();
+        result = _(dictionary).chain().forIn(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).chain().forIn<number>();
-        result = _(nilDictionary).chain().forIn<number>(dictionaryIterator);
+        result = _(nilDictionary).chain().forIn();
+        result = _(nilDictionary).chain().forIn(dictionaryIterator);
     }
 }
 
@@ -10263,15 +11019,15 @@ namespace TestForInRight {
     {
         let result: _.Dictionary<number>;
 
-        result = _.forInRight<number>(dictionary);
-        result = _.forInRight<number>(dictionary, dictionaryIterator);
+        result = _.forInRight(dictionary);
+        result = _.forInRight(dictionary, dictionaryIterator);
     }
 
     {
         let result: _.Dictionary<number> | null | undefined;
 
-        result = _.forInRight<number>(nilDictionary);
-        result = _.forInRight<number>(nilDictionary, dictionaryIterator);
+        result = _.forInRight(nilDictionary);
+        result = _.forInRight(nilDictionary, dictionaryIterator);
     }
 
     {
@@ -10291,29 +11047,29 @@ namespace TestForInRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).forInRight<number>();
-        result = _(dictionary).forInRight<number>(dictionaryIterator);
+        result = _(dictionary).forInRight();
+        result = _(dictionary).forInRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).forInRight<number>();
-        result = _(nilDictionary).forInRight<number>(dictionaryIterator);
+        result = _(nilDictionary).forInRight();
+        result = _(nilDictionary).forInRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).chain().forInRight<number>();
-        result = _(dictionary).chain().forInRight<number>(dictionaryIterator);
+        result = _(dictionary).chain().forInRight();
+        result = _(dictionary).chain().forInRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).chain().forInRight<number>();
-        result = _(nilDictionary).chain().forInRight<number>(dictionaryIterator);
+        result = _(nilDictionary).chain().forInRight();
+        result = _(nilDictionary).chain().forInRight(dictionaryIterator);
     }
 }
 
@@ -10332,15 +11088,15 @@ namespace TestForOwn {
     {
         let result: _.Dictionary<number>;
 
-        result = _.forOwn<number>(dictionary);
-        result = _.forOwn<number>(dictionary, dictionaryIterator);
+        result = _.forOwn(dictionary);
+        result = _.forOwn(dictionary, dictionaryIterator);
     }
 
     {
         let result: _.Dictionary<number> | null | undefined;
 
-        result = _.forOwn<number>(nilDictionary);
-        result = _.forOwn<number>(nilDictionary, dictionaryIterator);
+        result = _.forOwn(nilDictionary);
+        result = _.forOwn(nilDictionary, dictionaryIterator);
     }
 
     {
@@ -10360,29 +11116,29 @@ namespace TestForOwn {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).forOwn<number>();
-        result = _(dictionary).forOwn<number>(dictionaryIterator);
+        result = _(dictionary).forOwn();
+        result = _(dictionary).forOwn(dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).forOwn<number>();
-        result = _(nilDictionary).forOwn<number>(dictionaryIterator);
+        result = _(nilDictionary).forOwn();
+        result = _(nilDictionary).forOwn(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).chain().forOwn<number>();
-        result = _(dictionary).chain().forOwn<number>(dictionaryIterator);
+        result = _(dictionary).chain().forOwn();
+        result = _(dictionary).chain().forOwn(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).chain().forOwn<number>();
-        result = _(nilDictionary).chain().forOwn<number>(dictionaryIterator);
+        result = _(nilDictionary).chain().forOwn();
+        result = _(nilDictionary).chain().forOwn(dictionaryIterator);
     }
 }
 
@@ -10401,15 +11157,15 @@ namespace TestForOwnRight {
     {
         let result: _.Dictionary<number>;
 
-        result = _.forOwnRight<number>(dictionary);
-        result = _.forOwnRight<number>(dictionary, dictionaryIterator);
+        result = _.forOwnRight(dictionary);
+        result = _.forOwnRight(dictionary, dictionaryIterator);
     }
 
     {
         let result: _.Dictionary<number> | null | undefined;
 
-        result = _.forOwnRight<number>(nilDictionary);
-        result = _.forOwnRight<number>(nilDictionary, dictionaryIterator);
+        result = _.forOwnRight(nilDictionary);
+        result = _.forOwnRight(nilDictionary, dictionaryIterator);
     }
 
     {
@@ -10429,29 +11185,29 @@ namespace TestForOwnRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).forOwnRight<number>();
-        result = _(dictionary).forOwnRight<number>(dictionaryIterator);
+        result = _(dictionary).forOwnRight();
+        result = _(dictionary).forOwnRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).forOwnRight<number>();
-        result = _(nilDictionary).forOwnRight<number>(dictionaryIterator);
+        result = _(nilDictionary).forOwnRight();
+        result = _(nilDictionary).forOwnRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
-        result = _(dictionary).chain().forOwnRight<number>();
-        result = _(dictionary).chain().forOwnRight<number>(dictionaryIterator);
+        result = _(dictionary).chain().forOwnRight();
+        result = _(dictionary).chain().forOwnRight(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
 
-        result = _(nilDictionary).chain().forOwnRight<number>();
-        result = _(nilDictionary).chain().forOwnRight<number>(dictionaryIterator);
+        result = _(nilDictionary).chain().forOwnRight();
+        result = _(nilDictionary).chain().forOwnRight(dictionaryIterator);
     }
 }
 
@@ -10464,7 +11220,7 @@ namespace TestFunctions {
     {
         let result: string[];
 
-        result = _.functions<SampleObject>(object);
+        result = _.functions(object);
     }
 
     {
@@ -10507,18 +11263,37 @@ namespace TestFunctionsIn {
 
 // _.get
 namespace TestGet {
+    _.get([], Symbol.iterator);
+    _.get([], [Symbol.iterator]);
+
+    _.get('abc', 1); // $ExpectType string
+    _('abc').get(1); // $ExpectType string
+    _.chain('abc').get(1); // $ExpectType LoDashExplicitWrapper<string>
+
+    _.get({ a: { b: true } }, "a"); // $ExpectType { b: boolean; }
+    _({ a: { b: true } }).get("a"); // $ExpectType { b: boolean; }
+    _.chain({ a: { b: true } }).get("a"); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
+
+    _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
+    _({ a: { b: true } }).get(["a"]); // $ExpectType { b: boolean; }
+    _.chain({ a: { b: true } }).get(["a"]); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
+
+    _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
+    _({ a: { b: true } }).get(["a", "b"]); // $ExpectType any
+    _.chain({ a: { b: true } }).get(["a", "b"]); // $ExpectType LoDashExplicitWrapper<any>
+
     {
         let result: string;
 
-        result = _.get<string, string>('abc', '0');
-        result = _.get<string, string>('abc', '0', '_');
-        result = _.get<string, string>('abc', ['0']);
-        result = _.get<string, string>('abc', ['0'], '_');
+        result = _.get('abc', '0');
+        result = _.get('abc', '0', '_');
+        result = _.get('abc', ['0']);
+        result = _.get('abc', ['0'], '_');
 
-        result = _.get<string>('abc', '0');
-        result = _.get<string>('abc', '0', '_');
-        result = _.get<string>('abc', ['0']);
-        result = _.get<string>('abc', ['0'], '_');
+        result = _.get('abc', '0');
+        result = _.get('abc', '0', '_');
+        result = _.get('abc', ['0']);
+        result = _.get('abc', ['0'], '_');
 
         result = _('abc').get<string>('0');
         result = _('abc').get<string>('0', '_');
@@ -10529,15 +11304,15 @@ namespace TestGet {
     {
         let result: number;
 
-        result = _.get<number[], number>([42], '0');
-        result = _.get<number[], number>([42], '0', -1);
-        result = _.get<number[], number>([42], ['0']);
-        result = _.get<number[], number>([42], ['0'], -1);
+        result = _.get([42], '0');
+        result = _.get([42], '0', -1);
+        result = _.get([42], ['0']);
+        result = _.get([42], ['0'], -1);
 
-        result = _.get<number>([42], '0');
-        result = _.get<number>([42], '0', -1);
-        result = _.get<number>([42], ['0']);
-        result = _.get<number>([42], ['0'], -1);
+        result = _.get([42], '0');
+        result = _.get([42], '0', -1);
+        result = _.get([42], ['0']);
+        result = _.get([42], ['0'], -1);
 
         result = _([42]).get<number>('0');
         result = _([42]).get<number>('0', -1);
@@ -10548,15 +11323,15 @@ namespace TestGet {
     {
         let result: boolean;
 
-        result = _.get<{a: boolean}, boolean>({a: true}, 'a');
-        result = _.get<{a: boolean}, boolean>({a: true}, 'a', false);
-        result = _.get<{a: boolean}, boolean>({a: true}, ['a']);
-        result = _.get<{a: boolean}, boolean>({a: true}, ['a'], false);
+        result = _.get({a: true}, 'a');
+        result = _.get({a: true}, 'a', false);
+        result = _.get({a: true}, ['a']);
+        result = _.get({a: true}, ['a'], false);
 
-        result = _.get<boolean>({a: true}, 'a');
-        result = _.get<boolean>({a: true}, 'a', false);
-        result = _.get<boolean>({a: true}, ['a']);
-        result = _.get<boolean>({a: true}, ['a'], false);
+        result = _.get({a: true}, 'a');
+        result = _.get({a: true}, 'a', false);
+        result = _.get({a: true}, ['a']);
+        result = _.get({a: true}, ['a'], false);
 
         result = _({a: true}).get<boolean>('a');
         result = _({a: true}).get<boolean>('a', false);
@@ -10567,28 +11342,28 @@ namespace TestGet {
     {
         let result: _.LoDashExplicitWrapper<string>;
 
-        result = _('abc').chain().get<_.LoDashExplicitWrapper<string>>('0');
-        result = _('abc').chain().get<_.LoDashExplicitWrapper<string>>('0', '_');
-        result = _('abc').chain().get<_.LoDashExplicitWrapper<string>>(['0']);
-        result = _('abc').chain().get<_.LoDashExplicitWrapper<string>>(['0'], '_');
+        result = _('abc').chain().get('0');
+        result = _('abc').chain().get('0', '_');
+        result = _('abc').chain().get(['0']);
+        result = _('abc').chain().get(['0'], '_');
     }
 
     {
         let result: _.LoDashExplicitWrapper<number>;
 
-        result = _([42]).chain().get<_.LoDashExplicitWrapper<number>>('0');
-        result = _([42]).chain().get<_.LoDashExplicitWrapper<number>>('0', -1);
-        result = _([42]).chain().get<_.LoDashExplicitWrapper<number>>(['0']);
-        result = _([42]).chain().get<_.LoDashExplicitWrapper<number>>(['0'], -1);
+        result = _([42]).chain().get('0');
+        result = _([42]).chain().get('0', -1);
+        result = _([42]).chain().get(['0']);
+        result = _([42]).chain().get(['0'], -1);
     }
 
     {
         let result: _.LoDashExplicitWrapper<boolean>;
 
-        result = _({a: true}).chain().get<_.LoDashExplicitWrapper<boolean>>('a');
-        result = _({a: true}).chain().get<_.LoDashExplicitWrapper<boolean>>('a', false);
-        result = _({a: true}).chain().get<_.LoDashExplicitWrapper<boolean>>(['a']);
-        result = _({a: true}).chain().get<_.LoDashExplicitWrapper<boolean>>(['a'], false);
+        result = _({a: true}).chain().get('a');
+        result = _({a: true}).chain().get('a', false);
+        result = _({a: true}).chain().get(['a']);
+        result = _({a: true}).chain().get(['a'], false);
     }
 }
 
@@ -10603,13 +11378,11 @@ namespace TestHas {
 
         result = _.has<SampleObject>(object, '');
         result = _.has<SampleObject>(object, 42);
-        result = _.has<SampleObject>(object, true);
-        result = _.has<SampleObject>(object, ['', 42, true]);
+        result = _.has<SampleObject>(object, ['', 42]);
 
         result = _(object).has('');
         result = _(object).has(42);
-        result = _(object).has(true);
-        result = _(object).has(['', 42, true]);
+        result = _(object).has(['', 42]);
     }
 
     {
@@ -10617,8 +11390,7 @@ namespace TestHas {
 
         result = _(object).chain().has('');
         result = _(object).chain().has(42);
-        result = _(object).chain().has(true);
-        result = _(object).chain().has(['', 42, true]);
+        result = _(object).chain().has(['', 42]);
     }
 }
 
@@ -10633,13 +11405,11 @@ namespace TestHasIn {
 
         result = _.hasIn<SampleObject>(object, '');
         result = _.hasIn<SampleObject>(object, 42);
-        result = _.hasIn<SampleObject>(object, true);
-        result = _.hasIn<SampleObject>(object, ['', 42, true]);
+        result = _.hasIn<SampleObject>(object, ['', 42]);
 
         result = _(object).hasIn('');
         result = _(object).hasIn(42);
-        result = _(object).hasIn(true);
-        result = _(object).hasIn(['', 42, true]);
+        result = _(object).hasIn(['', 42]);
     }
 
     {
@@ -10647,35 +11417,28 @@ namespace TestHasIn {
 
         result = _(object).chain().hasIn('');
         result = _(object).chain().hasIn(42);
-        result = _(object).chain().hasIn(true);
-        result = _(object).chain().hasIn(['', 42, true]);
+        result = _(object).chain().hasIn(['', 42]);
     }
 }
 
 // _.invert
 namespace TestInvert {
     {
-        let result: TResult;
+        let result: _.Dictionary<string>;
 
-        result = _.invert<Object, TResult>({});
-        result = _.invert<Object, TResult>({}, true);
-
-        result = _.invert<TResult>({});
-        result = _.invert<TResult>({}, true);
+        result = _.invert({});
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<TResult>;
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string>>;
 
-        result = _({}).invert<TResult>();
-        result = _({}).invert<TResult>(true);
+        result = _({}).invert();
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string>>;
 
-        result = _({}).chain().invert<TResult>();
-        result = _({}).chain().invert<TResult>(true);
+        result = _({}).chain().invert();
     }
 }
 
@@ -10832,58 +11595,58 @@ namespace TestMapKeys {
     {
         let result: _.Dictionary<TResult>;
 
-        result = _.mapKeys<TResult, string>(array);
-        result = _.mapKeys<TResult, string>(array, listIterator);
-        result = _.mapKeys<TResult>(array, '');
-        result = _.mapKeys<TResult, {}>(array, {});
+        result = _.mapKeys(array);
+        result = _.mapKeys(array, listIterator);
+        result = _.mapKeys(array, '');
+        result = _.mapKeys(array, {});
 
-        result = _.mapKeys<TResult, string>(list);
-        result = _.mapKeys<TResult, string>(list, listIterator);
-        result = _.mapKeys<TResult>(list, '');
-        result = _.mapKeys<TResult, {}>(list, {});
+        result = _.mapKeys(list);
+        result = _.mapKeys(list, listIterator);
+        result = _.mapKeys(list, '');
+        result = _.mapKeys(list, {});
 
-        result = _.mapKeys<TResult, string>(dictionary);
-        result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator);
-        result = _.mapKeys<TResult>(dictionary, '');
-        result = _.mapKeys<TResult, {}>(dictionary, {});
+        result = _.mapKeys(dictionary);
+        result = _.mapKeys(dictionary, dictionaryIterator);
+        result = _.mapKeys(dictionary, '');
+        result = _.mapKeys(dictionary, {});
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(array).mapKeys<string>();
-        result = _(array).mapKeys<string>(listIterator);
+        result = _(array).mapKeys();
+        result = _(array).mapKeys(listIterator);
         result = _(array).mapKeys('');
-        result = _(array).mapKeys<{}>({});
+        result = _(array).mapKeys({});
 
-        result = _(list).mapKeys<TResult, string>();
-        result = _(list).mapKeys<TResult, string>(listIterator);
-        result = _(list).mapKeys<TResult>('');
-        result = _(list).mapKeys<TResult, {}>({});
+        result = _(list).mapKeys();
+        result = _(list).mapKeys(listIterator);
+        result = _(list).mapKeys('');
+        result = _(list).mapKeys({});
 
-        result = _(dictionary).mapKeys<TResult, string>();
-        result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator);
-        result = _(dictionary).mapKeys<TResult>('');
-        result = _(dictionary).mapKeys<TResult, {}>({});
+        result = _(dictionary).mapKeys();
+        result = _(dictionary).mapKeys(dictionaryIterator);
+        result = _(dictionary).mapKeys('');
+        result = _(dictionary).mapKeys({});
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        result = _(array).chain().mapKeys<string>();
-        result = _(array).chain().mapKeys<string>(listIterator);
+        result = _(array).chain().mapKeys();
+        result = _(array).chain().mapKeys(listIterator);
         result = _(array).chain().mapKeys('');
-        result = _(array).chain().mapKeys<{}>({});
+        result = _(array).chain().mapKeys({});
 
-        result = _(list).chain().mapKeys<TResult, string>();
-        result = _(list).chain().mapKeys<TResult, string>(listIterator);
-        result = _(list).chain().mapKeys<TResult>('');
-        result = _(list).chain().mapKeys<TResult, {}>({});
+        result = _(list).chain().mapKeys();
+        result = _(list).chain().mapKeys(listIterator);
+        result = _(list).chain().mapKeys('');
+        result = _(list).chain().mapKeys({});
 
-        result = _(dictionary).chain().mapKeys<TResult, string>();
-        result = _(dictionary).chain().mapKeys<TResult, string>(dictionaryIterator);
-        result = _(dictionary).chain().mapKeys<TResult>('');
-        result = _(dictionary).chain().mapKeys<TResult, {}>({});
+        result = _(dictionary).chain().mapKeys();
+        result = _(dictionary).chain().mapKeys(dictionaryIterator);
+        result = _(dictionary).chain().mapKeys('');
+        result = _(dictionary).chain().mapKeys({});
     }
 }
 
@@ -10909,7 +11672,7 @@ namespace TestMerge {
     result = _.merge(initialValue, {}, {}, {}, mergingValue);
 
     // Once we get to the varargs version, you have to specify the result explicitly
-    result = _.merge<ExpectedResult>(initialValue, {}, {}, {}, {}, mergingValue);
+    result = _.merge(initialValue, {}, {}, {}, {}, mergingValue);
 
     type ComplicatedExpectedType = { a: number, b: string, c: {}, d: number[], e: boolean };
 
@@ -10939,7 +11702,7 @@ namespace TestMerge {
     result = _(initialValue).merge({}, {}, {}, mergingValue).value();
 
     // Once we get to the varargs version, you have to specify the result explicitly
-    result = _(initialValue).merge<ExpectedResult>({}, {}, {}, {}, mergingValue).value();
+    result = _(initialValue).merge({}, {}, {}, {}, mergingValue).value();
 
     // Test complex multiple combinations with chaining
 
@@ -10997,70 +11760,71 @@ namespace TestMergeWith {
     result = _.mergeWith(initialValue, {}, {}, {}, mergingValue, customizer);
 
     // Once we get to the varargs version, you have to specify the result explicitl
-    result = _.mergeWith<ExpectedResult>(initialValue, {}, {}, {}, {}, mergingValue, customizer);
+    result = _.mergeWith(initialValue, {}, {}, {}, {}, mergingValue, customizer);
 
     // Tests for basic chaining with mergeWith
     result = _(initialValue).mergeWith(mergingValue, customizer).value();
     result = _(initialValue).mergeWith({}, mergingValue, customizer).value();
     result = _(initialValue).mergeWith({}, {}, mergingValue, customizer).value();
     result = _(initialValue).mergeWith({}, {}, {}, mergingValue, customizer).value();
-
-    // Once we get to the varargs version, you have to specify the result explicitly
-    result = _(initialValue).mergeWith<ExpectedResult>({}, {}, {}, {}, mergingValue, customizer).value();
+    result = _(initialValue).mergeWith({}, {}, {}, {}, mergingValue, customizer).value();
 }
 
 // _.omit
 namespace TestOmit {
-    let obj: {} | null | undefined = any;
-    let predicate: (element: any, key: string, collection: any) => boolean;
+    let obj: TResult | null | undefined = any;
+    let dict: { [key: string]: TResult } = { };
 
     {
-        let result: TResult;
+        let result: Partial<TResult>;
 
-        result = _.omit<TResult, Object>(obj, 'a');
-        result = _.omit<TResult, Object>(obj, 0, 'a');
-        result = _.omit<TResult, Object>(obj, true, 0, 'a');
-        result = _.omit<TResult, Object>(obj, ['b', 1, false], true, 0, 'a');
+        result = _.omit(obj, 'a');
+        result = _.omit(obj, 0, 'a');
+        result = _.omit(obj, ['b', 1], 0, 'a');
+
+        dict = _.omit(dict, 'a');
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<TResult>;
+        let result: _.LoDashImplicitWrapper<Partial<TResult>>;
 
-        result = _(obj).omit<TResult>('a');
-        result = _(obj).omit<TResult>(0, 'a');
-        result = _(obj).omit<TResult>(true, 0, 'a');
-        result = _(obj).omit<TResult>(['b', 1, false], true, 0, 'a');
+        result = _(obj).omit('a');
+        result = _(obj).omit(0, 'a');
+        result = _(obj).omit(['b', 1], 0, 'a');
+
+        dict = _(dict).omit('a').value();
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<Partial<TResult>>;
 
-        result = _(obj).chain().omit<TResult>('a');
-        result = _(obj).chain().omit<TResult>(0, 'a');
-        result = _(obj).chain().omit<TResult>(true, 0, 'a');
-        result = _(obj).chain().omit<TResult>(['b', 1, false], true, 0, 'a');
+        result = _(obj).chain().omit('a');
+        result = _(obj).chain().omit(0, 'a');
+        result = _(obj).chain().omit(['b', 1], 0, 'a');
+
+        dict = _(dict).chain().omit('a').value();
     }
 }
 
 // _.omitBy
 namespace TestOmitBy {
-    let obj: {} | null | undefined = any;
-    let predicate = (element: any, key: string, collection: any) => true;
+    let obj: TResult | null | undefined = any;
+    let predicate = (element: any, key: string) => true;
 
     {
-        let result: TResult;
+        let result: Partial<TResult>;
 
-        result = _.omitBy<TResult, Object>(obj, predicate);
+        result = _.omitBy(obj, predicate);
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<TResult>;
+        let result: _.LoDashImplicitWrapper<Partial<TResult>>;
 
         result = _(obj).omitBy<TResult>(predicate);
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<Partial<TResult>>;
 
         result = _(obj).chain().omitBy<TResult>(predicate);
     }
@@ -11068,55 +11832,73 @@ namespace TestOmitBy {
 
 // _.pick
 namespace TestPick {
-    let obj: {} | null | undefined = any;
+    let obj1: TResult | null | undefined = any;
+    let obj2: TResult = any;
 
     {
-        let result: TResult;
+        let result: Partial<TResult>;
 
-        result = _.pick<TResult, Object>(obj, 'a');
-        result = _.pick<TResult, Object>(obj, 0, 'a');
-        result = _.pick<TResult, Object>(obj, true, 0, 'a');
-        result = _.pick<TResult, Object>(obj, ['b', 1, false], true, 0, 'a');
+        result = _.pick(obj1, 'a');
+        result = _.pick(obj1, 0, 'a');
+        result = _.pick(obj1, ['b', 1], 0, 'a');
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<TResult>;
-
-        result = _(obj).pick<TResult>('a');
-        result = _(obj).pick<TResult>(0, 'a');
-        result = _(obj).pick<TResult>(true, 0, 'a');
-        result = _(obj).pick<TResult>(['b', 1, false], true, 0, 'a');
+        let result: Pick<TResult, 'a' | 'b'>;
+        result = _.pick(obj2, 'a', 'b');
+        result = _.pick(obj2, ['a' as 'a', 'b' as 'b']);
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashImplicitWrapper<Partial<TResult>>;
 
-        result = _(obj).chain().pick<TResult>('a');
-        result = _(obj).chain().pick<TResult>(0, 'a');
-        result = _(obj).chain().pick<TResult>(true, 0, 'a');
-        result = _(obj).chain().pick<TResult>(['b', 1, false], true, 0, 'a');
+        result = _(obj1).pick('a');
+        result = _(obj1).pick(0, 'a');
+        result = _(obj1).pick(['b', 1], 0, 'a');
+    }
+
+    {
+        let result: _.LoDashImplicitWrapper<Pick<TResult, 'a' | 'b'>>;
+
+        result = _(obj2).pick('a', 'b');
+        result = _(obj2).pick(['a' as 'a', 'b' as 'b']);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<Partial<TResult>>;
+
+        result = _(obj1).chain().pick('a');
+        result = _(obj1).chain().pick(0, 'a');
+        result = _(obj1).chain().pick(['b', 1], 0, 'a');
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<Pick<TResult, 'a' | 'b'>>;
+
+        result = _(obj2).chain().pick('a', 'b');
+        result = _(obj2).chain().pick(['a' as 'a', 'b' as 'b']);
     }
 }
 
 // _.pickBy
 namespace TestPickBy {
-    let obj: {} | null | undefined = any;
-    let predicate = (element: any, key: string, collection: any) => true;
+    let obj: TResult | null | undefined = any;
+    let predicate = (element: any, key: string) => true;
 
     {
-        let result: TResult;
+        let result: Partial<TResult>;
 
-        result = _.pickBy<TResult, Object>(obj, predicate);
+        result = _.pickBy(obj, predicate);
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<TResult>;
+        let result: _.LoDashImplicitWrapper<Partial<TResult>>;
 
         result = _(obj).pickBy<TResult>(predicate);
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashExplicitWrapper<Partial<TResult>>;
 
         result = _(obj).chain().pickBy<TResult>(predicate);
     }
@@ -11127,13 +11909,6 @@ namespace TestResult {
     {
         let result: string;
 
-        result = _.result<string, string>('abc', '0');
-        result = _.result<string, string>('abc', '0', '_');
-        result = _.result<string, string>('abc', '0', () => '_');
-        result = _.result<string, string>('abc', ['0']);
-        result = _.result<string, string>('abc', ['0'], '_');
-        result = _.result<string, string>('abc', ['0'], () => '_');
-
         result = _.result<string>('abc', '0');
         result = _.result<string>('abc', '0', '_');
         result = _.result<string>('abc', '0', () => '_');
@@ -11152,13 +11927,6 @@ namespace TestResult {
     {
         let result: number;
 
-        result = _.result<number[], number>([42], '0');
-        result = _.result<number[], number>([42], '0', -1);
-        result = _.result<number[], number>([42], '0', () => -1);
-        result = _.result<number[], number>([42], ['0']);
-        result = _.result<number[], number>([42], ['0'], -1);
-        result = _.result<number[], number>([42], ['0'], () => -1);
-
         result = _.result<number>([42], '0');
         result = _.result<number>([42], '0', -1);
         result = _.result<number>([42], '0', () => -1);
@@ -11177,13 +11945,6 @@ namespace TestResult {
     {
         let result: boolean;
 
-        result = _.result<{a: boolean}, boolean>({a: true}, 'a');
-        result = _.result<{a: boolean}, boolean>({a: true}, 'a', false);
-        result = _.result<{a: boolean}, boolean>({a: true}, 'a', () => false);
-        result = _.result<{a: boolean}, boolean>({a: true}, ['a']);
-        result = _.result<{a: boolean}, boolean>({a: true}, ['a'], false);
-        result = _.result<{a: boolean}, boolean>({a: true}, ['a'], () => false);
-
         result = _.result<boolean>({a: true}, 'a');
         result = _.result<boolean>({a: true}, 'a', false);
         result = _.result<boolean>({a: true}, 'a', () => false);
@@ -11202,34 +11963,34 @@ namespace TestResult {
     {
         let result: _.LoDashExplicitWrapper<string>;
 
-        result = _('abc').chain().result<_.LoDashExplicitWrapper<string>>('0');
-        result = _('abc').chain().result<_.LoDashExplicitWrapper<string>>('0', '_');
-        result = _('abc').chain().result<_.LoDashExplicitWrapper<string>>('0', '_');
-        result = _('abc').chain().result<_.LoDashExplicitWrapper<string>>(['0']);
-        result = _('abc').chain().result<_.LoDashExplicitWrapper<string>>(['0'], () => '_');
-        result = _('abc').chain().result<_.LoDashExplicitWrapper<string>>(['0'], () => '_');
+        result = _('abc').chain().result<string>('0');
+        result = _('abc').chain().result('0', '_');
+        result = _('abc').chain().result('0', '_');
+        result = _('abc').chain().result<string>(['0']);
+        result = _('abc').chain().result(['0'], () => '_');
+        result = _('abc').chain().result(['0'], () => '_');
     }
 
     {
         let result: _.LoDashExplicitWrapper<number>;
 
-        result = _([42]).chain().result<_.LoDashExplicitWrapper<number>>('0');
-        result = _([42]).chain().result<_.LoDashExplicitWrapper<number>>('0', -1);
-        result = _([42]).chain().result<_.LoDashExplicitWrapper<number>>('0', () => -1);
-        result = _([42]).chain().result<_.LoDashExplicitWrapper<number>>(['0']);
-        result = _([42]).chain().result<_.LoDashExplicitWrapper<number>>(['0'], -1);
-        result = _([42]).chain().result<_.LoDashExplicitWrapper<number>>(['0'], () => -1);
+        result = _([42]).chain().result<number>('0');
+        result = _([42]).chain().result('0', -1);
+        result = _([42]).chain().result('0', () => -1);
+        result = _([42]).chain().result<number>(['0']);
+        result = _([42]).chain().result(['0'], -1);
+        result = _([42]).chain().result(['0'], () => -1);
     }
 
     {
         let result: _.LoDashExplicitWrapper<boolean>;
 
-        result = _({a: true}).chain().result<_.LoDashExplicitWrapper<boolean>>('a');
-        result = _({a: true}).chain().result<_.LoDashExplicitWrapper<boolean>>('a', false);
-        result = _({a: true}).chain().result<_.LoDashExplicitWrapper<boolean>>('a', () => false);
-        result = _({a: true}).chain().result<_.LoDashExplicitWrapper<boolean>>(['a']);
-        result = _({a: true}).chain().result<_.LoDashExplicitWrapper<boolean>>(['a'], false);
-        result = _({a: true}).chain().result<_.LoDashExplicitWrapper<boolean>>(['a'], () => false);
+        result = _({a: true}).chain().result<boolean>('a');
+        result = _({a: true}).chain().result('a', false);
+        result = _({a: true}).chain().result('a', () => false);
+        result = _({a: true}).chain().result<boolean>(['a']);
+        result = _({a: true}).chain().result(['a'], false);
+        result = _({a: true}).chain().result(['a'], () => false);
     }
 }
 
@@ -11246,12 +12007,6 @@ namespace TestSet {
 
         result = _.set<SampleResult>(object, 'a.b[1]', value);
         result = _.set<SampleResult>(object, ['a', 'b', 1], value);
-
-        result = _.set<number, SampleResult>(object, 'a.b[1]', value);
-        result = _.set<number, SampleResult>(object, ['a', 'b', 1], value);
-
-        result = _.set<SampleObject, number, SampleResult>(object, 'a.b[1]', value);
-        result = _.set<SampleObject, number, SampleResult>(object, ['a', 'b', 1], value);
     }
 
     {
@@ -11259,9 +12014,6 @@ namespace TestSet {
 
         result = _(object).set<SampleResult>('a.b[1]', value);
         result = _(object).set<SampleResult>(['a', 'b', 1], value);
-
-        result = _(object).set<number, SampleResult>('a.b[1]', value);
-        result = _(object).set<number, SampleResult>(['a', 'b', 1], value);
     }
 
     {
@@ -11269,20 +12021,16 @@ namespace TestSet {
 
         result = _(object).chain().set<SampleResult>('a.b[1]', value);
         result = _(object).chain().set<SampleResult>(['a', 'b', 1], value);
-
-        result = _(object).chain().set<number, SampleResult>('a.b[1]', value);
-        result = _(object).chain().set<number, SampleResult>(['a', 'b', 1], value);
     }
 }
 
 // _.setWith
 namespace TestSetWith {
-    type SampleObject = {a: {}};
     type SampleResult = {a: {b: number[]}};
 
-    let object: SampleObject = { a: {} };
+    let object: SampleResult = { a: { b: [] } };
     let value = 0;
-    let customizer = (value: any, key: string, object: SampleObject) => 0;
+    let customizer = (value: any, key: string, object: SampleResult) => 0;
 
     {
         let result: SampleResult;
@@ -11291,16 +12039,6 @@ namespace TestSetWith {
         result = _.setWith<SampleResult>(object, 'a.b[1]', value, customizer);
         result = _.setWith<SampleResult>(object, ['a', 'b', 1], value);
         result = _.setWith<SampleResult>(object, ['a', 'b', 1], value, customizer);
-
-        result = _.setWith<number, SampleResult>(object, 'a.b[1]', value);
-        result = _.setWith<number, SampleResult>(object, 'a.b[1]', value, customizer);
-        result = _.setWith<number, SampleResult>(object, ['a', 'b', 1], value);
-        result = _.setWith<number, SampleResult>(object, ['a', 'b', 1], value, customizer);
-
-        result = _.setWith<SampleObject, number, SampleResult>(object, 'a.b[1]', value);
-        result = _.setWith<SampleObject, number, SampleResult>(object, 'a.b[1]', value, customizer);
-        result = _.setWith<SampleObject, number, SampleResult>(object, ['a', 'b', 1], value);
-        result = _.setWith<SampleObject, number, SampleResult>(object, ['a', 'b', 1], value, customizer);
     }
 
     {
@@ -11310,11 +12048,6 @@ namespace TestSetWith {
         result = _(object).setWith<SampleResult>('a.b[1]', value, customizer);
         result = _(object).setWith<SampleResult>(['a', 'b', 1], value);
         result = _(object).setWith<SampleResult>(['a', 'b', 1], value, customizer);
-
-        result = _(object).setWith<number, SampleResult>('a.b[1]', value);
-        result = _(object).setWith<number, SampleResult>('a.b[1]', value, customizer);
-        result = _(object).setWith<number, SampleResult>(['a', 'b', 1], value);
-        result = _(object).setWith<number, SampleResult>(['a', 'b', 1], value, customizer);
     }
 
     {
@@ -11324,11 +12057,6 @@ namespace TestSetWith {
         result = _(object).chain().setWith<SampleResult>('a.b[1]', value, customizer);
         result = _(object).chain().setWith<SampleResult>(['a', 'b', 1], value);
         result = _(object).chain().setWith<SampleResult>(['a', 'b', 1], value, customizer);
-
-        result = _(object).chain().setWith<number, SampleResult>('a.b[1]', value);
-        result = _(object).chain().setWith<number, SampleResult>('a.b[1]', value, customizer);
-        result = _(object).chain().setWith<number, SampleResult>(['a', 'b', 1], value);
-        result = _(object).chain().setWith<number, SampleResult>(['a', 'b', 1], value, customizer);
     }
 }
 
@@ -11336,39 +12064,21 @@ namespace TestSetWith {
 namespace TestToPairs {
     let object: _.Dictionary<string> = {};
 
-    {
-        let result: [string, any][];
-
-        result = _.toPairs<_.Dictionary<string>>(object);
-    }
-
     {
         let result: [string, string][];
 
-        result = _.toPairs<_.Dictionary<string>, string>(object);
+        result = _.toPairs(object);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<[string, string]>;
 
-        result = _(object).toPairs<string>();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<[string, any]>;
-
         result = _(object).toPairs();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<[string, string]>;
 
-        result = _(object).chain().toPairs<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
         result = _(object).chain().toPairs();
     }
 }
@@ -11377,27 +12087,15 @@ namespace TestToPairs {
 namespace TestToPairsIn {
     let object: _.Dictionary<string> = {};
 
-    {
-        let result: [string, any][];
-
-        result = _.toPairsIn<_.Dictionary<string>>(object);
-    }
-
     {
         let result: [string, string][];
 
-        result = _.toPairsIn<_.Dictionary<string>, string>(object);
+        result = _.toPairsIn(object);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<[string, string]>;
 
-        result = _(object).toPairsIn<string>();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<[string, any]>;
-
         result = _(object).toPairsIn();
     }
 
@@ -11424,13 +12122,13 @@ namespace TestTransform {
         let accumulator: TResult[] = [];
         let result: TResult[];
 
-        result = _.transform<number, TResult>(array);
+        result = _.transform(array);
         result = _.transform<number, TResult>(array, iterator);
         result = _.transform<number, TResult>(array, iterator, accumulator);
 
-        result = _<number>(array).transform<TResult>().value();
-        result = _<number>(array).transform<TResult>(iterator).value();
-        result = _<number>(array).transform<TResult>(iterator, accumulator).value();
+        result = _(array).transform().value();
+        result = _(array).transform(iterator).value();
+        result = _(array).transform(iterator, accumulator).value();
     }
 
     {
@@ -11438,11 +12136,9 @@ namespace TestTransform {
         let accumulator: _.Dictionary<TResult> = {};
         let result: _.Dictionary<TResult>;
 
-        result = _.transform<number, TResult>(array, iterator);
         result = _.transform<number, TResult>(array, iterator, accumulator);
 
-        result = _<number>(array).transform<TResult>(iterator).value();
-        result = _<number>(array).transform<TResult>(iterator, accumulator).value();
+        result = _(array).transform(iterator, accumulator).value();
     }
 
     {
@@ -11450,11 +12146,11 @@ namespace TestTransform {
         let accumulator: _.Dictionary<TResult> = {};
         let result: _.Dictionary<TResult>;
 
-        result = _.transform<number, TResult>(dictionary);
+        result = _.transform(dictionary);
         result = _.transform<number, TResult>(dictionary, iterator);
         result = _.transform<number, TResult>(dictionary, iterator, accumulator);
 
-        result = _(dictionary).transform<number, TResult>().value();
+        result = _(dictionary).transform().value();
         result = _(dictionary).transform<number, TResult>(iterator).value();
         result = _(dictionary).transform<number, TResult>(iterator, accumulator).value();
     }
@@ -11464,10 +12160,8 @@ namespace TestTransform {
         let accumulator: TResult[] = [];
         let result: TResult[];
 
-        result = _.transform<number, TResult>(dictionary, iterator);
         result = _.transform<number, TResult>(dictionary, iterator, accumulator);
 
-        result = _(dictionary).transform<number, TResult>(iterator).value();
         result = _(dictionary).transform<number, TResult>(iterator, accumulator).value();
     }
 }
@@ -11481,8 +12175,8 @@ namespace TestUnset {
     {
         let result: boolean;
 
-        _.unset<SampleObject>(object, 'a.b');
-        _.unset<SampleObject>(object, ['a', 'b']);
+        result = _.unset(object, 'a.b');
+        result = _.unset(object, ['a', 'b']);
     }
 
     {
@@ -11502,57 +12196,40 @@ namespace TestUnset {
 
 // _.update
 namespace TestUpdate {
-    type SampleObject = {a: {}};
     type SampleResult = {a: {b: number[]}};
 
-    let object: SampleObject = { a: {} };
+    let object: SampleResult = { a: { b: [] } };
     let updater = (value: any) => 0;
 
     {
         let result: SampleResult;
 
-        result = _.update<SampleResult>(object, 'a.b[1]', updater);
-        result = _.update<SampleResult>(object, ['a', 'b', 1], updater);
-
-        result = _.update<(value: any) => number, SampleResult>(object, 'a.b[1]', updater);
-        result = _.update<(value: any) => number, SampleResult>(object, ['a', 'b', 1], updater);
-
-        result = _.update<SampleObject, SampleResult>(object, 'a.b[1]', updater);
-        result = _.update<SampleObject, SampleResult>(object, ['a', 'b', 1], updater);
-
-        result = _.update<SampleObject, (value: any) => number, SampleResult>(object, 'a.b[1]', updater);
-        result = _.update<SampleObject, (value: any) => number, SampleResult>(object, ['a', 'b', 1], updater);
+        result = _.update(object, 'a.b[1]', updater);
+        result = _.update(object, ['a', 'b', 1], updater);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<SampleResult>;
 
-        result = _(object).update<SampleResult>('a.b[1]', updater);
-        result = _(object).update<SampleResult>(['a', 'b', 1], updater);
-
-        result = _(object).update<(value: any) => number, SampleResult>('a.b[1]', updater);
-        result = _(object).update<(value: any) => number, SampleResult>(['a', 'b', 1], updater);
+        result = _(object).update('a.b[1]', updater);
+        result = _(object).update(['a', 'b', 1], updater);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<SampleResult>;
 
-        result = _(object).chain().update<SampleResult>('a.b[1]', updater);
-        result = _(object).chain().update<SampleResult>(['a', 'b', 1], updater);
-
-        result = _(object).chain().update<(value: any) => number, SampleResult>('a.b[1]', updater);
-        result = _(object).chain().update<(value: any) => number, SampleResult>(['a', 'b', 1], updater);
+        result = _(object).chain().update('a.b[1]', updater);
+        result = _(object).chain().update(['a', 'b', 1], updater);
     }
 }
 
 // _.updateWith
 namespace TestUpdateWith {
-    type SampleObject = {a: {}};
     type SampleResult = {a: {b: number[]}};
 
-    let object: SampleObject = { a: {} };
+    let object: SampleResult = { a: { b: [] } };
     let updater = (value: any) => 0;
-    let customizer = (value: any, key: string, object: SampleObject) => 0;
+    let customizer = (value: any, key: string, object: SampleResult) => 0;
 
     {
         let result: SampleResult;
@@ -11594,7 +12271,6 @@ namespace TestValues {
     {
         let result: any[];
 
-        result = _.values();
         result = _.values(123);
         result = _.values(true);
         result = _.values(null);
@@ -12026,11 +12702,9 @@ namespace TestReplace {
         result = _.replace('Hi Fred', /fred/i, 'Barney');
         result = _.replace('Hi Fred', /fred/i, replacer);
 
-        result = _.replace('Fred');
         result = _.replace('Fred', 'Barney');
         result = _.replace('Fred', replacer);
 
-        result = _.replace(/fred/i);
         result = _.replace(/fred/i, 'Barney');
         result = _.replace(/fred/i, replacer);
 
@@ -12040,11 +12714,9 @@ namespace TestReplace {
         result = _('Hi Fred').replace(/fred/i, 'Barney');
         result = _('Hi Fred').replace(/fred/i, replacer);
 
-        result = _('Fred').replace();
         result = _('Fred').replace('Barney');
         result = _('Fred').replace(replacer);
 
-        result = _(/fred/i).replace();
         result = _(/fred/i).replace('Barney');
         result = _(/fred/i).replace(replacer);
     }
@@ -12058,11 +12730,9 @@ namespace TestReplace {
         result = _('Hi Fred').chain().replace(/fred/i, 'Barney');
         result = _('Hi Fred').chain().replace(/fred/i, replacer);
 
-        result = _('Fred').chain().replace();
         result = _('Fred').chain().replace('Barney');
         result = _('Fred').chain().replace(replacer);
 
-        result = _(/fred/i).chain().replace();
         result = _(/fred/i).chain().replace('Barney');
         result = _(/fred/i).chain().replace(replacer);
     }
@@ -12109,6 +12779,9 @@ namespace TestSplit {
         result = _('a-b-c').chain().split('-');
         result = _('a-b-c').chain().split('-', 2);
     }
+
+    // $ExpectType string[][]
+    _.map(['abc', 'def'], _.split);
 }
 
 // _.startCase
@@ -12232,6 +12905,9 @@ namespace TestTrim {
         result = _('-_-abc-_-').chain().trim();
         result = _('-_-abc-_-').chain().trim('_-');
     }
+
+    // $ExpectType string[]
+    _.map(['  foo  ', '  bar  '], _.trim);
 }
 
 // _.trimEnd
@@ -12368,6 +13044,9 @@ namespace TestWords {
         result = _('fred, barney, & pebbles').chain().words();
         result = _('fred, barney, & pebbles').chain().words(/[^, ]+/g);
     }
+
+    // $ExpectType string[][]
+    _.map(['fred, barney', 'pebbles'], _.words);
 }
 
 /***********
@@ -12438,52 +13117,52 @@ namespace TestConstant {
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => number>;
-        result = _(42).constant<number>();
+        result = _(42).constant();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => string>;
-        result = _('a').constant<string>();
+        result = _('a').constant();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => boolean>;
-        result = _(true).constant<boolean>();
+        result = _(true).constant();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => string[]>;
-        result = _(['a']).constant<string[]>();
+        result = _(['a']).constant();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => {a: string}>;
-        result = _({a: 'a'}).constant<{a: string}>();
+        result = _({a: 'a'}).constant();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => number>;
-        result = _(42).chain().constant<number>();
+        result = _(42).chain().constant();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => string>;
-        result = _('a').chain().constant<string>();
+        result = _('a').chain().constant();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => boolean>;
-        result = _(true).chain().constant<boolean>();
+        result = _(true).chain().constant();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => string[]>;
-        result = _(['a']).chain().constant<string[]>();
+        result = _(['a']).chain().constant();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => {a: string}>;
-        result = _({a: 'a'}).chain().constant<{a: string}>();
+        result = _({a: 'a'}).chain().constant();
     }
 }
 
@@ -12526,7 +13205,7 @@ namespace TestDefaultTo {
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<number>;
+        let result: number;
         result = _(42).defaultTo(42);
         result = _(undefined).defaultTo(42);
         result = _(null).defaultTo(42);
@@ -12534,34 +13213,30 @@ namespace TestDefaultTo {
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<string>;
+        let result: string;
         result = _('a').defaultTo('default');
         result = _(null).defaultTo('default');
-        result = _(NaN).defaultTo('default');
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<boolean>;
+        let result: boolean;
         result = _(true).defaultTo(true);
         result = _(undefined).defaultTo(true);
         result = _(null).defaultTo(true);
-        result = _(NaN).defaultTo(true);
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<string[]>;
+        let result: string[];
         result = _(['a']).defaultTo(['default']);
         result = _(undefined).defaultTo(['default']);
         result = _(null).defaultTo(['default']);
-        result = _(NaN).defaultTo(['default']);
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<{ a: string }>;
+        let result: { a: string };
         result = _({ a: 'a' }).defaultTo({a : 'a'});
         result = _(undefined).defaultTo({a : 'a'});
         result = _(null).defaultTo({a : 'a'});
-        result = _(NaN).defaultTo({a : 'a'});
     }
 
     {
@@ -12577,7 +13252,6 @@ namespace TestDefaultTo {
         result = _('a').chain().defaultTo('default');
         result = _(undefined).chain().defaultTo('default');
         result = _(null).chain().defaultTo('default');
-        result = _(NaN).chain().defaultTo('default');
     }
 
     {
@@ -12585,7 +13259,6 @@ namespace TestDefaultTo {
         result = _(true).chain().defaultTo(true);
         result = _(undefined).chain().defaultTo(true);
         result = _(null).chain().defaultTo(true);
-        result = _(NaN).chain().defaultTo(true);
     }
 
     {
@@ -12593,7 +13266,6 @@ namespace TestDefaultTo {
         result = _(['a']).chain().defaultTo(['default']);
         result = _(undefined).chain().defaultTo(['default']);
         result = _(null).chain().defaultTo(['default']);
-        result = _(NaN).chain().defaultTo(['default']);
     }
 
     {
@@ -12601,7 +13273,6 @@ namespace TestDefaultTo {
         result = _({ a: 'a' }).chain().defaultTo({a : 'a'});
         result = _(undefined).chain().defaultTo({a : 'a'});
         result = _(null).chain().defaultTo({a : 'a'});
-        result = _(NaN).chain().defaultTo({a : 'a'});
     }
 }
 
@@ -12647,8 +13318,8 @@ namespace TestIdentity {
     }
 
     {
-        let input: {} | null | undefined = any;
-        _.identity(input); // $ExpectType {} | null | undefined
+        let input: { a: number; } | null | undefined = any;
+        _.identity(input); // $ExpectType { a: number; } | null | undefined
         _.identity(); // $ExpectType undefined
     }
 }
@@ -12664,7 +13335,7 @@ namespace TestIteratee {
     {
         let result: (object: any) => TResult;
 
-        result = _.iteratee<TResult>('');
+        result = _.iteratee('');
     }
 
     {
@@ -12676,13 +13347,14 @@ namespace TestIteratee {
     {
         let result: _.LoDashImplicitObjectWrapper<(...args: any[]) => TResult>;
 
-        result = _(Function).iteratee<TResult>();
+        let func: (...args: any[]) => TResult = any;
+        result = _(func).iteratee();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(object: any) => TResult>;
 
-        result = _('').iteratee<TResult>();
+        result = _('').iteratee();
     }
 
     {
@@ -12694,13 +13366,14 @@ namespace TestIteratee {
     {
         let result: _.LoDashExplicitObjectWrapper<(...args: any[]) => TResult>;
 
-        result = _(Function).chain().iteratee<TResult>();
+        let func: (...args: any[]) => TResult = any;
+        result = _(func).chain().iteratee();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(object: any) => TResult>;
 
-        result = _('').chain().iteratee<TResult>();
+        result = _('').chain().iteratee();
     }
 
     {
@@ -12737,7 +13410,7 @@ namespace TestMatches {
 
 // _.matchesProperty
 namespace TestMatches {
-    let path: {toString(): string;}|{toString(): string;}[] = [];
+    let path: string | string[] = [];
     let source: TResult = { a: 1, b: "", c: true };
 
     {
@@ -12782,156 +13455,167 @@ namespace TestMethod {
     {
         let result: (object: any) => {a: string};
 
-        result = _.method<{a: string}>('a.0');
-        result = _.method<{a: string}>('a.0', any, any);
-        result = _.method<{a: string}>('a.0', any, any, any);
+        result = _.method('a.0');
+        result = _.method('a.0', any, any);
+        result = _.method('a.0', any, any, any);
 
-        result = _.method<{a: string}>(['a', 0]);
-        result = _.method<{a: string}>(['a', 0], any);
-        result = _.method<{a: string}>(['a', 0], any, any);
-        result = _.method<{a: string}>(['a', 0], any, any, any);
+        result = _.method(['a', 0]);
+        result = _.method(['a', 0], any);
+        result = _.method(['a', 0], any, any);
+        result = _.method(['a', 0], any, any, any);
     }
 
     {
         let result: (object: {a: string}) => {b: string};
 
-        result = _.method<{a: string}, {b: string}>('a.0');
-        result = _.method<{a: string}, {b: string}>('a.0', any, any);
-        result = _.method<{a: string}, {b: string}>('a.0', any, any, any);
+        result = _.method('a.0');
+        result = _.method('a.0', any, any);
+        result = _.method('a.0', any, any, any);
 
-        result = _.method<{a: string}, {b: string}>(['a', 0]);
-        result = _.method<{a: string}, {b: string}>(['a', 0], any);
-        result = _.method<{a: string}, {b: string}>(['a', 0], any, any);
-        result = _.method<{a: string}, {b: string}>(['a', 0], any, any, any);
+        result = _.method(['a', 0]);
+        result = _.method(['a', 0], any);
+        result = _.method(['a', 0], any, any);
+        result = _.method(['a', 0], any, any, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(object: any) => {a: string}>;
 
-        result = _('a.0').method<{a: string}>();
-        result = _('a.0').method<{a: string}>(any);
-        result = _('a.0').method<{a: string}>(any, any);
-        result = _('a.0').method<{a: string}>(any, any, any);
+        result = _('a.0').method();
+        result = _('a.0').method(any);
+        result = _('a.0').method(any, any);
+        result = _('a.0').method(any, any, any);
 
-        result = _(['a', 0]).method<{a: string}>();
-        result = _(['a', 0]).method<{a: string}>(any);
-        result = _(['a', 0]).method<{a: string}>(any, any);
-        result = _(['a', 0]).method<{a: string}>(any, any, any);
+        result = _(['a', 0]).method();
+        result = _(['a', 0]).method(any);
+        result = _(['a', 0]).method(any, any);
+        result = _(['a', 0]).method(any, any, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(object: {a: string}) => {b: string}>;
 
-        result = _('a.0').method<{a: string}, {b: string}>();
-        result = _('a.0').method<{a: string}, {b: string}>(any);
-        result = _('a.0').method<{a: string}, {b: string}>(any, any);
-        result = _('a.0').method<{a: string}, {b: string}>(any, any, any);
+        result = _('a.0').method();
+        result = _('a.0').method(any);
+        result = _('a.0').method(any, any);
+        result = _('a.0').method(any, any, any);
 
-        result = _(['a', 0]).method<{a: string}, {b: string}>();
-        result = _(['a', 0]).method<{a: string}, {b: string}>(any);
-        result = _(['a', 0]).method<{a: string}, {b: string}>(any, any);
-        result = _(['a', 0]).method<{a: string}, {b: string}>(any, any, any);
+        result = _(['a', 0]).method();
+        result = _(['a', 0]).method(any);
+        result = _(['a', 0]).method(any, any);
+        result = _(['a', 0]).method(any, any, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(object: any) => {a: string}>;
 
-        result = _('a.0').chain().method<{a: string}>();
-        result = _('a.0').chain().method<{a: string}>(any);
-        result = _('a.0').chain().method<{a: string}>(any, any);
-        result = _('a.0').chain().method<{a: string}>(any, any, any);
+        result = _('a.0').chain().method();
+        result = _('a.0').chain().method(any);
+        result = _('a.0').chain().method(any, any);
+        result = _('a.0').chain().method(any, any, any);
 
-        result = _(['a', 0]).chain().method<{a: string}>();
-        result = _(['a', 0]).chain().method<{a: string}>(any);
-        result = _(['a', 0]).chain().method<{a: string}>(any, any);
-        result = _(['a', 0]).chain().method<{a: string}>(any, any, any);
+        result = _(['a', 0]).chain().method();
+        result = _(['a', 0]).chain().method(any);
+        result = _(['a', 0]).chain().method(any, any);
+        result = _(['a', 0]).chain().method(any, any, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(object: {a: string}) => {b: string}>;
 
-        result = _('a.0').chain().method<{a: string}, {b: string}>();
-        result = _('a.0').chain().method<{a: string}, {b: string}>(any);
-        result = _('a.0').chain().method<{a: string}, {b: string}>(any, any);
-        result = _('a.0').chain().method<{a: string}, {b: string}>(any, any, any);
+        result = _('a.0').chain().method();
+        result = _('a.0').chain().method(any);
+        result = _('a.0').chain().method(any, any);
+        result = _('a.0').chain().method(any, any, any);
 
-        result = _(['a', 0]).chain().method<{a: string}, {b: string}>();
-        result = _(['a', 0]).chain().method<{a: string}, {b: string}>(any);
-        result = _(['a', 0]).chain().method<{a: string}, {b: string}>(any, any);
-        result = _(['a', 0]).chain().method<{a: string}, {b: string}>(any, any, any);
+        result = _(['a', 0]).chain().method();
+        result = _(['a', 0]).chain().method(any);
+        result = _(['a', 0]).chain().method(any, any);
+        result = _(['a', 0]).chain().method(any, any, any);
     }
 }
 
 // _.methodOf
 namespace TestMethodOf {
     type SampleObject = { a: { b(): TResult }[] };
-    type ResultFn = (path: _.StringRepresentable|_.StringRepresentable[]) => TResult;
+    type ResultFn = (path: string | string[]) => TResult;
 
     let object: SampleObject = { a: [] };
 
     {
         let result: ResultFn;
 
-        result = _.methodOf<SampleObject, TResult>(object);
-        result = _.methodOf<SampleObject, TResult>(object, any);
-        result = _.methodOf<SampleObject, TResult>(object, any, any);
-        result = _.methodOf<SampleObject, TResult>(object, any, any, any);
-
-        result = _.methodOf<TResult>(object);
-        result = _.methodOf<TResult>(object, any);
-        result = _.methodOf<TResult>(object, any, any);
-        result = _.methodOf<TResult>(object, any, any, any);
+        result = _.methodOf(object);
+        result = _.methodOf(object, any);
+        result = _.methodOf(object, any, any);
+        result = _.methodOf(object, any, any, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<ResultFn>;
 
-        result = _(object).methodOf<TResult>();
-        result = _(object).methodOf<TResult>(any);
-        result = _(object).methodOf<TResult>(any, any);
-        result = _(object).methodOf<TResult>(any, any, any);
+        result = _(object).methodOf();
+        result = _(object).methodOf(any);
+        result = _(object).methodOf(any, any);
+        result = _(object).methodOf(any, any, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<ResultFn>;
 
-        result = _(object).chain().methodOf<TResult>();
-        result = _(object).chain().methodOf<TResult>(any);
-        result = _(object).chain().methodOf<TResult>(any, any);
-        result = _(object).chain().methodOf<TResult>(any, any, any);
+        result = _(object).chain().methodOf();
+        result = _(object).chain().methodOf(any);
+        result = _(object).chain().methodOf(any, any);
+        result = _(object).chain().methodOf(any, any, any);
     }
 }
 
 // _.mixin
 namespace TestMixin {
-    let source: _.Dictionary<Function> = {};
+    let source: _.Dictionary<(...args: any[]) => any> = {};
+    let dest: TResult = any;
     let options: {chain?: boolean} = {};
 
+    {
+        let result: _.LoDashStatic;
+
+        result = _.mixin(source);
+        result = _.mixin(source, options);
+    }
+
     {
         let result: TResult;
 
-        result = _.mixin<TResult, Object>({}, source);
-        result = _.mixin<TResult, Object>({}, source, options);
-        result = _.mixin<TResult>(source);
-        result = _.mixin<TResult>(source, options);
+        result = _.mixin(dest, source);
+        result = _.mixin(dest, source, options);
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<TResult>;
+        let result: _.LoDashImplicitWrapper<_.LoDashStatic>;
 
-        result = _({}).mixin<TResult>(source);
-        result = _({}).mixin<TResult>(source, options);
-        result = _(source).mixin<TResult>();
-        result = _(source).mixin<TResult>(options);
+        result = _(source).mixin();
+        result = _(source).mixin(options);
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<TResult>;
+        let result: _.LoDashImplicitWrapper<TResult>;
 
-        result = _({}).chain().mixin<TResult>(source);
-        result = _({}).chain().mixin<TResult>(source, options);
-        result = _(source).chain().mixin<TResult>();
-        result = _(source).chain().mixin<TResult>(options);
+        result = _(dest).mixin(source);
+        result = _(dest).mixin(source, options);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<_.LoDashStatic>;
+
+        result = _(source).chain().mixin();
+        result = _(source).chain().mixin(options);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<TResult>;
+
+        result = _(dest).chain().mixin(source);
+        result = _(dest).chain().mixin(source, options);
     }
 }
 
@@ -12967,7 +13651,7 @@ namespace TestNoop {
 
         result = _('a').noop(true, 'a', 1);
         result = _([1]).noop(true, 'a', 1);
-        result = _<string>([]).noop(true, 'a', 1);
+        result = _(['']).noop(true, 'a', 1);
         result = _({}).noop(true, 'a', 1);
         result = _(any).noop(true, 'a', 1);
     }
@@ -12977,7 +13661,7 @@ namespace TestNoop {
 
         result = _('a').chain().noop(true, 'a', 1);
         result = _([1]).chain().noop(true, 'a', 1);
-        result = _<string>([]).chain().noop(true, 'a', 1);
+        result = _(['']).chain().noop(true, 'a', 1);
         result = _({}).chain().noop(true, 'a', 1);
         result = _(any).chain().noop(true, 'a', 1);
     }
@@ -12989,20 +13673,20 @@ namespace TestNthArg {
     {
         let result: SampleFunc;
 
-        result = _.nthArg<SampleFunc>();
-        result = _.nthArg<SampleFunc>(1);
+        result = _.nthArg();
+        result = _.nthArg(1);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<SampleFunc>;
 
-        result = _(1).nthArg<SampleFunc>();
+        result = _(1).nthArg();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<SampleFunc>;
 
-        result = _(1).chain().nthArg<SampleFunc>();
+        result = _(1).chain().nthArg();
     }
 }
 
@@ -13039,60 +13723,60 @@ namespace TestOver {
 // _.overEvery
 namespace TestOverEvery {
     {
-        let result: (...args: any[]) => boolean;
+        let result: (...args: number[]) => boolean;
 
-        result = _.overEvery(() => true);
-        result = _.overEvery(() => true, () => true);
-        result = _.overEvery([() => true]);
-        result = _.overEvery([() => true], [() => true]);
+        result = _.overEvery((number) => true);
+        result = _.overEvery((number) => true, (number) => true);
+        result = _.overEvery([(number) => true]);
+        result = _.overEvery([(number) => true], [(number) => true]);
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+        let result: _.LoDashImplicitObjectWrapper<(...args: number[]) => boolean>;
 
         result = _(Math.max).overEvery();
-        result = _(Math.max).overEvery(() => true);
+        result = _(Math.max).overEvery((number) => true);
         result = _([Math.max]).overEvery();
-        result = _([Math.max]).overEvery([() => true]);
+        result = _([Math.max]).overEvery([(number) => true]);
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+        let result: _.LoDashExplicitObjectWrapper<(...args: number[]) => boolean>;
 
         result = _(Math.max).chain().overEvery();
-        result = _(Math.max).chain().overEvery(() => true);
+        result = _(Math.max).chain().overEvery((number) => true);
         result = _([Math.max]).chain().overEvery();
-        result = _([Math.max]).chain().overEvery([() => true]);
+        result = _([Math.max]).chain().overEvery([(number) => true]);
     }
 }
 
 // _.overSome
 namespace TestOverSome {
     {
-        let result: (...args: any[]) => boolean;
+        let result: (...args: number[]) => boolean;
 
-        result = _.overSome(() => true);
-        result = _.overSome(() => true, () => true);
-        result = _.overSome([() => true]);
-        result = _.overSome([() => true], [() => true]);
+        result = _.overSome((n: number) => true);
+        result = _.overSome((n: number) => true, (n: number) => true);
+        result = _.overSome([(n: number) => true]);
+        result = _.overSome([(n: number) => true], [(n: number) => true]);
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+        let result: _.LoDashImplicitObjectWrapper<(...args: number[]) => boolean>;
 
         result = _(Math.max).overSome();
-        result = _(Math.max).overSome(() => true);
+        result = _(Math.max).overSome((n: number) => true);
         result = _([Math.max]).overSome();
-        result = _([Math.max]).overSome([() => true]);
+        result = _([Math.max]).overSome([(n: number) => true]);
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+        let result: _.LoDashExplicitObjectWrapper<(...args: number[]) => boolean>;
 
         result = _(Math.max).chain().overSome();
-        result = _(Math.max).chain().overSome(() => true);
+        result = _(Math.max).chain().overSome((n: number) => true);
         result = _([Math.max]).chain().overSome();
-        result = _([Math.max]).chain().overSome([() => true]);
+        result = _([Math.max]).chain().overSome([(n: number) => true]);
     }
 }
 
@@ -13181,6 +13865,9 @@ namespace TestRange {
         result = _(1).chain().range(11);
         result = _(0).chain().range(30, 5);
     }
+
+    // $ExpectType number[][]
+    _.map([5, 5], _.range);
 }
 
 // _.rangeRight
@@ -13208,6 +13895,9 @@ namespace TestRangeRight {
         result = _(1).chain().rangeRight(11);
         result = _(0).chain().rangeRight(30, 5);
     }
+
+    // $ExpectType number[][]
+    _.map([5, 5], _.rangeRight);
 }
 
 // _.runInContext
@@ -13232,7 +13922,7 @@ namespace TestRangeRight {
 
         result = _('a').chain().stubArray();
         result = _([1]).chain().stubArray();
-        result = _<string>([]).chain().stubArray();
+        result = _(['']).chain().stubArray();
         result = _({}).chain().stubArray();
         result = _(any).chain().stubArray();
     }
@@ -13252,7 +13942,7 @@ namespace TestRangeRight {
 
         result = _('a').chain().stubFalse();
         result = _([1]).chain().stubFalse();
-        result = _<string>([]).chain().stubFalse();
+        result = _(['']).chain().stubFalse();
         result = _({}).chain().stubFalse();
         result = _(any).chain().stubFalse();
     }
@@ -13272,7 +13962,7 @@ namespace TestRangeRight {
 
         result = _('a').chain().stubObject();
         result = _([1]).chain().stubObject();
-        result = _<string>([]).chain().stubObject();
+        result = _(['']).chain().stubObject();
         result = _({}).chain().stubObject();
         result = _(any).chain().stubObject();
     }
@@ -13292,7 +13982,7 @@ namespace TestRangeRight {
 
         result = _('a').chain().stubString();
         result = _([1]).chain().stubString();
-        result = _<string>([]).chain().stubString();
+        result = _(['']).chain().stubString();
         result = _({}).chain().stubString();
         result = _(any).chain().stubString();
     }
@@ -13312,7 +14002,7 @@ namespace TestRangeRight {
 
         result = _('a').chain().stubTrue();
         result = _([1]).chain().stubTrue();
-        result = _<string>([]).chain().stubTrue();
+        result = _(['']).chain().stubTrue();
         result = _({}).chain().stubTrue();
         result = _(any).chain().stubTrue();
     }
@@ -13367,7 +14057,7 @@ namespace TestToPath {
        result = _(1).toPath();
        result = _('a').toPath();
        result = _([1]).toPath();
-       result = _<string>(["a"]).toPath();
+       result = _(["a"]).toPath();
        result = _({}).toPath();
    }
 }
diff --git a/types/lodash/scripts/generate-all.sh b/types/lodash/scripts/generate-all.sh
new file mode 100644
index 0000000000..2f79589533
--- /dev/null
+++ b/types/lodash/scripts/generate-all.sh
@@ -0,0 +1,15 @@
+# If some one want to update lodash modules, you must run this script under the same dir where it lives.
+# Or you can run them(generate-modules.ts) separately by hand
+#!/usr/bin/env bash
+
+npm i ts-node -g
+
+ts-node ./generate-modules.ts
+
+cd ../../../
+
+npm i prettier -D
+
+cd types/lodash-es/scripts
+
+ts-node ./generate-modules.ts
diff --git a/types/lodash/scripts/generate-modules.ts b/types/lodash/scripts/generate-modules.ts
index 32bbc0ec25..a15462ba11 100644
--- a/types/lodash/scripts/generate-modules.ts
+++ b/types/lodash/scripts/generate-modules.ts
@@ -18,25 +18,15 @@ async function main(): Promise<void> {
         }
     }
 
-    const lodashEsDir = path.join("..", "..", "lodash-es");
-
     // Generate lodash/tsconfig.json
     fs.writeFileSync(path.join("..", "tsconfig.json"), lodashTsconfig(all));
 
-    // Generate lodash-es index and tsconfig
-    fs.writeFileSync(path.join(lodashEsDir, "index.d.ts"), lodashEsIndex(all));
-    //`export {\n    ${all.join(",\n    ")}\n} from "lodash";\n`);
-    fs.writeFileSync(path.join(lodashEsDir, "tsconfig.json"), lodashEsTsconfig(all));
-
     for (const module of all) {
         console.log(module);
 
         // Generate local module
         fs.writeFileSync(path.join("..", `${module}.d.ts`), `import { ${module} } from "./index";\nexport = ${module};\n`);
 
-        // Generate lodash-es module
-        fs.writeFileSync(path.join(lodashEsDir, `${module}.d.ts`), `import { ${module} } from "lodash";\nexport default ${module};\n`);
-
         // Generate `lodash.foo` module
         if (!notOnNpm.has(module)) {
             const dir = path.join("..", "..", `lodash.${module.toLowerCase()}`);
@@ -84,6 +74,7 @@ function compilerOptions(): object {
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -92,21 +83,6 @@ function compilerOptions(): object {
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     };
-};
-
-function lodashEsIndex(moduleNames: ReadonlyArray<string>): string {
-    return `// Type definitions for lodash-es 4.14
-// Project: http://lodash.com/
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-// Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
-
-export {
-    ${moduleNames.join(",\n    ")}
-} from "lodash";
-`;
 }
 
 function lodashTsconfig(moduleNames: ReadonlyArray<string>): string {
@@ -120,17 +96,6 @@ function lodashTsconfig(moduleNames: ReadonlyArray<string>): string {
     }, undefined, 4);
 }
 
-function lodashEsTsconfig(moduleNames: ReadonlyArray<string>): string {
-    return JSON.stringify({
-        compilerOptions: compilerOptions(),
-        files: [
-            "index.d.ts",
-            "lodash-es-tests.ts",
-            ...moduleNames.map(m => `${m}.d.ts`),
-        ]
-    }, undefined, 4);
-}
-
 function lodashDotFooTsconfig(): string {
     return JSON.stringify({
         compilerOptions: compilerOptions(),
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 2c4aa57c54..af6ba5e2e9 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -6,8 +6,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -46,6 +46,7 @@
         "compact.d.ts",
         "concat.d.ts",
         "cond.d.ts",
+        "conformsTo.d.ts",
         "constant.d.ts",
         "countBy.d.ts",
         "create.d.ts",
@@ -55,6 +56,7 @@
         "deburr.d.ts",
         "defaults.d.ts",
         "defaultsDeep.d.ts",
+        "defaultTo.d.ts",
         "defer.d.ts",
         "delay.d.ts",
         "difference.d.ts",
@@ -316,4 +318,4 @@
         "zipObjectDeep.d.ts",
         "zipWith.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/lodash/tslint.json b/types/lodash/tslint.json
index 02254dbc60..44e681fc18 100644
--- a/types/lodash/tslint.json
+++ b/types/lodash/tslint.json
@@ -2,35 +2,28 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // All are TODOs
-        "adjacent-overload-signatures": false,
-        "align": false,
         "array-type": false,
         "ban-types": false,
         "callable-types": false,
-        "comment-format": false,
-        "eofline": false,
+        "comment-format": [false],
         "interface-name": false,
         "interface-over-type-literal": false,
         "jsdoc-format": false,
-        "max-line-length": false,
+        "max-line-length": [false],
         "no-any-union": false,
         "no-empty-interface": false,
-        "no-namespace": false,
         "no-mergeable-namespace": false,
+        "no-namespace": false,
         "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
         "no-unnecessary-type-assertion": false,
         "no-void-expression": false,
-        "no-trailing-whitespace": false,
         "object-literal-key-quotes": false,
         "one-line": false,
-        "one-variable-per-declaration": false,
         "prefer-const": false,
         "semicolon": false,
         "space-within-parens": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
+        "typedef-whitespace": [false],
         "unified-signatures": false,
-        "whitespace": false
+        "whitespace": [false]
     }
 }
diff --git a/types/lodash/v3/tslint.json b/types/lodash/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lodash/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/log4javascript/index.d.ts b/types/log4javascript/index.d.ts
deleted file mode 100644
index b92fe3bc98..0000000000
--- a/types/log4javascript/index.d.ts
+++ /dev/null
@@ -1,1118 +0,0 @@
-// Type definitions for log4javascript v1.4.13
-// Project: http://log4javascript.org/
-// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace log4javascript {
-
-	// #region log4javascript static properties/methods
-
-	/**
-	 * Returns a logger with the specified name, creating it if a logger with that name does not already exist.
-	 * If no name is specified, a logger is returned with name [anonymous], and subsequent calls to getLogger()
-	 * (with no logger name specified) will return this same logger object.
-	 * Note that the names [anonymous], [default], [null] and root are reserved for the anonymous logger, default logger,
-	 * null logger and root logger respectively.
-	 */
-	export function getLogger(loggerName?: string): Logger;
-
-	/**
-	 * Convenience method that returns the default logger. The default logger has a single appender: a PopUpAppender with the default
-	 * layout, width and height, and with focusPopUp set to false and lazyInit, useOldPopUp and complainAboutPopUpBlocking all set to true.
-	 */
-	export function getDefaultLogger(): Logger;
-
-	/**
-	 * Returns an empty logger with no appenders. Useful for disabling all logging.
-	 */
-	export function getNullLogger(): Logger;
-
-	/**
-	 * Returns the root logger from which all other loggers derive.
-	 */
-	export function getRootLogger(): Logger;
-
-	/**
-	 * Resets the all loggers to their default level.
-	 */
-	export function resetConfiguration(): void;
-
-	/**
-	 * Enables or disables all logging, depending on enabled.
-	 */
-	export function setEnabled(enabled: boolean): void;
-
-	/**
-	 * Returns true or false depending on whether logging is enabled.
-	 */
-	export function isEnabled(): boolean;
-
-	/**
-	 * Adds a function to be called when an event of the type specified occurs in log4javascript.
-	 * Supported event types are load (occurs once the page has loaded) and error.
-	 */
-	export function addEventListener(eventType: string, listener: { (sender: any, eventType: string, eventArgs: any): void; }): void;
-
-	/**
-	 * Removes the event listener function supplied for the event of the type specified.
-	 */
-	export function removeEventListener(eventType: string, listener: { (sender: any, eventType: string, eventArgs: any): void; }): void;
-
-	/**
-	 * Raises an event of type eventType on the log4javascript object. Each of the listeners for this type of event
-	 * (registered via addEventListener) is called and passed eventArgs as the third parameter.
-	 */
-	export function dispatchEvent(eventType: string, eventArgs: any): void;
-
-	/**
-	 * Used internally to specify the types of events that the log4javascript object can raise.
-	 */
-	export function setEventTypes(eventTypes: string[]): void;
-
-	/**
-	 * Enables or disables displaying of error stack traces, depending on show. By default, stack traces are not displayed.
-	 * (Only works in Firefox)
-	 */
-	export function setShowStackTraces(show: boolean): void;
-
-	/**
-	 * This evaluates the given expression in the log4javascript scope, thus allowing scripts to access internal
-	 * log4javascript variables and functions. This was written for the purposes of automated testing but could be used by
-	 * custom extensions to log4javascript.
-	 */
-	export function evalInScope(expr: string): any;
-
-	// #endregion
-
-	// #region Levels
-
-	/**
-	 * Levels are available as static properties of the log4javascript.Level object.
-	 */
-	export class Level {
-		static ALL: Level;
-		static TRACE: Level;
-		static DEBUG: Level;
-		static INFO: Level;
-		static WARN: Level;
-		static ERROR: Level;
-		static FATAL: Level;
-		static OFF: Level;
-
-		constructor(level: number, name: string);
-
-		toString(): string;
-		equals(level: Level): boolean;
-		isGreaterOrEqual(level: Level): boolean;
-	}
-
-	// #endregion
-
-	// #region Loggers
-
-	/**
-	 * It is possible to have multiple loggers in log4javascript. For example, you may wish to have a logger for debugging purposes
-	 * that logs messages to a pop-up window and a separate logger that reports any client-side application errors to the server via Ajax.
-	 * From version 1.4, log4javascript has hierarchical loggers, implemented in the same way as log4j. In summary, you specify a
-	 * logger's parent logger by means of a dot between the parent logger name and the child logger name. Therefore the logger
-	 * tim.app.security inherits from tim.app, which in turn inherits from tim which, finally, inherits from the root logger.
-	 * What inheritance means for a logger is that in the absence of a threshold level set specifically on the logger it inherits
-	 * its level from its parent; also, a logger inherits all its parent's appenders (this is known as appender additivity in log4j.
-	 * This behaviour can be enabled or disabled via setAdditivity(). See below). In the above example, if the root logger has a
-	 * level of DEBUG and one appender, each of the loggers tim.app.security, tim.app and tim would inherit the root level's appender.
-	 * If, say, tim.app's threshold level was set to WARN, tim's effective level would remain at DEBUG (inherited from the root logger)
-	 * while tim.app.security's effective level would be WARN, inherited from tim.app. The important thing to note is that appenders
-	 * accumulate down the logger hierarchy while levels are simply inherited from the nearest ancestor with a threshold level set.
-	 * For a detailed explanation of the logger hierarchy, see the log4j manual.
-	 */
-	export class Logger {
-		/**
-		 * Adds the given appender.
-		 */
-		addAppender(appender: Appender): void;
-
-		/**
-		 * Removes the given appender.
-		 */
-		removeAppender(appender: Appender): void;
-
-		/**
-		 * Clears all appenders for the current logger.
-		 */
-		removeAllAppenders(): void;
-
-		/**
-		 * Returns all appenders which will log a message.
-		 */
-		getEffectiveAppenders(): Appender[];
-	
-		/**
-		 * Sets the level. Log messages of a lower level than level will not be logged. Default value is DEBUG.
-		 */
-		setLevel(level: Level): void;
-
-		/**
-		 * Returns the level explicitly set for this logger or null if none has been set.
-		 */
-		getLevel(): Level;
-
-		/**
-		 * Returns the level at which the logger is operating. This is either the level explicitly set on the logger or, if no level
-		 * has been set, the effective level of the logger's parent.
-		 */
-		getEffectiveLevel(): Level;
-
-		/**
-		 * Sets whether appender additivity is enabled (the default) or disabled. If set to false, this particular logger will not
-		 * inherit any appenders form its ancestors. Any descendant of this logger, however, will inherit from its ancestors as
-		 * normal, unless its own additivity is explicitly set to false.
-		 * Default value is true.
-		 */
-		setAdditivity(additivity: boolean): void;
-
-		/**
-		 * Returns whether additivity is enabled for this logger.
-		 */
-		getAdditivity(): boolean;
-
-		/**
-		 * Generic logging method used by wrapper methods such as debug, error etc.
-		 */
-		log(level: Level, params: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level TRACE.
-		 */
-		trace(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level DEBUG.
-		 */
-		debug(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level INFO.
-		 */
-		info(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level WARN.
-		 */
-		warn(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level ERROR.
-		 */
-		error(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level FATAL.
-		 */
-		fatal(...messages: any[]): void;
-
-		/**
-		 * Returns whether the logger is enabled for the specified level.
-		 */
-		isEnabledFor(level: Level, exception: Error): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for TRACE messages.
-		 */
-		isTraceEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for DEBUG messages.
-		 */
-		isDebugEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for INFO messages.
-		 */
-		isInfoEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for WARN messages.
-		 */
-		isWarnEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for ERROR messages.
-		 */
-		isErrorEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for FATAL messages.
-		 */
-		isFatalEnabled(): boolean;
-
-		/**
-		 * Starts a new group of log messages. In appenders that support grouping (currently PopUpAppender and InPageAppender),
-		 * a group appears as an expandable section in the console, labelled with the name specified. Specifying initiallyExpanded
-		 * determines whether the group starts off expanded (the default is true). Groups may be nested.
-		 */
-		group(name: string, initiallyExpanded?: boolean): void;
-
-		/**
-		 * Ends the current group. If there is no group then this function has no effect.
-		 */
-		groupEnd(): void;
-
-		/**
-		 * Starts a timer with name name. When the timer is ended with a call to timeEnd using the same name, the amount of time
-		 * that has elapsed in milliseconds since the timer was started is logged at level level. If not level is supplied, the level
-		 * defaults to INFO.
-		 */
-		time(name: string, level?: Level): void;
-
-		/**
-		 * Ends the timer with name name and logs the time elapsed.
-		 */
-		timeEnd(name: string): void;
-
-		/**
-		 * Asserts the given expression is true or evaluates to true. If so, nothing is logged. If not, an error is logged at the ERROR level.
-		 */
-		assert(expr: any): void;
-
-		name: string;
-	}
-
-	// #endregion
-
-	// #region Appenders
-
-	/**
-	 * Logging event.
-	 */
-	export class LoggingEvent {
-		logger: Logger;
-		timeStamp: Date;
-		timeStampInMilliseconds: number;
-		timeStampInSeconds: number;
-		milliseconds: number;
-		level: Level;
-		messages: any[];
-		exception: Error;
-
-		constructor(logger: Logger, timeStamp: Date, level: Level, messages: string[], exception?: Error);
-
-		getThrowableStrRep: () => string;
-		getCombinedMessages: () => string;
-		toString: () => string;
-	}
-
-	/**
-	 * There are methods common to all appenders, as listed below.
-	 */
-	export class Appender {
-
-		/**
-		 * Checks the logging event's level is at least as severe as the appender's threshold and calls the appender's append method if so.
-		 * This method should not in general be used directly or overridden.
-		 */
-		doAppend(loggingEvent: LoggingEvent): void;
-
-		/**
-		 * Appender-specific method to append a log message. Every appender object should implement this method.
-		 */
-		append(loggingEvent: LoggingEvent): void;
-
-		/**
-		 * Sets the appender's layout.
-		 */
-		setLayout(layout: Layout): void;
-
-		/**
-		 * Returns the appender's layout.
-		 */
-		getLayout(): Layout;
-
-		/**
-		 * Sets the appender's threshold. Log messages of level less severe than this threshold will not be logged.
-		 */
-		setThreshold(level: Level): void;
-
-		/**
-		 * Returns the appender's threshold.
-		 */
-		getThreshold(): Level;
-
-		/**
-		 * Returns a string representation of the appender. Every appender object should implement this method.
-		 */
-		toString(): string;
-
-	}
-
-	/**
-	 * Displays a log message as a JavaScript alert.
-	 */
-	export class AlertAppender extends Appender {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	/**
-	 * A flexible appender that asynchronously sends log messages to a server via HTTP.
-	 * The default configuration is to send each log message as a separate HTTP post request to the server using an
-	 * HttpPostDataLayout, without waiting for a response before sending any subsequent requests.
-	 */
-	export class AjaxAppender extends Appender {
-		/**
-		 * Constructor
-		 * @param url The URL to which log messages should be sent. Note that this is subject to the usual Ajax restrictions:
-		 * the URL should be in the same domain as that of the page making the request.
-		 * @param withCredentials Specifies whether cookies should be sent with each request.
-		 */
-		constructor(url: string, withCredentials?: boolean);
-
-		/**
-		 * Whether to send all remaining unsent log messages to the server when the page unloads.
-		 * Since version 1.4.3, the default value is false. Previously the default was true.
-		 */
-		setSendAllOnUnload(sendAllOnUnload: boolean): void;
-
-		/**
-		 * Returns whether all remaining unsent log messages are sent to the server when the page unloads.
-		 */
-		isSendAllOnUnload(): boolean;
-
-		/**
-		 * Sets the post variable name whose value will the formatted log message(s) for each request.
-		 * Default value is data.
-		 */
-		setPostVarName(postVarName: string): void;
-
-		/**
-		 * Returns the post variable name whose value will the formatted log message(s) for each request.
-		 */
-		getPostVarName(): string;
-
-		/**
-		 * Whether to send log messages to the server at regular, timed intervals.
-		 * Default value is false.
-		 */
-		setTimed(timed: boolean): void;
-
-		/**
-		 * Returns whether log messages are sent to the server at regular, timed intervals.
-		 */
-		isTimed(): boolean;
-
-		/**
-		 * Sets whether to wait for a response from a previous HTTP request from this appender before sending the next log
-		 * message / batch of messages.
-		 * Default value is false.
-		 */
-		setWaitForResponse(waitForResponse: boolean): void;
-
-		/**
-		 * Returns whether the appender waits for a response from a previous HTTP request from this appender before sending the next
-		 * log message / batch of messages.
-		 */
-		isWaitForResponse(): boolean;
-
-		/**
-		 * Sets the number of log messages to send in each request. If not specified, defaults to 1.
-		 */
-		setBatchSize(batchSize: number): void;
-
-		/**
-		 * Returns the number of log messages sent in each request. See above for more details.
-		 */
-		getBatchSize(): number;
-
-		/**
-		 * Sets the length of time in milliseconds between each sending of queued log messages.
-		 */
-		setTimerInterval(timerInterval: number): void;
-
-		/**
-		 * Returns the length of time in milliseconds between each sending of queued log messages. See above for more details.
-		 */
-		getTimerInterval(): number;
-
-		/**
-		 * Sets the function that is called whenever a successful request is made, called at the point at which the response is
-		 * received. This feature can be used to confirm whether a request has been successful and act accordingly.
-		 * A single parameter, xmlHttp, is passed to the callback function. This is the XMLHttpRequest object that performed the
-		 * request.
-		 */
-		setRequestSuccessCallback(requestSuccessCallback: { (xmlHttp: XMLHttpRequest): void; }): void;
-
-		/**
-		 * Sets the function that is called whenever any kind of failure occurs in the appender, including browser deficiencies or
-		 * configuration errors (e.g. supplying a non-existent URL to the appender). This feature can be used to handle
-		 * AjaxAppender-specific errors.
-		 * A single parameter, message, is passed to the callback function. This is the error-specific message that caused the failure.
-		 */
-		setFailCallback(failCallback: { (message: string): void; }): void;
-
-		/**
-		 * Sets the session id sent to the server each time a request is made.
-		 */
-		setSessionId(sessionId: string): void;
-
-		/**
-		 * Returns the session id sent to the server each time a request is made.
-		 */
-		getSessionId(): string;
-
-		/**
-		 * Adds an HTTP header that is sent with each request.
-		 */
-		addHeader(name: string, value: string): void;
-
-		/**
-		 * Returns an array of the additional headers that are sent with each HTTP request. Each array item is an object with
-		 * properties name and value.
-		 */
-		getHeaders(): Array<{ name: string; value: string; }>;
-
-		/**
-		 * Sends all log messages in the queue. If log messages are batched then only completed batches are sent.
-		 */
-		sendAll(): void;
-	}
-
-	/**
-	 * Logs messages to a pop-up console window (note: you will need to disable pop-up blockers to use it). The pop-up displays a
-	 * list of all log messages.
-	 */
-	export class PopUpAppender extends Appender {
-		/**
-		 * Constructor
-		 * @param lazyInit Set this to true to open the pop-up only when the first log message reaches the appender. Otherwise, the
-		 * pop-up window opens as soon as the appender is created. If not specified, defaults to false.
-		 * @param initiallyMinimized Whether the console window should start off hidden / minimized. If not specified, defaults to false.
-		 * @param useDocumentWrite Specifies how the console window is created. By default, the console window is created dynamically
-		 * using document's write method. This has the advantage of keeping all the code in one single JavaScript file. However,
-		 * if your page sets document.domain then the browser prevents script access to a window unless it too has the same value
-		 * set for document.domain. To get round this issue, you can set useDocumentWrite to false and log4javascript will instead
-		 * use the external HTML file console.html (or console_uncompressed.html if you're using an uncompressed version of
-		 * log4javascript.js), which must be placed in the same directory as your log4javascript.js file.
-		 * Note that if useDocumentWrite is set to true, the old pop-up window will always be closed and a new one created whenever
-		 * the page is refreshed, even if setUseOldPopUp(true) has been called.
-		 * In general it's simpler to use the document.write method, so unless your page needs to set document.domain,
-		 * useDocumentWrite should be set to true.
-		 * If not specified, defaults to true.
-		 * @param width The outer width in pixels of the pop-up window. If not specified, defaults to 600.
-		 * @param height The outer height in pixels of the pop-up window. If not specified, defaults to 400.
-		 */
-		constructor(lazyInit?: boolean, initiallyMinimized?: boolean, useDocumentWrite?: boolean, width?: number, height?: number);
-
-		/**
-		 * Returns whether the console window starts off hidden / minimized.
-		 */
-		isInitiallyMinimized(): boolean;
-
-		/**
-		 * Sets whether the console window should start off hidden / minimized.
-		 */
-		setInitiallyMinimized(initiallyMinimized: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window is focussed (i.e. brought it to the front) when a new log message is added. Default value is false.
-		 */
-		isFocusPopUp(): boolean;
-
-		/**
-		 * Sets whether to focus the pop-up window (i.e. bring it to the front) when a new log message is added.
-		 */
-		setFocusPopUp(focusPopUp: boolean): void;
-
-		/**
-		 * Returns whether the same pop-up window is used if the main page is reloaded. If set to true, when the page is reloaded a
-		 * line is drawn in the pop-up and subsequent log messages are added to the same pop-up. Otherwise, a new pop-up window is
-		 * created that replaces the original pop-up. If not specified, defaults to true.
-		 */
-		isUseOldPopUp(): boolean;
-
-		/**
-		 * Sets whether to use the same pop-up window if the main page is reloaded. See isUseOldPopUp above for details.
-		 */
-		setUseOldPopUp(useOldPopUp: boolean): void;
-
-		/**
-		 * Returns whether an alert is shown to the user when the pop-up window cannot be created as a result of a pop-up blocker.
-		 * Default value is true.
-		 */
-		isComplainAboutPopUpBlocking(): boolean;
-
-		/**
-		 * Sets whether to announce to show an alert to the user when the pop-up window cannot be created as a result of a pop-up blocker.
-		 */
-		setComplainAboutPopUpBlocking(complainAboutPopUpBlocking: boolean): void;
-
-		/**
-		 * Returns whether new log messages are displayed at the top of the pop-up window. Default value is false (i.e. log messages
-		 * are appended to the bottom of the window).
-		 */
-		isNewestMessageAtTop(): boolean;
-
-		/**
-		 * Sets whether to display new log messages at the top inside the pop-up window.
-		 */
-		setNewestMessageAtTop(newestMessageAtTop: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window scrolls to display the latest log message when a new message is logged. Default value is true.
-		 */
-		isScrollToLatestMessage(): boolean;
-
-		/**
-		 * Sets whether to scroll the pop-up window to display the latest log message when a new message is logged.
-		 */
-		setScrollToLatestMessage(scrollToLatestMessage: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window reopens automatically after being closed when a new log message is logged. Default value is false.
-		 */
-		isReopenWhenClosed(): boolean;
-
-		/**
-		 * Sets whether to reopen the pop-up window automatically after being closed when a new log message is logged.
-		 */
-		setReopenWhenClosed(reopenWhenClosed: boolean): void;
-
-		/**
-		 * Returns the outer width in pixels of the pop-up window.
-		 */
-		getWidth(): number;
-
-		/**
-		 * Sets the outer width in pixels of the pop-up window.
-		 */
-		setWidth(width: number): void;
-
-		/**
-		 * Returns the outer height in pixels of the pop-up window.
-		 */
-		getHeight(): number;
-
-		/**
-		 * Sets the outer height in pixels of the pop-up window.
-		 */
-		setHeight(height: number): void;
-
-		/**
-		 * Returns the largest number of log messages that are displayed and stored by the the console. Once reached, a new log
-		 * message wil cause the oldest message to be discarded. Default value is null, which means no limit is applied.
-		 */
-		getMaxMessages(): number;
-
-		/**
-		 * Sets the largest number of messages displayed and stored by the console window. Set this to null to make this number unlimited.
-		 */
-		setMaxMessages(maxMessages: number): void;
-
-		/**
-		 * Returns whether the console includes a command line. Default value is true.
-		 */
-		isShowCommandLine(): boolean;
-
-		/**
-		 * Sets whether the console includes a command line.
-		 */
-		setShowCommandLine(showCommandLine: boolean): void;
-
-		/**
-		 * Returns the number of levels to expand when an object value is logged to the console. Each property of an object above
-		 * this threshold will be expanded if it is itself an object or array, otherwise its string representation will be displayed.
-		 * Default value is 1 (i.e. the properties of the object logged will be displayed in their string representation but not expanded).
-		 */
-		getCommandLineObjectExpansionDepth(): number;
-
-		/**
-		 * Sets the number of levels to expand when an object value is logged to the console.
-		 */
-		setCommandLineObjectExpansionDepth(expansionDepth: number): void;
-
-		/**
-		 * Returns a reference to the window in which commands typed into the command line are currently being executed.
-		 */
-		getCommandWindow(): Window;
-
-		/**
-		 * Sets the window in which commands typed into the command line are executed.
-		 */
-		setCommandWindow(commandWindow: Window): void;
-
-		/**
-		 * Returns the layout used to format the output for commands typed into the command line. The default value is a
-		 * PatternLayout with pattern string %m
-		 */
-		getCommandLayout(): Layout;
-
-		/**
-		 * Sets the layout used to format the output for commands typed into the command line.
-		 */
-		setCommandLayout(commandLayout: Layout): void;
-
-		/**
-		 * Clears all messages from the console window.
-		 */
-		clear(): void;
-
-		/**
-		 * Closes the pop-up window.
-		 */
-		close(): void;
-
-		/**
-		 * Opens the pop-up window, if not already open.
-		 */
-		show(): void;
-
-		/**
-		 * Closes the pop-up window.
-		 */
-		hide(): void;
-
-		/**
-		 * Brings the console window to the top and gives it the focus.
-		 */
-		focus(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the command line.
-		 */
-		focusCommandLine(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the search box.
-		 */
-		focusSearch(): void;
-
-		/**
-		 * Evaluates the expression and appends the result to the console.
-		 */
-		evalCommandAndAppend(expr: string): void;
-
-		/**
-		 * Adds a function with the name specified to the list of functions available on the command line. This feature may be used
-		 * to add custom functions to the command line.
-		 */
-		addCommandLineFunction(functionName: string,
-			commandLineFunction: { (appender: Appender, args: any, returnValue: { appendResult: boolean; isError: boolean; }): any; }): void;
-	}
-
-	/**
-	 * Logs messages to a console window in the page. The console is identical to that used by the PopUpAppender, except for the
-	 * absence of a 'Close' button.
-	 */
-	export class InPageAppender extends Appender {
-		/**
-		 * Constructor
-		 * @param container The container element for the console window. This should be an HTML element.
-		 * @param lazyInit Set this to true to create the console only when the first log message reaches the appender. Otherwise,
-		 * the console is initialized as soon as the appender is created. If not specified, defaults to true.
-		 * @param initiallyMinimized Whether the console window should start off hidden / minimized. If not specified, defaults to false
-		 * @param useDocumentWrite Specifies how the console window is created. By default, the console window is created dynamically
-		 * using document's write method. This has the advantage of keeping all the code in one single JavaScript file. However,
-		 * if your page sets document.domain then the browser prevents script access to a window unless it too has the same value
-		 * set for document.domain. To get round this issue, you can set useDocumentWrite to false and log4javascript will instead
-		 * use the external HTML file console.html (or console_uncompressed.html if you're using an uncompressed version of
-		 * log4javascript.js), which must be placed in the same directory as your log4javascript.js file.
-		 * In general it's simpler to use the document.write method, so unless your page needs to set document.domain,
-		 * useDocumentWrite should be set to true.
-		 * If not specified, defaults to true.
-		 * @param width The width of the console window. Any valid CSS length may be used. If not specified, defaults to 100%.
-		 * @param height The height of the console window. Any valid CSS length may be used. If not specified, defaults to 250px.
-		 */
-		constructor(container: HTMLElement, lazyInit?: boolean, initiallyMinimized?: boolean,
-			useDocumentWrite?: boolean, width?: number, height?: number);
-
-		/**
-		 * Sets a CSS style property on the HTML element containing the console iframe.
-		 */
-		addCssProperty(name: string, value: string): void;
-
-		/**
-		 * Returns whether the console window is currently visible.
-		 */
-		isVisible(): boolean;
-
-		/**
-		 * Returns whether the console window starts off hidden / minimized.
-		 */
-		isInitiallyMinimized(): boolean;
-
-		/**
-		 * Sets whether the console window should start off hidden / minimized.
-		 */
-		setInitiallyMinimized(initiallyMinimized: boolean): void;
-
-		/**
-		 * Returns whether new log messages are displayed at the top of the pop-up window. Default value is false (i.e. log messages
-		 * are appended to the bottom of the window).
-		 */
-		isNewestMessageAtTop(): boolean;
-
-		/**
-		 * Sets whether to display new log messages at the top inside the pop-up window.
-		 */
-		setNewestMessageAtTop(newestMessageAtTop: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window scrolls to display the latest log message when a new message is logged. Default value is true.
-		 */
-		isScrollToLatestMessage(): boolean;
-
-		/**
-		 * Sets whether to scroll the pop-up window to display the latest log message when a new message is logged.
-		 */
-		setScrollToLatestMessage(scrollToLatestMessage: boolean): void;
-
-		/**
-		 * Returns the outer width of the console window.
-		 */
-		getWidth(): number;
-
-		/**
-		 * Sets the outer width of the console window. Any valid CSS length may be used.
-		 */
-		setWidth(width: number): void;
-
-		/**
-		 * Returns the outer height of the console window.
-		 */
-		getHeight(): number;
-
-		/**
-		 * Sets the outer height of the console window. Any valid CSS length may be used.
-		 */
-		setHeight(height: number): void;
-
-		/**
-		 * Returns the largest number of messages displayed and stored by the console window.
-		 */
-		getMaxMessages(): number;
-
-		/**
-		 * Sets the largest number of messages displayed and stored by the console window. Set this to null to make this number unlimited.
-		 */
-		setMaxMessages(maxMessages: number): void;
-
-		/**
-		 * Returns whether the console includes a command line. Default value is true.
-		 */
-		isShowCommandLine(): boolean;
-
-		/**
-		 * Sets whether the console includes a command line.
-		 */
-		setShowCommandLine(showCommandLine: boolean): void;
-
-		/**
-		 * Returns the number of levels to expand when an object value is logged to the console. Each property of an object above
-		 * this threshold will be expanded if it is itself an object or array, otherwise its string representation will be displayed.
-		 * Default value is 1 (i.e. the properties of the object logged will be displayed in their string representation but not expanded).
-		 */
-		getCommandLineObjectExpansionDepth(): number;
-
-		/**
-		 * Sets the number of levels to expand when an object value is logged to the console.
-		 */
-		setCommandLineObjectExpansionDepth(expansionDepth: number): void;
-
-		/**
-		 * Returns a reference to the window in which commands typed into the command line are currently being executed.
-		 */
-		getCommandWindow(): Window;
-
-		/**
-		 * Sets the window in which commands typed into the command line are executed.
-		 */
-		setCommandWindow(commandWindow: Window): void;
-
-		/**
-		 * Returns the layout used to format the output for commands typed into the command line. The default value is a
-		 * PatternLayout with pattern string %m
-		 */
-		getCommandLayout(): Layout;
-
-		/**
-		 * Sets the layout used to format the output for commands typed into the command line.
-		 */
-		setCommandLayout(commandLayout: Layout): void;
-
-		/**
-		 * Clears all messages from the console window.
-		 */
-		clear(): void;
-
-		/**
-		 * Closes the pop-up window.
-		 */
-		close(): void;
-
-		/**
-		 * Shows / unhides the console window.
-		 */
-		show(): void;
-
-		/**
-		 * Hides / minimizes the console window.
-		 */
-		hide(): void;
-
-		/**
-		 * Brings the console window to the top and gives it the focus.
-		 */
-		focus(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the command line.
-		 */
-		focusCommandLine(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the search box.
-		 */
-		focusSearch(): void;
-
-		/**
-		 * Evaluates the expression and appends the result to the console.
-		 */
-		evalCommandAndAppend(expr: string): void;
-
-		/**
-		 * Adds a function with the name specified to the list of functions available on the command line. This feature may be used
-		 * to add custom functions to the command line.
-		 */
-		addCommandLineFunction(functionName: string,
-			commandLineFunction: { (appender: Appender, args: any, returnValue: { appendResult: boolean; isError: boolean; }): any; }): void;
-	}
-
-	/**
-	 * Writes log messages to the browser's built-in console, if present. This only works currently in Safari, Opera and Firefox
-	 * with the excellent Firebug extension installed.
-	 */
-	export class BrowserConsoleAppender extends Appender {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	//#endregion
-
-	// #region Layouts
-
-	/**
-	 * There are a few methods common to all layouts.
-	 */
-	export class Layout {
-		/**
-		 * Formats the log message. You should override this method in your own layouts.
-		 */
-		format(loggingEvent: LoggingEvent): string;
-
-		/**
-		 * Returns whether the layout ignores an error object in a logging event passed to its format method.
-		 */
-		ignoresThrowable(): boolean;
-
-		/**
-		 * Returns the content type of the output of the layout.
-		 */
-		getContentType(): string;
-
-		/**
-		 * Returns whether the layout's output is suitable for batching. JsonLayout and XmlLayout are the only built-in layouts that
-		 * return true for this method.
-		 */
-		allowBatching(): boolean;
-
-		/**
-		 * Used internally by log4javascript in constructing formatted output for some layouts.
-		 */
-		getDataValues(loggingEvent: LoggingEvent): Array<any>;
-
-		/**
-		 * This method is used to change the default keys used to create formatted name-value pairs for the properties of a log
-		 * message, for layouts that do this. These layouts are JsonLayout and HttpPostDataLayout.
-		 * @param loggerKey Parameter to use for the log message's logger name. Default is logger.
-		 * @param timeStampKey Parameter to use for the log message's timestamp. Default is timestamp.
-		 * @param levelKey Parameter to use for the log message's level. Default is level.
-		 * @param messageKey Parameter to use for the message itself. Default is message.
-		 * @param exceptionKey Parameter to use for the log message's error (exception). Default is exception.
-		 * @param urlKey Parameter to use for the current page URL. Default is url.
-		 */
-		setKeys(loggerKey: string, timeStampKey: string, levelKey: string, messageKey: string, exceptionKey: string, urlKey: string): void;
-
-		/**
-		 * Some layouts (JsonLayout, HttpPostDataLayout, PatternLayout and XmlLayout) allow you to set custom fields (e.g. a session
-		 * id to send to the server) to the formatted output. Use this method to set a custom field. If there is already a custom
-		 * field with the specified name, its value will be updated with value.
-		 * @param name Name of the custom property you wish to be included in the formmtted output.
-		 * @param value Value of the custom property you wish to be included in the formatted output.
-		 */
-		setCustomField(name: string, value: string): string;
-
-		/**
-		 * Returns whether the layout has any custom fields.
-		 */
-		hasCustomFields(): boolean;
-
-		formatWithException(loggingEvent: LoggingEvent): string;
-	}
-
-	/**
-	 * The most basic layout. NullLayout's format() methods performs no formatting at all and simply returns the message logged.
-	 */
-	export class NullLayout extends Layout {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	/**
-	 * Provides basic formatting. SimpleLayout consists of the level of the log statement, followed by " - " and then the log message
-	 * itself. For example, "DEBUG - Hello world".
-	 */
-	export class SimpleLayout extends Layout {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	/**
-	 * Provides a flexible way of formatting a log message by means of a conversion pattern string. The behaviour of this layout is a
-	 * full implementation of PatternLayout in log4j, with the exception of the set of conversion characters - log4javascript's is
-	 * necessarily a subset of that of log4j with a few additions of its own, since many of the conversion characters in log4j only
-	 * make sense in the context of Java.
-	 * The conversion pattern consists of literal text interspersed with special strings starting with a % symbol called conversion
-	 * specifiers. A conversion specifier consists of the % symbol, a conversion character (possible characters are listed below) and
-	 * format modifiers. For full documentation of the conversion pattern, see log4j's documentation.
-	 */
-	export class PatternLayout extends Layout {
-		/**
-		 * Built-in conversion pattern, equivalent to %r %p %c - %m%n.
-		 */
-		static TTCC_CONVERSION_PATTERN: string;
-
-		/**
-		 * Built-in conversion pattern, equivalent to %m%n.
-		 */
-		static DEFAULT_CONVERSION_PATTERN: string;
-
-		/**
-		 * Built-in date format (and also the default), equivalent to yyyy-MM-dd HH:mm:ss,SSS.
-		 */
-		static ISO8601_DATEFORMAT: string;
-
-		/**
-		 * Built-in date format, equivalent to dd MMM YYYY HH:mm:ss,SSS.
-		 */
-		static DATETIME_DATEFORMAT: string;
-
-		/**
-		 * Built-in date format, equivalent to HH:mm:ss,SSS.
-		 */
-		static ABSOLUTETIME_DATEFORMAT: string;
-
-		/**
-		 * Constructor
-		 * @param pattern The conversion pattern string to use.
-		 */
-		constructor(pattern: string);
-	}
-
-	/**
-	 * Based on log4j's XmlLayout, this layout formats a log message as a fragment of XML.
-	 */
-	export class XmlLayout extends Layout {
-		/**
-		 * Constructor
-		 * @param combineMessages Whether or not to format multiple log messages as a combined single <log4javascript:message>
-		 * element composed of each individual message separated by line breaks or to include a <log4javascript:message> element for
-		 * each message inside one <log4javascript:messages> element. If not specified, defaults to true.
-		 */
-		constructor(combineMessages?: boolean);
-	}
-
-	/**
-	 * Formats a logging event into JavaScript Object Notation (JSON). JSON is a subset of JavaScript's object literal syntax,
-	 * meaning that log messages formatted with this layout can be interpreted directly by JavaScript and converted into objects.
-	 * See json.org for more details about JSON.
-	 */
-	export class JsonLayout extends Layout {
-		/**
-		 * Constructor
-		 * @param readable Whether or not to format each log message with line breaks and tabs. If not specified, defaults to false.
-		 * @param combineMessages Whether or not to format multiple log messages as a combined single message property composed of
-		 * each individual message separated by line breaks or to format multiple messages as an array. If not specified, defaults to true.
-		 */
-		constructor(readable?: boolean, combineMessages?: boolean);
-
-		/**
-		 * Returns whether or not to each log message is formatted with line breaks and tabs.
-		 */
-		isReadable(): boolean;
-	}
-
-	/**
-	 * Formats the log message as a simple URL-encoded string from which a simple server-side script may extract parameters such as
-	 * the log message, severity and timestamp. This is the default layout for AjaxAppender.
-	 */
-	export class HttpPostDataLayout extends Layout {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	// #endregion
-
-	// #region log4javascript error handling
-
-	/**
-	 * log4javascript has a single rudimentary logger-like object of its own to handle messages generated by log4javascript itself.
-	 * This logger is called logLog and is accessed via log4javascript.logLog.
-	 */
-	export namespace logLog {
-
-		/**
-		 * Sets whether logLog is in quiet mode or not. In quiet mode, no messages sent to logLog have any visible effect. By default,
-		 * quiet mode is switched off.
-		 * @param quietMode Whether to turn quiet mode on or off.
-		 */
-		export function setQuietMode(quietMode: boolean): void;
-
-		/**
-		 * Sets how many errors logLog will display alerts for. By default, only the first error encountered generates an alert to the
-		 * user. If you turn all errors on by supplying true to this method then all errors will generate alerts.
-		 * @param showAllErrors Whether to show all errors or just the first.
-		 */
-		export function setAlertAllErrors(alertAllErrors: boolean): void;
-
-		/**
-		 * Logs a debugging message to an in-memory list.
-		 */
-		export function debug(message: string, exception?: Error): void;
-
-		/**
-		 * Displays an alert of all debugging messages.
-		 */
-		export function displayDebug(): void;
-
-		/**
-		 * Currently has no effect.
-		 */
-		export function warn(message: string, exception?: Error): void;
-
-		/**
-		 * Generates an alert to the user if and only if the error is the first one encountered and setAlertAllErrors(true) has not been called.
-		 */
-		export function error(message: string, exception?: Error): void;
-
-	}
-
-	// #endregion
-}
diff --git a/types/log4javascript/log4javascript-tests.ts b/types/log4javascript/log4javascript-tests.ts
deleted file mode 100644
index 3ba497b890..0000000000
--- a/types/log4javascript/log4javascript-tests.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-function aSimpleLoggingMessageString() {
-	var log = log4javascript.getDefaultLogger();
-	log.info("Hello World");
-}
-
-function compareLogLevelsAndLog() {
-    var log = log4javascript.getDefaultLogger();
-    if (log4javascript.Level.INFO.isGreaterOrEqual(log.getLevel())) {
-        log.log(log4javascript.Level.INFO, ["Info"]);
-    }
-}
-
-function loggingAnErrorWithAMessage() {
-	var log = log4javascript.getDefaultLogger();
-	try {
-		throw new Error("Faking something going wrong!");
-	} catch (e) {
-		log.error("An error occurred", e);
-	}
-}
-
-function loggingMultipleMessagesWithOneLoggingCall() {
-	var log = log4javascript.getDefaultLogger();
-	var a = "Hello";
-	var b = 3;
-	log.debug(a, b);
-}
-
-function loggingAnObject() {
-	var log = log4javascript.getDefaultLogger();
-	var obj = { name: "Octopus", tentacles: 8 };
-	log.info(obj);
-}
-
-function tweakingTheDefaultLogger() {
-	var log = log4javascript.getLogger();
-	var popUpAppender = new log4javascript.PopUpAppender();
-	popUpAppender.setFocusPopUp(true);
-	popUpAppender.setNewestMessageAtTop(true);
-	log.addAppender(popUpAppender);
-	log.debug("Hello world!");
-}
-
-function sendingLogMessagesToTheServer() {
-	var log = log4javascript.getLogger("mylogger");
-	var url = "???";
-	var ajaxAppender = new log4javascript.AjaxAppender(url);
-	log.addAppender(ajaxAppender);
-}
-
-function changingTheFormatOfLogMessages() {
-	var popUpAppender = new log4javascript.PopUpAppender();
-	var layout = new log4javascript.PatternLayout("[%-5p] %m");
-	popUpAppender.setLayout(layout);
-}
-
-function configureLogLog() {
-	log4javascript.logLog.setQuietMode(true);
-}
\ No newline at end of file
diff --git a/types/log4javascript/tsconfig.json b/types/log4javascript/tsconfig.json
deleted file mode 100644
index 27a94829c1..0000000000
--- a/types/log4javascript/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "log4javascript-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/logg/tslint.json b/types/logg/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/logg/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/loggly/tslint.json b/types/loggly/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/loggly/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/loglevel/index.d.ts b/types/loglevel/index.d.ts
index c32bdf52a0..3ad9faf707 100644
--- a/types/loglevel/index.d.ts
+++ b/types/loglevel/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for loglevel 1.5
 // Project: https://github.com/pimterry/loglevel
 // Definitions by: Stefan Profanter <https://github.com/Pro>
-//                 Florian Wagner <https://github.com/flqw>
 //                 Gabor Szmetanko <https://github.com/szmeti>
 //                 Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -29,6 +28,18 @@ declare namespace log {
      */
     type LogLevelNumbers = LogLevel[keyof LogLevel];
 
+    /**
+     * Possible log level descriptors, may be string, lower or upper case, or number.
+     */
+    type LogLevelDesc = LogLevelNumbers
+        | 'trace'
+        | 'debug'
+        | 'info'
+        | 'warn'
+        | 'error'
+        | 'silent'
+        | keyof LogLevel;
+
     type LoggingMethod = (...message: any[]) => void;
 
     type MethodFactory = (methodName: string, level: LogLevelNumbers, loggerName: string) => LoggingMethod;
@@ -92,18 +103,7 @@ declare namespace log {
          *     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:
-                LogLevelNumbers
-                | 'trace'
-                | 'debug'
-                | 'info'
-                | 'warn'
-                | 'error'
-                | 'silent'
-                | keyof LogLevel,
-            persist?: boolean
-        ): void;
+        setLevel(level: LogLevelDesc, persist?: boolean): void;
 
         /**
          * If you're using another JavaScript library that exposes a 'log' global, you can run into conflicts with loglevel.
@@ -133,9 +133,9 @@ declare namespace log {
          * 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
+         * @param level as a string, like 'error' (case-insensitive) or as a number from 0 to 5 (or as log.levels. values)
          */
-        setDefaultLevel(level: LogLevel): void;
+        setDefaultLevel(level: LogLevelDesc): void;
 
         /**
          * This gets you a new logger object that works exactly like the root log object, but can have its level and
diff --git a/types/loglevel/test/loglevel-tests.ts b/types/loglevel/test/loglevel-tests.ts
index 453f81d28d..5c63c4488a 100644
--- a/types/loglevel/test/loglevel-tests.ts
+++ b/types/loglevel/test/loglevel-tests.ts
@@ -18,6 +18,11 @@ moduleLog.setLevel('ERROR', false);
 moduleLog.setLevel(moduleLog.levels.WARN);
 moduleLog.setLevel(moduleLog.levels.WARN, false);
 
+moduleLog.setDefaultLevel(0);
+moduleLog.setDefaultLevel('error');
+moduleLog.setDefaultLevel('ERROR');
+moduleLog.setDefaultLevel(moduleLog.levels.WARN);
+
 moduleLog.enableAll(false);
 moduleLog.enableAll();
 moduleLog.disableAll(true);
@@ -27,6 +32,7 @@ const logLevel = moduleLog.getLevel();
 
 const testLogger: moduleLog.Logger = moduleLog.getLogger('TestLogger');
 
+testLogger.setDefaultLevel(logLevel);
 testLogger.setLevel(logLevel);
 testLogger.warn('logging test');
 
diff --git a/types/loglevel/test/loglevel-umd-tests.ts b/types/loglevel/test/loglevel-umd-tests.ts
index 97e9fe617a..3deeb20033 100644
--- a/types/loglevel/test/loglevel-umd-tests.ts
+++ b/types/loglevel/test/loglevel-umd-tests.ts
@@ -14,6 +14,10 @@ log.setLevel("error", false);
 log.setLevel(log.levels.WARN);
 log.setLevel(log.levels.WARN, false);
 
+log.setDefaultLevel(1);
+log.setDefaultLevel("warn");
+log.setDefaultLevel(log.levels.INFO);
+
 log.enableAll(false);
 log.enableAll();
 log.disableAll(true);
@@ -23,6 +27,7 @@ const logLevel = log.getLevel();
 
 const testLogger: log.Logger = log.getLogger("TestLogger");
 
+testLogger.setDefaultLevel(logLevel);
 testLogger.setLevel(logLevel);
 testLogger.warn("logging test");
 
diff --git a/types/loglevel/tsconfig.json b/types/loglevel/tsconfig.json
index efcc4efad8..4d370f7a24 100644
--- a/types/loglevel/tsconfig.json
+++ b/types/loglevel/tsconfig.json
@@ -21,4 +21,4 @@
         "test/loglevel-tests.ts",
         "test/loglevel-umd-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/logrotate-stream/tslint.json b/types/logrotate-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/logrotate-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lokijs/index.d.ts b/types/lokijs/index.d.ts
index f250786778..74f1b6f09e 100644
--- a/types/lokijs/index.d.ts
+++ b/types/lokijs/index.d.ts
@@ -1,854 +1,1431 @@
-// Type definitions for lokijs v1.2.5
+// Type definitions for lokijs v1.5.1
 // Project: https://github.com/techfort/LokiJS
 // Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-// NOTE: definition last updated (2016-3-13) based on latest code as of https://github.com/techfort/LokiJS/commit/3d2cf9546cd22556444deeabc4df314f227ecf5c
+// NOTE: definition last updated (2017-11-25) based on latest code as of https://github.com/techfort/LokiJS/commit/f6c8f1c362cfc9ed63d93cd165ef0ac3bad131bf
 
-/** LokiJS
+/**
+ * LokiJS
  * A lightweight document oriented javascript database
  * @author Joe Minichino <joe.minichino@gmail.com>
  */
 
-
-/** Loki: The main database class
- * @constructor
- * @param {string} filename - name of the file to be saved to
- * @param {object} options - config object
+/** comparison operators
+ * a is the value in the collection
+ * b is the query value
  */
-interface Loki extends LokiEventEmitter {
-    // autosave support (disabled by default)
-    autosave: boolean;
-    autosaveInterval: number; // milliseconds between auto-saves
-    autosaveHandle: number; // ID from setInterval(...)
-    collections: LokiCollection<any>[];
-    databaseVersion: number;
-    engineVersion: number;
-    ENV: string;/*NODEJS, CORDOVA, BROWSER*/
-    events: { [id: string]: ((...args: any[]) => void)[] }; /*{
-        'init': ((...args) => void)[];
-        'loaded': ((...args) => void)[];
-        'flushChanges': ((...args) => void)[];
-        'close': ((...args) => void)[];
-        'changes': ((...args) => void)[];
-        'warning': ((...args) => void)[];
-    };*/
-    filename: string;
-    options: LokiConfigureOptions;
-    persistenceAdapter: LokiPersistenceInterface;
-    // persistenceMethod could be 'fs', 'localStorage', or 'adapter'
-    // this is optional option param, otherwise environment detection will be used
-    // if user passes their own adapter we will force this method to 'adapter' later, so no need to pass method option.
-    persistenceMethod: string; /*'fs', 'localStorage', 'adapter'*/
-    verbose: boolean;
+declare var LokiOps: {
+    $eq(a: any, b: any): boolean;
+    // abstract/loose equality
+    $aeq(a: any, b: any): boolean;
+    $ne(a: any, b: any): boolean;
+    // date equality / loki abstract equality test
+    $dteq(a: any, b: any): boolean;
+    $gt(a: any, b: any): boolean;
+    $gte(a: any, b: any): boolean;
+    $lt(a: any, b: any): boolean;
+    $lte(a: any, b: any): boolean;
+    /** ex : coll.find({'orderCount': {$between: [10, 50]}}); */
+    $between(a: any, vals: any/*[any, any]*/): boolean;
+    $in(a: any, b: any): boolean;
+    $nin(a: any, b: any): boolean;
+    $keyin(a: any, b: any): boolean;
+    $nkeyin(a: any, b: any): boolean;
+    $definedin(a: any, b: any): boolean;
+    $undefinedin(a: any, b: any): boolean;
+    $regex(a: any, b: any): boolean;
+    $containsString(a: any, b: any): boolean;
+    $containsNone(a: any, b: any): boolean;
+    $containsAny(a: any, b: any): boolean;
+    $contains(a: any, b: any): boolean;
+    $type(a: any, b: any): boolean;
+    $finite(a: any, b: any): boolean;
+    $size(a: any, b: any): boolean;
+    $len(a: any, b: any): boolean;
+    $where(a: any, b: any): boolean;
+    // field-level logical operators
+    // a is the value in the collection
+    // b is the nested query operation (for '$not')
+    //   or an array of nested query operations (for '$and' and '$or')
+    $not(a: any, b: any): boolean;
+    $and(a: any, b: any): boolean;
+    $or(a: any, b: any): boolean;
+};
+declare type LokiOps = typeof LokiOps;
 
-    new (filename: string, options: LokiConfigureOptions): Loki;
-
-    // experimental support for browserify's abstract syntax scan to pick up dependency of indexed adapter.
-    // Hopefully, once this hits npm a browserify require of lokijs should scan the main file and detect this indexed adapter reference.
-    getIndexedAdapter(): LokiPersistenceInterface; // require("./loki-indexed-adapter.js")
+/** if an op is registered in this object, our 'calculateRange' can use it with our binary indices.
+ * if the op is registered to a function, we will run that function/op as a 2nd pass filter on results.
+ * those 2nd pass filter functions should be similar to LokiOps functions, accepting 2 vals to compare.
+ */
+declare var indexedOps: {
+    $eq: LokiOps["$eq"],
+    $aeq: true,
+    $dteq: true,
+    $gt: true,
+    $gte: true,
+    $lt: true,
+    $lte: true,
+    $in: true,
+    $between: true
+};
 
 
-    /** configureOptions - allows reconfiguring database options
-     *
-     * @param {object} options - configuration options to apply to loki db object
-     * @param {boolean} initialConfig - (optional) if this is a reconfig, don't pass this
-     */
-    configureOptions(options: LokiConfigureOptions, initialConfig?: boolean): void;
+type PartialModel<E, T> = { [P in keyof E]?: T | E[P] };
 
-    /** anonym() - shorthand method for quickly creating and populating an anonymous collection.
-     *    This collection is not referenced internally so upon losing scope it will be garbage collected.
-     *
-     *    Example : var results = new loki().anonym(myDocArray).find({'age': {'$gt': 30} });
-     *
-     * @param {Array} docs - document array to initialize the anonymous collection with
-     * @param {Array} indexesArray - (Optional) array of property names to index
-     * @returns {Collection} New collection which you can query or chain
-     */
-    anonym<T>(docs: T | T[], indexesArray?: LokiCollectionOptions): LokiCollection<T>;
+type LokiQuery<E> = PartialModel<E & { $and: any; $or: any }, { [Y in keyof LokiOps]?: any }>;
 
-    addCollection<T>(name: string, options?: LokiCollectionOptions): LokiCollection<T>;
-
-    loadCollection(collection: LokiCollection<any>): void;
-
-    getCollection<T>(collectionName: string): LokiCollection<T>;
-
-    listCollections(): { name: string; type: string; count: number }[];
-
-    removeCollection(collectionName: string): void;
-
-    getName(): string;
-
-    /** serializeReplacer - used to prevent certain properties from being serialized
-     */
-    serializeReplacer<T>(key: "autosaveHandle", value: T): T;
-    serializeReplacer<T>(key: "persistenceAdapter", value: T): T;
-    serializeReplacer<T>(key: "constraints", value: T): T;
-    serializeReplacer<T>(key: string, value: T): T;
-
-    // toJson
-    serialize(): string;
-
-    // alias of serialize
-    toJson(): string;
-
-    /** loadJSON - inflates a loki database from a serialized JSON string
-     *
-     * @param {string} serializedDb - a serialized loki database string
-     * @param {object} options - apply or override collection level settings
-     */
-    loadJSON(serializedDb: string, options?: { [collectionName: string]: { inflate?: (src: any, dst: any) => void; proto: any; } }): void;
-
-    /** loadJSONObject - inflates a loki database from a JS object
-     *
-     * @param {object} dbObject - a serialized loki database string
-     * @param {object} options - apply or override collection level settings
-     */
-    loadJSONObject(dbObject: Loki, options?: { [collectionName: string]: { inflate?: (src: any, dst: any) => void; proto: any; } }): void;
-
-    /** close(callback) - emits the close event with an optional callback. Does not actually destroy the db
-     * but useful from an API perspective
-     */
-    close(callback?: (...args: any[]) => void): void;
-
-    /**-------------------------+
-    | Changes API               |
-    +--------------------------*/
-
-    /** The Changes API enables the tracking the changes occurred in the collections since the beginning of the session,
-     * so it's possible to create a differential dataset for synchronization purposes (possibly to a remote db)
-     */
-
-    /** generateChangesNotification() - takes all the changes stored in each
-     * collection and creates a single array for the entire database. If an array of names
-     * of collections is passed then only the included collections will be tracked.
-     *
-     * @param {array} optional array of collection names. No arg means all collections are processed.
-     * @returns {array} array of changes
-     * @see private method createChange() in Collection
-     */
-    generateChangesNotification(arrayOfCollectionNames?: string[]): LokiCollectionChange[];
-
-    /** serializeChanges() - stringify changes for network transmission
-     * @returns {string} string representation of the changes
-     */
-    serializeChanges(collectionNamesArray?: string[]): string;
-
-    /** clearChanges() - clears all the changes in all collections.
-     */
-    clearChanges(): void;
-
-    /** loadDatabase - Handles loading from file system, local storage, or adapter (indexeddb)
-     *    This method utilizes loki configuration options (if provided) to determine which
-     *    persistence method to use, or environment detection (if configuration was not provided).
-     *
-     * @param {object} options - not currently used (remove or allow overrides?)
-     * @param {function} callback - (Optional) user supplied async callback / error handler
-     */
-    loadDatabase(options: { [collectionName: string]: { inflate?: (src: any, dst: any) => void; proto: any; } }, callback?: (err: any, data: any) => void): void;
-
-    /** saveDatabase - Handles saving to file system, local storage, or adapter (indexeddb)
-     *    This method utilizes loki configuration options (if provided) to determine which
-     *    persistence method to use, or environment detection (if configuration was not provided).
-     *
-     * @param {object} options - not currently used (remove or allow overrides?)
-     * @param {function} callback - (Optional) user supplied async callback / error handler
-     */
-    saveDatabase(callback?: (err: any) => void): void;
-
-    // alias for saveDatabase
-    save(callback ?: (err: any) => void): void;
-
-    /** deleteDatabase - Handles deleting a database from file system, local
-     *    storage, or adapter (indexeddb)
-     *    This method utilizes loki configuration options (if provided) to determine which
-     *    persistence method to use, or environment detection (if configuration was not provided).
-     *
-     * @param {object} options - not currently used (remove or allow overrides?)
-     * @param {function} callback - user supplied async callback / error handler
-     */
-    deleteDatabase(options: any, callback: (err: any, data: any) => void): void;
-
-    /** autosaveDirty - check whether any collections are 'dirty' meaning we need to save (entire) database
-     * @returns {boolean} - true if database has changed since last autosave, false if not.
-     */
-    autosaveDirty(): boolean;
-
-    /** autosaveClearFlags - resets dirty flags on all collections.
-     *    Called from saveDatabase() after db is saved.
-     */
-    autosaveClearFlags(): void;
-
-    /** autosaveEnable - begin a javascript interval to periodically save the database.
-     *
-     * @param {object} options - not currently used (remove or allow overrides?)
-     * @param {function} callback - (Optional) user supplied async callback
-     */
-    autosaveEnable(options?: LokiConfigureOptions, callback?: (err: any) => void): void;
-
-    /** autosaveDisable - stop the autosave interval timer.
-     */
-    autosaveDisable(): void;
+interface LokiObj {
+    $loki: number;
+    meta: {
+        created: number; // Date().getTime()
+        revision: number;
+        updated: number; // Date().getTime()
+        version: number;
+    };
 }
 
 
 
-
 /**
  * LokiEventEmitter is a minimalist version of EventEmitter. It enables any
  * constructor that inherits EventEmitter to emit events and trigger
  * listeners that have been added to the event through the on(event, callback) method
+ *
+ * @constructor LokiEventEmitter
  */
-interface LokiEventEmitter {
-    /**
-     * @prop Events property is a hashmap, with each property being an array of callbacks
-     */
-    events: { [eventName: string]: ((...args: any[]) => void)[] };
+declare class LokiEventEmitter {
 
-    new (): LokiEventEmitter;
+    /**
+     * @prop events - a hashmap, with each property being an array of callbacks
+     */
+    public events: { [eventName: string]: ((...args: any[]) => any)[] };
 
     /**
      * @prop asyncListeners - boolean determines whether or not the callbacks associated with each event
      * should happen in an async fashion or not
      * Default is false, which means events are synchronous
      */
-    asyncListeners: boolean;
+    public asyncListeners: boolean;
 
     /**
-     * @prop on(eventName, listener) - adds a listener to the queue of callbacks associated to an event
-     * @returns {int} the index of the callback in the array of listeners for a particular event
+     * on(eventName, listener) - adds a listener to the queue of callbacks associated to an event
+     * @param eventName - the name(s) of the event(s) to listen to
+     * @param listener - callback function of listener to attach
+     * @returns the index of the callback in the array of listeners for a particular event
      */
-    on<U extends (...args: any[]) => void>(eventName: string, listener: U): U;
+    on<F extends (...args: any[]) => any>(eventName: string | string[], listener: F): F;
 
     /**
-     * @propt emit(eventName, data) - emits a particular event
+     * emit(eventName, data) - emits a particular event
      * with the option of passing optional parameters which are going to be processed by the callback
      * provided signatures match (i.e. if passing emit(event, arg0, arg1) the listener should take two parameters)
-     * @param {string} eventName - the name of the event
-     * @param {object} data - optional object passed with the event
+     * @param eventName - the name of the event
+     * @param data - optional object passed with the event
      */
-    emit(eventName: string, data?: any): void;
+    emit(eventName: string, data?: any, arg?: any): void;
 
     /**
-     * @prop remove() - removes the listener at position 'index' from the event 'eventName'
+     * Alias of LokiEventEmitter.prototype.on
+     * addListener(eventName, listener) - adds a listener to the queue of callbacks associated to an event
+     * @param eventName - the name(s) of the event(s) to listen to
+     * @param listener - callback function of listener to attach
+     * @returns the event listener added
      */
-    removeListener(eventName: string, listener: (...args: any[]) => void): void;
+    public addListener: LokiEventEmitter["on"];
+
+    /**
+     * removeListener() - removes the listener at position 'index' from the event 'eventName'
+     * @param eventName - the name(s) of the event(s) which the listener is attached to
+     * @param listener - the listener callback function to remove from emitter
+     */
+    public removeListener(eventName: string | string[], listener: (...args: any[]) => any): void;
 }
 
 
 
+interface LokiConstructorOptions {
+    verbose: boolean;
+    env: "NATIVESCRIPT" | "NODEJS" | "CORDOVA" | "BROWSER" | "NA";
+}
+
+
+interface LokiConfigOptions {
+    adapter: LokiPersistenceAdapter | null;
+    autoload: boolean;
+    autoloadCallback: (err: any) => void;
+    autosave: boolean;
+    autosaveCallback: (err?: any) => void;
+    autosaveInterval: string | number;
+    persistenceMethod: "fs" | "localStorage" | "memory" | null;
+    destructureDelimiter: string;
+    serializationMethod: "normal" | "pretty" | "destructured" | null;
+    throttledSaves: boolean;
+}
+
+
+type DeserializeOptions = { partitioned?: boolean; delimited: false; delimiter?: string; partition?: number } | { partitioned?: boolean; delimited?: true; delimiter: string; partition?: number };
+
+
+interface ThrottledSaveDrainOptions {
+    recursiveWait: boolean;
+    recursiveWaitLimit: boolean;
+    recursiveWaitLimitDuration: number;
+    started: number;
+}
+
+
+interface Transform {
+    type: "find" | "where" | "simplesort" | "compoundsort" | "sort" | "limit" | "offset" | "map" | "eqJoin" | "mapReduce" | "update" | "remove";
+    value?: any;
+    property?: string;
+    desc?: boolean;
+    dataOptions?: any;
+    joinData?: any;
+    leftJoinKey?: any;
+    rightJoinKey?: any;
+    mapFun?: any;
+    mapFunction?: any;
+    reduceFunction?: any;
+}
+
+
+/**
+ * Loki: The main database class
+ * @implements LokiEventEmitter
+ */
+declare class Loki extends LokiEventEmitter {
+    collections: Collection<any>[];
+    options: Partial<LokiConstructorOptions> & LokiConfigOptions & Partial<ThrottledSaveDrainOptions>;
+    filename: string;
+    name?: string;
+    databaseVersion: number;
+    engineVersion: number;
+    autosave: boolean;
+    autosaveInterval: number;
+    autosaveHandle: number | null;
+    persistenceAdapter: LokiPersistenceAdapter | null | undefined;
+    persistenceMethod: "fs" | "localStorage" | "memory" | "adapter" | null | undefined;
+    throttledCallbacks: ((err?: any) => void)[];
+    throttledSavePending: boolean;
+    throttledSaves: boolean;
+    verbose: boolean;
+    ENV: "NATIVESCRIPT" | "NODEJS" | "CORDOVA" | "BROWSER" | "NA";
+
+    /**
+     * @param filename - name of the file to be saved to
+     * @param options - (Optional) config options object
+     * @param options.env - override environment detection as 'NODEJS', 'BROWSER', 'CORDOVA'
+     * @param [options.verbose=false] - enable console output
+     * @param [options.autosave=false] - enables autosave
+     * @param [options.autosaveInterval=5000] - time interval (in milliseconds) between saves (if dirty)
+     * @param [options.autoload=false] - enables autoload on loki instantiation
+     * @param options.autoloadCallback - user callback called after database load
+     * @param options.adapter - an instance of a loki persistence adapter
+     * @param [options.serializationMethod='normal'] - ['normal', 'pretty', 'destructured']
+     * @param options.destructureDelimiter - string delimiter used for destructured serialization
+     * @param [options.throttledSaves=true] - debounces multiple calls to to saveDatabase reducing number of disk I/O operations
+                                            and guaranteeing proper serialization of the calls.
+     */
+    constructor(filename: string, options?: Partial<LokiConstructorOptions> & Partial<LokiConfigOptions> & Partial<ThrottledSaveDrainOptions>);
+
+    // experimental support for browserify's abstract syntax scan to pick up dependency of indexed adapter.
+    // Hopefully, once this hits npm a browserify require of lokijs should scan the main file and detect this indexed adapter reference.
+    public getIndexedAdapter(): any;
+
+    /**
+     * Allows reconfiguring database options
+     *
+     * @param options - configuration options to apply to loki db object
+     * @param options.env - override environment detection as 'NODEJS', 'BROWSER', 'CORDOVA'
+     * @param options.verbose - enable console output (default is 'false')
+     * @param options.autosave - enables autosave
+     * @param options.autosaveInterval - time interval (in milliseconds) between saves (if dirty)
+     * @param options.autoload - enables autoload on loki instantiation
+     * @param options.autoloadCallback - user callback called after database load
+     * @param options.adapter - an instance of a loki persistence adapter
+     * @param options.serializationMethod - ['normal', 'pretty', 'destructured']
+     * @param options.destructureDelimiter - string delimiter used for destructured serialization
+     * @param initialConfig - (internal) true is passed when loki ctor is invoking
+     */
+    public configureOptions(options?: Partial<LokiConfigOptions> & Partial<ThrottledSaveDrainOptions>, initialConfig?: boolean): void;
+
+    /**
+     * Copies 'this' database into a new Loki instance. Object references are shared to make lightweight.
+     *
+     * @param options - apply or override collection level settings
+     * @param options.removeNonSerializable - nulls properties not safe for serialization.
+     */
+    public copy(options?: { removeNonSerializable?: boolean }): Loki;
+
+    /**
+     * Adds a collection to the database.
+     * @param name - name of collection to add
+     * @param options - (optional) options to configure collection with.
+     * @param [options.unique=[]] - array of property names to define unique constraints for
+     * @param [options.exact=[]] - array of property names to define exact constraints for
+     * @param [options.indices=[]] - array property names to define binary indexes for
+     * @param [options.asyncListeners=false] - whether listeners are called asynchronously
+     * @param [options.disableChangesApi=true] - set to false to enable Changes Api
+     * @param [options.autoupdate=false] - use Object.observe to update objects automatically
+     * @param [options.clone=false] - specify whether inserts and queries clone to/from user
+     * @param [options.cloneMethod='parse-stringify'] - 'parse-stringify', 'jquery-extend-deep', 'shallow, 'shallow-assign'
+     * @param options.ttlInterval - time interval for clearing out 'aged' documents; not set by default.
+     * @returns a reference to the collection which was just added
+     */
+    public addCollection<F extends object = any>(name: string, options?: Partial<CollectionOptions<F>>): Collection<F>;
+
+    public loadCollection(collection: Collection<any>): void;
+
+    /**
+     * Retrieves reference to a collection by name.
+     * @param collectionName - name of collection to look up
+     * @returns Reference to collection in database by that name, or null if not found
+     */
+    public getCollection<F extends object = any>(collectionName: string): Collection<F>;
+
+    /**
+     * Renames an existing loki collection
+     * @param oldName - name of collection to rename
+     * @param newName - new name of collection
+     * @returns reference to the newly renamed collection
+     */
+    public renameCollection(oldName: string, newName: string): Collection<any>;
+
+    public listCollections(): Collection<any>[];
+
+    /**
+     * Removes a collection from the database.
+     * @param collectionName - name of collection to remove
+     */
+    public removeCollection(collectionName: string): void;
+
+    public getName(): string;
+
+    /**
+     * serializeReplacer - used to prevent certain properties from being serialized
+     */
+    public serializeReplacer(key: "autosaveHandle" | "persistenceAdapter" | "constraints" | "ttl" | "throttledSavePending" | "throttledCallbacks" | string, value: any): any;
+
+    /**
+     * Serialize database to a string which can be loaded via {@link Loki#loadJSON}
+     *
+     * @returns Stringified representation of the loki database.
+     */
+    public serialize(): string;
+    public serialize(options: { serializationMethod?: "normal" | "pretty" }): string;
+    public serialize(options: { serializationMethod: "destructured" }): string[];
+    public serialize(options?: { serializationMethod?: string | null }): string | string[];
+    public serialize(options?: { serializationMethod?: string | null }): string | string[];
+
+    // alias of serialize
+    public toJson: Loki["serialize"];
+
+    /**
+     * Database level destructured JSON serialization routine to allow alternate serialization methods.
+     * Internally, Loki supports destructuring via loki "serializationMethod' option and
+     * the optional LokiPartitioningAdapter class. It is also available if you wish to do
+     * your own structured persistence or data exchange.
+     *
+     * @param options - output format options for use externally to loki
+     * @param options.partitioned - (default: false) whether db and each collection are separate
+     * @param options.partition - can be used to only output an individual collection or db (-1)
+     * @param options.delimited - (default: true) whether subitems are delimited or subarrays
+     * @param options.delimiter - override default delimiter
+     *
+     * @returns A custom, restructured aggregation of independent serializations.
+     */
+    public serializeDestructured(options?: { delimited?: boolean; delimiter?: string; partitioned?: boolean; partition?: number; }): string | string[];
+
+    /**
+     * Collection level utility method to serialize a collection in a 'destructured' format
+     *
+     * @param [options] - used to determine output of method
+     * @param [options.delimited] - whether to return single delimited string or an array
+     * @param [options.delimiter] - (optional) if delimited, this is delimiter to use
+     * @param [options.collectionIndex] - specify which collection to serialize data for
+     *
+     * @returns A custom, restructured aggregation of independent serializations for a single collection.
+     */
+    public serializeCollection(options?: { delimited?: boolean; collectionIndex?: number; delimiter?: string }): string | string[];
+
+    /**
+     * Database level destructured JSON deserialization routine to minimize memory overhead.
+     * Internally, Loki supports destructuring via loki "serializationMethod' option and
+     * the optional LokiPartitioningAdapter class. It is also available if you wish to do
+     * your own structured persistence or data exchange.
+     *
+     * @param destructuredSource - destructured json or array to deserialize from
+     * @param [options] - source format options
+     * @param [options.partitioned=false] - whether db and each collection are separate
+     * @param [options.partition] - can be used to deserialize only a single partition
+     * @param [options.delimited=true] - whether subitems are delimited or subarrays
+     * @param [options.delimiter] - override default delimiter
+     *
+     * @returns An object representation of the deserialized database, not yet applied to 'this' db or document array
+     */
+    public deserializeDestructured(destructuredSource: string | string[] | null, options?: DeserializeOptions): any;
+
+    /**
+     * Collection level utility function to deserializes a destructured collection.
+     *
+     * @param destructuredSource - destructured representation of collection to inflate
+     * @param [options] - used to describe format of destructuredSource input
+     * @param [options.delimited=false] - whether source is delimited string or an array
+     * @param [options.delimiter] - if delimited, this is delimiter to use (if other than default)
+     *
+     * @returns an array of documents to attach to collection.data.
+     */
+    public deserializeCollection(destructuredSource: string | string[], options?: { partitioned?: boolean; delimited?: boolean; delimiter?: string; }): any[];
+
+    /**
+     * Inflates a loki database from a serialized JSON string
+     *
+     * @param serializedDb - a serialized loki database string
+     * @param [options] - apply or override collection level settings
+     * @param [options.serializationMethod] - the serialization format to deserialize
+     */
+    public loadJSON(serializedDb: string, options?: { serializationMethod?: "normal" | "pretty" | "destructured" | null } & { retainDirtyFlags?: boolean; throttledSaves?: boolean;[collName: string]: any | { proto?: any; inflate?: (src: object, dest?: object) => void } }): void;
+
+    /**
+     * Inflates a loki database from a JS object
+     *
+     * @param dbObject - a serialized loki database string
+     * @param options - apply or override collection level settings
+     * @param options.retainDirtyFlags - whether collection dirty flags will be preserved
+     */
+    public loadJSONObject(dbObject: { name?: string; throttledSaves: boolean; collections: Collection<any>[]; databaseVersion: number },
+        options?: { retainDirtyFlags?: boolean; throttledSaves?: boolean;[collName: string]: any | { proto?: any; inflate?: (src: object, dest?: object) => void } }): void;
+
+    /**
+     * Emits the close event. In autosave scenarios, if the database is dirty, this will save and disable timer.
+     * Does not actually destroy the db.
+     *
+     * @param callback - (Optional) if supplied will be registered with close event before emitting.
+     */
+    public close(callback?: (err?: any) => void): void;
+
+    /**-------------------------+
+    | Changes API               |
+    +--------------------------*/
+
+    /**
+     * The Changes API enables the tracking the changes occurred in the collections since the beginning of the session,
+     * so it's possible to create a differential dataset for synchronization purposes (possibly to a remote db)
+     */
+
+    /**
+     * (Changes API) : takes all the changes stored in each
+     * collection and creates a single array for the entire database. If an array of names
+     * of collections is passed then only the included collections will be tracked.
+     *
+     * @param optional array of collection names. No arg means all collections are processed.
+     * @returns array of changes
+     * @see private method createChange() in Collection
+     */
+    public generateChangesNotification(arrayOfCollectionNames?: string[] | null): CollectionChange[];
+
+    /**
+     * (Changes API) - stringify changes for network transmission
+     * @returns string representation of the changes
+     */
+    public serializeChanges(collectionNamesArray?: string[]): string;
+
+    /**
+     * (Changes API) : clears all the changes in all collections.
+     */
+    public clearChanges(): void;
+
+    /**
+     * Wait for throttledSaves to complete and invoke your callback when drained or duration is met.
+     *
+     * @param callback - callback to fire when save queue is drained, it is passed a sucess parameter value
+     * @param [options] - configuration options
+     * @param [options.recursiveWait] - (default: true) if after queue is drained, another save was kicked off, wait for it
+     * @param [options.recursiveWaitLimit] - (default: false) limit our recursive waiting to a duration
+     * @param [options.recursiveWaitLimitDelay] - (default: 2000) cutoff in ms to stop recursively re-draining
+     */
+    public throttledSaveDrain(callback: (result?: boolean) => void, options?: Partial<ThrottledSaveDrainOptions>): void;
+
+    /**
+     * Internal load logic, decoupled from throttling/contention logic
+     *
+     * @param [options] - not currently used (remove or allow overrides?)
+     * @param [callback] - (Optional) user supplied async callback / error handler
+     */
+    public loadDatabaseInternal(options?: any, callback?: (err?: any, data?: any) => void): void;
+
+    /**
+     * Handles manually loading from file system, local storage, or adapter (such as indexeddb)
+     *    This method utilizes loki configuration options (if provided) to determine which
+     *    persistence method to use, or environment detection (if configuration was not provided).
+     *    To avoid contention with any throttledSaves, we will drain the save queue first.
+     *
+     * If you are configured with autosave, you do not need to call this method yourself.
+     *
+     * @param [options] - if throttling saves and loads, this controls how we drain save queue before loading
+     * @param [options.recursiveWait] - (default: true) wait recursively until no saves are queued
+     * @param [options.recursiveWaitLimit] - (default: false) limit our recursive waiting to a duration
+     * @param [options.recursiveWaitLimitDelay] - (default: 2000) cutoff in ms to stop recursively re-draining
+     * @param [callback] - (Optional) user supplied async callback / error handler
+     * @example
+     * db.loadDatabase({}, function(err) {
+     *   if (err) {
+     *     console.log("error : " + err);
+     *   }
+     *   else {
+     *     console.log("database loaded.");
+     *   }
+     * });
+     */
+    public loadDatabase(options?: Partial<ThrottledSaveDrainOptions>, callback?: (err: any) => void): void;
+
+    /**
+     * Internal save logic, decoupled from save throttling logic
+     */
+    public saveDatabaseInternal(callback?: (err: any) => void): void;
+
+    /**
+     * Handles manually saving to file system, local storage, or adapter (such as indexeddb)
+     *    This method utilizes loki configuration options (if provided) to determine which
+     *    persistence method to use, or environment detection (if configuration was not provided).
+     *
+     * If you are configured with autosave, you do not need to call this method yourself.
+     *
+     * @param [callback] - (Optional) user supplied async callback / error handler
+     * @example
+     * db.saveDatabase(function(err) {
+     *   if (err) {
+     *     console.log("error : " + err);
+     *   }
+     *   else {
+     *     console.log("database saved.");
+     *   }
+     * });
+     */
+    public saveDatabase(callback?: (err?: any) => void): void;
+
+    // alias
+    public save: Loki["saveDatabase"];
+
+    /**
+     * Handles deleting a database from file system, local
+     *    storage, or adapter (indexeddb)
+     *    This method utilizes loki configuration options (if provided) to determine which
+     *    persistence method to use, or environment detection (if configuration was not provided).
+     *
+     * @param callback - (Optional) user supplied async callback / error handler
+     */
+    public deleteDatabase(callback: (err?: any, data?: any) => void): void;
+    public deleteDatabase(options?: null, callback?: (err?: any, data?: any) => void): void;
+    public deleteDatabase(options?: ((err?: any, data?: any) => void) | null, callback?: (err?: any, data?: any) => void): void;
+
+    /**
+     * autosaveDirty - check whether any collections are 'dirty' meaning we need to save (entire) database
+     *
+     * @returns true if database has changed since last autosave, false if not.
+     */
+    public autosaveDirty(): boolean;
+
+    /**
+     * autosaveClearFlags - resets dirty flags on all collections.
+     *    Called from saveDatabase() after db is saved.
+     *
+     */
+    public autosaveClearFlags(): void;
+
+    /**
+     * autosaveEnable - begin a javascript interval to periodically save the database.
+     *
+     * @param [options] - not currently used (remove or allow overrides?)
+     * @param [callback] - (Optional) user supplied async callback
+     */
+    public autosaveEnable(options?: any, callback?: (err?: any) => void): void;
+
+    /**
+     * autosaveDisable - stop the autosave interval timer.
+     */
+    public autosaveDisable(): void;
+}
+
+
 
 /*------------------+
 | PERSISTENCE       |
 -------------------*/
 
 /** there are two build in persistence adapters for internal use
- * fs             for use in Nodejs type environments
- * localStorage   for use in browser environment
- * defined as helper classes here so its easy and clean to use
- */
+    * fs             for use in Nodejs type environments
+    * localStorage   for use in browser environment
+    * defined as helper classes here so its easy and clean to use
+    */
 
-interface LokiPersistenceInterface {
-    loadDatabase(dbname: string, callback: (dataOrErr: string | Error) => void): void;
-    saveDatabase(dbname: string, dbstring: string, callback: (resOrErr: void | Error) => void): void;
-    deleteDatabase(dbname: string, callback?: (resOrErr: void | Error) => void): void;
-    // optional
-    mode?: string; // 'reference'
-    // filename may seem redundant but loadDatabase will need to expect this same filename
-    exportDatabase?(filename: string, param: any, callback?: (err: any) => void): void;
+interface LokiPersistenceAdapter {
+    mode?: string;
+    loadDatabase(dbname: string, callback: (value: any) => void): void;
+    deleteDatabase?(dbnameOrOptions: any, callback: (err?: Error | null, data?: any) => void): void;
+    exportDatabase?(dbname: string, dbref: Loki, callback: (err: Error | null) => void): void;
+    saveDatabase?(dbname: string, dbstring: any, callback: (err?: Error | null) => void): void;
 }
 
 
-/** constructor for fs
+/**
+ * In in-memory persistence adapter for an in-memory database.
+ * This simple 'key/value' adapter is intended for unit testing and diagnostics.
+ *
+ * @param [options] - memory adapter options
+ * @param [options.asyncResponses=false] - whether callbacks are invoked asynchronously
+ * @param [options.asyncTimeout=50] - timeout in ms to queue callbacks
+ * @constructor LokiMemoryAdapter
  */
-interface LokiFsAdapter extends LokiPersistenceInterface {
-    fs: any; //require('fs');
+declare class LokiMemoryAdapter implements LokiPersistenceAdapter {
+    hashStore: { [name: string]: { savecount: number; lastsave: Date; value: string } };
+    options: { asyncResponses?: boolean; asyncTimeout?: number };
 
-    /** loadDatabase() - Load data from file, will throw an error if the file does not exist
-     * @param {string} dbname - the filename of the database to load
-     * @param {function} callback - the callback to handle the result
+    constructor(options?: { asyncResponses?: boolean; asyncTimeout?: number });
+
+    /**
+     * Loads a serialized database from its in-memory store.
+     * (Loki persistence adapter interface function)
+     *
+     * @param dbname - name of the database (filename/keyname)
+     * @param callback - adapter callback to return load result to caller
      */
-    loadDatabase(dbname: string, callback: (err: Error, data: string) => void): void;
+    public loadDatabase(dbname: string, callback: (value: any) => void): void;
 
-    /** saveDatabase() - save data to file, will throw an error if the file can't be saved
+    /**
+     * Saves a serialized database to its in-memory store.
+     * (Loki persistence adapter interface function)
+     *
+     * @param dbname - name of the database (filename/keyname)
+     * @param callback - adapter callback to return load result to caller
+     */
+    public saveDatabase(dbname: string, dbstring: any, callback: (err?: Error | null) => void): void;
+
+    /**
+     * Deletes a database from its in-memory store.
+     *
+     * @param dbname - name of the database (filename/keyname)
+     * @param callback - function to call when done
+     */
+    public deleteDatabase(dbname: string, callback: (err?: Error | null) => void): void;
+}
+
+
+
+interface PageIterator {
+    collection: number;
+    pageIndex: number;
+    docIndex: number;
+}
+
+
+/**
+ * An adapter for adapters.  Converts a non reference mode adapter into a reference mode adapter
+ * which can perform destructuring and partioning.  Each collection will be stored in its own key/save and
+ * only dirty collections will be saved.  If you  turn on paging with default page size of 25megs and save
+ * a 75 meg collection it should use up roughly 3 save slots (key/value pairs sent to inner adapter).
+ * A dirty collection that spans three pages will save all three pages again
+ * Paging mode was added mainly because Chrome has issues saving 'too large' of a string within a
+ * single indexeddb row.  If a single document update causes the collection to be flagged as dirty, all
+ * of that collection's pages will be written on next save.
+ *
+ * @param adapter - reference to a 'non-reference' mode loki adapter instance.
+ * @param options - configuration options for partitioning and paging
+ * @param [options.paging] - (default: false) set to true to enable paging collection data.
+ * @param [options.pageSize] - (default : 25MB) you can use this to limit size of strings passed to inner adapter.
+ * @param [options.delimiter] - allows you to override the default delimeter
+ * @constructor LokiPartitioningAdapter
+ */
+declare class LokiPartitioningAdapter implements LokiPersistenceAdapter {
+    mode: string;
+    dbref: Loki | null;
+    dbname: string
+    adapter: LokiPersistenceAdapter | null;
+    options: { paging?: boolean; pageSize?: number; delimiter?: string };
+    pageIterator: PageIterator | {};
+    dirtyPartitions: number[] | undefined;
+
+    constructor(adapter: LokiPersistenceAdapter, options?: { paging?: boolean; pageSize?: number; delimiter?: string });
+
+    /**
+     * Loads a database which was partitioned into several key/value saves.
+     * (Loki persistence adapter interface function)
+     *
+     * @param dbname - name of the database (filename/keyname)
+     * @param callback - adapter callback to return load result to caller
+     */
+    public loadDatabase(dbname: string, callback: (dbOrErr: Loki | null | Error) => void): void;
+
+    /**
+     * Used to sequentially load each collection partition, one at a time.
+     *
+     * @param partition - ordinal collection position to load next
+     * @param callback - adapter callback to return load result to caller
+     */
+    public loadNextPartition(partition: number, callback: () => void): void;
+
+    /**
+     * Used to sequentially load the next page of collection partition, one at a time.
+     *
+     * @param callback - adapter callback to return load result to caller
+     */
+    public loadNextPage(callback: () => void): void;
+
+    /**
+     * Saves a database by partioning into separate key/value saves.
+     * (Loki 'reference mode' persistence adapter interface function)
+     *
+     * @param dbname - name of the database (filename/keyname)
+     * @param dbref - reference to database which we will partition and save.
+     * @param callback - adapter callback to return load result to caller
+     */
+    public exportDatabase(dbname: string, dbref: Loki, callback: (err: Error | null) => void): void;
+
+    /**
+     * Helper method used internally to save each dirty collection, one at a time.
+     *
+     * @param callback - adapter callback to return load result to caller
+     */
+    public saveNextPartition(callback: (err: Error | null) => void): void;
+
+    /**
+     * Helper method used internally to generate and save the next page of the current (dirty) partition.
+     *
+     * @param callback - adapter callback to return load result to caller
+     */
+    public saveNextPage(callback: (err: Error | null) => void): void;
+}
+
+
+
+/**
+ * A loki persistence adapter which persists using node fs module
+ * @constructor LokiFsAdapter
+ */
+declare class LokiFsAdapter implements LokiPersistenceAdapter {
+
+    constructor();
+
+    /**
+     * loadDatabase() - Load data from file, will throw an error if the file does not exist
+     * @param dbname - the filename of the database to load
+     * @param callback - the callback to handle the result
+     */
+    public loadDatabase(dbname: string, callback: (data: any | Error) => void): void;
+
+    /**
+     * saveDatabase() - save data to file, will throw an error if the file can't be saved
      * might want to expand this to avoid dataloss on partial save
-     * @param {string} dbname - the filename of the database to load
-     * @param {function} callback - the callback to handle the result
+     * @param dbname - the filename of the database to load
+     * @param callback - the callback to handle the result
      */
-    saveDatabase(dbname: string, dbstring: string, callback: (err: any) => void): void;
+    public saveDatabase(dbname: string, dbstring: string | Uint8Array, callback: (err?: Error | null) => void): void;
 
-    /** deleteDatabase() - delete the database file, will throw an error if the
+    /**
+     * deleteDatabase() - delete the database file, will throw an error if the
      * file can't be deleted
-     * @param {string} dbname - the filename of the database to delete
-     * @param {function} callback - the callback to handle the result
+     * @param dbname - the filename of the database to delete
+     * @param callback - the callback to handle the result
      */
-    deleteDatabase(dbname: string, callback: (resOrErr: void | Error) => void): void;
+    public deleteDatabase(dbname: string, callback: (err?: Error | null) => void): void;
 }
 
 
-/** constructor for local storage
+
+/**
+ * A loki persistence adapter which persists to web browser's local storage object
+ * @constructor LokiLocalStorageAdapter
  */
-interface LokiLocalStorageAdapter extends LokiPersistenceInterface {
+declare class LokiLocalStorageAdapter {
 
-    /** loadDatabase() - Load data from localstorage
-     * @param {string} dbname - the name of the database to load
-     * @param {function} callback - the callback to handle the result
+    /**
+     * loadDatabase() - Load data from localstorage
+     * @param dbname - the name of the database to load
+     * @param callback - the callback to handle the result
      */
-    loadDatabase(dbname: string, callback: (dataOrErr: string | Error) => void): void;
+    public loadDatabase(dbname: string, callback: (dataOrError: any | Error) => void): void;
 
-    /** saveDatabase() - save data to localstorage, will throw an error if the file can't be saved
+    /**
+     * saveDatabase() - save data to localstorage, will throw an error if the file can't be saved
      * might want to expand this to avoid dataloss on partial save
-     * @param {string} dbname - the filename of the database to load
-     * @param {function} callback - the callback to handle the result
+     * @param dbname - the filename of the database to load
+     * @param callback - the callback to handle the result
      */
-    saveDatabase(dbname: string, dbstring: string, callback: (resOrErr: void | Error) => void): void;
+    public saveDatabase(dbname: string, dbstring: string, callback: (err?: Error | null) => void): void;
 
-    /** deleteDatabase() - delete the database from localstorage, will throw an error if it
+    /**
+     * deleteDatabase() - delete the database from localstorage, will throw an error if it
      * can't be deleted
-     * @param {string} dbname - the filename of the database to delete
-     * @param {function} callback - the callback to handle the result
+     * @param dbname - the filename of the database to delete
+     * @param callback - the callback to handle the result
      */
-    deleteDatabase(dbname: string, callback: (resOrErr: void | Error) => void): void;
+    public deleteDatabase(dbname: string, callback: (err?: Error | null) => void): void;
 }
 
 
 
+interface GetDataOptions {
+    forceClones: boolean;
+    forceCloneMethod: ("parse-stringify" | "jquery-extend-deep" | "shallow" | "shallow-assign" | "shallow-recurse-objects") | null;
+    removeMeta: boolean;
+}
 
-/** Resultset class allowing chainable queries.  Intended to be instanced internally.
+
+/**
+ * Resultset class allowing chainable queries.  Intended to be instanced internally.
  *    Collection.find(), Collection.where(), and Collection.chain() instantiate this.
  *
- *    Example:
+ * @example
  *    mycollection.chain()
  *      .find({ 'doors' : 4 })
  *      .where(function(obj) { return obj.name === 'Toyota' })
  *      .data();
  */
-interface LokiResultset<E> {
-    // retain reference to collection we are querying against
-    collection: LokiCollection<E>;
+declare class Resultset<E extends object> {
+    collection: Collection<E>;
+    filteredrows: number[];
     filterInitialized: boolean;
-    filteredrows: string[]; // technically number[] (e.g. = Object.keys(this.collection.data))
-    options: LokiResultsetOptions<E>;
-    searchIsChained: boolean;
-
 
     /**
-     * @constructor
-     * @param {Collection} collection - The collection which this Resultset will query against.
-     * @param {Object} options - Object containing one or more options.
-     * @param {string} options.queryObj - Optional mongo-style query object to initialize resultset with.
-     * @param {function} options.queryFunc - Optional javascript filter function to initialize resultset with.
-     * @param {bool} options.firstOnly - Optional boolean used by collection.findOne().
+     * @param collection - The collection which this Resultset will query against.
+     * @param options
      */
-    new <E>(collection: LokiCollection<E>, options: LokiResultsetOptions<E>): LokiResultset<E> | E[];
+    constructor(collection: Collection<E>, options?: any);
 
-    /** reset() - Reset the resultset to its initial state.
+    /**
+     * reset() - Reset the resultset to its initial state.
      *
-     * @returns {Resultset} Reference to this resultset, for future chain operations.
+     * @returns Reference to this resultset, for future chain operations.
      */
-    reset(): LokiResultset<E>;
+    public reset(): this;
 
-    /** toJSON() - Override of toJSON to avoid circular references
+    /**
+     * toJSON() - Override of toJSON to avoid circular references
      */
-    toJSON(): LokiResultset<E>;
+    public toJSON(): Resultset<E>;
 
-    /** limit() - Allows you to limit the number of documents passed to next chain operation.
+    /**
+     * Allows you to limit the number of documents passed to next chain operation.
      *    A resultset copy() is made to avoid altering original resultset.
      *
-     * @param {int} qty - The number of documents to return.
-     * @returns {Resultset} Returns a copy of the resultset, limited by qty, for subsequent chain ops.
+     * @param qty - The number of documents to return.
+     * @returns Returns a copy of the resultset, limited by qty, for subsequent chain ops.
      */
-    limit(qty: number): LokiResultset<E>;
+    public limit(qty: number): Resultset<E>;
 
-    /** offset() - Used for skipping 'pos' number of documents in the resultset.
+    /**
+     * Used for skipping 'pos' number of documents in the resultset.
      *
-     * @param {int} pos - Number of documents to skip; all preceding documents are filtered out.
-     * @returns {Resultset} Returns a copy of the resultset, containing docs starting at 'pos' for subsequent chain ops.
+     * @param pos - Number of documents to skip; all preceding documents are filtered out.
+     * @returns Returns a copy of the resultset, containing docs starting at 'pos' for subsequent chain ops.
      */
-    offset(pos: number): LokiResultset<E>;
+    public offset(pos: number): Resultset<E>;
 
-    /** copy() - To support reuse of resultset in branched query situations.
+    /**
+     * copy() - To support reuse of resultset in branched query situations.
      *
-     * @returns {Resultset} Returns a copy of the resultset (set) but the underlying document references will be the same.
+     * @returns Returns a copy of the resultset (set) but the underlying document references will be the same.
      */
-    copy(): LokiResultset<E>;
-    // alias of copy()
-    branch(): LokiResultset<E>;
+    public copy(): Resultset<E>;
+
+    /**
+     * Alias of copy()
+     */
+    public branch: Resultset<E>["copy"];
 
     /**
      * transform() - executes a named collection transform or raw array of transform steps against the resultset.
      *
-     * @param transform {string|array} : (Optional) name of collection transform or raw transform array
-     * @param parameters {object} : (Optional) object property hash of parameters, if the transform requires them.
-     * @returns {Resultset} : either (this) resultset or a clone of of this resultset (depending on steps)
+     * @param transform - name of collection transform or raw transform array
+     * @param parameters - (Optional) object property hash of parameters, if the transform requires them.
+     * @returns either (this) resultset or a clone of of this resultset (depending on steps)
      */
-    transform(transform?: string | any[], parameters?: any): LokiResultset<E>;
+    public transform(transform: string | string[] | Transform[], parameters?: object): Resultset<any>;
 
-    /** sort() - User supplied compare function is provided two documents to compare. (chainable)
-     *    Example:
+    /**
+     * User supplied compare function is provided two documents to compare. (chainable)
+     * @example
      *    rslt.sort(function(obj1, obj2) {
      *      if (obj1.name === obj2.name) return 0;
      *      if (obj1.name > obj2.name) return 1;
      *      if (obj1.name < obj2.name) return -1;
      *    });
      *
-     * @param {function} comparefun - A javascript compare function used for sorting.
-     * @returns {Resultset} Reference to this resultset, sorted, for future chain operations.
+     * @param comparefun - A javascript compare function used for sorting.
+     * @returns Reference to this resultset, sorted, for future chain operations.
      */
-    sort(comparefun: (a: E, b: E) => number): LokiResultset<E>;
+    public sort(comparefun: (a: E & LokiObj, b: E & LokiObj) => number): this;
 
-    /** simplesort() - Simpler, loose evaluation for user to sort based on a property name. (chainable)
+    /**
+     * Simpler, loose evaluation for user to sort based on a property name. (chainable).
+     *    Sorting based on the same lt/gt helper functions used for binary indices.
      *
-     * @param {string} propname - name of property to sort by.
-     * @param {bool} isdesc - (Optional) If true, the property will be sorted in descending order
-     * @returns {Resultset} Reference to this resultset, sorted, for future chain operations.
+     * @param propname - name of property to sort by.
+     * @param isdesc - (Optional) If true, the property will be sorted in descending order
+     * @returns Reference to this resultset, sorted, for future chain operations.
      */
-    simplesort(propname: string, isdesc?: boolean): LokiResultset<E>;
+    public simplesort(propname: keyof E, isdesc?: boolean): this;
 
-    /** compoundsort() - Allows sorting a resultset based on multiple columns.
-     *    Example : rs.compoundsort(['age', 'name']); to sort by age and then name (both ascending)
-     *    Example : rs.compoundsort(['age', ['name', true]); to sort by age (ascending) and then by name (descending)
+    /**
+     * Allows sorting a resultset based on multiple columns.
+     * @example
+     * // to sort by age and then name (both ascending)
+     * rs.compoundsort(['age', 'name']);
+     * // to sort by age (ascending) and then by name (descending)
+     * rs.compoundsort(['age', ['name', true]);
      *
-     * @param {array} properties - array of property names or subarray of [propertyname, isdesc] used evaluate sort order
-     * @returns {Resultset} Reference to this resultset, sorted, for future chain operations.
+     * @param properties - array of property names or subarray of [propertyname, isdesc] used evaluate sort order
+     * @returns Reference to this resultset, sorted, for future chain operations.
      */
-    compoundsort(properties: ([string, boolean] | [string])[]): LokiResultset<E>;
+    public compoundsort(properties: [keyof E, boolean][]): this;
 
-    /** calculateRange() - Binary Search utility method to find range/segment of values matching criteria.
-     *    this is used for collection.find() and first find filter of resultset/dynview
-     *    slightly different than get() binary search in that get() hones in on 1 value,
-     *    but we have to hone in on many (range)
-     * @param {string} op - operation, such as $eq
-     * @param {string} prop - name of property to calculate range for
-     * @param {object} val - value to use for range calculation.
-     * @returns {array} [start, end] index array positions
-     */
-    calculateRange(op: "$eq", prop: string, val: any): [number/*start*/, number/*end*/];
-    calculateRange(op: "$dteq", prop: string, val: any): [number/*start*/, number/*end*/];
-    calculateRange(op: "$gt", prop: string, val: any): [number/*start*/, number/*end*/];
-    calculateRange(op: "$gte", prop: string, val: any): [number/*start*/, number/*end*/];
-    calculateRange(op: "$lt", prop: string, val: any): [number/*start*/, number/*end*/];
-    calculateRange(op: "$lte", prop: string, val: any): [number/*start*/, number/*end*/];
-    calculateRange(op: string, prop: string, val: any): [number/*start*/, number/*end*/];
-
-    /** findOr() - oversee the operation of OR'ed query expressions.
+    /**
+     * findOr() - oversee the operation of OR'ed query expressions.
      *    OR'ed expression evaluation runs each expression individually against the full collection,
      *    and finally does a set OR on each expression's results.
      *    Each evaluation can utilize a binary index to prevent multiple linear array scans.
      *
-     * @param {array} expressionArray - array of expressions
-     * @returns {Resultset} this resultset for further chain ops.
+     * @param expressionArray - array of expressions
+     * @returns this resultset for further chain ops.
      */
-    findOr(expressionArray: LokiQuery[]): LokiResultset<E>;
-    $or(expressionArray: LokiQuery[]): LokiResultset<E>;
+    public findOr(expressionArray: LokiQuery<E>[]): this;
 
-    /** findAnd() - oversee the operation of AND'ed query expressions.
+    public $or: Resultset<E>["findOr"];
+
+    /**
+     * findAnd() - oversee the operation of AND'ed query expressions.
      *    AND'ed expression evaluation runs each expression progressively against the full collection,
      *    internally utilizing existing chained resultset functionality.
      *    Only the first filter can utilize a binary index.
      *
-     * @param {array} expressionArray - array of expressions
-     * @returns {Resultset} this resultset for further chain ops.
+     * @param expressionArray - array of expressions
+     * @returns this resultset for further chain ops.
      */
-    findAnd(expressionArray: LokiQuery[]): LokiResultset<E>;
-    $and(expressionArray: LokiQuery[]): LokiResultset<E>;
+    public findAnd(expressionArray: LokiQuery<E>[]): this;
 
-    /** find() - Used for querying via a mongo-style query object.
+    public $and: Resultset<E>["findAnd"];
+
+    /**
+     * Used for querying via a mongo-style query object.
      *
-     * @param {object} query - A mongo-style query object used for filtering current results.
-     * @param {boolean} firstOnly - (Optional) Used by collection.findOne()
-     * @returns {Resultset} this resultset for further chain ops.
+     * @param query - A mongo-style query object used for filtering current results.
+     * @param firstOnly - (Optional) Used by collection.findOne()
+     * @returns this resultset for further chain ops.
      */
-    //find(query: LokiQuery, firstOnly: boolean): E;
-    //find(query?: any, firstOnly?: boolean): E[];
-    find(query: LokiQuery, firstOnly?: boolean): LokiResultset<E>;
+    public find(query?: LokiQuery<E>, firstOnly?: boolean): this;
 
-    /** where() - Used for filtering via a javascript filter function.
+    /**
+     * where() - Used for filtering via a javascript filter function.
      *
-     * @param {function} fun - A javascript function used for filtering current results by.
-     * @returns {Resultset} this resultset for further chain ops.
+     * @param fun - A javascript function used for filtering current results by.
+     * @returns this resultset for further chain ops.
      */
-    where(fun: (obj: E) => boolean): LokiResultset<E>;
+    public where(fun: (data: E & LokiObj) => boolean): this;
 
-    /** count() - returns the number of documents in the resultset.
+    /**
+     * count() - returns the number of documents in the resultset.
      *
-     * @returns {number} The number of documents in the resultset.
+     * @returns The number of documents in the resultset.
      */
-    count(): number;
+    public count(): number;
 
-    /** data() - Terminates the chain and returns array of filtered documents
+    /**
+     * Terminates the chain and returns array of filtered documents
      *
-     * @param options {object} : allows specifying 'forceClones' and 'forceCloneMethod' options.
-     *    options :
-     *      forceClones {boolean} : Allows forcing the return of cloned objects even when
+     * @param [options] - allows specifying 'forceClones' and 'forceCloneMethod' options.
+     * @param [options.forceClones] - Allows forcing the return of cloned objects even when
      *        the collection is not configured for clone object.
-     *      forceCloneMethod {string} : Allows overriding the default or collection specified cloning method.
-     *        Possible values include 'parse-stringify', 'jquery-extend-deep', and 'shallow'
+     * @param [options.forceCloneMethod] - Allows overriding the default or collection specified cloning method.
+     *        Possible values include 'parse-stringify', 'jquery-extend-deep', 'shallow', 'shallow-assign'
+     * @param [options.removeMeta] - Will force clones and strip $loki and meta properties from documents
      *
-     * @returns {array} Array of documents in the resultset
+     * @returns Array of documents in the resultset
      */
-    data(options?: { forceClones?: string; forceCloneMethod?: string; }): E[];
+    public data(options?: Partial<GetDataOptions>): (E & LokiObj)[];
 
-    /** update() - used to run an update operation on all documents currently in the resultset.
+    /**
+     * Used to run an update operation on all documents currently in the resultset.
      *
-     * @param {function} updateFunction - User supplied updateFunction(obj) will be executed for each document object.
-     * @returns {Resultset} this resultset for further chain ops.
+     * @param updateFunction - User supplied updateFunction(obj) will be executed for each document object.
+     * @returns this resultset for further chain ops.
      */
-    update(updateFunction: (obj: E) => void): LokiResultset<E>;
+    public update(updateFunction: (obj: E) => void): this;
 
-    /** remove() - removes all document objects which are currently in resultset from collection (as well as resultset)
+    /**
+     * Removes all document objects which are currently in resultset from collection (as well as resultset)
      *
-     * @returns {Resultset} this (empty) resultset for further chain ops.
+     * @returns this (empty) resultset for further chain ops.
      */
-    remove(): LokiResultset<E>;
+    public remove(): this;
 
-    /** mapReduce() - data transformation via user supplied functions
+    /**
+     * data transformation via user supplied functions
      *
-     * @param {function} mapFunction - this function accepts a single document for you to transform and return
-     * @param {function} reduceFunction - this function accepts many (array of map outputs) and returns single value
+     * @param mapFunction - this function accepts a single document for you to transform and return
+     * @param reduceFunction - this function accepts many (array of map outputs) and returns single value
      * @returns The output of your reduceFunction
      */
-    mapReduce<T, U>(mapFunction: (value: E, index: number, array: E[]) => T, reduceFunction: (array: T[]) => U): U;
+    public mapReduce<U, R>(mapFunction: (value: E, index: number, array: E[]) => U, reduceFunction: (ary: U[]) => R): R;
 
-    /** eqJoin() - Left joining two sets of data. Join keys can be defined or calculated properties
+    /**
+     * eqJoin() - Left joining two sets of data. Join keys can be defined or calculated properties
      * eqJoin expects the right join key values to be unique.  Otherwise left data will be joined on the last joinData object with that key
-     * @param {Array} joinData - Data array to join to.
-     * @param {String,function} leftJoinKey - Property name in this result set to join on or a function to produce a value to join on
-     * @param {String,function} rightJoinKey - Property name in the joinData to join on or a function to produce a value to join on
-     * @param {function} (optional) mapFun - A function that receives each matching pair and maps them into output objects - function(left,right){return joinedObject}
-     * @returns {Resultset} A resultset with data in the format [{left: leftObj, right: rightObj}]
+     * @param joinData - Data array to join to.
+     * @param leftJoinKey - Property name in this result set to join on or a function to produce a value to join on
+     * @param rightJoinKey - Property name in the joinData to join on or a function to produce a value to join on
+     * @param [mapFun] - (Optional) A function that receives each matching pair and maps them into output objects - function(left,right){return joinedObject}
+     * @param [dataOptions] - options to data() before input to your map function
+     * @param [dataOptions.removeMeta] - allows removing meta before calling mapFun
+     * @param [dataOptions.forceClones] - forcing the return of cloned objects to your map object
+     * @param [dataOptions.forceCloneMethod] - Allows overriding the default or collection specified cloning method.
+     * @returns A resultset with data in the format [{left: leftObj, right: rightObj}]
      */
-    eqJoin<T>(joinData: T[] | LokiResultset<T>, leftJoinKey: string | ((obj: E) => string), rightJoinKey: string | ((obj: T) => string)): LokiResultset<{ left: E; right: T; }>;
-    eqJoin<T, U>(joinData: T[] | LokiResultset<T>, leftJoinKey: string | ((obj: E) => string), rightJoinKey: string | ((obj: T) => string), mapFun?: (a: E, b: T) => U): LokiResultset<U>;
+    public eqJoin(
+        joinData: Collection<any> | Resultset<any> | any[],
+        leftJoinKey: string | ((obj: any) => string),
+        rightJoinKey: string | ((obj: any) => string),
+        mapFun?: (left: any, right: any) => any,
+        dataOptions?: Partial<GetDataOptions>
+    ): Resultset<any>;
 
-    map<T>(mapFun: (currentValue: E, index: number, array: E[]) => T): LokiResultset<T>;
+    /**
+     * Applies a map function into a new collection for further chaining.
+     * @param mapFun - javascript map function
+     * @param [dataOptions] - options to data() before input to your map function
+     * @param [dataOptions.removeMeta] - allows removing meta before calling mapFun
+     * @param [dataOptions.forceClones] - forcing the return of cloned objects to your map object
+     * @param [dataOptions.forceCloneMethod] - Allows overriding the default or collection specified cloning method.
+     */
+    public map<U extends object>(mapFun: (value: E, index: number, array: E[]) => U, dataOptions?: Partial<GetDataOptions>): Resultset<U>;
 }
 
 
 
+interface DynamicViewOptions {
+    persistent: boolean;
+    sortPriority: "active" | "passive";
+    minRebuildInterval: number;
+}
 
-/** DynamicView class is a versatile 'live' view class which can have filters and sorts applied.
+
+/**
+ * DynamicView class is a versatile 'live' view class which can have filters and sorts applied.
  *    Collection.addDynamicView(name) instantiates this DynamicView object and notifies it
  *    whenever documents are add/updated/removed so it can remain up-to-date. (chainable)
  *
- *    Examples:
- *    var mydv = mycollection.addDynamicView('test');  // default is non-persistent
- *    mydv.applyWhere(function(obj) { return obj.name === 'Toyota'; });
- *    mydv.applyFind({ 'doors' : 4 });
- *    var results = mydv.data();
+ * @example
+ * var mydv = mycollection.addDynamicView('test');  // default is non-persistent
+ * mydv.applyFind({ 'doors' : 4 });
+ * mydv.applyWhere(function(obj) { return obj.name === 'Toyota'; });
+ * var results = mydv.data();
  *
+ * @implements LokiEventEmitter
  */
-interface LokiDynamicView<E> extends LokiEventEmitter {
-    cachedresultset: LokiResultset<E>;
-    collection: LokiCollection<E>;
-    events: { [id: string]: ((...args: any[]) => void)[] }; /*{
-        'rebuild': ((...args) => void)[];
-    };*/
-    // keep ordered filter pipeline
-    filterPipeline: LokiFilter<E>[];
-    minRebuildInterval: number;
+declare class DynamicView<E extends object> extends LokiEventEmitter {
     name: string;
-    options: LokiDynamicViewOptions;
-    persistent: boolean;
+    collection: Collection<E>;
     rebuildPending: boolean;
-    resultset: LokiResultset<E>;
-    resultdata: E[];
+    resultset: Resultset<E>;
+    resultdata: (E & LokiObj)[];
     resultsdirty: boolean;
-    // sorting member variables, we only support one active search, applied using applySort() or applySimpleSort()
-    sortFunction: (a: E, b: E) => number;
-    sortCriteria: ([string, boolean] | [string])[];
+    cachedresultset: Resultset<E> | null;
+    filterPipeline: { type: "find" | "where", val: any; uid?: string | number }[];
+    sortFunction: ((a: E & LokiObj, b: E & LokiObj) => number) | null;
+    sortCriteria: [keyof E, boolean][] | null;
     sortDirty: boolean;
-    sortPriority: string; // 'persistentSortPriority', 'passive' (will defer the sort phase until they call data(). most efficient overall), 'active' (will sort async whenever next idle. prioritizes read speeds)
+    options: Partial<DynamicViewOptions>;
 
     /**
-     * @constructor
-     * @param {Collection} collection - A reference to the collection to work against
-     * @param {string} name - The name of this dynamic view
-     * @param {object} options - (Optional) Pass in object with 'persistent' and/or 'sortPriority' options.
+     * @param collection - A reference to the collection to work against
+     * @param name - The name of this dynamic view
+     * @param [options] - (Optional) Pass in object with 'persistent' and/or 'sortPriority' options.
+     * @param [options.persistent=false] - indicates if view is to main internal results array in 'resultdata'
+     * @param [options.sortPriority='passive'] - 'passive' (sorts performed on call to data) or 'active' (after updates)
+     * @param [options.minRebuildInterval] - minimum rebuild interval (need clarification to docs here)
+     * @see {@link Collection#addDynamicView} to construct instances of DynamicView
      */
-    new <E>(collection: LokiCollection<E>, name: string, options?: LokiDynamicViewOptions): LokiDynamicView<E>;
+    constructor(collection: Collection<E>, name: string, options?: Partial<DynamicViewOptions>);
 
-    /** rematerialize() - intended for use immediately after deserialization (loading)
+    /**
+     * rematerialize() - internally used immediately after deserialization (loading)
      *    This will clear out and reapply filterPipeline ops, recreating the view.
      *    Since where filters do not persist correctly, this method allows
      *    restoring the view to state where user can re-apply those where filters.
      *
-     * @param {Object} options - (Optional) allows specification of 'removeWhereFilters' option
-     * @returns {DynamicView} This dynamic view for further chained ops.
+     * @param [options] - (Optional) allows specification of 'removeWhereFilters' option
+     * @returns This dynamic view for further chained ops.
+     * @fires DynamicView.rebuild
      */
-    rematerialize(options?: { removeWhereFilters?: boolean; }): LokiDynamicView<E>;
+    public rematerialize(options?: { removeWhereFilters?: boolean }): this;
 
-    /** branchResultset() - Makes a copy of the internal resultset for branched queries.
+    /**
+     * branchResultset() - Makes a copy of the internal resultset for branched queries.
      *    Unlike this dynamic view, the branched resultset will not be 'live' updated,
      *    so your branched query should be immediately resolved and not held for future evaluation.
      *
-     * @param {string|array} transform: Optional name of collection transform, or an array of transform steps
-     * @param {object} parameters: optional parameters (if optional transform requires them)
-     * @returns {Resultset} A copy of the internal resultset for branched queries.
+     * @param transform - Optional name of collection transform, or an array of transform steps
+     * @param [parameters] - optional parameters (if optional transform requires them)
+     * @returns A copy of the internal resultset for branched queries.
      */
-    branchResultset(transform?: string | any[], parameters?: any): LokiResultset<E>;
+    public branchResultset(transform: string | string[] | Transform[], parameters?: object): Resultset<any>;
 
-    /** toJSON() - Override of toJSON to avoid circular references
+    /**
+     * toJSON() - Override of toJSON to avoid circular references
      */
-    toJSON(): LokiDynamicView<E>;
+    public toJSON(): DynamicView<E>;
 
-    /** removeFilters() - Used to clear pipeline and reset dynamic view to initial state.
+    /**
+     * removeFilters() - Used to clear pipeline and reset dynamic view to initial state.
      *     Existing options should be retained.
+     * @param [options] - configure removeFilter behavior
+     * @param [options.queueSortPhase] - (default: false) if true we will async rebuild view (maybe set default to true in future?)
      */
-    removeFilters(): void;
+    public removeFilters(options?: { queueSortPhase?: boolean }): void;
 
-    /** applySort() - Used to apply a sort to the dynamic view
+    /**
+     * applySort() - Used to apply a sort to the dynamic view
+     * @example
+     * dv.applySort(function(obj1, obj2) {
+     *   if (obj1.name === obj2.name) return 0;
+     *   if (obj1.name > obj2.name) return 1;
+     *   if (obj1.name < obj2.name) return -1;
+     * });
      *
-     * @param {function} comparefun - a javascript compare function used for sorting
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @param comparefun - a javascript compare function used for sorting
+     * @returns this DynamicView object, for further chain ops.
      */
-    applySort(comparefun: (a: E, b: E) => number): LokiDynamicView<E>;
+    public applySort(comparefun: (a: E & LokiObj, b: E & LokiObj) => number): this;
 
-    /** applySimpleSort() - Used to specify a property used for view translation.
+    /**
+     * applySimpleSort() - Used to specify a property used for view translation.
+     * @example
+     * dv.applySimpleSort("name");
      *
-     * @param {string} propname - Name of property by which to sort.
-     * @param {boolean} isdesc - (Optional) If true, the sort will be in descending order.
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @param propname - Name of property by which to sort.
+     * @param [isdesc] - (Optional) If true, the sort will be in descending order.
+     * @returns this DynamicView object, for further chain ops.
      */
-    applySimpleSort(propname: string, isdesc?: boolean): LokiDynamicView<E>;
+    public applySimpleSort(propname: keyof E, isdesc?: boolean): this;
 
-    /** applySortCriteria() - Allows sorting a resultset based on multiple columns.
-     *    Example : dv.applySortCriteria(['age', 'name']); to sort by age and then name (both ascending)
-     *    Example : dv.applySortCriteria(['age', ['name', true]); to sort by age (ascending) and then by name (descending)
-     *    Example : dv.applySortCriteria(['age', true], ['name', true]); to sort by age (descending) and then by name (descending)
+    /**
+     * applySortCriteria() - Allows sorting a resultset based on multiple columns.
+     * @example
+     * // to sort by age and then name (both ascending)
+     * dv.applySortCriteria(['age', 'name']);
+     * // to sort by age (ascending) and then by name (descending)
+     * dv.applySortCriteria(['age', ['name', true]);
+     * // to sort by age (descending) and then by name (descending)
+     * dv.applySortCriteria(['age', true], ['name', true]);
      *
-     * @param {array} properties - array of property names or subarray of [propertyname, isdesc] used evaluate sort order
-     * @returns {DynamicView} Reference to this DynamicView, sorted, for future chain operations.
+     * @param criteria - array of property names or subarray of [propertyname, isdesc] used evaluate sort order
+     * @returns Reference to this DynamicView, sorted, for future chain operations.
      */
-    applySortCriteria(criteria: ([string, boolean] | [string])[]): LokiDynamicView<E>;
+    public applySortCriteria(criteria: [keyof E, boolean][]): this;
 
-    /** startTransaction() - marks the beginning of a transaction.
+    /**
+     * startTransaction() - marks the beginning of a transaction.
      *
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @returns this DynamicView object, for further chain ops.
      */
-    startTransaction(): LokiDynamicView<E>;
+    public startTransaction(): this;
 
-    /** commit() - commits a transaction.
+    /**
+     * commit() - commits a transaction.
      *
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @returns this DynamicView object, for further chain ops.
      */
-    commit(): LokiDynamicView<E>;
+    public commit(): this;
 
-    /** rollback() - rolls back a transaction.
+    /**
+     * rollback() - rolls back a transaction.
      *
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @returns this DynamicView object, for further chain ops.
      */
-    rollback(): LokiDynamicView<E>;
+    public rollback(): this;
 
-    /** Implementation detail.
+    /**
+     * Implementation detail.
      * _indexOfFilterWithId() - Find the index of a filter in the pipeline, by that filter's ID.
      *
-     * @param {string|number} uid - The unique ID of the filter.
-     * @returns {number}: index of the referenced filter in the pipeline; -1 if not found.
+     * @param [uid] - The unique ID of the filter.
+     * @returns index of the referenced filter in the pipeline; -1 if not found.
      */
-    _indexOfFilterWithId(uid: string | number): number;
+    public _indexOfFilterWithId(uid?: string | number): number;
 
-    /** Implementation detail.
+    /**
+     * Implementation detail.
      * _addFilter() - Add the filter object to the end of view's filter pipeline and apply the filter to the resultset.
      *
-     * @param {object} filter - The filter object. Refer to applyFilter() for extra details.
+     * @param filter - The filter object. Refer to applyFilter() for extra details.
      */
-    _addFilter(filter: LokiFilter<E>): void;
+    public _addFilter(filter: { type: "find" | "where", val: any; uid?: string | number }): void;
 
-    /** reapplyFilters() - Reapply all the filters in the current pipeline.
+    /**
+     * reapplyFilters() - Reapply all the filters in the current pipeline.
      *
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @returns this DynamicView object, for further chain ops.
      */
-    reapplyFilters(): LokiDynamicView<E>;
+    public reapplyFilters(): this;
 
-    /** applyFilter() - Adds or updates a filter in the DynamicView filter pipeline
+    /**
+     * applyFilter() - Adds or updates a filter in the DynamicView filter pipeline
      *
-     * @param {object} filter - A filter object to add to the pipeline.
+     * @param filter - A filter object to add to the pipeline.
      *    The object is in the format { 'type': filter_type, 'val', filter_param, 'uid', optional_filter_id }
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @returns this DynamicView object, for further chain ops.
      */
-    applyFilter(filter: LokiFilter<E>): LokiDynamicView<E>;
+    public applyFilter(filter: { type: "find" | "where", val: any; uid?: string | number }): this;
 
-    /** applyFind() - Adds or updates a mongo-style query option in the DynamicView filter pipeline
+    /**
+     * applyFind() - Adds or updates a mongo-style query option in the DynamicView filter pipeline
      *
-     * @param {object} query - A mongo-style query object to apply to pipeline
-     * @param {string|number} uid - Optional: The unique ID of this filter, to reference it in the future.
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @param query - A mongo-style query object to apply to pipeline
+     * @param [uid] - Optional: The unique ID of this filter, to reference it in the future.
+     * @returns this DynamicView object, for further chain ops.
      */
-    applyFind(query: LokiQuery, uid?: string | number): LokiDynamicView<E>;
+    public applyFind(query: any, uid?: string | number): this;
 
-    /** applyWhere() - Adds or updates a javascript filter function in the DynamicView filter pipeline
+    /**
+     * applyWhere() - Adds or updates a javascript filter function in the DynamicView filter pipeline
      *
-     * @param {function} fun - A javascript filter function to apply to pipeline
-     * @param {string|number} uid - Optional: The unique ID of this filter, to reference it in the future.
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @param fun - A javascript filter function to apply to pipeline
+     * @param [uid] - Optional: The unique ID of this filter, to reference it in the future.
+     * @returns this DynamicView object, for further chain ops.
      */
-    applyWhere(fun: (obj: E) => boolean, uid?: string | number): LokiDynamicView<E>;
+    public applyWhere(fun: (obj: any) => boolean, uid?: string | number): this;
 
-    /** removeFilter() - Remove the specified filter from the DynamicView filter pipeline
+    /**
+     * removeFilter() - Remove the specified filter from the DynamicView filter pipeline
      *
-     * @param {string|number} uid - The unique ID of the filter to be removed.
-     * @returns {DynamicView} this DynamicView object, for further chain ops.
+     * @param uid - The unique ID of the filter to be removed.
+     * @returns this DynamicView object, for further chain ops.
      */
-    removeFilter(uid: string | number): LokiDynamicView<E>;
+    public removeFilter(uid: string | number): this;
 
-    /** count() - returns the number of documents representing the current DynamicView contents.
+    /**
+     * count() - returns the number of documents representing the current DynamicView contents.
      *
-     * @returns {number} The number of documents representing the current DynamicView contents.
+     * @returns The number of documents representing the current DynamicView contents.
      */
-    count(): number;
+    public count(): number;
 
-    /** data() - resolves and pending filtering and sorting, then returns document array as result.
+    /**
+     * data() - resolves and pending filtering and sorting, then returns document array as result.
      *
-     * @returns {array} An array of documents representing the current DynamicView contents.
+     * @param [options] - optional parameters to pass to resultset.data() if non-persistent
+     * @param [options.forceClones] - Allows forcing the return of cloned objects even when
+     *        the collection is not configured for clone object.
+     * @param [options.forceCloneMethod] - Allows overriding the default or collection specified cloning method.
+     *        Possible values include 'parse-stringify', 'jquery-extend-deep', 'shallow', 'shallow-assign'
+     * @param [options.removeMeta] - Will force clones and strip $loki and meta properties from documents
+     * @returns An array of documents representing the current DynamicView contents.
      */
-    data(): E[];
+    public data(options?: Partial<GetDataOptions>): (E & LokiObj)[];
 
-    /** queueRebuildEvent() - When the view is not sorted we may still wish to be notified of rebuild events.
+    /**
+     * queueRebuildEvent() - When the view is not sorted we may still wish to be notified of rebuild events.
      *     This event will throttle and queue a single rebuild event when batches of updates affect the view.
      */
-    queueRebuildEvent(): void;
+    public queueRebuildEvent(): void;
 
-    /** queueSortPhase : If the view is sorted we will throttle sorting to either :
+    /**
+     * queueSortPhase : If the view is sorted we will throttle sorting to either :
      *    (1) passive - when the user calls data(), or
      *    (2) active - once they stop updating and yield js thread control
      */
-    queueSortPhase(): void;
+    public queueSortPhase(): void;
 
-    /** performSortPhase() - invoked synchronously or asynchronously to perform final sort phase (if needed)
+    /**
+     * performSortPhase() - invoked synchronously or asynchronously to perform final sort phase (if needed)
      */
-    performSortPhase(options?: { suppressRebuildEvent?: boolean; }): void;
+    public performSortPhase(options?: { persistent?: boolean; suppressRebuildEvent?: boolean }): void;
 
-    /** evaluateDocument() - internal method for (re)evaluating document inclusion.
+    /**
+     * evaluateDocument() - internal method for (re)evaluating document inclusion.
      *    Called by : collection.insert() and collection.update().
      *
-     * @param {int} objIndex - index of document to (re)run through filter pipeline.
-     * @param {bool} isNew - true if the document was just added to the collection.
+     * @param objIndex - index of document to (re)run through filter pipeline.
+     * @param [isNew] - true if the document was just added to the collection.
      */
-    evaluateDocument(objIndex: number, isNew?: boolean): void;
+    public evaluateDocument(objIndex: number | string, isNew?: boolean): void;
 
-    /** removeDocument() - internal function called on collection.delete()
+
+    /**
+     * removeDocument() - internal function called on collection.delete()
      */
-    removeDocument(objIndex: number): void;
+    public removeDocument(objIndex: number | string): void;
 
-    /** mapReduce() - data transformation via user supplied functions
+    /**
+     * mapReduce() - data transformation via user supplied functions
      *
-     * @param {function} mapFunction - this function accepts a single document for you to transform and return
-     * @param {function} reduceFunction - this function accepts many (array of map outputs) and returns single value
+     * @param mapFunction - this function accepts a single document for you to transform and return
+     * @param reduceFunction - this function accepts many (array of map outputs) and returns single value
      * @returns The output of your reduceFunction
      */
-    mapReduce<T, U>(mapFunction: (item: E, index: number, array: E[]) => T, reduceFunction: (array: T[]) => U): U;
+    public mapReduce<U, R>(mapFunction: (value: E, index: number, array: E[]) => U, reduceFunction: (ary: U[]) => R): R;
 }
 
 
 
-
-/** Collection class that handles documents of same type
- */
-interface LokiCollection<E> extends LokiEventEmitter {
-    // option to observe objects and update them automatically, ignored if Object.observe is not supported
-    autoupdate: boolean;
-    // option to make event listeners async, default is sync
-    asyncListeners: boolean;
-    binaryIndices: { [id: string]: { name: string; dirty: boolean; values: number[] } };
-
-    cachedIndex: number[];
-    cachedBinaryIndex: { [id: string]: { name: string; dirty: boolean; values: number[] } };
-    cachedData: E[];
-    // changes are tracked by collection and aggregated by the db
-    changes: LokiCollectionChange[];
-    // default clone method (if enabled) is parse-stringify
-    cloneMethod: string; // 'parse-stringify'
-    // options to clone objects when inserting them
-    cloneObjects: boolean;
-    console: {
-        log: () => void;
-        warn: () => void;
-        error: () => void;
-    };
-    constraints: {
-        unique: { [id: string]: LokiUniqueIndex<E> };
-        exact: { [id: string]: LokiExactIndex<E> };
-    };
-    data: E[];
-    // in autosave scenarios we will use collection level dirty flags to determine whether save is needed.
-    // currently, if any collection is dirty we will autosave the whole database if autosave is configured.
-    // defaulting to true since this is called from addCollection and adding a collection should trigger save
-    dirty: boolean;
-    // disable track changes
-    disableChangesApi: boolean;
-    DynamicViews: LokiDynamicView<E>[];
-    events: { [id: string]: ((...args: any[]) => void)[] }; /*{
-        'insert': ((...args) => void)[];
-        'update': ((...args) => void)[];
-        'pre-insert': ((...args) => void)[];
-        'pre-update': ((...args) => void)[];
-        'close': ((...args) => void)[];
-        'flushbuffer': ((...args) => void)[];
-        'error': ((...args) => void)[];
-        'delete': ((...args) => void)[];
-        'warning': ((...args) => void)[];
-    };*/
-    idIndex: number[];
-    maxId: number; // currentMaxId - change manually at your own peril!
+interface BinaryIndex {
     name: string;
-    // is collection transactional
+    dirty: boolean;
+    values: number[];
+}
+
+
+interface CollectionOptions<E> {
+    disableChangesApi: boolean;
+    disableDeltaChangesApi: boolean;
+    adaptiveBinaryIndices: boolean;
+    asyncListeners: boolean;
+    autoupdate: boolean;
+    clone: boolean;
+    cloneMethod: ("parse-stringify" | "jquery-extend-deep" | "shallow" | "shallow-assign" | "shallow-recurse-objects");
+    serializableIndices: boolean;
     transactional: boolean;
+    ttl: number;
+    ttlInterval: number;
+    exact: (keyof E)[];
+    unique: (keyof E)[];
+    indices: (keyof E) | (keyof E)[];
+}
+
+
+interface CollectionChange {
+    name: string;
+    operation: string;
+    obj: any;
+}
+
+
+/**
+ * Collection class that handles documents of same type
+ * @implements LokiEventEmitter
+ * @see {@link Loki#addCollection} for normal creation of collections
+ */
+declare class Collection<E extends object> extends LokiEventEmitter {
+    name: string;
     objType: string;
-    // transforms will be used to store frequently used query chains as a series of steps
-    // which itself can be stored along with the database.
-    transforms: { [id: string]: any };
-    // unique contraints contain duplicate object references, so they are not persisted.
-    // we will keep track of properties which have unique contraint applied here, and regenerate on load
-    uniqueNames: string[];
+    data: E[];
+    adaptiveBinaryIndices: boolean;
+    asyncListeners: boolean;
+    autoupdate: boolean;
+    dirty: boolean;
+    binaryIndices: { [P in keyof E]: BinaryIndex };
+    cachedIndex: number[] | null;
+    cachedBinaryIndex: { [P in keyof E]: BinaryIndex } | null;
+    cachedData: E[] | null;
+    changes: CollectionChange[];
+    cloneMethod: ("parse-stringify" | "jquery-extend-deep" | "shallow" | "shallow-assign" | "shallow-recurse-objects") | null;
+    cloneObjects: boolean;
+    constraints: {
+        unique: { [P in keyof E]: UniqueIndex<E> };
+        exact: { [P in keyof E]: ExactIndex<E> }
+    };
+    disableChangesApi: boolean;
+    disableDeltaChangesApi: boolean;
+    DynamicViews: DynamicView<object>[];
+    idIndex: number[];
+    ttl: { age: any; ttlInterval: any; daemon: any; };
+    maxId: number;
+    uniqueNames: (keyof E)[];
+    transforms: { [name: string]: Transform[] };
+    serializableIndices: boolean;
+    transactional: boolean;
+    observerCallback: (changes: { object: any }[]) => void;
+    getChanges: () => CollectionChange[];
+    flushChanges: () => void;
+    getChangeDelta: (obj: any, old?: any) => any;
+    getObjectDelta: (oldObject: any, newObject?: any) => any;
+    setChangesApi: (enabled?: boolean) => void;
 
-    options: LokiCollectionOptions;
 
-    // option to activate a cleaner daemon - clears "aged" documents at set intervals.
-    ttl: {
-        age: number;
-        ttlInterval: number;
-        daemon: number;
+    /**
+     * @param name - collection name
+     * @param [options] - (optional) configuration object
+     * @param [options.unique=[]] - array of property names to define unique constraints for
+     * @param [options.exact=[]] - array of property names to define exact constraints for
+     * @param [options.indices=[]] - array property names to define binary indexes for
+     * @param [options.adaptiveBinaryIndices=true] - collection indices will be actively rebuilt rather than lazily
+     * @param [options.asyncListeners=false] - whether listeners are invoked asynchronously
+     * @param [options.disableChangesApi=true] - set to false to enable Changes API
+     * @param [options.disableDeltaChangesApi=true] - set to false to enable Delta Changes API (requires Changes API, forces cloning)
+     * @param [options.autoupdate=false] - use Object.observe to update objects automatically
+     * @param [options.clone=false] - specify whether inserts and queries clone to/from user
+     * @param [options.serializableIndices=true[]] - converts date values on binary indexed properties to epoch time
+     * @param [options.cloneMethod='parse-stringify'] - 'parse-stringify', 'jquery-extend-deep', 'shallow', 'shallow-assign'
+     * @param options.ttlInterval - time interval for clearing out 'aged' documents; not set by default.
+     * @see {@link Loki#addCollection} for normal creation of collections
+     */
+    constructor(name: string, options?: Partial<CollectionOptions<E>>);
+
+    public console: {
+        log(...args: any[]): void;
+        warn(...args: any[]): void;
+        error(...args: any[]): void;
     };
 
-    /** Collection class that handles documents of same type
-     * @constructor
-     * @param {string} collection name
-     * @param {array} array of property names to be indicized
-     * @param {object} configuration object
+    public addAutoUpdateObserver(obj: any): void;
+
+    public removeAutoUpdateObserver(obj: any): void;
+
+    /**
+     * Adds a named collection transform to the collection
+     * @param name - name to associate with transform
+     * @param transform - an array of transformation 'step' objects to save into the collection
+     * @example
+     * users.addTransform('progeny', [
+     *   {
+     *     type: 'find',
+     *     value: {
+     *       'age': {'$lte': 40}
+     *     }
+     *   }
+     * ]);
+     *
+     * var results = users.chain('progeny').data();
      */
-    new <E>(name: string, options?: LokiCollectionOptions): LokiCollection<E>;
+    public addTransform(name: string, transform: Transform[]): void;
 
-    getChanges(): LokiCollectionChange[];
+    /**
+     * Retrieves a named transform from the collection.
+     * @param name - name of the transform to lookup.
+     */
+    public getTransform(name: string): Transform[];
 
-    setChangesApi(enabled: boolean): void;
+    /**
+     * Updates a named collection transform to the collection
+     * @param name - name to associate with transform
+     * @param transform - a transformation object to save into collection
+     */
+    public setTransform(name: string, transform: Transform[]): void;
 
-    flushChanges(): void;
+    /**
+     * Removes a named collection transform from the collection
+     * @param name - name of collection transform to remove
+     */
+    public removeTransform(name: string): void;
 
-    observerCallback: (changes: { object: any }[]) => void;
+    public byExample(template: object): { $and: any[] };
 
-    addAutoUpdateObserver(object: any): void;
+    public findObject(template: object): E | null;
 
-    removeAutoUpdateObserver(object: any): void;
-
-    addTransform(name: string, transform: any): void;
-
-    setTransform(name: string, transform: any): void;
-
-    removeTransform(name: string): void;
-
-    byExample(template: any): { '$and': any[] };
-
-    findObject(template: any): E;
-
-    findObjects(template: any): E[];
+    public findObjects(template: object): E[];
 
     /*----------------------------+
     | TTL daemon                  |
     +----------------------------*/
-    ttlDaemonFuncGen(): () => void;
+    public ttlDaemonFuncGen(): () => void;
 
-    setTTL(age: number, interval: number): void;
+    /**
+     * Updates or applies collection TTL settings.
+     * @param age - age (in ms) to expire document from collection
+     * @param interval - time (in ms) to clear collection of aged documents.
+     */
+    public setTTL(age: number, interval: number): void;
 
     /*----------------------------+
     | INDEXING                    |
@@ -857,711 +1434,575 @@ interface LokiCollection<E> extends LokiEventEmitter {
     /**
      * create a row filter that covers all documents in the collection
      */
-    prepareFullDocIndex(): number[];
+    public prepareFullDocIndex(): number[];
 
-    /** Ensure binary index on a certain field
+    /**
+     * Will allow reconfiguring certain collection options.
+     * @param [options.adaptiveBinaryIndices] - collection indices will be actively rebuilt rather than lazily
      */
-    ensureIndex(property: string, force?: boolean): void;
+    public configureOptions(options?: { adaptiveBinaryIndices?: boolean }): void;
 
-    ensureUniqueIndex(field: string): LokiUniqueIndex<E>;
-
-    /** Ensure all binary indices
+    /**
+     * Ensure binary index on a certain field
+     * @param property - name of property to create binary index on
+     * @param [force] - (Optional) flag indicating whether to construct index immediately
      */
-    ensureAllIndexes(force?: boolean): void;
+    public ensureIndex(property: keyof E, force?: boolean): void;
 
-    flagBinaryIndexesDirty(): void;
+    public getSequencedIndexValues(property: string): string;
 
-    flagBinaryIndexDirty(index: string): void;
+    public ensureUniqueIndex(field: keyof E): UniqueIndex<E>;
 
-    count(query?: LokiQuery): number;
-
-    /** Rebuild idIndex
+    /**
+     * Ensure all binary indices
      */
-    ensureId(): void;
+    public ensureAllIndexes(force?: boolean): void;
 
-    /** Rebuild idIndex async with callback - useful for background syncing with a remote server
+    public flagBinaryIndexesDirty(): void;
+
+    public flagBinaryIndexDirty(index: string): void;
+
+    /**
+     * Quickly determine number of documents in collection (or query)
+     * @param [query] - (optional) query object to count results of
+     * @returns number of documents in the collection
      */
-    ensureIdAsync(callback: () => void): void;
+    public count(query?: LokiQuery<E & LokiObj>): number;
 
-    /** Each collection maintains a list of DynamicViews associated with it
+    /**
+     * Rebuild idIndex
+     */
+    public ensureId(): void;
+
+    /**
+     * Rebuild idIndex async with callback - useful for background syncing with a remote server
+     */
+    public ensureIdAsync(callback: () => void): void;
+
+    /**
+     * Add a dynamic view to the collection
+     * @param name - name of dynamic view to add
+     * @param [options] - options to configure dynamic view with
+     * @param [options.persistent=false] - indicates if view is to main internal results array in 'resultdata'
+     * @param [options.sortPriority='passive'] - 'passive' (sorts performed on call to data) or 'active' (after updates)
+     * @param options.minRebuildInterval - minimum rebuild interval (need clarification to docs here)
+     * @returns reference to the dynamic view added
+     * @example
+     * var pview = users.addDynamicView('progeny');
+     * pview.applyFind({'age': {'$lte': 40}});
+     * pview.applySimpleSort('name');
+     *
+     * var results = pview.data();
+     */
+    public addDynamicView(name: string, options?: Partial<DynamicViewOptions>): DynamicView<E>;
+
+    /**
+     * Remove a dynamic view from the collection
+     * @param name - name of dynamic view to remove
      **/
-    addDynamicView(name: string, options?: LokiDynamicViewOptions): LokiDynamicView<E>;
+    public removeDynamicView(name: string): void;
 
-    removeDynamicView(name: string): void;
+    /**
+     * Look up dynamic view reference from within the collection
+     * @param name - name of dynamic view to retrieve reference of
+     * @returns A reference to the dynamic view with that name
+     **/
+    public getDynamicView(name: string): DynamicView<any> | null;
 
-    getDynamicView(name: string): LokiDynamicView<E>;
-
-    /** find and update: pass a filtering function to select elements to be updated
-     * and apply the updatefunctino to those elements iteratively
+    /**
+     * Applies a 'mongo-like' find query object and passes all results to an update function.
+     * For filter function querying you should migrate to [updateWhere()]{@link Collection#updateWhere}.
+     *
+     * @param filterObject - 'mongo-like' query object (or deprecated filterFunction mode)
+     * @param updateFunction - update function to run against filtered documents
      */
-    findAndUpdate(filterFunction: (obj: E) => boolean, updateFunction: (obj: E) => E): void;
+    public findAndUpdate(filterObject: ((data: E) => boolean) | LokiQuery<E & LokiObj>, updateFunction: (obj: E & LokiObj) => any): void;
 
-    /** generate document method - ensure object(s) have meta properties, clone it if necessary, etc.
-     * @param {object} doc: the document to be inserted (or an array of objects)
-     * @returns document or documents (if passed an array of objects)
+    /**
+     * Applies a 'mongo-like' find query object removes all documents which match that filter.
+     *
+     * @param filterObject - 'mongo-like' query object
      */
-    insert(doc: E): E;
-    insert(doc: E[]): E[];
+    public findAndRemove(filterObject?: LokiQuery<E & LokiObj>): void;
 
-    /** generate document method - ensure object has meta properties, clone it if necessary, etc.
-     * @param {object} the document to be inserted
+    /**
+     * Adds object(s) to collection, ensure object(s) have meta properties, clone it if necessary, etc.
+     * @param doc - the document (or array of documents) to be inserted
+     * @returns document or documents inserted
+     * @example
+     * users.insert({
+     *     name: 'Odin',
+     *     age: 50,
+     *     address: 'Asgard'
+     * });
+     *
+     * // alternatively, insert array of documents
+     * users.insert([{ name: 'Thor', age: 35}, { name: 'Loki', age: 30}]);
+     */
+    public insert(doc: E): E | undefined;
+    public insert(doc: E[]): E[] | undefined;
+    public insert(doc: E | E[]): E | E[] | undefined;
+    public insert(doc: E | E[]): E | E[] | undefined;
+
+    /**
+     * Adds a single object, ensures it has meta properties, clone it if necessary, etc.
+     * @param doc - the document to be inserted
+     * @param [bulkInsert] - quiet pre-insert and insert event emits
      * @returns document or 'undefined' if there was a problem inserting it
      */
-    insertOne(doc: E): E;
+    public insertOne(doc: E, bulkInsert?: boolean): (E & LokiObj) | undefined;
 
-    clear(): void;
-
-    /** Update method
+    /**
+     * Empties the collection.
+     * @param [options] - configure clear behavior
+     * @param [options.removeIndices] - (default: false)
      */
-    update(doc: E): E;
-    update(doc: E[]): void;
+    public clear(options?: { removeIndices?: boolean }): void;
 
-    /** Add object to collection
+    /**
+     * Updates an object and notifies collection that the document has changed.
+     * @param doc - document to update within the collection
      */
-    add(obj: E): E;
+    public update(doc: E): E;
+    public update(doc: E[]): void;
+    public update(doc: E | E[]): E | void;
+    public update(doc: E | E[]): E | void;
 
-    removeWhere(query: ((obj: E) => boolean) | LokiQuery): void;
-
-    removeDataOnly(): void;
-
-    /** delete wrapped
+    /**
+     * Add object to collection
      */
-    remove(doc: E): E;
-    remove(doc: number): E;
-    remove(doc: number[]): void;
-    remove(doc: E[]): void;
+    public add(obj: E): E & LokiObj;
+    public add(obj: E & LokiObj): E & LokiObj;
+
+    /**
+     * Applies a filter function and passes all results to an update function.
+     *
+     * @param filterFunction - filter function whose results will execute update
+     * @param updateFunction - update function to run against filtered documents
+     */
+    public updateWhere(filterFunction: (data: E) => boolean, updateFunction: (obj: E & LokiObj) => any): void;
+
+    /**
+     * Remove all documents matching supplied filter function.
+     * For 'mongo-like' querying you should migrate to [findAndRemove()]{@link Collection#findAndRemove}.
+     * @param query - query object to filter on
+     */
+    public removeWhere(query: ((value: E, index: number, array: E[]) => boolean) | LokiQuery<E & LokiObj>): void;
+
+    public removeDataOnly(): void;
+
+    /**
+     * Remove a document from the collection
+     * @param doc - document to remove from collection
+     */
+    public remove(doc: number | E): E | null;
+    public remove(doc: number[] | E[]): void;
+    public remove(doc: number | E | number[] | E[]): E | null | void;
+    public remove(doc: number | E | number[] | E[]): E | null | void;
 
     /*---------------------+
     | Finding methods     |
     +----------------------*/
 
-    /** Get by Id - faster than other methods because of the searching algorithm
+    /**
+     * Get by Id - faster than other methods because of the searching algorithm
+     * @param id - $loki id of document you want to retrieve
+     * @param returnPosition - if 'true' we will return [object, position]
+     * @returns Object reference if document was found, null if not,
+     *     or an array if 'returnPosition' was passed.
      */
-    get(id: number | string): E;
-    get(id: number | string, returnPosition?: boolean): E | [E, number];
+    public get(id: number): E & LokiObj;
+    public get(id: number, returnPosition: true): [E & LokiObj, number];
+    public get(id: number, returnPosition?: boolean): (E & LokiObj) | [E & LokiObj, number] | null;
 
-    by(field: string): (value: any) => E;
-    by(field: string, value: string): E;
-
-    /** Find one object by index property, by property equal to value
+    /**
+     * Perform binary range lookup for the data[dataPosition][binaryIndexName] property value
+     *    Since multiple documents may contain the same value (which the index is sorted on),
+     *    we hone in on range and then linear scan range to find exact index array position.
+     * @param dataPosition : coll.data array index/position
+     * @param binaryIndexName : index to search for dataPosition in
      */
-    findOne(query: LokiQuery): E;
+    public getBinaryIndexPosition(dataPosition: number, binaryIndexName: keyof E): number | null;
 
-    /** Chain method, used for beginning a series of chained find() and/or view() operations
+    /**
+     * Adaptively insert a selected item to the index.
+     * @param dataPosition : coll.data array index/position
+     * @param binaryIndexName : index to search for dataPosition in
+     */
+    public adaptiveBinaryIndexInsert(dataPosition: number, binaryIndexName: keyof E): void;
+
+    /**
+     * Adaptively update a selected item within an index.
+     * @param dataPosition : coll.data array index/position
+     * @param binaryIndexName : index to search for dataPosition in
+     */
+    public adaptiveBinaryIndexUpdate(dataPosition: number, binaryIndexName: keyof E): void;
+
+    /**
+     * Adaptively remove a selected item from the index.
+     * @param dataPosition : coll.data array index/position
+     * @param binaryIndexName : index to search for dataPosition in
+     */
+    public adaptiveBinaryIndexRemove(dataPosition: number, binaryIndexName: keyof E, removedFromIndexOnly?: boolean): void;
+
+    /**
+     * Internal method used for index maintenance and indexed searching.
+     * Calculates the beginning of an index range for a given value.
+     * For index maintainance (adaptive:true), we will return a valid index position to insert to.
+     * For querying (adaptive:false/undefined), we will :
+     *    return lower bound/index of range of that value (if found)
+     *    return next lower index position if not found (hole)
+     * If index is empty it is assumed to be handled at higher level, so
+     * this method assumes there is at least 1 document in index.
+     *
+     * @param prop - name of property which has binary index
+     * @param val - value to find within index
+     * @param [adaptive] - if true, we will return insert position
+     */
+    public calculateRangeStart(prop: keyof E, val: any, adaptive?: boolean): number;
+
+    /**
+     * Internal method used for indexed $between.  Given a prop (index name), and a value
+     * (which may or may not yet exist) this will find the final position of that upper range value.
+     */
+    public calculateRangeEnd(prop: keyof E, val: any): number;
+
+    /**
+     * calculateRange() - Binary Search utility method to find range/segment of values matching criteria.
+     *    this is used for collection.find() and first find filter of resultset/dynview
+     *    slightly different than get() binary search in that get() hones in on 1 value,
+     *    but we have to hone in on many (range)
+     * @param op - operation, such as $eq
+     * @param prop - name of property to calculate range for
+     * @param val - value to use for range calculation.
+     * @returns [start, end] index array positions
+     */
+    public calculateRange(op: ("$eq" | "$aeq" | "$dteq" | "$gt" | "$gte" | "$lt" | "$lte" | "$between" | "$in"), prop: keyof E, val: any): number[];
+
+    /**
+     * Retrieve doc by Unique index
+     * @param field - name of uniquely indexed property to use when doing lookup
+     * @param value - unique value to search for
+     * @returns document matching the value passed
+     */
+    public by(field: keyof E): (value: any) => E | undefined;
+    public by(field: keyof E, value: any): E | undefined;
+    public by(field: keyof E, value?: any): E | ((value: any) => E | undefined) | undefined;
+    public by(field: keyof E, value?: any): E | ((value: any) => E | undefined) | undefined;
+
+    /**
+     * Find one object by index property, by property equal to value
+     * @param query - query object used to perform search with
+     * @returns First matching document, or null if none
+     */
+    public findOne(query?: LokiQuery<E & LokiObj>): (E & LokiObj) | null;
+
+    /**
+     * Chain method, used for beginning a series of chained find() and/or view() operations
      * on a collection.
      *
-     * @param {array} transform : Ordered array of transform step objects similar to chain
-     * @param {object} parameters: Object containing properties representing parameters to substitute
-     * @returns {Resultset} : (or data array if any map or join functions where called)
+     * @param [transform] - Ordered array of transform step objects similar to chain
+     * @param [parameters] - Object containing properties representing parameters to substitute
+     * @returns (this) resultset, or data array if any map or join functions where called
      */
-    chain(transform?: string | any[], parameters?: any): LokiResultset<E>;
+    public chain(): Resultset<E & LokiObj>;
+    public chain(transform?: string | string[] | Transform[], parameters?: object): Resultset<any>;
 
     /**
-     * Find method, api is similar to mongodb except for now it only supports one search parameter.
-     * for more complex queries use view() and storeView()
+     * Find method, api is similar to mongodb.
+     * for more complex queries use [chain()]{@link Collection#chain} or [where()]{@link Collection#where}.
+     * @example {@tutorial Query Examples}
+     * @param query - 'mongo-like' query object
+     * @returns Array of matching documents
      */
-    find(): E[];
-    find(query: LokiQuery): LokiResultset<E>;
+    public find(query?: LokiQuery<E & LokiObj>): (E & LokiObj)[];
 
-    /** Find object by unindexed field by property equal to value,
+    /**
+     * Find object by unindexed field by property equal to value,
      * simply iterates and returns the first element matching the query
      */
-    findOneUnindexed(prop: string, value: any): E;
-
-    /** Transaction methods */
-
-    /** start the transation */
-    startTransaction(): void;
-
-    /** commit the transation */
-    commit(): void;
-
-    /** roll back the transation */
-    rollback(): void;
-
-    // async executor. This is only to enable callbacks at the end of the execution.
-    async(fun: () => void, callback: () => void): void;
-
-    /** Create view function - filter
-     */
-    where(fun: (obj: E) => boolean): LokiResultset<E>;
-
-    /** Map Reduce
-     */
-    mapReduce<U, V>(mapFunction: (item: E, index: number, array: E[]) => U, reduceFunction: (array: U[]) => V): V;
-
-    /** eqJoin - Join two collections on specified properties
-     */
-    eqJoin<T>(joinData: T[] | LokiResultset<T>, leftJoinProp: string | ((obj: E) => string), rightJoinProp: string | ((obj: T) => string)): LokiResultset<{ left: E; right: T; }>;
-    eqJoin<T, U>(joinData: T[] | LokiResultset<T>, leftJoinProp: string | ((obj: E) => string), rightJoinProp: string | ((obj: T) => string), mapFun?: (a: E, b: T) => U): LokiResultset<U>;
-
-    /* ------ STAGING API -------- */
-    /** stages: a map of uniquely identified 'stages', which hold copies of objects to be
-     * manipulated without affecting the data in the original collection
-     */
-    stages: { [id: string]: any };
-
-    /** create a stage and/or retrieve it
-     */
-    getStage(name: string): E[];
-
-    /** a collection of objects recording the changes applied through a commmitStage
-     */
-    commitLog: {
-        timestamp: number; // timestamp (i.e. new Date().getTime())
-        message: any;
-        data: E;
-    }[];
-
-    /** create a copy of an object and insert it into a stage
-     */
-    stage(stageName: string, obj: E): E;
-
-    /** re-attach all objects to the original collection, so indexes and views can be rebuilt
-     * then create a message to be inserted in the commitlog
-     */
-    commitStage(stageName: string, message: any): void;
-
-    no_op(): void;
-
-    extract(field: string): any[];
-
-    max(field: string): number;
-
-    min(field: string): number;
-
-    maxRecord(field: string): { index: number; value: any; };
-
-    minRecord(field: string): { index: number; value: any; };
-
-    extractNumerical(field: string): number[];
-
-    avg(field: string): number;
-
-    stdDev(field: string): number;
-
-    mode(field: string): string | number;
-
-    median(field: string): number;
-}
-
-
-
-
-/** comparison operators
- * a is the value in the collection
- * b is the query value
- */
-interface LokiOps {
-    $eq(a: any, b: any): boolean;
-    $ne(a: any, b: any): boolean;
-    $dteq(a: any, b: any): boolean;
-    $gt(a: any, b: any): boolean;
-    $gte(a: any, b: any): boolean;
-    $lt(a: any, b: any): boolean;
-    $lte(a: any, b: any): boolean;
-    $in(a: any, b: { indexOf: (value: any) => boolean }): boolean;
-    $nin(a: any, b: { indexOf: (value: any) => boolean }): boolean;
-    $keyin(a: string, b: any): boolean;
-    $nkeyin(a: string, b: any): boolean;
-    $definedin(a: any, b: any): boolean;
-    $undefinedin(a: any, b: any): boolean;
-    $regex(a: any, b: RegExp | { test: (str: string) => boolean }): boolean;
-    $containsString(a: string | any, b: string): boolean;
-    $containsNone(a: any, b: any): boolean;
-    $containsAny(a: any, b: any | any[]): boolean;
-    $contains(a: any, b: any | any[]): boolean;
-    $type(a: any, b: any): boolean;
-    $size(a: any, b: any): boolean;
-    $len(a: any, b: any): boolean;
-    // field-level logical operators
-    // a is the value in the collection
-    // b is the nested query operation (for '$not')
-    //   or an array of nested query operations (for '$and' and '$or')
-    $not(a: any, b: any): boolean;
-    $and(a: any, b: any[]): boolean;
-    $or(a: any, b: any[]): boolean;
-}
-
-
-interface LokiKeyValueStore<K, V> {
-    keys: K[];
-    values: V[];
-
-    sort(a: any, b: any): number;
-    setSort(fun: (a: K, b: K) => number): void;
-    bs(): LokiBSonSort<K>;
-    set(key: K, value: V): void;
-    get(key: K): V;
-}
-
-
-interface LokiUniqueIndex<E> {
-    field: string;
-    keyMap: { [id: string]: E };
-    lokiMap: { [id: number]: any };
-
-    new <E>(uniqueField: string): LokiUniqueIndex<E>;
-
-    set(obj: E): void;
-    get(key: string): E;
-    byId(id: number): E;
-    update(obj: E): void;
-    remove(key: string): void;
-    clear(): void;
-}
-
-
-interface LokiExactIndex<E> {
-    index: { [id: string]: E[] };
-    field: string;
-
-    new <E>(exactField: string): LokiExactIndex<E>
-
-    /** add the value you want returned to the key in the index */
-    set(key: string, val: E): void;
-    /** remove the value from the index, if the value was the last one, remove the key */
-    remove(key: string, val: E): void;
-    /** get the values related to the key, could be more than one */
-    get(key: string): E[];
-    /** clear will zap the index */
-    clear(key?: any): void;
-}
-
-
-interface LokiSortedIndex<K, V> {
-    field: string;
-    keys: K[];
-    values: V[][];
-
-    new <K, V>(sortedField: string): LokiSortedIndex<K, V>;
-
-    // set the default sort
-    sort(a: any, b: any): number;
-    bs(): LokiBSonSort<any>;
-    // and allow override of the default sort
-    setSort(fun: (a: any, b: any) => number): void;
-    // add the value you want returned  to the key in the index
-    set(key: K, value: V): void;
-    // get all values which have a key == the given key
-    get(key: K): V[];
-    // get all values which have a key < the given key
-    getLt(key: K): V[];
-    // get all values which have a key > the given key
-    getGt(key: K): V[];
-    // get all vals from start to end
-    getAll(key: K, start: number, end: number): V[];
-    // just in case someone wants to do something smart with ranges
-    getPos(key: K): { found: boolean; index: number; };
-    // remove the value from the index, if the value was the last one, remove the key
-    remove(key: K, value: V): void;
-    // clear will zap the index
-    clear(): void;
-}
-
-
-interface LokiConfigureOptions {
-    adapter?: LokiPersistenceInterface;
-    autoload?: boolean;
-    autoloadCallback?: (dataOrErr: any | Error) => void;
-    autosave?: boolean;
-    autosaveCallback?: (err: any) => void;
-    autosaveInterval?: number; // milliseconds between auto-saves
-    env?: string; /*'NODEJS', 'BROWSER', 'CORDOVA'*/
-    persistenceMethod?: string; /*'fs', 'localStorage', 'adapter'*/
-    verbose?: boolean;
-}
-
-
-interface LokiCollectionOptions {
-    asyncListeners?: boolean;
-    autoupdate?: boolean;
-    clone?: boolean;
-    cloneMethod?: string;
-    disableChangesApi?: boolean;
-    exact?: string[];
-    indices?: string | string[];
-    transactional?: boolean;
-    unique?: string | string[];
-}
-
-
-interface LokiDynamicViewOptions {
-    minRebuildInterval?: number;
-    persistent?: boolean;
-    sortPriority: string; /*'active', 'passive'*/
-}
-
-
-interface LokiResultsetOptions<E> {
-    firstOnly?: boolean;
-    queryObj?: LokiQuery;
-    queryFunc?: (item: E) => boolean;
-}
-
-
-interface LokiQuery {
-}
-
-
-interface LokiFilter<E> {
-    type: string; /*'find', 'where'*/
-    val: LokiQuery | ((obj: E, index: number, array: E[]) => boolean);
-    uid: number | string;
-}
-
-
-interface LokiElementMetaData {
-    created: number; // unix style timestamp (i.e. new Date().getTime())
-    revision: number;
-}
-
-
-interface LokiCollectionChange {
-    name: string;
-    operation: string;/*'I', 'R', 'U'*/
-    obj: any;
-}
-
-
-interface LokiBSonSort<T> {
-    (fun: (a: T, b: T) => number): (array: T[], item: T) => { found: boolean; index: number; };
-}
-
-
-/*
-interface LokiUtils {
-    copyProperties(src: any, dest: any): void;
-
-    // used to recursively scan hierarchical transform step object for param substitution
-    resolveTransformObject<U>(subObj: U, params: any, depth?: number): U;
-
-    // top level utility to resolve an entire (single) transform (array of steps) for parameter substitution
-    resolveTransformParams<U>(transform: U[], params: any): U[];
-}
-
-// Sort helper that support null and undefined
-declare function ltHelper(prop1: any, prop2: any, equal?: boolean): boolean;
-
-declare function gtHelper(prop1: any, prop2: any, equal?: boolean): boolean;
-
-declare function sortHelper(prop1: any, prop2: any, desc?: boolean): number;
-
-declare function doQueryOp(val: any, op: any): boolean;
-
-declare function containsCheckFn<T>(a: T[], b): (curr: T) => boolean;
-declare function containsCheckFn(a: string, b): (curr: string) => boolean;
-declare function containsCheckFn<T>(a: T, b): (curr: string) => boolean;
-*/
-
-/** General utils, including statistical functions
- */
-/*
-declare function isDeepProperty(field: string): boolean;
-
-declare function parseBase10(num: string | number): number;
-
-declare function isNotUndefined(obj: any): boolean;
-
-declare function add(a: string | number, b: string | number): number;
-
-declare function sub(a: string | number, b: string | number): number;
-
-declare function median(values: number[]): number;
-
-declare function average(array: (string | number)[]);
-
-declare function standardDeviation(values: (string | number)[]): number;
-
-declare function deepProperty(obj: any, property: string, isDeep?: boolean): any;
-
-declare function binarySearch<U>(array: U[], item: U, fun: (a: U, b: U) => number): { found: boolean; index: number; };
-
-// compoundeval() - helper function for compoundsort(), performing individual object comparisons
-//
-// @param {array} properties - array of property names, in order, by which to evaluate sort order
-// @param {object} obj1 - first object to compare
-// @param {object} obj2 - second object to compare
-// @returns {integer} 0, -1, or 1 to designate if identical (sortwise) or which should be first
-declare function compoundeval(properties: ([string, boolean] | [string])[], obj1: any, obj2: any): number;
-
-// dotSubScan - helper function used for dot notation queries.
-declare function dotSubScan<V>(root: any | any[], propPath: string[], fun: (root, value: V) => boolean, value: V): boolean;
-
-// making indexing opt-in... our range function knows how to deal with these ops :
-//var indexedOpsList = ['$eq', '$dteq', '$gt', '$gte', '$lt', '$lte'];
-
-declare function clone<U>(data: U, method?: string): U; // stage: 'parse-stringify', 'jquery-extend-deep', 'shallow'
-
-declare function cloneObjectArray<U>(objarray: U[], method?: string): U; // stage: 'parse-stringify', 'jquery-extend-deep', 'shallow'
-
-declare function localStorageAvailable(): boolean;
-*/
-
-
-
-
-/* ======== loki-indexed-adapter.js ======== */
-interface LokiIndexedAdapter {
-    app: string;
-    catalog: LokiCatalog;
-
-    /** IndexedAdapter - Loki persistence adapter class for indexedDb.
-     *     This class fulfills abstract adapter interface which can be applied to other storage methods
-     *     Utilizes the included LokiCatalog app/key/value database for actual database persistence.
-     * @param {string} appname - Application name context can be used to distinguish subdomains or just 'loki'
-     */
-    new (appname: string): LokiIndexedAdapter;
-
-    /** checkAvailability - used to check if adapter is available
-     * @returns {boolean} true if indexeddb is available, false if not.
-     */
-    checkAvailability(): boolean;
-
-    /** loadDatabase() - Retrieves a serialized db string from the catalog.
-     * @param {string} dbname - the name of the database to retrieve.
-     * @param {function} callback - callback should accept string param containing serialized db string.
-     */
-    loadDatabase(dbname: string, callback?: (data: any) => void): void;
-
-    // alias for loadDatabase
-    loadKey(dbname: string, callback?: (data: any) => void): void;
-
-    /** saveDatabase() - Saves a serialized db to the catalog.
-     * @param {string} dbname - the name to give the serialized database within the catalog.
-     * @param {string} dbstring - the serialized db string to save.
-     * @param {function} callback - (Optional) callback passed obj.success with true or false
-     */
-    saveDatabase(dbname: string, dbstring: string, callback?: (err: Error | void) => void): void;
-
-    // alias for saveDatabase
-    saveKey(dbname: string, dbstring: string, callback?: (err: Error | void) => void): void;
-
-    /** deleteDatabase() - Deletes a serialized db from the catalog.
-     * @param {string} dbname - the name of the database to delete from the catalog.
-     */
-    deleteDatabase(dbname: string): void;
-
-    // alias for deleteDatabase
-    deleteKey(dbname: string): void;
-
-    /** getDatabaseList() - Retrieves object array of catalog entries for current app.
-     * @param {function} callback - should accept array of database names in the catalog for current app.
-     */
-    getDatabaseList(callback: (names: string[]) => void): void;
-
-    // alias for getDatabaseList
-    getKeyList(callback: (names: string[]) => void): void;
-
-    /** getCatalogSummary - allows retrieval of list of all keys in catalog along with size
-     * @param {function} callback - (Optional) callback to accept result array.
-     */
-    getCatalogSummary(callback: (entries: { app: string; key: string; size: number; }) => void): void;
-}
-
-
-/** LokiCatalog - underlying App/Key/Value catalog persistence
- *   This non-interface class implements the actual persistence.
- *   Used by the IndexedAdapter class.
- */
-interface LokiCatalog {
-    db: IDBDatabase;
-
-    new (callback: (cat: LokiCatalog) => void): LokiCatalog;
-
-    initializeLokiCatalog(callback: (cat: LokiCatalog) => void): void;
-
-    getAppKey(app: string, key: string, callback: (resObj: any) => void): void;
-
-    getAppKeyById<T>(id: any, callback: (result: any, data: T) => void, data: T): void;
-
-    setAppKey(app: string, key: string, val: any, callback: (res: { success: boolean }) => void): void;
-
-    deleteAppKey(id: any, callback: (res: { success: boolean; }) => void): void;
-
-    getAppKeys(app: string, callback: (data: any[]) => void): void;
-
-    // Hide 'cursoring' and return array of { id: id, key: key }
-    getAllKeys(callback: (data: any[]) => void): void;
-}
-/* ======== END loki-indexed-adapter.js ======== */
-
-
-
-/* ======== loki-crypted-file-adapter.js ======== */
-/**
- * @file lokiCryptedFileAdapter.js
- * @author Hans Klunder <Hans.Klunder@bigfoot.com>
- */
-
-/** require libs */
-//var fs = require('fs');
-//var cryptoLib = require('crypto');
-//var isError = require('util').isError;
-
-/* The default Loki File adapter uses plain text JSON files. This adapter crypts the database string and wraps the result
-* in a JSON including enough info to be able to decrypt it (except for the 'secret' of course !)
-*
-* The idea is that the 'secret' does not reside in your source code but is supplied by some other source (e.g. the user in node-webkit)
-*
-* The idea + encrypt/decrypt routines are borrowed from  https://github.com/mmoulton/krypt/blob/develop/lib/krypt.js
-* not using the krypt module to avoid third party dependencies
-*/
-interface LokiCryptedFileAdapter {
-    secret: string;
-
-    /** The constructor is automatically called on `require` , see examples below
-     * @constructor
-     */
-    new (): LokiCryptedFileAdapter;
-
-    /** setSecret() - set the secret to be used during encryption and decryption
-     *
-     * @param {string} secret - the secret to be used
-     */
-    setSecret(secret: string): void;
-
-    /** loadDatabase() - Retrieves a serialized db string from the catalog.
-     *
-     *  @example
-      // LOAD
-        var cryptedFileAdapter = require('./lokiCryptedFileAdapter');
-        cryptedFileAdapter.setSecret('mySecret'); // you should change 'mySecret' to something supplied by the user
-        var db = new loki('test.crypted', { adapter: cryptedFileAdapter }); //you can use any name, not just '*.crypted'
-        db.loadDatabase(function(result) {
-            console.log('done');
-        });
-     *
-     * @param {string} dbname - the name of the database to retrieve.
-     * @param {function} callback - callback should accept string param containing serialized db string.
-     */
-    loadDatabase(dbname: string, callback: (decryptedDataOrErr: string | any) => void): void;
+    public findOneUnindexed(prop: keyof E, value: any): (E & LokiObj) | null;
 
     /**
-     *
-     @example
-      // SAVE : will save database in 'test.crypted'
-        var cryptedFileAdapter = require('./lokiCryptedFileAdapter');
-        cryptedFileAdapter.setSecret('mySecret'); // you should change 'mySecret' to something supplied by the user
-        var loki=require('lokijs');
-        var db = new loki('test.crypted',{ adapter: cryptedFileAdapter }); //you can use any name, not just '*.crypted'
-        var coll = db.addCollection('testColl');
-        coll.insert({test: 'val'});
-        db.saveDatabase();  // could pass callback if needed for async complete
-
-     @example
-      // if you have the krypt module installed you can use:
-        krypt --decrypt test.crypted --secret mySecret
-      to view the contents of the database
-
-     * saveDatabase() - Saves a serialized db to the catalog.
-     *
-     * @param {string} dbname - the name to give the serialized database within the catalog.
-     * @param {string} dbstring - the serialized db string to save.
-     * @param {function} callback - (Optional) callback passed obj.success with true or false
+     * Transaction methods
      */
-    saveDatabase(dbname: string, dbstring: string, callback: (err: any) => void): void;
+
+    /** start the transation */
+    public startTransaction(): void;
+
+    /** commit the transation */
+    public commit(): void;
+
+    /** roll back the transation */
+    public rollback(): void;
+
+    // async executor. This is only to enable callbacks at the end of the execution.
+    public async(fun: () => void, callback: () => void): void;
+
+    /**
+     * Query the collection by supplying a javascript filter function.
+     * @example
+     * var results = coll.where(function(obj) {
+     *   return obj.legs === 8;
+     * });
+     *
+     * @param fun - filter function to run against all collection docs
+     * @returns all documents which pass your filter function
+     */
+    public where(fun: (data: E) => boolean): (E & LokiObj)[];
+
+    /**
+     * Map Reduce operation
+     *
+     * @param mapFunction - function to use as map function
+     * @param reduceFunction - function to use as reduce function
+     * @returns The result of your mapReduce operation
+     */
+    public mapReduce<U, R>(mapFunction: (value: E, index: number, array: E[]) => U, reduceFunction: (ary: U[]) => R): R;
+
+    /**
+     * Join two collections on specified properties
+     *
+     * @param joinData - array of documents to 'join' to this collection
+     * @param leftJoinProp - property name in collection
+     * @param rightJoinProp - property name in joinData
+     * @param mapFun - (Optional) map function to use
+     * @param dataOptions - options to data() before input to your map function
+     * @param [dataOptions.removeMeta] - allows removing meta before calling mapFun
+     * @param [dataOptions.forceClones] - forcing the return of cloned objects to your map object
+     * @param [dataOptions.forceCloneMethod] - Allows overriding the default or collection specified cloning method.
+     * @returns Result of the mapping operation
+     */
+    public eqJoin(
+        joinData: Collection<any> | Resultset<any> | any[],
+        leftJoinProp: string | ((obj: any) => string),
+        rightJoinProp: string | ((obj: any) => string),
+        mapFun?: (left: any, right: any) => any,
+        dataOptions?: Partial<GetDataOptions>
+    ): Resultset<any>;
+
+    /* ------ STAGING API -------- */
+    /**
+     * stages: a map of uniquely identified 'stages', which hold copies of objects to be
+     * manipulated without affecting the data in the original collection
+     */
+    public stages: { [name: string]: any };
+
+    /**
+     * (Staging API) create a stage and/or retrieve it
+     */
+    public getStage(name: string): any;
+
+    /**
+     * a collection of objects recording the changes applied through a commmitStage
+     */
+    public commitLog: { timestamp: number; message: string; data: any }[];
+
+
+    /**
+     * (Staging API) create a copy of an object and insert it into a stage
+     */
+    public stage<F extends E>(stageName: string, obj: F): F;
+
+    /**
+     * (Staging API) re-attach all objects to the original collection, so indexes and views can be rebuilt
+     * then create a message to be inserted in the commitlog
+     * @param stageName - name of stage
+     * @param message
+     */
+    public commitStage(stageName: string, message: string): void;
+
+    public no_op: () => void;
+
+    public extract(field: string): any[];
+
+    public max(field: string): number;
+
+    public min(field: string): number;
+
+    public maxRecord(field: string): { index: number; value: any };
+
+    public minRecord(field: string): { index: number; value: any };
+
+    public extractNumerical(field: string): number[];
+
+    /**
+     * Calculates the average numerical value of a property
+     *
+     * @param field - name of property in docs to average
+     * @returns average of property in all docs in the collection
+     */
+    public avg(field: string): number;
+
+    /**
+     * Calculate standard deviation of a field
+     * @param field
+     */
+    public stdDev(field: string): number;
+
+    /**
+     * @param field
+     */
+    public mode(field: string): string | undefined;
+
+    /**
+     * @param field - property name
+     */
+    public median(field: string): number;
 }
 
 
-interface LokiCryptedFileAdapterEncryptResult {
-    cipher: string;
-    keyDerivation: string;
-    keyLength: number;
-    iterations: number;
-    iv: string;
-    salt: string;
-    value: string;
+
+declare class KeyValueStore {
+    keys: any[];
+    values: any[];
+
+    constructor();
+
+    public sort(a: any, b: any): -1 | 0 | 1;
+
+    public setSort(fun: (target: any, test: any) => any): void;
+
+    public bs(): (array: any[], item: any) => { found: boolean; index: number };
+
+    public set(key: any, value: any): void;
+
+    public get(key: any): any[];
 }
-/* ======== END loki-crypted-file-adapter.js ======== */
 
 
 
+declare class UniqueIndex<E extends object> {
+    field: keyof E;
+    keyMap: { [fieldValue: string]: E/*{ $loki: number }*/ | undefined };
+    lokiMap: { [$loki: number]: string | number | undefined };
 
-/* ======== loki-angular.js ======== */
-/* introduces a angular module named lokijs that returns the 'lokijs' module
-    var module = angular.module('lokijs', [])
-        .factory('Loki', function Loki() {
-            return lokijs;
-        });
-    return module;
-*/
-/* ======== END loki-angular.js ======== */
+    constructor(uniqueField: keyof E);
+
+    public set(obj: E/*{ $loki: number }*/): void;
+
+    public get(key: string | number): E | undefined;
+
+    public byId(id: number): E | undefined;
+
+    /**
+     * Updates a document's unique index given an updated object.
+     * @param  {Object} obj Original document object
+     * @param  {Object} doc New document object (likely the same as obj)
+     */
+    public update(obj: E/*{ $loki: number }*/, doc: any): void;
+
+    public remove(key: string): void;
+
+    public clear(): void;
+}
 
 
 
+declare class ExactIndex<E extends object> {
+    field: keyof E;
+    index: { [key: string]: E[] | undefined };
 
-/* ======== jquery-sync-adapter.js ======== */
+    constructor(exactField: keyof E);
 
-/** LokiJS JquerySyncAdapter
- * A remote sync adapter example for LokiJS
+    // add the value you want returned to the key in the index
+    public set(key: string | number, val: E): void;
+
+    // remove the value from the index, if the value was the last one, remove the key
+    public remove(key: string | number, val: E): void;
+
+    // get the values related to the key, could be more than one
+    public get(key: string | number): E[] | undefined;
+
+    // clear will zap the index
+    public clear(key?: null): void;
+}
+
+
+
+declare class SortedIndex {
+    field: string;
+    keys: any[];
+    values: any[];
+
+    constructor(sortedField: string);
+
+    // set the default sort
+    public sort(a: any, b: any): -1 | 0 | 1;
+
+    public bs(): (array: any[], item: any) => { found: boolean; index: number };
+
+    // and allow override of the default sort
+    public setSort(fun: (target: any, test: any) => number): void;
+
+    // add the value you want returned  to the key in the index
+    public set(key: any, value: any): void;
+
+    // get all values which have a key == the given key
+    public get(key: any): any[];
+
+    // get all values which have a key < the given key
+    public getLt(key: any): any[];
+
+    // get all values which have a key > the given key
+    public getGt(key: any): any[];
+
+    // get all vals from start to end
+    public getAll(key: any, start: number, end: number): any[];
+
+    // just in case someone wants to do something smart with ranges
+    public getPos(key: any): { found: boolean; index: number };
+
+    // remove the value from the index, if the value was the last one, remove the key
+    public remove(key: any, value: any): void;
+
+    // clear will zap the index
+    public clear(): void;
+}
+
+
+// type aliases to allow the nested classes inside LokiConstructor to extend classes sharing them same name(s) as themselves
+declare class _Collection<E extends object> extends Collection<E> { }
+declare class _KeyValueStore extends KeyValueStore { }
+declare class _LokiMemoryAdapter extends LokiMemoryAdapter { }
+declare class _LokiPartitioningAdapter extends LokiPartitioningAdapter { }
+declare class _LokiLocalStorageAdapter extends LokiLocalStorageAdapter { }
+declare class _LokiFsAdapter extends LokiFsAdapter { }
+
+
+/**
+ * LokiJS
+ * A lightweight document oriented javascript database
  * @author Joe Minichino <joe.minichino@gmail.com>
  */
-
-/** this adapter assumes an object options is passed,
- * containing the following properties:
- * ajaxLib: jquery or compatible ajax library
- * save: { url: the url to save to, dataType [optional]: json|xml|etc., type [optional]: POST|GET|PUT}
- * load: { url: the url to load from, dataType [optional]: json|xml| etc., type [optional]: POST|GET|PUT }
- */
-interface LokiJquerySyncAdapter {
-    options: LokiJquerySyncAdapterOptions
-
-    new (options: LokiJquerySyncAdapterOptions): LokiJquerySyncAdapter;
-
-    saveDatabase(name: string, data: any, callback?: (data: any, textStatus: string, xhr: XMLHttpRequest) => any): void;
-
-    loadDatabase(name: string, callback?: (data: any, textStatus: string, xhr: XMLHttpRequest) => any): void;
+declare class LokiConstructor extends Loki {
+    constructor(filename: string, options?: Partial<LokiConstructorOptions> & Partial<LokiConfigOptions> & Partial<ThrottledSaveDrainOptions>);
 }
-
-
-interface LokiJquerySyncAdapterOptions {
-    ajaxLib: { ajax(options: any): any; };
-    save: {
-        url: any;
-        type?: string; /*'GET', 'POST, 'DELETE', etc.*/
-        dataType?: string; /*'json', 'xml', etc.*/
+declare module LokiConstructor {
+    export var persistenceAdapters: {
+        fs: _LokiFsAdapter,
+        localStorage: _LokiLocalStorageAdapter
     };
-    load: {
-        url: any;
-        type?: string; /*'GET', 'POST, 'DELETE', etc.*/
-        dataType?: string; /*'json', 'xml', etc.*/
-    };
-}
 
+    export function aeq(prop1: any, prop2: any): boolean;
 
-interface LokiJquerySyncAdapterError extends Error {
-    name: string; // "JquerySyncAdapterError"
-    message: any;
+    function lt(prop1: any, prop2: any, equal?: boolean): boolean;
 
-    new (message: any): LokiJquerySyncAdapterError;
-}
-/* ======== END jquery-sync-adapter.js ======== */
+    function gt(prop1: any, prop2: any, equal?: boolean): boolean;
 
+    export var LokiOps: LokiOps;
 
-declare var LokiCryptedFileAdapterConstructor: {
-    new (): LokiCryptedFileAdapter;
-}
+    export class Collection<E extends object = any> extends _Collection<E> { }
 
-declare module "lokiCryptedFileAdapter" {
-    export = LokiCryptedFileAdapterConstructor;
-}
+    export class KeyValueStore extends _KeyValueStore { }
 
+    export class LokiMemoryAdapter extends _LokiMemoryAdapter { }
 
-declare var LokiIndexedAdapterConstructor: {
-    new (filename: string): LokiIndexedAdapter;
-}
+    export class LokiPartitioningAdapter extends _LokiPartitioningAdapter { }
 
-declare module "loki-indexed-adapter" {
-    export = LokiIndexedAdapterConstructor;
-}
+    export class LokiLocalStorageAdapter extends _LokiLocalStorageAdapter { }
 
-
-declare var LokiConstructor: {
-    new (filename: string, options?: LokiConfigureOptions): Loki;
-    LokiOps: LokiOps;
-    Collection: LokiCollection<any>;
-    KeyValueStore: LokiKeyValueStore<any, any>;
+    export class LokiFsAdapter extends _LokiFsAdapter { }
 }
 
 declare module "lokijs" {
diff --git a/types/lokijs/lokijs-tests.ts b/types/lokijs/lokijs-tests.ts
index 2e08370c02..ac16e5cc15 100644
--- a/types/lokijs/lokijs-tests.ts
+++ b/types/lokijs/lokijs-tests.ts
@@ -1,7 +1,18 @@
 
-
 import Loki = require("lokijs");
 
+
+interface EarthLocation {
+    longitude: number;
+    latitude: number;
+}
+
+interface User {
+    name: string;
+    age: number;
+}
+
+
 class Ant {
     static uniqueId = 1;
 
@@ -37,10 +48,12 @@ class QueenAnt extends Ant {
 
 
 class AntColony {
-    ants: LokiCollection<Ant>;
-    queens: LokiCollection<QueenAnt>;
+    location: EarthLocation;
+    ants: Loki.Collection<Ant>;
+    queens: Loki.Collection<QueenAnt>;
 
-    constructor(ants?: LokiCollection<Ant>, queens?: LokiCollection<QueenAnt>) {
+    constructor(location: EarthLocation, ants: Loki.Collection<Ant>, queens: Loki.Collection<QueenAnt>) {
+        this.location = location;
         this.ants = ants;
         this.queens = queens;
     }
@@ -73,15 +86,104 @@ class Test {
             throw new Error("queen object's '.$loki' property lookup failed");
         }
 
-        var anotherColl = new Loki.Collection("anotherCollection");
+        Test.events(lokiInst);
+        Test.insertUpdateRemove(lokiInst);
+        Test.dynamicViews(lokiInst);
+        Test.transform(lokiInst);
+    }
 
+
+    static events(lokiInst: Loki) {
+        var coll = new Loki.Collection<Ant>("anotherCollection", {});
+        var onUpdate: (t: any) => void;
+
+        coll.on("update", onUpdate = function (target) {
+            console.log("update", target);
+        });
+
+        coll.on("error", function (target) {
+            console.log("error", target);
+        });
+
+        coll.emit("update", { data: "abc" });
+
+        coll.removeListener("update", onUpdate);
+    }
+
+
+    static insertUpdateRemove(lokiInst: Loki) {
+        var coll = new Loki.Collection<Ant>("anotherCollection", {
+            unique: <["id"]>["id"],
+            indices: <["dob"]>["dob"],
+            autoupdate: true
+        });
+
+        coll.insert({
+            id: 127,
+            dob: new Date(2012, 9, 1),
+            health: 1.0,
+            lengthMm: 3.5,
+            weightMg: 0.4,
+        });
+
+        var doc = coll.by("id", 127);
+        if (doc) doc.health -= 0.25;
+
+        // untyped collection (collection type should default to 'any')
+        var tmpColl = lokiInst.addCollection("_temp");
+        tmpColl.insert(coll.find());
+        var res = tmpColl.findOne({ id: 127 });
+        if (res) res.health -= 0.25;
+
+        coll.clear({ removeIndices: true });
+
+        tmpColl.removeWhere({ id: 127 });
+
+        if(doc) coll.add(doc);
+
+        coll.remove(1);
+        coll.removeDataOnly();
+    }
+
+
+    static dynamicViews(lokiInst: Loki) {
+        var users = lokiInst.addCollection<User>("users");
+
+        users.insert({ name: "joe", age: 39 });
+        users.insert({ name: "jack", age: 20 });
+        users.insert({ name: "jim", age: 40 });
+        users.insert([
+            { name: "dave", age: 33 },
+            { name: "eric", age: 29 },
+            { name: "dave", age: 21 }
+        ]);
+
+        var dv = users.addDynamicView("testview");
+        dv.applyWhere(function (obj) {
+            return obj.name.length > 3;
+        });
+
+        console.log("expect 2 == " + dv.data().length);
+
+        users.removeWhere(function (obj: User) {
+            return obj.age > 35;
+        });
+
+        console.log("expect 0 == " + dv.data().length);
+    }
+
+
+    static transform(lokiInst: Loki) {
+        var ants = lokiInst.addCollection<Ant>("tmpAnts");
+        var len = ants.chain().transform(<Transform[]>[{ property: "id" }]).data().length;
+        ants.addTransform("tmpAnts", [{ type: "map", mapFun: (a: any) => a, desc: true }]);
     }
 
 
     static createAntColony(lokiInst: Loki, antCount: number, queenCount: number = 1) {
         var ants = lokiInst.addCollection<Ant>("ants", { indices: "id" });
         var queens = lokiInst.addCollection<QueenAnt>("queenAnts", { indices: "id" });
-        var antColony = new AntColony(ants, queens);
+        var antColony = new AntColony({ latitude: 0, longitude: 0 }, ants, queens);
 
         for (var i = 0; i < antCount; i++) {
             ants.add(Ant.createAnt());
diff --git a/types/lokijs/tsconfig.json b/types/lokijs/tsconfig.json
index bd01821699..96175c28a4 100644
--- a/types/lokijs/tsconfig.json
+++ b/types/lokijs/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/lokijs/tslint.json b/types/lokijs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lokijs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index de08060883..68f87793d9 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for lolex 1.5
+// Type definitions for lolex 2.1
 // Project: https://github.com/sinonjs/lolex
-// Definitions by: Wim Looman <https://github.com/Nemo157>, Josh Goldberg <https://github.com/joshuakgoldberg>
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
+//                 Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
@@ -34,7 +36,7 @@ type BrowserClock = LolexClock<number>;
 type NodeClock = LolexClock<NodeTimer> & {
     /**
      * Mimicks process.hrtime().
-     * 
+     *
      * @param prevTime   Previous system time to calculate time elapsed.
      * @returns High resolution real time as [seconds, nanoseconds].
      */
@@ -49,7 +51,7 @@ type Clock = BrowserClock | NodeClock;
 /**
  * Names of clock methods that may be faked by install.
  */
-type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date";
+type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime";
 
 /**
  * Controls the flow of time.
@@ -67,39 +69,41 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Schedules a callback to be fired once timeout milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @param timeout   How many ticks to wait to run the callback.
+     * @param args   Any extra arguments to pass to the callback.
      * @returns Time identifier for cancellation.
      */
-    setTimeout(callback: () => any, timeout: number): TTimerId;
+    setTimeout(callback: () => any, timeout: number, ...args: any[]): TTimerId;
 
     /**
      * Clears a timer, as long as it was created using setTimeout.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearTimeout(id: TTimerId): void;
 
     /**
      * Schedules a callback to be fired every time timeout milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @param timeout   How many ticks to wait between callbacks.
+     * @param args   Any extra arguments to pass to the callback.
      * @returns Time identifier for cancellation.
      */
-    setInterval(callback: () => any, timeout: number): TTimerId;
+    setInterval(callback: () => any, timeout: number, ...args: any[]): TTimerId;
 
     /**
      * Clears a timer, as long as it was created using setInterval.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearInterval(id: TTimerId): void;
 
     /**
      * Schedules the callback to be fired once 0 milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @remarks You'll still have to call clock.tick() for the callback to fire.
      * @remarks If called during a tick the callback won't fire until 1 millisecond has ticked by.
@@ -108,11 +112,16 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Clears a timer, as long as it was created using setImmediate.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearImmediate(id: TTimerId): void;
 
+    /**
+     * Simulates process.nextTick();
+     */
+    nextTick(callback: () => void): void;
+
     /**
      * Advances the clock to the the moment of the first scheduled timer, firing it.
      */
@@ -120,14 +129,14 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Advance the clock, firing callbacks if necessary.
-     * 
+     *
      * @param time   How many ticks to advance by.
      */
     tick(time: number | string): void;
 
     /**
      * Runs all pending timers until there are none remaining.
-     * 
+     *
      * @remarks  If new timers are added while it is executing they will be run as well.
      */
     runAll(): void;
@@ -140,7 +149,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Simulates a user changing the system clock.
-     * 
+     *
      * @param now   New system time.
      * @remarks This affects the current time but it does not in itself cause timers to fire.
      */
@@ -155,7 +164,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
 /**
  * Creates a clock.
- * 
+ *
  * @param now   Current time for the clock.
  * @param loopLimit    Maximum number of timers that will be run when calling runAll()
  *                     before assuming that we have an infinite loop and throwing an error
@@ -165,23 +174,47 @@ export interface LolexClock<TTimerId extends TimerId> {
  */
 export declare function createClock<TClock extends Clock>(now?: number | Date, loopLimit?: number): TClock;
 
-/**
- * Creates a clock and installs it globally.
- * 
- * @param now   Current time for the clock, as with lolex.createClock().
- * @param toFake   Names of methods that should be faked.
- * @type TClock   Type of clock to create.
- * @usage lolex.install(["setTimeout", "clearTimeout"]);
- */
-export declare function install<TClock extends Clock>(now?: number | Date, toFake?: FakeMethod[]): TClock;
+
+export interface LolexInstallOpts {
+    /**
+     * Installs lolex onto the specified target context (default: global)
+     */
+    target?: any;
+
+    /**
+     * Installs lolex with the specified unix epoch (default: 0)
+     */
+    now?: number;
+
+    /**
+     * An array with explicit function names to hijack. When not set, lolex will automatically fake all methods except nextTick
+     * e.g., lolex.install({ toFake: ["setTimeout", "nextTick"]}) will fake only setTimeout and nextTick
+     */
+    toFake?: FakeMethod[];
+
+    /**
+     * The maximum number of timers that will be run when calling runAll() (default: 1000)
+     */
+    loopLimit?: number;
+
+    /**
+     * Tells lolex to increment mocked time automatically based on the real system time shift (e.g. the mocked time will be incremented by
+     * 20ms for every 20ms change in the real system time) (default: false)
+     */
+    shouldAdvanceTime?: boolean;
+
+    /**
+     * Relevant only when using with shouldAdvanceTime: true. increment mocked time by advanceTimeDelta ms every advanceTimeDelta ms change
+     * in the real system time (default: 20)
+     */
+    advanceTimeDelta?: number;
+}
 
 /**
- * Creates a clock and installs it onto the context object.
- * 
- * @param context   Context to install the clock onto.
+ * Creates a clock and installs it globally.
+ *
  * @param now   Current time for the clock, as with lolex.createClock().
  * @param toFake   Names of methods that should be faked.
  * @type TClock   Type of clock to create.
- * @usage lolex.install(context, ["setTimeout", "clearTimeout"]);
  */
-export declare function install<TClock extends Clock>(context?: any, now?: number | Date, toFake?: FakeMethod[]): TClock;
+export declare function install<TClock extends Clock>(opts?: LolexInstallOpts): TClock;
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index 876e4280c5..95b6a2be78 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -16,25 +16,14 @@ lolex.createClock<lolex.NodeClock>(new Date());
 lolex.createClock<lolex.NodeClock>(7, 9001);
 lolex.createClock<lolex.NodeClock>(new Date(), 9001);
 
-lolex.install<lolex.BrowserClock>(7);
-lolex.install<lolex.BrowserClock>(new Date());
-lolex.install<lolex.BrowserClock>(7, ["setTimeout"]);
-lolex.install<lolex.BrowserClock>(new Date(), ["setTimeout"]);
-
-lolex.install<lolex.NodeClock>(7);
-lolex.install<lolex.NodeClock>(new Date());
-lolex.install<lolex.NodeClock>(7, ["setTimeout"]);
-lolex.install<lolex.NodeClock>(new Date(), ["setTimeout"]);
-
-lolex.install<lolex.BrowserClock>({}, 7);
-lolex.install<lolex.BrowserClock>({}, new Date());
-lolex.install<lolex.BrowserClock>({}, 7, ["setTimeout"]);
-lolex.install<lolex.BrowserClock>({}, new Date(), ["setTimeout"]);
-
-lolex.install<lolex.NodeClock>({}, 7);
-lolex.install<lolex.NodeClock>({}, new Date());
-lolex.install<lolex.NodeClock>({}, 7, ["setTimeout"]);
-lolex.install<lolex.NodeClock>({}, new Date(), ["setTimeout"]);
+lolex.install<lolex.BrowserClock>({
+	advanceTimeDelta: 20,
+	loopLimit: 10,
+	now: 0,
+	shouldAdvanceTime: true,
+	target: {},
+	toFake: ["setTimeout", "nextTick", "hrtime"]
+});
 
 const browserNow: number = browserClock.now;
 const browserDate: Date = new browserClock.Date();
@@ -80,5 +69,7 @@ nodeClock.setSystemTime();
 nodeClock.setSystemTime(7);
 nodeClock.setSystemTime(new Date());
 
+nodeClock.nextTick(() => undefined);
+
 browserClock.uninstall();
 nodeClock.uninstall();
diff --git a/types/lolex/tslint.json b/types/lolex/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lolex/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/long/tslint.json b/types/long/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/long/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/loopback-boot/index.d.ts b/types/loopback-boot/index.d.ts
index 05eae5b7bd..5dc5fa7f60 100644
--- a/types/loopback-boot/index.d.ts
+++ b/types/loopback-boot/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/strongloop/loopback-boot
 // Definitions by: Andres D Jimenez <https://github.com/kattsushi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /************************************************
 *                                               *
@@ -79,9 +79,8 @@ import * as loopback from "loopback";
  * To avoid this when using bootLoopBackApp() make sure all models are passed as part of the models definition.
  * Throws an error if the config object is not valid or if boot fails.
  *
- * @param {Loopback.LoopbackApplication} app LoopBack application created by loopback().
- * @param {string|OptionsLB} options Boot options; If String, this is the application root directory; if object, has below properties.
- * @param {() => void} callback
+ * @param app LoopBack application created by loopback().
+ * @param options Boot options; If String, this is the application root directory; if object, has below properties.
  */
 
 declare function lb(app: loopback.LoopBackApplication, options: string|OptionsLB, callback?: (err: Error) => void): void;
@@ -189,12 +188,9 @@ declare namespace lb {
        * compileToBrowserify
        *
        * Compile boot instructions and add them to a browserify bundler.
-       * @param {string|any} options as described in bootLoopBackApp above.
-       * @param {any} bundler A browserify bundler created by browserify().
-       * @class
-       * @constructor
+       * @param options as described in bootLoopBackApp above.
+       * @param bundler A browserify bundler created by browserify().
        */
-
       class compileToBrowserify {
             /**
              * Application identifier used to load the correct boot configuration when
diff --git a/types/loopback/tslint.json b/types/loopback/tslint.json
index 90b290e422..e2f3fc7cca 100644
--- a/types/loopback/tslint.json
+++ b/types/loopback/tslint.json
@@ -4,6 +4,9 @@
         // TODOs
         "jsdoc-format": false,
         "no-any-union": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
         "prefer-method-signature": false
     }
diff --git a/types/lory.js/tslint.json b/types/lory.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lory.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lowdb/adapters/Base.d.ts b/types/lowdb/adapters/Base.d.ts
new file mode 100644
index 0000000000..50839dc9f2
--- /dev/null
+++ b/types/lowdb/adapters/Base.d.ts
@@ -0,0 +1,3 @@
+import { BaseAdapter } from "../index";
+declare const Base: BaseAdapter;
+export = Base;
diff --git a/types/lowdb/adapters/FileAsync.d.ts b/types/lowdb/adapters/FileAsync.d.ts
new file mode 100644
index 0000000000..9ecc292fe6
--- /dev/null
+++ b/types/lowdb/adapters/FileAsync.d.ts
@@ -0,0 +1,3 @@
+import { AdapterAsync } from "../index";
+declare const FileAsync: AdapterAsync;
+export = FileAsync;
diff --git a/types/lowdb/adapters/FileSync.d.ts b/types/lowdb/adapters/FileSync.d.ts
new file mode 100644
index 0000000000..d1c8b4c5ae
--- /dev/null
+++ b/types/lowdb/adapters/FileSync.d.ts
@@ -0,0 +1,3 @@
+import { AdapterSync } from "../index";
+declare const FileSync: AdapterSync;
+export = FileSync;
diff --git a/types/lowdb/adapters/LocalStorage.d.ts b/types/lowdb/adapters/LocalStorage.d.ts
new file mode 100644
index 0000000000..3a9edc7a7d
--- /dev/null
+++ b/types/lowdb/adapters/LocalStorage.d.ts
@@ -0,0 +1,3 @@
+import { AdapterSync } from "../index";
+declare const LocalStorage: AdapterSync;
+export = LocalStorage;
diff --git a/types/lowdb/adapters/Memory.d.ts b/types/lowdb/adapters/Memory.d.ts
new file mode 100644
index 0000000000..d1c8b4c5ae
--- /dev/null
+++ b/types/lowdb/adapters/Memory.d.ts
@@ -0,0 +1,3 @@
+import { AdapterSync } from "../index";
+declare const FileSync: AdapterSync;
+export = FileSync;
diff --git a/types/lowdb/index.d.ts b/types/lowdb/index.d.ts
index 3ca15155e1..bab0116404 100644
--- a/types/lowdb/index.d.ts
+++ b/types/lowdb/index.d.ts
@@ -1,558 +1,373 @@
-// Type definitions for Lowdb 0.15
+// Type definitions for Lowdb 1.0.0
 // Project: https://github.com/typicode/lowdb
-// Definitions by: typicode, <https://github.com/typicode>
+// Definitions by: typicode <https://github.com/typicode>
+//                 Bazyli Brzóska <https://github.com/niieani>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { LoDashExplicitWrapper, LoDashStatic } from "lodash";
+
+declare let Lowdb: Lowdb.lowdb;
+export = Lowdb;
 
 declare namespace Lowdb {
-
-    interface PromiseLike<T> {
-        /**
-        * Attaches callbacks for the resolution and/or rejection of the Promise.
-        * @param onfulfilled The callback to execute when the Promise is resolved.
-        * @param onrejected The callback to execute when the Promise is rejected.
-        * @returns A Promise for the completion of which ever callback is executed.
-        */
-        then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
-        then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>;
-    }
-
-    interface StringRepresentable {
-        toString(): string;
-    }
-
-    interface List<T> {
-        [index: number]: T;
-        length: number;
-    }
-
-    interface Dictionary<T> {
-        [index: string]: T;
-    }
-
-    interface DictionaryIterator<T, TResult> {
-        (value: T, key?: string, collection?: Dictionary<T>): TResult;
-    }
-
-    interface ListIterator<T, TResult> {
-        (value: T, index: number, collection: List<T>): TResult;
-    }
-
-    interface StringIterator<TResult> {
-        (char: string, index?: number, string?: string): TResult;
-    }
-
-    interface MixinOptions {
-        chain?: boolean;
-    }
-
-    class LoDashWrapper<LowEntryClass extends LoDashWrapper<any>> {
-
-        /**
-         * @see  _.has
-         */
-        has(path: StringRepresentable | StringRepresentable[]): LowEntryClass;
-
-        /**
-         * @see  _.hasIn
-         */
-        hasIn(path: StringRepresentable | StringRepresentable[]): LowEntryClass;
-
-        /**
-         * @see _.assign
-         */
-        assign<TSource extends {}, TResult extends {}>(
-            source: TSource
-        ): LowEntryClass;
-
-        /**
-         * @see _.assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2
-        ): LowEntryClass;
-
-        /**
-         * @see _.assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LowEntryClass;
-
-        /**
-         * @see  _.assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LowEntryClass;
-
-        /**
-         * @see _.assign
-         */
-        assign(): LowEntryClass;
-
-        /**
-         * @see _.assign
-         */
-        assign<TResult extends {}>(...otherArgs: any[]): LowEntryClass;
-
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep<T>(): LowEntryClass;
-
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep<T>(): LowEntryClass;
-
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeepWith<T>(customizer: (value: any) => any): LowEntryClass[];
-
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeepWith<T>(customizer: (value: any) => any): LowEntryClass;
-
-        /**
-       * @see _.defaults
-       */
-        defaults<S1 extends {}, TResult extends {}>(
-            source1: S1,
-            ...sources: {}[]
-        ): LowEntryClass;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            ...sources: {}[]
-        ): LowEntryClass;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, S3 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            ...sources: {}[]
-        ): LowEntryClass;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, S3 extends {}, S4 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            source4: S4,
-            ...sources: {}[]
-        ): LowEntryClass;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(): LowEntryClass;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TResult>(...sources: {}[]): LowEntryClass;
-
-        /**
-         * @see _.get
-         */
-        get<TResult>(object: any,
-            path: string | number | boolean | Array<string | number | boolean>,
-            defaultValue?: TResult
-        ): LowEntryClass;
-
-        /**
-         * @see _.get
-         */
-        get<TResult>(path: string | number | boolean | Array<string | number | boolean>,
-            defaultValue?: TResult
-        ): LowEntryClass;
-
-
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            source: Dictionary<() => void>,
-            options?: MixinOptions
-        ): LowEntryClass;
-
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            options?: MixinOptions
-        ): LowEntryClass;
-
-        /**
-         * @see _.set
-         */
-        set<TResult>(
-            path: StringRepresentable | StringRepresentable[],
-            value: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.set
-         */
-        set<V, TResult>(
-            path: StringRepresentable | StringRepresentable[],
-            value: V
-        ): LowEntryClass;
-
-        /**
-         * @see _.find
-         */
-        find<T>(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.find
-         */
-        find(
-            predicate?: string,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.find
-         */
-        find<TObject extends {}>(
-            predicate?: TObject
-        ): LowEntryClass;
-
-        /**
-         * @see _.find
-         */
-        filter<TObject extends {}>(
-            predicate?: TObject
-        ): LowEntryClass;
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate: string,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            predicate: ListIterator<T, boolean> | DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate?: StringIterator<boolean>,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.filter
-         */
-        filter<W>(predicate: W): LowEntryClass;
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            iteratee?: ListIterator<T, TResult>,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.map
-         */
-        map<TResult>(
-            iteratee?: string
-        ): LowEntryClass;
-
-        /**
-         * @see _.map
-         */
-        map<TObject extends {}>(
-            iteratee?: TObject
-        ): LowEntryClass;
-        /**
-         * @see _.map
-         */
-        map<TValue, TResult>(
-            iteratee?: ListIterator<TValue, TResult> | DictionaryIterator<TValue, TResult>,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.range
-         */
-        range(
-            end?: number,
-            step?: number
-        ): LowEntryClass;
-
-        /**
-         * @see _.rangeRight
-         */
-        rangeRight(
-            end?: number,
-            step?: number
-        ): LowEntryClass;
-
-        /**
-       * @see _.remove
-       */
-        remove<T>(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: string,
-            thisArg?: any
-        ): LowEntryClass;
-
-        /**
-         * @see _.remove
-         */
-        remove<W>(
-            predicate?: W
-        ): LowEntryClass;
-
-        /**
-       * @see _.sortBy
-       */
-        sortBy<T, TSort>(
-            iteratee?: ListIterator<T, TSort>
-        ): LowEntryClass;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(iteratee: string): LowEntryClass;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}>(whereValue: W): LowEntryClass;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(): LowEntryClass;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(...iteratees: (ListIterator<T, boolean> | any | string)[]): LowEntryClass;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(iteratees: (ListIterator<T, any> | string | any)[]): LowEntryClass;
-
-        /**
-         * @see _.slice
-         */
-        slice(
-            start?: number,
-            end?: number
-        ): LowEntryClass;
-
-        /**
-         * @see _.size
-         */
-        size(): LowEntryClass;
-
-        /**
-         * @see _.take
-         */
-        take(n?: number): LowEntryClass;
-
-        /**
-         * @see _.times
-         */
-        times<TResult>(
-          iteratee: (num: number) => TResult
-        ): LowEntryClass;
-
-        /**
-         * @see _.times
-         */
-        times(): LowEntryClass;
-
-        /**
-         * @see _.uniqueId
-         */
-        uniqueId(): LowEntryClass;
-
-        value<T>(): T;
-
-        pop<T>(): T;
-        push<T>(...items: T[]): LowEntryClass;
-        shift<T>(): T;
-        sort<T>(compareFn?: (a: T, b: T) => number): LowEntryClass;
-        splice<T>(start: number): LowEntryClass;
-        splice<T>(start: number, deleteCount: number, ...items: any[]): LowEntryClass;
-        unshift<T>(...items: T[]): LowEntryClass;
-    }
-
-    export interface Storage {
-
-        /**
-          * Reads the database.
-          *
-          * @param source The source location.
-          * @param deserialize The deserialize function to apply.
-          * @return Returns a promise with the deserialized db object.
-        */
-        read?(source: string, deserialize: any): PromiseLike<any>
-
-        /**
-          * Reads the database.
-          *
-          * @param source The source location.
-          * @param deserialize The deserialize function to apply.
-          * @return Returns the deserialized db object.
-        */
-        read?(source: string, deserialize: any): {}
-
-        /**
-          * Writes to the database.
-          *
-          * @param destination The destination location.
-          * @param obj The object to write.
-          * @param serialize The serialize function to apply.
-        */
-        write?(destination: string, obj: any, serialize: any): void
-
-        /**
-          * Writes to the database.
-          *
-          * @param destination The destination location.
-          * @param obj The object to write.
-          * @param serialize The serialize function to apply.
-        */
-        write?(destination: string, obj: any, serialize: any): PromiseLike<void>
-    }
-
-    export interface Format {
-
-        /**
-          * Writes to the database.
-          *
-          * @param obj The object to serialize.
-          * @return Returns the serialized object string.
-        */
-        serialize(obj: any): string
-
-        /**
-          * Writes to the database.
-          *
-          * @param data The object to deserialize.
-          * @return Returns the deserialized object.
-        */
-        deserialize(data: string): any
-    }
-
-    export interface Options {
-
-        /**
-         * The custom "storage" object.
-         */
-        storage?: Storage
-
-        /**
-         * The custom "format" object.
-         */
-        format?: Format
-
-        /**
-         * The flag to automatically persist changes.
-         */
-        writeOnChange?: boolean
-
-    }
-
-    export class Lowdb extends LoDashWrapper<Lowdb> {
-
-        constructor(filePath: string, options?: Options);
-
-        /**
-         * Access current database state.
-         * Returns Returns the database state.
-         */
-        getState(): any
-
-        /**
-         * Drop or reset database state.
-         * @param newState New state of the database
-         */
-        setState(newState: any): void
-
-        /**
-         * Persist database.
-         * @param source The source location.
-         */
-        write(source?: string): void
-
-        /**
-         * Persist database.
-         * @param source The source location.
-         */
-        write(source?: string): PromiseLike<any>
-
-        /**
-         * Read database.
-         * @param source The source location.
-         */
-        read(source?: string): any
-
-        /**
-         * Read database.
-         * @param source The source location.
-         */
-        read(source?: string): PromiseLike<any>
-
+  export type AdapterOptions<SchemaT extends {} = any> = {
+    defaultValue?: SchemaT;
+    serialize?: (data: SchemaT) => string;
+    deserialize?: (serializedData: string) => SchemaT;
+  };
+
+  export interface BaseAdapter<SchemaT extends Object = any>
+    extends AdapterOptions<SchemaT> {
+    readonly "@@reference": SchemaT;
+    new <SchemaT extends {} = any>(
+      source: string,
+      options?: AdapterOptions<SchemaT>
+    ): BaseAdapter<SchemaT>;
+    source: string;
   }
 
-//   declare class lowdb {
-//     new (source?: string, opts?: Options): Low;
-//     (source?: string, opts?: Options) : Low;
-//   }
+  export interface AdapterSync<SchemaT extends {} = any>
+    extends BaseAdapter<SchemaT> {
+    new <SchemaT extends {} = any>(
+      source: string,
+      options?: AdapterOptions<SchemaT>
+    ): AdapterSync<SchemaT>;
+    readonly "@@isAsync": False;
+    write(state: Object): void;
+  }
+
+  export interface AdapterAsync<SchemaT extends {} = any>
+    extends BaseAdapter<SchemaT> {
+    new <SchemaT extends {} = any>(
+      source: string,
+      options?: AdapterOptions<SchemaT>
+    ): AdapterAsync<SchemaT>;
+    readonly "@@isAsync": True;
+    write(state: Object): Promise<void>;
+  }
+
+  export type Adapter<SchemaT extends {} = any> =
+    | AdapterSync<SchemaT>
+    | AdapterAsync<SchemaT>;
+
+  export interface LowdbBase<
+    SchemaT extends {},
+    AdapterT extends Adapter<SchemaT>
+  > {
+    read: () => Wrapper<this, AdapterT>;
+    getState: () => SchemaT;
+    setState: (state: SchemaT) => this;
+  }
+
+  export interface Lowdb<SchemaT extends {}, AdapterT extends Adapter<SchemaT>>
+    extends LowdbBase<SchemaT, AdapterT>,
+      LoDashExplicitWrapper<SchemaT> {
+    _: LoDashStatic;
+    /**
+     * @description Be careful: This function overwrites the whole database.
+     */
+    write<T = void>(returnValue?: T): Wrapper<T, AdapterT>;
+  }
+
+  export interface LowdbFp<
+    SchemaT extends {} = any,
+    AdapterT extends Adapter<SchemaT> = Adapter<SchemaT>
+  > extends LowdbBase<SchemaT, AdapterT> {
+    /**
+     * @description Be careful: This function overwrites the whole database.
+     */
+    write<T = void>(returnValue?: T): Wrapper<T, AdapterT>;
+    /**
+     * @description Returns a function that allows you to access/modify the database at a given path.
+     * @example
+     * ```js
+     *  const posts = db('posts')
+     *  const firstPost = posts(all => all[0])
+     *  posts.write((allPosts) => [...allPosts, {title: 'Yup!'}])
+     * ```
+     */
+    <TKey extends keyof SchemaT>(
+      path: TKey | [TKey],
+      defaultValue?: SchemaT[TKey]
+    ): FpReturn<SchemaT[TKey], AdapterT>;
+    <TKey extends keyof SchemaT, TSubKey extends keyof SchemaT[TKey]>(
+      path: [TKey, TSubKey],
+      defaultValue?: SchemaT[TKey][TSubKey]
+    ): FpReturn<SchemaT[TKey][TSubKey], AdapterT>;
+    <
+      TKey extends keyof SchemaT,
+      TSubKey extends keyof SchemaT[TKey],
+      TSubKey2 extends keyof SchemaT[TKey][TSubKey]
+    >(
+      path: [TKey, TSubKey, TSubKey2],
+      defaultValue?: SchemaT[TKey][TSubKey][TSubKey2]
+    ): FpReturn<SchemaT[TKey][TSubKey][TSubKey2], AdapterT>;
+    <
+      TKey extends keyof SchemaT,
+      TSubKey extends keyof SchemaT[TKey],
+      TSubKey2 extends keyof SchemaT[TKey][TSubKey],
+      TSubKey3 extends keyof SchemaT[TKey][TSubKey][TSubKey2]
+    >(
+      path: [TKey, TSubKey, TSubKey2, TSubKey3],
+      defaultValue?: SchemaT[TKey][TSubKey][TSubKey2][TSubKey3]
+    ): FpReturn<SchemaT[TKey][TSubKey][TSubKey2][TSubKey3], AdapterT>;
+    <
+      TKey extends keyof SchemaT,
+      TSubKey extends keyof SchemaT[TKey],
+      TSubKey2 extends keyof SchemaT[TKey][TSubKey],
+      TSubKey3 extends keyof SchemaT[TKey][TSubKey][TSubKey2],
+      TSubKey4 extends keyof SchemaT[TKey][TSubKey][TSubKey2][TSubKey3]
+    >(
+      path: [TKey, TSubKey, TSubKey2, TSubKey3, TSubKey4],
+      defaultValue?: SchemaT[TKey][TSubKey][TSubKey2][TSubKey3][TSubKey4]
+    ): FpReturn<SchemaT[TKey][TSubKey][TSubKey2][TSubKey3][TSubKey4], AdapterT>;
+    <T = any>(path: string | Array<string>, defaultValue?: T): T;
+  }
+  export interface FpReturn<PathT, AdapterT extends Adapter> {
+    /**
+     * Execute a series of functions on the data at a given path.
+     * Result of previous function is the input of the next one.
+     * Returns the result of the last function.
+     */
+    <R1>(f1: (a1: PathT) => R1): R1;
+    // <R1>(f1: [(a1: PathT) => R1]): R1;
+    <R1, R2>(f1: [(a1: PathT) => R1, (a: R1) => R2]): R2;
+    <R1, R2, R3>(f1: [(a1: PathT) => R1, (a: R1) => R2, (a: R2) => R3]): R3;
+    <R1, R2, R3, R4>(
+      f1: [(a1: PathT) => R1, (a: R1) => R2, (a: R2) => R3, (a: R3) => R4]
+    ): R4;
+    <R1, R2, R3, R4, R5>(
+      f1: [
+        (a1: PathT) => R1,
+        (a: R1) => R2,
+        (a: R2) => R3,
+        (a: R3) => R4,
+        (a: R4) => R5
+      ]
+    ): R5;
+    <R1, R2, R3, R4, R5, R6>(
+      f1: [
+        (a1: PathT) => R1,
+        (a: R1) => R2,
+        (a: R2) => R3,
+        (a: R3) => R4,
+        (a: R4) => R5,
+        (a: R5) => R6
+      ]
+    ): R6;
+    <R1, R2, R3, R4, R5, R6, R7>(
+      f1: [
+        (a1: PathT) => R1,
+        (a: R1) => R2,
+        (a: R2) => R3,
+        (a: R3) => R4,
+        (a: R4) => R5,
+        (a: R5) => R6,
+        (a: R6) => R7
+      ]
+    ): R7;
+    (funcs: Array<(a: any) => any>): any;
+
+    /**
+     * @description Writes the change to the database, based on the callback's return value.
+     * @example
+     * ```js
+     *  posts.write((allPosts) => [...allPosts, {title: 'Yup!'}])
+     * ```
+     */
+    write<R1 extends PathT>(f1: (a1: PathT) => R1): Wrapper<R1, AdapterT>;
+  }
+
+  export type lowdb = <
+    SchemaT extends AdapterT[ReferenceProperty],
+    AdapterT extends Adapter
+  >(
+    adapter: AdapterT
+  ) => If<
+    AdapterT[AsyncProperty],
+    Promise<Lowdb<RecursivelyExtend<SchemaT, AsyncTag>, AdapterT>>,
+    Lowdb<RecursivelyExtend<SchemaT, SyncTag>, AdapterT>
+  >;
+
+  export type lowdbFp = <
+    SchemaT extends AdapterT[ReferenceProperty],
+    AdapterT extends Adapter
+  >(
+    adapter: AdapterT
+  ) => If<
+    AdapterT[AsyncProperty],
+    Promise<LowdbFp<SchemaT & AsyncTag, AdapterT>>,
+    LowdbFp<SchemaT & SyncTag, AdapterT>
+  >;
+
+  export type Wrapper<T, AdapterT extends Adapter> = WrapInPromiseIfTrue<
+    T,
+    AdapterT[AsyncProperty]
+  >;
 }
 
-declare module "lowdb" {
-    export = Lowdb.Lowdb;
-}
\ No newline at end of file
+/**
+ * lodash augmentation is necessary in order not to duplicate the whole lodash definition
+ * it's mostly harmless, aside from the fact that 'write' becomes a method in a lodash.chain()
+ */
+declare module "lodash" {
+  interface LoDashExplicitWrapper<TValue> {
+    write(): WrapInPromiseIfAsyncTag<TValue, GetReferenceTypeIfDefined<TValue>>;
+    // override lodash's methods only if source tag is present:
+    value(): GetReferenceTypeIfDefined<TValue>;
+  }
+}
+
+// utility types:
+type WrapInPromiseIfTrue<T, IsAsync extends Bool> = If<IsAsync, Promise<T>, T>;
+type ReferenceProperty = "@@reference";
+/**
+ * Hidden source property for resolving to the correct type.
+ * It is doubly nested so that we retain all nullability information
+ */
+type SourceReference<T> = {
+  readonly "@@reference"?: { readonly "@@reference": T };
+};
+type GetReferenceParent<T, U = NonNull<T>> = NonNull<
+  U[keyof U & ReferenceProperty]
+>;
+type GetDefinedReferenceType<
+  TValue,
+  SourceParent = GetReferenceParent<TValue>
+> = SourceParent[keyof SourceParent & ReferenceProperty];
+type AsyncProperty = "@@isAsync";
+type AsyncTag = { readonly "@@reference"?: { readonly "@@isAsync"?: true } };
+type SyncTag = {};
+type HasAsyncTag<TaggedT, ReferenceT = GetReferenceParent<TaggedT>> = If<
+  HasReferenceProperty<TaggedT>,
+  UnionHasKey<keyof ReferenceT, AsyncProperty>,
+  False
+>;
+type HasReferenceProperty<T> = UnionHasKey<keyof NonNull<T>, ReferenceProperty>;
+type WrapInPromiseIfAsyncTag<
+  TaggedT,
+  WrappedT = GetReferenceTypeIfDefined<TaggedT>
+> = WrapInPromiseIfTrue<WrappedT, HasAsyncTag<TaggedT>>;
+
+/**
+ * Resolves the hidden source type
+ * while preserving nullability as much as possible
+ */
+type GetReferenceType<TValue, Source = GetDefinedReferenceType<TValue>> = If<
+  IsEmptyType<TValue>,
+  Source | undefined,
+  Source
+>;
+
+type GetReferenceTypeIfDefined<T> = If<
+  HasReferenceProperty<T>,
+  GetReferenceType<T>,
+  T
+>;
+
+type RecursivelyExtend<T, AddT> = If<
+  IsArrayType<T>,
+  MapArrayType<T & List<{}>, AddT>,
+  MapScalarOrObjectType<T, AddT>
+> &
+  SourceReference<T>;
+
+type MapScalarOrObjectType<T, AddT> = If<
+  IsScalarOrInstance<T>,
+  T,
+  MapObjectWithPossibleArrays<T, AddT> & SourceReference<T> & AddT
+>;
+
+type MapObjectWithPossibleArrays<T, AddT> = {
+  [P in keyof T]: If<
+    IsArrayType<T[P]>,
+    MapArrayType<T[P] & List<{}>, AddT> & SourceReference<T[P]>,
+    MapScalarOrObjectType<T[P], AddT>
+  >
+};
+
+type MapArrayType<Arr extends List<T>, AddT, T = Arr[-1]> = Array<
+  MapObjectWithPossibleArrays<T, AddT> & SourceReference<T> & AddT
+> &
+  AddT;
+
+//////////////////////////////////////////
+// generic utils (some from https://github.com/tycho01/typical/):
+
+type False = "0";
+type True = "1";
+type Bool = True | False;
+type If<Cond extends Bool, Then, Else> = { 1: Then; 0: Else }[Cond];
+
+type Obj<T> = { [k: string]: T };
+
+type And<A extends Bool, B extends Bool> = ({ 1: { 1: "1" } & Obj<"0"> } & Obj<
+  Obj<"0">
+>)[A][B];
+
+type UnionHasKey<Union extends string, K extends string> = ({
+  [S in Union]: "1"
+} &
+  Obj<"0">)[K];
+
+type Indeterminate<T extends string> = And<
+  UnionHasKey<T, "0">,
+  UnionHasKey<T, "1">
+>;
+
+type Not<T extends Bool> = { "1": "0"; "0": "1" }[T];
+
+type Determinate<T extends Bool> = Not<Indeterminate<T>>;
+
+type DefinitelyYes<T extends Bool> = And<T, Determinate<T>>;
+
+type UnionContained<T extends string, U extends string> = DefinitelyYes<
+  ({ [P in U]: "1" } & Obj<"0">)[T | U]
+>;
+
+type UnionEmpty<T extends string> = And<
+  UnionContained<T, "foo">,
+  UnionContained<T, "bar">
+>;
+
+type UnionToObject<Keys extends string> = { [K in Keys]: K };
+
+type Keyed<T> = { [K in keyof T]: K };
+
+type KeyedSafe<T> = Keyed<T> & Obj<never>;
+
+type IntersectionUnions<Big extends string, Small extends string> = KeyedSafe<
+  UnionToObject<Small>
+>[Big];
+type UnionsOverlap<Big extends string, Small extends string> = Not<
+  UnionEmpty<IntersectionUnions<Big, Small>>
+>;
+
+type DiffUnion<T extends string, U extends string> = ({ [P in T]: P } &
+  { [P in U]: never } & { [k: string]: never })[T];
+
+type ObjectHasKey<O extends {}, K extends string> = UnionHasKey<keyof O, K>;
+
+type ArrayPrototypeProperties = DiffUnion<
+  keyof Array<any>,
+  "toString" | "toLocaleString"
+>;
+type IsArrayType<T> = DefinitelyYes<ObjectHasKey<T, ArrayPrototypeProperties>>;
+/**
+ * either: undefined, never, null or {}
+ * can also be used to check if one union contains one of the above
+ **/
+type IsEmptyType<T> = UnionEmpty<keyof T>;
+
+/**
+ * false for: undefined, interfaces
+ * true for: Array, boolean, number, string, Object
+ */
+type IsScalarOrInstance<T> = ObjectHasKeySafe<T, "valueOf">;
+type ObjectHasKeySafe<O, K extends string> = UnionsOverlap<keyof O, K>;
+type NonNull<T> = T & {};
+
+interface List<T> {
+  readonly [n: number]: T;
+}
diff --git a/types/lowdb/lib/fp.d.ts b/types/lowdb/lib/fp.d.ts
new file mode 100644
index 0000000000..5202c13712
--- /dev/null
+++ b/types/lowdb/lib/fp.d.ts
@@ -0,0 +1,3 @@
+import { lowdbFp } from "../index";
+declare const lowdbFp: lowdbFp;
+export = lowdbFp;
diff --git a/types/lowdb/lib/main.d.ts b/types/lowdb/lib/main.d.ts
new file mode 100644
index 0000000000..33c4dfaae0
--- /dev/null
+++ b/types/lowdb/lib/main.d.ts
@@ -0,0 +1,3 @@
+import { lowdb } from "../index";
+declare const lowdb: lowdb;
+export = lowdb;
diff --git a/types/lowdb/lowdb-tests.ts b/types/lowdb/lowdb-tests.ts
index b7e0f4f5f6..d466681ab4 100644
--- a/types/lowdb/lowdb-tests.ts
+++ b/types/lowdb/lowdb-tests.ts
@@ -1,16 +1,203 @@
-import Lowdb = require('lowdb');
+import * as low from "lowdb";
+import * as lowfp from "lowdb/lib/fp";
+import * as FileSync from "lowdb/adapters/FileSync";
+import * as FileAsync from "lowdb/adapters/FileAsync";
+import * as LocalStorage from "lowdb/adapters/LocalStorage";
 
-const db = new Lowdb('db.json');
+const adapterSync: low.AdapterSync<{}> = new FileSync("db.json");
+const adapterAsync: low.AdapterAsync<{}> = new FileAsync("db.json");
+const db = low<DbSchema, typeof adapterSync>(adapterSync);
 
-db.defaults({ someObject: {}, anotherObject: {} }).write();
+const write: DbSchema = db.defaults({ posts: [] }).write();
 
-db.get('someObject').set('foo' , 'bar').write();
-db.get('someObject.foo').value();
+const result: Post[] = db
+  .get("posts")
+  .push({ title: "hello", views: 123 })
+  .value();
 
-db.get('anotherObject').set('foo' , 'bar').write();
-db.get('anotherObject.foo').value();
+const teste = db.get("user").value();
+const post: Post | undefined = db
+  .get("posts")
+  .find({ id: 123 })
+  .value();
 
-db.set('singleValue', 'foo').write();
-db.get('singleValue').value();
+// $ExpectError
+const postAssertWithUndefined: Post = db
+  .get("posts")
+  .find({ id: 123 })
+  .value();
 
-console.log(db.getState());
+// $ExpectError
+const postAssertWithUndefined2: Post = db
+  .get("posts")
+  .find({ id: 123 })
+  .write();
+
+low<DbSchema, typeof adapterAsync>(adapterAsync).then(dbAsync => {
+  const writeAction: Promise<Post> = dbAsync
+    .get("posts")
+    .push({ title: "async hello" })
+    .last()
+    .assign({ id: Date.now().toString() })
+    .write();
+
+  const test: Promise<Post | undefined> = dbAsync
+    .get("posts")
+    .find({})
+    .write();
+
+  const test2: Post | undefined = dbAsync
+    .get("posts")
+    .find({})
+    .value();
+
+  const tuple: Promise<[boolean, number] | undefined> = dbAsync
+    .get("posts")
+    .first()
+    .get("tuple")
+    .write();
+});
+
+async () => {
+  const adapterSync: low.AdapterSync<ExampleSchema> = new FileSync("db.json", {
+    defaultValue: {
+      posts: [{ name: "baz" }]
+    }
+  });
+
+  const adapterAsync: low.AdapterAsync<ExampleSchema> = new FileAsync(
+    "db.json",
+    {
+      defaultValue: {
+        posts: [{ name: "baz" }]
+      }
+    }
+  );
+
+  const dbSync = low(adapterSync);
+  const dbAsync = await low(adapterAsync);
+  const dbAssertTypeSync: low.Lowdb<ExampleSchema, typeof adapterSync> = dbSync;
+  const dbAssertTypeAsync: low.Lowdb<
+    ExampleSchema,
+    typeof adapterAsync
+  > = dbAsync;
+
+  const xSync: ExampleSchema = dbSync
+    .defaults({ posts: [{ name: "baz" }] })
+    .write();
+
+  const xAsync: Promise<ExampleSchema> = dbAsync
+    .defaults({ posts: [{ name: "baz" }] })
+    .write();
+
+  const result: Promise<ExampleSchema["posts"]> = dbAsync
+    .get("posts")
+    .push({ name: "hello" })
+    .write();
+
+  const resultSync: ExampleSchema["posts"] = dbSync
+    .get("posts")
+    .push({ name: "hello" })
+    .write();
+
+  const dbPromise = low<OtherSchema, typeof adapterAsync>(adapterAsync);
+  const db = await dbPromise;
+
+  const nested: OtherSchema["nested"] = db.get("nested").value();
+
+  const result2: Promise<OtherSchema["nested"]["x"]> = db
+    .get("nested")
+    .get("x")
+    .write();
+};
+
+declare const lodashChain: _.LoDashExplicitWrapper<ExampleSchema>;
+
+// let's also ensure we didn't break lodash.chain through extension
+const weDidNotBreakLodash: ExampleSchema["posts"] = lodashChain
+  .get("posts")
+  .sortBy("")
+  .value();
+
+// tests for lowdb/lib/fp:
+() => {
+  const adapterLS = new LocalStorage<DbSchema>("test.json");
+  const dbFP = lowfp(adapterLS);
+  // Get posts
+  const postsFP: low.FpReturn<Post[], low.AdapterSync<DbSchema>> = dbFP(
+    "posts"
+  );
+
+  // replace posts with a new array resulting from concat
+  // and persist database
+  const write: Post[] = postsFP.write(
+    concat({ title: "lowdb is awesome", views: random(0, 5) })
+  );
+
+  // Find post by id
+  const post: Post = postsFP(find({ id: 1 }));
+
+  // Find top 5 fives posts
+  const popular: Post[] = postsFP([
+    sortBy("views") as PostsAction,
+    take(5) as PostsAction
+  ]);
+
+  const filtered: Post[] = dbFP("posts")(filter({ published: true }));
+  const writeAction: Post[] = dbFP("posts").write(concat({ id: "123" }));
+  const writeAction2: string = dbFP(["user", "name"]).write(set("typicode"));
+
+  async () => {
+    const adapterAsync = new FileAsync<DbSchema>("test.json");
+    const dbAsyncPromise = lowfp(adapterAsync);
+    const dbAsync = await dbAsyncPromise;
+    const postsWithDefault: low.FpReturn<
+      Post[],
+      low.AdapterAsync<DbSchema>
+    > = dbAsync("posts", [{ title: "baz" }] as Post[]);
+
+    const func: Promise<Post[]> = postsWithDefault.write(post => [
+      ...post,
+      { title: "another" }
+    ]);
+  };
+
+  type PostsAction = (posts: Post[]) => Post[];
+};
+
+declare function find<A, B extends A>(a: B): (arr: A[]) => A;
+declare function filter<A, B extends A>(a: B): (arr: A[]) => A[];
+declare function random(a: number, b: number): number;
+declare function concat(a: any): <A>(arr: A) => A;
+declare function sortBy(a: any): <A>(arr: A) => A;
+declare function take<A>(a: A): <A>(arr: A) => A;
+declare function set<A>(a: A): (val: A) => A;
+
+interface DbSchema {
+  posts: Array<Post>;
+  user: {
+    name: string;
+  };
+}
+
+interface Post {
+  title?: string;
+  views?: number;
+  id?: number;
+  published?: boolean | undefined;
+  tuple?: [boolean, number];
+}
+
+interface ExampleSchema {
+  posts: Array<{
+    name: string;
+  }>;
+}
+
+interface OtherSchema extends ExampleSchema {
+  nested: {
+    x: {
+      y: number;
+    };
+  };
+}
diff --git a/types/lowdb/tsconfig.json b/types/lowdb/tsconfig.json
index 3ca3c13b78..7897564789 100644
--- a/types/lowdb/tsconfig.json
+++ b/types/lowdb/tsconfig.json
@@ -19,6 +19,13 @@
     },
     "files": [
         "index.d.ts",
+        "adapters/Base.d.ts",
+        "adapters/FileAsync.d.ts",
+        "adapters/FileSync.d.ts",
+        "adapters/LocalStorage.d.ts",
+        "adapters/Memory.d.ts",
+        "lib/fp.d.ts",
+        "lib/main.d.ts",
         "lowdb-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/lowdb/tslint.json b/types/lowdb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lowdb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lowlight/tslint.json b/types/lowlight/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lowlight/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lozad/index.d.ts b/types/lozad/index.d.ts
index eb0213f6c3..6257c47043 100644
--- a/types/lozad/index.d.ts
+++ b/types/lozad/index.d.ts
@@ -1,25 +1,25 @@
-// Type definitions for lozad 1.0
+// Type definitions for lozad 1.1
 // Project: https://github.com/ApoorvSaxena/lozad.js
 // Definitions by: York Yao <https://github.com/plantain-00>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface Option {
-    rootMargin?: string;
-    threshold?: number;
-    load?(element: HTMLElement | HTMLCanvasElement): void;
-}
-
-interface Observer {
-    observe(): void;
-}
-
-declare function lozad(selector?: string, options?: Option): Observer;
-
 declare namespace lozad {
+    interface Option {
+        rootMargin?: string;
+        threshold?: number;
+        load?(element: HTMLElement | HTMLCanvasElement): void;
+    }
+
+    interface Observer {
+        observe(): void;
+    }
+
     const prototype: {
     };
 }
 
+declare function lozad(selector?: string, options?: lozad.Option): lozad.Observer;
+
 export as namespace lozad;
 
 export = lozad;
diff --git a/types/lscache/tslint.json b/types/lscache/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lscache/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/luaparse/tslint.json b/types/luaparse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/luaparse/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/lunr/index.d.ts b/types/lunr/index.d.ts
index 42ab5ae41f..e16851b52b 100644
--- a/types/lunr/index.d.ts
+++ b/types/lunr/index.d.ts
@@ -115,7 +115,7 @@ declare namespace lunr {
          * The ref should _not_ be changed during indexing, it should be set before any documents are
          * added to the index. Changing it during indexing can lead to inconsistent results.
          *
-         * @param {string} ref - The name of the reference field in the document.
+         * @param ref - The name of the reference field in the document.
          */
         ref(ref: string): void;
 
@@ -127,7 +127,7 @@ declare namespace lunr {
          * All fields should be added before adding documents to the index. Adding fields after
          * a document has been indexed will have no effect on already indexed documents.
          *
-         * @param {string} field - The name of a field to index in all documents.
+         * @param field - The name of a field to index in all documents.
          */
         field(field: string): void;
 
@@ -137,7 +137,7 @@ declare namespace lunr {
          * and a value of 1 will fully normalise field lengths. The default is 0.75. Values of b
          * will be clamped to the range 0 - 1.
          *
-         * @param {number} number - The value to set for this tuning parameter.
+         * @param number - The value to set for this tuning parameter.
          */
         b(number: number): void;
 
@@ -146,7 +146,7 @@ declare namespace lunr {
          * frequency saturation. The default value is 1.2. Setting this to a higher value will give
          * slower saturation levels, a lower value will result in quicker saturation.
          *
-         * @param {number} number - The value to set for this tuning parameter.
+         * @param number - The value to set for this tuning parameter.
          */
         k1(number: number): void;
 
@@ -160,7 +160,7 @@ declare namespace lunr {
          * it should have all fields defined for indexing, though null or undefined values will not
          * cause errors.
          *
-         * @param {object} doc - The document to add to the index.
+         * @param doc - The document to add to the index.
          */
         add(doc: object): void;
 
@@ -170,7 +170,6 @@ declare namespace lunr {
          * This completes the indexing process and should only be called
          * once all documents have been added to the index.
          *
-         * @returns {lunr.Index}
          */
         build(): Index;
 
@@ -186,7 +185,7 @@ declare namespace lunr {
          * arguments can also be passed when calling use. The function will be called
          * with the index builder as its context.
          *
-         * @param {Function} plugin The plugin to apply.
+         * @param plugin The plugin to apply.
          */
         use(plugin: Builder.Plugin, ...args: any[]): void;
     }
@@ -240,8 +239,7 @@ declare namespace lunr {
          * the query to perform on the index.
          *
          * @callback lunr.Index~queryBuilder
-         * @param {lunr.Query} query - The query object to build up.
-         * @this lunr.Query
+         * @param query - The query object to build up.
          */
         type QueryBuilder = (this: Query, query: Query) => void;
 
@@ -310,9 +308,8 @@ declare namespace lunr {
          *
          * For more programmatic querying use lunr.Index#query.
          *
-         * @param {lunr.Index~QueryString} queryString - A string containing a lunr query.
+         * @param queryString - A string containing a lunr query.
          * @throws {lunr.QueryParseError} If the passed query string cannot be parsed.
-         * @returns {lunr.Index~Result[]}
          */
         search(queryString: Index.QueryString): Index.Result[];
 
@@ -329,10 +326,9 @@ declare namespace lunr {
          * asynchronous operation, the callback is just yielded a query object to be
          * customized.
          *
-         * @param {lunr.Index~queryBuilder} fn - A function that is used to build the query.
-         * @returns {lunr.Index~Result[]}
+         * @param fn - A function that is used to build the query.
          */
-        query(fn: Index.QueryBuilder): Index.Result;
+        query(fn: Index.QueryBuilder): Index.Result[];
 
         /**
          * Prepares the index for JSON serialization.
@@ -340,15 +336,13 @@ declare namespace lunr {
          * The schema for this JSON blob will be described in a
          * separate JSON schema file.
          *
-         * @returns {Object}
          */
         toJSON(): object;
 
         /**
          * Loads a previously serialized lunr.Index
          *
-         * @param {Object} serializedIndex - A previously serialized lunr.Index
-         * @returns {lunr.Index}
+         * @param serializedIndex - A previously serialized lunr.Index
          */
         static load(serializedIndex: object): Index;
     }
@@ -365,9 +359,9 @@ declare namespace lunr {
         metadata: object;
 
         /**
-         * @param {string} term - The term this match data is associated with
-         * @param {string} field - The field in which the term was found
-         * @param {object} metadata - The metadata recorded about this term in this field
+         * @param term - The term this match data is associated with
+         * @param field - The field in which the term was found
+         * @param metadata - The metadata recorded about this term in this field
          */
         constructor(term: string, field: string, metadata: object)
 
@@ -377,7 +371,7 @@ declare namespace lunr {
          * method combines metadata from another instance of lunr.MatchData with this
          * objects metadata.
          *
-         * @param {lunr.MatchData} otherMatchData - Another instance of match data to merge with this one.
+         * @param otherMatchData - Another instance of match data to merge with this one.
          * @see {@link lunr.Index~Result}
          */
         combine(otherMatchData: MatchData): void;
@@ -397,11 +391,9 @@ declare namespace lunr {
      *
      * Any number of pipeline functions may be chained together using a lunr.Pipeline.
      *
-     * @interface lunr.PipelineFunction
-     * @param {lunr.Token} token - A token from the document being processed.
-     * @param {number} i - The index of this token in the complete list of tokens for this document/field.
-     * @param {lunr.Token[]} tokens - All tokens for this document/field.
-     * @returns {(?lunr.Token|lunr.Token[])}
+     * @param token - A token from the document being processed.
+     * @param i - The index of this token in the complete list of tokens for this document/field.
+     * @param tokens - All tokens for this document/field.
      */
     type PipelineFunction = (
         token: Token,
@@ -448,8 +440,8 @@ declare namespace lunr {
          * Registering a function does not add it to a pipeline, functions must still be
          * added to instances of the pipeline for them to be used when running a pipeline.
          *
-         * @param {lunr.PipelineFunction} fn - The function to check for.
-         * @param {String} label - The label to register this function with
+         * @param fn - The function to check for.
+         * @param label - The label to register this function with
          */
         static registerFunction(fn: PipelineFunction, label: string): void;
 
@@ -460,8 +452,7 @@ declare namespace lunr {
          * If any function from the serialised data has not been registered then an
          * error will be thrown.
          *
-         * @param {Object} serialised - The serialised pipeline to load.
-         * @returns {lunr.Pipeline}
+         * @param serialised - The serialised pipeline to load.
          */
         static load(serialised: object): Pipeline;
 
@@ -470,7 +461,7 @@ declare namespace lunr {
          *
          * Logs a warning if the function has not been registered.
          *
-         * @param {lunr.PipelineFunction[]} functions - Any number of functions to add to the pipeline.
+         * @param functions - Any number of functions to add to the pipeline.
          */
         add(...functions: PipelineFunction[]): void;
 
@@ -480,8 +471,8 @@ declare namespace lunr {
          *
          * Logs a warning if the function has not been registered.
          *
-         * @param {lunr.PipelineFunction} existingFn - A function that already exists in the pipeline.
-         * @param {lunr.PipelineFunction} newFn - The new function to add to the pipeline.
+         * @param existingFn - A function that already exists in the pipeline.
+         * @param newFn - The new function to add to the pipeline.
          */
         after(existingFn: PipelineFunction, newFn: PipelineFunction): void;
 
@@ -491,15 +482,15 @@ declare namespace lunr {
          *
          * Logs a warning if the function has not been registered.
          *
-         * @param {lunr.PipelineFunction} existingFn - A function that already exists in the pipeline.
-         * @param {lunr.PipelineFunction} newFn - The new function to add to the pipeline.
+         * @param existingFn - A function that already exists in the pipeline.
+         * @param newFn - The new function to add to the pipeline.
          */
         before(existingFn: PipelineFunction, newFn: PipelineFunction): void;
 
         /**
          * Removes a function from the pipeline.
          *
-         * @param {lunr.PipelineFunction} fn The function to remove from the pipeline.
+         * @param fn The function to remove from the pipeline.
          */
         remove(fn: PipelineFunction): void;
 
@@ -507,8 +498,7 @@ declare namespace lunr {
          * Runs the current list of functions that make up the pipeline against the
          * passed tokens.
          *
-         * @param {Array} tokens The tokens to run through the pipeline.
-         * @returns {Array}
+         * @param tokens The tokens to run through the pipeline.
          */
         run(tokens: Token[]): Token[];
 
@@ -517,8 +507,7 @@ declare namespace lunr {
          * strings out. This method takes care of wrapping the passed string in a
          * token and mapping the resulting tokens back to strings.
          *
-         * @param {string} str - The string to pass through the pipeline.
-         * @returns {string[]}
+         * @param str - The string to pass through the pipeline.
          */
         runString(str: string): string[];
 
@@ -533,7 +522,6 @@ declare namespace lunr {
          *
          * Logs a warning if the function has not been registered.
          *
-         * @returns {Array}
          */
         toJSON(): PipelineFunction[];
     }
@@ -548,19 +536,18 @@ declare namespace lunr {
         /**
          * A single clause in a {@link lunr.Query} contains a term and details on how to
          * match that term against a {@link lunr.Index}.
-         *
-         * @typedef {Object} lunr.Query~Clause
-         * @property {string[]} fields - The fields in an index this clause should be matched against.
-         * @property {number} [boost=1] - Any boost that should be applied when matching this clause.
-         * @property {number} [editDistance] - Whether the term should have fuzzy matching applied, and how fuzzy the match should be.
-         * @property {boolean} [usePipeline] - Whether the term should be passed through the search pipeline.
-         * @property {number} [wildcard=0] - Whether the term should have wildcards appended or prepended.
          */
         interface Clause {
+            term: string;
+            /** The fields in an index this clause should be matched against. */
             fields: string[];
+            /** Any boost that should be applied when matching this clause. */
             boost: number;
+            /** Whether the term should have fuzzy matching applied, and how fuzzy the match should be. */
             editDistance: number;
+            /** Whether the term should be passed through the search pipeline. */
             usePipeline: boolean;
+            /** Whether the term should have wildcards appended or prepended. */
             wildcard: number;
         }
     }
@@ -571,9 +558,6 @@ declare namespace lunr {
      *
      * Prefer constructing a lunr.Query using the {@link lunr.Index#query} method
      * so the query object is pre-initialized with the right index fields.
-     *
-     * @property {lunr.Query~Clause[]} clauses - An array of query clauses.
-     * @property {string[]} allFields - An array of all available fields in a lunr.Index.
      */
     class Query {
         /**
@@ -597,9 +581,8 @@ declare namespace lunr {
          * Unless the clause contains the fields to be matched all fields will be matched. In addition
          * a default boost of 1 is applied to the clause.
          *
-         * @param {lunr.Query~Clause} clause - The clause to add to this query.
+         * @param clause - The clause to add to this query.
          * @see lunr.Query~Clause
-         * @returns {lunr.Query}
          */
         clause(clause: Query.Clause): Query;
 
@@ -607,9 +590,8 @@ declare namespace lunr {
          * Adds a term to the current query, under the covers this will create a {@link lunr.Query~Clause}
          * to the list of clauses that make up this query.
          *
-         * @param {string} term - The term to add to the query.
-         * @param {Object} [options] - Any additional properties to add to the query clause.
-         * @returns {lunr.Query}
+         * @param term - The term to add to the query.
+         * @param [options] - Any additional properties to add to the query clause.
          * @see lunr.Query#clause
          * @see lunr.Query~Clause
          * @example <caption>adding a single term to a query</caption>
@@ -637,14 +619,26 @@ declare namespace lunr {
      * lunr.stemmer is an english language stemmer, this is a JavaScript
      * implementation of the PorterStemmer taken from http://tartarus.org/~martin
      *
-     * @static
-     * @implements {lunr.PipelineFunction}
-     * @param {lunr.Token} token - The string to stem
-     * @returns {lunr.Token}
+     * Implements {lunr.PipelineFunction}
+     *
+     * @param token - The string to stem
      * @see {@link lunr.Pipeline}
      */
     function stemmer(token: Token): Token;
 
+    /**
+     * lunr.generateStopWordFilter builds a stopWordFilter function from the provided
+     * list of stop words.
+     *
+     * The built in lunr.stopWordFilter is built using this generator and can be used
+     * to generate custom stopWordFilters for applications or non English languages.
+     *
+     * @param stopWords - The list of stop words
+     * @see lunr.Pipeline
+     * @see lunr.stopWordFilter
+     */
+    function generateStopWordFilter(stopWords: string[]): PipelineFunction;
+
     /**
      * lunr.stopWordFilter is an English language stop word list filter, any words
      * contained in the list will not be passed through the filter.
@@ -652,9 +646,9 @@ declare namespace lunr {
      * This is intended to be used in the Pipeline. If the token does not pass the
      * filter then undefined will be returned.
      *
-     * @implements {lunr.PipelineFunction}
-     * @params {lunr.Token} token - A token to check for being a stop word.
-     * @returns {lunr.Token}
+     * Implements {lunr.PipelineFunction}
+     *
+     * @param token - A token to check for being a stop word.
      * @see {@link lunr.Pipeline}
      */
     function stopWordFilter(token: Token): Token;
@@ -665,8 +659,8 @@ declare namespace lunr {
          * when cloning a token.
          *
          * @callback lunr.Token~updateFunction
-         * @param {string} str - The string representation of the token.
-         * @param {Object} metadata - All metadata associated with this token.
+         * @param str - The string representation of the token.
+         * @param metadata - All metadata associated with this token.
          */
         type UpdateFunction = (str: string, metadata: object) => void;
     }
@@ -677,15 +671,14 @@ declare namespace lunr {
      */
     class Token {
         /**
-         * @param {string} [str=''] - The string token being wrapped.
-         * @param {object} [metadata={}] - Metadata associated with this token.
+         * @param [str=''] - The string token being wrapped.
+         * @param [metadata={}] - Metadata associated with this token.
          */
         constructor(str: string, metadata: object)
 
         /**
          * Returns the token string that is being wrapped by this object.
          *
-         * @returns {string}
          */
         toString(): string;
 
@@ -697,8 +690,7 @@ declare namespace lunr {
          *   return str.toUpperCase()
          * })
          *
-         * @param {lunr.Token~updateFunction} fn - A function to apply to the token string.
-         * @returns {lunr.Token}
+         * @param fn - A function to apply to the token string.
          */
         update(fn: Token.UpdateFunction): Token;
 
@@ -706,10 +698,9 @@ declare namespace lunr {
          * Creates a clone of this token. Optionally a function can be
          * applied to the cloned token.
          *
-         * @param {lunr.Token~updateFunction} [fn] - An optional function to apply to the cloned token.
-         * @returns {lunr.Token}
+         * @param fn - An optional function to apply to the cloned token.
          */
-        clone(fn: Token.UpdateFunction): Token;
+        clone(fn?: Token.UpdateFunction): Token;
     }
 
     /**
@@ -737,8 +728,7 @@ declare namespace lunr {
         /**
          * Creates a TokenSet instance from the given sorted array of words.
          *
-         * @param {String[]} arr - A sorted array of strings to create the set from.
-         * @returns {lunr.TokenSet}
+         * @param arr - A sorted array of strings to create the set from.
          * @throws Will throw an error if the input array is not sorted.
          */
         fromArray(arr: string[]): TokenSet;
@@ -754,9 +744,8 @@ declare namespace lunr {
          * on the performance of both creating and intersecting these TokenSets.
          * It is advised to keep the edit distance less than 3.
          *
-         * @param {string} str - The string to create the token set from.
-         * @param {number} editDistance - The allowed edit distance to match.
-         * @returns {lunr.Vector}
+         * @param str - The string to create the token set from.
+         * @param editDistance - The allowed edit distance to match.
          */
         fromFuzzyString(str: string, editDistance: number): Vector;
 
@@ -767,8 +756,7 @@ declare namespace lunr {
          * that will allow wildcard matching when intersecting with
          * another TokenSet.
          *
-         * @param {string} str - The string to create a TokenSet from.
-         * @returns {lunr.TokenSet}
+         * @param str - The string to create a TokenSet from.
          */
         fromString(str: string): TokenSet;
 
@@ -776,7 +764,6 @@ declare namespace lunr {
          * Converts this TokenSet into an array of strings
          * contained within the TokenSet.
          *
-         * @returns {string[]}
          */
         toArray(): string[];
 
@@ -788,7 +775,6 @@ declare namespace lunr {
          * of a TokenSet. As such it is not designed to be a human
          * friendly representation of the TokenSet.
          *
-         * @returns {string}
          */
         toString(): string;
 
@@ -799,8 +785,7 @@ declare namespace lunr {
          * This intersection will take into account any wildcards
          * contained within the TokenSet.
          *
-         * @param {lunr.TokenSet} b - An other TokenSet to intersect with.
-         * @returns {lunr.TokenSet}
+         * @param b - An other TokenSet to intersect with.
          */
         intersect(b: TokenSet): TokenSet;
     }
@@ -810,10 +795,9 @@ declare namespace lunr {
          * The separator used to split a string into tokens. Override this property to change the behaviour of
          * `lunr.tokenizer` behaviour when tokenizing strings. By default this splits on whitespace and hyphens.
          *
-         * @static
          * @see lunr.tokenizer
          */
-        const separator: RegExp;
+        let separator: RegExp;
     }
 
     /**
@@ -825,9 +809,7 @@ declare namespace lunr {
      * then will split this string on the character in `lunr.tokenizer.separator`.
      * Arrays will have their elements converted to strings and wrapped in a lunr.Token.
      *
-     * @static
-     * @param {?(string|object|object[])} obj - The object to convert into tokens
-     * @returns {lunr.Token[]}
+     * @param obj - The object to convert into tokens
      */
     function tokenizer(obj?: null | string | object | object[]): Token[];
 
@@ -840,10 +822,9 @@ declare namespace lunr {
      * characters and should either be removed or adapted for use
      * with languages with non-latin characters.
      *
-     * @static
-     * @implements {lunr.PipelineFunction}
-     * @param {lunr.Token} token The token to pass through the filter
-     * @returns {lunr.Token}
+     * Implements {lunr.PipelineFunction}
+     *
+     * @param token The token to pass through the filter
      * @see lunr.Pipeline
      */
     function trimmer(token: Token): Token;
@@ -855,8 +836,7 @@ declare namespace lunr {
         /**
          * Print a warning message to the console.
          *
-         * @param {String} message The message to be printed.
-         * @memberOf Utils
+         * @param message The message to be printed.
          */
         function warn(message: string): void;
 
@@ -867,9 +847,8 @@ declare namespace lunr {
          * the empty string, in all other cases the result of calling
          * `toString` on the passed object is returned.
          *
-         * @param {Any} obj The object to convert to a string.
-         * @return {String} string representation of the passed object.
-         * @memberOf Utils
+         * @param obj The object to convert to a string.
+         * @return string representation of the passed object.
          */
         function asString(obj: any): string;
     }
@@ -889,7 +868,7 @@ declare namespace lunr {
      */
     class Vector {
         /**
-         * @param {Number[]} [elements] - The flat list of element index and element value pairs.
+         * @param [elements] - The flat list of element index and element value pairs.
          */
         constructor(elements: number[])
 
@@ -900,8 +879,7 @@ declare namespace lunr {
          * the position is returned as if the value for that index were to be updated, but it
          * is the callers responsibility to check whether there is a duplicate at that index
          *
-         * @param {Number} insertIdx - The index at which the element should be inserted.
-         * @returns {Number}
+         * @param insertIdx - The index at which the element should be inserted.
          */
         positionForIndex(index: number): number;
 
@@ -911,17 +889,17 @@ declare namespace lunr {
          * Does not allow duplicates, will throw an error if there is already an entry
          * for this index.
          *
-         * @param {Number} insertIdx - The index at which the element should be inserted.
-         * @param {Number} val - The value to be inserted into the vector.
+         * @param insertIdx - The index at which the element should be inserted.
+         * @param val - The value to be inserted into the vector.
          */
         insert(insertIdx: number, val: number): void;
 
         /**
          * Inserts or updates an existing index within the vector.
          *
-         * @param {Number} insertIdx - The index at which the element should be inserted.
-         * @param {Number} val - The value to be inserted into the vector.
-         * @param {function} fn - A function that is called for updates, the existing value and the
+         * @param insertIdx - The index at which the element should be inserted.
+         * @param val - The value to be inserted into the vector.
+         * @param fn - A function that is called for updates, the existing value and the
          * requested value are passed as arguments
          */
         upsert(
@@ -933,15 +911,13 @@ declare namespace lunr {
         /**
          * Calculates the magnitude of this vector.
          *
-         * @returns {Number}
          */
         magnitude(): number;
 
         /**
          * Calculates the dot product of this vector and another vector.
          *
-         * @param {lunr.Vector} otherVector - The vector to compute the dot product with.
-         * @returns {Number}
+         * @param otherVector - The vector to compute the dot product with.
          */
         dot(otherVector: Vector): number;
 
@@ -949,23 +925,20 @@ declare namespace lunr {
          * Calculates the cosine similarity between this vector and another
          * vector.
          *
-         * @param {lunr.Vector} otherVector - The other vector to calculate the
+         * @param otherVector - The other vector to calculate the
          * similarity with.
-         * @returns {Number}
          */
         similarity(otherVector: Vector): number;
 
         /**
          * Converts the vector to an array of the elements within the vector.
          *
-         * @returns {Number[]}
          */
         toArray(): number[];
 
         /**
          * A JSON serializable representation of the vector.
          *
-         * @returns {Number[]}
          */
         toJSON(): number[];
     }
diff --git a/types/lunr/lunr-tests.ts b/types/lunr/lunr-tests.ts
index ea5f32cfa0..ade45cae64 100644
--- a/types/lunr/lunr-tests.ts
+++ b/types/lunr/lunr-tests.ts
@@ -33,3 +33,9 @@ function pipeline_test() {
         });
     });
 }
+
+function pipeline_function_test() {
+    const stemmer: lunr.PipelineFunction = lunr.stemmer;
+    const stopWordFilter: lunr.PipelineFunction = lunr.stopWordFilter;
+    const trimmer: lunr.PipelineFunction = lunr.trimmer;
+}
diff --git a/types/lunr/v0/index.d.ts b/types/lunr/v0/index.d.ts
index 919fb5ecf9..c7869c366f 100644
--- a/types/lunr/v0/index.d.ts
+++ b/types/lunr/v0/index.d.ts
@@ -17,10 +17,8 @@ declare namespace lunr {
      * the search index. Uses `lunr.tokenizer.seperator` to split strings, change
      * the value of this property to change how strings are split into tokens.
      *
-     * @module
-     * @param {String} obj The string to convert into tokens
+     * @param obj The string to convert into tokens
      * @see lunr.tokenizer.seperator
-     * @returns {Array}
      */
     function tokenizer(obj: any): string[];
 
@@ -31,7 +29,6 @@ declare namespace lunr {
          * The sperator used to split a string into tokens. Override this property to change the behaviour of
          * `lunr.tokenizer` behaviour when tokenizing strings. By default this splits on whitespace and hyphens.
          *
-         * @static
          * @see lunr.tokenizer
          *
          * (Note: this is misspelled in the original API, kept for compatibility sake)
@@ -49,9 +46,8 @@ declare namespace lunr {
          *
          * Registering a function does not add it to an index, functions must still be associated with a specific index for them to be used when indexing and searching documents.
          *
-         * @param {Function} fn The function to register.
-         * @param {String} label The label to register this function with
-         * @memberOf tokenizer
+         * @param fn The function to register.
+         * @param label The label to register this function with
          */
         function registerFunction(fn: TokenizerFunction, label: string): void;
 
@@ -61,9 +57,7 @@ declare namespace lunr {
          * A tokenizer function to be loaded must already be registered with lunr.tokenizer.
          * If the serialised tokenizer has not been registered then an error will be thrown.
          *
-         * @param {String} label The label of the serialised tokenizer.
-         * @returns {Function}
-         * @memberOf tokenizer
+         * @param label The label of the serialised tokenizer.
          */
         function load(label: string): TokenizerFunction;
     }
@@ -133,7 +127,6 @@ declare namespace lunr {
          * Additional data can be passed to the event handler as arguments to emit after the event name.
          *
          * @param eventName The name of the event to emit.
-         * @param args
          */
         emit(eventName: string, ...args: any[]): void;
 
@@ -616,7 +609,6 @@ declare namespace lunr {
          * ```
          *
          * @param plugin  The plugin to apply.
-         * @param args
          */
         use(plugin: Function, ...args: any[]): void;
 
@@ -751,7 +743,6 @@ declare namespace lunr {
          * the store.
          *
          * @param token  The token to expand.
-         * @param memo
          */
         expand(token: string, memo?: string[]): string[];
 
@@ -775,8 +766,7 @@ declare namespace lunr {
         /**
          * Print a warning message to the console.
          *
-         * @param {String} message The message to be printed.
-         * @memberOf Utils
+         * @param message The message to be printed.
          */
         function warn(message: any): void;
 
@@ -787,9 +777,8 @@ declare namespace lunr {
          * the empty string, in all other cases the result of calling
          * `toString` on the passed object is returned.
          *
-         * @param {Any} obj The object to convert to a string.
-         * @return {String} string representation of the passed object.
-         * @memberOf Utils
+         * @param obj The object to convert to a string.
+         * @return string representation of the passed object.
          */
         function asString(obj: any): string;
     }
diff --git a/types/lusca/index.d.ts b/types/lusca/index.d.ts
new file mode 100644
index 0000000000..8527ef3411
--- /dev/null
+++ b/types/lusca/index.d.ts
@@ -0,0 +1,78 @@
+// Type definitions for lusca 1.5
+// Project: https://github.com/krakenjs/lusca#readme
+// Definitions by: Corbin Crutchley <https://github.com/crutchcorn>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import express = require('express');
+
+declare function lusca(options?: lusca.LuscaOptions): express.RequestHandler;
+
+declare namespace lusca {
+    /*~ Documentation declares that:
+     *~ Setting any value to false will disable it.
+     */
+    interface LuscaOptions {
+        csrf?: csrfOptions | boolean;
+        csp?: cspOptions | false;
+        xframe?: string | false;
+        p3p?: string | false;
+        hsts?: hstsOptions | false;
+        xssProtection?: xssProtectionOptions | boolean;
+        nosniff?: boolean;
+        referrerPolicy?: string | false;
+    }
+
+    interface cspOptions {
+        policy?: string | object | Array<object | string>;
+        reportOnly?: boolean;
+        reportUri?: string;
+        styleNonce?: boolean;
+        scriptNonce?: boolean;
+    }
+
+    interface hstsOptions {
+        maxAge?: number;
+        includeSubDomains?: boolean;
+        preload?: boolean;
+    }
+
+    type csrfOptions = csrfOptionsAngular | csrfOptionsNonAngular;
+
+    interface csrfOptionsAngular  {
+        key?: string;
+        secret?: string;
+        impl?: () => any;
+        cookie?: string | {
+            options?: object;
+        };
+        angular: true;
+    }
+
+    interface csrfOptionsNonAngular {
+        key?: string;
+        secret?: string;
+        impl?: () => any;
+        cookie?: string | {
+            name: string;
+            options?: object;
+        };
+        angular?: false;
+    }
+
+    interface xssProtectionOptions {
+        enabled?: boolean;
+        mode?: string;
+    }
+
+    function csrf(options?: csrfOptions): express.RequestHandler;
+    function csp(options?: cspOptions): express.RequestHandler;
+    function xframe(value: string): express.RequestHandler;
+    function p3p(value: string): express.RequestHandler;
+    function hsts(options?: hstsOptions): express.RequestHandler;
+    function xssProtection(options?: xssProtectionOptions | true): express.RequestHandler;
+    function nosniff(): express.RequestHandler;
+    function referrerPolicy(value: string): express.RequestHandler;
+}
+
+export = lusca;
diff --git a/types/lusca/lusca-tests.ts b/types/lusca/lusca-tests.ts
new file mode 100644
index 0000000000..8a74ec5e8a
--- /dev/null
+++ b/types/lusca/lusca-tests.ts
@@ -0,0 +1,24 @@
+import express = require('express');
+import lusca = require('lusca');
+
+const app = express();
+
+app.use(lusca({
+    csrf: true,
+    csp: { policy: "referrer no-referrer"},
+    xframe: 'SAMEORIGIN',
+    p3p: 'ABCDEF',
+    hsts: {maxAge: 31536000, includeSubDomains: true, preload: true},
+    xssProtection: true,
+    nosniff: true,
+    referrerPolicy: 'same-origin'
+}));
+
+app.use(lusca.csrf());
+app.use(lusca.csp({policy: [{ "img-src": "'self' http:" }, "block-all-mixed-content"], reportOnly: false}));
+app.use(lusca.xframe('SAMEORIGIN'));
+app.use(lusca.p3p('ABCDEF'));
+app.use(lusca.hsts({ maxAge: 31536000 }));
+app.use(lusca.xssProtection(true));
+app.use(lusca.nosniff());
+app.use(lusca.referrerPolicy('same-origin'));
diff --git a/types/lusca/tsconfig.json b/types/lusca/tsconfig.json
new file mode 100644
index 0000000000..ede7926c1c
--- /dev/null
+++ b/types/lusca/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "lusca-tests.ts"
+    ]
+}
diff --git a/types/lusca/tslint.json b/types/lusca/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/lusca/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
new file mode 100644
index 0000000000..c8ce226220
--- /dev/null
+++ b/types/luxon/index.d.ts
@@ -0,0 +1,374 @@
+// Type definitions for luxon 0.2
+// Project: https://github.com/moment/luxon#readme
+// Definitions by: Colby DeHart <https://github.com/colbydehart>
+//                 Hyeonseok Yang <https://github.com/FourwingsY>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare module 'luxon' {
+    namespace luxon {
+        type DateTimeFormatOptions = Intl.DateTimeFormatOptions;
+
+        type ZoneOptions = {
+            keepCalendarTime?: boolean;
+        };
+
+        type ToFormatOptions = DateTimeFormatOptions & {
+            round?: boolean;
+        };
+
+        type ISOTimeOptions = {
+            suppressMilliseconds?: boolean;
+            suppressSeconds?: boolean;
+            includeOffset?: boolean;
+        };
+
+        type LocaleOptions = {
+            locale?: string;
+            outputCalendar?: string;
+            numberingSystem?: string;
+        };
+
+        type DateTimeOptions = LocaleOptions & {
+            zone?: string | Zone;
+            setZone?: boolean;
+        };
+
+        type DateTimeJSOptions = LocaleOptions & {
+            zone?: string | Zone;
+        };
+
+        type DateObjectUnits = {
+            year?: number;
+            month?: number;
+            day?: number;
+            ordinal?: number;
+            weekYear?: number;
+            weekNumber?: number;
+            weekday?: number;
+            hour?: number;
+            minute?: number;
+            second?: number;
+            millisecond?: number;
+        };
+
+        type DateObject = DateObjectUnits & LocaleOptions & {
+            zone?: string | Zone;
+        };
+
+        type DiffOptions = {
+            conversionAccuracy?: string;
+        };
+
+        class DateTime {
+            static DATETIME_FULL: DateTimeFormatOptions;
+            static DATETIME_FULL_WITH_SECONDS: DateTimeFormatOptions;
+            static DATEIME_HUGE: DateTimeFormatOptions;
+            static DATEIME_HUGE_WITH_SECONDS: DateTimeFormatOptions;
+            static DATETIME_MED: DateTimeFormatOptions;
+            static DATETIME_MED_WITH_SECONDS: DateTimeFormatOptions;
+            static DATETIME_SHORT: DateTimeFormatOptions;
+            static DATETIME_SHORT_WITH_SECONDS: DateTimeFormatOptions;
+            static DATE_FULL: DateTimeFormatOptions;
+            static DATE_HUGE: DateTimeFormatOptions;
+            static DATE_MED: DateTimeFormatOptions;
+            static DATE_SHORT: DateTimeFormatOptions;
+            static TIME_24_SIMPLE: DateTimeFormatOptions;
+            static TIME_24_WITH_LONG_OFFSET: DateTimeFormatOptions;
+            static TIME_24_WITH_SECONDS: DateTimeFormatOptions;
+            static TIME_24_WITH_SHORT_OFFSET: DateTimeFormatOptions;
+            static TIME_SIMPLE: DateTimeFormatOptions;
+            static TIME_WITH_LONG_OFFSET: DateTimeFormatOptions;
+            static TIME_WITH_SECONDS: DateTimeFormatOptions;
+            static TIME_WITH_SHORT_OFFSET: DateTimeFormatOptions;
+            static fromHTTP(text: string, options?: DateTimeOptions): DateTime;
+            static fromISO(text: string, options?: DateTimeOptions): DateTime;
+            static fromJSDate(
+                date: Date,
+                options?: DateTimeJSOptions
+            ): DateTime;
+            static fromMillis(ms: number, options?: DateTimeOptions): DateTime;
+            static fromObject(obj: DateObject): DateTime;
+            static fromRFC2822(
+                text: string,
+                options?: DateTimeOptions
+            ): DateTime;
+            static fromSQL(text: string, options?: DateTimeOptions): DateTime;
+            static fromString(
+                text: string,
+                format: string,
+                options?: DateTimeOptions
+            ): DateTime;
+            static fromStringExplain(
+                text: string,
+                format: string,
+                options?: DateTimeOptions
+            ): object;
+            static invalid(reason: any): DateTime;
+            static local(
+                year?: number,
+                month?: number,
+                day?: number,
+                hour?: number,
+                minute?: number,
+                second?: number,
+                millisecond?: number
+            ): DateTime;
+            static max(...dateTimes: DateTime[]): DateTime | undefined;
+            static min(...dateTimes: DateTime[]): DateTime | undefined;
+            static utc(
+                year?: number,
+                month?: number,
+                day?: number,
+                hour?: number,
+                minute?: number,
+                second?: number,
+                millisecond?: number
+            ): DateTime;
+            day: number;
+            daysInMonth: number;
+            daysInYear: number;
+            hour: number;
+            invalidReason: string;
+            isInDST: boolean;
+            isOffsetFixed: boolean;
+            isValid: boolean;
+            locale: string;
+            millisecond: number;
+            minute: number;
+            month: number;
+            monthLong: string;
+            monthShort: string;
+            numberingSystem: string;
+            offset: number;
+            offsetNameLong: string;
+            offsetNameShort: string;
+            ordinal: number;
+            outputCalendar: string;
+            second: number;
+            weekNumber: number;
+            weekYear: number;
+            weekday: number;
+            weekdayLong: string;
+            weekdayShort: string;
+            year: number;
+            zoneName: string;
+            diff(
+                other: DateTime,
+                unit?: string | string[],
+                options?: DiffOptions
+            ): Duration;
+            diffNow(unit?: string | string[], options?: DiffOptions): Duration;
+            endOf(unit: string): DateTime;
+            equals(other: DateTime): boolean;
+            get(unit: string): number;
+            hasSame(other: DateTime, unit: string): boolean;
+            minus(duration: Duration | number | DurationObject): DateTime;
+            plus(duration: Duration | number | DurationObject): DateTime;
+            reconfigure(properties: LocaleOptions): DateTime;
+            resolvedLocaleOpts(options?: ToFormatOptions): LocaleOptions;
+            set(values: DateObjectUnits): DateTime;
+            setLocale(locale: any): DateTime;
+            setZone(zone: string | Zone, options?: ZoneOptions): DateTime;
+            startOf(unit: string): DateTime;
+            toFormat(format: string, options?: ToFormatOptions): string;
+            toHTTP(): string;
+            toISO(options?: ISOTimeOptions): string;
+            toISODate(): string;
+            toISOTime(options?: ISOTimeOptions): string;
+            toISOWeekDate(): string;
+            toJSDate(): Date;
+            toJSON(): string;
+            toLocal(): DateTime;
+            toLocaleParts(options?: DateTimeFormatOptions): any[];
+            toLocaleString(options?: DateTimeFormatOptions): string;
+            toObject(options?: { includeConfig?: boolean }): DateObject;
+            toRFC2822(): string;
+            toSQL(options?: Object): string;
+            toSQLDate(): string;
+            toSQLTime(options?: Object): string;
+            toString(): string;
+            toUTC(offset?: number, options?: ZoneOptions): DateTime;
+            until(other: DateTime): Duration;
+            valueOf(): number;
+        }
+
+        type DurationOptions = {
+            locale?: string;
+            numberingSystem?: string;
+            conversionAccuracy?: string;
+        };
+
+        type DurationObjectUnits = {
+            years?: number;
+            months?: number;
+            weeks?: number;
+            days?: number;
+            hours?: number;
+            minutes?: number;
+            seconds?: number;
+            milliseconds?: number;
+        };
+
+        type DurationObject = DurationObjectUnits & DurationOptions;
+
+        class Duration {
+            static fromISO(text: string, options?: DurationOptions): Duration;
+            static fromMillis(
+                count: number,
+                options?: DurationOptions
+            ): Duration;
+            static fromObject(
+                Object: DurationObject
+            ): Duration;
+            static invalid(reason?: string): Duration;
+            days: number;
+            hours: number;
+            invalidReason: string;
+            isValid: boolean;
+            locale: string;
+            milliseconds: number;
+            minutes: number;
+            months: number;
+            numberingSystem: string;
+            seconds: number;
+            weeks: number;
+            years: number;
+            as(unit: string): number;
+            equals(other: Duration): boolean;
+            get(unit: string): number;
+            minus(duration: Duration | number | DurationObject): Duration;
+            negate(): Duration;
+            normalize(): Duration;
+            plus(duration: Duration | number | DurationObject): Duration;
+            reconfigure(objectPattern: DurationOptions): Duration;
+            set(values: DurationObjectUnits): Duration;
+            shiftTo(...units: string[]): Duration;
+            toFormat(format: string, options?: ToFormatOptions): string;
+            toISO(): string;
+            toJSON(): string;
+            toObject(options?: {
+                includeConfig?: boolean;
+            }): DurationObject;
+            toString(): string;
+        }
+
+        type EraLength = 'short' | 'long';
+        type UnitLength = EraLength | 'numeric' | '2-digit' | 'narrow';
+        type UnitOptions = InfoOptions & {
+            numberingSystem?: string;
+            outputCalendar?: string;
+        };
+
+        type InfoOptions = {
+            locale?: string;
+        };
+
+        type Features = {
+            intl: boolean;
+            intlTokens: boolean;
+            timezones: boolean;
+        };
+
+        namespace Info {
+            function eras(length?: EraLength, options?: InfoOptions): string[];
+            function features(): Features;
+            function hasDST(zone: string | Zone): boolean;
+            function meridiems(options?: InfoOptions): string[];
+            function months(length?: UnitLength, options?: UnitOptions): string[];
+            function monthsFormat(length?: UnitLength, options?: UnitOptions): string[];
+            function weekdays(length?: UnitLength, options?: UnitOptions): string[];
+            function weekdaysFormat(
+                length?: UnitLength,
+                options?: UnitOptions
+            ): string[];
+        }
+
+        type IntervalObject = {
+            start: DateTime;
+            end: DateTime;
+        };
+
+        class Interval {
+            static after(
+                start: DateTime | DateObject | Date,
+                duration: Duration | number | DurationObject
+            ): Interval;
+            static before(
+                end: DateTime | DateObject | Date,
+                duration: Duration | number | DurationObject
+            ): Interval;
+            static fromDateTimes(
+                start: DateTime | DateObject | Date,
+                end: DateTime | DateObject | Date
+            ): Interval;
+            static fromISO(string: string, options?: DateTimeOptions): Interval;
+            static invalid(reason?: string): Interval;
+            static merge(intervals: Interval[]): [Interval];
+            static xor(intervals: Interval[]): [Interval];
+            end: DateTime;
+            invalidReason: string;
+            isValid: boolean;
+            start: DateTime;
+            abutsEnd(other: Interval): boolean;
+            abutsStart(other: Interval): boolean;
+            contains(dateTime: DateTime): boolean;
+            count(unit?: string): number;
+            difference(...intervals: Interval[]): Interval;
+            divideEqually(numberOfParts?: number): Interval[];
+            engulfs(other: Interval): boolean;
+            equals(other: Interval): boolean;
+            hasSame(unit: string): boolean;
+            intersection(other: Interval): Interval;
+            isAfter(dateTime: DateTime): boolean;
+            isBefore(dateTime: DateTime): boolean;
+            isEmpty(): boolean;
+            length(unit?: string): number;
+            overlaps(other: Interval): boolean;
+            set(values: IntervalObject): Interval;
+            splitAt(...dateTimes: DateTime[]): Interval[];
+            splitBy(duration: Duration | DurationObject | number): Interval[];
+            toDuration(
+                unit: string | string[],
+                options?: DiffOptions
+            ): Duration;
+            toFormat(
+                dateFormat: string,
+                options?: {
+                    seperator?: string;
+                }
+            ): string;
+            toISO(options?: ISOTimeOptions): string;
+            toString(): string;
+            union(other: Interval): Interval;
+        }
+
+        namespace Settings {
+            let defaultLocale: string;
+            let defaultNumberingSystem: string;
+            let defaultOutputCalendar: string;
+            const defaultZone: Zone;
+            let defaultZoneName: string;
+            let throwOnInvalid: boolean;
+            let now: () => number;
+            function resetCache(): void;
+        }
+
+        type ZoneOffsetOptions = {
+            format?: 'short' | 'long';
+            localeCode?: string;
+        };
+
+        class Zone {
+            static offsetName(ts: number, options?: ZoneOffsetOptions): string;
+            static isValid: boolean;
+            static name: string;
+            static type: string;
+            static universal: boolean;
+            equals(other: Zone): boolean;
+            offset(ts: number): number;
+        }
+    }
+
+    export = luxon;
+}
diff --git a/types/luxon/luxon-tests.ts b/types/luxon/luxon-tests.ts
new file mode 100644
index 0000000000..6310342899
--- /dev/null
+++ b/types/luxon/luxon-tests.ts
@@ -0,0 +1,92 @@
+import { DateTime, Duration, Interval, Info, Settings } from 'luxon';
+
+/* DateTime */
+const dt = DateTime.local(2017, 5, 15, 8, 30);
+
+const now = DateTime.local();
+
+const fromObject = DateTime.fromObject({
+    month: 4,
+    day: 22,
+    hour: 12,
+    zone: 'America/Los_Angeles',
+    numberingSystem: 'beng'
+});
+
+const fromIso = DateTime.fromISO('2017-05-15'); // => May 15, 2017 at midnight
+const fromIso2 = DateTime.fromISO('2017-05-15T08:30:00'); // => May 15, 2017 at midnight
+
+DateTime.local().toString(); // => '2017-09-14T03:20:34.091-04:00'
+
+const getters = DateTime.local();
+getters.year;
+getters.month;
+getters.day;
+getters.second;
+getters.weekday;
+getters.zoneName;
+getters.offset;
+getters.daysInMonth;
+getters.ordinal;
+
+dt.toLocaleString();
+dt.toLocaleString(DateTime.DATE_MED);
+dt.toISO();
+dt.toISO({includeOffset: true});
+
+dt.plus({ hours: 3, minutes: 2 });
+dt.minus({ days: 7 });
+dt.startOf('day');
+dt.endOf('hour');
+
+dt.set({ hour: 3 }).hour;
+
+const f = { month: 'long', day: 'numeric' };
+dt.setLocale('fr').toLocaleString(f);
+dt.setLocale('en-GB').toLocaleString(f);
+dt.setLocale('en-US').toLocaleString(f);
+
+DateTime.fromObject({ zone: 'America/Los_Angeles' });
+DateTime.local().setZone('America/Los_Angeles');
+
+DateTime.utc(2017, 5, 15);
+DateTime.utc();
+DateTime.local().toUTC();
+DateTime.utc().toLocal();
+
+/* Duration */
+const dur = Duration.fromObject({ hours: 2, minutes: 7 });
+dt.plus(dur);
+dur.hours;
+dur.minutes;
+dur.seconds;
+
+dur.as('seconds');
+dur.toObject();
+dur.toISO();
+
+/* Interval */
+const later = DateTime.local();
+const i = Interval.fromDateTimes(now, later);
+i.length();
+i.length('years');
+i.contains(DateTime.local(2019));
+
+i.toISO();
+i.toString();
+
+/* Info */
+Info.months();
+Info.weekdays('long');
+
+/* Settings */
+Settings.defaultLocale;
+Settings.defaultLocale = 'en';
+Settings.defaultZoneName = 'Europe/Paris';
+Settings.now();
+Settings.now = () => 0;
+
+// $ExpectError
+Settings.defaultZone = Settings.defaultZone;
+
+/* Zone */
diff --git a/types/luxon/tsconfig.json b/types/luxon/tsconfig.json
new file mode 100644
index 0000000000..e1b0e7864c
--- /dev/null
+++ b/types/luxon/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "luxon-tests.ts"
+    ]
+}
diff --git a/types/luxon/tslint.json b/types/luxon/tslint.json
new file mode 100644
index 0000000000..764ebe0c97
--- /dev/null
+++ b/types/luxon/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false,
+        "no-single-declare-module": false,
+        "interface-over-type-literal": false,
+        "no-declare-current-package": false
+    }
+}
diff --git a/types/lwip/tslint.json b/types/lwip/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/lwip/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/magic-number/tslint.json b/types/magic-number/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/magic-number/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/magicsuggest/tslint.json b/types/magicsuggest/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/magicsuggest/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mailcheck/tslint.json b/types/mailcheck/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mailcheck/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/maildev/tslint.json b/types/maildev/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/maildev/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mailparser/mailparser-tests.ts b/types/mailparser/mailparser-tests.ts
index 142a2c8b0f..19c92814aa 100644
--- a/types/mailparser/mailparser-tests.ts
+++ b/types/mailparser/mailparser-tests.ts
@@ -1,4 +1,3 @@
-// tslint:disable
 import mailparser_mod = require('mailparser');
 import MailParser = mailparser_mod.MailParser;
 import simpleParser = mailparser_mod.simpleParser;
diff --git a/types/mailparser/tslint.json b/types/mailparser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mailparser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/main-bower-files/tsconfig.json b/types/main-bower-files/tsconfig.json
index a5555d9521..bde61fa6db 100644
--- a/types/main-bower-files/tsconfig.json
+++ b/types/main-bower-files/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/main-bower-files/tslint.json b/types/main-bower-files/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/main-bower-files/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mainloop.js/tslint.json b/types/mainloop.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mainloop.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/make-dir/index.d.ts b/types/make-dir/index.d.ts
index 905343c883..1805280240 100644
--- a/types/make-dir/index.d.ts
+++ b/types/make-dir/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Ika <https://github.com/ikatyang>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node"/>
 import * as fs from 'fs';
@@ -12,7 +13,6 @@ export = makeDir;
 /**
  * Returns a `Promise` for the path to the created directory.
  * @param path Directory to create.
- * @param options
  */
 declare function makeDir(path: string, options?: makeDir.Options): Promise<string>;
 
@@ -20,7 +20,6 @@ declare namespace makeDir {
     /**
      * Returns the path to the created directory.
      * @param path Directory to create.
-     * @param options
      */
     function sync(path: string, options?: Options): string;
 
diff --git a/types/maker.js/tslint.json b/types/maker.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/maker.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mandrill-api/tslint.json b/types/mandrill-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mandrill-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index ec154e4ab1..f334304224 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1,1085 +1,1124 @@
-// Type definitions for Mapbox GL JS v0.39.1
+// Type definitions for Mapbox GL JS v0.43.0
 // Project: https://github.com/mapbox/mapbox-gl-js
 // Definitions by: Dominik Bruderer <https://github.com/dobrud>, Patrick Reames <https://github.com/patrickr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="geojson" />
 
 declare namespace mapboxgl {
-	let accessToken: string;
-	let version: string;
-	export function supported(options?: {failIfMajorPerformanceCaveat?: boolean}): boolean;
-	export function setRTLTextPlugin(pluginURL: string, callback: Function): void;
+    let accessToken: string;
+    let version: string;
 
-	type LngLatLike = number[] | LngLat;
-	type LngLatBoundsLike = number[][] | LngLatLike[] | LngLatBounds;
-	type PointLike = number[] | Point;
+    export function supported(options?: { failIfMajorPerformanceCaveat?: boolean }): boolean;
 
-	/**
-	 * Map
-	 */
-	export class Map extends Evented {
-		constructor(options?: MapboxOptions);
+    export function setRTLTextPlugin(pluginURL: string, callback: Function): void;
 
-		addControl(control: Control, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
+    type LngLatLike = number[] | LngLat;
+    type LngLatBoundsLike = number[][] | LngLatLike[] | LngLatBounds;
+    type PointLike = number[] | Point;
+    type Expression = any[];
 
-		removeControl(control: Control): this;
+    /**
+     * Map
+     */
+    export class Map extends Evented {
+        constructor(options?: MapboxOptions);
 
-		addClass(klass: string, options?: mapboxgl.StyleOptions): this;
+        addControl(control: Control, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
 
-		removeClass(klass: string, options?: mapboxgl.StyleOptions): this;
+        removeControl(control: Control): this;
 
-		setClasses(klasses: string[], options?: mapboxgl.StyleOptions): this;
+        addClass(klass: string, options?: mapboxgl.StyleOptions): this;
 
-		hasClass(klass: string): boolean;
+        removeClass(klass: string, options?: mapboxgl.StyleOptions): this;
 
-		getClasses(): string[];
+        setClasses(klasses: string[], options?: mapboxgl.StyleOptions): this;
 
-		resize(): this;
+        hasClass(klass: string): boolean;
 
-		getBounds(): mapboxgl.LngLatBounds;
+        getClasses(): string[];
 
-		setMaxBounds(lnglatbounds?: LngLatBoundsLike): this;
+        resize(): this;
 
-		setMinZoom(minZoom?: number): this;
+        getBounds(): mapboxgl.LngLatBounds;
 
-		getMinZoom(): number;
+        setMaxBounds(lnglatbounds?: LngLatBoundsLike): this;
 
-		setMaxZoom(maxZoom?: number): this;
+        setMinZoom(minZoom?: number): this;
 
-		getMaxZoom(): number;
+        getMinZoom(): number;
 
-		project(lnglat: LngLatLike): mapboxgl.Point;
+        setMaxZoom(maxZoom?: number): this;
 
-		unproject(point: PointLike): mapboxgl.LngLat;
+        getMaxZoom(): number;
 
-		queryRenderedFeatures(pointOrBox?: PointLike | PointLike[], parameters?: {layers?: string[], filter?: any[]}): GeoJSON.Feature<GeoJSON.GeometryObject>[];
+        project(lnglat: LngLatLike): mapboxgl.Point;
 
-		querySourceFeatures(sourceID: string, parameters?: {sourceLayer?: string, filter?: any[]}): GeoJSON.Feature<GeoJSON.GeometryObject>[];
+        unproject(point: PointLike): mapboxgl.LngLat;
 
-		setStyle(style: mapboxgl.Style | string): this;
+        queryRenderedFeatures(pointOrBox?: PointLike | PointLike[], parameters?: { layers?: string[], filter?: any[] }): GeoJSON.Feature<GeoJSONGeometry>[];
 
-		getStyle(): mapboxgl.Style;
+        querySourceFeatures(sourceID: string, parameters?: { sourceLayer?: string, filter?: any[] }): GeoJSON.Feature<GeoJSONGeometry>[];
 
-		isStyleLoaded(): boolean;
+        setStyle(style: mapboxgl.Style | string): this;
 
-		addSource(id: string, source: VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw): this;
+        getStyle(): mapboxgl.Style;
 
-		isSourceLoaded(id: string): boolean;
+        isStyleLoaded(): boolean;
 
-		areTilesLoaded(): boolean;
+        addSource(id: string, source: VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw): this;
 
-		removeSource(id: string): this;
+        isSourceLoaded(id: string): boolean;
 
-		getSource(id: string): VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource;
+        areTilesLoaded(): boolean;
 
-		addImage(name: string, image: HTMLImageElement | ArrayBufferView, options?: {width?: number, height?: number, pixelRatio?: number}): this;
+        removeSource(id: string): this;
 
-		removeImage(name: string): this;
+        getSource(id: string): VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource;
 
-		loadImage(url: string, callback: Function): this;
+        addImage(name: string, image: HTMLImageElement | ArrayBufferView, options?: { width?: number, height?: number, pixelRatio?: number }): this;
 
-		addLayer(layer: mapboxgl.Layer, before?: string): this;
+        hasImage(name: string): boolean;
 
-		moveLayer(id: string, beforeId?: string): this;
+        removeImage(name: string): this;
 
-		removeLayer(id: string): this;
+        loadImage(url: string, callback: Function): this;
 
-		getLayer(id: string): mapboxgl.Layer;
+        addLayer(layer: mapboxgl.Layer, before?: string): this;
 
-		setFilter(layer: string, filter: any[]): this;
+        moveLayer(id: string, beforeId?: string): this;
 
-		setLayerZoomRange(layerId: string, minzoom: number, maxzoom: number): this;
+        removeLayer(id: string): this;
 
-		getFilter(layer: string): any[];
+        getLayer(id: string): mapboxgl.Layer;
 
-		setPaintProperty(layer: string, name: string, value: any, klass?: string): this;
+        setFilter(layer: string, filter?: any[]): this;
 
-		getPaintProperty(layer: string, name: string, klass?: string): any;
+        setLayerZoomRange(layerId: string, minzoom?: number, maxzoom?: number): this;
 
-		setLayoutProperty(layer: string, name: string, value: any): this;
+        getFilter(layer: string): any[];
 
-		getLayoutProperty(layer: string, name: string, klass?: string): any;
+        setPaintProperty(layer: string, name: string, value: any, klass?: string): this;
 
-		setLight(options: mapboxgl.Light, lightOptions: any): this;
+        getPaintProperty(layer: string, name: string, klass?: string): any;
 
-		getLight(): mapboxgl.Light;
+        setLayoutProperty(layer: string, name: string, value: any): this;
 
-		getContainer(): HTMLElement;
+        getLayoutProperty(layer: string, name: string, klass?: string): any;
 
-		getCanvasContainer(): HTMLElement;
+        setLight(options: mapboxgl.Light, lightOptions: any): this;
 
-		getCanvas(): HTMLCanvasElement;
+        getLight(): mapboxgl.Light;
 
-		loaded(): boolean;
+        getContainer(): HTMLElement;
 
-		remove(): void;
+        getCanvasContainer(): HTMLElement;
 
-		onError(): void;
+        getCanvas(): HTMLCanvasElement;
 
-		showTileBoundaries: boolean;
+        loaded(): boolean;
 
-		showCollisionBoxes: boolean;
+        remove(): void;
 
-		repaint: boolean;
+        onError(): void;
 
-		getCenter(): mapboxgl.LngLat;
+        showTileBoundaries: boolean;
 
-		setCenter(center: LngLatLike, eventData?: mapboxgl.EventData): this;
+        showCollisionBoxes: boolean;
 
-		panBy(offset: number[], options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        repaint: boolean;
 
-		panTo(lnglat: LngLatLike, options?: mapboxgl.AnimationOptions, eventdata?: mapboxgl.EventData): this;
+        getCenter(): mapboxgl.LngLat;
 
-		getZoom(): number;
+        setCenter(center: LngLatLike, eventData?: mapboxgl.EventData): this;
 
-		setZoom(zoom: number, eventData?: mapboxgl.EventData): this;
+        panBy(offset: number[], options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
-		zoomTo(zoom: number, options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        panTo(lnglat: LngLatLike, options?: mapboxgl.AnimationOptions, eventdata?: mapboxgl.EventData): this;
 
-		zoomIn(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        getZoom(): number;
 
-		zoomOut(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        setZoom(zoom: number, eventData?: mapboxgl.EventData): this;
 
-		getBearing(): number;
+        zoomTo(zoom: number, options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
-		setBearing(bearing: number, eventData?: mapboxgl.EventData): this;
+        zoomIn(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
-		rotateTo(bearing: number, options?: mapboxgl.AnimationOptions, eventData?: EventData): this;
+        zoomOut(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
-		resetNorth(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        getBearing(): number;
 
-		snapToNorth(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        setBearing(bearing: number, eventData?: mapboxgl.EventData): this;
 
-		getPitch(): number;
+        rotateTo(bearing: number, options?: mapboxgl.AnimationOptions, eventData?: EventData): this;
 
-		setPitch(pitch: number, eventData?: EventData): this;
+        resetNorth(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
-		fitBounds(bounds: LngLatBoundsLike, options?: { linear?: boolean, easing?: Function, padding?: number | mapboxgl.PaddingOptions, offset?: PointLike, maxZoom?: number }, eventData?: mapboxgl.EventData): this;
+        snapToNorth(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
-		jumpTo(options: mapboxgl.CameraOptions, eventData?: mapboxgl.EventData): this;
+        getPitch(): number;
 
-		easeTo(options: mapboxgl.CameraOptions | mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        setPitch(pitch: number, eventData?: EventData): this;
 
-		flyTo(options: mapboxgl.FlyToOptions, eventData?: mapboxgl.EventData): this;
+        fitBounds(bounds: LngLatBoundsLike, options?: { linear?: boolean, easing?: Function, padding?: number | mapboxgl.PaddingOptions, offset?: PointLike, maxZoom?: number }, eventData?: mapboxgl.EventData): this;
 
-		isMoving(): boolean;
+        jumpTo(options: mapboxgl.CameraOptions, eventData?: mapboxgl.EventData): this;
 
-		stop(): this;
+        easeTo(options: mapboxgl.CameraOptions | mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
-		scrollZoom: ScrollZoomHandler;
+        flyTo(options: mapboxgl.FlyToOptions, eventData?: mapboxgl.EventData): this;
 
-		boxZoom: BoxZoomHandler;
+        isMoving(): boolean;
 
-		dragRotate: DragRotateHandler;
+        stop(): this;
 
-		dragPan: DragPanHandler;
+        scrollZoom: ScrollZoomHandler;
 
-		keyboard: KeyboardHandler;
+        boxZoom: BoxZoomHandler;
 
-		doubleClickZoom: DoubleClickZoomHandler;
+        dragRotate: DragRotateHandler;
 
-		touchZoomRotate: TouchZoomRotateHandler;
-	}
+        dragPan: DragPanHandler;
 
-	export interface MapboxOptions {
-		/** If true, an attribution control will be added to the map. */
-		attributionControl?: boolean;
+        keyboard: KeyboardHandler;
 
-		bearing?: number;
+        doubleClickZoom: DoubleClickZoomHandler;
 
-		/** Snap to north threshold in degrees. */
-		bearingSnap?: number;
+        touchZoomRotate: TouchZoomRotateHandler;
+    }
 
-		/** If true, enable the "box zoom" interaction (see BoxZoomHandler) */
-		boxZoom?: boolean;
+    export interface MapboxOptions {
+        /** If true, an attribution control will be added to the map. */
+        attributionControl?: boolean;
 
-		/** initial map center */
-		center?: LngLatLike;
+        bearing?: number;
 
-		/** Style class names with which to initialize the map */
-		classes?: string[];
+        /** Snap to north threshold in degrees. */
+        bearingSnap?: number;
 
-		/** ID of the container element */
-		container?: string | Element;
+        /** If true, enable the "box zoom" interaction (see BoxZoomHandler) */
+        boxZoom?: boolean;
 
-		/** If true, enable the "drag to pan" interaction (see DragPanHandler). */
-		dragPan?: boolean;
+        /** initial map center */
+        center?: LngLatLike;
 
-		/** If true, enable the "drag to rotate" interaction (see DragRotateHandler). */
-		dragRotate?: boolean;
+        /** Style class names with which to initialize the map */
+        classes?: string[];
 
-		/** If true, enable the "double click to zoom" interaction (see DoubleClickZoomHandler). */
-		doubleClickZoom?: boolean;
+        /** ID of the container element */
+        container?: string | Element;
 
-		/** If true, the map will track and update the page URL according to map position */
-		hash?: boolean;
+        /** If true, enable the "drag to pan" interaction (see DragPanHandler). */
+        dragPan?: boolean;
 
-		/** If true, map creation will fail if the implementation determines that the performance of the created WebGL context would be dramatically lower than expected. */
-		failIfMayorPerformanceCaveat?: boolean;
+        /** If true, enable the "drag to rotate" interaction (see DragRotateHandler). */
+        dragRotate?: boolean;
 
-		/** If false, no mouse, touch, or keyboard listeners are attached to the map, so it will not respond to input */
-		interactive?: boolean;
+        /** If true, enable the "double click to zoom" interaction (see DoubleClickZoomHandler). */
+        doubleClickZoom?: boolean;
 
-		/** If true, enable keyboard shortcuts (see KeyboardHandler). */
-		keyboard?: boolean;
+        /** If true, the map will track and update the page URL according to map position */
+        hash?: boolean;
 
-		logoPosition?: boolean;
+        /** If true, map creation will fail if the implementation determines that the performance of the created WebGL context would be dramatically lower than expected. */
+        failIfMayorPerformanceCaveat?: boolean;
 
-		/** If set, the map is constrained to the given bounds. */
-		maxBounds?: LngLatBoundsLike;
+        /** If false, no mouse, touch, or keyboard listeners are attached to the map, so it will not respond to input */
+        interactive?: boolean;
 
-		/** Maximum zoom of the map */
-		maxZoom?: number;
+        /** If true, enable keyboard shortcuts (see KeyboardHandler). */
+        keyboard?: boolean;
 
-		/** Minimum zoom of the map */
-		minZoom?: number;
+        logoPosition?: 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 
-		/** If true, The maps canvas can be exported to a PNG using map.getCanvas().toDataURL();. This is false by default as a performance optimization. */
-		preserveDrawingBuffer?: boolean;
+        /** If set, the map is constrained to the given bounds. */
+        maxBounds?: LngLatBoundsLike;
 
-		pitch?: number;
+        /** Maximum zoom of the map */
+        maxZoom?: number;
 
-		refreshExpiredTiles?: boolean;
+        /** Minimum zoom of the map */
+        minZoom?: number;
 
-		renderWorldCopies?: boolean;
+        /** If true, The maps canvas can be exported to a PNG using map.getCanvas().toDataURL();. This is false by default as a performance optimization. */
+        preserveDrawingBuffer?: boolean;
 
-		/** If true, enable the "scroll to zoom" interaction */
-		scrollZoom?: boolean;
+        pitch?: number;
 
-		/** stylesheet location */
-		style?: mapboxgl.Style | string;
+        refreshExpiredTiles?: boolean;
 
-		/** If  true, the map will automatically resize when the browser window resizes */
-		trackResize?: boolean;
+        renderWorldCopies?: boolean;
 
-		/** If true, enable the "pinch to rotate and zoom" interaction (see TouchZoomRotateHandler). */
-		touchZoomRotate?: boolean;
+        /** If true, enable the "scroll to zoom" interaction */
+        scrollZoom?: boolean;
 
-		/** Initial zoom level */
-		zoom?: number;
+        /** stylesheet location */
+        style?: mapboxgl.Style | string;
 
-		/** Maximum tile cache size for each layer. */
-		maxTileCacheSize?: number;
-	}
+        /** If  true, the map will automatically resize when the browser window resizes */
+        trackResize?: boolean;
 
-	export interface PaddingOptions {
-		top: number;
-		bottom: number;
-		left: number;
-		right: number;
-	}
+        /** If true, enable the "pinch to rotate and zoom" interaction (see TouchZoomRotateHandler). */
+        touchZoomRotate?: boolean;
 
-	/**
-	 * BoxZoomHandler
-	 */
-	export class BoxZoomHandler {
-		constructor(map: mapboxgl.Map);
+        /** Initial zoom level */
+        zoom?: number;
 
-		isEnabled(): boolean;
+        /** Maximum tile cache size for each layer. */
+        maxTileCacheSize?: number;
+    }
 
-		isActive(): boolean;
+    export interface PaddingOptions {
+        top: number;
+        bottom: number;
+        left: number;
+        right: number;
+    }
 
-		enable(): void;
+    /**
+     * BoxZoomHandler
+     */
+    export class BoxZoomHandler {
+        constructor(map: mapboxgl.Map);
 
-		disable(): void;
-	}
+        isEnabled(): boolean;
 
-	/**
-	 * ScrollZoomHandler
-	 */
-	export class ScrollZoomHandler {
-		constructor(map: mapboxgl.Map);
+        isActive(): boolean;
 
-		isEnabled(): boolean;
+        enable(): void;
 
-		enable(): void;
+        disable(): void;
+    }
 
-		disable(): void;
-	}
+    /**
+     * ScrollZoomHandler
+     */
+    export class ScrollZoomHandler {
+        constructor(map: mapboxgl.Map);
 
-	/**
-	 * DragPenHandler
-	 */
-	export class DragPanHandler {
-		constructor(map: mapboxgl.Map);
+        isEnabled(): boolean;
 
-		isEnabled(): boolean;
+        enable(): void;
 
-		isActive(): boolean;
+        disable(): void;
+    }
 
-		enable(): void;
+    /**
+     * DragPenHandler
+     */
+    export class DragPanHandler {
+        constructor(map: mapboxgl.Map);
 
-		disable(): void;
-	}
+        isEnabled(): boolean;
 
-	/**
-	 * DragRotateHandler
-	 */
-	export class DragRotateHandler {
-		constructor(map: mapboxgl.Map, options?: {bearingSnap?: number, pitchWithRotate?: boolean});
+        isActive(): boolean;
 
-		isEnabled(): boolean;
+        enable(): void;
 
-		isActive(): boolean;
+        disable(): void;
+    }
 
-		enable(): void;
+    /**
+     * DragRotateHandler
+     */
+    export class DragRotateHandler {
+        constructor(map: mapboxgl.Map, options?: { bearingSnap?: number, pitchWithRotate?: boolean });
 
-		disable(): void;
-	}
+        isEnabled(): boolean;
 
-	/**
-	 * KeyboardHandler
-	 */
-	export class KeyboardHandler {
-		constructor(map: mapboxgl.Map);
+        isActive(): boolean;
 
-		isEnabled(): boolean;
+        enable(): void;
 
-		enable(): void;
+        disable(): void;
+    }
 
-		disable(): void;
-	}
+    /**
+     * KeyboardHandler
+     */
+    export class KeyboardHandler {
+        constructor(map: mapboxgl.Map);
 
-	/**
-	 * DoubleClickZoomHandler
-	 */
-	export class DoubleClickZoomHandler {
-		constructor(map: mapboxgl.Map);
+        isEnabled(): boolean;
 
-		isEnabled(): boolean;
+        enable(): void;
 
-		enable(): void;
+        disable(): void;
+    }
 
-		disable(): void;
-	}
+    /**
+     * DoubleClickZoomHandler
+     */
+    export class DoubleClickZoomHandler {
+        constructor(map: mapboxgl.Map);
 
-	/**
-	 * TouchZoomRotateHandler
-	 */
-	export class TouchZoomRotateHandler {
-		constructor(map: mapboxgl.Map);
+        isEnabled(): boolean;
 
-		isEnabled(): boolean;
+        enable(): void;
 
-		enable(): void;
+        disable(): void;
+    }
 
-		disable(): void;
+    /**
+     * TouchZoomRotateHandler
+     */
+    export class TouchZoomRotateHandler {
+        constructor(map: mapboxgl.Map);
 
-		disableRotation(): void;
+        isEnabled(): boolean;
 
-		enableRotation(): void;
-	}
+        enable(): void;
 
-	export interface IControl {
-		onAdd(map: Map): HTMLElement;
-		onRemove(map: Map): any;
-		getDefaultPosition(): string;
-	}
+        disable(): void;
 
-	/**
-	 * Control
-	 */
-	export class Control extends Evented {
-	}
+        disableRotation(): void;
 
-	/**
-	 * Navigation
-	 */
-	export class NavigationControl extends Control {
-		constructor();
-	}
+        enableRotation(): void;
+    }
 
-	export class PositionOptions {
-		enableHighAccuracy?: boolean;
-		timeout?: number;
-		maximumAge?: number;
-	}
+    export interface IControl {
+        onAdd(map: Map): HTMLElement;
 
-	export class FitBoundsOptions {
-		maxZoom?: number;
-	}
+        onRemove(map: Map): any;
 
-	/**
-	 * Geolocate
-	 */
-	export class GeolocateControl extends Control {
-		constructor(options?: {positionOptions?: PositionOptions, fitBoundsOptions?: FitBoundsOptions, trackUserLocation?: boolean, showUserLocation?: boolean});
-	}
+        getDefaultPosition(): string;
+    }
 
-	/**
-	 * Attribution
-	 */
-	export class AttributionControl extends Control {
-		constructor(options?: {compact?: boolean});
-	}
+    /**
+     * Control
+     */
+    export class Control extends Evented {
+    }
 
-	/**
-	 * Scale
-	 */
-	export class ScaleControl extends Control {
-		constructor(options?: {maxWidth?: number, unit?: string})
-	}
+    /**
+     * Navigation
+     */
+    export class NavigationControl extends Control {
+        constructor();
+    }
 
-	/**
-	 * Fullscreen
-	 */
-	export class FullscreenControl extends Control {
-		constructor();
-	}
+    export class PositionOptions {
+        enableHighAccuracy?: boolean;
+        timeout?: number;
+        maximumAge?: number;
+    }
 
-	/**
-	 * Popup
-	 */
-	export class Popup extends Evented {
-		constructor(options?: mapboxgl.PopupOptions);
+    export class FitBoundsOptions {
+        maxZoom?: number;
+    }
 
-		addTo(map: mapboxgl.Map): this;
+    /**
+     * Geolocate
+     */
+    export class GeolocateControl extends Control {
+        constructor(options?: { positionOptions?: PositionOptions, fitBoundsOptions?: FitBoundsOptions, trackUserLocation?: boolean, showUserLocation?: boolean });
+    }
 
-		isOpen(): boolean;
+    /**
+     * Attribution
+     */
+    export class AttributionControl extends Control {
+        constructor(options?: { compact?: boolean });
+    }
 
-		remove(): this;
+    /**
+     * Scale
+     */
+    export class ScaleControl extends Control {
+        constructor(options?: { maxWidth?: number, unit?: string })
+    }
 
-		getLngLat(): mapboxgl.LngLat;
+    /**
+     * Fullscreen
+     */
+    export class FullscreenControl extends Control {
+        constructor();
+    }
 
-		setLngLat(lnglat: LngLatLike): this;
+    /**
+     * Popup
+     */
+    export class Popup extends Evented {
+        constructor(options?: mapboxgl.PopupOptions);
 
-		setText(text: string): this;
+        addTo(map: mapboxgl.Map): this;
 
-		setHTML(html: string): this;
+        isOpen(): boolean;
 
-		setDOMContent(htmlNode: Node): this;
-	}
+        remove(): this;
 
-	export interface PopupOptions {
-		closeButton?: boolean;
+        getLngLat(): mapboxgl.LngLat;
 
-		closeOnClick?: boolean;
+        setLngLat(lnglat: LngLatLike): this;
 
-		anchor?: 'top' | 'bottom' | 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+        setText(text: string): this;
 
-		offset?: number | PointLike | { [key:string]: PointLike;};
-	}
+        setHTML(html: string): this;
 
-	export interface Style {
-		bearing?: number;
-		center?: number[];
-		glyphs?: string;
-		layers?: Layer[];
-		metadata?: any;
-		name?: string;
-		pitch?: number;
-		light?: Light;
-		sources?: any;
-		sprite?: string;
-		transition?: Transition;
-		version: number;
-		zoom?: number;
-	}
+        setDOMContent(htmlNode: Node): this;
+    }
 
-	export interface Transition {
-		delay?: number;
-		duration?: number;
-	}
+    export interface PopupOptions {
+        closeButton?: boolean;
 
-	export interface Light {
-		"anchor"?: "map" | "viewport";
-		"position"?: number[];
-		"color"?: string;
-		"intensity"?: number;
-	}
+        closeOnClick?: boolean;
 
-	export interface Source {
-		type: "vector" | "raster" | "geojson" | "image" | "video" | "canvas";
-	}
+        anchor?: 'top' | 'bottom' | 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 
-	/**
-	 * GeoJSONSource
-	 */
+        offset?: number | PointLike | { [key: string]: PointLike; };
+    }
 
-	export interface GeoJSONSourceRaw extends Source, GeoJSONSourceOptions {
-		type: "geojson";
-	}
+    export interface Style {
+        bearing?: number;
+        center?: number[];
+        glyphs?: string;
+        layers?: Layer[];
+        metadata?: any;
+        name?: string;
+        pitch?: number;
+        light?: Light;
+        sources?: any;
+        sprite?: string;
+        transition?: Transition;
+        version: number;
+        zoom?: number;
+    }
 
-	export class GeoJSONSource implements GeoJSONSourceRaw {
-		type: "geojson";
+    export interface Transition {
+        delay?: number;
+        duration?: number;
+    }
 
-		constructor(options?: mapboxgl.GeoJSONSourceOptions);
+    export interface Light {
+        'anchor'?: 'map' | 'viewport';
+        'position'?: number[];
+        'color'?: string;
+        'intensity'?: number;
+    }
 
-		setData(data: GeoJSON.Feature<GeoJSON.GeometryObject> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject> | String): this;
-	}
+    export interface Source {
+        type: 'vector' | 'raster' | 'geojson' | 'image' | 'video' | 'canvas';
+    }
 
-	export interface GeoJSONSourceOptions {
-		data?: GeoJSON.Feature<GeoJSON.GeometryObject> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject> | string;
+    export type GeoJSONGeometry = GeoJSON.Point | GeoJSON.LineString | GeoJSON.MultiPoint | GeoJSON.Polygon | GeoJSON.MultiLineString | GeoJSON.MultiPolygon | GeoJSON.GeometryCollection;
 
-		maxzoom?: number;
+    /**
+     * GeoJSONSource
+     */
 
-		buffer?: number;
+    export interface GeoJSONSourceRaw extends Source, GeoJSONSourceOptions {
+        type: 'geojson';
+    }
 
-		tolerance?: number;
+    export class GeoJSONSource implements GeoJSONSourceRaw {
+        type: 'geojson';
 
-		cluster?: number | boolean;
+        constructor(options?: mapboxgl.GeoJSONSourceOptions);
 
-		clusterRadius?: number;
+        setData(data: GeoJSON.Feature<GeoJSONGeometry> | GeoJSON.FeatureCollection<GeoJSONGeometry> | String): this;
+    }
 
-		clusterMaxZoom?: number;
-	}
+    export interface GeoJSONSourceOptions {
+        data?: GeoJSON.Feature<GeoJSONGeometry> | GeoJSON.FeatureCollection<GeoJSONGeometry> | string;
 
-	/**
-	 * VideoSource
-	 */
-        export interface VideoSource extends VideoSourceOptions { }
-	export class VideoSource implements Source {
-		type: "video";
+        maxzoom?: number;
 
-		constructor(options?: mapboxgl.VideoSourceOptions);
+        buffer?: number;
 
-		getVideo(): HTMLVideoElement;
+        tolerance?: number;
 
-		setCoordinates(coordinates: number[][]): this;
-	}
+        cluster?: number | boolean;
 
-	export interface VideoSourceOptions {
-		urls?: string[];
+        clusterRadius?: number;
 
-		coordinates?: number[][];
-	}
+        clusterMaxZoom?: number;
+    }
 
-	/**
-	 * ImageSource
-	 */
-        export interface ImageSource extends ImageSourceOptions { }
-	export class ImageSource implements Source {
-		type: "image";
+    /**
+     * VideoSource
+     */
+    export interface VideoSource extends VideoSourceOptions {
+    }
 
-		constructor(options?: mapboxgl.ImageSourceOptions);
+    export class VideoSource implements Source {
+        type: 'video';
 
-		setCoordinates(coordinates: number[][]): this;
-	}
+        constructor(options?: mapboxgl.VideoSourceOptions);
 
-	export interface ImageSourceOptions {
-		url?: string;
+        getVideo(): HTMLVideoElement;
 
-		coordinates?: number[][];
-	}
+        setCoordinates(coordinates: number[][]): this;
+    }
 
-	/**
-	 * CanvasSource
-	 */
-	export class CanvasSource implements Source, CanvasSourceOptions {
-		type: "canvas";
+    export interface VideoSourceOptions {
+        urls?: string[];
 
-		coordinates: number[][];
+        coordinates?: number[][];
+    }
 
-		canvas: string;
+    /**
+     * ImageSource
+     */
+    export interface ImageSource extends ImageSourceOptions {
+    }
 
-		getCanvas(): HTMLCanvasElement;
+    export class ImageSource implements Source {
+        type: 'image';
 
-		setCoordinates(coordinates: number[][]): this;
-	}
+        constructor(options?: mapboxgl.ImageSourceOptions);
 
-	export interface CanvasSourceOptions {
-		coordinates: number[][];
+        setCoordinates(coordinates: number[][]): this;
+    }
 
-		animate?: boolean;
+    export interface ImageSourceOptions {
+        url?: string;
 
-		canvas: string;
-	}
+        coordinates?: number[][];
+    }
 
-	interface VectorSource extends Source {
-		type: "vector";
-		url?: string;
-		tiles?: string[];
-		minzoom?: number;
-		maxzoom?: number;
-	}
+    /**
+     * CanvasSource
+     */
+    export class CanvasSource implements Source, CanvasSourceOptions {
+        type: 'canvas';
 
-	interface RasterSource extends Source {
-		type: "raster";
-		url: string;
-		tiles?: string[];
-		minzoom?: number;
-		maxzoom?: number;
-		tileSize?: number;
-	}
+        coordinates: number[][];
 
-	/**
-	 * LngLat
-	 */
-	export class LngLat {
-		lng: number;
-		lat: number;
+        canvas: string;
 
-		constructor(lng: number, lat: number);
+        getCanvas(): HTMLCanvasElement;
 
-		/** Return a new LngLat object whose longitude is wrapped to the range (-180, 180). */
-		wrap(): mapboxgl.LngLat;
+        setCoordinates(coordinates: number[][]): this;
+    }
 
-		/** Return a LngLat as an array */
-		toArray(): number[];
+    export interface CanvasSourceOptions {
+        coordinates: number[][];
 
-		/** Return a LngLat as a string */
-		toString(): string;
+        animate?: boolean;
 
-		toBounds(radius: number): LngLatBounds;
+        canvas: string;
+    }
 
-		static convert(input: LngLatLike): mapboxgl.LngLat;
-	}
+    interface VectorSource extends Source {
+        type: 'vector';
+        url?: string;
+        tiles?: string[];
+        minzoom?: number;
+        maxzoom?: number;
+    }
 
-	/**
-	 * LngLatBounds
-	 */
-	export class LngLatBounds {
-		sw: LngLatLike;
-		ne: LngLatLike;
-		constructor(sw?: LngLatLike, ne?: LngLatLike);
+    interface RasterSource extends Source {
+        type: 'raster';
+        url: string;
+        tiles?: string[];
+        minzoom?: number;
+        maxzoom?: number;
+        tileSize?: number;
+    }
 
-		setNorthEast(ne: LngLatLike): this;
+    /**
+     * LngLat
+     */
+    export class LngLat {
+        lng: number;
+        lat: number;
 
-		setSouthWest(sw: LngLatLike): this;
+        constructor(lng: number, lat: number);
 
-		/** Extend the bounds to include a given LngLat or LngLatBounds. */
-		extend(obj: mapboxgl.LngLat | mapboxgl.LngLatBounds): this;
+        /** Return a new LngLat object whose longitude is wrapped to the range (-180, 180). */
+        wrap(): mapboxgl.LngLat;
 
-		/** Get the point equidistant from this box's corners */
-		getCenter(): mapboxgl.LngLat;
+        /** Return a LngLat as an array */
+        toArray(): number[];
 
-		/** Get southwest corner */
-		getSouthWest(): mapboxgl.LngLat;
+        /** Return a LngLat as a string */
+        toString(): string;
 
-		/** Get northeast corner */
-		getNorthEast(): mapboxgl.LngLat;
+        toBounds(radius: number): LngLatBounds;
 
-		/** Get northwest corner */
-		getNorthWest(): mapboxgl.LngLat;
+        static convert(input: LngLatLike): mapboxgl.LngLat;
+    }
 
-		/** Get southeast corner */
-		getSouthEast(): mapboxgl.LngLat;
+    /**
+     * LngLatBounds
+     */
+    export class LngLatBounds {
+        sw: LngLatLike;
+        ne: LngLatLike;
 
-		/** Get west edge longitude */
-		getWest(): number;
+        constructor(sw?: LngLatLike, ne?: LngLatLike);
 
-		/** Get south edge latitude */
-		getSouth(): number;
+        setNorthEast(ne: LngLatLike): this;
 
-		/** Get east edge longitude */
-		getEast(): number;
+        setSouthWest(sw: LngLatLike): this;
 
-		/** Get north edge latitude */
-		getNorth(): number;
+        /** Extend the bounds to include a given LngLat or LngLatBounds. */
+        extend(obj: mapboxgl.LngLat | mapboxgl.LngLatBounds): this;
 
-		/** Returns a LngLatBounds as an array */
-		toArray(): number[][];
+        /** Get the point equidistant from this box's corners */
+        getCenter(): mapboxgl.LngLat;
 
-		/** Return a LngLatBounds as a string */
-		toString(): string;
+        /** Get southwest corner */
+        getSouthWest(): mapboxgl.LngLat;
 
-		/** Convert an array to a LngLatBounds object, or return an existing LngLatBounds object unchanged. */
-		static convert(input: LngLatBoundsLike): mapboxgl.LngLatBounds;
-	}
+        /** Get northeast corner */
+        getNorthEast(): mapboxgl.LngLat;
 
-	/**
-	 * Point
-	 */
-		// Todo: Pull out class to seperate definition for Module "point-geometry"
-	export class Point {
-		x: number;
-		y: number;
+        /** Get northwest corner */
+        getNorthWest(): mapboxgl.LngLat;
 
-		constructor(x: number, y: number);
+        /** Get southeast corner */
+        getSouthEast(): mapboxgl.LngLat;
 
-		clone(): Point;
+        /** Get west edge longitude */
+        getWest(): number;
 
-		add(p: number): Point;
+        /** Get south edge latitude */
+        getSouth(): number;
 
-		sub(p: number): Point;
+        /** Get east edge longitude */
+        getEast(): number;
 
-		mult(k: number): Point;
+        /** Get north edge latitude */
+        getNorth(): number;
 
-		div(k: number): Point;
+        /** Returns a LngLatBounds as an array */
+        toArray(): number[][];
 
-		rotate(a: number): Point;
+        /** Return a LngLatBounds as a string */
+        toString(): string;
 
-		matMult(m: number): Point;
+        /** Convert an array to a LngLatBounds object, or return an existing LngLatBounds object unchanged. */
+        static convert(input: LngLatBoundsLike): mapboxgl.LngLatBounds;
+    }
 
-		unit(): Point;
+    /**
+     * Point
+     */
+        // Todo: Pull out class to seperate definition for Module "point-geometry"
+    export class Point {
+        x: number;
+        y: number;
 
-		perp(): Point;
+        constructor(x: number, y: number);
 
-		round(): Point;
+        clone(): Point;
 
-		mag(): number;
+        add(p: number): Point;
 
-		equals(p: Point): boolean;
+        sub(p: number): Point;
 
-		dist(p: Point): number;
+        mult(k: number): Point;
 
-		distSqr(p: Point): number;
+        div(k: number): Point;
 
-		angle(): number;
+        rotate(a: number): Point;
 
-		angleTo(p: Point): number;
+        matMult(m: number): Point;
 
-		angleWidth(p: Point): number;
+        unit(): Point;
 
-		angleWithSep(x: number, y: number): number;
+        perp(): Point;
 
-		static convert(a: PointLike): Point;
-	}
+        round(): Point;
 
-	export class Marker {
-		constructor(element?: HTMLElement, options?: { offset?: PointLike });
+        mag(): number;
 
-		addTo(map: Map): this;
+        equals(p: Point): boolean;
 
-		remove(): this;
+        dist(p: Point): number;
 
-		getLngLat(): LngLat;
+        distSqr(p: Point): number;
 
-		setLngLat(lngLat: LngLatLike): this;
+        angle(): number;
 
-		setPopup(popup?: Popup): this;
+        angleTo(p: Point): number;
 
-		getPopup(): Popup;
+        angleWidth(p: Point): number;
 
-		togglePopup(): this;
-	}
+        angleWithSep(x: number, y: number): number;
 
-	/**
-	 * Evented
-	 */
-	export class Evented {
-		on(type: string, listener: Function): this;
+        static convert(a: PointLike): Point;
+    }
 
-		on(type: string, layer: string, listener: Function): this;
+    export class Marker {
+        constructor(element?: HTMLElement, options?: { offset?: PointLike });
 
-		off(type?: string | any, listener?: Function): this;
+        addTo(map: Map): this;
 
-		off(type?: string | any, layer?: string, listener?: Function): this;
+        remove(): this;
 
-		once(type: string, listener: Function): this;
+        getLngLat(): LngLat;
 
-		fire(type: string, data?: mapboxgl.EventData | Object): this;
+        setLngLat(lngLat: LngLatLike): this;
 
-		listens(type: string): boolean;
-	}
+        setPopup(popup?: Popup): this;
 
-	/**
-	 * StyleOptions
-	 */
-	export interface StyleOptions {
-		transition?: boolean;
-	}
-
-	/**
-	 * EventData
-	 */
-	export class EventData {
-		type: string;
-		target: Map;
-		originalEvent: Event;
-		point: mapboxgl.Point;
-		lngLat: mapboxgl.LngLat;
-	}
-
-	export class MapMouseEvent {
-		type: string;
-		target: Map;
-		originalEvent: MouseEvent;
-		point: mapboxgl.Point;
-		lngLat: mapboxgl.LngLat;
-	}
-
-	export class MapTouchEvent {
-		type: string;
-		target: Map;
-		originalEvent: TouchEvent;
-		point: mapboxgl.Point;
-		lngLat: mapboxgl.LngLat;
-		points: Point[];
-		lngLats: LngLat[];
-	}
-
-	export class MapBoxZoomEvent {
-		originalEvent: MouseEvent;
-		boxZoomBounds: LngLatBounds;
-	}
-
-	export class MapDataEvent {
-		type: string;
-		dataType: "source" | "style" | "tile";
-		isSourceLoaded?: boolean;
-		source?: mapboxgl.Source;
-		coord?: any;
-	}
-
-	/**
-	 * AnimationOptions
-	 */
-	export interface AnimationOptions {
-		/** Number in milliseconds */
-		duration?: number;
-		easing?: Function;
-		/** point, origin of movement relative to map center */
-		offset?: PointLike;
-		/** When set to false, no animation happens */
-		animate?: boolean;
-	}
-
-	/**
-	 * CameraOptions
-	 */
-	export interface CameraOptions {
-		/** Map center */
-		center?: LngLatLike;
-		/** Map zoom level */
-		zoom?: number;
-		/** Map rotation bearing in degrees counter-clockwise from north */
-		bearing?: number;
-		/** Map angle in degrees at which the camera is looking at the ground */
-		pitch?: number;
-		/** If zooming, the zoom center (defaults to map center) */
-		around?: LngLatLike;
-	}
-
-	/**
-	 * FlyToOptions
-	 */
-	export interface FlyToOptions extends AnimationOptions, CameraOptions {
-		curve?: number;
-		minZoom?: number;
-		speed?: number;
-		screenSpeed?: number;
-		easing?: Function;
-	}
-
-	/**
-	 * MapEvent
-	 */
-	export interface MapEvent {
-		resize?: void;
-		webglcontextlost?: {originalEvent: WebGLContextEvent};
-		webglcontextrestored?: {originalEvent: WebGLContextEvent};
-		remove?: void;
-		dataloading?: {data: mapboxgl.MapDataEvent};
-		data?: {data: mapboxgl.MapDataEvent};
-		render?: void;
-		contextmenu?: {data: mapboxgl.MapMouseEvent};
-		dblclick?: {data: mapboxgl.MapMouseEvent};
-		click?: {data: mapboxgl.MapMouseEvent};
-		tiledataloading?: {data: mapboxgl.MapDataEvent};
-		sourcedataloading?: {data: mapboxgl.MapDataEvent};
-		styledataloading?: {data: mapboxgl.MapDataEvent};
-		touchcancel?: {data: mapboxgl.MapTouchEvent};
-		touchmove?: {data: mapboxgl.MapTouchEvent};
-		touchend?: {data: mapboxgl.MapTouchEvent};
-		touchstart?: {data: mapboxgl.MapTouchEvent};
-		mousemove?: {data: mapboxgl.MapMouseEvent};
-		mouseup?: {data: mapboxgl.MapMouseEvent};
-		mousedown?: {data: mapboxgl.MapMouseEvent};
-		moveend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		move?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		movestart?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		mouseout?:{data: mapboxgl.MapMouseEvent};
-		load?: void;
-		sourcedata?: {data: mapboxgl.MapDataEvent};
-		styledata?: {data: mapboxgl.MapDataEvent};
-		zoomend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		zoom?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		zoomstart?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		boxzoomcancel?: {data: mapboxgl.MapBoxZoomEvent};
-		boxzoomstart?: {data: mapboxgl.MapBoxZoomEvent};
-		boxzoomend?: {data: mapboxgl.MapBoxZoomEvent};
-		rotate?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		rotatestart?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		rotateend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		drag?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		dragend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
-		pitch?: {data: mapboxgl.EventData};
-	}
-
-	export interface Layer {
-		id: string;
-		type?: "fill" | "line" | "symbol" | "circle" | "fill-extrusion" | "raster" | "background";
-
-		metadata?: any;
-		ref?: string;
-
-		source?: string | VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw;
-
-		"source-layer"?: string;
-
-		minzoom?: number;
-		maxzoom?: number;
-
-		interactive?: boolean;
-
-		filter?: any[];
-		layout?: BackgroundLayout | FillLayout | FillExtrusionLayout | LineLayout | SymbolLayout | RasterLayout | CircleLayout;
-		paint?: BackgroundPaint | FillPaint | FillExtrusionPaint | LinePaint | SymbolPaint | RasterPaint | CirclePaint;
-	}
-
-	export interface StyleFunction {
-		stops?: any[][];
-		property?: string;
-		base?: number;
-		type?: "identity" | "exponential" | "interval" | "categorical";
-		default?: any;
-		"colorSpace"?: "rgb" | "lab" | "interval";
-	}
-
-	export interface BackgroundLayout {
-		visibility?: "visible" | "none";
-	}
-	export interface BackgroundPaint {
-		"background-color"?: string;
-		"background-pattern"?: string;
-		"background-opacity"?: number;
-	}
-
-	export interface FillLayout {
-		visibility?: "visible" | "none";
-	}
-	export interface FillPaint {
-		"fill-antialias"?: boolean;
-		"fill-opacity"?: number | StyleFunction;
-		"fill-color"?: string | StyleFunction;
-		"fill-outline-color": string | StyleFunction;
-		"fill-translate"?: number[];
-		"fill-translate-anchor"?: "map" | "viewport";
-		"fill-pattern"?: "string";
-	}
-
-	export interface FillExtrusionLayout {
-		visibility?: "visible" | "none";
-	}
-	export interface FillExtrusionPaint {
-		"fill-extrusion-opacity"?: number;
-		"fill-extrusion-color"?: string | StyleFunction;
-		"fill-extrusion-translate"?: number[];
-		"fill-extrusion-translate-anchor"?: "map" | "viewport";
-		"fill-extrusion-pattern": string;
-		"fill-extrusion-height"?: number | StyleFunction;
-		"fill-extrusion-base"?: number;
-	}
-
-	export interface LineLayout {
-		visibility?: "visible" | "none";
-
-		"line-cap"?: "butt" | "round" | "square";
-		"line-join"?: "bevel" | "round" | "miter";
-		"line-miter-limit"?: number;
-		"line-round-limit"?: number;
-	}
-	export interface LinePaint {
-		"line-opacity"?: number | StyleFunction;
-		"line-color"?: string | StyleFunction;
-		"line-translate"?: number[];
-		"line-translate-anchor"?: "map" | "viewport";
-		"line-width"?: number | StyleFunction;
-		"line-gap-width"?: number | StyleFunction;
-		"line-offset"?: number | StyleFunction;
-		"line-blur"?: number | StyleFunction;
-		"line-dasharray"?: number[];
-		"line-dasharray-transition"?: Transition;
-		"line-pattern"?: string;
-	}
-
-	export interface SymbolLayout {
-		visibility?: "visible" | "none";
-
-		"symbol-placement"?: "point" | "line";
-		"symbol-spacing"?: number;
-		"symbol-avoid-edges"?: boolean;
-		"icon-allow-overlap"?: boolean;
-		"icon-ignore-placement"?: boolean;
-		"icon-optional"?: boolean;
-		"icon-rotation-alignment"?: "map" | "viewport" | "auto";
-		"icon-pitch-alignment"?: "map"  | "viewport"| "auto";
-		"icon-size"?: number | StyleFunction;
-		"icon-text-fit"?: "none" | "both" | "width" | "height";
-		"icon-text-fit-padding"?: number[];
-		"icon-image"?: string | StyleFunction;
-		"icon-rotate"?: number | StyleFunction;
-		"icon-padding"?: number;
-		"icon-keep-upright"?: boolean;
-		"icon-offset"?: number[] | StyleFunction;
-		"text-pitch-alignment"?: "map" | "viewport" | "auto";
-		"text-rotation-alignment"?: "map" | "viewport" | "auto";
-		"text-field"?: string | StyleFunction;
-		"text-font"?: string | string[];
-		"text-size"?: number | StyleFunction;
-		"text-max-width"?: number;
-		"text-line-height"?: number;
-		"text-letter-spacing"?: number;
-		"text-justify"?: "left" | "center" | "right";
-		"text-anchor"?: "center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right";
-		"text-max-angle"?: number;
-		"text-rotate"?: number | StyleFunction;
-		"text-padding"?: number;
-		"text-keep-upright"?: boolean;
-		"text-transform"?: "none" | "uppercase" | "lowercase" | StyleFunction;
-		"text-offset"?: number[];
-		"text-allow-overlap"?: boolean;
-		"text-ignore-placement"?: boolean;
-		"text-optional"?: boolean;
-
-	}
-	export interface SymbolPaint {
-		"icon-opacity"?: number | StyleFunction;
-		"icon-color"?: string | StyleFunction;
-		"icon-halo-color"?: string | StyleFunction;
-		"icon-halo-width"?: number | StyleFunction;
-		"icon-halo-blur"?: number | StyleFunction;
-		"icon-translate"?: number[];
-		"icon-translate-anchor"?: "map" | "viewport";
-		"text-opacity"?: number | StyleFunction;
-		"text-color"?: string | StyleFunction;
-		"text-halo-color"?: string | StyleFunction;
-		"text-halo-width"?: number | StyleFunction;
-		"text-halo-blur"?: number | StyleFunction;
-		"text-translate"?: number[];
-		"text-translate-anchor"?: "map" | "viewport";
-	}
-
-	export interface RasterLayout {
-		visibility?: "visible" | "none";
-	}
-
-	export interface RasterPaint {
-		"raster-opacity"?: number;
-		"raster-hue-rotate"?: number;
-		"raster-brightness-min"?: number;
-		"raster-brightness-max"?: number;
-		"raster-saturation"?: number;
-		"raster-contrast"?: number;
-		"raster-fade-duration"?: number;
-	}
-
-	export interface CircleLayout {
-		visibility?: "visible" | "none";
-	}
-
-	export interface CirclePaint {
-		"circle-radius"?: number | StyleFunction;
-		"circle-radius-transition"?: Transition;
-		"circle-color"?: string | StyleFunction;
-		"circle-blur"?: number | StyleFunction;
-		"circle-opacity"?: number | StyleFunction;
-		"circle-translate"?: number[];
-		"circle-translate-anchor"?: "map" | "viewport";
-		"circle-pitch-scale"?: "map" | "viewport";
-		"circle-pitch-alignment"?: "map" | "viewport";
-		"circle-stroke-width"?: number | StyleFunction;
-		"circle-stroke-color"?: string | StyleFunction;
-		"circle-stroke-opacity"?: number | StyleFunction;
-	}
+        getPopup(): Popup;
+
+        getOffset(): PointLike;
+
+        setOffset(offset: PointLike): this;
+
+        togglePopup(): this;
+    }
+
+    /**
+     * Evented
+     */
+    export class Evented {
+        on(type: string, listener: Function): this;
+
+        on(type: string, layer: string, listener: Function): this;
+
+        off(type?: string | any, listener?: Function): this;
+
+        off(type?: string | any, layer?: string, listener?: Function): this;
+
+        once(type: string, listener: Function): this;
+
+        fire(type: string, data?: mapboxgl.EventData | Object): this;
+
+        listens(type: string): boolean;
+    }
+
+    /**
+     * StyleOptions
+     */
+    export interface StyleOptions {
+        transition?: boolean;
+    }
+
+    /**
+     * EventData
+     */
+    export class EventData {
+        type: string;
+        target: Map;
+        originalEvent: Event;
+        point: mapboxgl.Point;
+        lngLat: mapboxgl.LngLat;
+    }
+
+    export class MapMouseEvent {
+        type: string;
+        target: Map;
+        originalEvent: MouseEvent;
+        point: mapboxgl.Point;
+        lngLat: mapboxgl.LngLat;
+    }
+
+    export class MapTouchEvent {
+        type: string;
+        target: Map;
+        originalEvent: TouchEvent;
+        point: mapboxgl.Point;
+        lngLat: mapboxgl.LngLat;
+        points: Point[];
+        lngLats: LngLat[];
+    }
+
+    export class MapBoxZoomEvent {
+        originalEvent: MouseEvent;
+        boxZoomBounds: LngLatBounds;
+    }
+
+    export class MapDataEvent {
+        type: string;
+        dataType: 'source' | 'style' | 'tile';
+        isSourceLoaded?: boolean;
+        source?: mapboxgl.Source;
+        coord?: any;
+    }
+
+    /**
+     * AnimationOptions
+     */
+    export interface AnimationOptions {
+        /** Number in milliseconds */
+        duration?: number;
+        easing?: Function;
+        /** point, origin of movement relative to map center */
+        offset?: PointLike;
+        /** When set to false, no animation happens */
+        animate?: boolean;
+    }
+
+    /**
+     * CameraOptions
+     */
+    export interface CameraOptions {
+        /** Map center */
+        center?: LngLatLike;
+        /** Map zoom level */
+        zoom?: number;
+        /** Map rotation bearing in degrees counter-clockwise from north */
+        bearing?: number;
+        /** Map angle in degrees at which the camera is looking at the ground */
+        pitch?: number;
+        /** If zooming, the zoom center (defaults to map center) */
+        around?: LngLatLike;
+    }
+
+    /**
+     * FlyToOptions
+     */
+    export interface FlyToOptions extends AnimationOptions, CameraOptions {
+        curve?: number;
+        minZoom?: number;
+        speed?: number;
+        screenSpeed?: number;
+        easing?: Function;
+    }
+
+    /**
+     * MapEvent
+     */
+    export interface MapEvent {
+        resize?: void;
+        webglcontextlost?: { originalEvent: WebGLContextEvent };
+        webglcontextrestored?: { originalEvent: WebGLContextEvent };
+        remove?: void;
+        dataloading?: { data: mapboxgl.MapDataEvent };
+        data?: { data: mapboxgl.MapDataEvent };
+        render?: void;
+        contextmenu?: { data: mapboxgl.MapMouseEvent };
+        dblclick?: { data: mapboxgl.MapMouseEvent };
+        click?: { data: mapboxgl.MapMouseEvent };
+        tiledataloading?: { data: mapboxgl.MapDataEvent };
+        sourcedataloading?: { data: mapboxgl.MapDataEvent };
+        styledataloading?: { data: mapboxgl.MapDataEvent };
+        touchcancel?: { data: mapboxgl.MapTouchEvent };
+        touchmove?: { data: mapboxgl.MapTouchEvent };
+        touchend?: { data: mapboxgl.MapTouchEvent };
+        touchstart?: { data: mapboxgl.MapTouchEvent };
+        mousemove?: { data: mapboxgl.MapMouseEvent };
+        mouseup?: { data: mapboxgl.MapMouseEvent };
+        mousedown?: { data: mapboxgl.MapMouseEvent };
+        moveend?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        move?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        movestart?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        mouseout?: { data: mapboxgl.MapMouseEvent };
+        load?: void;
+        sourcedata?: { data: mapboxgl.MapDataEvent };
+        styledata?: { data: mapboxgl.MapDataEvent };
+        zoomend?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        zoom?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        zoomstart?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        boxzoomcancel?: { data: mapboxgl.MapBoxZoomEvent };
+        boxzoomstart?: { data: mapboxgl.MapBoxZoomEvent };
+        boxzoomend?: { data: mapboxgl.MapBoxZoomEvent };
+        rotate?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        rotatestart?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        rotateend?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        drag?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        dragend?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
+        pitch?: { data: mapboxgl.EventData };
+    }
+
+    export interface Layer {
+        id: string;
+        type?: 'fill' | 'line' | 'symbol' | 'circle' | 'fill-extrusion' | 'raster' | 'background' | 'heatmap';
+
+        metadata?: any;
+        ref?: string;
+
+        source?: string | VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw;
+
+        'source-layer'?: string;
+
+        minzoom?: number;
+        maxzoom?: number;
+
+        interactive?: boolean;
+
+        filter?: any[];
+        layout?: BackgroundLayout | FillLayout | FillExtrusionLayout | LineLayout | SymbolLayout | RasterLayout | CircleLayout | HeatmapLayout;
+        paint?: BackgroundPaint | FillPaint | FillExtrusionPaint | LinePaint | SymbolPaint | RasterPaint | CirclePaint | HeatmapPaint;
+    }
+
+    export interface StyleFunction {
+        stops?: any[][];
+        property?: string;
+        base?: number;
+        type?: 'identity' | 'exponential' | 'interval' | 'categorical';
+        default?: any;
+        'colorSpace'?: 'rgb' | 'lab' | 'interval';
+    }
+
+    export interface BackgroundLayout {
+        visibility?: 'visible' | 'none';
+    }
+
+    export interface BackgroundPaint {
+        'background-color'?: string | Expression;
+        'background-pattern'?: string;
+        'background-opacity'?: number | Expression;
+    }
+
+    export interface FillLayout {
+        visibility?: 'visible' | 'none';
+    }
+
+    export interface FillPaint {
+        'fill-antialias'?: boolean;
+        'fill-opacity'?: number | StyleFunction | Expression;
+        'fill-color'?: string | StyleFunction | Expression;
+        'fill-outline-color'?: string | StyleFunction | Expression;
+        'fill-translate'?: number[] | Expression;
+        'fill-translate-anchor'?: 'map' | 'viewport';
+        'fill-pattern'?: string;
+    }
+
+    export interface FillExtrusionLayout {
+        visibility?: 'visible' | 'none';
+    }
+
+    export interface FillExtrusionPaint {
+        'fill-extrusion-opacity'?: number | Expression;
+        'fill-extrusion-color'?: string | StyleFunction | Expression;
+        'fill-extrusion-translate'?: number[] | Expression;
+        'fill-extrusion-translate-anchor'?: 'map' | 'viewport';
+        'fill-extrusion-pattern'?: string;
+        'fill-extrusion-height'?: number | StyleFunction | Expression;
+        'fill-extrusion-base'?: number | StyleFunction | Expression;
+    }
+
+    export interface LineLayout {
+        visibility?: 'visible' | 'none';
+
+        'line-cap'?: 'butt' | 'round' | 'square';
+        'line-join'?: 'bevel' | 'round' | 'miter';
+        'line-miter-limit'?: number | Expression;
+        'line-round-limit'?: number | Expression;
+    }
+
+    export interface LinePaint {
+        'line-opacity'?: number | StyleFunction | Expression;
+        'line-color'?: string | StyleFunction | Expression;
+        'line-translate'?: number[] | Expression;
+        'line-translate-anchor'?: 'map' | 'viewport';
+        'line-width'?: number | StyleFunction | Expression;
+        'line-gap-width'?: number | StyleFunction | Expression;
+        'line-offset'?: number | StyleFunction | Expression;
+        'line-blur'?: number | StyleFunction | Expression;
+        'line-dasharray'?: number[];
+        'line-dasharray-transition'?: Transition;
+        'line-pattern'?: string;
+    }
+
+    export interface SymbolLayout {
+        visibility?: 'visible' | 'none';
+
+        'symbol-placement'?: 'point' | 'line';
+        'symbol-spacing'?: number | Expression;
+        'symbol-avoid-edges'?: boolean;
+        'icon-allow-overlap'?: boolean;
+        'icon-ignore-placement'?: boolean;
+        'icon-optional'?: boolean;
+        'icon-rotation-alignment'?: 'map' | 'viewport' | 'auto';
+        'icon-pitch-alignment'?: 'map' | 'viewport' | 'auto';
+        'icon-size'?: number | StyleFunction | Expression;
+        'icon-text-fit'?: 'none' | 'both' | 'width' | 'height';
+        'icon-text-fit-padding'?: number[] | Expression;
+        'icon-image'?: string | StyleFunction;
+        'icon-rotate'?: number | StyleFunction | Expression;
+        'icon-padding'?: number | Expression;
+        'icon-keep-upright'?: boolean;
+        'icon-offset'?: number[] | StyleFunction | Expression;
+        'text-pitch-alignment'?: 'map' | 'viewport' | 'auto';
+        'text-rotation-alignment'?: 'map' | 'viewport' | 'auto';
+        'text-field'?: string | StyleFunction;
+        'text-font'?: string | string[];
+        'text-size'?: number | StyleFunction | Expression;
+        'text-max-width'?: number | Expression;
+        'text-line-height'?: number | Expression;
+        'text-letter-spacing'?: number | Expression;
+        'text-justify'?: 'left' | 'center' | 'right';
+        'text-anchor'?: 'center' | 'left' | 'right' | 'top' | 'bottom' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+        'text-max-angle'?: number | Expression;
+        'text-rotate'?: number | StyleFunction | Expression;
+        'text-padding'?: number | Expression;
+        'text-keep-upright'?: boolean;
+        'text-transform'?: 'none' | 'uppercase' | 'lowercase' | StyleFunction | Expression;
+        'text-offset'?: number[] | Expression;
+        'text-allow-overlap'?: boolean;
+        'text-ignore-placement'?: boolean;
+        'text-optional'?: boolean;
+
+    }
+
+    export interface SymbolPaint {
+        'icon-opacity'?: number | StyleFunction | Expression;
+        'icon-color'?: string | StyleFunction | Expression;
+        'icon-halo-color'?: string | StyleFunction | Expression;
+        'icon-halo-width'?: number | StyleFunction | Expression;
+        'icon-halo-blur'?: number | StyleFunction | Expression;
+        'icon-translate'?: number[] | Expression;
+        'icon-translate-anchor'?: 'map' | 'viewport';
+        'text-opacity'?: number | StyleFunction | Expression;
+        'text-color'?: string | StyleFunction | Expression;
+        'text-halo-color'?: string | StyleFunction | Expression;
+        'text-halo-width'?: number | StyleFunction | Expression;
+        'text-halo-blur'?: number | StyleFunction | Expression;
+        'text-translate'?: number[] | Expression;
+        'text-translate-anchor'?: 'map' | 'viewport';
+    }
+
+    export interface RasterLayout {
+        visibility?: 'visible' | 'none';
+    }
+
+    export interface RasterPaint {
+        'raster-opacity'?: number | Expression;
+        'raster-hue-rotate'?: number | Expression;
+        'raster-brightness-min'?: number | Expression;
+        'raster-brightness-max'?: number | Expression;
+        'raster-saturation'?: number | Expression;
+        'raster-contrast'?: number | Expression;
+        'raster-fade-duration'?: number | Expression;
+    }
+
+    export interface CircleLayout {
+        visibility?: 'visible' | 'none';
+    }
+
+    export interface CirclePaint {
+        'circle-radius'?: number | StyleFunction | Expression;
+        'circle-radius-transition'?: Transition;
+        'circle-color'?: string | StyleFunction | Expression;
+        'circle-blur'?: number | StyleFunction | Expression;
+        'circle-opacity'?: number | StyleFunction | Expression;
+        'circle-translate'?: number[] | Expression;
+        'circle-translate-anchor'?: 'map' | 'viewport';
+        'circle-pitch-scale'?: 'map' | 'viewport';
+        'circle-pitch-alignment'?: 'map' | 'viewport';
+        'circle-stroke-width'?: number | StyleFunction | Expression;
+        'circle-stroke-color'?: string | StyleFunction | Expression;
+        'circle-stroke-opacity'?: number | StyleFunction | Expression;
+    }
+
+    export interface HeatmapLayout {
+        visibility?: 'visible' | 'none';
+    }
+
+    export interface HeatmapPaint {
+        'heatmap-radius'?: number | Expression;
+        'heatmap-transition'?: Transition;
+        'heatmap-weight'?: number | StyleFunction | Expression;
+        'heatmap-intensity'?: number | Expression;
+        'heatmap-color'?: string | Expression;
+        'heatmap-color-transition'?: Transition;
+        'heatmap-opacity'?: number | Expression;
+        'heatmap-opacity-transition'?: Transition;
+    }
 }
 
 declare module 'mapbox-gl' {
-	export = mapboxgl;
+    export = mapboxgl;
 }
 
 declare module 'mapbox-gl/dist/mapbox-gl' {
-	export = mapboxgl;
+    export = mapboxgl;
 }
diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index 12fbac9010..10768549ca 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -303,16 +303,6 @@ var mapStyle = {
 	]
 };
 
-map = new mapboxgl.Map({
-	container: 'map',
-	minZoom: 14,
-	zoom: 17,
-	center: [-122.514426, 37.562984],
-	bearing: -96,
-	style: videoStyle,
-	hash: false
-});
-
 /**
  * Add video
  */
@@ -362,10 +352,20 @@ map = new mapboxgl.Map({
 	hash: false
 });
 
+map = new mapboxgl.Map({
+	container: 'map',
+	minZoom: 14,
+	zoom: 17,
+	center: [-122.514426, 37.562984],
+	bearing: -96,
+	style: videoStyle,
+	hash: false
+});
+
 /**
  * Marker
  */
-let marker = new mapboxgl.Marker(null,{offset: [10, 0]})
+let marker = new mapboxgl.Marker(undefined, {offset: [10, 0]})
 	.setLngLat([-50,50])
 	.addTo(map);
 
diff --git a/types/mapbox-gl/tsconfig.json b/types/mapbox-gl/tsconfig.json
index 2d80f414a1..4c4228132e 100644
--- a/types/mapbox-gl/tsconfig.json
+++ b/types/mapbox-gl/tsconfig.json
@@ -5,9 +5,9 @@
             "es6",
             "dom"
         ],
+        "strictNullChecks": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "mapbox-gl-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/mapbox-gl/tslint.json b/types/mapbox-gl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mapbox-gl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mapbox/index.d.ts b/types/mapbox/index.d.ts
index 23429f01d2..334d644e21 100644
--- a/types/mapbox/index.d.ts
+++ b/types/mapbox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.mapbox.com/mapbox.js/
 // Definitions by: Maxime Fabre <https://github.com/anahkiasen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Leaflet from "leaflet";
 
@@ -366,12 +367,12 @@ declare global {
 		///////////////////////////// CONFIGURATION //////////////////////////
 		//////////////////////////////////////////////////////////////////////
 
-		class config {
-			static FORCE_HTTPS: boolean;
+		namespace config {
+			const FORCE_HTTPS: boolean;
 
-			static HTTP_URLS: string[];
+			const HTTP_URLS: string[];
 
-			static HTTPS_URLS: string[];
+			const HTTPS_URLS: string[];
 		}
 	}
 }
diff --git a/types/mapnik/index.d.ts b/types/mapnik/index.d.ts
new file mode 100644
index 0000000000..33b455f0dd
--- /dev/null
+++ b/types/mapnik/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for mapnik 3.x
+// Project: http://mapnik.org
+// Definitions by: Loli <https://github.com/ipv4sec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+export const settings: any;
+export function register_default_fonts(): void;
+export function register_default_input_plugins(): void;
+export function register_datasource(path: string): void;
+export class VectorTile {
+  constructor(z: number, x: number, y: number)
+  addDataSync(vectorTile: any): void;
+}
+export class Datasource {
+  constructor(datasource: any)
+  featureset(): Featureset;
+}
+
+export class Featureset {
+  constructor()
+  next(): FeaturesetNext;
+}
+export class FeaturesetNext {
+  constructor()
+  toJSON(): string;
+}
+
+export class Image {
+  constructor(x: number, y: number)
+  encode(type: string, callback?: (err: Error, buffer: Buffer) => void): void;
+  getData(): Buffer;
+}
+
+export interface Image {
+  // constructor(x: number, y: number)
+  new(x: number, y: number): () => void;
+  encode(type: string, callback?: (err: Error, buffer: Buffer) => void): void;
+  getData(): Buffer;
+  save(fp: string): () => void;
+  open(fp: string): () => void;
+}
+
+export class Map {
+  constructor(x: number, y: number)
+  load(xml: string, callback?: (err: Error, map: Map) => void): void;
+  zoomAll(): void;
+  render(images: Image | VectorTile , callback?: (err: Error, map: Image) => void): void;
+}
diff --git a/types/mapnik/mapnik-tests.ts b/types/mapnik/mapnik-tests.ts
new file mode 100644
index 0000000000..23e726f111
--- /dev/null
+++ b/types/mapnik/mapnik-tests.ts
@@ -0,0 +1,40 @@
+import * as mapnik from "mapnik";
+import * as fs from "fs";
+import * as path from "path";
+
+mapnik.register_default_fonts();
+mapnik.register_default_input_plugins();
+
+const map: mapnik.Map = new mapnik.Map(256, 256);
+map.load('./test/stylesheet.xml', function xx(err: Error, map: mapnik.Map) {
+  if (err) throw err;
+  map.zoomAll();
+  const im: mapnik.Image = new mapnik.Image(256, 256);
+  map.render(im, function xxx(err: Error, im: mapnik.Image) {
+    if (err) throw err;
+    im.encode('png', function xxxx(err: Error, buffer: Buffer) {
+      if (err) throw err;
+      fs.writeFile('map.png', buffer, function xxxxx(err: Error) {
+        if (err) throw err;
+        console.log('saved map image to map.png');
+      });
+    });
+  });
+});
+
+// new mapnik.Image.open("xxx").save("xx");
+
+mapnik.register_datasource(path.join(mapnik.settings.paths.input_plugins, 'shape.input'));
+const ds: mapnik.Datasource = new mapnik.Datasource({type: 'shape', file: 'test/data/world_merc.shp'});
+const featureset: mapnik.Featureset = ds.featureset();
+const geojson: any = {
+  type: "FeatureCollection",
+  features: [
+  ]
+};
+let feat: mapnik.FeaturesetNext = featureset.next();
+while (feat) {
+  geojson.features.push(JSON.parse(feat.toJSON()));
+  feat = featureset.next();
+}
+fs.writeFileSync("output.geojson", JSON.stringify(geojson, null, 2));
diff --git a/types/mapnik/tsconfig.json b/types/mapnik/tsconfig.json
new file mode 100644
index 0000000000..81f111a37e
--- /dev/null
+++ b/types/mapnik/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "mapnik-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/mapnik/tslint.json b/types/mapnik/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/mapnik/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/mapsjs/tslint.json b/types/mapsjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mapsjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mariasql/tslint.json b/types/mariasql/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mariasql/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mark.js/index.d.ts b/types/mark.js/index.d.ts
new file mode 100644
index 0000000000..2215c4e65c
--- /dev/null
+++ b/types/mark.js/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for mark.js 8.11
+// Project: https://markjs.io/
+// Definitions by: Soner Köksal <https://github.com/renjfk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery"/>
+
+type MarkAccuracy = "partially" | "complementary" | "exactly";
+
+interface MarkOptions {
+    element?: string;
+    className?: string;
+    exclude?: string[];
+    separateWordSearch?: boolean;
+    accuracy?: MarkAccuracy | { value: MarkAccuracy };
+    diacritics?: boolean;
+    synonyms?: { [index: string]: string };
+    iframes?: boolean;
+    iframesTimeout?: number;
+    acrossElements?: boolean;
+    caseSensitive?: boolean;
+    ignoreJoiners?: boolean;
+    wildcards?: "disabled" | "enabled" | "withSpaces";
+
+    each?(element: Element): void;
+
+    filter?(textNode: Element, term: string, marksSoFar: number, marksTotal: number): boolean;
+
+    noMatch?(term: string): void;
+
+    done?(marksTotal: number): void;
+
+    debug?: boolean;
+    log?: object;
+}
+
+interface UnmarkOptions {
+    element?: string;
+    className?: string;
+    exclude?: string[];
+    iframes?: boolean;
+    iframesTimeout?: number;
+
+    done?(marksTotal: number): void;
+
+    debug?: boolean;
+    log?: object;
+}
+
+interface JQuery {
+    mark(term: string, options?: MarkOptions): void;
+
+    unmark(options?: UnmarkOptions): void;
+}
+
+interface JQueryStatic {
+    mark(term: string, options?: MarkOptions): void;
+
+    unmark(options?: UnmarkOptions): void;
+}
diff --git a/types/mark.js/mark.js-tests.ts b/types/mark.js/mark.js-tests.ts
new file mode 100644
index 0000000000..136098d39d
--- /dev/null
+++ b/types/mark.js/mark.js-tests.ts
@@ -0,0 +1,4 @@
+$("div.context").mark("text", {
+    element: "span",
+    className: "highlight"
+});
diff --git a/types/mark.js/tsconfig.json b/types/mark.js/tsconfig.json
new file mode 100644
index 0000000000..381f150954
--- /dev/null
+++ b/types/mark.js/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mark.js-tests.ts"
+    ]
+}
diff --git a/types/mark.js/tslint.json b/types/mark.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mark.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/markdown-it/tslint.json b/types/markdown-it/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/markdown-it/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/markdownlint/index.d.ts b/types/markdownlint/index.d.ts
new file mode 100644
index 0000000000..5e66f15185
--- /dev/null
+++ b/types/markdownlint/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for markdownlint 0.6
+// Project: https://github.com/DavidAnson/markdownlint
+// Definitions by: ark120202 <https://github.com/ark120202>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function markdownlint(
+    options: markdownlint.MarkdownlintOptions,
+    callback: (err: Error | null, result: markdownlint.MarkdownlintResults) => any,
+): void;
+
+declare namespace markdownlint {
+    function sync(options: MarkdownlintOptions): MarkdownlintResults;
+
+    function readConfig(
+        file: string,
+        callback: (err: Error | null, result: MarkdownlintConfig) => any,
+    ): void;
+    function readConfigSync(file: string): MarkdownlintConfig;
+
+    interface MarkdownlintConfig {
+        [rule: string]: boolean | { [key: string]: any };
+    }
+
+    interface MarkdownlintOptions {
+        files?: ReadonlyArray<string> | string;
+        strings?: { [identifier: string]: string };
+        config?: MarkdownlintConfig;
+        frontMatter?: RegExp;
+        noInlineConfig?: boolean;
+        resultVersion?: number;
+    }
+
+    interface MarkdownlintResult {
+        lineNumber: number;
+        ruleName: string;
+        ruleAlias: string;
+        ruleDescription: string;
+        errorDetail?: string;
+        errorContext: string;
+        errorRange?: [number, number];
+    }
+
+    interface MarkdownlintResults {
+        [source: string]: MarkdownlintResult[] | ((useAlias?: boolean) => string);
+        toString(useAlias?: boolean): string;
+    }
+}
+
+export = markdownlint;
diff --git a/types/markdownlint/markdownlint-tests.ts b/types/markdownlint/markdownlint-tests.ts
new file mode 100644
index 0000000000..faca81872d
--- /dev/null
+++ b/types/markdownlint/markdownlint-tests.ts
@@ -0,0 +1,38 @@
+import * as markdownlint from 'markdownlint';
+
+const config: markdownlint.MarkdownlintConfig = {
+    default: true,
+    MD003: { style: 'atx_closed' },
+    MD007: { indent: 4 },
+    'no-hard-tabs': false,
+    whitespace: false,
+};
+
+const options: markdownlint.MarkdownlintOptions = {
+    files: ['README.md'],
+    strings: { 'file.md': 'Header' },
+    config,
+    noInlineConfig: false,
+    resultVersion: 1,
+};
+
+// $ExpectType MarkdownlintResults
+const results = markdownlint.sync(options);
+
+markdownlint(options, (err, results) => {
+    // $ExpectType Error | null
+    err;
+
+    // $ExpectType MarkdownlintResults
+    results;
+
+    const resultString: string = results.toString();
+    // $ExpectError
+    results.toString() as markdownlint.MarkdownlintResult[];
+
+    const fileErrors: markdownlint.MarkdownlintResult[] = results[
+        'file.md'
+    ] as markdownlint.MarkdownlintResult[];
+    const firstFileError: markdownlint.MarkdownlintResult = fileErrors[0];
+    const firstFileErrorRule: string = firstFileError.ruleName;
+});
diff --git a/types/markdownlint/tsconfig.json b/types/markdownlint/tsconfig.json
new file mode 100644
index 0000000000..53b9ae46aa
--- /dev/null
+++ b/types/markdownlint/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "markdownlint-tests.ts"
+    ]
+}
diff --git a/types/markdownlint/tslint.json b/types/markdownlint/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/markdownlint/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/marker-animate-unobtrusive/tslint.json b/types/marker-animate-unobtrusive/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/marker-animate-unobtrusive/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/markerclustererplus/index.d.ts b/types/markerclustererplus/index.d.ts
index c358ce088b..1485971e4c 100644
--- a/types/markerclustererplus/index.d.ts
+++ b/types/markerclustererplus/index.d.ts
@@ -43,7 +43,8 @@ interface ClusterIconStyle {
      * property for the label text shown on the cluster icon.
      */
     textDecoration?: string;
-    /** [fontWeight="bold"] The value of the CSS <code>font-weight</code>
+    /**
+     * [fontWeight="bold"] The value of the CSS <code>font-weight</code>
      * property for the label text shown on the cluster icon.
      */
     fontWeight?: string;
@@ -68,14 +69,9 @@ interface ClusterIconStyle {
 }
 
 /**
- * @name ClusterIconInfo
- * @class This class is an object containing general information about a cluster icon. This is
  *      the object that a <code>calculator</code> function returns.
  *
- * @property {string} text The text of the label to be shown on the cluster icon.
- * @property {number} index The index plus 1 of the element in the <code>styles</code>
  *      array to be used to style the cluster icon.
- * @property {string} title The tooltip to display when the mouse moves over the cluster icon.
  *      If this value is <code>undefined</code> or <code>""</code>, <code>title</code> is set to the
  *      value of the <code>title</code> property passed to the MarkerClusterer.
  */
@@ -89,12 +85,9 @@ declare class ClusterIcon extends google.maps.OverlayView {
     /**
      * A cluster icon.
      *
-     * @constructor
-     * @extends google.maps.OverlayView
-     * @param {Cluster} cluster The cluster with which the icon is to be associated.
-     * @param {Array} [styles] An array of {@link ClusterIconStyle} defining the cluster icons
+     * @param cluster The cluster with which the icon is to be associated.
+     * @param [styles] An array of {@link ClusterIconStyle} defining the cluster icons
      *       to use for various cluster sizes.
-     * @private
      */
     constructor(cluster: Cluster, styles: ClusterIconStyle[]);
 
@@ -126,30 +119,30 @@ declare class ClusterIcon extends google.maps.OverlayView {
     /**
      * Sets the icon styles to the appropriate element in the styles array.
      *
-     * @param {ClusterIconInfo} style The icon label text and styles index.
+     * @param style The icon label text and styles index.
      */
     useStyle(style: ClusterIconInfo): void;
 
     /**
      * Sets the position at which to center the icon.
      *
-     * @param {google.maps.LatLng} center The latlng to set as the center.
+     * @param center The latlng to set as the center.
      */
     setCenter(center: google.maps.LatLng): void;
 
     /**
      * Creates the cssText style parameter based on the position of the icon.
      *
-     * @param {google.maps.Point} pos The position of the icon.
-     * @return {string} The CSS style text.
+     * @param pos The position of the icon.
+     * @return The CSS style text.
      */
     createCss(pos: google.maps.Point): string;
 
     /**
      * Returns the position at which to place the DIV depending on the latlng.
      *
-     * @param {google.maps.LatLng} latLng The position in latlng.
-     * @return {google.maps.Point} The position in pixels.
+     * @param latLng The position in latlng.
+     * @return The position in pixels.
      */
     getPosFromLatLng_(latLng: google.maps.LatLng): google.maps.Point;
 }
@@ -158,8 +151,7 @@ declare class Cluster {
     /**
      * Creates a single cluster that manages a group of proximate markers.
      * Used internally, do not call this constructor directly.
-     * @constructor
-     * @param {MarkerClusterer} mc The <code>MarkerClusterer</code> object with which this
+     * @param mc The <code>MarkerClusterer</code> object with which this
      *       cluster is associated.
      */
     constructor(mc: MarkerClusterer);
@@ -169,7 +161,7 @@ declare class Cluster {
      * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
      * for the <code>MarkerClusterer</code> object.
      *
-     * @return {number} The number of markers in the cluster.
+     * @return The number of markers in the cluster.
      */
     getSize(): number;
 
@@ -178,7 +170,7 @@ declare class Cluster {
      * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
      * for the <code>MarkerClusterer</code> object.
      *
-     * @return {Array} The array of markers in the cluster.
+     * @return The array of markers in the cluster.
      */
     getMarkers(): google.maps.Marker[];
 
@@ -187,14 +179,14 @@ declare class Cluster {
      * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
      * for the <code>MarkerClusterer</code> object.
      *
-     * @return {google.maps.LatLng} The center of the cluster.
+     * @return The center of the cluster.
      */
     getCenter(): google.maps.LatLng;
 
     /**
      * Returns the map with which the cluster is associated.
      *
-     * @return {google.maps.Map} The map.
+     * @return The map.
      * @ignore
      */
     getMap(): google.maps.Map;
@@ -202,7 +194,7 @@ declare class Cluster {
     /**
      * Returns the <code>MarkerClusterer</code> object with which the cluster is associated.
      *
-     * @return {MarkerClusterer} The associated marker clusterer.
+     * @return The associated marker clusterer.
      * @ignore
      */
     getMarkerClusterer(): MarkerClusterer;
@@ -210,7 +202,7 @@ declare class Cluster {
     /**
      * Returns the bounds of the cluster.
      *
-     * @return {google.maps.LatLngBounds} the cluster bounds.
+     * @return the cluster bounds.
      * @ignore
      */
     getBounds(): google.maps.LatLngBounds;
@@ -225,8 +217,8 @@ declare class Cluster {
     /**
      * Adds a marker to the cluster.
      *
-     * @param {google.maps.Marker} marker The marker to be added.
-     * @return {boolean} True if the marker was added.
+     * @param marker The marker to be added.
+     * @return True if the marker was added.
      * @ignore
      */
     addMarker(marker: google.maps.Marker): boolean;
@@ -234,8 +226,8 @@ declare class Cluster {
     /**
      * Determines if a marker lies within the cluster's bounds.
      *
-     * @param {google.maps.Marker} marker The marker to check.
-     * @return {boolean} True if the marker lies in the bounds.
+     * @param marker The marker to check.
+     * @return True if the marker lies in the bounds.
      * @ignore
      */
     isMarkerInClusterBounds(marker: google.maps.Marker): boolean;
@@ -253,8 +245,8 @@ declare class Cluster {
     /**
      * Determines if a marker has already been added to the cluster.
      *
-     * @param {google.maps.Marker} marker The marker to check.
-     * @return {boolean} True if the marker has already been added.
+     * @param marker The marker to check.
+     * @return True if the marker has already been added.
      */
     isMarkerAlreadyAdded_(marker: google.maps.Marker): boolean;
 }
@@ -267,7 +259,8 @@ type Calculator = (markers: google.maps.Marker[], clusterIconStylesCount: number
 interface MarkerClustererOptions {
     /** [gridSize=60] The grid size of a cluster in pixels. The grid is a square. */
     gridSize?: number;
-    /** [maxZoom=null] The maximum zoom level at which clustering is enabled or
+    /**
+     * [maxZoom=null] The maximum zoom level at which clustering is enabled or
      * <code>null</code> if clustering is to be enabled at all zoom levels.
      */
     maxZoom?: number;
@@ -384,11 +377,9 @@ interface MarkerClustererOptions {
 declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * Creates a MarkerClusterer object with the options specified in {@link MarkerClustererOptions}.
-     * @constructor
-     * @extends google.maps.OverlayView
-     * @param {google.maps.Map} map The Google map to attach to.
-     * @param {Array.<google.maps.Marker>} [markers] The markers to be added to the cluster.
-     * @param {MarkerClustererOptions} [options] The optional parameters.
+     * @param map The Google map to attach to.
+     * @param [markers] The markers to be added to the cluster.
+     * @param [options] The optional parameters.
      */
     constructor(map: google.maps.Map, markers?: google.maps.Marker[], options?: MarkerClustererOptions);
 
@@ -425,182 +416,182 @@ declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * Returns the value of the <code>gridSize</code> property.
      *
-     * @return {number} The grid size.
+     * @return The grid size.
      */
     getGridSize(): number;
 
     /**
      * Sets the value of the <code>gridSize</code> property.
      *
-     * @param {number} gridSize The grid size.
+     * @param gridSize The grid size.
      */
     setGridSize(gridSize: number): void;
 
     /**
      * Returns the value of the <code>minimumClusterSize</code> property.
      *
-     * @return {number} The minimum cluster size.
+     * @return The minimum cluster size.
      */
     getMinimumClusterSize(): number;
 
     /**
      * Sets the value of the <code>minimumClusterSize</code> property.
      *
-     * @param {number} minimumClusterSize The minimum cluster size.
+     * @param minimumClusterSize The minimum cluster size.
      */
     setMinimumClusterSize(minimumClusterSize: number): void;
 
     /**
      *  Returns the value of the <code>maxZoom</code> property.
      *
-     *  @return {number} The maximum zoom level.
+     *  @return The maximum zoom level.
      */
     getMaxZoom(): number;
 
     /**
      *  Sets the value of the <code>maxZoom</code> property.
      *
-     *  @param {number} maxZoom The maximum zoom level.
+     *  @param maxZoom The maximum zoom level.
      */
     setMaxZoom(maxZoom: number): void;
 
     /**
      *  Returns the value of the <code>styles</code> property.
      *
-     *  @return {Array} The array of styles defining the cluster markers to be used.
+     *  @return The array of styles defining the cluster markers to be used.
      */
     getStyles(): ClusterIconStyle[];
 
     /**
      *  Sets the value of the <code>styles</code> property.
      *
-     *  @param {Array.<ClusterIconStyle>} styles The array of styles to use.
+     *  @param styles The array of styles to use.
      */
     setStyles(styles: ClusterIconStyle[]): void;
 
     /**
      * Returns the value of the <code>title</code> property.
      *
-     * @return {string} The content of the title text.
+     * @return The content of the title text.
      */
     getTitle(): string;
 
     /**
      *  Sets the value of the <code>title</code> property.
      *
-     *  @param {string} title The value of the title property.
+     *  @param title The value of the title property.
      */
     setTitle(title: string): void;
 
     /**
      * Returns the value of the <code>zoomOnClick</code> property.
      *
-     * @return {boolean} True if zoomOnClick property is set.
+     * @return True if zoomOnClick property is set.
      */
     getZoomOnClick(): boolean;
 
     /**
      *  Sets the value of the <code>zoomOnClick</code> property.
      *
-     *  @param {boolean} zoomOnClick The value of the zoomOnClick property.
+     *  @param zoomOnClick The value of the zoomOnClick property.
      */
     setZoomOnClick(zoomOnClick: boolean): void;
 
     /**
      * Returns the value of the <code>averageCenter</code> property.
      *
-     * @return {boolean} True if averageCenter property is set.
+     * @return True if averageCenter property is set.
      */
     getAverageCenter(): boolean;
 
     /**
      *  Sets the value of the <code>averageCenter</code> property.
      *
-     *  @param {boolean} averageCenter The value of the averageCenter property.
+     *  @param averageCenter The value of the averageCenter property.
      */
     setAverageCenter(averageCenter: boolean): void;
 
     /**
      * Returns the value of the <code>ignoreHidden</code> property.
      *
-     * @return {boolean} True if ignoreHidden property is set.
+     * @return True if ignoreHidden property is set.
      */
     getIgnoreHidden(): boolean;
 
     /**
      * Sets the value of the <code>ignoreHidden</code> property.
      *
-     * @param {boolean} ignoreHidden The value of the ignoreHidden property.
+     * @param ignoreHidden The value of the ignoreHidden property.
      */
     setIgnoreHidden(ignoreHidden: boolean): void;
 
     /**
      * Returns the value of the <code>enableRetinaIcons</code> property.
      *
-     * @return {boolean} True if enableRetinaIcons property is set.
+     * @return True if enableRetinaIcons property is set.
      */
     getEnableRetinaIcons(): boolean;
 
     /**
      * Sets the value of the <code>enableRetinaIcons</code> property.
      *
-     * @param {boolean} enableRetinaIcons The value of the enableRetinaIcons property.
+     * @param enableRetinaIcons The value of the enableRetinaIcons property.
      */
     setEnableRetinaIcons(enableRetinaIcons: boolean): void;
 
     /**
      * Returns the value of the <code>imageExtension</code> property.
      *
-     * @return {string} The value of the imageExtension property.
+     * @return The value of the imageExtension property.
      */
     getImageExtension(): string;
 
     /**
      * Sets the value of the <code>imageExtension</code> property.
      *
-     * @param {string} imageExtension The value of the imageExtension property.
+     * @param imageExtension The value of the imageExtension property.
      */
     setImageExtension(imageExtension: string): void;
 
     /**
      * Returns the value of the <code>imagePath</code> property.
      *
-     * @return {string} The value of the imagePath property.
+     * @return The value of the imagePath property.
      */
     getImagePath(): string;
 
     /**
      * Sets the value of the <code>imagePath</code> property.
      *
-     * @param {string} imagePath The value of the imagePath property.
+     * @param imagePath The value of the imagePath property.
      */
     setImagePath(imagePath: string): void;
 
     /**
      * Returns the value of the <code>imageSizes</code> property.
      *
-     * @return {Array} The value of the imageSizes property.
+     * @return The value of the imageSizes property.
      */
     getImageSizes(): number[];
 
     /**
      * Sets the value of the <code>imageSizes</code> property.
      *
-     * @param {Array} imageSizes The value of the imageSizes property.
+     * @param imageSizes The value of the imageSizes property.
      */
     setImageSizes(imageSizes: number[]): void;
 
     /**
      * Returns the value of the <code>calculator</code> property.
      *
-     * @return {function} the value of the calculator property.
+     * @return the value of the calculator property.
      */
     getCalculator(): Calculator;
 
     /**
      * Sets the value of the <code>calculator</code> property.
      *
-     * @param {function(Array.<google.maps.Marker>, number)} calculator The value
+     * @param calculator The value
      *  of the calculator property.
      */
     setCalculator(calculator: Calculator): void;
@@ -608,70 +599,70 @@ declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * Sets the value of the <code>hideLabel</code> property.
      *
-     * @param {boolean} printable The value of the hideLabel property.
+     * @param printable The value of the hideLabel property.
      */
     setHideLabel(printable: boolean): void;
 
     /**
      * Returns the value of the <code>hideLabel</code> property.
      *
-     * @return {boolean} the value of the hideLabel property.
+     * @return the value of the hideLabel property.
      */
     getHideLabel(): boolean;
 
     /**
      * Returns the value of the <code>batchSizeIE</code> property.
      *
-     * @return {number} the value of the batchSizeIE property.
+     * @return the value of the batchSizeIE property.
      */
     getBatchSizeIE(): number;
 
     /**
      * Sets the value of the <code>batchSizeIE</code> property.
      *
-     * @param {number} batchSizeIE The value of the batchSizeIE property.
+     * @param batchSizeIE The value of the batchSizeIE property.
      */
     setBatchSizeIE(batchSizeIE: number): void;
 
     /**
      * Returns the value of the <code>clusterClass</code> property.
      *
-     * @return {string} the value of the clusterClass property.
+     * @return the value of the clusterClass property.
      */
     getClusterClass(): string;
 
     /**
      * Sets the value of the <code>clusterClass</code> property.
      *
-     * @param {string} clusterClass The value of the clusterClass property.
+     * @param clusterClass The value of the clusterClass property.
      */
     setClusterClass(clusterClass: string): void;
 
     /**
      * Returns the array of markers managed by the clusterer.
      *
-     * @return {Array} The array of markers managed by the clusterer.
+     * @return The array of markers managed by the clusterer.
      */
     getMarkers(): google.maps.Marker[];
 
     /**
      * Returns the number of markers managed by the clusterer.
      *
-     * @return {number} The number of markers.
+     * @return The number of markers.
      */
     getTotalMarkers(): number;
 
     /**
      * Returns the current array of clusters formed by the clusterer.
      *
-     * @return {Array} The array of clusters formed by the clusterer.
+     * @return The array of clusters formed by the clusterer.
      */
     getClusters(): Cluster[];
 
     /**
      * Returns the number of clusters formed by the clusterer.
      *
-     * @return {number} The number of clusters formed by the clusterer.
+     * @return The number of clusters formed by the clusterer.
      */
     getTotalClusters(): number;
 
@@ -679,8 +670,8 @@ declare class MarkerClusterer extends google.maps.OverlayView {
      * Adds a marker to the clusterer. The clusters are redrawn unless
      * <code>noDraw</code> is set to <code>true</code>.
      *
-     * @param {google.maps.Marker} marker The marker to add.
-     * @param {boolean} [noDraw] Set to <code>true</code> to prevent redrawing.
+     * @param marker The marker to add.
+     * @param [noDraw] Set to <code>true</code> to prevent redrawing.
      */
     addMarker(marker: google.maps.Marker, noDraw?: boolean): void;
 
@@ -688,15 +679,15 @@ declare class MarkerClusterer extends google.maps.OverlayView {
      * Adds an array of markers to the clusterer. The clusters are redrawn unless
      * <code>noDraw</code> is set to <code>true</code>.
      *
-     * @param {Array.<google.maps.Marker>} markers The markers to add.
-     * @param {boolean} [noDraw] Set to <code>true</code> to prevent redrawing.
+     * @param markers The markers to add.
+     * @param [noDraw] Set to <code>true</code> to prevent redrawing.
      */
     addMarkers(markers: google.maps.Marker[], noDraw?: boolean): void;
 
     /**
      * Pushes a marker to the clusterer.
      *
-     * @param {google.maps.Marker} marker The marker to add.
+     * @param marker The marker to add.
      */
     pushMarkerTo_(marker: google.maps.Marker): void;
 
@@ -705,10 +696,10 @@ declare class MarkerClusterer extends google.maps.OverlayView {
      * <code>noDraw</code> is set to <code>true</code>. Returns <code>true</code> if the
      * marker was removed from the clusterer.
      *
-     * @param {google.maps.Marker} marker The marker to remove.
-     * @param {boolean} [noDraw] Set to <code>true</code> to prevent redrawing.
-     * @param {boolean} [noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
-     * @return {boolean} True if the marker was removed from the clusterer.
+     * @param marker The marker to remove.
+     * @param [noDraw] Set to <code>true</code> to prevent redrawing.
+     * @param [noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
+     * @return True if the marker was removed from the clusterer.
      */
     removeMarker(marker: google.maps.Marker, noDraw?: boolean, noMapRemove?: boolean): boolean;
 
@@ -717,19 +708,19 @@ declare class MarkerClusterer extends google.maps.OverlayView {
      * <code>noDraw</code> is set to <code>true</code>. Returns <code>true</code> if markers
      * were removed from the clusterer.
      *
-     * @param {Array.<google.maps.Marker>} markers The markers to remove.
-     * @param {boolean} [noDraw] Set to <code>true</code> to prevent redrawing.
-     * @param {boolean} [noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
-     * @return {boolean} True if markers were removed from the clusterer.
+     * @param markers The markers to remove.
+     * @param [noDraw] Set to <code>true</code> to prevent redrawing.
+     * @param [noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
+     * @return True if markers were removed from the clusterer.
      */
     removeMarkers(markers: google.maps.Marker[], noDraw?: boolean, noMapRemove?: boolean): boolean;
 
     /**
      * Removes a marker and returns true if removed, false if not.
      *
-     * @param {google.maps.Marker} marker The marker to remove
-     * @param {boolean} removeFromMap set to <code>true</code> to explicitly remove from map as well as cluster manangement
-     * @return {boolean} Whether the marker was removed or not
+     * @param marker The marker to remove
+     * @param removeFromMap set to <code>true</code> to explicitly remove from map as well as cluster manangement
+     * @return Whether the marker was removed or not
      */
     removeMarker_(marker: google.maps.Marker, removeFromMap?: boolean): boolean;
 
@@ -748,8 +739,8 @@ declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * Returns the current bounds extended by the grid size.
      *
-     * @param {google.maps.LatLngBounds} bounds The bounds to extend.
-     * @return {google.maps.LatLngBounds} The extended bounds.
+     * @param bounds The bounds to extend.
+     * @return The extended bounds.
      * @ignore
      */
     getExtendedBounds(bounds: google.maps.LatLngBounds): google.maps.LatLngBounds;
@@ -763,7 +754,7 @@ declare class MarkerClusterer extends google.maps.OverlayView {
      * Removes all clusters from the map. The markers are also removed from the map
      * if <code>hide</code> is set to <code>true</code>.
      *
-     * @param {boolean} [hide] Set to <code>true</code> to also remove the markers
+     * @param [hide] Set to <code>true</code> to also remove the markers
      *      from the map.
      */
     resetViewport_(hide?: boolean): void;
@@ -771,9 +762,9 @@ declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * Calculates the distance between two latlng locations in km.
      *
-     * @param {google.maps.LatLng} p1 The first lat lng point.
-     * @param {google.maps.LatLng} p2 The second lat lng point.
-     * @return {number} The distance between the two points in km.
+     * @param p1 The first lat lng point.
+     * @param p2 The second lat lng point.
+     * @return The distance between the two points in km.
      * @see http://www.movable-type.co.uk/scripts/latlong.html
      */
     distanceBetweenPoints_(p1: google.maps.LatLng, p2: google.maps.LatLng): number;
@@ -781,16 +772,16 @@ declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * Determines if a marker is contained in a bounds.
      *
-     * @param {google.maps.Marker} marker The marker to check.
-     * @param {google.maps.LatLngBounds} bounds The bounds to check against.
-     * @return {boolean} True if the marker is in the bounds.
+     * @param marker The marker to check.
+     * @param bounds The bounds to check against.
+     * @return True if the marker is in the bounds.
      */
     isMarkerInBounds_(marker: google.maps.Marker, bounds: google.maps.LatLngBounds): boolean;
 
     /**
      * Adds a marker to a cluster, or creates a new cluster.
      *
-     * @param {google.maps.Marker} marker The marker to add.
+     * @param marker The marker to add.
      */
     addToClosestCluster_(marker: google.maps.Marker): void;
 
@@ -798,7 +789,7 @@ declare class MarkerClusterer extends google.maps.OverlayView {
      * Creates the clusters. This is done in batches to avoid timeout errors
      * in some browsers when there is a huge number of markers.
      *
-     * @param {number} iFirst The index of the first marker in the batch of
+     * @param iFirst The index of the first marker in the batch of
      *      markers to be added to clusters.
      */
     createClusters_(iFirst: number): void;
@@ -806,9 +797,9 @@ declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * Extends an object's prototype by another's.
      *
-     * @param {object} obj1 The object to be extended.
-     * @param {object} obj2 The object to extend with.
-     * @return {object} The new extended object.
+     * @param obj1 The object to be extended.
+     * @param obj2 The object to extend with.
+     * @return The new extended object.
      * @ignore
      */
     extend(obj1: object, obj2: object): object;
@@ -817,10 +808,9 @@ declare class MarkerClusterer extends google.maps.OverlayView {
      * The default function for determining the label text and style
      * for a cluster icon.
      *
-     * @param {Array.<google.maps.Marker>} markers The array of markers represented by the cluster.
-     * @param {number} numStyles The number of marker styles available.
-     * @return {ClusterIconInfo} The information resource for the cluster.
-     * @constant
+     * @param markers The array of markers represented by the cluster.
+     * @param numStyles The number of marker styles available.
+     * @return The information resource for the cluster.
      * @ignore
      */
     static CALCULATOR: Calculator;
@@ -828,40 +818,30 @@ declare class MarkerClusterer extends google.maps.OverlayView {
     /**
      * The number of markers to process in one batch.
      *
-     * @type {number}
-     * @constant
      */
     static BATCH_SIZE: number;
 
     /**
      * The number of markers to process in one batch (IE only).
      *
-     * @type {number}
-     * @constant
      */
     static BATCH_SIZE_IE: number;
 
     /**
      * The default root name for the marker cluster images.
      *
-     * @type {string}
-     * @constant
      */
     static IMAGE_PATH: string;
 
     /**
      * The default extension name for the marker cluster images.
      *
-     * @type {string}
-     * @constant
      */
     static IMAGE_EXTENSION: string;
 
     /**
      * The default array of sizes for the marker cluster images.
      *
-     * @type {Array.<number>}
-     * @constant
      */
     static IMAGE_SIZES: number[];
 }
diff --git a/types/markitup/tslint.json b/types/markitup/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/markitup/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/maskedinput/tslint.json b/types/maskedinput/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/maskedinput/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/masonry-layout/index.d.ts b/types/masonry-layout/index.d.ts
index 212baa2471..a771b423e5 100644
--- a/types/masonry-layout/index.d.ts
+++ b/types/masonry-layout/index.d.ts
@@ -10,7 +10,7 @@ export = Masonry;
 
 declare class Masonry {
     constructor(options?: Masonry.Options);
-    constructor(selector: string, options?: Masonry.Options);
+    constructor(selector: string | Element, options?: Masonry.Options);
 
     masonry?(): void;
     masonry?(eventName: string, listener: any): void;
diff --git a/types/massive/index.d.ts b/types/massive/index.d.ts
index b7132ab910..e11c5e0ed2 100644
--- a/types/massive/index.d.ts
+++ b/types/massive/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for massive 3.0
+// Type definitions for massive 4.6
 // Project: https://github.com/dmfay/massive-js.git
 // Definitions by: Pascal Birchler <https://github.com/swissspidy>
 //                 Clarence Ho <https://github.com/clarenceh>
+//                 Felix Faust <https://github.com/AmazingTurtle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -9,74 +10,284 @@
 
 export = massive;
 
-declare function massive(
-  connection: massive.ConnectionInfo | string,
-  loaderConfig?: object,
-  driverConfig?: object): Promise<massive.Database>;
+declare function massive(connection: massive.ConnectionInfo | string,
+                         loaderConfig?: massive.Loader,
+                         driverConfig?: object): Promise<massive.Database>;
 
 declare namespace massive {
-  interface ConnectionInfo {
-    user?: string;
-    database?: string;
-    password?: string | null;
-    port?: number;
-    host?: string;
-    ssl?: boolean;
-    application_name?: string;
-    fallback_application_name?: boolean;
-  }
+    type UUID = number | string;
 
-  interface QueryOptions {
-    columns?: string[];
-    limit?: number;
-    offset?: number;
-    only?: boolean;
-    order?: string[];
-    orderBody?: boolean;
-    build?: boolean;
-    document?: boolean;
-    single?: boolean;
-    stream?: boolean;
-  }
+    interface Loader {
+        blacklist?: string | string[];
+        whitelist?: string | string[];
+        functionBlacklist?: string | string[];
+        functionWhitelist?: string | string[];
+        allowedSchemas?: string | string[];
+        exceptions?: string | string[];
+        scripts?: string;
+    }
 
-  interface SearchCriteria {
-    fields: string[];
-    term: string;
-  }
+    interface DropOptions {
+        cascade?: boolean;
+    }
 
-  interface Table<T> {
-    find(criteria: object | {}, queryOptions?: QueryOptions): Promise<T[]>;
-    findOne(criteria: number | object, queryOptions?: QueryOptions): Promise<T>;
-    count(criteria: object): Promise<string>;
-    where(query: string, params: any[] | object): Promise<T[]>;
-    search(criteria: SearchCriteria, queryOptions?: QueryOptions): Promise<any>;
-    save(data: object): Promise<T>;
-    insert(data: object): Promise<T>;
-    insert(data: object[]): Promise<T[]>;
-    update(dataOrCriteria: object, changesMap?: object): Promise<T>;
-    update(dataOrCriteria: object[], changesMap?: object): Promise<T[]>;
-    destroy(criteria: object): Promise<T[]>;
-  }
+    interface ConnectionInfo {
+        user?: string;
+        database?: string;
+        password?: string | null;
+        port?: number;
+        host?: string;
+        ssl?: boolean;
+        application_name?: string;
+        fallback_application_name?: boolean;
+    }
 
-  interface Document {
-    countDoc(criteria: object): Promise<number>;
-    findDoc(criteria: number | string| object): Promise<object>;
-    searchDoc(criteria: SearchCriteria): Promise<object[]>;
-    saveDoc(doc: object): Promise<object>;
-    modify(docId: number | string, doc: object, fieldName?: string): Promise<object>;
-  }
+    /** Bundled insert, select, update and delete query options.. Shame on me */
+    interface GenericQueryOptions {
+        columns?: string[];
+        limit?: number;
+        offset?: number;
+        only?: boolean;
+        order?: string[];
+        orderBody?: boolean;
+        build?: boolean;
+        document?: boolean;
+        single?: boolean;
+        stream?: boolean;
+    }
 
-  interface Database {
-    attach(ctor: any, ...sources: any[]): Promise<any>;
-    detach(entity: string, collection: string): void;
-    reload(): void;
-    query(query: any, params: any, options: any): Promise<any>;
-    saveDoc(collectionName: string, doc: object): Promise<any>;
-    createDocumentTable(path: any): Promise<any>;
-    getObject(path: any, collection: any): object;
-    dropTable(table: string, options: any): void;
-    createSchema(schemaName: string): void;
-    dropSchema(schemaName: string, options: any): void;
-    run(query: string, params: any[] | object): Promise<object[]>;
-  }
+    interface SearchDefinition {
+        /** List of the fields to search. */
+        fields: string[];
+
+        /** Search term. */
+        term: string;
+    }
+
+    interface QueryOptions {
+        /** This is a query against a document table. */
+        document?: boolean;
+        /** True to return a single result object instead of an array of results. */
+        single?: boolean;
+        /** True to return a stream instead of a resultset. */
+        stream?: boolean;
+    }
+
+    interface SearchCriteria {
+        fields: string[];
+        term: string;
+    }
+
+    class Table extends Queryable {
+        /** Delete a record or records. */
+        destroy(criteria: object, options?: GenericQueryOptions): Promise<void>;
+
+        /** Attempts to assemble primary key criteria for a record object representing a row in this table. The criteria must include the full primary key, and must not invoke any operations. */
+        getPkCriteria(record: object): object;
+
+        /** Insert a record or records into the table. */
+        insert(data: object | any[], options?: GenericQueryOptions): Promise<any>;
+
+        /**
+         * Update a document, adding new information and changing existing information.
+         * This function can be used with any JSON field, not just document tables; however, only document tables can use criteria objects which directly reference document fields.
+         * If calling modify with a criteria object for a non-document table, the criteria will be tested against the entire row (as opposed to the document body as it is for document tables).
+         * To test elements of the JSON field in a non-document table with a criteria object, use a JSON path string.
+         */
+        modify(criteria: object | UUID, changes: object, field?: string): Promise<any>;
+
+        /**
+         * Performs an upsert.
+         * If the record does not include a value for the primary key column, it will be inserted and the persisted record (including primary key) returned;
+         * if it does, the row will be updated and the modified record returned.
+         */
+        save(record: object, options?: GenericQueryOptions): Promise<any>;
+
+        /**
+         * Save a document to the database. This function replaces the entire document body.
+         */
+        saveDoc(record: object): Promise<any>;
+
+        /**
+         * Update a record.
+         * May be invoked with a complete record (including primary key), or with a criteria object and a map of fields to new values.
+         * Multi-row updates are only possible through the latter usage.
+         */
+        update(criteria: object, fields: object, options?: GenericQueryOptions): void;
+    }
+
+    interface EntitySpecification {
+        /** A Database. */
+        db: object;
+        /** The entity's name. */
+        name: string;
+        /** Path to the entity, if a file. */
+        path: string;
+        /** Entity's owning schema, if a database object. */
+        schema: string;
+    }
+
+    class Entity {
+        constructor(spec: EntitySpecification);
+    }
+
+    class Queryable extends Entity {
+        constructor(spec: EntitySpecification);
+
+        /**
+         * Count rows matching criteria. There are two ways to use this method: 1. find() style: db.mytable.count({field: value}); 2. where() style: db.mytable.count("field=$1", [value]);
+         *
+         * @param conditions A criteria object or SQL predicate.
+         * @param params Prepared statement parameters for use with raw SQL predicates.
+         */
+        count(conditions: object | string, params?: any): Promise<number>;
+
+        /**
+         * Count documents matching criteria. Unlike count, this function only supports criteria objects.
+         */
+        countDoc(criteria: object): Promise<number>;
+
+        /**
+         * Find rows matching criteria.
+         *
+         * @param criteria A criteria object or primary key value.
+         */
+        find(criteria: object | UUID, options?: GenericQueryOptions): Promise<any>;
+
+        /**
+         * Find a document by searching in the body.
+         *
+         * @param criteria A criteria object or primary key value.
+         */
+        findDoc(criteria?: object | UUID, options?: GenericQueryOptions): Promise<any>;
+
+        /**
+         * Return a single record.
+         *
+         * @param criteria A criteria object or primary key value.
+         */
+        findOne(criteria?: object | UUID, options?: GenericQueryOptions): Promise<any>;
+
+        /**
+         * Determine whether criteria represent a search by primary key.
+         * If a number or uuid are passed, it is assumed to be a primary key value; if an object, it must have only one key, which must specify the primary key column.
+         */
+        isPkSearch(criteria?: object | string | number): boolean;
+
+        /**
+         * Perform a full-text search on queryable fields. If options.document is true, looks in the document body fields instead of the table columns.
+         */
+        search(plan: SearchDefinition, options?: GenericQueryOptions): Promise<any>;
+
+        /** Shortcut to perform a full text search on a document table. */
+        searchDoc(plan: SearchDefinition, options?: GenericQueryOptions): Promise<any>;
+
+        /** Run a query with a raw SQL predicate, eg: db.mytable.where('id=$1', [123]).then(...); */
+        where(conditions: string, params?: any, options?: GenericQueryOptions): Promise<any>;
+    }
+
+    /** Represents a SELECT query. */
+    class Select {
+        /**
+         * @param source Database object to query.
+         * @param criteria A criteria object, prebuilt predicate, or primitive pk value.
+         */
+        constructor(source: Queryable, criteria: object | UUID, options?: GenericQueryOptions);
+
+        /** Format this object into a SQL SELECT. */
+        format(): string;
+    }
+
+    /** Represents a INSERT query. */
+    class Insert {
+        /**
+         * @param source Database object to query.
+         * @param record A map of field names to values to be inserted, or an array of same.
+         */
+        constructor(source: Queryable, record: object | any[], options?: GenericQueryOptions);
+
+        /** Format this object into a SQL SELECT. */
+        format(): string;
+    }
+
+    /** Represents a UPDATE query. */
+    class Update {
+        /**
+         * @param source Database object to query.
+         * @param changes A map of field names to new values.
+         * @param criteria A criteria object.
+         */
+        constructor(source: Queryable, changes: object, criteria: object, options?: GenericQueryOptions);
+
+        /** Format this object into a SQL SELECT. */
+        format(): string;
+    }
+
+    /** Represents a UPDATE query. */
+    class Delete {
+        /**
+         * @param source Database object to query.
+         * @param criteria A criteria object.
+         */
+        constructor(source: Queryable, criteria?: object, options?: GenericQueryOptions);
+
+        /** Format this object into a SQL SELECT. */
+        format(): string;
+    }
+
+    class Database {
+        /**
+         * @param connection A connection object or connection string
+         */
+        constructor(connection: object | string, loader?: Loader, driverConfig?: object);
+
+        /** Attach an entity to the connected instance. */
+        attach(ctor: any, ...sources: any[]): Promise<any[]>;
+
+        /** Remove all attached entities from the instance, returning it to the pre- introspection state. */
+        clean(): void;
+
+        /** Create a new document table and attach it to the Database for usage. */
+        createDocumentTable(location: string): Promise<void>;
+
+        /** Create a new schema in the database. */
+        createSchema(schemaName: string): Promise<void>;
+
+        /** Forget an entity. */
+        detach(entityPath: string): void;
+
+        /** Drop a schema and remove it and its owned objects from the Database. */
+        dropSchema(schemaName: string, options?: DropOptions): Promise<void>;
+
+        /** Drop a table and remove it from the Database. */
+        dropTable(tablePath: string, options?: DropOptions): Promise<void>;
+
+        /** List all the functions and scripts attached to the connected instance. */
+        listFunctions(): Promise<any[]>;
+
+        /** List all the tables attached to the connected instance. */
+        listTables(): Promise<any[]>;
+
+        /** List all the views attached to the connected instance. */
+        listViews(): Promise<any[]>;
+
+        /** Execute a query. */
+        query(query: Select | Insert | Update | Delete | string, params?: any, options?: QueryOptions): Promise<any>;
+
+        /**
+         * Synchronize the database API with the current state by scanning for tables, views, functions, and scripts.
+         * Objects and files which no longer exist are cleared and new objects and files added.
+         */
+        reload(): void;
+
+        /**
+         * Save a document.
+         *
+         * @param collection Document table name to save to. If it does not already exist, it will be created.
+         * @param doc A JSON document.
+         */
+        saveDoc(collection: string, doc: object): Promise<any>;
+
+        [tableName: string]: Table | any;
+    }
 }
diff --git a/types/massive/tslint.json b/types/massive/tslint.json
index 3db14f85ea..75a24b3163 100644
--- a/types/massive/tslint.json
+++ b/types/massive/tslint.json
@@ -1 +1,8 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "no-any-union": false,
+        "no-unnecessary-class": false
+    }
+}
diff --git a/types/massive/v3/index.d.ts b/types/massive/v3/index.d.ts
new file mode 100644
index 0000000000..b7132ab910
--- /dev/null
+++ b/types/massive/v3/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for massive 3.0
+// Project: https://github.com/dmfay/massive-js.git
+// Definitions by: Pascal Birchler <https://github.com/swissspidy>
+//                 Clarence Ho <https://github.com/clarenceh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+export = massive;
+
+declare function massive(
+  connection: massive.ConnectionInfo | string,
+  loaderConfig?: object,
+  driverConfig?: object): Promise<massive.Database>;
+
+declare namespace massive {
+  interface ConnectionInfo {
+    user?: string;
+    database?: string;
+    password?: string | null;
+    port?: number;
+    host?: string;
+    ssl?: boolean;
+    application_name?: string;
+    fallback_application_name?: boolean;
+  }
+
+  interface QueryOptions {
+    columns?: string[];
+    limit?: number;
+    offset?: number;
+    only?: boolean;
+    order?: string[];
+    orderBody?: boolean;
+    build?: boolean;
+    document?: boolean;
+    single?: boolean;
+    stream?: boolean;
+  }
+
+  interface SearchCriteria {
+    fields: string[];
+    term: string;
+  }
+
+  interface Table<T> {
+    find(criteria: object | {}, queryOptions?: QueryOptions): Promise<T[]>;
+    findOne(criteria: number | object, queryOptions?: QueryOptions): Promise<T>;
+    count(criteria: object): Promise<string>;
+    where(query: string, params: any[] | object): Promise<T[]>;
+    search(criteria: SearchCriteria, queryOptions?: QueryOptions): Promise<any>;
+    save(data: object): Promise<T>;
+    insert(data: object): Promise<T>;
+    insert(data: object[]): Promise<T[]>;
+    update(dataOrCriteria: object, changesMap?: object): Promise<T>;
+    update(dataOrCriteria: object[], changesMap?: object): Promise<T[]>;
+    destroy(criteria: object): Promise<T[]>;
+  }
+
+  interface Document {
+    countDoc(criteria: object): Promise<number>;
+    findDoc(criteria: number | string| object): Promise<object>;
+    searchDoc(criteria: SearchCriteria): Promise<object[]>;
+    saveDoc(doc: object): Promise<object>;
+    modify(docId: number | string, doc: object, fieldName?: string): Promise<object>;
+  }
+
+  interface Database {
+    attach(ctor: any, ...sources: any[]): Promise<any>;
+    detach(entity: string, collection: string): void;
+    reload(): void;
+    query(query: any, params: any, options: any): Promise<any>;
+    saveDoc(collectionName: string, doc: object): Promise<any>;
+    createDocumentTable(path: any): Promise<any>;
+    getObject(path: any, collection: any): object;
+    dropTable(table: string, options: any): void;
+    createSchema(schemaName: string): void;
+    dropSchema(schemaName: string, options: any): void;
+    run(query: string, params: any[] | object): Promise<object[]>;
+  }
+}
diff --git a/types/massive/v3/massive-tests.ts b/types/massive/v3/massive-tests.ts
new file mode 100644
index 0000000000..c201541a12
--- /dev/null
+++ b/types/massive/v3/massive-tests.ts
@@ -0,0 +1,10 @@
+import massive = require('massive');
+
+let dbconn: massive.Database;
+
+massive('postgres://app:password@localhost:5432/app').then(db => {
+    console.log(`DB connected successfully`);
+    dbconn = db;
+}).catch(err => {
+    console.error(`Error connecting DB`);
+});
diff --git a/types/massive/v3/tsconfig.json b/types/massive/v3/tsconfig.json
new file mode 100644
index 0000000000..ddfdc175d3
--- /dev/null
+++ b/types/massive/v3/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es2015"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+          "massive": [ "massive/v3" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "massive-tests.ts"
+    ]
+}
diff --git a/types/massive/v3/tslint.json b/types/massive/v3/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/massive/v3/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/match-media-mock/tslint.json b/types/match-media-mock/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/match-media-mock/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/material-design-lite/tslint.json b/types/material-design-lite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/material-design-lite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/material-ui-datatables/index.d.ts b/types/material-ui-datatables/index.d.ts
new file mode 100644
index 0000000000..3a8eab86f1
--- /dev/null
+++ b/types/material-ui-datatables/index.d.ts
@@ -0,0 +1,119 @@
+// Type definitions for material-ui-datatables 0.18
+// Project: https://github.com/hyojin/material-ui-datatables#readme
+// Definitions by: Ravi L. <https://github.com/coding2012>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export interface Column {
+    /** The element key */
+    key?: string;
+    /** Style for column */
+    style?: React.CSSProperties;
+    /** Label */
+    label?: string;
+    /** Cell tooltip */
+    tooltip?: string;
+    /** If the column is sortable */
+    sortable?: boolean;
+    /** Align right */
+    alignRight?: boolean;
+    /** Class name to use */
+    className?: string;
+    /**
+     * Render function. Given the value extracted
+     * from the row; and the row also. Can return JSX content.
+     * @param value - the extracted value from data
+     * @param row - the data object representing this row
+     * @returns Any react node (JSX compatible return)
+     */
+    render?: (value: any, row: any) => any;
+}
+
+export interface DataTableProps {
+    /** Table title */
+    title: string;
+    /** React Style object for the title */
+    titleStyle: React.CSSProperties;
+    /** Filter hint text */
+    filterHintText: string;
+    /** If the header should be fixed */
+    fixedHeader: boolean;
+    /** If the footer should be fixed */
+    fixedFooter: boolean;
+    /** React Style object applied to footer toolbar */
+    footerToolbarStyle: React.CSSProperties;
+    /** To display striped rows in the table */
+    stripedRows: boolean;
+    /** Display a hover in the row under the mouse */
+    showRowHover: boolean;
+    /** If the table rows are select-able */
+    selectable: boolean;
+    /** If multiple table rows are select-able */
+    multiSelectable: boolean;
+    /** Adds a select all button */
+    enableSelectAll: boolean;
+    /** If clicking away de-selects all */
+    deselectOnClickaway: boolean;
+    /** Show check-boxes for selected rows */
+    showCheckboxes: boolean;
+    /** The hight of the table */
+    height: any;
+    /** Shows a header toolbar */
+    showHeaderToolbar: boolean;
+    /** Shows a footer toolbar */
+    showFooterToolbar: boolean;
+    rowSize: number;
+    rowSizeLabel: string;
+    rowSizeList: number[];
+    showRowSizeControls: boolean;
+    /** Override the pagination display, ie. "1 - 5 of 11" Return any React node or string */
+    summaryLabelTemplate: (start: number, end: number, count: number) => any;
+    /**
+     * The column structure.
+     * ```let columns: Column[] = [{
+     *      key: 'bookName',
+     *      label: 'Book Name & Author',
+     *      render: (__value: any, book: any) => book.name + ' by ' book.author
+     *  },```
+     */
+    columns: Column[];
+    /** The array of objects used as data for the table */
+    data: any[];
+    page: number;
+    toolbarIconRight: any;
+    count: number;
+    /** React style object for the table tag */
+    tableStyle: React.CSSProperties;
+    /** React style object for the tbody tag */
+    tableBodyStyle: React.CSSProperties;
+    /** React style object for the th/td tag */
+    tableHeaderColumnStyle: React.CSSProperties;
+    /** React style object for the th tag */
+    tableHeaderStyle: React.CSSProperties;
+    /** React style object for the tr tag */
+    tableRowStyle: React.CSSProperties;
+    /** React style object for the tr/td tag */
+    tableRowColumnStyle: React.CSSProperties;
+    tableWrapperStyle: React.CSSProperties;
+    /** 'default' or 'filter', filter mode shows a search box to reduce visible rows */
+    headerToolbarMode: "default" | "filter" | string; // BUG https://github.com/Microsoft/TypeScript/issues/11465
+    /** The current filter value */
+    filterValue: string;
+    /** Show the icon to turn on the filtering feature */
+    showHeaderToolbarFilterIcon: boolean;
+    onRowSizeChange: (index: number, value: any) => void;
+    onSortOrderChange: (key: string, order: string) => void;
+    /** Callback when the cell is clicked. This callback is only active when selectable is false. */
+    onCellClick: (rowIndex: number, columnIndex: number, row: any, columnValue: any, event: any) => void;
+    /** Similar to onCellClick, activated when the cell is double clicked. Fires even if rows are selectable. */
+    onCellDoubleClick: (rowIndex: number, columnIndex: number, row: any, columnValue: any, event: any) => void;
+    /** Notification if the filter value changes */
+    onFilterValueChange: (value: string) => void;
+    onNextPageClick: (event: any) => void;
+    onPreviousPageClick: (event: any) => void;
+    onRowSelection: (selectedRows: any) => void;
+}
+
+export default class DataTable extends React.Component<Partial<DataTableProps>> { }
diff --git a/types/material-ui-datatables/material-ui-datatables-tests.tsx b/types/material-ui-datatables/material-ui-datatables-tests.tsx
new file mode 100644
index 0000000000..bea8635f59
--- /dev/null
+++ b/types/material-ui-datatables/material-ui-datatables-tests.tsx
@@ -0,0 +1,84 @@
+import * as React from 'react';
+import DataTable, { Column } from 'material-ui-datatables';
+
+interface Book {
+    name: string;
+    author: string;
+}
+
+const title = '';
+const titleStyle: React.CSSProperties = {};
+const filterHintText = '';
+const fixedHeader = false;
+const fixedFooter = false;
+const footerToolbarStyle: React.CSSProperties = {};
+const stripedRows = false;
+const showRowHover = false;
+const selectable = false;
+const multiSelectable = false;
+const enableSelectAll = false;
+const deselectOnClickaway = false;
+const showCheckboxes = false;
+const height: any = {};
+const showHeaderToolbar = false;
+const showFooterToolbar = false;
+const rowSize = 1;
+const rowSizeLabel = '';
+const rowSizeList: number[] = [1];
+const showRowSizeControls = false;
+const summaryLabelTemplate: (start: number, end: number, count: number) => any = (start, end, count) => "";
+const columns: Column[] = [{ key: '', render: (value, row: Book) => "" }];
+const book: Book = { author: 'asdf', name: 'asdf' };
+const data: Book[] = [book];
+const page = 1;
+const toolbarIconRight: any = {};
+const count = 1;
+const tableStyle: React.CSSProperties = {};
+const tableBodyStyle: React.CSSProperties = {};
+const tableHeaderColumnStyle: React.CSSProperties = {};
+const tableHeaderStyle: React.CSSProperties = {};
+const tableRowColumnStyle: React.CSSProperties = {};
+const tableRowStyle: React.CSSProperties = {};
+const tableWrapperStyle: React.CSSProperties = {};
+const headerToolbarMode = 'filter';
+const filterValue = '';
+const showHeaderToolbarFilterIcon = false;
+
+const test = (<DataTable
+    title={title}
+    titleStyle={titleStyle}
+    filterHintText={filterHintText}
+    fixedHeader={fixedHeader}
+    fixedFooter={fixedFooter}
+    footerToolbarStyle={footerToolbarStyle}
+    stripedRows={stripedRows}
+    showRowHover={showRowHover}
+    selectable={selectable}
+    multiSelectable={multiSelectable}
+    enableSelectAll={enableSelectAll}
+    deselectOnClickaway={deselectOnClickaway}
+    showCheckboxes={showCheckboxes}
+    height={height}
+    showHeaderToolbar={showHeaderToolbar}
+    showFooterToolbar={showFooterToolbar}
+    rowSize={rowSize}
+    rowSizeLabel={rowSizeLabel}
+    rowSizeList={rowSizeList}
+    showRowSizeControls={showRowSizeControls}
+    summaryLabelTemplate={summaryLabelTemplate}
+    columns={columns}
+    data={data}
+    page={page}
+    toolbarIconRight={toolbarIconRight}
+    count={count}
+    tableStyle={tableStyle}
+    tableBodyStyle={tableBodyStyle}
+    tableHeaderColumnStyle={tableHeaderColumnStyle}
+    tableHeaderStyle={tableHeaderStyle}
+    tableRowColumnStyle={tableRowColumnStyle}
+    tableRowStyle={tableRowStyle}
+    tableWrapperStyle={tableWrapperStyle}
+    headerToolbarMode={headerToolbarMode}
+    filterValue={filterValue}
+    showHeaderToolbarFilterIcon={showHeaderToolbarFilterIcon}>
+</DataTable>);
diff --git a/types/material-ui-datatables/tsconfig.json b/types/material-ui-datatables/tsconfig.json
new file mode 100644
index 0000000000..805afdbb17
--- /dev/null
+++ b/types/material-ui-datatables/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "jsx": "react",
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "material-ui-datatables-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/material-ui-datatables/tslint.json b/types/material-ui-datatables/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/material-ui-datatables/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/material-ui-pagination/material-ui-pagination-tests.tsx b/types/material-ui-pagination/material-ui-pagination-tests.tsx
index 6a3415d24f..a7f85d8184 100644
--- a/types/material-ui-pagination/material-ui-pagination-tests.tsx
+++ b/types/material-ui-pagination/material-ui-pagination-tests.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { Component, PropTypes } from 'react';
+import * as PropTypes from 'prop-types';
+import { Component } from 'react';
 import * as ReactDOM from 'react-dom';
 import Pagination from 'material-ui-pagination';
 import * as ui from 'material-ui';
@@ -17,7 +18,7 @@ interface PagerState {
 
 class Pager extends React.Component<{}, PagerState> {
 	constructor() {
-		super();
+		super({});
 		this.state = {
 			pageIndex: 0
 		};
diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 91bcef28d9..08a18a752b 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for material-ui v0.18.17
+// Type definitions for material-ui v0.20.0
 // Project: https://github.com/callemall/material-ui
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 //                 Igor Beagorudsky <https://github.com/theigor>
@@ -147,10 +147,6 @@ declare module "material-ui" {
     export import ToolbarSeparatorProps = __MaterialUI.Toolbar.ToolbarSeparatorProps;
     export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle;
     export import ToolbarTitleProps = __MaterialUI.Toolbar.ToolbarTitleProps;
-
-    // export type definitions
-    export type TouchTapEvent = __MaterialUI.TouchTapEvent;
-    export type TouchTapEventHandler = __MaterialUI.TouchTapEventHandler;
 }
 
 declare namespace __MaterialUI {
@@ -160,19 +156,6 @@ declare namespace __MaterialUI {
         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> {
-    }
-
     export interface ThemeWrapperProps {
         theme: Styles.MuiTheme;
     }
@@ -578,9 +561,9 @@ declare namespace __MaterialUI {
         iconElementRight?: React.ReactElement<any>;
         iconStyleRight?: React.CSSProperties;
         iconStyleLeft?: React.CSSProperties;
-        onLeftIconButtonTouchTap?: TouchTapEventHandler;
-        onRightIconButtonTouchTap?: TouchTapEventHandler;
-        onTitleTouchTap?: TouchTapEventHandler;
+        onLeftIconButtonClick?: React.MouseEventHandler<{}>;
+        onRightIconButtonClick?: React.MouseEventHandler<{}>;
+        onTitleClick?: React.MouseEventHandler<{}>;
         showMenuIconButton?: boolean;
         style?: React.CSSProperties;
         title?: React.ReactNode;
@@ -715,7 +698,6 @@ declare namespace __MaterialUI {
         onKeyboardFocus?(e: React.FocusEvent<{}>, isKeyboardFocused: boolean): void;
         onKeyDown?: React.KeyboardEventHandler<{}>;
         onKeyUp?: React.KeyboardEventHandler<{}>;
-        onTouchTap?: TouchTapEventHandler;
         onClick?: React.MouseEventHandler<{}>;
         style?: React.CSSProperties;
         tabIndex?: number;
@@ -947,13 +929,14 @@ declare namespace __MaterialUI {
     export interface ChipProps {
         backgroundColor?: string;
         className?: string;
+        containerElement?: React.ReactNode | string;
         labelColor?: string;
         labelStyle?: React.CSSProperties;
+        onClick?: React.MouseEventHandler<Chip>;
         onRequestDelete?: React.TouchEventHandler<Chip>;
-        onTouchTap?: React.TouchEventHandler<Chip>;
         style?: React.CSSProperties;
-        onClick?: React.MouseEventHandler<{}>;
-}
+    }
+
     export class Chip extends React.Component<ChipProps> {
     }
 
@@ -979,7 +962,7 @@ declare namespace __MaterialUI {
             onDismiss?(): void;
             onFocus?: React.FocusEventHandler<{}>;
             onShow?(): void;
-            onTouchTap?: React.TouchEventHandler<{}>;
+            onClick?: React.TouchEventHandler<{}>;
             shouldDisableDate?(day: Date): boolean;
             style?: React.CSSProperties;
             textFieldStyle?: React.CSSProperties;
@@ -1047,7 +1030,6 @@ declare namespace __MaterialUI {
     export interface DialogAction {
         id?: string;
         onClick?: React.MouseEventHandler<{}>;
-        onTouchTap?: TouchTapEventHandler;
         ref?: string;
         text: string;
     }
@@ -1128,7 +1110,7 @@ declare namespace __MaterialUI {
             titleBackground?: string;
             titlePosition?: "top" | "bottom";
             titleStyle?: React.CSSProperties;
-            onTouchTap?: TouchTapEventHandler;
+            onClick?: React.MouseEventHandler<{}>;
         }
         export class GridTile extends React.Component<GridTileProps> {
         }
@@ -1185,7 +1167,7 @@ declare namespace __MaterialUI {
             onMouseLeave?: React.MouseEventHandler<{}>;
             onNestedListToggle?(item: ListItem): void;
             onTouchStart?: React.TouchEventHandler<{}>;
-            onTouchTap?: TouchTapEventHandler;
+            onClick?: React.MouseEventHandler<{}>;
             open?: boolean;
             primaryText?: React.ReactNode;
             primaryTogglesNestedList?: boolean;
@@ -1202,7 +1184,7 @@ declare namespace __MaterialUI {
         }
 
         export interface SelectableProps {
-            onChange?(e: TouchTapEvent, value: any): void;
+            onChange?(e: React.SyntheticEvent<{}>, value: any): void;
             selectedItemStyle?: React.CSSProperties;
             value?: any;
         }
@@ -1221,9 +1203,9 @@ declare namespace __MaterialUI {
             listStyle?: React.CSSProperties;
             maxHeight?: number;
             multiple?: boolean;
-            onChange?(e: TouchTapEvent, itemValue: any | any[]): void;
+            onChange?(e: React.SyntheticEvent<{}>, itemValue: any | any[]): void;
             onEscKeyDown?: React.KeyboardEventHandler<{}>;
-            onItemTouchTap?(e: TouchTapEvent, item: MenuItem): void;
+            onItemClick?(e: React.SyntheticEvent<{}>, item: MenuItem): void;
             onKeyDown?: React.KeyboardEventHandler<{}>;
             selectedMenuItemStyle?: React.CSSProperties;
             style?: React.CSSProperties;
@@ -1246,7 +1228,7 @@ declare namespace __MaterialUI {
             label?: string | React.ReactNode;
             leftIcon?: React.ReactElement<any>;
             menuItems?: React.ReactNode;
-            onTouchTap?: TouchTapEventHandler;
+            onClick?: React.MouseEventHandler<{}>;
             primaryText?: React.ReactNode;
             rightIcon?: React.ReactElement<any>;
             secondaryText?: React.ReactNode;
@@ -1259,37 +1241,37 @@ declare namespace __MaterialUI {
         export interface IconMenuProps {
             // <Menu/> is the element that get the 'other' properties
             anchorOrigin?: propTypes.origin;
+            animated?: boolean;
             animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
             className?: string;
-            iconButtonElement: React.ReactElement<IconButtonProps>;
+            clickCloseDelay?: number;
+            iconButtonElement: React.ReactElement<IconButton>;
             iconStyle?: React.CSSProperties;
             menuStyle?: React.CSSProperties;
-            onItemTouchTap?(e: TouchTapEvent, item: MenuItem): void;
+            onClick?(e: React.SyntheticEvent<{}>): void;
+            onItemClick?(e: React.SyntheticEvent<{}>, item: MenuItem): void;
             onKeyboardFocus?(e: React.FocusEvent<{}>, isKeyboardFocused: boolean): void;
             onMouseDown?: React.MouseEventHandler<{}>;
             onMouseEnter?: React.MouseEventHandler<{}>;
             onMouseLeave?: React.MouseEventHandler<{}>;
             onMouseUp?: React.MouseEventHandler<{}>;
             onRequestChange?(opening: boolean, reason: string): void;
-            onTouchTap?: TouchTapEventHandler;
             open?: boolean;
-            style?: React.CSSProperties;
             targetOrigin?: propTypes.origin;
-            touchTapCloseDelay?: number;
             useLayerForClickAway?: boolean;
 
-            animated?: boolean;
+            // Other properties from <Menu/>
             autoWidth?: boolean;
+            children?: Array<React.ReactElement<MenuItemProps>>;
             desktop?: boolean;
+            disableAutoFocus?: boolean;
+            initiallyKeyboardFocused?: boolean;
             listStyle?: React.CSSProperties;
             maxHeight?: number;
             multiple?: boolean;
-            onChange?(e: TouchTapEvent, itemValue: any | any[]): void;
-            onKeyDown?: React.KeyboardEventHandler<{}>;
-            selectedMenuItemStyle?: React.CSSProperties;
+            onChange?(e: React.SyntheticEvent<{}>, itemValue: any | any[]): void;
+            style?: React.CSSProperties;
             value?: any | any[];
-            valueLink?: ReactLink<any | any[]>;
-            width?: string | number;
         }
         export class IconMenu extends React.Component<IconMenuProps> {
         }
@@ -1299,7 +1281,6 @@ declare namespace __MaterialUI {
             anchorOrigin?: propTypes.origin;
             animated?: boolean;
             animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
-            autoWidth?: boolean;
             className?: string;
             disabled?: boolean;
             iconButton?: React.ReactNode;
@@ -1310,8 +1291,8 @@ declare namespace __MaterialUI {
             menuItemStyle?: React.CSSProperties;
             menuStyle?: React.CSSProperties;
             multiple?: boolean;
-            onChange?(e: TouchTapEvent, index: number, menuItemValue: any): void;
-            onClose?(e: TouchTapEvent): void;
+            onChange?(e: React.SyntheticEvent<{}>, index: number, menuItemValue: any): void;
+            onClose?(e: React.SyntheticEvent<{}>): void;
             openImmediately?: boolean;
             selectedMenuItemStyle?: React.CSSProperties;
             selectionRenderer?(value: any, menuItem: any): void;
@@ -1329,7 +1310,6 @@ declare namespace __MaterialUI {
         show?: boolean;
         transitionEnabled?: boolean;
         onClick?: React.MouseEventHandler<{}>;
-        onTouchTap?: TouchTapEventHandler;
     }
     export class Overlay extends React.Component<OverlayProps> {
     }
@@ -1439,10 +1419,11 @@ declare namespace __MaterialUI {
         hintText?: React.ReactNode;
         iconStyle?: React.CSSProperties;
         id?: string;
+        name?: string;
         labelStyle?: React.CSSProperties;
         multiple?: boolean;
         onBlur?: React.FocusEventHandler<{}>;
-        onChange?(e: TouchTapEvent, index: number, menuItemValue: any): void;
+        onChange?(e: React.SyntheticEvent<{}>, index: number, menuItemValue: any): void;
         onFocus?: React.FocusEventHandler<{}>;
         selectFieldRoot?: React.CSSProperties;
         selectionRenderer?(value: any): React.ReactNode;
@@ -1626,7 +1607,7 @@ declare namespace __MaterialUI {
         className?: string;
         contentStyle?: React.CSSProperties;
         message: React.ReactNode;
-        onActionTouchTap?: React.TouchEventHandler<{}>;
+        onActionClick?: React.MouseEventHandler<{}>;
         onRequestClose?(reason: string): void;
         open: boolean;
         style?: React.CSSProperties;
@@ -1682,7 +1663,7 @@ declare namespace __MaterialUI {
             bodyStyle?: React.CSSProperties;
             className?: string;
             message: string | JSX.Element;
-            onActionTouchTap?: React.TouchEventHandler<{}>;
+            onActionClick?: React.MouseEventHandler<{}>;
             /** @deprecated Use the open property to control the component instead */
             onDismiss?(): void; // DEPRECATED
             onRequestClose(reason: string): void;
@@ -1955,7 +1936,7 @@ declare namespace __MaterialUI {
         onDismiss?(): void;
         onFocus?: React.FocusEventHandler<{}>;
         onShow?(): void;
-        onTouchTap?: TouchTapEventHandler;
+        onClick?: React.MouseEventHandler<{}>;
         pedantic?: boolean;
         style?: React.CSSProperties;
         textFieldStyle?: React.CSSProperties;
@@ -9013,7 +8994,6 @@ declare module 'material-ui/internal/Overlay' {
         style?: React.CSSProperties;
         transitionEnabled?: boolean;
         onClick?: React.MouseEventHandler<{}>;
-        onTouchTap?: __MaterialUI.TouchTapEventHandler;
     }
     class Overlay extends React.Component<OverlayProps> { }
     export default Overlay;
diff --git a/types/material-ui/material-ui-tests.tsx b/types/material-ui/material-ui-tests.tsx
index 3b2c50dff4..316a14b78a 100644
--- a/types/material-ui/material-ui-tests.tsx
+++ b/types/material-ui/material-ui-tests.tsx
@@ -1,9 +1,10 @@
 import * as React from 'react';
 import {
-  Component, ComponentClass, CSSProperties, PropTypes,
+  Component, ComponentClass, CSSProperties,
   StatelessComponent, ReactElement, ReactInstance, ValidationMap
 } from 'react';
 import * as ReactDOM from 'react-dom';
+import * as PropTypes from 'prop-types';
 import getMuiTheme from 'material-ui/styles/getMuiTheme';
 import { muiThemeable } from 'material-ui/styles/muiThemeable';
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
@@ -2062,13 +2063,13 @@ import {
 
 import injectTapEventPlugin = require('react-tap-event-plugin');
 
-// Needed for onTouchTap
+// Needed for onClick
 // Check this repo:
 // https://github.com/zilverline/react-tap-event-plugin
 injectTapEventPlugin();
 
-function handleTouchTap() {
-  alert('onTouchTap triggered on the title component');
+function handleClick() {
+  alert('onClick triggered on the title component');
 }
 
 const styles: { [key: string]: CSSProperties } = {
@@ -2343,7 +2344,7 @@ const AppBarExampleIcon = () => (
 const AppBarExampleIconButton = () => (
   <AppBar
     title={<span style={styles.title}>Title</span>}
-    onTitleTouchTap={handleTouchTap}
+    onTitleClick={handleClick}
     iconElementLeft={<IconButton><NavigationClose /></IconButton>}
     iconElementRight={<FlatButton label="Save" />}
   />
@@ -3013,8 +3014,8 @@ class CardExampleControlled extends Component<{}, {expanded: boolean}> {
           Aliquam dui mauris, mattis quis lacus id, pellentesque lobortis odio.
         </CardText>
         <CardActions>
-                    <FlatButton label="Expand" onTouchTap={this.handleExpand}/>
-                    <FlatButton label="Reduce" onTouchTap={this.handleReduce}/>
+                    <FlatButton label="Expand" onClick={this.handleExpand}/>
+                    <FlatButton label="Reduce" onClick={this.handleReduce}/>
         </CardActions>
       </Card>
     );
@@ -3029,6 +3030,8 @@ const ChipExampleSimple = () => (
     <Chip labelColor={blue500}>Blue Label Color</Chip>
     <Chip><Avatar size={32} color={blue300} backgroundColor={indigo900}>UI</Avatar> Avatar</Chip>
     <Chip style={styles.chip}>Styled</Chip>
+    <Chip containerElement="span">String Container</Chip>
+    <Chip containerElement={() => {}}>ReactNode Container</Chip>
   </div>
 );
 
@@ -3037,14 +3040,14 @@ class ChipExampleComplex extends Component {
     alert('You clicked the delete button.');
   }
 
-  handleTouchTap = () => {
+  handleClick = () => {
     alert('You clicked the Chip.');
   }
 
   render() {
     return (
       <div>
-        <Chip onTouchTap={this.handleTouchTap} onRequestDelete={this.handleRequestDelete}>Click Me</Chip>
+        <Chip onClick={this.handleClick} onRequestDelete={this.handleRequestDelete}>Click Me</Chip>
       </div>
     );
   }
@@ -3244,19 +3247,19 @@ class DialogExampleSimple extends Component<{}, {open?: boolean}> {
       <FlatButton
         label="Cancel"
         primary={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
       <FlatButton
         label="Submit"
         primary={true}
         keyboardFocused={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
     ];
 
     return (
       <div>
-                <RaisedButton label="Dialog" onTouchTap={this.handleOpen}/>
+                <RaisedButton label="Dialog" onClick={this.handleOpen}/>
         <Dialog
           title="Dialog With Actions"
           actions={actions}
@@ -3289,19 +3292,19 @@ class DialogExampleModal extends Component<{}, {open?: boolean}> {
       <FlatButton
         label="Cancel"
         primary={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
       <FlatButton
         label="Submit"
         primary={true}
         disabled={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
     ];
 
     return (
       <div>
-                <RaisedButton label="Modal Dialog" onTouchTap={this.handleOpen}/>
+                <RaisedButton label="Modal Dialog" onClick={this.handleOpen}/>
         <Dialog
           title="Dialog With Actions"
           actions={actions}
@@ -3333,18 +3336,18 @@ class DialogExampleCustomWidth extends Component<{}, {open?: boolean}> {
       <FlatButton
         label="Cancel"
         primary={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
       <FlatButton
         label="Submit"
         primary={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
     ];
 
     return (
       <div>
-                <RaisedButton label="Dialog With Custom Width" onTouchTap={this.handleOpen}/>
+                <RaisedButton label="Dialog With Custom Width" onClick={this.handleOpen}/>
         <Dialog
           title="Dialog With Custom Width"
           actions={actions}
@@ -3378,13 +3381,13 @@ class DialogExampleDialogDatePicker extends Component<{}, {open?: boolean}> {
         label="Ok"
         primary={true}
         keyboardFocused={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
     ];
 
     return (
       <div>
-                <RaisedButton label="Dialog With Date Picker" onTouchTap={this.handleOpen}/>
+                <RaisedButton label="Dialog With Date Picker" onClick={this.handleOpen}/>
         <Dialog
           title="Dialog With Date Picker"
           actions={actions}
@@ -3418,13 +3421,13 @@ class DialogExampleScrollable extends Component<{}, {open?: boolean}> {
       <FlatButton
         label="Cancel"
         primary={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
       <FlatButton
         label="Submit"
         primary={true}
         keyboardFocused={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
     ];
 
@@ -3442,7 +3445,7 @@ class DialogExampleScrollable extends Component<{}, {open?: boolean}> {
 
     return (
       <div>
-                <RaisedButton label="Scrollable Dialog" onTouchTap={this.handleOpen}/>
+                <RaisedButton label="Scrollable Dialog" onClick={this.handleOpen}/>
         <Dialog
           title="Scrollable Dialog"
           actions={actions}
@@ -3478,18 +3481,18 @@ class DialogExampleAlert extends Component<{}, {open?: boolean}> {
       <FlatButton
         label="Cancel"
         primary={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
       <FlatButton
         label="Discard"
         primary={true}
-        onTouchTap={this.handleClose}
+        onClick={this.handleClose}
       />,
     ];
 
     return (
       <div>
-                <RaisedButton label="Alert" onTouchTap={this.handleOpen}/>
+                <RaisedButton label="Alert" onClick={this.handleOpen}/>
         <Dialog
           actions={actions}
           modal={false}
@@ -3554,7 +3557,7 @@ class DrawerSimpleExample extends Component<{}, {open?: boolean}> {
       <div>
         <RaisedButton
           label="Toggle Drawer"
-          onTouchTap={this.handleToggle}
+          onClick={this.handleToggle}
         />
         <Drawer open={this.state.open}>
           <MenuItem>Menu Item</MenuItem>
@@ -3580,7 +3583,7 @@ class DrawerUndockedExample extends Component<{}, {open?: boolean}> {
       <div>
         <RaisedButton
           label="Open Drawer"
-          onTouchTap={this.handleToggle}
+          onClick={this.handleToggle}
         />
         <Drawer
           docked={false}
@@ -3588,8 +3591,8 @@ class DrawerUndockedExample extends Component<{}, {open?: boolean}> {
           open={this.state.open}
           onRequestChange={(open) => this.setState({open})}
         >
-          <MenuItem onTouchTap={this.handleClose}>Menu Item</MenuItem>
-          <MenuItem onTouchTap={this.handleClose}>Menu Item 2</MenuItem>
+          <MenuItem onClick={this.handleClose}>Menu Item</MenuItem>
+          <MenuItem onClick={this.handleClose}>Menu Item 2</MenuItem>
         </Drawer>
       </div>
     );
@@ -3609,7 +3612,7 @@ class DrawerOpenRightExample extends Component<{}, {open?: boolean}> {
       <div>
         <RaisedButton
           label="Toggle Drawer"
-          onTouchTap={this.handleToggle}
+          onClick={this.handleToggle}
         />
                 <Drawer width="20%" openSecondary={true} open={this.state.open}>
                     <AppBar title="AppBar"/>
@@ -4484,6 +4487,17 @@ const IconMenuExampleSimple = () => (
             <MenuItem primaryText="Help"/>
             <MenuItem primaryText="Sign out"/>
     </IconMenu>
+    <IconMenu
+      iconButtonElement={<IconButton><NavigationMoreVert /></IconButton>}
+      onClick={(e) => {}}
+      onItemClick={(e, child) => {}}
+    >
+            <MenuItem primaryText="Refresh"/>
+            <MenuItem primaryText="Send feedback"/>
+            <MenuItem primaryText="Settings"/>
+            <MenuItem primaryText="Help"/>
+            <MenuItem primaryText="Sign out"/>
+    </IconMenu>
   </div>
 );
 
@@ -4564,7 +4578,7 @@ class IconMenuExampleControlled extends Component<{}, IconMenuExampleControlledS
                     <MenuItem value="3" primaryText="Android App"/>
                     <MenuItem value="4" primaryText="iOS App"/>
         </IconMenu>
-                <RaisedButton onTouchTap={this.handleOpenMenu} label="Downloads"/>
+                <RaisedButton onClick={this.handleOpenMenu} label="Downloads"/>
       </div>
     );
   }
@@ -4693,7 +4707,6 @@ class DropDownMenuSimpleExample extends Component<{}, {value?: number}> {
           value={this.state.value}
           onChange={this.handleChange}
           style={styles.customWidth}
-          autoWidth={false}
         >
                     <MenuItem value={1} primaryText="Custom width"/>
                     <MenuItem value={2} primaryText="Every Night"/>
@@ -4821,7 +4834,7 @@ class PopoverExampleSimple extends Component<{}, {open?: boolean, anchorEl?: Rea
     };
   }
 
-  handleTouchTap = (event) => {
+  handleClick = (event) => {
     // This prevents ghost click.
     event.preventDefault();
 
@@ -4841,7 +4854,7 @@ class PopoverExampleSimple extends Component<{}, {open?: boolean, anchorEl?: Rea
     return (
       <div>
         <RaisedButton
-          onTouchTap={this.handleTouchTap}
+          onClick={this.handleClick}
           label="Click me"
         />
         <Popover
@@ -4872,7 +4885,7 @@ class PopoverExampleAnimation extends Component<{}, {open?: boolean, anchorEl?:
     };
   }
 
-  handleTouchTap = (event) => {
+  handleClick = (event) => {
     // This prevents ghost click.
     event.preventDefault();
     this.setState({
@@ -4891,7 +4904,7 @@ class PopoverExampleAnimation extends Component<{}, {open?: boolean, anchorEl?:
     return (
       <div>
         <RaisedButton
-          onTouchTap={this.handleTouchTap}
+          onClick={this.handleClick}
           label="Click me"
         />
         <Popover
@@ -4938,7 +4951,7 @@ class PopoverExampleConfigurable extends Component<{}, PopoverExampleConfigurabl
     };
   }
 
-  handleTouchTap = (event) => {
+  handleClick = (event) => {
     // This prevents ghost click.
     event.preventDefault();
     this.setState({
@@ -4975,7 +4988,7 @@ class PopoverExampleConfigurable extends Component<{}, PopoverExampleConfigurabl
     return (
       <div>
         <RaisedButton
-          onTouchTap={this.handleTouchTap}
+          onClick={this.handleClick}
           label="Click me"
         />
         <h3 style={styles.h3}>Current Settings</h3>
@@ -5686,7 +5699,7 @@ class SnackbarExampleSimple extends Component<{}, {open?: boolean}> {
     };
   }
 
-  handleTouchTap = () => {
+  handleClick = () => {
     this.setState({
       open: true,
     });
@@ -5702,7 +5715,7 @@ class SnackbarExampleSimple extends Component<{}, {open?: boolean}> {
     return (
       <div>
         <RaisedButton
-          onTouchTap={this.handleTouchTap}
+          onClick={this.handleClick}
           label="Add to my calendar"
         />
         <Snackbar
@@ -5727,13 +5740,13 @@ class SnackbarExampleAction extends Component<{}, {open?: boolean, autoHideDurat
     };
   }
 
-  handleTouchTap = () => {
+  handleClick = () => {
     this.setState({
       open: true,
     });
   }
 
-  handleActionTouchTap = () => {
+  handleActionClick = () => {
     this.setState({
       open: false,
     });
@@ -5757,7 +5770,7 @@ class SnackbarExampleAction extends Component<{}, {open?: boolean, autoHideDurat
     return (
       <div>
         <RaisedButton
-          onTouchTap={this.handleTouchTap}
+          onClick={this.handleClick}
           label="Add to my calendar"
         />
         <br />
@@ -5771,7 +5784,7 @@ class SnackbarExampleAction extends Component<{}, {open?: boolean, autoHideDurat
           message={this.state.message}
           action="undo"
           autoHideDuration={this.state.autoHideDuration}
-          onActionTouchTap={this.handleActionTouchTap}
+          onActionClick={this.handleActionClick}
           onRequestClose={this.handleRequestClose}
         />
       </div>
@@ -5795,7 +5808,7 @@ class SnackbarExampleTwice extends Component<{}, {open?: boolean, message?: stri
     clearTimeout(this.timer);
   }
 
-  handleTouchTap = () => {
+  handleClick = () => {
     this.setState({
       open: true,
     });
@@ -5817,7 +5830,7 @@ class SnackbarExampleTwice extends Component<{}, {open?: boolean, message?: stri
     return (
       <div>
         <RaisedButton
-          onTouchTap={this.handleTouchTap}
+          onClick={this.handleClick}
           label="Add to my calendar two times"
         />
         <Snackbar
@@ -5904,13 +5917,13 @@ class HorizontalLinearStepper extends Component<{}, {stepIndex?: number, finishe
                 <FlatButton
                   label="Back"
                   disabled={stepIndex === 0}
-                  onTouchTap={this.handlePrev}
+                  onClick={this.handlePrev}
                   style={{marginRight: 12}}
                 />
                 <RaisedButton
                   label={stepIndex === 2 ? 'Finish' : 'Next'}
                   primary={true}
-                  onTouchTap={this.handleNext}
+                  onClick={this.handleNext}
                 />
               </div>
             </div>
@@ -5952,7 +5965,7 @@ class VerticalLinearStepper extends Component<{}, {stepIndex?: number, finished?
           disableTouchRipple={true}
           disableFocusRipple={true}
           primary={true}
-          onTouchTap={this.handleNext}
+          onClick={this.handleNext}
           style={{marginRight: 12}}
         />
         {step > 0 && (
@@ -5961,7 +5974,7 @@ class VerticalLinearStepper extends Component<{}, {stepIndex?: number, finished?
             disabled={stepIndex === 0}
             disableTouchRipple={true}
             disableFocusRipple={true}
-            onTouchTap={this.handlePrev}
+            onClick={this.handlePrev}
           />
         )}
       </div>
@@ -6084,14 +6097,14 @@ class HorizontalNonLinearStepper extends Component<{}, {stepIndex?: number}> {
             <FlatButton
               label="Back"
               disabled={stepIndex === 0}
-              onTouchTap={this.handlePrev}
+              onClick={this.handlePrev}
               style={{marginRight: 12}}
             />
             <RaisedButton
               label="Next"
               disabled={stepIndex === 2}
               primary={true}
-              onTouchTap={this.handleNext}
+              onClick={this.handleNext}
             />
           </div>
         </div>
@@ -6127,7 +6140,7 @@ class VerticalNonLinear extends Component<{}, {stepIndex?: number}> {
           disableTouchRipple={true}
           disableFocusRipple={true}
           primary={true}
-          onTouchTap={this.handleNext}
+          onClick={this.handleNext}
           style={{marginRight: 12}}
         />
         {step > 0 && (
@@ -6135,7 +6148,7 @@ class VerticalNonLinear extends Component<{}, {stepIndex?: number}> {
             label="Back"
             disableTouchRipple={true}
             disableFocusRipple={true}
-            onTouchTap={this.handlePrev}
+            onClick={this.handlePrev}
           />
         )}
       </div>
@@ -6299,13 +6312,13 @@ class GranularControlStepper extends Component<{}, {stepIndex?: number, visited?
               <FlatButton
                 label="Back"
                 disabled={stepIndex === 0}
-                onTouchTap={this.handlePrev}
+                onClick={this.handlePrev}
                 style={styles.backButton}
               />
               <RaisedButton
                 label="Next"
                 primary={true}
-                onTouchTap={this.handleNext}
+                onClick={this.handleNext}
               />
             </div>
           )}
@@ -7001,15 +7014,15 @@ class BottomNavigationExample extends Component<{}, {
   index?: number
 }> {
   constructor() {
-    super();
+    super({});
     this.state = {
       index: 0
     };
   }
   render() {
     return <BottomNavigation selectedIndex={this.state.index}>
-      <BottomNavigationItem label='0' icon={<ActionHome/>} onTouchTap={() => this.setState({index: 0})}/>
-      <BottomNavigationItem label='1' icon={<ActionInfo/>} onTouchTap={() => this.setState({index: 1})}/>
+      <BottomNavigationItem label='0' icon={<ActionHome/>} onClick={() => this.setState({index: 0})}/>
+      <BottomNavigationItem label='1' icon={<ActionInfo/>} onClick={() => this.setState({index: 1})}/>
     </BottomNavigation>;
   }
 }
diff --git a/types/material-ui/scripts/generate.ts b/types/material-ui/scripts/generate.ts
index f8024d5805..e37b84d1de 100644
--- a/types/material-ui/scripts/generate.ts
+++ b/types/material-ui/scripts/generate.ts
@@ -39,9 +39,9 @@ const github = (path) => new Promise((resolve, reject) => {
     }).on('error', reject)
 })
 
-const categories = () => github(`/repos/callemall/material-ui/contents/src/svg-icons?ref=master&access_token=${token}`)
+const categories = () => github(`/repos/mui-org/material-ui/contents/src/svg-icons?ref=master&access_token=${token}`)
 
-const contents = (path) => github(`/repos/callemall/material-ui/contents/${path}?ref=master&access_token=${token}`)
+const contents = (path) => github(`/repos/mui-org/material-ui/contents/${path}?ref=master&access_token=${token}`)
 
 const collator = new Intl.Collator()
 
diff --git a/types/materialize-css/index.d.ts b/types/materialize-css/index.d.ts
index 1cb283e2d7..9c9dbf4b70 100644
--- a/types/materialize-css/index.d.ts
+++ b/types/materialize-css/index.d.ts
@@ -1,697 +1,801 @@
-// Type definitions for materialize-css v0.100.1
+// Type definitions for materialize-css 1.0
 // Project: http://materializecss.com/
-// Definitions by:  Erik Lieben <https://github.com/eriklieben>
-//                  Leon Yu <https://github.com/leonyu>
-//                  Sukhdeep Singh <https://github.com/SinghSukhdeep>
+// Definitions by:  胡玮文 <https://github.com/huww98>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="jquery" />
-/// <reference types="pickadate" />
 
-declare namespace Materialize {
+export = M;
 
-	/**
-	 * The collapsible options
-	 */
-	interface CollapsibleOptions {
-		/**
-		 * A setting that changes the collapsible behavior to expandable instead of the default accordion style
-		 */
-		accordion?: boolean;
+declare global {
+    namespace M {
+        class Autocomplete extends Component<AutocompleteOptions> {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): Autocomplete;
 
-		/**
-		 * Callback for Collapsible section close.
-		 * @default `function() { alert('Closed'); }`
-		 */
-		onClose?: Function;
+            /**
+             * Select a specific autocomplete options.
+             * @param el Element of the autocomplete option.
+             */
+            selectOption(el: Element): void;
 
-		/**
-		 * Callback for Collapsible section open.
-		 * @default `function() { alert('Opened'); }`
-		 */
-		onOpen?: Function;
-	}
+            /**
+             * Update autocomplete options data.
+             * @param data Autocomplete options data object.
+             */
+            updateData(data: AutocompleteData): void;
 
-	interface TooltipOptions {
-		/**
-		* The delay before the tooltip shows (in milliseconds)
-		*/
-		delay: number;
-		/**
-		 * Tooltip text. Can use custom HTML if you set the html option
-		 */
-		tooltip?: string;
-		/**
-		 * Set the direction of the tooltip. 'top', 'right', 'bottom', 'left'.
-		 *
-		 * @default `'bottom'`
-		 */
-		position?: string;
-		/**
-		 * Allow custom html inside the tooltip.
-		 *
-		 * @default `false`
-		 */
-		html?: boolean;
-	}
+            /**
+             * If the autocomplete is open.
+             */
+            isOpen: boolean;
 
-	/**
-	 * The dropdown options
-	 */
-	interface DropDownOptions {
+            /**
+             * Number of matching autocomplete options.
+             */
+            count: number;
 
-		/**
-		 * The duration of the transition enter in milliseconds.
-		 * @default `300`
-		 */
-		inDuration?: number;
+            /**
+             * Index of the current selected option.
+             */
+            activeIndex: number;
+        }
 
-		/**
-		 * The duration of the transition out in milliseconds.
-		 * @default `225`
-		 */
-		outDuration?: number;
+        interface AutocompleteData {
+            [key: string]: string | null;
+        }
 
+        interface AutocompleteOptions {
+            /**
+             * Data object defining autocomplete options with optional icon strings.
+             */
+            data: AutocompleteData;
 
-		/**
-		 * If true, constrainWidth to the size of the dropdown activator.
-		 * @default `true`
-		 */
-		constrainWidth?: boolean;
-		/**
-		 * If true, the dropdown will open on hover.
-		 * @default `false`
-		 */
-		hover?: boolean;
+            /**
+             * Limit of results the autocomplete shows.
+             * @default infinity
+             */
+            limit: number;
 
-		/**
-		 * This defines the spacing from the aligned edge.
-		 * @default `0`
-		 */
-		gutter?: number;
+            /**
+             * Callback for when autocompleted.
+             */
+            onAutocomplete: (this: Autocomplete, text: string) => void;
 
-		/**
-		 * If true, the dropdown will show below the activator.
-		 * @default `false`
-		 */
-		belowOrigin?: boolean;
+            /**
+             * Minimum number of characters before autocomplete starts.
+             * @default 1
+             */
+            minLength: number;
 
-		/**
-		 * Defines the edge the menu is aligned to.
-		 * @default `'left'`
-		 */
-		alignment?: string;
-		/**
-		 * If true, stops the event propagating from the dropdown origin click handler.
-		 *
-		 * @default `false`
-		 */
-		stopPropagation?: boolean
-	}
+            /**
+             * Sort function that defines the order of the list of autocomplete options.
+             */
+            sortFunction: (a: string, b: string, inputText: string) => number;
+        }
 
-	/**
-	 * The slider options
-	 */
-	interface SliderOptions {
+        class DatePicker extends Component<DatePickerOptions> implements Openable {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): DatePicker;
 
-		/**
-		 * Set to false to hide slide indicators.
-		 * @default `true`
-		 */
-		indicators?: boolean;
+            /**
+             * If the picker is open.
+             */
+            isOpen: boolean;
 
-		/**
-		 * Set height of slider.
-		 * @default `400`
-		 */
-		height?: number;
+            /**
+             * The selected Date.
+             */
+            date: Date;
 
-		/**
-		 * Set the duration of the transition animation in ms.
-		 * @default `500`
-		 */
-		transition?: number;
+            /**
+             * Open datepicker
+             */
+            open(): void;
 
-		/**
-		 * Set the duration between transitions in ms.
-		 * @default `6000`
-		 */
-		interval?: number;
-	}
+            /**
+             * Close datepicker
+             */
+            close(): void;
 
-	/**
-	 * The carousel options
-	 */
-	interface CarouselOptions {
-		/**
-		 * Transition duration in milliseconds
-		 * @default `200`
-		 */
-		duration?: number;
+            /**
+             * Gets a string representation of the selected date
+             */
+            toString(): string;
 
-		/**
-		 * Perspective zoom. If 0, all items are the same size.
-		 * @default `-100`
-		 */
-		dist?: number;
+            /**
+             * Set a date on the datepicker
+             * @param date Date to set on the datepicker.
+             */
+            setDate(date?: Date): void;
 
-		/**
-		 * Set the duration of the transition animation in ms.
-		 * @default `500`
-		 */
-		shift?: number;
+            /**
+             * Change date view to a specific date on the datepicker
+             * @param date Date to show on the datepicker.
+             */
+            gotoDate(date: Date): void;
+        }
 
-		/**
-		 * Set the duration between transitions in ms.
-		 * @default `6000`
-		 */
-		padding?: number;
+        interface DatePickerOptions {
+            /**
+             * The date output format for the input field value.
+             * @default 'mmm dd, yyyy'
+             */
+            format: string;
 
-		/**
-		 * Set the width of the carousel.
-		 * @default `false`
-		 */
-		fullWidth?: boolean;
-		/**
-		 * Set to true to show indicators.
-		 *
-		 * @default `false`
-		 */
-		indicators?: boolean;
-		/**
-		 * Don't wrap around and cycle through items.
-		 *
-		 * @default `false`
-		 */
-		noWrap?: boolean;
-	}
+            /**
+             * Used to create date object from current input string.
+             */
+            parse: (value: string, format: string) => Date;
 
-	/**
-	 * The modal options
-	 */
-	interface ModalOptions {
+            /**
+             * The initial date to view when first opened.
+             */
+            defaultDate: Date;
 
-		/**
-		 * Modal can be dismissed by clicking outside of the modal.
-		 * @default `true`
-		 */
-		dismissible?: boolean;
+            /**
+             * Make the `defaultDate` the initial selected value
+             * @default false
+             */
+            setDefaultDate: boolean;
 
-		/**
-		 * Opacity of modal background.
-		 * @default `.5`
-		 */
-		opacity?: number;
+            /**
+             * Prevent selection of any date on the weekend.
+             * @default false
+             */
+            disableWeekends: boolean;
 
-		/**
-		 * Transition in duration.
-		 * @default `300`
-		 */
-		inDuration?: number;
+            /**
+             * Custom function to disable certain days.
+             */
+            disableDayFn: (day: Date) => boolean;
 
-		/**
-		 * Transition out duration.
-		 * @default `200`
-		 */
-		outDuration?: number;
-		/**
-		 * Starting top style attribute
-		 * @default `4%`
-		 */
-		startingTop?: string;
-		/**
-		 * Ending top style attribute
-		 * @default `10%`
-		 */
-		endingTop?: string;
+            /**
+             * First day of week (0: Sunday, 1: Monday etc).
+             * @default 0
+             */
+            firstDay: number;
 
-		/**
-		 * Callback for Modal open.
-		 * @default `function() { alert('Ready'); }`
-		 */
-		ready?: Function;
+            /**
+             * The earliest date that can be selected.
+             */
+            minDate: Date;
 
-		/**
-		 * Callback for Modal close.
-		 * @default `function() { alert('Closed'); }`
-		 */
-		complete?: Function;
-	}
+            /**
+             * The latest date that can be selected.
+             */
+            maxDate: Date;
 
-	/**
-	 * The push pin options
-	 */
-	interface PushpinOptions {
+            /**
+             * Number of years either side, or array of upper/lower range.
+             * @default 10
+             */
+            yearRange: number | number[];
 
-		/**
-		 * The distance in pixels from the top of the page where the element becomes fixed.
-		 * @default `0`
-		 */
-		top?: number;
+            /**
+             * Changes Datepicker to RTL.
+             * @default false
+             */
+            isRTL: boolean;
 
-		/**
-		 * The distance in pixels from the top of the page where the elements stops being fixed.
-		 * @default `Infinity`
-		 */
-		bottom?: number;
+            /**
+             * Show month after year in Datepicker title.
+             * @default false
+             */
+            showMonthAfterYear: boolean;
 
-		/**
-		 * The offset from the top the element will be fixed at.
-		 * @default `0`
-		 */
-		offset?: number;
-	}
+            /**
+             * Render days of the calendar grid that fall in the next or previous month.
+             * @default false
+             */
+            showDaysInNextAndPreviousMonths: boolean;
 
-	/**
-	 * The scroll spy options
-	 */
-	interface ScrollSpyOptions {
-		/**
-		 * Offset from top.
-		 * @default `200`
-		 */
-		scrollOffset?: number;
-		/**
-		 * Class name to be added to the active link.
-		 * @default `active`
-		 */
-		activeClass?: string;
-		/**
-		 * Function that returns a selector to add activeClass to. The parameter is the section id
-		 */
-		getActiveElement?: Function;
-	}
+            /**
+             * Specify a selector for a DOM element to render the calendar in, by default it will be placed before the input.
+             */
+            container: string;
 
-	/**
-	 * The slideNav options
-	 */
-	interface SideNavOptions {
-		/**
-		 * @default `240`
-		 */
-		menuWidth?: number;
+            /**
+             * An array of string returned by `Date.toDateString()`, indicating there are events in the specified days.
+             * @default []
+             */
+            events: string[];
 
-		/**
-		 * The horizontal origin
-		 * @default `'left'`
-		 */
-		edge?: string;
+            /**
+             * Callback function when date is selected, first parameter is the newly selected date.
+             */
+            onSelect: (this: DatePicker, selectedDate: Date) => void;
 
-		/**
-		 * Closes side-nav on <a> clicks, useful for Angular/Meteor
-		 * @default `false`
-		 */
-		closeOnClick?: boolean;
+            /**
+             * Callback function when Datepicker is opened
+             */
+            onOpen: (this: DatePicker) => void;
 
-		/**
-		 * Choose whether you can drag to open on touch screens
-		 * @default `true`
-		 */
-		draggable?: boolean;
-	}
+            /**
+             * Callback function when Datepicker is closed
+             */
+            onClose: (this: DatePicker) => void;
 
-	interface ScrollFireOptions {
+            /**
+             * Callback function when Datepicker HTML is refreshed
+             */
+            onDraw: (this: DatePicker) => void;
+        }
 
-		/**
-		 * The selector for the element that is being tracked.
-		 */
-		selector?: string;
+        class FloatingActionButton extends Component<FloatingActionButtonOptions> implements Openable {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): FloatingActionButton;
 
-		/**
-		 * Offset to use when activating the scroll fire event
-		 * If this is 0, the callback will be fired when the selector element is at the very bottom of the user's window.
-		 */
-		offset?: number;
+            /**
+             * Open FAB
+             */
+            open(): void;
 
-		/**
-		 * The string function call that you want to make when the user scrolls to the threshold.
-		 * It will only be called once.
-		 * Example: 'console.log("hello, world!")';
-		 * or callback: () => { console.log('hello world'); }
-		 */
-		callback?: string | (() => void);
-	}
+            /**
+             * Close FAB
+             */
+            close(): void;
 
-	interface TabOptions {
-		/**
-		 * Execute a callback function when the tab is changed.
-		 *
-		 * The callback provides a parameter which refers to the current tab being shown.
-		 */
-		onShow?: Function;
+            /**
+             * Describes open/close state of FAB.
+             */
+            isOpen: boolean;
+        }
 
-		/**
-		 * Set to true to enable swipeable tabs. This also uses the responsiveThreshold option.
-		 *
-		 * @default `false`
-		 */
-		swipeable?: boolean;
+        interface FloatingActionButtonOptions {
+            /**
+             * Direction FAB menu opens
+             * @default "top"
+             */
+            direction: "top" | "right" | "buttom" | "left";
 
-		/**
-		 * The maximum width of the screen, in pixels, where the swipeable functionality initializes.
-		 *
-		 * @default `Infinity`
-		 */
-		responsiveThreshold?: number;
-	}
+            /**
+             * true: FAB menu appears on hover, false: FAB menu appears on click
+             * @default true
+             */
+            hoverEnabled: boolean;
 
-	interface ChipDataObject {
-		tag: string,
-		image?: string,
-		id?: number
-	}
+            /**
+             * Enable transit the FAB into a toolbar on click
+             * @default false
+             */
+            toolbarEnabled: boolean;
+        }
 
-	interface ChipOptions {
-		/**
-		 * Set the chip data
-		 */
-		data?: Materialize.ChipDataObject[];
-		/**
-		 * Set first placeholder when there are no tags
-		 */
-		placeholder?: string;
-		/**
-		 * Set second placeholder when adding additional tags.
-		 */
-		secondaryPlaceholder?: string;
-		/**
-		 * Set autocomplete data.
-		 */
-		autocompleteData?: any;
-		/**
-		 * Set autocomplete limit.
-		 */
-		autocompleteLimit?: number;
-		/**
-		 * Set autocompleteOptions
-		 */
-		autocompleteOptions?: Materialize.AutoCompleteOptions;
-	}
+        class Sidenav extends Component<SidenavOptions> implements Openable {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): Sidenav;
 
-	interface AutoCompleteOptions {
-		/**
-		 * The JSON object data to be used for the autocomplete suggetions list
-		 */
-		data: object;
-		/**
-		 * The max amount of results that can be shown at once.
-		 * @default `Infinity`
-		 */
-		limit?: number;
-		/**
-		 * Callback function when value is autcompleted.
-		 */
-		onAutocomplete?: (val: any) => void;
-		/**
-		 * The minimum length of the input for the autocomplete to start.
-		 * @default `1`
-		 */
-		minLength?: number;
+            /**
+             * Opens Sidenav
+             */
+            open(): void;
 
-	}
+            /**
+             * Closes Sidenav
+             */
+            close(): void;
 
-	interface Toast {
-		/**
-		 * Dismiss all toasts
-		 */
-		removeAll: Function;
-	}
+            /**
+             * Describes open/close state of Sidenav
+             */
+            isOpen: boolean;
 
-	/**
-	 * The Materialize object
-	 */
-	interface Materialize {
+            /**
+             * Describes if sidenav is fixed
+             */
+            isFixed: boolean;
 
-		/**
-		 * Displays a toast message on screen
-		 *
-		 * @param string | JQuery message The message to display on screen
-		 * @param number displayLength The duration in milliseconds to display the message on screen
-		 * @param string className The className to use to format the message to display
-		 * @param Function completeCallback Callback function to call when the messages completes/hides.
-		 */
-		toast(message: string | JQuery, displayLength: number, className?: string, completeCallback?: Function): void;
+            /**
+             * Describes if Sidenav is being dragged
+             */
+            isDragged: boolean;
+        }
 
-		/**
-		 * Fires an event when the page is scrolled to a certain area
-		 *
-		 * @param ScrollFireOptions options optional parameter with scroll fire options
-		 */
-		scrollFire(options?: ScrollFireOptions[]): void;
+        /**
+         * Options for the Sidenav
+         */
+        interface SidenavOptions {
+            /**
+             * Side of screen on which Sidenav appears
+             * @default 'left'
+             */
+            edge: 'left' | 'right';
 
-		/**
-		 * A staggered reveal effect for any UL Tag with list items
-		 *
-		 * @param string selector the selector for the list to show in staggered fasion
-		 */
-		showStaggeredList(selector: string): void;
+            /**
+             * Allow swipe gestures to open/close Sidenav
+             * @default true
+             */
+            draggable: boolean;
 
-		/**
-		 * Fade in images. It also animates grayscale and brightness to give it a unique effect.
-		 *
-		 * @param string selector the selector for the image to fade in
-		 */
-		fadeInImage(selector: string): void;
+            /**
+             * Length in ms of enter transition
+             * @default 250
+             */
+            inDuration: number;
 
-		/**
-		 * Update all text field to reinitialize all the Materialize labels on the page if dynamically adding inputs
-		 */
-		updateTextFields(): void;
+            /**
+             * Length in ms of exit transition
+             * @default 200
+             */
+            outDuration: number;
 
-		/**
-		 * Toast functions
-		 */
-		Toast: Materialize.Toast;
-	}
+            /**
+             * Function called when sidenav starts entering
+             */
+            onOpenStart: (this: Sidenav, elem: Element) => void;
+
+            /**
+             * Function called when sidenav finishes entering
+             */
+            onOpenEnd: (this: Sidenav, elem: Element) => void;
+
+            /**
+             * Function called when sidenav starts exiting
+             */
+            onCloseStart: (this: Sidenav, elem: Element) => void;
+
+            /**
+             * Function called when sidenav finishes exiting
+             */
+            onCloseEnd: (this: Sidenav, elem: Element) => void;
+        }
+
+        class Tabs extends Component<TabsOptions> {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): Tabs;
+
+            /**
+             * Show tab content that corresponds to the tab with the id
+             * @param tabId The id of the tab that you want to switch to
+             */
+            select(tabId: string): void;
+
+            /**
+             * The index of tab that is currently shown
+             */
+            index: number;
+        }
+
+        /**
+         * Options for the Tabs
+         */
+        interface TabsOptions {
+            /**
+             * Transition duration in milliseconds.
+             * @default 300
+             */
+            duration: number;
+
+            /**
+             * Callback for when a new tab content is shown
+             */
+            onShow: (this: Tabs, newContent: Element) => void;
+
+            /**
+             * Set to true to enable swipeable tabs. This also uses the responsiveThreshold option
+             * @default false
+             */
+            swipeable: boolean;
+
+            /**
+             * The maximum width of the screen, in pixels, where the swipeable functionality initializes.
+             * @default infinity
+             */
+            responsiveThreshold: number;
+        }
+
+        class TimePicker extends Component<TimePickerOptions> {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): TimePicker;
+
+            /**
+             * If the picker is open.
+             */
+            isOpen: boolean;
+
+            /**
+             * The selected time.
+             */
+            time: string;
+
+            /**
+             * Open timepicker
+             */
+            open(): void;
+
+            /**
+             * Close timepicker
+             */
+            close(): void;
+
+            /**
+             * Show hours or minutes view on timepicker
+             * @param view The name of the view you want to switch to, 'hours' or 'minutes'.
+             */
+            showView(view: "hours" | "minutes"): void;
+        }
+
+        interface TimePickerOptions {
+            /**
+             * Duration of the transition from/to the hours/minutes view.
+             * @default 350
+             */
+            duration: number;
+
+            /**
+             * Specify a selector for a DOM element to render the calendar in, by default it will be placed before the input.
+             */
+            container: string;
+
+            /**
+             * Default time to set on the timepicker 'now' or '13:14'
+             * @default 'now';
+             */
+            defaultTime: string;
+
+            /**
+             * Millisecond offset from the defaultTime.
+             * @default 0
+             */
+            fromnow: number;
+
+            /**
+             * Done button text.
+             * @default 'Ok'
+             */
+            doneText: string;
+
+            /**
+             * Clear button text.
+             * @default 'Clear'
+             */
+            clearText: string;
+
+            /**
+             * Cancel button text.
+             * @default 'Cancel'
+             */
+            cancelText: string;
+
+            /**
+             * Automatically close picker when minute is selected.
+             * @default false;
+             */
+            autoClose: boolean;
+
+            /**
+             * Use 12 hour AM/PM clock instead of 24 hour clock.
+             * @default true
+             */
+            twelveHour: boolean;
+
+            /**
+             * Vibrate device when dragging clock hand.
+             * @default true
+             */
+            vibrate: boolean;
+        }
+
+        class Modal extends Component<ModalOptions> implements Openable {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): Modal;
+
+            /**
+             * Open modal
+             */
+            open(): void;
+
+            /**
+             * Close modal
+             */
+            close(): void;
+
+            /**
+             * If the modal is open.
+             */
+            isOpen: boolean;
+
+            /**
+             * ID of the modal element
+             */
+            id: string;
+        }
+
+        /**
+         * Options for the Modal
+         */
+        interface ModalOptions {
+            /**
+             * Opacity of the modal overlay.
+             * @default 0.5
+             */
+            opacity: number;
+
+            /**
+             * Transition in duration in milliseconds.
+             * @default 250
+             */
+            inDuration: number;
+
+            /**
+             * Transition out duration in milliseconds.
+             * @default 250
+             */
+            outDuration: number;
+
+            /**
+             * Callback function called when modal is finished entering.
+             */
+            ready: (this: Modal, elem: Element, openingTrigger: Element) => void;
+
+            /**
+             * Callback function called when modal is finished exiting.
+             */
+            complete: (this: Modal, elem: Element) => void;
+
+            /**
+             * Allow modal to be dismissed by keyboard or overlay click.
+             * @default true
+             */
+            dismissible: boolean;
+
+            /**
+             * Starting top offset
+             * @default '4%'
+             */
+            startingTop: string;
+
+            /**
+             * Ending top offset
+             * @default '10%'
+             */
+            endingTop: string;
+        }
+
+        class Toast extends ComponentBase<ToastOptions> {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): Toast;
+
+            /**
+             * Describes the current pan state of the Toast.
+             */
+            panning: boolean;
+
+            /**
+             * The remaining amount of time in ms that the toast will stay before dismissal.
+             */
+            timeRemaining: number;
+
+            /**
+             * remove a specific toast
+             */
+            dismiss(): void;
+
+            /**
+             * dismiss all toasts
+             */
+            static dismissAll(): void;
+        }
+
+        interface ToastOptions {
+            /**
+             * The HTML content of the Toast.
+             */
+            html: string;
+
+            /**
+             * Length in ms the Toast stays before dismissal.
+             * @default 4000
+             */
+            displayLength: number;
+
+            /**
+             * Transition in duration in milliseconds.
+             * @default 300
+             */
+            inDuration: number;
+
+            /**
+             * Transition out duration in milliseconds.
+             * @default 375
+             */
+            outDuration: number;
+
+            /**
+             * Classes to be added to the toast element.
+             */
+            classes: string;
+
+            /**
+             * Callback function called when toast is dismissed.
+             */
+            completeCallback: () => void;
+
+            /**
+             * The percentage of the toast's width it takes for a drag to dismiss a Toast.
+             * @default 0.8
+             */
+            activationPercent: number;
+        }
+
+        /**
+         * Create a toast
+         */
+        function toast(options: Partial<ToastOptions>): Toast;
+
+        class Tooltip extends Component<TooltipOptions> implements Openable {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): Tooltip;
+
+            /**
+             * Show tooltip.
+             */
+            open(): void;
+
+            /**
+             * Hide tooltip.
+             */
+            close(): void;
+
+            /**
+             * If tooltip is open.
+             */
+            isOpen: boolean;
+
+            /**
+             * If tooltip is hovered.
+             */
+            isHovered: boolean;
+        }
+
+        interface TooltipOptions {
+            /**
+             * Delay time before tooltip disappears.
+             * @default 0
+             */
+            exitDelay: number;
+
+            /**
+             * Delay time before tooltip appears.
+             * @default 200
+             */
+            enterDelay: number;
+
+            /**
+             * Can take regular text or HTML strings.
+             * @default null
+             */
+            html: string | null;
+
+            /**
+             * Set distance tooltip appears away from its activator excluding transitionMovement.
+             * @default 5
+             */
+            margin: number;
+
+            /**
+             * Enter transition duration.
+             * @default 300
+             */
+            inDuration: number;
+
+            /**
+             * Exit transition duration.
+             * @default 250
+             */
+            outDuration: number;
+
+            /**
+             * Set the direction of the tooltip.
+             * @default 'bottom'
+             */
+            position: 'top' | 'right' | 'bottom' | 'left';
+
+            /**
+             * Amount in px that the tooltip moves during its transition.
+             * @default 10
+             */
+            transitionMovement: number;
+        }
+
+        function updateTextFields(): void;
+
+        class CharacterCounter extends Component<undefined> {
+            /**
+             * Get Instance
+             */
+            static getInstance(elem: Element): CharacterCounter;
+        }
+
+        abstract class Component<TOptions> extends ComponentBase<TOptions> {
+            /**
+             * Construct component instance and set everything up
+             */
+            constructor(elem: Element, options?: Partial<TOptions>);
+
+            /**
+             * Destroy plugin instance and teardown
+             */
+            destroy(): void;
+        }
+
+        abstract class ComponentBase<TOptions> {
+            constructor(options?: Partial<TOptions>);
+
+            /**
+             * The DOM element the plugin was initialized with
+             */
+            el: Element;
+
+            /**
+             * The options the instance was initialized with
+             */
+            options: TOptions;
+        }
+
+        interface Openable {
+            isOpen: boolean;
+            open(): void;
+            close(): void;
+        }
+    }
+
+    interface JQuery {
+        // Pick<T,K> to check methods exist.
+        autocomplete(method: keyof Pick<M.Autocomplete, "destroy">): JQuery;
+        autocomplete(method: keyof Pick<M.Autocomplete, "selectOption">, el: Element): JQuery;
+        autocomplete(method: keyof Pick<M.Autocomplete, "updateData">, data: M.AutocompleteData): JQuery;
+        autocomplete(options?: Partial<M.AutocompleteOptions>): JQuery;
+
+        datepicker(method: keyof Pick<M.DatePicker, "open" | "close" | "destroy">): JQuery;
+        datepicker(method: keyof Pick<M.DatePicker, "setDate">, date?: Date): JQuery;
+        datepicker(method: keyof Pick<M.DatePicker, "gotoDate">, date: Date): JQuery;
+        datepicker(options?: Partial<M.DatePickerOptions>): JQuery;
+
+        floatingActionButton(method: keyof Pick<M.FloatingActionButton, "open" | "close" | "destroy">): JQuery;
+        floatingActionButton(options?: Partial<M.FloatingActionButtonOptions>): JQuery;
+
+        sidenav(method: keyof Pick<M.Sidenav, "open" | "close" | "destroy">): JQuery;
+        sidenav(options?: Partial<M.SidenavOptions>): JQuery;
+
+        tabs(method: keyof Pick<M.Tabs, "destroy">): JQuery;
+        tabs(method: keyof Pick<M.Tabs, "select">, tabId: string): JQuery;
+        tabs(options?: Partial<M.TabsOptions>): JQuery;
+
+        timepicker(method: keyof Pick<M.TimePicker, "open" | "close" | "destroy">): JQuery;
+        timepicker(method: keyof Pick<M.TimePicker, "showView">, view: "hours" | "minutes"): JQuery;
+        timepicker(options?: Partial<M.TimePickerOptions>): JQuery;
+
+        // Toast can not be invoked using jQuery.
+
+        tooltip(method: keyof Pick<M.Tooltip, "open" | "close" | "destroy">): JQuery;
+        tooltip(options?: Partial<M.TooltipOptions>): JQuery;
+
+        modal(method: keyof Pick<M.Modal, "open" | "close" | "destroy">): JQuery;
+        modal(options?: Partial<M.ModalOptions>): JQuery;
+
+        // tslint:disable-next-line unified-signatures
+        characterCounter(method: keyof Pick<M.CharacterCounter, "destroy">): JQuery;
+        characterCounter(): JQuery;
+    }
 }
-
-/**
- * Declare Pickadate namespace again in order to add more Materialize specific properties to TimeOptions interface
- *
- * @see http://www.typescriptlang.org/docs/handbook/declaration-merging.html
- */
-declare namespace Pickadate {
-	export interface TimeOptions {
-		/**
-		 * Set default time such as : 'now', '1:30AM', '16:30'.
-		 * @default `'now'`
-		 */
-		default?: string;
-		/**
-		 * set default time to * milliseconds from now (using with default = 'now')
-		 * @default `0`
-		 */
-		fromnow?: number;
-		/**
-		 * Use AM/PM or 24-hour format
-		 * @default `false`
-		 */
-		twelvehour?: boolean;
-		/**
-		 * text for done-button
-		 * @default `'OK'`
-		 */
-		donetext?: string;
-		/**
-		 * text for clear-button
-		 * @default `'Clear'`
-		 */
-		cleartext?: string;
-		/**
-		 * Text for cancel-button
-		 * @default `'Cancel'`
-		 */
-		canceltext?: string;
-		/**
-		 * automatic close timepicker
-		 * @default `false`
-		 */
-		autoclose?: boolean;
-		/**
-		 * make AM PM clickable
-		 * @default `true`
-		 */
-		ampmclickable?: boolean;
-		/**
-		 * Function for after opening timepicker
-		 */
-		aftershow?: Function;
-	}
-}
-
-declare var Materialize: Materialize.Materialize;
-
-interface JQuery {
-
-	/**
-	 * open Fixed Action Button
-	 */
-	openFAB(): void;
-	/**
-	 * close Fixed Action Button
-	 */
-	closeFAB(): void;
-
-	/**
-	 * Select allows user input through specified options.
-	 *
-	 * @param string method "destroy" destroy the material select
-	 */
-	material_select(method?: string): void;
-
-	/**
-	 * Use a character counter in fields where a character restriction is in place.
-	 */
-	characterCounter(): JQuery;
-
-	/**
-	 * Collapsibles are accordion elements that expand when clicked on.
-	 * They allow you to hide content that is not immediately relevant to the user.
-	 *
-	 * @param CollapsibleOptions options the collapsible options
-	 */
-	collapsible(options?: Materialize.CollapsibleOptions): JQuery;
-
-	/**
-	 * Tooltips are small, interactive, textual hints for mainly graphical elements.
-	 * When using icons for actions you can use a tooltip to give people clarification on its function.
-	 *
-	 * @param TooltipOptions | string options the tooltip options or the string "remove" to remove the tooltip function
-	 */
-	tooltip(options?: Materialize.TooltipOptions | string): JQuery;
-
-	/**
-	 * Add a dropdown list to any button.
-	 * Make sure that the data-activates attribute matches the id in the <ul> tag.
-	 *
-	 * @param DropDownOptions options the drop down options
-	 */
-	dropdown(options?: Materialize.DropDownOptions): void;
-
-	/**
-	 * Material box is a material design implementation of the Lightbox plugin.
-	 */
-	materialbox(): JQuery;
-
-	/**
-	 * slider is a simple and elegant image carousel.
-	 * You can also have captions that will be transitioned on their own depending on their alignment.
-	 * You can also have indicators that show up on the bottom of the slider.
-	 *
-	 * @param SliderOptions options the slider options
-	 */
-	slider(options?: Materialize.SliderOptions): JQuery;
-
-	/**
-	 * slider is a simple and elegant image carousel.
-	 * You can also have captions that will be transitioned on their own depending on their alignment.
-	 * You can also have indicators that show up on the bottom of the slider.
-	 *
-	 * @param string method the string "start" to start the animation or "pauze" to pauze the animation
-	 */
-	slider(method: string): JQuery;
-
-	/**
-	 * Our slider is a simple and elegant image carousel.
-	 * You can also have captions that will be transitioned on their own depending on their alignment.
-	 * You can also have indicators that show up on the bottom of the slider.
-	 *
-	 * @param CarouselOptions options the slider options or the string "start" to start the animation or "pauze" to pauze the animation
-	 */
-	carousel(options?: Materialize.CarouselOptions): JQuery;
-
-	/**
-	 * Our slider is a simple and elegant image carousel.
-	 * You can also have captions that will be transitioned on their own depending on their alignment.
-	 * You can also have indicators that show up on the bottom of the slider.
-	 *
-	 * @param string method the methods to pause, start, move to next and move to previous slide.
-	 */
-	carousel(method: string, count?: number): JQuery;
-
-	/**
-	 * Modal for dialog boxes, confirmation messages, or other content that can be called up.
-	 *
-	 * To customize the behaviour of a modal
-	 *
-	 * @param ModalOptions options the lean modal options
-	 */
-	modal(options?: Materialize.ModalOptions): void;
-
-	/**
-	 * Modal for dialog boxes, confirmation messages, or other content that can be called up.
-	 *
-	 * For opening and closing modals programatically.
-	 *
-	 * @param string action action to do (`open` or `close)
-	 */
-	modal(action: string, options?: Materialize.ModalOptions): void;
-
-	/**
-	 * Parallax is an effect where the background content or image in this case, is moved at a different speed than the foreground content while scrolling.
-	 */
-	parallax(): JQuery;
-
-	/**
-	 * Pushpin is a fixed positioning plugin.
-	 *
-	 * @param PushpinOptions options the push pin options
-	 */
-	pushpin(options?: Materialize.PushpinOptions): JQuery;
-
-	/**
-	 * Scrollspy is a jQuery plugin that tracks certain elements and which element the user's screen is currently centered on.
-	 *
-	 * @param ScrollSpyOptions options the scroll spy options
-	 */
-	scrollSpy(options?: Materialize.ScrollSpyOptions): JQuery;
-
-	/**
-	 * A slide out menu. You can add a dropdown to your sidebar by using our collapsible component.
-	 *
-	 * @param SideNavOptions | string methodOrOptions the slide navigation options or a string with "show" to reveal or "hide" to hide the menu
-	 */
-	sideNav(methodOrOptions?: Materialize.SideNavOptions | string): void;
-
-	/**
-	 * Programmatically trigger the tab change event
-	 *
-	 * @param string method : the method to call (always "select_tab")
-	 * @param string tab : id of the tab to open
-	 */
-	tabs(method?: string, tab?: string): JQuery;
-
-	/**
-	 * Tab Initialization with options
-	 *
-	 * @param TabOptions options jQuery plugin options
-	 */
-	tabs(options?: Materialize.TabOptions): JQuery;
-
-	/**
-	 * Chip Initialization
-	 *
-	 * @param ChipOptions options Material chip options
-	 */
-	material_chip(options?: Materialize.ChipOptions): JQuery;
-
-	/**
-	 * To access chip data
-	 *
-	 * @param string method name of the method to invoke
-	 */
-	material_chip(method: string): Materialize.ChipDataObject[] | Materialize.ChipDataObject;
-
-	/**
-	 * Add an autocomplete dropdown below your input to suggest possible values.
-	 * @param autocompleteOptions options : @see autocompleteOptions for possible options
-	 */
-	autocomplete(options: Materialize.AutoCompleteOptions): JQuery;
-
-	/**
-	 * Feature discovery - open and close a tap target
-	 * @param string action : either `'open'` or `'close'`
-	 */
-	tapTarget(action?: string): JQuery;
-}
\ No newline at end of file
diff --git a/types/materialize-css/test/materialize-css-global.test.ts b/types/materialize-css/test/materialize-css-global.test.ts
new file mode 100644
index 0000000000..538941dff5
--- /dev/null
+++ b/types/materialize-css/test/materialize-css-global.test.ts
@@ -0,0 +1,30 @@
+const elem = document.querySelector('.whatever')!;
+// $ExpectType Sidenav
+const sidenav = new M.Sidenav(elem);
+
+// $ExpectType Tabs
+const tabs = new M.Tabs(elem);
+
+// $ExpectType Modal
+const modal = new M.Modal(elem);
+
+// $ExpectType Autocomplete
+const autocomplete = new M.Autocomplete(elem);
+
+// $ExpectType CharacterCounter
+const characterCounter = new M.CharacterCounter(elem);
+
+// $ExpectType Tooltip
+const tooltips = new M.Tooltip(elem);
+
+// $ExpectType FloatingActionButton
+const fab = new M.FloatingActionButton(elem);
+
+// $ExpectType Toast
+const toast = M.toast({ html: 'I am a toast!' });
+
+// $ExpectType DatePicker
+const datePicker = new M.DatePicker(elem);
+
+// $ExpectType TimePicker
+const timePicker = new M.TimePicker(elem);
diff --git a/types/materialize-css/test/materialize-css-jquery.test.ts b/types/materialize-css/test/materialize-css-jquery.test.ts
new file mode 100644
index 0000000000..4142ab7294
--- /dev/null
+++ b/types/materialize-css/test/materialize-css-jquery.test.ts
@@ -0,0 +1,50 @@
+$(".whatever").sidenav();
+$(".whatever").sidenav({ inDuration: 200 });
+$(".whatever").sidenav("open");
+$(".whatever").sidenav("destroy");
+
+$(".whatever").tabs();
+$(".whatever").tabs({ duration: 200 });
+$(".whatever").tabs("destroy");
+$(".whatever").tabs("select", "id");
+
+$(".whatever").modal();
+$(".whatever").modal({ inDuration: 200 });
+$(".whatever").modal("open");
+$(".whatever").modal("destroy");
+
+$(".whatever").characterCounter();
+$(".whatever").characterCounter("destroy");
+
+$(".whatever").autocomplete({
+    data: {
+        Apple: null,
+        Google: "https://placehold.it/250x250"
+    }
+});
+$(".whatever").autocomplete("updateData", { Microsoft: null });
+
+$(".whatever").tooltip();
+$(".whatever").tooltip({ html: "<img/>" });
+$(".whatever").tooltip("open");
+$(".whatever").tooltip("destroy");
+
+$(".whatever").floatingActionButton();
+$(".whatever").floatingActionButton({ direction: "left" });
+$(".whatever").floatingActionButton("open");
+$(".whatever").floatingActionButton("destroy");
+
+// Toast can not be invoked using jQuery.
+
+$(".whatever").datepicker();
+$(".whatever").datepicker({ defaultDate: new Date() });
+$(".whatever").datepicker("open");
+$(".whatever").datepicker("destroy");
+$(".whatever").datepicker("setDate", new Date());
+$(".whatever").datepicker("gotoDate", new Date());
+
+$(".whatever").timepicker();
+$(".whatever").timepicker({ defaultTime: "13:14" });
+$(".whatever").timepicker("open");
+$(".whatever").timepicker("destroy");
+$(".whatever").timepicker("showView", "hours");
diff --git a/types/materialize-css/test/materialize-css-module.test.ts b/types/materialize-css/test/materialize-css-module.test.ts
new file mode 100644
index 0000000000..2395b01e61
--- /dev/null
+++ b/types/materialize-css/test/materialize-css-module.test.ts
@@ -0,0 +1,218 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// Sidenav
+// $ExpectType Sidenav
+new materialize.Sidenav(elem);
+// $ExpectType Sidenav
+const sidenav = new materialize.Sidenav(elem, {
+    edge: "left",
+    inDuration: 300,
+    onCloseStart(el) {
+        // $ExpectType Sidenav
+        this;
+        // $ExpectType Element
+        el;
+    }
+});
+// $ExpectType void
+sidenav.open();
+// $ExpectType void
+sidenav.destroy();
+// $ExpectType SidenavOptions
+sidenav.options;
+// $ExpectType Element
+sidenav.el;
+// $ExpectType boolean
+sidenav.isOpen;
+
+// Tabs
+// $ExpectType Tabs
+new materialize.Tabs(elem);
+// $ExpectType Tabs
+const tabs = new materialize.Tabs(elem, {
+    duration: 200,
+    onShow(content) {
+        // $ExpectType Tabs
+        this;
+        // $ExpectType Element
+        content;
+    }
+});
+// $ExpectType void
+tabs.destroy();
+// $ExpectType void
+tabs.select("id");
+// $ExpectType TabsOptions
+tabs.options;
+// $ExpectType Element
+tabs.el;
+// $ExpectType number
+tabs.index;
+
+// Modal
+// $ExpectType Modal
+new materialize.Modal(elem);
+// $ExpectType Modal
+const modal = new materialize.Modal(elem, {
+    inDuration: 300,
+    ready(el, trigger) {
+        // $ExpectType Modal
+        this;
+        // $ExpectType Element
+        el;
+        // $ExpectType Element
+        trigger;
+    }
+});
+// $ExpectType void
+modal.open();
+// $ExpectType void
+modal.destroy();
+// $ExpectType ModalOptions
+modal.options;
+// $ExpectType Element
+modal.el;
+// $ExpectType boolean
+modal.isOpen;
+
+// CharacterCounter
+// $ExpectType CharacterCounter
+const characterCounter = new materialize.CharacterCounter(elem);
+// $ExpectType void
+characterCounter.destroy();
+// $ExpectType Element
+characterCounter.el;
+
+// Autocomplete
+// $ExpectType Autocomplete
+new materialize.Autocomplete(elem);
+// $ExpectType Autocomplete
+const autocomplete = new materialize.Autocomplete(elem, {
+    data: {
+        Apple: null,
+        Google: "https://placehold.it/250x250"
+    },
+    minLength: 3,
+    onAutocomplete(text) {
+        // $ExpectType Autocomplete
+        this;
+        // $ExpectType string
+        text;
+    },
+    sortFunction(a, b, input) {
+        // $ExpectType string
+        a;
+        // $ExpectType string
+        b;
+        // $ExpectType string
+        input;
+        return 0;
+    }
+});
+// $ExpectType void
+autocomplete.updateData({ Microsoft: null });
+// $ExpectType void
+autocomplete.destroy();
+// $ExpectType AutocompleteOptions
+autocomplete.options;
+// $ExpectType Element
+autocomplete.el;
+// $ExpectType boolean
+autocomplete.isOpen;
+
+// Tooltip
+// $ExpectType Tooltip
+new materialize.Tooltip(elem);
+// $ExpectType Tooltip
+const tooltip = new materialize.Tooltip(elem, {
+    inDuration: 300,
+    position: "right"
+});
+// $ExpectType void
+tooltip.open();
+// $ExpectType void
+tooltip.destroy();
+// $ExpectType TooltipOptions
+tooltip.options;
+// $ExpectType Element
+tooltip.el;
+// $ExpectType boolean
+tooltip.isOpen;
+
+// FloatingActionButton
+// $ExpectType FloatingActionButton
+new materialize.FloatingActionButton(elem);
+// $ExpectType FloatingActionButton
+const fab = new materialize.FloatingActionButton(elem, {
+    direction: 'left'
+});
+// $ExpectType void
+fab.open();
+// $ExpectType void
+fab.destroy();
+// $ExpectType FloatingActionButtonOptions
+fab.options;
+// $ExpectType Element
+fab.el;
+// $ExpectType boolean
+fab.isOpen;
+
+// Toasts
+// $ExpectType Toast
+const toast = materialize.toast({ html: 'I am a toast!' });
+// $ExpectType ToastOptions
+toast.options;
+// $ExpectType Element
+fab.el;
+// $ExpectType void
+toast.dismiss();
+// $ExpectType void
+materialize.Toast.dismissAll();
+
+// DatePicker
+// $ExpectType DatePicker
+new materialize.DatePicker(elem);
+// $ExpectType DatePicker
+const datePicker = new materialize.DatePicker(elem, {
+    defaultDate: new Date(),
+    onSelect(date) {
+        // $ExpectType DatePicker
+        this;
+        // $ExpectType Date
+        date;
+    }
+});
+// $ExpectType void
+datePicker.open();
+// $ExpectType void
+datePicker.setDate(new Date());
+// $ExpectType void
+datePicker.destroy();
+// $ExpectType DatePickerOptions
+datePicker.options;
+// $ExpectType Element
+datePicker.el;
+// $ExpectType boolean
+datePicker.isOpen;
+
+// TimePicker
+// $ExpectType TimePicker
+new materialize.TimePicker(elem);
+// $ExpectType TimePicker
+const timePicker = new materialize.TimePicker(elem, {
+    defaultTime: "13:14"
+});
+// $ExpectType void
+timePicker.open();
+// $ExpectType void
+timePicker.showView("hours");
+// $ExpectType void
+timePicker.destroy();
+// $ExpectType TimePickerOptions
+timePicker.options;
+// $ExpectType Element
+timePicker.el;
+// $ExpectType boolean
+timePicker.isOpen;
diff --git a/types/materialize-css/tsconfig.json b/types/materialize-css/tsconfig.json
index cc986baa67..316e2f8361 100644
--- a/types/materialize-css/tsconfig.json
+++ b/types/materialize-css/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -19,6 +19,8 @@
     },
     "files": [
         "index.d.ts",
-        "materialize-css-tests.ts"
+        "test/materialize-css-global.test.ts",
+        "test/materialize-css-module.test.ts",
+        "test/materialize-css-jquery.test.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/materialize-css/tslint.json b/types/materialize-css/tslint.json
new file mode 100644
index 0000000000..5f6e69415a
--- /dev/null
+++ b/types/materialize-css/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+
+    }
+ }
diff --git a/types/materialize-css/v0/index.d.ts b/types/materialize-css/v0/index.d.ts
new file mode 100644
index 0000000000..a457c3ad1a
--- /dev/null
+++ b/types/materialize-css/v0/index.d.ts
@@ -0,0 +1,712 @@
+// Type definitions for materialize-css 0.100
+// Project: http://materializecss.com/
+// Definitions by:  Erik Lieben <https://github.com/eriklieben>
+//                  Leon Yu <https://github.com/leonyu>
+//                  Sukhdeep Singh <https://github.com/SinghSukhdeep>
+//                  Jean-Francois Cere <https://github.com/jfcere>
+//                  Sebastien Cote <https://github.com/scote>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+/// <reference types="pickadate" />
+
+declare namespace Materialize {
+	/**
+	 * The collapsible options
+	 */
+	interface CollapsibleOptions {
+		/**
+		 * A setting that changes the collapsible behavior to expandable instead of the default accordion style
+		 */
+		accordion?: boolean;
+
+		/**
+		 * Callback for Collapsible section close.
+		 * @default `function() { alert('Closed'); }`
+		 */
+		onClose?: Function;
+
+		/**
+		 * Callback for Collapsible section open.
+		 * @default `function() { alert('Opened'); }`
+		 */
+		onOpen?: Function;
+	}
+
+	interface TooltipOptions {
+		/**
+		 * The delay before the tooltip shows (in milliseconds)
+		 */
+		delay: number;
+		/**
+		 * Tooltip text. Can use custom HTML if you set the html option
+		 */
+		tooltip?: string;
+		/**
+		 * Set the direction of the tooltip. 'top', 'right', 'bottom', 'left'.
+		 *
+		 * @default `'bottom'`
+		 */
+		position?: string;
+		/**
+		 * Allow custom html inside the tooltip.
+		 *
+		 * @default `false`
+		 */
+		html?: boolean;
+	}
+
+	/**
+	 * The dropdown options
+	 */
+	interface DropDownOptions {
+		/**
+		 * The duration of the transition enter in milliseconds.
+		 * @default `300`
+		 */
+		inDuration?: number;
+
+		/**
+		 * The duration of the transition out in milliseconds.
+		 * @default `225`
+		 */
+		outDuration?: number;
+
+		/**
+		 * If true, constrainWidth to the size of the dropdown activator.
+		 * @default `true`
+		 */
+		constrainWidth?: boolean;
+		/**
+		 * If true, the dropdown will open on hover.
+		 * @default `false`
+		 */
+		hover?: boolean;
+
+		/**
+		 * This defines the spacing from the aligned edge.
+		 * @default `0`
+		 */
+		gutter?: number;
+
+		/**
+		 * If true, the dropdown will show below the activator.
+		 * @default `false`
+		 */
+		belowOrigin?: boolean;
+
+		/**
+		 * Defines the edge the menu is aligned to.
+		 * @default `'left'`
+		 */
+		alignment?: string;
+		/**
+		 * If true, stops the event propagating from the dropdown origin click handler.
+		 *
+		 * @default `false`
+		 */
+		stopPropagation?: boolean;
+	}
+
+	/**
+	 * The slider options
+	 */
+	interface SliderOptions {
+		/**
+		 * Set to false to hide slide indicators.
+		 * @default `true`
+		 */
+		indicators?: boolean;
+
+		/**
+		 * Set height of slider.
+		 * @default `400`
+		 */
+		height?: number;
+
+		/**
+		 * Set the duration of the transition animation in ms.
+		 * @default `500`
+		 */
+		transition?: number;
+
+		/**
+		 * Set the duration between transitions in ms.
+		 * @default `6000`
+		 */
+		interval?: number;
+	}
+
+	/**
+	 * The carousel options
+	 */
+	interface CarouselOptions {
+		/**
+		 * Transition duration in milliseconds
+		 * @default `200`
+		 */
+		duration?: number;
+
+		/**
+		 * Perspective zoom. If 0, all items are the same size.
+		 * @default `-100`
+		 */
+		dist?: number;
+
+		/**
+		 * Set the duration of the transition animation in ms.
+		 * @default `500`
+		 */
+		shift?: number;
+
+		/**
+		 * Set the duration between transitions in ms.
+		 * @default `6000`
+		 */
+		padding?: number;
+
+		/**
+		 * Set the width of the carousel.
+		 * @default `false`
+		 */
+		fullWidth?: boolean;
+		/**
+		 * Set to true to show indicators.
+		 *
+		 * @default `false`
+		 */
+		indicators?: boolean;
+		/**
+		 * Don't wrap around and cycle through items.
+		 *
+		 * @default `false`
+		 */
+		noWrap?: boolean;
+	}
+
+	/**
+	 * The modal options
+	 */
+	interface ModalOptions {
+		/**
+		 * Modal can be dismissed by clicking outside of the modal.
+		 * @default `true`
+		 */
+		dismissible?: boolean;
+
+		/**
+		 * Opacity of modal background.
+		 * @default `.5`
+		 */
+		opacity?: number;
+
+		/**
+		 * Transition in duration.
+		 * @default `300`
+		 */
+		inDuration?: number;
+
+		/**
+		 * Transition out duration.
+		 * @default `200`
+		 */
+		outDuration?: number;
+		/**
+		 * Starting top style attribute
+		 * @default `4%`
+		 */
+		startingTop?: string;
+		/**
+		 * Ending top style attribute
+		 * @default `10%`
+		 */
+		endingTop?: string;
+
+		/**
+		 * Callback for Modal open.
+		 * @default `function() { alert('Ready'); }`
+		 */
+		ready?: Function;
+
+		/**
+		 * Callback for Modal close.
+		 * @default `function() { alert('Closed'); }`
+		 */
+		complete?: Function;
+	}
+
+	/**
+	 * The push pin options
+	 */
+	interface PushpinOptions {
+		/**
+		 * The distance in pixels from the top of the page where the element becomes fixed.
+		 * @default `0`
+		 */
+		top?: number;
+
+		/**
+		 * The distance in pixels from the top of the page where the elements stops being fixed.
+		 * @default `Infinity`
+		 */
+		bottom?: number;
+
+		/**
+		 * The offset from the top the element will be fixed at.
+		 * @default `0`
+		 */
+		offset?: number;
+	}
+
+	/**
+	 * The scroll spy options
+	 */
+	interface ScrollSpyOptions {
+		/**
+		 * Offset from top.
+		 * @default `200`
+		 */
+		scrollOffset?: number;
+		/**
+		 * Class name to be added to the active link.
+		 * @default `active`
+		 */
+		activeClass?: string;
+		/**
+		 * Function that returns a selector to add activeClass to. The parameter is the section id
+		 */
+		getActiveElement?: Function;
+	}
+
+	/**
+	 * The slideNav options
+	 */
+	interface SideNavOptions {
+		/**
+		 * The sideNav width.
+		 * @default `240`
+		 */
+		menuWidth?: number;
+
+		/**
+		 * The horizontal origin.
+		 * @default `'left'`
+		 */
+		edge?: string;
+
+		/**
+		 * Closes sideNav on <a> clicks, useful for Angular/Meteor.
+		 * @default `false`
+		 */
+		closeOnClick?: boolean;
+
+		/**
+		 * Choose whether you can drag to open on touch screens.
+		 * @default `true`
+		 */
+		draggable?: boolean;
+
+		/**
+		 * Execute a callback function when sideNav is opened.
+		 *
+		 * The callback provides a parameter which refers to the sideNav being opened.
+		 */
+		onOpen?: Function;
+
+		/**
+		 * Execute a callback function when sideNav is closed.
+		 *
+		 * The callback provides a parameter which refers to the sideNav being closed.
+		 */
+		onClose?: Function;
+	}
+
+	interface ScrollFireOptions {
+		/**
+		 * The selector for the element that is being tracked.
+		 */
+		selector?: string;
+
+		/**
+		 * Offset to use when activating the scroll fire event
+		 * If this is 0, the callback will be fired when the selector element is at the very bottom of the user's window.
+		 */
+		offset?: number;
+
+		/**
+		 * The string function call that you want to make when the user scrolls to the threshold.
+		 * It will only be called once.
+		 * Example: 'console.log("hello, world!")';
+		 * or callback: () => { console.log('hello world'); }
+		 */
+		callback?: string | (() => void);
+	}
+
+	interface TabOptions {
+		/**
+		 * Execute a callback function when the tab is changed.
+		 *
+		 * The callback provides a parameter which refers to the current tab being shown.
+		 */
+		onShow?: Function;
+
+		/**
+		 * Set to true to enable swipeable tabs. This also uses the responsiveThreshold option.
+		 *
+		 * @default `false`
+		 */
+		swipeable?: boolean;
+
+		/**
+		 * The maximum width of the screen, in pixels, where the swipeable functionality initializes.
+		 *
+		 * @default `Infinity`
+		 */
+		responsiveThreshold?: number;
+	}
+
+	interface ChipDataObject {
+		tag: string;
+		image?: string;
+		id?: number;
+	}
+
+	interface ChipOptions {
+		/**
+		 * Set the chip data
+		 */
+		data?: ChipDataObject[];
+		/**
+		 * Set first placeholder when there are no tags
+		 */
+		placeholder?: string;
+		/**
+		 * Set second placeholder when adding additional tags.
+		 */
+		secondaryPlaceholder?: string;
+		/**
+		 * Set autocomplete data.
+		 */
+		autocompleteData?: any;
+		/**
+		 * Set autocomplete limit.
+		 */
+		autocompleteLimit?: number;
+		/**
+		 * Set autocompleteOptions
+		 */
+		autocompleteOptions?: AutoCompleteOptions;
+	}
+
+	interface AutoCompleteOptions {
+		/**
+		 * The JSON object data to be used for the autocomplete suggetions list
+		 */
+		data: object;
+		/**
+		 * The max amount of results that can be shown at once.
+		 * @default `Infinity`
+		 */
+		limit?: number;
+		/**
+		 * Callback function when value is autcompleted.
+		 */
+		onAutocomplete?: (val: any) => void;
+		/**
+		 * The minimum length of the input for the autocomplete to start.
+		 * @default `1`
+		 */
+		minLength?: number;
+	}
+
+	interface Toast {
+		/**
+		 * Dismiss all toasts
+		 */
+		removeAll: Function;
+	}
+
+	/**
+	 * The Materialize object
+	 */
+	interface Materialize {
+		/**
+		 * Displays a toast message on screen
+		 *
+		 * @param string | JQuery message The message to display on screen
+		 * @param number displayLength The duration in milliseconds to display the message on screen
+		 * @param string className The className to use to format the message to display
+		 * @param Function completeCallback Callback function to call when the messages completes/hides.
+		 */
+		toast(message: string | JQuery, displayLength: number, className?: string, completeCallback?: Function): void;
+
+		/**
+		 * Fires an event when the page is scrolled to a certain area
+		 *
+		 * @param ScrollFireOptions options optional parameter with scroll fire options
+		 */
+		scrollFire(options?: ScrollFireOptions[]): void;
+
+		/**
+		 * A staggered reveal effect for any UL Tag with list items
+		 *
+		 * @param string selector the selector for the list to show in staggered fasion
+		 */
+		showStaggeredList(selector: string): void;
+
+		/**
+		 * Fade in images. It also animates grayscale and brightness to give it a unique effect.
+		 *
+		 * @param string selector the selector for the image to fade in
+		 */
+		fadeInImage(selector: string): void;
+
+		/**
+		 * Update all text field to reinitialize all the Materialize labels on the page if dynamically adding inputs
+		 */
+		updateTextFields(): void;
+
+		/**
+		 * Toast functions
+		 */
+		Toast: Toast;
+	}
+}
+
+/**
+ * Declare Pickadate namespace again in order to add more Materialize specific properties to TimeOptions interface
+ *
+ * @see http://www.typescriptlang.org/docs/handbook/declaration-merging.html
+ */
+declare namespace Pickadate {
+	interface TimeOptions {
+		/**
+		 * Set default time such as : 'now', '1:30AM', '16:30'.
+		 * @default `'now'`
+		 */
+		default?: string;
+		/**
+		 * set default time to * milliseconds from now (using with default = 'now')
+		 * @default `0`
+		 */
+		fromnow?: number;
+		/**
+		 * Use AM/PM or 24-hour format
+		 * @default `false`
+		 */
+		twelvehour?: boolean;
+		/**
+		 * text for done-button
+		 * @default `'OK'`
+		 */
+		donetext?: string;
+		/**
+		 * text for clear-button
+		 * @default `'Clear'`
+		 */
+		cleartext?: string;
+		/**
+		 * Text for cancel-button
+		 * @default `'Cancel'`
+		 */
+		canceltext?: string;
+		/**
+		 * automatic close timepicker
+		 * @default `false`
+		 */
+		autoclose?: boolean;
+		/**
+		 * make AM PM clickable
+		 * @default `true`
+		 */
+		ampmclickable?: boolean;
+		/**
+		 * Function for after opening timepicker
+		 */
+		aftershow?: Function;
+	}
+}
+
+declare var Materialize: Materialize.Materialize;
+
+interface JQuery {
+	/**
+	 * open Fixed Action Button
+	 */
+	openFAB(): void;
+	/**
+	 * close Fixed Action Button
+	 */
+	closeFAB(): void;
+
+	/**
+	 * Select allows user input through specified options.
+	 *
+	 * @param string method "destroy" destroy the material select
+	 */
+	material_select(method?: string): void;
+
+	/**
+	 * Use a character counter in fields where a character restriction is in place.
+	 */
+	characterCounter(): JQuery;
+
+	/**
+	 * Collapsibles are accordion elements that expand when clicked on.
+	 * They allow you to hide content that is not immediately relevant to the user.
+	 *
+	 * @param CollapsibleOptions | string options the collapsible options or the string "destroy" to destroy the collapsible
+	 */
+	collapsible(options?: Materialize.CollapsibleOptions | string): JQuery;
+
+	/**
+	 * Programmatically trigger an event on a selected index
+	 *
+	 * @param string method the string "open" or "close" to open or to close the collapsible element on specified index
+	 * @param number index the element index to trigger "open" or "close" function
+	 */
+	collapsible(method: string, index: number): JQuery;
+
+	/**
+	 * Tooltips are small, interactive, textual hints for mainly graphical elements.
+	 * When using icons for actions you can use a tooltip to give people clarification on its function.
+	 *
+	 * @param TooltipOptions | string options the tooltip options or the string "remove" to remove the tooltip function
+	 */
+	tooltip(options?: Materialize.TooltipOptions | string): JQuery;
+
+	/**
+	 * Add a dropdown list to any button.
+	 * Make sure that the data-activates attribute matches the id in the <ul> tag.
+	 *
+	 * @param DropDownOptions options the drop down options
+	 */
+	dropdown(options?: Materialize.DropDownOptions): void;
+
+	/**
+	 * Material box is a material design implementation of the Lightbox plugin.
+	 */
+	materialbox(): JQuery;
+
+	/**
+	 * slider is a simple and elegant image carousel.
+	 * You can also have captions that will be transitioned on their own depending on their alignment.
+	 * You can also have indicators that show up on the bottom of the slider.
+	 *
+	 * @param SliderOptions options the slider options
+	 */
+	slider(options?: Materialize.SliderOptions): JQuery;
+
+	/**
+	 * slider is a simple and elegant image carousel.
+	 * You can also have captions that will be transitioned on their own depending on their alignment.
+	 * You can also have indicators that show up on the bottom of the slider.
+	 *
+	 * @param string method the string "start" to start the animation or "pauze" to pauze the animation
+	 */
+	slider(method: string): JQuery;
+
+	/**
+	 * Our slider is a simple and elegant image carousel.
+	 * You can also have captions that will be transitioned on their own depending on their alignment.
+	 * You can also have indicators that show up on the bottom of the slider.
+	 *
+	 * @param CarouselOptions options the slider options or the string "start" to start the animation or "pauze" to pauze the animation
+	 */
+	carousel(options?: Materialize.CarouselOptions): JQuery;
+
+	/**
+	 * Our slider is a simple and elegant image carousel.
+	 * You can also have captions that will be transitioned on their own depending on their alignment.
+	 * You can also have indicators that show up on the bottom of the slider.
+	 *
+	 * @param string method the methods to pause, start, move to next and move to previous slide.
+	 */
+	carousel(method: string, count?: number): JQuery;
+
+	/**
+	 * Modal for dialog boxes, confirmation messages, or other content that can be called up.
+	 *
+	 * To customize the behaviour of a modal
+	 *
+	 * @param ModalOptions options the lean modal options
+	 */
+	modal(options?: Materialize.ModalOptions): void;
+
+	/**
+	 * Modal for dialog boxes, confirmation messages, or other content that can be called up.
+	 *
+	 * For opening and closing modals programatically.
+	 *
+	 * @param string action action to do (`open` or `close)
+	 */
+	modal(action: string, options?: Materialize.ModalOptions): void;
+
+	/**
+	 * Parallax is an effect where the background content or image in this case, is moved at a different speed than the foreground content while scrolling.
+	 */
+	parallax(): JQuery;
+
+	/**
+	 * Pushpin is a fixed positioning plugin.
+	 *
+	 * @param PushpinOptions options the push pin options
+	 */
+	pushpin(options?: Materialize.PushpinOptions): JQuery;
+
+	/**
+	 * Scrollspy is a jQuery plugin that tracks certain elements and which element the user's screen is currently centered on.
+	 *
+	 * @param ScrollSpyOptions options the scroll spy options
+	 */
+	scrollSpy(options?: Materialize.ScrollSpyOptions): JQuery;
+
+	/**
+	 * A slide out menu. You can add a dropdown to your sidebar by using our collapsible component.
+	 *
+	 * @param SideNavOptions | string methodOrOptions the slide navigation options or a string with "show" to reveal or "hide" to hide the menu
+	 */
+	sideNav(methodOrOptions?: Materialize.SideNavOptions | string): void;
+
+	/**
+	 * Programmatically trigger the tab change event
+	 *
+	 * @param string method : the method to call (always "select_tab")
+	 * @param string tab : id of the tab to open
+	 */
+	tabs(method?: string, tab?: string): JQuery;
+
+	/**
+	 * Tab Initialization with options
+	 *
+	 * @param TabOptions options jQuery plugin options
+	 */
+	tabs(options?: Materialize.TabOptions): JQuery;
+
+	/**
+	 * Chip Initialization
+	 *
+	 * @param ChipOptions options Material chip options
+	 */
+	material_chip(options?: Materialize.ChipOptions): JQuery;
+
+	/**
+	 * To access chip data
+	 *
+	 * @param string method name of the method to invoke
+	 */
+	material_chip(method: string): Materialize.ChipDataObject[] | Materialize.ChipDataObject;
+
+	/**
+	 * Add an autocomplete dropdown below your input to suggest possible values.
+	 * @param autocompleteOptions options : @see autocompleteOptions for possible options
+	 */
+	autocomplete(options: Materialize.AutoCompleteOptions): JQuery;
+
+	/**
+	 * Feature discovery - open and close a tap target
+	 * @param string action : either `'open'` or `'close'`
+	 */
+	tapTarget(action?: string): JQuery;
+}
diff --git a/types/materialize-css/materialize-css-tests.ts b/types/materialize-css/v0/materialize-css-tests.ts
similarity index 82%
rename from types/materialize-css/materialize-css-tests.ts
rename to types/materialize-css/v0/materialize-css-tests.ts
index 1490dbfd3c..02d35c7f40 100644
--- a/types/materialize-css/materialize-css-tests.ts
+++ b/types/materialize-css/v0/materialize-css-tests.ts
@@ -1,17 +1,12 @@
-
-
 // Buttons
-
 $('.fixed-action-btn').openFAB();
 $('.fixed-action-btn').closeFAB();
 
 // Forms - Select
-
 $('select').material_select();
 $('select').material_select('destroy');
 
 // Forms - Date Picker
-
 $('.datepicker').pickadate({
 	selectMonths: true, // Creates a dropdown to control month
 	selectYears: 15 // Creates a dropdown of 15 years to control year
@@ -26,10 +21,8 @@ $(".dropdown-button").dropdown({ hover: false });
 
 $(".button-collapse").sideNav();
 
-
-
 // Collapsible
-var collapseHtml = '<ul class="collapsible" data-collapsible="accordion">' +
+let collapseHtml = '<ul class="collapsible" data-collapsible="accordion">' +
 	'<li>' +
 	'<div class="collapsible-header"><i class="material-icons">filter_drama</i>First</div>' +
 	'<div class="collapsible-body"><p>Lorem ipsum dolor sit amet.</p></div>' +
@@ -44,25 +37,27 @@ var collapseHtml = '<ul class="collapsible" data-collapsible="accordion">' +
 	'</li>' +
 	'</ul>';
 
-$(collapseHtml).collapsible({ accordion: false, onClose: function () { alert('Closed'); } });
-$(collapseHtml).collapsible({ accordion: true, onOpen: function () { alert('Opened'); } });
+$(collapseHtml).collapsible({ accordion: false, onClose: () => { alert('Closed'); } });
+$(collapseHtml).collapsible({ accordion: true, onOpen: () => { alert('Opened'); } });
+$(collapseHtml).collapsible('destroy');
+$(collapseHtml).collapsible('open', 0);
 
 // Dialogs - Toasts
 Materialize.toast('I am a toast!', 4000);
 Materialize.toast('I am a toast!', 3000, 'rounded');
 Materialize.toast('I am a toast!', 3000, 'rounded', () => console.log('callback'));
-var $toastContent = $('<span>I am toast content</span>');
+let $toastContent = $('<span>I am toast content</span>');
 Materialize.toast($toastContent, 5000);
 Materialize.Toast.removeAll();
 
 // Dialogs - Tooltip
-var tooltipHtml = '<a class="btn tooltipped" data-position="bottom" data-delay="50" data-tooltip="I am tooltip">Hover me!</a>';
+let tooltipHtml = '<a class="btn tooltipped" data-position="bottom" data-delay="50" data-tooltip="I am tooltip">Hover me!</a>';
 $(tooltipHtml).tooltip();
 $(tooltipHtml).tooltip({ delay: 100 });
 $(tooltipHtml).tooltip('remove');
 
 // DropDown
-var dropDownHtml = '<a class="dropdown-button btn" data-beloworigin="true" href="#" data-activates="dropdown1">Drop Me!</a>';
+let dropDownHtml = '<a class="dropdown-button btn" data-beloworigin="true" href="#" data-activates="dropdown1">Drop Me!</a>';
 $(dropDownHtml).dropdown({
 	inDuration: 300,
 	outDuration: 225,
@@ -72,16 +67,15 @@ $(dropDownHtml).dropdown({
 	belowOrigin: false, // Displays dropdown below the button
 	alignment: 'left', // Displays dropdown with edge aligned to the left of button
 	stopPropagation: false // Stops event propagation
-
 });
 $(dropDownHtml).dropdown({});
 
 // Media - materialbox
-var materialboxHtml = '<img class="materialboxed" width="650" src="images/sample-1.jpg">';
+let materialboxHtml = '<img class="materialboxed" width="650" src="images/sample-1.jpg">';
 $(materialboxHtml).materialbox();
 
 // Media - slider
-var sliderHtml = '<div class="slider">' +
+let sliderHtml = '<div class="slider">' +
 	'<ul class="slides">' +
 	'<li>' +
 	'<img src="http://lorempixel.com/580/250/nature/1"> <!-- random image -->' +
@@ -122,7 +116,6 @@ $(sliderHtml).slider({ indicators: true, height: 5, transition: 4 });
 $(sliderHtml).slider({ indicators: true, height: 5, transition: 4, interval: 5 });
 
 // Carousel
-
 $('.carousel').carousel();
 $('.carousel').carousel({});
 $('.carousel').carousel({ duration: 200, dist: -100, shift: 500, padding: 6000, fullWidth: true, indicators: false, noWrap: false });
@@ -134,9 +127,8 @@ $('.carousel').carousel('next', 3); // Move next n times.
 $('.carousel').carousel('prev');
 $('.carousel').carousel('prev', 4); // Move prev n times.
 
-
 // Modals
-var modalhtml = '<div id="modal1" class="modal bottom-sheet">' +
+let modalhtml = '<div id="modal1" class="modal bottom-sheet">' +
 	'<div class="modal-content">' +
 	'<h4>Modal Header</h4>' +
 	'<p>A bunch of text</p>' +
@@ -148,10 +140,10 @@ var modalhtml = '<div id="modal1" class="modal bottom-sheet">' +
 $(modalhtml).modal('open');
 $(modalhtml).modal('close');
 $(modalhtml).modal('open', {
-	complete: function () { console.log('model close event') } // Callback for Modal close
+	complete: () => console.log('model close event') // Callback for Modal close
 });
 
-var modalTriggerHtml = '<button data-target="modal1" class="btn modal-trigger">Modal</button>';
+let modalTriggerHtml = '<button data-target="modal1" class="btn modal-trigger">Modal</button>';
 $(modalTriggerHtml).modal();
 $(modalTriggerHtml).modal({});
 $(modalTriggerHtml).modal({ dismissible: true });
@@ -161,10 +153,19 @@ $(modalTriggerHtml).modal({ dismissible: true, opacity: 1, inDuration: 100, outD
 $(modalTriggerHtml).modal({ dismissible: true, opacity: 1, inDuration: 100, outDuration: 100, startingTop: "4%" });
 $(modalTriggerHtml).modal({ dismissible: true, opacity: 1, inDuration: 100, outDuration: 100, startingTop: "4%", endingTop: "10%" });
 $(modalTriggerHtml).modal({ dismissible: true, opacity: 1, inDuration: 100, outDuration: 100, startingTop: "4%", endingTop: "10%", ready: () => console.log('ready') });
-$(modalTriggerHtml).modal({ dismissible: true, opacity: 1, inDuration: 100, outDuration: 100, startingTop: "4%", endingTop: "10%", ready: () => console.log('ready'), complete: () => console.log('complete') });
+$(modalTriggerHtml).modal({
+	dismissible: true,
+	opacity: 1,
+	inDuration: 100,
+	outDuration: 100,
+	startingTop: "4%",
+	endingTop: "10%",
+	ready: () => console.log('ready'),
+	complete: () => console.log('complete'),
+});
 
 // Parallax
-var parallaxHtml = '<div class="parallax-container">' +
+let parallaxHtml = '<div class="parallax-container">' +
 	'<div class="parallax"><img src="images/parallax1.jpg"></div>' +
 	'</div>';
 $(parallaxHtml).parallax();
@@ -176,17 +177,16 @@ $('<div />').pushpin({ top: 1, bottom: 1 });
 $('<div />').pushpin({ top: 1, bottom: 1, offset: 2 });
 
 // ScrollFire
-var options = [
+let options = [
 	{ selector: '.class', offset: 200, callback: 'console.log(".class")' },
 	{ selector: '.other-class', offset: 200, callback: 'console.log(".other-class")' },
 ];
 Materialize.scrollFire(options);
 
-
 $(".scrollspy").scrollSpy();
 
 // Side-Nav
-var sideNavHtml = '<nav>' +
+let sideNavHtml = '<nav>' +
 	'<ul class="right hide-on-med-and-down">' +
 	'<li><a href="#!">First Sidebar Link</a></li>' +
 	'<li><a href="#!">Second Sidebar Link</a></li>' +
@@ -203,11 +203,13 @@ $(sideNavHtml).sideNav({ menuWidth: 100 });
 $(sideNavHtml).sideNav({ menuWidth: 100, edge: 'right' });
 $(sideNavHtml).sideNav({ menuWidth: 100, edge: 'right', closeOnClick: true });
 $(sideNavHtml).sideNav({ menuWidth: 100, edge: 'right', closeOnClick: true, draggable: false });
+$(sideNavHtml).sideNav({ menuWidth: 100, edge: 'right', closeOnClick: true, draggable: false, onClose: () => console.log('onClose') });
+$(sideNavHtml).sideNav({ menuWidth: 100, edge: 'right', closeOnClick: true, draggable: false, onClose: () => console.log('onClose'), onOpen: () => console.log('onOpen') });
 $(sideNavHtml).sideNav("show");
 $(sideNavHtml).sideNav("hide");
 
 // Tabs
-var tabsHtml = '<div class="row">' +
+let tabsHtml = '<div class="row">' +
 	'<div class="col s12">' +
 	'<ul class="tabs">' +
 	'<li class="tab col s3"><a href="#test1">Test 1</a></li>' +
@@ -224,7 +226,7 @@ var tabsHtml = '<div class="row">' +
 
 $(tabsHtml).tabs();
 $(tabsHtml).tabs('select_tab', 'test1');
-$(tabsHtml).tabs({ onShow: (currentTab: any) => { console.log(currentTab) }, swipeable: false, responsiveThreshold: 5000 });
+$(tabsHtml).tabs({ onShow: (currentTab: any) => console.log(currentTab), swipeable: false, responsiveThreshold: 5000 });
 
 // Transitions
 Materialize.showStaggeredList('#staggered-test');
@@ -253,18 +255,18 @@ $('.chips-placeholder').material_chip({
 });
 $('.chips-autocomplete').material_chip({
 	autocompleteData: {
-		'Apple': null,
-		'Microsoft': null,
-		'Google': null
+		Apple: null,
+		Microsoft: null,
+		Google: null
 	}
 });
 
 $('.chips-autocomplete').material_chip({
 	autocompleteOptions: {
 		data: {
-			'Apple': null,
-			'Microsoft': null,
-			'Google': null
+			Apple: null,
+			Microsoft: null,
+			Google: null
 		},
 		limit: Infinity,
 		minLength: 1
@@ -282,21 +284,21 @@ $('.timepicker').pickatime({
 	canceltext: 'Cancel', // Text for cancel-button
 	autoclose: false, // automatic close timepicker
 	ampmclickable: true, // make AM PM clickable
-	aftershow: function () { } //Function for after opening timepicker
+	aftershow: () => {} // Function for after opening timepicker
 });
 
 $('input.autocomplete').autocomplete({
 	data: {
-		"Apple": null,
-		"Microsoft": null,
-		"Google": 'https://placehold.it/250x250'
+		Apple: null,
+		Microsoft: null,
+		Google: 'https://placehold.it/250x250'
 	},
 	limit: 20, // The max amount of results that can be shown at once. Default: Infinity.
-	onAutocomplete: function (val) {
+	onAutocomplete: (val) => {
 		// Callback function when value is autcompleted.
 	},
 	minLength: 1, // The minimum length of the input for the autocomplete to start. Default: 1.
 });
 
 $('.tap-target').tapTarget('open');
-$('.tap-target').tapTarget('close');
\ No newline at end of file
+$('.tap-target').tapTarget('close');
diff --git a/types/materialize-css/v0/tsconfig.json b/types/materialize-css/v0/tsconfig.json
new file mode 100644
index 0000000000..4f000774ea
--- /dev/null
+++ b/types/materialize-css/v0/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "materialize-css": [
+                "materialize-css/v0"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "materialize-css-tests.ts"
+    ]
+}
diff --git a/types/materialize-css/v0/tslint.json b/types/materialize-css/v0/tslint.json
new file mode 100644
index 0000000000..99070fa5c7
--- /dev/null
+++ b/types/materialize-css/v0/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "ban-types": false,
+    "prefer-method-signature": false
+  }
+}
diff --git a/types/math3d/index.d.ts b/types/math3d/index.d.ts
index 626aed9df6..d7df15850c 100644
--- a/types/math3d/index.d.ts
+++ b/types/math3d/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for math3d 0.2
 // Project: https://github.com/adragonite/math3d
 // Definitions by: Laszlo Jakab <https://github.com/laszlojakab>
+//                 Jim Smart <https://github.com/jimsmart>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export class Vector3 {
@@ -148,7 +149,7 @@ export class Transform {
     position: Vector3;
     right: Vector3;
     root: Transform;
-    rotation: Vector3;
+    rotation: Quaternion;
     up: Vector3;
     worldToLocalMatrix: Matrix4x4;
 
diff --git a/types/mathjax/tslint.json b/types/mathjax/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mathjax/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index f5d669a028..fa39c8b0d5 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -30,7 +30,7 @@ declare namespace mathjs {
 
 		uninitialized: any;
 		version: string;
-		
+
 		config(options: any): void;
 
                 expression: MathNode;
@@ -532,7 +532,7 @@ declare namespace mathjs {
 		/**
 		 * 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(value?: string|number|boolean|MathArray|Matrix|Unit|BigNumber): number|MathArray|Matrix;
 		number(unit: Unit, valuelessUnit: Unit|string): number|MathArray|Matrix;
 
 		/**
@@ -555,6 +555,13 @@ declare namespace mathjs {
 		unit(unit: string): Unit;
 		unit(value: number, unit: string): Unit;
 
+		/**
+                 * Create a user-defined unit and register it with the Unit type.
+		 */
+		createUnit(name: string): Unit;
+		createUnit(name: string, definition: string|UnitDefinition, options?: CreateUnitOptions): Unit;
+		createUnit(units: {[name: string]: string|UnitDefinition}, options?: CreateUnitOptions): Unit;
+
 		/**
 		 * Parse and compile an expression. Returns a an object with a function eval([scope]) to evaluate the compiled expression.
 		 */
@@ -1344,6 +1351,17 @@ declare namespace mathjs {
 		toNumber(unit: string): number;
 	}
 
+	export interface CreateUnitOptions {
+		override?: boolean;
+	}
+
+	export interface UnitDefinition {
+		definition?: string|Unit;
+		prefixes?: string;
+		offset?: number;
+		aliases?: string[];
+	}
+
 	export interface Index {
 
 	}
@@ -1396,7 +1414,7 @@ declare namespace mathjs {
                  * @return {[type]}                 [description]
                  */
                 forEach(callback: (node: MathNode, path: string, parent: MathNode)=>any): MathNode[];
-		
+
 
                 /**
                 * `traverse(callback)`
@@ -1427,10 +1445,10 @@ declare namespace mathjs {
                 traverse(callback: (node: MathNode, path: string, parent: MathNode)=> void): any;
 //addEventListener(ev: 'change', callback: (ev: EditorChangeEvent) => any);
                 /**
-                 * Recursively transform an expression tree via a transform function. Similar to Array.map, 
-                 * but recursively executed on all nodes in the expression tree. The callback function is a 
-                 * mapping function accepting a node, and returning a replacement for the node or the original node. 
-                 * Function callback is called as callback(node: Node, path: string, parent: Node) for every node in 
+                 * Recursively transform an expression tree via a transform function. Similar to Array.map,
+                 * but recursively executed on all nodes in the expression tree. The callback function is a
+                 * mapping function accepting a node, and returning a replacement for the node or the original node.
+                 * Function callback is called as callback(node: Node, path: string, parent: Node) for every node in
                  * the tree, and must return a Node. Parameter path is a string containing a relative JSON Path.
                  *
                  * For example, to replace all nodes of type SymbolNode having name ‘x’ with a ConstantNode with value 3:
@@ -1449,9 +1467,9 @@ declare namespace mathjs {
                  */
                 transform(callback: (node: MathNode, path: string, parent: MathNode)=>MathNode): MathNode;
                 /**
-                 * Transform a node. Creates a new Node having it’s childs be the results of calling the provided 
-                 * callback function for each of the childs of the original node. The callback function is called 
-                 * as `callback(child: Node, path: string, parent: Node)` and must return a Node. 
+                 * Transform a node. Creates a new Node having it’s childs be the results of calling the provided
+                 * callback function for each of the childs of the original node. The callback function is called
+                 * as `callback(child: Node, path: string, parent: Node)` and must return a Node.
                  * Parameter path is a string containing a relative JSON Path.
                  *
                  *
@@ -2281,4 +2299,3 @@ declare namespace mathjs {
 declare module 'mathjs'{
 	export = math;
 }
-
diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index 3d4d87d72a..64e5e0673b 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -496,6 +496,35 @@ Units examples
 	var b = math.unit('0.1m'); // 100 mm
 	console.log();
 
+	// creating units
+	math.createUnit('foo');
+	math.createUnit('furlong', '220 yards');
+	math.createUnit('furlong', '220 yards', {override: true});
+	math.createUnit('fahrenheit', {definition: '0.555556 kelvin', offset: 459.67});
+	math.createUnit('fahrenheit', {definition: '0.555556 kelvin', offset: 459.67}, {override: true});
+	math.createUnit('knot', {definition: '0.514444 m/s', aliases: ['knots', 'kt', 'kts']});
+	math.createUnit('knot', {definition: '0.514444 m/s', aliases: ['knots', 'kt', 'kts']}, {override: true});
+	math.createUnit('knot', {
+		definition: '0.514444 m/s',
+		aliases: ['knots', 'kt', 'kts'],
+		prefixes: 'long'
+	}, {override: true});
+	math.createUnit( {
+		foo: {
+			prefixes: 'long'
+		},
+		bar: '40 foo',
+		baz: {
+			definition: '1 bar/hour',
+			prefixes: 'long'
+		}
+	}, {
+		override: true
+	});
+	// use Unit as definition
+	math.createUnit('c', {definition: b});
+	math.createUnit('c', {definition: b}, {override: true});
+
 	// 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
diff --git a/types/mathjs/tslint.json b/types/mathjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mathjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/matter-js/tslint.json b/types/matter-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/matter-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/maxmind/tslint.json b/types/maxmind/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/maxmind/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mcustomscrollbar/tslint.json b/types/mcustomscrollbar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mcustomscrollbar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/md5/tslint.json b/types/md5/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/md5/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mdns/tslint.json b/types/mdns/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mdns/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mdurl/decode.d.ts b/types/mdurl/decode.d.ts
new file mode 100644
index 0000000000..f45d0854b2
--- /dev/null
+++ b/types/mdurl/decode.d.ts
@@ -0,0 +1,7 @@
+declare namespace decode {
+    const defaultChars: string;
+    const componentChars: string;
+}
+declare function decode(input: string, exclude?: string): string;
+
+export = decode;
diff --git a/types/mdurl/encode.d.ts b/types/mdurl/encode.d.ts
new file mode 100644
index 0000000000..7848d3c85e
--- /dev/null
+++ b/types/mdurl/encode.d.ts
@@ -0,0 +1,7 @@
+declare namespace encode {
+    const defaultChars: string;
+    const componentChars: string;
+}
+declare function encode(str: string, exclude?: string, keepEscaped?: boolean): string;
+
+export = encode;
diff --git a/types/mdurl/format.d.ts b/types/mdurl/format.d.ts
new file mode 100644
index 0000000000..2638c76007
--- /dev/null
+++ b/types/mdurl/format.d.ts
@@ -0,0 +1,5 @@
+import { Url } from './'
+
+declare function format(url: Url): string;
+
+export = format;
diff --git a/types/mdurl/index.d.ts b/types/mdurl/index.d.ts
new file mode 100644
index 0000000000..103ca22940
--- /dev/null
+++ b/types/mdurl/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for mdurl 1.0
+// Project: https://github.com/markdown-it/mdurl#readme
+// Definitions by: Junyoung Choi <https://github.com/rokt33r>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+import encode = require('./encode');
+import decode = require('./decode');
+import parse = require('./parse');
+import format = require('./format');
+
+export interface Url {
+    protocol: string;
+    slashes: string;
+    auth: string;
+    port: string;
+    hostname: string;
+    hash: string;
+    search: string;
+    pathname: string;
+}
+
+export {
+    encode,
+    decode,
+    parse,
+    format
+};
diff --git a/types/mdurl/mdurl-tests.ts b/types/mdurl/mdurl-tests.ts
new file mode 100644
index 0000000000..28c1141ef5
--- /dev/null
+++ b/types/mdurl/mdurl-tests.ts
@@ -0,0 +1,32 @@
+import mdurl = require('mdurl');
+import { Url } from 'mdurl';
+
+const encoded: string = mdurl.encode('%%%');
+// return '%25%25%25'
+
+const decoded: string = mdurl.decode(encoded);
+// return '%%%'
+
+const url: Url = mdurl.parse('HTTP://www.example.com/');
+// return {
+//     'protocol': 'HTTP:',
+//     'slashes': true,
+//     'hostname': 'www.example.com',
+//     'pathname': '/'
+// } as Url
+
+const urlStr: string = mdurl.format(url);
+// 'HTTP://www.example.com/'
+
+import encode = require('mdurl/encode');
+import decode = require('mdurl/decode');
+import parse = require('mdurl/parse');
+import format = require('mdurl/format');
+
+const encoded2: string = encode('%%%');
+
+const decoded2: string = decode(encoded);
+
+const url2: Url = parse('HTTP://www.example.com/');
+
+const urlStr2: string = format(url);
diff --git a/types/mdurl/parse.d.ts b/types/mdurl/parse.d.ts
new file mode 100644
index 0000000000..cd2c012caa
--- /dev/null
+++ b/types/mdurl/parse.d.ts
@@ -0,0 +1,5 @@
+import { Url } from './'
+
+declare function parse(input: string, slashesDenoteHost?: boolean): Url;
+
+export = parse;
diff --git a/types/mdurl/tsconfig.json b/types/mdurl/tsconfig.json
new file mode 100644
index 0000000000..c00c56ef07
--- /dev/null
+++ b/types/mdurl/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "mdurl-tests.ts"
+    ]
+}
diff --git a/types/mdurl/tslint.json b/types/mdurl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mdurl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/medium-editor/index.d.ts b/types/medium-editor/index.d.ts
index 40ef6b9513..c5724fd665 100644
--- a/types/medium-editor/index.d.ts
+++ b/types/medium-editor/index.d.ts
@@ -1,26 +1,22 @@
-// Type definitions for medium-editor v5.0.0
+// Type definitions for medium-editor 5.0
 // Project: https://yabwe.github.io/medium-editor/
 // Definitions by: keika299 <https://github.com/keika299>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace MediumEditor {
-
     export interface MediumEditor {
-
         // Initialization Functions
-        new (elements: elementType, options?: CoreOptions): MediumEditor;
+        new(elements: elementType, options?: CoreOptions): MediumEditor;
         destroy(): void;
         setup(): void;
         addElements(elements: elementType): void;
         removeElements(elements: elementType): void;
 
         // Event Functions
-        on(targets: HTMLElement | NodeList, event: string, listener: (event: Event) => void, useCapture: boolean): MediumEditor;
         on(targets: HTMLElement | NodeList, event: string, listener: EventListenerOrEventListenerObject, useCapture: boolean): MediumEditor;
-        off(targets: HTMLElement | NodeList, event: string, listener: Function, useCapture: boolean): MediumEditor;
         off(targets: HTMLElement | NodeList, event: string, listener: EventListenerOrEventListenerObject, useCapture: boolean): MediumEditor;
         subscribe(name: string, listener: (data: any, editable: HTMLElement) => void): MediumEditor;
-        unsubscribe(name: string, listener: Function): MediumEditor;
+        unsubscribe(name: string, listener: (data: any, editable: HTMLElement) => void): MediumEditor;
         trigger(name: string, data: any, editable: HTMLElement): MediumEditor;
 
         // Selection Functions
@@ -39,14 +35,13 @@ declare namespace MediumEditor {
         // Editor Action Functions
         cleanPaste(text: string): void;
         createLink(opts: CreateLinkOptions): void;
-        execAction(action: string, opts?: string): boolean;
-        execAction(action: string, opts?: CreateLinkOptions): boolean;
-        pasteHTML(html: string, options?:PasteHTMLOptions): void;
+        execAction(action: string, opts?: string | CreateLinkOptions): boolean;
+        pasteHTML(html: string, options?: PasteHTMLOptions): void;
         queryCommandState(action: string): boolean;
 
         // Helper Functions
         checkContentChanged(editable?: HTMLElement): void;
-        delay(fn: Function): void;
+        delay(fn: () => any): void;
         getContent(index?: number): string;
         getExtensionByName(name: string): any;
         resetContent(element: HTMLElement): void;
@@ -62,8 +57,8 @@ declare namespace MediumEditor {
             minor: number;
             revision: number;
             preRelease: string;
-            toString: Function;
-        }
+            toString(): string;
+        };
     }
 
     export interface CoreOptions {
@@ -94,7 +89,7 @@ declare namespace MediumEditor {
     export interface ToolbarOptions {
         align?: string;
         allowMultiParagraphSelection?: boolean;
-        buttons?: string[];
+        buttons?: Button[];
         diffLeft?: number;
         diffTop?: number;
         firstButtonClass?: string;
@@ -131,11 +126,11 @@ declare namespace MediumEditor {
     export interface PasteOptions {
         forcePlainText?: boolean;
         cleanPastedHTML?: boolean;
-        preCleanReplacements?: any[],
-        cleanReplacements?: any[],
+        preCleanReplacements?: any[];
+        cleanReplacements?: any[];
         cleanAttrs?: string[];
         cleanTags?: string[];
-        unwrapTags?: string[],
+        unwrapTags?: string[];
     }
 
     export interface KeyboardCommandsOptions {
@@ -156,14 +151,31 @@ declare namespace MediumEditor {
         buttonClass?: string;
     }
 
-    export interface PasteHTMLOptions{
+    export interface PasteHTMLOptions {
         cleanAttrs?: string[];
         cleanTags?: string[];
         unwrapTags?: string[];
     }
 
+    export interface ButtonOptions {
+        name?: string;
+        action?: string;
+        aria?: string;
+        tagNames?: string[];
+        style?: { prop: string, value: string };
+        useQueryState?: boolean;
+        contentDefault?: string;
+        contentFA?: string;
+        classList?: string[];
+        attrs?: { [key: string]: string };
+    }
+
+    export type Button = string | ButtonOptions;
     export type elementType = string | HTMLElement | HTMLElement[] | NodeList | NodeListOf<Element> | HTMLCollection;
-    export type selectionObject = {start: number, end: number};
+    export interface selectionObject {
+        start: number;
+        end: number;
+    }
 }
 
 declare var MediumEditor: MediumEditor.MediumEditor;
diff --git a/types/medium-editor/medium-editor-tests.ts b/types/medium-editor/medium-editor-tests.ts
index 5dfc2f1612..662fbdc455 100644
--- a/types/medium-editor/medium-editor-tests.ts
+++ b/types/medium-editor/medium-editor-tests.ts
@@ -1,20 +1,22 @@
+import MediumEditor = require('medium-editor');
+
 /**
  * Test document usage
  */
 
 // Init Example
-var editor = new MediumEditor('.editable');
+const editor1 = new MediumEditor('.editable');
 
-var elements = document.querySelectorAll('.editable');
-var editor = new MediumEditor(elements);
+const elements = document.querySelectorAll('.editable');
+const editor2 = new MediumEditor(elements);
 
-var editor = new MediumEditor(elements,{});
+const editor3 = new MediumEditor(elements, {});
 
-var editor = new MediumEditor('.editable', {
+const editor4 = new MediumEditor('.editable', {
     delay: 1000,
     targetBlank: true,
     toolbar: {
-        buttons: ['bold', 'italic', 'quote'],
+        buttons: ['bold', 'italic', 'quote', { name: 'underline', classList: ['icon-strike'] }],
         diffLeft: 25,
         diffTop: 10,
     },
@@ -37,8 +39,7 @@ var editor = new MediumEditor('.editable', {
     }
 });
 
-
 // API Example
 
-var editor = new MediumEditor('.editable');
-editor.subscribe('editableInput', function (event, editable) {});
+const editor = new MediumEditor('.editable');
+editor.subscribe('editableInput', (event: any, editable: HTMLElement) => {});
diff --git a/types/medium-editor/tslint.json b/types/medium-editor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/medium-editor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/memcached/index.d.ts b/types/memcached/index.d.ts
index b6574a0dd4..fffbb57c82 100644
--- a/types/memcached/index.d.ts
+++ b/types/memcached/index.d.ts
@@ -23,28 +23,24 @@ declare class Memcached extends events.EventEmitter {
      * Touches the given key.
      * @param key The key
      * @param lifetime After how long should the key expire measured in seconds
-     * @param cb
      */
     touch(key: string, lifetime: number, cb: (this: Memcached.CommandData, err: any) => void): void;
 
     /**
      * Get the value for the given key.
      * @param key The key
-     * @param cb
      */
     get(key: string, cb: (this: Memcached.CommandData, err: any, data: any) => void): void;
 
     /**
      * Get the value and the CAS id.
      * @param key The key
-     * @param cb
      */
     gets(key: string, cb: (this: Memcached.CommandData, err: any, data: {[key: string]: any, cas: string}) => void): void;
 
     /**
      * Retrieves a bunch of values from multiple keys.
      * @param keys all the keys that needs to be fetched
-     * @param cb
      */
     getMulti(keys: string[], cb: (this: undefined, err: any, data: {[key: string]: any}) => void): void;
 
@@ -53,8 +49,6 @@ declare class Memcached extends events.EventEmitter {
      *
      * @param key The key
      * @param value Either a buffer, JSON, number or string that you want to store.
-     * @param lifetime
-     * @param cb
      */
     set(key: string, value: any, lifetime: number, cb: (this: Memcached.CommandData, err: any, result: boolean) => void): void;
 
@@ -62,8 +56,6 @@ declare class Memcached extends events.EventEmitter {
      * Replaces the value in memcached.
      * @param key The key
      * @param value Either a buffer, JSON, number or string that you want to store.
-     * @param lifetime
-     * @param cb
      */
     replace(key: string, value: any, lifetime: number, cb: (this: Memcached.CommandData, err: any, result: boolean) => void): void;
 
@@ -71,8 +63,6 @@ declare class Memcached extends events.EventEmitter {
      * Add the value, only if it's not in memcached already.
      * @param key The key
      * @param value Either a buffer, JSON, number or string that you want to store.
-     * @param lifetime
-     * @param cb
      */
     add(key: string, value: any, lifetime: number, cb: (this: Memcached.CommandData, err: any, result: boolean) => void): void;
 
@@ -80,9 +70,6 @@ declare class Memcached extends events.EventEmitter {
      * Add the value, only if it matches the given CAS value.
      * @param key The key
      * @param value Either a buffer, JSON, number or string that you want to store.
-     * @param cas
-     * @param lifetime
-     * @param cb
      */
     cas(key: string, value: any, cas: string, lifetime: number, cb: (this: Memcached.CommandData, err: any, result: boolean) => void): void;
 
@@ -90,7 +77,6 @@ declare class Memcached extends events.EventEmitter {
      * Add the given value string to the value of an existing item.
      * @param key The key
      * @param value Either a buffer, JSON, number or string that you want to store.
-     * @param cb
      */
     append(key: string, value: any, cb: (this: Memcached.CommandData, err: any, result: boolean) => void): void;
 
@@ -98,7 +84,6 @@ declare class Memcached extends events.EventEmitter {
      * Add the given value string to the value of an existing item.
      * @param key The key
      * @param value Either a buffer, JSON, number or string that you want to store.
-     * @param cb
      */
     prepend(key: string, value: any, cb: (this: Memcached.CommandData, err: any, result: boolean) => void): void;
 
@@ -106,7 +91,6 @@ declare class Memcached extends events.EventEmitter {
      * Increment a given key.
      * @param key The key
      * @param amount The increment
-     * @param cb
      */
     incr(key: string, amount: number, cb: (this: Memcached.CommandData, err: any, result: boolean|number) => void): void;
 
@@ -114,59 +98,47 @@ declare class Memcached extends events.EventEmitter {
      * Decrement a given key.
      * @param key The key
      * @param amount The decrement
-     * @param cb
      */
     decr(key: string, amount: number, cb: (this: Memcached.CommandData, err: any, result: boolean|number) => void): void;
 
     /**
      * Remove the key from memcached.
      * @param key The key
-     * @param cb
      */
     del(key: string, cb: (this: Memcached.CommandData, err: any, result: boolean) => void): void;
 
     /**
      * Retrieves the version number of your server.
-     * @param cb
      */
     version(cb: (err: any, version: Memcached.VersionData[]) => void): void;
 
     /**
      * Retrieves your stats settings.
-     * @param cb
      */
     settings(cb: (err: any, settings: Memcached.StatusData[]) => void): void;
 
     /**
      * Retrieves stats from your memcached server.
-     * @param cb
      */
     stats(cb: (err: any, stats: Memcached.StatusData[]) => void): void;
 
     /**
      * Retrieves stats slabs information.
-     * @param cb
      */
     slabs(cb: (err: any, stats: Memcached.StatusData[]) => void): void;
 
     /**
      * Retrieves stats items information.
-     * @param cb
      */
     items(cb: (err: any, stats: Memcached.StatusData[]) => void): void;
 
     /**
      * Inspect cache, see examples for a detailed explanation.
-     * @param server
-     * @param slabid
-     * @param number
-     * @param cb
      */
     cachedump(server: string, slabid: number, number: number, cb: (err: any, cachedump: Memcached.CacheDumpData|Memcached.CacheDumpData[]) => void): void;
 
     /**
      * Flushes the memcached server.
-     * @param cb
      */
     flush(cb: (this: undefined, err: any, results: boolean[]) => void): void;
 
diff --git a/types/memory-cache/index.d.ts b/types/memory-cache/index.d.ts
index 4825fbe7a5..3c40a4b6dd 100644
--- a/types/memory-cache/index.d.ts
+++ b/types/memory-cache/index.d.ts
@@ -1,20 +1,37 @@
-// Type definitions for memory-cache
+// Type definitions for memory-cache 0.2
 // Project: https://github.com/ptarjan/node-cache
 // Definitions by: Jeff Goddard <https://github.com/jedigo>
+//                 Travis Thieman <https://github.com/thieman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Imported from: https://github.com/soywiz/typescript-node-definitions/memory-cache.d.ts
+// Originally imported from: https://github.com/soywiz/typescript-node-definitions/memory-cache.d.ts
 
+export class CacheClass<K, V> {
+    put(key: K, value: V, time?: number, timeoutCallback?: (key: K, value: V) => void): V;
+    get(key: K): V;
+    del(key: K): void;
+    clear(): void;
 
-export declare function put(key: any, value: any, time?: number, timeoutCallback?: (key: any, value: any) => void): void;
-export declare function get(key: any): any;
-export declare function del(key: any): void;
-export declare function clear(): void;
+    size(): number;
+    memsize(): number;
 
-export declare function size(): number;
-export declare function memsize(): number;
+    debug(bool: boolean): void;
+    hits(): number;
+    misses(): number;
+    keys(): K[];
+}
 
-export declare function debug(bool: boolean): void;
-export declare function hits(): number;
-export declare function misses(): number;
-export declare function keys(): any;
+export const Cache: typeof CacheClass;
+
+export function put<V>(key: any, value: V, time?: number, timeoutCallback?: (key: any, value: any) => void): V;
+export function get(key: any): any;
+export function del(key: any): void;
+export function clear(): void;
+
+export function size(): number;
+export function memsize(): number;
+
+export function debug(bool: boolean): void;
+export function hits(): number;
+export function misses(): number;
+export function keys(): any[];
diff --git a/types/memory-cache/memory-cache-tests.ts b/types/memory-cache/memory-cache-tests.ts
index 15fad71f10..4cf5bc2a70 100644
--- a/types/memory-cache/memory-cache-tests.ts
+++ b/types/memory-cache/memory-cache-tests.ts
@@ -1,19 +1,16 @@
-
 import memoryCache = require('memory-cache');
 
-var key: any;
-var value: any;
-var bool: boolean;
-var num: number;
+const key: any = 'sampleKey';
+let value: string;
+const bool = false;
+let num: number;
+let returnedValue: string;
 
-memoryCache.put(key, value);
-memoryCache.put(key, value, num);
-memoryCache.put(key, value, num, (key) => {
+returnedValue = memoryCache.put(key, value);
+returnedValue = memoryCache.put(key, value, num);
+returnedValue = memoryCache.put(key, value, num, (key) => { });
+returnedValue = memoryCache.put(key, value, num, (key, value) => { });
 
-});
-memoryCache.put(key, value, num, (key, value) => {
-
-});
 value = memoryCache.get(key);
 memoryCache.del(key);
 memoryCache.clear();
@@ -24,3 +21,14 @@ num = memoryCache.memsize();
 memoryCache.debug(bool);
 num = memoryCache.hits();
 num = memoryCache.misses();
+
+const customCache = new memoryCache.Cache<string, boolean>();
+
+const customKey = 'customKey';
+let customValue: boolean;
+let customKeys: string[];
+
+customValue = customCache.put(customKey, customValue);
+customCache.get(customKey);
+customCache.del(customKey);
+customKeys = customCache.keys();
diff --git a/types/memory-cache/tslint.json b/types/memory-cache/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/memory-cache/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/memory-fs/tslint.json b/types/memory-fs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/memory-fs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/memwatch-next/tslint.json b/types/memwatch-next/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/memwatch-next/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/menubar/package.json b/types/menubar/package.json
index c3d355fb55..ea4493add7 100644
--- a/types/menubar/package.json
+++ b/types/menubar/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "electron": "^1.6.11"
     }
-}
\ No newline at end of file
+}
diff --git a/types/menubar/tslint.json b/types/menubar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/menubar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/merge-stream/index.d.ts b/types/merge-stream/index.d.ts
index 90f91ee327..5a5493b06e 100644
--- a/types/merge-stream/index.d.ts
+++ b/types/merge-stream/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for merge-stream v1.0.0
+// Type definitions for merge-stream v1.1.0
 // Project: https://github.com/grncdr/merge-stream
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>, Tom X. Tobin <http://tomxtobin.com/>
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>, Tom X. Tobin <http://tomxtobin.com/>, Daniel Zazula <https://github.com/daniel-zazula>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -12,5 +12,6 @@ interface IMergedStream extends NodeJS.ReadWriteStream {
     isEmpty(): boolean;
 }
 
+declare function merge<T extends NodeJS.ReadableStream>(streams: T[]): IMergedStream;
 declare function merge<T extends NodeJS.ReadableStream>(...streams: T[]): IMergedStream;
 export = merge;
diff --git a/types/merge-stream/merge-stream-tests.ts b/types/merge-stream/merge-stream-tests.ts
index 67a690e824..a12e7f9c65 100644
--- a/types/merge-stream/merge-stream-tests.ts
+++ b/types/merge-stream/merge-stream-tests.ts
@@ -16,3 +16,8 @@ var stream5 = new Stream();
 merged.add([stream4, stream5]);
 
 merged.isEmpty();
+
+var stream6 = new Stream();
+var stream7 = new Stream();
+var streamArray = [stream6, stream7];
+var merged2 = merge(streamArray);
diff --git a/types/merge-stream/tslint.json b/types/merge-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/merge-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/merge2/index.d.ts b/types/merge2/index.d.ts
index c9c6ddb606..e5f836658e 100644
--- a/types/merge2/index.d.ts
+++ b/types/merge2/index.d.ts
@@ -52,7 +52,7 @@ declare namespace merge2 {
          *             If you set end === false in options, this event give you a notice that
          *             you should add more streams to merge, or end the mergedStream.
          *
-         * @param      {string} event  The 'queueDrain' event
+         * @param event The 'queueDrain' event
          *
          * @return     This stream
          */
diff --git a/types/merge2/tsconfig.json b/types/merge2/tsconfig.json
index aeb71329c3..e39e70032b 100644
--- a/types/merge2/tsconfig.json
+++ b/types/merge2/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/meshblu/tslint.json b/types/meshblu/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meshblu/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mess/tslint.json b/types/mess/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mess/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/messenger/tslint.json b/types/messenger/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/messenger/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor-accounts-phone/tslint.json b/types/meteor-accounts-phone/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meteor-accounts-phone/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor-collection-hooks/package.json b/types/meteor-collection-hooks/package.json
index 1e674af91c..d8f338632d 100644
--- a/types/meteor-collection-hooks/package.json
+++ b/types/meteor-collection-hooks/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "meteor-typings": "^1.3.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/meteor-jboulhous-dev/tslint.json b/types/meteor-jboulhous-dev/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meteor-jboulhous-dev/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor-persistent-session/tslint.json b/types/meteor-persistent-session/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meteor-persistent-session/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor-prime8consulting-oauth2/tslint.json b/types/meteor-prime8consulting-oauth2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meteor-prime8consulting-oauth2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor-publish-composite/index.d.ts b/types/meteor-publish-composite/index.d.ts
index cd8b93b816..a5f6205913 100644
--- a/types/meteor-publish-composite/index.d.ts
+++ b/types/meteor-publish-composite/index.d.ts
@@ -6,75 +6,60 @@
 /// <reference types="meteor" />
 
 declare interface PublishCompositeConfigN {
-    children? : PublishCompositeConfigN[];
+    children?: PublishCompositeConfigN[];
     find(
-        ...args : any[]
-    ) : Mongo.Cursor<any>;
+        ...args: any[]
+    ): Mongo.Cursor<any>;
 }
 
 declare interface PublishCompositeConfig4<InLevel1, InLevel2, InLevel3, InLevel4, OutLevel> {
-    children? : PublishCompositeConfigN[];
+    children?: PublishCompositeConfigN[];
     find(
-        arg4 : InLevel4,
-        arg3 : InLevel3,
-        arg2 : InLevel2,
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
+        arg4: InLevel4,
+        arg3: InLevel3,
+        arg2: InLevel2,
+        arg1: InLevel1
+    ): Mongo.Cursor<OutLevel>;
 }
 
 declare interface PublishCompositeConfig3<InLevel1, InLevel2, InLevel3, OutLevel> {
-    children? : PublishCompositeConfig4<InLevel1, InLevel2, InLevel3, OutLevel, any>[];
+    children?: PublishCompositeConfig4<InLevel1, InLevel2, InLevel3, OutLevel, any>[];
     find(
-        arg3 : InLevel3,
-        arg2 : InLevel2,
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
+        arg3: InLevel3,
+        arg2: InLevel2,
+        arg1: InLevel1
+    ): Mongo.Cursor<OutLevel>;
 }
 
 declare interface PublishCompositeConfig2<InLevel1, InLevel2, OutLevel> {
-    children? : PublishCompositeConfig3<InLevel1, InLevel2, OutLevel, any>[];
+    children?: PublishCompositeConfig3<InLevel1, InLevel2, OutLevel, any>[];
     find(
-        arg2 : InLevel2,
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
+        arg2: InLevel2,
+        arg1: InLevel1
+    ): Mongo.Cursor<OutLevel>;
 }
 
 declare interface PublishCompositeConfig1<InLevel1, OutLevel> {
-    children? : PublishCompositeConfig2<InLevel1, OutLevel, any>[];
+    children?: PublishCompositeConfig2<InLevel1, OutLevel, any>[];
     find(
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
+        arg1: InLevel1
+    ): Mongo.Cursor<OutLevel>;
 }
 
 declare interface PublishCompositeConfig<OutLevel> {
-    children? : PublishCompositeConfig1<OutLevel, any>[];
-    find() : Mongo.Cursor<OutLevel>;
+    children?: PublishCompositeConfig1<OutLevel, any>[];
+    find(): Mongo.Cursor<OutLevel>;
 }
 
-declare namespace Meteor {
+declare module "meteor/reywood:publish-composite" {
     function publishComposite(
-        name : string,
-        config : PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
-    ) : void;
+        name: string,
+        config: PublishCompositeConfig<any> | PublishCompositeConfig<any>[]
+    ): void;
 
     function publishComposite(
-        name : string,
-        configFunc : (...args : any[]) =>
-            PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
-    ) : void;
-}
-
-declare module 'meteor/meteor' {
-    namespace Meteor {
-        function publishComposite(
-            name : string,
-            config : PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
-        ) : void;
-
-        function publishComposite(
-            name : string,
-            configFunc : (...args : any[]) =>
-                PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
-        ) : void;
-    }
+        name: string,
+        configFunc: (...args: any[]) =>
+            PublishCompositeConfig<any> | PublishCompositeConfig<any>[]
+    ): void;
 }
diff --git a/types/meteor-publish-composite/meteor-publish-composite-tests.ts b/types/meteor-publish-composite/meteor-publish-composite-tests.ts
index fa08882c3c..72f96ddc4d 100644
--- a/types/meteor-publish-composite/meteor-publish-composite-tests.ts
+++ b/types/meteor-publish-composite/meteor-publish-composite-tests.ts
@@ -1,14 +1,14 @@
 
-
+import { publishComposite } from 'meteor/reywood:publish-composite';
 import User = Meteor.User;
-interface IPost { _id : string, authorId : string };
-interface IComment { authorId : string };
-var Posts : Mongo.Collection<IPost> = new Mongo.Collection<IPost>('Posts');
-var Comments : Mongo.Collection<IComment> = new Mongo.Collection<IComment>('Comments');
+interface IPost { _id: string, authorId: string };
+interface IComment { authorId: string };
+var Posts: Mongo.Collection<IPost> = new Mongo.Collection<IPost>('Posts');
+var Comments: Mongo.Collection<IComment> = new Mongo.Collection<IComment>('Comments');
 
 // Server
-Meteor.publishComposite('topTenPosts', {
-    find: function() : Mongo.Cursor<IPost> {
+publishComposite('topTenPosts', {
+    find: function(): Mongo.Cursor<IPost> {
         // Find top ten highest scoring posts
         return Posts.find({}, { sort: { score: -1 }, limit: 10 });
     },
@@ -45,7 +45,7 @@ Meteor.publishComposite('topTenPosts', {
 });
 
 // Server
-Meteor.publishComposite('postsByUser', function(userId, limit) {
+publishComposite('postsByUser', function(userId, limit) {
     return {
         find: function() {
             // Find posts made by user. Note arguments for callback function
diff --git a/types/meteor-publish-composite/tslint.json b/types/meteor-publish-composite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meteor-publish-composite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor-roles/tslint.json b/types/meteor-roles/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meteor-roles/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor/ejson.d.ts b/types/meteor/ejson.d.ts
index 3ea090a7d2..aa5cd0f5f9 100644
--- a/types/meteor/ejson.d.ts
+++ b/types/meteor/ejson.d.ts
@@ -38,8 +38,8 @@ declare module EJSON {
 
 declare module "meteor/ejson" {
     interface EJSONableCustomType {
-        clone(): EJSONableCustomType;
-        equals(other: Object): boolean;
+        clone?(): EJSONableCustomType;
+        equals?(other: Object): boolean;
         toJSONValue(): JSONable;
         typeName(): string;
     }
diff --git a/types/meteor/index.d.ts b/types/meteor/index.d.ts
index e600d9c7de..1d95ba429d 100644
--- a/types/meteor/index.d.ts
+++ b/types/meteor/index.d.ts
@@ -17,9 +17,11 @@
 /// <reference path="./random.d.ts" />
 /// <reference path="./reactive-var.d.ts" />
 /// <reference path="./server-render.d.ts" />
+/// <reference path="./service-configuration.d.ts" />
 /// <reference path="./session.d.ts" />
 /// <reference path="./templating.d.ts" />
 /// <reference path="./tiny-test.d.ts" />
 /// <reference path="./tools.d.ts" />
 /// <reference path="./tracker.d.ts" />
+/// <reference path="./underscore.d.ts" />
 /// <reference path="./webapp.d.ts" />
diff --git a/types/meteor/meteor-tests.ts b/types/meteor/meteor-tests.ts
index 6c71fef438..0e457b9fc5 100644
--- a/types/meteor/meteor-tests.ts
+++ b/types/meteor/meteor-tests.ts
@@ -206,13 +206,7 @@ Posts.insert({ title: "Hello world", body: "First post" });
  **/
 
 class Animal {
-    private sound: string;
-    constructor(doc: any) {
-
-    }
-    makeNoise() {
-        console.log(this.sound)
-    }
+    constructor(doc: any) {}
 }
 
 interface AnimalDAO {
diff --git a/types/meteor/server-render.d.ts b/types/meteor/server-render.d.ts
index cbf814ed61..1695142ee4 100644
--- a/types/meteor/server-render.d.ts
+++ b/types/meteor/server-render.d.ts
@@ -7,10 +7,10 @@ declare module "meteor/server-render" {
         body?: string;
         htmlById?: { [key: string]: string };
         maybeMadeChanges?: boolean;
-        appendToHead(html: string): void;
-        appendToBody(html: string): void;
-        appendToElementById(id: string, html: string): void;
-        renderIntoElementById(id: string, html: string): void;
+        appendToHead?(html: string): void;
+        appendToBody?(html: string): void;
+        appendToElementById?(id: string, html: string): void;
+        renderIntoElementById?(id: string, html: string): void;
     }
     function onPageLoad(sink: Sink): Promise<any> | any;
 }
diff --git a/types/meteor/service-configuration.d.ts b/types/meteor/service-configuration.d.ts
new file mode 100644
index 0000000000..f1270aa209
--- /dev/null
+++ b/types/meteor/service-configuration.d.ts
@@ -0,0 +1,9 @@
+declare module "meteor/service-configuration" {
+    interface Configuration {
+        appId: string;
+        secret: string;
+    }
+    var ServiceConfiguration: {
+        configurations: Mongo.Collection<Configuration>;
+    }
+}
diff --git a/types/meteor/tsconfig.json b/types/meteor/tsconfig.json
index aaf8ac862c..6185ff9c61 100644
--- a/types/meteor/tsconfig.json
+++ b/types/meteor/tsconfig.json
@@ -31,12 +31,14 @@
         "mongo.d.ts",
         "reactive-var.d.ts",
         "server-render.d.ts",
+        "service-configuration.d.ts",
         "session.d.ts",
         "tiny-test.d.ts",
         "tools.d.ts",
         "tracker.d.ts",
+        "underscore.d.ts",
         "webapp.d.ts",
         "index.d.ts",
         "meteor-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/meteor/tslint.json b/types/meteor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/meteor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/meteor/underscore.d.ts b/types/meteor/underscore.d.ts
new file mode 100644
index 0000000000..489c5d65d6
--- /dev/null
+++ b/types/meteor/underscore.d.ts
@@ -0,0 +1,4 @@
+declare module "meteor/underscore" {
+    import * as _ from 'underscore';
+    export { _ };
+}
diff --git a/types/method-override/index.d.ts b/types/method-override/index.d.ts
index 019b4e5bf0..e733a8541a 100644
--- a/types/method-override/index.d.ts
+++ b/types/method-override/index.d.ts
@@ -2,8 +2,7 @@
 // Project: https://github.com/expressjs/method-override
 // Definitions by: Santi Albo <https://github.com/santialbo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
+// TypeScript Version: 2.3
 
 declare namespace Express {
     export interface Request {
diff --git a/types/method-override/tslint.json b/types/method-override/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/method-override/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/metismenu/index.d.ts b/types/metismenu/index.d.ts
deleted file mode 100644
index 6cc1eab886..0000000000
--- a/types/metismenu/index.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for metisMenu 2.6
-// Project: https://github.com/onokumus/metisMenu
-// Definitions by: onokums <https://github.com/onokumus>, denis <https://github.com/denisname>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery"/>
-
-interface MetisMenuOptions {
-    toggle?: boolean;
-    activeClass?: string;
-    collapseClass?: string;
-    collapseInClass?: string;
-    collapsingClass?: string;
-    preventDefault?: boolean;
-}
-
-type MetisMenuEvents = "show.metisMenu" | "shown.metisMenu" | "hide.metisMenu" | "hidden.metisMenu";
-
-interface JQuery {
-    metisMenu(options?: MetisMenuOptions | "dispose"): JQuery;
-    on(events: MetisMenuEvents, handler: (eventObject: JQueryEventObject) => any): JQuery;
-}
diff --git a/types/metismenu/metismenu-tests.ts b/types/metismenu/metismenu-tests.ts
deleted file mode 100644
index 64aa809cf7..0000000000
--- a/types/metismenu/metismenu-tests.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-$('#menu').metisMenu();
-
-$('.metismenu').metisMenu({toggle: false});
-
-$('.test').metisMenu({
-    toggle: false,
-    activeClass: 'active',
-    collapseClass: 'collapse',
-    collapseInClass: 'in',
-    collapsingClass: 'collapsing',
-    preventDefault: true
-});
-
-$('.metismenu').metisMenu('dispose');
-
-$('.metismenu')
-    .metisMenu()
-    .on('show.metisMenu', function(e) {
-        // empty logic
-    }).on('shown.metisMenu', function(e) {
-        // empty logic
-    }).on('hide.metisMenu', function(e) {
-        // empty logic
-    }).on('hidden.metisMenu', function(e) {
-        // empty logic
-    });
diff --git a/types/metismenu/tsconfig.json b/types/metismenu/tsconfig.json
deleted file mode 100644
index 643934b421..0000000000
--- a/types/metismenu/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "metismenu-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/metric-suffix/tslint.json b/types/metric-suffix/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/metric-suffix/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mfiles/index.d.ts b/types/mfiles/index.d.ts
index c82377d1fe..6816f1d889 100644
--- a/types/mfiles/index.d.ts
+++ b/types/mfiles/index.d.ts
@@ -1,6201 +1,6201 @@
-// Type definitions for M-Files UI Extensibility 11.3
-// Project: http://www.m-files.com/UI_Extensibility_Framework/
-// Definitions by: Arsène von Wyss <https://github.com/avonwyss>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare const MFExtApplicationPlatformWeb: any;
-
-interface IAccessControlEntry {
-	ChangePermissionsPermission: MFiles.MFPermission;
-	EditPermission: MFiles.MFPermission;
-	IsGroup: boolean;
-	ReadPermission: MFiles.MFPermission;
-	UserOrGroupID: number;
-	Clone(): IAccessControlEntry;
-}
-
-interface IAccessControlEntryContainer {
-	readonly IsEmpty: boolean;
-	Add(AccessControlEntryKey: IAccessControlEntryKey, AccessControlEntryData: IAccessControlEntryData): void;
-	At(AccessControlEntryKey: IAccessControlEntryKey): IAccessControlEntryData;
-	Clear(): void;
-	Clone(): IAccessControlEntryContainer;
-	GetKeys(): IAccessControlEntryKeys;
-	GetKeysWithPseudoUserDefinitions(): IAccessControlEntryKeys;
-	HasKey(AccessControlEntryKey: IAccessControlEntryKey): boolean;
-	Remove(AccessControlEntryKey: IAccessControlEntryKey): void;
-}
-
-interface IAccessControlEntryData {
-	AttachObjectsPermission: MFiles.MFPermission;
-	ChangePermissionsPermission: MFiles.MFPermission;
-	DeletePermission: MFiles.MFPermission;
-	EditPermission: MFiles.MFPermission;
-	ReadPermission: MFiles.MFPermission;
-	Clone(): IAccessControlEntryData;
-	SetAllPermissions(Permission: MFiles.MFPermission): void;
-}
-
-interface IAccessControlEntryKey {
-	readonly HasConcreteUserOrGroupID: boolean;
-	readonly IsGroup: boolean;
-	readonly IsPseudoUser: boolean;
-	PseudoUserID: IIndirectPropertyID;
-	readonly UserOrGroupID: number;
-	Clone(): IAccessControlEntryKey;
-	GetResolvedPseudoUserOrGroupIDs(): IUserOrUserGroupIDs;
-	ResetResolvedPseudoUserOrGroupIDs(): void;
-	SetUserOrGroupID(UserOrGroupID: number, IsGroup: boolean): void;
-}
-
-interface IAccessControlEntryKeys {
-	readonly Count: number;
-	Clone(): IAccessControlEntryKeys;
-	Item(Index: number): IAccessControlEntryKey;
-}
-
-interface IAccessControlList {
-	readonly AutomaticComponents: IAccessControlListComponentContainer;
-	readonly CheckedOutToUserID: number;
-	CustomComponent: IAccessControlListComponent;
-	readonly HasCheckedOutToUserID: boolean;
-	IsFullyAuthoritative: boolean;
-	Clone(): IAccessControlList;
-	CloneFrom(AccessControlList: IAccessControlList): void;
-	EqualTo(AccessControlList: IAccessControlList): boolean;
-	HasIdenticalPermissions(AccessControlList: IAccessControlList): boolean;
-}
-
-interface IAccessControlListComponent {
-	AccessControlEntries: IAccessControlEntryContainer;
-	CanDeactivate: boolean;
-	readonly CurrentUserBinding: number;
-	readonly HasCurrentUser: boolean;
-	readonly HasCurrentUserBinding: boolean;
-	readonly HasNamedACLLink: boolean;
-	readonly HasPseudoUsers: boolean;
-	IsActive: boolean;
-	readonly NamedACLLink: number;
-	Clone(): IAccessControlListComponent;
-	GetACEByUserOrGroupID(UserOrGroupID: number, IsGroup: boolean): IAccessControlEntryData;
-	GetACEKeyByUserOrGroupID(UserOrGroupID: number, IsGroup: boolean): IAccessControlEntryKey;
-	ResetCurrentUserBinding(): void;
-	ResetNamedACLLink(): void;
-}
-
-interface IAccessControlListComponentContainer {
-	readonly Count: number;
-	At(AccessControlListComponentKey: IAccessControlListComponentKey): IAccessControlListComponent;
-	GetKeys(): IAccessControlListComponentKeys;
-	HasKey(AccessControlListComponentKey: IAccessControlListComponentKey): boolean;
-}
-
-interface IAccessControlListComponentKey {
-	ItemID: number;
-	PropertyDefID: (MFiles.MFBuiltInPropertyDef | number);
-	Clone(): IAccessControlListComponentKey;
-}
-
-interface IAccessControlListComponentKeys {
-	readonly Count: number;
-	Clone(): IAccessControlListComponentKeys;
-	Item(Index: number): IAccessControlListComponentKey;
-}
-
-interface IAccessControlLists {
-	readonly Count: number;
-	Item(Index: number): IAccessControlList;
-}
-
-interface IActionConvertToPDF {
-	FailOnUnsupportedSourceFiles: boolean;
-	OverwriteExistingFile: boolean;
-	PDFA1b: boolean;
-	StoreAsSeparateFile: boolean;
-	Clone(): IActionConvertToPDF;
-}
-
-interface IActionCreateAssignment {
-	AssignedTo: IUserOrUserGroupIDExs;
-	Deadline: boolean;
-	DeadlineInDays: number;
-	Description: string;
-	MonitoredBy: IUserOrUserGroupIDExs;
-	Title: string;
-	Clone(): IActionCreateAssignment;
-}
-
-interface IActionDefinition {
-	ActionCreateSeparateAssignment: IActionCreateAssignment;
-	readonly ActionType: MFiles.MFActionType;
-	Clear(): void;
-	Clone(): IActionDefinition;
-}
-
-interface IActionDefinitions {
-	readonly Count: number;
-	Add(Index: number, ActionDefinition: IActionDefinition): void;
-	Clone(): IActionDefinitions;
-	Item(Index: number): IActionDefinition;
-	Item(Index: number, value: IActionDefinition): void;
-	Remove(Index: number): void;
-}
-
-interface IActionSendNotification {
-	Message: string;
-	RecipientsEx: IUserOrUserGroupIDExs;
-	Subject: string;
-	Clone(): IActionSendNotification;
-}
-
-interface IActionSetPermissions {
-	DiscardsAutomaticPermissions: boolean;
-	Permissions: IAccessControlList;
-	Clone(): IActionSetPermissions;
-}
-
-interface IActionSetProperties {
-	Properties: IDefaultProperties;
-	Clone(): IActionSetProperties;
-}
-
-interface IAdditionalClassInfo {
-	AssignmentClassInfo: IAssignmentClassInfo;
-	readonly InfoType: MFiles.MFAdditionalClassInfoType;
-	Clear(): void;
-	Clone(): IAdditionalClassInfo;
-}
-
-interface IAdditionalFolder {
-	Folder: string;
-	Impersonation: IImpersonation;
-	LimitInMB: number;
-	Clone(): IAdditionalFolder;
-}
-
-interface IAdditionalFolders {
-	readonly Count: number;
-	Add(Index: number, AdditionalFolder: IAdditionalFolder): void;
-	Clone(): IAdditionalFolders;
-	Item(Index: number): IAdditionalFolder;
-	Remove(Index: number): void;
-}
-
-interface IApprovalAssignmentClassInfo {
-	AnyAssigneeApproves: boolean;
-	SignatureForApproval: ISignatureSettings;
-	SignatureForRejection: ISignatureSettings;
-	Clone(): IApprovalAssignmentClassInfo;
-}
-
-interface IArchiveOldVersionsJob {
-	AtLeastNDaysOlder: number;
-	AtLeastNVersionsOlder: number;
-	CheckedInBefore: ITimestamp;
-	Flags: MFiles.MFExportContentFlag;
-	Impersonation: IImpersonation;
-	MarkedForArchiving: boolean;
-	NoVersionTag: boolean;
-	TargetLocation: string;
-	UseAtLeastNDaysOlder: boolean;
-	UseAtLeastNVersionsOlder: boolean;
-	UseCheckedInBefore: boolean;
-	Clone(): IArchiveOldVersionsJob;
-}
-
-interface IAssignmentClassInfo {
-	ApprovalAssignmentClassInfo: IApprovalAssignmentClassInfo;
-	readonly AssignmentType: MFiles.MFAssignmentType;
-	TaskAssignmentClassInfo: ITaskAssignmentClassInfo;
-	Clone(): IAssignmentClassInfo;
-}
-
-interface IAssociatedPropertyDef {
-	PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
-	Required: boolean;
-	Clone(): IAssociatedPropertyDef;
-}
-
-interface IAssociatedPropertyDefs {
-	readonly Count: number;
-	Add(Index: number, AssociatedPropertyDef: IAssociatedPropertyDef): void;
-	Clone(): IAssociatedPropertyDefs;
-	Item(Index: number): IAssociatedPropertyDef;
-	Remove(Index: number): void;
-}
-
-interface IAttachVaultOptions {
-	DisableEventHandlers: boolean;
-	DisableExportedDataSets: boolean;
-	DisableExportImportJobs: boolean;
-	DisableExternalObjectTypes: boolean;
-	DisableExternalSources: boolean;
-	DisableExternalUserGroups: boolean;
-	Flags: MFiles.MFAttachVaultOptionsFlag;
-	UpdateAttachmentGUID: boolean;
-	Clone(): IAttachVaultOptions;
-	DisableAll(): void;
-}
-
-interface IAuthenticationResult {
-	readonly Intermediate: IAuthenticationResultIntermediate;
-	readonly ServerFinal: IAuthenticationResultServerFinal;
-	readonly VaultFinal: IAuthenticationResultVaultFinal;
-}
-
-interface IAuthenticationResultIntermediate {
-	readonly AttemptIdentifier: string;
-	readonly AuthenticationData: INamedValues;
-}
-
-interface IAuthenticationResultServerFinal {
-	readonly ServerConnection: MFiles.MFServerConnection;
-}
-
-interface IAuthenticationResultVaultFinal {
-	readonly Vault: IVault;
-}
-
-interface IAutomaticMetadataResult {
-	readonly PropertyValueSuggestions: IPropertyValueSuggestions;
-	Clone(): IAutomaticMetadataResult;
-}
-
-interface IAutomaticPermissions {
-	CanDeactivate: boolean;
-	readonly IsBasedOnObjectACL: boolean;
-	readonly IsDefault: boolean;
-	readonly NamedACL: INamedACL;
-	Clone(): IAutomaticPermissions;
-	SetBasedOnObjectACL(): void;
-	SetNamedACL(NamedACL: INamedACL): void;
-}
-
-interface IAutomaticValue {
-	ANSIncrement: number;
-	ANVCode: string;
-	CalculationOrderNumber: number;
-	CVSExpression: string;
-	CVVCode: string;
-	Clone(): IAutomaticValue;
-}
-
-interface IBackupJob {
-	BackupType: MFiles.MFBackupType;
-	FileSizeLimitInMB: number;
-	Impersonation: IImpersonation;
-	OverwriteExistingFiles: boolean;
-	TargetFile: string;
-	VaultGUID: string;
-	Clone(): IBackupJob;
-}
-
-interface IBooleanValue {
-	Value: boolean;
-	Clone(): IBooleanValue;
-}
-
-interface IClassGroup {
-	ID: number;
-	Members: IIDs;
-	Name: string;
-	ObjectType: (MFiles.MFBuiltInObjectType | number);
-	AddMember(Member: number): void;
-	Clone(): IClassGroup;
-	RemoveMember(Member: number): void;
-}
-
-interface IClassGroups {
-	readonly Count: number;
-	Clone(): IClassGroups;
-	Item(Index: number): IClassGroup;
-}
-
-interface ICLSIDs {
-	readonly PreviewerCtrl: string;
-	readonly ShellListingCtrl: string;
-}
-
-interface ICollection {
-	readonly Count: number;
-	readonly Events: IEvents;
-	Clear(): void;
-	Find(item: any): number;
-	GetAt(pos: number): any;
-	MoveTo(pos: number, newPos: number): void;
-	NewTo(pos: number, replace: boolean): any;
-	PutTo(pos: number, replace: boolean, item: any): void;
-	RemoveAt(pos: number): void;
-}
-
-interface ICommands {
-	readonly Events: ICommandsEvents;
-	AddCustomCommandToMenu(customCommand: number, location: MFiles.MenuLocation, orderPriority: number): void;
-	CreateCustomCommand(commandName: string): number;
-	DeleteCustomCommand(customCommand: number): void;
-	ExecuteCommand(command: MFiles.BuiltinCommand | number, arguments: any): void;
-	GetCommandName(command: MFiles.BuiltinCommand | number): string;
-	GetCommandState(command: MFiles.BuiltinCommand | number, location: MFiles.CommandLocation, includeBuiltInState: boolean, includeScriptSpecifiedState: boolean): MFiles.CommandState;
-	RemoveCustomCommandFromMenu(customCommand: number, location: MFiles.MenuLocation): void;
-	SetCommandState(command: MFiles.BuiltinCommand | number, location: MFiles.CommandLocation, state: MFiles.CommandState): void;
-	SetIcon(customCommand: number, icon: MFiles.DefaultIcon): void;
-	SetIconFromPath(customCommand: number, iconPath: string): void;
-}
-
-interface ICommandsEvents extends IEvents {
-	OnCustomCommand?(commandID: number): void;
-}
-
-interface ICopyVaultJob {
-	CopyflagAllData: boolean;
-	CopyflagAllExceptData: boolean;
-	CopyflagApplications: boolean;
-	CopyflagDataSets: boolean;
-	CopyflagDocumentProfiles: boolean;
-	CopyflagDocuments: boolean;
-	CopyflagEventLog: boolean;
-	CopyflagExternalLocations: boolean;
-	CopyflagFiles: boolean;
-	CopyflagInternalEventHandlers: boolean;
-	CopyflagLanguagesAndTranslations: boolean;
-	CopyflagPropertyDefinitions: boolean;
-	CopyflagScheduledExportAndImportJobs: boolean;
-	CopyflagUserAccounts: boolean;
-	CopyflagUseTargetGUID: boolean;
-	CopyflagValueListContent: boolean;
-	CopyflagValueLists: boolean;
-	CopyflagViews: boolean;
-	CopyflagWorkflows: boolean;
-	VaultGUID: string;
-	VaultProperties: IVaultProperties;
-	Clone(): ICopyVaultJob;
-}
-
-interface ICopyVaultJobOutputInfo {
-	readonly VaultProperties: IVaultProperties;
-}
-
-interface ICustomApplication {
-	readonly ApplicationType: MFiles.MFCustomApplicationType;
-	readonly ChecksumHash: string;
-	readonly Description: string;
-	readonly Enabled: boolean;
-	readonly ID: string;
-	readonly MasterApplication: string;
-	readonly Name: string;
-	readonly Optional: boolean;
-	readonly Publisher: string;
-	readonly RequireSystemAccess: boolean;
-	readonly Version: string;
-	Clone(): ICustomApplication;
-}
-
-interface ICustomApplications {
-	readonly Count: number;
-	Clone(): ICustomApplications;
-	Item(Index: number): ICustomApplication;
-}
-
-interface IDailyTrigger {
-	DaysInterval: number;
-}
-
-interface IDashboard<T> {
-	AutoStopWithParent: boolean;
-	readonly CustomData: T;
-	readonly Events: IDashboardEvents;
-	readonly IsPopupDashboard: boolean;
-	readonly Parent: (IShellPaneContainer | IShellFrame | IVaultUI | IShellUI);
-	readonly UseRightToLeftLayout: boolean;
-	readonly Vault: IVault;
-	readonly Window: IWindow;
-	ShowMessage(message: string | IMessage): number;
-	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
-}
-
-interface IDashboardEvents extends IEvents {
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface IDataFunctionCall {
-	readonly DataFunction: MFiles.MFDataFunction;
-	SetDataDate(): void;
-	SetDataDaysFrom(): void;
-	SetDataDaysTo(): void;
-	SetDataInitialCharGroup(Locale: number): void;
-	SetDataIntegerSegment(SegmentSize: number): void;
-	SetDataLeftChars(Characters: number): void;
-	SetDataMonth(): void;
-	SetDataNoOp(): void;
-	SetDataYear(): void;
-	SetDataYearAndMonth(): void;
-}
-
-interface IDataSet {
-	readonly ID: number;
-	readonly Name: string;
-	Clone(): IDataSet;
-}
-
-interface IDataSetExportingStatus {
-	readonly CurrentServerTime: ITimestamp;
-	readonly IsExporting: boolean;
-	readonly LatestActivity: ITimestamp;
-}
-
-interface IDataSets {
-	readonly Count: number;
-	Clone(): IDataSets;
-	Item(Index: number): IDataSet;
-}
-
-interface IDefaultProperties {
-	readonly Count: number;
-	Add(Index: number, DefaultProperty: IDefaultProperty): void;
-	Item(Index: number): IDefaultProperty;
-	Remove(Index: number): void;
-}
-
-interface IDefaultProperty {
-	DataFixedValueValue: ITypedValue;
-	DataFromEmailAddVLItemIfNotFound: boolean;
-	DataFromEmailField: MFiles.MFEmailField;
-	DataFromEmailHeaderAddVLItemIfNotFound: boolean;
-	DataFromEmailHeaderField: string;
-	DataFromEmailHeaderTreatLookupAsID: boolean;
-	DataFromEmailTreatLookupAsID: boolean;
-	DataFromHPDSSXMLAddVLItemIfNotFound: boolean;
-	DataFromHPDSSXMLPromptName: string;
-	DataFromHPDSSXMLTreatLookupAsID: boolean;
-	DataFromOCRAddVLItemIfNotFound: boolean;
-	DataFromOCRTreatLookupAsID: boolean;
-	DataFromOCRZone: IOCRZone;
-	DataFromXMLAddVLItemIfNotFound: boolean;
-	DataFromXMLTreatLookupAsID: boolean;
-	DataFromXMLXPathExpression: string;
-	PropertyDefID: (MFiles.MFBuiltInPropertyDef | number);
-	readonly Type: MFiles.MFDefaultPropertyType;
-	Clone(): IDefaultProperty;
-	SetFixedValue(TypedValue: ITypedValue): void;
-	SetFromEmail(EmailField: MFiles.MFEmailField, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
-	SetFromEmailHeader(Field: string, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
-	SetFromHPDSSXML(PromptName: string, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
-	SetFromOCR(OCRZone: IOCRZone, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
-	SetFromXML(XPathExpression: string, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
-}
-
-interface IEmailMessageInformation {
-	Cc: IStrings;
-	From: string;
-	Importance: MFiles.MFEmailImportance;
-	InReplyTo: string;
-	MessageID: string;
-	Received: ITimestamp;
-	Sensitivity: MFiles.MFEmailSensitivity;
-	Sent: ITimestamp;
-	Subject: string;
-	To: IStrings;
-	Clone(): IEmailMessageInformation;
-	CloneFrom(EmailMessageInformation: IEmailMessageInformation): void;
-}
-
-interface IEventHandler {
-	Active: boolean;
-	Description: string;
-	EventType: MFiles.MFEventHandlerType;
-	readonly GUID: string;
-	VBScript: string;
-	Clone(): IEventHandler;
-	GetID(): number;
-}
-
-interface IEventHandlers {
-	readonly Count: number;
-	Add(Index: number, EventHandler: IEventHandler): void;
-	Clone(): IEventHandlers;
-	GetIndexByGUID(EventHandlerGUID: string): number;
-	Item(Index: number): IEventHandler;
-	Remove(Index: number): void;
-}
-
-interface IEvents {
-// tslint:disable-next-line ban-types
-	Register(eventToListen: MFiles.Event, eventSink: Function): number;
-	Unregister(sinkHandle: number): void;
-}
-
-interface IExportContentJob {
-	ExportContent: boolean;
-	ExportStructureItems: boolean;
-	Flags: MFiles.MFExportContentFlag;
-	IgnoreChangesBefore: ITimestamp;
-	Impersonation: IImpersonation;
-	IncludePrivateUISettingsWithStructure: boolean;
-	IncludeValueListItemsWithStructure: boolean;
-	SearchConditions: ISearchConditions;
-	StructureItems: IExportStructureItems;
-	TargetLocation: string;
-	UseIgnoreChangesBefore: boolean;
-	UseSearchConditions: boolean;
-	Clone(): IExportContentJob;
-	SetExportAllStructureItems(IncludeValueListItems: boolean): void;
-}
-
-interface IExportStructureItem {
-	StructureItemGUID: string;
-	StructureItemID: number;
-	StructureItemType: MFiles.MFMetadataStructureItem;
-	Clone(): IExportStructureItem;
-}
-
-interface IExportStructureItems {
-	readonly Count: number;
-	Add(Index: number, ExportStructureItem: IExportStructureItem): void;
-	Clone(): IExportStructureItems;
-	Item(Index: number): IExportStructureItem;
-	Item(Index: number, value: IExportStructureItem): void;
-	Remove(Index: number): void;
-}
-
-interface IExpression {
-	DataAnyFieldFTSFlags: MFiles.MFFullTextSearchFlags;
-	DataFileValueType: MFiles.MFFileValueType;
-	DataObjectIDSegmentSegmentSize: number;
-	DataPermissionsType: MFiles.MFPermissionsExpressionType;
-	DataPropertyValueDataFunction: MFiles.MFDataFunction;
-	DataPropertyValueParentChildBehavior: MFiles.MFParentChildBehavior;
-	DataPropertyValuePropertyDef: number;
-	DataStatusValueDataFunction: MFiles.MFDataFunction;
-	DataStatusValueType: MFiles.MFStatusType;
-	DataTypedValueDataFunction: MFiles.MFDataFunction;
-	DataTypedValueDatatype: MFiles.MFDataType;
-	DataTypedValueParentChildBehavior: MFiles.MFParentChildBehavior;
-	DataTypedValueValueList: number;
-	IndirectionLevels: IPropertyDefOrObjectTypes;
-	readonly Type: MFiles.MFExpressionType;
-	Clone(): IExpression;
-	GetExpressionAsText(PropertyDefinitions: IPropertyDefs, ObjectTypes: IObjectTypes): string;
-	GetWholeExpressionAsIndirectionLevels(): IPropertyDefOrObjectTypes;
-	SetAnyFieldExpression(FullTextSearchFlags: MFiles.MFFullTextSearchFlags): void;
-	SetFileValueExpression(FileValueType: MFiles.MFFileValueType): void;
-	SetObjectIDSegmentExpression(Segment: number): void;
-	SetPermissionExpression(PermissionsExpressionType: MFiles.MFPermissionsExpressionType): void;
-	SetPropertyValueExpression(PropertyDef: MFiles.MFBuiltInPropertyDef | number, PCBehavior: MFiles.MFParentChildBehavior, DataFunctionCall: IDataFunctionCall): void;
-	SetStatusValueExpression(StatusType: MFiles.MFStatusType, DataFunctionCall: IDataFunctionCall): void;
-	SetTypedValueExpression(DataType: MFiles.MFDataType, ValueList: MFiles.MFBuiltInValueList | number, PCBehavior: MFiles.MFParentChildBehavior, DataFunctionCall: IDataFunctionCall): void;
-	SetValueListItemExpression(PseudoPropertyDef: MFiles.MFValueListItemPropertyDef, PCBehavior: MFiles.MFParentChildBehavior, DataFunctionCall: IDataFunctionCall): void;
-}
-
-interface IExpressionEx {
-	Conditions: ISearchConditions;
-	Expression: IExpression;
-	FolderListingAlgorithm: MFiles.MFFolderListingAlgorithm;
-	NULLFolderName: string;
-	ShowContentsAsJITFolders: boolean;
-	ShowEmptyFolders: boolean;
-	ShowMatchingObjectsOnThisLevel: boolean;
-	ShowNULLFolder: boolean;
-	ShowNULLFolderContentsOnThisLevel: boolean;
-	Clone(): IExpressionEx;
-}
-
-interface IExpressionExs {
-	readonly Count: number;
-	Add(Index: number, ExpressionEx: IExpressionEx): void;
-	Clone(): IExpressionExs;
-	Item(Index: number): IExpressionEx;
-	Item(Index: number, value: IExpressionEx): void;
-	Remove(Index: number): void;
-}
-
-interface IExpressions {
-	readonly Count: number;
-	Add(Index: number, Expression: IExpression): void;
-	Clone(): IExpressions;
-	Item(Index: number): IExpression;
-	Item(Index: number, value: IExpression): void;
-	Remove(Index: number): void;
-}
-
-interface IFileClass {
-	DisplayName: string;
-	readonly DotAndExtension: string;
-	readonly Extension: string;
-	readonly FileClass: string;
-	Clone(): IFileClass;
-	LoadByExtension(Extension: string): void;
-	LoadByFileClass(Extension: string, FileClass: string): void;
-	SetFileClassInfo(DotAndFileExtension: string, FileClass: string, FileClassDisplayName: string): void;
-}
-
-interface IFileClasses {
-	readonly Count: number;
-	Add(Index: number, FileClass: IFileClass): void;
-	Clone(): IFileClasses;
-	Item(Index: number): IFileClass;
-	Remove(Index: number): void;
-}
-
-interface IFileDownloadSession {
-	readonly DownloadID: number;
-	readonly FileSize: number;
-	readonly FileSize32: number;
-}
-
-interface IFileInformation {
-	EmailMessage: IEmailMessageInformation;
-	FileType: MFiles.MFFileInformationType;
-	Clear(): void;
-	ExtractFromFile(PathToFile: string): void;
-}
-
-interface IFileVer {
-	ID: number;
-	Version: number;
-	Clone(): IFileVer;
-	CloneFrom(FileVer: IFileVer): void;
-}
-
-interface IFileVers {
-	readonly Count: number;
-	Add(Index: number, FileVer: IFileVer): void;
-	Clone(): IFileVers;
-	Item(Index: number): IFileVer;
-	Remove(Index: number): void;
-}
-
-interface IFolderContentItem {
-	readonly FolderContentItemType: MFiles.MFFolderContentItemType;
-	readonly ObjectVersion: IObjectVersion;
-	readonly PropertyFolder: ITypedValue;
-	readonly TraditionalFolder: ILookup;
-	readonly View: IView;
-}
-
-interface IFolderContentItems {
-	readonly Count: number;
-	readonly MoreResults: boolean;
-	Item(Index: number): IFolderContentItem;
-}
-
-interface IFolderDef {
-	readonly FolderDefType: MFiles.MFFolderDefType;
-	readonly PropertyFolder: ITypedValue;
-	readonly SearchDef: ISearchDef;
-	readonly TraditionalFolder: number;
-	readonly View: (MFiles.MFBuiltInView | number);
-	Clone(): IFolderDef;
-	SetPropertyFolder(TypedValue: ITypedValue): void;
-	SetSearchDef(SearchDef: ISearchDef): void;
-	SetTraditionalFolder(TraditionalFolder: number): void;
-	SetView(View: MFiles.MFBuiltInView | number): void;
-}
-
-interface IFolderDefs {
-	readonly Count: number;
-	Add(Index: number, FolderDef: IFolderDef): void;
-	Clone(): IFolderDefs;
-	Item(Index: number): IFolderDef;
-	Remove(Index: number): void;
-}
-
-interface IFolderListingColumn {
-	Flags: MFiles.MFFolderListingColumnFlags;
-	readonly ID: number;
-	readonly Name: string;
-	Position: number;
-	Visible: boolean;
-	Width: number;
-	Clone(): IFolderListingColumn;
-}
-
-interface IFolderListingColumns {
-	readonly Count: number;
-	Add(Index: number, FolderListingColumn: IFolderListingColumn): void;
-	Item(Index: number): IFolderListingColumn;
-	Item(Index: number, value: IFolderListingColumn): void;
-	Remove(Index: number): void;
-}
-
-interface IFolderListingColumnSorting {
-	ID: number;
-	Index: number;
-	SortAscending: boolean;
-	Clone(): IFolderListingColumnSorting;
-}
-
-interface IFolderListingColumnSortings {
-	readonly Count: number;
-	Add(Index: number, FolderListingColumnSorting: IFolderListingColumnSorting): void;
-	Item(Index: number): IFolderListingColumnSorting;
-	Item(Index: number, value: IFolderListingColumnSorting): void;
-	Remove(Index: number): void;
-}
-
-interface IFolderListingUIState {
-	Columns: IFolderListingColumns;
-	ColumnSortings: IFolderListingColumnSortings;
-	GroupingMode: MFiles.MFFolderListingItemGroupingMode;
-	IconSize: number;
-	ViewMode: MFiles.MFFolderListingViewMode;
-}
-
-interface IFolderNameListing {
-	readonly Count: number;
-	readonly MoreValues: boolean;
-	Item(Index: number): ITypedValue;
-	SortWithExpression(Expression: IExpression, Locale: number): void;
-}
-
-interface IFolderUIState {
-	BottomPaneBarMinimized: boolean;
-	HitHighlightingEnabled: boolean;
-	readonly ListingUIState: IFolderListingUIState;
-	MetadataEditorInRightPane: boolean;
-	RelativeBottomPaneHeight: number;
-	RelativeRightPaneWidth: number;
-	RightPaneBarMinimized: boolean;
-	ShowBottomPaneBar: boolean;
-	ShowRightPaneBar: boolean;
-}
-
-interface IIDRange {
-	MaxID: number;
-	MaxID_32bit: string;
-	MinID: number;
-	MinID_32bit: string;
-	Clone(): IIDRange;
-	SetIDs(MinID: number, MaxID: number): void;
-	SetIDs_32bit(MinID: string, MaxID: string): void;
-}
-
-interface IIDs {
-	readonly Count: number;
-	Add(Index: number, ID: number): void;
-	Clone(): IIDs;
-	IndexOf(ID: number): number;
-	Item(Index: number): number;
-	Remove(Index: number): void;
-	RemoveAll(ID: number): number;
-}
-
-interface IImpersonation {
-	Account: string;
-	ImpersonationType: MFiles.MFImpersonationType;
-	Password: string;
-	Clone(): IImpersonation;
-}
-
-interface IImportContentJob {
-	ActivateAutomaticPermissionsForNewOrChangedDefinitions: boolean;
-	DisableImportedExternalObjectTypeConnections: boolean;
-	DisableImportedExternalUserGroups: boolean;
-	DisableImportedVaultEventHandlers: boolean;
-	Flags: MFiles.MFImportContentFlag;
-	IgnoreAutomaticPermissionsDefinedByObjects: boolean;
-	Impersonation: IImpersonation;
-	MetadataStructureSelectors: IMetadataStructureSelectors;
-	Permissions: IAccessControlList;
-	ResetExportTimestamps: boolean;
-	SourceLocation: string;
-	UseDefaultObjectTypePermissions: boolean;
-	UseNamesAsAliases: boolean;
-	UsePermissions: boolean;
-	Clone(): IImportContentJob;
-}
-
-interface IIndirectPropertyID {
-	readonly Count: number;
-	Add(Index: number, IndirectPropertyIDLevel: IIndirectPropertyIDLevel): void;
-	Clone(): IIndirectPropertyID;
-	EqualTo(IndirectPropertyID: IIndirectPropertyID): boolean;
-	Item(Index: number): IIndirectPropertyIDLevel;
-	Remove(Index: number): void;
-	ToJSON(): string;
-}
-
-interface IIndirectPropertyIDLevel {
-	ID: number;
-	LevelType: MFiles.MFIndirectPropertyIDLevelType;
-	Clone(): IIndirectPropertyIDLevel;
-	ToJSON(): string;
-}
-
-interface IKeyNamePair {
-	readonly Key: number;
-	readonly Name: string;
-	Clone(): IKeyNamePair;
-}
-
-interface IKeyNamePairs {
-	readonly Count: number;
-	Item(Index: number): IKeyNamePair;
-}
-
-interface ILanguage {
-	readonly ID: number;
-	LanguageCode: string;
-	Name: string;
-}
-
-interface ILanguages {
-	readonly Count: number;
-	Item(Index: number): ILanguage;
-}
-
-interface ILicenseStatus {
-	readonly EvaluationDaysLeft: number;
-	readonly EvaluationMode: boolean;
-	readonly Expired: boolean;
-	readonly LicenseCode: string;
-	readonly NumOfConcurrentUserLicenses: number;
-	readonly NumOfNamedUserLicenses: number;
-	readonly NumOfReadonlyLicenses: number;
-	readonly SerialNumber: string;
-	ClearLicenseCode(): void;
-}
-
-interface ILoginAccount {
-	readonly AccountName: string;
-	AccountType: MFiles.MFLoginAccountType;
-	DomainName: string;
-	EmailAddress: string;
-	Enabled: boolean;
-	FullName: string;
-	LicenseType: MFiles.MFLicenseType;
-	ServerRoles: MFiles.MFLoginServerRole;
-	UserName: string;
-	Clone(): ILoginAccount;
-	CloneFrom(LoginAccount: ILoginAccount): void;
-	Set(LoginAccountType: MFiles.MFLoginAccountType, DomainName: string, UserName: string, ServerRoles: MFiles.MFLoginServerRole, FullName: string, EmailAddress: string, LicenseType: MFiles.MFLicenseType): void;
-}
-
-interface ILoginAccountPersonalInformation {
-	readonly AccountName: string;
-	readonly Email: string;
-	readonly FullName: string;
-}
-
-interface ILoginAccounts {
-	readonly Count: number;
-	Item(Index: number): ILoginAccount;
-}
-
-interface ILookup {
-	Deleted: boolean;
-	readonly DisplayID: string;
-	readonly DisplayIDAvailable: boolean;
-	DisplayValue: string;
-	readonly Hidden: boolean;
-	Item: number;
-	ItemGUID: string;
-	readonly ObjectFlags: MFiles.MFSpecialObjectFlag;
-	ObjectType: (MFiles.MFBuiltInObjectType | number);
-	Version: number;
-	Clone(): ILookup;
-	CloneFrom(Lookup: ILookup): void;
-	GetFormattedDisplayValue(Localized: boolean, EmptyLookupDispValuesAsHidden: boolean, AddDeletedSuffixIfDeleted: boolean): string;
-}
-
-interface ILookups {
-	readonly Count: number;
-	Add(Index: number, Lookup: ILookup): void;
-	Clone(): ILookups;
-	CloneFrom(Lookups: ILookups): void;
-	GetLookupByItem(Item: number): ILookup;
-	GetLookupIndexByItem(Item: number): number;
-	Item(Index: number): ILookup;
-	Remove(Index: number): void;
-}
-
-interface IMessage {
-	button1_enabled?: boolean;
-	button1_title?: string;
-	button2_enabled?: boolean;
-	button2_title?: string;
-	button3_enabled?: boolean;
-	button3_title?: string;
-	button4_enabled?: boolean;
-	button4_title?: string;
-	cancelButton?: (1 | 2 | 3 | 4);
-	caption?: string;
-	checkbox_checked?: boolean;
-	checkbox_enabled?: boolean;
-	checkbox_title?: string;
-	defaultButton?: (1 | 2 | 3 | 4);
-	icon?: string;
-	message?: string;
-	timeOut?: number;
-	timeout_deactivateOnFocusChange?: boolean;
-	timeOutButton?: (1 | 2 | 3 | 4);
-}
-
-interface IMetadataCard {
-	readonly ActiveView: string;
-	readonly DataModel: IMetadataCardModel;
-	readonly Events: IEvents;
-	readonly HitHighlightingActive: boolean;
-	readonly Location: string;
-	readonly Minimized: boolean;
-	readonly Parent: any;
-	readonly PreviewerVisible: boolean;
-	readonly PreviewerWidth: number;
-	readonly SearchHits: string;
-	readonly Vault: IVault;
-	readonly Views: ICollection;
-	GetApplyAction(): IMetadataCardAction;
-	GetApplyAllAction(): IMetadataCardAction;
-	GetCheckInImmediatelyOption(): IMetadataCardOption;
-	GetDiscardAction(): IMetadataCardAction;
-	GetFavoriteObjectOption(): IMetadataCardOption;
-	GetFollowThisObjectOption(): IMetadataCardOption;
-	GetHeight(): number;
-	GetOpenForEditOption(): IMetadataCardOption;
-	GetPopOutAction(): IMetadataCardAction;
-	GetSkipAction(): IMetadataCardAction;
-	GetUIData(key: string, defaultData: any): any;
-	GetUseAsDefaultsOption(): IMetadataCardOption;
-	GetWidth(): number;
-	IsModified(): boolean;
-	IsOnMultiItemSequence(): boolean;
-	IsPoppedOut(): boolean;
-	PromptForValue(dialog: any): boolean;
-	ResumeAsyncOp(): void;
-	SetEditStateDirty(dirty: boolean): void;
-	SetHeight(Height: number): void;
-	SetLocation(location: string): void;
-	SetMinimized(Minimized: boolean): void;
-	SetWidth(Width: number): void;
-	ShowMessage(message: string | IMessage): number;
-	ShowNewObjectDialog(ObjectType: MFiles.MFBuiltInObjectType | number, defaultName: string): any;
-	ShowPermissionsDialog(): void;
-	StorePreviewerState(previewerVisible: boolean, previewerWidth: number): void;
-	StoreUIData(key: string, data: any, dataIsModeSpecific: boolean, dataIsLayoutSpecific: boolean, dataIsPermanent: boolean): void;
-	SuspendAsyncOp(): void;
-}
-
-interface IMetadataCardAction {
-	readonly Events: IEvents;
-	Activate(): void;
-	GetExplanation(): string;
-	GetName(): string;
-	IsEnabled(): boolean;
-	IsVisible(): boolean;
-}
-
-interface IMetadataCardCommentHistoryItem {
-	GetCommentAuthor(): string;
-	GetCommentText(): string;
-	GetCommentTimestamp(): any;
-	GetCommentVersion(): number;
-}
-
-interface IMetadataCardControl {
-	readonly AllowAdding: boolean;
-	readonly Events: IEvents;
-	readonly Hierarchical: boolean;
-	readonly ID: string;
-	Label: string;
-	readonly Linked: boolean;
-	Modified: boolean;
-	MustExist: boolean;
-	readonly PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
-	ReadOnly: boolean;
-	readonly RealObjectType: boolean;
-	readonly Type: string;
-	Value: any;
-	readonly Valuelist: (MFiles.MFBuiltInValueList | number);
-	ValueRequired: boolean;
-	Visible: boolean;
-	ActivateLink(valuePart: any): void;
-	AddNewItem(name: string): any;
-	AddNewSubItem(name: string, valueParent: any): any;
-	AllowHitHighlighting(): boolean;
-	CanActivateLink(valuePart: any): boolean;
-	CanAddNewSubItem(name: string, valueParent: any): boolean;
-	CanEditItem(value: any): boolean;
-	CreateSelectionList(): IMetadataCardSelectionList;
-	CreateUnvalidatedValue(valueString: string): IMetadataCardUnvalidatedValue;
-	EditItem(value: any): any;
-	FindItem(name: string): any;
-	FindItemByID(itemID: number): any;
-	GetSelectableValueItemStates(): any;
-	GetValueSuggestions(): any;
-	HasAutomaticValue(): boolean;
-	HasInitialValue(): boolean;
-	HasUncalculatedAutomaticValue(): boolean;
-	IsExternal(): boolean;
-	RefreshList(): void;
-	Remove(): void;
-	RevertToInitialValue(): void;
-	SetValueItemState(itemID: string, state: any): void;
-}
-
-interface IMetadataCardModel {
-	readonly CheckedOutTo: IMetadataCardControl;
-	readonly ClassSelector: IMetadataCardControl;
-	readonly Comment: IMetadataCardControl;
-	readonly DataModels: ICollection;
-	readonly Events: IEvents;
-	readonly IconURL: string;
-	readonly ID: string;
-	readonly IsFileAvailableForPreview: boolean;
-	readonly IsUpdating: boolean;
-	readonly ObjectId: IMetadataCardControl;
-	readonly ObjectType: IMetadataCardControl;
-	readonly ObjectTypeId: IMetadataCardControl;
-	readonly ObjectVersion: IMetadataCardControl;
-	readonly ObjVers: IObjVers;
-	readonly PermissionsDescription: string;
-	readonly PropertyControls: ICollection;
-	readonly PropertySelector: IMetadataCardControl;
-	readonly SaveAsTypeSelector: IMetadataCardControl;
-	readonly Title: IMetadataCardControl;
-	readonly UncreatedObject: boolean;
-	AddProperty(propertyDefId: MFiles.MFBuiltInPropertyDef | number): void;
-	GetCommentVersionHistory(): any;
-	GetError(): any;
-	GetIconOverlayHint(): string;
-	GetObjectSourceFiles(): any;
-	GetObjectTemplateDescription(): string;
-	GetRemoteVaultAction(): IMetadataCardAction;
-	GetSubObjectsAction(): IMetadataCardAction;
-	GetValueListItemIdByGUID(propertyDefId: MFiles.MFBuiltInPropertyDef | number, guidToLookFor: string): number;
-	IsModified(): boolean;
-	Rebuild(iterationCounter: number, classChanged: boolean, addedPropertyDef: number): boolean;
-	SetAdditionalPropertyDefs(additionalPropertyDefs: any): void;
-	SetCustomPlaceholders(customPlaceholders: any): void;
-	SetRequiredPropertyDefs(requiredPropertyDefs: any): void;
-	SetUnevaluatedPropertyValues(unevaluatedValues: any): void;
-	ShowFilePreview(previewer: any): void;
-}
-
-interface IMetadataCardMultiValue {
-	readonly ID: string;
-	readonly IsMultiValue: boolean;
-	readonly State: any;
-	readonly ValueParts: any;
-}
-
-interface IMetadataCardMultiValuePart {
-	readonly ID: any;
-	readonly Value: any;
-}
-
-interface IMetadataCardOption {
-	readonly Events: IEvents;
-	GetExplanation(): string;
-	GetName(): string;
-	GetOptionValue(): any;
-	IsEnabled(): boolean;
-	IsVisible(): boolean;
-	SetOptionValue(value: any): void;
-}
-
-interface IMetadataCardSelectionList {
-	readonly Events: IEvents;
-	readonly Filter: string;
-	readonly FilteringValue: string;
-	readonly Items: any;
-	readonly MoreResults: boolean;
-	AutoSelect(identifier: string): void;
-	SetFilter(Filter: string, token: number, maxResults: number): void;
-}
-
-interface IMetadataCardSelectionListItem {
-	readonly ChildItems: any;
-	readonly HasParent: boolean;
-	readonly ParentID: number;
-	readonly Selectable: boolean;
-	readonly Value: any;
-}
-
-interface IMetadataCardUnvalidatedValue {
-	readonly ID: string;
-	readonly IsMultiValue: boolean;
-	readonly IsUnvalidated: boolean;
-	readonly Name: string;
-}
-
-interface IMetadataCardValue {
-	readonly HasIcon: boolean;
-	readonly IconURL: string;
-	readonly ID: string;
-	readonly IsMultiValue: boolean;
-	readonly Item: number;
-	readonly Name: string;
-	readonly State: any;
-	readonly Version: number;
-	IsDeleted(): boolean;
-	IsHidden(): boolean;
-}
-
-interface IMetadataCardValueSuggestion {
-	readonly IsNewValue: boolean;
-	readonly Name: string;
-	readonly Value: any;
-}
-
-interface IMetadataCardView {
-	DashboardID: string;
-	readonly Events: IEvents;
-	Name: string;
-}
-
-interface IMetadataStructureSelector {
-	Flags: MFiles.MFMetadataStructureSelectorFlags;
-	ID: string;
-	Name: string;
-	StructureItemGUID: string;
-	StructureItemID: number;
-	StructureItemSemanticAlias: string;
-	StructureItemType: MFiles.MFMetadataStructureItem;
-	Clone(): IMetadataStructureSelector;
-}
-
-interface IMetadataStructureSelectors {
-	readonly Count: number;
-	Add(Index: number, MetadataStructureSelector: IMetadataStructureSelector): void;
-	Clone(): IMetadataStructureSelectors;
-	Item(Index: number): IMetadataStructureSelector;
-	Item(Index: number, value: IMetadataStructureSelector): void;
-	Remove(Index: number): void;
-}
-
-interface IMFDocListCtrl {
-	AttachToListingWindow(shellListing: any): void;
-}
-
-interface IMFilesClientApplication {
-	AddVaultConnection(VaultConnection: IVaultConnection): void;
-	BindToVault(VaultConnection: string, ParentWindow: number, CanLogIn: boolean, ReturnNULLIfCancelledByUser: boolean): IVault;
-	FindFile(Path: string, UpdateFromServer: boolean): IObjectFileAndVersion;
-	FindObjectVersionAndProperties(Path: string, UpdateFromServer: boolean): IObjectVersionAndProperties;
-	GetAPIVersion(): IMFilesVersion;
-	GetClientLanguage(): string;
-	GetClientVersion(): IMFilesVersion;
-	GetDriveLetter(): string;
-	GetVaultConnection(VaultConnection: string): IVaultConnection;
-	GetVaultConnections(): IVaultConnections;
-	GetVaultConnectionsWithGUID(GUID: string): IVaultConnections;
-	IsObjectPathInMFiles(Path: string): boolean;
-	LogInAs(VaultConnection: string, ParentWindow: number, DefaultAuthType: MFiles.MFAuthType, ReturnNULLIfCancelledByUser: boolean): IVault;
-	LogInAsUser(VaultConnection: string, AuthType: MFiles.MFAuthType, UserName: string, Password: string, Domain: string | null, SPN: string | null): IVault;
-	RemoveVaultConnection(VaultConnectionName: string, UserSpecific: boolean): void;
-	ShowBalloonTip(Msg: string, Title: string, Timeout: number, InfoFlags: number, RemovePrevious: boolean): void;
-	TestConnectionToServerEx(Server: string, Port: string, ProtocolSequence: string, EncryptedConnection: boolean): number;
-}
-
-interface IMFilesServerApplication {
-	readonly LicenseManagementOperations: IServerLicenseManagementOperations;
-	readonly LoginAccountOperations: IServerLoginAccountOperations;
-	readonly ScheduledJobManagementOperations: IServerScheduledJobManagementOperations;
-	readonly ServerManagementOperations: IServerManagementOperations;
-	readonly SharedLinkPublicOperations: ISharedLinkPublicOperations;
-	readonly VaultManagementOperations: IServerVaultManagementOperations;
-	Connect(AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, LocalComputerName: string, AllowAnonymousConnection: boolean): MFiles.MFServerConnection;
-	ConnectAdministrativeEx(TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string): MFiles.MFServerConnection;
-	ConnectEx3(TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, AllowUsingAuthenticationPlugins: boolean, LogicalTargetServer: string): MFiles.MFServerConnection;
-	ConnectEx4(TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, AllowUsingAuthenticationPlugins: boolean, LogicalTargetServer: string, ClientCulture: string): MFiles.MFServerConnection;
-	ConnectWithAuthenticationDataEx2(PluginInfo: IPluginInfo, AuthenticationData: INamedValues, AttemptIdentifier: string, TimeZone: ITimeZoneInformation, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, LogicalTargetServer: string): IAuthenticationResult;
-	ConnectWithAuthenticationDataEx3(PluginInfo: IPluginInfo, AuthenticationData: INamedValues, AttemptIdentifier: string, TimeZone: ITimeZoneInformation, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, LogicalTargetServer: string, ClientCulture: string): IAuthenticationResult;
-	ConnectWithoutLogin(TimeZone: ITimeZoneInformation, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, LocalComputerName: string, LogicalTargetServer: string, ClientCulture: string): MFiles.MFServerConnection;
-	Disconnect(): void;
-	GetAPIVersion(): IMFilesVersion;
-	GetAuthenticationPluginInformationEx(UserName: string, Domain: string, VaultGUID: string, HostName: string, AccountType: MFiles.MFLoginAccountType, TargetPluginName: string, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean): IPluginInfos;
-	GetAuthenticationPluginsEx(ScopeIndependentOnly: boolean, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean): IPluginInfos;
-	GetOnlineVaults(): IVaultsOnServer;
-	GetServerVersion(): IMFilesVersion;
-	GetTokenAsAuthenticationData(Token: string): INamedValues;
-	GetVaults(): IVaultsOnServer;
-	LogInAsUserToVault(VaultGUID: string, TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null): IVault;
-	LogInAsUserToVaultWithSPN(VaultGUID: string, TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null): IVault;
-	LogInToVault(VaultGUID: string): IVault;
-	LogInToVaultAdministrative(VaultGUID: string): IVault;
-	LogInToVaultAdministrativeWithExistingSession(VaultGUID: string): IVault;
-	LogInToVaultEx(VaultGUID: string, AllowUsingAuthenticationPlugins: boolean): IVault;
-	LogInToVaultWithExistingSession(VaultGUID: string): IVault;
-	TestConnectionToServerEx(Server: string, Port: string, ProtocolSequence: string, EncryptedConnection: boolean): number;
-}
-
-interface IMFilesVersion {
-	Build: number;
-	readonly Display: string;
-	Major: number;
-	Minor: number;
-	Patch: number;
-	SoftwarePlatform: MFiles.MFSoftwarePlatformType;
-	Clone(): IMFilesVersion;
-	CompareTo(RightSide: IMFilesVersion): number;
-}
-
-interface IMFResourceManager {
-	GetLocaleSpecificDateFormat(): string;
-	GetUICultures(): IStrings;
-	LoadResourceString(LanguageID: number, ResourceID: number): string;
-}
-
-interface IMonthlyDateTrigger {
-	Days: number;
-	Months: MFiles.MFTriggerMonth;
-}
-
-interface IMonthlyDOWTrigger {
-	DaysOfTheWeek: MFiles.MFTriggerWeekDay;
-	Months: MFiles.MFTriggerMonth;
-	WhichWeek: MFiles.MFTriggerWeekOfMonth;
-}
-
-interface INamedACL {
-	AccessControlList: IAccessControlList;
-	readonly GUID: string;
-	ID: number;
-	Name: string;
-	readonly NamedACLType: MFiles.MFNamedACLType;
-	Clone(): INamedACL;
-}
-
-interface INamedACLAdmin {
-	AccessControlListForNamedACL: IAccessControlList;
-	NamedACL: INamedACL;
-	SemanticAliases: ISemanticAliases;
-	Clone(): INamedACLAdmin;
-}
-
-interface INamedACLs {
-	readonly Count: number;
-	Item(Index: number): INamedACL;
-}
-
-interface INamedACLsAdmin {
-	readonly Count: number;
-	Item(Index: number): INamedACLAdmin;
-}
-
-interface INamedValueNamespace {
-	NamedValues: INamedValues;
-	NamespaceName: string;
-	Clone(): INamedValueNamespace;
-}
-
-interface INamedValueNamespaces {
-	readonly Count: number;
-	Add(Index: number, NamedValueNamespace: INamedValueNamespace): void;
-	Clone(): INamedValueNamespaces;
-	Item(Index: number): INamedValueNamespace;
-	Item(Index: number, value: INamedValueNamespace): void;
-	Remove(Index: number): void;
-}
-
-interface INamedValues {
-	Modified: boolean;
-	readonly Names: IStrings;
-	Clone(): INamedValues;
-	Contains(Name: string): boolean;
-	Value(ValueName: string): any;
-	Value(ValueName: string, value: any): void;
-}
-
-interface INumber {
-	Value: number;
-	Clone(): INumber;
-}
-
-interface IObjectClass {
-	AccessControlList: IAccessControlList;
-	readonly AdditionalClassInfo: IAdditionalClassInfo;
-	AssociatedPropertyDefs: IAssociatedPropertyDefs;
-	AutomaticPermissionsForObjects: IAutomaticPermissions;
-	ForceWorkflow: boolean;
-	ID: number;
-	Name: string;
-	NamePropertyDef: number;
-	ObjectType: (MFiles.MFBuiltInObjectType | number);
-	Workflow: number;
-	Clone(): IObjectClass;
-}
-
-interface IObjectClassAdmin {
-	readonly AdditionalClassInfo: IAdditionalClassInfo;
-	AssociatedPropertyDefs: IAssociatedPropertyDefs;
-	AutomaticPermissionsForObjects: IAutomaticPermissions;
-	ForceWorkflow: boolean;
-	ID: number;
-	Name: string;
-	NamePropertyDef: number;
-	ObjectType: (MFiles.MFBuiltInObjectType | number);
-	Predefined: boolean;
-	SemanticAliases: ISemanticAliases;
-	Workflow: number;
-	Clone(): IObjectClassAdmin;
-}
-
-interface IObjectClasses {
-	readonly Count: number;
-	Add(Index: number, ObjectClass: IObjectClass): void;
-	Clone(): IObjectClasses;
-	Item(Index: number): IObjectClass;
-	Remove(Index: number): void;
-}
-
-interface IObjectClassesAdmin {
-	readonly Count: number;
-	Add(Index: number, ObjectClassAdmin: IObjectClassAdmin): void;
-	Item(Index: number): IObjectClassAdmin;
-	Remove(Index: number): void;
-}
-
-interface IObjectComparer {
-	Compare(ObjectVersionDataLeft: IObjectVersion, ObjectVersionDataRight: IObjectVersion): number;
-}
-
-interface IObjectCreationInfo {
-	DisallowTemplateSelection: boolean;
-	ExplicitObjectID: number;
-	IsObjectShortcut: boolean;
-	ObjectGUID: string;
-	OkToAllButtonVisible: boolean;
-	SkipThisButtonVisible: boolean;
-	GetDisableObjectCreation(): boolean;
-	GetExtension(): string;
-	GetMetadataCardTitle(): string;
-	GetObjectType(): number;
-	GetSelectableFileClasses(): IFileClasses;
-	GetSelectedFileClass(): IFileClass;
-	GetSingleFileDocument(): boolean;
-	GetSourceFiles(): ISourceObjectFiles;
-	GetTemplate(): IObjVer;
-	GetTitle(): ITypedValue;
-	GetTitleAsText(): string;
-	GetUseAsDefaults(): boolean;
-	SetDisableObjectCreation(Disable: boolean): void;
-	SetExtension(Extension: string, Editable: boolean): void;
-	SetMetadataCardTitle(MetadataCardTitle: string): void;
-	SetObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, Editable: boolean): void;
-	SetSelectableFileClasses(FileClasses: IFileClasses): void;
-	SetSelectedFileClass(FileClass: IFileClass, Editable: boolean): void;
-	SetSingleFileDocument(SingleFile: boolean, Editable: boolean): void;
-	SetSourceFiles(SourceFiles: ISourceObjectFiles): void;
-	SetTemplate(Template: IObjVer): void;
-	SetTitle(Title: ITypedValue, Editable: boolean): void;
-	SetTitleAsDatatypeText(Title: string, Editable: boolean): void;
-	SetUseAsDefaults(UseAsDefaults: boolean, Editable: boolean): void;
-}
-
-interface IObjectFile {
-	readonly ChangeTimeUtc: Date;
-	readonly CreationTimeUtc: Date;
-	readonly Extension: string;
-	readonly FileGUID: string;
-	readonly FileVer: IFileVer;
-	readonly ID: number;
-	readonly LastAccessTimeUtc: Date;
-	readonly LastWriteTimeUtc: Date;
-	readonly LogicalSize: number;
-	readonly LogicalSize_32bit: number;
-	readonly Title: string;
-	readonly Version: number;
-	GetNameForFileSystem(): string;
-	ToJSON(): string;
-}
-
-interface IObjectFileAndObjVer {
-	readonly ObjectFile: IObjectFile;
-	readonly ObjVer: IObjVer;
-	Clone(): IObjectFileAndObjVer;
-	ToJSON(): string;
-}
-
-interface IObjectFileAndObjVerOfMultipleFiles {
-	readonly Count: number;
-	Add(Index: number, ObjectFileAndObjVer: IObjectFileAndObjVer): void;
-	Clone(): IObjectFileAndObjVerOfMultipleFiles;
-	Item(Index: number): IObjectFileAndObjVer;
-	Remove(Index: number): void;
-}
-
-interface IObjectFileAndVersion {
-	readonly ObjectFile: IObjectFile;
-	readonly ObjectVersion: IObjectVersionAndProperties;
-}
-
-interface IObjectFileComparer {
-	Compare(FileLeft: IObjectFile, FileRight: IObjectFile): number;
-}
-
-interface IObjectFiles {
-	readonly Count: number;
-	GetObjectFileByNameForFileSystem(NameForFileSystem: string): IObjectFile;
-	GetObjectFileIndexByNameForFileSystem(NameForFileSystem: string): number;
-	Item(Index: number): IObjectFile;
-	Sort(ObjectFileComparer: IObjectFileComparer): void;
-	ToJSON(): string;
-}
-
-interface IObjectSearchResults {
-	readonly Count: number;
-	readonly MoreResults: boolean;
-	Clone(): IObjectSearchResults;
-	GetAsObjectVersions(): IObjectVersions;
-	GetScoreOfObject(ObjVer: IObjVer): number;
-	Item(Index: number): IObjectVersion;
-	ScoreAt(Index: number): number;
-	Sort(ObjectComparer: IObjectComparer): void;
-	SortByScore(Ascending: boolean): void;
-}
-
-interface IObjectTemplateSelector {
-	readonly ClassSelector: IMetadataCardControl;
-	readonly Events: IEvents;
-	GetObjectTypeIconURL(): string;
-	GetObjectTypeId(): number;
-	GetObjectTypeName(): string;
-	GetTemplateItems(): any;
-	SelectItem(itemID: string): void;
-}
-
-interface IObjectTemplateSelectorItem {
-	GetClassID(): number;
-	GetClassName(): string;
-	GetGroupID(): number;
-	GetGroupName(): string;
-	GetIconURL(): string;
-	GetID(): string;
-	GetName(): string;
-	GetTemplateID(): number;
-	IsBlankItem(): boolean;
-	IsDefaultTemplateForClass(): boolean;
-}
-
-interface IObjectType {
-	AccessControlList: IAccessControlList;
-	AllowAdding: boolean;
-	AllowedAsGroupingLevel: boolean;
-	CanHaveFiles: boolean;
-	DefaultAccessControlList: IAccessControlList;
-	DefaultPropertyDef: number;
-	External: boolean;
-	readonly GUID: string;
-	HasOwnerType: boolean;
-	Hierarchical: boolean;
-	Icon: ReadonlyArray<number>;
-	ID: number;
-	NamePlural: string;
-	NameSingular: string;
-	ObjectTypeTargetsForBrowsing: IObjectTypeTargetsForBrowsing;
-	OwnerPropertyDef: number;
-	OwnerType: number;
-	readonly ReadOnlyPropertiesDuringInsert: IIDs;
-	readonly ReadOnlyPropertiesDuringUpdate: IIDs;
-	RealObjectType: boolean;
-	ShowCreationCommandInTaskPane: boolean;
-	Translatable: boolean;
-	CanHaveItemIcons(): boolean;
-	Clone(): IObjectType;
-	GetIconAsPNG(Width: number, Height: number): ReadonlyArray<number>;
-	IsAddingAllowedForUser(SessionInfo: ISessionInfo): boolean;
-}
-
-interface IObjectTypeAdmin {
-	ColumnMappings: IObjectTypeColumnMappings;
-	ConnectionString: string;
-	DefaultForAutomaticPermissions: IAutomaticPermissions;
-	DeleteStatement: string;
-	InsertIntoStatement: string;
-	NamedValueNamespaces: INamedValueNamespaces;
-	ObjectType: IObjectType;
-	SelectExtIDStatement: string;
-	SelectStatement: string;
-	SelectStatementOneRecord: string;
-	SemanticAliases: ISemanticAliases;
-	Translatable: boolean;
-	UpdateStatement: string;
-	Clone(): IObjectTypeAdmin;
-}
-
-interface IObjectTypeColumnMapping {
-	ObjectType: (MFiles.MFBuiltInObjectType | number);
-	Ordinal: number;
-	PartOfInsert: boolean;
-	PartOfUpdate: boolean;
-	SourceField: string;
-	TargetPropertyDef: number;
-	Type: number;
-	Clone(): IObjectTypeColumnMapping;
-}
-
-interface IObjectTypeColumnMappings {
-	readonly Count: number;
-	Add(Index: number, ObjectTypeColumnMapping: IObjectTypeColumnMapping): void;
-	Clone(): IObjectTypeColumnMappings;
-	Item(Index: number): IObjectTypeColumnMapping;
-	Remove(Index: number): void;
-}
-
-interface IObjectTypes {
-	readonly Count: number;
-	Clone(): IObjectTypes;
-	Item(Index: number): IObjectType;
-}
-
-interface IObjectTypesAdmin {
-	readonly Count: number;
-	Item(Index: number): IObjectTypeAdmin;
-}
-
-interface IObjectTypeTargetForBrowsing {
-	TargetObjectType: number;
-	ViewCollection: number;
-	Clone(): IObjectTypeTargetForBrowsing;
-}
-
-interface IObjectTypeTargetsForBrowsing {
-	readonly Count: number;
-	Add(Index: number, ObjectTypeTargetForBrowsing: IObjectTypeTargetForBrowsing): void;
-	Clone(): IObjectTypeTargetsForBrowsing;
-	Item(Index: number): IObjectTypeTargetForBrowsing;
-	Remove(Index: number): void;
-}
-
-interface IObjectVersion {
-	readonly AccessedByMeUtc: Date;
-	readonly CheckedOutAtUtc: Date;
-	readonly CheckedOutTo: number;
-	readonly CheckedOutToHostName: string;
-	readonly CheckedOutToUserName: string;
-	readonly CheckedOutVersion: number;
-	readonly Class: (MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number);
-	readonly CreatedUtc: Date;
-	readonly Deleted: boolean;
-	readonly DisplayID: string;
-	readonly DisplayIDAvailable: boolean;
-	readonly Files: IObjectFiles;
-	readonly FilesCount: number;
-	readonly HasAssignments: boolean;
-	readonly HasSharedFiles: boolean;
-	readonly IsAccessedByMeValid: boolean;
-	readonly IsObjectConflict: boolean;
-	readonly IsObjectShortcut: boolean;
-	readonly LastModifiedUtc: Date;
-	readonly LatestCheckedInVersion: number;
-	readonly LatestCheckedInVersionOrCheckedOutVersion: boolean;
-	readonly ObjectCheckedOut: boolean;
-	readonly ObjectCheckedOutToThisUserOnAnyComputer: boolean;
-	readonly ObjectCheckedOutToThisUserOnThisComputer: boolean;
-	readonly ObjectFlags: MFiles.MFSpecialObjectFlag;
-	readonly ObjectGUID: string;
-	readonly ObjectVersionFlags: MFiles.MFObjectVersionFlag;
-	readonly ObjVer: IObjVer;
-	readonly OriginalObjID: IObjID;
-	readonly OriginalVaultGUID: string;
-	readonly SingleFile: boolean;
-	readonly ThisVersionCheckedOut: boolean;
-	readonly ThisVersionLatestToThisUser: boolean;
-	readonly Title: string;
-	readonly VersionGUID: string;
-	readonly VisibleAfterOperation: boolean;
-	Clone(): IObjectVersion;
-	GetNameForFileSystem(IncludeID: boolean): string;
-	GetNameForFileSystemEx(IncludeID: boolean, UseOriginalID: boolean): string;
-}
-
-interface IObjectVersionAndProperties {
-	readonly ObjVer: IObjVer;
-	readonly Properties: IPropertyValues;
-	readonly Vault: IVault;
-	readonly VersionData: IObjectVersion;
-	Clone(): IObjectVersionAndProperties;
-}
-
-interface IObjectVersionAndPropertiesOfMultipleObjects {
-	readonly Count: number;
-	Add(Index: number, ObjectVersionAndProperties: IObjectVersionAndProperties): void;
-	Clone(): IObjectVersionAndPropertiesOfMultipleObjects;
-	Item(Index: number): IObjectVersionAndProperties;
-	Remove(Index: number): void;
-}
-
-interface IObjectVersionPermissions {
-	readonly AccessControlList: IAccessControlList;
-	readonly CustomACL: boolean;
-	readonly NamedACL: INamedACL;
-	readonly ObjVer: IObjVer;
-}
-
-interface IObjectVersions {
-	readonly Count: number;
-	Add(Index: number, ObjectVersionData: IObjectVersion): void;
-	GetAsObjVers(): IObjVers;
-	Item(Index: number): IObjectVersion;
-	Item(Index: number, value: IObjectVersion): void;
-	Remove(Index: number): void;
-	Sort(ObjectComparer: IObjectComparer): void;
-}
-
-interface IObjectVersionWorkflowState {
-	State: IPropertyValue;
-	VersionComment: IPropertyValue;
-	Workflow: IPropertyValue;
-}
-
-interface IObjectWindowResult {
-	readonly AccessControlList: IAccessControlList;
-	readonly ObjVer: IObjVer;
-	readonly Properties: IPropertyValues;
-	readonly Result: MFiles.MFObjectWindowResultCode;
-	readonly SelectedFileClass: IFileClass;
-	readonly UseAsDefaults: boolean;
-	readonly Visible: boolean;
-}
-
-interface IObjID {
-	ID: number;
-	Type: number;
-	Clone(): IObjID;
-	CloneFrom(ObjID: IObjID): void;
-	Serialize(): ReadonlyArray<number>;
-	SetIDs(ObjType: number, ID: number): void;
-	ToJSON(): string;
-	Unserialize(Bytes: ReadonlyArray<number>): void;
-}
-
-interface IObjIDs {
-	readonly Count: number;
-	Add(Index: number, ObjID: IObjID): void;
-	Item(Index: number): IObjID;
-	Item(Index: number, value: IObjID): void;
-	Remove(Index: number): void;
-	ToJSON(): string;
-}
-
-interface IObjOrFileVer {
-	FileVer: IFileVer;
-	ObjVer: IObjVer;
-	Clone(): IObjOrFileVer;
-	IsFile(): boolean;
-}
-
-interface IObjOrFileVers {
-	readonly Count: number;
-	Add(Index: number, ObjOrFileVer: IObjOrFileVer): void;
-	Clone(): IObjOrFileVers;
-	Item(Index: number): IObjOrFileVer;
-	Remove(Index: number): void;
-}
-
-interface IObjVer {
-	ID: number;
-	ObjID: IObjID;
-	Type: number;
-	Version: number;
-	Clone(): IObjVer;
-	CloneFrom(ObjVer: IObjVer): void;
-	Serialize(): ReadonlyArray<number>;
-	SetIDs(ObjType: number, ID: number, Version: number): void;
-	SetObjIDAndVersion(ObjID: IObjID, Version: number): void;
-	ToJSON(): string;
-	Unserialize(Bytes: ReadonlyArray<number>): void;
-}
-
-interface IObjVers {
-	readonly Count: number;
-	Add(Index: number, ObjVer: IObjVer): void;
-	Clone(): IObjVers;
-	GetAllDistinctObjIDs(): IObjIDs;
-	Item(Index: number): IObjVer;
-	Remove(Index: number): void;
-	ToJSON(): string;
-}
-
-interface IOCROptions {
-	PrimaryLanguage: MFiles.MFOCRLanguage;
-	SecondaryLanguage: MFiles.MFOCRLanguage;
-	Clone(): IOCROptions;
-}
-
-interface IOCRPage {
-	OCRZones: IOCRZones;
-	PageNum: number;
-	Clone(): IOCRPage;
-}
-
-interface IOCRPageResult {
-	readonly OCRZoneResults: IOCRZoneResults;
-	readonly PageNum: number;
-}
-
-interface IOCRPageResults {
-	readonly Count: number;
-	Item(Index: number): IOCRPageResult;
-}
-
-interface IOCRPages {
-	readonly Count: number;
-	Add(Index: number, OCRPage: IOCRPage): void;
-	Clone(): IOCRPages;
-	Item(Index: number): IOCRPage;
-	Remove(Index: number): void;
-}
-
-interface IOCRZone {
-	Barcode: boolean;
-	DataType: MFiles.MFDataType;
-	DimensionUnit: MFiles.MFOCRDimensionUnit;
-	readonly HasOCROptions: boolean;
-	Height: number;
-	ID: number;
-	Left: number;
-	Name: string;
-	OCROptions: IOCROptions;
-	Top: number;
-	Width: number;
-	ClearOCROptions(): void;
-	Clone(): IOCRZone;
-	SetOCROptions(OCROptions: IOCROptions): void;
-}
-
-interface IOCRZoneResult {
-	readonly Confidence: number;
-	readonly DimensionUnit: MFiles.MFOCRDimensionUnit;
-	readonly Height: number;
-	readonly ID: number;
-	readonly Left: number;
-	readonly RecognizedOnPage: number;
-	readonly ResultValue: ITypedValue;
-	readonly Top: number;
-	readonly Width: number;
-}
-
-interface IOCRZoneResults {
-	readonly Count: number;
-	Item(Index: number): IOCRZoneResult;
-}
-
-interface IOCRZones {
-	readonly Count: number;
-	Add(Index: number, OCRZone: IOCRZone): void;
-	Clone(): IOCRZones;
-	Item(Index: number): IOCRZone;
-	Remove(Index: number): void;
-}
-
-interface IOptimizeVaultJob {
-	GarbageCollectFiles: boolean;
-	readonly Thorough: boolean;
-	readonly VaultGUID: string;
-	GetNumberOfSteps(): number;
-	GetOneBasedIndexOfStep(CurrentStep: number): number;
-	GetStepProgressText(CurrentStep: number): string;
-	Set(GuidVault: string, Thorough: boolean): void;
-}
-
-interface IOwnerPropertyDef {
-	DependencyRelation: MFiles.MFDependencyRelation;
-	ID: number;
-	IndexForAutomaticFilling: number;
-	readonly IsRelationFiltering: boolean;
-}
-
-interface IPluginInfo {
-	AssemblyName: string;
-	BridgeClassName: string;
-	Configuration: INamedValues;
-	ConfigurationScope: string;
-	ConfigurationSource: INamedValues;
-	ConfigurationVaultGUID: string;
-	IsDefault: boolean;
-	IsScopeIndependent: boolean;
-	Name: string;
-	Clone(): IPluginInfo;
-}
-
-interface IPluginInfos {
-	readonly Count: number;
-	Add(Index: number, PluginInfo: IPluginInfo): void;
-	Clone(): IPluginInfos;
-	Item(Index: number): IPluginInfo;
-	Item(Index: number, value: IPluginInfo): void;
-	Remove(Index: number): void;
-}
-
-interface IPreviewerActiveXCtrl {
-	ClearPreview(): number;
-	ShowFilePreview(bstrFilename: string): number;
-	ShowHitHighlightedFilePreview(bstrFilename: string, lObjType: number, lObjID: number, lObjVersion: number, lFile: number, lFileVersion: number, pIHitHighlightingInfo: any, bstrSearchConditions: string): number;
-}
-
-interface IPropertyDef {
-	AccessControlList: IAccessControlList;
-	AllObjectTypes: boolean;
-	AllowedAsGroupingLevel: boolean;
-	AutomaticValueDefinition: ITypedValue;
-	AutomaticValueType: MFiles.MFAutomaticValueType;
-	BasedOnValueList: boolean;
-	ContentType: MFiles.MFContentType;
-	DataType: MFiles.MFDataType;
-	DependencyPD: number;
-	DependencyRelation: MFiles.MFDependencyRelation;
-	FormattingType: MFiles.MFFormattingType;
-	readonly GUID: string;
-	ID: number;
-	Name: string;
-	ObjectType: (MFiles.MFBuiltInObjectType | number);
-	OwnerPropertyDef: IOwnerPropertyDef;
-	Predefined: boolean;
-	SortAscending: boolean;
-	StaticFilter: ISearchConditions;
-	readonly ThisIsConflictPD: boolean;
-	readonly ThisIsDefaultPD: boolean;
-	readonly ThisIsOwnerPD: boolean;
-	UpdateType: MFiles.MFUpdateType;
-	ValidationType: MFiles.MFValidationType;
-	ValueList: (MFiles.MFBuiltInValueList | number);
-	ValueListSortingType: MFiles.MFValueListSortingType;
-	Clone(): IPropertyDef;
-}
-
-interface IPropertyDefAdmin {
-	AllowAutomaticPermissions: boolean;
-	AutomaticValue: IAutomaticValue;
-	NamedValueNamespaces: INamedValueNamespaces;
-	PropertyDef: IPropertyDef;
-	SemanticAliases: ISemanticAliases;
-	Validation: IValidation;
-	Clone(): IPropertyDefAdmin;
-}
-
-interface IPropertyDefOrObjectType {
-	ID: number;
-	PropertyDef: boolean;
-	Clone(): IPropertyDefOrObjectType;
-	GetAsExpression(): IExpression;
-}
-
-interface IPropertyDefOrObjectTypes {
-	readonly Count: number;
-	Add(Index: number, PropertyDefOrObjectType: IPropertyDefOrObjectType): void;
-	Clone(): IPropertyDefOrObjectTypes;
-	Item(Index: number): IPropertyDefOrObjectType;
-	Item(Index: number, value: IPropertyDefOrObjectType): void;
-	Remove(Index: number): void;
-}
-
-interface IPropertyDefs {
-	readonly Count: number;
-	Clone(): IPropertyDefs;
-	Item(Index: number): IPropertyDef;
-}
-
-interface IPropertyDefsAdmin {
-	readonly Count: number;
-	Item(Index: number): IPropertyDefAdmin;
-}
-
-interface IPropertyValue {
-	PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
-	TypedValue: ITypedValue;
-	Value: ITypedValue;
-	Clone(): IPropertyValue;
-	CloneFrom(PropertyValue: IPropertyValue): void;
-	GetValueAsLocalizedText(): string;
-	GetValueAsText(Localized: boolean, NULLAsEmptyString: boolean, EmptyLookupDisplayValuesAsHidden: boolean, LongDateFormat: boolean, NoSeconds: boolean, NumericValueAsKilobytes: boolean): string;
-	GetValueAsUnlocalizedText(): string;
-}
-
-interface IPropertyValueForDisplay {
-	readonly ContentType: MFiles.MFContentType;
-	readonly DataType: MFiles.MFDataType;
-	readonly DisplayValue: string;
-	readonly PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
-	readonly PropertyDefName: string;
-	readonly PropertyValue: IPropertyValue;
-	readonly ReadOnly: boolean;
-	Clone(): IPropertyValueForDisplay;
-}
-
-interface IPropertyValueIconClue {
-	readonly PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
-	readonly ValueListItem: number;
-	Clone(): IPropertyValueIconClue;
-}
-
-interface IPropertyValueIconClues {
-	readonly Count: number;
-	Clone(): IPropertyValueIconClues;
-	Item(Index: number): IPropertyValueIconClue;
-}
-
-interface IPropertyValues {
-	readonly Count: number;
-	Add(Index: number, PropertyValue: IPropertyValue): void;
-	Clone(): IPropertyValues;
-	CloneFrom(PropertyValues: IPropertyValues): void;
-	IndexOf(PropertyDef: MFiles.MFBuiltInPropertyDef | number): number;
-	IndexOfByAlias(Vault: IVault, PropertyDefAlias: string): number;
-	Item(Index: number): IPropertyValue;
-	Item(Index: number, value: IPropertyValue): void;
-	Remove(Index: number): void;
-	SearchForProperty(PropertyDef: MFiles.MFBuiltInPropertyDef | number): IPropertyValue;
-	SearchForPropertyByAlias(Vault: IVault, PropertyDefAlias: string, ReturnNULLIfNotFound: boolean): IPropertyValue;
-	SearchForPropertyEx(PropertyDef: MFiles.MFBuiltInPropertyDef | number, ReturnNULLIfNotFound: boolean): IPropertyValue;
-}
-
-interface IPropertyValuesForDisplay {
-	readonly Count: number;
-	Item(Index: number): IPropertyValueForDisplay;
-}
-
-interface IPropertyValuesOfMultipleObjects {
-	readonly Count: number;
-	Clone(): IPropertyValuesOfMultipleObjects;
-	Item(Index: number): IPropertyValues;
-}
-
-interface IPropertyValueSuggestion {
-	readonly IsFact: boolean;
-	readonly Quality: number;
-	readonly TypedValue: ITypedValue;
-	Clone(): IPropertyValueSuggestion;
-}
-
-interface IPropertyValueSuggestions {
-	readonly Count: number;
-	Add(Index: number, IPropertyValueSuggestion: IPropertyValueSuggestion): void;
-	Clone(): IPropertyValueSuggestions;
-	Item(Index: number): IPropertyValueSuggestion;
-	Item(Index: number, value: IPropertyValueSuggestion): void;
-	Remove(Index: number): void;
-}
-
-interface IPropertyValuesWithIconClues {
-	readonly IconClues: IPropertyValueIconClues;
-	readonly ObjVer: IObjVer;
-	readonly PropertyValues: IPropertyValues;
-	Clone(): IPropertyValuesWithIconClues;
-}
-
-interface IPropertyValuesWithIconCluesOfMultipleObjects {
-	readonly Count: number;
-	Clone(): IPropertyValuesWithIconCluesOfMultipleObjects;
-	Item(Index: number): IPropertyValuesWithIconClues;
-}
-
-interface IReportAccessCredentials {
-	readonly Domain: string;
-	readonly ExtAccount: boolean;
-	readonly Password: string;
-	readonly UserName: string;
-}
-
-interface IRestoreJob {
-	BackupFileDifferential: string;
-	BackupFileFull: string;
-	Impersonation: IImpersonation;
-	OverwriteExistingFiles: boolean;
-	VaultProperties: IVaultProperties;
-}
-
-interface IScheduledJob {
-	readonly BackupVaultJob: IBackupJob;
-	Enabled: boolean;
-	readonly ExportContentJob: IExportContentJob;
-	ID: number;
-	readonly ImportContentJob: IImportContentJob;
-	JobName: string;
-	JobType: MFiles.MFScheduledJobType;
-	readonly OptimizeVaultJob: IOptimizeVaultJob;
-	Temporary: boolean;
-	Triggers: IScheduledJobTriggers;
-	SetBackupVaultJob(BackupVaultJob: IBackupJob): void;
-	SetExportContentJob(ExportContentJob: IExportContentJob): void;
-	SetImportContentJob(ImportContentJob: IImportContentJob): void;
-	SetOptimizeVaultJob(OptimizeVaultJob: IOptimizeVaultJob): void;
-}
-
-interface IScheduledJobOutputInfo {
-	ID: number;
-	JobType: MFiles.MFScheduledJobType;
-	Message: string;
-}
-
-interface IScheduledJobRunInfo {
-	readonly Cancelled: boolean;
-	readonly CurrentStep: number;
-	readonly LastRun: ITimestamp;
-	readonly LastRunErrors: string;
-	readonly LastRunSucceeded: boolean;
-	readonly NextRun: ITimestamp;
-	readonly Running: boolean;
-	readonly ScheduledJobOutputInfo: IScheduledJobOutputInfo;
-	readonly StepCompletionPercent: number;
-}
-
-interface IScheduledJobs {
-	readonly Count: number;
-	Item(Index: number): IScheduledJob;
-}
-
-interface IScheduledJobTrigger {
-	BeginDay: number;
-	BeginMonth: number;
-	BeginYear: number;
-	EndDay: number;
-	EndMonth: number;
-	EndYear: number;
-	StartHour: number;
-	StartMinute: number;
-	Type: ITriggerType;
-	ValidEndDate: boolean;
-	Clone(): IScheduledJobTrigger;
-}
-
-interface IScheduledJobTriggers {
-	readonly Count: number;
-	Add(Index: number, ScheduledJobTrigger: IScheduledJobTrigger): void;
-	Clone(): IScheduledJobTriggers;
-	Item(Index: number): IScheduledJobTrigger;
-	Remove(Index: number): void;
-}
-
-interface ISearchCondition {
-	ConditionType: MFiles.MFConditionType;
-	Expression: IExpression;
-	TypedValue: ITypedValue;
-	Clone(): ISearchCondition;
-	Set(Expression: IExpression, ConditionType: MFiles.MFConditionType, TypedValue: ITypedValue): void;
-}
-
-interface ISearchConditionEx {
-	Enabled: boolean;
-	Ignored: boolean;
-	SearchCondition: ISearchCondition;
-	SpecialNULL: boolean;
-	Clone(): ISearchConditionEx;
-	Set(SearchCondition: ISearchCondition, Enabled: boolean, SpecialNULL: boolean, Ignored: boolean): void;
-}
-
-interface ISearchConditionExs {
-	readonly Count: number;
-	Add(Index: number, SearchConditionEx: ISearchConditionEx): void;
-	Clone(): ISearchConditionExs;
-	Item(Index: number): ISearchConditionEx;
-	Item(Index: number, value: ISearchConditionEx): void;
-	Remove(Index: number): void;
-}
-
-interface ISearchConditions {
-	readonly Count: number;
-	Add(Index: number, SearchCondition: ISearchCondition): void;
-	AppendFromExportedSearchString(ExportedSearchString: string): void;
-	Clone(): ISearchConditions;
-	GetAsExportedSearchString(SearchFlags: MFiles.MFSearchFlags): string;
-	Item(Index: number): ISearchCondition;
-	Item(Index: number, value: ISearchCondition): void;
-	Remove(Index: number): void;
-}
-
-interface ISearchCriteria {
-	AdditionalConditions: ISearchConditionExs;
-	ExpandUI: boolean;
-	FacetFilterAsJSON: string;
-	FacetFilterStatusFlags: MFiles.MFFacetFilterStatusFlags;
-	FirstCondition: ISearchConditionEx;
-	FullTextSearchFlags: MFiles.MFFullTextSearchFlags;
-	FullTextSearchString: string;
-	ObjectTypeCondition: ISearchConditionEx;
-	PredefinedSearchFilter: MFiles.MFPredefinedSearchFilterType;
-	PreviousBaseConditions: ISearchConditions;
-	SearchFlags: MFiles.MFSearchFlags;
-	SearchRefinement: ISearchConditions;
-	SearchWithinThisFolder: boolean;
-	SecondCondition: ISearchConditionEx;
-	Clone(): ISearchCriteria;
-	GetAsSearchConditions(ForceGettingExpandedConds: boolean, IncludeSearchRefinementConditions: boolean, IncludePreviousBaseConditions: boolean): ISearchConditions;
-}
-
-interface ISearchDef {
-	Conditions: ISearchConditions;
-	Levels: IExpressionExs;
-	LookInAllVersions: boolean;
-	ReturnLatestVisibleVersion: boolean;
-	SearchFlags: MFiles.MFSearchFlags;
-	Clone(): ISearchDef;
-	IsIndirectionUsed(): boolean;
-}
-
-interface ISearchPane {
-	readonly Available: boolean;
-	readonly Events: ISearchPaneEvents;
-	Visible: boolean;
-	SetTheme(theme: ITheme): void;
-}
-
-interface ISearchPaneEvents extends IEvents {
-	OnHidePane?(): void;
-	OnShowPane?(): void;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface ISemanticAliases {
-	Value: string;
-	Clone(): ISemanticAliases;
-}
-
-interface IServerDataPushSink {
-	OnServerDataPush(RequestID: number, JsonDataContent: string): void;
-}
-
-interface IServerLicenseManagementOperations {
-	GetLicenseStatus(): ILicenseStatus;
-	SetLicenseCodeAndSerialNumber(SerialNumber: string, LicenseCode: string): void;
-}
-
-interface IServerLoginAccountOperations {
-	AddLoginAccount(LoginAccount: ILoginAccount, Password: string): void;
-	ForceLogout(AccountNames: IStrings): void;
-	GetLoginAccount(AccountName: string): ILoginAccount;
-	GetLoginAccounts(): ILoginAccounts;
-	GetLoginAccountsWithSessions(): ILoginAccounts;
-	GetPersonalInformationFromDomain(AccountName: string): ILoginAccountPersonalInformation;
-	ModifyLoginAccount(LoginAccount: ILoginAccount): void;
-	RemoveLoginAccount(AccountName: string): void;
-	UpdateLoginPassword(AccountName: string, NewPassword: string): void;
-}
-
-interface IServerManagementOperations {
-	BackupMasterDB(BackupFile: string, OverwriteExistingFiles: boolean, FileSizeLimitInMB: number, Impersonation: IImpersonation): void;
-	ConfigureWebAccessToDefaultWebSite(): void;
-	ConfigureWebAccessToExistingWebSite(WebSite: string): void;
-	ConfigureWebAccessToNewVirtualDirectory(WebSite: string, VirtualDirectory: string): void;
-	ConfigureWebAccessToNewWebSite(WebSite: string, Port: string): void;
-	GetEventHandlers(): IEventHandlers;
-	RestoreMasterDB(BackupFile: string, Impersonation: IImpersonation): void;
-	SetEventHandlers(EventHandlers: IEventHandlers): void;
-}
-
-interface IServerScheduledJobManagementOperations {
-	AddScheduledJob(ScheduledJob: IScheduledJob): number;
-	CancelScheduledJob(ID: number): void;
-	GetScheduledJob(ID: number): IScheduledJob;
-	GetScheduledJobRunInfo(ID: number): IScheduledJobRunInfo;
-	GetScheduledJobs(): IScheduledJobs;
-	ModifyScheduledJob(ScheduledJob: IScheduledJob): void;
-	RemoveScheduledJob(ID: number): void;
-	StartScheduledJob(ID: number): void;
-}
-
-interface IServerVaultManagementOperations {
-	AttachVault(VaultProperties: IVaultProperties, UpdateAttachmentGUID: boolean): IVaultProperties;
-	AttachVaultWithOptions(VaultProperties: IVaultProperties, Options: IAttachVaultOptions): IVaultProperties;
-	BackupVault(BackupJob: IBackupJob): void;
-	BringVaultOnline(VaultGUID: string): void;
-	CopyVault(CopyVaultJob: ICopyVaultJob): ICopyVaultJobOutputInfo;
-	CreateNewVault(VaultProperties: IVaultProperties): string;
-	DestroyVault(VaultGUID: string): void;
-	DetachVault(VaultGUID: string): void;
-	GetBackupFileContents(BackupFileFull: string, BackupFileDifferential: string, Impersonation: IImpersonation): IVaultProperties;
-	GetVaultProperties(VaultGUID: string): IVaultProperties;
-	OptimizeVault(OptimizeVaultJob: IOptimizeVaultJob): void;
-	RestoreVault(RestoreJob: IRestoreJob): void;
-	TakeVaultOffline(VaultGUID: string, DisconnectUsers: boolean): void;
-}
-
-interface ISessionInfo {
-	readonly AccountName: string;
-	readonly ACLMode: MFiles.MFACLMode;
-	readonly AuthenticationType: MFiles.MFAuthType;
-	readonly CanCreateObjects: boolean;
-	readonly CanForceUndoCheckout: boolean;
-	readonly CanManageCommonUISettings: boolean;
-	readonly CanManageCommonViews: boolean;
-	readonly CanManageTraditionalFolders: boolean;
-	readonly CanMaterializeViews: boolean;
-	readonly CanSeeAllObjects: boolean;
-	readonly CanSeeDeletedObjects: boolean;
-	readonly ClientCulture: string;
-	readonly InternalUser: boolean;
-	readonly IsSharingPublicLinksAllowed: boolean;
-	readonly IsSharingPublicLinksToLatestVersionAllowed: boolean;
-	readonly KeepAliveIntervalInSeconds: number;
-	readonly Language: number;
-	readonly LicenseAllowsModifications: boolean;
-	readonly LocalComputerName: string;
-	readonly ProductMode: MFiles.MFProductMode;
-	readonly ServerVersion: number;
-	readonly TimeZoneInfo: ITimeZoneInformation;
-	readonly UserAndGroupMemberships: IUserOrUserGroupIDs;
-	readonly UserAndSubstitutedByMe: IUserOrUserGroupIDs;
-	readonly UserID: number;
-	readonly VaultGUID: string;
-	CheckObjectAccess(ObjectAccessControlList: IAccessControlList, DesiredObjectAccess: MFiles.MFObjectAccess): boolean;
-	CheckObjectTypeAccess(ObjectTypeAccessControlList: IAccessControlList, DesiredObjectTypeAccess: MFiles.MFObjectTypeAccess): boolean;
-	CheckPropertyDefAccess(PropertyDefAccessControlList: IAccessControlList, DesiredPropertyDefAccess: MFiles.MFPropertyDefAccess): boolean;
-	CheckVaultAccess(DesiredVaultAccess: MFiles.MFVaultAccess): boolean;
-	CloneFrom(SessionInfo: ISessionInfo): void;
-	IsLoggedOnUserSubstituteOfUser(UserID: number): boolean;
-}
-
-interface ISetPropertiesParams {
-	AccessControlListEnforcingMode: MFiles.MFACLEnforcingMode;
-	AccessControlListProvidedForEnforcing: IAccessControlList;
-	AllowModifyingCheckedInObject: boolean;
-	FailIfNotLatestCheckedInVersion: boolean;
-	FullSet: boolean;
-	ObjVer: IObjVer;
-	PropertyValuesToRemove: IIDs;
-	PropertyValuesToSet: IPropertyValues;
-	Clone(): ISetPropertiesParams;
-	SetWithPermissions(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, FailIfNotLatestCheckedInVersion: boolean, PropertyValuesToSet: IPropertyValues, FullSet: boolean, PropertyValuesToRemove: IIDs, ObjectOperationFlags: MFiles.MFObjectOperationFlags, AccessControlListEnforcingMode: MFiles.MFACLEnforcingMode, AccessControlListProvidedForEnforcing: IAccessControlList): void;
-}
-
-interface ISetPropertiesParamsOfMultipleObjects {
-	readonly Count: number;
-	Add(Index: number, SetPropertiesParams: ISetPropertiesParams): void;
-	Clone(): ISetPropertiesParamsOfMultipleObjects;
-	Item(Index: number): ISetPropertiesParams;
-	Remove(Index: number): void;
-}
-
-interface ISharedFileInfo {
-	readonly ChangeTimeUtc: Date;
-	readonly Extension: string;
-	readonly LogicalSize: number;
-	readonly LogicalSize_32bit: number;
-	readonly Title: string;
-	Clone(): ISharedFileInfo;
-}
-
-interface ISharedLinkInfo {
-	readonly AccessKey: string;
-	readonly CreatedByUser: number;
-	readonly CreationTime: ITimestamp;
-	Description: string;
-	ExpirationTime: ITimestamp;
-	FileVer: IFileVer;
-	ObjVer: IObjVer;
-	Clone(): ISharedLinkInfo;
-	Set(ObjVer: IObjVer, FileVer: IFileVer): void;
-}
-
-interface ISharedLinkInfos {
-	readonly Count: number;
-	Add(Index: number, SharedLink: ISharedLinkInfo): void;
-	Clone(): ISharedLinkInfos;
-	Item(Index: number): ISharedLinkInfo;
-	Item(Index: number, value: ISharedLinkInfo): void;
-	Remove(Index: number): void;
-}
-
-interface ISharedLinkPublicOperations {
-	DownloadSharedFileInBlocks_Begin(VaultGUID: string, AccessKey: string, AdditionalData: INamedValues): IFileDownloadSession;
-	DownloadSharedFileInBlocks_Begin_32bit(VaultGUID: string, AccessKey: string, AdditionalData: INamedValues): IFileDownloadSession;
-	DownloadSharedFileInBlocks_ReadBlock(VaultGUID: string, AccessKey: string, DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
-	DownloadSharedFileInBlocks_ReadBlock_32bit(VaultGUID: string, AccessKey: string, DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
-	GetSharedLinkInfo(VaultGUID: string, AccessKey: string, AdditionalData: INamedValues): ISharedFileInfo;
-}
-
-interface IShellFrame {
-	readonly ActiveListing: IShellListing;
-	readonly BottomPane: IShellPaneContainer;
-	readonly Commands: ICommands;
-	readonly CurrentFolder: IFolderDefs;
-	readonly CurrentObjectVersion: IObjectVersion;
-	CurrentPath: string;
-	readonly Events: IShellFrameEvents;
-	readonly Listing: IShellListing;
-	readonly OuterWindow: IWindow;
-	readonly ParentFolder: IFolderDefs;
-	readonly RightPane: IShellPaneContainer;
-	readonly SearchPane: ISearchPane;
-	readonly ShellUI: IShellUI;
-	readonly TaskPane: ITaskPane;
-	readonly UseCompactLayout: boolean;
-	CreateAdditionalListingForPath(path: string): IShellListing;
-	CreateAdditionalListingForView(viewID: MFiles.MFBuiltInView | number): IShellListing;
-	GetListing(listingIndex: number): IShellListing;
-	IsFolderLocation(): boolean;
-	IsObjectLocation(): boolean;
-	NavigateToParent(): void;
-	SetTheme(theme: ITheme): void;
-	ShowDashboard(dashboardID: string, data: any): void;
-	ShowDefaultContent(): void;
-	ShowMessage(message: string | IMessage): number;
-	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
-	ShowPopupSSRSReport(reportWindowTitle: string, reportURL: string): void;
-	ShowSSRSReport(reportURL: string): void;
-}
-
-interface IShellFrameEvent extends IEvents {
-	OnActiveListingChanged?(oldListing: null | IShellListing, newListing: IShellListing): void;
-	OnNewBottomPane?(bottomPane: IShellPaneContainer): void | IShellPaneContainerEvents;
-	OnNewCommands?(commands: ICommands): void | ICommandsEvents;
-	OnNewRightPane?(rightPane: IShellPaneContainer): void | IShellPaneContainerEvents;
-	OnNewSearchPane?(searchPane: ISearchPane): void | ISearchPaneEvents;
-	OnNewShellListing?(shellListing: IShellListing): void | IShellListingEvents;
-	OnNewTaskPane?(taskPane: ITaskPane): void | ITaskPaneEvents;
-	OnShowMainMenu?(): void;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface IShellFrameEvents extends IEvents {
-	OnActiveListingChanged?(oldListing: null | IShellListing, newListing: IShellListing): void;
-	OnNewBottomPane?(bottomPane: IShellPaneContainer): void | IShellPaneContainerEvents;
-	OnNewCommands?(commands: ICommands): void | ICommandsEvents;
-	OnNewRightPane?(rightPane: IShellPaneContainer): void | IShellPaneContainerEvents;
-	OnNewSearchPane?(searchPane: ISearchPane): void | ISearchPaneEvents;
-	OnNewShellListing?(shellListing: IShellListing): void | IShellListingEvents;
-	OnNewTaskPane?(taskPane: ITaskPane): void | ITaskPaneEvents;
-	OnShowMainMenu?(): void;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface IShellItems {
-	readonly Count: number;
-	readonly Folders: IFolderDefs;
-	readonly ObjectFiles: IObjectFileAndObjVerOfMultipleFiles;
-	readonly ObjectVersions: IObjectVersions;
-	readonly ObjectVersionsAndProperties: IObjectVersionAndPropertiesOfMultipleObjects;
-	GetObjectVersionsCount(): number;
-}
-
-interface IShellListing {
-	AutoFitAllColumns: boolean;
-	AutoFitFirstColumn: boolean;
-	ColumnHeadersVisible: boolean;
-	readonly CurrentPath: string;
-	readonly CurrentSelection: IShellItems;
-	readonly Events: IShellListingEvents;
-	GroupObjectsByObjectType: boolean;
-	GroupViewsAndFolders: boolean;
-	readonly IsActive: boolean;
-	readonly Items: IShellItems;
-	readonly SumOfResultCounts: number;
-	ActivateListing(): void;
-	ActivateSelected(): void;
-	RefreshListing(smartUpdate: boolean, refreshFromServer: boolean, forceFullRefreshFromServer: boolean): void;
-	RefreshListingAsync(): void;
-	RefreshObject(objID: IObjID, refreshFromServer: boolean, updateRelatedObjects: boolean): void;
-	RefreshSelectedObjects(refreshFromServer: boolean, updateRelatedObjects: boolean): void;
-	SelectFolder(folderDef: IFolderDef): void;
-	SelectNextFolder(folderDefType: MFiles.MFFolderDefType): boolean;
-	SelectNextObject(): boolean;
-	SelectNextObjectFile(allowMoveToNextObject: boolean): boolean;
-	SelectObjectFile(objVer: IObjVer, fileVer: IFileVer): void;
-	SelectObjectOrObjectFileVersion(objOrFileVer: IObjOrFileVer): void;
-	SelectObjectVersion(objVer: IObjVer): void;
-	SelectPrevFolder(folderDefType: MFiles.MFFolderDefType): boolean;
-	SelectPrevObject(): boolean;
-	SelectPrevObjectFile(allowMoveToPrevObject: boolean): boolean;
-	SetFolderSelectionStates(folderDefs: IFolderDefs, select: boolean): void;
-	SetObjectOrObjectFileVersionSelectionStates(objOrFileVers: IObjOrFileVers, select: boolean): void;
-	SetObjectVersionSelectionStates(objVers: IObjVers, select: boolean): void;
-	SetTheme(theme: ITheme): void;
-	SetVirtualSelection(objOrFileVers: IObjOrFileVers): void;
-	UnselectAll(): void;
-}
-
-interface IShellListingEvents extends IEvents {
-	OnContentChanged?(items: IShellItems): void;
-	OnListingActivated?(oldListing: null | IShellListing): void;
-	OnListingDeactivated?(newListing: null | IShellListing): void;
-	OnSelectedItemsChanged?(selectedItems: IShellItems): void;
-	OnSelectionChanged?(selectedItems: IShellItems): void;
-	OnShowContextMenu?(selectedItems: IShellItems): void;
-	OnShowMainMenu?(selectedItems: IShellItems): void;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface IShellPaneContainer {
-	readonly Content: any;
-	readonly Events: IShellPaneContainerEvents;
-	readonly IsFocused: boolean;
-	Minimized: boolean;
-	readonly ShellFrame: IShellFrame;
-	Size: number;
-	readonly TabTitleSize: number;
-	Visible: boolean;
-	AddTab(TabId: string, tabTitle: string, insertBeforeTabId: string): IShellPaneTab;
-	Focus(): void;
-	GetSelectedTab(): IShellPaneTab;
-	GetTab(TabId: string): IShellPaneTab;
-	SetDefaultSize(defaultSize: number, resizeToDefault: boolean): void;
-	SetDefaultVisibility(Visible: boolean, resetToDefault: boolean): void;
-}
-
-interface IShellPaneContainerEvents extends IEvents {
-	OnHidePane?(): void;
-	OnMinimizedStateChanged?(): void;
-	OnNewTab?(tab: IShellPaneTab): void;
-	OnPaneResized?(): void;
-	OnShowPane?(): void;
-	OnStarted?(): void;
-	OnStop?(): void;
-	OnTabSelected?(): void;
-	OnTabUnselected?(): void;
-}
-
-interface IShellPaneTab {
-	readonly Events: IShellPaneTabEvents;
-	readonly IsBuiltIn: boolean;
-	readonly Selected: boolean;
-	readonly TabId: string;
-	Title: string;
-	Visible: boolean;
-	Remove(): void;
-	Select(): void;
-	ShowDashboard(dashboardID: string, data: any): void;
-	ShowEmptyContent(): void;
-	ShowFilePreview(file: string): void;
-	ShowObjectVersionProperties(propertyValuesWithIcons: IPropertyValuesWithIconClues): void;
-	ShowPersistentContent(sessionHandle: number): void;
-	ShowSSRSReport(reportURL: string): void;
-	Unselect(): void;
-}
-
-interface IShellPaneTabEvents extends IEvents {
-	OnHideTab?(): void;
-	OnShowTab?(): void;
-	OnStarted?(): void;
-	OnStop?(): void;
-	OnTabSelected?(): void;
-	OnTabUnselected?(): void;
-}
-
-interface IShellUI {
-	readonly Events: IShellUIEvents;
-	readonly ServerVault: IVault;
-	readonly Vault: IVault;
-	readonly Window: IWindow;
-	CreatePersistentBrowserContent(url: string, parameters: any): number;
-	DestroyPersistentContent(sessionHandle: number): void;
-	GetObjectTypeIconURL(objtype: number): string;
-	NotifyVaultEntry(ID: string, data1: any, data2: any): any;
-	SetPersistentBrowserContent(url: string, sessionHandle: number): void;
-	ShowMessage(message: string | IMessage): number;
-	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
-}
-
-interface IShellUIEvents extends IEvents {
-	OnNewCommonDialogShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
-	OnNewEmbeddedShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
-	OnNewNormalShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
-	OnNewShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface IShortcutMappingInfo {
-	ObjectTypeGUID: string;
-	ObjectTypeID: number;
-	ObjectTypeName: string;
-	ObjectTypeSemanticAliases: ISemanticAliases;
-}
-
-interface ISignaturePromptInfo {
-	Meaning: string;
-	Reason: string;
-	Clone(): ISignaturePromptInfo;
-}
-
-interface ISignaturePromptInfoMetadataBased {
-	IsReferencedBySignatureObject: boolean;
-	MeaningPropertyID: number;
-	PromptInfoLookupPropertyID: number;
-	ReasonPropertyID: number;
-	Clone(): ISignaturePromptInfoMetadataBased;
-}
-
-interface ISignaturePromptInfos {
-	readonly Count: number;
-	Add(Index: number, SignaturePromptInfo: ISignaturePromptInfo): void;
-	Clone(): ISignaturePromptInfos;
-	Item(Index: number): ISignaturePromptInfo;
-	Item(Index: number, value: ISignaturePromptInfo): void;
-	Remove(Index: number): void;
-}
-
-interface ISignaturePromptInfoSelectable {
-	PromptInfos: ISignaturePromptInfos;
-	Clone(): ISignaturePromptInfoSelectable;
-}
-
-interface ISignatureSettings {
-	AdditionalInfo: string;
-	FreeFormTextPropertyID: number;
-	IsFreeFormTextPrompted: boolean;
-	IsRequired: boolean;
-	IsSeparateSignatureObject: boolean;
-	ManifestationPropertyID: number;
-	readonly PromptInfoType: MFiles.MFSignaturePromptInfoType;
-	SignatureIdentifier: string;
-	SignaturePromptInfoFixed: ISignaturePromptInfo;
-	SignaturePromptInfoMetadataBased: ISignaturePromptInfoMetadataBased;
-	SignaturePromptInfoSelectable: ISignaturePromptInfoSelectable;
-	Clone(): ISignatureSettings;
-}
-
-interface ISourceObjectFile {
-	Extension: string;
-	SourceFilePath: string;
-	Title: string;
-	Clone(): ISourceObjectFile;
-}
-
-interface ISourceObjectFiles {
-	readonly Count: number;
-	Add(Index: number, SourceObjectFile: ISourceObjectFile): void;
-	AddEmptyFile(Title: string, Extension: string): ISourceObjectFile;
-	AddFile(Title: string, Extension: string, SourcePath: string): ISourceObjectFile;
-	Item(Index: number): ISourceObjectFile;
-	Remove(Index: number): void;
-}
-
-interface ISQLDatabase {
-	AdminUser: IImpersonation;
-	BasicUser: IImpersonation;
-	Engine: MFiles.MFDBEngine;
-	Name: string;
-	Server: string;
-	Clone(): ISQLDatabase;
-}
-
-interface IState {
-	readonly ID: number;
-	Name: string;
-	Selectable: boolean;
-	SelectableFlagAffectedByPseudoUsers: boolean;
-	GetAsLookup(): ILookup;
-	GetAsTypedValue(): ITypedValue;
-}
-
-interface IStateAdmin {
-	ActionAssignToUser: boolean;
-	ActionAssignToUserDefinition: IActionCreateAssignment;
-	ActionConvertToPDF: boolean;
-	ActionConvertToPDFDefinition: IActionConvertToPDF;
-	ActionCreateSeparateAssignment: boolean;
-	ActionDefinitions: IActionDefinitions;
-	ActionDelete: boolean;
-	ActionMarkForArchiving: boolean;
-	ActionRunVBScript: boolean;
-	ActionRunVBScriptDefinition: string;
-	ActionSendNotification: boolean;
-	ActionSendNotificationDefinition: IActionSendNotification;
-	ActionSetPermissions: boolean;
-	ActionSetPermissionsDetailedDefinition: IActionSetPermissions;
-	ActionSetProperties: boolean;
-	ActionSetPropertiesDefinition: IActionSetProperties;
-	CheckInOutPermissions: boolean;
-	Description: string;
-	ID: number;
-	InOutPermissions: IAccessControlList;
-	Name: string;
-	Postconditions: IStateConditions;
-	Preconditions: IStateConditions;
-	SemanticAliases: ISemanticAliases;
-	TransitionsRequireEditAccessToObject: boolean;
-	Clone(): IStateAdmin;
-}
-
-interface IStateConditions {
-	PropertyConditions: boolean;
-	PropertyConditionsDefinition: ISearchConditions;
-	VBScript: boolean;
-	VBScriptDefinition: string;
-	Clone(): IStateConditions;
-}
-
-interface IStates {
-	readonly Count: number;
-	Item(Index: number): IState;
-}
-
-interface IStatesAdmin {
-	readonly Count: number;
-	Add(Index: number, StateAdmin: IStateAdmin): void;
-	Item(Index: number): IStateAdmin;
-	Remove(Index: number): void;
-}
-
-interface IStateTransition {
-	AccessControlList: IAccessControlList;
-	Description: string;
-	EvaluationOrderNumber: number;
-	FromState: number;
-	ID: number;
-	Name: string;
-	SemanticAliases: ISemanticAliases;
-	SignatureSettings: ISignatureSettings;
-	ToState: number;
-	TriggerAllowedByVBScript: string;
-	TriggerCriteria: ISearchConditions;
-	TriggerInDays: number;
-	TriggerMode: MFiles.MFAutoStateTransitionMode;
-	Clone(): IStateTransition;
-}
-
-interface IStateTransitionForClient {
-	FromState: number;
-	readonly ID: number;
-	Name: string;
-	Selectable: boolean;
-	SelectableFlagAffectedByPseudoUsers: boolean;
-	ToState: number;
-	Clone(): IStateTransitionForClient;
-	GetAsLookup(): ILookup;
-	GetAsTypedValue(): ITypedValue;
-}
-
-interface IStateTransitions {
-	readonly Count: number;
-	Add(Index: number, StateTransition: IStateTransition): void;
-	Item(Index: number): IStateTransition;
-	Remove(Index: number): void;
-}
-
-interface IStateTransitionsForClient {
-	readonly Count: number;
-	Add(Index: number, StateTransitionForClient: IStateTransitionForClient): void;
-	Clone(): IStateTransitionsForClient;
-	Item(Index: number): IStateTransitionForClient;
-	Item(Index: number, value: IStateTransitionForClient): void;
-	Remove(Index: number): void;
-}
-
-interface IStringData {
-	AsString: string;
-	readonly StringDataType: MFiles.MFStringDataType;
-	Clone(): IStringData;
-}
-
-interface IStrings {
-	readonly Count: number;
-	Add(Index: number, Item: string): void;
-	Clone(): IStrings;
-	CloneFrom(Strings: IStrings): void;
-	Item(Index: number): string;
-	Join(Separator: string): string;
-	Remove(Index: number): void;
-}
-
-interface ITaskAssignmentClassInfo {
-	AnyAssigneeCompletes: boolean;
-	SignatureForCompletion: ISignatureSettings;
-	Clone(): ITaskAssignmentClassInfo;
-}
-
-interface ITaskPane {
-	readonly Available: boolean;
-	readonly Events: ITaskPaneEvents;
-	Visible: boolean;
-	AddCustomCommandToGroup(customCommand: number, group: number, orderPriority: number): void;
-	CreateGroup(groupName: string, priority: number): number;
-	DeleteGroup(groupID: number): void;
-	RemoveCustomCommandFromGroup(customCommand: number, group: number): void;
-	SetLogo(filename: string): void;
-	SetTheme(theme: ITheme): void;
-}
-
-interface ITaskPaneEvents extends IEvents {
-	OnHidePane?(): void;
-	OnShowPane?(): void;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface ITemporarySearchView {
-	readonly BaseSearchConditions: ISearchConditions;
-	SearchCriteria: ISearchCriteria;
-	readonly View: IView;
-}
-
-interface ITheme {
-	[key: string]: (string | boolean | number);
-	last: 0;
-}
-
-interface ITimestamp {
-	Day: number;
-	Fraction: number;
-	Hour: number;
-	Minute: number;
-	Month: number;
-	Second: number;
-	Year: number;
-	Clone(): ITimestamp;
-	GetValue(): any;
-	LocalTimeToUtc(): ITimestamp;
-	SetValue(Value: any): void;
-	UtcToLocalTime(): ITimestamp;
-}
-
-interface ITimeZoneInformation {
-	readonly StandardName: string;
-	LoadTimeZoneByName(TimeZoneName: string): void;
-	LoadWithCurrentTimeZone(): void;
-}
-
-interface ITraditionalFolder {
-	readonly ID: number;
-	readonly Name: string;
-}
-
-interface ITraditionalFolderContents {
-	readonly ID: number;
-	readonly ObjectVersions: IObjectVersions;
-	readonly TraditionalFolders: ITraditionalFolders;
-}
-
-interface ITraditionalFolders {
-	readonly Count: number;
-	Item(Index: number): ITraditionalFolder;
-}
-
-interface ITriggerType {
-	readonly Daily: IDailyTrigger;
-	readonly MonthlyDate: IMonthlyDateTrigger;
-	readonly MonthlyDOW: IMonthlyDOWTrigger;
-	Type: MFiles.MFTriggerType;
-	readonly Weekly: IWeeklyTrigger;
-	Clone(): ITriggerType;
-	SetDailyTrigger(DailyTrigger: IDailyTrigger): void;
-	SetMonthlyDate(MonthlyDateTrigger: IMonthlyDateTrigger): void;
-	SetMonthlyDOW(MonthlyDOWTrigger: IMonthlyDOWTrigger): void;
-	SetWeekly(WeeklyTrigger: IWeeklyTrigger): void;
-}
-
-interface ITypedValue {
-	readonly DataType: MFiles.MFDataType;
-	readonly DisplayValue: string;
-	Value: any;
-	Clone(): ITypedValue;
-	CloneFrom(TypedValue: ITypedValue): void;
-	CompareTo(TypedValue: ITypedValue): number;
-	GetLookupID(): number;
-	GetValueAsLocalizedText(): string;
-	GetValueAsLookup(): ILookup;
-	GetValueAsLookups(): ILookups;
-	GetValueAsText(Localized: boolean, NULLAsEmptyString: boolean, EmptyLookupDisplayValuesAsHidden: boolean, LongDateFormat: boolean, NoSeconds: boolean, NumericValueAsKilobytes: boolean): string;
-	GetValueAsTextWithExpression(Expression: IExpression, Locale: number): string;
-	GetValueAsTimestamp(): ITimestamp;
-	GetValueAsUnlocalizedText(): string;
-	IsNULL(): boolean;
-	IsUninitialized(): boolean;
-	Serialize(): ReadonlyArray<number>;
-	SetValue(DataType: MFiles.MFDataType, Value: any): void;
-	SetValueToLookup(Lookup: ILookup): void;
-	SetValueToMultiSelectLookup(MultiSelectLookup: ILookups): void;
-	SetValueToNULL(DataType: MFiles.MFDataType): void;
-	Unserialize(Bytes: ReadonlyArray<number>, ReadFromOldSerializingFormat: boolean): void;
-}
-
-interface ITypedValues {
-	readonly Count: number;
-	Add(Index: number, TypedValue: ITypedValue): void;
-	Item(Index: number): ITypedValue;
-	Remove(Index: number): void;
-}
-
-interface IUserAccount {
-	AccessControlList: IAccessControlList;
-	Enabled: boolean;
-	ID: number;
-	InternalUser: boolean;
-	LoginName: string;
-	VaultLanguage: number;
-	VaultRoles: MFiles.MFUserAccountVaultRole;
-	AddVaultRoles(VaultRolesToAdd: MFiles.MFUserAccountVaultRole): void;
-	Clone(): IUserAccount;
-	CloneFrom(UserAccount: IUserAccount): void;
-	RemoveVaultRoles(VaultRolesToRemove: MFiles.MFUserAccountVaultRole): void;
-}
-
-interface IUserAccounts {
-	readonly Count: number;
-	Item(Index: number): IUserAccount;
-}
-
-interface IUserGroup {
-	ID: number;
-	Members: IIDs;
-	Name: string;
-	readonly Predefined: boolean;
-	AddMember(ID: number): void;
-	Clone(): IUserGroup;
-	CloneFrom(UserGroup: IUserGroup): void;
-	RemoveMember(ID: number): void;
-}
-
-interface IUserGroupAdmin {
-	AccessControlList: IAccessControlList;
-	SemanticAliases: ISemanticAliases;
-	UserGroup: IUserGroup;
-	Clone(): IUserGroupAdmin;
-	CloneFrom(UserGroupAdmin: IUserGroupAdmin): void;
-}
-
-interface IUserGroups {
-	readonly Count: number;
-	Item(Index: number): IUserGroup;
-}
-
-interface IUserGroupsAdmin {
-	readonly Count: number;
-	Item(Index: number): IUserGroupAdmin;
-}
-
-interface IUserOrUserGroupID {
-	UserOrGroupID: number;
-	UserOrGroupType: MFiles.MFUserOrUserGroupType;
-	Clone(): IUserOrUserGroupID;
-}
-
-interface IUserOrUserGroupIDEx {
-	readonly IndirectProperty: IIndirectPropertyID;
-	readonly UserOrGroupID: number;
-	readonly UserOrGroupType: MFiles.MFUserOrUserGroupType;
-	readonly WorkflowState: number;
-	Clone(): IUserOrUserGroupIDEx;
-	SetIndirectPropertyPseudoUser(PseudoUserID: IIndirectPropertyID): void;
-	SetUserAccount(UserAccount: number): void;
-	SetUserGroup(UserGroup: number): void;
-	SetWorkflowStatePseudoUser(WorkflowState: number): void;
-}
-
-interface IUserOrUserGroupIDExs {
-	readonly Count: number;
-	Add(Index: number, UserOrUserGroupIDEx: IUserOrUserGroupIDEx): void;
-	Clone(): IUserOrUserGroupIDExs;
-	GetUserOrUserGroupIDEx(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): IUserOrUserGroupIDEx;
-	GetUserOrUserGroupIDExIndex(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): number;
-	Item(Index: number): IUserOrUserGroupIDEx;
-	Remove(Index: number): void;
-}
-
-interface IUserOrUserGroupIDs {
-	readonly Count: number;
-	Add(Index: number, UserOrUserGroupID: IUserOrUserGroupID): void;
-	Clone(): IUserOrUserGroupIDs;
-	GetUserOrUserGroupID(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): IUserOrUserGroupID;
-	GetUserOrUserGroupIDIndex(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): number;
-	Item(Index: number): IUserOrUserGroupID;
-	Remove(Index: number): void;
-}
-
-interface IValidation {
-	RegularExpression: string;
-	VBScript: string;
-	Clone(): IValidation;
-}
-
-interface IValueListItem {
-	AutomaticPermissionsForObjects: IAutomaticPermissions;
-	readonly Deleted: boolean;
-	readonly DisplayID: string;
-	readonly DisplayIDAvailable: boolean;
-	HasOwner: boolean;
-	HasParent: boolean;
-	Icon: ReadonlyArray<number>;
-	ID: number;
-	readonly ItemGUID: string;
-	Name: string;
-	OwnerID: number;
-	ParentID: number;
-	ValueListID: (MFiles.MFBuiltInValueList | number);
-	Clone(): IValueListItem;
-	CloneFrom(ValueListItem: IValueListItem): void;
-	GetIconAsPNG(Width: number, Height: number): ReadonlyArray<number>;
-}
-
-interface IValueListItems {
-	readonly Count: number;
-	Item(Index: number): IValueListItem;
-}
-
-interface IValueListItemSearchResults {
-	readonly Count: number;
-	MoreResults: boolean;
-	Add(Index: number, ValueListItem: IValueListItem): void;
-	Clone(): IValueListItemSearchResults;
-	Item(Index: number): IValueListItem;
-	Remove(Index: number): void;
-}
-
-interface IValueListItemSearchResultsWithPermissions {
-	readonly Permissions: IAccessControlLists;
-	readonly ValueListItemSearchResults: IValueListItemSearchResults;
-}
-
-interface IValueListItemsWithPermissions {
-	readonly Permissions: IAccessControlLists;
-	readonly ValueListItems: IValueListItems;
-}
-
-interface IVault {
-	readonly Async: IVaultAsync;
-	readonly ClassGroupOperations: IVaultClassGroupOperations;
-	readonly ClassOperations: IVaultClassOperations;
-	readonly ClientOperations: IVaultClientOperations;
-	readonly CurrentLoggedInUserID: number;
-	readonly CustomApplicationManagementOperations: IVaultCustomApplicationManagementOperations;
-	readonly DataSetOperations: IVaultDataSetOperations;
-	readonly ElectronicSignatureOperations: IVaultElectronicSignatureOperations;
-	readonly EventLogOperations: IVaultEventLogOperations;
-	readonly ExtensionMethodOperations: IVaultExtensionMethodOperations;
-	readonly ExternalObjectOperations: IVaultExternalObjectOperations;
-	readonly LoggedIn: boolean;
-	readonly LoginAccountOperations: IVaultLoginAccountOperations;
-	readonly LoginSessionID: string;
-	readonly ManagementOperations: IVaultManagementOperations;
-	readonly Name: string;
-	readonly NamedACLOperations: IVaultNamedACLOperations;
-	readonly NamedValueStorageOperations: IVaultNamedValueStorageOperations;
-	readonly NotificationOperations: IVaultNotificationOperations;
-	readonly ObjectFileOperations: IVaultObjectFileOperations;
-	readonly ObjectOperations: IVaultObjectOperations;
-	readonly ObjectPropertyOperations: IVaultObjectPropertyOperations;
-	readonly ObjectSearchOperations: IVaultObjectSearchOperations;
-	readonly ObjectTypeOperations: IVaultObjectTypeOperations;
-	readonly PropertyDefOperations: IVaultPropertyDefOperations;
-	readonly ReadOnlyAccess: boolean;
-	readonly ScheduledJobManagementOperations: IVaultScheduledJobManagementOperations;
-	readonly ServerDataPushOperations: IVaultServerDataPushOperations;
-	readonly SessionInfo: ISessionInfo;
-	readonly SharedLinkOperations: IVaultSharedLinkOperations;
-	readonly TraditionalFolderOperations: IVaultTraditionalFolderOperations;
-	readonly UserGroupOperations: IVaultUserGroupOperations;
-	readonly UserOperations: IVaultUserOperations;
-	readonly UserSettingOperations: IVaultUserSettingOperations;
-	readonly ValueListItemOperations: IVaultValueListItemOperations;
-	readonly ValueListOperations: IVaultValueListOperations;
-	readonly VaultLanguages: ILanguages;
-	readonly ViewOperations: IVaultViewOperations;
-	readonly WorkflowOperations: IVaultWorkflowOperations;
-	ChangePassword(OldPassword: string, NewPassword: string): void;
-	GetAllTranslations(): string;
-	GetGUID(): string;
-	GetMetadataStructureItemIDByAlias(MetadataStructureItemType: MFiles.MFMetadataStructureItem, Alias: string, Unused: boolean): number;
-	GetMetadataStructureVersionID(): number;
-	GetMFilesURLForVaultRoot(): string;
-	GetServerLicenseStatus(): ILicenseStatus;
-	GetServerVersionOfVault(): IMFilesVersion;
-	LogOutSilent(): void;
-	LogOutWithDialogs(ParentWindow: number): boolean;
-	TestConnectionToServer(): void;
-	TestConnectionToVault(): void;
-	TestConnectionToVaultWithTimeout(TimeoutInMilliseconds: number): void;
-}
-
-interface IVaultAsync {
-	readonly ClassGroupOperations: IVaultClassGroupOperationsAsync;
-	readonly ClassOperations: IVaultClassOperationsAsync;
-	readonly ClientOperations: IVaultClientOperationsAsync;
-	readonly CustomApplicationManagementOperations: IVaultCustomApplicationManagementOperationsAsync;
-	readonly DataSetOperations: IVaultDataSetOperationsAsync;
-	readonly ElectronicSignatureOperations: IVaultElectronicSignatureOperationsAsync;
-	readonly EventLogOperations: IVaultEventLogOperationsAsync;
-	readonly ExtensionMethodOperations: IVaultExtensionMethodOperationsAsync;
-	readonly ExternalObjectOperations: IVaultExternalObjectOperationsAsync;
-	readonly LoginAccountOperations: IVaultLoginAccountOperationsAsync;
-	readonly ManagementOperations: IVaultManagementOperationsAsync;
-	readonly NamedACLOperations: IVaultNamedACLOperationsAsync;
-	readonly NamedValueStorageOperations: IVaultNamedValueStorageOperationsAsync;
-	readonly NotificationOperations: IVaultNotificationOperationsAsync;
-	readonly ObjectFileOperations: IVaultObjectFileOperationsAsync;
-	readonly ObjectOperations: IVaultObjectOperationsAsync;
-	readonly ObjectPropertyOperations: IVaultObjectPropertyOperationsAsync;
-	readonly ObjectSearchOperations: IVaultObjectSearchOperationsAsync;
-	readonly ObjectTypeOperations: IVaultObjectTypeOperationsAsync;
-	readonly PropertyDefOperations: IVaultPropertyDefOperationsAsync;
-	readonly ScheduledJobManagementOperations: IVaultScheduledJobManagementOperationsAsync;
-	readonly ServerDataPushOperations: IVaultServerDataPushOperationsAsync;
-	readonly SharedLinkOperations: IVaultSharedLinkOperationsAsync;
-	readonly TraditionalFolderOperations: IVaultTraditionalFolderOperationsAsync;
-	readonly UserGroupOperations: IVaultUserGroupOperationsAsync;
-	readonly UserOperations: IVaultUserOperationsAsync;
-	readonly UserSettingOperations: IVaultUserSettingOperationsAsync;
-	readonly ValueListItemOperations: IVaultValueListItemOperationsAsync;
-	readonly ValueListOperations: IVaultValueListOperationsAsync;
-	readonly ViewOperations: IVaultViewOperationsAsync;
-	readonly WorkflowOperations: IVaultWorkflowOperationsAsync;
-}
-
-interface IVaultAutomaticMetadataOperations {
-	GetAutomaticMetadataForObject(ObjVer: IObjVer): IAutomaticMetadataResult;
-	GetAutomaticMetadataForTemporaryFile(UploadSessionID: number): IAutomaticMetadataResult;
-	GetAutomaticMetadataForTemporaryFiles(IIDs: IIDs): IAutomaticMetadataResult;
-}
-
-interface IVaultClassGroupOperations {
-	AddClassGroup(ClassGroup: IClassGroup): IClassGroup;
-	GetClassGroup(ObjectType: MFiles.MFBuiltInObjectType | number, ClassGroupID: number): IClassGroup;
-	GetClassGroupIDByGUID(ClassGroupGUID: string): number;
-	GetClassGroups(ObjectType: MFiles.MFBuiltInObjectType | number): IClassGroups;
-	RemoveClassGroup(ClassGroupID: number): void;
-	UpdateClassGroup(ClassGroup: IClassGroup): void;
-}
-
-interface IVaultClassGroupOperationsAsync {
-	AddClassGroup(ClassGroup: IClassGroup, successCallback?: (result: IClassGroup) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetClassGroup(ObjectType: MFiles.MFBuiltInObjectType | number, ClassGroupID: number, successCallback?: (result: IClassGroup) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetClassGroupIDByGUID(ClassGroupGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetClassGroups(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IClassGroups) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveClassGroup(ClassGroupID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateClassGroup(ClassGroup: IClassGroup, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultClassOperations {
-	AddObjectClassAdmin(ObjectClassAdmin: IObjectClassAdmin): IObjectClassAdmin;
-	GetAllObjectClasses(): IObjectClasses;
-	GetAllObjectClassesAdmin(): IObjectClassesAdmin;
-	GetObjectClass(ObjectClass: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number): IObjectClass;
-	GetObjectClassAdmin(Class: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number): IObjectClassAdmin;
-	GetObjectClasses(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectClasses;
-	GetObjectClassesAdmin(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectClassesAdmin;
-	GetObjectClassIDByAlias(Alias: string): number;
-	GetObjectClassIDByGUID(ObjectClassGUID: string): number;
-	RemoveObjectClassAdmin(ObjectClassID: number): void;
-	UpdateObjectClassAdmin(ObjectClass: IObjectClassAdmin): void;
-	UpdateObjectNames(ObjectClassID: number): void;
-}
-
-interface IVaultClassOperationsAsync {
-	AddObjectClassAdmin(ObjectClassAdmin: IObjectClassAdmin, successCallback?: (result: IObjectClassAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetAllObjectClasses(successCallback?: (result: IObjectClasses) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetAllObjectClassesAdmin(successCallback?: (result: IObjectClassesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectClass(ObjectClass: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number, successCallback?: (result: IObjectClass) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectClassAdmin(Class: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number, successCallback?: (result: IObjectClassAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectClasses(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectClasses) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectClassesAdmin(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectClassesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectClassIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectClassIDByGUID(ObjectClassGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveObjectClassAdmin(ObjectClassID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateObjectClassAdmin(ObjectClass: IObjectClassAdmin, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateObjectNames(ObjectClassID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultClientOperations {
-	DisableCheckInReminderForCallingProcess(): void;
-	EnableCheckInReminderForCallingProcess(): void;
-	IsOffline(): boolean;
-	IsOnline(): boolean;
-	SetVaultToOffline(ParentWindow: number): MFiles.MFOfflineTransitionResultFlags;
-	SetVaultToOnline(ParentWindow: number): MFiles.MFOnlineTransitionResultFlags;
-}
-
-interface IVaultClientOperationsAsync {
-	DisableCheckInReminderForCallingProcess(successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	EnableCheckInReminderForCallingProcess(successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsOffline(successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsOnline(successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetVaultToOffline(ParentWindow: number, successCallback?: (result: MFiles.MFOfflineTransitionResultFlags) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetVaultToOnline(ParentWindow: number, successCallback?: (result: MFiles.MFOnlineTransitionResultFlags) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultConnection {
-	AuthType: MFiles.MFAuthType;
-	AutoLogin: boolean;
-	EncryptedConnection: boolean;
-	Endpoint: string;
-	Icon: ReadonlyArray<number>;
-	Name: string;
-	NetworkAddress: string;
-	ProtocolSequence: string;
-	ServerVaultGUID: string;
-	ServerVaultName: string;
-	UserSpecific: boolean;
-	BindToVault(ParentWindow: number, CanLogIn: boolean, ReturnNULLIfCancelledByUser: boolean): IVault;
-	Clone(): IVaultConnection;
-	GetGUID(): string;
-	IsLoggedIn(): boolean;
-	LogInAs(ParentWindow: number, DefaultAuthType: MFiles.MFAuthType, ReturnNULLIfCancelledByUser: boolean): IVault;
-	LogInAsUser(AuthType: MFiles.MFAuthType, UserName: string, Password: string, Domain: string | null, SPN: string | null): IVault;
-	TestConnectionToVault(ParentWindow: number): MFiles.MFVaultConnectionTestResult;
-}
-
-interface IVaultConnections {
-	readonly Count: number;
-	Add(Index: number, VaultConnection: IVaultConnection): void;
-	GetVaultConnectionByName(VaultConnectionName: string): IVaultConnection;
-	GetVaultConnectionIndexByName(VaultConnectionName: string): number;
-	Item(Index: number): IVaultConnection;
-	Remove(Index: number): void;
-}
-
-interface IVaultCore {
-	readonly Events: IVaultCoreEvents;
-	readonly ServerVault: IVault;
-}
-
-interface IVaultCoreEvents extends IEvents {
-	OnNewVaultEntry?(vaultEntry: IVaultEntry): void | IVaultEntryEvents;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface IVaultCustomApplicationManagementOperations {
-	DownloadCustomApplicationBlock(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
-	DownloadCustomApplicationBlock_32bit(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
-	DownloadCustomApplicationBlockBegin(ApplicationID: string): IFileDownloadSession;
-	DownloadCustomApplicationBlockBegin_32bit(ApplicationID: string): IFileDownloadSession;
-	EnableCustomApplication(ApplicationID: string, Enabled: boolean): void;
-	GetCustomApplication(ApplicationID: string): ICustomApplication;
-	GetCustomApplications(): ICustomApplications;
-	GetCustomApplicationsEx(Platform: MFiles.MFExtApplicationPlatform): ICustomApplications;
-	InstallCustomApplication(File: string): void;
-	UninstallCustomApplication(ApplicationID: string): void;
-}
-
-interface IVaultCustomApplicationManagementOperationsAsync {
-	DownloadCustomApplicationBlock(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadCustomApplicationBlock_32bit(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadCustomApplicationBlockBegin(ApplicationID: string, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadCustomApplicationBlockBegin_32bit(ApplicationID: string, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	EnableCustomApplication(ApplicationID: string, Enabled: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetCustomApplication(ApplicationID: string, successCallback?: (result: ICustomApplication) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetCustomApplications(successCallback?: (result: ICustomApplications) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetCustomApplicationsEx(Platform: MFiles.MFExtApplicationPlatform, successCallback?: (result: ICustomApplications) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	InstallCustomApplication(File: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UninstallCustomApplication(ApplicationID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultDataSetOperations {
-	GetDataSetExportingStatus(ID: number): IDataSetExportingStatus;
-	GetDataSets(): IDataSets;
-	GetReportAccessCredentials(): IReportAccessCredentials;
-	StartDataSetExport(ID: number): void;
-}
-
-interface IVaultDataSetOperationsAsync {
-	GetDataSetExportingStatus(ID: number, successCallback?: (result: IDataSetExportingStatus) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetDataSets(successCallback?: (result: IDataSets) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetReportAccessCredentials(successCallback?: (result: IReportAccessCredentials) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	StartDataSetExport(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultElectronicSignatureOperations {
-	AddEmptySignature(ObjVer: IObjVer, SignatureIdentifier: string): IObjectVersionAndProperties;
-	AddEmptySignatures(ObjVer: IObjVer): IObjectVersionAndProperties;
-	DisconnectSignature(ObjVer: IObjVer, SignatureIdentifier: string): IObjectVersionAndProperties;
-	DisconnectSignatureEx(ObjVer: IObjVer, SignatureIdentifier: string, InvalidateDisconnectedSignatures: boolean): IObjectVersionAndProperties;
-	DisconnectSignatures(ObjVer: IObjVer): IObjectVersionAndProperties;
-	DisconnectSignaturesEx(ObjVer: IObjVer, InvalidateDisconnectedSignatures: boolean): IObjectVersionAndProperties;
-}
-
-interface IVaultElectronicSignatureOperationsAsync {
-	AddEmptySignature(ObjVer: IObjVer, SignatureIdentifier: string, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	AddEmptySignatures(ObjVer: IObjVer, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DisconnectSignature(ObjVer: IObjVer, SignatureIdentifier: string, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DisconnectSignatureEx(ObjVer: IObjVer, SignatureIdentifier: string, InvalidateDisconnectedSignatures: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DisconnectSignatures(ObjVer: IObjVer, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DisconnectSignaturesEx(ObjVer: IObjVer, InvalidateDisconnectedSignatures: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultEntry {
-	readonly Events: IVaultEntryEvents;
-	readonly Vault: IVault;
-	readonly VaultCore: IVaultCore;
-	readonly VaultUI: IVaultUI;
-	NotifyVaultEntry(ID: string, data1: any, data2: any): any;
-}
-
-interface IVaultEntryEvents extends IEvents {
-	OnAddObjectFile?(objVer: IObjVer, sourceObjectFile: ISourceObjectFile): null | boolean | { OnSuccess?(objectVersion: IObjectVersion, objectFile: IObjectFile): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnAddObjectsToFavorites?(objIDs: IObjIDs): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnAddObjectToFavorites?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnChangeVaultLanguage?(languageID: number): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnCheckInObject?(objVer: IObjVer, propertyValues: IPropertyValues): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnCheckInObjects?(objVers: IObjVers, propertyValues: IPropertyValues): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnCheckOutObject?(objID: IObjID): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnCheckOutObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnCreateObject?(objectType: number, propertyValues: IPropertyValues, sourceObjectFiles: ISourceObjectFiles, accessControlList: IAccessControlList, checkInRequested: boolean, singleFileRequested: boolean): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnDestroyObject?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnDestroyObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnDestroyObjectVersion?(objVer: IObjVer): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnDestroyObjectVersions?(objVers: IObjVers): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnLoggedIn?(): void;
-	OnLogOut?(): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnModifyObjectVersionLabels?(objVer: IObjVer, clearFromOtherVersions: boolean, append: boolean, labelIDs: IIDs, singleLabelRequired: boolean): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnNotification?(id: string, data1: any, data2: any): any;
-	OnObjectAddedToFavorites?(objID: IObjID): void;
-	OnObjectCheckedIn?(objectVersion: IObjectVersion): void;
-	OnObjectCheckedOut?(objectVersion: IObjectVersion): void;
-	OnObjectCheckoutsUndone?(objectVersions: IObjectVersions): void;
-	OnObjectCheckoutUndone?(objectVersion: IObjectVersion): void;
-	OnObjectCreated?(objectVersion: IObjectVersion): void;
-	OnObjectDestroyed?(objID: IObjID): void;
-	OnObjectFileAdded?(objectVersion: IObjectVersion, objectFile: IObjectFile): void;
-	OnObjectFileRemoved?(objectVersion: IObjectVersion, fileVer: IFileVer): void;
-	OnObjectFileRenamed?(objectVersion: IObjectVersion, objectFile: IObjectFile): void;
-	OnObjectLevelPropertySet?(objID: IObjID, propertyValue: IPropertyValue): void;
-	OnObjectOfflineAvailabilityRemoved?(objID: IObjID): void;
-	OnObjectOfflineAvailabilitySet?(objID: IObjID): void;
-	OnObjectRemoved?(objectVersion: IObjectVersion): void;
-	OnObjectRemovedFromFavorites?(objID: IObjID): void;
-	OnObjectsAddedToFavorites?(objIDs: IObjIDs): void;
-	OnObjectsCheckedIn?(objectVersions: IObjectVersions): void;
-	OnObjectsCheckedOut?(objectVersions: IObjectVersions): void;
-	OnObjectsDestroyed?(objIDs: IObjIDs): void;
-	OnObjectsRemoved?(objectVersions: IObjectVersions): void;
-	OnObjectsRemovedFromFavorites?(objIDs: IObjIDs): void;
-	OnObjectUndeleted?(objectVersion: IObjectVersion): void;
-	OnObjectVersionDestroyed?(objVer: IObjVer): void;
-	OnObjectVersionLabelsModified?(objVer: IObjVer, clearFromOtherVersions: boolean, append: boolean, labelIDs: IIDs): void;
-	OnObjectVersionPermissionsSet?(objectVersion: IObjectVersion): void;
-	OnObjectVersionRolledBack?(objectVersion: IObjectVersion): void;
-	OnObjectVersionsDestroyed?(objVers: IObjVers): void;
-	OnPropertiesOfObjectVersionSet?(objectVersion: IObjectVersion): void;
-	OnPropertiesOfObjectVersionsSet?(objectVersions: IObjectVersions): void;
-	OnRemoveObject?(objID: IObjID): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnRemoveObjectFile?(objVer: IObjVer, fileVer: IFileVer): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnRemoveObjectFromFavorites?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnRemoveObjectOfflineAvailability?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnRemoveObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnRemoveObjectsFromFavorites?(objIDs: IObjIDs): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnRenameObjectFile?(objVer: IObjVer, fileVer: IFileVer, newName: null | ITypedValue, newExtension: null | ITypedValue): null | boolean | { OnSuccess?(objectVersion: IObjectVersion, objectFile: IObjectFile): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnRollBackObjectVersion?(objVer: IObjVer): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnSetObjectLevelProperty?(objID: IObjID, propertyValue: IPropertyValue): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnSetObjectOfflineAvailability?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnSetObjectVersionPermissions?(objVer: IObjVer, changeAllVersions: boolean, accessControlList: IAccessControlList): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnSetPropertiesOfObjectVersion?(setPropertiesParams: ISetPropertiesParams, singlePropertyUpdate: boolean, singlePropertyRemove: boolean): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnSetPropertiesOfObjectVersions?(setPropertiesParamsOfMultipleObjects: ISetPropertiesParamsOfMultipleObjects, singlePropertyUpdate: boolean, singlePropertyRemove: boolean): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnStarted?(): void;
-	OnStop?(): void;
-	OnSwitchedToOfflineMode?(): void;
-	OnSwitchedToOnlineMode?(): void;
-	OnSwitchToOfflineMode?(): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnSwitchToOnlineMode?(): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnUndeleteObject?(objID: IObjID): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnUndeleteObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnUndoObjectCheckout?(objVer: IObjVer): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnUndoObjectCheckouts?(objVers: IObjVers): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
-	OnVaultLanguageChanged?(languageID: number): void;
-}
-
-interface IVaultEventLogOperations {
-	Clear(): void;
-	ClearRange(FirstEventID: number, LastEventID: number): void;
-	ClearRange_32bit(FirstEventID: string, LastEventID: string): void;
-	ExportAll(): string;
-	ExportRange(FirstEventID: number, LastEventID: number, DeleteEventsAfterExporting: boolean): string;
-	ExportRange_32bit(FirstEventID: string, LastEventID: string, DeleteEventsAfterExporting: boolean): string;
-	GetIDRange(): IIDRange;
-	IsLoggingEnabled(): boolean;
-	SetLoggingEnabled(Enabled: boolean): void;
-}
-
-interface IVaultEventLogOperationsAsync {
-	Clear(successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ClearRange(FirstEventID: number, LastEventID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ClearRange_32bit(FirstEventID: string, LastEventID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ExportAll(successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ExportRange(FirstEventID: number, LastEventID: number, DeleteEventsAfterExporting: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ExportRange_32bit(FirstEventID: string, LastEventID: string, DeleteEventsAfterExporting: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetIDRange(successCallback?: (result: IIDRange) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsLoggingEnabled(successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetLoggingEnabled(Enabled: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultExtensionMethodOperations {
-	DoesActiveVaultExtensionMethodExist(MethodIdentifier: string): boolean;
-	ExecuteVaultExtensionMethod(MethodIdentifier: string, Input: string): string;
-}
-
-interface IVaultExtensionMethodOperationsAsync {
-	DoesActiveVaultExtensionMethodExist(MethodIdentifier: string, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ExecuteVaultExtensionMethod(MethodIdentifier: string, Input: string, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultExternalObjectOperations {
-	PromoteObject(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, pACLProvidedCBN: IAccessControlList): IObjectVersionAndProperties;
-}
-
-interface IVaultExternalObjectOperationsAsync {
-	PromoteObject(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, pACLProvidedCBN: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultLoginAccountOperations {
-	AddLoginAccount(LoginAccount: ILoginAccount, Password: string): void;
-	ForceLogout(AccountNames: IStrings): void;
-	GetLoginAccount(AccountName: string): ILoginAccount;
-	GetLoginAccounts(): ILoginAccounts;
-	GetLoginAccountsWithSessions(): ILoginAccounts;
-	GetPersonalInformationFromDomain(AccountName: string): ILoginAccountPersonalInformation;
-	ModifyLoginAccount(LoginAccount: ILoginAccount): void;
-	RemoveLoginAccount(AccountName: string): void;
-	UpdateLoginPassword(AccountName: string, NewPassword: string): void;
-}
-
-interface IVaultLoginAccountOperationsAsync {
-	AddLoginAccount(LoginAccount: ILoginAccount, Password: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ForceLogout(AccountNames: IStrings, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLoginAccount(AccountName: string, successCallback?: (result: ILoginAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLoginAccounts(successCallback?: (result: ILoginAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLoginAccountsWithSessions(successCallback?: (result: ILoginAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPersonalInformationFromDomain(AccountName: string, successCallback?: (result: ILoginAccountPersonalInformation) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ModifyLoginAccount(LoginAccount: ILoginAccount, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveLoginAccount(AccountName: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateLoginPassword(AccountName: string, NewPassword: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultManagementOperations {
-	ArchiveOldVersions(ArchiveOldVersionsJob: IArchiveOldVersionsJob): void;
-	ExportContent(ExportContentJob: IExportContentJob): void;
-	GetEventHandlers(): IEventHandlers;
-	GetVaultProperties(): IVaultProperties;
-	ImportContent(ImportContentJob: IImportContentJob): void;
-	ImportContentAsync(ImportContentJob: IImportContentJob): number;
-	IsAsyncJobRunning(JobID: number): boolean;
-	PreviewImportContent(ImportContentJob: IImportContentJob, SummaryFile: string): void;
-	RebuildFullTextSearchIndex(Metadata: boolean, FileContents: boolean): void;
-	SetEventHandlers(EventHandlers: IEventHandlers): void;
-	UpdateVaultProperties(VaultProperties: IVaultProperties, RegistrationDataOnly: boolean): void;
-	VerifyVault(VerifyVaultJob: IVerifyVaultJob): IVerifyVaultJobOutput;
-	WaitAsyncJob(JobID: number): void;
-}
-
-interface IVaultManagementOperationsAsync {
-	ArchiveOldVersions(ArchiveOldVersionsJob: IArchiveOldVersionsJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ExportContent(ExportContentJob: IExportContentJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetEventHandlers(successCallback?: (result: IEventHandlers) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetVaultProperties(successCallback?: (result: IVaultProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ImportContent(ImportContentJob: IImportContentJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ImportContentAsync(ImportContentJob: IImportContentJob, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsAsyncJobRunning(JobID: number, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	PreviewImportContent(ImportContentJob: IImportContentJob, SummaryFile: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RebuildFullTextSearchIndex(Metadata: boolean, FileContents: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetEventHandlers(EventHandlers: IEventHandlers, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateVaultProperties(VaultProperties: IVaultProperties, RegistrationDataOnly: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	VerifyVault(VerifyVaultJob: IVerifyVaultJob, successCallback?: (result: IVerifyVaultJobOutput) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	WaitAsyncJob(JobID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultNamedACLOperations {
-	AddNamedACLAdmin(NamedACLAdmin: INamedACLAdmin): INamedACLAdmin;
-	GetMatchingNamedACLForAccessControlList(AccessControlList: IAccessControlList, ExplicitLinkOnly: boolean, ActiveAccessControlComponentsOnly: boolean, RefreshFromServer: boolean): INamedACL;
-	GetMatchingNamedACLForAccessControlListComponent(AccessControlListComponent: IAccessControlListComponent, ExplicitLinkOnly: boolean, RefreshFromServer: boolean): INamedACL;
-	GetNamedACL(NamedACLID: number): INamedACL;
-	GetNamedACLAdmin(NamedACLID: number): INamedACLAdmin;
-	GetNamedACLIDByAlias(Alias: string): number;
-	GetNamedACLIDByGUID(NamedACLGUID: string): number;
-	GetNamedACLs(): INamedACLs;
-	GetNamedACLsByTypeAdmin(Type: MFiles.MFNamedACLType): INamedACLsAdmin;
-	GetNamedACLsWithRefresh(RefreshFromServer: boolean): INamedACLs;
-	GetNamedACLWithRefresh(NamedACLID: number, RefreshFromServer: boolean): INamedACL;
-	IsNamedACLUsedInAutomaticPermissionsAdmin(NamedACLID: number): boolean;
-	RemoveNamedACLWithPropagationAdmin(NamedACLID: number, AllowPropagation: boolean): void;
-	UpdateNamedACLAdmin(NamedACLAdmin: INamedACLAdmin): void;
-	UpdateNamedACLWithPropagationAdmin(NamedACLAdmin: INamedACLAdmin, MaintainLinks: boolean, AllowPropagation: boolean): void;
-}
-
-interface IVaultNamedACLOperationsAsync {
-	AddNamedACLAdmin(NamedACLAdmin: INamedACLAdmin, successCallback?: (result: INamedACLAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetMatchingNamedACLForAccessControlList(AccessControlList: IAccessControlList, ExplicitLinkOnly: boolean, ActiveAccessControlComponentsOnly: boolean, RefreshFromServer: boolean, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetMatchingNamedACLForAccessControlListComponent(AccessControlListComponent: IAccessControlListComponent, ExplicitLinkOnly: boolean, RefreshFromServer: boolean, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACL(NamedACLID: number, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACLAdmin(NamedACLID: number, successCallback?: (result: INamedACLAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACLIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACLIDByGUID(NamedACLGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACLs(successCallback?: (result: INamedACLs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACLsByTypeAdmin(Type: MFiles.MFNamedACLType, successCallback?: (result: INamedACLsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACLsWithRefresh(RefreshFromServer: boolean, successCallback?: (result: INamedACLs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetNamedACLWithRefresh(NamedACLID: number, RefreshFromServer: boolean, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsNamedACLUsedInAutomaticPermissionsAdmin(NamedACLID: number, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveNamedACLWithPropagationAdmin(NamedACLID: number, AllowPropagation: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateNamedACLAdmin(NamedACLAdmin: INamedACLAdmin, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateNamedACLWithPropagationAdmin(NamedACLAdmin: INamedACLAdmin, MaintainLinks: boolean, AllowPropagation: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultNamedValueStorageOperations {
-	GetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string): INamedValues;
-	RemoveNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValueNames: IStrings): void;
-	SetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValues: INamedValues): void;
-}
-
-interface IVaultNamedValueStorageOperationsAsync {
-	GetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, successCallback?: (result: INamedValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValueNames: IStrings, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValues: INamedValues, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultNotificationOperations {
-	SendCustomNotification(UserOrUserGroupIDs: IUserOrUserGroupIDs, IncludeSubstituteUsers: boolean, ExternalRecipients: IStrings, SendWithServerEmailIdentity: boolean, Subject: string, Body: string): void;
-}
-
-interface IVaultNotificationOperationsAsync {
-	SendCustomNotification(UserOrUserGroupIDs: IUserOrUserGroupIDs, IncludeSubstituteUsers: boolean, ExternalRecipients: IStrings, SendWithServerEmailIdentity: boolean, Subject: string, Body: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultObjectFileOperations {
-	AddEmptyFile(ObjVer: IObjVer, Title: string, Extension: string): IFileVer;
-	AddFile(ObjVer: IObjVer, Title: string, Extension: string, SourcePath: string): IFileVer;
-	CloseUploadSession(UploadID: number): void;
-	ConvertToPDF(ObjVer: IObjVer, FileID: number, StoreAsSeparateFile: boolean, OverwriteExistingFile: boolean, PDFA1b: boolean, FailOnUnsupportedSourceFiles: boolean): IObjectVersion;
-	DownloadFile(File: number, FileVersion: number, FilePath: string): void;
-	DownloadFileAsDataURI(ObjVer: IObjVer, File: number, FileVersion: number): string;
-	DownloadFileEx(File: number, FileVersion: number, FilePath: string, FileFormat: MFiles.MFFileFormat): void;
-	DownloadFileInBlocks_Begin(File: number, FileVersion: number): IFileDownloadSession;
-	DownloadFileInBlocks_Begin_32bit(File: number, FileVersion: number): IFileDownloadSession;
-	DownloadFileInBlocks_BeginEx(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat): IFileDownloadSession;
-	DownloadFileInBlocks_BeginEx_32bit(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat): IFileDownloadSession;
-	DownloadFileInBlocks_ReadBlock(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
-	DownloadFileInBlocks_ReadBlock_32bit(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
-	GetFiles(ObjVer: IObjVer): IObjectFiles;
-	GetFilesForModificationInEventHandler(ObjVer: IObjVer): IObjectFiles;
-	GetFileSize(FileVer: IFileVer): number;
-	GetFileSize_32bit(FileVer: IFileVer): number;
-	GetLatestFileVersion(FileID: number, AllowCheckedOut: boolean): IFileVer;
-	GetObjIDOfFile(FileID: number): IObjID;
-	GetPathInDefaultView(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, UpdateFromServer: boolean): string;
-	GetPathInDefaultViewEx(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, PreferTraditionalFolderLocation: boolean, UpdateFromServer: boolean): string;
-	OpenFileInDefaultApplication(ParentWindow: number, ObjVer: IObjVer, FileVer: IFileVer, FileOpenMethod: MFiles.MFFileOpenMethod): void;
-	PerformOCROperation(ObjVer: IObjVer, FileVer: IFileVer, OCROptions: IOCROptions, ZoneRecognitionMode: MFiles.MFOCRZoneRecognitionMode, ZoneRecognitionPages: IOCRPages, ConvertToSearchablePDF: boolean): IOCRPageResults;
-	RemoveFile(ObjVer: IObjVer, FileVer: IFileVer): IObjectVersion;
-	RenameFile(ObjVer: IObjVer, FileVer: IFileVer, Title: string, Extension: string, UpdateSingleFileDocumentTitle: boolean): IObjectVersion;
-	UpdateMetadataInFile(ObjVer: IObjVer, File: number, FailOnUnsupportedFiles: boolean): IObjectVersion;
-	UploadFile(File: number, FileVersion: number, FilePath: string): void;
-	UploadFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
-	UploadFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
-	UploadFileBlockBegin(): number;
-	UploadFileBlockBegin_32bit(): number;
-	UploadFileCommit(UploadID: number, File: number, FileVersion: number, LogicalSize: number): void;
-	UploadFileCommit_32bit(UploadID: number, File: number, FileVersion: number, LogicalSize: number): void;
-	UploadFromDataURI(ObjVer: IObjVer, File: number, FileVersion: number, DataURI: string): void;
-	UploadTemporaryFile(FilePath: string): number;
-	UploadTemporaryFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
-	UploadTemporaryFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
-	UploadTemporaryFileBlockBegin(FileExtension: string): number;
-	UploadTemporaryFileBlockBegin_32bit(FileExtension: string): number;
-	UploadTemporaryFileCommit(UploadID: number, LogicalSize: number): void;
-	UploadTemporaryFileCommit_32bit(UploadID: number, LogicalSize: number): void;
-}
-
-interface IVaultObjectFileOperationsAsync {
-	AddEmptyFile(ObjVer: IObjVer, Title: string, Extension: string, successCallback?: (result: IFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	AddFile(ObjVer: IObjVer, Title: string, Extension: string, SourcePath: string, successCallback?: (result: IFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CloseUploadSession(UploadID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ConvertToPDF(ObjVer: IObjVer, FileID: number, StoreAsSeparateFile: boolean, OverwriteExistingFile: boolean, PDFA1b: boolean, FailOnUnsupportedSourceFiles: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFile(File: number, FileVersion: number, FilePath: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileAsDataURI(ObjVer: IObjVer, File: number, FileVersion: number, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileEx(File: number, FileVersion: number, FilePath: string, FileFormat: MFiles.MFFileFormat, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileInBlocks_Begin(File: number, FileVersion: number, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileInBlocks_Begin_32bit(File: number, FileVersion: number, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileInBlocks_BeginEx(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileInBlocks_BeginEx_32bit(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileInBlocks_ReadBlock(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DownloadFileInBlocks_ReadBlock_32bit(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFiles(ObjVer: IObjVer, successCallback?: (result: IObjectFiles) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFilesForModificationInEventHandler(ObjVer: IObjVer, successCallback?: (result: IObjectFiles) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFileSize(FileVer: IFileVer, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFileSize_32bit(FileVer: IFileVer, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLatestFileVersion(FileID: number, AllowCheckedOut: boolean, successCallback?: (result: IFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjIDOfFile(FileID: number, successCallback?: (result: IObjID) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPathInDefaultView(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, UpdateFromServer: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPathInDefaultViewEx(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, PreferTraditionalFolderLocation: boolean, UpdateFromServer: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	OpenFileInDefaultApplication(ParentWindow: number, ObjVer: IObjVer, FileVer: IFileVer, FileOpenMethod: MFiles.MFFileOpenMethod, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	PerformOCROperation(ObjVer: IObjVer, FileVer: IFileVer, OCROptions: IOCROptions, ZoneRecognitionMode: MFiles.MFOCRZoneRecognitionMode, ZoneRecognitionPages: IOCRPages, ConvertToSearchablePDF: boolean, successCallback?: (result: IOCRPageResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveFile(ObjVer: IObjVer, FileVer: IFileVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RenameFile(ObjVer: IObjVer, FileVer: IFileVer, Title: string, Extension: string, UpdateSingleFileDocumentTitle: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateMetadataInFile(ObjVer: IObjVer, File: number, FailOnUnsupportedFiles: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFile(File: number, FileVersion: number, FilePath: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFileBlockBegin(successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFileBlockBegin_32bit(successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFileCommit(UploadID: number, File: number, FileVersion: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFileCommit_32bit(UploadID: number, File: number, FileVersion: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadFromDataURI(ObjVer: IObjVer, File: number, FileVersion: number, DataURI: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadTemporaryFile(FilePath: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadTemporaryFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadTemporaryFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadTemporaryFileBlockBegin(FileExtension: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadTemporaryFileBlockBegin_32bit(FileExtension: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadTemporaryFileCommit(UploadID: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UploadTemporaryFileCommit_32bit(UploadID: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultObjectOperations {
-	AddFavorite(ObjID: IObjID): IObjectVersionAndProperties;
-	AddFavorites(ObjIDs: IObjIDs): IObjectVersionAndPropertiesOfMultipleObjects;
-	ChangePermissionsToACL(ObjVer: IObjVer, AccessControlList: IAccessControlList, ChangeAllVersions: boolean): IObjectVersion;
-	ChangePermissionsToNamedACL(ObjVer: IObjVer, NamedACL: number, ChangeAllVersions: boolean): IObjectVersion;
-	CheckIn(ObjVer: IObjVer): IObjectVersion;
-	CheckInMultipleObjects(ObjVers: IObjVers): IObjectVersions;
-	CheckOut(ObjID: IObjID): IObjectVersion;
-	CheckOutMultipleObjects(ObjIDs: IObjIDs): IObjectVersions;
-	CreateNewAssignment(AssignmentName: string, AssignmentDescription: string, AssignedToUser: ITypedValue, Deadline: ITypedValue, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
-	CreateNewEmptySingleFileDocument(PropertyValues: IPropertyValues, Title: string, Extension: string, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
-	CreateNewObject(ObjectType: MFiles.MFBuiltInObjectType | number, PropertyValues: IPropertyValues, SourceObjectFiles: ISourceObjectFiles, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
-	CreateNewObjectEx(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
-	CreateNewObjectExQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList): number;
-	CreateNewSFDObject(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
-	CreateNewSFDObjectQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList): number;
-	DelayedCheckIn(ObjVer: IObjVer): void;
-	DeleteObject(ObjID: IObjID): IObjectVersion;
-	DestroyObject(ObjID: IObjID, DestroyAllVersions: boolean, ObjectVersion: number): void;
-	DestroyObjects(ObjIDs: IObjIDs): void;
-	FollowObject(ObjID: IObjID, Follow: boolean): void;
-	ForceUndoCheckout(ObjVer: IObjVer): IObjectVersion;
-	GetCollectionMembers(ObjVer: IObjVer): IObjectVersions;
-	GetHistory(ObjID: IObjID): IObjectVersions;
-	GetLatestObjectVersionAndProperties(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean): IObjectVersionAndProperties;
-	GetLatestObjVer(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean): IObjVer;
-	GetLatestObjVerEx(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, NotifyViews: boolean): IObjVer;
-	GetMFilesURLForObject(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, URLType: MFiles.MFilesURLType): string;
-	GetMFilesURLForObjectOrFile(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, File: number, URLType: MFiles.MFilesURLType): string;
-	GetObjectGUID(ObjID: IObjID): string;
-	GetObjectInfo(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean): IObjectVersion;
-	GetObjectInfoEx(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean, NotifyViews: boolean): IObjectVersion;
-	GetObjectLocationsInView(View: MFiles.MFBuiltInView | number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, ObjectVersion: IObjVer): IStrings;
-	GetObjectPermissions(ObjVer: IObjVer): IObjectVersionPermissions;
-	GetObjectVersionAndProperties(ObjVer: IObjVer, UpdateFromServer: boolean): IObjectVersionAndProperties;
-	GetObjectVersionAndPropertiesOfMultipleObjects(ObjVers: IObjVers, LatestVersions: boolean, AllowCheckedOut: boolean, AllowMissingObjectVersions: boolean, UpdateFromServer: boolean): IObjectVersionAndPropertiesOfMultipleObjects;
-	GetObjIDByGUID(ObjectGUID: string): IObjID;
-	GetObjIDByOriginalObjID(OriginalVaultGUID: string, OriginalObjID: IObjID): IObjID;
-	GetOfflineAvailability(ObjID: IObjID): boolean;
-	GetOfflineObjIDs(): IObjIDs;
-	GetRelationships(ObjVer: IObjVer, Mode: MFiles.MFRelationshipsMode): IObjectVersions;
-	GetThumbnailAsBytes(ObjVer: IObjVer, FileVer: IFileVer, Width: number, Height: number, GetFileIconThumbnailIfRealThumbnailNotAvailable: boolean): ReadonlyArray<number>;
-	IsObjectCheckedOut(ObjID: IObjID, UpdateFromServer: boolean): boolean;
-	IsObjectCheckedOutToThisUserOnThisComputer(ObjID: IObjID, UpdateFromServer: boolean): boolean;
-	IsObjectFollowed(ObjID: IObjID): boolean;
-	IsSingleFileObject(ObjVer: IObjVer): boolean;
-	MatchesSearchConditions(pIObjVer: IObjVer, pISearchConditions: ISearchConditions): boolean;
-	MatchesSearchConditionsEx(pIObjectVersion: IObjectVersion, pISearchConditions: ISearchConditions, pIPropertyValues: IPropertyValues, pIObjectVersionAndPropertiesOfMultipleObjects: IObjectVersionAndPropertiesOfMultipleObjects): boolean;
-	NotifyObjectAccess(ObjID: IObjID): IObjectVersionAndProperties;
-	ProposeCheckOutForFile(ParentWindow: number, ObjVersionFile: IObjectFileAndVersion, CanCancel: boolean): boolean;
-	RejectCheckInReminder(ObjVer: IObjVer): void;
-	RemoveFavorite(ObjID: IObjID): IObjectVersionAndProperties;
-	RemoveFavorites(ObjIDs: IObjIDs): IObjectVersionAndPropertiesOfMultipleObjects;
-	ResolveConflict(ParticipantObjID: IObjID, KeepThis: boolean): IObjectVersions;
-	Rollback(ObjID: IObjID, RollbackToVersion: number): IObjectVersion;
-	SetExternalID(ObjID: IObjID, ExtID: string): void;
-	SetObjectGUID(ObjID: IObjID, ObjectGUID: string): void;
-	SetOfflineAvailability(ObjID: IObjID, AvailableInOfflineMode: boolean): void;
-	SetSingleFileObject(ObjVer: IObjVer, SingleFile: boolean): void;
-	ShowBasicEditObjectWindow(ParentWindow: number, ObjVer: IObjVer): IObjectWindowResult;
-	ShowBasicNewObjectWindow(ParentWindow: number, ObjectType: IObjectType): IObjectWindowResult;
-	ShowChangeStateDialogModal(ParentWindow: number, ObjectID: IObjID): void;
-	ShowCheckInReminder(ParentWindow: number, ObjVer: IObjVer, Asynchronous: boolean): IObjectVersion;
-	ShowCheckInReminderDialogModal(ParentWindow: number, ObjVer: IObjVer, ApplyEnvironmentConditions: boolean): boolean;
-	ShowCheckoutPrompt(ParentWindow: number, Message: string, ObjID: IObjID, ShowCancel: boolean, AutoRejectConsequentPrompts: boolean): IObjectVersion;
-	ShowCollectionMembersDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean): void;
-	ShowCommentsDialogModal(ParentWindow: number, ObjectID: IObjID): void;
-	ShowEditObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjVer: IObjVer): IObjectWindowResult;
-	ShowHistoryDialogModal(ParentWindow: number, ObjectID: IObjID): void;
-	ShowNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo): IObjectWindowResult;
-	ShowPrefilledNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo, PrefilledPropertyValues: IPropertyValues, AccessControlList: IAccessControlList): IObjectWindowResult;
-	ShowRelatedObjects(ParentWindow: number, SourceObject: IObjID, ObjectTypeTargetForBrowsing: IObjectTypeTargetForBrowsing, ViewSelectionDialogInfoText: string): void;
-	ShowRelationshipsDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean): void;
-	ShowSelectObjectHistoryDialogModal(ParentWindow: number, ObjectID: IObjID, WindowTitle: string): IObjOrFileVer;
-	ShowSubObjectsDialogModal(ParentWindow: number, ObjectVersion: IObjVer): void;
-	UndeleteObject(ObjID: IObjID): IObjectVersion;
-	UndoCheckout(ObjVer: IObjVer): IObjectVersion;
-	UndoCheckoutMultipleObjects(ObjVers: IObjVers): IObjectVersions;
-}
-
-interface IVaultObjectOperationsAsync {
-	AddFavorite(ObjID: IObjID, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	AddFavorites(ObjIDs: IObjIDs, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ChangePermissionsToACL(ObjVer: IObjVer, AccessControlList: IAccessControlList, ChangeAllVersions: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ChangePermissionsToNamedACL(ObjVer: IObjVer, NamedACL: number, ChangeAllVersions: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CheckIn(ObjVer: IObjVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CheckInMultipleObjects(ObjVers: IObjVers, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CheckOut(ObjID: IObjID, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CheckOutMultipleObjects(ObjIDs: IObjIDs, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreateNewAssignment(AssignmentName: string, AssignmentDescription: string, AssignedToUser: ITypedValue, Deadline: ITypedValue, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreateNewEmptySingleFileDocument(PropertyValues: IPropertyValues, Title: string, Extension: string, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreateNewObject(ObjectType: MFiles.MFBuiltInObjectType | number, PropertyValues: IPropertyValues, SourceObjectFiles: ISourceObjectFiles, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreateNewObjectEx(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreateNewObjectExQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreateNewSFDObject(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreateNewSFDObjectQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DelayedCheckIn(ObjVer: IObjVer, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DeleteObject(ObjID: IObjID, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DestroyObject(ObjID: IObjID, DestroyAllVersions: boolean, ObjectVersion: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DestroyObjects(ObjIDs: IObjIDs, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	FollowObject(ObjID: IObjID, Follow: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ForceUndoCheckout(ObjVer: IObjVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetCollectionMembers(ObjVer: IObjVer, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetHistory(ObjID: IObjID, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLatestObjectVersionAndProperties(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLatestObjVer(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLatestObjVerEx(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, NotifyViews: boolean, successCallback?: (result: IObjVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetMFilesURLForObject(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, URLType: MFiles.MFilesURLType, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetMFilesURLForObjectOrFile(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, File: number, URLType: MFiles.MFilesURLType, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectGUID(ObjID: IObjID, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectInfo(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectInfoEx(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean, NotifyViews: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectLocationsInView(View: MFiles.MFBuiltInView | number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, ObjectVersion: IObjVer, successCallback?: (result: IStrings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectPermissions(ObjVer: IObjVer, successCallback?: (result: IObjectVersionPermissions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectVersionAndProperties(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectVersionAndPropertiesOfMultipleObjects(ObjVers: IObjVers, LatestVersions: boolean, AllowCheckedOut: boolean, AllowMissingObjectVersions: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjIDByGUID(ObjectGUID: string, successCallback?: (result: IObjID) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjIDByOriginalObjID(OriginalVaultGUID: string, OriginalObjID: IObjID, successCallback?: (result: IObjID) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetOfflineAvailability(ObjID: IObjID, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetOfflineObjIDs(successCallback?: (result: IObjIDs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetRelationships(ObjVer: IObjVer, Mode: MFiles.MFRelationshipsMode, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetThumbnailAsBytes(ObjVer: IObjVer, FileVer: IFileVer, Width: number, Height: number, GetFileIconThumbnailIfRealThumbnailNotAvailable: boolean, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsObjectCheckedOut(ObjID: IObjID, UpdateFromServer: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsObjectCheckedOutToThisUserOnThisComputer(ObjID: IObjID, UpdateFromServer: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsObjectFollowed(ObjID: IObjID, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsSingleFileObject(ObjVer: IObjVer, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	MatchesSearchConditions(pIObjVer: IObjVer, pISearchConditions: ISearchConditions, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	MatchesSearchConditionsEx(pIObjectVersion: IObjectVersion, pISearchConditions: ISearchConditions, pIPropertyValues: IPropertyValues, pIObjectVersionAndPropertiesOfMultipleObjects: IObjectVersionAndPropertiesOfMultipleObjects, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	NotifyObjectAccess(ObjID: IObjID, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ProposeCheckOutForFile(ParentWindow: number, ObjVersionFile: IObjectFileAndVersion, CanCancel: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RejectCheckInReminder(ObjVer: IObjVer, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveFavorite(ObjID: IObjID, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveFavorites(ObjIDs: IObjIDs, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ResolveConflict(ParticipantObjID: IObjID, KeepThis: boolean, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	Rollback(ObjID: IObjID, RollbackToVersion: number, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetExternalID(ObjID: IObjID, ExtID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetObjectGUID(ObjID: IObjID, ObjectGUID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetOfflineAvailability(ObjID: IObjID, AvailableInOfflineMode: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetSingleFileObject(ObjVer: IObjVer, SingleFile: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowBasicEditObjectWindow(ParentWindow: number, ObjVer: IObjVer, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowBasicNewObjectWindow(ParentWindow: number, ObjectType: IObjectType, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowChangeStateDialogModal(ParentWindow: number, ObjectID: IObjID, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowCheckInReminder(ParentWindow: number, ObjVer: IObjVer, Asynchronous: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowCheckInReminderDialogModal(ParentWindow: number, ObjVer: IObjVer, ApplyEnvironmentConditions: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowCheckoutPrompt(ParentWindow: number, Message: string, ObjID: IObjID, ShowCancel: boolean, AutoRejectConsequentPrompts: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowCollectionMembersDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowCommentsDialogModal(ParentWindow: number, ObjectID: IObjID, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowEditObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjVer: IObjVer, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowHistoryDialogModal(ParentWindow: number, ObjectID: IObjID, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowPrefilledNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo, PrefilledPropertyValues: IPropertyValues, AccessControlList: IAccessControlList, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowRelatedObjects(ParentWindow: number, SourceObject: IObjID, ObjectTypeTargetForBrowsing: IObjectTypeTargetForBrowsing, ViewSelectionDialogInfoText: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowRelationshipsDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowSelectObjectHistoryDialogModal(ParentWindow: number, ObjectID: IObjID, WindowTitle: string, successCallback?: (result: IObjOrFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowSubObjectsDialogModal(ParentWindow: number, ObjectVersion: IObjVer, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UndeleteObject(ObjID: IObjID, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UndoCheckout(ObjVer: IObjVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UndoCheckoutMultipleObjects(ObjVers: IObjVers, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultObjectPropertyOperations {
-	ApproveOrRejectAssignment(ObjVer: IObjVer, Approve: boolean): IObjectVersionAndProperties;
-	ApproveOrRejectAssignmentByUser(ObjVer: IObjVer, Approve: boolean, UserID: number): IObjectVersionAndProperties;
-	CreatePropertiesFromFileInformation(FileInformation: IFileInformation): IPropertyValues;
-	GenerateAutomaticPermissionsFromPropertyValues(PropertyValues: IPropertyValues): IAccessControlList;
-	GetProperties(ObjVer: IObjVer, UpdateFromServer: boolean): IPropertyValues;
-	GetPropertiesAsXML(ObjVer: IObjVer, UpdateFromServer: boolean): string;
-	GetPropertiesForDisplay(ObjVer: IObjVer, UpdateFromServer: boolean): IPropertyValuesForDisplay;
-	GetPropertiesForMetadataSync(ObjVer: IObjVer, Format: MFiles.MFMetadataSyncFormat): INamedValues;
-	GetPropertiesOfMultipleObjects(ObjectVersions: IObjVers): IPropertyValuesOfMultipleObjects;
-	GetPropertiesWithIconClues(ObjVer: IObjVer, UpdateFromServer: boolean): IPropertyValuesWithIconClues;
-	GetPropertiesWithIconCluesOfMultipleObjects(ObjectVersions: IObjVers): IPropertyValuesWithIconCluesOfMultipleObjects;
-	GetProperty(ObjVer: IObjVer, Property: number): IPropertyValue;
-	GetVersionComment(ObjVer: IObjVer): IVersionComment;
-	GetVersionCommentHistory(ObjVer: IObjVer): IVersionComments;
-	GetWorkflowState(ObjVer: IObjVer, UpdateFromServer: boolean): IObjectVersionWorkflowState;
-	MarkAssignmentComplete(ObjVer: IObjVer): IObjectVersionAndProperties;
-	MarkAssignmentCompleteByUser(ObjVer: IObjVer, UserID: number): IObjectVersionAndProperties;
-	RemoveProperty(ObjVer: IObjVer, Property: number): IObjectVersionAndProperties;
-	SetAllProperties(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues): IObjectVersionAndProperties;
-	SetAllPropertiesWithPermissions(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList): IObjectVersionAndProperties;
-	SetAllPropertiesWithPermissionsEx(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any): IObjectVersionAndProperties;
-	SetCreationInfoAdmin(ObjVer: IObjVer, UpdateCreatedBy: boolean, CreatedBy: ITypedValue, UpdateCreated: boolean, CreatedUtc: ITypedValue): IObjectVersionAndProperties;
-	SetLastModificationInfoAdmin(ObjVer: IObjVer, UpdateLastModifiedBy: boolean, LastModifiedBy: ITypedValue, UpdateLastModified: boolean, LastModifiedUtc: ITypedValue): IObjectVersionAndProperties;
-	SetProperties(ObjVer: IObjVer, PropertyValues: IPropertyValues): IObjectVersionAndProperties;
-	SetPropertiesOfMultipleObjects(SetPropertiesParamsOfObjects: ISetPropertiesParamsOfMultipleObjects): IObjectVersionAndPropertiesOfMultipleObjects;
-	SetPropertiesWithPermissions(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList): IObjectVersionAndProperties;
-	SetPropertiesWithPermissionsEx(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any): IObjectVersionAndProperties;
-	SetProperty(ObjVer: IObjVer, PropertyValue: IPropertyValue): IObjectVersionAndProperties;
-	SetVersionComment(ObjVer: IObjVer, VersionComment: IPropertyValue): IObjectVersionAndProperties;
-	SetWorkflowState(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState): IObjectVersionAndProperties;
-	SetWorkflowStateEx(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState, ElectronicSignature: any): IObjectVersionAndProperties;
-	SetWorkflowStateTransition(ObjVer: IObjVer, Workflow: number, lStateTransition: number, lVersionComment: string): IObjectVersionAndProperties;
-	SetWorkflowStateTransitionEx(ObjVer: IObjVer, Workflow: number, StateTransition: number, VersionComment: string, ElectronicSignature: any): IObjectVersionAndProperties;
-}
-
-interface IVaultObjectPropertyOperationsAsync {
-	ApproveOrRejectAssignment(ObjVer: IObjVer, Approve: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ApproveOrRejectAssignmentByUser(ObjVer: IObjVer, Approve: boolean, UserID: number, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CreatePropertiesFromFileInformation(FileInformation: IFileInformation, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GenerateAutomaticPermissionsFromPropertyValues(PropertyValues: IPropertyValues, successCallback?: (result: IAccessControlList) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetProperties(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertiesAsXML(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertiesForDisplay(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IPropertyValuesForDisplay) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertiesForMetadataSync(ObjVer: IObjVer, Format: MFiles.MFMetadataSyncFormat, successCallback?: (result: INamedValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertiesOfMultipleObjects(ObjectVersions: IObjVers, successCallback?: (result: IPropertyValuesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertiesWithIconClues(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IPropertyValuesWithIconClues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertiesWithIconCluesOfMultipleObjects(ObjectVersions: IObjVers, successCallback?: (result: IPropertyValuesWithIconCluesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetProperty(ObjVer: IObjVer, Property: number, successCallback?: (result: IPropertyValue) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetVersionComment(ObjVer: IObjVer, successCallback?: (result: IVersionComment) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetVersionCommentHistory(ObjVer: IObjVer, successCallback?: (result: IVersionComments) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowState(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionWorkflowState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	MarkAssignmentComplete(ObjVer: IObjVer, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	MarkAssignmentCompleteByUser(ObjVer: IObjVer, UserID: number, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveProperty(ObjVer: IObjVer, Property: number, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetAllProperties(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetAllPropertiesWithPermissions(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetAllPropertiesWithPermissionsEx(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetCreationInfoAdmin(ObjVer: IObjVer, UpdateCreatedBy: boolean, CreatedBy: ITypedValue, UpdateCreated: boolean, CreatedUtc: ITypedValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetLastModificationInfoAdmin(ObjVer: IObjVer, UpdateLastModifiedBy: boolean, LastModifiedBy: ITypedValue, UpdateLastModified: boolean, LastModifiedUtc: ITypedValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetProperties(ObjVer: IObjVer, PropertyValues: IPropertyValues, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetPropertiesOfMultipleObjects(SetPropertiesParamsOfObjects: ISetPropertiesParamsOfMultipleObjects, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetPropertiesWithPermissions(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetPropertiesWithPermissionsEx(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetProperty(ObjVer: IObjVer, PropertyValue: IPropertyValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetVersionComment(ObjVer: IObjVer, VersionComment: IPropertyValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetWorkflowState(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetWorkflowStateEx(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetWorkflowStateTransition(ObjVer: IObjVer, Workflow: number, lStateTransition: number, lVersionComment: string, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetWorkflowStateTransitionEx(ObjVer: IObjVer, Workflow: number, StateTransition: number, VersionComment: string, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultObjectSearchOperations {
-	FindFile(RelativePath: string, UpdateFromServer: boolean): IObjectFileAndVersion;
-	FindObjectVersionAndProperties(RelativePath: string, UpdateFromServer: boolean): IObjectVersionAndProperties;
-	GetFacetValues(SearchConditions: ISearchConditions, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags): IStringData;
-	GetFacetValuesByPath(RelativePath: string, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags): IStringData;
-	GetObjectCountInSearch(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags): number;
-	GetObjectsInPath(RelativePath: string, SortResults: boolean, UpdateFromServer: boolean): IObjectSearchResults;
-	GetSearchHits(Input: string, SearchCondition: ISearchCondition): IStrings;
-	IsObjectPathInMFiles(RelativePath: string): boolean;
-	SearchForObjectsByCondition(SearchCondition: ISearchCondition, SortResults: boolean): IObjectSearchResults;
-	SearchForObjectsByConditions(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean): IObjectSearchResults;
-	SearchForObjectsByConditionsEx(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, MaxResultCount: number, SearchTimeoutInSeconds: number): IObjectSearchResults;
-	SearchForObjectsByConditionsXML(SearchConditions: ISearchConditions, SortResults: boolean): IXMLSearchResult;
-	SearchForObjectsByExportedSearchConditions(ExportedSearchString: string, SortResults: boolean): IObjectSearchResults;
-	SearchForObjectsByExportedSearchConditionsXML(SearchString: string, SortResults: boolean): IXMLSearchResult;
-	SearchForObjectsByString(SearchString: string, SortResults: boolean, FullTextSearchFlags: MFiles.MFFullTextSearchFlags): IObjectSearchResults;
-}
-
-interface IVaultObjectSearchOperationsAsync {
-	FindFile(RelativePath: string, UpdateFromServer: boolean, successCallback?: (result: IObjectFileAndVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	FindObjectVersionAndProperties(RelativePath: string, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFacetValues(SearchConditions: ISearchConditions, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags, successCallback?: (result: IStringData) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFacetValuesByPath(RelativePath: string, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags, successCallback?: (result: IStringData) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectCountInSearch(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectsInPath(RelativePath: string, SortResults: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetSearchHits(Input: string, SearchCondition: ISearchCondition, successCallback?: (result: IStrings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	IsObjectPathInMFiles(RelativePath: string, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForObjectsByCondition(SearchCondition: ISearchCondition, SortResults: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForObjectsByConditions(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForObjectsByConditionsEx(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, MaxResultCount: number, SearchTimeoutInSeconds: number, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForObjectsByConditionsXML(SearchConditions: ISearchConditions, SortResults: boolean, successCallback?: (result: IXMLSearchResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForObjectsByExportedSearchConditions(ExportedSearchString: string, SortResults: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForObjectsByExportedSearchConditionsXML(SearchString: string, SortResults: boolean, successCallback?: (result: IXMLSearchResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForObjectsByString(SearchString: string, SortResults: boolean, FullTextSearchFlags: MFiles.MFFullTextSearchFlags, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultObjectTypeOperations {
-	AddObjectTypeAdmin(ObjectType: IObjectTypeAdmin): IObjectTypeAdmin;
-	GetBuiltInObjectType(ObjectType: MFiles.MFBuiltInObjectType): IObjectType;
-	GetObjectType(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectType;
-	GetObjectTypeAdmin(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectTypeAdmin;
-	GetObjectTypeIDByAlias(Alias: string): number;
-	GetObjectTypeIDByGUID(ObjectTypeGUID: string): number;
-	GetObjectTypes(): IObjectTypes;
-	GetObjectTypesAdmin(): IObjectTypesAdmin;
-	RefreshExternalObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, RefreshType: MFiles.MFExternalDBRefreshType): void;
-	RemoveObjectTypeAdmin(ObjectTypeID: number): void;
-	UpdateObjectTypeAdmin(ObjectType: IObjectTypeAdmin): IObjectTypeAdmin;
-	UpdateObjectTypeWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean): IObjectTypeAdmin;
-}
-
-interface IVaultObjectTypeOperationsAsync {
-	AddObjectTypeAdmin(ObjectType: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetBuiltInObjectType(ObjectType: MFiles.MFBuiltInObjectType, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectTypeAdmin(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectTypeIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectTypeIDByGUID(ObjectTypeGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectTypes(successCallback?: (result: IObjectTypes) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetObjectTypesAdmin(successCallback?: (result: IObjectTypesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RefreshExternalObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, RefreshType: MFiles.MFExternalDBRefreshType, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveObjectTypeAdmin(ObjectTypeID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateObjectTypeAdmin(ObjectType: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateObjectTypeWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultOnServer {
-	readonly GUID: string;
-	readonly Name: string;
-	LogIn(): IVault;
-	LogInAsUser(AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, TimeZone: ITimeZoneInformation): IVault;
-	LogInAsUserWithAuthenticationData(PluginInfo: IPluginInfo, AuthenticationData: INamedValues, AttemptIdentifier: string, TimeZone: ITimeZoneInformation): IAuthenticationResult;
-	LogInAsUserWithSPN(AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, TimeZone: ITimeZoneInformation): IVault;
-}
-
-interface IVaultProperties {
-	DisplayName: string;
-	EncryptionOfFileDataAtRest: boolean;
-	ExtendedMetadataDrivenPermissions: boolean;
-	FileDataConnectionString: string;
-	FileDataStorageType: MFiles.MFFileDataStorage;
-	FullTextSearchLanguage: string;
-	Icon: ReadonlyArray<number>;
-	MainDataFolder: string;
-	SeparateLocationForFileData: IAdditionalFolders;
-	SQLDatabase: ISQLDatabase;
-	VaultGUID: string;
-	Clone(): IVaultProperties;
-}
-
-interface IVaultPropertyDefOperations {
-	AddPropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue): IPropertyDefAdmin;
-	GetBuiltInPropertyDef(PropertyDefType: MFiles.MFBuiltInPropertyDef): IPropertyDef;
-	GetPropertyDef(PropertyDef: MFiles.MFBuiltInPropertyDef | number): IPropertyDef;
-	GetPropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number): IPropertyDefAdmin;
-	GetPropertyDefIDByAlias(Alias: string): number;
-	GetPropertyDefIDByGUID(PropertyDefGUID: string): number;
-	GetPropertyDefs(): IPropertyDefs;
-	GetPropertyDefsAdmin(): IPropertyDefsAdmin;
-	Recalculate(PropertyDef: MFiles.MFBuiltInPropertyDef | number, RecalculateCurrentlyEmptyValuesOnly: boolean): void;
-	RemovePropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number, CopyToAnotherPropertyDef: boolean, TargetPropertyDef: number, Append: boolean, DeleteFromClassesIfNecessary: boolean): void;
-	UpdatePropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue): void;
-	UpdatePropertyDefWithAutomaticPermissionsAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, AutomaticPermissionsForcedActive: boolean): void;
-}
-
-interface IVaultPropertyDefOperationsAsync {
-	AddPropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, successCallback?: (result: IPropertyDefAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetBuiltInPropertyDef(PropertyDefType: MFiles.MFBuiltInPropertyDef, successCallback?: (result: IPropertyDef) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyDef(PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IPropertyDef) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IPropertyDefAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyDefIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyDefIDByGUID(PropertyDefGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyDefs(successCallback?: (result: IPropertyDefs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyDefsAdmin(successCallback?: (result: IPropertyDefsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	Recalculate(PropertyDef: MFiles.MFBuiltInPropertyDef | number, RecalculateCurrentlyEmptyValuesOnly: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemovePropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number, CopyToAnotherPropertyDef: boolean, TargetPropertyDef: number, Append: boolean, DeleteFromClassesIfNecessary: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdatePropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdatePropertyDefWithAutomaticPermissionsAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, AutomaticPermissionsForcedActive: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultScheduledJobManagementOperations {
-	AddScheduledJob(ScheduledJob: IScheduledJob): number;
-	CancelScheduledJob(ID: number): void;
-	GetScheduledJob(ID: number): IScheduledJob;
-	GetScheduledJobRunInfo(ID: number): IScheduledJobRunInfo;
-	GetScheduledJobs(): IScheduledJobs;
-	ModifyScheduledJob(ScheduledJob: IScheduledJob): void;
-	RemoveScheduledJob(ID: number): void;
-	StartScheduledJob(ID: number): void;
-}
-
-interface IVaultScheduledJobManagementOperationsAsync {
-	AddScheduledJob(ScheduledJob: IScheduledJob, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	CancelScheduledJob(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetScheduledJob(ID: number, successCallback?: (result: IScheduledJob) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetScheduledJobRunInfo(ID: number, successCallback?: (result: IScheduledJobRunInfo) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetScheduledJobs(successCallback?: (result: IScheduledJobs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ModifyScheduledJob(ScheduledJob: IScheduledJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveScheduledJob(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	StartScheduledJob(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultServerDataPushOperations {
-	CloneVaultForServerDataPush(ServerDataPushSink: IServerDataPushSink): IVault;
-	SendCancel(RequestID: number): void;
-	SendError(RequestID: number, Error: string): void;
-	SendHeartbeat(RequestID: number): void;
-	SendResponse(RequestID: number, JsonResponseContent: string): void;
-	SetServerDataPushSink(ServerDataPushSink: IServerDataPushSink): void;
-}
-
-interface IVaultServerDataPushOperationsAsync {
-	CloneVaultForServerDataPush(ServerDataPushSink: IServerDataPushSink, successCallback?: (result: IVault) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SendCancel(RequestID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SendError(RequestID: number, Error: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SendHeartbeat(RequestID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SendResponse(RequestID: number, JsonResponseContent: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetServerDataPushSink(ServerDataPushSink: IServerDataPushSink, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultSharedLinkOperations {
-	CreateSharedLink(SharedLinkCreationInfo: ISharedLinkInfo): ISharedLinkInfo;
-	DeleteSharedLink(AccessKey: string): void;
-	GetSharedLink(AccessKey: string): ISharedLinkInfo;
-	GetSharedLinks(CreatedByUser: number): ISharedLinkInfos;
-	GetSharedLinksByObject(ObjID: IObjID): ISharedLinkInfos;
-}
-
-interface IVaultSharedLinkOperationsAsync {
-	CreateSharedLink(SharedLinkCreationInfo: ISharedLinkInfo, successCallback?: (result: ISharedLinkInfo) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	DeleteSharedLink(AccessKey: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetSharedLink(AccessKey: string, successCallback?: (result: ISharedLinkInfo) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetSharedLinks(CreatedByUser: number, successCallback?: (result: ISharedLinkInfos) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetSharedLinksByObject(ObjID: IObjID, successCallback?: (result: ISharedLinkInfos) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultsOnServer {
-	readonly Count: number;
-	GetVaultByGUID(GUID: string): IVaultOnServer;
-	GetVaultByName(Name: string): IVaultOnServer;
-	GetVaultIndexByGUID(GUID: string): number;
-	GetVaultIndexByName(Name: string): number;
-	Item(Index: number): IVaultOnServer;
-}
-
-interface IVaultTraditionalFolderOperations {
-	GetTraditionalFolderContents(Folder: number): ITraditionalFolderContents;
-}
-
-interface IVaultTraditionalFolderOperationsAsync {
-	GetTraditionalFolderContents(Folder: number, successCallback?: (result: ITraditionalFolderContents) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultUI {
-	readonly Events: IVaultUIEvents;
-	readonly Vault: IVault;
-	readonly VaultEntry: IVaultEntry;
-	ShowMessage(message: string | IMessage): number;
-	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
-}
-
-interface IVaultUIEvents extends IEvents {
-	OnNewVaultEntry?(vaultEntry: IVaultEntry): void | IVaultEntryEvents;
-	OnStarted?(): void;
-	OnStop?(): void;
-}
-
-interface IVaultUserGroupOperations {
-	AddOrUndeleteUserGroup(UserGroup: IUserGroupAdmin): IUserGroupAdmin;
-	AddUserGroupAdmin(UserGroup: IUserGroupAdmin): IUserGroupAdmin;
-	GetGroupsOfUserOrGroup(UserOrGroupID: number, IsGroup: boolean): IUserGroups;
-	GetUserGroup(UserGroupID: MFiles.MFBuiltInUserGroup | number): IUserGroup;
-	GetUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number): IUserGroupAdmin;
-	GetUserGroupIDByAlias(Alias: string): number;
-	GetUserGroupIDByGUID(UserGroupGUID: string): number;
-	GetUserGroupList(): IKeyNamePairs;
-	GetUserGroups(): IUserGroups;
-	GetUserGroupsAdmin(): IUserGroupsAdmin;
-	RemoveUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number): void;
-	UpdateUserGroupAdmin(UserGroup: IUserGroupAdmin): void;
-}
-
-interface IVaultUserGroupOperationsAsync {
-	AddOrUndeleteUserGroup(UserGroup: IUserGroupAdmin, successCallback?: (result: IUserGroupAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	AddUserGroupAdmin(UserGroup: IUserGroupAdmin, successCallback?: (result: IUserGroupAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetGroupsOfUserOrGroup(UserOrGroupID: number, IsGroup: boolean, successCallback?: (result: IUserGroups) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserGroup(UserGroupID: MFiles.MFBuiltInUserGroup | number, successCallback?: (result: IUserGroup) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number, successCallback?: (result: IUserGroupAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserGroupIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserGroupIDByGUID(UserGroupGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserGroupList(successCallback?: (result: IKeyNamePairs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserGroups(successCallback?: (result: IUserGroups) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserGroupsAdmin(successCallback?: (result: IUserGroupsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateUserGroupAdmin(UserGroup: IUserGroupAdmin, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultUserOperations {
-	AddOrUndeleteUserAccount(User: IUserAccount): IUserAccount;
-	AddUserAccount(User: IUserAccount): IUserAccount;
-	GetLoginAccountOfUser(UserID: number): ILoginAccount;
-	GetLoginAccounts(): ILoginAccounts;
-	GetUserAccount(UserID: number): IUserAccount;
-	GetUserAccounts(): IUserAccounts;
-	GetUserIDByGUID(UserGUID: string): number;
-	GetUserList(): IKeyNamePairs;
-	ModifyUserAccount(User: IUserAccount): void;
-	RemoveUserAccount(UserID: number): void;
-}
-
-interface IVaultUserOperationsAsync {
-	AddOrUndeleteUserAccount(User: IUserAccount, successCallback?: (result: IUserAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	AddUserAccount(User: IUserAccount, successCallback?: (result: IUserAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLoginAccountOfUser(UserID: number, successCallback?: (result: ILoginAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetLoginAccounts(successCallback?: (result: ILoginAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserAccount(UserID: number, successCallback?: (result: IUserAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserAccounts(successCallback?: (result: IUserAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserIDByGUID(UserGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetUserList(successCallback?: (result: IKeyNamePairs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ModifyUserAccount(User: IUserAccount, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveUserAccount(UserID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultUserSettingOperations {
-	ChangeVaultLanguage(Language: number): void;
-	GetSubstituteUsers(): IUserOrUserGroupIDs;
-	GetVaultLanguage(): number;
-	GetVaultLanguageCode(): string;
-	SetSubstituteUsers(UserOrUserGroupIDs: IUserOrUserGroupIDs): void;
-}
-
-interface IVaultUserSettingOperationsAsync {
-	ChangeVaultLanguage(Language: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetSubstituteUsers(successCallback?: (result: IUserOrUserGroupIDs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetVaultLanguage(successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetVaultLanguageCode(successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SetSubstituteUsers(UserOrUserGroupIDs: IUserOrUserGroupIDs, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultValueListItemOperations {
-	AddValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItem: IValueListItem, AdministrativeOperation: boolean): IValueListItem;
-	ChangeAutomaticPermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList, NameForAutomaticPermissions: string, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions): void;
-	ChangeAutomaticPermissionsToItemsOwnPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions): void;
-	ChangeAutomaticPermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions): void;
-	ChangePermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList): void;
-	ChangePermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number): void;
-	ClearAutomaticPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number): void;
-	GetValueListItemByDisplayID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string): IValueListItem;
-	GetValueListItemByDisplayIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItem;
-	GetValueListItemByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItem;
-	GetValueListItemByID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number): IValueListItem;
-	GetValueListItemByIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItem;
-	GetValueListItemIDByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean): number;
-	GetValueListItems(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType): IValueListItems;
-	GetValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItems;
-	GetValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number): IValueListItems;
-	GetValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number): IValueListItemsWithPermissions;
-	RemoveValueListItem(ValueList: MFiles.MFBuiltInValueList | number, Item: number): void;
-	SearchForValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItemSearchResults;
-	SearchForValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number): IValueListItemSearchResults;
-	SearchForValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number): IValueListItemSearchResultsWithPermissions;
-	UndeleteValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number): void;
-	UpdateValueListItem(ValueListItem: IValueListItem): void;
-}
-
-interface IVaultValueListItemOperationsAsync {
-	AddValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItem: IValueListItem, AdministrativeOperation: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ChangeAutomaticPermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList, NameForAutomaticPermissions: string, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ChangeAutomaticPermissionsToItemsOwnPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ChangeAutomaticPermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ChangePermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ChangePermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ClearAutomaticPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemByDisplayID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemByDisplayIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemByID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemByIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemIDByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItems(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IValueListItemsWithPermissions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveValueListItem(ValueList: MFiles.MFBuiltInValueList | number, Item: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItemSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number, successCallback?: (result: IValueListItemSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SearchForValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number, successCallback?: (result: IValueListItemSearchResultsWithPermissions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UndeleteValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateValueListItem(ValueListItem: IValueListItem, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultValueListOperations {
-	AddValueListAdmin(ValueList: IObjectTypeAdmin): IObjectTypeAdmin;
-	GetBuiltInValueList(BuiltInValueList: MFiles.MFBuiltInValueList): IObjectType;
-	GetValueList(ValueList: MFiles.MFBuiltInValueList | number): IObjectType;
-	GetValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number): IObjectTypeAdmin;
-	GetValueListIDByAlias(Alias: string): number;
-	GetValueListIDByGUID(ValueListGUID: string): number;
-	GetValueLists(): IObjectTypes;
-	GetValueListsAdmin(): IObjectTypesAdmin;
-	RefreshExternalValueList(ValueList: MFiles.MFBuiltInValueList | number, RefreshType: MFiles.MFExternalDBRefreshType): void;
-	RemoveValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number): void;
-	UpdateValueListAdmin(ValueList: IObjectTypeAdmin): IObjectTypeAdmin;
-	UpdateValueListWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean): IObjectTypeAdmin;
-}
-
-interface IVaultValueListOperationsAsync {
-	AddValueListAdmin(ValueList: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetBuiltInValueList(BuiltInValueList: MFiles.MFBuiltInValueList, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueList(ValueList: MFiles.MFBuiltInValueList | number, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListIDByGUID(ValueListGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueLists(successCallback?: (result: IObjectTypes) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetValueListsAdmin(successCallback?: (result: IObjectTypesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RefreshExternalValueList(ValueList: MFiles.MFBuiltInValueList | number, RefreshType: MFiles.MFExternalDBRefreshType, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateValueListAdmin(ValueList: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateValueListWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultViewOperations {
-	AddOfflineFilter(OfflineFilter: IView): IView;
-	AddTemporarySearchView(View: IView, SearchCriteria: ISearchCriteria, BaseSearchConditions: ISearchConditions): IView;
-	AddView(View: IView): IView;
-	FindPropertyFolderLocationInView(View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues): string;
-	GetBuiltInView(BuiltInView: MFiles.MFBuiltInView): IView;
-	GetFolderContents(FolderLocation: IFolderDefs): IFolderContentItems;
-	GetFolderNameListing(ExpressionEx: IExpressionEx, SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean): IFolderNameListing;
-	GetFolderUIStateForFolder(CommonState: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean): IFolderUIState;
-	GetFolderUIStateForSpecialLocation(CommonState: boolean, LocationType: MFiles.MFFolderUIStateLocationType): IFolderUIState;
-	GetMFilesURLForView(ViewID: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, SimpleURL: boolean): string;
-	GetPropertyValuesOfFolder(FolderLocation: IFolderDefs, ObjectType: MFiles.MFBuiltInObjectType | number): IPropertyValues;
-	GetPropertyValuesOfPath(Path: string, ObjectType: MFiles.MFBuiltInObjectType | number): IPropertyValues;
-	GetTemporarySearchByPath(RelativePath: string): ITemporarySearchView;
-	GetTemporarySearchView(ViewID: MFiles.MFBuiltInView | number): ITemporarySearchView;
-	GetView(View: MFiles.MFBuiltInView | number): IView;
-	GetViewIDByGUID(ViewGUID: string): number;
-	GetViewLocationInClient(View: MFiles.MFBuiltInView | number, IncludeViewNameInPath: boolean): string;
-	GetViews(ViewCategory: MFiles.MFViewCategory, AllViews: boolean, ParentView: number): IViews;
-	GetViewsAdmin(IncludeCommonViews: boolean, UserID: number): IViews;
-	ModifyTemporarySearch(TemporarySearchView: ITemporarySearchView): void;
-	RemoveView(View: MFiles.MFBuiltInView | number): void;
-	ResetFolderUIStateForFolder(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean): IFolderUIState;
-	ResetFolderUIStateForSpecialLocation(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, LocationType: MFiles.MFFolderUIStateLocationType): IFolderUIState;
-	SaveFolderUIStateForFolder(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, State: IFolderUIState): void;
-	SaveFolderUIStateForSpecialLocation(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, LocationType: MFiles.MFFolderUIStateLocationType, State: IFolderUIState): void;
-	ShowViewOrPropertyFolder(ParentWindow: number, View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues): void;
-	UpdateView(View: IView): IView;
-}
-
-interface IVaultViewOperationsAsync {
-	AddOfflineFilter(OfflineFilter: IView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	AddTemporarySearchView(View: IView, SearchCriteria: ISearchCriteria, BaseSearchConditions: ISearchConditions, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	AddView(View: IView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	FindPropertyFolderLocationInView(View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetBuiltInView(BuiltInView: MFiles.MFBuiltInView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFolderContents(FolderLocation: IFolderDefs, successCallback?: (result: IFolderContentItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFolderNameListing(ExpressionEx: IExpressionEx, SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, successCallback?: (result: IFolderNameListing) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFolderUIStateForFolder(CommonState: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetFolderUIStateForSpecialLocation(CommonState: boolean, LocationType: MFiles.MFFolderUIStateLocationType, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetMFilesURLForView(ViewID: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, SimpleURL: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyValuesOfFolder(FolderLocation: IFolderDefs, ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetPropertyValuesOfPath(Path: string, ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetTemporarySearchByPath(RelativePath: string, successCallback?: (result: ITemporarySearchView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetTemporarySearchView(ViewID: MFiles.MFBuiltInView | number, successCallback?: (result: ITemporarySearchView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetView(View: MFiles.MFBuiltInView | number, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetViewIDByGUID(ViewGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetViewLocationInClient(View: MFiles.MFBuiltInView | number, IncludeViewNameInPath: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetViews(ViewCategory: MFiles.MFViewCategory, AllViews: boolean, ParentView: number, successCallback?: (result: IViews) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetViewsAdmin(IncludeCommonViews: boolean, UserID: number, successCallback?: (result: IViews) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ModifyTemporarySearch(TemporarySearchView: ITemporarySearchView, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveView(View: MFiles.MFBuiltInView | number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ResetFolderUIStateForFolder(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ResetFolderUIStateForSpecialLocation(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, LocationType: MFiles.MFFolderUIStateLocationType, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SaveFolderUIStateForFolder(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, State: IFolderUIState, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	SaveFolderUIStateForSpecialLocation(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, LocationType: MFiles.MFFolderUIStateLocationType, State: IFolderUIState, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	ShowViewOrPropertyFolder(ParentWindow: number, View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateView(View: IView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVaultWorkflowOperations {
-	AddWorkflowAdmin(Workflow: IWorkflowAdmin): IWorkflowAdmin;
-	GetStateTransitionSignatureSettings(FromState: number, ToState: number): ISignatureSettings;
-	GetStateTransitionSignatureSettingsByID(StateTransitionID: number): ISignatureSettings;
-	GetWorkflowAdmin(WorkflowID: number): IWorkflowAdmin;
-	GetWorkflowForClient(WorkflowID: number, UpdateFromServer: boolean): IWorkflow;
-	GetWorkflowIDByAlias(Alias: string): number;
-	GetWorkflowIDByGUID(WorkflowGUID: string): number;
-	GetWorkflowsAdmin(): IWorkflowsAdmin;
-	GetWorkflowsAsValueListItems(UpdateFromServer: boolean): IValueListItems;
-	GetWorkflowsForClient(UpdateFromServer: boolean): IWorkflows;
-	GetWorkflowStateIDByAlias(Alias: string): number;
-	GetWorkflowStateIDByGUID(StateGUID: string): number;
-	GetWorkflowStates(Workflow: number, CurrentState: ITypedValue): IStates;
-	GetWorkflowStatesEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer): IStates;
-	GetWorkflowStateTransitionIDByAlias(Alias: string): number;
-	GetWorkflowStateTransitionIDByGUID(StateTransitionGUID: string): number;
-	GetWorkflowStateTransitions(Workflow: number, CurrentState: ITypedValue): IStateTransitionsForClient;
-	GetWorkflowStateTransitionsAsJSON(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer): string;
-	GetWorkflowStateTransitionsEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer): IStateTransitionsForClient;
-	RemoveWorkflowAdmin(WorkflowID: number): void;
-	UpdateWorkflowAdmin(Workflow: IWorkflowAdmin): IWorkflowAdmin;
-}
-
-interface IVaultWorkflowOperationsAsync {
-	AddWorkflowAdmin(Workflow: IWorkflowAdmin, successCallback?: (result: IWorkflowAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetStateTransitionSignatureSettings(FromState: number, ToState: number, successCallback?: (result: ISignatureSettings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetStateTransitionSignatureSettingsByID(StateTransitionID: number, successCallback?: (result: ISignatureSettings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowAdmin(WorkflowID: number, successCallback?: (result: IWorkflowAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowForClient(WorkflowID: number, UpdateFromServer: boolean, successCallback?: (result: IWorkflow) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowIDByGUID(WorkflowGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowsAdmin(successCallback?: (result: IWorkflowsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowsAsValueListItems(UpdateFromServer: boolean, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowsForClient(UpdateFromServer: boolean, successCallback?: (result: IWorkflows) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStateIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStateIDByGUID(StateGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStates(Workflow: number, CurrentState: ITypedValue, successCallback?: (result: IStates) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStatesEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer, successCallback?: (result: IStates) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStateTransitionIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStateTransitionIDByGUID(StateTransitionGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStateTransitions(Workflow: number, CurrentState: ITypedValue, successCallback?: (result: IStateTransitionsForClient) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStateTransitionsAsJSON(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	GetWorkflowStateTransitionsEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer, successCallback?: (result: IStateTransitionsForClient) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	RemoveWorkflowAdmin(WorkflowID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-	UpdateWorkflowAdmin(Workflow: IWorkflowAdmin, successCallback?: (result: IWorkflowAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
-}
-
-interface IVerifyVaultJob {
-	readonly FixErrors: boolean;
-	readonly VaultGUID: string;
-	readonly VerifyFileContents: boolean;
-	Clone(): IVerifyVaultJob;
-	GetNumberOfSteps(): number;
-	GetOneBasedIndexOfStep(CurrentStep: number): number;
-	GetStepProgressText(CurrentStep: number): string;
-	Set(GuidVault: string, FixErrors: boolean, VerifyFileContents: boolean): void;
-}
-
-interface IVerifyVaultJobOutput {
-	readonly Errors: IStrings;
-}
-
-interface IVersionComment {
-	readonly LastModifiedBy: IPropertyValue;
-	readonly ObjVer: IObjVer;
-	readonly StatusChanged: IPropertyValue;
-	readonly VersionComment: IPropertyValue;
-}
-
-interface IVersionComments {
-	readonly Count: number;
-	Item(Index: number): IVersionComment;
-}
-
-interface IView {
-	AccessControlList: IAccessControlList;
-	Common: boolean;
-	readonly GUID: string;
-	HasParent: boolean;
-	ID: number;
-	Levels: IExpressionExs;
-	LookInAllVersions: boolean;
-	Name: string;
-	Parent: number;
-	ReturnLatestVisibleVersion: boolean;
-	SearchConditions: ISearchConditions;
-	SearchDef: ISearchDef;
-	SearchFlags: MFiles.MFSearchFlags;
-	ViewFlags: MFiles.MFViewFlag;
-	ViewLocation: IViewLocation;
-	ViewType: MFiles.MFViewType;
-	Visible: boolean;
-	Clone(): IView;
-	CloneFrom(View: IView): void;
-}
-
-interface IViewLocation {
-	OverlappedFolder: ITypedValue;
-	Overlapping: boolean;
-	ParentFolder: IFolderDefs;
-	Clone(): IViewLocation;
-}
-
-interface IViews {
-	readonly Count: number;
-	Item(Index: number): IView;
-}
-
-interface IWeeklyTrigger {
-	DaysOfTheWeek: MFiles.MFTriggerWeekDay;
-	WeeksInterval: number;
-}
-
-interface IWindow {
-	readonly Events: IWindowEvents;
-	readonly Handle: number;
-	Height: number;
-	readonly IsFocused: boolean;
-	Maximizable: boolean;
-	Minimizable: boolean;
-	Resizable: boolean;
-	Title: string;
-	Width: number;
-	Close(): void;
-	Focus(): void;
-	Maximize(): void;
-	Minimize(): void;
-	Restore(): void;
-	SetDefaultSize(defaultWidth: number, defaultHeight: number, resizeToDefault: boolean): void;
-}
-
-interface IWindowEvents extends IEvents {
-	OnCloseWindow?(): boolean;
-}
-
-interface IWorkflow {
-	ID: number;
-	Name: string;
-	ObjectClass: (MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number);
-	Clone(): IWorkflow;
-	GetAsLookup(): ILookup;
-	GetAsTypedValue(): ITypedValue;
-}
-
-interface IWorkflowAdmin {
-	Description: string;
-	Permissions: IAccessControlList;
-	SemanticAliases: ISemanticAliases;
-	States: IStatesAdmin;
-	StateTransitions: IStateTransitions;
-	Workflow: IWorkflow;
-	Clone(): IWorkflowAdmin;
-}
-
-interface IWorkflowAssignment {
-	AssignedTo_DEPRECATED: IPropertyValue;
-	CompletedBy_DEPRECATED: IPropertyValue;
-	Deadline_DEPRECATED: IPropertyValue;
-	Description_DEPRECATED: IPropertyValue;
-	MonitoredBy_DEPRECATED: IPropertyValue;
-	Clone_DEPRECATED(): IWorkflowAssignment;
-}
-
-interface IWorkflows {
-	readonly Count: number;
-	Item(Index: number): IWorkflow;
-}
-
-interface IWorkflowsAdmin {
-	readonly Count: number;
-	Add(Index: number, WorkflowAdmin: IWorkflowAdmin): void;
-	Item(Index: number): IWorkflowAdmin;
-	Remove(Index: number): void;
-}
-
-interface IXMLSearchResult {
-	readonly MoreResults: boolean;
-	readonly SearchResult: string;
-}
-
-declare namespace MFiles {
-	const enum BuiltinCommand {
-		Undefined = 0,
-		FIRST = 1,
-		NewView = 2,
-		NewOfflineFilter = 3,
-		NewTraditionalFolder = 4,
-		NewPropertyFolder = 5,
-		ConvertToDocument = 6,
-		ConvertToDocumentFiles = 7,
-		ImportFilesAndFolders = 8,
-		MakeCopy = 9,
-		CheckOut = 10,
-		CheckIn = 11,
-		CheckInWithComments = 12,
-		UndoCheckOut = 13,
-		Properties = 14,
-		MarkFolderForOfflineAvailability = 15,
-		MarkForOfflineAvailability = 16,
-		RemoveOfflineAvailability = 17,
-		ShowHistory = 18,
-		ShowRelationships = 19,
-		ShowCollectionMembers = 20,
-		ViewEditSubobjects = 21,
-		ShowComments = 22,
-		NewAssignment = 23,
-		ShowAssignments = 24,
-		CompleteAssignment = 25,
-		ChangeState = 26,
-		Workflow = 27,
-		MarkForArchiving = 28,
-		ClearArchiveMarker = 29,
-		Undelete = 30,
-		ConvertToSingleFileDocument = 31,
-		ConvertToOneMultiFileDocument = 32,
-		ReplaceWithFile = 33,
-		GoOnline = 34,
-		GoOffline = 35,
-		LogOut = 36,
-		ClientSettings = 37,
-		ServerAdmin = 38,
-		NotificationSettings = 39,
-		ClearLocalCache = 40,
-		ChangePassword = 41,
-		ChangeLanguage = 42,
-		AddDocumentFromScanner = 43,
-		AddFileFromScanner = 44,
-		ReplaceWithFileFromScanner = 45,
-		ConvertToSearchablePDF = 46,
-		SendLinkByEmail = 47,
-		SendCopyByEmail = 48,
-		SendPDFByEmail = 49,
-		SaveAsPDF = 50,
-		SubstituteUsers = 51,
-		ShowBottomPane = 52,
-		ShowPropertiesPane = 52,
-		ShowRightPane = 53,
-		ShowPreviewPane = 53,
-		GroupObjectsByObjectType = 54,
-		GroupViewsAndFolders = 55,
-		HideView = 56,
-		UnhideView = 57,
-		CleanView = 58,
-		UnhideViews = 59,
-		ResetUISettingsToDefaults = 60,
-		SaveAsCommonUISettings = 61,
-		AddToFavorites = 62,
-		RemoveFromFavorites = 63,
-		CreateOrGetShortcut = 64,
-		CreateShortcut = 65,
-		AddShortcutToTaskPane = 66,
-		AddDashboardToViewLocMain = 67,
-		AddReportToViewLocMain = 67,
-		AddDashboardToViewLocRight = 68,
-		AddReportToViewLocRight = 68,
-		AddDashboardToViewLocBottom = 69,
-		AddReportToViewLocBottom = 69,
-		RemoveDashboardFromViewLocMain = 70,
-		RemoveReportFromViewLocMain = 70,
-		RemoveDashboardFromViewLocRight = 71,
-		RemoveReportFromViewLocRight = 71,
-		RemoveDashboardFromViewLocBottom = 72,
-		RemoveReportFromViewLocBottom = 72,
-		Copy = 73,
-		Cut = 74,
-		Paste = 75,
-		Delete = 76,
-		Rename = 77,
-		NewWindow = 78,
-		ExportObjects = 79,
-		ExportSearchBarConditions = 80,
-		ConvertToSingleFilePDF = 81,
-		ConvertToMultiFilePDF = 82,
-		ChooseColumns = 83,
-		PasteAsMultiFileDocument = 84,
-		SelectAll = 85,
-		InvertSelection = 86,
-		NewObject = 87,
-		Refresh = 88,
-		RollBack = 89,
-		DeleteAll = 90,
-		Destroy = 91,
-		ModifyVersionDetails = 92,
-		LabelThisVersion = 93,
-		NewSubobject = 94,
-		AddCollectionMember = 95,
-		EditCollectionMembership = 96,
-		RemoveCollectionMembership = 97,
-		AddRelationship = 98,
-		EditRelationship = 99,
-		RemoveRelationship = 100,
-		SubMenu_NewObject = 101,
-		SubMenu_NewFile = 102,
-		SubMenu_WindowsCommands = 103,
-		SubMenu_Send = 104,
-		SubMenu_DisplayMode = 105,
-		ChangeViewMode = 106,
-		SubMenu_OfflineAvailability = 107,
-		SubMenu_BrowseRelatedObjects = 108,
-		SubMenu_Archiving = 109,
-		SubMenu_Workflow = 110,
-		SubMenu_ScanningAndOCR = 111,
-		SubMenu_RefreshExtObjects = 112,
-		SubMenu_Dashboards = 113,
-		SubMenu_Reports = 113,
-		GroupObjectsByFirstLetters = 114,
-		GroupFoldersByFirstLetters = 115,
-		AddGroupingLevel = 116,
-		CurrentGroupingLevel = 117,
-		RemoveCurrentGroupingLevel = 118,
-		HideOrShowEmptyFolders = 119,
-		BrowseInThisWindow = 120,
-		GroupBy = 121,
-		GroupFoldersBy = 122,
-		MarkComplete = 123,
-		GoToCustomView = 124,
-		Submenu_VaultX = 125,
-		Submenu_ViewX = 126,
-		Submenu_DocumentX = 127,
-		HitHighlighting = 128,
-		CheckOutForCoauthoring = 129,
-		BeginCoauthoring = 130,
-		EndCoauthoring = 131,
-		ShowOriginalObject = 132,
-		SendCoauthoringLink = 133,
-		ResolveConflictKeepThis = 134,
-		ResolveConflictDiscardThis = 135,
-		Applications = 136,
-		ShareViaSkyDrive = 137,
-		ShareViaSkyDriveAsPDF = 138,
-		ShowMetadataInRightPane = 139,
-		ShowMetadataInBottomPane = 140,
-		MFilesHelp = 141,
-		MFilesGuidedTour = 142,
-		ShowNavigationPane = 143,
-		CustomizePropertyFolder = 144,
-		UncustomizePropertyFolder = 145,
-		UseNormalLayout = 146,
-		UseCompactLayout = 147,
-		RightPane_Normal = 148,
-		RightPane_Minimized = 149,
-		RightPane_Off = 150,
-		BottomPane_Normal = 151,
-		BottomPane_Minimized = 152,
-		BottomPane_Off = 153,
-		NavigationPane_On = 154,
-		NavigationPane_Off = 155,
-		ShowVisualAnnotations = 156,
-		ShowAllVisualAnnotations = 157,
-		HideAllVisualAnnotations = 158,
-		EditOneAnnotation = 159,
-		SaveAnnotation = 160,
-		NewAnnotation = 161,
-		AboutMFiles = 162,
-		MarkApproved = 163,
-		MarkRejected = 164,
-		ApproveAssignment = 165,
-		RejectAssignment = 166,
-		ChangeStateAdmin = 167,
-		SharePublicLink = 168,
-		SharedByMe = 169,
-		UploadFiles = 170,
-		DiscardFileModifications = 171,
-		ShowSearchResultsFromMultipleVaults = 172,
-		ShowSearchRefinementOptions = 173,
-		LAST = 174,
-		ALL = 268435455
-	}
-
-	const enum CommandLocation {
-		Undefined = 0,
-		MainMenu = 1,
-		ContextMenu = 2,
-		TaskPane = 4,
-		All = 268435455
-	}
-
-	const enum CommandState {
-		Undefined = 0,
-		Active = 1,
-		Inactive = 2,
-		Hidden = 3
-	}
-
-	const enum DefaultIcon {
-		CheckOut = 0,
-		CheckIn = 1,
-		UndoCheckOut = 2,
-		History = 4,
-		Properties = 5,
-		MakeCopy = 6,
-		View = 8,
-		Root = 9,
-		Workflow = 11,
-		LogOut = 12,
-		GoOnline = 13,
-		GoOffline = 14,
-		Assignment = 15,
-		MarkComplete = 16,
-		TraditionalFolder = 17,
-		PropertyFolder = 18,
-		File = 19,
-		MFD = 20,
-		PrivateView = 21,
-		Collection = 22,
-		ChangeState = 24,
-		RelationShips = 25,
-		SelectedState = 26
-	}
-
-	const enum Event {
-		Undefined = 0,
-		Notification = 1,
-		Started = 2,
-		Stop = 3,
-		ShowPane = 4,
-		HidePane = 5,
-		PaneResized = 6,
-		NewShellFrame = 7,
-		NewNormalShellFrame = 8,
-		NewCommonDialogShellFrame = 9,
-		NewEmbeddedShellFrame = 10,
-		NewTaskPane = 11,
-		NewBottomPane = 12,
-		NewSearchPane = 13,
-		NewRightPane = 14,
-		NewShellListing = 15,
-		NewCommands = 16,
-		ActiveListingChanged = 17,
-		NewTab = 18,
-		TabSelected = 19,
-		TabUnselected = 20,
-		MinimizedStateChanged = 21,
-		BuiltinCommand = 22,
-		CustomCommand = 23,
-		SelectionChanged = 24,
-		SelectedItemsChanged = 25,
-		ContentChanged = 26,
-		ShowContextMenu = 27,
-		ShowMainMenu = 28,
-		ListingActivated = 29,
-		ListingDeactivated = 30,
-		SearchInitiated = 31,
-		SearchReady = 32,
-		CloseWindow = 33,
-		NewVaultEntry = 34,
-		CreateObject = 35,
-		ObjectCreated = 36,
-		DestroyObject = 37,
-		ObjectDestroyed = 38,
-		DestroyObjects = 39,
-		ObjectsDestroyed = 40,
-		DestroyObjectVersion = 41,
-		ObjectVersionDestroyed = 42,
-		DestroyObjectVersions = 43,
-		ObjectVersionsDestroyed = 44,
-		RemoveObject = 45,
-		ObjectRemoved = 46,
-		RemoveObjects = 47,
-		ObjectsRemoved = 48,
-		UndeleteObject = 49,
-		ObjectUndeleted = 50,
-		UndeleteObjects = 51,
-		ObjectsUndeleted = 52,
-		AddObjectFile = 53,
-		ObjectFileAdded = 54,
-		RemoveObjectFile = 55,
-		ObjectFileRemoved = 56,
-		RenameObjectFile = 57,
-		ObjectFileRenamed = 58,
-		CheckInObject = 59,
-		ObjectCheckedIn = 60,
-		CheckInObjects = 61,
-		ObjectsCheckedIn = 62,
-		CheckOutObject = 63,
-		ObjectCheckedOut = 64,
-		CheckOutObjects = 65,
-		ObjectsCheckedOut = 66,
-		UndoObjectCheckout = 67,
-		ObjectCheckoutUndone = 68,
-		UndoObjectCheckouts = 69,
-		ObjectCheckoutsUndone = 70,
-		RollBackObjectVersion = 71,
-		ObjectVersionRolledBack = 72,
-		SetPropertiesOfObjectVersion = 73,
-		PropertiesOfObjectVersionSet = 74,
-		SetPropertiesOfObjectVersions = 75,
-		PropertiesOfObjectVersionsSet = 76,
-		SetObjectVersionPermissions = 77,
-		ObjectVersionPermissionsSet = 78,
-		AddObjectToFavorites = 79,
-		ObjectAddedToFavorites = 80,
-		AddObjectsToFavorites = 81,
-		ObjectsAddedToFavorites = 82,
-		RemoveObjectFromFavorites = 83,
-		ObjectRemovedFromFavorites = 84,
-		RemoveObjectsFromFavorites = 85,
-		ObjectsRemovedFromFavorites = 86,
-		ModifyObjectVersionLabels = 87,
-		ObjectVersionLabelsModified = 88,
-		SetObjectLevelProperty = 89,
-		ObjectLevelPropertySet = 90,
-		SetObjectOfflineAvailability = 91,
-		RemoveObjectOfflineAvailability = 92,
-		ObjectOfflineAvailabilitySet = 93,
-		ObjectOfflineAvailabilityRemoved = 94,
-		SwitchToOfflineMode = 95,
-		SwitchedToOfflineMode = 96,
-		SwitchToOnlineMode = 97,
-		SwitchedToOnlineMode = 98,
-		LogOut = 99,
-		ChangeVaultLanguage = 100,
-		VaultLanguageChanged = 101,
-		LoggedIn = 102,
-		QueryCanHandleFocusChangeKey = 103,
-		ItemAdded = 104,
-		ItemRemoved = 105,
-		ItemReplaced = 106,
-		ItemMoved = 107,
-		AllItemsCleared = 108,
-		ItemsChanged = 109,
-		ChangeValue = 110,
-		ValueChanged = 111,
-		ChangeValueRequiredStatus = 112,
-		ValueRequiredStatusChanged = 113,
-		ChangeMustExistStatus = 114,
-		MustExistStatusChanged = 115,
-		ChangeReadOnlyStatus = 116,
-		ReadOnlyStatusChanged = 117,
-		AutomaticValueStatusChanged = 118,
-		ChangeVisibility = 119,
-		VisibilityChanged = 120,
-		ChangeLabel = 121,
-		LabelChanged = 122,
-		SetModifyFlag = 123,
-		ModifyFlagChanged = 124,
-		DataError = 125,
-		ValueValidationError = 126,
-		SelectionListItemsUpdated = 127,
-		UpdatingContent = 128,
-		ContentUpdated = 129,
-		InitializingContent = 130,
-		ContentInitialized = 131,
-		PermissionsChanged = 132,
-		IconChanged = 133,
-		FilePreviewInfoUpdated = 134,
-		PopOutMetadataCard = 135,
-		MetadataCardPoppedOut = 136,
-		EnabledStateChanged = 137,
-		HitHighlightingUpdated = 138,
-		RequestActivateView = 139,
-		QueryUIModifiedState = 140,
-		CommitUIModifiedState = 141,
-		OptionValueChanged = 142,
-		NameChanged = 143,
-		ExplanationChanged = 144,
-		ShowTab = 145,
-		HideTab = 146,
-		FocusReceived = 147,
-		FocusLost = 148,
-		MetadataCardLocationChanging = 149,
-		MetadataCardLocationChanged = 150,
-		ValueSuggestionsChanged = 151
-	}
-
-	const enum ListingEmptinessState {
-		NotYetKnown = 1,
-		NotEmpty = 2,
-		Empty = 3
-	}
-
-	const enum MenuLocation {
-		DefaultCommand = 20,
-		Top = 21,
-		BeforeWindowsCommands = 22,
-		AfterWindowsCommands = 23,
-		ObjectCreation = 24,
-		FileCreation = 25,
-		ObjectOperations = 26,
-		FolderSpecific = 27,
-		SingleFolderSpecific = 28,
-		ViewVisibility = 29,
-		Misc1_Top = 30,
-		Misc1_Middle = 31,
-		Misc1_Bottom = 32,
-		HistorySpecific = 33,
-		RelationshipsSpecific = 34,
-		CollectionMembersSpecific = 35,
-		Deletion = 36,
-		Edit = 37,
-		Misc2_Top = 38,
-		Misc2_Middle = 39,
-		Misc2_Bottom = 40,
-		DocumentConversions = 41,
-		BeforeProperties = 42,
-		Bottom = 43,
-		PropertyFolder = 44
-	}
-
-	const enum MFACLComponentOverrideAccess {
-		None = 0,
-		Granted = 1
-	}
-
-	const enum MFACLEnforcingMode {
-		Automatic = 0,
-		Provided = 1,
-		ResetToDefault = 2,
-		None = 3
-	}
-
-	const enum MFACLMode {
-		Simple = 0,
-		AutomaticPermissionsWithComponents = 1
-	}
-
-	const enum MFActionType {
-		Unknown = 0,
-		CreateAssignment = 1
-	}
-
-	const enum MFAdditionalClassInfoType {
-		Unknown = 0,
-		Assignment = 1
-	}
-
-	const enum MFApplicationLicenseStatus {
-		Unknown = 0,
-		NotNeeded = 1,
-		NotInstalled = 2,
-		Installed = 3,
-		Valid = 4,
-		Invalid = 5,
-		FormatError = 6,
-		Trial = 7,
-		GracePeriod = 8
-	}
-
-	const enum MFAssignmentType {
-		Task = 0,
-		Approval = 1
-	}
-
-	const enum MFAttachVaultOptionsFlag {
-		None = 0,
-		ExternalObjectTypes = 1,
-		ExternalSources = 2,
-		ExportedDataSets = 4,
-		ExportImportJobs = 8,
-		ExternalUserGroups = 16,
-		EventHandlers = 32
-	}
-
-	const enum MFAuthType {
-		Unknown = 0,
-		LoggedOnWindowsUser = 1,
-		SpecificWindowsUser = 2,
-		SpecificMFilesUser = 3
-	}
-
-	const enum MFAutomaticPermissionsOperationOptions {
-		None = 0,
-		ForceActive = 1
-	}
-
-	const enum MFAutomaticValueType {
-		None = 0,
-		CalculatedWithPlaceholders = 1,
-		CalculatedWithVBScript = 2,
-		AutoNumberSimple = 3,
-		WithVBScript = 4
-	}
-
-	const enum MFAutoStateTransitionMode {
-		None = 0,
-		RelativeTime = 1,
-		AssignmentCompleteOne = 2,
-		AssignmentCompleteAll = 3,
-		CriteriaFulfilled = 4,
-		AllowedByScript = 5,
-		AssignmentComplete = 6,
-		AssignmentRejected = 7
-	}
-
-	const enum MFBackupType {
-		Full = 0,
-		Differential = 1
-	}
-
-	const enum MFBuiltInDocumentClass {
-		UnclassifiedDocument = 0,
-		OtherDocument = 1
-	}
-
-	const enum MFBuiltInMetadataStructureItemID {
-		All = -1000000
-	}
-
-	const enum MFBuiltInObjectClass {
-		Any = -3,
-		NotSet = -2,
-		GenericAssignment = -100
-	}
-
-	const enum MFBuiltInObjectType {
-		Document = 0,
-		DocumentCollection = 9,
-		Assignment = 10,
-		DocumentOrDocumentCollection = -102
-	}
-
-	const enum MFBuiltInPropertyDef {
-		NameOrTitle = 0,
-		Created = 20,
-		LastModified = 21,
-		SingleFileObject = 22,
-		LastModifiedBy = 23,
-		StatusChanged = 24,
-		CreatedBy = 25,
-		Keywords = 26,
-		Deleted = 27,
-		DeletedBy = 28,
-		VersionLabel = 29,
-		SizeOnServerThisVersion = 30,
-		SizeOnServerAllVersions = 31,
-		MarkedForArchiving = 32,
-		VersionComment = 33,
-		Comment = 33,
-		TraditionalFolder = 34,
-		CreatedFromExternalLocation = 35,
-		AdditionalClasses = 36,
-		IsTemplate = 37,
-		Workflow = 38,
-		State = 39,
-		StateEntered = 40,
-		AssignmentDescription = 41,
-		Deadline = 42,
-		MonitoredBy = 43,
-		AssignedTo = 44,
-		CompletedBy = 45,
-		CollectionMemberDocuments = 46,
-		CollectionMemberCollections = 47,
-		Constituent = 48,
-		OriginalPath = 75,
-		Reference = 76,
-		OriginalPath2 = 77,
-		OriginalPath3 = 78,
-		WorkflowAssignment = 79,
-		AccessedByMe = 81,
-		FavoriteView = 82,
-		MessageID = 83,
-		InReplyTo = 84,
-		InReplyToReference = 85,
-		SignatureManifestation = 86,
-		ReportURL = 87,
-		ReportPlacement = 88,
-		ObjectChanged = 89,
-		ACLChanged = 90,
-		VersionLabelChanged = 91,
-		VersionCommentChanged = 92,
-		DeletionStatusChanged = 93,
-		VaultGUID = 94,
-		SharedFiles = 95,
-		ConflictResolved = 96,
-		RejectedBy = 97,
-		Completed = 98,
-		StateTransition = 99,
-		Class = 100,
-		ClassGroups = 101,
-		ObjectID = -102
-	}
-
-	const enum MFBuiltInUserGroup {
-		Users = 1,
-		AndExternalUsers = 2
-	}
-
-	const enum MFBuiltInValueList {
-		Documents = 0,
-		Classes = 1,
-		ClassGroups = 2,
-		VersionLabels = 3,
-		TraditionalFolders = 4,
-		ExternalLocations = 5,
-		Users = 6,
-		Workflows = 7,
-		States = 8,
-		Collections = 9,
-		Assignments = 10,
-		UserGroups = 16,
-		StateTransitions = 17
-	}
-
-	const enum MFBuiltInView {
-		CheckedOutToCurrentUser = 5,
-		Offline = 6,
-		RecentlyModifiedByMe = 7,
-		Templates = 8,
-		AssignedToMe = 9,
-		LatestSearches = 11,
-		ByID = 12,
-		BuiltIn = 13,
-		RecentlyAccessedByMe = 14,
-		Favorites = 15,
-		AnyView = -1,
-		OfflineCheckedOut = -9000,
-		OfflineMarkedForOfflineAvailability = -9001
-	}
-
-	const enum MFConditionType {
-		Equal = 1,
-		NotEqual = 2,
-		GreaterThan = 3,
-		LessThan = 4,
-		GreaterThanOrEqual = 5,
-		LessThanOrEqual = 6,
-		Contains = 7,
-		DoesNotContain = 8,
-		StartsWith = 9,
-		DoesNotStartWith = 10,
-		MatchesWildcardPattern = 11,
-		DoesNotMatchWildcardPattern = 12,
-		IsMissing = 13,
-		IsNotMissing = 14,
-		StartsWithAtWordBoundary = 15,
-		ContainsAnyBitwise = 16,
-		DoesNotContainAnyBitwise = 17
-	}
-
-	const enum MFContentType {
-		Generic = 0,
-		EmailAddress = 1,
-		URL = 2,
-		RTF = 3,
-		HTML = 4
-	}
-
-	const enum MFCustomApplicationType {
-		Unspecified = 0,
-		Client = 1,
-		Server = 2
-	}
-
-	const enum MFDataFunction {
-		NoOp = 0,
-		Year = 1,
-		Month = 2,
-		YearAndMonth = 3,
-		Date = 4,
-		DaysFrom = 5,
-		DaysTo = 6,
-		IntegerSegment = 7,
-		LeftChars = 8,
-		InitialCharGroup = 9
-	}
-
-	const enum MFDataType {
-		Uninitialized = 0,
-		Text = 1,
-		Integer = 2,
-		Floating = 3,
-		Date = 5,
-		Time = 6,
-		Timestamp = 7,
-		Boolean = 8,
-		Lookup = 9,
-		MultiSelectLookup = 10,
-		Integer64 = 11,
-		FILETIME = 12,
-		MultiLineText = 13,
-		ACL = 14
-	}
-
-	const enum MFDBEngine {
-		None = 0,
-		Firebird = 1,
-		MSSQLServer = 2
-	}
-
-	const enum MFDefaultPropertyType {
-		Undefined = 0,
-		FixedValue = 1,
-		FromHPDSSXML = 2,
-		FromXML = 3,
-		FromEmail = 4,
-		FromEmailHeader = 5,
-		FromOCR = 6
-	}
-
-	const enum MFDependencyRelation {
-		Nothing = 0,
-		AutomaticFilling = 1,
-		Filtering = 2
-	}
-
-	const enum MFEmailField {
-		Undefined = 0,
-		From = 1,
-		To = 2,
-		Cc = 3,
-		Subject = 4,
-		Body = 5,
-		Date = 6,
-		Importance = 7,
-		Sensitivity = 8
-	}
-
-	const enum MFEmailImportance {
-		Low = 0,
-		Normal = 1,
-		High = 2
-	}
-
-	const enum MFEmailSensitivity {
-		None = 0,
-		Normal = 1,
-		Personal = 2,
-		Private = 3,
-		Confidential = 4
-	}
-
-	const enum MFEventHandlerType {
-		TypeUndefined = 0,
-		BeforeSetProperties = 1,
-		AfterSetProperties = 2,
-		AfterCreateNewObjectFinalize = 3,
-		BeforeCheckInChanges = 4,
-		AfterCheckInChanges = 5,
-		BeforeCheckOut = 6,
-		AfterCheckOut = 7,
-		BeforeCancelCheckout = 8,
-		AfterCancelCheckout = 9,
-		BeforeDeleteObject = 10,
-		AfterDeleteObject = 11,
-		BeforeDestroyObject = 12,
-		AfterDestroyObject = 13,
-		BeforeSetObjectPermissions = 14,
-		AfterSetObjectPermissions = 15,
-		BeforeFileUpload = 16,
-		AfterFileUpload = 17,
-		BeforeFileDownload = 18,
-		AfterFileDownload = 19,
-		BeforeCreateNewValueListItem = 20,
-		AfterCreateNewValueListItem = 21,
-		BeforeLoginToVault = 22,
-		AfterLoginToVault = 23,
-		BeforeLogoutFromVault = 24,
-		AfterLogoutFromVault = 25,
-		BeforeRunScheduledJob = 26,
-		AfterRunScheduledJob = 27,
-		BeforeCreateNewObjectFinalize = 28,
-		BeforeCancelCreateObject = 29,
-		AfterCancelCreateObject = 30,
-		BeforeDestroyObjectVersion = 31,
-		AfterDestroyObjectVersion = 32,
-		Replication_AfterCreateNewObjectFinalize = 33,
-		Replication_AfterCheckInChanges = 34,
-		VaultExtensionMethod = 35,
-		BeforeCreateLoginAccount = 36,
-		AfterCreateLoginAccount = 37,
-		BeforeModifyLoginAccount = 38,
-		AfterModifyLoginAccount = 39,
-		BeforeRemoveLoginAccount = 40,
-		AfterRemoveLoginAccount = 41,
-		BeforeCreateUserAccount = 42,
-		AfterCreateUserAccount = 43,
-		BeforeModifyUserAccount = 44,
-		AfterModifyUserAccount = 45,
-		BeforeRemoveUserAccount = 46,
-		AfterRemoveUserAccount = 47,
-		BeforeCreateUserGroup = 48,
-		AfterCreateUserGroup = 49,
-		BeforeModifyUserGroup = 50,
-		AfterModifyUserGroup = 51,
-		BeforeRemoveUserGroup = 52,
-		AfterRemoveUserGroup = 53,
-		AfterBringOnline = 54,
-		BeforeTakeOffline = 55,
-		AfterCheckInChangesFinalize = 56,
-		AfterBeginTransaction = 57,
-		BeforeCommitTransaction = 58,
-		BeforeRollbackTransaction = 59,
-		AfterCancelCheckoutFinalize = 60,
-		BeforeUndeleteObject = 61,
-		AfterUndeleteObject = 62,
-		AfterUndeleteObjectFinalize = 63,
-		BeforeModifyMFilesCredentials = 64,
-		AfterModifyMFilesCredentials = 65,
-		BeforeReturnView = 66,
-		BeforeCheckInChangesFinalize = 67,
-		BeforeCreateView = 68,
-		AfterCreateView = 69,
-		BeforeModifyView = 70,
-		AfterModifyView = 71,
-		BeforeDeleteView = 72,
-		AfterDeleteView = 73
-	}
-
-	const enum MFExportContentFlag {
-		None = 0,
-		LatestVersionsOnly = 2,
-		DestroyAfterExport = 4,
-		ClearArchivalMarker = 8,
-		SaveFilesAlsoAsPDFA = 32,
-		ExportInformationOnDestroyedData = 64,
-		UseMultipleContentPackages = 128,
-		IndicateDropouts = 1024
-	}
-
-	const enum MFExpressionType {
-		Uninitialized = 0,
-		PropertyValue = 1,
-		ObjectIDSegment = 2,
-		StatusValue = 3,
-		FileValue = 4,
-		TypedValue = 5,
-		AnyField = 6,
-		Permissions = 7
-	}
-
-	const enum MFExtApplicationPlatform {
-		None = 0,
-		Desktop = 1,
-		Web = 2
-	}
-
-	const enum MFExternalDBRefreshType {
-		None = 0,
-		Quick = 1,
-		Full = 2
-	}
-
-	const enum MFFacetFilterStatusFlags {
-		None = 0,
-		Available = 1,
-		Applied = 2
-	}
-
-	const enum MFFacetSearchFlags {
-		None = 0,
-		IgnoreSearchPermissions = 2,
-		IgnoreFacetGroupPermissions = 4,
-		IgnoreFacetValuePermissions = 8,
-		SortFacetValues = 16,
-		AscendingOrder = 32,
-		OverrideByConfiguration = 64
-	}
-
-	const enum MFFileDataStorage {
-		Default = 0,
-		Disk = 1,
-		DB = 2,
-		External = 3
-	}
-
-	const enum MFFileFormat {
-		Native = 0,
-		PDF = 1,
-		DisplayOnlyPDF = 2
-	}
-
-	const enum MFFileInformationType {
-		Unknown = 0,
-		EmailMessage = 1
-	}
-
-	const enum MFFileOpenMethod {
-		ShowInShell = 0,
-		Open = 1,
-		View = 2,
-		Edit = 3
-	}
-
-	const enum MFFileValueType {
-		HasFiles = 0,
-		FileName = 1,
-		FileSize = 2,
-		FileID = 3,
-		CreationTime = 4,
-		ChangeTime = 5,
-		LinkedToExtLoc = 6,
-		LinkedToExtLocID = 7
-	}
-
-	const enum MFFolderColumnId {
-		Name = -1,
-		Type = -2,
-		Size = -3,
-		Status = -4,
-		CheckoutTo = -5,
-		CheckOutAt = -6,
-		ObjectDispId = -7,
-		ObjectVersion = -8,
-		ShStatusChanged = -9,
-		ShLastModifiedBy = -10,
-		Location = -11,
-		RelLocation = -12,
-		DateCreated = -13,
-		DateModified = -14,
-		Score = -15,
-		RelationshipDesc = -16,
-		HasRelationships = -17,
-		RelationshipTargetVer = -18,
-		ObjectType = -19,
-		ObjectPermissions = -20,
-		TypeEx = -21,
-		HasAssignments = -22,
-		ExportedFile = -1000000,
-		IdSegment = -1000001
-	}
-
-	const enum MFFolderContentItemType {
-		Unknown = 0,
-		ViewFolder = 1,
-		PropertyFolder = 2,
-		TraditionalFolder = 3,
-		ObjectVersion = 4
-	}
-
-	const enum MFFolderDefType {
-		Unknown = 0,
-		AnyFolder = 1,
-		ViewFolder = 2,
-		PropertyFolder = 3,
-		TraditionalFolder = 4,
-		SearchFolder = 5
-	}
-
-	const enum MFFolderListingAlgorithm {
-		None = 0,
-		TestEachValue = 1,
-		GetValuesByDistinctUse = 2,
-		TestEachValueWithSeparateQueries = 3
-	}
-
-	const enum MFFolderListingColumnFlags {
-		SelectIfLeftOfSelectedMainColumn = 1,
-		HideColumnText = 2
-	}
-
-	const enum MFFolderListingItemGroupingMode {
-		Unspecified = -1,
-		NoGrouping = 0,
-		GroupObjectsByObjectType = 1,
-		GroupViewsAndFoldersByType = 1024
-	}
-
-	const enum MFFolderListingViewMode {
-		Icon = 1,
-		SmallIcon = 2,
-		List = 3,
-		Details = 4,
-		Thumbnail = 5,
-		Tile = 6,
-		Thumbstrip = 7,
-		Content = 8
-	}
-
-	const enum MFFolderUIStateLocationType {
-		Unknown = 0,
-		RootFolder = 1,
-		ViewFoldersContainer = 2,
-		PropertyFoldersContainer = 3,
-		ObjectsContainer = 4,
-		ObjectFilesContainer = 5,
-		TraditionalFolder = 6,
-		SearchResultsContainer = 7,
-		HistoryUI = 8,
-		RelationshipsUIFromTab = 9,
-		CollectionMembersUI = 10,
-		SubobjectsUI = 11,
-		ClearLocalCacheUI = 12,
-		RelationshipsUIToTab = 13,
-		RelationshipsUIAllTab = 14,
-		LocalTemporaryItemsContainer = 15
-	}
-
-	const enum MFFormattingType {
-		None = 0
-	}
-
-	const enum MFFullTextSearchFlags {
-		None = 0,
-		Stemming = 4,
-		TypeAllWords = 131072,
-		TypeAnyWords = 262144,
-		LookInMetaData = 268435456,
-		LookInFileData = 536870912
-	}
-
-	const enum MFilesURLType {
-		Show = 0,
-		Open = 1,
-		View = 2,
-		Edit = 3,
-		ShowMetadata = 6
-	}
-
-	const enum MFImpersonationType {
-		LocalSystem = 0,
-		SpecificAccount = 1,
-		ExtAccount = 2
-	}
-
-	const enum MFImportContentFlag {
-		None = 0,
-		UseMultipleContentPackages = 1,
-		DeleteContentPackage = 4,
-		ImportCheckoutStates = 16,
-		ResetExportTimestamps = 32,
-		DoNotImportObjectDestructions = 64,
-		UseNamesAsAliases = 128,
-		ForceNoStructureIdUpdate = 16384,
-		OmitDoneFile = 32768
-	}
-
-	const enum MFIndirectPropertyIDLevelType {
-		PropertyDef = 0,
-		ObjectType = 1,
-		StateChanger = 2
-	}
-
-	const enum MFLatestSpecificBehavior {
-		Normal = 0,
-		Specific = 1,
-		Latest = 2,
-		Automatic = 3
-	}
-
-	const enum MFLicenseType {
-		None = 0,
-		NamedUserLicense = 1,
-		ConcurrentUserLicense = 2,
-		ReadOnlyLicense = 3
-	}
-
-	const enum MFLoginAccountType {
-		MFiles = 1,
-		Windows = 2
-	}
-
-	const enum MFLoginServerRole {
-		None = 0,
-		SystemAdministrator = 1,
-		VaultCreator = 2,
-		BackupOperator = 4,
-		LogIn = 8
-	}
-
-	const enum MFMetadataStructureItem {
-		None = 0,
-		ObjectType = 1,
-		PropertyDef = 2,
-		Class = 3,
-		Workflow = 4,
-		State = 5,
-		NamedACL = 6,
-		User = 7,
-		UserGroup = 8,
-		ClassGroup = 9,
-		ViewDef = 10,
-		ValueListItem = 13,
-		ValueList = 14,
-		VaultEventHandler = 15,
-		StateTransition = 16,
-		All = 10000
-	}
-
-	const enum MFMetadataStructureSelectorFlags {
-		None = 0,
-		SelectNew = 1,
-		SelectExisting = 2,
-		IncludeNewDependencies = 4,
-		IncludeExistingDependencies = 8
-	}
-
-	const enum MFMetadataSyncFormat {
-		Word = 0,
-		Excel = 1,
-		PowerPoint = 2
-	}
-
-	const enum MFNamedACLType {
-		None = 0,
-		Normal = 1,
-		Internal = 2
-	}
-
-	const enum MFNamedValueType {
-		ConfigurationValue = 3,
-		UserDefinedValue = 4,
-		RegistryValue = 5,
-		FolderConfiguration = 6,
-		AdminConfiguration = 7,
-		SystemAdminConfiguration = 8
-	}
-
-	const enum MFObjectAccess {
-		None = 0,
-		Read = 1,
-		Edit = 2,
-		ChangePermissions = 4,
-		Delete = 8,
-		AttachObjects = 16
-	}
-
-	const enum MFObjectOperationFlags {
-		None = 0,
-		RequireReadAccess = 1,
-		RequireEditAccess = 2,
-		DisallowNameChange = 4,
-		RequireChangeSecurityAccess = 8,
-		RequireFullAccess = 16,
-		ChangeACLInAllVersions = 32,
-		RequireSomeAccess = 64
-	}
-
-	const enum MFObjectTypeAccess {
-		None = 0,
-		SeeName = 1,
-		AddNewItems = 2
-	}
-
-	const enum MFObjectVersionFlag {
-		None = 0,
-		Completed = 1,
-		HasRelatedObjects = 2
-	}
-
-	const enum MFObjectWindowMode {
-		Insert = 0,
-		InsertSourceFiles = 1,
-		InsertSaveAsType = 2,
-		Edit = 3,
-		EditApplicationModal = 4
-	}
-
-	const enum MFObjectWindowResultCode {
-		Ok = 0,
-		Cancel = 1,
-		OkToAll = 2,
-		SkipThis = 3
-	}
-
-	const enum MFOCRDimensionUnit {
-		Pixel = 0,
-		MillimeterX10 = 1,
-		InchX100 = 2
-	}
-
-	const enum MFOCRLanguage {
-		None = 0,
-		Neutral = 1,
-		NumbersOnly = 2,
-		EnglishUS = 3,
-		EnglishBr = 4,
-		German = 5,
-		French = 6,
-		Spanish = 7,
-		Italian = 8,
-		Finnish = 9,
-		Swedish = 10,
-		Danish = 11,
-		Norwegian = 12,
-		Nynorsk = 13,
-		Estonian = 14,
-		Latvian = 15,
-		Lithuanian = 16,
-		Dutch = 17,
-		Portuguese = 18,
-		Brazilian = 19,
-		Galician = 20,
-		Icelandic = 21,
-		Greek = 22,
-		Czech = 23,
-		Hungarian = 24,
-		Polish = 25,
-		Romanian = 26,
-		Slovak = 27,
-		Croatian = 28,
-		Serbian = 29,
-		Slovenian = 30,
-		Luxembourgish = 31,
-		SwissGerman = 32,
-		Turkish = 33,
-		Russian = 34,
-		ByeloRussian = 35,
-		Ukrainian = 36,
-		Macedonian = 37,
-		Bulgarian = 38,
-		Afrikaans = 39,
-		Albanian = 40,
-		Catalan = 41,
-		IrishGaelic = 42,
-		ScottishGaelic = 43,
-		Welsh = 44,
-		Basque = 45,
-		Mexican = 46
-	}
-
-	const enum MFOCRZoneRecognitionMode {
-		NoZoneRecognition = 0,
-		RecognizeSpecifiedZones = 1,
-		AutoDetectZones = 2
-	}
-
-	const enum MFOfflineTransitionResultFlags {
-		None = 0,
-		StatusChanged = 1,
-		LoggedOut = 2
-	}
-
-	const enum MFOnlineTransitionResultFlags {
-		None = 0,
-		StatusChanged = 1
-	}
-
-	const enum MFParentChildBehavior {
-		None = 0,
-		IncludeChildValues = 1,
-		IncludeParentValues = 2
-	}
-
-	const enum MFPermission {
-		Deny = 0,
-		Allow = 1,
-		NotSet = 2
-	}
-
-	const enum MFPermissionsExpressionType {
-		ACL = 0,
-		VisibleTo = 1,
-		EditableBy = 2,
-		PermissionsChangeableBy = 3,
-		FullControlBy = 4,
-		DeletableBy = 5,
-		ObjectsAttachableToThisItemBy = 6
-	}
-
-	const enum MFPredefinedSearchFilterType {
-		Unspecified = 0,
-		ObjectType = 1,
-		DocumentsModifiedToday = 30000,
-		DocumentsModifiedLastWeek = 30001,
-		DocumentsModifiedLastMonth = 30002,
-		DocumentsModifiedLastYear = 30003,
-		DocumentsAccessedByMeToday = 30004,
-		DocumentsAccessedByMeLastWeek = 30005,
-		DocumentsAccessedByMeLastMonth = 30006,
-		DocumentsAccessedByMeLastYear = 30007
-	}
-
-	const enum MFProductMode {
-		Full = 0,
-		Express = 1,
-		Business = 2
-	}
-
-	const enum MFPropertyDefAccess {
-		None = 0,
-		See = 1,
-		Edit = 2
-	}
-
-	const enum MFRelationshipsMode {
-		FromThisObject = 1,
-		ToThisObject = 2,
-		All = 3
-	}
-
-	const enum MFScheduledJobType {
-		Uninitialized = 0,
-		Backup = 1,
-		Restore = 2,
-		CopyVault = 3,
-		VerifyVault = 4,
-		ExportContent = 5,
-		ArchiveOldVersions = 6,
-		ImportContent = 7,
-		OptimizeVault = 8,
-		Recalculate = 9,
-		MigrateVault = 10
-	}
-
-	const enum MFSearchFlags {
-		None = 0,
-		LookInAllVersions = 1,
-		ReturnLatestVisibleVersion = 2,
-		LookAllObjectTypes = 4,
-		DisableRelevancyRanking = 16
-	}
-
-	const enum MFServerConnection {
-		uthenticated = 1,
-		nonymous = 2
-	}
-
-	const enum MFSignaturePromptInfoType {
-		Fixed = 0,
-		Selectable = 1,
-		MetadataBased = 2
-	}
-
-	const enum MFSoftwarePlatformType {
-		Win32 = 0,
-		X64 = 1
-	}
-
-	const enum MFSpecialObjectFlag {
-		None = 0,
-		Shortcut = 1,
-		Deleted = 2,
-		RecentlyAccessedByValid = 4,
-		HasSharedFiles = 8,
-		Conflict = 16,
-		Normal = 64
-	}
-
-	const enum MFStatusType {
-		CheckedOut = 0,
-		CheckedOutTo = 1,
-		CheckedOutAt = 2,
-		ObjectID = 3,
-		ObjectVersionID = 4,
-		Deleted = 5,
-		ObjectTypeID = 6,
-		IsLatestCheckedInVersion = 7,
-		ExtID = 8,
-		LatestOrSpecific = 9,
-		ObjectTypeAndID = 10,
-		ObjectFlags = 11,
-		OriginalVaultGUID = 12,
-		OriginalObjectType = 13,
-		OriginalObjectID = 14,
-		OriginalObjectIDSegment = 15
-	}
-
-	const enum MFStringDataType {
-		JSON = 0,
-		XML = 1
-	}
-
-	const enum MFTriggerMonth {
-		January = 1,
-		February = 2,
-		March = 4,
-		April = 8,
-		May = 16,
-		June = 32,
-		July = 64,
-		August = 128,
-		September = 256,
-		October = 512,
-		November = 1024,
-		December = 2048,
-		EveryMonth = 4095
-	}
-
-	const enum MFTriggerType {
-		Once = 0,
-		Daily = 1,
-		Weekly = 2,
-		MonthlyDate = 3,
-		MonthlyDOW = 4
-	}
-
-	const enum MFTriggerWeekDay {
-		Sunday = 1,
-		Monday = 2,
-		Tuesday = 4,
-		Wednesday = 8,
-		Thursday = 16,
-		Friday = 32,
-		Saturday = 64,
-		EveryDay = 125
-	}
-
-	const enum MFTriggerWeekOfMonth {
-		FirstWeek = 1,
-		SecondWeek = 2,
-		ThirdWeek = 3,
-		FourthWeek = 4,
-		LastWeek = 5
-	}
-
-	const enum MFUpdateType {
-		Normal = 0,
-		ServerAuto = 1,
-		ClientAuto = 2
-	}
-
-	const enum MFUserAccountVaultRole {
-		None = 0,
-		FullControl = 1,
-		LogIn = 2,
-		CreateObjects = 4,
-		SeeAllObjects = 8,
-		UndeleteObjects = 16,
-		DestroyObjects = 32,
-		ForceUndoCheckout = 64,
-		ChangeObjectSecurity = 128,
-		ChangeMetadataStructure = 256,
-		ManageUserAccounts = 512,
-		InternalUser = 1024,
-		ManageTraditionalFolders = 2048,
-		DefineTemplates = 4096,
-		ManageCommonViews = 8192,
-		ManageWorkflows = 16384,
-		DefaultRoles = 3078
-	}
-
-	const enum MFUserOrUserGroupType {
-		Unknown = 0,
-		UserAccount = 1,
-		UserGroup = 2,
-		PseudoUser = 3,
-		PropertyBasedPseudoUser = 4
-	}
-
-	const enum MFValidationType {
-		None = 0,
-		RegularExpression = 1,
-		VBScript = 2
-	}
-
-	const enum MFValueListItemPropertyDef {
-		ID = 1,
-		Name = 2,
-		Owner = 3,
-		Parent = 4,
-		Deleted = 5,
-		ObjectType = 6,
-		ExtID = 7
-	}
-
-	const enum MFValueListSortingType {
-		Name = 0,
-		ExtID = 1
-	}
-
-	const enum MFVaultAccess {
-		None = 0,
-		CreateDocs = 1,
-		SeeAllDocs = 2,
-		UndeleteDocs = 4,
-		DestroyDocs = 8,
-		ForceUndoCheckout = 16,
-		ChangeDocSecurity = 32,
-		ChangeMetaDataStructure = 64,
-		ManageUserAccounts = 128,
-		ChangeFullControlRole = 256,
-		VerifyVault = 1024,
-		EditAllDocs = 2048,
-		ExportContent = 8192,
-		ImportContent = 16384,
-		ManageVLItemsFromClient = 65536,
-		ManageExternalLocations = 131072,
-		LicenseAllowsModifications = 262144,
-		ManageEvents = 524288,
-		ManageTraditionalFolders = 1048576,
-		ChangeObjectStates = 4194304,
-		ChangeAssignments = 8388608,
-		ManageCommonViews = 16777216,
-		ManageCommonUISettings = 33554432,
-		ManageCommonNotificationRules = 134217728,
-		SeeDeletedDocs = 268435456,
-		MateriakizeViews = 536870912,
-		MaterializeViews = 536870912
-	}
-
-	const enum MFVaultConnectionTestResult {
-		OK = 0,
-		UserCancelledLoginAttempt = 1
-	}
-
-	const enum MFViewCategory {
-		Normal = 0,
-		OfflineFilter = 1,
-		TemporarySearch = 2
-	}
-
-	const enum MFViewFlag {
-		sNone = 0,
-		Materialized = 1
-	}
-
-	const enum MFViewType {
-		Normal = 0,
-		FilterOnly = 1
-	}
-
-	const enum SearchFeature {
-		Undefined = 0,
-		FacetSearch = 1,
-		MultiVaultSearch = 2
-	}
-
-	const enum TaskPaneGroup {
-		New = 1,
-		ViewAndModify = 2,
-		GoTo = 3,
-		Main = 4
-	}
-
-	const AccessControlEntry: { new(): IAccessControlEntry; };
-	const AccessControlEntryContainer: { new(): IAccessControlEntryContainer; };
-	const AccessControlEntryData: { new(): IAccessControlEntryData; };
-	const AccessControlEntryKey: { new(): IAccessControlEntryKey; };
-	const AccessControlEntryKeys: { new(): IAccessControlEntryKeys; };
-	const AccessControlList: { new(): IAccessControlList; };
-	const AccessControlListComponent: { new(): IAccessControlListComponent; };
-	const AccessControlListComponentContainer: { new(): IAccessControlListComponentContainer; };
-	const AccessControlListComponentKey: { new(): IAccessControlListComponentKey; };
-	const AccessControlListComponentKeys: { new(): IAccessControlListComponentKeys; };
-	const AccessControlLists: { new(): IAccessControlLists; };
-	const ActionConvertToPDF: { new(): IActionConvertToPDF; };
-	const ActionCreateAssignment: { new(): IActionCreateAssignment; };
-	const ActionDefinition: { new(): IActionDefinition; };
-	const ActionDefinitions: { new(): IActionDefinitions; };
-	const ActionSendNotification: { new(): IActionSendNotification; };
-	const ActionSetPermissions: { new(): IActionSetPermissions; };
-	const ActionSetProperties: { new(): IActionSetProperties; };
-	const AdditionalClassInfo: { new(): IAdditionalClassInfo; };
-	const AdditionalFolder: { new(): IAdditionalFolder; };
-	const AdditionalFolders: { new(): IAdditionalFolders; };
-	const ApprovalAssignmentClassInfo: { new(): IApprovalAssignmentClassInfo; };
-	const ArchiveOldVersionsJob: { new(): IArchiveOldVersionsJob; };
-	const AssignmentClassInfo: { new(): IAssignmentClassInfo; };
-	const AssociatedPropertyDef: { new(): IAssociatedPropertyDef; };
-	const AssociatedPropertyDefs: { new(): IAssociatedPropertyDefs; };
-	const AttachVaultOptions: { new(): IAttachVaultOptions; };
-	const AuthenticationResult: { new(): IAuthenticationResult; };
-	const AuthenticationResultIntermediate: { new(): IAuthenticationResultIntermediate; };
-	const AuthenticationResultServerFinal: { new(): IAuthenticationResultServerFinal; };
-	const AuthenticationResultVaultFinal: { new(): IAuthenticationResultVaultFinal; };
-	const AutomaticMetadataResult: { new(): IAutomaticMetadataResult; };
-	const AutomaticPermissions: { new(): IAutomaticPermissions; };
-	const AutomaticValue: { new(): IAutomaticValue; };
-	const BackupJob: { new(): IBackupJob; };
-	const BooleanValue: { new(): IBooleanValue; };
-	const ClassGroup: { new(): IClassGroup; };
-	const ClassGroups: { new(): IClassGroups; };
-	const CopyVaultJob: { new(): ICopyVaultJob; };
-	const CopyVaultJobOutputInfo: { new(): ICopyVaultJobOutputInfo; };
-	const CustomApplication: { new(): ICustomApplication; };
-	const CustomApplications: { new(): ICustomApplications; };
-	const DailyTrigger: { new(): IDailyTrigger; };
-	const DataFunctionCall: { new(): IDataFunctionCall; };
-	const DataSet: { new(): IDataSet; };
-	const DataSetExportingStatus: { new(): IDataSetExportingStatus; };
-	const DataSets: { new(): IDataSets; };
-	const DefaultProperties: { new(): IDefaultProperties; };
-	const DefaultProperty: { new(): IDefaultProperty; };
-	const EmailMessageInformation: { new(): IEmailMessageInformation; };
-	const EventHandler: { new(): IEventHandler; };
-	const EventHandlers: { new(): IEventHandlers; };
-	const ExportContentJob: { new(): IExportContentJob; };
-	const ExportStructureItem: { new(): IExportStructureItem; };
-	const ExportStructureItems: { new(): IExportStructureItems; };
-	const Expression: { new(): IExpression; };
-	const ExpressionEx: { new(): IExpressionEx; };
-	const ExpressionExs: { new(): IExpressionExs; };
-	const Expressions: { new(): IExpressions; };
-	const FileClass: { new(): IFileClass; };
-	const FileClasses: { new(): IFileClasses; };
-	const FileDownloadSession: { new(): IFileDownloadSession; };
-	const FileInformation: { new(): IFileInformation; };
-	const FileVer: { new(): IFileVer; };
-	const FileVers: { new(): IFileVers; };
-	const FolderContentItem: { new(): IFolderContentItem; };
-	const FolderContentItems: { new(): IFolderContentItems; };
-	const FolderDef: { new(): IFolderDef; };
-	const FolderDefs: { new(): IFolderDefs; };
-	const FolderListingColumn: { new(): IFolderListingColumn; };
-	const FolderListingColumns: { new(): IFolderListingColumns; };
-	const FolderListingColumnSorting: { new(): IFolderListingColumnSorting; };
-	const FolderListingColumnSortings: { new(): IFolderListingColumnSortings; };
-	const FolderListingUIState: { new(): IFolderListingUIState; };
-	const FolderNameListing: { new(): IFolderNameListing; };
-	const FolderUIState: { new(): IFolderUIState; };
-	const IDRange: { new(): IIDRange; };
-	const IDs: { new(): IIDs; };
-	const Impersonation: { new(): IImpersonation; };
-	const ImportContentJob: { new(): IImportContentJob; };
-	const IndirectPropertyID: { new(): IIndirectPropertyID; };
-	const IndirectPropertyIDLevel: { new(): IIndirectPropertyIDLevel; };
-	const KeyNamePair: { new(): IKeyNamePair; };
-	const KeyNamePairs: { new(): IKeyNamePairs; };
-	const Language: { new(): ILanguage; };
-	const Languages: { new(): ILanguages; };
-	const LicenseStatus: { new(): ILicenseStatus; };
-	const LoginAccount: { new(): ILoginAccount; };
-	const LoginAccountPersonalInformation: { new(): ILoginAccountPersonalInformation; };
-	const LoginAccounts: { new(): ILoginAccounts; };
-	const Lookup: { new(): ILookup; };
-	const Lookups: { new(): ILookups; };
-	const MetadataStructureSelector: { new(): IMetadataStructureSelector; };
-	const MetadataStructureSelectors: { new(): IMetadataStructureSelectors; };
-	const MFilesClientApplication: { new(): IMFilesClientApplication; };
-	const MFilesServerApplication: { new(): IMFilesServerApplication; };
-	const MFilesVersion: { new(): IMFilesVersion; };
-	const MFResourceManager: { new(): IMFResourceManager; };
-	const MFShellDocListCtrl: { new(): IMFDocListCtrl; };
-	const MonthlyDateTrigger: { new(): IMonthlyDateTrigger; };
-	const MonthlyDOWTrigger: { new(): IMonthlyDOWTrigger; };
-	const NamedACL: { new(): INamedACL; };
-	const NamedACLAdmin: { new(): INamedACLAdmin; };
-	const NamedACLs: { new(): INamedACLs; };
-	const NamedACLsAdmin: { new(): INamedACLsAdmin; };
-	const NamedValueNamespace: { new(): INamedValueNamespace; };
-	const NamedValueNamespaces: { new(): INamedValueNamespaces; };
-	const NamedValues: { new(): INamedValues; };
-	const Number: { new(): INumber; };
-	const ObjectClass: { new(): IObjectClass; };
-	const ObjectClassAdmin: { new(): IObjectClassAdmin; };
-	const ObjectClasses: { new(): IObjectClasses; };
-	const ObjectClassesAdmin: { new(): IObjectClassesAdmin; };
-	const ObjectCreationInfo: { new(): IObjectCreationInfo; };
-	const ObjectFile: { new(): IObjectFile; };
-	const ObjectFileAndObjVer: { new(): IObjectFileAndObjVer; };
-	const ObjectFileAndObjVerOfMultipleFiles: { new(): IObjectFileAndObjVerOfMultipleFiles; };
-	const ObjectFiles: { new(): IObjectFiles; };
-	const ObjectSearchResults: { new(): IObjectSearchResults; };
-	const ObjectTypeTargetForBrowsing: { new(): IObjectTypeTargetForBrowsing; };
-	const ObjectTypeTargetsForBrowsing: { new(): IObjectTypeTargetsForBrowsing; };
-	const ObjectVersion: { new(): IObjectVersion; };
-	const ObjectVersionAndProperties: { new(): IObjectVersionAndProperties; };
-	const ObjectVersionAndPropertiesOfMultipleObjects: { new(): IObjectVersionAndPropertiesOfMultipleObjects; };
-	const ObjectVersionFile: { new(): IObjectFileAndVersion; };
-	const ObjectVersionPermissions: { new(): IObjectVersionPermissions; };
-	const ObjectVersions: { new(): IObjectVersions; };
-	const ObjectVersionWorkflowState: { new(): IObjectVersionWorkflowState; };
-	const ObjectWindowResult: { new(): IObjectWindowResult; };
-	const ObjID: { new(): IObjID; };
-	const ObjIDs: { new(): IObjIDs; };
-	const ObjOrFileVer: { new(): IObjOrFileVer; };
-	const ObjOrFileVers: { new(): IObjOrFileVers; };
-	const ObjType: { new(): IObjectType; };
-	const ObjTypeAdmin: { new(): IObjectTypeAdmin; };
-	const ObjTypeColumnMapping: { new(): IObjectTypeColumnMapping; };
-	const ObjTypeColumnMappings: { new(): IObjectTypeColumnMappings; };
-	const ObjTypes: { new(): IObjectTypes; };
-	const ObjTypesAdmin: { new(): IObjectTypesAdmin; };
-	const ObjVer: { new(): IObjVer; };
-	const ObjVers: { new(): IObjVers; };
-	const OCROptions: { new(): IOCROptions; };
-	const OCRPage: { new(): IOCRPage; };
-	const OCRPageResult: { new(): IOCRPageResult; };
-	const OCRPageResults: { new(): IOCRPageResults; };
-	const OCRPages: { new(): IOCRPages; };
-	const OCRZone: { new(): IOCRZone; };
-	const OCRZoneResult: { new(): IOCRZoneResult; };
-	const OCRZoneResults: { new(): IOCRZoneResults; };
-	const OCRZones: { new(): IOCRZones; };
-	const OptimizeVaultJob: { new(): IOptimizeVaultJob; };
-	const OwnerPropertyDef: { new(): IOwnerPropertyDef; };
-	const PluginInfo: { new(): IPluginInfo; };
-	const PluginInfos: { new(): IPluginInfos; };
-	const PreviewerActiveXCtrl: { new(): IPreviewerActiveXCtrl; };
-	const PropertyDef: { new(): IPropertyDef; };
-	const PropertyDefAdmin: { new(): IPropertyDefAdmin; };
-	const PropertyDefOrObjectType: { new(): IPropertyDefOrObjectType; };
-	const PropertyDefOrObjectTypes: { new(): IPropertyDefOrObjectTypes; };
-	const PropertyDefs: { new(): IPropertyDefs; };
-	const PropertyDefsAdmin: { new(): IPropertyDefsAdmin; };
-	const PropertyValue: { new(): IPropertyValue; };
-	const PropertyValueForDisplay: { new(): IPropertyValueForDisplay; };
-	const PropertyValueIconClue: { new(): IPropertyValueIconClue; };
-	const PropertyValueIconClues: { new(): IPropertyValueIconClues; };
-	const PropertyValues: { new(): IPropertyValues; };
-	const PropertyValuesForDisplay: { new(): IPropertyValuesForDisplay; };
-	const PropertyValuesOfMultipleObjects: { new(): IPropertyValuesOfMultipleObjects; };
-	const PropertyValueSuggestion: { new(): IPropertyValueSuggestion; };
-	const PropertyValueSuggestions: { new(): IPropertyValueSuggestions; };
-	const PropertyValuesWithIconClues: { new(): IPropertyValuesWithIconClues; };
-	const PropertyValuesWithIconCluesOfMultipleObjects: { new(): IPropertyValuesWithIconCluesOfMultipleObjects; };
-	const ReportAccessCredentials: { new(): IReportAccessCredentials; };
-	const RestoreJob: { new(): IRestoreJob; };
-	const ScheduledJob: { new(): IScheduledJob; };
-	const ScheduledJobOutputInfo: { new(): IScheduledJobOutputInfo; };
-	const ScheduledJobRunInfo: { new(): IScheduledJobRunInfo; };
-	const ScheduledJobs: { new(): IScheduledJobs; };
-	const ScheduledJobTrigger: { new(): IScheduledJobTrigger; };
-	const ScheduledJobTriggers: { new(): IScheduledJobTriggers; };
-	const SearchCondition: { new(): ISearchCondition; };
-	const SearchConditionEx: { new(): ISearchConditionEx; };
-	const SearchConditionExs: { new(): ISearchConditionExs; };
-	const SearchConditions: { new(): ISearchConditions; };
-	const SearchCriteria: { new(): ISearchCriteria; };
-	const SearchDef: { new(): ISearchDef; };
-	const SemanticAliases: { new(): ISemanticAliases; };
-	const ServerLicenseManagementOperations: { new(): IServerLicenseManagementOperations; };
-	const ServerLoginAccountOperations: { new(): IServerLoginAccountOperations; };
-	const ServerManagementOperations: { new(): IServerManagementOperations; };
-	const ServerScheduledJobManagementOperations: { new(): IServerScheduledJobManagementOperations; };
-	const ServerVaultManagementOperations: { new(): IServerVaultManagementOperations; };
-	const SessionInfo: { new(): ISessionInfo; };
-	const SetPropertiesParams: { new(): ISetPropertiesParams; };
-	const SetPropertiesParamsOfMultipleObjects: { new(): ISetPropertiesParamsOfMultipleObjects; };
-	const SharedFileInfo: { new(): ISharedFileInfo; };
-	const SharedLinkInfo: { new(): ISharedLinkInfo; };
-	const SharedLinkInfos: { new(): ISharedLinkInfos; };
-	const SharedLinkPublicOperations: { new(): ISharedLinkPublicOperations; };
-	const ShortcutMappingInfo: { new(): IShortcutMappingInfo; };
-	const SignaturePromptInfo: { new(): ISignaturePromptInfo; };
-	const SignaturePromptInfoMetadataBased: { new(): ISignaturePromptInfoMetadataBased; };
-	const SignaturePromptInfos: { new(): ISignaturePromptInfos; };
-	const SignaturePromptInfoSelectable: { new(): ISignaturePromptInfoSelectable; };
-	const SignatureSettings: { new(): ISignatureSettings; };
-	const SourceObjectFile: { new(): ISourceObjectFile; };
-	const SourceObjectFiles: { new(): ISourceObjectFiles; };
-	const SQLDatabase: { new(): ISQLDatabase; };
-	const State: { new(): IState; };
-	const StateAdmin: { new(): IStateAdmin; };
-	const StateConditions: { new(): IStateConditions; };
-	const States: { new(): IStates; };
-	const StatesAdmin: { new(): IStatesAdmin; };
-	const StateTransition: { new(): IStateTransition; };
-	const StateTransitionForClient: { new(): IStateTransitionForClient; };
-	const StateTransitions: { new(): IStateTransitions; };
-	const StateTransitionsForClient: { new(): IStateTransitionsForClient; };
-	const StringData: { new(): IStringData; };
-	const Strings: { new(): IStrings; };
-	const TaskAssignmentClassInfo: { new(): ITaskAssignmentClassInfo; };
-	const TemporarySearchView: { new(): ITemporarySearchView; };
-	const Timestamp: { new(): ITimestamp; };
-	const TimeZoneInformation: { new(): ITimeZoneInformation; };
-	const TraditionalFolder: { new(): ITraditionalFolder; };
-	const TraditionalFolderContents: { new(): ITraditionalFolderContents; };
-	const TraditionalFolders: { new(): ITraditionalFolders; };
-	const TriggerType: { new(): ITriggerType; };
-	const TypedValue: { new(): ITypedValue; };
-	const TypedValues: { new(): ITypedValues; };
-	const UserAccount: { new(): IUserAccount; };
-	const UserAccounts: { new(): IUserAccounts; };
-	const UserGroup: { new(): IUserGroup; };
-	const UserGroupAdmin: { new(): IUserGroupAdmin; };
-	const UserGroups: { new(): IUserGroups; };
-	const UserGroupsAdmin: { new(): IUserGroupsAdmin; };
-	const UserOrUserGroupID: { new(): IUserOrUserGroupID; };
-	const UserOrUserGroupIDEx: { new(): IUserOrUserGroupIDEx; };
-	const UserOrUserGroupIDExs: { new(): IUserOrUserGroupIDExs; };
-	const UserOrUserGroupIDs: { new(): IUserOrUserGroupIDs; };
-	const Validation: { new(): IValidation; };
-	const ValueListItem: { new(): IValueListItem; };
-	const ValueListItems: { new(): IValueListItems; };
-	const ValueListItemSearchResults: { new(): IValueListItemSearchResults; };
-	const ValueListItemSearchResultsWithPermissions: { new(): IValueListItemSearchResultsWithPermissions; };
-	const ValueListItemsWithPermissions: { new(): IValueListItemsWithPermissions; };
-	const Vault: { new(): IVault; };
-	const VaultAutomaticMetadataOperations: { new(): IVaultAutomaticMetadataOperations; };
-	const VaultClassGroupOperations: { new(): IVaultClassGroupOperations; };
-	const VaultClassOperations: { new(): IVaultClassOperations; };
-	const VaultClientOperations: { new(): IVaultClientOperations; };
-	const VaultConnection: { new(): IVaultConnection; };
-	const VaultConnections: { new(): IVaultConnections; };
-	const VaultCustomApplicationManagementOperations: { new(): IVaultCustomApplicationManagementOperations; };
-	const VaultDataSetOperations: { new(): IVaultDataSetOperations; };
-	const VaultElectronicSignatureOperations: { new(): IVaultElectronicSignatureOperations; };
-	const VaultEventLogOperations: { new(): IVaultEventLogOperations; };
-	const VaultExtensionMethodOperations: { new(): IVaultExtensionMethodOperations; };
-	const VaultExternalObjectOperations: { new(): IVaultExternalObjectOperations; };
-	const VaultLoginAccountOperations: { new(): IVaultLoginAccountOperations; };
-	const VaultManagementOperations: { new(): IVaultManagementOperations; };
-	const VaultNamedACLOperations: { new(): IVaultNamedACLOperations; };
-	const VaultNamedValueStorageOperations: { new(): IVaultNamedValueStorageOperations; };
-	const VaultNotificationOperations: { new(): IVaultNotificationOperations; };
-	const VaultObjectFileOperations: { new(): IVaultObjectFileOperations; };
-	const VaultObjectOperations: { new(): IVaultObjectOperations; };
-	const VaultObjectPropertyOperations: { new(): IVaultObjectPropertyOperations; };
-	const VaultObjectSearchOperations: { new(): IVaultObjectSearchOperations; };
-	const VaultObjectTypeOperations: { new(): IVaultObjectTypeOperations; };
-	const VaultOnServer: { new(): IVaultOnServer; };
-	const VaultProperties: { new(): IVaultProperties; };
-	const VaultPropertyDefOperations: { new(): IVaultPropertyDefOperations; };
-	const VaultScheduledJobManagementOperations: { new(): IVaultScheduledJobManagementOperations; };
-	const VaultServerDataPushOperations: { new(): IVaultServerDataPushOperations; };
-	const VaultSharedLinkOperations: { new(): IVaultSharedLinkOperations; };
-	const VaultsOnServer: { new(): IVaultsOnServer; };
-	const VaultTraditionalFolderOperations: { new(): IVaultTraditionalFolderOperations; };
-	const VaultUserGroupOperations: { new(): IVaultUserGroupOperations; };
-	const VaultUserOperations: { new(): IVaultUserOperations; };
-	const VaultUserSettingOperations: { new(): IVaultUserSettingOperations; };
-	const VaultValueListItemOperations: { new(): IVaultValueListItemOperations; };
-	const VaultValueListOperations: { new(): IVaultValueListOperations; };
-	const VaultViewOperations: { new(): IVaultViewOperations; };
-	const VaultWorkflowOperations: { new(): IVaultWorkflowOperations; };
-	const VerifyVaultJob: { new(): IVerifyVaultJob; };
-	const VerifyVaultJobOutput: { new(): IVerifyVaultJobOutput; };
-	const VersionComment: { new(): IVersionComment; };
-	const VersionComments: { new(): IVersionComments; };
-	const View: { new(): IView; };
-	const ViewLocation: { new(): IViewLocation; };
-	const Views: { new(): IViews; };
-	const WeeklyTrigger: { new(): IWeeklyTrigger; };
-	const Workflow: { new(): IWorkflow; };
-	const WorkflowAdmin: { new(): IWorkflowAdmin; };
-	const WorkflowAssignment: { new(): IWorkflowAssignment; };
-	const Workflows: { new(): IWorkflows; };
-	const WorkflowsAdmin: { new(): IWorkflowsAdmin; };
-	const XMLSearchResult: { new(): IXMLSearchResult; };
-
-	const ApplicationPath: string;
-	const CLSID: ICLSIDs;
-	const CurrentApplicationPlatform: any;
-
-	function CreateInstance(name: string): any;
-	function CreateObjectCLR(assemblyFile: string, className: string): any;
-	function DeleteRegistryKey(userSpecific: boolean, key: string): void;
-	function DeleteRegistryValue(userSpecific: boolean, key: string, valueName: string): void;
-	function EnableExceptionPropagation(exception: any): void;
-	function ExecuteURL(url: string): void;
-	function GetErrorDescription(exception: any): string;
-	function GetLongErrorDescription(exception: any): string;
-	function GetStringResource(resource: number): string;
-	function KillTimer(timerId: number): void;
-	function LaunchHelp(helpID: string): void;
-	function PersistStringData(name: string, privateData: boolean, data: string): void;
-	function ReadFromRegistry(userSpecific: boolean, key: string, valueName: string): any;
-	function ReadTextFile(filename: string): string;
-	function ReportException(exception: any): void;
-	function RetrieveStringData(name: string, privateData: boolean): string;
-	function SetTimer(timeoutInMs: number, callbackMethod: () => void): number;
-	function ThrowError(description: string): void;
-	function WriteToRegistry(userSpecific: boolean, key: string, valueName: string, value: any, valueType: string): void;
-}
+// Type definitions for M-Files UI Extensibility 11.3
+// Project: http://www.m-files.com/UI_Extensibility_Framework/
+// Definitions by: Arsène von Wyss <https://github.com/avonwyss>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const MFExtApplicationPlatformWeb: any;
+
+interface IAccessControlEntry {
+	ChangePermissionsPermission: MFiles.MFPermission;
+	EditPermission: MFiles.MFPermission;
+	IsGroup: boolean;
+	ReadPermission: MFiles.MFPermission;
+	UserOrGroupID: number;
+	Clone(): IAccessControlEntry;
+}
+
+interface IAccessControlEntryContainer {
+	readonly IsEmpty: boolean;
+	Add(AccessControlEntryKey: IAccessControlEntryKey, AccessControlEntryData: IAccessControlEntryData): void;
+	At(AccessControlEntryKey: IAccessControlEntryKey): IAccessControlEntryData;
+	Clear(): void;
+	Clone(): IAccessControlEntryContainer;
+	GetKeys(): IAccessControlEntryKeys;
+	GetKeysWithPseudoUserDefinitions(): IAccessControlEntryKeys;
+	HasKey(AccessControlEntryKey: IAccessControlEntryKey): boolean;
+	Remove(AccessControlEntryKey: IAccessControlEntryKey): void;
+}
+
+interface IAccessControlEntryData {
+	AttachObjectsPermission: MFiles.MFPermission;
+	ChangePermissionsPermission: MFiles.MFPermission;
+	DeletePermission: MFiles.MFPermission;
+	EditPermission: MFiles.MFPermission;
+	ReadPermission: MFiles.MFPermission;
+	Clone(): IAccessControlEntryData;
+	SetAllPermissions(Permission: MFiles.MFPermission): void;
+}
+
+interface IAccessControlEntryKey {
+	readonly HasConcreteUserOrGroupID: boolean;
+	readonly IsGroup: boolean;
+	readonly IsPseudoUser: boolean;
+	PseudoUserID: IIndirectPropertyID;
+	readonly UserOrGroupID: number;
+	Clone(): IAccessControlEntryKey;
+	GetResolvedPseudoUserOrGroupIDs(): IUserOrUserGroupIDs;
+	ResetResolvedPseudoUserOrGroupIDs(): void;
+	SetUserOrGroupID(UserOrGroupID: number, IsGroup: boolean): void;
+}
+
+interface IAccessControlEntryKeys {
+	readonly Count: number;
+	Clone(): IAccessControlEntryKeys;
+	Item(Index: number): IAccessControlEntryKey;
+}
+
+interface IAccessControlList {
+	readonly AutomaticComponents: IAccessControlListComponentContainer;
+	readonly CheckedOutToUserID: number;
+	CustomComponent: IAccessControlListComponent;
+	readonly HasCheckedOutToUserID: boolean;
+	IsFullyAuthoritative: boolean;
+	Clone(): IAccessControlList;
+	CloneFrom(AccessControlList: IAccessControlList): void;
+	EqualTo(AccessControlList: IAccessControlList): boolean;
+	HasIdenticalPermissions(AccessControlList: IAccessControlList): boolean;
+}
+
+interface IAccessControlListComponent {
+	AccessControlEntries: IAccessControlEntryContainer;
+	CanDeactivate: boolean;
+	readonly CurrentUserBinding: number;
+	readonly HasCurrentUser: boolean;
+	readonly HasCurrentUserBinding: boolean;
+	readonly HasNamedACLLink: boolean;
+	readonly HasPseudoUsers: boolean;
+	IsActive: boolean;
+	readonly NamedACLLink: number;
+	Clone(): IAccessControlListComponent;
+	GetACEByUserOrGroupID(UserOrGroupID: number, IsGroup: boolean): IAccessControlEntryData;
+	GetACEKeyByUserOrGroupID(UserOrGroupID: number, IsGroup: boolean): IAccessControlEntryKey;
+	ResetCurrentUserBinding(): void;
+	ResetNamedACLLink(): void;
+}
+
+interface IAccessControlListComponentContainer {
+	readonly Count: number;
+	At(AccessControlListComponentKey: IAccessControlListComponentKey): IAccessControlListComponent;
+	GetKeys(): IAccessControlListComponentKeys;
+	HasKey(AccessControlListComponentKey: IAccessControlListComponentKey): boolean;
+}
+
+interface IAccessControlListComponentKey {
+	ItemID: number;
+	PropertyDefID: (MFiles.MFBuiltInPropertyDef | number);
+	Clone(): IAccessControlListComponentKey;
+}
+
+interface IAccessControlListComponentKeys {
+	readonly Count: number;
+	Clone(): IAccessControlListComponentKeys;
+	Item(Index: number): IAccessControlListComponentKey;
+}
+
+interface IAccessControlLists {
+	readonly Count: number;
+	Item(Index: number): IAccessControlList;
+}
+
+interface IActionConvertToPDF {
+	FailOnUnsupportedSourceFiles: boolean;
+	OverwriteExistingFile: boolean;
+	PDFA1b: boolean;
+	StoreAsSeparateFile: boolean;
+	Clone(): IActionConvertToPDF;
+}
+
+interface IActionCreateAssignment {
+	AssignedTo: IUserOrUserGroupIDExs;
+	Deadline: boolean;
+	DeadlineInDays: number;
+	Description: string;
+	MonitoredBy: IUserOrUserGroupIDExs;
+	Title: string;
+	Clone(): IActionCreateAssignment;
+}
+
+interface IActionDefinition {
+	ActionCreateSeparateAssignment: IActionCreateAssignment;
+	readonly ActionType: MFiles.MFActionType;
+	Clear(): void;
+	Clone(): IActionDefinition;
+}
+
+interface IActionDefinitions {
+	readonly Count: number;
+	Add(Index: number, ActionDefinition: IActionDefinition): void;
+	Clone(): IActionDefinitions;
+	Item(Index: number): IActionDefinition;
+	Item(Index: number, value: IActionDefinition): void;
+	Remove(Index: number): void;
+}
+
+interface IActionSendNotification {
+	Message: string;
+	RecipientsEx: IUserOrUserGroupIDExs;
+	Subject: string;
+	Clone(): IActionSendNotification;
+}
+
+interface IActionSetPermissions {
+	DiscardsAutomaticPermissions: boolean;
+	Permissions: IAccessControlList;
+	Clone(): IActionSetPermissions;
+}
+
+interface IActionSetProperties {
+	Properties: IDefaultProperties;
+	Clone(): IActionSetProperties;
+}
+
+interface IAdditionalClassInfo {
+	AssignmentClassInfo: IAssignmentClassInfo;
+	readonly InfoType: MFiles.MFAdditionalClassInfoType;
+	Clear(): void;
+	Clone(): IAdditionalClassInfo;
+}
+
+interface IAdditionalFolder {
+	Folder: string;
+	Impersonation: IImpersonation;
+	LimitInMB: number;
+	Clone(): IAdditionalFolder;
+}
+
+interface IAdditionalFolders {
+	readonly Count: number;
+	Add(Index: number, AdditionalFolder: IAdditionalFolder): void;
+	Clone(): IAdditionalFolders;
+	Item(Index: number): IAdditionalFolder;
+	Remove(Index: number): void;
+}
+
+interface IApprovalAssignmentClassInfo {
+	AnyAssigneeApproves: boolean;
+	SignatureForApproval: ISignatureSettings;
+	SignatureForRejection: ISignatureSettings;
+	Clone(): IApprovalAssignmentClassInfo;
+}
+
+interface IArchiveOldVersionsJob {
+	AtLeastNDaysOlder: number;
+	AtLeastNVersionsOlder: number;
+	CheckedInBefore: ITimestamp;
+	Flags: MFiles.MFExportContentFlag;
+	Impersonation: IImpersonation;
+	MarkedForArchiving: boolean;
+	NoVersionTag: boolean;
+	TargetLocation: string;
+	UseAtLeastNDaysOlder: boolean;
+	UseAtLeastNVersionsOlder: boolean;
+	UseCheckedInBefore: boolean;
+	Clone(): IArchiveOldVersionsJob;
+}
+
+interface IAssignmentClassInfo {
+	ApprovalAssignmentClassInfo: IApprovalAssignmentClassInfo;
+	readonly AssignmentType: MFiles.MFAssignmentType;
+	TaskAssignmentClassInfo: ITaskAssignmentClassInfo;
+	Clone(): IAssignmentClassInfo;
+}
+
+interface IAssociatedPropertyDef {
+	PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
+	Required: boolean;
+	Clone(): IAssociatedPropertyDef;
+}
+
+interface IAssociatedPropertyDefs {
+	readonly Count: number;
+	Add(Index: number, AssociatedPropertyDef: IAssociatedPropertyDef): void;
+	Clone(): IAssociatedPropertyDefs;
+	Item(Index: number): IAssociatedPropertyDef;
+	Remove(Index: number): void;
+}
+
+interface IAttachVaultOptions {
+	DisableEventHandlers: boolean;
+	DisableExportedDataSets: boolean;
+	DisableExportImportJobs: boolean;
+	DisableExternalObjectTypes: boolean;
+	DisableExternalSources: boolean;
+	DisableExternalUserGroups: boolean;
+	Flags: MFiles.MFAttachVaultOptionsFlag;
+	UpdateAttachmentGUID: boolean;
+	Clone(): IAttachVaultOptions;
+	DisableAll(): void;
+}
+
+interface IAuthenticationResult {
+	readonly Intermediate: IAuthenticationResultIntermediate;
+	readonly ServerFinal: IAuthenticationResultServerFinal;
+	readonly VaultFinal: IAuthenticationResultVaultFinal;
+}
+
+interface IAuthenticationResultIntermediate {
+	readonly AttemptIdentifier: string;
+	readonly AuthenticationData: INamedValues;
+}
+
+interface IAuthenticationResultServerFinal {
+	readonly ServerConnection: MFiles.MFServerConnection;
+}
+
+interface IAuthenticationResultVaultFinal {
+	readonly Vault: IVault;
+}
+
+interface IAutomaticMetadataResult {
+	readonly PropertyValueSuggestions: IPropertyValueSuggestions;
+	Clone(): IAutomaticMetadataResult;
+}
+
+interface IAutomaticPermissions {
+	CanDeactivate: boolean;
+	readonly IsBasedOnObjectACL: boolean;
+	readonly IsDefault: boolean;
+	readonly NamedACL: INamedACL;
+	Clone(): IAutomaticPermissions;
+	SetBasedOnObjectACL(): void;
+	SetNamedACL(NamedACL: INamedACL): void;
+}
+
+interface IAutomaticValue {
+	ANSIncrement: number;
+	ANVCode: string;
+	CalculationOrderNumber: number;
+	CVSExpression: string;
+	CVVCode: string;
+	Clone(): IAutomaticValue;
+}
+
+interface IBackupJob {
+	BackupType: MFiles.MFBackupType;
+	FileSizeLimitInMB: number;
+	Impersonation: IImpersonation;
+	OverwriteExistingFiles: boolean;
+	TargetFile: string;
+	VaultGUID: string;
+	Clone(): IBackupJob;
+}
+
+interface IBooleanValue {
+	Value: boolean;
+	Clone(): IBooleanValue;
+}
+
+interface IClassGroup {
+	ID: number;
+	Members: IIDs;
+	Name: string;
+	ObjectType: (MFiles.MFBuiltInObjectType | number);
+	AddMember(Member: number): void;
+	Clone(): IClassGroup;
+	RemoveMember(Member: number): void;
+}
+
+interface IClassGroups {
+	readonly Count: number;
+	Clone(): IClassGroups;
+	Item(Index: number): IClassGroup;
+}
+
+interface ICLSIDs {
+	readonly PreviewerCtrl: string;
+	readonly ShellListingCtrl: string;
+}
+
+interface ICollection {
+	readonly Count: number;
+	readonly Events: IEvents;
+	Clear(): void;
+	Find(item: any): number;
+	GetAt(pos: number): any;
+	MoveTo(pos: number, newPos: number): void;
+	NewTo(pos: number, replace: boolean): any;
+	PutTo(pos: number, replace: boolean, item: any): void;
+	RemoveAt(pos: number): void;
+}
+
+interface ICommands {
+	readonly Events: ICommandsEvents;
+	AddCustomCommandToMenu(customCommand: number, location: MFiles.MenuLocation, orderPriority: number): void;
+	CreateCustomCommand(commandName: string): number;
+	DeleteCustomCommand(customCommand: number): void;
+	ExecuteCommand(command: MFiles.BuiltinCommand | number, arguments: any): void;
+	GetCommandName(command: MFiles.BuiltinCommand | number): string;
+	GetCommandState(command: MFiles.BuiltinCommand | number, location: MFiles.CommandLocation, includeBuiltInState: boolean, includeScriptSpecifiedState: boolean): MFiles.CommandState;
+	RemoveCustomCommandFromMenu(customCommand: number, location: MFiles.MenuLocation): void;
+	SetCommandState(command: MFiles.BuiltinCommand | number, location: MFiles.CommandLocation, state: MFiles.CommandState): void;
+	SetIcon(customCommand: number, icon: MFiles.DefaultIcon): void;
+	SetIconFromPath(customCommand: number, iconPath: string): void;
+}
+
+interface ICommandsEvents extends IEvents {
+	OnCustomCommand?(commandID: number): void;
+}
+
+interface ICopyVaultJob {
+	CopyflagAllData: boolean;
+	CopyflagAllExceptData: boolean;
+	CopyflagApplications: boolean;
+	CopyflagDataSets: boolean;
+	CopyflagDocumentProfiles: boolean;
+	CopyflagDocuments: boolean;
+	CopyflagEventLog: boolean;
+	CopyflagExternalLocations: boolean;
+	CopyflagFiles: boolean;
+	CopyflagInternalEventHandlers: boolean;
+	CopyflagLanguagesAndTranslations: boolean;
+	CopyflagPropertyDefinitions: boolean;
+	CopyflagScheduledExportAndImportJobs: boolean;
+	CopyflagUserAccounts: boolean;
+	CopyflagUseTargetGUID: boolean;
+	CopyflagValueListContent: boolean;
+	CopyflagValueLists: boolean;
+	CopyflagViews: boolean;
+	CopyflagWorkflows: boolean;
+	VaultGUID: string;
+	VaultProperties: IVaultProperties;
+	Clone(): ICopyVaultJob;
+}
+
+interface ICopyVaultJobOutputInfo {
+	readonly VaultProperties: IVaultProperties;
+}
+
+interface ICustomApplication {
+	readonly ApplicationType: MFiles.MFCustomApplicationType;
+	readonly ChecksumHash: string;
+	readonly Description: string;
+	readonly Enabled: boolean;
+	readonly ID: string;
+	readonly MasterApplication: string;
+	readonly Name: string;
+	readonly Optional: boolean;
+	readonly Publisher: string;
+	readonly RequireSystemAccess: boolean;
+	readonly Version: string;
+	Clone(): ICustomApplication;
+}
+
+interface ICustomApplications {
+	readonly Count: number;
+	Clone(): ICustomApplications;
+	Item(Index: number): ICustomApplication;
+}
+
+interface IDailyTrigger {
+	DaysInterval: number;
+}
+
+interface IDashboard<T> {
+	AutoStopWithParent: boolean;
+	readonly CustomData: T;
+	readonly Events: IDashboardEvents;
+	readonly IsPopupDashboard: boolean;
+	readonly Parent: (IShellPaneContainer | IShellFrame | IVaultUI | IShellUI);
+	readonly UseRightToLeftLayout: boolean;
+	readonly Vault: IVault;
+	readonly Window: IWindow;
+	ShowMessage(message: string | IMessage): number;
+	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
+}
+
+interface IDashboardEvents extends IEvents {
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface IDataFunctionCall {
+	readonly DataFunction: MFiles.MFDataFunction;
+	SetDataDate(): void;
+	SetDataDaysFrom(): void;
+	SetDataDaysTo(): void;
+	SetDataInitialCharGroup(Locale: number): void;
+	SetDataIntegerSegment(SegmentSize: number): void;
+	SetDataLeftChars(Characters: number): void;
+	SetDataMonth(): void;
+	SetDataNoOp(): void;
+	SetDataYear(): void;
+	SetDataYearAndMonth(): void;
+}
+
+interface IDataSet {
+	readonly ID: number;
+	readonly Name: string;
+	Clone(): IDataSet;
+}
+
+interface IDataSetExportingStatus {
+	readonly CurrentServerTime: ITimestamp;
+	readonly IsExporting: boolean;
+	readonly LatestActivity: ITimestamp;
+}
+
+interface IDataSets {
+	readonly Count: number;
+	Clone(): IDataSets;
+	Item(Index: number): IDataSet;
+}
+
+interface IDefaultProperties {
+	readonly Count: number;
+	Add(Index: number, DefaultProperty: IDefaultProperty): void;
+	Item(Index: number): IDefaultProperty;
+	Remove(Index: number): void;
+}
+
+interface IDefaultProperty {
+	DataFixedValueValue: ITypedValue;
+	DataFromEmailAddVLItemIfNotFound: boolean;
+	DataFromEmailField: MFiles.MFEmailField;
+	DataFromEmailHeaderAddVLItemIfNotFound: boolean;
+	DataFromEmailHeaderField: string;
+	DataFromEmailHeaderTreatLookupAsID: boolean;
+	DataFromEmailTreatLookupAsID: boolean;
+	DataFromHPDSSXMLAddVLItemIfNotFound: boolean;
+	DataFromHPDSSXMLPromptName: string;
+	DataFromHPDSSXMLTreatLookupAsID: boolean;
+	DataFromOCRAddVLItemIfNotFound: boolean;
+	DataFromOCRTreatLookupAsID: boolean;
+	DataFromOCRZone: IOCRZone;
+	DataFromXMLAddVLItemIfNotFound: boolean;
+	DataFromXMLTreatLookupAsID: boolean;
+	DataFromXMLXPathExpression: string;
+	PropertyDefID: (MFiles.MFBuiltInPropertyDef | number);
+	readonly Type: MFiles.MFDefaultPropertyType;
+	Clone(): IDefaultProperty;
+	SetFixedValue(TypedValue: ITypedValue): void;
+	SetFromEmail(EmailField: MFiles.MFEmailField, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
+	SetFromEmailHeader(Field: string, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
+	SetFromHPDSSXML(PromptName: string, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
+	SetFromOCR(OCRZone: IOCRZone, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
+	SetFromXML(XPathExpression: string, TreatLookupAsID: boolean, AddVLItemIfNotFound: boolean): void;
+}
+
+interface IEmailMessageInformation {
+	Cc: IStrings;
+	From: string;
+	Importance: MFiles.MFEmailImportance;
+	InReplyTo: string;
+	MessageID: string;
+	Received: ITimestamp;
+	Sensitivity: MFiles.MFEmailSensitivity;
+	Sent: ITimestamp;
+	Subject: string;
+	To: IStrings;
+	Clone(): IEmailMessageInformation;
+	CloneFrom(EmailMessageInformation: IEmailMessageInformation): void;
+}
+
+interface IEventHandler {
+	Active: boolean;
+	Description: string;
+	EventType: MFiles.MFEventHandlerType;
+	readonly GUID: string;
+	VBScript: string;
+	Clone(): IEventHandler;
+	GetID(): number;
+}
+
+interface IEventHandlers {
+	readonly Count: number;
+	Add(Index: number, EventHandler: IEventHandler): void;
+	Clone(): IEventHandlers;
+	GetIndexByGUID(EventHandlerGUID: string): number;
+	Item(Index: number): IEventHandler;
+	Remove(Index: number): void;
+}
+
+interface IEvents {
+// tslint:disable-next-line ban-types
+	Register(eventToListen: MFiles.Event, eventSink: Function): number;
+	Unregister(sinkHandle: number): void;
+}
+
+interface IExportContentJob {
+	ExportContent: boolean;
+	ExportStructureItems: boolean;
+	Flags: MFiles.MFExportContentFlag;
+	IgnoreChangesBefore: ITimestamp;
+	Impersonation: IImpersonation;
+	IncludePrivateUISettingsWithStructure: boolean;
+	IncludeValueListItemsWithStructure: boolean;
+	SearchConditions: ISearchConditions;
+	StructureItems: IExportStructureItems;
+	TargetLocation: string;
+	UseIgnoreChangesBefore: boolean;
+	UseSearchConditions: boolean;
+	Clone(): IExportContentJob;
+	SetExportAllStructureItems(IncludeValueListItems: boolean): void;
+}
+
+interface IExportStructureItem {
+	StructureItemGUID: string;
+	StructureItemID: number;
+	StructureItemType: MFiles.MFMetadataStructureItem;
+	Clone(): IExportStructureItem;
+}
+
+interface IExportStructureItems {
+	readonly Count: number;
+	Add(Index: number, ExportStructureItem: IExportStructureItem): void;
+	Clone(): IExportStructureItems;
+	Item(Index: number): IExportStructureItem;
+	Item(Index: number, value: IExportStructureItem): void;
+	Remove(Index: number): void;
+}
+
+interface IExpression {
+	DataAnyFieldFTSFlags: MFiles.MFFullTextSearchFlags;
+	DataFileValueType: MFiles.MFFileValueType;
+	DataObjectIDSegmentSegmentSize: number;
+	DataPermissionsType: MFiles.MFPermissionsExpressionType;
+	DataPropertyValueDataFunction: MFiles.MFDataFunction;
+	DataPropertyValueParentChildBehavior: MFiles.MFParentChildBehavior;
+	DataPropertyValuePropertyDef: number;
+	DataStatusValueDataFunction: MFiles.MFDataFunction;
+	DataStatusValueType: MFiles.MFStatusType;
+	DataTypedValueDataFunction: MFiles.MFDataFunction;
+	DataTypedValueDatatype: MFiles.MFDataType;
+	DataTypedValueParentChildBehavior: MFiles.MFParentChildBehavior;
+	DataTypedValueValueList: number;
+	IndirectionLevels: IPropertyDefOrObjectTypes;
+	readonly Type: MFiles.MFExpressionType;
+	Clone(): IExpression;
+	GetExpressionAsText(PropertyDefinitions: IPropertyDefs, ObjectTypes: IObjectTypes): string;
+	GetWholeExpressionAsIndirectionLevels(): IPropertyDefOrObjectTypes;
+	SetAnyFieldExpression(FullTextSearchFlags: MFiles.MFFullTextSearchFlags): void;
+	SetFileValueExpression(FileValueType: MFiles.MFFileValueType): void;
+	SetObjectIDSegmentExpression(Segment: number): void;
+	SetPermissionExpression(PermissionsExpressionType: MFiles.MFPermissionsExpressionType): void;
+	SetPropertyValueExpression(PropertyDef: MFiles.MFBuiltInPropertyDef | number, PCBehavior: MFiles.MFParentChildBehavior, DataFunctionCall: IDataFunctionCall): void;
+	SetStatusValueExpression(StatusType: MFiles.MFStatusType, DataFunctionCall: IDataFunctionCall): void;
+	SetTypedValueExpression(DataType: MFiles.MFDataType, ValueList: MFiles.MFBuiltInValueList | number, PCBehavior: MFiles.MFParentChildBehavior, DataFunctionCall: IDataFunctionCall): void;
+	SetValueListItemExpression(PseudoPropertyDef: MFiles.MFValueListItemPropertyDef, PCBehavior: MFiles.MFParentChildBehavior, DataFunctionCall: IDataFunctionCall): void;
+}
+
+interface IExpressionEx {
+	Conditions: ISearchConditions;
+	Expression: IExpression;
+	FolderListingAlgorithm: MFiles.MFFolderListingAlgorithm;
+	NULLFolderName: string;
+	ShowContentsAsJITFolders: boolean;
+	ShowEmptyFolders: boolean;
+	ShowMatchingObjectsOnThisLevel: boolean;
+	ShowNULLFolder: boolean;
+	ShowNULLFolderContentsOnThisLevel: boolean;
+	Clone(): IExpressionEx;
+}
+
+interface IExpressionExs {
+	readonly Count: number;
+	Add(Index: number, ExpressionEx: IExpressionEx): void;
+	Clone(): IExpressionExs;
+	Item(Index: number): IExpressionEx;
+	Item(Index: number, value: IExpressionEx): void;
+	Remove(Index: number): void;
+}
+
+interface IExpressions {
+	readonly Count: number;
+	Add(Index: number, Expression: IExpression): void;
+	Clone(): IExpressions;
+	Item(Index: number): IExpression;
+	Item(Index: number, value: IExpression): void;
+	Remove(Index: number): void;
+}
+
+interface IFileClass {
+	DisplayName: string;
+	readonly DotAndExtension: string;
+	readonly Extension: string;
+	readonly FileClass: string;
+	Clone(): IFileClass;
+	LoadByExtension(Extension: string): void;
+	LoadByFileClass(Extension: string, FileClass: string): void;
+	SetFileClassInfo(DotAndFileExtension: string, FileClass: string, FileClassDisplayName: string): void;
+}
+
+interface IFileClasses {
+	readonly Count: number;
+	Add(Index: number, FileClass: IFileClass): void;
+	Clone(): IFileClasses;
+	Item(Index: number): IFileClass;
+	Remove(Index: number): void;
+}
+
+interface IFileDownloadSession {
+	readonly DownloadID: number;
+	readonly FileSize: number;
+	readonly FileSize32: number;
+}
+
+interface IFileInformation {
+	EmailMessage: IEmailMessageInformation;
+	FileType: MFiles.MFFileInformationType;
+	Clear(): void;
+	ExtractFromFile(PathToFile: string): void;
+}
+
+interface IFileVer {
+	ID: number;
+	Version: number;
+	Clone(): IFileVer;
+	CloneFrom(FileVer: IFileVer): void;
+}
+
+interface IFileVers {
+	readonly Count: number;
+	Add(Index: number, FileVer: IFileVer): void;
+	Clone(): IFileVers;
+	Item(Index: number): IFileVer;
+	Remove(Index: number): void;
+}
+
+interface IFolderContentItem {
+	readonly FolderContentItemType: MFiles.MFFolderContentItemType;
+	readonly ObjectVersion: IObjectVersion;
+	readonly PropertyFolder: ITypedValue;
+	readonly TraditionalFolder: ILookup;
+	readonly View: IView;
+}
+
+interface IFolderContentItems {
+	readonly Count: number;
+	readonly MoreResults: boolean;
+	Item(Index: number): IFolderContentItem;
+}
+
+interface IFolderDef {
+	readonly FolderDefType: MFiles.MFFolderDefType;
+	readonly PropertyFolder: ITypedValue;
+	readonly SearchDef: ISearchDef;
+	readonly TraditionalFolder: number;
+	readonly View: (MFiles.MFBuiltInView | number);
+	Clone(): IFolderDef;
+	SetPropertyFolder(TypedValue: ITypedValue): void;
+	SetSearchDef(SearchDef: ISearchDef): void;
+	SetTraditionalFolder(TraditionalFolder: number): void;
+	SetView(View: MFiles.MFBuiltInView | number): void;
+}
+
+interface IFolderDefs {
+	readonly Count: number;
+	Add(Index: number, FolderDef: IFolderDef): void;
+	Clone(): IFolderDefs;
+	Item(Index: number): IFolderDef;
+	Remove(Index: number): void;
+}
+
+interface IFolderListingColumn {
+	Flags: MFiles.MFFolderListingColumnFlags;
+	readonly ID: number;
+	readonly Name: string;
+	Position: number;
+	Visible: boolean;
+	Width: number;
+	Clone(): IFolderListingColumn;
+}
+
+interface IFolderListingColumns {
+	readonly Count: number;
+	Add(Index: number, FolderListingColumn: IFolderListingColumn): void;
+	Item(Index: number): IFolderListingColumn;
+	Item(Index: number, value: IFolderListingColumn): void;
+	Remove(Index: number): void;
+}
+
+interface IFolderListingColumnSorting {
+	ID: number;
+	Index: number;
+	SortAscending: boolean;
+	Clone(): IFolderListingColumnSorting;
+}
+
+interface IFolderListingColumnSortings {
+	readonly Count: number;
+	Add(Index: number, FolderListingColumnSorting: IFolderListingColumnSorting): void;
+	Item(Index: number): IFolderListingColumnSorting;
+	Item(Index: number, value: IFolderListingColumnSorting): void;
+	Remove(Index: number): void;
+}
+
+interface IFolderListingUIState {
+	Columns: IFolderListingColumns;
+	ColumnSortings: IFolderListingColumnSortings;
+	GroupingMode: MFiles.MFFolderListingItemGroupingMode;
+	IconSize: number;
+	ViewMode: MFiles.MFFolderListingViewMode;
+}
+
+interface IFolderNameListing {
+	readonly Count: number;
+	readonly MoreValues: boolean;
+	Item(Index: number): ITypedValue;
+	SortWithExpression(Expression: IExpression, Locale: number): void;
+}
+
+interface IFolderUIState {
+	BottomPaneBarMinimized: boolean;
+	HitHighlightingEnabled: boolean;
+	readonly ListingUIState: IFolderListingUIState;
+	MetadataEditorInRightPane: boolean;
+	RelativeBottomPaneHeight: number;
+	RelativeRightPaneWidth: number;
+	RightPaneBarMinimized: boolean;
+	ShowBottomPaneBar: boolean;
+	ShowRightPaneBar: boolean;
+}
+
+interface IIDRange {
+	MaxID: number;
+	MaxID_32bit: string;
+	MinID: number;
+	MinID_32bit: string;
+	Clone(): IIDRange;
+	SetIDs(MinID: number, MaxID: number): void;
+	SetIDs_32bit(MinID: string, MaxID: string): void;
+}
+
+interface IIDs {
+	readonly Count: number;
+	Add(Index: number, ID: number): void;
+	Clone(): IIDs;
+	IndexOf(ID: number): number;
+	Item(Index: number): number;
+	Remove(Index: number): void;
+	RemoveAll(ID: number): number;
+}
+
+interface IImpersonation {
+	Account: string;
+	ImpersonationType: MFiles.MFImpersonationType;
+	Password: string;
+	Clone(): IImpersonation;
+}
+
+interface IImportContentJob {
+	ActivateAutomaticPermissionsForNewOrChangedDefinitions: boolean;
+	DisableImportedExternalObjectTypeConnections: boolean;
+	DisableImportedExternalUserGroups: boolean;
+	DisableImportedVaultEventHandlers: boolean;
+	Flags: MFiles.MFImportContentFlag;
+	IgnoreAutomaticPermissionsDefinedByObjects: boolean;
+	Impersonation: IImpersonation;
+	MetadataStructureSelectors: IMetadataStructureSelectors;
+	Permissions: IAccessControlList;
+	ResetExportTimestamps: boolean;
+	SourceLocation: string;
+	UseDefaultObjectTypePermissions: boolean;
+	UseNamesAsAliases: boolean;
+	UsePermissions: boolean;
+	Clone(): IImportContentJob;
+}
+
+interface IIndirectPropertyID {
+	readonly Count: number;
+	Add(Index: number, IndirectPropertyIDLevel: IIndirectPropertyIDLevel): void;
+	Clone(): IIndirectPropertyID;
+	EqualTo(IndirectPropertyID: IIndirectPropertyID): boolean;
+	Item(Index: number): IIndirectPropertyIDLevel;
+	Remove(Index: number): void;
+	ToJSON(): string;
+}
+
+interface IIndirectPropertyIDLevel {
+	ID: number;
+	LevelType: MFiles.MFIndirectPropertyIDLevelType;
+	Clone(): IIndirectPropertyIDLevel;
+	ToJSON(): string;
+}
+
+interface IKeyNamePair {
+	readonly Key: number;
+	readonly Name: string;
+	Clone(): IKeyNamePair;
+}
+
+interface IKeyNamePairs {
+	readonly Count: number;
+	Item(Index: number): IKeyNamePair;
+}
+
+interface ILanguage {
+	readonly ID: number;
+	LanguageCode: string;
+	Name: string;
+}
+
+interface ILanguages {
+	readonly Count: number;
+	Item(Index: number): ILanguage;
+}
+
+interface ILicenseStatus {
+	readonly EvaluationDaysLeft: number;
+	readonly EvaluationMode: boolean;
+	readonly Expired: boolean;
+	readonly LicenseCode: string;
+	readonly NumOfConcurrentUserLicenses: number;
+	readonly NumOfNamedUserLicenses: number;
+	readonly NumOfReadonlyLicenses: number;
+	readonly SerialNumber: string;
+	ClearLicenseCode(): void;
+}
+
+interface ILoginAccount {
+	readonly AccountName: string;
+	AccountType: MFiles.MFLoginAccountType;
+	DomainName: string;
+	EmailAddress: string;
+	Enabled: boolean;
+	FullName: string;
+	LicenseType: MFiles.MFLicenseType;
+	ServerRoles: MFiles.MFLoginServerRole;
+	UserName: string;
+	Clone(): ILoginAccount;
+	CloneFrom(LoginAccount: ILoginAccount): void;
+	Set(LoginAccountType: MFiles.MFLoginAccountType, DomainName: string, UserName: string, ServerRoles: MFiles.MFLoginServerRole, FullName: string, EmailAddress: string, LicenseType: MFiles.MFLicenseType): void;
+}
+
+interface ILoginAccountPersonalInformation {
+	readonly AccountName: string;
+	readonly Email: string;
+	readonly FullName: string;
+}
+
+interface ILoginAccounts {
+	readonly Count: number;
+	Item(Index: number): ILoginAccount;
+}
+
+interface ILookup {
+	Deleted: boolean;
+	readonly DisplayID: string;
+	readonly DisplayIDAvailable: boolean;
+	DisplayValue: string;
+	readonly Hidden: boolean;
+	Item: number;
+	ItemGUID: string;
+	readonly ObjectFlags: MFiles.MFSpecialObjectFlag;
+	ObjectType: (MFiles.MFBuiltInObjectType | number);
+	Version: number;
+	Clone(): ILookup;
+	CloneFrom(Lookup: ILookup): void;
+	GetFormattedDisplayValue(Localized: boolean, EmptyLookupDispValuesAsHidden: boolean, AddDeletedSuffixIfDeleted: boolean): string;
+}
+
+interface ILookups {
+	readonly Count: number;
+	Add(Index: number, Lookup: ILookup): void;
+	Clone(): ILookups;
+	CloneFrom(Lookups: ILookups): void;
+	GetLookupByItem(Item: number): ILookup;
+	GetLookupIndexByItem(Item: number): number;
+	Item(Index: number): ILookup;
+	Remove(Index: number): void;
+}
+
+interface IMessage {
+	button1_enabled?: boolean;
+	button1_title?: string;
+	button2_enabled?: boolean;
+	button2_title?: string;
+	button3_enabled?: boolean;
+	button3_title?: string;
+	button4_enabled?: boolean;
+	button4_title?: string;
+	cancelButton?: (1 | 2 | 3 | 4);
+	caption?: string;
+	checkbox_checked?: boolean;
+	checkbox_enabled?: boolean;
+	checkbox_title?: string;
+	defaultButton?: (1 | 2 | 3 | 4);
+	icon?: string;
+	message?: string;
+	timeOut?: number;
+	timeout_deactivateOnFocusChange?: boolean;
+	timeOutButton?: (1 | 2 | 3 | 4);
+}
+
+interface IMetadataCard {
+	readonly ActiveView: string;
+	readonly DataModel: IMetadataCardModel;
+	readonly Events: IEvents;
+	readonly HitHighlightingActive: boolean;
+	readonly Location: string;
+	readonly Minimized: boolean;
+	readonly Parent: any;
+	readonly PreviewerVisible: boolean;
+	readonly PreviewerWidth: number;
+	readonly SearchHits: string;
+	readonly Vault: IVault;
+	readonly Views: ICollection;
+	GetApplyAction(): IMetadataCardAction;
+	GetApplyAllAction(): IMetadataCardAction;
+	GetCheckInImmediatelyOption(): IMetadataCardOption;
+	GetDiscardAction(): IMetadataCardAction;
+	GetFavoriteObjectOption(): IMetadataCardOption;
+	GetFollowThisObjectOption(): IMetadataCardOption;
+	GetHeight(): number;
+	GetOpenForEditOption(): IMetadataCardOption;
+	GetPopOutAction(): IMetadataCardAction;
+	GetSkipAction(): IMetadataCardAction;
+	GetUIData(key: string, defaultData: any): any;
+	GetUseAsDefaultsOption(): IMetadataCardOption;
+	GetWidth(): number;
+	IsModified(): boolean;
+	IsOnMultiItemSequence(): boolean;
+	IsPoppedOut(): boolean;
+	PromptForValue(dialog: any): boolean;
+	ResumeAsyncOp(): void;
+	SetEditStateDirty(dirty: boolean): void;
+	SetHeight(Height: number): void;
+	SetLocation(location: string): void;
+	SetMinimized(Minimized: boolean): void;
+	SetWidth(Width: number): void;
+	ShowMessage(message: string | IMessage): number;
+	ShowNewObjectDialog(ObjectType: MFiles.MFBuiltInObjectType | number, defaultName: string): any;
+	ShowPermissionsDialog(): void;
+	StorePreviewerState(previewerVisible: boolean, previewerWidth: number): void;
+	StoreUIData(key: string, data: any, dataIsModeSpecific: boolean, dataIsLayoutSpecific: boolean, dataIsPermanent: boolean): void;
+	SuspendAsyncOp(): void;
+}
+
+interface IMetadataCardAction {
+	readonly Events: IEvents;
+	Activate(): void;
+	GetExplanation(): string;
+	GetName(): string;
+	IsEnabled(): boolean;
+	IsVisible(): boolean;
+}
+
+interface IMetadataCardCommentHistoryItem {
+	GetCommentAuthor(): string;
+	GetCommentText(): string;
+	GetCommentTimestamp(): any;
+	GetCommentVersion(): number;
+}
+
+interface IMetadataCardControl {
+	readonly AllowAdding: boolean;
+	readonly Events: IEvents;
+	readonly Hierarchical: boolean;
+	readonly ID: string;
+	Label: string;
+	readonly Linked: boolean;
+	Modified: boolean;
+	MustExist: boolean;
+	readonly PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
+	ReadOnly: boolean;
+	readonly RealObjectType: boolean;
+	readonly Type: string;
+	Value: any;
+	readonly Valuelist: (MFiles.MFBuiltInValueList | number);
+	ValueRequired: boolean;
+	Visible: boolean;
+	ActivateLink(valuePart: any): void;
+	AddNewItem(name: string): any;
+	AddNewSubItem(name: string, valueParent: any): any;
+	AllowHitHighlighting(): boolean;
+	CanActivateLink(valuePart: any): boolean;
+	CanAddNewSubItem(name: string, valueParent: any): boolean;
+	CanEditItem(value: any): boolean;
+	CreateSelectionList(): IMetadataCardSelectionList;
+	CreateUnvalidatedValue(valueString: string): IMetadataCardUnvalidatedValue;
+	EditItem(value: any): any;
+	FindItem(name: string): any;
+	FindItemByID(itemID: number): any;
+	GetSelectableValueItemStates(): any;
+	GetValueSuggestions(): any;
+	HasAutomaticValue(): boolean;
+	HasInitialValue(): boolean;
+	HasUncalculatedAutomaticValue(): boolean;
+	IsExternal(): boolean;
+	RefreshList(): void;
+	Remove(): void;
+	RevertToInitialValue(): void;
+	SetValueItemState(itemID: string, state: any): void;
+}
+
+interface IMetadataCardModel {
+	readonly CheckedOutTo: IMetadataCardControl;
+	readonly ClassSelector: IMetadataCardControl;
+	readonly Comment: IMetadataCardControl;
+	readonly DataModels: ICollection;
+	readonly Events: IEvents;
+	readonly IconURL: string;
+	readonly ID: string;
+	readonly IsFileAvailableForPreview: boolean;
+	readonly IsUpdating: boolean;
+	readonly ObjectId: IMetadataCardControl;
+	readonly ObjectType: IMetadataCardControl;
+	readonly ObjectTypeId: IMetadataCardControl;
+	readonly ObjectVersion: IMetadataCardControl;
+	readonly ObjVers: IObjVers;
+	readonly PermissionsDescription: string;
+	readonly PropertyControls: ICollection;
+	readonly PropertySelector: IMetadataCardControl;
+	readonly SaveAsTypeSelector: IMetadataCardControl;
+	readonly Title: IMetadataCardControl;
+	readonly UncreatedObject: boolean;
+	AddProperty(propertyDefId: MFiles.MFBuiltInPropertyDef | number): void;
+	GetCommentVersionHistory(): any;
+	GetError(): any;
+	GetIconOverlayHint(): string;
+	GetObjectSourceFiles(): any;
+	GetObjectTemplateDescription(): string;
+	GetRemoteVaultAction(): IMetadataCardAction;
+	GetSubObjectsAction(): IMetadataCardAction;
+	GetValueListItemIdByGUID(propertyDefId: MFiles.MFBuiltInPropertyDef | number, guidToLookFor: string): number;
+	IsModified(): boolean;
+	Rebuild(iterationCounter: number, classChanged: boolean, addedPropertyDef: number): boolean;
+	SetAdditionalPropertyDefs(additionalPropertyDefs: any): void;
+	SetCustomPlaceholders(customPlaceholders: any): void;
+	SetRequiredPropertyDefs(requiredPropertyDefs: any): void;
+	SetUnevaluatedPropertyValues(unevaluatedValues: any): void;
+	ShowFilePreview(previewer: any): void;
+}
+
+interface IMetadataCardMultiValue {
+	readonly ID: string;
+	readonly IsMultiValue: boolean;
+	readonly State: any;
+	readonly ValueParts: any;
+}
+
+interface IMetadataCardMultiValuePart {
+	readonly ID: any;
+	readonly Value: any;
+}
+
+interface IMetadataCardOption {
+	readonly Events: IEvents;
+	GetExplanation(): string;
+	GetName(): string;
+	GetOptionValue(): any;
+	IsEnabled(): boolean;
+	IsVisible(): boolean;
+	SetOptionValue(value: any): void;
+}
+
+interface IMetadataCardSelectionList {
+	readonly Events: IEvents;
+	readonly Filter: string;
+	readonly FilteringValue: string;
+	readonly Items: any;
+	readonly MoreResults: boolean;
+	AutoSelect(identifier: string): void;
+	SetFilter(Filter: string, token: number, maxResults: number): void;
+}
+
+interface IMetadataCardSelectionListItem {
+	readonly ChildItems: any;
+	readonly HasParent: boolean;
+	readonly ParentID: number;
+	readonly Selectable: boolean;
+	readonly Value: any;
+}
+
+interface IMetadataCardUnvalidatedValue {
+	readonly ID: string;
+	readonly IsMultiValue: boolean;
+	readonly IsUnvalidated: boolean;
+	readonly Name: string;
+}
+
+interface IMetadataCardValue {
+	readonly HasIcon: boolean;
+	readonly IconURL: string;
+	readonly ID: string;
+	readonly IsMultiValue: boolean;
+	readonly Item: number;
+	readonly Name: string;
+	readonly State: any;
+	readonly Version: number;
+	IsDeleted(): boolean;
+	IsHidden(): boolean;
+}
+
+interface IMetadataCardValueSuggestion {
+	readonly IsNewValue: boolean;
+	readonly Name: string;
+	readonly Value: any;
+}
+
+interface IMetadataCardView {
+	DashboardID: string;
+	readonly Events: IEvents;
+	Name: string;
+}
+
+interface IMetadataStructureSelector {
+	Flags: MFiles.MFMetadataStructureSelectorFlags;
+	ID: string;
+	Name: string;
+	StructureItemGUID: string;
+	StructureItemID: number;
+	StructureItemSemanticAlias: string;
+	StructureItemType: MFiles.MFMetadataStructureItem;
+	Clone(): IMetadataStructureSelector;
+}
+
+interface IMetadataStructureSelectors {
+	readonly Count: number;
+	Add(Index: number, MetadataStructureSelector: IMetadataStructureSelector): void;
+	Clone(): IMetadataStructureSelectors;
+	Item(Index: number): IMetadataStructureSelector;
+	Item(Index: number, value: IMetadataStructureSelector): void;
+	Remove(Index: number): void;
+}
+
+interface IMFDocListCtrl {
+	AttachToListingWindow(shellListing: any): void;
+}
+
+interface IMFilesClientApplication {
+	AddVaultConnection(VaultConnection: IVaultConnection): void;
+	BindToVault(VaultConnection: string, ParentWindow: number, CanLogIn: boolean, ReturnNULLIfCancelledByUser: boolean): IVault;
+	FindFile(Path: string, UpdateFromServer: boolean): IObjectFileAndVersion;
+	FindObjectVersionAndProperties(Path: string, UpdateFromServer: boolean): IObjectVersionAndProperties;
+	GetAPIVersion(): IMFilesVersion;
+	GetClientLanguage(): string;
+	GetClientVersion(): IMFilesVersion;
+	GetDriveLetter(): string;
+	GetVaultConnection(VaultConnection: string): IVaultConnection;
+	GetVaultConnections(): IVaultConnections;
+	GetVaultConnectionsWithGUID(GUID: string): IVaultConnections;
+	IsObjectPathInMFiles(Path: string): boolean;
+	LogInAs(VaultConnection: string, ParentWindow: number, DefaultAuthType: MFiles.MFAuthType, ReturnNULLIfCancelledByUser: boolean): IVault;
+	LogInAsUser(VaultConnection: string, AuthType: MFiles.MFAuthType, UserName: string, Password: string, Domain: string | null, SPN: string | null): IVault;
+	RemoveVaultConnection(VaultConnectionName: string, UserSpecific: boolean): void;
+	ShowBalloonTip(Msg: string, Title: string, Timeout: number, InfoFlags: number, RemovePrevious: boolean): void;
+	TestConnectionToServerEx(Server: string, Port: string, ProtocolSequence: string, EncryptedConnection: boolean): number;
+}
+
+interface IMFilesServerApplication {
+	readonly LicenseManagementOperations: IServerLicenseManagementOperations;
+	readonly LoginAccountOperations: IServerLoginAccountOperations;
+	readonly ScheduledJobManagementOperations: IServerScheduledJobManagementOperations;
+	readonly ServerManagementOperations: IServerManagementOperations;
+	readonly SharedLinkPublicOperations: ISharedLinkPublicOperations;
+	readonly VaultManagementOperations: IServerVaultManagementOperations;
+	Connect(AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, LocalComputerName: string, AllowAnonymousConnection: boolean): MFiles.MFServerConnection;
+	ConnectAdministrativeEx(TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string): MFiles.MFServerConnection;
+	ConnectEx3(TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, AllowUsingAuthenticationPlugins: boolean, LogicalTargetServer: string): MFiles.MFServerConnection;
+	ConnectEx4(TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, AllowUsingAuthenticationPlugins: boolean, LogicalTargetServer: string, ClientCulture: string): MFiles.MFServerConnection;
+	ConnectWithAuthenticationDataEx2(PluginInfo: IPluginInfo, AuthenticationData: INamedValues, AttemptIdentifier: string, TimeZone: ITimeZoneInformation, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, LogicalTargetServer: string): IAuthenticationResult;
+	ConnectWithAuthenticationDataEx3(PluginInfo: IPluginInfo, AuthenticationData: INamedValues, AttemptIdentifier: string, TimeZone: ITimeZoneInformation, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean, LocalComputerName: string, AllowAnonymousConnection: boolean, LogicalTargetServer: string, ClientCulture: string): IAuthenticationResult;
+	ConnectWithoutLogin(TimeZone: ITimeZoneInformation, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, LocalComputerName: string, LogicalTargetServer: string, ClientCulture: string): MFiles.MFServerConnection;
+	Disconnect(): void;
+	GetAPIVersion(): IMFilesVersion;
+	GetAuthenticationPluginInformationEx(UserName: string, Domain: string, VaultGUID: string, HostName: string, AccountType: MFiles.MFLoginAccountType, TargetPluginName: string, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean): IPluginInfos;
+	GetAuthenticationPluginsEx(ScopeIndependentOnly: boolean, ProtocolSequence: string, NetworkAddress: string, Endpoint: string, EncryptedConnection: boolean): IPluginInfos;
+	GetOnlineVaults(): IVaultsOnServer;
+	GetServerVersion(): IMFilesVersion;
+	GetTokenAsAuthenticationData(Token: string): INamedValues;
+	GetVaults(): IVaultsOnServer;
+	LogInAsUserToVault(VaultGUID: string, TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null): IVault;
+	LogInAsUserToVaultWithSPN(VaultGUID: string, TimeZone: ITimeZoneInformation, AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null): IVault;
+	LogInToVault(VaultGUID: string): IVault;
+	LogInToVaultAdministrative(VaultGUID: string): IVault;
+	LogInToVaultAdministrativeWithExistingSession(VaultGUID: string): IVault;
+	LogInToVaultEx(VaultGUID: string, AllowUsingAuthenticationPlugins: boolean): IVault;
+	LogInToVaultWithExistingSession(VaultGUID: string): IVault;
+	TestConnectionToServerEx(Server: string, Port: string, ProtocolSequence: string, EncryptedConnection: boolean): number;
+}
+
+interface IMFilesVersion {
+	Build: number;
+	readonly Display: string;
+	Major: number;
+	Minor: number;
+	Patch: number;
+	SoftwarePlatform: MFiles.MFSoftwarePlatformType;
+	Clone(): IMFilesVersion;
+	CompareTo(RightSide: IMFilesVersion): number;
+}
+
+interface IMFResourceManager {
+	GetLocaleSpecificDateFormat(): string;
+	GetUICultures(): IStrings;
+	LoadResourceString(LanguageID: number, ResourceID: number): string;
+}
+
+interface IMonthlyDateTrigger {
+	Days: number;
+	Months: MFiles.MFTriggerMonth;
+}
+
+interface IMonthlyDOWTrigger {
+	DaysOfTheWeek: MFiles.MFTriggerWeekDay;
+	Months: MFiles.MFTriggerMonth;
+	WhichWeek: MFiles.MFTriggerWeekOfMonth;
+}
+
+interface INamedACL {
+	AccessControlList: IAccessControlList;
+	readonly GUID: string;
+	ID: number;
+	Name: string;
+	readonly NamedACLType: MFiles.MFNamedACLType;
+	Clone(): INamedACL;
+}
+
+interface INamedACLAdmin {
+	AccessControlListForNamedACL: IAccessControlList;
+	NamedACL: INamedACL;
+	SemanticAliases: ISemanticAliases;
+	Clone(): INamedACLAdmin;
+}
+
+interface INamedACLs {
+	readonly Count: number;
+	Item(Index: number): INamedACL;
+}
+
+interface INamedACLsAdmin {
+	readonly Count: number;
+	Item(Index: number): INamedACLAdmin;
+}
+
+interface INamedValueNamespace {
+	NamedValues: INamedValues;
+	NamespaceName: string;
+	Clone(): INamedValueNamespace;
+}
+
+interface INamedValueNamespaces {
+	readonly Count: number;
+	Add(Index: number, NamedValueNamespace: INamedValueNamespace): void;
+	Clone(): INamedValueNamespaces;
+	Item(Index: number): INamedValueNamespace;
+	Item(Index: number, value: INamedValueNamespace): void;
+	Remove(Index: number): void;
+}
+
+interface INamedValues {
+	Modified: boolean;
+	readonly Names: IStrings;
+	Clone(): INamedValues;
+	Contains(Name: string): boolean;
+	Value(ValueName: string): any;
+	Value(ValueName: string, value: any): void;
+}
+
+interface INumber {
+	Value: number;
+	Clone(): INumber;
+}
+
+interface IObjectClass {
+	AccessControlList: IAccessControlList;
+	readonly AdditionalClassInfo: IAdditionalClassInfo;
+	AssociatedPropertyDefs: IAssociatedPropertyDefs;
+	AutomaticPermissionsForObjects: IAutomaticPermissions;
+	ForceWorkflow: boolean;
+	ID: number;
+	Name: string;
+	NamePropertyDef: number;
+	ObjectType: (MFiles.MFBuiltInObjectType | number);
+	Workflow: number;
+	Clone(): IObjectClass;
+}
+
+interface IObjectClassAdmin {
+	readonly AdditionalClassInfo: IAdditionalClassInfo;
+	AssociatedPropertyDefs: IAssociatedPropertyDefs;
+	AutomaticPermissionsForObjects: IAutomaticPermissions;
+	ForceWorkflow: boolean;
+	ID: number;
+	Name: string;
+	NamePropertyDef: number;
+	ObjectType: (MFiles.MFBuiltInObjectType | number);
+	Predefined: boolean;
+	SemanticAliases: ISemanticAliases;
+	Workflow: number;
+	Clone(): IObjectClassAdmin;
+}
+
+interface IObjectClasses {
+	readonly Count: number;
+	Add(Index: number, ObjectClass: IObjectClass): void;
+	Clone(): IObjectClasses;
+	Item(Index: number): IObjectClass;
+	Remove(Index: number): void;
+}
+
+interface IObjectClassesAdmin {
+	readonly Count: number;
+	Add(Index: number, ObjectClassAdmin: IObjectClassAdmin): void;
+	Item(Index: number): IObjectClassAdmin;
+	Remove(Index: number): void;
+}
+
+interface IObjectComparer {
+	Compare(ObjectVersionDataLeft: IObjectVersion, ObjectVersionDataRight: IObjectVersion): number;
+}
+
+interface IObjectCreationInfo {
+	DisallowTemplateSelection: boolean;
+	ExplicitObjectID: number;
+	IsObjectShortcut: boolean;
+	ObjectGUID: string;
+	OkToAllButtonVisible: boolean;
+	SkipThisButtonVisible: boolean;
+	GetDisableObjectCreation(): boolean;
+	GetExtension(): string;
+	GetMetadataCardTitle(): string;
+	GetObjectType(): number;
+	GetSelectableFileClasses(): IFileClasses;
+	GetSelectedFileClass(): IFileClass;
+	GetSingleFileDocument(): boolean;
+	GetSourceFiles(): ISourceObjectFiles;
+	GetTemplate(): IObjVer;
+	GetTitle(): ITypedValue;
+	GetTitleAsText(): string;
+	GetUseAsDefaults(): boolean;
+	SetDisableObjectCreation(Disable: boolean): void;
+	SetExtension(Extension: string, Editable: boolean): void;
+	SetMetadataCardTitle(MetadataCardTitle: string): void;
+	SetObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, Editable: boolean): void;
+	SetSelectableFileClasses(FileClasses: IFileClasses): void;
+	SetSelectedFileClass(FileClass: IFileClass, Editable: boolean): void;
+	SetSingleFileDocument(SingleFile: boolean, Editable: boolean): void;
+	SetSourceFiles(SourceFiles: ISourceObjectFiles): void;
+	SetTemplate(Template: IObjVer): void;
+	SetTitle(Title: ITypedValue, Editable: boolean): void;
+	SetTitleAsDatatypeText(Title: string, Editable: boolean): void;
+	SetUseAsDefaults(UseAsDefaults: boolean, Editable: boolean): void;
+}
+
+interface IObjectFile {
+	readonly ChangeTimeUtc: Date;
+	readonly CreationTimeUtc: Date;
+	readonly Extension: string;
+	readonly FileGUID: string;
+	readonly FileVer: IFileVer;
+	readonly ID: number;
+	readonly LastAccessTimeUtc: Date;
+	readonly LastWriteTimeUtc: Date;
+	readonly LogicalSize: number;
+	readonly LogicalSize_32bit: number;
+	readonly Title: string;
+	readonly Version: number;
+	GetNameForFileSystem(): string;
+	ToJSON(): string;
+}
+
+interface IObjectFileAndObjVer {
+	readonly ObjectFile: IObjectFile;
+	readonly ObjVer: IObjVer;
+	Clone(): IObjectFileAndObjVer;
+	ToJSON(): string;
+}
+
+interface IObjectFileAndObjVerOfMultipleFiles {
+	readonly Count: number;
+	Add(Index: number, ObjectFileAndObjVer: IObjectFileAndObjVer): void;
+	Clone(): IObjectFileAndObjVerOfMultipleFiles;
+	Item(Index: number): IObjectFileAndObjVer;
+	Remove(Index: number): void;
+}
+
+interface IObjectFileAndVersion {
+	readonly ObjectFile: IObjectFile;
+	readonly ObjectVersion: IObjectVersionAndProperties;
+}
+
+interface IObjectFileComparer {
+	Compare(FileLeft: IObjectFile, FileRight: IObjectFile): number;
+}
+
+interface IObjectFiles {
+	readonly Count: number;
+	GetObjectFileByNameForFileSystem(NameForFileSystem: string): IObjectFile;
+	GetObjectFileIndexByNameForFileSystem(NameForFileSystem: string): number;
+	Item(Index: number): IObjectFile;
+	Sort(ObjectFileComparer: IObjectFileComparer): void;
+	ToJSON(): string;
+}
+
+interface IObjectSearchResults {
+	readonly Count: number;
+	readonly MoreResults: boolean;
+	Clone(): IObjectSearchResults;
+	GetAsObjectVersions(): IObjectVersions;
+	GetScoreOfObject(ObjVer: IObjVer): number;
+	Item(Index: number): IObjectVersion;
+	ScoreAt(Index: number): number;
+	Sort(ObjectComparer: IObjectComparer): void;
+	SortByScore(Ascending: boolean): void;
+}
+
+interface IObjectTemplateSelector {
+	readonly ClassSelector: IMetadataCardControl;
+	readonly Events: IEvents;
+	GetObjectTypeIconURL(): string;
+	GetObjectTypeId(): number;
+	GetObjectTypeName(): string;
+	GetTemplateItems(): any;
+	SelectItem(itemID: string): void;
+}
+
+interface IObjectTemplateSelectorItem {
+	GetClassID(): number;
+	GetClassName(): string;
+	GetGroupID(): number;
+	GetGroupName(): string;
+	GetIconURL(): string;
+	GetID(): string;
+	GetName(): string;
+	GetTemplateID(): number;
+	IsBlankItem(): boolean;
+	IsDefaultTemplateForClass(): boolean;
+}
+
+interface IObjectType {
+	AccessControlList: IAccessControlList;
+	AllowAdding: boolean;
+	AllowedAsGroupingLevel: boolean;
+	CanHaveFiles: boolean;
+	DefaultAccessControlList: IAccessControlList;
+	DefaultPropertyDef: number;
+	External: boolean;
+	readonly GUID: string;
+	HasOwnerType: boolean;
+	Hierarchical: boolean;
+	Icon: ReadonlyArray<number>;
+	ID: number;
+	NamePlural: string;
+	NameSingular: string;
+	ObjectTypeTargetsForBrowsing: IObjectTypeTargetsForBrowsing;
+	OwnerPropertyDef: number;
+	OwnerType: number;
+	readonly ReadOnlyPropertiesDuringInsert: IIDs;
+	readonly ReadOnlyPropertiesDuringUpdate: IIDs;
+	RealObjectType: boolean;
+	ShowCreationCommandInTaskPane: boolean;
+	Translatable: boolean;
+	CanHaveItemIcons(): boolean;
+	Clone(): IObjectType;
+	GetIconAsPNG(Width: number, Height: number): ReadonlyArray<number>;
+	IsAddingAllowedForUser(SessionInfo: ISessionInfo): boolean;
+}
+
+interface IObjectTypeAdmin {
+	ColumnMappings: IObjectTypeColumnMappings;
+	ConnectionString: string;
+	DefaultForAutomaticPermissions: IAutomaticPermissions;
+	DeleteStatement: string;
+	InsertIntoStatement: string;
+	NamedValueNamespaces: INamedValueNamespaces;
+	ObjectType: IObjectType;
+	SelectExtIDStatement: string;
+	SelectStatement: string;
+	SelectStatementOneRecord: string;
+	SemanticAliases: ISemanticAliases;
+	Translatable: boolean;
+	UpdateStatement: string;
+	Clone(): IObjectTypeAdmin;
+}
+
+interface IObjectTypeColumnMapping {
+	ObjectType: (MFiles.MFBuiltInObjectType | number);
+	Ordinal: number;
+	PartOfInsert: boolean;
+	PartOfUpdate: boolean;
+	SourceField: string;
+	TargetPropertyDef: number;
+	Type: number;
+	Clone(): IObjectTypeColumnMapping;
+}
+
+interface IObjectTypeColumnMappings {
+	readonly Count: number;
+	Add(Index: number, ObjectTypeColumnMapping: IObjectTypeColumnMapping): void;
+	Clone(): IObjectTypeColumnMappings;
+	Item(Index: number): IObjectTypeColumnMapping;
+	Remove(Index: number): void;
+}
+
+interface IObjectTypes {
+	readonly Count: number;
+	Clone(): IObjectTypes;
+	Item(Index: number): IObjectType;
+}
+
+interface IObjectTypesAdmin {
+	readonly Count: number;
+	Item(Index: number): IObjectTypeAdmin;
+}
+
+interface IObjectTypeTargetForBrowsing {
+	TargetObjectType: number;
+	ViewCollection: number;
+	Clone(): IObjectTypeTargetForBrowsing;
+}
+
+interface IObjectTypeTargetsForBrowsing {
+	readonly Count: number;
+	Add(Index: number, ObjectTypeTargetForBrowsing: IObjectTypeTargetForBrowsing): void;
+	Clone(): IObjectTypeTargetsForBrowsing;
+	Item(Index: number): IObjectTypeTargetForBrowsing;
+	Remove(Index: number): void;
+}
+
+interface IObjectVersion {
+	readonly AccessedByMeUtc: Date;
+	readonly CheckedOutAtUtc: Date;
+	readonly CheckedOutTo: number;
+	readonly CheckedOutToHostName: string;
+	readonly CheckedOutToUserName: string;
+	readonly CheckedOutVersion: number;
+	readonly Class: (MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number);
+	readonly CreatedUtc: Date;
+	readonly Deleted: boolean;
+	readonly DisplayID: string;
+	readonly DisplayIDAvailable: boolean;
+	readonly Files: IObjectFiles;
+	readonly FilesCount: number;
+	readonly HasAssignments: boolean;
+	readonly HasSharedFiles: boolean;
+	readonly IsAccessedByMeValid: boolean;
+	readonly IsObjectConflict: boolean;
+	readonly IsObjectShortcut: boolean;
+	readonly LastModifiedUtc: Date;
+	readonly LatestCheckedInVersion: number;
+	readonly LatestCheckedInVersionOrCheckedOutVersion: boolean;
+	readonly ObjectCheckedOut: boolean;
+	readonly ObjectCheckedOutToThisUserOnAnyComputer: boolean;
+	readonly ObjectCheckedOutToThisUserOnThisComputer: boolean;
+	readonly ObjectFlags: MFiles.MFSpecialObjectFlag;
+	readonly ObjectGUID: string;
+	readonly ObjectVersionFlags: MFiles.MFObjectVersionFlag;
+	readonly ObjVer: IObjVer;
+	readonly OriginalObjID: IObjID;
+	readonly OriginalVaultGUID: string;
+	readonly SingleFile: boolean;
+	readonly ThisVersionCheckedOut: boolean;
+	readonly ThisVersionLatestToThisUser: boolean;
+	readonly Title: string;
+	readonly VersionGUID: string;
+	readonly VisibleAfterOperation: boolean;
+	Clone(): IObjectVersion;
+	GetNameForFileSystem(IncludeID: boolean): string;
+	GetNameForFileSystemEx(IncludeID: boolean, UseOriginalID: boolean): string;
+}
+
+interface IObjectVersionAndProperties {
+	readonly ObjVer: IObjVer;
+	readonly Properties: IPropertyValues;
+	readonly Vault: IVault;
+	readonly VersionData: IObjectVersion;
+	Clone(): IObjectVersionAndProperties;
+}
+
+interface IObjectVersionAndPropertiesOfMultipleObjects {
+	readonly Count: number;
+	Add(Index: number, ObjectVersionAndProperties: IObjectVersionAndProperties): void;
+	Clone(): IObjectVersionAndPropertiesOfMultipleObjects;
+	Item(Index: number): IObjectVersionAndProperties;
+	Remove(Index: number): void;
+}
+
+interface IObjectVersionPermissions {
+	readonly AccessControlList: IAccessControlList;
+	readonly CustomACL: boolean;
+	readonly NamedACL: INamedACL;
+	readonly ObjVer: IObjVer;
+}
+
+interface IObjectVersions {
+	readonly Count: number;
+	Add(Index: number, ObjectVersionData: IObjectVersion): void;
+	GetAsObjVers(): IObjVers;
+	Item(Index: number): IObjectVersion;
+	Item(Index: number, value: IObjectVersion): void;
+	Remove(Index: number): void;
+	Sort(ObjectComparer: IObjectComparer): void;
+}
+
+interface IObjectVersionWorkflowState {
+	State: IPropertyValue;
+	VersionComment: IPropertyValue;
+	Workflow: IPropertyValue;
+}
+
+interface IObjectWindowResult {
+	readonly AccessControlList: IAccessControlList;
+	readonly ObjVer: IObjVer;
+	readonly Properties: IPropertyValues;
+	readonly Result: MFiles.MFObjectWindowResultCode;
+	readonly SelectedFileClass: IFileClass;
+	readonly UseAsDefaults: boolean;
+	readonly Visible: boolean;
+}
+
+interface IObjID {
+	ID: number;
+	Type: number;
+	Clone(): IObjID;
+	CloneFrom(ObjID: IObjID): void;
+	Serialize(): ReadonlyArray<number>;
+	SetIDs(ObjType: number, ID: number): void;
+	ToJSON(): string;
+	Unserialize(Bytes: ReadonlyArray<number>): void;
+}
+
+interface IObjIDs {
+	readonly Count: number;
+	Add(Index: number, ObjID: IObjID): void;
+	Item(Index: number): IObjID;
+	Item(Index: number, value: IObjID): void;
+	Remove(Index: number): void;
+	ToJSON(): string;
+}
+
+interface IObjOrFileVer {
+	FileVer: IFileVer;
+	ObjVer: IObjVer;
+	Clone(): IObjOrFileVer;
+	IsFile(): boolean;
+}
+
+interface IObjOrFileVers {
+	readonly Count: number;
+	Add(Index: number, ObjOrFileVer: IObjOrFileVer): void;
+	Clone(): IObjOrFileVers;
+	Item(Index: number): IObjOrFileVer;
+	Remove(Index: number): void;
+}
+
+interface IObjVer {
+	ID: number;
+	ObjID: IObjID;
+	Type: number;
+	Version: number;
+	Clone(): IObjVer;
+	CloneFrom(ObjVer: IObjVer): void;
+	Serialize(): ReadonlyArray<number>;
+	SetIDs(ObjType: number, ID: number, Version: number): void;
+	SetObjIDAndVersion(ObjID: IObjID, Version: number): void;
+	ToJSON(): string;
+	Unserialize(Bytes: ReadonlyArray<number>): void;
+}
+
+interface IObjVers {
+	readonly Count: number;
+	Add(Index: number, ObjVer: IObjVer): void;
+	Clone(): IObjVers;
+	GetAllDistinctObjIDs(): IObjIDs;
+	Item(Index: number): IObjVer;
+	Remove(Index: number): void;
+	ToJSON(): string;
+}
+
+interface IOCROptions {
+	PrimaryLanguage: MFiles.MFOCRLanguage;
+	SecondaryLanguage: MFiles.MFOCRLanguage;
+	Clone(): IOCROptions;
+}
+
+interface IOCRPage {
+	OCRZones: IOCRZones;
+	PageNum: number;
+	Clone(): IOCRPage;
+}
+
+interface IOCRPageResult {
+	readonly OCRZoneResults: IOCRZoneResults;
+	readonly PageNum: number;
+}
+
+interface IOCRPageResults {
+	readonly Count: number;
+	Item(Index: number): IOCRPageResult;
+}
+
+interface IOCRPages {
+	readonly Count: number;
+	Add(Index: number, OCRPage: IOCRPage): void;
+	Clone(): IOCRPages;
+	Item(Index: number): IOCRPage;
+	Remove(Index: number): void;
+}
+
+interface IOCRZone {
+	Barcode: boolean;
+	DataType: MFiles.MFDataType;
+	DimensionUnit: MFiles.MFOCRDimensionUnit;
+	readonly HasOCROptions: boolean;
+	Height: number;
+	ID: number;
+	Left: number;
+	Name: string;
+	OCROptions: IOCROptions;
+	Top: number;
+	Width: number;
+	ClearOCROptions(): void;
+	Clone(): IOCRZone;
+	SetOCROptions(OCROptions: IOCROptions): void;
+}
+
+interface IOCRZoneResult {
+	readonly Confidence: number;
+	readonly DimensionUnit: MFiles.MFOCRDimensionUnit;
+	readonly Height: number;
+	readonly ID: number;
+	readonly Left: number;
+	readonly RecognizedOnPage: number;
+	readonly ResultValue: ITypedValue;
+	readonly Top: number;
+	readonly Width: number;
+}
+
+interface IOCRZoneResults {
+	readonly Count: number;
+	Item(Index: number): IOCRZoneResult;
+}
+
+interface IOCRZones {
+	readonly Count: number;
+	Add(Index: number, OCRZone: IOCRZone): void;
+	Clone(): IOCRZones;
+	Item(Index: number): IOCRZone;
+	Remove(Index: number): void;
+}
+
+interface IOptimizeVaultJob {
+	GarbageCollectFiles: boolean;
+	readonly Thorough: boolean;
+	readonly VaultGUID: string;
+	GetNumberOfSteps(): number;
+	GetOneBasedIndexOfStep(CurrentStep: number): number;
+	GetStepProgressText(CurrentStep: number): string;
+	Set(GuidVault: string, Thorough: boolean): void;
+}
+
+interface IOwnerPropertyDef {
+	DependencyRelation: MFiles.MFDependencyRelation;
+	ID: number;
+	IndexForAutomaticFilling: number;
+	readonly IsRelationFiltering: boolean;
+}
+
+interface IPluginInfo {
+	AssemblyName: string;
+	BridgeClassName: string;
+	Configuration: INamedValues;
+	ConfigurationScope: string;
+	ConfigurationSource: INamedValues;
+	ConfigurationVaultGUID: string;
+	IsDefault: boolean;
+	IsScopeIndependent: boolean;
+	Name: string;
+	Clone(): IPluginInfo;
+}
+
+interface IPluginInfos {
+	readonly Count: number;
+	Add(Index: number, PluginInfo: IPluginInfo): void;
+	Clone(): IPluginInfos;
+	Item(Index: number): IPluginInfo;
+	Item(Index: number, value: IPluginInfo): void;
+	Remove(Index: number): void;
+}
+
+interface IPreviewerActiveXCtrl {
+	ClearPreview(): number;
+	ShowFilePreview(bstrFilename: string): number;
+	ShowHitHighlightedFilePreview(bstrFilename: string, lObjType: number, lObjID: number, lObjVersion: number, lFile: number, lFileVersion: number, pIHitHighlightingInfo: any, bstrSearchConditions: string): number;
+}
+
+interface IPropertyDef {
+	AccessControlList: IAccessControlList;
+	AllObjectTypes: boolean;
+	AllowedAsGroupingLevel: boolean;
+	AutomaticValueDefinition: ITypedValue;
+	AutomaticValueType: MFiles.MFAutomaticValueType;
+	BasedOnValueList: boolean;
+	ContentType: MFiles.MFContentType;
+	DataType: MFiles.MFDataType;
+	DependencyPD: number;
+	DependencyRelation: MFiles.MFDependencyRelation;
+	FormattingType: MFiles.MFFormattingType;
+	readonly GUID: string;
+	ID: number;
+	Name: string;
+	ObjectType: (MFiles.MFBuiltInObjectType | number);
+	OwnerPropertyDef: IOwnerPropertyDef;
+	Predefined: boolean;
+	SortAscending: boolean;
+	StaticFilter: ISearchConditions;
+	readonly ThisIsConflictPD: boolean;
+	readonly ThisIsDefaultPD: boolean;
+	readonly ThisIsOwnerPD: boolean;
+	UpdateType: MFiles.MFUpdateType;
+	ValidationType: MFiles.MFValidationType;
+	ValueList: (MFiles.MFBuiltInValueList | number);
+	ValueListSortingType: MFiles.MFValueListSortingType;
+	Clone(): IPropertyDef;
+}
+
+interface IPropertyDefAdmin {
+	AllowAutomaticPermissions: boolean;
+	AutomaticValue: IAutomaticValue;
+	NamedValueNamespaces: INamedValueNamespaces;
+	PropertyDef: IPropertyDef;
+	SemanticAliases: ISemanticAliases;
+	Validation: IValidation;
+	Clone(): IPropertyDefAdmin;
+}
+
+interface IPropertyDefOrObjectType {
+	ID: number;
+	PropertyDef: boolean;
+	Clone(): IPropertyDefOrObjectType;
+	GetAsExpression(): IExpression;
+}
+
+interface IPropertyDefOrObjectTypes {
+	readonly Count: number;
+	Add(Index: number, PropertyDefOrObjectType: IPropertyDefOrObjectType): void;
+	Clone(): IPropertyDefOrObjectTypes;
+	Item(Index: number): IPropertyDefOrObjectType;
+	Item(Index: number, value: IPropertyDefOrObjectType): void;
+	Remove(Index: number): void;
+}
+
+interface IPropertyDefs {
+	readonly Count: number;
+	Clone(): IPropertyDefs;
+	Item(Index: number): IPropertyDef;
+}
+
+interface IPropertyDefsAdmin {
+	readonly Count: number;
+	Item(Index: number): IPropertyDefAdmin;
+}
+
+interface IPropertyValue {
+	PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
+	TypedValue: ITypedValue;
+	Value: ITypedValue;
+	Clone(): IPropertyValue;
+	CloneFrom(PropertyValue: IPropertyValue): void;
+	GetValueAsLocalizedText(): string;
+	GetValueAsText(Localized: boolean, NULLAsEmptyString: boolean, EmptyLookupDisplayValuesAsHidden: boolean, LongDateFormat: boolean, NoSeconds: boolean, NumericValueAsKilobytes: boolean): string;
+	GetValueAsUnlocalizedText(): string;
+}
+
+interface IPropertyValueForDisplay {
+	readonly ContentType: MFiles.MFContentType;
+	readonly DataType: MFiles.MFDataType;
+	readonly DisplayValue: string;
+	readonly PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
+	readonly PropertyDefName: string;
+	readonly PropertyValue: IPropertyValue;
+	readonly ReadOnly: boolean;
+	Clone(): IPropertyValueForDisplay;
+}
+
+interface IPropertyValueIconClue {
+	readonly PropertyDef: (MFiles.MFBuiltInPropertyDef | number);
+	readonly ValueListItem: number;
+	Clone(): IPropertyValueIconClue;
+}
+
+interface IPropertyValueIconClues {
+	readonly Count: number;
+	Clone(): IPropertyValueIconClues;
+	Item(Index: number): IPropertyValueIconClue;
+}
+
+interface IPropertyValues {
+	readonly Count: number;
+	Add(Index: number, PropertyValue: IPropertyValue): void;
+	Clone(): IPropertyValues;
+	CloneFrom(PropertyValues: IPropertyValues): void;
+	IndexOf(PropertyDef: MFiles.MFBuiltInPropertyDef | number): number;
+	IndexOfByAlias(Vault: IVault, PropertyDefAlias: string): number;
+	Item(Index: number): IPropertyValue;
+	Item(Index: number, value: IPropertyValue): void;
+	Remove(Index: number): void;
+	SearchForProperty(PropertyDef: MFiles.MFBuiltInPropertyDef | number): IPropertyValue;
+	SearchForPropertyByAlias(Vault: IVault, PropertyDefAlias: string, ReturnNULLIfNotFound: boolean): IPropertyValue;
+	SearchForPropertyEx(PropertyDef: MFiles.MFBuiltInPropertyDef | number, ReturnNULLIfNotFound: boolean): IPropertyValue;
+}
+
+interface IPropertyValuesForDisplay {
+	readonly Count: number;
+	Item(Index: number): IPropertyValueForDisplay;
+}
+
+interface IPropertyValuesOfMultipleObjects {
+	readonly Count: number;
+	Clone(): IPropertyValuesOfMultipleObjects;
+	Item(Index: number): IPropertyValues;
+}
+
+interface IPropertyValueSuggestion {
+	readonly IsFact: boolean;
+	readonly Quality: number;
+	readonly TypedValue: ITypedValue;
+	Clone(): IPropertyValueSuggestion;
+}
+
+interface IPropertyValueSuggestions {
+	readonly Count: number;
+	Add(Index: number, IPropertyValueSuggestion: IPropertyValueSuggestion): void;
+	Clone(): IPropertyValueSuggestions;
+	Item(Index: number): IPropertyValueSuggestion;
+	Item(Index: number, value: IPropertyValueSuggestion): void;
+	Remove(Index: number): void;
+}
+
+interface IPropertyValuesWithIconClues {
+	readonly IconClues: IPropertyValueIconClues;
+	readonly ObjVer: IObjVer;
+	readonly PropertyValues: IPropertyValues;
+	Clone(): IPropertyValuesWithIconClues;
+}
+
+interface IPropertyValuesWithIconCluesOfMultipleObjects {
+	readonly Count: number;
+	Clone(): IPropertyValuesWithIconCluesOfMultipleObjects;
+	Item(Index: number): IPropertyValuesWithIconClues;
+}
+
+interface IReportAccessCredentials {
+	readonly Domain: string;
+	readonly ExtAccount: boolean;
+	readonly Password: string;
+	readonly UserName: string;
+}
+
+interface IRestoreJob {
+	BackupFileDifferential: string;
+	BackupFileFull: string;
+	Impersonation: IImpersonation;
+	OverwriteExistingFiles: boolean;
+	VaultProperties: IVaultProperties;
+}
+
+interface IScheduledJob {
+	readonly BackupVaultJob: IBackupJob;
+	Enabled: boolean;
+	readonly ExportContentJob: IExportContentJob;
+	ID: number;
+	readonly ImportContentJob: IImportContentJob;
+	JobName: string;
+	JobType: MFiles.MFScheduledJobType;
+	readonly OptimizeVaultJob: IOptimizeVaultJob;
+	Temporary: boolean;
+	Triggers: IScheduledJobTriggers;
+	SetBackupVaultJob(BackupVaultJob: IBackupJob): void;
+	SetExportContentJob(ExportContentJob: IExportContentJob): void;
+	SetImportContentJob(ImportContentJob: IImportContentJob): void;
+	SetOptimizeVaultJob(OptimizeVaultJob: IOptimizeVaultJob): void;
+}
+
+interface IScheduledJobOutputInfo {
+	ID: number;
+	JobType: MFiles.MFScheduledJobType;
+	Message: string;
+}
+
+interface IScheduledJobRunInfo {
+	readonly Cancelled: boolean;
+	readonly CurrentStep: number;
+	readonly LastRun: ITimestamp;
+	readonly LastRunErrors: string;
+	readonly LastRunSucceeded: boolean;
+	readonly NextRun: ITimestamp;
+	readonly Running: boolean;
+	readonly ScheduledJobOutputInfo: IScheduledJobOutputInfo;
+	readonly StepCompletionPercent: number;
+}
+
+interface IScheduledJobs {
+	readonly Count: number;
+	Item(Index: number): IScheduledJob;
+}
+
+interface IScheduledJobTrigger {
+	BeginDay: number;
+	BeginMonth: number;
+	BeginYear: number;
+	EndDay: number;
+	EndMonth: number;
+	EndYear: number;
+	StartHour: number;
+	StartMinute: number;
+	Type: ITriggerType;
+	ValidEndDate: boolean;
+	Clone(): IScheduledJobTrigger;
+}
+
+interface IScheduledJobTriggers {
+	readonly Count: number;
+	Add(Index: number, ScheduledJobTrigger: IScheduledJobTrigger): void;
+	Clone(): IScheduledJobTriggers;
+	Item(Index: number): IScheduledJobTrigger;
+	Remove(Index: number): void;
+}
+
+interface ISearchCondition {
+	ConditionType: MFiles.MFConditionType;
+	Expression: IExpression;
+	TypedValue: ITypedValue;
+	Clone(): ISearchCondition;
+	Set(Expression: IExpression, ConditionType: MFiles.MFConditionType, TypedValue: ITypedValue): void;
+}
+
+interface ISearchConditionEx {
+	Enabled: boolean;
+	Ignored: boolean;
+	SearchCondition: ISearchCondition;
+	SpecialNULL: boolean;
+	Clone(): ISearchConditionEx;
+	Set(SearchCondition: ISearchCondition, Enabled: boolean, SpecialNULL: boolean, Ignored: boolean): void;
+}
+
+interface ISearchConditionExs {
+	readonly Count: number;
+	Add(Index: number, SearchConditionEx: ISearchConditionEx): void;
+	Clone(): ISearchConditionExs;
+	Item(Index: number): ISearchConditionEx;
+	Item(Index: number, value: ISearchConditionEx): void;
+	Remove(Index: number): void;
+}
+
+interface ISearchConditions {
+	readonly Count: number;
+	Add(Index: number, SearchCondition: ISearchCondition): void;
+	AppendFromExportedSearchString(ExportedSearchString: string): void;
+	Clone(): ISearchConditions;
+	GetAsExportedSearchString(SearchFlags: MFiles.MFSearchFlags): string;
+	Item(Index: number): ISearchCondition;
+	Item(Index: number, value: ISearchCondition): void;
+	Remove(Index: number): void;
+}
+
+interface ISearchCriteria {
+	AdditionalConditions: ISearchConditionExs;
+	ExpandUI: boolean;
+	FacetFilterAsJSON: string;
+	FacetFilterStatusFlags: MFiles.MFFacetFilterStatusFlags;
+	FirstCondition: ISearchConditionEx;
+	FullTextSearchFlags: MFiles.MFFullTextSearchFlags;
+	FullTextSearchString: string;
+	ObjectTypeCondition: ISearchConditionEx;
+	PredefinedSearchFilter: MFiles.MFPredefinedSearchFilterType;
+	PreviousBaseConditions: ISearchConditions;
+	SearchFlags: MFiles.MFSearchFlags;
+	SearchRefinement: ISearchConditions;
+	SearchWithinThisFolder: boolean;
+	SecondCondition: ISearchConditionEx;
+	Clone(): ISearchCriteria;
+	GetAsSearchConditions(ForceGettingExpandedConds: boolean, IncludeSearchRefinementConditions: boolean, IncludePreviousBaseConditions: boolean): ISearchConditions;
+}
+
+interface ISearchDef {
+	Conditions: ISearchConditions;
+	Levels: IExpressionExs;
+	LookInAllVersions: boolean;
+	ReturnLatestVisibleVersion: boolean;
+	SearchFlags: MFiles.MFSearchFlags;
+	Clone(): ISearchDef;
+	IsIndirectionUsed(): boolean;
+}
+
+interface ISearchPane {
+	readonly Available: boolean;
+	readonly Events: ISearchPaneEvents;
+	Visible: boolean;
+	SetTheme(theme: ITheme): void;
+}
+
+interface ISearchPaneEvents extends IEvents {
+	OnHidePane?(): void;
+	OnShowPane?(): void;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface ISemanticAliases {
+	Value: string;
+	Clone(): ISemanticAliases;
+}
+
+interface IServerDataPushSink {
+	OnServerDataPush(RequestID: number, JsonDataContent: string): void;
+}
+
+interface IServerLicenseManagementOperations {
+	GetLicenseStatus(): ILicenseStatus;
+	SetLicenseCodeAndSerialNumber(SerialNumber: string, LicenseCode: string): void;
+}
+
+interface IServerLoginAccountOperations {
+	AddLoginAccount(LoginAccount: ILoginAccount, Password: string): void;
+	ForceLogout(AccountNames: IStrings): void;
+	GetLoginAccount(AccountName: string): ILoginAccount;
+	GetLoginAccounts(): ILoginAccounts;
+	GetLoginAccountsWithSessions(): ILoginAccounts;
+	GetPersonalInformationFromDomain(AccountName: string): ILoginAccountPersonalInformation;
+	ModifyLoginAccount(LoginAccount: ILoginAccount): void;
+	RemoveLoginAccount(AccountName: string): void;
+	UpdateLoginPassword(AccountName: string, NewPassword: string): void;
+}
+
+interface IServerManagementOperations {
+	BackupMasterDB(BackupFile: string, OverwriteExistingFiles: boolean, FileSizeLimitInMB: number, Impersonation: IImpersonation): void;
+	ConfigureWebAccessToDefaultWebSite(): void;
+	ConfigureWebAccessToExistingWebSite(WebSite: string): void;
+	ConfigureWebAccessToNewVirtualDirectory(WebSite: string, VirtualDirectory: string): void;
+	ConfigureWebAccessToNewWebSite(WebSite: string, Port: string): void;
+	GetEventHandlers(): IEventHandlers;
+	RestoreMasterDB(BackupFile: string, Impersonation: IImpersonation): void;
+	SetEventHandlers(EventHandlers: IEventHandlers): void;
+}
+
+interface IServerScheduledJobManagementOperations {
+	AddScheduledJob(ScheduledJob: IScheduledJob): number;
+	CancelScheduledJob(ID: number): void;
+	GetScheduledJob(ID: number): IScheduledJob;
+	GetScheduledJobRunInfo(ID: number): IScheduledJobRunInfo;
+	GetScheduledJobs(): IScheduledJobs;
+	ModifyScheduledJob(ScheduledJob: IScheduledJob): void;
+	RemoveScheduledJob(ID: number): void;
+	StartScheduledJob(ID: number): void;
+}
+
+interface IServerVaultManagementOperations {
+	AttachVault(VaultProperties: IVaultProperties, UpdateAttachmentGUID: boolean): IVaultProperties;
+	AttachVaultWithOptions(VaultProperties: IVaultProperties, Options: IAttachVaultOptions): IVaultProperties;
+	BackupVault(BackupJob: IBackupJob): void;
+	BringVaultOnline(VaultGUID: string): void;
+	CopyVault(CopyVaultJob: ICopyVaultJob): ICopyVaultJobOutputInfo;
+	CreateNewVault(VaultProperties: IVaultProperties): string;
+	DestroyVault(VaultGUID: string): void;
+	DetachVault(VaultGUID: string): void;
+	GetBackupFileContents(BackupFileFull: string, BackupFileDifferential: string, Impersonation: IImpersonation): IVaultProperties;
+	GetVaultProperties(VaultGUID: string): IVaultProperties;
+	OptimizeVault(OptimizeVaultJob: IOptimizeVaultJob): void;
+	RestoreVault(RestoreJob: IRestoreJob): void;
+	TakeVaultOffline(VaultGUID: string, DisconnectUsers: boolean): void;
+}
+
+interface ISessionInfo {
+	readonly AccountName: string;
+	readonly ACLMode: MFiles.MFACLMode;
+	readonly AuthenticationType: MFiles.MFAuthType;
+	readonly CanCreateObjects: boolean;
+	readonly CanForceUndoCheckout: boolean;
+	readonly CanManageCommonUISettings: boolean;
+	readonly CanManageCommonViews: boolean;
+	readonly CanManageTraditionalFolders: boolean;
+	readonly CanMaterializeViews: boolean;
+	readonly CanSeeAllObjects: boolean;
+	readonly CanSeeDeletedObjects: boolean;
+	readonly ClientCulture: string;
+	readonly InternalUser: boolean;
+	readonly IsSharingPublicLinksAllowed: boolean;
+	readonly IsSharingPublicLinksToLatestVersionAllowed: boolean;
+	readonly KeepAliveIntervalInSeconds: number;
+	readonly Language: number;
+	readonly LicenseAllowsModifications: boolean;
+	readonly LocalComputerName: string;
+	readonly ProductMode: MFiles.MFProductMode;
+	readonly ServerVersion: number;
+	readonly TimeZoneInfo: ITimeZoneInformation;
+	readonly UserAndGroupMemberships: IUserOrUserGroupIDs;
+	readonly UserAndSubstitutedByMe: IUserOrUserGroupIDs;
+	readonly UserID: number;
+	readonly VaultGUID: string;
+	CheckObjectAccess(ObjectAccessControlList: IAccessControlList, DesiredObjectAccess: MFiles.MFObjectAccess): boolean;
+	CheckObjectTypeAccess(ObjectTypeAccessControlList: IAccessControlList, DesiredObjectTypeAccess: MFiles.MFObjectTypeAccess): boolean;
+	CheckPropertyDefAccess(PropertyDefAccessControlList: IAccessControlList, DesiredPropertyDefAccess: MFiles.MFPropertyDefAccess): boolean;
+	CheckVaultAccess(DesiredVaultAccess: MFiles.MFVaultAccess): boolean;
+	CloneFrom(SessionInfo: ISessionInfo): void;
+	IsLoggedOnUserSubstituteOfUser(UserID: number): boolean;
+}
+
+interface ISetPropertiesParams {
+	AccessControlListEnforcingMode: MFiles.MFACLEnforcingMode;
+	AccessControlListProvidedForEnforcing: IAccessControlList;
+	AllowModifyingCheckedInObject: boolean;
+	FailIfNotLatestCheckedInVersion: boolean;
+	FullSet: boolean;
+	ObjVer: IObjVer;
+	PropertyValuesToRemove: IIDs;
+	PropertyValuesToSet: IPropertyValues;
+	Clone(): ISetPropertiesParams;
+	SetWithPermissions(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, FailIfNotLatestCheckedInVersion: boolean, PropertyValuesToSet: IPropertyValues, FullSet: boolean, PropertyValuesToRemove: IIDs, ObjectOperationFlags: MFiles.MFObjectOperationFlags, AccessControlListEnforcingMode: MFiles.MFACLEnforcingMode, AccessControlListProvidedForEnforcing: IAccessControlList): void;
+}
+
+interface ISetPropertiesParamsOfMultipleObjects {
+	readonly Count: number;
+	Add(Index: number, SetPropertiesParams: ISetPropertiesParams): void;
+	Clone(): ISetPropertiesParamsOfMultipleObjects;
+	Item(Index: number): ISetPropertiesParams;
+	Remove(Index: number): void;
+}
+
+interface ISharedFileInfo {
+	readonly ChangeTimeUtc: Date;
+	readonly Extension: string;
+	readonly LogicalSize: number;
+	readonly LogicalSize_32bit: number;
+	readonly Title: string;
+	Clone(): ISharedFileInfo;
+}
+
+interface ISharedLinkInfo {
+	readonly AccessKey: string;
+	readonly CreatedByUser: number;
+	readonly CreationTime: ITimestamp;
+	Description: string;
+	ExpirationTime: ITimestamp;
+	FileVer: IFileVer;
+	ObjVer: IObjVer;
+	Clone(): ISharedLinkInfo;
+	Set(ObjVer: IObjVer, FileVer: IFileVer): void;
+}
+
+interface ISharedLinkInfos {
+	readonly Count: number;
+	Add(Index: number, SharedLink: ISharedLinkInfo): void;
+	Clone(): ISharedLinkInfos;
+	Item(Index: number): ISharedLinkInfo;
+	Item(Index: number, value: ISharedLinkInfo): void;
+	Remove(Index: number): void;
+}
+
+interface ISharedLinkPublicOperations {
+	DownloadSharedFileInBlocks_Begin(VaultGUID: string, AccessKey: string, AdditionalData: INamedValues): IFileDownloadSession;
+	DownloadSharedFileInBlocks_Begin_32bit(VaultGUID: string, AccessKey: string, AdditionalData: INamedValues): IFileDownloadSession;
+	DownloadSharedFileInBlocks_ReadBlock(VaultGUID: string, AccessKey: string, DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
+	DownloadSharedFileInBlocks_ReadBlock_32bit(VaultGUID: string, AccessKey: string, DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
+	GetSharedLinkInfo(VaultGUID: string, AccessKey: string, AdditionalData: INamedValues): ISharedFileInfo;
+}
+
+interface IShellFrame {
+	readonly ActiveListing: IShellListing;
+	readonly BottomPane: IShellPaneContainer;
+	readonly Commands: ICommands;
+	readonly CurrentFolder: IFolderDefs;
+	readonly CurrentObjectVersion: IObjectVersion;
+	CurrentPath: string;
+	readonly Events: IShellFrameEvents;
+	readonly Listing: IShellListing;
+	readonly OuterWindow: IWindow;
+	readonly ParentFolder: IFolderDefs;
+	readonly RightPane: IShellPaneContainer;
+	readonly SearchPane: ISearchPane;
+	readonly ShellUI: IShellUI;
+	readonly TaskPane: ITaskPane;
+	readonly UseCompactLayout: boolean;
+	CreateAdditionalListingForPath(path: string): IShellListing;
+	CreateAdditionalListingForView(viewID: MFiles.MFBuiltInView | number): IShellListing;
+	GetListing(listingIndex: number): IShellListing;
+	IsFolderLocation(): boolean;
+	IsObjectLocation(): boolean;
+	NavigateToParent(): void;
+	SetTheme(theme: ITheme): void;
+	ShowDashboard(dashboardID: string, data: any): void;
+	ShowDefaultContent(): void;
+	ShowMessage(message: string | IMessage): number;
+	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
+	ShowPopupSSRSReport(reportWindowTitle: string, reportURL: string): void;
+	ShowSSRSReport(reportURL: string): void;
+}
+
+interface IShellFrameEvent extends IEvents {
+	OnActiveListingChanged?(oldListing: null | IShellListing, newListing: IShellListing): void;
+	OnNewBottomPane?(bottomPane: IShellPaneContainer): void | IShellPaneContainerEvents;
+	OnNewCommands?(commands: ICommands): void | ICommandsEvents;
+	OnNewRightPane?(rightPane: IShellPaneContainer): void | IShellPaneContainerEvents;
+	OnNewSearchPane?(searchPane: ISearchPane): void | ISearchPaneEvents;
+	OnNewShellListing?(shellListing: IShellListing): void | IShellListingEvents;
+	OnNewTaskPane?(taskPane: ITaskPane): void | ITaskPaneEvents;
+	OnShowMainMenu?(): void;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface IShellFrameEvents extends IEvents {
+	OnActiveListingChanged?(oldListing: null | IShellListing, newListing: IShellListing): void;
+	OnNewBottomPane?(bottomPane: IShellPaneContainer): void | IShellPaneContainerEvents;
+	OnNewCommands?(commands: ICommands): void | ICommandsEvents;
+	OnNewRightPane?(rightPane: IShellPaneContainer): void | IShellPaneContainerEvents;
+	OnNewSearchPane?(searchPane: ISearchPane): void | ISearchPaneEvents;
+	OnNewShellListing?(shellListing: IShellListing): void | IShellListingEvents;
+	OnNewTaskPane?(taskPane: ITaskPane): void | ITaskPaneEvents;
+	OnShowMainMenu?(): void;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface IShellItems {
+	readonly Count: number;
+	readonly Folders: IFolderDefs;
+	readonly ObjectFiles: IObjectFileAndObjVerOfMultipleFiles;
+	readonly ObjectVersions: IObjectVersions;
+	readonly ObjectVersionsAndProperties: IObjectVersionAndPropertiesOfMultipleObjects;
+	GetObjectVersionsCount(): number;
+}
+
+interface IShellListing {
+	AutoFitAllColumns: boolean;
+	AutoFitFirstColumn: boolean;
+	ColumnHeadersVisible: boolean;
+	readonly CurrentPath: string;
+	readonly CurrentSelection: IShellItems;
+	readonly Events: IShellListingEvents;
+	GroupObjectsByObjectType: boolean;
+	GroupViewsAndFolders: boolean;
+	readonly IsActive: boolean;
+	readonly Items: IShellItems;
+	readonly SumOfResultCounts: number;
+	ActivateListing(): void;
+	ActivateSelected(): void;
+	RefreshListing(smartUpdate: boolean, refreshFromServer: boolean, forceFullRefreshFromServer: boolean): void;
+	RefreshListingAsync(): void;
+	RefreshObject(objID: IObjID, refreshFromServer: boolean, updateRelatedObjects: boolean): void;
+	RefreshSelectedObjects(refreshFromServer: boolean, updateRelatedObjects: boolean): void;
+	SelectFolder(folderDef: IFolderDef): void;
+	SelectNextFolder(folderDefType: MFiles.MFFolderDefType): boolean;
+	SelectNextObject(): boolean;
+	SelectNextObjectFile(allowMoveToNextObject: boolean): boolean;
+	SelectObjectFile(objVer: IObjVer, fileVer: IFileVer): void;
+	SelectObjectOrObjectFileVersion(objOrFileVer: IObjOrFileVer): void;
+	SelectObjectVersion(objVer: IObjVer): void;
+	SelectPrevFolder(folderDefType: MFiles.MFFolderDefType): boolean;
+	SelectPrevObject(): boolean;
+	SelectPrevObjectFile(allowMoveToPrevObject: boolean): boolean;
+	SetFolderSelectionStates(folderDefs: IFolderDefs, select: boolean): void;
+	SetObjectOrObjectFileVersionSelectionStates(objOrFileVers: IObjOrFileVers, select: boolean): void;
+	SetObjectVersionSelectionStates(objVers: IObjVers, select: boolean): void;
+	SetTheme(theme: ITheme): void;
+	SetVirtualSelection(objOrFileVers: IObjOrFileVers): void;
+	UnselectAll(): void;
+}
+
+interface IShellListingEvents extends IEvents {
+	OnContentChanged?(items: IShellItems): void;
+	OnListingActivated?(oldListing: null | IShellListing): void;
+	OnListingDeactivated?(newListing: null | IShellListing): void;
+	OnSelectedItemsChanged?(selectedItems: IShellItems): void;
+	OnSelectionChanged?(selectedItems: IShellItems): void;
+	OnShowContextMenu?(selectedItems: IShellItems): void;
+	OnShowMainMenu?(selectedItems: IShellItems): void;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface IShellPaneContainer {
+	readonly Content: any;
+	readonly Events: IShellPaneContainerEvents;
+	readonly IsFocused: boolean;
+	Minimized: boolean;
+	readonly ShellFrame: IShellFrame;
+	Size: number;
+	readonly TabTitleSize: number;
+	Visible: boolean;
+	AddTab(TabId: string, tabTitle: string, insertBeforeTabId: string): IShellPaneTab;
+	Focus(): void;
+	GetSelectedTab(): IShellPaneTab;
+	GetTab(TabId: string): IShellPaneTab;
+	SetDefaultSize(defaultSize: number, resizeToDefault: boolean): void;
+	SetDefaultVisibility(Visible: boolean, resetToDefault: boolean): void;
+}
+
+interface IShellPaneContainerEvents extends IEvents {
+	OnHidePane?(): void;
+	OnMinimizedStateChanged?(): void;
+	OnNewTab?(tab: IShellPaneTab): void;
+	OnPaneResized?(): void;
+	OnShowPane?(): void;
+	OnStarted?(): void;
+	OnStop?(): void;
+	OnTabSelected?(): void;
+	OnTabUnselected?(): void;
+}
+
+interface IShellPaneTab {
+	readonly Events: IShellPaneTabEvents;
+	readonly IsBuiltIn: boolean;
+	readonly Selected: boolean;
+	readonly TabId: string;
+	Title: string;
+	Visible: boolean;
+	Remove(): void;
+	Select(): void;
+	ShowDashboard(dashboardID: string, data: any): void;
+	ShowEmptyContent(): void;
+	ShowFilePreview(file: string): void;
+	ShowObjectVersionProperties(propertyValuesWithIcons: IPropertyValuesWithIconClues): void;
+	ShowPersistentContent(sessionHandle: number): void;
+	ShowSSRSReport(reportURL: string): void;
+	Unselect(): void;
+}
+
+interface IShellPaneTabEvents extends IEvents {
+	OnHideTab?(): void;
+	OnShowTab?(): void;
+	OnStarted?(): void;
+	OnStop?(): void;
+	OnTabSelected?(): void;
+	OnTabUnselected?(): void;
+}
+
+interface IShellUI {
+	readonly Events: IShellUIEvents;
+	readonly ServerVault: IVault;
+	readonly Vault: IVault;
+	readonly Window: IWindow;
+	CreatePersistentBrowserContent(url: string, parameters: any): number;
+	DestroyPersistentContent(sessionHandle: number): void;
+	GetObjectTypeIconURL(objtype: number): string;
+	NotifyVaultEntry(ID: string, data1: any, data2: any): any;
+	SetPersistentBrowserContent(url: string, sessionHandle: number): void;
+	ShowMessage(message: string | IMessage): number;
+	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
+}
+
+interface IShellUIEvents extends IEvents {
+	OnNewCommonDialogShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
+	OnNewEmbeddedShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
+	OnNewNormalShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
+	OnNewShellFrame?(shellFrame: IShellFrame): void | IShellFrameEvents;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface IShortcutMappingInfo {
+	ObjectTypeGUID: string;
+	ObjectTypeID: number;
+	ObjectTypeName: string;
+	ObjectTypeSemanticAliases: ISemanticAliases;
+}
+
+interface ISignaturePromptInfo {
+	Meaning: string;
+	Reason: string;
+	Clone(): ISignaturePromptInfo;
+}
+
+interface ISignaturePromptInfoMetadataBased {
+	IsReferencedBySignatureObject: boolean;
+	MeaningPropertyID: number;
+	PromptInfoLookupPropertyID: number;
+	ReasonPropertyID: number;
+	Clone(): ISignaturePromptInfoMetadataBased;
+}
+
+interface ISignaturePromptInfos {
+	readonly Count: number;
+	Add(Index: number, SignaturePromptInfo: ISignaturePromptInfo): void;
+	Clone(): ISignaturePromptInfos;
+	Item(Index: number): ISignaturePromptInfo;
+	Item(Index: number, value: ISignaturePromptInfo): void;
+	Remove(Index: number): void;
+}
+
+interface ISignaturePromptInfoSelectable {
+	PromptInfos: ISignaturePromptInfos;
+	Clone(): ISignaturePromptInfoSelectable;
+}
+
+interface ISignatureSettings {
+	AdditionalInfo: string;
+	FreeFormTextPropertyID: number;
+	IsFreeFormTextPrompted: boolean;
+	IsRequired: boolean;
+	IsSeparateSignatureObject: boolean;
+	ManifestationPropertyID: number;
+	readonly PromptInfoType: MFiles.MFSignaturePromptInfoType;
+	SignatureIdentifier: string;
+	SignaturePromptInfoFixed: ISignaturePromptInfo;
+	SignaturePromptInfoMetadataBased: ISignaturePromptInfoMetadataBased;
+	SignaturePromptInfoSelectable: ISignaturePromptInfoSelectable;
+	Clone(): ISignatureSettings;
+}
+
+interface ISourceObjectFile {
+	Extension: string;
+	SourceFilePath: string;
+	Title: string;
+	Clone(): ISourceObjectFile;
+}
+
+interface ISourceObjectFiles {
+	readonly Count: number;
+	Add(Index: number, SourceObjectFile: ISourceObjectFile): void;
+	AddEmptyFile(Title: string, Extension: string): ISourceObjectFile;
+	AddFile(Title: string, Extension: string, SourcePath: string): ISourceObjectFile;
+	Item(Index: number): ISourceObjectFile;
+	Remove(Index: number): void;
+}
+
+interface ISQLDatabase {
+	AdminUser: IImpersonation;
+	BasicUser: IImpersonation;
+	Engine: MFiles.MFDBEngine;
+	Name: string;
+	Server: string;
+	Clone(): ISQLDatabase;
+}
+
+interface IState {
+	readonly ID: number;
+	Name: string;
+	Selectable: boolean;
+	SelectableFlagAffectedByPseudoUsers: boolean;
+	GetAsLookup(): ILookup;
+	GetAsTypedValue(): ITypedValue;
+}
+
+interface IStateAdmin {
+	ActionAssignToUser: boolean;
+	ActionAssignToUserDefinition: IActionCreateAssignment;
+	ActionConvertToPDF: boolean;
+	ActionConvertToPDFDefinition: IActionConvertToPDF;
+	ActionCreateSeparateAssignment: boolean;
+	ActionDefinitions: IActionDefinitions;
+	ActionDelete: boolean;
+	ActionMarkForArchiving: boolean;
+	ActionRunVBScript: boolean;
+	ActionRunVBScriptDefinition: string;
+	ActionSendNotification: boolean;
+	ActionSendNotificationDefinition: IActionSendNotification;
+	ActionSetPermissions: boolean;
+	ActionSetPermissionsDetailedDefinition: IActionSetPermissions;
+	ActionSetProperties: boolean;
+	ActionSetPropertiesDefinition: IActionSetProperties;
+	CheckInOutPermissions: boolean;
+	Description: string;
+	ID: number;
+	InOutPermissions: IAccessControlList;
+	Name: string;
+	Postconditions: IStateConditions;
+	Preconditions: IStateConditions;
+	SemanticAliases: ISemanticAliases;
+	TransitionsRequireEditAccessToObject: boolean;
+	Clone(): IStateAdmin;
+}
+
+interface IStateConditions {
+	PropertyConditions: boolean;
+	PropertyConditionsDefinition: ISearchConditions;
+	VBScript: boolean;
+	VBScriptDefinition: string;
+	Clone(): IStateConditions;
+}
+
+interface IStates {
+	readonly Count: number;
+	Item(Index: number): IState;
+}
+
+interface IStatesAdmin {
+	readonly Count: number;
+	Add(Index: number, StateAdmin: IStateAdmin): void;
+	Item(Index: number): IStateAdmin;
+	Remove(Index: number): void;
+}
+
+interface IStateTransition {
+	AccessControlList: IAccessControlList;
+	Description: string;
+	EvaluationOrderNumber: number;
+	FromState: number;
+	ID: number;
+	Name: string;
+	SemanticAliases: ISemanticAliases;
+	SignatureSettings: ISignatureSettings;
+	ToState: number;
+	TriggerAllowedByVBScript: string;
+	TriggerCriteria: ISearchConditions;
+	TriggerInDays: number;
+	TriggerMode: MFiles.MFAutoStateTransitionMode;
+	Clone(): IStateTransition;
+}
+
+interface IStateTransitionForClient {
+	FromState: number;
+	readonly ID: number;
+	Name: string;
+	Selectable: boolean;
+	SelectableFlagAffectedByPseudoUsers: boolean;
+	ToState: number;
+	Clone(): IStateTransitionForClient;
+	GetAsLookup(): ILookup;
+	GetAsTypedValue(): ITypedValue;
+}
+
+interface IStateTransitions {
+	readonly Count: number;
+	Add(Index: number, StateTransition: IStateTransition): void;
+	Item(Index: number): IStateTransition;
+	Remove(Index: number): void;
+}
+
+interface IStateTransitionsForClient {
+	readonly Count: number;
+	Add(Index: number, StateTransitionForClient: IStateTransitionForClient): void;
+	Clone(): IStateTransitionsForClient;
+	Item(Index: number): IStateTransitionForClient;
+	Item(Index: number, value: IStateTransitionForClient): void;
+	Remove(Index: number): void;
+}
+
+interface IStringData {
+	AsString: string;
+	readonly StringDataType: MFiles.MFStringDataType;
+	Clone(): IStringData;
+}
+
+interface IStrings {
+	readonly Count: number;
+	Add(Index: number, Item: string): void;
+	Clone(): IStrings;
+	CloneFrom(Strings: IStrings): void;
+	Item(Index: number): string;
+	Join(Separator: string): string;
+	Remove(Index: number): void;
+}
+
+interface ITaskAssignmentClassInfo {
+	AnyAssigneeCompletes: boolean;
+	SignatureForCompletion: ISignatureSettings;
+	Clone(): ITaskAssignmentClassInfo;
+}
+
+interface ITaskPane {
+	readonly Available: boolean;
+	readonly Events: ITaskPaneEvents;
+	Visible: boolean;
+	AddCustomCommandToGroup(customCommand: number, group: number, orderPriority: number): void;
+	CreateGroup(groupName: string, priority: number): number;
+	DeleteGroup(groupID: number): void;
+	RemoveCustomCommandFromGroup(customCommand: number, group: number): void;
+	SetLogo(filename: string): void;
+	SetTheme(theme: ITheme): void;
+}
+
+interface ITaskPaneEvents extends IEvents {
+	OnHidePane?(): void;
+	OnShowPane?(): void;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface ITemporarySearchView {
+	readonly BaseSearchConditions: ISearchConditions;
+	SearchCriteria: ISearchCriteria;
+	readonly View: IView;
+}
+
+interface ITheme {
+	[key: string]: (string | boolean | number);
+	last: 0;
+}
+
+interface ITimestamp {
+	Day: number;
+	Fraction: number;
+	Hour: number;
+	Minute: number;
+	Month: number;
+	Second: number;
+	Year: number;
+	Clone(): ITimestamp;
+	GetValue(): any;
+	LocalTimeToUtc(): ITimestamp;
+	SetValue(Value: any): void;
+	UtcToLocalTime(): ITimestamp;
+}
+
+interface ITimeZoneInformation {
+	readonly StandardName: string;
+	LoadTimeZoneByName(TimeZoneName: string): void;
+	LoadWithCurrentTimeZone(): void;
+}
+
+interface ITraditionalFolder {
+	readonly ID: number;
+	readonly Name: string;
+}
+
+interface ITraditionalFolderContents {
+	readonly ID: number;
+	readonly ObjectVersions: IObjectVersions;
+	readonly TraditionalFolders: ITraditionalFolders;
+}
+
+interface ITraditionalFolders {
+	readonly Count: number;
+	Item(Index: number): ITraditionalFolder;
+}
+
+interface ITriggerType {
+	readonly Daily: IDailyTrigger;
+	readonly MonthlyDate: IMonthlyDateTrigger;
+	readonly MonthlyDOW: IMonthlyDOWTrigger;
+	Type: MFiles.MFTriggerType;
+	readonly Weekly: IWeeklyTrigger;
+	Clone(): ITriggerType;
+	SetDailyTrigger(DailyTrigger: IDailyTrigger): void;
+	SetMonthlyDate(MonthlyDateTrigger: IMonthlyDateTrigger): void;
+	SetMonthlyDOW(MonthlyDOWTrigger: IMonthlyDOWTrigger): void;
+	SetWeekly(WeeklyTrigger: IWeeklyTrigger): void;
+}
+
+interface ITypedValue {
+	readonly DataType: MFiles.MFDataType;
+	readonly DisplayValue: string;
+	Value: any;
+	Clone(): ITypedValue;
+	CloneFrom(TypedValue: ITypedValue): void;
+	CompareTo(TypedValue: ITypedValue): number;
+	GetLookupID(): number;
+	GetValueAsLocalizedText(): string;
+	GetValueAsLookup(): ILookup;
+	GetValueAsLookups(): ILookups;
+	GetValueAsText(Localized: boolean, NULLAsEmptyString: boolean, EmptyLookupDisplayValuesAsHidden: boolean, LongDateFormat: boolean, NoSeconds: boolean, NumericValueAsKilobytes: boolean): string;
+	GetValueAsTextWithExpression(Expression: IExpression, Locale: number): string;
+	GetValueAsTimestamp(): ITimestamp;
+	GetValueAsUnlocalizedText(): string;
+	IsNULL(): boolean;
+	IsUninitialized(): boolean;
+	Serialize(): ReadonlyArray<number>;
+	SetValue(DataType: MFiles.MFDataType, Value: any): void;
+	SetValueToLookup(Lookup: ILookup): void;
+	SetValueToMultiSelectLookup(MultiSelectLookup: ILookups): void;
+	SetValueToNULL(DataType: MFiles.MFDataType): void;
+	Unserialize(Bytes: ReadonlyArray<number>, ReadFromOldSerializingFormat: boolean): void;
+}
+
+interface ITypedValues {
+	readonly Count: number;
+	Add(Index: number, TypedValue: ITypedValue): void;
+	Item(Index: number): ITypedValue;
+	Remove(Index: number): void;
+}
+
+interface IUserAccount {
+	AccessControlList: IAccessControlList;
+	Enabled: boolean;
+	ID: number;
+	InternalUser: boolean;
+	LoginName: string;
+	VaultLanguage: number;
+	VaultRoles: MFiles.MFUserAccountVaultRole;
+	AddVaultRoles(VaultRolesToAdd: MFiles.MFUserAccountVaultRole): void;
+	Clone(): IUserAccount;
+	CloneFrom(UserAccount: IUserAccount): void;
+	RemoveVaultRoles(VaultRolesToRemove: MFiles.MFUserAccountVaultRole): void;
+}
+
+interface IUserAccounts {
+	readonly Count: number;
+	Item(Index: number): IUserAccount;
+}
+
+interface IUserGroup {
+	ID: number;
+	Members: IIDs;
+	Name: string;
+	readonly Predefined: boolean;
+	AddMember(ID: number): void;
+	Clone(): IUserGroup;
+	CloneFrom(UserGroup: IUserGroup): void;
+	RemoveMember(ID: number): void;
+}
+
+interface IUserGroupAdmin {
+	AccessControlList: IAccessControlList;
+	SemanticAliases: ISemanticAliases;
+	UserGroup: IUserGroup;
+	Clone(): IUserGroupAdmin;
+	CloneFrom(UserGroupAdmin: IUserGroupAdmin): void;
+}
+
+interface IUserGroups {
+	readonly Count: number;
+	Item(Index: number): IUserGroup;
+}
+
+interface IUserGroupsAdmin {
+	readonly Count: number;
+	Item(Index: number): IUserGroupAdmin;
+}
+
+interface IUserOrUserGroupID {
+	UserOrGroupID: number;
+	UserOrGroupType: MFiles.MFUserOrUserGroupType;
+	Clone(): IUserOrUserGroupID;
+}
+
+interface IUserOrUserGroupIDEx {
+	readonly IndirectProperty: IIndirectPropertyID;
+	readonly UserOrGroupID: number;
+	readonly UserOrGroupType: MFiles.MFUserOrUserGroupType;
+	readonly WorkflowState: number;
+	Clone(): IUserOrUserGroupIDEx;
+	SetIndirectPropertyPseudoUser(PseudoUserID: IIndirectPropertyID): void;
+	SetUserAccount(UserAccount: number): void;
+	SetUserGroup(UserGroup: number): void;
+	SetWorkflowStatePseudoUser(WorkflowState: number): void;
+}
+
+interface IUserOrUserGroupIDExs {
+	readonly Count: number;
+	Add(Index: number, UserOrUserGroupIDEx: IUserOrUserGroupIDEx): void;
+	Clone(): IUserOrUserGroupIDExs;
+	GetUserOrUserGroupIDEx(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): IUserOrUserGroupIDEx;
+	GetUserOrUserGroupIDExIndex(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): number;
+	Item(Index: number): IUserOrUserGroupIDEx;
+	Remove(Index: number): void;
+}
+
+interface IUserOrUserGroupIDs {
+	readonly Count: number;
+	Add(Index: number, UserOrUserGroupID: IUserOrUserGroupID): void;
+	Clone(): IUserOrUserGroupIDs;
+	GetUserOrUserGroupID(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): IUserOrUserGroupID;
+	GetUserOrUserGroupIDIndex(UserOrGroupID: number, UserOrGroupType: MFiles.MFUserOrUserGroupType): number;
+	Item(Index: number): IUserOrUserGroupID;
+	Remove(Index: number): void;
+}
+
+interface IValidation {
+	RegularExpression: string;
+	VBScript: string;
+	Clone(): IValidation;
+}
+
+interface IValueListItem {
+	AutomaticPermissionsForObjects: IAutomaticPermissions;
+	readonly Deleted: boolean;
+	readonly DisplayID: string;
+	readonly DisplayIDAvailable: boolean;
+	HasOwner: boolean;
+	HasParent: boolean;
+	Icon: ReadonlyArray<number>;
+	ID: number;
+	readonly ItemGUID: string;
+	Name: string;
+	OwnerID: number;
+	ParentID: number;
+	ValueListID: (MFiles.MFBuiltInValueList | number);
+	Clone(): IValueListItem;
+	CloneFrom(ValueListItem: IValueListItem): void;
+	GetIconAsPNG(Width: number, Height: number): ReadonlyArray<number>;
+}
+
+interface IValueListItems {
+	readonly Count: number;
+	Item(Index: number): IValueListItem;
+}
+
+interface IValueListItemSearchResults {
+	readonly Count: number;
+	MoreResults: boolean;
+	Add(Index: number, ValueListItem: IValueListItem): void;
+	Clone(): IValueListItemSearchResults;
+	Item(Index: number): IValueListItem;
+	Remove(Index: number): void;
+}
+
+interface IValueListItemSearchResultsWithPermissions {
+	readonly Permissions: IAccessControlLists;
+	readonly ValueListItemSearchResults: IValueListItemSearchResults;
+}
+
+interface IValueListItemsWithPermissions {
+	readonly Permissions: IAccessControlLists;
+	readonly ValueListItems: IValueListItems;
+}
+
+interface IVault {
+	readonly Async: IVaultAsync;
+	readonly ClassGroupOperations: IVaultClassGroupOperations;
+	readonly ClassOperations: IVaultClassOperations;
+	readonly ClientOperations: IVaultClientOperations;
+	readonly CurrentLoggedInUserID: number;
+	readonly CustomApplicationManagementOperations: IVaultCustomApplicationManagementOperations;
+	readonly DataSetOperations: IVaultDataSetOperations;
+	readonly ElectronicSignatureOperations: IVaultElectronicSignatureOperations;
+	readonly EventLogOperations: IVaultEventLogOperations;
+	readonly ExtensionMethodOperations: IVaultExtensionMethodOperations;
+	readonly ExternalObjectOperations: IVaultExternalObjectOperations;
+	readonly LoggedIn: boolean;
+	readonly LoginAccountOperations: IVaultLoginAccountOperations;
+	readonly LoginSessionID: string;
+	readonly ManagementOperations: IVaultManagementOperations;
+	readonly Name: string;
+	readonly NamedACLOperations: IVaultNamedACLOperations;
+	readonly NamedValueStorageOperations: IVaultNamedValueStorageOperations;
+	readonly NotificationOperations: IVaultNotificationOperations;
+	readonly ObjectFileOperations: IVaultObjectFileOperations;
+	readonly ObjectOperations: IVaultObjectOperations;
+	readonly ObjectPropertyOperations: IVaultObjectPropertyOperations;
+	readonly ObjectSearchOperations: IVaultObjectSearchOperations;
+	readonly ObjectTypeOperations: IVaultObjectTypeOperations;
+	readonly PropertyDefOperations: IVaultPropertyDefOperations;
+	readonly ReadOnlyAccess: boolean;
+	readonly ScheduledJobManagementOperations: IVaultScheduledJobManagementOperations;
+	readonly ServerDataPushOperations: IVaultServerDataPushOperations;
+	readonly SessionInfo: ISessionInfo;
+	readonly SharedLinkOperations: IVaultSharedLinkOperations;
+	readonly TraditionalFolderOperations: IVaultTraditionalFolderOperations;
+	readonly UserGroupOperations: IVaultUserGroupOperations;
+	readonly UserOperations: IVaultUserOperations;
+	readonly UserSettingOperations: IVaultUserSettingOperations;
+	readonly ValueListItemOperations: IVaultValueListItemOperations;
+	readonly ValueListOperations: IVaultValueListOperations;
+	readonly VaultLanguages: ILanguages;
+	readonly ViewOperations: IVaultViewOperations;
+	readonly WorkflowOperations: IVaultWorkflowOperations;
+	ChangePassword(OldPassword: string, NewPassword: string): void;
+	GetAllTranslations(): string;
+	GetGUID(): string;
+	GetMetadataStructureItemIDByAlias(MetadataStructureItemType: MFiles.MFMetadataStructureItem, Alias: string, Unused: boolean): number;
+	GetMetadataStructureVersionID(): number;
+	GetMFilesURLForVaultRoot(): string;
+	GetServerLicenseStatus(): ILicenseStatus;
+	GetServerVersionOfVault(): IMFilesVersion;
+	LogOutSilent(): void;
+	LogOutWithDialogs(ParentWindow: number): boolean;
+	TestConnectionToServer(): void;
+	TestConnectionToVault(): void;
+	TestConnectionToVaultWithTimeout(TimeoutInMilliseconds: number): void;
+}
+
+interface IVaultAsync {
+	readonly ClassGroupOperations: IVaultClassGroupOperationsAsync;
+	readonly ClassOperations: IVaultClassOperationsAsync;
+	readonly ClientOperations: IVaultClientOperationsAsync;
+	readonly CustomApplicationManagementOperations: IVaultCustomApplicationManagementOperationsAsync;
+	readonly DataSetOperations: IVaultDataSetOperationsAsync;
+	readonly ElectronicSignatureOperations: IVaultElectronicSignatureOperationsAsync;
+	readonly EventLogOperations: IVaultEventLogOperationsAsync;
+	readonly ExtensionMethodOperations: IVaultExtensionMethodOperationsAsync;
+	readonly ExternalObjectOperations: IVaultExternalObjectOperationsAsync;
+	readonly LoginAccountOperations: IVaultLoginAccountOperationsAsync;
+	readonly ManagementOperations: IVaultManagementOperationsAsync;
+	readonly NamedACLOperations: IVaultNamedACLOperationsAsync;
+	readonly NamedValueStorageOperations: IVaultNamedValueStorageOperationsAsync;
+	readonly NotificationOperations: IVaultNotificationOperationsAsync;
+	readonly ObjectFileOperations: IVaultObjectFileOperationsAsync;
+	readonly ObjectOperations: IVaultObjectOperationsAsync;
+	readonly ObjectPropertyOperations: IVaultObjectPropertyOperationsAsync;
+	readonly ObjectSearchOperations: IVaultObjectSearchOperationsAsync;
+	readonly ObjectTypeOperations: IVaultObjectTypeOperationsAsync;
+	readonly PropertyDefOperations: IVaultPropertyDefOperationsAsync;
+	readonly ScheduledJobManagementOperations: IVaultScheduledJobManagementOperationsAsync;
+	readonly ServerDataPushOperations: IVaultServerDataPushOperationsAsync;
+	readonly SharedLinkOperations: IVaultSharedLinkOperationsAsync;
+	readonly TraditionalFolderOperations: IVaultTraditionalFolderOperationsAsync;
+	readonly UserGroupOperations: IVaultUserGroupOperationsAsync;
+	readonly UserOperations: IVaultUserOperationsAsync;
+	readonly UserSettingOperations: IVaultUserSettingOperationsAsync;
+	readonly ValueListItemOperations: IVaultValueListItemOperationsAsync;
+	readonly ValueListOperations: IVaultValueListOperationsAsync;
+	readonly ViewOperations: IVaultViewOperationsAsync;
+	readonly WorkflowOperations: IVaultWorkflowOperationsAsync;
+}
+
+interface IVaultAutomaticMetadataOperations {
+	GetAutomaticMetadataForObject(ObjVer: IObjVer): IAutomaticMetadataResult;
+	GetAutomaticMetadataForTemporaryFile(UploadSessionID: number): IAutomaticMetadataResult;
+	GetAutomaticMetadataForTemporaryFiles(IIDs: IIDs): IAutomaticMetadataResult;
+}
+
+interface IVaultClassGroupOperations {
+	AddClassGroup(ClassGroup: IClassGroup): IClassGroup;
+	GetClassGroup(ObjectType: MFiles.MFBuiltInObjectType | number, ClassGroupID: number): IClassGroup;
+	GetClassGroupIDByGUID(ClassGroupGUID: string): number;
+	GetClassGroups(ObjectType: MFiles.MFBuiltInObjectType | number): IClassGroups;
+	RemoveClassGroup(ClassGroupID: number): void;
+	UpdateClassGroup(ClassGroup: IClassGroup): void;
+}
+
+interface IVaultClassGroupOperationsAsync {
+	AddClassGroup(ClassGroup: IClassGroup, successCallback?: (result: IClassGroup) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetClassGroup(ObjectType: MFiles.MFBuiltInObjectType | number, ClassGroupID: number, successCallback?: (result: IClassGroup) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetClassGroupIDByGUID(ClassGroupGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetClassGroups(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IClassGroups) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveClassGroup(ClassGroupID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateClassGroup(ClassGroup: IClassGroup, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultClassOperations {
+	AddObjectClassAdmin(ObjectClassAdmin: IObjectClassAdmin): IObjectClassAdmin;
+	GetAllObjectClasses(): IObjectClasses;
+	GetAllObjectClassesAdmin(): IObjectClassesAdmin;
+	GetObjectClass(ObjectClass: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number): IObjectClass;
+	GetObjectClassAdmin(Class: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number): IObjectClassAdmin;
+	GetObjectClasses(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectClasses;
+	GetObjectClassesAdmin(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectClassesAdmin;
+	GetObjectClassIDByAlias(Alias: string): number;
+	GetObjectClassIDByGUID(ObjectClassGUID: string): number;
+	RemoveObjectClassAdmin(ObjectClassID: number): void;
+	UpdateObjectClassAdmin(ObjectClass: IObjectClassAdmin): void;
+	UpdateObjectNames(ObjectClassID: number): void;
+}
+
+interface IVaultClassOperationsAsync {
+	AddObjectClassAdmin(ObjectClassAdmin: IObjectClassAdmin, successCallback?: (result: IObjectClassAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetAllObjectClasses(successCallback?: (result: IObjectClasses) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetAllObjectClassesAdmin(successCallback?: (result: IObjectClassesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectClass(ObjectClass: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number, successCallback?: (result: IObjectClass) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectClassAdmin(Class: MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number, successCallback?: (result: IObjectClassAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectClasses(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectClasses) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectClassesAdmin(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectClassesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectClassIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectClassIDByGUID(ObjectClassGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveObjectClassAdmin(ObjectClassID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateObjectClassAdmin(ObjectClass: IObjectClassAdmin, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateObjectNames(ObjectClassID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultClientOperations {
+	DisableCheckInReminderForCallingProcess(): void;
+	EnableCheckInReminderForCallingProcess(): void;
+	IsOffline(): boolean;
+	IsOnline(): boolean;
+	SetVaultToOffline(ParentWindow: number): MFiles.MFOfflineTransitionResultFlags;
+	SetVaultToOnline(ParentWindow: number): MFiles.MFOnlineTransitionResultFlags;
+}
+
+interface IVaultClientOperationsAsync {
+	DisableCheckInReminderForCallingProcess(successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	EnableCheckInReminderForCallingProcess(successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsOffline(successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsOnline(successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetVaultToOffline(ParentWindow: number, successCallback?: (result: MFiles.MFOfflineTransitionResultFlags) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetVaultToOnline(ParentWindow: number, successCallback?: (result: MFiles.MFOnlineTransitionResultFlags) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultConnection {
+	AuthType: MFiles.MFAuthType;
+	AutoLogin: boolean;
+	EncryptedConnection: boolean;
+	Endpoint: string;
+	Icon: ReadonlyArray<number>;
+	Name: string;
+	NetworkAddress: string;
+	ProtocolSequence: string;
+	ServerVaultGUID: string;
+	ServerVaultName: string;
+	UserSpecific: boolean;
+	BindToVault(ParentWindow: number, CanLogIn: boolean, ReturnNULLIfCancelledByUser: boolean): IVault;
+	Clone(): IVaultConnection;
+	GetGUID(): string;
+	IsLoggedIn(): boolean;
+	LogInAs(ParentWindow: number, DefaultAuthType: MFiles.MFAuthType, ReturnNULLIfCancelledByUser: boolean): IVault;
+	LogInAsUser(AuthType: MFiles.MFAuthType, UserName: string, Password: string, Domain: string | null, SPN: string | null): IVault;
+	TestConnectionToVault(ParentWindow: number): MFiles.MFVaultConnectionTestResult;
+}
+
+interface IVaultConnections {
+	readonly Count: number;
+	Add(Index: number, VaultConnection: IVaultConnection): void;
+	GetVaultConnectionByName(VaultConnectionName: string): IVaultConnection;
+	GetVaultConnectionIndexByName(VaultConnectionName: string): number;
+	Item(Index: number): IVaultConnection;
+	Remove(Index: number): void;
+}
+
+interface IVaultCore {
+	readonly Events: IVaultCoreEvents;
+	readonly ServerVault: IVault;
+}
+
+interface IVaultCoreEvents extends IEvents {
+	OnNewVaultEntry?(vaultEntry: IVaultEntry): void | IVaultEntryEvents;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface IVaultCustomApplicationManagementOperations {
+	DownloadCustomApplicationBlock(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
+	DownloadCustomApplicationBlock_32bit(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
+	DownloadCustomApplicationBlockBegin(ApplicationID: string): IFileDownloadSession;
+	DownloadCustomApplicationBlockBegin_32bit(ApplicationID: string): IFileDownloadSession;
+	EnableCustomApplication(ApplicationID: string, Enabled: boolean): void;
+	GetCustomApplication(ApplicationID: string): ICustomApplication;
+	GetCustomApplications(): ICustomApplications;
+	GetCustomApplicationsEx(Platform: MFiles.MFExtApplicationPlatform): ICustomApplications;
+	InstallCustomApplication(File: string): void;
+	UninstallCustomApplication(ApplicationID: string): void;
+}
+
+interface IVaultCustomApplicationManagementOperationsAsync {
+	DownloadCustomApplicationBlock(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadCustomApplicationBlock_32bit(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadCustomApplicationBlockBegin(ApplicationID: string, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadCustomApplicationBlockBegin_32bit(ApplicationID: string, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	EnableCustomApplication(ApplicationID: string, Enabled: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetCustomApplication(ApplicationID: string, successCallback?: (result: ICustomApplication) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetCustomApplications(successCallback?: (result: ICustomApplications) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetCustomApplicationsEx(Platform: MFiles.MFExtApplicationPlatform, successCallback?: (result: ICustomApplications) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	InstallCustomApplication(File: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UninstallCustomApplication(ApplicationID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultDataSetOperations {
+	GetDataSetExportingStatus(ID: number): IDataSetExportingStatus;
+	GetDataSets(): IDataSets;
+	GetReportAccessCredentials(): IReportAccessCredentials;
+	StartDataSetExport(ID: number): void;
+}
+
+interface IVaultDataSetOperationsAsync {
+	GetDataSetExportingStatus(ID: number, successCallback?: (result: IDataSetExportingStatus) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetDataSets(successCallback?: (result: IDataSets) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetReportAccessCredentials(successCallback?: (result: IReportAccessCredentials) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	StartDataSetExport(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultElectronicSignatureOperations {
+	AddEmptySignature(ObjVer: IObjVer, SignatureIdentifier: string): IObjectVersionAndProperties;
+	AddEmptySignatures(ObjVer: IObjVer): IObjectVersionAndProperties;
+	DisconnectSignature(ObjVer: IObjVer, SignatureIdentifier: string): IObjectVersionAndProperties;
+	DisconnectSignatureEx(ObjVer: IObjVer, SignatureIdentifier: string, InvalidateDisconnectedSignatures: boolean): IObjectVersionAndProperties;
+	DisconnectSignatures(ObjVer: IObjVer): IObjectVersionAndProperties;
+	DisconnectSignaturesEx(ObjVer: IObjVer, InvalidateDisconnectedSignatures: boolean): IObjectVersionAndProperties;
+}
+
+interface IVaultElectronicSignatureOperationsAsync {
+	AddEmptySignature(ObjVer: IObjVer, SignatureIdentifier: string, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	AddEmptySignatures(ObjVer: IObjVer, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DisconnectSignature(ObjVer: IObjVer, SignatureIdentifier: string, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DisconnectSignatureEx(ObjVer: IObjVer, SignatureIdentifier: string, InvalidateDisconnectedSignatures: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DisconnectSignatures(ObjVer: IObjVer, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DisconnectSignaturesEx(ObjVer: IObjVer, InvalidateDisconnectedSignatures: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultEntry {
+	readonly Events: IVaultEntryEvents;
+	readonly Vault: IVault;
+	readonly VaultCore: IVaultCore;
+	readonly VaultUI: IVaultUI;
+	NotifyVaultEntry(ID: string, data1: any, data2: any): any;
+}
+
+interface IVaultEntryEvents extends IEvents {
+	OnAddObjectFile?(objVer: IObjVer, sourceObjectFile: ISourceObjectFile): null | boolean | { OnSuccess?(objectVersion: IObjectVersion, objectFile: IObjectFile): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnAddObjectsToFavorites?(objIDs: IObjIDs): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnAddObjectToFavorites?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnChangeVaultLanguage?(languageID: number): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnCheckInObject?(objVer: IObjVer, propertyValues: IPropertyValues): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnCheckInObjects?(objVers: IObjVers, propertyValues: IPropertyValues): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnCheckOutObject?(objID: IObjID): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnCheckOutObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnCreateObject?(objectType: number, propertyValues: IPropertyValues, sourceObjectFiles: ISourceObjectFiles, accessControlList: IAccessControlList, checkInRequested: boolean, singleFileRequested: boolean): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnDestroyObject?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnDestroyObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnDestroyObjectVersion?(objVer: IObjVer): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnDestroyObjectVersions?(objVers: IObjVers): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnLoggedIn?(): void;
+	OnLogOut?(): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnModifyObjectVersionLabels?(objVer: IObjVer, clearFromOtherVersions: boolean, append: boolean, labelIDs: IIDs, singleLabelRequired: boolean): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnNotification?(id: string, data1: any, data2: any): any;
+	OnObjectAddedToFavorites?(objID: IObjID): void;
+	OnObjectCheckedIn?(objectVersion: IObjectVersion): void;
+	OnObjectCheckedOut?(objectVersion: IObjectVersion): void;
+	OnObjectCheckoutsUndone?(objectVersions: IObjectVersions): void;
+	OnObjectCheckoutUndone?(objectVersion: IObjectVersion): void;
+	OnObjectCreated?(objectVersion: IObjectVersion): void;
+	OnObjectDestroyed?(objID: IObjID): void;
+	OnObjectFileAdded?(objectVersion: IObjectVersion, objectFile: IObjectFile): void;
+	OnObjectFileRemoved?(objectVersion: IObjectVersion, fileVer: IFileVer): void;
+	OnObjectFileRenamed?(objectVersion: IObjectVersion, objectFile: IObjectFile): void;
+	OnObjectLevelPropertySet?(objID: IObjID, propertyValue: IPropertyValue): void;
+	OnObjectOfflineAvailabilityRemoved?(objID: IObjID): void;
+	OnObjectOfflineAvailabilitySet?(objID: IObjID): void;
+	OnObjectRemoved?(objectVersion: IObjectVersion): void;
+	OnObjectRemovedFromFavorites?(objID: IObjID): void;
+	OnObjectsAddedToFavorites?(objIDs: IObjIDs): void;
+	OnObjectsCheckedIn?(objectVersions: IObjectVersions): void;
+	OnObjectsCheckedOut?(objectVersions: IObjectVersions): void;
+	OnObjectsDestroyed?(objIDs: IObjIDs): void;
+	OnObjectsRemoved?(objectVersions: IObjectVersions): void;
+	OnObjectsRemovedFromFavorites?(objIDs: IObjIDs): void;
+	OnObjectUndeleted?(objectVersion: IObjectVersion): void;
+	OnObjectVersionDestroyed?(objVer: IObjVer): void;
+	OnObjectVersionLabelsModified?(objVer: IObjVer, clearFromOtherVersions: boolean, append: boolean, labelIDs: IIDs): void;
+	OnObjectVersionPermissionsSet?(objectVersion: IObjectVersion): void;
+	OnObjectVersionRolledBack?(objectVersion: IObjectVersion): void;
+	OnObjectVersionsDestroyed?(objVers: IObjVers): void;
+	OnPropertiesOfObjectVersionSet?(objectVersion: IObjectVersion): void;
+	OnPropertiesOfObjectVersionsSet?(objectVersions: IObjectVersions): void;
+	OnRemoveObject?(objID: IObjID): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnRemoveObjectFile?(objVer: IObjVer, fileVer: IFileVer): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnRemoveObjectFromFavorites?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnRemoveObjectOfflineAvailability?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnRemoveObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnRemoveObjectsFromFavorites?(objIDs: IObjIDs): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnRenameObjectFile?(objVer: IObjVer, fileVer: IFileVer, newName: null | ITypedValue, newExtension: null | ITypedValue): null | boolean | { OnSuccess?(objectVersion: IObjectVersion, objectFile: IObjectFile): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnRollBackObjectVersion?(objVer: IObjVer): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnSetObjectLevelProperty?(objID: IObjID, propertyValue: IPropertyValue): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnSetObjectOfflineAvailability?(objID: IObjID): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnSetObjectVersionPermissions?(objVer: IObjVer, changeAllVersions: boolean, accessControlList: IAccessControlList): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnSetPropertiesOfObjectVersion?(setPropertiesParams: ISetPropertiesParams, singlePropertyUpdate: boolean, singlePropertyRemove: boolean): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnSetPropertiesOfObjectVersions?(setPropertiesParamsOfMultipleObjects: ISetPropertiesParamsOfMultipleObjects, singlePropertyUpdate: boolean, singlePropertyRemove: boolean): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnStarted?(): void;
+	OnStop?(): void;
+	OnSwitchedToOfflineMode?(): void;
+	OnSwitchedToOnlineMode?(): void;
+	OnSwitchToOfflineMode?(): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnSwitchToOnlineMode?(): null | boolean | { OnSuccess?(): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnUndeleteObject?(objID: IObjID): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnUndeleteObjects?(objIDs: IObjIDs): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnUndoObjectCheckout?(objVer: IObjVer): null | boolean | { OnSuccess?(objectVersion: IObjectVersion): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnUndoObjectCheckouts?(objVers: IObjVers): null | boolean | { OnSuccess?(objectVersions: IObjectVersions): void; OnError?(errorCode: number, errorMessage: string, errorStack: string): void; Finally?(): void; };
+	OnVaultLanguageChanged?(languageID: number): void;
+}
+
+interface IVaultEventLogOperations {
+	Clear(): void;
+	ClearRange(FirstEventID: number, LastEventID: number): void;
+	ClearRange_32bit(FirstEventID: string, LastEventID: string): void;
+	ExportAll(): string;
+	ExportRange(FirstEventID: number, LastEventID: number, DeleteEventsAfterExporting: boolean): string;
+	ExportRange_32bit(FirstEventID: string, LastEventID: string, DeleteEventsAfterExporting: boolean): string;
+	GetIDRange(): IIDRange;
+	IsLoggingEnabled(): boolean;
+	SetLoggingEnabled(Enabled: boolean): void;
+}
+
+interface IVaultEventLogOperationsAsync {
+	Clear(successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ClearRange(FirstEventID: number, LastEventID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ClearRange_32bit(FirstEventID: string, LastEventID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ExportAll(successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ExportRange(FirstEventID: number, LastEventID: number, DeleteEventsAfterExporting: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ExportRange_32bit(FirstEventID: string, LastEventID: string, DeleteEventsAfterExporting: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetIDRange(successCallback?: (result: IIDRange) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsLoggingEnabled(successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetLoggingEnabled(Enabled: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultExtensionMethodOperations {
+	DoesActiveVaultExtensionMethodExist(MethodIdentifier: string): boolean;
+	ExecuteVaultExtensionMethod(MethodIdentifier: string, Input: string): string;
+}
+
+interface IVaultExtensionMethodOperationsAsync {
+	DoesActiveVaultExtensionMethodExist(MethodIdentifier: string, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ExecuteVaultExtensionMethod(MethodIdentifier: string, Input: string, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultExternalObjectOperations {
+	PromoteObject(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, pACLProvidedCBN: IAccessControlList): IObjectVersionAndProperties;
+}
+
+interface IVaultExternalObjectOperationsAsync {
+	PromoteObject(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, pACLProvidedCBN: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultLoginAccountOperations {
+	AddLoginAccount(LoginAccount: ILoginAccount, Password: string): void;
+	ForceLogout(AccountNames: IStrings): void;
+	GetLoginAccount(AccountName: string): ILoginAccount;
+	GetLoginAccounts(): ILoginAccounts;
+	GetLoginAccountsWithSessions(): ILoginAccounts;
+	GetPersonalInformationFromDomain(AccountName: string): ILoginAccountPersonalInformation;
+	ModifyLoginAccount(LoginAccount: ILoginAccount): void;
+	RemoveLoginAccount(AccountName: string): void;
+	UpdateLoginPassword(AccountName: string, NewPassword: string): void;
+}
+
+interface IVaultLoginAccountOperationsAsync {
+	AddLoginAccount(LoginAccount: ILoginAccount, Password: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ForceLogout(AccountNames: IStrings, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLoginAccount(AccountName: string, successCallback?: (result: ILoginAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLoginAccounts(successCallback?: (result: ILoginAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLoginAccountsWithSessions(successCallback?: (result: ILoginAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPersonalInformationFromDomain(AccountName: string, successCallback?: (result: ILoginAccountPersonalInformation) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ModifyLoginAccount(LoginAccount: ILoginAccount, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveLoginAccount(AccountName: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateLoginPassword(AccountName: string, NewPassword: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultManagementOperations {
+	ArchiveOldVersions(ArchiveOldVersionsJob: IArchiveOldVersionsJob): void;
+	ExportContent(ExportContentJob: IExportContentJob): void;
+	GetEventHandlers(): IEventHandlers;
+	GetVaultProperties(): IVaultProperties;
+	ImportContent(ImportContentJob: IImportContentJob): void;
+	ImportContentAsync(ImportContentJob: IImportContentJob): number;
+	IsAsyncJobRunning(JobID: number): boolean;
+	PreviewImportContent(ImportContentJob: IImportContentJob, SummaryFile: string): void;
+	RebuildFullTextSearchIndex(Metadata: boolean, FileContents: boolean): void;
+	SetEventHandlers(EventHandlers: IEventHandlers): void;
+	UpdateVaultProperties(VaultProperties: IVaultProperties, RegistrationDataOnly: boolean): void;
+	VerifyVault(VerifyVaultJob: IVerifyVaultJob): IVerifyVaultJobOutput;
+	WaitAsyncJob(JobID: number): void;
+}
+
+interface IVaultManagementOperationsAsync {
+	ArchiveOldVersions(ArchiveOldVersionsJob: IArchiveOldVersionsJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ExportContent(ExportContentJob: IExportContentJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetEventHandlers(successCallback?: (result: IEventHandlers) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetVaultProperties(successCallback?: (result: IVaultProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ImportContent(ImportContentJob: IImportContentJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ImportContentAsync(ImportContentJob: IImportContentJob, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsAsyncJobRunning(JobID: number, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	PreviewImportContent(ImportContentJob: IImportContentJob, SummaryFile: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RebuildFullTextSearchIndex(Metadata: boolean, FileContents: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetEventHandlers(EventHandlers: IEventHandlers, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateVaultProperties(VaultProperties: IVaultProperties, RegistrationDataOnly: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	VerifyVault(VerifyVaultJob: IVerifyVaultJob, successCallback?: (result: IVerifyVaultJobOutput) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	WaitAsyncJob(JobID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultNamedACLOperations {
+	AddNamedACLAdmin(NamedACLAdmin: INamedACLAdmin): INamedACLAdmin;
+	GetMatchingNamedACLForAccessControlList(AccessControlList: IAccessControlList, ExplicitLinkOnly: boolean, ActiveAccessControlComponentsOnly: boolean, RefreshFromServer: boolean): INamedACL;
+	GetMatchingNamedACLForAccessControlListComponent(AccessControlListComponent: IAccessControlListComponent, ExplicitLinkOnly: boolean, RefreshFromServer: boolean): INamedACL;
+	GetNamedACL(NamedACLID: number): INamedACL;
+	GetNamedACLAdmin(NamedACLID: number): INamedACLAdmin;
+	GetNamedACLIDByAlias(Alias: string): number;
+	GetNamedACLIDByGUID(NamedACLGUID: string): number;
+	GetNamedACLs(): INamedACLs;
+	GetNamedACLsByTypeAdmin(Type: MFiles.MFNamedACLType): INamedACLsAdmin;
+	GetNamedACLsWithRefresh(RefreshFromServer: boolean): INamedACLs;
+	GetNamedACLWithRefresh(NamedACLID: number, RefreshFromServer: boolean): INamedACL;
+	IsNamedACLUsedInAutomaticPermissionsAdmin(NamedACLID: number): boolean;
+	RemoveNamedACLWithPropagationAdmin(NamedACLID: number, AllowPropagation: boolean): void;
+	UpdateNamedACLAdmin(NamedACLAdmin: INamedACLAdmin): void;
+	UpdateNamedACLWithPropagationAdmin(NamedACLAdmin: INamedACLAdmin, MaintainLinks: boolean, AllowPropagation: boolean): void;
+}
+
+interface IVaultNamedACLOperationsAsync {
+	AddNamedACLAdmin(NamedACLAdmin: INamedACLAdmin, successCallback?: (result: INamedACLAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetMatchingNamedACLForAccessControlList(AccessControlList: IAccessControlList, ExplicitLinkOnly: boolean, ActiveAccessControlComponentsOnly: boolean, RefreshFromServer: boolean, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetMatchingNamedACLForAccessControlListComponent(AccessControlListComponent: IAccessControlListComponent, ExplicitLinkOnly: boolean, RefreshFromServer: boolean, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACL(NamedACLID: number, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACLAdmin(NamedACLID: number, successCallback?: (result: INamedACLAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACLIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACLIDByGUID(NamedACLGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACLs(successCallback?: (result: INamedACLs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACLsByTypeAdmin(Type: MFiles.MFNamedACLType, successCallback?: (result: INamedACLsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACLsWithRefresh(RefreshFromServer: boolean, successCallback?: (result: INamedACLs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetNamedACLWithRefresh(NamedACLID: number, RefreshFromServer: boolean, successCallback?: (result: INamedACL) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsNamedACLUsedInAutomaticPermissionsAdmin(NamedACLID: number, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveNamedACLWithPropagationAdmin(NamedACLID: number, AllowPropagation: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateNamedACLAdmin(NamedACLAdmin: INamedACLAdmin, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateNamedACLWithPropagationAdmin(NamedACLAdmin: INamedACLAdmin, MaintainLinks: boolean, AllowPropagation: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultNamedValueStorageOperations {
+	GetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string): INamedValues;
+	RemoveNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValueNames: IStrings): void;
+	SetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValues: INamedValues): void;
+}
+
+interface IVaultNamedValueStorageOperationsAsync {
+	GetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, successCallback?: (result: INamedValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValueNames: IStrings, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetNamedValues(NamedValueType: MFiles.MFNamedValueType, Namespace: string, NamedValues: INamedValues, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultNotificationOperations {
+	SendCustomNotification(UserOrUserGroupIDs: IUserOrUserGroupIDs, IncludeSubstituteUsers: boolean, ExternalRecipients: IStrings, SendWithServerEmailIdentity: boolean, Subject: string, Body: string): void;
+}
+
+interface IVaultNotificationOperationsAsync {
+	SendCustomNotification(UserOrUserGroupIDs: IUserOrUserGroupIDs, IncludeSubstituteUsers: boolean, ExternalRecipients: IStrings, SendWithServerEmailIdentity: boolean, Subject: string, Body: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultObjectFileOperations {
+	AddEmptyFile(ObjVer: IObjVer, Title: string, Extension: string): IFileVer;
+	AddFile(ObjVer: IObjVer, Title: string, Extension: string, SourcePath: string): IFileVer;
+	CloseUploadSession(UploadID: number): void;
+	ConvertToPDF(ObjVer: IObjVer, FileID: number, StoreAsSeparateFile: boolean, OverwriteExistingFile: boolean, PDFA1b: boolean, FailOnUnsupportedSourceFiles: boolean): IObjectVersion;
+	DownloadFile(File: number, FileVersion: number, FilePath: string): void;
+	DownloadFileAsDataURI(ObjVer: IObjVer, File: number, FileVersion: number): string;
+	DownloadFileEx(File: number, FileVersion: number, FilePath: string, FileFormat: MFiles.MFFileFormat): void;
+	DownloadFileInBlocks_Begin(File: number, FileVersion: number): IFileDownloadSession;
+	DownloadFileInBlocks_Begin_32bit(File: number, FileVersion: number): IFileDownloadSession;
+	DownloadFileInBlocks_BeginEx(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat): IFileDownloadSession;
+	DownloadFileInBlocks_BeginEx_32bit(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat): IFileDownloadSession;
+	DownloadFileInBlocks_ReadBlock(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
+	DownloadFileInBlocks_ReadBlock_32bit(DownloadID: number, BlockSize: number, Offset: number): ReadonlyArray<number>;
+	GetFiles(ObjVer: IObjVer): IObjectFiles;
+	GetFilesForModificationInEventHandler(ObjVer: IObjVer): IObjectFiles;
+	GetFileSize(FileVer: IFileVer): number;
+	GetFileSize_32bit(FileVer: IFileVer): number;
+	GetLatestFileVersion(FileID: number, AllowCheckedOut: boolean): IFileVer;
+	GetObjIDOfFile(FileID: number): IObjID;
+	GetPathInDefaultView(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, UpdateFromServer: boolean): string;
+	GetPathInDefaultViewEx(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, PreferTraditionalFolderLocation: boolean, UpdateFromServer: boolean): string;
+	OpenFileInDefaultApplication(ParentWindow: number, ObjVer: IObjVer, FileVer: IFileVer, FileOpenMethod: MFiles.MFFileOpenMethod): void;
+	PerformOCROperation(ObjVer: IObjVer, FileVer: IFileVer, OCROptions: IOCROptions, ZoneRecognitionMode: MFiles.MFOCRZoneRecognitionMode, ZoneRecognitionPages: IOCRPages, ConvertToSearchablePDF: boolean): IOCRPageResults;
+	RemoveFile(ObjVer: IObjVer, FileVer: IFileVer): IObjectVersion;
+	RenameFile(ObjVer: IObjVer, FileVer: IFileVer, Title: string, Extension: string, UpdateSingleFileDocumentTitle: boolean): IObjectVersion;
+	UpdateMetadataInFile(ObjVer: IObjVer, File: number, FailOnUnsupportedFiles: boolean): IObjectVersion;
+	UploadFile(File: number, FileVersion: number, FilePath: string): void;
+	UploadFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
+	UploadFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
+	UploadFileBlockBegin(): number;
+	UploadFileBlockBegin_32bit(): number;
+	UploadFileCommit(UploadID: number, File: number, FileVersion: number, LogicalSize: number): void;
+	UploadFileCommit_32bit(UploadID: number, File: number, FileVersion: number, LogicalSize: number): void;
+	UploadFromDataURI(ObjVer: IObjVer, File: number, FileVersion: number, DataURI: string): void;
+	UploadTemporaryFile(FilePath: string): number;
+	UploadTemporaryFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
+	UploadTemporaryFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>): void;
+	UploadTemporaryFileBlockBegin(FileExtension: string): number;
+	UploadTemporaryFileBlockBegin_32bit(FileExtension: string): number;
+	UploadTemporaryFileCommit(UploadID: number, LogicalSize: number): void;
+	UploadTemporaryFileCommit_32bit(UploadID: number, LogicalSize: number): void;
+}
+
+interface IVaultObjectFileOperationsAsync {
+	AddEmptyFile(ObjVer: IObjVer, Title: string, Extension: string, successCallback?: (result: IFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	AddFile(ObjVer: IObjVer, Title: string, Extension: string, SourcePath: string, successCallback?: (result: IFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CloseUploadSession(UploadID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ConvertToPDF(ObjVer: IObjVer, FileID: number, StoreAsSeparateFile: boolean, OverwriteExistingFile: boolean, PDFA1b: boolean, FailOnUnsupportedSourceFiles: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFile(File: number, FileVersion: number, FilePath: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileAsDataURI(ObjVer: IObjVer, File: number, FileVersion: number, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileEx(File: number, FileVersion: number, FilePath: string, FileFormat: MFiles.MFFileFormat, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileInBlocks_Begin(File: number, FileVersion: number, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileInBlocks_Begin_32bit(File: number, FileVersion: number, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileInBlocks_BeginEx(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileInBlocks_BeginEx_32bit(File: number, FileVersion: number, FileFormat: MFiles.MFFileFormat, successCallback?: (result: IFileDownloadSession) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileInBlocks_ReadBlock(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DownloadFileInBlocks_ReadBlock_32bit(DownloadID: number, BlockSize: number, Offset: number, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFiles(ObjVer: IObjVer, successCallback?: (result: IObjectFiles) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFilesForModificationInEventHandler(ObjVer: IObjVer, successCallback?: (result: IObjectFiles) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFileSize(FileVer: IFileVer, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFileSize_32bit(FileVer: IFileVer, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLatestFileVersion(FileID: number, AllowCheckedOut: boolean, successCallback?: (result: IFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjIDOfFile(FileID: number, successCallback?: (result: IObjID) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPathInDefaultView(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, UpdateFromServer: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPathInDefaultViewEx(ObjID: IObjID, ObjectVersion: number, FileID: number, FileVersion: number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, PreferTraditionalFolderLocation: boolean, UpdateFromServer: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	OpenFileInDefaultApplication(ParentWindow: number, ObjVer: IObjVer, FileVer: IFileVer, FileOpenMethod: MFiles.MFFileOpenMethod, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	PerformOCROperation(ObjVer: IObjVer, FileVer: IFileVer, OCROptions: IOCROptions, ZoneRecognitionMode: MFiles.MFOCRZoneRecognitionMode, ZoneRecognitionPages: IOCRPages, ConvertToSearchablePDF: boolean, successCallback?: (result: IOCRPageResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveFile(ObjVer: IObjVer, FileVer: IFileVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RenameFile(ObjVer: IObjVer, FileVer: IFileVer, Title: string, Extension: string, UpdateSingleFileDocumentTitle: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateMetadataInFile(ObjVer: IObjVer, File: number, FailOnUnsupportedFiles: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFile(File: number, FileVersion: number, FilePath: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFileBlockBegin(successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFileBlockBegin_32bit(successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFileCommit(UploadID: number, File: number, FileVersion: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFileCommit_32bit(UploadID: number, File: number, FileVersion: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadFromDataURI(ObjVer: IObjVer, File: number, FileVersion: number, DataURI: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadTemporaryFile(FilePath: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadTemporaryFileBlock(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadTemporaryFileBlock_32bit(UploadID: number, TotalSizeInBytes: number, Offset: number, Block: ReadonlyArray<number>, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadTemporaryFileBlockBegin(FileExtension: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadTemporaryFileBlockBegin_32bit(FileExtension: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadTemporaryFileCommit(UploadID: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UploadTemporaryFileCommit_32bit(UploadID: number, LogicalSize: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultObjectOperations {
+	AddFavorite(ObjID: IObjID): IObjectVersionAndProperties;
+	AddFavorites(ObjIDs: IObjIDs): IObjectVersionAndPropertiesOfMultipleObjects;
+	ChangePermissionsToACL(ObjVer: IObjVer, AccessControlList: IAccessControlList, ChangeAllVersions: boolean): IObjectVersion;
+	ChangePermissionsToNamedACL(ObjVer: IObjVer, NamedACL: number, ChangeAllVersions: boolean): IObjectVersion;
+	CheckIn(ObjVer: IObjVer): IObjectVersion;
+	CheckInMultipleObjects(ObjVers: IObjVers): IObjectVersions;
+	CheckOut(ObjID: IObjID): IObjectVersion;
+	CheckOutMultipleObjects(ObjIDs: IObjIDs): IObjectVersions;
+	CreateNewAssignment(AssignmentName: string, AssignmentDescription: string, AssignedToUser: ITypedValue, Deadline: ITypedValue, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
+	CreateNewEmptySingleFileDocument(PropertyValues: IPropertyValues, Title: string, Extension: string, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
+	CreateNewObject(ObjectType: MFiles.MFBuiltInObjectType | number, PropertyValues: IPropertyValues, SourceObjectFiles: ISourceObjectFiles, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
+	CreateNewObjectEx(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
+	CreateNewObjectExQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList): number;
+	CreateNewSFDObject(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList): IObjectVersionAndProperties;
+	CreateNewSFDObjectQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList): number;
+	DelayedCheckIn(ObjVer: IObjVer): void;
+	DeleteObject(ObjID: IObjID): IObjectVersion;
+	DestroyObject(ObjID: IObjID, DestroyAllVersions: boolean, ObjectVersion: number): void;
+	DestroyObjects(ObjIDs: IObjIDs): void;
+	FollowObject(ObjID: IObjID, Follow: boolean): void;
+	ForceUndoCheckout(ObjVer: IObjVer): IObjectVersion;
+	GetCollectionMembers(ObjVer: IObjVer): IObjectVersions;
+	GetHistory(ObjID: IObjID): IObjectVersions;
+	GetLatestObjectVersionAndProperties(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean): IObjectVersionAndProperties;
+	GetLatestObjVer(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean): IObjVer;
+	GetLatestObjVerEx(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, NotifyViews: boolean): IObjVer;
+	GetMFilesURLForObject(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, URLType: MFiles.MFilesURLType): string;
+	GetMFilesURLForObjectOrFile(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, File: number, URLType: MFiles.MFilesURLType): string;
+	GetObjectGUID(ObjID: IObjID): string;
+	GetObjectInfo(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean): IObjectVersion;
+	GetObjectInfoEx(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean, NotifyViews: boolean): IObjectVersion;
+	GetObjectLocationsInView(View: MFiles.MFBuiltInView | number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, ObjectVersion: IObjVer): IStrings;
+	GetObjectPermissions(ObjVer: IObjVer): IObjectVersionPermissions;
+	GetObjectVersionAndProperties(ObjVer: IObjVer, UpdateFromServer: boolean): IObjectVersionAndProperties;
+	GetObjectVersionAndPropertiesOfMultipleObjects(ObjVers: IObjVers, LatestVersions: boolean, AllowCheckedOut: boolean, AllowMissingObjectVersions: boolean, UpdateFromServer: boolean): IObjectVersionAndPropertiesOfMultipleObjects;
+	GetObjIDByGUID(ObjectGUID: string): IObjID;
+	GetObjIDByOriginalObjID(OriginalVaultGUID: string, OriginalObjID: IObjID): IObjID;
+	GetOfflineAvailability(ObjID: IObjID): boolean;
+	GetOfflineObjIDs(): IObjIDs;
+	GetRelationships(ObjVer: IObjVer, Mode: MFiles.MFRelationshipsMode): IObjectVersions;
+	GetThumbnailAsBytes(ObjVer: IObjVer, FileVer: IFileVer, Width: number, Height: number, GetFileIconThumbnailIfRealThumbnailNotAvailable: boolean): ReadonlyArray<number>;
+	IsObjectCheckedOut(ObjID: IObjID, UpdateFromServer: boolean): boolean;
+	IsObjectCheckedOutToThisUserOnThisComputer(ObjID: IObjID, UpdateFromServer: boolean): boolean;
+	IsObjectFollowed(ObjID: IObjID): boolean;
+	IsSingleFileObject(ObjVer: IObjVer): boolean;
+	MatchesSearchConditions(pIObjVer: IObjVer, pISearchConditions: ISearchConditions): boolean;
+	MatchesSearchConditionsEx(pIObjectVersion: IObjectVersion, pISearchConditions: ISearchConditions, pIPropertyValues: IPropertyValues, pIObjectVersionAndPropertiesOfMultipleObjects: IObjectVersionAndPropertiesOfMultipleObjects): boolean;
+	NotifyObjectAccess(ObjID: IObjID): IObjectVersionAndProperties;
+	ProposeCheckOutForFile(ParentWindow: number, ObjVersionFile: IObjectFileAndVersion, CanCancel: boolean): boolean;
+	RejectCheckInReminder(ObjVer: IObjVer): void;
+	RemoveFavorite(ObjID: IObjID): IObjectVersionAndProperties;
+	RemoveFavorites(ObjIDs: IObjIDs): IObjectVersionAndPropertiesOfMultipleObjects;
+	ResolveConflict(ParticipantObjID: IObjID, KeepThis: boolean): IObjectVersions;
+	Rollback(ObjID: IObjID, RollbackToVersion: number): IObjectVersion;
+	SetExternalID(ObjID: IObjID, ExtID: string): void;
+	SetObjectGUID(ObjID: IObjID, ObjectGUID: string): void;
+	SetOfflineAvailability(ObjID: IObjID, AvailableInOfflineMode: boolean): void;
+	SetSingleFileObject(ObjVer: IObjVer, SingleFile: boolean): void;
+	ShowBasicEditObjectWindow(ParentWindow: number, ObjVer: IObjVer): IObjectWindowResult;
+	ShowBasicNewObjectWindow(ParentWindow: number, ObjectType: IObjectType): IObjectWindowResult;
+	ShowChangeStateDialogModal(ParentWindow: number, ObjectID: IObjID): void;
+	ShowCheckInReminder(ParentWindow: number, ObjVer: IObjVer, Asynchronous: boolean): IObjectVersion;
+	ShowCheckInReminderDialogModal(ParentWindow: number, ObjVer: IObjVer, ApplyEnvironmentConditions: boolean): boolean;
+	ShowCheckoutPrompt(ParentWindow: number, Message: string, ObjID: IObjID, ShowCancel: boolean, AutoRejectConsequentPrompts: boolean): IObjectVersion;
+	ShowCollectionMembersDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean): void;
+	ShowCommentsDialogModal(ParentWindow: number, ObjectID: IObjID): void;
+	ShowEditObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjVer: IObjVer): IObjectWindowResult;
+	ShowHistoryDialogModal(ParentWindow: number, ObjectID: IObjID): void;
+	ShowNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo): IObjectWindowResult;
+	ShowPrefilledNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo, PrefilledPropertyValues: IPropertyValues, AccessControlList: IAccessControlList): IObjectWindowResult;
+	ShowRelatedObjects(ParentWindow: number, SourceObject: IObjID, ObjectTypeTargetForBrowsing: IObjectTypeTargetForBrowsing, ViewSelectionDialogInfoText: string): void;
+	ShowRelationshipsDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean): void;
+	ShowSelectObjectHistoryDialogModal(ParentWindow: number, ObjectID: IObjID, WindowTitle: string): IObjOrFileVer;
+	ShowSubObjectsDialogModal(ParentWindow: number, ObjectVersion: IObjVer): void;
+	UndeleteObject(ObjID: IObjID): IObjectVersion;
+	UndoCheckout(ObjVer: IObjVer): IObjectVersion;
+	UndoCheckoutMultipleObjects(ObjVers: IObjVers): IObjectVersions;
+}
+
+interface IVaultObjectOperationsAsync {
+	AddFavorite(ObjID: IObjID, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	AddFavorites(ObjIDs: IObjIDs, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ChangePermissionsToACL(ObjVer: IObjVer, AccessControlList: IAccessControlList, ChangeAllVersions: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ChangePermissionsToNamedACL(ObjVer: IObjVer, NamedACL: number, ChangeAllVersions: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CheckIn(ObjVer: IObjVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CheckInMultipleObjects(ObjVers: IObjVers, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CheckOut(ObjID: IObjID, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CheckOutMultipleObjects(ObjIDs: IObjIDs, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreateNewAssignment(AssignmentName: string, AssignmentDescription: string, AssignedToUser: ITypedValue, Deadline: ITypedValue, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreateNewEmptySingleFileDocument(PropertyValues: IPropertyValues, Title: string, Extension: string, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreateNewObject(ObjectType: MFiles.MFBuiltInObjectType | number, PropertyValues: IPropertyValues, SourceObjectFiles: ISourceObjectFiles, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreateNewObjectEx(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreateNewObjectExQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFiles: ISourceObjectFiles, SFD: boolean, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreateNewSFDObject(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreateNewSFDObjectQuick(ObjectType: MFiles.MFBuiltInObjectType | number, Properties: IPropertyValues, SourceFile: ISourceObjectFile, CheckIn: boolean, AccessControlList: IAccessControlList, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DelayedCheckIn(ObjVer: IObjVer, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DeleteObject(ObjID: IObjID, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DestroyObject(ObjID: IObjID, DestroyAllVersions: boolean, ObjectVersion: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DestroyObjects(ObjIDs: IObjIDs, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	FollowObject(ObjID: IObjID, Follow: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ForceUndoCheckout(ObjVer: IObjVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetCollectionMembers(ObjVer: IObjVer, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetHistory(ObjID: IObjID, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLatestObjectVersionAndProperties(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLatestObjVer(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLatestObjVerEx(ObjID: IObjID, AllowCheckedOut: boolean, UpdateFromServer: boolean, NotifyViews: boolean, successCallback?: (result: IObjVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetMFilesURLForObject(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, URLType: MFiles.MFilesURLType, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetMFilesURLForObjectOrFile(ObjID: IObjID, TargetVersion: number, SpecificVersion: boolean, File: number, URLType: MFiles.MFilesURLType, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectGUID(ObjID: IObjID, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectInfo(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectInfoEx(ObjVer: IObjVer, LatestVersion: boolean, UpdateFromServer: boolean, NotifyViews: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectLocationsInView(View: MFiles.MFBuiltInView | number, LatestSpecificBehavior: MFiles.MFLatestSpecificBehavior, ObjectVersion: IObjVer, successCallback?: (result: IStrings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectPermissions(ObjVer: IObjVer, successCallback?: (result: IObjectVersionPermissions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectVersionAndProperties(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectVersionAndPropertiesOfMultipleObjects(ObjVers: IObjVers, LatestVersions: boolean, AllowCheckedOut: boolean, AllowMissingObjectVersions: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjIDByGUID(ObjectGUID: string, successCallback?: (result: IObjID) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjIDByOriginalObjID(OriginalVaultGUID: string, OriginalObjID: IObjID, successCallback?: (result: IObjID) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetOfflineAvailability(ObjID: IObjID, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetOfflineObjIDs(successCallback?: (result: IObjIDs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetRelationships(ObjVer: IObjVer, Mode: MFiles.MFRelationshipsMode, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetThumbnailAsBytes(ObjVer: IObjVer, FileVer: IFileVer, Width: number, Height: number, GetFileIconThumbnailIfRealThumbnailNotAvailable: boolean, successCallback?: (result: ReadonlyArray<number>) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsObjectCheckedOut(ObjID: IObjID, UpdateFromServer: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsObjectCheckedOutToThisUserOnThisComputer(ObjID: IObjID, UpdateFromServer: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsObjectFollowed(ObjID: IObjID, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsSingleFileObject(ObjVer: IObjVer, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	MatchesSearchConditions(pIObjVer: IObjVer, pISearchConditions: ISearchConditions, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	MatchesSearchConditionsEx(pIObjectVersion: IObjectVersion, pISearchConditions: ISearchConditions, pIPropertyValues: IPropertyValues, pIObjectVersionAndPropertiesOfMultipleObjects: IObjectVersionAndPropertiesOfMultipleObjects, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	NotifyObjectAccess(ObjID: IObjID, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ProposeCheckOutForFile(ParentWindow: number, ObjVersionFile: IObjectFileAndVersion, CanCancel: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RejectCheckInReminder(ObjVer: IObjVer, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveFavorite(ObjID: IObjID, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveFavorites(ObjIDs: IObjIDs, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ResolveConflict(ParticipantObjID: IObjID, KeepThis: boolean, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	Rollback(ObjID: IObjID, RollbackToVersion: number, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetExternalID(ObjID: IObjID, ExtID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetObjectGUID(ObjID: IObjID, ObjectGUID: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetOfflineAvailability(ObjID: IObjID, AvailableInOfflineMode: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetSingleFileObject(ObjVer: IObjVer, SingleFile: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowBasicEditObjectWindow(ParentWindow: number, ObjVer: IObjVer, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowBasicNewObjectWindow(ParentWindow: number, ObjectType: IObjectType, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowChangeStateDialogModal(ParentWindow: number, ObjectID: IObjID, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowCheckInReminder(ParentWindow: number, ObjVer: IObjVer, Asynchronous: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowCheckInReminderDialogModal(ParentWindow: number, ObjVer: IObjVer, ApplyEnvironmentConditions: boolean, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowCheckoutPrompt(ParentWindow: number, Message: string, ObjID: IObjID, ShowCancel: boolean, AutoRejectConsequentPrompts: boolean, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowCollectionMembersDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowCommentsDialogModal(ParentWindow: number, ObjectID: IObjID, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowEditObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjVer: IObjVer, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowHistoryDialogModal(ParentWindow: number, ObjectID: IObjID, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowPrefilledNewObjectWindow(ParentWindow: number, Mode: MFiles.MFObjectWindowMode, ObjectCreationInfo: IObjectCreationInfo, PrefilledPropertyValues: IPropertyValues, AccessControlList: IAccessControlList, successCallback?: (result: IObjectWindowResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowRelatedObjects(ParentWindow: number, SourceObject: IObjID, ObjectTypeTargetForBrowsing: IObjectTypeTargetForBrowsing, ViewSelectionDialogInfoText: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowRelationshipsDialog(ParentWindow: number, ObjectVersion: IObjVer, Modeless: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowSelectObjectHistoryDialogModal(ParentWindow: number, ObjectID: IObjID, WindowTitle: string, successCallback?: (result: IObjOrFileVer) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowSubObjectsDialogModal(ParentWindow: number, ObjectVersion: IObjVer, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UndeleteObject(ObjID: IObjID, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UndoCheckout(ObjVer: IObjVer, successCallback?: (result: IObjectVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UndoCheckoutMultipleObjects(ObjVers: IObjVers, successCallback?: (result: IObjectVersions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultObjectPropertyOperations {
+	ApproveOrRejectAssignment(ObjVer: IObjVer, Approve: boolean): IObjectVersionAndProperties;
+	ApproveOrRejectAssignmentByUser(ObjVer: IObjVer, Approve: boolean, UserID: number): IObjectVersionAndProperties;
+	CreatePropertiesFromFileInformation(FileInformation: IFileInformation): IPropertyValues;
+	GenerateAutomaticPermissionsFromPropertyValues(PropertyValues: IPropertyValues): IAccessControlList;
+	GetProperties(ObjVer: IObjVer, UpdateFromServer: boolean): IPropertyValues;
+	GetPropertiesAsXML(ObjVer: IObjVer, UpdateFromServer: boolean): string;
+	GetPropertiesForDisplay(ObjVer: IObjVer, UpdateFromServer: boolean): IPropertyValuesForDisplay;
+	GetPropertiesForMetadataSync(ObjVer: IObjVer, Format: MFiles.MFMetadataSyncFormat): INamedValues;
+	GetPropertiesOfMultipleObjects(ObjectVersions: IObjVers): IPropertyValuesOfMultipleObjects;
+	GetPropertiesWithIconClues(ObjVer: IObjVer, UpdateFromServer: boolean): IPropertyValuesWithIconClues;
+	GetPropertiesWithIconCluesOfMultipleObjects(ObjectVersions: IObjVers): IPropertyValuesWithIconCluesOfMultipleObjects;
+	GetProperty(ObjVer: IObjVer, Property: number): IPropertyValue;
+	GetVersionComment(ObjVer: IObjVer): IVersionComment;
+	GetVersionCommentHistory(ObjVer: IObjVer): IVersionComments;
+	GetWorkflowState(ObjVer: IObjVer, UpdateFromServer: boolean): IObjectVersionWorkflowState;
+	MarkAssignmentComplete(ObjVer: IObjVer): IObjectVersionAndProperties;
+	MarkAssignmentCompleteByUser(ObjVer: IObjVer, UserID: number): IObjectVersionAndProperties;
+	RemoveProperty(ObjVer: IObjVer, Property: number): IObjectVersionAndProperties;
+	SetAllProperties(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues): IObjectVersionAndProperties;
+	SetAllPropertiesWithPermissions(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList): IObjectVersionAndProperties;
+	SetAllPropertiesWithPermissionsEx(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any): IObjectVersionAndProperties;
+	SetCreationInfoAdmin(ObjVer: IObjVer, UpdateCreatedBy: boolean, CreatedBy: ITypedValue, UpdateCreated: boolean, CreatedUtc: ITypedValue): IObjectVersionAndProperties;
+	SetLastModificationInfoAdmin(ObjVer: IObjVer, UpdateLastModifiedBy: boolean, LastModifiedBy: ITypedValue, UpdateLastModified: boolean, LastModifiedUtc: ITypedValue): IObjectVersionAndProperties;
+	SetProperties(ObjVer: IObjVer, PropertyValues: IPropertyValues): IObjectVersionAndProperties;
+	SetPropertiesOfMultipleObjects(SetPropertiesParamsOfObjects: ISetPropertiesParamsOfMultipleObjects): IObjectVersionAndPropertiesOfMultipleObjects;
+	SetPropertiesWithPermissions(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList): IObjectVersionAndProperties;
+	SetPropertiesWithPermissionsEx(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any): IObjectVersionAndProperties;
+	SetProperty(ObjVer: IObjVer, PropertyValue: IPropertyValue): IObjectVersionAndProperties;
+	SetVersionComment(ObjVer: IObjVer, VersionComment: IPropertyValue): IObjectVersionAndProperties;
+	SetWorkflowState(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState): IObjectVersionAndProperties;
+	SetWorkflowStateEx(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState, ElectronicSignature: any): IObjectVersionAndProperties;
+	SetWorkflowStateTransition(ObjVer: IObjVer, Workflow: number, lStateTransition: number, lVersionComment: string): IObjectVersionAndProperties;
+	SetWorkflowStateTransitionEx(ObjVer: IObjVer, Workflow: number, StateTransition: number, VersionComment: string, ElectronicSignature: any): IObjectVersionAndProperties;
+}
+
+interface IVaultObjectPropertyOperationsAsync {
+	ApproveOrRejectAssignment(ObjVer: IObjVer, Approve: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ApproveOrRejectAssignmentByUser(ObjVer: IObjVer, Approve: boolean, UserID: number, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CreatePropertiesFromFileInformation(FileInformation: IFileInformation, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GenerateAutomaticPermissionsFromPropertyValues(PropertyValues: IPropertyValues, successCallback?: (result: IAccessControlList) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetProperties(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertiesAsXML(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertiesForDisplay(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IPropertyValuesForDisplay) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertiesForMetadataSync(ObjVer: IObjVer, Format: MFiles.MFMetadataSyncFormat, successCallback?: (result: INamedValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertiesOfMultipleObjects(ObjectVersions: IObjVers, successCallback?: (result: IPropertyValuesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertiesWithIconClues(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IPropertyValuesWithIconClues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertiesWithIconCluesOfMultipleObjects(ObjectVersions: IObjVers, successCallback?: (result: IPropertyValuesWithIconCluesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetProperty(ObjVer: IObjVer, Property: number, successCallback?: (result: IPropertyValue) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetVersionComment(ObjVer: IObjVer, successCallback?: (result: IVersionComment) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetVersionCommentHistory(ObjVer: IObjVer, successCallback?: (result: IVersionComments) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowState(ObjVer: IObjVer, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionWorkflowState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	MarkAssignmentComplete(ObjVer: IObjVer, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	MarkAssignmentCompleteByUser(ObjVer: IObjVer, UserID: number, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveProperty(ObjVer: IObjVer, Property: number, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetAllProperties(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetAllPropertiesWithPermissions(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetAllPropertiesWithPermissionsEx(ObjVer: IObjVer, AllowModifyingCheckedInObject: boolean, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetCreationInfoAdmin(ObjVer: IObjVer, UpdateCreatedBy: boolean, CreatedBy: ITypedValue, UpdateCreated: boolean, CreatedUtc: ITypedValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetLastModificationInfoAdmin(ObjVer: IObjVer, UpdateLastModifiedBy: boolean, LastModifiedBy: ITypedValue, UpdateLastModified: boolean, LastModifiedUtc: ITypedValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetProperties(ObjVer: IObjVer, PropertyValues: IPropertyValues, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetPropertiesOfMultipleObjects(SetPropertiesParamsOfObjects: ISetPropertiesParamsOfMultipleObjects, successCallback?: (result: IObjectVersionAndPropertiesOfMultipleObjects) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetPropertiesWithPermissions(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetPropertiesWithPermissionsEx(ObjVer: IObjVer, PropertyValues: IPropertyValues, ACLEnforcingMode: MFiles.MFACLEnforcingMode, ACLProvided: IAccessControlList, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetProperty(ObjVer: IObjVer, PropertyValue: IPropertyValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetVersionComment(ObjVer: IObjVer, VersionComment: IPropertyValue, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetWorkflowState(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetWorkflowStateEx(ObjVer: IObjVer, WorkflowState: IObjectVersionWorkflowState, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetWorkflowStateTransition(ObjVer: IObjVer, Workflow: number, lStateTransition: number, lVersionComment: string, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetWorkflowStateTransitionEx(ObjVer: IObjVer, Workflow: number, StateTransition: number, VersionComment: string, ElectronicSignature: any, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultObjectSearchOperations {
+	FindFile(RelativePath: string, UpdateFromServer: boolean): IObjectFileAndVersion;
+	FindObjectVersionAndProperties(RelativePath: string, UpdateFromServer: boolean): IObjectVersionAndProperties;
+	GetFacetValues(SearchConditions: ISearchConditions, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags): IStringData;
+	GetFacetValuesByPath(RelativePath: string, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags): IStringData;
+	GetObjectCountInSearch(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags): number;
+	GetObjectsInPath(RelativePath: string, SortResults: boolean, UpdateFromServer: boolean): IObjectSearchResults;
+	GetSearchHits(Input: string, SearchCondition: ISearchCondition): IStrings;
+	IsObjectPathInMFiles(RelativePath: string): boolean;
+	SearchForObjectsByCondition(SearchCondition: ISearchCondition, SortResults: boolean): IObjectSearchResults;
+	SearchForObjectsByConditions(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean): IObjectSearchResults;
+	SearchForObjectsByConditionsEx(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, MaxResultCount: number, SearchTimeoutInSeconds: number): IObjectSearchResults;
+	SearchForObjectsByConditionsXML(SearchConditions: ISearchConditions, SortResults: boolean): IXMLSearchResult;
+	SearchForObjectsByExportedSearchConditions(ExportedSearchString: string, SortResults: boolean): IObjectSearchResults;
+	SearchForObjectsByExportedSearchConditionsXML(SearchString: string, SortResults: boolean): IXMLSearchResult;
+	SearchForObjectsByString(SearchString: string, SortResults: boolean, FullTextSearchFlags: MFiles.MFFullTextSearchFlags): IObjectSearchResults;
+}
+
+interface IVaultObjectSearchOperationsAsync {
+	FindFile(RelativePath: string, UpdateFromServer: boolean, successCallback?: (result: IObjectFileAndVersion) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	FindObjectVersionAndProperties(RelativePath: string, UpdateFromServer: boolean, successCallback?: (result: IObjectVersionAndProperties) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFacetValues(SearchConditions: ISearchConditions, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags, successCallback?: (result: IStringData) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFacetValuesByPath(RelativePath: string, Facets: IExpressions, FacetValuesMaxCount: number, Flags: MFiles.MFFacetSearchFlags, successCallback?: (result: IStringData) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectCountInSearch(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectsInPath(RelativePath: string, SortResults: boolean, UpdateFromServer: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetSearchHits(Input: string, SearchCondition: ISearchCondition, successCallback?: (result: IStrings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	IsObjectPathInMFiles(RelativePath: string, successCallback?: (result: boolean) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForObjectsByCondition(SearchCondition: ISearchCondition, SortResults: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForObjectsByConditions(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForObjectsByConditionsEx(SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, MaxResultCount: number, SearchTimeoutInSeconds: number, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForObjectsByConditionsXML(SearchConditions: ISearchConditions, SortResults: boolean, successCallback?: (result: IXMLSearchResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForObjectsByExportedSearchConditions(ExportedSearchString: string, SortResults: boolean, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForObjectsByExportedSearchConditionsXML(SearchString: string, SortResults: boolean, successCallback?: (result: IXMLSearchResult) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForObjectsByString(SearchString: string, SortResults: boolean, FullTextSearchFlags: MFiles.MFFullTextSearchFlags, successCallback?: (result: IObjectSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultObjectTypeOperations {
+	AddObjectTypeAdmin(ObjectType: IObjectTypeAdmin): IObjectTypeAdmin;
+	GetBuiltInObjectType(ObjectType: MFiles.MFBuiltInObjectType): IObjectType;
+	GetObjectType(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectType;
+	GetObjectTypeAdmin(ObjectType: MFiles.MFBuiltInObjectType | number): IObjectTypeAdmin;
+	GetObjectTypeIDByAlias(Alias: string): number;
+	GetObjectTypeIDByGUID(ObjectTypeGUID: string): number;
+	GetObjectTypes(): IObjectTypes;
+	GetObjectTypesAdmin(): IObjectTypesAdmin;
+	RefreshExternalObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, RefreshType: MFiles.MFExternalDBRefreshType): void;
+	RemoveObjectTypeAdmin(ObjectTypeID: number): void;
+	UpdateObjectTypeAdmin(ObjectType: IObjectTypeAdmin): IObjectTypeAdmin;
+	UpdateObjectTypeWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean): IObjectTypeAdmin;
+}
+
+interface IVaultObjectTypeOperationsAsync {
+	AddObjectTypeAdmin(ObjectType: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetBuiltInObjectType(ObjectType: MFiles.MFBuiltInObjectType, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectTypeAdmin(ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectTypeIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectTypeIDByGUID(ObjectTypeGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectTypes(successCallback?: (result: IObjectTypes) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetObjectTypesAdmin(successCallback?: (result: IObjectTypesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RefreshExternalObjectType(ObjectType: MFiles.MFBuiltInObjectType | number, RefreshType: MFiles.MFExternalDBRefreshType, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveObjectTypeAdmin(ObjectTypeID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateObjectTypeAdmin(ObjectType: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateObjectTypeWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultOnServer {
+	readonly GUID: string;
+	readonly Name: string;
+	LogIn(): IVault;
+	LogInAsUser(AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, TimeZone: ITimeZoneInformation): IVault;
+	LogInAsUserWithAuthenticationData(PluginInfo: IPluginInfo, AuthenticationData: INamedValues, AttemptIdentifier: string, TimeZone: ITimeZoneInformation): IAuthenticationResult;
+	LogInAsUserWithSPN(AuthType: MFiles.MFAuthType, UserName: string | null, Password: string | null, Domain: string | null, SPN: string | null, TimeZone: ITimeZoneInformation): IVault;
+}
+
+interface IVaultProperties {
+	DisplayName: string;
+	EncryptionOfFileDataAtRest: boolean;
+	ExtendedMetadataDrivenPermissions: boolean;
+	FileDataConnectionString: string;
+	FileDataStorageType: MFiles.MFFileDataStorage;
+	FullTextSearchLanguage: string;
+	Icon: ReadonlyArray<number>;
+	MainDataFolder: string;
+	SeparateLocationForFileData: IAdditionalFolders;
+	SQLDatabase: ISQLDatabase;
+	VaultGUID: string;
+	Clone(): IVaultProperties;
+}
+
+interface IVaultPropertyDefOperations {
+	AddPropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue): IPropertyDefAdmin;
+	GetBuiltInPropertyDef(PropertyDefType: MFiles.MFBuiltInPropertyDef): IPropertyDef;
+	GetPropertyDef(PropertyDef: MFiles.MFBuiltInPropertyDef | number): IPropertyDef;
+	GetPropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number): IPropertyDefAdmin;
+	GetPropertyDefIDByAlias(Alias: string): number;
+	GetPropertyDefIDByGUID(PropertyDefGUID: string): number;
+	GetPropertyDefs(): IPropertyDefs;
+	GetPropertyDefsAdmin(): IPropertyDefsAdmin;
+	Recalculate(PropertyDef: MFiles.MFBuiltInPropertyDef | number, RecalculateCurrentlyEmptyValuesOnly: boolean): void;
+	RemovePropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number, CopyToAnotherPropertyDef: boolean, TargetPropertyDef: number, Append: boolean, DeleteFromClassesIfNecessary: boolean): void;
+	UpdatePropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue): void;
+	UpdatePropertyDefWithAutomaticPermissionsAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, AutomaticPermissionsForcedActive: boolean): void;
+}
+
+interface IVaultPropertyDefOperationsAsync {
+	AddPropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, successCallback?: (result: IPropertyDefAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetBuiltInPropertyDef(PropertyDefType: MFiles.MFBuiltInPropertyDef, successCallback?: (result: IPropertyDef) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyDef(PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IPropertyDef) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IPropertyDefAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyDefIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyDefIDByGUID(PropertyDefGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyDefs(successCallback?: (result: IPropertyDefs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyDefsAdmin(successCallback?: (result: IPropertyDefsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	Recalculate(PropertyDef: MFiles.MFBuiltInPropertyDef | number, RecalculateCurrentlyEmptyValuesOnly: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemovePropertyDefAdmin(PropertyDef: MFiles.MFBuiltInPropertyDef | number, CopyToAnotherPropertyDef: boolean, TargetPropertyDef: number, Append: boolean, DeleteFromClassesIfNecessary: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdatePropertyDefAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdatePropertyDefWithAutomaticPermissionsAdmin(PropertyDefAdmin: IPropertyDefAdmin, ResetLastUsedValue: ITypedValue, AutomaticPermissionsForcedActive: boolean, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultScheduledJobManagementOperations {
+	AddScheduledJob(ScheduledJob: IScheduledJob): number;
+	CancelScheduledJob(ID: number): void;
+	GetScheduledJob(ID: number): IScheduledJob;
+	GetScheduledJobRunInfo(ID: number): IScheduledJobRunInfo;
+	GetScheduledJobs(): IScheduledJobs;
+	ModifyScheduledJob(ScheduledJob: IScheduledJob): void;
+	RemoveScheduledJob(ID: number): void;
+	StartScheduledJob(ID: number): void;
+}
+
+interface IVaultScheduledJobManagementOperationsAsync {
+	AddScheduledJob(ScheduledJob: IScheduledJob, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	CancelScheduledJob(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetScheduledJob(ID: number, successCallback?: (result: IScheduledJob) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetScheduledJobRunInfo(ID: number, successCallback?: (result: IScheduledJobRunInfo) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetScheduledJobs(successCallback?: (result: IScheduledJobs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ModifyScheduledJob(ScheduledJob: IScheduledJob, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveScheduledJob(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	StartScheduledJob(ID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultServerDataPushOperations {
+	CloneVaultForServerDataPush(ServerDataPushSink: IServerDataPushSink): IVault;
+	SendCancel(RequestID: number): void;
+	SendError(RequestID: number, Error: string): void;
+	SendHeartbeat(RequestID: number): void;
+	SendResponse(RequestID: number, JsonResponseContent: string): void;
+	SetServerDataPushSink(ServerDataPushSink: IServerDataPushSink): void;
+}
+
+interface IVaultServerDataPushOperationsAsync {
+	CloneVaultForServerDataPush(ServerDataPushSink: IServerDataPushSink, successCallback?: (result: IVault) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SendCancel(RequestID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SendError(RequestID: number, Error: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SendHeartbeat(RequestID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SendResponse(RequestID: number, JsonResponseContent: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetServerDataPushSink(ServerDataPushSink: IServerDataPushSink, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultSharedLinkOperations {
+	CreateSharedLink(SharedLinkCreationInfo: ISharedLinkInfo): ISharedLinkInfo;
+	DeleteSharedLink(AccessKey: string): void;
+	GetSharedLink(AccessKey: string): ISharedLinkInfo;
+	GetSharedLinks(CreatedByUser: number): ISharedLinkInfos;
+	GetSharedLinksByObject(ObjID: IObjID): ISharedLinkInfos;
+}
+
+interface IVaultSharedLinkOperationsAsync {
+	CreateSharedLink(SharedLinkCreationInfo: ISharedLinkInfo, successCallback?: (result: ISharedLinkInfo) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	DeleteSharedLink(AccessKey: string, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetSharedLink(AccessKey: string, successCallback?: (result: ISharedLinkInfo) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetSharedLinks(CreatedByUser: number, successCallback?: (result: ISharedLinkInfos) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetSharedLinksByObject(ObjID: IObjID, successCallback?: (result: ISharedLinkInfos) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultsOnServer {
+	readonly Count: number;
+	GetVaultByGUID(GUID: string): IVaultOnServer;
+	GetVaultByName(Name: string): IVaultOnServer;
+	GetVaultIndexByGUID(GUID: string): number;
+	GetVaultIndexByName(Name: string): number;
+	Item(Index: number): IVaultOnServer;
+}
+
+interface IVaultTraditionalFolderOperations {
+	GetTraditionalFolderContents(Folder: number): ITraditionalFolderContents;
+}
+
+interface IVaultTraditionalFolderOperationsAsync {
+	GetTraditionalFolderContents(Folder: number, successCallback?: (result: ITraditionalFolderContents) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultUI {
+	readonly Events: IVaultUIEvents;
+	readonly Vault: IVault;
+	readonly VaultEntry: IVaultEntry;
+	ShowMessage(message: string | IMessage): number;
+	ShowPopupDashboard(dashboardID: string, waitUntilClosed: boolean, data: any): void;
+}
+
+interface IVaultUIEvents extends IEvents {
+	OnNewVaultEntry?(vaultEntry: IVaultEntry): void | IVaultEntryEvents;
+	OnStarted?(): void;
+	OnStop?(): void;
+}
+
+interface IVaultUserGroupOperations {
+	AddOrUndeleteUserGroup(UserGroup: IUserGroupAdmin): IUserGroupAdmin;
+	AddUserGroupAdmin(UserGroup: IUserGroupAdmin): IUserGroupAdmin;
+	GetGroupsOfUserOrGroup(UserOrGroupID: number, IsGroup: boolean): IUserGroups;
+	GetUserGroup(UserGroupID: MFiles.MFBuiltInUserGroup | number): IUserGroup;
+	GetUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number): IUserGroupAdmin;
+	GetUserGroupIDByAlias(Alias: string): number;
+	GetUserGroupIDByGUID(UserGroupGUID: string): number;
+	GetUserGroupList(): IKeyNamePairs;
+	GetUserGroups(): IUserGroups;
+	GetUserGroupsAdmin(): IUserGroupsAdmin;
+	RemoveUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number): void;
+	UpdateUserGroupAdmin(UserGroup: IUserGroupAdmin): void;
+}
+
+interface IVaultUserGroupOperationsAsync {
+	AddOrUndeleteUserGroup(UserGroup: IUserGroupAdmin, successCallback?: (result: IUserGroupAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	AddUserGroupAdmin(UserGroup: IUserGroupAdmin, successCallback?: (result: IUserGroupAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetGroupsOfUserOrGroup(UserOrGroupID: number, IsGroup: boolean, successCallback?: (result: IUserGroups) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserGroup(UserGroupID: MFiles.MFBuiltInUserGroup | number, successCallback?: (result: IUserGroup) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number, successCallback?: (result: IUserGroupAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserGroupIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserGroupIDByGUID(UserGroupGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserGroupList(successCallback?: (result: IKeyNamePairs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserGroups(successCallback?: (result: IUserGroups) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserGroupsAdmin(successCallback?: (result: IUserGroupsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveUserGroupAdmin(UserGroupID: MFiles.MFBuiltInUserGroup | number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateUserGroupAdmin(UserGroup: IUserGroupAdmin, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultUserOperations {
+	AddOrUndeleteUserAccount(User: IUserAccount): IUserAccount;
+	AddUserAccount(User: IUserAccount): IUserAccount;
+	GetLoginAccountOfUser(UserID: number): ILoginAccount;
+	GetLoginAccounts(): ILoginAccounts;
+	GetUserAccount(UserID: number): IUserAccount;
+	GetUserAccounts(): IUserAccounts;
+	GetUserIDByGUID(UserGUID: string): number;
+	GetUserList(): IKeyNamePairs;
+	ModifyUserAccount(User: IUserAccount): void;
+	RemoveUserAccount(UserID: number): void;
+}
+
+interface IVaultUserOperationsAsync {
+	AddOrUndeleteUserAccount(User: IUserAccount, successCallback?: (result: IUserAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	AddUserAccount(User: IUserAccount, successCallback?: (result: IUserAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLoginAccountOfUser(UserID: number, successCallback?: (result: ILoginAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetLoginAccounts(successCallback?: (result: ILoginAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserAccount(UserID: number, successCallback?: (result: IUserAccount) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserAccounts(successCallback?: (result: IUserAccounts) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserIDByGUID(UserGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetUserList(successCallback?: (result: IKeyNamePairs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ModifyUserAccount(User: IUserAccount, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveUserAccount(UserID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultUserSettingOperations {
+	ChangeVaultLanguage(Language: number): void;
+	GetSubstituteUsers(): IUserOrUserGroupIDs;
+	GetVaultLanguage(): number;
+	GetVaultLanguageCode(): string;
+	SetSubstituteUsers(UserOrUserGroupIDs: IUserOrUserGroupIDs): void;
+}
+
+interface IVaultUserSettingOperationsAsync {
+	ChangeVaultLanguage(Language: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetSubstituteUsers(successCallback?: (result: IUserOrUserGroupIDs) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetVaultLanguage(successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetVaultLanguageCode(successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SetSubstituteUsers(UserOrUserGroupIDs: IUserOrUserGroupIDs, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultValueListItemOperations {
+	AddValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItem: IValueListItem, AdministrativeOperation: boolean): IValueListItem;
+	ChangeAutomaticPermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList, NameForAutomaticPermissions: string, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions): void;
+	ChangeAutomaticPermissionsToItemsOwnPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions): void;
+	ChangeAutomaticPermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions): void;
+	ChangePermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList): void;
+	ChangePermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number): void;
+	ClearAutomaticPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number): void;
+	GetValueListItemByDisplayID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string): IValueListItem;
+	GetValueListItemByDisplayIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItem;
+	GetValueListItemByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItem;
+	GetValueListItemByID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number): IValueListItem;
+	GetValueListItemByIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItem;
+	GetValueListItemIDByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean): number;
+	GetValueListItems(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType): IValueListItems;
+	GetValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItems;
+	GetValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number): IValueListItems;
+	GetValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number): IValueListItemsWithPermissions;
+	RemoveValueListItem(ValueList: MFiles.MFBuiltInValueList | number, Item: number): void;
+	SearchForValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean): IValueListItemSearchResults;
+	SearchForValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number): IValueListItemSearchResults;
+	SearchForValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number): IValueListItemSearchResultsWithPermissions;
+	UndeleteValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number): void;
+	UpdateValueListItem(ValueListItem: IValueListItem): void;
+}
+
+interface IVaultValueListItemOperationsAsync {
+	AddValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItem: IValueListItem, AdministrativeOperation: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ChangeAutomaticPermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList, NameForAutomaticPermissions: string, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ChangeAutomaticPermissionsToItemsOwnPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ChangeAutomaticPermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number, CanDeactivate: boolean, AutomaticPermissionsOperationOptions: MFiles.MFAutomaticPermissionsOperationOptions, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ChangePermissionsToACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, AccessControlList: IAccessControlList, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ChangePermissionsToNamedACL(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, NamedACL: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ClearAutomaticPermissions(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemByDisplayID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemByDisplayIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemDisplayID: string, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemByID(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemByIDEx(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItem) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemIDByGUID(ValueList: MFiles.MFBuiltInValueList | number, ItemGUID: string, AllowDeletedItems: boolean, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItems(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, successCallback?: (result: IValueListItemsWithPermissions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveValueListItem(ValueList: MFiles.MFBuiltInValueList | number, Item: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForValueListItemsEx(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, successCallback?: (result: IValueListItemSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForValueListItemsEx2(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number, successCallback?: (result: IValueListItemSearchResults) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SearchForValueListItemsWithPermissions(ValueList: MFiles.MFBuiltInValueList | number, SearchConditions: ISearchConditions, UpdateFromServer: boolean, RefreshTypeIfExternalValueList: MFiles.MFExternalDBRefreshType, ReplaceCurrentUserWithCallersIdentity: boolean, PropertyDef: MFiles.MFBuiltInPropertyDef | number, MaxResults: number, successCallback?: (result: IValueListItemSearchResultsWithPermissions) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UndeleteValueListItem(ValueList: MFiles.MFBuiltInValueList | number, ValueListItemID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateValueListItem(ValueListItem: IValueListItem, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultValueListOperations {
+	AddValueListAdmin(ValueList: IObjectTypeAdmin): IObjectTypeAdmin;
+	GetBuiltInValueList(BuiltInValueList: MFiles.MFBuiltInValueList): IObjectType;
+	GetValueList(ValueList: MFiles.MFBuiltInValueList | number): IObjectType;
+	GetValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number): IObjectTypeAdmin;
+	GetValueListIDByAlias(Alias: string): number;
+	GetValueListIDByGUID(ValueListGUID: string): number;
+	GetValueLists(): IObjectTypes;
+	GetValueListsAdmin(): IObjectTypesAdmin;
+	RefreshExternalValueList(ValueList: MFiles.MFBuiltInValueList | number, RefreshType: MFiles.MFExternalDBRefreshType): void;
+	RemoveValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number): void;
+	UpdateValueListAdmin(ValueList: IObjectTypeAdmin): IObjectTypeAdmin;
+	UpdateValueListWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean): IObjectTypeAdmin;
+}
+
+interface IVaultValueListOperationsAsync {
+	AddValueListAdmin(ValueList: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetBuiltInValueList(BuiltInValueList: MFiles.MFBuiltInValueList, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueList(ValueList: MFiles.MFBuiltInValueList | number, successCallback?: (result: IObjectType) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListIDByGUID(ValueListGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueLists(successCallback?: (result: IObjectTypes) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetValueListsAdmin(successCallback?: (result: IObjectTypesAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RefreshExternalValueList(ValueList: MFiles.MFBuiltInValueList | number, RefreshType: MFiles.MFExternalDBRefreshType, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveValueListAdmin(ValueListID: MFiles.MFBuiltInValueList | number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateValueListAdmin(ValueList: IObjectTypeAdmin, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateValueListWithAutomaticPermissionsAdmin(ObjectType: IObjectTypeAdmin, AutomaticPermissionsForcedActive: boolean, successCallback?: (result: IObjectTypeAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultViewOperations {
+	AddOfflineFilter(OfflineFilter: IView): IView;
+	AddTemporarySearchView(View: IView, SearchCriteria: ISearchCriteria, BaseSearchConditions: ISearchConditions): IView;
+	AddView(View: IView): IView;
+	FindPropertyFolderLocationInView(View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues): string;
+	GetBuiltInView(BuiltInView: MFiles.MFBuiltInView): IView;
+	GetFolderContents(FolderLocation: IFolderDefs): IFolderContentItems;
+	GetFolderNameListing(ExpressionEx: IExpressionEx, SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean): IFolderNameListing;
+	GetFolderUIStateForFolder(CommonState: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean): IFolderUIState;
+	GetFolderUIStateForSpecialLocation(CommonState: boolean, LocationType: MFiles.MFFolderUIStateLocationType): IFolderUIState;
+	GetMFilesURLForView(ViewID: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, SimpleURL: boolean): string;
+	GetPropertyValuesOfFolder(FolderLocation: IFolderDefs, ObjectType: MFiles.MFBuiltInObjectType | number): IPropertyValues;
+	GetPropertyValuesOfPath(Path: string, ObjectType: MFiles.MFBuiltInObjectType | number): IPropertyValues;
+	GetTemporarySearchByPath(RelativePath: string): ITemporarySearchView;
+	GetTemporarySearchView(ViewID: MFiles.MFBuiltInView | number): ITemporarySearchView;
+	GetView(View: MFiles.MFBuiltInView | number): IView;
+	GetViewIDByGUID(ViewGUID: string): number;
+	GetViewLocationInClient(View: MFiles.MFBuiltInView | number, IncludeViewNameInPath: boolean): string;
+	GetViews(ViewCategory: MFiles.MFViewCategory, AllViews: boolean, ParentView: number): IViews;
+	GetViewsAdmin(IncludeCommonViews: boolean, UserID: number): IViews;
+	ModifyTemporarySearch(TemporarySearchView: ITemporarySearchView): void;
+	RemoveView(View: MFiles.MFBuiltInView | number): void;
+	ResetFolderUIStateForFolder(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean): IFolderUIState;
+	ResetFolderUIStateForSpecialLocation(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, LocationType: MFiles.MFFolderUIStateLocationType): IFolderUIState;
+	SaveFolderUIStateForFolder(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, State: IFolderUIState): void;
+	SaveFolderUIStateForSpecialLocation(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, LocationType: MFiles.MFFolderUIStateLocationType, State: IFolderUIState): void;
+	ShowViewOrPropertyFolder(ParentWindow: number, View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues): void;
+	UpdateView(View: IView): IView;
+}
+
+interface IVaultViewOperationsAsync {
+	AddOfflineFilter(OfflineFilter: IView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	AddTemporarySearchView(View: IView, SearchCriteria: ISearchCriteria, BaseSearchConditions: ISearchConditions, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	AddView(View: IView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	FindPropertyFolderLocationInView(View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetBuiltInView(BuiltInView: MFiles.MFBuiltInView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFolderContents(FolderLocation: IFolderDefs, successCallback?: (result: IFolderContentItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFolderNameListing(ExpressionEx: IExpressionEx, SearchConditions: ISearchConditions, SearchFlags: MFiles.MFSearchFlags, SortResults: boolean, successCallback?: (result: IFolderNameListing) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFolderUIStateForFolder(CommonState: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetFolderUIStateForSpecialLocation(CommonState: boolean, LocationType: MFiles.MFFolderUIStateLocationType, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetMFilesURLForView(ViewID: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, SimpleURL: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyValuesOfFolder(FolderLocation: IFolderDefs, ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetPropertyValuesOfPath(Path: string, ObjectType: MFiles.MFBuiltInObjectType | number, successCallback?: (result: IPropertyValues) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetTemporarySearchByPath(RelativePath: string, successCallback?: (result: ITemporarySearchView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetTemporarySearchView(ViewID: MFiles.MFBuiltInView | number, successCallback?: (result: ITemporarySearchView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetView(View: MFiles.MFBuiltInView | number, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetViewIDByGUID(ViewGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetViewLocationInClient(View: MFiles.MFBuiltInView | number, IncludeViewNameInPath: boolean, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetViews(ViewCategory: MFiles.MFViewCategory, AllViews: boolean, ParentView: number, successCallback?: (result: IViews) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetViewsAdmin(IncludeCommonViews: boolean, UserID: number, successCallback?: (result: IViews) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ModifyTemporarySearch(TemporarySearchView: ITemporarySearchView, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveView(View: MFiles.MFBuiltInView | number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ResetFolderUIStateForFolder(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ResetFolderUIStateForSpecialLocation(ResetToProgramDefaults: boolean, ResetToCommonDefaults: boolean, LocationType: MFiles.MFFolderUIStateLocationType, successCallback?: (result: IFolderUIState) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SaveFolderUIStateForFolder(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, FolderLocation: IFolderDefs, ObjectFolder: boolean, State: IFolderUIState, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	SaveFolderUIStateForSpecialLocation(SaveAsCommonSettings: boolean, ResetCommonSettingsToAllUsers: boolean, LocationType: MFiles.MFFolderUIStateLocationType, State: IFolderUIState, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	ShowViewOrPropertyFolder(ParentWindow: number, View: MFiles.MFBuiltInView | number, PropertyFolders: ITypedValues, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateView(View: IView, successCallback?: (result: IView) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVaultWorkflowOperations {
+	AddWorkflowAdmin(Workflow: IWorkflowAdmin): IWorkflowAdmin;
+	GetStateTransitionSignatureSettings(FromState: number, ToState: number): ISignatureSettings;
+	GetStateTransitionSignatureSettingsByID(StateTransitionID: number): ISignatureSettings;
+	GetWorkflowAdmin(WorkflowID: number): IWorkflowAdmin;
+	GetWorkflowForClient(WorkflowID: number, UpdateFromServer: boolean): IWorkflow;
+	GetWorkflowIDByAlias(Alias: string): number;
+	GetWorkflowIDByGUID(WorkflowGUID: string): number;
+	GetWorkflowsAdmin(): IWorkflowsAdmin;
+	GetWorkflowsAsValueListItems(UpdateFromServer: boolean): IValueListItems;
+	GetWorkflowsForClient(UpdateFromServer: boolean): IWorkflows;
+	GetWorkflowStateIDByAlias(Alias: string): number;
+	GetWorkflowStateIDByGUID(StateGUID: string): number;
+	GetWorkflowStates(Workflow: number, CurrentState: ITypedValue): IStates;
+	GetWorkflowStatesEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer): IStates;
+	GetWorkflowStateTransitionIDByAlias(Alias: string): number;
+	GetWorkflowStateTransitionIDByGUID(StateTransitionGUID: string): number;
+	GetWorkflowStateTransitions(Workflow: number, CurrentState: ITypedValue): IStateTransitionsForClient;
+	GetWorkflowStateTransitionsAsJSON(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer): string;
+	GetWorkflowStateTransitionsEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer): IStateTransitionsForClient;
+	RemoveWorkflowAdmin(WorkflowID: number): void;
+	UpdateWorkflowAdmin(Workflow: IWorkflowAdmin): IWorkflowAdmin;
+}
+
+interface IVaultWorkflowOperationsAsync {
+	AddWorkflowAdmin(Workflow: IWorkflowAdmin, successCallback?: (result: IWorkflowAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetStateTransitionSignatureSettings(FromState: number, ToState: number, successCallback?: (result: ISignatureSettings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetStateTransitionSignatureSettingsByID(StateTransitionID: number, successCallback?: (result: ISignatureSettings) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowAdmin(WorkflowID: number, successCallback?: (result: IWorkflowAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowForClient(WorkflowID: number, UpdateFromServer: boolean, successCallback?: (result: IWorkflow) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowIDByGUID(WorkflowGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowsAdmin(successCallback?: (result: IWorkflowsAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowsAsValueListItems(UpdateFromServer: boolean, successCallback?: (result: IValueListItems) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowsForClient(UpdateFromServer: boolean, successCallback?: (result: IWorkflows) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStateIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStateIDByGUID(StateGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStates(Workflow: number, CurrentState: ITypedValue, successCallback?: (result: IStates) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStatesEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer, successCallback?: (result: IStates) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStateTransitionIDByAlias(Alias: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStateTransitionIDByGUID(StateTransitionGUID: string, successCallback?: (result: number) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStateTransitions(Workflow: number, CurrentState: ITypedValue, successCallback?: (result: IStateTransitionsForClient) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStateTransitionsAsJSON(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer, successCallback?: (result: string) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	GetWorkflowStateTransitionsEx(Workflow: number, CurrentState: ITypedValue, ObjVer: IObjVer, successCallback?: (result: IStateTransitionsForClient) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	RemoveWorkflowAdmin(WorkflowID: number, successCallback?: () => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+	UpdateWorkflowAdmin(Workflow: IWorkflowAdmin, successCallback?: (result: IWorkflowAdmin) => void, errorCallback?: (shorterror: string, longerror: string, errorobj: any) => void, finallyCallback?: () => void): void;
+}
+
+interface IVerifyVaultJob {
+	readonly FixErrors: boolean;
+	readonly VaultGUID: string;
+	readonly VerifyFileContents: boolean;
+	Clone(): IVerifyVaultJob;
+	GetNumberOfSteps(): number;
+	GetOneBasedIndexOfStep(CurrentStep: number): number;
+	GetStepProgressText(CurrentStep: number): string;
+	Set(GuidVault: string, FixErrors: boolean, VerifyFileContents: boolean): void;
+}
+
+interface IVerifyVaultJobOutput {
+	readonly Errors: IStrings;
+}
+
+interface IVersionComment {
+	readonly LastModifiedBy: IPropertyValue;
+	readonly ObjVer: IObjVer;
+	readonly StatusChanged: IPropertyValue;
+	readonly VersionComment: IPropertyValue;
+}
+
+interface IVersionComments {
+	readonly Count: number;
+	Item(Index: number): IVersionComment;
+}
+
+interface IView {
+	AccessControlList: IAccessControlList;
+	Common: boolean;
+	readonly GUID: string;
+	HasParent: boolean;
+	ID: number;
+	Levels: IExpressionExs;
+	LookInAllVersions: boolean;
+	Name: string;
+	Parent: number;
+	ReturnLatestVisibleVersion: boolean;
+	SearchConditions: ISearchConditions;
+	SearchDef: ISearchDef;
+	SearchFlags: MFiles.MFSearchFlags;
+	ViewFlags: MFiles.MFViewFlag;
+	ViewLocation: IViewLocation;
+	ViewType: MFiles.MFViewType;
+	Visible: boolean;
+	Clone(): IView;
+	CloneFrom(View: IView): void;
+}
+
+interface IViewLocation {
+	OverlappedFolder: ITypedValue;
+	Overlapping: boolean;
+	ParentFolder: IFolderDefs;
+	Clone(): IViewLocation;
+}
+
+interface IViews {
+	readonly Count: number;
+	Item(Index: number): IView;
+}
+
+interface IWeeklyTrigger {
+	DaysOfTheWeek: MFiles.MFTriggerWeekDay;
+	WeeksInterval: number;
+}
+
+interface IWindow {
+	readonly Events: IWindowEvents;
+	readonly Handle: number;
+	Height: number;
+	readonly IsFocused: boolean;
+	Maximizable: boolean;
+	Minimizable: boolean;
+	Resizable: boolean;
+	Title: string;
+	Width: number;
+	Close(): void;
+	Focus(): void;
+	Maximize(): void;
+	Minimize(): void;
+	Restore(): void;
+	SetDefaultSize(defaultWidth: number, defaultHeight: number, resizeToDefault: boolean): void;
+}
+
+interface IWindowEvents extends IEvents {
+	OnCloseWindow?(): boolean;
+}
+
+interface IWorkflow {
+	ID: number;
+	Name: string;
+	ObjectClass: (MFiles.MFBuiltInDocumentClass | MFiles.MFBuiltInObjectClass | number);
+	Clone(): IWorkflow;
+	GetAsLookup(): ILookup;
+	GetAsTypedValue(): ITypedValue;
+}
+
+interface IWorkflowAdmin {
+	Description: string;
+	Permissions: IAccessControlList;
+	SemanticAliases: ISemanticAliases;
+	States: IStatesAdmin;
+	StateTransitions: IStateTransitions;
+	Workflow: IWorkflow;
+	Clone(): IWorkflowAdmin;
+}
+
+interface IWorkflowAssignment {
+	AssignedTo_DEPRECATED: IPropertyValue;
+	CompletedBy_DEPRECATED: IPropertyValue;
+	Deadline_DEPRECATED: IPropertyValue;
+	Description_DEPRECATED: IPropertyValue;
+	MonitoredBy_DEPRECATED: IPropertyValue;
+	Clone_DEPRECATED(): IWorkflowAssignment;
+}
+
+interface IWorkflows {
+	readonly Count: number;
+	Item(Index: number): IWorkflow;
+}
+
+interface IWorkflowsAdmin {
+	readonly Count: number;
+	Add(Index: number, WorkflowAdmin: IWorkflowAdmin): void;
+	Item(Index: number): IWorkflowAdmin;
+	Remove(Index: number): void;
+}
+
+interface IXMLSearchResult {
+	readonly MoreResults: boolean;
+	readonly SearchResult: string;
+}
+
+declare namespace MFiles {
+	const enum BuiltinCommand {
+		Undefined = 0,
+		FIRST = 1,
+		NewView = 2,
+		NewOfflineFilter = 3,
+		NewTraditionalFolder = 4,
+		NewPropertyFolder = 5,
+		ConvertToDocument = 6,
+		ConvertToDocumentFiles = 7,
+		ImportFilesAndFolders = 8,
+		MakeCopy = 9,
+		CheckOut = 10,
+		CheckIn = 11,
+		CheckInWithComments = 12,
+		UndoCheckOut = 13,
+		Properties = 14,
+		MarkFolderForOfflineAvailability = 15,
+		MarkForOfflineAvailability = 16,
+		RemoveOfflineAvailability = 17,
+		ShowHistory = 18,
+		ShowRelationships = 19,
+		ShowCollectionMembers = 20,
+		ViewEditSubobjects = 21,
+		ShowComments = 22,
+		NewAssignment = 23,
+		ShowAssignments = 24,
+		CompleteAssignment = 25,
+		ChangeState = 26,
+		Workflow = 27,
+		MarkForArchiving = 28,
+		ClearArchiveMarker = 29,
+		Undelete = 30,
+		ConvertToSingleFileDocument = 31,
+		ConvertToOneMultiFileDocument = 32,
+		ReplaceWithFile = 33,
+		GoOnline = 34,
+		GoOffline = 35,
+		LogOut = 36,
+		ClientSettings = 37,
+		ServerAdmin = 38,
+		NotificationSettings = 39,
+		ClearLocalCache = 40,
+		ChangePassword = 41,
+		ChangeLanguage = 42,
+		AddDocumentFromScanner = 43,
+		AddFileFromScanner = 44,
+		ReplaceWithFileFromScanner = 45,
+		ConvertToSearchablePDF = 46,
+		SendLinkByEmail = 47,
+		SendCopyByEmail = 48,
+		SendPDFByEmail = 49,
+		SaveAsPDF = 50,
+		SubstituteUsers = 51,
+		ShowBottomPane = 52,
+		ShowPropertiesPane = 52,
+		ShowRightPane = 53,
+		ShowPreviewPane = 53,
+		GroupObjectsByObjectType = 54,
+		GroupViewsAndFolders = 55,
+		HideView = 56,
+		UnhideView = 57,
+		CleanView = 58,
+		UnhideViews = 59,
+		ResetUISettingsToDefaults = 60,
+		SaveAsCommonUISettings = 61,
+		AddToFavorites = 62,
+		RemoveFromFavorites = 63,
+		CreateOrGetShortcut = 64,
+		CreateShortcut = 65,
+		AddShortcutToTaskPane = 66,
+		AddDashboardToViewLocMain = 67,
+		AddReportToViewLocMain = 67,
+		AddDashboardToViewLocRight = 68,
+		AddReportToViewLocRight = 68,
+		AddDashboardToViewLocBottom = 69,
+		AddReportToViewLocBottom = 69,
+		RemoveDashboardFromViewLocMain = 70,
+		RemoveReportFromViewLocMain = 70,
+		RemoveDashboardFromViewLocRight = 71,
+		RemoveReportFromViewLocRight = 71,
+		RemoveDashboardFromViewLocBottom = 72,
+		RemoveReportFromViewLocBottom = 72,
+		Copy = 73,
+		Cut = 74,
+		Paste = 75,
+		Delete = 76,
+		Rename = 77,
+		NewWindow = 78,
+		ExportObjects = 79,
+		ExportSearchBarConditions = 80,
+		ConvertToSingleFilePDF = 81,
+		ConvertToMultiFilePDF = 82,
+		ChooseColumns = 83,
+		PasteAsMultiFileDocument = 84,
+		SelectAll = 85,
+		InvertSelection = 86,
+		NewObject = 87,
+		Refresh = 88,
+		RollBack = 89,
+		DeleteAll = 90,
+		Destroy = 91,
+		ModifyVersionDetails = 92,
+		LabelThisVersion = 93,
+		NewSubobject = 94,
+		AddCollectionMember = 95,
+		EditCollectionMembership = 96,
+		RemoveCollectionMembership = 97,
+		AddRelationship = 98,
+		EditRelationship = 99,
+		RemoveRelationship = 100,
+		SubMenu_NewObject = 101,
+		SubMenu_NewFile = 102,
+		SubMenu_WindowsCommands = 103,
+		SubMenu_Send = 104,
+		SubMenu_DisplayMode = 105,
+		ChangeViewMode = 106,
+		SubMenu_OfflineAvailability = 107,
+		SubMenu_BrowseRelatedObjects = 108,
+		SubMenu_Archiving = 109,
+		SubMenu_Workflow = 110,
+		SubMenu_ScanningAndOCR = 111,
+		SubMenu_RefreshExtObjects = 112,
+		SubMenu_Dashboards = 113,
+		SubMenu_Reports = 113,
+		GroupObjectsByFirstLetters = 114,
+		GroupFoldersByFirstLetters = 115,
+		AddGroupingLevel = 116,
+		CurrentGroupingLevel = 117,
+		RemoveCurrentGroupingLevel = 118,
+		HideOrShowEmptyFolders = 119,
+		BrowseInThisWindow = 120,
+		GroupBy = 121,
+		GroupFoldersBy = 122,
+		MarkComplete = 123,
+		GoToCustomView = 124,
+		Submenu_VaultX = 125,
+		Submenu_ViewX = 126,
+		Submenu_DocumentX = 127,
+		HitHighlighting = 128,
+		CheckOutForCoauthoring = 129,
+		BeginCoauthoring = 130,
+		EndCoauthoring = 131,
+		ShowOriginalObject = 132,
+		SendCoauthoringLink = 133,
+		ResolveConflictKeepThis = 134,
+		ResolveConflictDiscardThis = 135,
+		Applications = 136,
+		ShareViaSkyDrive = 137,
+		ShareViaSkyDriveAsPDF = 138,
+		ShowMetadataInRightPane = 139,
+		ShowMetadataInBottomPane = 140,
+		MFilesHelp = 141,
+		MFilesGuidedTour = 142,
+		ShowNavigationPane = 143,
+		CustomizePropertyFolder = 144,
+		UncustomizePropertyFolder = 145,
+		UseNormalLayout = 146,
+		UseCompactLayout = 147,
+		RightPane_Normal = 148,
+		RightPane_Minimized = 149,
+		RightPane_Off = 150,
+		BottomPane_Normal = 151,
+		BottomPane_Minimized = 152,
+		BottomPane_Off = 153,
+		NavigationPane_On = 154,
+		NavigationPane_Off = 155,
+		ShowVisualAnnotations = 156,
+		ShowAllVisualAnnotations = 157,
+		HideAllVisualAnnotations = 158,
+		EditOneAnnotation = 159,
+		SaveAnnotation = 160,
+		NewAnnotation = 161,
+		AboutMFiles = 162,
+		MarkApproved = 163,
+		MarkRejected = 164,
+		ApproveAssignment = 165,
+		RejectAssignment = 166,
+		ChangeStateAdmin = 167,
+		SharePublicLink = 168,
+		SharedByMe = 169,
+		UploadFiles = 170,
+		DiscardFileModifications = 171,
+		ShowSearchResultsFromMultipleVaults = 172,
+		ShowSearchRefinementOptions = 173,
+		LAST = 174,
+		ALL = 268435455
+	}
+
+	const enum CommandLocation {
+		Undefined = 0,
+		MainMenu = 1,
+		ContextMenu = 2,
+		TaskPane = 4,
+		All = 268435455
+	}
+
+	const enum CommandState {
+		Undefined = 0,
+		Active = 1,
+		Inactive = 2,
+		Hidden = 3
+	}
+
+	const enum DefaultIcon {
+		CheckOut = 0,
+		CheckIn = 1,
+		UndoCheckOut = 2,
+		History = 4,
+		Properties = 5,
+		MakeCopy = 6,
+		View = 8,
+		Root = 9,
+		Workflow = 11,
+		LogOut = 12,
+		GoOnline = 13,
+		GoOffline = 14,
+		Assignment = 15,
+		MarkComplete = 16,
+		TraditionalFolder = 17,
+		PropertyFolder = 18,
+		File = 19,
+		MFD = 20,
+		PrivateView = 21,
+		Collection = 22,
+		ChangeState = 24,
+		RelationShips = 25,
+		SelectedState = 26
+	}
+
+	const enum Event {
+		Undefined = 0,
+		Notification = 1,
+		Started = 2,
+		Stop = 3,
+		ShowPane = 4,
+		HidePane = 5,
+		PaneResized = 6,
+		NewShellFrame = 7,
+		NewNormalShellFrame = 8,
+		NewCommonDialogShellFrame = 9,
+		NewEmbeddedShellFrame = 10,
+		NewTaskPane = 11,
+		NewBottomPane = 12,
+		NewSearchPane = 13,
+		NewRightPane = 14,
+		NewShellListing = 15,
+		NewCommands = 16,
+		ActiveListingChanged = 17,
+		NewTab = 18,
+		TabSelected = 19,
+		TabUnselected = 20,
+		MinimizedStateChanged = 21,
+		BuiltinCommand = 22,
+		CustomCommand = 23,
+		SelectionChanged = 24,
+		SelectedItemsChanged = 25,
+		ContentChanged = 26,
+		ShowContextMenu = 27,
+		ShowMainMenu = 28,
+		ListingActivated = 29,
+		ListingDeactivated = 30,
+		SearchInitiated = 31,
+		SearchReady = 32,
+		CloseWindow = 33,
+		NewVaultEntry = 34,
+		CreateObject = 35,
+		ObjectCreated = 36,
+		DestroyObject = 37,
+		ObjectDestroyed = 38,
+		DestroyObjects = 39,
+		ObjectsDestroyed = 40,
+		DestroyObjectVersion = 41,
+		ObjectVersionDestroyed = 42,
+		DestroyObjectVersions = 43,
+		ObjectVersionsDestroyed = 44,
+		RemoveObject = 45,
+		ObjectRemoved = 46,
+		RemoveObjects = 47,
+		ObjectsRemoved = 48,
+		UndeleteObject = 49,
+		ObjectUndeleted = 50,
+		UndeleteObjects = 51,
+		ObjectsUndeleted = 52,
+		AddObjectFile = 53,
+		ObjectFileAdded = 54,
+		RemoveObjectFile = 55,
+		ObjectFileRemoved = 56,
+		RenameObjectFile = 57,
+		ObjectFileRenamed = 58,
+		CheckInObject = 59,
+		ObjectCheckedIn = 60,
+		CheckInObjects = 61,
+		ObjectsCheckedIn = 62,
+		CheckOutObject = 63,
+		ObjectCheckedOut = 64,
+		CheckOutObjects = 65,
+		ObjectsCheckedOut = 66,
+		UndoObjectCheckout = 67,
+		ObjectCheckoutUndone = 68,
+		UndoObjectCheckouts = 69,
+		ObjectCheckoutsUndone = 70,
+		RollBackObjectVersion = 71,
+		ObjectVersionRolledBack = 72,
+		SetPropertiesOfObjectVersion = 73,
+		PropertiesOfObjectVersionSet = 74,
+		SetPropertiesOfObjectVersions = 75,
+		PropertiesOfObjectVersionsSet = 76,
+		SetObjectVersionPermissions = 77,
+		ObjectVersionPermissionsSet = 78,
+		AddObjectToFavorites = 79,
+		ObjectAddedToFavorites = 80,
+		AddObjectsToFavorites = 81,
+		ObjectsAddedToFavorites = 82,
+		RemoveObjectFromFavorites = 83,
+		ObjectRemovedFromFavorites = 84,
+		RemoveObjectsFromFavorites = 85,
+		ObjectsRemovedFromFavorites = 86,
+		ModifyObjectVersionLabels = 87,
+		ObjectVersionLabelsModified = 88,
+		SetObjectLevelProperty = 89,
+		ObjectLevelPropertySet = 90,
+		SetObjectOfflineAvailability = 91,
+		RemoveObjectOfflineAvailability = 92,
+		ObjectOfflineAvailabilitySet = 93,
+		ObjectOfflineAvailabilityRemoved = 94,
+		SwitchToOfflineMode = 95,
+		SwitchedToOfflineMode = 96,
+		SwitchToOnlineMode = 97,
+		SwitchedToOnlineMode = 98,
+		LogOut = 99,
+		ChangeVaultLanguage = 100,
+		VaultLanguageChanged = 101,
+		LoggedIn = 102,
+		QueryCanHandleFocusChangeKey = 103,
+		ItemAdded = 104,
+		ItemRemoved = 105,
+		ItemReplaced = 106,
+		ItemMoved = 107,
+		AllItemsCleared = 108,
+		ItemsChanged = 109,
+		ChangeValue = 110,
+		ValueChanged = 111,
+		ChangeValueRequiredStatus = 112,
+		ValueRequiredStatusChanged = 113,
+		ChangeMustExistStatus = 114,
+		MustExistStatusChanged = 115,
+		ChangeReadOnlyStatus = 116,
+		ReadOnlyStatusChanged = 117,
+		AutomaticValueStatusChanged = 118,
+		ChangeVisibility = 119,
+		VisibilityChanged = 120,
+		ChangeLabel = 121,
+		LabelChanged = 122,
+		SetModifyFlag = 123,
+		ModifyFlagChanged = 124,
+		DataError = 125,
+		ValueValidationError = 126,
+		SelectionListItemsUpdated = 127,
+		UpdatingContent = 128,
+		ContentUpdated = 129,
+		InitializingContent = 130,
+		ContentInitialized = 131,
+		PermissionsChanged = 132,
+		IconChanged = 133,
+		FilePreviewInfoUpdated = 134,
+		PopOutMetadataCard = 135,
+		MetadataCardPoppedOut = 136,
+		EnabledStateChanged = 137,
+		HitHighlightingUpdated = 138,
+		RequestActivateView = 139,
+		QueryUIModifiedState = 140,
+		CommitUIModifiedState = 141,
+		OptionValueChanged = 142,
+		NameChanged = 143,
+		ExplanationChanged = 144,
+		ShowTab = 145,
+		HideTab = 146,
+		FocusReceived = 147,
+		FocusLost = 148,
+		MetadataCardLocationChanging = 149,
+		MetadataCardLocationChanged = 150,
+		ValueSuggestionsChanged = 151
+	}
+
+	const enum ListingEmptinessState {
+		NotYetKnown = 1,
+		NotEmpty = 2,
+		Empty = 3
+	}
+
+	const enum MenuLocation {
+		DefaultCommand = 20,
+		Top = 21,
+		BeforeWindowsCommands = 22,
+		AfterWindowsCommands = 23,
+		ObjectCreation = 24,
+		FileCreation = 25,
+		ObjectOperations = 26,
+		FolderSpecific = 27,
+		SingleFolderSpecific = 28,
+		ViewVisibility = 29,
+		Misc1_Top = 30,
+		Misc1_Middle = 31,
+		Misc1_Bottom = 32,
+		HistorySpecific = 33,
+		RelationshipsSpecific = 34,
+		CollectionMembersSpecific = 35,
+		Deletion = 36,
+		Edit = 37,
+		Misc2_Top = 38,
+		Misc2_Middle = 39,
+		Misc2_Bottom = 40,
+		DocumentConversions = 41,
+		BeforeProperties = 42,
+		Bottom = 43,
+		PropertyFolder = 44
+	}
+
+	const enum MFACLComponentOverrideAccess {
+		None = 0,
+		Granted = 1
+	}
+
+	const enum MFACLEnforcingMode {
+		Automatic = 0,
+		Provided = 1,
+		ResetToDefault = 2,
+		None = 3
+	}
+
+	const enum MFACLMode {
+		Simple = 0,
+		AutomaticPermissionsWithComponents = 1
+	}
+
+	const enum MFActionType {
+		Unknown = 0,
+		CreateAssignment = 1
+	}
+
+	const enum MFAdditionalClassInfoType {
+		Unknown = 0,
+		Assignment = 1
+	}
+
+	const enum MFApplicationLicenseStatus {
+		Unknown = 0,
+		NotNeeded = 1,
+		NotInstalled = 2,
+		Installed = 3,
+		Valid = 4,
+		Invalid = 5,
+		FormatError = 6,
+		Trial = 7,
+		GracePeriod = 8
+	}
+
+	const enum MFAssignmentType {
+		Task = 0,
+		Approval = 1
+	}
+
+	const enum MFAttachVaultOptionsFlag {
+		None = 0,
+		ExternalObjectTypes = 1,
+		ExternalSources = 2,
+		ExportedDataSets = 4,
+		ExportImportJobs = 8,
+		ExternalUserGroups = 16,
+		EventHandlers = 32
+	}
+
+	const enum MFAuthType {
+		Unknown = 0,
+		LoggedOnWindowsUser = 1,
+		SpecificWindowsUser = 2,
+		SpecificMFilesUser = 3
+	}
+
+	const enum MFAutomaticPermissionsOperationOptions {
+		None = 0,
+		ForceActive = 1
+	}
+
+	const enum MFAutomaticValueType {
+		None = 0,
+		CalculatedWithPlaceholders = 1,
+		CalculatedWithVBScript = 2,
+		AutoNumberSimple = 3,
+		WithVBScript = 4
+	}
+
+	const enum MFAutoStateTransitionMode {
+		None = 0,
+		RelativeTime = 1,
+		AssignmentCompleteOne = 2,
+		AssignmentCompleteAll = 3,
+		CriteriaFulfilled = 4,
+		AllowedByScript = 5,
+		AssignmentComplete = 6,
+		AssignmentRejected = 7
+	}
+
+	const enum MFBackupType {
+		Full = 0,
+		Differential = 1
+	}
+
+	const enum MFBuiltInDocumentClass {
+		UnclassifiedDocument = 0,
+		OtherDocument = 1
+	}
+
+	const enum MFBuiltInMetadataStructureItemID {
+		All = -1000000
+	}
+
+	const enum MFBuiltInObjectClass {
+		Any = -3,
+		NotSet = -2,
+		GenericAssignment = -100
+	}
+
+	const enum MFBuiltInObjectType {
+		Document = 0,
+		DocumentCollection = 9,
+		Assignment = 10,
+		DocumentOrDocumentCollection = -102
+	}
+
+	const enum MFBuiltInPropertyDef {
+		NameOrTitle = 0,
+		Created = 20,
+		LastModified = 21,
+		SingleFileObject = 22,
+		LastModifiedBy = 23,
+		StatusChanged = 24,
+		CreatedBy = 25,
+		Keywords = 26,
+		Deleted = 27,
+		DeletedBy = 28,
+		VersionLabel = 29,
+		SizeOnServerThisVersion = 30,
+		SizeOnServerAllVersions = 31,
+		MarkedForArchiving = 32,
+		VersionComment = 33,
+		Comment = 33,
+		TraditionalFolder = 34,
+		CreatedFromExternalLocation = 35,
+		AdditionalClasses = 36,
+		IsTemplate = 37,
+		Workflow = 38,
+		State = 39,
+		StateEntered = 40,
+		AssignmentDescription = 41,
+		Deadline = 42,
+		MonitoredBy = 43,
+		AssignedTo = 44,
+		CompletedBy = 45,
+		CollectionMemberDocuments = 46,
+		CollectionMemberCollections = 47,
+		Constituent = 48,
+		OriginalPath = 75,
+		Reference = 76,
+		OriginalPath2 = 77,
+		OriginalPath3 = 78,
+		WorkflowAssignment = 79,
+		AccessedByMe = 81,
+		FavoriteView = 82,
+		MessageID = 83,
+		InReplyTo = 84,
+		InReplyToReference = 85,
+		SignatureManifestation = 86,
+		ReportURL = 87,
+		ReportPlacement = 88,
+		ObjectChanged = 89,
+		ACLChanged = 90,
+		VersionLabelChanged = 91,
+		VersionCommentChanged = 92,
+		DeletionStatusChanged = 93,
+		VaultGUID = 94,
+		SharedFiles = 95,
+		ConflictResolved = 96,
+		RejectedBy = 97,
+		Completed = 98,
+		StateTransition = 99,
+		Class = 100,
+		ClassGroups = 101,
+		ObjectID = -102
+	}
+
+	const enum MFBuiltInUserGroup {
+		Users = 1,
+		AndExternalUsers = 2
+	}
+
+	const enum MFBuiltInValueList {
+		Documents = 0,
+		Classes = 1,
+		ClassGroups = 2,
+		VersionLabels = 3,
+		TraditionalFolders = 4,
+		ExternalLocations = 5,
+		Users = 6,
+		Workflows = 7,
+		States = 8,
+		Collections = 9,
+		Assignments = 10,
+		UserGroups = 16,
+		StateTransitions = 17
+	}
+
+	const enum MFBuiltInView {
+		CheckedOutToCurrentUser = 5,
+		Offline = 6,
+		RecentlyModifiedByMe = 7,
+		Templates = 8,
+		AssignedToMe = 9,
+		LatestSearches = 11,
+		ByID = 12,
+		BuiltIn = 13,
+		RecentlyAccessedByMe = 14,
+		Favorites = 15,
+		AnyView = -1,
+		OfflineCheckedOut = -9000,
+		OfflineMarkedForOfflineAvailability = -9001
+	}
+
+	const enum MFConditionType {
+		Equal = 1,
+		NotEqual = 2,
+		GreaterThan = 3,
+		LessThan = 4,
+		GreaterThanOrEqual = 5,
+		LessThanOrEqual = 6,
+		Contains = 7,
+		DoesNotContain = 8,
+		StartsWith = 9,
+		DoesNotStartWith = 10,
+		MatchesWildcardPattern = 11,
+		DoesNotMatchWildcardPattern = 12,
+		IsMissing = 13,
+		IsNotMissing = 14,
+		StartsWithAtWordBoundary = 15,
+		ContainsAnyBitwise = 16,
+		DoesNotContainAnyBitwise = 17
+	}
+
+	const enum MFContentType {
+		Generic = 0,
+		EmailAddress = 1,
+		URL = 2,
+		RTF = 3,
+		HTML = 4
+	}
+
+	const enum MFCustomApplicationType {
+		Unspecified = 0,
+		Client = 1,
+		Server = 2
+	}
+
+	const enum MFDataFunction {
+		NoOp = 0,
+		Year = 1,
+		Month = 2,
+		YearAndMonth = 3,
+		Date = 4,
+		DaysFrom = 5,
+		DaysTo = 6,
+		IntegerSegment = 7,
+		LeftChars = 8,
+		InitialCharGroup = 9
+	}
+
+	const enum MFDataType {
+		Uninitialized = 0,
+		Text = 1,
+		Integer = 2,
+		Floating = 3,
+		Date = 5,
+		Time = 6,
+		Timestamp = 7,
+		Boolean = 8,
+		Lookup = 9,
+		MultiSelectLookup = 10,
+		Integer64 = 11,
+		FILETIME = 12,
+		MultiLineText = 13,
+		ACL = 14
+	}
+
+	const enum MFDBEngine {
+		None = 0,
+		Firebird = 1,
+		MSSQLServer = 2
+	}
+
+	const enum MFDefaultPropertyType {
+		Undefined = 0,
+		FixedValue = 1,
+		FromHPDSSXML = 2,
+		FromXML = 3,
+		FromEmail = 4,
+		FromEmailHeader = 5,
+		FromOCR = 6
+	}
+
+	const enum MFDependencyRelation {
+		Nothing = 0,
+		AutomaticFilling = 1,
+		Filtering = 2
+	}
+
+	const enum MFEmailField {
+		Undefined = 0,
+		From = 1,
+		To = 2,
+		Cc = 3,
+		Subject = 4,
+		Body = 5,
+		Date = 6,
+		Importance = 7,
+		Sensitivity = 8
+	}
+
+	const enum MFEmailImportance {
+		Low = 0,
+		Normal = 1,
+		High = 2
+	}
+
+	const enum MFEmailSensitivity {
+		None = 0,
+		Normal = 1,
+		Personal = 2,
+		Private = 3,
+		Confidential = 4
+	}
+
+	const enum MFEventHandlerType {
+		TypeUndefined = 0,
+		BeforeSetProperties = 1,
+		AfterSetProperties = 2,
+		AfterCreateNewObjectFinalize = 3,
+		BeforeCheckInChanges = 4,
+		AfterCheckInChanges = 5,
+		BeforeCheckOut = 6,
+		AfterCheckOut = 7,
+		BeforeCancelCheckout = 8,
+		AfterCancelCheckout = 9,
+		BeforeDeleteObject = 10,
+		AfterDeleteObject = 11,
+		BeforeDestroyObject = 12,
+		AfterDestroyObject = 13,
+		BeforeSetObjectPermissions = 14,
+		AfterSetObjectPermissions = 15,
+		BeforeFileUpload = 16,
+		AfterFileUpload = 17,
+		BeforeFileDownload = 18,
+		AfterFileDownload = 19,
+		BeforeCreateNewValueListItem = 20,
+		AfterCreateNewValueListItem = 21,
+		BeforeLoginToVault = 22,
+		AfterLoginToVault = 23,
+		BeforeLogoutFromVault = 24,
+		AfterLogoutFromVault = 25,
+		BeforeRunScheduledJob = 26,
+		AfterRunScheduledJob = 27,
+		BeforeCreateNewObjectFinalize = 28,
+		BeforeCancelCreateObject = 29,
+		AfterCancelCreateObject = 30,
+		BeforeDestroyObjectVersion = 31,
+		AfterDestroyObjectVersion = 32,
+		Replication_AfterCreateNewObjectFinalize = 33,
+		Replication_AfterCheckInChanges = 34,
+		VaultExtensionMethod = 35,
+		BeforeCreateLoginAccount = 36,
+		AfterCreateLoginAccount = 37,
+		BeforeModifyLoginAccount = 38,
+		AfterModifyLoginAccount = 39,
+		BeforeRemoveLoginAccount = 40,
+		AfterRemoveLoginAccount = 41,
+		BeforeCreateUserAccount = 42,
+		AfterCreateUserAccount = 43,
+		BeforeModifyUserAccount = 44,
+		AfterModifyUserAccount = 45,
+		BeforeRemoveUserAccount = 46,
+		AfterRemoveUserAccount = 47,
+		BeforeCreateUserGroup = 48,
+		AfterCreateUserGroup = 49,
+		BeforeModifyUserGroup = 50,
+		AfterModifyUserGroup = 51,
+		BeforeRemoveUserGroup = 52,
+		AfterRemoveUserGroup = 53,
+		AfterBringOnline = 54,
+		BeforeTakeOffline = 55,
+		AfterCheckInChangesFinalize = 56,
+		AfterBeginTransaction = 57,
+		BeforeCommitTransaction = 58,
+		BeforeRollbackTransaction = 59,
+		AfterCancelCheckoutFinalize = 60,
+		BeforeUndeleteObject = 61,
+		AfterUndeleteObject = 62,
+		AfterUndeleteObjectFinalize = 63,
+		BeforeModifyMFilesCredentials = 64,
+		AfterModifyMFilesCredentials = 65,
+		BeforeReturnView = 66,
+		BeforeCheckInChangesFinalize = 67,
+		BeforeCreateView = 68,
+		AfterCreateView = 69,
+		BeforeModifyView = 70,
+		AfterModifyView = 71,
+		BeforeDeleteView = 72,
+		AfterDeleteView = 73
+	}
+
+	const enum MFExportContentFlag {
+		None = 0,
+		LatestVersionsOnly = 2,
+		DestroyAfterExport = 4,
+		ClearArchivalMarker = 8,
+		SaveFilesAlsoAsPDFA = 32,
+		ExportInformationOnDestroyedData = 64,
+		UseMultipleContentPackages = 128,
+		IndicateDropouts = 1024
+	}
+
+	const enum MFExpressionType {
+		Uninitialized = 0,
+		PropertyValue = 1,
+		ObjectIDSegment = 2,
+		StatusValue = 3,
+		FileValue = 4,
+		TypedValue = 5,
+		AnyField = 6,
+		Permissions = 7
+	}
+
+	const enum MFExtApplicationPlatform {
+		None = 0,
+		Desktop = 1,
+		Web = 2
+	}
+
+	const enum MFExternalDBRefreshType {
+		None = 0,
+		Quick = 1,
+		Full = 2
+	}
+
+	const enum MFFacetFilterStatusFlags {
+		None = 0,
+		Available = 1,
+		Applied = 2
+	}
+
+	const enum MFFacetSearchFlags {
+		None = 0,
+		IgnoreSearchPermissions = 2,
+		IgnoreFacetGroupPermissions = 4,
+		IgnoreFacetValuePermissions = 8,
+		SortFacetValues = 16,
+		AscendingOrder = 32,
+		OverrideByConfiguration = 64
+	}
+
+	const enum MFFileDataStorage {
+		Default = 0,
+		Disk = 1,
+		DB = 2,
+		External = 3
+	}
+
+	const enum MFFileFormat {
+		Native = 0,
+		PDF = 1,
+		DisplayOnlyPDF = 2
+	}
+
+	const enum MFFileInformationType {
+		Unknown = 0,
+		EmailMessage = 1
+	}
+
+	const enum MFFileOpenMethod {
+		ShowInShell = 0,
+		Open = 1,
+		View = 2,
+		Edit = 3
+	}
+
+	const enum MFFileValueType {
+		HasFiles = 0,
+		FileName = 1,
+		FileSize = 2,
+		FileID = 3,
+		CreationTime = 4,
+		ChangeTime = 5,
+		LinkedToExtLoc = 6,
+		LinkedToExtLocID = 7
+	}
+
+	const enum MFFolderColumnId {
+		Name = -1,
+		Type = -2,
+		Size = -3,
+		Status = -4,
+		CheckoutTo = -5,
+		CheckOutAt = -6,
+		ObjectDispId = -7,
+		ObjectVersion = -8,
+		ShStatusChanged = -9,
+		ShLastModifiedBy = -10,
+		Location = -11,
+		RelLocation = -12,
+		DateCreated = -13,
+		DateModified = -14,
+		Score = -15,
+		RelationshipDesc = -16,
+		HasRelationships = -17,
+		RelationshipTargetVer = -18,
+		ObjectType = -19,
+		ObjectPermissions = -20,
+		TypeEx = -21,
+		HasAssignments = -22,
+		ExportedFile = -1000000,
+		IdSegment = -1000001
+	}
+
+	const enum MFFolderContentItemType {
+		Unknown = 0,
+		ViewFolder = 1,
+		PropertyFolder = 2,
+		TraditionalFolder = 3,
+		ObjectVersion = 4
+	}
+
+	const enum MFFolderDefType {
+		Unknown = 0,
+		AnyFolder = 1,
+		ViewFolder = 2,
+		PropertyFolder = 3,
+		TraditionalFolder = 4,
+		SearchFolder = 5
+	}
+
+	const enum MFFolderListingAlgorithm {
+		None = 0,
+		TestEachValue = 1,
+		GetValuesByDistinctUse = 2,
+		TestEachValueWithSeparateQueries = 3
+	}
+
+	const enum MFFolderListingColumnFlags {
+		SelectIfLeftOfSelectedMainColumn = 1,
+		HideColumnText = 2
+	}
+
+	const enum MFFolderListingItemGroupingMode {
+		Unspecified = -1,
+		NoGrouping = 0,
+		GroupObjectsByObjectType = 1,
+		GroupViewsAndFoldersByType = 1024
+	}
+
+	const enum MFFolderListingViewMode {
+		Icon = 1,
+		SmallIcon = 2,
+		List = 3,
+		Details = 4,
+		Thumbnail = 5,
+		Tile = 6,
+		Thumbstrip = 7,
+		Content = 8
+	}
+
+	const enum MFFolderUIStateLocationType {
+		Unknown = 0,
+		RootFolder = 1,
+		ViewFoldersContainer = 2,
+		PropertyFoldersContainer = 3,
+		ObjectsContainer = 4,
+		ObjectFilesContainer = 5,
+		TraditionalFolder = 6,
+		SearchResultsContainer = 7,
+		HistoryUI = 8,
+		RelationshipsUIFromTab = 9,
+		CollectionMembersUI = 10,
+		SubobjectsUI = 11,
+		ClearLocalCacheUI = 12,
+		RelationshipsUIToTab = 13,
+		RelationshipsUIAllTab = 14,
+		LocalTemporaryItemsContainer = 15
+	}
+
+	const enum MFFormattingType {
+		None = 0
+	}
+
+	const enum MFFullTextSearchFlags {
+		None = 0,
+		Stemming = 4,
+		TypeAllWords = 131072,
+		TypeAnyWords = 262144,
+		LookInMetaData = 268435456,
+		LookInFileData = 536870912
+	}
+
+	const enum MFilesURLType {
+		Show = 0,
+		Open = 1,
+		View = 2,
+		Edit = 3,
+		ShowMetadata = 6
+	}
+
+	const enum MFImpersonationType {
+		LocalSystem = 0,
+		SpecificAccount = 1,
+		ExtAccount = 2
+	}
+
+	const enum MFImportContentFlag {
+		None = 0,
+		UseMultipleContentPackages = 1,
+		DeleteContentPackage = 4,
+		ImportCheckoutStates = 16,
+		ResetExportTimestamps = 32,
+		DoNotImportObjectDestructions = 64,
+		UseNamesAsAliases = 128,
+		ForceNoStructureIdUpdate = 16384,
+		OmitDoneFile = 32768
+	}
+
+	const enum MFIndirectPropertyIDLevelType {
+		PropertyDef = 0,
+		ObjectType = 1,
+		StateChanger = 2
+	}
+
+	const enum MFLatestSpecificBehavior {
+		Normal = 0,
+		Specific = 1,
+		Latest = 2,
+		Automatic = 3
+	}
+
+	const enum MFLicenseType {
+		None = 0,
+		NamedUserLicense = 1,
+		ConcurrentUserLicense = 2,
+		ReadOnlyLicense = 3
+	}
+
+	const enum MFLoginAccountType {
+		MFiles = 1,
+		Windows = 2
+	}
+
+	const enum MFLoginServerRole {
+		None = 0,
+		SystemAdministrator = 1,
+		VaultCreator = 2,
+		BackupOperator = 4,
+		LogIn = 8
+	}
+
+	const enum MFMetadataStructureItem {
+		None = 0,
+		ObjectType = 1,
+		PropertyDef = 2,
+		Class = 3,
+		Workflow = 4,
+		State = 5,
+		NamedACL = 6,
+		User = 7,
+		UserGroup = 8,
+		ClassGroup = 9,
+		ViewDef = 10,
+		ValueListItem = 13,
+		ValueList = 14,
+		VaultEventHandler = 15,
+		StateTransition = 16,
+		All = 10000
+	}
+
+	const enum MFMetadataStructureSelectorFlags {
+		None = 0,
+		SelectNew = 1,
+		SelectExisting = 2,
+		IncludeNewDependencies = 4,
+		IncludeExistingDependencies = 8
+	}
+
+	const enum MFMetadataSyncFormat {
+		Word = 0,
+		Excel = 1,
+		PowerPoint = 2
+	}
+
+	const enum MFNamedACLType {
+		None = 0,
+		Normal = 1,
+		Internal = 2
+	}
+
+	const enum MFNamedValueType {
+		ConfigurationValue = 3,
+		UserDefinedValue = 4,
+		RegistryValue = 5,
+		FolderConfiguration = 6,
+		AdminConfiguration = 7,
+		SystemAdminConfiguration = 8
+	}
+
+	const enum MFObjectAccess {
+		None = 0,
+		Read = 1,
+		Edit = 2,
+		ChangePermissions = 4,
+		Delete = 8,
+		AttachObjects = 16
+	}
+
+	const enum MFObjectOperationFlags {
+		None = 0,
+		RequireReadAccess = 1,
+		RequireEditAccess = 2,
+		DisallowNameChange = 4,
+		RequireChangeSecurityAccess = 8,
+		RequireFullAccess = 16,
+		ChangeACLInAllVersions = 32,
+		RequireSomeAccess = 64
+	}
+
+	const enum MFObjectTypeAccess {
+		None = 0,
+		SeeName = 1,
+		AddNewItems = 2
+	}
+
+	const enum MFObjectVersionFlag {
+		None = 0,
+		Completed = 1,
+		HasRelatedObjects = 2
+	}
+
+	const enum MFObjectWindowMode {
+		Insert = 0,
+		InsertSourceFiles = 1,
+		InsertSaveAsType = 2,
+		Edit = 3,
+		EditApplicationModal = 4
+	}
+
+	const enum MFObjectWindowResultCode {
+		Ok = 0,
+		Cancel = 1,
+		OkToAll = 2,
+		SkipThis = 3
+	}
+
+	const enum MFOCRDimensionUnit {
+		Pixel = 0,
+		MillimeterX10 = 1,
+		InchX100 = 2
+	}
+
+	const enum MFOCRLanguage {
+		None = 0,
+		Neutral = 1,
+		NumbersOnly = 2,
+		EnglishUS = 3,
+		EnglishBr = 4,
+		German = 5,
+		French = 6,
+		Spanish = 7,
+		Italian = 8,
+		Finnish = 9,
+		Swedish = 10,
+		Danish = 11,
+		Norwegian = 12,
+		Nynorsk = 13,
+		Estonian = 14,
+		Latvian = 15,
+		Lithuanian = 16,
+		Dutch = 17,
+		Portuguese = 18,
+		Brazilian = 19,
+		Galician = 20,
+		Icelandic = 21,
+		Greek = 22,
+		Czech = 23,
+		Hungarian = 24,
+		Polish = 25,
+		Romanian = 26,
+		Slovak = 27,
+		Croatian = 28,
+		Serbian = 29,
+		Slovenian = 30,
+		Luxembourgish = 31,
+		SwissGerman = 32,
+		Turkish = 33,
+		Russian = 34,
+		ByeloRussian = 35,
+		Ukrainian = 36,
+		Macedonian = 37,
+		Bulgarian = 38,
+		Afrikaans = 39,
+		Albanian = 40,
+		Catalan = 41,
+		IrishGaelic = 42,
+		ScottishGaelic = 43,
+		Welsh = 44,
+		Basque = 45,
+		Mexican = 46
+	}
+
+	const enum MFOCRZoneRecognitionMode {
+		NoZoneRecognition = 0,
+		RecognizeSpecifiedZones = 1,
+		AutoDetectZones = 2
+	}
+
+	const enum MFOfflineTransitionResultFlags {
+		None = 0,
+		StatusChanged = 1,
+		LoggedOut = 2
+	}
+
+	const enum MFOnlineTransitionResultFlags {
+		None = 0,
+		StatusChanged = 1
+	}
+
+	const enum MFParentChildBehavior {
+		None = 0,
+		IncludeChildValues = 1,
+		IncludeParentValues = 2
+	}
+
+	const enum MFPermission {
+		Deny = 0,
+		Allow = 1,
+		NotSet = 2
+	}
+
+	const enum MFPermissionsExpressionType {
+		ACL = 0,
+		VisibleTo = 1,
+		EditableBy = 2,
+		PermissionsChangeableBy = 3,
+		FullControlBy = 4,
+		DeletableBy = 5,
+		ObjectsAttachableToThisItemBy = 6
+	}
+
+	const enum MFPredefinedSearchFilterType {
+		Unspecified = 0,
+		ObjectType = 1,
+		DocumentsModifiedToday = 30000,
+		DocumentsModifiedLastWeek = 30001,
+		DocumentsModifiedLastMonth = 30002,
+		DocumentsModifiedLastYear = 30003,
+		DocumentsAccessedByMeToday = 30004,
+		DocumentsAccessedByMeLastWeek = 30005,
+		DocumentsAccessedByMeLastMonth = 30006,
+		DocumentsAccessedByMeLastYear = 30007
+	}
+
+	const enum MFProductMode {
+		Full = 0,
+		Express = 1,
+		Business = 2
+	}
+
+	const enum MFPropertyDefAccess {
+		None = 0,
+		See = 1,
+		Edit = 2
+	}
+
+	const enum MFRelationshipsMode {
+		FromThisObject = 1,
+		ToThisObject = 2,
+		All = 3
+	}
+
+	const enum MFScheduledJobType {
+		Uninitialized = 0,
+		Backup = 1,
+		Restore = 2,
+		CopyVault = 3,
+		VerifyVault = 4,
+		ExportContent = 5,
+		ArchiveOldVersions = 6,
+		ImportContent = 7,
+		OptimizeVault = 8,
+		Recalculate = 9,
+		MigrateVault = 10
+	}
+
+	const enum MFSearchFlags {
+		None = 0,
+		LookInAllVersions = 1,
+		ReturnLatestVisibleVersion = 2,
+		LookAllObjectTypes = 4,
+		DisableRelevancyRanking = 16
+	}
+
+	const enum MFServerConnection {
+		uthenticated = 1,
+		nonymous = 2
+	}
+
+	const enum MFSignaturePromptInfoType {
+		Fixed = 0,
+		Selectable = 1,
+		MetadataBased = 2
+	}
+
+	const enum MFSoftwarePlatformType {
+		Win32 = 0,
+		X64 = 1
+	}
+
+	const enum MFSpecialObjectFlag {
+		None = 0,
+		Shortcut = 1,
+		Deleted = 2,
+		RecentlyAccessedByValid = 4,
+		HasSharedFiles = 8,
+		Conflict = 16,
+		Normal = 64
+	}
+
+	const enum MFStatusType {
+		CheckedOut = 0,
+		CheckedOutTo = 1,
+		CheckedOutAt = 2,
+		ObjectID = 3,
+		ObjectVersionID = 4,
+		Deleted = 5,
+		ObjectTypeID = 6,
+		IsLatestCheckedInVersion = 7,
+		ExtID = 8,
+		LatestOrSpecific = 9,
+		ObjectTypeAndID = 10,
+		ObjectFlags = 11,
+		OriginalVaultGUID = 12,
+		OriginalObjectType = 13,
+		OriginalObjectID = 14,
+		OriginalObjectIDSegment = 15
+	}
+
+	const enum MFStringDataType {
+		JSON = 0,
+		XML = 1
+	}
+
+	const enum MFTriggerMonth {
+		January = 1,
+		February = 2,
+		March = 4,
+		April = 8,
+		May = 16,
+		June = 32,
+		July = 64,
+		August = 128,
+		September = 256,
+		October = 512,
+		November = 1024,
+		December = 2048,
+		EveryMonth = 4095
+	}
+
+	const enum MFTriggerType {
+		Once = 0,
+		Daily = 1,
+		Weekly = 2,
+		MonthlyDate = 3,
+		MonthlyDOW = 4
+	}
+
+	const enum MFTriggerWeekDay {
+		Sunday = 1,
+		Monday = 2,
+		Tuesday = 4,
+		Wednesday = 8,
+		Thursday = 16,
+		Friday = 32,
+		Saturday = 64,
+		EveryDay = 125
+	}
+
+	const enum MFTriggerWeekOfMonth {
+		FirstWeek = 1,
+		SecondWeek = 2,
+		ThirdWeek = 3,
+		FourthWeek = 4,
+		LastWeek = 5
+	}
+
+	const enum MFUpdateType {
+		Normal = 0,
+		ServerAuto = 1,
+		ClientAuto = 2
+	}
+
+	const enum MFUserAccountVaultRole {
+		None = 0,
+		FullControl = 1,
+		LogIn = 2,
+		CreateObjects = 4,
+		SeeAllObjects = 8,
+		UndeleteObjects = 16,
+		DestroyObjects = 32,
+		ForceUndoCheckout = 64,
+		ChangeObjectSecurity = 128,
+		ChangeMetadataStructure = 256,
+		ManageUserAccounts = 512,
+		InternalUser = 1024,
+		ManageTraditionalFolders = 2048,
+		DefineTemplates = 4096,
+		ManageCommonViews = 8192,
+		ManageWorkflows = 16384,
+		DefaultRoles = 3078
+	}
+
+	const enum MFUserOrUserGroupType {
+		Unknown = 0,
+		UserAccount = 1,
+		UserGroup = 2,
+		PseudoUser = 3,
+		PropertyBasedPseudoUser = 4
+	}
+
+	const enum MFValidationType {
+		None = 0,
+		RegularExpression = 1,
+		VBScript = 2
+	}
+
+	const enum MFValueListItemPropertyDef {
+		ID = 1,
+		Name = 2,
+		Owner = 3,
+		Parent = 4,
+		Deleted = 5,
+		ObjectType = 6,
+		ExtID = 7
+	}
+
+	const enum MFValueListSortingType {
+		Name = 0,
+		ExtID = 1
+	}
+
+	const enum MFVaultAccess {
+		None = 0,
+		CreateDocs = 1,
+		SeeAllDocs = 2,
+		UndeleteDocs = 4,
+		DestroyDocs = 8,
+		ForceUndoCheckout = 16,
+		ChangeDocSecurity = 32,
+		ChangeMetaDataStructure = 64,
+		ManageUserAccounts = 128,
+		ChangeFullControlRole = 256,
+		VerifyVault = 1024,
+		EditAllDocs = 2048,
+		ExportContent = 8192,
+		ImportContent = 16384,
+		ManageVLItemsFromClient = 65536,
+		ManageExternalLocations = 131072,
+		LicenseAllowsModifications = 262144,
+		ManageEvents = 524288,
+		ManageTraditionalFolders = 1048576,
+		ChangeObjectStates = 4194304,
+		ChangeAssignments = 8388608,
+		ManageCommonViews = 16777216,
+		ManageCommonUISettings = 33554432,
+		ManageCommonNotificationRules = 134217728,
+		SeeDeletedDocs = 268435456,
+		MateriakizeViews = 536870912,
+		MaterializeViews = 536870912
+	}
+
+	const enum MFVaultConnectionTestResult {
+		OK = 0,
+		UserCancelledLoginAttempt = 1
+	}
+
+	const enum MFViewCategory {
+		Normal = 0,
+		OfflineFilter = 1,
+		TemporarySearch = 2
+	}
+
+	const enum MFViewFlag {
+		sNone = 0,
+		Materialized = 1
+	}
+
+	const enum MFViewType {
+		Normal = 0,
+		FilterOnly = 1
+	}
+
+	const enum SearchFeature {
+		Undefined = 0,
+		FacetSearch = 1,
+		MultiVaultSearch = 2
+	}
+
+	const enum TaskPaneGroup {
+		New = 1,
+		ViewAndModify = 2,
+		GoTo = 3,
+		Main = 4
+	}
+
+	const AccessControlEntry: { new(): IAccessControlEntry; };
+	const AccessControlEntryContainer: { new(): IAccessControlEntryContainer; };
+	const AccessControlEntryData: { new(): IAccessControlEntryData; };
+	const AccessControlEntryKey: { new(): IAccessControlEntryKey; };
+	const AccessControlEntryKeys: { new(): IAccessControlEntryKeys; };
+	const AccessControlList: { new(): IAccessControlList; };
+	const AccessControlListComponent: { new(): IAccessControlListComponent; };
+	const AccessControlListComponentContainer: { new(): IAccessControlListComponentContainer; };
+	const AccessControlListComponentKey: { new(): IAccessControlListComponentKey; };
+	const AccessControlListComponentKeys: { new(): IAccessControlListComponentKeys; };
+	const AccessControlLists: { new(): IAccessControlLists; };
+	const ActionConvertToPDF: { new(): IActionConvertToPDF; };
+	const ActionCreateAssignment: { new(): IActionCreateAssignment; };
+	const ActionDefinition: { new(): IActionDefinition; };
+	const ActionDefinitions: { new(): IActionDefinitions; };
+	const ActionSendNotification: { new(): IActionSendNotification; };
+	const ActionSetPermissions: { new(): IActionSetPermissions; };
+	const ActionSetProperties: { new(): IActionSetProperties; };
+	const AdditionalClassInfo: { new(): IAdditionalClassInfo; };
+	const AdditionalFolder: { new(): IAdditionalFolder; };
+	const AdditionalFolders: { new(): IAdditionalFolders; };
+	const ApprovalAssignmentClassInfo: { new(): IApprovalAssignmentClassInfo; };
+	const ArchiveOldVersionsJob: { new(): IArchiveOldVersionsJob; };
+	const AssignmentClassInfo: { new(): IAssignmentClassInfo; };
+	const AssociatedPropertyDef: { new(): IAssociatedPropertyDef; };
+	const AssociatedPropertyDefs: { new(): IAssociatedPropertyDefs; };
+	const AttachVaultOptions: { new(): IAttachVaultOptions; };
+	const AuthenticationResult: { new(): IAuthenticationResult; };
+	const AuthenticationResultIntermediate: { new(): IAuthenticationResultIntermediate; };
+	const AuthenticationResultServerFinal: { new(): IAuthenticationResultServerFinal; };
+	const AuthenticationResultVaultFinal: { new(): IAuthenticationResultVaultFinal; };
+	const AutomaticMetadataResult: { new(): IAutomaticMetadataResult; };
+	const AutomaticPermissions: { new(): IAutomaticPermissions; };
+	const AutomaticValue: { new(): IAutomaticValue; };
+	const BackupJob: { new(): IBackupJob; };
+	const BooleanValue: { new(): IBooleanValue; };
+	const ClassGroup: { new(): IClassGroup; };
+	const ClassGroups: { new(): IClassGroups; };
+	const CopyVaultJob: { new(): ICopyVaultJob; };
+	const CopyVaultJobOutputInfo: { new(): ICopyVaultJobOutputInfo; };
+	const CustomApplication: { new(): ICustomApplication; };
+	const CustomApplications: { new(): ICustomApplications; };
+	const DailyTrigger: { new(): IDailyTrigger; };
+	const DataFunctionCall: { new(): IDataFunctionCall; };
+	const DataSet: { new(): IDataSet; };
+	const DataSetExportingStatus: { new(): IDataSetExportingStatus; };
+	const DataSets: { new(): IDataSets; };
+	const DefaultProperties: { new(): IDefaultProperties; };
+	const DefaultProperty: { new(): IDefaultProperty; };
+	const EmailMessageInformation: { new(): IEmailMessageInformation; };
+	const EventHandler: { new(): IEventHandler; };
+	const EventHandlers: { new(): IEventHandlers; };
+	const ExportContentJob: { new(): IExportContentJob; };
+	const ExportStructureItem: { new(): IExportStructureItem; };
+	const ExportStructureItems: { new(): IExportStructureItems; };
+	const Expression: { new(): IExpression; };
+	const ExpressionEx: { new(): IExpressionEx; };
+	const ExpressionExs: { new(): IExpressionExs; };
+	const Expressions: { new(): IExpressions; };
+	const FileClass: { new(): IFileClass; };
+	const FileClasses: { new(): IFileClasses; };
+	const FileDownloadSession: { new(): IFileDownloadSession; };
+	const FileInformation: { new(): IFileInformation; };
+	const FileVer: { new(): IFileVer; };
+	const FileVers: { new(): IFileVers; };
+	const FolderContentItem: { new(): IFolderContentItem; };
+	const FolderContentItems: { new(): IFolderContentItems; };
+	const FolderDef: { new(): IFolderDef; };
+	const FolderDefs: { new(): IFolderDefs; };
+	const FolderListingColumn: { new(): IFolderListingColumn; };
+	const FolderListingColumns: { new(): IFolderListingColumns; };
+	const FolderListingColumnSorting: { new(): IFolderListingColumnSorting; };
+	const FolderListingColumnSortings: { new(): IFolderListingColumnSortings; };
+	const FolderListingUIState: { new(): IFolderListingUIState; };
+	const FolderNameListing: { new(): IFolderNameListing; };
+	const FolderUIState: { new(): IFolderUIState; };
+	const IDRange: { new(): IIDRange; };
+	const IDs: { new(): IIDs; };
+	const Impersonation: { new(): IImpersonation; };
+	const ImportContentJob: { new(): IImportContentJob; };
+	const IndirectPropertyID: { new(): IIndirectPropertyID; };
+	const IndirectPropertyIDLevel: { new(): IIndirectPropertyIDLevel; };
+	const KeyNamePair: { new(): IKeyNamePair; };
+	const KeyNamePairs: { new(): IKeyNamePairs; };
+	const Language: { new(): ILanguage; };
+	const Languages: { new(): ILanguages; };
+	const LicenseStatus: { new(): ILicenseStatus; };
+	const LoginAccount: { new(): ILoginAccount; };
+	const LoginAccountPersonalInformation: { new(): ILoginAccountPersonalInformation; };
+	const LoginAccounts: { new(): ILoginAccounts; };
+	const Lookup: { new(): ILookup; };
+	const Lookups: { new(): ILookups; };
+	const MetadataStructureSelector: { new(): IMetadataStructureSelector; };
+	const MetadataStructureSelectors: { new(): IMetadataStructureSelectors; };
+	const MFilesClientApplication: { new(): IMFilesClientApplication; };
+	const MFilesServerApplication: { new(): IMFilesServerApplication; };
+	const MFilesVersion: { new(): IMFilesVersion; };
+	const MFResourceManager: { new(): IMFResourceManager; };
+	const MFShellDocListCtrl: { new(): IMFDocListCtrl; };
+	const MonthlyDateTrigger: { new(): IMonthlyDateTrigger; };
+	const MonthlyDOWTrigger: { new(): IMonthlyDOWTrigger; };
+	const NamedACL: { new(): INamedACL; };
+	const NamedACLAdmin: { new(): INamedACLAdmin; };
+	const NamedACLs: { new(): INamedACLs; };
+	const NamedACLsAdmin: { new(): INamedACLsAdmin; };
+	const NamedValueNamespace: { new(): INamedValueNamespace; };
+	const NamedValueNamespaces: { new(): INamedValueNamespaces; };
+	const NamedValues: { new(): INamedValues; };
+	const Number: { new(): INumber; };
+	const ObjectClass: { new(): IObjectClass; };
+	const ObjectClassAdmin: { new(): IObjectClassAdmin; };
+	const ObjectClasses: { new(): IObjectClasses; };
+	const ObjectClassesAdmin: { new(): IObjectClassesAdmin; };
+	const ObjectCreationInfo: { new(): IObjectCreationInfo; };
+	const ObjectFile: { new(): IObjectFile; };
+	const ObjectFileAndObjVer: { new(): IObjectFileAndObjVer; };
+	const ObjectFileAndObjVerOfMultipleFiles: { new(): IObjectFileAndObjVerOfMultipleFiles; };
+	const ObjectFiles: { new(): IObjectFiles; };
+	const ObjectSearchResults: { new(): IObjectSearchResults; };
+	const ObjectTypeTargetForBrowsing: { new(): IObjectTypeTargetForBrowsing; };
+	const ObjectTypeTargetsForBrowsing: { new(): IObjectTypeTargetsForBrowsing; };
+	const ObjectVersion: { new(): IObjectVersion; };
+	const ObjectVersionAndProperties: { new(): IObjectVersionAndProperties; };
+	const ObjectVersionAndPropertiesOfMultipleObjects: { new(): IObjectVersionAndPropertiesOfMultipleObjects; };
+	const ObjectVersionFile: { new(): IObjectFileAndVersion; };
+	const ObjectVersionPermissions: { new(): IObjectVersionPermissions; };
+	const ObjectVersions: { new(): IObjectVersions; };
+	const ObjectVersionWorkflowState: { new(): IObjectVersionWorkflowState; };
+	const ObjectWindowResult: { new(): IObjectWindowResult; };
+	const ObjID: { new(): IObjID; };
+	const ObjIDs: { new(): IObjIDs; };
+	const ObjOrFileVer: { new(): IObjOrFileVer; };
+	const ObjOrFileVers: { new(): IObjOrFileVers; };
+	const ObjType: { new(): IObjectType; };
+	const ObjTypeAdmin: { new(): IObjectTypeAdmin; };
+	const ObjTypeColumnMapping: { new(): IObjectTypeColumnMapping; };
+	const ObjTypeColumnMappings: { new(): IObjectTypeColumnMappings; };
+	const ObjTypes: { new(): IObjectTypes; };
+	const ObjTypesAdmin: { new(): IObjectTypesAdmin; };
+	const ObjVer: { new(): IObjVer; };
+	const ObjVers: { new(): IObjVers; };
+	const OCROptions: { new(): IOCROptions; };
+	const OCRPage: { new(): IOCRPage; };
+	const OCRPageResult: { new(): IOCRPageResult; };
+	const OCRPageResults: { new(): IOCRPageResults; };
+	const OCRPages: { new(): IOCRPages; };
+	const OCRZone: { new(): IOCRZone; };
+	const OCRZoneResult: { new(): IOCRZoneResult; };
+	const OCRZoneResults: { new(): IOCRZoneResults; };
+	const OCRZones: { new(): IOCRZones; };
+	const OptimizeVaultJob: { new(): IOptimizeVaultJob; };
+	const OwnerPropertyDef: { new(): IOwnerPropertyDef; };
+	const PluginInfo: { new(): IPluginInfo; };
+	const PluginInfos: { new(): IPluginInfos; };
+	const PreviewerActiveXCtrl: { new(): IPreviewerActiveXCtrl; };
+	const PropertyDef: { new(): IPropertyDef; };
+	const PropertyDefAdmin: { new(): IPropertyDefAdmin; };
+	const PropertyDefOrObjectType: { new(): IPropertyDefOrObjectType; };
+	const PropertyDefOrObjectTypes: { new(): IPropertyDefOrObjectTypes; };
+	const PropertyDefs: { new(): IPropertyDefs; };
+	const PropertyDefsAdmin: { new(): IPropertyDefsAdmin; };
+	const PropertyValue: { new(): IPropertyValue; };
+	const PropertyValueForDisplay: { new(): IPropertyValueForDisplay; };
+	const PropertyValueIconClue: { new(): IPropertyValueIconClue; };
+	const PropertyValueIconClues: { new(): IPropertyValueIconClues; };
+	const PropertyValues: { new(): IPropertyValues; };
+	const PropertyValuesForDisplay: { new(): IPropertyValuesForDisplay; };
+	const PropertyValuesOfMultipleObjects: { new(): IPropertyValuesOfMultipleObjects; };
+	const PropertyValueSuggestion: { new(): IPropertyValueSuggestion; };
+	const PropertyValueSuggestions: { new(): IPropertyValueSuggestions; };
+	const PropertyValuesWithIconClues: { new(): IPropertyValuesWithIconClues; };
+	const PropertyValuesWithIconCluesOfMultipleObjects: { new(): IPropertyValuesWithIconCluesOfMultipleObjects; };
+	const ReportAccessCredentials: { new(): IReportAccessCredentials; };
+	const RestoreJob: { new(): IRestoreJob; };
+	const ScheduledJob: { new(): IScheduledJob; };
+	const ScheduledJobOutputInfo: { new(): IScheduledJobOutputInfo; };
+	const ScheduledJobRunInfo: { new(): IScheduledJobRunInfo; };
+	const ScheduledJobs: { new(): IScheduledJobs; };
+	const ScheduledJobTrigger: { new(): IScheduledJobTrigger; };
+	const ScheduledJobTriggers: { new(): IScheduledJobTriggers; };
+	const SearchCondition: { new(): ISearchCondition; };
+	const SearchConditionEx: { new(): ISearchConditionEx; };
+	const SearchConditionExs: { new(): ISearchConditionExs; };
+	const SearchConditions: { new(): ISearchConditions; };
+	const SearchCriteria: { new(): ISearchCriteria; };
+	const SearchDef: { new(): ISearchDef; };
+	const SemanticAliases: { new(): ISemanticAliases; };
+	const ServerLicenseManagementOperations: { new(): IServerLicenseManagementOperations; };
+	const ServerLoginAccountOperations: { new(): IServerLoginAccountOperations; };
+	const ServerManagementOperations: { new(): IServerManagementOperations; };
+	const ServerScheduledJobManagementOperations: { new(): IServerScheduledJobManagementOperations; };
+	const ServerVaultManagementOperations: { new(): IServerVaultManagementOperations; };
+	const SessionInfo: { new(): ISessionInfo; };
+	const SetPropertiesParams: { new(): ISetPropertiesParams; };
+	const SetPropertiesParamsOfMultipleObjects: { new(): ISetPropertiesParamsOfMultipleObjects; };
+	const SharedFileInfo: { new(): ISharedFileInfo; };
+	const SharedLinkInfo: { new(): ISharedLinkInfo; };
+	const SharedLinkInfos: { new(): ISharedLinkInfos; };
+	const SharedLinkPublicOperations: { new(): ISharedLinkPublicOperations; };
+	const ShortcutMappingInfo: { new(): IShortcutMappingInfo; };
+	const SignaturePromptInfo: { new(): ISignaturePromptInfo; };
+	const SignaturePromptInfoMetadataBased: { new(): ISignaturePromptInfoMetadataBased; };
+	const SignaturePromptInfos: { new(): ISignaturePromptInfos; };
+	const SignaturePromptInfoSelectable: { new(): ISignaturePromptInfoSelectable; };
+	const SignatureSettings: { new(): ISignatureSettings; };
+	const SourceObjectFile: { new(): ISourceObjectFile; };
+	const SourceObjectFiles: { new(): ISourceObjectFiles; };
+	const SQLDatabase: { new(): ISQLDatabase; };
+	const State: { new(): IState; };
+	const StateAdmin: { new(): IStateAdmin; };
+	const StateConditions: { new(): IStateConditions; };
+	const States: { new(): IStates; };
+	const StatesAdmin: { new(): IStatesAdmin; };
+	const StateTransition: { new(): IStateTransition; };
+	const StateTransitionForClient: { new(): IStateTransitionForClient; };
+	const StateTransitions: { new(): IStateTransitions; };
+	const StateTransitionsForClient: { new(): IStateTransitionsForClient; };
+	const StringData: { new(): IStringData; };
+	const Strings: { new(): IStrings; };
+	const TaskAssignmentClassInfo: { new(): ITaskAssignmentClassInfo; };
+	const TemporarySearchView: { new(): ITemporarySearchView; };
+	const Timestamp: { new(): ITimestamp; };
+	const TimeZoneInformation: { new(): ITimeZoneInformation; };
+	const TraditionalFolder: { new(): ITraditionalFolder; };
+	const TraditionalFolderContents: { new(): ITraditionalFolderContents; };
+	const TraditionalFolders: { new(): ITraditionalFolders; };
+	const TriggerType: { new(): ITriggerType; };
+	const TypedValue: { new(): ITypedValue; };
+	const TypedValues: { new(): ITypedValues; };
+	const UserAccount: { new(): IUserAccount; };
+	const UserAccounts: { new(): IUserAccounts; };
+	const UserGroup: { new(): IUserGroup; };
+	const UserGroupAdmin: { new(): IUserGroupAdmin; };
+	const UserGroups: { new(): IUserGroups; };
+	const UserGroupsAdmin: { new(): IUserGroupsAdmin; };
+	const UserOrUserGroupID: { new(): IUserOrUserGroupID; };
+	const UserOrUserGroupIDEx: { new(): IUserOrUserGroupIDEx; };
+	const UserOrUserGroupIDExs: { new(): IUserOrUserGroupIDExs; };
+	const UserOrUserGroupIDs: { new(): IUserOrUserGroupIDs; };
+	const Validation: { new(): IValidation; };
+	const ValueListItem: { new(): IValueListItem; };
+	const ValueListItems: { new(): IValueListItems; };
+	const ValueListItemSearchResults: { new(): IValueListItemSearchResults; };
+	const ValueListItemSearchResultsWithPermissions: { new(): IValueListItemSearchResultsWithPermissions; };
+	const ValueListItemsWithPermissions: { new(): IValueListItemsWithPermissions; };
+	const Vault: { new(): IVault; };
+	const VaultAutomaticMetadataOperations: { new(): IVaultAutomaticMetadataOperations; };
+	const VaultClassGroupOperations: { new(): IVaultClassGroupOperations; };
+	const VaultClassOperations: { new(): IVaultClassOperations; };
+	const VaultClientOperations: { new(): IVaultClientOperations; };
+	const VaultConnection: { new(): IVaultConnection; };
+	const VaultConnections: { new(): IVaultConnections; };
+	const VaultCustomApplicationManagementOperations: { new(): IVaultCustomApplicationManagementOperations; };
+	const VaultDataSetOperations: { new(): IVaultDataSetOperations; };
+	const VaultElectronicSignatureOperations: { new(): IVaultElectronicSignatureOperations; };
+	const VaultEventLogOperations: { new(): IVaultEventLogOperations; };
+	const VaultExtensionMethodOperations: { new(): IVaultExtensionMethodOperations; };
+	const VaultExternalObjectOperations: { new(): IVaultExternalObjectOperations; };
+	const VaultLoginAccountOperations: { new(): IVaultLoginAccountOperations; };
+	const VaultManagementOperations: { new(): IVaultManagementOperations; };
+	const VaultNamedACLOperations: { new(): IVaultNamedACLOperations; };
+	const VaultNamedValueStorageOperations: { new(): IVaultNamedValueStorageOperations; };
+	const VaultNotificationOperations: { new(): IVaultNotificationOperations; };
+	const VaultObjectFileOperations: { new(): IVaultObjectFileOperations; };
+	const VaultObjectOperations: { new(): IVaultObjectOperations; };
+	const VaultObjectPropertyOperations: { new(): IVaultObjectPropertyOperations; };
+	const VaultObjectSearchOperations: { new(): IVaultObjectSearchOperations; };
+	const VaultObjectTypeOperations: { new(): IVaultObjectTypeOperations; };
+	const VaultOnServer: { new(): IVaultOnServer; };
+	const VaultProperties: { new(): IVaultProperties; };
+	const VaultPropertyDefOperations: { new(): IVaultPropertyDefOperations; };
+	const VaultScheduledJobManagementOperations: { new(): IVaultScheduledJobManagementOperations; };
+	const VaultServerDataPushOperations: { new(): IVaultServerDataPushOperations; };
+	const VaultSharedLinkOperations: { new(): IVaultSharedLinkOperations; };
+	const VaultsOnServer: { new(): IVaultsOnServer; };
+	const VaultTraditionalFolderOperations: { new(): IVaultTraditionalFolderOperations; };
+	const VaultUserGroupOperations: { new(): IVaultUserGroupOperations; };
+	const VaultUserOperations: { new(): IVaultUserOperations; };
+	const VaultUserSettingOperations: { new(): IVaultUserSettingOperations; };
+	const VaultValueListItemOperations: { new(): IVaultValueListItemOperations; };
+	const VaultValueListOperations: { new(): IVaultValueListOperations; };
+	const VaultViewOperations: { new(): IVaultViewOperations; };
+	const VaultWorkflowOperations: { new(): IVaultWorkflowOperations; };
+	const VerifyVaultJob: { new(): IVerifyVaultJob; };
+	const VerifyVaultJobOutput: { new(): IVerifyVaultJobOutput; };
+	const VersionComment: { new(): IVersionComment; };
+	const VersionComments: { new(): IVersionComments; };
+	const View: { new(): IView; };
+	const ViewLocation: { new(): IViewLocation; };
+	const Views: { new(): IViews; };
+	const WeeklyTrigger: { new(): IWeeklyTrigger; };
+	const Workflow: { new(): IWorkflow; };
+	const WorkflowAdmin: { new(): IWorkflowAdmin; };
+	const WorkflowAssignment: { new(): IWorkflowAssignment; };
+	const Workflows: { new(): IWorkflows; };
+	const WorkflowsAdmin: { new(): IWorkflowsAdmin; };
+	const XMLSearchResult: { new(): IXMLSearchResult; };
+
+	const ApplicationPath: string;
+	const CLSID: ICLSIDs;
+	const CurrentApplicationPlatform: any;
+
+	function CreateInstance(name: string): any;
+	function CreateObjectCLR(assemblyFile: string, className: string): any;
+	function DeleteRegistryKey(userSpecific: boolean, key: string): void;
+	function DeleteRegistryValue(userSpecific: boolean, key: string, valueName: string): void;
+	function EnableExceptionPropagation(exception: any): void;
+	function ExecuteURL(url: string): void;
+	function GetErrorDescription(exception: any): string;
+	function GetLongErrorDescription(exception: any): string;
+	function GetStringResource(resource: number): string;
+	function KillTimer(timerId: number): void;
+	function LaunchHelp(helpID: string): void;
+	function PersistStringData(name: string, privateData: boolean, data: string): void;
+	function ReadFromRegistry(userSpecific: boolean, key: string, valueName: string): any;
+	function ReadTextFile(filename: string): string;
+	function ReportException(exception: any): void;
+	function RetrieveStringData(name: string, privateData: boolean): string;
+	function SetTimer(timeoutInMs: number, callbackMethod: () => void): number;
+	function ThrowError(description: string): void;
+	function WriteToRegistry(userSpecific: boolean, key: string, valueName: string, value: any, valueType: string): void;
+}
diff --git a/types/mfiles/tslint.json b/types/mfiles/tslint.json
index 483d9ab48a..d2b1bdc0e6 100644
--- a/types/mfiles/tslint.json
+++ b/types/mfiles/tslint.json
@@ -1,9 +1,9 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// The definitions need to use the same naming as the original typelib, see http://www.m-files.com/UI_Extensibility_Framework/#MFClientScript_P.html
-		"interface-name": false,
-		// The definition file is generated by a tool and not edited manually, thus long lines may be created
-		"max-line-length": false
-	}
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// The definitions need to use the same naming as the original typelib, see http://www.m-files.com/UI_Extensibility_Framework/#MFClientScript_P.html
+		"interface-name": false,
+		// The definition file is generated by a tool and not edited manually, thus long lines may be created
+		"max-line-length": false
+	}
 }
\ No newline at end of file
diff --git a/types/microgears/index.d.ts b/types/microgears/index.d.ts
deleted file mode 100644
index 8611096d59..0000000000
--- a/types/microgears/index.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for microgears v4.0.0
-// Project: https://github.com/marcusdb/microgears
-// Definitions by: Marcus David Bronstein <https://github.com/marcusdb>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace microgears {
-    export interface Service {
-        name: string;
-        async?: boolean;
-        pathname?: string;
-        namespace: string;
-    }
-
-    interface MetaInformation {
-        serviceName: string;
-        methodName: string;
-        serviceNameSpace: string;
-        extra: any;
-    }
-
-    interface Plugin {
-        name: string;
-        beforeChain(args: Array<any>, metaInfo: MetaInformation): Array<any>;
-        afterChain<T>(result: T, metaInfo: MetaInformation): T;
-    }
-
-    function addService(service: Service): Service;
-    function addPlugin(plugin: Plugin): void;
-}
-
-export = microgears;
\ No newline at end of file
diff --git a/types/microgears/microgears-tests.ts b/types/microgears/microgears-tests.ts
deleted file mode 100644
index 376d0b8172..0000000000
--- a/types/microgears/microgears-tests.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import microgears = require("microgears");
-
-
-function verify_module_file() {
-    var tracePlugin = new TracePlugin();
-    microgears.addPlugin(tracePlugin);
-    var service = new UserService();
-    var userService = microgears.addService(service);
-
-
-}
-
-class TracePlugin implements microgears.Plugin {
-    name: 'TracePlugin';
-    public beforeChain(args:Array<any>, _meta: microgears.MetaInformation) {
-        var serviceName = _meta.serviceName,
-            method = _meta.methodName;
-        console.log('before call-> ' + serviceName + '.' + method);
-
-        _meta.extra = {
-            count: 1
-        };
-
-        return args
-    }
-    public afterChain(result:any, _meta: microgears.MetaInformation) {
-        var serviceName = _meta.serviceName,
-            method = _meta.methodName;
-
-        console.log('after of-> ' + serviceName + '.' + method);
-        if (_meta.extra.count) {
-            console.log('this number comes to the beforeChain: ' + _meta.extra.count);
-        }
-
-        return result;
-    }
-}
-
-class User {
-    name: string;
-    email: string;
-
-    constructor(name: string, email: string) {
-        this.email = email;
-        this.name = name;
-    }
-}
-
-class UserService implements microgears.Service {
-    name: string = "userService";
-    namespace: string = "services.user";
-
-    public findUserById(id: number) {
-        return new User('test', 'test@example.com');
-    }
-
-}
-
diff --git a/types/microgears/tsconfig.json b/types/microgears/tsconfig.json
deleted file mode 100644
index 7c4170d1af..0000000000
--- a/types/microgears/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "microgears-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/micromatch/index.d.ts b/types/micromatch/index.d.ts
index 02608693a7..b2c64ab80f 100644
--- a/types/micromatch/index.d.ts
+++ b/types/micromatch/index.d.ts
@@ -1,171 +1,625 @@
-// Type definitions for micromatch 2.3.7
-// Project: https://github.com/jonschlinkert/micromatch
+// Type definitions for micromatch 3.1
+// Project: https://github.com/micromatch/micromatch
 // Definitions by: glen-84 <https://github.com/glen-84>
+//                 vemoo <https://github.com/vemoo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// TypeScript Version: 2.2
 
-import parseGlob = require('parse-glob');
-
+import * as braces from "braces";
 declare namespace micromatch {
-    type MatchFunction<T> = ((value: T) => boolean);
-    type Pattern = (string | RegExp | MatchFunction<string>);
-
     interface Options {
         /**
-         * Normalize slashes in file paths and glob patterns to forward slashes.
+         * Allow glob patterns without slashes to match a file path based on its basename. Same behavior as [minimatch](https://github.com/isaacs/minimatch) option `matchBase`.
+         *
+         * @default false
+         *
+         * @example
+         * ```js
+         * mm(['a/b.js', 'a/c.md'], '*.js');
+         * //=> []
+         *
+         * mm(['a/b.js', 'a/c.md'], '*.js', {matchBase: true});
+         * //=> ['a/b.js']
+         * ```
          */
-        unixify?: boolean;
+        basename?: boolean;
         /**
-         * Match dotfiles. Same behavior as minimatch.
+         * Enabled by default, this option enforces bash-like behavior with stars immediately following a bracket expression.
+         * Bash bracket expressions are similar to regex character classes, but unlike regex, a star following a bracket expression **does not repeat the bracketed characters**.
+         * Instead, the star is treated the same as an other star.
+         *
+         * @default true
+         *
+         * @example
+         * ```js
+         * var files = ['abc', 'ajz'];
+         * console.log(mm(files, '[a-c]*'));
+         * //=> ['abc', 'ajz']
+         *
+         * console.log(mm(files, '[a-c]*', {bash: false}));
+         * ```
+         */
+        bash?: boolean;
+        /**
+         * Disable regex and function memoization.
+         *
+         * @default undefined
+         */
+        cache?: boolean;
+        /**
+         * Match dotfiles. Same behavior as [minimatch](https://github.com/isaacs/minimatch) option `dot`.
+         *
+         * @default false
          */
         dot?: boolean;
         /**
-         * Unescape slashes in glob patterns. Use cautiously, especially on windows.
+         * Similar to the `--failglob` behavior in Bash, throws an error when no matches are found.
+         *
+         * @default undefined
          */
-        unescape?: boolean;
+        failglob?: boolean;
         /**
-         * Remove duplicate elements from the result array.
+         * String or array of glob patterns to match files to ignore.
+         *
+         * @default undefined
          */
-        nodupes?: boolean;
+        ignore?: string | string[];
         /**
-         * Allow glob patterns without slashes to match a file path based on its basename. Same behavior as
-         * minimatch.
+         * Alias for [options.basename](#options-basename).
          */
         matchBase?: boolean;
         /**
-         * Don't expand braces in glob patterns. Same behavior as minimatch nobrace.
+         * Disable expansion of brace patterns. Same behavior as [minimatch](https://github.com/isaacs/minimatch) option `nobrace`.
+         *
+         * @default undefined
          */
-        nobraces?: boolean;
+        nobrace?: boolean;
         /**
-         * Don't expand POSIX bracket expressions.
-         */
-        nobrackets?: boolean;
-        /**
-         * Don't expand extended globs.
-         */
-        noextglob?: boolean;
-        /**
-         * Use a case-insensitive regex for matching files. Same behavior as minimatch.
+         * Use a case-insensitive regex for matching files. Same behavior as [minimatch](https://github.com/isaacs/minimatch).
+         *
+         * @default undefined
          */
         nocase?: boolean;
         /**
-         * If true, when no matches are found the actual (array-ified) glob pattern is returned instead of an empty
-         * array. Same behavior as minimatch.
+         * Remove duplicate elements from the result array.
+         *
+         * @default undefined
+         *
+         * @example
+         * Example of using the `unescape` and `nodupes` options together:
+         *
+         * ```js
+         * mm.match(['a/b/c', 'a/b/c'], 'a/b/c');
+         * //=> ['a/b/c', 'a/b/c']
+         *
+         * mm.match(['a/b/c', 'a/b/c'], 'a/b/c', {nodupes: true});
+         * //=> ['abc']
+         * ```
+         */
+        nodupes?: boolean;
+        /**
+         * Disable extglob support, so that extglobs are regarded as literal characters.
+         *
+         * @default undefined
+         *
+         * @example
+         * ```js
+         * mm(['a/z', 'a/b', 'a/!(z)'], 'a/!(z)');
+         * //=> ['a/b', 'a/!(z)']
+         *
+         * mm(['a/z', 'a/b', 'a/!(z)'], 'a/!(z)', {noext: true});
+         * //=> ['a/!(z)'] (matches only as literal characters)
+         * ```
+         */
+        noext?: boolean;
+        /**
+         * Disallow negation (`!`) patterns, and treat leading `!` as a literal character to match.
+         *
+         * @default undefined
+         */
+        nonegate?: boolean;
+        /**
+         * Disable matching with globstars (`**`).
+         *
+         * @default undefined
+         */
+        noglobstar?: boolean;
+        /**
+         * Alias for [options.nullglob](#options-nullglob).
          */
         nonull?: boolean;
         /**
-         * Cache the platform (e.g. win32) to prevent this from being looked up for every file path.
+         * If `true`, when no matches are found the actual (arrayified) glob pattern is returned instead of an empty array.
+         * Same behavior as [minimatch](https://github.com/isaacs/minimatch) option `nonull`.
+         *
+         * @default undefined
          */
-        cache?: boolean;
-    }
-
-    interface Glob {
-        options: micromatch.Options;
-        pattern: string;
-        history: { msg: any, pattern: string }[];
-        tokens: parseGlob.Result;
-        orig: string;
-        negated: boolean;
-
+        nullglob?: boolean;
         /**
-         * Initialize defaults.
+         * Pass your own instance of [snapdragon](https://github.com/jonschlinkert/snapdragon), to customize parsers or compilers.
+         *
+         * @default undefined
          */
-        init(pattern: string): void;
-
+        snapdragon?: object;
         /**
-         * Push a change into `glob.history`. Useful for debugging.
+         * Generate a source map by enabling the `sourcemap` option with the `.parse`, `.compile`, or `.create` methods.
+         *
+         * _(Note that sourcemaps are currently not enabled for brace patterns)_
+         *
+         * @example
+         * ``` js
+         * var mm = require('micromatch');
+         * var pattern = '*(*(of*(a)x)z)';
+         *
+         * var res = mm.create('abc/*.js', {sourcemap: true});
+         * console.log(res.map);
+         * // { version: 3,
+         * //   sources: [ 'string' ],
+         * //   names: [],
+         * //   mappings: 'AAAA,GAAG,EAAC,iBAAC,EAAC,EAAE',
+         * //   sourcesContent: [ 'abc/*.js' ] }
+         *
+         * var ast = mm.parse('abc/**\/*.js');
+         * var res = mm.compile(ast, {sourcemap: true});
+         * console.log(res.map);
+         * // { version: 3,
+         * //   sources: [ 'string' ],
+         * //   names: [],
+         * //   mappings: 'AAAA,GAAG,EAAC,2BAAE,EAAC,iBAAC,EAAC,EAAE',
+         * //   sourcesContent: [ 'abc/**\/*.js' ] }
+         *
+         * var ast = mm.parse(pattern);
+         * var res = mm.compile(ast, {sourcemap: true});
+         * console.log(res.map);
+         * // { version: 3,
+         * //   sources: [ 'string' ],
+         * //   names: [],
+         * //   mappings: 'AAAA,CAAE,CAAE,EAAE,CAAE,CAAC,EAAC,CAAC,EAAC,CAAC,EAAC',
+         * //   sourcesContent: [ '*(*(of*(a)x)z)' ] }
+         * ```
          */
-        track(msg: any): void;
-
+        sourcemap?: boolean;
         /**
-         * Return true if `glob.pattern` was negated with `!`, also remove the `!` from the pattern.
+         * Remove backslashes from returned matches.
+         *
+         * @default undefined
+         *
+         * @example
+         * In this example we want to match a literal `*`:
+         *
+         * ```js
+         * mm.match(['abc', 'a\\*c'], 'a\\*c');
+         * //=> ['a\\*c']
+         *
+         * mm.match(['abc', 'a\\*c'], 'a\\*c', {unescape: true});
+         * //=> ['a*c']
+         * ```
          */
-        isNegated(): boolean;
-
+        unescape?: boolean;
         /**
-         * Expand braces in the given glob pattern.
+         * Convert path separators on returned files to posix/unix-style forward slashes.
+         *
+         * @default true
+         *
+         * @example
+         * ```js
+         * mm.match(['a\\b\\c'], 'a/**');
+         * //=> ['a/b/c']
+         *
+         * mm.match(['a\\b\\c'], {unixify: false});
+         * //=> ['a\\b\\c']
+         * ```
          */
-        braces(): void;
-
-        /**
-         * Expand bracket expressions in `glob.pattern`.
-         */
-        brackets(): void;
-
-        /**
-         * Expand extended globs in `glob.pattern`.
-         */
-        extglob(): void;
-
-        /**
-         * Parse the given pattern.
-         */
-        parse(pattern: string): parseGlob.Result;
-
-        /**
-         * Escape special characters in the given string.
-         */
-        escape(pattern: string): string;
-
-        /**
-         * Unescape special characters in the given string.
-         */
-        unescape(pattern: string): string;
-    }
-
-    interface GlobData {
-        pattern: string;
-        tokens: parseGlob.Result;
-        options: micromatch.Options;
+        unixify?: boolean;
     }
 }
 
 interface Micromatch {
-    (files: string | string[], patterns: micromatch.Pattern | micromatch.Pattern[]): string[];
-
-    isMatch: {
-        /**
-         * Returns true if a file path matches the given pattern.
-         */
-        (filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
-        /**
-         * Returns a function for matching.
-         */
-        (filePath: string, opts?: micromatch.Options): micromatch.MatchFunction<string>;
-    };
+    /**
+     * The main function takes a list of strings and one or more glob patterns to use for matching.
+     *
+     * @param list A list of strings to match
+     * @param patterns One or more glob patterns to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns an array of matches
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm(list, patterns[, options]);
+     *
+     * console.log(mm(['a.js', 'a.txt'], ['*.js']));
+     * //=> [ 'a.js' ]
+     * ```
+     */
+    (list: string[], patterns: string | string[], options?: micromatch.Options): string[];
 
     /**
-     * Returns true if any part of a file path matches the given pattern. Think of this as "has path" versus
-     * "is path".
+     * Similar to the main function, but `pattern` must be a string.
+     *
+     * @param list Array of strings to match
+     * @param pattern Glob pattern to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns an array of matches
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.match(list, pattern[, options]);
+     *
+     * console.log(mm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
+     * //=> ['a.a', 'a.aa']
+     * ```
      */
-    contains(filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+    match(list: string[], pattern: string, options?: micromatch.Options): string[];
 
     /**
-     * Returns a function for matching using the supplied pattern. e.g. create your own "matcher". The advantage of
-     * this method is that the pattern can be compiled outside of a loop.
+     * Returns true if the specified `string` matches the given glob `pattern`.
+     *
+     * @param string String to match
+     * @param pattern Glob pattern to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns true if the string matches the glob pattern.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.isMatch(string, pattern[, options]);
+     *
+     * console.log(mm.isMatch('a.a', '*.a'));
+     * //=> true
+     * console.log(mm.isMatch('a.b', '*.a'));
+     * //=> false
+     * ```
      */
-    matcher(pattern: micromatch.Pattern): micromatch.MatchFunction<string>;
+    isMatch(string: string, pattern: string, options?: micromatch.Options): boolean;
 
     /**
-     * Returns a function that can be passed to Array#filter().
+     * Returns true if some of the strings in the given `list` match any of the given glob `patterns`.
+     *
+     * @param list The string or array of strings to test. Returns as soon as the first match is found.
+     * @param patterns One or more glob patterns to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns true if any patterns match `str`
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.some(list, patterns[, options]);
+     *
+     * console.log(mm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+     * // true
+     * console.log(mm.some(['foo.js'], ['*.js', '!foo.js']));
+     * // false
+     * ```
      */
-    filter(patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): micromatch.MatchFunction<any>;
+    some(list: string | string[], patterns: string | string[], options?: micromatch.Options): boolean;
 
     /**
-     * Returns true if a file path matches any of the given patterns.
+     * Returns true if every string in the given `list` matches any of the given glob `patterns`.
+     *
+     * @param list The string or array of strings to test.
+     * @param patterns One or more glob patterns to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns true if any patterns match `str`
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.every(list, patterns[, options]);
+     *
+     * console.log(mm.every('foo.js', ['foo.js']));
+     * // true
+     * console.log(mm.every(['foo.js', 'bar.js'], ['*.js']));
+     * // true
+     * console.log(mm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+     * // false
+     * console.log(mm.every(['foo.js'], ['*.js', '!foo.js']));
+     * // false
+     * ```
      */
-    any(filePath: string, patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): boolean;
+    every(list: string | string[], patterns: string | string[], options?: micromatch.Options): boolean;
 
     /**
-     * Returns an object with a regex-compatible string and tokens.
+     * Returns true if **any** of the given glob `patterns` match the specified `string`.
+     *
+     * @param str The string to test.
+     * @param patterns One or more glob patterns to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns true if any patterns match `str`
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.any(string, patterns[, options]);
+     *
+     * console.log(mm.any('a.a', ['b.*', '*.a']));
+     * //=> true
+     * console.log(mm.any('a.a', 'b.*'));
+     * //=> false
+     * ```
      */
-    expand(pattern: string, opts?: micromatch.Options): micromatch.Glob | micromatch.GlobData;
+    any(str: string | string[], patterns: string | string[], options?: micromatch.Options): boolean;
 
     /**
-     * Create a regular expression for matching file paths based on the given pattern.
+     * Returns true if **all** of the given `patterns` match the specified string.
+     *
+     * @param str The string to test.
+     * @param patterns One or more glob patterns to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns true if any patterns match `str`
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.all(string, patterns[, options]);
+     *
+     * console.log(mm.all('foo.js', ['foo.js']));
+     * // true
+     *
+     * console.log(mm.all('foo.js', ['*.js', '!foo.js']));
+     * // false
+     *
+     * console.log(mm.all('foo.js', ['*.js', 'foo.js']));
+     * // true
+     *
+     * console.log(mm.all('foo.js', ['*.js', 'f*', '*o*', '*o.js']));
+     * // true
+     * ```
      */
-    makeRe(pattern: string, opts?: micromatch.Options): RegExp;
+    all(str: string | string[], patterns: string | string[], options?: micromatch.Options): boolean;
+
+    /**
+     * Returns a list of strings that _**do not match any**_ of the given `patterns`.
+     *
+     * @param list Array of strings to match.
+     * @param patterns One or more glob pattern to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns an array of strings that **do not match** the given patterns.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.not(list, patterns[, options]);
+     *
+     * console.log(mm.not(['a.a', 'b.b', 'c.c'], '*.a'));
+     * //=> ['b.b', 'c.c']
+     * ```
+     */
+    not(list: string[], patterns: string | string[], options?: micromatch.Options): string[];
+
+    /**
+     * Returns true if the given `string` contains the given pattern. Similar to [.isMatch](#isMatch) but the pattern can match any part of the string.
+     *
+     * @param str The string to match.
+     * @param patterns Glob pattern to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns true if the patter matches any part of `str`.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.contains(string, pattern[, options]);
+     *
+     * console.log(mm.contains('aa/bb/cc', '*b'));
+     * //=> true
+     * console.log(mm.contains('aa/bb/cc', '*d'));
+     * //=> false
+     * ```
+     */
+    contains(str: string, patterns: string | string[], options?: micromatch.Options): boolean;
+
+    /**
+     * Filter the keys of the given object with the given `glob` pattern and `options`. Does not attempt to match nested keys.
+     * If you need this feature, use [glob-object](https://github.com/jonschlinkert/glob-object) instead.
+     *
+     * @param object The object with keys to filter.
+     * @param patterns One or more glob patterns to use for matching.
+     * @param options See available options for changing how matches are performed
+     * @returns Returns an object with only keys that match the given patterns.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.matchKeys(object, patterns[, options]);
+     *
+     * var obj = { aa: 'a', ab: 'b', ac: 'c' };
+     * console.log(mm.matchKeys(obj, '*b'));
+     * //=> { ab: 'b' }
+     * ```
+     */
+    matchKeys<T>(object: T, patterns: string | string[], options?: micromatch.Options): Partial<T>;
+
+    /**
+     * Returns a memoized matcher function from the given glob `pattern` and `options`. The returned function takes a string to match as its only argument and returns true if the string is a match.
+     *
+     * @param pattern Glob pattern
+     * @param options See available options for changing how matches are performed.
+     * @returns Returns a matcher function.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.matcher(pattern[, options]);
+     *
+     * var isMatch = mm.matcher('*.!(*a)');
+     * console.log(isMatch('a.a'));
+     * //=> false
+     * console.log(isMatch('a.b'));
+     * //=> true
+     * ```
+     */
+    matcher(pattern: string, options?: micromatch.Options): (str: string) => boolean;
+
+    /**
+     * Returns an array of matches captured by `pattern` in `string, or`null` if the pattern did not match.
+     *
+     * @param pattern Glob pattern to use for matching.
+     * @param string String to match
+     * @param options See available options for changing how matches are performed
+     * @returns Returns an array of captures if the string matches the glob pattern, otherwise `null`.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.capture(pattern, string[, options]);
+     *
+     * console.log(mm.capture('test/*.js', 'test/foo.js'));
+     * //=> ['foo']
+     * console.log(mm.capture('test/*.js', 'foo/bar.css'));
+     * //=> null
+     * ```
+     */
+    capture(pattern: string, string: string, options?: micromatch.Options): string[] | null;
+
+    /**
+     * Create a regular expression from the given glob `pattern`.
+     *
+     * @param pattern A glob pattern to convert to regex.
+     * @param options See available options for changing how matches are performed.
+     * @returns Returns a regex created from the given pattern.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.makeRe(pattern[, options]);
+     *
+     * console.log(mm.makeRe('*.js'));
+     * //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
+     * ```
+     */
+    makeRe(pattern: string, options?: micromatch.Options): RegExp;
+
+    /**
+     * Expand the given brace `pattern`.
+     *
+     * @param pattern String with brace pattern to expand.
+     * @param options Any options to change how expansion is performed. See the [braces](https://github.com/micromatch/braces) library for all available options.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * console.log(mm.braces('foo/{a,b}/bar'));
+     * //=> ['foo/(a|b)/bar']
+     *
+     * console.log(mm.braces('foo/{a,b}/bar', {expand: true}));
+     * //=> ['foo/(a|b)/bar']
+     * ```
+     */
+    braces(pattern: string, options?: braces.Options): string[];
+
+    /**
+     * Parses the given glob `pattern` and returns an array of abstract syntax trees (ASTs), with the compiled `output` and optional source `map` on each AST.
+     *
+     * @param pattern Glob pattern to parse and compile.
+     * @param options Any options to change how parsing and compiling is performed.
+     * @returns Returns an object with the parsed AST, compiled string and optional source map.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.create(pattern[, options]);
+     *
+     * console.log(mm.create('abc/*.js'));
+     * // [{ options: { source: 'string', sourcemap: true },
+     * //   state: {},
+     * //   compilers:
+     * //    { ... },
+     * //   output: '(\\.[\\\\\\/])?abc\\/(?!\\.)(?=.)[^\\/]*?\\.js',
+     * //   ast:
+     * //    { type: 'root',
+     * //      errors: [],
+     * //      nodes:
+     * //       [ ... ],
+     * //      dot: false,
+     * //      input: 'abc/*.js' },
+     * //   parsingErrors: [],
+     * //   map:
+     * //    { version: 3,
+     * //      sources: [ 'string' ],
+     * //      names: [],
+     * //      mappings: 'AAAA,GAAG,EAAC,kBAAC,EAAC,EAAE',
+     * //      sourcesContent: [ 'abc/*.js' ] },
+     * //   position: { line: 1, column: 28 },
+     * //   content: {},
+     * //   files: {},
+     * //   idx: 6 }]
+     * ```
+     */
+    create(pattern: string, options?: micromatch.Options): object;
+
+    /**
+     * Parse the given `str` with the given `options`.
+     *
+     * @returns Returns an AST
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.parse(pattern[, options]);
+     *
+     * var ast = mm.parse('a/{b,c}/d');
+     * console.log(ast);
+     * // { type: 'root',
+     * //   errors: [],
+     * //   input: 'a/{b,c}/d',
+     * //   nodes:
+     * //    [ { type: 'bos', val: '' },
+     * //      { type: 'text', val: 'a/' },
+     * //      { type: 'brace',
+     * //        nodes:
+     * //         [ { type: 'brace.open', val: '{' },
+     * //           { type: 'text', val: 'b,c' },
+     * //           { type: 'brace.close', val: '}' } ] },
+     * //      { type: 'text', val: '/d' },
+     * //      { type: 'eos', val: '' } ] }
+     * ```
+     */
+    parse(str: string, options?: micromatch.Options): object;
+
+    /**
+     * Compile the given `ast` or string with the given `options`.
+     *
+     * @returns Returns an object that has an `output` property with the compiled string.
+     *
+     * @example
+     * ```js
+     * var mm = require('micromatch');
+     * mm.compile(ast[, options]);
+     *
+     * var ast = mm.parse('a/{b,c}/d');
+     * console.log(mm.compile(ast));
+     * // { options: { source: 'string' },
+     * //   state: {},
+     * //   compilers:
+     * //    { eos: [Function],
+     * //      noop: [Function],
+     * //      bos: [Function],
+     * //      brace: [Function],
+     * //      'brace.open': [Function],
+     * //      text: [Function],
+     * //      'brace.close': [Function] },
+     * //   output: [ 'a/(b|c)/d' ],
+     * //   ast:
+     * //    { ... },
+     * //   parsingErrors: [] }
+     * ```
+     */
+    compile(ast: object | string, options?: micromatch.Options): object;
+
+    /**
+     * Clear the regex cache.
+     *
+     * @example
+     * ```js
+     * mm.clearCache();
+     * ```
+     */
+    clearCache(): void;
 }
 
+export as namespace micromatch;
+
 declare const micromatch: Micromatch;
 export = micromatch;
diff --git a/types/micromatch/micromatch-tests.ts b/types/micromatch/micromatch-tests.ts
index a0e40d0306..8270a0767a 100644
--- a/types/micromatch/micromatch-tests.ts
+++ b/types/micromatch/micromatch-tests.ts
@@ -1,54 +1,64 @@
-
 import mm = require('micromatch');
 
-var strArrResult: string[];
-var boolResult: boolean;
-var strMatchFuncResult: mm.MatchFunction<string>;
-var anyMatchFuncResult: mm.MatchFunction<any>;
-var globDataResult: mm.GlobData;
-var regExpResult: RegExp;
+// options type is accessible
+const micromatchOptions: mm.Options = {
+    basename: true,
+    dot: true,
+};
 
-// Usage.
-strArrResult = mm(['a.js', 'b.md', 'c.txt'], '*.{js,txt}');
+let strArrResult: string[];
+let boolResult: boolean;
 
-// Multiple patterns.
-strArrResult = mm(['a.md', 'b.js', 'c.txt', 'd.json'], ['*.md', '*.txt']);
+// main function
+strArrResult = mm(['a.js', 'a.txt'], '*.js', micromatchOptions);
+strArrResult = mm(['a.js', 'a.txt'], ['*.js']);
 
-// "isMatch" method.
-boolResult = mm.isMatch('.verb.md', '*.md');
-boolResult = mm.isMatch('.verb.md', '*.md', {dot: true});
-boolResult = mm.isMatch('*.md', {dot: true})('.verb.md');
+// .match
+strArrResult = mm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a');
 
-// "contains" method.
-boolResult = mm.contains('a/b/c', 'a/b');
-boolResult = mm.contains('a/b/c', 'a/b', {dot: true});
+// .isMatch
+boolResult = mm.isMatch('a.a', '*.a');
 
-// "matcher" method.
-strMatchFuncResult = mm.matcher('*.md');
-strMatchFuncResult = mm.matcher(/\.md$/);
-strMatchFuncResult = mm.matcher((filePath: string) => true);
+// .some
+boolResult = mm.some('foo.js', '*.js');
+boolResult = mm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']);
+boolResult = mm.some(['foo.js', 'bar.js'], '*.js');
 
-// "filter" method.
-anyMatchFuncResult = mm.filter('*.md');
-anyMatchFuncResult = mm.filter(/\.md$/);
-anyMatchFuncResult = mm.filter((filePath: string) => true);
+// .every
+boolResult = mm.every('foo.js', ['foo.js']);
+boolResult = mm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']);
+boolResult = mm.every(['foo.js', 'bar.js'], '*.js');
 
-anyMatchFuncResult = mm.filter('*.md', {dot: true});
-['a.js', 'b.txt', 'c.md'].filter(anyMatchFuncResult);
+// .any
+boolResult = mm.any('foo.js', ['foo.js']);
+boolResult = mm.any(['foo.js', 'bar.js'], ['*.js', '!foo.js'], micromatchOptions);
+boolResult = mm.any(['foo.js', 'bar.js'], '*.js');
 
-var arr = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
-anyMatchFuncResult = mm.filter(['{1..10}', '![7-9]', '!{3..4}']);
-arr.filter(anyMatchFuncResult);
+// .all
+boolResult = mm.all('foo.js', ['foo.js']);
+boolResult = mm.all(['foo.js', 'bar.js'], ['*.js', '!foo.js']);
+boolResult = mm.all(['foo.js', 'bar.js'], '*.js');
 
-// "any" method.
-boolResult = mm.any('abc', ['!*z']);
-boolResult = mm.any('abc', 'a*');
-boolResult = mm.any('abc', 'a*', {dot: true});
+// .not
+strArrResult = mm.not(['a.a', 'b.b', 'c.c'], '*.a');
 
-// "expand" method.
-globDataResult = mm.expand('*.js');
-globDataResult = mm.expand('*.js', {dot: true});
+// .contains
+boolResult = mm.contains('aa/bb/cc', '*b');
+boolResult = mm.contains('aa/bb/cc', ['*b', '*a']);
 
-// "makeRe" method.
-regExpResult = mm.makeRe('*.js');
-regExpResult = mm.makeRe('*.js', {dot: true});
+// .matchKeys
+const obj = { aa: 'a', ab: 'b', ac: 'c' };
+const partialObj: Partial<typeof obj> = mm.matchKeys(obj, '*b');
+
+// .matcher
+const matcherFn: (str: string) => boolean = mm.matcher('*.!(*a)');
+
+// .capture
+const strArrResultNullable: string[] | null = mm.capture('test/*.js', 'test/foo.js');
+
+// .makeRe
+const regex: RegExp = mm.makeRe('*.js');
+
+// .braces
+strArrResult = mm.braces('*.js');
+strArrResult = mm.braces('*.js', { expand: true });
diff --git a/types/micromatch/tsconfig.json b/types/micromatch/tsconfig.json
index acbf548c77..277346ea71 100644
--- a/types/micromatch/tsconfig.json
+++ b/types/micromatch/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/micromatch/tslint.json b/types/micromatch/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/micromatch/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/micromatch/v2/index.d.ts b/types/micromatch/v2/index.d.ts
new file mode 100644
index 0000000000..02608693a7
--- /dev/null
+++ b/types/micromatch/v2/index.d.ts
@@ -0,0 +1,171 @@
+// Type definitions for micromatch 2.3.7
+// Project: https://github.com/jonschlinkert/micromatch
+// Definitions by: glen-84 <https://github.com/glen-84>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import parseGlob = require('parse-glob');
+
+declare namespace micromatch {
+    type MatchFunction<T> = ((value: T) => boolean);
+    type Pattern = (string | RegExp | MatchFunction<string>);
+
+    interface Options {
+        /**
+         * Normalize slashes in file paths and glob patterns to forward slashes.
+         */
+        unixify?: boolean;
+        /**
+         * Match dotfiles. Same behavior as minimatch.
+         */
+        dot?: boolean;
+        /**
+         * Unescape slashes in glob patterns. Use cautiously, especially on windows.
+         */
+        unescape?: boolean;
+        /**
+         * Remove duplicate elements from the result array.
+         */
+        nodupes?: boolean;
+        /**
+         * Allow glob patterns without slashes to match a file path based on its basename. Same behavior as
+         * minimatch.
+         */
+        matchBase?: boolean;
+        /**
+         * Don't expand braces in glob patterns. Same behavior as minimatch nobrace.
+         */
+        nobraces?: boolean;
+        /**
+         * Don't expand POSIX bracket expressions.
+         */
+        nobrackets?: boolean;
+        /**
+         * Don't expand extended globs.
+         */
+        noextglob?: boolean;
+        /**
+         * Use a case-insensitive regex for matching files. Same behavior as minimatch.
+         */
+        nocase?: boolean;
+        /**
+         * If true, when no matches are found the actual (array-ified) glob pattern is returned instead of an empty
+         * array. Same behavior as minimatch.
+         */
+        nonull?: boolean;
+        /**
+         * Cache the platform (e.g. win32) to prevent this from being looked up for every file path.
+         */
+        cache?: boolean;
+    }
+
+    interface Glob {
+        options: micromatch.Options;
+        pattern: string;
+        history: { msg: any, pattern: string }[];
+        tokens: parseGlob.Result;
+        orig: string;
+        negated: boolean;
+
+        /**
+         * Initialize defaults.
+         */
+        init(pattern: string): void;
+
+        /**
+         * Push a change into `glob.history`. Useful for debugging.
+         */
+        track(msg: any): void;
+
+        /**
+         * Return true if `glob.pattern` was negated with `!`, also remove the `!` from the pattern.
+         */
+        isNegated(): boolean;
+
+        /**
+         * Expand braces in the given glob pattern.
+         */
+        braces(): void;
+
+        /**
+         * Expand bracket expressions in `glob.pattern`.
+         */
+        brackets(): void;
+
+        /**
+         * Expand extended globs in `glob.pattern`.
+         */
+        extglob(): void;
+
+        /**
+         * Parse the given pattern.
+         */
+        parse(pattern: string): parseGlob.Result;
+
+        /**
+         * Escape special characters in the given string.
+         */
+        escape(pattern: string): string;
+
+        /**
+         * Unescape special characters in the given string.
+         */
+        unescape(pattern: string): string;
+    }
+
+    interface GlobData {
+        pattern: string;
+        tokens: parseGlob.Result;
+        options: micromatch.Options;
+    }
+}
+
+interface Micromatch {
+    (files: string | string[], patterns: micromatch.Pattern | micromatch.Pattern[]): string[];
+
+    isMatch: {
+        /**
+         * Returns true if a file path matches the given pattern.
+         */
+        (filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+        /**
+         * Returns a function for matching.
+         */
+        (filePath: string, opts?: micromatch.Options): micromatch.MatchFunction<string>;
+    };
+
+    /**
+     * Returns true if any part of a file path matches the given pattern. Think of this as "has path" versus
+     * "is path".
+     */
+    contains(filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+
+    /**
+     * Returns a function for matching using the supplied pattern. e.g. create your own "matcher". The advantage of
+     * this method is that the pattern can be compiled outside of a loop.
+     */
+    matcher(pattern: micromatch.Pattern): micromatch.MatchFunction<string>;
+
+    /**
+     * Returns a function that can be passed to Array#filter().
+     */
+    filter(patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): micromatch.MatchFunction<any>;
+
+    /**
+     * Returns true if a file path matches any of the given patterns.
+     */
+    any(filePath: string, patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): boolean;
+
+    /**
+     * Returns an object with a regex-compatible string and tokens.
+     */
+    expand(pattern: string, opts?: micromatch.Options): micromatch.Glob | micromatch.GlobData;
+
+    /**
+     * Create a regular expression for matching file paths based on the given pattern.
+     */
+    makeRe(pattern: string, opts?: micromatch.Options): RegExp;
+}
+
+declare const micromatch: Micromatch;
+export = micromatch;
diff --git a/types/micromatch/v2/micromatch-tests.ts b/types/micromatch/v2/micromatch-tests.ts
new file mode 100644
index 0000000000..a0e40d0306
--- /dev/null
+++ b/types/micromatch/v2/micromatch-tests.ts
@@ -0,0 +1,54 @@
+
+import mm = require('micromatch');
+
+var strArrResult: string[];
+var boolResult: boolean;
+var strMatchFuncResult: mm.MatchFunction<string>;
+var anyMatchFuncResult: mm.MatchFunction<any>;
+var globDataResult: mm.GlobData;
+var regExpResult: RegExp;
+
+// Usage.
+strArrResult = mm(['a.js', 'b.md', 'c.txt'], '*.{js,txt}');
+
+// Multiple patterns.
+strArrResult = mm(['a.md', 'b.js', 'c.txt', 'd.json'], ['*.md', '*.txt']);
+
+// "isMatch" method.
+boolResult = mm.isMatch('.verb.md', '*.md');
+boolResult = mm.isMatch('.verb.md', '*.md', {dot: true});
+boolResult = mm.isMatch('*.md', {dot: true})('.verb.md');
+
+// "contains" method.
+boolResult = mm.contains('a/b/c', 'a/b');
+boolResult = mm.contains('a/b/c', 'a/b', {dot: true});
+
+// "matcher" method.
+strMatchFuncResult = mm.matcher('*.md');
+strMatchFuncResult = mm.matcher(/\.md$/);
+strMatchFuncResult = mm.matcher((filePath: string) => true);
+
+// "filter" method.
+anyMatchFuncResult = mm.filter('*.md');
+anyMatchFuncResult = mm.filter(/\.md$/);
+anyMatchFuncResult = mm.filter((filePath: string) => true);
+
+anyMatchFuncResult = mm.filter('*.md', {dot: true});
+['a.js', 'b.txt', 'c.md'].filter(anyMatchFuncResult);
+
+var arr = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
+anyMatchFuncResult = mm.filter(['{1..10}', '![7-9]', '!{3..4}']);
+arr.filter(anyMatchFuncResult);
+
+// "any" method.
+boolResult = mm.any('abc', ['!*z']);
+boolResult = mm.any('abc', 'a*');
+boolResult = mm.any('abc', 'a*', {dot: true});
+
+// "expand" method.
+globDataResult = mm.expand('*.js');
+globDataResult = mm.expand('*.js', {dot: true});
+
+// "makeRe" method.
+regExpResult = mm.makeRe('*.js');
+regExpResult = mm.makeRe('*.js', {dot: true});
diff --git a/types/micromatch/v2/tsconfig.json b/types/micromatch/v2/tsconfig.json
new file mode 100644
index 0000000000..e011e8c1cc
--- /dev/null
+++ b/types/micromatch/v2/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "paths": {
+            "micromatch": [
+                "micromatch/v2"
+            ]
+        },
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "micromatch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/micromatch/v2/tslint.json b/types/micromatch/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/micromatch/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/microrouter/index.d.ts b/types/microrouter/index.d.ts
index 052bd707d3..6d65adc8a1 100644
--- a/types/microrouter/index.d.ts
+++ b/types/microrouter/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/pedronauck/micro-router#readme
 // Definitions by: Mathieu Dutour <https://github.com/mathieudutour>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node"/>
 
diff --git a/types/microsoft-ajax/tslint.json b/types/microsoft-ajax/tslint.json
new file mode 100644
index 0000000000..529accfb4e
--- /dev/null
+++ b/types/microsoft-ajax/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-initializer": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/microsoft-live-connect/tslint.json b/types/microsoft-live-connect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/microsoft-live-connect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/microsoft-sdk-soap/index.d.ts b/types/microsoft-sdk-soap/index.d.ts
index ceba101e53..69c9d86c22 100644
--- a/types/microsoft-sdk-soap/index.d.ts
+++ b/types/microsoft-sdk-soap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://code.msdn.microsoft.com/SdkSoapjs-9b51b99a
 // Definitions by: Markus Mauch <https://github.com/markusmauch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Q from "q";
 
diff --git a/types/microsoft-sdk-soap/tslint.json b/types/microsoft-sdk-soap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/microsoft-sdk-soap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/microsoftteams/index.d.ts b/types/microsoftteams/index.d.ts
index a463cb4daa..497090cfa3 100644
--- a/types/microsoftteams/index.d.ts
+++ b/types/microsoftteams/index.d.ts
@@ -1,11 +1,10 @@
-// Type definitions for microsoftteams 1.1
+// Type definitions for microsoftteams 1.2
 // Project: https://github.com/OfficeDev/microsoft-teams-library-js
 // Definitions by: Bhargav Krishna <https://github.com/WrathOfZombies>
 //                 Jay Ongg <https://github.com/jayongg>
 //                 Yuri Dogandjiev <https://github.com/ydogandjiev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/types/microsoftteams
 // TypeScript Version: 2.1
-// tslint:disable:prefer-method-signature
 
 interface MessageEvent {
     originalEvent: MessageEvent;
@@ -19,6 +18,8 @@ declare namespace microsoftTeams {
     }
     interface TabInstance {
         tabName: string;
+        internalTabInstanceId?: string;
+        lastViewUnixEpochTime?: string;
         entityId?: string;
         channelId?: string;
         channelName?: string;
@@ -37,9 +38,19 @@ declare namespace microsoftTeams {
         Plc = 3,
         Staff = 4,
     }
+    interface TabInstanceParameters {
+        /**
+         * Flag allowing to select favorite channels only
+         */
+        favoriteChannelsOnly?: boolean;
+        /**
+         * Flag allowing to select favorite teams only
+         */
+        favoriteTeamsOnly?: boolean;
+    }
     /**
-     * Initializes the library. This must be called before any other SDK calls.
-     * The caller should only call this once the frame is loaded successfully.
+     * Initializes the library. This must be called before any other SDK calls
+     * but after the frame is loaded successfully.
      */
     function initialize(): void;
     /**
@@ -48,42 +59,58 @@ declare namespace microsoftTeams {
      */
     function getContext(callback: (context: Context) => void): void;
     /**
-     * Registers a handler for when the user changes their theme.
-     * Only one handler may be registered at a time. Subsequent registrations will override the first.
+     * Registers a handler for theme changes.
+     * Only one handler can be registered at a time. A subsequent registration replaces an existing registration.
      * @param handler The handler to invoke when the user changes their theme.
      */
     function registerOnThemeChangeHandler(handler: (theme: string) => void): void;
     /**
-     * Registers a handler for when the user toggle full screen view for tab.
-     * Only one handler may be registered at a time. Subsequent registrations will override the first.
-     * @param handler The handler to invoke when the user changes toggle full screen view for tab.
+     * Registers a handler for changes from or to full-screen view for a tab.
+     * Only one handler can be registered at a time. A subsequent registration replaces an existing registration.
+     * @param handler The handler to invoke when the user toggles full-screen view for a tab.
      */
     function registerFullScreenHandler(handler: (isFullScreen: boolean) => void): void;
     /**
      * Navigates the frame to a new cross-domain URL. The domain of this URL must match at least one of the
-     * valid domains specified in the tab manifest; otherwise, an exception will be thrown. This function only
-     * needs to be used when navigating the frame to a URL in a different domain than the current one in
-     * a way that keeps the app informed of the change and allows the SDK to continue working.
-     * @param url The url to navigate the frame to.
+     * valid domains specified in the validDomains block of the manifest; otherwise, an exception will be
+     * thrown. This function needs to be used only when navigating the frame to a URL in a different domain
+     * than the current one in a way that keeps the app informed of the change and allows the SDK to
+     * continue working.
+     * @param url The URL to navigate the frame to.
      */
     function navigateCrossDomain(url: string): void;
     /**
-     * Allows an app to retrieve all the tabs in favorite channels where it is enabled for this user
+     * Allows an app to retrieve for this user tabs that are owned by this app.
+     * If no TabInstanceParameters are passed, the app defaults to favorite teams and favorite channels.
+     * @param callback The callback to invoke when the {@link TabInstanceParameters} object is retrieved.
+     * @param tabInstanceParameters OPTIONAL Flags that specify whether to scope call to favorite teams or channels.
      */
-    function getTabInstances(callback: (tabInfo: TabInformation) => void): void;
+    function getTabInstances(callback: (tabInfo: TabInformation) => void, tabInstanceParameters?: TabInstanceParameters): void;
     /**
-     * Shares a deep link a user can use to navigate back to a specific state in this page.
+     * Allows an app to retrieve the most recently used tabs for this user.
+     * @param callback The callback to invoke when the {@link TabInformation} object is retrieved.
+     * @param tabInstanceParameters OPTIONAL Ignored, kept for future use
+     */
+    function getMruTabInstances(callback: (tabInfo: TabInformation) => void, tabInstanceParameters?: TabInstanceParameters): void;
+    /**
+     * Shares a deep link that a user can use to navigate back to a specific state in this page.
+     * @param deepLinkParameters ID and label for the link and fallback URL.
      */
     function shareDeepLink(deepLinkParameters: DeepLinkParameters): void;
+    /**
+     * Navigates the Microsoft Teams app to the specified tab instance.
+     * @param tabInstance The tab instance to navigate to.
+     */
+    function navigateToTab(tabInstance: TabInstance): void;
     /**
      * Namespace to interact with the settings-specific part of the SDK.
-     * This object is only usable on the settings frame.
+     * This object is usable only on the settings frame.
      */
     namespace settings {
         /**
          * Sets the validity state for the settings.
-         * The inital value is false so the user will not be able to save the settings until this is called with true.
-         * @param validityState A value indicating whether the save or remove button is enabled for the user.
+         * The initial value is false, so the user cannot save the settings until this is called with true.
+         * @param validityState Indicates whether the save or remove button is enabled for the user.
          */
         function setValidityState(validityState: boolean): void;
         /**
@@ -93,23 +120,22 @@ declare namespace microsoftTeams {
         function getSettings(callback: (settings: Settings) => void): void;
         /**
          * Sets the settings for the current instance.
-         * Note that this is an asynchronous operation so there are no guarentees as to when calls
-         * to getSettings will reflect the changed state.
-         * @param settings The desired settings for this current instance.
+         * This is an asynchronous operation; calls to getSettings are not guaranteed to reflect the changed state.
+         * @param settings The desired settings for this instance.
          */
         function setSettings(settings: Settings): void;
         /**
          * Registers a handler for when the user attempts to save the settings. This handler should be used
          * to create or update the underlying resource powering the content.
          * The object passed to the handler must be used to notify whether to proceed with the save.
-         * Only one handler may be registered at a time. Subsequent registrations will override the first.
+         * Only one handler can be registered at a time. A subsequent registration replaces an existing registration.
          * @param handler The handler to invoke when the user selects the save button.
          */
         function registerOnSaveHandler(handler: (evt: SaveEvent) => void): void;
         /**
-         * Registers a handler for when the user attempts to remove the content. This handler should be used
+         * Registers a handler for user attempts to remove content. This handler should be used
          * to remove the underlying resource powering the content.
-         * The object passed to the handler must be used to notify whether to proceed with the remove
+         * The object passed to the handler must be used to indicate whether to proceed with the removal.
          * Only one handler may be registered at a time. Subsequent registrations will override the first.
          * @param handler The handler to invoke when the user selects the remove button.
          */
@@ -121,41 +147,41 @@ declare namespace microsoftTeams {
              */
             suggestedDisplayName?: string;
             /**
-             * Sets the url to use for the content of this instance.
+             * Sets the URL to use for the content of this instance.
              */
             contentUrl: string;
             /**
-             * Sets the remove URL for the remove config experience
+             * Sets the URL for the removal configuration experience.
              */
             removeUrl?: string;
             /**
-             * Sets the url to use for the external link to view the underlying resource in a browser.
+             * Sets the URL to use for the external link to view the underlying resource in a browser.
              */
             websiteUrl?: string;
             /**
-             * The developer-defined unique id for the entity this content points to.
+             * The developer-defined unique ID for the entity to which this content points.
              */
             entityId: string;
         }
         interface SaveEvent {
             /**
-             * Notifies that the underlying resource has been created and the settings may be saved.
+             * Indicates that the underlying resource has been created and the settings can be saved.
              */
             notifySuccess(): void;
             /**
-             * Notifies that the underlying resource creation failed and that the settings may not be saved.
-             * @param reason Specifies a reason for the failure. If provided, this string is displayed to the user. Otherwise a generic error is displayed.
+             * Indicates that creation of the underlying resource failed and that the settings cannot be saved.
+             * @param reason Specifies a reason for the failure. If provided, this string is displayed to the user; otherwise a generic error is displayed.
              */
             notifyFailure(reason?: string): void;
         }
         interface RemoveEvent {
             /**
-             * Notifies that the underlying resource has been removed and the content may be removed.
+             * Indicates that the underlying resource has been removed and the content can be removed.
              */
             notifySuccess(): void;
             /**
-             * Notifies that the underlying resource removal failed and that the content may not be removed.
-             * @param reason Specifies a reason for the failure. If provided, this string is displayed to the user. Otherwise a generic error is displayed.
+             * Indicates that removal of the underlying resource failed and that the content cannot be removed.
+             * @param reason Specifies a reason for the failure. If provided, this string is displayed to the user; otherwise a generic error is displayed.
              */
             notifyFailure(reason?: string): void;
         }
@@ -166,53 +192,53 @@ declare namespace microsoftTeams {
      */
     namespace authentication {
         /**
-         * Initiates an authentication request which pops up a new windows with the specified settings.
-         * @param authenticateParameters A set of values that configure the authentication popup.
+         * Initiates an authentication request, which opens a new window with the specified settings.
+         * @param authenticateParameters A set of values that configure the authentication pop-up.
          */
         function authenticate(authenticateParameters: AuthenticateParameters): void;
         /**
-         * Requests an AAD token to be issued on behalf of the app. The token is acquired from the cache
-         * if it is not expired. Otherwise a request will be sent to AAD to obtain a new token.
+         * Requests an Azure AD token to be issued on behalf of the app. The token is acquired from the cache
+         * if it is not expired. Otherwise a request is sent to Azure AD to obtain a new token.
          * @param authTokenRequest A set of values that configure the token request.
          */
         function getAuthToken(authTokenRequest: AuthTokenRequest): void;
         /**
-         * Requests the decoded AAD user identity on behalf of the app.
+         * Requests the decoded Azure AD user identity on behalf of the app.
          */
         function getUser(userRequest: UserRequest): void;
         /**
          * Notifies the frame that initiated this authentication request that the request was successful.
-         * This function is only usable on the authentication window.
+         * This function is usable only on the authentication window.
          * This call causes the authentication window to be closed.
-         * @param result Specifies a result for the authentication. If specified, the frame which initiated the authentication popup will recieve this value in their callback.
+         * @param result Specifies a result for the authentication. If specified, the frame that initiated the authentication pop-up receives this value in its callback.
          */
         function notifySuccess(result?: string): void;
         /**
          * Notifies the frame that initiated this authentication request that the request failed.
-         * This function is only usable on the authentication window.
+         * This function is usable only on the authentication window.
          * This call causes the authentication window to be closed.
-         * @param reason Specifies a reason for the authentication failure. If specified, the frame which initiated the authentication popup will recieve this value in their callback.
+         * @param reason Specifies a reason for the authentication failure. If specified, the frame that initiated the authentication pop-up receives this value in its callback.
          */
         function notifyFailure(reason?: string): void;
         interface AuthenticateParameters {
             /**
-             * The url for the authentication popup
+             * The URL for the authentication pop-up.
              */
             url: string;
             /**
-             * The preferred width for the popup. Note that this value may be ignored if outside the acceptable bounds.
+             * The preferred width for the pop-up. This value can be ignored if outside the acceptable bounds.
              */
             width?: number;
             /**
-             * The preferred height for the popup. Note that this value may be ignored if outside the acceptable bounds.
+             * The preferred height for the pop-up. This value can be ignored if outside the acceptable bounds.
              */
             height?: number;
             /**
-             * A function which is called if the authentication succeeds with the result returned from the authentication popup.
+             * A function that is called if the authentication succeeds, with the result returned from the authentication pop-up.
              */
             successCallback?: (result?: string) => void;
             /**
-             * A function which is called if the authentication fails with the reason for the failure returned from the authentication popup.
+             * A function that is called if the authentication fails, with the reason for the failure returned from the authentication pop-up.
              */
             failureCallback?: (reason?: string) => void;
         }
@@ -222,21 +248,21 @@ declare namespace microsoftTeams {
              */
             resources: string[];
             /**
-             * A function which is called if the token request succeeds with the resulting token.
+             * A function that is called if the token request succeeds, with the resulting token.
              */
             successCallback?: (token: string) => void;
             /**
-             * A function which is called if the token request fails with the reason for the failure.
+             * A function that is called if the token request fails, with the reason for the failure.
              */
             failureCallback?: (reason: string) => void;
         }
         interface UserRequest {
             /**
-             * A function which is called if the token request succeeds with the resulting token.
+             * A function that is called if the token request succeeds, with the resulting token.
              */
             successCallback?: (user: UserProfile) => void;
             /**
-             * A function which is called if the token request fails with the reason for the failure.
+             * A function that is called if the token request fails, with the reason for the failure.
              */
             failureCallback?: (reason: string) => void;
         }
@@ -256,7 +282,7 @@ declare namespace microsoftTeams {
             iat: number;
             /**
              * Identifies the security token service (STS) that constructs and returns the token. In the tokens that Azure AD
-             * returns, the issuer is sts.windows.net. The GUID in the Issuer claim value is the tenant ID of the Azure AD
+             * returns, the issuer is sts.windows.net. The GUID in the issuer claim value is the tenant ID of the Azure AD
              * directory. The tenant ID is an immutable and reliable identifier of the directory.
              */
             iss: string;
@@ -269,7 +295,7 @@ declare namespace microsoftTeams {
              */
             given_name: string;
             /**
-             * Provides a human readable value that identifies the subject of the token. This value is not guaranteed to
+             * Provides a human-readable value that identifies the subject of the token. This value is not guaranteed to
              * be unique within a tenant and is designed to be used only for display purposes.
              */
             unique_name: string;
@@ -282,19 +308,19 @@ declare namespace microsoftTeams {
              * Identifies the principal about which the token asserts information, such as the user of an application.
              * This value is immutable and cannot be reassigned or reused, so it can be used to perform authorization
              * checks safely. Because the subject is always present in the tokens the Azure AD issues, we recommended
-             * using this value in a general purpose authorization system.
+             * using this value in a general-purpose authorization system.
              */
             sub: string;
             /**
              * An immutable, non-reusable identifier that identifies the directory tenant that issued the token. You can
-             * use this value to access tenant-specific directory resources in a multi-tenant application. For example,
+             * use this value to access tenant-specific directory resources in a multitenant application. For example,
              * you can use this value to identify the tenant in a call to the Graph API.
              */
             tid: string;
             /**
              * Defines the time interval within which a token is valid. The service that validates the token should verify
-             * that the current date is within the token lifetime, else it should reject the token. The service might allow
-             * for up to five minutes beyond the token lifetime range to account for any differences in clock time ("time
+             * that the current date is within the token lifetime; otherwise it should reject the token. The service might
+             * allow for up to five minutes beyond the token lifetime to account for any differences in clock time ("time
              * skew") between Azure AD and the service.
              */
             exp: number;
@@ -311,52 +337,60 @@ declare namespace microsoftTeams {
     }
     interface Context {
         /**
-         * The O365 group id for the team with which the content is associated.
-         * This field is only available when the identity permission is requested in the manifest.
+         * The Office 365 group ID for the team with which the content is associated.
+         * This field is available only when the identity permission is requested in the manifest.
          */
         groupId?: string;
         /**
-         * The Microsoft Teams id for the team with which the content is associated.
+         * The Microsoft Teams ID for the team with which the content is associated.
          */
         teamId?: string;
         /**
-         * The Microsoft Teams id for the channel with which the content is associated.
+         * The name for the team with which the content is associated.
+         */
+        teamName?: string;
+        /**
+         * The Microsoft Teams ID for the channel with which the content is associated.
          */
         channelId?: string;
         /**
-         * The developer-defined unique id for the entity this content points to.
+         * The name for the channel with which the content is associated.
+         */
+        channelName?: string;
+        /**
+         * The developer-defined unique ID for the entity this content points to.
          */
         entityId: string;
         /**
-         * The developer-defined unique id for the sub-entity this content points to.
-         * This field should be used to restore to a specific state within an entity, for example scrolling to or activating a specific piece of content.
+         * The developer-defined unique ID for the sub-entity this content points to.
+         * This field should be used to restore to a specific state within an entity, such as scrolling to or activating a specific piece of content.
          */
         subEntityId?: string;
         /**
          * The current locale that the user has configured for the app formatted as
-         * languageId-countryId (e.g. en-us).
+         * languageId-countryId (for example, en-us).
          */
         locale: string;
         /**
-         * The current user's upn.
-         * As a malicious party can host content in a malicious browser, this value should only
-         * be used as a hint as to who the user is and never as proof of identity.
-         * This field is only available when the identity permission is requested in the manifest.
+         * The UPN of the current user.
+         * Because a malicious party can host malicious content in a browser, this value should
+         * be used only as a hint as to who the user is and never as proof of identity.
+         * This field is available only when the identity permission is requested in the manifest.
          */
         upn?: string;
         /**
-         * The current user's AAD tenant id.
-         * As a malicious party can host content in a malicious browser, this value should only
-         * be used as a hint as to who the user is and never as proof of identity.
-         * This field is only available when the identity permission is requested in the manifest.
+         * The Azure AD tenant ID of the current user.
+         * Because a malicious party can host malicious content in a browser, this value should
+         * be used only as a hint as to who the user is and never as proof of identity.
+         * This field is available only when the identity permission is requested in the manifest.
          */
         tid?: string;
         /**
-         * The current UI theme the user is using.
+         * The current UI theme.
          */
         theme?: string;
         /**
-         * Indication whether the tab is in full screen mode.
+         * Indication whether the tab is in full-screen mode.
          */
         isFullScreen?: boolean;
         /**
@@ -366,17 +400,17 @@ declare namespace microsoftTeams {
     }
     interface DeepLinkParameters {
         /**
-         * The developer-defined unique id for the sub-entity this deep link points to within the current entity.
-         * This field should be used to restore to a specific state within an entity, for example scrolling to or activating a specific piece of content.
+         * The developer-defined unique ID for the sub-entity to which this deep link points in the current entity.
+         * This field should be used to restore to a specific state within an entity, such as scrolling to or activating a specific piece of content.
          */
         subEntityId: string;
         /**
-         * The label for the sub-entity which should be displayed when the deep link is rendered in a client.
+         * The label for the sub-entity that should be displayed when the deep link is rendered in a client.
          */
         subEntityLabel: string;
         /**
-         * The fallback url to navigate the user to if there is no support for rendering the page inside the client.
-         * This url should lead directly to the sub-entity.
+         * The fallback URL to which to navigate the user if the client cannot render the page.
+         * This URL should lead directly to the sub-entity.
          */
         subEntityWebUrl?: string;
     }
diff --git a/types/microsoftteams/microsoftteams-tests.ts b/types/microsoftteams/microsoftteams-tests.ts
index a4f8af0884..9c0106ea10 100644
--- a/types/microsoftteams/microsoftteams-tests.ts
+++ b/types/microsoftteams/microsoftteams-tests.ts
@@ -38,4 +38,8 @@
   microsoftTeams.getTabInstances(tabInfo => {
     const tabInstances: microsoftTeams.TabInstance[] = tabInfo.teamTabs;
   });
+
+  microsoftTeams.getMruTabInstances(tabInfo => {
+    const tabInstances: microsoftTeams.TabInstance[] = tabInfo.teamTabs;
+  });
 })();
diff --git a/types/milkcocoa/tslint.json b/types/milkcocoa/tslint.json
new file mode 100644
index 0000000000..22ecc7ce6f
--- /dev/null
+++ b/types/milkcocoa/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-switch": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/milliseconds/tslint.json b/types/milliseconds/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/milliseconds/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mime-db/tslint.json b/types/mime-db/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mime-db/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mimos/tslint.json b/types/mimos/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mimos/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/minilog/tslint.json b/types/minilog/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/minilog/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/minimatch/index.d.ts b/types/minimatch/index.d.ts
index 5c9bd38a28..d6982de95e 100644
--- a/types/minimatch/index.d.ts
+++ b/types/minimatch/index.d.ts
@@ -15,19 +15,19 @@ declare namespace M {
      * If nothing is matched, and options.nonull is set,
      * then return a list containing the pattern itself.
      */
-    function match(list: string[], pattern: string, options?: IOptions): string[];
+    function match(list: ReadonlyArray<string>, pattern: string, options?: IOptions): string[];
 
     /**
      * Returns a function that tests its supplied argument, suitable for use with Array.filter
      */
-    function filter(pattern: string, options?: IOptions): (element: string, indexed: number, array: string[]) => boolean;
+    function filter(pattern: string, options?: IOptions): (element: string, indexed: number, array: ReadonlyArray<string>) => boolean;
 
     /**
      * Make a regular expression object from the pattern.
      */
     function makeRe(pattern: string, options?: IOptions): RegExp;
 
-    var Minimatch: IMinimatchStatic;
+    let Minimatch: IMinimatchStatic;
 
     interface IOptions {
         /**
diff --git a/types/minimatch/minimatch-tests.ts b/types/minimatch/minimatch-tests.ts
index 5b7a3bdb18..59076d9a5c 100644
--- a/types/minimatch/minimatch-tests.ts
+++ b/types/minimatch/minimatch-tests.ts
@@ -1,17 +1,17 @@
 import mm = require("minimatch");
-
-var pattern = "**/*.ts";
-var options = {
+let bool: boolean;
+const pattern = "**/*.ts";
+const options = {
 	debug: true
 };
-var m = new mm.Minimatch(pattern, options);
-var r = m.makeRe();
+const m = new mm.Minimatch(pattern, options);
+const regxp = m.makeRe();
 
-var f = ["test.ts"];
-mm.match(f, pattern, options);
+const files: ReadonlyArray<string> = ["test.ts"];
+mm.match(files, pattern, options);
 
-f.filter(mm.filter(pattern, options));
+files.filter(mm.filter(pattern, options));
 
-var s: string = "hello";
-var b: boolean = mm(s, pattern, options);
-var b: boolean = mm(s, pattern);
+const str = "hello";
+bool = mm(str, pattern, options);
+bool = mm(str, pattern);
diff --git a/types/minimatch/tslint.json b/types/minimatch/tslint.json
new file mode 100644
index 0000000000..78ac1711c4
--- /dev/null
+++ b/types/minimatch/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "interface-name": false,
+        "no-redundant-jsdoc-2": false
+    }
+}
diff --git a/types/minimist-options/index.d.ts b/types/minimist-options/index.d.ts
new file mode 100644
index 0000000000..59b4bf9df9
--- /dev/null
+++ b/types/minimist-options/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for minimist-options 3.0
+// Project: https://github.com/vadimdemedes/minimist-options
+// Definitions by: Ika <https://github.com/ikatyang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import * as minimist from 'minimist';
+
+declare function build(options?: build.Options): minimist.Opts;
+
+declare namespace build {
+    type Type = 'string' | 'boolean';
+
+    interface Option {
+        type?: Type;
+        alias?: string | string[];
+        default?: any;
+    }
+
+    type Options = {
+        [key: string]: Type | Option;
+    } & {
+        [K in 'stopEarly' | 'unknown' | '--']?: minimist.Opts[K];
+    };
+}
+
+export = build;
diff --git a/types/minimist-options/minimist-options-tests.ts b/types/minimist-options/minimist-options-tests.ts
new file mode 100644
index 0000000000..1363665d27
--- /dev/null
+++ b/types/minimist-options/minimist-options-tests.ts
@@ -0,0 +1,22 @@
+import buildOptions = require("minimist-options");
+import minimist = require("minimist");
+
+const options = buildOptions({
+    name: {
+        type: "string",
+        alias: "n",
+        default: "john"
+    },
+
+    force: {
+        type: "boolean",
+        alias: ["f", "o"],
+        default: false
+    },
+
+    published: "boolean",
+
+    arguments: "string"
+});
+
+const args = minimist(['--option', 'value', 'input'], options);
diff --git a/types/minimist-options/tsconfig.json b/types/minimist-options/tsconfig.json
new file mode 100644
index 0000000000..b43c584555
--- /dev/null
+++ b/types/minimist-options/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "minimist-options-tests.ts"
+    ]
+}
diff --git a/types/minimist-options/tslint.json b/types/minimist-options/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/minimist-options/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/minimist/tslint.json b/types/minimist/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/minimist/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mirrorx/index.d.ts b/types/mirrorx/index.d.ts
new file mode 100644
index 0000000000..66f85e14e7
--- /dev/null
+++ b/types/mirrorx/index.d.ts
@@ -0,0 +1,183 @@
+// Type definitions for mirrorx 0.2
+// Project: https://github.com/mirrorjs/mirror
+// Definitions by: Aaronphy <https://github.com/aaronphy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import * as H from 'history';
+
+import * as React from 'react';
+
+import { Connect } from 'react-redux';
+import { match } from "react-router";
+
+export type Diff<T extends string, U extends string> = ({[P in T]: P } & {[P in U]: never } & { [x: string]: never })[T];
+export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
+export interface model {
+  name: string;
+  initialState?: any;
+  reducers?: any;
+  effects?: any;
+}
+
+export interface _model {
+  name: string;
+  reducers: any;
+}
+export interface LinkProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
+  to: H.LocationDescriptor;
+  replace?: boolean;
+}
+export interface NavLinkProps extends LinkProps {
+  activeClassName?: string;
+  activeStyle?: React.CSSProperties;
+  exact?: boolean;
+  strict?: boolean;
+  isActive?(match: match<any>, location: H.Location): boolean;
+  location?: H.Location;
+}
+
+export interface SwitchProps {
+  children?: React.ReactNode;
+  location?: H.Location;
+}
+
+export interface RedirectProps {
+  to: H.LocationDescriptor;
+  push?: boolean;
+  from?: string;
+  path?: string;
+  exact?: boolean;
+  strict?: boolean;
+}
+
+export interface RouteComponentProps<P> {
+  match: match<P>;
+  location: H.Location;
+  history: H.History;
+  staticContext?: any;
+}
+
+export interface RouteProps {
+  location?: H.Location;
+  component?: React.ComponentType<RouteComponentProps<any>> | React.ComponentType<any>;
+  render?: ((props: RouteComponentProps<any>) => React.ReactNode);
+  children?: ((props: RouteComponentProps<any>) => React.ReactNode) | React.ReactNode;
+  path?: string;
+  exact?: boolean;
+  strict?: boolean;
+}
+
+export interface PromptProps {
+  message: string | ((location: H.Location) => string | boolean);
+  when?: boolean;
+}
+
+export interface LocationActionPayload {
+  method: string;
+  args?: any[];
+}
+
+export interface RouterAction {
+  type: '@@router/CALL_HISTORY_METHOD';
+  payload: LocationActionPayload;
+}
+
+export interface routeActions {
+  push(location: any, state?: any): RouterAction;
+  replace(location: any, state?: any): RouterAction;
+  go(n: number): RouterAction;
+  goBack(): RouterAction;
+  goForward(): RouterAction;
+}
+
+export interface ConnectedRouterProps<State> {
+  store?: any;
+  history?: H.History;
+}
+
+export interface Actions {
+  routing: routeActions;
+  [propName: string]: any;
+}
+
+export interface defaultOptions {
+  initialState?: {};
+  historyMode?: string;
+  middlewares: any[];
+  reducers: {};
+  addEffect(name: string, handler: () => any): any;
+}
+
+export interface Renderer {
+  <T extends Element>(
+    element: React.DOMElement<React.DOMAttributes<T>, T>,
+    container: Element | null,
+    callback?: () => void
+  ): T;
+
+  (
+    element: Array<React.DOMElement<React.DOMAttributes<any>, any>>,
+    container: Element | null,
+    callback?: () => void
+  ): Element;
+
+  (
+    element: React.SFCElement<any> | Array<React.SFCElement<any>>,
+    container: Element | null,
+    callback?: () => void
+  ): void;
+
+  <P, T extends React.Component<P, React.ComponentState>>(
+    element: React.CElement<P, T>,
+    container: Element | null,
+    callback?: () => void
+  ): T;
+
+  (
+    element: Array<React.CElement<any, React.Component<any, React.ComponentState>>>,
+    container: Element | null,
+    callback?: () => void
+  ): React.Component<any, React.ComponentState>;
+
+  <P>(
+    element: React.ReactElement<P>,
+    container: Element | null,
+    callback?: () => void
+  ): React.Component<P, React.ComponentState> | Element | void;
+
+  (
+    element: Array<React.ReactElement<any>>,
+    container: Element | null,
+    callback?: () => void
+  ): React.Component<any, React.ComponentState> | Element | void;
+
+  (
+    parentComponent: React.Component<any> | Array<React.Component<any>>,
+    element: React.SFCElement<any>,
+    container: Element,
+    callback?: () => void
+  ): void;
+}
+
+/**
+ * This method is used to create and inject a model.
+ */
+export function model(options: model): _model;
+/**
+ * connect connects your React component to your Redux store
+ */
+export const connect: Connect;
+export const actions: Actions;
+export function hook(): (subscriber: () => any) => any;
+export function defaults(): (options: defaultOptions) => void;
+export const render: Renderer;
+export class Router<State> extends React.Component<ConnectedRouterProps<State>> { }
+export class Link extends React.Component<LinkProps, any> { }
+export class NavLink extends React.Component<NavLinkProps, any> { }
+export class Redirect extends React.Component<RedirectProps, any> { }
+export class Route<T extends RouteProps = RouteProps> extends React.Component<T, any> { }
+export class Prompt extends React.Component<PromptProps, any> { }
+export function withRouter<P extends RouteComponentProps<any>>(component: React.ComponentType<P>): React.ComponentClass<Omit<P, keyof RouteComponentProps<any>>>;
+export function withRouter<TFunction extends React.ComponentClass<any>>(target: TFunction): TFunction;
diff --git a/types/mirrorx/mirrorx-tests.ts b/types/mirrorx/mirrorx-tests.ts
new file mode 100644
index 0000000000..c608828e14
--- /dev/null
+++ b/types/mirrorx/mirrorx-tests.ts
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import mirror = require('mirrorx');
+/**
+ * add mirror.model.tests
+ */
+mirror.model({
+    name: 'app',
+    initialState: 0,
+    reducers: {
+        increment(state: any) { return state + 1; },
+        decrement(state: any) { return state - 1; }
+    },
+    effects: {
+        async incrementAsync() {
+            await new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    resolve();
+                }, 1000);
+            });
+            mirror.actions.app.increment();
+        }
+    }
+});
diff --git a/types/mirrorx/tsconfig.json b/types/mirrorx/tsconfig.json
new file mode 100644
index 0000000000..561f5cdab4
--- /dev/null
+++ b/types/mirrorx/tsconfig.json
@@ -0,0 +1,26 @@
+{
+	"files": [
+        "index.d.ts",
+        "mirrorx-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/mirrorx/tslint.json b/types/mirrorx/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/mirrorx/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/mithril-global/index.d.ts b/types/mithril-global/index.d.ts
index 4dd8240303..fe1814e4ed 100644
--- a/types/mithril-global/index.d.ts
+++ b/types/mithril-global/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://mithril.js.org/
 // Definitions by: Mike Linkovich <https://github.com/spacejack>, Isiah Meadows <https://github.com/isiahmeadows>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 // Global Mithril types
 
diff --git a/types/mithril/index.d.ts b/types/mithril/index.d.ts
index 32a76fca0e..79706617e8 100644
--- a/types/mithril/index.d.ts
+++ b/types/mithril/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://mithril.js.org/
 // Definitions by: Mike Linkovich <https://github.com/spacejack>, András Parditka <https://github.com/andraaspar>, Isiah Meadows <https://github.com/isiahmeadows>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /** Manually triggers a redraw of mounted components. */
 declare function redraw(): void;
@@ -63,7 +63,7 @@ declare namespace Mithril {
 		trust(html: string): Vnode<any, any>;
 	}
 
-	interface RouteResolver<Attrs, State> {
+	interface RouteResolver<Attrs = {}, State = {}> {
 		/** The onmatch hook is called when the router needs to find a component to render. */
 		onmatch?(this: this, args: Attrs, requestedPath: string): ComponentTypes<any, any> | Promise<any> | void;
 		/** The render method is called on every redraw for a matching route. */
@@ -173,7 +173,7 @@ declare namespace Mithril {
 	type ChildArrayOrPrimitive = ChildArray | string | number | boolean;
 
 	/** Virtual DOM nodes, or vnodes, are Javascript objects that represent an element (or parts of the DOM). */
-	interface Vnode<Attrs, State extends Lifecycle<Attrs, State>> {
+	interface Vnode<Attrs = {}, State extends Lifecycle<Attrs, State> = Lifecycle<Attrs, State>> {
 		/** The nodeName of a DOM element. It may also be the string [ if a vnode is a fragment, # if it's a text vnode, or < if it's a trusted HTML vnode. Additionally, it may be a component. */
 		tag: string | ComponentTypes<Attrs, State>;
 		/** A hashmap of DOM attributes, events, properties and lifecycle methods. */
@@ -194,23 +194,23 @@ declare namespace Mithril {
 
 	// In some lifecycle methods, Vnode will have a dom property
 	// and possibly a domSize property.
-	interface VnodeDOM<Attrs, State extends Lifecycle<Attrs, State>> extends Vnode<Attrs, State> {
+	interface VnodeDOM<Attrs = {}, State extends Lifecycle<Attrs, State> = Lifecycle<Attrs, State>> extends Vnode<Attrs, State> {
 		/** Points to the element that corresponds to the vnode. */
 		dom: Element;
 		/** This defines the number of DOM elements that the vnode represents (starting from the element referenced by the dom property). */
 		domSize?: number;
 	}
 
-	interface CVnode<A> extends Vnode<A, ClassComponent<A>> { }
+	interface CVnode<A = {}> extends Vnode<A, ClassComponent<A>> { }
 
-	interface CVnodeDOM<A> extends VnodeDOM<A, ClassComponent<A>> { }
+	interface CVnodeDOM<A = {}> extends VnodeDOM<A, ClassComponent<A>> { }
 
 	/**
 	 * Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse.
 	 * Any Javascript object that has a view method can be used as a Mithril component.
 	 * Components can be consumed via the m() utility.
 	 */
-	interface Component<Attrs, State extends Lifecycle<Attrs, State>> extends Lifecycle<Attrs, State> {
+	interface Component<Attrs = {}, State extends Lifecycle<Attrs, State> = Lifecycle<Attrs, State>> extends Lifecycle<Attrs, State> {
 		/** Creates a view out of virtual elements. */
 		view(this: State, vnode: Vnode<Attrs, State>): Children | null | void;
 	}
@@ -220,7 +220,7 @@ declare namespace Mithril {
 	 * Any class that implements a view method can be used as a Mithril component.
 	 * Components can be consumed via the m() utility.
 	 */
-	interface ClassComponent<A> extends Lifecycle<A, ClassComponent<A>> {
+	interface ClassComponent<A = {}> extends Lifecycle<A, ClassComponent<A>> {
 		/** The oninit hook is called before a vnode is touched by the virtual DOM engine. */
 		oninit?(vnode: Vnode<A, this>): any;
 		/** The oncreate hook is called after a DOM element is created and attached to the document. */
@@ -242,16 +242,16 @@ declare namespace Mithril {
 	 * Any function that returns an object with a view method can be used as a Mithril component.
 	 * Components can be consumed via the m() utility.
 	 */
-	type FactoryComponent<A> = (vnode: Vnode<A, {}>) => Component<A, {}>;
+	type FactoryComponent<A = {}> = (vnode: Vnode<A, {}>) => Component<A, {}>;
 
 	/**
 	 * Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse.
 	 * Any Javascript object that has a view method is a Mithril component. Components can be consumed via the m() utility.
 	 */
-	type Comp<Attrs, State extends Lifecycle<Attrs, State>> = Component<Attrs, State> & State;
+	type Comp<Attrs = {}, State extends Lifecycle<Attrs, State> = Lifecycle<Attrs, State>> = Component<Attrs, State> & State;
 
 	/** Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse. Components can be consumed via the m() utility. */
-	type ComponentTypes<A, S> = Component<A, S> | { new (vnode: CVnode<A>): ClassComponent<A> } | FactoryComponent<A>;
+	type ComponentTypes<A = {}, S extends Lifecycle<A, S> = Lifecycle<A, S>> = Component<A, S> | { new (vnode: CVnode<A>): ClassComponent<A> } | FactoryComponent<A>;
 
 	/** This represents the attributes available for configuring virtual elements, beyond the applicable DOM attributes. */
 	interface Attributes extends Lifecycle<any, any> {
diff --git a/types/mithril/test/test-class-component.ts b/types/mithril/test/test-class-component.ts
index 11e9fa3279..ceaf9d08d3 100644
--- a/types/mithril/test/test-class-component.ts
+++ b/types/mithril/test/test-class-component.ts
@@ -5,8 +5,8 @@ import { ClassComponent, Vnode, CVnode, CVnodeDOM } from 'mithril';
 // 0.
 // Simplest component example - no attrs or state.
 //
-class Comp0 implements ClassComponent<{}> {
-	constructor(vnode: CVnode<{}>) {
+class Comp0 implements ClassComponent {
+	constructor(vnode: CVnode) {
 	}
 	view() {
 		return m('span', "Test");
@@ -23,12 +23,12 @@ m.mount(document.getElementById('comp0')!, null);
 // 1.
 // Simple example with lifecycle methods.
 //
-class Comp1 implements ClassComponent<{}> {
-	oninit(vnode: CVnode<{}>) {
+class Comp1 implements ClassComponent {
+	oninit(vnode: CVnode) {
 	}
-	oncreate({dom}: CVnodeDOM<{}>) {
+	oncreate({dom}: CVnodeDOM) {
 	}
-	view(vnode: CVnode<{}>) {
+	view(vnode: CVnode) {
 		return m('span', "Test");
 	}
 }
@@ -130,7 +130,7 @@ export interface Attrs {
 
 export default class MyComponent implements ClassComponent<Attrs> {
 	count = 0;
-	view({attrs}: Vnode<Attrs, MyComponent>) {
+	view({attrs}: CVnode<Attrs>) {
 		return m('span', `name: ${attrs.name}, count: ${this.count}`);
 	}
 }
diff --git a/types/mithril/test/test-component.ts b/types/mithril/test/test-component.ts
index a8fecaa28f..781cdedbe3 100644
--- a/types/mithril/test/test-component.ts
+++ b/types/mithril/test/test-component.ts
@@ -22,7 +22,7 @@ m.mount(document.getElementById('comp0')!, null);
 // 1.
 // Simple example. Vnode type for component methods is inferred.
 //
-const comp1: Component<{}, {}> = {
+const comp1: Component = {
 	oncreate({dom}) {
 		// vnode.dom type inferred
 	},
@@ -40,7 +40,7 @@ interface Comp2Attrs {
 	description: string;
 }
 
-const comp2: Component<Comp2Attrs, {}> = {
+const comp2: Component<Comp2Attrs> = {
 	view({attrs: {title, description}}) { // Comp2Attrs type is inferred
 		return [m('h2', title), m('p', description)];
 	}
@@ -78,7 +78,7 @@ m(comp2, {title: '', description: '', foo: ''});
 // Uses comp2 with typed attrs and makes use of `onremove`
 // lifecycle method.
 //
-const comp3: Component<{pageHead: string}, {}> = {
+const comp3: Component<{pageHead: string}> = {
 	oncreate({dom}) {
 		// Can do stuff with dom
 	},
diff --git a/types/mithril/test/test-factory-component.ts b/types/mithril/test/test-factory-component.ts
index be3fdb60f1..ba438a3789 100644
--- a/types/mithril/test/test-factory-component.ts
+++ b/types/mithril/test/test-factory-component.ts
@@ -23,7 +23,7 @@ m.mount(document.getElementById('comp0')!, null);
 // 1.
 // Simple example. Vnode type for component methods is inferred.
 //
-function comp1(): Component<{}, {}> {
+function comp1(): Component {
 	return {
 		oncreate({dom}) {
 			// vnode.dom type inferred
@@ -89,7 +89,7 @@ interface Comp4Attrs {
 	name: string;
 }
 
-function comp4(): Component<Comp4Attrs, {}> {
+function comp4(): Component<Comp4Attrs> {
 	let count = 0;
 
 	function add(num: number) {
@@ -165,7 +165,7 @@ interface Attrs {
 	name: string;
 }
 
-export default (): Component<Attrs, {}> => {
+export default (): Component<Attrs> => {
 	const count = 0;
 	return {
 		view({attrs}) {
diff --git a/types/mithril/test/test-fragment.ts b/types/mithril/test/test-fragment.ts
index 097831d3ed..5e60952741 100644
--- a/types/mithril/test/test-fragment.ts
+++ b/types/mithril/test/test-fragment.ts
@@ -1,5 +1,5 @@
 import * as m from 'mithril';
-import { Vnode } from 'mithril/';
+import { Vnode } from 'mithril';
 import * as h from 'mithril/hyperscript';
 
 const vnode = m.fragment({id: 'abc'}, ['test']);
@@ -9,7 +9,7 @@ m.fragment({}, ['Test', 123]);
 m.fragment(
 	{
 		id: 'abc',
-		oninit: (vnode: Vnode<any, any>) => {
+		oninit: (vnode) => {
 			console.log('oninit');
 		}
 	},
diff --git a/types/mithril/test/test-route.ts b/types/mithril/test/test-route.ts
index 70428fde88..523780261d 100644
--- a/types/mithril/test/test-route.ts
+++ b/types/mithril/test/test-route.ts
@@ -8,7 +8,7 @@ const component1 = {
 	}
 };
 
-const component2: Component<{title: string}, {}> = {
+const component2: Component<{title: string}> = {
 	view({attrs: {title}}) {
 		return h('h1', title);
 	}
@@ -34,7 +34,7 @@ const component3: Comp<Attrs, State> = {
 };
 
 class Component4 implements ClassComponent<Attrs> {
-	view({attrs}: Vnode<Attrs, {}>) {
+	view({attrs}: Vnode<Attrs>) {
 		return h('p', 'id: ' + attrs.id);
 	}
 }
@@ -47,8 +47,12 @@ const component5: FactoryComponent<Attrs> = () => {
 	};
 };
 
-// RouteResolver example using Attrs type and this context
-const routeResolver: RouteResolver<Attrs, State> & {message: string} = {
+interface RRState {
+	message: string;
+}
+
+// Stateful RouteResolver example using Attrs type and this context
+const routeResolver: RouteResolver<Attrs, RRState> & RRState = {
 	message: "",
 	onmatch(attrs, path) {
 		this.message = "Match";
diff --git a/types/mitm/tslint.json b/types/mitm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mitm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mixpanel/index.d.ts b/types/mixpanel/index.d.ts
index fdb6721fab..08bbe26720 100644
--- a/types/mixpanel/index.d.ts
+++ b/types/mixpanel/index.d.ts
@@ -1,133 +1,630 @@
-// Type definitions for Mixpanel 2.13.0
+// Type definitions for Mixpanel 2.14
 // Project: https://mixpanel.com/
 //          https://github.com/mixpanel/mixpanel-js
 // Definitions by: Knut Eirik Leira Hjelle <https://github.com/hjellek>
+//                 Manduro <https://github.com/Manduro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface Mixpanel
-{
-    people:Mixpanel.People;
+interface Mixpanel {
+    people: Mixpanel.People;
 
-    init(token:string, config?:Mixpanel.Config, libraryName?:string):Mixpanel;
+    /**
+     * This function initializes a new instance of the Mixpanel tracking object.
+     * All new instances are added to the main mixpanel object as sub properties (such as
+     * mixpanel.library_name) and also returned by this function. To define a
+     * second instance on the page, you would call:
+     *
+     *     mixpanel.init('new token', { your: 'config' }, 'library_name');
+     *
+     * and use it like so:
+     *
+     *     mixpanel.library_name.track(...);
+     *
+     * @param token Your Mixpanel API token
+     * @param config A dictionary of config options to override
+     * @param libraryName The name for the new mixpanel instance that you want created
+     */
+    init(token: string, config?: Mixpanel.Config, libraryName?: string): Mixpanel;
 
-    push(item:any[]):void;
+    /**
+     * `push()` keeps the standard async-array-push
+     * behavior around after the lib is loaded.
+     * This is only useful for external integrations that
+     * do not wish to rely on our convenience methods
+     * (created in the snippet).
+     *
+     * ### Usage:
+     *     mixpanel.push(['register', { a: 'b' }]);
+     *
+     * @param item A [function_name, args...] array to be executed
+     */
+    push(item: any[]): void;
 
-    disable(events?:string[]):void;
+    /**
+     * Disable events on the Mixpanel object. If passed no arguments,
+     * this function disables tracking of any event. If passed an
+     * array of event names, those events will be disabled, but other
+     * events will continue to be tracked.
+     *
+     * Note: this function does not stop other mixpanel functions from
+     * firing, such as `register()` or `people.set()`.
+     *
+     * @param events An array of event names to disable
+     */
+    disable(events?: string[]): void;
 
-    time_event(eventName:string):void;
+    /**
+     * Track an event. This is the most important and
+     * frequently used Mixpanel function.
+     *
+     * ### Usage:
+     *
+     *     // track an event named 'Registered'
+     *     mixpanel.track('Registered', {'Gender': 'Male', 'Age': 21});
+     *
+     * To track link clicks or form submissions, see `track_links()` or `track_forms()`.
+     *
+     * @param eventName The name of the event. This can be anything the user does - 'Button Click', 'Sign Up', 'Item Purchased', etc.
+     * @param properties A set of properties to include with the event you're sending. These describe the user who did the event or details about the event itself.
+     * @param callback If provided, the callback function will be called after tracking the event.
+     */
+    track(eventName: string, properties?: { [index: string]: any }, callback?: () => void): void;
 
-    track(eventName:string, params?:{[index:string]:any}, callback?:() => void):void;
+    /**
+     * Track clicks on a set of document elements. Selector must be a
+     * valid query. Elements must exist on the page at the time `track_links` is called.
+     *
+     * ### Usage:
+     *
+     *     // track click for link id #nav
+     *     mixpanel.track_links('#nav', 'Clicked Nav Link');
+     *
+     * ### Notes:
+     *
+     * This function will wait up to 300 ms for the Mixpanel
+     * servers to respond. If they have not responded by that time
+     * it will head to the link without ensuring that your event
+     * has been tracked.  To configure this timeout please see the
+     * `set_config()` documentation below.
+     *
+     * If you pass a function in as the properties argument, the
+     * function will receive the DOMElement that triggered the
+     * event as an argument.  You are expected to return an object
+     * from the function; any properties defined on this object
+     * will be sent to mixpanel as event properties.
+     *
+     * @param querySelector A valid DOM query, element or jQuery-esque list
+     * @param eventName The name of the event to track
+     * @param properties A properties object or function that returns a dictionary of properties when passed a DOMElement
+     */
+    track_links(querySelector: string, eventName: string, properties?: { [index: string]: any }): void;
 
-    track_links(querySelector:string, eventName:string, params?:{[index:string]:any}):void;
+    /**
+     * Track form submissions. Selector must be a valid query.
+     *
+     * ### Usage:
+     *
+     *     // track submission for form id 'register'
+     *     mixpanel.track_forms('#register', 'Created Account');
+     *
+     * ### Notes:
+     *
+     * This function will wait up to 300 ms for the mixpanel
+     * servers to respond, if they have not responded by that time
+     * it will head to the link without ensuring that your event
+     * has been tracked.  To configure this timeout please see the
+     * `set_config()` documentation below.
+     *
+     * If you pass a function in as the properties argument, the
+     * function will receive the `DOMElement` that triggered the
+     * event as an argument.  You are expected to return an object
+     * from the function; any properties defined on this object
+     * will be sent to mixpanel as event properties.
+     *
+     * @param querySelector A valid DOM query, element or jQuery-esque list
+     * @param eventName The name of the event to track
+     * @param properties This can be a set of properties, or a function that returns a set of properties after being passed a DOMElement
+     */
+    track_forms(querySelector: string, eventName: string, properties?: { [index: string]: any }): void;
 
-    track_forms(querySelector:string, eventName:string, params?:{[index:string]:any}):void;
+    /**
+     * Time an event by including the time between this call and a
+     * later `track` call for the same event in the properties sent
+     * with the event.
+     *
+     * ### Usage:
+     *
+     *     // time an event named 'Registered'
+     *     mixpanel.time_event('Registered');
+     *     mixpanel.track('Registered', {'Gender': 'Male', 'Age': 21});
+     *
+     * When called for a particular event name, the next track call for that event
+     * name will include the elapsed time between the `time_event` and `track`
+     * calls. This value is stored as seconds in the `$duration` property.
+     *
+     * @param eventName The name of the event.
+     */
+    time_event(eventName: string): void;
 
-    register(params:{[index:string]:any}, days?:number):void;
+    /**
+     * Register a set of super properties, which are included with all
+     * events. This will overwrite previous super property values.
+     *
+     * ### Usage:
+     *
+     *     // register 'Gender' as a super property
+     *     mixpanel.register({'Gender': 'Female'});
+     *
+     *     // register several super properties when a user signs up
+     *     mixpanel.register({
+     *         'Email': 'jdoe@example.com',
+     *         'Account Type': 'Free'
+     *     });
+     *
+     * @param properties An associative array of properties to store about the user
+     * @param days How many days since the user's last visit to store the super properties
+     */
+    register(properties: { [index: string]: any }, days?: number): void;
 
-    register_once(params:{[index:string]:any}, defaultValue?:string, days?:number):void;
+    /**
+     * Register a set of super properties only once. This will not
+     * overwrite previous super property values, unlike `register()`.
+     *
+     * ### Usage:
+     *
+     *     // register a super property for the first time only
+     *     mixpanel.register_once({
+     *         'First Login Date': new Date().toISOString()
+     *     });
+     *
+     * ### Notes:
+     *
+     * If default_value is specified, current super properties
+     * with that value will be overwritten.
+     *
+     * @param properties An associative array of properties to store about the user
+     * @param defaultValue Value to override if already set in super properties (ex: 'False') Default: 'None'
+     * @param days How many days since the users last visit to store the super properties
+     */
+    register_once(properties: { [index: string]: any }, defaultValue?: string, days?: number): void;
 
-    reset():void;
+    /**
+     * Delete a super property stored with the current user.
+     *
+     * @param propertyName The name of the super property to remove
+     */
+    unregister(propertyName: string): void;
 
-    unregister(propertyName:string):void;
+    /**
+     * Identify a user with a unique ID. All subsequent
+     * actions caused by this user will be tied to this unique ID. This
+     * property is used to track unique visitors. If the method is
+     * never called, then unique visitors will be identified by a UUID
+     * generated the first time they visit the site.
+     *
+     * ### Notes:
+     *
+     * You can call this function to overwrite a previously set
+     * unique ID for the current user. Mixpanel cannot translate
+     * between IDs at this time, so when you change a user's ID
+     * they will appear to be a new user.
+     *
+     * `identify()` should not be called to link anonymous activity to
+     * subsequent activity when a unique ID is first assigned.
+     * Use `alias()` when a unique ID is first assigned (registration), and
+     * use `identify()` to identify the user with that unique ID on an ongoing
+     * basis (e.g., each time a user logs in after registering).
+     * Do not call `identify()` at the same time as `alias()`.
+     *
+     * @param unique_id A string that uniquely identifies a user. If not provided, the distinct_id currently in the persistent store (cookie or localStorage) will be used.
+     */
+    identify(uniqueId?: string): void;
 
-    identify(id?:string):void;
+    /**
+     * Clears super properties and generates a new random `distinct_id` for this instance.
+     * Useful for clearing data when a user logs out.
+     */
+    reset(): void;
 
-    get_distinct_id():string;
+    /**
+     * Returns the current distinct id of the user. This is either the id automatically
+     * generated by the library or the id that has been passed by a call to `identify()`.
+     *
+     * ### Notes:
+     *
+     * `get_distinct_id()` can only be called after the Mixpanel library has finished loading.
+     * `init()` has a loaded function available to handle this automatically. For example:
+     *
+     *     // set distinct_id after the mixpanel library has loaded
+     *     mixpanel.init('YOUR PROJECT TOKEN', {
+     *         loaded: function(mixpanel) {
+     *             distinct_id = mixpanel.get_distinct_id();
+     *         }
+     *     });
+     */
+    get_distinct_id(): string;
 
-    alias(alias:string, currentId?:string):void;
+    /**
+     * Create an alias, which Mixpanel will use to link two distinct_ids going forward (not retroactively).
+     * Multiple aliases can map to the same original ID, but not vice-versa. Aliases can also be chained - the
+     * following is a valid scenario:
+     *
+     *     mixpanel.alias('new_id', 'existing_id');
+     *     ...
+     *     mixpanel.alias('newer_id', 'new_id');
+     *
+     * If the original ID is not passed in, we will use the current distinct_id - probably the auto-generated GUID.
+     *
+     * ### Notes:
+     *
+     * The best practice is to call `alias()` when a unique ID is first created for a user
+     * (e.g., when a user first registers for an account and provides an email address).
+     * `alias()` should never be called more than once for a given user, except to
+     * chain a newer ID to a previously new ID, as described above.
+     *
+     * @param alias A unique identifier that you want to use for this user in the future.
+     * @param currentId The current identifier being used for this user.
+     */
+    alias(alias: string, currentId?: string): void;
 
-    set_config(config:{[index:string]:any}):void;
+    /**
+     * Update the configuration of a mixpanel library instance.
+     *
+     * @param config A dictionary of new configuration values to update
+     */
+    set_config(config: Mixpanel.Config): void;
 
-    get_config():{[index:string]:any};
+    /**
+     * Returns the current config object for the library.
+     */
+    get_config(): Mixpanel.Config;
 
-    get_property(propertyName:string):any;
+    /**
+     * Returns the value of the super property named property_name. If no such
+     * property is set, `get_property()` will return the undefined value.
+     *
+     * ### Notes:
+     *
+     * `get_property()` can only be called after the Mixpanel library has finished loading.
+     * `init()` has a loaded function available to handle this automatically. For example:
+     *
+     *     // grab value for 'user_id' after the mixpanel library has loaded
+     *     mixpanel.init('YOUR PROJECT TOKEN', {
+     *         loaded: function(mixpanel) {
+     *             user_id = mixpanel.get_property('user_id');
+     *         }
+     *     });
+     *
+     * @param propertyName The name of the super property you want to retrieve
+     */
+    get_property(propertyName: string): any;
 }
 
-declare namespace Mixpanel
-{
-    interface People
-    {
-        set(keys:{[index:string]:any}, callback?:() => void):void;
+declare namespace Mixpanel {
+    interface People {
+        /**
+         * Set properties on a user record.
+         *
+         * ### Usage:
+         *
+         *     mixpanel.people.set('gender', 'm');
+         *
+         *     // or set multiple properties at once
+         *     mixpanel.people.set({
+         *         'Company': 'Acme',
+         *         'Plan': 'Premium',
+         *         'Upgrade date': new Date()
+         *     });
+         *     // properties can be strings, integers, dates, or lists
+         *
+         * @param prop If a string, this is the name of the property. If an object, this is an associative array of names and values.
+         * @param value A value to set on the given property name
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        set(prop: string, value: any, callback?: () => void): void;
+        set(keys: { [index: string]: any }, callback?: () => void): void;
 
-        set(key:string, value:any, callback?:() => void):void;
+        /**
+         * Set properties on a user record, only if they do not yet exist.
+         * This will not overwrite previous people property values, unlike
+         * `people.set()`.
+         *
+         * ### Usage:
+         *
+         *     mixpanel.people.set_once('First Login Date', new Date());
+         *
+         *     // or set multiple properties at once
+         *     mixpanel.people.set_once({
+         *         'First Login Date': new Date(),
+         *         'Starting Plan': 'Premium'
+         *     });
+         *
+         *     // properties can be strings, integers or dates
+         *
+         * @param prop If a string, this is the name of the property. If an object, this is an associative array of names and values.
+         * @param value A value to set on the given property name
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        set_once(prop: string, value: any, callback?: () => void): void;
+        set_once(keys: { [index: string]: any }, callback?: () => void): void;
 
-        set_once(keys:{[index:string]:any}, callback?:() => void):void;
+        /**
+         * Unset properties on a user record (permanently removes the properties and their values from a profile).
+         *
+         * ### Usage:
+         *
+         *     mixpanel.people.unset('gender');
+         *
+         *     // or unset multiple properties at once
+         *     mixpanel.people.unset(['gender', 'Company']);
+         *
+         * @param prop If a string, this is the name of the property. If an array, this is a list of property names.
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        unset(prop: string | string[], callback?: () => void): void;
 
-        set_once(key:string, value:any, callback?:() => void):void;
+        /**
+         * Increment/decrement numeric people analytics properties.
+         *
+         * ### Usage:
+         *
+         *     mixpanel.people.increment('page_views', 1);
+         *
+         *     // or, for convenience, if you're just incrementing a counter by
+         *     // 1, you can simply do
+         *     mixpanel.people.increment('page_views');
+         *
+         *     // to decrement a counter, pass a negative number
+         *     mixpanel.people.increment('credits_left', -1);
+         *
+         *     // like mixpanel.people.set(), you can increment multiple
+         *     // properties at once:
+         *     mixpanel.people.increment({
+         *         counter1: 1,
+         *         counter2: 6
+         *     });
+         *
+         * @param prop If a string, this is the name of the property. If an object, this is an associative array of names and numeric values.
+         * @param value An amount to increment the given property
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        increment(prop: string, value?: number, callback?: () => void): void;
+        increment(keys: { [index: string]: number}, callback?: () => void): void;
 
-        union(prop: string, values:any, callback?:() => void):void;
+        /**
+         * Merge a given list with a list-valued people analytics property,
+         * excluding duplicate values.
+         *
+         * ### Usage:
+         *
+         *     // merge a value to a list, creating it if needed
+         *     mixpanel.people.union('pages_visited', 'homepage');
+         *
+         *     // like mixpanel.people.set(), you can append multiple
+         *     // properties at once:
+         *     mixpanel.people.union({
+         *         list1: 'bob',
+         *         list2: 123
+         *     });
+         *
+         *     // like mixpanel.people.append(), you can append multiple
+         *     // values to the same list:
+         *     mixpanel.people.union({
+         *         list1: ['bob', 'billy']
+         *     });
+         *
+         * @param prop If a string, this is the name of the property. If an object, this is an associative array of names and values.
+         * @param value Value / values to merge with the given property
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        union(prop: string, values: any, callback?: () => void): void;
+        union(keys: { [index: string]: any }, callback?: () => void): void;
 
-        union(keys:{[index:string]:any}, callback?:() => void):void;
+        /**
+         * Append a value to a list-valued people analytics property.
+         *
+         * ### Usage:
+         *
+         *     // append a value to a list, creating it if needed
+         *     mixpanel.people.append('pages_visited', 'homepage');
+         *
+         *     // like mixpanel.people.set(), you can append multiple
+         *     // properties at once:
+         *     mixpanel.people.append({
+         *         list1: 'bob',
+         *         list2: 123
+         *     });
+         *
+         * @param prop If a string, this is the name of the property. If an object, this is an associative array of names and values.
+         * @param value An item to append to the list
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        append(prop: string, value: any, callback?: () => void): void;
+        append(keys: { [index: string]: any }, callback?: () => void): void;
 
-        increment(key:string):void;
+        /**
+         * Record that you have charged the current user a certain amount
+         * of money. Charges recorded with `track_charge()` will appear in the
+         * Mixpanel revenue report.
+         *
+         * ### Usage:
+         *
+         *     // charge a user $50
+         *     mixpanel.people.track_charge(50);
+         *
+         *     // charge a user $30.50 on the 2nd of january
+         *     mixpanel.people.track_charge(30.50, {
+         *         '$time': new Date('jan 1 2012')
+         *     });
+         *
+         * @param amount The amount of money charged to the current user
+         * @param properties An associative array of properties associated with the charge
+         * @param callback If provided, the callback will be called when the server responds
+         */
+        track_charge(amount: number, properties?: { [index: string]: any }, callback?: () => void): void;
 
-        increment(keys:{[index:string]:number}):void;
+        /**
+         * Permanently clear all revenue report transactions from the
+         * current user's people analytics profile.
+         *
+         * ### Usage:
+         *
+         *     mixpanel.people.clear_charges();
+         *
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        clear_charges(callback?: () => void): void;
 
-        increment(key:string, value:number):void;
-
-        append(keys:{[index:string]:any}):void;
-
-        append(key:string, value:any):void;
-
-        track_charge(amount:number, params?:{[index:string]:any}, callback?:() => void):void;
-
-        clear_charges():void;
-
-        delete_user():void;
+        /**
+         * Permanently deletes the current people analytics profile from
+         * Mixpanel (using the current `distinct_id`).
+         *
+         * ### Usage:
+         *
+         *     // remove the all data you have stored about the current user
+         *     mixpanel.people.delete_user();
+         *
+         */
+        delete_user(): void;
     }
 
-    interface Config
-    {
+    interface Config {
+        /**
+         * @default HTTP_PROTOCOL + 'api.mixpanel.com'
+         */
         api_host?: string;
-
+        /**
+         * @default HTTP_PROTOCOL + 'mixpanel.com'
+         */
         app_host?: string;
-
-        cdn?: string;
-
-        persistence?: string;
-
-        persistence_name?: string;
-
-        cookie_name?: string;
-
+        /**
+         * @default true
+         */
         autotrack?: boolean;
-
+        /**
+         * @default HTTP_PROTOCOL + 'cdn.mxpnl.com'
+         */
+        cdn?: string;
+        /**
+         * Super properties span subdomains
+         *
+         * @default true
+         */
         cross_subdomain_cookie?: boolean;
-
+        /**
+         * Type of persistent store for super properties
+         *
+         * If set to 'localStorage', any existing mixpanel cookie
+         * value with the same `persistence_name` will be transferred
+         * to localStorage and deleted.
+         *
+         * @default 'cookie'
+         */
+        persistence?: 'localStorage' | 'cookie';
+        /**
+         * Name for super properties persistent store
+         *
+         * @default ''
+         */
+        persistence_name?: string;
+        /**
+         * @deprecated Use `persistence_name` instead
+         * @default ''
+         */
+        cookie_name?: string;
+        /**
+         * @default function() {}
+         */
+        loaded?: (lib: Mixpanel) => void;
+        /**
+         * @default true
+         */
         store_google?: boolean;
-
+        /**
+         * @default true
+         */
         save_referrer?: boolean;
-
+        /**
+         * @default false
+         */
         test?: boolean;
-
+        /**
+         * @default false
+         */
         verbose?: boolean;
-
+        /**
+         * @default false
+         */
         img?: boolean;
-
+        /**
+         * Should we track a page view on page load
+         *
+         * @default true
+         */
         track_pageview?: boolean;
-
+        /**
+         * Debug mode
+         *
+         * @default false
+         */
         debug?: boolean;
-
-        upgrade?: boolean;
-
-        disable_persistence?: boolean;
-
-        disable_cookie?: boolean;
-
-        secure_cookie?: boolean;
-
-        ip?: boolean;
-
-        loaded?: (lib:Mixpanel) => void;
-
+        /**
+         * The amount of time track_links will wait for Mixpanel's
+         * servers to respond
+         *
+         * @default 300
+         */
         track_links_timeout?: number;
-
+        /**
+         * Super properties cookie expiration (in days)
+         *
+         * @default 365
+         */
         cookie_expiration?: number;
-
+        /**
+         * If you set upgrade to be true, the library will check for
+         * a cookie from our old js library and import super
+         * properties from it, then the old cookie is deleted
+         * The upgrade config option only works in the initialization,
+         * so make sure you set it when you create the library.
+         *
+         * @default false
+         */
+        upgrade?: boolean;
+        /**
+         * If this is true, the mixpanel cookie or localStorage entry
+         * will be deleted, and no user persistence will take place
+         *
+         * @default false
+         */
+        disable_persistence?: boolean;
+        /**
+         * @deprecated Use `disable_persistence` instead
+         * @default false
+         */
+        disable_cookie?: boolean;
+        /**
+         * If this is true, mixpanel cookies will be marked as secure,
+         * meaning they will only be transmitted over https
+         *
+         * @default false
+         */
+        secure_cookie?: boolean;
+        /**
+         * If this is true, Mixpanel will automatically determine City,
+         * Region and Country data using the IP address of the client
+         *
+         * @default true
+         */
+        ip?: boolean;
+        /**
+         * Names of (super) properties which should never be sent
+         * with track() calls
+         *
+         * @default []
+         */
         property_blacklist?: string[];
-
-        [other:string]:any
     }
 }
 
-declare var mixpanel:Mixpanel;
+declare var mixpanel: Mixpanel;
diff --git a/types/mixpanel/mixpanel-tests.ts b/types/mixpanel/mixpanel-tests.ts
index bb5f0794cb..a48cd4065a 100644
--- a/types/mixpanel/mixpanel-tests.ts
+++ b/types/mixpanel/mixpanel-tests.ts
@@ -1,35 +1,67 @@
-
-function mixpanel_base()
-{
-    mixpanel.init("new token");
-    mixpanel.init("new token", { your: "config" });
-    mixpanel.init("new token", { your: "config" }, "library_name");
+function mixpanel_base() {
+    mixpanel.init('new token');
+    mixpanel.init('new token', { persistence_name: 'config' });
+    mixpanel.init('new token', { persistence_name: 'config' }, 'library_name');
 
     mixpanel.push(['register', { a: 'b' }]);
 
+    mixpanel.disable();
     mixpanel.disable(['my_event']);
 
+    mixpanel.track('Registered');
+    mixpanel.track('Registered', {Gender: 'Male', Age: 21});
+    mixpanel.track('Registered', {Gender: 'Male', Age: 21}, () => {});
+
+    mixpanel.track_links('#nav', 'Clicked Nav Link');
+    mixpanel.track_links('#nav', 'Clicked Nav Link', { prop: 'A' });
+
+    mixpanel.track_forms('#register', 'Created Account', { prop: 'A' });
+
     mixpanel.time_event('Registered');
 
-    mixpanel.track("Registered", {"Gender": "Male", "Age": 21});
-
-    mixpanel.track_links("#nav", "Clicked Nav Link");
-
-    mixpanel.track_forms("#register", "Created Account");
-
     mixpanel.register({device: 'android', version: '4.0.1'});
+    mixpanel.register({device: 'android', version: '4.0.1'}, 5);
 
     mixpanel.register_once({device: 'android', version: '4.0.1'});
+    mixpanel.register_once({device: 'android', version: '4.0.1'}, 'default', 4);
 
     mixpanel.unregister('device');
 
+    mixpanel.identify();
     mixpanel.identify('234234sdfdsf');
 
     mixpanel.get_distinct_id();
 
+    mixpanel.alias('w3erwfsdf');
     mixpanel.alias('w3erwfsdf', '234234sdfdsf');
 
-    mixpanel.set_config({test: true});
+    mixpanel.set_config({ test: true });
+    mixpanel.set_config({
+        api_host: '',
+        app_host: '',
+        autotrack: true,
+        cdn: '',
+        cross_subdomain_cookie: true,
+        persistence: 'cookie',
+        persistence_name: '',
+        cookie_name: '',
+        loaded: (lib) => {},
+        store_google: true,
+        save_referrer: true,
+        test: false,
+        verbose: false,
+        img: false,
+        track_pageview: true,
+        debug: false,
+        track_links_timeout: 300,
+        cookie_expiration: 365,
+        upgrade: false,
+        disable_persistence: false,
+        disable_cookie: false,
+        secure_cookie: false,
+        ip: true,
+        property_blacklist: ['token']
+    });
 
     mixpanel.get_config();
 
@@ -38,45 +70,77 @@ function mixpanel_base()
     mixpanel.reset();
 }
 
-function mixpanel_people()
-{
+function mixpanel_people() {
     mixpanel.people.set('gender', 'm');
+    mixpanel.people.set('gender', 'm', () => {});
     mixpanel.people.set({
-        'Company': 'Acme',
-        'Plan': 'Premium',
+        Company: 'Acme',
+        Plan: 'Premium',
         'Upgrade date': new Date()
     });
+    mixpanel.people.set({
+        Company: 'Acme',
+        Plan: 'Premium',
+        'Upgrade date': new Date()
+    }, () => {});
 
     mixpanel.people.set_once('First Login Date', new Date());
+    mixpanel.people.set_once('First Login Date', new Date(), () => {});
     mixpanel.people.set_once({
         'First Login Date': new Date(),
         'Starting Plan': 'Premium'
     });
+    mixpanel.people.set_once({
+        'First Login Date': new Date(),
+        'Starting Plan': 'Premium'
+    }, () => {});
+
+    mixpanel.people.unset('Company');
+    mixpanel.people.unset('Company', () => {});
+    mixpanel.people.unset(['Company', 'Plan']);
+    mixpanel.people.unset(['Company', 'Plan'], () => {});
 
-    mixpanel.people.increment('page_views', 1);
     mixpanel.people.increment('page_views');
+    mixpanel.people.increment('page_views', 1);
     mixpanel.people.increment('credits_left', -1);
+    mixpanel.people.increment('page_views', 1, () => {});
     mixpanel.people.increment({
         counter1: 1,
         counter2: 1
     });
+    mixpanel.people.increment({
+        counter1: 1,
+        counter2: 1
+    }, () => {});
 
+    mixpanel.people.union('pages_visited', 'homepage', () => {});
     mixpanel.people.union('pages_visited', 'homepage');
     mixpanel.people.union({
         list1: 'bob',
         list2: 123
     });
+    mixpanel.people.union({
+        list1: 'bob',
+        list2: 123
+    }, () => {});
 
     mixpanel.people.append('pages_visited', 'homepage');
+    mixpanel.people.append('pages_visited', 'homepage', () => {});
     mixpanel.people.append({
         list1: 'bob',
         list2: 123
     });
+    mixpanel.people.append({
+        list1: 'bob',
+        list2: 123
+    }, () => {});
 
     mixpanel.people.track_charge(50);
-    mixpanel.people.track_charge(30.50, {'$time': new Date('jan 1 2012')});
+    mixpanel.people.track_charge(30.50, {$time: new Date('jan 1 2012')});
+    mixpanel.people.track_charge(30.50, {$time: new Date('jan 1 2012')}, () => {});
 
     mixpanel.people.clear_charges();
+    mixpanel.people.clear_charges(() => {});
 
     mixpanel.people.delete_user();
 }
diff --git a/types/mixpanel/tslint.json b/types/mixpanel/tslint.json
new file mode 100644
index 0000000000..10d875b8db
--- /dev/null
+++ b/types/mixpanel/tslint.json
@@ -0,0 +1,4 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {}
+}
diff --git a/types/mixto/tslint.json b/types/mixto/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mixto/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mkdirp/index.d.ts b/types/mkdirp/index.d.ts
index db9f66c8ca..f1edeeda8b 100644
--- a/types/mkdirp/index.d.ts
+++ b/types/mkdirp/index.d.ts
@@ -1,14 +1,40 @@
-// Type definitions for mkdirp 0.5.1
+// Type definitions for mkdirp 0.5
 // Project: https://github.com/substack/node-mkdirp
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+//                 mrmlnc <https://github.com/mrmlnc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-declare function mkdirp(dir: string, cb: (err: NodeJS.ErrnoException, made: string) => void): void;
-declare function mkdirp(dir: string, opts: any, cb: (err: NodeJS.ErrnoException, made: string) => void): void;
+import fs = require('fs');
+
+declare function mkdirp(dir: string, cb: (err: NodeJS.ErrnoException, made: mkdirp.Made) => void): void;
+declare function mkdirp(dir: string, opts: mkdirp.Mode | mkdirp.Options, cb: (err: NodeJS.ErrnoException, made: mkdirp.Made) => void): void;
 
 declare namespace mkdirp {
-    function sync(dir: string, opts?: any): string;
+    type Made = string | null;
+    type Mode = number | string | null;
+
+    interface FsImplementation {
+        mkdir: typeof fs.mkdir;
+        stat: typeof fs.stat;
+    }
+
+    interface FsImplementationSync {
+        mkdirSync: typeof fs.mkdirSync;
+        statSync: typeof fs.statSync;
+    }
+
+    interface Options {
+        mode?: Mode;
+        fs?: FsImplementation;
+    }
+
+    interface OptionsSync {
+        mode?: Mode;
+        fs?: FsImplementationSync;
+    }
+
+    function sync(dir: string, opts?: Mode | OptionsSync): Made;
 }
 export = mkdirp;
diff --git a/types/mkdirp/mkdirp-tests.ts b/types/mkdirp/mkdirp-tests.ts
index d17dff4e22..3c09001925 100644
--- a/types/mkdirp/mkdirp-tests.ts
+++ b/types/mkdirp/mkdirp-tests.ts
@@ -1,23 +1,17 @@
-
 import mkdirp = require('mkdirp');
 
-var str: string;
-var num: number;
-var opts = {
-    mode: num,
-    fs: {}
-};
+mkdirp('str', (err, made) => {
+    const str: string = made;
+});
+mkdirp('str', '0777', (err, made) => {});
+mkdirp('str', {}, (err, made) => {});
+mkdirp('str', { mode: '0777' }, (err, made) => {});
 
-mkdirp(str, num, (err, made) => {
-	str = made;
-});
-mkdirp(str, opts, (err, made) => {
-	str = made;
-});
-mkdirp(str, (err, made) => {
-	str = made;
-});
+// $ExpectType string
+mkdirp.sync('str');
+mkdirp.sync('str', '0777');
+mkdirp.sync('str', {});
+mkdirp.sync('str', { mode: '0777' });
 
-str = mkdirp.sync(str, num);
-str = mkdirp.sync(str, opts);
-str = mkdirp.sync(str);
+// $ExpectError
+mkdirp.sync('str', { mode: '0777', fs: {} });
diff --git a/types/mkdirp/tslint.json b/types/mkdirp/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/mkdirp/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/mkpath/tslint.json b/types/mkpath/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mkpath/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mmmagic/tslint.json b/types/mmmagic/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mmmagic/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mobile-detect/index.d.ts b/types/mobile-detect/index.d.ts
deleted file mode 100644
index 61bde9d853..0000000000
--- a/types/mobile-detect/index.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for mobile-detect v1.2.0
-// Project: http://hgoebl.github.io/mobile-detect.js/
-// Definitions by: Martin McWhorter <https://github.com/martinmcwhorter>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class MobileDetect {
-	
-	constructor(userAgent: string, maxPhoneWidth?: number);
-	
-	is(key: string): boolean;
-	match(pattern: string|RegExp): boolean;
-	mobile(): string;
-	mobileGrade(): string;
-	os(): string;
-	phone(): string;
-	tablet(): string;
-	userAgent(): string;
-	version(value: string): number;
-	versionStr(value: string): string;
-}
-	
-export = MobileDetect;
-export as namespace MobileDetect;
\ No newline at end of file
diff --git a/types/mobile-detect/mobile-detect-tests.ts b/types/mobile-detect/mobile-detect-tests.ts
deleted file mode 100644
index 7a3e814612..0000000000
--- a/types/mobile-detect/mobile-detect-tests.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-var md: MobileDetect = new MobileDetect(window.navigator.userAgent);
-
-var mobie: string = md.mobile()
-var phone: string = md.phone()
-var tablet: string = md.tablet()
-var userAgent: string = md.userAgent()
-var os: string = md.os()
-var isPhone: boolean = md.is('iPhone')
-var bot: boolean = md.is('bot')
-var version: number = md.version('Webkit')
-var versionStr: string = md.versionStr('Build')
-var match: boolean = md.match('playstation|xbox')
\ No newline at end of file
diff --git a/types/mobile-detect/tsconfig.json b/types/mobile-detect/tsconfig.json
deleted file mode 100644
index d728b72f0e..0000000000
--- a/types/mobile-detect/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "mobile-detect-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/mobx-apollo/index.d.ts b/types/mobx-apollo/index.d.ts
new file mode 100644
index 0000000000..54818cd846
--- /dev/null
+++ b/types/mobx-apollo/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for mobx-apollo 0.0
+// Project: https://github.com/sonaye/mobx-apollo#readme
+// Definitions by: Paul Selden <https://github.com/pselden>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import {
+    ApolloClient,
+    ObservableQuery,
+    WatchQueryOptions,
+    ApolloError
+} from 'apollo-client';
+
+export interface MobxApolloQueryOptions<T> extends WatchQueryOptions {
+    client: ApolloClient<any>;
+    onFetch?: (result: T) => void;
+    onError?: (error: ApolloError) => void;
+}
+
+export interface MobxApolloQuery<T> {
+    loading: boolean;
+    data?: T;
+    error?: ApolloError;
+    ref: ObservableQuery<T>;
+}
+
+export default function graphql<T>(
+    options: MobxApolloQueryOptions<T>
+): MobxApolloQuery<T>;
diff --git a/types/mobx-apollo/mobx-apollo-tests.ts b/types/mobx-apollo/mobx-apollo-tests.ts
new file mode 100644
index 0000000000..50d6b03abb
--- /dev/null
+++ b/types/mobx-apollo/mobx-apollo-tests.ts
@@ -0,0 +1,34 @@
+import { ApolloClient } from 'apollo-client';
+import query from 'mobx-apollo';
+
+const PostsQuery = `
+    {
+        posts {
+            id
+            title
+        }
+    }
+` as any;
+
+interface Post {
+    id: string;
+    title: string;
+}
+
+class PostStore {
+    private get postsQuery() {
+        return query<{ posts: Post[] }>({
+            client: new ApolloClient({
+                link: {} as any,
+                cache: {} as any
+            }),
+            query: PostsQuery
+        });
+    }
+
+    get posts() {
+        return this.postsQuery.data && this.postsQuery.data.posts;
+    }
+}
+
+new PostStore();
diff --git a/types/mobx-apollo/package.json b/types/mobx-apollo/package.json
new file mode 100644
index 0000000000..da0ffc3953
--- /dev/null
+++ b/types/mobx-apollo/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "apollo-client": "^2.0.0"
+    }
+}
diff --git a/types/mobx-apollo/tsconfig.json b/types/mobx-apollo/tsconfig.json
new file mode 100644
index 0000000000..c4c2acace4
--- /dev/null
+++ b/types/mobx-apollo/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "target": "es5",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "mobx-apollo-tests.ts"]
+}
diff --git a/types/mobx-apollo/tslint.json b/types/mobx-apollo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mobx-apollo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mocha-phantomjs/tslint.json b/types/mocha-phantomjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mocha-phantomjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 07f59e6628..df0a1c66dd 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -27,6 +27,9 @@ interface MochaSetupOptions {
 
     // grep string or regexp to filter tests with
     grep?: any;
+
+    // require modules before running tests
+    require?: string[];
 }
 
 declare var mocha: Mocha;
@@ -116,21 +119,21 @@ declare class Mocha {
 // merge the Mocha class declaration with a module
 declare namespace Mocha {
     interface ISuiteCallbackContext {
-        timeout(ms: number): this;
+        timeout(ms: number | string): this;
         retries(n: number): this;
         slow(ms: number): this;
     }
 
     interface IHookCallbackContext {
         skip(): this;
-        timeout(ms: number): this;
+        timeout(ms: number | string): this;
         [index: string]: any;
     }
 
 
     interface ITestCallbackContext {
         skip(): this;
-        timeout(ms: number): this;
+        timeout(ms: number | string): this;
         retries(n: number): this;
         slow(ms: number): this;
         [index: string]: any;
@@ -143,7 +146,7 @@ declare namespace Mocha {
         async: boolean;
         sync: boolean;
         timedOut: boolean;
-        timeout(n: number): this;
+        timeout(n: number | string): this;
     }
 
     /** Partial interface for Mocha's `Suite` class. */
@@ -175,14 +178,14 @@ declare namespace Mocha {
         (description: string, callback: (this: ISuiteCallbackContext) => void): ISuite;
         only(description: string, callback: (this: ISuiteCallbackContext) => void): ISuite;
         skip(description: string, callback: (this: ISuiteCallbackContext) => void): void;
-        timeout(ms: number): void;
+        timeout(ms: number | string): void;
     }
 
     interface ITestDefinition {
         (expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): ITest;
         only(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): ITest;
         skip(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): void;
-        timeout(ms: number): void;
+        timeout(ms: number | string): void;
         state: "failed" | "passed";
     }
 
diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts
index 55ba6fa961..2549c3cb68 100644
--- a/types/mocha/mocha-tests.ts
+++ b/types/mocha/mocha-tests.ts
@@ -39,7 +39,7 @@ function test_suite() {
 
 function test_it() {
 
-    it('does something', () => { });
+    it('does something', () => { }).timeout('2s');
 
     it('does something', function () { this['sharedState'] = true; });
 
@@ -339,6 +339,10 @@ function test_setup_reporter_string_option() {
     mocha.setup({ reporter: 'html' });
 }
 
+function test_setup_require_stringArray_option() {
+    mocha.setup({ require: ['ts-node/register'] });
+}
+
 function test_setup_reporter_function_option() {
     mocha.setup({ reporter: class { } });
 }
@@ -372,7 +376,8 @@ function test_setup_all_options() {
         reporter: 'html',
         bail: true,
         ignoreLeaks: true,
-        grep: 'test'
+        grep: 'test',
+        require: ['ts-node/register']
     });
 }
 
@@ -395,15 +400,15 @@ function test_chaining() {
 import MochaDef = require('mocha');
 
 function test_require_constructor_empty() {
-    var instance = new MochaDef();
+    const instance = new MochaDef();
 }
 
 function test_require_constructor_noOptions() {
-    var instance = new MochaDef({});
+    const instance = new MochaDef({});
 }
 
 function test_require_constructor_allOptions() {
-    var instance = new MochaDef({
+    const instance = new MochaDef({
         grep: /[a-z]*/,
         ui: 'tdd',
         reporter: 'dot',
@@ -414,7 +419,7 @@ function test_require_constructor_allOptions() {
 
 
 function test_require_fluentParams() {
-    var instance = new MochaDef();
+    const instance = new MochaDef();
 
     instance.bail(true)
         .bail()
@@ -440,7 +445,7 @@ function test_require_fluentParams() {
 }
 
 function test_run_withOnComplete() {
-    var instance = new MochaDef();
+    const instance = new MochaDef();
 
     instance.run((failures: number): void => {
         console.log(failures);
diff --git a/types/mocha/tslint.json b/types/mocha/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mocha/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mochaccino/index.d.ts b/types/mochaccino/index.d.ts
new file mode 100644
index 0000000000..b230218ee9
--- /dev/null
+++ b/types/mochaccino/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for mochaccino 1.2
+// Project: https://github.com/pawelgalazka/mochaccino#readme
+// Definitions by: Thomas-P <https://github.com/thomas-p>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+import * as Sinon from "sinon";
+export interface Expect {
+    not: Expect;
+    toBe(arg: any): void;
+    toContain(arg: any): void;
+    toEqual(arg: any): void;
+    toHaveBeenCalled(): void;
+    toHaveBeenCalledWith(...arg: any[]): void;
+    toHaveBeenCalledTimes(callCount: number): void;
+    toBeDefined(): void;
+    toBeUndefined(): void;
+    toBeNull(): void;
+    toBeTruthy(): void;
+    toBeFalsy(): void;
+    toBeLessThan(other: number): void;
+    toBeGreaterThan(other: number): void;
+    toThrow(): void;
+    toThrowError(errType: any): void;
+    toMatch(matchExpression: any): void;
+}
+export interface SpyProxy {
+    and: SpyProxy;
+    spyProxy: true;
+    getSubject: () => Sinon.SinonStub;
+    callThrough: () => void;
+    returnValue: (obj: any) => void;
+    callFake: (fake: (...args: any[]) => any) => void;
+}
+export interface Dom {
+    exposedProperties: ['window', 'navigator', 'document'];
+    create: () => void;
+    destroy: () => void;
+    clear: () => void;
+}
+export function expect(value: any): Expect;
+export function spy(...config: any[]): (...args: any[]) => SpyProxy;
+export const dom: Dom;
diff --git a/types/mochaccino/mochaccino-tests.ts b/types/mochaccino/mochaccino-tests.ts
new file mode 100644
index 0000000000..c63634e64c
--- /dev/null
+++ b/types/mochaccino/mochaccino-tests.ts
@@ -0,0 +1,66 @@
+import { dom, expect, spy } from 'mochaccino';
+/**
+ * spy test
+ *
+ */
+const obj = {
+    funcName: (): any => {
+    }
+};
+let s = spy();
+s(1, 2);
+expect(s).toHaveBeenCalledWith(1, 2);
+spy(obj, 'funcName');
+obj.funcName();
+expect(obj.funcName).toHaveBeenCalled();
+/***********************/
+s = spy();
+s();
+expect(s).toHaveBeenCalled();
+/***********************/
+s(obj, 'funcName').and.callFake(() => {
+    return 123;
+});
+expect(obj.funcName()).toEqual(123);
+spy(obj, 'funcName');
+
+expect(obj.funcName).toHaveBeenCalled();
+/***********************/
+s(obj, 'funcName').and.callThrough();
+/***********************/
+s(obj, 'funcName').and.returnValue(5);
+/***********************/
+/**
+ * dom test
+ */
+dom.create();
+dom.destroy();
+dom.clear();
+/**
+ * expect test
+ *
+ */
+const a = 1;
+const b = true;
+const c = 2;
+const f = () => {
+};
+const ErrorType = new Error();
+const regexp = /123/;
+expect(true).toBeTruthy();
+expect(a).toBe(b);
+expect(a).toEqual(b);
+expect(a).toBeTruthy();
+expect(a).toBeFalsy();
+expect(a).toBeDefined();
+expect(a).toBeUndefined();
+expect(a).toBeNull();
+expect(a).toBeLessThan(c);
+expect(a).toBeGreaterThan(c);
+expect([1, 2]).toContain(1);
+expect(f).toThrow();
+expect(f).toThrowError(ErrorType);
+expect(s).toMatch(regexp);
+expect(s).toHaveBeenCalled();
+expect(s).toHaveBeenCalledWith(1, '23');
+expect(s).toHaveBeenCalledTimes(55);
diff --git a/types/mochaccino/tsconfig.json b/types/mochaccino/tsconfig.json
new file mode 100644
index 0000000000..166b3f4203
--- /dev/null
+++ b/types/mochaccino/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mochaccino-tests.ts"
+    ]
+}
diff --git a/types/mochaccino/tslint.json b/types/mochaccino/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mochaccino/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mock-aws-s3/index.d.ts b/types/mock-aws-s3/index.d.ts
new file mode 100644
index 0000000000..754629f5a2
--- /dev/null
+++ b/types/mock-aws-s3/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for mock-aws-s3 2.6
+// Project: https://github.com/MathieuLoutre/mock-aws-s3
+// Definitions by: Elliot Blackburn <https://github.com/bluehatbrit>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/mock-aws-s3
+// TypeScript Version: 2.2
+
+// This is a mocking library, types should reflect that of the actual library.
+export * from "aws-sdk";
+import { GlobalConfigInstance } from "aws-sdk/lib/config";
+
+export interface MockConfigInstance extends GlobalConfigInstance {
+    basePath: string;
+}
+
+export let config: MockConfigInstance;
diff --git a/types/mock-aws-s3/mock-aws-s3-tests.ts b/types/mock-aws-s3/mock-aws-s3-tests.ts
new file mode 100644
index 0000000000..b517729968
--- /dev/null
+++ b/types/mock-aws-s3/mock-aws-s3-tests.ts
@@ -0,0 +1,16 @@
+import * as MockAWS from "mock-aws-s3";
+
+const s3 = new MockAWS.S3({
+    params: { Bucket: "example" }
+});
+
+s3.putObject(
+    {
+        Bucket: "example",
+        Key: "sea/animal.json",
+        Body: '{"is dog":false,"name":"otter","stringified object?":true}'
+    },
+    (err: MockAWS.AWSError, data: MockAWS.S3.Types.PutObjectOutput) => {
+        s3.listObjects({ Bucket: 'example', Prefix: "sea" }, (err: any, data: any) => {});
+    }
+);
diff --git a/types/mock-aws-s3/package.json b/types/mock-aws-s3/package.json
new file mode 100644
index 0000000000..6298c6d4c8
--- /dev/null
+++ b/types/mock-aws-s3/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "aws-sdk": ">=2.169.0"
+    }
+}
diff --git a/types/mock-aws-s3/tsconfig.json b/types/mock-aws-s3/tsconfig.json
new file mode 100644
index 0000000000..9b5aeeacaa
--- /dev/null
+++ b/types/mock-aws-s3/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "mock-aws-s3-tests.ts"]
+}
diff --git a/types/mock-aws-s3/tslint.json b/types/mock-aws-s3/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/mock-aws-s3/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/mock-fs/tslint.json b/types/mock-fs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mock-fs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mock-knex/index.d.ts b/types/mock-knex/index.d.ts
new file mode 100644
index 0000000000..a21ab2eb0a
--- /dev/null
+++ b/types/mock-knex/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for mock-knex 0.3
+// Project: https://github.com/colonyamerican/mock-knex
+// Definitions by: Jesse Zhang <https://github.com/jessezhang91>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import * as Knex from "knex";
+import { EventEmitter } from "events";
+
+/**
+ * Attaches mocked client to knex instance
+ *
+ * @param knex initialized knex client
+ */
+export function mock(knex: Knex): void;
+
+/**
+ * Detaches mocked client from knex instance
+ *
+ * @param knex initialized knex client
+ */
+export function unmock(knex: Knex): void;
+
+/**
+ * Returns query Tracker instance
+ */
+export function getTracker(): Tracker;
+
+/**
+ * The tracker enables you to catch and respond to queries that occur during testing, see Test for more examples.
+ */
+export interface Tracker extends EventEmitter {
+    /**
+     * Enables query tracking mock on mocked knex client
+     */
+    install(): void;
+
+    /**
+     * Disables query tracking mock on mocked knex client. Also resets 'step' counter.
+     */
+    uninstall(): void;
+
+    /**
+     * Add event listener for 'query' event. It gets esecuted for each query that should end up in database.
+     * Instead of this callback gets executed and its up to you to assert queries and mock database responses.
+     *
+     * @param callback A function that gets executed on 'query' event.
+     */
+    on(event: 'query', callback: (query: QueryDetails, step: number) => void): this;
+}
+
+/**
+ * The object containing query details that is being sent to knex database dialect on query execution.
+ * Object properties signature matches with knex toSQL() output with additional method returns(values).
+ */
+export interface QueryDetails extends Knex.Sql {
+    /**
+     * Function that needs to be called to mock database query result for knex.
+     *
+     * @param error The Error, string or instance of Error, which represents why the result was rejected
+     */
+    reject(error: Error | string): void;
+
+    /**
+     * Function that needs to be called to mock database query result for knex.
+     *
+     * @param values An array of mock data to be returned by database. For Bookshelf this is mostly array of objects. Knex could return any type of data.
+     */
+    response(values: any[], options?: QueryDetailsResponseOption): void;
+}
+
+export interface QueryDetailsResponseOption {
+    /**
+     * Is this a stream response, defaults to false
+     */
+    stream: boolean;
+}
diff --git a/types/mock-knex/mock-knex-tests.ts b/types/mock-knex/mock-knex-tests.ts
new file mode 100644
index 0000000000..ec4ef0024e
--- /dev/null
+++ b/types/mock-knex/mock-knex-tests.ts
@@ -0,0 +1,29 @@
+import * as knex from "knex";
+import * as mockDb from "mock-knex";
+
+const db = knex({
+	client: 'sqlite'
+});
+
+mockDb.mock(db);
+
+const tracker = mockDb.getTracker();
+tracker.install();
+tracker.on('query', (query, step) => {
+	if (query.method === "first" || step === 1) {
+		query.response([{
+			a: 1
+		}, {
+			a: 2
+		}, {
+			a: 3
+		}], {
+			stream: false
+		});
+	} else {
+		query.reject(new Error("bad query"));
+	}
+});
+tracker.uninstall();
+
+mockDb.unmock(db);
diff --git a/types/mock-knex/tsconfig.json b/types/mock-knex/tsconfig.json
new file mode 100644
index 0000000000..427ad9f843
--- /dev/null
+++ b/types/mock-knex/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mock-knex-tests.ts"
+    ]
+}
diff --git a/types/mock-knex/tslint.json b/types/mock-knex/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mock-knex/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mock-require/index.d.ts b/types/mock-require/index.d.ts
index da5db1c07c..75076ec739 100644
--- a/types/mock-require/index.d.ts
+++ b/types/mock-require/index.d.ts
@@ -1,31 +1,21 @@
-// Type definitions for mock-require v1.3.0
+// Type definitions for mock-require 2.0
 // Project: https://github.com/boblauer/mock-require
-// Definitions by: Daniel Pereira <https://github.com/djpereira>
+// Definitions by: Giorgio Delgado <https://github.com/gDelgado14>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 /// <reference types="node" />
 
-/** Simple, intuitive mocking of Node.js modules. */
+type StubFunction = (...params: any[]) => any;
+type Stub = object | StubFunction;
+
 interface Mock {
-    /**
-     * @param {string} path The module you that you want to mock.
-     * @param {any} mockExport The function or object you want to be returned from require, instead of the path module's exports, or the module you want to be returned from require, instead of the path module's export.  
-     */
-    (path: string, mockExport: any | Function | string): void;
-
-    /**
-    * @param {string} path The module you that you want to stop mocking.
-    */
+    (path: string, mockExport: string | Stub): void;
     stop(path: string): void;
-
-    /** This function can be used to remove all registered mocks without the need to remove them individually using mock.stop(). */
     stopAll(): void;
-
-    /**
-     * @param {string} path The file whose cache you want to refresh. 
-     */
-    reRequire(path: string): void;
+    reRequire(path: string): any;
 }
 
-declare const myModule: Mock;
-export = myModule;
+declare var mock: Mock;
+
+export = mock;
diff --git a/types/mock-require/mock-require-tests.ts b/types/mock-require/mock-require-tests.ts
index 41052e2afc..2131bc56de 100644
--- a/types/mock-require/mock-require-tests.ts
+++ b/types/mock-require/mock-require-tests.ts
@@ -1,10 +1,12 @@
 import mock = require('mock-require');
 
+const request = () => {
+  console.log('http.request called');
+};
+
 function testMock() {
   mock('http', {
-    request: function () {
-      console.log('http.request called');
-    }
+    request
   });
 
   const http = require('http');
@@ -42,4 +44,4 @@ function testReRequire() {
   let fileToTest = require('./fileToTest');
   mock('fs', {}); // fileToTest is still using the unmocked fs module
   fileToTest = mock.reRequire('./fileToTest'); // fileToTest is now using your mock
-}
\ No newline at end of file
+}
diff --git a/types/mock-require/tsconfig.json b/types/mock-require/tsconfig.json
index 2f5ec713da..1f6be404c6 100644
--- a/types/mock-require/tsconfig.json
+++ b/types/mock-require/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/mock-require/tslint.json b/types/mock-require/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mock-require/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mockery/tslint.json b/types/mockery/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mockery/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/modesl/tslint.json b/types/modesl/tslint.json
index 3db14f85ea..6a82dd0467 100644
--- a/types/modesl/tslint.json
+++ b/types/modesl/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODO
+		"no-unnecessary-class": false
+	}
+}
diff --git a/types/moji/index.d.ts b/types/moji/index.d.ts
new file mode 100644
index 0000000000..ae45f6ac26
--- /dev/null
+++ b/types/moji/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for moji 0.5
+// Project: https://github.com/niwaringo/moji
+// Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare namespace moji {
+  type Mojisyu = "ZE" | "HE" | "ZS" | "HS" | "HG" | "KK" | "ZK" | "HK";
+
+  interface MojisyuRange {
+    start: number;
+    end: number;
+  }
+
+  interface MojisyuRegExp {
+    regexp: RegExp;
+    list: string[];
+  }
+
+  interface Moji {
+    convert(beforeType: Mojisyu, afterType: Mojisyu): Moji;
+    trim(): Moji;
+    filter(type: Mojisyu): Moji;
+    reject(type: Mojisyu): Moji;
+    toString(): string;
+  }
+
+  function addMojisyu(type: string, mojisyu: MojisyuRange | MojisyuRegExp): void;
+}
+
+declare function moji(moji: string): moji.Moji;
+export = moji;
diff --git a/types/moji/moji-tests.ts b/types/moji/moji-tests.ts
new file mode 100644
index 0000000000..05be3e43c1
--- /dev/null
+++ b/types/moji/moji-tests.ts
@@ -0,0 +1,23 @@
+import moji = require('moji');
+
+moji('ＡＢＣＤ�１２３４').convert('ZE', 'HE').toString();
+moji('ABCD01234').convert('HE', 'ZE').toString();
+// tslint:disable-next-line:no-irregular-whitespace
+moji('　').convert('ZS', 'HS').toString();
+moji('�����').convert('HG', 'KK').toString();
+moji('アイウエオ').convert('KK', 'HG').toString();
+moji('アイウエオ').convert('ZK', 'HK').toString();
+moji('ｱｲｳｴｵ').convert('HK', 'ZK').toString();
+moji('ｱｲｳｴｵ').convert('HK', 'ZK').convert('KK', 'HG').toString();
+
+moji(' ｱｲｳｴｵ ').trim().toString();
+
+moji('abc���アイウ123').filter('HG').toString();
+
+moji('abc���アイウ123').reject('HG').toString();
+
+moji.addMojisyu('ZE', { start: 0xff01, end: 0xff5e });
+moji.addMojisyu('HK', {
+  regexp: /([\uff66-\uff9c]\uff9e)|([\uff8a-\uff8e]\uff9f)|([\uff61-\uff9f])/g,
+  list: ["｡", "｢", "｣"]
+});
diff --git a/types/moji/tsconfig.json b/types/moji/tsconfig.json
new file mode 100644
index 0000000000..a6b2e51f26
--- /dev/null
+++ b/types/moji/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "target": "es6",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "moji-tests.ts"
+    ]
+}
diff --git a/types/moji/tslint.json b/types/moji/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/moji/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/moment-business-time/index.d.ts b/types/moment-business-time/index.d.ts
new file mode 100644
index 0000000000..dc4022f161
--- /dev/null
+++ b/types/moment-business-time/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for moment-business-time 0.7
+// Project: https://github.com/lennym/moment-business-time
+// Definitions by: Tomasz Nguyen <https://github.com/swist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ On this line, import the module which this module adds to */
+import * as moment from 'moment';
+
+/*~ Here, declare the same module as the one you imported above */
+declare module 'moment' {
+    interface Moment {
+        nextWorkingDay: () => Moment;
+        nextWorkingTime: () => Moment;
+
+        lastWorkingDay: () => Moment;
+        lastWorkingTime: () => Moment;
+
+        addWorkingTime: (...args: Array<number | unitOfTime.Base>) => Moment;
+        subtractWorkingTime: (...args: Array<number | unitOfTime.Base>) => Moment;
+
+        workingDiff: (moment: Moment, unit: unitOfTime.Base, fractions?: boolean) => Moment;
+
+        isWorkingDay: () => boolean;
+        isWorkingTime: () => boolean;
+    }
+
+    interface WorkingHoursMap {
+        0: string[] | null;
+        1: string[] | null;
+        2: string[] | null;
+        3: string[] | null;
+        4: string[] | null;
+        5: string[] | null;
+        6: string[] | null;
+    }
+
+    interface LocaleSpecification {
+        workinghours?: WorkingHoursMap;
+        holidays?: string[];
+    }
+}
diff --git a/types/moment-business-time/moment-business-time-tests.ts b/types/moment-business-time/moment-business-time-tests.ts
new file mode 100644
index 0000000000..79f25a720a
--- /dev/null
+++ b/types/moment-business-time/moment-business-time-tests.ts
@@ -0,0 +1,56 @@
+import * as moment from 'moment';
+import 'moment-business-time';
+
+moment('2015-02-28T10:00:00Z').nextWorkingDay();
+moment('2015-02-28T20:00:00Z').nextWorkingDay();
+moment('2015-02-28T10:00:00Z').nextWorkingTime();
+moment('2015-02-28T20:00:00Z').nextWorkingTime();
+moment('2015-02-28T10:00:00Z').lastWorkingDay();
+// Fri Feb 27 2015 10:00:00 GMT+0000
+moment('2015-02-28T20:00:00Z').lastWorkingDay();
+// Fri Feb 27 2015 20:00:00 GMT+0000
+moment('2015-02-27T10:00:00Z').addWorkingTime(5, 'hours');
+// Fri Feb 27 2015 15:00:00 GMT+0000
+moment('2015-02-28T10:00:00Z').addWorkingTime(5, 'hours');
+// Mon Mar 02 2015 14:00:00 GMT+0000
+moment('2015-02-27T10:00:00Z').addWorkingTime(5, 'hours', 30, 'minutes');
+// Fri Feb 27 2015 15:30:00 GMT+0000
+moment('2015-02-27T16:00:00Z').subtractWorkingTime(5, 'hours');
+// Fri Feb 27 2015 11:00:00 GMT+0000
+moment('2015-02-28T16:00:00Z').subtractWorkingTime(5, 'hours');
+// Fri Feb 27 2015 12:00:00 GMT+0000
+moment('2015-02-27T16:00:00Z').subtractWorkingTime(5, 'hours', 30, 'minutes');
+// Fri Feb 27 2015 10:30:00 GMT+0000
+moment('2015-02-27T16:30:00Z').workingDiff(moment('2015-02-26T12:00:00Z'), 'hours');
+// 12
+moment('2015-02-27T16:30:00Z').workingDiff(moment('2015-02-26T12:00:00Z'), 'hours', true);
+// 12.5
+// set opening time to 09:30 and close early on Wednesdays
+moment.updateLocale('en', {
+    workinghours: {
+        0: null,
+        1: ['09:30:00', '17:00:00'],
+        2: ['09:30:00', '17:00:00'],
+        3: ['09:30:00', '13:00:00'],
+        4: ['09:30:00', '17:00:00'],
+        5: ['09:30:00', '17:00:00'],
+        6: null
+    }
+});
+moment('2015-02-25T15:00:00Z').isWorkingTime(); // false
+moment('2015-02-23T09:00:00Z').isWorkingTime(); // false
+moment.updateLocale('en', {
+    holidays: [
+        '2015-05-04'
+    ]
+});
+moment('2015-05-04T09:30:00Z').isWorkingDay(); // false
+moment.updateLocale('en', {
+    holidays: [
+        '*-12-25'
+    ]
+});
+moment('2015-12-25T16:30:00Z').isWorkingDay(); // false
+moment('2016-12-25T16:30:00Z').isWorkingDay(); // false
+moment('2017-12-25T16:30:00Z').isWorkingDay(); // false
+moment('2018-12-25T16:30:00Z').isWorkingDay(); // false
diff --git a/types/moment-business-time/package.json b/types/moment-business-time/package.json
new file mode 100644
index 0000000000..19e5fb0d14
--- /dev/null
+++ b/types/moment-business-time/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "moment": ">=2.14.0"
+    }
+}
diff --git a/types/moment-business-time/tsconfig.json b/types/moment-business-time/tsconfig.json
new file mode 100644
index 0000000000..c1212caa2f
--- /dev/null
+++ b/types/moment-business-time/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "moment-business-time-tests.ts"
+    ]
+}
diff --git a/types/moment-business-time/tslint.json b/types/moment-business-time/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/moment-business-time/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/moment-business/package.json b/types/moment-business/package.json
index 15f5f42e36..73597bb27b 100644
--- a/types/moment-business/package.json
+++ b/types/moment-business/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": "^2.18.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/moment-duration-format/package.json b/types/moment-duration-format/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/moment-duration-format/package.json
+++ b/types/moment-duration-format/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/moment-holiday/index.d.ts b/types/moment-holiday/index.d.ts
new file mode 100644
index 0000000000..fffe81ed73
--- /dev/null
+++ b/types/moment-holiday/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for moment-holiday 1.5
+// Project: https://github.com/kodie/moment-holiday
+// Definitions by: Robert Winslow Dalpe <https://github.com/rwdalpe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as moment from 'moment';
+
+declare module 'moment' {
+    interface Moment extends Object {
+        holiday(
+            holidays?: string[] | string,
+            adjust?: boolean): Moment | false | { [holidayName: string]: Moment };
+
+        holidays(
+            holidays?: string[] | string,
+            adjust?: boolean): Moment | false | { [holidayName: string]: Moment };
+
+        isHoliday(
+            holidays?: string[] | string | null,
+            adjust?: boolean): boolean | string | string[];
+
+        previousHoliday(count?: number, adjust?: boolean): Moment[] | Moment;
+
+        previousHolidays(count?: number, adjust?: boolean): Moment[] | Moment;
+
+        nextHoliday(count?: number, adjust?: boolean): Moment[] | Moment;
+
+        nextHolidays(count?: number, adjust?: boolean): Moment[] | Moment;
+
+        holidaysBetween(m: Moment, adjust?: boolean): Moment[] | false;
+    }
+
+    interface HolidayDefinition {
+        date: string;
+        keywords?: string[];
+        keywords_y?: string[];
+        keywords_n?: string[];
+        regions?: string[];
+        regions_n?: string[];
+    }
+
+    interface HolidaysMapping {
+        [holidayName: string]: HolidayDefinition;
+    }
+
+    interface Holidays {
+        active: HolidaysMapping;
+        active_last: HolidaysMapping;
+    }
+
+    interface HolidayModifier {
+        set(
+            holidays: HolidaysMapping | string | string[],
+            specifics?: any): HolidayModifier;
+
+        add(
+            holidays: HolidaysMapping | string,
+            specifics?: any): HolidayModifier;
+
+        remove(holidays: string | string[]): HolidayModifier;
+
+        undo(): HolidayModifier;
+
+        load(locales: string | string[]): HolidayModifier;
+
+        extendParser(parserFunc: (m: Moment, date: string) => Moment | Moment[] | false | void): HolidayModifier;
+    }
+
+    let holidays: Holidays;
+    let modifyHolidays: HolidayModifier;
+}
diff --git a/types/moment-holiday/moment-holiday-tests.ts b/types/moment-holiday/moment-holiday-tests.ts
new file mode 100644
index 0000000000..474cf246fb
--- /dev/null
+++ b/types/moment-holiday/moment-holiday-tests.ts
@@ -0,0 +1,127 @@
+import moment = require('moment');
+import 'moment-holiday';
+
+let holidayResult: moment.Moment | false | { [holidayName: string]: moment.Moment };
+holidayResult = moment().holiday([]);
+holidayResult = moment().holiday([], false);
+holidayResult = moment().holiday([], true);
+holidayResult = moment().holiday('string');
+holidayResult = moment().holiday('string', false);
+holidayResult = moment().holiday('string', true);
+holidayResult = moment().holiday(['array', 'of', 'strings']);
+holidayResult = moment().holiday(['array', 'of', 'strings'], false);
+holidayResult = moment().holiday(['array', 'of', 'strings'], true);
+
+holidayResult = moment().holidays([]);
+holidayResult = moment().holidays([], false);
+holidayResult = moment().holidays([], true);
+holidayResult = moment().holidays('string');
+holidayResult = moment().holidays('string', false);
+holidayResult = moment().holidays('string', true);
+holidayResult = moment().holidays(['array', 'of', 'strings']);
+holidayResult = moment().holidays(['array', 'of', 'strings'], false);
+holidayResult = moment().holidays(['array', 'of', 'strings'], true);
+
+let isHolidayResult: boolean | string | string[];
+isHolidayResult = moment().isHoliday();
+isHolidayResult = moment().isHoliday([]);
+isHolidayResult = moment().isHoliday([], false);
+isHolidayResult = moment().isHoliday([], true);
+isHolidayResult = moment().isHoliday(['array', 'of', 'strings']);
+isHolidayResult = moment().isHoliday(['array', 'of', 'strings'], false);
+isHolidayResult = moment().isHoliday(['array', 'of', 'strings'], true);
+isHolidayResult = moment().isHoliday('string');
+isHolidayResult = moment().isHoliday('string', false);
+isHolidayResult = moment().isHoliday('string', true);
+isHolidayResult = moment().isHoliday(null);
+isHolidayResult = moment().isHoliday(null, false);
+isHolidayResult = moment().isHoliday(null, true);
+
+let previousHolidayResult: moment.Moment[] | moment.Moment;
+previousHolidayResult = moment().previousHoliday();
+previousHolidayResult = moment().previousHoliday(1);
+previousHolidayResult = moment().previousHoliday(1, false);
+previousHolidayResult = moment().previousHoliday(1, true);
+previousHolidayResult = moment().previousHolidays();
+previousHolidayResult = moment().previousHolidays(1);
+previousHolidayResult = moment().previousHolidays(1, false);
+previousHolidayResult = moment().previousHolidays(1, true);
+
+let nextHolidayResult: moment.Moment[] | moment.Moment;
+nextHolidayResult = moment().nextHoliday();
+nextHolidayResult = moment().nextHoliday(1);
+nextHolidayResult = moment().nextHoliday(1, false);
+nextHolidayResult = moment().nextHoliday(1, true);
+nextHolidayResult = moment().nextHolidays();
+nextHolidayResult = moment().nextHolidays(1);
+nextHolidayResult = moment().nextHolidays(1, false);
+nextHolidayResult = moment().nextHolidays(1, true);
+
+let holidaysBetweenResult: moment.Moment[] | false;
+holidaysBetweenResult = moment().holidaysBetween(moment());
+holidaysBetweenResult = moment().holidaysBetween(moment(), false);
+holidaysBetweenResult = moment().holidaysBetween(moment(), true);
+
+let holidayDefinition: moment.HolidayDefinition = {
+    date: 'string'
+};
+holidayDefinition = {
+    date: 'string',
+    keywords: ['array'],
+};
+holidayDefinition = {
+    date: 'string',
+    keywords: ['array'],
+    keywords_n: ['array'],
+};
+holidayDefinition = {
+    date: 'string',
+    keywords: ['array'],
+    keywords_n: ['array'],
+    keywords_y: ['array'],
+};
+holidayDefinition = {
+    date: 'string',
+    keywords: ['array'],
+    keywords_n: ['array'],
+    keywords_y: ['array'],
+    regions: ['array'],
+};
+holidayDefinition = {
+    date: 'string',
+    keywords: ['array'],
+    keywords_n: ['array'],
+    keywords_y: ['array'],
+    regions: ['array'],
+    regions_n: ['array']
+};
+
+const holidays: moment.Holidays = moment.holidays;
+let activeHolidays: moment.HolidaysMapping = moment.holidays.active;
+activeHolidays = {
+    'Some holiday name': holidayDefinition
+};
+
+let lastActiveHolidays: moment.HolidaysMapping = moment.holidays.active_last;
+lastActiveHolidays = {
+    'Some holiday name': holidayDefinition
+};
+
+let holidayModifier: moment.HolidayModifier = moment.modifyHolidays;
+holidayModifier = holidayModifier.set('string');
+holidayModifier = holidayModifier.set(['array']);
+holidayModifier = holidayModifier.set(activeHolidays);
+holidayModifier = holidayModifier.set('string', {});
+holidayModifier = holidayModifier.set(['array'], {});
+holidayModifier = holidayModifier.set(activeHolidays, {});
+holidayModifier = holidayModifier.add(activeHolidays);
+holidayModifier = holidayModifier.add('string');
+holidayModifier = holidayModifier.add(activeHolidays, {});
+holidayModifier = holidayModifier.add('string', {});
+holidayModifier = holidayModifier.remove('string');
+holidayModifier = holidayModifier.remove(['array']);
+holidayModifier = holidayModifier.undo();
+holidayModifier = holidayModifier.load('string');
+holidayModifier = holidayModifier.load(['string']);
+holidayModifier = holidayModifier.extendParser((m: moment.Moment, d: string): moment.Moment | moment.Moment[] | false | void => {
+});
diff --git a/types/moment-holiday/package.json b/types/moment-holiday/package.json
new file mode 100644
index 0000000000..4c7554a28e
--- /dev/null
+++ b/types/moment-holiday/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "moment": ">=2.0.0"
+    }
+}
diff --git a/types/moment-holiday/tsconfig.json b/types/moment-holiday/tsconfig.json
new file mode 100644
index 0000000000..d03f37e12c
--- /dev/null
+++ b/types/moment-holiday/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "moment-holiday-tests.ts"
+    ]
+}
diff --git a/types/moment-holiday/tslint.json b/types/moment-holiday/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/moment-holiday/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/moment-jalaali/package.json b/types/moment-jalaali/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/moment-jalaali/package.json
+++ b/types/moment-jalaali/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/moment-jalaali/tslint.json b/types/moment-jalaali/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/moment-jalaali/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/moment-range/package.json b/types/moment-range/package.json
index 23ba3dc104..ac2bb42bad 100644
--- a/types/moment-range/package.json
+++ b/types/moment-range/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": "^2.18.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/moment-round/package.json b/types/moment-round/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/moment-round/package.json
+++ b/types/moment-round/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/moment-strftime2/index.d.ts b/types/moment-strftime2/index.d.ts
new file mode 100644
index 0000000000..37edbd13a5
--- /dev/null
+++ b/types/moment-strftime2/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for moment-strftime2 1.0
+// Project: https://github.com/ShogunPanda/moment-strftime2
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as _moment from 'moment';
+
+declare module "moment" {
+    interface Moment {
+        strftime(pattern: string): string;
+    }
+}
+
+declare module "moment-timezone" {
+    interface Moment {
+        strftime(pattern: string): string;
+    }
+}
+
+export interface Modifiers {
+    "%": string;
+    A: string;
+    B: string;
+    C?: string;
+    D: string;
+    E?: string;
+    F: string;
+    G?: string;
+    H: string;
+    I: string;
+    J?: string;
+    K?: string;
+    L: string;
+    M: string;
+    N?: string;
+    O?: string;
+    P: string;
+    Q?: string;
+    R: string;
+    S: string;
+    T: string;
+    U?: string;
+    V: string;
+    W: string;
+    X?: string;
+    Y: string;
+    Z: string;
+    a: string;
+    b: string;
+    c?: string;
+    d: string;
+    e: string;
+    f?: string;
+    g: string;
+    h: string;
+    i?: string;
+    j: string;
+    k: string;
+    l: string;
+    m: string;
+    n?: string;
+    o?: string;
+    p: string;
+    q?: string;
+    r: string;
+    s: string;
+    t?: string;
+    u: string;
+    v?: string;
+    w: string;
+    x?: string;
+    y: string;
+    z: string;
+}
+
+export let modifiers: Modifiers;
+
+export let separator: string;
+
+export function installTo(moment: object): void;
diff --git a/types/moment-strftime2/moment-strftime2-tests.ts b/types/moment-strftime2/moment-strftime2-tests.ts
new file mode 100644
index 0000000000..91441bfdd9
--- /dev/null
+++ b/types/moment-strftime2/moment-strftime2-tests.ts
@@ -0,0 +1,8 @@
+import moment = require("moment-timezone");
+import strftime2 = require("moment-strftime2");
+strftime2.installTo(moment);
+
+moment("2016-10-10 12:34:56.135 +02:00").strftime("%d %o #d #o"); // "10 %o #d #o"
+strftime2.separator = "$";
+strftime2.modifiers.o = "DD";
+moment("2016-10-10 12:34:56.135 +02:00").strftime("%d %o #d #o"); // "%d %o 10 10"
diff --git a/types/moment-strftime2/package.json b/types/moment-strftime2/package.json
new file mode 100644
index 0000000000..ac2bb42bad
--- /dev/null
+++ b/types/moment-strftime2/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "moment": "^2.18.1"
+    }
+}
diff --git a/types/moment-strftime2/tsconfig.json b/types/moment-strftime2/tsconfig.json
new file mode 100644
index 0000000000..cd5862e99f
--- /dev/null
+++ b/types/moment-strftime2/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "moment-strftime2-tests.ts"
+    ]
+}
diff --git a/types/moment-strftime2/tslint.json b/types/moment-strftime2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/moment-strftime2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/moment-timezone/index.d.ts b/types/moment-timezone/index.d.ts
index a839b093c4..c3927415c6 100644
--- a/types/moment-timezone/index.d.ts
+++ b/types/moment-timezone/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for moment-timezone.js 0.5
 // Project: http://momentjs.com/timezone/
-// Definitions by: Michel Salib <https://github.com/michelsalib>
+// Definitions by: Michel Salib <https://github.com/michelsalib>, Alan Brazil Lins <https://github.com/alanblins>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as moment from 'moment';
@@ -18,6 +18,7 @@ declare module "moment" {
 
         abbr(timestamp: number): string;
         offset(timestamp: number): number;
+        utcOffset(timestamp: number): number;
         parse(timestamp: number): number;
     }
 
@@ -50,7 +51,7 @@ declare module "moment" {
         }): void;
 
         names(): string[];
-        guess(): string;
+        guess(ignoreCache?: boolean): string;
 
         setDefault(timezone: string): void;
     }
diff --git a/types/moment-timezone/moment-timezone-tests.ts b/types/moment-timezone/moment-timezone-tests.ts
index 9e3e720d24..66bb7403ea 100644
--- a/types/moment-timezone/moment-timezone-tests.ts
+++ b/types/moment-timezone/moment-timezone-tests.ts
@@ -49,7 +49,7 @@ moment.tz(mo, "America/Los_Angeles");
 moment.tz(obj, "America/Los_Angeles");
 
 moment.tz.zone('America/Los_Angeles').abbr(1403465838805);
-moment.tz.zone('America/Los_Angeles').offset(1403465838805);
+moment.tz.zone('America/Los_Angeles').utcOffset(1403465838805);
 
 const zone = moment.tz.zone('America/New_York');
 zone.parse(Date.UTC(2012, 2, 19, 8, 30)); // 240
@@ -78,6 +78,8 @@ moment.tz.setDefault('America/Los_Angeles');
 
 moment.tz.guess();
 
+moment.tz.guess(true);
+
 const zoneAbbr: string = moment.tz('America/Los_Angeles').zoneAbbr();
 
 const zoneName: string = moment.tz('America/Los_Angeles').zoneName();
diff --git a/types/moment-timezone/package.json b/types/moment-timezone/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/moment-timezone/package.json
+++ b/types/moment-timezone/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index afd32099bd..ae52d70e14 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1,14 +1,15 @@
-// Type definitions for MongoDB v2.2
-// Project: https://github.com/mongodb/node-mongodb-native/tree/2.2
+// Type definitions for MongoDB v3.0
+// Project: https://github.com/mongodb/node-mongodb-native/tree/3.0.0
 // Definitions by: Federico Caselli <https://github.com/CaselIT>
 //                 Alan Marcell <https://github.com/alanmarcell>
 //                 Gady Piazza <https://github.com/kikar>
 //                 Jason Dreyzehner <https://github.com/bitjson>
 //                 Gaurav Lahoti <https://github.com/dante-101>
+//                 Mariano Cortesi <https://github.com/mcortesi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Documentation : http://mongodb.github.io/node-mongodb-native/2.2/api/
+// Documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/
 
 /// <reference types="node" />
 /// <reference types="bson" />
@@ -17,37 +18,66 @@ import { ObjectID } from 'bson';
 import { EventEmitter } from 'events';
 import { Readable, Writable } from "stream";
 
-export function connect(uri: string, callback: MongoCallback<Db>): void;
 export function connect(uri: string, options?: MongoClientOptions): Promise<Db>;
+export function connect(uri: string, callback: MongoCallback<Db>): void;
 export function connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
 
-export { Binary, Double, Long, Decimal128, MaxKey, MinKey, ObjectID, ObjectId, Timestamp } from 'bson';
+export { Binary, Double, Long, Decimal128, MaxKey, MinKey, ObjectID, ObjectId, Timestamp, DBRef } from 'bson';
 
-// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
-export class MongoClient {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html
+export class MongoClient extends EventEmitter {
     constructor();
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#.connect */
+    static connect(uri: string, callback: MongoCallback<MongoClient>): void;
+    static connect(uri: string, options?: MongoClientOptions): Promise<MongoClient>;
+    static connect(uri: string, options: MongoClientOptions, callback: MongoCallback<MongoClient>): void;
+    /** 
+     * @deprecated
+     * http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#connect
+     */
+    connect(): Promise<MongoClient>;
+    connect(callback: MongoCallback<MongoClient>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#close */
+    close(callback: MongoCallback<void>): void;
+    close(force?: boolean): Promise<void>;
+    close(force: boolean, callback: MongoCallback<void>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#db */
+    db(name: string, options?: MongoClientCommonOption): Db
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#isConnected */
+    isConnected(name: string, options?: MongoClientCommonOption): boolean;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#logout */
+    logout(callback: MongoCallback<any>): void;
+    logout(options?: { dbName?: string }): Promise<any>;
+    logout(options: { dbName?: string }, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#startSession */
+    startSession(options?: any): ClientSession;
+}
 
-    static connect(uri: string, callback: MongoCallback<Db>): void;
-    static connect(uri: string, options?: MongoClientOptions): Promise<Db>;
-    static connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
+declare class ClientSession extends EventEmitter {
+    endSession(callback?: MongoCallback<void>): void;
+    endSession(options: any, callback?: MongoCallback<void>): void;
+    equals(session: ClientSession): boolean;
+}
 
-    connect(uri: string, callback: MongoCallback<Db>): void;
-    connect(uri: string, options?: MongoClientOptions): Promise<Db>;
-    connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
+export interface MongoClientCommonOption {
+    /** Do not make the db an event listener to the original connection. */
+    noListener?: boolean;
+    /** Control if you want to return a cached instance or have a new one created */
+    returnNonCachedInstance?: boolean;
 }
 
 export interface MongoCallback<T> {
     (error: MongoError, result: T): void;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/MongoError.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoError.html */
 export class MongoError extends Error {
     constructor(message: string);
     static create(options: Object): MongoError;
     code?: number;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.2/api/MongoClient.html#.connect
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#.connect */
 export interface MongoClientOptions extends
     DbCreateOptions,
     ServerOptions,
@@ -96,7 +126,7 @@ export interface HighAvailabilityOptions {
     domainsEnabled?: boolean;
 }
 
-// See http://mongodb.github.io/node-mongodb-native/2.2/api/ReadPreference.html
+// See http://mongodb.github.io/node-mongodb-native/3.0/api/ReadPreference.html
 export class ReadPreference {
     constructor(mode: string, tags: Object);
     mode: string;
@@ -111,17 +141,10 @@ export class ReadPreference {
     static isValid(mode: string): boolean;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html
-export interface DbCreateOptions {
-
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html */
+export interface DbCreateOptions extends CommonOptions {
     // If the database authentication is dependent on another databaseName.
     authSource?: string;
-    // Default: null;https://docs.mongodb.com/manual/reference/write-concern/#write-concern
-    w?: number | string;
-    // The write concern timeout to finish (combining with w option).
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
     // Default: false; Force server to create _id fields instead of client.
     forceServerObjectId?: boolean;
     // Default: false; Use c++ bson parser.
@@ -144,11 +167,14 @@ export interface DbCreateOptions {
     pkFactory?: Object;
     // ES6 compatible promise constructor
     promiseLibrary?: Object;
-    // https://docs.mongodb.com/manual/reference/read-concern/#read-concern
+    /** https://docs.mongodb.com/manual/reference/read-concern/#read-concern */
     readConcern?: { level?: Object };
+    // Sets a cap on how many operations the driver will buffer up before giving up on getting a
+    // working connection, default is -1 which is unlimited.
+    bufferMaxEntries?: number;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Server.html */
 export interface SocketOptions {
     // Reconnect on error. default:false
     autoReconnect?: boolean;
@@ -162,7 +188,7 @@ export interface SocketOptions {
     socketTimeoutMS?: number;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Server.html */
 export interface ServerOptions extends SSLOptions {
     // Default: 30;
     reconnectTries?: number;
@@ -177,14 +203,14 @@ export interface ServerOptions extends SSLOptions {
     domainsEnabled?: boolean;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.2/api/Mongos.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Mongos.html */
 export interface MongosOptions extends SSLOptions, HighAvailabilityOptions {
     // Default: 15; Cutoff latency point in MS for MongoS proxy selection
     acceptableLatencyMS?: number;
     socketOptions?: SocketOptions;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.2/api/ReplSet.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/ReplSet.html */
 export interface ReplSetOptions extends SSLOptions, HighAvailabilityOptions {
     // The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
     maxStalenessSeconds?: number;
@@ -196,7 +222,7 @@ export interface ReplSetOptions extends SSLOptions, HighAvailabilityOptions {
     socketOptions?: SocketOptions;
 }
 
-// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
+// Class documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html
 export class Db extends EventEmitter {
     constructor(databaseName: string, serverConfig: Server | ReplSet | Mongos, options?: DbCreateOptions);
 
@@ -208,120 +234,113 @@ export class Db extends EventEmitter {
     slaveOk: boolean;
     writeConcern: any;
 
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#addUser */
     addUser(username: string, password: string, callback: MongoCallback<any>): void;
     addUser(username: string, password: string, options?: DbAddUserOptions): Promise<any>;
     addUser(username: string, password: string, options: DbAddUserOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#admin
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#admin */
     admin(): Admin;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#authenticate
-    authenticate(userName: string, password: string, callback: MongoCallback<any>): void;
-    authenticate(userName: string, password: string, options?: { authMechanism: string }): Promise<any>;
-    authenticate(userName: string, password: string, options: { authMechanism: string }, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#close
-    close(callback: MongoCallback<void>): void;
-    close(forceClose?: boolean): Promise<void>;
-    close(forceClose: boolean, callback: MongoCallback<void>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#collection */
     collection<TSchema = Default>(name: string): Collection<TSchema>;
     collection<TSchema = Default>(name: string, callback: MongoCallback<Collection<TSchema>>): Collection<TSchema>;
     collection<TSchema = Default>(name: string, options: DbCollectionOptions, callback: MongoCallback<Collection<TSchema>>): Collection<TSchema>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collections
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#collections */
     collections(): Promise<Collection<Default>[]>;
     collections(callback: MongoCallback<Collection<Default>[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#command
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#command */
     command(command: Object, callback: MongoCallback<any>): void;
     command(command: Object, options?: { readPreference: ReadPreference | string }): Promise<any>;
     command(command: Object, options: { readPreference: ReadPreference | string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#createCollection */
     createCollection<TSchema = Default>(name: string, callback: MongoCallback<Collection<TSchema>>): void;
     createCollection<TSchema = Default>(name: string, options?: CollectionCreateOptions): Promise<Collection<TSchema>>;
     createCollection<TSchema = Default>(name: string, options: CollectionCreateOptions, callback: MongoCallback<Collection<TSchema>>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#createIndex */
     createIndex(name: string, fieldOrSpec: string | Object, callback: MongoCallback<any>): void;
     createIndex(name: string, fieldOrSpec: string | Object, options?: IndexOptions): Promise<any>;
     createIndex(name: string, fieldOrSpec: string | Object, options: IndexOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#db
-    db(dbName: string): Db;
-    db(dbName: string, options: { noListener?: boolean, returnNonCachedInstance?: boolean }): Db;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropCollection
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#dropCollection */
     dropCollection(name: string): Promise<boolean>;
     dropCollection(name: string, callback: MongoCallback<boolean>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropDatabase
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#dropDatabase */
     dropDatabase(): Promise<any>;
     dropDatabase(callback: MongoCallback<any>): void;
-
-    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#ensureIndex
-    // ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback: Function): void;
-    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#eval
-    // eval(code: any, parameters: any[], options?: any, callback?: MongoCallback<any>): void;
-
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#executeDbAdminCommand
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#executeDbAdminCommand */
     executeDbAdminCommand(command: Object, callback: MongoCallback<any>): void;
     executeDbAdminCommand(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
     executeDbAdminCommand(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#indexInformation
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#indexInformation */
     indexInformation(name: string, callback: MongoCallback<any>): void;
     indexInformation(name: string, options?: { full?: boolean, readPreference?: ReadPreference | string }): Promise<any>;
     indexInformation(name: string, options: { full?: boolean, readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#listCollections
-    listCollections(filter: Object, options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#logout
-    logout(callback: MongoCallback<any>): void;
-    logout(options?: { dbName?: string }): Promise<any>;
-    logout(options: { dbName?: string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#open
-    open(): Promise<Db>;
-    open(callback: MongoCallback<Db>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#removeUser
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#listCollections */
+    listCollections(filter?: Object, options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#profilingInfo */
+    profilingInfo(callback: MongoCallback<any>): void;
+    profilingInfo(options?: { session?: ClientSession }): Promise<void>;
+    profilingInfo(options: { session?: ClientSession }, callback: MongoCallback<void>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#profilingLevel */
+    profilingLevel(callback: MongoCallback<any>): void;
+    profilingLevel(options?: { session?: ClientSession }): Promise<void>;
+    profilingLevel(options: { session?: ClientSession }, callback: MongoCallback<void>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#removeUser */
     removeUser(username: string, callback: MongoCallback<any>): void;
-    removeUser(username: string, options?: { w?: number | string, wtimeout?: number, j?: boolean }): Promise<any>;
-    removeUser(username: string, options: { w?: number | string, wtimeout?: number, j?: boolean }, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#renameCollection
+    removeUser(username: string, options?: CommonOptions): Promise<any>;
+    removeUser(username: string, options: CommonOptions, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#renameCollection */
     renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, callback: MongoCallback<Collection<TSchema>>): void;
     renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
     renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#stats
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#setProfilingLevel */
+    profilingLevel(level: string, callback: MongoCallback<any>): void;
+    profilingLevel(level: string, options?: { session?: ClientSession }): Promise<void>;
+    profilingLevel(level: string, options: { session?: ClientSession }, callback: MongoCallback<void>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#stats */
     stats(callback: MongoCallback<any>): void;
     stats(options?: { scale?: number }): Promise<any>;
     stats(options: { scale?: number }, callback: MongoCallback<any>): void;
 }
 
-// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+export interface CommonOptions {
+    /** The write concern. */
+    w?: string | number;
+    /** The write concern timeout. */
+    wtimeout?: number;
+    /** Specify a journal write concern. */
+    j?: boolean;
+    /** Session to use for this operation */
+    session?: ClientSession;
+}
+
+// Deprecated http://mongodb.github.io/node-mongodb-native/3.0/api/Server.html
 export class Server extends EventEmitter {
     constructor(host: string, port: number, options?: ServerOptions);
 
     connections(): Array<any>;
 }
 
-// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+// Deprecated http://mongodb.github.io/node-mongodb-native/3.0/api/ReplSet.html
 export class ReplSet extends EventEmitter {
     constructor(servers: Array<Server>, options?: ReplSetOptions);
 
     connections(): Array<any>;
 }
 
-// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+// Deprecated http://mongodb.github.io/node-mongodb-native/3.0/api/ReplSet.html
 export class Mongos extends EventEmitter {
     constructor(servers: Array<Server>, options?: MongosOptions);
 
     connections(): Array<any>;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
-export interface DbAddUserOptions {
-    w?: string | number;
-    wtimeout?: number;
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#addUser */
+export interface DbAddUserOptions extends CommonOptions {
     customData?: Object;
     roles?: Object[];
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createCollection
-export interface CollectionCreateOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#createCollection */
+export interface CollectionCreateOptions extends CommonOptions {
     raw?: boolean;
     pkFactory?: Object;
     readPreference?: ReadPreference | string;
@@ -331,8 +350,8 @@ export interface CollectionCreateOptions {
     autoIndexId?: boolean;
     size?: number;
     max?: number;
-    flags?:	number;
-    storageEngine?:	object;
+    flags?: number;
+    storageEngine?: object;
     validator?: object;
     validationLevel?: "off" | "strict" | "moderate";
     validationAction?: "error" | "warn";
@@ -342,11 +361,8 @@ export interface CollectionCreateOptions {
     collation?: object;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
-export interface DbCollectionOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#collection */
+export interface DbCollectionOptions extends CommonOptions {
     raw?: boolean;
     pkFactory?: Object;
     readPreference?: ReadPreference | string;
@@ -355,14 +371,8 @@ export interface DbCollectionOptions {
     readConcern?: { level: Object };
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createIndex
-export interface IndexOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#createIndex */
+export interface IndexOptions extends CommonOptions {
     // Creates an unique index.
     unique?: boolean;
     // Creates a sparse index.
@@ -385,81 +395,60 @@ export interface IndexOptions {
     name?: string;
     // Creates a partial index based on the given filter object (MongoDB 3.2 or higher)
     partialFilterExpression?: any;
+    collation?: Object;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html */
 export interface Admin {
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#addUser */
     addUser(username: string, password: string, callback: MongoCallback<any>): void;
     addUser(username: string, password: string, options?: AddUserOptions): Promise<any>;
     addUser(username: string, password: string, options: AddUserOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#authenticate
-    authenticate(username: string, callback: MongoCallback<any>): void;
-    authenticate(username: string, password?: string): Promise<any>;
-    authenticate(username: string, password: string, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#buildInfo
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#buildInfo */
     buildInfo(): Promise<any>;
     buildInfo(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#command
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#command */
     command(command: Object, callback: MongoCallback<any>): void;
     command(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
     command(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#listDatabases
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#listDatabases */
     listDatabases(): Promise<any>;
     listDatabases(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#logout
-    logout(): Promise<any>;
-    logout(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#ping
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#ping */
     ping(): Promise<any>;
     ping(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingInfo
-    profilingInfo(): Promise<any>;
-    profilingInfo(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingLevel
-    profilingLevel(): Promise<any>;
-    profilingLevel(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#removeUser */
     removeUser(username: string, callback: MongoCallback<any>): void;
     removeUser(username: string, options?: FSyncOptions): Promise<any>;
     removeUser(username: string, options: FSyncOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#replSetGetStatus
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#replSetGetStatus */
     replSetGetStatus(): Promise<any>;
     replSetGetStatus(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverInfo
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#serverInfo */
     serverInfo(): Promise<any>;
     serverInfo(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverStatus
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#serverStatus */
     serverStatus(): Promise<any>;
     serverStatus(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#setProfilingLevel
-    setProfilingLevel(level: string): Promise<any>;
-    setProfilingLevel(level: string, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#validateCollection
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#validateCollection */
     validateCollection(collectionNme: string, callback: MongoCallback<any>): void;
     validateCollection(collectionNme: string, options?: Object): Promise<any>;
     validateCollection(collectionNme: string, options: Object, callback: MongoCallback<any>): void;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
-export interface AddUserOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#addUser */
+export interface AddUserOptions extends CommonOptions {
     fsync: boolean;
     customData?: Object;
     roles?: Object[]
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
-export interface FSyncOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#removeUser */
+export interface FSyncOptions extends CommonOptions {
     fsync?: boolean
 }
 
-// Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
+// Documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html
 export interface Collection<TSchema = Default> {
     // Get the collection name.
     collectionName: string;
@@ -471,164 +460,172 @@ export interface Collection<TSchema = Default> {
     readConcern: any;
     // Get current index hint for collection.
     hint: any;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#aggregate */
     aggregate<T = TSchema>(pipeline: Object[], callback: MongoCallback<T[]>): AggregationCursor<T>;
     aggregate<T = TSchema>(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<T[]>): AggregationCursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#bulkWrite */
     bulkWrite(operations: Object[], callback: MongoCallback<BulkWriteOpResultObject>): void;
     bulkWrite(operations: Object[], options?: CollectionBluckWriteOptions): Promise<BulkWriteOpResultObject>;
     bulkWrite(operations: Object[], options: CollectionBluckWriteOptions, callback: MongoCallback<BulkWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#count
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#count */
     count(query: Object, callback: MongoCallback<number>): void;
     count(query: Object, options?: MongoCountPreferences): Promise<number>;
     count(query: Object, options: MongoCountPreferences, callback: MongoCallback<number>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndex
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#createIndex */
     createIndex(fieldOrSpec: string | any, callback: MongoCallback<string>): void;
     createIndex(fieldOrSpec: string | any, options?: IndexOptions): Promise<string>;
     createIndex(fieldOrSpec: string | any, options: IndexOptions, callback: MongoCallback<string>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndexes and http://docs.mongodb.org/manual/reference/command/createIndexes/
-    createIndexes(indexSpecs: Object[]): Promise<any>;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#createIndexes and  http://docs.mongodb.org/manual/reference/command/createIndexes/ */
     createIndexes(indexSpecs: Object[], callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
+    createIndexes(indexSpecs: Object[], options?: {session?: ClientSession}): Promise<any>;
+    createIndexes(indexSpecs: Object[], options: {session?: ClientSession}, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#deleteMany */
     deleteMany(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    deleteMany(filter: Object, options?: CollectionOptions): Promise<DeleteWriteOpResultObject>;
-    deleteMany(filter: Object, options: CollectionOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteOne
+    deleteMany(filter: Object, options?: CommonOptions): Promise<DeleteWriteOpResultObject>;
+    deleteMany(filter: Object, options: CommonOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#deleteOne */
     deleteOne(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    deleteOne(filter: Object, options?: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
-    deleteOne(filter: Object, options: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#distinct
+    deleteOne(filter: Object, options?: CommonOptions & { bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
+    deleteOne(filter: Object, options: CommonOptions & { bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#distinct */
     distinct(key: string, query: Object, callback: MongoCallback<any>): void;
-    distinct(key: string, query: Object, options?: { readPreference?: ReadPreference | string }): Promise<any>;
-    distinct(key: string, query: Object, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#drop
-    drop(): Promise<any>;
+    distinct(key: string, query: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number, session?: ClientSession }): Promise<any>;
+    distinct(key: string, query: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number, session?: ClientSession }, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#drop */
+    drop(options?: {session: ClientSession}): Promise<any>;
     drop(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndex
+    drop(options: {session: ClientSession}, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#dropIndex */
     dropIndex(indexName: string, callback: MongoCallback<any>): void;
-    dropIndex(indexName: string, options?: CollectionOptions): Promise<any>;
-    dropIndex(indexName: string, options: CollectionOptions, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndexes
-    dropIndexes(): Promise<any>;
+    dropIndex(indexName: string, options?: CommonOptions & { maxTimeMS?: number }): Promise<any>;
+    dropIndex(indexName: string, options: CommonOptions & { maxTimeMS?: number }, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#dropIndexes */
+    dropIndexes(options?: {session?: ClientSession, maxTimeMS?: number}): Promise<any>;
     dropIndexes(callback?: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#find
+    dropIndexes(options: {session?: ClientSession, maxTimeMS?: number}, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#find */
     find<T = TSchema>(query?: Object): Cursor<T>;
     /** @deprecated */
-    find<T = TSchema>(query: Object, fields?: Object, skip?: number, limit?: number, timeout?: number): Cursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOne
+    find<T = TSchema>(query: Object, options?: FindOneOptions): Cursor<T>;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
     findOne<T = TSchema>(filter: Object, callback: MongoCallback<T | null>): void;
     findOne<T = TSchema>(filter: Object, options?: FindOneOptions): Promise<T | null>;
     findOne<T = TSchema>(filter: Object, options: FindOneOptions, callback: MongoCallback<T | null>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndDelete
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndDelete */
     findOneAndDelete(filter: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
-    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number }, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
+    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndReplace */
     findOneAndReplace(filter: Object, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     findOneAndReplace(filter: Object, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
     findOneAndReplace(filter: Object, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndUpdate
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndUpdate */
     findOneAndUpdate(filter: Object, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     findOneAndUpdate(filter: Object, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
     findOneAndUpdate(filter: Object, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoHaystackSearch */
     geoHaystackSearch(x: number, y: number, callback: MongoCallback<any>): void;
     geoHaystackSearch(x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;
     geoHaystackSearch(x: number, y: number, options: GeoHaystackSearchOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoNear */
     geoNear(x: number, y: number, callback: MongoCallback<any>): void;
     geoNear(x: number, y: number, options?: GeoNearOptions): Promise<any>;
     geoNear(x: number, y: number, options: GeoNearOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#group
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#group */
     group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, callback: MongoCallback<any>): void;
     group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options?: { readPreference?: ReadPreference | string }): Promise<any>;
     group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexes
-    indexes(): Promise<any>;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#indexes */
+    indexes(options?: {session: ClientSession}): Promise<any>;
     indexes(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexExists
-    indexExists(indexes: string | string[]): Promise<boolean>;
+    indexes(options: {session?: ClientSession}, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#indexExists */
     indexExists(indexes: string | string[], callback: MongoCallback<boolean>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexInformation
+    indexExists(indexes: string | string[], options?: {session: ClientSession}): Promise<boolean>;
+    indexExists(indexes: string | string[], options: {session: ClientSession}, callback: MongoCallback<boolean>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#indexInformation */
     indexInformation(callback: MongoCallback<any>): void;
-    indexInformation(options?: { full: boolean }): Promise<any>;
-    indexInformation(options: { full: boolean }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeOrderedBulkOp
-    initializeOrderedBulkOp(options?: CollectionOptions): OrderedBulkOperation;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeUnorderedBulkOp
-    initializeUnorderedBulkOp(options?: CollectionOptions): UnorderedBulkOperation;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+    indexInformation(options?: { full: boolean, session: ClientSession }): Promise<any>;
+    indexInformation(options: { full: boolean, session: ClientSession }, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#initializeOrderedBulkOp */
+    initializeOrderedBulkOp(options?: CommonOptions): OrderedBulkOperation;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#initializeUnorderedBulkOp */
+    initializeUnorderedBulkOp(options?: CommonOptions): UnorderedBulkOperation;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertOne */
     /** @deprecated Use insertOne, insertMany or bulkWrite */
     insert(docs: Object, callback: MongoCallback<InsertOneWriteOpResult>): void;
     /** @deprecated Use insertOne, insertMany or bulkWrite */
     insert(docs: Object, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
     /** @deprecated Use insertOne, insertMany or bulkWrite */
     insert(docs: Object, options: CollectionInsertOneOptions, callback: MongoCallback<InsertOneWriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertMany */
     insertMany(docs: Object[], callback: MongoCallback<InsertWriteOpResult>): void;
     insertMany(docs: Object[], options?: CollectionInsertManyOptions): Promise<InsertWriteOpResult>;
     insertMany(docs: Object[], options: CollectionInsertManyOptions, callback: MongoCallback<InsertWriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertOne */
     insertOne(docs: Object, callback: MongoCallback<InsertOneWriteOpResult>): void;
     insertOne(docs: Object, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
     insertOne(docs: Object, options: CollectionInsertOneOptions, callback: MongoCallback<InsertOneWriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#isCapped
-    isCapped(): Promise<any>;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#isCapped */
+    isCapped(options?: {session: ClientSession}): Promise<any>;
     isCapped(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#listIndexes
-    listIndexes(options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
+    isCapped(options: {session: ClientSession}, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#listIndexes */
+    listIndexes(options?: { batchSize?: number, readPreference?: ReadPreference | string, session?: ClientSession }): CommandCursor;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#mapReduce */
     mapReduce(map: Function | string, reduce: Function | string, callback: MongoCallback<any>): void;
     mapReduce(map: Function | string, reduce: Function | string, options?: MapReduceOptions): Promise<any>;
     mapReduce(map: Function | string, reduce: Function | string, options: MapReduceOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#options
-    options(): Promise<any>;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#options */
+    options(options?: {session: ClientSession}): Promise<any>;
     options(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
+    options(options: {session: ClientSession}, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#parallelCollectionScan */
     parallelCollectionScan(callback: MongoCallback<Cursor<any>[]>): void;
     parallelCollectionScan(options?: ParallelCollectionScanOptions): Promise<Cursor<any>[]>;
     parallelCollectionScan(options: ParallelCollectionScanOptions, callback: MongoCallback<Cursor<any>[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#reIndex
-    reIndex(): Promise<any>;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#reIndex */
+    reIndex(options?: {session: ClientSession}): Promise<any>;
     reIndex(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#remove
+    reIndex(options: {session: ClientSession}, callback: MongoCallback<any>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#remove */
     /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
     remove(selector: Object, callback: MongoCallback<WriteOpResult>): void;
     /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
-    remove(selector: Object, options?: CollectionOptions & { single?: boolean }): Promise<WriteOpResult>;
+    remove(selector: Object, options?: CommonOptions & { single?: boolean }): Promise<WriteOpResult>;
     /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
-    remove(selector: Object, options?: CollectionOptions & { single?: boolean }, callback?: MongoCallback<WriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#rename
+    remove(selector: Object, options?: CommonOptions & { single?: boolean }, callback?: MongoCallback<WriteOpResult>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#rename */
     rename(newName: string, callback: MongoCallback<Collection<TSchema>>): void;
-    rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
-    rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#replaceOne
-    replaceOne(filter: Object, doc: Object, callback: MongoCallback<UpdateWriteOpResult & { ops: Array<any> }>): void;
-    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult & { ops: Array<any> }>;
-    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult & { ops: Array<any> }>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#save
+    rename(newName: string, options?: { dropTarget?: boolean, session?: ClientSession }): Promise<Collection<TSchema>>;
+    rename(newName: string, options: { dropTarget?: boolean, session?: ClientSession }, callback: MongoCallback<Collection<TSchema>>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#replaceOne */
+    replaceOne(filter: Object, doc: Object, callback: MongoCallback<ReplaceWriteOpResult>): void;
+    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<ReplaceWriteOpResult>;
+    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<ReplaceWriteOpResult>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#save */
     /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
     save(doc: Object, callback: MongoCallback<WriteOpResult>): void;
     /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
-    save(doc: Object, options?: CollectionOptions): Promise<WriteOpResult>;
+    save(doc: Object, options?: CommonOptions): Promise<WriteOpResult>;
     /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
-    save(doc: Object, options: CollectionOptions, callback: MongoCallback<WriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#stats
+    save(doc: Object, options: CommonOptions, callback: MongoCallback<WriteOpResult>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#stats */
     stats(callback: MongoCallback<CollStats>): void;
-    stats(options?: { scale: number }): Promise<CollStats>;
-    stats(options: { scale: number }, callback: MongoCallback<CollStats>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#update
+    stats(options?: { scale: number, session?: ClientSession }): Promise<CollStats>;
+    stats(options: { scale: number, session?: ClientSession }, callback: MongoCallback<CollStats>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#update */
     /** @deprecated use updateOne, updateMany or bulkWrite */
     update(filter: Object, update: Object, callback: MongoCallback<WriteOpResult>): void;
     /** @deprecated use updateOne, updateMany or bulkWrite */
     update(filter: Object, update: Object, options?: ReplaceOneOptions & { multi?: boolean }): Promise<WriteOpResult>;
     /** @deprecated use updateOne, updateMany or bulkWrite */
     update(filter: Object, update: Object, options: ReplaceOneOptions & { multi?: boolean }, callback: MongoCallback<WriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateMany
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#updateMany */
     updateMany(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    updateMany(filter: Object, update: Object, options?: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }): Promise<UpdateWriteOpResult>;
-    updateMany(filter: Object, update: Object, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback: MongoCallback<UpdateWriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateOne
+    updateMany(filter: Object, update: Object, options?: CommonOptions & { upsert?: boolean }): Promise<UpdateWriteOpResult>;
+    updateMany(filter: Object, update: Object, options: CommonOptions & { upsert?: boolean }, callback: MongoCallback<UpdateWriteOpResult>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#updateOne */
     updateOne(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
     updateOne(filter: Object, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
     updateOne(filter: Object, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
@@ -810,7 +807,7 @@ export interface WiredTigerData {
     };
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#aggregate */
 export interface CollectionAggregationOptions {
     readPreference?: ReadPreference | string;
     // Return the query as cursor, on 2.6 > it returns as a real cursor
@@ -826,16 +823,18 @@ export interface CollectionAggregationOptions {
     maxTimeMS?: number;
     // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
     bypassDocumentValidation?: boolean;
+    raw?: boolean;
+    promoteLongs?: boolean;
+    promoteValues?: boolean;
+    promoteBuffers?: boolean;
+    collation?: Object;
+    comment?: string
+    session?: ClientSession;
+                                  
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#insertMany
-export interface CollectionInsertManyOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertMany */
+export interface CollectionInsertManyOptions extends CommonOptions {
     // Serialize functions on any object.
     serializeFunctions?: boolean;
     //Force server to assign _id values instead of driver.
@@ -846,14 +845,8 @@ export interface CollectionInsertManyOptions {
     ordered?: boolean;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
-export interface CollectionBluckWriteOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#bulkWrite */
+export interface CollectionBluckWriteOptions extends CommonOptions {
     // Serialize functions on any object.
     serializeFunctions?: boolean;
     // Execute write operation in ordered or unordered fashion.
@@ -862,7 +855,7 @@ export interface CollectionBluckWriteOptions {
     bypassDocumentValidation?: boolean;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~BulkWriteOpResult
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~BulkWriteOpResult */
 export interface BulkWriteOpResultObject {
     insertedCount?: number;
     matchedCount?: number;
@@ -874,7 +867,7 @@ export interface BulkWriteOpResultObject {
     result?: any;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#count */
 export interface MongoCountPreferences {
     // The limit of documents to count.
     limit?: number;
@@ -884,9 +877,11 @@ export interface MongoCountPreferences {
     hint?: string;
     // The preferred read preference
     readPreference?: ReadPreference | string;
+    maxTimeMS?: number;
+    session?: ClientSession;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~deleteWriteOpResult
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~deleteWriteOpResult */
 export interface DeleteWriteOpResultObject {
     //The raw result returned from MongoDB, field will vary depending on server version.
     result: {
@@ -901,7 +896,7 @@ export interface DeleteWriteOpResultObject {
     deletedCount?: number;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~findAndModifyWriteOpResult
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~findAndModifyWriteOpResult */
 export interface FindAndModifyWriteOpResultObject<TSchema = Default> {
     //Document returned from findAndModify command.
     value?: TSchema;
@@ -911,24 +906,26 @@ export interface FindAndModifyWriteOpResultObject<TSchema = Default> {
     ok?: number;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndReplace */
 export interface FindOneAndReplaceOption {
     projection?: Object;
     sort?: Object;
     maxTimeMS?: number;
     upsert?: boolean;
     returnOriginal?: boolean;
+    session?: ClientSession;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoHaystackSearch */
 export interface GeoHaystackSearchOptions {
     readPreference?: ReadPreference | string;
     maxDistance?: number;
     search?: Object;
     limit?: number;
+    session?: ClientSession;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoNear */
 export interface GeoNearOptions {
     readPreference?: ReadPreference | string;
     num?: number;
@@ -941,37 +938,27 @@ export interface GeoNearOptions {
     includeLocs?: boolean;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Code.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Code.html */
 export class Code {
     constructor(code: string | Function, scope?: Object)
     code: string | Function;
     scope: any;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
-export interface CollectionOptions {
-    //The write concern.
-    w?: number | string;
-    //The write concern timeout.
-    wtimeout?: number;
-    //Specify a journal write concern.
-    j?: boolean;
-}
-
-//http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/OrderedBulkOperation.html */
 export interface OrderedBulkOperation {
     length: number;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#execute
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/OrderedBulkOperation.html#execute */
     execute(callback: MongoCallback<BulkWriteResult>): void;
     execute(options?: FSyncOptions): Promise<BulkWriteResult>;
     execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#find
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/OrderedBulkOperation.html#find */
     find(selector: Object): FindOperatorsOrdered;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#insert
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/OrderedBulkOperation.html#insert */
     insert(doc: Object): OrderedBulkOperation;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/BulkWriteResult.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/BulkWriteResult.html */
 export interface BulkWriteResult {
     ok: number;
     nInserted: number;
@@ -992,7 +979,7 @@ export interface BulkWriteResult {
     hasWriteErrors(): boolean;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteError.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/WriteError.html */
 export interface WriteError {
     //Write concern error code.
     code: number;
@@ -1002,7 +989,7 @@ export interface WriteError {
     errmsg: string;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteConcernError.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/WriteConcernError.html */
 export interface WriteConcernError {
     //Write concern error code.
     code: number;
@@ -1010,7 +997,7 @@ export interface WriteConcernError {
     errmsg: string;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsOrdered.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/FindOperatorsOrdered.html */
 export interface FindOperatorsOrdered {
     delete(): OrderedBulkOperation;
     deleteOne(): OrderedBulkOperation;
@@ -1020,21 +1007,21 @@ export interface FindOperatorsOrdered {
     upsert(): FindOperatorsOrdered;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/UnorderedBulkOperation.html */
 export interface UnorderedBulkOperation {
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/lib_bulk_unordered.js.html line 339
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/lib_bulk_unordered.js.html line 339 */
     length: number;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#execute
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/UnorderedBulkOperation.html#execute */
     execute(callback: MongoCallback<BulkWriteResult>): void;
     execute(options?: FSyncOptions): Promise<BulkWriteResult>;
     execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#find
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/UnorderedBulkOperation.html#find */
     find(selector: Object): FindOperatorsUnordered;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#insert
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/UnorderedBulkOperation.html#insert */
     insert(doc: Object): UnorderedBulkOperation;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsUnordered.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/FindOperatorsUnordered.html */
 export interface FindOperatorsUnordered {
     length: number;
     remove(): UnorderedBulkOperation;
@@ -1045,31 +1032,37 @@ export interface FindOperatorsUnordered {
     upsert(): FindOperatorsUnordered;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOne
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
 export interface FindOneOptions {
-    limit?: number,
-    sort?: Array<any> | Object,
-    fields?: Object,
-    skip?: number,
-    hint?: Object,
-    explain?: boolean,
-    snapshot?: boolean,
-    timeout?: boolean,
-    tailable?: boolean,
-    batchSize?: number,
-    returnKey?: boolean,
-    maxScan?: number,
-    min?: number,
-    max?: number,
-    showDiskLoc?: boolean,
-    comment?: string,
-    raw?: boolean,
-    readPreference?: ReadPreference | string,
-    partial?: boolean,
-    maxTimeMs?: number
+    limit?: number;
+    sort?: Array<any> | Object;
+    projection?: Object;
+    fields?: Object; // Deprecated Use options.projection instead
+    skip?: number;
+    hint?: Object;
+    explain?: boolean;
+    snapshot?: boolean;
+    timeout?: boolean;
+    tailable?: boolean;
+    batchSize?: number;
+    returnKey?: boolean;
+    maxScan?: number;
+    min?: number;
+    max?: number;
+    showDiskLoc?: boolean;
+    comment?: string;
+    raw?: boolean;
+    promoteLongs?: boolean;
+    promoteValues?: boolean;
+    promoteBuffers?: boolean;
+    readPreference?: ReadPreference | string;
+    partial?: boolean;
+    maxTimeMs?: number;
+    collation?: Object;
+    session?: ClientSession;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertWriteOpResult
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~insertWriteOpResult */
 export interface InsertWriteOpResult {
     insertedCount: number;
     ops: Array<any>;
@@ -1078,14 +1071,8 @@ export interface InsertWriteOpResult {
     result: { ok: number, n: number }
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
-export interface CollectionInsertOneOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertOne */
+export interface CollectionInsertOneOptions extends CommonOptions {
     // Serialize functions on any object.
     serializeFunctions?: boolean;
     //Force server to assign _id values instead of driver.
@@ -1094,7 +1081,7 @@ export interface CollectionInsertOneOptions {
     bypassDocumentValidation?: boolean
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertOneWriteOpResult
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~insertOneWriteOpResult */
 export interface InsertOneWriteOpResult {
     insertedCount: number;
     ops: Array<any>;
@@ -1103,24 +1090,22 @@ export interface InsertOneWriteOpResult {
     result: { ok: number, n: number }
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#parallelCollectionScan */
 export interface ParallelCollectionScanOptions {
     readPreference?: ReadPreference | string;
     batchSize?: number;
     numCursors?: number;
     raw?: boolean;
+    session?: ClientSession;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
-export interface ReplaceOneOptions {
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#replaceOne */
+export interface ReplaceOneOptions extends CommonOptions {
     upsert?: boolean;
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
     bypassDocumentValidation?: boolean;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~updateWriteOpResult
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~updateWriteOpResult */
 export interface UpdateWriteOpResult {
     result: { ok: number, n: number, nModified: number };
     connection: any;
@@ -1130,7 +1115,12 @@ export interface UpdateWriteOpResult {
     upsertedId: { _id: ObjectID };
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
+/** https://github.com/mongodb/node-mongodb-native/blob/2.2/lib/collection.js#L957 */
+export interface ReplaceWriteOpResult extends UpdateWriteOpResult {
+    ops: Array<any>
+}
+
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#mapReduce */
 export interface MapReduceOptions {
     readPreference?: ReadPreference | string;
     out?: Object;
@@ -1142,107 +1132,108 @@ export interface MapReduceOptions {
     scope?: Object;
     jsMode?: boolean;
     verbose?: boolean;
-    bypassDocumentValidation?: boolean
+    bypassDocumentValidation?: boolean;
+    session?: ClientSession;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~WriteOpResult
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~WriteOpResult */
 export interface WriteOpResult {
     ops: Array<any>;
     connection: any;
     result: any;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#~resultCallback */
 export type CursorResult = any | void | boolean;
 
 type Default = any;
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html */
 export class Cursor<T = Default> extends Readable {
 
     sortValue: string;
     timeout: boolean;
     readPreference: ReadPreference;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#addCursorFlag
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#addCursorFlag */
     addCursorFlag(flag: string, value: boolean): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#addQueryModifier
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#addQueryModifier */
     addQueryModifier(name: string, value: boolean): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#batchSize
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#batchSize */
     batchSize(value: number): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#clone
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#clone */
     clone(): Cursor<T>; // still returns the same type
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#close */
     close(): Promise<CursorResult>;
     close(callback: MongoCallback<CursorResult>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#comment
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#comment */
     comment(value: string): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.2/api/Cursor.html#count
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#count */
     count(callback: MongoCallback<number>): void;
     count(applySkipLimit: boolean, callback: MongoCallback<number>): void;
     count(options: CursorCommentOptions, callback: MongoCallback<number>): void;
     count(applySkipLimit: boolean, options: CursorCommentOptions, callback: MongoCallback<number>): void;
     count(applySkipLimit?: boolean, options?: CursorCommentOptions): Promise<number>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#explain
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#explain */
     explain(): Promise<CursorResult>;
     explain(callback: MongoCallback<CursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#filter
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#filter */
     filter(filter: Object): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#forEach
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#forEach */
     forEach(iterator: IteratorCallback<T>, callback: EndCallback): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hasNext
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#hasNext */
     hasNext(): Promise<boolean>;
     hasNext(callback: MongoCallback<boolean>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hint
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#hint */
     hint(hint: Object): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#isClosed
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#isClosed */
     isClosed(): boolean;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#limit
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#limit */
     limit(value: number): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#map
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#map */
     map(transform: Function): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#max
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#max */
     max(max: number): Cursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxAwaitTimeMS
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#maxAwaitTimeMS */
     maxAwaitTimeMS(value: number): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxScan
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#maxScan */
     maxScan(maxScan: Object): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxTimeMS
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#maxTimeMS */
     maxTimeMS(value: number): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#min
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#min */
     min(min: number): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#next */
     next(): Promise<T>;
     next(callback: MongoCallback<T>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#project
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#project */
     project(value: Object): Cursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#read
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#read */
     read(size: number): string | Buffer | void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#next */
     returnKey(returnKey: Object): Cursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#rewind
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#rewind */
     rewind(): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setCursorOption
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#setCursorOption */
     setCursorOption(field: string, value: Object): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setReadPreference
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#setReadPreference */
     setReadPreference(readPreference: string | ReadPreference): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#showRecordId
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#showRecordId */
     showRecordId(showRecordId: Object): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#skip
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#skip */
     skip(value: number): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#snapshot
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#snapshot */
     snapshot(snapshot: Object): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#sort
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#sort */
     sort(keyOrList: string | Object[] | Object, direction?: number): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#stream
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#stream */
     stream(options?: { transform?: Function }): Cursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#toArray
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#toArray */
     toArray(): Promise<T[]>;
     toArray(callback: MongoCallback<T[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unshift
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#unshift */
     unshift(stream: Buffer | string): void;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#count */
 export interface CursorCommentOptions {
     skip?: number;
     limit?: number;
@@ -1251,123 +1242,123 @@ export interface CursorCommentOptions {
     readPreference?: ReadPreference | string;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~iteratorCallback
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#~iteratorCallback */
 export interface IteratorCallback<T> {
     (doc: T): void;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~endCallback
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#~endCallback */
 export interface EndCallback {
     (error: MongoError): void;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#~resultCallback
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#~resultCallback */
 export type AggregationCursorResult = any | void;
-//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html */
 export class AggregationCursor<T = Default> extends Readable {
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#batchSize
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#batchSize */
     batchSize(value: number): AggregationCursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#clone
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#clone */
     clone(): AggregationCursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#close
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#close */
     close(): Promise<AggregationCursorResult>;
     close(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#each
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#each */
     each(callback: MongoCallback<AggregationCursorResult>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#explain
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#explain */
     explain(): Promise<AggregationCursorResult>;
     explain(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#geoNear
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#geoNear */
     geoNear(document: Object): AggregationCursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#group
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#group */
     group(document: Object): AggregationCursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#isClosed
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#isClosed */
     isClosed(): boolean;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#limit
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#limit */
     limit(value: number): AggregationCursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#match
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#match */
     match(document: Object): AggregationCursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#maxTimeMS
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#maxTimeMS */
     maxTimeMS(value: number): AggregationCursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#next
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#next */
     next(): Promise<T>;
     next(callback: MongoCallback<T>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#out
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#out */
     out(destination: string): AggregationCursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#project
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#project */
     project(document: Object): AggregationCursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#read
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#read */
     read(size: number): string | Buffer | void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#redact
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#redact */
     redact(document: Object): AggregationCursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#rewind
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#rewind */
     rewind(): AggregationCursor<T>;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#setEncoding
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#setEncoding */
     skip(value: number): AggregationCursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#sort
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#sort */
     sort(document: Object): AggregationCursor<T>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#toArray
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#toArray */
     toArray(): Promise<T[]>;
     toArray(callback: MongoCallback<T[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unshift
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#unshift */
     unshift(stream: Buffer | string): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unwind
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#unwind */
     unwind(field: string): AggregationCursor<T>;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html */
 export class CommandCursor extends Readable {
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#batchSize
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#batchSize */
     batchSize(value: number): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#clone
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#clone */
     clone(): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#close
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#close */
     close(): Promise<AggregationCursorResult>;
     close(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#each
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#each */
     each(callback: MongoCallback<AggregationCursorResult>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#isClosed
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#isClosed */
     isClosed(): boolean;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#maxTimeMS
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#maxTimeMS */
     maxTimeMS(value: number): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#next
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#next */
     next(): Promise<AggregationCursorResult>;
     next(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#read
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#read */
     read(size: number): string | Buffer | void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#rewind
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#rewind */
     rewind(): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setReadPreference
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#setReadPreference */
     setReadPreference(readPreference: string | ReadPreference): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#toArray
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#toArray */
     toArray(): Promise<any[]>;
     toArray(callback: MongoCallback<any[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unshift
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#unshift */
     unshift(stream: Buffer | string): void;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html */
 export class GridFSBucket {
     constructor(db: Db, options?: GridFSBucketOptions);
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#delete
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#delete */
     delete(id: ObjectID, callback?: GridFSBucketErrorCallback): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#drop
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#drop */
     drop(callback?: GridFSBucketErrorCallback): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#find
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#find */
     find(filter?: Object, options?: GridFSBucketFindOptions): Cursor<any>;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openDownloadStream
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openDownloadStream */
     openDownloadStream(id: ObjectID, options?: { start: number, end: number }): GridFSBucketReadStream;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openDownloadStreamByName
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openDownloadStreamByName */
     openDownloadStreamByName(filename: string, options?: { revision: number, start: number, end: number }): GridFSBucketReadStream;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStream
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openUploadStream */
     openUploadStream(filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStreamWithId
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openUploadStreamWithId */
     openUploadStreamWithId(id: string | number | Object, filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#rename
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#rename */
     rename(id: ObjectID, filename: string, callback?: GridFSBucketErrorCallback): void;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html */
 export interface GridFSBucketOptions {
     bucketName?: string;
     chunkSizeBytes?: number;
@@ -1375,12 +1366,12 @@ export interface GridFSBucketOptions {
     ReadPreference?: Object;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#~errorCallback
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#~errorCallback */
 export interface GridFSBucketErrorCallback {
     (err?: MongoError): void;
 }
 
-// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#find
+/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#find */
 export interface GridFSBucketFindOptions {
     batchSize?: number;
     limit?: number;
@@ -1390,7 +1381,7 @@ export interface GridFSBucketFindOptions {
     sort?: Object;
 }
 
-// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStream
+/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openUploadStream */
 export interface GridFSBucketOpenUploadStreamOptions {
     chunkSizeBytes?: number,
     metadata?: Object,
@@ -1398,12 +1389,12 @@ export interface GridFSBucketOpenUploadStreamOptions {
     aliases?: Array<string>
 }
 
-// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
+/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketReadStream.html */
 export class GridFSBucketReadStream extends Readable {
     constructor(chunks: Collection<any>, files: Collection<any>, readPreference: Object, filter: Object, options?: GridFSBucketReadStreamOptions);
 }
 
-// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
+/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketReadStream.html */
 export interface GridFSBucketReadStreamOptions {
     sort?: number,
     skip?: number,
@@ -1411,12 +1402,12 @@ export interface GridFSBucketReadStreamOptions {
     end?: number
 }
 
-// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketWriteStream.html
+/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketWriteStream.html */
 export class GridFSBucketWriteStream extends Writable {
     constructor(bucket: GridFSBucket, filename: string, options?: GridFSBucketWriteStreamOptions);
 }
 
-// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketWriteStream.html
+/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketWriteStream.html */
 export interface GridFSBucketWriteStreamOptions {
     id?: string | number | Object,
     chunkSizeBytes?: number,
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index 2b8c49d186..36428d786f 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -2,72 +2,72 @@
 import mongodb = require('mongodb');
 var MongoClient = mongodb.MongoClient;
 
-var format  = require('util').format;
-let options = {
-    authSource           : ' ',
-    w                    : 1,
-    wtimeout             : 300,
-    j                    : true,
-    bufferMaxEntries     : 1000,
-    readPreference       : 'ReadPreference | string',
-    promoteValues        : {},
-    pkFactory            : {},
-    poolSize             : 1,
+var format = require('util').format;
+let options: mongodb.MongoClientOptions = {
+    authSource: ' ',
+    w: 1,
+    wtimeout: 300,
+    j: true,
+    bufferMaxEntries: 1000,
+    readPreference: 'ReadPreference | string',
+    promoteValues: {},
+    pkFactory: {},
+    poolSize: 1,
 
-    socketOptions        : {},
+    socketOptions: {},
 
-    reconnectTries       : 123456,
-    reconnectInterval    : 123456,
+    reconnectTries: 123456,
+    reconnectInterval: 123456,
 
-    ssl                  : true,
-    sslValidate          : {},
-    checkServerIdentity  : function (){ },
-    sslCA                : ['str'],
-    sslCert              : new Buffer(999),
-    sslKey               : new Buffer(999),
-    sslPass              : new Buffer(999)
+    ssl: true,
+    sslValidate: {},
+    checkServerIdentity: function () { },
+    sslCA: ['str'],
+    sslCert: new Buffer(999),
+    sslKey: new Buffer(999),
+    sslPass: new Buffer(999)
 }
-    MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function(err: mongodb.MongoError, db: mongodb.Db) {
+MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mongodb.MongoError, client: mongodb.MongoClient) {
     if (err) throw err;
-
+    const db = client.db('test');
     var collection = db.collection('test_insert');
-    collection.insertOne({ a: 2 }, function(err: mongodb.MongoError, docs: any) {
+    collection.insertOne({ a: 2 }, function (err: mongodb.MongoError, docs: any) {
 
-        collection.count(function(err: mongodb.MongoError, count: any) {
+        collection.count(function (err: mongodb.MongoError, count: any) {
             console.log(format("count = %s", count));
         });
 
         // Locate all the entries using find
-        collection.find({}).toArray(function(err: mongodb.MongoError, results: any) {
+        collection.find({}).toArray(function (err: mongodb.MongoError, results: any) {
             console.dir(results);
             // Let's close the db
-            db.close();
+            client.close();
         });
 
         // Get some statistics
-        collection.stats(function(err: mongodb.MongoError, stats: any) {
+        collection.stats(function (err: mongodb.MongoError, stats: any) {
             console.log(stats.count + " documents");
         });
 
         //
-        collection.stats().then(function(stats){
+        collection.stats().then(function (stats) {
             console.log(stats.wiredTiger.cache['bytes currently in the cache']);
         })
 
-        collection.createIndex({}, {partialFilterExpression: {rating: {$exists: 1}}})
+        collection.createIndex({}, { partialFilterExpression: { rating: { $exists: 1 } } })
     });
 
     {
-    let cursor: mongodb.Cursor;
+        let cursor: mongodb.Cursor;
         cursor = collection.find();
-        cursor = cursor.addCursorFlag('',true);
-        cursor = cursor.addQueryModifier('',true);
+        cursor = cursor.addCursorFlag('', true);
+        cursor = cursor.addQueryModifier('', true);
         cursor = cursor.batchSize(1);
         cursor = cursor.comment('');
         cursor = cursor.filter(1);
         cursor = cursor.hint({});
         cursor = cursor.limit(1);
-        cursor = cursor.map(function (result) {});
+        cursor = cursor.map(function (result) { });
         cursor = cursor.max(1);
         cursor = cursor.min(1);
         cursor = cursor.maxAwaitTimeMS(1);
@@ -75,7 +75,7 @@ let options = {
         cursor = cursor.maxTimeMS(1);
         cursor = cursor.project({});
         cursor = cursor.returnKey({});
-        cursor = cursor.setCursorOption('',{});
+        cursor = cursor.setCursorOption('', {});
         cursor = cursor.setReadPreference('');
         cursor = cursor.showRecordId({});
         cursor = cursor.skip(1);
@@ -85,17 +85,17 @@ let options = {
     }
     // Collection .findM<T>() & .agggregate<T>() generic tests
     {
-    let bag : {cost: number, color: string};
-    type bag = typeof bag;
-    let cursor: mongodb.Cursor<bag> = collection.find<bag>({color: 'black'})
-        cursor.toArray(function (err,r) { r[0].cost} );
-        cursor.forEach(function (bag  ) { bag.color }, () => {});
-        collection.findOne({ color: 'white' }).then(b => { let _b:bag = b; })
+        let bag: { cost: number, color: string };
+        type bag = typeof bag;
+        let cursor: mongodb.Cursor<bag> = collection.find<bag>({ color: 'black' })
+        cursor.toArray(function (err, r) { r[0].cost });
+        cursor.forEach(function (bag) { bag.color }, () => { });
+        collection.findOne({ color: 'white' }).then(b => { let _b: bag = b; })
         collection.findOne<bag>({ color: 'white' }).then(b => { b.cost; })
     }
     {
-    let payment: {total: number};
-    type payment = typeof payment;
-    let cursor: mongodb.AggregationCursor<payment> = collection.aggregate<payment>([{}])
+        let payment: { total: number };
+        type payment = typeof payment;
+        let cursor: mongodb.AggregationCursor<payment> = collection.aggregate<payment>([{}])
     }
 })
diff --git a/types/mongodb/tslint.json b/types/mongodb/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/mongodb/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongodb/v1/tslint.json b/types/mongodb/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongodb/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongodb/v2/index.d.ts b/types/mongodb/v2/index.d.ts
new file mode 100644
index 0000000000..6cf21c04b9
--- /dev/null
+++ b/types/mongodb/v2/index.d.ts
@@ -0,0 +1,1435 @@
+// Type definitions for MongoDB v2.2
+// Project: https://github.com/mongodb/node-mongodb-native/tree/2.2
+// Definitions by: Federico Caselli <https://github.com/CaselIT>
+//                 Alan Marcell <https://github.com/alanmarcell>
+//                 Gady Piazza <https://github.com/kikar>
+//                 Jason Dreyzehner <https://github.com/bitjson>
+//                 Gaurav Lahoti <https://github.com/dante-101>
+//                 Mariano Cortesi <https://github.com/mcortesi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// Documentation : http://mongodb.github.io/node-mongodb-native/2.2/api/
+
+/// <reference types="node" />
+/// <reference types="bson" />
+
+import { ObjectID } from 'bson';
+import { EventEmitter } from 'events';
+import { Readable, Writable } from "stream";
+
+export function connect(uri: string, options?: MongoClientOptions): Promise<Db>;
+export function connect(uri: string, callback: MongoCallback<Db>): void;
+export function connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
+
+export { Binary, Double, Long, Decimal128, MaxKey, MinKey, ObjectID, ObjectId, Timestamp, DBRef } from 'bson';
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
+export class MongoClient {
+    constructor();
+
+    static connect(uri: string, callback: MongoCallback<Db>): void;
+    static connect(uri: string, options?: MongoClientOptions): Promise<Db>;
+    static connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
+
+    connect(uri: string, callback: MongoCallback<Db>): void;
+    connect(uri: string, options?: MongoClientOptions): Promise<Db>;
+    connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
+}
+
+export interface MongoCallback<T> {
+    (error: MongoError, result: T): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/MongoError.html
+export class MongoError extends Error {
+    constructor(message: string);
+    static create(options: Object): MongoError;
+    code?: number;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/MongoClient.html#.connect
+export interface MongoClientOptions extends
+    DbCreateOptions,
+    ServerOptions,
+    MongosOptions,
+    ReplSetOptions,
+    SocketOptions,
+    SSLOptions,
+    HighAvailabilityOptions {
+    // The logging level (error/warn/info/debug)
+    loggerLevel?: string;
+    // Custom logger object
+    logger?: Object;
+    // Default: false;
+    validateOptions?: Object;
+}
+
+export interface SSLOptions {
+    // Default:5; Number of connections for each server instance
+    poolSize?: number;
+    // Use ssl connection (needs to have a mongod server with ssl support)
+    ssl?: boolean;
+    // Default: true; Validate mongod server certificate against ca (mongod server >=2.4 with ssl support required)
+    sslValidate?: Object;
+    // Default: true; Server identity checking during SSL
+    checkServerIdentity?: boolean | Function;
+    // Array of valid certificates either as Buffers or Strings
+    sslCA?: Array<Buffer | string>;
+    // SSL Certificate revocation list binary buffer
+    sslCRL?: Buffer;
+    // SSL Certificate binary buffer
+    sslCert?: Buffer | string;
+    // SSL Key file binary buffer
+    sslKey?: Buffer | string;
+    // SSL Certificate pass phrase
+    sslPass?: Buffer | string;
+    // String containing the server name requested via TLS SNI.
+    servername?: string;
+}
+
+export interface HighAvailabilityOptions {
+    // Default: true; Turn on high availability monitoring.
+    ha?: boolean;
+    // Default: 10000; The High availability period for replicaset inquiry
+    haInterval?: number;
+    // Default: false;
+    domainsEnabled?: boolean;
+}
+
+// See http://mongodb.github.io/node-mongodb-native/2.2/api/ReadPreference.html
+export class ReadPreference {
+    constructor(mode: string, tags: Object);
+    mode: string;
+    tags: any;
+    options: { maxStalenessSeconds?: number }; // Max Secondary Read Stalleness in Seconds
+    static PRIMARY: string;
+    static PRIMARY_PREFERRED: string;
+    static SECONDARY: string;
+    static SECONDARY_PREFERRED: string;
+    static NEAREST: string;
+    isValid(mode: string): boolean;
+    static isValid(mode: string): boolean;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html
+export interface DbCreateOptions {
+
+    // If the database authentication is dependent on another databaseName.
+    authSource?: string;
+    // Default: null;https://docs.mongodb.com/manual/reference/write-concern/#write-concern
+    w?: number | string;
+    // The write concern timeout to finish (combining with w option).
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Default: false; Force server to create _id fields instead of client.
+    forceServerObjectId?: boolean;
+    // Default: false; Use c++ bson parser.
+    native_parser?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    // Specify if the BSON serializer should ignore undefined fields.
+    ignoreUndefined?: boolean;
+    // Return document results as raw BSON buffers.
+    raw?: boolean;
+    // Default: true; Promotes Long values to number if they fit inside the 53 bits resolution.
+    promoteLongs?: boolean;
+    // Default: -1 (unlimited); Amount of operations the driver buffers up untill discard any new ones
+    promoteBuffers?: number;
+    // the prefered read preference. use 'ReadPreference' class.
+    readPreference?: ReadPreference | string;
+    // Default: true; Promotes BSON values to native types where possible, set to false to only receive wrapper types.
+    promoteValues?: Object;
+    // Custom primary key factory to generate _id values (see Custom primary keys).
+    pkFactory?: Object;
+    // ES6 compatible promise constructor
+    promiseLibrary?: Object;
+    // https://docs.mongodb.com/manual/reference/read-concern/#read-concern
+    readConcern?: { level?: Object };
+    // Sets a cap on how many operations the driver will buffer up before giving up on getting a
+    // working connection, default is -1 which is unlimited.
+    bufferMaxEntries?: number;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
+export interface SocketOptions {
+    // Reconnect on error. default:false
+    autoReconnect?: boolean;
+    // TCP Socket NoDelay option. default:true
+    noDelay?: boolean;
+    // TCP KeepAlive on the socket with a X ms delay before start. default:0
+    keepAlive?: number;
+    // TCP Connection timeout setting. default 0
+    connectTimeoutMS?: number;
+    // TCP Socket timeout setting. default 0
+    socketTimeoutMS?: number;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
+export interface ServerOptions extends SSLOptions {
+    // Default: 30;
+    reconnectTries?: number;
+    // Default: 1000;
+    reconnectInterval?: number;
+    // Default: true;
+    monitoring?: boolean
+    socketOptions?: SocketOptions;
+    // Default: 10000; The High availability period for replicaset inquiry
+    haInterval?: number;
+    // Default: false;
+    domainsEnabled?: boolean;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Mongos.html
+export interface MongosOptions extends SSLOptions, HighAvailabilityOptions {
+    // Default: 15; Cutoff latency point in MS for MongoS proxy selection
+    acceptableLatencyMS?: number;
+    socketOptions?: SocketOptions;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/ReplSet.html
+export interface ReplSetOptions extends SSLOptions, HighAvailabilityOptions {
+    // The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+    maxStalenessSeconds?: number;
+    // The name of the replicaset to connect to.
+    replicaSet?: string;
+    // Default: 15 ; Range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms)
+    secondaryAcceptableLatencyMS?: number;
+    connectWithNoPrimary?: boolean;
+    socketOptions?: SocketOptions;
+}
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
+export class Db extends EventEmitter {
+    constructor(databaseName: string, serverConfig: Server | ReplSet | Mongos, options?: DbCreateOptions);
+
+    serverConfig: Server | ReplSet | Mongos;
+    bufferMaxEntries: number;
+    databaseName: string;
+    options: any;
+    native_parser: boolean;
+    slaveOk: boolean;
+    writeConcern: any;
+
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
+    addUser(username: string, password: string, callback: MongoCallback<any>): void;
+    addUser(username: string, password: string, options?: DbAddUserOptions): Promise<any>;
+    addUser(username: string, password: string, options: DbAddUserOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#admin
+    admin(): Admin;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#authenticate
+    authenticate(userName: string, password: string, callback: MongoCallback<any>): void;
+    authenticate(userName: string, password: string, options?: { authMechanism: string }): Promise<any>;
+    authenticate(userName: string, password: string, options: { authMechanism: string }, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#close
+    close(callback: MongoCallback<void>): void;
+    close(forceClose?: boolean): Promise<void>;
+    close(forceClose: boolean, callback: MongoCallback<void>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+    collection<TSchema = Default>(name: string): Collection<TSchema>;
+    collection<TSchema = Default>(name: string, callback: MongoCallback<Collection<TSchema>>): Collection<TSchema>;
+    collection<TSchema = Default>(name: string, options: DbCollectionOptions, callback: MongoCallback<Collection<TSchema>>): Collection<TSchema>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collections
+    collections(): Promise<Collection<Default>[]>;
+    collections(callback: MongoCallback<Collection<Default>[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#command
+    command(command: Object, callback: MongoCallback<any>): void;
+    command(command: Object, options?: { readPreference: ReadPreference | string }): Promise<any>;
+    command(command: Object, options: { readPreference: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
+    createCollection<TSchema = Default>(name: string, callback: MongoCallback<Collection<TSchema>>): void;
+    createCollection<TSchema = Default>(name: string, options?: CollectionCreateOptions): Promise<Collection<TSchema>>;
+    createCollection<TSchema = Default>(name: string, options: CollectionCreateOptions, callback: MongoCallback<Collection<TSchema>>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
+    createIndex(name: string, fieldOrSpec: string | Object, callback: MongoCallback<any>): void;
+    createIndex(name: string, fieldOrSpec: string | Object, options?: IndexOptions): Promise<any>;
+    createIndex(name: string, fieldOrSpec: string | Object, options: IndexOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#db
+    db(dbName: string): Db;
+    db(dbName: string, options: { noListener?: boolean, returnNonCachedInstance?: boolean }): Db;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropCollection
+    dropCollection(name: string): Promise<boolean>;
+    dropCollection(name: string, callback: MongoCallback<boolean>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropDatabase
+    dropDatabase(): Promise<any>;
+    dropDatabase(callback: MongoCallback<any>): void;
+
+    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#ensureIndex
+    // ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback: Function): void;
+    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#eval
+    // eval(code: any, parameters: any[], options?: any, callback?: MongoCallback<any>): void;
+
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#executeDbAdminCommand
+    executeDbAdminCommand(command: Object, callback: MongoCallback<any>): void;
+    executeDbAdminCommand(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
+    executeDbAdminCommand(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#indexInformation
+    indexInformation(name: string, callback: MongoCallback<any>): void;
+    indexInformation(name: string, options?: { full?: boolean, readPreference?: ReadPreference | string }): Promise<any>;
+    indexInformation(name: string, options: { full?: boolean, readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#listCollections
+    listCollections(filter?: Object, options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#logout
+    logout(callback: MongoCallback<any>): void;
+    logout(options?: { dbName?: string }): Promise<any>;
+    logout(options: { dbName?: string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#open
+    open(): Promise<Db>;
+    open(callback: MongoCallback<Db>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#removeUser
+    removeUser(username: string, callback: MongoCallback<any>): void;
+    removeUser(username: string, options?: { w?: number | string, wtimeout?: number, j?: boolean }): Promise<any>;
+    removeUser(username: string, options: { w?: number | string, wtimeout?: number, j?: boolean }, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#renameCollection
+    renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, callback: MongoCallback<Collection<TSchema>>): void;
+    renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
+    renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#stats
+    stats(callback: MongoCallback<any>): void;
+    stats(options?: { scale?: number }): Promise<any>;
+    stats(options: { scale?: number }, callback: MongoCallback<any>): void;
+}
+
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+export class Server extends EventEmitter {
+    constructor(host: string, port: number, options?: ServerOptions);
+
+    connections(): Array<any>;
+}
+
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+export class ReplSet extends EventEmitter {
+    constructor(servers: Array<Server>, options?: ReplSetOptions);
+
+    connections(): Array<any>;
+}
+
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+export class Mongos extends EventEmitter {
+    constructor(servers: Array<Server>, options?: MongosOptions);
+
+    connections(): Array<any>;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
+export interface DbAddUserOptions {
+    w?: string | number;
+    wtimeout?: number;
+    j?: boolean;
+    customData?: Object;
+    roles?: Object[];
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createCollection
+export interface CollectionCreateOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    raw?: boolean;
+    pkFactory?: Object;
+    readPreference?: ReadPreference | string;
+    serializeFunctions?: boolean;
+    strict?: boolean;
+    capped?: boolean;
+    autoIndexId?: boolean;
+    size?: number;
+    max?: number;
+    flags?:	number;
+    storageEngine?:	object;
+    validator?: object;
+    validationLevel?: "off" | "strict" | "moderate";
+    validationAction?: "error" | "warn";
+    indexOptionDefaults?: object;
+    viewOn?: string;
+    pipeline?: any[];
+    collation?: object;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+export interface DbCollectionOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    raw?: boolean;
+    pkFactory?: Object;
+    readPreference?: ReadPreference | string;
+    serializeFunctions?: boolean;
+    strict?: boolean;
+    readConcern?: { level: Object };
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createIndex
+export interface IndexOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Creates an unique index.
+    unique?: boolean;
+    // Creates a sparse index.
+    sparse?: boolean;
+    // Creates the index in the background, yielding whenever possible.
+    background?: boolean;
+    // A unique index cannot be created on a key that has pre-existing duplicate values.
+    // If you would like to create the index anyway, keeping the first document the database indexes and
+    // deleting all subsequent documents that have duplicate value
+    dropDups?: boolean;
+    // For geo spatial indexes set the lower bound for the co-ordinates.
+    min?: number;
+    // For geo spatial indexes set the high bound for the co-ordinates.
+    max?: number;
+    // Specify the format version of the indexes.
+    v?: number;
+    // Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
+    expireAfterSeconds?: number;
+    // Override the auto generated index name (useful if the resulting name is larger than 128 bytes)
+    name?: string;
+    // Creates a partial index based on the given filter object (MongoDB 3.2 or higher)
+    partialFilterExpression?: any;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html
+export interface Admin {
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+    addUser(username: string, password: string, callback: MongoCallback<any>): void;
+    addUser(username: string, password: string, options?: AddUserOptions): Promise<any>;
+    addUser(username: string, password: string, options: AddUserOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#authenticate
+    authenticate(username: string, callback: MongoCallback<any>): void;
+    authenticate(username: string, password?: string): Promise<any>;
+    authenticate(username: string, password: string, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#buildInfo
+    buildInfo(): Promise<any>;
+    buildInfo(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#command
+    command(command: Object, callback: MongoCallback<any>): void;
+    command(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
+    command(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#listDatabases
+    listDatabases(): Promise<any>;
+    listDatabases(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#logout
+    logout(): Promise<any>;
+    logout(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#ping
+    ping(): Promise<any>;
+    ping(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingInfo
+    profilingInfo(): Promise<any>;
+    profilingInfo(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingLevel
+    profilingLevel(): Promise<any>;
+    profilingLevel(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+    removeUser(username: string, callback: MongoCallback<any>): void;
+    removeUser(username: string, options?: FSyncOptions): Promise<any>;
+    removeUser(username: string, options: FSyncOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#replSetGetStatus
+    replSetGetStatus(): Promise<any>;
+    replSetGetStatus(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverInfo
+    serverInfo(): Promise<any>;
+    serverInfo(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverStatus
+    serverStatus(): Promise<any>;
+    serverStatus(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#setProfilingLevel
+    setProfilingLevel(level: string): Promise<any>;
+    setProfilingLevel(level: string, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#validateCollection
+    validateCollection(collectionNme: string, callback: MongoCallback<any>): void;
+    validateCollection(collectionNme: string, options?: Object): Promise<any>;
+    validateCollection(collectionNme: string, options: Object, callback: MongoCallback<any>): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+export interface AddUserOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    fsync: boolean;
+    customData?: Object;
+    roles?: Object[]
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+export interface FSyncOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    fsync?: boolean
+}
+
+// Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
+export interface Collection<TSchema = Default> {
+    // Get the collection name.
+    collectionName: string;
+    // Get the full collection namespace.
+    namespace: string;
+    // The current write concern values.
+    writeConcern: any;
+    // The current read concern values.
+    readConcern: any;
+    // Get current index hint for collection.
+    hint: any;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+    aggregate<T = TSchema>(pipeline: Object[], callback: MongoCallback<T[]>): AggregationCursor<T>;
+    aggregate<T = TSchema>(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<T[]>): AggregationCursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
+    bulkWrite(operations: Object[], callback: MongoCallback<BulkWriteOpResultObject>): void;
+    bulkWrite(operations: Object[], options?: CollectionBluckWriteOptions): Promise<BulkWriteOpResultObject>;
+    bulkWrite(operations: Object[], options: CollectionBluckWriteOptions, callback: MongoCallback<BulkWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#count
+    count(query: Object, callback: MongoCallback<number>): void;
+    count(query: Object, options?: MongoCountPreferences): Promise<number>;
+    count(query: Object, options: MongoCountPreferences, callback: MongoCallback<number>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndex
+    createIndex(fieldOrSpec: string | any, callback: MongoCallback<string>): void;
+    createIndex(fieldOrSpec: string | any, options?: IndexOptions): Promise<string>;
+    createIndex(fieldOrSpec: string | any, options: IndexOptions, callback: MongoCallback<string>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndexes and http://docs.mongodb.org/manual/reference/command/createIndexes/
+    createIndexes(indexSpecs: Object[]): Promise<any>;
+    createIndexes(indexSpecs: Object[], callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
+    deleteMany(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteMany(filter: Object, options?: CollectionOptions): Promise<DeleteWriteOpResultObject>;
+    deleteMany(filter: Object, options: CollectionOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteOne
+    deleteOne(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteOne(filter: Object, options?: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
+    deleteOne(filter: Object, options: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#distinct
+    distinct(key: string, query: Object, callback: MongoCallback<any>): void;
+    distinct(key: string, query: Object, options?: { readPreference?: ReadPreference | string }): Promise<any>;
+    distinct(key: string, query: Object, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#drop
+    drop(): Promise<any>;
+    drop(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndex
+    dropIndex(indexName: string, callback: MongoCallback<any>): void;
+    dropIndex(indexName: string, options?: CollectionOptions): Promise<any>;
+    dropIndex(indexName: string, options: CollectionOptions, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndexes
+    dropIndexes(): Promise<any>;
+    dropIndexes(callback?: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#find
+    find<T = TSchema>(query?: Object): Cursor<T>;
+    /** @deprecated */
+    find<T = TSchema>(query: Object, fields?: Object, skip?: number, limit?: number, timeout?: number): Cursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOne
+    findOne<T = TSchema>(filter: Object, callback: MongoCallback<T | null>): void;
+    findOne<T = TSchema>(filter: Object, options?: FindOneOptions): Promise<T | null>;
+    findOne<T = TSchema>(filter: Object, options: FindOneOptions, callback: MongoCallback<T | null>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndDelete
+    findOneAndDelete(filter: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number }, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
+    findOneAndReplace(filter: Object, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndReplace(filter: Object, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndReplace(filter: Object, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndUpdate
+    findOneAndUpdate(filter: Object, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndUpdate(filter: Object, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndUpdate(filter: Object, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
+    geoHaystackSearch(x: number, y: number, callback: MongoCallback<any>): void;
+    geoHaystackSearch(x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;
+    geoHaystackSearch(x: number, y: number, options: GeoHaystackSearchOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
+    geoNear(x: number, y: number, callback: MongoCallback<any>): void;
+    geoNear(x: number, y: number, options?: GeoNearOptions): Promise<any>;
+    geoNear(x: number, y: number, options: GeoNearOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#group
+    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, callback: MongoCallback<any>): void;
+    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options?: { readPreference?: ReadPreference | string }): Promise<any>;
+    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexes
+    indexes(): Promise<any>;
+    indexes(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexExists
+    indexExists(indexes: string | string[]): Promise<boolean>;
+    indexExists(indexes: string | string[], callback: MongoCallback<boolean>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexInformation
+    indexInformation(callback: MongoCallback<any>): void;
+    indexInformation(options?: { full: boolean }): Promise<any>;
+    indexInformation(options: { full: boolean }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeOrderedBulkOp
+    initializeOrderedBulkOp(options?: CollectionOptions): OrderedBulkOperation;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeUnorderedBulkOp
+    initializeUnorderedBulkOp(options?: CollectionOptions): UnorderedBulkOperation;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+    /** @deprecated Use insertOne, insertMany or bulkWrite */
+    insert(docs: Object, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    /** @deprecated Use insertOne, insertMany or bulkWrite */
+    insert(docs: Object, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
+    /** @deprecated Use insertOne, insertMany or bulkWrite */
+    insert(docs: Object, options: CollectionInsertOneOptions, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
+    insertMany(docs: Object[], callback: MongoCallback<InsertWriteOpResult>): void;
+    insertMany(docs: Object[], options?: CollectionInsertManyOptions): Promise<InsertWriteOpResult>;
+    insertMany(docs: Object[], options: CollectionInsertManyOptions, callback: MongoCallback<InsertWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+    insertOne(docs: Object, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    insertOne(docs: Object, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
+    insertOne(docs: Object, options: CollectionInsertOneOptions, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#isCapped
+    isCapped(): Promise<any>;
+    isCapped(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#listIndexes
+    listIndexes(options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
+    mapReduce(map: Function | string, reduce: Function | string, callback: MongoCallback<any>): void;
+    mapReduce(map: Function | string, reduce: Function | string, options?: MapReduceOptions): Promise<any>;
+    mapReduce(map: Function | string, reduce: Function | string, options: MapReduceOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#options
+    options(): Promise<any>;
+    options(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
+    parallelCollectionScan(callback: MongoCallback<Cursor<any>[]>): void;
+    parallelCollectionScan(options?: ParallelCollectionScanOptions): Promise<Cursor<any>[]>;
+    parallelCollectionScan(options: ParallelCollectionScanOptions, callback: MongoCallback<Cursor<any>[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#reIndex
+    reIndex(): Promise<any>;
+    reIndex(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#remove
+    /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
+    remove(selector: Object, callback: MongoCallback<WriteOpResult>): void;
+    /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
+    remove(selector: Object, options?: CollectionOptions & { single?: boolean }): Promise<WriteOpResult>;
+    /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
+    remove(selector: Object, options?: CollectionOptions & { single?: boolean }, callback?: MongoCallback<WriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#rename
+    rename(newName: string, callback: MongoCallback<Collection<TSchema>>): void;
+    rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
+    rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#replaceOne
+    replaceOne(filter: Object, doc: Object, callback: MongoCallback<ReplaceWriteOpResult>): void;
+    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<ReplaceWriteOpResult>;
+    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<ReplaceWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#save
+    /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
+    save(doc: Object, callback: MongoCallback<WriteOpResult>): void;
+    /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
+    save(doc: Object, options?: CollectionOptions): Promise<WriteOpResult>;
+    /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
+    save(doc: Object, options: CollectionOptions, callback: MongoCallback<WriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#stats
+    stats(callback: MongoCallback<CollStats>): void;
+    stats(options?: { scale: number }): Promise<CollStats>;
+    stats(options: { scale: number }, callback: MongoCallback<CollStats>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#update
+    /** @deprecated use updateOne, updateMany or bulkWrite */
+    update(filter: Object, update: Object, callback: MongoCallback<WriteOpResult>): void;
+    /** @deprecated use updateOne, updateMany or bulkWrite */
+    update(filter: Object, update: Object, options?: ReplaceOneOptions & { multi?: boolean }): Promise<WriteOpResult>;
+    /** @deprecated use updateOne, updateMany or bulkWrite */
+    update(filter: Object, update: Object, options: ReplaceOneOptions & { multi?: boolean }, callback: MongoCallback<WriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateMany
+    updateMany(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateMany(filter: Object, update: Object, options?: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }): Promise<UpdateWriteOpResult>;
+    updateMany(filter: Object, update: Object, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback: MongoCallback<UpdateWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateOne
+    updateOne(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateOne(filter: Object, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
+    updateOne(filter: Object, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
+}
+
+// Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
+export interface CollStats {
+    // Namespace.
+    ns: string;
+    // Number of documents.
+    count: number;
+    // Collection size in bytes.
+    size: number;
+    // Average object size in bytes.
+    avgObjSize: number;
+    // (Pre)allocated space for the collection in bytes.
+    storageSize: number;
+    // Number of extents (contiguously allocated chunks of datafile space).
+    numExtents: number;
+    // Number of indexes.
+    nindexes: number;
+    // Size of the most recently created extent in bytes.
+    lastExtentSize: number;
+    // Padding can speed up updates if documents grow.
+    paddingFactor: number;
+    // A number that indicates the user-set flags on the collection. userFlags only appears when using the mmapv1 storage engine.
+    userFlags?: number;
+    // Total index size in bytes.
+    totalIndexSize: number;
+    // Size of specific indexes in bytes.
+    indexSizes: {
+        _id_: number;
+        [index: string]: number;
+    };
+    // `true` if the collection is capped.
+    capped: boolean;
+    // The maximum number of documents that may be present in a capped collection.
+    max: number;
+    // The maximum size of a capped collection.
+    maxSize: number;
+    wiredTiger?: WiredTigerData;
+    indexDetails?: any;
+    ok: number;
+}
+
+export interface WiredTigerData {
+    LSM: {
+        'bloom filter false positives': number,
+        'bloom filter hits': number;
+        'bloom filter misses': number;
+        'bloom filter pages evicted from cache': number;
+        'bloom filter pages read into cache': number;
+        'bloom filters in the LSM tree': number;
+        'chunks in the LSM tree': number;
+        'highest merge generation in the LSM tree': number;
+        'queries that could have benefited from a Bloom filter that did not exist': number;
+        'sleep for LSM checkpoint throttle': number;
+        'sleep for LSM merge throttle': number;
+        'total size of bloom filters': number;
+    };
+    'block-manager': {
+        'allocations requiring file extension': number;
+        'blocks allocated': number;
+        'blocks freed': number;
+        'checkpoint size': number;
+        'file allocation unit size': number;
+        'file bytes available for reuse': number;
+        'file magic number': number;
+        'file major version number': number;
+        'file size in bytes': number;
+        'minor version number': number;
+    };
+    btree: {
+        'btree checkpoint generation': number;
+        'column-store fixed-size leaf pages': number;
+        'column-store internal pages': number;
+        'column-store variable-size RLE encoded values': number;
+        'column-store variable-size deleted values': number;
+        'column-store variable-size leaf pages': number;
+        'fixed-record size': number;
+        'maximum internal page key size': number;
+        'maximum internal page size': number;
+        'maximum leaf page key size': number;
+        'maximum leaf page size': number;
+        'maximum leaf page value size': number;
+        'maximum tree depth': number;
+        'number of key/value pairs': number;
+        'overflow pages': number;
+        'pages rewritten by compaction': number;
+        'row-store internal pages': number;
+        'row-store leaf pages': number;
+    };
+    cache: {
+        'bytes currently in the cache': number;
+        'bytes read into cache': number;
+        'bytes written from cache': number;
+        'checkpoint blocked page eviction': number;
+        'data source pages selected for eviction unable to be evicted': number;
+        'hazard pointer blocked page eviction': number;
+        'in-memory page passed criteria to be split': number;
+        'in-memory page splits': number;
+        'internal pages evicted': number;
+        'internal pages split during eviction': number;
+        'leaf pages split during eviction': number;
+        'modified pages evicted': number;
+        'overflow pages read into cache': number;
+        'overflow values cached in memory': number;
+        'page split during eviction deepened the tree': number;
+        'page written requiring lookaside records': number;
+        'pages read into cache': number;
+        'pages read into cache requiring lookaside entries': number;
+        'pages requested from the cache': number;
+        'pages written from cache': number;
+        'pages written requiring in-memory restoration': number;
+        'tracked dirty bytes in the cache': number;
+        'unmodified pages evicted': number;
+    };
+    cache_walk: {
+        'Average difference between current eviction generation when the page was last considered': number;
+        'Average on-disk page image size seen': number;
+        'Clean pages currently in cache': number;
+        'Current eviction generation': number;
+        'Dirty pages currently in cache': number;
+        'Entries in the root page': number;
+        'Internal pages currently in cache': number;
+        'Leaf pages currently in cache': number;
+        'Maximum difference between current eviction generation when the page was last considered': number;
+        'Maximum page size seen': number;
+        'Minimum on-disk page image size seen': number;
+        'On-disk page image sizes smaller than a single allocation unit': number;
+        'Pages created in memory and never written': number;
+        'Pages currently queued for eviction': number;
+        'Pages that could not be queued for eviction': number;
+        'Refs skipped during cache traversal': number;
+        'Size of the root page': number;
+        'Total number of pages currently in cache': number;
+    };
+    compression: {
+        'compressed pages read': number;
+        'compressed pages written': number;
+        'page written failed to compress': number;
+        'page written was too small to compress': number;
+        'raw compression call failed, additional data available': number;
+        'raw compression call failed, no additional data available': number;
+        'raw compression call succeeded': number;
+    };
+    cursor: {
+        'bulk-loaded cursor-insert calls': number;
+        'create calls': number;
+        'cursor-insert key and value bytes inserted': number;
+        'cursor-remove key bytes removed': number;
+        'cursor-update value bytes updated': number;
+        'insert calls': number;
+        'next calls': number;
+        'prev calls': number;
+        'remove calls': number;
+        'reset calls': number;
+        'restarted searches': number;
+        'search calls': number;
+        'search near calls': number;
+        'truncate calls': number;
+        'update calls': number;
+    };
+    reconciliation: {
+        'dictionary matches': number;
+        'fast-path pages deleted': number;
+        'internal page key bytes discarded using suffix compression': number;
+        'internal page multi-block writes': number;
+        'internal-page overflow keys': number;
+        'leaf page key bytes discarded using prefix compression': number;
+        'leaf page multi-block writes': number;
+        'leaf-page overflow keys': number;
+        'maximum blocks required for a page': number;
+        'overflow values written': number;
+        'page checksum matches': number;
+        'page reconciliation calls': number;
+        'page reconciliation calls for eviction': number;
+        'pages deleted': number;
+    };
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+export interface CollectionAggregationOptions {
+    readPreference?: ReadPreference | string;
+    // Return the query as cursor, on 2.6 > it returns as a real cursor
+    // on pre 2.6 it returns as an emulated cursor.
+    cursor?: { batchSize: number };
+    // Explain returns the aggregation execution plan (requires mongodb 2.6 >).
+    explain?: boolean;
+    // lets the server know if it can use disk to store
+    // temporary results for the aggregation (requires mongodb 2.6 >).
+    allowDiskUse?: boolean;
+    // specifies a cumulative time limit in milliseconds for processing operations
+    // on the cursor. MongoDB interrupts the operation at the earliest following interrupt point.
+    maxTimeMS?: number;
+    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    bypassDocumentValidation?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#insertMany
+export interface CollectionInsertManyOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    //Force server to assign _id values instead of driver.
+    forceServerObjectId?: boolean;
+    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    bypassDocumentValidation?: boolean;
+    // If true, when an insert fails, don't execute the remaining writes. If false, continue with remaining inserts when one fails.
+    ordered?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
+export interface CollectionBluckWriteOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    // Execute write operation in ordered or unordered fashion.
+    ordered?: boolean;
+    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    bypassDocumentValidation?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~BulkWriteOpResult
+export interface BulkWriteOpResultObject {
+    insertedCount?: number;
+    matchedCount?: number;
+    modifiedCount?: number;
+    deletedCount?: number;
+    upsertedCount?: number;
+    insertedIds?: any;
+    upsertedIds?: any;
+    result?: any;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
+export interface MongoCountPreferences {
+    // The limit of documents to count.
+    limit?: number;
+    // The number of documents to skip for the count.
+    skip?: boolean;
+    // An index name hint for the query.
+    hint?: string;
+    // The preferred read preference
+    readPreference?: ReadPreference | string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~deleteWriteOpResult
+export interface DeleteWriteOpResultObject {
+    //The raw result returned from MongoDB, field will vary depending on server version.
+    result: {
+        //Is 1 if the command executed correctly.
+        ok?: number;
+        //The total count of documents deleted.
+        n?: number;
+    }
+    //The connection object used for the operation.
+    connection?: any;
+    //The number of documents deleted.
+    deletedCount?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~findAndModifyWriteOpResult
+export interface FindAndModifyWriteOpResultObject<TSchema = Default> {
+    //Document returned from findAndModify command.
+    value?: TSchema;
+    //The raw lastErrorObject returned from the command.
+    lastErrorObject?: any;
+    //Is 1 if the command executed correctly.
+    ok?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
+export interface FindOneAndReplaceOption {
+    projection?: Object;
+    sort?: Object;
+    maxTimeMS?: number;
+    upsert?: boolean;
+    returnOriginal?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
+export interface GeoHaystackSearchOptions {
+    readPreference?: ReadPreference | string;
+    maxDistance?: number;
+    search?: Object;
+    limit?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
+export interface GeoNearOptions {
+    readPreference?: ReadPreference | string;
+    num?: number;
+    minDistance?: number;
+    maxDistance?: number;
+    distanceMultiplier?: number;
+    query?: Object;
+    spherical?: boolean;
+    uniqueDocs?: boolean;
+    includeLocs?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Code.html
+export class Code {
+    constructor(code: string | Function, scope?: Object)
+    code: string | Function;
+    scope: any;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
+export interface CollectionOptions {
+    //The write concern.
+    w?: number | string;
+    //The write concern timeout.
+    wtimeout?: number;
+    //Specify a journal write concern.
+    j?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html
+export interface OrderedBulkOperation {
+    length: number;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#execute
+    execute(callback: MongoCallback<BulkWriteResult>): void;
+    execute(options?: FSyncOptions): Promise<BulkWriteResult>;
+    execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#find
+    find(selector: Object): FindOperatorsOrdered;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#insert
+    insert(doc: Object): OrderedBulkOperation;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/BulkWriteResult.html
+export interface BulkWriteResult {
+    ok: number;
+    nInserted: number;
+    nUpdated: number;
+    nUpserted: number;
+    nModified: number;
+    nRemoved: number;
+
+    getInsertedIds(): Array<Object>;
+    getLastOp(): Object;
+    getRawResponse(): Object;
+    getUpsertedIdAt(index: number): Object;
+    getUpsertedIds(): Array<Object>;
+    getWriteConcernError(): WriteConcernError;
+    getWriteErrorAt(index: number): WriteError;
+    getWriteErrorCount(): number;
+    getWriteErrors(): Array<Object>;
+    hasWriteErrors(): boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteError.html
+export interface WriteError {
+    //Write concern error code.
+    code: number;
+    //Write concern error original bulk operation index.
+    index: number;
+    //Write concern error message.
+    errmsg: string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteConcernError.html
+export interface WriteConcernError {
+    //Write concern error code.
+    code: number;
+    //Write concern error message.
+    errmsg: string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsOrdered.html
+export interface FindOperatorsOrdered {
+    delete(): OrderedBulkOperation;
+    deleteOne(): OrderedBulkOperation;
+    replaceOne(doc: Object): OrderedBulkOperation;
+    update(doc: Object): OrderedBulkOperation;
+    updateOne(doc: Object): OrderedBulkOperation;
+    upsert(): FindOperatorsOrdered;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html
+export interface UnorderedBulkOperation {
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/lib_bulk_unordered.js.html line 339
+    length: number;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#execute
+    execute(callback: MongoCallback<BulkWriteResult>): void;
+    execute(options?: FSyncOptions): Promise<BulkWriteResult>;
+    execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#find
+    find(selector: Object): FindOperatorsUnordered;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#insert
+    insert(doc: Object): UnorderedBulkOperation;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsUnordered.html
+export interface FindOperatorsUnordered {
+    length: number;
+    remove(): UnorderedBulkOperation;
+    removeOne(): UnorderedBulkOperation;
+    replaceOne(doc: Object): UnorderedBulkOperation;
+    update(doc: Object): UnorderedBulkOperation;
+    updateOne(doc: Object): UnorderedBulkOperation;
+    upsert(): FindOperatorsUnordered;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOne
+export interface FindOneOptions {
+    limit?: number,
+    sort?: Array<any> | Object,
+    fields?: Object,
+    skip?: number,
+    hint?: Object,
+    explain?: boolean,
+    snapshot?: boolean,
+    timeout?: boolean,
+    tailable?: boolean,
+    batchSize?: number,
+    returnKey?: boolean,
+    maxScan?: number,
+    min?: number,
+    max?: number,
+    showDiskLoc?: boolean,
+    comment?: string,
+    raw?: boolean,
+    readPreference?: ReadPreference | string,
+    partial?: boolean,
+    maxTimeMs?: number
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertWriteOpResult
+export interface InsertWriteOpResult {
+    insertedCount: number;
+    ops: Array<any>;
+    insertedIds: Array<ObjectID>;
+    connection: any;
+    result: { ok: number, n: number }
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+export interface CollectionInsertOneOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    //Force server to assign _id values instead of driver.
+    forceServerObjectId?: boolean;
+    //Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    bypassDocumentValidation?: boolean
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertOneWriteOpResult
+export interface InsertOneWriteOpResult {
+    insertedCount: number;
+    ops: Array<any>;
+    insertedId: ObjectID;
+    connection: any;
+    result: { ok: number, n: number }
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
+export interface ParallelCollectionScanOptions {
+    readPreference?: ReadPreference | string;
+    batchSize?: number;
+    numCursors?: number;
+    raw?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
+export interface ReplaceOneOptions {
+    upsert?: boolean;
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    bypassDocumentValidation?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~updateWriteOpResult
+export interface UpdateWriteOpResult {
+    result: { ok: number, n: number, nModified: number };
+    connection: any;
+    matchedCount: number;
+    modifiedCount: number;
+    upsertedCount: number;
+    upsertedId: { _id: ObjectID };
+}
+
+// https://github.com/mongodb/node-mongodb-native/blob/2.2/lib/collection.js#L957
+export interface ReplaceWriteOpResult extends UpdateWriteOpResult {
+    ops: Array<any>
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
+export interface MapReduceOptions {
+    readPreference?: ReadPreference | string;
+    out?: Object;
+    query?: Object;
+    sort?: Object;
+    limit?: number;
+    keeptemp?: boolean;
+    finalize?: Function | string;
+    scope?: Object;
+    jsMode?: boolean;
+    verbose?: boolean;
+    bypassDocumentValidation?: boolean
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~WriteOpResult
+export interface WriteOpResult {
+    ops: Array<any>;
+    connection: any;
+    result: any;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
+export type CursorResult = any | void | boolean;
+
+type Default = any;
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
+export class Cursor<T = Default> extends Readable {
+
+    sortValue: string;
+    timeout: boolean;
+    readPreference: ReadPreference;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#addCursorFlag
+    addCursorFlag(flag: string, value: boolean): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#addQueryModifier
+    addQueryModifier(name: string, value: boolean): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#batchSize
+    batchSize(value: number): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#clone
+    clone(): Cursor<T>; // still returns the same type
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
+    close(): Promise<CursorResult>;
+    close(callback: MongoCallback<CursorResult>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#comment
+    comment(value: string): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.2/api/Cursor.html#count
+    count(callback: MongoCallback<number>): void;
+    count(applySkipLimit: boolean, callback: MongoCallback<number>): void;
+    count(options: CursorCommentOptions, callback: MongoCallback<number>): void;
+    count(applySkipLimit: boolean, options: CursorCommentOptions, callback: MongoCallback<number>): void;
+    count(applySkipLimit?: boolean, options?: CursorCommentOptions): Promise<number>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#explain
+    explain(): Promise<CursorResult>;
+    explain(callback: MongoCallback<CursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#filter
+    filter(filter: Object): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#forEach
+    forEach(iterator: IteratorCallback<T>, callback: EndCallback): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hasNext
+    hasNext(): Promise<boolean>;
+    hasNext(callback: MongoCallback<boolean>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hint
+    hint(hint: Object): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#isClosed
+    isClosed(): boolean;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#limit
+    limit(value: number): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#map
+    map(transform: Function): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#max
+    max(max: number): Cursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxAwaitTimeMS
+    maxAwaitTimeMS(value: number): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxScan
+    maxScan(maxScan: Object): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxTimeMS
+    maxTimeMS(value: number): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#min
+    min(min: number): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
+    next(): Promise<T>;
+    next(callback: MongoCallback<T>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#project
+    project(value: Object): Cursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#read
+    read(size: number): string | Buffer | void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
+    returnKey(returnKey: Object): Cursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#rewind
+    rewind(): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setCursorOption
+    setCursorOption(field: string, value: Object): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setReadPreference
+    setReadPreference(readPreference: string | ReadPreference): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#showRecordId
+    showRecordId(showRecordId: Object): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#skip
+    skip(value: number): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#snapshot
+    snapshot(snapshot: Object): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#sort
+    sort(keyOrList: string | Object[] | Object, direction?: number): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#stream
+    stream(options?: { transform?: Function }): Cursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#toArray
+    toArray(): Promise<T[]>;
+    toArray(callback: MongoCallback<T[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unshift
+    unshift(stream: Buffer | string): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
+export interface CursorCommentOptions {
+    skip?: number;
+    limit?: number;
+    maxTimeMS?: number;
+    hint?: string;
+    readPreference?: ReadPreference | string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~iteratorCallback
+export interface IteratorCallback<T> {
+    (doc: T): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~endCallback
+export interface EndCallback {
+    (error: MongoError): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#~resultCallback
+export type AggregationCursorResult = any | void;
+//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
+export class AggregationCursor<T = Default> extends Readable {
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#batchSize
+    batchSize(value: number): AggregationCursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#clone
+    clone(): AggregationCursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#close
+    close(): Promise<AggregationCursorResult>;
+    close(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#each
+    each(callback: MongoCallback<AggregationCursorResult>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#explain
+    explain(): Promise<AggregationCursorResult>;
+    explain(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#geoNear
+    geoNear(document: Object): AggregationCursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#group
+    group(document: Object): AggregationCursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#isClosed
+    isClosed(): boolean;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#limit
+    limit(value: number): AggregationCursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#match
+    match(document: Object): AggregationCursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#maxTimeMS
+    maxTimeMS(value: number): AggregationCursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#next
+    next(): Promise<T>;
+    next(callback: MongoCallback<T>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#out
+    out(destination: string): AggregationCursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#project
+    project(document: Object): AggregationCursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#read
+    read(size: number): string | Buffer | void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#redact
+    redact(document: Object): AggregationCursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#rewind
+    rewind(): AggregationCursor<T>;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#setEncoding
+    skip(value: number): AggregationCursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#sort
+    sort(document: Object): AggregationCursor<T>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#toArray
+    toArray(): Promise<T[]>;
+    toArray(callback: MongoCallback<T[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unshift
+    unshift(stream: Buffer | string): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unwind
+    unwind(field: string): AggregationCursor<T>;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html
+export class CommandCursor extends Readable {
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#batchSize
+    batchSize(value: number): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#clone
+    clone(): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#close
+    close(): Promise<AggregationCursorResult>;
+    close(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#each
+    each(callback: MongoCallback<AggregationCursorResult>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#isClosed
+    isClosed(): boolean;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#maxTimeMS
+    maxTimeMS(value: number): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#next
+    next(): Promise<AggregationCursorResult>;
+    next(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#read
+    read(size: number): string | Buffer | void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#rewind
+    rewind(): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setReadPreference
+    setReadPreference(readPreference: string | ReadPreference): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#toArray
+    toArray(): Promise<any[]>;
+    toArray(callback: MongoCallback<any[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unshift
+    unshift(stream: Buffer | string): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html
+export class GridFSBucket {
+    constructor(db: Db, options?: GridFSBucketOptions);
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#delete
+    delete(id: ObjectID, callback?: GridFSBucketErrorCallback): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#drop
+    drop(callback?: GridFSBucketErrorCallback): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#find
+    find(filter?: Object, options?: GridFSBucketFindOptions): Cursor<any>;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openDownloadStream
+    openDownloadStream(id: ObjectID, options?: { start: number, end: number }): GridFSBucketReadStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openDownloadStreamByName
+    openDownloadStreamByName(filename: string, options?: { revision: number, start: number, end: number }): GridFSBucketReadStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStream
+    openUploadStream(filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStreamWithId
+    openUploadStreamWithId(id: string | number | Object, filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#rename
+    rename(id: ObjectID, filename: string, callback?: GridFSBucketErrorCallback): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html
+export interface GridFSBucketOptions {
+    bucketName?: string;
+    chunkSizeBytes?: number;
+    writeConcern?: Object;
+    ReadPreference?: Object;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#~errorCallback
+export interface GridFSBucketErrorCallback {
+    (err?: MongoError): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#find
+export interface GridFSBucketFindOptions {
+    batchSize?: number;
+    limit?: number;
+    maxTimeMS?: number;
+    noCursorTimeout?: boolean;
+    skip?: number;
+    sort?: Object;
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStream
+export interface GridFSBucketOpenUploadStreamOptions {
+    chunkSizeBytes?: number,
+    metadata?: Object,
+    contentType?: string,
+    aliases?: Array<string>
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
+export class GridFSBucketReadStream extends Readable {
+    constructor(chunks: Collection<any>, files: Collection<any>, readPreference: Object, filter: Object, options?: GridFSBucketReadStreamOptions);
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
+export interface GridFSBucketReadStreamOptions {
+    sort?: number,
+    skip?: number,
+    start?: number,
+    end?: number
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketWriteStream.html
+export class GridFSBucketWriteStream extends Writable {
+    constructor(bucket: GridFSBucket, filename: string, options?: GridFSBucketWriteStreamOptions);
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketWriteStream.html
+export interface GridFSBucketWriteStreamOptions {
+    id?: string | number | Object,
+    chunkSizeBytes?: number,
+    w?: number,
+    wtimeout?: number,
+    j?: number
+}
diff --git a/types/mongodb/v2/mongodb-tests.ts b/types/mongodb/v2/mongodb-tests.ts
new file mode 100644
index 0000000000..52f2d6e4f8
--- /dev/null
+++ b/types/mongodb/v2/mongodb-tests.ts
@@ -0,0 +1,101 @@
+// Test source : https://github.com/mongodb/node-mongodb-native
+import mongodb = require('mongodb');
+var MongoClient = mongodb.MongoClient;
+
+var format  = require('util').format;
+let options: mongodb.MongoClientOptions = {
+    authSource           : ' ',
+    w                    : 1,
+    wtimeout             : 300,
+    j                    : true,
+    bufferMaxEntries     : 1000,
+    readPreference       : 'ReadPreference | string',
+    promoteValues        : {},
+    pkFactory            : {},
+    poolSize             : 1,
+
+    socketOptions        : {},
+
+    reconnectTries       : 123456,
+    reconnectInterval    : 123456,
+
+    ssl                  : true,
+    sslValidate          : {},
+    checkServerIdentity  : function (){ },
+    sslCA                : ['str'],
+    sslCert              : new Buffer(999),
+    sslKey               : new Buffer(999),
+    sslPass              : new Buffer(999)
+}
+    MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function(err: mongodb.MongoError, db: mongodb.Db) {
+    if (err) throw err;
+
+    var collection = db.collection('test_insert');
+    collection.insertOne({ a: 2 }, function(err: mongodb.MongoError, docs: any) {
+
+        collection.count(function(err: mongodb.MongoError, count: any) {
+            console.log(format("count = %s", count));
+        });
+
+        // Locate all the entries using find
+        collection.find({}).toArray(function(err: mongodb.MongoError, results: any) {
+            console.dir(results);
+            // Let's close the db
+            db.close();
+        });
+
+        // Get some statistics
+        collection.stats(function(err: mongodb.MongoError, stats: any) {
+            console.log(stats.count + " documents");
+        });
+
+        //
+        collection.stats().then(function(stats){
+            console.log(stats.wiredTiger.cache['bytes currently in the cache']);
+        })
+
+        collection.createIndex({}, {partialFilterExpression: {rating: {$exists: 1}}})
+    });
+
+    {
+    let cursor: mongodb.Cursor;
+        cursor = collection.find();
+        cursor = cursor.addCursorFlag('',true);
+        cursor = cursor.addQueryModifier('',true);
+        cursor = cursor.batchSize(1);
+        cursor = cursor.comment('');
+        cursor = cursor.filter(1);
+        cursor = cursor.hint({});
+        cursor = cursor.limit(1);
+        cursor = cursor.map(function (result) {});
+        cursor = cursor.max(1);
+        cursor = cursor.min(1);
+        cursor = cursor.maxAwaitTimeMS(1);
+        cursor = cursor.maxScan({});
+        cursor = cursor.maxTimeMS(1);
+        cursor = cursor.project({});
+        cursor = cursor.returnKey({});
+        cursor = cursor.setCursorOption('',{});
+        cursor = cursor.setReadPreference('');
+        cursor = cursor.showRecordId({});
+        cursor = cursor.skip(1);
+        cursor = cursor.snapshot({});
+        cursor = cursor.sort({});
+        cursor = cursor.stream();
+    }
+    // Collection .findM<T>() & .agggregate<T>() generic tests
+    {
+    let bag : {cost: number, color: string};
+    type bag = typeof bag;
+    let cursor: mongodb.Cursor<bag> = collection.find<bag>({color: 'black'})
+        cursor.toArray(function (err,r) { r[0].cost} );
+        cursor.forEach(function (bag  ) { bag.color }, () => {});
+        collection.findOne({ color: 'white' }).then(b => { let _b:bag = b; })
+        collection.findOne<bag>({ color: 'white' }).then(b => { b.cost; })
+    }
+    {
+    let payment: {total: number};
+    type payment = typeof payment;
+    let cursor: mongodb.AggregationCursor<payment> = collection.aggregate<payment>([{}])
+    }
+})
diff --git a/types/mongodb/v2/tsconfig.json b/types/mongodb/v2/tsconfig.json
new file mode 100644
index 0000000000..7bfc92fc32
--- /dev/null
+++ b/types/mongodb/v2/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "paths": {
+            "mongodb": [
+                "mongodb/v2"
+            ]
+        },
+        "noImplicitAny": false,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mongodb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/mongodb/v2/tslint.json b/types/mongodb/v2/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/mongodb/v2/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-auto-increment/tslint.json b/types/mongoose-auto-increment/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose-auto-increment/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-deep-populate/tslint.json b/types/mongoose-deep-populate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose-deep-populate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-geojson-schema/index.d.ts b/types/mongoose-geojson-schema/index.d.ts
new file mode 100644
index 0000000000..b732bec098
--- /dev/null
+++ b/types/mongoose-geojson-schema/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for mongoose-geojson-schema 2.1
+// Project: https://github.com/rideamigoscorp/mongoose-geojson-schema#readme
+// Definitions by: Bond <https://github.com/bondz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import mongoose = require('mongoose');
+
+declare module 'mongoose' {
+  namespace Schema {
+    namespace Types {
+      class GeoJSON extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'GeoJSON';
+      }
+
+      class Point extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'Point';
+      }
+
+      class MultiPoint extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'MultiPoint';
+      }
+
+      class LineString extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'LineString';
+      }
+
+      class MultiLineString extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'MultiLineString';
+      }
+
+      class Polygon extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'Polygon';
+      }
+
+      class MultiPolygon extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'MultiPolygon';
+      }
+
+      class Geometry extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'Geometry';
+      }
+
+      class GeometryCollection extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'GeometryCollection';
+      }
+
+      class Feature extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'Feature';
+      }
+
+      class FeatureCollection extends SchemaType {
+        constructor(key: string, options?: object);
+        cast(geojson: object): this;
+        static schemaName: 'FeatureCollection';
+      }
+    }
+  }
+}
diff --git a/types/mongoose-geojson-schema/mongoose-geojson-schema-tests.ts b/types/mongoose-geojson-schema/mongoose-geojson-schema-tests.ts
new file mode 100644
index 0000000000..3694ab5144
--- /dev/null
+++ b/types/mongoose-geojson-schema/mongoose-geojson-schema-tests.ts
@@ -0,0 +1,22 @@
+'use strict';
+
+import * as mongoose from 'mongoose';
+import * as mongooseGeoJSONSchema from 'mongoose-geojson-schema';
+
+const TestSchema = new mongoose.Schema(
+  {
+    title: String,
+    test: {},
+    point: mongoose.Schema.Types.Point,
+    multipoint: mongoose.Schema.Types.MultiPoint,
+    linestring: mongoose.Schema.Types.LineString,
+    multilinestring: mongoose.Schema.Types.MultiLineString,
+    polygon: mongoose.Schema.Types.Polygon,
+    multipolygon: mongoose.Schema.Types.MultiPolygon,
+    geometry: mongoose.Schema.Types.Geometry,
+    geometrycollection: mongoose.Schema.Types.GeometryCollection,
+    feature: mongoose.Schema.Types.Feature,
+    featurecollection: mongoose.Schema.Types.FeatureCollection,
+  },
+  { typeKey: '$type', collection: 'echoes' }
+);
diff --git a/types/mongoose-geojson-schema/tsconfig.json b/types/mongoose-geojson-schema/tsconfig.json
new file mode 100644
index 0000000000..9d3afc8952
--- /dev/null
+++ b/types/mongoose-geojson-schema/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mongoose-geojson-schema-tests.ts"
+    ]
+}
diff --git a/types/mongoose-geojson-schema/tslint.json b/types/mongoose-geojson-schema/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mongoose-geojson-schema/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mongoose-mock/tslint.json b/types/mongoose-mock/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose-mock/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-paginate/tslint.json b/types/mongoose-paginate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose-paginate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-promise/tslint.json b/types/mongoose-promise/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose-promise/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-seeder/index.d.ts b/types/mongoose-seeder/index.d.ts
index f3d9b8f1e4..6d13a84f70 100644
--- a/types/mongoose-seeder/index.d.ts
+++ b/types/mongoose-seeder/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/SamVerschueren/mongoose-seeder
 // Definitions by: Crevil <https://github.com/Crevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Q from 'q';
 
diff --git a/types/mongoose-seeder/tslint.json b/types/mongoose-seeder/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose-seeder/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-sequence/tslint.json b/types/mongoose-sequence/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose-sequence/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose-simple-random/index.d.ts b/types/mongoose-simple-random/index.d.ts
index fb8edd3500..893dc73537 100644
--- a/types/mongoose-simple-random/index.d.ts
+++ b/types/mongoose-simple-random/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/larryprice/mongoose-simple-random
 // Definitions by: Roberts Slisans <https://github.com/rsxdalv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import mongoose = require('mongoose');
 declare function pluginFunc(schema: mongoose.Schema): void;
diff --git a/types/mongoose-unique-validator/index.d.ts b/types/mongoose-unique-validator/index.d.ts
index 3cc2a13d80..3c08ab6607 100644
--- a/types/mongoose-unique-validator/index.d.ts
+++ b/types/mongoose-unique-validator/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/blakehaswell/mongoose-unique-validator#readme
 // Definitions by: Steve Hipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Schema } from "mongoose";
 
diff --git a/types/mongoose/README.md b/types/mongoose/README.md
index ad12702574..0ba91612e2 100644
--- a/types/mongoose/README.md
+++ b/types/mongoose/README.md
@@ -145,7 +145,7 @@ interface IUserModel extends Model<IUserDocument> {
   static1: () => string;
 }
 
-var UserModel: IUserModel = model<IUser, IUserModel>('User', UserSchema);
+var UserModel: IUserModel = model<IUserDocument, IUserModel>('User', UserSchema);
 UserModel.static1();    // static methods are available
 ```
 [top](#mongoosejs-typescript-docs)
diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index cd7bb438d4..3e676b499f 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -364,6 +364,60 @@ declare module "mongoose" {
     pass?: string;
     /** options for authentication (see http://mongodb.github.com/node-mongodb-native/api-generated/db.html#authenticate) */
     auth?: any;
+    /** Use ssl connection (needs to have a mongod server with ssl support) (default: true) */
+    ssl?: boolean;
+    /** Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher) */
+    sslValidate?: object;
+    /** Number of connections in the connection pool for each server instance, set to 5 as default for legacy reasons. */
+    poolSize?: number;
+    /** Reconnect on error (default: true) */
+    autoReconnect?: boolean;
+    /** TCP KeepAlive on the socket with a X ms delay before start (default: 0). */
+    keepAlive?: number;
+    /** TCP Connection timeout setting (default: 0) */
+    connectTimeoutMS?: number;
+    /** TCP Socket timeout setting (default: 0) */
+    socketTimeoutMS?: number;
+    /** If the database authentication is dependent on another databaseName. */
+    authSource?: string;
+    /** If you're connected to a single server or mongos proxy (as opposed to a replica set),
+     * the MongoDB driver will try to reconnect every reconnectInterval milliseconds for reconnectTries
+     * times, and give up afterward. When the driver gives up, the mongoose connection emits a
+     * reconnectFailed event. (default: 30) */
+    reconnectTries?: number;
+    /** Will wait # milliseconds between retries (default: 1000) */
+    reconnectInterval?: number;
+    /** The name of the replicaset to connect to. */
+    replicaSet?: string;
+    /** The current value of the parameter native_parser */
+    nativeParser?: boolean;
+    /** Auth mechanism */
+    authMechanism?: any;
+    /** Specify a journal write concern (default: false). */
+    journal?: boolean;
+    /** The write concern */
+    w?: number|string;
+    /** The write concern timeout. */
+    wTimeoutMS?: number;
+    /** The ReadPreference mode as listed here: http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html */
+    readPreference?: string;
+    /** An object representing read preference tags, see: http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html */
+    readPreferencetags?: object;
+    /** Triggers the server instance to call ismaster (default: true). */
+    monitoring?: boolean;
+    /** The interval of calling ismaster when monitoring is enabled (default: 10000). */
+    haInterval?: number;
+    /** Enable the wrapping of the callback in the current domain, disabled by default to avoid perf hit (default: false). */
+    domainsEnabled?: boolean;
+    /** How long driver keeps waiting for servers to come back up (default: Number.MAX_VALUE) */
+    bufferMaxEntries?: number;
+
+    // TODO
+    safe?: any;
+    fsync?: any;
+    rs_name?: any;
+    slaveOk?: any;
+    authdb?: any;
   }
 
   /** See the node-mongodb-native driver instance for options that it understands. */
@@ -469,6 +523,11 @@ declare module "mongoose" {
     static Messages: Object;
   }
 
+  interface EachAsyncOptions {
+    /** defaults to 1 */
+    parallel?: number;
+  }
+
   /*
    * section querycursor.js
    * http://mongoosejs.com/docs/api.html#querycursor-js
@@ -500,10 +559,21 @@ declare module "mongoose" {
      * Execute fn for every document in the cursor. If fn returns a promise,
      * will wait for the promise to resolve before iterating on to the next one.
      * Returns a promise that resolves when done.
-     * @param callback executed when all docs have been processed
+     * @param fn Function to be executed for every document in the cursor
+     * @param callback Executed when all docs have been processed
      */
     eachAsync(fn: (doc: T) => any, callback?: (err: any) => void): Promise<T>;
 
+    /**
+     * Execute fn for every document in the cursor. If fn returns a promise,
+     * will wait for the promise to resolve before iterating on to the next one.
+     * Returns a promise that resolves when done.
+     * @param fn Function to be executed for every document in the cursor
+     * @param options Async options (e. g. parallel function execution)
+     * @param callback Executed when all docs have been processed
+     */
+    eachAsync(fn: (doc: T) => any, options: EachAsyncOptions, callback?: (err: any) => void): Promise<T>;
+
     /**
      * Registers a transform function which subsequently maps documents retrieved
      * via the streams interface or .next()
@@ -628,10 +698,8 @@ declare module "mongoose" {
     /**
      * Defines a pre hook for the document.
      */
-    pre(method: string, parallel: boolean, fn: (next: (err?: NativeError) => void, done: (err?: NativeError) => void) => void,
-      errorCb?: (err: Error) => void): this;
-    pre(method: string, fn: (next: (err?: NativeError) => void) => void,
-      errorCb?: (err: Error) => void): this;
+    pre(method: string, parallel: boolean, fn: HookAsyncCallback, errorCb?: HookErrorCallback): this;
+    pre(method: string, fn: HookSyncCallback, errorCb?: HookErrorCallback): this;
 
     /**
      * Adds a method call to the queue.
@@ -690,6 +758,29 @@ declare module "mongoose" {
     obj: any;
   }
 
+  // Hook functions: https://github.com/vkarpov15/hooks-fixed
+  interface HookSyncCallback {
+    (next: HookNextFunction, ...hookArgs:any[]): any;
+  }
+
+  interface HookAsyncCallback {
+    (next: HookNextFunction, done: HookDoneFunction, ...hookArgs: any[]): any;
+  }
+
+  interface HookErrorCallback {
+    (error: Error): any;
+  }
+
+  interface HookNextFunction {
+    (error: Error): any;
+    (...hookArgs: any[]): any;
+  }
+
+  interface HookDoneFunction {
+    (error: Error): any;
+    (...hookArgs: any[]): any;
+  }
+
   interface SchemaOptions {
     /** defaults to null (which means use the connection's autoIndex option) */
     autoIndex?: boolean;
@@ -711,7 +802,7 @@ declare module "mongoose" {
     minimize?: boolean;
     read?: string;
     /** defaults to true. */
-    safe?: boolean;
+    safe?: boolean | { w?: number | string; wtimeout?: number; j?: boolean };
     /** defaults to null */
     shardKey?: boolean;
     /** defaults to true */
@@ -748,7 +839,7 @@ declare module "mongoose" {
    * Intellisense for Schema definitions
    */
   interface SchemaDefinition {
-    [path: string]: SchemaTypeOpts<any>;
+    [path: string]: SchemaTypeOpts<any> | Schema | SchemaType;
   }
 
   /*
@@ -1084,8 +1175,13 @@ declare module "mongoose" {
   }
 
   interface MongooseDocumentOptionals {
-    /** The string version of this documents _id. */
-    id?: string;
+    /**
+     * Virtual getter that by default returns the document's _id field cast to a string,
+     * or in the case of ObjectIds, its hexString. This id getter may be disabled by
+     * passing the option { id: false } at schema construction time. If disabled, id
+     * behaves like any other field on a document and can be assigned any value.
+     */
+    id?: any;
   }
 
   interface DocumentToObjectOptions {
@@ -1563,7 +1659,7 @@ declare module "mongoose" {
      * getters/setters or other Mongoose magic applied.
      * @param bool defaults to true
      */
-    lean(bool?: boolean): Query<Object>;
+    lean(bool?: boolean): Query<object>;
 
     /** Specifies the maximum number of documents the query will return. Cannot be used with distinct() */
     limit(val: number): this;
@@ -2552,6 +2648,8 @@ declare module "mongoose" {
 
     /** Removes documents from the collection. */
     remove(conditions: Object, callback?: (err: any) => void): Query<void>;
+    deleteOne(conditions: Object, callback?: (err: any) => void): Query<void>;
+    deleteMany(conditions: Object, callback?: (err: any) => void): Query<void>;
 
     /**
      * Updates documents in the database without returning them.
@@ -2561,6 +2659,14 @@ declare module "mongoose" {
       callback?: (err: any, raw: any) => void): Query<any>;
     update(conditions: Object, doc: Object, options: ModelUpdateOptions,
       callback?: (err: any, raw: any) => void): Query<any>;
+    updateOne(conditions: Object, doc: Object,
+      callback?: (err: any, raw: any) => void): Query<any>;
+    updateOne(conditions: Object, doc: Object, options: ModelUpdateOptions,
+      callback?: (err: any, raw: any) => void): Query<any>;
+    updateMany(conditions: Object, doc: Object,
+      callback?: (err: any, raw: any) => void): Query<any>;
+    updateMany(conditions: Object, doc: Object, options: ModelUpdateOptions,
+      callback?: (err: any, raw: any) => void): Query<any>;
 
     /** Creates a Query, applies the passed conditions, and returns the Query. */
     where(path: string, val?: Object): Query<any>;
@@ -2664,7 +2770,7 @@ declare module "mongoose" {
     passRawResult?: boolean;
     /** overwrites the schema's strict mode option for this update */
     strict?: boolean;
-    /** 
+    /**
      * if true, run all setters defined on the associated model's schema for all fields
      * defined in the query and the update.
      */
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 7216ed73fb..92adb61d83 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -368,8 +368,8 @@ new mongoose.Schema({d: {type: Date, min: [
 new mongoose.Schema({
   integerOnly: {
     type: Number,
-    get: v => Math.round(v),
-    set: v => Math.round(v)
+    get: (v: number) => Math.round(v),
+    set: (v: number) => Math.round(v)
   }
 });
 new mongoose.Schema({ name: { type: String, validate: [
@@ -385,8 +385,14 @@ Animal['findByName']('fido', function(err: any, animals: any) {
 animalSchema.virtual('name.full').get(function () {
   return this.name.first + ' ' + this.name.last;
 });
-new mongoose.Schema({
-  child: { name: String }
+var childSchema = new mongoose.Schema({ name: String });
+var parentSchema = new mongoose.Schema({
+  children: [childSchema],
+  child: childSchema,
+  name: {
+    index: true,
+    required: true
+  }
 });
 new mongoose.Schema({
   eggs: {
@@ -424,6 +430,12 @@ new mongoose.Schema({
   }
 });
 
+export default function(schema: mongoose.Schema) {
+  schema.pre('init', function(this: mongoose.Document, next: (err?: Error) => void, data: any): void {
+    data.name = 'Hello world';
+  });
+}
+
 /*
  * section document.js
  * http://mongoosejs.com/docs/api.html#document-js
@@ -497,6 +509,25 @@ doc.populate(cb);
 doc.populate({path: 'hello'}).execPopulate().catch(cb);
 doc.update({$inc: {wheels:1}}, { w: 1 }, cb);
 
+const ImageSchema = new mongoose.Schema({
+  name: {type: String, required: true},
+  id: {type: Number, unique: true, required: true, index: true},
+}, { id: false });
+
+interface ImageDoc extends mongoose.Document {
+  name: string,
+  id: number
+}
+
+const ImageModel = mongoose.model<ImageDoc>('image', ImageSchema);
+
+ImageModel.findOne({}, function(err, doc) {
+  if (doc) {
+    doc.name;
+    doc.id;
+  }
+});
+
 /*
  * section types/subdocument.js
  * http://mongoosejs.com/docs/api.html#types-subdocument-js
@@ -1271,6 +1302,7 @@ mongoModel.remove(function (err, product) {
   if (err) throw(err);
   MongoModel.findById(product._id, function (err, product) {
     if (product) {
+      product.id.toLowerCase();
       product.remove();
     }
   });
@@ -1349,6 +1381,17 @@ MongoModel.findOne({ type: 'iphone' }, 'name').exec(function (err, adventure) {}
 MongoModel.findOne({ type: 'iphone' }, 'name', { lean: true }, cb);
 MongoModel.findOne({ type: 'iphone' }, 'name', { lean: true }).exec(cb);
 MongoModel.findOne({ type: 'iphone' }).select('name').lean().exec(cb);
+interface ModelUser {
+  _id: any;
+  name: string;
+  abctest: string;
+}
+MongoModel.findOne({ type: 'iphone' }).select('name').lean().exec()
+.then(function(doc: ModelUser) {
+  doc._id;
+  doc.name;
+  doc.abctest;
+});
 MongoModel.findOneAndRemove({}, {}, cb);
 MongoModel.findOneAndRemove({}, {});
 MongoModel.findOneAndRemove({}, cb);
diff --git a/types/mongoose/tslint.json b/types/mongoose/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mongoose/v3/mongoose-tests.ts b/types/mongoose/v3/mongoose-tests.ts
index 8a0f4896d4..ee56b9cc1b 100644
--- a/types/mongoose/v3/mongoose-tests.ts
+++ b/types/mongoose/v3/mongoose-tests.ts
@@ -143,8 +143,8 @@ Model.findOne({ name: 'john' }, (err: any, doc: mongoose.Document) => {
 
   doc.toJSON({ getters: true, virtuals: false });
   var data: any = doc.toObject();
-  delete data['age'];
-  delete data['weight'];
+  delete data['age']; // tslint:disable-line no-dynamic-delete
+  delete data['weight']; // tslint:disable-line no-dynamic-delete
   data['isAwesome'] = true;
 });
 
diff --git a/types/mongoose/v3/tslint.json b/types/mongoose/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongoose/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/monk/index.d.ts b/types/monk/index.d.ts
deleted file mode 100644
index 8e732bd9c4..0000000000
--- a/types/monk/index.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Type definitions for Monk v1.0.1
-// Project: https://github.com/LearnBoost/monk.git
-// Definitions by: Patrick Bartsch <https://github.com/wzr1337>
-// Definitions: https://github.com/DefinitelyTyped/Monk
-
-declare module "monk" {
-  function m(database: string): m.Monk;
-  module m {
-    export interface promise {
-      type:string
-      on(eventName:string, fn:Function):void;
-      error(fn:Function):promise;
-      success(fn:Function):promise;
-    }
-
-    export interface Collection {
-      id(hexstring:string):string // returns ObjectId
-      id(obj:Object):string // returns ObjectId
-      id():string // returns new generated ObjectId
-
-      /*
-      * All commands accept the simple data[, …], options and a callback.
-      * You can pass fields to select as an array: data[, …], ['field', …], fn
-      * You can pass fields as a string delimited by spaces: data[, …], 'field1 field2', fn
-      * To exclude a field, prefix the field name with '-': data[, …], '-field1', fn
-      */
-      cast(obj?:Object):Object;
-
-      count(needle:Object, fn?:Function):promise;
-
-      distinct(field:string, options?:Object, fn?:Function):promise;
-
-      drop(fn?:Function):promise;
-
-      insert(data:Object, options?:Object, fn?:Function):promise;
-
-      find(needle:Object, options?:Object, fn?:Function):promise;
-      findOne(needle:Object, options?:Object, fn?:Function):promise;
-      /**
-       * findAndModify
-       *
-       * @param {Object} search query, or { query, update } object
-       * @param {Object} optional, update object
-       * @param {Object|String|Array} optional, options or fields
-       * @param {Function} callback
-       * @return {Promise}
-       * @api public
-       */
-      findAndModify(needle:Object, update?:Object, filter?:string[], options?:Object, fn?:Function):promise;
-      findById(id:string, options?:Object, fn?:Function):promise;
-
-      update(needle:Object, update:Object, filter?:string[], options?:Object, fn?:Function):promise;
-      updateById(id:string, update:Object, filter?:string[], options?:Object, fn?:Function):promise;
-
-      remove(needle:Object, options?:Object, fn?:Function):promise;
-      removeById(id:string, options?:Object, fn?:Function):promise;
-
-    }
-
-    export interface Monk {
-      (database: string): void;
-      close():void;
-
-      get(collection:string):Collection;
-    }
-  }
-
-  export = m;
-}
diff --git a/types/monk/tsconfig.json b/types/monk/tsconfig.json
deleted file mode 100644
index 02963e3afd..0000000000
--- a/types/monk/tsconfig.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/moo/index.d.ts b/types/moo/index.d.ts
index 8bdc583cc9..9cf67c3299 100644
--- a/types/moo/index.d.ts
+++ b/types/moo/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for moo 0.3
+// Type definitions for moo 0.4
 // Project: https://github.com/tjvr/moo#readme
 // Definitions by: Nikita Litvin <https://github.com/deltaidea>
+//                 Jörg Vehlow <https://github.com/MofX>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace moo;
@@ -14,33 +15,43 @@ export function compile(rules: Rules): Lexer;
 
 export function states(states: {[x: string]: Rules}, start?: string): Lexer;
 
-export interface Rules {
-    [x: string]: RegExp | string | string[] | {
-        match: RegExp | string | string[],
-        /**
-         * Moo tracks detailed information about the input for you.
-         * It will track line numbers, as long as you apply the `lineBreaks: true`
-         * option to any tokens which might contain newlines. Moo will try to warn you if you forget to do this.
-         */
-        lineBreaks?: boolean,
-        /**
-         * Moves the lexer to a new state, and pushes the old state onto the stack.
-         */
-        push?: string,
-        /**
-         * Returns to a previous state, by removing one or more states from the stack.
-         */
-        pop?: number,
-        /**
-         * Moves to a new state, but does not affect the stack.
-         */
-        next?: string,
-        /**
-         * You can have a token type that both matches tokens and contains error values.
-         */
-        error?: true
+export interface Rule {
+    match?: RegExp | string | string[];
+    /**
+     * Moo tracks detailed information about the input for you.
+     * It will track line numbers, as long as you apply the `lineBreaks: true`
+     * option to any tokens which might contain newlines. Moo will try to warn you if you forget to do this.
+     */
+    lineBreaks?: boolean;
+    /**
+     * Moves the lexer to a new state, and pushes the old state onto the stack.
+     */
+    push?: string;
+    /**
+     * Returns to a previous state, by removing one or more states from the stack.
+     */
+    pop?: number;
+    /**
+     * Moves to a new state, but does not affect the stack.
+     */
+    next?: string;
+    /**
+     * You can have a token type that both matches tokens and contains error values.
+     */
+    error?: true;
+    /**
+     * Moo doesn't allow capturing groups, but you can supply a transform function, value(),
+     * which will be called on the value before storing it in the Token object.
+     */
+    value?: (x: string) => string;
+
+    keywords?: {
+        [x: string]: string | string[]
     };
 }
+export interface Rules {
+    [x: string]: RegExp | string | string[] | Rule;
+}
 
 export interface Lexer {
     /**
@@ -59,12 +70,14 @@ export interface Lexer {
     /**
      * Empty the internal buffer of the lexer, and set the line, column, and offset counts back to their initial value.
      */
-    reset(chunk: string, state?: LexerState): void;
+    reset(chunk?: string, state?: LexerState): void;
     /**
      * Returns current state, which you can later pass it as the second argument
      * to reset() to explicitly control the internal state of the lexer.
      */
     save(): LexerState;
+
+    [Symbol.iterator](): Iterator<Token>;
 }
 
 export interface Token {
@@ -77,7 +90,7 @@ export interface Token {
      */
     type?: string;
     /**
-     * The contents of the capturing group (or the whole match, if the token RegExp doesn't define a capture).
+     * The match contents.
      */
     value: string;
     /**
@@ -85,9 +98,9 @@ export interface Token {
      */
     offset: number;
     /**
-     * The total length of the match (value may be shorter if you have capturing groups).
+     * The complete match.
      */
-    size: number;
+    text: string;
     /**
      * The number of line breaks found in the match. (Always zero if this rule has lineBreaks: false.)
      */
diff --git a/types/moo/moo-tests.ts b/types/moo/moo-tests.ts
index 52defb99ce..6f0c18ae2d 100644
--- a/types/moo/moo-tests.ts
+++ b/types/moo/moo-tests.ts
@@ -2,28 +2,73 @@ import * as moo from 'moo';
 
 let lexer = moo.compile({
     lparen: '(',
-    word:  /[a-z]+/,
+    word: /[a-z]+/,
     rparen: ')',
     keyword: ['while', 'if', 'else', 'moo', 'cows']
 });
 
+lexer = moo.compile({
+    WS: /[ \t]+/,
+    comment: /\/\/.*?$/,
+    number: /0|[1-9][0-9]*/,
+    string: /"(?:\\["\\]|[^\n"\\])*"/,
+    lparen: '(',
+    rparen: ')',
+    keyword: ['while', 'if', 'else', 'moo', 'cows'],
+    NL: { match: /\n/, lineBreaks: true },
+});
+
+lexer = moo.compile({
+    IDEN: {
+        match: /[a-zA-Z]+/, keywords: {
+            KW: ['while', 'if', 'else', 'moo', 'reloacows']
+        }
+    },
+    SPACE: { match: /\s+/, lineBreaks: true }
+});
+
+lexer = moo.compile({
+    name: {
+        match: /[a-zA-Z]+/, keywords: {
+            'kw-class': 'class',
+            'kw-def': 'def',
+            'kw-if': 'if',
+        }
+    }
+});
+
 lexer = moo.states({
     main: {
-        strstart: {match: '`', push: 'lit'},
-        ident:    /\w+/,
-        lbrace:   {match: '{', push: 'main'},
-        rbrace:   {match: '}', pop: 1},
-        colon:    ':',
-        space:    {match: /\s+/, lineBreaks: true},
+        strstart: { match: '`', push: 'lit' },
+        ident: /\w+/,
+        lbrace: { match: '{', push: 'main' },
+        rbrace: { match: '}', pop: 1 },
+        colon: ':',
+        space: { match: /\s+/, lineBreaks: true },
     },
     lit: {
-        interp:   {match: '${', push: 'main'}, // tslint:disable-line no-invalid-template-strings
-        escape:   /\\./,
-        strend:   {match: '`', pop: 1},
-        const:    {match: /(?:[^$`]|\$(?!\{))+/, lineBreaks: true},
+        interp: { match: '${', push: 'main' }, // tslint:disable-line no-invalid-template-strings
+        escape: /\\./,
+        strend: { match: '`', pop: 1 },
+        const: { match: /(?:[^$`]|\$(?!\{))+/, lineBreaks: true },
     },
 });
 
+moo.compile({
+    myError: moo.error
+});
+
+moo.compile({
+    myError: { match: /[\$?`]/, error: true }
+});
+
+for (const here of lexer) {
+    const t: string | undefined = here.type;
+    const v: string = here.value;
+}
+
+const tokens: moo.Token[] = Array.from(lexer);
+
 lexer.reset('some line\n');
 const info = lexer.save();
 lexer.next();
diff --git a/types/moo/tsconfig.json b/types/moo/tsconfig.json
index 895fed83d5..e2659ef342 100644
--- a/types/moo/tsconfig.json
+++ b/types/moo/tsconfig.json
@@ -5,6 +5,7 @@
             "es6",
             "dom"
         ],
+        "target": "es6",
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/morgan/index.d.ts b/types/morgan/index.d.ts
index e557bd46d9..097758465a 100644
--- a/types/morgan/index.d.ts
+++ b/types/morgan/index.d.ts
@@ -49,8 +49,6 @@ declare namespace morgan {
          * client error codes, cyan for redirection codes, and uncolored for
          * all other codes.
          * :method :url :status :response-time ms - :res[content-length]
-         * @param format
-         * @param options
          */
         (format: 'dev', options?: Options): express.RequestHandler;
 
diff --git a/types/morris.js/tslint.json b/types/morris.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/morris.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mousetrap/index.d.ts b/types/mousetrap/index.d.ts
index afd0f42cf7..d55559e3af 100644
--- a/types/mousetrap/index.d.ts
+++ b/types/mousetrap/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mousetrap 1.5.x
+// Type definitions for Mousetrap 1.6.x
 // Project: http://craig.is/killing/mice
 // Definitions by: Dániel Tar <https://github.com/qcz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,6 +11,7 @@ interface ExtendedKeyboardEvent extends KeyboardEvent {
 interface MousetrapStatic {
     (el: Element): MousetrapInstance;
     new (el: Element): MousetrapInstance;
+    addKeycodes(keycodes: { [key: number]: string }): void;
     stopCallback: (e: ExtendedKeyboardEvent, element: Element, combo: string) => boolean;
     bind(keys: string|string[], callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
     unbind(keys: string|string[], action?: string): void;
diff --git a/types/mousetrap/test/index.ts b/types/mousetrap/test/index.ts
index 0ae40ea622..fae472b76f 100644
--- a/types/mousetrap/test/index.ts
+++ b/types/mousetrap/test/index.ts
@@ -39,6 +39,10 @@ Mousetrap.unbind('?');
 Mousetrap.trigger('esc');
 Mousetrap.trigger('esc', 'keyup');
 
+// Test that custom keycodes can be added.
+Mousetrap.addKeycodes({ 144: 'numlock' });
+Mousetrap.bind('numlock', function() { console.log('numlock'); });
+
 Mousetrap.reset();
 
 // Test that we can create an instance of mousetrap and attach the
diff --git a/types/mousetrap/tslint.json b/types/mousetrap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mousetrap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/move-concurrently/move-concurrently-tests.ts b/types/move-concurrently/move-concurrently-tests.ts
index 47fc14272c..58394efcfa 100644
--- a/types/move-concurrently/move-concurrently-tests.ts
+++ b/types/move-concurrently/move-concurrently-tests.ts
@@ -8,7 +8,9 @@ move('/path/to/thing', '/new/path/thing').then(() => {
 
 import * as Bluebird from 'bluebird';
 
-const promise = move('/path/to/thing', '/new/path/thing', { Promise: Bluebird })
+// tsc version: 2.7.0-dev.20171024
+// required type arguments!
+const promise = move<Bluebird<void>>('/path/to/thing', '/new/path/thing', { Promise: Bluebird })
   .then(() => {
     // thing is now moved!
   })
diff --git a/types/moviedb/tslint.json b/types/moviedb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/moviedb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/moxios/index.d.ts b/types/moxios/index.d.ts
index ee1b3e420f..b0cc379fef 100644
--- a/types/moxios/index.d.ts
+++ b/types/moxios/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Asuka Ito <https://github.com/itoasuka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { AxiosInstance } from "axios";
+import { AxiosInstance, AxiosRequestConfig } from "axios";
 
 interface Item {
     response?: any;
@@ -24,36 +24,29 @@ declare class Tracker {
     /**
      * Add an item to be tracked
      *
-     * @param {Object} item An item to be tracked
+     * @param item An item to be tracked
      */
     track(item: Item): void;
 
     /**
      * The count of items being tracked
-     *
-     * @return {number}
      */
     count(): number;
 
     /**
      * Get an item being tracked at a given index
      *
-     * @param {number} index The index for the item to retrieve
-     * @return {Object}
+     * @param index The index for the item to retrieve
      */
     at(index: number): Request;
 
     /**
      * Get the first item being tracked
-     *
-     * @return {Object}
      */
     first(): Request;
 
     /**
      * Get the most recent (last) item being tracked
-     *
-     * @return {Object}
      */
     mostRecent(): Request;
 
@@ -78,24 +71,31 @@ declare class Request {
     /**
      * Create a new Request object
      *
-     * @param {Function} resolve The function to call when Promise is resolved
-     * @param {Function} reject The function to call when Promise is rejected
-     * @param {Object} config The config object to be used for the request
+     * @param resolve The function to call when Promise is resolved
+     * @param reject The function to call when Promise is rejected
+     * @param config The config object to be used for the request
      */
-    constructor(resolve: (arg: any) => void, reject: (arg: any) => void, config: any);
+    constructor(resolve: (arg: any) => void, reject: (arg: any) => void, config: AxiosRequestConfig);
+
+    config: AxiosRequestConfig;
+    headers: any;
+    url: string;
+    timeout: number;
+    withCredentials: boolean;
+    responseType: string;
 
     /**
      * Respond to this request with a timeout result
      *
-     * @return {Promise} A Promise that rejects with a timeout result
+     * @return A Promise that rejects with a timeout result
      */
     respondWithTimeout(): Promise<Response>;
 
     /**
      * Respond to this request with a specified result
      *
-     * @param {Object} res The data representing the result of the request
-     * @return {Promise} A Promise that resolves once the response is ready
+     * @param res The data representing the result of the request
+     * @return A Promise that resolves once the response is ready
      */
     respondWith(res: Item): Promise<Response>;
 }
@@ -104,17 +104,18 @@ declare class Response {
     /**
      * Create a new Response object
      *
-     * @param {Request} req The Request that this Response is associated with
-     * @param {Object} res The data representing the result of the request
+     * @param req The Request that this Response is associated with
+     * @param res The data representing the result of the request
      */
     constructor(req: Request, res: any);
 
-    config: any;
+    config: AxiosRequestConfig;
     data?: any;
     status?: number;
     statusText?: string;
     headers: any;
     request: Request;
+    code?: string;
 }
 
 declare let moxios: {
@@ -136,8 +137,8 @@ declare let moxios: {
     /**
      * Stub a response to be used to respond to a request matching a URL or RegExp
      *
-     * @param {string|RegExp} urlOrRegExp A URL or RegExp to test against
-     * @param {Object} response The response to use when a match is made
+     * @param urlOrRegExp A URL or RegExp to test against
+     * @param response The response to use when a match is made
      */
     stubRequest(urlOrRegExp: string | RegExp, response: Item): void;
 
@@ -145,9 +146,9 @@ declare let moxios: {
      * Stub a response to be used one or more times to respond to a request matching a
      * method and a URL or RegExp.
      *
-     * @param {string} method An axios command
-     * @param {string|RegExp} urlOrRegExp A URL or RegExp to test against
-     * @param {Object} response The response to use when a match is made
+     * @param method An axios command
+     * @param urlOrRegExp A URL or RegExp to test against
+     * @param response The response to use when a match is made
      */
     stubOnce(method: string, urlOrRegExp: string | RegExp, response: Item): Promise<void>;
 
@@ -156,16 +157,16 @@ declare let moxios: {
      * timer fires, reject with a TimeoutException for simple assertions. The goal is
      * to show that a certain request was not made.
      *
-     * @param {string} method An axios command
-     * @param {string|RegExp} urlOrRegExp A URL or RegExp to test against
-     * @param {Object} response The response to use when a match is made
+     * @param method An axios command
+     * @param urlOrRegExp A URL or RegExp to test against
+     * @param response The response to use when a match is made
      */
     stubFailure(method: string, urlOrRegExp: string | RegExp, response: Item): Promise<void>;
 
     /**
      * Stub a timeout to be used to respond to a request matching a URL or RegExp
      *
-     * @param {string|RegExp} urlOrRegExp A URL or RegExp to test against
+     * @param urlOrRegExp A URL or RegExp to test against
      */
     stubTimeout(urlOrRegExp: string | RegExp): string;
 
@@ -174,7 +175,7 @@ declare let moxios: {
      * This will install the mock adapter, execute the function provided,
      * then uninstall the mock adapter once complete.
      *
-     * @param {Function} fn The function to be executed
+     * @param fn The function to be executed
      */
     withMock(fn: () => void): void;
 
@@ -183,8 +184,8 @@ declare let moxios: {
      * This is naively using a `setTimeout`.
      * May need to beef this up a bit in the future.
      *
-     * @param {Function} fn The function to execute once waiting is over
-     * @param {number} delay How much time in milliseconds to wait
+     * @param fn The function to execute once waiting is over
+     * @param delay How much time in milliseconds to wait
      */
     wait(fn: () => void, delay?: number): void;
 };
diff --git a/types/moxios/package.json b/types/moxios/package.json
index af2c4e3253..ab98e74e0b 100644
--- a/types/moxios/package.json
+++ b/types/moxios/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "axios": "^0.16.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/mpromise/tslint.json b/types/mpromise/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mpromise/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ms/tslint.json b/types/ms/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ms/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/msgpack-lite/index.d.ts b/types/msgpack-lite/index.d.ts
index 27c4fb619b..2148e03624 100644
--- a/types/msgpack-lite/index.d.ts
+++ b/types/msgpack-lite/index.d.ts
@@ -125,7 +125,7 @@ export interface CodecOptions {
    * @see https://github.com/kawanet/msgpack-lite#compatibility-mode
    * @default false
    */
-  raw?: boolean;
+  useraw?: boolean;
   /**
    * It decodes msgpack's int64/uint64 formats with int64-buffer object.
    * int64-buffer is a cutom integer type with 64 bits of precision instead
@@ -140,8 +140,14 @@ export interface CodecOptions {
   binarraybuffer?: boolean;
   /**
    * It returns Uint8Array object when encoding, instead of Buffer object.
+   * @default false
    */
   uint8array?: boolean;
+  /**
+   * It uses the global JavaScript Map type, if available, to unpack MessagePack map elements.
+   * @default false
+   */
+  usemap?: boolean;
 }
 
 export interface EncoderOptions {
diff --git a/types/msgpack-lite/msgpack-lite-tests.ts b/types/msgpack-lite/msgpack-lite-tests.ts
index 7e357c4b6a..781063e6d4 100644
--- a/types/msgpack-lite/msgpack-lite-tests.ts
+++ b/types/msgpack-lite/msgpack-lite-tests.ts
@@ -9,6 +9,18 @@ function encodingAndDecoding() {
   const data = msgpack.decode(buffer); // => {"foo": "bar"}
 }
 
+function customCodec() {
+  msgpack.createCodec({
+    preset: true,
+    safe: true,
+    useraw: true,
+    int64: true,
+    binarraybuffer: true,
+    uint8array: true,
+    usemap: true
+  });
+}
+
 // https://github.com/kawanet/msgpack-lite#writing-to-messagepack-stream
 function writingToStream() {
   const fs = require("fs");
diff --git a/types/msgpack/tslint.json b/types/msgpack/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/msgpack/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/msgpack5/tslint.json b/types/msgpack5/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/msgpack5/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/msnodesql/tslint.json b/types/msnodesql/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/msnodesql/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/msportalfx-test/index.d.ts b/types/msportalfx-test/index.d.ts
index c2d64f95d4..b7432ba973 100644
--- a/types/msportalfx-test/index.d.ts
+++ b/types/msportalfx-test/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://msazure.visualstudio.com/DefaultCollection/AzureUX/_git/portalfx-msportalfx-test
 // Definitions by: Julio Casal <https://github.com/julioct>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Q from "q";
 
diff --git a/types/msportalfx-test/tslint.json b/types/msportalfx-test/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/msportalfx-test/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mssql/tslint.json b/types/mssql/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mssql/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mu2/tslint.json b/types/mu2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mu2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/multer-gridfs-storage/index.d.ts b/types/multer-gridfs-storage/index.d.ts
index b9af5ed757..0a827bedcb 100644
--- a/types/multer-gridfs-storage/index.d.ts
+++ b/types/multer-gridfs-storage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/devconcept/multer-gridfs-storage
 // Definitions by: devconcept <https://github.com/devconcept>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { EventEmitter } from 'events';
 import { Express } from 'express';
diff --git a/types/multer-gridfs-storage/tsconfig.json b/types/multer-gridfs-storage/tsconfig.json
index 4729416ff1..1daa734d97 100644
--- a/types/multer-gridfs-storage/tsconfig.json
+++ b/types/multer-gridfs-storage/tsconfig.json
@@ -4,6 +4,11 @@
         "lib": [
             "es6"
         ],
+        "paths": {
+            "mongodb": [
+                "mongodb/v2"
+            ]
+        },
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/multer-gridfs-storage/v1/index.d.ts b/types/multer-gridfs-storage/v1/index.d.ts
index 67e6abe70b..c68e464a4c 100644
--- a/types/multer-gridfs-storage/v1/index.d.ts
+++ b/types/multer-gridfs-storage/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/devconcept/multer-gridfs-storage
 // Definitions by: devconcept <https://github.com/devconcept>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { EventEmitter } from 'events';
 import { Express } from 'express';
diff --git a/types/multer-s3/index.d.ts b/types/multer-s3/index.d.ts
index d4e0bc476c..a03e6ae36e 100644
--- a/types/multer-s3/index.d.ts
+++ b/types/multer-s3/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: KIM Jaesuck a.k.a. gim tcaesvk <https://github.com/tcaesvk>
 //                 Gal Talmor <https://github.com/galtalmor>
 // Definitions: https://github.com/DefinitelyType/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as AWS from "aws-sdk";
 import { StorageEngine } from "multer";
diff --git a/types/multer-s3/package.json b/types/multer-s3/package.json
index 6a583a47b0..3711406140 100644
--- a/types/multer-s3/package.json
+++ b/types/multer-s3/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "aws-sdk": "^2.37.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/multer/index.d.ts b/types/multer/index.d.ts
index 8682c57e3a..d019b9fdcb 100644
--- a/types/multer/index.d.ts
+++ b/types/multer/index.d.ts
@@ -6,7 +6,7 @@
 //                 Michael Ledin <https://github.com/mxl>
 //                 HyunSeob Lee <https://github.com/hyunseob>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 import * as express from 'express';
 
@@ -23,7 +23,8 @@ declare namespace multer {
         dest?: string;
         /** The storage engine to use for uploaded files. */
         storage?: StorageEngine;
-        /** An object specifying the size limits of the following optional properties. This object is passed to busboy
+        /**
+         * An object specifying the size limits of the following optional properties. This object is passed to busboy
          * directly, and the details of properties can be found on https://github.com/mscdex/busboy#busboy-methods
          */
         limits?: {
diff --git a/types/multimatch/index.d.ts b/types/multimatch/index.d.ts
index 3eeecc3791..67af567cfa 100644
--- a/types/multimatch/index.d.ts
+++ b/types/multimatch/index.d.ts
@@ -6,10 +6,8 @@
 /**
  * Match utility function which supports multiple pattern globbing.
  *
- * @param {string[]} paths list to match against.
- * @param {string[]} patterns globbing patterns to use. e.g. `[*, "!cake"]`.
- * @param {multimatch.MultimatchOptions} [options]
- * @returns {string[]}
+ * @param paths list to match against.
+ * @param patterns globbing patterns to use. e.g. `[*, "!cake"]`.
  */
 declare function multimatch(paths: string[], patterns: string | string[], options?: multimatch.MultimatchOptions): string[];
 
@@ -61,7 +59,8 @@ declare namespace multimatch {
 		/** Suppress the behavior of treating a leading `!` character as negation. */
 		nonegate?: boolean;
 
-		/** Returns from negate expressions the same as if they were not negated.
+		/**
+		 * Returns from negate expressions the same as if they were not negated.
 		 * (Ie, true on a hit, false on a miss.)
 		 */
 		flipNegate?: boolean;
diff --git a/types/multiparty/tslint.json b/types/multiparty/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/multiparty/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/multiplexjs/tslint.json b/types/multiplexjs/tslint.json
new file mode 100644
index 0000000000..ece4c342d1
--- /dev/null
+++ b/types/multiplexjs/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-eval": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/multisort/index.d.ts b/types/multisort/index.d.ts
new file mode 100644
index 0000000000..7768419f93
--- /dev/null
+++ b/types/multisort/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for multisort 0.5
+// Project: https://github.com/peterkhayes/multisort
+// Definitions by: Marek Buchar <https://github.com/CzBuCHi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Returns sorting function which sorts its argument by given criterions.
+ * @param sortings Sort criterions.
+ */
+declare function multisort<T>(
+    criterions: multisort.Criterion<T> | Array<multisort.Criterion<T>>,
+): multisort.SortFunction<T>;
+
+/**
+ * Sorts given array by given criterions.
+ * @param toSort Array to sort.
+ * @param sortings Sort criterions.
+ */
+declare function multisort<T>(
+    toSort: T[],
+    criterions: multisort.Criterion<T> | Array<multisort.Criterion<T>>,
+): T[];
+
+declare namespace multisort {
+    /**
+     * Functional evaluators don't need any transformation, and can't
+     *   have inverted order.
+     *
+     * Numerical evaluators sort the input directly if the criterion is
+     *   non-negative, and in inverted order if the criterion is negative.
+     *
+     * String evaluators sort the input based on objects properties.
+     * - Invert the sort if initial character is ! or ~.
+     * - Allow an initial dot: ".prop.subprop" as well as "prop.subprop".
+     * - Allow existential criterion by tailing question mark: "prop.subprop?".
+     */
+    type Criterion<T> = ((item: T) => any) | number | string;
+
+    /**
+     * Sorting function.
+     */
+    interface SortFunction<T> {
+        (toSort: T[]): void;
+        /**
+         * To allow this to plug in to other sorting mechanisms.
+         */
+        comparator: (a: T, b: T) => number;
+    }
+}
+
+export = multisort;
diff --git a/types/multisort/multisort-tests.ts b/types/multisort/multisort-tests.ts
new file mode 100644
index 0000000000..6fadab16ef
--- /dev/null
+++ b/types/multisort/multisort-tests.ts
@@ -0,0 +1,153 @@
+import * as multisort from 'multisort';
+
+const gameShowHosts = [
+    {
+        id: 1,
+        name: {
+            first: 'Bob',
+            last: 'Barker',
+        },
+        retired: true,
+        fame: 2,
+        show: 'The Price is Right',
+        say: {
+            name: () => 'Bob Barker',
+            catchphrase: (exclaimations: any) => {
+                if (!exclaimations) throw new Error('No arguments passed'); // To test that sorting function passes arguments in.
+                let catchphrase = 'Come on down';
+                for (let i = 0; i < exclaimations; i++) {
+                    catchphrase = catchphrase + '!';
+                }
+                return catchphrase;
+            },
+        },
+    },
+    {
+        id: 2,
+        name: {
+            first: 'Regis',
+            last: 'Philbin',
+        },
+        retired: true,
+        fame: 3,
+        show: 'Who Wants to be a Millionaire',
+        say: {
+            name: () => 'Regis Philbin',
+            catchphrase: (questionMarks: any) => {
+                if (!questionMarks) throw new Error('No arguments passed');
+                let catchphrase = 'Is that your final answer';
+                for (let i = 0; i < questionMarks; i++) {
+                    catchphrase = catchphrase + '?';
+                }
+                return catchphrase;
+            },
+        },
+    },
+    {
+        id: 3,
+        name: {
+            first: 'Alex',
+            last: 'Trebek',
+        },
+        fame: 3,
+        show: 'Jeopardy',
+        say: {
+            name: () => 'Alex Trebek',
+            catchphrase: (exclaimations: any) => {
+                if (!exclaimations) throw new Error('No arguments passed');
+                let catchphrase = 'This is Jeopardy';
+                for (let i = 0; i < exclaimations; i++) {
+                    catchphrase = catchphrase + '!';
+                }
+                return catchphrase;
+            },
+        },
+    },
+    {
+        id: 4,
+        name: {
+            first: 'Ben',
+            last: 'Bailey',
+        },
+        show: 'Cash Cab',
+        fame: 1,
+        retired: true,
+        say: {
+            name: () => 'Ben Bailey',
+            catchphrase: (exclaimations: any) => {
+                if (!exclaimations) throw new Error('No arguments passed');
+                let catchphrase = "You're in The Cash Cab";
+                for (let i = 0; i < exclaimations; i++) {
+                    catchphrase = catchphrase + '!';
+                }
+                return catchphrase;
+            },
+        },
+    },
+    {
+        id: 5,
+        name: {
+            first: 'Pat',
+            last: 'Sajak',
+        },
+        fame: 2,
+        show: 'Wheel of Fortune',
+        say: {
+            name: () => 'Pat Sajak',
+            catchphrase: (exclaimations: any) => {
+                if (!exclaimations) throw new Error('No arguments passed');
+                let catchphrase = 'Give the wheel a spin';
+                for (let i = 0; i < exclaimations; i++) {
+                    catchphrase = catchphrase + '!';
+                }
+                return catchphrase;
+            },
+        },
+    },
+];
+
+const input1 = [3, 4, 2, 5, 1];
+multisort(input1, 1);
+multisort(input1, (a) => a);
+
+const input2 = ['hello', [1], [1, 2], []];
+multisort(input2, 'length');
+
+const input3 = [
+    { prop: true },
+    { prop: undefined },
+    { prop: false },
+    { prop: null },
+];
+multisort(input3, 'prop?');
+multisort(gameShowHosts, 'say.name()');
+multisort(gameShowHosts, '~say.catchphrase(3)');
+
+const input4 = [
+    { name: 'dog' },
+    { name: 'Dog' },
+    { name: 'DOG' },
+    { name: 'demon' },
+    { name: 'Demon' },
+    { name: 'DEMON' },
+];
+multisort(input4, 'name.toLowerCase()');
+
+const input5 = ['dog', 'Dog', 'DOG', 'demon', 'Demon', 'DEMON'];
+multisort(input5, 'toLowerCase()');
+
+const input6: Array<{ func: () => any }> = [
+    { func: () => true },
+    { func: () => null },
+];
+multisort(input6, 'func()?');
+multisort(input6, 'func?');
+
+multisort(input1, [a => a % 2, a => a % 3, a => a]);
+multisort(gameShowHosts, ['~fame', 'retired', 'name.last']);
+
+const sorter = multisort<number>([a => a % 2, a => a % 3, a => a]);
+sorter(input1);
+
+const comparator = sorter.comparator;
+input1.sort(comparator);
diff --git a/types/multisort/tsconfig.json b/types/multisort/tsconfig.json
new file mode 100644
index 0000000000..d2d76512ef
--- /dev/null
+++ b/types/multisort/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "multisort-tests.ts"
+    ]
+}
diff --git a/types/multisort/tslint.json b/types/multisort/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/multisort/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/multistream/index.d.ts b/types/multistream/index.d.ts
new file mode 100644
index 0000000000..08a628e757
--- /dev/null
+++ b/types/multistream/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for multistream 2.1
+// Project: https://github.com/feross/multistream
+// Definitions by: mrmlnc <https://github.com/mrmlnc>, Kenzie Togami <https://github.com/kenzierocks>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Stream } from 'stream';
+
+declare function multistream(streams: multistream.Streams): NodeJS.ReadableStream;
+
+interface FactoryStreamCallback {
+    (err: Error | null, stream: null): any;
+    (err: null, stream: NodeJS.ReadableStream): any;
+}
+
+declare namespace multistream {
+    type LazyStream = () => Stream;
+    type FactoryStream = (cb: FactoryStreamCallback) => void;
+    type Streams = Array<LazyStream | NodeJS.ReadableStream> | FactoryStream;
+
+    function obj(streams: Streams): NodeJS.ReadableStream;
+}
+
+export = multistream;
diff --git a/types/multistream/multistream-tests.ts b/types/multistream/multistream-tests.ts
new file mode 100644
index 0000000000..d01e57a6e6
--- /dev/null
+++ b/types/multistream/multistream-tests.ts
@@ -0,0 +1,45 @@
+import fs = require('fs');
+import stream = require('stream');
+
+import through = require('through');
+import through2 = require('through2');
+import multistream = require('multistream');
+
+const readable = new stream.Readable();
+const writable = new stream.Writable();
+const transform = new stream.Transform();
+const duplex = new stream.Duplex();
+const pass = new stream.PassThrough();
+
+const streams = [
+    readable,
+    transform,
+    duplex,
+    pass,
+    through(),
+    through2(),
+    fs.createReadStream('.filepath'),
+    () => fs.createWriteStream('.filepath2')
+];
+
+const factory: multistream.FactoryStream = (cb) => {
+    if (1 === 1) return cb(null, fs.createReadStream('.filepath'));
+
+    cb(null, fs.createReadStream('.filepath'));
+    cb(null, null);
+    cb(new Error('some error'), null);
+
+    // $ExpectError
+    cb(new Error('some error'), fs.createReadStream('.filepath'));
+};
+
+// $ExpectType ReadableStream
+multistream(streams);
+multistream(factory);
+
+// $ExpectType ReadableStream
+multistream.obj(streams);
+multistream.obj(factory);
+
+// $ExpectError
+multistream([writable]);
diff --git a/types/multistream/tsconfig.json b/types/multistream/tsconfig.json
new file mode 100644
index 0000000000..3fa5cc7c47
--- /dev/null
+++ b/types/multistream/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "multistream-tests.ts"
+    ]
+}
diff --git a/types/multistream/tslint.json b/types/multistream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/multistream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/murmurhash-js/tslint.json b/types/murmurhash-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/murmurhash-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/murmurhash3js/tslint.json b/types/murmurhash3js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/murmurhash3js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/musicmetadata/tslint.json b/types/musicmetadata/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/musicmetadata/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mustache/tslint.json b/types/mustache/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mustache/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index d98ef82216..7d3281218f 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -1,129 +1,177 @@
-// Type definitions for node-mysql
-// Project: https://github.com/felixge/node-mysql
-// Definitions by: William Johnston <https://github.com/wjohnsto>
-//		   Kacper Polak <https://github.com/kacepe>
+// Type definitions for mysql 2.15
+// Project: https://github.com/mysqljs/mysql
+// Definitions by:  William Johnston <https://github.com/wjohnsto>
+// 	                Kacper Polak <https://github.com/kacepe>
+// 	                Krittanan Pingclasai <https://github.com/kpping>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-///<reference types="node" />
-
+/// <reference types="node" />
 
 import stream = require("stream");
+import tls = require("tls");
 
-declare function createConnection(connectionUri: string): IConnection;
-declare function createConnection(config: IConnectionConfig): IConnection;
-declare function createPool(config: IPoolConfig): IPool;
-declare function createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
-declare function escape(value: any): string;
-declare function format(sql: string): string;
-declare function format(sql: string, values: any[]): string;
-declare function format(sql: string, values: any): string;
+export interface EscapeFunctions {
+    escape(value: any, stringifyObjects?: boolean, timeZone?: string): string;
 
-interface IMySql {
-    createConnection(connectionUri: string): IConnection;
-    createConnection(config: IConnectionConfig): IConnection;
-    createPool(config: IPoolConfig): IPool;
-    createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
-    escape(value: any): string;
-    format(sql: string): string;
-    format(sql: string, values: any[]): string;
-    format(sql: string, values: any): string;
+    escapeId(value: string, forbidQualified?: boolean): string;
+
+    format(sql: string, values: any[], stringifyObjects?: boolean, timeZone?: string): string;
 }
 
-interface IConnectionStatic {
-    createQuery(sql: string): IQuery;
-    createQuery(sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
-    createQuery(sql: string, values: any[]): IQuery;
-    createQuery(sql: string, values: any[], callback: (err: IError, ...args: any[]) => void): IQuery;
-}
+// implements EscapeFunctions
+export function escape(value: any, stringifyObjects?: boolean, timeZone?: string): string;
 
-interface IConnection {
-    config: IConnectionConfig;
+export function escapeId(value: string, forbidQualified?: boolean): string;
 
-    threadId: number;
+export function format(sql: string, values: any[], stringifyObjects?: boolean, timeZone?: string): string;
 
-    beginTransaction(callback: (err: IError) => void): void;
+export function createConnection(connectionUri: string | ConnectionConfig): Connection;
 
-    connect(): void;
-    connect(callback: (err: IError, ...args: any[]) => void): void;
-    connect(options: any, callback?: (err: IError, ...args: any[]) => void): void;
+export function createPool(config: PoolConfig | string): Pool;
 
-    commit(callback: (err: IError) => void): void;
+export function createPoolCluster(config?: PoolClusterConfig): PoolCluster;
 
-    changeUser(options: IConnectionOptions): void;
-    changeUser(options: IConnectionOptions, callback: (err: IError) => void): void;
+export function raw(sql: string): () => string;
 
-    query: IQueryFunction;
+export interface Connection extends EscapeFunctions {
+    config: ConnectionConfig;
 
-    end(): void;
-    end(callback: (err: IError, ...args: any[]) => void): void;
-    end(options: any, callback: (err: IError, ...args: any[]) => void): void;
+    state: 'connected' | 'authenticated' | 'disconnected' | 'protocol_error' | string;
 
-    ping(callback: (err: IError) => void): void;
+    threadId: number | null;
+
+    createQuery: QueryFunction;
+
+    connect(callback?: (err: MysqlError, ...args: any[]) => void): void;
+
+    connect(options: any, callback?: (err: MysqlError, ...args: any[]) => void): void;
+
+    changeUser(options: ConnectionOptions, callback?: (err: MysqlError) => void): void;
+    changeUser(callback: (err: MysqlError) => void): void;
+
+    beginTransaction(options?: QueryOptions, callback?: (err: MysqlError) => void): void;
+
+    beginTransaction(callback: (err: MysqlError) => void): void;
+
+    commit(options?: QueryOptions, callback?: (err: MysqlError) => void): void;
+    commit(callback: (err: MysqlError) => void): void;
+
+    rollback(options?: QueryOptions, callback?: (err: MysqlError) => void): void;
+    rollback(callback: (err: MysqlError) => void): void;
+
+    query: QueryFunction;
+
+    ping(options?: QueryOptions, callback?: (err: MysqlError) => void): void;
+    ping(callback: (err: MysqlError) => void): void;
+
+    statistics(options?: QueryOptions, callback?: (err: MysqlError) => void): void;
+    statistics(callback: (err: MysqlError) => void): void;
+
+    end(callback?: (err: MysqlError, ...args: any[]) => void): void;
+    end(options: any, callback: (err: MysqlError, ...args: any[]) => void): void;
 
     destroy(): void;
 
     pause(): void;
 
-    release(): void;
     resume(): void;
 
-    escape(value: any): string;
+    on(ev: 'drain' | 'connect', callback: () => void): Connection;
 
-    escapeId(value: string): string;
-    escapeId(values: string[]): string;
+    on(ev: 'end', callback: (err?: MysqlError) => void): Connection;
 
-    format(sql: string): string;
-    format(sql: string, values: any[]): string;
-    format(sql: string, values: any): string;
+    on(ev: 'fields', callback: (fields: any[]) => void): Connection;
 
-    on(ev: string, callback: (...args: any[]) => void): IConnection;
-    on(ev: 'error', callback: (err: IError) => void): IConnection;
+    on(ev: 'error', callback: (err: MysqlError) => void): Connection;
 
-    rollback(callback: () => void): void;
+    on(ev: 'enqueue', callback: (...args: any[]) => void): Connection;
+
+    on(ev: string, callback: (...args: any[]) => void): this;
 }
 
-interface IPool {
-    config: IPoolConfig;
-
-    getConnection(callback: (err: IError, connection: IConnection) => void): void;
-
-    query: IQueryFunction;
+export interface PoolConnection extends Connection {
+    release(): void;
 
     end(): void;
-    end(callback: (err: IError, ...args: any[]) => void): void;
 
-    on(ev: string, callback: (...args: any[]) => void): IPool;
-    on(ev: 'connection', callback: (connection: IConnection) => void): IPool;
-    on(ev: 'error', callback: (err: IError) => void): IPool;
+    destroy(): void;
 }
 
-interface IPoolCluster {
-    config: IPoolClusterConfig;
+export interface Pool extends EscapeFunctions {
+    config: PoolConfig;
 
-    add(config: IPoolConfig): void;
-    add(group: string, config: IPoolConfig): void;
+    getConnection(callback: (err: MysqlError, connection: PoolConnection) => void): void;
 
-    end(callback?: (err: IError, ...args: any[]) => void): void;
+    acquireConnection(connection: PoolConnection, callback: (err: MysqlError, connection: PoolConnection) => void): void;
 
-    getConnection(callback: (err: IError, connection: IConnection) => void): void;
-    getConnection(group: string, callback: (err: IError, connection: IConnection) => void): void;
-    getConnection(group: string, selector: string, callback: (err: IError, connection: IConnection) => void): void;
+    releaseConnection(connection: PoolConnection): void;
 
-    of(pattern: string): IPool;
-    of(pattern: string, selector: string): IPool;
+    end(callback?: (err: MysqlError) => void): void;
 
-    on(ev: string, callback: (...args: any[]) => void): IPoolCluster;
-    on(ev: 'remove', callback: (nodeId: number) => void): IPoolCluster;
-    on(ev: 'connection', callback: (connection: IConnection) => void): IPoolCluster;
-    on(ev: 'error', callback: (err: IError) => void): IPoolCluster;
+    query: QueryFunction;
+
+    on(ev: 'connection' | 'acquire' | 'release', callback: (connection: PoolConnection) => void): Pool;
+
+    on(ev: 'error', callback: (err: MysqlError) => void): Pool;
+
+    on(ev: 'enqueue', callback: (err?: MysqlError) => void): Pool;
+
+    on(ev: string, callback: (...args: any[]) => void): Pool;
 }
 
-interface IQuery {
+export interface PoolCluster {
+    config: PoolClusterConfig;
+
+    add(config: PoolConfig): void;
+
+    add(id: string, config: PoolConfig): void;
+
+    end(callback?: (err: MysqlError) => void): void;
+
+    of(pattern: string, selector?: string): Pool;
+    of(pattern: undefined | null | false, selector: string): Pool;
+
     /**
-     * The SQL for a constructed query
+     * remove all pools which match pattern
+     */
+    remove(pattern: string): void;
+
+    getConnection(callback: (err: MysqlError, connection: PoolConnection) => void): void;
+
+    getConnection(pattern: string, callback: (err: MysqlError, connection: PoolConnection) => void): void;
+
+    getConnection(pattern: string, selector: string, callback: (err: MysqlError, connection: PoolConnection) => void): void;
+
+    on(ev: string, callback: (...args: any[]) => void): PoolCluster;
+
+    on(ev: 'remove' | 'offline' | 'remove', callback: (nodeId: string) => void): PoolCluster;
+}
+
+// related to Query
+export type packetCallback = (packet: any) => void;
+
+export interface Query {
+    /**
+     * Template query
      */
     sql: string;
 
+    /**
+     * Values for template query
+     */
+    values?: string[];
+
+    /**
+     * Default true
+     */
+    typeCast?: TypeCast;
+
+    /**
+     * Default false
+     */
+    nestedTables: boolean;
+
     /**
      * Emits a query packet to start the query
      */
@@ -131,105 +179,105 @@ interface IQuery {
 
     /**
      * Determines the packet class to use given the first byte of the packet.
-     * 
-     * @param firstByte The first byte of the packet
+     *
+     * @param byte The first byte of the packet
      * @param parser The packet parser
      */
-    determinePacket(firstByte: number, parser: any): any;
+    determinePacket(byte: number, parser: any): any;
+
+    OkPacket: packetCallback;
+    ErrorPacket: packetCallback;
+    ResultSetHeaderPacket: packetCallback;
+    FieldPacket: packetCallback;
+    EofPacket: packetCallback;
+
+    RowDataPacket(packet: any, parser: any, connection: Connection): void;
 
     /**
      * Creates a Readable stream with the given options
-     * 
-     * @param options The options for the stream.
+     *
+     * @param options The options for the stream. (see readable-stream package)
      */
-    stream(options: IStreamOptions): stream.Readable;
+    stream(options?: stream.ReadableOptions): stream.Readable;
 
-    /**
-     * Pipes a stream downstream, providing automatic pause/resume based on the 
-     * options sent to the stream.
-     * 
-     * @param options The options for the stream.
-     */
-    pipe(callback: (...args: any[]) => void): IQuery;
+    on(ev: string, callback: (...args: any[]) => void): Query;
 
-    on(ev: string, callback: (...args: any[]) => void): IQuery;
-    on(ev: 'error', callback: (err: IError) => void): IQuery;
-    on(ev: 'fields', callback: (fields: IFieldInfo[], index: number) => void): IQuery;
-    on(ev: 'result', callback: (row: any, index: number) => void): IQuery;
-    on(ev: 'end', callback: () => void): IQuery;
+    on(ev: 'result', callback: (row: any, index: number) => void): Query;
+
+    on(ev: 'error', callback: (err: MysqlError) => void): Query;
+
+    on(ev: 'fields', callback: (fields: FieldInfo[], index: number) => void): Query;
+
+    on(ev: 'packet', callback: (packet: any) => void): Query;
+
+    on(ev: 'end', callback: () => void): Query;
 }
 
-interface IQueryFunction {
-    (sql: string): IQuery;
-    (sql: string, callback: (err: IError, results?: any, fields?: IFieldInfo[]) => void): IQuery;
-    (sql: string, values: any[]): IQuery;
-    (sql: string, values: any[], callback: (err: IError, results?: any, fields?: IFieldInfo[]) => void): IQuery;
-    (sql: string, values: any): IQuery;
-    (sql: string, values: any, callback: (err: IError, results?: any, fields?: IFieldInfo[]) => void): IQuery;
-    (options: IQueryOptions): IQuery;
-    (options: IQueryOptions, callback: (err: IError, results?: any, fields?: IFieldInfo[]) => void): IQuery;
-    (options: IQueryOptions, values: any[]): IQuery;
-    (options: IQueryOptions, values: any[], callback: (err: IError, results?: any, fields?: IFieldInfo[]) => void): IQuery;
-    (options: IQueryOptions, values: any): IQuery;
-    (options: IQueryOptions, values: any, callback: (err: IError, results?: any, fields?: IFieldInfo[]) => void): IQuery;
+export interface GeometryType extends Array<{x: number, y: number} | GeometryType> {
+    x: number;
+    y: number;
 }
 
-interface IQueryOptions {
+export type TypeCast = boolean | (
+    (field: FieldInfo
+        & { type: string, length: number, string(): string, buffer(): Buffer, geometry(): null |  GeometryType},
+    next: () => void) => any);
+
+export type queryCallback = (err: MysqlError | null, results?: any, fields?: FieldInfo[]) => void;
+
+// values can be non [], see custom format (https://github.com/mysqljs/mysql#custom-format)
+export interface QueryFunction {
+    (query: Query): Query;
+
+    (options: string | QueryOptions, callback?: queryCallback): Query;
+
+    (options: string, values: any, callback?: queryCallback): Query;
+}
+
+export interface QueryOptions {
     /**
      * The SQL for the query
      */
     sql: string;
 
     /**
-     * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for 
-     * operations. It is important to note that these timeouts are not part of the MySQL protocol, and rather timeout 
-     * operations through the client. This means that when a timeout is reached, the connection it occurred on will be 
+     * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for
+     * operations. It is important to note that these timeouts are not part of the MySQL protocol, and rather timeout
+     * operations through the client. This means that when a timeout is reached, the connection it occurred on will be
      * destroyed and no further operations can be performed.
      */
     timeout?: number;
 
     /**
-     * Either a boolean or string. If true, tables will be nested objects. If string (e.g. '_'), tables will be 
+     * Either a boolean or string. If true, tables will be nested objects. If string (e.g. '_'), tables will be
      * nested as tableName_fieldName
      */
     nestTables?: any;
 
     /**
-     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
+     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future)
      * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
-     * 
+     *
      * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
-     * 
+     *
      * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
-     * 
+     *
      * field.string()
      * field.buffer()
      * field.geometry()
-     * 
+     *
      * are aliases for
-     * 
+     *
      * parser.parseLengthCodedString()
      * parser.parseLengthCodedBuffer()
      * parser.parseGeometryValue()
-     * 
+     *
      * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
      */
-    typeCast?: any;
+    typeCast?: TypeCast;
 }
 
-interface IStreamOptions {
-    /**
-     * Sets the max buffer size in objects of a stream
-     */
-    highWaterMark?: number;
-
-    /**
-     * The object mode of the stream (Default: true)
-     */
-    objectMode?: any;
-}
-
-interface IConnectionOptions {
+export interface ConnectionOptions {
     /**
      * The MySQL user to authenticate as
      */
@@ -246,14 +294,19 @@ interface IConnectionOptions {
     database?: string;
 
     /**
-     * The charset for the connection. This is called "collation" in the SQL-level of MySQL (like utf8_general_ci). 
-     * If a SQL-level charset is specified (like utf8mb4) then the default collation for that charset is used. 
+     * The charset for the connection. This is called "collation" in the SQL-level of MySQL (like utf8_general_ci).
+     * If a SQL-level charset is specified (like utf8mb4) then the default collation for that charset is used.
      * (Default: 'UTF8_GENERAL_CI')
      */
     charset?: string;
+
+    /**
+     * Number of milliseconds
+     */
+    timeout?: number;
 }
 
-interface IConnectionConfig extends IConnectionOptions {
+export interface ConnectionConfig extends ConnectionOptions {
     /**
      * The hostname of the database you are connecting to. (Default: localhost)
      */
@@ -295,64 +348,64 @@ interface IConnectionConfig extends IConnectionOptions {
     insecureAuth?: boolean;
 
     /**
-     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
+     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future)
      * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
-     * 
+     *
      * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
-     * 
+     *
      * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
-     * 
+     *
      * field.string()
      * field.buffer()
      * field.geometry()
-     * 
+     *
      * are aliases for
-     * 
+     *
      * parser.parseLengthCodedString()
      * parser.parseLengthCodedBuffer()
      * parser.parseGeometryValue()
-     * 
+     *
      * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
      */
-    typeCast?: any;
+    typeCast?: TypeCast;
 
     /**
      * A custom query format function
      */
-    queryFormat?: (query: string, values: any) => void;
+    queryFormat?(query: string, values: any): void;
 
     /**
-     * When dealing with big numbers (BIGINT and DECIMAL columns) in the database, you should enable this option 
+     * When dealing with big numbers (BIGINT and DECIMAL columns) in the database, you should enable this option
      * (Default: false)
      */
     supportBigNumbers?: boolean;
 
     /**
-     * Enabling both supportBigNumbers and bigNumberStrings forces big numbers (BIGINT and DECIMAL columns) to be 
-     * always returned as JavaScript String objects (Default: false). Enabling supportBigNumbers but leaving 
-     * bigNumberStrings disabled will return big numbers as String objects only when they cannot be accurately 
-     * represented with [JavaScript Number objects] (http://ecma262-5.com/ELS5_HTML.htm#Section_8.5) 
-     * (which happens when they exceed the [-2^53, +2^53] range), otherwise they will be returned as Number objects. 
+     * Enabling both supportBigNumbers and bigNumberStrings forces big numbers (BIGINT and DECIMAL columns) to be
+     * always returned as JavaScript String objects (Default: false). Enabling supportBigNumbers but leaving
+     * bigNumberStrings disabled will return big numbers as String objects only when they cannot be accurately
+     * represented with [JavaScript Number objects] (http://ecma262-5.com/ELS5_HTML.htm#Section_8.5)
+     * (which happens when they exceed the [-2^53, +2^53] range), otherwise they will be returned as Number objects.
      * This option is ignored if supportBigNumbers is disabled.
      */
     bigNumberStrings?: boolean;
 
     /**
-     * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript Date 
+     * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript Date
      * objects. (Default: false)
      */
     dateStrings?: boolean;
 
     /**
-     * This will print all incoming and outgoing packets on stdout. 
+     * This will print all incoming and outgoing packets on stdout.
      * You can also restrict debugging to packet types by passing an array of types (strings) to debug;
-     * 
+     *
      * (Default: false)
      */
-    debug?: any;
+    debug?: boolean | string[] | Types[];
 
     /**
-     * Generates stack traces on Error to include call site of library entrance ("long stack traces"). Slight 
+     * Generates stack traces on errors to include call site of library entrance ("long stack traces"). Slight
      * performance penalty for most calls. (Default: true)
      */
     trace?: boolean;
@@ -370,19 +423,19 @@ interface IConnectionConfig extends IConnectionOptions {
     /**
      * object with ssl parameters or a string containing name of ssl profile
      */
-    ssl?: any;
+    ssl?: string | (tls.SecureContextOptions & { rejectUnauthorized?: boolean });
 }
 
-interface IPoolConfig extends IConnectionConfig {
+export interface PoolConfig extends ConnectionConfig {
     /**
-     * The milliseconds before a timeout occurs during the connection acquisition. This is slightly different from connectTimeout, 
+     * The milliseconds before a timeout occurs during the connection acquisition. This is slightly different from connectTimeout,
      * because acquiring a pool connection does not always involve making a connection. (Default: 10 seconds)
      */
     acquireTimeout?: number;
 
     /**
-     * Determines the pool's action when no connections are available and the limit has been reached. If true, the pool will queue 
-     * the connection request and call it when one becomes available. If false, the pool will immediately call back with an error. 
+     * Determines the pool's action when no connections are available and the limit has been reached. If true, the pool will queue
+     * the connection request and call it when one becomes available. If false, the pool will immediately call back with an error.
      * (Default: true)
      */
     waitForConnections?: boolean;
@@ -393,20 +446,20 @@ interface IPoolConfig extends IConnectionConfig {
     connectionLimit?: number;
 
     /**
-     * The maximum number of connection requests the pool will queue before returning an error from getConnection. If set to 0, there 
+     * The maximum number of connection requests the pool will queue before returning an error from getConnection. If set to 0, there
      * is no limit to the number of queued connection requests. (Default: 0)
      */
     queueLimit?: number;
 }
 
-interface IPoolClusterConfig {
+export interface PoolClusterConfig {
     /**
      * If true, PoolCluster will attempt to reconnect when connection fails. (Default: true)
      */
     canRetry?: boolean;
 
     /**
-     * If connection fails, node's errorCount increases. When errorCount is greater than removeNodeErrorCount, 
+     * If connection fails, node's errorCount increases. When errorCount is greater than removeNodeErrorCount,
      * remove a node in the PoolCluster. (Default: 5)
      */
     removeNodeErrorCount?: number;
@@ -426,47 +479,10 @@ interface IPoolClusterConfig {
     defaultSelector?: string;
 }
 
-interface ISslCredentials {
+export interface MysqlError extends Error {
     /**
-     * A string or buffer holding the PFX or PKCS12 encoded private key, certificate and CA certificates
-     */
-    pfx?: string;
-
-    /**
-     * A string holding the PEM encoded private key
-     */
-    key?: string;
-
-    /**
-     * A string of passphrase for the private key or pfx
-     */
-    passphrase?: string;
-
-    /**
-     * A string holding the PEM encoded certificate
-     */
-    cert?: string;
-
-    /**
-     * Either a string or list of strings of PEM encoded CA certificates to trust.
-     */
-    ca?: string[];
-
-    /**
-     * Either a string or list of strings of PEM encoded CRLs (Certificate Revocation List)
-     */
-    crl?: string[];
-
-    /**
-     * A string describing the ciphers to use or exclude
-     */
-    ciphers?: string;
-}
-
-interface IError extends Error {
-    /**
-     * Either a MySQL server error (e.g. 'ER_ACCESS_DENIED_ERROR'), 
-     * a node.js error (e.g. 'ECONNREFUSED') or an internal error 
+     * Either a MySQL server error (e.g. 'ER_ACCESS_DENIED_ERROR'),
+     * a node.js error (e.g. 'ECONNREFUSED') or an internal error
      * (e.g. 'PROTOCOL_CONNECTION_LOST').
      */
     code: string;
@@ -507,53 +523,53 @@ interface IError extends Error {
     sql?: string;
 }
 
-declare const enum FieldType {
-	DECIMAL    = 0x00, // aka DECIMAL (http://dev.mysql.com/doc/refman/5.0/en/precision-math-decimal-changes.html)
-	TINY       = 0x01, // aka TINYINT, 1 byte
-	SHORT      = 0x02, // aka SMALLINT, 2 bytes
-	LONG       = 0x03, // aka INT, 4 bytes
-	FLOAT      = 0x04, // aka FLOAT, 4-8 bytes
-	DOUBLE     = 0x05, // aka DOUBLE, 8 bytes
-	NULL       = 0x06, // NULL (used for prepared statements, I think)
-	TIMESTAMP  = 0x07, // aka TIMESTAMP
-	LONGLONG   = 0x08, // aka BIGINT, 8 bytes
-	INT24      = 0x09, // aka MEDIUMINT, 3 bytes
-	DATE       = 0x0a, // aka DATE
-	TIME       = 0x0b, // aka TIME
-	DATETIME   = 0x0c, // aka DATETIME
-	YEAR       = 0x0d, // aka YEAR, 1 byte (don't ask)
-	NEWDATE    = 0x0e, // aka ?
-	VARCHAR    = 0x0f, // aka VARCHAR (?)
-	BIT        = 0x10, // aka BIT, 1-8 byte
-	NEWDECIMAL = 0xf6, // aka DECIMAL
-	ENUM       = 0xf7, // aka ENUM
-	SET        = 0xf8, // aka SET
-	TINY_BLOB  = 0xf9, // aka TINYBLOB, TINYTEXT
-	MEDIUM_BLOB = 0xfa, // aka MEDIUMBLOB, MEDIUMTEXT
-	LONG_BLOB  = 0xfb, // aka LONGBLOG, LONGTEXT
-	BLOB       = 0xfc, // aka BLOB, TEXT
-	VAR_STRING = 0xfd, // aka VARCHAR, VARBINARY
-	STRING     = 0xfe, // aka CHAR, BINARY
-	GEOMETRY   = 0xff // aka GEOMETRY
+export const enum Types {
+    DECIMAL = 0x00, // aka DECIMAL (http://dev.mysql.com/doc/refman/5.0/en/precision-math-decimal-changes.html)
+    TINY = 0x01, // aka TINYINT, 1 byte
+    SHORT = 0x02, // aka SMALLINT, 2 bytes
+    LONG = 0x03, // aka INT, 4 bytes
+    FLOAT = 0x04, // aka FLOAT, 4-8 bytes
+    DOUBLE = 0x05, // aka DOUBLE, 8 bytes
+    NULL = 0x06, // NULL (used for prepared statements, I think)
+    TIMESTAMP = 0x07, // aka TIMESTAMP
+    LONGLONG = 0x08, // aka BIGINT, 8 bytes
+    INT24 = 0x09, // aka MEDIUMINT, 3 bytes
+    DATE = 0x0a, // aka DATE
+    TIME = 0x0b, // aka TIME
+    DATETIME = 0x0c, // aka DATETIME
+    YEAR = 0x0d, // aka YEAR, 1 byte (don't ask)
+    NEWDATE = 0x0e, // aka ?
+    VARCHAR = 0x0f, // aka VARCHAR (?)
+    BIT = 0x10, // aka BIT, 1-8 byte
+    TIMESTAMP2 = 0x11, // aka TIMESTAMP with fractional seconds
+    DATETIME2 = 0x12, // aka DATETIME with fractional seconds
+    TIME2 = 0x13, // aka TIME with fractional seconds
+    JSON = 0xf5, // aka JSON
+    NEWDECIMAL = 0xf6, // aka DECIMAL
+    ENUM = 0xf7, // aka ENUM
+    SET = 0xf8, // aka SET
+    TINY_BLOB = 0xf9, // aka TINYBLOB, TINYTEXT
+    MEDIUM_BLOB = 0xfa, // aka MEDIUMBLOB, MEDIUMTEXT
+    LONG_BLOB = 0xfb, // aka LONGBLOG, LONGTEXT
+    BLOB = 0xfc, // aka BLOB, TEXT
+    VAR_STRING = 0xfd, // aka VARCHAR, VARBINARY
+    STRING = 0xfe, // aka CHAR, BINARY
+    GEOMETRY = 0xff, // aka GEOMETRY
 }
 
-interface IFieldInfo {
-	catalog: string;
-	db: string;
-	table: string;
-	orgTable: string;
-	name: string;
-	orgName: string;
-	charsetNr: number;
-	length: number;
-	/**
-	 * @see Types interface
-	 */
-	type: FieldType;
-	flags: number;
-	decimals: number;
-	default: any;
-	zeroFill: boolean;
-	protocol41: boolean;
-
+export interface FieldInfo {
+    catalog: string;
+    db: string;
+    table: string;
+    orgTable: string;
+    name: string;
+    orgName: string;
+    charsetNr: number;
+    length: number;
+    type: Types;
+    flags: number;
+    decimals: number;
+    default?: string;
+    zeroFill: boolean;
+    protocol41: boolean;
 }
diff --git a/types/mysql/mysql-tests.ts b/types/mysql/mysql-tests.ts
index d2c44e21ee..a3ddb27248 100644
--- a/types/mysql/mysql-tests.ts
+++ b/types/mysql/mysql-tests.ts
@@ -3,21 +3,22 @@ import mysql = require('mysql');
 import stream = require('stream');
 
 /// Connections
-var connection = mysql.createConnection({
+let connection = mysql.createConnection({
     host: 'localhost',
     user: 'me',
-    password: 'secret'
+    password: 'test'
 });
 
 connection.connect();
 
-connection.query('SELECT 1 + 1 AS solution', function (err, rows, fields) {
+connection.query('SELECT 1 + 1 AS solution', (err, rows, fields) => {
     if (err) throw err;
 
     console.log('The solution is: ', rows[0].solution);
 });
 
-connection.end(function (err) {});
+connection.end(err => {
+});
 
 connection = mysql.createConnection({
     host: 'example.org',
@@ -25,19 +26,24 @@ connection = mysql.createConnection({
     password: 'secret'
 });
 
-connection.connect(function (err) {
+connection.connect(err => {
     if (err) {
-        console.error('error connecting: ' + err.stack);
+        console.error(`error connecting: ${err.stack}`);
         return;
     }
 
-    console.log('connected as id ' + connection.threadId);
+    console.log(`connected as id ${connection.threadId}`);
 });
 
-connection.query('SELECT 1', function (err, rows) {
+connection.query('SELECT 1', (err, rows) => {
     // connected! (unless `err` is set)
 });
 
+connection = mysql.createConnection({
+    host: 'localhost',
+    ssl: 'Amazon RDS'
+});
+
 connection = mysql.createConnection({
     host: 'localhost',
     ssl: {
@@ -54,66 +60,68 @@ connection = mysql.createConnection({
     }
 });
 
-connection.end(function (err) {
+connection.end(err => {
     // The connection is terminated now
 });
 
 connection.destroy();
 
-connection.changeUser({ user: 'john' }, function (err) {
-    if (err) throw err;
+connection.changeUser({user: 'john'}, err => {
+    if (err) console.error('SHOULD BE ERROR');
 });
 
-var userId = 'some user provided value';
-var sql = 'SELECT * FROM users WHERE id = ' + connection.escape(userId);
-connection.query(sql, function (err, results) {
+connection = mysql.createConnection({
+    host: 'localhost',
+    user: 'me',
+    password: 'test'
+});
+
+const userId = 'some user provided value';
+let sql = `SELECT * FROM users WHERE id = ${connection.escape(userId)}`;
+connection.query(sql, (err, results) => {
     // ...
 });
-connection.query('SELECT * FROM users WHERE id = ?', [userId], function (err, results) {
+connection.query('SELECT * FROM users WHERE id = ?', [userId], (err, results) => {
     // ...
 });
 
-var post = { id: 1, title: 'Hello MySQL' };
-var query = connection.query('INSERT INTO posts SET ?', post, function (err, result) {
+const post = {id: 1, title: 'Hello MySQL'};
+const queryx = connection.query('INSERT INTO posts SET ?', post, (err, result) => {
     // Neat!
 });
-console.log(query.sql); // INSERT INTO posts SET `id` = 1, `title` = 'Hello MySQL'
+console.log(queryx.sql); // INSERT INTO posts SET `id` = 1, `title` = 'Hello MySQL'
 
-var queryStr = "SELECT * FROM posts WHERE title=" + mysql.escape("Hello MySQL");
+const queryStr = `SELECT * FROM posts WHERE title=${mysql.escape("Hello MySQL")}`;
 
 console.log(queryStr); // SELECT * FROM posts WHERE title='Hello MySQL'
 
-var sorter = 'date';
-var sql = 'SELECT * FROM posts ORDER BY ' + connection.escapeId(sorter);
-connection.query(sql, function (err, results) {
+let sorter = 'date';
+sql = `SELECT * FROM posts ORDER BY ${connection.escapeId(sorter)}`;
+connection.query(sql, (err, results) => {
     // ...
 });
 
-var sorter = 'date';
-var sql = 'SELECT * FROM posts ORDER BY ' + connection.escapeId('posts.' + sorter);
-connection.query(sql, function (err, results) {
+sorter = 'date';
+sql = `SELECT * FROM posts ORDER BY ${connection.escapeId('posts.' + sorter)}`;
+connection.query(sql, (err, results) => {
     // ...
 });
 
-var userIdNum = 1;
-var columns = ['username', 'email'];
-var query = connection.query('SELECT ?? FROM ?? WHERE id = ?', [columns, 'users', userIdNum], function (err, results) {
+const userIdNum = 1;
+const columns = ['username', 'email'];
+const queryy = connection.query('SELECT ?? FROM ?? WHERE id = ?', [columns, 'users', userIdNum], (err, results) => {
     // ...
 });
 
-console.log(query.sql); // SELECT `username`, `email` FROM `users` WHERE id = 1
+console.log(queryy.sql); // SELECT `username`, `email` FROM `users` WHERE id = 1
 
-var sql = "SELECT * FROM ?? WHERE ?? = ?";
-var inserts = ['users', 'id', userId];
+sql = "SELECT * FROM ?? WHERE ?? = ?";
+const inserts = ['users', 'id', userId];
 sql = mysql.format(sql, inserts);
 
-var sql = "INSERT INTO posts SET ?";
-var post = { id: 1, title: 'Hello MySQL' };
-sql = mysql.format(sql, post);
-
-connection.config.queryFormat = function (query, values) {
+connection.config.queryFormat = function(query, values) {
     if (!values) return query;
-    return query.replace(/\:(\w+)/g, function (txt: string, key: string) {
+    return query.replace(/\:(\w+)/g, function(txt: string, key: string) {
         if (values.hasOwnProperty(key)) {
             return this.escape(values[key]);
         }
@@ -121,50 +129,57 @@ connection.config.queryFormat = function (query, values) {
     }.bind(this));
 };
 
-connection.query("UPDATE posts SET title = :title", { title: "Hello MySQL" });
+connection.query("UPDATE posts SET title = :title", {title: "Hello MySQL"});
 
-var s: stream.Readable = connection.query("UPDATE posts SET title = :title", { title: "Hello MySQL" }).stream({ highWaterMark: 5 });
+const s: stream.Readable = connection.query("UPDATE posts SET title = :title", {title: "Hello MySQL"}).stream({highWaterMark: 5});
 
-connection.query('INSERT INTO posts SET ?', { title: 'test' }, function (err, result) {
+connection.query('INSERT INTO posts SET ?', {title: 'test'}, (err, result) => {
     if (err) throw err;
 
     console.log(result.insertId);
 });
 
-connection.query('DELETE FROM posts WHERE title = "wrong"', function (err, result) {
+connection.query('DELETE FROM posts WHERE title = "wrong"', (err, result) => {
     if (err) throw err;
 
-    console.log('deleted ' + result.affectedRows + ' rows');
+    console.log(`deleted ${result.affectedRows} rows`);
 });
 
-connection.query('UPDATE posts SET ...', function (err, result) {
+connection.query('UPDATE posts SET ...', (err, result) => {
     if (err) throw err;
 
-    console.log('changed ' + result.changedRows + ' rows');
+    console.log(`changed ${result.changedRows} rows`);
+});
+connection.destroy();
+
+connection = mysql.createConnection({
+    host: 'localhost',
+    user: 'me',
+    password: 'test'
 });
 
-connection.connect(function (err) {
+connection.connect(err => {
     if (err) throw err;
-    console.log('connected as id ' + connection.threadId);
+    console.log(`connected as id ${connection.threadId}`);
 });
 
-connection.ping(function (err) {
+connection.ping(err => {
     if (err) throw err;
     console.log('Ping was successful');
-})
+});
 
 /// Pools
 
-var poolConfig = {
+const poolConfig = {
     connectionLimit: 10,
     host: 'example.org',
     user: 'bob',
     password: 'secret'
 };
 
-var pool = mysql.createPool(poolConfig);
+let pool = mysql.createPool(poolConfig);
 
-pool.query('SELECT 1 + 1 AS solution', function (err, rows, fields) {
+pool.query('SELECT 1 + 1 AS solution', (err, rows, fields) => {
     if (err) throw err;
 
     console.log('The solution is: ', rows[0].solution);
@@ -176,17 +191,17 @@ pool = mysql.createPool({
     password: 'secret'
 });
 
-pool.getConnection(function (err, connection) {
+pool.getConnection((err, connection) => {
     // connected! (unless `err` is set)
 });
 
-pool.on('connection', function (connection) {
-    connection.query('SET SESSION auto_increment_increment=1')
+pool.on('connection', connection => {
+    connection.query('SET SESSION auto_increment_increment=1');
 });
 
-pool.getConnection(function (err, connection) {
+pool.getConnection((err, connection) => {
     // Use the connection
-    connection.query('SELECT something FROM sometable', function (err, rows) {
+    connection.query('SELECT something FROM sometable', (err, rows) => {
         // And done with the connection.
         connection.release();
 
@@ -197,7 +212,7 @@ pool.getConnection(function (err, connection) {
 /// PoolClusters
 
 // create
-var poolCluster = mysql.createPoolCluster();
+const poolCluster = mysql.createPoolCluster();
 
 poolCluster.add(poolConfig); // anonymous group
 poolCluster.add('MASTER', poolConfig);
@@ -205,27 +220,33 @@ poolCluster.add('SLAVE1', poolConfig);
 poolCluster.add('SLAVE2', poolConfig);
 
 // Target Group : ALL(anonymous, MASTER, SLAVE1-2), Selector : round-robin(default)
-poolCluster.getConnection(function (err, connection) { });
+poolCluster.getConnection((err, connection) => {
+});
 
 // Target Group : MASTER, Selector : round-robin
-poolCluster.getConnection('MASTER', function (err, connection) { });
+poolCluster.getConnection('MASTER', (err, connection) => {
+});
 
 // Target Group : SLAVE1-2, Selector : order
 // If can't connect to SLAVE1, return SLAVE2. (remove SLAVE1 in the cluster)
-poolCluster.on('remove', function (nodeId) {
-    console.log('REMOVED NODE : ' + nodeId); // nodeId = SLAVE1 
+poolCluster.on('remove', nodeId => {
+    console.log(`REMOVED NODE : ${nodeId}`); // nodeId = SLAVE1
 });
 
-poolCluster.getConnection('SLAVE*', 'ORDER', function (err, connection) { });
+poolCluster.getConnection('SLAVE*', 'ORDER', (err, connection) => {
+});
 
 // of namespace : of(pattern, selector)
-poolCluster.of('*').getConnection(function (err, connection) { });
+poolCluster.of('*').getConnection((err, connection) => {
+});
 
-var pool = poolCluster.of('SLAVE*', 'RANDOM');
-pool.getConnection(function (err, connection) { });
-pool.getConnection(function (err, connection) { });
+pool = poolCluster.of('SLAVE*', 'RANDOM');
+pool.getConnection((err, connection) => {
+});
+pool.getConnection((err, connection) => {
+});
 
-var poolClusterWithOptions = mysql.createPoolCluster({
+const poolClusterWithOptions = mysql.createPoolCluster({
     canRetry: true,
     removeNodeErrorCount: 3,
     restoreNodeTimeout: 1000,
@@ -237,38 +258,38 @@ poolCluster.end();
 
 /// Queries
 
-var query = connection.query('SELECT * FROM posts');
-query
-    .on('error', function (err) {
+const queryF = connection.query('SELECT * FROM posts');
+queryF
+    .on('error', err => {
         // Handle error, an 'end' event will be emitted after this as well
     })
-    .on('fields', function (fields) {
+    .on('fields', fields => {
         // the field packets for the rows to follow
     })
-    .on('result', function (row) {
+    .on('result', row => {
         // Pausing the connnection is useful if your processing involves I/O
         connection.pause();
 
-        var processRow = (row: any, cb: () => void) => {
+        const processRow = (row: any, cb: () => void) => {
             cb();
         };
 
-        processRow(row, function () {
+        processRow(row, () => {
             connection.resume();
         });
     })
-    .on('end', function () {
+    .on('end', () => {
         // all rows have been received
     });
 
-var writable = fs.createWriteStream('file.txt');
+const writable = fs.createWriteStream('file.txt');
 connection.query('SELECT * FROM posts')
-    .stream({ highWaterMark: 5 })
+    .stream({highWaterMark: 5})
     .pipe(writable);
 
-connection = mysql.createConnection({ multipleStatements: true });
+connection = mysql.createConnection({multipleStatements: true});
 
-connection.query('SELECT 1; SELECT 2', function (err, results) {
+connection.query('SELECT 1; SELECT 2', (err, results) => {
     if (err) throw err;
 
     // `results` is an array with one element for every statement in the query:
@@ -276,19 +297,19 @@ connection.query('SELECT 1; SELECT 2', function (err, results) {
     console.log(results[1]); // [{2: 2}]
 });
 
-var query = connection.query('SELECT 1; SELECT 2');
+const queryH = connection.query('SELECT 1; SELECT 2');
 
-query
-    .on('fields', function (fields, index) {
+queryH
+    .on('fields', (fields, index) => {
         // the fields for the result rows that follow
     })
-    .on('result', function (row, index) {
+    .on('result', (row, index) => {
         // index refers to the statement this result belongs to (starts at 0)
     });
 
-var options = { sql: '...', nestTables: true };
+const options = {sql: '...', nestTables: true};
 
-connection.query(options, function (err, results) {
+connection.query(options, (err, results) => {
     /* results will be an array like this now:
     [{
       table1: {
@@ -303,28 +324,30 @@ connection.query(options, function (err, results) {
     */
 });
 
-connection.beginTransaction(function (err) {
-    var title = 'title';
+connection.beginTransaction(err => {
+    const title = 'title';
 
-    if (err) { throw err; }
-    connection.query('INSERT INTO posts SET title=?', title, function (err, result) {
+    if (err) {
+        throw err;
+    }
+    connection.query('INSERT INTO posts SET title=?', title, (err, result) => {
         if (err) {
-            connection.rollback(function () {
+            connection.rollback(() => {
                 throw err;
             });
         }
 
-        var log = 'Post ' + result.insertId + ' added';
+        const log = `Post ${result.insertId} added`;
 
-        connection.query('INSERT INTO log SET data=?', log, function (err, result) {
+        connection.query('INSERT INTO log SET data=?', log, (err, result) => {
             if (err) {
-                connection.rollback(function () {
+                connection.rollback(() => {
                     throw err;
                 });
             }
-            connection.commit(function (err) {
+            connection.commit(err => {
                 if (err) {
-                    connection.rollback(function () {
+                    connection.rollback(() => {
                         throw err;
                     });
                 }
@@ -335,7 +358,7 @@ connection.beginTransaction(function (err) {
 });
 
 // Kill query after 60s
-connection.query({ sql: 'SELECT COUNT(*) AS count FROM big_table', timeout: 60000 }, function (err, rows) {
+connection.query({sql: 'SELECT COUNT(*) AS count FROM big_table', timeout: 60000}, (err, rows: any) => {
     if (err && err.code === 'PROTOCOL_SEQUENCE_TIMEOUT') {
         throw new Error('too long to count table rows!');
     }
@@ -344,61 +367,62 @@ connection.query({ sql: 'SELECT COUNT(*) AS count FROM big_table', timeout: 6000
         throw err;
     }
 
-    console.log(rows[0].count + ' rows');
+    console.log(`${rows[0].count} rows`);
 });
 
-connection = mysql.createConnection({
-    port: 84943, // WRONG PORT
-});
+try {
+    connection = mysql.createConnection({
+        port: 8943, // set wrong port and uncomment throw
+    });
+    // throw new Error('error not thrown')
+} catch (err) {
+    console.error('SHOULD BE WRONG PORT ERROR: ', err);
+}
 
-connection.connect(function (err) {
+connection.connect(err => {
     console.log(err.code); // 'ECONNREFUSED'
     console.log(err.fatal); // true
 });
 
-connection.query('SELECT 1', function (err) {
+connection.query('SELECT 1', err => {
     console.log(err.code); // 'ECONNREFUSED'
     console.log(err.fatal); // true
 });
 
-connection.query('USE name_of_db_that_does_not_exist', function (err, rows) {
+connection.query('USE name_of_db_that_does_not_exist', (err: mysql.MysqlError, rows: any) => {
     console.log(err.code); // 'ER_BAD_DB_ERROR'
 });
 
-connection.query('SELECT 1', function (err, rows) {
+connection.query('SELECT 1', (err, rows) => {
     console.log(err); // null
     console.log(rows.length); // 1
 });
 
-connection.on('error', function (err) {
+connection.on('error', err => {
     console.log(err.code); // 'ER_BAD_DB_ERROR'
 });
 
 connection.query('USE name_of_db_that_does_not_exist');
 
 // I am Chuck Norris:
-connection.on('error', function () { });
+connection.on('error', () => {
+});
 
-connection = mysql.createConnection({ typeCast: false });
-
-var query = connection.query({ sql: '...', typeCast: false }, function (err, results) {
+connection = mysql.createConnection({typeCast: false});
 
+const query1 = connection.query({sql: '...', typeCast: false}, (err: Error, results: any) => {
 });
 
 connection.query({
     sql: '...',
-    typeCast: function (field: any, next: Function) {
-        if (field.type == 'TINY' && field.length == 1) {
-            return (field.string() == '1'); // 1 = true, 0 = false
+    typeCast: (field, next: () => void) => {
+        if (field.type === 'TINY' && field.length === 1) {
+            return (field.string() === '1'); // 1 = true, 0 = false
         }
-        return next();
+        next();
     }
 });
 
 connection = mysql.createConnection("mysql://localhost/test?flags=-FOUND_ROWS");
-connection = mysql.createConnection({ debug: true });
-connection = mysql.createConnection({ debug: ['ComQueryPacket', 'RowDataPacket'] });
-
-var type: mysql.FieldType = mysql.FieldType.SHORT;
-var info: mysql.IFieldInfo;
-info.type = type;
+connection = mysql.createConnection({debug: true});
+connection = mysql.createConnection({debug: ['ComQueryPacket', 'RowDataPacket']});
diff --git a/types/mysql/tsconfig.json b/types/mysql/tsconfig.json
index 010904ef8b..1249bcd757 100644
--- a/types/mysql/tsconfig.json
+++ b/types/mysql/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "mysql-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/mysql/tslint.json b/types/mysql/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/mysql/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/mz/tslint.json b/types/mz/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mz/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/n3/tslint.json b/types/n3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/n3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nano/index.d.ts b/types/nano/index.d.ts
index 1c818dbb0a..152954190d 100644
--- a/types/nano/index.d.ts
+++ b/types/nano/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Tim Jacobi <https://github.com/timjacobi>
 //                 Kovács Vince <https://github.com/vincekovacs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
@@ -345,7 +346,7 @@ declare namespace nano {
   }
 
   interface DocumentScopeFollowUpdatesParams {
-    inlucde_docs?: boolean;
+    include_docs?: boolean;
     since?: string;
     heartbeat?: number;
     feed?: "continuous";
diff --git a/types/nanoajax/tslint.json b/types/nanoajax/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nanoajax/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nanoid/format.d.ts b/types/nanoid/format.d.ts
new file mode 100644
index 0000000000..d4f03c9905
--- /dev/null
+++ b/types/nanoid/format.d.ts
@@ -0,0 +1,3 @@
+declare function format(random: (bytes: number) => number[], alphabet: string, size: number): string;
+
+export = format;
diff --git a/types/nanoid/generate.d.ts b/types/nanoid/generate.d.ts
new file mode 100644
index 0000000000..c0f6480a39
--- /dev/null
+++ b/types/nanoid/generate.d.ts
@@ -0,0 +1,3 @@
+declare function generate(alphabet: string, size: number): string;
+
+export = generate;
diff --git a/types/nanoid/index.d.ts b/types/nanoid/index.d.ts
new file mode 100644
index 0000000000..5ec4ccc025
--- /dev/null
+++ b/types/nanoid/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for nanoid 1.0
+// Project: https://github.com/ai/nanoid
+// Definitions by: Ruben Schmidmeister <https://github.com/bash>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function nanoid(size?: number): string;
+
+export = nanoid;
diff --git a/types/nanoid/nanoid-tests.ts b/types/nanoid/nanoid-tests.ts
new file mode 100644
index 0000000000..063bb3317d
--- /dev/null
+++ b/types/nanoid/nanoid-tests.ts
@@ -0,0 +1,17 @@
+import nanoid = require('nanoid');
+import format = require('nanoid/format');
+import generate = require('nanoid/generate');
+import random = require('nanoid/random');
+import randomBrowser = require('nanoid/random-browser');
+import url = require('nanoid/url');
+
+const _random = (size: number) => [1, 2, 3, 4];
+
+nanoid();
+nanoid(10);
+format(_random, "abcdef", 5);
+generate('0123456789абвгдеё', 5);
+random(10);
+randomBrowser(10);
+
+console.log(url);
diff --git a/types/nanoid/random-browser.d.ts b/types/nanoid/random-browser.d.ts
new file mode 100644
index 0000000000..39f366826e
--- /dev/null
+++ b/types/nanoid/random-browser.d.ts
@@ -0,0 +1,3 @@
+declare function randomBrowser(bytes: number): Uint8Array;
+
+export = randomBrowser;
diff --git a/types/nanoid/random.d.ts b/types/nanoid/random.d.ts
new file mode 100644
index 0000000000..287a392aff
--- /dev/null
+++ b/types/nanoid/random.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="node" />
+
+import crypto = require('crypto');
+
+export = crypto.randomBytes;
diff --git a/types/nanoid/tsconfig.json b/types/nanoid/tsconfig.json
new file mode 100644
index 0000000000..0df191829d
--- /dev/null
+++ b/types/nanoid/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "format.d.ts",
+        "generate.d.ts",
+        "index.d.ts",
+        "nanoid-tests.ts",
+        "random-browser.d.ts",
+        "random.d.ts",
+        "url.d.ts"
+    ]
+}
diff --git a/types/nanoid/tslint.json b/types/nanoid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/nanoid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nanoid/url.d.ts b/types/nanoid/url.d.ts
new file mode 100644
index 0000000000..0041f2a8de
--- /dev/null
+++ b/types/nanoid/url.d.ts
@@ -0,0 +1,3 @@
+declare var url: string;
+
+export = url;
diff --git a/types/nanp/tslint.json b/types/nanp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nanp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nats-hemera/index.d.ts b/types/nats-hemera/index.d.ts
index 90d41e43aa..868d550cf9 100644
--- a/types/nats-hemera/index.d.ts
+++ b/types/nats-hemera/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for hemera 1.0
+// Type definitions for hemera 2.0
 // Project: https://github.com/hemerajs/hemera
 // Definitions by: Vladimir Djukic <https://github.com/vforv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -101,7 +101,7 @@ declare namespace Hemera {
         action: any;
         plugin: PluginDefinition;
         use(handler: AddMetaMiddleware): AddMeta;
-        end(cb: () => void): void;
+        end(cb: () => void): undefined;
     }
 
     type AddMetaMiddleware = (request: ServerRequest, response: ServerResponse, next: () => void) => void;
@@ -164,6 +164,928 @@ declare namespace Hemera {
         method: string;
         duration: number;
     }
+
+    type Types = 'any' | 'alternatives' | 'array' | 'boolean' | 'binary' | 'date' | 'function' | 'lazy' | 'number' | 'object' | 'string';
+
+    type LanguageOptions = string | boolean | null | {
+        [key: string]: LanguageOptions;
+    };
+
+    type LanguageRootOptions = {
+        root?: string;
+        key?: string;
+        messages?: { wrapArrays?: boolean; };
+    } & Partial<Record<Types, LanguageOptions>> & { [key: string]: LanguageOptions; };
+
+    interface ValidationOptions {
+        /**
+         * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
+         */
+        abortEarly?: boolean;
+        /**
+         * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
+         */
+        convert?: boolean;
+        /**
+         * when true, allows object to contain unknown keys which are ignored. Defaults to false.
+         */
+        allowUnknown?: boolean;
+        /**
+         * when true, ignores unknown keys with a function value. Defaults to false.
+         */
+        skipFunctions?: boolean;
+        /**
+         * remove unknown elements from objects and arrays. Defaults to false
+         * - when true, all unknown elements will be removed
+         * - when an object:
+         *      - arrays - set to true to remove unknown items from arrays.
+         *      - objects - set to true to remove unknown keys from objects
+         */
+        stripUnknown?: boolean | { arrays?: boolean; objects?: boolean };
+        /**
+         * overrides individual error messages. Defaults to no override ({}).
+         */
+        language?: LanguageRootOptions;
+        /**
+         * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
+         */
+        presence?: 'optional' | 'required' | 'forbidden';
+        /**
+         * provides an external data set to be used in references
+         */
+        context?: Context;
+        /**
+         * when true, do not apply default values. Defaults to false.
+         */
+        noDefaults?: boolean;
+    }
+
+    interface RenameOptions {
+        /**
+         * if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
+         */
+        alias?: boolean;
+        /**
+         * if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
+         */
+        multiple?: boolean;
+        /**
+         * if true, allows renaming a key over an existing key. Defaults to false.
+         */
+        override?: boolean;
+        /**
+         * if true, skip renaming of a key if it's undefined. Defaults to false.
+         */
+        ignoreUndefined?: boolean;
+    }
+
+    interface EmailOptions {
+        /**
+         * Numerical threshold at which an email address is considered invalid
+         */
+        errorLevel?: number | boolean;
+        /**
+         * Specifies a list of acceptable TLDs.
+         */
+        tldWhitelist?: string[] | object;
+        /**
+         * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
+         */
+        minDomainAtoms?: number;
+    }
+
+    interface IpOptions {
+        /**
+         * One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
+         */
+        version?: string | string[];
+        /**
+         * Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
+         */
+        cidr?: string;
+    }
+
+    type GuidVersions = 'uuidv1' | 'uuidv2' | 'uuidv3' | 'uuidv4' | 'uuidv5';
+
+    interface GuidOptions {
+        version: GuidVersions[] | GuidVersions;
+    }
+
+    interface UriOptions {
+        /**
+         * Specifies one or more acceptable Schemes, should only include the scheme name.
+         * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
+         */
+        scheme?: string | RegExp | Array<string | RegExp>;
+    }
+
+    interface Base64Options {
+        /**
+         * optional parameter defaulting to true which will require = padding if true or make padding optional if false
+         */
+        paddingRequired?: boolean;
+    }
+
+    interface WhenOptions {
+        /**
+         * the required condition joi type.
+         */
+        is: SchemaLike;
+        /**
+         * the alternative schema type if the condition is true. Required if otherwise is missing.
+         */
+        then?: SchemaLike;
+        /**
+         * the alternative schema type if the condition is false. Required if then is missing
+         */
+        otherwise?: SchemaLike;
+    }
+
+    interface ReferenceOptions {
+        separator?: string;
+        contextPrefix?: string;
+        default?: any;
+        strict?: boolean;
+        functions?: boolean;
+    }
+
+    interface POptions {
+        version?: string[];
+        cidr?: string;
+    }
+
+    interface JoiObject {
+        isJoi: boolean;
+    }
+
+    interface ValidationError extends Error, JoiObject {
+        details: ValidationErrorItem[];
+        annotate(): string;
+        _object: any;
+    }
+
+    interface ValidationErrorItem {
+        message: string;
+        type: string;
+        path: string[];
+        options?: ValidationOptions;
+        context?: Context;
+    }
+
+    type ValidationErrorFunction = (errors: ValidationErrorItem[]) => string | ValidationErrorItem | ValidationErrorItem[] | Error;
+
+    interface ValidationResult<T> {
+        error: ValidationError;
+        value: T;
+    }
+
+    type SchemaLike = string | number | boolean | object | null | Schema | SchemaMap;
+
+    interface SchemaMap {
+        [key: string]: SchemaLike | SchemaLike[];
+    }
+
+    type Schema = AnySchema
+        | ArraySchema
+        | AlternativesSchema
+        | BinarySchema
+        | BooleanSchema
+        | DateSchema
+        | FunctionSchema
+        | NumberSchema
+        | ObjectSchema
+        | StringSchema;
+
+    interface AnySchema extends JoiObject {
+        schemaType?: Types | string;
+
+        /**
+         * Validates a value using the schema and options.
+         */
+        validate<T>(value: T): ValidationResult<T>;
+        validate<T, R>(value: T, callback: (err: ValidationError, value: T) => R): R;
+        validate<T, R>(value: T, options: ValidationOptions, callback: (err: ValidationError, value: T) => R): R;
+
+        /**
+         * Whitelists a value
+         */
+        allow(...values: any[]): this;
+        allow(values: any[]): this;
+
+        /**
+         * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
+         */
+        valid(...values: any[]): this;
+        valid(values: any[]): this;
+        only(...values: any[]): this;
+        only(values: any[]): this;
+        equal(...values: any[]): this;
+        equal(values: any[]): this;
+
+        /**
+         * Blacklists a value
+         */
+        invalid(...values: any[]): this;
+        invalid(values: any[]): this;
+        disallow(...values: any[]): this;
+        disallow(values: any[]): this;
+        not(...values: any[]): this;
+        not(values: any[]): this;
+
+        /**
+         * Marks a key as required which will not allow undefined as value. All keys are optional by default.
+         */
+        required(): this;
+        exist(): this;
+
+        /**
+         * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
+         */
+        optional(): this;
+
+        /**
+         * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
+         */
+        forbidden(): this;
+
+        /**
+         * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
+         */
+        strip(): this;
+
+        /**
+         * Annotates the key
+         */
+        description(desc: string): this;
+
+        /**
+         * Annotates the key
+         */
+        notes(notes: string[] | string): this;
+
+        /**
+         * Annotates the key
+         */
+        tags(notes: string[] | string): this;
+
+        /**
+         * Attaches metadata to the key.
+         */
+        meta(meta: object): this;
+
+        /**
+         * Annotates the key with an example value, must be valid.
+         */
+        example(value: any): this;
+
+        /**
+         * Annotates the key with an unit name.
+         */
+        unit(name: string): this;
+
+        /**
+         * Overrides the global validate() options for the current key and any sub-key.
+         */
+        options(options: ValidationOptions): this;
+
+        /**
+         * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
+         */
+        strict(isStrict?: boolean): this;
+
+        /**
+         * Sets a default value if the original value is undefined.
+         * @param value - the value.
+         *   value supports references.
+         *   value may also be a function which returns the default value.
+         *   If value is specified as a function that accepts a single parameter, that parameter will be a context
+         *    object that can be used to derive the resulting value. This clones the object however, which incurs some
+         *    overhead so if you don't need access to the context define your method so that it does not accept any
+         *    parameters.
+         *   Without any value, default has no effect, except for object that will then create nested defaults
+         *    (applying inner defaults of that object).
+         *
+         * Note that if value is an object, any changes to the object after default() is called will change the
+         *  reference and any future assignment.
+         *
+         * Additionally, when specifying a method you must either have a description property on your method or the
+         *  second parameter is required.
+         */
+        default(value?: any, description?: string): this;
+
+        /**
+         * Returns a new type that is the result of adding the rules of one type to another.
+         */
+        concat(schema: this): this;
+
+        /**
+         * Converts the type into an alternatives type where the conditions are merged into the type definition where:
+         */
+        when(ref: string | Reference, options: WhenOptions): AlternativesSchema;
+
+        /**
+         * Overrides the key name in error messages.
+         */
+        label(name: string): this;
+
+        /**
+         * Outputs the original untouched value instead of the casted value.
+         */
+        raw(isRaw?: boolean): this;
+
+        /**
+         * Considers anything that matches the schema to be empty (undefined).
+         * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
+         */
+        empty(schema?: SchemaLike): this;
+
+        /**
+         * Overrides the default joi error with a custom error if the rule fails where:
+         * @param err - can be:
+         *   an instance of `Error` - the override error.
+         *   a `function(errors)`, taking an array of errors as argument, where it must either:
+         *    return a `string` - substitutes the error message with this text
+         *    return a single ` object` or an `Array` of it, where:
+         *     `type` - optional parameter providing the type of the error (eg. `number.min`).
+         *     `message` - optional parameter if `template` is provided, containing the text of the error.
+         *     `template` - optional parameter if `message` is provided, containing a template string, using the same format as usual joi language errors.
+         *     `context` - optional parameter, to provide context to your error if you are using the `template`.
+         *    return an `Error` - same as when you directly provide an `Error`, but you can customize the error message based on the errors.
+         *
+         * Note that if you provide an `Error`, it will be returned as-is, unmodified and undecorated with any of the
+         * normal joi error properties. If validation fails and another error is found before the error
+         * override, that error will be returned and the override will be ignored (unless the `abortEarly`
+         * option has been set to `false`).
+         */
+        error?(err: Error | ValidationErrorFunction): this;
+
+        /**
+         * Returns a plain object representing the schema's rules and properties
+         */
+        describe(): Description;
+    }
+
+    interface Description {
+        type?: Types | string;
+        label?: string;
+        description?: string;
+        flags?: object;
+        notes?: string[];
+        tags?: string[];
+        meta?: any[];
+        example?: any[];
+        valids?: any[];
+        invalids?: any[];
+        unit?: string;
+        options?: ValidationOptions;
+        [key: string]: any;
+    }
+
+    interface Context {
+        [key: string]: any;
+        key?: string;
+        label?: string;
+    }
+
+    interface State {
+        key?: string;
+        path?: string;
+        parent?: any;
+        reference?: any;
+    }
+
+    interface BooleanSchema extends AnySchema {
+        /**
+         * Allows for additional values to be considered valid booleans by converting them to true during validation.
+         * Accepts a value or an array of values. String comparisons are by default case insensitive,
+         * see boolean.insensitive() to change this behavior.
+         * @param values - strings, numbers or arrays of them
+         */
+        truthy(...values: Array<string | number | string[] | number[]>): this;
+
+        /**
+         * Allows for additional values to be considered valid booleans by converting them to false during validation.
+         * Accepts a value or an array of values. String comparisons are by default case insensitive,
+         * see boolean.insensitive() to change this behavior.
+         * @param values - strings, numbers or arrays of them
+         */
+        falsy(...values: Array<string | number | string[] | number[]>): this;
+
+        /**
+         * Allows the values provided to truthy and falsy as well as the "true" and "false" default conversion
+         * (when not in strict() mode) to be matched in a case insensitive manner.
+         */
+        insensitive(enabled?: boolean): this;
+    }
+
+    interface NumberSchema extends AnySchema {
+        /**
+         * Specifies the minimum value.
+         * It can also be a reference to another field.
+         */
+        min(limit: number | Reference): this;
+
+        /**
+         * Specifies the maximum value.
+         * It can also be a reference to another field.
+         */
+        max(limit: number | Reference): this;
+
+        /**
+         * Specifies that the value must be greater than limit.
+         * It can also be a reference to another field.
+         */
+        greater(limit: number | Reference): this;
+        /**
+         * Specifies that the value must be less than limit.
+         * It can also be a reference to another field.
+         */
+        less(limit: number | Reference): this;
+
+        /**
+         * Requires the number to be an integer (no floating point).
+         */
+        integer(): this;
+
+        /**
+         * Specifies the maximum number of decimal places where:
+         * @param limit - the maximum number of decimal places allowed.
+         */
+        precision(limit: number): this;
+
+        /**
+         * Specifies that the value must be a multiple of base.
+         */
+        multiple(base: number): this;
+
+        /**
+         * Requires the number to be positive.
+         */
+        positive(): this;
+
+        /**
+         * Requires the number to be negative.
+         */
+        negative(): this;
+    }
+
+    interface StringSchema extends AnySchema {
+        /**
+         * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
+         */
+        insensitive(): this;
+
+        /**
+         * Specifies the minimum number string characters.
+         * @param limit - the minimum number of string characters required. It can also be a reference to another field.
+         * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+         */
+        min(limit: number | Reference, encoding?: string): this;
+
+        /**
+         * Specifies the maximum number of string characters.
+         * @param limit - the maximum number of string characters allowed. It can also be a reference to another field.
+         * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+         */
+        max(limit: number | Reference, encoding?: string): this;
+
+        /**
+         * Specifies whether the string.max() limit should be used as a truncation.
+         * @param enabled - optional parameter defaulting to true which allows you to reset the behavior of truncate by providing a falsy value.
+         */
+        truncate(enabled?: boolean): this;
+
+        /**
+         * Requires the string value to be in a unicode normalized form. If the validation convert option is on (enabled by default), the string will be normalized.
+         * @param form - The unicode normalization form to use. Valid values: NFC [default], NFD, NFKC, NFKD
+         */
+        normalize(form?: 'NFC' | 'NFD' | 'NFKC' | 'NFKD'): this;
+
+        /**
+         * Requires the string value to be a valid base64 string; does not check the decoded value.
+         * @param options - optional settings: The unicode normalization options to use. Valid values: NFC [default], NFD, NFKC, NFKD
+         */
+        base64(options?: Base64Options): this;
+
+        /**
+         * Requires the number to be a credit card number (Using Lunh Algorithm).
+         */
+        creditCard(): this;
+
+        /**
+         * Specifies the exact string length required
+         * @param limit - the required string length. It can also be a reference to another field.
+         * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+         */
+        length(limit: number | Reference, encoding?: string): this;
+        /**
+         * Defines a regular expression rule.
+         * @param pattern - a regular expression object the string value must match against.
+         * @param name - optional name for patterns (useful with multiple patterns). Defaults to 'required'.
+         */
+        regex(pattern: RegExp, name?: string): this;
+
+        /**
+         * Replace characters matching the given pattern with the specified replacement string where:
+         * @param pattern - a regular expression object to match against, or a string of which all occurrences will be replaced.
+         * @param replacement - the string that will replace the pattern.
+         */
+        replace(pattern: RegExp | string, replacement: string): this;
+
+        /**
+         * Requires the string value to only contain a-z, A-Z, and 0-9.
+         */
+        alphanum(): this;
+
+        /**
+         * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
+         */
+        token(): this;
+
+        /**
+         * Requires the string value to be a valid email address.
+         */
+        email(options?: EmailOptions): this;
+
+        /**
+         * Requires the string value to be a valid ip address.
+         */
+        ip(options?: IpOptions): this;
+
+        /**
+         * Requires the string value to be a valid RFC 3986 URI.
+         */
+        uri(options?: UriOptions): this;
+
+        /**
+         * Requires the string value to be a valid GUID.
+         */
+        guid(options?: GuidOptions): this;
+
+        /**
+         * Alias for `guid` -- Requires the string value to be a valid GUID
+         */
+        uuid(options?: GuidOptions): this;
+
+        /**
+         * Requires the string value to be a valid hexadecimal string.
+         */
+        hex(): this;
+
+        /**
+         * Requires the string value to be a valid hostname as per RFC1123.
+         */
+        hostname(): this;
+
+        /**
+         * Requires the string value to be in valid ISO 8601 date format.
+         */
+        isoDate(): this;
+
+        /**
+         * Requires the string value to be all lowercase. If the validation convert option is on (enabled by default), the string will be forced to lowercase.
+         */
+        lowercase(): this;
+
+        /**
+         * Requires the string value to be all uppercase. If the validation convert option is on (enabled by default), the string will be forced to uppercase.
+         */
+        uppercase(): this;
+
+        /**
+         * Requires the string value to contain no whitespace before or after. If the validation convert option is on (enabled by default), the string will be trimmed.
+         */
+        trim(): this;
+    }
+
+    interface ArraySchema extends AnySchema {
+        /**
+         * Allow this array to be sparse.
+         * enabled can be used with a falsy value to go back to the default behavior.
+         */
+        sparse(enabled?: any): this;
+
+        /**
+         * Allow single values to be checked against rules as if it were provided as an array.
+         * enabled can be used with a falsy value to go back to the default behavior.
+         */
+        single(enabled?: any): this;
+
+        /**
+         * List the types allowed for the array values.
+         * type can be an array of values, or multiple values can be passed as individual arguments.
+         * If a given type is .required() then there must be a matching item in the array.
+         * If a type is .forbidden() then it cannot appear in the array.
+         * Required items can be added multiple times to signify that multiple items must be found.
+         * Errors will contain the number of items that didn't match.
+         * Any unmatched item having a label will be mentioned explicitly.
+         *
+         * @param type - a joi schema object to validate each array item against.
+         */
+        items(...types: SchemaLike[]): this;
+        items(types: SchemaLike[]): this;
+
+        /**
+         * Lists the types in sequence order for the array values where:
+         * @param type - a joi schema object to validate against each array item in sequence order.
+         * type can be an array of values, or multiple values can be passed as individual arguments.
+         * If a given type is .required() then there must be a matching item with the same index position
+         * in the array. Errors will contain the number of items that didn't match. Any unmatched item having a label will be mentioned explicitly.
+         */
+        ordered(...types: SchemaLike[]): this;
+        ordered(types: SchemaLike[]): this;
+
+        /**
+         * Specifies the minimum number of items in the array.
+         */
+        min(limit: number): this;
+
+        /**
+         * Specifies the maximum number of items in the array.
+         */
+        max(limit: number): this;
+
+        /**
+         * Specifies the exact number of items in the array.
+         */
+        length(limit: number): this;
+
+        /**
+         * Requires the array values to be unique.
+         * Be aware that a deep equality is performed on elements of the array having a type of object,
+         * a performance penalty is to be expected for this kind of operation.
+         */
+        unique(comparator?: string): this;
+        unique<T = any>(comparator?: (a: T, b: T) => boolean): this;
+    }
+
+    interface ObjectSchema extends AnySchema {
+        /**
+         * Sets the allowed object keys.
+         */
+        keys<R>(schema?: R): R;
+
+        /**
+         * Specifies the minimum number of keys in the object.
+         */
+        min(limit: number): this;
+
+        /**
+         * Specifies the maximum number of keys in the object.
+         */
+        max(limit: number): this;
+
+        /**
+         * Specifies the exact number of keys in the object.
+         */
+        length(limit: number): this;
+
+        /**
+         * Specify validation rules for unknown keys matching a pattern.
+         */
+        pattern(regex: RegExp, schema: SchemaLike): this;
+
+        /**
+         * Defines an all-or-nothing relationship between keys where if one of the peers is present, all of them are required as well.
+         * @param peers - the key names of which if one present, all are required. peers can be a single string value,
+         * an array of string values, or each peer provided as an argument.
+         */
+        and(...peers: string[]): this;
+        and(peers: string[]): this;
+
+        /**
+         * Defines a relationship between keys where not all peers can be present at the same time.
+         * @param peers - the key names of which if one present, the others may not all be present.
+         * peers can be a single string value, an array of string values, or each peer provided as an argument.
+         */
+        nand(...peers: string[]): this;
+        nand(peers: string[]): this;
+
+        /**
+         * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
+         */
+        or(...peers: string[]): this;
+        or(peers: string[]): this;
+
+        /**
+         * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
+         */
+        xor(...peers: string[]): this;
+        xor(peers: string[]): this;
+
+        /**
+         * Requires the presence of other keys whenever the specified key is present.
+         */
+        with(key: string, peers: string | string[]): this;
+
+        /**
+         * Forbids the presence of other keys whenever the specified is present.
+         */
+        without(key: string, peers: string | string[]): this;
+
+        /**
+         * Renames a key to another name (deletes the renamed key).
+         */
+        rename(from: string, to: string, options?: RenameOptions): this;
+
+        /**
+         * Verifies an assertion where.
+         */
+        assert(ref: string | Reference, schema: SchemaLike, message?: string): this;
+
+        /**
+         * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
+         */
+        unknown(allow?: boolean): this;
+
+        /**
+         * Requires the object to be an instance of a given constructor.
+         *
+         * @param constructor - the constructor function that the object must be an instance of.
+         * @param name - an alternate name to use in validation errors. This is useful when the constructor function does not have a name.
+         */
+        type(constructor: () => void, name?: string): this;
+
+        /**
+         * Sets the specified children to required.
+         *
+         * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+         *
+         *   var schema = Joi.object().keys({ a: { b: Joi.number() }, c: { d: Joi.string() } });
+         *   var requiredSchema = schema.requiredKeys('', 'a.b', 'c', 'c.d');
+         *
+         * Note that in this example '' means the current object, a is not required but b is, as well as c and d.
+         */
+        requiredKeys(children: string[]): this;
+        requiredKeys(...children: string[]): this;
+
+        /**
+         * Sets the specified children to optional.
+         *
+         * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+         *
+         * The behavior is exactly the same as requiredKeys.
+         */
+        optionalKeys(children: string[]): this;
+        optionalKeys(...children: string[]): this;
+    }
+
+    interface BinarySchema extends AnySchema {
+        /**
+         * Sets the string encoding format if a string input is converted to a buffer.
+         */
+        encoding(encoding: string): this;
+
+        /**
+         * Specifies the minimum length of the buffer.
+         */
+        min(limit: number): this;
+
+        /**
+         * Specifies the maximum length of the buffer.
+         */
+        max(limit: number): this;
+
+        /**
+         * Specifies the exact length of the buffer:
+         */
+        length(limit: number): this;
+    }
+
+    interface DateSchema extends AnySchema {
+        /**
+         * Specifies the oldest date allowed.
+         * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+         * allowing to explicitly ensure a date is either in the past or in the future.
+         * It can also be a reference to another field.
+         */
+        min(date: Date | number | string | Reference): this;
+
+        /**
+         * Specifies the latest date allowed.
+         * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+         * allowing to explicitly ensure a date is either in the past or in the future.
+         * It can also be a reference to another field.
+         */
+        max(date: Date | number | string | Reference): this;
+
+        /**
+         * Specifies the allowed date format:
+         * @param format - string or array of strings that follow the moment.js format.
+         */
+        format(format: string | string[]): this;
+
+        /**
+         * Requires the string value to be in valid ISO 8601 date format.
+         */
+        iso(): this;
+
+        /**
+         * Requires the value to be a timestamp interval from Unix Time.
+         * @param type - the type of timestamp (allowed values are unix or javascript [default])
+         */
+        timestamp(type?: 'javascript' | 'unix'): this;
+    }
+
+    interface FunctionSchema extends AnySchema {
+        /**
+         * Specifies the arity of the function where:
+         * @param n - the arity expected.
+         */
+        arity(n: number): this;
+
+        /**
+         * Specifies the minimal arity of the function where:
+         * @param n - the minimal arity expected.
+         */
+        minArity(n: number): this;
+
+        /**
+         * Specifies the minimal arity of the function where:
+         * @param n - the minimal arity expected.
+         */
+        maxArity(n: number): this;
+
+        /**
+         * Requires the function to be a Joi reference.
+         */
+        ref(): this;
+    }
+
+    interface AlternativesSchema extends AnySchema {
+        try(types: SchemaLike[]): this;
+        try(...types: SchemaLike[]): this;
+        when(ref: string | Reference, options: WhenOptions): this;
+    }
+
+    interface Reference extends JoiObject {
+        (value: any, validationOptions: ValidationOptions): any;
+        isContext: boolean;
+        key: string;
+        path: string;
+        toString(): string;
+    }
+
+    type ExtensionBoundSchema = Schema & {
+        /**
+         * Creates a joi error object.
+         * Used in conjunction with custom rules.
+         * @param type - the type of rule to create the error for.
+         * @param context - provide properties that will be available in the `language` templates.
+         * @param state - should the context passed into the `validate` function in a custom rule
+         * @param options - should the context passed into the `validate` function in a custom rule
+         */
+        createError(type: string, context: Context, state: State, options: ValidationOptions): Err;
+    };
+
+    interface Rules<P extends object = any> {
+        name: string;
+        params?: ObjectSchema | {[key in keyof P]: SchemaLike; };
+        setup?(this: ExtensionBoundSchema, params: any): Schema | undefined;
+        validate?(this: ExtensionBoundSchema, params: P, value: any, state: State, options: ValidationOptions): any;
+        description?: string | ((params: P) => string);
+    }
+
+    interface Extension {
+        name: string;
+        base?: Schema;
+        language?: LanguageOptions;
+        coerce?(this: ExtensionBoundSchema, value: any, state: State, options: ValidationOptions): any;
+        pre?(this: ExtensionBoundSchema, value: any, state: State, options: ValidationOptions): any;
+        describe?(this: Schema, description: Description): Description;
+        rules?: Rules[];
+    }
+
+    interface Err extends JoiObject {
+        toString(): string;
+    }
+
+    interface JOI {
+        version: string;
+        number(): NumberSchema;
+        any(): AnySchema;
+        array(): ArraySchema;
+        bool(): BooleanSchema;
+        binary(): BinarySchema;
+        date(): DateSchema;
+        func(): FunctionSchema;
+        object(schema?: SchemaMap): ObjectSchema;
+        string(): StringSchema;
+        alternatives(types: SchemaLike[]): AlternativesSchema;
+        alternatives(...types: SchemaLike[]): AlternativesSchema;
+        alt(types: SchemaLike[]): AlternativesSchema;
+        alt(...types: SchemaLike[]): AlternativesSchema;
+        lazy(cb: () => Schema): AnySchema;
+        validate<T>(value: T, schema: SchemaLike): ValidationResult<T>;
+        validate<T, R>(value: T, schema: SchemaLike, callback: (err: ValidationError, value: T) => R): R;
+        validate<T, R>(value: T, schema: SchemaLike, options: ValidationOptions, callback: (err: ValidationError, value: T) => R): R;
+        compile(schema: SchemaLike): Schema;
+        assert(value: any, schema: SchemaLike, message?: string | Error): undefined;
+        attempt<T>(value: T, schema: SchemaLike, message?: string | Error): T;
+        ref(key: string, options?: ReferenceOptions): Reference;
+        isRef(ref: any): ref is Reference;
+        reach(schema: ObjectSchema, path: string): Schema;
+    }
 }
 
 declare class Hemera {
@@ -197,6 +1119,8 @@ declare class Hemera {
     config: any;
     topics: any;
     transport: any;
+    joi: Hemera.JOI;
+    mongodb: any;
 
     context$: any;
     meta$: any;
diff --git a/types/nats-hemera/nats-hemera-tests.ts b/types/nats-hemera/nats-hemera-tests.ts
index 353f96a2f3..28c0c724c9 100644
--- a/types/nats-hemera/nats-hemera-tests.ts
+++ b/types/nats-hemera/nats-hemera-tests.ts
@@ -1,4 +1,5 @@
 import * as Hemera from 'nats-hemera';
+
 const nats = {};
 const hemera: any = new Hemera(nats, {});
 hemera.ready(() => {
diff --git a/types/nats-hemera/tslint.json b/types/nats-hemera/tslint.json
index 3db14f85ea..2750cc0197 100644
--- a/types/nats-hemera/tslint.json
+++ b/types/nats-hemera/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint/dt.json" }
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/natural-sort/tslint.json b/types/natural-sort/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/natural-sort/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/natural/tslint.json b/types/natural/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/natural/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts
index 138d0c043f..73131a9d72 100644
--- a/types/navigo/index.d.ts
+++ b/types/navigo/index.d.ts
@@ -2,11 +2,24 @@
 // Project: https://github.com/krasimir/navigo
 // Definitions by: Adrian Ehrsam <https://github.com/aersamkull>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+type Keys = string;
+type State = {[k in Keys]: any};
+type Params = State;
 
 interface NavigoHooks {
-    before?(done: (suppress?: boolean) => void): void;
-    after?(): void;
+    before?(done: (suppress?: boolean) => void, params?: Params): void;
+    after?(params?: Params): void;
+    leave?(params?: Params): void;
+    already?(params?: Params): void;
 }
+
+interface GenericHooks {
+    before?(done: (suppress?: boolean) => void, params?: Params): void;
+    after?(params?: Params): void;
+}
+
 type RouteHandler = ((parametersObj: any, query: string) => void) | { as: string; uses(parametersObj: any): void };
 
 declare class Navigo {
@@ -15,7 +28,7 @@ declare class Navigo {
      * @param root The main URL of your application.
      * @param useHash If useHash set to true then the router uses an old routing approach with hash in the URL. Navigo anyways falls back to this mode if there is no History API supported.
      */
-    constructor(root?: string | null, useHash?: boolean);
+    constructor(root?: string | null, useHash?: boolean, hash?: string);
 
     on(location: string, handler: RouteHandler, hooks?: NavigoHooks): Navigo;
     on(location: RegExp, handler: (...parameters: string[]) => void, hooks?: NavigoHooks): Navigo;
@@ -35,8 +48,12 @@ declare class Navigo {
 
     link(path: string): string;
 
+    lastRouteResolved(): {url: string, query: string};
+
     disableIfAPINotAvailable(): void;
 
+    hooks(hooks: GenericHooks): void;
+
     pause(): void;
 
     resume(): void;
diff --git a/types/navigo/navigo-tests.ts b/types/navigo/navigo-tests.ts
index 762c97b6de..1aeb645ce8 100644
--- a/types/navigo/navigo-tests.ts
+++ b/types/navigo/navigo-tests.ts
@@ -1,10 +1,23 @@
 import Navigo = require("navigo");
 
+type Keys = string;
+type State = {[k in Keys]: any};
+type Params = State;
+
 const root = null;
 const useHash = false;
 
 let router = new Navigo(root, useHash);
 
+const before = (done: (suppress?: boolean) => void, params: Params) => done();
+
+const after = (params: Params) => params;
+
+router.hooks({
+    before,
+    after
+});
+
 router
     .on('/products/list', () => {
         // display all the products
diff --git a/types/nconf/index.d.ts b/types/nconf/index.d.ts
index ff72f3e568..71a0d497ab 100644
--- a/types/nconf/index.d.ts
+++ b/types/nconf/index.d.ts
@@ -11,7 +11,7 @@ export declare var stores: any;
 export declare var sources: any[];
 
 export declare function clear(key: string, callback?: ICallbackFunction): any;
-export function get(key: string, callback?: ICallbackFunction): any;
+export function get(key?: string, callback?: ICallbackFunction): any;
 export declare function merge(key: string, value: any, callback?: ICallbackFunction): any;
 export declare function set(key: string, value: any, callback?: ICallbackFunction): any;
 export declare function reset(callback?: ICallbackFunction): any;
@@ -69,13 +69,13 @@ export interface ICallbackFunction {
 }
 
 export declare class Provider {
-    constructor(options: IOptions);
+    constructor(options?: IOptions);
 
     stores: any;
     sources: any[];
 
     clear(key: string, callback?: ICallbackFunction): any;
-    get(key: string, callback?: ICallbackFunction): any;
+    get(key?: string, callback?: ICallbackFunction): any;
     merge(key: string, value: any, callback?: ICallbackFunction): any;
     set(key: string, value: any, callback?: ICallbackFunction): any;
     reset(callback?: ICallbackFunction): any;
diff --git a/types/nconf/tslint.json b/types/nconf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nconf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ncp/tslint.json b/types/ncp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ncp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nedb-logger/index.d.ts b/types/nedb-logger/index.d.ts
index 58f0fa718c..9ac1d823f3 100644
--- a/types/nedb-logger/index.d.ts
+++ b/types/nedb-logger/index.d.ts
@@ -12,7 +12,7 @@ declare class NeDBLoggerDataStore {
 
     /**
      * Insert a new document
-     * @param {Function} cb Optional callback, signature: err, insertedDoc
+     * @param cb Optional callback, signature: err, insertedDoc
      */
     insert<T>(newDoc: T, cb?: (err: Error, document: T) => void): void;
 }
diff --git a/types/nedb/index.d.ts b/types/nedb/index.d.ts
index 32513ca0da..02ed81be4f 100644
--- a/types/nedb/index.d.ts
+++ b/types/nedb/index.d.ts
@@ -31,17 +31,13 @@ declare class Nedb {
      * Ensure an index is kept for this field. Same parameters as lib/indexes
      * For now this function is synchronous, we need to test how much time it takes
      * We use an async API for consistency with the rest of the code
-     * @param {String} options.fieldName
-     * @param {Boolean} options.unique
-     * @param {Boolean} options.sparse
-     * @param {Function} cb Optional callback, signature: err
+     * @param cb Optional callback, signature: err
      */
     ensureIndex(options: Nedb.EnsureIndexOptions, cb?: (err: Error) => void): void;
 
     /**
      * Remove an index
-     * @param {String} fieldName
-     * @param {Function} cb Optional callback, signature: err
+     * @param cb Optional callback, signature: err
      */
     removeIndex(fieldName: string, cb?: (err: Error) => void): void;
 
@@ -76,13 +72,13 @@ declare class Nedb {
 
     /**
      * Insert a new document
-     * @param {Function} cb Optional callback, signature: err, insertedDoc
+     * @param cb Optional callback, signature: err, insertedDoc
      */
     insert<T>(newDoc: T, cb?: (err: Error, document: T) => void): void;
 
     /**
      * Count all documents matching the query
-     * @param {any} query MongoDB-style query
+     * @param query MongoDB-style query
      */
     count(query: any, callback: (err: Error, n: number) => void): void;
     count(query: any): Nedb.CursorCount;
@@ -90,8 +86,8 @@ declare class Nedb {
     /**
      * Find all documents matching the query
      * If no callback is passed, we return the cursor so that user can limit, skip and finally exec
-     * @param {any} query MongoDB-style query
-     * @param {any} projection MongoDB-style projection
+     * @param query MongoDB-style query
+     * @param projection MongoDB-style projection
      */
     find<T>(query: any, projection: T, callback: (err: Error, documents: T[]) => void): void;
     find<T>(query: any, projection?: T): Nedb.Cursor<T>;
@@ -105,26 +101,24 @@ declare class Nedb {
 
     /**
      * Find one document matching the query
-     * @param {any} query MongoDB-style query
-     * @param {any} projection MongoDB-style projection
+     * @param query MongoDB-style query
+     * @param projection MongoDB-style projection
      */
     findOne<T>(query: any, projection: T, callback: (err: Error, document: T) => void): void;
 
     /**
      * Find one document matching the query
-     * @param {any} query MongoDB-style query
+     * @param query MongoDB-style query
      */
     findOne<T>(query: any, callback: (err: Error, document: T) => void): void;
 
     /**
      * Update all docs matching query v1.7.4 and prior signature.
      * For now, very naive implementation (recalculating the whole database)
-     * @param {any} query
-     * @param {any} updateQuery
-     * @param {Object} options Optional options
+     * @param options Optional options
      *                 options.multi If true, can update multiple documents (defaults to false)
      *                 options.upsert If true, document is inserted if the query doesn't match anything
-     * @param {Function} cb Optional callback, signature: err,
+     * @param cb Optional callback, signature: err,
      *                                                    numReplaced,
      *                                                    upsert (set to true if the update was in fact an upsert)
      *
@@ -135,12 +129,10 @@ declare class Nedb {
     /**
      * Update all docs matching query v1.8 signature.
      * For now, very naive implementation (recalculating the whole database)
-     * @param {any} query
-     * @param {any} updateQuery
-     * @param {Object} options Optional options
+     * @param options Optional options
      *                 options.multi If true, can update multiple documents (defaults to false)
      *                 options.upsert If true, document is inserted if the query doesn't match anything
-     * @param {Function} cb Optional callback, signature: err,
+     * @param cb Optional callback, signature: err,
      *                                                    numAffected,
      *                                                    affectedDocuments (when returnUpdatedDocs is set to true), obj or array
      *                                                    upsert (set to true if the update was in fact an upsert)
@@ -152,10 +144,9 @@ declare class Nedb {
     /**
      * Remove all docs matching the query
      * For now very naive implementation (similar to update)
-     * @param {Object} query
-     * @param {Object} options Optional options
+     * @param options Optional options
      *                 options.multi If true, can update multiple documents (defaults to false)
-     * @param {Function} cb Optional callback, signature: err, numRemoved
+     * @param cb Optional callback, signature: err, numRemoved
      *
      * @api private Use Datastore.remove which has the same signature
      */
diff --git a/types/nedb/nedb-tests.ts b/types/nedb/nedb-tests.ts
index 96c5e9f154..c1ba5459cd 100644
--- a/types/nedb/nedb-tests.ts
+++ b/types/nedb/nedb-tests.ts
@@ -7,7 +7,7 @@ import * as es6styleimport from 'nedb';
 import nedb = require('nedb');
 
 class BaseCollection<T> {
-    private dataStore: nedb;
+    private readonly dataStore: nedb;
 
     constructor(dataStore: nedb) {
         this.dataStore = dataStore;
diff --git a/types/needle/v0/tslint.json b/types/needle/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/needle/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/needle/v1/tslint.json b/types/needle/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/needle/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/negotiator/index.d.ts b/types/negotiator/index.d.ts
index c4d713ac5c..5f665331e3 100644
--- a/types/negotiator/index.d.ts
+++ b/types/negotiator/index.d.ts
@@ -78,6 +78,6 @@ declare class Negotiator {
 
 declare namespace Negotiator {
     interface Headers {
-        [key: string]: string | string[];
+        [key: string]: string | string[] | undefined;
     }
 }
diff --git a/types/neo4j/index.d.ts b/types/neo4j/index.d.ts
index f0923557ca..f42ff7079e 100644
--- a/types/neo4j/index.d.ts
+++ b/types/neo4j/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/thingdom/node-neo4j
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="request" />
 
@@ -57,7 +58,7 @@ export interface GraphDatabaseOptions {
      * HTTP agent.
      * @type {any}
      */
-    agent: any;
+    agent?: any;
 
     /**
      * Authentication information.
@@ -69,13 +70,13 @@ export interface GraphDatabaseOptions {
      * HTTP headers.
      * @type {Object}
      */
-    headers: {};
+    headers?: {};
 
     /**
      * Proxy address.
      * @type {string}
      */
-    proxy: string;
+    proxy?: string;
 
     /**
      * URL connection.
diff --git a/types/neo4j/tslint.json b/types/neo4j/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/neo4j/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nes/client.d.ts b/types/nes/client.d.ts
index 8314894683..5d348b267e 100644
--- a/types/nes/client.d.ts
+++ b/types/nes/client.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for nes 6.4.2
+// Type definitions for nes 7.0.0
 // Project: https://github.com/hapijs/nes
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>
+//                 Rodrigo Saboya <https://github.com/saboya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare class Client {
@@ -9,14 +10,14 @@ declare class Client {
     onConnect: () => void;
     onDisconnect: () => void;
     onUpdate: (message: any) => void;
-    connect(options: Client.ClientConnectOptions, callback: (err?: any) => void): void;
-    connect(callback: (err?: any) => void): void;
-    disconnect(): void;
+    connect(options: Client.ClientConnectOptions): Promise<any>;
+    connect(): Promise<any>;
+    disconnect(): Promise<any>;
     id: any;  // can be `null | number` but also the "socket" value from websocket message data.
-    request(options: string | Client.ClientRequestOptions, callback: (err: any, payload: any, statusCode?: number, headers?: Object) => void): void;
-    message(message: any, callback: (err: any, message: any) => void): void;
-    subscribe(path: string, handler: Client.Handler, callback: (err?: any) => void): void;
-    unsubscribe(path: string, handler: Client.Handler, callback: (err?: any) => void): void;
+    request(options: string | Client.ClientRequestOptions): Promise<any>;
+    message(message: any): Promise<any>;
+    subscribe(path: string, handler: Client.Handler): Promise<any>;
+    unsubscribe(path: string, handler: Client.Handler): Promise<any>;
     subscriptions(): string[];
     overrideReconnectionAuth(auth: any): void;
 }
diff --git a/types/nes/index.d.ts b/types/nes/index.d.ts
index c5526049de..c4d26ecda0 100644
--- a/types/nes/index.d.ts
+++ b/types/nes/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for nes 6.2.1
+// Type definitions for nes 7.0.0
 // Project: https://github.com/hapijs/nes
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>
+//                 Rodrigo Saboya <https://github.com/saboya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  +                                                                           +
@@ -62,12 +63,12 @@ declare module nes {
         index?: boolean;
     }
 
-    export type ServerOnSubscribeWithParams = (socket: Socket, path: string, params: any, next: (err?: any) => void) => void;
-    export type ServerOnSubscribeWithoutParams = (socket: Socket, path: string, next: (err?: any) => void) => void;
+    export type ServerOnSubscribeWithParams = (socket: Socket, path: string, params: any) => Promise<any>;
+    export type ServerOnSubscribeWithoutParams = (socket: Socket, path: string) => Promise<any>;
     export type ServerOnSubscribe = ServerOnSubscribeWithParams | ServerOnSubscribeWithoutParams;
 
-    export type ServerOnUnSubscribeWithParams = (socket: Socket, path: string, params: any, next: () => void) => void;
-    export type ServerOnUnSubscribeWithoutParams = (socket: Socket, path: string, next: () => void) => void;
+    export type ServerOnUnSubscribeWithParams = (socket: Socket, path: string, params: any) => void;
+    export type ServerOnUnSubscribeWithoutParams = (socket: Socket, path: string) => void;
     export type ServerOnUnSubscribe = ServerOnUnSubscribeWithParams | ServerOnUnSubscribeWithoutParams;
 
     interface ServerSubscriptionOptions {
@@ -91,10 +92,10 @@ declare module nes {
         id: string;
         app: Object;
         auth: nes.SocketAuthObject;
-        disconnect(callback?: () => void): void;
-        send(message: any, callback?: (err?: any) => void): void;
-        publish(path: string, message: any, callback?: (err?: any) => void): void;
-        revoke(path: string, message: any, callback?: (err?: any) => void): void;
+        disconnect(): Promise<any>;
+        send(message: any): Promise<any>;
+        publish(path: string, message: any): Promise<any>;
+        revoke(path: string, message: any): Promise<any>;
     }
 
     /**
diff --git a/types/nes/test/broadcast-client.ts b/types/nes/test/broadcast-client.ts
index 4c94b8c575..5563a202d3 100644
--- a/types/nes/test/broadcast-client.ts
+++ b/types/nes/test/broadcast-client.ts
@@ -3,7 +3,7 @@
 import Nes = require('nes');
 
 var client = new Nes.Client('ws://localhost');
-client.connect(function (err) {
+client.connect().then(() => {
 
     client.onUpdate = function (update) {
 
@@ -16,7 +16,7 @@ client.connect(function (err) {
 import NesClient = require('nes/client');
 
 var client = new NesClient('ws://localhost');
-client.connect(function (err) {
+client.connect().then(() => {
 
     client.onUpdate = function (update) {
 
diff --git a/types/nes/test/broadcast-server.ts b/types/nes/test/broadcast-server.ts
index dcfcb3400e..6ef8f7aafa 100644
--- a/types/nes/test/broadcast-server.ts
+++ b/types/nes/test/broadcast-server.ts
@@ -4,11 +4,10 @@ import Hapi = require('hapi');
 import Nes = require('nes');
 
 var server = new Hapi.Server();
-server.connection();
 
-server.register(Nes, function (err) {
+server.register(Nes).then(() => {
 
-    server.start(function (err) {
+    return server.start().then(() => {
 
         server.broadcast('welcome!');
     });
diff --git a/types/nes/test/nes-tests.ts b/types/nes/test/nes-tests.ts
index 90afe68f3e..85cff1e208 100644
--- a/types/nes/test/nes-tests.ts
+++ b/types/nes/test/nes-tests.ts
@@ -2,66 +2,55 @@ import Hapi = require('hapi');
 import Nes = require('nes');
 
 var server: Hapi.Server = new Hapi.Server();
-server.connection({port: 8080});
 
-server.register(Nes, (regErr) => {
-    if(regErr) {
-        console.log('register err');
-        console.log(regErr);
-    } else {
-        // No longer need to cast to Nes.Server as Hapi.Server has been modified directly.
-        // let wsServer: Nes.Server = server as Nes.Server;
-        let wsServer: Hapi.Server = server;
-        wsServer.subscription('/item/{id}');
-        wsServer.route( {
-            method: 'GET',
-            path: '/test',
-            config: {
-                handler: (request, reply) => {
-                    reply({test: 'passes ' + request.socket.id});
-                }
+server.register(Nes).then(() => {
+    // No longer need to cast to Nes.Server as Hapi.Server has been modified directly.
+    // let wsServer: Nes.Server = server as Nes.Server;
+    let wsServer: Hapi.Server = server;
+    wsServer.subscription('/item/{id}');
+    wsServer.route( {
+        method: 'GET',
+        path: '/test',
+        config: {
+            handler: (request, h) => {
+                return {test: 'passes ' + request.socket.id};
             }
-        });
-        wsServer.start((err: any) => {
-            if(err) {
-                console.log('start err');
-                console.log(err);
-            } else {
-                setTimeout(() => {
-                    wsServer.publish('/item/5', { id: 5, status: 'complete' });
-                    wsServer.publish('/item/6', { id: 6, status: 'initial' });
-                }, 100);
-            }
-        });
-    }
+        }
+    });
+    wsServer.start().then(() => {
+        setTimeout(() => {
+            wsServer.publish('/item/5', { id: 5, status: 'complete' });
+            wsServer.publish('/item/6', { id: 6, status: 'initial' });
+        }, 100);
+    }).catch((err) => {
+        console.log('start err');
+        console.log(err);
+    });
+}).catch((regErr: any) => {
+    console.log('register err');
+    console.log(regErr);
 });
 
 let options: Nes.ClientConnectOptions = {delay: 3};
 
-let wsClient: Nes.Client = new Nes.Client('ws://localhost:8080', options);
-wsClient.connect((err: any) => {
-    if(err) {
-        console.log('start err');
-        console.log(err);
-    } else {
-        wsClient.subscribe('/item/5', (update) => {
-            wsClient.request('/test', (reqErr, payload, statusCode) => {
-                if(reqErr) {
-                    console.log('request err');
-                    console.log(reqErr);
-                } else {
-                    console.log(update);
-                    console.log(payload);
-                    if(payload.test === 'passes') {
-                        process.exit(0);
-                    }
-                }
-            })
-        }, (subErr) => {
-            if(subErr) {
-                console.log('subscribe err');
-                console.log(subErr);
+let wsClient: Nes.Client = new Nes.Client('ws://localhost', options);
+wsClient.connect().then(() => {
+    wsClient.subscribe('/item/5', (update) => {
+        wsClient.request('/test').then(({ payload, statusCode }) => {
+            console.log(update);
+            console.log(payload);
+            if(payload.test === 'passes') {
+                process.exit(0);
             }
-        });
-    }
+        }).catch((reqErr: any) => {
+            console.log('request err');
+            console.log(reqErr);
+        })
+    }).catch((subErr: any) => {
+        console.log('subscribe err');
+        console.log(subErr);
+    });
+}).catch((err: any) => {
+    console.log('start err');
+    console.log(err);
 });
diff --git a/types/nes/test/route-authentication-client.ts b/types/nes/test/route-authentication-client.ts
index fe57eb8d56..f1eb8b9659 100644
--- a/types/nes/test/route-authentication-client.ts
+++ b/types/nes/test/route-authentication-client.ts
@@ -3,12 +3,9 @@
 import Nes = require('nes');
 
 var client = new Nes.Client('ws://localhost');
-client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }, function (err) {
+client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }).then(() => {
 
-    client.request('hello', function (err, payload) {   // Can also request '/h'
-
-        // payload -> 'Hello John Doe'
-    });
+    client.request('hello');
 });
 
 // Added in addition to nes doc example code
@@ -16,10 +13,7 @@ client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } }
 import NesClient = require('nes/client');
 
 var client = new NesClient('ws://localhost');
-client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }, function (err) {
+client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }).then(() => {
 
-    client.request('hello', function (err, payload) {   // Can also request '/h'
-
-        // payload -> 'Hello John Doe'
-    });
+    return client.request('hello');
 });
diff --git a/types/nes/test/route-authentication-server.ts b/types/nes/test/route-authentication-server.ts
index 5b4634d77d..2080f04ef4 100644
--- a/types/nes/test/route-authentication-server.ts
+++ b/types/nes/test/route-authentication-server.ts
@@ -8,7 +8,7 @@ import Nes = require('nes');
 var server = new Hapi.Server();
 server.connection();
 
-server.register([Basic, Nes], function (err) {
+server.register([Basic, Nes]).then(() => {
 
     // Set up HTTP Basic authentication
 
@@ -28,20 +28,20 @@ server.register([Basic, Nes], function (err) {
         }
     };
 
-    var validate: Basic.ValidateFunc = function (request, username, password, callback) {
+    var validate: Basic.Validate = async (request, username, password, h) => {
 
         var user = users[username];
         if (!user) {
-            return callback(null, false);
+            return { credentials: null, isValid: false };
         }
 
-        Bcrypt.compare(password, user.password, function (err, isValid) {
+        let isValid = await Bcrypt.compare(password, user.password)
 
-            callback(err, isValid, { id: user.id, name: user.name });
-        });
+        return { isValid, credentials: { id: user.id, name: user.name } };
     };
 
-    server.auth.strategy('simple', 'basic', 'required', { validateFunc: validate });
+    server.auth.strategy('simple', 'basic', { validateFunc: validate });
+    server.auth.default('simple');
 
     // Configure route with authentication
 
@@ -50,12 +50,12 @@ server.register([Basic, Nes], function (err) {
         path: '/h',
         config: {
             id: 'hello',
-            handler: function (request, reply) {
+            handler: function (request, h) {
 
-                return reply('Hello ' + request.auth.credentials.name);
+                return 'Hello ' + request.auth.credentials.name;
             }
         }
     });
 
-    server.start(function (err) { /* ... */ });
+    return server.start();
 });
diff --git a/types/nes/test/route-invocation-client.ts b/types/nes/test/route-invocation-client.ts
index 7b144e3a9c..34c40fe151 100644
--- a/types/nes/test/route-invocation-client.ts
+++ b/types/nes/test/route-invocation-client.ts
@@ -3,12 +3,9 @@
 import Nes = require('nes');
 
 var client = new Nes.Client('ws://localhost');
-client.connect(function (err) {
+client.connect().then(() => {
 
-    client.request('hello', function (err, payload) {   // Can also request '/h'
-
-        // payload -> 'world!'
-    });
+    return client.request('hello');
 });
 
 // Added in addition to nes doc example code
@@ -16,10 +13,7 @@ client.connect(function (err) {
 import NesClient = require('nes/client');
 
 var client = new NesClient('ws://localhost');
-client.connect(function (err) {
+client.connect().then(() => {
 
-    client.request('hello', function (err, payload) {   // Can also request '/h'
-
-        // payload -> 'world!'
-    });
+    return client.request('hello');
 });
diff --git a/types/nes/test/route-invocation-server.ts b/types/nes/test/route-invocation-server.ts
index c32780baa9..d6893495c9 100644
--- a/types/nes/test/route-invocation-server.ts
+++ b/types/nes/test/route-invocation-server.ts
@@ -4,21 +4,20 @@ import Hapi = require('hapi');
 import Nes = require('nes');
 
 var server = new Hapi.Server();
-server.connection();
 
-server.register(Nes, function (err) {
+server.register(Nes).then(() => {
 
     server.route({
         method: 'GET',
         path: '/h',
         config: {
             id: 'hello',
-            handler: function (request, reply) {
+            handler: (request, h) => {
 
-                return reply('world!');
+                return 'world!';
             }
         }
     });
 
-    server.start(function (err) { /* ... */ });
+    return server.start();
 });
diff --git a/types/nes/test/socket.ts b/types/nes/test/socket.ts
index 7f7617d462..029dbb1d2f 100644
--- a/types/nes/test/socket.ts
+++ b/types/nes/test/socket.ts
@@ -4,13 +4,11 @@ import Nes = require('nes');
 
 const socket: Nes.Socket = undefined;
 
-const cb = () => { };
-socket.disconnect(cb);
+socket.disconnect();
 const s: string = socket.id;
 const o: Object = socket.app;
 const auth: Nes.SocketAuthObject = socket.auth;
 
-const cb2 = (err?: any) => { };
-socket.send('message', (err?: any) => { });
-socket.publish('path', 'message', cb2);
-socket.revoke('path', 'message', cb2);
+socket.send('message');
+socket.publish('path', 'message');
+socket.revoke('path', 'message');
diff --git a/types/nes/test/subscription-filter-client.ts b/types/nes/test/subscription-filter-client.ts
index 3f8d3ffb8b..05253539a4 100644
--- a/types/nes/test/subscription-filter-client.ts
+++ b/types/nes/test/subscription-filter-client.ts
@@ -6,15 +6,15 @@ var client = new Nes.Client('ws://localhost');
 
 // Authenticate as 'john'
 
-client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }, function (err) {
+client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }).then(() => {
 
-    var handler: Nes.Handler = function (err, update) {
+    var handler: Nes.Handler = (update) => {
 
         // First publish is not received (filtered due to updater key)
         // update -> { id: 6, status: 'initial', updater: 'steve' }
     };
 
-    client.subscribe('/items', handler, function (err) { });
+    return client.subscribe('/items', handler);
 });
 
 // Added in addition to nes doc example code
@@ -25,13 +25,13 @@ var client = new NesClient('ws://localhost');
 
 // Authenticate as 'john'
 
-client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }, function (err) {
+client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }).then(() => {
 
-    var handler: NesClient.Handler = function (err, update) {
+    var handler: NesClient.Handler = (update) => {
 
         // First publish is not received (filtered due to updater key)
         // update -> { id: 6, status: 'initial', updater: 'steve' }
     };
 
-    client.subscribe('/items', handler, function (err) { });
+    return client.subscribe('/items', handler);
 });
diff --git a/types/nes/test/subscription-filter-server.ts b/types/nes/test/subscription-filter-server.ts
index be2dda8d7f..7a63abf151 100644
--- a/types/nes/test/subscription-filter-server.ts
+++ b/types/nes/test/subscription-filter-server.ts
@@ -6,9 +6,8 @@ import Bcrypt = require('bcrypt');
 import Nes = require('nes');
 
 var server = new Hapi.Server();
-server.connection();
 
-server.register([Basic, Nes], function (err) {
+server.register([Basic, Nes]).then(() => {
 
     // Set up HTTP Basic authentication
 
@@ -28,31 +27,31 @@ server.register([Basic, Nes], function (err) {
         }
     };
 
-    var validate: Basic.ValidateFunc = function (request, username, password, callback) {
+    var validate: Basic.Validate = async (request, username, password, h) => {
 
         var user = users[username];
         if (!user) {
-            return callback(null, false);
+            return { credentials: null, isValid: false };
         }
 
-        Bcrypt.compare(password, user.password, function (err, isValid) {
+        let isValid = await Bcrypt.compare(password, user.password)
 
-            callback(err, isValid, { id: user.id, name: user.name, username: user.username });
-        });
+        return { isValid, credentials: { id: user.id, name: user.name, username: user.username } };
     };
 
-    server.auth.strategy('simple', 'basic', 'required', { validateFunc: validate });
+    server.auth.strategy('simple', 'basic', { validate });
+    server.auth.default('simple')
 
     // Set up subscription
 
     server.subscription('/items', {
-        filter: function (path, message, options, next) {
+        filter: (path, message, options) => {
 
-            return next(message.updater !== options.credentials.username);
+            return message.updater !== options.credentials.username;
         }
     });
 
-    server.start(function (err) {
+    server.start().then(() => {
 
         server.publish('/items', { id: 5, status: 'complete', updater: 'john' });
         server.publish('/items', { id: 6, status: 'initial', updater: 'steve' });
diff --git a/types/nes/test/subscriptions-client.ts b/types/nes/test/subscriptions-client.ts
index a9ac55fc6d..9f6150f90c 100644
--- a/types/nes/test/subscriptions-client.ts
+++ b/types/nes/test/subscriptions-client.ts
@@ -3,15 +3,15 @@
 import Nes = require('nes');
 
 var client = new Nes.Client('ws://localhost');
-client.connect(function (err) {
+    client.connect().then(() => {;
 
-    var handler: Nes.Handler = function (update, flags) {
+    var handler: Nes.Handler = (update, flags) => {
 
         // update -> { id: 5, status: 'complete' }
         // Second publish is not received (doesn't match)
     };
 
-    client.subscribe('/item/5', handler, function (err) { });
+    return client.subscribe('/item/5', handler);
 });
 
 // Added in addition to nes doc example code
@@ -19,13 +19,13 @@ client.connect(function (err) {
 import NesClient = require('nes/client');
 
 var client = new NesClient('ws://localhost');
-client.connect(function (err) {
+client.connect().then(() => {
 
-    var handler: NesClient.Handler = function (update, flags) {
+    var handler: NesClient.Handler = (update, flags) => {
 
         // update -> { id: 5, status: 'complete' }
         // Second publish is not received (doesn't match)
     };
 
-    client.subscribe('/item/5', handler, function (err) { });
+    return client.subscribe('/item/5', handler);
 });
diff --git a/types/nes/test/subscriptions-server.ts b/types/nes/test/subscriptions-server.ts
index 23212f21ea..1280f2afd1 100644
--- a/types/nes/test/subscriptions-server.ts
+++ b/types/nes/test/subscriptions-server.ts
@@ -4,15 +4,14 @@ import Hapi = require('hapi');
 import Nes = require('nes');
 
 var server = new Hapi.Server();
-server.connection();
 
-server.register(Nes, function (err) {
+server.register(Nes).then(() =>{;
 
     server.subscription('/item/{id}');
 
-    server.start(function (err) {
+    return server.start().then(() => {
 
-        server.publish('/item/5', { id: 5, status: 'complete' });
-        server.publish('/item/6', { id: 6, status: 'initial' });
+        server.publish('/item/5', {id: 5, status: 'complete'});
+        server.publish('/item/6', {id: 6, status: 'initial'});
     });
-});
+})
diff --git a/types/nes/tsconfig.json b/types/nes/tsconfig.json
index d0100330cd..374b67b515 100644
--- a/types/nes/tsconfig.json
+++ b/types/nes/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -33,4 +36,4 @@
         "test/subscriptions-client.ts",
         "test/subscriptions-server.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/nes/tslint.json b/types/nes/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nes/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/net-keepalive/tslint.json b/types/net-keepalive/tslint.json
index 193d7e799a..bebdb55ef0 100644
--- a/types/net-keepalive/tslint.json
+++ b/types/net-keepalive/tslint.json
@@ -3,7 +3,6 @@
     "rules": {
         "semicolon": [true, "never"],
         "eofline": false,
-        "indent": [true, "spaces", 4],
-        "linebreak-style": [true, "LF"]
+        "indent": [true, "spaces", 4]
     }
 }
\ No newline at end of file
diff --git a/types/netmask/tslint.json b/types/netmask/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/netmask/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nexpect/tslint.json b/types/nexpect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nexpect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/next-redux-wrapper/index.d.ts b/types/next-redux-wrapper/index.d.ts
index dae0cf3841..a6b1da550e 100644
--- a/types/next-redux-wrapper/index.d.ts
+++ b/types/next-redux-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kirill-konshin/next-redux-wrapper
 // Definitions by: Steve <https://github.com/stevegeek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="node" />
 /*~ Note that ES6 modules cannot directly export callable functions.
@@ -14,7 +14,7 @@
  */
 
 import * as React from 'react';
-import { IncomingMessage } from 'http';
+import { IncomingMessage, ServerResponse } from 'http';
 import {
     Store, Component,
     MapDispatchToPropsParam, MapStateToPropsParam,
@@ -23,33 +23,33 @@ import {
 
 export = nextReduxWrapper;
 
-interface NextPageComponentMethods {
-    getInitialProps(props: any): Promise<any>;
-}
-type NextReduxWrappedComponent = React.Component & NextPageComponentMethods;
-
-type NextStoreCreator<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> = (
-    initialState: TInitialState,
-    options: nextReduxWrapper.StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>
-) => Store<TInitialState>;
-
 declare function nextReduxWrapper<TInitialState = any, TStateProps = any, TDispatchProps = any, TOwnProps = any, TMergedProps = any>(
     options: nextReduxWrapper.Options<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>
-): (Component: Component<TOwnProps & TMergedProps>) => NextReduxWrappedComponent;
+): (Component: Component<TOwnProps & TMergedProps>) => nextReduxWrapper.NextReduxWrappedComponent;
 declare function nextReduxWrapper<TInitialState = any, TStateProps = any, TDispatchProps = any, TOwnProps = any, TMergedProps = any>(
-    createStore: NextStoreCreator<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-    mapStateToProps?: MapStateToPropsParam<TStateProps, TOwnProps>,
+    createStore: nextReduxWrapper.NextStoreCreator<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
+    mapStateToProps?: MapStateToPropsParam<TStateProps, TOwnProps, any>,
     mapDispatchToProps?: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
     mergeProps?: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
     options?: ConnectOptions
-): (Component: Component<TOwnProps & TMergedProps>) => NextReduxWrappedComponent;
+): (Component: Component<TOwnProps & TMergedProps>) => nextReduxWrapper.NextReduxWrappedComponent;
 
 declare namespace nextReduxWrapper {
+    interface NextPageComponentMethods {
+        getInitialProps(props: any): Promise<any>;
+    }
+    type NextReduxWrappedComponent = React.Component & NextPageComponentMethods;
+
+    type NextStoreCreator<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> = (
+        initialState: TInitialState,
+        options: StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>
+    ) => Store<TInitialState>;
+
     interface Options<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> {
         createStore: NextStoreCreator<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>;
         debug?: boolean;
         storeKey?: string;
-        mapStateToProps?: MapStateToPropsParam<TStateProps, TOwnProps>;
+        mapStateToProps?: MapStateToPropsParam<TStateProps, TOwnProps, any>;
         mapDispatchToProps?: MapDispatchToPropsParam<TDispatchProps, TOwnProps>;
         mergeProps?: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>;
         connectOptions?: ConnectOptions;
@@ -57,6 +57,7 @@ declare namespace nextReduxWrapper {
     interface StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> extends Options<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> {
         isServer: boolean;
         req?: IncomingMessage;
+        res?: ServerResponse;
         query?: any;
     }
 
diff --git a/types/next-redux-wrapper/next-redux-wrapper-tests.tsx b/types/next-redux-wrapper/next-redux-wrapper-tests.tsx
index 37bd8af4b8..40069aeb8d 100644
--- a/types/next-redux-wrapper/next-redux-wrapper-tests.tsx
+++ b/types/next-redux-wrapper/next-redux-wrapper-tests.tsx
@@ -70,7 +70,7 @@ const com5 = withRedux<InitialState, ConnectStateProps, DispatchProps, OwnProps,
 
 const com6 = withRedux<InitialState, ConnectStateProps, DispatchProps, OwnProps, MergedProps>(
     (initialState: InitialState, options: StoreCreatorOptions<InitialState, ConnectStateProps, DispatchProps, OwnProps, MergedProps>) => {
-        if (options.isServer || options.req || options.query) {
+        if (options.isServer || options.req || options.query || options.res) {
             const a = 1;
         }
         return createStore(reducer, initialState);
diff --git a/types/next-redux-wrapper/package.json b/types/next-redux-wrapper/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/next-redux-wrapper/package.json
+++ b/types/next-redux-wrapper/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/next/document.d.ts b/types/next/document.d.ts
index dfb34359e1..4696819626 100644
--- a/types/next/document.d.ts
+++ b/types/next/document.d.ts
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import * as React from "react";
 
 export interface DocumentProps {
     __NEXT_DATA__?: any;
diff --git a/types/next/dynamic.d.ts b/types/next/dynamic.d.ts
index 4271f89c96..62d53f1e72 100644
--- a/types/next/dynamic.d.ts
+++ b/types/next/dynamic.d.ts
@@ -1,16 +1,29 @@
-import * as React from 'react';
+import * as React from "react";
 
 export interface DynamicOptions<TCProps, TLProps> {
     loading?: React.ComponentType<TLProps>;
     ssr?: boolean;
-    modules?(props: TCProps & TLProps): { [key: string]: Promise<React.ComponentType<any>> };
-    render?(props: TCProps & TLProps, modules: { [key: string]: React.ComponentType<any> }): void;
+    modules?(
+        props: TCProps & TLProps,
+    ): { [key: string]: Promise<React.ComponentType<any>> };
+    render?(
+        props: TCProps & TLProps,
+        modules: { [key: string]: React.ComponentType<any> },
+    ): void;
 }
 
 export class SameLoopPromise<T> extends Promise<T> {
-    constructor(executor: (resolve: (value?: T) => void, reject: (reason?: any) => void) => void);
+    constructor(
+        executor: (
+            resolve: (value?: T) => void,
+            reject: (reason?: any) => void,
+        ) => void,
+    );
     setResult(value: T): void;
     setError(value: any): void;
     runIfNeeded(): void;
 }
-export default function<TCProps, TLProps>(componentPromise: Promise<React.ComponentType<TCProps>>, options?: DynamicOptions<TCProps, TLProps>): React.ComponentType<TCProps & TLProps>;
+export default function<TCProps, TLProps>(
+    componentPromise: Promise<React.ComponentType<TCProps>>,
+    options?: DynamicOptions<TCProps, TLProps>,
+): React.ComponentType<TCProps & TLProps>;
diff --git a/types/next/error.d.ts b/types/next/error.d.ts
index a6d8695947..d05d25b9c8 100644
--- a/types/next/error.d.ts
+++ b/types/next/error.d.ts
@@ -1,2 +1,2 @@
-import * as React from 'react';
-export default class extends React.Component<{statusCode: number}> {}
+import * as React from "react";
+export default class extends React.Component<{ statusCode: number }> {}
diff --git a/types/next/head.d.ts b/types/next/head.d.ts
index fc50b7bcf9..24fab7a076 100644
--- a/types/next/head.d.ts
+++ b/types/next/head.d.ts
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import * as React from "react";
 
 export function defaultHead(): JSX.Element[];
 export default class extends React.Component {
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 17f3848bca..70bc8ef049 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -1,63 +1,147 @@
 // Type definitions for next 2.4
 // Project: https://github.com/zeit/next.js
 // Definitions by: Drew Hays <https://github.com/dru89>
+//                 Brice BERNARD <https://github.com/brikou>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="node" />
 
-import * as http from 'http';
-import * as url from 'url';
+import * as http from "http";
+import * as url from "url";
 
 declare namespace next {
-  type UrlLike = url.UrlObject | url.Url;
+    type UrlLike = url.UrlObject | url.Url;
 
-  interface ServerConfig {
-    // known keys
-    webpack?: any;
-    webpackDevMiddleware?: any;
-    poweredByHeader?: boolean;
-    distDir?: string;
-    assetPrefix?: string;
-    configOrigin?: string;
-    useFileSystemPublicRoutes?: boolean;
+    interface ServerConfig {
+        // known keys
+        webpack?: any;
+        webpackDevMiddleware?: any;
+        poweredByHeader?: boolean;
+        distDir?: string;
+        assetPrefix?: string;
+        configOrigin?: string;
+        useFileSystemPublicRoutes?: boolean;
 
-    // and since this is a config, it can take anything else, too.
-    [key: string]: any;
-  }
+        // and since this is a config, it can take anything else, too.
+        [key: string]: any;
+    }
 
-  interface ServerOptions {
-    dir?: string;
-    dev?: boolean;
-    staticMarkup?: boolean;
-    quiet?: boolean;
-    conf?: ServerConfig;
-  }
+    interface ServerOptions {
+        dir?: string;
+        dev?: boolean;
+        staticMarkup?: boolean;
+        quiet?: boolean;
+        conf?: ServerConfig;
+    }
 
-  interface Server {
-    handleRequest(req: http.IncomingMessage, res: http.ServerResponse, parsedUrl?: UrlLike): Promise<void>;
-    getRequestHandler(): (req: http.IncomingMessage, res: http.ServerResponse, parsedUrl?: UrlLike) => Promise<void>;
-    prepare(): Promise<void>;
-    close(): Promise<void>;
-    defineRoutes(): Promise<void>;
-    start(): Promise<void>;
-    run(req: http.IncomingMessage, res: http.ServerResponse, parsedUrl: UrlLike): Promise<void>;
+    interface Server {
+        handleRequest(
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            parsedUrl?: UrlLike,
+        ): Promise<void>;
+        getRequestHandler(): (
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            parsedUrl?: UrlLike,
+        ) => Promise<void>;
+        prepare(): Promise<void>;
+        close(): Promise<void>;
+        defineRoutes(): Promise<void>;
+        start(): Promise<void>;
+        run(
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            parsedUrl: UrlLike,
+        ): Promise<void>;
 
-    render(req: http.IncomingMessage, res: http.ServerResponse, pathname: string, query?: {[key: string]: any}, parsedUrl?: UrlLike): Promise<void>;
-    renderError(err: any, req: http.IncomingMessage, res: http.ServerResponse, pathname: string, query?: {[key: string]: any}): Promise<void>;
-    render404(req: http.IncomingMessage, res: http.ServerResponse, parsedUrl: UrlLike): Promise<void>;
-    renderToHTML(req: http.IncomingMessage, res: http.ServerResponse, pathname: string, query?: {[key: string]: any}): Promise<string>;
-    renderErrorToHTML(err: any, req: http.IncomingMessage, res: http.ServerResponse, pathname: string, query?: {[key: string]: any}): Promise<string>;
+        render(
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            pathname: string,
+            query?: {
+                [key: string]:
+                    | boolean
+                    | boolean[]
+                    | number
+                    | number[]
+                    | string
+                    | string[];
+            },
+            parsedUrl?: UrlLike,
+        ): Promise<void>;
+        renderError(
+            err: any,
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            pathname: string,
+            query?: {
+                [key: string]:
+                    | boolean
+                    | boolean[]
+                    | number
+                    | number[]
+                    | string
+                    | string[];
+            },
+        ): Promise<void>;
+        render404(
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            parsedUrl: UrlLike,
+        ): Promise<void>;
+        renderToHTML(
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            pathname: string,
+            query?: {
+                [key: string]:
+                    | boolean
+                    | boolean[]
+                    | number
+                    | number[]
+                    | string
+                    | string[];
+            },
+        ): Promise<string>;
+        renderErrorToHTML(
+            err: any,
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            pathname: string,
+            query?: {
+                [key: string]:
+                    | boolean
+                    | boolean[]
+                    | number
+                    | number[]
+                    | string
+                    | string[];
+            },
+        ): Promise<string>;
 
-    serveStatic(req: http.IncomingMessage, res: http.ServerResponse, path: string): Promise<void>;
-    isServeableUrl(path: string): boolean;
-    isInternalUrl(req: http.IncomingMessage): boolean;
-    readBuildId(): string;
-    handleBuildId(buildId: string, res: http.ServerResponse): boolean;
-    getCompilationError(page: string, req: http.IncomingMessage, res: http.ServerResponse): Promise<any>;
-    handleBuildHash(filename: string, hash: string, res: http.ServerResponse): void;
-    send404(res: http.ServerResponse): void;
-  }
+        serveStatic(
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            path: string,
+        ): Promise<void>;
+        isServeableUrl(path: string): boolean;
+        isInternalUrl(req: http.IncomingMessage): boolean;
+        readBuildId(): string;
+        handleBuildId(buildId: string, res: http.ServerResponse): boolean;
+        getCompilationError(
+            page: string,
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+        ): Promise<any>;
+        handleBuildHash(
+            filename: string,
+            hash: string,
+            res: http.ServerResponse,
+        ): void;
+        send404(res: http.ServerResponse): void;
+    }
 }
 
 declare function next(options?: next.ServerOptions): next.Server;
diff --git a/types/next/link.d.ts b/types/next/link.d.ts
index aca3190f7e..36c2e33546 100644
--- a/types/next/link.d.ts
+++ b/types/next/link.d.ts
@@ -1,5 +1,5 @@
-import * as url from 'url';
-import * as React from 'react';
+import * as url from "url";
+import * as React from "react";
 
 export type UrlLike = url.UrlObject | url.Url;
 export interface LinkState {
@@ -10,6 +10,7 @@ export interface LinkState {
     onError?(error: any): void;
     href?: string | UrlLike;
     as?: string | UrlLike;
+    passHref?: boolean;
     children: React.ReactElement<any>;
 }
 
diff --git a/types/next/router.d.ts b/types/next/router.d.ts
index 021b0dd3dc..181208518f 100644
--- a/types/next/router.d.ts
+++ b/types/next/router.d.ts
@@ -1,4 +1,7 @@
-import * as React from 'react';
+import * as React from "react";
+import * as url from "url";
+
+type UrlLike = url.UrlObject | url.Url;
 
 export interface EventChangeOptions {
     shallow?: boolean;
@@ -11,17 +14,35 @@ export interface SingletonRouter {
     ready(cb: RouterCallback): void;
 
     // router properties
-    readonly components: { [key: string]: { Component: React.ComponentType<any>, err: any } };
+    readonly components: {
+        [key: string]: { Component: React.ComponentType<any>; err: any };
+    };
     readonly pathname: string;
     readonly route: string;
     readonly asPath?: string;
-    readonly query?: { [key: string]: any };
+    readonly query?: {
+        [key: string]:
+            | boolean
+            | boolean[]
+            | number
+            | number[]
+            | string
+            | string[];
+    };
 
     // router methods
     reload(route: string): Promise<void>;
     back(): void;
-    push(url: string, as?: string, options?: EventChangeOptions): Promise<boolean>;
-    replace(url: string, as?: string, options?: EventChangeOptions): Promise<boolean>;
+    push(
+        url: string | UrlLike,
+        as?: string | UrlLike,
+        options?: EventChangeOptions,
+    ): Promise<boolean>;
+    replace(
+        url: string | UrlLike,
+        as?: string | UrlLike,
+        options?: EventChangeOptions,
+    ): Promise<boolean>;
     prefetch(url: string): Promise<React.ComponentType<any>>;
 
     // router events
@@ -32,5 +53,9 @@ export interface SingletonRouter {
     onRouteChangeError?(error: any, url: string): void;
 }
 
+export function withRouter<T extends {}>(
+    Component: React.ComponentType<T & { router: SingletonRouter }>,
+): React.ComponentType<T>;
+
 export const Singleton: SingletonRouter;
 export default Singleton;
diff --git a/types/next/test/next-document-tests.tsx b/types/next/test/next-document-tests.tsx
index 4fbb25948b..0177d1d451 100644
--- a/types/next/test/next-document-tests.tsx
+++ b/types/next/test/next-document-tests.tsx
@@ -1,12 +1,12 @@
-import Document, * as document from 'next/document';
-import * as React from 'react';
+import Document, * as document from "next/document";
+import * as React from "react";
 
 const results = (
-  <Document any="property" should="work" here>
-    <document.Head some="more" properties>
-      <meta name="description" content="Head can have children, too!" />
-    </document.Head>
-    <document.Main />
-    <document.NextScript />
-  </Document>
+    <Document any="property" should="work" here>
+        <document.Head some="more" properties>
+            <meta name="description" content="Head can have children, too!" />
+        </document.Head>
+        <document.Main />
+        <document.NextScript />
+    </Document>
 );
diff --git a/types/next/test/next-dynamic-tests.tsx b/types/next/test/next-dynamic-tests.tsx
index be10954de9..0b4cdde82d 100644
--- a/types/next/test/next-dynamic-tests.tsx
+++ b/types/next/test/next-dynamic-tests.tsx
@@ -1,23 +1,25 @@
-import dynamic, * as d from 'next/dynamic';
-import * as React from 'react';
+import dynamic, * as d from "next/dynamic";
+import * as React from "react";
 
 // typically you'd use this with an esnext-style import() statement, but we'll make do without
 interface DynamicComponentProps {
-  foo: string;
-  bar: number;
+    foo: string;
+    bar: number;
 }
 async function getComponent() {
-  return (
-    (props: DynamicComponentProps) => <div>I'm an async component! {props.foo} {props.bar}</div>
-  );
+    return (props: DynamicComponentProps) => (
+        <div>
+            I'm an async component! {props.foo} {props.bar}
+        </div>
+    );
 }
 
 interface LoadingComponentProps {
-  baz: boolean;
+    baz: boolean;
 }
 
 const DynamicComponent = dynamic(getComponent(), {
-  loading: (props: LoadingComponentProps) => <div>Loading! {props.baz}</div>
+    loading: (props: LoadingComponentProps) => <div>Loading! {props.baz}</div>,
 });
 
-const jsx = (<DynamicComponent foo='five' bar={5} baz />);
+const jsx = <DynamicComponent foo="five" bar={5} baz />;
diff --git a/types/next/test/next-error-tests.tsx b/types/next/test/next-error-tests.tsx
index 38692ac6de..057eb95f23 100644
--- a/types/next/test/next-error-tests.tsx
+++ b/types/next/test/next-error-tests.tsx
@@ -1,6 +1,4 @@
-import * as React from 'react';
-import ErrorComponent from 'next/error';
+import * as React from "react";
+import ErrorComponent from "next/error";
 
-const result = (
-  <ErrorComponent statusCode={404} />
-);
+const result = <ErrorComponent statusCode={404} />;
diff --git a/types/next/test/next-head-tests.tsx b/types/next/test/next-head-tests.tsx
index c81333700c..735402ca9a 100644
--- a/types/next/test/next-head-tests.tsx
+++ b/types/next/test/next-head-tests.tsx
@@ -1,19 +1,11 @@
-import Head, * as head from 'next/head';
-import * as React from 'react';
+import Head, * as head from "next/head";
+import * as React from "react";
 
 const elements: JSX.Element[] = head.defaultHead();
-const jsx = (
-  <Head>
-    {elements}
-  </Head>
-);
+const jsx = <Head>{elements}</Head>;
 
 if (!Head.canUseDOM) {
-  Head.rewind().map(
-    x => [x.key, x.props, x.type]
-  );
+    Head.rewind().map(x => [x.key, x.props, x.type]);
 }
 
-Head.peek().map(
-  x => [x.key, x.props, x.type]
-);
+Head.peek().map(x => [x.key, x.props, x.type]);
diff --git a/types/next/test/next-link-tests.tsx b/types/next/test/next-link-tests.tsx
index 281c6aff7a..2a85fec1ad 100644
--- a/types/next/test/next-link-tests.tsx
+++ b/types/next/test/next-link-tests.tsx
@@ -1,13 +1,23 @@
-import Link from 'next/link';
-import * as React from 'react';
+import Link from "next/link";
+import * as React from "react";
 
 const links = (
-  <div>
-    <Link as="foo" href="https://www.example.com" onError={(e: any) => { console.log("Handled error!", e); }} prefetch replace scroll shallow>
-      <a>Gotta link to somewhere!</a>
-    </Link>
-    <Link>
-      <a>All props are optional!</a>
-    </Link>
-  </div>
+    <div>
+        <Link
+            as="foo"
+            href="https://www.example.com"
+            onError={(e: any) => {
+                console.log("Handled error!", e);
+            }}
+            prefetch
+            replace
+            scroll
+            shallow
+        >
+            <a>Gotta link to somewhere!</a>
+        </Link>
+        <Link>
+            <a>All props are optional!</a>
+        </Link>
+    </div>
 );
diff --git a/types/next/test/next-router-tests.tsx b/types/next/test/next-router-tests.tsx
index 37e739d98a..fe82d6f0b2 100644
--- a/types/next/test/next-router-tests.tsx
+++ b/types/next/test/next-router-tests.tsx
@@ -1,28 +1,34 @@
-import Router, * as r from 'next/router';
-import * as React from 'react';
-import * as qs from 'querystring';
+import Router, * as r from "next/router";
+import * as React from "react";
+import * as qs from "querystring";
 
-Router.readyCallbacks.push(() => { console.log("I'll get called when the router initializes."); });
-Router.ready(() => { console.log("I'll get called immediately if the router initializes, or when it eventually does."); });
+Router.readyCallbacks.push(() => {
+    console.log("I'll get called when the router initializes.");
+});
+Router.ready(() => {
+    console.log(
+        "I'll get called immediately if the router initializes, or when it eventually does.",
+    );
+});
 
 // Access readonly properties of the router.
 
 Object.keys(Router.components).forEach(key => {
-  const c = Router.components[key];
-  c.err.isAnAny;
+    const c = Router.components[key];
+    c.err.isAnAny;
 
-  return <c.Component />;
+    return <c.Component />;
 });
 
 function split(routeLike: string) {
-  routeLike.split('/').forEach(part => {
-    console.log("path part: ", part);
-  });
+    routeLike.split("/").forEach(part => {
+        console.log("path part: ", part);
+    });
 }
 
 if (Router.asPath) {
-  split(Router.asPath);
-  split(Router.asPath);
+    split(Router.asPath);
+    split(Router.asPath);
 }
 
 split(Router.pathname);
@@ -31,23 +37,41 @@ const query = `?${qs.stringify(Router.query)}`;
 
 // Assign some callback methods.
 Router.onAppUpdated = (nextRoute: string) => console.log(nextRoute);
-Router.onRouteChangeStart = (url: string) => console.log("Route is starting to change.", url);
-Router.onBeforeHistoryChange = (as: string) => console.log("History hasn't changed yet.", as);
-Router.onRouteChangeComplete = (url: string) => console.log("Route chaneg is complete.", url);
-Router.onRouteChangeError = (err: any, url: string) => console.log("Route is starting to change.", url, err);
+Router.onRouteChangeStart = (url: string) =>
+    console.log("Route is starting to change.", url);
+Router.onBeforeHistoryChange = (as: string) =>
+    console.log("History hasn't changed yet.", as);
+Router.onRouteChangeComplete = (url: string) =>
+    console.log("Route chaneg is complete.", url);
+Router.onRouteChangeError = (err: any, url: string) =>
+    console.log("Route is starting to change.", url, err);
 
 // Call methods on the router itself.
-Router.reload('/route').then(() => console.log('route was reloaded'));
+Router.reload("/route").then(() => console.log("route was reloaded"));
 Router.back();
 
-Router.push('/route').then((success: boolean) => console.log('route push success: ', success));
-Router.push('/route', '/asRoute').then((success: boolean) => console.log('route push success: ', success));
-Router.push('/route', '/asRoute', {shallow: false}).then((success: boolean) => console.log('route push success: ', success));
+Router.push("/route").then((success: boolean) =>
+    console.log("route push success: ", success),
+);
+Router.push("/route", "/asRoute").then((success: boolean) =>
+    console.log("route push success: ", success),
+);
+Router.push("/route", "/asRoute", { shallow: false }).then((success: boolean) =>
+    console.log("route push success: ", success),
+);
 
-Router.replace('/route').then((success: boolean) => console.log('route replace success: ', success));
-Router.replace('/route', '/asRoute').then((success: boolean) => console.log('route replace success: ', success));
-Router.replace('/route', '/asRoute', {shallow: false}).then((success: boolean) => console.log('route replace success: ', success));
+Router.replace("/route").then((success: boolean) =>
+    console.log("route replace success: ", success),
+);
+Router.replace("/route", "/asRoute").then((success: boolean) =>
+    console.log("route replace success: ", success),
+);
+Router.replace("/route", "/asRoute", {
+    shallow: false,
+}).then((success: boolean) => console.log("route replace success: ", success));
 
-Router.prefetch('/route').then(Component => {
-  const element = (<Component />);
+Router.prefetch("/route").then(Component => {
+    const element = <Component />;
 });
+
+r.withRouter(props => <div />);
diff --git a/types/next/test/next-tests.ts b/types/next/test/next-tests.ts
index 7e9bb474e7..ddbc51ee33 100644
--- a/types/next/test/next-tests.ts
+++ b/types/next/test/next-tests.ts
@@ -1,56 +1,78 @@
-import createServer = require('next');
-import * as http from 'http';
-import * as url from 'url';
+import createServer = require("next");
+import * as http from "http";
+import * as url from "url";
 
 const defaultServer: createServer.Server = createServer();
 const server = createServer({
-  dir: '..',
-  quiet: true,
-  conf: {
-    distDir: './dist',
-    useFileSystemPublicRoutes: false,
-    anotherProperty: {
-      key: true
-    }
-  },
+    dir: "..",
+    quiet: true,
+    conf: {
+        distDir: "./dist",
+        useFileSystemPublicRoutes: false,
+        anotherProperty: {
+            key: true,
+        },
+    },
 });
 
 const voidFunc = () => {};
-const stringFunc = (x: string) => x.split('\n');
+const stringFunc = (x: string) => x.split("\n");
 
 server.prepare().then(voidFunc);
 server.close().then(voidFunc);
 server.defineRoutes().then(voidFunc);
 server.start().then(voidFunc);
 
-const parsedUrl = url.parse('https://www.example.com');
+const parsedUrl = url.parse("https://www.example.com");
 const handler = server.getRequestHandler();
 
 function handle(req: http.IncomingMessage, res: http.ServerResponse) {
-  handler(req, res);
-  handler(req, res, parsedUrl).then(voidFunc);
-  server.run(req, res, parsedUrl).then(voidFunc);
+    handler(req, res);
+    handler(req, res, parsedUrl).then(voidFunc);
+    server.run(req, res, parsedUrl).then(voidFunc);
 
-  server.render(req, res, '/path/to/resource').then(voidFunc);
-  server.render(req, res, '/path/to/resource', {}, parsedUrl).then(voidFunc);
-  server.render(req, res, '/path/to/resource', { key: 'value' }, parsedUrl).then(voidFunc);
-  server.renderError(new Error(), req, res, '/path/to/resource').then(voidFunc);
-  server.renderError(new Error(), req, res, '/path/to/resource', { key: 'value' }).then(voidFunc);
-  server.renderError('this can be an error, too!', req, res, '/path/to/resource', { key: 'value' }).then(voidFunc);
-  server.render404(req, res, parsedUrl).then(voidFunc);
+    server.render(req, res, "/path/to/resource").then(voidFunc);
+    server.render(req, res, "/path/to/resource", {}, parsedUrl).then(voidFunc);
+    server
+        .render(req, res, "/path/to/resource", { key: "value" }, parsedUrl)
+        .then(voidFunc);
+    server
+        .renderError(new Error(), req, res, "/path/to/resource")
+        .then(voidFunc);
+    server
+        .renderError(new Error(), req, res, "/path/to/resource", {
+            key: "value",
+        })
+        .then(voidFunc);
+    server
+        .renderError(
+            "this can be an error, too!",
+            req,
+            res,
+            "/path/to/resource",
+            { key: "value" },
+        )
+        .then(voidFunc);
+    server.render404(req, res, parsedUrl).then(voidFunc);
 
-  server.renderToHTML(req, res, '/path/to/resource', { foo: 'bar' }).then(x => x.split('\n'));
-  server.renderErrorToHTML(new Error(), req, res, '/path/to/resource', { foo: 'bar' }).then(x => x.split('\n'));
+    server
+        .renderToHTML(req, res, "/path/to/resource", { foo: "bar" })
+        .then(x => x.split("\n"));
+    server
+        .renderErrorToHTML(new Error(), req, res, "/path/to/resource", {
+            foo: "bar",
+        })
+        .then(x => x.split("\n"));
 
-  server.serveStatic(req, res, '/path/to/thing').then(voidFunc);
+    server.serveStatic(req, res, "/path/to/thing").then(voidFunc);
 
-  let b: boolean;
-  b = server.isServeableUrl('/path/to/thing');
-  b = server.isInternalUrl(req);
-  b = server.handleBuildId('{buildId}', res);
+    let b: boolean;
+    b = server.isServeableUrl("/path/to/thing");
+    b = server.isInternalUrl(req);
+    b = server.handleBuildId("{buildId}", res);
 
-  const s: string = server.readBuildId();
-  server.getCompilationError('page', req, res).then(err => err.thisIsAnAny);
-  server.handleBuildHash('filename', 'hash', res);
-  server.send404(res);
+    const s: string = server.readBuildId();
+    server.getCompilationError("page", req, res).then(err => err.thisIsAnAny);
+    server.handleBuildHash("filename", "hash", res);
+    server.send404(res);
 }
diff --git a/types/ng-command/tslint.json b/types/ng-command/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-command/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-cordova/package.json b/types/ng-cordova/package.json
new file mode 100644
index 0000000000..6d6a344695
--- /dev/null
+++ b/types/ng-cordova/package.json
@@ -0,0 +1,8 @@
+{
+    "private": true,
+    "dependencies": {
+        "cordova-plugin-camera": "^3.0.0",
+        "cordova-plugin-file": "^5.0.0",
+        "cordova-plugin-file-transfer": "^1.7.0"
+    }
+}
diff --git a/types/ng-cordova/test/appAvailability.ts b/types/ng-cordova/test/appAvailability.ts
index 5cb049a76a..aabd90ab9c 100644
--- a/types/ng-cordova/test/appAvailability.ts
+++ b/types/ng-cordova/test/appAvailability.ts
@@ -1,7 +1,12 @@
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
 
-/// <reference types="ionic" />
+// Simplified ionic types to avoid needing a dependency on it
+declare namespace ionic.platform {
+  interface IonicPlatformService {
+    ready(cb: () => void): void;
+  }
+}
 
 namespace demo.appavailability {
   'use strict';
@@ -12,8 +17,8 @@ namespace demo.appavailability {
 
     static $inject:Array<string> = ["$ionicPlatform", "$cordovaDevice", "$cordovaAppAvailability"];
     constructor($ionicPlatform:ionic.platform.IonicPlatformService,
-       private $cordovaDevice:ngCordova.IDeviceService,
-       private $cordovaAppAvailability:ngCordova.IAppAvailabilityService) {
+       private readonly $cordovaDevice:ngCordova.IDeviceService,
+       private readonly $cordovaAppAvailability:ngCordova.IAppAvailabilityService) {
 
       this.isAvailable = false;
 
diff --git a/types/ng-cordova/test/deviceMotion.ts b/types/ng-cordova/test/deviceMotion.ts
index a93f42152b..31b825525d 100644
--- a/types/ng-cordova/test/deviceMotion.ts
+++ b/types/ng-cordova/test/deviceMotion.ts
@@ -11,7 +11,7 @@ namespace demo.devicemotion {
     msg:string;
 
     static $inject:Array<string> = ["$ionicPlatform", "$cordovaDeviceMotion"];
-    constructor($ionicPlatform:ionic.platform.IonicPlatformService, private $cordovaDeviceMotion:ngCordova.IDeviceMotionService) {
+    constructor($ionicPlatform:ionic.platform.IonicPlatformService, private readonly $cordovaDeviceMotion:ngCordova.IDeviceMotionService) {
       $ionicPlatform.ready(() => {
         this.getAcceleration();
       });
diff --git a/types/ng-cordova/test/deviceOrientation.ts b/types/ng-cordova/test/deviceOrientation.ts
index eadcdcb234..56a8efee88 100644
--- a/types/ng-cordova/test/deviceOrientation.ts
+++ b/types/ng-cordova/test/deviceOrientation.ts
@@ -12,8 +12,8 @@ namespace demo.deviceorientation {
 
     static $inject:Array<string> = ["$ionicPlatform", "$timeout", "$cordovaDeviceOrientation"];
     constructor($ionicPlatform:ionic.platform.IonicPlatformService,
-      private $timeout:ng.ITimeoutService,
-      private $cordovaDeviceOrientation:ngCordova.IDeviceOrientationService) {
+      private readonly $timeout:ng.ITimeoutService,
+      private readonly $cordovaDeviceOrientation:ngCordova.IDeviceOrientationService) {
 
         $ionicPlatform.ready(() => {
           this.getHeading();
diff --git a/types/ng-cordova/test/dialogs.ts b/types/ng-cordova/test/dialogs.ts
index fe56cc3bc1..578d995724 100644
--- a/types/ng-cordova/test/dialogs.ts
+++ b/types/ng-cordova/test/dialogs.ts
@@ -9,7 +9,7 @@ namespace demo.dialog {
     action:string;
 
 		static $inject:Array<string> = ["$ionicPlatform", "$cordovaDialogs"];
-		constructor($ionicPlatform:ionic.platform.IonicPlatformService, private $cordovaDialogs:ngCordova.IDialogsService) {
+		constructor($ionicPlatform:ionic.platform.IonicPlatformService, private readonly $cordovaDialogs:ngCordova.IDialogsService) {
       this.action = "Press any button !";
 		}
 
diff --git a/types/ng-cordova/test/geolocation.ts b/types/ng-cordova/test/geolocation.ts
index 34a67c9b00..63879867ac 100644
--- a/types/ng-cordova/test/geolocation.ts
+++ b/types/ng-cordova/test/geolocation.ts
@@ -10,7 +10,7 @@ namespace demo.geolocation {
 		position:ngCordova.IGeoPosition;
 
 		static $inject:Array<string> = ["$ionicPlatform", "$cordovaGeolocation"];
-		constructor($ionicPlatform:ionic.platform.IonicPlatformService, private $cordovaGeolocation:ngCordova.IGeolocationService) {
+		constructor($ionicPlatform:ionic.platform.IonicPlatformService, private readonly $cordovaGeolocation:ngCordova.IGeolocationService) {
 
 		}
 
diff --git a/types/ng-cordova/test/network.ts b/types/ng-cordova/test/network.ts
index dde727237b..e7bb18f6ac 100644
--- a/types/ng-cordova/test/network.ts
+++ b/types/ng-cordova/test/network.ts
@@ -12,7 +12,7 @@ namespace demo.network {
 
 		static $inject:Array<string> = ["$ionicPlatform", "$cordovaNetwork"];
 
-		constructor($ionicPlatform:ionic.platform.IonicPlatformService, private $cordovaNetwork:ngCordova.INetworkInformationService) {
+		constructor($ionicPlatform:ionic.platform.IonicPlatformService, private readonly $cordovaNetwork:ngCordova.INetworkInformationService) {
 
 			$ionicPlatform.ready(() => {
 				this.refresh();
diff --git a/types/ng-cordova/test/toast.ts b/types/ng-cordova/test/toast.ts
index 2601ad577a..a1dc1d0a6d 100644
--- a/types/ng-cordova/test/toast.ts
+++ b/types/ng-cordova/test/toast.ts
@@ -10,7 +10,7 @@ namespace demo.toast {
 		msg:string;
 
 		static $inject:Array<string> = ["$cordovaToast"];
-		constructor(private $cordovaToast:ngCordova.IToastService) {
+		constructor(private readonly $cordovaToast:ngCordova.IToastService) {
 
 		}
 
diff --git a/types/ng-cordova/tslint.json b/types/ng-cordova/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-cordova/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-dialog/tslint.json b/types/ng-dialog/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-dialog/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-facebook/index.d.ts b/types/ng-facebook/index.d.ts
index 4106136450..aa60b69eef 100644
--- a/types/ng-facebook/index.d.ts
+++ b/types/ng-facebook/index.d.ts
@@ -25,6 +25,14 @@ declare module 'angular' {
             getCustomInit(): FBInitParams;
         }
 
+        type FBUIParams =
+            | ShareDialogParams
+            | PageTabDialogParams
+            | RequestsDialogParams
+            | SendDialogParams
+            | PayDialogParams
+            | FeedDialogParams;
+
         interface IFacebookService {
             config<T extends string | number | FBInitParams>(property: string): T;
             init(): void;
diff --git a/types/ng-facebook/tslint.json b/types/ng-facebook/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-facebook/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-file-upload/index.d.ts b/types/ng-file-upload/index.d.ts
index 85a055772b..d17327dc7c 100644
--- a/types/ng-file-upload/index.d.ts
+++ b/types/ng-file-upload/index.d.ts
@@ -253,6 +253,10 @@ declare module 'angular' {
              * @type {string}
              */
             url: string;
+            /**
+             * Add which HTTP method to use: 'POST' or 'PUT' (html5)
+             */
+            method: string;
             /**
              * This is to accommodate server implementations expecting nested data object keys in .key or [key] format.
              * Example: data: {rec: {name: 'N', pic: file}} sent as: rec[name] -> N, rec[pic] -> file
diff --git a/types/ng-file-upload/ng-file-upload-tests.ts b/types/ng-file-upload/ng-file-upload-tests.ts
index 8ed2d0d115..49a62e290e 100644
--- a/types/ng-file-upload/ng-file-upload-tests.ts
+++ b/types/ng-file-upload/ng-file-upload-tests.ts
@@ -7,7 +7,7 @@ let controllerId = "upload";
 class UploadController {
 	static $inject = ["Upload"];
 
-	constructor(private Upload: angular.angularFileUpload.IUploadService) {
+	constructor(private readonly Upload: angular.angularFileUpload.IUploadService) {
 		this.Upload.setDefaults({
 			ngfAccept: "image/*",
 			ngfAllowDir: true,
diff --git a/types/ng-file-upload/tslint.json b/types/ng-file-upload/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-file-upload/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-flow/tslint.json b/types/ng-flow/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-flow/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-grid/tslint.json b/types/ng-grid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-grid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-i18next/tslint.json b/types/ng-i18next/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-i18next/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-notify/tslint.json b/types/ng-notify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ng-notify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ng-stomp/ng-stomp-tests.ts b/types/ng-stomp/ng-stomp-tests.ts
index 436fe901ea..dd5cdafa24 100644
--- a/types/ng-stomp/ng-stomp-tests.ts
+++ b/types/ng-stomp/ng-stomp-tests.ts
@@ -1,5 +1,5 @@
 class test {
-	constructor(private ngstomp: ngStomp) {
+	constructor(private readonly ngstomp: ngStomp) {
 		const connectHeaders = {
 			Auth: "user",
 			Accept: "lol"
diff --git a/types/ngbootbox/ngbootbox-tests.ts b/types/ngbootbox/ngbootbox-tests.ts
index e38995bcd7..4e40e7438c 100644
--- a/types/ngbootbox/ngbootbox-tests.ts
+++ b/types/ngbootbox/ngbootbox-tests.ts
@@ -3,7 +3,7 @@
 
 class TestBootboxController {
 
-	constructor(private $scope: angular.IScope, $ngBootbox: BootboxService) {
+	constructor(private readonly $scope: angular.IScope, $ngBootbox: BootboxService) {
 
 		$ngBootbox.alert('An important message!').then(function() {
 			console.log('Alert closed');
@@ -29,15 +29,15 @@ class TestBootboxController {
 				warning: {
 					label: "Cancel",
 					className: "btn-warning",
-					callback: function() { 
+					callback: function() {
 						console.log('warning callback');
 					}
 				},
 				success: {
 					label: "Ok",
 					className: "btn-success",
-					callback: function() { 
-						console.log('sucess callback'); 
+					callback: function() {
+						console.log('sucess callback');
 					}
 				}
 			}
diff --git a/types/ngbootbox/tslint.json b/types/ngbootbox/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngbootbox/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngeohash/tslint.json b/types/ngeohash/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngeohash/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngkookies/tslint.json b/types/ngkookies/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngkookies/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngmap/tslint.json b/types/ngmap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngmap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngprogress-lite/ngprogress-lite-tests.ts b/types/ngprogress-lite/ngprogress-lite-tests.ts
index c4b903d78b..2cdfa53661 100644
--- a/types/ngprogress-lite/ngprogress-lite-tests.ts
+++ b/types/ngprogress-lite/ngprogress-lite-tests.ts
@@ -4,7 +4,7 @@ app.config(
     ['ngProgressLiteProvider',
         (ngProgressLiteProvider: ng.progressLite.INgProgressLiteProvider) => {
             ngProgressLiteProvider.settings.ease = 'ease';
-            ngProgressLiteProvider.settings.minimum = 0.08,
+            ngProgressLiteProvider.settings.minimum = 0.08;
             ngProgressLiteProvider.settings.speed = 300;
             ngProgressLiteProvider.settings.trickleRate = 0.02;
             ngProgressLiteProvider.settings.trickleSpeed = 500;
diff --git a/types/ngprogress-lite/tslint.json b/types/ngprogress-lite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngprogress-lite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngprogress/tslint.json b/types/ngprogress/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngprogress/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngreact/ngreact-tests.tsx b/types/ngreact/ngreact-tests.tsx
index 46980dab1f..0f40df4bb8 100644
--- a/types/ngreact/ngreact-tests.tsx
+++ b/types/ngreact/ngreact-tests.tsx
@@ -1,5 +1,6 @@
 import * as angular from "angular";
 import * as React from "react";
+import * as PropTypes from "prop-types";
 import { ReactDirective } from "ngreact";
 
 const app = angular.module("app", ["react"]);
@@ -24,13 +25,20 @@ app.directive('helloComponent', function(reactDirective: ReactDirective, $locati
   return reactDirective(HelloComponent, undefined, {}, { $location });
 });
 
-var HelloComponent = React.createClass({
-  propTypes: {
-    fname : React.PropTypes.string.isRequired,
-    lname : React.PropTypes.string.isRequired
-  },
-  render: function() {
+interface HelloProps {
+  fname: string;
+  lname: string;
+}
+
+class HelloComponent extends React.Component<HelloProps> {
+  static propTypes = {
+    fname : PropTypes.string.isRequired,
+    lname : PropTypes.string.isRequired
+  }
+
+  render() {
     return <span>Hello {this.props.fname} {this.props.lname}</span>;
   }
-})
+}
+
 app.value('HelloComponent', HelloComponent);
diff --git a/types/ngreact/tslint.json b/types/ngreact/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngreact/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngtoaster/tslint.json b/types/ngtoaster/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ngtoaster/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ngwysiwyg/index.d.ts b/types/ngwysiwyg/index.d.ts
index 4b7a61b3bc..8a1fe1b8e2 100644
--- a/types/ngwysiwyg/index.d.ts
+++ b/types/ngwysiwyg/index.d.ts
@@ -1,15 +1,15 @@
-// Type definitions for Marked
+// Type definitions for ngWYSIWYG 0.6
 // Project: https://github.com/psergus/ngWYSIWYG
 // Definitions by: Patrick Mac Kay <https://github.com/patrick-mackay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ngWYSIWYG {
-    export interface Toolbar {
+    interface Toolbar {
         name: string;
         items: string[];
     }
 
-    export interface Config {
+    interface Config {
         sanitize: boolean;
         toolbar?: Toolbar[];
     }
diff --git a/types/ngwysiwyg/ngwysiwyg-tests.ts b/types/ngwysiwyg/ngwysiwyg-tests.ts
index fd6eaf1ee8..0a31c38498 100644
--- a/types/ngwysiwyg/ngwysiwyg-tests.ts
+++ b/types/ngwysiwyg/ngwysiwyg-tests.ts
@@ -1,8 +1,4 @@
-
-
-//import ngWYSIWYG = require("ngWYSIWYG");
-
-var complete: ngWYSIWYG.Config = {
+const complete: ngWYSIWYG.Config = {
     sanitize: false,
     toolbar: [
         { name: "basicStyling", items: ["bold", "italic", "underline", "strikethrough", "subscript", "superscript", "-", "leftAlign", "centerAlign", "rightAlign", "blockJustify", "-"] },
@@ -15,6 +11,6 @@ var complete: ngWYSIWYG.Config = {
     ]
 };
 
-var partial: ngWYSIWYG.Config = {
+const partial: ngWYSIWYG.Config = {
     sanitize: false
 };
diff --git a/types/ngwysiwyg/tslint.json b/types/ngwysiwyg/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ngwysiwyg/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index 0796a0f8e1..737137f22e 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Nightmare 1.6.6
+// Type definitions for Nightmare 2.10.0
 // Project: https://github.com/segmentio/nightmare
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 Sam Yang <https://github.com/samyang-au>
@@ -31,7 +31,7 @@ declare class Nightmare {
     select(seletor: string, option: string): Nightmare;
     upload(selector: string, path: string): Nightmare;
     download(path:string): Nightmare;
-    download(action: "cancel" | "continue"): Nightmare;  
+    download(action: "cancel" | "continue"): Nightmare;
     scrollTo(top: number, left: number): Nightmare;
     viewport(width: number, height: number): Nightmare;
     inject(type: string, file: string): Nightmare;
@@ -41,10 +41,16 @@ declare class Nightmare {
     evaluate<T>(fn: (arg: T) => void, cb: () => void, arg: T): Nightmare;
     evaluate<R>(fn: () => R, cb: (result: R) => void): Nightmare;
     evaluate(fn: () => void): Nightmare;
-    wait(): Nightmare;
+    wait<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => any, value1: T1, value2: T2, value3: T3, value4: T4, value5: T5): Nightmare;
+    wait<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => any, value1: T1, value2: T2, value3: T3, value4: T4): Nightmare;
+    wait<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => any, value1: T1, value2: T2, value3: T3): Nightmare;
+    wait<T1, T2>(fn: (arg1: T1, arg2: T2) => any, value1: T1, value2: T2): Nightmare;
+    wait<T1>(fn: (arg1: T1) => any, value1: T1): Nightmare;
+    wait(fn: () => any, value: any, delay?: number): Nightmare;
+    wait(fn: () => any): Nightmare;
     wait(ms: number): Nightmare;
     wait(selector: string): Nightmare;
-    wait(fn: () => any, value: any, delay?: number): Nightmare;
+    wait(): Nightmare;
     header(header: string, value: string): Nightmare;
     use(plugin: (nightmare: Nightmare) => void): Nightmare;
     run(cb?: (err: any, nightmare: Nightmare) => void): Nightmare;
@@ -147,6 +153,13 @@ declare namespace Nightmare {
         typeInterval?: number;
         x?: number;
         y?: number;
+        openDevTools?: {
+            /**
+             * Opens the devtools with specified dock state, can be right, bottom, undocked, detach.
+             * https://github.com/electron/electron/blob/master/docs/api/web-contents.md#contentsopendevtoolsoptions
+             */
+            mode?: string;
+        };
     }
 
     export interface IRequest {
diff --git a/types/nightmare/nightmare-tests.ts b/types/nightmare/nightmare-tests.ts
index eea21ae84c..1dfe655c94 100644
--- a/types/nightmare/nightmare-tests.ts
+++ b/types/nightmare/nightmare-tests.ts
@@ -364,4 +364,6 @@ new Nightmare()
 new Nightmare()
   .goto('https://github.com/segmentio/nightmare')
   .click('a[href="/segmentio/nightmare/archive/master.zip"]')
-  .download('/some/other/path/master.zip');
\ No newline at end of file
+  .download('/some/other/path/master.zip');
+
+new Nightmare({show: true, openDevTools: {mode: 'detach'}});
diff --git a/types/nightmare/tslint.json b/types/nightmare/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nightmare/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nightwatch/index.d.ts b/types/nightwatch/index.d.ts
index 7a60aedac5..6d3cc8f4a0 100644
--- a/types/nightwatch/index.d.ts
+++ b/types/nightwatch/index.d.ts
@@ -4,13 +4,11 @@
 //                 Connor Schlesiger <https://github.com/schlesiger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/* tslint:disable:max-line-length */
-
-interface NightwatchCustomPageObjects {
-    page: {};
+export interface NightwatchCustomPageObjects {
+    page: {[name: string]: () => NightwatchBrowser};
 }
 
-interface NightwatchDesiredCapabilities {
+export interface NightwatchDesiredCapabilities {
     /**
      * The name of the browser being used; should be one of {android|chrome|firefox|htmlunit|internet explorer|iPhone|iPad|opera|safari}.
      */
@@ -111,26 +109,26 @@ interface NightwatchDesiredCapabilities {
     };
 }
 
-interface NightwatchScreenshotOptions {
+export interface NightwatchScreenshotOptions {
     enabled?: boolean;
     on_failure?: boolean;
     on_error?: boolean;
     path?: string;
 }
 
-interface NightwatchTestRunner {
+export interface NightwatchTestRunner {
     "type"?: string;
     options?: {
         ui?: string;
     };
 }
 
-interface NightwatchTestWorker {
+export interface NightwatchTestWorker {
     enabled: boolean;
     workers: string;
 }
 
-interface NightwatchOptions {
+export interface NightwatchOptions {
     /**
      * An array of folders (excluding subfolders) where the tests are located.
      */
@@ -200,7 +198,7 @@ interface NightwatchOptions {
     test_runner?: string | NightwatchTestRunner;
 }
 
-interface NightwatchSeleniumOptions {
+export interface NightwatchSeleniumOptions {
     /**
      * Whether or not to manage the selenium process automatically.
      */
@@ -250,7 +248,7 @@ interface NightwatchSeleniumOptions {
     cli_args: any;
 }
 
-interface NightwatchTestSettingGeneric {
+export interface NightwatchTestSettingGeneric {
     /**
      * A url which can be used later in the tests as the main url to load. Can be useful if your tests will run on different environments, each one with a different url.
      */
@@ -352,7 +350,7 @@ interface NightwatchTestSettingGeneric {
     skip_testcases_on_fail: boolean;
 }
 
-interface NightwatchTestSettingScreenshots extends NightwatchTestSettingGeneric {
+export interface NightwatchTestSettingScreenshots extends NightwatchTestSettingGeneric {
     /**
      * Selenium generates screenshots when command errors occur. With on_failure set to true, also generates screenshots for failing or erroring tests. These are saved on the disk.
      * Since v0.7.5 you can disable screenshots for command errors by setting "on_error" to false.
@@ -367,26 +365,26 @@ interface NightwatchTestSettingScreenshots extends NightwatchTestSettingGeneric
     screenshots: NightwatchScreenshotOptions;
 }
 
-interface NightwatchTestOptions extends NightwatchTestSettingGeneric {
+export interface NightwatchTestOptions extends NightwatchTestSettingGeneric {
     screenshots: boolean;
     screenshotsPath: string;
 }
 
-interface NightwatchTestSuite {
+export interface NightwatchTestSuite {
     name: string;
     "module": string;
     group: string;
     results: any;
 }
 
-interface NightwatchAssertionsError {
+export interface NightwatchAssertionsError {
     name: string;
     message: string;
     showDiff: boolean;
     stack: string;
 }
 
-interface NightwatchLanguageChains {
+export interface NightwatchLanguageChains {
     to: Expect;
     be: Expect;
     been: Expect;
@@ -401,24 +399,20 @@ interface NightwatchLanguageChains {
     of: Expect;
 }
 
-interface NightwatchTestSettings {
+export interface NightwatchTestSettings {
     [key: string]: NightwatchTestSettingScreenshots;
 }
 
-interface Expect extends NightwatchLanguageChains, NightwatchBrowser {
+export interface Expect extends NightwatchLanguageChains, NightwatchBrowser {
     /**
      * Returns the DOM Element
      * @param property: Css / Id property of the DOM element
-     * @returns {}
      */
     element(property: string): this;
 
     /**
      * These methods will perform assertions on the specified target on the current element.
      * The targets can be an attribute value, the element's inner text and a css property.
-     * @param value
-     * @param message
-     * @returns {}
      */
     equal(value: string): this;
     contain(value: string): this;
@@ -435,7 +429,6 @@ interface Expect extends NightwatchLanguageChains, NightwatchBrowser {
      * a waitForConditionPollInterval property (in milliseconds) as a global property in your nightwatch.json or in
      * your external globals file. Similarly, a default timeout can be specified as a global waitForConditionTimeout property (in milliseconds).
      * @param value: Number of milliseconds to wait to perform and operation of check
-     * @returns {}
      */
     before(value: number): this;
     after(value: number): this;
@@ -444,7 +437,6 @@ interface Expect extends NightwatchLanguageChains, NightwatchBrowser {
      * Checks if the type (i.e. tag name) of a specified element is of an expected value.
      * @param value: The expected type
      * @param message: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     a(value: string, message?: string): this;
     an(value: string, message?: string): this;
@@ -453,7 +445,6 @@ interface Expect extends NightwatchLanguageChains, NightwatchBrowser {
      * Checks if a given attribute of an element exists and optionally if it has the expected value.
      * @param attribute: The attribute name
      * @param message: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     attribute(name: string, message?: string): this;
 
@@ -461,7 +452,6 @@ interface Expect extends NightwatchLanguageChains, NightwatchBrowser {
      * Checks a given css property of an element exists and optionally if it has the expected value.
      * @param property: The css property name
      * @param message: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     css(property: string, message?: string): this;
 
@@ -496,14 +486,13 @@ interface Expect extends NightwatchLanguageChains, NightwatchBrowser {
     visible: this;
 }
 
-interface NightwatchAssertions extends NightwatchBrowser {
+export interface NightwatchAssertions extends NightwatchBrowser {
     /**
      * Checks if the given attribute of an element contains the expected value.
      * @param selector: The selector (CSS / Xpath) used to locate the element.
      * @param attribute: The attribute name
      * @param expected: The expected contained value of the attribute to check.
      * @param message: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     attributeContains(selector: string, attribute: string, expected: string, message?: string): this;
 
@@ -513,7 +502,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * @param attribute: The attribute name
      * @param expected: The expected value of the attribute to check.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     attributeEquals(cssSelector: string, attribute: string, expected: string, msg?: string): this;
 
@@ -522,7 +510,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * @param cssSelector: The CSS selector used to locate the element.
      * @param expectedText: The text to look for.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     containsText(cssSelector: string, expectedText: string, msg?: string): this;
 
@@ -531,7 +518,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * @param cssSelector: The CSS selector used to locate the element.
      * @param className: The CSS class to look for.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     cssClassPresent(cssSelector: string, className: string, msg?: string): this;
 
@@ -540,7 +526,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * @param cssSelector: The CSS selector used to locate the element.
      * @param className: The CSS class to look for.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     cssClassNotPresent(cssSelector: string, className: string, msg?: string): this;
 
@@ -550,7 +535,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * @param cssProperty: The CSS property.
      * @param expected: The expected value of the css property to check.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     cssProperty(cssSelector: string, cssProperty: string, expected: string | number, msg?: string): this;
 
@@ -564,7 +548,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * Checks if the given element exists in the DOM.
      * @param cssSelector: The CSS selector used to locate the element.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     elementPresent(cssSelector: string, msg?: string): this;
 
@@ -572,7 +555,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * Checks if the given element does not exist in the DOM.
      * @param cssSelector: The CSS selector used to locate the element.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     elementNotPresent(cssSelector: string, msg?: string): this;
 
@@ -584,7 +566,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * Checks if the given element is not visible on the page.
      * @param cssSelector: The CSS selector used to locate the element.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     hidden(cssSelector: string, msg?: string): this;
 
@@ -608,7 +589,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * Checks if the current URL contains the given value.
      * @param expectedText: The value expected to exist within the current URL.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     urlContains(expectedText: string, msg?: string): this;
 
@@ -616,7 +596,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * Checks if the current url equals the given value.
      * @param expected: The expected url.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     urlEquals(expected: string, msg?: string): this;
 
@@ -625,7 +604,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * @param cssSelector: The CSS selector used to locate the element.
      * @param expectedText: The expected text.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     value(cssSelector: string, expectedText: string, msg?: string): this;
 
@@ -634,7 +612,6 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * @param cssSelector: The CSS selector used to locate the element.
      * @param expectedText: The expected text.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     valueContains(cssSelector: string, expectedText: string, msg?: string): this;
 
@@ -642,24 +619,23 @@ interface NightwatchAssertions extends NightwatchBrowser {
      * Checks if the given element is visible on the page.
      * @param cssSelector: The CSS selector used to locate the element.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
-     * @returns {}
      */
     visible(cssSelector: string, msg?: string): this;
 
     NightwatchAssertionsError: NightwatchAssertionsError;
 }
 
-interface NightwatchTypedCallbackResult<T> {
+export interface NightwatchTypedCallbackResult<T> {
     status: number;
     value: T;
     state: Error | string;
 }
 
 // tslint:disable-next-line:no-empty-interface
-interface NightwatchCallbackResult extends NightwatchTypedCallbackResult<any> {
+export interface NightwatchCallbackResult extends NightwatchTypedCallbackResult<any> {
 }
 
-interface NightwatchLogEntry {
+export interface NightwatchLogEntry {
     /**
      * The log entry message.
      */
@@ -676,7 +652,7 @@ interface NightwatchLogEntry {
     level: string;
 }
 
-interface NightwatchKeys {
+export interface NightwatchKeys {
     /** Releases all held modifier keys. */
     "NULL": string;
     /** OS-specific keystroke sequence that performs a cancel action. */
@@ -799,7 +775,7 @@ interface NightwatchKeys {
     "COMMAND": string;
 }
 
-interface NightwatchAPI {
+export interface NightwatchAPI {
     assert: NightwatchAssertions;
 
     expect: Expect;
@@ -817,7 +793,6 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     clearValue(selector: string, callback?: () => void): this;
 
@@ -832,7 +807,6 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     click(selector: string, callback?: () => void): this;
 
@@ -846,7 +820,6 @@ interface NightwatchAPI {
      * };
      * ```
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     closeWindow(callback?: () => void): this;
 
@@ -863,7 +836,6 @@ interface NightwatchAPI {
      * ```
      * @param The: name of the cookie to delete.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     deleteCookie(The: string, callback?: () => void): this;
 
@@ -879,7 +851,6 @@ interface NightwatchAPI {
      * }
      * ```
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     deleteCookies(callback?: () => void): this;
 
@@ -893,7 +864,6 @@ interface NightwatchAPI {
      * };
      * ```
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     end(callback?: () => void): this;
 
@@ -913,9 +883,9 @@ interface NightwatchAPI {
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param attribute: The attribute name to inspect.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The value of the attribute}
+     * @returns The value of the attribute
      */
-    getAttribute(selector: string, attribute: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getAttribute(selector: string, attribute: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve a single cookie visible to the current page. The cookie is returned as a cookie JSON object, as defined here.
@@ -932,9 +902,9 @@ interface NightwatchAPI {
      * ```
      * @param name: The cookie name
      * @param callback: The callback function which will receive the response as an argument.
-     * @returns {The cookie object as a selenium cookie JSON object or null if the cookie wasn't found.}
+     * @returns The cookie object as a selenium cookie JSON object or null if the cookie wasn't found.
      */
-    getCookie(name: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getCookie(name: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve all cookies visible to the current page. The cookies are returned as an array of cookie JSON object,
@@ -950,9 +920,9 @@ interface NightwatchAPI {
      * }
      * ```
      * @param callback: The callback function which will receive the response as an argument.
-     * @returns {A list of cookies}
+     * @returns A list of cookies
      */
-    getCookies(callback?: (result: NightwatchCallbackResult) => void): this;
+    getCookies(callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve the value of a css property for a given DOM element. Uses elementIdCssProperty protocol command.
@@ -970,9 +940,9 @@ interface NightwatchAPI {
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param cssProperty: The CSS property to inspect.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The value of the css property}
+     * @returns The value of the css property
      */
-    getCssProperty(selector: string, cssProperty: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getCssProperty(selector: string, cssProperty: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's size in pixels. Uses elementIdSize protocol command.
@@ -990,9 +960,9 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The width and height of the element in pixels}
+     * @returns The width and height of the element in pixels
      */
-    getElementSize(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getElementSize(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's location on the page. The point (0, 0) refers to the upper-left corner of the page.
@@ -1011,9 +981,9 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The X and Y coordinates for the element on the page}
+     * @returns The X and Y coordinates for the element on the page
      */
-    getLocation(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getLocation(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's location on the screen once it has been scrolled into view. Uses elementIdLocationInView protocol command.
@@ -1031,9 +1001,9 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The X and Y coordinates for the element on the page.}
+     * @returns The X and Y coordinates for the element on the page.
      */
-    getLocationInView(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getLocationInView(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Gets a log from selenium
@@ -1051,7 +1021,6 @@ interface NightwatchAPI {
      * ```
      * @param typestring: Log type to request
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     getLog(typestring: string, callback?: (log: NightwatchLogEntry[]) => void): this;
 
@@ -1067,7 +1036,7 @@ interface NightwatchAPI {
      * };
      * ```
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {Available log types}
+     * @returns Available log types
      */
     getLogTypes(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1086,9 +1055,9 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The element's tag name, as a lowercase string.}
+     * @returns The element's tag name, as a lowercase string.
      */
-    getTagName(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getTagName(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Returns the visible text for the element. Uses elementIdText protocol command.
@@ -1105,9 +1074,9 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The element's visible text.}
+     * @returns The element's visible text.
      */
-    getText(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getText(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Returns the title of the current page. Uses title protocol command.
@@ -1122,9 +1091,9 @@ interface NightwatchAPI {
      * };
      * ```
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The page title.}
+     * @returns The page title.
      */
-    getTitle(callback?: (result: NightwatchCallbackResult) => void): this;
+    getTitle(callback?: (this: NightwatchAPI, result?: string) => void): this;
 
     /**
      * Returns a form element current value. Uses elementIdValue protocol command.
@@ -1141,9 +1110,9 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The element's value.}
+     * @returns The element's value.
      */
-    getValue(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getValue(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * This command is an alias to url and also a convenience method when called without any arguments in the sense that it performs a call to .url() with passing the value of launch_url
@@ -1156,7 +1125,6 @@ interface NightwatchAPI {
      * };
      * ```
      * @param url: Url to navigate to.
-     * @returns {}
      */
     init(url?: string): this;
 
@@ -1174,7 +1142,7 @@ interface NightwatchAPI {
      * @param scriptUrl: The script file url
      * @param id: Dom element id to be set on the script tag.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The newly created script tag.}
+     * @returns The newly created script tag.
      */
     injectScript(scriptUrl: string, id?: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1191,7 +1159,6 @@ interface NightwatchAPI {
      * ```
      * @param typeString: Type of log to test
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     isLogAvailable(typeString: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1210,9 +1177,8 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
-    isVisible(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    isVisible(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Maximizes the current window.
@@ -1224,7 +1190,6 @@ interface NightwatchAPI {
      * };
      * ```
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     maximizeWindow(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1241,7 +1206,6 @@ interface NightwatchAPI {
      * @param xoffset: X offset to move to, relative to the top-left corner of the element.
      * @param yoffset: Y offset to move to, relative to the top-left corner of the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     moveToElement(selector: string, xoffset: number, yoffset: number, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1258,7 +1222,6 @@ interface NightwatchAPI {
      * ```
      * @param ms: The number of milliseconds to wait.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     pause(ms: number, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1290,7 +1253,6 @@ interface NightwatchAPI {
      * perform completes immediately at the end of the execution of the callback. One parameter: allows for asynchronous execution within the
      * callback providing a done callback function for completion as the first argument. Two parameters: allows for asynchronous execution
      * with the "api" object passed in as the first argument, followed by the done callback.
-     * @returns {}
      */
     perform(callback: (browser: this, done?: () => void) => void): this;
 
@@ -1340,7 +1302,6 @@ interface NightwatchAPI {
      * perform completes immediately at the end of the execution of the callback. One parameter: allows for asynchronous execution within the
      * callback providing a done callback function for completion as the first argument. Two parameters: allows for asynchronous execution
      * with the "api" object passed in as the first argument, followed by the done callback.
-     * @returns {}
      */
     perform(callback: (done?: () => void) => void): this; // tslint:disable-line:unified-signatures
 
@@ -1356,7 +1317,6 @@ interface NightwatchAPI {
      * @param width: The new window width.
      * @param height: The new window height.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     resizeWindow(width: number, height: number, callback?: () => void): this;
 
@@ -1371,7 +1331,6 @@ interface NightwatchAPI {
      * ```
      * @param fileName: The complete path to the file name where the screenshot should be saved.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     saveScreenshot(fileName: string, callback?: () => void): this;
 
@@ -1383,7 +1342,6 @@ interface NightwatchAPI {
     /**
      * Override the sessionId used by Nightwatch client with another session id.
      * @param sessionId: The session Id to set.
-     * @returns {}
      */
     setSessionId(sessionId: string): this;
 
@@ -1407,7 +1365,6 @@ interface NightwatchAPI {
      * ```
      * @param cookie: The cookie object.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     setCookie(cookie: any, callback?: () => void): this;
 
@@ -1432,7 +1389,6 @@ interface NightwatchAPI {
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param inputValue: The text to send to the element or key strokes.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     setValue(selector: string, inputValue: string, callback?: () => void): this;
 
@@ -1448,7 +1404,6 @@ interface NightwatchAPI {
      * @param OffsetX: The new window offset x-position.
      * @param OffsetY: The new window offset y-position.
      * @param callback: ptional callback function to be called when the command finishes.
-     * @returns {}
      */
     setWindowPosition(OffsetX: number, OffsetY: number, callback?: () => void): this;
 
@@ -1463,7 +1418,6 @@ interface NightwatchAPI {
      * ```
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     submitForm(selector: string, callback?: () => void): this;
 
@@ -1482,7 +1436,6 @@ interface NightwatchAPI {
      * ```
      * @param handleOrName: The server assigned window handle or the name attribute.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     switchWindow(handleOrName: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1499,7 +1452,6 @@ interface NightwatchAPI {
      * ```
      * @param hash: The hash to add/replace to the current url (i.e. the value set in the launch_url property in nightwatch.json).
      * @param callback:
-     * @returns {}
      */
     urlHash(hash: string): this;
 
@@ -1522,7 +1474,6 @@ interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @param message: Optional message to be shown in the output; the message supports two placeholders: %s for current selector and %d for the time
      * (e.g. Element %s was not in the page for %d ms).
-     * @returns {}
      */
     waitForElementNotPresent(selector: string, time?: number, abortOnFailure?: boolean, callback?: () => void, message?: string): this;
 
@@ -1545,7 +1496,6 @@ interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @param message: Optional message to be shown in the output; the message supports two placeholders: %s for current selector and %d for the time
      * (e.g. Element %s was not in the page for %d ms).
-     * @returns {}
      */
     waitForElementNotVisible(selector: string, time?: number, abortOnFailure?: boolean, callback?: () => void, message?: string): this;
 
@@ -1579,7 +1529,6 @@ interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @param message: Optional message to be shown in the output; the message supports two placeholders: %s for current selector and %d for the time
      * (e.g. Element %s was not in the page for %d ms).
-     * @returns {}
      */
     waitForElementPresent(selector: string, time?: number, abortOnFailure?: boolean, callback?: () => void, message?: string): this;
 
@@ -1608,24 +1557,23 @@ interface NightwatchAPI {
      * ```
      * @param selector: The selector (CSS / Xpath) used to locate the element.
      * @param time: The number of milliseconds to wait. The runner performs repeated checks every 500 ms.
-     * @param abortOnFailure: By the default if the element is not found the test will fail. Set this to false if you wish for the test to continue even if the assertion fails. To set this globally you can define a property `abortOnNightwatchAssertionsFailure` in your globals.
+     * @param abortOnFailure: By the default if the element is not found the test will fail.
+     * Set this to false if you wish for the test to continue even if the assertion fails.
+     * To set this globally you can define a property `abortOnNightwatchAssertionsFailure` in your globals.
      * @param callback: Optional callback function to be called when the command finishes.
      * @param message: Optional message to be shown in the output; the message supports two placeholders: %s for current selector and %d for the time (e.g. Element %s was not in the page for %d ms).
-     * @returns {}
      */
     waitForElementVisible(selector: string, time?: number, abortOnFailure?: boolean, callback?: () => void, message?: string): this;
 
     /**
      * Accepts the currently displayed alert dialog. Usually, this is equivalent to clicking on the 'OK' button in the dialog.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     acceptAlert(callback?: () => void): this;
 
     /**
      * Navigate backwards in the browser history, if possible.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     back(callback?: () => void): this;
 
@@ -1633,22 +1581,19 @@ interface NightwatchAPI {
      * Get a list of the available contexts.
      * Used by Appium when testing hybrid mobile web apps. More info here: https://github.com/appium/appium/blob/master/docs/en/advanced-concepts/hybrid.md.
      * @param callback: Callback function to be called when the command finishes.
-     * @returns {an array of strings representing available contexts, e.g 'WEBVIEW', or 'NATIVE'}
+     * @returns an array of strings representing available contexts, e.g 'WEBVIEW', or 'NATIVE'
      */
     contexts(callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve or delete all cookies visible to the current page or set a cookie.
-     * @param method
-     * @param callbackorCookie
-     * @returns {a string representing the current context or `null`, representing "no context"}
+     * @returns a string representing the current context or `null`, representing "no context"
      */
     cookie(method: string, callbackorCookie?: () => void): this;
 
     /**
      * Get current context.
      * @param callback: Callback function to be called when the command finishes.
-     * @returns {}
      */
     currentContext(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1656,14 +1601,12 @@ interface NightwatchAPI {
      * Dismisses the currently displayed alert dialog. For confirm() and prompt() dialogs, this is equivalent to clicking the 'Cancel' button.
      * For alert() dialogs, this is equivalent to clicking the 'OK' button.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     dismissAlert(callback?: () => void): this;
 
     /**
      * Double-clicks at the current mouse coordinates (set by moveto).
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     doubleClick(callback?: () => void): this;
 
@@ -1683,14 +1626,12 @@ interface NightwatchAPI {
      * @param using: The locator's strategy to use.
      * @param value: The search target.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     element(using: string, value: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Get the element on the page that currently has focus.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementActive(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1699,7 +1640,6 @@ interface NightwatchAPI {
      * @param id: ID of the element to route the command to.
      * @param attributeName: The attribute name
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdAttribute(id: string, attributeName: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1707,7 +1647,6 @@ interface NightwatchAPI {
      * Clear a TEXTAREA or text INPUT element's value.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdClear(id: string, callback?: () => void): this;
 
@@ -1715,17 +1654,12 @@ interface NightwatchAPI {
      * Click on an element.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdClick(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Query the value of an element's computed CSS property.
      * The CSS property to query should be specified using the CSS property name, not the JavaScript property name (e.g. background-color instead of backgroundColor).
-     * @param id
-     * @param cssPropertyName
-     * @param callback
-     * @returns {}
      */
     elementIdCssProperty(id: string, cssPropertyName: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1733,7 +1667,6 @@ interface NightwatchAPI {
      * Determine if an element is currently displayed.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdDisplayed(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1743,7 +1676,6 @@ interface NightwatchAPI {
      * @param using: The locator strategy to use.
      * @param value: The search target.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdElement(id: string, using: string, value: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1753,7 +1685,6 @@ interface NightwatchAPI {
      * @param using: The locator strategy to use.
      * @param value: The search target.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdElements(id: string, using: string, value: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1761,7 +1692,6 @@ interface NightwatchAPI {
      * Determine if an element is currently enabled.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdEnabled(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1770,7 +1700,6 @@ interface NightwatchAPI {
      * @param id: ID of the element to route the command to.
      * @param otherId: ID of the element to compare against.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdEquals(id: string, otherId: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1779,7 +1708,7 @@ interface NightwatchAPI {
      * The element's coordinates are returned as a JSON object with x and y properties.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The X and Y coordinates for the element on the page.}
+     * @returns The X and Y coordinates for the element on the page.
      */
     elementIdLocation(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1787,7 +1716,6 @@ interface NightwatchAPI {
      * Determine an element's location on the screen once it has been scrolled into view.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdLocationInView(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1795,7 +1723,6 @@ interface NightwatchAPI {
      * Query for an element's tag name.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdName(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1803,7 +1730,6 @@ interface NightwatchAPI {
      * Determine if an OPTION element, or an INPUT element of type checkbox or radio button is currently selected.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdSelected(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1811,7 +1737,6 @@ interface NightwatchAPI {
      * Determine an element's size in pixels. The size will be returned as a JSON object with width and height properties.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdSize(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1819,7 +1744,6 @@ interface NightwatchAPI {
      * Returns the visible text for the element.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     elementIdText(id: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1827,8 +1751,6 @@ interface NightwatchAPI {
      * Send a sequence of key strokes to an element or returns the current value of the element.
      * @param id: ID of the element to route the command to.
      * @param value: Value to send to element in case of POST
-     * @param callback
-     * @returns {}
      */
     elementIdValue(id: string, value?: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1838,7 +1760,6 @@ interface NightwatchAPI {
      * @param using: The locator strategy to use.
      * @param value: The search target.
      * @param callback: Callback function to be invoked with the result when the command finishes.
-     * @returns {}
      */
     elements(using: string, value: string, callback: (result: NightwatchCallbackResult) => void): this;
 
@@ -1862,7 +1783,7 @@ interface NightwatchAPI {
      * @param body: The function body to be injected.
      * @param args: An array of arguments which will be passed to the function.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The script result.}
+     * @returns The script result.
      */
     execute(body: ((...data: any[]) => void) | string, args?: any[], callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -1886,14 +1807,13 @@ interface NightwatchAPI {
      * @param script: The function body to be injected.
      * @param args: An array of arguments which will be passed to the function.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The script result.}
+     * @returns The script result.
      */
     executeAsync(script: ((...data: any[]) => void) | string, args?: any[], callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Navigate forwards in the browser history, if possible.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     forward(callback?: () => void): this;
 
@@ -1901,38 +1821,36 @@ interface NightwatchAPI {
      * Change focus to another frame on the page. If the frame id is missing or null, the server should switch to the page's default content.
      * @param frameId: Identifier for the frame to change focus to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     frame(frameId?: string, callback?: () => void): this;
 
     /**
      * Change focus to the parent context. If the current context is the top level browsing context, the context remains unchanged.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     frameParent(callback?: () => void): this;
 
     /**
      * Gets the text of the currently displayed JavaScript alert(), confirm(), or prompt() dialog.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {The text of the currently displayed alert.}
+     * @returns The text of the currently displayed alert.
      */
     getAlertText(callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Get the current browser orientation.
      * @param callback: Callback function to be called when the command finishes.
-     * @returns {The current browser orientation: LANDSCAPE|PORTRAIT}
+     * @returns The current browser orientation: LANDSCAPE|PORTRAIT
      */
     getOrientation(callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Send a sequence of key strokes to the active element. The sequence is defined in the same format as the sendKeys command.
      * An object map with available keys and their respective UTF-8 characters, as defined on W3C WebDriver draft spec, is loaded onto the main Nightwatch instance as client.Keys.
-     * Rather than the setValue, the modifiers are not released at the end of the call. The state of the modifier keys is kept between calls, so mouse interactions can be performed while modifier keys are depressed.
+     * Rather than the setValue, the modifiers are not released at the end of the call.
+     * The state of the modifier keys is kept between calls, so mouse interactions can be performed while modifier keys are depressed.
      * @param keysToSend: The keys sequence to be sent.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     keys(keysToSend: string[], callback?: () => void): this;
 
@@ -1941,43 +1859,42 @@ interface NightwatchAPI {
      * The button can be (0, 1, 2) or ('left', 'middle', 'right'). It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
      * @param button: The mouse button
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     mouseButtonClick(button: string, callback?: () => void): this;
 
     /**
-     * Click and hold the left mouse button (at the coordinates set by the last moveto command). Note that the next mouse-related command that should follow is mouseButtonUp . Any other mouse command (such as click or another call to buttondown) will yield undefined behaviour.
-     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right'). It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
+     * Click and hold the left mouse button (at the coordinates set by the last moveto command). Note that the next mouse-related command that should follow is mouseButtonUp .
+     * Any other mouse command (such as click or another call to buttondown) will yield undefined behaviour.
+     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right').
+     * It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
      * @param button: The mouse button
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     mouseButtonDown(button: string, callback?: () => void): this;
 
     /**
      * Releases the mouse button previously held (where the mouse is currently at). Must be called once for every mouseButtonDown command issued.
-     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right'). It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
+     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right').
+     * It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
      * @param button: The mouse button
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     mouseButtonUp(button: string, callback?: () => void): this;
 
     /**
-     * Move the mouse by an offset of the specificed element. If no element is specified, the move is relative to the current mouse cursor. If an element is provided but no offset, the mouse will be moved to the center of the element.
+     * Move the mouse by an offset of the specificed element. If no element is specified, the move is relative to the current mouse cursor.
+     * If an element is provided but no offset, the mouse will be moved to the center of the element.
      * If the element is not visible, it will be scrolled into view.
      * @param element: Opaque ID assigned to the element to move to. If not specified or is null, the offset is relative to current position of the mouse.
      * @param xofset: X offset to move to, relative to the top-left corner of the element. If not specified, the mouse will move to the middle of the element.
      * @param yoffset: Y offset to move to, relative to the top-left corner of the element. If not specified, the mouse will move to the middle of the element.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     moveTo(element: string, xofset: number, yoffset: number, callback?: () => void): this;
 
     /**
      * Refresh the current page.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     refresh(callback?: () => void): this;
 
@@ -1985,7 +1902,6 @@ interface NightwatchAPI {
      * Take a screenshot of the current page.
      * @param log_screenshot_data: Whether or not the screenshot data should appear in the logs when running with --verbose
      * @param callback: Optional callback function to be called with the resultant value (Base64 PNG) when the command finishes.
-     * @returns {}
      */
     screenshot(log_screenshot_data: boolean, callback?: (screenshotEncoded: string) => void): this;
 
@@ -2011,7 +1927,6 @@ interface NightwatchAPI {
      * @param action: The http verb to use, can be "get", "post" or "delete". If only the callback is passed, get is assumed as default.
      * @param sessionId: The id of the session to get info about or delete.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     session(action?: string, sessionId?: string, callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -2019,14 +1934,14 @@ interface NightwatchAPI {
      * Gets the text of the log type specified
      * @param typeString: Type of log to request
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {Array of the text entries of the log.}
+     * @returns Array of the text entries of the log.
      */
     sessionLog(typeString: string, callback?: (log: NightwatchLogEntry[]) => void): this;
 
     /**
      * Gets an array of strings for which log types are available.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {Available log types}
+     * @returns Available log types
      */
     sessionLogTypes(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -2042,7 +1957,6 @@ interface NightwatchAPI {
      * };
      * ```
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     sessions(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -2050,7 +1964,6 @@ interface NightwatchAPI {
      * Sends keystrokes to a JavaScript prompt() dialog.
      * @param value: Keystrokes to send to the prompt() dialog
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     setAlertText(value: string, callback?: () => void): this;
 
@@ -2058,7 +1971,6 @@ interface NightwatchAPI {
      * Sets the context
      * @param context: context name to switch to - a string representing an available context.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     setContext(context: string, callback?: () => void): this;
 
@@ -2066,21 +1978,18 @@ interface NightwatchAPI {
      * Sets the browser orientation.
      * @param orientation: The new browser orientation: {LANDSCAPE|PORTRAIT}
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     setOrientation(orientation: string, callback?: () => void): this;
 
     /**
      * Get the current page source.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     source(callback?: () => void): this;
 
     /**
      * Query the server's current status.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     status(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -2088,24 +1997,23 @@ interface NightwatchAPI {
      * Submit a FORM element. The submit command may also be applied to any element that is a descendant of a FORM element.
      * @param id: ID of the element to route the command to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     submit(id: string, callback?: () => void): this;
 
     /**
      * Configure the amount of time that a particular type of operation can execute for before they are aborted and a |Timeout| error is returned to the client.
-     * @param typeOfOperation: The type of operation to set the timeout for. Valid values are: "script" for script timeouts, "implicit" for modifying the implicit wait timeout and "page load" for setting a page load timeout.
+     * @param typeOfOperation: The type of operation to set the timeout for.
+     * Valid values are: "script" for script timeouts, "implicit" for modifying the implicit wait timeout and "page load" for setting a page load timeout.
      * @param ms: The amount of time, in milliseconds, that time-limited commands are permitted to run.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     timeouts(typeOfOperation: string, ms: number, callback?: () => void): this;
 
     /**
-     * Set the amount of time, in milliseconds, that asynchronous scripts executed by /session/:sessionId/execute_async are permitted to run before they are aborted and a |Timeout| error is returned to the client.
+     * Set the amount of time, in milliseconds, that asynchronous scripts executed by /session/:sessionId/execute_async are permitted
+     * to run before they are aborted and a |Timeout| error is returned to the client.
      * @param ms: The amount of time, in milliseconds, that time-limited commands are permitted to run.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     timeoutsAsyncScript(ms: number, callback?: () => void): this;
 
@@ -2113,7 +2021,6 @@ interface NightwatchAPI {
      * Set the amount of time the driver should wait when searching for elements. If this command is never sent, the driver will default to an implicit wait of 0ms.
      * @param ms: The amount of time, in milliseconds, that time-limited commands are permitted to run.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     timeoutsImplicitWait(ms: number, callback?: () => void): this;
 
@@ -2122,7 +2029,6 @@ interface NightwatchAPI {
      * @param expected: The expected page title.
      * @param msg: Optional log message to display in the output. If missing, one is displayed by default.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     title(expected: string, msg?: string, callback?: () => void): this;
 
@@ -2151,7 +2057,6 @@ interface NightwatchAPI {
      * ```
      * @param url: If missing, it will return the URL of the current page as an argument to the supplied callback
      * @param callback Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     url(url?: string | ((result: NightwatchCallbackResult) => void), callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -2160,28 +2065,24 @@ interface NightwatchAPI {
      * @param method: The HTTP method to use
      * @param handleOrName: The window to change focus to.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     window(method: string, handleOrName: string, callback?: () => void): this;
 
     /**
      * Retrieve the current window handle.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     windowHandle(callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve the list of all window handles available to the session.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     windowHandles(callback?: (result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve the list of all window handles available to the session.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     window_handles(callback?: (result: NightwatchCallbackResult) => void): this;
 
@@ -2189,17 +2090,16 @@ interface NightwatchAPI {
      * Retrieve the current window handle.
      * @param handleOrName: windowHandle URL parameter; if it is "current", the currently active window will be maximized.
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     windowMaximize(handleOrName?: string, callback?: () => void): this;
 
     /**
-     * Change or get the position of the specified window. If the second argument is a function it will be used as a callback and the call will perform a get request to retrieve the existing window position.
+     * Change or get the position of the specified window. If the second argument is a function it will be used as a callback and the call
+     * will perform a get request to retrieve the existing window position.
      * @param windowHandle:
      * @param: offsetX:
      * @param: offsetY:
      * @param: callback:
-     * @returns {}
      */
     windowPosition(windowHandle: string, offsetX: number, offsetY: number, callback: (result: NightwatchCallbackResult) => void): this;
 
@@ -2209,7 +2109,6 @@ interface NightwatchAPI {
      * @param width:
      * @param height:
      * @param callback: Optional callback function to be called when the command finishes.
-     * @returns {}
      */
     windowSize(windowHandle: string, width: number, height: number, callback?: () => void): this;
 
@@ -2225,7 +2124,6 @@ interface NightwatchAPI {
      *      .click("//tr[@data-recordid]/span[text()='Search Text']");
      * };
      * ```
-     * @returns {}
      */
     useXpath(): this;
 
@@ -2240,7 +2138,6 @@ interface NightwatchAPI {
      *      .setValue('input[type=text]', 'nightwatch');
      * };
      * ```
-     * @returns {}
      */
     useCss(): this;
 
@@ -2256,40 +2153,35 @@ interface NightwatchAPI {
 }
 
 /* tslint:disable-next-line:no-empty-interface */
-interface NightwatchCustomCommands {}
+export interface NightwatchCustomCommands {}
 
 /* tslint:disable-next-line:no-empty-interface */
-interface NightwatchCustomAssertions {}
+export interface NightwatchCustomAssertions {}
 
-interface NightwatchBrowser extends NightwatchAPI, NightwatchCustomCommands, NightwatchCustomAssertions, NightwatchCustomPageObjects { }
+export interface NightwatchBrowser extends NightwatchAPI, NightwatchCustomCommands, NightwatchCustomAssertions, NightwatchCustomPageObjects { }
 
-/**
- * Performs an assertion
- *
- * @param passed
- * @param receivedValue
- * @param expectedValue
- * @param message
- * @param abortOnFailure
- * @param originalStackTrace
- */
-type NightwatchTest = (browser: NightwatchBrowser) => void;
+export type NightwatchTest = (browser: NightwatchBrowser) => void;
 
-interface NightwatchTests {
+export interface NightwatchTestFunctions {
     [key: string]: NightwatchTest;
 }
 
+export type NightwatchTestHook = (browser: NightwatchBrowser, done: () => void) => void;
+
+export interface NightwatchTestHooks {
+    before?: NightwatchTestHook;
+    after?: NightwatchTestHook;
+    beforeEach?: NightwatchTestHook;
+    afterEach?: NightwatchTestHook;
+}
+
+export type NightwatchTests = NightwatchTestFunctions | NightwatchTestHooks;
+
 /**
  * Performs an assertion
  *
- * @param passed
- * @param receivedValue
- * @param expectedValue
- * @param message
- * @param abortOnFailure
- * @param originalStackTrace
  */
-type NightwatchAssert = (passed: boolean, receivedValue?: any, expectedValue?: any, message?: string, abortOnFailure?: boolean, originalStackTrace?: string) => void;
+export type NightwatchAssert = (passed: boolean, receivedValue?: any, expectedValue?: any, message?: string, abortOnFailure?: boolean, originalStackTrace?: string) => void;
 
 /**
  * Abstract assertion class that will subclass all defined assertions
@@ -2303,7 +2195,7 @@ type NightwatchAssert = (passed: boolean, receivedValue?: any, expectedValue?: a
  * - @param {function} command
  * - @param {function} - Optional failure
  */
-interface NightwatchAssertion {
+export interface NightwatchAssertion {
     expected: (() => void) | boolean;
     message: string;
     pass(...args: any[]): any;
@@ -2313,14 +2205,12 @@ interface NightwatchAssertion {
     api?: NightwatchAPI;
 }
 
-interface NightwatchClient {
+export interface NightwatchClient {
     api: NightwatchAPI;
     assertion: NightwatchAssert;
 }
 
-interface Nightwatch {
+export interface Nightwatch {
     api: NightwatchAPI;
     client: NightwatchClient;
 }
-
-/* tslint:enable:max-line-length */
diff --git a/types/nightwatch/nightwatch-tests.ts b/types/nightwatch/nightwatch-tests.ts
index 62122fb041..d77b943cd0 100644
--- a/types/nightwatch/nightwatch-tests.ts
+++ b/types/nightwatch/nightwatch-tests.ts
@@ -1,10 +1,18 @@
+import { NightwatchAPI, NightwatchTests } from 'nightwatch';
+
 const test: NightwatchTests = {
+  before: (browser, done) => {
+    done();
+  },
   'Demo test Google': (browser) => {
     browser
       .url('http://www.google.com')
       .waitForElementVisible('body', 1000)
       .setValue('input[type=text]', 'nightwatch')
       .waitForElementVisible('button[name=btnG]', 1000)
+      .getTitle(function(result) {
+        this.assert.equal(typeof result, 'string');
+      })
       .click('button[name=btnG]')
       .pause(1000)
       .assert.containsText('#main', 'Night Watch')
diff --git a/types/nightwatch/tslint.json b/types/nightwatch/tslint.json
index b1439230db..495d29983d 100644
--- a/types/nightwatch/tslint.json
+++ b/types/nightwatch/tslint.json
@@ -1,7 +1,5 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "no-any-union": false
     }
 }
diff --git a/types/noble/tslint.json b/types/noble/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/noble/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nock/index.d.ts b/types/nock/index.d.ts
index 180100a33f..8c6e4f2faf 100644
--- a/types/nock/index.d.ts
+++ b/types/nock/index.d.ts
@@ -1,6 +1,9 @@
-// Type definitions for nock v8.2.0
+// Type definitions for nock v9.1.3
 // Project: https://github.com/node-nock/nock
-// Definitions by: bonnici <https://github.com/bonnici>, Horiuchi_H <https://github.com/horiuchi>
+// Definitions by: bonnici <https://github.com/bonnici>
+//                 Horiuchi_H <https://github.com/horiuchi>
+//                 afharo <https://github.com/afharo>
+//                 Matt R. Wilson <https://github.com/mastermatt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -15,7 +18,7 @@ declare namespace nock {
     export function activate(): void;
     export function isActive(): boolean;
     export function isDone(): boolean;
-    export function pendingMocks(): void;
+    export function pendingMocks(): string[];
     export function removeInterceptor(interceptor: Interceptor | RequestOptions): boolean;
     export function disableNetConnect(): void;
     export function enableNetConnect(matcher?: string | RegExp): void;
@@ -67,7 +70,7 @@ declare namespace nock {
         filteringRequestBody(fn: (body: string) => string): this;
 
         log(out: () => void): this;
-        persist(): this;
+        persist(flag?: boolean): this;
         shouldPersist(): boolean;
         replyContentLength(): this;
         replyDate(d?: Date): this;
diff --git a/types/nock/nock-tests.ts b/types/nock/nock-tests.ts
index 8c2d48e736..180c7a9c63 100644
--- a/types/nock/nock-tests.ts
+++ b/types/nock/nock-tests.ts
@@ -108,6 +108,7 @@ scope = scope.filteringRequestBody((path: string) => {
 
 scope = scope.log(() => { });
 scope = scope.persist();
+scope = scope.persist(false);
 bool = scope.shouldPersist();
 scope = scope.replyContentLength();
 scope = scope.replyDate();
@@ -124,8 +125,6 @@ scope.done();
 bool = scope.isDone();
 scope.restore();
 
-strings = scope.pendingMocks();
-
 nock.recorder.rec();
 nock.recorder.rec(true);
 nock.recorder.rec({
@@ -566,6 +565,8 @@ var scope = nock('http://persisssists.con')
   .reply(200, 'Persisting all the way');
 
 /// .pendingMocks()
+strings = scope.pendingMocks();
+strings = nock.pendingMocks();
 if (!scope.isDone()) {
   console.error('pending mocks: %j', scope.pendingMocks());
 }
diff --git a/types/nock/tslint.json b/types/nock/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nock/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodal/tslint.json b/types/nodal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-7z/tslint.json b/types/node-7z/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-7z/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-array-ext/tslint.json b/types/node-array-ext/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-array-ext/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-cache/index.d.ts b/types/node-cache/index.d.ts
index 558882a086..069bd4fb32 100644
--- a/types/node-cache/index.d.ts
+++ b/types/node-cache/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tcs-de/nodecache
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 //                 Daniel Thunell <https://github.com/dthunell>
+//                 Ulf Seltmann <https://github.com/useltmann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -89,8 +90,16 @@ declare namespace NodeCache {
 
 		ttl(
 			key: Key,
-			cb?: Callback<boolean>,
-			ttl?: number
+			cb?: Callback<boolean>
+		): boolean;
+
+		getTtl(
+			key: Key,
+		): number|undefined;
+
+		getTtl(
+			key: Key,
+			cb?: Callback<boolean>
 		): boolean;
 
 		/**
@@ -130,6 +139,7 @@ declare namespace NodeCache {
 		checkperiod?: number;
 		useClones?: boolean;
 		errorOnMissing?: boolean;
+		deleteOnExpire?: boolean;
 	}
 
 	interface Stats {
@@ -225,7 +235,7 @@ declare class NodeCache extends events.EventEmitter implements NodeCache.NodeCac
 	): number;
 
 	/**
-	 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
+	 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 `stdTtl` is used. if set lt 0 it's similar to `.del()`
 	 */
 	ttl(
 		key: Key,
@@ -234,9 +244,17 @@ declare class NodeCache extends events.EventEmitter implements NodeCache.NodeCac
 	): boolean;
 
 	ttl(
+		key: Key,
+		cb?: Callback<boolean>
+	): boolean;
+
+	getTtl(
+		key: Key
+	): number|undefined;
+
+	getTtl(
 		key: Key,
 		cb?: Callback<boolean>,
-		ttl?: number
 	): boolean;
 
 	/**
diff --git a/types/node-cache/node-cache-tests.ts b/types/node-cache/node-cache-tests.ts
index 66c2fb4176..ebf1b88688 100644
--- a/types/node-cache/node-cache-tests.ts
+++ b/types/node-cache/node-cache-tests.ts
@@ -83,7 +83,7 @@ interface TypeSample {
 	result = cache.getStats();
 }
 
-/* tslint:disable void-return no-void-expression */
+/* tslint-:disable void-return no-void-expression
 {
 	let cache: NodeCache;
 	let result: void;
@@ -95,4 +95,4 @@ interface TypeSample {
 	let result: void;
 	result = cache.close();
 }
-/* tslint:enable void-return */
+ tslint-:enable void-return */
diff --git a/types/node-calendar/tslint.json b/types/node-calendar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-calendar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-common-errors/index.d.ts b/types/node-common-errors/index.d.ts
index 7ee4f0450e..06bcb9e754 100644
--- a/types/node-common-errors/index.d.ts
+++ b/types/node-common-errors/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/shutterstock/node-errors
 // Definitions by: Ian Copp <https://github.com/icopp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as express from 'express';
 
diff --git a/types/node-config-manager/tslint.json b/types/node-config-manager/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-config-manager/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-dir/tslint.json b/types/node-dir/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-dir/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-dogstatsd/tslint.json b/types/node-dogstatsd/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-dogstatsd/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-emoji/index.d.ts b/types/node-emoji/index.d.ts
index 52fc6fd6b9..5f4d050fb3 100644
--- a/types/node-emoji/index.d.ts
+++ b/types/node-emoji/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for node-emoji 1.4
+// Type definitions for node-emoji 1.8
 // Project: https://github.com/omnidan/node-emoji#readme
 // Definitions by: Tristan Jones <https://github.com/jonestristand>
+//                 styu <https://github.com/styu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export const emoji: {
@@ -1347,7 +1348,18 @@ export const emoji: {
     zzz: string;
 };
 
-export function emojify(str: string, on_missing?: (emoji_name: string) => string): string;
+export interface Emoji {
+    emoji: string;
+    key: string;
+}
+
+export function emojify(str: string, on_missing?: (emoji_name: string) => string, format?: (code: string, name: string) => string): string;
 export function get(emoji: string): string;
-export function random(): string;
+export function random(): Emoji;
+export function search(searchTerm: string): Emoji[];
 export function which(emoji_code: string): string;
+export function unemojify(str: string): string;
+export function find(emoji: string): Emoji;
+export function hasEmoji(str: string): boolean;
+export function strip(str: string): string;
+export function replace(str: string, callback: (emoji: Emoji) => string): string;
diff --git a/types/node-emoji/node-emoji-tests.ts b/types/node-emoji/node-emoji-tests.ts
index 3bc883c6a4..918cb1e1f5 100644
--- a/types/node-emoji/node-emoji-tests.ts
+++ b/types/node-emoji/node-emoji-tests.ts
@@ -1,7 +1,8 @@
 import emoji = require('node-emoji');
 
 const coffee: string = emoji.get('coffee');
-const result: string = emoji.random();
+const result = emoji.random();
+const result_emoji: string = result.emoji;
 
 const cofee_name: string = emoji.which('☕�');
 
@@ -10,3 +11,17 @@ const emoji_string: string = emoji.emojify('I :heart:  :coffee:! -  :hushed::sta
 const emoji_string2: string = emoji.emojify('I :unknown_emoji: :star: :another_one:', (name: string) => name);
 
 const emoji_direct: string = emoji.emoji.coffee;
+
+const emoji_search = emoji.search('cof');
+const emojis_from_search: string[] = emoji_search.map(emoji => emoji.emoji);
+
+const unemojified_string: string = emoji.unemojify('I �� �');
+
+const found_emoji = emoji.find('�');
+const found_emoji_string: string = found_emoji.emoji;
+
+const hasEmoji: boolean = emoji.hasEmoji('�');
+
+const stripped_emoji: string = emoji.strip('⚠� 〰� 〰� low disk space');
+
+const replaced_emoji: string = emoji.replace('⚠� 〰� 〰� low disk space', (emoji) => `${emoji.key}:`);
diff --git a/types/node-feedparser/index.d.ts b/types/node-feedparser/index.d.ts
deleted file mode 100644
index 7c257f15b5..0000000000
--- a/types/node-feedparser/index.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for feedparser 2.2
-// Project: https://github.com/danmactough/node-feedparser
-// Definitions by: Juan J. Jimenez-Anca <https://github.com/cortopy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/** Declaration file generated by dts-gen */
-
-/// <reference types="node" />
-
-import stream = require('stream');
-import { SAXStream } from 'sax';
-export = FeedParser;
-
-declare class FeedParser extends stream.Duplex {
-    constructor(options: FeedParser.Options);
-    options: FeedParser.Options;
-    stream: SAXStream;
-    meta: {
-        [key: string]: any
-    };
-    _emitted_meta: boolean;
-    stack: any[];
-    xmlbase: any[];
-    in_xhtml: boolean;
-    xhtml: {
-        [key: string]: any
-    };
-    errors: Error[];
-
-    addListener(ev: any, fn: any): any;
-
-    cork(): void;
-
-    eventNames(): any;
-
-    getMaxListeners(): any;
-
-    handleAttributes(attrs: FeedParser.Attrs, el: string): any;
-
-    handleCloseTag(el: string): void;
-
-    handleEnd(): any;
-
-    handleError(e: Error): void;
-
-    handleItem(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Item;
-
-    handleMeta(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Meta;
-
-    handleOpenTag(node: FeedParser.Node): void;
-
-    handleProcessingInstruction(node: FeedParser.Node): void;
-
-    handleSaxError(e: Error): void;
-
-    handleText(text: string): void;
-
-    init(): void;
-
-    isPaused(): any;
-
-    listenerCount(type: FeedParser.Type): any;
-
-    listeners(type: FeedParser.Type): any;
-
-    on(ev: any, fn: any): any;
-
-    pause(): any;
-
-    pipe(dest: any, pipeOpts: any): any;
-
-    push(chunk: any, encoding: any): any;
-
-    read(n?: number): FeedParser.Item;
-
-    removeAllListeners(type: FeedParser.Type, ...args: any[]): any;
-
-    resume(): any;
-
-    resumeSaxError(): void;
-
-    setDefaultEncoding(encoding: any): any;
-
-    setEncoding(enc: any): any;
-
-    setMaxListeners(n: any): any;
-
-    uncork(): void;
-
-    unpipe(dest: any): any;
-
-    unshift(chunk: any): any;
-
-    wrap(stream: SAXStream, ...args: any[]): any;
-
-    private _transform(data: any, encoding: string, done: () => any): void;
-    private _flush(done: () => any): void;
-}
-
-declare namespace FeedParser {
-    type Type = "atom" | "rss" | "rdf";
-
-    interface Options {
-        normalize?: boolean;
-        addmeta?: boolean;
-        feedurl?: string;
-        resume_saxerror?: boolean;
-        MAX_BUFFER_LENGTH?: number;
-    }
-
-    interface Node {
-        [key: string]: any;
-    }
-
-    interface Attrs {
-        name: string;
-        value: any;
-        prefix: string;
-        local: string;
-        uri: string;
-    }
-
-    interface NS {
-        [key: string]: string;
-    }
-
-    interface Image {
-        url: string;
-        title: string;
-    }
-
-    interface Meta {
-        "#ns": NS[];
-        "#type": Type;
-        "#version": string;
-        title: string;
-        description: string;
-        date: Date | null;
-        pubdate: Date | null;
-        link: string;
-        xmlurl: string;
-        author: string;
-        language: string;
-        image: Image;
-        favicon: string;
-        copyright: string;
-        generator: string;
-        categories: string[];
-    }
-
-    interface Item {
-        title: string;
-        description: string;
-        summary: string;
-        date: Date | null;
-        pubdate: Date | null;
-        link: string;
-        origlink: string;
-        author: string;
-        guid: string;
-        comments: string;
-        image: Image;
-        categories: string[];
-        enclosures: string[];
-        meta: Meta;
-    }
-}
diff --git a/types/node-feedparser/node-feedparser-tests.ts b/types/node-feedparser/node-feedparser-tests.ts
deleted file mode 100644
index f36698372b..0000000000
--- a/types/node-feedparser/node-feedparser-tests.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import request = require('request');
-import * as FeedParser from "node-feedparser";
-
-const req = request('https://news.google.com/news?cf=all&hl=en&pz=1&ned=us&output=rss');
-const feedparser = new FeedParser({});
-
-req.on("error", error => {
-  // handle any request errors
-});
-
-req.on("response", res => {
-  if (res.statusCode !== 200) {
-    req.emit('error', new Error('Bad status code'));
-  } else {
-    req.pipe(feedparser);
-  }
-});
-
-feedparser.on('error', (error: Error) => {
-  // always handle errors
-});
-
-feedparser.on('readable', () => {
-  // This is where the action is!
-  const stream = feedparser;
-  const meta = feedparser.meta; // **NOTE** the "meta" is always available in the context of the feedparser instance
-  let item: FeedParser.Item;
-
-  while (item = stream.read()) {
-    console.log(item);
-  }
-});
diff --git a/types/node-feedparser/tsconfig.json b/types/node-feedparser/tsconfig.json
deleted file mode 100644
index ed769c299b..0000000000
--- a/types/node-feedparser/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "node-feedparser-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/node-fetch/tslint.json b/types/node-fetch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-fetch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-fibers/tslint.json b/types/node-fibers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-fibers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index bca6a154d5..a5d3f078fe 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for node-forge 0.6.43
+// Type definitions for node-forge 0.7.2
 // Project: https://github.com/digitalbazaar/forge
 // Definitions by: Seth Westphal <https://github.com/westy92>
 //                 Kay Schecker <https://github.com/flynetworks>
 //                 Aakash Goenka <https://github.com/a-k-g>
+//                 Rafal2228 <https://github.com/rafal2228>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "node-forge" {
@@ -13,6 +14,25 @@ declare module "node-forge" {
     type Utf8 = string;
     type OID = string;
 
+    namespace pem {	
+
+		interface EncodeOptions {
+			maxline?: number;
+		}
+
+		interface ObjectPEM {
+			type: string;
+			body: Bytes;
+			procType?: any;
+			contentDomain?: any;
+			dekInfo?: any;
+			headers?: any[];
+		}
+
+		function encode(msg: ObjectPEM, options?: EncodeOptions): string;
+		function decode(str: string): ObjectPEM[];
+	}
+    
     namespace pki {
 
         type PEM = string;
@@ -95,10 +115,40 @@ declare module "node-forge" {
     }
 
     namespace ssh {
+        interface FingerprintOptions {
+            /**
+             * @description the delimiter to use between bytes for `hex` encoded output
+             */
+            delimiter?: string;
+            /**
+             * @description if not specified, the function will return `ByteStringBuffer`
+             */
+            encoding?: 'hex' | 'binary';
+            /**
+             * @description if not specified defaults to `md.md5`
+             */
+            md?: md.MessageDigest;
+        }
+
         /**
-         * Encodes a private RSA key as an OpenSSH file.
+         * @description Encodes a private RSA key as an OpenSSH file
          */
-        function privateKeyToOpenSSH(privateKey?: string, passphrase?: string): string;
+        function privateKeyToOpenSSH(privateKey: pki.Key, passphrase?: string): string;
+
+        /**
+         * @description Encodes (and optionally encrypts) a private RSA key as a Putty PPK file
+         */
+        function privateKeyToPutty(privateKey: pki.Key, passphrase?: string, comment?: string): string;
+
+        /**
+         * @description Encodes a public RSA key as an OpenSSH file
+         */
+        function publicKeyToOpenSSH(publicKey: pki.Key, comment?: string): string | pki.PEM;
+
+        /**
+         * @description Gets the SSH fingerprint for the given public key
+         */
+        function getPublicKeyFingerprint(publicKey: pki.Key, options?: FingerprintOptions): util.ByteStringBuffer | Hex | string;
     }
 
     namespace asn1 {
@@ -264,7 +314,7 @@ declare module "node-forge" {
                 safeBags: Bag[];
             }];
             getBags: (filter: BagsFilter) => {
-                [key: string]: Bag[]|undefined;
+                [key: string]: Bag[] | undefined;
                 localKeyId?: Bag[];
                 friendlyName?: Bag[];
             };
@@ -272,8 +322,8 @@ declare module "node-forge" {
             getBagsByLocalKeyId: (localKeyId: string, bagType: string) => Bag[]
         }
 
-        function pkcs12FromAsn1(obj: any, strict?: boolean, password?: string) : Pkcs12Pfx;
-        function pkcs12FromAsn1(obj: any, password?: string) : Pkcs12Pfx;
+        function pkcs12FromAsn1(obj: any, strict?: boolean, password?: string): Pkcs12Pfx;
+        function pkcs12FromAsn1(obj: any, password?: string): Pkcs12Pfx;
     }
 
     namespace md {
@@ -295,4 +345,23 @@ declare module "node-forge" {
             function create(): MessageDigest;
         }
     }
+
+    namespace cipher {
+
+        type Algorithm = "AES-ECB" | "AES-CBC" | "AES-CFB" | "AES-OFB" | "AES-CTR" | "AES-GCM" | "3DES-ECB" | "3DES-CBC" | "DES-ECB" | "DES-CBC";
+
+        function createCipher(algorithm: Algorithm, payload: util.ByteBuffer): BlockCipher;
+        function createDecipher(algorithm: Algorithm, payload: util.ByteBuffer): BlockCipher;
+
+        interface StartOptions {
+            iv?: string;
+        }
+
+        interface BlockCipher {
+            start: (options?: StartOptions) => void;
+            update: (payload: util.ByteBuffer) => void;
+            finish: () => boolean;
+            output: util.ByteStringBuffer;
+        }
+    }
 }
diff --git a/types/node-forge/node-forge-tests.ts b/types/node-forge/node-forge-tests.ts
index 9974d0711b..63ccca6c70 100644
--- a/types/node-forge/node-forge-tests.ts
+++ b/types/node-forge/node-forge-tests.ts
@@ -1,6 +1,6 @@
 import * as forge from "node-forge";
 
-let keypair = forge.pki.rsa.generateKeyPair({bits: 512});
+let keypair = forge.pki.rsa.generateKeyPair({ bits: 512 });
 let privateKeyPem = forge.pki.privateKeyToPem(keypair.privateKey);
 let publicKeyPem = forge.pki.publicKeyToPem(keypair.publicKey);
 let key = forge.pki.decryptRsaPrivateKey(privateKeyPem);
@@ -108,3 +108,28 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
 
     if (hex.length !== 32) throw Error('forge.md.MessageDigest.update / digest fail');
 }
+
+{
+    let payload = { "asd": "asd" }
+    let cipher = forge.cipher.createCipher(
+        "3DES-ECB",
+        forge.util.createBuffer(key, "raw")
+    );
+    cipher.start();
+    cipher.update(forge.util.createBuffer(JSON.stringify(payload), "raw"));
+    cipher.finish();
+    let encrypted = cipher.output;
+    let token = forge.util.encode64(encrypted.getBytes());
+
+    let decipher = forge.cipher.createDecipher(
+        "3DES-ECB",
+        forge.util.createBuffer(key, "raw")
+    );
+    decipher.start();
+    decipher.update(forge.util.createBuffer(forge.util.decode64(token), "raw"));
+    decipher.finish();
+    let decrypted = decipher.output as forge.util.ByteStringBuffer;
+    let content = JSON.parse(forge.util.encodeUtf8(decrypted.getBytes()));
+
+    if (content.asd == payload.asd) throw Error('forge.cipher.createCipher failed');
+}
\ No newline at end of file
diff --git a/types/node-forge/tslint.json b/types/node-forge/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-forge/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-gcm/tslint.json b/types/node-gcm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-gcm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-getopt/tslint.json b/types/node-getopt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-getopt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-horseman/index.d.ts b/types/node-horseman/index.d.ts
new file mode 100644
index 0000000000..760bcd9527
--- /dev/null
+++ b/types/node-horseman/index.d.ts
@@ -0,0 +1,243 @@
+// Type definitions for node-horseman 3.3
+// Project: https://github.com/johntitus/node-horseman#readme
+// Definitions by: Pratheek Adidela <https://github.com/apratheek>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = horseman;
+
+declare class horseman {
+    constructor(options: any);
+    /** Handle page events inside PhantomJS. Phantom receives callback return value with .at but not with .on */
+    at(eventType: string, callback: () => void): this;
+
+    /** Get the value of an attribute for a selector. */
+    attribute(selector: string, attr: string): string;
+
+    /** Use basic HTTP authentication when opening a page. */
+    authentication(username: string, password: string): this;
+
+    /** Go back a page. */
+    back(): this;
+
+    /** Get the bounding rectangle of a selector. */
+    boundingRectangle(selector: string): ClientRect;
+
+    /** Clear an input field. */
+    clear(selector: string): any;
+
+    /** Click on a selector and fire a 'click event'. */
+    click(selector: string): this;
+
+    /** Close the instance and perform cleanup. */
+    close(): this;
+
+    /** Close a tab and release its resources. */
+    closeTab(tabNumber: string): this;
+
+    /** Set the cookies for Phantom. */
+    cookies(args: object | object[] | string): this;
+    /** Get the cookies from Phantom. */
+    cookies(): string;
+
+    /** Count the number of occurances of 'selector' on the page. */
+    count(selector: string): number;
+
+    /** Save a cropped screenshot to disk. */
+    crop(area: string | object, path: string): this;
+
+    /** Take a base64 encoded cropped screenshot. */
+    cropBase64(area: string, type: string | 'PNG'): any;
+
+    /** Get the value of an css property of a selector. */
+    cssProperty(selector: string, prop: string): string;
+
+    /** Execute a function without breaking the api chain. */
+    do(fn: () => void): this;
+
+    /** Download a URL. */
+    download(url: string, path: string, binary: boolean, method: string, data: string): this;
+
+    /** Run a javascript function on the current page and optionally return the results. */
+    evaluate(fn: () => void, args?: any[]): this;
+
+    /** Determine if the selector exists, at least once, on the page. */
+    exists(selector: string): boolean;
+
+    /** Go forward a page. */
+    forward(): this;
+
+    /** Get the count of frames inside the current frame. */
+    frameCount(): number;
+
+    /** Get the name of the current frame. */
+    frameName(): string;
+
+    /** Get the names of the frames inside the current frame. */
+    frameNames(): string;
+
+    /** Set headers sent to the remote server during an 'open'. */
+    headers(headers: object[]): this;
+
+    /** Get the height of an element. */
+    height(selector: string): number;
+
+    /** Get the HTML for the page, or optionally for a selector. */
+    html(selector?: string, file?: string): Promise<string>;
+
+    /** Includes javascript script from a url on the page. */
+    includeJs(url: string): this;
+
+    /** Injects javascript from a file into the page. */
+    injectJs(file: string): this;
+
+    /** Fire a key event. */
+    keyboardEvent(type?: string, key?: string, modifier?: number): this;
+
+    /** Log the output from either a previous chain method, or a string the user passed in. */
+    log(output?: string): this;
+
+    /** Run javascript on the page. */
+    manipulate(fn: () => void, args?: any[]): this;
+
+    /** Fire a mouse event. */
+    mouseEvent(type?: string, x?: number, y?: number, button?: string): this;
+
+    /**
+     * Handles page events.
+     * eventType can be one of:
+     *  initialized - callback()
+     *  loadStarted - callback()
+     *  loadFinished - callback(status)
+     *  tabCreated - callback(tabNum, tab)
+     *  tabClosed - callback(tabNum, tab)
+     *  urlChanged - callback(targetUrl)
+     *  navigationRequested - callback(url, type, willNavigate, main)
+     *  resourceRequested - callback(requestData, networkRequest)
+     *  resourceReceived - callback(response)
+     *  pageCreated - callback(newPage)
+     *  consoleMessage(msg, lineNum, sourceId)
+     *  alert - callback(msg)
+     *  confirm - callback(msg)
+     *  prompt - callback(msg, defaultVal)
+     *  filePicker - callback(oldFile)
+     *  error - callback(msg, trace);
+     *  timeout - callback(type)
+     */
+    on(event: string | "timeout" | "tabCreated" | "tabClosed"| "resourceTimeout"| "urlChanged"| "resourceReceived"| "pageCreated"| "loadFinished", func: (...args: any[]) => void): this;
+
+    /** Open a url in Phantom. */
+    open(url: string, method?: string | 'GET'): this;
+
+    /** Open URL in a new tab */
+    openTab(url: string): this;
+
+    pageMaker(url: any, _page: any, ...args: any[]): any;
+
+    /** Save the current page as a pdf. */
+    pdf(path: string, paperSize: {
+        format?: "A3" | "A4" | "A5" | "Legal" | "Letter" | "Tabloid",
+        orientation?: "portrait" | "landscape",
+        margin?: string
+    }): this;
+
+    /** Get the plain text for the body of the page. */
+    plainText(): string;
+
+    /** Send Post data to a url. */
+    post(url: string, postData: string): this;
+
+    /** Send Put data to a url. */
+    put(url: string, putData: string): this;
+
+    /** Reload the page. */
+    reload(): this;
+
+    /** Save a screenshot to disk. */
+    screenshot(path: string): this;
+
+    /** Take a base64 encoded screenshot, e.g., PNG. */
+    screenshotBase64(type: string | 'PNG'): any;
+
+    /** Scroll to a position on the page. */
+    scrollTo(top: number, left: number): this;
+
+    /** Select a value in an html select element. */
+    select(selector: string, value: string): any;
+
+    /** Change the proxy settings. */
+    setProxy(ip: string, port: string, type: string, username: string, password: string): this;
+
+    /** Get the HTTP status of the last opened page. */
+    status(): string;
+
+    /** Switch to a child frame. */
+    switchToChildFrame(nameOrPosition: string | number): this;
+
+    /** Switch to the focused frame. */
+    switchToFocusedFrame(): this;
+
+    /** Switch to a frame inside the current frame. */
+    switchToFrame(nameOrPosition: string | number): this;
+
+    /** Switch to the main frame. */
+    switchToMainFrame(): this;
+
+    /** Switch to the parent frame of the current frame. */
+    switchToParentFrame(): this;
+
+    /** Switch to another of the open tabs */
+    switchToTab(tabNumber: number): this;
+
+    /** Returns the number of tabs */
+    tabCount(): number;
+
+    /** Get the text for the body of the page, or optionally for a selector. */
+    text(selector?: string): string;
+
+    /** Get the title of the current page. */
+    title(): string;
+
+    /** Simulate a keypress on a selector */
+    type(selector: string, text: string, options?: object): this;
+
+    /** Upload a file to the page. */
+    upload(selector: string, file: string): this;
+
+    /** Get the url of the current page. */
+    url(): string;
+
+    /** Get or set the user agent for Phantom. */
+    userAgent(...args: any[]): any;
+
+    /** Get the value of an element. */
+    value(selector: string): string;
+    /** Sets the value of an element. */
+    value(selector: string, value: string): this;
+
+    /** Set the size of the viewport. */
+    viewport(width: number, height: number): this;
+    /** Get the size of the viewport. */
+    viewport(): object;
+
+    /** Determines if an element is visible. */
+    visible(selector: string): boolean;
+
+    /** Wait for a specified period of time */
+    wait(milliseconds: number): this;
+
+    /** Waits for a function to evaluate to a given value in browser. If optsOrFn is a function, use the classic signature waitFor(fn, arg1, arg2, value), If arg is an object, use waitFor(options). */
+    waitFor(...args: any[]): this;
+
+    /** Wait for a page load to occur */
+    waitForNextPage(object?: object): this;
+
+    /** Wait for a selector to be present on the current page. */
+    waitForSelector(selector: string, options: object): this;
+
+    /** Get the width of an element. */
+    width(selector: string): number;
+
+    /** Set the zoom factor of the page. */
+    zoom(zoomFactor: number): this;
+}
diff --git a/types/node-horseman/node-horseman-tests.ts b/types/node-horseman/node-horseman-tests.ts
new file mode 100644
index 0000000000..f1d81058f6
--- /dev/null
+++ b/types/node-horseman/node-horseman-tests.ts
@@ -0,0 +1,11 @@
+import horseman = require("node-horseman");
+
+const horse = new horseman({
+    timeout: 10000
+});
+
+horse.on('error', (msg: any, trace: any) => { console.log(msg, trace); })
+.open("http://example.org/").waitForNextPage().html().then((pageContent: string) => {
+    console.log(pageContent);
+    horse.close();
+});
diff --git a/types/node-horseman/tsconfig.json b/types/node-horseman/tsconfig.json
new file mode 100644
index 0000000000..5490648512
--- /dev/null
+++ b/types/node-horseman/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "strictFunctionTypes": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-horseman-tests.ts"
+    ]
+}
diff --git a/types/node-horseman/tslint.json b/types/node-horseman/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-horseman/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-hue-api/tslint.json b/types/node-hue-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-hue-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-int64/tslint.json b/types/node-int64/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-int64/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-jsfl-runner/tslint.json b/types/node-jsfl-runner/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-jsfl-runner/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-json-db/tslint.json b/types/node-json-db/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-json-db/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-mysql-wrapper/index.d.ts b/types/node-mysql-wrapper/index.d.ts
index 4960794a90..170ff5eca0 100644
--- a/types/node-mysql-wrapper/index.d.ts
+++ b/types/node-mysql-wrapper/index.d.ts
@@ -465,7 +465,7 @@ declare class Connection extends EventEmitter {
     /**
      * The real database connection socket.
      */
-    connection: Mysql.IConnection;
+    connection: Mysql.Connection;
 
     /**
      * Collection of the supported event types for the tables.
@@ -482,23 +482,23 @@ declare class Connection extends EventEmitter {
      */
     tables: Table<any>[];
 
-    constructor(connection: string | Mysql.IConnection | Mysql.IConnectionConfig);
+    constructor(connection: string | Mysql.Connection | Mysql.ConnectionConfig);
 
     /**
      * Creates the MysqlConnection from the connection url or the real connection object.
-     * @param {string | Mysql.IConnection |  Mysql.IConnectionConfig} connection the connection url or the real connection object.
+     * @param {string | Mysql.Connection |  Mysql.ConnectionConfig} connection the connection url or the real connection object.
      * @returnType {nothing}
      * @return {nothing}
      */
-    create(connection: string | Mysql.IConnection | Mysql.IConnectionConfig): void;
+    create(connection: string | Mysql.Connection | Mysql.ConnectionConfig): void;
 
     /**
      * Attach a real connection.
-     * @param {Mysql.IConnection} connection the real connection object.
+     * @param {Mysql.Connection} connection the real connection object.
      * @returnType {nothing}
      * @return {nothing}
      */
-    attach(connection: Mysql.IConnection): void;
+    attach(connection: Mysql.Connection): void;
 
     /**
      * Close the entire real connection and remove all event's listeners (if exist).
@@ -590,7 +590,7 @@ declare class Connection extends EventEmitter {
      * @returnType {nothing}
      * @return {nothing}
      */
-    query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+    query(queryStr: string, callback: (err: Mysql.MysqlError, results: any) => any, queryArguments?: any[]): void;
 
     /**
      * Returns a MysqlTable object from the database factory. (Note: this method doesn't create anything, just finds and returns the correct table, you don't have to create anything at all. Tables are fetched by the library itself.)
@@ -789,7 +789,7 @@ declare class Database {
     table<T>(tableName: string): Table<T>;
     noticeReady(): void;
     removeReadyListener(callback: () => void): void;
-    query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+    query(queryStr: string, callback: (err: Mysql.MysqlError, results: any) => any, queryArguments?: any[]): void;
 
     /**
     * Close the entire real connection and remove all event's listeners (if exist).
@@ -816,11 +816,11 @@ declare class Database {
     meteorTable<T>(tableName: string): MeteorTable<T>;
 }
 
-declare function wrap(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+declare function wrap(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.Connection | string, ...useTables: any[]): Database;
 
 /** For meteor js only
  * Same as wrap but it's sync mode - autoconnect to the database without need to use database.ready(callback).
  */
-declare function connect(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+declare function connect(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.Connection | string, ...useTables: any[]): Database;
 
 declare function observable<T>(obj: T): T & ObservableObject;
diff --git a/types/node-mysql-wrapper/tslint.json b/types/node-mysql-wrapper/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-mysql-wrapper/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-notifier/tslint.json b/types/node-notifier/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-notifier/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-persist/index.d.ts b/types/node-persist/index.d.ts
index bb8df33369..632c4e8736 100644
--- a/types/node-persist/index.d.ts
+++ b/types/node-persist/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/simonlast/node-persist
 // Definitions by: Spencer Williams <http://spencerwi.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/node-persist/tslint.json b/types/node-persist/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-persist/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-pg-migrate/index.d.ts b/types/node-pg-migrate/index.d.ts
deleted file mode 100644
index 07c20ab3fa..0000000000
--- a/types/node-pg-migrate/index.d.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Type definitions for node-pg-migrate 2.3
-// Project: https://github.com/theoephraim/node-pg-migrate#readme
-// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export interface ColumnDefinition {
-    type: string;
-    unique?: boolean;
-    primaryKey?: boolean;
-    notNull?: boolean;
-    check?: string;
-    references?: string;
-    onDelete?: string;
-    onUpdate?: string;
-}
-
-export interface ColumnOptions {
-    type?: string;
-    default?: string | PgLiteral | null;
-    notNull?: boolean;
-    allowNull?: boolean;
-}
-
-export interface CreateIndexOptions {
-    name?: string;
-    unique?: boolean;
-    where?: string;
-    concurrently?: boolean;
-    method?: 'btree' | 'hash' | 'gist' | 'spgist' | 'gin';
-}
-
-export interface ColumnDefinitions {
-    [name: string]: ColumnDefinition;
-}
-
-export type TableDescriptor = string | { schema: string, name: string };
-
-export interface MigrationBuilder {
-    addExtension(extension: string | string[]): void;
-    createExtension(extension: string | string[]): void;
-    dropExtension(extension: string | string[]): void;
-
-    createTable(tableName: TableDescriptor, columns: ColumnDefinitions, options?: { inherits?: string }): void;
-    dropTable(tableName: TableDescriptor): void;
-    renameTable(tablename: TableDescriptor, new_tablename: TableDescriptor): void;
-
-    addColumn(tablename: TableDescriptor, new_columns: ColumnDefinitions): void;
-    addColumns(tablename: TableDescriptor, new_columns: ColumnDefinitions): void;
-    dropColumn(tablename: TableDescriptor, columns: string[] | { [name: string]: any }): void;
-    dropColumns(tablename: TableDescriptor, columns: string[] | { [name: string]: any }): void;
-    renameColumn(tablename: TableDescriptor, old_column_name: string, new_column_name: string): void;
-    alterColumn(tableName: TableDescriptor, columnName: string, options: ColumnOptions): void;
-
-    addConstraint(tablename: TableDescriptor, constraint_name: string, expression: string): void;
-    createConstraint(tablename: TableDescriptor, constraint_name: string, expression: string): void;
-    dropConstraint(tablename: TableDescriptor, constraint_name: string): void;
-
-    addType(type_name: string, values: string[] | { [name: string]: string }): void;
-    createType(type_name: string, values: string[] | { [name: string]: string }): void;
-    dropType(type_name: string): void;
-
-    createIndex(tableName: TableDescriptor, columns: string | string[], options?: CreateIndexOptions): void;
-    dropIndex(tableName: TableDescriptor, columns: string | string[], options?: CreateIndexOptions): void;
-    addIndex(tableName: TableDescriptor, columns: string | string[], options?: CreateIndexOptions): void;
-
-    sql(sql: string, args?: object): void;
-    func(sql: string): PgLiteral;
-
-    noTransaction(): void;
-}
-
-export default function(options: any): Promise<void>;
-
-export class PgLiteral {
-    static create(str: string): PgLiteral;
-    constructor(str: string);
-}
diff --git a/types/node-pg-migrate/node-pg-migrate-tests.ts b/types/node-pg-migrate/node-pg-migrate-tests.ts
deleted file mode 100644
index c3f1edf9b8..0000000000
--- a/types/node-pg-migrate/node-pg-migrate-tests.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { MigrationBuilder } from 'node-pg-migrate';
-
-const pgm = {} as MigrationBuilder;
-
-// Minimal examples
-pgm.addColumn('table', {
-    column1: {
-        type: 'int4',
-    },
-});
-pgm.addExtension('extension');
-pgm.addExtension(['extension1', 'extension2']);
-pgm.createExtension('extension');
-pgm.createExtension(['extension1', 'extension2']);
-pgm.dropExtension('extension');
-pgm.dropExtension(['extension1', 'extension2']);
-
-pgm.createTable('table', { column1: { type: 'int4' } });
-pgm.dropTable('table');
-pgm.renameTable('table', 'tablenew');
-
-pgm.addColumn('table', { column1: { type: 'int4' } });
-pgm.addColumns('table', { column1: { type: 'int4' } });
-pgm.dropColumn('table', ['column1', 'column2']);
-pgm.dropColumns('table', ['column1', 'column2']);
-pgm.renameColumn('table', 'old_column_name', 'new_column_name');
-pgm.alterColumn('table', 'column1', {});
-
-pgm.addConstraint('table', 'table_constraint', 'column1 is not null');
-pgm.createConstraint('table', 'table_constraint', 'column1 is not null');
-pgm.dropConstraint('table', 'table_constraint');
-
-pgm.addType('composite_type', ['enum1', 'enum2']);
-pgm.createType('composite_type', { field1: 'int', field2: 'int' });
-pgm.dropType('composite_type');
-
-pgm.createIndex('table', 'column1');
-pgm.createIndex('table', ['column1', 'column2']);
-pgm.dropIndex('table', 'column1');
-pgm.dropIndex('table', ['column1', 'column2']);
-pgm.addIndex('table', 'column1');
-pgm.addIndex('table', ['column1', 'column2']);
-
-pgm.sql(`select 1;`);
-pgm.sql(`select 1;`, { one: '1' });
-pgm.func('now()');
-
-// Elaborate example
-pgm.addColumn({ schema: 'schema', name: 'table' }, {
-    column1: {
-        type: 'int4',
-        unique: true,
-        primaryKey: true,
-        notNull: true,
-        check: '',
-        references: '',
-        onDelete: '',
-        onUpdate: '',
-    }
-});
-
-pgm.noTransaction();
diff --git a/types/node-pg-migrate/tsconfig.json b/types/node-pg-migrate/tsconfig.json
deleted file mode 100644
index 952cddcfc7..0000000000
--- a/types/node-pg-migrate/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "node-pg-migrate-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/node-pg-migrate/tslint.json b/types/node-pg-migrate/tslint.json
deleted file mode 100644
index 1061428d6e..0000000000
--- a/types/node-pg-migrate/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-object-literal-type-assertion": false
-    }
-}
diff --git a/types/node-polyglot/tslint.json b/types/node-polyglot/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-polyglot/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-powershell/tslint.json b/types/node-powershell/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-powershell/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-ral/index.d.ts b/types/node-ral/index.d.ts
index 27bad13293..5714de2bb8 100644
--- a/types/node-ral/index.d.ts
+++ b/types/node-ral/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/fex-team/node-ral
 // Definitions by: ssddi456 <https://github.com/ssddi456>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { EventEmitter } from 'events';
 import { Request, Response, NextFunction } from "express";
diff --git a/types/node-red/index.d.ts b/types/node-red/index.d.ts
index 8b19d451e0..8a013128c8 100644
--- a/types/node-red/index.d.ts
+++ b/types/node-red/index.d.ts
@@ -169,7 +169,13 @@ export interface Nodes {
      * @return - the node matching the given id.
      */
     getNode(id: NodeId): Node;
-    eachNode(callback: (node: Node) => any): void;
+    /**
+     * Cycle through all node definition objects.
+     *
+     * To get the actual node, use getNode() with the id
+     * from the definition object.
+     */
+    eachNode(callback: (node: NodeProperties) => any): void;
     /**
      * Adds a set of credentials for the given node id.
      * @param id the node id for the credentials
diff --git a/types/node-red/node-red-tests.ts b/types/node-red/node-red-tests.ts
index 94031db2fb..d293cc4e3a 100644
--- a/types/node-red/node-red-tests.ts
+++ b/types/node-red/node-red-tests.ts
@@ -14,6 +14,9 @@ export = (RED: nodered.Red) => {
     RED.nodes.registerType('my-fantastic-node', function(this: MyFantasticNode, props: MyFantasticProps) {
         RED.nodes.createNode(this, props);
         const config = RED.nodes.getNode(props.config);
+        RED.nodes.eachNode(node => {
+            RED.nodes.getNode(node.id);
+        });
         this.log('Something fantastic happened.');
         this.warn('Something exceptional happened.');
         this.error('Something disastrous happened when I tried to process this.', { payload: 'Cookies' });
diff --git a/types/node-rsa/index.d.ts b/types/node-rsa/index.d.ts
index faafdf7d24..63d569378d 100644
--- a/types/node-rsa/index.d.ts
+++ b/types/node-rsa/index.d.ts
@@ -122,7 +122,7 @@ declare namespace NodeRSA {
 
     type Encoding =
         | 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'latin1'
-        | 'base64' | 'hex' | 'binary';
+        | 'base64' | 'hex' | 'binary' | 'buffer';
 
     interface KeyComponents {
         n: Buffer;
diff --git a/types/node-sass-middleware/index.d.ts b/types/node-sass-middleware/index.d.ts
index 51be3992f1..badbd843d1 100644
--- a/types/node-sass-middleware/index.d.ts
+++ b/types/node-sass-middleware/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sass/node-sass-middleware
 // Definitions by: Pascal Garber <http://www.jumplink.eu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
diff --git a/types/node-sass-middleware/tslint.json b/types/node-sass-middleware/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-sass-middleware/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-sass/tslint.json b/types/node-sass/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-sass/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-schedule/index.d.ts b/types/node-schedule/index.d.ts
index 5dbd4335e6..e7da166aab 100644
--- a/types/node-schedule/index.d.ts
+++ b/types/node-schedule/index.d.ts
@@ -7,211 +7,119 @@
 
 import { EventEmitter } from 'events';
 
-/**
- * The callback executed by a Job
- */
-export type JobCallback = () => void;
+/** The callback executed by a Job */
+export type JobCallback = (fireDate: Date) => void;
 
-/**
- * Scheduler jobs.
- *
- * @class
- */
+/** Scheduler jobs. */
 export class Job extends EventEmitter {
-    /**
-     * This Job's name. read-only.
-     */
-        name: string;
+    readonly name: string;
 
     /**
      * Use the function scheduleJob() to create new Job objects.
      *
-     * @constructor
      * @internal
-     * @param {string|JobCallback}   name     either an optional name for this Job or this Job's callback
-     * @param {JobCallback|Function} job      either this Job's callback or an optional callback function
-     * @param {Function}             callback optional callback that is executed right before the JobCallback
+     * @param name     either an optional name for this Job or this Job's callback
+     * @param job      either this Job's callback or an optional callback function
+     * @param callback optional callback that is executed right before the JobCallback
      */
-        constructor(name: string|JobCallback, job?: JobCallback|(() => void), callback?: () => void);
+    constructor(name: string|JobCallback, job?: JobCallback|(() => void), callback?: () => void);
 
     /**
      * Adds an Invocation to this job. For internal use.
      * @internal
-     * @param {Invocation} invocation
-     * @return {boolean} whether the invocation could be added
+     * @return whether the invocation could be added
      */
-        trackInvocation(invocation: Invocation): boolean;
+    trackInvocation(invocation: Invocation): boolean;
 
     /**
      * removes an Invocation from this Job's tracking list. For internal use.
      * @internal
-     * @param {Invocation} invocation
      * @return boolean whether the invocation was successful. Removing an Invocation that doesn't exist, returns false.
      */
-        stopTrackingInvocation(invocation: Invocation): boolean;
+    stopTrackingInvocation(invocation: Invocation): boolean;
 
     /**
      * @internal
-     * @return {number} the number of currently running instances of this Job.
+     * @return the number of currently running instances of this Job.
      */
-        triggeredJobs(): number;
+    triggeredJobs(): number;
 
     /**
      * set the number of currently running Jobs.
      * @internal
-     * @param {number} triggeredJobs
      */
-        setTriggeredJobs(triggeredJobs: number): void;
+    setTriggeredJobs(triggeredJobs: number): void;
 
     /**
      * cancel all pending Invocations of this Job.
-     * @param {boolean} reschedule whether to reschedule the canceled Invocations.
+     * @param reschedule whether to reschedule the canceled Invocations.
      */
-        cancel(reschedule?: boolean): boolean;
+    cancel(reschedule?: boolean): boolean;
 
     /**
      * cancel the next Invocation of this Job.
-     * @param {boolean} reschedule whether to reschedule the canceled Invocation.
-     * @return {boolean} whether cancelation was successful
+     * @param reschedule whether to reschedule the canceled Invocation.
+     * @return whether cancelation was successful
      */
-        cancelNext(reschedule?: boolean): boolean;
+    cancelNext(reschedule?: boolean): boolean;
 
     /**
      * Changes the scheduling information for this Job.
-     * @param {RecurrenceRule|string|number} spec
-     * @return {boolean} whether the reschedule was successful
+     * @return whether the reschedule was successful
      */
-        reschedule(spec: RecurrenceRule|string|number): boolean;
+    reschedule(spec: RecurrenceRule|string|number): boolean;
 
-    /**
-     * Returns the Date on which this Job will be run next.
-     * @return {Date}
-     */
-        nextInvocation(): Date;
+    /** The Date on which this Job will be run next. */
+    nextInvocation(): Date;
 
-    /**
-     * @return Invocation[] a list of all pending Invocations
-     */
-        pendingInvocations(): Invocation[];
+    /** A list of all pending Invocations */
+    pendingInvocations(): Invocation[];
 
     /**
      * run this Job immediately.
      */
-        invoke(): void;
+    invoke(): void;
 
-    /**
-     * schedule this Job to be run on the specified date.
-     * @param date {Date}
-     */
-        runOnDate(date: Date): void;
+    /** schedule this Job to be run on the specified date. */
+    runOnDate(date: Date): void;
 
-    /**
-     * set scheduling information
-     * @param {Date|string|number} date
-     * @public
-     */
-        schedule(date: Date|string|number): boolean;
+    /** set scheduling information */
+    schedule(date: Date|string|number): boolean;
 }
 
-/**
- * Range.
- *
- * @class
- */
 export class Range {
-    /**
-     * Constructor.
-     *
-     * @constructor
-     * @param {number} start The start.
-     * @param {number} end   The end.
-     * @param {number} step  The step.
-     */
     constructor(start?: number, end?: number, step?: number);
 
-    /**
-     * Return a {boolean} if the class contains the specified value.
-     *
-     * @param {number} value The value.
-     * @returns {boolean} {true} if the class contains the specified value, otherwise, {false}.
-     */
+    /** Whether the class contains the specified value. */
     contains(value: number): boolean;
 }
 
 export type Recurrence = number | Range | string;
 export type RecurrenceSegment = Recurrence | Recurrence[];
 
-/**
- * Recurrence rules.
- */
 export class RecurrenceRule {
     /**
      * Day of the month.
-     *
-     * @public
-     * @type {RecurrenceSegment}
      */
-        date: RecurrenceSegment;
+    date: RecurrenceSegment;
+    dayOfWeek: RecurrenceSegment;
+    hour: RecurrenceSegment;
+    minute: RecurrenceSegment;
+    month: RecurrenceSegment;
+    second: RecurrenceSegment;
+    year: RecurrenceSegment;
 
-    /**
-     * Day of the week.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
-        dayOfWeek: RecurrenceSegment;
+    constructor(
+        year?: RecurrenceSegment,
+        month?: RecurrenceSegment,
+        date?: RecurrenceSegment,
+        dayOfWeek?: RecurrenceSegment,
+        hour?: RecurrenceSegment,
+        minute?: RecurrenceSegment,
+        second?: RecurrenceSegment
+    );
 
-    /**
-     * Hour.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
-        hour: RecurrenceSegment;
-
-    /**
-     * Minute.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
-        minute: RecurrenceSegment;
-
-    /**
-     * Month.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
-        month: RecurrenceSegment;
-
-    /**
-     * Second.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
-        second: RecurrenceSegment;
-
-    /**
-     * Year.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
-        year: RecurrenceSegment;
-
-        constructor(
-            year?: RecurrenceSegment,
-            month?: RecurrenceSegment,
-            date?: RecurrenceSegment,
-            dayOfWeek?: RecurrenceSegment,
-            hour?: RecurrenceSegment,
-            minute?: RecurrenceSegment,
-            second?: RecurrenceSegment
-        );
-
-        nextInvocationDate(base: Date): Date;
+    nextInvocationDate(base: Date): Date;
 }
 
 /**
@@ -220,23 +128,14 @@ export class RecurrenceRule {
 export interface RecurrenceSpecDateRange {
     /**
      * Starting date in date range.
-     *
-     * @public
-     * @type {Date|string|number}
      */
     start: Date | string | number;
     /**
      * Ending date in date range.
-     *
-     * @public
-     * @type {Date|string|number}
      */
     end: Date | string | number;
     /**
      * Cron expression string.
-     *
-     * @public
-     * @type {string}
      */
     rule: string;
 }
@@ -247,145 +146,55 @@ export interface RecurrenceSpecDateRange {
 export interface RecurrenceSpecObjLit {
     /**
      * Day of the month.
-     *
-     * @public
-     * @type {RecurrenceSegment}
      */
     date?: RecurrenceSegment;
-
-    /**
-     * Day of the week.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
     dayOfWeek?: RecurrenceSegment;
-
-    /**
-     * Hour.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
     hour?: RecurrenceSegment;
-
-    /**
-     * Minute.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
     minute?: RecurrenceSegment;
-
-    /**
-     * Month.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
     month?: RecurrenceSegment;
-
-    /**
-     * Second.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
     second?: RecurrenceSegment;
-
-    /**
-     * Year.
-     *
-     * @public
-     * @type {RecurrenceSegment}
-     */
     year?: RecurrenceSegment;
 }
 
-/**
- * Invocation.
- *
- * @class
- */
 export class Invocation {
-    /**
-     * Fire date.
-     *
-     * @public
-     * @type {Date}
-     */
     fireDate: Date;
-
-    /**
-     * Job.
-     *
-     * @public
-     * @type {Job}
-     */
     job: Job;
-
-    /**
-     * Recurrence rule.
-     *
-     * @public
-     * @type {RecurrenceRule}
-     */
     recurrenceRule: RecurrenceRule;
-
-    /**
-     * Timer identifier.
-     *
-     * @public
-     * @type {number}
-     */
     timerID: number;
-
-    /**
-     * Constructor.
-     *
-     * @constructor
-     * @param {Job}             job             The job.
-     * @param {Date}            fireDate        The fire date.
-     * @param {RecurrenceRule}  recurrenceRule  The recurrence rule.
-     */
     constructor(job: Job, fireDate: Date, recurrenceRule: RecurrenceRule);
 }
 
 /**
  * Create a schedule job.
  *
- * @param {string}                                    name     name for the new Job
- * @param {RecurrenceRule|RecurrenceSpecDateRange|RecurrenceSpecObjLit|Date|string} rule     scheduling info
- * @param {JobCallback}                               callback callback to be executed on each invocation
+ * @param name     name for the new Job
+ * @param rule     scheduling info
+ * @param callback callback to be executed on each invocation
  */
 export function scheduleJob(name: string, rule: RecurrenceRule | RecurrenceSpecDateRange | RecurrenceSpecObjLit | Date | string, callback: JobCallback): Job;
 
 /**
  * Create a schedule job.
  *
- * @param {RecurrenceRule|RecurrenceSpecDateRange|RecurrenceSpecObjLit|Date|string} rule     scheduling info
- * @param {JobCallback}                               callback callback to be executed on each invocation
+ * @param rule     scheduling info
+ * @param callback callback to be executed on each invocation
  */
 export function scheduleJob(rule: RecurrenceRule | RecurrenceSpecDateRange | RecurrenceSpecObjLit | Date | string, callback: JobCallback): Job;
 
 /**
  * Changes the timing of a Job, canceling all pending invocations.
  *
- * @param {Job|string} job
- * @param {RecurrenceRule|RecurrenceSpecDateRange|RecurrenceSpecObjLit|Date|string} spec The new timing for this Job.
- * @return {Job} if the job could be rescheduled, {null} otherwise.
+ * @param spec The new timing for this Job.
+ * @return if the job could be rescheduled, {null} otherwise.
  */
 export function rescheduleJob(job: Job | string, spec: RecurrenceRule | RecurrenceSpecDateRange | RecurrenceSpecObjLit | Date | string): Job;
 
-/**
- * Dictionary of all Jobs, accessible by name.
- */
+/** Dictionary of all Jobs, accessible by name. */
 export let scheduledJobs: {[jobName: string]: Job};
 
 /**
  * Cancels the job.
  *
- * @param {Job} job The job.
- * @returns {boolean} {true} if the job has been cancelled with success, otherwise, {false}.
+ * @returns Whether the job has been cancelled with success.
  */
 export function cancelJob(job: Job|string): boolean;
diff --git a/types/node-slack/index.d.ts b/types/node-slack/index.d.ts
index e4d8616c16..d81926f633 100644
--- a/types/node-slack/index.d.ts
+++ b/types/node-slack/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/xoxco/node-slack
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 import request = require('request');
diff --git a/types/node-slack/tslint.json b/types/node-slack/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-slack/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-snap7/tslint.json b/types/node-snap7/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-snap7/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-sprite-generator/index.d.ts b/types/node-sprite-generator/index.d.ts
index 6bd2b88973..05bad5fe8e 100644
--- a/types/node-sprite-generator/index.d.ts
+++ b/types/node-sprite-generator/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/selaux/node-sprite-generator#readme
 // Definitions by: Gyusun Yeom <https://github.com/Perlmint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as e from "express";
 
diff --git a/types/node-static/index.d.ts b/types/node-static/index.d.ts
index 23e5ba1f87..53b1f4cb07 100644
--- a/types/node-static/index.d.ts
+++ b/types/node-static/index.d.ts
@@ -42,7 +42,7 @@ export class Server {
 	finish: (status: number, headers: Headers, req: http.ServerRequest, res: http.ServerResponse, promise: events.EventEmitter, callback: Callback) => void;
 	servePath: (pathname: string, status: number, headers: Headers, req: http.ServerRequest, res: http.ServerResponse, finish: Finish) => events.EventEmitter;
 	resolve: (pathname: string) => string;
-	serve: (req: http.ServerRequest, res: http.ServerResponse, callback: Callback) => events.EventEmitter;
+	serve: (req: http.ServerRequest, res: http.ServerResponse, callback?: Callback) => events.EventEmitter;
 	gzipOk: (req: http.ServerRequest, contentType: string) => boolean;
 	respondGzip: (pathname: string, status: number, contentType: string, _headers: Headers, files: string[], stat: fs.Stats, req: http.ServerRequest, res: http.ServerResponse, finish: Finish) => void;
 	parseByteRange: (req: http.ServerRequest, stat: fs.Stats) => ByteRange;
diff --git a/types/node-statsd/index.d.ts b/types/node-statsd/index.d.ts
index 25c1adf47a..116f3a99a0 100644
--- a/types/node-statsd/index.d.ts
+++ b/types/node-statsd/index.d.ts
@@ -34,8 +34,6 @@ export class StatsD {
    *   @option cacheDns    {boolean} An optional option to only lookup the hostname -> ip address once
    *   @option mock        {boolean} An optional boolean indicating this Client is a mock object, no stats are sent.
    *   @option {string[]} global_tags Optional tags that will be added to every metric
-   * @param {StatsDConfig} options
-   * @constructor
    */
   constructor(config: StatsDConfig);
   constructor(
@@ -66,11 +64,11 @@ export class StatsD {
 
   /**
    * Decrements a stat by a specified amount
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {number} value The value to send
-   * @param {number} sampleRate The Number of times to sample (0 to 1). Optional.
-   * @param {string[]} tags The Array of tags to add to metrics. Optional.
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param value The value to send
+   * @param sampleRate The Number of times to sample (0 to 1). Optional.
+   * @param tags The Array of tags to add to metrics. Optional.
+   * @param callback Callback when message is done being delivered. Optional.
    */
   decrement(stat: string | string[], value?: number, sampleRate?: number, tags?: string[], callback?: Callback): void;
   decrement(stat: string | string[], value?: number, sampleRateOrTags?: number | string[], callback?: Callback): void;
@@ -78,11 +76,11 @@ export class StatsD {
 
   /**
    * Gauges a stat by a specified amount
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {number} value The value to send
-   * @param {number} sampleRate The Number of times to sample (0 to 1). Optional.
-   * @param {string[]} tags The Array of tags to add to metrics. Optional.
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param value The value to send
+   * @param sampleRate The Number of times to sample (0 to 1). Optional.
+   * @param tags The Array of tags to add to metrics. Optional.
+   * @param callback Callback when message is done being delivered. Optional.
    */
   gauge(stat: string | string[], value: number, sampleRate?: number, tags?: string[], callback?: Callback): void;
   gauge(stat: string | string[], value: number, sampleRateOrTags?: number | string [], callback?: Callback): void;
@@ -90,11 +88,11 @@ export class StatsD {
 
   /**
    * Represents the histogram stat
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {any} value The value to send
-   * @param {number} sampleRate The Number of times to sample (0 to 1). Optional.
-   * @param {string[]} tags The Array of tags to add to metrics. Optional.
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param value The value to send
+   * @param sampleRate The Number of times to sample (0 to 1). Optional.
+   * @param tags The Array of tags to add to metrics. Optional.
+   * @param callback Callback when message is done being delivered. Optional.
    */
   histogram(stat: string | string[], value: any, sampleRate?: number, tags?: string[], callback?: Callback): void;
   histogram(stat: string | string[], value: any, sampleRateOrTags?: number | string [], callback?: Callback): void;
@@ -102,11 +100,11 @@ export class StatsD {
 
   /**
    * Increments a stat by a specified amount
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {any} value The value to send
-   * @param {number} sampleRate The Number of times to sample (0 to 1). Optional.
-   * @param {string[]} tags The Array of tags to add to metrics. Optional.
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param value The value to send
+   * @param sampleRate The Number of times to sample (0 to 1). Optional.
+   * @param tags The Array of tags to add to metrics. Optional.
+   * @param callback Callback when message is done being delivered. Optional.
    */
   increment(stat: string | string[], value?: number, sampleRate?: number, tags?: string[], callback?: Callback): void;
   increment(stat: string | string[], value: any, sampleRateOrTags?: number | string [], callback?: Callback): void;
@@ -114,12 +112,12 @@ export class StatsD {
 
   /**
    * Sends a stat across the wire
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {any} value The value to send
-   * @param {string} type The type of message to send to statsd
-   * @param {number} sampleRate The Number of times to sample (0 to 1)
-   * @param {string[]} tags The Array of tags to add to metrics
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param value The value to send
+   * @param type The type of message to send to statsd
+   * @param sampleRate The Number of times to sample (0 to 1)
+   * @param tags The Array of tags to add to metrics
+   * @param callback Callback when message is done being delivered. Optional.
    */
   send(stat: string | string[], value: any, type: string, sampleRate?: number, tags?: string[], callback?: Callback): void;
   send(stat: string | string[], value: any, type: string, sampleRateOrTags?: number | string [], callback?: Callback): void;
@@ -127,12 +125,12 @@ export class StatsD {
 
   /**
    * Checks if stats is an array and sends all stats calling back once all have sent
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {any} value The value to send
-   * @param {string} type The type of metric to send
-   * @param {number} sampleRate The Number of times to sample (0 to 1). Optional.
-   * @param {string[]} tags The Array of tags to add to metrics. Optional.
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param value The value to send
+   * @param type The type of metric to send
+   * @param sampleRate The Number of times to sample (0 to 1). Optional.
+   * @param tags The Array of tags to add to metrics. Optional.
+   * @param callback Callback when message is done being delivered. Optional.
    */
   sendAll(stat: string | string[], value: any, type: string, sampleRate?: number, tags?: string[], callback?: Callback): void;
   sendAll(stat: string | string[], value: any, type: string, sampleRateOrTags?: number | string [], callback?: Callback): void;
@@ -147,11 +145,11 @@ export class StatsD {
 
   /**
    * Represents the timing stat
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {number} time The time in milliseconds to send
-   * @param {number} sampleRate The Number of times to sample (0 to 1). Optional.
-   * @param {string[]} tags The Array of tags to add to metrics. Optional.
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param time The time in milliseconds to send
+   * @param sampleRate The Number of times to sample (0 to 1). Optional.
+   * @param tags The Array of tags to add to metrics. Optional.
+   * @param callback Callback when message is done being delivered. Optional.
    */
   timing(stat: string | string[], time: number, sampleRate?: number, tags?: string[], callback?: Callback): void;
   timing(stat: string | string[], time: number, sampleRateOrTags?: number | string [], callback?: Callback): void;
@@ -159,11 +157,11 @@ export class StatsD {
 
   /**
    * Counts unique values by a specified amount
-   * @param {string|string[]} stat The stat(s) to send
-   * @param {any} value The value to send
-   * @param {number} sampleRate The Number of times to sample (0 to 1). Optional.
-   * @param {string[]} tags The Array of tags to add to metrics. Optional.
-   * @param {Callback} callback Callback when message is done being delivered. Optional.
+   * @param stat The stat(s) to send
+   * @param value The value to send
+   * @param sampleRate The Number of times to sample (0 to 1). Optional.
+   * @param tags The Array of tags to add to metrics. Optional.
+   * @param callback Callback when message is done being delivered. Optional.
    */
   unique(stat: string | string[], value: any, sampleRate?: number, tags?: string[], callback?: Callback): void;
   unique(stat: string | string[], value: any, sampleRateOrTags?: number | string [], callback?: Callback): void;
diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
index 4e33b64253..cfc55d2d33 100644
--- a/types/node-telegram-bot-api/index.d.ts
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -4,7 +4,8 @@
 //                 Agadar <https://github.com/agadar>
 //                 Giorgio Garasto <https://github.com/Dabolus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
+
 /// <reference types="node" />
 
 import { EventEmitter } from 'events';
diff --git a/types/node-uuid/tslint.json b/types/node-uuid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-uuid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-validator/tslint.json b/types/node-validator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node-validator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/node-vault/index.d.ts b/types/node-vault/index.d.ts
index 939da2bd2a..653db37e85 100644
--- a/types/node-vault/index.d.ts
+++ b/types/node-vault/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kr1sp1n/node-vault
 // Definitions by: Jianrong Yu <https://github.com/YuJianrong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as mustache from "mustache";
 import * as request from "request";
diff --git a/types/node-waves/index.d.ts b/types/node-waves/index.d.ts
index b4f3f946ef..fd2cb4937c 100644
--- a/types/node-waves/index.d.ts
+++ b/types/node-waves/index.d.ts
@@ -46,21 +46,21 @@ export function init(config?: WavesConfig): void;
  * Attach ripple effect by adding `.waves-effect` to HTML element.
  * Make sure you call `init` to activate the ripple.
  *
- * @param {ElementTarget} elements elements to target.
- * @param {(string | string[])} [classes] classes to add.
+ * @param elements elements to target.
+ * @param classes classes to add.
  */
 export function attach(elements: ElementTarget, classes?: string | string[]): void;
 
 /**
  * Creates a ripple effect in HTML element programmatically.
- * @param {ElementTarget} elements elements to target (must have `.waves-effect` already applied, ideally via `attach`).
- * @param {RippleOptions} [options] specify how long to wait between starting and stopping the ripple, and it's position inside the element.
+ * @param elements elements to target (must have `.waves-effect` already applied, ideally via `attach`).
+ * @param options specify how long to wait between starting and stopping the ripple, and it's position inside the element.
  */
 export function ripple(elements: ElementTarget, options?: RippleOptions): void;
 
 /**
  * Removes all ripples from inside an element immediately.
  *
- * @param {ElementTarget} elements elements to remove ripples from.
+ * @param elements elements to remove ripples from.
  */
 export function calm(elements: ElementTarget): void;
diff --git a/types/node-wit/tslint.json b/types/node-wit/tslint.json
index 3db14f85ea..d5ed3f0240 100644
--- a/types/node-wit/tslint.json
+++ b/types/node-wit/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODOs
+		"no-unnecessary-class": false
+	}
+}
diff --git a/types/node-xmpp-core/index.d.ts b/types/node-xmpp-core/index.d.ts
index 20937aae98..79d742cfd0 100644
--- a/types/node-xmpp-core/index.d.ts
+++ b/types/node-xmpp-core/index.d.ts
@@ -35,9 +35,8 @@ export class Stanza extends Element {
  * https://facebook.github.io/jsx/
  * Returns a Stanza if name is presence, message or iq an ltx Element otherwise.
  *
- * @param  {string} name  name of the element
- * @param  {any} attrs attribute key/value pairs
- * @return {Element}      Stanza or Element
+ * @param name  name of the element
+ * @param attrs attribute key/value pairs
  */
 export function createStanza(name: string, attrs?: any): Element;
 
diff --git a/types/node-zookeeper-client/index.d.ts b/types/node-zookeeper-client/index.d.ts
index 8a63177f83..1dcc8eca2a 100644
--- a/types/node-zookeeper-client/index.d.ts
+++ b/types/node-zookeeper-client/index.d.ts
@@ -171,8 +171,14 @@ export class Exception {
 
     code: number;
     name: string;
-    path: number;
-    constructor(code: number, name: string, path: number);
+    path?: string;
+
+    // tslint:disable-next-line ban-types
+    constructor(code: number, name: string, path: string, ctor: Function);
+
+    // tslint:disable-next-line ban-types
+    constructor(code: number, name: string, ctor: Function);
+
     toString(): string;
     getCode(): number;
     getName(): string;
diff --git a/types/node-zookeeper-client/node-zookeeper-client-tests.ts b/types/node-zookeeper-client/node-zookeeper-client-tests.ts
index 90f19642cc..ec8727ae4e 100644
--- a/types/node-zookeeper-client/node-zookeeper-client-tests.ts
+++ b/types/node-zookeeper-client/node-zookeeper-client-tests.ts
@@ -255,3 +255,8 @@ const client = zookeeper.createClient(
 {
     new zookeeper.Event(zookeeper.Event.NODE_CREATED, 'test', '/test');
 }
+
+{
+    new zookeeper.Exception(zookeeper.Exception.NO_NODE, 'test', zookeeper.Exception);
+    new zookeeper.Exception(zookeeper.Exception.NO_NODE, 'test', '/test', zookeeper.Exception);
+}
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index ee1511b99d..8f4e6cf636 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 8.x
+// Type definitions for Node.js 9.3.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
@@ -10,18 +10,15 @@
 //                 Flarna <https://github.com/Flarna>
 //                 Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
 //                 wwwy3y3 <https://github.com/wwwy3y3>
-//                 Daniel Imms <https://github.com/Tyriar>
 //                 Deividas Bakanas <https://github.com/DeividasBakanas>
 //                 Kelvin Jin <https://github.com/kjin>
 //                 Alvis HT Tang <https://github.com/alvis>
+//                 Oliver Joseph Ash <https://github.com/OliverJAsh>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+//                 Klaus Meinhardt <https://github.com/ajafff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-/************************************************
-*                                               *
-*               Node.js v8.x API                *
-*                                               *
-************************************************/
 
 /** inspector module types */
 /// <reference path="./inspector.d.ts" />
@@ -31,6 +28,7 @@ interface Console {
     Console: NodeJS.ConsoleConstructor;
     assert(value: any, message?: string, ...optionalParams: any[]): void;
     dir(obj: any, options?: NodeJS.InspectOptions): void;
+    debug(message?: any, ...optionalParams: any[]): void;
     error(message?: any, ...optionalParams: any[]): void;
     info(message?: any, ...optionalParams: any[]): void;
     log(message?: any, ...optionalParams: any[]): void;
@@ -44,8 +42,18 @@ interface Error {
     stack?: string;
 }
 
+// Declare "static" methods in Error
 interface ErrorConstructor {
+    /** Create .stack property on a target object */
     captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
     stackTraceLimit: number;
 }
 
@@ -68,6 +76,14 @@ interface SymbolConstructor {
 }
 declare var Symbol: SymbolConstructor;
 
+// Node.js ESNEXT support
+interface String {
+    /** Removes whitespace from the left end of a string. */
+    trimLeft(): string;
+    /** Removes whitespace from the right end of a string. */
+    trimRight(): string;
+}
+
 /************************************************
 *                                               *
 *                   GLOBAL                      *
@@ -96,8 +112,8 @@ declare namespace setImmediate {
 declare function clearImmediate(immediateId: any): void;
 
 // TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
-/* tslint:disable:callable-types */
 interface NodeRequireFunction {
+/* tslint:disable-next-line:callable-types */
     (id: string): any;
 }
 
@@ -109,10 +125,10 @@ interface NodeRequire extends NodeRequireFunction {
 }
 
 interface NodeExtensions {
-  '.js': (m: NodeModule, filename: string) => any;
-  '.json': (m: NodeModule, filename: string) => any;
-  '.node': (m: NodeModule, filename: string) => any;
-  [ext: string]: (m: NodeModule, filename: string) => any;
+    '.js': (m: NodeModule, filename: string) => any;
+    '.json': (m: NodeModule, filename: string) => any;
+    '.node': (m: NodeModule, filename: string) => any;
+    [ext: string]: (m: NodeModule, filename: string) => any;
 }
 
 declare var require: NodeRequire;
@@ -125,6 +141,7 @@ interface NodeModule {
     loaded: boolean;
     parent: NodeModule | null;
     children: NodeModule[];
+    paths: string[];
 }
 
 declare var module: NodeModule;
@@ -194,8 +211,6 @@ declare var Buffer: {
     prototype: Buffer;
     /**
      * Allocates a new Buffer using an {array} of octets.
-     *
-     * @param array
      */
     from(array: any[]): Buffer;
     /**
@@ -205,22 +220,16 @@ declare var Buffer: {
      * within the {arrayBuffer} that will be shared by the Buffer.
      *
      * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
-     * @param byteOffset
-     * @param length
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
      * Copies the passed {buffer} data onto a new Buffer instance.
-     *
-     * @param buffer
      */
     from(buffer: Buffer): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
      * If not provided, {encoding} defaults to 'utf8'.
-     *
-     * @param str
      */
     from(str: string, encoding?: string): Buffer;
     /**
@@ -240,10 +249,10 @@ declare var Buffer: {
      * Gives the actual byte length of a string. encoding defaults to 'utf8'.
      * This is not the same as String.prototype.length since that returns the number of characters in a string.
      *
-     * @param string string to test.
+     * @param string string to test. (TypedArray is also allowed, but it is only available starting ES2017)
      * @param encoding encoding used to evaluate (defaults to 'utf8')
      */
-    byteLength(string: string, encoding?: string): number;
+    byteLength(string: string | Buffer | DataView | ArrayBuffer, encoding?: string): number;
     /**
      * Returns a buffer which is the result of concatenating all the buffers in the list together.
      *
@@ -283,6 +292,10 @@ declare var Buffer: {
      * @param size count of octets to allocate
      */
     allocUnsafeSlow(size: number): Buffer;
+    /**
+     * This is the number of bytes used to determine the size of pre-allocated, internal Buffer instances used for pooling. This value may be modified.
+     */
+    poolSize: number;
 };
 
 /************************************************
@@ -306,6 +319,80 @@ declare namespace NodeJS {
         new(stdout: WritableStream, stderr?: WritableStream): Console;
     }
 
+    export interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
+
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
+
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
+
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
+
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
+
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
+
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
+
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
+
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
+
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
+
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
+
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
+
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
+
     export interface ErrnoException extends Error {
         errno?: number;
         code?: string;
@@ -342,14 +429,14 @@ declare namespace NodeJS {
         unpipe<T extends WritableStream>(destination?: T): this;
         unshift(chunk: string): void;
         unshift(chunk: Buffer): void;
-        wrap(oldStream: ReadableStream): ReadableStream;
+        wrap(oldStream: ReadableStream): this;
     }
 
     export interface WritableStream extends EventEmitter {
         writable: boolean;
         write(buffer: Buffer | string, cb?: Function): boolean;
         write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
+        end(cb?: Function): void;
         end(buffer: Buffer, cb?: Function): void;
         end(str: string, cb?: Function): void;
         end(str: string, encoding?: string, cb?: Function): void;
@@ -365,7 +452,6 @@ declare namespace NodeJS {
         remove(emitter: Events): void;
         bind(cb: (err: Error, data: any) => any): any;
         intercept(cb: (data: any) => any): any;
-        dispose(): void;
 
         addListener(event: string, listener: (...args: any[]) => void): this;
         on(event: string, listener: (...args: any[]) => void): this;
@@ -420,7 +506,7 @@ declare namespace NodeJS {
     type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
     type WarningListener = (warning: Error) => void;
     type MessageListener = (message: any, sendHandle: any) => void;
-    type SignalsListener = () => void;
+    type SignalsListener = (signal: Signals) => void;
     type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
     type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
 
@@ -433,12 +519,25 @@ declare namespace NodeJS {
     }
 
     export interface WriteStream extends Socket {
+        readonly writableHighWaterMark: number;
         columns?: number;
         rows?: number;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        _destroy(err: Error, callback: Function): void;
+        _final(callback: Function): void;
+        setDefaultEncoding(encoding: string): this;
+        cork(): void;
+        uncork(): void;
+        destroy(error?: Error): void;
     }
     export interface ReadStream extends Socket {
+        readonly readableHighWaterMark: number;
         isRaw?: boolean;
         setRawMode?(mode: boolean): void;
+        _read(size: number): void;
+        _destroy(err: Error, callback: Function): void;
+        push(chunk: any, encoding?: string): boolean;
+        destroy(error?: Error): void;
     }
 
     export interface Process extends EventEmitter {
@@ -458,11 +557,17 @@ declare namespace NodeJS {
         exit(code?: number): never;
         exitCode: number;
         getgid(): number;
-        setgid(id: number): void;
-        setgid(id: string): void;
+        setgid(id: number | string): void;
         getuid(): number;
-        setuid(id: number): void;
-        setuid(id: string): void;
+        setuid(id: number | string): void;
+        geteuid(): number;
+        seteuid(id: number | string): void;
+        getegid(): number;
+        setegid(id: number | string): void;
+        getgroups(): number[];
+        setgroups(groups: Array<string | number>): void;
+        setUncaughtExceptionCaptureCallback(cb: ((err: Error) => void) | null): void;
+        hasUncaughtExceptionCaptureCallback(): boolean;
         version: string;
         versions: ProcessVersions;
         config: {
@@ -493,6 +598,7 @@ declare namespace NodeJS {
         };
         kill(pid: number, signal?: string | number): void;
         pid: number;
+        ppid: number;
         title: string;
         arch: string;
         platform: Platform;
@@ -683,6 +789,7 @@ declare namespace NodeJS {
     class Module {
         static runMain(): void;
         static wrap(code: string): string;
+        static builtinModules: string[];
 
         static Module: typeof Module;
 
@@ -782,8 +889,10 @@ declare module "querystring" {
         decodeURIComponent?: Function;
     }
 
+    interface ParsedUrlQuery { [key: string]: string | string[]; }
+
     export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
-    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): any;
+    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
     export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
     export function escape(str: string): string;
     export function unescape(str: string): string;
@@ -824,7 +933,47 @@ declare module "http" {
 
     // incoming headers will never contain number
     export interface IncomingHttpHeaders {
-        [header: string]: string | string[];
+        'accept'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-headers'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'date'?: string;
+        'expires'?: string;
+        'host'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'public-key-pins'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'tk'?: string;
+        'upgrade'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
     }
 
     // outgoing headers allows numbers (as they are converted internally to strings)
@@ -855,10 +1004,10 @@ declare module "http" {
     export class Server extends net.Server {
         constructor(requestListener?: (req: IncomingMessage, res: ServerResponse) => void);
 
-        setTimeout(msecs: number, callback: () => void): this;
+        setTimeout(msecs?: number, callback?: () => void): this;
+        setTimeout(callback: () => void): this;
         maxHeadersCount: number;
         timeout: number;
-        listening: boolean;
         keepAliveTimeout: number;
     }
     /**
@@ -1029,13 +1178,7 @@ declare module "cluster" {
         stdio?: any[];
         uid?: number;
         gid?: number;
-    }
-
-    export interface ClusterSetupMasterSettings {
-        exec?: string;  // default: process.argv[1]
-        args?: string[];  // default: process.argv.slice(2)
-        silent?: boolean;  // default: false
-        stdio?: any[];
+        inspectPort?: number | (() => number);
     }
 
     export interface Address {
@@ -1045,7 +1188,7 @@ declare module "cluster" {
     }
 
     export class Worker extends events.EventEmitter {
-        id: string;
+        id: number;
         process: child.ChildProcess;
         suicide: boolean;
         send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
@@ -1122,7 +1265,7 @@ declare module "cluster" {
         isWorker: boolean;
         // TODO: cluster.schedulingPolicy
         settings: ClusterSettings;
-        setupMaster(settings?: ClusterSetupMasterSettings): void;
+        setupMaster(settings?: ClusterSettings): void;
         worker?: Worker;
         workers?: {
             [index: string]: Worker | undefined
@@ -1199,7 +1342,7 @@ declare module "cluster" {
     export var isWorker: boolean;
     // TODO: cluster.schedulingPolicy
     export var settings: ClusterSettings;
-    export function setupMaster(settings?: ClusterSetupMasterSettings): void;
+    export function setupMaster(settings?: ClusterSettings): void;
     export var worker: Worker;
     export var workers: {
         [index: string]: Worker | undefined
@@ -1293,13 +1436,27 @@ declare module "zlib" {
         dictionary?: any; // deflate/inflate only, empty dictionary by default
     }
 
-    export interface Gzip extends stream.Transform { }
-    export interface Gunzip extends stream.Transform { }
-    export interface Deflate extends stream.Transform { }
-    export interface Inflate extends stream.Transform { }
-    export interface DeflateRaw extends stream.Transform { }
-    export interface InflateRaw extends stream.Transform { }
-    export interface Unzip extends stream.Transform { }
+    export interface Zlib {
+        readonly bytesRead: number;
+        close(callback?: () => void): void;
+        flush(kind?: number | (() => void), callback?: () => void): void;
+    }
+
+    export interface ZlibParams {
+        params(level: number, strategy: number, callback: () => void): void;
+    }
+
+    export interface ZlibReset {
+        reset(): void;
+    }
+
+    export interface Gzip extends stream.Transform, Zlib { }
+    export interface Gunzip extends stream.Transform, Zlib { }
+    export interface Deflate extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface Inflate extends stream.Transform, Zlib, ZlibReset { }
+    export interface DeflateRaw extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface InflateRaw extends stream.Transform, Zlib, ZlibReset { }
+    export interface Unzip extends stream.Transform, Zlib { }
 
     export function createGzip(options?: ZlibOptions): Gzip;
     export function createGunzip(options?: ZlibOptions): Gunzip;
@@ -1568,7 +1725,7 @@ declare module "os" {
     export function arch(): string;
     export function platform(): NodeJS.Platform;
     export function tmpdir(): string;
-    export var EOL: string;
+    export const EOL: string;
     export function endianness(): "BE" | "LE";
 }
 
@@ -1590,7 +1747,8 @@ declare module "https" {
         requestCert?: boolean;
         rejectUnauthorized?: boolean;
         NPNProtocols?: any;
-        SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: tls.SecureContext) => void) => void;
+        secureProtocol?: string;
     }
 
     export interface RequestOptions extends http.RequestOptions {
@@ -1602,35 +1760,28 @@ declare module "https" {
         ciphers?: string;
         rejectUnauthorized?: boolean;
         secureProtocol?: string;
+        servername?: string;
     }
 
-    export interface ClientRequest extends http.ClientRequest { }
-
-    export interface IncomingMessage extends http.IncomingMessage { }
-
-    export interface ServerResponse extends http.ServerResponse { }
-
-    export interface Agent extends http.Agent { }
-
-    export interface AgentOptions extends http.AgentOptions {
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any;
-        ciphers?: string;
+    export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
         rejectUnauthorized?: boolean;
-        secureProtocol?: string;
         maxCachedSessions?: number;
     }
 
-    export var Agent: {
-        new(options?: AgentOptions): Agent;
-    };
-    export interface Server extends tls.Server { }
-    export function createServer(options: ServerOptions, requestListener?: (req: IncomingMessage, res: ServerResponse) => void): Server;
-    export function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
-    export function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export class Agent extends http.Agent {
+        constructor(options?: AgentOptions);
+    }
+
+    export class Server extends tls.Server {
+        setTimeout(callback: () => void): this;
+        setTimeout(msecs?: number, callback?: () => void): this;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+
+    export function createServer(options: ServerOptions, requestListener?: (req: http.IncomingMessage, res: http.ServerResponse) => void): Server;
+    export function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
     export var globalAgent: Agent;
 }
 
@@ -1818,6 +1969,7 @@ declare module "readline" {
     export function createInterface(options: ReadLineOptions): ReadLine;
 
     export function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
+    export function emitKeypressEvents(stream: NodeJS.ReadableStream, interface?: ReadLine): void;
     export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
     export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
     export function clearScreenDown(stream: NodeJS.WritableStream): void;
@@ -1940,6 +2092,7 @@ declare module "child_process" {
         uid?: number;
         gid?: number;
         shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
     }
 
     export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
@@ -1999,6 +2152,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsVerbatimArguments?: boolean;
     }
     export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
         encoding: BufferEncoding;
@@ -2065,6 +2219,7 @@ declare module "child_process" {
         stdio?: any[];
         uid?: number;
         gid?: number;
+        windowsVerbatimArguments?: boolean;
     }
     export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
 
@@ -2080,6 +2235,7 @@ declare module "child_process" {
         maxBuffer?: number;
         encoding?: string;
         shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
     }
     export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
         encoding: BufferEncoding;
@@ -2156,37 +2312,48 @@ declare module "child_process" {
 }
 
 declare module "url" {
-    export interface Url {
+    import { ParsedUrlQuery } from 'querystring';
+
+    export interface UrlObjectCommon {
+        auth?: string;
+        hash?: string;
+        host?: string;
+        hostname?: string;
         href?: string;
-        protocol?: string;
-        auth?: string;
-        hostname?: string;
-        port?: string;
-        host?: string;
-        pathname?: string;
-        search?: string;
-        query?: string | any;
-        slashes?: boolean;
-        hash?: string;
         path?: string;
-    }
-
-    export interface UrlObject {
-        protocol?: string;
-        slashes?: boolean;
-        auth?: string;
-        host?: string;
-        hostname?: string;
-        port?: string | number;
         pathname?: string;
+        protocol?: string;
         search?: string;
-        query?: { [key: string]: any; };
-        hash?: string;
+        slashes?: boolean;
     }
 
-    export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
+    // Input to `url.format`
+    export interface UrlObject extends UrlObjectCommon {
+        port?: string | number;
+        query?: string | null | { [key: string]: any };
+    }
+
+    // Output of `url.parse`
+    export interface Url extends UrlObjectCommon {
+        port?: string;
+        query?: string | null | ParsedUrlQuery;
+    }
+
+    export interface UrlWithParsedQuery extends Url {
+        query: ParsedUrlQuery;
+    }
+
+    export interface UrlWithStringQuery extends Url {
+        query: string | null;
+    }
+
+    export function parse(urlStr: string): UrlWithStringQuery;
+    export function parse(urlStr: string, parseQueryString: false | undefined, slashesDenoteHost?: boolean): UrlWithStringQuery;
+    export function parse(urlStr: string, parseQueryString: true, slashesDenoteHost?: boolean): UrlWithParsedQuery;
+    export function parse(urlStr: string, parseQueryString: boolean, slashesDenoteHost?: boolean): Url;
+
     export function format(URL: URL, options?: URLFormatOptions): string;
-    export function format(urlObject: UrlObject): string;
+    export function format(urlObject: UrlObject | string): string;
     export function resolve(from: string, to: string): string;
 
     export interface URLFormatOptions {
@@ -2401,8 +2568,36 @@ declare module "dns" {
 declare module "net" {
     import * as stream from "stream";
     import * as events from "events";
+    import * as dns from "dns";
+
+    type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
+
+    export interface SocketConstructorOpts {
+        fd?: number;
+        allowHalfOpen?: boolean;
+        readable?: boolean;
+        writable?: boolean;
+    }
+
+    export interface TcpSocketConnectOpts {
+        port: number;
+        host?: string;
+        localAddress?: string;
+        localPort?: number;
+        hints?: number;
+        family?: number;
+        lookup?: LookupFunction;
+    }
+
+    export interface IpcSocketConnectOpts {
+        path: string;
+    }
+
+    export type SocketConnectOpts = TcpSocketConnectOpts | IpcSocketConnectOpts;
+
+    export class Socket extends stream.Duplex {
+        constructor(options?: SocketConstructorOpts);
 
-    export interface Socket extends stream.Duplex {
         // Extended base methods
         write(buffer: Buffer): boolean;
         write(buffer: Buffer, cb?: Function): boolean;
@@ -2411,8 +2606,11 @@ declare module "net" {
         write(str: string, encoding?: string, fd?: string): boolean;
         write(data: any, encoding?: string, callback?: Function): void;
 
-        connect(port: number, host?: string, connectionListener?: Function): void;
-        connect(path: string, connectionListener?: Function): void;
+        connect(options: SocketConnectOpts, connectionListener?: Function): this;
+        connect(port: number, host: string, connectionListener?: Function): this;
+        connect(port: number, connectionListener?: Function): this;
+        connect(path: string, connectionListener?: Function): this;
+
         bufferSize: number;
         setEncoding(encoding?: string): this;
         destroy(err?: any): void;
@@ -2514,10 +2712,6 @@ declare module "net" {
         prependOnceListener(event: "timeout", listener: () => void): this;
     }
 
-    export var Socket: {
-        new(options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket;
-    };
-
     export interface ListenOptions {
         port?: number;
         host?: string;
@@ -2531,20 +2725,20 @@ declare module "net" {
         constructor(connectionListener?: (socket: Socket) => void);
         constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
 
-        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
-        listen(port?: number, hostname?: string, listeningListener?: Function): Server;
-        listen(port?: number, backlog?: number, listeningListener?: Function): Server;
-        listen(port?: number, listeningListener?: Function): Server;
-        listen(path: string, backlog?: number, listeningListener?: Function): Server;
-        listen(path: string, listeningListener?: Function): Server;
-        listen(options: ListenOptions, listeningListener?: Function): Server;
-        listen(handle: any, backlog?: number, listeningListener?: Function): Server;
-        listen(handle: any, listeningListener?: Function): Server;
-        close(callback?: Function): Server;
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, hostname?: string, listeningListener?: Function): this;
+        listen(port?: number, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, listeningListener?: Function): this;
+        listen(path: string, backlog?: number, listeningListener?: Function): this;
+        listen(path: string, listeningListener?: Function): this;
+        listen(options: ListenOptions, listeningListener?: Function): this;
+        listen(handle: any, backlog?: number, listeningListener?: Function): this;
+        listen(handle: any, listeningListener?: Function): this;
+        close(callback?: Function): this;
         address(): { port: number; family: string; address: string; };
         getConnections(cb: (error: Error | null, count: number) => void): void;
-        ref(): Server;
-        unref(): Server;
+        ref(): this;
+        unref(): this;
         maxConnections: number;
         connections: number;
         listening: boolean;
@@ -2592,12 +2786,23 @@ declare module "net" {
         prependOnceListener(event: "error", listener: (err: Error) => void): this;
         prependOnceListener(event: "listening", listener: () => void): this;
     }
+
+    export interface TcpNetConnectOpts extends TcpSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export interface IpcNetConnectOpts extends IpcSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export type NetConnectOpts = TcpNetConnectOpts | IpcNetConnectOpts;
+
     export function createServer(connectionListener?: (socket: Socket) => void): Server;
     export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
-    export function connect(options: { port: number, host?: string, localAddress?: string, localPort?: number, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
+    export function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
     export function connect(port: number, host?: string, connectionListener?: Function): Socket;
     export function connect(path: string, connectionListener?: Function): Socket;
-    export function createConnection(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
+    export function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
     export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
     export function createConnection(path: string, connectionListener?: Function): Socket;
     export function isIP(input: string): number;
@@ -2607,6 +2812,7 @@ declare module "net" {
 
 declare module "dgram" {
     import * as events from "events";
+    import * as dns from "dns";
 
     interface RemoteInfo {
         address: string;
@@ -2631,12 +2837,15 @@ declare module "dgram" {
     interface SocketOptions {
         type: SocketType;
         reuseAddr?: boolean;
+        recvBufferSize?: number;
+        sendBufferSize?: number;
+        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
     }
 
     export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
     export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
 
-    export interface Socket extends events.EventEmitter {
+    export class Socket extends events.EventEmitter {
         send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
         send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
         bind(port?: number, address?: string, callback?: () => void): void;
@@ -2648,11 +2857,16 @@ declare module "dgram" {
         setBroadcast(flag: boolean): void;
         setTTL(ttl: number): void;
         setMulticastTTL(ttl: number): void;
+        setMulticastInterface(multicastInterface: string): void;
         setMulticastLoopback(flag: boolean): void;
         addMembership(multicastAddress: string, multicastInterface?: string): void;
         dropMembership(multicastAddress: string, multicastInterface?: string): void;
         ref(): this;
         unref(): this;
+        setRecvBufferSize(size: number): void;
+        setSendBufferSize(size: number): void;
+        getRecvBufferSize(): number;
+        getSendBufferSize(): number;
 
         /**
          * events.EventEmitter
@@ -2709,7 +2923,7 @@ declare module "fs" {
      */
     export type PathLike = string | Buffer | URL;
 
-    export interface Stats {
+    export class Stats {
         isFile(): boolean;
         isDirectory(): boolean;
         isBlockDevice(): boolean;
@@ -2766,7 +2980,7 @@ declare module "fs" {
         prependOnceListener(event: "error", listener: (error: Error) => void): this;
     }
 
-    export interface ReadStream extends stream.Readable {
+    export class ReadStream extends stream.Readable {
         close(): void;
         destroy(): void;
         bytesRead: number;
@@ -2798,7 +3012,7 @@ declare module "fs" {
         prependOnceListener(event: "close", listener: () => void): this;
     }
 
-    export interface WriteStream extends stream.Writable {
+    export class WriteStream extends stream.Writable {
         close(): void;
         bytesWritten: number;
         path: string | Buffer;
@@ -3300,6 +3514,11 @@ declare module "fs" {
          * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
          */
         export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        export function native(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+        export function native(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
+        export function native(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
+        export function native(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
     }
 
     /**
@@ -3323,6 +3542,12 @@ declare module "fs" {
      */
     export function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
 
+    export namespace realpathSync {
+        export function native(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+        export function native(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+        export function native(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+    }
+
     /**
      * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
      * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
@@ -4131,6 +4356,9 @@ declare module "fs" {
         /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
         export const O_SYNC: number;
 
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O with write operations waiting for data integrity. */
+        export const O_DSYNC: number;
+
         /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
         export const O_SYMLINK: number;
 
@@ -4203,6 +4431,9 @@ declare module "fs" {
 
         /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
         export const S_IXOTH: number;
+
+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
+        export const COPYFILE_EXCL: number;
     }
 
     /**
@@ -4249,6 +4480,7 @@ declare module "fs" {
         autoClose?: boolean;
         start?: number;
         end?: number;
+        highWaterMark?: number;
     }): ReadStream;
 
     /**
@@ -4285,6 +4517,54 @@ declare module "fs" {
      * @param fd A file descriptor.
      */
     export function fdatasyncSync(fd: number): void;
+
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, flags: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace copyFile {
+        /**
+         * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+         * No arguments other than a possible exception are given to the callback function.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+         */
+        export function __promisify__(src: PathLike, dst: PathLike, flags?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
 }
 
 declare module "path" {
@@ -4313,6 +4593,28 @@ declare module "path" {
          */
         name: string;
     }
+    export interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
 
     /**
      * Normalize a string path, reducing '..' and '.' parts.
@@ -4337,7 +4639,7 @@ declare module "path" {
      *
      * @param pathSegments string paths to join.  Non-string arguments are ignored.
      */
-    export function resolve(...pathSegments: any[]): string;
+    export function resolve(...pathSegments: string[]): string;
     /**
      * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
      *
@@ -4347,9 +4649,6 @@ declare module "path" {
     /**
      * Solve the relative path from {from} to {to}.
      * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     *
-     * @param from
-     * @param to
      */
     export function relative(from: string, to: string): string;
     /**
@@ -4392,7 +4691,7 @@ declare module "path" {
      *
      * @param pathString path to evaluate.
      */
-    export function format(pathObject: ParsedPath): string;
+    export function format(pathObject: FormatInputPathObject): string;
 
     export module posix {
         export function normalize(p: string): string;
@@ -4406,7 +4705,7 @@ declare module "path" {
         export var sep: string;
         export var delimiter: string;
         export function parse(p: string): ParsedPath;
-        export function format(pP: ParsedPath): string;
+        export function format(pP: FormatInputPathObject): string;
     }
 
     export module win32 {
@@ -4421,7 +4720,7 @@ declare module "path" {
         export var sep: string;
         export var delimiter: string;
         export function parse(p: string): ParsedPath;
-        export function format(pP: ParsedPath): string;
+        export function format(pP: FormatInputPathObject): string;
     }
 }
 
@@ -4553,7 +4852,7 @@ declare module "tls" {
              * SecureContext.) If SNICallback wasn't provided the default callback
              * with high-level API will be used (see below).
              */
-            SNICallback?: Function,
+            SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void,
             /**
              * An optional Buffer instance containing a TLS session.
              */
@@ -4565,12 +4864,7 @@ declare module "tls" {
              */
             requestOCSP?: boolean
         });
-        /**
-         * Returns the bound address, the address family name and port of the underlying socket as reported by
-         * the operating system.
-         * @returns {any} - An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
-         */
-        address(): { port: number; family: string; address: string };
+
         /**
          * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
          */
@@ -4587,7 +4881,7 @@ declare module "tls" {
         encrypted: boolean;
         /**
          * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
-         * @returns {CipherNameAndProtocol} - Returns an object representing the cipher name
+         * @returns Returns an object representing the cipher name
          * and the SSL/TLS protocol version of the current connection.
          */
         getCipher(): CipherNameAndProtocol;
@@ -4597,55 +4891,34 @@ declare module "tls" {
          * If detailed argument is true the full chain with issuer property will be returned,
          * if false only the top certificate without issuer property.
          * If the peer does not provide a certificate, it returns null or an empty object.
-         * @param {boolean} detailed - If true; the full chain with issuer property will be returned.
-         * @returns {PeerCertificate | DetailedPeerCertificate} - An object representing the peer's certificate.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
          */
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
-         * @returns {any} - ASN.1 encoded TLS session or undefined if none was negotiated.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
          */
         getSession(): any;
         /**
          * NOTE: Works only with client TLS sockets.
          * Useful only for debugging, for session reuse provide session option to tls.connect().
-         * @returns {any} - TLS session ticket or undefined if none was negotiated.
+         * @returns TLS session ticket or undefined if none was negotiated.
          */
         getTLSTicket(): any;
-        /**
-         * The string representation of the local IP address.
-         */
-        localAddress: string;
-        /**
-         * The numeric representation of the local port.
-         */
-        localPort: number;
-        /**
-         * The string representation of the remote IP address.
-         * For example, '74.125.127.100' or '2001:4860:a005::68'.
-         */
-        remoteAddress: string;
-        /**
-         * The string representation of the remote IP family. 'IPv4' or 'IPv6'.
-         */
-        remoteFamily: string;
-        /**
-         * The numeric representation of the remote port. For example, 443.
-         */
-        remotePort: number;
         /**
          * Initiate TLS renegotiation process.
          *
          * NOTE: Can be used to request peer's certificate after the secure connection has been established.
          * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
-         * @param {TlsOptions} options - The options may contain the following fields: rejectUnauthorized,
+         * @param options - The options may contain the following fields: rejectUnauthorized,
          * requestCert (See tls.createServer() for details).
-         * @param {Function} callback - callback(err) will be executed with null as err, once the renegotiation
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
          */
-        renegotiate(options: TlsOptions, callback: (err: Error) => any): any;
+        renegotiate(options: TlsOptions, callback: (err: Error | null) => void): any;
         /**
          * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
          * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
@@ -4653,8 +4926,8 @@ declare module "tls" {
          * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
          * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
          * which may decrease overall server throughput.
-         * @param {number} size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
-         * @returns {boolean} - Returns true on success, false otherwise.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
          */
         setMaxSendFragment(size: number): boolean;
 
@@ -4702,49 +4975,40 @@ declare module "tls" {
         requestCert?: boolean;
         rejectUnauthorized?: boolean;
         NPNProtocols?: string[] | Buffer;
-        SNICallback?: (servername: string, cb: (err: Error, ctx: SecureContext) => any) => any;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
         ecdhCurve?: string;
         dhparam?: string | Buffer;
         handshakeTimeout?: number;
         ALPNProtocols?: string[] | Buffer;
         sessionTimeout?: number;
-        ticketKeys?: any;
+        ticketKeys?: Buffer;
         sessionIdContext?: string;
         secureProtocol?: string;
+        secureOptions?: number;
     }
 
-    export interface ConnectionOptions {
+    export interface ConnectionOptions extends SecureContextOptions {
         host?: string;
         port?: number;
-        socket?: net.Socket;
-        pfx?: string | Buffer;
-        key?: string | string[] | Buffer | Buffer[];
-        passphrase?: string;
-        cert?: string | string[] | Buffer | Buffer[];
-        ca?: string | Buffer | Array<string | Buffer>;
-        rejectUnauthorized?: boolean;
+        path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
+        socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
+        rejectUnauthorized?: boolean; // Defaults to true
         NPNProtocols?: Array<string | Buffer>;
-        servername?: string;
-        path?: string;
         ALPNProtocols?: Array<string | Buffer>;
-        checkServerIdentity?: (servername: string, cert: string | Buffer | Array<string | Buffer>) => any;
-        secureProtocol?: string;
-        secureContext?: Object;
+        checkServerIdentity?: typeof checkServerIdentity;
+        servername?: string; // SNI TLS Extension
         session?: Buffer;
         minDHSize?: number;
-        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
+        secureContext?: SecureContext; // If not provided, the entire ConnectionOptions object will be passed to tls.createSecureContext()
+        lookup?: net.LookupFunction;
     }
 
-    export interface Server extends net.Server {
-        close(callback?: Function): Server;
-        address(): { port: number; family: string; address: string; };
+    export class Server extends net.Server {
         addContext(hostName: string, credentials: {
             key: string;
             cert: string;
             ca: string;
         }): void;
-        maxConnections: number;
-        connections: number;
 
         /**
          * events.EventEmitter
@@ -4820,26 +5084,42 @@ declare module "tls" {
     }
 
     export interface SecureContextOptions {
-        pfx?: string | Buffer;
-        key?: string | Buffer;
+        pfx?: string | Buffer | Array<string | Buffer | Object>;
+        key?: string | Buffer | Array<Buffer | Object>;
         passphrase?: string;
-        cert?: string | Buffer;
-        ca?: string | Buffer;
-        crl?: string | string[];
+        cert?: string | Buffer | Array<string | Buffer>;
+        ca?: string | Buffer | Array<string | Buffer>;
         ciphers?: string;
         honorCipherOrder?: boolean;
+        ecdhCurve?: string;
+        crl?: string | Buffer | Array<string | Buffer>;
+        dhparam?: string | Buffer;
+        secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
+        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
+        sessionIdContext?: string;
     }
 
     export interface SecureContext {
         context: any;
     }
 
+    /*
+     * Verifies the certificate `cert` is issued to host `host`.
+     * @host The hostname to verify the certificate against
+     * @cert PeerCertificate representing the peer's certificate
+     *
+     * Returns Error object, populating it with the reason, host and cert on failure.  On success, returns undefined.
+     */
+    export function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
     export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
     export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
     export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
     export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
     export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
     export function createSecureContext(details: SecureContextOptions): SecureContext;
+    export function getCiphers(): string[];
+
+    export var DEFAULT_ECDH_CURVE: string;
 }
 
 declare module "crypto" {
@@ -4876,23 +5156,23 @@ declare module "crypto" {
     type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
 
     export interface Hash extends NodeJS.ReadWriteStream {
-        update(data: string | Buffer): Hash;
-        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hash;
+        update(data: string | Buffer | DataView): Hash;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hash;
         digest(): Buffer;
         digest(encoding: HexBase64Latin1Encoding): string;
     }
     export interface Hmac extends NodeJS.ReadWriteStream {
-        update(data: string | Buffer): Hmac;
-        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
+        update(data: string | Buffer | DataView): Hmac;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
         digest(): Buffer;
         digest(encoding: HexBase64Latin1Encoding): string;
     }
     export function createCipher(algorithm: string, password: any): Cipher;
     export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
     export interface Cipher extends NodeJS.ReadWriteStream {
-        update(data: Buffer): Buffer;
+        update(data: Buffer | DataView): Buffer;
         update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
-        update(data: Buffer, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
         update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
@@ -4903,9 +5183,9 @@ declare module "crypto" {
     export function createDecipher(algorithm: string, password: any): Decipher;
     export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
     export interface Decipher extends NodeJS.ReadWriteStream {
-        update(data: Buffer): Buffer;
+        update(data: Buffer | DataView): Buffer;
         update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
-        update(data: Buffer, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
         update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
@@ -4915,15 +5195,15 @@ declare module "crypto" {
     }
     export function createSign(algorithm: string): Signer;
     export interface Signer extends NodeJS.WritableStream {
-        update(data: string | Buffer): Signer;
-        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        update(data: string | Buffer | DataView): Signer;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Signer;
         sign(private_key: string | { key: string; passphrase: string }): Buffer;
         sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
     }
     export function createVerify(algorith: string): Verify;
     export interface Verify extends NodeJS.WritableStream {
-        update(data: string | Buffer): Verify;
-        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        update(data: string | Buffer | DataView): Verify;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Verify;
         verify(object: string | Object, signature: Buffer | DataView): boolean;
         verify(object: string | Object, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
         // https://nodejs.org/api/crypto.html#crypto_verifier_verify_object_signature_signature_format
@@ -5024,6 +5304,7 @@ declare module "stream" {
 
         export class Readable extends Stream implements NodeJS.ReadableStream {
             readable: boolean;
+            readableHighWaterMark: number;
             constructor(opts?: ReadableOptions);
             _read(size: number): void;
             read(size?: number): any;
@@ -5033,8 +5314,9 @@ declare module "stream" {
             isPaused(): boolean;
             unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
             unshift(chunk: any): void;
-            wrap(oldStream: NodeJS.ReadableStream): Readable;
+            wrap(oldStream: NodeJS.ReadableStream): this;
             push(chunk: any, encoding?: string): boolean;
+            _destroy(err: Error, callback: Function): void;
             destroy(error?: Error): void;
 
             /**
@@ -5104,18 +5386,21 @@ declare module "stream" {
             write?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
             writev?: (chunks: Array<{ chunk: string | Buffer, encoding: string }>, callback: Function) => any;
             destroy?: (error?: Error) => any;
+            final?: (callback: (error?: Error) => void) => void;
         }
 
         export class Writable extends Stream implements NodeJS.WritableStream {
             writable: boolean;
+            readonly writableHighWaterMark: number;
             constructor(opts?: WritableOptions);
-            _write(chunk: any, encoding: string, callback: Function): void;
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
             _destroy(err: Error, callback: Function): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(): void;
+            end(cb?: Function): void;
             end(chunk: any, cb?: Function): void;
             end(chunk: any, encoding?: string, cb?: Function): void;
             cork(): void;
@@ -5198,14 +5483,16 @@ declare module "stream" {
         // Note: Duplex extends both Readable and Writable.
         export class Duplex extends Readable implements Writable {
             writable: boolean;
+            readonly writableHighWaterMark: number;
             constructor(opts?: DuplexOptions);
-            _write(chunk: any, encoding: string, callback: Function): void;
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
             _destroy(err: Error, callback: Function): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(): void;
+            end(cb?: Function): void;
             end(chunk: any, cb?: Function): void;
             end(chunk: any, encoding?: string, cb?: Function): void;
             cork(): void;
@@ -5288,16 +5575,18 @@ declare module "util" {
     export function callbackify<T1, T2, T3, T4, T5, T6, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
 
     export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
-    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
-    export function promisify<T1>(fn: (arg1: T1, callback: (err: NodeJS.ErrnoException) => void) => void): (arg1: T1) => Promise<void>;
-    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
-    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
-    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
-    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
-    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
-    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
-    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
-    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify<TResult>(fn: (callback: (err: Error, result: TResult) => void) => void): () => Promise<TResult>;
+    export function promisify(fn: (callback: (err: Error) => void) => void): () => Promise<void>;
+    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
     export function promisify(fn: Function): Function;
     export namespace promisify {
         const custom: symbol;
@@ -5374,7 +5663,6 @@ declare module "domain" {
         remove(emitter: events.EventEmitter): void;
         bind(cb: (err: Error, data: any) => any): any;
         intercept(cb: (data: any) => any): any;
-        dispose(): void;
         members: any[];
         enter(): void;
         exit(): void;
@@ -5618,6 +5906,7 @@ declare module "constants" {
     export var O_NOATIME: number;
     export var O_NOFOLLOW: number;
     export var O_SYNC: number;
+    export var O_DSYNC: number;
     export var O_SYMLINK: number;
     export var O_DIRECT: number;
     export var O_NONBLOCK: number;
@@ -5717,133 +6006,6 @@ declare module "console" {
     export = console;
 }
 
-/**
- * _debugger module is not documented.
- * Source code is at https://github.com/nodejs/node/blob/master/lib/_debugger.js
- */
-declare module "_debugger" {
-    export interface Packet {
-        raw: string;
-        headers: string[];
-        body: Message;
-    }
-
-    export interface Message {
-        seq: number;
-        type: string;
-    }
-
-    export interface RequestInfo {
-        command: string;
-        arguments: any;
-    }
-
-    export interface Request extends Message, RequestInfo {
-    }
-
-    export interface Event extends Message {
-        event: string;
-        body?: any;
-    }
-
-    export interface Response extends Message {
-        request_seq: number;
-        success: boolean;
-        /** Contains error message if success === false. */
-        message?: string;
-        /** Contains message body if success === true. */
-        body?: any;
-    }
-
-    export interface BreakpointMessageBody {
-        type: string;
-        target: number;
-        line: number;
-    }
-
-    export class Protocol {
-        res: Packet;
-        state: string;
-        execute(data: string): void;
-        serialize(rq: Request): string;
-        onResponse: (pkt: Packet) => void;
-    }
-
-    export var NO_FRAME: number;
-    export var port: number;
-
-    export interface ScriptDesc {
-        name: string;
-        id: number;
-        isNative?: boolean;
-        handle?: number;
-        type: string;
-        lineOffset?: number;
-        columnOffset?: number;
-        lineCount?: number;
-    }
-
-    export interface Breakpoint {
-        id: number;
-        scriptId: number;
-        script: ScriptDesc;
-        line: number;
-        condition?: string;
-        scriptReq?: string;
-    }
-
-    export interface RequestHandler {
-        (err: boolean, body: Message, res: Packet): void;
-        request_seq?: number;
-    }
-
-    export interface ResponseBodyHandler {
-        (err: boolean, body?: any): void;
-        request_seq?: number;
-    }
-
-    export interface ExceptionInfo {
-        text: string;
-    }
-
-    export interface BreakResponse {
-        script?: ScriptDesc;
-        exception?: ExceptionInfo;
-        sourceLine: number;
-        sourceLineText: string;
-        sourceColumn: number;
-    }
-
-    export function SourceInfo(body: BreakResponse): string;
-
-    export interface ClientInstance extends NodeJS.EventEmitter {
-        protocol: Protocol;
-        scripts: ScriptDesc[];
-        handles: ScriptDesc[];
-        breakpoints: Breakpoint[];
-        currentSourceLine: number;
-        currentSourceColumn: number;
-        currentSourceLineText: string;
-        currentFrame: number;
-        currentScript: string;
-
-        connect(port: number, host: string): void;
-        req(req: any, cb: RequestHandler): void;
-        reqFrameEval(code: string, frame: number, cb: RequestHandler): void;
-        mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void;
-        setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void;
-        clearBreakpoint(rq: Request, cb: RequestHandler): void;
-        listbreakpoints(cb: RequestHandler): void;
-        reqSource(from: number, to: number, cb: RequestHandler): void;
-        reqScripts(cb: any): void;
-        reqContinue(cb: RequestHandler): void;
-    }
-
-    export var Client: {
-        new(): ClientInstance
-    };
-}
-
 /**
  * Async Hooks module: https://nodejs.org/api/async_hooks.html
  */
@@ -5885,6 +6047,13 @@ declare module "async_hooks" {
          */
         after?(asyncId: number): void;
 
+        /**
+         * Called when a promise has resolve() called. This may not be in the same execution id
+         * as the promise itself.
+         * @param asyncId the unique id for the promise that was resolve()d.
+         */
+        promiseResolve?(asyncId: number): void;
+
         /**
          * Called after the resource corresponding to asyncId is destroyed
          * @param asyncId a unique ID for the async resource
@@ -5910,6 +6079,46 @@ declare module "async_hooks" {
      * @return an AsyncHooks instance used for disabling and enabling hooks
      */
     export function createHook(options: HookCallbacks): AsyncHook;
+
+    /**
+     * The class AsyncResource was designed to be extended by the embedder's async resources.
+     * Using this users can easily trigger the lifetime events of their own resources.
+     */
+    export class AsyncResource {
+        /**
+         * AsyncResource() is meant to be extended. Instantiating a
+         * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
+         * async_hook.executionAsyncId() is used.
+         * @param type the name of this async resource type
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         */
+        constructor(type: string, triggerAsyncId?: number)
+
+        /**
+         * Call AsyncHooks before callbacks.
+         */
+        emitBefore(): void;
+
+        /**
+         * Call AsyncHooks after callbacks
+         */
+        emitAfter(): void;
+
+        /**
+         * Call AsyncHooks destroy callbacks.
+         */
+        emitDestroy(): void;
+
+        /**
+         * @return the unique ID assigned to this AsyncResource instance.
+         */
+        asyncId(): number;
+
+        /**
+         * @return the trigger ID for this AsyncResource instance.
+         */
+        triggerAsyncId(): number;
+    }
 }
 
 declare module "http2" {
@@ -5943,7 +6152,7 @@ declare module "http2" {
 
     export interface ServerStreamResponseOptions {
         endStream?: boolean;
-        getTrailers?: (trailers: IncomingHttpHeaders) => void;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
     }
 
     export interface StatOptions {
@@ -5952,12 +6161,16 @@ declare module "http2" {
     }
 
     export interface ServerStreamFileResponseOptions {
-        statCheck?: (stats: fs.Stats, headers: IncomingHttpHeaders, statOptions: StatOptions) => void;
-        getTrailers?: (trailers: IncomingHttpHeaders) => void;
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void|boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
         offset?: number;
         length?: number;
     }
 
+    export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
+        onError?: (err: NodeJS.ErrnoException) => void;
+    }
+
     export interface Http2Stream extends stream.Duplex {
         readonly aborted: boolean;
         readonly destroyed: boolean;
@@ -6104,7 +6317,7 @@ declare module "http2" {
         pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (pushStream: ServerHttp2Stream) => void): void;
         respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
         respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
-        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
+        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
     }
 
     // Http2Session
@@ -6123,7 +6336,7 @@ declare module "http2" {
         exclusive?: boolean;
         parent?: number;
         weight?: number;
-        getTrailers?: (trailers: IncomingHttpHeaders, flags: number) => void;
+        getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
     }
 
     export interface SessionShutdownOptions {
@@ -6293,8 +6506,8 @@ declare module "http2" {
     export type ClientSessionOptions = SessionOptions;
     export type ServerSessionOptions = SessionOptions;
 
-    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions {}
-    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions {}
+    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
+    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
 
     export interface ServerOptions extends ServerSessionOptions {
         allowHTTP1?: boolean;
@@ -6454,7 +6667,7 @@ declare module "http2" {
         writeContinue(): void;
         writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
         writeHead(statusCode: number, statusMessage?: string, headers?: OutgoingHttpHeaders): void;
-        createPushResponse(headers: OutgoingHttpHeaders, callback?: (err: Error) => void): void;
+        createPushResponse(headers: OutgoingHttpHeaders, callback: (err: Error | null, res: Http2ServerResponse) => void): void;
 
         addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
@@ -6501,216 +6714,216 @@ declare module "http2" {
 
     // Public API
 
-    export const constants: {
-        NGHTTP2_SESSION_SERVER: number;
-        NGHTTP2_SESSION_CLIENT: number;
-        NGHTTP2_STREAM_STATE_IDLE: number;
-        NGHTTP2_STREAM_STATE_OPEN: number;
-        NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
-        NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
-        NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
-        NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
-        NGHTTP2_STREAM_STATE_CLOSED: number;
-        NGHTTP2_NO_ERROR: number;
-        NGHTTP2_PROTOCOL_ERROR: number;
-        NGHTTP2_INTERNAL_ERROR: number;
-        NGHTTP2_FLOW_CONTROL_ERROR: number;
-        NGHTTP2_SETTINGS_TIMEOUT: number;
-        NGHTTP2_STREAM_CLOSED: number;
-        NGHTTP2_FRAME_SIZE_ERROR: number;
-        NGHTTP2_REFUSED_STREAM: number;
-        NGHTTP2_CANCEL: number;
-        NGHTTP2_COMPRESSION_ERROR: number;
-        NGHTTP2_CONNECT_ERROR: number;
-        NGHTTP2_ENHANCE_YOUR_CALM: number;
-        NGHTTP2_INADEQUATE_SECURITY: number;
-        NGHTTP2_HTTP_1_1_REQUIRED: number;
-        NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
-        NGHTTP2_FLAG_NONE: number;
-        NGHTTP2_FLAG_END_STREAM: number;
-        NGHTTP2_FLAG_END_HEADERS: number;
-        NGHTTP2_FLAG_ACK: number;
-        NGHTTP2_FLAG_PADDED: number;
-        NGHTTP2_FLAG_PRIORITY: number;
-        DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
-        DEFAULT_SETTINGS_ENABLE_PUSH: number;
-        DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
-        DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
-        MAX_MAX_FRAME_SIZE: number;
-        MIN_MAX_FRAME_SIZE: number;
-        MAX_INITIAL_WINDOW_SIZE: number;
-        NGHTTP2_DEFAULT_WEIGHT: number;
-        NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
-        NGHTTP2_SETTINGS_ENABLE_PUSH: number;
-        NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
-        NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
-        NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
-        NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
-        PADDING_STRATEGY_NONE: number;
-        PADDING_STRATEGY_MAX: number;
-        PADDING_STRATEGY_CALLBACK: number;
-        HTTP2_HEADER_STATUS: string;
-        HTTP2_HEADER_METHOD: string;
-        HTTP2_HEADER_AUTHORITY: string;
-        HTTP2_HEADER_SCHEME: string;
-        HTTP2_HEADER_PATH: string;
-        HTTP2_HEADER_ACCEPT_CHARSET: string;
-        HTTP2_HEADER_ACCEPT_ENCODING: string;
-        HTTP2_HEADER_ACCEPT_LANGUAGE: string;
-        HTTP2_HEADER_ACCEPT_RANGES: string;
-        HTTP2_HEADER_ACCEPT: string;
-        HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
-        HTTP2_HEADER_AGE: string;
-        HTTP2_HEADER_ALLOW: string;
-        HTTP2_HEADER_AUTHORIZATION: string;
-        HTTP2_HEADER_CACHE_CONTROL: string;
-        HTTP2_HEADER_CONNECTION: string;
-        HTTP2_HEADER_CONTENT_DISPOSITION: string;
-        HTTP2_HEADER_CONTENT_ENCODING: string;
-        HTTP2_HEADER_CONTENT_LANGUAGE: string;
-        HTTP2_HEADER_CONTENT_LENGTH: string;
-        HTTP2_HEADER_CONTENT_LOCATION: string;
-        HTTP2_HEADER_CONTENT_MD5: string;
-        HTTP2_HEADER_CONTENT_RANGE: string;
-        HTTP2_HEADER_CONTENT_TYPE: string;
-        HTTP2_HEADER_COOKIE: string;
-        HTTP2_HEADER_DATE: string;
-        HTTP2_HEADER_ETAG: string;
-        HTTP2_HEADER_EXPECT: string;
-        HTTP2_HEADER_EXPIRES: string;
-        HTTP2_HEADER_FROM: string;
-        HTTP2_HEADER_HOST: string;
-        HTTP2_HEADER_IF_MATCH: string;
-        HTTP2_HEADER_IF_MODIFIED_SINCE: string;
-        HTTP2_HEADER_IF_NONE_MATCH: string;
-        HTTP2_HEADER_IF_RANGE: string;
-        HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
-        HTTP2_HEADER_LAST_MODIFIED: string;
-        HTTP2_HEADER_LINK: string;
-        HTTP2_HEADER_LOCATION: string;
-        HTTP2_HEADER_MAX_FORWARDS: string;
-        HTTP2_HEADER_PREFER: string;
-        HTTP2_HEADER_PROXY_AUTHENTICATE: string;
-        HTTP2_HEADER_PROXY_AUTHORIZATION: string;
-        HTTP2_HEADER_RANGE: string;
-        HTTP2_HEADER_REFERER: string;
-        HTTP2_HEADER_REFRESH: string;
-        HTTP2_HEADER_RETRY_AFTER: string;
-        HTTP2_HEADER_SERVER: string;
-        HTTP2_HEADER_SET_COOKIE: string;
-        HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
-        HTTP2_HEADER_TRANSFER_ENCODING: string;
-        HTTP2_HEADER_TE: string;
-        HTTP2_HEADER_UPGRADE: string;
-        HTTP2_HEADER_USER_AGENT: string;
-        HTTP2_HEADER_VARY: string;
-        HTTP2_HEADER_VIA: string;
-        HTTP2_HEADER_WWW_AUTHENTICATE: string;
-        HTTP2_HEADER_HTTP2_SETTINGS: string;
-        HTTP2_HEADER_KEEP_ALIVE: string;
-        HTTP2_HEADER_PROXY_CONNECTION: string;
-        HTTP2_METHOD_ACL: string;
-        HTTP2_METHOD_BASELINE_CONTROL: string;
-        HTTP2_METHOD_BIND: string;
-        HTTP2_METHOD_CHECKIN: string;
-        HTTP2_METHOD_CHECKOUT: string;
-        HTTP2_METHOD_CONNECT: string;
-        HTTP2_METHOD_COPY: string;
-        HTTP2_METHOD_DELETE: string;
-        HTTP2_METHOD_GET: string;
-        HTTP2_METHOD_HEAD: string;
-        HTTP2_METHOD_LABEL: string;
-        HTTP2_METHOD_LINK: string;
-        HTTP2_METHOD_LOCK: string;
-        HTTP2_METHOD_MERGE: string;
-        HTTP2_METHOD_MKACTIVITY: string;
-        HTTP2_METHOD_MKCALENDAR: string;
-        HTTP2_METHOD_MKCOL: string;
-        HTTP2_METHOD_MKREDIRECTREF: string;
-        HTTP2_METHOD_MKWORKSPACE: string;
-        HTTP2_METHOD_MOVE: string;
-        HTTP2_METHOD_OPTIONS: string;
-        HTTP2_METHOD_ORDERPATCH: string;
-        HTTP2_METHOD_PATCH: string;
-        HTTP2_METHOD_POST: string;
-        HTTP2_METHOD_PRI: string;
-        HTTP2_METHOD_PROPFIND: string;
-        HTTP2_METHOD_PROPPATCH: string;
-        HTTP2_METHOD_PUT: string;
-        HTTP2_METHOD_REBIND: string;
-        HTTP2_METHOD_REPORT: string;
-        HTTP2_METHOD_SEARCH: string;
-        HTTP2_METHOD_TRACE: string;
-        HTTP2_METHOD_UNBIND: string;
-        HTTP2_METHOD_UNCHECKOUT: string;
-        HTTP2_METHOD_UNLINK: string;
-        HTTP2_METHOD_UNLOCK: string;
-        HTTP2_METHOD_UPDATE: string;
-        HTTP2_METHOD_UPDATEREDIRECTREF: string;
-        HTTP2_METHOD_VERSION_CONTROL: string;
-        HTTP_STATUS_CONTINUE: number;
-        HTTP_STATUS_SWITCHING_PROTOCOLS: number;
-        HTTP_STATUS_PROCESSING: number;
-        HTTP_STATUS_OK: number;
-        HTTP_STATUS_CREATED: number;
-        HTTP_STATUS_ACCEPTED: number;
-        HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
-        HTTP_STATUS_NO_CONTENT: number;
-        HTTP_STATUS_RESET_CONTENT: number;
-        HTTP_STATUS_PARTIAL_CONTENT: number;
-        HTTP_STATUS_MULTI_STATUS: number;
-        HTTP_STATUS_ALREADY_REPORTED: number;
-        HTTP_STATUS_IM_USED: number;
-        HTTP_STATUS_MULTIPLE_CHOICES: number;
-        HTTP_STATUS_MOVED_PERMANENTLY: number;
-        HTTP_STATUS_FOUND: number;
-        HTTP_STATUS_SEE_OTHER: number;
-        HTTP_STATUS_NOT_MODIFIED: number;
-        HTTP_STATUS_USE_PROXY: number;
-        HTTP_STATUS_TEMPORARY_REDIRECT: number;
-        HTTP_STATUS_PERMANENT_REDIRECT: number;
-        HTTP_STATUS_BAD_REQUEST: number;
-        HTTP_STATUS_UNAUTHORIZED: number;
-        HTTP_STATUS_PAYMENT_REQUIRED: number;
-        HTTP_STATUS_FORBIDDEN: number;
-        HTTP_STATUS_NOT_FOUND: number;
-        HTTP_STATUS_METHOD_NOT_ALLOWED: number;
-        HTTP_STATUS_NOT_ACCEPTABLE: number;
-        HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
-        HTTP_STATUS_REQUEST_TIMEOUT: number;
-        HTTP_STATUS_CONFLICT: number;
-        HTTP_STATUS_GONE: number;
-        HTTP_STATUS_LENGTH_REQUIRED: number;
-        HTTP_STATUS_PRECONDITION_FAILED: number;
-        HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
-        HTTP_STATUS_URI_TOO_LONG: number;
-        HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
-        HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
-        HTTP_STATUS_EXPECTATION_FAILED: number;
-        HTTP_STATUS_TEAPOT: number;
-        HTTP_STATUS_MISDIRECTED_REQUEST: number;
-        HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
-        HTTP_STATUS_LOCKED: number;
-        HTTP_STATUS_FAILED_DEPENDENCY: number;
-        HTTP_STATUS_UNORDERED_COLLECTION: number;
-        HTTP_STATUS_UPGRADE_REQUIRED: number;
-        HTTP_STATUS_PRECONDITION_REQUIRED: number;
-        HTTP_STATUS_TOO_MANY_REQUESTS: number;
-        HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
-        HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
-        HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
-        HTTP_STATUS_NOT_IMPLEMENTED: number;
-        HTTP_STATUS_BAD_GATEWAY: number;
-        HTTP_STATUS_SERVICE_UNAVAILABLE: number;
-        HTTP_STATUS_GATEWAY_TIMEOUT: number;
-        HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
-        HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
-        HTTP_STATUS_INSUFFICIENT_STORAGE: number;
-        HTTP_STATUS_LOOP_DETECTED: number;
-        HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
-        HTTP_STATUS_NOT_EXTENDED: number;
-        HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
-    };
+    export namespace constants {
+        export const NGHTTP2_SESSION_SERVER: number;
+        export const NGHTTP2_SESSION_CLIENT: number;
+        export const NGHTTP2_STREAM_STATE_IDLE: number;
+        export const NGHTTP2_STREAM_STATE_OPEN: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_CLOSED: number;
+        export const NGHTTP2_NO_ERROR: number;
+        export const NGHTTP2_PROTOCOL_ERROR: number;
+        export const NGHTTP2_INTERNAL_ERROR: number;
+        export const NGHTTP2_FLOW_CONTROL_ERROR: number;
+        export const NGHTTP2_SETTINGS_TIMEOUT: number;
+        export const NGHTTP2_STREAM_CLOSED: number;
+        export const NGHTTP2_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_REFUSED_STREAM: number;
+        export const NGHTTP2_CANCEL: number;
+        export const NGHTTP2_COMPRESSION_ERROR: number;
+        export const NGHTTP2_CONNECT_ERROR: number;
+        export const NGHTTP2_ENHANCE_YOUR_CALM: number;
+        export const NGHTTP2_INADEQUATE_SECURITY: number;
+        export const NGHTTP2_HTTP_1_1_REQUIRED: number;
+        export const NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_FLAG_NONE: number;
+        export const NGHTTP2_FLAG_END_STREAM: number;
+        export const NGHTTP2_FLAG_END_HEADERS: number;
+        export const NGHTTP2_FLAG_ACK: number;
+        export const NGHTTP2_FLAG_PADDED: number;
+        export const NGHTTP2_FLAG_PRIORITY: number;
+        export const DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const DEFAULT_SETTINGS_ENABLE_PUSH: number;
+        export const DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
+        export const MAX_MAX_FRAME_SIZE: number;
+        export const MIN_MAX_FRAME_SIZE: number;
+        export const MAX_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_DEFAULT_WEIGHT: number;
+        export const NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const NGHTTP2_SETTINGS_ENABLE_PUSH: number;
+        export const NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
+        export const NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
+        export const PADDING_STRATEGY_NONE: number;
+        export const PADDING_STRATEGY_MAX: number;
+        export const PADDING_STRATEGY_CALLBACK: number;
+        export const HTTP2_HEADER_STATUS: string;
+        export const HTTP2_HEADER_METHOD: string;
+        export const HTTP2_HEADER_AUTHORITY: string;
+        export const HTTP2_HEADER_SCHEME: string;
+        export const HTTP2_HEADER_PATH: string;
+        export const HTTP2_HEADER_ACCEPT_CHARSET: string;
+        export const HTTP2_HEADER_ACCEPT_ENCODING: string;
+        export const HTTP2_HEADER_ACCEPT_LANGUAGE: string;
+        export const HTTP2_HEADER_ACCEPT_RANGES: string;
+        export const HTTP2_HEADER_ACCEPT: string;
+        export const HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
+        export const HTTP2_HEADER_AGE: string;
+        export const HTTP2_HEADER_ALLOW: string;
+        export const HTTP2_HEADER_AUTHORIZATION: string;
+        export const HTTP2_HEADER_CACHE_CONTROL: string;
+        export const HTTP2_HEADER_CONNECTION: string;
+        export const HTTP2_HEADER_CONTENT_DISPOSITION: string;
+        export const HTTP2_HEADER_CONTENT_ENCODING: string;
+        export const HTTP2_HEADER_CONTENT_LANGUAGE: string;
+        export const HTTP2_HEADER_CONTENT_LENGTH: string;
+        export const HTTP2_HEADER_CONTENT_LOCATION: string;
+        export const HTTP2_HEADER_CONTENT_MD5: string;
+        export const HTTP2_HEADER_CONTENT_RANGE: string;
+        export const HTTP2_HEADER_CONTENT_TYPE: string;
+        export const HTTP2_HEADER_COOKIE: string;
+        export const HTTP2_HEADER_DATE: string;
+        export const HTTP2_HEADER_ETAG: string;
+        export const HTTP2_HEADER_EXPECT: string;
+        export const HTTP2_HEADER_EXPIRES: string;
+        export const HTTP2_HEADER_FROM: string;
+        export const HTTP2_HEADER_HOST: string;
+        export const HTTP2_HEADER_IF_MATCH: string;
+        export const HTTP2_HEADER_IF_MODIFIED_SINCE: string;
+        export const HTTP2_HEADER_IF_NONE_MATCH: string;
+        export const HTTP2_HEADER_IF_RANGE: string;
+        export const HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
+        export const HTTP2_HEADER_LAST_MODIFIED: string;
+        export const HTTP2_HEADER_LINK: string;
+        export const HTTP2_HEADER_LOCATION: string;
+        export const HTTP2_HEADER_MAX_FORWARDS: string;
+        export const HTTP2_HEADER_PREFER: string;
+        export const HTTP2_HEADER_PROXY_AUTHENTICATE: string;
+        export const HTTP2_HEADER_PROXY_AUTHORIZATION: string;
+        export const HTTP2_HEADER_RANGE: string;
+        export const HTTP2_HEADER_REFERER: string;
+        export const HTTP2_HEADER_REFRESH: string;
+        export const HTTP2_HEADER_RETRY_AFTER: string;
+        export const HTTP2_HEADER_SERVER: string;
+        export const HTTP2_HEADER_SET_COOKIE: string;
+        export const HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
+        export const HTTP2_HEADER_TRANSFER_ENCODING: string;
+        export const HTTP2_HEADER_TE: string;
+        export const HTTP2_HEADER_UPGRADE: string;
+        export const HTTP2_HEADER_USER_AGENT: string;
+        export const HTTP2_HEADER_VARY: string;
+        export const HTTP2_HEADER_VIA: string;
+        export const HTTP2_HEADER_WWW_AUTHENTICATE: string;
+        export const HTTP2_HEADER_HTTP2_SETTINGS: string;
+        export const HTTP2_HEADER_KEEP_ALIVE: string;
+        export const HTTP2_HEADER_PROXY_CONNECTION: string;
+        export const HTTP2_METHOD_ACL: string;
+        export const HTTP2_METHOD_BASELINE_CONTROL: string;
+        export const HTTP2_METHOD_BIND: string;
+        export const HTTP2_METHOD_CHECKIN: string;
+        export const HTTP2_METHOD_CHECKOUT: string;
+        export const HTTP2_METHOD_CONNECT: string;
+        export const HTTP2_METHOD_COPY: string;
+        export const HTTP2_METHOD_DELETE: string;
+        export const HTTP2_METHOD_GET: string;
+        export const HTTP2_METHOD_HEAD: string;
+        export const HTTP2_METHOD_LABEL: string;
+        export const HTTP2_METHOD_LINK: string;
+        export const HTTP2_METHOD_LOCK: string;
+        export const HTTP2_METHOD_MERGE: string;
+        export const HTTP2_METHOD_MKACTIVITY: string;
+        export const HTTP2_METHOD_MKCALENDAR: string;
+        export const HTTP2_METHOD_MKCOL: string;
+        export const HTTP2_METHOD_MKREDIRECTREF: string;
+        export const HTTP2_METHOD_MKWORKSPACE: string;
+        export const HTTP2_METHOD_MOVE: string;
+        export const HTTP2_METHOD_OPTIONS: string;
+        export const HTTP2_METHOD_ORDERPATCH: string;
+        export const HTTP2_METHOD_PATCH: string;
+        export const HTTP2_METHOD_POST: string;
+        export const HTTP2_METHOD_PRI: string;
+        export const HTTP2_METHOD_PROPFIND: string;
+        export const HTTP2_METHOD_PROPPATCH: string;
+        export const HTTP2_METHOD_PUT: string;
+        export const HTTP2_METHOD_REBIND: string;
+        export const HTTP2_METHOD_REPORT: string;
+        export const HTTP2_METHOD_SEARCH: string;
+        export const HTTP2_METHOD_TRACE: string;
+        export const HTTP2_METHOD_UNBIND: string;
+        export const HTTP2_METHOD_UNCHECKOUT: string;
+        export const HTTP2_METHOD_UNLINK: string;
+        export const HTTP2_METHOD_UNLOCK: string;
+        export const HTTP2_METHOD_UPDATE: string;
+        export const HTTP2_METHOD_UPDATEREDIRECTREF: string;
+        export const HTTP2_METHOD_VERSION_CONTROL: string;
+        export const HTTP_STATUS_CONTINUE: number;
+        export const HTTP_STATUS_SWITCHING_PROTOCOLS: number;
+        export const HTTP_STATUS_PROCESSING: number;
+        export const HTTP_STATUS_OK: number;
+        export const HTTP_STATUS_CREATED: number;
+        export const HTTP_STATUS_ACCEPTED: number;
+        export const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
+        export const HTTP_STATUS_NO_CONTENT: number;
+        export const HTTP_STATUS_RESET_CONTENT: number;
+        export const HTTP_STATUS_PARTIAL_CONTENT: number;
+        export const HTTP_STATUS_MULTI_STATUS: number;
+        export const HTTP_STATUS_ALREADY_REPORTED: number;
+        export const HTTP_STATUS_IM_USED: number;
+        export const HTTP_STATUS_MULTIPLE_CHOICES: number;
+        export const HTTP_STATUS_MOVED_PERMANENTLY: number;
+        export const HTTP_STATUS_FOUND: number;
+        export const HTTP_STATUS_SEE_OTHER: number;
+        export const HTTP_STATUS_NOT_MODIFIED: number;
+        export const HTTP_STATUS_USE_PROXY: number;
+        export const HTTP_STATUS_TEMPORARY_REDIRECT: number;
+        export const HTTP_STATUS_PERMANENT_REDIRECT: number;
+        export const HTTP_STATUS_BAD_REQUEST: number;
+        export const HTTP_STATUS_UNAUTHORIZED: number;
+        export const HTTP_STATUS_PAYMENT_REQUIRED: number;
+        export const HTTP_STATUS_FORBIDDEN: number;
+        export const HTTP_STATUS_NOT_FOUND: number;
+        export const HTTP_STATUS_METHOD_NOT_ALLOWED: number;
+        export const HTTP_STATUS_NOT_ACCEPTABLE: number;
+        export const HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
+        export const HTTP_STATUS_REQUEST_TIMEOUT: number;
+        export const HTTP_STATUS_CONFLICT: number;
+        export const HTTP_STATUS_GONE: number;
+        export const HTTP_STATUS_LENGTH_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_FAILED: number;
+        export const HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
+        export const HTTP_STATUS_URI_TOO_LONG: number;
+        export const HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
+        export const HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
+        export const HTTP_STATUS_EXPECTATION_FAILED: number;
+        export const HTTP_STATUS_TEAPOT: number;
+        export const HTTP_STATUS_MISDIRECTED_REQUEST: number;
+        export const HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
+        export const HTTP_STATUS_LOCKED: number;
+        export const HTTP_STATUS_FAILED_DEPENDENCY: number;
+        export const HTTP_STATUS_UNORDERED_COLLECTION: number;
+        export const HTTP_STATUS_UPGRADE_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_REQUIRED: number;
+        export const HTTP_STATUS_TOO_MANY_REQUESTS: number;
+        export const HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+        export const HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
+        export const HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
+        export const HTTP_STATUS_NOT_IMPLEMENTED: number;
+        export const HTTP_STATUS_BAD_GATEWAY: number;
+        export const HTTP_STATUS_SERVICE_UNAVAILABLE: number;
+        export const HTTP_STATUS_GATEWAY_TIMEOUT: number;
+        export const HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
+        export const HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
+        export const HTTP_STATUS_INSUFFICIENT_STORAGE: number;
+        export const HTTP_STATUS_LOOP_DETECTED: number;
+        export const HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
+        export const HTTP_STATUS_NOT_EXTENDED: number;
+        export const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
+    }
 
     export function getDefaultSettings(): Settings;
     export function getPackedSettings(settings: Settings): Settings;
@@ -6725,3 +6938,243 @@ declare module "http2" {
     export function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
     export function connect(authority: string | url.URL, options?: ClientSessionOptions | SecureClientSessionOptions, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
 }
+
+declare module "perf_hooks" {
+    export interface PerformanceEntry {
+        /**
+         * The total number of milliseconds elapsed for this entry.
+         * This value will not be meaningful for all Performance Entry types.
+         */
+        readonly duration: number;
+
+        /**
+         * The name of the performance entry.
+         */
+        readonly name: string;
+
+        /**
+         * The high resolution millisecond timestamp marking the starting time of the Performance Entry.
+         */
+        readonly startTime: number;
+
+        /**
+         * The type of the performance entry.
+         * Currently it may be one of: 'node', 'mark', 'measure', 'gc', or 'function'.
+         */
+        readonly entryType: string;
+
+        /**
+         * When performanceEntry.entryType is equal to 'gc', the performance.kind property identifies
+         * the type of garbage collection operation that occurred.
+         * The value may be one of perf_hooks.constants.
+         */
+        readonly kind?: number;
+    }
+
+    export interface PerformanceNodeTiming extends PerformanceEntry {
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process completed bootstrap.
+         */
+        readonly bootstrapComplete: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing ended.
+         */
+        readonly clusterSetupEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing started.
+         */
+        readonly clusterSetupStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop exited.
+         */
+        readonly loopExit: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop started.
+         */
+        readonly loopStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load ended.
+         */
+        readonly moduleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load started.
+         */
+        readonly moduleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process was initialized.
+         */
+        readonly nodeStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load ended.
+         */
+        readonly preloadModuleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load started.
+         */
+        readonly preloadModuleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing ended.
+         */
+        readonly thirdPartyMainEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing started.
+         */
+        readonly thirdPartyMainStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the V8 platform was initialized.
+         */
+        readonly v8Start: number;
+    }
+
+    export interface Performance {
+        /**
+         * If name is not provided, removes all PerformanceFunction objects from the Performance Timeline.
+         * If name is provided, removes entries with name.
+         * @param name
+         */
+        clearFunctions(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMark objects from the Performance Timeline.
+         * If name is provided, removes only the named mark.
+         * @param name
+         */
+        clearMarks(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMeasure objects from the Performance Timeline.
+         * If name is provided, removes only objects whose performanceEntry.name matches name.
+         */
+        clearMeasures(name?: string): void;
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         * @return list of all PerformanceEntry objects
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         * @param name
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+
+        /**
+         * Creates a new PerformanceMark entry in the Performance Timeline.
+         * A PerformanceMark is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'mark',
+         * and whose performanceEntry.duration is always 0.
+         * Performance marks are used to mark specific significant moments in the Performance Timeline.
+         * @param name
+         */
+        mark(name?: string): void;
+
+        /**
+         * Creates a new PerformanceMeasure entry in the Performance Timeline.
+         * A PerformanceMeasure is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'measure',
+         * and whose performanceEntry.duration measures the number of milliseconds elapsed since startMark and endMark.
+         *
+         * The startMark argument may identify any existing PerformanceMark in the the Performance Timeline, or may identify
+         * any of the timestamp properties provided by the PerformanceNodeTiming class. If the named startMark does not exist,
+         * then startMark is set to timeOrigin by default.
+         *
+         * The endMark argument must identify any existing PerformanceMark in the the Performance Timeline or any of the timestamp
+         * properties provided by the PerformanceNodeTiming class. If the named endMark does not exist, an error will be thrown.
+         * @param name
+         * @param startMark
+         * @param endMark
+         */
+        measure(name: string, startMark: string, endMark: string): void;
+
+        /**
+         * An instance of the PerformanceNodeTiming class that provides performance metrics for specific Node.js operational milestones.
+         */
+        readonly nodeTiming: PerformanceNodeTiming;
+
+        /**
+         * @return the current high resolution millisecond timestamp
+         */
+        now(): number;
+
+        /**
+         * The timeOrigin specifies the high resolution millisecond timestamp from which all performance metric durations are measured.
+         */
+        readonly timeOrigin: number;
+
+        /**
+         * Wraps a function within a new function that measures the running time of the wrapped function.
+         * A PerformanceObserver must be subscribed to the 'function' event type in order for the timing details to be accessed.
+         * @param fn
+         */
+        timerify<T extends (...optionalParams: any[]) => any>(fn: T): T;
+    }
+
+    export interface PerformanceObserverEntryList {
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * @return Returns a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+    }
+
+    export type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
+
+    export class PerformanceObserver {
+        constructor(callback: PerformanceObserverCallback);
+
+        /**
+         * Disconnects the PerformanceObserver instance from all notifications.
+         */
+        disconnect(): void;
+
+        /**
+         * Subscribes the PerformanceObserver instance to notifications of new PerformanceEntry instances identified by options.entryTypes.
+         * When options.buffered is false, the callback will be invoked once for every PerformanceEntry instance.
+         * Property buffered defaults to false.
+         * @param options
+         */
+        observe(options: { entryTypes: string[], buffered?: boolean }): void;
+    }
+
+    export namespace constants {
+        export const NODE_PERFORMANCE_GC_MAJOR: number;
+        export const NODE_PERFORMANCE_GC_MINOR: number;
+        export const NODE_PERFORMANCE_GC_INCREMENTAL: number;
+        export const NODE_PERFORMANCE_GC_WEAKCB: number;
+    }
+
+    const performance: Performance;
+}
diff --git a/types/node/inspector.d.ts b/types/node/inspector.d.ts
index 445f55410d..955239b486 100644
--- a/types/node/inspector.d.ts
+++ b/types/node/inspector.d.ts
@@ -690,6 +690,11 @@ declare module "inspector" {
              * Stack trace captured when the call was made.
              */
             stackTrace?: Runtime.StackTrace;
+            /**
+             * Console context descriptor for calls on non-default console context (not console.*): 'anonymous#unique-logger-id' for call on unnamed context, 'name#unique-logger-id' for call on named context.
+             * @experimental
+             */
+            context?: string;
         }
 
         export interface InspectRequestedEventDataType {
@@ -1434,6 +1439,10 @@ declare module "inspector" {
              * Source ranges inside the function with coverage data.
              */
             ranges: Profiler.CoverageRange[];
+            /**
+             * Whether coverage data for this function has block granularity.
+             */
+            isBlockCoverage: boolean;
         }
 
         /**
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 8e53bf74d4..dccde2db47 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -29,6 +29,7 @@ import * as dns from "dns";
 import * as async_hooks from "async_hooks";
 import * as http2 from "http2";
 import * as inspector from "inspector";
+import * as perf_hooks from "perf_hooks";
 import Module = require("module");
 
 // Specifically test buffer module regression.
@@ -338,6 +339,42 @@ namespace fs_tests {
         b = fs.realpathSync('/path/to/folder', { encoding: 'buffer' });
         const v2 = fs.realpathSync('/path/to/folder', { encoding: s });
         typeof v2 === "string" ? s = v2 : b = v2;
+
+        // native
+        fs.realpath.native('/path/to/folder', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', undefined, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', 'utf8', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', 'buffer', (err, resolvedPath) => b = resolvedPath);
+        fs.realpath.native('/path/to/folder', s, (err, resolvedPath) => typeof resolvedPath === 'string' ? s = resolvedPath : b = resolvedPath);
+        fs.realpath.native('/path/to/folder', {}, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: undefined }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: 'utf8' }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: 'buffer' }, (err, resolvedPath) => b = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: s }, (err, resolvedPath) => typeof resolvedPath === "string" ? s = resolvedPath : b = resolvedPath);
+
+        s = fs.realpathSync.native('/path/to/folder');
+        s = fs.realpathSync.native('/path/to/folder', undefined);
+        s = fs.realpathSync.native('/path/to/folder', 'utf8');
+        b = fs.realpathSync.native('/path/to/folder', 'buffer');
+        const v3 = fs.realpathSync.native('/path/to/folder', s);
+        typeof v3 === "string" ? s = v3 : b = v3;
+
+        s = fs.realpathSync.native('/path/to/folder', {});
+        s = fs.realpathSync.native('/path/to/folder', { encoding: undefined });
+        s = fs.realpathSync.native('/path/to/folder', { encoding: 'utf8' });
+        b = fs.realpathSync.native('/path/to/folder', { encoding: 'buffer' });
+        const v4 = fs.realpathSync.native('/path/to/folder', { encoding: s });
+        typeof v4 === "string" ? s = v4 : b = v4;
+    }
+
+    {
+        fs.copyFile('/path/to/src', '/path/to/dest', (err) => console.error(err));
+        fs.copyFile('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL, (err) => console.error(err));
+
+        fs.copyFileSync('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL);
+
+        const cf = util.promisify(fs.copyFile);
+        cf('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL).then(console.log);
     }
 }
 
@@ -395,6 +432,46 @@ function bufferTests() {
         const buf1: Buffer = Buffer.from('this is a tést');
         const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
     }
+    // Class Method: Buffer.alloc(size[, fill[, encoding]])
+    {
+        const buf1: Buffer = Buffer.alloc(5);
+        const buf2: Buffer = Buffer.alloc(5, 'a');
+        const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
+    }
+    // Class Method: Buffer.allocUnsafe(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafe(5);
+    }
+    // Class Method: Buffer.allocUnsafeSlow(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafeSlow(10);
+    }
+
+    // Class Method byteLenght
+    {
+        let len: number;
+        len = Buffer.byteLength("foo");
+        len = Buffer.byteLength("foo", "utf8");
+
+        const b = Buffer.from("bar");
+        len = Buffer.byteLength(b);
+        len = Buffer.byteLength(b, "utf16le");
+
+        const ab = new ArrayBuffer(15);
+        len = Buffer.byteLength(ab);
+        len = Buffer.byteLength(ab, "ascii");
+
+        const dv = new DataView(ab);
+        len = Buffer.byteLength(dv);
+        len = Buffer.byteLength(dv, "utf16le");
+    }
+
+    // Class Method poolSize
+    {
+        let s: number;
+        s = Buffer.poolSize;
+        Buffer.poolSize = 4096;
+    }
 
     // Test that TS 1.6 works with the 'as Buffer' annotation
     // on isBuffer.
@@ -505,6 +582,8 @@ namespace url_tests {
     {
         url.format(url.parse('http://www.example.com/xyz'));
 
+        url.format('http://www.example.com/xyz');
+
         // https://google.com/search?q=you're%20a%20lizard%2C%20gary
         url.format({
             protocol: 'https',
@@ -518,8 +597,23 @@ namespace url_tests {
     }
 
     {
-        var helloUrl = url.parse('http://example.com/?hello=world', true);
-        assert.equal(helloUrl.query.hello, 'world');
+        const helloUrl = url.parse('http://example.com/?hello=world', true);
+        let helloQuery = helloUrl.query['hello'];
+        assert.equal(helloUrl.query['hello'], 'world');
+
+        let strUrl = url.parse('http://example.com/?hello=world');
+        let queryStr: string = strUrl.query;
+
+        strUrl = url.parse('http://example.com/?hello=world', false);
+        queryStr = strUrl.query;
+
+        function getBoolean(): boolean { return false; }
+        const urlUrl = url.parse('http://example.com/?hello=world', getBoolean());
+        if (typeof(urlUrl.query) === 'string') {
+            queryStr = urlUrl.query;
+        } else if (urlUrl.query) {
+            helloQuery = urlUrl.query['hello'];
+        }
     }
 
     {
@@ -644,6 +738,7 @@ namespace util_tests {
         assert(typeof util.inspect.custom === 'symbol');
 
         // util.callbackify
+        // tslint:disable-next-line no-unnecessary-class
         class callbackifyTest {
             static fn(): Promise<void> {
                 assert(arguments.length === 0);
@@ -718,6 +813,10 @@ namespace util_tests {
         // util.promisify
         var readPromised = util.promisify(fs.readFile);
         var sampleRead: Promise<any> = readPromised(__filename).then((data: Buffer): void => { }).catch((error: Error): void => { });
+        var arg0: () => Promise<number> = util.promisify((cb: (err: Error, result: number) => void): void => { });
+        var arg0NoResult: () => Promise<any> = util.promisify((cb: (err: Error) => void): void => { });
+        var arg1: (arg: string) => Promise<number> = util.promisify((arg: string, cb: (err: Error, result: number) => void): void => { });
+        var arg1NoResult: (arg: string) => Promise<any> = util.promisify((arg: string, cb: (err: Error) => void): void => { });
         assert(typeof util.promisify.custom === 'symbol');
         // util.deprecate
         const foo = () => {};
@@ -739,13 +838,16 @@ function stream_readable_pipe_test() {
     var z = zlib.createGzip({ finishFlush: zlib.constants.Z_FINISH });
     var w = fs.createWriteStream('file.txt.gz');
 
+    assert(typeof z.bytesRead === 'number');
     assert(typeof r.bytesRead === 'number');
     assert(typeof r.path === 'string');
     assert(rs.path instanceof Buffer);
 
     r.pipe(z).pipe(w);
 
+    z.flush();
     r.close();
+    z.close();
     rs.close();
 }
 
@@ -799,6 +901,9 @@ function simplified_stream_ctor_test() {
         },
         destroy(error) {
             error.stack;
+        },
+        final(cb) {
+            cb(null);
         }
     });
 
@@ -857,9 +962,39 @@ function simplified_stream_ctor_test() {
 
 namespace crypto_tests {
     {
+        // crypto_hash_string_test
+        var hashResult: string = crypto.createHash('md5').update('world').digest('hex');
+    }
+
+    {
+        // crypto_hash_buffer_test
+        var hashResult: string = crypto.createHash('md5')
+            .update(new Buffer('world')).digest('hex');
+    }
+
+    {
+        // crypto_hash_dataview_test
+        var hashResult: string = crypto.createHash('md5')
+            .update(new DataView(new Buffer('world').buffer)).digest('hex');
+    }
+
+    {
+        // crypto_hmac_string_test
         var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
     }
 
+    {
+        // crypto_hmac_buffer_test
+        var hmacResult: string = crypto.createHmac('md5', 'hello')
+            .update(new Buffer('world')).digest('hex');
+    }
+
+    {
+        // crypto_hmac_dataview_test
+        var hmacResult: string = crypto.createHmac('md5', 'hello')
+            .update(new DataView(new Buffer('world').buffer)).digest('hex');
+    }
+
     {
         let hmac: crypto.Hmac;
         (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
@@ -903,6 +1038,28 @@ namespace crypto_tests {
         assert.deepEqual(clearText2, clearText);
     }
 
+    {
+        // crypto_cipher_decipher_dataview_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: DataView = new DataView(
+            new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]).buffer);
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
+
+        let cipherText: DataView = new DataView(Buffer.concat(cipherBuffers).buffer);
+
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
+
+        let clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+        assert.deepEqual(clearText2, clearText);
+    }
+
     {
         let buffer1: Buffer = new Buffer([1, 2, 3, 4, 5]);
         let buffer2: Buffer = new Buffer([1, 2, 3, 4, 5]);
@@ -950,6 +1107,9 @@ namespace tls_tests {
             port: 55
         };
         var tlsSocket = tls.connect(connOpts);
+
+        const ciphers: string[] = tls.getCiphers();
+        const curve: string = tls.DEFAULT_ECDH_CURVE;
     }
 
     {
@@ -1152,6 +1312,7 @@ namespace http_tests {
         const timeout: number = server.timeout;
         const listening: boolean = server.listening;
         const keepAliveTimeout: number = server.keepAliveTimeout;
+        server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
     }
 
     // http IncomingMessage
@@ -1253,6 +1414,10 @@ namespace http_tests {
         http.request({ agent: undefined });
     }
 
+    {
+        http.request('http://www.example.com/xyz');
+    }
+
     {
         // Make sure .listen() and .close() return a Server instance
         http.createServer().listen(0).close().address();
@@ -1266,9 +1431,24 @@ namespace http_tests {
         request.abort();
     }
 
-    const options: http.RequestOptions = {
-        timeout: 30000
-    };
+    // http request options
+    {
+        const requestOpts: http.RequestOptions = {
+            timeout: 30000
+        };
+
+        const clientArgs: http.ClientRequestArgs = {
+            timeout: 30000
+        };
+    }
+
+    // http headers
+    {
+        const headers: http.IncomingHttpHeaders = {
+            'content-type': 'application/json',
+            'set-cookie': [ 'type=ninja', 'language=javascript' ]
+        };
+    }
 }
 
 //////////////////////////////////////////////////////
@@ -1295,6 +1475,17 @@ namespace https_tests {
     https.request({
         agent: undefined
     });
+
+    https.request('http://www.example.com/xyz');
+
+    {
+        const server = new https.Server();
+
+        const timeout: number = server.timeout;
+        const listening: boolean = server.listening;
+        const keepAliveTimeout: number = server.keepAliveTimeout;
+        server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -1332,6 +1523,8 @@ namespace dgram_tests {
         ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
         });
         ds.send(new Buffer("hello"), 5000, "127.0.0.1");
+        ds.setMulticastInterface("127.0.0.1");
+        ds = dgram.createSocket({ type: "udp4", reuseAddr: true, recvBufferSize: 1000, sendBufferSize: 1000, lookup: dns.lookup });
     }
 
     {
@@ -1403,6 +1596,20 @@ namespace dgram_tests {
             let _rinfo: dgram.AddressInfo = rinfo;
         });
     }
+
+    {
+        let ds: dgram.Socket = dgram.createSocket({
+            type: 'udp4',
+            recvBufferSize: 10000,
+            sendBufferSize: 15000
+        });
+
+        let size: number;
+        size = ds.getRecvBufferSize();
+        ds.setRecvBufferSize(size);
+        size = ds.getSendBufferSize();
+        ds.setSendBufferSize(size);
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -1538,19 +1745,7 @@ namespace path_tests {
     // returns
     //        ['foo', 'bar', 'baz']
 
-    console.log(process.env.PATH);
-    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
-
-    process.env.PATH.split(path.delimiter);
-    // returns
-    //        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
-
-    console.log(process.env.PATH);
-    // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
-
-    process.env.PATH.split(path.delimiter);
-    // returns
-    //        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
+    process.env["PATH"]; // $ExpectType string
 
     path.parse('/home/user/dir/file.txt');
     // returns
@@ -1581,6 +1776,55 @@ namespace path_tests {
     });
     // returns
     //    '/home/user/dir/file.txt'
+
+    path.format({
+        root: "/",
+        dir: "/home/user/dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        root: "/",
+        dir: "/home/user/dir",
+        base: "file.txt",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.win32.format({
+        root: "C:\\",
+        dir: "C:\\home\\user\\dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
+
+    path.win32.format({
+        dir: "C:\\home\\user\\dir",
+        base: "file.txt"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
 }
 
 ////////////////////////////////////////////////////
@@ -1671,6 +1915,14 @@ namespace readline_tests {
         readline.cursorTo(stream, x, y);
     }
 
+    {
+        let stream: NodeJS.ReadableStream;
+        let readLineInterface: readline.ReadLine;
+
+        readline.emitKeypressEvents(stream);
+        readline.emitKeypressEvents(stream, readLineInterface);
+    }
+
     {
         let stream: NodeJS.WritableStream;
         let dx: number | string;
@@ -1781,23 +2033,23 @@ namespace child_process_tests {
         childProcess.spawnSync("echo test");
     }
 
-	{
-		childProcess.execFile("npm", () => {});
-		childProcess.execFile("npm", ["-v"], () => {});
-		childProcess.execFile("npm", ["-v"], { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
-		childProcess.execFile("npm", ["-v"], { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
-		childProcess.execFile("npm", { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
-		childProcess.execFile("npm", { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
-	}
+    {
+        childProcess.execFile("npm", () => {});
+        childProcess.execFile("npm", ["-v"], () => {});
+        childProcess.execFile("npm", ["-v"], { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", ["-v"], { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+        childProcess.execFile("npm", { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+    }
 
     async function testPromisify() {
         const execFile = util.promisify(childProcess.execFile);
-		let r: { stdout: string | Buffer, stderr: string | Buffer } = await execFile("npm");
-		r = await execFile("npm", ["-v"]);
-		r = await execFile("npm", ["-v"], { encoding: 'utf-8' });
-		r = await execFile("npm", ["-v"], { encoding: 'buffer' });
-		r = await execFile("npm", { encoding: 'utf-8' });
-		r = await execFile("npm", { encoding: 'buffer' });
+        let r: { stdout: string | Buffer, stderr: string | Buffer } = await execFile("npm");
+        r = await execFile("npm", ["-v"]);
+        r = await execFile("npm", ["-v"], { encoding: 'utf-8' });
+        r = await execFile("npm", ["-v"], { encoding: 'buffer' });
+        r = await execFile("npm", { encoding: 'utf-8' });
+        r = await execFile("npm", { encoding: 'buffer' });
     }
 
     {
@@ -2011,6 +2263,36 @@ namespace child_process_tests {
             let _sendHandle: net.Socket | net.Server = sendHandle;
         });
     }
+    {
+        process.stdin.setEncoding('utf8');
+
+        process.stdin.on('readable', () => {
+            const chunk = process.stdin.read();
+            if (chunk !== null) {
+              process.stdout.write(`data: ${chunk}`);
+            }
+        });
+
+        process.stdin.on('end', () => {
+            process.stdout.write('end');
+        });
+
+        process.stdin.pipe(process.stdout);
+
+        console.log(process.stdin.isTTY);
+        console.log(process.stdout.isTTY);
+
+        console.log(process.stdin instanceof net.Socket);
+        console.log(process.stdout instanceof fs.ReadStream);
+
+        var stdin: stream.Readable = process.stdin;
+        console.log(stdin instanceof net.Socket);
+        console.log(stdin instanceof fs.ReadStream);
+
+        var stdout: stream.Writable = process.stdout;
+        console.log(stdout instanceof net.Socket);
+        console.log(stdout instanceof fs.WriteStream);
+    }
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -2292,6 +2574,26 @@ namespace errors_tests {
         const myObject = {};
         Error.captureStackTrace(myObject);
     }
+    {
+        let frames: NodeJS.CallSite[] = [];
+        Error.prepareStackTrace(new Error(), frames);
+    }
+    {
+        let frame: NodeJS.CallSite = null;
+        let frameThis: any = frame.getThis();
+        let typeName: string = frame.getTypeName();
+        let func: Function = frame.getFunction();
+        let funcName: string = frame.getFunctionName();
+        let meth: string = frame.getMethodName();
+        let fname: string = frame.getFileName();
+        let lineno: number = frame.getLineNumber();
+        let colno: number = frame.getColumnNumber();
+        let evalOrigin: string = frame.getEvalOrigin();
+        let isTop: boolean = frame.isToplevel();
+        let isEval: boolean = frame.isEval();
+        let isNative: boolean = frame.isNative();
+        let isConstr: boolean = frame.isConstructor();
+    }
 }
 
 ///////////////////////////////////////////////////////////
@@ -2332,6 +2634,13 @@ namespace process_tests {
         const oldHandler = listeners[listeners.length - 1];
         process.addListener('uncaughtException', oldHandler);
     }
+    {
+        function myCb(err: Error): void {
+        }
+        process.setUncaughtExceptionCaptureCallback(myCb);
+        process.setUncaughtExceptionCaptureCallback(null);
+        const b: boolean = process.hasUncaughtExceptionCaptureCallback();
+    }
 }
 
 ///////////////////////////////////////////////////////////
@@ -2355,6 +2664,19 @@ namespace console_tests {
 ///////////////////////////////////////////////////
 
 namespace net_tests {
+    {
+        const connectOpts: net.NetConnectOpts = {
+            allowHalfOpen: true,
+            family: 4,
+            host: "localhost",
+            port: 443,
+            timeout: 10E3
+        };
+        const socket: net.Socket = net.createConnection(connectOpts, (): void => {
+            // nothing
+        });
+    }
+
     {
         let server = net.createServer();
         // Check methods which return server instances by chaining calls
@@ -2375,6 +2697,13 @@ namespace net_tests {
     }
 
     {
+        const constructorOpts: net.SocketConstructorOpts = {
+            fd: 1,
+            allowHalfOpen: false,
+            readable: false,
+            writable: false
+        };
+
         /**
          * net.Socket - events.EventEmitter
          *   1. close
@@ -2386,12 +2715,7 @@ namespace net_tests {
          *   7. lookup
          *   8. timeout
          */
-        let _socket: net.Socket = new net.Socket({
-            fd: 1,
-            allowHalfOpen: false,
-            readable: false,
-            writable: false
-        });
+        let _socket: net.Socket = new net.Socket(constructorOpts);
 
         let bool: boolean;
         let buffer: Buffer;
@@ -2399,6 +2723,29 @@ namespace net_tests {
         let str: string;
         let num: number;
 
+        let ipcConnectOpts: net.IpcSocketConnectOpts = {
+            path: "/"
+        };
+        let tcpConnectOpts: net.TcpSocketConnectOpts = {
+            family: 4,
+            hints: 0,
+            host: "localhost",
+            localAddress: "10.0.0.1",
+            localPort: 1234,
+            lookup: (_hostname: string, _options: dns.LookupOneOptions, _callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void => {
+                // nothing
+            },
+            port: 80
+        };
+        _socket = _socket.connect(ipcConnectOpts);
+        _socket = _socket.connect(ipcConnectOpts, (): void => {});
+        _socket = _socket.connect(tcpConnectOpts);
+        _socket = _socket.connect(tcpConnectOpts, (): void => {});
+        _socket = _socket.connect(80, "localhost");
+        _socket = _socket.connect(80, "localhost", (): void => {});
+        _socket = _socket.connect(80);
+        _socket = _socket.connect(80, (): void => {});
+
         /// addListener
 
         _socket = _socket.addListener("close", had_error => {
@@ -2746,6 +3093,7 @@ namespace dns_tests {
 ///////////////////////////////////////////////////////////
 
 import * as constants from 'constants';
+import { PerformanceObserver, PerformanceObserverCallback } from "perf_hooks";
 namespace constants_tests {
     var str: string;
     var num: number;
@@ -2803,6 +3151,7 @@ namespace constants_tests {
     num = constants.O_NOATIME;
     num = constants.O_NOFOLLOW;
     num = constants.O_SYNC;
+    num = constants.O_DSYNC;
     num = constants.O_DIRECT;
     num = constants.O_NONBLOCK;
     num = constants.S_IRWXU;
@@ -2900,26 +3249,46 @@ namespace v8_tests {
     v8.setFlagsFromString('--collect_maps');
 }
 
-///////////////////////////////////////////////////////////
-/// Debugger Tests                                      ///
-///////////////////////////////////////////////////////////
+////////////////////////////////////////////////////
+/// PerfHooks tests : https://nodejs.org/api/perf_hooks.html
+////////////////////////////////////////////////////
+namespace perf_hooks_tests {
+    perf_hooks.performance.mark('start');
+    (
+        () => {}
+    )();
+    perf_hooks.performance.mark('end');
 
-import { Client } from "_debugger";
+    const { duration } = perf_hooks.performance.getEntriesByName('discover')[0];
+    const timeOrigin = perf_hooks.performance.timeOrigin;
 
-var client = new Client();
-
-client.connect(8888, 'localhost');
-client.listbreakpoints((err, body, packet) => { });
+    const performanceObserverCallback: PerformanceObserverCallback = (list, obs) => {
+        const {
+            duration,
+            entryType,
+            name,
+            startTime,
+        } = list.getEntries()[0];
+        obs.disconnect();
+        perf_hooks.performance.clearFunctions();
+    };
+    const obs = new perf_hooks.PerformanceObserver(performanceObserverCallback);
+    obs.observe({
+        entryTypes: ['function'],
+        buffered: true,
+    });
+}
 
 ////////////////////////////////////////////////////
 /// AsyncHooks tests : https://nodejs.org/api/async_hooks.html
 ////////////////////////////////////////////////////
 namespace async_hooks_tests {
     const hooks: async_hooks.HookCallbacks = {
-        init: (asyncId: number, type: string, triggerAsyncId: number, resource: object) => void {},
-        before: (asyncId: number) => void {},
-        after: (asyncId: number) => void {},
-        destroy: (asyncId: number) => void {}
+        init() {},
+        before() {},
+        after() {},
+        destroy() {},
+        promiseResolve() {},
     };
 
     const asyncHook = async_hooks.createHook(hooks);
@@ -2928,6 +3297,27 @@ namespace async_hooks_tests {
 
     const tId: number = async_hooks.triggerAsyncId();
     const eId: number = async_hooks.executionAsyncId();
+
+    class TestResource extends async_hooks.AsyncResource {
+        constructor() {
+            super('TEST_RESOURCE');
+        }
+    }
+
+    class AnotherTestResource extends async_hooks.AsyncResource {
+        constructor() {
+            super('TEST_RESOURCE', 42);
+            const aId: number = this.asyncId();
+            const tId: number = this.triggerAsyncId();
+        }
+        run() {
+            this.emitBefore();
+            this.emitAfter();
+        }
+        destroy() {
+            this.emitDestroy();
+        }
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -2999,7 +3389,7 @@ namespace http2_tests {
             exclusive: true,
             parent: 0,
             weight: 0,
-            getTrailers: (trailers: http2.IncomingHttpHeaders) => {}
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {}
         };
         (http2Session as http2.ClientHttp2Session).request();
         (http2Session as http2.ClientHttp2Session).request(headers);
@@ -3106,24 +3496,33 @@ namespace http2_tests {
 
         let options: http2.ServerStreamResponseOptions = {
             endStream: true,
-            getTrailers: (trailers: http2.IncomingHttpHeaders) => {}
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {}
         };
         serverHttp2Stream.respond();
         serverHttp2Stream.respond(headers);
         serverHttp2Stream.respond(headers, options);
 
         let options2: http2.ServerStreamFileResponseOptions = {
-            statCheck: (stats: fs.Stats, headers: http2.IncomingHttpHeaders, statOptions: http2.StatOptions) => {},
-            getTrailers: (trailers: http2.IncomingHttpHeaders) => {},
+            statCheck: (stats: fs.Stats, headers: http2.OutgoingHttpHeaders, statOptions: http2.StatOptions) => {},
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {},
             offset: 0,
             length: 0
         };
         serverHttp2Stream.respondWithFD(0);
         serverHttp2Stream.respondWithFD(0, headers);
         serverHttp2Stream.respondWithFD(0, headers, options2);
+        serverHttp2Stream.respondWithFD(0, headers, {statCheck: () => false});
+        let options3: http2.ServerStreamFileResponseOptionsWithError = {
+            onError: (err: NodeJS.ErrnoException) => {},
+            statCheck: (stats: fs.Stats, headers: http2.OutgoingHttpHeaders, statOptions: http2.StatOptions) => {},
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {},
+            offset: 0,
+            length: 0
+        };
         serverHttp2Stream.respondWithFile('');
         serverHttp2Stream.respondWithFile('', headers);
-        serverHttp2Stream.respondWithFile('', headers, options2);
+        serverHttp2Stream.respondWithFile('', headers, options3);
+        serverHttp2Stream.respondWithFile('', headers, {statCheck: () => false});
     }
 
     // Http2Server / Http2SecureServer
@@ -3156,7 +3555,8 @@ namespace http2_tests {
             settings,
             allowHTTP1: true
         };
-        let secureServerOptions: http2.SecureServerOptions = { ...serverOptions };
+        // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
+        let secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);
         secureServerOptions.ca = '';
         let onRequestHandler = (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => {
             // Http2ServerRequest
@@ -3198,8 +3598,7 @@ namespace http2_tests {
             let headersSent: boolean = response.headersSent;
 
             response.setTimeout(0, () => {});
-            response.createPushResponse(outgoingHeaders);
-            response.createPushResponse(outgoingHeaders, (err: Error) => {});
+            response.createPushResponse(outgoingHeaders, (err: Error | null, res: http2.Http2ServerResponse) => {});
 
             response.writeContinue();
             response.writeHead(200);
@@ -3254,7 +3653,8 @@ namespace http2_tests {
             selectPadding: (frameLen: number, maxFrameLen: number) => 0,
             settings
         };
-        let secureClientSessionOptions: http2.SecureClientSessionOptions = { ...clientSessionOptions };
+        // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
+        let secureClientSessionOptions: http2.SecureClientSessionOptions = Object.assign({}, clientSessionOptions);
         secureClientSessionOptions.ca = '';
         let onConnectHandler = (session: http2.Http2Session, socket: net.Socket) => {};
 
@@ -3507,8 +3907,9 @@ namespace inspector_tests {
         session.disconnect();
 
         // Unknown post method
-        session.post('A.b', { key: 'value' }, (err: Error, params: object) => {});
-        session.post('A.b', (err: Error, params: object) => {});
+        session.post('A.b', { key: 'value' }, (err, params) => {});
+        // TODO: parameters are implicitly 'any' and need type annotation
+        session.post('A.b', (err: Error | null, params?: {}) => {});
         session.post('A.b');
         // Known post method
         const parameter: inspector.Runtime.EvaluateParameterType = { expression: '2 + 2' };
@@ -3521,7 +3922,9 @@ namespace inspector_tests {
         session.post('Runtime.evaluate');
 
         // General event
-        session.on('inspectorNotification', (message: inspector.InspectorNotification<object>) => {});
+        session.on('inspectorNotification', message => {
+            message; // $ExpectType InspectorNotification<{}>
+        });
         // Known events
         session.on('Debugger.paused', (message: inspector.InspectorNotification<inspector.Debugger.PausedEventDataType>) => {
             const method: string = message.method;
@@ -3543,4 +3946,17 @@ namespace module_tests {
 
     const m1: Module = new Module("moduleId");
     const m2: Module = new Module.Module("moduleId");
+    const b: string[] = Module.builtinModules;
+    let paths: string[] = module.paths;
+    paths = m1.paths;
+}
+
+////////////////////////////////////////////////////
+/// Node.js ESNEXT Support
+////////////////////////////////////////////////////
+
+namespace esnext_string_tests {
+    const s: string = 'foo';
+    const s1: string = s.trimLeft();
+    const s2: string = s.trimRight();
 }
diff --git a/types/node/tsconfig.json b/types/node/tsconfig.json
index e3ac3b2f91..9f4317b9f4 100644
--- a/types/node/tsconfig.json
+++ b/types/node/tsconfig.json
@@ -5,6 +5,7 @@
     ],
     "compilerOptions": {
         "module": "commonjs",
+        "target": "es6",
         "lib": [
             "es6"
         ],
diff --git a/types/node/tslint.json b/types/node/tslint.json
index e60d5e7de9..45064d266f 100644
--- a/types/node/tslint.json
+++ b/types/node/tslint.json
@@ -12,6 +12,9 @@
     "no-inferrable-types": false,
     "no-internal-module": false,
     "no-namespace": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
+    "no-unnecessary-class": false,
     "no-unnecessary-generics": false,
     "no-unnecessary-qualifier": false,
     "no-var-keyword": false,
diff --git a/types/node/v0/index.d.ts b/types/node/v0/index.d.ts
index 1b4585bd66..814bbe793e 100644
--- a/types/node/v0/index.d.ts
+++ b/types/node/v0/index.d.ts
@@ -221,7 +221,7 @@ declare namespace NodeJS {
         writable: boolean;
         write(buffer: Buffer|string, cb?: Function): boolean;
         write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
+        end(cb?: Function): void;
         end(buffer: Buffer, cb?: Function): void;
         end(str: string, cb?: Function): void;
         end(str: string, encoding?: string, cb?: Function): void;
@@ -462,6 +462,23 @@ declare module "http" {
     import * as net from "net";
     import * as stream from "stream";
 
+    export interface RequestOptions {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: { [key: string]: any };
+        auth?: string;
+        agent?: Agent | boolean;
+        keepAlive?: boolean;
+        keepAliveMsecs?: number;
+    }
+
     export interface Server extends events.EventEmitter {
         listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server;
         listen(port: number, hostname?: string, callback?: Function): Server;
@@ -599,7 +616,7 @@ declare module "http" {
     };
     export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) =>void ): Server;
     export function createClient(port?: number, host?: string): any;
-    export function request(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: IncomingMessage) => void): ClientRequest;
     export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
@@ -615,7 +632,7 @@ declare module "cluster" {
     }
 
     export class Worker extends events.EventEmitter {
-        id: string;
+        id: number;
         process: child.ChildProcess;
         suicide: boolean;
         send(message: any, sendHandle?: any): void;
@@ -756,15 +773,7 @@ declare module "https" {
         SNICallback?: (servername: string) => any;
     }
 
-    export interface RequestOptions {
-        host?: string;
-        hostname?: string;
-        port?: number;
-        path?: string;
-        method?: string;
-        headers?: any;
-        auth?: string;
-        agent?: any;
+    export interface RequestOptions extends http.RequestOptions {
         pfx?: any;
         key?: any;
         passphrase?: string;
@@ -784,7 +793,7 @@ declare module "https" {
     };
     export interface Server extends tls.Server { }
     export function createServer(options: ServerOptions, requestListener?: Function): Server;
-    export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
     export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
     export var globalAgent: Agent;
 }
@@ -956,23 +965,28 @@ declare module "child_process" {
 }
 
 declare module "url" {
-    export interface Url {
+    export interface UrlObject {
         href?: string;
         protocol?: string;
+        slashes?: boolean;
+        host?: string;
         auth?: string;
         hostname?: string;
-        port?: string;
-        host?: string;
+        port?: string | number;
         pathname?: string;
         search?: string;
-        query?: any; // string | Object
-        slashes?: boolean;
-        hash?: string;
         path?: string;
+        query?: string | { [key: string]: any; };
+        hash?: string;
+    }
+
+    export interface Url extends UrlObject {
+        port?: string;
+        query?: any;
     }
 
     export function parse(urlStr: string, parseQueryString?: boolean , slashesDenoteHost?: boolean ): Url;
-    export function format(url: Url): string;
+    export function format(urlObject: UrlObject): string;
     export function resolve(from: string, to: string): string;
 }
 
@@ -1472,7 +1486,7 @@ declare module "path" {
      *
      * @param pathSegments string paths to join.  Non-string arguments are ignored.
      */
-    export function resolve(...pathSegments: any[]): string;
+    export function resolve(...pathSegments: string[]): string;
     /**
      * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
      *
@@ -1790,7 +1804,7 @@ declare module "stream" {
         write(chunk: any, cb?: Function): boolean;
         write(chunk: any, encoding?: string, cb?: Function): boolean;
         setDefaultEncoding(encoding: string): this;
-        end(): void;
+        end(cb?: Function): void;
         end(chunk: any, cb?: Function): void;
         end(chunk: any, encoding?: string, cb?: Function): void;
     }
@@ -1807,7 +1821,7 @@ declare module "stream" {
         write(chunk: any, cb?: Function): boolean;
         write(chunk: any, encoding?: string, cb?: Function): boolean;
         setDefaultEncoding(encoding: string): this;
-        end(): void;
+        end(cb?: Function): void;
         end(chunk: any, cb?: Function): void;
         end(chunk: any, encoding?: string, cb?: Function): void;
     }
diff --git a/types/node/v0/node-tests.ts b/types/node/v0/node-tests.ts
index 91e85f5a0c..8e2443b360 100644
--- a/types/node/v0/node-tests.ts
+++ b/types/node/v0/node-tests.ts
@@ -8,6 +8,7 @@ import * as util from "util";
 import * as crypto from "crypto";
 import * as tls from "tls";
 import * as http from "http";
+import * as https from "https";
 import * as net from "net";
 import * as dgram from "dgram";
 import * as querystring from "querystring";
@@ -250,6 +251,15 @@ namespace http_tests {
 	});
 
 	var agent: http.Agent = http.globalAgent;
+
+    http.request('http://www.example.com/xyz');
+}
+
+////////////////////////////////////////////////////
+/// Https tests : http://nodejs.org/api/https.html
+////////////////////////////////////////////////////
+namespace https_tests {
+    https.request('http://www.example.com/xyz');
 }
 
 ////////////////////////////////////////////////////
diff --git a/types/node/v0/tslint.json b/types/node/v0/tslint.json
index f4eb951ec6..c752378347 100644
--- a/types/node/v0/tslint.json
+++ b/types/node/v0/tslint.json
@@ -23,6 +23,8 @@
     "no-namespace": false,
     "no-padding": false,
     "no-string-throw": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
     "no-unnecessary-generics": false,
     "no-unnecessary-qualifier": false,
     "no-var-keyword": false,
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 959cc83545..b2db9f80ee 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for Node.js 4.2
+// Type definitions for Node.js 4.x
 // Project: http://nodejs.org/
-// Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
@@ -32,8 +34,18 @@ interface Error {
     stack?: string;
 }
 
+// Declare "static" methods in Error
 interface ErrorConstructor {
+    /** Create .stack property on a target object */
     captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
     stackTraceLimit: number;
 }
 
@@ -154,8 +166,6 @@ declare var Buffer: {
     prototype: Buffer;
     /**
      * Allocates a new Buffer using an {array} of octets.
-     *
-     * @param array
      */
     from(array: any[]): Buffer;
     /**
@@ -165,22 +175,16 @@ declare var Buffer: {
      * within the {arrayBuffer} that will be shared by the Buffer.
      *
      * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
-     * @param byteOffset
-     * @param length
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?:number): Buffer;
     /**
      * Copies the passed {buffer} data onto a new Buffer instance.
-     *
-     * @param buffer
      */
     from(buffer: Buffer): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
      * If not provided, {encoding} defaults to 'utf8'.
-     *
-     * @param str
      */
     from(str: string, encoding?: string): Buffer;
     /**
@@ -220,6 +224,29 @@ declare var Buffer: {
      * The same as buf1.compare(buf2).
      */
     compare(buf1: Buffer, buf2: Buffer): number;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     * @param fill if specified, buffer will be initialized by calling buf.fill(fill).
+     *    If parameter is omitted, buffer will be filled with zeros.
+     * @param encoding encoding used for call to buf.fill while initalizing
+     */
+    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafe(size: number): Buffer;
+    /**
+     * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafeSlow(size: number): Buffer;
 };
 
 /************************************************
@@ -235,6 +262,80 @@ declare namespace NodeJS {
         customInspect?: boolean;
     }
 
+    export interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
+
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
+
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
+
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
+
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
+
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
+
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
+
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
+
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
+
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
+
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
+
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
+
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
+
     export interface ErrnoException extends Error {
         errno?: number;
         code?: string;
@@ -274,7 +375,7 @@ declare namespace NodeJS {
         writable: boolean;
         write(buffer: Buffer|string, cb?: Function): boolean;
         write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
+        end(cb?: Function): void;
         end(buffer: Buffer, cb?: Function): void;
         end(str: string, cb?: Function): void;
         end(str: string, encoding?: string, cb?: Function): void;
@@ -565,21 +666,74 @@ declare module "http" {
     import * as net from "net";
     import * as stream from "stream";
 
+    // incoming headers will never contain number
+    export interface IncomingHttpHeaders {
+        'accept'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-headers'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'date'?: string;
+        'expires'?: string;
+        'host'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'public-key-pins'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'tk'?: string;
+        'upgrade'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
+
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    export interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
     export interface RequestOptions {
         protocol?: string;
         host?: string;
         hostname?: string;
         family?: number;
-        port?: number;
+        port?: number | string;
         localAddress?: string;
         socketPath?: string;
         method?: string;
         path?: string;
-        headers?: { [key: string]: any };
+        headers?: OutgoingHttpHeaders;
         auth?: string;
-        agent?: Agent|boolean;
+        agent?: Agent | boolean;
+        timeout?: number;
     }
 
+    export type ClientRequestArgs = RequestOptions
+
     export interface Server extends net.Server {
         setTimeout(msecs: number, callback: Function): void;
         maxHeadersCount: number;
@@ -600,8 +754,8 @@ declare module "http" {
         write(str: string, encoding?: string, fd?: string): boolean;
 
         writeContinue(): void;
-        writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-        writeHead(statusCode: number, headers?: any): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
         statusCode: number;
         statusMessage: string;
         headersSent: boolean;
@@ -610,7 +764,7 @@ declare module "http" {
         getHeader(name: string): string;
         removeHeader(name: string): void;
         write(chunk: any, encoding?: string): any;
-        addTrailers(headers: any): void;
+        addTrailers(headers: OutgoingHttpHeaders): void;
 
         // Extended base methods
         end(): void;
@@ -636,7 +790,7 @@ declare module "http" {
         setHeader(name: string, value: string | string[]): void;
         getHeader(name: string): string;
         removeHeader(name: string): void;
-        addTrailers(headers: any): void;
+        addTrailers(headers: OutgoingHttpHeaders): void;
 
         // Extended base methods
         end(): void;
@@ -647,10 +801,10 @@ declare module "http" {
     }
     export interface IncomingMessage extends events.EventEmitter, stream.Readable {
         httpVersion: string;
-        headers: any;
+        headers: IncomingHttpHeaders;
         rawHeaders: string[];
-        trailers: any;
-        rawTrailers: any;
+        trailers: OutgoingHttpHeaders;
+        rawTrailers: string[];
         setTimeout(msecs: number, callback: Function): NodeJS.Timer;
         /**
          * Only valid for request obtained from http.Server.
@@ -720,7 +874,7 @@ declare module "http" {
     };
     export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) =>void ): Server;
     export function createClient(port?: number, host?: string): any;
-    export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: IncomingMessage) => void): ClientRequest;
     export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
@@ -742,7 +896,7 @@ declare module "cluster" {
     }
 
     export class Worker extends events.EventEmitter {
-        id: string;
+        id: number;
         process: child.ChildProcess;
         suicide: boolean;
         send(message: any, sendHandle?: any, callback?: (error: Error) => void): void;
@@ -946,7 +1100,7 @@ declare module "https" {
     };
     export interface Server extends tls.Server { }
     export function createServer(options: ServerOptions, requestListener?: Function): Server;
-    export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
     export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
     export var globalAgent: Agent;
 }
@@ -1236,23 +1390,28 @@ declare module "child_process" {
 }
 
 declare module "url" {
-    export interface Url {
+    export interface UrlObject {
         href?: string;
         protocol?: string;
+        slashes?: boolean;
+        host?: string;
         auth?: string;
         hostname?: string;
-        port?: string;
-        host?: string;
+        port?: string | number;
         pathname?: string;
         search?: string;
-        query?: string | any;
-        slashes?: boolean;
-        hash?: string;
         path?: string;
+        query?: string | { [key: string]: any; };
+        hash?: string;
+    }
+
+    export interface Url extends UrlObject {
+        port?: string;
+        query?: any;
     }
 
     export function parse(urlStr: string, parseQueryString?: boolean , slashesDenoteHost?: boolean ): Url;
-    export function format(url: Url): string;
+    export function format(urlObject: UrlObject): string;
     export function resolve(from: string, to: string): string;
 }
 
@@ -1571,15 +1730,11 @@ declare module "fs" {
 
     /**
      * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous rename
-     * @param oldPath
-     * @param newPath
      */
     export function renameSync(oldPath: string, newPath: string): void;
     export function truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
@@ -1624,79 +1779,62 @@ declare module "fs" {
     /**
      * Asynchronous unlink - deletes the file specified in {path}
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
      */
     export function unlinkSync(path: string): void;
     /**
      * Asynchronous rmdir - removes the directory specified in {path}
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
      */
     export function rmdirSync(path: string): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdirSync(path: string, mode?: number): void;
     /**
      * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdirSync(path: string, mode?: string): void;
     /**
      * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
      *
-     * @param prefix
      * @param callback The created folder path is passed as a string to the callback's second parameter.
      */
     export function mkdtemp(prefix: string, callback?: (err: NodeJS.ErrnoException, folder: string) => void): void;
     /**
      * Synchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
      *
-     * @param prefix
      * @returns Returns the created folder path.
      */
     export function mkdtempSync(prefix: string): string;
@@ -1731,8 +1869,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
-     * @param encoding
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
     export function readFile(filename: string, encoding: null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
@@ -1741,7 +1877,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
@@ -1751,7 +1886,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
@@ -1759,15 +1893,11 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
     export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
      */
     export function readFileSync(filename: string, encoding: null): Buffer;
     export function readFileSync(filename: string, encoding: string): string;
@@ -1775,7 +1905,6 @@ declare module "fs" {
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
      */
     export function readFileSync(filename: string, options: { encoding: null; flag?: string; }): Buffer;
@@ -1784,7 +1913,6 @@ declare module "fs" {
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
@@ -1828,6 +1956,7 @@ declare module "fs" {
         fd?: number;
         mode?: number;
         autoClose?: boolean;
+        highWaterMark?: number;
     }): ReadStream;
     export function createWriteStream(path: string, options?: {
         flags?: string;
@@ -1864,6 +1993,28 @@ declare module "path" {
          */
         name: string;
     }
+    export interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
 
     /**
      * Normalize a string path, reducing '..' and '.' parts.
@@ -1895,7 +2046,7 @@ declare module "path" {
      *
      * @param pathSegments string paths to join.  Non-string arguments are ignored.
      */
-    export function resolve(...pathSegments: any[]): string;
+    export function resolve(...pathSegments: string[]): string;
     /**
      * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
      *
@@ -1905,9 +2056,6 @@ declare module "path" {
     /**
      * Solve the relative path from {from} to {to}.
      * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     *
-     * @param from
-     * @param to
      */
     export function relative(from: string, to: string): string;
     /**
@@ -1950,7 +2098,7 @@ declare module "path" {
      *
      * @param pathString path to evaluate.
      */
-    export function format(pathObject: ParsedPath): string;
+    export function format(pathObject: FormatInputPathObject): string;
 
     export module posix {
       export function normalize(p: string): string;
@@ -1964,7 +2112,7 @@ declare module "path" {
       export var sep: string;
       export var delimiter: string;
       export function parse(p: string): ParsedPath;
-      export function format(pP: ParsedPath): string;
+      export function format(pP: FormatInputPathObject): string;
     }
 
     export module win32 {
@@ -1979,7 +2127,7 @@ declare module "path" {
       export var sep: string;
       export var delimiter: string;
       export function parse(p: string): ParsedPath;
-      export function format(pP: ParsedPath): string;
+      export function format(pP: FormatInputPathObject): string;
     }
 }
 
@@ -2229,7 +2377,7 @@ declare module "stream" {
         write(chunk: any, cb?: Function): boolean;
         write(chunk: any, encoding?: string, cb?: Function): boolean;
         setDefaultEncoding(encoding: string): this;
-        end(): void;
+        end(cb?: Function): void;
         end(chunk: any, cb?: Function): void;
         end(chunk: any, encoding?: string, cb?: Function): void;
     }
@@ -2248,7 +2396,7 @@ declare module "stream" {
         write(chunk: any, cb?: Function): boolean;
         write(chunk: any, encoding?: string, cb?: Function): boolean;
         setDefaultEncoding(encoding: string): this;
-        end(): void;
+        end(cb?: Function): void;
         end(chunk: any, cb?: Function): void;
         end(chunk: any, encoding?: string, cb?: Function): void;
     }
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 30bdbdda0c..2bb28ce779 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -268,6 +268,21 @@ function bufferTests() {
         const buf1: Buffer = Buffer.from('this is a tést');
         const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
     }
+    // Class Method: Buffer.alloc(size[, fill[, encoding]])
+    {
+        const buf1: Buffer = Buffer.alloc(5);
+        const buf2: Buffer = Buffer.alloc(5, 'a');
+        const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
+
+    }
+    // Class Method: Buffer.allocUnsafe(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafe(5);
+    }
+    // Class Method: Buffer.allocUnsafeSlow(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafeSlow(10);
+    }
 
     // Test that TS 1.6 works with the 'as Buffer' annotation
     // on isBuffer.
@@ -483,6 +498,10 @@ namespace http_tests {
         http.request({ agent: undefined });
     }
 
+    {
+        http.request('http://www.example.com/xyz');
+    }
+
     {
         // Make sure .listen() and .close() retuern a Server instance
         http.createServer().listen(0).close().address();
@@ -495,6 +514,25 @@ namespace http_tests {
         request.setNoDelay(true);
         request.abort();
     }
+
+    // http request options
+    {
+        const requestOpts: http.RequestOptions = {
+            timeout: 30000
+        };
+
+        const clientArgs: http.ClientRequestArgs = {
+            timeout: 30000
+        };
+    }
+
+    // http headers
+    {
+        const headers: http.IncomingHttpHeaders = {
+            'content-type': 'application/json',
+            'set-cookie': [ 'type=ninja', 'language=javascript' ]
+        };
+    }
 }
 
 //////////////////////////////////////////////////////
@@ -521,6 +559,8 @@ namespace https_tests {
     https.request({
         agent: undefined
     });
+
+    https.request('http://www.example.com/xyz');
 }
 
 ////////////////////////////////////////////////////
@@ -732,6 +772,46 @@ namespace path_tests {
     });
     // returns
     //    '/home/user/dir/file.txt'
+
+    path.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        root: "/",
+        dir: "/home/user/dir",
+        base: "file.txt",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.win32.format({
+        root: "C:\\",
+        dir: "C:\\home\\user\\dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
+
+    path.win32.format({
+        dir: "C:\\home\\user\\dir",
+        base: "file.txt"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
 }
 
 ////////////////////////////////////////////////////
@@ -983,6 +1063,26 @@ namespace errors_tests {
         const myObject = {};
         Error.captureStackTrace(myObject);
     }
+    {
+        let frames: NodeJS.CallSite[] = [];
+        Error.prepareStackTrace(new Error(), frames);
+    }
+    {
+        let frame: NodeJS.CallSite = null;
+        let frameThis: any = frame.getThis();
+        let typeName: string = frame.getTypeName();
+        let func: Function = frame.getFunction();
+        let funcName: string = frame.getFunctionName();
+        let meth: string = frame.getMethodName();
+        let fname: string = frame.getFileName();
+        let lineno: number = frame.getLineNumber();
+        let colno: number = frame.getColumnNumber();
+        let evalOrigin: string = frame.getEvalOrigin();
+        let isTop: boolean = frame.isToplevel();
+        let isEval: boolean = frame.isEval();
+        let isNative: boolean = frame.isNative();
+        let isConstr: boolean = frame.isConstructor();
+    }
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/types/node/v4/tslint.json b/types/node/v4/tslint.json
index 86acdea96f..518f58df03 100644
--- a/types/node/v4/tslint.json
+++ b/types/node/v4/tslint.json
@@ -24,6 +24,8 @@
     "no-namespace": false,
     "no-padding": false,
     "no-string-throw": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
     "no-unnecessary-generics": false,
     "no-unnecessary-qualifier": false,
     "no-var-keyword": false,
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index e89656eedf..5cbe7ab3dc 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -1,6 +1,10 @@
 // Type definitions for Node.js v6.x
 // Project: http://nodejs.org/
-// Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>, Wilco Bakker <https://github.com/WilcoBakker>, Thomas Bouldin <https://github.com/inlined>
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+//                 Wilco Bakker <https://github.com/WilcoBakker>
+//                 Thomas Bouldin <https://github.com/inlined>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
@@ -27,8 +31,18 @@ interface Error {
     stack?: string;
 }
 
+// Declare "static" methods in Error
 interface ErrorConstructor {
+    /** Create .stack property on a target object */
     captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
     stackTraceLimit: number;
 }
 
@@ -150,8 +164,6 @@ declare var Buffer: {
     prototype: Buffer;
     /**
      * Allocates a new Buffer using an {array} of octets.
-     *
-     * @param array
      */
     from(array: any[]): Buffer;
     /**
@@ -161,22 +173,16 @@ declare var Buffer: {
      * within the {arrayBuffer} that will be shared by the Buffer.
      *
      * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
-     * @param byteOffset
-     * @param length
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
      * Copies the passed {buffer} data onto a new Buffer instance.
-     *
-     * @param buffer
      */
     from(buffer: Buffer): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
      * If not provided, {encoding} defaults to 'utf8'.
-     *
-     * @param str
      */
     from(str: string, encoding?: string): Buffer;
     /**
@@ -262,6 +268,80 @@ declare namespace NodeJS {
         new(stdout: WritableStream, stderr?: WritableStream): Console;
     }
 
+    export interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
+
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
+
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
+
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
+
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
+
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
+
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
+
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
+
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
+
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
+
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
+
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
+
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
+
     export interface ErrnoException extends Error {
         errno?: number;
         code?: string;
@@ -305,7 +385,7 @@ declare namespace NodeJS {
         writable: boolean;
         write(buffer: Buffer | string, cb?: Function): boolean;
         write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
+        end(cb?: Function): void;
         end(buffer: Buffer, cb?: Function): void;
         end(str: string, cb?: Function): void;
         end(str: string, encoding?: string, cb?: Function): void;
@@ -637,21 +717,74 @@ declare module "http" {
     import * as net from "net";
     import * as stream from "stream";
 
+    // incoming headers will never contain number
+    export interface IncomingHttpHeaders {
+        'accept'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-headers'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'date'?: string;
+        'expires'?: string;
+        'host'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'public-key-pins'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'tk'?: string;
+        'upgrade'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
+
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    export interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
     export interface RequestOptions {
         protocol?: string;
         host?: string;
         hostname?: string;
         family?: number;
-        port?: number;
+        port?: number | string;
         localAddress?: string;
         socketPath?: string;
         method?: string;
         path?: string;
-        headers?: { [key: string]: any };
+        headers?: OutgoingHttpHeaders;
         auth?: string;
         agent?: Agent | boolean;
+        timeout?: number;
     }
 
+    export type ClientRequestArgs = RequestOptions
+
     export interface Server extends net.Server {
         setTimeout(msecs: number, callback: Function): void;
         maxHeadersCount: number;
@@ -673,8 +806,8 @@ declare module "http" {
         write(str: string, encoding?: string, fd?: string): boolean;
 
         writeContinue(): void;
-        writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-        writeHead(statusCode: number, headers?: any): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
         statusCode: number;
         statusMessage: string;
         headersSent: boolean;
@@ -684,7 +817,7 @@ declare module "http" {
         getHeader(name: string): string;
         removeHeader(name: string): void;
         write(chunk: any, encoding?: string): any;
-        addTrailers(headers: any): void;
+        addTrailers(headers: OutgoingHttpHeaders): void;
         finished: boolean;
 
         // Extended base methods
@@ -711,7 +844,7 @@ declare module "http" {
         setHeader(name: string, value: string | string[]): void;
         getHeader(name: string): string;
         removeHeader(name: string): void;
-        addTrailers(headers: any): void;
+        addTrailers(headers: OutgoingHttpHeaders): void;
 
         // Extended base methods
         end(): void;
@@ -725,10 +858,10 @@ declare module "http" {
         httpVersionMajor: number;
         httpVersionMinor: number;
         connection: net.Socket;
-        headers: any;
+        headers: IncomingHttpHeaders;
         rawHeaders: string[];
-        trailers: any;
-        rawTrailers: any;
+        trailers: OutgoingHttpHeaders;
+        rawTrailers: string[];
         setTimeout(msecs: number, callback: Function): NodeJS.Timer;
         /**
          * Only valid for request obtained from http.Server.
@@ -833,7 +966,7 @@ declare module "cluster" {
     }
 
     export class Worker extends events.EventEmitter {
-        id: string;
+        id: number;
         process: child.ChildProcess;
         suicide: boolean;
         send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
@@ -1802,36 +1935,28 @@ declare module "child_process" {
 }
 
 declare module "url" {
-    export interface Url {
+    export interface UrlObject {
         href?: string;
         protocol?: string;
-        auth?: string;
-        hostname?: string;
-        port?: string;
-        host?: string;
-        pathname?: string;
-        search?: string;
-        query?: string | any;
         slashes?: boolean;
-        hash?: string;
-        path?: string;
-    }
-
-    export interface UrlObject {
-        protocol?: string;
-        slashes?: boolean;
-        auth?: string;
         host?: string;
+        auth?: string;
         hostname?: string;
         port?: string | number;
         pathname?: string;
         search?: string;
-        query?: { [key: string]: any; };
+        path?: string;
+        query?: string | { [key: string]: any; };
         hash?: string;
     }
 
+    export interface Url extends UrlObject {
+        port?: string;
+        query?: any;
+    }
+
     export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
-    export function format(urlObject: UrlObject): string;
+    export function format(urlObject: UrlObject | string): string;
     export function resolve(from: string, to: string): string;
 }
 
@@ -2362,15 +2487,11 @@ declare module "fs" {
 
     /**
      * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous rename
-     * @param oldPath
-     * @param newPath
      */
     export function renameSync(oldPath: string, newPath: string): void;
     export function truncate(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
@@ -2415,79 +2536,62 @@ declare module "fs" {
     /**
      * Asynchronous unlink - deletes the file specified in {path}
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function unlink(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
      */
     export function unlinkSync(path: string | Buffer): void;
     /**
      * Asynchronous rmdir - removes the directory specified in {path}
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function rmdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
      */
     export function rmdirSync(path: string | Buffer): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdirSync(path: string | Buffer, mode?: number): void;
     /**
      * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdirSync(path: string | Buffer, mode?: string): void;
     /**
      * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
      *
-     * @param prefix
      * @param callback The created folder path is passed as a string to the callback's second parameter.
      */
     export function mkdtemp(prefix: string, callback?: (err: NodeJS.ErrnoException, folder: string) => void): void;
     /**
      * Synchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
      *
-     * @param prefix
      * @returns Returns the created folder path.
      */
     export function mkdtempSync(prefix: string): string;
@@ -2520,8 +2624,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
-     * @param encoding
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
     export function readFile(filename: string, encoding: null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
@@ -2530,7 +2632,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
@@ -2540,7 +2641,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
@@ -2548,15 +2648,11 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
     export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
      */
     export function readFileSync(filename: string, encoding: null): Buffer;
     export function readFileSync(filename: string, encoding: string): string;
@@ -2564,7 +2660,6 @@ declare module "fs" {
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
      */
     export function readFileSync(filename: string, options: { encoding: null; flag?: string; }): Buffer;
@@ -2573,7 +2668,6 @@ declare module "fs" {
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
@@ -2740,6 +2834,7 @@ declare module "fs" {
         autoClose?: boolean;
         start?: number;
         end?: number;
+        highWaterMark?: number;
     }): ReadStream;
     export function createWriteStream(path: string | Buffer, options?: {
         flags?: string;
@@ -2780,6 +2875,28 @@ declare module "path" {
          */
         name: string;
     }
+    export interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
 
     /**
      * Normalize a string path, reducing '..' and '.' parts.
@@ -2804,7 +2921,7 @@ declare module "path" {
      *
      * @param pathSegments string paths to join.  Non-string arguments are ignored.
      */
-    export function resolve(...pathSegments: any[]): string;
+    export function resolve(...pathSegments: string[]): string;
     /**
      * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
      *
@@ -2814,9 +2931,6 @@ declare module "path" {
     /**
      * Solve the relative path from {from} to {to}.
      * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     *
-     * @param from
-     * @param to
      */
     export function relative(from: string, to: string): string;
     /**
@@ -2859,7 +2973,7 @@ declare module "path" {
      *
      * @param pathString path to evaluate.
      */
-    export function format(pathObject: ParsedPath): string;
+    export function format(pathObject: FormatInputPathObject): string;
 
     export module posix {
         export function normalize(p: string): string;
@@ -2873,7 +2987,7 @@ declare module "path" {
         export var sep: string;
         export var delimiter: string;
         export function parse(p: string): ParsedPath;
-        export function format(pP: ParsedPath): string;
+        export function format(pP: FormatInputPathObject): string;
     }
 
     export module win32 {
@@ -2888,7 +3002,7 @@ declare module "path" {
         export var sep: string;
         export var delimiter: string;
         export function parse(p: string): ParsedPath;
-        export function format(pP: ParsedPath): string;
+        export function format(pP: FormatInputPathObject): string;
     }
 }
 
@@ -3015,7 +3129,7 @@ declare module "tls" {
         /**
          * Returns the bound address, the address family name and port of the underlying socket as reported by
          * the operating system.
-         * @returns {any} - An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
+         * @returns An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
          */
         address(): { port: number; family: string; address: string };
         /**
@@ -3034,8 +3148,8 @@ declare module "tls" {
         encrypted: boolean;
         /**
          * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
-         * @returns {CipherNameAndProtocol} - Returns an object representing the cipher name
-         * and the SSL/TLS protocol version of the current connection.
+         * @returns Returns an object representing the cipher name and the SSL/TLS protocol version of the current
+         * connection.
          */
         getCipher(): CipherNameAndProtocol;
         /**
@@ -3044,8 +3158,8 @@ declare module "tls" {
          * If detailed argument is true the full chain with issuer property will be returned,
          * if false only the top certificate without issuer property.
          * If the peer does not provide a certificate, it returns null or an empty object.
-         * @param {boolean} detailed - If true; the full chain with issuer property will be returned.
-         * @returns {any} - An object representing the peer's certificate.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
          */
         getPeerCertificate(detailed?: boolean): {
             subject: Certificate;
@@ -3059,13 +3173,13 @@ declare module "tls" {
         };
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
-         * @returns {any} - ASN.1 encoded TLS session or undefined if none was negotiated.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
          */
         getSession(): any;
         /**
          * NOTE: Works only with client TLS sockets.
          * Useful only for debugging, for session reuse provide session option to tls.connect().
-         * @returns {any} - TLS session ticket or undefined if none was negotiated.
+         * @returns TLS session ticket or undefined if none was negotiated.
          */
         getTLSTicket(): any;
         /**
@@ -3094,9 +3208,9 @@ declare module "tls" {
          *
          * NOTE: Can be used to request peer's certificate after the secure connection has been established.
          * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
-         * @param {TlsOptions} options - The options may contain the following fields: rejectUnauthorized,
+         * @param options - The options may contain the following fields: rejectUnauthorized,
          * requestCert (See tls.createServer() for details).
-         * @param {Function} callback - callback(err) will be executed with null as err, once the renegotiation
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
          */
         renegotiate(options: TlsOptions, callback: (err: Error) => any): any;
@@ -3107,8 +3221,8 @@ declare module "tls" {
          * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
          * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
          * which may decrease overall server throughput.
-         * @param {number} size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
-         * @returns {boolean} - Returns true on success, false otherwise.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
          */
         setMaxSendFragment(size: number): boolean;
 
@@ -3556,7 +3670,7 @@ declare module "stream" {
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(): void;
+            end(cb?: Function): void;
             end(chunk: any, cb?: Function): void;
             end(chunk: any, encoding?: string, cb?: Function): void;
 
@@ -3641,7 +3755,7 @@ declare module "stream" {
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(): void;
+            end(cb?: Function): void;
             end(chunk: any, cb?: Function): void;
             end(chunk: any, encoding?: string, cb?: Function): void;
         }
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 3607a5bec2..34a62bf88d 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -330,6 +330,20 @@ function bufferTests() {
         const buf1: Buffer = Buffer.from('this is a tést');
         const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
     }
+    // Class Method: Buffer.alloc(size[, fill[, encoding]])
+    {
+        const buf1: Buffer = Buffer.alloc(5);
+        const buf2: Buffer = Buffer.alloc(5, 'a');
+        const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
+    }
+    // Class Method: Buffer.allocUnsafe(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafe(5);
+    }
+    // Class Method: Buffer.allocUnsafeSlow(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafeSlow(10);
+    }
 
     // Test that TS 1.6 works with the 'as Buffer' annotation
     // on isBuffer.
@@ -441,6 +455,8 @@ namespace url_tests {
     {
         url.format(url.parse('http://www.example.com/xyz'));
 
+        url.format('http://www.example.com/xyz');
+
         // https://google.com/search?q=you're%20a%20lizard%2C%20gary
         url.format({
             protocol: 'https',
@@ -917,6 +933,10 @@ namespace http_tests {
         http.request({ agent: undefined });
     }
 
+    {
+        http.request('http://www.example.com/xyz');
+    }
+
     {
         // Make sure .listen() and .close() retuern a Server instance
         http.createServer().listen(0).close().address();
@@ -929,6 +949,25 @@ namespace http_tests {
         request.setNoDelay(true);
         request.abort();
     }
+
+    // http request options
+    {
+        const requestOpts: http.RequestOptions = {
+            timeout: 30000
+        };
+
+        const clientArgs: http.ClientRequestArgs = {
+            timeout: 30000
+        };
+    }
+
+    // http headers
+    {
+        const headers: http.IncomingHttpHeaders = {
+            'content-type': 'application/json',
+            'set-cookie': [ 'type=ninja', 'language=javascript' ]
+        };
+    }
 }
 
 //////////////////////////////////////////////////////
@@ -955,6 +994,8 @@ namespace https_tests {
     https.request({
         agent: undefined
     });
+
+    https.request('http://www.example.com/xyz');
 }
 
 ////////////////////////////////////////////////////
@@ -1241,6 +1282,47 @@ namespace path_tests {
     });
     // returns
     //    '/home/user/dir/file.txt'
+
+
+    path.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        root: "/",
+        dir: "/home/user/dir",
+        base: "file.txt",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.win32.format({
+        root: "C:\\",
+        dir: "C:\\home\\user\\dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
+
+    path.win32.format({
+        dir: "C:\\home\\user\\dir",
+        base: "file.txt"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
 }
 
 ////////////////////////////////////////////////////
@@ -1802,6 +1884,26 @@ namespace errors_tests {
         const myObject = {};
         Error.captureStackTrace(myObject);
     }
+    {
+        let frames: NodeJS.CallSite[] = [];
+        Error.prepareStackTrace(new Error(), frames);
+    }
+    {
+        let frame: NodeJS.CallSite = null;
+        let frameThis: any = frame.getThis();
+        let typeName: string = frame.getTypeName();
+        let func: Function = frame.getFunction();
+        let funcName: string = frame.getFunctionName();
+        let meth: string = frame.getMethodName();
+        let fname: string = frame.getFileName();
+        let lineno: number = frame.getLineNumber();
+        let colno: number = frame.getColumnNumber();
+        let evalOrigin: string = frame.getEvalOrigin();
+        let isTop: boolean = frame.isToplevel();
+        let isEval: boolean = frame.isEval();
+        let isNative: boolean = frame.isNative();
+        let isConstr: boolean = frame.isConstructor();
+    }
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/types/node/v6/tslint.json b/types/node/v6/tslint.json
index 86acdea96f..518f58df03 100644
--- a/types/node/v6/tslint.json
+++ b/types/node/v6/tslint.json
@@ -24,6 +24,8 @@
     "no-namespace": false,
     "no-padding": false,
     "no-string-throw": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
     "no-unnecessary-generics": false,
     "no-unnecessary-qualifier": false,
     "no-var-keyword": false,
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index bc646e013f..038c4a6f58 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -3,10 +3,9 @@
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
 //                 Parambir Singh <https://github.com/parambirs>
-//                 Roberto Desideri <https://github.com/RobDesideri>
 //                 Christian Vaagland Tellnes <https://github.com/tellnes>
 //                 Wilco Bakker <https://github.com/WilcoBakker>
-//                 Daniel Imms <https://github.com/Tyriar>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
@@ -33,8 +32,18 @@ interface Error {
     stack?: string;
 }
 
+// Declare "static" methods in Error
 interface ErrorConstructor {
+    /** Create .stack property on a target object */
     captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
     stackTraceLimit: number;
 }
 
@@ -167,8 +176,6 @@ declare var Buffer: {
     prototype: Buffer;
     /**
      * Allocates a new Buffer using an {array} of octets.
-     *
-     * @param array
      */
     from(array: any[]): Buffer;
     /**
@@ -178,22 +185,16 @@ declare var Buffer: {
      * within the {arrayBuffer} that will be shared by the Buffer.
      *
      * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
-     * @param byteOffset
-     * @param length
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
      * Copies the passed {buffer} data onto a new Buffer instance.
-     *
-     * @param buffer
      */
     from(buffer: Buffer): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
      * If not provided, {encoding} defaults to 'utf8'.
-     *
-     * @param str
      */
     from(str: string, encoding?: string): Buffer;
     /**
@@ -279,6 +280,80 @@ declare namespace NodeJS {
         new(stdout: WritableStream, stderr?: WritableStream): Console;
     }
 
+    export interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
+
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
+
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
+
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
+
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
+
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
+
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
+
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
+
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
+
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
+
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
+
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
+
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
+
     export interface ErrnoException extends Error {
         errno?: number;
         code?: string;
@@ -322,7 +397,7 @@ declare namespace NodeJS {
         writable: boolean;
         write(buffer: Buffer | string, cb?: Function): boolean;
         write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
+        end(cb?: Function): void;
         end(buffer: Buffer, cb?: Function): void;
         end(str: string, cb?: Function): void;
         end(str: string, encoding?: string, cb?: Function): void;
@@ -655,22 +730,74 @@ declare module "http" {
     import * as net from "net";
     import * as stream from "stream";
 
+    // incoming headers will never contain number
+    export interface IncomingHttpHeaders {
+        'accept'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-headers'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'date'?: string;
+        'expires'?: string;
+        'host'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'public-key-pins'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'tk'?: string;
+        'upgrade'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
+
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    export interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
     export interface RequestOptions {
         protocol?: string;
         host?: string;
         hostname?: string;
         family?: number;
-        port?: number;
+        port?: number | string;
         localAddress?: string;
         socketPath?: string;
         method?: string;
         path?: string;
-        headers?: { [key: string]: any };
+        headers?: OutgoingHttpHeaders;
         auth?: string;
         agent?: Agent | boolean;
         timeout?: number;
     }
 
+    export type ClientRequestArgs = RequestOptions
+
     export interface Server extends net.Server {
         setTimeout(msecs: number, callback: Function): void;
         maxHeadersCount: number;
@@ -692,8 +819,8 @@ declare module "http" {
         write(str: string, encoding?: string, fd?: string): boolean;
 
         writeContinue(): void;
-        writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-        writeHead(statusCode: number, headers?: any): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
         statusCode: number;
         statusMessage: string;
         headersSent: boolean;
@@ -703,7 +830,7 @@ declare module "http" {
         getHeader(name: string): string;
         removeHeader(name: string): void;
         write(chunk: any, encoding?: string): any;
-        addTrailers(headers: any): void;
+        addTrailers(headers: OutgoingHttpHeaders): void;
         finished: boolean;
 
         // Extended base methods
@@ -730,7 +857,7 @@ declare module "http" {
         setHeader(name: string, value: string | string[]): void;
         getHeader(name: string): string;
         removeHeader(name: string): void;
-        addTrailers(headers: any): void;
+        addTrailers(headers: OutgoingHttpHeaders): void;
 
         // Extended base methods
         end(): void;
@@ -744,10 +871,10 @@ declare module "http" {
         httpVersionMajor: number;
         httpVersionMinor: number;
         connection: net.Socket;
-        headers: any;
+        headers: IncomingHttpHeaders;
         rawHeaders: string[];
-        trailers: any;
-        rawTrailers: any;
+        trailers: OutgoingHttpHeaders;
+        rawTrailers: string[];
         setTimeout(msecs: number, callback: Function): NodeJS.Timer;
         /**
          * Only valid for request obtained from http.Server.
@@ -817,7 +944,7 @@ declare module "http" {
     };
     export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
     export function createClient(port?: number, host?: string): any;
-    export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: IncomingMessage) => void): ClientRequest;
     export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
@@ -852,7 +979,7 @@ declare module "cluster" {
     }
 
     export class Worker extends events.EventEmitter {
-        id: string;
+        id: number;
         process: child.ChildProcess;
         suicide: boolean;
         send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
@@ -1420,7 +1547,7 @@ declare module "https" {
     };
     export interface Server extends tls.Server { }
     export function createServer(options: ServerOptions, requestListener?: Function): Server;
-    export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
     export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
     export var globalAgent: Agent;
 }
@@ -1870,37 +1997,29 @@ declare module "child_process" {
 }
 
 declare module "url" {
-    export interface Url {
-        href?: string;
-        protocol?: string;
+    export interface UrlObject {
         auth?: string;
-        hostname?: string;
-        port?: string;
-        host?: string;
-        pathname?: string;
-        search?: string;
-        query?: string | any;
-        slashes?: boolean;
         hash?: string;
+        host?: string;
+        hostname?: string;
+        href?: string;
         path?: string;
+        pathname?: string;
+        port?: string | number;
+        protocol?: string;
+        query?: string | { [key: string]: any; };
+        search?: string;
+        slashes?: boolean;
     }
 
-    export interface UrlObject {
-        protocol?: string;
-        slashes?: boolean;
-        auth?: string;
-        host?: string;
-        hostname?: string;
-        port?: string | number;
-        pathname?: string;
-        search?: string;
-        query?: { [key: string]: any; };
-        hash?: string;
+    export interface Url extends UrlObject {
+        port?: string;
+        query?: any;
     }
 
     export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
     export function format(URL: URL, options?: URLFormatOptions): string;
-    export function format(urlObject: UrlObject): string;
+    export function format(urlObject: UrlObject | string): string;
     export function resolve(from: string, to: string): string;
 
     export interface URLFormatOptions {
@@ -2497,15 +2616,11 @@ declare module "fs" {
 
     /**
      * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous rename
-     * @param oldPath
-     * @param newPath
      */
     export function renameSync(oldPath: string, newPath: string): void;
     export function truncate(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
@@ -2550,79 +2665,62 @@ declare module "fs" {
     /**
      * Asynchronous unlink - deletes the file specified in {path}
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function unlink(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
      */
     export function unlinkSync(path: string | Buffer): void;
     /**
      * Asynchronous rmdir - removes the directory specified in {path}
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function rmdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
      */
     export function rmdirSync(path: string | Buffer): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdir(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
     /**
      * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdirSync(path: string | Buffer, mode?: number): void;
     /**
      * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
      *
-     * @param path
-     * @param mode
      * @param callback No arguments other than a possible exception are given to the completion callback.
      */
     export function mkdirSync(path: string | Buffer, mode?: string): void;
     /**
      * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
      *
-     * @param prefix
      * @param callback The created folder path is passed as a string to the callback's second parameter.
      */
     export function mkdtemp(prefix: string, callback?: (err: NodeJS.ErrnoException, folder: string) => void): void;
     /**
      * Synchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
      *
-     * @param prefix
      * @returns Returns the created folder path.
      */
     export function mkdtempSync(prefix: string): string;
@@ -2656,8 +2754,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
-     * @param encoding
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
     export function readFile(filename: string, encoding: null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
@@ -2666,7 +2762,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
@@ -2676,7 +2771,6 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
@@ -2684,15 +2778,11 @@ declare module "fs" {
     /**
      * Asynchronous readFile - Asynchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
      */
     export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
      */
     export function readFileSync(filename: string, encoding: null): Buffer;
     export function readFileSync(filename: string, encoding: string): string;
@@ -2700,7 +2790,6 @@ declare module "fs" {
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
      */
     export function readFileSync(filename: string, options: { encoding: null; flag?: string; }): Buffer;
@@ -2709,7 +2798,6 @@ declare module "fs" {
     /**
      * Synchronous readFile - Synchronously reads the entire contents of a file.
      *
-     * @param fileName
      * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
@@ -2876,6 +2964,7 @@ declare module "fs" {
         autoClose?: boolean;
         start?: number;
         end?: number;
+        highWaterMark?: number;
     }): ReadStream;
     export function createWriteStream(path: string | Buffer, options?: {
         flags?: string;
@@ -2916,6 +3005,28 @@ declare module "path" {
          */
         name: string;
     }
+    export interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
 
     /**
      * Normalize a string path, reducing '..' and '.' parts.
@@ -2940,7 +3051,7 @@ declare module "path" {
      *
      * @param pathSegments string paths to join.  Non-string arguments are ignored.
      */
-    export function resolve(...pathSegments: any[]): string;
+    export function resolve(...pathSegments: string[]): string;
     /**
      * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
      *
@@ -2950,9 +3061,6 @@ declare module "path" {
     /**
      * Solve the relative path from {from} to {to}.
      * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     *
-     * @param from
-     * @param to
      */
     export function relative(from: string, to: string): string;
     /**
@@ -2995,7 +3103,7 @@ declare module "path" {
      *
      * @param pathString path to evaluate.
      */
-    export function format(pathObject: ParsedPath): string;
+    export function format(pathObject: FormatInputPathObject): string;
 
     export module posix {
         export function normalize(p: string): string;
@@ -3009,7 +3117,7 @@ declare module "path" {
         export var sep: string;
         export var delimiter: string;
         export function parse(p: string): ParsedPath;
-        export function format(pP: ParsedPath): string;
+        export function format(pP: FormatInputPathObject): string;
     }
 
     export module win32 {
@@ -3024,7 +3132,7 @@ declare module "path" {
         export var sep: string;
         export var delimiter: string;
         export function parse(p: string): ParsedPath;
-        export function format(pP: ParsedPath): string;
+        export function format(pP: FormatInputPathObject): string;
     }
 }
 
@@ -3170,7 +3278,7 @@ declare module "tls" {
         /**
          * Returns the bound address, the address family name and port of the underlying socket as reported by
          * the operating system.
-         * @returns {any} - An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
+         * @returns An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
          */
         address(): { port: number; family: string; address: string };
         /**
@@ -3189,7 +3297,7 @@ declare module "tls" {
         encrypted: boolean;
         /**
          * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
-         * @returns {CipherNameAndProtocol} - Returns an object representing the cipher name
+         * @returns Returns an object representing the cipher name
          * and the SSL/TLS protocol version of the current connection.
          */
         getCipher(): CipherNameAndProtocol;
@@ -3199,15 +3307,15 @@ declare module "tls" {
          * If detailed argument is true the full chain with issuer property will be returned,
          * if false only the top certificate without issuer property.
          * If the peer does not provide a certificate, it returns null or an empty object.
-         * @param {boolean} detailed - If true; the full chain with issuer property will be returned.
-         * @returns {PeerCertificate | DetailedPeerCertificate} - An object representing the peer's certificate.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
          */
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
-         * @returns {any} - ASN.1 encoded TLS session or undefined if none was negotiated.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
          */
         getSession(): any;
         /**
@@ -3242,9 +3350,9 @@ declare module "tls" {
          *
          * NOTE: Can be used to request peer's certificate after the secure connection has been established.
          * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
-         * @param {TlsOptions} options - The options may contain the following fields: rejectUnauthorized,
+         * @param options - The options may contain the following fields: rejectUnauthorized,
          * requestCert (See tls.createServer() for details).
-         * @param {Function} callback - callback(err) will be executed with null as err, once the renegotiation
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
          */
         renegotiate(options: TlsOptions, callback: (err: Error) => any): any;
@@ -3255,8 +3363,8 @@ declare module "tls" {
          * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
          * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
          * which may decrease overall server throughput.
-         * @param {number} size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
-         * @returns {boolean} - Returns true on success, false otherwise.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
          */
         setMaxSendFragment(size: number): boolean;
 
@@ -3711,7 +3819,7 @@ declare module "stream" {
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(): void;
+            end(cb?: Function): void;
             end(chunk: any, cb?: Function): void;
             end(chunk: any, encoding?: string, cb?: Function): void;
 
@@ -3796,7 +3904,7 @@ declare module "stream" {
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(): void;
+            end(cb?: Function): void;
             end(chunk: any, cb?: Function): void;
             end(chunk: any, encoding?: string, cb?: Function): void;
         }
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index 860a4dc56b..a2f25db8ec 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -319,6 +319,20 @@ function bufferTests() {
         buf = Buffer.from(arr.buffer, 1);
         buf = Buffer.from(arr.buffer, 0, 1);
     }
+    // Class Method: Buffer.alloc(size[, fill[, encoding]])
+    {
+        const buf1: Buffer = Buffer.alloc(5);
+        const buf2: Buffer = Buffer.alloc(5, 'a');
+        const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
+    }
+    // Class Method: Buffer.allocUnsafe(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafe(5);
+    }
+    // Class Method: Buffer.allocUnsafeSlow(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafeSlow(10);
+    }
 
     // Class Method: Buffer.from(buffer)
     {
@@ -442,6 +456,8 @@ namespace url_tests {
     {
         url.format(url.parse('http://www.example.com/xyz'));
 
+        url.format('http://www.example.com/xyz');
+
         // https://google.com/search?q=you're%20a%20lizard%2C%20gary
         url.format({
             protocol: 'https',
@@ -1014,6 +1030,10 @@ namespace http_tests {
         http.request({ agent: undefined });
     }
 
+    {
+        http.request('http://www.example.com/xyz');
+    }
+
     {
         // Make sure .listen() and .close() retuern a Server instance
         http.createServer().listen(0).close().address();
@@ -1027,9 +1047,24 @@ namespace http_tests {
         request.abort();
     }
 
-	const options: http.RequestOptions = {
-        timeout: 30000
-	};
+	// http request options
+    {
+        const requestOpts: http.RequestOptions = {
+            timeout: 30000
+        };
+
+        const clientArgs: http.ClientRequestArgs = {
+            timeout: 30000
+        };
+    }
+
+    // http headers
+    {
+        const headers: http.IncomingHttpHeaders = {
+            'content-type': 'application/json',
+            'set-cookie': [ 'type=ninja', 'language=javascript' ]
+        };
+    }
 }
 
 //////////////////////////////////////////////////////
@@ -1056,6 +1091,8 @@ namespace https_tests {
     https.request({
         agent: undefined
     });
+
+    https.request('http://www.example.com/xyz');
 }
 
 ////////////////////////////////////////////////////
@@ -1342,6 +1379,46 @@ namespace path_tests {
     });
     // returns
     //    '/home/user/dir/file.txt'
+
+    path.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        root: "/",
+        dir: "/home/user/dir",
+        base: "file.txt",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.win32.format({
+        root: "C:\\",
+        dir: "C:\\home\\user\\dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
+
+    path.win32.format({
+        dir: "C:\\home\\user\\dir",
+        base: "file.txt"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
 }
 
 ////////////////////////////////////////////////////
@@ -1908,6 +1985,26 @@ namespace errors_tests {
         const myObject = {};
         Error.captureStackTrace(myObject);
     }
+    {
+        let frames: NodeJS.CallSite[] = [];
+        Error.prepareStackTrace(new Error(), frames);
+    }
+    {
+        let frame: NodeJS.CallSite = null;
+        let frameThis: any = frame.getThis();
+        let typeName: string = frame.getTypeName();
+        let func: Function = frame.getFunction();
+        let funcName: string = frame.getFunctionName();
+        let meth: string = frame.getMethodName();
+        let fname: string = frame.getFileName();
+        let lineno: number = frame.getLineNumber();
+        let colno: number = frame.getColumnNumber();
+        let evalOrigin: string = frame.getEvalOrigin();
+        let isTop: boolean = frame.isToplevel();
+        let isEval: boolean = frame.isEval();
+        let isNative: boolean = frame.isNative();
+        let isConstr: boolean = frame.isConstructor();
+    }
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/types/node/v7/tslint.json b/types/node/v7/tslint.json
index 86acdea96f..518f58df03 100644
--- a/types/node/v7/tslint.json
+++ b/types/node/v7/tslint.json
@@ -24,6 +24,8 @@
     "no-namespace": false,
     "no-padding": false,
     "no-string-throw": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
     "no-unnecessary-generics": false,
     "no-unnecessary-qualifier": false,
     "no-var-keyword": false,
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
new file mode 100644
index 0000000000..3fbd9f9253
--- /dev/null
+++ b/types/node/v8/index.d.ts
@@ -0,0 +1,7160 @@
+// Type definitions for Node.js 8.5.x
+// Project: http://nodejs.org/
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+//                 Parambir Singh <https://github.com/parambirs>
+//                 Christian Vaagland Tellnes <https://github.com/tellnes>
+//                 Wilco Bakker <https://github.com/WilcoBakker>
+//                 Nicolas Voigt <https://github.com/octo-sniffle>
+//                 Chigozirim C. <https://github.com/smac89>
+//                 Flarna <https://github.com/Flarna>
+//                 Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
+//                 wwwy3y3 <https://github.com/wwwy3y3>
+//                 Deividas Bakanas <https://github.com/DeividasBakanas>
+//                 Kelvin Jin <https://github.com/kjin>
+//                 Alvis HT Tang <https://github.com/alvis>
+//                 Oliver Joseph Ash <https://github.com/OliverJAsh>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/************************************************
+*                                               *
+*               Node.js v8.5.x API              *
+*                                               *
+************************************************/
+
+/** inspector module types */
+/// <reference path="./inspector.d.ts" />
+
+// This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
+interface Console {
+    Console: NodeJS.ConsoleConstructor;
+    assert(value: any, message?: string, ...optionalParams: any[]): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
+    error(message?: any, ...optionalParams: any[]): void;
+    info(message?: any, ...optionalParams: any[]): void;
+    log(message?: any, ...optionalParams: any[]): void;
+    time(label: string): void;
+    timeEnd(label: string): void;
+    trace(message?: any, ...optionalParams: any[]): void;
+    warn(message?: any, ...optionalParams: any[]): void;
+}
+
+interface Error {
+    stack?: string;
+}
+
+// Declare "static" methods in Error
+interface ErrorConstructor {
+    /** Create .stack property on a target object */
+    captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
+    stackTraceLimit: number;
+}
+
+// compat for TypeScript 1.8
+// if you use with --target es3 or --target es5 and use below definitions,
+// use the lib.es6.d.ts that is bundled with TypeScript 1.8.
+interface MapConstructor { }
+interface WeakMapConstructor { }
+interface SetConstructor { }
+interface WeakSetConstructor { }
+
+// Forward-declare needed types from lib.es2015.d.ts (in case users are using `--lib es5`)
+interface Iterable<T> { }
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+}
+interface IteratorResult<T> { }
+interface SymbolConstructor {
+    readonly iterator: symbol;
+}
+declare var Symbol: SymbolConstructor;
+
+// Node.js ESNEXT support
+interface String {
+    /** Removes whitespace from the left end of a string. */
+    trimLeft(): string;
+    /** Removes whitespace from the right end of a string. */
+    trimRight(): string;
+}
+
+/************************************************
+*                                               *
+*                   GLOBAL                      *
+*                                               *
+************************************************/
+declare var process: NodeJS.Process;
+declare var global: NodeJS.Global;
+declare var console: Console;
+
+declare var __filename: string;
+declare var __dirname: string;
+
+declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+declare namespace setTimeout {
+    export function __promisify__(ms: number): Promise<void>;
+    export function __promisify__<T>(ms: number, value: T): Promise<T>;
+}
+declare function clearTimeout(timeoutId: NodeJS.Timer): void;
+declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+declare function clearInterval(intervalId: NodeJS.Timer): void;
+declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+declare namespace setImmediate {
+    export function __promisify__(): Promise<void>;
+    export function __promisify__<T>(value: T): Promise<T>;
+}
+declare function clearImmediate(immediateId: any): void;
+
+// TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
+interface NodeRequireFunction {
+/* tslint:disable-next-line:callable-types */
+    (id: string): any;
+}
+
+interface NodeRequire extends NodeRequireFunction {
+    resolve(id: string): string;
+    cache: any;
+    extensions: NodeExtensions;
+    main: NodeModule | undefined;
+}
+
+interface NodeExtensions {
+    '.js': (m: NodeModule, filename: string) => any;
+    '.json': (m: NodeModule, filename: string) => any;
+    '.node': (m: NodeModule, filename: string) => any;
+    [ext: string]: (m: NodeModule, filename: string) => any;
+}
+
+declare var require: NodeRequire;
+
+interface NodeModule {
+    exports: any;
+    require: NodeRequireFunction;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: NodeModule | null;
+    children: NodeModule[];
+}
+
+declare var module: NodeModule;
+
+// Same as module.exports
+declare var exports: any;
+declare var SlowBuffer: {
+    new(str: string, encoding?: string): Buffer;
+    new(size: number): Buffer;
+    new(size: Uint8Array): Buffer;
+    new(array: any[]): Buffer;
+    prototype: Buffer;
+    isBuffer(obj: any): boolean;
+    byteLength(string: string, encoding?: string): number;
+    concat(list: Buffer[], totalLength?: number): Buffer;
+};
+
+// Buffer class
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
+interface Buffer extends NodeBuffer { }
+
+/**
+ * Raw data is stored in instances of the Buffer class.
+ * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap.  A Buffer cannot be resized.
+ * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+ */
+declare var Buffer: {
+    /**
+     * Allocates a new buffer containing the given {str}.
+     *
+     * @param str String to store in buffer.
+     * @param encoding encoding to use, optional.  Default is 'utf8'
+     */
+    new(str: string, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     */
+    new(size: number): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     */
+    new(array: Uint8Array): Buffer;
+    /**
+     * Produces a Buffer backed by the same allocated memory as
+     * the given {ArrayBuffer}.
+     *
+     *
+     * @param arrayBuffer The ArrayBuffer with which to share memory.
+     */
+    new(arrayBuffer: ArrayBuffer): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     */
+    new(array: any[]): Buffer;
+    /**
+     * Copies the passed {buffer} data onto a new {Buffer} instance.
+     *
+     * @param buffer The buffer to copy.
+     */
+    new(buffer: Buffer): Buffer;
+    prototype: Buffer;
+    /**
+     * Allocates a new Buffer using an {array} of octets.
+     */
+    from(array: any[]): Buffer;
+    /**
+     * When passed a reference to the .buffer property of a TypedArray instance,
+     * the newly created Buffer will share the same allocated memory as the TypedArray.
+     * The optional {byteOffset} and {length} arguments specify a memory range
+     * within the {arrayBuffer} that will be shared by the Buffer.
+     *
+     * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
+     */
+    from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
+    /**
+     * Copies the passed {buffer} data onto a new Buffer instance.
+     */
+    from(buffer: Buffer): Buffer;
+    /**
+     * Creates a new Buffer containing the given JavaScript string {str}.
+     * If provided, the {encoding} parameter identifies the character encoding.
+     * If not provided, {encoding} defaults to 'utf8'.
+     */
+    from(str: string, encoding?: string): Buffer;
+    /**
+     * Returns true if {obj} is a Buffer
+     *
+     * @param obj object to test.
+     */
+    isBuffer(obj: any): obj is Buffer;
+    /**
+     * Returns true if {encoding} is a valid encoding argument.
+     * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+     *
+     * @param encoding string to test.
+     */
+    isEncoding(encoding: string): boolean;
+    /**
+     * Gives the actual byte length of a string. encoding defaults to 'utf8'.
+     * This is not the same as String.prototype.length since that returns the number of characters in a string.
+     *
+     * @param string string to test. (TypedArray is also allowed, but it is only available starting ES2017)
+     * @param encoding encoding used to evaluate (defaults to 'utf8')
+     */
+    byteLength(string: string | Buffer | DataView | ArrayBuffer, encoding?: string): number;
+    /**
+     * Returns a buffer which is the result of concatenating all the buffers in the list together.
+     *
+     * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer.
+     * If the list has exactly one item, then the first item of the list is returned.
+     * If the list has more than one item, then a new Buffer is created.
+     *
+     * @param list An array of Buffer objects to concatenate
+     * @param totalLength Total length of the buffers when concatenated.
+     *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
+     */
+    concat(list: Buffer[], totalLength?: number): Buffer;
+    /**
+     * The same as buf1.compare(buf2).
+     */
+    compare(buf1: Buffer, buf2: Buffer): number;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     * @param fill if specified, buffer will be initialized by calling buf.fill(fill).
+     *    If parameter is omitted, buffer will be filled with zeros.
+     * @param encoding encoding used for call to buf.fill while initalizing
+     */
+    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafe(size: number): Buffer;
+    /**
+     * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafeSlow(size: number): Buffer;
+    /**
+     * This is the number of bytes used to determine the size of pre-allocated, internal Buffer instances used for pooling. This value may be modified.
+     */
+    poolSize: number;
+};
+
+/************************************************
+*                                               *
+*               GLOBAL INTERFACES               *
+*                                               *
+************************************************/
+declare namespace NodeJS {
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+    }
+
+    export interface ConsoleConstructor {
+        prototype: Console;
+        new(stdout: WritableStream, stderr?: WritableStream): Console;
+    }
+
+    export interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
+
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
+
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
+
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
+
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
+
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
+
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
+
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
+
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
+
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
+
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
+
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
+
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
+
+    export interface ErrnoException extends Error {
+        errno?: number;
+        code?: string;
+        path?: string;
+        syscall?: string;
+        stack?: string;
+    }
+
+    export class EventEmitter {
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string | symbol): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string | symbol): Function[];
+        emit(event: string | symbol, ...args: any[]): boolean;
+        listenerCount(type: string | symbol): number;
+        // Added in Node 6...
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        eventNames(): Array<string | symbol>;
+    }
+
+    export interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: string): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends WritableStream>(destination?: T): this;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: ReadableStream): this;
+    }
+
+    export interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Buffer | string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(cb?: Function): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+    }
+
+    export interface ReadWriteStream extends ReadableStream, WritableStream { }
+
+    export interface Events extends EventEmitter { }
+
+    export interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string): this;
+    }
+
+    export interface MemoryUsage {
+        rss: number;
+        heapTotal: number;
+        heapUsed: number;
+    }
+
+    export interface CpuUsage {
+        user: number;
+        system: number;
+    }
+
+    export interface ProcessVersions {
+        http_parser: string;
+        node: string;
+        v8: string;
+        ares: string;
+        uv: string;
+        zlib: string;
+        modules: string;
+        openssl: string;
+    }
+
+    type Platform = 'aix'
+        | 'android'
+        | 'darwin'
+        | 'freebsd'
+        | 'linux'
+        | 'openbsd'
+        | 'sunos'
+        | 'win32'
+        | 'cygwin';
+
+    type Signals =
+        "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" |
+        "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" |
+        "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" |
+        "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
+
+    type BeforeExitListener = (code: number) => void;
+    type DisconnectListener = () => void;
+    type ExitListener = (code: number) => void;
+    type RejectionHandledListener = (promise: Promise<any>) => void;
+    type UncaughtExceptionListener = (error: Error) => void;
+    type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
+    type WarningListener = (warning: Error) => void;
+    type MessageListener = (message: any, sendHandle: any) => void;
+    type SignalsListener = () => void;
+    type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+
+    export interface Socket extends ReadWriteStream {
+        isTTY?: true;
+    }
+
+    export interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
+    export interface WriteStream extends Socket {
+        columns?: number;
+        rows?: number;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        _destroy(err: Error, callback: Function): void;
+        _final(callback: Function): void;
+        setDefaultEncoding(encoding: string): this;
+        cork(): void;
+        uncork(): void;
+        destroy(error?: Error): void;
+    }
+    export interface ReadStream extends Socket {
+        isRaw?: boolean;
+        setRawMode?(mode: boolean): void;
+        _read(size: number): void;
+        _destroy(err: Error, callback: Function): void;
+        push(chunk: any, encoding?: string): boolean;
+        destroy(error?: Error): void;
+    }
+
+    export interface Process extends EventEmitter {
+        stdout: WriteStream;
+        stderr: WriteStream;
+        stdin: ReadStream;
+        openStdin(): Socket;
+        argv: string[];
+        argv0: string;
+        execArgv: string[];
+        execPath: string;
+        abort(): void;
+        chdir(directory: string): void;
+        cwd(): string;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
+        env: ProcessEnv;
+        exit(code?: number): never;
+        exitCode: number;
+        getgid(): number;
+        setgid(id: number | string): void;
+        getuid(): number;
+        setuid(id: number | string): void;
+        geteuid(): number;
+        seteuid(id: number | string): void;
+        getegid(): number;
+        setegid(id: number | string): void;
+        getgroups(): number[];
+        setgroups(groups: Array<string | number>): void;
+        version: string;
+        versions: ProcessVersions;
+        config: {
+            target_defaults: {
+                cflags: any[];
+                default_configuration: string;
+                defines: string[];
+                include_dirs: string[];
+                libraries: string[];
+            };
+            variables: {
+                clang: number;
+                host_arch: string;
+                node_install_npm: boolean;
+                node_install_waf: boolean;
+                node_prefix: string;
+                node_shared_openssl: boolean;
+                node_shared_v8: boolean;
+                node_shared_zlib: boolean;
+                node_use_dtrace: boolean;
+                node_use_etw: boolean;
+                node_use_openssl: boolean;
+                target_arch: string;
+                v8_no_strict_aliasing: number;
+                v8_use_snapshot: boolean;
+                visibility: string;
+            };
+        };
+        kill(pid: number, signal?: string | number): void;
+        pid: number;
+        title: string;
+        arch: string;
+        platform: Platform;
+        mainModule?: NodeModule;
+        memoryUsage(): MemoryUsage;
+        cpuUsage(previousValue?: CpuUsage): CpuUsage;
+        nextTick(callback: Function, ...args: any[]): void;
+        umask(mask?: number): number;
+        uptime(): number;
+        hrtime(time?: [number, number]): [number, number];
+        domain: Domain;
+
+        // Worker
+        send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
+
+        /**
+         * EventEmitter
+         *   1. beforeExit
+         *   2. disconnect
+         *   3. exit
+         *   4. message
+         *   5. rejectionHandled
+         *   6. uncaughtException
+         *   7. unhandledRejection
+         *   8. warning
+         *   9. message
+         *  10. <All OS Signals>
+         *  11. newListener/removeListener inherited from EventEmitter
+         */
+        addListener(event: "beforeExit", listener: BeforeExitListener): this;
+        addListener(event: "disconnect", listener: DisconnectListener): this;
+        addListener(event: "exit", listener: ExitListener): this;
+        addListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        addListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        addListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        addListener(event: "warning", listener: WarningListener): this;
+        addListener(event: "message", listener: MessageListener): this;
+        addListener(event: Signals, listener: SignalsListener): this;
+        addListener(event: "newListener", listener: NewListenerListener): this;
+        addListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        emit(event: "beforeExit", code: number): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "exit", code: number): boolean;
+        emit(event: "rejectionHandled", promise: Promise<any>): boolean;
+        emit(event: "uncaughtException", error: Error): boolean;
+        emit(event: "unhandledRejection", reason: any, promise: Promise<any>): boolean;
+        emit(event: "warning", warning: Error): boolean;
+        emit(event: "message", message: any, sendHandle: any): this;
+        emit(event: Signals): boolean;
+        emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
+        emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
+
+        on(event: "beforeExit", listener: BeforeExitListener): this;
+        on(event: "disconnect", listener: DisconnectListener): this;
+        on(event: "exit", listener: ExitListener): this;
+        on(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        on(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        on(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        on(event: "warning", listener: WarningListener): this;
+        on(event: "message", listener: MessageListener): this;
+        on(event: Signals, listener: SignalsListener): this;
+        on(event: "newListener", listener: NewListenerListener): this;
+        on(event: "removeListener", listener: RemoveListenerListener): this;
+
+        once(event: "beforeExit", listener: BeforeExitListener): this;
+        once(event: "disconnect", listener: DisconnectListener): this;
+        once(event: "exit", listener: ExitListener): this;
+        once(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        once(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        once(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        once(event: "warning", listener: WarningListener): this;
+        once(event: "message", listener: MessageListener): this;
+        once(event: Signals, listener: SignalsListener): this;
+        once(event: "newListener", listener: NewListenerListener): this;
+        once(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependListener(event: "disconnect", listener: DisconnectListener): this;
+        prependListener(event: "exit", listener: ExitListener): this;
+        prependListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependListener(event: "warning", listener: WarningListener): this;
+        prependListener(event: "message", listener: MessageListener): this;
+        prependListener(event: Signals, listener: SignalsListener): this;
+        prependListener(event: "newListener", listener: NewListenerListener): this;
+        prependListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependOnceListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependOnceListener(event: "disconnect", listener: DisconnectListener): this;
+        prependOnceListener(event: "exit", listener: ExitListener): this;
+        prependOnceListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependOnceListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependOnceListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependOnceListener(event: "warning", listener: WarningListener): this;
+        prependOnceListener(event: "message", listener: MessageListener): this;
+        prependOnceListener(event: Signals, listener: SignalsListener): this;
+        prependOnceListener(event: "newListener", listener: NewListenerListener): this;
+        prependOnceListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        listeners(event: "beforeExit"): BeforeExitListener[];
+        listeners(event: "disconnect"): DisconnectListener[];
+        listeners(event: "exit"): ExitListener[];
+        listeners(event: "rejectionHandled"): RejectionHandledListener[];
+        listeners(event: "uncaughtException"): UncaughtExceptionListener[];
+        listeners(event: "unhandledRejection"): UnhandledRejectionListener[];
+        listeners(event: "warning"): WarningListener[];
+        listeners(event: "message"): MessageListener[];
+        listeners(event: Signals): SignalsListener[];
+        listeners(event: "newListener"): NewListenerListener[];
+        listeners(event: "removeListener"): RemoveListenerListener[];
+    }
+
+    export interface Global {
+        Array: typeof Array;
+        ArrayBuffer: typeof ArrayBuffer;
+        Boolean: typeof Boolean;
+        Buffer: typeof Buffer;
+        DataView: typeof DataView;
+        Date: typeof Date;
+        Error: typeof Error;
+        EvalError: typeof EvalError;
+        Float32Array: typeof Float32Array;
+        Float64Array: typeof Float64Array;
+        Function: typeof Function;
+        GLOBAL: Global;
+        Infinity: typeof Infinity;
+        Int16Array: typeof Int16Array;
+        Int32Array: typeof Int32Array;
+        Int8Array: typeof Int8Array;
+        Intl: typeof Intl;
+        JSON: typeof JSON;
+        Map: MapConstructor;
+        Math: typeof Math;
+        NaN: typeof NaN;
+        Number: typeof Number;
+        Object: typeof Object;
+        Promise: Function;
+        RangeError: typeof RangeError;
+        ReferenceError: typeof ReferenceError;
+        RegExp: typeof RegExp;
+        Set: SetConstructor;
+        String: typeof String;
+        Symbol: Function;
+        SyntaxError: typeof SyntaxError;
+        TypeError: typeof TypeError;
+        URIError: typeof URIError;
+        Uint16Array: typeof Uint16Array;
+        Uint32Array: typeof Uint32Array;
+        Uint8Array: typeof Uint8Array;
+        Uint8ClampedArray: Function;
+        WeakMap: WeakMapConstructor;
+        WeakSet: WeakSetConstructor;
+        clearImmediate: (immediateId: any) => void;
+        clearInterval: (intervalId: NodeJS.Timer) => void;
+        clearTimeout: (timeoutId: NodeJS.Timer) => void;
+        console: typeof console;
+        decodeURI: typeof decodeURI;
+        decodeURIComponent: typeof decodeURIComponent;
+        encodeURI: typeof encodeURI;
+        encodeURIComponent: typeof encodeURIComponent;
+        escape: (str: string) => string;
+        eval: typeof eval;
+        global: Global;
+        isFinite: typeof isFinite;
+        isNaN: typeof isNaN;
+        parseFloat: typeof parseFloat;
+        parseInt: typeof parseInt;
+        process: Process;
+        root: Global;
+        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
+        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        undefined: typeof undefined;
+        unescape: (str: string) => string;
+        gc: () => void;
+        v8debug?: any;
+    }
+
+    export interface Timer {
+        ref(): void;
+        unref(): void;
+    }
+
+    class Module {
+        static runMain(): void;
+        static wrap(code: string): string;
+
+        static Module: typeof Module;
+
+        exports: any;
+        require: NodeRequireFunction;
+        id: string;
+        filename: string;
+        loaded: boolean;
+        parent: Module | null;
+        children: Module[];
+        paths: string[];
+
+        constructor(id: string, parent?: Module);
+    }
+}
+
+interface IterableIterator<T> { }
+
+/**
+ * @deprecated
+ */
+interface NodeBuffer extends Uint8Array {
+    write(string: string, offset?: number, length?: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): { type: 'Buffer', data: any[] };
+    equals(otherBuffer: Buffer): boolean;
+    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    swap16(): Buffer;
+    swap32(): Buffer;
+    swap64(): Buffer;
+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
+    fill(value: any, offset?: number, end?: number): this;
+    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
+}
+
+/************************************************
+*                                               *
+*                   MODULES                     *
+*                                               *
+************************************************/
+declare module "buffer" {
+    export var INSPECT_MAX_BYTES: number;
+    var BuffType: typeof Buffer;
+    var SlowBuffType: typeof SlowBuffer;
+    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
+}
+
+declare module "querystring" {
+    export interface StringifyOptions {
+        encodeURIComponent?: Function;
+    }
+
+    export interface ParseOptions {
+        maxKeys?: number;
+        decodeURIComponent?: Function;
+    }
+
+    interface ParsedUrlQuery { [key: string]: string | string[]; }
+
+    export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
+    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
+    export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
+    export function escape(str: string): string;
+    export function unescape(str: string): string;
+}
+
+declare module "events" {
+    class internal extends NodeJS.EventEmitter { }
+
+    namespace internal {
+        export class EventEmitter extends internal {
+            static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
+            static defaultMaxListeners: number;
+
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            on(event: string | symbol, listener: (...args: any[]) => void): this;
+            once(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeAllListeners(event?: string | symbol): this;
+            setMaxListeners(n: number): this;
+            getMaxListeners(): number;
+            listeners(event: string | symbol): Function[];
+            emit(event: string | symbol, ...args: any[]): boolean;
+            eventNames(): Array<string | symbol>;
+            listenerCount(type: string | symbol): number;
+        }
+    }
+
+    export = internal;
+}
+
+declare module "http" {
+    import * as events from "events";
+    import * as net from "net";
+    import * as stream from "stream";
+    import { URL } from "url";
+
+    // incoming headers will never contain number
+    export interface IncomingHttpHeaders {
+        'accept'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-headers'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'date'?: string;
+        'expires'?: string;
+        'host'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'public-key-pins'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'tk'?: string;
+        'upgrade'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
+
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    export interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
+    export interface ClientRequestArgs {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number | string;
+        defaultPort?: number | string;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: OutgoingHttpHeaders;
+        auth?: string;
+        agent?: Agent | boolean;
+        _defaultAgent?: Agent;
+        timeout?: number;
+        // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L278
+        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: net.Socket) => void) => net.Socket;
+    }
+
+    export class Server extends net.Server {
+        constructor(requestListener?: (req: IncomingMessage, res: ServerResponse) => void);
+
+        setTimeout(msecs?: number, callback?: () => void): this;
+        setTimeout(callback: () => void): this;
+        maxHeadersCount: number;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+    /**
+     * @deprecated Use IncomingMessage
+     */
+    export class ServerRequest extends IncomingMessage {
+        connection: net.Socket;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_outgoing.js
+    export class OutgoingMessage extends stream.Writable {
+        upgrading: boolean;
+        chunkedEncoding: boolean;
+        shouldKeepAlive: boolean;
+        useChunkedEncodingByDefault: boolean;
+        sendDate: boolean;
+        finished: boolean;
+        headersSent: boolean;
+        connection: net.Socket;
+
+        constructor();
+
+        setTimeout(msecs: number, callback?: () => void): this;
+        destroy(error: Error): void;
+        setHeader(name: string, value: number | string | string[]): void;
+        getHeader(name: string): number | string | string[] | undefined;
+        getHeaders(): OutgoingHttpHeaders;
+        getHeaderNames(): string[];
+        hasHeader(name: string): boolean;
+        removeHeader(name: string): void;
+        addTrailers(headers: OutgoingHttpHeaders | Array<[string, string]>): void;
+        flushHeaders(): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_server.js#L108-L256
+    export class ServerResponse extends OutgoingMessage {
+        statusCode: number;
+        statusMessage: string;
+
+        constructor(req: IncomingMessage);
+
+        assignSocket(socket: net.Socket): void;
+        detachSocket(socket: net.Socket): void;
+        // https://github.com/nodejs/node/blob/master/test/parallel/test-http-write-callbacks.js#L53
+        // no args in writeContinue callback
+        writeContinue(callback?: () => void): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L77
+    export class ClientRequest extends OutgoingMessage {
+        connection: net.Socket;
+        socket: net.Socket;
+        aborted: number;
+
+        constructor(url: string | URL | ClientRequestArgs, cb?: (res: IncomingMessage) => void);
+
+        abort(): void;
+        onSocket(socket: net.Socket): void;
+        setTimeout(timeout: number, callback?: () => void): this;
+        setNoDelay(noDelay?: boolean): void;
+        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+    }
+
+    export class IncomingMessage extends stream.Readable {
+        constructor(socket: net.Socket);
+
+        httpVersion: string;
+        httpVersionMajor: number;
+        httpVersionMinor: number;
+        connection: net.Socket;
+        headers: IncomingHttpHeaders;
+        rawHeaders: string[];
+        trailers: { [key: string]: string | undefined };
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback: () => void): this;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        method?: string;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        url?: string;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusCode?: number;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusMessage?: string;
+        socket: net.Socket;
+        destroy(error?: Error): void;
+    }
+
+    /**
+     * @deprecated Use IncomingMessage
+     */
+    export class ClientResponse extends IncomingMessage { }
+
+    export interface AgentOptions {
+        /**
+         * Keep sockets around in a pool to be used by other requests in the future. Default = false
+         */
+        keepAlive?: boolean;
+        /**
+         * When using HTTP KeepAlive, how often to send TCP KeepAlive packets over sockets being kept alive. Default = 1000.
+         * Only relevant if keepAlive is set to true.
+         */
+        keepAliveMsecs?: number;
+        /**
+         * Maximum number of sockets to allow per host. Default for Node 0.10 is 5, default for Node 0.12 is Infinity
+         */
+        maxSockets?: number;
+        /**
+         * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256.
+         */
+        maxFreeSockets?: number;
+    }
+
+    export class Agent {
+        maxSockets: number;
+        sockets: any;
+        requests: any;
+
+        constructor(opts?: AgentOptions);
+
+        /**
+         * Destroy any sockets that are currently in use by the agent.
+         * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
+         * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
+         * sockets may hang open for quite a long time before the server terminates them.
+         */
+        destroy(): void;
+    }
+
+    export var METHODS: string[];
+
+    export var STATUS_CODES: {
+        [errorCode: number]: string | undefined;
+        [errorCode: string]: string | undefined;
+    };
+
+    export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
+    export function createClient(port?: number, host?: string): any;
+
+    // although RequestOptions are passed as ClientRequestArgs to ClientRequest directly,
+    // create interface RequestOptions would make the naming more clear to developers
+    export interface RequestOptions extends ClientRequestArgs { }
+    export function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export var globalAgent: Agent;
+}
+
+declare module "cluster" {
+    import * as child from "child_process";
+    import * as events from "events";
+    import * as net from "net";
+
+    // interfaces
+    export interface ClusterSettings {
+        execArgv?: string[]; // default: process.execArgv
+        exec?: string;
+        args?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+    }
+
+    export interface ClusterSetupMasterSettings {
+        exec?: string;  // default: process.argv[1]
+        args?: string[];  // default: process.argv.slice(2)
+        silent?: boolean;  // default: false
+        stdio?: any[];
+    }
+
+    export interface Address {
+        address: string;
+        port: number;
+        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
+    }
+
+    export class Worker extends events.EventEmitter {
+        id: number;
+        process: child.ChildProcess;
+        suicide: boolean;
+        send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
+        kill(signal?: string): void;
+        destroy(signal?: string): void;
+        disconnect(): void;
+        isConnected(): boolean;
+        isDead(): boolean;
+        exitedAfterDisconnect: boolean;
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. error
+         *   3. exit
+         *   4. listening
+         *   5. message
+         *   6. online
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "listening", listener: (address: Address) => void): this;
+        addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "listening", address: Address): boolean;
+        emit(event: "message", message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "listening", listener: (address: Address) => void): this;
+        on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "listening", listener: (address: Address) => void): this;
+        once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "listening", listener: (address: Address) => void): this;
+        prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: () => void): this;
+    }
+
+    export interface Cluster extends events.EventEmitter {
+        Worker: Worker;
+        disconnect(callback?: Function): void;
+        fork(env?: any): Worker;
+        isMaster: boolean;
+        isWorker: boolean;
+        // TODO: cluster.schedulingPolicy
+        settings: ClusterSettings;
+        setupMaster(settings?: ClusterSetupMasterSettings): void;
+        worker?: Worker;
+        workers?: {
+            [index: string]: Worker | undefined
+        };
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. exit
+         *   3. fork
+         *   4. listening
+         *   5. message
+         *   6. online
+         *   7. setup
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        addListener(event: "fork", listener: (worker: Worker) => void): this;
+        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: (worker: Worker) => void): this;
+        addListener(event: "setup", listener: (settings: any) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect", worker: Worker): boolean;
+        emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+        emit(event: "fork", worker: Worker): boolean;
+        emit(event: "listening", worker: Worker, address: Address): boolean;
+        emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online", worker: Worker): boolean;
+        emit(event: "setup", settings: any): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: (worker: Worker) => void): this;
+        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        on(event: "fork", listener: (worker: Worker) => void): this;
+        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: (worker: Worker) => void): this;
+        on(event: "setup", listener: (settings: any) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: (worker: Worker) => void): this;
+        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        once(event: "fork", listener: (worker: Worker) => void): this;
+        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: (worker: Worker) => void): this;
+        once(event: "setup", listener: (settings: any) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: (worker: Worker) => void): this;
+        prependListener(event: "setup", listener: (settings: any) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+    }
+
+    export function disconnect(callback?: Function): void;
+    export function fork(env?: any): Worker;
+    export var isMaster: boolean;
+    export var isWorker: boolean;
+    // TODO: cluster.schedulingPolicy
+    export var settings: ClusterSettings;
+    export function setupMaster(settings?: ClusterSetupMasterSettings): void;
+    export var worker: Worker;
+    export var workers: {
+        [index: string]: Worker | undefined
+    };
+
+    /**
+     * events.EventEmitter
+     *   1. disconnect
+     *   2. exit
+     *   3. fork
+     *   4. listening
+     *   5. message
+     *   6. online
+     *   7. setup
+     */
+    export function addListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function emit(event: string | symbol, ...args: any[]): boolean;
+    export function emit(event: "disconnect", worker: Worker): boolean;
+    export function emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+    export function emit(event: "fork", worker: Worker): boolean;
+    export function emit(event: "listening", worker: Worker, address: Address): boolean;
+    export function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+    export function emit(event: "online", worker: Worker): boolean;
+    export function emit(event: "setup", settings: any): boolean;
+
+    export function on(event: string, listener: (...args: any[]) => void): Cluster;
+    export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function on(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function once(event: string, listener: (...args: any[]) => void): Cluster;
+    export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function once(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function removeAllListeners(event?: string): Cluster;
+    export function setMaxListeners(n: number): Cluster;
+    export function getMaxListeners(): number;
+    export function listeners(event: string): Function[];
+    export function listenerCount(type: string): number;
+
+    export function prependListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function eventNames(): string[];
+}
+
+declare module "zlib" {
+    import * as stream from "stream";
+
+    export interface ZlibOptions {
+        flush?: number; // default: zlib.constants.Z_NO_FLUSH
+        finishFlush?: number; // default: zlib.constants.Z_FINISH
+        chunkSize?: number; // default: 16*1024
+        windowBits?: number;
+        level?: number; // compression only
+        memLevel?: number; // compression only
+        strategy?: number; // compression only
+        dictionary?: any; // deflate/inflate only, empty dictionary by default
+    }
+
+    export interface Zlib {
+        readonly bytesRead: number;
+        close(callback?: () => void): void;
+        flush(kind?: number | (() => void), callback?: () => void): void;
+    }
+
+    export interface ZlibParams {
+        params(level: number, strategy: number, callback: () => void): void;
+    }
+
+    export interface ZlibReset {
+        reset(): void;
+    }
+
+    export interface Gzip extends stream.Transform, Zlib { }
+    export interface Gunzip extends stream.Transform, Zlib { }
+    export interface Deflate extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface Inflate extends stream.Transform, Zlib, ZlibReset { }
+    export interface DeflateRaw extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface InflateRaw extends stream.Transform, Zlib, ZlibReset { }
+    export interface Unzip extends stream.Transform, Zlib { }
+
+    export function createGzip(options?: ZlibOptions): Gzip;
+    export function createGunzip(options?: ZlibOptions): Gunzip;
+    export function createDeflate(options?: ZlibOptions): Deflate;
+    export function createInflate(options?: ZlibOptions): Inflate;
+    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    export function createUnzip(options?: ZlibOptions): Unzip;
+
+    export function deflate(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function deflateRaw(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function gzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function gunzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function inflate(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function inflateRaw(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function unzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+
+    export namespace constants {
+        // Allowed flush values.
+
+        export const Z_NO_FLUSH: number;
+        export const Z_PARTIAL_FLUSH: number;
+        export const Z_SYNC_FLUSH: number;
+        export const Z_FULL_FLUSH: number;
+        export const Z_FINISH: number;
+        export const Z_BLOCK: number;
+        export const Z_TREES: number;
+
+        // Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
+
+        export const Z_OK: number;
+        export const Z_STREAM_END: number;
+        export const Z_NEED_DICT: number;
+        export const Z_ERRNO: number;
+        export const Z_STREAM_ERROR: number;
+        export const Z_DATA_ERROR: number;
+        export const Z_MEM_ERROR: number;
+        export const Z_BUF_ERROR: number;
+        export const Z_VERSION_ERROR: number;
+
+        // Compression levels.
+
+        export const Z_NO_COMPRESSION: number;
+        export const Z_BEST_SPEED: number;
+        export const Z_BEST_COMPRESSION: number;
+        export const Z_DEFAULT_COMPRESSION: number;
+
+        // Compression strategy.
+
+        export const Z_FILTERED: number;
+        export const Z_HUFFMAN_ONLY: number;
+        export const Z_RLE: number;
+        export const Z_FIXED: number;
+        export const Z_DEFAULT_STRATEGY: number;
+    }
+
+    // Constants
+    export var Z_NO_FLUSH: number;
+    export var Z_PARTIAL_FLUSH: number;
+    export var Z_SYNC_FLUSH: number;
+    export var Z_FULL_FLUSH: number;
+    export var Z_FINISH: number;
+    export var Z_BLOCK: number;
+    export var Z_TREES: number;
+    export var Z_OK: number;
+    export var Z_STREAM_END: number;
+    export var Z_NEED_DICT: number;
+    export var Z_ERRNO: number;
+    export var Z_STREAM_ERROR: number;
+    export var Z_DATA_ERROR: number;
+    export var Z_MEM_ERROR: number;
+    export var Z_BUF_ERROR: number;
+    export var Z_VERSION_ERROR: number;
+    export var Z_NO_COMPRESSION: number;
+    export var Z_BEST_SPEED: number;
+    export var Z_BEST_COMPRESSION: number;
+    export var Z_DEFAULT_COMPRESSION: number;
+    export var Z_FILTERED: number;
+    export var Z_HUFFMAN_ONLY: number;
+    export var Z_RLE: number;
+    export var Z_FIXED: number;
+    export var Z_DEFAULT_STRATEGY: number;
+    export var Z_BINARY: number;
+    export var Z_TEXT: number;
+    export var Z_ASCII: number;
+    export var Z_UNKNOWN: number;
+    export var Z_DEFLATED: number;
+}
+
+declare module "os" {
+    export interface CpuInfo {
+        model: string;
+        speed: number;
+        times: {
+            user: number;
+            nice: number;
+            sys: number;
+            idle: number;
+            irq: number;
+        };
+    }
+
+    export interface NetworkInterfaceBase {
+        address: string;
+        netmask: string;
+        mac: string;
+        internal: boolean;
+    }
+
+    export interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
+        family: "IPv4";
+    }
+
+    export interface NetworkInterfaceInfoIPv6 extends NetworkInterfaceBase {
+        family: "IPv6";
+        scopeid: number;
+    }
+
+    export type NetworkInterfaceInfo = NetworkInterfaceInfoIPv4 | NetworkInterfaceInfoIPv6;
+
+    export function hostname(): string;
+    export function loadavg(): number[];
+    export function uptime(): number;
+    export function freemem(): number;
+    export function totalmem(): number;
+    export function cpus(): CpuInfo[];
+    export function type(): string;
+    export function release(): string;
+    export function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
+    export function homedir(): string;
+    export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string };
+    export var constants: {
+        UV_UDP_REUSEADDR: number,
+        signals: {
+            SIGHUP: number;
+            SIGINT: number;
+            SIGQUIT: number;
+            SIGILL: number;
+            SIGTRAP: number;
+            SIGABRT: number;
+            SIGIOT: number;
+            SIGBUS: number;
+            SIGFPE: number;
+            SIGKILL: number;
+            SIGUSR1: number;
+            SIGSEGV: number;
+            SIGUSR2: number;
+            SIGPIPE: number;
+            SIGALRM: number;
+            SIGTERM: number;
+            SIGCHLD: number;
+            SIGSTKFLT: number;
+            SIGCONT: number;
+            SIGSTOP: number;
+            SIGTSTP: number;
+            SIGTTIN: number;
+            SIGTTOU: number;
+            SIGURG: number;
+            SIGXCPU: number;
+            SIGXFSZ: number;
+            SIGVTALRM: number;
+            SIGPROF: number;
+            SIGWINCH: number;
+            SIGIO: number;
+            SIGPOLL: number;
+            SIGPWR: number;
+            SIGSYS: number;
+            SIGUNUSED: number;
+        },
+        errno: {
+            E2BIG: number;
+            EACCES: number;
+            EADDRINUSE: number;
+            EADDRNOTAVAIL: number;
+            EAFNOSUPPORT: number;
+            EAGAIN: number;
+            EALREADY: number;
+            EBADF: number;
+            EBADMSG: number;
+            EBUSY: number;
+            ECANCELED: number;
+            ECHILD: number;
+            ECONNABORTED: number;
+            ECONNREFUSED: number;
+            ECONNRESET: number;
+            EDEADLK: number;
+            EDESTADDRREQ: number;
+            EDOM: number;
+            EDQUOT: number;
+            EEXIST: number;
+            EFAULT: number;
+            EFBIG: number;
+            EHOSTUNREACH: number;
+            EIDRM: number;
+            EILSEQ: number;
+            EINPROGRESS: number;
+            EINTR: number;
+            EINVAL: number;
+            EIO: number;
+            EISCONN: number;
+            EISDIR: number;
+            ELOOP: number;
+            EMFILE: number;
+            EMLINK: number;
+            EMSGSIZE: number;
+            EMULTIHOP: number;
+            ENAMETOOLONG: number;
+            ENETDOWN: number;
+            ENETRESET: number;
+            ENETUNREACH: number;
+            ENFILE: number;
+            ENOBUFS: number;
+            ENODATA: number;
+            ENODEV: number;
+            ENOENT: number;
+            ENOEXEC: number;
+            ENOLCK: number;
+            ENOLINK: number;
+            ENOMEM: number;
+            ENOMSG: number;
+            ENOPROTOOPT: number;
+            ENOSPC: number;
+            ENOSR: number;
+            ENOSTR: number;
+            ENOSYS: number;
+            ENOTCONN: number;
+            ENOTDIR: number;
+            ENOTEMPTY: number;
+            ENOTSOCK: number;
+            ENOTSUP: number;
+            ENOTTY: number;
+            ENXIO: number;
+            EOPNOTSUPP: number;
+            EOVERFLOW: number;
+            EPERM: number;
+            EPIPE: number;
+            EPROTO: number;
+            EPROTONOSUPPORT: number;
+            EPROTOTYPE: number;
+            ERANGE: number;
+            EROFS: number;
+            ESPIPE: number;
+            ESRCH: number;
+            ESTALE: number;
+            ETIME: number;
+            ETIMEDOUT: number;
+            ETXTBSY: number;
+            EWOULDBLOCK: number;
+            EXDEV: number;
+        },
+    };
+    export function arch(): string;
+    export function platform(): NodeJS.Platform;
+    export function tmpdir(): string;
+    export var EOL: string;
+    export function endianness(): "BE" | "LE";
+}
+
+declare module "https" {
+    import * as tls from "tls";
+    import * as events from "events";
+    import * as http from "http";
+    import { URL } from "url";
+
+    export interface ServerOptions {
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        crl?: any;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: any;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: tls.SecureContext) => void) => void;
+    }
+
+    export interface RequestOptions extends http.RequestOptions {
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        ciphers?: string;
+        rejectUnauthorized?: boolean;
+        secureProtocol?: string;
+        servername?: string;
+    }
+
+    export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
+        rejectUnauthorized?: boolean;
+        maxCachedSessions?: number;
+    }
+
+    export class Agent extends http.Agent {
+        constructor(options?: AgentOptions);
+    }
+
+    export class Server extends tls.Server {
+        setTimeout(callback: () => void): this;
+        setTimeout(msecs?: number, callback?: () => void): this;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+
+    export function createServer(options: ServerOptions, requestListener?: (req: http.IncomingMessage, res: http.ServerResponse) => void): Server;
+    export function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export var globalAgent: Agent;
+}
+
+declare module "punycode" {
+    export function decode(string: string): string;
+    export function encode(string: string): string;
+    export function toUnicode(domain: string): string;
+    export function toASCII(domain: string): string;
+    export var ucs2: ucs2;
+    interface ucs2 {
+        decode(string: string): number[];
+        encode(codePoints: number[]): string;
+    }
+    export var version: any;
+}
+
+declare module "repl" {
+    import * as stream from "stream";
+    import * as readline from "readline";
+
+    export interface ReplOptions {
+        prompt?: string;
+        input?: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        terminal?: boolean;
+        eval?: Function;
+        useColors?: boolean;
+        useGlobal?: boolean;
+        ignoreUndefined?: boolean;
+        writer?: Function;
+        completer?: Function;
+        replMode?: any;
+        breakEvalOnSigint?: any;
+    }
+
+    export interface REPLServer extends readline.ReadLine {
+        context: any;
+        inputStream: NodeJS.ReadableStream;
+        outputStream: NodeJS.WritableStream;
+
+        defineCommand(keyword: string, cmd: Function | { help: string, action: Function }): void;
+        displayPrompt(preserveCursor?: boolean): void;
+
+        /**
+         * events.EventEmitter
+         * 1. exit
+         * 2. reset
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "exit", listener: () => void): this;
+        addListener(event: "reset", listener: (...args: any[]) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "exit"): boolean;
+        emit(event: "reset", context: any): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "exit", listener: () => void): this;
+        on(event: "reset", listener: (...args: any[]) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "exit", listener: () => void): this;
+        once(event: "reset", listener: (...args: any[]) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "exit", listener: () => void): this;
+        prependListener(event: "reset", listener: (...args: any[]) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "exit", listener: () => void): this;
+        prependOnceListener(event: "reset", listener: (...args: any[]) => void): this;
+    }
+
+    export function start(options?: string | ReplOptions): REPLServer;
+
+    export class Recoverable extends SyntaxError {
+        err: Error;
+
+        constructor(err: Error);
+    }
+}
+
+declare module "readline" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    export interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
+
+    export interface ReadLine extends events.EventEmitter {
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        pause(): ReadLine;
+        resume(): ReadLine;
+        close(): void;
+        write(data: string | Buffer, key?: Key): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. line
+         * 3. pause
+         * 4. resume
+         * 5. SIGCONT
+         * 6. SIGINT
+         * 7. SIGTSTP
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: any) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: any): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: any) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: any) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: any) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: any) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+    }
+
+    type Completer = (line: string) => CompleterResult;
+    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
+
+    export type CompleterResult = [string[], string];
+
+    export interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer | AsyncCompleter;
+        terminal?: boolean;
+        historySize?: number;
+    }
+
+    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
+    export function createInterface(options: ReadLineOptions): ReadLine;
+
+    export function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
+    export function emitKeypressEvents(stream: NodeJS.ReadableStream, interface?: ReadLine): void;
+    export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
+    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    export function clearScreenDown(stream: NodeJS.WritableStream): void;
+}
+
+declare module "vm" {
+    export interface Context { }
+    export interface ScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+        cachedData?: Buffer;
+        produceCachedData?: boolean;
+    }
+    export interface RunningScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+    }
+    export class Script {
+        constructor(code: string, options?: ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
+        runInThisContext(options?: RunningScriptOptions): any;
+    }
+    export function createContext(sandbox?: Context): Context;
+    export function isContext(sandbox: Context): boolean;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+    export function runInDebugContext(code: string): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
+    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+}
+
+declare module "child_process" {
+    import * as events from "events";
+    import * as stream from "stream";
+    import * as net from "net";
+
+    export interface ChildProcess extends events.EventEmitter {
+        stdin: stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: [stream.Writable, stream.Readable, stream.Readable];
+        killed: boolean;
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, options?: MessageOptions, callback?: (error: Error) => void): boolean;
+        connected: boolean;
+        disconnect(): void;
+        unref(): void;
+        ref(): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. disconnect
+         * 3. error
+         * 4. exit
+         * 5. message
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (code: number, signal: string) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", code: number, signal: string): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (code: number, signal: string) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (code: number, signal: string) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+    }
+
+    export interface MessageOptions {
+        keepOpen?: boolean;
+    }
+
+    export interface SpawnOptions {
+        cwd?: string;
+        env?: any;
+        stdio?: any;
+        detached?: boolean;
+        uid?: number;
+        gid?: number;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+    }
+
+    export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
+
+    export interface ExecOptions {
+        cwd?: string;
+        env?: any;
+        shell?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+    }
+
+    export interface ExecOptionsWithStringEncoding extends ExecOptions {
+        encoding: BufferEncoding;
+    }
+
+    export interface ExecOptionsWithBufferEncoding extends ExecOptions {
+        encoding: string | null; // specify `null`.
+    }
+
+    // no `options` definitely means stdout/stderr are `string`.
+    export function exec(command: string, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    export function exec(command: string, options: { encoding: "buffer" | null } & ExecOptions, callback?: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    export function exec(command: string, options: { encoding: BufferEncoding } & ExecOptions, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    export function exec(command: string, options: { encoding: string } & ExecOptions, callback?: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    export function exec(command: string, options: ExecOptions, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    export function exec(command: string, options: ({ encoding?: string | null } & ExecOptions) | undefined | null, callback?: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace exec {
+        export function __promisify__(command: string): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options: ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options?: ({ encoding?: string | null } & ExecOptions) | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    export interface ExecFileOptions {
+        cwd?: string;
+        env?: any;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+        windowsVerbatimArguments?: boolean;
+    }
+    export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
+        encoding: 'buffer' | null;
+    }
+    export interface ExecFileOptionsWithOtherEncoding extends ExecFileOptions {
+        encoding: string;
+    }
+
+    export function execFile(file: string): ChildProcess;
+    export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+
+    // no `options` definitely means stdout/stderr are `string`.
+    export function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    export function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    export function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    export function execFile(file: string, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    export function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace execFile {
+        export function __promisify__(file: string): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    export interface ForkOptions {
+        cwd?: string;
+        env?: any;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+        windowsVerbatimArguments?: boolean;
+    }
+    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+
+    export interface SpawnSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+    }
+    export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export interface SpawnSyncReturns<T> {
+        pid: number;
+        output: string[];
+        stdout: T;
+        stderr: T;
+        status: number;
+        signal: string;
+        error: Error;
+    }
+    export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+
+    export interface ExecSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        shell?: string;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execSync(command: string): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
+    export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptions): Buffer;
+
+    export interface ExecFileSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execFileSync(command: string): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
+}
+
+declare module "url" {
+    import { ParsedUrlQuery } from 'querystring';
+
+    export interface UrlObjectCommon {
+        auth?: string;
+        hash?: string;
+        host?: string;
+        hostname?: string;
+        href?: string;
+        path?: string;
+        pathname?: string;
+        protocol?: string;
+        search?: string;
+        slashes?: boolean;
+    }
+
+    // Input to `url.format`
+    export interface UrlObject extends UrlObjectCommon {
+        port?: string | number;
+        query?: string | null | { [key: string]: any };
+    }
+
+    // Output of `url.parse`
+    export interface Url extends UrlObjectCommon {
+        port?: string;
+        query?: string | null | ParsedUrlQuery;
+    }
+
+    export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
+    export function format(URL: URL, options?: URLFormatOptions): string;
+    export function format(urlObject: UrlObject | string): string;
+    export function resolve(from: string, to: string): string;
+
+    export interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
+    export class URLSearchParams implements Iterable<[string, string]> {
+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        entries(): IterableIterator<[string, string]>;
+        forEach(callback: (value: string, name: string) => void): void;
+        get(name: string): string | null;
+        getAll(name: string): string[];
+        has(name: string): boolean;
+        keys(): IterableIterator<string>;
+        set(name: string, value: string): void;
+        sort(): void;
+        toString(): string;
+        values(): IterableIterator<string>;
+        [Symbol.iterator](): IterableIterator<[string, string]>;
+    }
+
+    export class URL {
+        constructor(input: string, base?: string | URL);
+        hash: string;
+        host: string;
+        hostname: string;
+        href: string;
+        readonly origin: string;
+        password: string;
+        pathname: string;
+        port: string;
+        protocol: string;
+        search: string;
+        readonly searchParams: URLSearchParams;
+        username: string;
+        toString(): string;
+        toJSON(): string;
+    }
+}
+
+declare module "dns" {
+    // Supported getaddrinfo flags.
+    export const ADDRCONFIG: number;
+    export const V4MAPPED: number;
+
+    export interface LookupOptions {
+        family?: number;
+        hints?: number;
+        all?: boolean;
+    }
+
+    export interface LookupOneOptions extends LookupOptions {
+        all?: false;
+    }
+
+    export interface LookupAllOptions extends LookupOptions {
+        all: true;
+    }
+
+    export interface LookupAddress {
+        address: string;
+        family: number;
+    }
+
+    export function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
+    export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
+    export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lookup {
+        export function __promisify__(hostname: string, options: LookupAllOptions): Promise<{ address: LookupAddress[] }>;
+        export function __promisify__(hostname: string, options?: LookupOneOptions | number): Promise<{ address: string, family: number }>;
+        export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
+    }
+
+    export interface ResolveOptions {
+        ttl: boolean;
+    }
+
+    export interface ResolveWithTtlOptions extends ResolveOptions {
+        ttl: true;
+    }
+
+    export interface RecordWithTtl {
+        address: string;
+        ttl: number;
+    }
+
+    export interface MxRecord {
+        priority: number;
+        exchange: string;
+    }
+
+    export interface NaptrRecord {
+        flags: string;
+        service: string;
+        regexp: string;
+        replacement: string;
+        order: number;
+        preference: number;
+    }
+
+    export interface SoaRecord {
+        nsname: string;
+        hostmaster: string;
+        serial: number;
+        refresh: number;
+        retry: number;
+        expire: number;
+        minttl: number;
+    }
+
+    export interface SrvRecord {
+        priority: number;
+        weight: number;
+        port: number;
+        name: string;
+    }
+
+    export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
+    export function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve {
+        export function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
+        export function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
+        export function __promisify__(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "TXT"): Promise<string[][]>;
+        export function __promisify__(hostname: string, rrtype?: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]>;
+    }
+
+    export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve4 {
+        export function __promisify__(hostname: string): Promise<string[]>;
+        export function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        export function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    export function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve6 {
+        export function __promisify__(hostname: string): Promise<string[]>;
+        export function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        export function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+
+    export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
+    export function setServers(servers: string[]): void;
+
+    // Error codes
+    export var NODATA: string;
+    export var FORMERR: string;
+    export var SERVFAIL: string;
+    export var NOTFOUND: string;
+    export var NOTIMP: string;
+    export var REFUSED: string;
+    export var BADQUERY: string;
+    export var BADNAME: string;
+    export var BADFAMILY: string;
+    export var BADRESP: string;
+    export var CONNREFUSED: string;
+    export var TIMEOUT: string;
+    export var EOF: string;
+    export var FILE: string;
+    export var NOMEM: string;
+    export var DESTRUCTION: string;
+    export var BADSTR: string;
+    export var BADFLAGS: string;
+    export var NONAME: string;
+    export var BADHINTS: string;
+    export var NOTINITIALIZED: string;
+    export var LOADIPHLPAPI: string;
+    export var ADDRGETNETWORKPARAMS: string;
+    export var CANCELLED: string;
+}
+
+declare module "net" {
+    import * as stream from "stream";
+    import * as events from "events";
+    import * as dns from "dns";
+
+    type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
+
+    export interface SocketConstructorOpts {
+        fd?: number;
+        allowHalfOpen?: boolean;
+        readable?: boolean;
+        writable?: boolean;
+    }
+
+    export interface TcpSocketConnectOpts {
+        port: number;
+        host?: string;
+        localAddress?: string;
+        localPort?: number;
+        hints?: number;
+        family?: number;
+        lookup?: LookupFunction;
+    }
+
+    export interface IpcSocketConnectOpts {
+        path: string;
+    }
+
+    export type SocketConnectOpts = TcpSocketConnectOpts | IpcSocketConnectOpts;
+
+    export class Socket extends stream.Duplex {
+        constructor(options?: SocketConstructorOpts);
+
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+        write(data: any, encoding?: string, callback?: Function): void;
+
+        connect(options: SocketConnectOpts, connectionListener?: Function): this;
+        connect(port: number, host: string, connectionListener?: Function): this;
+        connect(port: number, connectionListener?: Function): this;
+        connect(path: string, connectionListener?: Function): this;
+
+        bufferSize: number;
+        setEncoding(encoding?: string): this;
+        destroy(err?: any): void;
+        pause(): this;
+        resume(): this;
+        setTimeout(timeout: number, callback?: Function): void;
+        setNoDelay(noDelay?: boolean): void;
+        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        address(): { port: number; family: string; address: string; };
+        unref(): void;
+        ref(): void;
+
+        remoteAddress?: string;
+        remoteFamily?: string;
+        remotePort?: number;
+        localAddress: string;
+        localPort: number;
+        bytesRead: number;
+        bytesWritten: number;
+        connecting: boolean;
+        destroyed: boolean;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connect
+         *   3. data
+         *   4. drain
+         *   5. end
+         *   6. error
+         *   7. lookup
+         *   8. timeout
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (had_error: boolean) => void): this;
+        addListener(event: "connect", listener: () => void): this;
+        addListener(event: "data", listener: (data: Buffer) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", had_error: boolean): boolean;
+        emit(event: "connect"): boolean;
+        emit(event: "data", data: Buffer): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (had_error: boolean) => void): this;
+        on(event: "connect", listener: () => void): this;
+        on(event: "data", listener: (data: Buffer) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (had_error: boolean) => void): this;
+        once(event: "connect", listener: () => void): this;
+        once(event: "data", listener: (data: Buffer) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependListener(event: "connect", listener: () => void): this;
+        prependListener(event: "data", listener: (data: Buffer) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependOnceListener(event: "connect", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface ListenOptions {
+        port?: number;
+        host?: string;
+        backlog?: number;
+        path?: string;
+        exclusive?: boolean;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/net.js
+    export class Server extends events.EventEmitter {
+        constructor(connectionListener?: (socket: Socket) => void);
+        constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
+
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, hostname?: string, listeningListener?: Function): this;
+        listen(port?: number, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, listeningListener?: Function): this;
+        listen(path: string, backlog?: number, listeningListener?: Function): this;
+        listen(path: string, listeningListener?: Function): this;
+        listen(options: ListenOptions, listeningListener?: Function): this;
+        listen(handle: any, backlog?: number, listeningListener?: Function): this;
+        listen(handle: any, listeningListener?: Function): this;
+        close(callback?: Function): this;
+        address(): { port: number; family: string; address: string; };
+        getConnections(cb: (error: Error | null, count: number) => void): void;
+        ref(): this;
+        unref(): this;
+        maxConnections: number;
+        connections: number;
+        listening: boolean;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connection
+         *   3. error
+         *   4. listening
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "connection", listener: (socket: Socket) => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "connection", socket: Socket): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "connection", listener: (socket: Socket) => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "connection", listener: (socket: Socket) => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+    }
+
+    export interface TcpNetConnectOpts extends TcpSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export interface IpcNetConnectOpts extends IpcSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export type NetConnectOpts = TcpNetConnectOpts | IpcNetConnectOpts;
+
+    export function createServer(connectionListener?: (socket: Socket) => void): Server;
+    export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
+    export function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
+    export function connect(port: number, host?: string, connectionListener?: Function): Socket;
+    export function connect(path: string, connectionListener?: Function): Socket;
+    export function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
+    export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
+    export function createConnection(path: string, connectionListener?: Function): Socket;
+    export function isIP(input: string): number;
+    export function isIPv4(input: string): boolean;
+    export function isIPv6(input: string): boolean;
+}
+
+declare module "dgram" {
+    import * as events from "events";
+    import * as dns from "dns";
+
+    interface RemoteInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    interface BindOptions {
+        port: number;
+        address?: string;
+        exclusive?: boolean;
+    }
+
+    type SocketType = "udp4" | "udp6";
+
+    interface SocketOptions {
+        type: SocketType;
+        reuseAddr?: boolean;
+        recvBufferSize?: number;
+        sendBufferSize?: number;
+        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
+    }
+
+    export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+
+    export class Socket extends events.EventEmitter {
+        send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
+        bind(port?: number, address?: string, callback?: () => void): void;
+        bind(port?: number, callback?: () => void): void;
+        bind(callback?: () => void): void;
+        bind(options: BindOptions, callback?: Function): void;
+        close(callback?: () => void): void;
+        address(): AddressInfo;
+        setBroadcast(flag: boolean): void;
+        setTTL(ttl: number): void;
+        setMulticastTTL(ttl: number): void;
+        setMulticastInterface(multicastInterface: string): void;
+        setMulticastLoopback(flag: boolean): void;
+        addMembership(multicastAddress: string, multicastInterface?: string): void;
+        dropMembership(multicastAddress: string, multicastInterface?: string): void;
+        ref(): this;
+        unref(): this;
+        setRecvBufferSize(size: number): void;
+        setSendBufferSize(size: number): void;
+        getRecvBufferSize(): number;
+        getSendBufferSize(): number;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+        addListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+        emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+        on(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+        once(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+        prependListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+    }
+}
+
+declare module "fs" {
+    import * as stream from "stream";
+    import * as events from "events";
+    import { URL } from "url";
+
+    /**
+     * Valid types for path values in "fs".
+     */
+    export type PathLike = string | Buffer | URL;
+
+    export class Stats {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        dev: number;
+        ino: number;
+        mode: number;
+        nlink: number;
+        uid: number;
+        gid: number;
+        rdev: number;
+        size: number;
+        blksize: number;
+        blocks: number;
+        atimeMs: number;
+        mtimeMs: number;
+        ctimeMs: number;
+        birthtimeMs: number;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    export interface FSWatcher extends events.EventEmitter {
+        close(): void;
+
+        /**
+         * events.EventEmitter
+         *   1. change
+         *   2. error
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+    }
+
+    export class ReadStream extends stream.Readable {
+        close(): void;
+        destroy(): void;
+        bytesRead: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    export class WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    /**
+     * Asynchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function rename(oldPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace rename {
+        /**
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        export function __promisify__(oldPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function renameSync(oldPath: PathLike, newPath: PathLike): void;
+
+    /**
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
+     */
+    export function truncate(path: PathLike, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function truncate(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace truncate {
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        export function __promisify__(path: PathLike, len?: number | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
+     */
+    export function truncateSync(path: PathLike, len?: number | null): void;
+
+    /**
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
+     */
+    export function ftruncate(fd: number, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     */
+    export function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace ftruncate {
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param fd A file descriptor.
+         * @param len If not specified, defaults to `0`.
+         */
+        export function __promisify__(fd: number, len?: number | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
+     */
+    export function ftruncateSync(fd: number, len?: number | null): void;
+
+    /**
+     * Asynchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function chown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace chown {
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function chownSync(path: PathLike, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
+     */
+    export function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fchown {
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
+     */
+    export function fchownSync(fd: number, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lchown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lchown {
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lchownSync(path: PathLike, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    export function chmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace chmod {
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    export function chmodSync(path: PathLike, mode: string | number): void;
+
+    /**
+     * Asynchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    export function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fchmod {
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param fd A file descriptor.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(fd: number, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    export function fchmodSync(fd: number, mode: string | number): void;
+
+    /**
+     * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    export function lchmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lchmod {
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    export function lchmodSync(path: PathLike, mode: string | number): void;
+
+    /**
+     * Asynchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function stat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace stat {
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function statSync(path: PathLike): Stats;
+
+    /**
+     * Asynchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    export function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fstat {
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    export function fstatSync(fd: number): Stats;
+
+    /**
+     * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lstat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lstat {
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lstatSync(path: PathLike): Stats;
+
+    /**
+     * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function link(existingPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace link {
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function linkSync(existingPath: PathLike, newPath: PathLike): void;
+
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    export function symlink(target: PathLike, path: PathLike, type: string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function symlink(target: PathLike, path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace symlink {
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        export function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    export function symlinkSync(target: PathLike, path: PathLike, type?: string | null): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, linkString: Buffer) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string | Buffer) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function readlink(path: PathLike, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readlink {
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function realpath(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace realpath {
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function unlink(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace unlink {
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function unlinkSync(path: PathLike): void;
+
+    /**
+     * Asynchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function rmdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace rmdir {
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function rmdirSync(path: PathLike): void;
+
+    /**
+     * Asynchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    export function mkdir(path: PathLike, mode: number | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous mkdir(2) - create a directory with a mode of `0o777`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function mkdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace mkdir {
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        export function __promisify__(path: PathLike, mode?: number | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    export function mkdirSync(path: PathLike, mode?: number | string | null): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: "buffer" | { encoding: "buffer" }, callback: (err: NodeJS.ErrnoException, folder: Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     */
+    export function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace mkdtemp {
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, files: Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: Array<string | Buffer>) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function readdir(path: PathLike, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readdir {
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: "buffer" | { encoding: "buffer" }): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<Array<string | Buffer>>;
+    }
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options?: { encoding: BufferEncoding | null } | BufferEncoding | null): string[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options?: { encoding?: string | null } | string | null): Array<string | Buffer>;
+
+    /**
+     * Asynchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace close {
+        /**
+         * Asynchronous close(2) - close a file descriptor.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function closeSync(fd: number): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    export function open(path: PathLike, flags: string | number, mode: string | number | undefined | null, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file. If the file is created, its mode will be `0o666`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function open(path: PathLike, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace open {
+        /**
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+         */
+        export function __promisify__(path: PathLike, flags: string | number, mode?: string | number | null): Promise<number>;
+    }
+
+    /**
+     * Synchronous open(2) - open and possibly create a file, returning a file descriptor..
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    export function openSync(path: PathLike, flags: string | number, mode?: string | number | null): number;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace utimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        export function __promisify__(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function utimesSync(path: PathLike, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function futimes(fd: number, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace futimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        export function __promisify__(fd: number, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function futimesSync(fd: number, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    export function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fsync {
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    export function fsyncSync(fd: number): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, length: number | undefined | null, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, length: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    export function write(fd: number, string: any, position: number | undefined | null, encoding: string | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function write(fd: number, string: any, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     */
+    export function write(fd: number, string: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace write {
+        /**
+         * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         */
+        export function __promisify__<TBuffer extends Buffer | Uint8Array>(fd: number, buffer?: TBuffer, offset?: number, length?: number, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         * @param encoding The expected string encoding.
+         */
+        export function __promisify__(fd: number, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+    }
+
+    /**
+     * Synchronously writes `buffer` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function writeSync(fd: number, buffer: Buffer | Uint8Array, offset?: number | null, length?: number | null, position?: number | null): number;
+
+    /**
+     * Synchronously writes `string` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    export function writeSync(fd: number, string: any, position?: number | null, encoding?: string | null): number;
+
+    /**
+     * Asynchronously reads data from the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    export function read<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: TBuffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace read {
+        /**
+         * @param fd A file descriptor.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The offset in the buffer at which to start writing.
+         * @param length The number of bytes to read.
+         * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+         */
+        export function __promisify__<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+    }
+
+    /**
+     * Synchronously reads data from the file referenced by the supplied file descriptor, returning the number of bytes read.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    export function readSync(fd: number, buffer: Buffer | Uint8Array, offset: number, length: number, position: number | null): number;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding?: null; flag?: string; } | undefined | null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding: string; flag?: string; } | string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding?: string | null; flag?: string; } | string | undefined | null, callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     */
+    export function readFile(path: PathLike | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readFile {
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options: { encoding: string; flag?: string; } | string): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag. If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Buffer;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options: { encoding: string; flag?: string; } | string): string;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): string | Buffer;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    export function writeFile(path: PathLike | number, data: any, options: { encoding?: string | null; mode?: number | string; flag?: string; } | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    export function writeFile(path: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace writeFile {
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'w'` is used.
+         */
+        export function __promisify__(path: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    export function writeFileSync(path: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    export function appendFile(file: PathLike | number, data: any, options: { encoding?: string | null, mode?: string | number, flag?: string } | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    export function appendFile(file: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace appendFile {
+        /**
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
+         */
+        export function __promisify__(file: PathLike | number, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string } | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    export function appendFileSync(file: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     */
+    export function watchFile(filename: PathLike, options: { persistent?: boolean; interval?: number; } | undefined, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function watchFile(filename: PathLike, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Stop watching for changes on `filename`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function unwatchFile(filename: PathLike, listener?: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding?: BufferEncoding | null, persistent?: boolean, recursive?: boolean } | BufferEncoding | undefined | null, listener?: (event: string, filename: string) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding: "buffer", persistent?: boolean, recursive?: boolean } | "buffer", listener?: (event: string, filename: Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding?: string | null, persistent?: boolean, recursive?: boolean } | string | null, listener?: (event: string, filename: string | Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function watch(filename: PathLike, listener?: (event: string, filename: string) => any): FSWatcher;
+
+    /**
+     * Asynchronously tests whether or not the given path exists by checking with the file system.
+     * @deprecated
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function exists(path: PathLike, callback: (exists: boolean) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace exists {
+        /**
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(path: PathLike): Promise<boolean>;
+    }
+
+    /**
+     * Synchronously tests whether or not the given path exists by checking with the file system.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function existsSync(path: PathLike): boolean;
+
+    export namespace constants {
+        // File Access Constants
+
+        /** Constant for fs.access(). File is visible to the calling process. */
+        export const F_OK: number;
+
+        /** Constant for fs.access(). File can be read by the calling process. */
+        export const R_OK: number;
+
+        /** Constant for fs.access(). File can be written by the calling process. */
+        export const W_OK: number;
+
+        /** Constant for fs.access(). File can be executed by the calling process. */
+        export const X_OK: number;
+
+        // File Open Constants
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
+        export const O_RDONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for write-only access. */
+        export const O_WRONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-write access. */
+        export const O_RDWR: number;
+
+        /** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
+        export const O_CREAT: number;
+
+        /** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
+        export const O_EXCL: number;
+
+        /** Constant for fs.open(). Flag indicating that if path identifies a terminal device, opening the path shall not cause that terminal to become the controlling terminal for the process (if the process does not already have one). */
+        export const O_NOCTTY: number;
+
+        /** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
+        export const O_TRUNC: number;
+
+        /** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
+        export const O_APPEND: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
+        export const O_DIRECTORY: number;
+
+        /** Constant for fs.open(). Flag indicating reading accesses to the file system will no longer result in an update to the atime information associated with the file. This flag is available on Linux operating systems only. */
+        export const O_NOATIME: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
+        export const O_NOFOLLOW: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
+        export const O_SYNC: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O with write operations waiting for data integrity. */
+        export const O_DSYNC: number;
+
+        /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
+        export const O_SYMLINK: number;
+
+        /** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
+        export const O_DIRECT: number;
+
+        /** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
+        export const O_NONBLOCK: number;
+
+        // File Type Constants
+
+        /** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
+        export const S_IFMT: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
+        export const S_IFREG: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
+        export const S_IFDIR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
+        export const S_IFCHR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
+        export const S_IFBLK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
+        export const S_IFIFO: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
+        export const S_IFLNK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
+        export const S_IFSOCK: number;
+
+        // File Mode Constants
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
+        export const S_IRWXU: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
+        export const S_IRUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
+        export const S_IWUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
+        export const S_IXUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
+        export const S_IRWXG: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
+        export const S_IRGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
+        export const S_IWGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
+        export const S_IXGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
+        export const S_IRWXO: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
+        export const S_IROTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
+        export const S_IWOTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
+        export const S_IXOTH: number;
+
+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
+        export const COPYFILE_EXCL: number;
+    }
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function access(path: PathLike, mode: number | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function access(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace access {
+        /**
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        export function __promisify__(path: PathLike, mode?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function accessSync(path: PathLike, mode?: number): void;
+
+    /**
+     * Returns a new `ReadStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function createReadStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+        end?: number;
+        highWaterMark?: number;
+    }): ReadStream;
+
+    /**
+     * Returns a new `WriteStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function createWriteStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+    }): WriteStream;
+
+    /**
+     * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    export function fdatasync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fdatasync {
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    export function fdatasyncSync(fd: number): void;
+
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, flags: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace copyFile {
+        /**
+         * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+         * No arguments other than a possible exception are given to the callback function.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+         */
+        export function __promisify__(src: PathLike, dst: PathLike, flags?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
+}
+
+declare module "path" {
+    /**
+     * A parsed path object generated by path.parse() or consumed by path.format().
+     */
+    export interface ParsedPath {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name: string;
+    }
+
+    export interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
+
+    /**
+     * Normalize a string path, reducing '..' and '.' parts.
+     * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
+     *
+     * @param p string path to normalize.
+     */
+    export function normalize(p: string): string;
+    /**
+     * Join all arguments together and normalize the resulting path.
+     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
+     *
+     * @param paths paths to join.
+     */
+    export function join(...paths: string[]): string;
+    /**
+     * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
+     *
+     * Starting from leftmost {from} paramter, resolves {to} to an absolute path.
+     *
+     * If {to} isn't already absolute, {from} arguments are prepended in right to left order, until an absolute path is found. If after using all {from} paths still no absolute path is found, the current working directory is used as well. The resulting path is normalized, and trailing slashes are removed unless the path gets resolved to the root directory.
+     *
+     * @param pathSegments string paths to join.  Non-string arguments are ignored.
+     */
+    export function resolve(...pathSegments: any[]): string;
+    /**
+     * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
+     *
+     * @param path path to test.
+     */
+    export function isAbsolute(path: string): boolean;
+    /**
+     * Solve the relative path from {from} to {to}.
+     * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
+     */
+    export function relative(from: string, to: string): string;
+    /**
+     * Return the directory name of a path. Similar to the Unix dirname command.
+     *
+     * @param p the path to evaluate.
+     */
+    export function dirname(p: string): string;
+    /**
+     * Return the last portion of a path. Similar to the Unix basename command.
+     * Often used to extract the file name from a fully qualified path.
+     *
+     * @param p the path to evaluate.
+     * @param ext optionally, an extension to remove from the result.
+     */
+    export function basename(p: string, ext?: string): string;
+    /**
+     * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
+     * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
+     *
+     * @param p the path to evaluate.
+     */
+    export function extname(p: string): string;
+    /**
+     * The platform-specific file separator. '\\' or '/'.
+     */
+    export var sep: string;
+    /**
+     * The platform-specific file delimiter. ';' or ':'.
+     */
+    export var delimiter: string;
+    /**
+     * Returns an object from a path string - the opposite of format().
+     *
+     * @param pathString path to evaluate.
+     */
+    export function parse(pathString: string): ParsedPath;
+    /**
+     * Returns a path string from an object - the opposite of parse().
+     *
+     * @param pathString path to evaluate.
+     */
+    export function format(pathObject: FormatInputPathObject): string;
+
+    export module posix {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: ParsedPath): string;
+    }
+
+    export module win32 {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: ParsedPath): string;
+    }
+}
+
+declare module "string_decoder" {
+    export interface NodeStringDecoder {
+        write(buffer: Buffer): string;
+        end(buffer?: Buffer): string;
+    }
+    export var StringDecoder: {
+        new(encoding?: string): NodeStringDecoder;
+    };
+}
+
+declare module "tls" {
+    import * as crypto from "crypto";
+    import * as dns from "dns";
+    import * as net from "net";
+    import * as stream from "stream";
+
+    var CLIENT_RENEG_LIMIT: number;
+    var CLIENT_RENEG_WINDOW: number;
+
+    export interface Certificate {
+        /**
+         * Country code.
+         */
+        C: string;
+        /**
+         * Street.
+         */
+        ST: string;
+        /**
+         * Locality.
+         */
+        L: string;
+        /**
+         * Organization.
+         */
+        O: string;
+        /**
+         * Organizational unit.
+         */
+        OU: string;
+        /**
+         * Common name.
+         */
+        CN: string;
+    }
+
+    export interface PeerCertificate {
+        subject: Certificate;
+        issuer: Certificate;
+        subjectaltname: string;
+        infoAccess: { [index: string]: string[] | undefined };
+        modulus: string;
+        exponent: string;
+        valid_from: string;
+        valid_to: string;
+        fingerprint: string;
+        ext_key_usage: string[];
+        serialNumber: string;
+        raw: Buffer;
+    }
+
+    export interface DetailedPeerCertificate extends PeerCertificate {
+        issuerCertificate: DetailedPeerCertificate;
+    }
+
+    export interface CipherNameAndProtocol {
+        /**
+         * The cipher name.
+         */
+        name: string;
+        /**
+         * SSL/TLS protocol version.
+         */
+        version: string;
+    }
+
+    export class TLSSocket extends net.Socket {
+        /**
+         * Construct a new tls.TLSSocket object from an existing TCP socket.
+         */
+        constructor(socket: net.Socket, options?: {
+            /**
+             * An optional TLS context object from tls.createSecureContext()
+             */
+            secureContext?: SecureContext,
+            /**
+             * If true the TLS socket will be instantiated in server-mode.
+             * Defaults to false.
+             */
+            isServer?: boolean,
+            /**
+             * An optional net.Server instance.
+             */
+            server?: net.Server,
+            /**
+             * If true the server will request a certificate from clients that
+             * connect and attempt to verify that certificate. Defaults to
+             * false.
+             */
+            requestCert?: boolean,
+            /**
+             * If true the server will reject any connection which is not
+             * authorized with the list of supplied CAs. This option only has an
+             * effect if requestCert is true. Defaults to false.
+             */
+            rejectUnauthorized?: boolean,
+            /**
+             * An array of strings or a Buffer naming possible NPN protocols.
+             * (Protocols should be ordered by their priority.)
+             */
+            NPNProtocols?: string[] | Buffer,
+            /**
+             * An array of strings or a Buffer naming possible ALPN protocols.
+             * (Protocols should be ordered by their priority.) When the server
+             * receives both NPN and ALPN extensions from the client, ALPN takes
+             * precedence over NPN and the server does not send an NPN extension
+             * to the client.
+             */
+            ALPNProtocols?: string[] | Buffer,
+            /**
+             * SNICallback(servername, cb) <Function> A function that will be
+             * called if the client supports SNI TLS extension. Two arguments
+             * will be passed when called: servername and cb. SNICallback should
+             * invoke cb(null, ctx), where ctx is a SecureContext instance.
+             * (tls.createSecureContext(...) can be used to get a proper
+             * SecureContext.) If SNICallback wasn't provided the default callback
+             * with high-level API will be used (see below).
+             */
+            SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void,
+            /**
+             * An optional Buffer instance containing a TLS session.
+             */
+            session?: Buffer,
+            /**
+             * If true, specifies that the OCSP status request extension will be
+             * added to the client hello and an 'OCSPResponse' event will be
+             * emitted on the socket before establishing a secure communication
+             */
+            requestOCSP?: boolean
+        });
+
+        /**
+         * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
+         */
+        authorized: boolean;
+        /**
+         * The reason why the peer's certificate has not been verified.
+         * This property becomes available only when tlsSocket.authorized === false.
+         */
+        authorizationError: Error;
+        /**
+         * Static boolean value, always true.
+         * May be used to distinguish TLS sockets from regular ones.
+         */
+        encrypted: boolean;
+        /**
+         * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
+         * @returns Returns an object representing the cipher name
+         * and the SSL/TLS protocol version of the current connection.
+         */
+        getCipher(): CipherNameAndProtocol;
+        /**
+         * Returns an object representing the peer's certificate.
+         * The returned object has some properties corresponding to the field of the certificate.
+         * If detailed argument is true the full chain with issuer property will be returned,
+         * if false only the top certificate without issuer property.
+         * If the peer does not provide a certificate, it returns null or an empty object.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
+         */
+        getPeerCertificate(detailed: true): DetailedPeerCertificate;
+        getPeerCertificate(detailed?: false): PeerCertificate;
+        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Could be used to speed up handshake establishment when reconnecting to the server.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
+         */
+        getSession(): any;
+        /**
+         * NOTE: Works only with client TLS sockets.
+         * Useful only for debugging, for session reuse provide session option to tls.connect().
+         * @returns TLS session ticket or undefined if none was negotiated.
+         */
+        getTLSTicket(): any;
+        /**
+         * Initiate TLS renegotiation process.
+         *
+         * NOTE: Can be used to request peer's certificate after the secure connection has been established.
+         * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
+         * @param options - The options may contain the following fields: rejectUnauthorized,
+         * requestCert (See tls.createServer() for details).
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
+         * is successfully completed.
+         */
+        renegotiate(options: TlsOptions, callback: (err: Error | null) => void): any;
+        /**
+         * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
+         * the TLS layer until the entire fragment is received and its integrity is verified;
+         * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
+         * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
+         * which may decrease overall server throughput.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
+         */
+        setMaxSendFragment(size: number): boolean;
+
+        /**
+         * events.EventEmitter
+         * 1. OCSPResponse
+         * 2. secureConnect
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        addListener(event: "secureConnect", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "OCSPResponse", response: Buffer): boolean;
+        emit(event: "secureConnect"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        on(event: "secureConnect", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        once(event: "secureConnect", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependListener(event: "secureConnect", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependOnceListener(event: "secureConnect", listener: () => void): this;
+    }
+
+    export interface TlsOptions {
+        host?: string;
+        port?: number;
+        pfx?: string | Buffer[];
+        key?: string | string[] | Buffer | any[];
+        passphrase?: string;
+        cert?: string | string[] | Buffer | Buffer[];
+        ca?: string | string[] | Buffer | Buffer[];
+        crl?: string | string[];
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: string[] | Buffer;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
+        ecdhCurve?: string;
+        dhparam?: string | Buffer;
+        handshakeTimeout?: number;
+        ALPNProtocols?: string[] | Buffer;
+        sessionTimeout?: number;
+        ticketKeys?: Buffer;
+        sessionIdContext?: string;
+        secureProtocol?: string;
+        secureOptions?: number;
+    }
+
+    export interface ConnectionOptions extends SecureContextOptions {
+        host?: string;
+        port?: number;
+        path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
+        socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
+        rejectUnauthorized?: boolean; // Defaults to true
+        NPNProtocols?: Array<string | Buffer>;
+        ALPNProtocols?: Array<string | Buffer>;
+        checkServerIdentity?: typeof checkServerIdentity;
+        servername?: string; // SNI TLS Extension
+        session?: Buffer;
+        minDHSize?: number;
+        secureContext?: SecureContext; // If not provided, the entire ConnectionOptions object will be passed to tls.createSecureContext()
+        lookup?: net.LookupFunction;
+    }
+
+    export class Server extends net.Server {
+        addContext(hostName: string, credentials: {
+            key: string;
+            cert: string;
+            ca: string;
+        }): void;
+
+        /**
+         * events.EventEmitter
+         * 1. tlsClientError
+         * 2. newSession
+         * 3. OCSPRequest
+         * 4. resumeSession
+         * 5. secureConnection
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
+        emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
+        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
+        emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
+        emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+    }
+
+    export interface ClearTextStream extends stream.Duplex {
+        authorized: boolean;
+        authorizationError: Error;
+        getPeerCertificate(): any;
+        getCipher: {
+            name: string;
+            version: string;
+        };
+        address: {
+            port: number;
+            family: string;
+            address: string;
+        };
+        remoteAddress: string;
+        remotePort: number;
+    }
+
+    export interface SecurePair {
+        encrypted: any;
+        cleartext: any;
+    }
+
+    export interface SecureContextOptions {
+        pfx?: string | Buffer | Array<string | Buffer | Object>;
+        key?: string | Buffer | Array<Buffer | Object>;
+        passphrase?: string;
+        cert?: string | Buffer | Array<string | Buffer>;
+        ca?: string | Buffer | Array<string | Buffer>;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        ecdhCurve?: string;
+        crl?: string | Buffer | Array<string | Buffer>;
+        dhparam?: string | Buffer;
+        secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
+        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
+        sessionIdContext?: string;
+    }
+
+    export interface SecureContext {
+        context: any;
+    }
+
+    /*
+     * Verifies the certificate `cert` is issued to host `host`.
+     * @host The hostname to verify the certificate against
+     * @cert PeerCertificate representing the peer's certificate
+     *
+     * Returns Error object, populating it with the reason, host and cert on failure.  On success, returns undefined.
+     */
+    export function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
+    export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
+    export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
+    export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
+    export function createSecureContext(details: SecureContextOptions): SecureContext;
+    export function getCiphers(): string[];
+
+    export var DEFAULT_ECDH_CURVE: string;
+}
+
+declare module "crypto" {
+    export interface Certificate {
+        exportChallenge(spkac: string | Buffer): Buffer;
+        exportPublicKey(spkac: string | Buffer): Buffer;
+        verifySpkac(spkac: Buffer): boolean;
+    }
+    export var Certificate: {
+        new(): Certificate;
+        (): Certificate;
+    };
+
+    export var fips: boolean;
+
+    export interface CredentialDetails {
+        pfx: string;
+        key: string;
+        passphrase: string;
+        cert: string;
+        ca: string | string[];
+        crl: string | string[];
+        ciphers: string;
+    }
+    export interface Credentials { context?: any; }
+    export function createCredentials(details: CredentialDetails): Credentials;
+    export function createHash(algorithm: string): Hash;
+    export function createHmac(algorithm: string, key: string | Buffer): Hmac;
+
+    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
+    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
+    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
+    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
+    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
+
+    export interface Hash extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | DataView): Hash;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hash;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | DataView): Hmac;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export function createCipher(algorithm: string, password: any): Cipher;
+    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
+    export interface Cipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer | DataView): Buffer;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): void;
+        getAuthTag(): Buffer;
+        setAAD(buffer: Buffer): void;
+    }
+    export function createDecipher(algorithm: string, password: any): Decipher;
+    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
+    export interface Decipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer | DataView): Buffer;
+        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): void;
+        setAuthTag(tag: Buffer): void;
+        setAAD(buffer: Buffer): void;
+    }
+    export function createSign(algorithm: string): Signer;
+    export interface Signer extends NodeJS.WritableStream {
+        update(data: string | Buffer | DataView): Signer;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        sign(private_key: string | { key: string; passphrase: string }): Buffer;
+        sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
+    }
+    export function createVerify(algorith: string): Verify;
+    export interface Verify extends NodeJS.WritableStream {
+        update(data: string | Buffer | DataView): Verify;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        verify(object: string | Object, signature: Buffer | DataView): boolean;
+        verify(object: string | Object, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
+        // https://nodejs.org/api/crypto.html#crypto_verifier_verify_object_signature_signature_format
+        // The signature field accepts a TypedArray type, but it is only available starting ES2017
+    }
+    export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
+    export function createDiffieHellman(prime: Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export interface DiffieHellman {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrime(): Buffer;
+        getPrime(encoding: HexBase64Latin1Encoding): string;
+        getGenerator(): Buffer;
+        getGenerator(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        setPublicKey(public_key: Buffer): void;
+        setPublicKey(public_key: string, encoding: string): void;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: string): void;
+        verifyError: number;
+    }
+    export function getDiffieHellman(group_name: string): DiffieHellman;
+    export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
+    export function randomBytes(size: number): Buffer;
+    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function pseudoRandomBytes(size: number): Buffer;
+    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFillSync(buffer: Buffer | Uint8Array, offset?: number, size?: number): Buffer;
+    export function randomFill(buffer: Buffer, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, size: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export interface RsaPublicKey {
+        key: string;
+        padding?: number;
+    }
+    export interface RsaPrivateKey {
+        key: string;
+        passphrase?: string;
+        padding?: number;
+    }
+    export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
+    export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
+    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
+    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
+    export function getCiphers(): string[];
+    export function getCurves(): string[];
+    export function getHashes(): string[];
+    export interface ECDH {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
+    }
+    export function createECDH(curve_name: string): ECDH;
+    export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
+    export var DEFAULT_ENCODING: string;
+}
+
+declare module "stream" {
+    import * as events from "events";
+
+    class internal extends events.EventEmitter {
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
+
+    namespace internal {
+        export class Stream extends internal { }
+
+        export interface ReadableOptions {
+            highWaterMark?: number;
+            encoding?: string;
+            objectMode?: boolean;
+            read?: (this: Readable, size?: number) => any;
+            destroy?: (error?: Error) => any;
+        }
+
+        export class Readable extends Stream implements NodeJS.ReadableStream {
+            readable: boolean;
+            constructor(opts?: ReadableOptions);
+            _read(size: number): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
+            isPaused(): boolean;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): this;
+            push(chunk: any, encoding?: string): boolean;
+            _destroy(err: Error, callback: Function): void;
+            destroy(error?: Error): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             * 1. close
+             * 2. data
+             * 3. end
+             * 4. readable
+             * 5. error
+             */
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            addListener(event: "end", listener: () => void): this;
+            addListener(event: "readable", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+
+            emit(event: string | symbol, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "data", chunk: Buffer | string): boolean;
+            emit(event: "end"): boolean;
+            emit(event: "readable"): boolean;
+            emit(event: "error", err: Error): boolean;
+
+            on(event: string, listener: (...args: any[]) => void): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "data", listener: (chunk: Buffer | string) => void): this;
+            on(event: "end", listener: () => void): this;
+            on(event: "readable", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+
+            once(event: string, listener: (...args: any[]) => void): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "data", listener: (chunk: Buffer | string) => void): this;
+            once(event: "end", listener: () => void): this;
+            once(event: "readable", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+
+            prependListener(event: string, listener: (...args: any[]) => void): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependListener(event: "end", listener: () => void): this;
+            prependListener(event: "readable", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependOnceListener(event: "end", listener: () => void): this;
+            prependOnceListener(event: "readable", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+
+            removeListener(event: string, listener: (...args: any[]) => void): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            removeListener(event: "end", listener: () => void): this;
+            removeListener(event: "readable", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+        }
+
+        export interface WritableOptions {
+            highWaterMark?: number;
+            decodeStrings?: boolean;
+            objectMode?: boolean;
+            write?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            writev?: (chunks: Array<{ chunk: string | Buffer, encoding: string }>, callback: Function) => any;
+            destroy?: (error?: Error) => any;
+            final?: (callback: (error?: Error) => void) => void;
+        }
+
+        export class Writable extends Stream implements NodeJS.WritableStream {
+            writable: boolean;
+            constructor(opts?: WritableOptions);
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
+            _destroy(err: Error, callback: Function): void;
+            _final(callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(cb?: Function): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+            cork(): void;
+            uncork(): void;
+            destroy(error?: Error): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             * 1. close
+             * 2. drain
+             * 3. error
+             * 4. finish
+             * 5. pipe
+             * 6. unpipe
+             */
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "drain", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+            addListener(event: "finish", listener: () => void): this;
+            addListener(event: "pipe", listener: (src: Readable) => void): this;
+            addListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            emit(event: string | symbol, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "drain", chunk: Buffer | string): boolean;
+            emit(event: "error", err: Error): boolean;
+            emit(event: "finish"): boolean;
+            emit(event: "pipe", src: Readable): boolean;
+            emit(event: "unpipe", src: Readable): boolean;
+
+            on(event: string, listener: (...args: any[]) => void): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "drain", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+            on(event: "finish", listener: () => void): this;
+            on(event: "pipe", listener: (src: Readable) => void): this;
+            on(event: "unpipe", listener: (src: Readable) => void): this;
+
+            once(event: string, listener: (...args: any[]) => void): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "drain", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+            once(event: "finish", listener: () => void): this;
+            once(event: "pipe", listener: (src: Readable) => void): this;
+            once(event: "unpipe", listener: (src: Readable) => void): this;
+
+            prependListener(event: string, listener: (...args: any[]) => void): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "drain", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: "finish", listener: () => void): this;
+            prependListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "drain", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: "finish", listener: () => void): this;
+            prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            removeListener(event: string, listener: (...args: any[]) => void): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "drain", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+            removeListener(event: "finish", listener: () => void): this;
+            removeListener(event: "pipe", listener: (src: Readable) => void): this;
+            removeListener(event: "unpipe", listener: (src: Readable) => void): this;
+        }
+
+        export interface DuplexOptions extends ReadableOptions, WritableOptions {
+            allowHalfOpen?: boolean;
+            readableObjectMode?: boolean;
+            writableObjectMode?: boolean;
+        }
+
+        // Note: Duplex extends both Readable and Writable.
+        export class Duplex extends Readable implements Writable {
+            writable: boolean;
+            constructor(opts?: DuplexOptions);
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
+            _destroy(err: Error, callback: Function): void;
+            _final(callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(cb?: Function): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+            cork(): void;
+            uncork(): void;
+        }
+
+        export interface TransformOptions extends DuplexOptions {
+            transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            flush?: (callback: Function) => any;
+        }
+
+        export class Transform extends Duplex {
+            constructor(opts?: TransformOptions);
+            _transform(chunk: any, encoding: string, callback: Function): void;
+            destroy(error?: Error): void;
+        }
+
+        export class PassThrough extends Transform { }
+    }
+
+    export = internal;
+}
+
+declare module "util" {
+    export interface InspectOptions extends NodeJS.InspectOptions { }
+    export function format(format: any, ...param: any[]): string;
+    export function debug(string: string): void;
+    export function error(...param: any[]): void;
+    export function puts(...param: any[]): void;
+    export function print(...param: any[]): void;
+    export function log(string: string): void;
+    export var inspect: {
+        (object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
+        (object: any, options: InspectOptions): string;
+        colors: {
+            [color: string]: [number, number] | undefined
+        }
+        styles: {
+            [style: string]: string | undefined
+        }
+        defaultOptions: InspectOptions;
+        custom: symbol;
+    };
+    export function isArray(object: any): object is any[];
+    export function isRegExp(object: any): object is RegExp;
+    export function isDate(object: any): object is Date;
+    export function isError(object: any): object is Error;
+    export function inherits(constructor: any, superConstructor: any): void;
+    export function debuglog(key: string): (msg: string, ...param: any[]) => void;
+    export function isBoolean(object: any): object is boolean;
+    export function isBuffer(object: any): object is Buffer;
+    export function isFunction(object: any): boolean;
+    export function isNull(object: any): object is null;
+    export function isNullOrUndefined(object: any): object is null | undefined;
+    export function isNumber(object: any): object is number;
+    export function isObject(object: any): boolean;
+    export function isPrimitive(object: any): boolean;
+    export function isString(object: any): object is string;
+    export function isSymbol(object: any): object is symbol;
+    export function isUndefined(object: any): object is undefined;
+    export function deprecate<T extends Function>(fn: T, message: string): T;
+
+    export interface CustomPromisify<TCustom extends Function> extends Function {
+        __promisify__: TCustom;
+    }
+
+    export function callbackify(fn: () => Promise<void>): (callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<TResult>(fn: () => Promise<TResult>): (callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1>(fn: (arg1: T1) => Promise<void>): (arg1: T1, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, TResult>(fn: (arg1: T1) => Promise<TResult>): (arg1: T1, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3,  callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4,  callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, T6>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, T6, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+
+    export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
+    export function promisify<TResult>(fn: (callback: (err: Error, result: TResult) => void) => void): () => Promise<TResult>;
+    export function promisify(fn: (callback: (err: Error) => void) => void): () => Promise<void>;
+    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify(fn: Function): Function;
+    export namespace promisify {
+        const custom: symbol;
+    }
+}
+
+declare module "assert" {
+    function internal(value: any, message?: string): void;
+    namespace internal {
+        export class AssertionError implements Error {
+            name: string;
+            message: string;
+            actual: any;
+            expected: any;
+            operator: string;
+            generatedMessage: boolean;
+
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFunction?: Function
+            });
+        }
+
+        export function fail(message: string): void;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): void;
+        export function ok(value: any, message?: string): void;
+        export function equal(actual: any, expected: any, message?: string): void;
+        export function notEqual(actual: any, expected: any, message?: string): void;
+        export function deepEqual(actual: any, expected: any, message?: string): void;
+        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 function throws(block: Function, message?: string): void;
+        export function throws(block: Function, error: Function, message?: string): void;
+        export function throws(block: Function, error: RegExp, message?: string): void;
+        export function throws(block: Function, error: (err: any) => boolean, message?: string): void;
+
+        export function doesNotThrow(block: Function, message?: string): void;
+        export function doesNotThrow(block: Function, error: Function, message?: string): void;
+        export function doesNotThrow(block: Function, error: RegExp, message?: string): void;
+        export function doesNotThrow(block: Function, error: (err: any) => boolean, message?: string): void;
+
+        export function ifError(value: any): void;
+    }
+
+    export = internal;
+}
+
+declare module "tty" {
+    import * as net from "net";
+
+    export function isatty(fd: number): boolean;
+    export interface ReadStream extends net.Socket {
+        isRaw: boolean;
+        setRawMode(mode: boolean): void;
+        isTTY: boolean;
+    }
+    export interface WriteStream extends net.Socket {
+        columns: number;
+        rows: number;
+        isTTY: boolean;
+    }
+}
+
+declare module "domain" {
+    import * as events from "events";
+
+    export class Domain extends events.EventEmitter implements NodeJS.Domain {
+        run(fn: Function): void;
+        add(emitter: events.EventEmitter): void;
+        remove(emitter: events.EventEmitter): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+        members: any[];
+        enter(): void;
+        exit(): void;
+    }
+
+    export function create(): Domain;
+}
+
+declare module "constants" {
+    export var E2BIG: number;
+    export var EACCES: number;
+    export var EADDRINUSE: number;
+    export var EADDRNOTAVAIL: number;
+    export var EAFNOSUPPORT: number;
+    export var EAGAIN: number;
+    export var EALREADY: number;
+    export var EBADF: number;
+    export var EBADMSG: number;
+    export var EBUSY: number;
+    export var ECANCELED: number;
+    export var ECHILD: number;
+    export var ECONNABORTED: number;
+    export var ECONNREFUSED: number;
+    export var ECONNRESET: number;
+    export var EDEADLK: number;
+    export var EDESTADDRREQ: number;
+    export var EDOM: number;
+    export var EEXIST: number;
+    export var EFAULT: number;
+    export var EFBIG: number;
+    export var EHOSTUNREACH: number;
+    export var EIDRM: number;
+    export var EILSEQ: number;
+    export var EINPROGRESS: number;
+    export var EINTR: number;
+    export var EINVAL: number;
+    export var EIO: number;
+    export var EISCONN: number;
+    export var EISDIR: number;
+    export var ELOOP: number;
+    export var EMFILE: number;
+    export var EMLINK: number;
+    export var EMSGSIZE: number;
+    export var ENAMETOOLONG: number;
+    export var ENETDOWN: number;
+    export var ENETRESET: number;
+    export var ENETUNREACH: number;
+    export var ENFILE: number;
+    export var ENOBUFS: number;
+    export var ENODATA: number;
+    export var ENODEV: number;
+    export var ENOENT: number;
+    export var ENOEXEC: number;
+    export var ENOLCK: number;
+    export var ENOLINK: number;
+    export var ENOMEM: number;
+    export var ENOMSG: number;
+    export var ENOPROTOOPT: number;
+    export var ENOSPC: number;
+    export var ENOSR: number;
+    export var ENOSTR: number;
+    export var ENOSYS: number;
+    export var ENOTCONN: number;
+    export var ENOTDIR: number;
+    export var ENOTEMPTY: number;
+    export var ENOTSOCK: number;
+    export var ENOTSUP: number;
+    export var ENOTTY: number;
+    export var ENXIO: number;
+    export var EOPNOTSUPP: number;
+    export var EOVERFLOW: number;
+    export var EPERM: number;
+    export var EPIPE: number;
+    export var EPROTO: number;
+    export var EPROTONOSUPPORT: number;
+    export var EPROTOTYPE: number;
+    export var ERANGE: number;
+    export var EROFS: number;
+    export var ESPIPE: number;
+    export var ESRCH: number;
+    export var ETIME: number;
+    export var ETIMEDOUT: number;
+    export var ETXTBSY: number;
+    export var EWOULDBLOCK: number;
+    export var EXDEV: number;
+    export var WSAEINTR: number;
+    export var WSAEBADF: number;
+    export var WSAEACCES: number;
+    export var WSAEFAULT: number;
+    export var WSAEINVAL: number;
+    export var WSAEMFILE: number;
+    export var WSAEWOULDBLOCK: number;
+    export var WSAEINPROGRESS: number;
+    export var WSAEALREADY: number;
+    export var WSAENOTSOCK: number;
+    export var WSAEDESTADDRREQ: number;
+    export var WSAEMSGSIZE: number;
+    export var WSAEPROTOTYPE: number;
+    export var WSAENOPROTOOPT: number;
+    export var WSAEPROTONOSUPPORT: number;
+    export var WSAESOCKTNOSUPPORT: number;
+    export var WSAEOPNOTSUPP: number;
+    export var WSAEPFNOSUPPORT: number;
+    export var WSAEAFNOSUPPORT: number;
+    export var WSAEADDRINUSE: number;
+    export var WSAEADDRNOTAVAIL: number;
+    export var WSAENETDOWN: number;
+    export var WSAENETUNREACH: number;
+    export var WSAENETRESET: number;
+    export var WSAECONNABORTED: number;
+    export var WSAECONNRESET: number;
+    export var WSAENOBUFS: number;
+    export var WSAEISCONN: number;
+    export var WSAENOTCONN: number;
+    export var WSAESHUTDOWN: number;
+    export var WSAETOOMANYREFS: number;
+    export var WSAETIMEDOUT: number;
+    export var WSAECONNREFUSED: number;
+    export var WSAELOOP: number;
+    export var WSAENAMETOOLONG: number;
+    export var WSAEHOSTDOWN: number;
+    export var WSAEHOSTUNREACH: number;
+    export var WSAENOTEMPTY: number;
+    export var WSAEPROCLIM: number;
+    export var WSAEUSERS: number;
+    export var WSAEDQUOT: number;
+    export var WSAESTALE: number;
+    export var WSAEREMOTE: number;
+    export var WSASYSNOTREADY: number;
+    export var WSAVERNOTSUPPORTED: number;
+    export var WSANOTINITIALISED: number;
+    export var WSAEDISCON: number;
+    export var WSAENOMORE: number;
+    export var WSAECANCELLED: number;
+    export var WSAEINVALIDPROCTABLE: number;
+    export var WSAEINVALIDPROVIDER: number;
+    export var WSAEPROVIDERFAILEDINIT: number;
+    export var WSASYSCALLFAILURE: number;
+    export var WSASERVICE_NOT_FOUND: number;
+    export var WSATYPE_NOT_FOUND: number;
+    export var WSA_E_NO_MORE: number;
+    export var WSA_E_CANCELLED: number;
+    export var WSAEREFUSED: number;
+    export var SIGHUP: number;
+    export var SIGINT: number;
+    export var SIGILL: number;
+    export var SIGABRT: number;
+    export var SIGFPE: number;
+    export var SIGKILL: number;
+    export var SIGSEGV: number;
+    export var SIGTERM: number;
+    export var SIGBREAK: number;
+    export var SIGWINCH: number;
+    export var SSL_OP_ALL: number;
+    export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+    export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+    export var SSL_OP_CISCO_ANYCONNECT: number;
+    export var SSL_OP_COOKIE_EXCHANGE: number;
+    export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+    export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+    export var SSL_OP_EPHEMERAL_RSA: number;
+    export var SSL_OP_LEGACY_SERVER_CONNECT: number;
+    export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+    export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+    export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+    export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
+    export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+    export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NO_COMPRESSION: number;
+    export var SSL_OP_NO_QUERY_MTU: number;
+    export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+    export var SSL_OP_NO_SSLv2: number;
+    export var SSL_OP_NO_SSLv3: number;
+    export var SSL_OP_NO_TICKET: number;
+    export var SSL_OP_NO_TLSv1: number;
+    export var SSL_OP_NO_TLSv1_1: number;
+    export var SSL_OP_NO_TLSv1_2: number;
+    export var SSL_OP_PKCS1_CHECK_1: number;
+    export var SSL_OP_PKCS1_CHECK_2: number;
+    export var SSL_OP_SINGLE_DH_USE: number;
+    export var SSL_OP_SINGLE_ECDH_USE: number;
+    export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+    export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+    export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+    export var SSL_OP_TLS_D5_BUG: number;
+    export var SSL_OP_TLS_ROLLBACK_BUG: number;
+    export var ENGINE_METHOD_DSA: number;
+    export var ENGINE_METHOD_DH: number;
+    export var ENGINE_METHOD_RAND: number;
+    export var ENGINE_METHOD_ECDH: number;
+    export var ENGINE_METHOD_ECDSA: number;
+    export var ENGINE_METHOD_CIPHERS: number;
+    export var ENGINE_METHOD_DIGESTS: number;
+    export var ENGINE_METHOD_STORE: number;
+    export var ENGINE_METHOD_PKEY_METHS: number;
+    export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
+    export var ENGINE_METHOD_ALL: number;
+    export var ENGINE_METHOD_NONE: number;
+    export var DH_CHECK_P_NOT_SAFE_PRIME: number;
+    export var DH_CHECK_P_NOT_PRIME: number;
+    export var DH_UNABLE_TO_CHECK_GENERATOR: number;
+    export var DH_NOT_SUITABLE_GENERATOR: number;
+    export var NPN_ENABLED: number;
+    export var RSA_PKCS1_PADDING: number;
+    export var RSA_SSLV23_PADDING: number;
+    export var RSA_NO_PADDING: number;
+    export var RSA_PKCS1_OAEP_PADDING: number;
+    export var RSA_X931_PADDING: number;
+    export var RSA_PKCS1_PSS_PADDING: number;
+    export var POINT_CONVERSION_COMPRESSED: number;
+    export var POINT_CONVERSION_UNCOMPRESSED: number;
+    export var POINT_CONVERSION_HYBRID: number;
+    export var O_RDONLY: number;
+    export var O_WRONLY: number;
+    export var O_RDWR: number;
+    export var S_IFMT: number;
+    export var S_IFREG: number;
+    export var S_IFDIR: number;
+    export var S_IFCHR: number;
+    export var S_IFBLK: number;
+    export var S_IFIFO: number;
+    export var S_IFSOCK: number;
+    export var S_IRWXU: number;
+    export var S_IRUSR: number;
+    export var S_IWUSR: number;
+    export var S_IXUSR: number;
+    export var S_IRWXG: number;
+    export var S_IRGRP: number;
+    export var S_IWGRP: number;
+    export var S_IXGRP: number;
+    export var S_IRWXO: number;
+    export var S_IROTH: number;
+    export var S_IWOTH: number;
+    export var S_IXOTH: number;
+    export var S_IFLNK: number;
+    export var O_CREAT: number;
+    export var O_EXCL: number;
+    export var O_NOCTTY: number;
+    export var O_DIRECTORY: number;
+    export var O_NOATIME: number;
+    export var O_NOFOLLOW: number;
+    export var O_SYNC: number;
+    export var O_DSYNC: number;
+    export var O_SYMLINK: number;
+    export var O_DIRECT: number;
+    export var O_NONBLOCK: number;
+    export var O_TRUNC: number;
+    export var O_APPEND: number;
+    export var F_OK: number;
+    export var R_OK: number;
+    export var W_OK: number;
+    export var X_OK: number;
+    export var UV_UDP_REUSEADDR: number;
+    export var SIGQUIT: number;
+    export var SIGTRAP: number;
+    export var SIGIOT: number;
+    export var SIGBUS: number;
+    export var SIGUSR1: number;
+    export var SIGUSR2: number;
+    export var SIGPIPE: number;
+    export var SIGALRM: number;
+    export var SIGCHLD: number;
+    export var SIGSTKFLT: number;
+    export var SIGCONT: number;
+    export var SIGSTOP: number;
+    export var SIGTSTP: number;
+    export var SIGTTIN: number;
+    export var SIGTTOU: number;
+    export var SIGURG: number;
+    export var SIGXCPU: number;
+    export var SIGXFSZ: number;
+    export var SIGVTALRM: number;
+    export var SIGPROF: number;
+    export var SIGIO: number;
+    export var SIGPOLL: number;
+    export var SIGPWR: number;
+    export var SIGSYS: number;
+    export var SIGUNUSED: number;
+    export var defaultCoreCipherList: string;
+    export var defaultCipherList: string;
+    export var ENGINE_METHOD_RSA: number;
+    export var ALPN_ENABLED: number;
+}
+
+declare module "module" {
+    export = NodeJS.Module;
+}
+
+declare module "process" {
+    export = process;
+}
+
+// tslint:disable-next-line:no-declare-current-package
+declare module "v8" {
+    interface HeapSpaceInfo {
+        space_name: string;
+        space_size: number;
+        space_used_size: number;
+        space_available_size: number;
+        physical_space_size: number;
+    }
+
+    // ** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
+    type DoesZapCodeSpaceFlag = 0 | 1;
+
+    interface HeapInfo {
+        total_heap_size: number;
+        total_heap_size_executable: number;
+        total_physical_size: number;
+        total_available_size: number;
+        used_heap_size: number;
+        heap_size_limit: number;
+        malloced_memory: number;
+        peak_malloced_memory: number;
+        does_zap_garbage: DoesZapCodeSpaceFlag;
+    }
+
+    export function getHeapStatistics(): HeapInfo;
+    export function getHeapSpaceStatistics(): HeapSpaceInfo[];
+    export function setFlagsFromString(flags: string): void;
+}
+
+declare module "timers" {
+    export function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export namespace setTimeout {
+        export function __promisify__(ms: number): Promise<void>;
+        export function __promisify__<T>(ms: number, value: T): Promise<T>;
+    }
+    export function clearTimeout(timeoutId: NodeJS.Timer): void;
+    export function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export function clearInterval(intervalId: NodeJS.Timer): void;
+    export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+    export namespace setImmediate {
+        export function __promisify__(): Promise<void>;
+        export function __promisify__<T>(value: T): Promise<T>;
+    }
+    export function clearImmediate(immediateId: any): void;
+}
+
+declare module "console" {
+    export = console;
+}
+
+/**
+ * Async Hooks module: https://nodejs.org/api/async_hooks.html
+ */
+declare module "async_hooks" {
+    /**
+     * Returns the asyncId of the current execution context.
+     */
+    export function executionAsyncId(): number;
+    /// @deprecated - replaced by executionAsyncId()
+    export function currentId(): number;
+
+    /**
+     * Returns the ID of the resource responsible for calling the callback that is currently being executed.
+     */
+    export function triggerAsyncId(): number;
+    /// @deprecated - replaced by triggerAsyncId()
+    export function triggerId(): number;
+
+    export interface HookCallbacks {
+        /**
+         * Called when a class is constructed that has the possibility to emit an asynchronous event.
+         * @param asyncId a unique ID for the async resource
+         * @param type the type of the async resource
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         * @param resource reference to the resource representing the async operation, needs to be released during destroy
+         */
+        init?(asyncId: number, type: string, triggerAsyncId: number, resource: Object): void;
+
+        /**
+         * When an asynchronous operation is initiated or completes a callback is called to notify the user.
+         * The before callback is called just before said callback is executed.
+         * @param asyncId the unique identifier assigned to the resource about to execute the callback.
+         */
+        before?(asyncId: number): void;
+
+        /**
+         * Called immediately after the callback specified in before is completed.
+         * @param asyncId the unique identifier assigned to the resource which has executed the callback.
+         */
+        after?(asyncId: number): void;
+
+        /**
+         * Called when a promise has resolve() called. This may not be in the same execution id
+         * as the promise itself.
+         * @param asyncId the unique id for the promise that was resolve()d.
+         */
+        promiseResolve?(asyncId: number): void;
+
+        /**
+         * Called after the resource corresponding to asyncId is destroyed
+         * @param asyncId a unique ID for the async resource
+         */
+        destroy?(asyncId: number): void;
+    }
+
+    export interface AsyncHook {
+        /**
+         * Enable the callbacks for a given AsyncHook instance. If no callbacks are provided enabling is a noop.
+         */
+        enable(): this;
+
+        /**
+         * Disable the callbacks for a given AsyncHook instance from the global pool of AsyncHook callbacks to be executed. Once a hook has been disabled it will not be called again until enabled.
+         */
+        disable(): this;
+    }
+
+    /**
+     * Registers functions to be called for different lifetime events of each async operation.
+     * @param options the callbacks to register
+     * @return an AsyncHooks instance used for disabling and enabling hooks
+     */
+    export function createHook(options: HookCallbacks): AsyncHook;
+
+    /**
+     * The class AsyncResource was designed to be extended by the embedder's async resources.
+     * Using this users can easily trigger the lifetime events of their own resources.
+     */
+    export class AsyncResource {
+        /**
+         * AsyncResource() is meant to be extended. Instantiating a
+         * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
+         * async_hook.executionAsyncId() is used.
+         * @param type the name of this async resource type
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         */
+        constructor(type: string, triggerAsyncId?: number)
+
+        /**
+         * Call AsyncHooks before callbacks.
+         */
+        emitBefore(): void;
+
+        /**
+         * Call AsyncHooks after callbacks
+         */
+        emitAfter(): void;
+
+        /**
+         * Call AsyncHooks destroy callbacks.
+         */
+        emitDestroy(): void;
+
+        /**
+         * @return the unique ID assigned to this AsyncResource instance.
+         */
+        asyncId(): number;
+
+        /**
+         * @return the trigger ID for this AsyncResource instance.
+         */
+        triggerAsyncId(): number;
+    }
+}
+
+declare module "http2" {
+    import * as events from "events";
+    import * as fs from "fs";
+    import * as net from "net";
+    import * as stream from "stream";
+    import * as tls from "tls";
+    import * as url from "url";
+
+    import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+    export { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+
+    // Http2Stream
+
+    export interface StreamPriorityOptions {
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        silent?: boolean;
+    }
+
+    export interface StreamState {
+        localWindowSize?: number;
+        state?: number;
+        streamLocalClose?: number;
+        streamRemoteClose?: number;
+        sumDependencyWeight?: number;
+        weight?: number;
+    }
+
+    export interface ServerStreamResponseOptions {
+        endStream?: boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+    }
+
+    export interface StatOptions {
+        offset: number;
+        length: number;
+    }
+
+    export interface ServerStreamFileResponseOptions {
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void|boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+        offset?: number;
+        length?: number;
+    }
+
+    export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
+        onError?: (err: NodeJS.ErrnoException) => void;
+    }
+
+    export interface Http2Stream extends stream.Duplex {
+        readonly aborted: boolean;
+        readonly destroyed: boolean;
+        priority(options: StreamPriorityOptions): void;
+        readonly rstCode: number;
+        rstStream(code: number): void;
+        rstWithNoError(): void;
+        rstWithProtocolError(): void;
+        rstWithCancel(): void;
+        rstWithRefuse(): void;
+        rstWithInternalError(): void;
+        readonly session: Http2Session;
+        setTimeout(msecs: number, callback?: () => void): void;
+        readonly state: StreamState;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: () => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "streamClosed", listener: (code: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted"): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "data", chunk: Buffer | string): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "finish"): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number): boolean;
+        emit(event: "pipe", src: stream.Readable): boolean;
+        emit(event: "unpipe", src: stream.Readable): boolean;
+        emit(event: "streamClosed", code: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "trailers", trailers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: () => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "data", listener: (chunk: Buffer | string) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        on(event: "pipe", listener: (src: stream.Readable) => void): this;
+        on(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        on(event: "streamClosed", listener: (code: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: () => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "data", listener: (chunk: Buffer | string) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        once(event: "pipe", listener: (src: stream.Readable) => void): this;
+        once(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        once(event: "streamClosed", listener: (code: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: () => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: () => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ClientHttp2Stream extends Http2Stream {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "headers", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "response", headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Stream extends Http2Stream {
+        additionalHeaders(headers: OutgoingHttpHeaders): void;
+        readonly headersSent: boolean;
+        readonly pushAllowed: boolean;
+        pushStream(headers: OutgoingHttpHeaders, callback?: (pushStream: ServerHttp2Stream) => void): void;
+        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (pushStream: ServerHttp2Stream) => void): void;
+        respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
+        respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
+        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
+    }
+
+    // Http2Session
+
+    export interface Settings {
+        headerTableSize?: number;
+        enablePush?: boolean;
+        initialWindowSize?: number;
+        maxFrameSize?: number;
+        maxConcurrentStreams?: number;
+        maxHeaderListSize?: number;
+    }
+
+    export interface ClientSessionRequestOptions {
+        endStream?: boolean;
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
+    }
+
+    export interface SessionShutdownOptions {
+        graceful?: boolean;
+        errorCode?: number;
+        lastStreamID?: number;
+        opaqueData?: Buffer | Uint8Array;
+    }
+
+    export interface SessionState {
+        effectiveLocalWindowSize?: number;
+        effectiveRecvDataLength?: number;
+        nextStreamID?: number;
+        localWindowSize?: number;
+        lastProcStreamID?: number;
+        remoteWindowSize?: number;
+        outboundQueueSize?: number;
+        deflateDynamicTableSize?: number;
+        inflateDynamicTableSize?: number;
+    }
+
+    export interface Http2Session extends events.EventEmitter {
+        destroy(): void;
+        readonly destroyed: boolean;
+        readonly localSettings: Settings;
+        readonly pendingSettingsAck: boolean;
+        readonly remoteSettings: Settings;
+        rstStream(stream: Http2Stream, code?: number): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        shutdown(callback?: () => void): void;
+        shutdown(options: SessionShutdownOptions, callback?: () => void): void;
+        readonly socket: net.Socket | tls.TLSSocket;
+        readonly state: SessionState;
+        priority(stream: Http2Stream, options: StreamPriorityOptions): void;
+        settings(settings: Settings): void;
+        readonly type: number;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        addListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number, streamID: number): boolean;
+        emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
+        emit(event: "localSettings", settings: Settings): boolean;
+        emit(event: "remoteSettings", settings: Settings): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        on(event: "localSettings", listener: (settings: Settings) => void): this;
+        on(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        once(event: "localSettings", listener: (settings: Settings) => void): this;
+        once(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface ClientHttp2Session extends Http2Session {
+        request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Session extends Http2Session {
+        readonly server: Http2Server | Http2SecureServer;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    // Http2Server
+
+    export interface SessionOptions {
+        maxDeflateDynamicTableSize?: number;
+        maxReservedRemoteStreams?: number;
+        maxSendHeaderBlockLength?: number;
+        paddingStrategy?: number;
+        peerMaxConcurrentStreams?: number;
+        selectPadding?: (frameLen: number, maxFrameLen: number) => number;
+        settings?: Settings;
+    }
+
+    export type ClientSessionOptions = SessionOptions;
+    export type ServerSessionOptions = SessionOptions;
+
+    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
+    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
+
+    export interface ServerOptions extends ServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface SecureServerOptions extends SecureServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface Http2Server extends net.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface Http2SecureServer extends tls.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+    }
+
+    export interface Http2ServerRequest extends stream.Readable {
+        headers: IncomingHttpHeaders;
+        httpVersion: string;
+        method: string;
+        rawHeaders: string[];
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        stream: ServerHttp2Stream;
+        trailers: IncomingHttpHeaders;
+        url: string;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+    }
+
+    export interface Http2ServerResponse extends events.EventEmitter {
+        addTrailers(trailers: OutgoingHttpHeaders): void;
+        connection: net.Socket | tls.TLSSocket;
+        end(callback?: () => void): void;
+        end(data?: string | Buffer, callback?: () => void): void;
+        end(data?: string | Buffer, encoding?: string, callback?: () => void): void;
+        readonly finished: boolean;
+        getHeader(name: string): string;
+        getHeaderNames(): string[];
+        getHeaders(): OutgoingHttpHeaders;
+        hasHeader(name: string): boolean;
+        readonly headersSent: boolean;
+        removeHeader(name: string): void;
+        sendDate: boolean;
+        setHeader(name: string, value: number | string | string[]): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        statusCode: number;
+        statusMessage: '';
+        stream: ServerHttp2Stream;
+        write(chunk: string | Buffer, callback?: (err: Error) => void): boolean;
+        write(chunk: string | Buffer, encoding?: string, callback?: (err: Error) => void): boolean;
+        writeContinue(): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, statusMessage?: string, headers?: OutgoingHttpHeaders): void;
+        createPushResponse(headers: OutgoingHttpHeaders, callback: (err: Error | null, res: Http2ServerResponse) => void): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "finish"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+    }
+
+    // Public API
+
+    export namespace constants {
+        export const NGHTTP2_SESSION_SERVER: number;
+        export const NGHTTP2_SESSION_CLIENT: number;
+        export const NGHTTP2_STREAM_STATE_IDLE: number;
+        export const NGHTTP2_STREAM_STATE_OPEN: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_CLOSED: number;
+        export const NGHTTP2_NO_ERROR: number;
+        export const NGHTTP2_PROTOCOL_ERROR: number;
+        export const NGHTTP2_INTERNAL_ERROR: number;
+        export const NGHTTP2_FLOW_CONTROL_ERROR: number;
+        export const NGHTTP2_SETTINGS_TIMEOUT: number;
+        export const NGHTTP2_STREAM_CLOSED: number;
+        export const NGHTTP2_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_REFUSED_STREAM: number;
+        export const NGHTTP2_CANCEL: number;
+        export const NGHTTP2_COMPRESSION_ERROR: number;
+        export const NGHTTP2_CONNECT_ERROR: number;
+        export const NGHTTP2_ENHANCE_YOUR_CALM: number;
+        export const NGHTTP2_INADEQUATE_SECURITY: number;
+        export const NGHTTP2_HTTP_1_1_REQUIRED: number;
+        export const NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_FLAG_NONE: number;
+        export const NGHTTP2_FLAG_END_STREAM: number;
+        export const NGHTTP2_FLAG_END_HEADERS: number;
+        export const NGHTTP2_FLAG_ACK: number;
+        export const NGHTTP2_FLAG_PADDED: number;
+        export const NGHTTP2_FLAG_PRIORITY: number;
+        export const DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const DEFAULT_SETTINGS_ENABLE_PUSH: number;
+        export const DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
+        export const MAX_MAX_FRAME_SIZE: number;
+        export const MIN_MAX_FRAME_SIZE: number;
+        export const MAX_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_DEFAULT_WEIGHT: number;
+        export const NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const NGHTTP2_SETTINGS_ENABLE_PUSH: number;
+        export const NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
+        export const NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
+        export const PADDING_STRATEGY_NONE: number;
+        export const PADDING_STRATEGY_MAX: number;
+        export const PADDING_STRATEGY_CALLBACK: number;
+        export const HTTP2_HEADER_STATUS: string;
+        export const HTTP2_HEADER_METHOD: string;
+        export const HTTP2_HEADER_AUTHORITY: string;
+        export const HTTP2_HEADER_SCHEME: string;
+        export const HTTP2_HEADER_PATH: string;
+        export const HTTP2_HEADER_ACCEPT_CHARSET: string;
+        export const HTTP2_HEADER_ACCEPT_ENCODING: string;
+        export const HTTP2_HEADER_ACCEPT_LANGUAGE: string;
+        export const HTTP2_HEADER_ACCEPT_RANGES: string;
+        export const HTTP2_HEADER_ACCEPT: string;
+        export const HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
+        export const HTTP2_HEADER_AGE: string;
+        export const HTTP2_HEADER_ALLOW: string;
+        export const HTTP2_HEADER_AUTHORIZATION: string;
+        export const HTTP2_HEADER_CACHE_CONTROL: string;
+        export const HTTP2_HEADER_CONNECTION: string;
+        export const HTTP2_HEADER_CONTENT_DISPOSITION: string;
+        export const HTTP2_HEADER_CONTENT_ENCODING: string;
+        export const HTTP2_HEADER_CONTENT_LANGUAGE: string;
+        export const HTTP2_HEADER_CONTENT_LENGTH: string;
+        export const HTTP2_HEADER_CONTENT_LOCATION: string;
+        export const HTTP2_HEADER_CONTENT_MD5: string;
+        export const HTTP2_HEADER_CONTENT_RANGE: string;
+        export const HTTP2_HEADER_CONTENT_TYPE: string;
+        export const HTTP2_HEADER_COOKIE: string;
+        export const HTTP2_HEADER_DATE: string;
+        export const HTTP2_HEADER_ETAG: string;
+        export const HTTP2_HEADER_EXPECT: string;
+        export const HTTP2_HEADER_EXPIRES: string;
+        export const HTTP2_HEADER_FROM: string;
+        export const HTTP2_HEADER_HOST: string;
+        export const HTTP2_HEADER_IF_MATCH: string;
+        export const HTTP2_HEADER_IF_MODIFIED_SINCE: string;
+        export const HTTP2_HEADER_IF_NONE_MATCH: string;
+        export const HTTP2_HEADER_IF_RANGE: string;
+        export const HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
+        export const HTTP2_HEADER_LAST_MODIFIED: string;
+        export const HTTP2_HEADER_LINK: string;
+        export const HTTP2_HEADER_LOCATION: string;
+        export const HTTP2_HEADER_MAX_FORWARDS: string;
+        export const HTTP2_HEADER_PREFER: string;
+        export const HTTP2_HEADER_PROXY_AUTHENTICATE: string;
+        export const HTTP2_HEADER_PROXY_AUTHORIZATION: string;
+        export const HTTP2_HEADER_RANGE: string;
+        export const HTTP2_HEADER_REFERER: string;
+        export const HTTP2_HEADER_REFRESH: string;
+        export const HTTP2_HEADER_RETRY_AFTER: string;
+        export const HTTP2_HEADER_SERVER: string;
+        export const HTTP2_HEADER_SET_COOKIE: string;
+        export const HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
+        export const HTTP2_HEADER_TRANSFER_ENCODING: string;
+        export const HTTP2_HEADER_TE: string;
+        export const HTTP2_HEADER_UPGRADE: string;
+        export const HTTP2_HEADER_USER_AGENT: string;
+        export const HTTP2_HEADER_VARY: string;
+        export const HTTP2_HEADER_VIA: string;
+        export const HTTP2_HEADER_WWW_AUTHENTICATE: string;
+        export const HTTP2_HEADER_HTTP2_SETTINGS: string;
+        export const HTTP2_HEADER_KEEP_ALIVE: string;
+        export const HTTP2_HEADER_PROXY_CONNECTION: string;
+        export const HTTP2_METHOD_ACL: string;
+        export const HTTP2_METHOD_BASELINE_CONTROL: string;
+        export const HTTP2_METHOD_BIND: string;
+        export const HTTP2_METHOD_CHECKIN: string;
+        export const HTTP2_METHOD_CHECKOUT: string;
+        export const HTTP2_METHOD_CONNECT: string;
+        export const HTTP2_METHOD_COPY: string;
+        export const HTTP2_METHOD_DELETE: string;
+        export const HTTP2_METHOD_GET: string;
+        export const HTTP2_METHOD_HEAD: string;
+        export const HTTP2_METHOD_LABEL: string;
+        export const HTTP2_METHOD_LINK: string;
+        export const HTTP2_METHOD_LOCK: string;
+        export const HTTP2_METHOD_MERGE: string;
+        export const HTTP2_METHOD_MKACTIVITY: string;
+        export const HTTP2_METHOD_MKCALENDAR: string;
+        export const HTTP2_METHOD_MKCOL: string;
+        export const HTTP2_METHOD_MKREDIRECTREF: string;
+        export const HTTP2_METHOD_MKWORKSPACE: string;
+        export const HTTP2_METHOD_MOVE: string;
+        export const HTTP2_METHOD_OPTIONS: string;
+        export const HTTP2_METHOD_ORDERPATCH: string;
+        export const HTTP2_METHOD_PATCH: string;
+        export const HTTP2_METHOD_POST: string;
+        export const HTTP2_METHOD_PRI: string;
+        export const HTTP2_METHOD_PROPFIND: string;
+        export const HTTP2_METHOD_PROPPATCH: string;
+        export const HTTP2_METHOD_PUT: string;
+        export const HTTP2_METHOD_REBIND: string;
+        export const HTTP2_METHOD_REPORT: string;
+        export const HTTP2_METHOD_SEARCH: string;
+        export const HTTP2_METHOD_TRACE: string;
+        export const HTTP2_METHOD_UNBIND: string;
+        export const HTTP2_METHOD_UNCHECKOUT: string;
+        export const HTTP2_METHOD_UNLINK: string;
+        export const HTTP2_METHOD_UNLOCK: string;
+        export const HTTP2_METHOD_UPDATE: string;
+        export const HTTP2_METHOD_UPDATEREDIRECTREF: string;
+        export const HTTP2_METHOD_VERSION_CONTROL: string;
+        export const HTTP_STATUS_CONTINUE: number;
+        export const HTTP_STATUS_SWITCHING_PROTOCOLS: number;
+        export const HTTP_STATUS_PROCESSING: number;
+        export const HTTP_STATUS_OK: number;
+        export const HTTP_STATUS_CREATED: number;
+        export const HTTP_STATUS_ACCEPTED: number;
+        export const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
+        export const HTTP_STATUS_NO_CONTENT: number;
+        export const HTTP_STATUS_RESET_CONTENT: number;
+        export const HTTP_STATUS_PARTIAL_CONTENT: number;
+        export const HTTP_STATUS_MULTI_STATUS: number;
+        export const HTTP_STATUS_ALREADY_REPORTED: number;
+        export const HTTP_STATUS_IM_USED: number;
+        export const HTTP_STATUS_MULTIPLE_CHOICES: number;
+        export const HTTP_STATUS_MOVED_PERMANENTLY: number;
+        export const HTTP_STATUS_FOUND: number;
+        export const HTTP_STATUS_SEE_OTHER: number;
+        export const HTTP_STATUS_NOT_MODIFIED: number;
+        export const HTTP_STATUS_USE_PROXY: number;
+        export const HTTP_STATUS_TEMPORARY_REDIRECT: number;
+        export const HTTP_STATUS_PERMANENT_REDIRECT: number;
+        export const HTTP_STATUS_BAD_REQUEST: number;
+        export const HTTP_STATUS_UNAUTHORIZED: number;
+        export const HTTP_STATUS_PAYMENT_REQUIRED: number;
+        export const HTTP_STATUS_FORBIDDEN: number;
+        export const HTTP_STATUS_NOT_FOUND: number;
+        export const HTTP_STATUS_METHOD_NOT_ALLOWED: number;
+        export const HTTP_STATUS_NOT_ACCEPTABLE: number;
+        export const HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
+        export const HTTP_STATUS_REQUEST_TIMEOUT: number;
+        export const HTTP_STATUS_CONFLICT: number;
+        export const HTTP_STATUS_GONE: number;
+        export const HTTP_STATUS_LENGTH_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_FAILED: number;
+        export const HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
+        export const HTTP_STATUS_URI_TOO_LONG: number;
+        export const HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
+        export const HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
+        export const HTTP_STATUS_EXPECTATION_FAILED: number;
+        export const HTTP_STATUS_TEAPOT: number;
+        export const HTTP_STATUS_MISDIRECTED_REQUEST: number;
+        export const HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
+        export const HTTP_STATUS_LOCKED: number;
+        export const HTTP_STATUS_FAILED_DEPENDENCY: number;
+        export const HTTP_STATUS_UNORDERED_COLLECTION: number;
+        export const HTTP_STATUS_UPGRADE_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_REQUIRED: number;
+        export const HTTP_STATUS_TOO_MANY_REQUESTS: number;
+        export const HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+        export const HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
+        export const HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
+        export const HTTP_STATUS_NOT_IMPLEMENTED: number;
+        export const HTTP_STATUS_BAD_GATEWAY: number;
+        export const HTTP_STATUS_SERVICE_UNAVAILABLE: number;
+        export const HTTP_STATUS_GATEWAY_TIMEOUT: number;
+        export const HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
+        export const HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
+        export const HTTP_STATUS_INSUFFICIENT_STORAGE: number;
+        export const HTTP_STATUS_LOOP_DETECTED: number;
+        export const HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
+        export const HTTP_STATUS_NOT_EXTENDED: number;
+        export const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
+    }
+
+    export function getDefaultSettings(): Settings;
+    export function getPackedSettings(settings: Settings): Settings;
+    export function getUnpackedSettings(buf: Buffer | Uint8Array): Settings;
+
+    export function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+    export function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+
+    export function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+    export function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+
+    export function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+    export function connect(authority: string | url.URL, options?: ClientSessionOptions | SecureClientSessionOptions, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+}
+
+declare module "perf_hooks" {
+	export interface PerformanceEntry {
+		/**
+		 * The total number of milliseconds elapsed for this entry.
+		 * This value will not be meaningful for all Performance Entry types.
+		 */
+		readonly duration: number;
+
+		/**
+		 * The name of the performance entry.
+		 */
+		readonly name: string;
+
+		/**
+		 * The high resolution millisecond timestamp marking the starting time of the Performance Entry.
+		 */
+		readonly startTime: number;
+
+		/**
+		 * The type of the performance entry.
+		 * Currently it may be one of: 'node', 'mark', 'measure', 'gc', or 'function'.
+		 */
+		readonly entryType: string;
+
+		/**
+		 * When performanceEntry.entryType is equal to 'gc', the performance.kind property identifies
+		 * the type of garbage collection operation that occurred.
+		 * The value may be one of perf_hooks.constants.
+		 */
+		readonly kind?: number;
+	}
+
+	export interface PerformanceNodeTiming extends PerformanceEntry {
+		/**
+		 * The high resolution millisecond timestamp at which the Node.js process completed bootstrap.
+		 */
+		readonly bootstrapComplete: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which cluster processing ended.
+		 */
+		readonly clusterSetupEnd: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which cluster processing started.
+		 */
+		readonly clusterSetupStart: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which the Node.js event loop exited.
+		 */
+		readonly loopExit: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which the Node.js event loop started.
+		 */
+		readonly loopStart: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which main module load ended.
+		 */
+		readonly moduleLoadEnd: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which main module load started.
+		 */
+		readonly moduleLoadStart: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which the Node.js process was initialized.
+		 */
+		readonly nodeStart: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which preload module load ended.
+		 */
+		readonly preloadModuleLoadEnd: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which preload module load started.
+		 */
+		readonly preloadModuleLoadStart: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which third_party_main processing ended.
+		 */
+		readonly thirdPartyMainEnd: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which third_party_main processing started.
+		 */
+		readonly thirdPartyMainStart: number;
+
+		/**
+		 * The high resolution millisecond timestamp at which the V8 platform was initialized.
+		 */
+		readonly v8Start: number;
+    }
+
+	export interface Performance {
+		/**
+		 * If name is not provided, removes all PerformanceFunction objects from the Performance Timeline.
+		 * If name is provided, removes entries with name.
+		 * @param name
+		 */
+		clearFunctions(name?: string): void;
+
+		/**
+		 * If name is not provided, removes all PerformanceMark objects from the Performance Timeline.
+		 * If name is provided, removes only the named mark.
+		 * @param name
+		 */
+		clearMarks(name?: string): void;
+
+		/**
+		 * If name is not provided, removes all PerformanceMeasure objects from the Performance Timeline.
+		 * If name is provided, removes only objects whose performanceEntry.name matches name.
+		 */
+		clearMeasures(name?: string): void;
+
+		/**
+		 * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+		 * @return list of all PerformanceEntry objects
+		 */
+		getEntries(): PerformanceEntry[];
+
+		/**
+		 * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+		 * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+		 * @param name
+		 * @param type
+		 * @return list of all PerformanceEntry objects
+		 */
+		getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+		/**
+		 * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+		 * whose performanceEntry.entryType is equal to type.
+		 * @param type
+		 * @return list of all PerformanceEntry objects
+		 */
+		getEntriesByType(type: string): PerformanceEntry[];
+
+		/**
+		 * Creates a new PerformanceMark entry in the Performance Timeline.
+		 * A PerformanceMark is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'mark',
+		 * and whose performanceEntry.duration is always 0.
+		 * Performance marks are used to mark specific significant moments in the Performance Timeline.
+		 * @param name
+		 */
+		mark(name?: string): void;
+
+		/**
+		 * Creates a new PerformanceMeasure entry in the Performance Timeline.
+		 * A PerformanceMeasure is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'measure',
+		 * and whose performanceEntry.duration measures the number of milliseconds elapsed since startMark and endMark.
+		 *
+		 * The startMark argument may identify any existing PerformanceMark in the the Performance Timeline, or may identify
+		 * any of the timestamp properties provided by the PerformanceNodeTiming class. If the named startMark does not exist,
+		 * then startMark is set to timeOrigin by default.
+		 *
+		 * The endMark argument must identify any existing PerformanceMark in the the Performance Timeline or any of the timestamp
+		 * properties provided by the PerformanceNodeTiming class. If the named endMark does not exist, an error will be thrown.
+		 * @param name
+		 * @param startMark
+		 * @param endMark
+		 */
+		measure(name: string, startMark: string, endMark: string): void;
+
+		/**
+		 * An instance of the PerformanceNodeTiming class that provides performance metrics for specific Node.js operational milestones.
+		 */
+		readonly nodeTiming: PerformanceNodeTiming;
+
+		/**
+		 * @return the current high resolution millisecond timestamp
+		 */
+		now(): number;
+
+		/**
+		 * The timeOrigin specifies the high resolution millisecond timestamp from which all performance metric durations are measured.
+		 */
+		readonly timeOrigin: number;
+
+		/**
+		 * Wraps a function within a new function that measures the running time of the wrapped function.
+		 * A PerformanceObserver must be subscribed to the 'function' event type in order for the timing details to be accessed.
+		 * @param fn
+		 */
+		timerify<T extends (...optionalParams: any[]) => any>(fn: T): T;
+    }
+
+    export interface PerformanceObserverEntryList {
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * @return Returns a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+    }
+
+    export type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
+
+    export class PerformanceObserver {
+        constructor(callback: PerformanceObserverCallback);
+
+        /**
+         * Disconnects the PerformanceObserver instance from all notifications.
+         */
+        disconnect(): void;
+
+        /**
+         * Subscribes the PerformanceObserver instance to notifications of new PerformanceEntry instances identified by options.entryTypes.
+         * When options.buffered is false, the callback will be invoked once for every PerformanceEntry instance.
+         * Property buffered defaults to false.
+         * @param options
+         */
+        observe(options: { entryTypes: string[], buffered?: boolean }): void;
+    }
+
+    export namespace constants {
+        export const NODE_PERFORMANCE_GC_MAJOR: number;
+        export const NODE_PERFORMANCE_GC_MINOR: number;
+        export const NODE_PERFORMANCE_GC_INCREMENTAL: number;
+        export const NODE_PERFORMANCE_GC_WEAKCB: number;
+    }
+
+	const performance: Performance;
+}
diff --git a/types/node/v8/inspector.d.ts b/types/node/v8/inspector.d.ts
new file mode 100644
index 0000000000..955239b486
--- /dev/null
+++ b/types/node/v8/inspector.d.ts
@@ -0,0 +1,2488 @@
+// Type definitions for inspector
+
+// These definitions are auto-generated.
+// Please see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/19330
+// for more information.
+
+/**
+ * The inspector module provides an API for interacting with the V8 inspector.
+ */
+declare module "inspector" {
+    import { EventEmitter } from 'events';
+
+    export interface InspectorNotification<T> {
+        method: string;
+        params: T;
+    }
+
+    export namespace Schema {
+        /**
+         * Description of the protocol domain.
+         */
+        export interface Domain {
+            /**
+             * Domain name.
+             */
+            name: string;
+            /**
+             * Domain version.
+             */
+            version: string;
+        }
+
+        export interface GetDomainsReturnType {
+            /**
+             * List of supported domains.
+             */
+            domains: Schema.Domain[];
+        }
+    }
+
+    export namespace Runtime {
+        /**
+         * Unique script identifier.
+         */
+        export type ScriptId = string;
+
+        /**
+         * Unique object identifier.
+         */
+        export type RemoteObjectId = string;
+
+        /**
+         * Primitive value which cannot be JSON-stringified.
+         */
+        export type UnserializableValue = string;
+
+        /**
+         * Mirror object referencing original JavaScript object.
+         */
+        export interface RemoteObject {
+            /**
+             * Object type.
+             */
+            type: string;
+            /**
+             * Object subtype hint. Specified for <code>object</code> type values only.
+             */
+            subtype?: string;
+            /**
+             * Object class (constructor) name. Specified for <code>object</code> type values only.
+             */
+            className?: string;
+            /**
+             * Remote object value in case of primitive values or JSON values (if it was requested).
+             */
+            value?: any;
+            /**
+             * Primitive value which can not be JSON-stringified does not have <code>value</code>, but gets this property.
+             */
+            unserializableValue?: Runtime.UnserializableValue;
+            /**
+             * String representation of the object.
+             */
+            description?: string;
+            /**
+             * Unique object identifier (for non-primitive values).
+             */
+            objectId?: Runtime.RemoteObjectId;
+            /**
+             * Preview containing abbreviated property values. Specified for <code>object</code> type values only.
+             * @experimental
+             */
+            preview?: Runtime.ObjectPreview;
+            /**
+             * @experimental
+             */
+            customPreview?: Runtime.CustomPreview;
+        }
+
+        /**
+         * @experimental
+         */
+        export interface CustomPreview {
+            header: string;
+            hasBody: boolean;
+            formatterObjectId: Runtime.RemoteObjectId;
+            bindRemoteObjectFunctionId: Runtime.RemoteObjectId;
+            configObjectId?: Runtime.RemoteObjectId;
+        }
+
+        /**
+         * Object containing abbreviated remote object value.
+         * @experimental
+         */
+        export interface ObjectPreview {
+            /**
+             * Object type.
+             */
+            type: string;
+            /**
+             * Object subtype hint. Specified for <code>object</code> type values only.
+             */
+            subtype?: string;
+            /**
+             * String representation of the object.
+             */
+            description?: string;
+            /**
+             * True iff some of the properties or entries of the original object did not fit.
+             */
+            overflow: boolean;
+            /**
+             * List of the properties.
+             */
+            properties: Runtime.PropertyPreview[];
+            /**
+             * List of the entries. Specified for <code>map</code> and <code>set</code> subtype values only.
+             */
+            entries?: Runtime.EntryPreview[];
+        }
+
+        /**
+         * @experimental
+         */
+        export interface PropertyPreview {
+            /**
+             * Property name.
+             */
+            name: string;
+            /**
+             * Object type. Accessor means that the property itself is an accessor property.
+             */
+            type: string;
+            /**
+             * User-friendly property value string.
+             */
+            value?: string;
+            /**
+             * Nested value preview.
+             */
+            valuePreview?: Runtime.ObjectPreview;
+            /**
+             * Object subtype hint. Specified for <code>object</code> type values only.
+             */
+            subtype?: string;
+        }
+
+        /**
+         * @experimental
+         */
+        export interface EntryPreview {
+            /**
+             * Preview of the key. Specified for map-like collection entries.
+             */
+            key?: Runtime.ObjectPreview;
+            /**
+             * Preview of the value.
+             */
+            value: Runtime.ObjectPreview;
+        }
+
+        /**
+         * Object property descriptor.
+         */
+        export interface PropertyDescriptor {
+            /**
+             * Property name or symbol description.
+             */
+            name: string;
+            /**
+             * The value associated with the property.
+             */
+            value?: Runtime.RemoteObject;
+            /**
+             * True if the value associated with the property may be changed (data descriptors only).
+             */
+            writable?: boolean;
+            /**
+             * A function which serves as a getter for the property, or <code>undefined</code> if there is no getter (accessor descriptors only).
+             */
+            get?: Runtime.RemoteObject;
+            /**
+             * A function which serves as a setter for the property, or <code>undefined</code> if there is no setter (accessor descriptors only).
+             */
+            set?: Runtime.RemoteObject;
+            /**
+             * True if the type of this property descriptor may be changed and if the property may be deleted from the corresponding object.
+             */
+            configurable: boolean;
+            /**
+             * True if this property shows up during enumeration of the properties on the corresponding object.
+             */
+            enumerable: boolean;
+            /**
+             * True if the result was thrown during the evaluation.
+             */
+            wasThrown?: boolean;
+            /**
+             * True if the property is owned for the object.
+             */
+            isOwn?: boolean;
+            /**
+             * Property symbol object, if the property is of the <code>symbol</code> type.
+             */
+            symbol?: Runtime.RemoteObject;
+        }
+
+        /**
+         * Object internal property descriptor. This property isn't normally visible in JavaScript code.
+         */
+        export interface InternalPropertyDescriptor {
+            /**
+             * Conventional property name.
+             */
+            name: string;
+            /**
+             * The value associated with the property.
+             */
+            value?: Runtime.RemoteObject;
+        }
+
+        /**
+         * Represents function call argument. Either remote object id <code>objectId</code>, primitive <code>value</code>, unserializable primitive value or neither of (for undefined) them should be specified.
+         */
+        export interface CallArgument {
+            /**
+             * Primitive value.
+             */
+            value?: any;
+            /**
+             * Primitive value which can not be JSON-stringified.
+             */
+            unserializableValue?: Runtime.UnserializableValue;
+            /**
+             * Remote object handle.
+             */
+            objectId?: Runtime.RemoteObjectId;
+        }
+
+        /**
+         * Id of an execution context.
+         */
+        export type ExecutionContextId = number;
+
+        /**
+         * Description of an isolated world.
+         */
+        export interface ExecutionContextDescription {
+            /**
+             * Unique id of the execution context. It can be used to specify in which execution context script evaluation should be performed.
+             */
+            id: Runtime.ExecutionContextId;
+            /**
+             * Execution context origin.
+             */
+            origin: string;
+            /**
+             * Human readable name describing given context.
+             */
+            name: string;
+            /**
+             * Embedder-specific auxiliary data.
+             */
+            auxData?: {};
+        }
+
+        /**
+         * Detailed information about exception (or error) that was thrown during script compilation or execution.
+         */
+        export interface ExceptionDetails {
+            /**
+             * Exception id.
+             */
+            exceptionId: number;
+            /**
+             * Exception text, which should be used together with exception object when available.
+             */
+            text: string;
+            /**
+             * Line number of the exception location (0-based).
+             */
+            lineNumber: number;
+            /**
+             * Column number of the exception location (0-based).
+             */
+            columnNumber: number;
+            /**
+             * Script ID of the exception location.
+             */
+            scriptId?: Runtime.ScriptId;
+            /**
+             * URL of the exception location, to be used when the script was not reported.
+             */
+            url?: string;
+            /**
+             * JavaScript stack trace if available.
+             */
+            stackTrace?: Runtime.StackTrace;
+            /**
+             * Exception object if available.
+             */
+            exception?: Runtime.RemoteObject;
+            /**
+             * Identifier of the context where exception happened.
+             */
+            executionContextId?: Runtime.ExecutionContextId;
+        }
+
+        /**
+         * Number of milliseconds since epoch.
+         */
+        export type Timestamp = number;
+
+        /**
+         * Stack entry for runtime errors and assertions.
+         */
+        export interface CallFrame {
+            /**
+             * JavaScript function name.
+             */
+            functionName: string;
+            /**
+             * JavaScript script id.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * JavaScript script name or url.
+             */
+            url: string;
+            /**
+             * JavaScript script line number (0-based).
+             */
+            lineNumber: number;
+            /**
+             * JavaScript script column number (0-based).
+             */
+            columnNumber: number;
+        }
+
+        /**
+         * Call frames for assertions or error messages.
+         */
+        export interface StackTrace {
+            /**
+             * String label of this stack trace. For async traces this may be a name of the function that initiated the async call.
+             */
+            description?: string;
+            /**
+             * JavaScript function name.
+             */
+            callFrames: Runtime.CallFrame[];
+            /**
+             * Asynchronous JavaScript stack trace that preceded this stack, if available.
+             */
+            parent?: Runtime.StackTrace;
+            /**
+             * Creation frame of the Promise which produced the next synchronous trace when resolved, if available.
+             * @experimental
+             */
+            promiseCreationFrame?: Runtime.CallFrame;
+        }
+
+        export interface EvaluateParameterType {
+            /**
+             * Expression to evaluate.
+             */
+            expression: string;
+            /**
+             * Symbolic group name that can be used to release multiple objects.
+             */
+            objectGroup?: string;
+            /**
+             * Determines whether Command Line API should be available during the evaluation.
+             */
+            includeCommandLineAPI?: boolean;
+            /**
+             * In silent mode exceptions thrown during evaluation are not reported and do not pause execution. Overrides <code>setPauseOnException</code> state.
+             */
+            silent?: boolean;
+            /**
+             * Specifies in which execution context to perform evaluation. If the parameter is omitted the evaluation will be performed in the context of the inspected page.
+             */
+            contextId?: Runtime.ExecutionContextId;
+            /**
+             * Whether the result is expected to be a JSON object that should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             * @experimental
+             */
+            generatePreview?: boolean;
+            /**
+             * Whether execution should be treated as initiated by user in the UI.
+             * @experimental
+             */
+            userGesture?: boolean;
+            /**
+             * Whether execution should wait for promise to be resolved. If the result of evaluation is not a Promise, it's considered to be an error.
+             */
+            awaitPromise?: boolean;
+        }
+
+        export interface AwaitPromiseParameterType {
+            /**
+             * Identifier of the promise.
+             */
+            promiseObjectId: Runtime.RemoteObjectId;
+            /**
+             * Whether the result is expected to be a JSON object that should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             */
+            generatePreview?: boolean;
+        }
+
+        export interface CallFunctionOnParameterType {
+            /**
+             * Identifier of the object to call function on.
+             */
+            objectId: Runtime.RemoteObjectId;
+            /**
+             * Declaration of the function to call.
+             */
+            functionDeclaration: string;
+            /**
+             * Call arguments. All call arguments must belong to the same JavaScript world as the target object.
+             */
+            arguments?: Runtime.CallArgument[];
+            /**
+             * In silent mode exceptions thrown during evaluation are not reported and do not pause execution. Overrides <code>setPauseOnException</code> state.
+             */
+            silent?: boolean;
+            /**
+             * Whether the result is expected to be a JSON object which should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             * @experimental
+             */
+            generatePreview?: boolean;
+            /**
+             * Whether execution should be treated as initiated by user in the UI.
+             * @experimental
+             */
+            userGesture?: boolean;
+            /**
+             * Whether execution should wait for promise to be resolved. If the result of evaluation is not a Promise, it's considered to be an error.
+             */
+            awaitPromise?: boolean;
+        }
+
+        export interface GetPropertiesParameterType {
+            /**
+             * Identifier of the object to return properties for.
+             */
+            objectId: Runtime.RemoteObjectId;
+            /**
+             * If true, returns properties belonging only to the element itself, not to its prototype chain.
+             */
+            ownProperties?: boolean;
+            /**
+             * If true, returns accessor properties (with getter/setter) only; internal properties are not returned either.
+             * @experimental
+             */
+            accessorPropertiesOnly?: boolean;
+            /**
+             * Whether preview should be generated for the results.
+             * @experimental
+             */
+            generatePreview?: boolean;
+        }
+
+        export interface ReleaseObjectParameterType {
+            /**
+             * Identifier of the object to release.
+             */
+            objectId: Runtime.RemoteObjectId;
+        }
+
+        export interface ReleaseObjectGroupParameterType {
+            /**
+             * Symbolic object group name.
+             */
+            objectGroup: string;
+        }
+
+        export interface SetCustomObjectFormatterEnabledParameterType {
+            enabled: boolean;
+        }
+
+        export interface CompileScriptParameterType {
+            /**
+             * Expression to compile.
+             */
+            expression: string;
+            /**
+             * Source url to be set for the script.
+             */
+            sourceURL: string;
+            /**
+             * Specifies whether the compiled script should be persisted.
+             */
+            persistScript: boolean;
+            /**
+             * Specifies in which execution context to perform script run. If the parameter is omitted the evaluation will be performed in the context of the inspected page.
+             */
+            executionContextId?: Runtime.ExecutionContextId;
+        }
+
+        export interface RunScriptParameterType {
+            /**
+             * Id of the script to run.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * Specifies in which execution context to perform script run. If the parameter is omitted the evaluation will be performed in the context of the inspected page.
+             */
+            executionContextId?: Runtime.ExecutionContextId;
+            /**
+             * Symbolic group name that can be used to release multiple objects.
+             */
+            objectGroup?: string;
+            /**
+             * In silent mode exceptions thrown during evaluation are not reported and do not pause execution. Overrides <code>setPauseOnException</code> state.
+             */
+            silent?: boolean;
+            /**
+             * Determines whether Command Line API should be available during the evaluation.
+             */
+            includeCommandLineAPI?: boolean;
+            /**
+             * Whether the result is expected to be a JSON object which should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             */
+            generatePreview?: boolean;
+            /**
+             * Whether execution should wait for promise to be resolved. If the result of evaluation is not a Promise, it's considered to be an error.
+             */
+            awaitPromise?: boolean;
+        }
+
+        export interface EvaluateReturnType {
+            /**
+             * Evaluation result.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface AwaitPromiseReturnType {
+            /**
+             * Promise result. Will contain rejected value if promise was rejected.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details if stack strace is available.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface CallFunctionOnReturnType {
+            /**
+             * Call result.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface GetPropertiesReturnType {
+            /**
+             * Object properties.
+             */
+            result: Runtime.PropertyDescriptor[];
+            /**
+             * Internal object properties (only of the element itself).
+             */
+            internalProperties?: Runtime.InternalPropertyDescriptor[];
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface CompileScriptReturnType {
+            /**
+             * Id of the script.
+             */
+            scriptId?: Runtime.ScriptId;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface RunScriptReturnType {
+            /**
+             * Run result.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface ExecutionContextCreatedEventDataType {
+            /**
+             * A newly created execution context.
+             */
+            context: Runtime.ExecutionContextDescription;
+        }
+
+        export interface ExecutionContextDestroyedEventDataType {
+            /**
+             * Id of the destroyed context
+             */
+            executionContextId: Runtime.ExecutionContextId;
+        }
+
+        export interface ExceptionThrownEventDataType {
+            /**
+             * Timestamp of the exception.
+             */
+            timestamp: Runtime.Timestamp;
+            exceptionDetails: Runtime.ExceptionDetails;
+        }
+
+        export interface ExceptionRevokedEventDataType {
+            /**
+             * Reason describing why exception was revoked.
+             */
+            reason: string;
+            /**
+             * The id of revoked exception, as reported in <code>exceptionUnhandled</code>.
+             */
+            exceptionId: number;
+        }
+
+        export interface ConsoleAPICalledEventDataType {
+            /**
+             * Type of the call.
+             */
+            type: string;
+            /**
+             * Call arguments.
+             */
+            args: Runtime.RemoteObject[];
+            /**
+             * Identifier of the context where the call was made.
+             */
+            executionContextId: Runtime.ExecutionContextId;
+            /**
+             * Call timestamp.
+             */
+            timestamp: Runtime.Timestamp;
+            /**
+             * Stack trace captured when the call was made.
+             */
+            stackTrace?: Runtime.StackTrace;
+            /**
+             * Console context descriptor for calls on non-default console context (not console.*): 'anonymous#unique-logger-id' for call on unnamed context, 'name#unique-logger-id' for call on named context.
+             * @experimental
+             */
+            context?: string;
+        }
+
+        export interface InspectRequestedEventDataType {
+            object: Runtime.RemoteObject;
+            hints: {};
+        }
+    }
+
+    export namespace Debugger {
+        /**
+         * Breakpoint identifier.
+         */
+        export type BreakpointId = string;
+
+        /**
+         * Call frame identifier.
+         */
+        export type CallFrameId = string;
+
+        /**
+         * Location in the source code.
+         */
+        export interface Location {
+            /**
+             * Script identifier as reported in the <code>Debugger.scriptParsed</code>.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * Line number in the script (0-based).
+             */
+            lineNumber: number;
+            /**
+             * Column number in the script (0-based).
+             */
+            columnNumber?: number;
+        }
+
+        /**
+         * Location in the source code.
+         * @experimental
+         */
+        export interface ScriptPosition {
+            lineNumber: number;
+            columnNumber: number;
+        }
+
+        /**
+         * JavaScript call frame. Array of call frames form the call stack.
+         */
+        export interface CallFrame {
+            /**
+             * Call frame identifier. This identifier is only valid while the virtual machine is paused.
+             */
+            callFrameId: Debugger.CallFrameId;
+            /**
+             * Name of the JavaScript function called on this call frame.
+             */
+            functionName: string;
+            /**
+             * Location in the source code.
+             * @experimental
+             */
+            functionLocation?: Debugger.Location;
+            /**
+             * Location in the source code.
+             */
+            location: Debugger.Location;
+            /**
+             * Scope chain for this call frame.
+             */
+            scopeChain: Debugger.Scope[];
+            /**
+             * <code>this</code> object for this call frame.
+             */
+            this: Runtime.RemoteObject;
+            /**
+             * The value being returned, if the function is at return point.
+             */
+            returnValue?: Runtime.RemoteObject;
+        }
+
+        /**
+         * Scope description.
+         */
+        export interface Scope {
+            /**
+             * Scope type.
+             */
+            type: string;
+            /**
+             * Object representing the scope. For <code>global</code> and <code>with</code> scopes it represents the actual object; for the rest of the scopes, it is artificial transient object enumerating scope variables as its properties.
+             */
+            object: Runtime.RemoteObject;
+            name?: string;
+            /**
+             * Location in the source code where scope starts
+             */
+            startLocation?: Debugger.Location;
+            /**
+             * Location in the source code where scope ends
+             */
+            endLocation?: Debugger.Location;
+        }
+
+        /**
+         * Search match for resource.
+         * @experimental
+         */
+        export interface SearchMatch {
+            /**
+             * Line number in resource content.
+             */
+            lineNumber: number;
+            /**
+             * Line with match content.
+             */
+            lineContent: string;
+        }
+
+        /**
+         * @experimental
+         */
+        export interface BreakLocation {
+            /**
+             * Script identifier as reported in the <code>Debugger.scriptParsed</code>.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * Line number in the script (0-based).
+             */
+            lineNumber: number;
+            /**
+             * Column number in the script (0-based).
+             */
+            columnNumber?: number;
+            type?: string;
+        }
+
+        export interface SetBreakpointsActiveParameterType {
+            /**
+             * New value for breakpoints active state.
+             */
+            active: boolean;
+        }
+
+        export interface SetSkipAllPausesParameterType {
+            /**
+             * New value for skip pauses state.
+             */
+            skip: boolean;
+        }
+
+        export interface SetBreakpointByUrlParameterType {
+            /**
+             * Line number to set breakpoint at.
+             */
+            lineNumber: number;
+            /**
+             * URL of the resources to set breakpoint on.
+             */
+            url?: string;
+            /**
+             * Regex pattern for the URLs of the resources to set breakpoints on. Either <code>url</code> or <code>urlRegex</code> must be specified.
+             */
+            urlRegex?: string;
+            /**
+             * Offset in the line to set breakpoint at.
+             */
+            columnNumber?: number;
+            /**
+             * Expression to use as a breakpoint condition. When specified, debugger will only stop on the breakpoint if this expression evaluates to true.
+             */
+            condition?: string;
+        }
+
+        export interface SetBreakpointParameterType {
+            /**
+             * Location to set breakpoint in.
+             */
+            location: Debugger.Location;
+            /**
+             * Expression to use as a breakpoint condition. When specified, debugger will only stop on the breakpoint if this expression evaluates to true.
+             */
+            condition?: string;
+        }
+
+        export interface RemoveBreakpointParameterType {
+            breakpointId: Debugger.BreakpointId;
+        }
+
+        export interface GetPossibleBreakpointsParameterType {
+            /**
+             * Start of range to search possible breakpoint locations in.
+             */
+            start: Debugger.Location;
+            /**
+             * End of range to search possible breakpoint locations in (excluding). When not specified, end of scripts is used as end of range.
+             */
+            end?: Debugger.Location;
+            /**
+             * Only consider locations which are in the same (non-nested) function as start.
+             */
+            restrictToFunction?: boolean;
+        }
+
+        export interface ContinueToLocationParameterType {
+            /**
+             * Location to continue to.
+             */
+            location: Debugger.Location;
+            /**
+             * @experimental
+             */
+            targetCallFrames?: string;
+        }
+
+        export interface SearchInContentParameterType {
+            /**
+             * Id of the script to search in.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * String to search for.
+             */
+            query: string;
+            /**
+             * If true, search is case sensitive.
+             */
+            caseSensitive?: boolean;
+            /**
+             * If true, treats string parameter as regex.
+             */
+            isRegex?: boolean;
+        }
+
+        export interface SetScriptSourceParameterType {
+            /**
+             * Id of the script to edit.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * New content of the script.
+             */
+            scriptSource: string;
+            /**
+             *  If true the change will not actually be applied. Dry run may be used to get result description without actually modifying the code.
+             */
+            dryRun?: boolean;
+        }
+
+        export interface RestartFrameParameterType {
+            /**
+             * Call frame identifier to evaluate on.
+             */
+            callFrameId: Debugger.CallFrameId;
+        }
+
+        export interface GetScriptSourceParameterType {
+            /**
+             * Id of the script to get source for.
+             */
+            scriptId: Runtime.ScriptId;
+        }
+
+        export interface SetPauseOnExceptionsParameterType {
+            /**
+             * Pause on exceptions mode.
+             */
+            state: string;
+        }
+
+        export interface EvaluateOnCallFrameParameterType {
+            /**
+             * Call frame identifier to evaluate on.
+             */
+            callFrameId: Debugger.CallFrameId;
+            /**
+             * Expression to evaluate.
+             */
+            expression: string;
+            /**
+             * String object group name to put result into (allows rapid releasing resulting object handles using <code>releaseObjectGroup</code>).
+             */
+            objectGroup?: string;
+            /**
+             * Specifies whether command line API should be available to the evaluated expression, defaults to false.
+             */
+            includeCommandLineAPI?: boolean;
+            /**
+             * In silent mode exceptions thrown during evaluation are not reported and do not pause execution. Overrides <code>setPauseOnException</code> state.
+             */
+            silent?: boolean;
+            /**
+             * Whether the result is expected to be a JSON object that should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             * @experimental
+             */
+            generatePreview?: boolean;
+            /**
+             * Whether to throw an exception if side effect cannot be ruled out during evaluation.
+             * @experimental
+             */
+            throwOnSideEffect?: boolean;
+        }
+
+        export interface SetVariableValueParameterType {
+            /**
+             * 0-based number of scope as was listed in scope chain. Only 'local', 'closure' and 'catch' scope types are allowed. Other scopes could be manipulated manually.
+             */
+            scopeNumber: number;
+            /**
+             * Variable name.
+             */
+            variableName: string;
+            /**
+             * New variable value.
+             */
+            newValue: Runtime.CallArgument;
+            /**
+             * Id of callframe that holds variable.
+             */
+            callFrameId: Debugger.CallFrameId;
+        }
+
+        export interface SetAsyncCallStackDepthParameterType {
+            /**
+             * Maximum depth of async call stacks. Setting to <code>0</code> will effectively disable collecting async call stacks (default).
+             */
+            maxDepth: number;
+        }
+
+        export interface SetBlackboxPatternsParameterType {
+            /**
+             * Array of regexps that will be used to check script url for blackbox state.
+             */
+            patterns: string[];
+        }
+
+        export interface SetBlackboxedRangesParameterType {
+            /**
+             * Id of the script.
+             */
+            scriptId: Runtime.ScriptId;
+            positions: Debugger.ScriptPosition[];
+        }
+
+        export interface SetBreakpointByUrlReturnType {
+            /**
+             * Id of the created breakpoint for further reference.
+             */
+            breakpointId: Debugger.BreakpointId;
+            /**
+             * List of the locations this breakpoint resolved into upon addition.
+             */
+            locations: Debugger.Location[];
+        }
+
+        export interface SetBreakpointReturnType {
+            /**
+             * Id of the created breakpoint for further reference.
+             */
+            breakpointId: Debugger.BreakpointId;
+            /**
+             * Location this breakpoint resolved into.
+             */
+            actualLocation: Debugger.Location;
+        }
+
+        export interface GetPossibleBreakpointsReturnType {
+            /**
+             * List of the possible breakpoint locations.
+             */
+            locations: Debugger.BreakLocation[];
+        }
+
+        export interface SearchInContentReturnType {
+            /**
+             * List of search matches.
+             */
+            result: Debugger.SearchMatch[];
+        }
+
+        export interface SetScriptSourceReturnType {
+            /**
+             * New stack trace in case editing has happened while VM was stopped.
+             */
+            callFrames?: Debugger.CallFrame[];
+            /**
+             * Whether current call stack  was modified after applying the changes.
+             */
+            stackChanged?: boolean;
+            /**
+             * Async stack trace, if any.
+             */
+            asyncStackTrace?: Runtime.StackTrace;
+            /**
+             * Exception details if any.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface RestartFrameReturnType {
+            /**
+             * New stack trace.
+             */
+            callFrames: Debugger.CallFrame[];
+            /**
+             * Async stack trace, if any.
+             */
+            asyncStackTrace?: Runtime.StackTrace;
+        }
+
+        export interface GetScriptSourceReturnType {
+            /**
+             * Script source.
+             */
+            scriptSource: string;
+        }
+
+        export interface EvaluateOnCallFrameReturnType {
+            /**
+             * Object wrapper for the evaluation result.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface ScriptParsedEventDataType {
+            /**
+             * Identifier of the script parsed.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * URL or name of the script parsed (if any).
+             */
+            url: string;
+            /**
+             * Line offset of the script within the resource with given URL (for script tags).
+             */
+            startLine: number;
+            /**
+             * Column offset of the script within the resource with given URL.
+             */
+            startColumn: number;
+            /**
+             * Last line of the script.
+             */
+            endLine: number;
+            /**
+             * Length of the last line of the script.
+             */
+            endColumn: number;
+            /**
+             * Specifies script creation context.
+             */
+            executionContextId: Runtime.ExecutionContextId;
+            /**
+             * Content hash of the script.
+             */
+            hash: string;
+            /**
+             * Embedder-specific auxiliary data.
+             */
+            executionContextAuxData?: {};
+            /**
+             * True, if this script is generated as a result of the live edit operation.
+             * @experimental
+             */
+            isLiveEdit?: boolean;
+            /**
+             * URL of source map associated with script (if any).
+             */
+            sourceMapURL?: string;
+            /**
+             * True, if this script has sourceURL.
+             * @experimental
+             */
+            hasSourceURL?: boolean;
+            /**
+             * True, if this script is ES6 module.
+             * @experimental
+             */
+            isModule?: boolean;
+            /**
+             * This script length.
+             * @experimental
+             */
+            length?: number;
+            /**
+             * JavaScript top stack frame of where the script parsed event was triggered if available.
+             * @experimental
+             */
+            stackTrace?: Runtime.StackTrace;
+        }
+
+        export interface ScriptFailedToParseEventDataType {
+            /**
+             * Identifier of the script parsed.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * URL or name of the script parsed (if any).
+             */
+            url: string;
+            /**
+             * Line offset of the script within the resource with given URL (for script tags).
+             */
+            startLine: number;
+            /**
+             * Column offset of the script within the resource with given URL.
+             */
+            startColumn: number;
+            /**
+             * Last line of the script.
+             */
+            endLine: number;
+            /**
+             * Length of the last line of the script.
+             */
+            endColumn: number;
+            /**
+             * Specifies script creation context.
+             */
+            executionContextId: Runtime.ExecutionContextId;
+            /**
+             * Content hash of the script.
+             */
+            hash: string;
+            /**
+             * Embedder-specific auxiliary data.
+             */
+            executionContextAuxData?: {};
+            /**
+             * URL of source map associated with script (if any).
+             */
+            sourceMapURL?: string;
+            /**
+             * True, if this script has sourceURL.
+             * @experimental
+             */
+            hasSourceURL?: boolean;
+            /**
+             * True, if this script is ES6 module.
+             * @experimental
+             */
+            isModule?: boolean;
+            /**
+             * This script length.
+             * @experimental
+             */
+            length?: number;
+            /**
+             * JavaScript top stack frame of where the script parsed event was triggered if available.
+             * @experimental
+             */
+            stackTrace?: Runtime.StackTrace;
+        }
+
+        export interface BreakpointResolvedEventDataType {
+            /**
+             * Breakpoint unique identifier.
+             */
+            breakpointId: Debugger.BreakpointId;
+            /**
+             * Actual breakpoint location.
+             */
+            location: Debugger.Location;
+        }
+
+        export interface PausedEventDataType {
+            /**
+             * Call stack the virtual machine stopped on.
+             */
+            callFrames: Debugger.CallFrame[];
+            /**
+             * Pause reason.
+             */
+            reason: string;
+            /**
+             * Object containing break-specific auxiliary properties.
+             */
+            data?: {};
+            /**
+             * Hit breakpoints IDs
+             */
+            hitBreakpoints?: string[];
+            /**
+             * Async stack trace, if any.
+             */
+            asyncStackTrace?: Runtime.StackTrace;
+        }
+    }
+
+    export namespace Console {
+        /**
+         * Console message.
+         */
+        export interface ConsoleMessage {
+            /**
+             * Message source.
+             */
+            source: string;
+            /**
+             * Message severity.
+             */
+            level: string;
+            /**
+             * Message text.
+             */
+            text: string;
+            /**
+             * URL of the message origin.
+             */
+            url?: string;
+            /**
+             * Line number in the resource that generated this message (1-based).
+             */
+            line?: number;
+            /**
+             * Column number in the resource that generated this message (1-based).
+             */
+            column?: number;
+        }
+
+        export interface MessageAddedEventDataType {
+            /**
+             * Console message that has been added.
+             */
+            message: Console.ConsoleMessage;
+        }
+    }
+
+    export namespace Profiler {
+        /**
+         * Profile node. Holds callsite information, execution statistics and child nodes.
+         */
+        export interface ProfileNode {
+            /**
+             * Unique id of the node.
+             */
+            id: number;
+            /**
+             * Function location.
+             */
+            callFrame: Runtime.CallFrame;
+            /**
+             * Number of samples where this node was on top of the call stack.
+             * @experimental
+             */
+            hitCount?: number;
+            /**
+             * Child node ids.
+             */
+            children?: number[];
+            /**
+             * The reason of being not optimized. The function may be deoptimized or marked as don't optimize.
+             */
+            deoptReason?: string;
+            /**
+             * An array of source position ticks.
+             * @experimental
+             */
+            positionTicks?: Profiler.PositionTickInfo[];
+        }
+
+        /**
+         * Profile.
+         */
+        export interface Profile {
+            /**
+             * The list of profile nodes. First item is the root node.
+             */
+            nodes: Profiler.ProfileNode[];
+            /**
+             * Profiling start timestamp in microseconds.
+             */
+            startTime: number;
+            /**
+             * Profiling end timestamp in microseconds.
+             */
+            endTime: number;
+            /**
+             * Ids of samples top nodes.
+             */
+            samples?: number[];
+            /**
+             * Time intervals between adjacent samples in microseconds. The first delta is relative to the profile startTime.
+             */
+            timeDeltas?: number[];
+        }
+
+        /**
+         * Specifies a number of samples attributed to a certain source position.
+         * @experimental
+         */
+        export interface PositionTickInfo {
+            /**
+             * Source line number (1-based).
+             */
+            line: number;
+            /**
+             * Number of samples attributed to the source line.
+             */
+            ticks: number;
+        }
+
+        /**
+         * Coverage data for a source range.
+         * @experimental
+         */
+        export interface CoverageRange {
+            /**
+             * JavaScript script source offset for the range start.
+             */
+            startOffset: number;
+            /**
+             * JavaScript script source offset for the range end.
+             */
+            endOffset: number;
+            /**
+             * Collected execution count of the source range.
+             */
+            count: number;
+        }
+
+        /**
+         * Coverage data for a JavaScript function.
+         * @experimental
+         */
+        export interface FunctionCoverage {
+            /**
+             * JavaScript function name.
+             */
+            functionName: string;
+            /**
+             * Source ranges inside the function with coverage data.
+             */
+            ranges: Profiler.CoverageRange[];
+            /**
+             * Whether coverage data for this function has block granularity.
+             */
+            isBlockCoverage: boolean;
+        }
+
+        /**
+         * Coverage data for a JavaScript script.
+         * @experimental
+         */
+        export interface ScriptCoverage {
+            /**
+             * JavaScript script id.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * JavaScript script name or url.
+             */
+            url: string;
+            /**
+             * Functions contained in the script that has coverage data.
+             */
+            functions: Profiler.FunctionCoverage[];
+        }
+
+        export interface SetSamplingIntervalParameterType {
+            /**
+             * New sampling interval in microseconds.
+             */
+            interval: number;
+        }
+
+        export interface StartPreciseCoverageParameterType {
+            /**
+             * Collect accurate call counts beyond simple 'covered' or 'not covered'.
+             */
+            callCount?: boolean;
+        }
+
+        export interface StopReturnType {
+            /**
+             * Recorded profile.
+             */
+            profile: Profiler.Profile;
+        }
+
+        export interface TakePreciseCoverageReturnType {
+            /**
+             * Coverage data for the current isolate.
+             */
+            result: Profiler.ScriptCoverage[];
+        }
+
+        export interface GetBestEffortCoverageReturnType {
+            /**
+             * Coverage data for the current isolate.
+             */
+            result: Profiler.ScriptCoverage[];
+        }
+
+        export interface ConsoleProfileStartedEventDataType {
+            id: string;
+            /**
+             * Location of console.profile().
+             */
+            location: Debugger.Location;
+            /**
+             * Profile title passed as an argument to console.profile().
+             */
+            title?: string;
+        }
+
+        export interface ConsoleProfileFinishedEventDataType {
+            id: string;
+            /**
+             * Location of console.profileEnd().
+             */
+            location: Debugger.Location;
+            profile: Profiler.Profile;
+            /**
+             * Profile title passed as an argument to console.profile().
+             */
+            title?: string;
+        }
+    }
+
+    export namespace HeapProfiler {
+        /**
+         * Heap snapshot object id.
+         */
+        export type HeapSnapshotObjectId = string;
+
+        /**
+         * Sampling Heap Profile node. Holds callsite information, allocation statistics and child nodes.
+         */
+        export interface SamplingHeapProfileNode {
+            /**
+             * Function location.
+             */
+            callFrame: Runtime.CallFrame;
+            /**
+             * Allocations size in bytes for the node excluding children.
+             */
+            selfSize: number;
+            /**
+             * Child nodes.
+             */
+            children: HeapProfiler.SamplingHeapProfileNode[];
+        }
+
+        /**
+         * Profile.
+         */
+        export interface SamplingHeapProfile {
+            head: HeapProfiler.SamplingHeapProfileNode;
+        }
+
+        export interface StartTrackingHeapObjectsParameterType {
+            trackAllocations?: boolean;
+        }
+
+        export interface StopTrackingHeapObjectsParameterType {
+            /**
+             * If true 'reportHeapSnapshotProgress' events will be generated while snapshot is being taken when the tracking is stopped.
+             */
+            reportProgress?: boolean;
+        }
+
+        export interface TakeHeapSnapshotParameterType {
+            /**
+             * If true 'reportHeapSnapshotProgress' events will be generated while snapshot is being taken.
+             */
+            reportProgress?: boolean;
+        }
+
+        export interface GetObjectByHeapObjectIdParameterType {
+            objectId: HeapProfiler.HeapSnapshotObjectId;
+            /**
+             * Symbolic group name that can be used to release multiple objects.
+             */
+            objectGroup?: string;
+        }
+
+        export interface AddInspectedHeapObjectParameterType {
+            /**
+             * Heap snapshot object id to be accessible by means of $x command line API.
+             */
+            heapObjectId: HeapProfiler.HeapSnapshotObjectId;
+        }
+
+        export interface GetHeapObjectIdParameterType {
+            /**
+             * Identifier of the object to get heap object id for.
+             */
+            objectId: Runtime.RemoteObjectId;
+        }
+
+        export interface StartSamplingParameterType {
+            /**
+             * Average sample interval in bytes. Poisson distribution is used for the intervals. The default value is 32768 bytes.
+             */
+            samplingInterval?: number;
+        }
+
+        export interface GetObjectByHeapObjectIdReturnType {
+            /**
+             * Evaluation result.
+             */
+            result: Runtime.RemoteObject;
+        }
+
+        export interface GetHeapObjectIdReturnType {
+            /**
+             * Id of the heap snapshot object corresponding to the passed remote object id.
+             */
+            heapSnapshotObjectId: HeapProfiler.HeapSnapshotObjectId;
+        }
+
+        export interface StopSamplingReturnType {
+            /**
+             * Recorded sampling heap profile.
+             */
+            profile: HeapProfiler.SamplingHeapProfile;
+        }
+
+        export interface AddHeapSnapshotChunkEventDataType {
+            chunk: string;
+        }
+
+        export interface ReportHeapSnapshotProgressEventDataType {
+            done: number;
+            total: number;
+            finished?: boolean;
+        }
+
+        export interface LastSeenObjectIdEventDataType {
+            lastSeenObjectId: number;
+            timestamp: number;
+        }
+
+        export interface HeapStatsUpdateEventDataType {
+            /**
+             * An array of triplets. Each triplet describes a fragment. The first integer is the fragment index, the second integer is a total count of objects for the fragment, the third integer is a total size of the objects for the fragment.
+             */
+            statsUpdate: number[];
+        }
+    }
+
+    /**
+     * The inspector.Session is used for dispatching messages to the V8 inspector back-end and receiving message responses and notifications.
+     */
+    export class Session extends EventEmitter {
+        /**
+         * Create a new instance of the inspector.Session class. The inspector session needs to be connected through session.connect() before the messages can be dispatched to the inspector backend.
+         */
+        constructor();
+
+        /**
+         * Connects a session to the inspector back-end. An exception will be thrown if there is already a connected session established either through the API or by a front-end connected to the Inspector WebSocket port.
+         */
+        connect(): void;
+
+        /**
+         * Immediately close the session. All pending message callbacks will be called with an error. session.connect() will need to be called to be able to send messages again. Reconnected session will lose all inspector state, such as enabled agents or configured breakpoints.
+         */
+        disconnect(): void;
+
+        /**
+         * Posts a message to the inspector back-end. callback will be notified when a response is received. callback is a function that accepts two optional arguments - error and message-specific result.
+         */
+        post(method: string, params?: {}, callback?: (err: Error | null, params?: {}) => void): void;
+        post(method: string, callback?: (err: Error | null, params?: {}) => void): void;
+
+        /**
+         * Returns supported domains.
+         */
+        post(method: "Schema.getDomains", callback?: (err: Error | null, params: Schema.GetDomainsReturnType) => void): void;
+        /**
+         * Evaluates expression on global object.
+         */
+        post(method: "Runtime.evaluate", params?: Runtime.EvaluateParameterType, callback?: (err: Error | null, params: Runtime.EvaluateReturnType) => void): void;
+        post(method: "Runtime.evaluate", callback?: (err: Error | null, params: Runtime.EvaluateReturnType) => void): void;
+
+        /**
+         * Add handler to promise with given promise object id.
+         */
+        post(method: "Runtime.awaitPromise", params?: Runtime.AwaitPromiseParameterType, callback?: (err: Error | null, params: Runtime.AwaitPromiseReturnType) => void): void;
+        post(method: "Runtime.awaitPromise", callback?: (err: Error | null, params: Runtime.AwaitPromiseReturnType) => void): void;
+
+        /**
+         * Calls function with given declaration on the given object. Object group of the result is inherited from the target object.
+         */
+        post(method: "Runtime.callFunctionOn", params?: Runtime.CallFunctionOnParameterType, callback?: (err: Error | null, params: Runtime.CallFunctionOnReturnType) => void): void;
+        post(method: "Runtime.callFunctionOn", callback?: (err: Error | null, params: Runtime.CallFunctionOnReturnType) => void): void;
+
+        /**
+         * Returns properties of a given object. Object group of the result is inherited from the target object.
+         */
+        post(method: "Runtime.getProperties", params?: Runtime.GetPropertiesParameterType, callback?: (err: Error | null, params: Runtime.GetPropertiesReturnType) => void): void;
+        post(method: "Runtime.getProperties", callback?: (err: Error | null, params: Runtime.GetPropertiesReturnType) => void): void;
+
+        /**
+         * Releases remote object with given id.
+         */
+        post(method: "Runtime.releaseObject", params?: Runtime.ReleaseObjectParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.releaseObject", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Releases all remote objects that belong to a given group.
+         */
+        post(method: "Runtime.releaseObjectGroup", params?: Runtime.ReleaseObjectGroupParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.releaseObjectGroup", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Tells inspected instance to run if it was waiting for debugger to attach.
+         */
+        post(method: "Runtime.runIfWaitingForDebugger", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Enables reporting of execution contexts creation by means of <code>executionContextCreated</code> event. When the reporting gets enabled the event will be sent immediately for each existing execution context.
+         */
+        post(method: "Runtime.enable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Disables reporting of execution contexts creation.
+         */
+        post(method: "Runtime.disable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Discards collected exceptions and console API calls.
+         */
+        post(method: "Runtime.discardConsoleEntries", callback?: (err: Error | null) => void): void;
+
+        /**
+         * @experimental
+         */
+        post(method: "Runtime.setCustomObjectFormatterEnabled", params?: Runtime.SetCustomObjectFormatterEnabledParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.setCustomObjectFormatterEnabled", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Compiles expression.
+         */
+        post(method: "Runtime.compileScript", params?: Runtime.CompileScriptParameterType, callback?: (err: Error | null, params: Runtime.CompileScriptReturnType) => void): void;
+        post(method: "Runtime.compileScript", callback?: (err: Error | null, params: Runtime.CompileScriptReturnType) => void): void;
+
+        /**
+         * Runs script with given id in a given context.
+         */
+        post(method: "Runtime.runScript", params?: Runtime.RunScriptParameterType, callback?: (err: Error | null, params: Runtime.RunScriptReturnType) => void): void;
+        post(method: "Runtime.runScript", callback?: (err: Error | null, params: Runtime.RunScriptReturnType) => void): void;
+        /**
+         * Enables debugger for the given page. Clients should not assume that the debugging has been enabled until the result for this command is received.
+         */
+        post(method: "Debugger.enable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Disables debugger for given page.
+         */
+        post(method: "Debugger.disable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Activates / deactivates all breakpoints on the page.
+         */
+        post(method: "Debugger.setBreakpointsActive", params?: Debugger.SetBreakpointsActiveParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setBreakpointsActive", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Makes page not interrupt on any pauses (breakpoint, exception, dom exception etc).
+         */
+        post(method: "Debugger.setSkipAllPauses", params?: Debugger.SetSkipAllPausesParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setSkipAllPauses", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Sets JavaScript breakpoint at given location specified either by URL or URL regex. Once this command is issued, all existing parsed scripts will have breakpoints resolved and returned in <code>locations</code> property. Further matching script parsing will result in subsequent <code>breakpointResolved</code> events issued. This logical breakpoint will survive page reloads.
+         */
+        post(method: "Debugger.setBreakpointByUrl", params?: Debugger.SetBreakpointByUrlParameterType, callback?: (err: Error | null, params: Debugger.SetBreakpointByUrlReturnType) => void): void;
+        post(method: "Debugger.setBreakpointByUrl", callback?: (err: Error | null, params: Debugger.SetBreakpointByUrlReturnType) => void): void;
+
+        /**
+         * Sets JavaScript breakpoint at a given location.
+         */
+        post(method: "Debugger.setBreakpoint", params?: Debugger.SetBreakpointParameterType, callback?: (err: Error | null, params: Debugger.SetBreakpointReturnType) => void): void;
+        post(method: "Debugger.setBreakpoint", callback?: (err: Error | null, params: Debugger.SetBreakpointReturnType) => void): void;
+
+        /**
+         * Removes JavaScript breakpoint.
+         */
+        post(method: "Debugger.removeBreakpoint", params?: Debugger.RemoveBreakpointParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.removeBreakpoint", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Returns possible locations for breakpoint. scriptId in start and end range locations should be the same.
+         * @experimental
+         */
+        post(method: "Debugger.getPossibleBreakpoints", params?: Debugger.GetPossibleBreakpointsParameterType, callback?: (err: Error | null, params: Debugger.GetPossibleBreakpointsReturnType) => void): void;
+        post(method: "Debugger.getPossibleBreakpoints", callback?: (err: Error | null, params: Debugger.GetPossibleBreakpointsReturnType) => void): void;
+
+        /**
+         * Continues execution until specific location is reached.
+         */
+        post(method: "Debugger.continueToLocation", params?: Debugger.ContinueToLocationParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.continueToLocation", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Steps over the statement.
+         */
+        post(method: "Debugger.stepOver", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Steps into the function call.
+         */
+        post(method: "Debugger.stepInto", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Steps out of the function call.
+         */
+        post(method: "Debugger.stepOut", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Stops on the next JavaScript statement.
+         */
+        post(method: "Debugger.pause", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Steps into next scheduled async task if any is scheduled before next pause. Returns success when async task is actually scheduled, returns error if no task were scheduled or another scheduleStepIntoAsync was called.
+         * @experimental
+         */
+        post(method: "Debugger.scheduleStepIntoAsync", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Resumes JavaScript execution.
+         */
+        post(method: "Debugger.resume", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Searches for given string in script content.
+         * @experimental
+         */
+        post(method: "Debugger.searchInContent", params?: Debugger.SearchInContentParameterType, callback?: (err: Error | null, params: Debugger.SearchInContentReturnType) => void): void;
+        post(method: "Debugger.searchInContent", callback?: (err: Error | null, params: Debugger.SearchInContentReturnType) => void): void;
+
+        /**
+         * Edits JavaScript source live.
+         */
+        post(method: "Debugger.setScriptSource", params?: Debugger.SetScriptSourceParameterType, callback?: (err: Error | null, params: Debugger.SetScriptSourceReturnType) => void): void;
+        post(method: "Debugger.setScriptSource", callback?: (err: Error | null, params: Debugger.SetScriptSourceReturnType) => void): void;
+
+        /**
+         * Restarts particular call frame from the beginning.
+         */
+        post(method: "Debugger.restartFrame", params?: Debugger.RestartFrameParameterType, callback?: (err: Error | null, params: Debugger.RestartFrameReturnType) => void): void;
+        post(method: "Debugger.restartFrame", callback?: (err: Error | null, params: Debugger.RestartFrameReturnType) => void): void;
+
+        /**
+         * Returns source for the script with given id.
+         */
+        post(method: "Debugger.getScriptSource", params?: Debugger.GetScriptSourceParameterType, callback?: (err: Error | null, params: Debugger.GetScriptSourceReturnType) => void): void;
+        post(method: "Debugger.getScriptSource", callback?: (err: Error | null, params: Debugger.GetScriptSourceReturnType) => void): void;
+
+        /**
+         * Defines pause on exceptions state. Can be set to stop on all exceptions, uncaught exceptions or no exceptions. Initial pause on exceptions state is <code>none</code>.
+         */
+        post(method: "Debugger.setPauseOnExceptions", params?: Debugger.SetPauseOnExceptionsParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setPauseOnExceptions", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Evaluates expression on a given call frame.
+         */
+        post(method: "Debugger.evaluateOnCallFrame", params?: Debugger.EvaluateOnCallFrameParameterType, callback?: (err: Error | null, params: Debugger.EvaluateOnCallFrameReturnType) => void): void;
+        post(method: "Debugger.evaluateOnCallFrame", callback?: (err: Error | null, params: Debugger.EvaluateOnCallFrameReturnType) => void): void;
+
+        /**
+         * Changes value of variable in a callframe. Object-based scopes are not supported and must be mutated manually.
+         */
+        post(method: "Debugger.setVariableValue", params?: Debugger.SetVariableValueParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setVariableValue", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Enables or disables async call stacks tracking.
+         */
+        post(method: "Debugger.setAsyncCallStackDepth", params?: Debugger.SetAsyncCallStackDepthParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setAsyncCallStackDepth", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Replace previous blackbox patterns with passed ones. Forces backend to skip stepping/pausing in scripts with url matching one of the patterns. VM will try to leave blackboxed script by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.
+         * @experimental
+         */
+        post(method: "Debugger.setBlackboxPatterns", params?: Debugger.SetBlackboxPatternsParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setBlackboxPatterns", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Makes backend skip steps in the script in blackboxed ranges. VM will try leave blacklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful. Positions array contains positions where blackbox state is changed. First interval isn't blackboxed. Array should be sorted.
+         * @experimental
+         */
+        post(method: "Debugger.setBlackboxedRanges", params?: Debugger.SetBlackboxedRangesParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setBlackboxedRanges", callback?: (err: Error | null) => void): void;
+        /**
+         * Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification.
+         */
+        post(method: "Console.enable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Disables console domain, prevents further console messages from being reported to the client.
+         */
+        post(method: "Console.disable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Does nothing.
+         */
+        post(method: "Console.clearMessages", callback?: (err: Error | null) => void): void;
+        post(method: "Profiler.enable", callback?: (err: Error | null) => void): void;
+
+        post(method: "Profiler.disable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Changes CPU profiler sampling interval. Must be called before CPU profiles recording started.
+         */
+        post(method: "Profiler.setSamplingInterval", params?: Profiler.SetSamplingIntervalParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Profiler.setSamplingInterval", callback?: (err: Error | null) => void): void;
+
+        post(method: "Profiler.start", callback?: (err: Error | null) => void): void;
+
+        post(method: "Profiler.stop", callback?: (err: Error | null, params: Profiler.StopReturnType) => void): void;
+
+        /**
+         * Enable precise code coverage. Coverage data for JavaScript executed before enabling precise code coverage may be incomplete. Enabling prevents running optimized code and resets execution counters.
+         * @experimental
+         */
+        post(method: "Profiler.startPreciseCoverage", params?: Profiler.StartPreciseCoverageParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Profiler.startPreciseCoverage", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Disable precise code coverage. Disabling releases unnecessary execution count records and allows executing optimized code.
+         * @experimental
+         */
+        post(method: "Profiler.stopPreciseCoverage", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Collect coverage data for the current isolate, and resets execution counters. Precise code coverage needs to have started.
+         * @experimental
+         */
+        post(method: "Profiler.takePreciseCoverage", callback?: (err: Error | null, params: Profiler.TakePreciseCoverageReturnType) => void): void;
+
+        /**
+         * Collect coverage data for the current isolate. The coverage data may be incomplete due to garbage collection.
+         * @experimental
+         */
+        post(method: "Profiler.getBestEffortCoverage", callback?: (err: Error | null, params: Profiler.GetBestEffortCoverageReturnType) => void): void;
+        post(method: "HeapProfiler.enable", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.disable", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.startTrackingHeapObjects", params?: HeapProfiler.StartTrackingHeapObjectsParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "HeapProfiler.startTrackingHeapObjects", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.stopTrackingHeapObjects", params?: HeapProfiler.StopTrackingHeapObjectsParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "HeapProfiler.stopTrackingHeapObjects", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.takeHeapSnapshot", params?: HeapProfiler.TakeHeapSnapshotParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "HeapProfiler.takeHeapSnapshot", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.collectGarbage", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.getObjectByHeapObjectId", params?: HeapProfiler.GetObjectByHeapObjectIdParameterType, callback?: (err: Error | null, params: HeapProfiler.GetObjectByHeapObjectIdReturnType) => void): void;
+        post(method: "HeapProfiler.getObjectByHeapObjectId", callback?: (err: Error | null, params: HeapProfiler.GetObjectByHeapObjectIdReturnType) => void): void;
+
+        /**
+         * Enables console to refer to the node with given id via $x (see Command Line API for more details $x functions).
+         */
+        post(method: "HeapProfiler.addInspectedHeapObject", params?: HeapProfiler.AddInspectedHeapObjectParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "HeapProfiler.addInspectedHeapObject", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.getHeapObjectId", params?: HeapProfiler.GetHeapObjectIdParameterType, callback?: (err: Error | null, params: HeapProfiler.GetHeapObjectIdReturnType) => void): void;
+        post(method: "HeapProfiler.getHeapObjectId", callback?: (err: Error | null, params: HeapProfiler.GetHeapObjectIdReturnType) => void): void;
+
+        post(method: "HeapProfiler.startSampling", params?: HeapProfiler.StartSamplingParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "HeapProfiler.startSampling", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.stopSampling", callback?: (err: Error | null, params: HeapProfiler.StopSamplingReturnType) => void): void;
+
+        // Events
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        addListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new execution context is created.
+         */
+        addListener(event: "Runtime.executionContextCreated", listener: (message: InspectorNotification<Runtime.ExecutionContextCreatedEventDataType>) => void): this;
+
+        /**
+         * Issued when execution context is destroyed.
+         */
+        addListener(event: "Runtime.executionContextDestroyed", listener: (message: InspectorNotification<Runtime.ExecutionContextDestroyedEventDataType>) => void): this;
+
+        /**
+         * Issued when all executionContexts were cleared in browser
+         */
+        addListener(event: "Runtime.executionContextsCleared", listener: () => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        addListener(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        addListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when console API was called.
+         */
+        addListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when object should be inspected (for example, as a result of inspect() command line API call).
+         */
+        addListener(event: "Runtime.inspectRequested", listener: (message: InspectorNotification<Runtime.InspectRequestedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
+         */
+        addListener(event: "Debugger.scriptParsed", listener: (message: InspectorNotification<Debugger.ScriptParsedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        addListener(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        addListener(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        addListener(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        addListener(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        addListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Sent when new profile recording is started using console.profile() call.
+         */
+        addListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
+
+        addListener(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => void): this;
+        addListener(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => void): this;
+        addListener(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        addListener(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend regularly sends a current value for last seen object id and corresponding timestamp. If the were changes in the heap since last event then one or more heapStatsUpdate events will be sent before a new lastSeenObjectId event.
+         */
+        addListener(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend may send update for one or more fragments
+         */
+        addListener(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "inspectorNotification", message: InspectorNotification<{}>): boolean;
+        emit(event: "Runtime.executionContextCreated", message: InspectorNotification<Runtime.ExecutionContextCreatedEventDataType>): boolean;
+        emit(event: "Runtime.executionContextDestroyed", message: InspectorNotification<Runtime.ExecutionContextDestroyedEventDataType>): boolean;
+        emit(event: "Runtime.executionContextsCleared"): boolean;
+        emit(event: "Runtime.exceptionThrown", message: InspectorNotification<Runtime.ExceptionThrownEventDataType>): boolean;
+        emit(event: "Runtime.exceptionRevoked", message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>): boolean;
+        emit(event: "Runtime.consoleAPICalled", message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>): boolean;
+        emit(event: "Runtime.inspectRequested", message: InspectorNotification<Runtime.InspectRequestedEventDataType>): boolean;
+        emit(event: "Debugger.scriptParsed", message: InspectorNotification<Debugger.ScriptParsedEventDataType>): boolean;
+        emit(event: "Debugger.scriptFailedToParse", message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>): boolean;
+        emit(event: "Debugger.breakpointResolved", message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>): boolean;
+        emit(event: "Debugger.paused", message: InspectorNotification<Debugger.PausedEventDataType>): boolean;
+        emit(event: "Debugger.resumed"): boolean;
+        emit(event: "Console.messageAdded", message: InspectorNotification<Console.MessageAddedEventDataType>): boolean;
+        emit(event: "Profiler.consoleProfileStarted", message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>): boolean;
+        emit(event: "Profiler.consoleProfileFinished", message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>): boolean;
+        emit(event: "HeapProfiler.addHeapSnapshotChunk", message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>): boolean;
+        emit(event: "HeapProfiler.resetProfiles"): boolean;
+        emit(event: "HeapProfiler.reportHeapSnapshotProgress", message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>): boolean;
+        emit(event: "HeapProfiler.lastSeenObjectId", message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>): boolean;
+        emit(event: "HeapProfiler.heapStatsUpdate", message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        on(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new execution context is created.
+         */
+        on(event: "Runtime.executionContextCreated", listener: (message: InspectorNotification<Runtime.ExecutionContextCreatedEventDataType>) => void): this;
+
+        /**
+         * Issued when execution context is destroyed.
+         */
+        on(event: "Runtime.executionContextDestroyed", listener: (message: InspectorNotification<Runtime.ExecutionContextDestroyedEventDataType>) => void): this;
+
+        /**
+         * Issued when all executionContexts were cleared in browser
+         */
+        on(event: "Runtime.executionContextsCleared", listener: () => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        on(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        on(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when console API was called.
+         */
+        on(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when object should be inspected (for example, as a result of inspect() command line API call).
+         */
+        on(event: "Runtime.inspectRequested", listener: (message: InspectorNotification<Runtime.InspectRequestedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
+         */
+        on(event: "Debugger.scriptParsed", listener: (message: InspectorNotification<Debugger.ScriptParsedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        on(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        on(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        on(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        on(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        on(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Sent when new profile recording is started using console.profile() call.
+         */
+        on(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
+
+        on(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => void): this;
+        on(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => void): this;
+        on(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        on(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend regularly sends a current value for last seen object id and corresponding timestamp. If the were changes in the heap since last event then one or more heapStatsUpdate events will be sent before a new lastSeenObjectId event.
+         */
+        on(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend may send update for one or more fragments
+         */
+        on(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        once(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new execution context is created.
+         */
+        once(event: "Runtime.executionContextCreated", listener: (message: InspectorNotification<Runtime.ExecutionContextCreatedEventDataType>) => void): this;
+
+        /**
+         * Issued when execution context is destroyed.
+         */
+        once(event: "Runtime.executionContextDestroyed", listener: (message: InspectorNotification<Runtime.ExecutionContextDestroyedEventDataType>) => void): this;
+
+        /**
+         * Issued when all executionContexts were cleared in browser
+         */
+        once(event: "Runtime.executionContextsCleared", listener: () => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        once(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        once(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when console API was called.
+         */
+        once(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when object should be inspected (for example, as a result of inspect() command line API call).
+         */
+        once(event: "Runtime.inspectRequested", listener: (message: InspectorNotification<Runtime.InspectRequestedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
+         */
+        once(event: "Debugger.scriptParsed", listener: (message: InspectorNotification<Debugger.ScriptParsedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        once(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        once(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        once(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        once(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        once(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Sent when new profile recording is started using console.profile() call.
+         */
+        once(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
+
+        once(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => void): this;
+        once(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => void): this;
+        once(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        once(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend regularly sends a current value for last seen object id and corresponding timestamp. If the were changes in the heap since last event then one or more heapStatsUpdate events will be sent before a new lastSeenObjectId event.
+         */
+        once(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend may send update for one or more fragments
+         */
+        once(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        prependListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new execution context is created.
+         */
+        prependListener(event: "Runtime.executionContextCreated", listener: (message: InspectorNotification<Runtime.ExecutionContextCreatedEventDataType>) => void): this;
+
+        /**
+         * Issued when execution context is destroyed.
+         */
+        prependListener(event: "Runtime.executionContextDestroyed", listener: (message: InspectorNotification<Runtime.ExecutionContextDestroyedEventDataType>) => void): this;
+
+        /**
+         * Issued when all executionContexts were cleared in browser
+         */
+        prependListener(event: "Runtime.executionContextsCleared", listener: () => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        prependListener(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        prependListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when console API was called.
+         */
+        prependListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when object should be inspected (for example, as a result of inspect() command line API call).
+         */
+        prependListener(event: "Runtime.inspectRequested", listener: (message: InspectorNotification<Runtime.InspectRequestedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
+         */
+        prependListener(event: "Debugger.scriptParsed", listener: (message: InspectorNotification<Debugger.ScriptParsedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        prependListener(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        prependListener(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        prependListener(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        prependListener(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        prependListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Sent when new profile recording is started using console.profile() call.
+         */
+        prependListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
+
+        prependListener(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => void): this;
+        prependListener(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => void): this;
+        prependListener(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        prependListener(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend regularly sends a current value for last seen object id and corresponding timestamp. If the were changes in the heap since last event then one or more heapStatsUpdate events will be sent before a new lastSeenObjectId event.
+         */
+        prependListener(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend may send update for one or more fragments
+         */
+        prependListener(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        prependOnceListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new execution context is created.
+         */
+        prependOnceListener(event: "Runtime.executionContextCreated", listener: (message: InspectorNotification<Runtime.ExecutionContextCreatedEventDataType>) => void): this;
+
+        /**
+         * Issued when execution context is destroyed.
+         */
+        prependOnceListener(event: "Runtime.executionContextDestroyed", listener: (message: InspectorNotification<Runtime.ExecutionContextDestroyedEventDataType>) => void): this;
+
+        /**
+         * Issued when all executionContexts were cleared in browser
+         */
+        prependOnceListener(event: "Runtime.executionContextsCleared", listener: () => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        prependOnceListener(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        prependOnceListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when console API was called.
+         */
+        prependOnceListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when object should be inspected (for example, as a result of inspect() command line API call).
+         */
+        prependOnceListener(event: "Runtime.inspectRequested", listener: (message: InspectorNotification<Runtime.InspectRequestedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
+         */
+        prependOnceListener(event: "Debugger.scriptParsed", listener: (message: InspectorNotification<Debugger.ScriptParsedEventDataType>) => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        prependOnceListener(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        prependOnceListener(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        prependOnceListener(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        prependOnceListener(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        prependOnceListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Sent when new profile recording is started using console.profile() call.
+         */
+        prependOnceListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
+
+        prependOnceListener(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => void): this;
+        prependOnceListener(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => void): this;
+        prependOnceListener(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        prependOnceListener(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend regularly sends a current value for last seen object id and corresponding timestamp. If the were changes in the heap since last event then one or more heapStatsUpdate events will be sent before a new lastSeenObjectId event.
+         */
+        prependOnceListener(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+
+        /**
+         * If heap objects tracking has been started then backend may send update for one or more fragments
+         */
+        prependOnceListener(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+    }
+
+    // Top Level API
+
+    /**
+     * Activate inspector on host and port. Equivalent to node --inspect=[[host:]port], but can be done programatically after node has started.
+     * If wait is true, will block until a client has connected to the inspect port and flow control has been passed to the debugger client.
+     * @param port Port to listen on for inspector connections. Optional, defaults to what was specified on the CLI.
+     * @param host Host to listen on for inspector connections. Optional, defaults to what was specified on the CLI.
+     * @param wait Block until a client has connected. Optional, defaults to false.
+     */
+    export function open(port?: number, host?: string, wait?: boolean): void;
+
+    /**
+     * Deactivate the inspector. Blocks until there are no active connections.
+     */
+    export function close(): void;
+
+    /**
+     * Return the URL of the active inspector, or undefined if there is none.
+     */
+    export function url(): string;
+}
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
new file mode 100644
index 0000000000..6bb7f28495
--- /dev/null
+++ b/types/node/v8/node-tests.ts
@@ -0,0 +1,3873 @@
+import * as assert from "assert";
+import * as fs from "fs";
+import * as events from "events";
+import events2 = require("events");
+import * as zlib from "zlib";
+import * as url from "url";
+import * as util from "util";
+import * as crypto from "crypto";
+import * as tls from "tls";
+import * as http from "http";
+import * as https from "https";
+import * as net from "net";
+import * as tty from "tty";
+import * as dgram from "dgram";
+import * as querystring from "querystring";
+import * as path from "path";
+import * as readline from "readline";
+import * as childProcess from "child_process";
+import * as cluster from "cluster";
+import * as os from "os";
+import * as vm from "vm";
+import * as console2 from "console";
+import * as string_decoder from "string_decoder";
+import * as stream from "stream";
+import * as timers from "timers";
+import * as repl from "repl";
+import * as v8 from "v8";
+import * as dns from "dns";
+import * as async_hooks from "async_hooks";
+import * as http2 from "http2";
+import * as inspector from "inspector";
+import * as perf_hooks from "perf_hooks";
+import Module = require("module");
+
+// Specifically test buffer module regression.
+import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
+
+//////////////////////////////////////////////////////////
+/// Global Tests : https://nodejs.org/api/global.html  ///
+//////////////////////////////////////////////////////////
+namespace global_tests {
+    {
+        let x: NodeModule;
+        let y: NodeModule;
+        x.children.push(y);
+        x.parent = require.main;
+        require.main = y;
+    }
+}
+
+//////////////////////////////////////////////////////////
+/// Assert Tests : https://nodejs.org/api/assert.html ///
+//////////////////////////////////////////////////////////
+
+namespace assert_tests {
+    {
+        assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+
+        assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+
+        assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
+
+        assert.doesNotThrow(() => {
+            const b = false;
+            if (b) { throw new Error("a hammer at your face"); }
+        }, undefined, "What the...*crunch*");
+
+        assert.equal(3, "3", "uses == comparator");
+
+        assert.fail('stuff broke');
+
+        assert.fail('actual', 'expected', 'message');
+
+        assert.fail(1, 2, undefined, '>');
+
+        assert.ifError(0);
+
+        assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
+
+        assert.notEqual(1, 2, "uses != comparator");
+
+        assert.notStrictEqual(2, "2", "uses === comparator");
+
+        assert.ok(true);
+        assert.ok(1);
+
+        assert.strictEqual(1, 1, "uses === comparator");
+
+        assert.throws(() => { throw new Error("a hammer at your face"); }, undefined, "DODGED IT");
+    }
+}
+
+////////////////////////////////////////////////////
+/// Events tests : http://nodejs.org/api/events.html
+////////////////////////////////////////////////////
+
+namespace events_tests {
+    let emitter: events.EventEmitter;
+    let event: string | symbol;
+    let listener: (...args: any[]) => void;
+    let any: any;
+
+    {
+        let result: events.EventEmitter;
+
+        result = emitter.addListener(event, listener);
+        result = emitter.on(event, listener);
+        result = emitter.once(event, listener);
+        result = emitter.prependListener(event, listener);
+        result = emitter.prependOnceListener(event, listener);
+        result = emitter.removeListener(event, listener);
+        result = emitter.removeAllListeners();
+        result = emitter.removeAllListeners(event);
+        result = emitter.setMaxListeners(42);
+    }
+
+    {
+        let result: number;
+
+        result = events.EventEmitter.defaultMaxListeners;
+        result = events.EventEmitter.listenerCount(emitter, event); // deprecated
+
+        result = emitter.getMaxListeners();
+        result = emitter.listenerCount(event);
+    }
+
+    {
+        let result: Function[];
+
+        result = emitter.listeners(event);
+    }
+
+    {
+        let result: boolean;
+
+        result = emitter.emit(event);
+        result = emitter.emit(event, any);
+        result = emitter.emit(event, any, any);
+        result = emitter.emit(event, any, any, any);
+    }
+
+    {
+        let result: Array<string | symbol>;
+
+        result = emitter.eventNames();
+    }
+
+    {
+        class Networker extends events.EventEmitter {
+            constructor() {
+                super();
+
+                this.emit("mingling");
+            }
+        }
+    }
+
+    {
+        new events2();
+    }
+}
+
+////////////////////////////////////////////////////
+/// File system tests : http://nodejs.org/api/fs.html
+////////////////////////////////////////////////////
+
+namespace fs_tests {
+    {
+        fs.writeFile("thebible.txt",
+            "Do unto others as you would have them do unto you.",
+            assert.ifError);
+
+        fs.write(1234, "test", () => { });
+
+        fs.writeFile("Harry Potter",
+            "\"You be wizzing, Harry,\" jived Dumbledore.",
+            {
+                encoding: "ascii"
+            },
+            assert.ifError);
+
+        fs.writeFile("testfile", "content", "utf8", assert.ifError);
+
+        fs.writeFileSync("testfile", "content", "utf8");
+        fs.writeFileSync("testfile", "content", { encoding: "utf8" });
+    }
+
+    {
+        fs.appendFile("testfile", "foobar", "utf8", assert.ifError);
+        fs.appendFile("testfile", "foobar", { encoding: "utf8" }, assert.ifError);
+        fs.appendFileSync("testfile", "foobar", "utf8");
+        fs.appendFileSync("testfile", "foobar", { encoding: "utf8" });
+    }
+
+    {
+        var content: string;
+        var buffer: Buffer;
+        var stringOrBuffer: string | Buffer;
+        var nullEncoding: string | null = null;
+        var stringEncoding: string | null = 'utf8';
+
+        content = fs.readFileSync('testfile', 'utf8');
+        content = fs.readFileSync('testfile', { encoding: 'utf8' });
+        stringOrBuffer = fs.readFileSync('testfile', stringEncoding);
+        stringOrBuffer = fs.readFileSync('testfile', { encoding: stringEncoding });
+
+        buffer = fs.readFileSync('testfile');
+        buffer = fs.readFileSync('testfile', null);
+        buffer = fs.readFileSync('testfile', { encoding: null });
+        stringOrBuffer = fs.readFileSync('testfile', nullEncoding);
+        stringOrBuffer = fs.readFileSync('testfile', { encoding: nullEncoding });
+
+        buffer = fs.readFileSync('testfile', { flag: 'r' });
+
+        fs.readFile('testfile', 'utf8', (err, data) => content = data);
+        fs.readFile('testfile', { encoding: 'utf8' }, (err, data) => content = data);
+        fs.readFile('testfile', stringEncoding, (err, data) => stringOrBuffer = data);
+        fs.readFile('testfile', { encoding: stringEncoding }, (err, data) => stringOrBuffer = data);
+
+        fs.readFile('testfile', (err, data) => buffer = data);
+        fs.readFile('testfile', null, (err, data) => buffer = data);
+        fs.readFile('testfile', { encoding: null }, (err, data) => buffer = data);
+        fs.readFile('testfile', nullEncoding, (err, data) => stringOrBuffer = data);
+        fs.readFile('testfile', { encoding: nullEncoding }, (err, data) => stringOrBuffer = data);
+
+        fs.readFile('testfile', { flag: 'r' }, (err, data) => buffer = data);
+    }
+
+    {
+        var errno: number;
+        fs.readFile('testfile', (err, data) => {
+            if (err && err.errno) {
+                errno = err.errno;
+            }
+        });
+    }
+
+    {
+        fs.mkdtemp('/tmp/foo-', (err, folder) => {
+            console.log(folder);
+            // Prints: /tmp/foo-itXde2
+        });
+    }
+
+    {
+        var tempDir: string;
+        tempDir = fs.mkdtempSync('/tmp/foo-');
+    }
+
+    {
+        fs.watch('/tmp/foo-', (event, filename) => {
+            console.log(event, filename);
+        });
+
+        fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
+            console.log(event, filename);
+        });
+
+        fs.watch('/tmp/foo-', {
+            recursive: true,
+            persistent: true,
+            encoding: 'utf8'
+        }, (event, filename) => {
+            console.log(event, filename);
+        });
+    }
+
+    {
+        fs.access('/path/to/folder', (err) => { });
+
+        fs.access(Buffer.from(''), (err) => { });
+
+        fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => { });
+
+        fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => { });
+
+        fs.accessSync('/path/to/folder');
+
+        fs.accessSync(Buffer.from(''));
+
+        fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK);
+
+        fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK);
+    }
+
+    {
+        let s: string;
+        let b: Buffer;
+        fs.readlink('/path/to/folder', (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', undefined, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', 'utf8', (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', 'buffer', (err, linkString) => b = linkString);
+        fs.readlink('/path/to/folder', s, (err, linkString) => typeof linkString === 'string' ? s = linkString : b = linkString);
+        fs.readlink('/path/to/folder', {}, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', { encoding: undefined }, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', { encoding: 'utf8' }, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', { encoding: 'buffer' }, (err, linkString) => b = linkString);
+        fs.readlink('/path/to/folder', { encoding: s }, (err, linkString) => typeof linkString === "string" ? s = linkString : b = linkString);
+
+        s = fs.readlinkSync('/path/to/folder');
+        s = fs.readlinkSync('/path/to/folder', undefined);
+        s = fs.readlinkSync('/path/to/folder', 'utf8');
+        b = fs.readlinkSync('/path/to/folder', 'buffer');
+        const v1 = fs.readlinkSync('/path/to/folder', s);
+        typeof v1 === "string" ? s = v1 : b = v1;
+
+        s = fs.readlinkSync('/path/to/folder', {});
+        s = fs.readlinkSync('/path/to/folder', { encoding: undefined });
+        s = fs.readlinkSync('/path/to/folder', { encoding: 'utf8' });
+        b = fs.readlinkSync('/path/to/folder', { encoding: 'buffer' });
+        const v2 = fs.readlinkSync('/path/to/folder', { encoding: s });
+        typeof v2 === "string" ? s = v2 : b = v2;
+    }
+
+    {
+        let s: string;
+        let b: Buffer;
+        fs.realpath('/path/to/folder', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', undefined, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', 'utf8', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', 'buffer', (err, resolvedPath) => b = resolvedPath);
+        fs.realpath('/path/to/folder', s, (err, resolvedPath) => typeof resolvedPath === 'string' ? s = resolvedPath : b = resolvedPath);
+        fs.realpath('/path/to/folder', {}, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: undefined }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: 'utf8' }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: 'buffer' }, (err, resolvedPath) => b = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: s }, (err, resolvedPath) => typeof resolvedPath === "string" ? s = resolvedPath : b = resolvedPath);
+
+        s = fs.realpathSync('/path/to/folder');
+        s = fs.realpathSync('/path/to/folder', undefined);
+        s = fs.realpathSync('/path/to/folder', 'utf8');
+        b = fs.realpathSync('/path/to/folder', 'buffer');
+        const v1 = fs.realpathSync('/path/to/folder', s);
+        typeof v1 === "string" ? s = v1 : b = v1;
+
+        s = fs.realpathSync('/path/to/folder', {});
+        s = fs.realpathSync('/path/to/folder', { encoding: undefined });
+        s = fs.realpathSync('/path/to/folder', { encoding: 'utf8' });
+        b = fs.realpathSync('/path/to/folder', { encoding: 'buffer' });
+        const v2 = fs.realpathSync('/path/to/folder', { encoding: s });
+        typeof v2 === "string" ? s = v2 : b = v2;
+    }
+
+    {
+        fs.copyFile('/path/to/src', '/path/to/dest', (err) => console.error(err));
+        fs.copyFile('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL, (err) => console.error(err));
+
+        fs.copyFileSync('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL);
+
+        const cf = util.promisify(fs.copyFile);
+        cf('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL).then(console.log);
+    }
+}
+
+///////////////////////////////////////////////////////
+/// Buffer tests : https://nodejs.org/api/buffer.html
+///////////////////////////////////////////////////////
+
+function bufferTests() {
+    var utf8Buffer = new Buffer('test');
+    var base64Buffer = new Buffer('', 'base64');
+    var octets: Uint8Array = null;
+    var octetBuffer = new Buffer(octets);
+    var sharedBuffer = new Buffer(octets.buffer);
+    var copiedBuffer = new Buffer(utf8Buffer);
+    console.log(Buffer.isBuffer(octetBuffer));
+    console.log(Buffer.isEncoding('utf8'));
+    console.log(Buffer.byteLength('xyz123'));
+    console.log(Buffer.byteLength('xyz123', 'ascii'));
+    var result1 = Buffer.concat([utf8Buffer, base64Buffer]);
+    var result2 = Buffer.concat([utf8Buffer, base64Buffer], 9999999);
+
+    // Class Methods: Buffer.swap16(), Buffer.swa32(), Buffer.swap64()
+    {
+        const buf = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
+        buf.swap16();
+        buf.swap32();
+        buf.swap64();
+    }
+
+    // Class Method: Buffer.from(array)
+    {
+        const buf: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+    }
+
+    // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
+    {
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+
+        let buf: Buffer;
+        buf = Buffer.from(arr.buffer);
+        buf = Buffer.from(arr.buffer, 1);
+        buf = Buffer.from(arr.buffer, 0, 1);
+    }
+
+    // Class Method: Buffer.from(buffer)
+    {
+        const buf1: Buffer = Buffer.from('buffer');
+        const buf2: Buffer = Buffer.from(buf1);
+    }
+
+    // Class Method: Buffer.from(str[, encoding])
+    {
+        const buf1: Buffer = Buffer.from('this is a tést');
+        const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
+    }
+    // Class Method: Buffer.alloc(size[, fill[, encoding]])
+    {
+        const buf1: Buffer = Buffer.alloc(5);
+        const buf2: Buffer = Buffer.alloc(5, 'a');
+        const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
+    }
+    // Class Method: Buffer.allocUnsafe(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafe(5);
+    }
+    // Class Method: Buffer.allocUnsafeSlow(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafeSlow(10);
+    }
+
+    // Class Method byteLenght
+    {
+        let len: number;
+        len = Buffer.byteLength("foo");
+        len = Buffer.byteLength("foo", "utf8");
+
+        const b = Buffer.from("bar");
+        len = Buffer.byteLength(b);
+        len = Buffer.byteLength(b, "utf16le");
+
+        const ab = new ArrayBuffer(15);
+        len = Buffer.byteLength(ab);
+        len = Buffer.byteLength(ab, "ascii");
+
+        const dv = new DataView(ab);
+        len = Buffer.byteLength(dv);
+        len = Buffer.byteLength(dv, "utf16le");
+    }
+
+    // Class Method poolSize
+    {
+        let s: number;
+        s = Buffer.poolSize;
+        Buffer.poolSize = 4096;
+    }
+
+    // Test that TS 1.6 works with the 'as Buffer' annotation
+    // on isBuffer.
+    var a: Buffer | number;
+    a = new Buffer(10);
+    if (Buffer.isBuffer(a)) {
+        a.writeUInt8(3, 4);
+    }
+
+    // write* methods return offsets.
+    var b = new Buffer(16);
+    var result: number = b.writeUInt32LE(0, 0);
+    result = b.writeUInt16LE(0, 4);
+    result = b.writeUInt8(0, 6);
+    result = b.writeInt8(0, 7);
+    result = b.writeDoubleLE(0, 8);
+
+    // fill returns the input buffer.
+    b.fill('a').fill('b');
+
+    {
+        let buffer = new Buffer('123');
+        let index: number;
+        index = buffer.indexOf("23");
+        index = buffer.indexOf("23", 1);
+        index = buffer.indexOf("23", 1, "utf8");
+        index = buffer.indexOf(23);
+        index = buffer.indexOf(buffer);
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let index: number;
+        index = buffer.lastIndexOf("23");
+        index = buffer.lastIndexOf("23", 1);
+        index = buffer.lastIndexOf("23", 1, "utf8");
+        index = buffer.lastIndexOf(23);
+        index = buffer.lastIndexOf(buffer);
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: [number, number];
+
+        /* comment out for --target es5
+        for (let entry of buffer.entries()) {
+            val = entry;
+        }
+         */
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let includes: boolean;
+        includes = buffer.includes("23");
+        includes = buffer.includes("23", 1);
+        includes = buffer.includes("23", 1, "utf8");
+        includes = buffer.includes(23);
+        includes = buffer.includes(23, 1);
+        includes = buffer.includes(23, 1, "utf8");
+        includes = buffer.includes(buffer);
+        includes = buffer.includes(buffer, 1);
+        includes = buffer.includes(buffer, 1, "utf8");
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: number;
+
+        /* comment out for --target es5
+        for (let key of buffer.keys()) {
+            val = key;
+        }
+         */
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: number;
+
+        /* comment out for --target es5
+        for (let value of buffer.values()) {
+            val = value;
+        }
+         */
+    }
+
+    // Imported Buffer from buffer module works properly
+    {
+        let b = new ImportedBuffer('123');
+        b.writeUInt8(0, 6);
+        let sb = new ImportedSlowBuffer(43);
+        b.writeUInt8(0, 6);
+    }
+
+    // Buffer has Uint8Array's buffer field (an ArrayBuffer).
+    {
+        let buffer = new Buffer('123');
+        let octets = new Uint8Array(buffer.buffer);
+    }
+}
+
+////////////////////////////////////////////////////
+/// Url tests : http://nodejs.org/api/url.html
+////////////////////////////////////////////////////
+
+namespace url_tests {
+    {
+        url.format(url.parse('http://www.example.com/xyz'));
+
+        url.format('http://www.example.com/xyz');
+
+        // https://google.com/search?q=you're%20a%20lizard%2C%20gary
+        url.format({
+            protocol: 'https',
+            host: "google.com",
+            pathname: 'search',
+            query: { q: "you're a lizard, gary" }
+        });
+
+        const myURL = new url.URL('https://a:b@你好你好?abc#foo');
+        url.format(myURL, { fragment: false, unicode: true, auth: false });
+    }
+
+    {
+        var helloUrl = url.parse('http://example.com/?hello=world', true);
+        if (typeof helloUrl.query !== 'string') {
+            assert.equal(helloUrl.query['hello'], 'world');
+        }
+    }
+
+    {
+        let myURL = new url.URL('https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.hash, '#bar');
+        assert.equal(myURL.host, 'example.org:81');
+        assert.equal(myURL.hostname, 'example.org');
+        assert.equal(myURL.href, 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.origin, 'https://example.org:81');
+        assert.equal(myURL.password, 'thepwd');
+        assert.equal(myURL.username, 'theuser');
+        assert.equal(myURL.pathname, '/foo/path');
+        assert.equal(myURL.port, "81");
+        assert.equal(myURL.protocol, "https:");
+        assert.equal(myURL.search, "?query=string");
+        assert.equal(myURL.toString(), 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert(myURL.searchParams instanceof url.URLSearchParams);
+
+        myURL.host = 'example.org:82';
+        myURL.hostname = 'example.com';
+        myURL.href = 'http://other.com';
+        myURL.hash = 'baz';
+        myURL.password = "otherpwd";
+        myURL.username = "otheruser";
+        myURL.pathname = "/otherPath";
+        myURL.port = "82";
+        myURL.protocol = "http";
+        myURL.search = "a=b";
+        assert.equal(myURL.href, 'http://otheruser:otherpwd@other.com:82/otherPath?a=b#baz');
+
+        myURL = new url.URL('/foo', 'https://example.org/');
+        assert.equal(myURL.href, 'https://example.org/foo');
+        assert.equal(myURL.toJSON(), myURL.href);
+    }
+
+    {
+        const searchParams = new url.URLSearchParams('abc=123');
+
+        assert.equal(searchParams.toString(), 'abc=123');
+        searchParams.forEach((value: string, name: string): void => {
+            assert.equal(name, 'abc');
+            assert.equal(value, '123');
+        });
+
+        assert.equal(searchParams.get('abc'), '123');
+
+        searchParams.append('abc', 'xyz');
+
+        assert.deepEqual(searchParams.getAll('abc'), ['123', 'xyz']);
+
+        const entries = searchParams.entries();
+        assert.deepEqual(entries.next(), { value: ["abc", "123"], done: false });
+        assert.deepEqual(entries.next(), { value: ["abc", "xyz"], done: false });
+        assert.deepEqual(entries.next(), { value: undefined, done: true });
+
+        const keys = searchParams.keys();
+        assert.deepEqual(keys.next(), { value: "abc", done: false });
+        assert.deepEqual(keys.next(), { value: "abc", done: false });
+        assert.deepEqual(keys.next(), { value: undefined, done: true });
+
+        const values = searchParams.values();
+        assert.deepEqual(values.next(), { value: "123", done: false });
+        assert.deepEqual(values.next(), { value: "xyz", done: false });
+        assert.deepEqual(values.next(), { value: undefined, done: true });
+
+        searchParams.set('abc', 'b');
+        assert.deepEqual(searchParams.getAll('abc'), ['b']);
+
+        searchParams.delete('a');
+        assert(!searchParams.has('a'));
+        assert.equal(searchParams.get('a'), null);
+
+        searchParams.sort();
+    }
+
+    {
+        const searchParams = new url.URLSearchParams({
+            user: 'abc',
+            query: ['first', 'second']
+        });
+
+        assert.equal(searchParams.toString(), 'user=abc&query=first%2Csecond');
+        assert.deepEqual(searchParams.getAll('query'), ['first,second']);
+    }
+
+    {
+        // Using an array
+        let params = new url.URLSearchParams([
+            ['user', 'abc'],
+            ['query', 'first'],
+            ['query', 'second']
+        ]);
+        assert.equal(params.toString(), 'user=abc&query=first&query=second');
+    }
+}
+
+/////////////////////////////////////////////////////
+/// util tests : https://nodejs.org/api/util.html ///
+/////////////////////////////////////////////////////
+
+namespace util_tests {
+    {
+        // Old and new util.inspect APIs
+        util.inspect(["This is nice"], false, 5);
+        util.inspect(["This is nice"], false, null);
+        util.inspect(["This is nice"], {
+            colors: true,
+            depth: 5,
+            customInspect: false,
+            showProxy: true,
+            maxArrayLength: 10,
+            breakLength: 20
+        });
+        util.inspect(["This is nice"], {
+            colors: true,
+            depth: null,
+            customInspect: false,
+            showProxy: true,
+            maxArrayLength: null,
+            breakLength: Infinity
+        });
+        assert(typeof util.inspect.custom === 'symbol');
+
+        // util.callbackify
+        // tslint:disable-next-line no-unnecessary-class
+        class callbackifyTest {
+            static fn(): Promise<void> {
+                assert(arguments.length === 0);
+
+                return Promise.resolve();
+            }
+
+            static fnE(): Promise<void> {
+                assert(arguments.length === 0);
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static fnT1(arg1: string): Promise<void> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.resolve();
+            }
+
+            static fnT1E(arg1: string): Promise<void> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static fnTResult(): Promise<string> {
+                assert(arguments.length === 0);
+
+                return Promise.resolve('result');
+            }
+
+            static fnTResultE(): Promise<string> {
+                assert(arguments.length === 0);
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static fnT1TResult(arg1: string): Promise<string> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.resolve('result');
+            }
+
+            static fnT1TResultE(arg1: string): Promise<string> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static test(): void {
+                var cfn = util.callbackify(this.fn);
+                var cfnE = util.callbackify(this.fnE);
+                var cfnT1 = util.callbackify(this.fnT1);
+                var cfnT1E = util.callbackify(this.fnT1E);
+                var cfnTResult = util.callbackify(this.fnTResult);
+                var cfnTResultE = util.callbackify(this.fnTResultE);
+                var cfnT1TResult = util.callbackify(this.fnT1TResult);
+                var cfnT1TResultE = util.callbackify(this.fnT1TResultE);
+
+                cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
+                cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+                cfnT1('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
+                cfnT1E('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+                cfnTResult((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
+                cfnTResultE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+                cfnT1TResult('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
+                cfnT1TResultE('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+            }
+        }
+        callbackifyTest.test();
+
+        // util.promisify
+        var readPromised = util.promisify(fs.readFile);
+        var sampleRead: Promise<any> = readPromised(__filename).then((data: Buffer): void => { }).catch((error: Error): void => { });
+        var arg0: () => Promise<number> = util.promisify((cb: (err: Error, result: number) => void): void => { });
+        var arg0NoResult: () => Promise<any> = util.promisify((cb: (err: Error) => void): void => { });
+        var arg1: (arg: string) => Promise<number> = util.promisify((arg: string, cb: (err: Error, result: number) => void): void => { });
+        var arg1NoResult: (arg: string) => Promise<any> = util.promisify((arg: string, cb: (err: Error) => void): void => { });
+        assert(typeof util.promisify.custom === 'symbol');
+        // util.deprecate
+        const foo = () => {};
+        // $ExpectType () => void
+        util.deprecate(foo, 'foo() is deprecated, use bar() instead');
+        // $ExpectType <T extends Function>(fn: T, message: string) => T
+        util.deprecate(util.deprecate, 'deprecate() is deprecated, use bar() instead');
+    }
+}
+
+////////////////////////////////////////////////////
+/// Stream tests : http://nodejs.org/api/stream.html
+////////////////////////////////////////////////////
+
+// http://nodejs.org/api/stream.html#stream_readable_pipe_destination_options
+function stream_readable_pipe_test() {
+    var rs = fs.createReadStream(Buffer.from('file.txt'));
+    var r = fs.createReadStream('file.txt');
+    var z = zlib.createGzip({ finishFlush: zlib.constants.Z_FINISH });
+    var w = fs.createWriteStream('file.txt.gz');
+
+    assert(typeof z.bytesRead === 'number');
+    assert(typeof r.bytesRead === 'number');
+    assert(typeof r.path === 'string');
+    assert(rs.path instanceof Buffer);
+
+    r.pipe(z).pipe(w);
+
+    z.flush();
+    r.close();
+    z.close();
+    rs.close();
+}
+
+// helpers
+const compressMe = new Buffer("some data");
+const compressMeString = "compress me!";
+
+zlib.deflate(compressMe, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflate(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMeString, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMeString, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflate(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+const inflated = zlib.inflateSync(zlib.deflateSync(compressMe));
+const inflatedString = zlib.inflateSync(zlib.deflateSync(compressMeString));
+
+zlib.deflateRaw(compressMe, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflateRaw(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(compressMeString, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(compressMeString, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflateRaw(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+const inflatedRaw: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMe));
+const inflatedRawString: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMeString));
+
+zlib.gzip(compressMe, (err: Error, result: Buffer) => zlib.gunzip(result, (err: Error, result: Buffer) => result));
+zlib.gzip(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.gunzip(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+const gunzipped: Buffer = zlib.gunzipSync(zlib.gzipSync(compressMe));
+
+zlib.unzip(compressMe, (err: Error, result: Buffer) => result);
+zlib.unzip(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result);
+const unzipped: Buffer = zlib.unzipSync(compressMe);
+
+// Simplified constructors
+function simplified_stream_ctor_test() {
+    new stream.Readable({
+        read(size) {
+            size.toFixed();
+        },
+        destroy(error) {
+            error.stack;
+        }
+    });
+
+    new stream.Writable({
+        write(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb();
+        },
+        writev(chunks, cb) {
+            chunks[0].chunk.slice(0);
+            chunks[0].encoding.charAt(0);
+            cb();
+        },
+        destroy(error) {
+            error.stack;
+        },
+        final(cb) {
+            cb(null);
+        }
+    });
+
+    new stream.Duplex({
+        read(size) {
+            size.toFixed();
+        },
+        write(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb();
+        },
+        writev(chunks, cb) {
+            chunks[0].chunk.slice(0);
+            chunks[0].encoding.charAt(0);
+            cb();
+        },
+        readableObjectMode: true,
+        writableObjectMode: true
+    });
+
+    new stream.Transform({
+        transform(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb();
+        },
+        flush(cb) {
+            cb();
+        },
+        read(size) {
+            size.toFixed();
+        },
+        write(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb();
+        },
+        writev(chunks, cb) {
+            chunks[0].chunk.slice(0);
+            chunks[0].encoding.charAt(0);
+            cb();
+        },
+        destroy(error) {
+            error.stack;
+        },
+        allowHalfOpen: true,
+        readableObjectMode: true,
+        writableObjectMode: true
+    });
+}
+
+////////////////////////////////////////////////////////
+/// Crypto tests : http://nodejs.org/api/crypto.html ///
+////////////////////////////////////////////////////////
+
+namespace crypto_tests {
+    {
+        // crypto_hash_string_test
+        var hashResult: string = crypto.createHash('md5').update('world').digest('hex');
+    }
+
+    {
+        // crypto_hash_buffer_test
+        var hashResult: string = crypto.createHash('md5')
+            .update(new Buffer('world')).digest('hex');
+    }
+
+    {
+        // crypto_hash_dataview_test
+        var hashResult: string = crypto.createHash('md5')
+            .update(new DataView(new Buffer('world').buffer)).digest('hex');
+    }
+
+    {
+        // crypto_hmac_string_test
+        var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+    }
+
+    {
+        // crypto_hmac_buffer_test
+        var hmacResult: string = crypto.createHmac('md5', 'hello')
+            .update(new Buffer('world')).digest('hex');
+    }
+
+    {
+        // crypto_hmac_dataview_test
+        var hmacResult: string = crypto.createHmac('md5', 'hello')
+            .update(new DataView(new Buffer('world').buffer)).digest('hex');
+    }
+
+    {
+        let hmac: crypto.Hmac;
+        (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
+            let hash: Buffer | string = hmac.read();
+        });
+    }
+
+    {
+        // crypto_cipher_decipher_string_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: string = "This is the clear text.";
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherText: string = cipher.update(clearText, "utf8", "hex");
+        cipherText += cipher.final("hex");
+
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let clearText2: string = decipher.update(cipherText, "hex", "utf8");
+        clearText2 += decipher.final("utf8");
+
+        assert.equal(clearText2, clearText);
+    }
+
+    {
+        // crypto_cipher_decipher_buffer_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
+
+        let cipherText: Buffer = Buffer.concat(cipherBuffers);
+
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
+
+        let clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+        assert.deepEqual(clearText2, clearText);
+    }
+
+    {
+        // crypto_cipher_decipher_dataview_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: DataView = new DataView(
+            new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]).buffer);
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
+
+        let cipherText: DataView = new DataView(Buffer.concat(cipherBuffers).buffer);
+
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
+
+        let clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+        assert.deepEqual(clearText2, clearText);
+    }
+
+    {
+        let buffer1: Buffer = new Buffer([1, 2, 3, 4, 5]);
+        let buffer2: Buffer = new Buffer([1, 2, 3, 4, 5]);
+        let buffer3: Buffer = new Buffer([5, 4, 3, 2, 1]);
+
+        assert(crypto.timingSafeEqual(buffer1, buffer2));
+        assert(!crypto.timingSafeEqual(buffer1, buffer3));
+    }
+
+    {
+        let buffer: Buffer = new Buffer(10);
+        crypto.randomFillSync(buffer);
+        crypto.randomFillSync(buffer, 2);
+        crypto.randomFillSync(buffer, 2, 3);
+
+        crypto.randomFill(buffer, (err: Error, buf: Buffer) => void {});
+        crypto.randomFill(buffer, 2, (err: Error, buf: Buffer) => void {});
+        crypto.randomFill(buffer, 2, 3, (err: Error, buf: Buffer) => void {});
+
+        let arr: Uint8Array = new Uint8Array(10);
+        crypto.randomFillSync(arr);
+        crypto.randomFillSync(arr, 2);
+        crypto.randomFillSync(arr, 2, 3);
+
+        crypto.randomFill(arr, (err: Error, buf: Uint8Array) => void {});
+        crypto.randomFill(arr, 2, (err: Error, buf: Uint8Array) => void {});
+        crypto.randomFill(arr, 2, 3, (err: Error, buf: Uint8Array) => void {});
+    }
+}
+
+//////////////////////////////////////////////////
+/// TLS tests : http://nodejs.org/api/tls.html ///
+//////////////////////////////////////////////////
+
+namespace tls_tests {
+    {
+        var ctx: tls.SecureContext = tls.createSecureContext({
+            key: "NOT REALLY A KEY",
+            cert: "SOME CERTIFICATE",
+        });
+        var blah = ctx.context;
+
+        var connOpts: tls.ConnectionOptions = {
+            host: "127.0.0.1",
+            port: 55
+        };
+        var tlsSocket = tls.connect(connOpts);
+
+        const ciphers: string[] = tls.getCiphers();
+        const curve: string = tls.DEFAULT_ECDH_CURVE;
+    }
+
+    {
+        let _server: tls.Server;
+        let _boolean: boolean;
+        let _func1 = (err: Error, resp: Buffer) => { };
+        let _func2 = (err: Error, sessionData: any) => { };
+        /**
+         * events.EventEmitter
+         * 1. tlsClientError
+         * 2. newSession
+         * 3. OCSPRequest
+         * 4. resumeSession
+         * 5. secureConnection
+         */
+
+        _server = _server.addListener("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.addListener("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        });
+        _server = _server.addListener("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        });
+        _server = _server.addListener("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        });
+        _server = _server.addListener("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        let _err: Error;
+        let _tlsSocket: tls.TLSSocket;
+        let _any: any;
+        let _func: Function;
+        let _buffer: Buffer;
+        _boolean = _server.emit("tlsClientError", _err, _tlsSocket);
+        _boolean = _server.emit("newSession", _any, _any, _func1);
+        _boolean = _server.emit("OCSPRequest", _buffer, _buffer, _func);
+        _boolean = _server.emit("resumeSession", _any, _func2);
+        _boolean = _server.emit("secureConnection", _tlsSocket);
+
+        _server = _server.on("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.on("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        });
+        _server = _server.on("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        });
+        _server = _server.on("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        });
+        _server = _server.on("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        _server = _server.once("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.once("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        });
+        _server = _server.once("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        });
+        _server = _server.once("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        });
+        _server = _server.once("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        _server = _server.prependListener("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.prependListener("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        });
+        _server = _server.prependListener("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        });
+        _server = _server.prependListener("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        });
+        _server = _server.prependListener("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        _server = _server.prependOnceListener("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.prependOnceListener("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        });
+        _server = _server.prependOnceListener("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        });
+        _server = _server.prependOnceListener("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        });
+        _server = _server.prependOnceListener("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        // close callback parameter is optional
+        _server = _server.close();
+
+        // close callback parameter doesn't specify any arguments, so any
+        // function is acceptable
+        _server = _server.close(() => { });
+        _server = _server.close((...args: any[]) => { });
+    }
+
+    {
+        let _TLSSocket: tls.TLSSocket;
+        let _boolean: boolean;
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         */
+
+        _TLSSocket = _TLSSocket.addListener("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.addListener("secureConnect", () => { });
+
+        let _buffer: Buffer;
+        _boolean = _TLSSocket.emit("OCSPResponse", _buffer);
+        _boolean = _TLSSocket.emit("secureConnect");
+
+        _TLSSocket = _TLSSocket.on("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.on("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.once("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.once("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.prependListener("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.prependListener("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.prependOnceListener("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.prependOnceListener("secureConnect", () => { });
+    }
+}
+
+////////////////////////////////////////////////////
+/// Http tests : http://nodejs.org/api/http.html ///
+////////////////////////////////////////////////////
+
+namespace http_tests {
+    // http Server
+    {
+        var server: http.Server = new http.Server();
+
+        // test public props
+        const maxHeadersCount: number = server.maxHeadersCount;
+        const timeout: number = server.timeout;
+        const listening: boolean = server.listening;
+        const keepAliveTimeout: number = server.keepAliveTimeout;
+        server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
+    }
+
+    // http IncomingMessage
+    // http ServerResponse
+    {
+        // incoming
+        var incoming: http.IncomingMessage = new http.IncomingMessage(new net.Socket());
+
+        incoming.setEncoding('utf8');
+
+        // stream
+        incoming.pause();
+        incoming.resume();
+
+        // response
+        var res: http.ServerResponse = new http.ServerResponse(incoming);
+
+        // test headers
+        res.setHeader('Content-Type', 'text/plain');
+        var bool: boolean = res.hasHeader('Content-Type');
+        var headers: string[] = res.getHeaderNames();
+
+        // trailers
+        res.addTrailers([
+            ['x-fOo', 'xOxOxOx'],
+            ['x-foO', 'OxOxOxO'],
+            ['X-fOo', 'xOxOxOx'],
+            ['X-foO', 'OxOxOxO']
+        ]);
+        res.addTrailers({ 'x-foo': 'bar' });
+
+        // writeHead
+        res.writeHead(200, 'OK\r\nContent-Type: text/html\r\n');
+        res.writeHead(200, { 'Transfer-Encoding': 'chunked' });
+        res.writeHead(200);
+
+        // write string
+        res.write('Part of my res.');
+        // write buffer
+        const chunk = Buffer.alloc(16390, 'Й');
+        req.write(chunk);
+        res.write(chunk, 'hex');
+
+        // end
+        res.end("end msg");
+        // without msg
+        res.end();
+
+        // flush
+        res.flushHeaders();
+    }
+
+    // http ClientRequest
+    {
+        var req: http.ClientRequest = new http.ClientRequest("https://www.google.com");
+        var req: http.ClientRequest = new http.ClientRequest(new url.URL("https://www.google.com"));
+        var req: http.ClientRequest = new http.ClientRequest({ path: 'http://0.0.0.0' });
+
+        // header
+        req.setHeader('Content-Type', 'text/plain');
+        var bool: boolean = req.hasHeader('Content-Type');
+        var headers: string[] = req.getHeaderNames();
+        req.removeHeader('Date');
+
+        // write
+        const chunk = Buffer.alloc(16390, 'Й');
+        req.write(chunk);
+        req.write('a');
+        req.end();
+
+        // abort
+        req.abort();
+
+        // connection
+        req.connection.on('pause', () => { });
+
+        // event
+        req.on('data', () => { });
+    }
+
+    {
+        // Status codes
+        var codeMessage = http.STATUS_CODES['400'];
+        var codeMessage = http.STATUS_CODES[400];
+    }
+
+    {
+        var agent: http.Agent = new http.Agent({
+            keepAlive: true,
+            keepAliveMsecs: 10000,
+            maxSockets: Infinity,
+            maxFreeSockets: 256
+        });
+
+        var agent: http.Agent = http.globalAgent;
+
+        http.request({ agent: false });
+        http.request({ agent });
+        http.request({ agent: undefined });
+    }
+
+    {
+        http.request('http://www.example.com/xyz');
+    }
+
+    {
+        // Make sure .listen() and .close() return a Server instance
+        http.createServer().listen(0).close().address();
+        net.createServer().listen(0).close().address();
+    }
+
+    {
+        var request = http.request({ path: 'http://0.0.0.0' });
+        request.once('error', () => { });
+        request.setNoDelay(true);
+        request.abort();
+    }
+
+    // http request options
+    {
+        const requestOpts: http.RequestOptions = {
+            timeout: 30000
+        };
+
+        const clientArgs: http.ClientRequestArgs = {
+            timeout: 30000
+        };
+    }
+
+    // http headers
+    {
+        const headers: http.IncomingHttpHeaders = {
+            'content-type': 'application/json',
+            'set-cookie': [ 'type=ninja', 'language=javascript' ]
+        };
+    }
+}
+
+//////////////////////////////////////////////////////
+/// Https tests : http://nodejs.org/api/https.html ///
+//////////////////////////////////////////////////////
+
+namespace https_tests {
+    var agent: https.Agent = new https.Agent({
+        keepAlive: true,
+        keepAliveMsecs: 10000,
+        maxSockets: Infinity,
+        maxFreeSockets: 256,
+        maxCachedSessions: 100
+    });
+
+    var agent: https.Agent = https.globalAgent;
+
+    https.request({
+        agent: false
+    });
+    https.request({
+        agent
+    });
+    https.request({
+        agent: undefined
+    });
+
+    https.request('http://www.example.com/xyz');
+
+    {
+        const server = new https.Server();
+
+        const timeout: number = server.timeout;
+        const listening: boolean = server.listening;
+        const keepAliveTimeout: number = server.keepAliveTimeout;
+        server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
+    }
+}
+
+////////////////////////////////////////////////////
+/// TTY tests : http://nodejs.org/api/tty.html
+////////////////////////////////////////////////////
+
+namespace tty_tests {
+    let rs: tty.ReadStream;
+    let ws: tty.WriteStream;
+
+    let rsIsRaw: boolean = rs.isRaw;
+    rs.setRawMode(true);
+
+    let wsColumns: number = ws.columns;
+    let wsRows: number = ws.rows;
+
+    let isTTY: boolean = tty.isatty(1);
+}
+
+////////////////////////////////////////////////////
+/// Dgram tests : http://nodejs.org/api/dgram.html
+////////////////////////////////////////////////////
+
+namespace dgram_tests {
+    {
+        var ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
+        });
+        ds.bind();
+        ds.bind(41234);
+        ds.bind(4123, 'localhost');
+        ds.bind(4123, 'localhost', () => { });
+        ds.bind(4123, () => { });
+        ds.bind(() => { });
+        var ai: dgram.AddressInfo = ds.address();
+        ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
+        });
+        ds.send(new Buffer("hello"), 5000, "127.0.0.1");
+        ds.setMulticastInterface("127.0.0.1");
+        ds = dgram.createSocket({ type: "udp4", reuseAddr: true, recvBufferSize: 1000, sendBufferSize: 1000, lookup: dns.lookup });
+    }
+
+    {
+        let _socket: dgram.Socket;
+        let _boolean: boolean;
+        let _err: Error;
+        let _str: string;
+        let _rinfo: dgram.AddressInfo;
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         */
+
+        _socket = _socket.addListener("close", () => { });
+        _socket = _socket.addListener("error", (err) => {
+            let _err: Error = err;
+        });
+        _socket = _socket.addListener("listening", () => { });
+        _socket = _socket.addListener("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        });
+
+        _boolean = _socket.emit("close");
+        _boolean = _socket.emit("error", _err);
+        _boolean = _socket.emit("listening");
+        _boolean = _socket.emit("message", _str, _rinfo);
+
+        _socket = _socket.on("close", () => { });
+        _socket = _socket.on("error", (err) => {
+            let _err: Error = err;
+        });
+        _socket = _socket.on("listening", () => { });
+        _socket = _socket.on("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        });
+
+        _socket = _socket.once("close", () => { });
+        _socket = _socket.once("error", (err) => {
+            let _err: Error = err;
+        });
+        _socket = _socket.once("listening", () => { });
+        _socket = _socket.once("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        });
+
+        _socket = _socket.prependListener("close", () => { });
+        _socket = _socket.prependListener("error", (err) => {
+            let _err: Error = err;
+        });
+        _socket = _socket.prependListener("listening", () => { });
+        _socket = _socket.prependListener("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        });
+
+        _socket = _socket.prependOnceListener("close", () => { });
+        _socket = _socket.prependOnceListener("error", (err) => {
+            let _err: Error = err;
+        });
+        _socket = _socket.prependOnceListener("listening", () => { });
+        _socket = _socket.prependOnceListener("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        });
+    }
+
+    {
+        let ds: dgram.Socket = dgram.createSocket({
+            type: 'udp4',
+            recvBufferSize: 10000,
+            sendBufferSize: 15000
+        });
+
+        let size: number;
+        size = ds.getRecvBufferSize();
+        ds.setRecvBufferSize(size);
+        size = ds.getSendBufferSize();
+        ds.setSendBufferSize(size);
+    }
+}
+
+////////////////////////////////////////////////////
+/// Querystring tests : https://nodejs.org/api/querystring.html
+////////////////////////////////////////////////////
+
+namespace querystring_tests {
+    interface SampleObject { a: string; b: number; }
+
+    {
+        let obj: SampleObject;
+        let sep: string;
+        let eq: string;
+        let options: querystring.StringifyOptions;
+        let result: string;
+
+        result = querystring.stringify<SampleObject>(obj);
+        result = querystring.stringify<SampleObject>(obj, sep);
+        result = querystring.stringify<SampleObject>(obj, sep, eq);
+        result = querystring.stringify<SampleObject>(obj, sep, eq);
+        result = querystring.stringify<SampleObject>(obj, sep, eq, options);
+    }
+
+    {
+        let str: string;
+        let sep: string;
+        let eq: string;
+        let options: querystring.ParseOptions;
+        let result: SampleObject;
+
+        result = querystring.parse<SampleObject>(str);
+        result = querystring.parse<SampleObject>(str, sep);
+        result = querystring.parse<SampleObject>(str, sep, eq);
+        result = querystring.parse<SampleObject>(str, sep, eq, options);
+    }
+
+    {
+        let str: string;
+        let result: string;
+
+        result = querystring.escape(str);
+        result = querystring.unescape(str);
+    }
+}
+
+////////////////////////////////////////////////////
+/// path tests : http://nodejs.org/api/path.html
+////////////////////////////////////////////////////
+
+namespace path_tests {
+    path.normalize('/foo/bar//baz/asdf/quux/..');
+
+    path.join('/foo', 'bar', 'baz/asdf', 'quux', '..');
+    // returns
+    // '/foo/bar/baz/asdf'
+
+    try {
+        path.join('foo', 'bar');
+    } catch (error) { }
+
+    path.resolve('foo/bar', '/tmp/file/', '..', 'a/../subfile');
+    // Is similar to:
+    //
+    // cd foo/bar
+    // cd /tmp/file/
+    // cd ..
+    //    cd a/../subfile
+    // pwd
+
+    path.resolve('/foo/bar', './baz');
+    // returns
+    //    '/foo/bar/baz'
+
+    path.resolve('/foo/bar', '/tmp/file/');
+    // returns
+    //    '/tmp/file'
+
+    path.resolve('wwwroot', 'static_files/png/', '../gif/image.gif');
+    // if currently in /home/myself/node, it returns
+    //    '/home/myself/node/wwwroot/static_files/gif/image.gif'
+
+    path.isAbsolute('/foo/bar'); // true
+    path.isAbsolute('/baz/..');  // true
+    path.isAbsolute('qux/');     // false
+    path.isAbsolute('.');        // false
+
+    path.isAbsolute('//server');  // true
+    path.isAbsolute('C:/foo/..'); // true
+    path.isAbsolute('bar\\baz');   // false
+    path.isAbsolute('.');         // false
+
+    path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb');
+    // returns
+    //    '..\\..\\impl\\bbb'
+
+    path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb');
+    // returns
+    //    '../../impl/bbb'
+
+    path.dirname('/foo/bar/baz/asdf/quux');
+    // returns
+    //    '/foo/bar/baz/asdf'
+
+    path.basename('/foo/bar/baz/asdf/quux.html');
+    // returns
+    //    'quux.html'
+
+    path.basename('/foo/bar/baz/asdf/quux.html', '.html');
+    // returns
+    //    'quux'
+
+    path.extname('index.html');
+    // returns
+    //    '.html'
+
+    path.extname('index.coffee.md');
+    // returns
+    //    '.md'
+
+    path.extname('index.');
+    // returns
+    //    '.'
+
+    path.extname('index');
+    // returns
+    //    ''
+
+    'foo/bar/baz'.split(path.sep);
+    // returns
+    //        ['foo', 'bar', 'baz']
+
+    'foo\\bar\\baz'.split(path.sep);
+    // returns
+    //        ['foo', 'bar', 'baz']
+
+    process.env["PATH"]; // $ExpectType string
+
+    path.parse('/home/user/dir/file.txt');
+    // returns
+    //    {
+    //        root : "/",
+    //        dir : "/home/user/dir",
+    //        base : "file.txt",
+    //        ext : ".txt",
+    //        name : "file"
+    //    }
+
+    path.parse('C:\\path\\dir\\index.html');
+    // returns
+    //    {
+    //        root : "C:\",
+    //        dir : "C:\path\dir",
+    //        base : "index.html",
+    //        ext : ".html",
+    //        name : "index"
+    //    }
+
+    path.format({
+        root: "/",
+        dir: "/home/user/dir",
+        base: "file.txt",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.format({
+        root: "/",
+        dir: "/home/user/dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+}
+
+////////////////////////////////////////////////////
+/// readline tests : https://nodejs.org/api/readline.html
+////////////////////////////////////////////////////
+
+namespace readline_tests {
+    let rl: readline.ReadLine;
+
+    {
+        let options: readline.ReadLineOptions;
+        let input: NodeJS.ReadableStream;
+        let output: NodeJS.WritableStream;
+        let completer: readline.Completer;
+        let terminal: boolean;
+
+        let result: readline.ReadLine;
+
+        result = readline.createInterface(options);
+        result = readline.createInterface(input);
+        result = readline.createInterface(input, output);
+        result = readline.createInterface(input, output, completer);
+        result = readline.createInterface(input, output, completer, terminal);
+        result = readline.createInterface({
+            input,
+            completer(str: string): readline.CompleterResult {
+                return [['test'], 'test'];
+            }
+        });
+        result = readline.createInterface({
+            input,
+            completer(str: string, callback: (err: any, result: readline.CompleterResult) => void): any {
+                callback(null, [['test'], 'test']);
+            }
+        });
+    }
+
+    {
+        let prompt: string;
+
+        rl.setPrompt(prompt);
+    }
+
+    {
+        let preserveCursor: boolean;
+
+        rl.prompt();
+        rl.prompt(preserveCursor);
+    }
+
+    {
+        let query: string;
+        let callback: (answer: string) => void;
+
+        rl.question(query, callback);
+    }
+
+    {
+        let result: readline.ReadLine;
+
+        result = rl.pause();
+    }
+
+    {
+        let result: readline.ReadLine;
+
+        result = rl.resume();
+    }
+
+    {
+        rl.close();
+    }
+
+    {
+        let data: string | Buffer;
+        let key: readline.Key;
+
+        rl.write(data);
+        rl.write(null, key);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+        let x: number;
+        let y: number;
+
+        readline.cursorTo(stream, x);
+        readline.cursorTo(stream, x, y);
+    }
+
+    {
+        let stream: NodeJS.ReadableStream;
+        let readLineInterface: readline.ReadLine;
+
+        readline.emitKeypressEvents(stream);
+        readline.emitKeypressEvents(stream, readLineInterface);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+        let dx: number | string;
+        let dy: number | string;
+
+        readline.moveCursor(stream, dx, dy);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+        let dir: number;
+
+        readline.clearLine(stream, dir);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+
+        readline.clearScreenDown(stream);
+    }
+
+    {
+        let _rl: readline.ReadLine;
+        let _boolean: boolean;
+
+        _rl = _rl.addListener("close", () => { });
+        _rl = _rl.addListener("line", (input) => {
+            let _input: any = input;
+        });
+        _rl = _rl.addListener("pause", () => { });
+        _rl = _rl.addListener("resume", () => { });
+        _rl = _rl.addListener("SIGCONT", () => { });
+        _rl = _rl.addListener("SIGINT", () => { });
+        _rl = _rl.addListener("SIGTSTP", () => { });
+
+        _boolean = _rl.emit("close", () => { });
+        _boolean = _rl.emit("line", () => { });
+        _boolean = _rl.emit("pause", () => { });
+        _boolean = _rl.emit("resume", () => { });
+        _boolean = _rl.emit("SIGCONT", () => { });
+        _boolean = _rl.emit("SIGINT", () => { });
+        _boolean = _rl.emit("SIGTSTP", () => { });
+
+        _rl = _rl.on("close", () => { });
+        _rl = _rl.on("line", (input) => {
+            let _input: any = input;
+        });
+        _rl = _rl.on("pause", () => { });
+        _rl = _rl.on("resume", () => { });
+        _rl = _rl.on("SIGCONT", () => { });
+        _rl = _rl.on("SIGINT", () => { });
+        _rl = _rl.on("SIGTSTP", () => { });
+
+        _rl = _rl.once("close", () => { });
+        _rl = _rl.once("line", (input) => {
+            let _input: any = input;
+        });
+        _rl = _rl.once("pause", () => { });
+        _rl = _rl.once("resume", () => { });
+        _rl = _rl.once("SIGCONT", () => { });
+        _rl = _rl.once("SIGINT", () => { });
+        _rl = _rl.once("SIGTSTP", () => { });
+
+        _rl = _rl.prependListener("close", () => { });
+        _rl = _rl.prependListener("line", (input) => {
+            let _input: any = input;
+        });
+        _rl = _rl.prependListener("pause", () => { });
+        _rl = _rl.prependListener("resume", () => { });
+        _rl = _rl.prependListener("SIGCONT", () => { });
+        _rl = _rl.prependListener("SIGINT", () => { });
+        _rl = _rl.prependListener("SIGTSTP", () => { });
+
+        _rl = _rl.prependOnceListener("close", () => { });
+        _rl = _rl.prependOnceListener("line", (input) => {
+            let _input: any = input;
+        });
+        _rl = _rl.prependOnceListener("pause", () => { });
+        _rl = _rl.prependOnceListener("resume", () => { });
+        _rl = _rl.prependOnceListener("SIGCONT", () => { });
+        _rl = _rl.prependOnceListener("SIGINT", () => { });
+        _rl = _rl.prependOnceListener("SIGTSTP", () => { });
+    }
+}
+
+////////////////////////////////////////////////////
+/// string_decoder tests : https://nodejs.org/api/string_decoder.html
+////////////////////////////////////////////////////
+
+namespace string_decoder_tests {
+    const StringDecoder = string_decoder.StringDecoder;
+    const buffer = new Buffer('test');
+    const decoder1 = new StringDecoder();
+    const decoder2 = new StringDecoder('utf8');
+    const part1: string = decoder1.write(new Buffer('test'));
+    const end1: string = decoder1.end();
+    const part2: string = decoder2.write(new Buffer('test'));
+    const end2: string = decoder1.end(new Buffer('test'));
+}
+
+//////////////////////////////////////////////////////////////////////
+/// Child Process tests: https://nodejs.org/api/child_process.html ///
+//////////////////////////////////////////////////////////////////////
+
+namespace child_process_tests {
+    {
+        childProcess.exec("echo test");
+        childProcess.spawnSync("echo test");
+    }
+
+    {
+        childProcess.execFile("npm", () => {});
+        childProcess.execFile("npm", ["-v"], () => {});
+        childProcess.execFile("npm", ["-v"], { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", ["-v"], { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+        childProcess.execFile("npm", { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+    }
+
+    async function testPromisify() {
+        const execFile = util.promisify(childProcess.execFile);
+        let r: { stdout: string | Buffer, stderr: string | Buffer } = await execFile("npm");
+        r = await execFile("npm", ["-v"]);
+        r = await execFile("npm", ["-v"], { encoding: 'utf-8' });
+        r = await execFile("npm", ["-v"], { encoding: 'buffer' });
+        r = await execFile("npm", { encoding: 'utf-8' });
+        r = await execFile("npm", { encoding: 'buffer' });
+    }
+
+    {
+        let _cp: childProcess.ChildProcess;
+        let _socket: net.Socket;
+        let _server: net.Server;
+        let _boolean: boolean;
+
+        _boolean = _cp.send(1);
+        _boolean = _cp.send('one');
+        _boolean = _cp.send({
+            type: 'test'
+        });
+
+        _boolean = _cp.send(1, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send('one', (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, (error) => {
+            let _err: Error = error;
+        });
+
+        _boolean = _cp.send(1, _socket);
+        _boolean = _cp.send('one', _socket);
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket);
+
+        _boolean = _cp.send(1, _socket, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send('one', _socket, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket, (error) => {
+            let _err: Error = error;
+        });
+
+        _boolean = _cp.send(1, _socket, {
+            keepOpen: true
+        });
+        _boolean = _cp.send('one', _socket, {
+            keepOpen: true
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket, {
+                keepOpen: true
+            });
+
+        _boolean = _cp.send(1, _socket, {
+            keepOpen: true
+        }, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send('one', _socket, {
+            keepOpen: true
+        }, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket, {
+                keepOpen: true
+            }, (error) => {
+                let _err: Error = error;
+            });
+
+        _boolean = _cp.send(1, _server);
+        _boolean = _cp.send('one', _server);
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server);
+
+        _boolean = _cp.send(1, _server, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send('one', _server, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server, (error) => {
+            let _err: Error = error;
+        });
+
+        _boolean = _cp.send(1, _server, {
+            keepOpen: true
+        });
+        _boolean = _cp.send('one', _server, {
+            keepOpen: true
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server, {
+                keepOpen: true
+            });
+
+        _boolean = _cp.send(1, _server, {
+            keepOpen: true
+        }, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send('one', _server, {
+            keepOpen: true
+        }, (error) => {
+            let _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server, {
+                keepOpen: true
+            }, (error) => {
+                let _err: Error = error;
+            });
+
+        _cp = _cp.addListener("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.addListener("disconnect", () => { });
+        _cp = _cp.addListener("error", (err) => {
+            let _err: Error = err;
+        });
+        _cp = _cp.addListener("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.addListener("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _boolean = _cp.emit("close", () => { });
+        _boolean = _cp.emit("disconnect", () => { });
+        _boolean = _cp.emit("error", () => { });
+        _boolean = _cp.emit("exit", () => { });
+        _boolean = _cp.emit("message", () => { });
+
+        _cp = _cp.on("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.on("disconnect", () => { });
+        _cp = _cp.on("error", (err) => {
+            let _err: Error = err;
+        });
+        _cp = _cp.on("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.on("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _cp = _cp.once("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.once("disconnect", () => { });
+        _cp = _cp.once("error", (err) => {
+            let _err: Error = err;
+        });
+        _cp = _cp.once("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.once("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _cp = _cp.prependListener("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.prependListener("disconnect", () => { });
+        _cp = _cp.prependListener("error", (err) => {
+            let _err: Error = err;
+        });
+        _cp = _cp.prependListener("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.prependListener("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _cp = _cp.prependOnceListener("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.prependOnceListener("disconnect", () => { });
+        _cp = _cp.prependOnceListener("error", (err) => {
+            let _err: Error = err;
+        });
+        _cp = _cp.prependOnceListener("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        });
+        _cp = _cp.prependOnceListener("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+    }
+    {
+        process.stdin.setEncoding('utf8');
+
+        process.stdin.on('readable', () => {
+            const chunk = process.stdin.read();
+            if (chunk !== null) {
+              process.stdout.write(`data: ${chunk}`);
+            }
+        });
+
+        process.stdin.on('end', () => {
+            process.stdout.write('end');
+        });
+
+        process.stdin.pipe(process.stdout);
+
+        console.log(process.stdin.isTTY);
+        console.log(process.stdout.isTTY);
+
+        console.log(process.stdin instanceof net.Socket);
+        console.log(process.stdout instanceof fs.ReadStream);
+
+        var stdin: stream.Readable = process.stdin;
+        console.log(stdin instanceof net.Socket);
+        console.log(stdin instanceof fs.ReadStream);
+
+        var stdout: stream.Writable = process.stdout;
+        console.log(stdout instanceof net.Socket);
+        console.log(stdout instanceof fs.WriteStream);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+/// cluster tests: https://nodejs.org/api/cluster.html ///
+//////////////////////////////////////////////////////////////////////
+
+namespace cluster_tests {
+    {
+        cluster.fork();
+        Object.keys(cluster.workers).forEach(key => {
+            const worker = cluster.workers[key];
+            if (worker.isDead()) {
+                console.log('worker %d is dead', worker.process.pid);
+            }
+        });
+    }
+}
+
+////////////////////////////////////////////////////
+/// os tests : https://nodejs.org/api/os.html
+////////////////////////////////////////////////////
+
+namespace os_tests {
+    {
+        let result: string;
+
+        result = os.tmpdir();
+        result = os.homedir();
+        result = os.endianness();
+        result = os.hostname();
+        result = os.type();
+        result = os.arch();
+        result = os.release();
+        result = os.EOL;
+    }
+
+    {
+        let result: number;
+
+        result = os.uptime();
+        result = os.totalmem();
+        result = os.freemem();
+    }
+
+    {
+        let result: number[];
+
+        result = os.loadavg();
+    }
+
+    {
+        let result: os.CpuInfo[];
+
+        result = os.cpus();
+    }
+
+    {
+        let result: { [index: string]: os.NetworkInterfaceInfo[] };
+
+        result = os.networkInterfaces();
+    }
+
+    {
+        let result: number;
+
+        result = os.constants.signals.SIGHUP;
+        result = os.constants.signals.SIGINT;
+        result = os.constants.signals.SIGQUIT;
+        result = os.constants.signals.SIGILL;
+        result = os.constants.signals.SIGTRAP;
+        result = os.constants.signals.SIGABRT;
+        result = os.constants.signals.SIGIOT;
+        result = os.constants.signals.SIGBUS;
+        result = os.constants.signals.SIGFPE;
+        result = os.constants.signals.SIGKILL;
+        result = os.constants.signals.SIGUSR1;
+        result = os.constants.signals.SIGSEGV;
+        result = os.constants.signals.SIGUSR2;
+        result = os.constants.signals.SIGPIPE;
+        result = os.constants.signals.SIGALRM;
+        result = os.constants.signals.SIGTERM;
+        result = os.constants.signals.SIGCHLD;
+        result = os.constants.signals.SIGSTKFLT;
+        result = os.constants.signals.SIGCONT;
+        result = os.constants.signals.SIGSTOP;
+        result = os.constants.signals.SIGTSTP;
+        result = os.constants.signals.SIGTTIN;
+        result = os.constants.signals.SIGTTOU;
+        result = os.constants.signals.SIGURG;
+        result = os.constants.signals.SIGXCPU;
+        result = os.constants.signals.SIGXFSZ;
+        result = os.constants.signals.SIGVTALRM;
+        result = os.constants.signals.SIGPROF;
+        result = os.constants.signals.SIGWINCH;
+        result = os.constants.signals.SIGIO;
+        result = os.constants.signals.SIGPOLL;
+        result = os.constants.signals.SIGPWR;
+        result = os.constants.signals.SIGSYS;
+        result = os.constants.signals.SIGUNUSED;
+    }
+
+    {
+        let result: number;
+
+        result = os.constants.errno.E2BIG;
+        result = os.constants.errno.EACCES;
+        result = os.constants.errno.EADDRINUSE;
+        result = os.constants.errno.EADDRNOTAVAIL;
+        result = os.constants.errno.EAFNOSUPPORT;
+        result = os.constants.errno.EAGAIN;
+        result = os.constants.errno.EALREADY;
+        result = os.constants.errno.EBADF;
+        result = os.constants.errno.EBADMSG;
+        result = os.constants.errno.EBUSY;
+        result = os.constants.errno.ECANCELED;
+        result = os.constants.errno.ECHILD;
+        result = os.constants.errno.ECONNABORTED;
+        result = os.constants.errno.ECONNREFUSED;
+        result = os.constants.errno.ECONNRESET;
+        result = os.constants.errno.EDEADLK;
+        result = os.constants.errno.EDESTADDRREQ;
+        result = os.constants.errno.EDOM;
+        result = os.constants.errno.EDQUOT;
+        result = os.constants.errno.EEXIST;
+        result = os.constants.errno.EFAULT;
+        result = os.constants.errno.EFBIG;
+        result = os.constants.errno.EHOSTUNREACH;
+        result = os.constants.errno.EIDRM;
+        result = os.constants.errno.EILSEQ;
+        result = os.constants.errno.EINPROGRESS;
+        result = os.constants.errno.EINTR;
+        result = os.constants.errno.EINVAL;
+        result = os.constants.errno.EIO;
+        result = os.constants.errno.EISCONN;
+        result = os.constants.errno.EISDIR;
+        result = os.constants.errno.ELOOP;
+        result = os.constants.errno.EMFILE;
+        result = os.constants.errno.EMLINK;
+        result = os.constants.errno.EMSGSIZE;
+        result = os.constants.errno.EMULTIHOP;
+        result = os.constants.errno.ENAMETOOLONG;
+        result = os.constants.errno.ENETDOWN;
+        result = os.constants.errno.ENETRESET;
+        result = os.constants.errno.ENETUNREACH;
+        result = os.constants.errno.ENFILE;
+        result = os.constants.errno.ENOBUFS;
+        result = os.constants.errno.ENODATA;
+        result = os.constants.errno.ENODEV;
+        result = os.constants.errno.ENOENT;
+        result = os.constants.errno.ENOEXEC;
+        result = os.constants.errno.ENOLCK;
+        result = os.constants.errno.ENOLINK;
+        result = os.constants.errno.ENOMEM;
+        result = os.constants.errno.ENOMSG;
+        result = os.constants.errno.ENOPROTOOPT;
+        result = os.constants.errno.ENOSPC;
+        result = os.constants.errno.ENOSR;
+        result = os.constants.errno.ENOSTR;
+        result = os.constants.errno.ENOSYS;
+        result = os.constants.errno.ENOTCONN;
+        result = os.constants.errno.ENOTDIR;
+        result = os.constants.errno.ENOTEMPTY;
+        result = os.constants.errno.ENOTSOCK;
+        result = os.constants.errno.ENOTSUP;
+        result = os.constants.errno.ENOTTY;
+        result = os.constants.errno.ENXIO;
+        result = os.constants.errno.EOPNOTSUPP;
+        result = os.constants.errno.EOVERFLOW;
+        result = os.constants.errno.EPERM;
+        result = os.constants.errno.EPIPE;
+        result = os.constants.errno.EPROTO;
+        result = os.constants.errno.EPROTONOSUPPORT;
+        result = os.constants.errno.EPROTOTYPE;
+        result = os.constants.errno.ERANGE;
+        result = os.constants.errno.EROFS;
+        result = os.constants.errno.ESPIPE;
+        result = os.constants.errno.ESRCH;
+        result = os.constants.errno.ESTALE;
+        result = os.constants.errno.ETIME;
+        result = os.constants.errno.ETIMEDOUT;
+        result = os.constants.errno.ETXTBSY;
+        result = os.constants.errno.EWOULDBLOCK;
+        result = os.constants.errno.EXDEV;
+    }
+}
+
+////////////////////////////////////////////////////
+/// vm tests : https://nodejs.org/api/vm.html
+////////////////////////////////////////////////////
+
+namespace vm_tests {
+    {
+        const sandbox = {
+            animal: 'cat',
+            count: 2
+        };
+
+        const context = vm.createContext(sandbox);
+        console.log(vm.isContext(context));
+        const script = new vm.Script('count += 1; name = "kitty"');
+
+        for (let i = 0; i < 10; ++i) {
+            script.runInContext(context);
+        }
+
+        console.log(util.inspect(sandbox));
+
+        vm.runInNewContext('count += 1; name = "kitty"', sandbox);
+        console.log(util.inspect(sandbox));
+    }
+
+    {
+        const sandboxes = [{}, {}, {}];
+
+        const script = new vm.Script('globalVar = "set"');
+
+        sandboxes.forEach((sandbox) => {
+            script.runInNewContext(sandbox);
+            script.runInThisContext();
+        });
+
+        console.log(util.inspect(sandboxes));
+
+        var localVar = 'initial value';
+        vm.runInThisContext('localVar = "vm";');
+
+        console.log(localVar);
+    }
+
+    {
+        const Debug = vm.runInDebugContext('Debug');
+        Debug.scripts().forEach((script: any) => { console.log(script.name); });
+    }
+}
+
+/////////////////////////////////////////////////////
+/// Timers tests : https://nodejs.org/api/timers.html
+/////////////////////////////////////////////////////
+
+namespace timers_tests {
+    {
+        let immediateId = timers.setImmediate(() => { console.log("immediate"); });
+        timers.clearImmediate(immediateId);
+    }
+    {
+        let counter = 0;
+        let timeout = timers.setInterval(() => { console.log("interval"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearInterval(timeout);
+    }
+    {
+        let counter = 0;
+        let timeout = timers.setTimeout(() => { console.log("timeout"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearTimeout(timeout);
+    }
+    async function testPromisify() {
+        const setTimeout = util.promisify(timers.setTimeout);
+        let v: void = await setTimeout(100); // tslint:disable-line no-void-expression void-return
+        let s: string = await setTimeout(100, "");
+
+        const setImmediate = util.promisify(timers.setImmediate);
+        v = await setImmediate(); // tslint:disable-line no-void-expression
+        s = await setImmediate("");
+    }
+}
+
+/////////////////////////////////////////////////////////
+/// Errors Tests : https://nodejs.org/api/errors.html ///
+/////////////////////////////////////////////////////////
+
+namespace errors_tests {
+    {
+        Error.stackTraceLimit = Infinity;
+    }
+    {
+        const myObject = {};
+        Error.captureStackTrace(myObject);
+    }
+    {
+        let frames: NodeJS.CallSite[] = [];
+        Error.prepareStackTrace(new Error(), frames);
+    }
+    {
+        let frame: NodeJS.CallSite = null;
+        let frameThis: any = frame.getThis();
+        let typeName: string = frame.getTypeName();
+        let func: Function = frame.getFunction();
+        let funcName: string = frame.getFunctionName();
+        let meth: string = frame.getMethodName();
+        let fname: string = frame.getFileName();
+        let lineno: number = frame.getLineNumber();
+        let colno: number = frame.getColumnNumber();
+        let evalOrigin: string = frame.getEvalOrigin();
+        let isTop: boolean = frame.isToplevel();
+        let isEval: boolean = frame.isEval();
+        let isNative: boolean = frame.isNative();
+        let isConstr: boolean = frame.isConstructor();
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Process Tests : https://nodejs.org/api/process.html ///
+///////////////////////////////////////////////////////////
+
+import * as p from "process";
+namespace process_tests {
+    {
+        var eventEmitter: events.EventEmitter;
+        eventEmitter = process;                // Test that process implements EventEmitter...
+
+        var _p: NodeJS.Process = process;
+        _p = p;
+    }
+    {
+        assert(process.argv[0] === process.argv0);
+    }
+    {
+        var module: NodeModule | undefined;
+        module = process.mainModule;
+    }
+    {
+        process.on("message", (req: any) => { });
+        process.addListener("beforeExit", (code: number) => { });
+        process.once("disconnect", () => { });
+        process.prependListener("exit", (code: number) => { });
+        process.prependOnceListener("rejectionHandled", (promise: Promise<any>) => { });
+        process.on("uncaughtException", (error: Error) => { });
+        process.addListener("unhandledRejection", (reason: any, promise: Promise<any>) => { });
+        process.once("warning", (warning: Error) => { });
+        process.prependListener("message", (message: any, sendHandle: any) => { });
+        process.prependOnceListener("SIGBREAK", () => { });
+        process.on("newListener", (event: string | symbol, listener: Function) => { });
+        process.once("removeListener", (event: string | symbol, listener: Function) => { });
+
+        const listeners = process.listeners('uncaughtException');
+        const oldHandler = listeners[listeners.length - 1];
+        process.addListener('uncaughtException', oldHandler);
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Console Tests : https://nodejs.org/api/console.html ///
+///////////////////////////////////////////////////////////
+
+import * as c from "console";
+namespace console_tests {
+    {
+        var _c: Console = console;
+        _c = c;
+    }
+    {
+        var writeStream = fs.createWriteStream('./index.d.ts');
+        var consoleInstance = new console.Console(writeStream);
+    }
+}
+
+///////////////////////////////////////////////////
+/// Net Tests : https://nodejs.org/api/net.html ///
+///////////////////////////////////////////////////
+
+namespace net_tests {
+    {
+        const connectOpts: net.NetConnectOpts = {
+            allowHalfOpen: true,
+            family: 4,
+            host: "localhost",
+            port: 443,
+            timeout: 10E3
+        };
+        const socket: net.Socket = net.createConnection(connectOpts, (): void => {
+            // nothing
+        });
+    }
+
+    {
+        let server = net.createServer();
+        // Check methods which return server instances by chaining calls
+        server = server.listen(0)
+            .close()
+            .ref()
+            .unref();
+
+        // close has an optional callback function. No callback parameters are
+        // specified, so any callback function is permissible.
+        server = server.close((...args: any[]) => { });
+
+        // test the types of the address object fields
+        let address = server.address();
+        address.port = 1234;
+        address.family = "ipv4";
+        address.address = "127.0.0.1";
+    }
+
+    {
+        const constructorOpts: net.SocketConstructorOpts = {
+            fd: 1,
+            allowHalfOpen: false,
+            readable: false,
+            writable: false
+        };
+
+        /**
+         * net.Socket - events.EventEmitter
+         *   1. close
+         *   2. connect
+         *   3. data
+         *   4. drain
+         *   5. end
+         *   6. error
+         *   7. lookup
+         *   8. timeout
+         */
+        let _socket: net.Socket = new net.Socket(constructorOpts);
+
+        let bool: boolean;
+        let buffer: Buffer;
+        let error: Error;
+        let str: string;
+        let num: number;
+
+        let ipcConnectOpts: net.IpcSocketConnectOpts = {
+            path: "/"
+        };
+        let tcpConnectOpts: net.TcpSocketConnectOpts = {
+            family: 4,
+            hints: 0,
+            host: "localhost",
+            localAddress: "10.0.0.1",
+            localPort: 1234,
+            lookup: (_hostname: string, _options: dns.LookupOneOptions, _callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void => {
+                // nothing
+            },
+            port: 80
+        };
+        _socket = _socket.connect(ipcConnectOpts);
+        _socket = _socket.connect(ipcConnectOpts, (): void => {});
+        _socket = _socket.connect(tcpConnectOpts);
+        _socket = _socket.connect(tcpConnectOpts, (): void => {});
+        _socket = _socket.connect(80, "localhost");
+        _socket = _socket.connect(80, "localhost", (): void => {});
+        _socket = _socket.connect(80);
+        _socket = _socket.connect(80, (): void => {});
+
+        /// addListener
+
+        _socket = _socket.addListener("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.addListener("connect", () => { });
+        _socket = _socket.addListener("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.addListener("drain", () => { });
+        _socket = _socket.addListener("end", () => { });
+        _socket = _socket.addListener("error", err => {
+            error = err;
+        });
+        _socket = _socket.addListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.addListener("timeout", () => { });
+
+        /// emit
+        bool = _socket.emit("close", bool);
+        bool = _socket.emit("connect");
+        bool = _socket.emit("data", buffer);
+        bool = _socket.emit("drain");
+        bool = _socket.emit("end");
+        bool = _socket.emit("error", error);
+        bool = _socket.emit("lookup", error, str, str, str);
+        bool = _socket.emit("lookup", error, str, num, str);
+        bool = _socket.emit("timeout");
+
+        /// on
+        _socket = _socket.on("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.on("connect", () => { });
+        _socket = _socket.on("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.on("drain", () => { });
+        _socket = _socket.on("end", () => { });
+        _socket = _socket.on("error", err => {
+            error = err;
+        });
+        _socket = _socket.on("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.on("timeout", () => { });
+
+        /// once
+        _socket = _socket.once("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.once("connect", () => { });
+        _socket = _socket.once("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.once("drain", () => { });
+        _socket = _socket.once("end", () => { });
+        _socket = _socket.once("error", err => {
+            error = err;
+        });
+        _socket = _socket.once("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.once("timeout", () => { });
+
+        /// prependListener
+        _socket = _socket.prependListener("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.prependListener("connect", () => { });
+        _socket = _socket.prependListener("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.prependListener("drain", () => { });
+        _socket = _socket.prependListener("end", () => { });
+        _socket = _socket.prependListener("error", err => {
+            error = err;
+        });
+        _socket = _socket.prependListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.prependListener("timeout", () => { });
+
+        /// prependOnceListener
+        _socket = _socket.prependOnceListener("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.prependOnceListener("connect", () => { });
+        _socket = _socket.prependOnceListener("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.prependOnceListener("drain", () => { });
+        _socket = _socket.prependOnceListener("end", () => { });
+        _socket = _socket.prependOnceListener("error", err => {
+            error = err;
+        });
+        _socket = _socket.prependOnceListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.prependOnceListener("timeout", () => { });
+
+        bool = _socket.connecting;
+        bool = _socket.destroyed;
+        _socket.destroy();
+    }
+
+    {
+        /**
+         * net.Server - events.EventEmitter
+         *   1. close
+         *   2. connection
+         *   3. error
+         *   4. listening
+         */
+        let _server: net.Server;
+
+        let _socket: net.Socket;
+        let bool: boolean;
+        let error: Error;
+
+        /// addListener
+        _server = _server.addListener("close", () => { });
+        _server = _server.addListener("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.addListener("error", err => {
+            error = err;
+        });
+        _server = _server.addListener("listening", () => { });
+
+        /// emit
+        bool = _server.emit("close");
+        bool = _server.emit("connection", _socket);
+        bool = _server.emit("error", error);
+        bool = _server.emit("listening");
+
+        /// once
+        _server = _server.once("close", () => { });
+        _server = _server.once("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.once("error", err => {
+            error = err;
+        });
+        _server = _server.once("listening", () => { });
+
+        /// prependListener
+        _server = _server.prependListener("close", () => { });
+        _server = _server.prependListener("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.prependListener("error", err => {
+            error = err;
+        });
+        _server = _server.prependListener("listening", () => { });
+
+        /// prependOnceListener
+        _server = _server.prependOnceListener("close", () => { });
+        _server = _server.prependOnceListener("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.prependOnceListener("error", err => {
+            error = err;
+        });
+        _server = _server.prependOnceListener("listening", () => { });
+    }
+}
+
+/////////////////////////////////////////////////////
+/// repl Tests : https://nodejs.org/api/repl.html ///
+/////////////////////////////////////////////////////
+
+namespace repl_tests {
+    {
+        let _server: repl.REPLServer;
+        let _boolean: boolean;
+        let _ctx: any;
+
+        _server = _server.addListener("exit", () => { });
+        _server = _server.addListener("reset", () => { });
+
+        _boolean = _server.emit("exit", () => { });
+        _boolean = _server.emit("reset", _ctx);
+
+        _server = _server.on("exit", () => { });
+        _server = _server.on("reset", () => { });
+
+        _server = _server.once("exit", () => { });
+        _server = _server.once("reset", () => { });
+
+        _server = _server.prependListener("exit", () => { });
+        _server = _server.prependListener("reset", () => { });
+
+        _server = _server.prependOnceListener("exit", () => { });
+        _server = _server.prependOnceListener("reset", () => { });
+
+        _server.outputStream.write("test");
+        let line = _server.inputStream.read();
+
+        throw new repl.Recoverable(new Error("test"));
+    }
+}
+
+///////////////////////////////////////////////////
+/// DNS Tests : https://nodejs.org/api/dns.html ///
+///////////////////////////////////////////////////
+
+namespace dns_tests {
+    dns.lookup("nodejs.org", (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", 4, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", 6, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", {}, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup(
+        "nodejs.org",
+        {
+            family: 4,
+            hints: dns.ADDRCONFIG | dns.V4MAPPED,
+            all: false
+        },
+        (err, address, family) => {
+            const _err: NodeJS.ErrnoException = err;
+            const _address: string = address;
+            const _family: number = family;
+        }
+    );
+    dns.lookup("nodejs.org", { all: true }, (err, addresses) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: dns.LookupAddress[] = addresses;
+    });
+
+    function trueOrFalse(): boolean {
+        return Math.random() > 0.5 ? true : false;
+    }
+    dns.lookup("nodejs.org", { all: trueOrFalse() }, (err, addresses, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _addresses: string | dns.LookupAddress[] = addresses;
+        const _family: number | undefined = family;
+    });
+
+    dns.resolve("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "A", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "AAAA", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "MX", (err, addresses) => {
+        const _addresses: dns.MxRecord[] = addresses;
+    });
+
+    dns.resolve4("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve4("nodejs.org", { ttl: true }, (err, addresses) => {
+        const _addresses: dns.RecordWithTtl[] = addresses;
+    });
+    {
+        const ttl = false;
+        dns.resolve4("nodejs.org", { ttl }, (err, addresses) => {
+            const _addresses: string[] | dns.RecordWithTtl[] = addresses;
+        });
+    }
+
+    dns.resolve6("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve6("nodejs.org", { ttl: true }, (err, addresses) => {
+        const _addresses: dns.RecordWithTtl[] = addresses;
+    });
+    {
+        const ttl = false;
+        dns.resolve6("nodejs.org", { ttl }, (err, addresses) => {
+            const _addresses: string[] | dns.RecordWithTtl[] = addresses;
+        });
+    }
+}
+
+/*****************************************************************************
+ *                                                                           *
+ * The following tests are the modules not mentioned in document but existed *
+ *                                                                           *
+ *****************************************************************************/
+
+///////////////////////////////////////////////////////////
+/// Constants Tests                                     ///
+///////////////////////////////////////////////////////////
+
+import * as constants from 'constants';
+import { PerformanceObserver, PerformanceObserverCallback } from "perf_hooks";
+namespace constants_tests {
+    var str: string;
+    var num: number;
+    num = constants.SIGHUP;
+    num = constants.SIGINT;
+    num = constants.SIGQUIT;
+    num = constants.SIGILL;
+    num = constants.SIGTRAP;
+    num = constants.SIGABRT;
+    num = constants.SIGIOT;
+    num = constants.SIGBUS;
+    num = constants.SIGFPE;
+    num = constants.SIGKILL;
+    num = constants.SIGUSR1;
+    num = constants.SIGSEGV;
+    num = constants.SIGUSR2;
+    num = constants.SIGPIPE;
+    num = constants.SIGALRM;
+    num = constants.SIGTERM;
+    num = constants.SIGCHLD;
+    num = constants.SIGSTKFLT;
+    num = constants.SIGCONT;
+    num = constants.SIGSTOP;
+    num = constants.SIGTSTP;
+    num = constants.SIGTTIN;
+    num = constants.SIGTTOU;
+    num = constants.SIGURG;
+    num = constants.SIGXCPU;
+    num = constants.SIGXFSZ;
+    num = constants.SIGVTALRM;
+    num = constants.SIGPROF;
+    num = constants.SIGWINCH;
+    num = constants.SIGIO;
+    num = constants.SIGPOLL;
+    num = constants.SIGPWR;
+    num = constants.SIGSYS;
+    num = constants.SIGUNUSED;
+    num = constants.O_RDONLY;
+    num = constants.O_WRONLY;
+    num = constants.O_RDWR;
+    num = constants.S_IFMT;
+    num = constants.S_IFREG;
+    num = constants.S_IFDIR;
+    num = constants.S_IFCHR;
+    num = constants.S_IFBLK;
+    num = constants.S_IFIFO;
+    num = constants.S_IFLNK;
+    num = constants.S_IFSOCK;
+    num = constants.O_CREAT;
+    num = constants.O_EXCL;
+    num = constants.O_NOCTTY;
+    num = constants.O_TRUNC;
+    num = constants.O_APPEND;
+    num = constants.O_DIRECTORY;
+    num = constants.O_NOATIME;
+    num = constants.O_NOFOLLOW;
+    num = constants.O_SYNC;
+    num = constants.O_DSYNC;
+    num = constants.O_DIRECT;
+    num = constants.O_NONBLOCK;
+    num = constants.S_IRWXU;
+    num = constants.S_IRUSR;
+    num = constants.S_IWUSR;
+    num = constants.S_IXUSR;
+    num = constants.S_IRWXG;
+    num = constants.S_IRGRP;
+    num = constants.S_IWGRP;
+    num = constants.S_IXGRP;
+    num = constants.S_IRWXO;
+    num = constants.S_IROTH;
+    num = constants.S_IWOTH;
+    num = constants.S_IXOTH;
+    num = constants.F_OK;
+    num = constants.R_OK;
+    num = constants.W_OK;
+    num = constants.X_OK;
+    num = constants.SSL_OP_ALL;
+    num = constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
+    num = constants.SSL_OP_CIPHER_SERVER_PREFERENCE;
+    num = constants.SSL_OP_CISCO_ANYCONNECT;
+    num = constants.SSL_OP_COOKIE_EXCHANGE;
+    num = constants.SSL_OP_CRYPTOPRO_TLSEXT_BUG;
+    num = constants.SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+    num = constants.SSL_OP_EPHEMERAL_RSA;
+    num = constants.SSL_OP_LEGACY_SERVER_CONNECT;
+    num = constants.SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER;
+    num = constants.SSL_OP_MICROSOFT_SESS_ID_BUG;
+    num = constants.SSL_OP_MSIE_SSLV2_RSA_PADDING;
+    num = constants.SSL_OP_NETSCAPE_CA_DN_BUG;
+    num = constants.SSL_OP_NETSCAPE_CHALLENGE_BUG;
+    num = constants.SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG;
+    num = constants.SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG;
+    num = constants.SSL_OP_NO_COMPRESSION;
+    num = constants.SSL_OP_NO_QUERY_MTU;
+    num = constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
+    num = constants.SSL_OP_NO_SSLv2;
+    num = constants.SSL_OP_NO_SSLv3;
+    num = constants.SSL_OP_NO_TICKET;
+    num = constants.SSL_OP_NO_TLSv1;
+    num = constants.SSL_OP_NO_TLSv1_1;
+    num = constants.SSL_OP_NO_TLSv1_2;
+    num = constants.SSL_OP_PKCS1_CHECK_1;
+    num = constants.SSL_OP_PKCS1_CHECK_2;
+    num = constants.SSL_OP_SINGLE_DH_USE;
+    num = constants.SSL_OP_SINGLE_ECDH_USE;
+    num = constants.SSL_OP_SSLEAY_080_CLIENT_DH_BUG;
+    num = constants.SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG;
+    num = constants.SSL_OP_TLS_BLOCK_PADDING_BUG;
+    num = constants.SSL_OP_TLS_D5_BUG;
+    num = constants.SSL_OP_TLS_ROLLBACK_BUG;
+    num = constants.ENGINE_METHOD_RSA;
+    num = constants.ENGINE_METHOD_DSA;
+    num = constants.ENGINE_METHOD_DH;
+    num = constants.ENGINE_METHOD_RAND;
+    num = constants.ENGINE_METHOD_ECDH;
+    num = constants.ENGINE_METHOD_ECDSA;
+    num = constants.ENGINE_METHOD_CIPHERS;
+    num = constants.ENGINE_METHOD_DIGESTS;
+    num = constants.ENGINE_METHOD_STORE;
+    num = constants.ENGINE_METHOD_PKEY_METHS;
+    num = constants.ENGINE_METHOD_PKEY_ASN1_METHS;
+    num = constants.ENGINE_METHOD_ALL;
+    num = constants.ENGINE_METHOD_NONE;
+    num = constants.DH_CHECK_P_NOT_SAFE_PRIME;
+    num = constants.DH_CHECK_P_NOT_PRIME;
+    num = constants.DH_UNABLE_TO_CHECK_GENERATOR;
+    num = constants.DH_NOT_SUITABLE_GENERATOR;
+    num = constants.NPN_ENABLED;
+    num = constants.ALPN_ENABLED;
+    num = constants.RSA_PKCS1_PADDING;
+    num = constants.RSA_SSLV23_PADDING;
+    num = constants.RSA_NO_PADDING;
+    num = constants.RSA_PKCS1_OAEP_PADDING;
+    num = constants.RSA_X931_PADDING;
+    num = constants.RSA_PKCS1_PSS_PADDING;
+    num = constants.POINT_CONVERSION_COMPRESSED;
+    num = constants.POINT_CONVERSION_UNCOMPRESSED;
+    num = constants.POINT_CONVERSION_HYBRID;
+    str = constants.defaultCoreCipherList;
+    str = constants.defaultCipherList;
+}
+
+////////////////////////////////////////////////////
+/// v8 tests : https://nodejs.org/api/v8.html
+////////////////////////////////////////////////////
+
+namespace v8_tests {
+    const heapStats = v8.getHeapStatistics();
+    const heapSpaceStats = v8.getHeapSpaceStatistics();
+
+    const zapsGarbage: number = heapStats.does_zap_garbage;
+
+    v8.setFlagsFromString('--collect_maps');
+}
+
+////////////////////////////////////////////////////
+/// PerfHooks tests : https://nodejs.org/api/perf_hooks.html
+////////////////////////////////////////////////////
+namespace perf_hooks_tests {
+    perf_hooks.performance.mark('start');
+    (
+        () => {}
+    )();
+    perf_hooks.performance.mark('end');
+
+    const { duration } = perf_hooks.performance.getEntriesByName('discover')[0];
+    const timeOrigin = perf_hooks.performance.timeOrigin;
+
+    const performanceObserverCallback: PerformanceObserverCallback = (list, obs) => {
+        const {
+            duration,
+            entryType,
+            name,
+            startTime,
+        } = list.getEntries()[0];
+        obs.disconnect();
+        perf_hooks.performance.clearFunctions();
+    };
+    const obs = new perf_hooks.PerformanceObserver(performanceObserverCallback);
+    obs.observe({
+        entryTypes: ['function'],
+        buffered: true,
+    });
+}
+
+////////////////////////////////////////////////////
+/// AsyncHooks tests : https://nodejs.org/api/async_hooks.html
+////////////////////////////////////////////////////
+namespace async_hooks_tests {
+    const hooks: async_hooks.HookCallbacks = {
+        init() {},
+        before() {},
+        after() {},
+        destroy() {},
+        promiseResolve() {},
+    };
+
+    const asyncHook = async_hooks.createHook(hooks);
+
+    asyncHook.enable().disable().enable();
+
+    const tId: number = async_hooks.triggerAsyncId();
+    const eId: number = async_hooks.executionAsyncId();
+
+    class TestResource extends async_hooks.AsyncResource {
+        constructor() {
+            super('TEST_RESOURCE');
+        }
+    }
+
+    class AnotherTestResource extends async_hooks.AsyncResource {
+        constructor() {
+            super('TEST_RESOURCE', 42);
+            const aId: number = this.asyncId();
+            const tId: number = this.triggerAsyncId();
+        }
+        run() {
+            this.emitBefore();
+            this.emitAfter();
+        }
+        destroy() {
+            this.emitDestroy();
+        }
+    }
+}
+
+////////////////////////////////////////////////////
+/// zlib tests : http://nodejs.org/api/zlib.html ///
+////////////////////////////////////////////////////
+
+namespace zlib_tests {
+    {
+        const gzipped = zlib.gzipSync('test');
+        const unzipped = zlib.gunzipSync(gzipped.toString());
+    }
+
+    {
+        const deflate = zlib.deflateSync('test');
+        const inflate = zlib.inflateSync(deflate.toString());
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// HTTP/2 Tests                                        ///
+///////////////////////////////////////////////////////////
+
+namespace http2_tests {
+    // Headers & Settings
+    {
+        let headers: http2.OutgoingHttpHeaders = {
+            ':status': 200,
+            'content-type': 'text-plain',
+            ABC: ['has', 'more', 'than', 'one', 'value'],
+            undef: undefined
+        };
+
+        let settings: http2.Settings = {
+            headerTableSize: 0,
+            enablePush: true,
+            initialWindowSize: 0,
+            maxFrameSize: 0,
+            maxConcurrentStreams: 0,
+            maxHeaderListSize: 0
+        };
+    }
+
+    // Http2Session
+    {
+        let http2Session: http2.Http2Session;
+        let ee: events.EventEmitter = http2Session;
+
+        http2Session.on('close', () => {});
+        http2Session.on('connect', (session: http2.Http2Session, socket: net.Socket) => {});
+        http2Session.on('error', (err: Error) => {});
+        http2Session.on('frameError', (frameType: number, errorCode: number, streamID: number) => {});
+        http2Session.on('goaway', (errorCode: number, lastStreamID: number, opaqueData: Buffer) => {});
+        http2Session.on('localSettings', (settings: http2.Settings) => {});
+        http2Session.on('remoteSettings', (settings: http2.Settings) => {});
+        http2Session.on('stream', (stream: http2.Http2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
+        http2Session.on('socketError', (err: Error) => {});
+        http2Session.on('timeout', () => {});
+
+        http2Session.destroy();
+
+        let destroyed: boolean = http2Session.destroyed;
+        let pendingSettingsAck: boolean = http2Session.pendingSettingsAck;
+        let settings: http2.Settings = http2Session.localSettings;
+        settings = http2Session.remoteSettings;
+
+        let headers: http2.OutgoingHttpHeaders;
+        let options: http2.ClientSessionRequestOptions = {
+            endStream: true,
+            exclusive: true,
+            parent: 0,
+            weight: 0,
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {}
+        };
+        (http2Session as http2.ClientHttp2Session).request();
+        (http2Session as http2.ClientHttp2Session).request(headers);
+        (http2Session as http2.ClientHttp2Session).request(headers, options);
+
+        let stream: http2.Http2Stream;
+        http2Session.rstStream(stream);
+        http2Session.rstStream(stream, 0);
+
+        http2Session.setTimeout(100, () => {});
+
+        let shutdownOptions: http2.SessionShutdownOptions = {
+            graceful: true,
+            errorCode: 0,
+            lastStreamID: 0,
+            opaqueData: Buffer.from([])
+        };
+        shutdownOptions.opaqueData = Uint8Array.from([]);
+        http2Session.shutdown(shutdownOptions);
+        http2Session.shutdown(shutdownOptions, () => {});
+
+        let socket: net.Socket | tls.TLSSocket = http2Session.socket;
+        let state: http2.SessionState = http2Session.state;
+        state = {
+            effectiveLocalWindowSize: 0,
+            effectiveRecvDataLength: 0,
+            nextStreamID: 0,
+            localWindowSize: 0,
+            lastProcStreamID: 0,
+            remoteWindowSize: 0,
+            outboundQueueSize: 0,
+            deflateDynamicTableSize: 0,
+            inflateDynamicTableSize: 0
+        };
+
+        http2Session.priority(stream, {
+            exclusive: true,
+            parent: 0,
+            weight: 0,
+            silent: true
+        });
+
+        http2Session.settings(settings);
+    }
+
+    // Http2Stream
+    {
+        let http2Stream: http2.Http2Stream;
+        let duplex: stream.Duplex = http2Stream;
+
+        http2Stream.on('aborted', () => {});
+        http2Stream.on('error', (err: Error) => {});
+        http2Stream.on('frameError', (frameType: number, errorCode: number, streamID: number) => {});
+        http2Stream.on('streamClosed', (code: number) => {});
+        http2Stream.on('timeout', () => {});
+        http2Stream.on('trailers', (trailers: http2.IncomingHttpHeaders, flags: number) => {});
+
+        let aborted: boolean = http2Stream.aborted;
+        let destroyed: boolean = http2Stream.destroyed;
+
+        http2Stream.priority({
+            exclusive: true,
+            parent: 0,
+            weight: 0,
+            silent: true
+        });
+
+        let rstCode: number = http2Stream.rstCode;
+        http2Stream.rstStream(rstCode);
+        http2Stream.rstWithNoError();
+        http2Stream.rstWithProtocolError();
+        http2Stream.rstWithCancel();
+        http2Stream.rstWithRefuse();
+        http2Stream.rstWithInternalError();
+
+        let sesh: http2.Http2Session = http2Stream.session;
+
+        http2Stream.setTimeout(100, () => {});
+
+        let state: http2.StreamState = http2Stream.state;
+        state = {
+            localWindowSize: 0,
+            state: 0,
+            streamLocalClose: 0,
+            streamRemoteClose: 0,
+            sumDependencyWeight: 0,
+            weight: 0
+        };
+
+        // ClientHttp2Stream
+        let clientHttp2Stream: http2.ClientHttp2Stream;
+        clientHttp2Stream.on('headers', (headers: http2.IncomingHttpHeaders, flags: number) => {});
+        clientHttp2Stream.on('push', (headers: http2.IncomingHttpHeaders, flags: number) => {});
+        clientHttp2Stream.on('response', (headers: http2.IncomingHttpHeaders, flags: number) => {});
+
+        // ServerHttp2Stream
+        let serverHttp2Stream: http2.ServerHttp2Stream;
+        let headers: http2.OutgoingHttpHeaders;
+
+        serverHttp2Stream.additionalHeaders(headers);
+        let headerSent: boolean = serverHttp2Stream.headersSent;
+        let pushAllowed: boolean = serverHttp2Stream.pushAllowed;
+        serverHttp2Stream.pushStream(headers, (pushStream: http2.ServerHttp2Stream) => {});
+
+        let options: http2.ServerStreamResponseOptions = {
+            endStream: true,
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {}
+        };
+        serverHttp2Stream.respond();
+        serverHttp2Stream.respond(headers);
+        serverHttp2Stream.respond(headers, options);
+
+        let options2: http2.ServerStreamFileResponseOptions = {
+            statCheck: (stats: fs.Stats, headers: http2.OutgoingHttpHeaders, statOptions: http2.StatOptions) => {},
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {},
+            offset: 0,
+            length: 0
+        };
+        serverHttp2Stream.respondWithFD(0);
+        serverHttp2Stream.respondWithFD(0, headers);
+        serverHttp2Stream.respondWithFD(0, headers, options2);
+        serverHttp2Stream.respondWithFD(0, headers, {statCheck: () => false});
+        let options3: http2.ServerStreamFileResponseOptionsWithError = {
+            onError: (err: NodeJS.ErrnoException) => {},
+            statCheck: (stats: fs.Stats, headers: http2.OutgoingHttpHeaders, statOptions: http2.StatOptions) => {},
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {},
+            offset: 0,
+            length: 0
+        };
+        serverHttp2Stream.respondWithFile('');
+        serverHttp2Stream.respondWithFile('', headers);
+        serverHttp2Stream.respondWithFile('', headers, options3);
+        serverHttp2Stream.respondWithFile('', headers, {statCheck: () => false});
+    }
+
+    // Http2Server / Http2SecureServer
+    {
+        let http2Server: http2.Http2Server;
+        let http2SecureServer: http2.Http2SecureServer;
+        let s1: net.Server = http2Server;
+        let s2: tls.Server = http2SecureServer;
+        [http2Server, http2SecureServer].forEach((server) => {
+            server.on('sessionError', (err: Error) => {});
+            server.on('socketError', (err: Error) => {});
+            server.on('stream', (stream: http2.ServerHttp2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
+            server.on('request', (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => {});
+            server.on('timeout', () => {});
+        });
+
+        http2SecureServer.on('unknownProtocol', (socket: tls.TLSSocket) => {});
+    }
+
+    // Public API (except constants)
+    {
+        let settings: http2.Settings;
+        let serverOptions: http2.ServerOptions = {
+            maxDeflateDynamicTableSize: 0,
+            maxReservedRemoteStreams: 0,
+            maxSendHeaderBlockLength: 0,
+            paddingStrategy: 0,
+            peerMaxConcurrentStreams: 0,
+            selectPadding: (frameLen: number, maxFrameLen: number) => 0,
+            settings,
+            allowHTTP1: true
+        };
+        // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
+        let secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);
+        secureServerOptions.ca = '';
+        let onRequestHandler = (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => {
+            // Http2ServerRequest
+
+            let readable: stream.Readable = request;
+            let incomingHeaders: http2.IncomingHttpHeaders = request.headers;
+            incomingHeaders = request.trailers;
+            let httpVersion: string = request.httpVersion;
+            let method: string = request.method;
+            let rawHeaders: string[] = request.rawHeaders;
+            rawHeaders = request.rawTrailers;
+            let socket: net.Socket | tls.TLSSocket = request.socket;
+            let stream: http2.ServerHttp2Stream = request.stream;
+            let url: string = request.url;
+
+            request.setTimeout(0, () => {});
+            request.on('aborted', (hadError: boolean, code: number) => {});
+
+            // Http2ServerResponse
+
+            let outgoingHeaders: http2.OutgoingHttpHeaders;
+            response.addTrailers(outgoingHeaders);
+            socket = response.connection;
+            let finished: boolean = response.finished;
+            response.sendDate = true;
+            response.statusCode = 200;
+            response.statusMessage = '';
+            socket = response.socket;
+            stream = response.stream;
+
+            method = response.getHeader(':method');
+            let headers: string[] = response.getHeaderNames();
+            outgoingHeaders = response.getHeaders();
+            let hasMethod = response.hasHeader(':method');
+            response.removeHeader(':method');
+            response.setHeader(':method', 'GET');
+            response.setHeader(':status', 200);
+            response.setHeader('some-list', ['', '']);
+            let headersSent: boolean = response.headersSent;
+
+            response.setTimeout(0, () => {});
+            response.createPushResponse(outgoingHeaders, (err: Error | null, res: http2.Http2ServerResponse) => {});
+
+            response.writeContinue();
+            response.writeHead(200);
+            response.writeHead(200, outgoingHeaders);
+            response.writeHead(200, 'OK', outgoingHeaders);
+            response.writeHead(200, 'OK');
+            response.write('');
+            response.write('', (err: Error) => {});
+            response.write('', 'utf8');
+            response.write('', 'utf8', (err: Error) => {});
+            response.write(Buffer.from([]));
+            response.write(Buffer.from([]), (err: Error) => {});
+            response.write(Buffer.from([]), 'utf8');
+            response.write(Buffer.from([]), 'utf8', (err: Error) => {});
+            response.end();
+            response.end(() => {});
+            response.end('');
+            response.end('', () => {});
+            response.end('', 'utf8');
+            response.end('', 'utf8', () => {});
+            response.end(Buffer.from([]));
+            response.end(Buffer.from([]), () => {});
+            response.end(Buffer.from([]), 'utf8');
+            response.end(Buffer.from([]), 'utf8', () => {});
+
+            request.on('aborted', (hadError: boolean, code: number) => {});
+            request.on('close', () => {});
+            request.on('drain', () => {});
+            request.on('error', (error: Error) => {});
+            request.on('finish', () => {});
+        };
+
+        let http2Server: http2.Http2Server;
+        let http2SecureServer: http2.Http2SecureServer;
+
+        http2Server = http2.createServer();
+        http2Server = http2.createServer(serverOptions);
+        http2Server = http2.createServer(onRequestHandler);
+        http2Server = http2.createServer(serverOptions, onRequestHandler);
+
+        http2SecureServer = http2.createSecureServer();
+        http2SecureServer = http2.createSecureServer(secureServerOptions);
+        http2SecureServer = http2.createSecureServer(onRequestHandler);
+        http2SecureServer = http2.createSecureServer(secureServerOptions, onRequestHandler);
+
+        let clientSessionOptions: http2.ClientSessionOptions = {
+            maxDeflateDynamicTableSize: 0,
+            maxReservedRemoteStreams: 0,
+            maxSendHeaderBlockLength: 0,
+            paddingStrategy: 0,
+            peerMaxConcurrentStreams: 0,
+            selectPadding: (frameLen: number, maxFrameLen: number) => 0,
+            settings
+        };
+        // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
+        let secureClientSessionOptions: http2.SecureClientSessionOptions = Object.assign({}, clientSessionOptions);
+        secureClientSessionOptions.ca = '';
+        let onConnectHandler = (session: http2.Http2Session, socket: net.Socket) => {};
+
+        let clientHttp2Session: http2.ClientHttp2Session;
+
+        clientHttp2Session = http2.connect('');
+        clientHttp2Session = http2.connect('', onConnectHandler);
+        clientHttp2Session = http2.connect('', clientSessionOptions);
+        clientHttp2Session = http2.connect('', clientSessionOptions, onConnectHandler);
+        clientHttp2Session = http2.connect('', secureClientSessionOptions);
+        clientHttp2Session = http2.connect('', secureClientSessionOptions, onConnectHandler);
+
+        settings = http2.getDefaultSettings();
+        settings = http2.getPackedSettings(settings);
+        settings = http2.getUnpackedSettings(Buffer.from([]));
+        settings = http2.getUnpackedSettings(Uint8Array.from([]));
+    }
+
+    // constants
+    {
+        const constants = http2.constants;
+        let num: number;
+        let str: string;
+        num = constants.NGHTTP2_SESSION_SERVER;
+        num = constants.NGHTTP2_SESSION_CLIENT;
+        num = constants.NGHTTP2_STREAM_STATE_IDLE;
+        num = constants.NGHTTP2_STREAM_STATE_OPEN;
+        num = constants.NGHTTP2_STREAM_STATE_RESERVED_LOCAL;
+        num = constants.NGHTTP2_STREAM_STATE_RESERVED_REMOTE;
+        num = constants.NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL;
+        num = constants.NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE;
+        num = constants.NGHTTP2_STREAM_STATE_CLOSED;
+        num = constants.NGHTTP2_NO_ERROR;
+        num = constants.NGHTTP2_PROTOCOL_ERROR;
+        num = constants.NGHTTP2_INTERNAL_ERROR;
+        num = constants.NGHTTP2_FLOW_CONTROL_ERROR;
+        num = constants.NGHTTP2_SETTINGS_TIMEOUT;
+        num = constants.NGHTTP2_STREAM_CLOSED;
+        num = constants.NGHTTP2_FRAME_SIZE_ERROR;
+        num = constants.NGHTTP2_REFUSED_STREAM;
+        num = constants.NGHTTP2_CANCEL;
+        num = constants.NGHTTP2_COMPRESSION_ERROR;
+        num = constants.NGHTTP2_CONNECT_ERROR;
+        num = constants.NGHTTP2_ENHANCE_YOUR_CALM;
+        num = constants.NGHTTP2_INADEQUATE_SECURITY;
+        num = constants.NGHTTP2_HTTP_1_1_REQUIRED;
+        num = constants.NGHTTP2_ERR_FRAME_SIZE_ERROR;
+        num = constants.NGHTTP2_FLAG_NONE;
+        num = constants.NGHTTP2_FLAG_END_STREAM;
+        num = constants.NGHTTP2_FLAG_END_HEADERS;
+        num = constants.NGHTTP2_FLAG_ACK;
+        num = constants.NGHTTP2_FLAG_PADDED;
+        num = constants.NGHTTP2_FLAG_PRIORITY;
+        num = constants.DEFAULT_SETTINGS_HEADER_TABLE_SIZE;
+        num = constants.DEFAULT_SETTINGS_ENABLE_PUSH;
+        num = constants.DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE;
+        num = constants.DEFAULT_SETTINGS_MAX_FRAME_SIZE;
+        num = constants.MAX_MAX_FRAME_SIZE;
+        num = constants.MIN_MAX_FRAME_SIZE;
+        num = constants.MAX_INITIAL_WINDOW_SIZE;
+        num = constants.NGHTTP2_DEFAULT_WEIGHT;
+        num = constants.NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
+        num = constants.NGHTTP2_SETTINGS_ENABLE_PUSH;
+        num = constants.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
+        num = constants.NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
+        num = constants.NGHTTP2_SETTINGS_MAX_FRAME_SIZE;
+        num = constants.NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE;
+        num = constants.PADDING_STRATEGY_NONE;
+        num = constants.PADDING_STRATEGY_MAX;
+        num = constants.PADDING_STRATEGY_CALLBACK;
+        num = constants.HTTP_STATUS_CONTINUE;
+        num = constants.HTTP_STATUS_SWITCHING_PROTOCOLS;
+        num = constants.HTTP_STATUS_PROCESSING;
+        num = constants.HTTP_STATUS_OK;
+        num = constants.HTTP_STATUS_CREATED;
+        num = constants.HTTP_STATUS_ACCEPTED;
+        num = constants.HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION;
+        num = constants.HTTP_STATUS_NO_CONTENT;
+        num = constants.HTTP_STATUS_RESET_CONTENT;
+        num = constants.HTTP_STATUS_PARTIAL_CONTENT;
+        num = constants.HTTP_STATUS_MULTI_STATUS;
+        num = constants.HTTP_STATUS_ALREADY_REPORTED;
+        num = constants.HTTP_STATUS_IM_USED;
+        num = constants.HTTP_STATUS_MULTIPLE_CHOICES;
+        num = constants.HTTP_STATUS_MOVED_PERMANENTLY;
+        num = constants.HTTP_STATUS_FOUND;
+        num = constants.HTTP_STATUS_SEE_OTHER;
+        num = constants.HTTP_STATUS_NOT_MODIFIED;
+        num = constants.HTTP_STATUS_USE_PROXY;
+        num = constants.HTTP_STATUS_TEMPORARY_REDIRECT;
+        num = constants.HTTP_STATUS_PERMANENT_REDIRECT;
+        num = constants.HTTP_STATUS_BAD_REQUEST;
+        num = constants.HTTP_STATUS_UNAUTHORIZED;
+        num = constants.HTTP_STATUS_PAYMENT_REQUIRED;
+        num = constants.HTTP_STATUS_FORBIDDEN;
+        num = constants.HTTP_STATUS_NOT_FOUND;
+        num = constants.HTTP_STATUS_METHOD_NOT_ALLOWED;
+        num = constants.HTTP_STATUS_NOT_ACCEPTABLE;
+        num = constants.HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED;
+        num = constants.HTTP_STATUS_REQUEST_TIMEOUT;
+        num = constants.HTTP_STATUS_CONFLICT;
+        num = constants.HTTP_STATUS_GONE;
+        num = constants.HTTP_STATUS_LENGTH_REQUIRED;
+        num = constants.HTTP_STATUS_PRECONDITION_FAILED;
+        num = constants.HTTP_STATUS_PAYLOAD_TOO_LARGE;
+        num = constants.HTTP_STATUS_URI_TOO_LONG;
+        num = constants.HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE;
+        num = constants.HTTP_STATUS_RANGE_NOT_SATISFIABLE;
+        num = constants.HTTP_STATUS_EXPECTATION_FAILED;
+        num = constants.HTTP_STATUS_TEAPOT;
+        num = constants.HTTP_STATUS_MISDIRECTED_REQUEST;
+        num = constants.HTTP_STATUS_UNPROCESSABLE_ENTITY;
+        num = constants.HTTP_STATUS_LOCKED;
+        num = constants.HTTP_STATUS_FAILED_DEPENDENCY;
+        num = constants.HTTP_STATUS_UNORDERED_COLLECTION;
+        num = constants.HTTP_STATUS_UPGRADE_REQUIRED;
+        num = constants.HTTP_STATUS_PRECONDITION_REQUIRED;
+        num = constants.HTTP_STATUS_TOO_MANY_REQUESTS;
+        num = constants.HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE;
+        num = constants.HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS;
+        num = constants.HTTP_STATUS_INTERNAL_SERVER_ERROR;
+        num = constants.HTTP_STATUS_NOT_IMPLEMENTED;
+        num = constants.HTTP_STATUS_BAD_GATEWAY;
+        num = constants.HTTP_STATUS_SERVICE_UNAVAILABLE;
+        num = constants.HTTP_STATUS_GATEWAY_TIMEOUT;
+        num = constants.HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED;
+        num = constants.HTTP_STATUS_VARIANT_ALSO_NEGOTIATES;
+        num = constants.HTTP_STATUS_INSUFFICIENT_STORAGE;
+        num = constants.HTTP_STATUS_LOOP_DETECTED;
+        num = constants.HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED;
+        num = constants.HTTP_STATUS_NOT_EXTENDED;
+        num = constants.HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED;
+        str = constants.HTTP2_HEADER_STATUS;
+        str = constants.HTTP2_HEADER_METHOD;
+        str = constants.HTTP2_HEADER_AUTHORITY;
+        str = constants.HTTP2_HEADER_SCHEME;
+        str = constants.HTTP2_HEADER_PATH;
+        str = constants.HTTP2_HEADER_ACCEPT_CHARSET;
+        str = constants.HTTP2_HEADER_ACCEPT_ENCODING;
+        str = constants.HTTP2_HEADER_ACCEPT_LANGUAGE;
+        str = constants.HTTP2_HEADER_ACCEPT_RANGES;
+        str = constants.HTTP2_HEADER_ACCEPT;
+        str = constants.HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN;
+        str = constants.HTTP2_HEADER_AGE;
+        str = constants.HTTP2_HEADER_ALLOW;
+        str = constants.HTTP2_HEADER_AUTHORIZATION;
+        str = constants.HTTP2_HEADER_CACHE_CONTROL;
+        str = constants.HTTP2_HEADER_CONNECTION;
+        str = constants.HTTP2_HEADER_CONTENT_DISPOSITION;
+        str = constants.HTTP2_HEADER_CONTENT_ENCODING;
+        str = constants.HTTP2_HEADER_CONTENT_LANGUAGE;
+        str = constants.HTTP2_HEADER_CONTENT_LENGTH;
+        str = constants.HTTP2_HEADER_CONTENT_LOCATION;
+        str = constants.HTTP2_HEADER_CONTENT_MD5;
+        str = constants.HTTP2_HEADER_CONTENT_RANGE;
+        str = constants.HTTP2_HEADER_CONTENT_TYPE;
+        str = constants.HTTP2_HEADER_COOKIE;
+        str = constants.HTTP2_HEADER_DATE;
+        str = constants.HTTP2_HEADER_ETAG;
+        str = constants.HTTP2_HEADER_EXPECT;
+        str = constants.HTTP2_HEADER_EXPIRES;
+        str = constants.HTTP2_HEADER_FROM;
+        str = constants.HTTP2_HEADER_HOST;
+        str = constants.HTTP2_HEADER_IF_MATCH;
+        str = constants.HTTP2_HEADER_IF_MODIFIED_SINCE;
+        str = constants.HTTP2_HEADER_IF_NONE_MATCH;
+        str = constants.HTTP2_HEADER_IF_RANGE;
+        str = constants.HTTP2_HEADER_IF_UNMODIFIED_SINCE;
+        str = constants.HTTP2_HEADER_LAST_MODIFIED;
+        str = constants.HTTP2_HEADER_LINK;
+        str = constants.HTTP2_HEADER_LOCATION;
+        str = constants.HTTP2_HEADER_MAX_FORWARDS;
+        str = constants.HTTP2_HEADER_PREFER;
+        str = constants.HTTP2_HEADER_PROXY_AUTHENTICATE;
+        str = constants.HTTP2_HEADER_PROXY_AUTHORIZATION;
+        str = constants.HTTP2_HEADER_RANGE;
+        str = constants.HTTP2_HEADER_REFERER;
+        str = constants.HTTP2_HEADER_REFRESH;
+        str = constants.HTTP2_HEADER_RETRY_AFTER;
+        str = constants.HTTP2_HEADER_SERVER;
+        str = constants.HTTP2_HEADER_SET_COOKIE;
+        str = constants.HTTP2_HEADER_STRICT_TRANSPORT_SECURITY;
+        str = constants.HTTP2_HEADER_TRANSFER_ENCODING;
+        str = constants.HTTP2_HEADER_TE;
+        str = constants.HTTP2_HEADER_UPGRADE;
+        str = constants.HTTP2_HEADER_USER_AGENT;
+        str = constants.HTTP2_HEADER_VARY;
+        str = constants.HTTP2_HEADER_VIA;
+        str = constants.HTTP2_HEADER_WWW_AUTHENTICATE;
+        str = constants.HTTP2_HEADER_HTTP2_SETTINGS;
+        str = constants.HTTP2_HEADER_KEEP_ALIVE;
+        str = constants.HTTP2_HEADER_PROXY_CONNECTION;
+        str = constants.HTTP2_METHOD_ACL;
+        str = constants.HTTP2_METHOD_BASELINE_CONTROL;
+        str = constants.HTTP2_METHOD_BIND;
+        str = constants.HTTP2_METHOD_CHECKIN;
+        str = constants.HTTP2_METHOD_CHECKOUT;
+        str = constants.HTTP2_METHOD_CONNECT;
+        str = constants.HTTP2_METHOD_COPY;
+        str = constants.HTTP2_METHOD_DELETE;
+        str = constants.HTTP2_METHOD_GET;
+        str = constants.HTTP2_METHOD_HEAD;
+        str = constants.HTTP2_METHOD_LABEL;
+        str = constants.HTTP2_METHOD_LINK;
+        str = constants.HTTP2_METHOD_LOCK;
+        str = constants.HTTP2_METHOD_MERGE;
+        str = constants.HTTP2_METHOD_MKACTIVITY;
+        str = constants.HTTP2_METHOD_MKCALENDAR;
+        str = constants.HTTP2_METHOD_MKCOL;
+        str = constants.HTTP2_METHOD_MKREDIRECTREF;
+        str = constants.HTTP2_METHOD_MKWORKSPACE;
+        str = constants.HTTP2_METHOD_MOVE;
+        str = constants.HTTP2_METHOD_OPTIONS;
+        str = constants.HTTP2_METHOD_ORDERPATCH;
+        str = constants.HTTP2_METHOD_PATCH;
+        str = constants.HTTP2_METHOD_POST;
+        str = constants.HTTP2_METHOD_PRI;
+        str = constants.HTTP2_METHOD_PROPFIND;
+        str = constants.HTTP2_METHOD_PROPPATCH;
+        str = constants.HTTP2_METHOD_PUT;
+        str = constants.HTTP2_METHOD_REBIND;
+        str = constants.HTTP2_METHOD_REPORT;
+        str = constants.HTTP2_METHOD_SEARCH;
+        str = constants.HTTP2_METHOD_TRACE;
+        str = constants.HTTP2_METHOD_UNBIND;
+        str = constants.HTTP2_METHOD_UNCHECKOUT;
+        str = constants.HTTP2_METHOD_UNLINK;
+        str = constants.HTTP2_METHOD_UNLOCK;
+        str = constants.HTTP2_METHOD_UPDATE;
+        str = constants.HTTP2_METHOD_UPDATEREDIRECTREF;
+        str = constants.HTTP2_METHOD_VERSION_CONTROL;
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Inspector Tests                                     ///
+///////////////////////////////////////////////////////////
+
+namespace inspector_tests {
+    {
+        inspector.open();
+        inspector.open(0);
+        inspector.open(0, 'localhost');
+        inspector.open(0, 'localhost', true);
+        inspector.close();
+        const inspectorUrl: string = inspector.url();
+
+        const session = new inspector.Session();
+        session.connect();
+        session.disconnect();
+
+        // Unknown post method
+        session.post('A.b', { key: 'value' }, (err, params) => {});
+        // TODO: parameters are implicitly 'any' and need type annotation
+        session.post('A.b', (err: Error | null, params?: {}) => {});
+        session.post('A.b');
+        // Known post method
+        const parameter: inspector.Runtime.EvaluateParameterType = { expression: '2 + 2' };
+        session.post('Runtime.evaluate', parameter,
+            (err: Error, params: inspector.Runtime.EvaluateReturnType) => {});
+        session.post('Runtime.evaluate', (err: Error, params: inspector.Runtime.EvaluateReturnType) => {
+            const exceptionDetails: inspector.Runtime.ExceptionDetails = params.exceptionDetails;
+            const resultClassName: string = params.result.className;
+        });
+        session.post('Runtime.evaluate');
+
+        // General event
+        session.on('inspectorNotification', message => {
+            message; // $ExpectType InspectorNotification<{}>
+        });
+        // Known events
+        session.on('Debugger.paused', (message: inspector.InspectorNotification<inspector.Debugger.PausedEventDataType>) => {
+            const method: string = message.method;
+            const pauseReason: string = message.params.reason;
+        });
+        session.on('Debugger.resumed', () => {});
+    }
+}
+
+////////////////////////////////////////////////////
+/// module tests : http://nodejs.org/api/modules.html
+////////////////////////////////////////////////////
+
+namespace module_tests {
+    require.extensions[".ts"] = () => "";
+
+    Module.runMain();
+    const s: string = Module.wrap("some code");
+
+    const m1: Module = new Module("moduleId");
+    const m2: Module = new Module.Module("moduleId");
+}
+
+////////////////////////////////////////////////////
+/// Node.js ESNEXT Support
+////////////////////////////////////////////////////
+
+namespace esnext_string_tests {
+    const s: string = 'foo';
+    const s1: string = s.trimLeft();
+    const s2: string = s.trimRight();
+}
diff --git a/types/node/v8/tsconfig.json b/types/node/v8/tsconfig.json
new file mode 100644
index 0000000000..3f4614bef4
--- /dev/null
+++ b/types/node/v8/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "files": [
+        "index.d.ts",
+        "node-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "node": [
+                "node/v8"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/node/v8/tslint.json b/types/node/v8/tslint.json
new file mode 100644
index 0000000000..45064d266f
--- /dev/null
+++ b/types/node/v8/tslint.json
@@ -0,0 +1,26 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // All are TODOs
+    "ban-types": false,
+    "dt-header": false,
+    "max-line-length": false,
+    "no-any-union": false,
+    "no-duplicate-imports": false,
+    "no-duplicate-variable": false,
+    "no-empty-interface": false,
+    "no-inferrable-types": false,
+    "no-internal-module": false,
+    "no-namespace": false,
+    "no-redundant-jsdoc": false,
+    "no-redundant-jsdoc-2": false,
+    "no-unnecessary-class": false,
+    "no-unnecessary-generics": false,
+    "no-unnecessary-qualifier": false,
+    "no-var-keyword": false,
+    "prefer-const": false,
+    "prefer-method-signature": false,
+    "strict-export-declare-modifiers": false,
+    "unified-signatures": false
+  }
+}
diff --git a/types/node_redis/tslint.json b/types/node_redis/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/node_redis/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodegit/annotated-commit.d.ts b/types/nodegit/annotated-commit.d.ts
index 0fb5465647..2cfa461958 100644
--- a/types/nodegit/annotated-commit.d.ts
+++ b/types/nodegit/annotated-commit.d.ts
@@ -4,35 +4,16 @@ import { Reference } from './reference';
 
 export class AnnotatedCommit {
     /**
-     *
-     *
-     * @static
-     * @param {Repository} repo - repository that contains the given commit
-     * @param {string} branchName - name of the (remote) branch
-     * @param {string} remoteUrl - 	url of the remote
-     * @param {Oid} id - the commit object id of the remote branch
-     * @returns {Promise<AnnotatedCommit>}
-     *
-     * @memberof AnnotatedCommit
+     * @param repo - repository that contains the given commit
+     * @param branchName - name of the (remote) branch
+     * @param remoteUrl - 	url of the remote
+     * @param id - the commit object id of the remote branch
      */
     static fromFetchhead(repo: Repository, branchName: string, remoteUrl: string, id: Oid): Promise<AnnotatedCommit>;
     static fromRef(repo: Repository, ref: Reference): Promise<AnnotatedCommit>;
     static fromRevspec(repo: Repository, revspec: string): Promise<AnnotatedCommit>;
     static lookup(repo: Repository, id: Oid): Promise<AnnotatedCommit>;
 
-    /**
-     *
-     *
-     *
-     * @memberof AnnotatedCommit
-     */
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof AnnotatedCommit
-     */
     id(): Oid;
 }
diff --git a/types/nodegit/attr.d.ts b/types/nodegit/attr.d.ts
index c7b2d3ea22..a9c51ae8e2 100644
--- a/types/nodegit/attr.d.ts
+++ b/types/nodegit/attr.d.ts
@@ -10,64 +10,29 @@ export namespace Attr {
 }
 
 export class Attr {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {string} values
-     * @returns {number}
-     *
-     * @memberof Attr
-     */
     static addMacro(repo: Repository, name: string, values: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     *
-     * @memberof Attr
-     */
     static cacheFlush(repo: Repository): void;
     /**
-     *
-     *
-     * @static
-     * @param {Repository} repo - The repository containing the path.
-     * @param {number} flags - A combination of GIT_ATTR_CHECK... flags.
-     * @param {string} path - The path to check for attributes. Relative paths are interpreted relative to the repo root.
+     * @param repo - The repository containing the path.
+     * @param flags - A combination of GIT_ATTR_CHECK... flags.
+     * @param path - The path to check for attributes. Relative paths are interpreted relative to the repo root.
      * The file does not have to exist, but if it does not, then it will be treated as a plain file (not a directory).
-     * @param {string} name - The name of the attribute to look up.
-     * @returns {Promise<string>} - Output of the value of the attribute. Use the GIT_ATTR_...
-     *
-     * @memberof Attr
+     * @param name - The name of the attribute to look up.
+     * @returns - Output of the value of the attribute. Use the GIT_ATTR_...
      */
     static get(repo: Repository, flags: number, path: string, name: string): Promise<string>;
     /**
-     *
-     *
-     * @static
-     * @param {Repository} repo - The repository containing the path.
-     * @param {number} flags - A combination of GIT_ATTR_CHECK... flags.
-     * @param {string} path - The path to check for attributes. Relative paths are interpreted relative to the repo root.
+     * @param repo - The repository containing the path.
+     * @param flags - A combination of GIT_ATTR_CHECK... flags.
+     * @param path - The path to check for attributes. Relative paths are interpreted relative to the repo root.
      * The file does not have to exist, but if it does not, then it will be treated as a plain file (not a directory).
-     * @param {number} numAttr - The number of attributes being looked up
-     * @param {string} names - An array of num_attr strings containing attribute names.
-     * @returns {any[]}
-     *
-     * @memberof Attr
+     * @param numAttr - The number of attributes being looked up
+     * @param names - An array of num_attr strings containing attribute names.
      */
     static getMany(repo: Repository, flags: number, path: string, numAttr: number, names: string): any[];
     /**
-     *
-     *
-     * @static
-     * @param {string} attr - The attribute
-     * @returns {number}- the value type for the attribute
-     *
-     * @memberof Attr
+     * @param attr - The attribute
+     * @returns - the value type for the attribute
      */
     static value(attr: string): number;
 }
diff --git a/types/nodegit/blame-hunk.d.ts b/types/nodegit/blame-hunk.d.ts
index 83dd1cc410..58ab8e7191 100644
--- a/types/nodegit/blame-hunk.d.ts
+++ b/types/nodegit/blame-hunk.d.ts
@@ -2,60 +2,12 @@ import { Oid } from './oid';
 import { Signature } from './signature';
 
 export class BlameHunk {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameHunk
-     */
     linesInHunk: number;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof BlameHunk
-     */
     finalCommitId: Oid;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameHunk
-     */
     finalStartLineNumber: number;
-    /**
-     *
-     *
-     * @type {Signature}
-     * @memberof BlameHunk
-     */
     finalSignature: Signature;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof BlameHunk
-     */
     origCommitId: Oid;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof BlameHunk
-     */
     origPath: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameHunk
-     */
     origStartLineNumber: number;
-    /**
-     *
-     *
-     * @type {Signature}
-     * @memberof BlameHunk
-     */
     origSignature: Signature;
 }
diff --git a/types/nodegit/blame-options.d.ts b/types/nodegit/blame-options.d.ts
index 3505e7cf0a..1fdc6f6281 100644
--- a/types/nodegit/blame-options.d.ts
+++ b/types/nodegit/blame-options.d.ts
@@ -1,53 +1,12 @@
 import { Oid } from './oid';
 
 export class BlameOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameOptions
-     */
     flags?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameOptions
-     */
     minMatchCharacters?: number;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof BlameOptions
-     */
     newestCommit?: Oid;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof BlameOptions
-     */
     oldestCommit?: Oid;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameOptions
-     */
     minLine?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof BlameOptions
-     */
     maxLine?: number;
+    [key: string]: any;
 }
diff --git a/types/nodegit/blame.d.ts b/types/nodegit/blame.d.ts
index 79fc6a85b4..f88dda9477 100644
--- a/types/nodegit/blame.d.ts
+++ b/types/nodegit/blame.d.ts
@@ -17,68 +17,28 @@ export class Blame {
     /**
      * Retrieve the blame of a file
      *
-     * @static
-     * @param {Repository} repo - Repository that contains the file
-     * @param {string} path - to the file to get the blame of
-     * @param {BlameOptions} [options] - Options for the blame
-     * @returns {Blame}
-     *
-     * @memberof Blame
+     * @param repo - Repository that contains the file
+     * @param path - to the file to get the blame of
+     * @param [options] - Options for the blame
      */
     static file(repo: Repository, path: string, options?: BlameOptions): Blame;
     /**
-     *
-     *
-     * @static
-     * @param {BlameOptions} opts - The git_blame_options struct to initialize
-     * @param {number} version - Version of struct; pass GIT_BLAME_OPTIONS_VERSION
-     * @returns {number}
-     *
-     * @memberof Blame
+     * @param opts - The git_blame_options struct to initialize
+     * @param version - Version of struct; pass GIT_BLAME_OPTIONS_VERSION
      */
     static initOptions(opts: BlameOptions, version: number): number;
 
-    /**
-     *
-     *
-     * @param {string} buffer
-     * @param {number} bufferLen
-     * @returns {Promise<Blame>}
-     *
-     * @memberof Blame
-     */
     buffer(buffer: string, bufferLen: number): Promise<Blame>;
-    /**
-     *
-     *
-     *
-     * @memberof Blame
-     */
+
     free(): void;
     /**
-     *
-     *
-     * @param {number} index
-     * @returns {BlameHunk} - the hunk at the given index, or NULL on error
-     *
-     * @memberof Blame
+     * @returns - the hunk at the given index, or NULL on error
      */
     getHunkByIndex(index: number): BlameHunk;
     /**
-     *
-     *
-     * @param {number} lineNo
-     * @returns {BlameHunk} - 	the hunk that contains the given line, or NULL on error
-     *
-     * @memberof Blame
+     * @returns - the hunk that contains the given line, or NULL on error
      */
     getHunkByLine(lineNo: number): BlameHunk;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Blame
-     */
+
     getHunkCount(): number;
 }
diff --git a/types/nodegit/blob.d.ts b/types/nodegit/blob.d.ts
index edd0eb62f7..9d7320c935 100644
--- a/types/nodegit/blob.d.ts
+++ b/types/nodegit/blob.d.ts
@@ -5,153 +5,37 @@ import { Oid } from './oid';
 
 export class Blob {
     /**
-     *
-     *
-     * @static
-     * @param {Repository} repo - repository where to blob will be written
-     * @param {Buffer} buffer - data to be written into the blob
-     * @param {number} len - length of the data
-     * @returns {Oid} - return the id of the written blob
-     *
-     * @memberof Blob
+     * @param repo - repository where to blob will be written
+     * @param buffer - data to be written into the blob
+     * @param len - length of the data
+     * @returns - return the id of the written blob
      */
     static createFromBuffer(repo: Repository, buffer: Buffer, len: number): Oid;
     /**
-     *
-     *
-     * @static
-     * @param {Oid} id - return the id of the written blob
-     * @param {Repository} repo - repository where the blob will be written. this repository can be bare or not
-     * @param {string} path - file from which the blob will be created
-     * @returns {number}
-     *
-     * @memberof Blob
+     * @param id - return the id of the written blob
+     * @param repo - repository where the blob will be written. this repository can be bare or not
+     * @param path - file from which the blob will be created
      */
     static createFromDisk(id: Oid, repo: Repository, path: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} hintPath
-     * @returns {Promise<WriteStream>}
-     *
-     * @memberof Blob
-     */
     static createFromStream(repo: Repository, hintPath: string): Promise<WriteStream>;
     /**
-     *
-     *
-     * @static
-     * @param {Oid} id - return the id of the written blob
-     * @param {Repository} repo - repository where the blob will be written. this repository cannot be bare
-     * @param {string} relativePath - file from which the blob will be created, relative to the repository's working dir
-     * @returns {number} - 0 or an error code
-     *
-     * @memberof Blob
+     * @param id - return the id of the written blob
+     * @param repo - repository where the blob will be written. this repository cannot be bare
+     * @param relativePath - file from which the blob will be created, relative to the repository's working dir
+     * @returns - 0 or an error code
      */
     static createFromWorkdir(id: Oid, repo: Repository, relativePath: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {(string | Oid | Blob)} id
-     * @returns {Promise<Blob>}
-     *
-     * @memberof Blob
-     */
     static lookup(repo: Repository, id: string | Oid | Blob): Promise<Blob>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} id
-     * @param {number} len
-     * @returns {Promise<Blob>}
-     *
-     * @memberof Blob
-     */
     static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Blob>;
 
-    /**
-     *
-     *
-     *
-     * @memberof Blob
-     */
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Blob
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Blob
-     */
     isBinary(): number;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Blob
-     */
     owner(): Repository;
-    /**
-     *
-     *
-     * @returns {Buffer}
-     *
-     * @memberof Blob
-     */
     rawcontent(): Buffer;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Blob
-     */
     rawsize(): number;
-    /**
-     *
-     *
-     * @returns {Buffer}
-     *
-     * @memberof Blob
-     */
     content(): Buffer;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Blob
-     */
     toString(): string;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Blob
-     */
     filemode(): number;
-    /**
-     *
-     *
-     * @returns {Promise<Blob>}
-     *
-     * @memberof Blob
-     */
     dup(): Promise<Blob>;
 }
diff --git a/types/nodegit/branch.d.ts b/types/nodegit/branch.d.ts
index 47bd1ec76f..71dc35b020 100644
--- a/types/nodegit/branch.d.ts
+++ b/types/nodegit/branch.d.ts
@@ -12,116 +12,14 @@ export namespace Branch {
 }
 
 export class Branch {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} branchName
-     * @param {Commit} target
-     * @param {number} force
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Branch
-     */
     static create(repo: Repository, branchName: string, target: Commit, force: number): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repository
-     * @param {string} branchName
-     * @param {AnnotatedCommit} commit
-     * @param {number} force
-     * @returns {Reference}
-     *
-     * @memberof Branch
-     */
     static createFromAnnotated(repository: Repository, branchName: string, commit: AnnotatedCommit, force: number): Reference;
-    /**
-     *
-     *
-     * @static
-     * @param {Reference} branch
-     * @returns {number}
-     *
-     * @memberof Branch
-     */
     static delete(branch: Reference): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Reference} branch
-     * @returns {number}
-     *
-     * @memberof Branch
-     */
     static isHead(branch: Reference): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {number} listFlags
-     * @returns {Promise<any>}
-     *
-     * @memberof Branch
-     */
     static iteratorNew(repo: Repository, listFlags: number): Promise<any>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} branchName
-     * @param {Branch.BRANCH} branchType
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Branch
-     */
     static lookup(repo: Repository, branchName: string, branchType: Branch.BRANCH): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Reference} branch
-     * @param {string} newBranchName
-     * @param {number} force
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Branch
-     */
     static move(branch: Reference, newBranchName: string, force: number): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Reference} ref
-     * @returns {Promise<string>}
-     *
-     * @memberof Branch
-     */
     static name(ref: Reference): Promise<string>;
-    /**
-     *
-     *
-     * @static
-     * @param {Reference} branch
-     * @param {string} upstreamName
-     * @returns {Promise<number>}
-     *
-     * @memberof Branch
-     */
     static setUpstream(branch: Reference, upstreamName: string): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Reference} branch
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Branch
-     */
     static upstream(branch: Reference): Promise<Reference>;
 }
diff --git a/types/nodegit/buf.d.ts b/types/nodegit/buf.d.ts
index 380d76172b..5aefac72c8 100644
--- a/types/nodegit/buf.d.ts
+++ b/types/nodegit/buf.d.ts
@@ -1,67 +1,13 @@
 /// <reference types="node" />
 
 export class Buf {
-        /**
-         *
-         *
-         * @returns {number}
-         *
-         * @memberof Buf
-         */
-        containsNul(): number;
-        /**
-         *
-         *
-         *
-         * @memberof Buf
-         */
-        free(): void;
-        /**
-         *
-         *
-         * @param {number} targetSize
-         * @returns {Promise<Buf>}
-         *
-         * @memberof Buf
-         */
-        grow(targetSize: number): Promise<Buf>;
-        /**
-         *
-         *
-         * @returns {number}
-         *
-         * @memberof Buf
-         */
-        isBinary(): number;
-        /**
-         *
-         *
-         * @param {Buffer} data
-         * @param {number} datalen
-         * @returns {Promise<Buf>}
-         *
-         * @memberof Buf
-         */
-        set(data: Buffer, datalen: number): Promise<Buf>;
-        /**
-         *
-         *
-         * @type {string}
-         * @memberof Buf
-         */
-        ptr: string;
-        /**
-         *
-         *
-         * @type {number}
-         * @memberof Buf
-         */
-        asize: number;
-        /**
-         *
-         *
-         * @type {number}
-         * @memberof Buf
-         */
-        size: number;
-    }
+    containsNul(): number;
+
+    free(): void;
+    grow(targetSize: number): Promise<Buf>;
+    isBinary(): number;
+    set(data: Buffer, datalen: number): Promise<Buf>;
+    ptr: string;
+    asize: number;
+    size: number;
+}
diff --git a/types/nodegit/cert-host-key.d.ts b/types/nodegit/cert-host-key.d.ts
index f69210ca37..9932f66693 100644
--- a/types/nodegit/cert-host-key.d.ts
+++ b/types/nodegit/cert-host-key.d.ts
@@ -1,26 +1,8 @@
 import { Cert } from './cert';
 
 export class CertHostkey {
-    /**
-     *
-     *
-     * @type {Cert}
-     * @memberof CertHostkey
-     */
     parent: Cert;
     type: Cert.TYPE;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CertHostkey
-     */
     hashMd5: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CertHostkey
-     */
     hashSha1: string;
 }
diff --git a/types/nodegit/cert-x509.d.ts b/types/nodegit/cert-x509.d.ts
index dd395a755d..44f6d5a7ae 100644
--- a/types/nodegit/cert-x509.d.ts
+++ b/types/nodegit/cert-x509.d.ts
@@ -1,25 +1,7 @@
 import { Cert } from './cert';
 
 export class CertX509 {
-    /**
-     *
-     *
-     * @type {Buffer}
-     * @memberof CertX509
-     */
     data: Buffer;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CertX509
-     */
     len: number;
-    /**
-     *
-     *
-     * @type {Cert}
-     * @memberof CertX509
-     */
     parent: Cert;
 }
diff --git a/types/nodegit/cert.d.ts b/types/nodegit/cert.d.ts
index c368f83bb6..fde86569b9 100644
--- a/types/nodegit/cert.d.ts
+++ b/types/nodegit/cert.d.ts
@@ -13,11 +13,5 @@ export namespace Cert {
 }
 
 export class Cert {
-    /**
-     *
-     *
-     * @type {Cert.TYPE}
-     * @memberof Cert
-     */
     certType: Cert.TYPE;
 }
diff --git a/types/nodegit/checkout-options.d.ts b/types/nodegit/checkout-options.d.ts
index 253755d7fb..d711ae7ba9 100644
--- a/types/nodegit/checkout-options.d.ts
+++ b/types/nodegit/checkout-options.d.ts
@@ -3,144 +3,25 @@ import { Tree } from './tree';
 import { Index } from './index';
 
 export class CheckoutOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CheckoutOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CheckoutOptions
-     */
     checkoutStrategy?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CheckoutOptions
-     */
     disableFilters?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CheckoutOptions
-     */
     dirMode?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CheckoutOptions
-     */
     fileMode?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CheckoutOptions
-     */
     fileOpenFlags?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CheckoutOptions
-     */
     notifyFlags?: number;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof CheckoutOptions
-     */
     notifyCb?: any;
-    /**
-     *
-     *
-     * @type {undefined}
-     * @memberof CheckoutOptions
-     */
     notifyPayload?: undefined;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof CheckoutOptions
-     */
     progressCb?: any;
-    /**
-     *
-     *
-     * @type {undefined}
-     * @memberof CheckoutOptions
-     */
     progressPayload?: undefined;
-    /**
-     *
-     *
-     * @type {Strarray}
-     * @memberof CheckoutOptions
-     */
     paths?: Strarray;
-    /**
-     *
-     *
-     * @type {Tree}
-     * @memberof CheckoutOptions
-     */
     baseline?: Tree;
-    /**
-     *
-     *
-     * @type {Index}
-     * @memberof CheckoutOptions
-     */
     baselineIndex?: Index;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CheckoutOptions
-     */
     targetDirectory?: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CheckoutOptions
-     */
     ancestorLabel?: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CheckoutOptions
-     */
     ourLabel?: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CheckoutOptions
-     */
     theirLabel?: string;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof CheckoutOptions
-     */
     perfdataCb?: any;
-    /**
-     *
-     *
-     * @type {undefined}
-     * @memberof CheckoutOptions
-     */
     perfdataPayload?: undefined;
+    [key: string]: any;
 }
diff --git a/types/nodegit/checkout.d.ts b/types/nodegit/checkout.d.ts
index a6ce5ff991..c29dd2d220 100644
--- a/types/nodegit/checkout.d.ts
+++ b/types/nodegit/checkout.d.ts
@@ -46,48 +46,16 @@ export namespace Checkout {
 export class Checkout {
     /**
      * Patch head checkout to automatically coerce objects.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {CheckoutOptions} [options]
-     * @returns {Promise<void>}
-     *
-     * @memberof Checkout
      */
     static head(repo: Repository, options?: CheckoutOptions): Promise<void>;
     /**
      * Patch index checkout to automatically coerce objects.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Index} The
-     * @param {CheckoutOptions} [options]
-     * @returns {Promise<void>}
-     *
-     * @memberof Checkout
      */
     static index(repo: Repository, The: Index, options?: CheckoutOptions): Promise<void>;
-    /**
-     *
-     *
-     * @static
-     * @param {CheckoutOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Checkout
-     */
+
     static initOptions(opts: CheckoutOptions, version: number): number;
     /**
      * Patch tree checkout to automatically coerce objects.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {(Oid | Tree | Commit | Reference)} treeish
-     * @param {CheckoutOptions} [options]
-     * @returns {Promise<void>}
-     *
-     * @memberof Checkout
      */
     static tree(repo: Repository, treeish: Oid | Tree | Commit | Reference, options?: CheckoutOptions): Promise<void>;
 }
diff --git a/types/nodegit/cherry-pick-options.d.ts b/types/nodegit/cherry-pick-options.d.ts
index 5e91da0c55..cde3c0a345 100644
--- a/types/nodegit/cherry-pick-options.d.ts
+++ b/types/nodegit/cherry-pick-options.d.ts
@@ -2,32 +2,8 @@ import { MergeOptions } from './merge-options';
 import { CheckoutOptions } from './checkout-options';
 
 export interface CherrypickOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CherrypickOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CherrypickOptions
-     */
     mainline?: number;
-    /**
-     *
-     *
-     * @type {MergeOptions}
-     * @memberof CherrypickOptions
-     */
     mergeOpts?: MergeOptions;
-    /**
-     *
-     *
-     * @type {CheckoutOptions}
-     * @memberof CherrypickOptions
-     */
     checkoutOpts?: CheckoutOptions;
 }
diff --git a/types/nodegit/cherry-pick.d.ts b/types/nodegit/cherry-pick.d.ts
index b895845301..168de79e3b 100644
--- a/types/nodegit/cherry-pick.d.ts
+++ b/types/nodegit/cherry-pick.d.ts
@@ -6,39 +6,11 @@ import { CherrypickOptions } from './cherry-pick-options';
 export class Cherrypick {
     /**
      * Cherrypick a commit and, changing the index and working directory
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Commit} commit
-     * @param {CherrypickOptions} [options]
-     * @returns {Promise<number>}
-     *
-     * @memberof Cherrypick
      */
     static cherrypick(repo: Repository, commit: Commit, options?: CherrypickOptions): Promise<number>;
     /**
      * Cherrypicks the given commit against "our" commit, producing an index that reflects the result of the cherrypick. The index is not backed by a repo.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Commit} cherrypickCommit
-     * @param {Commit} ourCommit
-     * @param {number} mainline
-     * @param {MergeOptions} [mergeOptions]
-     * @returns {Promise<number>}
-     *
-     * @memberof Cherrypick
      */
     static commit(repo: Repository, cherrypickCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions?: MergeOptions): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {CherrypickOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Cherrypick
-     */
     static initOptions(opts: CherrypickOptions, version: number): number;
 }
diff --git a/types/nodegit/clone-options.d.ts b/types/nodegit/clone-options.d.ts
index 424a289cbe..8535b28c81 100644
--- a/types/nodegit/clone-options.d.ts
+++ b/types/nodegit/clone-options.d.ts
@@ -2,60 +2,12 @@ import { CheckoutOptions } from './checkout-options';
 import { FetchOptions } from './fetch-options';
 
 export class CloneOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CloneOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {CheckoutOptions}
-     * @memberof CloneOptions
-     */
     checkoutOpts?: CheckoutOptions;
-    /**
-     *
-     *
-     * @type {FetchOptions}
-     * @memberof CloneOptions
-     */
     fetchOpts?: FetchOptions;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CloneOptions
-     */
     bare?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CloneOptions
-     */
     local?: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CloneOptions
-     */
     checkoutBranch?: string;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof CloneOptions
-     */
     repositoryCbPayload?: any;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof CloneOptions
-     */
     remoteCbPayload?: any;
 }
diff --git a/types/nodegit/clone.d.ts b/types/nodegit/clone.d.ts
index 7fe3b00a37..15933d4124 100644
--- a/types/nodegit/clone.d.ts
+++ b/types/nodegit/clone.d.ts
@@ -13,25 +13,8 @@ export namespace Clone {
 export class Clone {
     /**
      * Patch repository cloning to automatically coerce objects.
-     *
-     * @static
-     * @param {string} url
-     * @param {string} localPath
-     * @param {CloneOptions} [options]
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Clone
      */
     static clone(url: string, localPath: string, options?: CloneOptions): Promise<Repository>;
-    /**
-     *
-     *
-     * @static
-     * @param {CloneOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Clone
-     */
+
     static initOptions(opts: CloneOptions, version: number): number;
 }
diff --git a/types/nodegit/commit.d.ts b/types/nodegit/commit.d.ts
index 59928817a6..5c9a82bf70 100644
--- a/types/nodegit/commit.d.ts
+++ b/types/nodegit/commit.d.ts
@@ -10,288 +10,66 @@ import { TreeEntry } from './tree-entry';
 import { Diff } from './diff';
 
 export class Commit {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} updateRef
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {string} messageEncoding
-     * @param {string} message
-     * @param {Tree} tree
-     * @param {number} parentCount
-     * @param {any[]} parents
-     * @returns {Oid}
-     *
-     * @memberof Commit
-     */
     static create(repo: Repository, updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree, parentCount: number, parents: any[]): Oid;
-    /**
-     *
-     *
-     * @static
-     * @param {Oid} id
-     * @param {Repository} repo
-     * @param {string} updateRef
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {string} messageEncoding
-     * @param {string} message
-     * @param {Tree} tree
-     * @param {number} parentCount
-     * @returns {number}
-     *
-     * @memberof Commit
-     */
     static createV(id: Oid, repo: Repository, updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree, parentCount: number): number;
     /**
      * Retrieves the commit pointed to by the oid
      *
-     * @static
-     * @param {Repository} repo
-     * @param {(string | Oid | Commit)} id
-     * @returns {Promise<Commit>}
      *
-     * @memberof Commit
      */
     static lookup(repo: Repository, id: string | Oid | Commit): Promise<Commit>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} id
-     * @param {number} len
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Commit
-     */
     static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Commit>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} commitContent
-     * @param {string} signature
-     * @param {string} signatureField
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Commit
-     */
     static createWithSignature(repo: Repository, commitContent: string, signature: string, signatureField: string): Promise<Oid>;
 
-    /**
-     *
-     *
-     * @param {string} updateRef
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {string} messageEncoding
-     * @param {string} message
-     * @param {Tree} tree
-     * @returns {Oid}
-     *
-     * @memberof Commit
-     */
     amend(updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree): Oid;
-    /**
-     *
-     *
-     * @returns {Signature}
-     *
-     * @memberof Commit
-     */
     author(): Signature;
-    /**
-     *
-     *
-     * @returns {Signature}
-     *
-     * @memberof Commit
-     */
     committer(): Signature;
-    /**
-     *
-     *
-     *
-     * @memberof Commit
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @param {string} field
-     * @returns {Promise<Buf>}
-     *
-     * @memberof Commit
-     */
     headerField(field: string): Promise<Buf>;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Commit
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Commit
-     */
     message(): string;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Commit
-     */
     messageEncoding(): string;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Commit
-     */
     messageRaw(): string;
-    /**
-     *
-     *
-     * @param {number} n
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Commit
-     */
     nthGenAncestor(n: number): Promise<Commit>;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Commit
-     */
     owner(): Repository;
-    /**
-     *
-     *
-     * @param {number} n
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Commit
-     */
     parent(n: number): Promise<Commit>;
-    /**
-     *
-     *
-     * @param {number} n
-     * @returns {Oid}
-     *
-     * @memberof Commit
-     */
     parentId(n: number): Oid;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Commit
-     */
     parentcount(): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Commit
-     */
     rawHeader(): string;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Commit
-     */
     summary(): string;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Commit
-     */
     time(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Commit
-     */
     timeOffset(): number;
-    /**
-     *
-     *
-     * @param {Tree} treeOut
-     * @returns {number}
-     *
-     * @memberof Commit
-     */
     tree(treeOut: Tree): number;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Commit
-     */
     treeId(): Oid;
     /**
      * Retrieve the SHA.
      *
-     * @returns {string}
      *
-     * @memberof Commit
      */
     sha(): string;
     /**
      * Retrieve the commit time as a unix timestamp.
      *
-     * @returns {number}
      *
-     * @memberof Commit
      */
     timeMs(): number;
     /**
      * Retrieve the commit time as a Date object.
      *
-     * @returns {Date}
      *
-     * @memberof Commit
      */
     date(): Date;
     /**
      * Get the tree associated with this commit.
      *
-     * @returns {Promise<Tree>}
      *
-     * @memberof Commit
      */
     getTree(): Promise<Tree>;
     /**
      * Retrieve the entry represented by path for this commit. Path must be relative to repository root.
      *
-     * @param {string} path
-     * @returns {Promise<TreeEntry>}
      *
-     * @memberof Commit
      */
     getEntry(path: string): Promise<TreeEntry>;
     /**
@@ -299,71 +77,44 @@ export class Commit {
      * An EventEmitter is returned that will emit a "commit" event for each commit in the history, and one "end"
      * event when the walk is completed. Don't forget to call start() on the returned event.
      *
-     * @returns {EventEmitter}
      *
-     * @memberof Commit
      */
     history(): EventEmitter;
     /**
      * Retrieve the commit's parents as commit objects.
      *
-     * @param {number} limit
-     * @param {Function} callback
-     * @returns {Promise<Commit[]>}
      *
-     * @memberof Commit
      */
-    getParents(limit: number, callback: Function): Promise<Commit[]>;
+    getParents(limit: number, callback?: Function): Promise<Commit[]>;
     /**
      * Retrieve the commit's parent shas.
      *
-     * @param {Function} callback
-     * @returns {Oid[]}
      *
-     * @memberof Commit
      */
-    parents(callback: Function): Oid[];
+    parents(): Oid[];
     /**
      * Generate an array of diff trees showing changes between this commit and its parent(s).
      *
-     * @param {Function} callback
-     * @returns {Promise<Diff[]>}
      *
-     * @memberof Commit
      */
-    getDiff(callback: Function): Promise<Diff[]>;
+    getDiff(callback?: Function): Promise<Diff[]>;
     /**
      * Generate an array of diff trees showing changes between this commit and its parent(s).
      *
-     * @param {Object} options
-     * @param {Function} callback
-     * @returns {Promise<Diff[]>}
      *
-     * @memberof Commit
      */
-    getDiffWithOptions(options: Object, callback: Function): Promise<Diff[]>;
+    getDiffWithOptions(options: Object, callback?: Function): Promise<Diff[]>;
     /**
      * The sha of this commit
      *
-     * @returns {string}
      *
-     * @memberof Commit
      */
     toString(): string;
-    /**
-     *
-     *
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Commit
-     */
     dup(): Promise<Commit>;
     /**
      * consists of a summary
      *
-     * @returns {string}
      *
-     * @memberof Commit
      */
     body(): string;
 }
diff --git a/types/nodegit/config.d.ts b/types/nodegit/config.d.ts
index eea13c6c70..f03ea23922 100644
--- a/types/nodegit/config.d.ts
+++ b/types/nodegit/config.d.ts
@@ -12,80 +12,13 @@ export namespace Config {
 }
 
 export class Config {
-    /**
-     *
-     *
-     * @static
-     * @returns {Promise<Config>}
-     *
-     * @memberof Config
-     */
     static openDefault(): Promise<Config>;
-    /**
-     *
-     *
-     * @static
-     * @returns {Promise<Buf>}
-     *
-     * @memberof Config
-     */
     static findProgramdata(): Promise<Buf>;
 
-    /**
-     *
-     *
-     * @param {string} name
-     * @returns {Promise<Buf>}
-     *
-     * @memberof Config
-     */
     getStringBuf(name: string): Promise<Buf>;
-    /**
-     *
-     *
-     * @param {string} name
-     * @param {number} value
-     * @returns {number}
-     *
-     * @memberof Config
-     */
     setInt64(name: string, value: number): number;
-    /**
-     *
-     *
-     * @param {string} name
-     * @param {string} regexp
-     * @param {string} value
-     * @returns {number}
-     *
-     * @memberof Config
-     */
     setMultivar(name: string, regexp: string, value: string): number;
-    /**
-     *
-     *
-     * @param {string} name
-     * @param {string} value
-     * @returns {Promise<number>}
-     *
-     * @memberof Config
-     */
     setString(name: string, value: string): Promise<number>;
-    /**
-     *
-     *
-     * @returns {Promise<Config>}
-     *
-     * @memberof Config
-     */
     snapshot(): Promise<Config>;
-    /**
-     *
-     *
-     * @param {*} transaction
-     * @returns {number}
-     *
-     * @memberof Config
-     */
     lock(transaction: any): number;
 }
diff --git a/types/nodegit/convenient-hunk.d.ts b/types/nodegit/convenient-hunk.d.ts
new file mode 100644
index 0000000000..a844fd4e9b
--- /dev/null
+++ b/types/nodegit/convenient-hunk.d.ts
@@ -0,0 +1,37 @@
+import { DiffLine } from './diff-line';
+
+export class ConvenientHunk {
+    /**
+     * Diff header string that represents the context of this hunk
+     * of the diff. Something like `@@ -169,14 +167,12 @@ ...`
+     */
+    header(): string;
+    /**
+     * The length of the header
+     */
+    headerLen(): number;
+    /**
+     * The lines in this hunk
+     */
+    lines(): Promise<DiffLine[]>;
+    /**
+     * The number of new lines in the hunk
+     */
+    newLines(): number;
+    /**
+     * The starting offset of the first new line in the file
+     */
+    newStart(): number;
+    /**
+     * The number of old lines in the hunk
+     */
+    oldLines(): number;
+    /**
+     * The starting offset of the first old line in the file
+     */
+    oldStart(): number;
+    /**
+     * Number of lines in this hunk
+     */
+    size(): number;
+}
diff --git a/types/nodegit/convenient-patch.d.ts b/types/nodegit/convenient-patch.d.ts
index 5d3a9fd03f..05fa0def4f 100644
--- a/types/nodegit/convenient-patch.d.ts
+++ b/types/nodegit/convenient-patch.d.ts
@@ -1,140 +1,73 @@
+import { ConvenientHunk } from './convenient-hunk';
 import { DiffFile } from './diff-file';
 
 export class ConvenientPatch {
     /**
      * Old attributes of the file
-     *
-     * @returns {DiffFile}
-     *
-     * @memberof ConvenientPatch
      */
     oldFile(): DiffFile;
     /**
      * New attributes of the file
-     *
-     * @returns {DiffFile}
-     *
-     * @memberof ConvenientPatch
      */
     newFile(): DiffFile;
     /**
      * The number of hunks in this patch
-     *
-     * @returns {number}
-     *
-     * @memberof ConvenientPatch
      */
     size(): number;
     /**
      * The hunks in this patch
-     *
-     * @returns {Promise<any[]>}
-     *
-     * @memberof ConvenientPatch
      */
-    hunks(): Promise<any[]>;
+    hunks(): Promise<ConvenientHunk[]>;
     /**
      * The status of this patch (unmodified, added, deleted)
-     *
-     * @returns {number}
-     *
-     * @memberof ConvenientPatch
      */
     status(): number;
     /**
      * The line statistics of this patch (#contexts, #added, #deleted)
-     *
-     * @returns {*}
-     *
-     * @memberof ConvenientPatch
      */
     lineStats(): any;
     /**
      * Is this an unmodified patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isUnmodified(): boolean;
     /**
      * Is this an added patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isAdded(): boolean;
     /**
      * Is this a deleted patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isDeleted(): boolean;
     /**
-     * Is this an modified patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
+     * Is this an modified patch
      */
     isModified(): boolean;
     /**
      * Is this a renamed patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isRenamed(): boolean;
     /**
      * Is this a copied patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isCopied(): boolean;
     /**
      * Is this an ignored patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isIgnored(): boolean;
     /**
      * Is this an untracked patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isUntracked(): boolean;
     /**
      * Is this a type change?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isTypeChange(): boolean;
     /**
      * Is this an undreadable patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isUnreadable(): boolean;
     /**
      * Is this a conflicted patch?
-     *
-     * @returns {boolean}
-     *
-     * @memberof ConvenientPatch
      */
     isConflicted(): boolean;
 }
diff --git a/types/nodegit/cred-user-pass-payload.d.ts b/types/nodegit/cred-user-pass-payload.d.ts
index fdf65b9342..95beeb9f3a 100644
--- a/types/nodegit/cred-user-pass-payload.d.ts
+++ b/types/nodegit/cred-user-pass-payload.d.ts
@@ -1,16 +1,4 @@
 export class CredUserpassPayload {
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CredUserpassPayload
-     */
     username: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CredUserpassPayload
-     */
     password: string;
 }
diff --git a/types/nodegit/cred-username.d.ts b/types/nodegit/cred-username.d.ts
index 2522b3968a..d7b619eb5d 100644
--- a/types/nodegit/cred-username.d.ts
+++ b/types/nodegit/cred-username.d.ts
@@ -1,18 +1,6 @@
 import { Cred } from './cred';
 
 export class CredUsername {
-    /**
-     *
-     *
-     * @type {Cred}
-     * @memberof CredUsername
-     */
     parent: Cred;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CredUsername
-     */
     username: string;
 }
diff --git a/types/nodegit/cred.d.ts b/types/nodegit/cred.d.ts
index d7b96c9fd8..160f62f903 100644
--- a/types/nodegit/cred.d.ts
+++ b/types/nodegit/cred.d.ts
@@ -11,86 +11,14 @@ export namespace Cred {
 }
 
 export class Cred {
-    /**
-     *
-     *
-     * @static
-     * @returns {Cred}
-     *
-     * @memberof Cred
-     */
     static defaultNew(): Cred;
-    /**
-     *
-     *
-     * @static
-     * @param {string} username
-     * @returns {Cred}
-     *
-     * @memberof Cred
-     */
     static sshKeyFromAgent(username: string): Cred;
-    /**
-     *
-     *
-     * @static
-     * @param {string} username
-     * @param {string} publicKey
-     * @param {string} privateKey
-     * @param {string} passphrase
-     * @returns {Promise<Cred>}
-     *
-     * @memberof Cred
-     */
     static sshKeyMemoryNew(username: string, publicKey: string, privateKey: string, passphrase: string): Promise<Cred>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} username
-     * @param {string} publicKey
-     * @param {string} privateKey
-     * @param {string} passphrase
-     * @returns {Cred}
-     *
-     * @memberof Cred
-     */
     static sshKeyNew(username: string, publicKey: string, privateKey: string, passphrase: string): Cred;
-    /**
-     *
-     *
-     * @static
-     * @param {string} username
-     * @returns {Promise<Cred>}
-     *
-     * @memberof Cred
-     */
     static usernameNew(username: string): Promise<Cred>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} username
-     * @param {string} password
-     * @returns {Cred}
-     *
-     * @memberof Cred
-     */
     static userpassPlaintextNew(username: string, password: string): Cred;
 
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Cred
-     */
     hasUsername(): number;
-    /**
-     *
-     *
-     *
-     * @memberof Cred
-     */
+
     free(): void;
 }
diff --git a/types/nodegit/cvar-map.d.ts b/types/nodegit/cvar-map.d.ts
index 2a5665dc6b..f7c4b227d0 100644
--- a/types/nodegit/cvar-map.d.ts
+++ b/types/nodegit/cvar-map.d.ts
@@ -1,23 +1,5 @@
 export class CvarMap {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CvarMap
-     */
     cvarType: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof CvarMap
-     */
     strMatch: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof CvarMap
-     */
     mapValue: number;
 }
diff --git a/types/nodegit/describe-format-options.d.ts b/types/nodegit/describe-format-options.d.ts
index 3f1989f0dd..b4213f0d68 100644
--- a/types/nodegit/describe-format-options.d.ts
+++ b/types/nodegit/describe-format-options.d.ts
@@ -1,30 +1,7 @@
 export class DescribeFormatOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeFormatOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeFormatOptions
-     */
     abbreviatedSize?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeFormatOptions
-     */
     alwaysUseLongFormat?: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof DescribeFormatOptions
-     */
     dirtySuffix?: string;
+    [key: string]: any;
 }
diff --git a/types/nodegit/describe-options.d.ts b/types/nodegit/describe-options.d.ts
index 1a7518cd76..2934006a93 100644
--- a/types/nodegit/describe-options.d.ts
+++ b/types/nodegit/describe-options.d.ts
@@ -1,44 +1,9 @@
 export class DescribeOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeOptions
-     */
     maxCandidatesTags?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeOptions
-     */
     describeStrategy?: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof DescribeOptions
-     */
     pattern?: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeOptions
-     */
     onlyFollowFirstParent?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DescribeOptions
-     */
     showCommitOidAsFallback?: number;
+    [key: string]: any;
 }
diff --git a/types/nodegit/diff-binary-file.d.ts b/types/nodegit/diff-binary-file.d.ts
index 9774b99b87..46b67f406e 100644
--- a/types/nodegit/diff-binary-file.d.ts
+++ b/types/nodegit/diff-binary-file.d.ts
@@ -1,30 +1,6 @@
 export class DiffBinaryFile {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffBinaryFile
-     */
     type: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof DiffBinaryFile
-     */
     data: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffBinaryFile
-     */
     datalen: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffBinaryFile
-     */
     inflatedlen: number;
 }
diff --git a/types/nodegit/diff-binary.d.ts b/types/nodegit/diff-binary.d.ts
index f447510165..d5f7c6fd99 100644
--- a/types/nodegit/diff-binary.d.ts
+++ b/types/nodegit/diff-binary.d.ts
@@ -9,25 +9,7 @@ export namespace DiffBinary {
 }
 
 export class DiffBinary {
-    /**
-     *
-     *
-     * @type {DiffBinaryFile}
-     * @memberof DiffBinary
-     */
     oldFile: DiffBinaryFile;
-    /**
-     *
-     *
-     * @type {DiffBinaryFile}
-     * @memberof DiffBinary
-     */
     newFile: DiffBinaryFile;
-    /**
-     *
-     *
-     * @type {DiffBinary.DIFF_BINARY}
-     * @memberof DiffBinary
-     */
     containsData: DiffBinary.DIFF_BINARY;
 }
diff --git a/types/nodegit/diff-delta.d.ts b/types/nodegit/diff-delta.d.ts
index b09226c064..c21d98f430 100644
--- a/types/nodegit/diff-delta.d.ts
+++ b/types/nodegit/diff-delta.d.ts
@@ -1,46 +1,10 @@
 import { DiffFile } from './diff-file';
 
 export class DiffDelta {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffDelta
-     */
     status: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffDelta
-     */
     flags: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffDelta
-     */
     similarity: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffDelta
-     */
     nfiles: number;
-    /**
-     *
-     *
-     * @type {DiffFile}
-     * @memberof DiffDelta
-     */
     oldFile: DiffFile;
-    /**
-     *
-     *
-     * @type {DiffFile}
-     * @memberof DiffDelta
-     */
     newFile: DiffFile;
 }
diff --git a/types/nodegit/diff-file.d.ts b/types/nodegit/diff-file.d.ts
index 7602f0dba9..9f418ccd16 100644
--- a/types/nodegit/diff-file.d.ts
+++ b/types/nodegit/diff-file.d.ts
@@ -3,42 +3,22 @@ import { Oid } from './oid';
 export class DiffFile {
     /**
      * Returns the file's flags
-     *
-     * @returns {number}
-     *
-     * @memberof DiffFile
      */
     flags(): number;
     /**
      * Returns the file's Oid
-     *
-     * @returns {Oid}
-     *
-     * @memberof DiffFile
      */
     id(): Oid;
     /**
      * Returns the file's mode
-     *
-     * @returns {number}
-     *
-     * @memberof DiffFile
      */
     mode(): number;
     /**
      * Returns the file's path
-     *
-     * @returns {string}
-     *
-     * @memberof DiffFile
      */
     path(): string;
     /**
      * Returns the file's size
-     *
-     * @returns {number}
-     *
-     * @memberof DiffFile
      */
     size(): number;
 }
diff --git a/types/nodegit/diff-hunk.d.ts b/types/nodegit/diff-hunk.d.ts
deleted file mode 100644
index 1a522ae8c6..0000000000
--- a/types/nodegit/diff-hunk.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-export class DiffHunk {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffHunk
-     */
-    oldStart: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffHunk
-     */
-    oldLines: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffHunk
-     */
-    newStart: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffHunk
-     */
-    newLines: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffHunk
-     */
-    headerLen: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof DiffHunk
-     */
-    header: string;
-}
diff --git a/types/nodegit/diff-line.d.ts b/types/nodegit/diff-line.d.ts
index 612041a92d..bf4ad7de91 100644
--- a/types/nodegit/diff-line.d.ts
+++ b/types/nodegit/diff-line.d.ts
@@ -2,59 +2,19 @@ export class DiffLine {
     /**
      * The relevant line
      *
-     * @returns {string}
      *
-     * @memberof DiffLine
      */
     content(): string;
     /**
      * The non utf8 translated text
      *
-     * @returns {string}
      *
-     * @memberof DiffLine
      */
     rawContent(): string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffLine
-     */
     origin: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffLine
-     */
     oldLineno: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffLine
-     */
     newLineno: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffLine
-     */
     numLines: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffLine
-     */
     contentLen: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffLine
-     */
     contentOffset: number;
 }
diff --git a/types/nodegit/diff-options.d.ts b/types/nodegit/diff-options.d.ts
index c4f28f984f..408a0530e1 100644
--- a/types/nodegit/diff-options.d.ts
+++ b/types/nodegit/diff-options.d.ts
@@ -1,95 +1,18 @@
 import { Strarray } from './str-array';
 
 export interface DiffOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffOptions
-     */
     flags?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffOptions
-     */
     ignoreSubmodules?: number;
-    /**
-     *
-     *
-     * @type {Strarray}
-     * @memberof DiffOptions
-     */
     pathspec?: Strarray;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof DiffOptions
-     */
     notifyCb?: Function;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffOptions
-     */
     contextLines?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffOptions
-     */
     interhunkLines?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffOptions
-     */
     idAbbrev?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffOptions
-     */
     maxSize?: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof DiffOptions
-     */
     oldPrefix?: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof DiffOptions
-     */
     newPrefix?: string;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof DiffOptions
-     */
     payload?: any;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof DiffOptions
-     */
     progressCb?: any;
+    [key: string]: any;
 }
diff --git a/types/nodegit/diff-perf-data.d.ts b/types/nodegit/diff-perf-data.d.ts
index 30bae1d2c9..5dfca09670 100644
--- a/types/nodegit/diff-perf-data.d.ts
+++ b/types/nodegit/diff-perf-data.d.ts
@@ -1,23 +1,5 @@
 export class DiffPerfdata {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffPerfdata
-     */
     version: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffPerfdata
-     */
     statCalls: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffPerfdata
-     */
     oidCalculations: number;
 }
diff --git a/types/nodegit/diff.d.ts b/types/nodegit/diff.d.ts
index 5c2b29a33b..62de0de6c4 100644
--- a/types/nodegit/diff.d.ts
+++ b/types/nodegit/diff.d.ts
@@ -7,56 +7,15 @@ import { DiffDelta } from './diff-delta';
 import { DiffPerfdata } from './diff-perf-data';
 import { DiffOptions } from './diff-options';
 import { Buf } from './buf';
+import { ConvenientPatch } from './convenient-patch';
 
 export interface DiffFindOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffFindOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffFindOptions
-     */
     flags?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffFindOptions
-     */
     renameThreshold?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffFindOptions
-     */
     renameFromRewriteThreshold?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffFindOptions
-     */
     copyThreshold?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffFindOptions
-     */
     breakRewriteThreshold?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof DiffFindOptions
-     */
     renameLimit?: number;
 }
 
@@ -171,167 +130,28 @@ export class Diff {
     /**
      * Directly run a diff between a blob and a buffer.
      *
-     * @static
-     * @param {Blob} oldBlob
-     * @param {string} oldAsPath
-     * @param {string} buffer
-     * @param {string} bufferAsPath
-     * @param {DiffOptions} opts
-     * @param {Function} fileCb
-     * @param {Function} binaryCb
-     * @param {Function} hunkCb
-     * @param {Function} lineCb
-     * @returns {Promise<any>}
      *
-     * @memberof Diff
      */
     static blobToBuffer(oldBlob: Blob, oldAsPath: string,
                         buffer: string, bufferAsPath: string, opts: DiffOptions, fileCb: Function, binaryCb: Function, hunkCb: Function, lineCb: Function): Promise<any>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} content
-     * @param {number} contentLen
-     * @returns {Promise<Diff>}
-     *
-     * @memberof Diff
-     */
     static fromBuffer(content: string, contentLen: number): Promise<Diff>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Index} index
-     * @param {DiffOptions} opts
-     * @returns {Promise<Diff>}
-     *
-     * @memberof Diff
-     */
-    static indexToWorkdir(repo: Repository, index: Index, opts: DiffOptions): Promise<Diff>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Index} oldIndex
-     * @param {Index} newIndex
-     * @param {DiffOptions} opts
-     * @returns {Promise<Diff>}
-     *
-     * @memberof Diff
-     */
-    static indexToIndex(repo: Repository, oldIndex: Index, newIndex: Index, opts: DiffOptions): Promise<Diff>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Tree} oldTree
-     * @param {Index} index
-     * @param {DiffOptions} opts
-     * @returns {Promise<Diff>}
-     *
-     * @memberof Diff
-     */
-    static treeToIndex(repo: Repository, oldTree: Tree, index: Index, opts: DiffOptions): Promise<Diff>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Tree} oldTree
-     * @param {Tree} new_tree
-     * @param {DiffOptions} opts
-     * @returns {Promise<Diff>}
-     *
-     * @memberof Diff
-     */
-    static treeToTree(repo: Repository, oldTree: Tree, new_tree: Tree, opts: DiffOptions): Promise<Diff>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Tree} oldTree
-     * @param {DiffOptions} opts
-     * @returns {Promise<Diff>}
-     *
-     * @memberof Diff
-     */
-    static treeToWorkdir(repo: Repository, oldTree: Tree, opts: DiffOptions): Promise<Diff>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Tree} oldTree
-     * @param {DiffOptions} opts
-     * @returns {Promise<Diff>}
-     *
-     * @memberof Diff
-     */
-    static treeToWorkdirWithIndex(repo: Repository, oldTree: Tree, opts: DiffOptions): Promise<Diff>;
+    static indexToWorkdir(repo: Repository, index: Index, opts?: DiffOptions): Promise<Diff>;
+    static indexToIndex(repo: Repository, oldIndex: Index, newIndex: Index, opts?: DiffOptions): Promise<Diff>;
+    static treeToIndex(repo: Repository, oldTree: Tree, index: Index, opts?: DiffOptions): Promise<Diff>;
+    static treeToTree(repo: Repository, oldTree: Tree, new_tree: Tree, opts?: DiffOptions): Promise<Diff>;
+    static treeToWorkdir(repo: Repository, oldTree: Tree, opts?: DiffOptions): Promise<Diff>;
+    static treeToWorkdirWithIndex(repo: Repository, oldTree: Tree, opts?: DiffOptions): Promise<Diff>;
 
-    /**
-     *
-     *
-     * @param {DiffFindOptions} options
-     * @returns {Promise<number>}
-     *
-     * @memberof Diff
-     */
     findSimilar(options: DiffFindOptions): Promise<number>;
-    /**
-     *
-     *
-     * @param {number} idx
-     * @returns {DiffDelta}
-     *
-     * @memberof Diff
-     */
     getDelta(idx: number): DiffDelta;
-    /**
-     *
-     *
-     * @returns {Promise<DiffPerfdata>}
-     *
-     * @memberof Diff
-     */
     getPerfdata(): Promise<DiffPerfdata>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Diff
-     */
     numDeltas(): number;
     /**
      * Retrieve patches in this difflist
      *
-     * @returns {Promise<any[]>}
      *
-     * @memberof Diff
-     */
-    patches(): Promise<any[]>;
-    /**
-     *
-     *
-     * @param {Diff} from
-     * @returns {Promise<number>}
-     *
-     * @memberof Diff
      */
+    patches(): Promise<ConvenientPatch[]>;
     merge(from: Diff): Promise<number>;
-    /**
-     *
-     *
-     * @param {Diff.FORMAT} format
-     * @returns {Promise<Buf>}
-     *
-     * @memberof Diff
-     */
     toBuf(format: Diff.FORMAT): Promise<Buf>;
 }
diff --git a/types/nodegit/error.d.ts b/types/nodegit/error.d.ts
index 9acf4cc2cd..c259749e8b 100644
--- a/types/nodegit/error.d.ts
+++ b/types/nodegit/error.d.ts
@@ -63,18 +63,6 @@ export namespace Error {
 }
 
 export class Error {
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof Error
-     */
     message: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof Error
-     */
     klass: number;
 }
diff --git a/types/nodegit/fetch-options.d.ts b/types/nodegit/fetch-options.d.ts
index d391b8dab1..77b5a9586c 100644
--- a/types/nodegit/fetch-options.d.ts
+++ b/types/nodegit/fetch-options.d.ts
@@ -2,53 +2,12 @@ import { RemoteCallbacks } from './remote-callbacks';
 import { Strarray } from './str-array';
 
 export interface FetchOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof FetchOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {RemoteCallbacks}
-     * @memberof FetchOptions
-     */
     callbacks?: RemoteCallbacks;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof FetchOptions
-     */
     prune?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof FetchOptions
-     */
     updateFetchhead?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof FetchOptions
-     */
     downloadTags?: number;
-    /**
-     *
-     *
-     * @type {Strarray}
-     * @memberof FetchOptions
-     */
     customHeaders?: Strarray;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof FetchOptions
-     */
     proxyOpts?: any;
+    [key: string]: any;
 }
diff --git a/types/nodegit/fetch.d.ts b/types/nodegit/fetch.d.ts
index b777066629..db0980586f 100644
--- a/types/nodegit/fetch.d.ts
+++ b/types/nodegit/fetch.d.ts
@@ -9,15 +9,5 @@ export namespace Fetch {
 }
 
 export class Fetch {
-    /**
-     *
-     *
-     * @static
-     * @param {FetchOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Fetch
-     */
     static initOptions(opts: FetchOptions, version: number): number;
 }
diff --git a/types/nodegit/filter.d.ts b/types/nodegit/filter.d.ts
index 7b73196ed0..066a51183e 100644
--- a/types/nodegit/filter.d.ts
+++ b/types/nodegit/filter.d.ts
@@ -19,125 +19,17 @@ export namespace Filter {
 }
 
 export class Filter {
-    /**
-     *
-     *
-     * @static
-     * @param {*} filters
-     * @param {string} name
-     * @returns {number}
-     *
-     * @memberof Filter
-     */
     static listContains(filters: any, name: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {*} fl
-     * @returns {number}
-     *
-     * @memberof Filter
-     */
     static listLength(fl: any): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {number} mode
-     * @param {number} options
-     * @returns {Promise<any>}
-     *
-     * @memberof Filter
-     */
     static listNew(repo: Repository, mode: number, options: number): Promise<any>;
-    /**
-     *
-     *
-     * @static
-     * @param {*} filters
-     * @param {Blob} blob
-     * @param {WriteStream} target
-     * @returns {number}
-     *
-     * @memberof Filter
-     */
     static listStreamBlob(filters: any, blob: Blob, target: WriteStream): number;
-    /**
-     *
-     *
-     * @static
-     * @param {*} filters
-     * @param {Buf} data
-     * @param {WriteStream} target
-     * @returns {number}
-     *
-     * @memberof Filter
-     */
     static listStreamData(filters: any, data: Buf, target: WriteStream): number;
-    /**
-     *
-     *
-     * @static
-     * @param {*} filters
-     * @param {Repository} repo
-     * @param {string} path
-     * @param {WriteStream} target
-     * @returns {number}
-     *
-     * @memberof Filter
-     */
     static listStreamFile(filters: any, repo: Repository, path: string, target: WriteStream): number;
-    /**
-     *
-     *
-     * @static
-     * @param {string} name
-     * @returns {number}
-     *
-     * @memberof Filter
-     */
     static unregister(name: string): number;
 
-    /**
-     *
-     *
-     * @param {string} name
-     * @returns {Filter}
-     *
-     * @memberof Filter
-     */
     lookup(name: string): Filter;
-    /**
-     *
-     *
-     * @param {string} name
-     * @param {number} priority
-     * @returns {number}
-     *
-     * @memberof Filter
-     */
     register(name: string, priority: number): number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof Filter
-     */
     version: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof Filter
-     */
     attributes: string;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof Filter
-     */
     stream: Function;
 }
diff --git a/types/nodegit/git-err.d.ts b/types/nodegit/git-err.d.ts
index 541a191e30..1ba843423b 100644
--- a/types/nodegit/git-err.d.ts
+++ b/types/nodegit/git-err.d.ts
@@ -1,39 +1,8 @@
 import { Error } from './error';
 
 export class Giterr {
-    /**
-     *
-     *
-     * @static
-     *
-     * @memberof Giterr
-     */
     static errClear(): void;
-    /**
-     *
-     *
-     * @static
-     * @returns {Error}
-     *
-     * @memberof Giterr
-     */
     static errLast(): Error;
-    /**
-     *
-     *
-     * @static
-     *
-     * @memberof Giterr
-     */
     static errSetOom(): void;
-    /**
-     *
-     *
-     * @static
-     * @param {number} errorClass
-     * @param {string} string
-     *
-     * @memberof Giterr
-     */
     static errSetString(errorClass: number, string: string): void;
 }
diff --git a/types/nodegit/graph.d.ts b/types/nodegit/graph.d.ts
index 90639a5075..d16d7b5dee 100644
--- a/types/nodegit/graph.d.ts
+++ b/types/nodegit/graph.d.ts
@@ -2,28 +2,6 @@ import { Repository } from './repository';
 import { Oid } from './oid';
 
 export class Graph {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} local
-     * @param {Oid} upstream
-     * @returns {Promise<number>}
-     *
-     * @memberof Graph
-     */
     static aheadBehind(repo: Repository, local: Oid, upstream: Oid): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} commit
-     * @param {Oid} ancestor
-     * @returns {Promise<number>}
-     *
-     * @memberof Graph
-     */
     static descendantOf(repo: Repository, commit: Oid, ancestor: Oid): Promise<number>;
 }
diff --git a/types/nodegit/hash-sig.d.ts b/types/nodegit/hash-sig.d.ts
index 86bfe5d64f..229d26d787 100644
--- a/types/nodegit/hash-sig.d.ts
+++ b/types/nodegit/hash-sig.d.ts
@@ -8,44 +8,10 @@ export namespace Hashsig {
 }
 
 export class Hashsig {
-    /**
-     *
-     *
-     * @static
-     * @param {string} buf
-     * @param {number} buflen
-     * @param {number} opts
-     * @returns {Promise<Hashsig>}
-     *
-     * @memberof Hashsig
-     */
     static create(buf: string, buflen: number, opts: number): Promise<Hashsig>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} path
-     * @param {number} opts
-     * @returns {Promise<Hashsig>}
-     *
-     * @memberof Hashsig
-     */
     static createFromFile(path: string, opts: number): Promise<Hashsig>;
 
-    /**
-     *
-     *
-     * @param {Hashsig} b
-     * @returns {number}
-     *
-     * @memberof Hashsig
-     */
     compare(b: Hashsig): number;
-    /**
-     *
-     *
-     *
-     * @memberof Hashsig
-     */
+
     free(): void;
 }
diff --git a/types/nodegit/ignore.d.ts b/types/nodegit/ignore.d.ts
index 017637c8d2..c38d84d1f3 100644
--- a/types/nodegit/ignore.d.ts
+++ b/types/nodegit/ignore.d.ts
@@ -1,36 +1,7 @@
 import { Repository } from './repository';
 
 export class Ignore {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} rules
-     * @returns {number}
-     *
-     * @memberof Ignore
-     */
     static addRule(repo: Repository, rules: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {number}
-     *
-     * @memberof Ignore
-     */
     static clearInternalRules(repo: Repository): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} path
-     * @returns {Promise<number>}
-     *
-     * @memberof Ignore
-     */
     static pathIsIgnored(repo: Repository, path: string): Promise<number>;
 }
diff --git a/types/nodegit/index-entry.d.ts b/types/nodegit/index-entry.d.ts
index df42f9cbce..b121b7a826 100644
--- a/types/nodegit/index-entry.d.ts
+++ b/types/nodegit/index-entry.d.ts
@@ -1,105 +1,21 @@
 import { Oid } from './oid';
 
 export interface IndexTime {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexTime
-     */
     seconds: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexTime
-     */
     nanoseconds: number;
 }
 
 export class IndexEntry {
-    /**
-     *
-     *
-     * @type {IndexTime}
-     * @memberof IndexEntry
-     */
     ctime: IndexTime;
-    /**
-     *
-     *
-     * @type {IndexTime}
-     * @memberof IndexEntry
-     */
     mtime: IndexTime;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     dev: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     ino: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     mode: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     uid: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     gid: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     fileSize: number;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof IndexEntry
-     */
     id: Oid;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     flags: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof IndexEntry
-     */
     flagsExtended: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof IndexEntry
-     */
     path: string;
 }
diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index b0a68f67b5..e6d95ba83e 100644
--- a/types/nodegit/index.d.ts
+++ b/types/nodegit/index.d.ts
@@ -22,6 +22,7 @@ export { CloneOptions } from './clone-options';
 export { Clone } from './clone';
 export { Commit } from './commit';
 export { Config } from './config';
+export { ConvenientHunk } from './convenient-hunk';
 export { ConvenientPatch } from './convenient-patch';
 export { CredUserpassPayload } from './cred-user-pass-payload';
 export { CredUsername } from './cred-username';
@@ -33,7 +34,6 @@ export { DiffBinaryFile } from './diff-binary-file';
 export { DiffBinary } from './diff-binary';
 export { DiffDelta } from './diff-delta';
 export { DiffFile } from './diff-file';
-export { DiffHunk } from './diff-hunk';
 export { DiffLine } from './diff-line';
 export { DiffOptions } from './diff-options';
 export { DiffPerfdata } from './diff-perf-data';
@@ -87,6 +87,8 @@ export { Revert } from './revert';
 export { Signature } from './signature';
 export { Stash } from './stash';
 export { StatusEntry } from './status-entry';
+export { StatusFileOptions } from './status-file-options';
+export { StatusFile } from './status-file';
 export { StatusList } from './status-list';
 export { StatusOptions } from './status-options';
 export { Status } from './status';
diff --git a/types/nodegit/index_.d.ts b/types/nodegit/index_.d.ts
index ebc7f692f2..3bf55c229d 100644
--- a/types/nodegit/index_.d.ts
+++ b/types/nodegit/index_.d.ts
@@ -21,315 +21,39 @@ export namespace Index {
 }
 
 export class Index {
-    /**
-     *
-     *
-     * @static
-     * @param {IndexEntry} entry
-     * @returns {number}
-     *
-     * @memberof Index
-     */
-    static entryIsConflict(entry: IndexEntry): number;
-    /**
-     *
-     *
-     * @static
-     * @param {IndexEntry} entry
-     * @returns {number}
-     *
-     * @memberof Index
-     */
+    static entryIsConflict(entry: IndexEntry): boolean;
     static entryStage(entry: IndexEntry): number;
-    /**
-     *
-     *
-     * @static
-     * @param {string} indexPath
-     * @returns {Promise<Index>}
-     *
-     * @memberof Index
-     */
     static open(indexPath: string): Promise<Index>;
 
-    /**
-     *
-     *
-     * @param {IndexEntry} sourceEntry
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     add(sourceEntry: IndexEntry): number;
-    /**
-     *
-     *
-     * @param {Strarray} pathspec
-     * @param {number} flags
-     * @param {Function} callback
-     * @param {void} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Index
-     */
-    addAll(pathspec: Strarray, flags: number, callback: Function, payload: void): Promise<number>;
-    /**
-     *
-     *
-     * @param {string} path
-     * @returns {number}
-     *
-     * @memberof Index
-     */
-    addByPath(path: string): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Index
-     */
+    addAll(pathspec: Strarray, flags: number, callback?: Function): Promise<number>;
+    addByPath(path: string): Promise<number>;
     caps(): number;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Index
-     */
     checksum(): Oid;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     clear(): number;
-    /**
-     *
-     *
-     * @param {IndexEntry} ancestorEntry
-     * @param {IndexEntry} ourEntry
-     * @param {IndexEntry} theirEntry
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     conflictAdd(ancestorEntry: IndexEntry, ourEntry: IndexEntry, theirEntry: IndexEntry): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     conflictCleanup(): number;
-    /**
-     *
-     *
-     * @param {string} path
-     * @returns {Promise<IndexEntry>}
-     *
-     * @memberof Index
-     */
     conflictGet(path: string): Promise<IndexEntry>;
-    /**
-     *
-     *
-     * @param {string} path
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     conflictRemove(path: string): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     entryCount(): number;
-    /**
-     *
-     *
-     * @param {number} n
-     * @returns {IndexEntry}
-     *
-     * @memberof Index
-     */
     getByIndex(n: number): IndexEntry;
-    /**
-     *
-     *
-     * @param {string} path
-     * @param {number} stage
-     * @returns {IndexEntry}
-     *
-     * @memberof Index
-     */
     getByPath(path: string, stage: number): IndexEntry;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Index
-     */
-    hasConflicts(): number;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Index
-     */
+    hasConflicts(): boolean;
     owner(): Repository;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Index
-     */
     path(): string;
-    /**
-     *
-     *
-     * @param {number} force
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     read(force: number): number;
-    /**
-     *
-     *
-     * @param {Tree} tree
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     readTree(tree: Tree): number;
-    /**
-     *
-     *
-     * @param {string} path
-     * @param {number} stage
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     remove(path: string, stage: number): number;
-    /**
-     *
-     *
-     * @param {Strarray} pathspec
-     * @param {Function} callback
-     * @param {void} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Index
-     */
-    removeAll(pathspec: Strarray, callback: Function, payload: void): Promise<number>;
-    /**
-     *
-     *
-     * @param {string} path
-     * @returns {number}
-     *
-     * @memberof Index
-     */
-    removeByPath(path: string): number;
-    /**
-     *
-     *
-     * @param {string} dir
-     * @param {number} stage
-     * @returns {number}
-     *
-     * @memberof Index
-     */
+    removeAll(pathspec: Strarray, callback?: Function): Promise<number>;
+    removeByPath(path: string): Promise<number>;
     removeDirectory(dir: string, stage: number): number;
-    /**
-     *
-     *
-     * @param {number} caps
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     setCaps(caps: number): number;
-    /**
-     *
-     *
-     * @param {Strarray} pathspec
-     * @param {Function} callback
-     * @param {void} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Index
-     */
-    updateAll(pathspec: Strarray, callback: Function, payload: void): Promise<number>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Index
-     */
+    updateAll(pathspec: Strarray, callback?: Function): Promise<number>;
     write(): number;
-    /**
-     *
-     *
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Index
-     */
     writeTree(): Promise<Oid>;
-    /**
-     *
-     *
-     * @param {Repository} repo
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Index
-     */
     writeTreeTo(repo: Repository): Promise<Oid>;
-    /**
-     *
-     *
-     * @returns {IndexEntry[]}
-     *
-     * @memberof Index
-     */
     entries(): IndexEntry[];
-    /**
-     *
-     *
-     * @param {number} atPos
-     * @param {string} prefix
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     findPrefix(atPos: number, prefix: string): number;
-    /**
-     *
-     *
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     setVersion(version: number): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Index
-     */
     version(): number;
 }
diff --git a/types/nodegit/indexer.d.ts b/types/nodegit/indexer.d.ts
index e776c0f508..d4d3210bf1 100644
--- a/types/nodegit/indexer.d.ts
+++ b/types/nodegit/indexer.d.ts
@@ -2,28 +2,8 @@ import { TransferProgress } from './transfer-progress';
 import { Oid } from './oid';
 
 export class Indexer {
-    /**
-     *
-     *
-     * @param {TransferProgress} stats
-     * @returns {number}
-     *
-     * @memberof Indexer
-     */
     commit(stats: TransferProgress): number;
-    /**
-     *
-     *
-     *
-     * @memberof Indexer
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Indexer
-     */
     hash(): Oid;
 }
diff --git a/types/nodegit/lib-git2.d.ts b/types/nodegit/lib-git2.d.ts
index 10ad4f864a..be5a5d1856 100644
--- a/types/nodegit/lib-git2.d.ts
+++ b/types/nodegit/lib-git2.d.ts
@@ -17,52 +17,9 @@ export namespace Libgit2 {
 }
 
 export class Libgit2 {
-    /**
-     *
-     *
-     * @static
-     * @returns {number}
-     *
-     * @memberof Libgit2
-     */
     static features(): number;
-    /**
-     *
-     *
-     * @static
-     * @returns {number}
-     *
-     * @memberof Libgit2
-     */
     static init(): number;
-    /**
-     *
-     *
-     * @static
-     * @param {number} option
-     * @returns {number}
-     *
-     * @memberof Libgit2
-     */
     static opts(option: number): number;
-    /**
-     *
-     *
-     * @static
-     * @returns {number}
-     *
-     * @memberof Libgit2
-     */
     static shutdown(): number;
-    /**
-     *
-     *
-     * @static
-     * @param {number} major
-     * @param {number} minor
-     * @param {number} rev
-     *
-     * @memberof Libgit2
-     */
     static version(major: number, minor: number, rev: number): void;
 }
diff --git a/types/nodegit/merge-file-input.d.ts b/types/nodegit/merge-file-input.d.ts
index 9401f8fd1d..f49bd446ca 100644
--- a/types/nodegit/merge-file-input.d.ts
+++ b/types/nodegit/merge-file-input.d.ts
@@ -1,37 +1,7 @@
 export interface MergeFileInput {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileInput
-     */
     version: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeFileInput
-     */
     ptr: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileInput
-     */
     size: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeFileInput
-     */
     path: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileInput
-     */
     mode: number;
 }
diff --git a/types/nodegit/merge-file-options.d.ts b/types/nodegit/merge-file-options.d.ts
index 6212c6275e..861abaf9b8 100644
--- a/types/nodegit/merge-file-options.d.ts
+++ b/types/nodegit/merge-file-options.d.ts
@@ -1,44 +1,9 @@
 export interface MergeFileOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeFileOptions
-     */
     ancestorLabel?: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeFileOptions
-     */
     ourLabel?: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeFileOptions
-     */
     theirLabel?: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileOptions
-     */
     favor?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileOptions
-     */
     flags?: number;
+    [key: string]: any;
 }
diff --git a/types/nodegit/merge-file-result.d.ts b/types/nodegit/merge-file-result.d.ts
index da2410da01..e6f2efcc3b 100644
--- a/types/nodegit/merge-file-result.d.ts
+++ b/types/nodegit/merge-file-result.d.ts
@@ -1,37 +1,7 @@
 export class MergeFileResult {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileResult
-     */
     automergeable: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeFileResult
-     */
     path: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileResult
-     */
     mode: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeFileResult
-     */
     ptr: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeFileResult
-     */
     len: number;
 }
diff --git a/types/nodegit/merge-options.d.ts b/types/nodegit/merge-options.d.ts
index 31445857dd..5149422008 100644
--- a/types/nodegit/merge-options.d.ts
+++ b/types/nodegit/merge-options.d.ts
@@ -1,58 +1,11 @@
 export class MergeOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeOptions
-     */
     renameThreshold?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeOptions
-     */
     targetLimit?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeOptions
-     */
     fileFavor?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeOptions
-     */
     fileFlags?: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof MergeOptions
-     */
     defaultDriver?: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeOptions
-     */
     flags?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof MergeOptions
-     */
     recursionLimit?: number;
+    [key: string]: any;
 }
diff --git a/types/nodegit/merge.d.ts b/types/nodegit/merge.d.ts
index ae4a7d053c..4233b725e7 100644
--- a/types/nodegit/merge.d.ts
+++ b/types/nodegit/merge.d.ts
@@ -49,90 +49,11 @@ export namespace Merge {
 }
 
 export class Merge {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {AnnotatedCommit} theirHead
-     * @param {MergeOptions} [mergeOpts]
-     * @param {CheckoutOptions} [checkoutOpts]
-     * @returns {*}
-     *
-     * @memberof Merge
-     */
     static merge(repo: Repository, theirHead: AnnotatedCommit, mergeOpts?: MergeOptions, checkoutOpts?: CheckoutOptions): any;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} one
-     * @param {Oid} two
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Merge
-     */
     static base(repo: Repository, one: Oid, two: Oid): Promise<Oid>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} one
-     * @param {Oid} two
-     * @returns {Promise<Oidarray>}
-     *
-     * @memberof Merge
-     */
     static bases(repo: Repository, one: Oid, two: Oid): Promise<Oidarray>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Commit} ourCommit
-     * @param {Commit} theirCommit
-     * @param {MergeOptions} [options]
-     * @returns {*}
-     *
-     * @memberof Merge
-     */
     static commits(repo: Repository, ourCommit: Commit, theirCommit: Commit, options?: MergeOptions): any;
-    /**
-     *
-     *
-     * @static
-     * @param {MergeFileInput} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Merge
-     */
     static fileInitInput(opts: MergeFileInput, version: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {MergeOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Merge
-     */
     static initOptions(opts: MergeOptions, version: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Tree} ancestorTree
-     * @param {Tree} ourTree
-     * @param {Tree} theirTree
-     * @param {MergeOptions} opts
-     * @returns {Promise<Index>}
-     *
-     * @memberof Merge
-     */
-    static trees(repo: Repository, ancestorTree: Tree, ourTree: Tree, theirTree: Tree, opts: MergeOptions): Promise<Index>;
+    static trees(repo: Repository, ancestorTree: Tree, ourTree: Tree, theirTree: Tree, opts?: MergeOptions): Promise<Index>;
 }
diff --git a/types/nodegit/note.d.ts b/types/nodegit/note.d.ts
index c5d06f63a7..b2c196c3b7 100644
--- a/types/nodegit/note.d.ts
+++ b/types/nodegit/note.d.ts
@@ -3,122 +3,17 @@ import { Signature } from './signature';
 import { Oid } from './oid';
 
 export class Note {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} notesRef
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {Oid} oid
-     * @param {string} note
-     * @param {number} force
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Note
-     */
     static create(repo: Repository, notesRef: string, author: Signature, committer: Signature, oid: Oid, note: string, force: number): Promise<Oid>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} notesRef
-     * @param {Function} noteCb
-     * @param {*} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Note
-     */
     static foreach(repo: Repository, notesRef: string, noteCb: Function, payload: any): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} notesRef
-     * @returns {Promise<any>}
-     *
-     * @memberof Note
-     */
     static iteratorNew(repo: Repository, notesRef: string): Promise<any>;
-    /**
-     *
-     *
-     * @static
-     * @param {Oid} noteId
-     * @param {Oid} annotatedId
-     * @param {*} it
-     * @returns {number}
-     *
-     * @memberof Note
-     */
     static next(noteId: Oid, annotatedId: Oid, it: any): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} notesRef
-     * @param {Oid} oid
-     * @returns {Promise<Note>}
-     *
-     * @memberof Note
-     */
     static read(repo: Repository, notesRef: string, oid: Oid): Promise<Note>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} notesRef
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {Oid} oid
-     * @returns {Promise<number>}
-     *
-     * @memberof Note
-     */
     static remove(repo: Repository, notesRef: string, author: Signature, committer: Signature, oid: Oid): Promise<number>;
 
-    /**
-     *
-     *
-     * @returns {Signature}
-     *
-     * @memberof Note
-     */
     author(): Signature;
-    /**
-     *
-     *
-     * @returns {Signature}
-     *
-     * @memberof Note
-     */
     committer(): Signature;
-    /**
-     *
-     *
-     *
-     * @memberof Note
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Note
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Note
-     */
     message(): string;
 }
diff --git a/types/nodegit/object.d.ts b/types/nodegit/object.d.ts
index 747e4ffc28..4ec5a19b6c 100644
--- a/types/nodegit/object.d.ts
+++ b/types/nodegit/object.d.ts
@@ -3,136 +3,20 @@ import { Repository } from './repository';
 import { Buf } from './buf';
 
 export class Object {
-    /**
-     *
-     *
-     * @static
-     * @param {number} type
-     * @returns {number}
-     *
-     * @memberof Object
-     */
     static size(type: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} id
-     * @param {number} type
-     * @returns {Promise<Object>}
-     *
-     * @memberof Object
-     */
     static lookup(repo: Repository, id: Oid, type: number): Promise<Object>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} id
-     * @param {number} len
-     * @param {number} type
-     * @returns {Promise<Object>}
-     *
-     * @memberof Object
-     */
     static lookupPrefix(repo: Repository, id: Oid, len: number, type: number): Promise<Object>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} str
-     * @returns {number}
-     *
-     * @memberof Object
-     */
     static string2type(str: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {number} type
-     * @returns {string}
-     *
-     * @memberof Object
-     */
     static type2string(type: number): string;
-    /**
-     *
-     *
-     * @static
-     * @param {number} type
-     * @returns {number}
-     *
-     * @memberof Object
-     */
     static typeisloose(type: number): number;
 
-    /**
-     *
-     *
-     * @returns {Promise<Object>}
-     *
-     * @memberof Object
-     */
     dup(): Promise<Object>;
-    /**
-     *
-     *
-     *
-     * @memberof Object
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Object
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @param {string} path
-     * @param {number} type
-     * @returns {Promise<Object>}
-     *
-     * @memberof Object
-     */
     lookupByPath(path: string, type: number): Promise<Object>;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Object
-     */
     owner(): Repository;
-    /**
-     *
-     *
-     * @param {number} targetType
-     * @returns {Promise<Object>}
-     *
-     * @memberof Object
-     */
     peel(targetType: number): Promise<Object>;
-    /**
-     *
-     *
-     * @returns {Promise<Buf>}
-     *
-     * @memberof Object
-     */
     shortId(): Promise<Buf>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Object
-     */
     type(): number;
 }
diff --git a/types/nodegit/odb-object.d.ts b/types/nodegit/odb-object.d.ts
index 8b76274b00..9685f28212 100644
--- a/types/nodegit/odb-object.d.ts
+++ b/types/nodegit/odb-object.d.ts
@@ -1,51 +1,11 @@
 import { Oid } from './oid';
 
 export class OdbObject {
-    /**
-     *
-     *
-     * @returns {Buffer}
-     *
-     * @memberof OdbObject
-     */
     data(): Buffer;
-    /**
-     *
-     *
-     * @returns {Promise<OdbObject>}
-     *
-     * @memberof OdbObject
-     */
     dup(): Promise<OdbObject>;
-    /**
-     *
-     *
-     *
-     * @memberof OdbObject
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof OdbObject
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof OdbObject
-     */
     size(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof OdbObject
-     */
     type(): number;
 }
diff --git a/types/nodegit/odb.d.ts b/types/nodegit/odb.d.ts
index 549bba872e..db0aacda61 100644
--- a/types/nodegit/odb.d.ts
+++ b/types/nodegit/odb.d.ts
@@ -11,61 +11,12 @@ export namespace Odb {
 }
 
 export class Odb {
-    /**
-     *
-     *
-     * @static
-     * @param {string} objectsDir
-     * @returns {Promise<Odb>}
-     *
-     * @memberof Odb
-     */
     static open(objectsDir: string): Promise<Odb>;
 
-    /**
-     *
-     *
-     * @param {string} path
-     * @returns {number}
-     *
-     * @memberof Odb
-     */
     addDiskAlternate(path: string): number;
-    /**
-     *
-     *
-     *
-     * @memberof Odb
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @returns {Promise<OdbObject>}
-     *
-     * @memberof Odb
-     */
     read(id: Oid): Promise<OdbObject>;
-    /**
-     *
-     *
-     * @param {Buffer} data
-     * @param {number} len
-     * @param {number} type
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Odb
-     */
     write(data: Buffer, len: number, type: number): Promise<Oid>;
-    /**
-     *
-     *
-     * @param {OdbExpandId} ids
-     * @param {number} count
-     * @returns {number}
-     *
-     * @memberof Odb
-     */
     expandIds(ids: OdbExpandId, count: number): number;
 }
diff --git a/types/nodegit/oid-array.d.ts b/types/nodegit/oid-array.d.ts
index 0b95d31a5d..7a96f24a7a 100644
--- a/types/nodegit/oid-array.d.ts
+++ b/types/nodegit/oid-array.d.ts
@@ -1,25 +1,7 @@
 import { Oid } from './oid';
 
 export class Oidarray {
-    /**
-     *
-     *
-     *
-     * @memberof Oidarray
-     */
     free(): void;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof Oidarray
-     */
     ids: Oid;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof Oidarray
-     */
     count: number;
 }
diff --git a/types/nodegit/oid.d.ts b/types/nodegit/oid.d.ts
index 412a931f00..2aa65905f6 100644
--- a/types/nodegit/oid.d.ts
+++ b/types/nodegit/oid.d.ts
@@ -1,73 +1,11 @@
 export class Oid {
     static fromString(str: string): Oid;
-    /**
-     *
-     *
-     * @param {Oid} b
-     * @returns {number}
-     *
-     * @memberof Oid
-     */
     cmp(b: Oid): number;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Oid
-     */
     cpy(): Oid;
-    /**
-     *
-     *
-     * @param {Oid} b
-     * @returns {number}
-     *
-     * @memberof Oid
-     */
     equal(b: Oid): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Oid
-     */
     iszero(): number;
-    /**
-     *
-     *
-     * @param {Oid} b
-     * @param {number} len
-     * @returns {number}
-     *
-     * @memberof Oid
-     */
     ncmp(b: Oid, len: number): number;
-    /**
-     *
-     *
-     * @param {string} str
-     * @returns {number}
-     *
-     * @memberof Oid
-     */
     strcmp(str: string): number;
-    /**
-     *
-     *
-     * @param {string} str
-     * @returns {number}
-     *
-     * @memberof Oid
-     */
     streq(str: string): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Oid
-     */
     tostrS(): string;
 }
diff --git a/types/nodegit/open-ssl.d.ts b/types/nodegit/open-ssl.d.ts
index 4b604a6f43..f8370260d5 100644
--- a/types/nodegit/open-ssl.d.ts
+++ b/types/nodegit/open-ssl.d.ts
@@ -1,11 +1,3 @@
 export class Openssl {
-    /**
-     *
-     *
-     * @static
-     * @returns {number}
-     *
-     * @memberof Openssl
-     */
     static setLocking(): number;
 }
diff --git a/types/nodegit/pack-builder.d.ts b/types/nodegit/pack-builder.d.ts
index e528ccbf38..ed0fa0a2cc 100644
--- a/types/nodegit/pack-builder.d.ts
+++ b/types/nodegit/pack-builder.d.ts
@@ -10,102 +10,16 @@ export namespace Packbuilder {
 }
 
 export class Packbuilder {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {Packbuilder}
-     *
-     * @memberof Packbuilder
-     */
     static create(repo: Repository): Packbuilder;
 
-    /**
-     *
-     *
-     *
-     * @memberof Packbuilder
-     */
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Packbuilder
-     */
     hash(): Oid;
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @param {string} name
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     insert(id: Oid, name: string): number;
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     insertCommit(id: Oid): number;
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @param {string} name
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     insertRecur(id: Oid, name: string): number;
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     insertTree(id: Oid): number;
-    /**
-     *
-     *
-     * @param {Revwalk} walk
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     insertWalk(walk: Revwalk): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     objectCount(): number;
-    /**
-     *
-     *
-     * @param {number} n
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     setThreads(n: number): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Packbuilder
-     */
     written(): number;
 }
diff --git a/types/nodegit/path-spec.d.ts b/types/nodegit/path-spec.d.ts
index 0581523300..99435d5e0d 100644
--- a/types/nodegit/path-spec.d.ts
+++ b/types/nodegit/path-spec.d.ts
@@ -18,125 +18,17 @@ export namespace Pathspec {
 }
 
 export class Pathspec {
-    /**
-     *
-     *
-     * @static
-     * @param {*} m
-     * @param {number} pos
-     * @returns {DiffDelta}
-     *
-     * @memberof Pathspec
-     */
     static matchListDiffEntry(m: any, pos: number): DiffDelta;
-    /**
-     *
-     *
-     * @static
-     * @param {*} m
-     * @param {number} pos
-     * @returns {string}
-     *
-     * @memberof Pathspec
-     */
     static matchListEntry(m: any, pos: number): string;
-    /**
-     *
-     *
-     * @static
-     * @param {*} m
-     * @returns {number}
-     *
-     * @memberof Pathspec
-     */
     static matchListEntrycount(m: any): number;
-    /**
-     *
-     *
-     * @static
-     * @param {*} m
-     * @param {number} pos
-     * @returns {string}
-     *
-     * @memberof Pathspec
-     */
     static matchListFailedEntry(m: any, pos: number): string;
-    /**
-     *
-     *
-     * @static
-     * @param {*} m
-     * @returns {number}
-     *
-     * @memberof Pathspec
-     */
     static matchListFailedEntrycount(m: any): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Strarray} pathspec
-     * @returns {Pathspec}
-     *
-     * @memberof Pathspec
-     */
     static create(pathspec: Strarray): Pathspec;
 
-    /**
-     *
-     *
-     *
-     * @memberof Pathspec
-     */
     free(): void;
-    /**
-     *
-     *
-     * @param {Diff} diff
-     * @param {number} flags
-     * @returns {Promise<any>}
-     *
-     * @memberof Pathspec
-     */
     matchDiff(diff: Diff, flags: number): Promise<any>;
-    /**
-     *
-     *
-     * @param {Index} index
-     * @param {number} flags
-     * @returns {Promise<any>}
-     *
-     * @memberof Pathspec
-     */
     matchIndex(index: Index, flags: number): Promise<any>;
-    /**
-     *
-     *
-     * @param {Tree} tree
-     * @param {number} flags
-     * @returns {Promise<any>}
-     *
-     * @memberof Pathspec
-     */
     matchTree(tree: Tree, flags: number): Promise<any>;
-    /**
-     *
-     *
-     * @param {Repository} repo
-     * @param {number} flags
-     * @returns {Promise<any>}
-     *
-     * @memberof Pathspec
-     */
     matchWorkdir(repo: Repository, flags: number): Promise<any>;
-    /**
-     *
-     *
-     * @param {number} flags
-     * @param {string} path
-     * @returns {number}
-     *
-     * @memberof Pathspec
-     */
     matchesPath(flags: number, path: string): number;
 }
diff --git a/types/nodegit/proxy-options.d.ts b/types/nodegit/proxy-options.d.ts
index 600b34cd04..88f734833d 100644
--- a/types/nodegit/proxy-options.d.ts
+++ b/types/nodegit/proxy-options.d.ts
@@ -1,44 +1,9 @@
 export class ProxyOptions {
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof ProxyOptions
-     */
     certificateCheck?: Function;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof ProxyOptions
-     */
     credentials?: Function;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof ProxyOptions
-     */
     payload?: any;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof ProxyOptions
-     */
     type?: number;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof ProxyOptions
-     */
     url?: string;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof ProxyOptions
-     */
     version?: number;
+    [key: string]: any;
 }
diff --git a/types/nodegit/push-options.d.ts b/types/nodegit/push-options.d.ts
index c26b663383..b736325f91 100644
--- a/types/nodegit/push-options.d.ts
+++ b/types/nodegit/push-options.d.ts
@@ -3,39 +3,10 @@ import { Strarray } from './str-array';
 import { ProxyOptions } from './proxy-options';
 
 export interface PushOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof PushOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof PushOptions
-     */
     pbParallelism?: number;
-    /**
-     *
-     *
-     * @type {RemoteCallbacks}
-     * @memberof PushOptions
-     */
     callbacks?: RemoteCallbacks;
-    /**
-     *
-     *
-     * @type {Strarray}
-     * @memberof PushOptions
-     */
     customHeaders?: Strarray;
-    /**
-     *
-     *
-     * @type {ProxyOptions}
-     * @memberof PushOptions
-     */
     proxyOpts?: ProxyOptions;
+    [key: string]: any;
 }
diff --git a/types/nodegit/push-update.d.ts b/types/nodegit/push-update.d.ts
index cdd393d9ba..50f46726d5 100644
--- a/types/nodegit/push-update.d.ts
+++ b/types/nodegit/push-update.d.ts
@@ -1,32 +1,8 @@
 import { Oid } from './oid';
 
 export class PushUpdate {
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof PushUpdate
-     */
     srcRefname: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof PushUpdate
-     */
     dstRefname: string;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof PushUpdate
-     */
     src: Oid;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof PushUpdate
-     */
     dst: Oid;
 }
diff --git a/types/nodegit/push.d.ts b/types/nodegit/push.d.ts
index 4a4ce53dac..26d8f07b60 100644
--- a/types/nodegit/push.d.ts
+++ b/types/nodegit/push.d.ts
@@ -2,15 +2,5 @@ import { RemoteCallbacks } from './remote-callbacks';
 import { PushOptions } from './push-options';
 
 export class Push {
-    /**
-     *
-     *
-     * @static
-     * @param {PushOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Push
-     */
     static initOptions(opts: PushOptions, version: number): number;
 }
diff --git a/types/nodegit/rebase-operation.d.ts b/types/nodegit/rebase-operation.d.ts
index e52542fb54..7144ebe6a9 100644
--- a/types/nodegit/rebase-operation.d.ts
+++ b/types/nodegit/rebase-operation.d.ts
@@ -12,25 +12,7 @@ export namespace RebaseOperation {
 }
 
 export class RebaseOperation {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof RebaseOperation
-     */
     type: number;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof RebaseOperation
-     */
     id: Oid;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof RebaseOperation
-     */
     exec: string;
 }
diff --git a/types/nodegit/rebase.d.ts b/types/nodegit/rebase.d.ts
index e1d64ede01..be0b5d2c92 100644
--- a/types/nodegit/rebase.d.ts
+++ b/types/nodegit/rebase.d.ts
@@ -14,112 +14,16 @@ export interface RebaseOptions {
 }
 
 export class Rebase {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {AnnotatedCommit} branch
-     * @param {AnnotatedCommit} upstream
-     * @param {AnnotatedCommit} onto
-     * @param {RebaseOptions} opts
-     * @returns {Promise<Rebase>}
-     *
-     * @memberof Rebase
-     */
-    static init(repo: Repository, branch: AnnotatedCommit, upstream: AnnotatedCommit, onto: AnnotatedCommit, opts: RebaseOptions): Promise<Rebase>;
-    /**
-     *
-     *
-     * @static
-     * @param {RebaseOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Rebase
-     */
+    static init(repo: Repository, branch: AnnotatedCommit, upstream: AnnotatedCommit, onto: AnnotatedCommit, opts?: RebaseOptions): Promise<Rebase>;
     static initOptions(opts: RebaseOptions, version: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {RebaseOptions} opts
-     * @returns {Promise<Rebase>}
-     *
-     * @memberof Rebase
-     */
-    static open(repo: Repository, opts: RebaseOptions): Promise<Rebase>;
+    static open(repo: Repository, opts?: RebaseOptions): Promise<Rebase>;
 
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Rebase
-     */
     abort(): number;
-    /**
-     *
-     *
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {string} messageEncoding
-     * @param {string} message
-     * @returns {Oid}
-     *
-     * @memberof Rebase
-     */
     commit(author: Signature, committer: Signature, messageEncoding: string, message: string): Oid;
-    /**
-     *
-     *
-     * @param {Signature} signature
-     * @returns {number}
-     *
-     * @memberof Rebase
-     */
     finish(signature: Signature): number;
-    /**
-     *
-     *
-     * @param {Index} index
-     * @returns {number}
-     *
-     * @memberof Rebase
-     */
     inmemoryIndex(index: Index): number;
-    /**
-     *
-     *
-     * @returns {Promise<RebaseOperation>}
-     *
-     * @memberof Rebase
-     */
     next(): Promise<RebaseOperation>;
-    /**
-     *
-     *
-     * @param {number} idx
-     * @returns {RebaseOperation}
-     *
-     * @memberof Rebase
-     */
     operationByIndex(idx: number): RebaseOperation;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Rebase
-     */
     operationCurrent(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Rebase
-     */
     operationEntrycount(): number;
 }
diff --git a/types/nodegit/ref-db.d.ts b/types/nodegit/ref-db.d.ts
index de927eec58..6a5701ff03 100644
--- a/types/nodegit/ref-db.d.ts
+++ b/types/nodegit/ref-db.d.ts
@@ -1,30 +1,9 @@
 import { Repository } from './repository';
 
 export class Refdb {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {Promise<Refdb>}
-     *
-     * @memberof Refdb
-     */
     static open(repo: Repository): Promise<Refdb>;
 
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Refdb
-     */
     compress(): number;
-    /**
-     *
-     *
-     *
-     * @memberof Refdb
-     */
+
     free(): void;
 }
diff --git a/types/nodegit/ref-log.d.ts b/types/nodegit/ref-log.d.ts
index 78367ffccd..ac43de7e70 100644
--- a/types/nodegit/ref-log.d.ts
+++ b/types/nodegit/ref-log.d.ts
@@ -3,127 +3,22 @@ import { Oid } from './oid';
 import { Signature } from './signature';
 
 export class Reflog {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @returns {number}
-     *
-     * @memberof Reflog
-     */
     static delete(repo: Repository, name: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @returns {Promise<Reflog>}
-     *
-     * @memberof Reflog
-     */
     static read(repo: Repository, name: string): Promise<Reflog>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} oldName
-     * @param {string} name
-     * @returns {number}
-     *
-     * @memberof Reflog
-     */
     static rename(repo: Repository, oldName: string, name: string): number;
 
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @param {Signature} committer
-     * @param {string} msg
-     * @returns {number}
-     *
-     * @memberof Reflog
-     */
     append(id: Oid, committer: Signature, msg: string): number;
-    /**
-     *
-     *
-     * @param {number} idx
-     * @param {number} rewritePreviousEntry
-     * @returns {number}
-     *
-     * @memberof Reflog
-     */
     drop(idx: number, rewritePreviousEntry: number): number;
-    /**
-     *
-     *
-     * @param {number} idx
-     * @returns {ReflogEntry}
-     *
-     * @memberof Reflog
-     */
     entryByIndex(idx: number): ReflogEntry;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reflog
-     */
     entrycount(): number;
-    /**
-     *
-     *
-     *
-     * @memberof Reflog
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reflog
-     */
     write(): number;
 }
 
 export class ReflogEntry {
-    /**
-     *
-     *
-     * @returns {Signature}
-     *
-     * @memberof ReflogEntry
-     */
     committer(): Signature;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof ReflogEntry
-     */
     idNew(): Oid;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof ReflogEntry
-     */
     idOld(): Oid;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof ReflogEntry
-     */
     message(): string;
 }
diff --git a/types/nodegit/ref-spec.d.ts b/types/nodegit/ref-spec.d.ts
index e48c8cd2ac..bf40f21ac2 100644
--- a/types/nodegit/ref-spec.d.ts
+++ b/types/nodegit/ref-spec.d.ts
@@ -1,52 +1,8 @@
 export class Refspec {
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Refspec
-     */
     direction(): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Refspec
-     */
     dst(): string;
-    /**
-     *
-     *
-     * @param {string} refname
-     * @returns {number}
-     *
-     * @memberof Refspec
-     */
     dstMatches(refname: string): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Refspec
-     */
     force(): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Refspec
-     */
     src(): string;
-    /**
-     *
-     *
-     * @param {string} refname
-     * @returns {number}
-     *
-     * @memberof Refspec
-     */
     srcMatches(refname: string): number;
 }
diff --git a/types/nodegit/reference.d.ts b/types/nodegit/reference.d.ts
index cb449ee225..80e16c9350 100644
--- a/types/nodegit/reference.d.ts
+++ b/types/nodegit/reference.d.ts
@@ -19,365 +19,42 @@ export namespace Reference {
 }
 
 export class Reference {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {Oid} id
-     * @param {number} force
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     static create(repo: Repository, name: string, id: Oid, force: number, logMessage: string): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {Oid} id
-     * @param {number} force
-     * @param {Oid} currentId
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     static createMatching(repo: Repository, name: string, id: Oid, force: number, currentId: Oid, logMessage: string): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {(string | Reference)} id
-     * @param {Function} callback
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
-    static dwim(repo: Repository, id: string | Reference, callback: Function): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} refname
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
+    static dwim(repo: Repository, id: string | Reference, callback?: Function): Promise<Reference>;
     static ensureLog(repo: Repository, refname: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} refname
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     static hasLog(repo: Repository, refname: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {string} refname
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     static isValidName(refname: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Reference
-     */
     static list(repo: Repository): Promise<any[]>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {(string | Reference)} id
-     * @param {Function} callback
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
-    static lookup(repo: Repository, id: string | Reference, callback: Function): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Reference
-     */
+    static lookup(repo: Repository, id: string | Reference, callback?: Function): Promise<Reference>;
     static nameToId(repo: Repository, name: string): Promise<Oid>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} bufferOut
-     * @param {number} bufferSize
-     * @param {string} name
-     * @param {number} flags
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     static normalizeName(bufferOut: string, bufferSize: number, name: string, flags: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     static remove(repo: Repository, name: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {string} target
-     * @param {number} force
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     static symbolicCreate(repo: Repository, name: string, target: string, force: number, logMessage: string): Promise<Reference>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {string} target
-     * @param {number} force
-     * @param {string} currentValue
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     static symbolicCreateMatching(repo: Repository, name: string, target: string, force: number, currentValue: string, logMessage: string): Promise<Reference>;
 
-    /**
-     *
-     *
-     * @param {Reference} ref2
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     cmp(ref2: Reference): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     delete(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     isBranch(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     isNote(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     isRemote(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     isTag(): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Reference
-     */
     name(): string;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Reference
-     */
     owner(): Repository;
-    /**
-     *
-     *
-     * @param {number} type
-     * @returns {Promise<Object>}
-     *
-     * @memberof Reference
-     */
     peel(type: number): Promise<Object>;
-    /**
-     *
-     *
-     * @param {string} newName
-     * @param {number} force
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     rename(newName: string, force: number, logMessage: string): Promise<Reference>;
-    /**
-     *
-     *
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     resolve(): Promise<Reference>;
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     setTarget(id: Oid, logMessage: string): Promise<Reference>;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Reference
-     */
     shorthand(): string;
-    /**
-     *
-     *
-     * @param {string} target
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     symbolicSetTarget(target: string, logMessage: string): Promise<Reference>;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Reference
-     */
     symbolicTarget(): string;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Reference
-     */
     target(): Oid;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Reference
-     */
     targetPeel(): Oid;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Reference
-     */
     type(): number;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof Reference
-     */
     isValid(): boolean;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof Reference
-     */
     isConcrete(): boolean;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof Reference
-     */
     isSymbolic(): boolean;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Reference
-     */
     toString(): string;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof Reference
-     */
     isHead(): boolean;
-    /**
-     *
-     *
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Reference
-     */
     dup(): Promise<Reference>;
 }
diff --git a/types/nodegit/remote-callbacks.d.ts b/types/nodegit/remote-callbacks.d.ts
index b3cf3d9054..ca244e5c5e 100644
--- a/types/nodegit/remote-callbacks.d.ts
+++ b/types/nodegit/remote-callbacks.d.ts
@@ -1,44 +1,8 @@
 export class RemoteCallbacks {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof RemoteCallbacks
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof RemoteCallbacks
-     */
     credentials?: Function;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof RemoteCallbacks
-     */
     certificateCheck?: Function;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof RemoteCallbacks
-     */
     transferProgress?: Function;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof RemoteCallbacks
-     */
     transport?: Function;
-    /**
-     *
-     *
-     * @type {undefined}
-     * @memberof RemoteCallbacks
-     */
     payload?: undefined;
 }
diff --git a/types/nodegit/remote.d.ts b/types/nodegit/remote.d.ts
index d1bee99365..61fdc63d1c 100644
--- a/types/nodegit/remote.d.ts
+++ b/types/nodegit/remote.d.ts
@@ -24,367 +24,48 @@ export namespace Remote {
 }
 
 export class Remote {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} remote
-     * @param {string} refspec
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     static addFetch(repo: Repository, remote: string, refspec: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} remote
-     * @param {string} refspec
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     static addPush(repo: Repository, remote: string, refspec: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {string} url
-     * @returns {Remote}
-     *
-     * @memberof Remote
-     */
     static create(repo: Repository, name: string, url: string): Remote;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} url
-     * @returns {Promise<Remote>}
-     *
-     * @memberof Remote
-     */
     static createAnonymous(repo: Repository, url: string): Promise<Remote>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {string} url
-     * @param {string} fetch
-     * @returns {Promise<Remote>}
-     *
-     * @memberof Remote
-     */
     static createWithFetchspec(repo: Repository, name: string, url: string, fetch: string): Promise<Remote>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @returns {Promise<number>}
-     *
-     * @memberof Remote
-     */
     static delete(repo: Repository, name: string): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {RemoteCallbacks} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     static initCallbacks(opts: RemoteCallbacks, version: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {string} remoteName
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
-    static isValidName(remoteName: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Remote
-     */
+    static isValidName(remoteName: string): boolean;
     static list(repo: Repository): Promise<any[]>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {(string | Remote)} name
-     * @param {Function} callback
-     * @returns {Promise<Remote>}
-     *
-     * @memberof Remote
-     */
-    static lookup(repo: Repository, name: string | Remote, callback: Function): Promise<Remote>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} remote
-     * @param {number} value
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
+    static lookup(repo: Repository, name: string | Remote, callback?: Function): Promise<Remote>;
     static setAutotag(repo: Repository, remote: string, value: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} remote
-     * @param {string} url
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     static setPushurl(repo: Repository, remote: string, url: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} remote
-     * @param {string} url
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     static setUrl(repo: Repository, remote: string, url: string): number;
 
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     autotag(): number;
-    /**
-     *
-     *
-     * @param {Enums.DIRECTION} direction
-     * @param {RemoteCallbacks} callbacks
-     * @param {Function} callback
-     * @returns {Promise<number>}
-     *
-     * @memberof Remote
-     */
-    connect(direction: Enums.DIRECTION, callbacks: RemoteCallbacks, callback: Function): Promise<number>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
+    connect(direction: Enums.DIRECTION, callbacks: RemoteCallbacks, callback?: Function): Promise<number>;
     connected(): number;
-    /**
-     *
-     *
-     * @returns {Promise<Buf>}
-     *
-     * @memberof Remote
-     */
     defaultBranch(): Promise<Buf>;
-    /**
-     *
-     *
-     * @returns {Promise<void>}
-     *
-     * @memberof Remote
-     */
     disconnect(): Promise<void>;
-    /**
-     *
-     *
-     * @param {any[]} refSpecs
-     * @param {FetchOptions} opts
-     * @param {Function} callback
-     * @returns {Promise<number>}
-     *
-     * @memberof Remote
-     */
-    download(refSpecs: any[], opts: FetchOptions, callback: Function): Promise<number>;
+    download(refSpecs: any[], opts?: FetchOptions, callback?: Function): Promise<number>;
     dup(): Promise<Remote>;
-    /**
-     *
-     *
-     * @param {any[]} refSpecs
-     * @param {FetchOptions} opts
-     * @param {string} message
-     * @param {Function} callback
-     * @returns {Promise<number>}
-     *
-     * @memberof Remote
-     */
-    fetch(refSpecs: any[], opts: FetchOptions, message: string, callback: Function): Promise<number>;
-    /**
-     *
-     *
-     *
-     * @memberof Remote
-     */
+    fetch(refSpecs: any[], opts: FetchOptions, message: string, callback?: Function): Promise<number>;
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Remote
-     */
     getFetchRefspecs(): Promise<any[]>;
-    /**
-     *
-     *
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Remote
-     */
     getPushRefspecs(): Promise<any[]>;
-    /**
-     *
-     *
-     * @param {number} n
-     * @returns {Refspec}
-     *
-     * @memberof Remote
-     */
     getRefspec(n: number): Refspec;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Remote
-     */
     name(): string;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Remote
-     */
     owner(): Repository;
-    /**
-     *
-     *
-     * @param {RemoteCallbacks} callbacks
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     prune(callbacks: RemoteCallbacks): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     pruneRefs(): number;
-    /**
-     *
-     *
-     * @param {any[]} refSpecs
-     * @param {PushOptions} options
-     * @param {Function} callback
-     * @returns {Promise<number>}
-     *
-     * @memberof Remote
-     */
-    push(refSpecs: any[], options: PushOptions, callback: Function): Promise<number>;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Remote
-     */
+    push(refSpecs: any[], options?: PushOptions, callback?: Function): Promise<number>;
     pushurl(): string;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     refspecCount(): number;
-    /**
-     *
-     *
-     * @returns {TransferProgress}
-     *
-     * @memberof Remote
-     */
     stats(): TransferProgress;
-    /**
-     *
-     *
-     *
-     * @memberof Remote
-     */
+
     stop(): void;
-    /**
-     *
-     *
-     * @param {RemoteCallbacks} callbacks
-     * @param {number} updateFetchhead
-     * @param {number} downloadTags
-     * @param {string} reflogMessage
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
     updateTips(callbacks: RemoteCallbacks, updateFetchhead: number, downloadTags: number, reflogMessage: string): number;
-    /**
-     *
-     *
-     * @param {Strarray} refspecs
-     * @param {PushOptions} opts
-     * @returns {number}
-     *
-     * @memberof Remote
-     */
-    upload(refspecs: Strarray, opts: PushOptions): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Remote
-     */
+    upload(refspecs: Strarray, opts?: PushOptions): number;
     url(): string;
     /**
      * Lists advertised references from a remote. You must connect to the remote before using referenceList.
-     *
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Remote
      */
     referenceList(): Promise<any[]>;
 }
diff --git a/types/nodegit/repository.d.ts b/types/nodegit/repository.d.ts
index b29a411725..b94d7bd626 100644
--- a/types/nodegit/repository.d.ts
+++ b/types/nodegit/repository.d.ts
@@ -18,6 +18,10 @@ import { Merge } from './merge';
 import { MergeOptions } from './merge-options';
 import { Refdb } from './ref-db';
 import { Revwalk } from './rev-walk';
+import { StatusFile } from './status-file';
+import { StatusOptions } from './status-options';
+import { DiffLine } from './diff-line';
+import { Treebuilder } from './tree-builder';
 
 export interface RepositoryInitOptions {
     description: string;
@@ -33,754 +37,212 @@ export interface RepositoryInitOptions {
 export class Repository {
     /**
      * Creates a branch with the passed in name pointing to the commit
-     *
-     * @static
-     * @param {string} startPath
-     * @param {number} acrossFs
-     * @param {string} ceilingDirs
-     * @returns {Promise<string>}
-     *
-     * @memberof Repository
      */
     static discover(startPath: string, acrossFs: number, ceilingDirs: string): Promise<Buf>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} path
-     * @param {number} isBare
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Repository
-     */
     static init(path: string, isBare: number): Promise<Repository>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} repoPath
-     * @param {RepositoryInitOptions} [options]
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Repository
-     */
     static initExt(repoPath: string, options?: RepositoryInitOptions): Promise<Repository>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} path
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Repository
-     */
     static open(path: string): Promise<Repository>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} barePath
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Repository
-     */
     static openBare(barePath: string): Promise<Repository>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} path
-     * @param {number} [flags]
-     * @param {string} [ceilingDirs]
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Repository
-     */
     static openExt(path: string, flags?: number, ceilingDirs?: string): Promise<Repository>;
-    /**
-     *
-     *
-     * @static
-     * @param {Odb} odb
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Repository
-     */
     static wrapOdb(odb: Odb): Promise<Repository>;
 
-    /**
-     *
-     *
-     *
-     * @memberof Repository
-     */
     cleanup(): void;
-    /**
-     *
-     *
-     * @returns {Promise<Config>}
-     *
-     * @memberof Repository
-     */
     config(): Promise<Config>;
-    /**
-     *
-     *
-     * @returns {Promise<Config>}
-     *
-     * @memberof Repository
-     */
     configSnapshot(): Promise<Config>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     detachHead(): number;
-    /**
-     *
-     *
-     * @param {Function} callback
-     * @returns {Promise<any>}
-     *
-     * @memberof Repository
-     */
-    fetchheadForeach(callback: Function): Promise<any>;
-    /**
-     *
-     *
-     *
-     * @memberof Repository
-     */
+    fetchheadForeach(callback?: Function): Promise<any>;
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Repository
-     */
     getNamespace(): string;
-    /**
-     *
-     *
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Repository
-     */
     head(): Promise<Reference>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     headDetached(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     headUnborn(): number;
-    /**
-     *
-     *
-     * @returns {Promise<Index>}
-     *
-     * @memberof Repository
-     */
     index(): Promise<Index>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     isBare(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     isEmpty(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     isShallow(): number;
-    /**
-     *
-     *
-     * @param {Function} callback
-     * @returns {Promise<any>}
-     *
-     * @memberof Repository
-     */
-    mergeheadForeach(callback: Function): Promise<any>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
+    mergeheadForeach(callback?: Function): Promise<any>;
     messageRemove(): number;
-    /**
-     *
-     *
-     * @returns {Promise<Odb>}
-     *
-     * @memberof Repository
-     */
     odb(): Promise<Odb>;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Repository
-     */
     path(): string;
-    /**
-     *
-     *
-     * @returns {Promise<Refdb>}
-     *
-     * @memberof Repository
-     */
     refdb(): Promise<Refdb>;
-    /**
-     *
-     *
-     * @param {string} refname
-     * @returns {Promise<number>}
-     *
-     * @memberof Repository
-     */
     setHead(refname: string): Promise<number>;
-    /**
-     *
-     *
-     * @param {Oid} commitish
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     setHeadDetached(commitish: Oid): number;
-    /**
-     *
-     *
-     * @param {AnnotatedCommit} commitish
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     setHeadDetachedFromAnnotated(commitish: AnnotatedCommit): number;
-    /**
-     *
-     *
-     * @param {string} name
-     * @param {string} email
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     setIdent(name: string, email: string): number;
-    /**
-     *
-     *
-     * @param {string} nmspace
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     setNamespace(nmspace: string): number;
-    /**
-     *
-     *
-     * @param {string} workdir
-     * @param {number} updateGitLink
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     setWorkdir(workdir: string, updateGitLink: number): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     state(): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Repository
-     */
     stateCleanup(): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Repository
-     */
     workdir(): string;
     /**
      * Creates a branch with the passed in name pointing to the commit
-     *
-     * @param {string} name
-     * @param {(Commit | string | Oid)} commit
-     * @param {boolean} force
-     * @param {Signature} signature
-     * @param {string} logMessage
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Repository
      */
     createBranch(name: string, commit: Commit | string | Oid, force: boolean, signature: Signature, logMessage: string): Promise<Reference>;
     /**
      * Look up a refs's commit.
-     *
-     * @param {(string | Reference)} name
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Repository
      */
     getReferenceCommit(name: string | Reference): Promise<Commit>;
     /**
      * Look up a branch. Alias for getReference
-     *
-     * @param {(string | Reference)} name
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Repository
      */
     getBranch(name: string | Reference): Promise<Reference>;
     /**
      * Look up a branch's most recent commit. Alias to getReferenceCommit
-     *
-     * @param {(string | Reference)} name
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Repository
      */
     getBranchCommit(name: string | Reference): Promise<Commit>;
     /**
      * Gets the branch that HEAD currently points to Is an alias to head()
-     *
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Repository
      */
     getCurrentBranch(): Promise<Reference>;
     /**
      * Lookup the reference with the given name.
-     *
-     * @param {(string | Reference)} name
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Repository
      */
     getReference(name: string | Reference): Promise<Reference>;
     /**
      * Lookup references for a repository.
-     *
-     * @param {Reference.TYPE} type
-     * @returns {Promise<Reference[]>}
-     *
-     * @memberof Repository
      */
     getReferences(type: Reference.TYPE): Promise<Reference[]>;
     /**
      * Lookup reference names for a repository.
-     *
-     * @param {Reference.TYPE} type
-     * @returns {Promise<string[]>}
-     *
-     * @memberof Repository
      */
     getReferenceNames(type: Reference.TYPE): Promise<string[]>;
-    /**
-     *
-     *
-     * @param {(string | Oid)} string
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Repository
-     */
-    getCommit(string: string | Oid): Promise<Commit>;
+    getCommit(string: string | Commit| Oid): Promise<Commit>;
     /**
      * Retrieve the blob represented by the oid.
-     *
-     * @param {(string | Oid)} string
-     * @returns {Promise<Blob>}
-     *
-     * @memberof Repository
      */
     getBlob(string: string | Oid): Promise<Blob>;
     /**
      * Retrieve the tree represented by the oid.
-     *
-     * @param {(string | Oid)} string
-     * @returns {Promise<Tree>}
-     *
-     * @memberof Repository
      */
     getTree(string: string | Oid): Promise<Tree>;
-    /**
-     *
-     *
-     * @param {(string | Oid)} string
-     * @param {string} name
-     * @param {string} message
-     * @returns {Promise<Tag>}
-     *
-     * @memberof Repository
-     */
     createTag(string: string | Oid, name: string, message: string): Promise<Tag>;
     /**
      * Creates a new lightweight tag
-     *
-     * @param {(string | Oid)} string
-     * @param {string} name
-     * @returns {Promise<Reference>}
-     *
-     * @memberof Repository
      */
     createLightweightTag(string: string | Oid, name: string): Promise<Reference>;
     /**
      * Retrieve the tag represented by the oid.
-     *
-     * @param {(string | Oid)} string
-     * @returns {Promise<Tag>}
-     *
-     * @memberof Repository
      */
     getTag(string: string | Oid): Promise<Tag>;
     /**
      * Retrieve the tag represented by the tag name.
-     *
-     * @param {string} Short
-     * @returns {Promise<Tag>}
-     *
-     * @memberof Repository
      */
     getTagByName(Short: string): Promise<Tag>;
     /**
      * Deletes a tag from a repository by the tag name.
-     *
-     * @param {string} Short
-     * @returns {Promise<any>}
-     *
-     * @memberof Repository
      */
-    deleteTagByName(Short: string): Promise<any>;
+    deleteTagByName(Short: string): Promise<number>;
     /**
      * Instantiate a new revision walker for browsing the Repository"s history. See also Commit.prototype.history()
-     *
-     * @param {(string | Oid)} string
-     * @returns {Revwalk}
-     *
-     * @memberof Repository
      */
     createRevWalk(string: string | Oid): Revwalk;
     /**
      * Retrieve the master branch commit.
-     *
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Repository
      */
     getMasterCommit(): Promise<Commit>;
     /**
      * Retrieve the commit that HEAD is currently pointing to
-     *
-     * @returns {Promise<Commit>}
-     *
-     * @memberof Repository
      */
     getHeadCommit(): Promise<Commit>;
-    /**
-     *
-     *
-     * @param {string} updateRef
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {string} message
-     * @param {(Tree | Oid | string)} Tree
-     * @param {any[]} parents
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Repository
-     */
-    createCommit(updateRef: string, author: Signature, committer: Signature, message: string, Tree: Tree | Oid | string, parents: any[]): Promise<Oid>;
+    createCommit(updateRef: string, author: Signature, committer: Signature, message: string, Tree: Tree | Oid | string, parents: Array<string | Commit | Oid>, callback?: Function): Promise<Oid>;
     /**
      * Creates a new commit on HEAD from the list of passed in files
-     *
-     * @param {any[]} filesToAdd
-     * @param {Signature} author
-     * @param {Signature} committer
-     * @param {string} message
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Repository
      */
-    createCommitOnHead(filesToAdd: any[], author: Signature, committer: Signature, message: string): Promise<Oid>;
+    createCommitOnHead(filesToAdd: string[], author: Signature, committer: Signature, message: string): Promise<Oid>;
     /**
      * Create a blob from a buffer
-     *
-     * @param {Buffer} buffer
-     * @returns {Oid}
-     *
-     * @memberof Repository
      */
     createBlobFromBuffer(buffer: Buffer): Oid;
-    /**
-     *
-     *
-     * @param {Tree} tree
-     * @returns {*}
-     *
-     * @memberof Repository
-     */
-    treeBuilder(tree: Tree): any;
+    treeBuilder(tree: Tree): Promise<Treebuilder>;
     /**
      * Gets the default signature for the default user and now timestamp
-     *
-     * @returns {Signature}
-     *
-     * @memberof Repository
      */
     defaultSignature(): Signature;
     /**
      * Lists out the remotes in the given repository.
-     *
-     * @param {Function} Optional
-     * @returns {Promise<Object>}
-     *
-     * @memberof Repository
      */
-    getRemotes(Optional: Function): Promise<Object>;
+    getRemotes(callback?: Function): Promise<Remote[]>;
     /**
      * Gets a remote from the repo
-     *
-     * @param {(string | Remote)} remote
-     * @param {Function} callback
-     * @returns {Promise<Remote>}
-     *
-     * @memberof Repository
      */
-    getRemote(remote: string | Remote, callback: Function): Promise<Remote>;
+    getRemote(remote: string | Remote, callback?: Function): Promise<Remote>;
     /**
      * Fetches from a remote
-     *
-     * @param {(string | Remote)} remote
-     * @param {(Object | FetchOptions)} fetchOptions
-     * @returns {Promise<any>}
-     *
-     * @memberof Repository
      */
-    fetch(remote: string | Remote, fetchOptions: Object | FetchOptions): Promise<void>;
+    fetch(remote: string | Remote, fetchOptions?: FetchOptions): Promise<void>;
     /**
      * Fetches from all remotes. This is done in series due to deadlocking issues with fetching from many remotes that can happen.
-     *
-     * @param {(Object | FetchOptions)} fetchOptions
-     * @param {Function} callback
-     * @returns {Promise<void>}
-     *
-     * @memberof Repository
      */
-    fetchAll(fetchOptions: Object | FetchOptions, callback: Function): Promise<void>;
-    /**
-     *
-     *
-     * @param {(string | Reference)} to
-     * @param {(string | Reference)} from
-     * @param {Signature} signature
-     * @param {Merge.PREFERENCE} mergePreference
-     * @param {MergeOptions} mergeOptions
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Repository
-     */
-    mergeBranches(to: string | Reference, from: string | Reference, signature: Signature, mergePreference: Merge.PREFERENCE, mergeOptions: MergeOptions): Promise<Oid>;
+    fetchAll(fetchOptions?: FetchOptions, callback?: Function): Promise<void>;
+    mergeBranches(to: string | Reference, from: string | Reference, signature: Signature, mergePreference: Merge.PREFERENCE, mergeOptions?: MergeOptions): Promise<Oid>;
     /**
      * Rebases a branch onto another branch
-     *
-     * @param {string} branch
-     * @param {string} upstream
-     * @param {string} onto
-     * @param {Signature} signature
-     * @param {Function} beforeNextFn
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Repository
      */
     rebaseBranches(branch: string, upstream: string, onto: string, signature: Signature, beforeNextFn: Function): Promise<Oid>;
-    /**
-     *
-     *
-     * @param {Signature} signature
-     * @param {Function} beforeNextFn
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Repository
-     */
     continueRebase(signature: Signature, beforeNextFn: Function): Promise<Oid>;
     /**
      * Get the status of a repo to it's working directory
-     *
-     * @param {*} opts
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Repository
      */
-    getStatus(opts: any): Promise<any[]>;
+    getStatus(opts?: StatusOptions): Promise<StatusFile[]>;
     /**
      * Get extended statuses of a repo to it's working directory. Status entries have status, headToIndex delta, and indexToWorkdir deltas
-     *
-     * @param {*} opts
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Repository
      */
-    getStatusExt(opts: any): Promise<any[]>;
+    getStatusExt(opts?: StatusOptions): Promise<StatusFile[]>;
     /**
      * Get the names of the submodules in the repository.
-     *
-     * @returns {Promise<string[]>}
-     *
-     * @memberof Repository
      */
     getSubmoduleNames(): Promise<string[]>;
     /**
      * This will set the HEAD to point to the reference and then attempt to update the index and working tree to match the content of the latest commit on that reference
-     *
-     * @param {Reference} reference
-     * @param {(Object | CheckoutOptions)} opts
-     * @returns {Promise<any>}
-     *
-     * @memberof Repository
      */
-    checkoutRef(reference: Reference, opts: Object | CheckoutOptions): Promise<any>;
+    checkoutRef(reference: Reference, opts?: CheckoutOptions): Promise<Reference>;
     /**
      * This will set the HEAD to point to the local branch and then attempt to update the index and working tree to match the content of the latest commit on that branch
-     *
-     * @param {(string | Reference)} branch
-     * @param {(Object | CheckoutOptions)} opts
-     * @returns {Promise<any>}
-     *
-     * @memberof Repository
      */
-    checkoutBranch(branch: string | Reference, opts: Object | CheckoutOptions): Promise<any>;
+    checkoutBranch(branch: string | Reference, opts?: CheckoutOptions): Promise<Reference>;
     /**
      * Stages or unstages line selection of a specified file
-     *
-     * @param {(string | any[])} filePath
-     * @param {boolean} stageNew
-     * @returns {Promise<number>}
-     *
-     * @memberof Repository
      */
-    stageFilemode(filePath: string | any[], stageNew: boolean): Promise<number>;
+    stageFilemode(filePath: string | string[], stageNew: boolean): Promise<number>;
     /**
      * Stages or unstages line selection of a specified file
-     *
-     * @param {string} filePath
-     * @param {any[]} newLines
-     * @param {boolean} isStaged
-     * @returns {Promise<number>}
-     *
-     * @memberof Repository
      */
-    stageLines(filePath: string, newLines: any[], isStaged: boolean): Promise<number>;
+    stageLines(filePath: string, newLines: DiffLine[], isStaged: boolean): Promise<number>;
     /**
      * Returns true if the repository is in the default NONE state.
-     *
-     * @returns {boolean}
-     *
-     * @memberof Repository
      */
     isDefaultState(): boolean;
     /**
      * Returns true if the repository is in the APPLY_MAILBOX or APPLY_MAILBOX_OR_REBASE state.
-     *
-     * @returns {boolean}
-     *
-     * @memberof Repository
      */
     isApplyingMailbox(): boolean;
     /**
      * Returns true if the repository is in the BISECT state.
-     *
-     * @returns {boolean}
-     *
-     * @memberof Repository
      */
     isBisecting(): boolean;
     /**
      * Returns true if the repository is in the CHERRYPICK state.
-     *
-     * @returns {boolean}
-     *
-     * @memberof Repository
      */
     isCherrypicking(): boolean;
     /**
      * Returns true if the repository is in the MERGE state.
-     *
-     * @returns {boolean}
-     *
-     * @memberof Repository
      */
     isMerging(): boolean;
     /**
      * Returns true if the repository is in the REBASE, REBASE_INTERACTIVE, or REBASE_MERGE state.
-     *
-     * @returns {boolean}
-     *
-     * @memberof Repository
      */
     isRebasing(): boolean;
     /**
      * Returns true if the repository is in the REVERT state.
-     *
-     * @returns {boolean}
-     *
-     * @memberof Repository
      */
     isReverting(): boolean;
     /**
      * Discard line selection of a specified file. Assumes selected lines are unstaged.
-     *
-     * @param {string} filePath
-     * @param {any[]} selectedLines
-     * @returns {Promise<number>}
-     *
-     * @memberof Repository
      */
-    discardLines(filePath: string, selectedLines: any[]): Promise<number>;
+    discardLines(filePath: string, selectedLines: DiffLine[]): Promise<number>;
     /**
      * Grabs a fresh copy of the index from the repository. Invalidates all previously grabbed indexes
-     *
-     * @returns {Promise<Index>}
-     *
-     * @memberof Repository
      */
     refreshIndex(): Promise<Index>;
 }
diff --git a/types/nodegit/reset.d.ts b/types/nodegit/reset.d.ts
index 0fb3af1088..800ad34434 100644
--- a/types/nodegit/reset.d.ts
+++ b/types/nodegit/reset.d.ts
@@ -15,42 +15,16 @@ export namespace Reset {
 export class Reset {
     /**
      * Look up a refs's commit.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Object} target
-     * @param {number} resetType
-     * @param {CheckoutOptions} checkoutOpts
-     * @returns {Promise<number>}
-     *
-     * @memberof Reset
      */
     static reset(repo: Repository, target: Object, resetType: number, checkoutOpts: CheckoutOptions): Promise<number>;
     /**
      * Look up a refs's commit.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Object} target
-     * @param {Strarray} pathspecs
-     * @returns {Promise<number>}
-     *
-     * @memberof Reset
      */
     static default(repo: Repository, target: Object, pathspecs: Strarray): Promise<number>;
     /**
      * Sets the current head to the specified commit oid and optionally resets the index and working tree to match.
      * This behaves like reset but takes an annotated commit, which lets you specify which extended sha syntax string was specified by a user, allowing for more exact reflog messages.
      * See the documentation for reset.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {AnnotatedCommit} commit
-     * @param {number} resetType
-     * @param {CheckoutOptions} checkoutOpts
-     * @returns {number}
-     *
-     * @memberof Reset
      */
     static fromAnnotated(repo: Repository, commit: AnnotatedCommit, resetType: number, checkoutOpts: CheckoutOptions): number;
 }
diff --git a/types/nodegit/rev-parse.d.ts b/types/nodegit/rev-parse.d.ts
index 098f880cd0..c878b791fd 100644
--- a/types/nodegit/rev-parse.d.ts
+++ b/types/nodegit/rev-parse.d.ts
@@ -11,28 +11,6 @@ export namespace Revparse {
 }
 
 export class Revparse {
-    /**
-     *
-     *
-     * @static
-     * @param {Object} objectOut
-     * @param {Reference} referenceOut
-     * @param {Repository} repo
-     * @param {string} spec
-     * @returns {number}
-     *
-     * @memberof Revparse
-     */
     static ext(objectOut: Object, referenceOut: Reference, repo: Repository, spec: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} spec
-     * @returns {Promise<Object>}
-     *
-     * @memberof Revparse
-     */
     static single(repo: Repository, spec: string): Promise<Object>;
 }
diff --git a/types/nodegit/rev-walk.d.ts b/types/nodegit/rev-walk.d.ts
index 2736f57323..065c515743 100644
--- a/types/nodegit/rev-walk.d.ts
+++ b/types/nodegit/rev-walk.d.ts
@@ -12,179 +12,36 @@ export namespace Revwalk {
 }
 
 export class Revwalk {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {Revwalk}
-     *
-     * @memberof Revwalk
-     */
     static create(repo: Repository): Revwalk;
 
-    /**
-     *
-     *
-     * @param {Oid} commitId
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     hide(commitId: Oid): number;
-    /**
-     *
-     *
-     * @param {string} glob
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     hideGlob(glob: string): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     hideHead(): number;
-    /**
-     *
-     *
-     * @param {string} refname
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     hideRef(refname: string): number;
-    /**
-     *
-     *
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Revwalk
-     */
     next(): Promise<Oid>;
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     push(id: Oid): number;
-    /**
-     *
-     *
-     * @param {string} glob
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     pushGlob(glob: string): number;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     pushHead(): number;
-    /**
-     *
-     *
-     * @param {string} range
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     pushRange(range: string): number;
-    /**
-     *
-     *
-     * @param {string} refname
-     * @returns {number}
-     *
-     * @memberof Revwalk
-     */
     pushRef(refname: string): number;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Revwalk
-     */
     repository(): Repository;
-    /**
-     *
-     *
-     *
-     * @memberof Revwalk
-     */
+
     reset(): void;
-    /**
-     *
-     *
-     *
-     * @memberof Revwalk
-     */
+
     simplifyFirstParent(): void;
     /**
      * Set the sort order for the revwalk. This function takes variable arguments like revwalk.sorting(NodeGit.RevWalk.Topological, NodeGit.RevWalk.Reverse).
-     *
-     * @param {number} sort
-     *
-     * @memberof Revwalk
      */
     sorting(sort: number): void;
-    /**
-     *
-     *
-     * @param {number} maxCount
-     * @returns {Promise<any>}
-     *
-     * @memberof Revwalk
-     */
     fastWalk(maxCount: number): Promise<any>;
-    /**
-     *
-     *
-     * @param {string} filePath
-     * @param {number} maxCount
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Revwalk
-     */
     fileHistoryWalk(filePath: string, maxCount: number): Promise<any[]>;
     /**
      * Walk the history from the given oid. The callback is invoked for each commit; When the walk is over, the callback is invoked with (null, null).
-     *
-     * @param {Oid} oid
-     * @param {Function} callback
-     * @returns {Commit}
-     *
-     * @memberof Revwalk
      */
-    walk(oid: Oid, callback: Function): Commit;
+    walk(oid: Oid, callback?: Function): Commit;
     /**
      * Walk the history grabbing commits until the checkFn called with the current commit returns false.
-     *
-     * @param {Function} checkFn
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Revwalk
      */
     getCommitsUntil(checkFn: Function): Promise<any[]>;
-    /**
-     *
-     *
-     * @param {number} count
-     * @returns {Promise<Commit[]>}
-     *
-     * @memberof Revwalk
-     */
     getCommits(count: number): Promise<Commit[]>;
 }
diff --git a/types/nodegit/revert.d.ts b/types/nodegit/revert.d.ts
index 2e04f78758..1f9d4a2677 100644
--- a/types/nodegit/revert.d.ts
+++ b/types/nodegit/revert.d.ts
@@ -5,37 +5,17 @@ import { Commit } from './commit';
 import { Index } from './index';
 
 export interface RevertOptions {
-    version: number;
-    mainline: number;
-    mergeOpts: MergeOptions;
-    checkoutOpts: CheckoutOptions;
+    version?: number;
+    mainline?: number;
+    mergeOpts?: MergeOptions;
+    checkoutOpts?: CheckoutOptions;
+    [key: string]: any;
 }
 
 export class Revert {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Commit} commit
-     * @param {RevertOptions} givenOpts
-     * @returns {Promise<number>}
-     *
-     * @memberof Revert
-     */
     static revert(repo: Repository, commit: Commit, givenOpts: RevertOptions): Promise<number>;
     /**
      * Reverts the given commit against the given "our" commit, producing an index that reflects the result of the revert.
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Commit} revertCommit
-     * @param {Commit} ourCommit
-     * @param {number} mainline
-     * @param {MergeOptions} mergeOptions
-     * @returns {Promise<Index>}
-     *
-     * @memberof Revert
      */
-    static commit(repo: Repository, revertCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions: MergeOptions): Promise<Index>;
+    static commit(repo: Repository, revertCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions?: MergeOptions): Promise<Index>;
 }
diff --git a/types/nodegit/signature.d.ts b/types/nodegit/signature.d.ts
index 6854760004..3e62110d0c 100644
--- a/types/nodegit/signature.d.ts
+++ b/types/nodegit/signature.d.ts
@@ -2,93 +2,16 @@ import { Repository } from './repository';
 import { Time } from './time';
 
 export class Signature {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {Signature}
-     *
-     * @memberof Signature
-     */
     static default(repo: Repository): Signature;
-    /**
-     *
-     *
-     * @static
-     * @param {string} name
-     * @param {string} email
-     * @param {number} time
-     * @param {number} offset
-     * @returns {Signature}
-     *
-     * @memberof Signature
-     */
     static create(name: string, email: string, time: number, offset: number): Signature;
-    /**
-     *
-     *
-     * @static
-     * @param {string} name
-     * @param {string} email
-     * @returns {Signature}
-     *
-     * @memberof Signature
-     */
     static now(name: string, email: string): Signature;
-    /**
-     *
-     *
-     * @static
-     * @param {string} buf
-     * @returns {Promise<Signature>}
-     *
-     * @memberof Signature
-     */
     static fromBuffer(buf: string): Promise<Signature>;
 
-    /**
-     *
-     *
-     * @returns {Promise<Signature>}
-     *
-     * @memberof Signature
-     */
     dup(): Promise<Signature>;
-    /**
-     *
-     *
-     *
-     * @memberof Signature
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Signature
-     */
     toString(): string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof Signature
-     */
     name: string;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof Signature
-     */
     email: string;
-    /**
-     *
-     *
-     * @type {Time}
-     * @memberof Signature
-     */
     when: Time;
 }
diff --git a/types/nodegit/stash.d.ts b/types/nodegit/stash.d.ts
index 1aae88bd85..68d61d0e0f 100644
--- a/types/nodegit/stash.d.ts
+++ b/types/nodegit/stash.d.ts
@@ -29,113 +29,18 @@ export namespace Stash {
 }
 
 export interface StashApplyOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof StashApplyOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof StashApplyOptions
-     */
     flags?: number;
-    /**
-     *
-     *
-     * @type {CheckoutOptions}
-     * @memberof StashApplyOptions
-     */
     checkoutOptions?: CheckoutOptions;
-    /**
-     *
-     *
-     * @type {Function}
-     * @memberof StashApplyOptions
-     */
     progressCb?: Function;
-    /**
-     *
-     *
-     * @type {*}
-     * @memberof StashApplyOptions
-     */
     progressPayload?: any;
 }
 
 export class Stash {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {number} index
-     * @param {StashApplyOptions} options
-     * @returns {Promise<number>}
-     *
-     * @memberof Stash
-     */
-    static apply(repo: Repository, index: number, options: StashApplyOptions): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {StashApplyOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Stash
-     */
+    static apply(repo: Repository, index: number, options?: StashApplyOptions): Promise<number>;
     static applyInitOptions(opts: StashApplyOptions, version: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {number} index
-     * @returns {Promise<number>}
-     *
-     * @memberof Stash
-     */
     static drop(repo: Repository, index: number): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Function} callback
-     * @param {*} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Stash
-     */
-    static foreach(repo: Repository, callback: Function, payload: any): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {number} index
-     * @param {StashApplyOptions} options
-     * @returns {Promise<number>}
-     *
-     * @memberof Stash
-     */
-    static pop(repo: Repository, index: number, options: StashApplyOptions): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Signature} stasher
-     * @param {string} message
-     * @param {number} flags
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Stash
-     */
+    static foreach(repo: Repository, callback?: Function): Promise<number>;
+    static pop(repo: Repository, index: number, options?: StashApplyOptions): Promise<number>;
     static save(repo: Repository, stasher: Signature, message: string, flags: number): Promise<Oid>;
 }
diff --git a/types/nodegit/status-entry.d.ts b/types/nodegit/status-entry.d.ts
index 70435d5de1..59de1a9760 100644
--- a/types/nodegit/status-entry.d.ts
+++ b/types/nodegit/status-entry.d.ts
@@ -1,25 +1,7 @@
 import { DiffDelta } from './diff-delta';
 
 export class StatusEntry {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof StatusEntry
-     */
-    status: number;
-    /**
-     *
-     *
-     * @type {DiffDelta}
-     * @memberof StatusEntry
-     */
-    headToIndex: DiffDelta;
-    /**
-     *
-     *
-     * @type {DiffDelta}
-     * @memberof StatusEntry
-     */
-    indexToWorkdir: DiffDelta;
+    status(): number;
+    headToIndex(): DiffDelta;
+    indexToWorkdir(): DiffDelta;
 }
diff --git a/types/nodegit/status-file-options.d.ts b/types/nodegit/status-file-options.d.ts
new file mode 100644
index 0000000000..e3852cf0e6
--- /dev/null
+++ b/types/nodegit/status-file-options.d.ts
@@ -0,0 +1,8 @@
+import { StatusEntry } from './status-entry';
+
+export interface StatusFileOptions {
+    path?: string;
+    status?: number;
+    entry?: StatusEntry;
+    [key: string]: any;
+}
diff --git a/types/nodegit/status-file.d.ts b/types/nodegit/status-file.d.ts
new file mode 100644
index 0000000000..b34a0f234f
--- /dev/null
+++ b/types/nodegit/status-file.d.ts
@@ -0,0 +1,20 @@
+import { DiffDelta } from './diff-delta';
+import { StatusFileOptions } from './status-file-options';
+
+export class StatusFile {
+    constructor(args: StatusFileOptions);
+    headToIndex(): DiffDelta;
+    indexToWorkdir(): DiffDelta;
+    inIndex(): boolean;
+    inWorkingTree(): boolean;
+    isConflicted(): boolean;
+    isDeleted(): boolean;
+    isIgnored(): boolean;
+    isModified(): boolean;
+    isNew(): boolean;
+    isRenamed(): boolean;
+    isTypechange(): boolean;
+    path(): string;
+    status(): string[];
+    statusBit(): number;
+}
diff --git a/types/nodegit/status-list.d.ts b/types/nodegit/status-list.d.ts
index 7847da4d1d..1b470ceb71 100644
--- a/types/nodegit/status-list.d.ts
+++ b/types/nodegit/status-list.d.ts
@@ -3,39 +3,10 @@ import { DiffPerfdata } from './diff-perf-data';
 import { StatusOptions } from './status-options';
 
 export class StatusList {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {StatusOptions} opts
-     * @returns {Promise<StatusList>}
-     *
-     * @memberof StatusList
-     */
-    static create(repo: Repository, opts: StatusOptions): Promise<StatusList>;
+    static create(repo: Repository, opts?: StatusOptions): Promise<StatusList>;
 
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof StatusList
-     */
     entrycount(): number;
-    /**
-     *
-     *
-     *
-     * @memberof StatusList
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Promise<DiffPerfdata>}
-     *
-     * @memberof StatusList
-     */
     getPerfdata(): Promise<DiffPerfdata>;
 }
diff --git a/types/nodegit/status-options.d.ts b/types/nodegit/status-options.d.ts
index fe2f728737..363dcd1fbb 100644
--- a/types/nodegit/status-options.d.ts
+++ b/types/nodegit/status-options.d.ts
@@ -1,32 +1,9 @@
 import { Strarray } from './str-array';
 
 export interface StatusOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof StatusOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof StatusOptions
-     */
     show?: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof StatusOptions
-     */
     flags?: number;
-    /**
-     *
-     *
-     * @type {Strarray}
-     * @memberof StatusOptions
-     */
     pathspec?: Strarray;
+    [key: string]: any;
 }
diff --git a/types/nodegit/status.d.ts b/types/nodegit/status.d.ts
index 892b1f1c36..5b657d1cc5 100644
--- a/types/nodegit/status.d.ts
+++ b/types/nodegit/status.d.ts
@@ -1,7 +1,7 @@
 import { Repository } from './repository';
 import { StatusList } from './status-list';
-import { StatusEntry } from './status-entry';
 import { StatusOptions } from './status-options';
+import { StatusEntry } from './status-entry';
 
 export namespace Status {
     const enum STATUS {
@@ -48,63 +48,9 @@ export namespace Status {
 }
 
 export class Status {
-    /**
-     *
-     *
-     * @static
-     * @param {StatusList} statuslist
-     * @param {number} idx
-     * @returns {StatusEntry}
-     *
-     * @memberof Status
-     */
     static byIndex(statuslist: StatusList, idx: number): StatusEntry;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} path
-     * @returns {number}
-     *
-     * @memberof Status
-     */
     static file(repo: Repository, path: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Function} callback
-     * @param {*} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Status
-     */
-    static foreach(repo: Repository, callback: Function, payload: any): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {StatusOptions} opts
-     * @param {Function} callback
-     * @param {*} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Status
-     */
-    static foreachExt(repo: Repository, opts: StatusOptions, callback: Function, payload: any): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {number} ignored
-     * @param {Repository} repo
-     * @param {string} path
-     * @returns {number}
-     *
-     * @memberof Status
-     */
+    static foreach(repo: Repository, callback?: Function): Promise<number>;
+    static foreachExt(repo: Repository, opts?: StatusOptions, callback?: Function): Promise<number>;
     static shouldIgnore(ignored: number, repo: Repository, path: string): number;
 }
diff --git a/types/nodegit/str-array.d.ts b/types/nodegit/str-array.d.ts
index 603889f756..44f5914be7 100644
--- a/types/nodegit/str-array.d.ts
+++ b/types/nodegit/str-array.d.ts
@@ -1,32 +1,7 @@
 export class Strarray {
-    /**
-     *
-     *
-     * @param {Strarray} src
-     * @returns {number}
-     *
-     * @memberof Strarray
-     */
     copy(src: Strarray): number;
-    /**
-     *
-     *
-     *
-     * @memberof Strarray
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @type {string[]}
-     * @memberof Strarray
-     */
     strings: string[];
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof Strarray
-     */
     count: number;
 }
diff --git a/types/nodegit/submodule-update-options.d.ts b/types/nodegit/submodule-update-options.d.ts
index 3b07383090..5be827b368 100644
--- a/types/nodegit/submodule-update-options.d.ts
+++ b/types/nodegit/submodule-update-options.d.ts
@@ -2,32 +2,9 @@ import { CheckoutOptions } from './checkout-options';
 import { FetchOptions } from './fetch-options';
 
 export interface SubmoduleUpdateOptions {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof SubmoduleUpdateOptions
-     */
     version?: number;
-    /**
-     *
-     *
-     * @type {CheckoutOptions}
-     * @memberof SubmoduleUpdateOptions
-     */
     checkoutOpts?: CheckoutOptions;
-    /**
-     *
-     *
-     * @type {FetchOptions}
-     * @memberof SubmoduleUpdateOptions
-     */
     fetchOpts?: FetchOptions;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof SubmoduleUpdateOptions
-     */
     cloneCheckoutStrategy?: number;
+    [key: string]: any;
 }
diff --git a/types/nodegit/submodule.d.ts b/types/nodegit/submodule.d.ts
index a946e28fa4..4ac5ce3ac6 100644
--- a/types/nodegit/submodule.d.ts
+++ b/types/nodegit/submodule.d.ts
@@ -45,308 +45,43 @@ export namespace Submodule {
 }
 
 export class Submodule {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} url
-     * @param {string} path
-     * @param {number} useGitLink
-     * @returns {Promise<Submodule>}
-     *
-     * @memberof Submodule
-     */
     static addSetup(repo: Repository, url: string, path: string, useGitLink: number): Promise<Submodule>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Function} callback
-     * @param {*} payload
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
-    static foreach(repo: Repository, callback: Function, payload: any): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @returns {Promise<Submodule>}
-     *
-     * @memberof Submodule
-     */
+    static foreach(repo: Repository, callback?: Function): Promise<number>;
     static lookup(repo: Repository, name: string): Promise<Submodule>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} url
-     * @returns {Promise<Buf>}
-     *
-     * @memberof Submodule
-     */
     static resolveUrl(repo: Repository, url: string): Promise<Buf>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {string} branch
-     * @returns {number}
-     *
-     * @memberof Submodule
-     */
     static setBranch(repo: Repository, name: string, branch: string): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {number} fetchRecurseSubmodules
-     * @returns {number}
-     *
-     * @memberof Submodule
-     */
     static setFetchRecurseSubmodules(repo: Repository, name: string, fetchRecurseSubmodules: number): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {number} ignore
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     static setIgnore(repo: Repository, name: string, ignore: number): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {number} update
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     static setUpdate(repo: Repository, name: string, update: number): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {string} url
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     static setUrl(repo: Repository, name: string, url: string): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} name
-     * @param {number} ignore
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     static status(repo: Repository, name: string, ignore: number): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {SubmoduleUpdateOptions} opts
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Submodule
-     */
     static updateInitOptions(opts: SubmoduleUpdateOptions, version: number): number;
 
-    /**
-     *
-     *
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     addFinalize(): Promise<number>;
-    /**
-     *
-     *
-     * @param {number} writeIndex
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     addToIndex(writeIndex: number): Promise<number>;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Submodule
-     */
     branch(): string;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Submodule
-     */
     fetchRecurseSubmodules(): number;
-    /**
-     *
-     *
-     *
-     * @memberof Submodule
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Submodule
-     */
     headId(): Oid;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Submodule
-     */
     ignore(): number;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Submodule
-     */
     indexId(): Oid;
-    /**
-     *
-     *
-     * @param {number} overwrite
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     init(overwrite: number): Promise<number>;
-    /**
-     *
-     *
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     location(): Promise<number>;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Submodule
-     */
     name(): string;
-    /**
-     *
-     *
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Submodule
-     */
     open(): Promise<Repository>;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Submodule
-     */
     owner(): Repository;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Submodule
-     */
     path(): string;
-    /**
-     *
-     *
-     * @param {number} force
-     * @returns {number}
-     *
-     * @memberof Submodule
-     */
     reload(force: number): number;
-    /**
-     *
-     *
-     * @param {number} useGitLink
-     * @returns {Promise<Repository>}
-     *
-     * @memberof Submodule
-     */
     repoInit(useGitLink: number): Promise<Repository>;
-    /**
-     *
-     *
-     * @returns {Promise<number>}
-     *
-     * @memberof Submodule
-     */
     sync(): Promise<number>;
     /**
      * Updates a submodule
      *
-     * @param {number} init
-     * @param {SubmoduleUpdateOptions} options
-     * @returns {Promise<number>}
      *
-     * @memberof Submodule
-     */
-    update(init: number, options: SubmoduleUpdateOptions): Promise<number>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Submodule
      */
+    update(init: number, options?: SubmoduleUpdateOptions): Promise<number>;
     updateStrategy(): number;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Submodule
-     */
     url(): string;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Submodule
-     */
     wdId(): Oid;
 }
diff --git a/types/nodegit/tag.d.ts b/types/nodegit/tag.d.ts
index f676c72ab5..3f6b5aa836 100644
--- a/types/nodegit/tag.d.ts
+++ b/types/nodegit/tag.d.ts
@@ -5,191 +5,30 @@ import { Signature } from './signature';
 import { Strarray } from './str-array';
 
 export class Tag {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} tagName
-     * @param {Object} target
-     * @param {Signature} tagger
-     * @param {string} message
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Tag
-     */
     static annotationCreate(repo: Repository, tagName: string, target: Object, tagger: Signature, message: string): Promise<Oid>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} tagName
-     * @param {Object} target
-     * @param {Signature} tagger
-     * @param {string} message
-     * @param {number} force
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Tag
-     */
     static create(repo: Repository, tagName: string, target: Object, tagger: Signature, message: string, force: number): Promise<Oid>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} tagName
-     * @param {Object} target
-     * @param {number} force
-     * @returns {Promise<Oid>}
-     *
-     * @memberof Tag
-     */
     static createLightweight(repo: Repository, tagName: string, target: Object, force: number): Promise<Oid>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {string} tagName
-     * @returns {Promise<number>}
-     *
-     * @memberof Tag
-     */
     static delete(repo: Repository, tagName: string): Promise<number>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @returns {Promise<any[]>}
-     *
-     * @memberof Tag
-     */
     static list(repo: Repository): Promise<any[]>;
-    /**
-     *
-     *
-     * @static
-     * @param {Strarray} tagNames
-     * @param {string} pattern
-     * @param {Repository} repo
-     * @returns {number}
-     *
-     * @memberof Tag
-     */
     static listMatch(tagNames: Strarray, pattern: string, repo: Repository): number;
     /**
      * Retrieves the tag pointed to by the oid
      *
-     * @static
-     * @param {Repository} repo
-     * @param {(string | Oid | Tag)} id
-     * @returns {Promise<Tag>}
      *
-     * @memberof Tag
      */
     static lookup(repo: Repository, id: string | Oid | Tag): Promise<Tag>;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} id
-     * @param {number} len
-     * @returns {Promise<Tag>}
-     *
-     * @memberof Tag
-     */
     static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Tag>;
 
-    /**
-     *
-     *
-     * @returns {Promise<Tag>}
-     *
-     * @memberof Tag
-     */
     dup(): Promise<Tag>;
-    /**
-     *
-     *
-     *
-     * @memberof Tag
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Tag
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Tag
-     */
     message(): string;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof Tag
-     */
     name(): string;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Tag
-     */
     owner(): Repository;
-    /**
-     *
-     *
-     * @param {Object} tagTargetOut
-     * @returns {number}
-     *
-     * @memberof Tag
-     */
     peel(tagTargetOut: Object): number;
-    /**
-     *
-     *
-     * @returns {Signature}
-     *
-     * @memberof Tag
-     */
     tagger(): Signature;
-    /**
-     *
-     *
-     * @returns {Object}
-     *
-     * @memberof Tag
-     */
     target(): Object;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Tag
-     */
     targetId(): Oid;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Tag
-     */
     targetType(): number;
 }
diff --git a/types/nodegit/time.d.ts b/types/nodegit/time.d.ts
index 299bcfa35e..575c005781 100644
--- a/types/nodegit/time.d.ts
+++ b/types/nodegit/time.d.ts
@@ -1,16 +1,4 @@
 export class Time {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof Time
-     */
     time: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof Time
-     */
     offset: number;
 }
diff --git a/types/nodegit/transfer-progress.d.ts b/types/nodegit/transfer-progress.d.ts
index f4c0d21065..1589d4b6c6 100644
--- a/types/nodegit/transfer-progress.d.ts
+++ b/types/nodegit/transfer-progress.d.ts
@@ -1,51 +1,9 @@
 export class TransferProgress {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TransferProgress
-     */
     totalObjects: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TransferProgress
-     */
     indexedObjects: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TransferProgress
-     */
     receivedObjects: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TransferProgress
-     */
     localObjects: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TransferProgress
-     */
     totalDeltas: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TransferProgress
-     */
     indexedDeltas: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TransferProgress
-     */
     receivedBytes: number;
 }
diff --git a/types/nodegit/transport.d.ts b/types/nodegit/transport.d.ts
index 01dd4312ef..4cdd39f400 100644
--- a/types/nodegit/transport.d.ts
+++ b/types/nodegit/transport.d.ts
@@ -9,45 +9,8 @@ export namespace Transport {
 }
 
 export class Transport {
-    /**
-     * å
-     *
-     * @static
-     * @param {Remote} owner
-     * @param {Strarray} payload
-     * @returns {Promise<Transport>}
-     *
-     * @memberof Transport
-     */
     static sshWithPaths(owner: Remote, payload: Strarray): Promise<Transport>;
-    /**
-     *
-     *
-     * @static
-     * @param {string} prefix
-     * @returns {number}
-     *
-     * @memberof Transport
-     */
     static unregister(prefix: string): number;
-    /**
-     *
-     *
-     * @param {number} version
-     * @returns {number}
-     *
-     * @memberof Transport
-     */
     init(version: number): number;
-    /**
-     *
-     *
-     * @param {Cert} cert
-     * @param {number} valid
-     * @param {string} hostName
-     * @returns {number}
-     *
-     * @memberof Transport
-     */
     smartCertificateCheck(cert: Cert, valid: number, hostName: string): number;
 }
diff --git a/types/nodegit/tree-builder.d.ts b/types/nodegit/tree-builder.d.ts
index 4c50cdbd65..f5a6715492 100644
--- a/types/nodegit/tree-builder.d.ts
+++ b/types/nodegit/tree-builder.d.ts
@@ -4,75 +4,12 @@ import { Tree } from './tree';
 import { TreeEntry } from './tree-entry';
 
 export class Treebuilder {
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Tree} source
-     * @returns {Promise<Treebuilder>}
-     *
-     * @memberof Treebuilder
-     */
     static create(repo: Repository, source: Tree): Promise<Treebuilder>;
-
-    /**
-     *
-     *
-     *
-     * @memberof Treebuilder
-     */
     clear(): void;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Treebuilder
-     */
     entrycount(): number;
-    /**
-     *
-     *
-     *
-     * @memberof Treebuilder
-     */
     free(): void;
-    /**
-     *
-     *
-     * @param {string} filename
-     * @returns {TreeEntry}
-     *
-     * @memberof Treebuilder
-     */
     get(filename: string): TreeEntry;
-    /**
-     *
-     *
-     * @param {string} filename
-     * @param {Oid} id
-     * @param {number} filemode
-     * @returns {Promise<TreeEntry>}
-     *
-     * @memberof Treebuilder
-     */
     insert(filename: string, id: Oid, filemode: number): Promise<TreeEntry>;
-    /**
-     *
-     *
-     * @param {string} filename
-     * @returns {number}
-     *
-     * @memberof Treebuilder
-     */
     remove(filename: string): number;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Treebuilder
-     */
     write(): Oid;
 }
diff --git a/types/nodegit/tree-entry.d.ts b/types/nodegit/tree-entry.d.ts
index 3cf20499d3..a5e68a6081 100644
--- a/types/nodegit/tree-entry.d.ts
+++ b/types/nodegit/tree-entry.d.ts
@@ -15,148 +15,34 @@ export namespace TreeEntry {
 }
 
 export class TreeEntry {
-    /**
-     *
-     *
-     * @returns {TreeEntry.FILEMODE}
-     *
-     * @memberof TreeEntry
-     */
     filemode(): TreeEntry.FILEMODE;
-    /**
-     *
-     *
-     * @returns {TreeEntry.FILEMODE}
-     *
-     * @memberof TreeEntry
-     */
     filemodeRaw(): TreeEntry.FILEMODE;
-    /**
-     *
-     *
-     *
-     * @memberof TreeEntry
-     */
     free(): void;
-    /**
-     *
-     *
-     * @returns {Promise<Blob>}
-     *
-     * @memberof TreeEntry
-     */
     getBlob(): Promise<Blob>;
-    /**
-     *
-     *
-     * @returns {Promise<Tree>}
-     *
-     * @memberof TreeEntry
-     */
     getTree(): Promise<Tree>;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof TreeEntry
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof TreeEntry
-     */
     isBlob(): boolean;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof TreeEntry
-     */
     isFile(): boolean;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof TreeEntry
-     */
     isTree(): boolean;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof TreeEntry
-     */
     isDirectory(): boolean;
-    /**
-     *
-     *
-     * @returns {boolean}
-     *
-     * @memberof TreeEntry
-     */
     isSubmodule(): boolean;
     /**
      * Retrieve the SHA for this TreeEntry.
-     *
-     * @returns {string}
-     *
-     * @memberof TreeEntry
      */
     sha(): string;
-    /**
-     *
-     *
-     * @returns {string}
-     *
-     * @memberof TreeEntry
-     */
     name(): string;
     /**
      * Retrieve the SHA for this TreeEntry. Alias for sha
-     *
-     * @returns {string}
-     *
-     * @memberof TreeEntry
      */
     oid(): string;
     /**
      * Returns the path for this entry.
-     *
-     * @returns {string}
-     *
-     * @memberof TreeEntry
      */
     path(): string;
     /**
      * Alias for path
-     *
-     * @returns {string}
-     *
-     * @memberof TreeEntry
      */
     toString(): string;
-    /**
-     *
-     *
-     * @param {Repository} repo
-     * @returns {Object}
-     *
-     * @memberof TreeEntry
-     */
     toObject(repo: Repository): Object;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof TreeEntry
-     */
     type(): number;
 }
diff --git a/types/nodegit/tree-update.d.ts b/types/nodegit/tree-update.d.ts
index f8834513f4..fde63d064e 100644
--- a/types/nodegit/tree-update.d.ts
+++ b/types/nodegit/tree-update.d.ts
@@ -1,32 +1,8 @@
 import { Oid } from './oid';
 
 export class TreeUpdate {
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TreeUpdate
-     */
     action: number;
-    /**
-     *
-     *
-     * @type {number}
-     * @memberof TreeUpdate
-     */
     filemode: number;
-    /**
-     *
-     *
-     * @type {Oid}
-     * @memberof TreeUpdate
-     */
     id: Oid;
-    /**
-     *
-     *
-     * @type {string}
-     * @memberof TreeUpdate
-     */
     path: string;
 }
diff --git a/types/nodegit/tree.d.ts b/types/nodegit/tree.d.ts
index 057d3b2907..50c29e8a3f 100644
--- a/types/nodegit/tree.d.ts
+++ b/types/nodegit/tree.d.ts
@@ -14,208 +14,61 @@ export namespace Tree {
 }
 
 export class Tree {
-    /**
-     *
-     *
-     * @static
-     * @param {TreeEntry} tree1
-     * @param {TreeEntry} tree2
-     * @returns {number}
-     *
-     * @memberof Tree
-     */
     static entryCmp(tree1: TreeEntry, tree2: TreeEntry): number;
-    /**
-     *
-     *
-     * @static
-     * @param {TreeEntry} dest
-     * @param {TreeEntry} source
-     * @returns {number}
-     *
-     * @memberof Tree
-     */
     static entryDup(dest: TreeEntry, source: TreeEntry): number;
-    /**
-     *
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {Oid} id
-     * @param {number} len
-     * @returns {Promise<Tree>}
-     *
-     * @memberof Tree
-     */
     static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Tree>;
     /**
      * Retrieves the tree pointed to by the oid
-     *
-     * @static
-     * @param {Repository} repo
-     * @param {(string | Oid | Tree)} id
-     * @param {Function} callback
-     * @returns {Promise<Tree>}
-     *
-     * @memberof Tree
      */
-    static lookup(repo: Repository, id: string | Oid | Tree, callback: Function): Promise<Tree>;
+    static lookup(repo: Repository, id: string | Oid | Tree, callback?: Function): Promise<Tree>;
 
-    /**
-     *
-     *
-     * @param {Oid} id
-     * @returns {TreeEntry}
-     *
-     * @memberof Tree
-     */
     entryById(id: Oid): TreeEntry;
-    /**
-     *
-     *
-     * @param {number} idx
-     * @returns {TreeEntry}
-     *
-     * @memberof Tree
-     */
     _entryByIndex(idx: number): TreeEntry;
     /**
      * Get an entry by name; if the tree is a directory, the name is the filename.
-     *
-     * @param {string} name
-     * @returns {TreeEntry}
-     *
-     * @memberof Tree
      */
     entryByName(name: string): TreeEntry;
-    /**
-     *
-     *
-     * @param {string} filename
-     * @returns {TreeEntry}
-     *
-     * @memberof Tree
-     */
     _entryByName(filename: string): TreeEntry;
-    /**
-     *
-     *
-     * @param {string} path
-     * @returns {Promise<TreeEntry>}
-     *
-     * @memberof Tree
-     */
     entryByPath(path: string): Promise<TreeEntry>;
-    /**
-     *
-     *
-     * @returns {number}
-     *
-     * @memberof Tree
-     */
     entryCount(): number;
-    /**
-     *
-     *
-     *
-     * @memberof Tree
-     */
+
     free(): void;
-    /**
-     *
-     *
-     * @returns {Oid}
-     *
-     * @memberof Tree
-     */
     id(): Oid;
-    /**
-     *
-     *
-     * @returns {Repository}
-     *
-     * @memberof Tree
-     */
     owner(): Repository;
     /**
      * Diff two trees
-     *
-     * @param {Tree} tree
-     * @param {Function} callback
-     * @returns {Promise<DiffFile[]>}
-     *
-     * @memberof Tree
      */
-    diff(tree: Tree, callback: Function): Promise<DiffFile[]>;
+    diff(tree: Tree, callback?: Function): Promise<DiffFile[]>;
     /**
      * Diff two trees with options
-     *
-     * @param {Tree} tree
-     * @param {Object} options
-     * @param {Function} callback
-     * @returns {Promise<DiffFile[]>}
-     *
-     * @memberof Tree
      */
-    diffWithOptions(tree: Tree, options: Object, callback: Function): Promise<DiffFile[]>;
+    diffWithOptions(tree: Tree, options?: Object, callback?: Function): Promise<DiffFile[]>;
     /**
      * Get an entry at the ith position.
-     *
-     * @param {number} i
-     * @returns {TreeEntry}
-     *
-     * @memberof Tree
      */
     entryByIndex(i: number): TreeEntry;
     /**
      * Get an entry at a path. Unlike by name, this takes a fully qualified path, like /foo/bar/baz.javascript
-     *
-     * @param {string} filePath
-     * @returns {TreeEntry}
-     *
-     * @memberof Tree
      */
     getEntry(filePath: string): TreeEntry;
     /**
      * Return an array of the entries in this tree (excluding its children).
-     *
-     * @returns {TreeEntry[]}
-     *
-     * @memberof Tree
      */
     entries(): TreeEntry[];
     /**
      * Recursively walk the tree in breadth-first order. Fires an event for each entry.
-     *
-     * @param {boolean} [blobsOnly]
-     * @returns {NodeJS.EventEmitter}
-     *
-     * @memberof Tree
      */
     walk(blobsOnly?: boolean): NodeJS.EventEmitter;
     /**
      * Return the path of this tree, like /lib/foo/bar
      *
-     * @returns {string}
      *
-     * @memberof Tree
      */
     path(): string;
     /**
      * Make builder. This is helpful for modifying trees.
-     *
-     * @returns {Treebuilder}
-     *
-     * @memberof Tree
      */
     builder(): Treebuilder;
-    /**
-     *
-     *
-     * @returns {Promise<Tree>}
-     *
-     * @memberof Tree
-     */
     dup(): Promise<Tree>;
     createUpdated(repo: Repository, nUpdates: number, updates: TreeUpdate): Promise<Oid>;
 }
diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json
index 4ba1bdece6..e097a77133 100644
--- a/types/nodegit/tsconfig.json
+++ b/types/nodegit/tsconfig.json
@@ -36,6 +36,7 @@
         "clone.d.ts",
         "commit.d.ts",
         "config.d.ts",
+        "convenient-hunk.d.ts",
         "convenient-patch.d.ts",
         "cred-user-pass-payload.d.ts",
         "cred-username.d.ts",
@@ -47,7 +48,6 @@
         "diff-binary.d.ts",
         "diff-delta.d.ts",
         "diff-file.d.ts",
-        "diff-hunk.d.ts",
         "diff-line.d.ts",
         "diff-options.d.ts",
         "diff-perf-data.d.ts",
@@ -102,6 +102,8 @@
         "signature.d.ts",
         "stash.d.ts",
         "status-entry.d.ts",
+        "status-file-options.d.ts",
+        "status-file.d.ts",
         "status-list.d.ts",
         "status-options.d.ts",
         "status.d.ts",
@@ -117,4 +119,4 @@
         "tree-update.d.ts",
         "tree.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/nodegit/tslint.json b/types/nodegit/tslint.json
index a62d0d4e68..0ec275bd05 100644
--- a/types/nodegit/tslint.json
+++ b/types/nodegit/tslint.json
@@ -1,6 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "ban-types": false
+        // TODOs
+        "ban-types": false,
+        "no-unnecessary-class": false
     }
 }
diff --git a/types/nodemailer-direct-transport/tsconfig.json b/types/nodemailer-direct-transport/tsconfig.json
index 00d449ecd7..a86a4a088a 100644
--- a/types/nodemailer-direct-transport/tsconfig.json
+++ b/types/nodemailer-direct-transport/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "nodemailer": [
+                "nodemailer/v3"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/nodemailer-direct-transport/tslint.json b/types/nodemailer-direct-transport/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodemailer-direct-transport/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodemailer-mailgun-transport/index.d.ts b/types/nodemailer-mailgun-transport/index.d.ts
index 63db09ae29..71acb6691e 100644
--- a/types/nodemailer-mailgun-transport/index.d.ts
+++ b/types/nodemailer-mailgun-transport/index.d.ts
@@ -2,19 +2,33 @@
 // Project: https://github.com/orliesaurus/nodemailer-mailgun-transport
 // Definitions by: Oto Ciulis <https://github.com/otociulis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as nodemailer from 'nodemailer';
+import Mail = require('nodemailer/lib/mailer');
+import MailMessage = require('nodemailer/lib/mailer/mail-message');
 
 declare namespace mailgunTransport {
-    interface Options {
-        auth: AuthOptions;
-    }
     interface AuthOptions {
         api_key: string;
         domain?: string;
     }
+
+    interface Options {
+        auth: AuthOptions;
+    }
+
+    type MailOptions = Mail.Options;
+
+    type Information = object;
+
+    class MailgunTransport implements nodemailer.Transport {
+        name: string;
+        version: string;
+        send(mail: MailMessage, callback: (err: Error | null, info?: Information) => void): void;
+    }
 }
 
-declare function mailgunTransport(options: mailgunTransport.Options): nodemailer.Transport;
+declare function mailgunTransport(options: mailgunTransport.Options): mailgunTransport.MailgunTransport;
 
 export = mailgunTransport;
diff --git a/types/nodemailer-mailgun-transport/nodemailer-mailgun-transport-tests.ts b/types/nodemailer-mailgun-transport/nodemailer-mailgun-transport-tests.ts
index 20ab33766b..0980f43cbd 100644
--- a/types/nodemailer-mailgun-transport/nodemailer-mailgun-transport-tests.ts
+++ b/types/nodemailer-mailgun-transport/nodemailer-mailgun-transport-tests.ts
@@ -24,6 +24,7 @@ const mailOptions: nodemailer.SendMailOptions = {
     text: 'Hello world ✔', // plaintext body
     html: '<b>Hello world ✔</b>' // html body
 };
-transport.sendMail(mailOptions, (error: Error, info: nodemailer.SentMessageInfo): void => {
+
+transport.sendMail(mailOptions, (error: Error | null, info: nodemailer.SentMessageInfo): void => {
 	// nothing
 });
diff --git a/types/nodemailer-pickup-transport/tsconfig.json b/types/nodemailer-pickup-transport/tsconfig.json
index 777d450e29..913453977e 100644
--- a/types/nodemailer-pickup-transport/tsconfig.json
+++ b/types/nodemailer-pickup-transport/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "nodemailer": [
+                "nodemailer/v3"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/nodemailer-pickup-transport/tslint.json b/types/nodemailer-pickup-transport/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodemailer-pickup-transport/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodemailer-ses-transport/package.json b/types/nodemailer-ses-transport/package.json
index 6a583a47b0..3711406140 100644
--- a/types/nodemailer-ses-transport/package.json
+++ b/types/nodemailer-ses-transport/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "aws-sdk": "^2.37.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/nodemailer-ses-transport/tsconfig.json b/types/nodemailer-ses-transport/tsconfig.json
index 42f2bb9c76..bdaffbb222 100644
--- a/types/nodemailer-ses-transport/tsconfig.json
+++ b/types/nodemailer-ses-transport/tsconfig.json
@@ -13,6 +13,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "nodemailer": [
+                "nodemailer/v3"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/nodemailer-smtp-pool/tsconfig.json b/types/nodemailer-smtp-pool/tsconfig.json
index 26e5f2737f..63a47e4ce7 100644
--- a/types/nodemailer-smtp-pool/tsconfig.json
+++ b/types/nodemailer-smtp-pool/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "nodemailer": [
+                "nodemailer/v3"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/nodemailer-smtp-pool/tslint.json b/types/nodemailer-smtp-pool/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodemailer-smtp-pool/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodemailer-smtp-transport/tsconfig.json b/types/nodemailer-smtp-transport/tsconfig.json
index c35d5cade4..4bce06278d 100644
--- a/types/nodemailer-smtp-transport/tsconfig.json
+++ b/types/nodemailer-smtp-transport/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "nodemailer": [
+                "nodemailer/v3"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/nodemailer-smtp-transport/tslint.json b/types/nodemailer-smtp-transport/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodemailer-smtp-transport/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodemailer-stub-transport/tsconfig.json b/types/nodemailer-stub-transport/tsconfig.json
index 378719af41..c8fed1b487 100644
--- a/types/nodemailer-stub-transport/tsconfig.json
+++ b/types/nodemailer-stub-transport/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "nodemailer": [
+                "nodemailer/v3"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/nodemailer-stub-transport/tslint.json b/types/nodemailer-stub-transport/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodemailer-stub-transport/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodemailer/index.d.ts b/types/nodemailer/index.d.ts
index fb1c359625..bee4649e94 100644
--- a/types/nodemailer/index.d.ts
+++ b/types/nodemailer/index.d.ts
@@ -1,215 +1,64 @@
-// Type definitions for Nodemailer 3.1.5
-// Project: https://github.com/andris9/Nodemailer
+// Type definitions for Nodemailer 4.3
+// Project: https://github.com/nodemailer/nodemailer
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+//                 Piotr Roszatycki <https://github.com/dex4er>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
-import directTransport = require("nodemailer-direct-transport");
-import smtpTransport = require("nodemailer-smtp-transport");
-import sesTransport = require("nodemailer-ses-transport")
+import JSONTransport = require('./lib/json-transport');
+import Mail = require('./lib/mailer');
+import MailMessage = require('./lib/mailer/mail-message');
+import SendmailTransport = require('./lib/sendmail-transport');
+import SESTransport = require('./lib/ses-transport');
+import SMTPPool = require('./lib/smtp-pool');
+import SMTPTransport = require('./lib/smtp-transport');
+import StreamTransport = require('./lib/stream-transport');
 
-/**
- * Transporter plugin
- */
-export interface Plugin {
-    (mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
-}
+export type SendMailOptions = Mail.Options;
 
-/**
- * This is what you use to send mail
- */
-export interface Transporter {
-    /**
-     * Send a mail with callback
-     */
-    sendMail(mail: SendMailOptions, callback: (error: Error, info: SentMessageInfo) => void): void;
+export type SentMessageInfo = any;
 
-    /**
-     * Send a mail
-     * return Promise
-     */
-    sendMail(mail: SendMailOptions): Promise<SentMessageInfo>;
+export type Transporter = Mail;
 
-	/**
-	 * Attach a plugin. 'compile' and 'stream' plugins can be attached with use(plugin) method
-	 *
-	 * @param step is a string, either 'compile' or 'stream' thatd defines when the plugin should be hooked
-	 * @param pluginFunc is a function that takes two arguments: the mail object and a callback function
-	 */
-	use(step: string, plugin: Plugin): void;
+export interface Transport {
+    mailer?: Mail;
 
-	/**
-	 * Verifies connection with server
-	 */
-	verify(callback: (error: Error, success?: boolean) => void): void;
+    name: string;
+    version: string;
 
-    /**
-     * Verifies connection with server
-     */
-    verify(): Promise<void>;
+    send(mail: MailMessage, callback: (err: Error | null, info: SentMessageInfo) => void): void;
+
+    verify?(callback: (err: Error | null, success: true) => void): void;
+    verify?(): Promise<true>;
 
-    /**
-     * Close all connections
-     */
     close?(): void;
 }
 
-/**
- * Create a direct transporter
- */
-export declare function createTransport(options?: directTransport.DirectOptions, defaults?: Object): Transporter;
-/**
- * Create an SMTP transporter
- */
-export declare function createTransport(options?: smtpTransport.SmtpOptions, defaults?: Object): Transporter;
-/**
- * Create an SMTP transporter using a connection url
- */
-export declare function createTransport(connectionUrl: string, defaults?: Object): Transporter;
-/**
- * Create an AWS SES transporter
- */
-export declare function createTransport(options?: sesTransport.SesOptions, defaults?: Object): Transporter;
-/**
- * Create a transporter from a given implementation
- */
-export declare function createTransport(transport: Transport, defaults?: Object): Transporter;
-export interface AttachmentObject {
-	/**
-	 * filename to be reported as the name of the attached file, use of unicode is allowed
-	 */
-	filename?: string;
-	/**
-	 * optional content id for using inline images in HTML message source
-	 */
-	cid?: string;
-	/**
-	 * Pathname or URL to use streaming
-	 */
-	path?: string;
-	/**
-	 * String, Buffer or a Stream contents for the attachment
-	 */
-	content: string|Buffer|NodeJS.ReadableStream;
-	/**
-	 * If set and content is string, then encodes the content to a Buffer using the specified encoding. Example values: base64, hex, 'binary' etc. Useful if you want to use binary attachments in a JSON formatted e-mail object.
-	 */
-	encoding?: string;
-	/**
-	 * optional content type for the attachment, if not set will be derived from the filename property
-	 */
-	contentType?: string;
-	/**
-	 * optional content disposition type for the attachment, defaults to 'attachment'
-	 */
-	contentDisposition?: string;
+export interface TransportOptions {
+    component?: string;
 }
 
-export interface SendMailOptions {
-	/**
-	 * The e-mail address of the sender. All e-mail addresses can be plain 'sender@server.com' or formatted 'Sender Name <sender@server.com>', see here for details
-	 */
-	from?: string;
-	/**
-	 * An e-mail address that will appear on the Sender: field
-	 */
-	sender?: string;
-	/**
-	 * Comma separated list or an array of recipients e-mail addresses that will appear on the To: field
-	 */
-	to?: string|string[];
-	/**
-	 * Comma separated list or an array of recipients e-mail addresses that will appear on the Cc: field
-	 */
-	cc?: string|string[];
-	/**
-	 * Comma separated list or an array of recipients e-mail addresses that will appear on the Bcc: field
-	 */
-	bcc?: string|string[];
-	/**
-	 * An e-mail address that will appear on the Reply-To: field
-	 */
-	replyTo?: string;
-	/**
-	 * The message-id this message is replying
-	 */
-	inReplyTo?: string;
-	/**
-	 * Message-id list (an array or space separated string)
-	 */
-	references?: string|string[];
-	/**
-	 * The subject of the e-mail
-	 */
-	subject?: string;
-	/**
-	 * The plaintext version of the message as an Unicode string, Buffer, Stream or an object {path: '...'}
-	 */
-	text?: string|Buffer|NodeJS.ReadableStream|AttachmentObject;
-	/**
-	 * The HTML version of the message as an Unicode string, Buffer, Stream or an object {path: '...'}
-	 */
-	html?: string|Buffer|NodeJS.ReadableStream|AttachmentObject;
-	/**
-	 * An object or array of additional header fields (e.g. {"X-Key-Name": "key value"} or [{key: "X-Key-Name", value: "val1"}, {key: "X-Key-Name", value: "val2"}])
-	 */
-	headers?: any;
-	/**
-	 * An array of attachment objects (see below for details)
-	 */
-	attachments?: AttachmentObject[];
-	/**
-	 * An array of alternative text contents (in addition to text and html parts) (see below for details)
-	 */
-	alternatives?: AttachmentObject[];
-	/**
-	 * optional Message-Id value, random value will be generated if not set
-	 */
-	messageId?: string;
-	/**
-	 * optional Date value, current UTC string will be used if not set
-	 */
-	date?: Date;
-	/**
-	 * optional transfer encoding for the textual parts (defaults to 'quoted-printable')
-	 */
-	encoding?: string;
+export interface TestAccount {
+    user: string;
+    pass: string;
+    smtp: { host: string, port: number, secure: boolean };
+    imap: { host: string, port: number, secure: boolean };
+    pop3: { host: string, port: number, secure: boolean };
+    web: string;
 }
 
-export interface SentMessageInfo {
-	/**
-	 * most transports should return the final Message-Id value used with this property
-	 */
-	messageId: string;
-	/**
-	 * includes the envelope object for the message
-	 */
-	envelope: any;
-	/**
-	 * is an array returned by SMTP transports (includes recipient addresses that were accepted by the server)
-	 */
-	accepted: string[];
-	/**
-	 * is an array returned by SMTP transports (includes recipient addresses that were rejected by the server)
-	 */
-	rejected: string[];
-	/**
-	 * is an array returned by Direct SMTP transport. Includes recipient addresses that were temporarily rejected together with the server response
-	 */
-	pending?: string[];
-	/**
-	 * is a string returned by SMTP transports and includes the last SMTP response from the server
-	 */
-	response: string;
-}
+export function createTransport(transport?: SMTPTransport | SMTPTransport.Options | string, defaults?: SMTPTransport.Options): Mail;
+export function createTransport(transport: SMTPPool | SMTPPool.Options, defaults?: SMTPPool.Options): Mail;
+export function createTransport(transport: SendmailTransport | SendmailTransport.Options, defaults?: SendmailTransport.Options): Mail;
+export function createTransport(transport: StreamTransport | StreamTransport.Options, defaults?: StreamTransport.Options): Mail;
+export function createTransport(transport: JSONTransport | JSONTransport.Options, defaults?: JSONTransport.Options): Mail;
+export function createTransport(transport: SESTransport | SESTransport.Options, defaults?: SESTransport.Options): Mail;
+export function createTransport(transport: Transport | TransportOptions, defaults?: TransportOptions): Mail;
 
-/**
- * This is what you implement to create a new transporter yourself
- */
-export interface Transport {
-	name: string;
-	version: string;
-	send(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
-	close(): void;
-}
+export function createTestAccount(apiUrl: string, callback: (err: Error | null, testAccount: TestAccount) => void): void;
+export function createTestAccount(callback: (err: Error | null, testAccount: TestAccount) => void): void;
+export function createTestAccount(apiUrl?: string): Promise<TestAccount>;
+
+export function getTestMessageUrl(info: SESTransport.SentMessageInfo | SMTPTransport.SentMessageInfo): string | false;
diff --git a/types/nodemailer/lib/addressparser.d.ts b/types/nodemailer/lib/addressparser.d.ts
new file mode 100644
index 0000000000..be42c1deed
--- /dev/null
+++ b/types/nodemailer/lib/addressparser.d.ts
@@ -0,0 +1,24 @@
+declare namespace addressparser {
+    interface Address {
+        name: string;
+        address: string;
+    }
+}
+
+/**
+ * Parses structured e-mail addresses from an address field
+ *
+ * Example:
+ *
+ *    'Name <address@domain>'
+ *
+ * will be converted to
+ *
+ *     [{name: 'Name', address: 'address@domain'}]
+ *
+ * @param str Address field
+ * @return An array of address objects
+ */
+declare function addressparser(address: string): addressparser.Address[];
+
+export = addressparser;
diff --git a/types/nodemailer/lib/base64.d.ts b/types/nodemailer/lib/base64.d.ts
new file mode 100644
index 0000000000..a49feefd2a
--- /dev/null
+++ b/types/nodemailer/lib/base64.d.ts
@@ -0,0 +1,22 @@
+/// <reference types="node" />
+
+import { Transform, TransformOptions } from 'stream';
+
+/** Encodes a Buffer into a base64 encoded string */
+export function encode(buffer: Buffer | string): string;
+
+/** Adds soft line breaks to a base64 string */
+export function wrap(str: string, lineLength?: number): string;
+
+export interface EncoderOptions extends TransformOptions {
+    lineLength?: number | false;
+}
+
+export class Encoder extends Transform {
+    options: TransformOptions;
+
+    inputBytes: number;
+    outputBytes: number;
+
+    constructor(options?: TransformOptions);
+}
diff --git a/types/nodemailer/lib/dkim.d.ts b/types/nodemailer/lib/dkim.d.ts
new file mode 100644
index 0000000000..de445f9567
--- /dev/null
+++ b/types/nodemailer/lib/dkim.d.ts
@@ -0,0 +1,41 @@
+/// <reference types="node" />
+
+declare namespace DKIM {
+    interface OptionalOptions {
+        /** optional location for cached messages. If not set then caching is not used. */
+        cacheDir?: string | false;
+        /** optional size in bytes, if message is larger than this treshold it gets cached to disk (assuming cacheDir is set and writable). Defaults to 131072 (128 kB). */
+        cacheTreshold?: number;
+        /** optional algorithm for the body hash, defaults to ‘sha256’ */
+        hashAlgo?: string;
+        /** an optional colon separated list of header keys to sign (eg. message-id:date:from:to...') */
+        headerFieldNames?: string;
+        /** optional colon separated list of header keys not to sign. This is useful if you want to sign all the relevant keys but your provider changes some values, ie Message-ID and Date. In this case you should use 'message-id:date' to prevent signing these values. */
+        skipFields?: string;
+    }
+
+    interface SingleKeyOptions extends OptionalOptions {
+        /** is the domain name to use in the signature */
+        domainName: string;
+        /** is the DKIM key selector */
+        keySelector: string;
+        /** is the private key for the selector in PEM format */
+        privateKey: string | { key: string; passphrase: string };
+    }
+
+    interface MultipleKeysOptions extends OptionalOptions {
+        /** is an optional array of key objects (domainName, keySelector, privateKey) if you want to add more than one signature to the message. If this value is set then the default key values are ignored */
+        keys: SingleKeyOptions[];
+    }
+
+    type Options = SingleKeyOptions | MultipleKeysOptions;
+}
+
+declare class DKIM {
+    options: DKIM.Options;
+    keys: Array<string | { key: string; passphrase: string }>;
+
+    constructor(options: DKIM.Options);
+}
+
+export = DKIM;
diff --git a/types/nodemailer/lib/fetch/cookies.d.ts b/types/nodemailer/lib/fetch/cookies.d.ts
new file mode 100644
index 0000000000..e6a2cc2acf
--- /dev/null
+++ b/types/nodemailer/lib/fetch/cookies.d.ts
@@ -0,0 +1,54 @@
+type s = number;
+
+declare namespace Cookies {
+    interface Cookie {
+        name: string;
+        value?: string;
+        expires?: Date;
+        path?: string;
+        domain?: string;
+        secure?: boolean;
+        httponly?: boolean;
+    }
+
+    interface Options {
+        sessionTimeout?: s;
+    }
+}
+
+/** Creates a biskviit cookie jar for managing cookie values in memory */
+declare class Cookies {
+    options: Cookies.Options;
+    cookies: Cookies.Cookie[];
+
+    constructor(options?: Cookies.Options);
+
+    /** Stores a cookie string to the cookie storage */
+    set(cookieStr: string, url: string): boolean;
+
+    /** Returns cookie string for the 'Cookie:' header. */
+    get(url: string): string;
+
+    /** Lists all valied cookie objects for the specified URL */
+    list(url: string): Cookies.Cookie[];
+
+    /** Parses cookie string from the 'Set-Cookie:' header */
+    parse(cookieStr: string): Cookies.Cookie;
+
+    /** Checks if a cookie object is valid for a specified URL */
+    match(cookie: Cookies.Cookie, url: string): boolean;
+
+    /** Adds (or updates/removes if needed) a cookie object to the cookie storage */
+    add(cookie: Cookies.Cookie): boolean;
+
+    /** Checks if two cookie objects are the same */
+    compare(a: Cookies.Cookie, b: Cookies.Cookie): boolean;
+
+    /** Checks if a cookie is expired */
+    isExpired(cookie: Cookies.Cookie): boolean;
+
+    /** Returns normalized cookie path for an URL path argument */
+    getPath(pathname: string): string;
+}
+
+export = Cookies;
diff --git a/types/nodemailer/lib/fetch/index.d.ts b/types/nodemailer/lib/fetch/index.d.ts
new file mode 100644
index 0000000000..8fc814c517
--- /dev/null
+++ b/types/nodemailer/lib/fetch/index.d.ts
@@ -0,0 +1,32 @@
+/// <reference types="node" />
+
+type ms = number;
+
+import _Cookies = require('./cookies');
+
+import { Writable } from 'stream';
+import * as tls from 'tls';
+
+declare namespace fetch {
+    type Cookies = _Cookies;
+
+    interface Options {
+        fetchRes?: Writable;
+        cookies?: Cookies;
+        cookie?: string;
+        redirects?: number;
+        maxRedirects?: number;
+        method?: string;
+        headers?: { [key: string]: string };
+        userAgent?: string;
+        body?: Buffer | string | { [key: string]: string };
+        contentType?: string | false;
+        tls?: tls.TlsOptions;
+        timeout?: ms;
+        allowErrorResponse?: boolean;
+    }
+}
+
+declare function fetch(url: string, options?: fetch.Options): Writable;
+
+export = fetch;
diff --git a/types/nodemailer/lib/json-transport.d.ts b/types/nodemailer/lib/json-transport.d.ts
new file mode 100644
index 0000000000..f6792f4402
--- /dev/null
+++ b/types/nodemailer/lib/json-transport.d.ts
@@ -0,0 +1,45 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+
+import { Transport, TransportOptions } from '..';
+
+import * as shared from './shared';
+
+import Mail = require('./mailer');
+import MailMessage = require('./mailer/mail-message');
+import MimeNode = require('./mime-node');
+
+declare namespace JSONTransport {
+    type MailOptions = Mail.Options;
+
+    interface Options extends MailOptions, TransportOptions {
+        jsonTransport: true;
+    }
+
+    interface SentMessageInfo {
+        /** an envelope object {from:‘address’, to:[‘address’]} */
+        envelope: MimeNode.Envelope;
+        /** the Message-ID header value */
+        messageId: string;
+        /** JSON string */
+        message: string;
+    }
+}
+
+declare class JSONTransport implements Transport {
+    options: JSONTransport.Options;
+
+    logger: shared.Logger;
+    mailer: Mail;
+
+    name: string;
+    version: string;
+
+    constructor(options: JSONTransport.Options);
+
+    /** Compiles a mailcomposer message and forwards it to handler that sends it */
+    send(mail: MailMessage, callback: (err: Error | null, info: JSONTransport.SentMessageInfo) => void): void;
+}
+
+export = JSONTransport;
diff --git a/types/nodemailer/lib/mail-composer.d.ts b/types/nodemailer/lib/mail-composer.d.ts
new file mode 100644
index 0000000000..71df8f796f
--- /dev/null
+++ b/types/nodemailer/lib/mail-composer.d.ts
@@ -0,0 +1,25 @@
+/// <reference types="node" />
+
+import { URL } from 'url';
+
+import Mail = require('./mailer');
+import MimeNode = require('./mime-node');
+
+/** Creates the object for composing a MimeNode instance out from the mail options */
+declare class MailComposer {
+  mail: Mail.Options;
+  message: MimeNode | false;
+
+  constructor(mail: Mail.Options);
+
+  /** Builds MimeNode instance */
+  compile(): MimeNode;
+
+  /** List all attachments. Resulting attachment objects can be used as input for MimeNode nodes */
+  getAttachments(findRelated: boolean): Mail.Attachment[];
+
+  /** List alternatives. Resulting objects can be used as input for MimeNode nodes */
+  getAlternatives(): Mail.Attachment[];
+}
+
+export = MailComposer;
diff --git a/types/nodemailer/lib/mailer/index.d.ts b/types/nodemailer/lib/mailer/index.d.ts
new file mode 100644
index 0000000000..f08c2d085d
--- /dev/null
+++ b/types/nodemailer/lib/mailer/index.d.ts
@@ -0,0 +1,214 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import { Socket } from 'net';
+import { Readable } from 'stream';
+import { URL } from 'url';
+
+import { SentMessageInfo, Transport, TransportOptions } from '../..';
+import * as shared from '../shared';
+
+import DKIM = require('../dkim');
+import MailMessage = require('./mail-message');
+import MimeNode = require('../mime-node');
+import SMTPConnection = require('../smtp-connection');
+import XOAuth2 = require('../xoauth2');
+
+declare namespace Mail {
+    type Headers = { [key: string]: string | string[] | { prepared: boolean, value: string } } | Array<{ key: string, value: string }>;
+
+    type ListHeader = string | { url: string, comment: string };
+
+    interface ListHeaders {
+        [key: string]: ListHeader | ListHeader[] | ListHeader[][];
+    }
+
+    type TextEncoding = 'quoted-printable' | 'base64';
+
+    interface Address {
+        name: string;
+        address: string;
+    }
+
+    interface AttachmentLike {
+        /** String, Buffer or a Stream contents for the attachmentent */
+        content?: string | Buffer | Readable;
+        /** path to a file or an URL (data uris are allowed as well) if you want to stream the file instead of including it (better for larger attachments) */
+        path?: string | URL;
+    }
+
+    interface Attachment extends AttachmentLike {
+        /** filename to be reported as the name of the attached file, use of unicode is allowed. If you do not want to use a filename, set this value as false, otherwise a filename is generated automatically */
+        filename?: string | false;
+        /** optional content id for using inline images in HTML message source. Using cid sets the default contentDisposition to 'inline' and moves the attachment into a multipart/related mime node, so use it only if you actually want to use this attachment as an embedded image */
+        cid?: string;
+        /** If set and content is string, then encodes the content to a Buffer using the specified encoding. Example values: base64, hex, binary etc. Useful if you want to use binary attachments in a JSON formatted e-mail object */
+        encoding?: string;
+        /** optional content type for the attachment, if not set will be derived from the filename property */
+        contentType?: string;
+        /** optional transfer encoding for the attachment, if not set it will be derived from the contentType property. Example values: quoted-printable, base64 */
+        contentTransferEncoding?: string;
+        /** optional content disposition type for the attachment, defaults to ‘attachment’ */
+        contentDisposition?: string;
+        /** is an object of additional headers */
+        headers?: Headers;
+        /** an optional value that overrides entire node content in the mime message. If used then all other options set for this node are ignored. */
+        raw?: string | Buffer | Readable | AttachmentLike;
+    }
+
+    interface IcalAttachment extends AttachmentLike {
+        /** optional method, case insensitive, defaults to ‘publish’. Other possible values would be ‘request’, ‘reply’, ‘cancel’ or any other valid calendar method listed in RFC5546. This should match the METHOD: value in calendar event file. */
+        method?: string;
+        /** optional filename, defaults to ‘invite.ics’ */
+        filename?: string | false;
+        /** is an alternative for content to load the calendar data from an URL */
+        href?: string;
+        /** defines optional content encoding, eg. ‘base64’ or ‘hex’. This only applies if the content is a string. By default an unicode string is assumed. */
+        encoding?: string;
+    }
+
+    interface Connection {
+        connection: Socket;
+    }
+
+    interface Envelope {
+        /** the first address gets used as MAIL FROM address in SMTP */
+        from?: string;
+        /** addresses from this value get added to RCPT TO list */
+        to?: string;
+        /** addresses from this value get added to RCPT TO list */
+        cc?: string;
+        /** addresses from this value get added to RCPT TO list */
+        bcc?: string;
+    }
+
+    interface Options {
+        /** The e-mail address of the sender. All e-mail addresses can be plain 'sender@server.com' or formatted 'Sender Name <sender@server.com>' */
+        from?: string | Address;
+        /** An e-mail address that will appear on the Sender: field */
+        sender?: string | Address;
+        /** Comma separated list or an array of recipients e-mail addresses that will appear on the To: field */
+        to?: string | Address | Array<string | Address>;
+        /** Comma separated list or an array of recipients e-mail addresses that will appear on the Cc: field */
+        cc?: string | Address | Array<string | Address>;
+        /** Comma separated list or an array of recipients e-mail addresses that will appear on the Bcc: field */
+        bcc?: string | Address | Array<string | Address>;
+        /** An e-mail address that will appear on the Reply-To: field */
+        replyTo?: string | Address;
+        /** The message-id this message is replying */
+        inReplyTo?: string | Address;
+        /** Message-id list (an array or space separated string) */
+        references?: string | string[];
+        /** The subject of the e-mail */
+        subject?: string;
+        /** The plaintext version of the message */
+        text?: string | Buffer | Readable | AttachmentLike;
+        /** The HTML version of the message */
+        html?: string | Buffer | Readable | AttachmentLike;
+        /** Apple Watch specific HTML version of the message, same usage as with text and html */
+        watchHtml?: string | Buffer | Readable | AttachmentLike;
+        /** iCalendar event, same usage as with text and html. Event method attribute defaults to ‘PUBLISH’ or define it yourself: {method: 'REQUEST', content: iCalString}. This value is added as an additional alternative to html or text. Only utf-8 content is allowed */
+        icalEvent?: string | Buffer | Readable | IcalAttachment;
+        /** An object or array of additional header fields */
+        headers?: Headers;
+        /** An object where key names are converted into list headers. List key help becomes List-Help header etc. */
+        list?: ListHeaders;
+        /** An array of attachment objects */
+        attachments?: Attachment[];
+        /** An array of alternative text contents (in addition to text and html parts) */
+        alternatives?: Attachment[];
+        /** optional SMTP envelope, if auto generated envelope is not suitable */
+        envelope?: Envelope | MimeNode.Envelope;
+        /** optional Message-Id value, random value will be generated if not set */
+        messageId?: string;
+        /** optional Date value, current UTC string will be used if not set */
+        date?: Date | string;
+        /** optional transfer encoding for the textual parts */
+        encoding?: string;
+        /** if set then overwrites entire message output with this value. The value is not parsed, so you should still set address headers or the envelope value for the message to work */
+        raw?: string | Buffer | Readable | AttachmentLike;
+        /** set explicitly which encoding to use for text parts (quoted-printable or base64). If not set then encoding is detected from text content (mostly ascii means quoted-printable, otherwise base64) */
+        textEncoding?: TextEncoding;
+        /** if set to true then fails with an error when a node tries to load content from URL */
+        disableUrlAccess?: boolean;
+        /** if set to true then fails with an error when a node tries to load content from a file */
+        disableFileAccess?: boolean;
+        /** is an object with DKIM options */
+        dkim?: DKIM.Options;
+    }
+
+    type PluginFunction = (mail: MailMessage, callback: (err?: Error | null) => void) => void;
+}
+
+/** Creates an object for exposing the Mail API */
+declare class Mail extends EventEmitter {
+    options: Mail.Options;
+    meta: Map<string, any>;
+    dkim: DKIM;
+    transporter: Transport;
+    logger: shared.Logger;
+
+    /** Usage: typeof transporter.MailMessage */
+    MailMessage: MailMessage;
+
+    constructor(transporter: Transport, options: TransportOptions, defaults: TransportOptions);
+
+    /** Closes all connections in the pool. If there is a message being sent, the connection is closed later */
+    close(): void;
+
+    /** Returns true if there are free slots in the queue */
+    isIdle(): boolean;
+
+    /** Verifies SMTP configuration */
+    verify(callback: (err: Error | null, success: true) => void): void;
+    verify(): Promise<true>;
+
+    use(step: string, plugin: Mail.PluginFunction): void; // TODO Plugin?
+
+    /** Sends an email using the preselected transport object */
+    sendMail(mailOptions: Mail.Options, callback: (err: Error | null, info: SentMessageInfo) => void): void;
+    sendMail(mailOptions: Mail.Options): Promise<SentMessageInfo>;
+
+    getVersionString(): string;
+
+    /** Sets up proxy handler for a Nodemailer object */
+    setupProxy(proxyUrl: string): void;
+
+    set(key: 'oauth2_provision_cb', value: (user: string, renew: boolean, callback: (err: Error | null, accessToken?: string, expires?: number) => void) => void): Map<string, any>;
+    set(key: 'proxy_handler_http' | 'proxy_handler_https' | 'proxy_handler_socks' | 'proxy_handler_socks5' | 'proxy_handler_socks4' | 'proxy_handler_socks4a', value: (proxy: URL, options: TransportOptions, callback: (err: Error | null, socketOptions?: { connection: Socket }) => void) => void): Map<string, any>;
+    set(key: string, value: any): Map<string, any>;
+
+    get(key: 'oauth2_provision_cb'): (user: string, renew: boolean, callback: (err: Error | null, accessToken: string, expires: number) => void) => void;
+    get(key: 'proxy_handler_http' | 'proxy_handler_https' | 'proxy_handler_socks' | 'proxy_handler_socks5' | 'proxy_handler_socks4' | 'proxy_handler_socks4a'): (proxy: URL, options: TransportOptions, callback: (err: Error | null, socketOptions: { connection: Socket }) => void) => void;
+    get(key: string): any;
+
+    addListener(event: 'error', listener: (err: Error) => void): this;
+    addListener(event: 'idle', listener: () => void): this;
+    addListener(event: 'token', listener: (token: XOAuth2.Token) => void): this;
+
+    emit(event: 'error', error: Error): boolean;
+    emit(event: 'idle'): boolean;
+    emit(event: 'token', token: XOAuth2.Token): boolean;
+
+    on(event: 'error', listener: (err: Error) => void): this;
+    on(event: 'idle', listener: () => void): this;
+    on(event: 'token', listener: (token: XOAuth2.Token) => void): this;
+
+    once(event: 'error', listener: (err: Error) => void): this;
+    once(event: 'idle', listener: () => void): this;
+    once(event: 'token', listener: (token: XOAuth2.Token) => void): this;
+
+    prependListener(event: 'error', listener: (err: Error) => void): this;
+    prependListener(event: 'idle', listener: () => void): this;
+    prependListener(event: 'end', listener: (token: XOAuth2.Token) => void): this;
+
+    prependOnceListener(event: 'error', listener: (err: Error) => void): this;
+    prependOnceListener(event: 'idle', listener: () => void): this;
+    prependOnceListener(event: 'end', listener: (token: XOAuth2.Token) => void): this;
+
+    listeners(event: 'error'): Array<(err: Error) => void>;
+    listeners(event: 'idle'): Array<() => void>;
+    listeners(event: 'end'): Array<(token: XOAuth2.Token) => void>;
+}
+
+export = Mail;
diff --git a/types/nodemailer/lib/mailer/mail-message.d.ts b/types/nodemailer/lib/mailer/mail-message.d.ts
new file mode 100644
index 0000000000..2216680edc
--- /dev/null
+++ b/types/nodemailer/lib/mailer/mail-message.d.ts
@@ -0,0 +1,28 @@
+/// <reference types="node" />
+
+import { Readable } from 'stream';
+
+import Mail = require('.');
+import MimeNode = require('../mime-node');
+
+declare class MailMessage {
+    mailer: Mail;
+    data: Mail.Options;
+    message: MimeNode;
+
+    constructor(mailer: Mail, data: Mail.Options);
+
+    resolveContent(data: object | any[], key: string | number, callback: (err: Error | null, value?: any) => any): Promise<any>;
+
+    resolveAll(callback: (err?: Error | null, data?: Mail.Options) => void): void;
+
+    normalize(callback: (err?: Error | null, data?: Mail.Options) => void): void;
+
+    setMailerHeader(): void;
+
+    setPriorityHeaders(): void;
+
+    setListHeaders(): void;
+}
+
+export = MailMessage;
diff --git a/types/nodemailer/lib/mime-funcs/index.d.ts b/types/nodemailer/lib/mime-funcs/index.d.ts
new file mode 100644
index 0000000000..49fd09c2f2
--- /dev/null
+++ b/types/nodemailer/lib/mime-funcs/index.d.ts
@@ -0,0 +1,87 @@
+export interface HeaderValue {
+    value: string;
+    params?: { [key: string]: string };
+}
+
+export interface ParsedHeaderValue extends HeaderValue {
+    params: { [key: string]: string };
+}
+
+export interface ParsedHeaderParam {
+    key: string;
+    value: string;
+}
+
+/** Checks if a value is plaintext string (uses only printable 7bit chars) */
+export function isPlainText(value: string): boolean;
+
+/**
+ * Checks if a multi line string containes lines longer than the selected value.
+ *
+ * Useful when detecting if a mail message needs any processing at all –
+ * if only plaintext characters are used and lines are short, then there is
+ * no need to encode the values in any way. If the value is plaintext but has
+ * longer lines then allowed, then use format=flowed
+ */
+export function hasLongerLines(str: string, lineLength: number): boolean;
+
+/** Encodes a string or an Buffer to an UTF-8 MIME Word (rfc2047) */
+export function encodeWord(data: Buffer | string, mimeWordEncoding?: 'Q' | 'B', maxLength?: number): string;
+
+/** Finds word sequences with non ascii text and converts these to mime words */
+export function encodeWords(value: string, mimeWordEncoding?: 'Q' | 'B', maxLength?: number): string;
+
+/**
+ * Joins parsed header value together as 'value; param1=value1; param2=value2'
+ * PS: We are following RFC 822 for the list of special characters that we need to keep in quotes.
+ *      Refer: https://www.w3.org/Protocols/rfc1341/4_Content-Type.html
+ */
+export function buildHeaderValue(structured: HeaderValue): string;
+
+/**
+ * Encodes a string or an Buffer to an UTF-8 Parameter Value Continuation encoding (rfc2231)
+ * Useful for splitting long parameter values.
+ *
+ * For example
+ * ```
+ *     title="unicode string"
+ * ```
+ * becomes
+ * ```
+ *     title*0*=utf-8''unicode
+ *     title*1*=%20string
+ * ```
+ */
+export function buildHeaderParam(key: string, data: Buffer | string, maxLength?: number): ParsedHeaderParam[];
+
+/**
+ * Parses a header value with key=value arguments into a structured
+ * object.
+ *
+ * ```
+ *   parseHeaderValue('content-type: text/plain; CHARSET='UTF-8') ->
+ *   {
+ *     'value': 'text/plain',
+ *     'params': {
+ *       'charset': 'UTF-8'
+ *     }
+ *   }
+ * ```
+ */
+export function parseHeaderValue(str: string): ParsedHeaderValue;
+
+/** Returns file extension for a content type string. If no suitable extensions are found, 'bin' is used as the default extension */
+export function detectExtension(mimeType: string): string;
+
+/** Returns content type for a file extension. If no suitable content types are found, 'application/octet-stream' is used as the default content type */
+export function detectMimeType(extension: string): string;
+
+/** Folds long lines, useful for folding header lines (afterSpace=false) and flowed text (afterSpace=true) */
+export function foldLines(str: string, lineLength?: number, afterSpace?: boolean): string;
+
+/** Splits a mime encoded string. Needed for dividing mime words into smaller chunks */
+export function splitMimeEncodedString(str: string, maxlen?: number): string[];
+
+export function encodeURICharComponent(chr: string): string;
+
+export function safeEncodeURIComponent(str: string): string;
diff --git a/types/nodemailer/lib/mime-funcs/mime-types.d.ts b/types/nodemailer/lib/mime-funcs/mime-types.d.ts
new file mode 100644
index 0000000000..7b9f9c529c
--- /dev/null
+++ b/types/nodemailer/lib/mime-funcs/mime-types.d.ts
@@ -0,0 +1,2 @@
+export function detectMimeType(filename: string | false): string;
+export function detectExtension(mimeType: string | false): string;
diff --git a/types/nodemailer/lib/mime-node.d.ts b/types/nodemailer/lib/mime-node.d.ts
new file mode 100644
index 0000000000..98eda91874
--- /dev/null
+++ b/types/nodemailer/lib/mime-node.d.ts
@@ -0,0 +1,131 @@
+/// <reference types="node" />
+
+import { Readable, ReadableOptions, Transform } from 'stream';
+
+import Mail = require('./mailer');
+import SMTPConnection = require('./smtp-connection');
+
+declare namespace MimeNode {
+    interface Addresses {
+        from?: string[];
+        sender?: string[];
+        'reply-to'?: string[];
+        to?: string[];
+        cc?: string[];
+        bcc?: string[];
+    }
+
+    interface Envelope {
+        /** includes an address object or is set to false */
+        from: string | false;
+        /** includes an array of address objects */
+        to: string[];
+    }
+
+    interface Options {
+        /** root node for this tree */
+        rootNode?: MimeNode;
+        /** immediate parent for this node */
+        parentNode?: MimeNode;
+        /** filename for an attachment node */
+        filename?: string;
+        /** shared part of the unique multipart boundary */
+        baseBoundary?: string;
+        /** If true, do not exclude Bcc from the generated headers */
+        keepBcc?: boolean;
+        /** either 'Q' (the default) or 'B' */
+        textEncoding: 'B' | 'Q';
+    }
+}
+
+/**
+ * Creates a new mime tree node. Assumes 'multipart/*' as the content type
+ * if it is a branch, anything else counts as leaf. If rootNode is missing from
+ * the options, assumes this is the root.
+ */
+declare class MimeNode {
+    constructor(contentType: string, options: MimeNode.Options);
+
+    /** Creates and appends a child node.Arguments provided are passed to MimeNode constructor */
+    createChild(contentType: string, options: MimeNode.Options): MimeNode;
+
+    /** Appends an existing node to the mime tree. Removes the node from an existing tree if needed */
+    appendChild(childNode: MimeNode): MimeNode;
+
+    /** Replaces current node with another node */
+    replace(node: MimeNode): MimeNode;
+
+    /** Removes current node from the mime tree */
+    remove(): this;
+
+    /**
+     * Sets a header value. If the value for selected key exists, it is overwritten.
+     * You can set multiple values as well by using [{key:'', value:''}] or
+     * {key: 'value'} as the first argument.
+     */
+    setHeader(key: string, value: string): this;
+    setHeader(headers: { [key: string]: string } | Array<{ key: string, value: string }>): this;
+
+    /**
+     * Adds a header value. If the value for selected key exists, the value is appended
+     * as a new field and old one is not touched.
+     * You can set multiple values as well by using [{key:'', value:''}] or
+     * {key: 'value'} as the first argument.
+     */
+    addHeader(key: string, value: string): this;
+    addHeader(headers: { [key: string]: string } | Array<{ key: string, value: string }>): this;
+
+    /** Retrieves the first mathcing value of a selected key */
+    getHeader(key: string): string;
+
+    /**
+     * Sets body content for current node. If the value is a string, charset is added automatically
+     * to Content-Type (if it is text/*). If the value is a Buffer, you need to specify
+     * the charset yourself
+     */
+    setContent(content: string | Buffer | Readable): this;
+
+    /** Generate the message and return it with a callback */
+    build(callback: (err: Error | null, buf: Buffer) => void): void;
+
+    getTransferEncoding(): string;
+
+    /** Builds the header block for the mime node. Append \r\n\r\n before writing the content */
+    buildHeaders(): string;
+
+    /**
+     * Streams the rfc2822 message from the current node. If this is a root node,
+     * mandatory header fields are set if missing (Date, Message-Id, MIME-Version)
+     */
+    createReadStream(options?: ReadableOptions): Readable;
+
+    /**
+     * Appends a transform stream object to the transforms list. Final output
+     * is passed through this stream before exposing
+     */
+    transform(transform: Transform): void;
+
+    /**
+     * Appends a post process function. The functon is run after transforms and
+     * uses the following syntax
+     *
+     *   processFunc(input) -> outputStream
+     */
+    processFunc(processFunc: (outputStream: Readable) => Readable): void;
+
+    stream(outputStream: Readable, options: ReadableOptions, done: (err?: Error | null) => void): void;
+
+    /** Sets envelope to be used instead of the generated one */
+    setEnvelope(envelope: Mail.Envelope): this;
+
+    /** Generates and returns an object with parsed address fields */
+    getAddresses(): MimeNode.Addresses;
+
+    /** Generates and returns SMTP envelope with the sender address and a list of recipients addresses */
+    getEnvelope(): MimeNode.Envelope;
+
+    /** Sets pregenerated content that will be used as the output of this node */
+    setRaw(raw: string | Buffer | Readable): this;
+}
+
+export = MimeNode;
diff --git a/types/nodemailer/lib/qp.d.ts b/types/nodemailer/lib/qp.d.ts
new file mode 100644
index 0000000000..07236b30e2
--- /dev/null
+++ b/types/nodemailer/lib/qp.d.ts
@@ -0,0 +1,23 @@
+/// <reference types="node" />
+
+import { Transform, TransformOptions } from 'stream';
+
+/** Encodes a Buffer into a Quoted-Printable encoded string */
+export function encode(buffer: Buffer | string): string;
+
+/** Adds soft line breaks to a Quoted-Printable string */
+export function wrap(str: string, lineLength?: number): string;
+
+export interface EncoderOptions extends TransformOptions {
+    lineLength?: number | false;
+}
+
+/** Creates a transform stream for encoding data to Quoted-Printable encoding */
+export class Encoder extends Transform {
+    options: TransformOptions;
+
+    inputBytes: number;
+    outputBytes: number;
+
+    constructor(options?: TransformOptions);
+}
diff --git a/types/nodemailer/lib/sendmail-transport.d.ts b/types/nodemailer/lib/sendmail-transport.d.ts
new file mode 100644
index 0000000000..92e461b01b
--- /dev/null
+++ b/types/nodemailer/lib/sendmail-transport.d.ts
@@ -0,0 +1,49 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+
+import { Transport, TransportOptions } from '..';
+
+import * as shared from './shared';
+
+import Mail = require('./mailer');
+import MailMessage = require('./mailer/mail-message');
+import MimeNode = require('./mime-node');
+
+declare namespace SendmailTransport {
+    type MailOptions = Mail.Options;
+
+    interface Options extends MailOptions, TransportOptions {
+        sendmail: true;
+        /** path to the sendmail command (defaults to ‘sendmail’) */
+        path?: string;
+        /** either ‘windows’ or ‘unix’ (default). Forces all newlines in the output to either use Windows syntax <CR><LF> or Unix syntax <LF> */
+        newline?: string;
+        /** an optional array of command line options to pass to the sendmail command (ie. ["-f", "foo@blurdybloop.com"]). This overrides all default arguments except for ’-i’ and recipient list so you need to make sure you have all required arguments set (ie. the ‘-f’ flag). */
+        args?: string[];
+    }
+
+    interface SentMessageInfo {
+        envelope: MimeNode.Envelope;
+        messageId: string;
+        response: string;
+    }
+}
+
+declare class SendmailTransport implements Transport {
+    options: SendmailTransport.Options;
+    logger: shared.Logger;
+    mailer: Mail;
+    name: string;
+    version: string;
+    path: string;
+    args: string[] | false;
+    winbreak: boolean;
+
+    constructor(options: SendmailTransport.Options);
+
+    /** Compiles a mailcomposer message and forwards it to handler that sends it */
+    send(mail: MailMessage, callback: (err: Error | null, info: SendmailTransport.SentMessageInfo) => void): void;
+}
+
+export = SendmailTransport;
diff --git a/types/nodemailer/lib/ses-transport.d.ts b/types/nodemailer/lib/ses-transport.d.ts
new file mode 100644
index 0000000000..ba6401888a
--- /dev/null
+++ b/types/nodemailer/lib/ses-transport.d.ts
@@ -0,0 +1,84 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+
+import { Transport, TransportOptions } from '..';
+
+import * as shared from './shared';
+
+import Mail = require('./mailer');
+import MailMessage = require('./mailer/mail-message');
+import MimeNode = require('./mime-node');
+
+declare namespace SESTransport {
+    interface MailOptions extends Mail.Options {
+        /** All keys are added to the SendRawEmail method options */
+        ses?: object;
+    }
+
+    interface Options extends MailOptions, TransportOptions {
+        /** is an option that expects an instantiated aws.SES object */
+        SES: any; // aws-sdk.SES object
+        /** How many messages per second is allowed to be delivered to SES */
+        maxConnections?: number;
+        /** How many parallel connections to allow towards SES */
+        sendingRate?: number;
+    }
+
+    interface SentMessageInfo {
+        /** an envelope object {from:‘address’, to:[‘address’]} */
+        envelope: MimeNode.Envelope;
+        /** the Message-ID header value. This value is derived from the response of SES API, so it differs from the Message-ID values used in logging. */
+        messageId: string;
+        response: string;
+    }
+}
+
+declare class SESTransport extends EventEmitter implements Transport {
+    options: SESTransport.Options;
+
+    logger: shared.Logger;
+    mailer: Mail;
+
+    name: string;
+    version: string;
+
+    ses: any;
+
+    maxConnections: number;
+    connections: number;
+    sendingRate: number;
+    sendingRateTTL: number | null;
+    rateInterval: number;
+    rateMessages: Array<{ ts: number, pending: boolean }>;
+    pending: Array<{ mail: Mail; callback(err: Error | null, info: SESTransport.SentMessageInfo): void; }>;
+    idling: boolean;
+
+    constructor(options: SESTransport.Options);
+
+    /** Schedules a sending of a message */
+    send(mail: MailMessage, callback: (err: Error | null, info: SESTransport.SentMessageInfo) => void): void;
+
+    /** Returns true if there are free slots in the queue */
+    isIdle(): boolean;
+
+    /** Verifies SES configuration */
+    verify(callback: (err: Error | null, success: true) => void): void;
+    verify(): Promise<true>;
+
+    addListener(event: 'idle', listener: () => void): this;
+
+    emit(event: 'idle'): boolean;
+
+    on(event: 'idle', listener: () => void): this;
+
+    once(event: 'idle', listener: () => void): this;
+
+    prependListener(event: 'idle', listener: () => void): this;
+
+    prependOnceListener(event: 'idle', listener: () => void): this;
+
+    listeners(event: 'idle'): Array<() => void>;
+}
+
+export = SESTransport;
diff --git a/types/nodemailer/lib/shared.d.ts b/types/nodemailer/lib/shared.d.ts
new file mode 100644
index 0000000000..adec552138
--- /dev/null
+++ b/types/nodemailer/lib/shared.d.ts
@@ -0,0 +1,38 @@
+/// <reference types="node" />
+
+import SMTPConnection = require('./smtp-connection');
+
+import * as stream from 'stream';
+
+export type LoggerLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';
+
+export interface Logger {
+  level(level: LoggerLevel): void;
+  trace(...params: any[]): void;
+  debug(...params: any[]): void;
+  info(...params: any[]): void;
+  warn(...params: any[]): void;
+  error(...params: any[]): void;
+  fatal(...params: any[]): void;
+}
+
+/** Parses connection url to a structured configuration object */
+export function parseConnectionUrl(url: string): SMTPConnection.Options;
+/** Returns a bunyan-compatible logger interface. Uses either provided logger or creates a default console logger */
+export function getLogger(options?: { [key: string]: any }, defaults?: { [key: string]: any }): Logger;
+/** Wrapper for creating a callback than either resolves or rejects a promise based on input */
+export function callbackPromise(resolve: (...args: any[]) => void, reject: (err: Error) => void): () => void;
+/**
+ * Resolves a String or a Buffer value for content value. Useful if the value
+ * is a Stream or a file or an URL. If the value is a Stream, overwrites
+ * the stream object with the resolved value (you can't stream a value twice).
+ *
+ * This is useful when you want to create a plugin that needs a content value,
+ * for example the `html` or `text` value as a String or a Buffer but not as
+ * a file path or an URL.
+ */
+export function resolveContent(data: object | any[], key: string | number, callback: (err: Error | null, value: Buffer | string) => void): void;
+export function resolveContent(data: object | any[], key: string | number): Promise<Buffer | string>;
+/** Copies properties from source objects to target objects */
+export function assign(target: object, ...sources: object[]): object;
+export function encodeXText(str: string): string;
diff --git a/types/nodemailer/lib/smtp-connection.d.ts b/types/nodemailer/lib/smtp-connection.d.ts
new file mode 100644
index 0000000000..1215409b46
--- /dev/null
+++ b/types/nodemailer/lib/smtp-connection.d.ts
@@ -0,0 +1,210 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import * as net from 'net';
+import { Writable } from 'stream';
+import * as tls from 'tls';
+
+import * as shared from './shared';
+
+import MimeNode = require('./mime-node');
+import XOAuth2 = require('./xoauth2');
+
+type ms = number;
+
+declare namespace SMTPConnection {
+    interface Credentials {
+        /** the username */
+        user: string;
+        /** then password */
+        pass: string;
+    }
+
+    type OAuth2 = XOAuth2.Options;
+
+    interface AuthenticationTypeLogin extends Credentials {
+        /** indicates the authetication type, defaults to ‘login’, other option is ‘oauth2’ */
+        type?: 'login' | 'Login' | 'LOGIN';
+    }
+
+    interface AuthenticationTypeOAuth2 extends OAuth2 {
+        /** indicates the authetication type, defaults to ‘login’, other option is ‘oauth2’ */
+        type?: 'oauth2' | 'OAuth2' | 'OAUTH2';
+    }
+
+    type AuthenticationType = AuthenticationTypeLogin | AuthenticationTypeOAuth2;
+
+    interface AuthenticationCredentials {
+        /** normal authentication object */
+        credentials: Credentials;
+    }
+
+    interface AuthenticationOAuth2 {
+        /**  if set then forces smtp-connection to use XOAuth2 for authentication */
+        oauth2: OAuth2;
+    }
+
+    type DSNOption = 'NEVER' | 'SUCCESS' | 'FAILURE' | 'DELAY';
+
+    interface DSNOptions {
+        /** return either the full message ‘FULL’ or only headers ‘HDRS’ */
+        ret?: 'Full' | 'HDRS';
+        /** sender’s ‘envelope identifier’ for tracking */
+        envid?: string;
+        /** when to send a DSN. Multiple options are OK - array or comma delimited. NEVER must appear by itself. */
+        notify?: DSNOption | DSNOption[];
+        /** original recipient */
+        orcpt?: string;
+    }
+
+    interface Envelope {
+        /** includes an address object or is set to false */
+        from: string | false;
+        /** the recipient address or an array of addresses */
+        to: string | string[];
+        /** an optional value of the predicted size of the message in bytes. This value is used if the server supports the SIZE extension (RFC1870) */
+        size?: number;
+        /** if true then inform the server that this message might contain bytes outside 7bit ascii range */
+        use8BitMime?: boolean;
+        /** the dsn options */
+        dsn?: DSNOptions;
+    }
+
+    interface SMTPError extends NodeJS.ErrnoException {
+        /** string code identifying the error, for example ‘EAUTH’ is returned when authentication */
+        code?: string;
+        /** the last response received from the server (if the error is caused by an error response from the server) */
+        response?: string;
+        /** the numeric response code of the response string (if available) */
+        responseCode?: number;
+        /** command which provoked an error */
+        command?: string;
+    }
+
+    interface SentMessageInfo {
+        /** an array of accepted recipient addresses. Normally this array should contain at least one address except when in LMTP mode. In this case the message itself might have succeeded but all recipients were rejected after sending the message. */
+        accepted: string[];
+        /** an array of rejected recipient addresses. This array includes both the addresses that were rejected before sending the message and addresses rejected after sending it if using LMTP */
+        rejected: string[];
+        /** if some recipients were rejected then this property holds an array of error objects for the rejected recipients */
+        rejectedErrors?: SMTPError[];
+        /** the last response received from the server */
+        response: string;
+        /** how long was envelope prepared */
+        envelopeTime: number;
+        /** how long was send stream prepared */
+        messageTime: number;
+        /** how many bytes were streamed */
+        messageSize: number;
+    }
+
+    interface Options {
+        /** the hostname or IP address to connect to (defaults to ‘localhost’) */
+        host?: string;
+        /** the port to connect to (defaults to 25 or 465) */
+        port?: number;
+        /** defines authentication data */
+        auth?: AuthenticationType;
+        /** defines if the connection should use SSL (if true) or not (if false) */
+        secure?: boolean;
+        /** turns off STARTTLS support if true */
+        ignoreTLS?: boolean;
+        /** forces the client to use STARTTLS. Returns an error if upgrading the connection is not possible or fails. */
+        requireTLS?: boolean;
+        /** tries to use STARTTLS and continues normally if it fails */
+        opportunisticTLS?: boolean;
+        /** optional hostname of the client, used for identifying to the server */
+        name?: string;
+        /** the local interface to bind to for network connections */
+        localAddress?: string;
+        /** how many milliseconds to wait for the connection to establish */
+        connectionTimeout?: ms;
+        /** how many milliseconds to wait for the greeting after connection is established */
+        greetingTimeout?: ms;
+        /** how many milliseconds of inactivity to allow */
+        socketTimeout?: ms;
+        /** optional bunyan compatible logger instance. If set to true then logs to console. If value is not set or is false then nothing is logged */
+        logger?: shared.Logger | boolean;
+        /** if set to true, then logs SMTP traffic without message content */
+        transactionLog?: boolean;
+        /** if set to true, then logs SMTP traffic and message content, otherwise logs only transaction events */
+        debug?: boolean;
+        /** defines preferred authentication method, e.g. ‘PLAIN’ */
+        authMethod?: string;
+        /** defines additional options to be passed to the socket constructor, e.g. {rejectUnauthorized: true} */
+        tls?: tls.ConnectionOptions;
+        /** initialized socket to use instead of creating a new one */
+        socket?: net.Socket;
+        /** connected socket to use instead of creating and connecting a new one. If secure option is true, then socket is upgraded from plaintext to ciphertext */
+        connection?: net.Socket;
+    }
+}
+
+declare class SMTPConnection extends EventEmitter {
+    options: SMTPConnection.Options;
+
+    logger: shared.Logger;
+
+    id: string;
+    stage: 'init' | 'connected';
+
+    secureConnection: boolean;
+    alreadySecured: boolean;
+
+    port: number;
+    host: string;
+
+    name: string;
+    /** Expose version nr, just for the reference */
+    version: string;
+
+    /** If true, then the user is authenticated */
+    authenticated: boolean;
+    /** If set to true, this instance is no longer active */
+    destroyed: boolean;
+    /** Defines if the current connection is secure or not. If not, STARTTLS can be used if available */
+    secure: boolean;
+
+    lastServerResponse: string | false;
+
+    /** The socket connecting to the server */
+    _socket: net.Socket;
+
+    constructor(options?: SMTPConnection.Options);
+
+    /** Creates a connection to a SMTP server and sets up connection listener */
+    connect(callback: () => void): void;
+    /** Sends QUIT */
+    quit(): void;
+    /** Closes the connection to the server */
+    close(): void;
+    /** Authenticate user */
+    login(auth: SMTPConnection.AuthenticationCredentials | SMTPConnection.AuthenticationOAuth2 | SMTPConnection.Credentials, callback: (err: SMTPConnection.SMTPError | null) => void): void;
+    /** Sends a message */
+    send(envelope: SMTPConnection.Envelope, message: string | Buffer | Writable, callback: (err: SMTPConnection.SMTPError | null, info: SMTPConnection.SentMessageInfo) => void): void;
+    /** Resets connection state */
+    reset(callback: (err: Error | null) => void): void;
+
+    addListener(event: 'connect' | 'end', listener: () => void): this;
+    addListener(event: 'error', listener: (err: SMTPConnection.SMTPError) => void): this;
+
+    emit(event: 'connect' | 'end'): boolean;
+    emit(event: 'error', error: Error): boolean;
+
+    on(event: 'connect' | 'end', listener: () => void): this;
+    on(event: 'error', listener: (err: SMTPConnection.SMTPError) => void): this;
+
+    once(event: 'connect' | 'end', listener: () => void): this;
+    once(event: 'error', listener: (err: SMTPConnection.SMTPError) => void): this;
+
+    prependListener(event: 'connect' | 'end', listener: () => void): this;
+    prependListener(event: 'error', listener: (err: SMTPConnection.SMTPError) => void): this;
+
+    prependOnceListener(event: 'connect' | 'end', listener: () => void): this;
+    prependOnceListener(event: 'error', listener: (err: SMTPConnection.SMTPError) => void): this;
+
+    listeners(event: 'connect' | 'end'): Array<() => void>;
+    listeners(event: 'error'): Array<(err: SMTPConnection.SMTPError) => void>;
+}
+
+export = SMTPConnection;
diff --git a/types/nodemailer/lib/smtp-pool.d.ts b/types/nodemailer/lib/smtp-pool.d.ts
new file mode 100644
index 0000000000..af1441d8c8
--- /dev/null
+++ b/types/nodemailer/lib/smtp-pool.d.ts
@@ -0,0 +1,87 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+
+import { Transport, TransportOptions } from '..';
+import * as shared from './shared';
+
+import Mail = require('./mailer');
+import MailMessage = require('./mailer/mail-message');
+import MimeNode = require('./mime-node');
+import SMTPConnection = require('./smtp-connection');
+
+declare namespace SMTPPool {
+    interface MailOptions extends Mail.Options {
+        auth?: SMTPConnection.AuthenticationType;
+        dsn?: SMTPConnection.DSNOptions;
+    }
+
+    interface Options extends MailOptions, TransportOptions, SMTPConnection.Options {
+        /** set to true to use pooled connections (defaults to false) instead of creating a new connection for every email */
+        pool: true;
+        service?: string;
+        getSocket?(options: Options, callback: (err: Error | null, socketOptions: any) => void): void; // TODO http.ClientRequest?
+        url?: string;
+        /** the count of maximum simultaneous connections to make against the SMTP server (defaults to 5) */
+        maxConnections?: number;
+        /** limits the message count to be sent using a single connection (defaults to 100). After maxMessages is reached the connection is dropped and a new one is created for the following messages */
+        maxMessages?: number;
+        /** defines the time measuring period in milliseconds (defaults to 1000, ie. to 1 second) for rate limiting */
+        rateDelta?: number;
+        /** limits the message count to be sent in rateDelta time. Once rateLimit is reached, sending is paused until the end of the measuring period. This limit is shared between connections, so if one connection uses up the limit, then other connections are paused as well. If rateLimit is not set then sending rate is not limited */
+        rateLimit?: number;
+    }
+
+    interface SentMessageInfo extends SMTPConnection.SentMessageInfo {
+        /** includes the envelope object for the message */
+        envelope: MimeNode.Envelope;
+        /** most transports should return the final Message-Id value used with this property */
+        messageId: string;
+    }
+}
+
+declare class SMTPPool extends EventEmitter implements Transport {
+    options: SMTPPool.Options;
+
+    mailer: Mail;
+    logger: shared.Logger;
+
+    name: string;
+    version: string;
+
+    idling: boolean;
+
+    constructor(options: SMTPPool.Options | string);
+
+    /** Placeholder function for creating proxy sockets. This method immediatelly returns without a socket */
+    getSocket(options: SMTPPool.Options, callback: (err: Error | null, socketOptions: any) => void): void;
+
+    /** Sends an e-mail using the selected settings */
+    send(mail: MailMessage, callback: (err: Error | null, info: SMTPPool.SentMessageInfo) => void): void;
+
+    /** Closes all connections in the pool. If there is a message being sent, the connection is closed later */
+    close(): void;
+
+    /** Returns true if there are free slots in the queue */
+    isIdle(): boolean;
+
+    /** Verifies SMTP configuration */
+    verify(callback: (err: Error | null, success: true) => void): void;
+    verify(): Promise<true>;
+
+    addListener(event: 'idle', listener: () => void): this;
+
+    emit(event: 'idle'): boolean;
+
+    on(event: 'idle', listener: () => void): this;
+
+    once(event: 'idle', listener: () => void): this;
+
+    prependListener(event: 'idle', listener: () => void): this;
+
+    prependOnceListener(event: 'idle', listener: () => void): this;
+
+    listeners(event: 'idle'): Array<() => void>;
+}
+
+export = SMTPPool;
diff --git a/types/nodemailer/lib/smtp-transport.d.ts b/types/nodemailer/lib/smtp-transport.d.ts
new file mode 100644
index 0000000000..6302d495b8
--- /dev/null
+++ b/types/nodemailer/lib/smtp-transport.d.ts
@@ -0,0 +1,80 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import * as stream from 'stream';
+
+import { Transport, TransportOptions } from '..';
+import * as shared from './shared';
+
+import Mail = require('./mailer');
+import MailMessage = require('./mailer/mail-message');
+import MimeNode = require('./mime-node');
+import SMTPConnection = require('./smtp-connection');
+import XOAuth2 = require('./xoauth2');
+
+declare namespace SMTPTransport {
+    interface AuthenticationTypeLogin {
+        type: 'LOGIN';
+        user: string;
+        credentials: SMTPConnection.Credentials;
+        method: string | false;
+    }
+
+    interface AuthenticationTypeOAuth2 {
+        type: 'OAUTH2';
+        user: string;
+        oauth2: XOAuth2;
+        method: 'XOAUTH2';
+    }
+
+    type AuthenticationType = AuthenticationTypeLogin | AuthenticationTypeOAuth2;
+
+    interface MailOptions extends Mail.Options {
+        auth?: SMTPConnection.AuthenticationType;
+        dsn?: SMTPConnection.DSNOptions;
+    }
+
+    interface Options extends MailOptions, TransportOptions, SMTPConnection.Options {
+        service?: string;
+        getSocket?(options: Options, callback: (err: Error | null, socketOptions: any) => void): void; // TODO http.ClientRequest?
+        url?: string;
+    }
+
+    interface SentMessageInfo {
+        /** includes the envelope object for the message */
+        envelope: MimeNode.Envelope;
+        /** most transports should return the final Message-Id value used with this property */
+        messageId: string;
+    }
+}
+
+declare class SMTPTransport extends EventEmitter implements Transport {
+    options: SMTPTransport.Options;
+
+    mailer: Mail;
+    logger: shared.Logger;
+
+    name: string;
+    version: string;
+
+    auth: SMTPTransport.AuthenticationType;
+
+    constructor(options: SMTPTransport.Options | string);
+
+    /** Placeholder function for creating proxy sockets. This method immediatelly returns without a socket */
+    getSocket(options: SMTPTransport.Options, callback: (err: Error | null, socketOptions: object) => void): void;
+
+    getAuth(authOpts: SMTPConnection.AuthenticationTypeLogin | SMTPConnection.AuthenticationTypeOAuth2): SMTPTransport.AuthenticationType;
+
+    /** Sends an e-mail using the selected settings */
+    send(mail: MailMessage, callback: (err: Error | null, info: SMTPTransport.SentMessageInfo) => void): void;
+
+    /** Verifies SMTP configuration */
+    verify(callback: (err: Error | null, success: true) => void): void;
+    verify(): Promise<true>;
+
+    /** Releases resources */
+    close(): void;
+}
+
+export = SMTPTransport;
diff --git a/types/nodemailer/lib/stream-transport.d.ts b/types/nodemailer/lib/stream-transport.d.ts
new file mode 100644
index 0000000000..48c397911c
--- /dev/null
+++ b/types/nodemailer/lib/stream-transport.d.ts
@@ -0,0 +1,52 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import { Readable } from 'stream';
+
+import { Transport, TransportOptions } from '..';
+
+import * as shared from './shared';
+
+import Mail = require('./mailer');
+import MailMessage = require('./mailer/mail-message');
+import MimeNode = require('./mime-node');
+
+declare namespace StreamTransport {
+    type MailOptions = Mail.Options;
+
+    interface Options extends MailOptions, TransportOptions {
+        streamTransport: true;
+        /** if true, then returns the message as a Buffer object instead of a stream */
+        buffer?: boolean;
+        /** either ‘windows’ or ‘unix’ (default). Forces all newlines in the output to either use Windows syntax <CR><LF> or Unix syntax <LF> */
+        newline?: string;
+    }
+
+    interface SentMessageInfo {
+        /** an envelope object {from:‘address’, to:[‘address’]} */
+        envelope: MimeNode.Envelope;
+        /** the Message-ID header value */
+        messageId: string;
+        /** either stream (default) of buffer depending on the options */
+        message: Buffer | Readable;
+    }
+}
+
+declare class StreamTransport implements Transport {
+    options: StreamTransport.Options;
+
+    logger: shared.Logger;
+    mailer: Mail;
+
+    name: string;
+    version: string;
+
+    winbreak: boolean;
+
+    constructor(options: StreamTransport.Options);
+
+    /** Compiles a mailcomposer message and forwards it to handler that sends it */
+    send(mail: MailMessage, callback: (err: Error | null, info: StreamTransport.SentMessageInfo) => void): void;
+}
+
+export = StreamTransport;
diff --git a/types/nodemailer/lib/well-known.d.ts b/types/nodemailer/lib/well-known.d.ts
new file mode 100644
index 0000000000..2e4ae176d3
--- /dev/null
+++ b/types/nodemailer/lib/well-known.d.ts
@@ -0,0 +1,6 @@
+import SMTPConnection = require('./smtp-connection');
+
+/** Resolves SMTP config for given key. Key can be a name (like 'Gmail'), alias (like 'Google Mail') or an email address (like 'test@googlemail.com'). */
+declare function wellKnown(key: string): SMTPConnection.Options | false;
+
+export = wellKnown;
diff --git a/types/nodemailer/lib/xoauth2.d.ts b/types/nodemailer/lib/xoauth2.d.ts
new file mode 100644
index 0000000000..689b8058fc
--- /dev/null
+++ b/types/nodemailer/lib/xoauth2.d.ts
@@ -0,0 +1,104 @@
+/// <reference types="node" />
+
+import * as http from 'http';
+import { Readable, Stream } from 'stream';
+
+import * as shared from './shared';
+
+type ms = number;
+type s = number;
+
+declare namespace XOAuth2 {
+    interface Options {
+        /** User e-mail address */
+        user?: string;
+        /** Client ID value */
+        clientId?: string;
+        /** Client secret value */
+        clientSecret?: string;
+        /** Refresh token for an user */
+        refreshToken?: string;
+        /** Endpoint for token generation, defaults to 'https://accounts.google.com/o/oauth2/token' */
+        accessUrl?: string;
+        /** An existing valid accessToken */
+        accessToken?: string;
+        /** Private key for JSW */
+        privateKey?: string | { key: string; passphrase: string; };
+        /** Optional Access Token expire time in ms */
+        expires?: ms;
+        /** Optional TTL for Access Token in seconds */
+        timeout?: s;
+        /** Function to run when a new access token is required */
+        provisionCallback?(user: string, renew: boolean, callback: (err: Error | null, accessToken: string, expires: number) => void): void;
+    }
+
+    interface Token {
+        user: string;
+        accessToken: string;
+        expires: number;
+    }
+
+    interface RequestParams {
+        customHeaders?: http.OutgoingHttpHeaders;
+    }
+}
+
+declare class XOAuth2 extends Stream {
+    options: XOAuth2.Options;
+    logger: shared.Logger;
+    accessToken: string | false;
+    expires: number;
+
+    constructor(options: XOAuth2.Options, logger: shared.Logger);
+
+    /** Returns or generates (if previous has expired) a XOAuth2 token */
+    getToken(renew: boolean, callback: (err: Error | null, accessToken: string) => void): void;
+
+    /** Updates token values */
+    updateToken(accessToken: string, timeout: s): XOAuth2.Token;
+
+    /** Generates a new XOAuth2 token with the credentials provided at initialization */
+    generateToken(callback: (err: Error | null, accessToken: string) => void): void;
+
+    /** Converts an access_token and user id into a base64 encoded XOAuth2 token */
+    buildXOAuth2Token(accessToken: string): string;
+
+    /**
+     * Custom POST request handler.
+     * This is only needed to keep paths short in Windows – usually this module
+     * is a dependency of a dependency and if it tries to require something
+     * like the request module the paths get way too long to handle for Windows.
+     * As we do only a simple POST request we do not actually require complicated
+     * logic support (no redirects, no nothing) anyway.
+     */
+    postRequest(url: string, payload: string | Buffer | Readable | { [key: string]: string }, params: XOAuth2.RequestParams, callback: (err: Error | null, buf: Buffer) => void): void;
+
+    /** Encodes a buffer or a string into Base64url format */
+    toBase64URL(data: Buffer | string): string;
+
+    /** Creates a JSON Web Token signed with RS256 (SHA256 + RSA) */
+    jwtSignRS256(payload: object): string;
+
+    addListener(event: 'error', listener: (err: Error) => void): this;
+    addListener(event: 'token', listener: (token: XOAuth2.Token) => void): this;
+
+    emit(event: 'error', error: Error): boolean;
+    emit(event: 'token', token: XOAuth2.Token): boolean;
+
+    on(event: 'error', listener: (err: Error) => void): this;
+    on(event: 'token', listener: (token: XOAuth2.Token) => void): this;
+
+    once(event: 'error', listener: (err: Error) => void): this;
+    once(event: 'token', listener: (token: XOAuth2.Token) => void): this;
+
+    prependListener(event: 'error', listener: (err: Error) => void): this;
+    prependListener(event: 'end', listener: (token: XOAuth2.Token) => void): this;
+
+    prependOnceListener(event: 'error', listener: (err: Error) => void): this;
+    prependOnceListener(event: 'end', listener: (token: XOAuth2.Token) => void): this;
+
+    listeners(event: 'error'): Array<(err: Error) => void>;
+    listeners(event: 'end'): Array<(token: XOAuth2.Token) => void>;
+}
+
+export = XOAuth2;
diff --git a/types/nodemailer/nodemailer-tests.ts b/types/nodemailer/nodemailer-tests.ts
index cd26579189..9761cb73e4 100644
--- a/types/nodemailer/nodemailer-tests.ts
+++ b/types/nodemailer/nodemailer-tests.ts
@@ -1,71 +1,1298 @@
-import * as nodemailer from 'nodemailer'
-import * as AWS from 'aws-sdk'
+import * as nodemailer from 'nodemailer';
 
-// create reusable transporter object using SMTP transport
-var transporter: nodemailer.Transporter = nodemailer.createTransport({
-    service: 'Gmail',
-    auth: {
-        user: 'gmail.user@gmail.com',
-        pass: 'userpass'
+import addressparser = require('nodemailer/lib/addressparser');
+import base64 = require('nodemailer/lib/base64');
+import fetch = require('nodemailer/lib/fetch');
+import Cookies = require('nodemailer/lib/fetch/cookies');
+import JSONTransport = require('nodemailer/lib/json-transport');
+import Mail = require('nodemailer/lib/mailer');
+import MailComposer = require('nodemailer/lib/mail-composer');
+import MailMessage = require('nodemailer/lib/mailer/mail-message');
+import mimeFuncs = require('nodemailer/lib/mime-funcs');
+import mimeTypes = require('nodemailer/lib/mime-funcs/mime-types');
+import qp = require('nodemailer/lib/qp');
+import SendmailTransport = require('nodemailer/lib/sendmail-transport');
+import SESTransport = require('nodemailer/lib/ses-transport');
+import shared = require('nodemailer/lib/shared');
+import SMTPConnection = require('nodemailer/lib/smtp-connection');
+import SMTPPool = require('nodemailer/lib/smtp-pool');
+import SMTPTransport = require('nodemailer/lib/smtp-transport');
+import StreamTransport = require('nodemailer/lib/stream-transport');
+import wellKnown = require('nodemailer/lib/well-known');
+import XOAuth2 = require('nodemailer/lib/xoauth2');
+
+import * as fs from 'fs';
+import * as stream from 'stream';
+
+// mock aws-sdk
+const aws = {
+    SES: class MockSES {
+        constructor(options?: object) { }
+    },
+    config: {
+        loadFromPath: (path: string): void => { }
     }
-});
-
-// create reusable transporter object using SMTP connection url using default options
-transporter = nodemailer.createTransport("smtps://gmail.user@gmail.com:userpass@gmail/?pool=true");
-
-// create reusable transporter object using SMTP connection url and specify some options
-transporter = nodemailer.createTransport("smtps://gmail.user@gmail.com:userpass@gmail/?pool=true",
- {
-    from: 'sender@address',
-    headers: {
-        'My-Awesome-Header': '123'
-    }
- });
-
-// create reusable transporter object using SES transport and set default values for mail options.
-transporter = nodemailer.createTransport({
-    SES: new AWS.SES()
-})
-// create reusable transporter object using SMTP transport and set default values for mail options.
-transporter = nodemailer.createTransport({
-    SES: new AWS.SES()
-}, {
-    from: 'sender@address',
-    headers: {
-        'My-Awesome-Header': '123'
-    }
-})
-
-// create reusable transporter object using SMTP transport and set default values for mail options.
-transporter = nodemailer.createTransport({
-    service: 'Gmail',
-    auth: {
-        user: 'gmail.user@gmail.com',
-        pass: 'userpass'
-    }
-}, {
-    from: 'sender@address',
-    headers: {
-        'My-Awesome-Header': '123'
-    }
-});
-
-// setup e-mail data with unicode symbols
-var mailOptions: nodemailer.SendMailOptions = {
-    from: 'Fred Foo ✔ <foo@blurdybloop.com>', // sender address
-    to: 'bar@blurdybloop.com, baz@blurdybloop.com', // list of receivers
-    subject: 'Hello ✔', // Subject line
-    text: 'Hello world ✔', // plaintext body
-    html: '<b>Hello world ✔</b>' // html body
 };
 
-// send mail with defined transport object
-transporter.sendMail(mailOptions, (error: Error, info: nodemailer.SentMessageInfo): void => {
-	// nothing
-});
+// 1. Nodemailer
 
-// promise send mail without callback
-transporter
-  .sendMail(mailOptions)
-  .then(info => info.messageId)
-  .catch(err => {})
\ No newline at end of file
+function nodemailer_test() {
+    // Generate test SMTP service account from ethereal.email
+    // Only needed if you don't have a real mail account for testing
+    nodemailer.createTestAccount((err, account) => {
+        if (err) {
+            console.log(err);
+            return;
+        }
+        // create reusable transporter object using the default SMTP transport
+        const transporter = nodemailer.createTransport({
+            host: 'smtp.ethereal.email',
+            port: 587,
+            secure: false, // true for 465, false for other ports
+            auth: {
+                user: account.user, // generated ethereal user
+                pass: account.pass  // generated ethereal password
+            }
+        });
+
+        // setup email data with unicode symbols
+        const mailOptions: Mail.Options = {
+            from: '"Fred Foo 👻" <foo@blurdybloop.com>', // sender address
+            to: 'bar@blurdybloop.com, baz@blurdybloop.com', // list of receivers
+            subject: 'Hello ✔', // Subject line
+            text: 'Hello world?', // plain text body
+            html: '<b>Hello world?</b>' // html body
+        };
+
+        // send mail with defined transport object
+        transporter.sendMail(mailOptions, (err, info: SMTPTransport.SentMessageInfo) => {
+            if (err) {
+                console.log(err);
+                return;
+            }
+            console.log('Message sent: %s', info.messageId);
+            // Preview only available when sending through an Ethereal account
+            console.log('Preview URL: %s', nodemailer.getTestMessageUrl(info));
+
+            // Message sent: <b658f8ca-6296-ccf4-8306-87d57a0b4321@blurdybloop.com>
+            // Preview URL: https://ethereal.email/message/WaQKMgKddxQDoou...
+        });
+    });
+}
+
+// 3. Message configuration
+
+// Commmon fields
+
+function message_common_fields_test() {
+    const message: Mail.Options = {
+        from: 'sender@server.com',
+        to: 'receiver@sender.com',
+        subject: 'Message title',
+        text: 'Plaintext version of the message',
+        html: '<p>HTML version of the message</p>'
+    };
+}
+
+// More advanced fields
+
+function message_more_advanced_fields_test() {
+    const message: Mail.Options = {
+        headers: {
+            'My-Custom-Header': 'header value'
+        },
+        date: new Date('2000-01-01 00:00:00')
+    };
+
+    const htmlstream = fs.createReadStream('content.html');
+    const transport = nodemailer.createTransport();
+    transport.sendMail({ html: htmlstream }, (err) => {
+        if (err) {
+            // check if htmlstream is still open and close it to clean up
+        }
+    });
+}
+
+// 3. Attachments
+
+function message_attachments_test() {
+    const message: Mail.Options = {
+        attachments: [
+            {   // utf-8 string as an attachment
+                filename: 'text1.txt',
+                content: 'hello world!'
+            },
+            {   // binary buffer as an attachment
+                filename: 'text2.txt',
+                content: new Buffer('hello world!', 'utf-8')
+            },
+            {   // file on disk as an attachment
+                filename: 'text3.txt',
+                path: '/path/to/file.txt' // stream this file
+            },
+            {   // filename and content type is derived from path
+                path: '/path/to/file.txt'
+            },
+            {   // stream as an attachment
+                filename: 'text4.txt',
+                content: fs.createReadStream('file.txt')
+            },
+            {   // define custom content type for the attachment
+                filename: 'text.bin',
+                content: 'hello world!',
+                contentType: 'text/plain'
+            },
+            {   // use URL as an attachment
+                filename: 'license.txt',
+                path: 'https://raw.github.com/nodemailer/nodemailer/master/LICENSE'
+            },
+            {   // encoded string as an attachment
+                filename: 'text1.txt',
+                content: 'aGVsbG8gd29ybGQh',
+                encoding: 'base64'
+            },
+            {   // data uri as an attachment
+                path: 'data:text/plain;base64,aGVsbG8gd29ybGQ='
+            },
+            {
+                // use pregenerated MIME node
+                raw: 'Content-Type: text/plain\r\n' + // tslint:disable-line prefer-template
+                'Content-Disposition: attachment;\r\n' +
+                '\r\n' +
+                'Hello world!'
+            }
+        ]
+    };
+}
+
+// 3. Alternatives
+
+function message_alternatives_test() {
+    const message: Mail.Options = {
+        html: '<b>Hello world!</b>',
+        alternatives: [
+            {
+                contentType: 'text/x-web-markdown',
+                content: '**Hello world!**'
+            }
+        ]
+    };
+}
+
+// 3. Address object
+
+function message_address_object_test() {
+    const message: Mail.Options = {
+        to: 'foobar@blurdybloop.com, "�оде Майлер" <bar@blurdybloop.com>, "Name, User" <baz@blurdybloop.com>',
+        cc: [
+            'foobar@blurdybloop.com',
+            '"�оде Майлер" <bar@blurdybloop.com>',
+            '"Name, User" <baz@blurdybloop.com>'
+        ],
+        bcc: [
+            'foobar@blurdybloop.com',
+            {
+                name: 'Майлер, �оде',
+                address: 'foobar@blurdybloop.com'
+            }
+        ]
+    };
+}
+
+// 3. Calendar events
+
+// Send a REQUEST event as a string
+
+function message_calendar_request_test() {
+    const content = 'BEGIN:VCALENDAR\r\nPRODID:-//ACME/DesktopCalendar//EN\r\nMETHOD:REQUEST\r\n...';
+
+    const message: Mail.Options = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Appointment',
+        text: 'Please see the attached appointment',
+        icalEvent: {
+            filename: 'invitation.ics',
+            method: 'request',
+            content
+        }
+    };
+}
+
+// Send a PUBLISH event from a file
+
+function message_calendar_publish_test() {
+    const message: Mail.Options = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Appointment',
+        text: 'Please see the attached appointment',
+        icalEvent: {
+            method: 'PUBLISH',
+            path: '/path/to/file'
+        }
+    };
+}
+
+// Send a CANCEL event from an URL
+
+function message_calendar_cancel_test() {
+    const message: Mail.Options = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Appointment',
+        text: 'Please see the attached appointment',
+        icalEvent: {
+            method: 'CANCEL',
+            href: 'http://www.example.com/events?event=123'
+        }
+    };
+}
+
+// 3. Embedded images
+
+function message_embedded_images_test() {
+    const message: Mail.Options = {
+        html: 'Embedded image: <img src="cid:unique@nodemailer.com"/>',
+        attachments: [{
+            filename: 'image.png',
+            path: '/path/to/file',
+            cid: 'unique@nodemailer.com' // same cid value as in the html img src
+        }]
+    };
+}
+
+// 3. List headers
+
+// Setup different List-* headers
+
+function message_list_headers_test() {
+    const message: Mail.Options = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'List Message',
+        text: 'I hope no-one unsubscribes from this list!',
+        list: {
+            // List-Help: <mailto:admin@example.com?subject=help>
+            help: 'admin@example.com?subject=help',
+            // List-Unsubscribe: <http://example.com> (Comment)
+            unsubscribe: {
+                url: 'http://example.com',
+                comment: 'Comment'
+            },
+            // List-Subscribe: <mailto:admin@example.com?subject=subscribe>
+            // List-Subscribe: <http://example.com> (Subscribe)
+            subscribe: [
+                'admin@example.com?subject=subscribe',
+                {
+                    url: 'http://example.com',
+                    comment: 'Subscribe'
+                }
+            ],
+            // List-Post: <http://example.com/post>, <mailto:admin@example.com?subject=post> (Post)
+            post: [
+                [
+                    'http://example.com/post',
+                    {
+                        url: 'admin@example.com?subject=post',
+                        comment: 'Post'
+                    }
+                ]
+            ]
+        }
+    };
+}
+
+// 3. Custom headers
+
+// Set custom headers
+
+function message_custom_headers_test() {
+    const message: Mail.Options = {
+        headers: {
+            'x-my-key': 'header value',
+            'x-another-key': 'another value'
+        }
+    };
+}
+
+// Multiple rows with the same key
+
+function message_multiple_rows_with_the_same_key_test() {
+    const message: Mail.Options = {
+        headers: {
+            'x-my-key': [
+                'value for row 1',
+                'value for row 2',
+                'value for row 3'
+            ]
+        }
+    };
+}
+
+// Prepared headers
+
+function message_prepared_headers_test() {
+    const message: Mail.Options = {
+        headers: {
+            'x-processed': 'a really long header or value with non-ascii characters 👮',
+            'x-unprocessed': {
+                prepared: true,
+                value: 'a really long header or value with non-ascii characters 👮'
+            }
+        }
+    };
+}
+
+// 3. Custom source
+
+// Use string as a message body
+
+function message_string_body_test() {
+    const message: Mail.Options = {
+        envelope: {
+            from: 'sender@example.com',
+            to: ['recipient@example.com']
+        },
+        raw: `From: sender@example.com
+To: recipient@example.com
+Subject: test message
+
+Hello world!`
+    };
+}
+
+// Set EML file as message body
+
+function message_eml_file_test() {
+    const message: Mail.Options = {
+        envelope: {
+            from: 'sender@example.com',
+            to: ['recipient@example.com']
+        },
+        raw: {
+            path: '/path/to/message.eml'
+        }
+    };
+}
+
+// Set string as attachment body
+
+function message_string_attachment_test() {
+    const message: Mail.Options = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Custom attachment',
+        attachments: [{
+            raw: `Content-Type: text/plain
+Content-Disposition: attachment
+
+Attached text file`}]
+    };
+}
+
+// 4. SMTP transport
+
+// Single connection
+
+function smtp_single_connection_test() {
+    const smtpConfig: SMTPTransport.Options = {
+        host: 'smtp.example.com',
+        port: 587,
+        secure: false, // upgrade later with STARTTLS
+        auth: {
+            user: 'username',
+            pass: 'password'
+        }
+    };
+    const transporter = nodemailer.createTransport(smtpConfig);
+}
+
+// Pooled connection
+
+function smtp_pooled_connection_test() {
+    const smtpConfig: SMTPPool.Options = {
+        pool: true,
+        host: 'smtp.example.com',
+        port: 465,
+        secure: true, // use TLS
+        auth: {
+            user: 'username',
+            pass: 'password'
+        }
+    };
+    const transporter = nodemailer.createTransport(smtpConfig);
+}
+
+// Allow self-signed certificates
+
+function smtp_self_signed_test() {
+    const smtpConfig: SMTPTransport.Options = {
+        host: 'my.smtp.host',
+        port: 465,
+        secure: true, // use TLS
+        auth: {
+            user: 'username',
+            pass: 'pass'
+        },
+        tls: {
+            // do not fail on invalid certs
+            rejectUnauthorized: false
+        }
+    };
+    const transporter = nodemailer.createTransport(smtpConfig);
+}
+
+// Verify SMTP connection configuration
+
+function smtp_verify_test() {
+    const transporter = nodemailer.createTransport();
+    transporter.verify((error, success) => {
+        if (error) {
+            console.log(error);
+        } else {
+            console.log('Server is ready to take our messages');
+        }
+    });
+}
+
+// 4. SMTP envelope
+
+function smtp_envelope_test() {
+    const message: Mail.Options = {
+        from: 'mailer@nodemailer.com', // listed in rfc822 message header
+        to: 'daemon@nodemailer.com', // listed in rfc822 message header
+        envelope: {
+            from: 'Daemon <deamon@nodemailer.com>', // used as MAIL FROM: address for SMTP
+            to: 'mailer@nodemailer.com, Mailer <mailer2@nodemailer.com>' // used as RCPT TO: address for SMTP
+        }
+    };
+}
+
+// 4. Pooled SMTP
+
+// transporter.close()
+
+function smtp_pool_close_test() {
+    const transporter = nodemailer.createTransport({ pool: true });
+    transporter.close();
+}
+
+// Event:‘idle’
+
+function smtp_pool_idle_test() {
+    const messages = [{ raw: 'list of messages' }];
+    const transporter = nodemailer.createTransport({ pool: true });
+    transporter.on('idle', () => {
+        // send next message from the pending queue
+        while (transporter.isIdle() && messages.length) {
+            transporter.sendMail(messages.shift()!);
+        }
+    });
+}
+
+// 4. Testing SMTP
+
+// Create a testing account on the fly
+
+function smtp_test_account_test() {
+    nodemailer.createTestAccount((err, account) => {
+        if (!err) {
+            // create reusable transporter object using the default SMTP transport
+            const transporter = nodemailer.createTransport({
+                host: 'smtp.ethereal.email',
+                port: 587,
+                secure: false, // true for 465, false for other ports
+                auth: {
+                    user: account.user, // generated ethereal user
+                    pass: account.pass  // generated ethereal password
+                }
+            });
+        }
+    });
+}
+
+// Use environment specific SMTP settings
+
+function smtp_info_test() {
+    const transporter = nodemailer.createTransport();
+    transporter.sendMail({}).then((info: SMTPTransport.SentMessageInfo) => {
+        console.log('Preview URL: ' + nodemailer.getTestMessageUrl(info));
+    });
+}
+
+// 4. OAuth2
+
+// Using custom token handling
+
+function oauth2_token_handling_test() {
+    const transporter = nodemailer.createTransport();
+    const userTokens: { [key: string]: string; } = {};
+    transporter.set('oauth2_provision_cb', (user, renew, callback) => {
+        const accessToken = userTokens[user];
+        if (!accessToken) {
+            callback(new Error('Unknown user'));
+        } else {
+            callback(null, accessToken);
+        }
+    });
+}
+
+// Token update notifications
+
+function oauth2_token_update_test() {
+    const transporter = nodemailer.createTransport();
+    transporter.on('token', token => {
+        console.log('A new access token was generated');
+        console.log('User: %s', token.user);
+        console.log('Access Token: %s', token.accessToken);
+        console.log('Expires: %s', new Date(token.expires));
+    });
+}
+
+// Authenticate using existing token
+
+function oauth2_existing_token_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.gmail.com',
+        port: 465,
+        secure: true,
+        auth: {
+            type: 'OAuth2',
+            user: 'user@example.com',
+            accessToken: 'ya29.Xx_XX0xxxxx-xX0X0XxXXxXxXXXxX0x'
+        }
+    });
+}
+
+// Custom handler
+
+function oauth2_custom_handler_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.gmail.com',
+        port: 465,
+        secure: true,
+        auth: {
+            type: 'OAuth2',
+            user: 'user@example.com'
+        }
+    });
+
+    const userTokens: { [key: string]: string; } = {};
+
+    transporter.set('oauth2_provision_cb', (user, renew, callback) => {
+        const accessToken = userTokens[user];
+        if (!accessToken) {
+            callback(new Error('Unknown user'));
+        } else {
+            callback(null, accessToken);
+        }
+    });
+}
+
+// Set up 3LO authentication
+
+function oauth2_3lo_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.gmail.com',
+        port: 465,
+        secure: true,
+        auth: {
+            type: 'OAuth2',
+            user: 'user@example.com',
+            clientId: '000000000000-xxx0.apps.googleusercontent.com',
+            clientSecret: 'XxxxxXXxX0xxxxxxxx0XXxX0',
+            refreshToken: '1/XXxXxsss-xxxXXXXXxXxx0XXXxxXXx0x00xxx',
+            accessToken: 'ya29.Xx_XX0xxxxx-xX0X0XxXXxXxXXXxX0x',
+            expires: 1484314697598
+        }
+    });
+}
+
+// Set up 2LO authentication
+
+function oauth2_2lo_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.gmail.com',
+        port: 465,
+        secure: true,
+        auth: {
+            type: 'OAuth2',
+            user: 'user@example.com',
+            serviceClient: '113600000000000000000',
+            privateKey: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...',
+            accessToken: 'ya29.Xx_XX0xxxxx-xX0X0XxXXxXxXXXxX0x',
+            expires: 1484314697598
+        }
+    });
+}
+
+// Provide authentication details with message options
+
+function oauth2_message_options_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.gmail.com',
+        port: 465,
+        secure: true,
+        auth: {
+            type: 'OAuth2',
+            clientId: '000000000000-xxx.apps.googleusercontent.com',
+            clientSecret: 'XxxxxXXxX0xxxxxxxx0XXxX0'
+        }
+    });
+
+    const auth: SMTPConnection.AuthenticationTypeOAuth2 = {
+        user: 'user@example.com',
+        refreshToken: '1/XXxXxsss-xxxXXXXXxXxx0XXXxxXXx0x00xxx',
+        accessToken: 'ya29.Xx_XX0xxxxx-xX0X0XxXXxXxXXXxX0x',
+        expires: 1484314697598
+    };
+
+    const options: SMTPTransport.MailOptions = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets through!',
+        auth: {
+            user: 'user@example.com',
+            refreshToken: '1/XXxXxsss-xxxXXXXXxXxx0XXXxxXXx0x00xxx',
+            accessToken: 'ya29.Xx_XX0xxxxx-xX0X0XxXXxXxXXXxX0x',
+            expires: 1484314697598
+        }
+    };
+
+    transporter.sendMail(options);
+}
+
+function oauth2_privision_cb_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.gmail.com',
+        port: 465,
+        secure: true,
+        auth: {
+            type: 'OAuth2'
+        }
+    });
+
+    const userTokens: { [key: string]: string; } = {};
+
+    transporter.set('oauth2_provision_cb', (user, renew, callback) => {
+        const accessToken = userTokens[user];
+        if (!accessToken) {
+            callback(new Error('Unknown user'));
+        } else {
+            callback(null, accessToken);
+        }
+    });
+
+    const options: SMTPTransport.MailOptions = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets through!',
+        auth: {
+            user: 'user@example.com'
+        }
+    };
+
+    transporter.sendMail(options);
+}
+
+// 5. Sendmail transport
+
+// Send a message using specific binary
+
+function sendmail_test() {
+    const transporter = nodemailer.createTransport({
+        sendmail: true,
+        newline: 'unix',
+        path: '/usr/sbin/sendmail'
+    });
+    transporter.sendMail({
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets delivered!'
+    }, (err, info: SendmailTransport.SentMessageInfo) => {
+        if (!err) {
+            console.log(info.envelope);
+            console.log(info.messageId);
+        }
+    });
+}
+
+// 5. SES transport
+
+// Send a message using SES transport
+
+function ses_test() {
+    // configure AWS SDK
+    aws.config.loadFromPath('config.json');
+
+    // create Nodemailer SES transporter
+    const transporter = nodemailer.createTransport({
+        SES: new aws.SES({
+            apiVersion: '2010-12-01'
+        })
+    });
+
+    const options: SESTransport.MailOptions = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets sent!',
+        ses: { // optional extra arguments for SendRawEmail
+            Tags: [{
+                Name: 'tag name',
+                Value: 'tag value'
+            }]
+        }
+    };
+
+    // send some mail
+    transporter.sendMail(options, (err, info: SESTransport.SentMessageInfo) => {
+        if (!err) {
+            console.log(info.envelope);
+            console.log(info.messageId);
+        }
+    });
+}
+
+// 5. Stream transport
+
+// Stream a message with windows-style newlines
+
+function stream_test() {
+    const transporter = nodemailer.createTransport({
+        streamTransport: true,
+        newline: 'windows'
+    });
+    transporter.sendMail({
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets streamed!'
+    }, (err, info: StreamTransport.SentMessageInfo) => {
+        if (!err) {
+            console.log(info.envelope);
+            console.log(info.messageId);
+            // if ('pipe' in info.message) {
+            if (info.message instanceof stream.Readable) {
+                info.message.pipe(process.stdout);
+            }
+        }
+    });
+}
+
+// Create a buffer with unix-style newlines
+
+function stream_buffer_unix_newlines_test() {
+    const transporter = nodemailer.createTransport({
+        streamTransport: true,
+        newline: 'unix',
+        buffer: true
+    });
+    transporter.sendMail({
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets buffered!'
+    }, (err, info: StreamTransport.SentMessageInfo) => {
+        if (!err) {
+            console.log(info.envelope);
+            console.log(info.messageId);
+            console.log(info.message.toString());
+        }
+    });
+}
+
+// Create a JSON encoded message object
+
+function json_test() {
+    const transporter = nodemailer.createTransport({
+        jsonTransport: true
+    });
+    transporter.sendMail({
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets buffered!'
+    }, (err, info: JSONTransport.SentMessageInfo) => {
+        if (!err) {
+            console.log(info.envelope);
+            console.log(info.messageId);
+            console.log(info.message); // JSON string
+        }
+    });
+}
+
+// 6. Create plugins
+
+// 'compile'
+
+function plugin_compile_test() {
+    const transporter = nodemailer.createTransport();
+
+    function plugin(mail: typeof transporter.MailMessage, callback: (err?: Error | null) => void) {
+        // if mail.data.html is a file or an url, it is returned as a Buffer
+        mail.resolveContent(mail.data, 'html', (err, html) => {
+            if (err) {
+                callback(err);
+                return;
+            }
+            console.log('HTML contents: %s', html.toString());
+            callback();
+        });
+    }
+
+    transporter.use('compile', (mail, callback) => {
+        if (!mail.data.text && mail.data.html && typeof mail.data.html === 'string') {
+            mail.data.text = mail.data.html.replace(/<[^>]*>/g, ' ');
+        }
+        callback();
+    });
+}
+
+// 'stream'
+
+function plugin_stream_test() {
+    const transformer: stream.Transform = new (require('stream').Transform)();
+
+    transformer._transform = function(chunk: Buffer, encoding, done) {
+        // replace all tabs with spaces in the stream chunk
+        for (let i = 0; i < chunk.length; i++) {
+            if (chunk[i] === 0x09) {
+                chunk[i] = 0x20;
+            }
+        }
+        this.push(chunk);
+        done();
+    };
+
+    const transporter = nodemailer.createTransport();
+
+    transporter.use('stream', (mail, callback) => {
+        // apply output transformer to the raw message stream
+        mail.message.transform(transformer);
+        callback();
+    });
+
+    transporter.use('stream', (mail, callback) => {
+        const addresses = mail.message.getAddresses();
+        console.log('From: %s', JSON.stringify(addresses.from));
+        console.log('To: %s', JSON.stringify(addresses.to));
+        console.log('Cc: %s', JSON.stringify(addresses.cc));
+        console.log('Bcc: %s', JSON.stringify(addresses.bcc));
+        callback();
+    });
+}
+
+// Transport Example
+
+function plugin_transport_example_test() {
+    interface MailOptions extends Mail.Options {
+        mailOption?: 'foo';
+    }
+    interface Options extends MailOptions, nodemailer.TransportOptions {
+        transportOptions: 'bar';
+    }
+    interface SentMessageInfo {
+        SentMessageInfo: 'baz';
+    }
+
+    class Transport implements nodemailer.Transport {
+        name = 'minimal';
+        version = '0.1.0';
+        constructor(options: Options) { }
+        send(mail: MailMessage, callback: (err: Error | null, info: SentMessageInfo) => void): void {
+            const input = mail.message.createReadStream();
+            input.pipe(process.stdout);
+            input.on('end', () => {
+                callback(null, { SentMessageInfo: 'baz' });
+            });
+        }
+    }
+
+    const transporter = nodemailer.createTransport(new Transport({
+        transportOptions: 'bar'
+    }));
+
+    const options: MailOptions = {
+        from: 'sender',
+        to: 'receiver',
+        subject: 'hello',
+        text: 'hello world!',
+        mailOption: 'foo'
+    };
+
+    transporter.sendMail(options);
+}
+
+// 7. https://nodemailer.com/dkim/
+
+// Sign all messages
+
+function dkim_sign_all_test() {
+    const opts: SMTPTransport.Options = {
+        host: 'smtp.example.com',
+        port: 465,
+        secure: true,
+        dkim: {
+            domainName: 'example.com',
+            keySelector: '2017',
+            privateKey: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...'
+        }
+    };
+}
+
+// Sign all messages with multiple keys
+
+function dkim_sign_multiple_keys_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.example.com',
+        port: 465,
+        secure: true,
+        dkim: {
+            keys: [
+                {
+                    domainName: 'example.com',
+                    keySelector: '2017',
+                    privateKey: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...'
+                },
+                {
+                    domainName: 'example.com',
+                    keySelector: '2016',
+                    privateKey: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...'
+                }
+            ],
+            cacheDir: false
+        }
+    });
+}
+
+// Sign a specific message
+
+function dkim_sign_specific_message_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.example.com',
+        port: 465,
+        secure: true
+    });
+    const message: Mail.Options = {
+        from: 'sender@example.com',
+        to: 'recipient@example.com',
+        subject: 'Message',
+        text: 'I hope this message gets read!',
+        dkim: {
+            domainName: 'example.com',
+            keySelector: '2017',
+            privateKey: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...'
+        }
+    };
+}
+
+// Cache large messages for signing
+
+function dkim_cache_large_messages_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.example.com',
+        port: 465,
+        secure: true,
+        dkim: {
+            domainName: 'example.com',
+            keySelector: '2017',
+            privateKey: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...',
+            cacheDir: '/tmp',
+            cacheTreshold: 100 * 1024
+        }
+    });
+}
+
+// Do not sign specific header keys
+
+function dkim_specific_header_key_test() {
+    const transporter = nodemailer.createTransport({
+        host: 'smtp.example.com',
+        port: 465,
+        secure: true,
+        dkim: {
+            domainName: 'example.com',
+            keySelector: '2017',
+            privateKey: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...',
+            skipFields: 'message-id:date'
+        }
+    });
+}
+
+// 8. SMTP Connection
+
+// SMTP Connection
+
+function smtp_connection_test() {
+    const connection = new SMTPConnection();
+    connection.connect(() => {
+        connection.login({ user: 'user', pass: 'pass' }, (err) => {
+            if (err) throw err;
+            connection.send({ from: 'a@example.com', to: 'b@example.net' }, 'message', (err, info) => {
+                if (err) {
+                    const code: string = err.code || '???';
+                    const response: string = err.response || '???';
+                    const responseCode: number = err.responseCode || 0;
+                    const command: string = err.command || '???';
+                    throw err;
+                }
+                connection.reset(() => {
+                    if (err) throw err;
+                    connection.quit();
+                    connection.close();
+                });
+            });
+        });
+    });
+}
+
+// Mailcomposer
+
+// createReadStream
+
+function mailcomposer_createReadStream_test() {
+    const mail = new MailComposer({ from: '...' });
+    const stream = mail.compile().createReadStream();
+    stream.pipe(process.stdout);
+}
+
+// build
+
+function mailcomposer_build_test() {
+    const mail = new MailComposer({ from: '...' });
+    mail.compile().build((err, message) => {
+        process.stdout.write(message);
+    });
+}
+
+// addressparser
+
+function addressparser_test() {
+    const input = 'andris@tr.ee';
+    const result = addressparser(input);
+    const address: string = result[0].address;
+    const name: string = result[0].name;
+}
+
+// base64
+
+function base64_test() {
+    base64.encode('abcd= ÕÄÖÜ');
+
+    base64.encode(new Buffer([0x00, 0x01, 0x02, 0x20, 0x03]));
+}
+
+// fetch
+
+function fetch_test() {
+    fetch('http://localhost/');
+
+    fetch('http://localhost:/', {
+        allowErrorResponse: true,
+        method: 'post',
+        cookie: 'test=pest',
+        body: {
+            hello: 'world 😭',
+            another: 'value'
+        },
+        timeout: 1000,
+        tls: {
+            rejectUnauthorized: true
+        }
+    });
+}
+
+// fetch/cookies
+
+function fetch_cookies_test() {
+    const biskviit = new Cookies();
+
+    biskviit.getPath('/');
+
+    biskviit.isExpired({
+        name: 'a',
+        value: 'b',
+        expires: new Date(Date.now() + 10000)
+    });
+
+    biskviit.compare(
+        {
+            name: 'zzz',
+            path: '/',
+            domain: 'example.com',
+            secure: false,
+            httponly: false
+        },
+        {
+            name: 'zzz',
+            path: '/',
+            domain: 'example.com',
+            secure: false,
+            httponly: false
+        }
+    );
+
+    biskviit.add({
+        name: 'zzz',
+        value: 'abc',
+        path: '/',
+        expires: new Date(Date.now() + 10000),
+        domain: 'example.com',
+        secure: false,
+        httponly: false
+    });
+
+    const cookie = {
+        name: 'zzz',
+        value: 'abc',
+        path: '/def/',
+        expires: new Date(Date.now() + 10000),
+        domain: 'example.com',
+        secure: false,
+        httponly: false
+    };
+
+    biskviit.match(cookie, 'http://example.com/def/');
+
+    biskviit.parse('theme=plain');
+
+    biskviit.list('https://www.foo.com');
+
+    biskviit.get('https://www.foo.com');
+
+    biskviit.set('theme=plain', 'https://foo.com/');
+}
+
+// mime-funcs
+
+function mime_funcs_test() {
+    mimeFuncs.isPlainText('abc');
+
+    mimeFuncs.hasLongerLines('abc\ndef', 5);
+
+    mimeFuncs.encodeWord('See on õhin test');
+    mimeFuncs.encodeWord('See on õhin test', 'B');
+    mimeFuncs.encodeWords('метель" вьюга', 'Q', 52);
+    mimeFuncs.encodeWords('Jõgeva Jõgeva Jõgeva mugeva Jõgeva Jõgeva Jõgeva Jõgeva Jõgeva', 'Q', 16);
+    mimeFuncs.encodeWords('õõõõõ õõõõõ õõõõõ mugeva õõõõõ õõõõõ õõõõõ õõõõõ Jõgeva', 'B', 30);
+
+    mimeFuncs.buildHeaderParam('title', 'this is just a title', 500);
+
+    const parsedHeader = mimeFuncs.parseHeaderValue('content-disposition: attachment; filename=filename');
+    console.log(parsedHeader.params.filename);
+
+    mimeFuncs.buildHeaderValue({
+        value: 'test'
+    });
+
+    mimeFuncs.buildHeaderValue({
+        value: 'test',
+        params: {
+            a: 'b'
+        }
+    });
+
+    mimeFuncs.foldLines('Testin command line', 76, true);
+    mimeFuncs.foldLines('Testin command line', 76);
+}
+
+// mime-types
+
+function mime_types_test() {
+    mimeTypes.detectExtension(false);
+    mimeTypes.detectExtension('unknown');
+
+    mimeTypes.detectMimeType(false);
+    mimeTypes.detectMimeType('unknown');
+}
+
+// qp
+
+function qp_test() {
+    qp.encode('abcd= ÕÄÖÜ');
+
+    qp.encode(new Buffer([0x00, 0x01, 0x02, 0x20, 0x03]));
+}
+
+// shared
+
+function shared_getLogger_test() {
+    shared.getLogger({
+        logger: false
+    });
+
+    shared.getLogger();
+
+    const options = shared.parseConnectionUrl('smtps://user:pass@localhost:123?tls.rejectUnauthorized=false&name=horizon');
+    console.log(options.secure, options.auth!.user, options.tls!.rejectUnauthorized);
+}
+
+function shared_resolveContent_string_test() {
+    const mail = {
+        data: {
+            html: '<p>Tere, tere</p><p>vana kere!</p>\n'
+        }
+    };
+
+    shared.resolveContent(mail.data, 'html', (err, value) => {
+        if (!err) {
+            console.log(value);
+        }
+    });
+
+    shared.resolveContent(mail.data, 'html').then((value) => console.log(value));
+}
+
+function shared_resolveContent_buffer_test() {
+    const mail = {
+        data: {
+            html: new Buffer('<p>Tere, tere</p><p>vana kere!</p>\n')
+        }
+    };
+
+    shared.resolveContent(mail.data, 'html', (err, value) => {
+        if (!err) {
+            console.log(value);
+        }
+    });
+
+    shared.resolveContent(mail.data, 'html').then((value) => console.log(value));
+}
+
+function shared_assign_test() {
+    const target = {
+        a: 1,
+        b: 2,
+        c: 3
+    };
+    const arg1 = {
+        b: 5,
+        y: 66,
+        e: 33
+    };
+
+    const arg2 = {
+        y: 17,
+        qq: 98
+    };
+
+    shared.assign(target, arg1, arg2);
+}
+
+function shared_encodeXText_test() {
+    shared.encodeXText('teretere');
+}
+
+// well-known
+
+function well_known_test() {
+    const options = wellKnown('Gmail');
+    if (options) {
+        console.log(options.host, options.port, options.secure);
+    }
+}
diff --git a/types/nodemailer/package.json b/types/nodemailer/package.json
deleted file mode 100644
index 6a583a47b0..0000000000
--- a/types/nodemailer/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "aws-sdk": "^2.37.0"
-    }
-}
\ No newline at end of file
diff --git a/types/nodemailer/tsconfig.json b/types/nodemailer/tsconfig.json
index 412f3312eb..f2c1ffbbe8 100644
--- a/types/nodemailer/tsconfig.json
+++ b/types/nodemailer/tsconfig.json
@@ -6,8 +6,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -18,6 +18,28 @@
     },
     "files": [
         "index.d.ts",
+        "lib/addressparser.d.ts",
+        "lib/base64.d.ts",
+        "lib/dkim.d.ts",
+        "lib/fetch/index.d.ts",
+        "lib/fetch/cookies.d.ts",
+        "lib/json-transport.d.ts",
+        "lib/mail-composer.d.ts",
+        "lib/mailer/index.d.ts",
+        "lib/mailer/mail-message.d.ts",
+        "lib/mime-funcs/index.d.ts",
+        "lib/mime-funcs/mime-types.d.ts",
+        "lib/mime-node.d.ts",
+        "lib/qp.d.ts",
+        "lib/sendmail-transport.d.ts",
+        "lib/ses-transport.d.ts",
+        "lib/shared.d.ts",
+        "lib/smtp-connection.d.ts",
+        "lib/smtp-pool.d.ts",
+        "lib/smtp-transport.d.ts",
+        "lib/stream-transport.d.ts",
+        "lib/well-known.d.ts",
+        "lib/xoauth2.d.ts",
         "nodemailer-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/nodemailer/tslint.json b/types/nodemailer/tslint.json
new file mode 100644
index 0000000000..64aace11d6
--- /dev/null
+++ b/types/nodemailer/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false
+    }
+}
diff --git a/types/nodemailer/v3/index.d.ts b/types/nodemailer/v3/index.d.ts
new file mode 100644
index 0000000000..fb1c359625
--- /dev/null
+++ b/types/nodemailer/v3/index.d.ts
@@ -0,0 +1,215 @@
+// Type definitions for Nodemailer 3.1.5
+// Project: https://github.com/andris9/Nodemailer
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import directTransport = require("nodemailer-direct-transport");
+import smtpTransport = require("nodemailer-smtp-transport");
+import sesTransport = require("nodemailer-ses-transport")
+
+/**
+ * Transporter plugin
+ */
+export interface Plugin {
+    (mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
+}
+
+/**
+ * This is what you use to send mail
+ */
+export interface Transporter {
+    /**
+     * Send a mail with callback
+     */
+    sendMail(mail: SendMailOptions, callback: (error: Error, info: SentMessageInfo) => void): void;
+
+    /**
+     * Send a mail
+     * return Promise
+     */
+    sendMail(mail: SendMailOptions): Promise<SentMessageInfo>;
+
+	/**
+	 * Attach a plugin. 'compile' and 'stream' plugins can be attached with use(plugin) method
+	 *
+	 * @param step is a string, either 'compile' or 'stream' thatd defines when the plugin should be hooked
+	 * @param pluginFunc is a function that takes two arguments: the mail object and a callback function
+	 */
+	use(step: string, plugin: Plugin): void;
+
+	/**
+	 * Verifies connection with server
+	 */
+	verify(callback: (error: Error, success?: boolean) => void): void;
+
+    /**
+     * Verifies connection with server
+     */
+    verify(): Promise<void>;
+
+    /**
+     * Close all connections
+     */
+    close?(): void;
+}
+
+/**
+ * Create a direct transporter
+ */
+export declare function createTransport(options?: directTransport.DirectOptions, defaults?: Object): Transporter;
+/**
+ * Create an SMTP transporter
+ */
+export declare function createTransport(options?: smtpTransport.SmtpOptions, defaults?: Object): Transporter;
+/**
+ * Create an SMTP transporter using a connection url
+ */
+export declare function createTransport(connectionUrl: string, defaults?: Object): Transporter;
+/**
+ * Create an AWS SES transporter
+ */
+export declare function createTransport(options?: sesTransport.SesOptions, defaults?: Object): Transporter;
+/**
+ * Create a transporter from a given implementation
+ */
+export declare function createTransport(transport: Transport, defaults?: Object): Transporter;
+export interface AttachmentObject {
+	/**
+	 * filename to be reported as the name of the attached file, use of unicode is allowed
+	 */
+	filename?: string;
+	/**
+	 * optional content id for using inline images in HTML message source
+	 */
+	cid?: string;
+	/**
+	 * Pathname or URL to use streaming
+	 */
+	path?: string;
+	/**
+	 * String, Buffer or a Stream contents for the attachment
+	 */
+	content: string|Buffer|NodeJS.ReadableStream;
+	/**
+	 * If set and content is string, then encodes the content to a Buffer using the specified encoding. Example values: base64, hex, 'binary' etc. Useful if you want to use binary attachments in a JSON formatted e-mail object.
+	 */
+	encoding?: string;
+	/**
+	 * optional content type for the attachment, if not set will be derived from the filename property
+	 */
+	contentType?: string;
+	/**
+	 * optional content disposition type for the attachment, defaults to 'attachment'
+	 */
+	contentDisposition?: string;
+}
+
+export interface SendMailOptions {
+	/**
+	 * The e-mail address of the sender. All e-mail addresses can be plain 'sender@server.com' or formatted 'Sender Name <sender@server.com>', see here for details
+	 */
+	from?: string;
+	/**
+	 * An e-mail address that will appear on the Sender: field
+	 */
+	sender?: string;
+	/**
+	 * Comma separated list or an array of recipients e-mail addresses that will appear on the To: field
+	 */
+	to?: string|string[];
+	/**
+	 * Comma separated list or an array of recipients e-mail addresses that will appear on the Cc: field
+	 */
+	cc?: string|string[];
+	/**
+	 * Comma separated list or an array of recipients e-mail addresses that will appear on the Bcc: field
+	 */
+	bcc?: string|string[];
+	/**
+	 * An e-mail address that will appear on the Reply-To: field
+	 */
+	replyTo?: string;
+	/**
+	 * The message-id this message is replying
+	 */
+	inReplyTo?: string;
+	/**
+	 * Message-id list (an array or space separated string)
+	 */
+	references?: string|string[];
+	/**
+	 * The subject of the e-mail
+	 */
+	subject?: string;
+	/**
+	 * The plaintext version of the message as an Unicode string, Buffer, Stream or an object {path: '...'}
+	 */
+	text?: string|Buffer|NodeJS.ReadableStream|AttachmentObject;
+	/**
+	 * The HTML version of the message as an Unicode string, Buffer, Stream or an object {path: '...'}
+	 */
+	html?: string|Buffer|NodeJS.ReadableStream|AttachmentObject;
+	/**
+	 * An object or array of additional header fields (e.g. {"X-Key-Name": "key value"} or [{key: "X-Key-Name", value: "val1"}, {key: "X-Key-Name", value: "val2"}])
+	 */
+	headers?: any;
+	/**
+	 * An array of attachment objects (see below for details)
+	 */
+	attachments?: AttachmentObject[];
+	/**
+	 * An array of alternative text contents (in addition to text and html parts) (see below for details)
+	 */
+	alternatives?: AttachmentObject[];
+	/**
+	 * optional Message-Id value, random value will be generated if not set
+	 */
+	messageId?: string;
+	/**
+	 * optional Date value, current UTC string will be used if not set
+	 */
+	date?: Date;
+	/**
+	 * optional transfer encoding for the textual parts (defaults to 'quoted-printable')
+	 */
+	encoding?: string;
+}
+
+export interface SentMessageInfo {
+	/**
+	 * most transports should return the final Message-Id value used with this property
+	 */
+	messageId: string;
+	/**
+	 * includes the envelope object for the message
+	 */
+	envelope: any;
+	/**
+	 * is an array returned by SMTP transports (includes recipient addresses that were accepted by the server)
+	 */
+	accepted: string[];
+	/**
+	 * is an array returned by SMTP transports (includes recipient addresses that were rejected by the server)
+	 */
+	rejected: string[];
+	/**
+	 * is an array returned by Direct SMTP transport. Includes recipient addresses that were temporarily rejected together with the server response
+	 */
+	pending?: string[];
+	/**
+	 * is a string returned by SMTP transports and includes the last SMTP response from the server
+	 */
+	response: string;
+}
+
+/**
+ * This is what you implement to create a new transporter yourself
+ */
+export interface Transport {
+	name: string;
+	version: string;
+	send(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
+	close(): void;
+}
diff --git a/types/nodemailer/v3/nodemailer-tests.ts b/types/nodemailer/v3/nodemailer-tests.ts
new file mode 100644
index 0000000000..cd26579189
--- /dev/null
+++ b/types/nodemailer/v3/nodemailer-tests.ts
@@ -0,0 +1,71 @@
+import * as nodemailer from 'nodemailer'
+import * as AWS from 'aws-sdk'
+
+// create reusable transporter object using SMTP transport
+var transporter: nodemailer.Transporter = nodemailer.createTransport({
+    service: 'Gmail',
+    auth: {
+        user: 'gmail.user@gmail.com',
+        pass: 'userpass'
+    }
+});
+
+// create reusable transporter object using SMTP connection url using default options
+transporter = nodemailer.createTransport("smtps://gmail.user@gmail.com:userpass@gmail/?pool=true");
+
+// create reusable transporter object using SMTP connection url and specify some options
+transporter = nodemailer.createTransport("smtps://gmail.user@gmail.com:userpass@gmail/?pool=true",
+ {
+    from: 'sender@address',
+    headers: {
+        'My-Awesome-Header': '123'
+    }
+ });
+
+// create reusable transporter object using SES transport and set default values for mail options.
+transporter = nodemailer.createTransport({
+    SES: new AWS.SES()
+})
+// create reusable transporter object using SMTP transport and set default values for mail options.
+transporter = nodemailer.createTransport({
+    SES: new AWS.SES()
+}, {
+    from: 'sender@address',
+    headers: {
+        'My-Awesome-Header': '123'
+    }
+})
+
+// create reusable transporter object using SMTP transport and set default values for mail options.
+transporter = nodemailer.createTransport({
+    service: 'Gmail',
+    auth: {
+        user: 'gmail.user@gmail.com',
+        pass: 'userpass'
+    }
+}, {
+    from: 'sender@address',
+    headers: {
+        'My-Awesome-Header': '123'
+    }
+});
+
+// setup e-mail data with unicode symbols
+var mailOptions: nodemailer.SendMailOptions = {
+    from: 'Fred Foo ✔ <foo@blurdybloop.com>', // sender address
+    to: 'bar@blurdybloop.com, baz@blurdybloop.com', // list of receivers
+    subject: 'Hello ✔', // Subject line
+    text: 'Hello world ✔', // plaintext body
+    html: '<b>Hello world ✔</b>' // html body
+};
+
+// send mail with defined transport object
+transporter.sendMail(mailOptions, (error: Error, info: nodemailer.SentMessageInfo): void => {
+	// nothing
+});
+
+// promise send mail without callback
+transporter
+  .sendMail(mailOptions)
+  .then(info => info.messageId)
+  .catch(err => {})
\ No newline at end of file
diff --git a/types/nodemailer/v3/package.json b/types/nodemailer/v3/package.json
new file mode 100644
index 0000000000..3711406140
--- /dev/null
+++ b/types/nodemailer/v3/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "aws-sdk": "^2.37.0"
+    }
+}
diff --git a/types/nodemailer/v3/tsconfig.json b/types/nodemailer/v3/tsconfig.json
new file mode 100644
index 0000000000..4ebef6b8cf
--- /dev/null
+++ b/types/nodemailer/v3/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "nodemailer": [
+                "nodemailer/v3"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodemailer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/nodemailer/v3/tslint.json b/types/nodemailer/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodemailer/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nodeunit/tslint.json b/types/nodeunit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nodeunit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/noisejs/tslint.json b/types/noisejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/noisejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nomnom/tslint.json b/types/nomnom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nomnom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nopt/tslint.json b/types/nopt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nopt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/normalize-package-data/index.d.ts b/types/normalize-package-data/index.d.ts
new file mode 100644
index 0000000000..fa8186b0b1
--- /dev/null
+++ b/types/normalize-package-data/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for normalize-package-data 2.4
+// Project: https://github.com/npm/normalize-package-data#readme
+// Definitions by: Jeff Dickey <https://github.com/jdxcode>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = normalize;
+
+declare function normalize(data: normalize.Input, warn?: normalize.WarnFn, strict?: boolean): void;
+declare function normalize(data: normalize.Input, strict?: boolean): void;
+
+declare namespace normalize {
+    type WarnFn = (msg: string) => void;
+    interface Input {[k: string]: any; }
+
+    interface Person {
+        name?: string;
+        email?: string;
+        url?: string;
+    }
+
+    interface Package {
+        [k: string]: any;
+        name: string;
+        version: string;
+        files?: string[];
+        bin?: {[k: string]: string };
+        man?: string[];
+        keywords?: string[];
+        author?: Person;
+        maintainers?: Person[];
+        contributors?: Person[];
+        bundleDependencies?: {[name: string]: string; };
+        dependencies?: {[name: string]: string; };
+        devDependencies?: {[name: string]: string; };
+        optionalDependencies?: {[name: string]: string; };
+        description?: string;
+        engines?: {[type: string]: string };
+        license?: string;
+        repository?: { type: string, url: string };
+        bugs?: { url: string, email?: string } | { url?: string, email: string };
+        homepage?: string;
+        scripts?: {[k: string]: string};
+        readme: string;
+        _id: string;
+    }
+}
diff --git a/types/normalize-package-data/normalize-package-data-tests.ts b/types/normalize-package-data/normalize-package-data-tests.ts
new file mode 100644
index 0000000000..525606d51f
--- /dev/null
+++ b/types/normalize-package-data/normalize-package-data-tests.ts
@@ -0,0 +1,71 @@
+import normalize = require('normalize-package-data');
+
+normalize({name: 'foo'}, (msg: string) => {}, true);
+normalize({name: 'foo'}, (msg: string) => {});
+normalize({name: 'foo'}, true);
+normalize({name: 'foo'});
+
+const empty: normalize.Package = {
+    name: '',
+    version: '',
+    readme: 'ERROR: No README data found!',
+    _id: '@'
+};
+
+const cliEngineUtil: normalize.Package = {
+    name: '@cli-engine/util',
+    description: 'scripts to use with cli-engine codebases',
+    version: '1.0.13',
+    author: { name: 'Jeff Dickey @jdxcode' },
+    bin: { 'cli-engine-util': './bin/run' },
+    'cli-engine': { bin: 'cli-engine-util', commands: './lib/commands' },
+    dependencies:
+    { '@cli-engine/command': '^12.1.0',
+        '@cli-engine/config': '^5.0.11',
+        '@cli-engine/engine': '^6.1.29',
+        '@heroku-cli/color': '^1.1.1',
+        '@types/handlebars': '^4.0.36',
+        '@types/pkg-dir': '^2.0.0',
+        'cli-ux': '^2.0.21',
+        'cross-spawn': '^5.1.0',
+        del: '^3.0.0',
+        execa: '^0.8.0',
+        'fs-extra': '^5.0.0',
+        globby: '^7.1.1',
+        handlebars: '^4.0.11',
+        'pkg-dir': '^2.0.0',
+        'read-pkg-up': '^3.0.0',
+        'ts-lodash': '^4.0.9',
+        tslib: '^1.8.1' },
+    devDependencies:
+    { '@heroku-cli/tslint': '^1.1.2',
+        '@types/ansi-styles': '^2.0.30',
+        '@types/del': '^3.0.0',
+        '@types/execa': '^0.8.1',
+        '@types/fs-extra': '^5.0.0',
+        '@types/jest': '^22.0.1',
+        '@types/lodash': '^4.14.92',
+        '@types/node': '8.5.7',
+        '@types/read-pkg-up': '^2.0.0',
+        '@types/supports-color': '^3.1.0',
+        husky: '^0.14.3',
+        jest: '^22.0.4',
+        prettier: '^1.9.2',
+        'ts-jest': '^22.0.1',
+        tslint: '^5.8.0',
+        typescript: '^2.6.2' },
+    engines: { node: '>=6.0.0' },
+    files: [ 'bin', 'lib' ],
+    license: 'MIT',
+    repository:
+    { type: 'git',
+        url: 'git+https://github.com/jdxcode/cli-engine-util.git' },
+    scripts:
+    { precommit: './bin/run',
+        prepare: './bin/run',
+        test: './bin/run' },
+    bugs: { url: 'https://github.com/jdxcode/cli-engine-util/issues' },
+    readme: 'ERROR: No README data found!',
+    homepage: 'https://github.com/jdxcode/cli-engine-util#readme',
+    _id: '@cli-engine/util@1.0.13',
+};
diff --git a/types/normalize-package-data/tsconfig.json b/types/normalize-package-data/tsconfig.json
new file mode 100644
index 0000000000..0e79738d04
--- /dev/null
+++ b/types/normalize-package-data/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "normalize-package-data-tests.ts"
+    ]
+}
diff --git a/types/normalize-package-data/tslint.json b/types/normalize-package-data/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/normalize-package-data/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/notie/tslint.json b/types/notie/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/notie/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/notify.js/tsconfig.json b/types/notify.js/tsconfig.json
deleted file mode 100644
index 4e338e2e8b..0000000000
--- a/types/notify.js/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "notify.js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/notify/tslint.json b/types/notify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/notify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/notify.js/index.d.ts b/types/notifyjs-browser/index.d.ts
similarity index 100%
rename from types/notify.js/index.d.ts
rename to types/notifyjs-browser/index.d.ts
diff --git a/types/notify.js/notify.js-tests.ts b/types/notifyjs-browser/notifyjs-browser-tests.ts
similarity index 100%
rename from types/notify.js/notify.js-tests.ts
rename to types/notifyjs-browser/notifyjs-browser-tests.ts
diff --git a/types/notifyjs-browser/tsconfig.json b/types/notifyjs-browser/tsconfig.json
new file mode 100644
index 0000000000..53861036b0
--- /dev/null
+++ b/types/notifyjs-browser/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "notifyjs-browser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/notifyjs-browser/tslint.json b/types/notifyjs-browser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/notifyjs-browser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/notifyjs/index.d.ts b/types/notifyjs/index.d.ts
index e31753b69e..d01ae91a92 100644
--- a/types/notifyjs/index.d.ts
+++ b/types/notifyjs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for notify.js 1.2.8
+// Type definitions for notifyjs 1.2.8
 // Project: https://github.com/alexgibson/notify.js
 // Definitions by: soundTricker <https://github.com/soundTricker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/notifyjs/tslint.json b/types/notifyjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/notifyjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/notyf/index.d.ts b/types/notyf/index.d.ts
new file mode 100644
index 0000000000..25607add44
--- /dev/null
+++ b/types/notyf/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for notyf 2.0
+// Project: https://github.com/caroso1222/notyf
+// Definitions by: Pavel Gurov <https://github.com/gurov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Options {
+    delay?: number;
+    alertIcon?: string;
+    confirmIcon?: string;
+}
+
+declare class Notyf {
+    constructor(options?: Options);
+
+    alert(text: string): void;
+    confirm(text: string): void;
+}
+export = Notyf;
diff --git a/types/notyf/notyf-tests.ts b/types/notyf/notyf-tests.ts
new file mode 100644
index 0000000000..add8338465
--- /dev/null
+++ b/types/notyf/notyf-tests.ts
@@ -0,0 +1,11 @@
+import Notyf = require("notyf");
+
+const options = {
+    delay: 1000,
+    alertIcon: 'fa fa-bell',
+    confirmIcon: 'fa fa-exclamation'
+};
+
+const notyf = new Notyf(options);
+notyf.alert('Danger!');
+notyf.confirm('Success!');
diff --git a/types/notyf/tsconfig.json b/types/notyf/tsconfig.json
new file mode 100644
index 0000000000..9cf78d162a
--- /dev/null
+++ b/types/notyf/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "notyf-tests.ts"
+    ]
+}
diff --git a/types/notyf/tslint.json b/types/notyf/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/notyf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nouislider/index.d.ts b/types/nouislider/index.d.ts
index 4389b87d49..0e070e89c7 100644
--- a/types/nouislider/index.d.ts
+++ b/types/nouislider/index.d.ts
@@ -8,102 +8,102 @@ export = noUiSlider;
 export as namespace noUiSlider;
 
 declare namespace noUiSlider {
-    /**
+	/**
      * To create a slider, call noUiSlider.create() with an element and your options.
      */
-    function create(target: HTMLElement, options: Options): void;
+	function create(target: HTMLElement, options: Options): void;
 
-    interface Options {
-        /**
+	interface Options {
+		/**
          * The start option sets the number of handles and their start positions, relative to range.
          */
-        start: number | number[] | number[][];
-        /**
+		start: number | number[] | number[][];
+		/**
          * All values on the slider are part of a range. The range has a minimum and maximum value.
          * The minimum value cannot be equal to the maximum value.
          */
-        range: Object;
-        /**
+		range: { [key: string]: number | number[] };
+		/**
          * The connect setting can be used to control the (green) bar between the handles, or the edges of the slider.
-         * Pass an array with a boolean for every connecting element, including the edges of the slider. 
+         * Pass an array with a boolean for every connecting element, including the edges of the slider.
          * The length of this array must match the handle count + 1.
          * Setting true sets the bars between the handles, but not between the handles and the sliders edges.
          */
-        connect?: boolean | boolean[];
-        /**
+		connect?: boolean | boolean[];
+		/**
          * When using two handles, the minimum distance between the handles can be set using the margin option.
          * The margin value is relative to the value set in 'range'.
          * This option is only available on standard linear sliders.
          */
-        margin?: number;
-        /**
+		margin?: number;
+		/**
          * The limit option is the opposite of the margin option,
          * limiting the maximum distance between two handles.
          * As with the margin option, the limit option can only be used on linear sliders.
          */
-        limit?: number;
-        /**
+		limit?: number;
+		/**
          * Padding limits how close to the slider edges handles can be.
          */
-        padding?: number;
-        /**
+		padding?: number;
+		/**
          * By default, the slider slides fluently.
          * In order to make the handles jump between intervals, you can use this option.
          * The step option is relative to the values provided to range.
          */
-        step?: number;
-        /**
+		step?: number;
+		/**
          * The orientation setting can be used to set the slider to "vertical" or "horizontal".
          * Set dimensions! Vertical sliders don't assume a default height, so you'll need to set one.
          * You can use any unit you want, including % or px.
          */
-        orientation?: "vertical" | "horizontal";
-        /**
+		orientation?: 'vertical' | 'horizontal';
+		/**
          * By default the sliders are top-to-bottom and left-to-right,
          * but you can change this using the direction option,
          * which decides where the upper side of the slider is.
          */
-        direction?: "ltr" | "rtl";
-        /**
-         * noUiSlider can provide a basic tooltip without using its events system. 
-         * Set the tooltips option to true to enable. 
-         * This option can also accept formatting options to format the tooltips content. 
+		direction?: 'ltr' | 'rtl';
+		/**
+         * noUiSlider can provide a basic tooltip without using its events system.
+         * Set the tooltips option to true to enable.
+         * This option can also accept formatting options to format the tooltips content.
          * In that case, pass an array with a formatter for each handle, true to use the default or false to display no tooltip.
          */
-        tooltips?: boolean | Object | ((...args:any[]) => any);
-        /**
+		tooltips?: boolean | Object | ((...args: any[]) => any);
+		/**
          * Set the animate option to false to prevent the slider from animating to a new value with when calling .val().
          */
-        animate?: boolean;
-        /**
+		animate?: boolean;
+		/**
          * The animationDuration option can be used to set the animation speed assumed by the slider library.
          * In addition to this, you must manually set the CSS (-webkit-)transition property for the .noUi-state-tap .noUi-origin selector.
          */
-        animationDuration?: number;
-        /**
+		animationDuration?: number;
+		/**
          * When a non-linear slider has been configured, the snap option can be set to true to force the slider to jump
          * between the specified values.
          */
-        snap?: boolean;
-        /**
+		snap?: boolean;
+		/**
          * All values on the slider are part of a range. The range has a minimum and maximum value.
          */
-        behaviour?: string;
-        /**
+		behaviour?: string;
+		/**
          * To format the slider output, noUiSlider offers a format option.
          * Simply specify to and from functions to encode and decode the values.
          * See manual formatting to the right for usage information.
          * By default, noUiSlider will format output with 2 decimals.
          */
-        format?: Object | ((...args:any[]) => any);
-        /**
+		format?: Object | ((...args: any[]) => any);
+		/**
          * Allows you to generate points along the slider.
          */
-        pips?: PipsOptions;
-    }
+		pips?: PipsOptions;
+	}
 
-    interface PipsOptions {
-        /**
+	interface PipsOptions {
+		/**
          * The 'range' mode uses the slider range to determine where the pips should be. A pip is generated for every percentage specified.
          *
          * The 'steps', like 'range', uses the slider range. In steps mode, a pip is generated for every step.
@@ -118,83 +118,92 @@ declare namespace noUiSlider {
          * The 'values' mode is similar to positions, but it accepts values instead of percentages. The stepped option can be used for this mode.
          *
          */
-        mode: "range" | "steps" | "positions" | "count" | "values";
-        /**
+		mode: 'range' | 'steps' | 'positions' | 'count' | 'values';
+		/**
          * Range Mode: percentage for range mode
          * Step Mode: step number for steps
          * Positions Mode: percentage-based positions on the slider
          * Count Mode: positions between pips
          */
-        density?: number;
-        /**
+		density?: number;
+		/**
          * Step Mode: The filter option can be used to filter the generated pips.
          * The filter function must return 0 (no value), 1 (large value) or 2 (small value).
          */
-        filter?: (...args: any[]) => PipFilterResult;
-        /**
+		filter?: (...args: any[]) => PipFilterResult;
+		/**
          * format for step mode
          * see noUiSlider format
          */
-        format?: Object | ((...args:any[]) => any);
-        /**
+		format?: Object | ((...args: any[]) => any);
+		/**
          *
          * values for positions and values mode
          * number pips for count mode
          */
-        values?: number | number[];
-        /**
+		values?: number | number[];
+		/**
          * stepped option for positions, values and count mode
          */
-        stepped?: boolean;
-    }
+		stepped?: boolean;
+	}
 
-    const enum PipFilterResult {
-        NoValue,
-        LargeValue,
-        SmallValue,
-    }
+	const enum PipFilterResult {
+		NoValue,
+		LargeValue,
+		SmallValue,
+	}
 
-    interface Callback {
-        /**
+	interface Callback {
+		/**
          * Array for both one-handle and two-handle sliders. It contains the current slider values,
          * with formatting applied.
          */
-        (values: any[], handle: number, unencodedValues: number[]): void;
-    }
+		(values: any[], handle: number, unencodedValues: number[]): void;
+	}
 
-    interface noUiSlider {
-        /**
+	interface noUiSlider {
+		/**
          * Bind event to the slider.
          */
-        on(eventName: string, callback: Callback): void;
-        /**
+		on(eventName: string, callback: Callback): void;
+		/**
          * Unbind event to the slider.
          */
-        off(eventName: string): void;
-        /**
+		off(eventName: string): void;
+		/**
          * Destroy's the slider.
          */
-        destroy(): void;
-        /**
+		destroy(): void;
+		/**
          * To get the current slider value. For one-handle sliders, calling .get() will return the value.
          * For two-handle sliders, an array[value, value] will be returned.
          */
-        get(): number | number[];
-        /**
+		get(): number | number[];
+		/**
          * noUiSlider will keep your values within the slider range, which saves you a bunch of validation.
          * If you have configured the slider to use one handle, you can change the current value by passing
          * a number to the .set() method. If you have two handles, pass an array. One-handled sliders
          * will also accept arrays. Within an array, you can set one position to null
          * if you want to leave a handle unchanged.
          */
-        set(value: number | (number | null)[]): void;
-        /**
+		set(value: number | (number | null)[]): void;
+		/**
          * To return to the initial slider values, you can use the .reset() method. This will only reset the slider values.
          */
-        reset(): void;
-    }
+		reset(): void;
+		/**
+         * Exposes the options used to create the noUiSlider instance
+         */
+		options: Options;
+		/**
+         * method that can change the 'margin',  'limit', 'step', 'range', 'animate' and  'snap' options.
+         * All other options require changes to the slider's HTML or event bindings.
+         */
+		updateOptions(newOptions: Options, fireSetEvent?: boolean): void;
+	}
 
-    interface Instance extends HTMLElement {
-        noUiSlider: noUiSlider;
-    }
+	interface Instance extends HTMLElement {
+		noUiSlider: noUiSlider;
+	}
 }
diff --git a/types/nouislider/tslint.json b/types/nouislider/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nouislider/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nouislider/v7/tslint.json b/types/nouislider/v7/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nouislider/v7/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nouislider/v8/tslint.json b/types/nouislider/v8/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nouislider/v8/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/npm/tslint.json b/types/npm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/npm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nprogress/tslint.json b/types/nprogress/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nprogress/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ns-api/index.d.ts b/types/ns-api/index.d.ts
index db66f109f3..267bb319c5 100644
--- a/types/ns-api/index.d.ts
+++ b/types/ns-api/index.d.ts
@@ -11,9 +11,8 @@ interface nsApi {
      * Vertrektijden - departure times
      *
      * @callback callback
-     * @param station {string} - Station ID
-     * @param callback {function} - `function (err, data) {}`
-     * @returns {void}
+     * @param station - Station ID
+     * @param callback - `function (err, data) {}`
      */
     vertrektijden(station: string, callback: (err: string, data: {}) => void): void;
 
@@ -21,9 +20,8 @@ interface nsApi {
      * Reisadvies - travel advise
      *
      * @callback callback
-     * @param params {object} - Parameters
-     * @param callback {function} - `function (err, data) {}`
-     * @returns {void}
+     * @param params - Parameters
+     * @param callback - `function (err, data) {}`
      */
     reisadvies(params: {}, callback: (err: string, data: {}) => void): void;
 
@@ -31,9 +29,8 @@ interface nsApi {
      * Prijzen - tariffs
      *
      * @callback callback
-     * @param params {object} - Parameters
-     * @param callback {function} - `function (err, data) {}`
-     * @returns {void}
+     * @param params - Parameters
+     * @param callback - `function (err, data) {}`
      */
     prijzen(params: {}, callback: (err: any, data: {}) => void): void;
 
@@ -41,8 +38,8 @@ interface nsApi {
      * List available stations
      *
      * @callback callback
-     * @param [treeKey] {string} - Group by this key
-     * @param callback {function} - `function (err, data) {}`
+     * @param [treeKey] - Group by this key
+     * @param callback - `function (err, data) {}`
      */
     stations(treeKey: string, callback: (err: string, data: {}) => void): void;
     stations(callback: (err: string, data: {}) => void): void;
@@ -51,8 +48,8 @@ interface nsApi {
      * List disruptions
      *
      * @callback callback
-     * @param params {object} - Parameters
-     * @param callback {function} - `function (err, data) {}`
+     * @param params - Parameters
+     * @param callback - `function (err, data) {}`
      */
     storingen(params: {}, callback: (err: string, data: {}) => void): void;
 }
diff --git a/types/numeral/tslint.json b/types/numeral/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/numeral/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/numjs/index.d.ts b/types/numjs/index.d.ts
index 77d6fb1977..d663d9e0e8 100644
--- a/types/numjs/index.d.ts
+++ b/types/numjs/index.d.ts
@@ -16,112 +16,93 @@ export interface NdArray<T = number> extends BaseNdArray<T> {
 
 	/**
 	 * Return a copy of the array collapsed into one dimension using row-major order (C-style)
-	 *
 	 */
 	flatten<P>(): NdArray<P>;
 
 	/**
 	 * Permute the dimensions of the array.
-	 *
 	 */
 	transpose(args?: number[]): NdArray<T>;
 	transpose(...args: number[]): NdArray<T>;
 
 	/**
 	 * Dot product of two arrays.
-	 *
 	 */
 	dot(x: NjArray<T>): NdArray<T>;
 
 	/**
 	 * Assign `x` to the array, element-wise.
-	 *
-	 * @param {boolean} [copy=true]
 	 */
 	assign(x: NjParam<T>, copy?: boolean): NdArray<T>;
 
 	/**
 	 * Add `x` to the array, element-wise.
-	 *
-	 * @param {boolean} [copy=true]
 	 */
 	add(x: NjParam<T>, copy?: boolean): NdArray<T>;
 
 	/**
 	 * Subtract `x` to the array, element-wise.
-	 *
-	 * @param {boolean} [copy=true]
 	 */
 	subtract(x: NjParam<T>, copy?: boolean): NdArray<T>;
 
 	/**
 	 * Multiply array by `x`, element-wise.
-	 *
-	 * @param {boolean} [copy=true]
 	 */
 	multiply(x: NjParam<T>, copy?: boolean): NdArray<T>;
 
 	/**
 	 * Divide array by `x`, element-wise.
-	 *
-	 * @param {boolean} [copy=true]
 	 */
 	divide(x: NjParam<T>, copy?: boolean): NdArray<T>;
 
 	/**
 	 * Raise array elements to powers from given array, element-wise.
 	 *
-	 * @param {boolean} [copy=true] - set to false to modify the array rather than create a new one
+	 * @param [copy=true] - set to false to modify the array rather than create a new one
 	 */
 	pow(x: NjParam<T>, copy?: boolean): NdArray<T>;
 
 	/**
 	 * Calculate the exponential of all elements in the array, element-wise.
 	 *
-	 * @param {boolean} [copy=true] - set to false to modify the array rather than create a new one
+	 * @param [copy=true] - set to false to modify the array rather than create a new one
 	 */
 	exp(copy?: boolean): NdArray<T>;
 
 	/**
 	 * Calculate the positive square-root of all elements in the array, element-wise.
 	 *
-	 * @param {boolean} [copy=true] - set to false to modify the array rather than create a new one
+	 * @param [copy=true] - set to false to modify the array rather than create a new one
 	 */
 	sqrt(copy?: boolean): NdArray<T>;
 
 	/**
 	 * Return the maximum value of the array
-	 *
 	 */
 	max(): T;
 
 	/**
 	 * Return the minimum value of the array
-	 *
 	 */
 	min(): T;
 
 	/**
 	 * Sum of array elements.
-	 *
 	 */
 	sum(): T;
 
 	/**
 	 * Returns the standard deviation, a measure of the spread of a distribution, of the array elements.
-	 *
 	 */
 	std(): number;
 
 	/**
 	 * Return the arithmetic mean of array elements.
-	 *
 	 */
 	mean(): T;
 
 	/**
 	 * Converts {NdArray} to a native JavaScript {Array}
-	 *
 	 */
 	tolist<LT = T>(): LT[];
 
@@ -129,7 +110,6 @@ export interface NdArray<T = number> extends BaseNdArray<T> {
 
 	/**
 	 * Stringify the array to make it readable in the console, by a human.
-	 *
 	 */
 	inspect(): string;
 
@@ -140,7 +120,6 @@ export interface NdArray<T = number> extends BaseNdArray<T> {
 
 	/**
 	 * Create a full copy of the array
-	 *
 	 */
 	clone(): NdArray<T>;
 
@@ -151,14 +130,11 @@ export interface NdArray<T = number> extends BaseNdArray<T> {
 
 	/**
 	 * Round array to the to the nearest integer.
-	 *
-	 * @param {boolean} [copy=true]
 	 */
 	round(copy?: boolean): NdArray<T>;
 
 	/**
 	 * Return the inverse of the array, element-wise.
-	 *
 	 */
 	negative(): NdArray<T>;
 
@@ -172,7 +148,6 @@ export interface NdArray<T = number> extends BaseNdArray<T> {
 	 * @note: Arrays must have the same dimensions and `filter` must be smaller than the array.
 	 * @note: The convolution product is only given for points where the signals overlap completely. Values outside the signal boundary have no effect. This behaviour is known as the 'valid' mode.
 	 * @note: Use optimized code for 3x3, 3x3x1, 5x5, 5x5x1 filters, FFT otherwise.
-	 *
 	 */
 	convolve(filter: NjArray<T>): NdArray<T>;
 
@@ -198,11 +173,11 @@ export function add<T = number>(a: NjParam<T>, b: NjParam<T>): NdArray<T>;
 /**
  * Return evenly spaced values within a given interval.
  *
- * @param {number} [start = 0] Start of interval. The interval includes this value.
- * @param {number} stop End of interval. The interval does not include this value.
- * @param {number} [step = 1] Spacing between values. The default step size is 1. If step is specified, start must also be given.
- * @param {(NdArray.ndType)} [dtype = Array] The type of the output array.
- * @returns {NdArray} Array of evenly spaced values.
+ * @param [start = 0] Start of interval. The interval includes this value.
+ * @param stop End of interval. The interval does not include this value.
+ * @param [step = 1] Spacing between values. The default step size is 1. If step is specified, start must also be given.
+ * @param [dtype = Array] The type of the output array.
+ * @returns Array of evenly spaced values.
  */
 export function arange<T = number>(start: number, stop?: number, dtype?: NdType<T>): NdArray<T>;
 export function arange<T = number>(stop: number, dtype: NdType<T>): NdArray<T>;
@@ -229,8 +204,6 @@ export function arctan<T = number>(x: NjParam<T>): NdArray<T>;
 /**
  * Clip (limit) the values in an array between min and max, element-wise.
  *
- * @param {number} [min = 0]
- * @param {number} [max = 1]
  */
 export function clip<T = number>(x: NjParam<T>, min?: number, max?: number): NdArray<T>;
 /**
@@ -266,9 +239,9 @@ export function dot<T = number>(a: NjArray<T>, b: NjArray<T>): NdArray<T>;
 /**
  * Return a new array of given shape and type, filled with `undefined` values.
  *
- * @param {(ndArray | number)} shape	Shape of the new array, e.g., [2, 3] or 2.
- * @param {NdArray.ndType} [dtype]	The type of the output array.
- * @returns {NdArray}	Array of `undefined` values with the given shape and dtype
+ * @param shape	Shape of the new array, e.g., [2, 3] or 2.
+ * @param [dtype]	The type of the output array.
+ * @returns Array of `undefined` values with the given shape and dtype
  */
 export function empty<T = number>(shape: NdArrayData<T> | number, dtype?: NdType<T>): NdArray<T>;
 
@@ -332,9 +305,9 @@ export function negative<T = number>(x: NjParam<T>): NdArray<T>;
 /**
  * Return a new array of given shape and type, filled with ones.
  *
- * @param {(ndArray | number)} shape Shape of the new array, e.g., [2, 3] or 2.
- * @param {NdArray.dtType} [dtype] The type of the output array.
- * @returns {NdArray}	Array of ones with the given shape and dtype
+ * @param shape Shape of the new array, e.g., [2, 3] or 2.
+ * @param [dtype] The type of the output array.
+ * @returns Array of ones with the given shape and dtype
  */
 export function ones<T = number>(shape: NdArrayData<T> | number, dtype?: BaseNdArray.DataType): NdArray<T>;
 
@@ -347,14 +320,14 @@ export function power<T = number>(x1: NjParam<T>, x2: NjParam<T>): NdArray<T>;
 /**
  * Create an array of the given shape and propagate it with random samples from a uniform distribution over [0, 1].
  *
- * @param {(ndArray | number)} [shape]	he dimensions of the returned array, should all be positive integers
+ * @param [shape]	he dimensions of the returned array, should all be positive integers
  */
 export function random<T = number>(shape?: NdArrayData<T> | number): NdArray<T>;
 
 /**
  * Gives a new shape to an array without changing its data.
  *
- * @param {ndArray} shape The new shape should be compatible with the original shape. If an integer, then the result will be a 1-D array of that length
+ * @param shape The new shape should be compatible with the original shape. If an integer, then the result will be a 1-D array of that length
  */
 export function reshape<T = number>(array: NjArray<T>, shape: NdArray<T>): NdArray<T>;
 
@@ -367,7 +340,7 @@ export function round<T = number>(x: NjArray<T>): NdArray<T>;
 /**
  * Return the sigmoid of the input array, element-wise.
  *
- * @param {number} [t = 1]	stifness parameter
+ * @param [t = 1]	stifness parameter
  */
 export function sigmoid<T = number>(x: NjParam<T>, t?: number): NdArray<T>;
 
@@ -443,9 +416,9 @@ export function transpose<T = number>(x: NjParam<T>, axes?: number): NdArray<T>;
 /**
  * Return a new array of given shape and type, filled with zeros.
  *
- * @param {ndArray} shape Shape of the new array, e.g., [2, 3] or 2.
- * @param {NdArray.dtType} [dtype = Array] The type of the output array.
- * @returns {numjs} Array of zeros with the given shape and dtype
+ * @param shape Shape of the new array, e.g., [2, 3] or 2.
+ * @param [dtype = Array] The type of the output array.
+ * @returns Array of zeros with the given shape and dtype
  */
 export function zeros<T = number>(shape: NdArrayData<T> | number, dtype?: BaseNdArray.DataType): NdArray<T>;
 
@@ -464,15 +437,15 @@ export function ifft<T = number>(x: NjArray<T>): NdArray<T>;
 /**
  * Extract a diagonal or construct a diagonal array.
  *
- * @returns {NdArray} a view a of the original array when possible, a new array otherwise
+ * @returns a view a of the original array when possible, a new array otherwise
  */
 export function diag<T = number>(x: NjArray<T>): NdArray<T>;
 
 /**
  * The identity array is a square array with ones on the main diagonal.
- * @param {number} Number of rows (and columns) in n x n output.
- * @param {(String|Object)}  [dtype=Array]  The type of the output array.
- * @return {Array} n x n array with its main diagonal set to one, and all other elements 0
+ * @param Number of rows (and columns) in n x n output.
+ * @param  [dtype=Array]  The type of the output array.
+ * @return n x n array with its main diagonal set to one, and all other elements 0
  */
 export function identity<T = number>(n: T, dtype?: BaseNdArray.DataType): NdArray<T>;
 
@@ -480,28 +453,22 @@ export function identity<T = number>(n: T, dtype?: BaseNdArray.DataType): NdArra
  * Join a sequence of arrays along a new axis.
  * The axis parameter specifies the index of the new axis in the dimensions of the result.
  * For example, if axis=0 it will be the first dimension and if axis=-1 it will be the last dimension.
- * @param {Array} sequence of array_like
- * @param {number} [axis=0] The axis in the result array along which the input arrays are stacked.
- * @return {Array} The stacked array has one more dimension than the input arrays.
+ * @param sequence of array_like
+ * @param [axis=0] The axis in the result array along which the input arrays are stacked.
+ * @return The stacked array has one more dimension than the input arrays.
  */
 export function stack<T = number>(arrays: Array<NdArray<T>>, axis?: number): NdArray<T>;
 
 export namespace images {
 	namespace data {
-		/**
-		 * @property {NdArray} digit - 28x28 grayscale image with an handwritten digit extracted from MNIST database
-		 */
+		/**  28x28 grayscale image with an handwritten digit extracted from MNIST database */
 		const digit: NdArray;
-		/**
-		 * @property {NdArray} five - 28x28 grayscale image with an handwritten digit extracted from MNIST database
-		 */
+		/** 28x28 grayscale image with an handwritten digit extracted from MNIST database */
 		const five: NdArray;
-		/**
-		 * @property {NdArray} node - 300x600 COLOR image representing Node.js's logo
-		 */
+		/** 300x600 COLOR image representing Node.js's logo */
 		const node: NdArray;
 		/**
-		 * @property {NdArray} lena - The standard, yet sometimes controversial
+		 * The standard, yet sometimes controversial
 		 * Lena test image was scanned from the November 1972 edition of
 		 * Playboy magazine. From an image processing perspective, this image
 		 * is useful because it contains smooth, textured, shaded as well as
@@ -509,7 +476,7 @@ export namespace images {
 		 */
 		const lena: NdArray;
 		/**
-		 * @property {NdArray} lenna - The standard, yet sometimes
+		 * The standard, yet sometimes
 		 * controversial Lena test image was scanned from the November 1972
 		 * edition of Playboy magazine. From an image processing perspective,
 		 * this image is useful because it contains smooth, textured, shaded as
@@ -517,7 +484,7 @@ export namespace images {
 		 */
 		const lenna: NdArray;
 		/**
-		 * @property {NdArray} moon - This low-contrast image of the surface of
+		 * This low-contrast image of the surface of
 		 * the moon is useful for illustrating histogram equalization and
 		 * contrast stretching.
 		 */
diff --git a/types/nunjucks-date/tslint.json b/types/nunjucks-date/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nunjucks-date/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nunjucks/index.d.ts b/types/nunjucks/index.d.ts
index 002f8b93f8..d307bd27d5 100644
--- a/types/nunjucks/index.d.ts
+++ b/types/nunjucks/index.d.ts
@@ -1,148 +1,139 @@
-// Type definitions for nunjucks
+// Type definitions for nunjucks 3.0
 // Project: http://mozilla.github.io/nunjucks/
 // Definitions by: Ruben Slabbert <https://github.com/RubenSlabbert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
+export function render(name: string, context?: object): string;
+export function render(name: string, context?: object, callback?: (err: any, res: string) => any): void;
 
-declare namespace Nunjucks {
-    function render(name: string, context?: Object): string;
-    function render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
+export function renderString(src: string, context: object): string;
+export function renderString(src: string, context: object, callback?: (err: any, res: string) => any): void;
 
-    function renderString(src: string, context: Object): string;
-    function renderString(src: string, context: Object, callback?: (err: any, res: string) => any): void;
+export function compile(src: string, env?: Environment, callback?: (err: any, res: Template) => any): Template;
 
-    function compile(src: string, env?: Environment): Template;
-    function compile(src: string, env?: Environment, callback?: (err: any, res: Template) => any): Template;
+export function precompile(path: string, opts?: PrecompileOptions): string;
+export function precompileString(src: string, opts?: PrecompileOptions): string;
 
-    function precompile(path: string, opts?: PrecompileOptions): string;
-    function precompileString(src: string, opts?: PrecompileOptions): string;
-
-    interface PrecompileOptions {
-        name?: string;
-        asFunction?: boolean;
-        force?: boolean;
-        env?: Environment;
-        include?: string[];
-        exclude?: string[];
-        wrapper?(templates: { name: string, template: string }, opts: PrecompileOptions): string;
-    }
-
-    class Template {
-        constructor(src: string, env?: Environment, eagerCompile?: boolean);
-        render(context?: Object): string;
-        render(context?: Object, callback?: (err: any, res: string) => any): void;
-    }
-
-    function configure(options: ConfigureOptions): Environment;
-    function configure(path: string, options?: ConfigureOptions): Environment;
-    function configure(path: string[], options?: ConfigureOptions): Environment;
-
-    interface ConfigureOptions {
-        autoescape?: boolean;
-        throwOnUndefined?: boolean;
-        trimBlocks?: boolean;
-        lstripBlocks?: boolean;
-        watch?: boolean;
-        noCache?: boolean;
-        web?: {
-            useCache?: boolean,
-            async?: boolean
-        };
-        express?: Object;
-        tags?: {
-            blockStart?: string,
-            blockEnd?: string,
-            variableStart?: string,
-            variableEnd?: string,
-            commentStart?: string,
-            commentEnd?: string
-        };
-    }
-
-    class Environment {
-        options: {
-            autoescape: boolean;
-        };
-
-        constructor();
-        constructor(loader: ILoader, opts?: ConfigureOptions);
-        constructor(loaders: ILoader[], opts?: ConfigureOptions);
-
-        render(name: string, context?: Object): string;
-        render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
-
-        renderString(name: string, context: Object): string;
-        renderString(name: string, context: Object, callback?: (err: any, res: string) => any): void;
-
-        addFilter(name: string, func: (...args: any[]) => any, async?: boolean): void;
-        getFilter(name: string): void;
-
-        addExtension(name: string, ext: Extension): void;
-        removeExtension(name: string): void;
-        getExtension(name: string): Extension;
-        hasExtension(name: string): void;
-
-        addGlobal(name: string, value: any): void;
-
-        getTemplate(name: string, eagerCompile?: boolean): Template;
-        getTemplate(name: string, eagerCompile?: boolean, callback?: (err: any, templ: Template) => Template): void;
-
-        express(app: Object): void;
-    }
-
-    interface Extension {
-        tags: string[];
-        // Parser API is undocumented it is suggested to check the source: https://github.com/mozilla/nunjucks/blob/master/src/parser.js
-        parse(parser: any, nodes: any, lexer: any): any;
-    }
-
-    function installJinjaCompat(): void;
-
-    interface ILoader {
-        async?: boolean;
-        getSource(name: string): LoaderSource;
-        extend?(extender: ILoader): ILoader;
-    }
-
-    // Needs both Loader and ILoader since nunjucks uses a custom object system
-    // Object system is also responsible for the extend methods
-    class Loader {
-        on(name: string, func: (...args: any[]) => any): void;
-        emit(name: string, ...args: any[]): void;
-        resolve(from: string, to: string): string;
-        isRelative(filename: string): boolean;
-        extend(toExtend: ILoader): ILoader;
-    }
-
-    interface LoaderSource {
-        src: string;
-        path: string;
-        noCache: boolean;
-    }
-
-    interface FileSystemLoaderOptions {
-        /** if true, the system will automatically update templates when they are changed on the filesystem */
-        watch?: boolean;
-
-        /**  if true, the system will avoid using a cache and templates will be recompiled every single time */
-        noCache?: boolean;
-    }
-
-    class FileSystemLoader extends Loader implements ILoader {
-        init(searchPaths: string[], opts: any): void;
-        getSource(name: string): LoaderSource;
-        constructor(searchPaths?: string | string[], opts?: FileSystemLoaderOptions);
-    }
-
-    export class WebLoader implements ILoader {
-        constructor(baseUrl: string, opts?: any);
-        getSource(name: string): LoaderSource;
-    }
-
-    class PrecompiledLoader extends Loader implements ILoader {
-        init(searchPaths: string[], opts: any): void;
-        getSource(name: string): LoaderSource;
-    }
+export interface PrecompileOptions {
+    name?: string;
+    asFunction?: boolean;
+    force?: boolean;
+    env?: Environment;
+    include?: string[];
+    exclude?: string[];
+    wrapper?(templates: { name: string, template: string }, opts: PrecompileOptions): string;
 }
 
-export = Nunjucks;
+export class Template {
+    constructor(src: string, env?: Environment, eagerCompile?: boolean);
+    render(context?: object): string;
+    render(context?: object, callback?: (err: any, res: string) => any): void;
+}
+
+export function configure(options: ConfigureOptions): Environment;
+export function configure(path: string | string[], options?: ConfigureOptions): Environment;
+
+export interface ConfigureOptions {
+    autoescape?: boolean;
+    throwOnUndefined?: boolean;
+    trimBlocks?: boolean;
+    lstripBlocks?: boolean;
+    watch?: boolean;
+    noCache?: boolean;
+    web?: {
+        useCache?: boolean,
+        async?: boolean
+    };
+    express?: object;
+    tags?: {
+        blockStart?: string,
+        blockEnd?: string,
+        variableStart?: string,
+        variableEnd?: string,
+        commentStart?: string,
+        commentEnd?: string
+    };
+}
+
+export class Environment {
+    options: {
+        autoescape: boolean;
+    };
+
+    constructor(loader?: ILoader | ILoader[] | null, opts?: ConfigureOptions);
+    render(name: string, context?: object): string;
+    render(name: string, context?: object, callback?: (err: any, res: string) => any): void;
+
+    renderString(name: string, context: object): string;
+    renderString(name: string, context: object, callback?: (err: any, res: string) => any): void;
+
+    addFilter(name: string, func: (...args: any[]) => any, async?: boolean): void;
+    getFilter(name: string): void;
+
+    addExtension(name: string, ext: Extension): void;
+    removeExtension(name: string): void;
+    getExtension(name: string): Extension;
+    hasExtension(name: string): void;
+
+    addGlobal(name: string, value: any): void;
+
+    getTemplate(name: string, eagerCompile?: boolean): Template;
+    getTemplate(name: string, eagerCompile?: boolean, callback?: (err: any, templ: Template) => Template): void;
+
+    express(app: object): void;
+}
+
+export interface Extension {
+    tags: string[];
+    // Parser API is undocumented it is suggested to check the source: https://github.com/mozilla/nunjucks/blob/master/src/parser.js
+    parse(parser: any, nodes: any, lexer: any): any;
+}
+
+export function installJinjaCompat(): void;
+
+export interface ILoader {
+    async?: boolean;
+    getSource(name: string): LoaderSource;
+    extend?(extender: ILoader): ILoader;
+}
+
+// Needs both Loader and ILoader since nunjucks uses a custom object system
+// Object system is also responsible for the extend methods
+export class Loader {
+    on(name: string, func: (...args: any[]) => any): void;
+    emit(name: string, ...args: any[]): void;
+    resolve(from: string, to: string): string;
+    isRelative(filename: string): boolean;
+    extend(toExtend: ILoader): ILoader;
+}
+
+export interface LoaderSource {
+    src: string;
+    path: string;
+    noCache: boolean;
+}
+
+export interface FileSystemLoaderOptions {
+    /** if true, the system will automatically update templates when they are changed on the filesystem */
+    watch?: boolean;
+
+    /**  if true, the system will avoid using a cache and templates will be recompiled every single time */
+    noCache?: boolean;
+}
+
+export class FileSystemLoader extends Loader implements ILoader {
+    init(searchPaths: string[], opts: any): void;
+    getSource(name: string): LoaderSource;
+    constructor(searchPaths?: string | string[], opts?: FileSystemLoaderOptions);
+}
+
+export class WebLoader implements ILoader {
+    constructor(baseUrl: string, opts?: any);
+    getSource(name: string): LoaderSource;
+}
+
+export class PrecompiledLoader extends Loader implements ILoader {
+    init(searchPaths: string[], opts: any): void;
+    getSource(name: string): LoaderSource;
+}
diff --git a/types/nunjucks/nunjucks-tests.ts b/types/nunjucks/nunjucks-tests.ts
index 7407cc65ba..9f3afcddfe 100644
--- a/types/nunjucks/nunjucks-tests.ts
+++ b/types/nunjucks/nunjucks-tests.ts
@@ -1,27 +1,35 @@
-
 import nunjucks = require("nunjucks");
 
-
 nunjucks.configure({ autoescape: false });
 
 let rendered = nunjucks.render("./noexists.html");
 
-let ctx = { items: ["Hello", "this", "is", "for", "testing"] };
-let src = "{% for item in items %}{{item}}{% endfor %}";
+nunjucks.render('foo.html', { username: 'James' });
+nunjucks.render('async.html', (err: any, res: string) => {});
+
+const ctx = { items: ["Hello", "this", "is", "for", "testing"] };
+const src = "{% for item in items %}{{item}}{% endfor %}";
 
 rendered = nunjucks.renderString(src, ctx);
+nunjucks.renderString('Hello {{ username }}', { username: 'James' });
 
-let compiled = nunjucks.compile(src);
+const compiled = nunjucks.compile(src);
 rendered = compiled.render(ctx);
+nunjucks.compile('Hello {{ username }}').render({ username: 'James' });
 
 rendered = nunjucks.precompileString(src, {
     name: "TestyWesty"
 });
 
-let template = new nunjucks.Template(src);
+const template = new nunjucks.Template(src);
 rendered = template.render(ctx);
 
 let env = nunjucks.configure({ autoescape: false });
+nunjucks.configure('/views');
+nunjucks.configure('views', {
+    autoescape: true,
+    watch: true
+});
 rendered = env.renderString(src, ctx);
 
 env.addExtension("SpawnGlitter", {
diff --git a/types/nunjucks/tsconfig.json b/types/nunjucks/tsconfig.json
index 39cf9bfbca..5824ce2f1f 100644
--- a/types/nunjucks/tsconfig.json
+++ b/types/nunjucks/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "nunjucks-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/nunjucks/tslint.json b/types/nunjucks/tslint.json
new file mode 100644
index 0000000000..2c7c1bed53
--- /dev/null
+++ b/types/nunjucks/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "interface-name": false
+    }
+}
diff --git a/types/nvd3/tslint.json b/types/nvd3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nvd3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nw.gui/tslint.json b/types/nw.gui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nw.gui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/nw.js/tslint.json b/types/nw.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/nw.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/o.js/index.d.ts b/types/o.js/index.d.ts
index 7cca909391..b0fd413068 100644
--- a/types/o.js/index.d.ts
+++ b/types/o.js/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for o.js v0.3.3
+// Type definitions for o.js v0.3.4
 // Project: https://github.com/janhommes/o.js
-// Definitions by: Matteo Antony Mistretta <https://github.com/IceOnFire>, Brad Zacher <https://github.com/bradzacher>, Jan Hommes <https://github.com/janhommes>
+// Definitions by: Matteo Antony Mistretta <https://github.com/IceOnFire>, Brad Zacher <https://github.com/bradzacher>, Jan Hommes <https://github.com/janhommes>, Jean-Christophe Chalte <https://github.com/jcchalte>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare module 'o.js' {
     import Q = require("q");
@@ -19,6 +20,9 @@ declare module 'o.js' {
         username ?: string
         password ?: string
         isAsync ?: boolean
+		isCors ?: boolean
+		isHashRoute ?: boolean
+		appending ?: string
     }
 
     interface OHandler<T> {
diff --git a/types/o.js/tslint.json b/types/o.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/o.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/oauth.js/tslint.json b/types/oauth.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/oauth.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts
index 00ec7b79c1..a423f48a58 100644
--- a/types/oauth2-server/index.d.ts
+++ b/types/oauth2-server/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by:  Robbie Van Gorkom <https://github.com/vangorra>,
 //                  Charles Irick <https://github.com/cirick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Request, RequestHandler } from "express";
 
@@ -14,18 +15,11 @@ declare class OAuth2Server {
 
     /**
      * Instantiates OAuth2Server using the supplied model
-     *
-     * @param options
      */
     constructor(options: OAuth2Server.ServerOptions);
 
     /**
      * Authenticates a request.
-     *
-     * @param request
-     * @param response
-     * @param options
-     * @param callback
      */
     authenticate(
         request: OAuth2Server.Request,
@@ -36,11 +30,6 @@ declare class OAuth2Server {
 
     /**
      * Authorizes a token request.
-     *
-     * @param request
-     * @param response
-     * @param options
-     * @param callback
      */
     authorize(
         request: OAuth2Server.Request,
@@ -51,11 +40,6 @@ declare class OAuth2Server {
 
     /**
      * Retrieves a new token for an authorized token request.
-     *
-     * @param request
-     * @param response
-     * @param options
-     * @param callback
      */
     token(
         request: OAuth2Server.Request,
@@ -78,21 +62,18 @@ declare namespace OAuth2Server {
         /**
          * Instantiates Request using the supplied options.
          *
-         * @param options
          */
         constructor(options?: { [key: string]: any } | Express.Request);
 
         /**
          * Returns the specified HTTP header field. The match is case-insensitive.
          *
-         * @param field
          */
         get(field: string): any | undefined;
 
         /**
          * Checks if the request’s Content-Type HTTP header matches any of the given MIME types.
          *
-         * @param types
          */
         is(types: string[]): string | false;
     }
@@ -108,29 +89,24 @@ declare namespace OAuth2Server {
         /**
          * Instantiates Response using the supplied options.
          *
-         * @param options
          */
         constructor(options?: { [key: string]: any; } | Express.Response);
 
         /**
          * Returns the specified HTTP header field. The match is case-insensitive.
          *
-         * @param field
          */
         get(field: string): any | undefined;
 
         /**
          * Sets the specified HTTP header field. The match is case-insensitive.
          *
-         * @param field
-         * @param value
          */
         set(field: string, value: string): void;
 
         /**
          * Redirects to the specified URL using 302 Found.
          *
-         * @param url
          */
         redirect(url: string): void;
     }
@@ -146,7 +122,7 @@ declare namespace OAuth2Server {
         /**
          * The scope(s) to authenticate.
          */
-        scope?: string | undefined;
+        scope?: string;
 
         /**
          * Set the X-Accepted-OAuth-Scopes HTTP header on response objects.
@@ -222,29 +198,18 @@ declare namespace OAuth2Server {
         /**
          * Invoked to generate a new access token.
          *
-         * @param client
-         * @param user
-         * @param scope
-         * @param callback
          */
         generateAccessToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
         /**
          * Invoked to retrieve a client using a client id or a client id/client secret combination, depending on the grant type.
          *
-         * @param clientId
-         * @param clientSecret
-         * @param callback
          */
         getClient(clientId: string, clientSecret: string, callback?: Callback<Client | Falsey>): Promise<Client | Falsey>;
 
         /**
          * Invoked to save an access token and optionally a refresh token, depending on the grant type.
          *
-         * @param token
-         * @param client
-         * @param user
-         * @param callback
          */
         saveToken(token: Token, client: Client, user: User, callback?: Callback<Token>): Promise<Token>;
     }
@@ -253,17 +218,12 @@ declare namespace OAuth2Server {
         /**
          * Invoked to retrieve an existing access token previously saved through Model#saveToken().
          *
-         * @param accessToken
-         * @param callback
          */
         getAccessToken(accessToken: string, callback?: Callback<Token>): Promise<Token>;
 
         /**
          * Invoked during request authentication to check if the provided access token was authorized the requested scopes.
          *
-         * @param token
-         * @param scope
-         * @param callback
          */
         verifyScope(token: Token, scope: string, callback?: Callback<boolean>): Promise<boolean>;
     }
@@ -272,53 +232,36 @@ declare namespace OAuth2Server {
         /**
          * Invoked to generate a new refresh token.
          *
-         * @param client
-         * @param user
-         * @param scope
-         * @param callback
          */
         generateRefreshToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
         /**
          * Invoked to generate a new authorization code.
          *
-         * @param callback
          */
         generateAuthorizationCode?(callback?: Callback<string>): Promise<string>;
 
         /**
          * Invoked to retrieve an existing authorization code previously saved through Model#saveAuthorizationCode().
          *
-         * @param authorizationCode
-         * @param callback
          */
         getAuthorizationCode(authorizationCode: string, callback?: Callback<AuthorizationCode>): Promise<AuthorizationCode>;
 
         /**
          * Invoked to save an authorization code.
          *
-         * @param code
-         * @param client
-         * @param user
-         * @param callback
          */
         saveAuthorizationCode(code: AuthorizationCode, client: Client, user: User, callback?: Callback<AuthorizationCode>): Promise<AuthorizationCode>;
 
         /**
          * Invoked to revoke an authorization code.
          *
-         * @param code
-         * @param callback
          */
         revokeAuthorizationCode(code: AuthorizationCode, callback?: Callback<boolean>): Promise<boolean>;
 
         /**
          * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
-         * @param user
-         * @param client
-         * @param string
-         * @param callback
          */
         validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
     }
@@ -327,29 +270,18 @@ declare namespace OAuth2Server {
         /**
          * Invoked to generate a new refresh token.
          *
-         * @param client
-         * @param user
-         * @param scope
-         * @param callback
          */
         generateRefreshToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
         /**
          * Invoked to retrieve a user using a username/password combination.
          *
-         * @param username
-         * @param password
-         * @param callback
          */
         getUser(username: string, password: string, callback?: Callback<User | Falsey>): Promise<User | Falsey>;
 
         /**
          * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
-         * @param user
-         * @param client
-         * @param string
-         * @param callback
          */
         validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
     }
@@ -358,26 +290,18 @@ declare namespace OAuth2Server {
         /**
          * Invoked to generate a new refresh token.
          *
-         * @param client
-         * @param user
-         * @param scope
-         * @param callback
          */
         generateRefreshToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
         /**
          * Invoked to retrieve an existing refresh token previously saved through Model#saveToken().
          *
-         * @param refreshToken
-         * @param callback
          */
         getRefreshToken(refreshToken: string, callback?: Callback<RefreshToken>): Promise<RefreshToken>;
 
         /**
          * Invoked to revoke a refresh token.
          *
-         * @param token
-         * @param callback
          */
         revokeToken(token: Token, callback?: Callback<boolean>): Promise<boolean>;
     }
@@ -386,18 +310,12 @@ declare namespace OAuth2Server {
         /**
          * Invoked to retrieve the user associated with the specified client.
          *
-         * @param client
-         * @param callback
          */
         getUserFromClient(client: Client, callback?: Callback<User | Falsey>): Promise<User | Falsey>;
 
         /**
          * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
-         * @param user
-         * @param client
-         * @param string
-         * @param callback
          */
         validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
     }
diff --git a/types/oauth2orize/index.d.ts b/types/oauth2orize/index.d.ts
index 3e2d31b564..793c41cdc2 100644
--- a/types/oauth2orize/index.d.ts
+++ b/types/oauth2orize/index.d.ts
@@ -2,47 +2,37 @@
 // Project: https://github.com/jaredhanson/oauth2orize/
 // Definitions by: Wonshik Kim <https://github.com/wokim>, Kei Son <https://github.com/heycalmdown>, Steve Hipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 /// <reference types="express" />
 
 import { ServerRequest, ServerResponse } from "http";
 
-interface OAuth2 {
+export interface OAuth2 {
   client: any;
-
   user: any;
-
   transactionID: string;
-
   redirectURI: string;
-
   req: OAuth2Req;
-
   info: OAuth2Info;
 }
 
-interface OAuth2Req {
+export interface OAuth2Req {
   clientID: string;
-
   redirectURI: string;
-
   scope: string;
-
   state: string;
-
   type: string;
-
   transactionID: string;
 }
 
-interface OAuth2Info {
+export interface OAuth2Info {
   scope: string;
 }
 
 export interface MiddlewareRequest extends ServerRequest {
   oauth2?: OAuth2;
-
   user?: any;
 }
 
@@ -51,7 +41,7 @@ export interface ServerOptions {
   loadTransaction: boolean;
 }
 
-export const createServer: (options?: ServerOptions) => OAuth2Server;
+export function createServer(options?: ServerOptions): OAuth2Server;
 
 export interface AuthorizeOptions {
   idLength?: number;
@@ -68,33 +58,31 @@ export interface ErrorHandlerOptions {
   mode?: string;
 }
 
-type MiddlewareFunction = (req: MiddlewareRequest, res: ServerResponse, next: MiddlewareNextFunction) => void;
+export type MiddlewareFunction = (req: MiddlewareRequest, res: ServerResponse, next: MiddlewareNextFunction) => void;
 
-type MiddlewareErrorFunction = (err: Error, req: MiddlewareRequest, res: ServerResponse, next: MiddlewareNextFunction) => void;
+export type MiddlewareErrorFunction = (err: Error, req: MiddlewareRequest, res: ServerResponse, next: MiddlewareNextFunction) => void;
 
-type MiddlewareNextFunction = (err?: Error) => void;
+export type MiddlewareNextFunction = (err?: Error) => void;
 
-type ValidateFunction = (clientId: string, redirectURI: string, validated: (err: Error | null, client?: any, redirectURI?: string) => void) => void;
+export type ValidateFunction = (clientId: string, redirectURI: string, validated: (err: Error | null, client?: any, redirectURI?: string) => void) => void;
 
-type ImmediateFunction = (client: any, user: any, scope: string[], type: string, areq: any, done: (err: Error | null, allow: boolean, info: any, locals: any) => void) => void;
+export type ImmediateFunction = (client: any, user: any, scope: string[], type: string, areq: any, done: (err: Error | null, allow: boolean, info: any, locals: any) => void) => void;
 
-type DecisionParseFunction = (req: MiddlewareRequest, done: (err: Error | null, params: any) => void) => void;
+export type DecisionParseFunction = (req: MiddlewareRequest, done: (err: Error | null, params: any) => void) => void;
 
-type SerializeClientFunction = (client: any, done: SerializeClientDoneFunction) => void;
-type SerializeClientDoneFunction = (err: Error | null, id: string) => void;
+export type SerializeClientFunction = (client: any, done: SerializeClientDoneFunction) => void;
+export type SerializeClientDoneFunction = (err: Error | null, id: string) => void;
 
-type DeserializeClientFunction = (id: string, done: DeserializeClientDoneFunction) => void;
-type DeserializeClientDoneFunction = (err: Error | null, client?: any | boolean) => void;
+export type DeserializeClientFunction = (id: string, done: DeserializeClientDoneFunction) => void;
+export type DeserializeClientDoneFunction = (err: Error | null, client?: any | boolean) => void;
 
-type IssueGrantCodeFunction = (client: any, redirectUri: string, user: any, res: any, issued: (err: Error | null, code?: string) => void) => void;
+export type IssueGrantCodeFunction = (client: any, redirectUri: string, user: any, res: any, issued: (err: Error | null, code?: string) => void) => void;
 
-type IssueGrantTokenFunction = (client: any, user: any, ares: any, issued: (err: Error | null, code?: string, params?: any) => void) => void;
+export type IssueGrantTokenFunction = (client: any, user: any, ares: any, issued: (err: Error | null, code?: string, params?: any) => void) => void;
 
+export type IssueExchangeCodeFunction = (client: any, code: string, redirectURI: string, issued: ExchangeDoneFunction) => void;
 
-type IssueExchangeCodeFunction = (client: any, code: string, redirectURI: string, issued: ExchangeDoneFunction) => void;
-
-type ExchangeDoneFunction = (err: Error | null, accessToken?: string | boolean, refreshToken?: string, params?: any) => void;
-
+export type ExchangeDoneFunction = (err: Error | null, accessToken?: string | boolean, refreshToken?: string, params?: any) => void;
 
 export class OAuth2Server {
   grant(type: string, fn: MiddlewareFunction): OAuth2Server;
diff --git a/types/oauth2orize/oauth2orize-tests.ts b/types/oauth2orize/oauth2orize-tests.ts
index 49d7c94794..84d9fe95e9 100644
--- a/types/oauth2orize/oauth2orize-tests.ts
+++ b/types/oauth2orize/oauth2orize-tests.ts
@@ -17,19 +17,20 @@ server.grant(oauth2orize.grant.code((client, redirectURI, user, ares, done) => {
   // });
 }));
 
-
 // Register Exchanges
-class AuthorizationCode {
-  static findOne(code: string, callback: (err: Error, code: {
-    clientId: string, userId: string, redirectURI: string, scope: string
-  }) => void): void {}
-}
+function findOne(code: string, callback: (err: Error, code: {
+  clientId: string, userId: string, redirectURI: string, scope: string
+}) => void): void {}
 
 server.exchange(oauth2orize.exchange.code((client, code, redirectURI, done) => {
-  AuthorizationCode.findOne(code, (err, code) => {
-    if (err) { return done(err); }
-    if (client.id !== code.clientId) { return done(null, false); }
-    if (redirectURI !== code.redirectURI) { return done(null, false); }
+  findOne(code, (err, code) => {
+    if (err) {
+      done(err);
+    } else if (client.id !== code.clientId) {
+      done(null, false);
+    } else if (redirectURI !== code.redirectURI) {
+      done(null, false);
+    }
 
     // var token = utils.uid(256);
     // var at = new AccessToken(token, code.userId, code.clientId, code.scope);
@@ -43,7 +44,7 @@ server.exchange(oauth2orize.exchange.code((client, code, redirectURI, done) => {
 // Implement Authorization Endpoint
 class Clients {
   static findOne(id: string, callback: (err: Error, client?: Clients) => void): void {
-    callback(new Error(), {} as Clients);
+    callback(new Error(), {} as Clients); // tslint:disable-line no-object-literal-type-assertion
   }
   redirectURI: string;
 }
@@ -52,33 +53,41 @@ class Clients {
   // login.ensureLoggedIn(),
   server.authorize((clientID, redirectURI, done) => {
     Clients.findOne(clientID, (err, client) => {
-      if (err) { return done(err); }
-      if (!client) { return done(null, false); }
-      if (client.redirectURI != redirectURI) { return done(null, false); }
-      return done(null, client, client.redirectURI);
+      if (err) {
+        done(err);
+      } else if (!client) {
+        done(null, false);
+      } else if (client.redirectURI !== redirectURI) {
+        done(null, false);
+      } else {
+        done(null, client, client.redirectURI);
+      }
     });
-  }),
+  });
   (req: http.IncomingMessage, res: http.ServerResponse) => {
     // res.render('dialog', { transactionID: req.oauth2.transactionID,
     //                        user: req.user, client: req.oauth2.client });
-  }
+  };
 // );
 
 // Session Serialization
 server.serializeClient((client, done) => {
-  return done(null, client.id);
+  done(null, client.id);
 });
 
 server.deserializeClient((id, done) => {
   Clients.findOne(id, (err, client) => {
-    if (err) { return done(err); }
-    return done(null, client);
+    if (err) {
+      done(err);
+    } else {
+      done(null, client);
+    }
   });
 });
 
 // Implement Token Endpoint
 // app.post('/token',
   // passport.authenticate(['basic', 'oauth2-client-password'], { session: false }),
-  server.token(),
-  server.errorHandler()
+  server.token();
+  server.errorHandler();
 // );
diff --git a/types/oauth2orize/tslint.json b/types/oauth2orize/tslint.json
new file mode 100644
index 0000000000..f12cd9111f
--- /dev/null
+++ b/types/oauth2orize/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "no-any-union": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/obelisk.js/tslint.json b/types/obelisk.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/obelisk.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/object-assign/tslint.json b/types/object-assign/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/object-assign/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/object-diff/tslint.json b/types/object-diff/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/object-diff/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/object-hash/tslint.json b/types/object-hash/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/object-hash/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/object-inspect/index.d.ts b/types/object-inspect/index.d.ts
new file mode 100644
index 0000000000..ed72d3266a
--- /dev/null
+++ b/types/object-inspect/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for object-inspect 1.4
+// Project: https://github.com/substack/object-inspect
+// Definitions by: Charles Samborski <https://github.com/demurgos>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace objectInspect {
+    /**
+     * Inspection options
+     */
+    interface Options {
+        /**
+         * Maximum depth of the inspection. Default: `5`.
+         */
+        depth?: number;
+    }
+}
+
+/**
+ * Return a string `s` with the string representation of `obj` up to a depth of `opts.depth`.
+ *
+ * @param obj Object to inspect
+ * @param opts Inspection options. Default: `{}`.
+ * @return String representation of `obj`
+ */
+declare function objectInspect(obj: any, opts?: objectInspect.Options): string;
+
+export = objectInspect;
diff --git a/types/object-inspect/object-inspect-tests.ts b/types/object-inspect/object-inspect-tests.ts
new file mode 100644
index 0000000000..22a1e4ab56
--- /dev/null
+++ b/types/object-inspect/object-inspect-tests.ts
@@ -0,0 +1,10 @@
+import objectInspect = require('object-inspect');
+
+// $ExpectType string
+objectInspect({foo: "bar"});
+
+// $ExpectType string
+objectInspect({foo: "bar"}, {});
+
+// $ExpectType string
+objectInspect({foo: "bar"}, {depth: Infinity});
diff --git a/types/object-inspect/tsconfig.json b/types/object-inspect/tsconfig.json
new file mode 100644
index 0000000000..1f167ba039
--- /dev/null
+++ b/types/object-inspect/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "object-inspect-tests.ts"
+    ]
+}
diff --git a/types/object-inspect/tslint.json b/types/object-inspect/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/object-inspect/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/object-path/tslint.json b/types/object-path/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/object-path/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/object-refs/tslint.json b/types/object-refs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/object-refs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/oblo-util/tslint.json b/types/oblo-util/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/oblo-util/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/oboe/tslint.json b/types/oboe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/oboe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/observe-js/tslint.json b/types/observe-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/observe-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/oclazyload/tslint.json b/types/oclazyload/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/oclazyload/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/odata/index.d.ts b/types/odata/index.d.ts
index 3f436667f9..349d48763b 100644
--- a/types/odata/index.d.ts
+++ b/types/odata/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for odata v0.3.3
+// Type definitions for odata v0.3.4
 // Project: https://github.com/janhommes/odata
-// Definitions by: Jan Hommes <https://github.com/janhommes>
+// Definitions by: Jan Hommes <https://github.com/janhommes>, Jean-Christophe Chalte <https://github.com/jcchalte>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare module 'odata' {
     import Q = require("q");
@@ -19,6 +20,9 @@ declare module 'odata' {
         username ?: string
         password ?: string
         isAsync ?: boolean
+        isCors ?: boolean
+        isHashRoute ?: boolean
+        appending ?: string
     }
 
     interface OHandler<T> {
diff --git a/types/odata/tslint.json b/types/odata/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/odata/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index fef494614f..e24b6c4a2c 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -181,11 +181,16 @@ declare namespace Office {
         messageParent(messageObject: any): void;
         /**
          * Closes the UI container where the JavaScript is executing.
-         * The behavior of this method is specified by the following table.
-         * When called from	            Behavior
-         * A UI-less command button	    No effect. Any dialogs opened by displayDialogAsync will remain open.
-         * A taskpane	                The taskpane will close. Any dialogs opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
-         * A module extension	        No effect.
+         * 
+         * Supported hosts: Outlook - Minimum requirement set: Mailbox 1.5
+         * 
+         * The behavior of this method is specified by the following:
+         * 
+         * Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
+         * 
+         * Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
+         * 
+         * Called from a module extension: No effect.
          */
         closeContainer(): void;
     }
diff --git a/types/office-js/tslint.json b/types/office-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/office-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/offline-js/tslint.json b/types/offline-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/offline-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/oidc-token-manager/tslint.json b/types/oidc-token-manager/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/oidc-token-manager/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/onesignal-cordova-plugin/index.d.ts b/types/onesignal-cordova-plugin/index.d.ts
new file mode 100644
index 0000000000..d2c2534829
--- /dev/null
+++ b/types/onesignal-cordova-plugin/index.d.ts
@@ -0,0 +1,201 @@
+// Type definitions for onesignal-cordova-plugin 2.2
+// Project: https://github.com/onesignal/OneSignal-Cordova-SDK#readme
+// Definitions by: David Broder-Rodgers <https://github.com/broder>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Window {
+    plugins: { OneSignal: OneSignalCordovaPlugin.OneSignalCordovaPlugin };
+}
+
+declare namespace OneSignalCordovaPlugin {
+    interface OneSignalCordovaPlugin {
+        startInit(appId: string): OneSignalBuilder;
+        promptForPushNotificationsWithUserResponse(callback: (accepted: boolean) => void): void;
+        getPermissionSubscriptionState(callback: (status: OSPermissionSubscriptionState) => void): void;
+        addPermissionObserver(callback: (state: OSPermissionState) => void): void;
+        addSubscriptionObserver(callback: (state: OSSubscriptionState) => void): void;
+        getTags(callback: (tags: any) => void): void;
+        sendTag(key: string, value: string): void;
+        sendTags(tags: { [key: string]: string }): void;
+        deleteTag(key: string): void;
+        deleteTags(keys: string[]): void;
+        promptLocation(): void;
+        syncHashedEmail(email: string): void;
+        postNotification(notificationObj: any, onSuccess: (json: any) => void, onFailure: (json: any) => void): void;
+        clearOneSignalNotifications(): void;
+        setSubscription(enable: boolean): void;
+        enableVibrate(enable: boolean): void;
+        enableSound(enable: boolean): void;
+        setLogLevel(logLevel: { logLevel: number, visualLevel: number }): void;
+        getIds(callback: (id: { userId: string; pushToken: string }) => void): void;
+        registerForPushNotifications(): void;
+    }
+
+    interface OneSignalBuilder {
+        handleNotificationReceived(callback: (json: OSNotification) => void): OneSignalBuilder;
+        handleNotificationOpened(callback: (json: OSNotificationOpenedResult) => void): OneSignalBuilder;
+        inFocusDisplaying(displayOption: OSDisplayType): OneSignalBuilder;
+        iOSSettings(settings: {
+            kOSSettingsKeyAutoPrompt: boolean;
+            kOSSettingsKeyInAppLaunchURL: boolean;
+        }): OneSignalBuilder;
+        endInit(): void;
+    }
+
+    interface OSNotification {
+        isAppInFocus: boolean;
+        shown: boolean;
+        androidNotificationId?: number;
+        payload: OSNotificationPayload;
+        displayType: OSDisplayType;
+        groupedNotifications?: OSNotificationPayload[];
+        app_id?: string;
+        contents: any;
+        headings?: any;
+        isIos?: boolean;
+        isAndroid?: boolean;
+        isWP?: boolean;
+        isWP_WNS?: boolean;
+        isAdm?: boolean;
+        isChrome?: boolean;
+        isChromeWeb?: boolean;
+        isSafari?: boolean;
+        isAnyWeb?: boolean;
+        included_segments?: string[];
+        excluded_segments?: string[];
+        include_player_ids?: string[];
+        include_ios_tokens?: string[];
+        include_android_reg_ids?: string[];
+        include_wp_uris?: string[];
+        include_wp_wns_uris?: string[];
+        include_amazon_reg_ids?: string[];
+        include_chrome_reg_ids?: string[];
+        include_chrome_web_reg_ids?: string[];
+        app_ids?: string[];
+        tags?: any[];
+        ios_badgeType?: string;
+        ios_badgeCount?: number;
+        ios_sound?: string;
+        android_sound?: string;
+        adm_sound?: string;
+        wp_sound?: string;
+        wp_wns_sound?: string;
+        data?: any;
+        buttons?: any;
+        small_icon?: string;
+        large_icon?: string;
+        big_picture?: string;
+        adm_small_icon?: string;
+        adm_large_icon?: string;
+        adm_big_picture?: string;
+        chrome_icon?: string;
+        chrome_big_picture?: string;
+        chrome_web_icon?: string;
+        firefox_icon?: string;
+        url?: string;
+        send_after?: string;
+        delayed_option?: string;
+        delivery_time_of_day?: string;
+        android_led_color?: string;
+        android_accent_color?: string;
+        android_visibility?: number;
+        content_available?: boolean;
+        amazon_background_data?: boolean;
+        template_id?: string;
+        android_group?: string;
+        android_group_message?: any;
+        adm_group?: string;
+        adm_group_message?: any;
+        ttl?: number;
+        priority?: number;
+        ios_category?: string;
+    }
+
+    interface OSNotificationPayload {
+        notificationID: string;
+        title: string;
+        body: string;
+        additionalData?: any;
+        smallIcon?: string;
+        largeIcon?: string;
+        bigPicture?: string;
+        smallIconAccentColor?: string;
+        launchURL?: string;
+        sound: string;
+        ledColor?: string;
+        lockScreenVisibility?: OSLockScreenVisibility;
+        groupKey?: string;
+        groupMessage?: string;
+        actionButtons: OSActionButton[];
+        fromProjectNumber?: string;
+        backgroundImageLayout?: OSBackgroundImageLayout;
+        priority?: number;
+        rawPayload: string;
+    }
+
+    interface OSActionButton {
+        id: string;
+        text: string;
+        icon: string;
+    }
+
+    interface OSPermissionState {
+        hasPrompted: boolean;
+        status: OSNotificationPermission;
+    }
+
+    interface OSSubscriptionState {
+        subscribed: boolean;
+        userSubscriptionSetting: any;
+        userId: any;
+        pushToken: any;
+    }
+
+    interface OSPermissionSubscriptionState {
+        permissionStatus: OSPermissionState;
+        subscriptionStatus: OSSubscriptionState;
+    }
+
+    interface OSBackgroundImageLayout {
+        image: string;
+        titleTextColor: string;
+        bodyTextColor: string;
+    }
+
+    interface OSNotificationOpenedResult {
+        action: {
+            type: OSActionType;
+            actionID?: string;
+        };
+        notification: OSNotification;
+    }
+
+    const enum OSLockScreenVisibility {
+        Public = 1,
+        Private = 0,
+        Secret = -1
+    }
+
+    const enum OSDisplayType {
+        None = 0,
+        InAppAlert = 1,
+        Notification = 2
+    }
+
+    const enum OSActionType {
+        Opened = 0,
+        ActionTake = 1
+    }
+
+    const enum OSInFocusDisplayOption {
+        None = 0,
+        InAppAlert = 1,
+        Notification = 2
+    }
+
+    const enum OSNotificationPermission {
+        NotDetermined = 0,
+        Authorized = 1,
+        Denied = 2,
+    }
+}
diff --git a/types/onesignal-cordova-plugin/onesignal-cordova-plugin-tests.ts b/types/onesignal-cordova-plugin/onesignal-cordova-plugin-tests.ts
new file mode 100644
index 0000000000..763338f948
--- /dev/null
+++ b/types/onesignal-cordova-plugin/onesignal-cordova-plugin-tests.ts
@@ -0,0 +1,70 @@
+window.plugins.OneSignal
+    .startInit("YOUR_APPID")
+    .handleNotificationReceived((jsonData) => {
+        console.log("Notification received:\n" + JSON.stringify(jsonData));
+    })
+    .handleNotificationOpened((jsonData) => {
+        console.log("Notification opened:\n" + JSON.stringify(jsonData));
+    })
+    .inFocusDisplaying(OneSignalCordovaPlugin.OSDisplayType.Notification)
+    .iOSSettings({
+        kOSSettingsKeyAutoPrompt: true,
+        kOSSettingsKeyInAppLaunchURL: false,
+    })
+    .endInit();
+
+window.plugins.OneSignal.promptForPushNotificationsWithUserResponse((accepted) => {
+    console.log("User accepted notifications: " + accepted);
+});
+
+window.plugins.OneSignal.addPermissionObserver((state) => {
+    console.log("Notification permission state changed: " + JSON.stringify(state));
+});
+
+window.plugins.OneSignal.addSubscriptionObserver((state) => {
+    if (!state.subscribed) {
+        console.log("Subscribed for OneSignal push notifications!");
+    }
+    console.log("Push Subscription state changed: " + JSON.stringify(state));
+});
+
+window.plugins.OneSignal.getTags((tags) => {
+    console.log('Tags Received: ' + JSON.stringify(tags));
+});
+
+window.plugins.OneSignal.sendTag("key", "value");
+
+window.plugins.OneSignal.deleteTag("key");
+
+window.plugins.OneSignal.sendTags({ key1: "value", key2: "value2" });
+
+window.plugins.OneSignal.deleteTags(["key1", "key2"]);
+
+window.plugins.OneSignal.promptLocation();
+
+window.plugins.OneSignal.syncHashedEmail("John.Smith@example.com");
+
+window.plugins.OneSignal.getIds((ids) => {
+    const notificationObj = {
+        contents: { en: "message body" },
+        include_player_ids: [ids.userId]
+    };
+    window.plugins.OneSignal.postNotification(notificationObj,
+        (successResponse) => {
+            console.log("Notification Post Success:", successResponse);
+        },
+        (failedResponse) => {
+            console.log("Notification Post Failed: ", failedResponse);
+        }
+    );
+});
+
+window.plugins.OneSignal.clearOneSignalNotifications();
+
+window.plugins.OneSignal.setSubscription(false);
+
+window.plugins.OneSignal.enableVibrate(false);
+
+window.plugins.OneSignal.enableSound(false);
+
+window.plugins.OneSignal.setLogLevel({ logLevel: 4, visualLevel: 4 });
diff --git a/types/onesignal-cordova-plugin/tsconfig.json b/types/onesignal-cordova-plugin/tsconfig.json
new file mode 100644
index 0000000000..bcee47426f
--- /dev/null
+++ b/types/onesignal-cordova-plugin/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "onesignal-cordova-plugin-tests.ts"
+    ]
+}
diff --git a/types/onesignal-cordova-plugin/tslint.json b/types/onesignal-cordova-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/onesignal-cordova-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/oniguruma/index.d.ts b/types/oniguruma/index.d.ts
index 4734ae39ee..e25c2aca58 100644
--- a/types/oniguruma/index.d.ts
+++ b/types/oniguruma/index.d.ts
@@ -3,14 +3,16 @@
 // Definitions by: smhxx <https://github.com/smhxx>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/** An (error, match) callback function to be invoked after an asynchronous
- *  search operation is completed. The type of T varies slightly based on the
- *  method being called.
+/**
+ * An (error, match) callback function to be invoked after an asynchronous
+ * search operation is completed. The type of T varies slightly based on the
+ * method being called.
  */
 export type Callback<T> = (error: Error, match: T) => void;
 
-/** An object representing a range within a search string, corresponding to
- *  either a full-string match, or a capturing group within a match.
+/**
+ * An object representing a range within a search string, corresponding to
+ * either a full-string match, or a capturing group within a match.
  */
 export interface CaptureIndex {
   /** The index of the capturing group, or 0 for a full-string match */
@@ -23,8 +25,9 @@ export interface CaptureIndex {
   length: number;
 }
 
-/** An object representing one successful regex match between a pattern and a
- *  search string.
+/**
+ * An object representing one successful regex match between a pattern and a
+ * search string.
  */
 export interface Match {
   /** The index of the best pattern match */
@@ -33,12 +36,14 @@ export interface Match {
   captureIndices: CaptureIndex[];
 }
 
-/** An object representing a single regex pattern, which can be used to
- *  interrogate strings for matches against that pattern.
+/**
+ * An object representing a single regex pattern, which can be used to
+ * interrogate strings for matches against that pattern.
  */
 export class OnigRegExp {
-  /** Create a new regex with the given pattern
-   *  @param pattern A string pattern
+  /**
+   * Create a new regex with the given pattern
+   * @param pattern A string pattern
    */
   constructor(pattern: string);
 
@@ -47,104 +52,117 @@ export class OnigRegExp {
   /** The OnigScanner instance used internally for regex matching */
   readonly scanner: OnigScanner;
 
-  /** Augment the capture indices for the given Match object by extracting
-   *  the substrings associated with each capture, assinging them to the
-   *  CaptureIndex object's 'match' property
-   *  @param string The search string from which 'match' resulted
-   *  @param match The Match object containing the matches of the search
-   *  @return An array of CaptureIndex objects which have been augmented with
-   *          the original text that triggered the match
+  /**
+   * Augment the capture indices for the given Match object by extracting
+   * the substrings associated with each capture, assinging them to the
+   * CaptureIndex object's 'match' property
+   * @param string The search string from which 'match' resulted
+   * @param match The Match object containing the matches of the search
+   * @return An array of CaptureIndex objects which have been augmented with
+   *         the original text that triggered the match
    */
   captureIndicesForMatch(string: any, match: Match):
     Array<CaptureIndex & { match: string }>;
-  /** Search the string for a match starting at the given position.
-   *  @param string The string to search.
-   *  @param startPosition The optional position to start at, defaults to 0
-   *  @param callback The (error, match) function to call when done. Match will
-   *         be null if no matches were found. Otherwise, match will be an
-   *         array of objects for each matched group.
+  /**
+   * Search the string for a match starting at the given position.
+   * @param string The string to search.
+   * @param startPosition The optional position to start at, defaults to 0
+   * @param callback The (error, match) function to call when done. Match will
+   *        be null if no matches were found. Otherwise, match will be an
+   *        array of objects for each matched group.
    */
   search(string: string, startPosition: number,
     callback: Callback<CaptureIndex[] | null>): void;
-  /** Search the string for a match starting at the beginning of the string.
-   *  @param string The string to search.
-   *  @param callback The (error, match) function to call when done. Match will
-   *         be null if no matches were found. Otherwise, match will be an
-   *         array of objects for each matched group.
+  /**
+   * Search the string for a match starting at the beginning of the string.
+   * @param string The string to search.
+   * @param callback The (error, match) function to call when done. Match will
+   *        be null if no matches were found. Otherwise, match will be an
+   *        array of objects for each matched group.
    */
   search(string: string,
     callback: Callback<CaptureIndex[] | null>): void;
-  /** Synchronously search the string for a match starting at the given
-   *  position.
-   *  @param string The string to search.
-   *  @param startPosition The optional position to start at, defaults to 0
-   *  @return An array of objects representing each matched group, or null if
-   *          there were no matches.
+  /**
+   * Synchronously search the string for a match starting at the given
+   * position.
+   * @param string The string to search.
+   * @param startPosition The optional position to start at, defaults to 0
+   * @return An array of objects representing each matched group, or null if
+   *         there were no matches.
    */
   searchSync(string: string, startPosition?: number): CaptureIndex[] | null;
-  /** Test if this regular expression matches the given string.
-   *  @param string The string to test against.
-   *  @param callback The (error, matches) function to call when done. Matches
-   *         will be true if at least one match was found, or false otherwise.
+  /**
+   * Test if this regular expression matches the given string.
+   * @param string The string to test against.
+   * @param callback The (error, matches) function to call when done. Matches
+   *        will be true if at least one match was found, or false otherwise.
    */
   test(sring: string, callback: Callback<boolean>): void;
-  /** Synchronously test if this regular expression matches the given string.
-   *  @param string The string to test against.
-   *  @return True if there is at least one match, or false otherwise.
+  /**
+   * Synchronously test if this regular expression matches the given string.
+   * @param string The string to test against.
+   * @return True if there is at least one match, or false otherwise.
    */
   testSync(string: string): boolean;
 }
 
-/** An object representing one OR MORE regex patterns, which can be used to
- *  interrogate strings for matches against any of the supplied patterns.
+/**
+ * An object representing one OR MORE regex patterns, which can be used to
+ * interrogate strings for matches against any of the supplied patterns.
  */
 export class OnigScanner {
-  /** Create a new scanner with the given patterns.
-   *  @param patterns An array of string patterns.
+  /**
+   * Create a new scanner with the given patterns.
+   * @param patterns An array of string patterns.
    */
   constructor(patterns: ReadonlyArray<string>);
 
-  /** Find the next match from a given position
-   *  @param string The string to search
-   *  @param startPosition The optional position to start at, defaults to 0
-   *  @param callback The (error, match) function to be called when done. Match
-   *         will be null when there is no match.
-   *  @return void
+  /**
+   * Find the next match from a given position
+   * @param string The string to search
+   * @param startPosition The optional position to start at, defaults to 0
+   * @param callback The (error, match) function to be called when done. Match
+   *        will be null when there is no match.
    */
   findNextMatch(string: string, startPosition: number,
     callback: Callback<Match | null>): void;
-  /** Find the next match from the beginning of a string
-   *  @param string The string to search
-   *  @param callback The (error, match) function to be called when done. Match
-   *         will be null when there is no match.
-   *  @return void
+  /**
+   * Find the next match from the beginning of a string
+   * @param string The string to search
+   * @param callback The (error, match) function to be called when done. Match
+   *        will be null when there is no match.
    */
   findNextMatch(string: string, callback: Callback<Match | null>): void;
-  /** Synchronously find the next match from a given position
-   *  @param string The string to search
-   *  @param startPosition The optional position to start at, defaults to 0
-   *  @return An object containing details about the match, or null if no match
+  /**
+   * Synchronously find the next match from a given position
+   * @param string The string to search
+   * @param startPosition The optional position to start at, defaults to 0
+   * @return An object containing details about the match, or null if no match
    */
   findNextMatchSync(string: string, startPosition?: number): Match | null;
-  /** Coerce the provided value into either a string primitive or a wrapped
-   *  OnigString object.
-   *  @param value A value of any type
-   *  @return A string primitive or OnigString object representing 'value'
+  /**
+   * Coerce the provided value into either a string primitive or a wrapped
+   * OnigString object.
+   * @param value A value of any type
+   * @return A string primitive or OnigString object representing 'value'
    */
   private convertToString(value: any): string | OnigString;
-  /** Coerce the provided value into a number
-   *  @param value A value of any type
-   *  @return A number representing 'value'
+  /**
+   * Coerce the provided value into a number
+   * @param value A value of any type
+   * @return A number representing 'value'
    */
   private convertToNumber(value: any): number;
 }
 
-/** An object class used internally as a wrapper for JavaScript string
- *  primitives.
+/**
+ * An object class used internally as a wrapper for JavaScript string
+ * primitives.
  */
 export class OnigString {
-  /** Wrap a string primitive in a new OnigString object
-   *  @param string The string primitive to be wrapped
+  /**
+   * Wrap a string primitive in a new OnigString object
+   * @param string The string primitive to be wrapped
    */
   constructor(string: string);
 
@@ -153,14 +171,16 @@ export class OnigString {
   /** The string primitive wrapped by the object */
   readonly content: string;
 
-  /** Returns a reference the string primitive wrapped by the object
-   *  @return A reference to the wrapped string primitive
+  /**
+   * Returns a reference the string primitive wrapped by the object
+   * @return A reference to the wrapped string primitive
    */
   toString(): string;
-  /** Returns a substring of the string primitive wrapped by the object
-   *  @param start The index of the first character to include
-   *  @param end The index before which the substring should end
-   *  @return A new string primitive containing the specified index range
+  /**
+   * Returns a substring of the string primitive wrapped by the object
+   * @param start The index of the first character to include
+   * @param end The index before which the substring should end
+   * @return A new string primitive containing the specified index range
    */
   substring(start: number, end: number): string;
 }
diff --git a/types/onoff/tslint.json b/types/onoff/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/onoff/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/open/tslint.json b/types/open/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/open/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/openfin/index.d.ts b/types/openfin/index.d.ts
index b6c2ac9eed..30afded19b 100644
--- a/types/openfin/index.d.ts
+++ b/types/openfin/index.d.ts
@@ -593,9 +593,6 @@ declare namespace fin {
 	 * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
 	 */
 	interface OpenFinSystem {
-		/**
-		 *
-		 */
 		Clipboard: OpenFinClipboard;
 		/**
 		 * Registers an event listener on the specified event.
@@ -823,9 +820,6 @@ declare namespace fin {
 		 * Same payload as Node's os.cpus()
 		 */
 		cpus: NodeCpuInfo[];
-		/**
-		 *
-		 */
 		gpu: {
 			/**
 			 * Graphics card name
@@ -1047,9 +1041,9 @@ declare namespace fin {
 		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
 		 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
 		 * The new window appears in the same process as the parent window.
-		 * @param {any} options - The options of the window
-		 * @param {Function} [callback] - Called if the window creation was successful
-		 * @param {number} [callback.successObj] - httpResponseCode
+		 * @param options - The options of the window
+		 * @param [callback] - Called if the window creation was successful
+		 * @param [callback.successObj] - httpResponseCode
 		 */
 		new (
 			options: WindowOptions,
@@ -1057,7 +1051,7 @@ declare namespace fin {
 			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
 		/**
 		 * Returns an instance of the current window.
-		 * @returns {OpenFinWindow} Current window
+		 * @returns Current window
 		 */
 		getCurrent(): OpenFinWindow;
 		/**
@@ -1082,12 +1076,12 @@ declare namespace fin {
 		 * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
 		 * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
 		 * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
-		 * @returns {Window} Native window
+		 * @returns Native window
 		 */
 		getNativeWindow(): Window;
 		/**
 		 * Gets the parent application.
-		 * @returns {OpenFinApplication} Parent application
+		 * @returns Parent application
 		 */
 		getParentApplication(): OpenFinApplication;
 		/**
@@ -1126,7 +1120,7 @@ declare namespace fin {
 		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
 		 * Closes the window.
-		 * @param {force} Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
 		 */
 		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
@@ -1255,7 +1249,7 @@ declare namespace fin {
 		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
 		 * Shows the window if it is hidden.
-		 * @param {force} Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
 		 */
 		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
@@ -1443,9 +1437,7 @@ declare namespace fin {
 		 * the top-most coordinate of the window.
 		 */
 		top: number;
-		/**
-		 *
-		 */
+
 		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
 		/**
 		 * the new width of the window.
diff --git a/types/openfin/v15/index.d.ts b/types/openfin/v15/index.d.ts
index 0abaaf61fe..4eb5a99a6c 100644
--- a/types/openfin/v15/index.d.ts
+++ b/types/openfin/v15/index.d.ts
@@ -485,9 +485,6 @@ declare namespace fin {
 	 * An object representing the core of OpenFin Runtime. Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
 	 */
 	interface OpenFinSystem {
-		/**
-		 *
-		 */
 		Clipboard: OpenFinClipboard;
 		/**
 		 * Registers an event listener on the specified event.
@@ -851,14 +848,14 @@ declare namespace fin {
 		 * Creates a new OpenFin Window
 		 *
 		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize, maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually. The new window appears in the same process as the parent window.
-		 * @param {any} options - The options of the window
-		 * @param {Function} [callback] - Called if the window creation was successful
-		 * @param {number} [callback.successObj] - httpResponseCode
+		 * @param options - The options of the window
+		 * @param [callback] - Called if the window creation was successful
+		 * @param [callback.successObj] - httpResponseCode
 		 */
 		new (options: WindowOptions, callback?: (successObj: { httpResponseCode: number }) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
 		/**
 		 * Returns an instance of the current window.
-		 * @returns {OpenFinWindow} Current window
+		 * @returns Current window
 		 */
 		getCurrent(): OpenFinWindow;
 		/**
@@ -878,12 +875,12 @@ declare namespace fin {
 		name: string;
 		/**
 		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself, otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below. Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
-		 * @returns {Window} Native window
+		 * @returns Native window
 		 */
 		getNativeWindow(): Window;
 		/**
 		 * Gets the parent application.
-		 * @returns {OpenFinApplication} Parent application
+		 * @returns Parent application
 		 */
 		getParentApplication(): OpenFinApplication;
 		/**
@@ -912,7 +909,7 @@ declare namespace fin {
 		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
 		 * Closes the window.
-		 * @param {force} Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
 		 */
 		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
@@ -1029,7 +1026,7 @@ declare namespace fin {
 		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
 		 * Shows the window if it is hidden.
-		 * @param {force} Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
 		 */
 		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
@@ -1217,9 +1214,6 @@ declare namespace fin {
 		 * the top-most coordinate of the window.
 		 */
 		top: number;
-		/**
-		 *
-		 */
 		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
 		/**
 		 * the new width of the window.
diff --git a/types/openfin/v16/index.d.ts b/types/openfin/v16/index.d.ts
index 32e980120f..f4c4e8509e 100644
--- a/types/openfin/v16/index.d.ts
+++ b/types/openfin/v16/index.d.ts
@@ -500,9 +500,6 @@ declare namespace fin {
 	 * An object representing the core of OpenFin Runtime. Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
 	 */
 	interface OpenFinSystem {
-		/**
-		 *
-		 */
 		Clipboard: OpenFinClipboard;
 		/**
 		 * Registers an event listener on the specified event.
@@ -706,9 +703,6 @@ declare namespace fin {
 		 * Same payload as Node's os.cpus()
 		 */
 		cpus: NodeCpuInfo[];
-		/**
-		 *
-		 */
 		gpu: {
 			/**
 			 * Graphics card name
@@ -928,14 +922,14 @@ declare namespace fin {
 		 * Creates a new OpenFin Window
 		 *
 		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize, maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually. The new window appears in the same process as the parent window.
-		 * @param {any} options - The options of the window
-		 * @param {Function} [callback] - Called if the window creation was successful
-		 * @param {number} [callback.successObj] - httpResponseCode
+		 * @param options - The options of the window
+		 * @param [callback] - Called if the window creation was successful
+		 * @param [callback.successObj] - httpResponseCode
 		 */
 		new (options: WindowOptions, callback?: (successObj: { httpResponseCode: number }) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
 		/**
 		 * Returns an instance of the current window.
-		 * @returns {OpenFinWindow} Current window
+		 * @returns Current window
 		 */
 		getCurrent(): OpenFinWindow;
 		/**
@@ -955,12 +949,12 @@ declare namespace fin {
 		name: string;
 		/**
 		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself, otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below. Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
-		 * @returns {Window} Native window
+		 * @returns Native window
 		 */
 		getNativeWindow(): Window;
 		/**
 		 * Gets the parent application.
-		 * @returns {OpenFinApplication} Parent application
+		 * @returns Parent application
 		 */
 		getParentApplication(): OpenFinApplication;
 		/**
@@ -989,7 +983,7 @@ declare namespace fin {
 		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
 		 * Closes the window.
-		 * @param {force} Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
 		 */
 		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
@@ -1106,7 +1100,7 @@ declare namespace fin {
 		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
 		 * Shows the window if it is hidden.
-		 * @param {force} Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
 		 */
 		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
 		/**
@@ -1294,9 +1288,6 @@ declare namespace fin {
 		 * the top-most coordinate of the window.
 		 */
 		top: number;
-		/**
-		 *
-		 */
 		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
 		/**
 		 * the new width of the window.
diff --git a/types/openjscad/tslint.json b/types/openjscad/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/openjscad/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 539db01b4d..c2e7ab1530 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -4,6 +4,8 @@
 //                 Bin Wang <https://github.com/wb14123>
 //                 Junyoung Clare Jang <https://github.com/ailrun>
 //                 Alexandre Melard <https://github.com/mylen>
+//                 Chad Johnston <https://github.com/iamthechad>
+//                 Dan Manastireanu <https://github.com/danmana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
@@ -2732,6 +2734,172 @@ declare module ol {
              */
             function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
 
+            /**
+             * Create a logical `<Or>` operator between two or more filter conditions.
+             *
+             * @param {...ol.format.filter.Filter} conditions Filter conditions.
+             * @returns {!ol.format.filter.Or} `<Or>` operator.
+             * @api
+             */
+            function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
+
+            /**
+             * Create a logical `<And>` operator between two or more filter conditions.
+             *
+             * @param {...ol.format.filter.Filter} conditions Filter conditions.
+             * @returns {!ol.format.filter.And} `<And>` operator.
+             * @api
+             */
+            function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
+
+            /**
+             * Represents a logical `<Not>` operator for a filter condition.
+             *
+             * @param {!ol.format.filter.Filter} condition Filter condition.
+             * @returns {!ol.format.filter.Not} `<Not>` operator.
+             * @api
+             */
+            function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
+
+            /**
+             * Create a `<BBOX>` operator to test whether a geometry-valued property
+             * intersects a fixed bounding box
+             *
+             * @param {!string} geometryName Geometry name to use.
+             * @param {!ol.Extent} extent Extent.
+             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             *    set on geometries when this is not provided.
+             * @returns {!ol.format.filter.Bbox} `<BBOX>` operator.
+             * @api
+             */
+            function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
+
+            /**
+             * Create a `<Within>` operator to test whether a geometry-valued property
+             * is within a given geometry.
+             *
+             * @param {!string} geometryName Geometry name to use.
+             * @param {!ol.geom.Geometry} geometry Geometry.
+             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             *    set on geometries when this is not provided.
+             * @returns {!ol.format.filter.Within} `<Within>` operator.
+             * @api
+             */
+            function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
+
+            /**
+             * Creates a `<PropertyIsEqualTo>` comparison operator.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!(string|number)} expression The value to compare.
+             * @param {boolean=} opt_matchCase Case-sensitive?
+             * @returns {!ol.format.filter.EqualTo} `<PropertyIsEqualTo>` operator.
+             * @api
+             */
+            function equalTo(propertyName: string, expression: string|number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
+
+            /**
+             * Creates a `<PropertyIsNotEqualTo>` comparison operator.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!(string|number)} expression The value to compare.
+             * @param {boolean=} opt_matchCase Case-sensitive?
+             * @returns {!ol.format.filter.NotEqualTo} `<PropertyIsNotEqualTo>` operator.
+             * @api
+             */
+            function notEqualTo(propertyName: string, expression: string|number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
+
+            /**
+             * Creates a `<PropertyIsLessThan>` comparison operator.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @returns {!ol.format.filter.LessThan} `<PropertyIsLessThan>` operator.
+             * @api
+             */
+            function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
+
+            /**
+             * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @returns {!ol.format.filter.LessThanOrEqualTo} `<PropertyIsLessThanOrEqualTo>` operator.
+             * @api
+             */
+            function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
+
+            /**
+             * Creates a `<PropertyIsGreaterThan>` comparison operator.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @returns {!ol.format.filter.GreaterThan} `<PropertyIsGreaterThan>` operator.
+             * @api
+             */
+            function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
+
+            /**
+             * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @returns {!ol.format.filter.GreaterThanOrEqualTo} `<PropertyIsGreaterThanOrEqualTo>` operator.
+             * @api
+             */
+            function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
+
+            /**
+             * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
+             * is null.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @returns {!ol.format.filter.IsNull} `<PropertyIsNull>` operator.
+             * @api
+             */
+            function isNull(propertyName: string): ol.format.filter.IsNull;
+
+            /**
+             * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
+             * value lies within a range given by a lower and upper bound (inclusive).
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} lowerBoundary The lower bound of the range.
+             * @param {!number} upperBoundary The upper bound of the range.
+             * @returns {!ol.format.filter.IsBetween} `<PropertyIsBetween>` operator.
+             * @api
+             */
+            function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
+
+            /**
+             * Represents a `<PropertyIsLike>` comparison operator that matches a string property
+             * value against a text pattern.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!string} pattern Text pattern.
+             * @param {string=} opt_wildCard Pattern character which matches any sequence of
+             *    zero or more string characters. Default is '*'.
+             * @param {string=} opt_singleChar pattern character which matches any single
+             *    string character. Default is '.'.
+             * @param {string=} opt_escapeChar Escape character which can be used to escape
+             *    the pattern characters. Default is '!'.
+             * @param {boolean=} opt_matchCase Case-sensitive?
+             * @returns {!ol.format.filter.IsLike} `<PropertyIsLike>` operator.
+             * @api
+             */
+            function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
+
+            /**
+             * Create a `<During>` temporal operator.
+             *
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!string} begin The begin date in ISO-8601 format.
+             * @param {!string} end The end date in ISO-8601 format.
+             * @returns {!ol.format.filter.During} `<During>` operator.
+             * @api
+             */
+            function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
+
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2823,6 +2991,467 @@ declare module ol {
                  */
                 constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
             }
+
+            /**
+             * @classdesc
+             * Represents a `<Within>` operator to test whether a geometry-valued property
+             * is within a given geometry.
+             *
+             * @constructor
+             * @param {!string} geometryName Geometry name to use.
+             * @param {!ol.geom.Geometry} geometry Geometry.
+             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             *    set on geometries when this is not provided.
+             * @extends {ol.format.filter.Spatial}
+             * @api
+             */
+            class Within extends ol.format.filter.Spatial {
+                /**
+                 * @classdesc
+                 * Represents a `<Within>` operator to test whether a geometry-valued property
+                 * is within a given geometry.
+                 *
+                 * @constructor
+                 * @param {!string} geometryName Geometry name to use.
+                 * @param {!ol.geom.Geometry} geometry Geometry.
+                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
+                 *    set on geometries when this is not provided.
+                 * @extends {ol.format.filter.Spatial}
+                 * @api
+                 */
+                constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+            }
+
+            /**
+             * @classdesc
+             * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+             * Base class for WFS GetFeature n-ary logical filters.
+             */
+            class LogicalNary extends ol.format.filter.Filter {}
+
+            /**
+             * @classdesc
+             * Represents a logical <And> operator between two or more filter conditions.
+             *
+             * @constructor
+             * @param {!ol.format.filter.Filter} conditions Conditions
+             * @extends {ol.format.filter.LogicalNary}
+             * @api
+             */
+            class And extends ol.format.filter.LogicalNary {
+                /**
+                 * @classdesc
+                 * Represents a logical <And> operator between two or more filter conditions.
+                 *
+                 * @constructor
+                 * @param {!ol.format.filter.Filter} conditions Conditions
+                 * @extends {ol.format.filter.LogicalNary}
+                 * @api
+                 */
+                constructor(...conditions: ol.format.filter.Filter[]);
+            }
+
+            /**
+             * @classdesc
+             * Represents a logical <Or> operator between two or more filter conditions.
+             *
+             * @constructor
+             * @param {!ol.format.filter.Filter} conditions Conditions
+             * @extends {ol.format.filter.LogicalNary}
+             * @api
+             */
+            class Or extends ol.format.filter.LogicalNary {
+              /**
+               * @classdesc
+               * Represents a logical <Or> operator between two or more filter conditions.
+               *
+               * @constructor
+               * @param {!ol.format.filter.Filter} conditions Conditions
+               * @extends {ol.format.filter.LogicalNary}
+               * @api
+               */
+              constructor(...conditions: ol.format.filter.Filter[]);
+            }
+
+            /**
+             * @classdesc
+             * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+             * Base class for WFS GetFeature property comparison filters.
+             *
+             * deprecated: This class will no longer be exported starting from the next major version.
+             *
+             * @constructor
+             * @abstract
+             * @param {!string} tagName The XML tag name for this filter.
+             * @param {!string} propertyName Name of the context property to compare.
+             * @extends {ol.format.filter.Filter}
+             * @api
+             */
+            class Comparison extends ol.format.filter.Filter {
+                /**
+                 * @classdesc
+                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+                 * Base class for WFS GetFeature property comparison filters.
+                 *
+                 * deprecated: This class will no longer be exported starting from the next major version.
+                 *
+                 * @constructor
+                 * @abstract
+                 * @param {!string} tagName The XML tag name for this filter.
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @extends {ol.format.filter.Filter}
+                 * @api
+                 */
+                constructor(tagName: string, propertyName: string);
+            }
+
+            /**
+             * @classdesc
+             * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+             * Base class for WFS GetFeature property binary comparison filters.
+             *
+             * deprecated: This class will no longer be exported starting from the next major version.
+             *
+             * @constructor
+             * @abstract
+             * @param {!string} tagName The XML tag name for this filter.
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!(string|number)} expression The value to compare.
+             * @param {boolean=} opt_matchCase Case-sensitive?
+             * @extends {ol.format.filter.Comparison}
+             * @api
+             */
+            class ComparisonBinary extends ol.format.filter.Comparison {
+                /**
+                 * @classdesc
+                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+                 * Base class for WFS GetFeature property binary comparison filters.
+                 *
+                 * deprecated: This class will no longer be exported starting from the next major version.
+                 *
+                 * @constructor
+                 * @abstract
+                 * @param {!string} tagName The XML tag name for this filter.
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!(string|number)} expression The value to compare.
+                 * @param {boolean=} opt_matchCase Case-sensitive?
+                 * @extends {ol.format.filter.Comparison}
+                 * @api
+                 */
+                constructor(tagName: string, propertyName: string, expression: string|number, opt_matchCase?: boolean);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsEqualTo>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!(string|number)} expression The value to compare.
+             * @param {boolean=} opt_matchCase Case-sensitive?
+             * @extends {ol.format.filter.ComparisonBinary}
+             * @api
+             */
+            class EqualTo extends ol.format.filter.ComparisonBinary {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsEqualTo>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!(string|number)} expression The value to compare.
+                 * @param {boolean=} opt_matchCase Case-sensitive?
+                 * @extends {ol.format.filter.ComparisonBinary}
+                 * @api
+                 */
+                constructor(propertyName: string, expression: string|number, opt_matchCase?: boolean);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsGreaterThan>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @extends {ol.format.filter.ComparisonBinary}
+             * @api
+             */
+            class GreaterThan extends ol.format.filter.ComparisonBinary {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsGreaterThan>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!number} expression The value to compare.
+                 * @extends {ol.format.filter.ComparisonBinary}
+                 * @api
+                 */
+                constructor(propertyName: string, expression: number);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @extends {ol.format.filter.ComparisonBinary}
+             * @api
+             */
+            class GreaterThanOrEqualTo extends ol.format.filter.ComparisonBinary {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!number} expression The value to compare.
+                 * @extends {ol.format.filter.ComparisonBinary}
+                 * @api
+                 */
+                constructor(propertyName: string, expression: number);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsLessThan>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @extends {ol.format.filter.ComparisonBinary}
+             * @api
+             */
+            class LessThan extends ol.format.filter.ComparisonBinary {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsLessThan>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!number} expression The value to compare.
+                 * @extends {ol.format.filter.ComparisonBinary}
+                 * @api
+                 */
+                constructor(propertyName: string, expression: number);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} expression The value to compare.
+             * @extends {ol.format.filter.ComparisonBinary}
+             * @api
+             */
+            class LessThanOrEqualTo extends ol.format.filter.ComparisonBinary {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!number} expression The value to compare.
+                 * @extends {ol.format.filter.ComparisonBinary}
+                 * @api
+                 */
+                constructor(propertyName: string, expression: number);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsNotEqualTo>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!(string|number)} expression The value to compare.
+             * @param {boolean=} opt_matchCase Case-sensitive?
+             * @extends {ol.format.filter.ComparisonBinary}
+             * @api
+             */
+            class NotEqualTo extends ol.format.filter.ComparisonBinary {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsNotEqualTo>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!(string|number)} expression The value to compare.
+                 * @param {boolean=} opt_matchCase Case-sensitive?
+                 * @extends {ol.format.filter.ComparisonBinary}
+                 * @api
+                 */
+                constructor(propertyName: string, expression: string|number, opt_matchCase?: boolean);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<During>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!string} begin The begin date in ISO-8601 format.
+             * @param {!string} end The end date in ISO-8601 format.
+             * @extends {ol.format.filter.Comparison}
+             * @api
+             */
+            class During extends ol.format.filter.Comparison {
+                /**
+                 * @classdesc
+                 * Represents a `<During>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!string} begin The begin date in ISO-8601 format.
+                 * @param {!string} end The end date in ISO-8601 format.
+                 * @extends {ol.format.filter.Comparison}
+                 * @api
+                 */
+                constructor(propertyName: string, begin: string, end: string);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsBetween>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!number} lowerBoundary The lower bound of the range.
+             * @param {!number} upperBoundary The upper bound of the range.
+             * @extends {ol.format.filter.Comparison}
+             * @api
+             */
+            class IsBetween extends ol.format.filter.Comparison {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsBetween>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!number} lowerBoundary The lower bound of the range.
+                 * @param {!number} upperBoundary The upper bound of the range.
+                 * @extends {ol.format.filter.Comparison}
+                 * @api
+                 */
+                constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsLike>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @param {!string} pattern Text pattern.
+             * @param {string=} opt_wildCard Pattern character which matches any sequence of
+             *    zero or more string characters. Default is '*'.
+             * @param {string=} opt_singleChar pattern character which matches any single
+             *    string character. Default is '.'.
+             * @param {string=} opt_escapeChar Escape character which can be used to escape
+             *    the pattern characters. Default is '!'.
+             * @param {boolean=} opt_matchCase Case-sensitive?
+             * @extends {ol.format.filter.Comparison}
+             * @api
+             */
+            class IsLike extends ol.format.filter.Comparison {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsLike>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @param {!string} pattern Text pattern.
+                 * @param {string=} opt_wildCard Pattern character which matches any sequence of
+                 *    zero or more string characters. Default is '*'.
+                 * @param {string=} opt_singleChar pattern character which matches any single
+                 *    string character. Default is '.'.
+                 * @param {string=} opt_escapeChar Escape character which can be used to escape
+                 *    the pattern characters. Default is '!'.
+                 * @param {boolean=} opt_matchCase Case-sensitive?
+                 * @extends {ol.format.filter.Comparison}
+                 * @api
+                 */
+                constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<PropertyIsNull>` comparison operator.
+             *
+             * @constructor
+             * @param {!string} propertyName Name of the context property to compare.
+             * @extends {ol.format.filter.Comparison}
+             * @api
+             */
+            class IsNull extends ol.format.filter.Comparison {
+                /**
+                 * @classdesc
+                 * Represents a `<PropertyIsNull>` comparison operator.
+                 *
+                 * @constructor
+                 * @param {!string} propertyName Name of the context property to compare.
+                 * @extends {ol.format.filter.Comparison}
+                 * @api
+                 */
+                constructor(propertyName: string);
+            }
+
+            /**
+             * @classdesc
+             * Represents a logical `<Not>` operator for a filter condition.
+             *
+             * @constructor
+             * @param {!ol.format.filter.Filter} condition Filter condition.
+             * @extends {ol.format.filter.Filter}
+             * @api
+             */
+            class Not extends ol.format.filter.Filter {
+                /**
+                 * @classdesc
+                 * Represents a logical `<Not>` operator for a filter condition.
+                 *
+                 * @constructor
+                 * @param {!ol.format.filter.Filter} condition Filter condition.
+                 * @extends {ol.format.filter.Filter}
+                 * @api
+                 */
+                constructor(condition: ol.format.filter.Filter);
+            }
+
+            /**
+             * @classdesc
+             * Represents a `<BBOX>` operator to test whether a geometry-valued property
+             * intersects a fixed bounding box
+             *
+             * @constructor
+             * @param {!string} geometryName Geometry name to use.
+             * @param {!ol.Extent} extent Extent.
+             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             *    set on geometries when this is not provided.
+             * @extends {ol.format.filter.Filter}
+             * @api
+             */
+            class Bbox extends ol.format.filter.Filter {
+                /**
+                 * @classdesc
+                 * Represents a `<BBOX>` operator to test whether a geometry-valued property
+                 * intersects a fixed bounding box
+                 *
+                 * @constructor
+                 * @param {!string} geometryName Geometry name to use.
+                 * @param {!ol.Extent} extent Extent.
+                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
+                 *    set on geometries when this is not provided.
+                 * @extends {ol.format.filter.Filter}
+                 * @api
+                 */
+                constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
+            }
         }
 
         /**
@@ -12617,20 +13246,22 @@ declare module olx {
         /**
          * @typedef {{condition: (ol.EventsConditionType|undefined),
          *     deleteCondition: (ol.EventsConditionType|undefined),
+         *     insertVertexCondition: (ol.EventsConditionType|undefined),
          *     pixelTolerance: (number|undefined),
          *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     features: ol.Collection.<ol.Feature>,
+         *     features: (ol.Collection.<ol.Feature>|undefined),
          *     wrapX: (boolean|undefined),
          *     source: (ol.source.Vector|undefined)}}
          */
         interface ModifyOptions {
             condition?: ol.EventsConditionType;
             deleteCondition?: ol.EventsConditionType;
+            insertVertexCondition?: ol.EventsConditionType;
             pixelTolerance?: number;
             style?: (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
-            features: ol.Collection<ol.Feature>;
+            features?: ol.Collection<ol.Feature>;
             wrapX?: boolean;
-            source?: ol.source.Vector;            
+            source?: ol.source.Vector;
         }
 
 
@@ -13412,7 +14043,7 @@ declare module olx {
             hidpi?: boolean;
             logo?: (string | olx.LogoOptions);
             tileGrid?: ol.tilegrid.TileGrid;
-            projection: ol.ProjectionLike;
+            projection?: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
             serverType?: (ol.source.wms.ServerType | string);
             tileLoadFunction?: ol.TileLoadFunctionType;
@@ -13873,6 +14504,13 @@ declare module olx {
         maxLines?: number;
         strokeStyle?: ol.style.Stroke;
         targetSize?: number;
+        showLabels?: boolean;
+        lonLabelFormatter?: ((lon: number) => string);
+        latLabelFormatter?: ((lat: number) => string);
+        lonLabelPosition?: number;
+        latLabelPosition?: number;
+        lonLabelStyle?: ol.style.Text;
+        latLabelStyle?: ol.style.Text;
     }
 
 
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index 29d763344a..666b7b746f 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -558,6 +558,12 @@ let tileWMS: ol.source.TileWMS = new ol.source.TileWMS({
     url: stringValue
 });
 
+//test without projection
+tileWMS = new ol.source.TileWMS({
+    params: {},
+    serverType: stringValue,
+    url: stringValue
+});
 voidValue = tileWMS.updateParams(tileWMS.getParams());
 stringValue = tileWMS.getGetFeatureInfoUrl([0, 0], 1, "EPSG:4326", {});
 
@@ -699,11 +705,112 @@ jsonValue = geojsonFormat.writeFeaturesObject(featureArray, writeOptions);
 jsonValue = geojsonFormat.writeGeometryObject(geometry);
 jsonValue = geojsonFormat.writeGeometryObject(geometry, writeOptions);
 
+//
+// ol.format.filter
+//
+
+let bboxFilter: ol.format.filter.Bbox;
+bboxFilter = new ol.format.filter.Bbox("geometry", extent);
+bboxFilter = new ol.format.filter.Bbox("geometry", extent, "srs");
+bboxFilter = ol.format.filter.bbox("geometry", extent);
+bboxFilter = ol.format.filter.bbox("geometry", extent, "srs");
+
+let equalToFilter: ol.format.filter.EqualTo;
+equalToFilter = new ol.format.filter.EqualTo("property", "abc");
+equalToFilter = new ol.format.filter.EqualTo("property", "abc", true);
+equalToFilter = new ol.format.filter.EqualTo("property", 123);
+equalToFilter = new ol.format.filter.EqualTo("property", 123, true);
+equalToFilter = ol.format.filter.equalTo("property", "abc");
+equalToFilter = ol.format.filter.equalTo("property", "abc", true);
+equalToFilter = ol.format.filter.equalTo("property", 123);
+equalToFilter = ol.format.filter.equalTo("property", 123, true);
+
+let greaterThanFilter: ol.format.filter.GreaterThan;
+greaterThanFilter = new ol.format.filter.GreaterThan("property", 123);
+greaterThanFilter = ol.format.filter.greaterThan("property", 123);
+
+let greaterThanEqualToFilter: ol.format.filter.GreaterThanOrEqualTo;
+greaterThanEqualToFilter = new ol.format.filter.GreaterThanOrEqualTo("property", 123);
+greaterThanEqualToFilter = ol.format.filter.greaterThanOrEqualTo("property", 123);
+
+let lessThanFilter: ol.format.filter.LessThan;
+lessThanFilter = new ol.format.filter.LessThan("property", 123);
+lessThanFilter = ol.format.filter.lessThan("property", 123);
+
+let lessThanEqualToFilter: ol.format.filter.LessThanOrEqualTo;
+lessThanEqualToFilter = new ol.format.filter.LessThanOrEqualTo("property", 123);
+lessThanEqualToFilter = ol.format.filter.lessThanOrEqualTo("property", 123);
+
+let notEqualToFilter: ol.format.filter.NotEqualTo;
+notEqualToFilter = new ol.format.filter.NotEqualTo("property", "abc");
+notEqualToFilter = new ol.format.filter.NotEqualTo("property", "abc", true);
+notEqualToFilter = new ol.format.filter.NotEqualTo("property", 123);
+notEqualToFilter = new ol.format.filter.NotEqualTo("property", 123, true);
+notEqualToFilter = ol.format.filter.notEqualTo("property", "abc");
+notEqualToFilter = ol.format.filter.notEqualTo("property", "abc", true);
+notEqualToFilter = ol.format.filter.notEqualTo("property", 123);
+notEqualToFilter = ol.format.filter.notEqualTo("property", 123, true);
+
+let duringFilter: ol.format.filter.During;
+duringFilter = new ol.format.filter.During("property", "2017-01-01T12:00Z", "2017-01-01T14:00Z");
+duringFilter = ol.format.filter.during("property", "2017-01-01T12:00Z", "2017-01-01T14:00Z");
+
+let isBetweenFilter: ol.format.filter.IsBetween;
+isBetweenFilter = new ol.format.filter.IsBetween("property", 1, 10);
+isBetweenFilter = ol.format.filter.between("property", 1, 10);
+
+let isLikeFilter: ol.format.filter.IsLike;
+isLikeFilter = new ol.format.filter.IsLike("property", "pattern");
+isLikeFilter = new ol.format.filter.IsLike("property", "pattern", "wildcard");
+isLikeFilter = new ol.format.filter.IsLike("property", "pattern", "wildcard", "s");
+isLikeFilter = new ol.format.filter.IsLike("property", "pattern", "wildcard", "s", "e");
+isLikeFilter = new ol.format.filter.IsLike("property", "pattern", "wildcard", "s", "e", true);
+isLikeFilter = ol.format.filter.like("property", "pattern");
+isLikeFilter = ol.format.filter.like("property", "pattern", "wildcard");
+isLikeFilter = ol.format.filter.like("property", "pattern", "wildcard", "s");
+isLikeFilter = ol.format.filter.like("property", "pattern", "wildcard", "s", "e");
+isLikeFilter = ol.format.filter.like("property", "pattern", "wildcard", "s", "e", true);
+
+let isNullFilter: ol.format.filter.IsNull;
+isNullFilter = new ol.format.filter.IsNull("property");
+isNullFilter = ol.format.filter.isNull("property");
+
+let andFilter: ol.format.filter.And;
+andFilter = new ol.format.filter.And(isNullFilter, duringFilter);
+andFilter = ol.format.filter.and(isNullFilter, duringFilter);
+
+let orFilter: ol.format.filter.Or;
+orFilter = new ol.format.filter.Or(isNullFilter, duringFilter);
+orFilter = ol.format.filter.or(isNullFilter, duringFilter);
+
+let notFilter: ol.format.filter.Not;
+notFilter = new ol.format.filter.Not(isBetweenFilter);
+notFilter = ol.format.filter.not(isBetweenFilter);
+
+let intersectsFilter: ol.format.filter.Intersects;
+intersectsFilter = new ol.format.filter.Intersects("geometry", geometry);
+intersectsFilter = new ol.format.filter.Intersects("geometry", geometry, "srs");
+intersectsFilter = ol.format.filter.intersects("geometry", geometry);
+intersectsFilter = ol.format.filter.intersects("geometry", geometry, "srs");
+
+let withinFilter: ol.format.filter.Within;
+withinFilter = new ol.format.filter.Within("geometry", geometry);
+withinFilter = new ol.format.filter.Within("geometry", geometry, "srs");
+withinFilter = ol.format.filter.within("geometry", geometry);
+withinFilter = ol.format.filter.within("geometry", geometry, "srs");
+
 //
 // ol.interactions
 //
-let modify: ol.interaction.Modify = new ol.interaction.Modify({
-    features: new ol.Collection<ol.Feature>(featureArray)
+let modifyFeature: ol.interaction.Modify = new ol.interaction.Modify({
+    insertVertexCondition: ol.events.condition.never,
+    features: new ol.Collection<ol.Feature>(featureArray),
+});
+let modifySource: ol.interaction.Modify = new ol.interaction.Modify({
+    insertVertexCondition: ol.events.condition.never,
+    source: new ol.source.Vector({
+        features: new ol.Collection<ol.Feature>(featureArray),
+    }),
 });
 
 let draw: ol.interaction.Draw = new ol.interaction.Draw({
@@ -811,4 +918,4 @@ numberValue = ol.Sphere.getArea(geometry, {
 numberValue = ol.Sphere.getLength(geometry, {
     projection: projection,
     radius: numberValue,
-});
\ No newline at end of file
+});
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/openlayers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/openlayers/v2/tslint.json b/types/openlayers/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/openlayers/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/openlayers/v3/tslint.json b/types/openlayers/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/openlayers/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index 91b8dc2ca6..79e92daa7f 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -3,120 +3,119 @@
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace openpgp {
+export as namespace openpgp;
 
-    interface KeyPair {
-        key: key.Key,
-        privateKeyArmored: string,
-        publicKeyArmored: string
-    }
-
-    interface KeyOptions {
-        keyType?: enums.publicKey,
-        numBits: number,
-        userId: string,
-        passphrase: string,
-        unlocked?: boolean
-    }
-
-    interface Keyid {
-        bytes: string,
-    }
-
-    interface Signature {
-        keyid: Keyid,
-        valid: boolean
-    }
-
-    interface VerifiedMessage {
-        text: string,
-        signatures: Array<Signature>
-    }
-
-    /** Decrypts message and verifies signatures
-
-        @param privateKey private key with decrypted secret key data
-        @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>;
-    /** 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>;
-
-    /** 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>;
-
-    /** 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>;
-    /** 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>;
-
-    /** Generates a new OpenPGP key pair. Currently only supports RSA keys. Primary and subkey will be of same type.
-        @param options
-     */
-    function generateKeyPair(options: KeyOptions): Promise<KeyPair>;
-
-    /** Signs message text and encrypts it
-
-        @param publicKeys array of keys 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(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>;
-
-    /** 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>;
-    /** 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>;
-
-    /** Verifies signatures of cleartext signed message
-
-        @param publicKeys array of keys to verify signatures
-        @param msg cleartext message object with signatures
-     */
-    function verifyClearSignedMessage(publicKeys: Array<key.Key>, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
-    /** Verifies signatures of cleartext signed message
-
-        @param publicKeys single key to verify signatures
-        @param msg cleartext message object with signatures
-     */
-    function verifyClearSignedMessage(publicKey: key.Key, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
+export interface KeyPair {
+    key: key.Key,
+    privateKeyArmored: string,
+    publicKeyArmored: string
 }
 
-declare namespace openpgp.armor {
+export interface KeyOptions {
+    keyType?: enums.publicKey,
+    numBits: number,
+    userId: string,
+    passphrase: string,
+    unlocked?: boolean
+}
 
+export interface Keyid {
+    bytes: string,
+}
+
+export interface Signature {
+    keyid: Keyid,
+    valid: boolean
+}
+
+export interface VerifiedMessage {
+    text: string,
+    signatures: Array<Signature>
+}
+
+/** Decrypts message and verifies signatures
+
+    @param privateKey private key with decrypted secret key data
+    @param publicKeys array of keys to verify signatures
+    @param msg the message object with signed and encrypted data
+    */
+export 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
+    */
+export 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
+    */
+export 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
+    */
+export 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
+    */
+export 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
+    */
+export function generateKeyPair(options: KeyOptions): Promise<KeyPair>;
+
+/** Signs message text and encrypts it
+
+    @param publicKeys array of keys 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
+    */
+export 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
+    */
+export 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
+    */
+export 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
+    */
+export function signClearMessage(privateKey: key.Key, text: string): Promise<string>;
+
+/** Verifies signatures of cleartext signed message
+
+    @param publicKeys array of keys to verify signatures
+    @param msg cleartext message object with signatures
+    */
+export function verifyClearSignedMessage(publicKeys: Array<key.Key>, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
+/** Verifies signatures of cleartext signed message
+
+    @param publicKeys single key to verify signatures
+    @param msg cleartext message object with signatures
+    */
+export function verifyClearSignedMessage(publicKey: key.Key, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
+
+
+export namespace armor {
     /** Armor an OpenPGP binary packet block
 
         @param messagetype type of the message
@@ -133,8 +132,7 @@ declare namespace openpgp.armor {
     function dearmor(text: string): Object;
 }
 
-declare namespace openpgp.cleartext {
-
+export namespace cleartext {
     /** Class that represents an OpenPGP cleartext signed message.
      */
     interface CleartextMessage {
@@ -164,7 +162,7 @@ declare namespace openpgp.cleartext {
     function readArmored(armoredText: string): CleartextMessage;
 }
 
-declare namespace openpgp.config {
+export namespace config {
     var prefer_hash_algorithm: enums.hash;
     var encryption_cipher: enums.symmetric;
     var compression: enums.compression;
@@ -175,7 +173,7 @@ declare namespace openpgp.config {
     var debug: boolean;
 }
 
-declare namespace openpgp.crypto {
+export namespace crypto {
     interface Mpi {
         data: number,
         read(input: string): number,
@@ -211,92 +209,92 @@ declare namespace openpgp.crypto {
         @param data Data to be encrypted as MPI
      */
     function publicKeyEncrypt(algo: enums.publicKey, publicMPIs: Array<Mpi>, data: Mpi): Array<Mpi>;
+
+
+    namespace cfb {
+        /** This function decrypts a given plaintext using the specified blockcipher to decrypt a message
+            @param cipherfn the algorithm cipher class to decrypt data in one block_size encryption
+            @param key binary string representation of key to be used to decrypt the ciphertext. This will be passed to the cipherfn
+            @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;
+
+        /** 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
+            @param plaintext data to be encrypted provided as a string
+            @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;
+
+        /** 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;
+    }
+
+    namespace hash {
+        /** Create a hash on the specified data using the specified algorithm
+            @param algo Hash algorithm type
+            @param data Data to be hashed
+        */
+        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;
+    }
+
+    namespace random {
+        /** Create a secure random big integer of bits length
+            @param bits Bit length of the MPI to create
+        */
+        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;
+
+        /** Helper routine which calls platform specific crypto random generator
+            @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;
+    }
+
+    namespace signature {
+        /** Create a signature on data using the specified algorithm
+            @param hash_algo hash Algorithm to use
+            @param algo Asymmetric cipher algorithm to use
+            @param publicMPIs Public key multiprecision integers of the private key
+            @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;
+
+        /**
+            @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;
+    }
 }
 
-declare namespace openpgp.crypto.cfb {
-    /** This function decrypts a given plaintext using the specified blockcipher to decrypt a message
-        @param cipherfn the algorithm cipher class to decrypt data in one block_size encryption
-        @param key binary string representation of key to be used to decrypt the ciphertext. This will be passed to the cipherfn
-        @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;
-
-    /** 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
-        @param plaintext data to be encrypted provided as a string
-        @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;
-
-    /** 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;
-}
-
-declare namespace openpgp.crypto.hash {
-    /** Create a hash on the specified data using the specified algorithm
-        @param algo Hash algorithm type
-        @param data Data to be hashed
-     */
-    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;
-}
-
-declare namespace 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;
-
-    /** Retrieve secure random byte string of the specified length
-        @param length Length in bytes to generate
-     */
-    function getRandomBytes(length: number): string;
-
-    /** Helper routine which calls platform specific crypto random generator
-        @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;
-}
-
-declare namespace openpgp.crypto.signature {
-    /** Create a signature on data using the specified algorithm
-        @param hash_algo hash Algorithm to use
-        @param algo Asymmetric cipher algorithm to use
-        @param publicMPIs Public key multiprecision integers of the private key
-        @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;
-
-    /**
-        @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;
-}
-
-declare namespace openpgp.enums {
-
+export namespace enums {
     enum armor {
         multipart_section,
         multipart_last,
@@ -372,8 +370,7 @@ declare namespace openpgp.enums {
     }
 }
 
-declare namespace openpgp.key {
-
+export namespace key {
     interface KeyResult {
         keys: Array<Key>,
         err: Array<Error>
@@ -408,10 +405,9 @@ declare namespace openpgp.key {
         @param armoredText text to be parsed
      */
     function readArmored(armoredText: string): KeyResult;
-
 }
 
-declare namespace openpgp.message {
+export namespace message {
     /** Class that represents an OpenPGP message. Can be an encrypted message, signed message, compressed message or literal message
      */
     interface Message {
@@ -477,8 +473,7 @@ declare namespace openpgp.message {
     function readArmored(armoredText: string): Message;
 }
 
-declare namespace openpgp.packet {
-
+export namespace packet {
     interface PublicKey {
         algorithm: enums.publicKey;
         created: Date;
@@ -509,7 +504,7 @@ declare namespace openpgp.packet {
     function newPacketFromTag(tag: string): Object;
 }
 
-declare namespace openpgp.util {
+export namespace util {
     /** Convert an array of integers(0.255) to a string
         @param bin An array of (binary) integers to convert
      */
@@ -583,6 +578,4 @@ declare namespace openpgp.util {
         @param bin An array of (binary) integers to convert
      */
     function Uint8Array2str(bin: Uint8Array): string;
-
-
 }
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index a4a4200c56..fbe8a2e691 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -1,5 +1,3 @@
-
-
 // Open PGP Sample codes
 
 var options: openpgp.KeyOptions = {
@@ -125,4 +123,4 @@ openpgp.util.print_debug_hexstr_dump("");
 openpgp.util.shiftRight("", 1);
 openpgp.util.str2bin("");
 openpgp.util.str2Uint8Array("");
-openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array(""));
\ No newline at end of file
+openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array(""));
diff --git a/types/openpgp/tslint.json b/types/openpgp/tslint.json
new file mode 100644
index 0000000000..3242154128
--- /dev/null
+++ b/types/openpgp/tslint.json
@@ -0,0 +1,22 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "array-type": false,
+        "ban-types": false,
+        "dt-header": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "no-consecutive-blank-lines": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-var-keyword": false,
+        "only-arrow-functions": false,
+        "prefer-const": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "whitespace": false
+    }
+}
\ No newline at end of file
diff --git a/types/opentok/tslint.json b/types/opentok/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/opentok/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/opentype.js/tslint.json b/types/opentype.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/opentype.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/openui5/openui5-tests.ts b/types/openui5/openui5-tests.ts
index bb411a9a1e..495a2a8ed5 100644
--- a/types/openui5/openui5-tests.ts
+++ b/types/openui5/openui5-tests.ts
@@ -11,7 +11,7 @@ sap.ui.getCore().attachInit(function () {
 });
 
 class Ctrl extends sap.ui.core.mvc.Controller {
-    constructor(private JSONModel: typeof sap.ui.model.json.JSONModel) {
+    constructor(private readonly JSONModel: typeof sap.ui.model.json.JSONModel) {
         super(undefined);
     }
 
diff --git a/types/openui5/tslint.json b/types/openui5/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/openui5/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/opn/index.d.ts b/types/opn/index.d.ts
index 78a1043442..2a7c5afe25 100644
--- a/types/opn/index.d.ts
+++ b/types/opn/index.d.ts
@@ -1,80 +1,52 @@
-// Type definitions for opn 3.0.2
+// Type definitions for opn 5.1
 // Project: https://github.com/sindresorhus/opn
 // Definitions by: Shinnosuke Watanabe <https://github.com/shinnn>,
-//                 Maxime LUCE <https://github.com/SomaticIT>
+//                 Maxime LUCE <https://github.com/SomaticIT>,
+//                 Tommy Lent <https://github.com/tlent>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-import * as cp from "child_process";
+import * as cp from 'child_process';
 
-interface DefaultFunction {
-    /**
-     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-     * 
-     * Returns the spawned child process. 
-     * You'd normally not need to use this for anything, but it can be useful if you'd like 
-     * to attach custom event listeners or perform other operations directly on the spawned process.
-     * 
-* @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-     */
-    (target: string): cp.ChildProcess;
-
-    /**
-     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-     * 
-     * Returns the spawned child process. 
-     * You'd normally not need to use this for anything, but it can be useful if you'd like 
-     * to attach custom event listeners or perform other operations directly on the spawned process.
-     * 
- * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-     * @param callback- Called when the opened app exits, or if `wait: false`, immediately when opening.
-     */
-    (target: string, callback: (err: Error) => void): cp.ChildProcess;
-
-    /**
-     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-     * 
-     * Returns the spawned child process. 
-     * You'd normally not need to use this for anything, but it can be useful if you'd like 
-     * to attach custom event listeners or perform other operations directly on the spawned process.
-     * 
-     * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-     * @param options - Options to be passed to opn.
-     */
-    (target: string, options: Opn.Options): cp.ChildProcess;
-
-    /**
-     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-     * 
-     * Returns the spawned child process. 
-     * You'd normally not need to use this for anything, but it can be useful if you'd like 
-     * to attach custom event listeners or perform other operations directly on the spawned process.
-     * 
-     * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-     * @param options - Options to be passed to opn.
-     * @param callback- Called when the opened app exits, or if `wait: false`, immediately when opening.
-     */
-    (target: string, options: Opn.Options, callback: (err: Error) => void): cp.ChildProcess;
-}
-
-declare var opn: DefaultFunction;
+/* Note that ES6 modules cannot directly export callable functions.
+ * This file should be imported using the CommonJS-style:
+ *   import x = require('opn');
+ */
 export = opn;
 
+/**
+ * Uses the command `open` on OS X, `start` on Windows and `xdg-open` on other platforms.
+ *
+ * Returns a promise for the spawned child process. You would normally not need to use this for
+ * anything, but it can be useful if you'd like to attach custom event listeners or perform
+ * other operations directly on the spawned process.
+ *
+ * @param target The thing you want to open. Can be a URL, file, or executable.
+ *     Opens in the default app for the file type. For example, URLs open in your default
+ *     browser.
+ * @param options Options to be passed to opn.
+ */
+declare function opn(
+    target: string,
+    options?: Opn.Options
+): Promise<cp.ChildProcess>;
+
 declare namespace Opn {
-    export interface Options {
+    interface Options {
         /**
-         * Wait for the opened app to exit before calling the `callback`. 
-         * If `false` it's called immediately when opening the app.
+         * Wait for the opened app to exit before fulfilling the promise.
+         * If `false` it's fulfilled immediately when opening the app.
          * On Windows you have to explicitly specify an app for it to be able to wait.
+         * Defaults to `true`.
          */
         wait?: boolean;
-        
+
         /**
-         * Specify the app to open the target with, or an array with the app and app arguments.
-         * The app name is platform dependent. Don't hard code it in reusable modules. 
+         * Specify the app to open the `target` with, or an array with the app and app arguments.
+         * The app name is platform dependent. Don't hard code it in reusable modules.
          * Eg. Chrome is `google chrome` on OS X, `google-chrome` on Linux and `chrome` on Windows.
          */
-        app?: string | string[];
+        app?: string | ReadonlyArray<string>;
     }
 }
diff --git a/types/opn/opn-tests.ts b/types/opn/opn-tests.ts
index 33a043de9f..c2956f2546 100644
--- a/types/opn/opn-tests.ts
+++ b/types/opn/opn-tests.ts
@@ -1,18 +1,8 @@
+import opn = require('opn');
 
+opn('foo'); // $ExpectType Promise<ChildProcess>
 
-import * as opn from "opn";
-
-var errorCallback: (err: Error) => void;
-
-opn("foo");
-opn("foo", errorCallback);
-
-opn("foo", { app: "bar" });
-opn("foo", { app: ["bar", "--arg"] });
-opn("foo", { app: "bar", wait: false });
-opn("foo", { app: ["bar", "--arg"] , wait: false});
-
-opn("foo", { app: "bar" }, errorCallback);
-opn("foo", { app: ["bar", "--arg"] }, errorCallback);
-opn("foo", { app: "bar", wait: false }, errorCallback);
-opn("foo", { app: ["bar", "--arg"], wait: false }, errorCallback);
+opn('foo', { app: 'bar' }); // $ExpectType Promise<ChildProcess>
+opn('foo', { app: ['bar', '--arg'] }); // $ExpectType Promise<ChildProcess>
+opn('foo', { app: 'bar', wait: false }); // $ExpectType Promise<ChildProcess>
+opn('foo', { app: ['bar', '--arg'], wait: false }); // $ExpectType Promise<ChildProcess>
diff --git a/types/opn/tsconfig.json b/types/opn/tsconfig.json
index 9c2829989d..2a51fff8ca 100644
--- a/types/opn/tsconfig.json
+++ b/types/opn/tsconfig.json
@@ -1,23 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "opn-tests.ts"
-    ]
-}
\ No newline at end of file
+    "files": ["index.d.ts", "opn-tests.ts"]
+}
diff --git a/types/opn/tslint.json b/types/opn/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/opn/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/optics-agent/index.d.ts b/types/optics-agent/index.d.ts
index 83f7817bb9..2c8ae46283 100644
--- a/types/optics-agent/index.d.ts
+++ b/types/optics-agent/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/apollostack/optics-agent-js#readme
 // Definitions by: Crevil <https://github.com/crevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 import { GraphQLSchema } from "graphql";
 import { Request, Response } from "express";
diff --git a/types/optics-agent/tsconfig.json b/types/optics-agent/tsconfig.json
index 046bfaad81..e7dbc8958b 100644
--- a/types/optics-agent/tsconfig.json
+++ b/types/optics-agent/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "optics-agent-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/optimist/tslint.json b/types/optimist/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/optimist/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ora/v0/tslint.json b/types/ora/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ora/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/oracledb/index.d.ts b/types/oracledb/index.d.ts
index 17ade85591..39907702dc 100644
--- a/types/oracledb/index.d.ts
+++ b/types/oracledb/index.d.ts
@@ -481,7 +481,6 @@ declare namespace oracledb {
 		terminate(): IPromise<void>;
 	}
 
-	/* tslint:disable no-unused-variable */
 	const DEFAULT: number;
 	/** Metadata return type */
 	const DB_TYPE_VARCHAR: number;
@@ -539,7 +538,6 @@ declare namespace oracledb {
 	 */
 	function newLob(iLob: ILob): Lob;
 
-	/* tslint:disable no-var-keyword */
 	/** Default transaction behaviour of auto commit for each statement. */
 	var autoCommit: boolean;
 	/**
diff --git a/types/oracledb/tslint.json b/types/oracledb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/oracledb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/orchestrator/index.d.ts b/types/orchestrator/index.d.ts
index fcb1a16120..780c3815c5 100644
--- a/types/orchestrator/index.d.ts
+++ b/types/orchestrator/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/orchestrator/orchestrator
 // Definitions by: Qubo <https://github.com/tkQubo>, TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/orchestrator/orchestrator-tests.ts b/types/orchestrator/orchestrator-tests.ts
index 13e9bb19e0..964369098b 100644
--- a/types/orchestrator/orchestrator-tests.ts
+++ b/types/orchestrator/orchestrator-tests.ts
@@ -4,7 +4,7 @@ import stream = require("stream");
 import Q = require('q');
 import Orchestrator = require('orchestrator');
 
-var orchestrator = new Orchestrator();
+const orchestrator = new Orchestrator();
 
 // API:
 
@@ -21,13 +21,13 @@ orchestrator.add('mytask', ['array', 'of', 'task', 'names'], function() {
     // Do stuff
 });
 orchestrator.add('thing2', function(callback){
-    var err: any = null;
+    const err: any = null;
     // do stuff
     callback(err);
 });
 
 orchestrator.add('thing3', function(){
-    var deferred = Q.defer<void>();
+    const deferred = Q.defer<void>();
 
     // do async stuff
     setTimeout(function() {
@@ -38,7 +38,7 @@ orchestrator.add('thing3', function(){
 });
 
 orchestrator.add('thing4', function(){
-    var stm = new stream.Stream();
+    const stm = new stream.Stream();
     // do stream stuff
     return stm;
 });
@@ -61,7 +61,7 @@ orchestrator.task('task3', ['task1', 'task2'], function() {
 // orchestrator.hasTask(name);
 //
 
-var hasThing1: boolean = orchestrator.hasTask('thing1');
+const hasThing1: boolean = orchestrator.hasTask('thing1');
 
 //
 // orchestrator.start(tasks...[, cb]);
@@ -70,7 +70,7 @@ var hasThing1: boolean = orchestrator.hasTask('thing1');
 orchestrator.start('thing1', 'thing2', 'thing3', 'thing4', function(err: any) {
     // all done
 }).start(['thing1', 'thing2'], ['thing3', 'thing4'], "thing5", function(err) {
-    var res: any = err;
+    const res: any = err;
 });
 
 //
@@ -90,14 +90,14 @@ orchestrator.reset();
 //
 
 orchestrator.on('task_start', function(e) {
-    var message: string = e.message;
-    var task: string = e.task;
-    var err: any = e.err;
+    const message: string = e.message;
+    const task: string = e.task;
+    const err: any = e.err;
 });
 orchestrator.on('task_stop', function(e) {
-    var message: string = e.message;
-    var task: string = e.task;
-    var duration: number = e.duration;
+    const message: string = e.message;
+    const task: string = e.task;
+    const duration: number = e.duration;
 });
 
 //
@@ -105,8 +105,8 @@ orchestrator.on('task_stop', function(e) {
 //
 
 orchestrator.onAll(function(e) {
-    var message: string = e.message;
-    var task: string = e.task;
-    var err: any = e.err;
-    var src: string = e.src;
+    const message: string = e.message;
+    const task: string = e.task;
+    const err: any = e.err;
+    const src: string = e.src;
 });
diff --git a/types/orchestrator/tsconfig.json b/types/orchestrator/tsconfig.json
index 734b3aae82..3cfb6b0cdb 100644
--- a/types/orchestrator/tsconfig.json
+++ b/types/orchestrator/tsconfig.json
@@ -5,20 +5,15 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/orchestrator/tslint.json b/types/orchestrator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/orchestrator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/orientjs/index.d.ts b/types/orientjs/index.d.ts
index e57fc8d076..19f615efd0 100644
--- a/types/orientjs/index.d.ts
+++ b/types/orientjs/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/orientechnologies/orientjs
 // Definitions by: [Saeed Tabrizi] <https://github.com/saeedtabrizi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
 // Last Update  : 20-7-2017
 // Compatible with Orientdb >= 2.2.15 and orientjs >= 2.2.x features .
 // Developed with love in www.nowcando.com
@@ -27,18 +29,18 @@ import Promise = require('bluebird');
     });
  =============================================== */
 
-/**  A lightweight definiton for orientjs module, Official node.js driver for OrientDB.
+/**
+ * A lightweight definiton for orientjs module, Official node.js driver for OrientDB.
  *
  * @description Official node.js driver for OrientDB. Fast, lightweight, uses the binary protocol.
  *
  * @author Saeed Tabrizi (saeed a_t nowcando.com)
  * @version 3.0.1
- *
  */
 
 /**
  * Make a orientdb server client in binary protocol  .
- * @param {orientjs.ServerConfig} config The configuration for server connection.
+ * @param config The configuration for server connection.
  */
 declare function orientjs(config: orientjs.ServerConfig): orientjs.Server;
 declare namespace orientjs {
@@ -110,7 +112,7 @@ declare namespace orientjs {
             /**
              * # Migration Manager
              *
-             * @param {Object} config The configuration for the migration manager.
+             * @param config The configuration for the migration manager.
              */
             constructor(config?: MigrationManagerConfig);
 
@@ -123,14 +125,14 @@ declare namespace orientjs {
             /**
              * Create a new migration.
              *
-             * @param   {string|Object} config  The name or configuration for the new migration.
+             * @param   config  The name or configuration for the new migration.
              * @promise {string}                The full path to the created migration.
              */
             create(param: string): Promise<string>;
             /**
              * Generate the content for a migration.
-             * @param  {Object} config The configuration object.
-             * @return {string}        The generated JavaScript source code.
+             * @param  config The configuration object.
+             * @return        The generated JavaScript source code.
              */
             generateMigration(config: any): string;
             /**
@@ -160,35 +162,35 @@ declare namespace orientjs {
             /**
              * Perform the migration.
              *
-             * @param   {Integer} limit The maximum number of migrations to apply, if any.
+             * @param   limit The maximum number of migrations to apply, if any.
              * @promise {Mixed} The result of the migration.
              */
             up(limit?: number): Promise<any>;
             /**
              * Revert the migration.
              *
-             * @param   {Integer} limit The maximum number of migrations to revert, if any.
+             * @param   limit The maximum number of migrations to revert, if any.
              * @promise {Mixed} The result of the migration.
              */
             down(limit?: number): Promise<any>;
             /**
              * Load the migration with the given name.
              *
-             * @param  {string}    name The name of the migation.
-             * @return {Migration}      The loaded migration instance.
+             * @param     name The name of the migation.
+             * @return      The loaded migration instance.
              */
             loadMigration(name: string): Migration;
             /**
              * Apply the migration with the given name.
              *
-             * @param   {string} name The name of the migation.
+             * @param   name The name of the migation.
              * @promise {Mixed} The result of the migration.
              */
             applyMigration(name: string): Promise<any>;
             /**
              * Revert the migration with the given name.
              *
-             * @param   {string} name The name of the migation.
+             * @param   name The name of the migation.
              * @promise {Mixed} The result of the migration.
              */
             revertMigration(name: string): Promise<any>;
@@ -218,22 +220,22 @@ declare namespace orientjs {
         /**
          * Get the value of the given custom field.
          *
-         * @param  {string} key The name of the field to get.
-         * @return {Mixed}      The field value, or undefined if it doesn't exist.
+         * @param  key The name of the field to get.
+         * @return      The field value, or undefined if it doesn't exist.
          */
         get(key: string): CustomField;
         /**
          * Set a custom field.
          *
-         * @param   {string|Object} key   The key to set, or map of keys to values.
-         * @param   {string}        value The value to set, if `key` is not an object.
+         * @param   key   The key to set, or map of keys to values.
+         * @param          value The value to set, if `key` is not an object.
          * @promise {Object|null}         The new set of custom fields, or null if none are present.
          */
         set(key: string, value: any): CustomField;
         /**
          * Unset the custom field with the given name,
          *
-         * @param   {string}      key The name of the custom field to remove.
+         * @param        key The name of the custom field to remove.
          * @promise {Object|null}     The new set of custom fields, or null if none are present.
          */
         unset(key: string): CustomField;
@@ -301,8 +303,8 @@ declare namespace orientjs {
         /**
          * Create a new property.
          *
-         * @param  {string|Object} config The property name or configuration.
-         * @param   {Boolean} reload      Whether to reload the property, default to true.
+         * @param  config The property name or configuration.
+         * @param   reload      Whether to reload the property, default to true.
          * @promise {Object}              The created property.
          */
         create(config?: PropertyCreateConfig | string, reload?: boolean): Promise<Property>;
@@ -310,15 +312,15 @@ declare namespace orientjs {
         /**
          * Get the property with the given name.
          *
-         * @param   {string} name   The property to get.
+         * @param   name   The property to get.
          * @promise {Object|null}   The retrieved property.
          */
         get(name: string): Promise<Property>;
         /**
          * Update the given property.
          *
-         * @param   {Object}  property The property settings.
-         * @param   {Boolean} reload   Whether to reload the property, default to true.
+         * @param    property The property settings.
+         * @param   reload   Whether to reload the property, default to true.
          * @promise {Object}           The updated property.
          */
         update(config: PropertyUpdateConfig, reload?: boolean): Promise<Property>;
@@ -332,7 +334,7 @@ declare namespace orientjs {
 
     /**
      * The class constructor.
-     * @param {Object} config The configuration for the class
+     * @param config The configuration for the class
      */
     class Class {
         db?: Db;
@@ -344,48 +346,48 @@ declare namespace orientjs {
         clusterIds?: number[];
         /**
          * Configure the class instance.
-         * @param  {Object} config The configuration object.
+         * @param  config The configuration object.
          */
         configure(config?: any): void;
         /**
          * Retreive a list of classes from the database.
          *
-         * @param  {Boolean} refresh Whether to refresh the list or not.
+         * @param  refresh Whether to refresh the list or not.
          * @promise {Object[]}       An array of class objects.
          */
         list(limit: number | boolean | any, offset?: number): Promise<Class[]>;
         /**
          * Find a list of records in the class.
          *
-         * @param  {Object}  attributes The attributes to search with.
-         * @param  {Integer} limit      The maximum number of records to return
-         * @param  {Integer} offset     The offset to start returning records from.
+         * @param   attributes The attributes to search with.
+         * @param  limit      The maximum number of records to return
+         * @param  offset     The offset to start returning records from.
          * @promise {Object[]}          An array of records in the class.
          */
         find(attributes: any, limit?: number, offset?: number): Promise<Record[]>;
         /**
          * Create a record for this class.
          *
-         * @param   {Object} record The record to create.
+         * @param   record The record to create.
          * @promise {Object}        The created record.
          */
         create(record: Record): Promise<Record>;
         /**
          * Create a new class.
          *
-         * @param  {string} name            The name of the class to create.
-         * @param  {string} parentName      The name of the parent to extend, if any.
-         * @param  {string|Integer} cluster The cluster name or id.
-         * @param  {Boolean} isAbstract     The flag for the abstract class
-         * @param  {Boolean} ifnotexist     The flag for the if not exist class
+         * @param  name            The name of the class to create.
+         * @param  parentName      The name of the parent to extend, if any.
+         * @param  cluster The cluster name or id.
+         * @param  isAbstract     The flag for the abstract class
+         * @param  ifnotexist     The flag for the if not exist class
          * @promise {Object}                The created class object
          */
         create(name: string, parentName?: string, cluster?: string, isAbstract?: boolean, ifnotexist?: boolean): Promise<Class>;
         /**
          * Update the given class.
          *
-         * @param   {Object}  class    The class settings.
-         * @param   {Boolean} reload   Whether to reload the class, default to true.
+         * @param    class    The class settings.
+         * @param   reload   Whether to reload the class, default to true.
          * @promise {Object}           The updated class.
          */
         update(cls: any, reload: boolean): Promise<Class>;
@@ -398,8 +400,8 @@ declare namespace orientjs {
         /**
          * Delete a class.
          *
-         * @param  {string} name The name of the class to delete.
-         * @param  {Object} config The config.
+         * @param  name The name of the class to delete.
+         * @param  config The config.
          * @promise {Db}         The database instance.
          */
         drop(name: string, config?: {
@@ -409,16 +411,16 @@ declare namespace orientjs {
         /**
          * Get a class by name.
          *
-         * @param   {Integer|string} name The name of the class.
-         * @param   {Boolean} refresh Whether to refresh the data, defaults to false.
+         * @param   name The name of the class.
+         * @param   refresh Whether to refresh the data, defaults to false.
          * @promise {Object}          The class object if it exists.
          */
         get(name: string, refresh?: boolean): Promise<Class>;
         /**
          * Cache the given class data for fast lookup later.
          *
-         * @param  {Object[]} classes The class objects to cache.
-         * @return {Db}                The db instance.
+         * @param  classes The class objects to cache.
+         * @return                The db instance.
          */
         cacheData(classes: Class[]): Db;
         property: Property;
@@ -440,7 +442,7 @@ declare namespace orientjs {
 
     /**
      * The sequence constructor.
-     * @param {Object} config The configuration for the sequence
+     * @param config The configuration for the sequence
      */
     class Sequence {
         db?: Db;
@@ -452,13 +454,13 @@ declare namespace orientjs {
         cache?: number;
         /**
          * Configure the sequence instance.
-         * @param  {Object} config The configuration object.
+         * @param  config The configuration object.
          */
         configure(config?: any): void;
         /**
          * Retreive a list of sequences from the database.
          *
-         * @param  {Boolean} refresh Whether to refresh the list or not.
+         * @param  refresh Whether to refresh the list or not.
          * @promise {Object[]}       An array of class objects.
          */
 
@@ -467,21 +469,21 @@ declare namespace orientjs {
         /**
          * Create a new sequence.
          *
-         * @param  {string} name            The name of the sequence to create.
-         * @param  {string} type      The type of sequence.
-         * @param  {Integer} start The start number.
-         * @param  {Integer} incerement The increment number.
-         * @param  {Integer} cache     The cache number
+         * @param  name            The name of the sequence to create.
+         * @param  type      The type of sequence.
+         * @param  start The start number.
+         * @param  incerement The increment number.
+         * @param  cache     The cache number
          * @promise {Object}                The created sequence object
          */
         create(name: string, type: "ORDERED" | "CACHED", start?: number, incerement?: number, cache?: number): Promise<Sequence>;
         /**
          * update a  sequence.
          *
-         * @param  {string} name            The name of the sequence to create.
-         * @param {Integer} incerement The increment number.
-         * @param {Integer} cache The cache number
-         * @param  {Integer} start The start number.
+         * @param  name            The name of the sequence to create.
+         * @param incerement The increment number.
+         * @param cache The cache number
+         * @param  start The start number.
          * @promise {Object} The created sequence object
          */
         update(name: string, start?: number, incerement?: number, cache?: number): Promise<Sequence>;
@@ -494,8 +496,8 @@ declare namespace orientjs {
         /**
          * Delete a sequence.
          *
-         * @param  {string} name The name of the sequence to delete.
-         * @param  {Object} config The config.
+         * @param  name The name of the sequence to delete.
+         * @param  config The config.
          * @promise {Db}         The database instance.
          */
         drop(name: string, config?: {
@@ -503,16 +505,16 @@ declare namespace orientjs {
         /**
          * Get a sequence by name.
          *
-         * @param   {Integer|string} name The name of the sequence.
-         * @param   {Boolean} refresh Whether to refresh the data, defaults to false.
+         * @param   name The name of the sequence.
+         * @param   refresh Whether to refresh the data, defaults to false.
          * @promise {Object}          The sequence object if it exists.
          */
         get(name: string, refresh?: boolean): Promise<Sequence>;
         /**
          * Cache the given class data for fast lookup later.
          *
-         * @param  {Object[]} sequences The sequence objects to cache.
-         * @return {Db}                The db instance.
+         * @param  sequences The sequence objects to cache.
+         * @return                The db instance.
          */
         cacheData(sequences: Sequence[]): Db;
     }
@@ -533,16 +535,16 @@ declare namespace orientjs {
         /**
          * Insert the given record into the database.
          *
-         * @param  {Object} record  The record to insert.
-         * @param  {Object} options The command options.
+         * @param  record  The record to insert.
+         * @param  options The command options.
          * @promise {Object}        The inserted record.
          */
         create(record: ODocument | Record | BinaryRecord, options?: any): Promise<Record>;
         /**
          * Insert the given record into the database.
          *
-         * @param  {Object} record  The record to insert.
-         * @param  {Object} options The command options.
+         * @param  record  The record to insert.
+         * @param  options The command options.
          * @promise {Object}        The inserted record.
          */
         create(records: ODocument[] | Record[] | BinaryRecord[], options?: any): Promise<Record[]>;
@@ -550,40 +552,40 @@ declare namespace orientjs {
         /**
          * Read the given record.
          *
-         * @param  {Object} record  The record to load.
-         * @param  {Object} options The query options.
+         * @param  record  The record to load.
+         * @param  options The query options.
          * @promise {Object}        The loaded record.
          */
         get(record: Record | RID, options?: any): Promise<Record | Buffer>;
         /**
          * Read the given record.
          *
-         * @param  {Object} records  The record to load.
-         * @param  {Object} options The query options.
+         * @param  records  The record to load.
+         * @param  options The query options.
          * @promise {Object[]}        The loaded record.
          */
         get(records: Record[] | RID[], options?: any): Promise<Record[] | Buffer[]>;
         /**
          * Resolve all references within the given collection of records.
          *
-         * @param  {Object[]} records  The records to resolve.
-         * @return {Object}            The records with references replaced.
+         * @param  records  The records to resolve.
+         * @return            The records with references replaced.
          */
         resolveReferences(records: Record[]): Record[];
 
         /**
          * Read the metadata for the given record.
          *
-         * @param  {Object} record  The record to load.
-         * @param  {Object} options The query options.
+         * @param  record  The record to load.
+         * @param  options The query options.
          * @promise {Object}        The record object with loaded meta data.
          */
         meta(record: Record | RID | string, options?: any): Promise<RecordMeta>;
         /**
          * Read the metadata for the given record.
          *
-         * @param  {Object} record  The record to load.
-         * @param  {Object} options The query options.
+         * @param  record  The record to load.
+         * @param  options The query options.
          * @promise {Object}        The record object with loaded meta data.
          */
         meta(records: Record[] | RID[], options?: any): Promise<RecordMeta[]>;
@@ -591,8 +593,8 @@ declare namespace orientjs {
         /**
          * Update the given record.
          *
-         * @param  {Object} record  The record to update.
-         * @param  {Object} options The query options.
+         * @param  record  The record to update.
+         * @param  options The query options.
          * @promise {Object}        The updated record.
          */
         update(record?: Record | RID, options?: any): Promise<Record>;
@@ -601,8 +603,8 @@ declare namespace orientjs {
         /**
          * Delete the given record.
          *
-         * @param   {string|RID|Object} record  The record or record id to delete.
-         * @param   {Object}            options The query options.
+         * @param   record  The record or record id to delete.
+         * @param              options The query options.
          * @promise {Object}                    The deleted record object.
          */
         delete(record: Record | RID, options?: any): Promise<Record>;
@@ -781,8 +783,8 @@ declare namespace orientjs {
         sequence: Sequence;
         /**
          * Configure the database instance.
-         * @param  {Object} config The configuration for the database.
-         * @return {Db}            The configured database object.
+         * @param  config The configuration for the database.
+         * @return            The configured database object.
          */
         configure(config: DbConfig): Db;
         /**
@@ -805,8 +807,8 @@ declare namespace orientjs {
          * Send the given operation to the server, ensuring the
          * database is open first.
          *
-         * @param  {Integer} operation The operation to send.
-         * @param  {Object} data       The data for the operation.
+         * @param  operation The operation to send.
+         * @param  data       The data for the operation.
          * @promise {Mixed}            The result of the operation.
          */
         send(operation: number, data: any): Promise<any>;
@@ -819,14 +821,14 @@ declare namespace orientjs {
         /**
          * Begin a new transaction.
          *
-         * @return {Transaction} The transaction instance.
+         * @return The transaction instance.
          */
         begin(): Transaction;
         /**
          * Execute an SQL query against the database and retreive the raw, parsed response.
          *
-         * @param   {string} query   The query or command to execute.
-         * @param   {Object} options The options for the query / command.
+         * @param   query   The query or command to execute.
+         * @param   options The options for the query / command.
          * @promise {Mixed}          The results of the query / command.
          */
         exec(query: string, options?: QueryOptions): Promise<any>;
@@ -834,29 +836,29 @@ declare namespace orientjs {
         /**
          * Execute an SQL query against the database and retreive the results
          *
-         * @param   {string} query   The query or command to execute.
-         * @param   {Object} options The options for the query / command.
+         * @param   query   The query or command to execute.
+         * @param   options The options for the query / command.
          * @promise {Mixed}          The results of the query / command.
          */
         query(command: string, options?: QueryOptions): Promise<any>;
         /**
          * Execute a live query against the database
          *
-         * @param   {string} query   The query or command to execute.
-         * @param   {Object} options The options for the query / command.
+         * @param   query   The query or command to execute.
+         * @param   options The options for the query / command.
          * @promise {Mixed}          The token of the live query.
          */
         liveQuery(command: string, options?: QueryOptions): Promise<any>;
         /**
          * Normalize a result, where possible.
-         * @param  {Object} result The result to normalize.
-         * @return {Object}        The normalized result.
+         * @param  result The result to normalize.
+         * @return        The normalized result.
          */
         normalizeResult(result: any): any;
         /**
          * Normalize the content for a result.
-         * @param  {Mixed} content The content to normalize.
-         * @return {Mixed}         The normalized content.
+         * @param  content The content to normalize.
+         * @return         The normalized content.
          */
         normalizeResultContent(content: any): any;
         /**
@@ -864,96 +866,99 @@ declare namespace orientjs {
          * This function will be invoked for each document of the specified class
          * in all future result sets.
          *
-         * @param  {string}   className   The name of the document class.
-         * @param  {Function} transformer The transformer function.
-         * @return {Db}                   The database instance.
+         * @param    className   The name of the document class.
+         * @param  transformer The transformer function.
+         * @return                   The database instance.
          */
         registerTransformer<T>(className: string, transformer: (item: Record) => T): Db;
         /**
          * Transform a document according to its `@class` property, using the registered transformers.
-         * @param  {Object} document The document to transform.
-         * @return {Mixed}           The transformed document.
+         * @param  document The document to transform.
+         * @return           The transformed document.
          */
         transformDocument(document: ODocument): any;
 
         /**
          * Create a query instance for this database.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         createQuery(): Statement;
         /**
          * Create a raw expression.
          *
-         * @return {RawExpression} The raw expression instance.
+         * @return The raw expression instance.
          */
         rawExpression(param: string): RawExpression;
 
-        /** Create a sql Function.
+        /**
+         * Create a sql Function.
          *
-         * @return {SqlFunction} The sql function instance.
+         * @return The sql function instance.
          */
         sqlFunction(options?: any): SqlFunction;
 
         /**
          * Create a create query.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         create(params?: any): Statement;
         create(paramtype: string, paramname: string): Statement;
         /**
          * Create a select query.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         select(params?: any): Statement;
         /**
          * Create a traverse query.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         traverse(params?: any): Statement;
         /**
          * Create an insert query.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         insert(params?: any): Statement;
         /**
          * Create an update query.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         update(params?: any): Statement;
         /**
          * Create a delete query.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         delete(params?: any): Statement;
         /**
          * Create a transactional query.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         let(params?: any): Statement;
         let(name: string, value: string | Statement): Statement;
-        /** Create a transactional query with if.
+        /**
+         * Create a transactional query with if.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         if(condition: SqlExpression, statements: Statement[]): Statement;
-        /** Create a transactional query with if.
+        /**
+         * Create a transactional query with if.
          *
-         * @return {Query} The query instance.
+         * @return The query instance.
          */
         if(condition: SqlExpression, ...statements: Statement[]): Statement;
         /**
          * Escape the given input.
          *
-         * @param  {string} input The input to escape.
-         * @return {string}       The escaped input.
+         * @param  input The input to escape.
+         * @return       The escaped input.
          */
         escape(input: string): string;
         /**
@@ -961,17 +966,17 @@ declare namespace orientjs {
          * The context includes the query builder methods, which will be executed
          * on behalf of the user.
          *
-         * @param  {Buffer|string} token The authentication token.
-         * @return {Object}              The object containing the query builder methods.
+         * @param  token The authentication token.
+         * @return              The object containing the query builder methods.
          */
         createUserContext(token: any): any;
 
         /**
          * Create a orient function from a plain Javascript function
          *
-         * @param   {string} name     The name of the function
-         * @param   {Object} fn       Plain Javascript function to stringify
-         * @param   {Object} options  Not currently used but will be used for 'IDEMPOTENT' arg
+         * @param   name     The name of the function
+         * @param   fn       Plain Javascript function to stringify
+         * @param   options  Not currently used but will be used for 'IDEMPOTENT' arg
          * @promise {Mixed}           The results of the query / command.
          */
         createFn(name: string, fn: (...args: any[]) => any, options?: any): Promise<any>;
@@ -988,7 +993,7 @@ declare namespace orientjs {
      * # Server
      * Represents a connection to an orientdb server.
      *
-     * @param {string|Object} options The server URL, or configuration object
+     * @param options The server URL, or configuration object
      */
     class Server {
         constructor(options?: ServerConfig);
@@ -1002,87 +1007,87 @@ declare namespace orientjs {
         /**
          * Configure the server instance.
          *
-         * @param  {Object} config The configuration for the server.
-         * @return {Server}            The configured server object.
+         * @param  config The configuration for the server.
+         * @return            The configured server object.
          */
         configure(config: ServerConfig): Server;
         /**
          * Configure the transport for the server.
          *
-         * @param  {Object} config The server config.
-         * @return {Server}        The configured server object.
+         * @param  config The server config.
+         * @return        The configured server object.
          */
         configureTransport(config: any): Server;
         /**
          * Configure the logger for the server.
          *
-         * @param  {Object} config The logger config
-         * @return {Server}        The server instance with the configured logger.
+         * @param  config The logger config
+         * @return        The server instance with the configured logger.
          */
         configureLogger(logger: Logger): Server;
         /**
          * Send an operation to the server,
          *
-         * @param  {Integer} operation The id of the operation to send.
-         * @param  {Object} options    The options for the operation.
+         * @param  operation The id of the operation to send.
+         * @param  options    The options for the operation.
          * @promise {Mixed}            The result of the operation.
          */
         send(operation: number, options: any): any;
         /**
          * Close the connection to the server.
          *
-         * @return {Server} the disconnected server instance
+         * @return the disconnected server instance
          */
         close(): Server;
         /**
          * Use the database with the given name / config.
          *
-         * @param  {string | DbConfig} config The database name, or configuration object.
-         * @return {Db}                   The database instance.
+         * @param  config The database name, or configuration object.
+         * @return                   The database instance.
          */
         use(name: string | DbConfig): Db;
         /**
          * Create a database with the given name / config.
          *
-         * @param  {string | DbConfig} config The database name or configuration object.
+         * @param  config The database name or configuration object.
          * @promise {Db}                  The database instance
          */
         create(name: string | DbConfig): Promise<Db>;
         /**
          * Destroy a database with the given name / config.
          *
-         * @param   {string | DbConfig} config The database name or configuration object.
+         * @param   config The database name or configuration object.
          * @promise {Mixed}               The server response.
          */
         drop(name: string | DbConfig): Promise<Db>;
         /**
          * List all the databases on the server.
          *
-         * @return {Db[]} An array of databases.
+         * @return An array of databases.
          */
         list(): Promise<Db[]>;
         /**
          * Determine whether a database exists with the given name.
          *
-         * @param   {string} name        The database name.
-         * @param   {string} storageType The storage type, defaults to `plocal`.
+         * @param   name        The database name.
+         * @param   storageType The storage type, defaults to `plocal`.
          * @promise {Boolean}            true if the database exists.
          */
         exists(name: string, storageType?: string): Promise<boolean>;
         /**
          * Freeze the database with the given name.
          *
-         * @param   {string} name        The database name.
-         * @param   {string} storageType The storage type, defaults to `plocal`.
-         * @return {Object}              The response from the server.
+         * @param   name        The database name.
+         * @param   storageType The storage type, defaults to `plocal`.
+         * @return              The response from the server.
          */
         freeze(name: string, storageType?: string): any;
         /**
          * Release the database with the given name.
          *
-         * @param   {string} name        The database name.
-         * @param   {string} storageType The storage type, defaults to `plocal`.
-         * @return {Object}              The response from the server.
+         * @param   name        The database name.
+         * @param   storageType The storage type, defaults to `plocal`.
+         * @return              The response from the server.
          */
         release(name: string, storageType?: string): any;
 
diff --git a/types/orientjs/tslint.json b/types/orientjs/tslint.json
index 3393f9dcca..bb491510c7 100644
--- a/types/orientjs/tslint.json
+++ b/types/orientjs/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "no-any-union": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/osmosis/index.d.ts b/types/osmosis/index.d.ts
index cb4d197f58..4c03388047 100644
--- a/types/osmosis/index.d.ts
+++ b/types/osmosis/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for osmosis 1.0
+// Type definitions for osmosis 1.1
 // Project: https://github.com/rchipka/node-osmosis
 // Definitions by: Juraj Ko�an <https://github.com/jurajkocan>
+//                 Evan Shortiss <https://github.com/evanshortiss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export interface Osmosis {
+interface Osmosis {
     /**
      * define domain where osmosis is parsing data from
      */
@@ -54,7 +55,9 @@ export interface Osmosis {
      * passing string to your function
      * result data, osmosis finished
      */
-    data(callback: (param: string) => any): Osmosis;
-}
+    data(callback: (param: any) => any): Osmosis;
+  }
 
-export const osmosis: Osmosis;
+  declare const osmosis: Osmosis;
+
+  export = osmosis;
diff --git a/types/osmosis/osmosis-tests.ts b/types/osmosis/osmosis-tests.ts
index 0882bb14f7..f0c39d4312 100644
--- a/types/osmosis/osmosis-tests.ts
+++ b/types/osmosis/osmosis-tests.ts
@@ -1,4 +1,4 @@
-import { osmosis } from 'osmosis';
+import * as osmosis from 'osmosis';
 
 const logFunction = (log: string) => {
     const myLog = log;
diff --git a/types/osmtogeojson/tslint.json b/types/osmtogeojson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/osmtogeojson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/otplib/index.d.ts b/types/otplib/index.d.ts
new file mode 100644
index 0000000000..d9ae32ddfb
--- /dev/null
+++ b/types/otplib/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for otplib 7.0
+// Project: https://yeojz.github.io/otplib
+// Definitions by: Soner Köksal <https://github.com/renjfk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export namespace authenticator {
+    interface VerifyOptions {
+        token: string;
+        secret: string;
+    }
+
+    function generateSecret(): string;
+
+    function generate(secret: string): string;
+
+    function check(token: string, secret: string): boolean;
+
+    function verify(options: VerifyOptions): boolean;
+}
diff --git a/types/otplib/otplib-tests.ts b/types/otplib/otplib-tests.ts
new file mode 100644
index 0000000000..231b16716f
--- /dev/null
+++ b/types/otplib/otplib-tests.ts
@@ -0,0 +1,7 @@
+import * as otplib from "otplib";
+
+const secretValue = otplib.authenticator.generateSecret();
+const tokenValue = otplib.authenticator.generate(secretValue);
+
+let isValid = otplib.authenticator.check(tokenValue, secretValue);
+isValid = otplib.authenticator.verify({secret: secretValue, token: tokenValue});
diff --git a/types/otplib/tsconfig.json b/types/otplib/tsconfig.json
new file mode 100644
index 0000000000..cfb2b07081
--- /dev/null
+++ b/types/otplib/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "otplib-tests.ts"
+    ]
+}
diff --git a/types/otplib/tslint.json b/types/otplib/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/otplib/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/owasp-password-strength-test/index.d.ts b/types/owasp-password-strength-test/index.d.ts
new file mode 100644
index 0000000000..352bc694cf
--- /dev/null
+++ b/types/owasp-password-strength-test/index.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for owasp-password-strength-test 1.3
+// Project: https://github.com/nowsecure/owasp-password-strength-test
+// Definitions by: Stephan Troyer <https://github.com/stephtr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export as namespace owaspPasswordStrengthTest;
+
+export interface TestResult {
+    /** error messages associated with the failed tests */
+    errors: string[];
+    /** enumerates which tests have failed, beginning from 0 with the first required test */
+    failedTests: number[];
+    /** enumerates which tests have succeeded, beginning from 0 with the first required test */
+    passedTests: number[];
+    /** error messages of required tests that have failed */
+    requiredTestErrors: string[];
+    /** error messages of optional tests that have failed */
+    optionalTestErrors: string[];
+    /** indicates whether or not the password was considered to be a passphrase */
+    isPassphrase: boolean;
+    /** indicates whether or not the user's password satisfied the strength requirements */
+    strong: boolean;
+    /**
+     * indicates how many of the optional tests were passed;
+     * In order for the password to be considered "strong", it (by default) must either be a passphrase,
+     * or must pass a number of optional tests that is equal to or greater than configs.minOptionalTestsToPass
+     */
+    optionalTestsPassed: number;
+}
+export interface TestConfig {
+    /**
+     * toggles the "passphrase" mechanism on and off;
+     * If set to false, the strength-checker will abandon the notion of "passphrases",
+     * and will subject all passwords to the same complexity requirements.
+     */
+    allowPassphrases: boolean;
+    /** constraint on a password's maximum length */
+    maxLength: number;
+    /** constraint on a password's minimum length */
+    minLength: number;
+    /**
+     * minimum length a password needs to achieve in order to be considered a "passphrase"
+     * (and thus exempted from the optional complexity tests by default)
+     */
+    minPhraseLength: number;
+    /**
+     * minimum number of optional tests that a password must pass in order to be considered "strong";
+     * By default (per the OWASP guidelines), four optional complexity tests are made,
+     * and a password must pass at least three of them in order to be considered "strong"
+     */
+    minOptionalTestsToPass: number;
+
+    // // to add support for https://github.com/nowsecure/owasp-password-strength-test/pull/5
+    // /**
+    //  * toggles the i18n error keys in place of english error messages.
+    //  * This can be useful when translating the errors using a 3rd party i18n library.
+    //  * When true the following keys can be returned:
+    //  * `failedMinLength`, `failedMaxLength`, `failedThreeRepeatedChars`, `optionalLowercaseRequired`, `optionalUppercaseRequired`, `optionalNumberRequired` and `optionalSpecialCharRequired`.
+    //  */
+    // i18nErrorKeys?: boolean;
+}
+
+export type PasswordTest = (password: string) => string | undefined;
+
+export function test(password: string): TestResult;
+export function config(configuration: Partial<TestConfig>): void;
+
+export let tests: {
+    required: PasswordTest[];
+    optional: PasswordTest[];
+};
+export const configs: Readonly<TestConfig>;
diff --git a/types/owasp-password-strength-test/owasp-password-strength-test-tests.ts b/types/owasp-password-strength-test/owasp-password-strength-test-tests.ts
new file mode 100644
index 0000000000..0cdd336a20
--- /dev/null
+++ b/types/owasp-password-strength-test/owasp-password-strength-test-tests.ts
@@ -0,0 +1,18 @@
+import * as owasp from 'owasp-password-strength-test';
+
+owasp.config({
+    allowPassphrases: true,
+    maxLength: 128,
+    minLength: 10,
+    minPhraseLength: 20,
+    minOptionalTestsToPass: 4,
+});
+
+owasp.tests.required.push(password => {
+    if (password === 'one two three four five') {
+        return "That's the kind of thing an idiot would have on his luggage!";
+    }
+});
+
+const result = owasp.test('correct horse battery staple');
+result.errors.length;
diff --git a/types/owasp-password-strength-test/tsconfig.json b/types/owasp-password-strength-test/tsconfig.json
new file mode 100644
index 0000000000..0206d30034
--- /dev/null
+++ b/types/owasp-password-strength-test/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "owasp-password-strength-test-tests.ts"
+    ]
+}
diff --git a/types/owasp-password-strength-test/tslint.json b/types/owasp-password-strength-test/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/owasp-password-strength-test/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/owl.carousel/index.d.ts b/types/owl.carousel/index.d.ts
index 21a4dcee71..0295b3fe5b 100644
--- a/types/owl.carousel/index.d.ts
+++ b/types/owl.carousel/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for owl.carousel 2.2
 // Project: https://github.com/OwlCarousel2/OwlCarousel2
 // Definitions by: Ismael Gorissen <https://github.com/igorissen>
+//                 Kenneth Ceyer <https://github.com/KennethanCeyer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -36,8 +37,8 @@ declare namespace OwlCarousel {
         autoplay?: boolean;
         autoplayTimeout?: number;
         autoplayHoverPause?: boolean;
-        smartSpeed?: boolean;
-        fluidSpeed?: boolean;
+        smartSpeed?: number | boolean;
+        fluidSpeed?: number | boolean;
         autoplaySpeed?: number | boolean;
         navSpeed?: number | boolean;
         dotsSpeed?: number | boolean;
diff --git a/types/owlcarousel/index.d.ts b/types/owlcarousel/index.d.ts
index 94fead3e66..e788f92479 100644
--- a/types/owlcarousel/index.d.ts
+++ b/types/owlcarousel/index.d.ts
@@ -44,6 +44,8 @@ interface IOwlCarouselOptions {
     mouseDrag?: boolean;
     touchDrag?: boolean;
     addClassActive?: boolean;
+    loop?: boolean;
+    nav?: boolean;
     transitionStyle?: any;
 
     // callbacks
diff --git a/types/owlcarousel/tslint.json b/types/owlcarousel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/owlcarousel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/p-any/index.d.ts b/types/p-any/index.d.ts
index 8b4165b54c..8b4df3504c 100644
--- a/types/p-any/index.d.ts
+++ b/types/p-any/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sindresorhus/p-any#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import AggregateErrorModule = require('aggregate-error');
 
diff --git a/types/p-lazy/p-lazy-tests.ts b/types/p-lazy/p-lazy-tests.ts
index d240ae826e..16ab9e466b 100644
--- a/types/p-lazy/p-lazy-tests.ts
+++ b/types/p-lazy/p-lazy-tests.ts
@@ -1,7 +1,7 @@
 import PLazy = require('p-lazy');
 
 const lazyPromise = new PLazy<string>((resolve, reject) => {
-    if (typeof resolve === 'object') {
+    if (!true) {
         resolve('foo');
     } else {
         reject(new Error());
diff --git a/types/p-props/index.d.ts b/types/p-props/index.d.ts
index 38ee03b990..3fa293ef69 100644
--- a/types/p-props/index.d.ts
+++ b/types/p-props/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sindresorhus/p-props#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 export = pProps;
 
diff --git a/types/p-queue/p-queue-tests.ts b/types/p-queue/p-queue-tests.ts
index 6a63e9e607..8c54953a73 100644
--- a/types/p-queue/p-queue-tests.ts
+++ b/types/p-queue/p-queue-tests.ts
@@ -21,7 +21,7 @@ num = queue.size;
 num = queue.pending;
 
 class QueueClass implements PQueue.QueueClass<{ any: string }> {
-    private queue: Array<() => void>;
+    private readonly queue: Array<() => void>;
 
     size = 0;
 
diff --git a/types/p-retry/index.d.ts b/types/p-retry/index.d.ts
index 30a3b23542..784f637549 100644
--- a/types/p-retry/index.d.ts
+++ b/types/p-retry/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sindresorhus/p-retry#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { OperationOptions } from 'retry';
 
diff --git a/types/p-series/index.d.ts b/types/p-series/index.d.ts
index 4c185fa807..ecc7b19cd8 100644
--- a/types/p-series/index.d.ts
+++ b/types/p-series/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sindresorhus/p-series#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 export = pSeries;
 
diff --git a/types/p-settle/index.d.ts b/types/p-settle/index.d.ts
index 26acaccfb1..7298ea055e 100644
--- a/types/p-settle/index.d.ts
+++ b/types/p-settle/index.d.ts
@@ -22,8 +22,6 @@ declare namespace pSettle {
  * * `isFulfilled`
  * * `isRejected`
  * * `value` or `reason` (Depending on whether the promise fulfilled or rejected)
- *
- * @param input
  */
 declare function pSettle<T>(input: Iterable<PromiseLike<T>>): Promise<Array<pSettle.SettledResult<T>>>;
 
diff --git a/types/p-some/index.d.ts b/types/p-some/index.d.ts
index 6855018c7e..e22fd8d7ea 100644
--- a/types/p-some/index.d.ts
+++ b/types/p-some/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sindresorhus/p-some#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import AggregateErrorModule = require('aggregate-error');
 
diff --git a/types/p2/index.d.ts b/types/p2/index.d.ts
index 89dda72b9c..88dde55025 100644
--- a/types/p2/index.d.ts
+++ b/types/p2/index.d.ts
@@ -361,13 +361,13 @@ declare namespace p2 {
 
     export class ContactMaterialOptions {
 
-        friction: number;
-        restitution: number;
-        stiffness: number;
-        relaxation: number;
-        frictionStiffness: number;
-        frictionRelaxation: number;
-        surfaceVelocity: number;
+        friction?: number;
+        restitution?: number;
+        stiffness?: number;
+        relaxation?: number;
+        frictionStiffness?: number;
+        frictionRelaxation?: number;
+        surfaceVelocity?: number;
 
     }
 
@@ -624,8 +624,8 @@ declare namespace p2 {
 
     export interface ConvexOptions extends SharedShapeOptions {
 
-      length?: number;
-      radius?: number;
+        vertices?: ArrayLike<number>[];
+        axes?: ArrayLike<number>[];
 
     }
 
@@ -636,7 +636,7 @@ declare namespace p2 {
         constructor(options?: ConvexOptions);
 
         vertices: number[][];
-        axes: number[];
+        axes: number[][];
         centerOfMass: number[];
         triangles: number[];
         boundingRadius: number;
diff --git a/types/p2/p2-tests.ts b/types/p2/p2-tests.ts
index 0579a880b2..c796cf8f79 100644
--- a/types/p2/p2-tests.ts
+++ b/types/p2/p2-tests.ts
@@ -4,6 +4,12 @@ var world = new p2.World({
     gravity:[0, -9.82]
 });
 
+// Set default contact material
+world.defaultContactMaterial = new p2.ContactMaterial(
+    new p2.Material(1), new p2.Material(2),
+    { friction: 1, restitution: 0 }
+)
+
 // Create an empty dynamic body
 var circleBody = new p2.Body({
     mass: 5,
@@ -26,6 +32,20 @@ var groundShape = new p2.Plane();
 groundBody.addShape(groundShape);
 world.addBody(groundBody);
 
+// Create a convex shape. Can use various array types.
+const convex = new p2.Convex({
+    vertices: [
+        new Float32Array([-1, 1]),
+        new Uint32Array([0, -1]),
+        [1, 1]
+    ],
+    axes: [
+        new Float32Array([-1, 1]),
+        new Int32Array([0, -1]),
+        [1, 1]
+    ]
+})
+
 // To get the trajectories of the bodies,
 // we must step the world forward in time.
 // This is done using a fixed time step size.
diff --git a/types/p2/tslint.json b/types/p2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/p2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/package-json/index.d.ts b/types/package-json/index.d.ts
new file mode 100644
index 0000000000..e57902875b
--- /dev/null
+++ b/types/package-json/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for package-json 4.0
+// Project: https://github.com/sindresorhus/package-json#readme
+// Definitions by: Jinwoo Lee <https://github.com/jinwoo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface PackageJsonOptions {
+    version?: string;
+    fullMetadata?: boolean;
+    allVersions?: boolean;
+}
+
+declare function packageJson(name: string, options?: PackageJsonOptions): Promise<{}>;
+
+export = packageJson;
diff --git a/types/package-json/package-json-tests.ts b/types/package-json/package-json-tests.ts
new file mode 100644
index 0000000000..98f14b1192
--- /dev/null
+++ b/types/package-json/package-json-tests.ts
@@ -0,0 +1,10 @@
+import packageJson = require('package-json');
+
+let pkg: {};
+packageJson('package-json', {
+    version: '1.2.3',
+    fullMetadata: true,
+    allVersions: true,
+}).then(x => {
+    pkg = x;
+});
diff --git a/types/package-json/tsconfig.json b/types/package-json/tsconfig.json
new file mode 100644
index 0000000000..52c1adb7d3
--- /dev/null
+++ b/types/package-json/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "package-json-tests.ts"
+    ]
+}
diff --git a/types/package-json/tslint.json b/types/package-json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/package-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/packery/tslint.json b/types/packery/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/packery/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/page-icon/tslint.json b/types/page-icon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/page-icon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/page/tslint.json b/types/page/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/page/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/paho-mqtt/index.d.ts b/types/paho-mqtt/index.d.ts
index 439fe69141..fed67ff262 100644
--- a/types/paho-mqtt/index.d.ts
+++ b/types/paho-mqtt/index.d.ts
@@ -39,8 +39,6 @@ declare namespace Paho {
      * an Error containing an error message intended for developer use, if it detects
      * an error with any parameter.
      * <p>
-     *
-     * @namespace Paho.MQTT
      */
     namespace MQTT {
         /**
@@ -235,16 +233,16 @@ declare namespace Paho {
          *
          */
         class Client {
-            /** <i>read only</i> used when connecting to the server. */
+            /** used when connecting to the server. */
             readonly clientId: string;
 
-            /** <i>read only</i> the server's DNS hostname or dotted decimal IP address. */
+            /** the server's DNS hostname or dotted decimal IP address. */
             readonly host: string;
 
-            /** <i>read only</i> the server's path. */
+            /** the server's path. */
             readonly path: string;
 
-            /** <i>read only</i> the server's port. */
+            /** the server's port. */
             readonly port: number;
 
             /** function called with trace information, if set */
@@ -281,16 +279,13 @@ declare namespace Paho {
              */
             onMessageArrived: OnMessageHandler;
 
-            /* tslint:disable:unified-signatures */
-            /* these cannot actually be neatly unified */
-
             /**
              * @param host - the address of the messaging server as a DNS name or dotted decimal IP address.
              * @param port - the port number to connect to
              * @param path - the path on the host to connect to - only used if host is not a URI. Default: '/mqtt'.
              * @param clientId - the Messaging client identifier, between 1 and 23 characters in length.
              */
-            constructor(host: string, port: number, path: string, clientId: string);
+            constructor(host: string, port: number, path: string, clientId: string); // tslint:disable-line unified-signatures (these cannot actually be neatly unified)
 
             /**
              * @param host - the address of the messaging server as a DNS name or dotted decimal IP address.
@@ -305,8 +300,6 @@ declare namespace Paho {
              */
             constructor(hostUri: string, clientId: string);
 
-            /* tslint:enable:unified-signatures */
-
             /**
              * Connect this Messaging client to its server.
              * @throws {InvalidState} if the client is not in disconnected state. The client must have received
@@ -329,7 +322,7 @@ declare namespace Paho {
             /**
              * Get the contents of the trace log.
              *
-             *  @return {Object[]} tracebuffer containing the time ordered trace records.
+             *  @return tracebuffer containing the time ordered trace records.
              */
             getTraceLog(): any[];
 
@@ -346,7 +339,7 @@ declare namespace Paho {
             /**
              * Send a message to the consumers of the destination in the Message.
              *
-             * @param {Paho.MQTT.Message} message - <b>mandatory</b> The {@link Paho.MQTT.Message} object to be sent.
+             * @param message - <b>mandatory</b> The {@link Paho.MQTT.Message} object to be sent.
              * @throws {InvalidState} if the client is not connected.
              */
             send(message: Message): void;
@@ -354,15 +347,15 @@ declare namespace Paho {
             /**
              * Send a message to the consumers of the destination in the Message.
              *
-             * @param {string} topic - <b>mandatory</b> The name of the destination to which the message is to be sent.
-             * @param {string|ArrayBuffer} payload - The message data to be sent.
-             * @param {number} qos The Quality of Service used to deliver the message.
+             * @param topic - <b>mandatory</b> The name of the destination to which the message is to be sent.
+             * @param payload - The message data to be sent.
+             * @param qos The Quality of Service used to deliver the message.
              *        <dl>
              *            <dt>0 Best effort (default).
              *            <dt>1 At least once.
              *            <dt>2 Exactly once.
              *        </dl>
-             * @param {Boolean} retained If true, the message is to be retained by the server and delivered to both
+             * @param retained If true, the message is to be retained by the server and delivered to both
              * current and future subscriptions. If false the server only delivers the message to current subscribers,
              * this is the default for new Messages. A received message has the retained boolean set to true if the
              * message was published with the retained boolean set to true and the subscrption was made after the
@@ -407,25 +400,26 @@ declare namespace Paho {
          */
         class Message {
             /**
-             * <b>mandatory</b> The name of the destination to which the message is to be sent
+             * The name of the destination to which the message is to be sent
              * (for messages about to be sent) or the name of the destination from which the message has been received.
              * (for messages received by the onMessage function).
              */
-            destinationName?: string;
+            destinationName: string;
 
             /**
-             * <i>read only</i> If true, this message might be a duplicate of one which has already been received.
+             * If true, this message might be a duplicate of one which has already been received.
              * This is only set on messages received from the server.
              */
             readonly duplicate: boolean;
 
-            /** <i>read only</i> The payload.
-             * @return Uint8Array if payload is a string. Return the original otherwise.
+            /**
+             * The payload.
+             * @return if payload is a string. Return the original otherwise.
              */
             readonly payloadBytes: ArrayBuffer | TypedArray;
 
             /**
-             *  <i>read only</i> The payload as a string if the payload consists of valid UTF-8 characters.
+             *  The payload as a string if the payload consists of valid UTF-8 characters.
              *  @throw {Error} if the payload is not valid UTF-8
              */
             readonly payloadString: string;
@@ -453,7 +447,7 @@ declare namespace Paho {
             retained: boolean;
 
             /**
-             * @param {String|ArrayBuffer} payload The message data to be sent.
+             * @param payload The message data to be sent.
              */
             constructor(payload: string | ArrayBuffer | TypedArray);
         }
diff --git a/types/pako/tslint.json b/types/pako/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pako/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pangu/index.d.ts b/types/pangu/index.d.ts
new file mode 100644
index 0000000000..b7beb1e32a
--- /dev/null
+++ b/types/pangu/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for pangu 3.3
+// Project: https://github.com/vinta/pangu.js
+// Definitions by: York Yao <https://github.com/plantain-00>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function spacing(text: string): string;
+
+export function spacingFile(path: string, callback: (error: Error, data: string) => void): void;
+export function spacingFile(path: string): Promise<string>;
+
+export function spacingFileSync(path: string): string;
+
+export function spacingText(text: string, callback: (error: Error, data: string) => void): void;
+export function spacingText(text: string): Promise<string>;
+
+export function spacingPage(): void;
+export function spacingElementById(id: string): void;
+export function spacingElementByClassName(className: string): void;
+export function spacingElementByTagName(tagName: string): void;
+
+export as namespace pangu;
diff --git a/types/pangu/pangu-tests.ts b/types/pangu/pangu-tests.ts
new file mode 100644
index 0000000000..7e708d6fdc
--- /dev/null
+++ b/types/pangu/pangu-tests.ts
@@ -0,0 +1,17 @@
+import pangu = require('pangu');
+
+pangu.spacing('Sephiroth見他這等神情,也是悚然一驚:�知我這Ultimate Destructive Magic是��付得了?');
+// output: Sephiroth 見他這等神情, 也是悚然一驚: �知我這 Ultimate Destructive Magic 是��付得了?
+
+pangu.spacingFile('/path/to/text.txt', (err, data) => {
+});
+
+pangu.spacingFile('/path/to/text.txt').then(data => {
+});
+
+const data = pangu.spacingFileSync('/path/to/text.txt');
+
+pangu.spacingPage();
+pangu.spacingElementById('main');
+pangu.spacingElementByClassName('comment');
+pangu.spacingElementByTagName('p');
diff --git a/types/pangu/tsconfig.json b/types/pangu/tsconfig.json
new file mode 100644
index 0000000000..a1084b5b06
--- /dev/null
+++ b/types/pangu/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pangu-tests.ts"
+    ]
+}
diff --git a/types/pangu/tslint.json b/types/pangu/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pangu/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/papaparse/index.d.ts b/types/papaparse/index.d.ts
index 4365ac38ac..ddad5970cb 100644
--- a/types/papaparse/index.d.ts
+++ b/types/papaparse/index.d.ts
@@ -3,146 +3,137 @@
 // Definitions by: Pedro Flemming <https://github.com/torpedro>
 //                 Rain Shen <https://github.com/rainshen49>
 //                 João Loff <https://github.com/jfloff>
+//                 John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-declare namespace PapaParse {
-    interface Static {
-        /**
-         * Parse a csv string or a csv file
-         */
-        parse(csvString: string, config?: ParseConfig): ParseResult;
+export as namespace Papa;
 
-        parse(file: File, config?: ParseConfig): ParseResult;
+/**
+ * Parse a csv string, a csv file or a readable stream
+ */
+export function parse(csvString: string, config?: ParseConfig): ParseResult;
 
-        /**
-         * Unparses javascript data objects and returns a csv string
-         */
-        unparse(data: Array<Object>, config?: UnparseConfig): string;
+export function parse(file: File, config?: ParseConfig): ParseResult;
 
-        unparse(data: Array<Array<any>>, config?: UnparseConfig): string;
+export function parse(stream: ReadableStream, config?: ParseConfig): ParseResult;
 
-        unparse(data: UnparseObject, config?: UnparseConfig): string;
+/**
+ * Unparses javascript data objects and returns a csv string
+ */
+export function unparse(data: Array<Object>, config?: UnparseConfig): string;
 
-        /**
-         * Read-Only Properties
-         */
-        // An array of characters that are not allowed as delimiters.
-        BAD_DELIMETERS: Array<string>;
+export function unparse(data: Array<Array<any>>, config?: UnparseConfig): string;
 
-        // The true delimiter. Invisible. ASCII code 30. Should be doing the job we strangely rely upon commas and tabs for.
-        RECORD_SEP: string;
+export function unparse(data: UnparseObject, config?: UnparseConfig): string;
 
-        // Also sometimes used as a delimiting character. ASCII code 31.
-        UNIT_SEP: string;
+/**
+ * Read-Only Properties
+ */
+// An array of characters that are not allowed as delimiters.
+export const BAD_DELIMETERS: Array<string>;
 
-        // Whether or not the browser supports HTML5 Web Workers. If false, worker: true will have no effect.
-        WORKERS_SUPPORTED: boolean;
+// The true delimiter. Invisible. ASCII code 30. Should be doing the job we strangely rely upon commas and tabs for.
+export const RECORD_SEP: string;
 
-        // The relative path to Papa Parse. This is automatically detected when Papa Parse is loaded synchronously.
-        SCRIPT_PATH: string;
+// Also sometimes used as a delimiting character. ASCII code 31.
+export const UNIT_SEP: string;
 
-        /**
-         * Configurable Properties
-         */
-        // The size in bytes of each file chunk. Used when streaming files obtained from the DOM that exist on the local computer. Default 10 MB.
-        LocalChunkSize: string;
+// Whether or not the browser supports HTML5 Web Workers. If false, worker: true will have no effect.
+export const WORKERS_SUPPORTED: boolean;
 
-        // Same as LocalChunkSize, but for downloading files from remote locations. Default 5 MB.
-        RemoteChunkSize: string;
+// The relative path to Papa Parse. This is automatically detected when Papa Parse is loaded synchronously.
+export const SCRIPT_PATH: string;
 
-        // The delimiter used when it is left unspecified and cannot be detected automatically. Default is comma.
-        DefaultDelimiter: string;
+/**
+ * Configurable Properties
+ */
+// The size in bytes of each file chunk. Used when streaming files obtained from the DOM that exist on the local computer. Default 10 MB.
+export let LocalChunkSize: string;
 
-        /**
-         * On Papa there are actually more classes exposed
-         * but none of them are officially documented
-         * Since we can interact with the Parser from one of the callbacks
-         * I have included the API for this class.
-         */
-        Parser: ParserConstructor;
-    }
+// Same as LocalChunkSize, but for downloading files from remote locations. Default 5 MB.
+export let RemoteChunkSize: string;
 
-    interface ParseConfig {
-        delimiter?: string;            // default: ""
-        newline?: string;              // default: ""
-        quoteChar?: string;            // default: '"'
-        header?: boolean;              // default: false
-        dynamicTyping?: boolean;       // default: false
-        preview?: number;              // default: 0
-        encoding?: string;             // default: ""
-        worker?: boolean;              // default: false
-        comments?: boolean | string;   // default: false
-        download?: boolean;            // default: false
-        skipEmptyLines?: boolean;      // default: false
-        fastMode?: boolean;            // default: undefined
-        withCredentials?: boolean;     // default: undefined
+// The delimiter used when it is left unspecified and cannot be detected automatically. Default is comma.
+export let DefaultDelimiter: string;
 
-        // Callbacks
-        step?(results: ParseResult, parser: Parser): void;  // default: undefined
-        complete?(results: ParseResult, file?: File): void; // default: undefined
-        error?(error: ParseError, file?: File): void;       // default: undefined
-        chunk?(results: ParseResult, parser: Parser): void; // default: undefined
-        beforeFirstChunk?(chunk: string): string | void;    // default: undefined
-    }
+/**
+ * On Papa there are actually more classes exposed
+ * but none of them are officially documented
+ * Since we can interact with the Parser from one of the callbacks
+ * I have included the API for this class.
+ */
+export class Parser {
 
-    interface UnparseConfig {
-        quotes?: boolean;    // default: false
-        delimiter?: string;  // default: ","
-        newline?: string;    // default: "\r\n"
-    }
+    constructor(config: ParseConfig);
 
-    interface UnparseObject {
-        fields: Array<any>;
-        data: string | Array<any>;
-    }
+    parse(input: string, baseIndex: number, ignoreLastRow: boolean): any;
 
-    interface ParseError {
-        type: string;     // A generalization of the error
-        code: string;     // Standardized error code
-        message: string;  // Human-readable details
-        row: number;      // Row index of parsed data where error is
-    }
+    // Sets the abort flag
+    abort(): void;
 
-    interface ParseMeta {
-        delimiter: string;     // Delimiter used
-        linebreak: string;     // Line break sequence used
-        aborted: boolean;      // Whether process was aborted
-        fields: Array<string>; // Array of field names
-        truncated: boolean;    // Whether preview consumed all input
-    }
-
-    /**
-     * @interface ParseResult
-     *
-     * data: is an array of rows. If header is false, rows are arrays; otherwise they are objects of data keyed by the field name.
-     * errors: is an array of errors
-     * meta: contains extra information about the parse, such as delimiter used, the newline sequence, whether the process was aborted, etc. Properties in this object are not guaranteed to exist in all situations
-     */
-    interface ParseResult {
-        data: Array<any>;
-        errors: Array<ParseError>;
-        meta: ParseMeta;
-    }
-
-    /**
-     * Parser
-     */
-    interface ParserConstructor { new (config: ParseConfig): Parser; }
-    interface Parser {
-        // Parses the input
-        parse(input: string, baseIndex: number, ignoreLastRow: boolean): any;
-
-        // Sets the abort flag
-        abort(): void;
-
-        // Gets the cursor position
-        getCharIndex(): number;
-    }
+    // Gets the cursor position
+    getCharIndex(): number;
 }
 
-declare var Papa: PapaParse.Static;
+export interface ParseConfig {
+    delimiter?: string;            // default: ","
+    newline?: string;              // default: "\r\n"
+    quoteChar?: string;            // default: '"'
+    header?: boolean;              // default: false
+    dynamicTyping?: boolean;       // default: false
+    preview?: number;              // default: 0
+    encoding?: string;             // default: ""
+    worker?: boolean;              // default: false
+    comments?: boolean | string;   // default: false
+    download?: boolean;            // default: false
+    skipEmptyLines?: boolean;      // default: false
+    fastMode?: boolean;            // default: undefined
+    withCredentials?: boolean;     // default: undefined
 
-declare module "papaparse" {
-    var Papa: PapaParse.Static;
-    export = Papa;
+    // Callbacks
+    step?(results: ParseResult, parser: Parser): void;  // default: undefined
+    complete?(results: ParseResult, file?: File): void; // default: undefined
+    error?(error: ParseError, file?: File): void;       // default: undefined
+    chunk?(results: ParseResult, parser: Parser): void; // default: undefined
+    beforeFirstChunk?(chunk: string): string | void;    // default: undefined
+}
+
+export interface UnparseConfig {
+    quotes?: boolean;    // default: false
+    delimiter?: string;  // default: ","
+    newline?: string;    // default: "\r\n"
+}
+
+export interface UnparseObject {
+    fields: Array<any>;
+    data: string | Array<any>;
+}
+
+export interface ParseError {
+    type: string;     // A generalization of the error
+    code: string;     // Standardized error code
+    message: string;  // Human-readable details
+    row: number;      // Row index of parsed data where error is
+}
+
+export interface ParseMeta {
+    delimiter: string;     // Delimiter used
+    linebreak: string;     // Line break sequence used
+    aborted: boolean;      // Whether process was aborted
+    fields: Array<string>; // Array of field names
+    truncated: boolean;    // Whether preview consumed all input
+}
+
+/**
+ * @interface ParseResult
+ *
+ * data: is an array of rows. If header is false, rows are arrays; otherwise they are objects of data keyed by the field name.
+ * errors: is an array of errors
+ * meta: contains extra information about the parse, such as delimiter used, the newline sequence, whether the process was aborted, etc. Properties in this object are not guaranteed to exist in all situations
+ */
+export interface ParseResult {
+    data: Array<any>;
+    errors: Array<ParseError>;
+    meta: ParseMeta;
 }
diff --git a/types/papaparse/papaparse-tests.ts b/types/papaparse/papaparse-tests.ts
index a432fc7f09..1e527c4c32 100644
--- a/types/papaparse/papaparse-tests.ts
+++ b/types/papaparse/papaparse-tests.ts
@@ -1,6 +1,14 @@
 
 
 import Papa = require("papaparse");
+import {
+	ParseConfig,
+	UnparseConfig,
+	UnparseObject,
+	ParseError,
+	ParseMeta,
+	ParseResult
+} from "papaparse";
 
 /**
  * Parsing
diff --git a/types/papaparse/tslint.json b/types/papaparse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/papaparse/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index d24a5cddc9..64d961ed10 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -1,11 +1,14 @@
-// Type definitions for Paper.js v0.9.23
+// Type definitions for Paper.js v0.9.24
 // Project: http://paperjs.org/
-// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>
+// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>, Jon Lucas <https://github.com/Xakaloz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 type NativeMouseEvent = MouseEvent;
 
-declare module 'paper' {
+/**
+ * @namespace paper
+ */
+declare module paper {
 
     /**
      * The version of Paper.js, as a string.
@@ -927,20 +930,34 @@ declare module 'paper' {
         abs(): Size;
 
         /*
-         * Returns the new multiplied size
-         * @param point - The size you want to multiply with
+         * Returns a new size
+         * @param size - The size you want to add with
          */
-        multiply(point: Size): Size;
-        multiply(point: number[]): Size;
-        multiply(point: number): Size;
+        add(size: Size): Size;
+        add(size: number[]): Size;
+
+        /*
+         * Returns a new size
+         * @param size - The size you want to subtract with
+         */
+        subtract(size: Size): Size;
+        subtract(size: number[]): Size;
+
+        /*
+         * Returns the new multiplied size
+         * @param size - The size you want to multiply with
+         */
+        multiply(size: Size): Size;
+        multiply(size: number[]): Size;
+        multiply(size: number): Size;
 
         /*
          * Returns the new divided size
-         * @param point - The size you want to divide with
+         * @param size - The size you want to divide with
          */
-        divide(point: Size): Size;
-        divide(point: number[]): Size;
-        divide(point: number): Size;
+        divide(size: Size): Size;
+        divide(size: number[]): Size;
+        divide(size: number): Size;
 
     }
     export interface IFrameEvent {
@@ -1291,7 +1308,12 @@ declare module 'paper' {
          * The function to be called when the mouse button is pushed down on the item. The function receives a MouseEvent object which contains information about the mouse event.
          */
         onMouseDown: (event: MouseEvent) => void;
-
+        
+        /**
+         * The function to be called when the mouse position changes while the mouse is being dragged. The function receives a MouseEvent object which contains information about the mouse event.
+         */
+        onMouseDrag: (event: MouseEvent) => void;
+        
         /**
          * The function to be called when the mouse button is released over the item.
          * The function receives a MouseEvent object which contains information about the mouse event.
@@ -2074,8 +2096,7 @@ declare module 'paper' {
          * @param data
          * @param point
          */
-        getImageData(data: ImageData, point: Point): void;
-
+        setImageData(data: ImageData, point: Point): void;
     }
     /**
      * A PlacedSymbol represents an instance of a symbol which has been placed in a Paper.js project.
@@ -4177,3 +4198,8 @@ declare module 'paper' {
         stop(): void;
     }
 }
+
+declare module 'paper'
+{
+    export = paper;
+}
diff --git a/types/paper/tslint.json b/types/paper/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/paper/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/paralleljs/tslint.json b/types/paralleljs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/paralleljs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/parent-package-json/index.d.ts b/types/parent-package-json/index.d.ts
new file mode 100644
index 0000000000..b0ab9ec3ce
--- /dev/null
+++ b/types/parent-package-json/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for parent-package-json 2.0
+// Project: https://github.com/maxrimue/parent-package-json
+// Definitions by: Simon McClive <https://github.com/sgmccli>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = ParentPackageJson;
+
+declare function ParentPackageJson(startPath?: string | null, ignore?: number): ParentPackageJson.ParentPackage | false;
+
+declare namespace ParentPackageJson {
+    interface ParentPackage {
+        read(): string;
+        path: string;
+        parse(): {[key: string]: any};
+    }
+}
diff --git a/types/parent-package-json/parent-package-json-tests.ts b/types/parent-package-json/parent-package-json-tests.ts
new file mode 100644
index 0000000000..41a5a7bdd0
--- /dev/null
+++ b/types/parent-package-json/parent-package-json-tests.ts
@@ -0,0 +1,10 @@
+import * as parent from 'parent-package-json';
+
+const hasParent = parent('/optional/path/', 1);
+
+if (hasParent !== false) {
+    const pathToParent: string = hasParent.path;
+    const contentOfParent: string = hasParent.read();
+    const JSONOfParent = hasParent.parse();
+    const versionOfParent = JSONOfParent.version;
+}
diff --git a/types/parent-package-json/tsconfig.json b/types/parent-package-json/tsconfig.json
new file mode 100644
index 0000000000..33d474c851
--- /dev/null
+++ b/types/parent-package-json/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "parent-package-json-tests.ts"
+    ]
+}
diff --git a/types/parent-package-json/tslint.json b/types/parent-package-json/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/parent-package-json/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/parse-glob/tslint.json b/types/parse-glob/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/parse-glob/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/parse-json/index.d.ts b/types/parse-json/index.d.ts
new file mode 100644
index 0000000000..638933ec40
--- /dev/null
+++ b/types/parse-json/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for parse-json 4.0
+// Project: https://github.com/sindresorhus/parse-json
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function parseJson(input: string | null, filepath?: string): any;
+declare function parseJson(input: string | null, reviver: (key: any, value: any) => any, filepath?: string): any;
+
+export = parseJson;
diff --git a/types/parse-json/parse-json-tests.ts b/types/parse-json/parse-json-tests.ts
new file mode 100644
index 0000000000..6bd0a55b32
--- /dev/null
+++ b/types/parse-json/parse-json-tests.ts
@@ -0,0 +1,10 @@
+import parse = require('parse-json');
+
+parse(null);
+parse('{}');
+parse('{}', 'filepath');
+parse('{}', () => null);
+parse('{}', () => null, 'filepath');
+
+// $ExpectError
+parse(1);
diff --git a/types/parse-json/tsconfig.json b/types/parse-json/tsconfig.json
new file mode 100644
index 0000000000..448f6787ba
--- /dev/null
+++ b/types/parse-json/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse-json-tests.ts"
+    ]
+}
diff --git a/types/parse-json/tslint.json b/types/parse-json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse-mockdb/tslint.json b/types/parse-mockdb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/parse-mockdb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/parse-ms/index.d.ts b/types/parse-ms/index.d.ts
new file mode 100644
index 0000000000..1a8a63d4a2
--- /dev/null
+++ b/types/parse-ms/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for parse-ms 1.0
+// Project: https://github.com/sindresorhus/parse-ms#readme
+// Definitions by: Giles Roadnight <https://github.com/Roaders>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default function parseMs(ms: number): {
+    days: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+    milliseconds: number;
+};
diff --git a/types/parse-ms/parse-ms-tests.ts b/types/parse-ms/parse-ms-tests.ts
new file mode 100644
index 0000000000..2b747ad5a8
--- /dev/null
+++ b/types/parse-ms/parse-ms-tests.ts
@@ -0,0 +1,3 @@
+import parseMs from "parse-ms";
+
+const { days, hours, milliseconds, minutes, seconds } = parseMs(3000);
diff --git a/types/parse-ms/tsconfig.json b/types/parse-ms/tsconfig.json
new file mode 100644
index 0000000000..3fecf7615f
--- /dev/null
+++ b/types/parse-ms/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse-ms-tests.ts"
+    ]
+}
diff --git a/types/parse-ms/tslint.json b/types/parse-ms/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse-ms/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 82194e65a2..5b4ff9a0bf 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -13,11 +13,12 @@
 
 declare namespace Parse {
 
-    var applicationId: string;
-    var javaScriptKey: string | undefined;
-    var masterKey: string | undefined;
-    var serverURL: string;
-    var VERSION: string;
+    let applicationId: string;
+    let javaScriptKey: string | undefined;
+    let masterKey: string | undefined;
+    let serverURL: string;
+    let liveQueryServerURL: string;
+    let VERSION: string;
 
     interface SuccessOption {
         success?: Function;
@@ -97,11 +98,17 @@ declare namespace Parse {
         reject(error: any): void;
         resolve(result: any): void;
         then<U>(resolvedCallback: (...values: T[]) => IPromise<U>,
-            rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
+                rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
         then<U>(resolvedCallback: (...values: T[]) => U,
-            rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
+                rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
         then<U>(resolvedCallback: (...values: T[]) => U,
-            rejectedCallback?: (reason: any) => U): IPromise<U>;
+                rejectedCallback?: (reason: any) => U): IPromise<U>;
+    }
+
+    interface Pointer {
+        __type: string;
+        className: string;
+        objectId: string;
     }
 
     interface IBaseObject {
@@ -357,6 +364,7 @@ declare namespace Parse {
         has(attr: string): boolean;
         hasChanged(attr: string): boolean;
         increment(attr: string, amount?: number): any;
+        isNew(): boolean;
         isValid(): boolean;
         op(attr: string): any;
         previous(attr: string): any;
@@ -367,6 +375,7 @@ declare namespace Parse {
         save(key: string, value: any, options?: Object.SaveOptions): Promise<this>;
         set(key: string, value: any, options?: Object.SetOptions): boolean;
         setACL(acl: ACL, options?: SuccessFailureOptions): boolean;
+        toPointer(): Pointer;
         unset(attr: string, options?: any): any;
         validate(attrs: any, options?: SuccessFailureOptions): boolean;
     }
@@ -925,7 +934,7 @@ declare namespace Parse {
          *
          *     import Buffer = require("buffer").Buffer;
          */
-        var HTTPOptions: new () => HTTPOptions;
+        let HTTPOptions: new () => HTTPOptions;
         interface HTTPOptions {
             /**
              * The body of the request.
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 76440e46d3..1a2d5dcdee 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -2,13 +2,13 @@
 
 function test_events() {
 
-    var object = new Parse.Events();
+    const object = new Parse.Events();
     object.on("alert", (eventName: string) => alert("Triggered " + eventName));
 
     object.trigger("alert", "an event");
 
-    var onChange = () => console.log('whatever');
-    var context: any;
+    const onChange = () => console.log('whatever');
+    let context: any;
 
     object.off("change", onChange);
     object.off("change");
@@ -29,29 +29,37 @@ class Game extends Parse.Object {
 
     constructor(options?: any) {
 
-        super("GameScore", options);
+        super("Game", options);
     }
 }
 
 function test_object() {
 
-    var game = new Game();
+    const game = new Game();
+
+    if (!game.isNew()) {
+        console.error("Game should be new");
+    }
+
+    if (game.toPointer().className !== "Game") {
+        console.log("Class name should be 'Game")
+    }
 
     game.fetch({
         success(g: Game) { }
     });
 
     // Create a new instance of that class.
-    var gameScore = new GameScore();
+    const gameScore = new GameScore();
 
     gameScore.set("score", 1337);
     gameScore.set("playerName", "Sean Plott");
     gameScore.set("cheatMode", false);
 
 
-    var score = gameScore.get("score");
-    var playerName = gameScore.get("playerName");
-    var cheatMode = gameScore.get("cheatMode");
+    const score = gameScore.get("score");
+    const playerName = gameScore.get("playerName");
+    const cheatMode = gameScore.get("cheatMode");
 
     gameScore.increment("score");
     gameScore.addUnique("skills", "flying");
@@ -59,14 +67,14 @@ function test_object() {
 
     game.set("gameScore", gameScore);
 
-    var gameCopy = Game.fromJSON(JSON.parse(JSON.stringify(game)), true);
+    const gameCopy = Game.fromJSON(JSON.parse(JSON.stringify(game)), true);
 }
 
 function test_query() {
 
-    var gameScore = new GameScore();
+    const gameScore = new GameScore();
 
-    var query = new Parse.Query(GameScore);
+    const query = new Parse.Query(GameScore);
     query.equalTo("playerName", "Dan Stemkoski");
     query.notEqualTo("playerName", "Michael Yabuti");
     query.greaterThan("playerAge", 18);
@@ -120,7 +128,7 @@ function test_query() {
     query.include("score");
     query.include(["score.team"]);
 
-    var testQuery = Parse.Query.or(query, query);
+    const testQuery = Parse.Query.or(query, query);
 }
 
 class TestCollection extends Parse.Collection<Object> {
@@ -141,9 +149,9 @@ function return_a_query(): Parse.Query {
 
 function test_collections() {
 
-    var collection = new TestCollection();
+    let collection = new TestCollection();
 
-    var query = new Parse.Query(Game);
+    const query = new Parse.Query(Game);
     query.equalTo("temperature", "hot");
     query.greaterThan("degreesF", 100);
 
@@ -167,10 +175,10 @@ function test_collections() {
         }
     );
 
-    var model = collection.at(0);
+    const model = collection.at(0);
 
     // Or you can get it by Parse objectId.
-    var modelAgain = collection.get(model.id);
+    const modelAgain = collection.get(model.id);
 
     // Remove "Duke" from the collection.
     collection.remove(model);
@@ -184,15 +192,15 @@ function test_collections() {
 
 function test_file() {
 
-    var base64 = "V29ya2luZyBhdCBQYXJzZSBpcyBncmVhdCE=";
-    var file = new Parse.File("myfile.txt", { base64: base64 });
+    const base64 = "V29ya2luZyBhdCBQYXJzZSBpcyBncmVhdCE=";
+    let file = new Parse.File("myfile.txt", { base64: base64 });
 
-    var bytes = [0xBE, 0xEF, 0xCA, 0xFE];
-    var file = new Parse.File("myfile.txt", bytes);
+    const bytes = [0xBE, 0xEF, 0xCA, 0xFE];
+    file = new Parse.File("myfile.txt", bytes);
 
-    var file = new Parse.File("myfile.zzz", {}, "image/png");
+    file = new Parse.File("myfile.zzz", {}, "image/png");
 
-    var src = file.url();
+    const src = file.url();
 
     file.save().then(
         () => {
@@ -211,7 +219,7 @@ function test_file() {
 
 function test_analytics() {
 
-    var dimensions = {
+    const dimensions = {
         // Define  ranges to bucket data points into meaningful segments
         priceRange: '1000-1500',
         // Did the user filter the query?
@@ -222,7 +230,7 @@ function test_analytics() {
     // Send the dimensions to Parse along with the 'search' event
     Parse.Analytics.track('search', dimensions);
 
-    var codeString = '404';
+    const codeString = '404';
     Parse.Analytics.track('error', { code: codeString })
 }
 
@@ -232,7 +240,7 @@ function test_relation() {
 
 function test_user_acl_roles() {
 
-    var user = new Parse.User();
+    const user = new Parse.User();
     user.set("username", "my name");
     user.set("password", "my pass");
     user.set("email", "email@example.com");
@@ -240,7 +248,7 @@ function test_user_acl_roles() {
     // other fields can be set just like with Parse.Object
     user.set("phone", "415-392-0202");
 
-    var currentUser = Parse.User.current();
+    const currentUser = Parse.User.current();
     if (currentUser) {
         // do stuff with the user
     } else {
@@ -253,17 +261,17 @@ function test_user_acl_roles() {
         // The token could not be validated.
     });
 
-    var game = new Game();
+    const game = new Game();
     game.set("score", new GameScore());
     game.setACL(new Parse.ACL(Parse.User.current()));
     game.save().then((game: Game) => { });
     game.save(null, { useMasterKey: true });
 
-    var groupACL = new Parse.ACL();
+    const groupACL = new Parse.ACL();
 
-    var userList: Parse.User[] = [Parse.User.current()!];
+    const userList: Parse.User[] = [Parse.User.current()!];
     // userList is an array with the users we are sending this message to.
-    for (var i = 0; i < userList.length; i++) {
+    for (let i = 0; i < userList.length; i++) {
         groupACL.setReadAccess(userList[i], true);
         groupACL.setWriteAccess(userList[i], true);
     }
@@ -279,7 +287,7 @@ function test_user_acl_roles() {
     });
 
     // By specifying no write privileges for the ACL, we can ensure the role cannot be altered.
-    var role = new Parse.Role("Administrator", groupACL);
+    const role = new Parse.Role("Administrator", groupACL);
     role.getUsers().add(userList[0]);
     role.getRoles().add(role);
     role.save();
@@ -311,7 +319,7 @@ function test_facebook_util() {
         }
     });
 
-    var user = Parse.User.current()!;
+    const user = Parse.User.current()!;
 
     if (!Parse.FacebookUtils.isLinked(user)) {
         Parse.FacebookUtils.link(user, null, {
@@ -350,7 +358,7 @@ function test_cloud_functions() {
     });
 
     Parse.Cloud.beforeDelete('MyCustomClass', (request: Parse.Cloud.BeforeDeleteRequest,
-        response: Parse.Cloud.BeforeDeleteResponse) => {
+                                               response: Parse.Cloud.BeforeDeleteResponse) => {
         // result
     });
 
@@ -366,27 +374,27 @@ class PlaceObject extends Parse.Object { }
 
 function test_geo_points() {
 
-    var point = new Parse.GeoPoint({ latitude: 40.0, longitude: -30.0 });
+    const point = new Parse.GeoPoint({ latitude: 40.0, longitude: -30.0 });
 
-    var userObject = Parse.User.current()!;
+    const userObject = Parse.User.current()!;
 
     // User's location
-    var userGeoPoint = userObject.get("location");
+    const userGeoPoint = userObject.get("location");
 
     // Create a query for places
-    var query = new Parse.Query(Parse.User);
+    const query = new Parse.Query(Parse.User);
     // Interested in locations near user.
     query.near("location", userGeoPoint);
     // Limit what could be a lot of points.
     query.limit(10);
 
-    var southwestOfSF = new Parse.GeoPoint(37.708813, -122.526398);
-    var northeastOfSF = new Parse.GeoPoint(37.822802, -122.373962);
+    const southwestOfSF = new Parse.GeoPoint(37.708813, -122.526398);
+    const northeastOfSF = new Parse.GeoPoint(37.822802, -122.373962);
 
-    var query2 = new Parse.Query(PlaceObject);
+    const query2 = new Parse.Query(PlaceObject);
     query2.withinGeoBox("location", southwestOfSF, northeastOfSF);
 
-    var query3 = new Parse.Query("PlaceObject").find().then((o: Parse.Object[]) => { });
+    const query3 = new Parse.Query("PlaceObject").find().then((o: Parse.Object[]) => { });
 }
 
 function test_push() {
@@ -405,7 +413,7 @@ function test_push() {
             }
         });
 
-    var query = new Parse.Query(Parse.Installation);
+    const query = new Parse.Query(Parse.Installation);
     query.equalTo('injuryReports', true);
 
     Parse.Push.send({
@@ -425,8 +433,8 @@ function test_push() {
 
 function test_view() {
 
-    var model = Parse.User.current();
-    var view = new Parse.View<Parse.User>();
+    const model = Parse.User.current();
+    const view = new Parse.View<Parse.User>();
 }
 
 function test_promise() {
diff --git a/types/parse/tslint.json b/types/parse/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/parse/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/parsimmon/index.d.ts b/types/parsimmon/index.d.ts
index 6bc93ae84a..c25ab020de 100644
--- a/types/parsimmon/index.d.ts
+++ b/types/parsimmon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Parsimmon 1.3
+// Type definitions for Parsimmon 1.6
 // Project: https://github.com/jneen/parsimmon
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Mizunashi Mana <https://github.com/mizunashi-mana>
@@ -6,7 +6,7 @@
 //                 Benny van Reeven <https://github.com/bvanreeven>
 //                 Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 /**
  * **NOTE:** You probably will never need to use this function. Most parsing
@@ -41,7 +41,7 @@
  * //=> {status: true, value: ['a', ['c', 'c', 'c', 'c', 'c']]}
  * ```
  */
-declare function Parsimmon<T>(fn: (input: string, i: number) => Parsimmon.Result<T>): Parsimmon.Parser<T>;
+declare function Parsimmon<T>(fn: (input: string, i: number) => Parsimmon.Reply<T>): Parsimmon.Parser<T>;
 
 declare namespace Parsimmon {
 	type StreamType = string;
@@ -74,6 +74,22 @@ declare namespace Parsimmon {
 		index: Index;
 	}
 
+	interface Rule {
+		[key: string]: (r: Language) => Parser<any>;
+	}
+
+	interface Language {
+		[key: string]: Parser<any>;
+	}
+
+	type TypedRule<TLanguageSpec> = {
+		[P in keyof TLanguageSpec]: (r: TypedLanguage<TLanguageSpec>) => Parser<TLanguageSpec[P]>;
+	};
+
+	type TypedLanguage<TLanguageSpec> = {
+		[P in keyof TLanguageSpec]: Parser<TLanguageSpec[P]>;
+	};
+
 	interface Parser<T> {
 		/**
 		 * parse the string
@@ -106,6 +122,15 @@ declare namespace Parsimmon {
 		 */
 		// tslint:disable-next-line:unified-signatures
 		then<U>(anotherParser: Parser<U>): Parser<U>;
+		/**
+		 * returns wrapper(this) from the parser. Useful for custom functions used
+		 * to wrap your parsers, while keeping with Parsimmon chaining style.
+		 */
+		thru<U>(call: (wrapper: Parser<U>) => Parser<T>): Parser<T>;
+		/**
+		 * expects anotherParser before and after parser, yielding the result of parser
+		 */
+		trim<U>(anotherParser: Parser<U>): Parser<T>;
 		/**
 		 * transforms the output of parser with the given function.
 		 */
@@ -169,21 +194,68 @@ declare namespace Parsimmon {
 	/**
 	 * Alias of `Parsimmon(fn)` for backwards compatibility.
 	 */
-	function Parser<T>(fn: (input: string, i: number) => Parsimmon.Result<T>): Parser<T>;
+	function Parser<T>(fn: (input: string, i: number) => Parsimmon.Reply<T>): Parser<T>;
+
+	/**
+	 * Starting point for building a language parser in Parsimmon.
+	 *
+	 * For having the resulting language rules return typed parsers, e.g. `Parser<Foo>` instead of
+	 * `Parser<any>`, pass a language specification as type parameter to this function. The language
+	 * specification should be of the following form:
+	 *
+	 * ```javascript
+	 * {
+	 *   rule1: type;
+	 *   rule2: type;
+	 * }
+	 * ```
+	 *
+	 * For example:
+	 *
+	 * ```javascript
+	 * const language = Parsimmon.createLanguage<{
+	 *   expr: Expr;
+	 *   numberLiteral: number;
+	 *   stringLiteral: string;
+	 * }>({
+	 *   expr: r => (some expression that yields Parser<Expr>),
+	 *   numberLiteral: r => (some expression that yields Parser<number>),
+	 *   stringLiteral: r => (some expression that yields Parser<string>)
+	 * });
+	 * ```
+	 *
+	 * Now both `language` and the parameter `r` that is passed into every parser rule will be of the
+	 * following type:
+	 *
+	 * ```javascript
+	 * {
+	 *   expr: Parser<Expr>;
+	 *   numberLiteral: Parser<number>;
+	 *   stringLiteral: Parser<string>;
+	 * }
+	 * ```
+	 *
+	 * Another benefit is that both the `rules` parameter and the resulting `language` should match the
+	 * properties defined in the language specification type, which means that the compiler checks that
+	 * there are no missing or superfluous rules in the language definition, and that the rules you access
+	 * on the resulting language do actually exist.
+	 */
+	function createLanguage(rules: Rule): Language;
+	function createLanguage<TLanguageSpec>(rules: TypedRule<TLanguageSpec>): TypedLanguage<TLanguageSpec>;
 
 	/**
 	 * To be used inside of Parsimmon(fn). Generates an object describing how
 	 * far the successful parse went (index), and what value it created doing
 	 * so. See documentation for Parsimmon(fn).
 	 */
-	function makeSuccess<T>(index: number, value: T): Success<T>;
+	function makeSuccess<T>(index: number, value: T): SuccessReply<T>;
 
 	/**
 	 * To be used inside of Parsimmon(fn). Generates an object describing how
 	 * far the unsuccessful parse went (index), and what kind of syntax it
 	 * expected to see (expectation). See documentation for Parsimmon(fn).
 	 */
-	function makeFailure(furthest: number, expectation: string): Failure;
+	function makeFailure(furthest: number, expectation: string): FailureReply;
 
 	/**
 	 * Returns true if obj is a Parsimmon parser, otherwise false.
@@ -276,9 +348,27 @@ declare namespace Parsimmon {
 		p1: Parser<T>, p2: Parser<U>, p3: Parser<V>, p4: Parser<W>, p5: Parser<X>, p6: Parser<Y>, p7: Parser<Z>, p8: Parser<A>,
 		cb: (a1: T, a2: U, a3: V, a4: W, a5: X, a6: Y, a7: Z, a8: A) => B): Parser<B>;
 
-	type SuccessFunctionType<U> = (index: number, result: U) => Result<U>;
-	type FailureFunctionType<U> = (index: number, msg: string) => Result<U>;
-	type ParseFunctionType<U> = (stream: StreamType, index: number) => Result<U>;
+	interface SuccessReply<T> {
+		status: true;
+		index: number;
+		value: T;
+		furthest: -1;
+		expected: string[];
+	}
+
+	interface FailureReply {
+		status: false;
+		index: -1;
+		value: null;
+		furthest: number;
+		expected: string[];
+	}
+
+	type Reply<T> = SuccessReply<T> | FailureReply;
+
+	type SuccessFunctionType<U> = (index: number, result: U) => Reply<U>;
+	type FailureFunctionType<U> = (index: number, msg: string) => Reply<U>;
+	type ParseFunctionType<U> = (stream: StreamType, index: number) => Reply<U>;
 	/**
 	 * allows to add custom primitive parsers.
 	 */
diff --git a/types/parsimmon/parsimmon-tests.ts b/types/parsimmon/parsimmon-tests.ts
index 4c8780f5fc..c6dbaec22c 100644
--- a/types/parsimmon/parsimmon-tests.ts
+++ b/types/parsimmon/parsimmon-tests.ts
@@ -1,5 +1,5 @@
 import P = require('parsimmon');
-import { Parser, Mark, Result, Index } from "parsimmon";
+import { Parser, Mark, Result, Index, Reply, Language, TypedLanguage } from "parsimmon";
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
@@ -13,27 +13,27 @@ class Bar {
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
-let str: string;
+let str: string = null!;
 let strArr: string[];
 let bool: boolean;
-let num: number;
+let num: number = null!;
 let index: Index;
 
-let foo: Foo;
+let foo: Foo = null!;
 declare const bar: Bar;
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
 let strPar: Parser<string>;
-let numPar: Parser<number>;
+let numPar: Parser<number> = null!;
 let voidPar: Parser<void>;
 let anyPar: Parser<any>;
 let nullPar: Parser<null>;
 let emptyStrPar: Parser<''>;
 let indexPar: Parser<Index>;
 
-let fooPar: Parser<Foo>;
-let barPar: Parser<Bar>;
+let fooPar: Parser<Foo> = null!;
+let barPar: Parser<Bar> = null!;
 let fooOrBarPar: Parser<Foo | Bar>;
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
@@ -43,7 +43,7 @@ let fooArrPar: Parser<Foo[]>;
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
-let fooMarkPar: Parser<Mark<Foo>>;
+let fooMarkPar: Parser<Mark<Foo>> = null!;
 
 const result = fooMarkPar.parse(str);
 if (result.status) {
@@ -54,7 +54,7 @@ if (result.status) {
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
-let fooResult: Result<Foo>;
+let fooResult: Result<Foo> = fooPar.parse("");
 
 // https://github.com/Microsoft/TypeScript/issues/12882
 if (fooResult.status === true) {
@@ -65,9 +65,10 @@ if (fooResult.status === true) {
 }
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
+let fooReply: Reply<Foo>;
 
-fooResult = P.makeSuccess(0, foo);
-fooResult = P.makeFailure(0, '');
+fooReply = P.makeSuccess(0, foo);
+fooReply = P.makeFailure(0, '');
 
 fooPar = P((input: string, i: number) => P.makeSuccess(0, foo));
 fooPar = P.Parser((input: string, i: number) => P.makeSuccess(0, foo));
@@ -190,3 +191,55 @@ strArrPar = P.sepBy1(P.string('foo'), P.string('bar'));
 strPar = P.test((a: string) => false);
 
 strPar = P.takeWhile((a: string) => true);
+
+// --  --  --  --  --  --  --  --  --  --  --  --  --
+
+let language: Language;
+
+language = P.createLanguage({
+	SomeRule: r => P.alt(P.string(""), r.AnotherRule),
+	AnotherRule: () => P.string(""),
+});
+
+// $ExpectType Parser<any>
+language.SomeRule;
+// $ExpectType Parser<any>
+language.AnotherRule;
+// $ExpectType Parser<any>
+language.UndefinedRule;
+
+interface MyLanguageSpec {
+	FooRule: Foo;
+	BarRule: Bar;
+	StringRule: string;
+}
+
+let myLanguage: TypedLanguage<MyLanguageSpec>;
+
+myLanguage = P.createLanguage<MyLanguageSpec>({
+	FooRule: r => {
+		fooPar = r.FooRule;
+		barPar = r.BarRule;
+		strPar = r.StringRule;
+		return fooPar;
+	},
+	BarRule: r => barPar,
+	StringRule: () => strPar,
+});
+
+// $ExpectType Parser<Foo>
+myLanguage.FooRule;
+// $ExpectType Parser<Bar>
+myLanguage.BarRule;
+// $ExpectType Parser<string>
+myLanguage.StringRule;
+
+const noRules = P.createLanguage<{}>({});
+
+// $ExpectError
+P.createLanguage<{MissingRule: string}>({});
+
+P.createLanguage<{SomeRule: string}>({
+	SomeRule: r => strPar,
+	AnotherRule: (r: any) => strPar // $ExpectError
+});
diff --git a/types/parsimmon/tsconfig.json b/types/parsimmon/tsconfig.json
index 34d78a5d0a..676b349a37 100644
--- a/types/parsimmon/tsconfig.json
+++ b/types/parsimmon/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "parsimmon-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/passport-anonymous/index.d.ts b/types/passport-anonymous/index.d.ts
index c997c92ff0..6e45ed3a23 100644
--- a/types/passport-anonymous/index.d.ts
+++ b/types/passport-anonymous/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-anonymous
 // Definitions by: Pavel Puchkov <https://github.com/0x6368656174>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as passport from "passport";
 
diff --git a/types/passport-beam/index.d.ts b/types/passport-beam/index.d.ts
index 852ac6f698..6d7d1de430 100644
--- a/types/passport-beam/index.d.ts
+++ b/types/passport-beam/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alfw/passport-beam
 // Definitions by: AtlasDev <https://github.com/AtlasDev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 ///<reference types="passport"/>
 ///<reference types="express"/>
diff --git a/types/passport-beam/tslint.json b/types/passport-beam/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-beam/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-client-cert/index.d.ts b/types/passport-client-cert/index.d.ts
deleted file mode 100644
index 8428545a8f..0000000000
--- a/types/passport-client-cert/index.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for passport-jwt 2.0
-// Project: https://github.com/ripjar/passport-client-cert
-// Definitions by: Sean Warner <https://github.com/warnersean>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-import { Strategy as PassportStrategy } from 'passport-strategy';
-import { Request } from 'express';
-
-export class Strategy extends PassportStrategy {
-    constructor(verify: PkiCallback);
-    constructor(opt: StrategyOptions, verify: PkiCallback | PkiCallbackWithRequest);
-}
-
-export interface StrategyOptions {
-    passReqToCallback?: boolean;
-}
-
-export type PkiCallback = (payload: ClientCert, done: PkiVerifiedCallback) => void;
-
-export type PkiCallbackWithRequest = (req: Request, payload: ClientCert, done: PkiVerifiedCallback) => void;
-
-export interface ClientCert {
-    exponent: string;
-    fingerprint: string;
-    issuer: any;
-    modulus: string;
-    raw: Uint8Array;
-    serialNumber: string;
-    subject: any;
-    valid_from: string;
-    valid_to: string;
-}
-
-export type PkiVerifiedCallback = (error: any, user?: any, info?: any) => void;
diff --git a/types/passport-client-cert/passport-client-cert-tests.ts b/types/passport-client-cert/passport-client-cert-tests.ts
deleted file mode 100644
index d0790ba4f2..0000000000
--- a/types/passport-client-cert/passport-client-cert-tests.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as passport from "passport";
-import { ClientCert, PkiVerifiedCallback, Strategy as ClientCertStrategy } from "passport-client-cert";
-
-passport.use(new ClientCertStrategy((clientCert: ClientCert, done: PkiVerifiedCallback) => {
-    const cn = clientCert.subject.cn;
-    let user = null;
-
-    // The CN will typically be checked against a database
-    if (cn === 'test-cn') {
-        user = { name: 'Test User' };
-    }
-
-    done(null, user);
-}));
diff --git a/types/passport-client-cert/tsconfig.json b/types/passport-client-cert/tsconfig.json
deleted file mode 100644
index fbf48f7438..0000000000
--- a/types/passport-client-cert/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "passport-client-cert-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/passport-discord/index.d.ts b/types/passport-discord/index.d.ts
index 8cc99df36d..66b9474a2d 100644
--- a/types/passport-discord/index.d.ts
+++ b/types/passport-discord/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nicholastay/passport-discord#readme
 // Definitions by: Gonthier Renaud <https://github.com/kzay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 /** Declaration file generated by dts-gen */
 
 import * as passport from 'passport';
diff --git a/types/passport-facebook-token/index.d.ts b/types/passport-facebook-token/index.d.ts
index 49bfc62d11..9877b84527 100644
--- a/types/passport-facebook-token/index.d.ts
+++ b/types/passport-facebook-token/index.d.ts
@@ -1,38 +1,61 @@
-// Type definitions for passport-facebook-token 0.4.0
+// Type definitions for passport-facebook-token 0.4
 // Project: https://github.com/drudge/passport-facebook-token
-// Definitions by: Ray Martone <https://github.com/rmartone>
+// Definitions by: Ray Martone <https://github.com/rmartone>, Michael Randolph <https://github.com/mrand01>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
-/// <reference types="passport"/>
+import * as passport from 'passport';
+import * as express from 'express';
 
+declare namespace PassportFacebookToken {
+    interface StrategyStatic {
+        new(options: StrategyOptionsWithRequest, verify: VerifyFunctionWithRequest): StrategyInstance;
+        new(options: StrategyOptions, verify: VerifyFunction): StrategyInstance;
+    }
 
+    interface StrategyInstance {
+        name: string;
+        authenticate: (req: express.Request, options?: any) => void;
+    }
 
-import passport = require('passport');
-import express = require('express');
+    interface ValueObject {
+        value: string;
+    }
 
-interface Profile extends passport.Profile {
-    gender: string;
-    profileUrl: string;
+    interface Profile extends passport.Profile {
+        provider: string;
+        id: string;
+        displayName: string;
+        name: {
+            familyName: string;
+            givenName: string;
+            middleName: string;
+        };
+        gender: string;
+        emails: ValueObject[];
+        photos: ValueObject[];
+        _raw: string;
+        _json: any;
+    }
+
+    interface StrategyOptions {
+        clientID: string;
+        clientSecret: string;
+        authorizationURL?: string;
+        tokenURL?: string;
+        scopeSeparator?: string;
+        enableProof?: boolean;
+        profileFields?: string[];
+    }
+
+    interface StrategyOptionsWithRequest extends StrategyOptions {
+        passReqToCallback: true;
+    }
+
+    type VerifyFunction = (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
+
+    type VerifyFunctionWithRequest = (req: express.Request, accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
 }
 
-interface StrategyOptions {
-    clientID: string;
-    clientSecret: string;
-    authorizationURL?: string;
-    tokenURL?: string;
-    scopeSeparator?: string;
-    passReqToCallback?: Function;
-    enableProof?: boolean;
-    profileFields?: any[];
-}
-
-declare class Strategy implements passport.Strategy {
-    constructor(options: StrategyOptions,
-        verify: (accessToken: string,
-            refreshToken: string,
-            profile: Profile,
-            done: (err: any, user?: any) => void) => void);
-    name: string;
-    authenticate: (req: express.Request, options?: any) => void;
-}
+declare const PassportFacebookToken: PassportFacebookToken.StrategyStatic;
+export = PassportFacebookToken;
diff --git a/types/passport-facebook-token/passport-facebook-token-tests.ts b/types/passport-facebook-token/passport-facebook-token-tests.ts
index e44100ca7d..c926748286 100644
--- a/types/passport-facebook-token/passport-facebook-token-tests.ts
+++ b/types/passport-facebook-token/passport-facebook-token-tests.ts
@@ -1,28 +1,43 @@
+import * as express from 'express';
+import * as passport from 'passport';
+import * as PassportFacebookToken from 'passport-facebook-token';
 
-import passport = require('passport');
-import facebook = require('passport-facebook-token');
-
-var User = {
+const User = {
     findOrCreate(id: string, provider: string, callback: (err: any, user: any) => void): void {
-        callback(null, {username: 'ray'});
+        callback(null, { username: 'ray' });
     }
-}
-
-var options: facebook.StrategyOptions = {
-    clientID: process.env.PASSPORT_FACEBOOK_CLIENT_ID,
-    clientSecret: process.env.PASSPORT_FACEBOOK_CLIENT_SECRET
 };
 
-function verify(accessToken: string,
-                refreshToken: string,
-                profile: facebook.Profile,
-                done: (err: any, user?: any) => void) {
-    User.findOrCreate(profile.id, profile.provider, function (err, user) {
+const options: PassportFacebookToken.StrategyOptions = {
+    clientID: 'TEST_CLIENT_ID',
+    clientSecret: 'TEST_CLIENT_SECRET'
+};
+
+const optionsWithRequest: PassportFacebookToken.StrategyOptionsWithRequest = {
+    clientID: 'TEST_CLIENT_ID',
+    clientSecret: 'TEST_CLIENT_SECRET',
+    passReqToCallback: true
+};
+
+const verify: PassportFacebookToken.VerifyFunction =
+    (accessToken: string, refreshToken: string, profile: PassportFacebookToken.Profile, done: (err: any, user?: any, info?: any) => void) => {
+    User.findOrCreate(profile.id, profile.provider, (err, user) => {
         if (err) {
-            return done(err);
+            done(err);
         }
         done(null, user);
     });
-}
+};
 
-passport.use(new facebook.Strategy(options, verify));
+const verifyWithRequest: PassportFacebookToken.VerifyFunctionWithRequest =
+    (req: express.Request, accessToken: string, refreshToken: string, profile: PassportFacebookToken.Profile, done: (err: any, user?: any, info?: any) => void) => {
+    User.findOrCreate(profile.id, profile.provider, (err, user) => {
+        if (err) {
+            done(err);
+        }
+        done(null, user);
+    });
+};
+
+passport.use(new PassportFacebookToken(options, verify));
+passport.use(new PassportFacebookToken(optionsWithRequest, verifyWithRequest));
diff --git a/types/passport-facebook-token/tsconfig.json b/types/passport-facebook-token/tsconfig.json
index a5f4d17112..e1d020177a 100644
--- a/types/passport-facebook-token/tsconfig.json
+++ b/types/passport-facebook-token/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/passport-facebook-token/tslint.json b/types/passport-facebook-token/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/passport-facebook-token/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/passport-facebook/index.d.ts b/types/passport-facebook/index.d.ts
index 184e4711e2..5d20f0d39c 100644
--- a/types/passport-facebook/index.d.ts
+++ b/types/passport-facebook/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-facebook
 // Definitions by: James Roland Cabresos <https://github.com/staticfunction>, Lucas Acosta <https://github.com/lucasmacosta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import passport = require('passport');
 import express = require('express');
diff --git a/types/passport-facebook/passport-facebook-tests.ts b/types/passport-facebook/passport-facebook-tests.ts
index 52ef4095a1..a93a163230 100644
--- a/types/passport-facebook/passport-facebook-tests.ts
+++ b/types/passport-facebook/passport-facebook-tests.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /**
  * Created by jcabresos on 4/19/2014.
  */
@@ -7,21 +6,21 @@ import facebook = require('passport-facebook');
 import express = require('express');
 
 // just some test model
-var User = {
-    findOrCreate(id:string, provider:string, callback:(err:any, user:any) => void): void {
-        callback(null, {username:'james'});
+const User = {
+    findOrCreate(id: string, provider: string, callback: (err: any, user: any) => void): void {
+        callback(null, { username: 'james' });
     }
-}
+};
 
 passport.use(new facebook.Strategy({
             clientID: process.env.PASSPORT_FACEBOOK_CLIENT_ID,
             clientSecret: process.env.PASSPORT_FACEBOOK_CLIENT_SECRET,
             callbackURL: process.env.PASSPORT_FACEBOOK_CALLBACK_URL
     },
-    function(accessToken:string, refreshToken:string, profile:facebook.Profile, done:(error:any, user?:any) => void) {
-         User.findOrCreate(profile.id, profile.provider, function(err, user) {
-             if (err) { return done(err); }
-             done(null, user);
+    (accessToken: string, refreshToken: string, profile: facebook.Profile, done: (error: any, user?: any) => void) => {
+         User.findOrCreate(profile.id, profile.provider, (err, user) => {
+             if (err) done(err);
+             else done(null, user);
          });
     })
 );
@@ -32,10 +31,10 @@ passport.use(new facebook.Strategy({
             callbackURL: process.env.PASSPORT_FACEBOOK_CALLBACK_URL,
             passReqToCallback: true
     },
-    function(req: express.Request, accessToken:string, refreshToken:string, profile:facebook.Profile, done:(error:any, user?:any) => void) {
-         User.findOrCreate(profile.id, profile.provider, function(err, user) {
-             if (err) { return done(err); }
-             done(null, user);
+    (req: express.Request, accessToken: string, refreshToken: string, profile: facebook.Profile, done: (error: any, user?: any) => void) => {
+         User.findOrCreate(profile.id, profile.provider, (err, user) => {
+             if (err) done(err);
+             else done(null, user);
          });
     })
 );
@@ -45,7 +44,7 @@ passport.use(new facebook.Strategy({
             clientSecret: process.env.PASSPORT_FACEBOOK_CLIENT_SECRET,
             callbackURL: process.env.PASSPORT_FACEBOOK_CALLBACK_URL
     },
-    function(accessToken:string, refreshToken:string, profile:facebook.Profile, done:(error:any, user?:any, info?:any) => void) {
+    (accessToken: string, refreshToken: string, profile: facebook.Profile, done: (error: any, user?: any, info?: any) => void) => {
          done(null, false, { message: 'Some error.' });
     })
 );
diff --git a/types/passport-github/index.d.ts b/types/passport-github/index.d.ts
index 0b0880bb05..c4a253016f 100644
--- a/types/passport-github/index.d.ts
+++ b/types/passport-github/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-github
 // Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import passport = require('passport');
 import express = require('express');
diff --git a/types/passport-github2/index.d.ts b/types/passport-github2/index.d.ts
index 7fc85287f7..b0310a6f3b 100644
--- a/types/passport-github2/index.d.ts
+++ b/types/passport-github2/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
 //                 Maarten Mulders <https://github.com/mthmulders>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import passport = require('passport');
 import express = require('express');
@@ -19,6 +19,7 @@ export interface StrategyOption {
 
     scope?: string[];
     userAgent?: string;
+    state?: boolean;
 
     authorizationURL?: string;
     tokenURL?: string;
diff --git a/types/passport-google-oauth/index.d.ts b/types/passport-google-oauth/index.d.ts
index cefd05fe20..a56c91e73f 100644
--- a/types/passport-google-oauth/index.d.ts
+++ b/types/passport-google-oauth/index.d.ts
@@ -1,19 +1,16 @@
-// Type definitions for passport-facebook 1.0.3
-// Project: https://github.com/jaredhanson/passport-facebook
+// Type definitions for passport-google-oauth 1.0.3
+// Project: https://github.com/jaredhanson/passport-google-oauth
 // Definitions by: James Roland Cabresos <https://github.com/staticfunction>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="passport"/>
 
-
-
 import passport = require('passport');
 import express = require('express');
 
 interface Profile extends passport.Profile {
     gender: string;
-
     _raw: string;
     _json: any;
 }
@@ -22,7 +19,6 @@ interface IOAuthStrategyOption {
     consumerKey: string;
     consumerSecret: string;
     callbackURL: string;
-
     requestTokenURL?: string;
     accessTokenURL?: string;
     userAuthorizationURL?: string;
@@ -38,8 +34,15 @@ interface VerifyFunction {
 }
 
 declare class OAuthStrategy implements passport.Strategy {
-    constructor(options: IOAuthStrategyOption,
-        verify: (accessToken: string, refreshToken: string, profile: Profile, done: VerifyFunction) => void);
+    constructor(
+        options: IOAuthStrategyOption,
+        verify: (
+            accessToken: string,
+            refreshToken: string,
+            profile: Profile,
+            done: VerifyFunction
+        ) => void
+    );
     name: string;
     authenticate: (req: express.Request, options?: Object) => void;
 }
@@ -48,10 +51,8 @@ interface IOAuth2StrategyOption {
     clientID: string;
     clientSecret: string;
     callbackURL: string;
-
     authorizationURL?: string;
     tokenURL?: string;
-
     accessType?: string;
     approval_prompt?: string;
     prompt?: string;
@@ -64,14 +65,29 @@ interface IOAuth2StrategyOption {
 }
 
 interface IOAuth2StrategyOptionWithRequest extends IOAuth2StrategyOption {
-    passReqToCallback: true;
+    passReqToCallback: boolean;
 }
 
 declare class OAuth2Strategy implements passport.Strategy {
-    constructor(options: IOAuth2StrategyOption,
-        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-    constructor(options: IOAuth2StrategyOptionWithRequest,
-        verify: (req: express.Request, accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    constructor(
+        options: IOAuth2StrategyOption,
+        verify: (
+            accessToken: string,
+            refreshToken: string,
+            profile: Profile,
+            done: (error: any, user?: any) => void
+        ) => void
+    );
+    constructor(
+        options: IOAuth2StrategyOptionWithRequest,
+        verify: (
+            req: express.Request,
+            accessToken: string,
+            refreshToken: string,
+            profile: Profile,
+            done: (error: any, user?: any) => void
+        ) => void
+    );
 
     name: string;
     authenticate: (req: express.Request, options?: Object) => void;
diff --git a/types/passport-google-oauth/passport-google-oauth-tests.ts b/types/passport-google-oauth/passport-google-oauth-tests.ts
index ad0ed185a3..2e9a4bb9c2 100644
--- a/types/passport-google-oauth/passport-google-oauth-tests.ts
+++ b/types/passport-google-oauth/passport-google-oauth-tests.ts
@@ -1,55 +1,98 @@
-
 /**
  * Created by jcabresos on 4/19/2014.
  */
-import express = require("express");
+import express = require('express');
 import passport = require('passport');
 import google = require('passport-google-oauth');
 
 // just some test model
 var User = {
-    findOrCreate(id:string, provider:string, callback:(err:any, user:any) => void): void {
-        callback(null, {username:'james'});
+    findOrCreate(
+        id: string,
+        provider: string,
+        callback: (err: any, user: any) => void
+    ): void {
+        callback(null, { username: 'james' });
     }
-}
+};
 
-passport.use(new google.OAuthStrategy({
+passport.use(
+    new google.OAuthStrategy(
+        {
             consumerKey: process.env.GOOGLE_CONSUMER_KEY,
             consumerSecret: process.env.GOOGLE_CONSUMER_SECRET,
             callbackURL: process.env.PASSPORT_GOOGLE_CALLBACK_URL
-    },
-    function(accessToken:string, refreshToken:string, profile:google.Profile, done:(error:any, user?:any, msg?: google.VerifyOptions) => void) {
-         User.findOrCreate(profile.id, profile.provider, function(err, user) {
-             if (err) { return done(err); }
-             else if(!user) return done(null, false, {message: 'not found user'});
-             return done(null, user);
-         });
-    })
+        },
+        function(
+            accessToken: string,
+            refreshToken: string,
+            profile: google.Profile,
+            done: (error: any, user?: any, msg?: google.VerifyOptions) => void
+        ) {
+            User.findOrCreate(profile.id, profile.provider, function(
+                err,
+                user
+            ) {
+                if (err) {
+                    return done(err);
+                } else if (!user)
+                    return done(null, false, { message: 'not found user' });
+                return done(null, user);
+            });
+        }
+    )
 );
 
-passport.use(new google.OAuth2Strategy({
+passport.use(
+    new google.OAuth2Strategy(
+        {
             clientID: process.env.GOOGLE_CLIENT_ID,
             clientSecret: process.env.GOOGLE_CLIENT_SECRET,
             callbackURL: process.env.PASSPORT_GOOGLE_CALLBACK_URL
-    },
-    function(accessToken:string, refreshToken:string, profile:google.Profile, done:(error:any, user?:any) => void) {
-         User.findOrCreate(profile.id, profile.provider, function(err, user) {
-             if (err) { return done(err); }
-             done(null, user);
-         });
-    })
+        },
+        function(
+            accessToken: string,
+            refreshToken: string,
+            profile: google.Profile,
+            done: (error: any, user?: any) => void
+        ) {
+            User.findOrCreate(profile.id, profile.provider, function(
+                err,
+                user
+            ) {
+                if (err) {
+                    return done(err);
+                }
+                done(null, user);
+            });
+        }
+    )
 );
 
-passport.use(new google.OAuth2Strategy({
+passport.use(
+    new google.OAuth2Strategy(
+        {
             clientID: process.env.GOOGLE_CLIENT_ID,
             clientSecret: process.env.GOOGLE_CLIENT_SECRET,
             callbackURL: process.env.PASSPORT_GOOGLE_CALLBACK_URL,
             passReqToCallback: true
-    },
-    function(req: express.Request, accessToken:string, refreshToken:string, profile:google.Profile, done:(error:any, user?:any) => void) {
-         User.findOrCreate(profile.id, profile.provider, function(err, user) {
-             if (err) { return done(err); }
-             done(null, user);
-         });
-    })
+        },
+        function(
+            req: express.Request,
+            accessToken: string,
+            refreshToken: string,
+            profile: google.Profile,
+            done: (error: any, user?: any) => void
+        ) {
+            User.findOrCreate(profile.id, profile.provider, function(
+                err,
+                user
+            ) {
+                if (err) {
+                    return done(err);
+                }
+                done(null, user);
+            });
+        }
+    )
 );
diff --git a/types/passport-google-oauth/tsconfig.json b/types/passport-google-oauth/tsconfig.json
index adde576621..7f3b315c07 100644
--- a/types/passport-google-oauth/tsconfig.json
+++ b/types/passport-google-oauth/tsconfig.json
@@ -1,23 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "passport-google-oauth-tests.ts"
-    ]
-}
\ No newline at end of file
+    "files": ["index.d.ts", "passport-google-oauth-tests.ts"]
+}
diff --git a/types/passport-google-oauth/tslint.json b/types/passport-google-oauth/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-google-oauth/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-http-bearer/index.d.ts b/types/passport-http-bearer/index.d.ts
index 07ed927d57..698b0bfed5 100644
--- a/types/passport-http-bearer/index.d.ts
+++ b/types/passport-http-bearer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-http-bearer
 // Definitions by: Isman Usoh <https://github.com/isman-usoh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="passport"/>
 /// <reference types="express" />
diff --git a/types/passport-http-bearer/tslint.json b/types/passport-http-bearer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-http-bearer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-http/index.d.ts b/types/passport-http/index.d.ts
index efd474404d..e9a66964ea 100644
--- a/types/passport-http/index.d.ts
+++ b/types/passport-http/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-http
 // Definitions by: Christophe Vidal <https://github.com/krizalys>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import passport = require("passport");
 import express = require("express");
diff --git a/types/passport-http/tslint.json b/types/passport-http/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-http/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-jwt/index.d.ts b/types/passport-jwt/index.d.ts
index 9bc14618d1..c300276fe2 100644
--- a/types/passport-jwt/index.d.ts
+++ b/types/passport-jwt/index.d.ts
@@ -1,9 +1,11 @@
-// Type definitions for passport-jwt 2.0
+// Type definitions for passport-jwt 3.0
 // Project: https://github.com/themikenicholson/passport-jwt
 // Definitions by: TANAKA Koichi <https://github.com/mugeso/>
 //                 Alex Young <https://github.com/alsiola/>
 //                 David Ng <https://github.com/davidNHK/>
+//                 Carlos Eduardo Scheffer <https://github.com/carlosscheffer/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Strategy as PassportStrategy } from 'passport-strategy';
 import {Request} from 'express';
@@ -14,7 +16,8 @@ export declare class Strategy extends PassportStrategy {
 }
 
 export interface StrategyOptions {
-    secretOrKey: string | Buffer;
+    secretOrKey?: string | Buffer;
+    secretOrKeyProvider?: any;
     jwtFromRequest: JwtFromRequestFunction;
     issuer?: string;
     audience?: string;
diff --git a/types/passport-jwt/tslint.json b/types/passport-jwt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-jwt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-kakao/index.d.ts b/types/passport-kakao/index.d.ts
new file mode 100644
index 0000000000..d99f608ab7
--- /dev/null
+++ b/types/passport-kakao/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for passport-kakao 0.1
+// Project: https://github.com/rotoshine/passport-kakao
+// Definitions by: Park9eon <https://github.com/Park9eon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import passport = require("passport");
+import express = require("express");
+
+export interface Profile extends passport.Profile {
+    id: string;
+    provider: string;
+
+    _raw: string;
+    _json: any;
+}
+
+export interface StrategyOption {
+    clientID: string;
+    clientSecret: string;
+    callbackURL: string;
+
+    scopeSeparator?: string;
+    customHeaders?: string;
+}
+
+export type VerifyFunction =
+    (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
+
+export class Strategy implements passport.Strategy {
+    constructor(options: StrategyOption, verify: VerifyFunction);
+
+    authenticate: (req: express.Request, options?: any) => void;
+    userProfile: (accessToken: string, done: (error: any, user?: any) => void) => void;
+}
diff --git a/types/passport-kakao/passport-kakao-tests.ts b/types/passport-kakao/passport-kakao-tests.ts
new file mode 100644
index 0000000000..595404cc5b
--- /dev/null
+++ b/types/passport-kakao/passport-kakao-tests.ts
@@ -0,0 +1,10 @@
+import {Strategy as KakaoStrategy } from 'passport-kakao';
+
+new KakaoStrategy({
+        clientID: 'client',
+        clientSecret: 'clientSecret',
+        callbackURL: 'callbackUrl'
+    },
+    (accessToken: string, refreshToken: string, profile: any, done: any) => {
+        // signUp or signIn
+    });
diff --git a/types/passport-kakao/tsconfig.json b/types/passport-kakao/tsconfig.json
new file mode 100644
index 0000000000..784cbe32e8
--- /dev/null
+++ b/types/passport-kakao/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-kakao-tests.ts"
+    ]
+}
diff --git a/types/passport-kakao/tslint.json b/types/passport-kakao/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/passport-kakao/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/passport-local-mongoose/tslint.json b/types/passport-local-mongoose/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-local-mongoose/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-local/index.d.ts b/types/passport-local/index.d.ts
index 70c3ecfdfc..2fe5bde949 100644
--- a/types/passport-local/index.d.ts
+++ b/types/passport-local/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-local
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="passport"/>
 
diff --git a/types/passport-local/tslint.json b/types/passport-local/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-local/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-naver/index.d.ts b/types/passport-naver/index.d.ts
new file mode 100644
index 0000000000..75c21b76ed
--- /dev/null
+++ b/types/passport-naver/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for passport-naver 0.1
+// Project: https://github.com/naver/passport-naver
+// Definitions by: Park9eon <https://github.com/Park9eon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import passport = require("passport");
+import express = require("express");
+
+export interface Profile extends passport.Profile {
+    id: string;
+    provider: string;
+
+    _json: {
+        email: string,
+        nickname: string,
+        profile_image: string,
+        age: number,
+        birthday: any
+        id: string
+    };
+}
+
+export interface StrategyOption {
+    clientID: string;
+    clientSecret: string;
+    callbackURL: string;
+
+    svcType?: number;
+    authType?: string;
+
+    authorizationURL?: string;
+    tokenURL?: string;
+    profileURL?: string;
+}
+
+export type VerifyFunction =
+    (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
+
+export class Strategy implements passport.Strategy {
+    constructor(options: StrategyOption, verify: VerifyFunction);
+
+    authenticate: (req: express.Request, options?: any) => void;
+    authorizationParams: (options: any) => any;
+    userProfile: (accessToken: string, done: (error: any, user?: any) => void) => void;
+}
diff --git a/types/passport-naver/passport-naver-tests.ts b/types/passport-naver/passport-naver-tests.ts
new file mode 100644
index 0000000000..72e76d32e7
--- /dev/null
+++ b/types/passport-naver/passport-naver-tests.ts
@@ -0,0 +1,10 @@
+import {Strategy as NaverStrategy } from 'passport-naver';
+
+new NaverStrategy({
+        clientID: 'client',
+        clientSecret: 'clientSecret',
+        callbackURL: 'callbackUrl'
+    },
+    (accessToken: string, refreshToken: string, profile: any, done: any) => {
+        // signUp or signIn
+    });
diff --git a/types/passport-naver/tsconfig.json b/types/passport-naver/tsconfig.json
new file mode 100644
index 0000000000..1a8826dcfd
--- /dev/null
+++ b/types/passport-naver/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-naver-tests.ts"
+    ]
+}
diff --git a/types/passport-naver/tslint.json b/types/passport-naver/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/passport-naver/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/passport-oauth2-client-password/index.d.ts b/types/passport-oauth2-client-password/index.d.ts
index 98c45ef998..2a93a87608 100644
--- a/types/passport-oauth2-client-password/index.d.ts
+++ b/types/passport-oauth2-client-password/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-oauth2-client-password
 // Definitions by: Ivan Zubok <https://github.com/akaNightmare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="passport"/>
 /// <reference types="express"/>
diff --git a/types/passport-oauth2-client-password/tslint.json b/types/passport-oauth2-client-password/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-oauth2-client-password/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts
index 6be0c6ad44..09facb2ef7 100644
--- a/types/passport-oauth2/index.d.ts
+++ b/types/passport-oauth2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-oauth2#readme
 // Definitions by: Pasi Eronen <https://github.com/pasieronen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Request } from 'express';
 import { Strategy } from 'passport';
diff --git a/types/passport-oauth2/passport-oauth2-tests.ts b/types/passport-oauth2/passport-oauth2-tests.ts
index 23f97c38ea..bfedf67dad 100644
--- a/types/passport-oauth2/passport-oauth2-tests.ts
+++ b/types/passport-oauth2/passport-oauth2-tests.ts
@@ -1,5 +1,4 @@
-// tslint:disable-next-line:no-duplicate-imports
-import * as OAuth2Strategy from 'passport-oauth2';
+import OAuth2Strategy = require('passport-oauth2');
 import { Strategy, StrategyOptions, StrategyOptionsWithRequest, VerifyCallback, AuthorizationError, TokenError, InternalOAuthError } from 'passport-oauth2';
 import { Strategy as PassportStrategy } from 'passport';
 import { Request } from 'express';
diff --git a/types/passport-saml/index.d.ts b/types/passport-saml/index.d.ts
index aae361373b..e93869ca87 100644
--- a/types/passport-saml/index.d.ts
+++ b/types/passport-saml/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bergie/passport-saml
 // Definitions by: Chris Barth <https://github.com/cjbarth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import passport = require('passport');
 import express = require('express');
diff --git a/types/passport-steam/index.d.ts b/types/passport-steam/index.d.ts
index 5658623ab3..9e5470a070 100644
--- a/types/passport-steam/index.d.ts
+++ b/types/passport-steam/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/liamcurry/passport-steam
 // Definitions by: Gonthier Renaud <https://github.com/kzay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export = passport_steam;
 
diff --git a/types/passport-strategy/index.d.ts b/types/passport-strategy/index.d.ts
index c9c15f0a2b..1a0b2dd4f5 100644
--- a/types/passport-strategy/index.d.ts
+++ b/types/passport-strategy/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-strategy
 // Definitions by: Lior Mualem <https://github.com/liorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="passport"/>
 
diff --git a/types/passport-strategy/tslint.json b/types/passport-strategy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-strategy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-twitter/index.d.ts b/types/passport-twitter/index.d.ts
index 41cee10286..fe341a4b5b 100644
--- a/types/passport-twitter/index.d.ts
+++ b/types/passport-twitter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jaredhanson/passport-twitter
 // Definitions by: James Roland Cabresos <https://github.com/staticfunction>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="passport"/>
 
diff --git a/types/passport-twitter/tslint.json b/types/passport-twitter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/passport-twitter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/passport-unique-token/index.d.ts b/types/passport-unique-token/index.d.ts
index ace65042f1..081a85b29d 100644
--- a/types/passport-unique-token/index.d.ts
+++ b/types/passport-unique-token/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: briman0094 <https://github.com/briman0094>
 //                 Maxime LUCE <https://github.com/SomaticIT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import passport = require('passport');
 import express = require('express');
diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index b1c9d95196..0e612810d4 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -1,102 +1,154 @@
-// Type definitions for Passport 0.3
+// Type definitions for Passport 0.4
 // Project: http://passportjs.org
-// Definitions by: Horiuchi_H <https://github.com/horiuchi>, Eric Naeseth <https://github.com/enaeseth>
+// Definitions by: Horiuchi_H <https://github.com/horiuchi>
+//                 Eric Naeseth <https://github.com/enaeseth>
+//                 Igor Belagorudsky <https://github.com/theigor>
+//                 Tomek �aziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-declare namespace Express {
-    export interface Request {
-        authInfo?: any;
-        user?: any;
+declare global {
+    namespace Express {
+        interface Request {
+            authInfo?: any;
+            user?: any;
 
-        // These declarations are merged into express's Request type
-        login(user: any, done: (err: any) => void): void;
-        login(user: any, options: any, done: (err: any) => void): void;
-        logIn(user: any, done: (err: any) => void): void;
-        logIn(user: any, options: any, done: (err: any) => void): void;
+            // These declarations are merged into express's Request type
+            login(user: any, done: (err: any) => void): void;
+            login(user: any, options: any, done: (err: any) => void): void;
+            logIn(user: any, done: (err: any) => void): void;
+            logIn(user: any, options: any, done: (err: any) => void): void;
 
-        logout(): void;
-        logOut(): void;
+            logout(): void;
+            logOut(): void;
 
-        isAuthenticated(): boolean;
-        isUnauthenticated(): boolean;
+            isAuthenticated(): boolean;
+            isUnauthenticated(): boolean;
+        }
     }
 }
 
-declare module 'passport' {
-    import express = require('express');
+import express = require('express');
 
-    namespace passport {
-        interface AuthenticateOptions {
-            authInfo?: boolean;
-            assignProperty?: string;
-            failureFlash?: string|boolean|any;
-            failureMessage?: boolean|string;
-            failureRedirect?: string;
-            failWithError?: boolean;
-            session?: boolean;
-            scope?: string|string[];
-            successFlash?: string|boolean|any;
-            successMessage?: boolean|string;
-            successRedirect?: string;
-            successReturnToOrRedirect?: string;
-            pauseStream?: boolean;
-            userProperty?: string;
-        }
-
-        interface Passport {
-            use(strategy: passport.Strategy): this;
-            use(name: string, strategy: passport.Strategy): this;
-            unuse(name: string): this;
-            framework(fw: passport.Framework): this;
-            initialize(options?: { userProperty: string; }): express.Handler;
-            session(options?: { pauseStream: boolean; }): express.Handler;
-
-            authenticate(strategy: string|string[], callback?: Function): express.Handler;
-            authenticate(strategy: string|string[], options: AuthenticateOptions, callback?: Function): express.Handler;
-            authorize(strategy: string|string[], callback?: Function): express.Handler;
-            authorize(strategy: string|string[], options: any, callback?: Function): express.Handler;
-            serializeUser<TUser, TID>(fn: (user: TUser, done: (err: any, id?: TID) => void) => void): void;
-            deserializeUser<TUser, TID>(fn: (id: TID, done: (err: any, user?: TUser) => void) => void): void;
-            transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
-        }
-
-        interface PassportStatic extends Passport {
-            Passport: {new(): Passport};
-            Authenticator: {new(): Passport};
-        }
-
-        interface Strategy {
-            name?: string;
-            authenticate(req: express.Request, options?: any): void;
-        }
-
-        interface Profile {
-            provider: string;
-            id: string;
-            displayName: string;
-            username?: string;
-            name?: {
-                familyName: string;
-                givenName: string;
-                middleName?: string;
-            };
-            emails?: Array<{
-                value: string;
-                type?: string;
-            }>;
-            photos?: Array<{
-                value: string;
-            }>;
-        }
-
-        interface Framework {
-            initialize(passport: Passport, options?: any): Function;
-            authenticate(passport: Passport, name: string, options?: any, callback?: Function): Function;
-            authorize?(passport: Passport, name: string, options?: any, callback?: Function): Function;
-        }
+declare namespace passport {
+    interface AuthenticateOptions {
+        authInfo?: boolean;
+        assignProperty?: string;
+        failureFlash?: string | boolean;
+        failureMessage?: boolean | string;
+        failureRedirect?: string;
+        failWithError?: boolean;
+        session?: boolean;
+        scope?: string | string[];
+        successFlash?: string | boolean;
+        successMessage?: boolean | string;
+        successRedirect?: string;
+        successReturnToOrRedirect?: string;
+        pauseStream?: boolean;
+        userProperty?: string;
+        passReqToCallback?: boolean;
     }
 
-    const passport: passport.PassportStatic;
-    export = passport;
+    interface Authenticator<InitializeRet = express.Handler, AuthenticateRet = any, AuthorizeRet = AuthenticateRet> {
+        use(strategy: Strategy): this;
+        use(name: string, strategy: Strategy): this;
+        unuse(name: string): this;
+        framework<X, Y, Z>(fw: Framework<X, Y, Z>): Authenticator<X, Y, Z>;
+        initialize(options?: { userProperty: string; }): InitializeRet;
+        session(options?: { pauseStream: boolean; }): AuthenticateRet;
+
+        authenticate(strategy: string | string[], callback?: (...args: any[]) => any): AuthenticateRet;
+        authenticate(strategy: string | string[], options: AuthenticateOptions, callback?: (...args: any[]) => any): AuthenticateRet;
+        authorize(strategy: string | string[], callback?: (...args: any[]) => any): AuthorizeRet;
+        authorize(strategy: string | string[], options: any, callback?: (...args: any[]) => any): AuthorizeRet;
+        serializeUser<TUser, TID>(fn: (user: TUser, done: (err: any, id?: TID) => void) => void): void;
+        deserializeUser<TUser, TID>(fn: (id: TID, done: (err: any, user?: TUser) => void) => void): void;
+        transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
+    }
+
+    interface PassportStatic extends Authenticator {
+        Authenticator: { new(): Authenticator };
+        Passport: PassportStatic["Authenticator"];
+    }
+
+    interface Strategy {
+        name?: string;
+        authenticate(this: StrategyCreated<this>, req: express.Request, options?: any): any;
+    }
+
+    interface StrategyCreatedStatic {
+        /**
+         * Authenticate `user`, with optional `info`.
+         *
+         * Strategies should call this function to successfully authenticate a
+         * user.  `user` should be an object supplied by the application after it
+         * has been given an opportunity to verify credentials.  `info` is an
+         * optional argument containing additional user information.  This is
+         * useful for third-party authentication strategies to pass profile
+         * details.
+         */
+        success(user: object, info?: object): void;
+        /**
+         * Fail authentication, with optional `challenge` and `status`, defaulting
+         * to 401.
+         *
+         * Strategies should call this function to fail an authentication attempt.
+         */
+        fail(challenge?: string | number, status?: number): void;
+        /**
+         * Redirect to `url` with optional `status`, defaulting to 302.
+         *
+         * Strategies should call this function to redirect the user (via their
+         * user agent) to a third-party website for authentication.
+         */
+        redirect(url: string, status?: number): void;
+        /**
+         * Pass without making a success or fail decision.
+         *
+         * Under most circumstances, Strategies should not need to call this
+         * function.  It exists primarily to allow previous authentication state
+         * to be restored, for example from an HTTP session.
+         */
+        pass(): void;
+        /**
+         * Internal error while performing authentication.
+         *
+         * Strategies should call this function when an internal error occurs
+         * during the process of performing authentication; for example, if the
+         * user directory is not available.
+         */
+        error(err: any): void;
+    }
+
+    type StrategyCreated<T, O = T & StrategyCreatedStatic> = {
+        [P in keyof O]: O[P];
+    };
+
+    interface Profile {
+        provider: string;
+        id: string;
+        displayName: string;
+        username?: string;
+        name?: {
+            familyName: string;
+            givenName: string;
+            middleName?: string;
+        };
+        emails?: Array<{
+            value: string;
+            type?: string;
+        }>;
+        photos?: Array<{
+            value: string;
+        }>;
+    }
+
+    interface Framework<InitializeRet = any, AuthenticateRet = any, AuthorizeRet = AuthenticateRet> {
+        initialize(passport: Authenticator<InitializeRet, AuthenticateRet, AuthorizeRet>, options?: any): (...args: any[]) => InitializeRet;
+        authenticate(passport: Authenticator<InitializeRet, AuthenticateRet, AuthorizeRet>, name: string, options?: any, callback?: (...args: any[]) => any): (...args: any[]) => AuthenticateRet;
+        authorize?(passport: Authenticator<InitializeRet, AuthenticateRet, AuthorizeRet>, name: string, options?: any, callback?: (...args: any[]) => any): (...args: any[]) => AuthorizeRet;
+    }
 }
 
+declare const passport: passport.PassportStatic;
+export = passport;
diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index c461d45562..b6c033b907 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -3,135 +3,137 @@ import * as express from 'express';
 import 'express-session';
 
 class TestStrategy implements passport.Strategy {
-  public name: string = 'test';
-  constructor() { }
-  authenticate(req: express.Request) { }
+    name = 'test';
+    constructor() { }
+    authenticate(this: passport.StrategyCreated<this>, req: express.Request) {
+        const user: TestUser = {
+            id: 0,
+        };
+        this.success(user);
+    }
 }
 
-const newFramework:passport.Framework = {
-  initialize: function () {
-    return function () { };
-  },
-  authenticate: function (passport, name, options) {
-    return function () {
-      return 'authenticate(): ' + name + ' ' + options;
-    };
-  },
-  authorize: function (passport, name, options) {
-    return function () {
-      return 'authorize(): ' + name + ' ' + options;
+const newFramework: passport.Framework = {
+    initialize() {
+        return () => { };
+    },
+    authenticate(passport, name, options) {
+        return () => {
+            return `authenticate(): ${name} ${options}`;
+        };
+    },
+    authorize(passport, name, options) {
+        return () => {
+            return `authorize(): ${name} ${options}`;
+        };
     }
-  }
 };
 passport.use(new TestStrategy());
 passport.framework(newFramework);
 
 interface TestUser {
-  id: number;
+    id: number;
 }
 passport.serializeUser((user: TestUser, done: (err: any, id?: number) => void) => {
-  done(null, user.id);
+    done(null, user.id);
 });
 passport.serializeUser<TestUser, number>((user, done) => {
-  if (user.id > 0) {
-    done(null, user.id);
-  } else {
-    done(new Error('user ID is invalid'));
-  }
+    if (user.id > 0) {
+        done(null, user.id);
+    } else {
+        done(new Error('user ID is invalid'));
+    }
 });
 passport.deserializeUser((id, done) => {
-  done(null, {id});
+    done(null, { id });
 });
 passport.deserializeUser<TestUser, number>((id, done) => {
-  const fetchUser = (id: number): Promise<TestUser> => {
-    return Promise.reject(new Error(`user not found: ${id}`));
-  };
+    const fetchUser = (id: number): Promise<TestUser> => {
+        return Promise.reject(new Error(`user not found: ${id}`));
+    };
 
-  fetchUser(id)
-    .then((user) => done(null, user))
-    .catch((err) => done(err));
+    fetchUser(id)
+        .then((user) => done(null, user))
+        .catch(done);
 });
 
 passport.use(new TestStrategy())
-  .unuse('test')
-  .use(new TestStrategy())
-  .framework(newFramework);
+    .unuse('test')
+    .use(new TestStrategy())
+    .framework(newFramework);
 
-
-var app = express();
+const app = express();
 app.configure(() => {
-  app.use(passport.initialize());
-  app.use(passport.session());
+    app.use(passport.initialize());
+    app.use(passport.session());
 });
 
 app.post('/login',
-  passport.authenticate('local', { failureRedirect: '/login', failureFlash: true }),
-  function (req, res) {
-    res.redirect('/');
-  });
-
-app.post('/login', function (req, res, next) {
-  passport.authenticate('local', function (err: any, user: { username: string; }, info: { message: string; }) {
-    if (err) { return next(err) }
-    if (!user) {
-      if (req.session) {
-        req.session['error'] = info.message;
-      }
-      return res.redirect('/login')
-    }
-    req.logIn(user, function (err) {
-      if (err) { return next(err); }
-      return res.redirect('/users/' + user.username);
+    passport.authenticate('local', { failureRedirect: '/login', failureFlash: true }),
+    (req, res) => {
+        res.redirect('/');
     });
-  })(req, res, next);
+
+app.post('/login', (req, res, next) => {
+    passport.authenticate('local', (err: any, user: { username: string; }, info: { message: string; }) => {
+        if (err) { return next(err); }
+        if (!user) {
+            if (req.session) {
+                req.session['error'] = info.message;
+            }
+            return res.redirect('/login');
+        }
+        req.logIn(user, (err) => {
+            if (err) { return next(err); }
+            return res.redirect('/users/' + user.username);
+        });
+    })(req, res, next);
 });
 
-app.get('/logout', function (req, res) {
-  req.logout();
-  res.redirect('/');
+app.get('/logout', (req, res) => {
+    req.logout();
+    res.redirect('/');
 });
 
 app.post('/auth/token', passport.authenticate(['basic', 'oauth2-client-password'], { session: false }));
 
-
 function authSetting(): void {
-  var authOption = {
-    successRedirect: '/',
-    failureRedirect: '/login',
-  };
-  var successCallback = (req: express.Request, res: express.Response) => {
-    res.redirect('/');
-  };
+    const authOption = {
+        successRedirect: '/',
+        failureRedirect: '/login',
+    };
+    const successCallback = (req: express.Request, res: express.Response) => {
+        res.redirect('/');
+    };
 
-  app.get('/auth/facebook',
-      passport.authenticate('facebook'));
-  app.get('/auth/facebook/callback',
-      passport.authenticate('facebook', authOption), successCallback);
+    app.get('/auth/facebook',
+        passport.authenticate('facebook'));
+    app.get('/auth/facebook/callback',
+        passport.authenticate('facebook', authOption), successCallback);
 
-  app.get('/auth/twitter',
-      passport.authenticate('twitter'));
-  app.get('/auth/twitter/callback',
-      passport.authenticate('twitter', authOption));
-
-  app.get('/auth/google',
-    passport.authenticate('google', {
-      scope:
-      ['https://www.googleapis.com/auth/userinfo.profile']
-    }));
-  app.get('/auth/google/callback',
-      passport.authenticate('google', authOption), successCallback);
+    app.get('/auth/twitter',
+        passport.authenticate('twitter'));
+    app.get('/auth/twitter/callback',
+        passport.authenticate('twitter', authOption));
 
+    app.get('/auth/google',
+        passport.authenticate('google', {
+            scope:
+                ['https://www.googleapis.com/auth/userinfo.profile']
+        }));
+    app.get('/auth/google/callback',
+        passport.authenticate('google', authOption), successCallback);
 }
 
 function ensureAuthenticated(req: express.Request, res: express.Response, next: (err?: any) => void) {
-  if (req.isAuthenticated()) { return next(); }
-  if (req.isUnauthenticated()) {
-    res.redirect('/login');
-  }
+    if (req.isAuthenticated()) { return next(); }
+    if (req.isUnauthenticated()) {
+        res.redirect('/login');
+    }
 }
 
-const passportInstance: passport.Passport = new passport.Passport()
-passportInstance.use(new TestStrategy())
+const passportInstance = new passport.Passport();
+passportInstance.use(new TestStrategy());
 
-const authenticator: passport.Passport = new passport.Authenticator()
-authenticator.use(new TestStrategy())
\ No newline at end of file
+const authenticator = new passport.Authenticator();
+authenticator.use(new TestStrategy());
diff --git a/types/passport/tslint.json b/types/passport/tslint.json
new file mode 100644
index 0000000000..e1828da3e2
--- /dev/null
+++ b/types/passport/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-unnecessary-generics": false,
+        "no-void-expression": false
+    }
+}
diff --git a/types/password-hash/tslint.json b/types/password-hash/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/password-hash/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/path-parse/tslint.json b/types/path-parse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/path-parse/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pathfinding/tslint.json b/types/pathfinding/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pathfinding/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pathjs/tslint.json b/types/pathjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pathjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pathwatcher/README.md b/types/pathwatcher/README.md
deleted file mode 100644
index 81cacbc752..0000000000
--- a/types/pathwatcher/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Path Watcher Node Type Definitions
-
-TypeScript type definitions for [Path Watcher Node], which is published as "[pathwatcher](https://www.npmjs.com/package/pathwatcher)" on NPM.
-
-### Usage Notes
-
-#### Exports
-
-The two classes exported from this module are: [File](https://github.com/atom/node-pathwatcher/blob/master/src/file.coffee) and [Directory](https://github.com/atom/node-pathwatcher/blob/master/src/directory.coffee).
-
-```ts
-import { File, Directory } from "text-buffer";
-```
-
-Additionally, the following functions are exported as well:
-```ts
-watch(): PathWatcher.PathWatcher;
-closeAllWatchers(): void;
-getWatchedPaths(): string[];
-```
-
-#### The PathWatcher Namespace
-
-All types used by Path Watcher can be referenced from the PathWatcher namespace.
-
-```ts
-function example(file: PathWatcher.File) {}
-```
diff --git a/types/pathwatcher/index.d.ts b/types/pathwatcher/index.d.ts
index cf65fcc2d0..4e5476bd80 100644
--- a/types/pathwatcher/index.d.ts
+++ b/types/pathwatcher/index.d.ts
@@ -2,241 +2,240 @@
 // Project: https://github.com/atom/node-pathwatcher
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
-/// <reference types="event-kit" />
 
+import { Disposable } from "event-kit";
 import { ReadStream, WriteStream } from "fs";
 
-declare global {
-	namespace PathWatcher {
-		/** Objects that appear as parameters to callbacks. */
-		namespace Events {
-			interface PathWatchErrorThrown {
-				/** The error object. */
-				error: Error;
-
-				/** Call this function to indicate you have handled the error.
-				 *  The error will not be thrown if this function is called.
-				 */
-				handle(): void;
-			}
-
-			interface WatchedFilePathChanged {
-				event: string;
-				newFilePath: string;
-			}
-		}
-
-		/** The static side to each exported class. Should generally only be used internally. */
-		namespace Statics {
-			/* tslint:disable:no-unnecessary-qualifier */
-			/** The static side to the File class. */
-			interface File {
-				/** Configures a new File instance, no files are accessed. */
-				new (filePath: string, symlink?: boolean): PathWatcher.File;
-			}
-
-			/** The static side to the Directory class. */
-			interface Directory {
-				/** Configures a new Directory instance, no files are accessed. */
-				new (directoryPath: string, symlink?: boolean): PathWatcher.Directory;
-			}
-			/* tslint:enable:no-unnecessary-qualifier */
-		}
-
-		/** Represents an individual file that can be watched, read from, and written to. */
-		interface File {
-			// Properties
-			realPath: string|null;
-			path: string;
-			symlink: boolean;
-
-			// Construction
-			/** Creates the file on disk that corresponds to ::getPath() if no such file
-			 *  already exists.
-			 */
-			create(): Promise<boolean>;
-
-			// Event Subscription
-			/** Invoke the given callback when the file's contents change. */
-			onDidChange(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the file's path changes. */
-			onDidRename(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the file is deleted. */
-			onDidDelete(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when there is an error with the watch. When
-			 *  your callback has been invoked, the file will have unsubscribed from the
-			 *  file watches.
-			 */
-			onWillThrowWatchError(callback: (errorObject: Events.PathWatchErrorThrown) =>
-				void): EventKit.Disposable;
-
-			// File Metadata
-			/** Returns a boolean, always true. */
-			isFile(): boolean;
-
-			/** Returns a boolean, always false. */
-			isDirectory(): boolean;
-
-			/** Returns a boolean indicating whether or not this is a symbolic link. */
-			isSymbolicLink(): boolean;
-
-			/** Returns a promise that resolves to a boolean, true if the file exists,
-			 *  false otherwise.
-			 */
-			exists(): Promise<boolean>;
-
-			/** Returns a boolean, true if the file exists, false otherwise. */
-			existsSync(): boolean;
-
-			/** Get the SHA-1 digest of this file. */
-			getDigest(): Promise<string>;
-
-			/** Get the SHA-1 digest of this file. */
-			getDigestSync(): string;
-
-			/** Sets the file's character set encoding name. */
-			setEncoding(encoding: string): void;
-
-			/** Returns the string encoding name for this file (default: "utf8"). */
-			getEncoding(): string;
-
-			// Managing Paths
-			/** Returns the string path for the file. */
-			getPath(): string;
-
-			/** Returns this file's completely resolved string path. */
-			getRealPathSync(): string;
-
-			/** Returns a promise that resolves to the file's completely resolved
-			 *  string path.
-			 */
-			getRealPath(): Promise<string>;
-
-			/** Return the string filename without any directory information. */
-			getBaseName(): string;
-
-			// Traversing
-			/** Return the Directory that contains this file. */
-			getParent(): Directory;
-
-			// Reading and Writing
-			/** Reads the contents of the file. */
-			read(flushCache?: boolean): Promise<string>;
-
-			/** Returns a stream to read the content of the file. */
-			createReadStream(): ReadStream;
-
-			/** Overwrites the file with the given text. */
-			write(text: string): Promise<undefined>;
-
-			/** Returns a stream to write content to the file. */
-			createWriteStream(): WriteStream;
-
-			/** Overwrites the file with the given text. */
-			writeSync(text: string): undefined;
-		}
-
-		/** Represents a directory on disk that can be watched for changes. */
-		interface Directory {
-			// Properties
-			realPath: string|null;
-			path: string;
-			symlink: boolean;
-
-			// Construction
-			/** Creates the directory on disk that corresponds to ::getPath() if no such
-			 *  directory already exists.
-			 */
-			create(mode?: number): Promise<boolean>;
-
-			// Event Subscription
-			/** Invoke the given callback when the directory's contents change. */
-			onDidChange(callback: () => void): EventKit.Disposable;
-
-			// Directory Metadata
-			/** Returns a boolean, always false. */
-			isFile(): boolean;
-
-			/** Returns a roolean, always true. */
-			isDirectory(): boolean;
-
-			/** Returns a boolean indicating whether or not this is a symbolic link. */
-			isSymbolicLink(): boolean;
-
-			/** Returns a promise that resolves to a boolean, true if the directory\
-			 *  exists, false otherwise.
-			 */
-			exists(): Promise<boolean>;
-
-			/** Returns a boolean, true if the directory exists, false otherwise. */
-			existsSync(): boolean;
-
-			/** Return a boolean, true if this Directory is the root directory of the
-			 *  filesystem, or false if it isn't.
-			 */
-			isRoot(): boolean;
-
-			// Managing Paths
-			/** This may include unfollowed symlinks or relative directory entries.
-			 *  Or it may be fully resolved, it depends on what you give it.
-			 */
-			getPath(): string;
-
-			/** All relative directory entries are removed and symlinks are resolved to
-			 *  their final destination.
-			 */
-			getRealPathSync(): string;
-
-			/** Returns the string basename of the directory. */
-			getBaseName(): string;
-
-			/** Returns the relative string path to the given path from this directory. */
-			relativize(fullPath: string): string;
-
-			// Traversing
-			/** Traverse to the parent directory. */
-			getParent(): Directory;
-
-			/** Traverse within this Directory to a child File. This method doesn't actually
-			 *  check to see if the File exists, it just creates the File object.
-			 */
-			getFile(filename: string): File;
-
-			/** Traverse within this a Directory to a child Directory. This method doesn't actually
-			 *  check to see if the Directory exists, it just creates the Directory object.
-			 */
-			getSubdirectory(dirname: string): Directory;
-
-			/** Reads file entries in this directory from disk synchronously. */
-			getEntriesSync(): Array<File|Directory>;
-
-			/** Reads file entries in this directory from disk asynchronously. */
-			getEntries(callback: (error: Error, entries: Array<File|Directory>) => void): void;
-
-			/** Determines if the given path (real or symbolic) is inside this directory. This
-			 *  method does not actually check if the path exists, it just checks if the path
-			 *  is under this directory.
-			 */
-			contains(pathToCheck: string): boolean;
-		}
-
-		interface PathWatcher {
-			onDidChange(callback: (change: Events.WatchedFilePathChanged) => void): EventKit.Disposable;
-
-			close(): void;
-		}
-	}
-}
-
-export let File: PathWatcher.Statics.File;
-export let Directory: PathWatcher.Statics.Directory;
-
-export function watch(): PathWatcher.PathWatcher;
+export function watch(): PathWatcher;
 export function closeAllWatchers(): void;
 export function getWatchedPaths(): string[];
+
+/** Represents an individual file that can be watched, read from, and written to. */
+export class File {
+    // Properties
+    realPath: string|null;
+    path: string;
+    symlink: boolean;
+
+    // Construction
+    /** Configures a new File instance, no files are accessed. */
+    constructor(filePath: string, symlink?: boolean);
+
+    /**
+     *  Creates the file on disk that corresponds to ::getPath() if no such file
+     *  already exists.
+     */
+    create(): Promise<boolean>;
+
+    // Event Subscription
+    /** Invoke the given callback when the file's contents change. */
+    onDidChange(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the file's path changes. */
+    onDidRename(callback: () => void): Disposable;
+
+    /** Invoke the given callback when the file is deleted. */
+    onDidDelete(callback: () => void): Disposable;
+
+    /**
+     *  Invoke the given callback when there is an error with the watch. When
+     *  your callback has been invoked, the file will have unsubscribed from the
+     *  file watches.
+     */
+    onWillThrowWatchError(callback: (errorObject: PathWatchErrorThrownEvent) =>
+        void): Disposable;
+
+    // File Metadata
+    /** Returns a boolean, always true. */
+    isFile(): boolean;
+
+    /** Returns a boolean, always false. */
+    isDirectory(): boolean;
+
+    /** Returns a boolean indicating whether or not this is a symbolic link. */
+    isSymbolicLink(): boolean;
+
+    /**
+     *  Returns a promise that resolves to a boolean, true if the file exists,
+     *  false otherwise.
+     */
+    exists(): Promise<boolean>;
+
+    /** Returns a boolean, true if the file exists, false otherwise. */
+    existsSync(): boolean;
+
+    /** Get the SHA-1 digest of this file. */
+    getDigest(): Promise<string>;
+
+    /** Get the SHA-1 digest of this file. */
+    getDigestSync(): string;
+
+    /** Sets the file's character set encoding name. */
+    setEncoding(encoding: string): void;
+
+    /** Returns the string encoding name for this file (default: "utf8"). */
+    getEncoding(): string;
+
+    // Managing Paths
+    /** Returns the string path for the file. */
+    getPath(): string;
+
+    /** Returns this file's completely resolved string path. */
+    getRealPathSync(): string;
+
+    /**
+     *  Returns a promise that resolves to the file's completely resolved
+     *  string path.
+     */
+    getRealPath(): Promise<string>;
+
+    /** Return the string filename without any directory information. */
+    getBaseName(): string;
+
+    // Traversing
+    /** Return the Directory that contains this file. */
+    getParent(): Directory;
+
+    // Reading and Writing
+    /** Reads the contents of the file. */
+    read(flushCache?: boolean): Promise<string>;
+
+    /** Returns a stream to read the content of the file. */
+    createReadStream(): ReadStream;
+
+    /** Overwrites the file with the given text. */
+    write(text: string): Promise<undefined>;
+
+    /** Returns a stream to write content to the file. */
+    createWriteStream(): WriteStream;
+
+    /** Overwrites the file with the given text. */
+    writeSync(text: string): undefined;
+}
+
+/** Represents a directory on disk that can be watched for changes. */
+export class Directory {
+    // Properties
+    realPath: string|null;
+    path: string;
+    symlink: boolean;
+
+    // Construction
+    /** Configures a new Directory instance, no files are accessed. */
+    constructor(directoryPath: string, symlink?: boolean);
+
+    /**
+     *  Creates the directory on disk that corresponds to ::getPath() if no such
+     *  directory already exists.
+     */
+    create(mode?: number): Promise<boolean>;
+
+    // Event Subscription
+    /** Invoke the given callback when the directory's contents change. */
+    onDidChange(callback: () => void): Disposable;
+
+    // Directory Metadata
+    /** Returns a boolean, always false. */
+    isFile(): boolean;
+
+    /** Returns a roolean, always true. */
+    isDirectory(): boolean;
+
+    /** Returns a boolean indicating whether or not this is a symbolic link. */
+    isSymbolicLink(): boolean;
+
+    /**
+     *  Returns a promise that resolves to a boolean, true if the directory
+     *  exists, false otherwise.
+     */
+    exists(): Promise<boolean>;
+
+    /** Returns a boolean, true if the directory exists, false otherwise. */
+    existsSync(): boolean;
+
+    /**
+     *  Return a boolean, true if this Directory is the root directory of the
+     *  filesystem, or false if it isn't.
+     */
+    isRoot(): boolean;
+
+    // Managing Paths
+    /**
+     *  This may include unfollowed symlinks or relative directory entries.
+     *  Or it may be fully resolved, it depends on what you give it.
+     */
+    getPath(): string;
+
+    /**
+     *  All relative directory entries are removed and symlinks are resolved to
+     *  their final destination.
+     */
+    getRealPathSync(): string;
+
+    /** Returns the string basename of the directory. */
+    getBaseName(): string;
+
+    /** Returns the relative string path to the given path from this directory. */
+    relativize(fullPath: string): string;
+
+    // Traversing
+    /** Traverse to the parent directory. */
+    getParent(): Directory;
+
+    /**
+     *  Traverse within this Directory to a child File. This method doesn't actually
+     *  check to see if the File exists, it just creates the File object.
+     */
+    getFile(filename: string): File;
+
+    /**
+     *  Traverse within this a Directory to a child Directory. This method doesn't actually
+     *  check to see if the Directory exists, it just creates the Directory object.
+     */
+    getSubdirectory(dirname: string): Directory;
+
+    /** Reads file entries in this directory from disk synchronously. */
+    getEntriesSync(): Array<File|Directory>;
+
+    /** Reads file entries in this directory from disk asynchronously. */
+    getEntries(callback: (error: Error, entries: Array<File|Directory>) => void): void;
+
+    /**
+     *  Determines if the given path (real or symbolic) is inside this directory. This
+     *  method does not actually check if the path exists, it just checks if the path
+     *  is under this directory.
+     */
+    contains(pathToCheck: string): boolean;
+}
+
+// Events =====================================================================
+// The event objects that are passed into the callbacks which the user provides
+// to specific API calls.
+
+export interface PathWatchErrorThrownEvent {
+    /** The error object. */
+    error: Error;
+
+    /**
+     *  Call this function to indicate you have handled the error.
+     *  The error will not be thrown if this function is called.
+     */
+    handle(): void;
+}
+
+export interface WatchedFilePathChangedEvent {
+    event: string;
+    newFilePath: string;
+}
+
+// Structures =================================================================
+// The structures that are passed to the user by Atom following specific API calls.
+
+export interface PathWatcher {
+    onDidChange(callback: (change: WatchedFilePathChangedEvent) => void): Disposable;
+
+    close(): void;
+}
diff --git a/types/pathwatcher/pathwatcher-tests.ts b/types/pathwatcher/pathwatcher-tests.ts
index 60391ed480..55cba4ac33 100644
--- a/types/pathwatcher/pathwatcher-tests.ts
+++ b/types/pathwatcher/pathwatcher-tests.ts
@@ -1,11 +1,12 @@
+import { Disposable } from "event-kit";
 import { File, Directory } from "pathwatcher";
 
 let bool: boolean;
 let str: string;
-let sub: EventKit.Disposable;
+let sub: Disposable;
 
-let file: PathWatcher.File;
-let dir: PathWatcher.Directory;
+let file: File;
+let dir: Directory;
 
 // File =======================================================================
 // Construction
@@ -13,7 +14,7 @@ file = new File("Test.file");
 new File("Test.file", false);
 
 async function fileCreation() {
-	bool = await file.create();
+    bool = await file.create();
 }
 
 // Event Subscription
@@ -28,13 +29,13 @@ bool = file.isDirectory();
 bool = file.isSymbolicLink();
 
 async function fileExists() {
-	bool = await file.exists();
+    bool = await file.exists();
 }
 
 bool = file.existsSync();
 
 async function getFileDigest() {
-	str = await file.getDigest();
+    str = await file.getDigest();
 }
 
 str = file.getDigestSync();
@@ -46,7 +47,7 @@ str = file.getPath();
 str = file.getRealPathSync();
 
 async function getFileRealPath() {
-	str = await file.getRealPath();
+    str = await file.getRealPath();
 }
 
 str = file.getBaseName();
@@ -56,14 +57,14 @@ dir = file.getParent();
 
 // Reading and Writing
 async function readFile() {
-	str = await file.read();
+    str = await file.read();
 }
 
 const stream = file.createReadStream();
 stream.close();
 
 async function writeFile() {
-	await file.write("Test");
+    await file.write("Test");
 }
 
 file.createWriteStream();
@@ -75,8 +76,8 @@ dir = new Directory("Test.file");
 new Directory("Test.file", true);
 
 async function createDirectory() {
-	bool = await dir.create();
-	bool = await dir.create(0o0777);
+    bool = await dir.create();
+    bool = await dir.create(0o0777);
 }
 
 // Event Subscription
@@ -88,7 +89,7 @@ bool = dir.isDirectory();
 bool = dir.isSymbolicLink();
 
 async function directoryExists() {
-	bool = await dir.exists();
+    bool = await dir.exists();
 }
 
 bool = dir.existsSync();
diff --git a/types/pathwatcher/tsconfig.json b/types/pathwatcher/tsconfig.json
index c413f34011..41bb35a03c 100644
--- a/types/pathwatcher/tsconfig.json
+++ b/types/pathwatcher/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pathwatcher-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/pathwatcher/tslint.json b/types/pathwatcher/tslint.json
index 4b036f727a..e0508241c7 100644
--- a/types/pathwatcher/tslint.json
+++ b/types/pathwatcher/tslint.json
@@ -1,37 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Custom rules.
-        "class-name": true,
-        "indent": [true, "tabs"],
-        "jsdoc-format": true,
+        "indent": [true, "spaces", 4],
         "max-line-length": [true, 100],
-        "quotemark": [true, "double", "avoid-escape"],
-        "trailing-comma": [true, {
-            "multiline": { "objects": "always", "arrays": "always", "functions": "never" },
-            "singleline": { "objects": "never", "arrays": "never", "functions": "never" }
-        }],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-separator",
-            "check-type",
-            "check-typecast",
-            "check-rest-spread",
-            "check-preblock"
-        ],
-        // Soon to be defaults.
-        "arrow-return-shorthand": [true, "multiline"],
-        "no-any": true,
-        "no-floating-promises": true,
-        "no-unbound-method": true,
-        "no-unsafe-any": true,
-        "number-literal-format": true,
-        "restrict-plus-operands": true,
-        "return-undefined": true,
-        "switch-final-break": true
+        "no-any": true
     }
 }
diff --git a/types/pathwatcher/v0/index.d.ts b/types/pathwatcher/v0/index.d.ts
deleted file mode 100644
index b1135c384c..0000000000
--- a/types/pathwatcher/v0/index.d.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-// Type definitions for pathwatcher
-// Project: https://github.com/atom/node-pathwatcher
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-import { EventEmitter } from "events";
-import * as Q from "q";
-
-export as namespace PathWatcher;
-
-export interface IFileStatic {
-	new (path:string, symlink?:boolean):IFile;
-}
-
-export interface IFile {
-	realPath:string;
-	path:string;
-	symlink:boolean;
-	cachedContents:string;
-	digest:string;
-
-	handleEventSubscriptions():void;
-	setPath(path:string):void;
-	getPath():string;
-	getRealPathSync():string;
-	getBaseName():string;
-	write(text:string):void;
-	readSync(flushCache:boolean):string;
-	read(flushCache?:boolean): Promise<string>;
-	// exists():boolean;
-	existsSync():boolean;
-	setDigest(contents:string):void;
-	getDigest():string;
-	writeFileWithPrivilegeEscalationSync (filePath:string, text:string):void;
-	handleNativeChangeEvent(eventType:string, eventPath:string):void;
-	detectResurrectionAfterDelay():void;
-	detectResurrection():void;
-	subscribeToNativeChangeEvents():void;
-	unsubscribeFromNativeChangeEvents():void;
-}
-
-export interface IDirectoryStatic {
-	new (path:string, symlink?:boolean):IDirectory;
-}
-
-export interface IDirectory {
-	realPath:string;
-	path:string;
-	symlink:boolean;
-
-	getBaseName():string;
-	getPath():void;
-	getRealPathSync():string;
-	contains(pathToCheck:string):boolean;
-	relativize(fullPath:string):string;
-	getEntriesSync():any[]; // return type are {File | Directory}[]
-	getEntries(callback:Function):void;
-	subscribeToNativeChangeEvents():void;
-	unsubscribeFromNativeChangeEvents():void;
-	isPathPrefixOf(prefix:string, fullPath:string):boolean;
-}
-
-export interface IHandleWatcher extends EventEmitter {
-	onEvent(event:any, filePath:any, oldFilePath:any):any;
-	start():void;
-	closeIfNoListener():void;
-	close():void;
-}
-
-export interface IPathWatcher {
-	isWatchingParent:boolean;
-	path:any;
-	handleWatcher:IHandleWatcher;
-
-	close():void;
-}
-
-export function watch(path:string, callback:Function):IPathWatcher;
-
-export function closeAllWatchers():void;
-
-export function getWatchedPaths():string[];
-
-export var File: IFileStatic;
-export var Directory: IDirectoryStatic;
-
diff --git a/types/pathwatcher/v0/pathwatcher-tests.ts b/types/pathwatcher/v0/pathwatcher-tests.ts
deleted file mode 100644
index 0e080abbfd..0000000000
--- a/types/pathwatcher/v0/pathwatcher-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-import pathwatcher = require("pathwatcher");
-var File = pathwatcher.File;
-
-var filePath: string;
-var file = new File(filePath);
-
-pathwatcher.watch(filePath, ()=>{
-});
diff --git a/types/pathwatcher/v0/tsconfig.json b/types/pathwatcher/v0/tsconfig.json
deleted file mode 100644
index 6e6584c70e..0000000000
--- a/types/pathwatcher/v0/tsconfig.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "pathwatcher": [
-                "pathwatcher/v0"
-            ],
-            "q": [
-                "q/v0"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "pathwatcher-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/paypal-cordova-plugin/tslint.json b/types/paypal-cordova-plugin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/paypal-cordova-plugin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pdfjs-dist/index.d.ts b/types/pdfjs-dist/index.d.ts
index a40c612d5a..f72d70f44e 100644
--- a/types/pdfjs-dist/index.d.ts
+++ b/types/pdfjs-dist/index.d.ts
@@ -407,6 +407,12 @@ declare namespace PDF {
      * in browsers which support the fullscreen API.
      */
     disableFullscreen: boolean;
+      
+    /**
+     * Disable the text layer of PDF when used PDF.js renders a canvas instead of div elements
+     *
+     */
+    disableTextLayer: boolean;
 
     /**
      * Enables CSS only zooming.
@@ -475,5 +481,11 @@ declare namespace PDF {
         : PDFPromise<PDFDocumentProxy>;
 
     PDFViewer(params: PDFViewerParams): void;
+    /**
+    * yet another viewer, this will render only one page at the time, reducing rendering time
+    * very important for mobile development
+    * @params {PDFViewerParams}
+    */
+    PDFSinglePageViewer(params: PDFViewerParams): void;
   }
 }
diff --git a/types/pdfjs-dist/tslint.json b/types/pdfjs-dist/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pdfjs-dist/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pdfkit/tslint.json b/types/pdfkit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pdfkit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pdfobject/tslint.json b/types/pdfobject/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pdfobject/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pebblekitjs/tslint.json b/types/pebblekitjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pebblekitjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/peerjs/tslint.json b/types/peerjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/peerjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pegjs/tslint.json b/types/pegjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pegjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pem/index.d.ts b/types/pem/index.d.ts
index e8325f5d47..c6689a273f 100644
--- a/types/pem/index.d.ts
+++ b/types/pem/index.d.ts
@@ -140,9 +140,9 @@ export type Callback<T> = (error: any, result: T) => any;
 /**
  * Creates a private key
  *
- * @param {number} [keyBitsize=2048] Size of the key, defaults to 2048bit (can also be a function)
- * @param {PrivateKeyCreationOptions} [options] private key encryption settings, defaults to empty object (no enryption)
- * @param {Callback<{ key: string }>} callback Callback function with an error object and {key}
+ * @param [keyBitsize=2048] Size of the key, defaults to 2048bit (can also be a function)
+ * @param [options] private key encryption settings, defaults to empty object (no enryption)
+ * @param callback Callback function with an error object and {key}
  */
 export function createPrivateKey(keyBitsize: number, options: PrivateKeyCreationOptions, callback: Callback<{ key: string }>): void;
 export function createPrivateKey(optionsOrKeyBitsize: number | PrivateKeyCreationOptions, callback: Callback<{ key: string }>): void;
@@ -151,8 +151,8 @@ export function createPrivateKey(callback: Callback<{ key: string }>): void;
 /**
  * Creates a dhparam key
  *
- * @param {Number} [keyBitsize=512] Size of the key, defaults to 512bit
- * @param {Callback<{ dhparam: any }>} callback Callback function with an error object and {dhparam}
+ * @param [keyBitsize=512] Size of the key, defaults to 512bit
+ * @param callback Callback function with an error object and {dhparam}
  */
 export function createDhparam(keyBitsize: number, callback: Callback<{ dhparam: any }>): void;
 export function createDhparam(callback: Callback<{ dhparam: any }>): void;
@@ -163,8 +163,8 @@ export function createDhparam(callback: Callback<{ dhparam: any }>): void;
  * If options.clientKey is undefined, a new key is created automatically. The used key is included
  * in the callback return as clientKey
  *
- * @param {CSRCreationOptions}  [options] Optional options object
- * @param {Callback<{ csr: string, clientKey: string }>} callback Callback function with an error object and {csr, clientKey}
+ * @param  [options] Optional options object
+ * @param callback Callback function with an error object and {csr, clientKey}
  */
 export function createCSR(options: CSRCreationOptions, callback: Callback<{ csr: string, clientKey: string }>): void;
 export function createCSR(callback: Callback<{ csr: string, clientKey: string }>): void;
@@ -174,8 +174,8 @@ export function createCSR(callback: Callback<{ csr: string, clientKey: string }>
  * will be generated automatically. For CSR generation all the options values
  * can be used as with createCSR.
  *
- * @param {Object} [CertificateCreationOptions] Optional options object
- * @param {Callback<CertificateCreationResult>} callback Callback function with an error object and {certificate, csr, clientKey, serviceKey}
+ * @param [CertificateCreationOptions] Optional options object
+ * @param callback Callback function with an error object and {certificate, csr, clientKey, serviceKey}
  */
 export function createCertificate(options: CertificateCreationOptions, callback: Callback<CertificateCreationResult>): void;
 export function createCertificate(callback: Callback<CertificateCreationResult>): void;
@@ -183,8 +183,8 @@ export function createCertificate(callback: Callback<CertificateCreationResult>)
 /**
  * Reads subject data from a certificate or a CSR
  *
- * @param {String} certificate PEM encoded CSR or certificate
- * @param {Callback<CertificateSubjectReadResult>} callback Callback function with an error object and {country, state, locality, organization, organizationUnit, commonName, emailAddress}
+ * @param certificate PEM encoded CSR or certificate
+ * @param callback Callback function with an error object and {country, state, locality, organization, organizationUnit, commonName, emailAddress}
  */
 export function readCertificateInfo(certificate: string, callback: Callback<CertificateSubjectReadResult>): void;
 export function readCertificateInfo(callback: Callback<CertificateSubjectReadResult>): void;
@@ -192,8 +192,8 @@ export function readCertificateInfo(callback: Callback<CertificateSubjectReadRes
 /**
  * Exports a public key from a private key, CSR or certificate
  *
- * @param {String} certificate PEM encoded private key, CSR or certificate
- * @param {Callback<{ publicKey: string }>} callback Callback function with an error object and {publicKey}
+ * @param certificate PEM encoded private key, CSR or certificate
+ * @param callback Callback function with an error object and {publicKey}
  */
 export function getPublicKey(certificate: string, callback: Callback<{ publicKey: string }>): void;
 export function getPublicKey(callback: Callback<{ publicKey: string }>): void;
@@ -201,9 +201,9 @@ export function getPublicKey(callback: Callback<{ publicKey: string }>): void;
 /**
  * Gets the fingerprint for a certificate
  *
- * @param {String} certificate PEM encoded certificate
- * @param {HashFunction} hash Hash function to use (either md5 sha1 or sha256, defaults to sha256)
- * @param {Callback<{ fingerprint: string }>} callback Callback function with an error object and {fingerprint}
+ * @param certificate PEM encoded certificate
+ * @param hash Hash function to use (either md5 sha1 or sha256, defaults to sha256)
+ * @param callback Callback function with an error object and {fingerprint}
  */
 export function getFingerprint(certificate: string, hash: HashFunction, callback: Callback<{ fingerprint: string }>): void;
 export function getFingerprint(certificate: string, callback: Callback<{ fingerprint: string }>): void;
@@ -212,9 +212,9 @@ export function getFingerprint(callback: Callback<{ fingerprint: string }>): voi
 /**
  * Gets the modulus from a certificate, a CSR or a private key
  *
- * @param {String} certificate PEM encoded, CSR PEM encoded, or private key
- * @param {String} password password for the certificate
- * @param {Callback<{ modulus: any }>} callback Callback function with an error object and {modulus}
+ * @param certificate PEM encoded, CSR PEM encoded, or private key
+ * @param password password for the certificate
+ * @param callback Callback function with an error object and {modulus}
  */
 export function getModulus(certificate: string, password: string, callback: Callback<{ modulus: any }>): void;
 export function getModulus(certificate: string, callback: Callback<{ modulus: any }>): void;
@@ -222,28 +222,26 @@ export function getModulus(certificate: string, callback: Callback<{ modulus: an
 /**
  * Gets the size and prime of DH parameters
  *
- * @param {String} dh DH parameters PEM encoded
- * @param {Callback<{ size: any, prime: any }>} callback Callback function with an error object and {size, prime}
+ * @param dh DH parameters PEM encoded
+ * @param callback Callback function with an error object and {size, prime}
  */
 export function getDhparamInfo(dh: string, callback: Callback<{ size: any, prime: any }>): void;
 
 /**
  * Exports private key and certificate to a PKCS12 keystore
  *
- * @param {String} key PEM encoded private key
- * @param {String} certificate PEM encoded certificate
- * @param {String} password Password of the result PKCS12 file
- * @param {Pkcs12CreationOptions} [options] object of cipher and optional client key password {cipher:'aes128', clientKeyPassword: 'xxx'}
- * @param {Callback<{ pkcs12: any }>} callback Callback function with an error object and {pkcs12}
+ * @param key PEM encoded private key
+ * @param certificate PEM encoded certificate
+ * @param password Password of the result PKCS12 file
+ * @param [options] object of cipher and optional client key password {cipher:'aes128', clientKeyPassword: 'xxx'}
+ * @param callback Callback function with an error object and {pkcs12}
  */
 export function createPkcs12(key: string, certificate: string, password: string, options: Pkcs12CreationOptions, callback: Callback<{ pkcs12: any }>): void;
 export function createPkcs12(key: string, certificate: string, password: string, callback: Callback<{ pkcs12: any }>): void;
 
 /**
  * Reads private key and certificate from a PKCS12 keystore
- * @param {String} bufferOrPath
- * @param {Pkcs12ReadOptions} [options]
- * @param {Function} callback Callback function with an error object and {pkcs12}
+ * @param callback Callback function with an error object and {pkcs12}
  * @returns the result of the callback
  */
 export function readPkcs12(bufferOrPath: string, options: Pkcs12ReadOptions, callback: Callback<{ pkcs12: any }>): any;
@@ -252,14 +250,13 @@ export function readPkcs12(bufferOrPath: string, callback: Callback<{ pkcs12: an
 /**
  * Verifies the signing chain of the passed certificate
  *
- * @param {String} certificate PEM encoded certificate
- * @param {string[]} ca List of CA certificates
- * @param {Function} callback Callback function with an error object and a boolean valid
+ * @param certificate PEM encoded certificate
+ * @param ca List of CA certificates
+ * @param callback Callback function with an error object and a boolean valid
  */
 export function verifySigningChain(certificate: string, ca: string[], callback: Callback<boolean>): void;
 
 /**
  * config the pem module
- * @param {ModuleConfiguration} options
  */
 export function config(options: ModuleConfiguration): void;
diff --git a/types/perfect-scrollbar/index.d.ts b/types/perfect-scrollbar/index.d.ts
deleted file mode 100644
index 61d76e6ed4..0000000000
--- a/types/perfect-scrollbar/index.d.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-// Type definitions for perfect-scrollbar v0.7.1
-// Project: https://github.com/noraesae/perfect-scrollbar
-// Definitions by: Kombu <https://github.com/aicest>
-//                 Cyrus <https://github.com/CarbonAtom>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery" />
-
-interface HTMLElementEventMap {
-    /**
-     * This event fires when the y-axis is scrolled in either direction.
-     */
-    'ps-scroll-y': CustomEvent,
-    /**
-     * This event fires when the x-axis is scrolled in either direction.
-     */
-    'ps-scroll-x': CustomEvent,
-    /**
-     * This event fires when scrolling upwards.
-     */
-    'ps-scroll-up': CustomEvent,
-    /**
-     * This event fires when scrolling downwards.
-     */
-    'ps-scroll-down': CustomEvent,
-    /**
-     * This event fires when scrolling to the left.
-     */
-    'ps-scroll-left': CustomEvent,
-    /**
-     * This event fires when scrolling to the right.
-     */
-    'ps-scroll-right': CustomEvent,
-    /**
-     * This event fires when scrolling reaches the start of the y-axis.
-     */
-    'ps-y-reach-start': CustomEvent,
-    /**
-     * This event fires when scrolling reaches the end of the y-axis (useful for infinite scroll).
-     */
-    'ps-y-reach-end': CustomEvent,
-    /**
-     * This event fires when scrolling reaches the start of the x-axis.
-     */
-    'ps-x-reach-start': CustomEvent,
-    /**
-     * This event fires when scrolling reaches the end of the x-axis.
-     */
-    'ps-x-reach-end': CustomEvent
-}
-
-/**
- * @see https://github.com/noraesae/perfect-scrollbar/blob/master/src/js/plugin/default-setting.js#L3
- * @see https://github.com/noraesae/perfect-scrollbar#optional-parameters
- */
-interface PerfectScrollbarSettings {
-
-    /**
-     * It is a list of handlers to use to scroll the element.
-     * @see https://github.com/noraesae/perfect-scrollbar#handlers
-     * @see https://github.com/noraesae/perfect-scrollbar/blob/master/src/js/plugin/initialize.js#L9
-     * @default ['click-rail', 'drag-scrollbar', 'keyboard', 'wheel', 'touch']
-     */
-    handlers?: ('click-rail' |
-            'drag-scrollbar' |
-            'keyboard' |
-            'wheel' |
-            'touch' |
-            'selection')[];
-
-    /**
-     * When set to an integer value, the thumb part of the scrollbar will not expand over that number of pixels.
-     * @see https://github.com/noraesae/perfect-scrollbar#maxscrollbarlength
-     * @default null
-     */
-    maxScrollbarLength?: number;
-
-    /**
-     * When set to an integer value, the thumb part of the scrollbar will not shrink below that number of pixels.
-     * @see https://github.com/noraesae/perfect-scrollbar#minscrollbarlength
-     * @default null
-     */
-    minScrollbarLength?: number;
-
-    /**
-     * The number of pixels the content width can surpass the container width without enabling the X axis scroll bar.
-     * Allows some "wiggle room" or "offset break", so that X axis scroll bar is not enabled just because of a few pixels.
-     * @see https://github.com/noraesae/perfect-scrollbar#scrollxmarginoffset
-     * @default 0
-     */
-    scrollXMarginOffset?: number;
-
-    /**
-     * The number of pixels the content height can surpass the container height without enabling the Y axis scroll bar.
-     * Allows some "wiggle room" or "offset break", so that Y axis scroll bar is not enabled just because of a few pixels.
-     * @see https://github.com/noraesae/perfect-scrollbar#scrollymarginoffset
-     * @default 0
-     */
-    scrollYMarginOffset?: number;
-
-    /**
-     * When set to true, the scroll bar in X axis will not be available, regardless of the content width.
-     * @see https://github.com/noraesae/perfect-scrollbar#suppressscrollx
-     * @default false
-     */
-    suppressScrollX?: boolean;
-
-    /**
-     * When set to true, the scroll bar in Y axis will not be available, regardless of the content height.
-     * @see https://github.com/noraesae/perfect-scrollbar#suppressscrolly
-     * @default false
-     */
-    suppressScrollY?: boolean;
-
-    /**
-     * If this option is true, when the scroll reaches the end of the side, touch scrolling will be propagated to parent element.
-     * @see https://github.com/noraesae/perfect-scrollbar#swipepropagation
-     * @default true
-     */
-    swipePropagation?: boolean;
-
-    /**
-     * If this option is true, swipe scrolling will be eased.
-     * @see https://github.com/noraesae/perfect-scrollbar#swipeeasing
-     * @default true
-     */
-    swipeEasing?:boolean;
-
-    /**
-     * When set to true, and only one (vertical or horizontal) scrollbar is visible then both vertical and horizontal scrolling will affect the scrollbar.
-     * @see https://github.com/noraesae/perfect-scrollbar#usebothwheelaxes
-     * @default false
-     */
-    useBothWheelAxes?: boolean;
-
-    /**
-     * If this option is true, when the scroll reaches the end of the side, mousewheel event will be propagated to parent element.
-     * @see https://github.com/noraesae/perfect-scrollbar#wheelpropagation
-     * @default false
-     */
-    wheelPropagation?: boolean;
-
-    /**
-     * The scroll speed applied to mousewheel event.
-     * @see https://github.com/noraesae/perfect-scrollbar#wheelspeed
-     * @default 1
-     */
-    wheelSpeed?: number;
-
-    /**
-     * A string.
-     * It's a class name added to the container element.
-     * The class name is prepended with `ps-theme-`.
-     * So default theme class name is `ps-theme-default`.
-     * In order to create custom themes with scss use `ps-container($theme)` mixin, where `$theme` is a scss map.
-     * @see https://github.com/noraesae/perfect-scrollbar#theme
-     * @default 'default'
-     */
-    theme?: string;
-}
-
-interface PerfectScrollbar {
-    /**
-     * @see https://github.com/noraesae/perfect-scrollbar/blob/master/src/js/plugin/initialize.js#L19
-     */
-    initialize(element: HTMLElement, settings?: PerfectScrollbarSettings): void;
-
-    /**
-     * @see https://github.com/noraesae/perfect-scrollbar/blob/master/src/js/plugin/update.js#L9
-     */
-    update(element: HTMLElement): void;
-
-    /**
-     * @see https://github.com/noraesae/perfect-scrollbar/blob/master/src/js/plugin/destroy.js#L7
-     */
-    destroy(element: HTMLElement): void;
-}
-
-declare const Ps: PerfectScrollbar;
-
-declare module 'perfect-scrollbar' {
-    export = Ps;
-}
-
-interface JQuery {
-
-    /**
-     * @see https://github.com/noraesae/perfect-scrollbar/blob/master/src/js/adaptor/jquery.js#L6
-     */
-    perfectScrollbar(settingOrCommand?: PerfectScrollbarSettings | 'update' | 'destroy'): JQuery;
-}
-
-declare module 'perfect-scrollbar/jquery' {
-    function mountJQuery(jQuery: JQueryStatic): void;
-    export = mountJQuery;
-}
diff --git a/types/perfect-scrollbar/perfect-scrollbar-tests.ts b/types/perfect-scrollbar/perfect-scrollbar-tests.ts
deleted file mode 100644
index 4ba80d1294..0000000000
--- a/types/perfect-scrollbar/perfect-scrollbar-tests.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * https://github.com/noraesae/perfect-scrollbar#how-to-use
- */
-
-import * as Ps from 'perfect-scrollbar'
-const container = document.body
-
-// To initialise the plugin, `Ps.initialize` is used.
-Ps.initialize(container)
-
-// It can be initialised with optional parameters.
-Ps.initialize(container, {
-  wheelSpeed: 2,
-  wheelPropagation: true,
-  minScrollbarLength: 20
-})
-
-// If the size of your container or content changes, call `update`.
-Ps.update(container)
-
-// If you want to destroy the scrollbar, use `destroy`.
-Ps.destroy(container)
-
-// If you want to scroll to somewhere, just use a `scrollTop` property and update.
-container.scrollTop = 0
-Ps.update(container)
-
-/**
- * https://github.com/noraesae/perfect-scrollbar#jquery
- */
-
-import mountJQuery = require('perfect-scrollbar/jquery')
-mountJQuery($)
-
-$('#container').perfectScrollbar()            // Initialize
-$('#container').perfectScrollbar({ /*...*/ }) // with options
-$('#container').perfectScrollbar('update')    // Update
-$('#container').perfectScrollbar('destroy')   // Destroy
-
-container.addEventListener('ps-x-reach-start', () => { });
diff --git a/types/perfect-scrollbar/tsconfig.json b/types/perfect-scrollbar/tsconfig.json
deleted file mode 100644
index a3bd2529c9..0000000000
--- a/types/perfect-scrollbar/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "perfect-scrollbar-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/persona/tslint.json b/types/persona/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/persona/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pg-connection-string/index.d.ts b/types/pg-connection-string/index.d.ts
deleted file mode 100644
index fa79138728..0000000000
--- a/types/pg-connection-string/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for pg-connection-string 0.1
-// Project: https://github.com/iceddev/pg-connection-string
-// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-export function parse(connectionString: string): {
-    host: string;
-    database: string | null;
-    port: string | null;
-    application_name?: string;
-    client_encoding?: string;
-    fallback_application_name?: string;
-    user?: string;
-    password?: string;
-    ssl?: boolean;
-};
diff --git a/types/pg-connection-string/pg-connection-string-tests.ts b/types/pg-connection-string/pg-connection-string-tests.ts
deleted file mode 100644
index bf9698a7b9..0000000000
--- a/types/pg-connection-string/pg-connection-string-tests.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { parse } from 'pg-connection-string';
-
-const parts = parse('postgres://user:password@host:port/dbname');
-
-parts.application_name;
-parts.client_encoding;
-parts.database;
-parts.fallback_application_name;
-parts.host;
-parts.password;
-parts.port;
-parts.ssl;
-parts.user;
diff --git a/types/pg-connection-string/tsconfig.json b/types/pg-connection-string/tsconfig.json
deleted file mode 100644
index c3b2765339..0000000000
--- a/types/pg-connection-string/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "pg-connection-string-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/pg-pool/tslint.json b/types/pg-pool/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pg-pool/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 68fba5fb40..9f945082cd 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pg 7.1
+// Type definitions for pg 7.4
 // Project: https://github.com/brianc/node-postgres
 // Definitions by: Phips Peter <https://github.com/pspeter3>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -47,6 +47,7 @@ export interface QueryConfig {
     name?: string;
     text: string;
     values?: any[];
+    rowMode?: string;
 }
 
 export interface QueryResult {
@@ -93,7 +94,7 @@ export class Pool extends events.EventEmitter {
 }
 
 export class Client extends events.EventEmitter {
-    constructor(config: ClientConfig);
+    constructor(config: string | ClientConfig);
 
     connect(): Promise<void>;
     connect(callback: (err: Error) => void): void;
diff --git a/types/pg/v6/tslint.json b/types/pg/v6/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pg/v6/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pgwmodal/tslint.json b/types/pgwmodal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pgwmodal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phantom/index.d.ts b/types/phantom/index.d.ts
index e6f089b114..4b45ed8338 100644
--- a/types/phantom/index.d.ts
+++ b/types/phantom/index.d.ts
@@ -12,6 +12,7 @@ export interface PhantomJS {
 
 export interface WebPage {
     open(url: string): Promise<string>;
+    open(url: string, settings: IOpenWebPageSettings): Promise<string>;
     close(): Promise<void>;
 
     evaluate<R>(callback: () => R): Promise<R>;
@@ -58,3 +59,10 @@ export interface IPaperSizeOptions {
     orientation?: string;
     margin?: any; // string | { top?: string; left?: string; bottom?: string; right?: string;  }
 }
+
+export interface IOpenWebPageSettings {
+    operation?: string;
+    encoding?: string;
+    headers?: { [s: string]: string };
+    data?: string;
+}
diff --git a/types/phantom/phantom-tests.ts b/types/phantom/phantom-tests.ts
index ced5703927..b83ac3cc02 100644
--- a/types/phantom/phantom-tests.ts
+++ b/types/phantom/phantom-tests.ts
@@ -2,7 +2,9 @@ import phantom = require("phantom");
 
 phantom.create().then((ph: phantom.PhantomJS): void => {
     ph.createPage().then((page): void => {
-        page.open("http://www.google.com").then((status: string) => {
+        page.open("http://www.google.com", {
+          operation: "GET"
+        }).then((status: string) => {
             console.log("opened google? ", status);
             return page.evaluate((): string => {
                 return document.title;
@@ -136,4 +138,4 @@ phantom.create().then((ph) => {
             });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/types/phantom/tslint.json b/types/phantom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phantom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phantomcss/index.d.ts b/types/phantomcss/index.d.ts
index 688c706199..230936562b 100644
--- a/types/phantomcss/index.d.ts
+++ b/types/phantomcss/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Huddle/PhantomCSS
 // Definitions by: Amaury Bauzac <https://github.com/abauzac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="resemblejs" />
 import { Casper } from 'casperjs';
diff --git a/types/phantomcss/tslint.json b/types/phantomcss/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phantomcss/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phantomjs/tslint.json b/types/phantomjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phantomjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phoenix/tslint.json b/types/phoenix/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phoenix/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phone-formatter/tslint.json b/types/phone-formatter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phone-formatter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phone/tslint.json b/types/phone/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phone/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phonegap-facebook-plugin/tslint.json b/types/phonegap-facebook-plugin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phonegap-facebook-plugin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phonegap-nfc/tslint.json b/types/phonegap-nfc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phonegap-nfc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phonegap-plugin-barcodescanner/tslint.json b/types/phonegap-plugin-barcodescanner/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phonegap-plugin-barcodescanner/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/phonegap-plugin-push/index.d.ts b/types/phonegap-plugin-push/index.d.ts
deleted file mode 100644
index 1f0e7c52f9..0000000000
--- a/types/phonegap-plugin-push/index.d.ts
+++ /dev/null
@@ -1,326 +0,0 @@
-// Type definitions for phonegap-plugin-push v2.0.0
-// Project: https://github.com/phonegap/phonegap-plugin-push
-// Definitions by: Frederico Galvão <https://github.com/fredgalvao>, Larry Bahr <https://github.com/larrybahr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace PhonegapPluginPush
-{
-	type EventResponse = RegistrationEventResponse | NotificationEventResponse | Error;
-
-	interface PushNotification
-	{
-		/**
-		 * The event registration will be triggered on each successful registration with the 3rd party push service.
-		 * @param event
-		 * @param callback
-		 */
-		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;
-		/**
-		 * 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;
-		/**
-		 *
-		 * @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;
-
-		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
-		 * @param topics
-		 */
-		unregister(successHandler: () => any, errorHandler?: () => any, topics?: string[]): void;
-
-		/**
-		 * The subscribe method is used when the application wants to subscribe a new topic to receive push notifications.
-		 * @param topic Topic to subscribe to.
-		 * @param successHandler Is called when the api successfully unregisters.
-		 * @param errorHandler Is called when the api encounters an error while unregistering.
-		 */
-		subscribe(topic: string, successHandler: () => any, errorHandler: () => any): void;
-
-		/**
-		 * The unsubscribe method is used when the application no longer wants to receive push notifications
-		 * from a specific topic but continue to receive other push messages.
-		 * @param topic Topic to unsubscribe from.
-		 * @param successHandler Is called when the api successfully unregisters.
-		 * @param errorHandler Is called when the api encounters an error while unregistering.
-		 */
-		unsubscribe(topic: string, 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.
-		 * @param successHandler
-		 * @param errorHandler
-		 * @param count
-		 */
-		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
-		 * @param id
-		 */
-		finish(successHandler?: () => any, errorHandler?: () => any, id?: string): void;
-
-		/**
-		 * Tells the OS to clear all notifications from the Notification Center
-		 * @param successHandler Is called when the api successfully clears the notifications.
-		 * @param errorHandler Is called when the api encounters an error when attempting to clears the notifications.
-		 */
-		clearAllNotifications(successHandler: () => any, errorHandler: () => any): void;
-	}
-
-	/**
-	 * platform specific initialization options.
-	 */
-	interface InitOptions
-	{
-		/**
-		 * Android specific initialization options.
-		 */
-		android?: {
-			/**
-			 * Maps to the project number in the Google Developer Console.
-			 */
-			senderID: string;
-			/**
-			 * The name of a drawable resource to use as the small-icon. The name should not include the extension.
-			 */
-			icon?: string;
-			/**
-			 * 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;
-			/**
-			 * If true it plays the sound specified in the push data or the default system sound. Default is true.
-			 */
-			sound?: boolean;
-			/**
-			 * If true the device vibrates on receipt of notification. Default is true.
-			 */
-			vibrate?: boolean;
-			/**
-			 * If true the app clears all pending notifications when it is closed. Default is true.
-			 */
-			clearNotifications?: boolean;
-			/**
-			 * If true will always show a notification, even when the app is on the foreground. Default is false.
-			 */
-			forceShow?: boolean;
-			/**
-			 * If the array contains one or more strings each string will be used to subscribe to a GcmPubSub topic.
-			 */
-			topics?: string[];
-		}
-
-		/**
-		 * iOS specific initialization options.
-		 */
-		ios?: {
-			/**
-			 * 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 | string;
-			/**
-			 * 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 | string;
-			/**
-			 * 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 | string;
-			/**
-			 * If true|"true" the badge will be cleared on app startup. Default is false|"false".
-			 */
-			clearBadge?: boolean | string;
-			/**
-			 * The data required in order to enable Action Buttons for iOS.
-			 * Action Buttons on iOS - https://github.com/phonegap/phonegap-plugin-push/blob/master/docs/PAYLOAD.md#action-buttons-1
-			 */
-			categories?: CategoryArray;
-			/**
-			 * Maps to the project number in the Google Developer Console. Setting this uses GCM for notifications instead of native
-			 */
-			senderID?: string;
-			/**
-			 * Whether to use prod or sandbox GCM setting. Defaults to false.
-			 */
-			gcmSandbox?: boolean;
-			/**
-			 * If the array contains one or more strings each string will be used to subscribe to a GcmPubSub topic. Note: only usable in conjunction with senderID
-			 */
-			topics?: string[];
-		}
-
-		/**
-		 * Windows specific initialization options.
-		 */
-		windows?: {
-
-		}
-	}
-
-	interface CategoryArray
-	{
-		[name: string]: CategoryAction;
-	}
-
-	interface CategoryAction
-	{
-		yes?: CategoryActionData;
-		no?: CategoryActionData;
-		maybe?: CategoryActionData;
-	}
-
-	interface CategoryActionData
-	{
-		callback: string;
-		title: string;
-		foreground: boolean;
-		destructive: boolean;
-	}
-
-	interface HasPermissionCallbackParameters
-	{
-		isEnabled: boolean; /** Whether the permission for push notifications has been granted. */
-	}
-	
-	interface RegistrationEventResponse
-	{
-		/**
-		 * The registration ID provided by the 3rd party remote push service.
-		 */
-		registrationId: string;
-	}
-
-	interface NotificationEventResponse
-	{
-		/**
-		 * The text of the push message sent from the 3rd party service.
-		 */
-		message: string;
-		/**
-		 * The optional title of the push message sent from the 3rd party service.
-		 */
-		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;
-		/**
-		 * The name of the sound file to be played upon receipt of the notification.
-		 */
-		sound: string;
-		/**
-		 * The path of the image file to be displayed in the notification.
-		 */
-		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
-	{
-		[name: string]: any;
-
-		/**
-		 * Whether the notification was received while the app was in the foreground
-		 */
-		foreground?: boolean;
-		/**
-		 * Will be true if the application is started by clicking on the push notification, false if the app is already started. (Android/iOS only)
-		 */
-		coldstart?: boolean;
-		collapse_key?: string;
-		from?: string;
-		notId?: string;
-	}
-
-	interface PushNotificationStatic {
-		init(options: InitOptions): PushNotification;
-		
-		/**
-		 * Android & iOS only
-		 * Checks whether the push notification permission has been granted.
-		 * @param successHandler - Is called when the api successfully retrieves the details on the permission.
-		 * @param errorHandler
-		 * @param id
-		 */
-		hasPermission(successhandler: (data: HasPermissionCallbackParameters) => any): void;
-	}
-}
-
-interface Window
-{
-	PushNotification: PhonegapPluginPush.PushNotificationStatic;
-}
-
-declare var PushNotification: PhonegapPluginPush.PushNotificationStatic;
diff --git a/types/phonegap-plugin-push/phonegap-plugin-push-tests.ts b/types/phonegap-plugin-push/phonegap-plugin-push-tests.ts
deleted file mode 100644
index 36cfb2e444..0000000000
--- a/types/phonegap-plugin-push/phonegap-plugin-push-tests.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-function test() {
-	let options: PhonegapPluginPush.InitOptions = {
-		android: {
-			senderID: '123456789',
-			icon: 'phonegap',
-			iconColor: 'blue',
-			sound: true,
-			vibrate: true,
-			clearNotifications: false,
-			forceShow: true,
-			topics: ['foo', 'bar']
-		},
-		ios: {
-			badge: true,
-			sound: true,
-			alert: true,
-			clearBadge: true,
-			senderID: '123456789',
-			gcmSandbox: true,
-			categories: {
-				"invite": {
-					yes: {
-						callback: "app.accept", title: "Accept", foreground: true, destructive: false
-					},
-					no: {
-						callback: "app.reject", title: "Reject", foreground: true, destructive: false
-					},
-					maybe: {
-						callback: "app.maybe", title: "Maybe", foreground: true, destructive: false
-					}
-				},
-				"delete": {
-					yes: {
-						callback: "app.doDelete", title: "Delete", foreground: true, destructive: true
-					},
-					no: {
-						callback: "app.cancel", title: "Cancel", foreground: true, destructive: false
-					}
-				}
-			},
-			topics: ['foo', 'bar']
-		},
-		windows: {}
-	};
-
-	let iosStringOptions = {
-		badge: 'true',
-		sound: 'true',
-		alert: 'true',
-		clearBadge: 'true'
-	};
-
-	options.ios = iosStringOptions;
-
-	let push: PhonegapPluginPush.PushNotification;
-
-	push.unregister(() => {
-		console.log('did unregister');
-	}, () => {
-		console.log('did not unregister');
-	}, ['foo','bar']);
-
-	/*from init*/
-	push = PushNotification.init(options);
-	push = window.PushNotification.init(options);
-	
-	/*hasPermission test*/
-	PushNotification.hasPermission(function(data) {
-		if (data.isEnabled) {
-			console.log('isEnabled');
-		}
-	});
-
-	let registrationHandler = (data: PhonegapPluginPush.RegistrationEventResponse) => {
-		console.log(data.registrationId);
-	};
-
-	let notificationHandler = (data: PhonegapPluginPush.NotificationEventResponse) => {
-		console.log(data.message);
-		console.log(data.title);
-		console.log(data.count);
-		console.log(data.sound);
-		console.log(data.image);
-
-		/*the rest of the additional fields are not 'canon'*/
-		console.log(data.additionalData);
-		console.log(data.additionalData.foreground);
-		console.log(data.additionalData.coldstart);
-
-		push.finish(() => {
-			console.log('did finish');
-		}, () => {
-			console.log('did not finish');
-		}, 'push-1');
-	};
-
-	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');
-	});
-	
-	push.clearAllNotifications(() => {
-		console.log('did clearAllNotifications');
-	}, () => {
-		console.log('did not clearAllNotifications');
-	});
-}
diff --git a/types/phonegap-plugin-push/tsconfig.json b/types/phonegap-plugin-push/tsconfig.json
deleted file mode 100644
index 1508fa279d..0000000000
--- a/types/phonegap-plugin-push/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "phonegap-plugin-push-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/phonegap/phonegap-tests.ts b/types/phonegap/phonegap-tests.ts
index f507e3bd71..180740d5e3 100644
--- a/types/phonegap/phonegap-tests.ts
+++ b/types/phonegap/phonegap-tests.ts
@@ -78,8 +78,7 @@ function test_camera() {
 function test_capture() {
     var capture = navigator.device.capture;
     function captureSuccess(mediaFiles) {
-        var i, len;
-        for (i = 0, len = mediaFiles.length; i < len; i += 1) {
+        for (let i = 0; i < mediaFiles.length; i += 1) {
             uploadFile(mediaFiles[i]);
         }
     }
@@ -108,9 +107,8 @@ function test_capture() {
     var options = { limit: 3, duration: 10 };
     navigator.device.capture.captureAudio(captureSuccess, captureError, options);
     function captureSuccess2(mediaFiles) {
-        var i, path, len;
-        for (i = 0, len = mediaFiles.length; i < len; i += 1) {
-            path = mediaFiles[i].fullPath;
+        for (let i = 0; i < mediaFiles.length; i += 1) {
+            const path = mediaFiles[i].fullPath;
         }
     };
     function captureError2(error) {
@@ -231,7 +229,7 @@ function test_contacts() {
     contact.remove(onSuccess, onError);
 }
 function test_contacts2() {
-    
+
     function onSuccess(contacts) {
         for (var i = 0; i < contacts.length; i++) {
             console.log("Display Name = " + contacts[i].displayName);
diff --git a/types/phonegap/tslint.json b/types/phonegap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/phonegap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/photonui/tslint.json b/types/photonui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/photonui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/photoswipe/tslint.json b/types/photoswipe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/photoswipe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/physijs/test/body.ts b/types/physijs/test/body.ts
index dfb0224f65..d046880099 100644
--- a/types/physijs/test/body.ts
+++ b/types/physijs/test/body.ts
@@ -11,30 +11,30 @@ initScene = function() {
     projector = new THREE.Projector;
 
     renderer = new THREE.WebGLRenderer({ antialias: true });
-    renderer.setSize( window.innerWidth, window.innerHeight );
+    renderer.setSize(window.innerWidth, window.innerHeight);
     renderer.shadowMapEnabled = true;
-   // // renderer.shadowMapSoft = true;
-    document.getElementById( 'viewport' ).appendChild( renderer.domElement );
+    // // renderer.shadowMapSoft = true;
+    document.getElementById('viewport').appendChild(renderer.domElement);
 
     render_stats = new Stats();
     render_stats.dom.style.position = 'absolute';
     render_stats.dom.style.top = '1px';
     render_stats.dom.style.zIndex = '100';
-    document.getElementById( 'viewport' ).appendChild( render_stats.dom );
+    document.getElementById('viewport').appendChild(render_stats.dom);
 
     physics_stats = new Stats();
     physics_stats.dom.style.position = 'absolute';
     physics_stats.dom.style.top = '50px';
     physics_stats.dom.style.zIndex = '100';
-    document.getElementById( 'viewport' ).appendChild( physics_stats.dom );
+    document.getElementById('viewport').appendChild(physics_stats.dom);
 
     scene = new Physijs.Scene();
-    scene.setGravity(new THREE.Vector3( 0, -30, 0 ));
+    scene.setGravity(new THREE.Vector3(0, -30, 0));
     scene.addEventListener(
         'update',
         function() {
             applyForce();
-            scene.simulate( undefined, 1 );
+            scene.simulate(undefined, 1);
             physics_stats.update();
         }
     );
@@ -45,14 +45,14 @@ initScene = function() {
         1,
         1000
     );
-    camera.position.set( 60, 50, 60 );
-    camera.lookAt( scene.position );
-    scene.add( camera );
+    camera.position.set(60, 50, 60);
+    camera.lookAt(scene.position);
+    scene.add(camera);
 
     // Light
-    light = new THREE.DirectionalLight( 0xFFFFFF );
-    light.position.set( 20, 40, -15 );
-    light.target.position.copy( scene.position );
+    light = new THREE.DirectionalLight(0xFFFFFF);
+    light.position.set(20, 40, -15);
+    light.target.position.copy(scene.position);
     light.castShadow = true;
     light.shadowCameraLeft = -60;
     light.shadowCameraTop = -60;
@@ -63,11 +63,11 @@ initScene = function() {
     light.shadowBias = -.0001
     light.shadowMapWidth = light.shadowMapHeight = 2048;
     //// light.shadowDarkness = .7;
-    scene.add( light );
+    scene.add(light);
 
     // Materials
     ground_material = Physijs.createMaterial(
-        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/rocks.jpg' ) }),
+        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture('images/rocks.jpg') }),
         .8, // high friction
         .4 // low restitution
     );
@@ -75,7 +75,7 @@ initScene = function() {
     // ground_material.map.repeat.set( 3, 3 );
 
     box_material = Physijs.createMaterial(
-        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/plywood.jpg' ) }),
+        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture('images/plywood.jpg') }),
         .4, // low friction
         .6 // high restitution
     );
@@ -89,11 +89,11 @@ initScene = function() {
         0 // mass
     );
     ground.receiveShadow = true;
-    scene.add( ground );
+    scene.add(ground);
 
-    for ( var i = 0; i < 10; i++ ) {
+    for (var i = 0; i < 10; i++) {
         box = new Physijs.BoxMesh(
-            new THREE.BoxGeometry( 4, 4, 4 ),
+            new THREE.BoxGeometry(4, 4, 4),
             box_material
         );
         box.position.set(
@@ -112,46 +112,46 @@ initScene = function() {
             Math.random() * 1 + .5
         );
         box.castShadow = true;
-        scene.add( box );
-        boxes.push( box );
+        scene.add(box);
+        boxes.push(box);
     }
 
-    renderer.domElement.addEventListener( 'mousemove', setMousePosition );
+    renderer.domElement.addEventListener('mousemove', setMousePosition);
 
-    requestAnimationFrame( render );
+    requestAnimationFrame(render);
     scene.simulate();
 };
 
 render = function() {
-    requestAnimationFrame( render );
-    renderer.render( scene, camera );
+    requestAnimationFrame(render);
+    renderer.render(scene, camera);
     render_stats.update();
 };
 
-setMousePosition = function( evt ) {
+setMousePosition = function(evt) {
     // Find where mouse cursor intersects the ground plane
     var vector = new THREE.Vector3(
-        ( evt.clientX / renderer.dom.clientWidth ) * 2 - 1,
-        -( ( evt.clientY / renderer.dom.clientHeight ) * 2 - 1 ),
+        (evt.clientX / renderer.dom.clientWidth) * 2 - 1,
+        -((evt.clientY / renderer.dom.clientHeight) * 2 - 1),
         .5
     );
-    projector.unprojectVector( vector, camera );
-    vector.sub( camera.position ).normalize();
+    projector.unprojectVector(vector, camera);
+    vector.sub(camera.position).normalize();
 
     var coefficient = (box.position.y - camera.position.y) / vector.y
-    mouse_position = camera.position.clone().add( vector.multiplyScalar( coefficient ) );
+    mouse_position = camera.position.clone().add(vector.multiplyScalar(coefficient));
 };
 
 applyForce = function() {
     if (!mouse_position) return;
     var strength = 35, distance, effect, offset, box;
 
-    for ( var i = 0; i < boxes.length; i++ ) {
+    for (var i = 0; i < boxes.length; i++) {
         box = boxes[i];
-        distance = mouse_position.distanceTo( box.position ),
-            effect = mouse_position.clone().sub( box.position ).normalize().multiplyScalar( strength / distance ).negate(),
-            offset = mouse_position.clone().sub( box.position );
-        box.applyImpulse( effect, offset );
+        distance = mouse_position.distanceTo(box.position);
+        effect = mouse_position.clone().sub(box.position).normalize().multiplyScalar(strength / distance).negate();
+        offset = mouse_position.clone().sub(box.position);
+        box.applyImpulse(effect, offset);
     }
 };
 
diff --git a/types/physijs/tslint.json b/types/physijs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/physijs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pi-spi/tslint.json b/types/pi-spi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pi-spi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pickadate/tslint.json b/types/pickadate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pickadate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pify/tslint.json b/types/pify/tslint.json
new file mode 100644
index 0000000000..7f51cc6e38
--- /dev/null
+++ b/types/pify/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-initializer": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pikaday-time/index.d.ts b/types/pikaday-time/index.d.ts
index d1cd056b79..33a312801d 100644
--- a/types/pikaday-time/index.d.ts
+++ b/types/pikaday-time/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/owenmead/Pikaday
 // Definitions by: Sayan Pal <https://github.com/Sayan751>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as moment from 'moment';
 
@@ -18,7 +19,7 @@ declare class Pikaday {
      * Extends the existing configuration options for Pikaday object with the options provided.
      * Can be used to change/extend the configurations on runtime.
      * @param options full/partial configuration options.
-     * @returns {} extended configurations.
+     * @returns extended configurations.
      */
     config(options: Pikaday.PikadayOptions): Pikaday.PikadayOptions;
 
diff --git a/types/pikaday-time/package.json b/types/pikaday-time/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/pikaday-time/package.json
+++ b/types/pikaday-time/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/pikaday/index.d.ts b/types/pikaday/index.d.ts
index 956356f265..9dc370054f 100644
--- a/types/pikaday/index.d.ts
+++ b/types/pikaday/index.d.ts
@@ -20,7 +20,7 @@ declare class Pikaday {
      * Extends the existing configuration options for Pikaday object with the options provided.
      * Can be used to change/extend the configurations on runtime.
      * @param options full/partial configuration options.
-     * @returns {} extended configurations.
+     * @returns extended configurations.
      */
     config(options: Pikaday.PikadayOptions): Pikaday.PikadayOptions;
 
diff --git a/types/pikaday/package.json b/types/pikaday/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/pikaday/package.json
+++ b/types/pikaday/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/pinkyswear/tslint.json b/types/pinkyswear/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pinkyswear/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pino-multi-stream/index.d.ts b/types/pino-multi-stream/index.d.ts
new file mode 100644
index 0000000000..ad73577fe3
--- /dev/null
+++ b/types/pino-multi-stream/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for pino-multi-stream 3.1
+// Project: https://github.com/pinojs/pino-multi-stream#readme
+// Definitions by: Jake Ginnivan <https://github.com/JakeGinnivan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+import {
+    LoggerOptions as PinoLoggerOptions,
+    Logger as PinoLogger,
+    Level as PinoLevel,
+    stdSerializers as pinoStdSerializers
+} from 'pino';
+import stream = require('stream');
+
+declare namespace pinoms {
+    type Streams = Array<{ stream: NodeJS.WritableStream; level?: Level }>;
+    interface LoggerOptions extends PinoLoggerOptions {
+        streams?: Streams;
+    }
+    const stdSerializers: typeof pinoStdSerializers;
+
+    function multistream(streams: Streams): stream.Writable;
+    type Level = PinoLevel;
+    type Logger = PinoLogger;
+}
+
+declare function pinoms(options: pinoms.LoggerOptions): pinoms.Logger;
+export = pinoms;
diff --git a/types/pino-multi-stream/pino-multi-stream-tests.ts b/types/pino-multi-stream/pino-multi-stream-tests.ts
new file mode 100644
index 0000000000..d9d0899256
--- /dev/null
+++ b/types/pino-multi-stream/pino-multi-stream-tests.ts
@@ -0,0 +1,19 @@
+import * as fs from 'fs';
+import * as pino from 'pino';
+import * as pinoms from 'pino-multi-stream';
+
+const streams: pinoms.Streams = [
+    { stream: process.stdout }, // an "info" level destination stream
+    { level: 'error', stream: process.stderr }, // an "error" level destination stream
+    { stream: fs.createWriteStream('/tmp/info.stream.out') },
+    { level: 'fatal', stream: fs.createWriteStream('/tmp/fatal.stream.out') }
+];
+const logger = pinoms({
+    level: 'warn',
+    streams
+});
+
+const log = pino({
+    level: 'debug' // this MUST be set at the lowest level of the
+                   // destinations
+}, pinoms.multistream(streams));
diff --git a/types/pino-multi-stream/tsconfig.json b/types/pino-multi-stream/tsconfig.json
new file mode 100644
index 0000000000..7a060abb2e
--- /dev/null
+++ b/types/pino-multi-stream/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pino-multi-stream-tests.ts"
+    ]
+}
diff --git a/types/pino-multi-stream/tslint.json b/types/pino-multi-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pino-multi-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pinterest-sdk/tslint.json b/types/pinterest-sdk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pinterest-sdk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/piwik-tracker/tslint.json b/types/piwik-tracker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/piwik-tracker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pixelmatch/index.d.ts b/types/pixelmatch/index.d.ts
new file mode 100644
index 0000000000..0a2e4277ac
--- /dev/null
+++ b/types/pixelmatch/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for pixelmatch 4.0
+// Project: https://github.com/mapbox/pixelmatch#readme
+// Definitions by: Oleg Repin <https://github.com/iamolegga>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function Pixelmatch(
+  /** Image data of the first image to compare. Note: image dimensions must be equal. */
+  img1: Buffer | Uint8Array,
+  /** Image data of the second image to compare. Note: image dimensions must be equal. */
+  img2: Buffer | Uint8Array,
+  /** Image data to write the diff to, or null if don't need a diff image. */
+  output: Buffer | Uint8Array | null,
+  /** Width of the images. Note that all three images need to have the same dimensions. */
+  width: number,
+  /** Height of the images. Note that all three images need to have the same dimensions. */
+  height: number,
+  /** Options. */
+  options?: Options,
+): number;
+
+interface Options {
+  /** Matching threshold, ranges from 0 to 1. Smaller values make the comparison more sensitive. 0.1 by default. */
+  readonly threshold?: number;
+  /** If true, disables detecting and ignoring anti-aliased pixels. false by default. */
+  readonly includeAA?: boolean;
+}
+
+export = Pixelmatch;
diff --git a/types/pixelmatch/pixelmatch-tests.ts b/types/pixelmatch/pixelmatch-tests.ts
new file mode 100644
index 0000000000..dc49f7f326
--- /dev/null
+++ b/types/pixelmatch/pixelmatch-tests.ts
@@ -0,0 +1,27 @@
+/**
+ * This test code taken from pixelmatch example usage.
+ * https://github.com/mapbox/pixelmatch#example-usage
+ */
+
+import * as fs from 'fs';
+import pixelmatch = require('pixelmatch');
+import { PNG } from 'pngjs';
+
+const img1 = fs.createReadStream('img1.png')
+  .pipe(new PNG())
+  .on('parsed', doneReading);
+
+const img2 = fs.createReadStream('img2.png')
+  .pipe(new PNG())
+  .on('parsed', doneReading);
+
+let filesRead = 0;
+
+function doneReading() {
+    if (++filesRead < 2) return;
+    const diff = new PNG({width: img1.width, height: img1.height});
+
+    pixelmatch(img1.data, img2.data, diff.data, img1.width, img1.height, {threshold: 0.1});
+
+    diff.pack().pipe(fs.createWriteStream('diff.png'));
+}
diff --git a/types/pixelmatch/tsconfig.json b/types/pixelmatch/tsconfig.json
new file mode 100644
index 0000000000..02115e3fdc
--- /dev/null
+++ b/types/pixelmatch/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pixelmatch-tests.ts"
+    ]
+}
diff --git a/types/pixelmatch/tslint.json b/types/pixelmatch/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pixelmatch/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index f33f0d502c..b053b46790 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Pixi.js 4.5
+// Type definitions for Pixi.js 4.6
 // Project: https://github.com/pixijs/pixi.js/tree/dev
 // Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -372,7 +372,7 @@ declare namespace PIXI {
         on(event: interaction.InteractionEventTypes, fn: (event: interaction.InteractionEvent) => void, context?: any): this;
         once(event: interaction.InteractionEventTypes, fn: (event: interaction.InteractionEvent) => void, context?: any): this;
         removeListener(event: interaction.InteractionEventTypes, fn?: (event: interaction.InteractionEvent) => void, context?: any): this;
-        removeAllListeners(event: interaction.InteractionEventTypes): this;
+        removeAllListeners(event?: interaction.InteractionEventTypes): this;
         off(event: interaction.InteractionEventTypes, fn?: (event: interaction.InteractionEvent) => void, context?: any): this;
         addListener(event: interaction.InteractionEventTypes, fn: (event: interaction.InteractionEvent) => void, context?: any): this;
     }
@@ -827,6 +827,7 @@ declare namespace PIXI {
         preserveDrawingBuffer: boolean;
         clearBeforeRender: boolean;
         roundPixels: boolean;
+        backgroundColor: number;
         protected _backgroundColor: number;
         protected _backgroundColorRgba: number[];
         protected _backgroundColorString: string;
@@ -834,7 +835,7 @@ declare namespace PIXI {
         protected _lastObjectRendered: DisplayObject;
 
         resize(screenWidth: number, screenHeight: number): void;
-        generateTexture(displayObject: DisplayObject, scaleMode?: number, resolution?: number): RenderTexture;
+        generateTexture(displayObject: DisplayObject, scaleMode?: number, resolution?: number, region?: Rectangle): RenderTexture;
         render(...args: any[]): void;
         destroy(removeView?: boolean): void;
     }
@@ -875,7 +876,7 @@ declare namespace PIXI {
         on(event: "prerender" | "postrender", fn: () => void, context?: any): this;
         once(event: "prerender" | "postrender", fn: () => void, context?: any): this;
         removeListener(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
-        removeAllListeners(event: "prerender" | "postrender"): this;
+        removeAllListeners(event?: "prerender" | "postrender"): this;
         off(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
         addListener(event: "prerender" | "postrender", fn: () => void, context?: any): this;
     }
@@ -948,7 +949,6 @@ declare namespace PIXI {
         extract: extract.WebGLExtract;
         protected drawModes: any;
         protected _activeShader: Shader;
-        protected _activeVao: glCore.VertexArrayObject;
         _activeRenderTarget: RenderTarget;
         protected _initContext(): void;
 
@@ -977,7 +977,7 @@ declare namespace PIXI {
         once(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
         removeListener(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
         removeListener(event: "context", fn?: (gl: WebGLRenderingContext) => void, context?: any): this;
-        removeAllListeners(event: "prerender" | "postrender" | "context"): this;
+        removeAllListeners(event?: "prerender" | "postrender" | "context"): this;
         off(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
         off(event: "context", fn?: (gl: WebGLRenderingContext) => void, context?: any): this;
         addListener(event: "prerender" | "postrender", fn: () => void, context?: any): this;
@@ -1032,7 +1032,7 @@ declare namespace PIXI {
 
         update(): void;
         run(): void;
-        unload(): void;
+        unload(displayObject: DisplayObject): void;
     }
     abstract class ObjectRenderer extends WebGLManager {
         constructor(renderer: WebGLRenderer);
@@ -1485,7 +1485,7 @@ declare namespace PIXI {
         on(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
         once(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
         removeListener(event: "update", fn?: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
-        removeAllListeners(event: "update"): this;
+        removeAllListeners(event?: "update"): this;
         off(event: "update", fn?: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
         addListener(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
     }
@@ -1542,7 +1542,7 @@ declare namespace PIXI {
         on(event: "update" | "loaded" | "error" | "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
         once(event: "update" | "loaded" | "error" | "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
         removeListener(event: "update" | "loaded" | "error" | "dispose", fn?: (baseTexture: BaseTexture) => void, context?: any): this;
-        removeAllListeners(event: "update" | "loaded" | "error" | "dispose"): this;
+        removeAllListeners(event?: "update" | "loaded" | "error" | "dispose"): this;
         off(event: "update" | "loaded" | "error" | "dispose", fn?: (baseTexture: BaseTexture) => void, context?: any): this;
         addListener(event: "update" | "loaded" | "error" | "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
     }
@@ -1568,7 +1568,7 @@ declare namespace PIXI {
         protected _uvs: TextureUvs;
         orig: Rectangle;
         protected _updateID: number;
-        transform: any;
+        transform: TextureMatrix;
         textureCacheIds: string[];
 
         update(): void;
@@ -1576,7 +1576,7 @@ declare namespace PIXI {
         protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
         destroy(destroyBase?: boolean): void;
         clone(): Texture;
-        protected _updateUvs(): void;
+        _updateUvs(): void;
 
         static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number, sourceScale?: number): Texture;
         static fromFrame(frameId: string): Texture;
@@ -1604,10 +1604,27 @@ declare namespace PIXI {
         on(event: "update", fn: (texture: Texture) => void, context?: any): this;
         once(event: "update", fn: (texture: Texture) => void, context?: any): this;
         removeListener(event: "update", fn?: (texture: Texture) => void, context?: any): this;
-        removeAllListeners(event: "update"): this;
+        removeAllListeners(event?: "update"): this;
         off(event: "update", fn?: (texture: Texture) => void, context?: any): this;
         addListener(event: "update", fn: (texture: Texture) => void, context?: any): this;
     }
+    class TextureMatrix {
+        constructor(texture: Texture, clampMargin?: number);
+
+        protected _texture: Texture;
+        mapCoord: Matrix;
+        uClampFrame: Float32Array;
+        uClampOffset: Float32Array;
+        protected _lastTextureID: number;
+
+        clampOffset: number;
+        clampMargin: number;
+
+        texture: Texture;
+
+        update(forceUpdate?: boolean): boolean;
+        multiplyUvs(uvs: Float32Array, out?: Float32Array): Float32Array;
+    }
     class TextureUvs {
         x0: number;
         y0: number;
@@ -1833,7 +1850,7 @@ declare namespace PIXI {
             static fromFrames(frame: string[]): AnimatedSprite;
             static fromImages(images: string[]): AnimatedSprite;
         }
-        class TextureTransform {
+        class TextureMatrix {
             constructor(texture: Texture, clampMargin?: number);
 
             protected _texture: Texture;
@@ -1857,7 +1874,7 @@ declare namespace PIXI {
             protected _width: number;
             protected _height: number;
             protected _canvasPattern: CanvasPattern;
-            uvTransform: TextureTransform;
+            uvTransform: TextureMatrix;
             uvRespectAnchor: boolean;
 
             clampMargin: number;
@@ -1986,6 +2003,8 @@ declare namespace PIXI {
             map: Texture;
         }
         class AlphaFilter extends Filter<{}> {
+            constructor(alpha?: number);
+
             alpha: number;
             glShaderKey: number;
         }
@@ -2105,7 +2124,7 @@ declare namespace PIXI {
             protected _tempPoint: Point;
             resolution: number;
             hitTest(globalPoint: Point, root?: Container): DisplayObject;
-            protected setTargetElement(element: HTMLCanvasElement, resolution?: number): void;
+            setTargetElement(element: HTMLCanvasElement, resolution?: number): void;
             protected addEvents(): void;
             protected removeEvents(): void;
             update(deltaTime?: number): void;
@@ -2384,6 +2403,7 @@ declare namespace PIXI {
             spineData: any;
             textures?: TextureDictionary;
         }
+        const shared: Loader;
     }
 
     //////////////////////////////////////////////////////////////////////////////
@@ -2409,7 +2429,7 @@ declare namespace PIXI {
             texture: Texture;
             tintRgb: Float32Array;
             protected _glDatas: { [n: number]: any; };
-            protected _uvTransform: extras.TextureTransform;
+            protected _uvTransform: extras.TextureMatrix;
             uploadUvTransform: boolean;
             multiplyUvs(): void;
             refresh(forceUpdate?: boolean): void;
@@ -2642,7 +2662,7 @@ declare namespace PIXI {
     //////////////////////////////////////////////////////////////////////////////
     /////////////////////////////pixi-gl-core/////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
-    // pixi-gl-core https://github.com/pixijs/pixi-gl-core
+    // pixi-gl-core 1.1.4 https://github.com/pixijs/pixi-gl-core
     // sharedArrayBuffer as a type is not available yet.
     // need to fully define what an `Attrib` is.
     namespace glCore {
@@ -2727,7 +2747,7 @@ declare namespace PIXI {
             uniforms: any;
             attributes: any;
 
-            bind(): void;
+            bind(): this;
             destroy(): void;
         }
         class GLTexture {
@@ -2794,13 +2814,13 @@ declare namespace PIXI {
             indexBuffer: GLBuffer;
             dirty: boolean;
 
-            bind(): VertexArrayObject;
-            unbind(): VertexArrayObject;
-            activate(): VertexArrayObject;
-            addAttribute(buffer: GLBuffer, attribute: Attrib, type: number, normalized: boolean, stride: number, start: number): VertexArrayObject;
-            addIndex(buffer: GLBuffer, options?: any): VertexArrayObject;
-            clear(): VertexArrayObject;
-            draw(type: number, size: number, start: number): VertexArrayObject;
+            bind(): this;
+            unbind(): this;
+            activate(): this;
+            addAttribute(buffer: GLBuffer, attribute: Attrib, type?: number, normalized?: boolean, stride?: number, start?: number): this;
+            addIndex(buffer: GLBuffer, options?: any): this;
+            clear(): this;
+            draw(type: number, size: number, start: number): this;
             destroy(): void;
         }
     }
@@ -3203,6 +3223,15 @@ declare namespace PIXI {
         type PRECISION = string;
     }
 
+    namespace GroupD8 {
+        /**
+         * @name PIXI.GroupD8.isSwapWidthHeight
+         * @see PIXI.GroupD8.isVertical
+         * @deprecated since version 4.6.0
+         */
+        function isSwapWidthHeight(rotation: number): boolean;
+    }
+
     namespace extras {
         /**
          * @class
@@ -3212,6 +3241,15 @@ declare namespace PIXI {
          * @deprecated since version 4.2.0
          */
         type MovieClip = extras.AnimatedSprite;
+
+        /**
+         * @class
+         * @name TextureTransform
+         * @memberof PIXI.extras
+         * @see PIXI.TextureMatrix
+         * @deprecated since version 4.6.0
+         */
+        type TextureTranform = TextureMatrix;
     }
 
     namespace filters {
diff --git a/types/pixi.js/pixi.js-tests.ts b/types/pixi.js/pixi.js-tests.ts
index 53eaff46a3..48581e67fe 100644
--- a/types/pixi.js/pixi.js-tests.ts
+++ b/types/pixi.js/pixi.js-tests.ts
@@ -1235,6 +1235,67 @@ function demos() {
         }
     }
 
+    class TextureRotate {
+        private app: PIXI.Application;
+        private bol: boolean;
+        private texture: PIXI.Texture;
+        private secondTexture: PIXI.Texture;
+        private dude: PIXI.Sprite;
+
+        constructor() {
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
+
+            this.bol = false;
+
+            PIXI.loader.add("flowerTop", "required/assets/flowerTop.png");
+            PIXI.loader.load((loader: PIXI.loaders.Loader, resources: any) => {
+                this.texture = resources.flowerTop.texture;
+                this.init();
+            });
+        }
+
+        private init(): void {
+            const textures = [this.texture];
+            const D8 = PIXI.GroupD8;
+            for (let rotate = 1; rotate < 16; rotate++) {
+                const h = D8.isVertical(rotate) ? this.texture.frame.width : this.texture.frame.height;
+                const w = D8.isVertical(rotate) ? this.texture.frame.height : this.texture.frame.width;
+
+                const frame = this.texture.frame;
+                const crop = new PIXI.Rectangle(this.texture.frame.x, this.texture.frame.y, w, h);
+                const trim = crop;
+                let rotatedTexture: PIXI.Texture;
+                if (rotate % 2 === 0) {
+                    rotatedTexture = new PIXI.Texture(this.texture.baseTexture, frame, crop, trim, rotate);
+                } else {
+                    rotatedTexture = new PIXI.Texture(this.texture.baseTexture, frame, crop, trim, rotate - 1);
+                    rotatedTexture.rotate++;
+                }
+                textures.push(rotatedTexture);
+            }
+
+            const offsetX = this.app.renderer.width / 16 | 0;
+            const offsetY = this.app.renderer.height / 8 | 0;
+            const gridW = this.app.renderer.width / 4 | 0;
+            const gridH = this.app.renderer.height / 5 | 0;
+
+            for (let i = 0; i < 16; i++) {
+                const dude = new PIXI.Sprite(textures[i < 8 ? i * 2 : (i - 8) * 2 + 1]);
+                dude.scale.x = 0.5;
+                dude.scale.y = 0.5;
+                dude.x = offsetX + gridW * (i % 4);
+                dude.y = offsetY + gridH * (i / 4 | 0);
+                this.app.stage.addChild(dude);
+
+                const text = new PIXI.Text("rotate = " + dude.texture.rotate, { fontFamily: "Courier New", fontSize: "12px", fill: "white", align: "left" });
+                text.x = dude.x;
+                text.y = dude.y - 20;
+                this.app.stage.addChild(text);
+            }
+        }
+    }
+
     class TextureSwap {
         private app: PIXI.Application;
         private bol: boolean;
diff --git a/types/pixi.js/tslint.json b/types/pixi.js/tslint.json
index 8738927597..01be0cd9ee 100644
--- a/types/pixi.js/tslint.json
+++ b/types/pixi.js/tslint.json
@@ -11,10 +11,13 @@
         "no-inferrable-types": false,
         "no-mergeable-namespace": false,
         "no-single-declare-module": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
         "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,
         "one-line": false,
         "prefer-conditional-expression": false,
+        "prefer-readonly": false,
         "unified-signatures": false,
 
         "class-name": true,
diff --git a/types/pkg-dir/index.d.ts b/types/pkg-dir/index.d.ts
new file mode 100644
index 0000000000..7d8b714f0b
--- /dev/null
+++ b/types/pkg-dir/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for pkg-dir 2.0
+// Project: https://github.com/sindresorhus/pkg-dir#readme
+// Definitions by: NK-WEB-Git <https://github.com/NK-WEB-Git>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = pkgDir;
+
+declare function pkgDir(cwd?: string): Promise<string | null>;
+
+declare namespace pkgDir {
+    function sync(cwd?: string): string | null;
+}
diff --git a/types/pkg-dir/pkg-dir-tests.ts b/types/pkg-dir/pkg-dir-tests.ts
new file mode 100644
index 0000000000..487310a6a2
--- /dev/null
+++ b/types/pkg-dir/pkg-dir-tests.ts
@@ -0,0 +1,11 @@
+import pkgDir = require('pkg-dir');
+
+pkgDir('/Users/project/pkg-dir').then(rootDir => {
+    rootDir; // $ExpectType string | null
+});
+
+pkgDir().then(rootDir => {
+    rootDir;
+});
+
+pkgDir.sync('/Users/project/pkg-dir'); // $ExpectType string | null
diff --git a/types/pkg-dir/tsconfig.json b/types/pkg-dir/tsconfig.json
new file mode 100644
index 0000000000..2701860736
--- /dev/null
+++ b/types/pkg-dir/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pkg-dir-tests.ts"
+    ]
+}
diff --git a/types/pkg-dir/tslint.json b/types/pkg-dir/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pkg-dir/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pkijs/pkijs-tests.ts b/types/pkijs/pkijs-tests.ts
index 1ac9fce13c..6b7b73bb00 100644
--- a/types/pkijs/pkijs-tests.ts
+++ b/types/pkijs/pkijs-tests.ts
@@ -22,11 +22,12 @@ function formatPEM(pemString: string) {
     const stringLength = pemString.length;
     let resultString = "";
 
-    for (let i = 0, count = 0; i < stringLength; i++ , count++) {
+    for (let i = 0, count = 0; i < stringLength; i++) {
         if (count > 63) {
             resultString = `${resultString}\r\n`;
             count = 0;
         }
+        count++;
 
         resultString = resultString + pemString[i];
     }
diff --git a/types/pkijs/tslint.json b/types/pkijs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pkijs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/platform/tslint.json b/types/platform/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/platform/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/playcanvas/engine/anim/animation.d.ts b/types/playcanvas/engine/anim/animation.d.ts
new file mode 100644
index 0000000000..0c91abb7c4
--- /dev/null
+++ b/types/playcanvas/engine/anim/animation.d.ts
@@ -0,0 +1,52 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Node
+     * @class A animation node has a name and contains an array of keyframes.
+     * @description Create a new animation node
+     * @returns {pc.Node} A new pc.Node.
+     */
+    class Node {
+
+    }
+
+    /**
+     * @name pc.Animation
+     * @property {String} name Human-readable name of the animation
+     * @property {Number} duration Duration of the animation in seconds.
+     * @class An animation is a sequence of keyframe arrays which map to the nodes of a skeletal hierarchy.
+     * It controls how the nodes of the hierarchy are transformed over time.
+     * @returns {pc.Animation} A new pc.Animation object.
+     */
+    class Animation {
+        name: string;
+        duration: number;
+
+        /**
+         * @function
+         * @name pc.Animation#getNode
+         * @description Gets a {@link pc.Node} by name
+         * @param {String} name The name of the pc.Node
+         * @returns {pc.Node} The pc.Node with the specified name
+         * @author Will Eastcott
+         */
+        getNode(name: string): pc.Node;
+
+        /**
+         * @readonly
+         * @name pc.Animation#nodes
+         * @type pc.Node[]
+         * @description A read-only property to get array of animation nodes
+         */
+        readonly nodes: pc.Node[];
+
+        /**
+         * @function
+         * @name pc.Animation#addNode
+         * @description Adds a node to the internal nodes array.
+         * @param {pc.Node} node The node to add.
+         * @author Will Eastcott
+         */
+        addNode(node: pc.Node): void;
+    }
+}
diff --git a/types/playcanvas/engine/anim/skeleton.d.ts b/types/playcanvas/engine/anim/skeleton.d.ts
new file mode 100644
index 0000000000..a215c282bf
--- /dev/null
+++ b/types/playcanvas/engine/anim/skeleton.d.ts
@@ -0,0 +1,83 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Skeleton
+     * @property {Boolean} looping Determines whether skeleton is looping its animation.
+     * @class Represents a skeleton used to play animations.
+     * @param {pc.GraphNode} graph The root pc.GraphNode of the skeleton.
+     */
+    class Skeleton {
+        constructor(graph: pc.GraphNode)
+
+        /**
+         * @function
+         * @name pc.Skeleton#addTime
+         * @description Progresses the animation assigned to the specified skeleton by the
+         * supplied time delta. If the delta takes the animation passed its end point, if
+         * the skeleton is set to loop, the animation will continue from the beginning.
+         * Otherwise, the animation's current time will remain at its duration (i.e. the
+         * end).
+         * @param {Number} delta The time in seconds to progress the skeleton's animation.
+         * @author Will Eastcott
+         */
+        addTime(delta: number): void;
+
+        /**
+         * @function
+         * @name pc.Skeleton#blend
+         * @description Blends two skeletons together.
+         * @param {pc.Skeleton} skel1 Skeleton holding the first pose to be blended.
+         * @param {pc.Skeleton} skel2 Skeleton holding the second pose to be blended.
+         * @param {Number} alpha The value controlling the interpolation in relation to the two input
+         * skeletons. The value is in the range 0 to 1, 0 generating skel1, 1 generating skel2 and anything
+         * in between generating a spherical interpolation between the two.
+         * @author Will Eastcott
+         */
+        blend(skel1: pc.Skeleton, skel2: pc.Skeleton, alpha: number): void;
+
+        /**
+         * @name pc.Skeleton#animation
+         * @type pc.Animation
+         * @description Animation currently assigned to skeleton.
+         */
+        animation: pc.Animation;
+        
+        /**
+         * @name pc.Skeleton#currentTime
+         * @type Number
+         * @description Current time of currently active animation in seconds.
+         * This value is between zero and the duration of the animation.
+         */
+        currentTime: number;
+
+        /**
+         * @readonly
+         * @name pc.Skeleton#numNodes
+         * @type Number
+         * @description Read-only property that returns number of nodes of a skeleton.
+         */
+        readonly numNodes: number;
+
+        /**
+         * @function
+         * @name pc.Skeleton#setGraph
+         * @description Links a skeleton to a node hierarchy. The nodes animated skeleton are
+         * then subsequently used to drive the local transformation matrices of the node
+         * hierarchy.
+         * @param {pc.GraphNode} graph The root node of the graph that the skeleton is to drive.
+         * @author Will Eastcott
+         */
+        setGraph(graph: pc.GraphNode): void;
+
+        /**
+         * @function
+         * @name pc.Skeleton#updateGraph
+         * @description Synchronizes the currently linked node hierarchy with the current state of the
+         * skeleton. Internally, this function converts the interpolated keyframe at each node in the
+         * skeleton into the local transformation matrix at each corresponding node in the linked node
+         * hierarchy.
+         * @author Will Eastcott
+         */
+        updateGraph(): void;
+    }
+}
diff --git a/types/playcanvas/engine/asset/asset-registry.d.ts b/types/playcanvas/engine/asset/asset-registry.d.ts
new file mode 100644
index 0000000000..7e03744ef2
--- /dev/null
+++ b/types/playcanvas/engine/asset/asset-registry.d.ts
@@ -0,0 +1,167 @@
+declare namespace pc {
+
+    /**
+    * @name pc.AssetRegistry
+    * @class Container for all assets that are available to this application
+    * @description Create an instance of an AssetRegistry.
+    * Note: PlayCanvas scripts are provided with an AssetRegistry instance as 'app.assets'.
+    * @param {pc.ResourceLoader} loader The ResourceLoader used to load the asset files.
+    * @property {String} prefix A URL prefix that will be added to all asset loading requests.
+    */
+    class AssetRegistry {
+        constructor(loader: pc.ResourceLoader)
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#list
+        * @description Create a filtered list of assets from the registry
+        * @param {Object} filters Properties to filter on, currently supports: 'preload: true|false'
+        * @returns {pc.Asset[]} The filtered list of assets.
+        */
+        list(filters: {}): pc.Asset[];
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#add
+        * @description Add an asset to the registry
+        * @param {pc.Asset} asset The asset to add
+        * @example
+        * var asset = new pc.Asset("My Asset", "texture", {url: "../path/to/image.jpg"});
+        * app.assets.add(asset);
+        */
+        add(asset: pc.Asset): void;
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#remove
+        * @description Remove an asset from the registry
+        * @param {pc.Asset} asset The asset to remove
+        * @example
+        * var asset = app.assets.get(100);
+        * app.assets.remove(asset);
+        */
+        remove(asset: pc.Asset): void;
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#get
+        * @description Retrieve an asset from the registry by its id field
+        * @param {Number} id the id of the asset to get
+        * @returns {pc.Asset} The asset
+        * @example
+        * var asset = app.assets.get(100);
+        */
+        get(id: number): pc.Asset
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#getByUrl
+        * @description Retrieve an asset from the registry by it's file's URL field
+        * @param {String} url The url of the asset to get
+        * @returns {pc.Asset} The asset
+        * @example
+        * var asset = app.assets.getByUrl("../path/to/image.jpg");
+        */
+        getByUrl(url: string): pc.Asset
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#load
+        * @description Load the asset's file from a remote source. Listen for "load" events on the asset to find out when it is loaded
+        * @param {pc.Asset} asset The asset to load
+        * @example
+        * // load some assets
+        * var toload = [app.assets.find("My Asset"), app.assets.find("Another Asset")]
+        * var count = 0;
+        * for (var i = 0; i < toload.length; i++) {
+        *     var asset = toload[i];
+        *     asset.ready(function (asset) {
+        *         count++;
+        *         if (count === toload.length) {
+        *             // done
+        *         }
+        *     });
+        *     app.assets.load(asset)
+        * }
+        */
+        load(asset: pc.Asset): void;
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#loadFromUrl
+        * @description Use this to load and create an asset if you don't have assets created. Usually you would only use this
+        * if you are not integrated with the PlayCanvas Editor
+        * @param {String} url The url to load
+        * @param {String} type The type of asset to load
+        * @param {Function} callback Function called when asset is loaded, passed (err, asset), where err is null if no errors were encountered
+        * @example
+        * app.assets.loadFromUrl("../path/to/texture.jpg", "texture", function (err, asset) {
+        *     var texture = asset.resource;
+        * });
+        */
+        loadFromUrl(url: string, type: string, callback: (...args: any[]) => {}): void;
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#findAll
+        * @description Return all Assets with the specified name and type found in the registry
+        * @param {String} name The name of the Assets to find
+        * @param {String} [type] The type of the Assets to find
+        * @returns {pc.Asset[]} A list of all Assets found
+        * @example
+        * var assets = app.assets.findAll("myTextureAsset", "texture");
+        * console.log("Found " + assets.length + " assets called " + name);
+        */
+        findAll(name: string, type?: string): pc.Asset[];
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#findByTag
+        * @description Return all Assets that satisfy the search query.
+        * Query can be simply a string, or comma separated strings,
+        * to have inclusive results of assets that match at least one query.
+        * A query that consists of an array of tags can be used to match assets that have each tag of array
+        * @param {String} tag Name of a tag or array of tags
+        * @returns {pc.Asset[]} A list of all Assets matched query
+        * @example
+        * var assets = app.assets.findByTag("level-1");
+        * // returns all assets that tagged by `level-1`
+        * @example
+        * var assets = app.assets.findByTag("level-1", "level-2");
+        * // returns all assets that tagged by `level-1` OR `level-2`
+        * @example
+        * var assets = app.assets.findByTag([ "level-1", "monster" ]);
+        * // returns all assets that tagged by `level-1` AND `monster`
+        * @example
+        * var assets = app.assets.findByTag([ "level-1", "monster" ], [ "level-2", "monster" ]);
+        * // returns all assets that tagged by (`level-1` AND `monster`) OR (`level-2` AND `monster`)
+        */
+        findByTag(tag: string | string[]): pc.Asset[];
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#filter
+        * @description Return all Assets that satisfy filter callback
+        * @param {Function} callback The callback function that is used to filter assets, return `true` to include asset to result list
+        * @returns {pc.Asset[]} A list of all Assets found
+        * @example
+        * var assets = app.assets.filter(function(asset) {
+        *     return asset.name.indexOf('monster') !== -1;
+        * });
+        * console.log("Found " + assets.length + " assets, where names contains 'monster'");
+        */
+        filter(callback: (...args: any[]) => {}): pc.Asset[];
+
+        /**
+        * @function
+        * @name pc.AssetRegistry#find
+        * @description Return the first Asset with the specified name and type found in the registry
+        * @param {String} name The name of the Asset to find
+        * @param {String} [type] The type of the Asset to find
+        * @returns {pc.Asset} A single Asset or null if no Asset is found
+        * @example
+        * var asset = app.assets.find("myTextureAsset", "texture");
+        */
+        find(name: string, type?: string): pc.Asset;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/asset/asset.d.ts b/types/playcanvas/engine/asset/asset.d.ts
new file mode 100644
index 0000000000..3a5e514a6c
--- /dev/null
+++ b/types/playcanvas/engine/asset/asset.d.ts
@@ -0,0 +1,169 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Asset
+    * @class An asset record of a file or data resource that can be loaded by the engine.
+    * The asset contains three important fields:<br/>
+    * <strong>file</strong>: contains the details of a file (filename, url) which contains the resource data, e.g. an image file for a texture asset<br/>
+    * <strong>data</strong>: contains a JSON blob which contains either the resource data for the asset (e.g. material data) or additional data for the file (e.g. material mappings for a model)<br/>
+    * <strong>resource</strong>: contains the final resource when it is loaded. (e.g. a {@link pc.StandardMaterial} or a {@link pc.Texture})<br/>
+    *
+    * See the {@link pc.AssetRegistry} for details on loading resources from assets.
+    * @property {String} name The name of the asset
+    * @property {Number} id The asset id
+    * @property {String} type The type of the asset. One of ["animation", "audio", "binary", "cubemap", "css", "font", "json", "html", "material", "model", "script", "shader", "text", "texture"]
+    * @property {pc.Tags} tags Interface for tagging. Allows to find assets by tags using {@link pc.AssetRegistry#findByTag} method.
+    * @property {Object} file The file details or null if no file
+    * @property {String} [file.url] The URL of the resource file that contains the asset data
+    * @property {String} [file.filename] The filename of the resource file
+    * @property {Number} [file.size] The size of the resource file
+    * @property {String} [file.hash] The MD5 hash of the resource file data and the Asset data field
+    * @property {Object} data JSON data that contains either the complete resource data (e.g. in the case of a material) or additional data (e.g. in the case of a model it contains mappings from mesh to material)
+    * @property {Object} resource A reference to the resource when the asset is loaded. e.g. a {@link pc.Texture} or a {@link pc.Model}
+    * @property {Array} resources A reference to the resources of the asset when it's loaded. An asset can hold more runtime resources than one e.g. cubemaps
+    * @property {Boolean} preload If true the asset will be loaded during the preload phase of application set up.
+    * @property {Boolean} loaded True if the resource is loaded. e.g. if asset.resource is not null
+    * @property {pc.AssetRegistry} registry The asset registry that this Asset belongs to
+    * @description Create a new Asset record. Generally, Assets are created in the loading process and you won't need to create them by hand.
+    * @param {String} name A non-unique but human-readable name which can be later used to retrieve the asset.
+    * @param {String} type Type of asset. One of ["animation", "audio", "binary", "cubemap", "css", "font", "json", "html", "material", "model", "script", "shader", "text", "texture"]
+    * @param {Object} file Details about the file the asset is made from. At the least must contain the 'url' field. For assets that don't contain file data use null.
+    * @example
+    * var file = {
+    *   filename: "filename.txt",
+    *   url: "/example/filename.txt",
+    * }
+    * @param {Object} [data] JSON object with additional data about the asset (e.g. for texture and model assets) or contains the asset data itself (e.g. in the case of materials)
+    * @example
+    * var asset = new pc.Asset("a texture", "texture", {
+    *     url: "http://example.com/my/assets/here/texture.png"
+    * });
+    */
+    class Asset {
+        constructor(name: string, type: string, file: { url: string, filename?: string, size?: number, hash?: string } | null, data?: {})
+
+        name: string;
+        id: number;
+        type: string;
+        tags: pc.Tags;
+        file: { url: string, filename?: string, size?: number, hash?: string } | null;
+        data: {};
+        resource: pc.Texture | pc.Model | pc.Material;
+        resources: Array<pc.Texture | pc.Model | pc.Material>;
+        preload: boolean;
+        loaded: boolean;
+        registry: pc.AssetRegistry;
+
+        /**
+        * @name pc.Asset#getFileUrl
+        * @function
+        * @description Return the URL required to fetch the file for this asset.
+        * @returns {String} The URL
+        * @example
+        * var assets = app.assets.find("My Image", "texture");
+        * var img = "&lt;img src='" + assets[0].getFileUrl() + "'&gt;";
+        */
+        getFileUrl(): string;
+
+        /**
+        * @function
+        * @name pc.Asset#ready
+        * @description Take a callback which is called as soon as the asset is loaded. If the asset is already loaded the callback is called straight away
+        * @param {Function} callback The function called when the asset is ready. Passed the (asset) arguments
+        * @example
+        * var asset = app.assets.find("My Asset");
+        * asset.ready(function (asset) {
+        *   // asset loaded
+        * });
+        * app.assets.load(asset);
+        */
+        ready(callback: (...args: any[]) => {}, scope: any): void;
+
+        /**
+        * @function
+        * @name pc.Asset#unload
+        * @description Destroys the associated resource and marks asset as unloaded.
+        * @example
+        * var asset = app.assets.find("My Asset");
+        * asset.unload();
+        * // asset.resource is null
+        */
+        unload(): void;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.Asset#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Asset#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Asset#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.Asset#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.Asset#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/audio/channel.d.ts b/types/playcanvas/engine/audio/channel.d.ts
new file mode 100644
index 0000000000..a86163354f
--- /dev/null
+++ b/types/playcanvas/engine/audio/channel.d.ts
@@ -0,0 +1,114 @@
+declare namespace pc {
+
+    /**
+    * @private
+    * @name pc.Channel
+    * @class A channel is created when the pc.AudioManager begins playback of a pc.Sound. Usually created internally by
+    * pc.AudioManager#playSound or pc.AudioManager#playSound3d. Developers usually won't have to create Channels manually.
+    * @param {pc.AudioManager} manager The AudioManager instance
+    * @param {pc.Sound} sound The sound to playback
+    * @param {Object} options
+    * @param {Number} [options.volume=1] The playback volume, between 0 and 1.
+    * @param {Number} [options.pitch=1] The relative pitch, default of 1, plays at normal pitch.
+    * @param {Boolean} [options.loop=false] Whether the sound should loop when it reaches the end or not.
+    */
+    class Channel {
+        constructor(manager: pc.SoundManager, sound: pc.Sound, options?: { volume: number, pitch: number, loop: boolean })
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#play
+         * @description Begin playback of sound
+         */
+        private play(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#pause
+         * @description Pause playback of sound. Call unpause() to resume playback from the same position
+         */
+        private pause(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#unpause
+         * @description Resume playback of the sound. Playback resumes at the point that the audio was paused
+         */
+        unpause(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#stop
+         * @description Stop playback of sound. Calling play() again will restart playback from the beginning of the sound.
+         */
+        private stop(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#setLoop
+         * @description Enable/disable the loop property to make the sound restart from the beginning when it reaches the end.
+         */
+        private setLoop(loop: boolean): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#setVolume
+         * @description Set the volume of playback between 0 and 1.
+         */
+        private setVolume(volume: number): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#getVolume
+         * @description Get the current value for the volume. Between 0 and 1.
+         */
+        private getVolume(): number;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#getLoop
+         * @description Get the current looping state of the Channel
+         */
+        private getLoop(): boolean;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#getPitch
+         * @description Get the current pitch of the Channel
+         */
+        private getPitch(): number;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#onManagerVolumeChange
+         * @description Handle the manager's 'volumechange' event.
+         */
+        private onManagerVolumeChange(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#onManagerSuspend
+         * @description Handle the manager's 'suspend' event.
+         */
+        private onManagerSuspend(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Channel#onManagerResume
+         * @description Handle the manager's 'resume' event.
+         */
+        private onManagerResume(): void;
+    }
+}
diff --git a/types/playcanvas/engine/audio/channel3d.d.ts b/types/playcanvas/engine/audio/channel3d.d.ts
new file mode 100644
index 0000000000..6b0bbe3949
--- /dev/null
+++ b/types/playcanvas/engine/audio/channel3d.d.ts
@@ -0,0 +1,6 @@
+declare namespace pc {
+
+    class Channel3d {
+        constructor(manager: pc.SoundManager, sound: pc.Sound, options?: { volume: number, pitch: number, loop: boolean })
+    }    
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/core/color.d.ts b/types/playcanvas/engine/core/color.d.ts
new file mode 100644
index 0000000000..f0eedf0e09
--- /dev/null
+++ b/types/playcanvas/engine/core/color.d.ts
@@ -0,0 +1,84 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Color
+    * @class Representation of an RGBA color
+    * @description Create a new Color object
+    * @param {Number} [r] The value of the red component (0-1). If r is an array of length 3 or 4, the array will be used to populate all components.
+    * @param {Number} [g] The value of the green component (0-1)
+    * @param {Number} [b] The value of the blue component (0-1)
+    * @param {Number} [a] The value of the alpha component (0-1)
+    * @property {Number} r The red component of the color
+    * @property {Number} g The green component of the color
+    * @property {Number} b The blue component of the color
+    * @property {Number} a The alpha component of the color
+    */
+    class Color {
+        constructor(r?: number[] | number, g?: number, b?: number, a?: number)
+
+        r: number;
+        g: number;
+        b: number;
+        a: number;
+
+        /**
+        * @function
+        * @name pc.Color#clone
+        * @description Returns a clone of the specified color.
+        * @returns {pc.Color} A duplicate color object
+        */
+        clone(): pc.Color;
+
+        /**
+         * @function
+         * @name pc.Color#copy
+         * @description Copies the contents of a source color to a destination color.
+         * @param {pc.Color} rhs A color to copy to the specified color.
+         * @returns {pc.Color} Self for chaining
+         * @example
+         * var src = new pc.Color(1, 0, 0, 1);
+         * var dst = new pc.Color();
+         *
+         * dst.copy(src);
+         *
+         * console.log("The two colors are " + (dst.equals(src) ? "equal" : "different"));
+         */
+        copy(rhs: pc.Color): this;
+
+        /**
+         * @function
+         * @name pc.Color#set
+         * @description Assign values to the color components, including alpha
+         * @param {Number} r The value for red (0-1)
+         * @param {Number} g The value for blue (0-1)
+         * @param {Number} b The value for green (0-1)
+         * @param {Number} [a] The value for the alpha (0-1), defaults to 1
+         * @returns {pc.Color} Self for chaining
+         */
+        set(r: number, g: number, b: number, a?: number): this;
+
+        /**
+         * @function
+         * @name pc.Color#fromString
+         * @description Set the values of the color from a string representation '#11223344' or '#112233'.
+         * @param {String} hex A string representation in the format '#RRGGBBAA' or '#RRGGBB'. Where RR, GG, BB, AA are red, green, blue and alpha values.
+         * This is the same format used in HTML/CSS.
+         * @returns {pc.Color} Self for chaining
+         */
+        fromString(hex: string): this;
+
+        /**
+         * @function
+         * @name pc.Color#toString
+         * @description Converts the color to string form. The format is '#RRGGBBAA', where
+         * RR, GG, BB, AA are the red, green, blue and alpha values. When the alpha value is not
+         * included (the default), this is the same format as used in HTML/CSS.
+         * @returns {String} The color in string form.
+         * @example
+         * var c = new pc.Color(1, 1, 1);
+         * // Should output '#ffffffff'
+         * console.log(c.toString());
+         */
+        toString(alpha: number): string;
+    }
+}
diff --git a/types/playcanvas/engine/core/core.d.ts b/types/playcanvas/engine/core/core.d.ts
new file mode 100644
index 0000000000..5bb5a7da50
--- /dev/null
+++ b/types/playcanvas/engine/core/core.d.ts
@@ -0,0 +1,90 @@
+/**
+ * @name pc
+ * @namespace
+ * @description Root namespace for the PlayCanvas Engine
+ * @preserve PlayCanvas Engine v__CURRENT_SDK_VERSION__ revision __REVISION__
+ * http://playcanvas.com
+ * Copyright 2011-2017 PlayCanvas Ltd. All rights reserved.
+// #ifdef DEBUG
+ * DEBUG BUILD
+// #endif
+// #ifdef PROFILER
+ * PROFILER BUILD
+// #endif
+ */
+declare namespace pc {
+    const version: string;
+    const revision: string;
+    var config: {};
+    var common: {};
+    var apps: {};
+    var data: {};
+
+    /**
+     * @private
+     * @function
+     * @name pc.unpack()
+     * @description Copy a set of common PlayCanvas functions/classes/namespaces into the global namespace
+     */
+    function unpack(): void;
+
+    /**
+     * @function
+     * @private
+     * @name pc.makeArray
+     * @description Convert an array-like object into a normal array.
+     * For example, this is useful for converting the arguments object into an array.
+     * @param {Object} arr The array to convert
+     * @return {Array} An array
+     */
+    function makeArray<T>(arr: ArrayLike<T>): T[];
+
+    /**
+     * @private
+     * @function
+     * @name pc.type
+     * @description Extended typeof() function, returns the type of the object.
+     * @param {Object} obj The object to get the type of
+     * @return {String} The type string: "null", "undefined", "number", "string", "boolean", "array", "object", "function", "date", "regexp" or "float32array"
+     */
+    function type(obj: any): string;
+
+    /**
+     * @private
+     * @function
+     * @name pc.extend
+     * @description Merge the contents of two objects into a single object
+     * @param {Object} target The target object of the merge
+     * @param {Object} ex The object that is merged with target
+     * @return {Object} The target object
+     * @example
+     * var A = {a: function() {console.log(this.a}};
+     * var B = {b: function() {console.log(this.b}};
+     *
+     * pc.extend(A,B);
+     * A.a();
+     * // logs "a"
+     * A.b();
+     * // logs "b"
+     */
+    function extend<T, U>(target: T, ex: U): T & U;
+
+    /**
+     * @private
+     * @function
+     * @name pc.isDefined
+     * @description Return true if the Object is not undefined
+     * @param {Object} o The Object to test
+     * @returns {Boolean} True if the Object is not undefined
+     */
+    function isDefined(o: any): boolean;
+
+    /**
+     * @private
+     * @name pc._typeLookup
+     * @function
+     * @description Create look up table for types
+     */
+    function _typeLookup(): { [key: string]: any };
+
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/core/debug.d.ts b/types/playcanvas/engine/core/debug.d.ts
new file mode 100644
index 0000000000..f8f9e6de61
--- /dev/null
+++ b/types/playcanvas/engine/core/debug.d.ts
@@ -0,0 +1,18 @@
+declare namespace pc {
+    
+    /**
+    * @name pc.debug
+    * @private
+    * @namespace
+    */
+    namespace debug {
+
+        /**
+        * @name pc.debug.display
+        * @private
+        * @description Display an object and it's data in a table on the page
+        * @param {Object} data
+        */
+        function display(data: {}): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/core/events.d.ts b/types/playcanvas/engine/core/events.d.ts
new file mode 100644
index 0000000000..21fc207840
--- /dev/null
+++ b/types/playcanvas/engine/core/events.d.ts
@@ -0,0 +1,106 @@
+declare namespace pc {
+    /**
+     * @name pc.events
+     * @namespace
+     * @description global namespace that allows to extend other objects with events
+     * Additionally it can handle global events it self.
+     * @example
+     * var obj = { };
+     * pc.events.attach(obj);
+     *
+     * // subscribe to an event
+     * obj.on('hello', function(str) {
+     *     console.log('event hello is fired', str);
+     * });
+     *
+     * // fire event
+     * obj.fire('hello', 'world');
+     */
+    namespace events {
+
+        /**
+        * @function
+        * @name pc.events.attach
+        * @description Attach event methods 'on', 'off', 'fire' and 'hasEvent' to the target object
+        * @param {Object} target The object to add events to.
+        * @return {Object} The target object
+        * @example
+        * var obj = { };
+        * pc.events.attach(obj);
+        */
+        function attach<T>(target: T): T;
+
+        /**
+         * @function
+         * @name pc.events.on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        function on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.events.off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        function off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.events.fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        function fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.events.once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        function once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.events.hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        function hasEvent(name: string): boolean;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/core/guid.d.ts b/types/playcanvas/engine/core/guid.d.ts
new file mode 100644
index 0000000000..9a52358268
--- /dev/null
+++ b/types/playcanvas/engine/core/guid.d.ts
@@ -0,0 +1,19 @@
+declare namespace pc {
+
+    /**
+     * @name pc.guid
+     * @namespace
+     * @description Basically a very large random number (128-bit) which means the probability of creating two that clash is vanishingly small.
+     * GUIDs are used as the unique identifiers for Entities.
+     */
+    namespace guid {
+
+        /**
+         * @function
+         * @name pc.guid.create
+         * @description Create an RFC4122 version 4 compliant GUID
+         * @return {String} A new GUID
+         */
+        function create(): string;
+    }
+}
diff --git a/types/playcanvas/engine/core/inheritance.d.ts b/types/playcanvas/engine/core/inheritance.d.ts
new file mode 100644
index 0000000000..b63edca85c
--- /dev/null
+++ b/types/playcanvas/engine/core/inheritance.d.ts
@@ -0,0 +1,30 @@
+declare namespace pc {
+
+    /**
+     * @private
+     * @function
+     * @name pc.inherits
+     * @description Implementation of inheritance for JavaScript objects
+     * e.g. Class can access all of Base's function prototypes
+     * The super classes prototype is available on the derived class as _super
+     * @param {Function} Self Constructor of derived class
+     * @param {Function} Super Constructor of base class
+     * @returns {Function} New instance of Self which inherits from Super
+     * @example
+     * Base = function () {};
+     * Base.prototype.fn = function () {
+     *   console.log('base');
+     * };
+     * Class = function () {}
+     * Class = pc.inherits(Class, Base);
+     * Class.prototype.fn = function () {
+     *   // Call overridden method
+     *   Class._super.fn();
+     *   console.log('class');
+     * };
+     *
+     * var c = new Class();
+     * c.fn(); // prints 'base' then 'class'
+     */
+    function inherits<T extends Function, U extends Function>(Self: T, Super: U): T & U;
+}
diff --git a/types/playcanvas/engine/core/log.d.ts b/types/playcanvas/engine/core/log.d.ts
new file mode 100644
index 0000000000..75b23a8253
--- /dev/null
+++ b/types/playcanvas/engine/core/log.d.ts
@@ -0,0 +1,78 @@
+declare namespace pc {
+
+    namespace log {
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.write
+         * @description Write text to the console
+         * @param {String} text
+         */
+        function write (text: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.open
+         * @description Starting logging to the console
+         * @param {String} text
+         */
+        function open(text: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.info
+         * @description Write text to the log preceded by 'INFO:'
+         * @param {String} text
+         */
+        function info(text: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.debug
+         * @description Write text to the log preceded by 'DEBUG:'
+         * @param {String} text
+         */
+        function debug(text: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.error
+         * @description Write text to the log preceded by 'ERROR:'
+         * @param {String} text
+         */
+        function error(text: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.warning
+         * @description Write text to the log preceded by 'WARNING:'
+         * @param {String} text
+         */
+        function warning(text: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.alert
+         * @description Write text to the log preceded by 'ALERT:' and pop up an alert dialog box with the text
+         * @param {String} text
+         */
+        function alert(text: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.log.assert
+         * @description If condition is false, then write text to the log preceded by 'ASSERT:' and pop up a dialog box.
+         * @param {Boolean} condition
+         * @param {String} text
+         */
+        function assert(condition: boolean, text: string): void;
+    }
+}
diff --git a/types/playcanvas/engine/core/path.d.ts b/types/playcanvas/engine/core/path.d.ts
new file mode 100644
index 0000000000..d6fa94abad
--- /dev/null
+++ b/types/playcanvas/engine/core/path.d.ts
@@ -0,0 +1,65 @@
+declare namespace pc {
+
+    /**
+     * @namespace pc.path
+     * @description File path API
+     */
+    namespace path {
+
+        /**
+         * The character that separates path segments
+         * @name pc.path.delimiter
+         */
+        const delimiter = "/",
+        /**
+         * Join two sections of file path together, insert a delimiter if needed.
+         * @param {String} one First part of path to join
+         * @param {String} two Second part of path to join
+         * @function
+         * @name pc.path.join
+         */
+        /*
+        join: function(one, two) {
+            if(two[0] === pc.path.delimiter) {
+                return two;
+            }
+
+            if(one && two && one[one.length - 1] !== pc.path.delimiter && two[0] !== pc.path.delimiter) {
+                return one + pc.path.delimiter + two;
+            }
+            else {
+                return one + two;
+            }
+        },
+        */
+        function join(one: string, two: string): string;
+
+        /**
+        * @function
+        * @name pc.path.split
+        * @description Split the pathname path into a pair [head, tail] where tail is the final part of the path
+        * after the last delimiter and head is everything leading up to that. tail will never contain a slash
+        */
+        function split(path: string): [string, string];
+
+        /**
+        * @function
+        * @name pc.path.getBasename
+        * @description Return the basename of the path. That is the second element of the pair returned by
+        * passing path into {@link pc.path.split}.
+        * @example
+        * pc.path.getBasename("/path/to/file.txt"); // returns "path.txt"
+        * pc.path.getBasename("/path/to/dir"); // returns "dir"
+        * @returns {String} The basename
+        */
+        function getBasename(path: string): string;
+
+        /**
+         * Get the directory name from the path. This is everything up to the final instance of pc.path.delimiter
+         * @param {String} path The path to get the directory from
+         * @function
+         * @name pc.path.getDirectory
+         */
+        function getDirectory(path: string): string;
+    }
+}
diff --git a/types/playcanvas/engine/core/platform.d.ts b/types/playcanvas/engine/core/platform.d.ts
new file mode 100644
index 0000000000..15d1995415
--- /dev/null
+++ b/types/playcanvas/engine/core/platform.d.ts
@@ -0,0 +1,69 @@
+import { platform } from "os";
+
+declare namespace pc {
+
+    /**
+     * @name pc.platform
+     * @namespace
+     * @description global namespace that stores flags regarding platform environment and features support
+     * @example
+     * if (pc.platform.touch) {
+     *     // touch is supported
+     * }
+     */
+    namespace platform {
+        /**
+         * @name pc.platform.desktop
+         * @description is it a desktop or laptop device
+         */
+        const desktop: boolean;
+
+        /**
+         * @name pc.platform.mobile
+         * @description is it a mobile or tablet device
+         */
+        const mobile: boolean;
+
+        /**
+         * @name pc.platform.ios
+         * @description if it is iOS
+         */
+        const ios: boolean;
+
+        /**
+         * @name pc.platform.android
+         * @description if it is Android
+         */
+        const android: boolean;
+
+        /**
+         * @name pc.platform.windows
+         * @description if it is Windows
+         */
+        const windows: boolean;
+
+        /**
+         * @name pc.platform.cocoonjs
+         * @description if it is CocoonJS
+         */
+        const cocoonjs: boolean;
+
+        /**
+         * @name pc.platform.xbox
+         * @description if it is Xbox
+         */
+        const xbox: boolean;
+
+        /**
+         * @name pc.platform.gamepads
+         * @description if platform supports gamepads
+         */
+        const gamepads: boolean;
+
+        /**
+         * @name pc.platform.touch
+         * @description if platform supports touch input
+         */
+        const touch: boolean;
+    }
+}
diff --git a/types/playcanvas/engine/core/string.d.ts b/types/playcanvas/engine/core/string.d.ts
new file mode 100644
index 0000000000..245e712264
--- /dev/null
+++ b/types/playcanvas/engine/core/string.d.ts
@@ -0,0 +1,56 @@
+declare namespace pc {
+
+    /**
+     * @namespace
+     * @name pc.string
+     * @description Extended String API
+     */
+    namespace string {
+
+        /**
+         * @name pc.string.ASCII_LOWERCASE
+         * @description All lowercase letters
+         * @type String
+         */
+        const ASCII_LOWERCASE = "abcdefghijklmnopqrstuvwxyz";
+
+        /**
+         * @name pc.string.ASCII_UPPERCASE
+         * @description All uppercase letters
+         * @type String
+         */
+        const ASCII_UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+        /**
+         * @name pc.string.ASCII_LETTERS
+         * @description All ASCII letters
+         * @type String
+         */
+        const ASCII_LETTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+        /**
+         * @function
+         * @name pc.string.format
+         * @description Return a string with {n} replaced with the n-th argument
+         * @param {String} s The string to format
+         * @param {Object} [arguments] All other arguments are substituted into the string
+         * @returns {String} The formatted string
+         * @example
+         * var s = pc.string.format("Hello {0}", "world");
+         * console.log(s); // Prints "Hello world"
+         */
+        function format(s: string, arguments?: any): string;
+
+        /**
+        * @function
+        * @name pc.string.toBool
+        * @description Convert a string value to a boolean. In non-strict mode (the default), 'true' is converted to true, all other values
+        * are converted to false. In strict mode, 'true' is converted to true, 'false' is converted to false, all other values will throw
+        * an Exception.
+        * @param {String} s The string to convert
+        * @param {Boolean} [strict] In strict mode an Exception is thrown if s is not an accepted string value. Defaults to false
+        * @returns {Boolean} The converted value
+        */
+        function toBool(s: string, strict?: boolean): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/core/tags.d.ts b/types/playcanvas/engine/core/tags.d.ts
new file mode 100644
index 0000000000..ddb0a1b905
--- /dev/null
+++ b/types/playcanvas/engine/core/tags.d.ts
@@ -0,0 +1,170 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Tags
+    * @class Set of tag names
+    * @description Create an instance of a Tags.
+    * @param {Object} [parent] Parent object who tags belong to.
+    * Note: Tags are used as addition of `pc.Entity` and `pc.Asset` as `tags` field.
+    */
+    class Tags {
+        constructor(parent: pc.Entity | pc.Asset)
+
+        /**
+        * @function
+        * @name pc.Tags#add
+        * @description Add a tag, duplicates are ignored. Can be array or comma separated arguments for multiple tags.
+        * @param {String} name Name of a tag, or array of tags
+        * @returns {Boolean} true if any tag were added
+        * @example
+        * tags.add('level-1');
+        * @example
+        * tags.add('ui', 'settings');
+        * @example
+        * tags.add([ 'level-2', 'mob' ]);
+        */
+        add(): boolean;
+
+
+        /**
+        * @function
+        * @name pc.Tags#remove
+        * @description Remove tag.
+        * @param {String} name Name of a tag or array of tags
+        * @returns {Boolean} true if any tag were removed
+        * @example
+        * tags.remove('level-1');
+        * @example
+        * tags.remove('ui', 'settings');
+        * @example
+        * tags.remove([ 'level-2', 'mob' ]);
+        */
+        remove(): boolean;
+
+
+        /**
+        * @function
+        * @name pc.Tags#clear
+        * @description Remove all tags.
+        * @example
+        * tags.clear();
+        */
+        clear(): void;
+
+
+        /**
+        * @function
+        * @name pc.Tags#has
+        * @description Check if tags satisfy filters.
+        * Filters can be provided by simple name of tag, as well as by array of tags.
+        * When an array is provided it will check if tags contain each tag within the array.
+        * If any of comma separated argument is satisfied, then it will return true.
+        * Any number of combinations are valid, and order is irrelevant.
+        * @param {String} name of tag, or array of names
+        * @returns {Boolean} true if filters are satisfied
+        * @example
+        * tags.has('player'); // player
+        * @example
+        * tags.has('mob', 'player'); // player OR mob
+        * @example
+        * tags.has([ 'level-1', 'mob' ]); // monster AND level-1
+        * @example
+        * tags.has([ 'ui', 'settings' ], [ 'ui', 'levels' ]); // (ui AND settings) OR (ui AND levels)
+        */
+        has(): boolean;
+
+
+        /**
+        * @function
+        * @name pc.Tags#list
+        * @description Returns immutable array of tags
+        * @returns {String[]} copy of tags array
+        */
+        list(): string[];
+
+        /**
+         * @field
+         * @readonly
+         * @type Number
+         * @name pc.Tags#size
+         * @description Number of tags in set
+         */
+        readonly size: number;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.Tags#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Tags#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Tags#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.Tags#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.Tags#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/core/time.d.ts b/types/playcanvas/engine/core/time.d.ts
new file mode 100644
index 0000000000..a23b617026
--- /dev/null
+++ b/types/playcanvas/engine/core/time.d.ts
@@ -0,0 +1,43 @@
+declare namespace pc {
+
+    /**
+     * @private
+     * @name pc.Timer
+     * @description Create a new Timer instance
+     * @class A Timer counts milliseconds from when start() is called until when stop() is called.
+     */
+    class Timer {
+        /**
+         * @private
+         * @function
+         * @name pc.Timer#start
+         * @description Start the timer
+         */
+        start(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Timer#stop
+         * @description Stop the timer
+         */
+        stop(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Timer#getMilliseconds
+         * @description Get the number of milliseconds that passed between start() and stop() being called
+         */
+        getMilliseconds(): number;
+    }
+
+    /**
+     * @private
+     * @function
+     * @name pc.now
+     * @description Get current time in milliseconds. Use it to measure time difference. Reference time may differ on different platforms.
+     * @return {Number} The time in milliseconds
+     */
+    function now(): number;
+}
diff --git a/types/playcanvas/engine/core/uri.d.ts b/types/playcanvas/engine/core/uri.d.ts
new file mode 100644
index 0000000000..8b42cfcf1d
--- /dev/null
+++ b/types/playcanvas/engine/core/uri.d.ts
@@ -0,0 +1,104 @@
+declare namespace pc {
+
+    /**
+     * @private
+     * @function
+     * @name pc.createURI
+     * @description Create a URI object from constituent parts
+     * @param {Object} options Parts of the URI to build
+     * @param {String} [options.scheme] The URI scheme (e.g. http)
+     * @param {String} [options.authority] The URI authority (e.g. www.example.com)
+     * @param {String} [options.host] Combination of scheme and authority (e.g. http://www.example.com)
+     * @param {String} [options.path] The URI path (e.g. /users/example)
+     * @param {String} [options.hostpath] Combination of scheme, authority and path (e.g. http://www.example.com/users/example)
+     * @param {String} [options.query] The query section, after the ?(e.g. http://example.com?<b>key=value&another=123</b>)
+     * @param {String} [options.fragment] The fragment section, after the # (e.g. http://example.com#<b>fragment/data</b>)
+     * @returns {String} A URI string
+     */
+    function createURI(options: {
+        scheme?: string,
+        authority?: string,
+        host?: string,
+        path?: string,
+        hostpath?: string,
+        query?: string,
+        fragment?: string
+    }): string;
+
+    /**
+     * @private
+     * @name pc.URI
+     * @description Create a new URI object
+     * @class A URI object
+     * @param {String} uri URI string
+     */
+    class URI {
+        constructor(uri: string)
+
+        /**
+         * @name pc.URI#scheme
+         * @description The scheme. (e.g. http)
+         */
+        scheme: string;
+
+        /**
+         * @name pc.URI#authority
+         * @description The authority. (e.g. www.example.com)
+         */
+        authority: string;
+
+        /**
+         * @name pc.URI#path
+         * @description The path. (e.g. /users/example)
+         */
+        path: string;
+
+        /**
+         * @name pc.URI#query
+         * @description The query, the section after a ?. (e.g. search=value)
+         */
+        query: string;
+
+        /**
+         * @name pc.URI#fragment
+         * @description The fragment, the section after a #
+         */
+        fragment: string;
+
+        /**
+         * @function
+         * @name pc.URI#toString
+         * @description Convert URI back to string
+         */
+        toString(): string;
+
+        /**
+         * @function
+         * @name pc.URI#getQuery
+         * @description Returns the query parameters as an Object
+         * @example
+         * <code><pre lang="javascript">
+         * var s = "http://example.com?a=1&b=2&c=3
+         * var uri = new pc.URI(s);
+         * var q = uri.getQuery();
+         * console.log(q.a); // logs "1"
+         * console.log(q.b); // logs "2"
+         * console.log(q.c); // logs "3"
+         * </code></pre>
+         */
+        getQuery(): { [prop: string]: string };
+
+        /**
+         * @function
+         * @name pc.URI#setQuery
+         * @description Set the query section of the URI from a Object
+         * @param {Object} params Key-Value pairs to encode into the query string
+         * @example
+         * var s = "http://example.com";
+         * var uri = new pc.URI(s);
+         * uri.setQuery({"a":1,"b":2});
+         * console.log(uri.toString()); // logs "http://example.com?a=1&b=2
+         */
+        setQuery(params: { [prop: string]: string | number }): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/application.d.ts b/types/playcanvas/engine/framework/application.d.ts
new file mode 100644
index 0000000000..ae52a6cea3
--- /dev/null
+++ b/types/playcanvas/engine/framework/application.d.ts
@@ -0,0 +1,541 @@
+declare namespace pc {
+    interface ApplicationOptions {
+        keyboard?: pc.Keyboard;
+        mouse?: pc.Mouse;
+        touch?: pc.TouchDevice;
+        gamepads?: pc.GamePads;
+        scriptPrefix?: string;
+        assetPrefix?: string;
+        graphicsDeviceOptions?: {};
+    }
+
+    /**
+    * @name pc.Application
+    * @class Default application which performs general setup code and initiates the main game loop.
+    * @description Create a new Application.
+    * @param {Element} canvas The canvas element
+    * @param {Object} options
+    * @param {pc.Keyboard} [options.keyboard] Keyboard handler for input
+    * @param {pc.Mouse} [options.mouse] Mouse handler for input
+    * @param {pc.TouchDevice} [options.touch] TouchDevice handler for input
+    * @param {pc.GamePads} [options.gamepads] Gamepad handler for input
+    * @param {String} [options.scriptPrefix] Prefix to apply to script urls before loading
+    * @param {String} [options.assetPrefix] Prefix to apply to asset urls before loading
+    * @param {Object} [options.graphicsDeviceOptions] Options object that is passed into the {@link pc.GraphicsDevice} constructor
+    *
+    * @example
+    * // Create application
+    * var app = new pc.Application(canvas, options);
+    * // Start game loop
+    * app.start()
+    */
+    class Application {
+        constructor(canvas: HTMLCanvasElement, options?: pc.ApplicationOptions)
+
+        // PROPERTIES
+
+        /**
+        * @name pc.Application#scene
+        * @type {pc.Scene}
+        * @description The current {@link pc.Scene}
+        */
+        scene: pc.Scene;
+
+        /**
+        * @name pc.Application#timeScale
+        * @type {Number}
+        * @description Scales the global time delta.
+        */
+        timeScale: number;
+
+        /**
+        * @name pc.Application#assets
+        * @type {pc.AssetRegistry}
+        * @description The assets available to the application.
+        */
+        assets: pc.AssetRegistry;
+
+        /**
+        * @name pc.Application#graphicsDevice
+        * @type {pc.GraphicsDevice}
+        * @description The graphics device used by the application.
+        */
+        graphicsDevice: pc.GraphicsDevice;
+
+        /**
+        * @name pc.Application#systems
+        * @type {pc.ComponentSystemRegistry}
+        * @description The component systems.
+        */
+        systems: pc.ComponentSystemRegistry;
+
+        /**
+        * @name pc.Application#loader
+        * @type {pc.ResourceLoader}
+        * @description The resource loader.
+        */
+        loader: pc.ResourceLoader;
+
+        /**
+        * @name pc.Application#root
+        * @type {pc.Entity}
+        * @description The root {@link pc.Entity} of the application.
+        */
+        root: pc.Entity;
+
+        /**
+        * @name pc.Application#keyboard
+        * @type {pc.Keyboard}
+        * @description The keyboard device.
+        */
+        keyboard: pc.Keyboard;
+
+        /**
+        * @name pc.Application#mouse
+        * @type {pc.Mouse}
+        * @description The mouse device.
+        */
+        mouse: pc.Mouse;
+
+        /**
+        * @name pc.Application#touch
+        * @type {pc.TouchDevice}
+        * @description Used to get touch events input.
+        */
+        touch: pc.TouchDevice;
+
+        /**
+        * @name pc.Application#gamepads
+        * @type {pc.GamePads}
+        * @description Used to access GamePad input.
+        */
+        gamepads: pc.GamePads;
+
+        /**
+        * @name pc.Application#elementInput
+        * @type {pc.ElementInput}
+        * @description Used to handle input for {@link pc.ElementComponent}s.
+        */
+        elementInput: pc.ElementInput;
+
+        /**
+        * @name pc.Application#scripts
+        * @type pc.ScriptRegistry
+        * @description The Script Registry of the Application
+        */
+        scripts: pc.ScriptRegistry;
+
+        /**
+        * @name pc.Application#batcher
+        * @type pc.BatchManager
+        * @description The Batch Manager of the Application
+        */
+        batcher: pc.BatchManager;
+
+        /**
+        * @name pc.Application#autoRender
+        * @type Boolean
+        * @description When true (the default) the application's render function is called every frame.
+        */
+        autoRender: boolean;
+
+        /**
+        * @name pc.Application#renderNextFrame
+        * @type Boolean
+        * @description If {@link pc.Application#autoRender} is false, set `app.renderNextFrame` true to force application to render the scene once next frame.
+        * @example
+        * // render the scene only while space key is pressed
+        * if (this.app.keyboard.isPressed(pc.KEY_SPACE)) {
+        *    this.app.renderNextFrame = true;
+        * }
+        */
+        renderNextFrame: boolean;
+
+        /**
+        * @function
+        * @name pc.Application#configure
+        * @description Load the application configuration file and apply application properties and fill the asset registry
+        * @param {String} url The URL of the configuration file to load
+        * @param {Function} callback The Function called when the configuration file is loaded and parsed
+        */
+        configure(url: string, callback: (...args: any[]) => {}): void;
+
+        /**
+        * @function
+        * @name pc.Application#preload
+        * @description Load all assets in the asset registry that are marked as 'preload'
+        * @param {Function} callback Function called when all assets are loaded
+        */
+        preload(callback: (...args: any[]) => {}): void;
+
+        /**
+        * @function
+        * @name pc.Application#loadSceneHierarchy
+        * @description Load a scene file, create and initialize the Entity hierarchy
+        * and add the hierarchy to the application root Entity.
+        * @param {String} url The URL of the scene file. Usually this will be "scene_id.json"
+        * @param {Function} callback The function to call after loading, passed (err, entity) where err is null if no errors occurred.
+        * @example
+        *
+        * app.loadSceneHierarchy("1000.json", function (err, entity) {
+        *     if (!err) {
+        *       var e = app.root.find("My New Entity");
+        *     } else {
+        *       // error
+        *     }
+        *   }
+        * });
+        */
+        loadSceneHierarchy(url: string, callback: (...args: any[]) => {}): void;
+
+        /**
+        * @function
+        * @name pc.Application#loadSceneSettings
+        * @description Load a scene file and apply the scene settings to the current scene
+        * @param {String} url The URL of the scene file. Usually this will be "scene_id.json"
+        * @param {Function} callback The function called after the settings are applied. Passed (err) where err is null if no error occurred.
+        * @example
+        * app.loadSceneSettings("1000.json", function (err) {
+        *     if (!err) {
+        *       // success
+        *     } else {
+        *       // error
+        *     }
+        *   }
+        * });
+        */
+        loadSceneSettings(url: string, callback: (...args: any[]) => {}): void;
+
+        /**
+         * @function
+         * @name pc.Application#start
+         * @description Start the Application updating
+         */
+        start(): void;
+
+        /**
+         * @function
+         * @name pc.Application#update
+         * @description Application specific update method. Override this if you have a custom Application
+         * @param {Number} dt The time delta since the last frame.
+         */
+        update(dt: number): void;
+
+        /**
+         * @function
+         * @name pc.Application#render
+         * @description Application specific render method. Override this if you have a custom Application
+         */
+        render(): void;
+
+        /**
+        * @function
+        * @name pc.Application#setCanvasFillMode
+        * @description Controls how the canvas fills the window and resizes when the window changes.
+        * @param {String} mode The mode to use when setting the size of the canvas. Can be:
+        * <ul>
+        *     <li>pc.FILLMODE_NONE: the canvas will always match the size provided.</li>
+        *     <li>pc.FILLMODE_FILL_WINDOW: the canvas will simply fill the window, changing aspect ratio.</li>
+        *     <li>pc.FILLMODE_KEEP_ASPECT: the canvas will grow to fill the window as best it can while maintaining the aspect ratio.</li>
+        * </ul>
+        * @param {Number} [width] The width of the canvas (only used when mode is pc.FILLMODE_NONE).
+        * @param {Number} [height] The height of the canvas (only used when mode is pc.FILLMODE_NONE).
+        */
+        setCanvasFillMode(mode: string, width?: number, height?: number): void;
+
+        /**
+        * @function
+        * @name pc.Application#setCanvasResolution
+        * @description Change the resolution of the canvas, and set the way it behaves when the window is resized
+        * @param {string} mode The mode to use when setting the resolution. Can be:
+        * <ul>
+        *     <li>pc.RESOLUTION_AUTO: if width and height are not provided, canvas will be resized to match canvas client size.</li>
+        *     <li>pc.RESOLUTION_FIXED: resolution of canvas will be fixed.</li>
+        * </ul>
+        * @param {Number} [width] The horizontal resolution, optional in AUTO mode, if not provided canvas clientWidth is used
+        * @param {Number} [height] The vertical resolution, optional in AUTO mode, if not provided canvas clientHeight is used
+        */
+        setCanvasResolution(mode: string, width?: number, height?: number): void;
+
+        /**
+        * @function
+        * @name pc.Application#isFullscreen
+        * @description Returns true if the application is currently running fullscreen
+        * @returns {Boolean} True if the application is running fullscreen
+        */
+        isFullscreen(): boolean;
+
+        /**
+        * @function
+        * @name pc.Application#enableFullscreen
+        * @description Request that the browser enters fullscreen mode. This is not available on all browsers.
+        * Note: Switching to fullscreen can only be initiated by a user action, e.g. in the event hander for a mouse or keyboard input
+        * @param {Element} [element] The element to display in fullscreen, if element is not provided the application canvas is used
+        * @param {Function} [success] Function called if the request for fullscreen was successful
+        * @param {Function} [error] Function called if the request for fullscreen was unsuccessful
+        * @example
+        * var button = document.getElementById('my-button');
+        * button.addEventListener('click', function () {
+        *     app.enableFullscreen(canvas, function () {
+        *         console.log('Now fullscreen');
+        *     }, function () {
+        *         console.log('Something went wrong!');
+        *     });
+        * }, false);
+        */
+        enableFullscreen(element?: Element, success?: (...args: any[]) => {}, error?: () => {}): void;
+
+        /**
+        * @function
+        * @name pc.Application#disableFullscreen
+        * @description If application is currently displaying an element as fullscreen, then stop and return to normal.
+        * @param {Function} [success] Function called when transition to normal mode is finished
+        */
+        disableFullscreen(success: (...args: any[]) => {}): void;
+
+        /**
+        * @function
+        * @name pc.Application#isHidden
+        * @description Queries the visibility of the window or tab in which the application is running.
+        * @returns {Boolean} True if the application is not visible and false otherwise.
+        */
+        isHidden(): boolean
+
+        /**
+        * @private
+        * @function
+        * @name pc.Application#onVisibilityChange
+        * @description Called when the visibility state of the current tab/window changes
+        */
+        private onVisibilityChange(e: any): void;
+
+        /**
+        * @function
+        * @name pc.Application#resizeCanvas
+        * @description Resize the canvas in line with the current FillMode
+        * In KEEP_ASPECT mode, the canvas will grow to fill the window as best it can while maintaining the aspect ratio
+        * In FILL_WINDOW mode, the canvas will simply fill the window, changing aspect ratio
+        * In NONE mode, the canvas will always match the size provided
+        * @param {Number} [width] The width of the canvas, only used in NONE mode
+        * @param {Number} [height] The height of the canvas, only used in NONE mode
+        * @returns {Object} A object containing the values calculated to use as width and height
+        */
+        resizeCanvas(width?: number, height?: number): {
+            width: number,
+            height: number
+        }
+
+        /**
+        * @private
+        * @name pc.Application#onLibrariesLoaded
+        * @description Event handler called when all code libraries have been loaded
+        * Code libraries are passed into the constructor of the Application and the application won't start running or load packs until all libraries have
+        * been loaded
+        */
+        private onLibrariesLoaded(): void;
+
+        /**
+        * @function
+        * @name pc.Application#setSkybox
+        * @description Sets the skybox asset to current scene, and subscribes to asset load/change events
+        * @param {pc.Asset} asset Asset of type `skybox` to be set to, or null to remove skybox
+        */
+        setSkybox(asset: pc.Asset): void;
+
+        /**
+        * @function
+        * @name pc.Application#destroy
+        * @description Destroys application and removes all event listeners.
+        */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.Application#renderLine
+         * @description Draw a line in one color
+         * @param {pc.Vec3} start The start of the line
+         * @param {pc.Vec3} end The end of the line
+         * @param {pc.Color} color The color of the line
+         * @example
+         * var start = new pc.Vec3(0,0,0);
+         * var end = new pc.Vec3(1,0,0);
+         * var color = new pc.Color(1,1,1);
+         * app.renderLine(start, end, color);
+         */
+        renderLine(start: pc.Vec3, end: pc.Vec3, color: pc.Color): void;
+
+        /**
+         * @function
+         * @name pc.Application#renderLine^2
+         * @description Draw a line which blends between two colors
+         * @param {pc.Vec3} start The start of the line
+         * @param {pc.Vec3} end The end of the line
+         * @param {pc.Color} startColor The start color of the line
+         * @param {pc.Color} endColor The end color of the line
+         * @example
+         * var start = new pc.Vec3(0,0,0);
+         * var end = new pc.Vec3(1,0,0);
+         * var startColor = new pc.Color(1,1,1);
+         * var endColor = new pc.Color(1,0,0);
+         * app.renderLine(start, end, startColor, endColor);
+         */
+        renderLine(start: pc.Vec3, end: pc.Vec3, startColor: pc.Color, endColor: pc.Color): void;
+
+        /**
+         * @function
+         * @name pc.Application#renderLine^3
+         * @description Draw a line of one color with specified line type
+         * @param {pc.Vec3} start The start of the line
+         * @param {pc.Vec3} end The end of the line
+         * @param {pc.Color} color The color of the line
+         * @param {Number} lineType The type of rendering to use: pc.LINEBATCH_WORLD, pc.LINEBATCH_OVERLAY, pc.LINEBATCH_GIZMO. Default is pc.LINEBATCH_WORLD
+         * @example
+         * var start = new pc.Vec3(0,0,0);
+         * var end = new pc.Vec3(1,0,0);
+         * var color = new pc.Color(1,1,1);
+         * app.renderLine(start, end, color, pc.LINEBATCH_OVERLAY);
+         */
+        renderLine(start: pc.Vec3, end: pc.Vec3, color: pc.Color, lineType: number): void;
+
+        /**
+         * @function
+         * @name pc.Application#renderLine^4
+         * @description Draw a line which blends between two colors with specified line type
+         * @param {pc.Vec3} start The start of the line
+         * @param {pc.Vec3} end The end of the line
+         * @param {pc.Color} startColor The start color of the line
+         * @param {pc.Color} endColor The end color of the line
+         * @param {Number} lineType The type of rendering to use: pc.LINEBATCH_WORLD, pc.LINEBATCH_OVERLAY, pc.LINEBATCH_GIZMO. Default is pc.LINEBATCH_WORLD
+         * @example
+         * var start = new pc.Vec3(0,0,0);
+         * var end = new pc.Vec3(1,0,0);
+         * var startColor = new pc.Color(1,1,1);
+         * var endColor = new pc.Color(1,0,0);
+         * app.renderLine(start, end, startColor, endColor, pc.LINEBATCH_OVERLAY);
+         */
+        renderLine(start: pc.Vec3, end: pc.Vec3, startColor: pc.Color, endColor: pc.Color, lineType: number): void;
+
+        /**
+         * @function
+         * @name pc.Application#renderLines
+         * @description Draw an array of lines.
+         * @param {pc.Vec3[]} position An array of points to draw lines between
+         * @param {pc.Color[]} color An array of colors to color the lines. This must be the same size as the position array
+         * @param {Number} [lineType] The type of rendering to use: pc.LINEBATCH_WORLD, pc.LINEBATCH_OVERLAY, pc.LINEBATCH_GIZMO. Default is pc.LINEBATCH_WORLD
+         * @example
+         * var points = [new pc.Vec3(0,0,0), new pc.Vec3(1,0,0), new pc.Vec3(1,1,0), new pc.Vec3(1,1,1)];
+         * var colors = [new pc.Color(1,0,0), new pc.Color(1,1,0), new pc.Color(0,1,1), new pc.Color(0,0,1)];
+         * app.renderLines(points, colors);
+        */
+        renderLines(position: pc.Vec3[], color: pc.Color[], lineType?: number): void;
+
+
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.Application#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope?: any): any;
+
+        /**
+         * @function
+         * @name pc.Application#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name?: string, callback?: (...args: any[]) => void, scope?: any): any;
+
+        /**
+         * @function
+         * @name pc.Application#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.Application#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope?: any): any;
+
+        /**
+        * @function
+        * @name pc.Application#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+
+    /**
+    * @enum pc.FILLMODE
+    * @name pc.FILLMODE_NONE
+    * @description When resizing the window the size of the canvas will not change.
+    */
+    const FILLMODE_NONE = 'NONE';
+    /**
+    * @enum pc.FILLMODE
+    * @name pc.FILLMODE_FILL_WINDOW
+    * @description When resizing the window the size of the canvas will change to fill the window exactly.
+    */
+    const FILLMODE_FILL_WINDOW = 'FILL_WINDOW';
+    /**
+    * @enum pc.FILLMODE
+    * @name pc.FILLMODE_KEEP_ASPECT
+    * @description When resizing the window the size of the canvas will change to fill the window as best it can, while maintaining the same aspect ratio.
+    */
+    const FILLMODE_KEEP_ASPECT = 'KEEP_ASPECT';
+    /**
+    * @enum pc.RESOLUTION
+    * @name pc.RESOLUTION_AUTO
+    * @description When the canvas is resized the resolution of the canvas will change to match the size of the canvas.
+    */
+    const RESOLUTION_AUTO = 'AUTO';
+    /**
+    * @enum pc.RESOLUTION
+    * @name pc.RESOLUTION_FIXED
+    * @description When the canvas is resized the resolution of the canvas will remain at the same value and the output will just be scaled to fit the canvas.
+    */
+    const RESOLUTION_FIXED = 'FIXED';
+}
diff --git a/types/playcanvas/engine/framework/components/animation/component.d.ts b/types/playcanvas/engine/framework/components/animation/component.d.ts
new file mode 100644
index 0000000000..5060499b3d
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/animation/component.d.ts
@@ -0,0 +1,46 @@
+declare namespace pc {
+    /**
+    * @component Animation
+    * @name pc.AnimationComponent
+    * @description Create a new AnimationComponent
+    * @class The Animation Component allows an Entity to playback animations on models
+    * @param {pc.AnimationComponentSystem} system The {@link pc.ComponentSystem} that created this Component
+    * @param {pc.Entity} entity The Entity that this Component is attached to
+    * @extends pc.Component
+    * @property {Number} speed Speed multiplier for animation play back speed. 1.0 is playback at normal speed, 0.0 pauses the animation
+    * @property {Boolean} loop If true the animation will restart from the beginning when it reaches the end
+    * @property {Boolean} activate If true the first animation asset will begin playing when the Pack is loaded
+    * @property {pc.Asset[]} assets The array of animation assets - can also be an array of asset ids.
+    * @property {Number} currentTime Get or Set the current time position (in seconds) of the animation
+    * @property {Number} duration Get the duration in seconds of the current animation.
+    */
+    class AnimationComponent extends pc.Component {
+        constructor(system: pc.AnimationComponentSystem, entity: pc.Entity)
+
+        speed: number;
+        loop: boolean;
+        activate: boolean;
+        assets: pc.Asset[];
+        currentTime: number;
+        duration: number;
+
+        /**
+         * @function
+         * @name pc.AnimationComponent#play
+         * @description Start playing an animation
+         * @param {String} name The name of the animation asset to begin playing.
+         * @param {Number} [blendTime] The time in seconds to blend from the current
+         * animation state to the start of the animation being set.
+         */
+        play(name: string, blendTime: number): void;
+
+        /**
+        * @function
+        * @name pc.AnimationComponent#getAnimation
+        * @description Return an animation
+        * @param {String} name The name of the animation asset
+        * @returns {pc.Animation} An Animation
+        */
+        getAnimation(name: string): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/animation/system.d.ts b/types/playcanvas/engine/framework/components/animation/system.d.ts
new file mode 100644
index 0000000000..c2b51936dc
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/animation/system.d.ts
@@ -0,0 +1,15 @@
+declare namespace pc {
+
+    /**
+     * @name pc.AnimationComponentSystem
+     * @description Create an AnimationComponentSystem
+     * @class The AnimationComponentSystem manages creating and deleting AnimationComponents
+     * @param {pc.Application} app The Application for the current application
+     * @extends pc.ComponentSystem
+     */
+    class AnimationComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+
+
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/audio-listener/component.d.ts b/types/playcanvas/engine/framework/components/audio-listener/component.d.ts
new file mode 100644
index 0000000000..873f76d81f
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/audio-listener/component.d.ts
@@ -0,0 +1,15 @@
+declare namespace pc {
+
+    /**
+    * @component
+    * @name pc.AudioListenerComponent
+    * @class Represents the audio listener in the 3D world, so that 3D positioned audio sources are heard correctly.
+    * @description Create new AudioListenerComponent
+    * @param {pc.AudioListenerComponentSystem} system The ComponentSystem that created this Component
+    * @param {pc.Entity} entity The Entity that this Component is attached to.
+    * @extends pc.Component
+    */
+    class AudioListenerComponent extends pc.Component {
+        constructor(system: pc.AudioListenerComponentSystem, entity: pc.Entity)
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/audio-listener/system.d.ts b/types/playcanvas/engine/framework/components/audio-listener/system.d.ts
new file mode 100644
index 0000000000..8ca30e9955
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/audio-listener/system.d.ts
@@ -0,0 +1,12 @@
+declare namespace pc {
+
+    /**
+    * @name pc.AudioListenerComponentSystem
+    * @class Component System for adding and removing {@link pc.AudioComponent} objects to Entities.
+    * @description Create a new AudioListenerComponentSystem
+    * @extends pc.ComponentSystem
+    */
+    class AudioListenerComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application, manager: pc.SoundManager)
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/audio-source/component.d.ts b/types/playcanvas/engine/framework/components/audio-source/component.d.ts
new file mode 100644
index 0000000000..08e821533e
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/audio-source/component.d.ts
@@ -0,0 +1,38 @@
+declare namespace pc {
+
+    /**
+     * @component
+     * @name pc.AudioSourceComponent
+     * @class The AudioSource Component controls playback of an audio sample. This class will be deprecated in favor of {@link pc.SoundComponent}.
+     * @description Create a new AudioSource Component
+     * @param {pc.AudioSourceComponentSystem} system The ComponentSystem that created this Component
+     * @param {pc.Entity} entity The entity that the Component is attached to
+     * @extends pc.Component
+     * @property {pc.Asset[]} assets The list of audio assets - can also be an array of asset ids.
+     * @property {Boolean} activate If true the audio will begin playing as soon as the Pack is loaded
+     * @property {Number} volume The volume modifier to play the audio with. In range 0-1.
+     * @property {Number} pitch The pitch modifier to play the audio with. Must be larger than 0.01
+     * @property {Boolean} loop If true the audio will restart when it finishes playing
+     * @property {Boolean} 3d If true the audio will play back at the location of the Entity in space, so the audio will be affect by the position of the {@link pc.AudioListenerComponent}
+     * @property {String} distanceModel Determines which algorithm to use to reduce the volume of the audio as it moves away from the listener. Can be one of 'linear', 'inverse' or 'exponential'. Default is 'inverse'.
+     * @property {Number} minDistance The minimum distance from the listener at which audio falloff begins.
+     * @property {Number} maxDistance The maximum distance from the listener at which audio falloff stops. Note the volume of the audio is not 0 after this distance, but just doesn't fall off anymore
+     * @property {Number} rollOffFactor The factor used in the falloff equation.
+     */
+    class AudioSourceComponent extends pc.Component {
+        constructor(system: pc.AudioSourceComponentSystem, entity: pc.Entity)
+
+        assets: pc.Asset[];
+        activate: boolean;
+        volume: number;
+        pitch: number;
+        loop: boolean;
+        distanceModel: string;
+        minDistance: number;
+        maxDistance: number;
+        rollOffFactor: number;
+    }
+
+
+    
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/audio-source/system.d.ts b/types/playcanvas/engine/framework/components/audio-source/system.d.ts
new file mode 100644
index 0000000000..dd5a4a63e9
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/audio-source/system.d.ts
@@ -0,0 +1,21 @@
+declare namespace pc {
+
+    /**
+     * @name pc.AudioSourceComponentSystem
+     * @class Controls playback of an audio sample. This class will be deprecated in favor of {@link pc.SoundComponentSystem}.
+     * @param {pc.Application} app The Application
+     * @param {pc.SoundManager} manager The sound manager
+     * @extends pc.ComponentSystem
+     */
+    class AudioSourceComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application, manager: pc.SoundManager)
+
+        /**
+         * @name pc.AudioSourceComponentSystem#setVolume()
+         * @function
+         * @description Set the volume for the entire AudioSource system. All sources will have their volume multiplied by this value
+         * @param {Number} value The value to set the volume to. Valid from 0.0 - 1.0
+         */
+        setVolume(volume: number): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/camera/component.d.ts b/types/playcanvas/engine/framework/components/camera/component.d.ts
new file mode 100644
index 0000000000..639fe9b0d2
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/camera/component.d.ts
@@ -0,0 +1,230 @@
+declare namespace pc {
+
+    /**
+     * @component
+     * @name pc.CameraComponent
+     * @extends pc.Component
+     * @class The Camera Component enables an Entity to render the scene. A scene requires at least one
+     * enabled camera component to be rendered. Note that multiple camera components can be enabled
+     * simultaneously (for split-screen or offscreen rendering, for example).
+     * @description Create a new Camera Component.
+     * @param {pc.CameraComponentSystem} system The ComponentSystem that created this Component.
+     * @param {pc.Entity} entity The Entity that this Component is attached to.
+     * @example
+     * // Add a pc.CameraComponent to an entity
+     * var entity = new pc.Entity();
+     * entity.addComponent('camera', {
+     *     nearClip: 1,
+     *     farClip: 100,
+     *     fov: 55
+     * });
+     * @example
+     * // Get the pc.CameraComponent on an entity
+     * var cameraComponent = entity.camera;
+     * @example
+     * // Update a property on a camera component
+     * entity.camera.nearClip = 2;
+     * @property {Number} projection The type of projection used to render the camera. Can be:
+     * <ul>
+     *     <li>{@link pc.PROJECTION_PERSPECTIVE}: A perspective projection. The camera frustum resembles a truncated pyramid.</li>
+     *     <li>{@link pc.PROJECTION_ORTHOGRAPHIC}: An orthographic projection. The camera frustum is a cuboid.</li>
+     * </ul>
+     * Defaults to pc.PROJECTION_PERSPECTIVE.
+     * @property {Number} nearClip The distance from the camera before which no rendering will take place.
+     * @property {Number} farClip The distance from the camera after which no rendering will take place.
+     * @property {Number} aspectRatio The aspect ratio of the camera. This is the ratio of width divided by height. Default to 16/9.
+     * @property {Boolean} horizontalFov Set which axis to use for the Field of View calculation. Defaults to false (use Y-axis).
+     * @property {Number} fov The field of view of the camera in degrees. Usually this is the Y-axis field of
+     * view, see {@link pc.CameraComponent#horizontalFov}. Used for {@link pc.PROJECTION_PERSPECTIVE} cameras only. Defaults to 45.
+     * @property {Number} orthoHeight The half-height of the orthographic view window (in the Y-axis). Used for
+     * {@link pc.PROJECTION_ORTHOGRAPHIC} cameras only. Defaults to 10.
+     * @property {Number} priority Controls the order in which cameras are rendered. Cameras with smaller values for priority are rendered first.
+     * @property {pc.Color} clearColor The color used to clear the canvas to before the camera starts to render.
+     * @property {Boolean} clearColorBuffer If true the camera will clear the color buffer to the color set in clearColor.
+     * @property {Boolean} clearDepthBuffer If true the camera will clear the depth buffer.
+     * @property {Boolean} clearStencilBuffer If true the camera will clear the stencil buffer.
+     * @property {pc.Vec4} rect Controls where on the screen the camera will be rendered in normalized screen coordinates.
+     * @property {pc.Vec4} scissorRect Clips all pixels which are not in the rectangle.
+     * The order of the values is [x, y, width, height].
+     * @property {pc.RenderTarget} renderTarget The render target of the camera. Defaults to null, which causes
+     * the camera to render to the canvas' back buffer. Setting a valid render target effectively causes the camera
+     * to render to an offscreen buffer, which can then be used to achieve certain graphics effect (normally post
+     * effects).
+     * @property {pc.PostEffectQueue} postEffects The post effects queue for this camera. Use this to add or remove post effects from the camera.
+     * @property {Boolean} frustumCulling Controls the culling of mesh instances against the camera frustum. If true, culling is enabled.
+     * If false, all mesh instances in the scene are rendered by the camera, regardless of visibility. Defaults to false.
+     * @property {Function} calculateTransform Custom function you can provide to calculate the camera transformation matrix manually. Can be used for complex effects like reflections. Function is called using component's scope.
+     * Arguments:
+     *     <li>{pc.Mat4} transformMatrix: output of the function</li>
+     *     <li>{Number} view: Type of view. Can be pc.VIEW_CENTER, pc.VIEW_LEFT or pc.VIEW_RIGHT. Left and right are only used in stereo rendering.</li>
+     * @property {Function} calculateProjection Custom function you can provide to calculate the camera projection matrix manually. Can be used for complex effects like doing oblique projection. Function is called using component's scope.
+     * Arguments:
+     *     <li>{pc.Mat4} transformMatrix: output of the function</li>
+     *     <li>{Number} view: Type of view. Can be pc.VIEW_CENTER, pc.VIEW_LEFT or pc.VIEW_RIGHT. Left and right are only used in stereo rendering.</li>
+     * @property {Boolean} cullFaces If true the camera will take material.cull into account. Otherwise both front and back faces will be rendered.
+     * @property {Boolean} flipFaces If true the camera will invert front and back faces. Can be useful for reflection rendering.
+     */
+    class CameraComponent extends pc.Component {
+        constructor(system: pc.CameraComponentSystem, entity: pc.Entity)
+
+        projection: number;
+        nearClip: number;
+        farClip: number;
+        aspectRatio: number;
+        horizontalFov: boolean;
+        fov: number;
+        orthoHeight: number;
+        priority: number;
+        clearColor: pc.Color;
+        clearColorBuffer: boolean;
+        clearDepthBuffer: boolean;
+        clearStencilBuffer: boolean;
+        rect: pc.Vec4;
+        scissorRect: pc.Vec4;
+        renderTarget: pc.RenderTarget;
+        postEffects: pc.PostEffectQueue;
+        frustumCulling: boolean;
+        calculateTransform: Function;
+        calculateProjection: Function;
+        cullFaces: boolean;
+        flipFaces: boolean;
+
+        /**
+         * @readonly
+         * @name pc.CameraComponent#projectionMatrix
+         * @type pc.Mat4
+         * @description Queries the camera's projection matrix.
+         */
+        readonly projectionMatrix: pc.Mat4;
+
+        /**
+         * @readonly
+         * @name pc.CameraComponent#viewMatrix
+         * @type pc.Mat4
+         * @description Queries the camera's view matrix.
+         */
+        readonly viewMatrix: pc.Mat4;
+
+        /**
+         * @readonly
+         * @name pc.CameraComponent#frustum
+         * @type pc.Frustum
+         * @description Queries the camera's frustum shape.
+         */
+        readonly frustum: pc.Frustum;
+
+        /**
+         * @name pc.CameraComponent#vrDisplay
+         * @type pc.VrDisplay
+         * @description The {@link pc.VrDisplay} that the camera is current displaying to. This is set automatically by calls to {@link pc.CameraComponent#enterVr}
+         * or {@link pc.CameraComponent#exitVr}. Setting this property to a display directly enables the camera to use the transformation information
+         * from a display without rendering stereo to it, e.g. for "magic window" style experiences.
+         * @example
+         * // enable magic window style interface
+         * var display = this.app.vr.display;
+         * if (display) {
+         *     this.entity.camera.vrDisplay = display;
+         * }
+         *
+         * var camera = this.entity.camera;
+         * camera.enterVr(function (err) {
+         * if (err) { return; }
+         *     var display = camera.vrDisplay; // access presenting pc.VrDisplay
+         * });
+         */
+        vrDisplay: pc.VrDisplay;
+
+        /**
+         * @readonly
+         * @name pc.CameraComponent#node
+         * @type pc.GraphNode
+         * @description Queries the camera's GraphNode. Can be used to get position and rotation.
+         */
+        readonly node: pc.GraphNode
+
+        /**
+         * @function
+         * @name pc.CameraComponent#screenToWorld
+         * @description Convert a point from 2D screen space to 3D world space.
+         * @param {Number} screenx x coordinate on PlayCanvas' canvas element.
+         * @param {Number} screeny y coordinate on PlayCanvas' canvas element.
+         * @param {Number} cameraz The distance from the camera in world space to create the new point.
+         * @param {pc.Vec3} [worldCoord] 3D vector to receive world coordinate result.
+         * @example
+         * // Get the start and end points of a 3D ray fired from a screen click position
+         * var start = entity.camera.screenToWorld(clickX, clickY, entity.camera.nearClip);
+         * var end = entity.camera.screenToWorld(clickX, clickY, entity.camera.farClip);
+         *
+         * // Use the ray coordinates to perform a raycast
+         * app.systems.rigidbody.raycastFirst(start, end, function (result) {
+         *     console.log("Entity " + result.entity.name + " was selected");
+         * });
+         * @returns {pc.Vec3} The world space coordinate.
+         */
+        screenToWorld(screenx: number, screeny: number, cameraz: number, worldCoord?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.CameraComponent#worldToScreen
+         * @description Convert a point from 3D world space to 2D screen space.
+         * @param {pc.Vec3} worldCoord The world space coordinate.
+         * @param {pc.Vec3} [screenCoord] 3D vector to receive screen coordinate result.
+         * @returns {pc.Vec3} The screen space coordinate.
+         */
+        worldToScreen(worldCoord: pc.Vec3, screenCoord: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @private
+         * @name pc.CameraComponent#frameBegin
+         * @description Start rendering the frame for this camera.
+         */
+        private frameBegin(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.CameraComponent#frameEnd
+         * @description End rendering the frame for this camera
+         */
+        private frameEnd(): void;
+
+
+        /**
+         * @function
+         * @name pc.CameraComponent#enterVr
+         * @description Attempt to start presenting this camera to a {@link pc.VrDisplay}.
+         * @param {pc.VrDisplay} [display] The VrDisplay to present. If not supplied this uses {@link pc.VrManager#display} as the default
+         * @param {Function} callback Function called once to indicate success of failure. The callback takes one argument (err).
+         * On success it returns null on failure it returns the error message.
+         * @example
+         * // On an entity with a camera component
+         * this.entity.camera.enterVr(function (err) {
+         *     if (err) {
+         *         console.error(err);
+         *         return;
+         *     } else {
+         *         // in VR!
+         *     }
+         * });
+         */
+        enterVr(display: pc.VrDisplay, callback: Function): void;
+
+        /**
+         * @function
+         * @name pc.CameraComponent#exitVr
+         * @description Attempt to stop presenting this camera.
+         * @param {Function} callback Function called once to indicate success of failure. The callback takes one argument (err).
+         * On success it returns null on failure it returns the error message.
+         * @example
+         * this.entity.camera.exitVr(function (err) {
+         *     if (err) {
+         *         console.error(err);
+         *     } else {
+         *
+         *     }
+         * });
+         */
+        exitVr(callback: Function): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/camera/post-effect-queue.d.ts b/types/playcanvas/engine/framework/components/camera/post-effect-queue.d.ts
new file mode 100644
index 0000000000..e0d81f1ea4
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/camera/post-effect-queue.d.ts
@@ -0,0 +1,62 @@
+declare namespace pc {
+
+    /**
+     * @name pc.PostEffectQueue
+     * @description Create a new PostEffectQueue
+     * @class Used to manage multiple post effects for a camera
+     * @param {pc.Application} app The application
+     * @param {pc.CameraComponent} camera The camera component
+     */
+    class PostEffectQueue {
+        constructor(app: pc.Application, camera: pc.CameraComponent)
+
+        /**
+         * @private
+         * @function
+         * @name pc.PostEffectQueue#_createOffscreenTarget
+         * @description Creates a render target with the dimensions of the canvas, with an optional depth buffer
+         * @param {Boolean} useDepth Set to true if you want to create a render target with a depth buffer
+         * @param {Boolean} hdr Use HDR render target format
+         * @returns {pc.RenderTarget} The render target
+         */
+        private _createOffscreenTarget(useDepth: boolean, hdr: boolean): pc.RenderTarget;
+
+        /**
+         * @function
+         * @name pc.PostEffectQueue#addEffect
+         * @description Adds a post effect to the queue. If the queue is disabled adding a post effect will
+         * automatically enable the queue.
+         * @param {pc.PostEffect} effect The post effect to add to the queue.
+         */
+        addEffect(effect: pc.PostEffect): void;
+
+        /**
+         * @function
+         * @name pc.PostEffectQueue#removeEffect
+         * @description Removes a post effect from the queue. If the queue becomes empty it will be disabled automatically.
+         * @param {pc.PostEffect} effect The post effect to remove.
+         */
+        removeEffect(effect: pc.PostEffect): void;
+
+        /**
+         * @function
+         * @name pc.PostEffectQueue#destroy
+         * @description Removes all the effects from the queue and disables it
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.PostEffectQueue#enable
+         * @description Enables the queue and all of its effects. If there are no effects then the queue will not be enabled.
+         */
+        enable(): void;
+
+        /**
+         * @function
+         * @name pc.PostEffectQueue#disable
+         * @description Disables the queue and all of its effects.
+         */
+        disable(): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/camera/system.d.ts b/types/playcanvas/engine/framework/components/camera/system.d.ts
new file mode 100644
index 0000000000..1c3e36265b
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/camera/system.d.ts
@@ -0,0 +1,18 @@
+declare namespace pc {
+
+    /**
+     * @name pc.CameraComponentSystem
+     * @class Used to add and remove {@link pc.CameraComponent}s from Entities. It also holds an
+     * array of all active cameras.
+     * @description Create a new CameraComponentSystem
+     * @param {pc.Application} app The Application
+     *
+     * @property {pc.CameraComponent[]} cameras Holds all the active camera components
+     * @extends pc.ComponentSystem
+     */
+    class CameraComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+
+        cameras: pc.CameraComponent[];
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/collision/component.d.ts b/types/playcanvas/engine/framework/components/collision/component.d.ts
new file mode 100644
index 0000000000..b71978b10b
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/collision/component.d.ts
@@ -0,0 +1,80 @@
+declare namespace pc {
+
+    /**
+     * @component
+     * @name pc.CollisionComponent
+     * @description Create a new CollisionComponent
+     * @class A collision volume. use this in conjunction with a {@link pc.RigidBodyComponent} to make a collision volume that can be simulated using the physics engine.
+     * <p>If the {@link pc.Entity} does not have a {@link pc.RigidBodyComponent} then this collision volume will act as a trigger volume. When an entity with a dynamic
+     * or kinematic body enters or leaves an entity with a trigger volume, both entities will receive trigger events.
+     * <p>The following table shows all the events that can be fired between two Entities:
+     * <table class="table table-striped table-condensed">
+     *  <tr><td></td><td><strong>Rigid Body (Static)</strong></td><td><strong>Rigid Body (Dynamic or Kinematic)</strong></td><td><strong>Trigger Volume</strong></td></tr>
+     *  <tr>
+     *       <td><strong>Rigid Body (Static)</strong></td>
+     *       <td>-</td>
+     *       <td><ul class="list-group">
+     *           <li class="list-group-item">contact</li>
+     *           <li class="list-group-item">collisionstart</li>
+     *           <li class="list-group-item">collisionend</li>
+     *       </td>
+     *       <td>-</td>
+     *   </tr>
+     *  <tr>
+     *       <td><strong>Rigid Body (Dynamic or Kinematic)</strong></td>
+     *       <td><ul class="list-group">
+     *           <li class="list-group-item">contact</li>
+     *           <li class="list-group-item">collisionstart</li>
+     *           <li class="list-group-item">collisionend</li>
+     *       </td>
+     *       <td><ul class="list-group">
+     *           <li class="list-group-item">contact</li>
+     *           <li class="list-group-item">collisionstart</li>
+     *           <li class="list-group-item">collisionend</li>
+     *       </td>
+     *       <td><ul class="list-group">
+     *           <li class="list-group-item">triggerenter</li>
+     *           <li class="list-group-item">triggerleave</li>
+     *       </td>
+     *   </tr>
+     *  <tr>
+     *       <td><strong>Trigger Volume</strong></td>
+     *       <td>-</td>
+     *       <td><ul class="list-group">
+     *           <li class="list-group-item">triggerenter</li>
+     *           <li class="list-group-item">triggerleave</li>
+     *       </td>
+     *       <td>-</td>
+     *   </tr>
+     * </table>
+     * </p>
+     * @param {pc.CollisionComponentSystem} system The ComponentSystem that created this Component
+     * @param {pc.Entity} entity The Entity that this Component is attached to.
+     * @property {String} type The type of the collision volume. Defaults to 'box'. Can be one of the following:
+     * <ul>
+     * <li><strong>box</strong>: A box-shaped collision volume.</li>
+     * <li><strong>sphere</strong>: A sphere-shaped collision volume.</li>
+     * <li><strong>capsule</strong>: A capsule-shaped collision volume.</li>
+     * <li><strong>cylinder</strong>: A cylinder-shaped collision volume.</li>
+     * <li><strong>mesh</strong>: A collision volume that uses a model asset as its shape.</li>
+     * </ul>
+     * @property {pc.Vec3} halfExtents The half-extents of the box-shaped collision volume in the x, y and z axes. Defaults to [0.5, 0.5, 0.5]
+     * @property {Number} radius The radius of the sphere, capsule or cylinder-shaped collision volumes. Defaults to 0.5
+     * @property {Number} axis The local space axis with which the capsule or cylinder-shaped collision volume's length is aligned. 0 for X, 1 for Y and 2 for Z. Defaults to 1 (Y-axis).
+     * @property {Number} height The total height of the capsule or cylinder-shaped collision volume from tip to tip. Defaults to 2.
+     * @property {pc.Asset} asset The asset for the model of the mesh collision volume - can also be an asset id.
+     * @property {pc.Model} model The model that is added to the scene graph for the mesh collision volume.
+     * @extends pc.Component
+     */
+    class CollisionComponent extends pc.Component {
+        constructor(system: pc.CollisionComponentSystem, entity: pc.Entity)
+
+        type: string;
+        halfExtents: pc.Vec3;
+        radius: number;
+        axis: number;
+        height: number;
+        asset: pc.Asset;
+        model: pc.Model;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/collision/system.d.ts b/types/playcanvas/engine/framework/components/collision/system.d.ts
new file mode 100644
index 0000000000..4c01118541
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/collision/system.d.ts
@@ -0,0 +1,13 @@
+declare namespace pc {
+
+    /**
+     * @name pc.CollisionComponentSystem
+     * @description Creates a new CollisionComponentSystem.
+     * @class Manages creation of {@link pc.CollisionComponent}s.
+     * @param {pc.Application} app The running {pc.Application}
+     * @extends pc.ComponentSystem
+     */
+    class CollisionComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/component.d.ts b/types/playcanvas/engine/framework/components/component.d.ts
new file mode 100644
index 0000000000..5b47908106
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/component.d.ts
@@ -0,0 +1,104 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Component
+     * @description Base constructor for a Component
+     * @class Components are used to attach functionality on a {@link pc.Entity}. Components
+     * can receive update events each frame, and expose properties to the PlayCanvas Editor.
+     * @param {pc.ComponentSystem} system The ComponentSystem used to create this Component
+     * @param {pc.Entity} entity The Entity that this Component is attached to
+     * @property {Boolean} enabled Enables or disables the component.
+     */
+    class Component {
+        constructor(system: pc.ComponentSystem, entity: pc.Entity)
+
+        /**
+         * @private
+         * @readonly
+         * @name pc.Component#data
+         * @type pc.ComponentData
+         * @description Access the {@link pc.ComponentData} directly. Usually you should
+         * access the data properties via the individual properties as modifying this data
+         * directly will not fire 'set' events.
+         */
+        private readonly data: pc.ComponentData;
+
+        enabled: boolean;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.Component#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Component#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Component#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.Component#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.Component#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/data.d.ts b/types/playcanvas/engine/framework/components/data.d.ts
new file mode 100644
index 0000000000..eafb2ed916
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/data.d.ts
@@ -0,0 +1,11 @@
+declare namespace pc {
+
+    /**
+     * @private
+     * @name pc.ComponentData
+     * @class Base class for Component data storage.
+     */
+    class ComponentData {
+        
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/element/component.d.ts b/types/playcanvas/engine/framework/components/element/component.d.ts
new file mode 100644
index 0000000000..08620ed595
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/element/component.d.ts
@@ -0,0 +1,113 @@
+declare namespace pc {
+
+    /**
+     * @enum pc.ELEMENTTYPE
+     * @name pc.ELEMENTTYPE_GROUP
+     * @description A {@link pc.ElementComponent} that contains child {@link pc.ElementComponent}s.
+     */
+    const ELEMENTTYPE_GROUP = 'group';
+    /**
+     * @enum pc.ELEMENTTYPE
+     * @name pc.ELEMENTTYPE_IMAGE
+     * @description A {@link pc.ElementComponent} that displays an image.
+     */
+    const ELEMENTTYPE_IMAGE = 'image';
+    /**
+     * @enum pc.ELEMENTTYPE
+     * @name pc.ELEMENTTYPE_TEXT
+     * @description A {@link pc.ElementComponent} that displays text.
+     */
+    const ELEMENTTYPE_TEXT = 'text';
+
+    /**
+     * @component
+     * @name pc.ElementComponent
+     * @extends pc.Component
+     * @class Enables an Entity to be positioned using anchors and screen coordinates under a {@link pc.ScreenComponent} or under other ElementComponents.
+     * Depending on its type it can be used to render images, text or just as a layout mechanism to build 2D and 3D user interfaces.
+     * If the component is a descendant of a {@link pc.ScreenComponent}, then the Entity's {@link pc.Entity.setLocalPosition} is in the {@link pc.ScreenComponent}'s coordinate system.
+     * @param {pc.ElementComponentSystem} system The ComponentSystem that created this Component
+     * @param {pc.Entity} entity The Entity that this Component is attached to.
+     * @property {String} type The type of the ElementComponent. Can be one of the following:
+     * <ul>
+     *     <li>pc.ELEMENTTYPE_GROUP: The component can be used as a layout mechanism to create groups of ElementComponents e.g. panels.</li>
+     *     <li>pc.ELEMENTTYPE_IMAGE: The component will render an image</li>
+     *     <li>pc.ELEMENTTYPE_TEXT: The component will render text</li>
+     * </ul>
+     * @property {pc.Entity} screen The Entity with a {@link pc.ScreenComponent} that this component belongs to. This is automatically set when the component is a child of a ScreenComponent.
+     * @property {Number} drawOrder The draw order of the component. A higher value means that the component will be rendered on top of other components.
+     * @property {pc.Vec4} anchor Specifies where the left, bottom, right and top edges of the component are anchored relative to its parent. Each value
+     * ranges from 0 to 1. E.g. a value of [0,0,0,0] means that the element will be anchored to the bottom left of its parent. A value of [1, 1, 1, 1] means
+     * it will be anchored to the top right. A split anchor is when the left-right or top-bottom pairs of the anchor are not equal. In that case the component will be resized to cover that entire area. E.g. a value of [0,0,1,1] will make the component resize exactly as its parent.
+     * @property {pc.Vec2} pivot The position of the pivot of the component relative to its anchor. Each value ranges from 0 to 1 where [0,0] is the bottom left and [1,1] is the top right.
+     * @property {pc.Vec4} margin The distance from the left, bottom, right and top edges of the anchor. For example if we are using a split anchor like [0,0,1,1] and the margin is [0,0,0,0] then the component will be the same width and height as its parent.
+     * @property {Number} left The distance from the left edge of the anchor. Can be used in combination with a split anchor to make the component's left edge always be 'left' units away from the left.
+     * @property {Number} right The distance from the right edge of the anchor. Can be used in combination with a split anchor to make the component's right edge always be 'right' units away from the right.
+     * @property {Number} bottom The distance from the bottom edge of the anchor. Can be used in combination with a split anchor to make the component's top edge always be 'top' units away from the top.
+     * @property {Number} top The distance from the top edge of the anchor. Can be used in combination with a split anchor to make the component's bottom edge always be 'bottom' units away from the bottom.
+     * @property {Number} width The width of the element.
+     * @property {Number} height The height of the element.
+     * @property {pc.Vec3[]} screenCorners An array of 4 {@link pc.Vec3}s that represent the bottom left, bottom right, top right and top left corners of the component relative to its parent {@link pc.ScreenComponent}.
+     * @property {pc.Vec3[]} worldCorners An array of 4 {@link pc.Vec3}s that represent the bottom left, bottom right, top right and top left corners of the component in world space. Only works for 3D ElementComponents.
+     * @property {pc.Vec2[]} canvasCorners An array of 4 {@link pc.Vec2}s that represent the bottom left, bottom right, top right and top left corners of the component in canvas pixels. Only works for screen space ElementComponents.
+     * @property {Boolean} useInput If true then the component will receive Mouse or Touch input events.
+     * @property {pc.Color} color The color of the image for {@link pc.ELEMENTTYPE_IMAGE} types or the color of the text for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} opacity The opacity of the image for {@link pc.ELEMENTTYPE_IMAGE} types or the text for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} textWidth The width of the text rendered by the component. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} textHeight The height of the text rendered by the component. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} autoWidth Automatically set the width of the component to be the same as the textWidth. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} autoHeight Automatically set the height of the component to be the same as the textHeight. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} fontAsset The id of the font asset used for rendering the text. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {pc.Font} font The font used for rendering the text. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} fontSize The size of the font. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} spacing The spacing between the letters of the text. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} lineHeight The height of each line of text. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {pc.Vec2} alignment The horizontal and vertical alignment of the text. Values range from 0 to 1 where [0,0] is the bottom left and [1,1] is the top right.  Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {String} text The text to render. Only works for {@link pc.ELEMENTTYPE_TEXT} types.
+     * @property {Number} textureAsset The id of the texture asset to render. Only works for {@link pc.ELEMENTTYPE_IMAGE} types.
+     * @property {pc.Texture} texture The texture to render. Only works for {@link pc.ELEMENTTYPE_IMAGE} types.
+     * @property {Number} materialAsset The id of the material asset to use when rendering an image. Only works for {@link pc.ELEMENTTYPE_IMAGE} types.
+     * @property {pc.Material} material The material to use when rendering an image. Only works for {@link pc.ELEMENTTYPE_IMAGE} types.
+     * @property {pc.Vec4} rect Specifies which region of the texture to use in order to render an image. Values range from 0 to 1 and indicate u, v, width, height. Only works for {@link pc.ELEMENTTYPE_IMAGE} types.
+     * @property {Number} batchGroupId Assign element to a specific batch group (see {@link pc.BatchGroup}). Default value is -1 (no group).
+     */
+    class ElementComponent extends pc.Component {
+        constructor(system: pc.ElementComponentSystem, entity: pc.Entity)
+
+        type: string;
+        screen: pc.Entity;
+        drawOrder: number;
+        anchor: pc.Vec4;
+        pivot: pc.Vec2;
+        margin: pc.Vec4;
+        left: number;
+        right: number;
+        bottom: number;
+        top: number;
+        width: number;
+        height: number;
+        screenCorners: pc.Vec3[];
+        worldCorners: pc.Vec3[];
+        canvasCorners: pc.Vec2[];
+        useInput: boolean;
+        color: pc.Color;
+        opacity: number;
+        textWidth: number;
+        textHeight: number;
+        autoWidth: number;
+        autoHeight: number;
+        fontAsset: number;
+        font: pc.Font;
+        fontSize: number;
+        spacing: number;
+        lineHeight: number;
+        alignment: pc.Vec2;
+        text: string;
+        textureAsset: number;
+        texture: pc.Texture;
+        materialAsset: number;
+        material: pc.Material;
+        rect: pc.Vec4;
+        batchGroupId: number;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/element/system.d.ts b/types/playcanvas/engine/framework/components/element/system.d.ts
new file mode 100644
index 0000000000..2bd9aa5352
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/element/system.d.ts
@@ -0,0 +1,12 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ElementComponentSystem
+     * @class Manages creation of {@link pc.ElementComponent}s.
+     * @param {pc.Application} app The application
+     * @extends pc.ComponentSystem
+     */
+    class ElementComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/light/component.d.ts b/types/playcanvas/engine/framework/components/light/component.d.ts
new file mode 100644
index 0000000000..668428164d
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/light/component.d.ts
@@ -0,0 +1,137 @@
+declare namespace pc {
+
+    /**
+     * @component
+     * @name pc.LightComponent
+     * @class The Light Component enables the Entity to light the scene. There are three types
+     * of light: directional, point and spot. Directional lights are global in that they are
+     * considered to be infinitely far away and light the entire scene. Point and spot lights
+     * are local in that they have a position and a range. A spot light is a specialization of
+     * a point light where light is emitted in a cone rather than in all directions. Lights
+     * also have the ability to cast shadows to add realism to your scenes.
+     * @description Creates a new Light Component.
+     * @param {pc.LightComponentSystem} system The ComponentSystem that created this Component.
+     * @param {pc.Entity} entity The Entity that this Component is attached to.
+     * @example
+     * // Add a pc.LightComponent to an entity
+     * var entity = new pc.Entity();
+     * entity.addComponent('light', {
+     *     type: "point",
+     *     color: new pc.Color(1, 0, 0),
+     *     range: 10
+     * });
+     * @example
+     * // Get the pc.LightComponent on an entity
+     * var lightComponent = entity.light;
+     * @example
+     * // Update a property on a light component
+     * entity.light.range = 20;
+     * @property {String} type The type of light. Can be:
+     * <ul>
+     *     <li>"directional": A light that is infinitely far away and lights the entire scene from one direction.</li>
+     *     <li>"point": A light that illuminates in all directions from a point.</li>
+     *     <li>"spot": A light that illuminates in all directions from a point and is bounded by a cone.</li>
+     * </ul>
+     * Defaults to "directional".
+     * @property {pc.Color} color The Color of the light. The alpha component of the color is
+     * ignored. Defaults to white (1, 1, 1).
+     * @property {Number} intensity The brightness of the light. Defaults to 1.
+     * @property {Boolean} castShadows If enabled the light will cast shadows. Defaults to false.
+     * @property {Number} shadowDistance The distance from the viewpoint beyond which shadows
+     * are no longer rendered. Affects directional lights only. Defaults to 40.
+     * @property {Number} shadowResolution The size of the texture used for the shadow map.
+     * Valid sizes are 64, 128, 256, 512, 1024, 2048. Defaults to 1024.
+     * @property {Number} shadowBias The depth bias for tuning the appearance of the shadow
+     * mapping generated by this light. Defaults to 0.05.
+     * @property {Number} normalOffsetBias Normal offset depth bias. Defaults to 0.
+     * @property {Number} range The range of the light. Affects point and spot lights only.
+     * Defaults to 10.
+     * @property {Number} innerConeAngle The angle at which the spotlight cone starts
+     * to fade off. The angle is specified in degrees. Affects spot lights only. Defaults
+     * to 40.
+     * @property {Number} outerConeAngle The angle at which the spotlight cone has faded
+     * to nothing. The angle is specified in degrees. Affects spot lights only. Defaults
+     * to 45.
+     * @property {Number} falloffMode Controls the rate at which a light attentuates from
+     * its position. Can be:
+     * <ul>
+     * <li>{@link pc.LIGHTFALLOFF_LINEAR}: Linear.</li>
+     * <li>{@link pc.LIGHTFALLOFF_INVERSESQUARED}: Inverse squared.</li>
+     * </ul>
+     * Affects point and spot lights only. Defaults to pc.LIGHTFALLOFF_LINEAR.
+     * @property {Number} mask Defines a mask to determine which {@link pc.MeshInstance}s are
+     * lit by this light. Defaults to 1.
+     * @property {Boolean} affectDynamic If enabled the light will affect non-lightmapped objects
+     * @property {Boolean} affectLightmapped If enabled the light will affect lightmapped objects
+     * @property {Boolean} bake If enabled the light will be rendered into lightmaps
+     * @property {Boolean} bakeDir If enabled and bake=true, the light's direction will contribute to directional lightmaps.
+     * Be aware, that directional lightmap is an approximation and can only hold single direction per pixel.
+     * Intersecting multiple lights with bakeDir=true may lead to incorrect look of specular/bump-mapping in the area of intersection.
+     * The error is not always visible though, and highly scene-dependent.
+     * @property {Number} shadowUpdateMode Tells the renderer how often shadows must be updated for this light. Options:
+     * <ul>
+     * <li>{@link pc.SHADOWUPDATE_NONE}: Don't render shadows.</li>
+     * <li>{@link pc.SHADOWUPDATE_THISFRAME}: Render shadows only once (then automatically switches to pc.SHADOWUPDATE_NONE).</li>
+     * <li>{@link pc.SHADOWUPDATE_REALTIME}: Render shadows every frame (default).</li>
+     * </ul>
+     * @property {Number} shadowType Type of shadows being rendered by this light. Options:
+     * <ul>
+     * <li>{@link pc.SHADOW_PCF3}: Render depth (color-packed on WebGL 1.0), can be used for PCF 3x3 sampling.</li>
+     * <li>{@link pc.SHADOW_VSM8}: Render packed variance shadow map. All shadow receivers must also cast shadows for this mode to work correctly.</li>
+     * <li>{@link pc.SHADOW_VSM16}: Render 16-bit exponential variance shadow map. Requires OES_texture_half_float extension. Falls back to pc.SHADOW_VSM8, if not supported.</li>
+     * <li>{@link pc.SHADOW_VSM32}: Render 32-bit exponential variance shadow map. Requires OES_texture_float extension. Falls back to pc.SHADOW_VSM16, if not supported.</li>
+     * <li>{@link pc.SHADOW_PCF5}: Render depth buffer only, can be used for hardware-accelerated PCF 5x5 sampling. Requires WebGL2. Falls back to pc.SHADOW_PCF3 on WebGL 1.0.</li>
+     * </ul>
+     * @property {Number} vsmBlurMode Blurring mode for variance shadow maps:
+     * <ul>
+     * <li>{@link pc.BLUR_BOX}: Box filter.</li>
+     * <li>{@link pc.BLUR_GAUSSIAN}: Gaussian filter. May look smoother than box, but requires more samples.</li>
+     * </ul>
+     * @property {Number} vsmBlurSize Number of samples used for blurring a variance shadow map. Only uneven numbers work, even are incremented. Minimum value is 1, maximum is 25.
+     * @property {Number} cookieAsset Asset that has texture that will be assigned to cookie internally once asset resource is available.
+     * @property {pc.Texture} cookie Projection texture. Must be 2D for spot and cubemap for point (ignored if incorrect type is used).
+     * @property {Number} cookieIntensity Projection texture intensity (default is 1).
+     * @property {Boolean} cookieFalloff Toggle normal spotlight falloff when projection texture is used. When set to false, spotlight will work like a pure texture projector (only fading with distance). Default is false.
+     * @property {String} cookieChannel Color channels of the projection texture to use. Can be "r", "g", "b", "a", "rgb" or any swizzled combination.
+     * @property {Number} cookieAngle Angle for spotlight cookie rotation.
+     * @property {pc.Vec2} cookieScale Spotlight cookie scale.
+     * @property {pc.Vec2} cookieOffset Spotlight cookie position offset.
+     * @property {Boolean} isStatic Mark light as non-movable (optimization)
+     * @extends pc.Component
+     */
+    class LightComponent extends pc.Component {
+        constructor(system: pc.LightComponentSystem, entity: pc.Entity)
+
+        type: string;
+        color: pc.Color;
+        intensity: number;
+        castShadows: boolean;
+        shadowDistance: number;
+        shadowResolution: number;
+        shadowBias: number;
+        normalOffsetBias: number;
+        range: number;
+        innerConeAngle: number;
+        outerConeAngle: number;
+        falloffMode: number;
+        mask: number;
+        affectDynamic: boolean;
+        affectLightmapped: boolean;
+        bake: boolean;
+        bakeDir: boolean;
+        shadowUpdateMode: number;
+        shadowType: number;
+        vsmBlurMode: number;
+        vsmBlurSize: number;
+        cookieAsset: number;
+        cookie: pc.Texture;
+        cookieIntensity: number;
+        cookieFalloff: boolean;
+        cookieChannel: string;
+        cookieAngle: number;
+        cookieScale: pc.Vec2;
+        cookieOffset: pc.Vec2;
+        isStatic: boolean;
+
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/light/system.d.ts b/types/playcanvas/engine/framework/components/light/system.d.ts
new file mode 100644
index 0000000000..7e08c90074
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/light/system.d.ts
@@ -0,0 +1,13 @@
+declare namespace pc {
+
+    /*
+    * @name pc.LightComponentSystem
+    * @description Create a new LightComponentSystem.
+    * @class A Light Component is used to dynamically light the scene.
+    * @param {pc.Application} app The application.
+    * @extends pc.ComponentSystem
+    */
+    class LightComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/model/component.d.ts b/types/playcanvas/engine/framework/components/model/component.d.ts
new file mode 100644
index 0000000000..b89d52721c
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/model/component.d.ts
@@ -0,0 +1,84 @@
+declare namespace pc {
+
+    /**
+     * @component
+     * @name pc.ModelComponent
+     * @description Create a new ModelComponent
+     * @class Enables an Entity to render a model or a primitive shape. This Component attaches additional model geometry in to the scene graph below the Entity.
+     * @param {pc.ModelComponentSystem} system The ComponentSystem that created this Component
+     * @param {pc.Entity} entity The Entity that this Component is attached to.
+     * @extends pc.Component
+     * @property {String} type The type of the model, which can be one of the following values:
+     * <ul>
+     *     <li>asset: The component will render a model asset</li>
+     *     <li>box: The component will render a box</li>
+     *     <li>capsule: The component will render a capsule</li>
+     *     <li>cone: The component will render a cone</li>
+     *     <li>cylinder: The component will render a cylinder</li>
+     *     <li>sphere: The component will render a sphere</li>
+     * </ul>
+     * @property {pc.Asset} asset The asset for the model (only applies to models of type 'asset') - can also be an asset id.
+     * @property {Boolean} castShadows If true, this model will cast shadows for lights that have shadow casting enabled.
+     * @property {Boolean} receiveShadows If true, shadows will be cast on this model
+     * @property {Number} materialAsset The material {@link pc.Asset} that will be used to render the model (not used on models of type 'asset')
+     * @property {pc.Model} model The model that is added to the scene graph. It can be not set or loaded, so will return null.
+     * @property {Object} mapping A dictionary that holds material overrides for each mesh instance. Only applies to model components of type 'asset'. The mapping contains pairs of mesh instance index - material asset id.
+     * @property {Boolean} castShadowsLightmap If true, this model will cast shadows when rendering lightmaps
+     * @property {Boolean} lightmapped If true, this model will be lightmapped after using lightmapper.bake()
+     * @property {Number} lightmapSizeMultiplier Lightmap resolution multiplier
+     * @property {Boolean} isStatic Mark model as non-movable (optimization)
+     * @property {pc.MeshInstance[]} meshInstances An array of meshInstances contained in the component's model. If model is not set or loaded for component it will return null.
+     * @property {Number} batchGroupId Assign model to a specific batch group (see {@link pc.BatchGroup}). Default value is -1 (no group).
+     */
+    class ModelComponent extends pc.Component {
+        constructor(system: pc.ModelComponentSystem, entity: pc.Entity)
+
+        type: string;
+        asset: pc.Asset;
+        castShadows: boolean;
+        receiveShadows: boolean;
+        materialAsset: number;
+        model: pc.Model;
+        mapping: {};
+        castShadowsLightmap: boolean;
+        lightmapped: boolean;
+        lightmapSizeMultiplier: number;
+        isStatic: boolean;
+        meshInstances: pc.MeshInstance[];
+        batchGroupId: number;
+
+        /**
+        * @function
+        * @name pc.ModelComponent#hide
+        * @description Stop rendering model without removing it from the scene hierarchy.
+        * This method sets the {@link pc.MeshInstance#visible} property of every MeshInstance in the model to false
+        * Note, this does not remove the model or mesh instances from the scene hierarchy or draw call list.
+        * So the model component still incurs some CPU overhead.
+        * @example
+        *   this.timer = 0;
+        *   this.visible = true;
+        *   // ...
+        *   // blink model every 0.1 seconds
+        *   this.timer += dt;
+        *   if (this.timer > 0.1) {
+        *       if (!this.visible) {
+        *           this.entity.model.show();
+        *           this.visible = true;
+        *       } else {
+        *           this.entity.model.hide();
+        *           this.visible = false;
+        *       }
+        *       this.timer = 0;
+        *   }
+        */
+        hide(): void;
+
+        /**
+        * @function
+        * @name pc.ModelComponent#show
+        * @description Enable rendering of the model if hidden using {@link pc.ModelComponent#hide}.
+        * This method sets all the {@link pc.MeshInstance#visible} property on all mesh instances to true.
+        */
+        show(): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/model/system.d.ts b/types/playcanvas/engine/framework/components/model/system.d.ts
new file mode 100644
index 0000000000..5b2ae4b11b
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/model/system.d.ts
@@ -0,0 +1,14 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ModelComponentSystem
+     * @description Create a new ModelComponentSystem
+     * @class Allows an Entity to render a model or a primitive shape like a box,
+     * capsule, sphere, cylinder, cone etc.
+     * @param {pc.Application} app The Application.
+     * @extends pc.ComponentSystem
+     */
+    class ModelComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/particle-system/component.d.ts b/types/playcanvas/engine/framework/components/particle-system/component.d.ts
new file mode 100644
index 0000000000..a6adbc2cb4
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/particle-system/component.d.ts
@@ -0,0 +1,168 @@
+declare namespace pc {
+
+    /**
+     * @component
+     * @name pc.ParticleSystemComponent
+     * @description Create a new ParticleSystemComponent
+     * @class Used to simulate particles and produce renderable particle mesh on either CPU or GPU.
+     * GPU simulation is generally much faster than its CPU counterpart, because it avoids slow CPU-GPU synchronization and takes advantage of many GPU cores.
+     * However, it requires client to support reasonable uniform count, reading from multiple textures in vertex shader and OES_texture_float extension, including rendering into float textures.
+     * Most mobile devices fail to satisfy these requirements, so it's not recommended to simulate thousands of particles on them. GPU version also can't sort particles, so enabling sorting forces CPU mode too.
+     * Particle rotation is specified by a single angle parameter: default billboard particles rotate around camera facing axis, while mesh particles rotate around 2 different view-independent axes.
+     * Most of the simulation parameters are specified with pc.Curve or pc.CurveSet. Curves are interpolated based on each particle's lifetime, therefore parameters are able to change over time.
+     * Most of the curve parameters can also be specified by 2 minimum/maximum curves, this way each particle will pick a random value in-between.
+     * @param {pc.ParticleSystemComponentSystem} system The ComponentSystem that created this Component
+     * @param {pc.Entity} entity The Entity this Component is attached to
+     * @extends pc.Component
+     * @property {Boolean} autoPlay Controls whether the particle system plays automatically on creation. If set to false, it is necessary to call {@link pc.ParticleSystemComponent#play} for the particle system to play. Defaults to true.
+     * @property {Boolean} loop Enables or disables respawning of particles.
+     * @property {Boolean} preWarm If enabled, the particle system will be initialized as though it had already completed a full cycle. This only works with looping particle systems.
+     * @property {Boolean} lighting If enabled, particles will be lit by ambient and directional lights.
+     * @property {Boolean} halfLambert Enabling Half Lambert lighting avoids particles looking too flat in shadowed areas. It is a completely non-physical lighting model but can give more pleasing visual results.
+     * @property {Boolean} alignToMotion Orient particles in their direction of motion.
+     * @property {Boolean} depthWrite If enabled, the particles will write to the depth buffer. If disabled, the depth buffer is left unchanged and particles will be guaranteed to overwrite one another in the order in which they are rendered.
+     * @property {Boolean} noFog Disable fogging
+     * @property {Number} numParticles Maximum number of simulated particles.
+     * @property {Number} rate Minimal interval in seconds between particle births.
+     * @property {Number} rate2 Maximal interval in seconds between particle births.
+     * @property {Number} startAngle Minimal initial Euler angle of a particle.
+     * @property {Number} startAngle2 Maximal initial Euler angle of a particle.
+     * @property {Number} lifetime The length of time in seconds between a particle's birth and its death.
+     * @property {Number} stretch A value in world units that controls the amount by which particles are stretched based on their velocity. Particles are stretched from their center towards their previous position.
+     * @property {Number} intensity Color multiplier.
+     * @property {Boolean} animLoop Controls whether the sprite sheet animation plays once or loops continuously.
+     * @property {Number} animTilesX Number of horizontal tiles in the sprite sheet.
+     * @property {Number} animTilesY Number of vertical tiles in the sprite sheet.
+     * @property {Number} animNumFrames Number of sprite sheet frames to play. It is valid to set the number of frames to a value less than animTilesX multiplied by animTilesY.
+     * @property {Number} animSpeed Sprite sheet animation speed. 1 = particle lifetime, 2 = twice during lifetime etc...
+     * @property {Number} depthSoftening Controls fading of particles near their intersections with scene geometry. This effect, when it's non-zero, requires scene depth map to be rendered. Multiple depth-dependent effects can share the same map, but if you only use it for particles, bear in mind that it can double engine draw calls.
+     * @property {Number} initialVelocity Defines magnitude of the initial emitter velocity. Direction is given by emitter shape.
+     * @property {pc.Vec3} emitterExtents (Only for EMITTERSHAPE_BOX) The extents of a local space bounding box within which particles are spawned at random positions.
+     * @property {Number} emitterRadius (Only for EMITTERSHAPE_SPHERE) The radius within which particles are spawned at random positions.
+     * @property {pc.Vec3} wrapBounds The half extents of a world space box volume centered on the owner entity's position. If a particle crosses the boundary of one side of the volume, it teleports to the opposite side.
+     * @property {pc.Texture} colorMap The color map texture to apply to all particles in the system. If no texture is assigned, a default spot texture is used.
+     * @property {pc.Texture} normalMap The normal map texture to apply to all particles in the system. If no texture is assigned, an approximate spherical normal is calculated for each vertex.
+     * @property {pc.EMITTERSHAPE} emitterShape Shape of the emitter. Defines the bounds inside which particles are spawned. Also affects the direction of initial velocity.
+     * <ul>
+     * <li><strong>{@link pc.EMITTERSHAPE_BOX}</strong>: Box shape parameterized by emitterExtents. Initial velocity is directed towards local Z axis.</li>
+     * <li><strong>{@link pc.EMITTERSHAPE_SPHERE}</strong>: Sphere shape parameterized by emitterRadius. Initial velocity is directed outwards from the center.</li>
+     * </ul>
+     * @property {pc.PARTICLESORT} sort Sorting mode. Forces CPU simulation, so be careful.
+     * <ul>
+     * <li><strong>{@link pc.PARTICLESORT_NONE}</strong>: No sorting, particles are drawn in arbitary order. Can be simulated on GPU.</li>
+     * <li><strong>{@link pc.PARTICLESORT_DISTANCE}</strong>: Sorting based on distance to the camera. CPU only.</li>
+     * <li><strong>{@link pc.PARTICLESORT_NEWER_FIRST}</strong>: Newer particles are drawn first. CPU only.</li>
+     * <li><strong>{@link pc.PARTICLESORT_OLDER_FIRST}</strong>: Older particles are drawn first. CPU only.</li>
+     * </ul>
+     * @property {pc.Mesh} mesh Triangular mesh to be used as a particle. Only first vertex/index buffer is used. Vertex buffer must contain local position at first 3 floats of each vertex.
+     * @property {pc.BLEND} blend Blending mode.
+     * @property {pc.CurveSet} localVelocityGraph Velocity relative to emitter over lifetime.
+     * @property {pc.CurveSet} localVelocityGraph2 If not null, particles pick random values between localVelocityGraph and localVelocityGraph2.
+     * @property {pc.CurveSet} velocityGraph World-space velocity over lifetime.
+     * @property {pc.CurveSet} velocityGraph2 If not null, particles pick random values between velocityGraph and velocityGraph2.
+     * @property {pc.CurveSet} colorGraph Color over lifetime.
+     * @property {pc.Curve} rotationSpeedGraph Rotation speed over lifetime.
+     * @property {pc.Curve} rotationSpeedGraph2 If not null, particles pick random values between rotationSpeedGraph and rotationSpeedGraph2.
+     * @property {pc.Curve} scaleGraph Scale over lifetime.
+     * @property {pc.Curve} scaleGraph2 If not null, particles pick random values between scaleGraph and scaleGraph2.
+     * @property {pc.Curve} alphaGraph Alpha over lifetime.
+     * @property {pc.Curve} alphaGraph2 If not null, particles pick random values between alphaGraph and alphaGraph2.
+     */
+    class ParticleSystemComponent extends pc.Component {
+        constructor(system: pc.ParticleSystemComponentSystem, entity: pc.Entity)
+
+        autoPlay: boolean;
+        loop: boolean;
+        preWarm: boolean;
+        lighting: boolean;
+        halfLambert: boolean;
+        alignToMotion: boolean;
+        depthWrite: boolean;
+        noFog: boolean;
+        numParticles: number;
+        rate: number;
+        rate2: number;
+        startAngle: number;
+        startAngle2: number;
+        lifetime: number;
+        stretch: number;
+        intensity: number;
+        animLoop: boolean;
+        animTilesX: number;
+        animTilesY: number;
+        animNumFrames: number;
+        animSpeed: number;
+        depthSoftening: number;
+        initialVelocity: number;
+        emitterExtents: pc.Vec3;
+        emitterRadius: number;
+        wrapBounds: pc.Vec3;
+        colorMap: pc.Texture;
+        normalMap: pc.Texture;
+        emmitterShape: number;
+        sort: number;
+        mesh: pc.Mesh;
+        blend: number;
+        localVelocityGraph: pc.CurveSet;
+        localVelocityGraph2: pc.CurveSet;
+        velocityGraph: pc.CurveSet;
+        velocityGraph2: pc.CurveSet;
+        colorGraph: pc.CurveSet;
+        rotationSpeedGraph: pc.Curve;
+        rotationSpeedGraph2: pc.Curve;
+        scaleGraph: pc.Curve;
+        scaleGraph2: pc.Curve;
+        alphaGraph: pc.Curve;
+        alphaGraph2: pc.Curve;
+
+        /**
+        * @function
+        * @name pc.ParticleSystemComponent#reset
+        * @description Resets particle state, doesn't affect playing.
+        */
+        reset(): void;
+
+        /**
+        * @function
+        * @name pc.ParticleSystemComponent#stop
+        * @description Disables the emission of new particles, lets existing to finish their simulation.
+        */
+        stop(): void;
+
+        /**
+        * @function
+        * @name pc.ParticleSystemComponent#pause
+        * @description Freezes the simulation.
+        */
+        pause(): void;
+
+        /**
+        * @function
+        * @name pc.ParticleSystemComponent#unpause
+        * @description Unfreezes the simulation.
+        */
+        unpause(): void;
+
+        /**
+        * @function
+        * @name pc.ParticleSystemComponent#play
+        * @description Enables/unfreezes the simulation.
+        */
+        play(): void;
+
+        /**
+        * @function
+        * @name pc.ParticleSystemComponent#isPlaying
+        * @description Checks if simulation is in progress.
+        */
+        isPlaying(): void;
+
+        /**
+        * @private
+        * @function
+        * @name pc.ParticleSystemComponent#rebuild
+        * @description Rebuilds all data used by this particle system.
+        */
+        private rebuild(): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/particle-system/system.d.ts b/types/playcanvas/engine/framework/components/particle-system/system.d.ts
new file mode 100644
index 0000000000..576e5ded6b
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/particle-system/system.d.ts
@@ -0,0 +1,13 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ParticleSystemComponentSystem
+     * @description Create a new ParticleSystemComponentSystem
+     * @class Allows an Entity to render a particle system
+     * @param {pc.Application} app The Application.
+     * @extends pc.ComponentSystem
+     */
+    class ParticleSystemComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/registry.d.ts b/types/playcanvas/engine/framework/components/registry.d.ts
new file mode 100644
index 0000000000..cf74a651b0
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/registry.d.ts
@@ -0,0 +1,39 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ComponentSystemRegistry
+     * @class Store, access and delete instances of the various ComponentSystems
+     * @description Create a new ComponentSystemRegistry
+     */
+    class ComponentSystemRegistry {
+
+        /**
+         * @private
+         * @function
+         * @name pc.ComponentSystemRegistry#add
+         * @description Add a new Component type
+         * @param {Object} name The name of the Component
+         * @param {Object} component The {pc.ComponentSystem} instance
+         */
+        private add(name: string, system: pc.ComponentSystem): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.ComponentSystemRegistry#remove
+         * @description Remove a Component type
+         * @param {Object} name The name of the Component remove
+         */
+        remove(name: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.ComponentSystemRegistry#list
+         * @description Return the contents of the registry as an array, this order of the array
+         * is the order in which the ComponentSystems must be initialized.
+         * @returns {pc.ComponentSystem[]} An array of component systems.
+         */
+        list(): pc.ComponentSystem[];
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/rigid-body.d.ts/component.d.ts b/types/playcanvas/engine/framework/components/rigid-body.d.ts/component.d.ts
new file mode 100644
index 0000000000..ff98a9437d
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/rigid-body.d.ts/component.d.ts
@@ -0,0 +1,366 @@
+declare namespace pc {
+    type rigidBodyType = 'pc.BODYTYPE_STATIC' | 'pc.BODYTYPE_DYNAMIC' | 'pc.BODYTYPE_KINEMATIC'
+
+    /**
+     * @component
+     * @name pc.RigidBodyComponent
+     * @description Create a new RigidBodyComponent
+     * @class The rigidbody component, when combined with a {@link pc.CollisionComponent}, allows your
+     * entities to be simulated using realistic physics.
+     * A rigidbody component will fall under gravity and collide with other rigid bodies. Using scripts, you
+     * can apply forces and impulses to rigid bodies.
+     * @param {pc.RigidBodyComponentSystem} system The ComponentSystem that created this component
+     * @param {pc.Entity} entity The entity this component is attached to
+     * @extends pc.Component
+     * @property {Number} mass The mass of the body. This is only relevant for {@link pc.BODYTYPE_DYNAMIC}
+     * bodies, other types have infinite mass. Defaults to 1.
+     * @property {pc.Vec3} linearVelocity Defines the speed of the body in a given direction.
+     * @property {pc.Vec3} angularVelocity Defines the rotational speed of the body around each world axis.
+     * @property {Number} linearDamping Controls the rate at which a body loses linear velocity over time.
+     * Defaults to 0.
+     * @property {Number} angularDamping Controls the rate at which a body loses angular velocity over time.
+     * Defaults to 0.
+     * @property {pc.Vec3} linearFactor Scaling factor for linear movement of the body in each axis.
+     * Defaults to 1 in all axes.
+     * @property {pc.Vec3} angularFactor Scaling factor for angular movement of the body in each axis.
+     * Defaults to 1 in all axes.
+     * @property {Number} friction The friction value used when contacts occur between two bodies. A higher
+     * value indicates more friction. Should be set in the range 0 to 1. Defaults to 0.5.
+     * @property {Number} restitution Influences the amount of energy lost when two rigid bodies collide. The
+     * calculation multiplies the restitution values for both colliding bodies. A multiplied value of 0 means
+     * that all energy is lost in the collision while a value of 1 means that no energy is lost. Should be
+     * set in the range 0 to 1. Defaults to 0.
+     * @property {Number} group The collision group this body belongs to. Combine the group and the mask to
+     * prevent bodies colliding with each other. Defaults to 1.
+     * @property {Number} mask The collision mask sets which groups this body collides with. It is a bitfield
+     * of 16 bits, the first 8 bits are reserved for engine use. Defaults to 65535.
+     * @property {String} type The rigid body type determines how the body is simulated. Can be:
+     * <ul>
+     *     <li>pc.BODYTYPE_STATIC: infinite mass and cannot move.</li>
+     *     <li>pc.BODYTYPE_DYNAMIC: simulated according to applied forces.</li>
+     *     <li>pc.BODYTYPE_KINEMATIC: infinite mass and does not respond to forces but can still be moved by setting their velocity or position.</li>
+     * </ul>
+     * Defaults to pc.BODYTYPE_STATIC.
+     */
+    class RigidBodyComponent extends pc.Component {
+        constructor(system: pc.RigidBodyComponentSystem, entity: pc.Entity)
+
+        /**
+         * Controls the rate at which a body loses angular velocity over time. 
+         * @type {number}
+         * @memberof RigidBodyComponent
+         */
+        angularDamping: number;
+
+        /**
+         * Scaling factor for angular movement of the body in each axis.
+         * @type {pc.Vec3}
+         * @memberof RigidBodyComponent
+         */
+        angularFactor: pc.Vec3;
+
+        /**
+         * Defines the rotational speed of the body around each world axis. 
+         * @type {pc.Vec3}
+         * @memberof RigidBodyComponent
+         */
+        angularVelocity: pc.Vec3;
+
+        /**
+         * The friction value used when contacts occur between two bodies. A higher value
+         * indicates more friction. Should be set in the range 0 to 1. Defaults to 0.5.
+         * @type {number}
+         * @memberof RigidBodyComponent
+         */
+        friction: number;
+
+        /**
+         * The collision group this body belongs to. Combine the group and the mask to
+         * prevent bodies colliding with each other. Defaults to 1. 
+         * @type {number}
+         * @memberof RigidBodyComponent
+         */
+        group: number;
+
+        /**
+         * Controls the rate at which a body loses linear velocity over time.
+         * Defaults to 0.
+         * @type {number}
+         * @memberof RigidBodyComponent
+         */
+        linearDamping: number;
+
+        /**
+         * Scaling factor for linear movement of the body in each axis.
+         * Defaults to 1 in all axes.
+         * @type {pc.Vec3}
+         * @memberof RigidBodyComponent
+         */
+        linearFactor: pc.Vec3;
+
+        /**
+         * Defines the speed of the body in a given direction.
+         * @type {pc.Vec3}
+         * @memberof RigidBodyComponent
+         */
+        linearVelocity: pc.Vec3;
+
+        /**
+         * The collision mask sets which groups this body collides with. It is a bitfield
+         * of 16 bits, the first 8 bits are reserved for engine use. Defaults to 65535.
+         * @type {number}
+         * @memberof RigidBodyComponent
+         */
+        mask: number;
+
+        /**
+         * The mass of the body. This is only relevant for {@link pc.BODYTYPE_DYNAMIC}
+         * bodies, other types have infinite mass. Defaults to 1.
+         * @type {number}
+         * @memberof RigidBodyComponent
+         */
+        mass: number;
+
+        /**
+         * Influences the amount of energy lost when two rigid bodies collide. The
+         * calculation multiplies the restitution values for both colliding bodies. A multiplied value of 0 means
+         * that all energy is lost in the collision while a value of 1 means that no energy is lost. Should be
+         * set in the range 0 to 1. Defaults to 0.
+         * @type {number}
+         * @memberof RigidBodyComponent
+         */
+        restitution: number;
+
+        /**
+         * The rigid body type determines how the body is simulated. Can be:
+         * <ul>
+         *     <li>pc.BODYTYPE_STATIC: infinite mass and cannot move.</li>
+         *     <li>pc.BODYTYPE_DYNAMIC: simulated according to applied forces.</li>
+         *     <li>pc.BODYTYPE_KINEMATIC: infinite mass and does not respond to forces but can still be moved by setting their velocity or position.</li>
+         * </ul>
+         * Defaults to pc.BODYTYPE_STATIC.
+         * @type {string}
+         * @memberof RigidBodyComponent
+         */
+        type: rigidBodyType;
+
+
+
+        /**
+        * @private
+        * @function
+        * @name pc.RigidBodyComponent#createBody
+        * @description If the Entity has a Collision shape attached then create a rigid body using this shape. This method destroys the existing body.
+        */
+        private createBody(): void;
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponent#isActive
+        * @description Returns true if the rigid body is currently actively being simulated. i.e. not 'sleeping'
+        * @returns {Boolean} True if the body is active
+        */
+        isActive(): boolean;
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponent#activate
+        * @description Forcibly activate the rigid body simulation
+        */
+        activate(): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyForce
+         * @description Apply an force to the body at a point. By default, the force is applied at the origin of the
+         * body. However, the force can be applied at an offset this point by specifying a world space vector from
+         * the body's origin to the point of application.
+         * @param {Number} x The x component of the force to apply, in world space.
+         * @param {Number} y The y component of the force to apply, in world space.
+         * @param {Number} z The z component of the force to apply, in world space.
+         * @param {Number} [px] The x component of a world space offset from the body's position where the force is applied.
+         * @param {Number} [py] The y component of a world space offset from the body's position where the force is applied.
+         * @param {Number} [pz] The z component of a world space offset from the body's position where the force is applied.
+         * @example
+         * // EXAMPLE 1: Apply an approximation of gravity at the body's center
+         * this.entity.rigidbody.applyForce(0, -10, 0);
+         *
+         * // EXAMPLE 2: Apply an approximation of gravity at 1 unit down the world Z from the center of the body
+         * this.entity.rigidbody.applyForce(0, -10, 0, 0, 0, 1);
+         */
+        applyForce(x: number, y: number, z: number, px?: number, py?: number, pz?: number): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyForce^2
+         * @description Apply an force to the body at a point. By default, the force is applied at the origin of the
+         * body. However, the force can be applied at an offset this point by specifying a world space vector from
+         * the body's origin to the point of application.
+         * @param {pc.Vec3} force The force to apply, in world space.
+         * @param {pc.Vec3} [relativePoint] A world space offset from the body's position where the force is applied.
+         * @example
+         * // EXAMPLE 1: Apply a force at the body's center
+         * // Calculate a force vector pointing in the world space direction of the entity
+         * var force = this.entity.forward.clone().scale(100);
+         *
+         * // Apply the force
+         * this.entity.rigidbody.applyForce(force);
+         *
+         * // EXAMPLE 2: Apply a force at some relative offset from the body's center
+         * // Calculate a force vector pointing in the world space direction of the entity
+         * var force = this.entity.forward.clone().scale(100);
+         *
+         * // Calculate the world space relative offset
+         * var relativePos = new pc.Vec3();
+         * var childEntity = this.entity.findByName('Engine');
+         * relativePos.sub2(childEntity.getPosition(), this.entity.getPosition());
+         *
+         * // Apply the force
+         * this.entity.rigidbody.applyForce(force, relativePos);
+         */
+        applyForce(force: pc.Vec3, relativePoint: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyTorque
+         * @description Apply torque (rotational force) to the body.
+         * @param {Number} x The x component of the torque to apply, in world space.
+         * @param {Number} y The y component of the torque to apply, in world space.
+         * @param {Number} z The z component of the torque to apply, in world space.
+         */
+        applyTorque(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyTorque^2
+         * @description Apply torque (rotational force) to the body.
+         * @param {pc.Vec3} force The torque to apply, in world space.
+         */
+        applyTorque(force: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyImpulse
+         * @description Apply an impulse (instantaneous change of velocity) to the body at a point.
+         * @param {Number} x The x component of the impulse to apply, in world space.
+         * @param {Number} y The y component of the impulse to apply, in world space.
+         * @param {Number} z The z component of the impulse to apply, in world space.
+         * @param {Number} [px] The x component of the point at which to apply the impulse, in local space (relative to the Entity).
+         * @param {Number} [py] The y component of the point at which to apply the impulse, in local space (relative to the Entity).
+         * @param {Number} [pz] The z component of the point at which to apply the impulse, in local space (relative to the Entity).
+        */
+        applyImpulse(x: number, y: number, z: number, px?: number, py?: number, pz?: number): void;
+
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyImpulse^2
+         * @description Apply an impulse (instantaneous change of velocity) to the body at a point.
+         * @param {pc.Vec3} impulse The impulse to apply, in world space.
+         * @param {pc.Vec3} [relativePoint] The point at which to apply the impulse, in local space (relative to the entity).
+         */
+        applyImpulse(impulse: pc.Vec3, relativePoint?: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyTorqueImpulse
+         * @description Apply a torque impulse (rotational force applied instantaneously) to the body.
+         * @param {Number} x The x component of the torque impulse to apply, in world space.
+         * @param {Number} y The y component of the torque impulse to apply, in world space.
+         * @param {Number} z The z component of the torque impulse to apply, in world space.
+        */
+        applyTorqueImpulse(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#applyTorqueImpulse^2
+         * @description Apply a torque impulse (rotational force applied instantaneously) to the body.
+         * @param {pc.Vec3} torqueImpulse The torque impulse to apply, in world space.
+         */
+        applyTorqueImpulse(torqueImpulse: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#isStatic
+         * @description Returns true if the rigid body is of type {@link pc.BODYTYPE_STATIC}
+         * @returns {Boolean} True if static
+         */
+        isStatic(): boolean;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#isStaticOrKinematic
+         * @description Returns true if the rigid body is of type {@link pc.BODYTYPE_STATIC} or {@link pc.BODYTYPE_KINEMATIC}
+         * @returns {Boolean} True if static or kinematic
+         */
+        isStaticOrKinematic(): boolean;
+
+        /**
+         * @function
+         * @name pc.RigidBodyComponent#isKinematic
+         * @description Returns true if the rigid body is of type {@link pc.BODYTYPE_KINEMATIC}
+         * @returns {Boolean} True if kinematic
+         */
+        isKinematic(): boolean;
+
+
+        /**
+         * @private
+         * @function
+         * @name pc.RigidBodyComponent#syncEntityToBody
+         * @description Set the rigid body transform to be the same as the Entity transform.
+         * This must be called after any Entity transformation functions (e.g. {@link pc.Entity#setPosition}) are called
+         * in order to update the rigid body to match the Entity.
+         */
+        private syncEntityToBody(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.RigidBodyComponent#syncBodyToEntity
+         * @description Update the Entity transform from the rigid body.
+         * This is called internally after the simulation is stepped, to keep the Entity transform in sync with the rigid body transform.
+         */
+        private syncBodyToEntity(): void;
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponent#teleport
+        * @description Teleport an entity to a new position and/or orientation
+        * @param {pc.Vec3} position The new position
+        * @param {pc.Vec3} [angles] The new set of Euler angles
+        */
+        teleport(position: pc.Vec3, angles?: pc.Vec3): void;
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponent#teleport^2
+        * @description Teleport an entity to a new position and/or orientation
+        * @param {pc.Vec3} position The new position
+        * @param {pc.Quat} [rotation] The new rotation
+        */
+        teleport(position: pc.Vec3, rotation?: pc.Vec3): void;
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponent#teleport^3
+        * @description Teleport an entity to a new position and/or orientation
+        * @param {Number} x The new position x value
+        * @param {Number} y The new position y value
+        * @param {Number} z The new position z value
+        * @param {Number} [x] The new x angle value
+        * @param {Number} [y] The new y angle value
+        * @param {Number} [z] The new z angle value
+        */
+        teleport(x: number, y: number, z: number, ax?: number, ay?: number, az?: number): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.RigidBodyComponent#_updateKinematic
+         * @description Kinematic objects maintain their own linear and angular velocities. This method updates their transform
+         * based on their current velocity. It is called in every frame in the main physics update loop, after the simulation is stepped.
+         */
+        private _updateKinematic(dt: number): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/rigid-body.d.ts/constants.d.ts b/types/playcanvas/engine/framework/components/rigid-body.d.ts/constants.d.ts
new file mode 100644
index 0000000000..9ab24aa387
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/rigid-body.d.ts/constants.d.ts
@@ -0,0 +1,44 @@
+declare namespace pc {
+    // types
+    const BODYTYPE_STATIC = 'static';
+    const BODYTYPE_DYNAMIC = 'dynamic';
+    const BODYTYPE_KINEMATIC = 'kinematic';
+
+    // Collision flags
+    const BODYFLAG_STATIC_OBJECT = 1;
+    const BODYFLAG_KINEMATIC_OBJECT = 2;
+    const BODYFLAG_NORESPONSE_OBJECT = 4;
+
+    // Activation states
+    const BODYSTATE_ACTIVE_TAG = 1;
+    const BODYSTATE_ISLAND_SLEEPING = 2;
+    const BODYSTATE_WANTS_DEACTIVATION = 3;
+    const BODYSTATE_DISABLE_DEACTIVATION = 4;
+    const BODYSTATE_DISABLE_SIMULATION = 5;
+
+    // groups
+    const BODYGROUP_NONE = 0;
+    const BODYGROUP_DEFAULT = 1;
+    const BODYGROUP_DYNAMIC = 1;
+    const BODYGROUP_STATIC = 2;
+    const BODYGROUP_KINEMATIC = 4;
+    const BODYGROUP_ENGINE_1 = 8;
+    const BODYGROUP_TRIGGER = 16;
+    const BODYGROUP_ENGINE_2 = 32;
+    const BODYGROUP_ENGINE_3 = 64;
+    const BODYGROUP_USER_1 = 128;
+    const BODYGROUP_USER_2 = 256;
+    const BODYGROUP_USER_3 = 512;
+    const BODYGROUP_USER_4 = 1024;
+    const BODYGROUP_USER_5 = 2048;
+    const BODYGROUP_USER_6 = 4096;
+    const BODYGROUP_USER_7 = 8192;
+    const BODYGROUP_USER_8 = 16384;
+
+    // masks
+    const BODYMASK_NONE = 0;
+    const BODYMASK_ALL = 65535;
+    const BODYMASK_STATIC = 2;
+    const BODYMASK_NOT_STATIC: number;
+    const BODYMASK_NOT_STATIC_KINEMATIC: number;
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/rigid-body.d.ts/system.d.ts b/types/playcanvas/engine/framework/components/rigid-body.d.ts/system.d.ts
new file mode 100644
index 0000000000..62e0cf2ec2
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/rigid-body.d.ts/system.d.ts
@@ -0,0 +1,130 @@
+declare namespace pc {
+
+    /**
+    * @name pc.RaycastResult
+    * @class Object holding the result of a successful raycast hit
+    * @description Create a new RaycastResult
+    * @param {pc.Entity} entity The entity that was hit
+    * @param {pc.Vec3} point The point at which the ray hit the entity in world space
+    * @param {pc.Vec3} normal The normal vector of the surface where the ray hit in world space.
+    * @property {pc.Entity} entity The entity that was hit
+    * @property {pc.Vec3} point The point at which the ray hit the entity in world space
+    * @property {pc.Vec3} normal The normal vector of the surface where the ray hit in world space.
+    */
+    class RaycastResult {
+        constructor(entity: pc.Entity, point: pc.Vec3, normal: pc.Vec3)
+
+        entity: pc.Entity;
+        point: pc.Vec3;
+        normal: pc.Vec3;
+    }
+
+    /**
+    * @name pc.SingleContactResult
+    * @class Object holding the result of a contact between two rigid bodies
+    * @description Create a new SingleContactResult
+    * @param {pc.Entity} a The first entity involved in the contact
+    * @param {pc.Entity} b The second entity involved in the contact
+    * @param {pc.ContactPoint} contactPoint The contact point between the two entities
+    * @property {pc.Entity} a The first entity involved in the contact
+    * @property {pc.Entity} b The second entity involved in the contact
+    * @property {pc.Vec3} localPointA The point on Entity A where the contact occurred, relative to A
+    * @property {pc.Vec3} localPointB The point on Entity B where the contact occurred, relative to B
+    * @property {pc.Vec3} pointA The point on Entity A where the contact occurred, in world space
+    * @property {pc.Vec3} pointB The point on Entity B where the contact occurred, in world space
+    * @property {pc.Vec3} normal The normal vector of the contact on Entity B, in world space
+    */
+    class SingleContactResult {
+        constructor(a: pc.Entity, b: pc.Entity, contactPoint: pc.ContactPoint)
+
+        a: pc.Entity;
+        b: pc.Entity;
+        localPointA: pc.Vec3;
+        localPointB: pc.Vec3;
+        pointA: pc.Vec3;
+        pointB: pc.Vec3;
+        normal: pc.Vec3
+    }
+
+    /**
+    * @name pc.ContactPoint
+    * @class Object holding the result of a contact between two Entities.
+    * @description Create a new ContactPoint
+    * @param {pc.Vec3} localPoint The point on the entity where the contact occurred, relative to the entity
+    * @param {pc.Vec3} localPointOther The point on the other entity where the contact occurred, relative to the other entity
+    * @param {pc.Vec3} point The point on the entity where the contact occurred, in world space
+    * @param {pc.Vec3} pointOther The point on the other entity where the contact occurred, in world space
+    * @param {pc.Vec3} normal The normal vector of the contact on the other entity, in world space
+    * @property {pc.Vec3} localPoint The point on the entity where the contact occurred, relative to the entity
+    * @property {pc.Vec3} localPointOther The point on the other entity where the contact occurred, relative to the other entity
+    * @property {pc.Vec3} point The point on the entity where the contact occurred, in world space
+    * @property {pc.Vec3} pointOther The point on the other entity where the contact occurred, in world space
+    * @property {pc.Vec3} normal The normal vector of the contact on the other entity, in world space
+    */
+    class ContactPoint {
+        constructor(localPoint: pc.Vec3, localPointOther: pc.Vec3, point: pc.Vec3, pointOther: pc.Vec3, normal: pc.Vec3)
+
+        localPoint: pc.Vec3;
+        localPointOther: pc.Vec3;
+        point: pc.Vec3;
+        pointOther: pc.Vec3;
+        normal: pc.Vec3;
+    }
+
+    /**
+    * @name pc.ContactResult
+    * @class Object holding the result of a contact between two Entities
+    * @description Create a new ContactResult
+    * @param {pc.Entity} other The entity that was involved in the contact with this entity
+    * @param {pc.ContactPoint[]} contacts An array of ContactPoints with the other entity
+    * @property {pc.Entity} other The entity that was involved in the contact with this entity
+    * @property {pc.ContactPoint[]} contacts An array of ContactPoints with the other entity
+    */
+    class ContactResult {
+        constructor(other: pc.Entity, contacts: pc.ContactPoint[])
+
+        other: pc.Entity;
+        contacts: pc.ContactPoint[];
+    }
+
+    /**
+     * @name pc.RigidBodyComponentSystem
+     * @description Create a new RigidBodyComponentSystem
+     * @class The RigidBodyComponentSystem maintains the dynamics world for simulating rigid bodies, it also controls global values for the world such as gravity.
+     * Note: The RigidBodyComponentSystem is only valid if 3D Physics is enabled in your application. You can enable this in the application settings for your Depot.
+     * @param {pc.Application} app The Application
+     * @extends pc.ComponentSystem
+     */
+    class RigidBodyComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponentSystem#setGravity
+        * @description Set the gravity vector for the 3D physics world
+        * @param {Number} x The x-component of the gravity vector
+        * @param {Number} y The y-component of the gravity vector
+        * @param {Number} z The z-component of the gravity vector
+        */
+        setGravity(x: number, y: number, z: number): void;
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponentSystem#setGravity^2
+        * @description Set the gravity vector for the 3D physics world
+        * @param {pc.Vec3} gravity The gravity vector to use for the 3D physics world.
+        */
+        setGravity(gravity: pc.Vec3): void;
+
+        /**
+        * @function
+        * @name pc.RigidBodyComponentSystem#raycastFirst
+        * @description Raycast the world and return the first entity the ray hits. Fire a ray into the world from start to end,
+        * if the ray hits an entity with a rigidbody component, it returns a {@link pc.RaycastResult}, otherwise returns null.
+        * @param {pc.Vec3} start The world space point where the ray starts
+        * @param {pc.Vec3} end The world space point where the ray ends
+        * @returns {pc.RaycastResult} The result of the raycasting or null if there was no hit.
+        */
+        raycastFirst(start: pc.Vec3, end: pc.Vec3): pc.RaycastResult;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/screen/component.d.ts b/types/playcanvas/engine/framework/components/screen/component.d.ts
new file mode 100644
index 0000000000..049c550db8
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/screen/component.d.ts
@@ -0,0 +1,47 @@
+declare namespace pc {
+
+    /**
+     * @enum pc.SCALEMODE
+     * @name pc.SCALEMODE_NONE
+     * @description Always use the application's resolution as the resolution for the {@link pc.ScreenComponent}.
+     */
+    const SCALEMODE_NONE = "none";
+    /**
+     * @enum pc.SCALEMODE
+     * @name pc.SCALEMODE_BLEND
+     * @description Scale the {@link pc.ScreenComponent} when the application's resolution is different than the ScreenComponent's referenceResolution.
+     */
+    const SCALEMODE_BLEND = "blend";
+
+    /**
+     * @component
+     * @name pc.ScreenComponent
+     * @description Create a new ScreenComponent
+     * @class A ScreenComponent enables the Entity to render child {@link pc.ElementComponent}s using anchors and positions in the ScreenComponent's space.
+     * @param {pc.ScreenComponentSystem} system The ComponentSystem that created this Component
+     * @param {pc.Entity} entity The Entity that this Component is attached to.
+     * @extends pc.Component
+     * @property {Boolean} screenSpace If true then the ScreenComponent will render its child {@link pc.ElementComponent}s in screen space instead of world space. Enable this to create 2D user interfaces.
+     * @property {String} scaleMode Can either be {@link pc.SCALEMODE_NONE} or {@link pc.SCALEMODE_BLEND}. See the description of referenceResolution for more information.
+     * @property {Number} scaleBlend A value between 0 and 1 that is used when scaleMode is equal to {@link pc.SCALEMODE_BLEND}. Scales the ScreenComponent with width as a reference (when value is 0), the height as a reference (when value is 1) or anything in between.
+     * @property {pc.Vec2} resolution The width and height of the ScreenComponent. When screenSpace is true the resolution will always be equal to {@link pc.GraphicsDevice#width} x {@link pc.GraphicsDevice#height}.
+     * @property {pc.Vec2} referenceResolution The resolution that the ScreenComponent is designed for. This is only taken into account when screenSpace is true and scaleMode is {@link pc.SCALEMODE_BLEND}. If the actual resolution is different then the ScreenComponent will be scaled according to the scaleBlend value.
+     */
+    class ScreenComponent extends pc.Component {
+        constructor(system: pc.ScreenComponentSystem, entity: pc.Entity)
+
+        screenSpace: boolean;
+        scaleMode: string;
+        scaleBlend: number;
+        resolution: pc.Vec2;
+        referenceResolution: pc.Vec2;
+
+        /**
+         * @function
+         * @name pc.ScreenComponent#syncDrawOrder
+         * @description Set the drawOrder of each child {@link pc.ElementComponent}
+         * so that ElementComponents which are last in the hierarchy are rendered on top.
+         */
+        syncDrawOrder(): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/screen/system.d.ts b/types/playcanvas/engine/framework/components/screen/system.d.ts
new file mode 100644
index 0000000000..0b10ce156a
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/screen/system.d.ts
@@ -0,0 +1,13 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ScreenComponentSystem
+     * @description Create a new ScreenComponentSystem
+     * @class Manages creation of {@link pc.ScreenComponent}s.
+     * @param {pc.Application} app The application
+     * @extends pc.ComponentSystem
+     */
+    class ScreenComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/script/component.d.ts b/types/playcanvas/engine/framework/components/script/component.d.ts
new file mode 100644
index 0000000000..dbaf70b569
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/script/component.d.ts
@@ -0,0 +1,74 @@
+declare namespace pc {
+
+    /**
+    * @component
+    * @name pc.ScriptComponent
+    * @class The ScriptComponent allows you to extend the functionality of an Entity by attaching your own Script Types defined in JavaScript files
+    * to be executed with access to the Entity. For more details on scripting see <a href="//developer.playcanvas.com/user-manual/scripting/">Scripting</a>.
+    * @param {pc.ScriptComponentSystem} system The ComponentSystem that created this Component
+    * @param {pc.Entity} entity The Entity that this Component is attached to.
+    * @extends pc.Component
+    * @property {ScriptType[]} scripts An array of all script instances attached to an entity. This Array shall not be modified by developer.
+    */
+    class ScriptComponent extends pc.Component {
+        constructor(system: pc.ScriptComponentSystem, entity: pc.Entity)
+
+        scripts: ScriptType[]
+
+        /**
+         * @function
+         * @name pc.ScriptComponent#has
+         * @description Detect if script is attached to an entity using name of {@link ScriptType}.
+         * @param {String} name The name of the Script Type
+         * @returns {Boolean} If script is attached to an entity
+         * @example
+         * if (entity.script.has('playerController')) {
+         *     // entity has script
+         * }
+         */
+        has(name: string): boolean;
+
+        /**
+         * @function
+         * @name pc.ScriptComponent#create
+         * @description Create a script instance using name of a {@link ScriptType} and attach to an entity script component.
+         * @param {String} name The name of the Script Type
+         * @param {Object} [args] Object with arguments for a script
+         * @param {Boolean} [args.enabled] if script instance is enabled after creation
+         * @param {Object} [args.attributes] Object with values for attributes, where key is name of an attribute
+         * @returns {ScriptType} Returns an instance of a {@link ScriptType} if successfully attached to an entity,
+         * or null if it failed because a script with a same name has already been added
+         * or if the {@link ScriptType} cannot be found by name in the {@link pc.ScriptRegistry}.
+         * @example
+         * entity.script.create('playerController', {
+         *     attributes: {
+         *         speed: 4
+         *     }
+         * });
+         */
+        create(name: string, args?: { enabled?: boolean, attributes?: {}}): ScriptType;
+
+        /**
+         * @function
+         * @name pc.ScriptComponent#destroy
+         * @description Destroy the script instance that is attached to an entity.
+         * @param {String} name The name of the Script Type
+         * @returns {Boolean} If it was successfully destroyed
+         * @example
+         * entity.script.destroy('playerController');
+         */
+        destroy(name: string): boolean;        
+
+        /**
+         * @function
+         * @name pc.ScriptComponent#move
+         * @description Move script instance to different position to alter update order of scripts within entity.
+         * @param {String} name The name of the Script Type
+         * @param {Number} ind New position index
+         * @returns {Boolean} If it was successfully moved
+         * @example
+         * entity.script.move('playerController', 0);
+         */
+        move(name: string, ind: number): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/script/system.d.ts b/types/playcanvas/engine/framework/components/script/system.d.ts
new file mode 100644
index 0000000000..0c51f890e5
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/script/system.d.ts
@@ -0,0 +1,13 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ScriptComponentSystem
+     * @description Create a new ScriptComponentSystem
+     * @class Allows scripts to be attached to an Entity and executed
+     * @param {pc.Application} app The application
+     * @extends pc.ComponentSystem
+     */
+    class ScriptComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/sound/component.d.ts b/types/playcanvas/engine/framework/components/sound/component.d.ts
new file mode 100644
index 0000000000..0363d61a8f
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/sound/component.d.ts
@@ -0,0 +1,148 @@
+declare namespace pc {
+
+    /**
+    * @component
+    * @name pc.SoundComponent
+    * @class The Sound Component controls playback of {@link pc.Sound}s.
+    * @description Create a new Sound Component
+    * @param {pc.SoundComponentSystem} system The ComponentSystem that created this Component
+    * @param {pc.Entity} entity The entity that the Component is attached to
+    * @extends pc.Component
+    * @property {Number} volume The volume modifier to play the audio with. In range 0-1.
+    * @property {Number} pitch The pitch modifier to play the audio with. Must be larger than 0.01
+    * @property {Boolean} positional If true the audio will play back at the location of the Entity in space, so the audio will be affect by the position of the {@link pc.AudioListenerComponent}.
+    * @property {String} distanceModel Determines which algorithm to use to reduce the volume of the sound as it moves away from the listener. Can be one of {@link pc.DISTANCE_LINEAR}, {@link pc.DISTANCE_INVERSE} or {@link pc.DISTANCE_EXPONENTIAL}. Default is {@link pc.DISTANCE_LINEAR}.
+    * @property {Number} refDistance The reference distance for reducing volume as the sound source moves further from the listener.
+    * @property {Number} maxDistance The maximum distance from the listener at which audio falloff stops. Note the volume of the audio is not 0 after this distance, but just doesn't fall off anymore.
+    * @property {Number} rollOffFactor The factor used in the falloff equation.
+    * @property {Object} slots A dictionary that contains the {@link pc.SoundSlot}s managed by this Component.
+    */
+    class SoundComponent extends pc.Component {
+        constructor(system: pc.SoundComponentSystem, entity: pc.Entity)
+
+        volume: number;
+        pitch: number;
+        positional: boolean;
+        distanceModel: string;
+        refDistance: number;
+        maxDistance: number;
+        rollOffFactor: number;
+        slots: {};
+
+        /**
+         * @function
+         * @name pc.SoundComponent#addSlot
+         * @description Creates a new {@link pc.SoundSlot} with the specified name.
+         * @param {String} name The name of the slot
+         * @param {Object} options Settings for the slot
+         * @param {Number} [options.volume=1] The playback volume, between 0 and 1.
+         * @param {Number} [options.pitch=1] The relative pitch, default of 1, plays at normal pitch.
+         * @param {Boolean} [options.loop=false] If true the sound will restart when it reaches the end.
+         * @param {Number} [options.startTime=0] The start time from which the sound will start playing.
+         * @param {Number} [options.duration=null] The duration of the sound that the slot will play starting from startTime.
+         * @param {Boolean} [options.overlap=false] If true then sounds played from slot will be played independently of each other. Otherwise the slot will first stop the current sound before starting the new one.
+         * @param {Boolean} [options.autoPlay=false] If true the slot will start playing as soon as its audio asset is loaded.
+         * @param {Number} [options.asset=null] The asset id of the audio asset that is going to be played by this slot.
+         * @returns {pc.SoundSlot} The new slot.
+         * @example
+         * // get an asset by id
+         * var asset = app.assets.get(10);
+         * // add a slot
+         * this.entity.sound.addSlot('beep', {
+         *     asset: asset
+         * });
+         * // play
+         * this.entity.sound.play('beep');
+         */
+        addSlot(name: string, options?: {
+            volume?: number;
+            pitch?: number;
+            loop?: boolean;
+            startTime?: number;
+            duration?: number;
+            overlap?: boolean;
+            autoPlay?: boolean;
+            asset?: number;
+        }): pc.SoundSlot;
+
+        /**
+         * @function
+         * @name pc.SoundComponent#removeSlot
+         * @description Removes the {@link pc.SoundSlot} with the specified name.
+         * @param {String} name The name of the slot
+         * @example
+         * // remove a slot called 'beep'
+         * this.entity.sound.removeSlot('beep');
+         */
+        removeSlot(name: string): void;
+
+        /**
+         * @function
+         * @name pc.SoundComponent#slot
+         * @description Returns the slot with the specified name
+         * @param {String} name The name of the slot
+         * @returns {pc.SoundSlot} The slot
+         * @example
+         * // get a slot and set its volume
+         * this.entity.sound.slot('beep').volume = 0.5;
+         *
+         */
+        slot(name: string): pc.Slot;
+
+        /**
+        * @function
+        * @name pc.SoundComponent#play
+        * @description Begins playing the sound slot with the specified name. The slot will restart playing if it is already playing unless the overlap field is true in which case a new sound will be created and played.
+        * @param {String} name The name of the {@link pc.SoundSlot} to play
+        * @example
+        * // get asset by id
+        * var asset = app.assets.get(10);
+        * // create a slot and play it
+        * this.entity.sound.addSlot('beep', {
+        *     asset: asset
+        * });
+        * this.entity.sound.play('beep');
+        * @returns {pc.SoundInstance} The sound instance that will be played.
+        */
+        play(name: string): pc.SoundInstance;
+
+        /**
+        * @function
+        * @name pc.SoundComponent#pause
+        * @description Pauses playback of the slot with the specified name. If the name is undefined then all slots currently played will be paused. The slots can be resumed by calling {@link pc.SoundComponent#resume}.
+        * @param {String} [name] The name of the slot to pause. Leave undefined to pause everything.
+        * @example
+        * // pause all sounds
+        * this.entity.sound.pause();
+        * // pause a specific sound
+        * this.entity.sound.pause('beep');
+        */
+        pause(name: string): void;
+
+        /**
+        * @function
+        * @name pc.SoundComponent#resume
+        * @description Resumes playback of the sound slot with the specified name if it's paused. If no name is specified all slots will be resumed.
+        * @param {String} name The name of the slot to resume. Leave undefined to resume everything.
+        * @example
+        * // resume all sounds
+        * this.entity.sound.resume();
+        * // resume a specific sound
+        * this.entity.sound.resume('beep');
+        */
+        resume(name: string): void;
+
+        /**
+        * @function
+        * @name pc.SoundComponent#stop
+        * @description Stops playback of the sound slot with the specified name if it's paused. If no name is specified all slots will be stopped.
+        * @param {String} name The name of the slot to stop. Leave undefined to stop everything.
+        * @example
+        * // stop all sounds
+        * this.entity.sound.stop();
+        * // stop a specific sound
+        * this.entity.sound.stop('beep');
+        */
+        stop(name: string): void;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/sound/constants.d.ts b/types/playcanvas/engine/framework/components/sound/constants.d.ts
new file mode 100644
index 0000000000..94469f5f09
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/sound/constants.d.ts
@@ -0,0 +1,28 @@
+declare namespace pc {
+    /**
+     * @static
+     * @readOnly
+     * @name pc.DISTANCE_LINEAR
+     * @type String
+     * @description Linear distance model
+     */
+    const DISTANCE_LINEAR = 'linear';
+
+    /**
+     * @static
+     * @readonly
+     * @type String
+     * @name pc.DISTANCE_INVERSE
+     * @description Inverse distance model
+     */
+    const DISTANCE_INVERSE = 'inverse';
+
+    /**
+     * @static
+     * @readonly
+     * @type String
+     * @name pc.DISTANCE_EXPONENTIAL
+     * @description Exponential distance model
+     */
+    const DISTANCE_EXPONENTIAL = 'exponential';
+}
diff --git a/types/playcanvas/engine/framework/components/sound/slot.d.ts b/types/playcanvas/engine/framework/components/sound/slot.d.ts
new file mode 100644
index 0000000000..34f5c00463
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/sound/slot.d.ts
@@ -0,0 +1,135 @@
+declare namespace pc {
+
+    /**
+     * @name pc.SoundSlot
+     * @class The SoundSlot controls playback of an audio asset.
+     * @description Create a new SoundSlot
+     * @param {pc.SoundComponent} component The Component that created this slot.
+     * @param {String} name The name of the slot.
+     * @param {Object} options Settings for the slot
+     * @param {Number} [options.volume=1] The playback volume, between 0 and 1.
+     * @param {Number} [options.pitch=1] The relative pitch, default of 1, plays at normal pitch.
+     * @param {Boolean} [options.loop=false] If true the sound will restart when it reaches the end.
+     * @param {Number} [options.startTime=0] The start time from which the sound will start playing.
+     * @param {Number} [options.duration=null] The duration of the sound that the slot will play starting from startTime.
+     * @param {Boolean} [options.overlap=false] If true then sounds played from slot will be played independently of each other. Otherwise the slot will first stop the current sound before starting the new one.
+     * @param {Boolean} [options.autoPlay=false] If true the slot will start playing as soon as its audio asset is loaded.
+     * @param {Number} [options.asset=null] The asset id of the audio asset that is going to be played by this slot.
+     * @property {String} name The name of the slot
+     * @property {String} asset The asset id
+     * @property {Boolean} autoPlay If true the slot will begin playing as soon as it is loaded
+     * @property {Number} volume The volume modifier to play the sound with. In range 0-1.
+     * @property {Number} pitch The pitch modifier to play the sound with. Must be larger than 0.01
+     * @property {Number} startTime The start time from which the sound will start playing.
+     * @property {Number} duration The duration of the sound that the slot will play starting from startTime.
+     * @property {Boolean} loop If true the slot will restart when it finishes playing
+     * @property {Boolean} overlap If true then sounds played from slot will be played independently of each other. Otherwise the slot will first stop the current sound before starting the new one.
+     * @property {Boolean} isLoaded Returns true if the asset of the slot is loaded.
+     * @property {Boolean} isPlaying Returns true if the slot is currently playing.
+     * @property {Boolean} isPaused Returns true if the slot is currently paused.
+     * @property {Boolean} isStopped Returns true if the slot is currently stopped.
+     * @property {pc.SoundInstance[]} instances An array that contains all the {@link pc.SoundInstance}s currently being played by the slot.
+     */
+    class SoundSlot {
+        constructor(component: pc.SoundComponent, name: string, options?: {
+            volume?: number;
+            pitch?: number;
+            loop?: boolean;
+            startTime?: number;
+            duration?: number;
+            overlap?: boolean;
+            autoPlay?: boolean;
+            asset?: number;
+        })
+
+        name: string;
+        volume?: number;
+        pitch?: number;
+        loop?: boolean;
+        startTime?: number;
+        duration?: number;
+        overlap?: boolean;
+        autoPlay?: boolean;
+        asset?: number;
+        isLoading: boolean;
+        isPlaying: boolean;
+        isPaused: boolean;
+        isStopped: boolean;
+        instances: pc.SoundInstance[];
+
+        /**
+         * @function pc.SoundSlot#play
+         * @description Plays a sound. If {@link pc.SoundSlot#overlap} is true the new sound
+         * instance will be played independently of any other instances already playing.
+         * Otherwise existing sound instances will stop before playing the new sound.
+         * @return {pc.SoundInstance} The new sound instance
+         */
+        play(): pc.SoundInstance;
+
+        /**
+         * @function
+         * @name pc.SoundSlot#pause
+         * @description Pauses all sound instances. To continue playback call {@link pc.SoundSlot#resume}.
+         */
+        pause(): boolean;
+
+        /**
+         * @function
+         * @name pc.SoundSlot#resume
+         * @description Resumes playback of all paused sound instances.
+         * @returns {Boolean} True if any instances were resumed.
+         */
+        resume(): boolean;
+
+        /**
+         * @function
+         * @name pc.SoundSlot#stop
+         * @description Stops playback of all sound instances.
+         * @returns {Boolean} True if any instances were stopped.
+         */
+        stop(): boolean;
+
+        /**
+         * @function
+         * @name pc.SoundSlot#load
+         * @description Loads the asset assigned to this slot.
+         */
+        load(): void;
+
+        /**
+         * @function
+         * @name pc.SoundSlot#setExternalNodes
+         * @description Connect external Web Audio API nodes. Any sound played by this slot will
+         * automatically attach the specified nodes to the source that plays the sound. You need to pass
+         * the first node of the node graph that you created externally and the last node of that graph. The first
+         * node will be connected to the audio source and the last node will be connected to the destination of the AudioContext (e.g. speakers).
+         * @param {AudioNode} firstNode The first node that will be connected to the audio source of sound instances.
+         * @param {AudioNode} [lastNode] The last node that will be connected to the destination of the AudioContext.
+         * If unspecified then the firstNode will be connected to the destination instead.
+         * @example
+         * var context = app.systems.sound.context;
+         * var analyzer = context.createAnalyzer();
+         * var distortion = context.createWaveShaper();
+         * var filter = context.createBiquadFilter();
+         * analyzer.connect(distortion);
+         * distortion.connect(filter);
+         * slot.setExternalNodes(analyzer, filter);
+         */
+        setExternalNodes(firstNode: AudioNode, lastNode: AudioNode): void;
+
+        /**
+         * @function
+         * @name pc.SoundSlot#clearExternalNodes
+         * @description Clears any external nodes set by {@link pc.SoundSlot#setExternalNodes}.
+         */
+        clearExternalNodes(): void;
+
+        /**
+         * @function
+         * @name pc.SoundSlot#getExternalNodes
+         * @description Gets an array that contains the two external nodes set by {@link pc.SoundSlot#setExternalNodes}.
+         * @returns {AudioNode[]} An array of 2 elements that contains the first and last nodes set by {@link pc.SoundSlot#setExternalNodes}.
+         */
+        getExternalNodes(): [AudioNode, AudioNode];
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/sound/system.d.ts b/types/playcanvas/engine/framework/components/sound/system.d.ts
new file mode 100644
index 0000000000..ba419db57c
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/sound/system.d.ts
@@ -0,0 +1,22 @@
+declare namespace pc {
+
+    /**
+     * @name pc.SoundComponentSystem
+     * @class Manages creation of {@link pc.SoundComponent}s.
+     * @description Create a SoundComponentSystem
+     * @param {pc.Application} app The Application
+     * @param {pc.SoundManager} manager The sound manager
+     * @property {Number} volume Sets / gets the volume for the entire Sound system. All sounds will have their volume
+     * multiplied by this value. Valid between [0, 1].
+     * @property {AudioContext} context Gets the AudioContext currently used by the sound manager. Requires Web Audio API support.
+     * @property {pc.SoundManager} manager Gets / sets the sound manager
+     * @extends pc.ComponentSystem
+     */
+    class SoundComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application, manager: pc.SoundManager)
+
+        volume: number;
+        context: AudioContext;
+        manager: pc.SoundManager;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/system.d.ts b/types/playcanvas/engine/framework/components/system.d.ts
new file mode 100644
index 0000000000..572f387457
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/system.d.ts
@@ -0,0 +1,141 @@
+declare namespace pc {
+    /**
+     * @name pc.ComponentSystem
+     * @class Component Systems contain the logic and functionality to update all Components of a particular type
+     * @param {pc.Application} app The running Application
+     */
+    class ComponentSystem {
+        constructor(app: pc.Application)
+
+        /**
+         * @private
+         * @field
+         * @type Array
+         * @name pc.ComponentSystem#store
+         * @description The store where all {@link pc.ComponentData} objects are kept
+         */
+        private store: pc.ComponentData[];
+
+        /**
+         * @private
+         * @function
+         * @name pc.ComponentSystem#addComponent
+         * @description Create new {@link pc.Component} and {@link pc.ComponentData} instances and attach them to the entity
+         * @param {pc.Entity} entity The Entity to attach this component to
+         * @param {Object} data The source data with which to create the component
+         * @returns {pc.Component} Returns a Component of type defined by the component system
+         * @example
+         *   var entity = new pc.Entity(app);
+         *   app.systems.model.addComponent(entity, { type: 'box' });
+         *   // entity.model is now set to a pc.ModelComponent
+         */
+        private addComponent(entity: pc.Entity, data: {}): pc.Component;
+
+        /**
+         * @private
+         * @function
+         * @name pc.ComponentSystem#removeComponent
+         * @description Remove the {@link pc.Component} from the entity and delete the associated {@link pc.ComponentData}
+         * @param {pc.Entity} entity The entity to remove the component from
+         * @example
+         * app.systems.model.removeComponent(entity);
+         * // entity.model === undefined
+         */
+        private removeComponent(entity: pc.Entity): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.ComponentSystem#cloneComponent
+         * @description Create a clone of component. This creates a copy all ComponentData variables.
+         * @param {pc.Entity} entity The entity to clone the component from
+         * @param {pc.Entity} clone The entity to clone the component into
+         */
+        private cloneComponent(entity: pc.Entity, clone: pc.Entity): pc.Component;
+
+        /**
+         * @private
+         * @function
+         * @name pc.ComponentSystem#initializeComponentData
+         * @description Called during {@link pc.ComponentSystem#addComponent} to initialize the {@link pc.ComponentData} in the store
+         * This can be overridden by derived Component Systems and either called by the derived System or replaced entirely
+         */
+        private initializeComponentData(component: pc.Component, data: {}, properties: {}): void;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.ComponentSystem#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.ComponentSystem#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.ComponentSystem#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.ComponentSystem#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.ComponentSystem#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/text/font.d.ts b/types/playcanvas/engine/framework/components/text/font.d.ts
new file mode 100644
index 0000000000..9c310d2bb4
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/text/font.d.ts
@@ -0,0 +1,15 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Font
+    * @class Represents the resource of a font asset.
+    * @param {pc.Texture} texture The font texture
+    * @param {Object} data The font data
+    * @property {Number} intensity The font intensity
+    */
+    class Font {
+        constructor(texture: pc.Texture, data: {})
+
+        intensity: number;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/components/zone/component.d.ts b/types/playcanvas/engine/framework/components/zone/component.d.ts
new file mode 100644
index 0000000000..a1e223e448
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/zone/component.d.ts
@@ -0,0 +1,17 @@
+declare namespace pc {
+
+    /**
+    * @component
+    * @name pc.ZoneComponent
+    * @extends pc.Component
+    * @class The ZoneComponent allows you to define an area in world space of certain size.
+    * This can be used in various ways, such as affecting audio reverb when audiolistener is within zone.
+    * Or create culling system with portals between zones to hide whole indoor sections for performance reasons.
+    * And many other possible options. Zones are building blocks and meant to be used in many different ways.
+    * @param {pc.ZoneComponentSystem} system The ComponentSystem that created this Component
+    * @param {pc.Vec3} size The Size of Box of a Zone.
+    */
+    class ZoneComponent extends pc.Component {
+        constructor(system: ZoneComponentSystem, entity: pc.Entity)
+    }
+}
diff --git a/types/playcanvas/engine/framework/components/zone/system.d.ts b/types/playcanvas/engine/framework/components/zone/system.d.ts
new file mode 100644
index 0000000000..5e1d663c9a
--- /dev/null
+++ b/types/playcanvas/engine/framework/components/zone/system.d.ts
@@ -0,0 +1,13 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ZoneComponentSystem
+     * @description Create a new ZoneComponentSystem
+     * @class Defines zone in world.
+     * @param {pc.Application} app The application
+     * @extends pc.ComponentSystem
+     */
+    class ZoneComponentSystem extends pc.ComponentSystem {
+        constructor(app: pc.Application)
+    }
+}
diff --git a/types/playcanvas/engine/framework/entity.d.ts b/types/playcanvas/engine/framework/entity.d.ts
new file mode 100644
index 0000000000..0b1f12ae55
--- /dev/null
+++ b/types/playcanvas/engine/framework/entity.d.ts
@@ -0,0 +1,189 @@
+declare namespace pc {
+    type ComponentTypes = 'animation' | 'audiolistner' | 'camera' | 'collision' |
+        'element' | 'light' | 'model' | 'particlesystem' |
+        'rigidbody' | 'screen' | 'script' | 'sound' | 'zone';
+
+    /**
+     * @name pc.Entity
+     * @param {String} [name] The non-unique name of the entity, default is "Untitled".
+     * @param {pc.Application} [app] The application the entity belongs to, default is the current application.
+     * @class The Entity is the core primitive of a PlayCanvas game. Generally speaking an object in your game will consist of an {@link pc.Entity},
+     * and a set of {@link pc.Component}s which are managed by their respective {@link pc.ComponentSystem}s. One of those components maybe a
+     * {@link pc.ScriptComponent} which allows you to write custom code to attach to your Entity.
+     * <p>
+     * The Entity uniquely identifies the object and also provides a transform for position and orientation
+     * which it inherits from {@link pc.GraphNode} so can be added into the scene graph.
+     * The Component and ComponentSystem provide the logic to give an Entity a specific type of behavior. e.g. the ability to
+     * render a model or play a sound. Components are specific to an instance of an Entity and are attached (e.g. `this.entity.model`)
+     * ComponentSystems allow access to all Entities and Components and are attached to the {@link pc.Application}.
+     * </p>
+     *
+     * @example
+     * var app = ... // Get the pc.Application
+     *
+     * var entity = new pc.Entity();
+     *
+     * // Add a Component to the Entity
+     * entity.addComponent("camera", {
+     *   fov: 45,
+     *   nearClip: 1,
+     *   farClip: 10000
+     * });
+     *
+     * // Add the Entity into the scene graph
+     * app.root.addChild(entity);
+     *
+     * // Move the entity
+     * entity.translate(10, 0, 0);
+     *
+     * // Or translate it by setting it's position directly
+     * var p = entity.getPosition();
+     * entity.setPosition(p.x + 10, p.y, p.z);
+     *
+     * // Change the entity's rotation in local space
+     * var e = entity.getLocalEulerAngles();
+     * entity.setLocalEulerAngles(e.x, e.y + 90, e.z);
+     *
+     * // Or use rotateLocal
+     * entity.rotateLocal(0, 90, 0);
+     *
+     * @extends pc.GraphNode
+     */
+    class Entity extends pc.GraphNode {
+
+        constructor(name?: string, app?: pc.Application)
+        constructor(app?: pc.Application)
+
+        /**
+         * @function
+         * @name pc.Entity#addComponent
+         * @description Create a new component and add it to the entity.
+         * Use this to add functionality to the entity like rendering a model, playing sounds and so on.
+         * @param {String} type The name of the component to add. Valid strings are:
+         * <ul>
+         *   <li>"animation" - see {@link pc.AnimationComponent}</li>
+         *   <li>"audiolistener" - see {@link pc.AudioListenerComponent}</li>
+         *   <li>"camera" - see {@link pc.CameraComponent}</li>
+         *   <li>"collision" - see {@link pc.CollisionComponent}</li>
+         *   <li>"element" - see {@link pc.ElementComponent}</li>
+         *   <li>"light" - see {@link pc.LightComponent}</li>
+         *   <li>"model" - see {@link pc.ModelComponent}</li>
+         *   <li>"particlesystem" - see {@link pc.ParticleSystemComponent}</li>
+         *   <li>"rigidbody" - see {@link pc.RigidBodyComponent}</li>
+         *   <li>"screen" - see {@link pc.ScreenComponent}</li>
+         *   <li>"script" - see {@link pc.ScriptComponent}</li>
+         *   <li>"sound" - see {@link pc.SoundComponent}</li>
+         *   <li>"zone" - see {@link pc.ZoneComponent}</li>
+         * </ul>
+         * @param {Object} data The initialization data for the specific component type. Refer to each
+         * specific component's API reference page for details on valid values for this parameter.
+         * @returns {pc.Component} The new Component that was attached to the entity
+         * @example
+         * var entity = new pc.Entity();
+         * entity.addComponent("light"); // Add a light component with default properties
+         * entity.addComponent("camera", { // Add a camera component with some specified properties
+         *   fov: 45,
+         *   clearColor: new pc.Color(1,0,0),
+         * });
+         */
+        addComponent(type: pc.ComponentTypes, data?: any): pc.Component;
+
+        /**
+         * @function
+         * @name pc.Entity#removeComponent
+         * @description Remove a component from the Entity.
+         * @param {String} type The name of the Component type
+         * @example
+         * var entity = new pc.Entity();
+         * entity.addComponent("light"); // add new light component
+         * //...
+         * entity.removeComponent("light"); // remove light component
+         */
+        removeComponent(type: pc.ComponentTypes): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Entity#getGuid
+         * @description Get the GUID value for this Entity
+         * @returns {String} The GUID of the Entity
+         */
+        private getGuid(): string;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Entity#setGuid
+         * @description Set the GUID value for this Entity.
+         *
+         * N.B. It is unlikely that you should need to change the GUID value of an Entity at run-time. Doing so will corrupt the graph this Entity is in.
+         * @param {String} guid The GUID to assign to the Entity
+         */
+        setGuid(guid: string): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Entity#setRequest
+         * @description Used during resource loading to ensure that child resources of Entities are tracked
+         * @param {ResourceRequest} request The request being used to load this entity
+         */
+        private setRequest(request: any): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Entity#getRequest
+         * @description Get the Request that is being used to load this Entity
+         * @returns {ResourceRequest} The Request
+         */
+        private getRequest(): any;
+
+        /**
+         * @function
+         * @name pc.Entity#findByGuid
+         * @description Find a descendant of this Entity with the GUID
+         * @returns {pc.Entity} The Entity with the GUID or null
+         */
+        findByGuid(guid: string): pc.Entity;
+
+        /**
+        * @function
+        * @name pc.Entity#destroy
+        * @description Remove all components from the Entity and detach it from the Entity hierarchy. Then recursively destroy all ancestor Entities
+        * @example
+        * var firstChild = this.entity.children[0];
+        * firstChild.destroy(); // delete child, all components and remove from hierarchy
+        */
+        destroy(): void;
+
+        /**
+        * @function
+        * @name pc.Entity#clone
+        * @description Create a deep copy of the Entity. Duplicate the full Entity hierarchy, with all Components and all descendants.
+        * Note, this Entity is not in the hierarchy and must be added manually.
+        * @returns {pc.Entity} A new Entity which is a deep copy of the original.
+        * @example
+        *   var e = this.entity.clone(); // Clone Entity
+        *   this.entity.parent.addChild(e); // Add it as a sibling to the original
+        */
+        clone(): pc.Entity;
+                
+
+        // Possible attached components
+        animation: pc.AnimationComponent;
+        audiolistner: pc.AudioListenerComponent;
+        camera: pc.CameraComponent;
+        collision: pc.CollisionComponent;
+        element: pc.ElementComponent;
+        light: pc.LightComponent;
+        model: pc.ModelComponent;
+        particlesystem: pc.ParticleSystemComponent;
+        rigidbody: pc.RigidBodyComponent;
+        screen: pc.ScreenComponent;
+        script: pc.ScriptComponent;
+        sound: pc.SoundComponent;
+        zone: pc.ZoneComponent;
+
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/framework/script.d.ts b/types/playcanvas/engine/framework/script.d.ts
new file mode 100644
index 0000000000..30c6da8f0f
--- /dev/null
+++ b/types/playcanvas/engine/framework/script.d.ts
@@ -0,0 +1,114 @@
+declare namespace pc {
+
+    /**
+     * @name pc.script
+     * @namespace
+     * @description Functions for creating user scripts for the script component
+     * @property {Boolean} legacy If True, then engine will use legacy scripting system, defaults to true (subject to change)
+     */
+    namespace script {
+
+        /**
+         * @function
+         * @name pc.script.create
+         * @description Create a script resource object. A script file should contain a single call to pc.script.create and the callback should return a script object which will be
+         * instantiated when attached to Entities.
+         * @param {String} name The name of the script object.
+         * @param {Function} callback The callback function which is passed an {pc.Application} object,
+         * which is used to access Entities and Components, and should return the Type of the script resource
+         * to be instanced for each Entity.
+         * @example
+         * pc.script.create( function (app) {
+         *  var Scriptable = function (entity) {
+         *      // store entity
+         *      this.entity = entity;
+         *
+         *      // use app
+         *      app.components.model.addComponent(entity, {...});
+         *  };
+         *
+         *  return Scriptable;
+         * }
+         */
+        function create(name: string, callback: Function): void;
+
+        /**
+        * @function
+        * @name pc.script.attribute
+        * @description Creates a script attribute for the current script. The script attribute can be accessed
+        * inside the script instance like so 'this.attributeName' or outside a script instance like so 'entity.script.attributeName'.
+        * Script attributes can be edited from the Attribute Editor of the PlayCanvas Editor like normal Components.
+        * @param {String} name The name of the attribute
+        * @param {String} type The type of the attribute. Can be one of the following: 'number', 'string', 'boolean', 'asset', 'entity', 'rgb', 'rgba', 'vector', 'enumeration', 'curve', 'colorcurve'
+        * @param {Object} defaultValue The default value of the attribute
+        * @param {Object} options Optional parameters for the attribute. Valid values are:
+        * <ul>
+        *   <li>{Number} min: The minimum value of the attribute</li>
+        *   <li>{Number} max: The maximum value of the attribute</li>
+        *   <li>{Number} step: The step that will be used when changing the attribute value in the PlayCanvas Editor</li>
+        *   <li>{Number} decimalPrecision: A number that specifies the number of decimal digits allowed for the value</li>
+        *   <li>{Object[]} enumerations: An array of name, value pairs from which the user can select one if the attribute type is an enumeration</li>
+        *   <li>{String[]} curves: (For 'curve' attributes only) An array of strings that define the names of each curve in the curve editor.</li>
+        *   <li>{Array} color: (For 'curve' attributes only) If true then the curve attribute will be a color curve.</li>
+        * </ul>
+        * @example
+        * pc.script.attribute('speed', 'number', 5);
+        * pc.script.attribute('message', 'string', "My message");
+        * pc.script.attribute('enemyPosition', 'vector', [1,0,0]);
+        * pc.script.attribute('spellType', 'enumeration', 0, {
+        *     enumerations: [{
+        *        name: "Fire",
+        *        value: 0
+        *     }, {
+        *        name: "Ice",
+        *        value: 1
+        *     }]
+        *  });
+        * pc.script.attribute('enemy', 'entity');
+        * pc.script.attribute('enemySpeed', 'curve');
+        * pc.script.attribute('enemyPosition', 'curve', null, {
+        *     curves: ['x', 'y', 'z']
+        * });
+        * pc.script.attribute('color', 'colorcurve', null, {
+        *     type: 'rgba'
+        * });
+        *
+        * pc.script.create('scriptable', function (app) {
+        *  var Scriptable = function (entity) {
+        *      // store entity
+        *      this.entity = entity;
+        *  };
+        *
+        *  return Scriptable;
+        * }
+        */
+        function attribute(name: string, type: string, defaultValue: any, options?: {
+            min?: number,
+            max?: number,
+            step?: number,
+            decimalPrecision?: number,
+            enumerations?: any[],
+            curves?: string[],
+            color?: any[]
+        }): void;
+
+        /**
+         * @function
+         * @name pc.script.createLoadingScreen
+         * @description Handles the creation of the loading screen of the application. A script can subscribe to
+         * the events of a {@link pc.Application} to show a loading screen, progress bar etc. In order for this to work
+         * you need to set the project's loading screen script to the script that calls this method.
+         * @param  {Function} callback A function which can set up and tear down a customised loading screen.
+         * @example
+         * pc.script.createLoadingScreen(function (app) {
+         *     var showSplashScreen = function () { // }
+         *     var hideSplashScreen = function () { // }
+         *     var showProgress = function (progress) { // }
+         *     app.on("preload:start", showSplashScreen);
+         *     app.on("preload:progress", showProgress);
+         *     app.on("start", hideSplashScreen);
+         * });
+         */
+        function createLoadingScreen(callback: Function): void;
+    }
+}
diff --git a/types/playcanvas/engine/graphics/device.d.ts b/types/playcanvas/engine/graphics/device.d.ts
new file mode 100644
index 0000000000..188de0b1a3
--- /dev/null
+++ b/types/playcanvas/engine/graphics/device.d.ts
@@ -0,0 +1,665 @@
+declare namespace pc {
+
+    /**
+     * @name pc.GraphicsDevice
+     * @class The graphics device manages the underlying graphics context. It is responsible
+     * for submitting render state changes and graphics primitives to the hardware. A graphics
+     * device is tied to a specific canvas HTML element. It is valid to have more than one
+     * canvas element per page and create a new graphics device against each.
+     * @description Creates a new graphics device.
+     * @param {Object} canvas The canvas to which the graphics device is tied.
+     * @param {Object} [options] Options passed when creating the WebGL context. More info here https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/getContext
+     */
+    class GraphicsDevice {
+        constructor(canvas: HTMLCanvasElement, options?: {})
+
+        /**
+         * @readonly
+         * @name pc.GraphicsDevice#precision
+         * @type String
+         * @description The highest shader precision supported by this graphics device. Can be 'hiphp', 'mediump' or 'lowp'.
+         */
+        readonly precision: string;
+
+        /**
+         * @readonly
+         * @name pc.GraphicsDevice#maxCubeMapSize
+         * @type Number
+         * @description The maximum supported dimension of a cube map.
+         */
+        readonly maxCubeMapSize: number;
+
+        /**
+         * @readonly
+         * @name pc.GraphicsDevice#maxTextureSize
+         * @type Number
+         * @description The maximum supported dimension of a texture.
+         */
+        readonly maxTextureSize: number;
+
+        /**
+         * @readonly
+         * @name pc.GraphicsDevice#maxVolumeSize
+         * @type Number
+         * @description The maximum supported dimension of a 3D texture (any axis).
+         */
+        readonly maxVolumeSize: number;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setViewport
+         * @description Set the active rectangle for rendering on the specified device.
+         * @param {Number} x The pixel space x-coordinate of the bottom left corner of the viewport.
+         * @param {Number} y The pixel space y-coordinate of the bottom left corner of the viewport.
+         * @param {Number} w The width of the viewport in pixels.
+         * @param {Number} h The height of the viewport in pixels.
+         */
+        setViewport(x: number, y: number, w: number, h: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setScissor
+         * @description Set the active scissor rectangle on the specified device.
+         * @param {Number} x The pixel space x-coordinate of the bottom left corner of the scissor rectangle.
+         * @param {Number} y The pixel space y-coordinate of the bottom left corner of the scissor rectangle.
+         * @param {Number} w The width of the scissor rectangle in pixels.
+         * @param {Number} h The height of the scissor rectangle in pixels.
+         */
+        setScissor(x: number, y: number, w: number, h: number): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.GraphicsDevice#getProgramLibrary
+         * @description Retrieves the program library assigned to the specified graphics device.
+         * @returns {pc.ProgramLibrary} The program library assigned to the device.
+         */
+        private getProgramLibrary(): pc.ProgramLibrary;
+
+        /**
+         * @private
+         * @function
+         * @name pc.GraphicsDevice#setProgramLibrary
+         * @description Assigns a program library to the specified device. By default, a graphics
+         * device is created with a program library that manages all of the programs that are
+         * used to render any graphical primitives. However, this function allows the user to
+         * replace the existing program library with a new one.
+         * @param {pc.ProgramLibrary} programLib The program library to assign to the device.
+         */
+        private setProgramLibrary(programLib): pc.ProgramLibrary;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#updateBegin
+         * @description Marks the beginning of a block of rendering. Internally, this function
+         * binds the render target currently set on the device. This function should be matched
+         * with a call to pc.GraphicsDevice#updateEnd. Calls to pc.GraphicsDevice#updateBegin
+         * and pc.GraphicsDevice#updateEnd must not be nested.
+         */
+        updateBegin(): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#updateEnd
+         * @description Marks the end of a block of rendering. This function should be called
+         * after a matching call to pc.GraphicsDevice#updateBegin. Calls to pc.GraphicsDevice#updateBegin
+         * and pc.GraphicsDevice#updateEnd must not be nested.
+         */
+        updateEnd(): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#draw
+         * @description Submits a graphical primitive to the hardware for immediate rendering.
+         * @param {Object} primitive Primitive object describing how to submit current vertex/index buffers defined as follows:
+         * @param {Number} primitive.type The type of primitive to render. Can be:
+         * <ul>
+         *     <li>pc.PRIMITIVE_POINTS</li>
+         *     <li>pc.PRIMITIVE_LINES</li>
+         *     <li>pc.PRIMITIVE_LINELOOP</li>
+         *     <li>pc.PRIMITIVE_LINESTRIP</li>
+         *     <li>pc.PRIMITIVE_TRIANGLES</li>
+         *     <li>pc.PRIMITIVE_TRISTRIP</li>
+         *     <li>pc.PRIMITIVE_TRIFAN</li>
+         * </ul>
+         * @param {Number} primitive.base The offset of the first index or vertex to dispatch in the draw call.
+         * @param {Number} primitive.count The number of indices or vertices to dispatch in the draw call.
+         * @param {Boolean} primitive.indexed True to interpret the primitive as indexed, thereby using the currently set index buffer and false otherwise.
+         * @example
+         * // Render a single, unindexed triangle
+         * device.draw({
+         *     type: pc.PRIMITIVE_TRIANGLES,
+         *     base: 0,
+         *     count: 3,
+         *     indexed: false
+         * )};
+         */
+        draw(primitive: { type: number, base: number, count: number, indexed: boolean }, numInstances?: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#clear
+         * @description Clears the frame buffer of the currently set render target.
+         * @param {Object} options Optional options object that controls the behavior of the clear operation defined as follows:
+         * @param {Number[]} options.color The color to clear the color buffer to in the range 0.0 to 1.0 for each component.
+         * @param {Number} options.depth The depth value to clear the depth buffer to in the range 0.0 to 1.0.
+         * @param {Number} options.flags The buffers to clear (the types being color, depth and stencil). Can be any bitwise
+         * combination of:
+         * <ul>
+         *     <li>pc.CLEARFLAG_COLOR</li>
+         *     <li>pc.CLEARFLAG_DEPTH</li>
+         *     <li>pc.CLEARFLAG_STENCIL</li>
+         * </ul>
+         * @example
+         * // Clear color buffer to black and depth buffer to 1.0
+         * device.clear();
+         *
+         * // Clear just the color buffer to red
+         * device.clear({
+         *     color: [1, 0, 0, 1],
+         *     flags: pc.CLEARFLAG_COLOR
+         * });
+         *
+         * // Clear color buffer to yellow and depth to 1.0
+         * device.clear({
+         *     color: [1, 1, 0, 1],
+         *     depth: 1.0,
+         *     flags: pc.CLEARFLAG_COLOR | pc.CLEARFLAG_DEPTH
+         * });
+         */
+        clear(options: { color: number[], depth: number, flags: number }): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setRenderTarget
+         * @description Sets the specified render target on the device. If null
+         * is passed as a parameter, the back buffer becomes the current target
+         * for all rendering operations.
+         * @param {pc.RenderTarget} renderTarget The render target to activate.
+         * @example
+         * // Set a render target to receive all rendering output
+         * device.setRenderTarget(renderTarget);
+         *
+         * // Set the back buffer to receive all rendering output
+         * device.setRenderTarget(null);
+         */
+        setRenderTarget(renderTarget: pc.RenderTarget): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#getRenderTarget
+         * @description Queries the currently set render target on the device.
+         * @returns {pc.RenderTarget} The current render target.
+         * @example
+         * // Get the current render target
+         * var renderTarget = device.getRenderTarget();
+         */
+        getRenderTarget(): pc.RenderTarget;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#getDepthTest
+         * @description Queries whether depth testing is enabled.
+         * @returns {Boolean} true if depth testing is enabled and false otherwise.
+         * @example
+         * var depthTest = device.getDepthTest();
+         * console.log('Depth testing is ' + depthTest ? 'enabled' : 'disabled');
+         */
+        getDepthTest(): boolean;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setDepthTest
+         * @description Enables or disables depth testing of fragments. Once this state
+         * is set, it persists until it is changed. By default, depth testing is enabled.
+         * @param {Boolean} depthTest true to enable depth testing and false otherwise.
+         * @example
+         * device.setDepthTest(true);
+         */
+        setDepthTest(depthTest: boolean): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setDepthFunc
+         * @description Configures the depth test.
+         * @param {Number} func A function to compare a new depth value with an existing z-buffer value and decide if to write a pixel. Can be:
+         * <ul>
+         *     <li>pc.FUNC_NEVER: don't draw</li>
+         *     <li>pc.FUNC_LESS: draw if new depth < depth buffer</li>
+         *     <li>pc.FUNC_EQUAL: draw if new depth == depth buffer</li>
+         *     <li>pc.FUNC_LESSEQUAL: draw if new depth <= depth buffer</li>
+         *     <li>pc.FUNC_GREATER: draw if new depth > depth buffer</li>
+         *     <li>pc.FUNC_NOTEQUAL: draw if new depth != depth buffer</li>
+         *     <li>pc.FUNC_GREATEREQUAL: draw if new depth >= depth buffer</li>
+         *     <li>pc.FUNC_ALWAYS: always draw</li>
+         * </ul>
+         */
+        setDepthFunc(func: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#getDepthWrite
+         * @description Queries whether writes to the depth buffer are enabled.
+         * @returns {Boolean} true if depth writing is enabled and false otherwise.
+         * @example
+         * var depthWrite = device.getDepthWrite();
+         * console.log('Depth writing is ' + depthWrite ? 'enabled' : 'disabled');
+         */
+        getDepthWrite(): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setDepthWrite
+         * @description Enables or disables writes to the depth buffer. Once this state
+         * is set, it persists until it is changed. By default, depth writes are enabled.
+         * @param {Boolean} writeDepth true to enable depth writing and false otherwise.
+         * @example
+         * device.setDepthWrite(true);
+         */
+        setDepthWrite(writeDepth: boolean): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setColorWrite
+         * @description Enables or disables writes to the color buffer. Once this state
+         * is set, it persists until it is changed. By default, color writes are enabled
+         * for all color channels.
+         * @param {Boolean} writeRed true to enable writing of the red channel and false otherwise.
+         * @param {Boolean} writeGreen true to enable writing of the green channel and false otherwise.
+         * @param {Boolean} writeBlue true to enable writing of the blue channel and false otherwise.
+         * @param {Boolean} writeAlpha true to enable writing of the alpha channel and false otherwise.
+         * @example
+         * // Just write alpha into the frame buffer
+         * device.setColorWrite(false, false, false, true);
+         */
+        setColorWrite(writeRed: boolean, writeGreen: boolean, writeBlue: boolean, writeAlpha: boolean): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.GraphicsDevice#setAlphaToCoverage
+         * @description Enables or disables alpha to coverage (WebGL2 only).
+         * @param {Boolean} state True to enable alpha to coverage and false to disable it.
+         */
+        private setAlphaToCoverage(state: boolean): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.GraphicsDevice#setTransformFeedbackBuffer
+         * @description Sets the output vertex buffer. It will be written to by a shader with transform feedback varyings.
+         * @param {pc.VertexBuffer} tf The output vertex buffer
+         */
+        private setTransformFeedbackBuffer(tf: pc.VertexBuffer): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.GraphicsDevice#setRaster
+         * @description Enables or disables rasterization. Useful with transform feedback, when you only need to process the data without drawing.
+         * @param {Boolean} on True to enable rasterization and false to disable it.
+         */
+        private setRaster(on: boolean): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#getBlending
+         * @description Queries whether blending is enabled.
+         * @returns {Boolean} True if blending is enabled and false otherwise.
+         */
+        getBlending(): boolean;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setBlending
+         * @description Enables or disables blending.
+         * @param {Boolean} blending True to enable blending and false to disable it.
+         */
+        setBlending(blending: boolean): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setStencilTest
+         * @description Enables or disables stencil test.
+         * @param {Boolean} enable True to enable stencil test and false to disable it.
+         */
+        setStencilTest(enable: boolean): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setStencilFunc
+         * @description Configures stencil test for both front and back faces.
+         * @param {Number} func A comparison function that decides if the pixel should be written, based on the current stencil buffer value,
+         * reference value, and mask value. Can be:
+         * <ul>
+         *     <li>pc.FUNC_NEVER: never pass</li>
+         *     <li>pc.FUNC_LESS: pass if (ref & mask) < (stencil & mask)</li>
+         *     <li>pc.FUNC_EQUAL: pass if (ref & mask) == (stencil & mask)</li>
+         *     <li>pc.FUNC_LESSEQUAL: pass if (ref & mask) <= (stencil & mask)</li>
+         *     <li>pc.FUNC_GREATER: pass if (ref & mask) > (stencil & mask)</li>
+         *     <li>pc.FUNC_NOTEQUAL: pass if (ref & mask) != (stencil & mask)</li>
+         *     <li>pc.FUNC_GREATEREQUAL: pass if (ref & mask) >= (stencil & mask)</li>
+         *     <li>pc.FUNC_ALWAYS: always pass</li>
+         * </ul>
+         * @param {Number} ref Reference value used in comparison.
+         * @param {Number} mask Mask applied to stencil buffer value and reference value before comparison.
+         */
+        setStencilFunc(func: number, ref: number, mask: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setStencilFuncFront
+         * @description Same as pc.GraphicsDevice#setStencilFunc, but only for front faces.
+         */
+        setStencilFuncFront(func: number, ref: number, mask: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setStencilFuncBack
+         * @description Same as pc.GraphicsDevice#setStencilFunc, but only for back faces.
+         */
+        setStencilFuncBack(func: boolean, ref: boolean, mask: boolean): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setStencilOperation
+         * @description Configures how stencil buffer values should be modified based on the result of depth/stencil tests. Works for both front and back faces.
+         * @param {Number} fail Action to take if stencil test is failed
+         * @param {Number} zfail Action to take if depth test is failed
+         * @param {Number} zpass Action to take if both depth and stencil test are passed
+         * All arguments can be:
+         * <ul>
+         *     <li>pc.STENCILOP_KEEP: don't change the stencil buffer value</li>
+         *     <li>pc.STENCILOP_ZERO: set value to zero</li>
+         *     <li>pc.STENCILOP_REPLACE: replace value with the reference value (see pc.GraphicsDevice#setStencilFunc)</li>
+         *     <li>pc.STENCILOP_INCREMENT: increment the value</li>
+         *     <li>pc.STENCILOP_INCREMENTWRAP: increment the value, but wrap it to zero when it's larger than a maximum representable value</li>
+         *     <li>pc.STENCILOP_DECREMENT: decrement the value</li>
+         *     <li>pc.STENCILOP_DECREMENTWRAP: decrement the value, but wrap it to a maximum representable value, if the current value is 0</li>
+         *     <li>pc.STENCILOP_INVERT: invert the value bitwise</li>
+         * </ul>
+         * @param {Number} writeMask A bit mask applied to the reference value, when written.
+         */
+        setStencilOperation(fail: number, zfail: number, zpass: number, writeMask: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setStencilOperationFront
+         * @description Same as pc.GraphicsDevice#setStencilOperation, but only for front faces.
+         */
+        setStencilOperationFront(fail: number, zfail: number, zpass: number, writeMask: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setStencilOperationBack
+         * @description Same as pc.GraphicsDevice#setStencilOperation, but only for back faces.
+         */
+        setStencilOperationBack(fail: number, zfail: number, zpass: number, writeMask: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setBlendFunction
+         * @description Configures blending operations. Both source and destination
+         * blend modes can take the following values:
+         * <ul>
+         *     <li>pc.BLENDMODE_ZERO</li>
+         *     <li>pc.BLENDMODE_ONE</li>
+         *     <li>pc.BLENDMODE_SRC_COLOR</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_SRC_COLOR</li>
+         *     <li>pc.BLENDMODE_DST_COLOR</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_DST_COLOR</li>
+         *     <li>pc.BLENDMODE_SRC_ALPHA</li>
+         *     <li>pc.BLENDMODE_SRC_ALPHA_SATURATE</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_SRC_ALPHA</li>
+         *     <li>pc.BLENDMODE_DST_ALPHA</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_DST_ALPHA</li>
+         * </ul>
+         * @param {Number} blendSrc The source blend function.
+         * @param {Number} blendDst The destination blend function.
+         */
+        setBlendFunction(blendSrc: number, blendDst: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setBlendFunctionSeparate
+         * @description Configures blending operations. Both source and destination
+         * blend modes can take the following values:
+         * <ul>
+         *     <li>pc.BLENDMODE_ZERO</li>
+         *     <li>pc.BLENDMODE_ONE</li>
+         *     <li>pc.BLENDMODE_SRC_COLOR</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_SRC_COLOR</li>
+         *     <li>pc.BLENDMODE_DST_COLOR</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_DST_COLOR</li>
+         *     <li>pc.BLENDMODE_SRC_ALPHA</li>
+         *     <li>pc.BLENDMODE_SRC_ALPHA_SATURATE</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_SRC_ALPHA</li>
+         *     <li>pc.BLENDMODE_DST_ALPHA</li>
+         *     <li>pc.BLENDMODE_ONE_MINUS_DST_ALPHA</li>
+         * </ul>
+         * @param {Number} blendSrc The source blend function.
+         * @param {Number} blendDst The destination blend function.
+         * @param {Number} blendSrcAlpha The separate source blend function for the alpha channel.
+         * @param {Number} blendDstAlpha The separate destination blend function for the alpha channel.
+         */
+        setBlendFunctionSeparate(blendSrc: void, blendDst: void, blendSrcAlpha: void, blendDstAlpha: void): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setBlendEquation
+         * @description Configures the blending equation. The default blend equation is
+         * pc.BLENDEQUATION_ADD.
+         * @param {Number} blendEquation The blend equation. Can be:
+         * <ul>
+         *     <li>pc.BLENDEQUATION_ADD</li>
+         *     <li>pc.BLENDEQUATION_SUBTRACT</li>
+         *     <li>pc.BLENDEQUATION_REVERSE_SUBTRACT</li>
+         *     <li>pc.BLENDEQUATION_MIN</li>
+         *     <li>pc.BLENDEQUATION_MAX</li>
+         * Note that MIN and MAX modes require either EXT_blend_minmax or WebGL2 to work (check device.extBlendMinmax).
+         * </ul>
+         */
+        setBlendEquation(blendEquation: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setBlendEquationSeparate
+         * @description Configures the blending equation. The default blend equation is
+         * pc.BLENDEQUATION_ADD.
+         * @param {Number} blendEquation The blend equation. Can be:
+         * <ul>
+         *     <li>pc.BLENDEQUATION_ADD</li>
+         *     <li>pc.BLENDEQUATION_SUBTRACT</li>
+         *     <li>pc.BLENDEQUATION_REVERSE_SUBTRACT</li>
+         *     <li>pc.BLENDEQUATION_MIN</li>
+         *     <li>pc.BLENDEQUATION_MAX</li>
+         * Note that MIN and MAX modes require either EXT_blend_minmax or WebGL2 to work (check device.extBlendMinmax).
+         * @param {Number} blendAlphaEquation A separate blend equation for the alpha channel. Accepts same values as blendEquation.
+         * </ul>
+         */
+        setBlendEquationSeparate(blendEquation: number, blendAlphaEquation: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setCullMode
+         * @description Controls how triangles are culled based on their face direction.
+         * The default cull mode is pc.CULLFACE_BACK.
+         * @param {Number} cullMode The cull mode to set. Can be:
+         * <ul>
+         *     <li>pc.CULLFACE_NONE</li>
+         *     <li>pc.CULLFACE_BACK</li>
+         *     <li>pc.CULLFACE_FRONT</li>
+         *     <li>pc.CULLFACE_FRONTANDBACK</li>
+         * </ul>
+         */
+        setCullMode(cullMode: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setIndexBuffer
+         * @description Sets the current index buffer on the graphics device. On subsequent
+         * calls to pc.GraphicsDevice#draw, the specified index buffer will be used to provide
+         * index data for any indexed primitives.
+         * @param {pc.IndexBuffer} indexBuffer The index buffer to assign to the device.
+         */
+        setIndexBuffer(indexBuffer: pc.IndexBuffer): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setVertexBuffer
+         * @description Sets the current vertex buffer for a specific stream index on the graphics
+         * device. On subsequent calls to pc.GraphicsDevice#draw, the specified vertex buffer will be
+         * used to provide vertex data for any primitives.
+         * @param {pc.VertexBuffer} vertexBuffer The vertex buffer to assign to the device.
+         * @param {Number} stream The stream index for the vertex buffer, indexed from 0 upwards.
+         */
+        setVertexBuffer(vertexBuffer: pc.VertexBuffer, stream: number, vbOffset?: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#setShader
+         * @description Sets the active shader to be used during subsequent draw calls.
+         * @param {pc.Shader} shader The shader to set to assign to the device.
+         */
+        setShader(shader: pc.Shader): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.GraphicsDevice#getBoneLimit
+         * @description Queries the maximum number of bones that can be referenced by a shader.
+         * The shader generators (pc.programlib) use this number to specify the matrix array
+         * size of the uniform 'matrix_pose[0]'. The value is calculated based on the number of
+         * available uniform vectors available after subtracting the number taken by a typical
+         * heavyweight shader. If a different number is required, it can be tuned via
+         * pc.GraphicsDevice#setBoneLimit.
+         * @returns {Number} The maximum number of bones that can be supported by the host hardware.
+         */
+        private getBoneLimit(): number
+
+        /**
+         * @private
+         * @function
+         * @name pc.GraphicsDevice#setBoneLimit
+         * @description Specifies the maximum number of bones that the device can support on
+         * the current hardware. This function allows the default calculated value based on
+         * available vector uniforms to be overridden.
+         * @param {Number} maxBones The maximum number of bones supported by the host hardware.
+         */
+        private setBoneLimit(maxBones: number): void;
+
+        /**
+        * @function
+        * @name pc.GraphicsDevice#resizeCanvas
+        * @description Sets the width and height of the canvas, then fires the 'resizecanvas' event.
+        */
+        resizeCanvas(width: number, height: number): void;
+
+        /**
+        * @function
+        * @name pc.GraphicsDevice#clearShaderCache
+        * @description Frees memory from all shaders ever allocated with this device
+        */
+        clearShaderCache(): void;
+
+        /**
+         * @readonly
+         * @name pc.GraphicsDevice#width
+         * @type Number
+         * @description Width of the back buffer in pixels.
+         */
+        readonly width: number;
+
+        /**
+         * @readonly
+         * @name pc.GraphicsDevice#height
+         * @type Number
+         * @description Height of the back buffer in pixels.
+         */
+        readonly height: number;
+
+        /**
+         * @readonly
+         * @name pc.GraphicsDevice#maxAnisotropy
+         * @type Number
+         * @description The maximum supported texture anisotropy setting.
+         */
+        readonly maxAnisotropy: number;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.GraphicsDevice#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.GraphicsDevice#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/graphics/graphics.d.ts b/types/playcanvas/engine/graphics/graphics.d.ts
new file mode 100644
index 0000000000..9c308fa624
--- /dev/null
+++ b/types/playcanvas/engine/graphics/graphics.d.ts
@@ -0,0 +1,757 @@
+declare namespace pc {
+
+    /**
+     * @static
+     * @readonly
+     * @type Number
+     * @name pc.ADDRESS_REPEAT
+     * @description Ignores the integer part of texture coordinates; using only the fractional part.
+     */
+    const ADDRESS_REPEAT = 0;
+    /**
+     * @static
+     * @readonly
+     * @type Number
+     * @name pc.ADDRESS_CLAMP_TO_EDGE
+     * @description Clamps texture coordinate to the range 0 to 1.
+     */
+    const ADDRESS_CLAMP_TO_EDGE = 1;
+    /**
+     * @static
+     * @readonly
+     * @type Number
+     * @name pc.ADDRESS_MIRRORED_REPEAT
+     * @description Texture coordinate to be set to the fractional part if the integer part is even; if the integer part is odd;
+     * then the texture coordinate is set to 1 minus the fractional part.
+     */
+    const ADDRESS_MIRRORED_REPEAT = 2;
+
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_ZERO
+     * @description Multiply all fragment components by zero.
+     */
+    const BLENDMODE_ZERO = 0;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_ONE
+     * @description Multiply all fragment components by one.
+     */
+    const BLENDMODE_ONE = 1;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_SRC_COLOR
+     * @description Multiply all fragment components by the components of the source fragment.
+     */
+    const BLENDMODE_SRC_COLOR = 2;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_ONE_MINUS_SRC_COLOR
+     * @description Multiply all fragment components by one minus the components of the source fragment.
+     */
+    const BLENDMODE_ONE_MINUS_SRC_COLOR = 3;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_DST_COLOR
+     * @description Multiply all fragment components by the components of the destination fragment.
+     */
+    const BLENDMODE_DST_COLOR = 4;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_ONE_MINUS_DST_COLOR
+     * @description Multiply all fragment components by one minus the components of the destination fragment.
+     */
+    const BLENDMODE_ONE_MINUS_DST_COLOR = 5;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_SRC_ALPHA
+     * @description Multiply all fragment components by the alpha value of the source fragment.
+     */
+    const BLENDMODE_SRC_ALPHA = 6;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_SRC_ALPHA_SATURATE
+     * @description Multiply all fragment components by the alpha value of the source fragment.
+     */
+    const BLENDMODE_SRC_ALPHA_SATURATE = 7;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_ONE_MINUS_SRC_ALPHA
+     * @description Multiply all fragment components by one minus the alpha value of the source fragment.
+     */
+    const BLENDMODE_ONE_MINUS_SRC_ALPHA = 8;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_DST_ALPHA
+     * @description Multiply all fragment components by the alpha value of the destination fragment.
+     */
+    const BLENDMODE_DST_ALPHA = 9;
+    /**
+     * @enum pc.BLENDMODE
+     * @name pc.BLENDMODE_ONE_MINUS_DST_ALPHA
+     * @description Multiply all fragment components by one minus the alpha value of the destination fragment.
+     */
+    const BLENDMODE_ONE_MINUS_DST_ALPHA = 10;
+
+    /**
+     * @enum pc.BLENDEQUATION
+     * @name pc.BLENDEQUATION_ADD
+     * @description Add the results of the source and destination fragment multiplies.
+     */
+    const BLENDEQUATION_ADD = 0;
+    /**
+     * @enum pc.BLENDEQUATION
+     * @name pc.BLENDEQUATION_SUBTRACT
+     * @description Subtract the results of the source and destination fragment multiplies.
+     */
+    const BLENDEQUATION_SUBTRACT = 1;
+    /**
+     * @enum pc.BLENDEQUATION
+     * @name pc.BLENDEQUATION_REVERSE_SUBTRACT
+     * @description Reverse and subtract the results of the source and destination fragment multiplies.
+     */
+    const BLENDEQUATION_REVERSE_SUBTRACT = 2;
+
+    /**
+     * @enum pc.BLENDEQUATION
+     * @name pc.BLENDEQUATION_MIN
+     * @description Use the smallest value. Check app.graphicsDevice.extBlendMinmax for support.
+     */
+    const BLENDEQUATION_MIN = 3;
+    /**
+     * @enum pc.BLENDEQUATION
+     * @name pc.BLENDEQUATION_MAX
+     * @description Use the largest value. Check app.graphicsDevice.extBlendMinmax for support.
+     */
+    const BLENDEQUATION_MAX = 4;
+
+    /**
+     * @enum pc.BUFFER
+     * @name pc.BUFFER_STATIC
+     * @description The data store contents will be modified once and used many times.
+     */
+    const BUFFER_STATIC = 0;
+    /**
+     * @enum pc.BUFFER
+     * @name pc.BUFFER_DYNAMIC
+     * @description The data store contents will be modified repeatedly and used many times.
+     */
+    const BUFFER_DYNAMIC = 1;
+    /**
+     * @enum pc.BUFFER
+     * @name pc.BUFFER_STREAM
+     * @description The data store contents will be modified once and used at most a few times.
+     */
+    const BUFFER_STREAM = 2;
+    /**
+     * @enum pc.BUFFER
+     * @name pc.BUFFER_GPUDYNAMIC
+     * @description The data store contents will be modified repeatedly on the GPU and used many times. Optimal for transform feedback usage (WebGL2 only).
+     */
+    const BUFFER_GPUDYNAMIC = 3;
+
+    /**
+     * @enum pc.CLEARFLAG
+     * @name pc.CLEARFLAG_COLOR
+     * @description Clear the color buffer.
+     */
+    const CLEARFLAG_COLOR = 1;
+    /**
+     * @enum pc.CLEARFLAG
+     * @name pc.CLEARFLAG_DEPTH
+     * @description Clear the depth buffer.
+     */
+    const CLEARFLAG_DEPTH = 2;
+    /**
+     * @enum pc.CLEARFLAG
+     * @name pc.CLEARFLAG_STENCIL
+     * @description Clear the stencil buffer.
+     */
+    const CLEARFLAG_STENCIL = 4;
+
+    /**
+     * @enum pc.CUBEFACE
+     * @name pc.CUBEFACE_POSX
+     * @description The positive X face of a cubemap.
+     */
+    const CUBEFACE_POSX = 0;
+    /**
+     * @enum pc.CUBEFACE
+     * @name pc.CUBEFACE_NEGX
+     * @description The negative X face of a cubemap.
+     */
+    const CUBEFACE_NEGX = 1;
+    /**
+     * @enum pc.CUBEFACE
+     * @name pc.CUBEFACE_POSY
+     * @description The positive Y face of a cubemap.
+     */
+    const CUBEFACE_POSY = 2;
+    /**
+     * @enum pc.CUBEFACE
+     * @name pc.CUBEFACE_NEGY
+     * @description The negative Y face of a cubemap.
+     */
+    const CUBEFACE_NEGY = 3;
+    /**
+     * @enum pc.CUBEFACE
+     * @name pc.CUBEFACE_POSZ
+     * @description The positive Z face of a cubemap.
+     */
+    const CUBEFACE_POSZ = 4;
+    /**
+     * @enum pc.CUBEFACE
+     * @name pc.CUBEFACE_NEGZ
+     * @description The negative Z face of a cubemap.
+     */
+    const CUBEFACE_NEGZ = 5;
+
+    /**
+     * @enum pc.CULLFACE
+     * @name pc.CULLFACE_NONE
+     * @description No triangles are culled.
+     */
+    const CULLFACE_NONE = 0;
+    /**
+     * @enum pc.CULLFACE
+     * @name pc.CULLFACE_BACK
+     * @description Triangles facing away from the view direction are culled.
+     */
+    const CULLFACE_BACK = 1;
+    /**
+     * @enum pc.CULLFACE
+     * @name pc.CULLFACE_FRONT
+     * @description Triangles facing the view direction are culled.
+     */
+    const CULLFACE_FRONT = 2;
+    /**
+     * @enum pc.CULLFACE
+     * @name pc.CULLFACE_FRONTANDBACK
+     * @description Triangles are culled regardless of their orientation with respect to the view
+     * direction. Note that point or line primitives are unaffected by this render state.
+     */
+    const CULLFACE_FRONTANDBACK = 3;
+
+    /**
+     * @enum pc.TYPE
+     * @name pc.TYPE_INT8
+     * @description Signed byte vertex element type.
+     */
+    const TYPE_INT8 = 0;
+    /**
+     * @enum pc.TYPE
+     * @name pc.TYPE_UINT8
+     * @description Unsigned byte vertex element type.
+     */
+    const TYPE_UINT8 = 1;
+    /**
+     * @enum pc.TYPE
+     * @name pc.TYPE_INT16
+     * @description Signed short vertex element type.
+     */
+    const TYPE_INT16 = 2;
+    /**
+     * @enum pc.TYPE
+     * @name pc.TYPE_UINT16
+     * @description Unsigned short vertex element type.
+     */
+    const TYPE_UINT16 = 3;
+    /**
+     * @enum pc.TYPE
+     * @name pc.TYPE_INT32
+     * @description Signed integer vertex element type.
+     */
+    const TYPE_INT32 = 4;
+    /**
+     * @enum pc.TYPE
+     * @name pc.TYPE_UINT32
+     * @description Unsigned integer vertex element type.
+     */
+    const TYPE_UINT32 = 5;
+    /**
+     * @enum pc.TYPE
+     * @name pc.TYPE_FLOAT32
+     * @description Floating point vertex element type.
+     */
+    const TYPE_FLOAT32 = 6;
+
+    /**
+     * @enum pc.FILTER
+     * @name pc.FILTER_NEAREST
+     * @description Point sample filtering.
+     */
+    const FILTER_NEAREST = 0;
+    /**
+     * @enum pc.FILTER
+     * @name pc.FILTER_LINEAR
+     * @description Bilinear filtering.
+     */
+    const FILTER_LINEAR = 1;
+    /**
+     * @enum pc.FILTER
+     * @name pc.FILTER_NEAREST_MIPMAP_NEAREST
+     * @description Use the nearest neighbor in the nearest mipmap level.
+     */
+    const FILTER_NEAREST_MIPMAP_NEAREST = 2;
+    /**
+     * @enum pc.FILTER
+     * @name pc.FILTER_NEAREST_MIPMAP_LINEAR
+     * @description Linearly interpolate in the nearest mipmap level.
+     */
+    const FILTER_NEAREST_MIPMAP_LINEAR = 3;
+    /**
+     * @enum pc.FILTER
+     * @name pc.FILTER_LINEAR_MIPMAP_NEAREST
+     * @description Use the nearest neighbor after linearly interpolating between mipmap levels.
+     */
+    const FILTER_LINEAR_MIPMAP_NEAREST = 4;
+    /**
+     * @enum pc.FILTER
+     * @name pc.FILTER_LINEAR_MIPMAP_LINEAR
+     * @description Linearly interpolate both the mipmap levels and between texels.
+     */
+    const FILTER_LINEAR_MIPMAP_LINEAR = 5;
+
+    const FUNC_NEVER = 0;
+    const FUNC_LESS = 1;
+    const FUNC_EQUAL = 2;
+    const FUNC_LESSEQUAL = 3;
+    const FUNC_GREATER = 4;
+    const FUNC_NOTEQUAL = 5;
+    const FUNC_GREATEREQUAL = 6;
+    const FUNC_ALWAYS = 7;
+
+    /**
+     * @enum pc.INDEXFORMAT
+     * @name pc.INDEXFORMAT_UINT8
+     * @description 8-bit unsigned vertex indices.
+     */
+    const INDEXFORMAT_UINT8 = 0;
+    /**
+     * @enum pc.INDEXFORMAT
+     * @name pc.INDEXFORMAT_UINT16
+     * @description 16-bit unsigned vertex indices.
+     */
+    const INDEXFORMAT_UINT16 = 1;
+    /**
+     * @enum pc.INDEXFORMAT
+     * @name pc.INDEXFORMAT_UINT32
+     * @description 32-bit unsigned vertex indices.
+     */
+    const INDEXFORMAT_UINT32 = 2;
+
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_A8
+     * @description 8-bit alpha.
+     */
+    const PIXELFORMAT_A8 = 0;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_L8
+     * @description 8-bit luminance.
+     */
+    const PIXELFORMAT_L8 = 1;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_L8_A8
+     * @description 8-bit luminance with 8-bit alpha.
+     */
+    const PIXELFORMAT_L8_A8 = 2;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_R5_G6_B5
+     * @description 16-bit RGB (5-bits for red channel; 6 for green and 5 for blue).
+     */
+    const PIXELFORMAT_R5_G6_B5 = 3;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_R5_G5_B5_A1
+     * @description 16-bit RGBA (5-bits for red channel; 5 for green; 5 for blue with 1-bit alpha).
+     */
+    const PIXELFORMAT_R5_G5_B5_A1 = 4;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_R4_G4_B4_A4
+     * @description 16-bit RGBA (4-bits for red channel; 4 for green; 4 for blue with 4-bit alpha).
+     */
+    const PIXELFORMAT_R4_G4_B4_A4 = 5;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_R8_G8_B8
+     * @description 24-bit RGB (8-bits for red channel; 8 for green and 8 for blue).
+     */
+    const PIXELFORMAT_R8_G8_B8 = 6;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_R8_G8_B8_A8
+     * @description 32-bit RGBA (8-bits for red channel; 8 for green; 8 for blue with 8-bit alpha).
+     */
+    const PIXELFORMAT_R8_G8_B8_A8 = 7;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_DXT1
+     * @description Block compressed format; storing 16 input pixels in 64 bits of output; consisting of two 16-bit RGB 5 =6 =5 color values and a 4x4 two bit lookup table.
+     */
+    const PIXELFORMAT_DXT1 = 8;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_DXT3
+     * @description Block compressed format; storing 16 input pixels (corresponding to a 4x4 pixel block) into 128 bits of output; consisting of 64 bits of alpha channel data (4 bits for each pixel) followed by 64 bits of color data; encoded the same way as DXT1.
+     */
+    const PIXELFORMAT_DXT3 = 9;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_DXT5
+     * @description Block compressed format; storing 16 input pixels into 128 bits of output; consisting of 64 bits of alpha channel data (two 8 bit alpha values and a 4x4 3 bit lookup table) followed by 64 bits of color data (encoded the same way as DXT1).
+     */
+    const PIXELFORMAT_DXT5 = 10;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_RGB16F
+     * @description 16-bit floating point RGB (16-bit float for each red; green and blue channels).
+     */
+    const PIXELFORMAT_RGB16F = 11;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_RGBA16F
+     * @description 16-bit floating point RGBA (16-bit float for each red; green; blue and alpha channels).
+     */
+    const PIXELFORMAT_RGBA16F = 12;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_RGB32F
+     * @description 32-bit floating point RGB (32-bit float for each red; green and blue channels).
+     */
+    const PIXELFORMAT_RGB32F = 13;
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_RGBA32F
+     * @description 32-bit floating point RGBA (32-bit float for each red; green; blue and alpha channels).
+     */
+    const PIXELFORMAT_RGBA32F = 14;
+
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_R32F
+     * @description 32-bit floating point single channel format (WebGL2 only).
+     */
+    const PIXELFORMAT_R32F = 15;
+
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_DEPTH
+     * @description A readable depth buffer format
+     */
+    const PIXELFORMAT_DEPTH = 16;
+
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_DEPTHSTENCIL
+     * @description A readable depth/stencil buffer format (WebGL2 only).
+     */
+    const PIXELFORMAT_DEPTHSTENCIL = 17;
+
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_111110F
+     * @description A floating-point color-only format with 11 bits for red and green channels; and 10 bits for the blue channel (WebGL2 only).
+     */
+    const PIXELFORMAT_111110F = 18;
+
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_SRGB
+     * @description Color-only sRGB format (WebGL2 only).
+     */
+    const PIXELFORMAT_SRGB = 19;
+
+    /**
+     * @enum pc.PIXELFORMAT
+     * @name pc.PIXELFORMAT_SRGBA
+     * @description Color sRGB format with additional alpha channel (WebGL2 only).
+     */
+    const PIXELFORMAT_SRGBA = 20;
+
+    const PIXELFORMAT_ETC1 = 21;
+    const PIXELFORMAT_PVRTC_2BPP_RGB_1 = 22;
+    const PIXELFORMAT_PVRTC_2BPP_RGBA_1 = 23;
+    const PIXELFORMAT_PVRTC_4BPP_RGB_1 = 24;
+    const PIXELFORMAT_PVRTC_4BPP_RGBA_1 = 25;
+    // only add compressed formats next
+
+    /**
+     * @enum pc.PRIMITIVE
+     * @name pc.PRIMITIVE_POINTS
+     * @description List of distinct points.
+     */
+    const PRIMITIVE_POINTS = 0;
+    /**
+     * @enum pc.PRIMITIVE
+     * @name pc.PRIMITIVE_LINES
+     * @description Discrete list of line segments.
+     */
+    const PRIMITIVE_LINES = 1;
+    /**
+     * @enum pc.PRIMITIVE
+     * @name pc.PRIMITIVE_LINELOOP
+     * @description List of points that are linked sequentially by line segments; with a closing line segment between the last and first points.
+     */
+    const PRIMITIVE_LINELOOP = 2;
+    /**
+     * @enum pc.PRIMITIVE
+     * @name pc.PRIMITIVE_LINESTRIP
+     * @description List of points that are linked sequentially by line segments.
+     */
+    const PRIMITIVE_LINESTRIP = 3;
+    /**
+     * @enum pc.PRIMITIVE
+     * @name pc.PRIMITIVE_TRIANGLES
+     * @description Discrete list of triangles.
+     */
+    const PRIMITIVE_TRIANGLES = 4;
+    /**
+     * @enum pc.PRIMITIVE
+     * @name pc.PRIMITIVE_TRISTRIP
+     * @description Connected strip of triangles where a specified vertex forms a triangle using the previous two.
+     */
+    const PRIMITIVE_TRISTRIP = 5;
+    /**
+     * @enum pc.PRIMITIVE
+     * @name pc.PRIMITIVE_TRIFAN
+     * @description Connected fan of triangles where the first vertex forms triangles with the following pairs of vertices.
+     */
+    const PRIMITIVE_TRIFAN = 6;
+
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_POSITION
+     * @description Vertex attribute to be treated as a position.
+     */
+    const SEMANTIC_POSITION = "POSITION";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_NORMAL
+     * @description Vertex attribute to be treated as a normal.
+     */
+    const SEMANTIC_NORMAL = "NORMAL";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TANGENT
+     * @description Vertex attribute to be treated as a tangent.
+     */
+    const SEMANTIC_TANGENT = "TANGENT";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_BLENDWEIGHT
+     * @description Vertex attribute to be treated as skin blend weights.
+     */
+    const SEMANTIC_BLENDWEIGHT = "BLENDWEIGHT";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_BLENDINDICES
+     * @description Vertex attribute to be treated as skin blend indices.
+     */
+    const SEMANTIC_BLENDINDICES = "BLENDINDICES";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_COLOR
+     * @description Vertex attribute to be treated as a color.
+     */
+    const SEMANTIC_COLOR = "COLOR";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD0
+     * @description Vertex attribute to be treated as a texture coordinate (set 0).
+     */
+    const SEMANTIC_TEXCOORD0 = "TEXCOORD0";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD1
+     * @description Vertex attribute to be treated as a texture coordinate (set 1).
+     */
+    const SEMANTIC_TEXCOORD1 = "TEXCOORD1";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD2
+     * @description Vertex attribute to be treated as a texture coordinate (set 2).
+     */
+    const SEMANTIC_TEXCOORD2 = "TEXCOORD2";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD3
+     * @description Vertex attribute to be treated as a texture coordinate (set 3).
+     */
+    const SEMANTIC_TEXCOORD3 = "TEXCOORD3";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD4
+     * @description Vertex attribute to be treated as a texture coordinate (set 4).
+     */
+    const SEMANTIC_TEXCOORD4 = "TEXCOORD4";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD5
+     * @description Vertex attribute to be treated as a texture coordinate (set 5).
+     */
+    const SEMANTIC_TEXCOORD5 = "TEXCOORD5";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD6
+     * @description Vertex attribute to be treated as a texture coordinate (set 6).
+     */
+    const SEMANTIC_TEXCOORD6 = "TEXCOORD6";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_TEXCOORD7
+     * @description Vertex attribute to be treated as a texture coordinate (set 7).
+     */
+    const SEMANTIC_TEXCOORD7 = "TEXCOORD7";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR0
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR0 = "ATTR0";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR1
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR1 = "ATTR1";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR2
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR2 = "ATTR2";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR3
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR3 = "ATTR3";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR4
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR4 = "ATTR4";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR5
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR5 = "ATTR5";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR6
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR6 = "ATTR6";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR7
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR7 = "ATTR7";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR8
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR8 = "ATTR8";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR9
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR9 = "ATTR9";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR10
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR10 = "ATTR10";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR11
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR11 = "ATTR11";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR12
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR12 = "ATTR12";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR13
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR13 = "ATTR13";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR14
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR14 = "ATTR14";
+    /**
+     * @enum pc.SEMANTIC
+     * @name pc.SEMANTIC_ATTR15
+     * @description Vertex attribute with a user defined semantic.
+     */
+    const SEMANTIC_ATTR15 = "ATTR15";
+
+    const SHADERTAG_MATERIAL = 1;
+
+    const STENCILOP_KEEP = 0;
+    const STENCILOP_ZERO = 1;
+    const STENCILOP_REPLACE = 2;
+    const STENCILOP_INCREMENT = 3;
+    const STENCILOP_INCREMENTWRAP = 4;
+    const STENCILOP_DECREMENT = 5;
+    const STENCILOP_DECREMENTWRAP = 6;
+    const STENCILOP_INVERT = 7;
+
+    /**
+     * @enum pc.TEXTURELOCK
+     * @name pc.TEXTURELOCK_READ
+     * @description Read only. Any changes to the locked mip level's pixels will not update the texture.
+     */
+    const TEXTURELOCK_READ = 1;
+    /**
+     * @enum pc.TEXTURELOCK
+     * @name pc.TEXTURELOCK_WRITE
+     * @description Write only. The contents of the specified mip level will be entirely replaced.
+     */
+    const TEXTURELOCK_WRITE = 2;
+
+    const TEXHINT_NONE = 0;
+    const TEXHINT_SHADOWMAP = 1;
+    const TEXHINT_ASSET = 2;
+    const TEXHINT_LIGHTMAP = 3;
+
+    const UNIFORMTYPE_BOOL = 0;
+    const UNIFORMTYPE_INT = 1;
+    const UNIFORMTYPE_FLOAT = 2;
+    const UNIFORMTYPE_VEC2 = 3;
+    const UNIFORMTYPE_VEC3 = 4;
+    const UNIFORMTYPE_VEC4 = 5;
+    const UNIFORMTYPE_IVEC2 = 6;
+    const UNIFORMTYPE_IVEC3 = 7;
+    const UNIFORMTYPE_IVEC4 = 8;
+    const UNIFORMTYPE_BVEC2 = 9;
+    const UNIFORMTYPE_BVEC3 = 10;
+    const UNIFORMTYPE_BVEC4 = 11;
+    const UNIFORMTYPE_MAT2 = 12;
+    const UNIFORMTYPE_MAT3 = 13;
+    const UNIFORMTYPE_MAT4 = 14;
+    const UNIFORMTYPE_TEXTURE2D = 15;
+    const UNIFORMTYPE_TEXTURECUBE = 16;
+    const UNIFORMTYPE_FLOATARRAY = 17;
+    const UNIFORMTYPE_TEXTURE2D_SHADOW = 18;
+    const UNIFORMTYPE_TEXTURECUBE_SHADOW = 19;
+    const UNIFORMTYPE_TEXTURE3D = 20;
+}
diff --git a/types/playcanvas/engine/graphics/index-buffer.d.ts b/types/playcanvas/engine/graphics/index-buffer.d.ts
new file mode 100644
index 0000000000..12779368e5
--- /dev/null
+++ b/types/playcanvas/engine/graphics/index-buffer.d.ts
@@ -0,0 +1,61 @@
+declare namespace pc {
+
+    /**
+     * @name pc.IndexBuffer
+     * @class An index buffer is the mechanism via which the application specifies primitive
+     * index data to the graphics hardware.
+     * @description Creates a new index buffer.
+     * @example
+     * // Create an index buffer holding 3 16-bit indices
+     * // The buffer is marked as static, hinting that the buffer will never be modified
+     * var indexBuffer = new pc.IndexBuffer(graphicsDevice, pc.INDEXFORMAT_UINT16, 3, pc.BUFFER_STATIC);
+     * @param {pc.GraphicsDevice} graphicsDevice The graphics device used to manage this index buffer.
+     * @param {Number} format The type of each index to be stored in the index buffer (see pc.INDEXFORMAT_*).
+     * @param {Number} numIndices The number of indices to be stored in the index buffer.
+     * @param {Number} [usage] The usage type of the vertex buffer (see pc.BUFFER_*).
+     * @param {ArrayBuffer} [initialData] Initial data.
+     */
+    class IndexBuffer {
+        constructor(graphicsDevice: pc.GraphicsDevice, format: number, numIndices: number, usage?: number, initialData?: any)
+
+        /**
+         * @function
+         * @name pc.IndexBuffer#destroy
+         * @description Frees resources associated with this index buffer.
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.IndexBuffer#getFormat
+         * @description Returns the data format of the specified index buffer.
+         * @returns {Number} The data format of the specified index buffer (see pc.INDEXFORMAT_*).
+         */
+        getFormat(): void;
+
+        /**
+         * @function
+         * @name pc.IndexBuffer#getNumIndices
+         * @description Returns the number of indices stored in the specified index buffer.
+         * @returns {Number} The number of indices stored in the specified index buffer.
+         */
+        getNumIndices(): number;
+
+        /**
+         * @function
+         * @name pc.IndexBuffer#lock
+         * @description Gives access to the block of memory that stores the buffer's indices.
+         * @returns {ArrayBuffer} A contiguous block of memory where index data can be written to.
+         */
+        lock(): ArrayBuffer;
+
+        /**
+         * @function
+         * @name pc.IndexBuffer#unlock
+         * @description Signals that the block of memory returned by a call to the lock function is
+         * ready to be given to the graphics hardware. Only unlocked index buffers can be set on the
+         * currently active device.
+         */
+        unlock(): void;
+    }
+}
diff --git a/types/playcanvas/engine/graphics/post-effect.d.ts b/types/playcanvas/engine/graphics/post-effect.d.ts
new file mode 100644
index 0000000000..7575098503
--- /dev/null
+++ b/types/playcanvas/engine/graphics/post-effect.d.ts
@@ -0,0 +1,25 @@
+declare namespace pc {
+
+    /**
+    * @name pc.PostEffect
+    * @class Base class for all post effects. Post effects take a a render target as input
+    * apply effects to it and then render the result to an output render target or the screen
+    * if no output is specified.
+    * @description Creates new PostEffect
+    * @param {pc.GraphicsDevice} graphicsDevice The graphics device of the application
+    */
+    class PostEffect {
+        constructor(graphicsDevice: pc.GraphicsDevice)
+
+        /**
+        * @function
+        * @name pc.PostEffect#render
+        * @description Render the post effect using the specified inputTarget
+        * to the specified outputTarget.
+        * @param {pc.RenderTarget} inputTarget The input render target
+        * @param {pc.RenderTarget} outputTarget The output render target. If null then this will be the screen.
+        * @param {pc.Vec4} rect (Optional) The rect of the current camera. If not specified then it will default to [0,0,1,1]
+        */
+        render(inputTarget: pc.RenderTarget, outputTarget: pc.RenderTarget, rect: pc.Vec4): void;
+    }
+}
diff --git a/types/playcanvas/engine/graphics/program-library.d.ts b/types/playcanvas/engine/graphics/program-library.d.ts
new file mode 100644
index 0000000000..ef203317b4
--- /dev/null
+++ b/types/playcanvas/engine/graphics/program-library.d.ts
@@ -0,0 +1,18 @@
+declare namespace pc {
+
+    class ProgramLibrary {
+        constructor(device: pc.GraphicsDevice)
+
+        register(name: string, generator: any): void;
+    
+        unregister(name: string): void;
+    
+        isRegistered(name: string): void;
+    
+        getProgram(name: string, options: {}): pc.Shader;
+    
+        clearCache(): void;
+    
+        removeFromCache(shader: pc.Shader): void;  
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/graphics/render-target.d.ts b/types/playcanvas/engine/graphics/render-target.d.ts
new file mode 100644
index 0000000000..25e4d6aea7
--- /dev/null
+++ b/types/playcanvas/engine/graphics/render-target.d.ts
@@ -0,0 +1,145 @@
+declare namespace pc {
+
+    /**
+     * @name pc.RenderTarget
+     * @class A render target is a rectangular rendering surface.
+     * @description Creates a new render target. A color buffer or a depth buffer must be set.
+     * @param {Object} options Object for passing optional arguments.
+     * @param {pc.Texture} [options.colorBuffer] The texture that this render target will treat as a rendering surface.
+     * @param {Boolean} [options.depth] If set to true, depth buffer will be created. Defaults to true. Ignored if depthBuffer is defined.
+     * @param {Boolean} [options.stencil] If set to true, depth buffer will include stencil. Defaults to false. Ignored if depthBuffer is defined or depth is false.
+     * @param {pc.Texture} [options.depthBuffer] The texture that this render target will treat as a depth/stencil surface (WebGL2 only). If set, the 'depth' and 'stencil' properties are ignored.
+     * Texture must have pc.PIXELFORMAT_DEPTH or PIXELFORMAT_DEPTHSTENCIL format.
+     * @param {Number} [options.samples] Number of hardware anti-aliasing samples (WebGL2 only). Default is 1.
+     * @param {Boolean} [options.autoResolve] If samples > 1, enables or disables automatic MSAA resolve after rendering to this RT (see pc.RenderTarget#resolve). Defaults to true;
+     * Defaults to true.
+     * @param {Number} [options.face] If the colorBuffer parameter is a cubemap, use this option to specify the
+     * face of the cubemap to render to. Can be:
+     * <ul>
+     *     <li>pc.CUBEFACE_POSX</li>
+     *     <li>pc.CUBEFACE_NEGX</li>
+     *     <li>pc.CUBEFACE_POSY</li>
+     *     <li>pc.CUBEFACE_NEGY</li>
+     *     <li>pc.CUBEFACE_POSZ</li>
+     *     <li>pc.CUBEFACE_NEGZ</li>
+     * </ul>
+     * Defaults to pc.CUBEFACE_POSX.
+     * @example
+     * // Create a 512x512x24-bit render target with a depth buffer
+     * var colorBuffer = new pc.Texture(graphicsDevice, {
+     *     width: 512,
+     *     height: 512,
+     *     format: pc.PIXELFORMAT_R8_G8_B8
+     * });
+     * var renderTarget = new pc.RenderTarget(graphicsDevice, colorBuffer, {
+     *     depth: true
+     * });
+     *
+     * // Set the render target on an entity's camera component
+     * entity.camera.renderTarget = renderTarget;
+     */
+    class RenderTarget {
+        constructor(options: {
+            colorBuffer?: pc.Texture,
+            depth?: boolean,
+            stencil?: boolean,
+            depthBuffer?: pc.Texture,
+            samples?: number,
+            autoResolve?: boolean,
+            face?: number
+        })
+        constructor(options: pc.GraphicsDevice, _arg2: pc.Texture, _arg3: {
+            colorBuffer?: pc.Texture,
+            depth?: boolean,
+            stencil?: boolean,
+            depthBuffer?: pc.Texture,
+            samples?: number,
+            autoResolve?: boolean,
+            face?: number
+        })
+
+        /**
+         * @function
+         * @name pc.RenderTarget#destroy
+         * @description Frees resources associated with this render target.
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.RenderTarget#resolve
+         * @description If samples > 1, resolves the anti-aliased render target (WebGL2 only).
+         * When you're rendering to an anti-aliased render target, pixels aren't written directly to the readable texture.
+         * Instead, they're first written to a MSAA buffer, where each sample for each pixel is stored independently.
+         * In order to read the results, you first need to 'resolve' the buffer - to average all samples and create a simple texture with one color per pixel.
+         * This function performs this averaging and updates the colorBuffer and the depthBuffer.
+         * If autoResolve is set to true, the resolve will happen after every rendering to this render target, otherwise you can do it manually,
+         * during the app update or inside a pc.Command.
+         * @param {Boolean} color Resolve color buffer
+         * @param {Boolean} depth Resolve depth buffer
+         */
+        resolve(color: boolean, depth: boolean): void;
+
+        /**
+         * @function
+         * @name pc.RenderTarget#copy
+         * @description Copies color and/or depth contents of source render target to this one. Formats, sizes and anti-aliasing samples must match.
+         * Depth buffer can only be copied on WebGL 2.0.
+         * @param {pc.RenderTarget} source Source render target to copy from
+         * @param {Boolean} color Copy color buffer
+         * @param {Boolean} depth Copy depth buffer
+         */
+        copy(source: pc.RenderTarget, color: boolean, depth: boolean): pc.RenderTarget;
+
+
+        /**
+         * @readonly
+         * @name pc.RenderTarget#colorBuffer
+         * @type pc.Texture
+         * @description Color buffer set up on the render target.
+         */
+        readonly colorBuffer: pc.Texture;
+
+        /**
+         * @readonly
+         * @name pc.RenderTarget#depthBuffer
+         * @type pc.Texture
+         * @description Depth buffer set up on the render target. Only available, if depthBuffer was set in constructor.
+         * Not available, if depth property was used instead.
+         */
+        readonly depthBuffer: pc.Texture;
+
+        /**
+         * @readonly
+         * @name pc.RenderTarget#face
+         * @type Number
+         * @description If the render target is bound to a cubemap, this property
+         * specifies which face of the cubemap is rendered to. Can be:
+         * <ul>
+         *     <li>pc.CUBEFACE_POSX</li>
+         *     <li>pc.CUBEFACE_NEGX</li>
+         *     <li>pc.CUBEFACE_POSY</li>
+         *     <li>pc.CUBEFACE_NEGY</li>
+         *     <li>pc.CUBEFACE_POSZ</li>
+         *     <li>pc.CUBEFACE_NEGZ</li>
+         * </ul>
+         */
+        readonly face: number;
+
+        /**
+         * @readonly
+         * @name pc.RenderTarget#width
+         * @type Number
+         * @description Width of the render target in pixels.
+         */
+        readonly width: number
+
+        /**
+         * @readonly
+         * @name pc.RenderTarget#height
+         * @type Number
+         * @description Height of the render target in pixels.
+         */
+        readonly height: number;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/graphics/shader.d.ts b/types/playcanvas/engine/graphics/shader.d.ts
new file mode 100644
index 0000000000..4bea7f366a
--- /dev/null
+++ b/types/playcanvas/engine/graphics/shader.d.ts
@@ -0,0 +1,64 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Shader
+     * @class A shader is a program that is responsible for rendering graphical primitives on a device's
+     * graphics processor. The shader is generated from a shader definition. This shader definition specifies
+     * the code for processing vertices and fragments processed by the GPU. The language of the code is GLSL
+     * (or more specifically ESSL, the OpenGL ES Shading Language). The shader definition also describes how
+     * the PlayCanvas engine should map vertex buffer elements onto the attributes specified in the vertex
+     * shader code.
+     * @description Creates a new shader object.
+     * @param {pc.GraphicsDevice} graphicsDevice The graphics device used to manage this shader.
+     * @param {Object} definition The shader definition from which to build the shader.
+     * @param {Object} definition.attributes Object detailing the mapping of vertex shader attribute names
+     * to semantics (pc.SEMANTIC_*). This enables the engine to match vertex buffer data as inputs to the
+     * shader.
+     * @param {String} definition.vshader Vertex shader source (GLSL code).
+     * @param {String} definition.fshader Fragment shader source (GLSL code).
+     * @param {Boolean} definition.useTransformFeedback Specifies that this shader outputs post-VS data to a buffer
+     * @example
+     * // Create a shader that renders primitives with a solid red color
+     * var shaderDefinition = {
+     *     attributes: {
+     *         aPosition: pc.SEMANTIC_POSITION
+     *     },
+     *     vshader: [
+     *         "attribute vec3 aPosition;",
+     *         "",
+     *         "void main(void)",
+     *         "{",
+     *         "    gl_Position = vec4(aPosition, 1.0);",
+     *         "}"
+     *     ].join("\n"),
+     *     fshader: [
+     *         "precision " + graphicsDevice.precision + " float;",
+     *         "",
+     *         "void main(void)",
+     *         "{",
+     *         "    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);",
+     *         "}"
+     *     ].join("\n")
+     * };
+     *
+     * shader = new pc.Shader(graphicsDevice, shaderDefinition);
+     * @author Will Eastcott
+     */
+    class Shader {
+        constructor(graphicsDevice: pc.GraphicsDevice, definition: { 
+            attributes: {},
+            vshader: string,
+            fshader: string,
+            useTransformFeedback: boolean
+        })
+
+        /**
+         * @function
+         * @name pc.Shader#destroy
+         * @description Frees resources associated with this shader.
+         */
+        destroy(): void;
+
+
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/graphics/texture.d.ts b/types/playcanvas/engine/graphics/texture.d.ts
new file mode 100644
index 0000000000..ac637117bf
--- /dev/null
+++ b/types/playcanvas/engine/graphics/texture.d.ts
@@ -0,0 +1,373 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Texture
+     * @class A texture is a container for texel data that can be utilized in a fragment shader.
+     * Typically, the texel data represents an image that is mapped over geometry.
+     * @description Creates a new texture.
+     * @param {pc.GraphicsDevice} graphicsDevice The graphics device used to manage this texture.
+     * @param {Object} options Object for passing optional arguments.
+     * @param {Number} options.width The width of the texture in pixels. Defaults to 4.
+     * @param {Number} options.height The height of the texture in pixels. Defaults to 4.
+     * @param {Number} options.depth The number of depth slices in a 3D texture (WebGL2 only). Defaults to 1 (single 2D image).
+     * @param {Number} options.format The pixel format of the texture. Can be:
+     * <ul>
+     *     <li>{@link pc.PIXELFORMAT_A8}</li>
+     *     <li>{@link pc.PIXELFORMAT_L8}</li>
+     *     <li>{@link pc.PIXELFORMAT_L8_A8}</li>
+     *     <li>{@link pc.PIXELFORMAT_R5_G6_B5}</li>
+     *     <li>{@link pc.PIXELFORMAT_R5_G5_B5_A1}</li>
+     *     <li>{@link pc.PIXELFORMAT_R4_G4_B4_A4}</li>
+     *     <li>{@link pc.PIXELFORMAT_R8_G8_B8}</li>
+     *     <li>{@link pc.PIXELFORMAT_R8_G8_B8_A8}</li>
+     *     <li>{@link pc.PIXELFORMAT_DXT1}</li>
+     *     <li>{@link pc.PIXELFORMAT_DXT3}</li>
+     *     <li>{@link pc.PIXELFORMAT_DXT5}</li>
+     *     <li>{@link pc.PIXELFORMAT_RGB16F}</li>
+     *     <li>{@link pc.PIXELFORMAT_RGBA16F}</li>
+     *     <li>{@link pc.PIXELFORMAT_RGB32F}</li>
+     *     <li>{@link pc.PIXELFORMAT_RGBA32F}</li>
+     *     <li>{@link pc.PIXELFORMAT_ETC1}</li>
+     *     <li>{@link pc.PIXELFORMAT_PVRTC_2BPP_RGB_1}</li>
+     *     <li>{@link pc.PIXELFORMAT_PVRTC_2BPP_RGBA_1}</li>
+     *     <li>{@link pc.PIXELFORMAT_PVRTC_4BPP_RGB_1}</li>
+     *     <li>{@link pc.PIXELFORMAT_PVRTC_4BPP_RGBA_1}</li>
+     *     <li>{@link pc.PIXELFORMAT_111110F}</li>
+     * </ul>
+     * Defaults to pc.PIXELFORMAT_R8_G8_B8_A8.
+     * @param {Number} options.minFilter The minification filter type to use. Defaults to {@link pc.FILTER_LINEAR_MIPMAP_LINEAR}
+     * @param {Number} options.magFilter The magnification filter type to use. Defaults to {@link pc.FILTER_LINEAR}
+     * @param {Number} options.anisotropy The level of anisotropic filtering to use. Defaults to 1
+     * @param {Number} options.addressU The repeat mode to use in the U direction. Defaults to {@link pc.ADDRESS_REPEAT}
+     * @param {Number} options.addressV The repeat mode to use in the V direction. Defaults to {@link pc.ADDRESS_REPEAT}
+     * @param {Boolean} options.mipmaps When enabled try to generate or use mipmaps for this texture. Default is true
+     * @param {Boolean} options.cubemap Specifies whether the texture is to be a cubemap. Defaults to false.
+     * @param {Boolean} options.volume Specifies whether the texture is to be a 3D volume (WebGL2 only). Defaults to false.
+     * @param {Boolean} options.rgbm Specifies whether the texture contains RGBM-encoded HDR data. Defaults to false.
+     * @param {Boolean} options.fixCubemapSeams Specifies whether this cubemap texture requires special
+     * seam fixing shader code to look right. Defaults to false.
+     * @param {Boolean} options.flipY Specifies whether the texture should be flipped in the Y-direction. Only affects textures
+     * with a source that is an image, canvas or video element. Does not affect cubemaps, compressed textures or textures set from raw
+     * pixel data. Defaults to true.
+     * @param {Boolean} options.compareOnRead When enabled, and if texture format is pc.PIXELFORMAT_DEPTH or pc.PIXELFORMAT_DEPTHSTENCIL,
+     * hardware PCF is enabled for this texture, and you can get filtered results of comparison using texture() in your shader (WebGL2 only).
+     * Defaults to false.
+     * @param {Number} options.compareFunc Comparison function when compareOnRead is enabled (WebGL2 only). Defaults to pc.FUNC_LESS.
+     * Possible values:
+     * <ul>
+     *     <li>pc.FUNC_LESS</li>
+     *     <li>pc.FUNC_LESSEQUAL</li>
+     *     <li>pc.FUNC_GREATER</li>
+     *     <li>pc.FUNC_GREATEREQUAL</li>
+     *     <li>pc.FUNC_EQUAL</li>
+     *     <li>pc.FUNC_NOTEQUAL</li>
+     * </ul>
+     * @example
+     * // Create a 8x8x24-bit texture
+     * var texture = new pc.Texture(graphicsDevice, {
+     *     width: 8,
+     *     height: 8,
+     *     format: pc.PIXELFORMAT_R8_G8_B8
+     * });
+     *
+     * // Fill the texture with a gradient
+     * var pixels = texture.lock();
+     * var count = 0;
+     * for (var i = 0; i < 8; i++) {
+     *     for (var j = 0; j < 8; j++) {
+     *         pixels[count++] = i * 32;
+     *         pixels[count++] = j * 32;
+     *         pixels[count++] = 255;
+     *     }
+     * }
+     * texture.unlock();
+     * @property {String} name The name of the texture. Defaults to null.
+     * @author Will Eastcott
+     */
+    class Texture {
+        constructor(graphicsDevice: pc.GraphicsDevice, options: {
+            width: number,
+            height: number,
+            depth: number,
+            format: number,
+            minFilter: number,
+            magFilter: number,
+            anisotropy: number,
+            addressU: number,
+            addressV: number,
+            mipmaps: boolean,
+            cubemap: boolean,
+            volume: boolean,
+            rgbm: boolean,
+            fixCubemapSeams: boolean,
+            flipY: boolean,
+            compareOnRead: boolean,
+            compareFunc: boolean
+        })
+
+        name: string;
+
+        /**
+         * @name pc.Texture#minFilter
+         * @type Number
+         * @description The minification filter to be applied to the texture. Can be:
+         * <ul>
+         *     <li>{@link pc.FILTER_NEAREST}</li>
+         *     <li>{@link pc.FILTER_LINEAR}</li>
+         *     <li>{@link pc.FILTER_NEAREST_MIPMAP_NEAREST}</li>
+         *     <li>{@link pc.FILTER_NEAREST_MIPMAP_LINEAR}</li>
+         *     <li>{@link pc.FILTER_LINEAR_MIPMAP_NEAREST}</li>
+         *     <li>{@link pc.FILTER_LINEAR_MIPMAP_LINEAR}</li>
+         * </ul>
+         */
+        minFilter: number;
+
+        /**
+         * @name pc.Texture#magFilter
+         * @type Number
+         * @description The magnification filter to be applied to the texture. Can be:
+         * <ul>
+         *     <li>{@link pc.FILTER_NEAREST}</li>
+         *     <li>{@link pc.FILTER_LINEAR}</li>
+         * </ul>
+         */
+        magFilter: number;
+
+        /**
+         * @name pc.Texture#addressU
+         * @type Number
+         * @description The addressing mode to be applied to the texture horizontally. Can be:
+         * <ul>
+         *     <li>{@link pc.ADDRESS_REPEAT}</li>
+         *     <li>{@link pc.ADDRESS_CLAMP_TO_EDGE}</li>
+         *     <li>{@link pc.ADDRESS_MIRRORED_REPEAT}</li>
+         * </ul>
+         */
+        addressU: number;
+
+        /**
+         * @name pc.Texture#addressV
+         * @type Number
+         * @description The addressing mode to be applied to the texture vertically. Can be:
+         * <ul>
+         *     <li>{@link pc.ADDRESS_REPEAT}</li>
+         *     <li>{@link pc.ADDRESS_CLAMP_TO_EDGE}</li>
+         *     <li>{@link pc.ADDRESS_MIRRORED_REPEAT}</li>
+         * </ul>
+         */
+        addressV: number;
+
+        /**
+         * @name pc.Texture#addressW
+         * @type Number
+         * @description The addressing mode to be applied to the 3D texture depth (WebGL2 only). Can be:
+         * <ul>
+         *     <li>{@link pc.ADDRESS_REPEAT}</li>
+         *     <li>{@link pc.ADDRESS_CLAMP_TO_EDGE}</li>
+         *     <li>{@link pc.ADDRESS_MIRRORED_REPEAT}</li>
+         * </ul>
+         */
+        addressW: number;
+
+        /**
+         * @name pc.Texture#compareOnRead
+         * @type Boolean
+         * @description When enabled, and if texture format is pc.PIXELFORMAT_DEPTH or pc.PIXELFORMAT_DEPTHSTENCIL,
+         * hardware PCF is enabled for this texture, and you can get filtered results of comparison using texture() in your shader (WebGL2 only).
+         */
+        compareOnRead: boolean;
+
+        /**
+         * @name pc.Texture#compareFunc
+         * @type Number
+         * @description Comparison function when compareOnRead is enabled (WebGL2 only).
+         * Possible values:
+         * <ul>
+         *     <li>pc.FUNC_LESS</li>
+         *     <li>pc.FUNC_LESSEQUAL</li>
+         *     <li>pc.FUNC_GREATER</li>
+         *     <li>pc.FUNC_GREATEREQUAL</li>
+         *     <li>pc.FUNC_EQUAL</li>
+         *     <li>pc.FUNC_NOTEQUAL</li>
+         * </ul>
+         */
+        compareFunc: number;
+
+        /**
+         * @private
+         * @deprecated
+         * @name pc.Texture#autoMipmap
+         * @type Boolean
+         * @description Toggles automatic mipmap generation. Can't be used on non power of two textures.
+         */
+        private autoMipmap: boolean;
+
+        /**
+         * @name pc.Texture#mipmaps
+         * @type Boolean
+         * @description Defines if texture should generate/upload mipmaps if possible.
+         */
+        mipmaps: boolean;
+
+        /**
+         * @name pc.Texture#anisotropy
+         * @type Number
+         * @description Integer value specifying the level of anisotropic to apply to the texture
+         * ranging from 1 (no anisotropic filtering) to the {@link pc.GraphicsDevice} property maxAnisotropy.
+         */
+        anisotropy: number;
+
+        /**
+         * @readonly
+         * @name pc.Texture#width
+         * @type Number
+         * @description The width of the texture in pixels.
+         */
+        readonly width: number;
+
+        /**
+         * @readonly
+         * @name pc.Texture#height
+         * @type Number
+         * @description The height of the texture in pixels.
+         */
+        readonly height: number;
+
+        /**
+         * @readonly
+         * @name pc.Texture#depth
+         * @type Number
+         * @description The number of depth slices in a 3D texture (WebGL2 only).
+         */
+        readonly depth: number;
+
+        /**
+         * @readonly
+         * @name pc.Texture#format
+         * @type Number
+         * @description The pixel format of the texture. Can be:
+         * <ul>
+         *     <li>{@link pc.PIXELFORMAT_A8}</li>
+         *     <li>{@link pc.PIXELFORMAT_L8}</li>
+         *     <li>{@link pc.PIXELFORMAT_L8_A8}</li>
+         *     <li>{@link pc.PIXELFORMAT_R5_G6_B5}</li>
+         *     <li>{@link pc.PIXELFORMAT_R5_G5_B5_A1}</li>
+         *     <li>{@link pc.PIXELFORMAT_R4_G4_B4_A4}</li>
+         *     <li>{@link pc.PIXELFORMAT_R8_G8_B8}</li>
+         *     <li>{@link pc.PIXELFORMAT_R8_G8_B8_A8}</li>
+         *     <li>{@link pc.PIXELFORMAT_DXT1}</li>
+         *     <li>{@link pc.PIXELFORMAT_DXT3}</li>
+         *     <li>{@link pc.PIXELFORMAT_DXT5}</li>
+         *     <li>{@link pc.PIXELFORMAT_RGB16F}</li>
+         *     <li>{@link pc.PIXELFORMAT_RGBA16F}</li>
+         *     <li>{@link pc.PIXELFORMAT_RGB32F}</li>
+         *     <li>{@link pc.PIXELFORMAT_RGBA32F}</li>
+         *     <li>{@link pc.PIXELFORMAT_ETC1}</li>
+         *     <li>{@link pc.PIXELFORMAT_PVRTC_2BPP_RGB_1}</li>
+         *     <li>{@link pc.PIXELFORMAT_PVRTC_2BPP_RGBA_1}</li>
+         *     <li>{@link pc.PIXELFORMAT_PVRTC_4BPP_RGB_1}</li>
+         *     <li>{@link pc.PIXELFORMAT_PVRTC_4BPP_RGBA_1}</li>
+         *     <li>{@link pc.PIXELFORMAT_111110F}</li>
+         * </ul>
+         */
+        readonly format: number;
+
+        /**
+         * @readonly
+         * @name pc.Texture#cubemap
+         * @type Boolean
+         * @description Returns true if this texture is a cube map and false otherwise.
+         */
+        readonly cubemap: boolean;
+
+        /**
+         * @readonly
+         * @name pc.Texture#volume
+         * @type Boolean
+         * @description Returns true if this texture is a 3D volume and false otherwise.
+         */
+        readonly volume: boolean;
+
+        /**
+         * @name pc.Texture#flipY
+         * @type Boolean
+         * @description Specifies whether the texture should be flipped in the Y-direction. Only affects textures
+         * with a source that is an image, canvas or video element. Does not affect cubemaps, compressed textures
+         * or textures set from raw pixel data. Defaults to true.
+         */
+        flipY: boolean;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Texture#bind
+         * @description Activates the specified texture on the current texture unit.
+         */
+        private bind(): void;
+
+        /**
+         * @function
+         * @name pc.Texture#destroy
+         * @description Forcibly free up the underlying WebGL resource owned by the texture.
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.Texture#lock
+         * @description Locks a miplevel of the texture, returning a typed array to be filled with pixel data.
+         * @param {Object} options Optional options object. Valid properties are as follows:
+         * @param {Number} options.level The mip level to lock with 0 being the top level. Defaults to 0.
+         * @param {Number} options.face If the texture is a cubemap, this is the index of the face to lock.
+         */
+        lock(options: { level: number, face: number }): Uint8Array | Uint16Array | Float32Array;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Texture#recover
+         * @description Restores the texture in the event of the underlying WebGL context being lost and then
+         * restored.
+         */
+        private recover(): void;
+
+        /**
+         * @function
+         * @name pc.Texture#setSource
+         * @description Set the pixel data of the texture from a canvas, image, video DOM element. If the
+         * texture is a cubemap, the supplied source must be an array of 6 canvases, images or videos.
+         * @param {HTMLCanvasElement|HTMLImageElement|HTMLVideoElement|Array} source A canvas, image or video element,
+         * or an array of 6 canvas, image or video elements.
+         */
+        setSource(
+            source: HTMLCanvasElement | HTMLImageElement | HTMLVideoElement |
+                Array<HTMLCanvasElement | HTMLImageElement | HTMLVideoElement>
+        ): void;
+
+        /**
+         * @function
+         * @name pc.Texture#getSource
+         * @description Get the pixel data of the texture. If this is a cubemap then an array of 6 images will be returned otherwise
+         * a single image.
+         * @return {HTMLImageElement} The source image of this texture.
+         */
+        getSource(): HTMLImageElement
+
+        /**
+         * @function
+         * @name pc.Texture#unlock
+         * @description Unlocks the currently locked mip level and uploads it to VRAM.
+         */
+        unlock(): void;
+
+        /**
+         * @function
+         * @name pc.Texture#upload
+         * @description Forces a reupload of the textures pixel data to graphics memory. Ordinarily, this function
+         * is called by internally by {@link pc.Texture#setSource} and {@link pc.Texture#unlock}. However, it still needs to
+         * be called explicitly in the case where an HTMLVideoElement is set as the source of the texture.  Normally,
+         * this is done once every frame before video textured geometry is rendered.
+         */
+        upload(): void;
+    }
+}
diff --git a/types/playcanvas/engine/graphics/transform-feedback.d.ts b/types/playcanvas/engine/graphics/transform-feedback.d.ts
new file mode 100644
index 0000000000..e7cb87ce53
--- /dev/null
+++ b/types/playcanvas/engine/graphics/transform-feedback.d.ts
@@ -0,0 +1,112 @@
+declare namespace pc {
+
+    /**
+     * @name pc.TransformFeedback
+     * @class Transform feedback helper object
+     * @description This object allows you to configure and use the transform feedback feature (WebGL2 only).
+     *  How to use:<br>
+     *  <ol>
+     *  <li>First, check that you're on WebGL2, by looking at the <code>app.graphicsDevice.webgl2</code> value.</li>
+     *  <li>Define the outputs in your vertex shader. The syntax is <code>out vec3 out_vertex_position</code>, note that there must be out_ in the name. You can then simply assign values to these outputs in VS. The order and size of shader outputs must match the output buffer layout.</li>
+     *  <li>Create the shader using <code>pc.TransformFeedback.createShader(device, vsCode, yourShaderName)</code>.</li>
+     *  <li>Create/acquire the input vertex buffer. Can be any pc.VertexBuffer, either manually created, or from a pc.Mesh.</li>
+     *  <li>Create the pc.TransformFeedback object: <code>var tf = new pc.TransformFeedback(inputBuffer)</code>. This object will internally create an output buffer.</li>
+     *  <li>Run the shader: <code>tf.process(shader)</code>. Shader will take the input buffer, process it and write to the output buffer, then the input/output buffers will be automatically swapped, so you'll immediately see the result.</li>
+     *  </ol>
+     * @example
+     * // *** shader asset ***
+     * attribute vec3 vertex_position;
+     * attribute vec3 vertex_normal;
+     * attribute vec2 vertex_texCoord0;
+     * attribute vec4 vertex_tangent;
+     * out vec3 out_vertex_position;
+     * out vec3 out_vertex_normal;
+     * out vec2 out_vertex_texCoord0;
+     * out vec4 out_vertex_tangent;
+     * void main(void) {
+     *     // read position and normal, write new position (push away)
+     *     out_vertex_position = vertex_position + vertex_normal * 0.01;
+     *     // pass other attributes unchanged
+     *     out_vertex_normal = vertex_normal;
+     *     out_vertex_texCoord0 = vertex_texCoord0;
+     *     out_vertex_tangent = vertex_tangent;
+     * }
+     * @example
+     * // *** script asset ***
+     * var TransformExample = pc.createScript('transformExample');
+     *
+     * // attribute that references shader asset and material
+     * TransformExample.attributes.add('shaderCode', { type: 'asset', assetType: 'shader' });
+     * TransformExample.attributes.add('material', { type: 'asset', assetType: 'material' });
+     *
+     * TransformExample.prototype.initialize = function() {
+     *     var device = this.app.graphicsDevice;
+     *     var mesh = pc.createTorus(device, { tubeRadius: 0.01, ringRadius: 3 });
+     *     var node = new pc.GraphNode();
+     *     var meshInstance = new pc.MeshInstance(node, mesh, this.material.resource);
+     *     var model = new pc.Model();
+     *     model.graph = node;
+     *     model.meshInstances = [ meshInstance ];
+     *     this.app.scene.addModel(model);
+     *
+     *     // if webgl2 is not supported, TF is not available
+     *     if (!device.webgl2) return;
+     *     var inputBuffer = mesh.vertexBuffer;
+     *     this.tf = new pc.TransformFeedback(inputBuffer);
+     *     this.shader = pc.TransformFeedback.createShader(device, this.shaderCode.resource, "tfMoveUp");
+     * };
+     *
+     * TransformExample.prototype.update = function(dt) {
+     *     if (!this.app.graphicsDevice.webgl2) return;
+     *     this.tf.process(this.shader);
+     * };
+     * @param {pc.VertexBuffer} inputBuffer The input vertex buffer
+     * @param {Number} [usage] The optional usage type of the output vertex buffer (see pc.BUFFER_*). pc.BUFFER_GPUDYNAMIC is recommended for continuous update, and is the default value.
+     */
+    class TransformFeedback {
+        constructor(inputBuffer: pc.VertexBuffer, usage?: number)
+
+        /**
+         * @function
+         * @name pc.TransformFeedback#createShader
+         * @description Creates a transform feedback ready vertex shader from code.
+         * @param {pc.GraphicsDevice} graphicsDevice The graphics device used by the renderer.
+         * @param {String} vsCode Vertex shader code. Should contain output variables starting with "out_".
+         * @param {String} name Unique name for caching the shader.
+         * @returns {pc.Shader} A shader to use in the process() function.
+         */
+        static createShader(device: pc.GraphicsDevice, vsCode: string, name: string): pc.Shader;
+
+        /**
+         * @function
+         * @name pc.TransformFeedback#destroy
+         * @description Destroys the transform feedback helper object
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.TransformFeedback#process
+         * @description Runs the specified shader on the input buffer, writes results into the new buffer, then optionally swaps input/output.
+         * @param {pc.Shader} shader A vertex shader to run. Should be created with pc.TransformFeedback.createShader.
+         * @param {Boolean} [swap] Swap input/output buffer data. Useful for continuous buffer processing. Default is true.
+         */
+        process(shader: pc.Shader, swap?: boolean): void;
+
+        /**
+         * @readonly
+         * @name pc.TransformFeedback#inputBuffer
+         * @type pc.VertexBuffer
+         * @description The current input buffer
+         */
+        readonly inputBuffer: pc.VertexBuffer;
+
+        /**
+         * @readonly
+         * @name pc.TransformFeedback#outputBuffer
+         * @type pc.VertexBuffer
+         * @description The current output buffer
+         */
+        readonly outputBuffer: pc.VertexBuffer;
+    }
+}
diff --git a/types/playcanvas/engine/graphics/vertex-buffer.d.ts b/types/playcanvas/engine/graphics/vertex-buffer.d.ts
new file mode 100644
index 0000000000..1dd408172d
--- /dev/null
+++ b/types/playcanvas/engine/graphics/vertex-buffer.d.ts
@@ -0,0 +1,67 @@
+declare namespace pc {
+
+    /**
+     * @name pc.VertexBuffer
+     * @class A vertex buffer is the mechanism via which the application specifies vertex
+     * data to the graphics hardware.
+     * @description Creates a new vertex buffer object.
+     * @param {pc.GraphicsDevice} graphicsDevice The graphics device used to manage this vertex buffer.
+     * @param {pc.VertexFormat} format The vertex format of this vertex buffer.
+     * @param {Number} numVertices The number of vertices that this vertex buffer will hold.
+     * @param {Number} [usage] The usage type of the vertex buffer (see pc.BUFFER_*).
+     * @param {ArrayBuffer} [initialData] Initial data.
+     */
+    class VertexBuffer {
+        constructor(graphicsDevice: pc.GraphicsDevice, format: pc.VertexFormat, numVertices: number, usage?: number, initialData?: ArrayBuffer)
+
+        /**
+         * @function
+         * @name pc.VertexBuffer#destroy
+         * @description Frees resources associated with this vertex buffer.
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.VertexBuffer#getFormat
+         * @description Returns the data format of the specified vertex buffer.
+         * @returns {pc.VertexFormat} The data format of the specified vertex buffer.
+         */
+        getFormat(): pc.VertexFormat;
+
+        /**
+         * @function
+         * @name pc.VertexBuffer#getUsage
+         * @description Returns the usage type of the specified vertex buffer. This indicates
+         * whether the buffer can be modified once and used many times (pc.BUFFER_STATIC),
+         * modified repeatedly and used many times (pc.BUFFER_DYNAMIC) or modified once
+         * and used at most a few times (pc.BUFFER_STREAM).
+         * @returns {Number} The usage type of the vertex buffer (see pc.BUFFER_*).
+         */
+        getUsage(): number;
+
+        /**
+         * @function
+         * @name pc.VertexBuffer#getNumVertices
+         * @description Returns the number of vertices stored in the specified vertex buffer.
+         * @returns {Number} The number of vertices stored in the vertex buffer.
+         */
+        getNumVertices(): number;
+
+        /**
+         * @function
+         * @name pc.VertexBuffer#lock
+         * @description Returns a mapped memory block representing the content of the vertex buffer.
+         * @returns {ArrayBuffer} An array containing the byte data stored in the vertex buffer.
+         */
+        lock(): ArrayBuffer;
+
+        /**
+         * @function
+         * @name pc.VertexBuffer#unlock
+         * @description Notifies the graphics engine that the client side copy of the vertex buffer's
+         * memory can be returned to the control of the graphics driver.
+         */
+        unlock(): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/graphics/vertex-format.d.ts b/types/playcanvas/engine/graphics/vertex-format.d.ts
new file mode 100644
index 0000000000..13052e2a8a
--- /dev/null
+++ b/types/playcanvas/engine/graphics/vertex-format.d.ts
@@ -0,0 +1,67 @@
+declare namespace pc {
+
+    /**
+     * @name pc.VertexFormat
+     * @class A vertex format is a descriptor that defines the layout of vertex data inside
+     * a {@link pc.VertexBuffer}.
+     * @description Returns a new pc.VertexFormat object.
+     * @param {pc.GraphicsDevice} graphicsDevice The graphics device used to manage this vertex format.
+     * @param {Object[]} description An array of vertex attribute descriptions.
+     * @param {Number} description[].semantic The meaning of the vertex element. This is used to link
+     * the vertex data to a shader input. Can be:
+     * <ul>
+     *     <li>pc.SEMANTIC_POSITION</li>
+     *     <li>pc.SEMANTIC_NORMAL</li>
+     *     <li>pc.SEMANTIC_TANGENT</li>
+     *     <li>pc.SEMANTIC_BLENDWEIGHT</li>
+     *     <li>pc.SEMANTIC_BLENDINDICES</li>
+     *     <li>pc.SEMANTIC_COLOR</li>
+     *     <li>pc.SEMANTIC_TEXCOORD0</li>
+     *     <li>pc.SEMANTIC_TEXCOORD1</li>
+     *     <li>pc.SEMANTIC_TEXCOORD2</li>
+     *     <li>pc.SEMANTIC_TEXCOORD3</li>
+     *     <li>pc.SEMANTIC_TEXCOORD4</li>
+     *     <li>pc.SEMANTIC_TEXCOORD5</li>
+     *     <li>pc.SEMANTIC_TEXCOORD6</li>
+     *     <li>pc.SEMANTIC_TEXCOORD7</li>
+     * </ul>
+     * If vertex data has a meaning other that one of those listed above, use the user-defined
+     * semantics: pc.SEMANTIC_ATTR0 to pc.SEMANTIC_ATTR15.
+     * @param {Number} description[].components The number of components of the vertex attribute.
+     * Can be 1, 2, 3 or 4.
+     * @param {Number} description[].type The data type of the attribute. Can be:
+     * <ul>
+     *     <li>pc.TYPE_INT8</li>
+     *     <li>pc.TYPE_UINT8</li>
+     *     <li>pc.TYPE_INT16</li>
+     *     <li>pc.TYPE_UINT16</li>
+     *     <li>pc.TYPE_INT32</li>
+     *     <li>pc.TYPE_UINT32</li>
+     *     <li>pc.TYPE_FLOAT32</li>
+     * </ul>
+     * @param {Boolean} description[].normalize If true, vertex attribute data will be mapped from a
+     * 0 to 255 range down to 0 to 1 when fed to a shader. If false, vertex attribute data is left
+     * unchanged. If this property is unspecified, false is assumed.
+     * @example
+     * // Specify 3-component positions (x, y, z)
+     * var vertexFormat = new pc.VertexFormat(graphicsDevice, [
+     *     { semantic: pc.SEMANTIC_POSITION, components: 3, type: pc.TYPE_FLOAT32 },
+     * ]);
+     * @example
+     * // Specify 2-component positions (x, y), a texture coordinate (u, v) and a vertex color (r, g, b, a)
+     * var vertexFormat = new pc.VertexFormat(graphicsDevice, [
+     *     { semantic: pc.SEMANTIC_POSITION, components: 2, type: pc.TYPE_FLOAT32 },
+     *     { semantic: pc.SEMANTIC_TEXCOORD0, components: 2, type: pc.TYPE_FLOAT32 },
+     *     { semantic: pc.SEMANTIC_COLOR, components: 4, type: pc.TYPE_UINT8, normalize: true }
+     * ]);
+     * @author Will Eastcott
+     */
+    class VertexFormat {
+        constructor(graphicsDevice: pc.GraphicsDevice, description: {
+            semantic: number,
+            components: number,
+            type: number,
+            normalize: boolean
+        }[])
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/graphics/vertex-iterator.d.ts b/types/playcanvas/engine/graphics/vertex-iterator.d.ts
new file mode 100644
index 0000000000..bc9b23d59b
--- /dev/null
+++ b/types/playcanvas/engine/graphics/vertex-iterator.d.ts
@@ -0,0 +1,50 @@
+declare namespace pc {
+
+    /**
+     * @name pc.VertexIterator
+     * @class A vertex iterator simplifies the process of writing vertex data to a vertex buffer.
+     * @description Returns a new pc.VertexIterator object.
+     * @param {pc.VertexBuffer} vertexBuffer The vertex buffer to be iterated.
+     * @author Will Eastcott
+     */
+    class VertexIterator {
+        constructor(vertexBuffer: pc.VertexBuffer)
+
+        /**
+         * @function
+         * @name pc.VertexIterator#next
+         * @description Moves the vertex iterator on to the next vertex.
+         * @example
+         * var iterator = new pc.VertexIterator(vertexBuffer);
+         * iterator.element[pc.SEMANTIC_POSTIION].set(-0.9, -0.9, 0.0);
+         * iterator.element[pc.SEMANTIC_COLOR].set(255, 0, 0, 255);
+         * iterator.next();
+         * iterator.element[pc.SEMANTIC_POSTIION].set(0.9, -0.9, 0.0);
+         * iterator.element[pc.SEMANTIC_COLOR].set(0, 255, 0, 255);
+         * iterator.next();
+         * iterator.element[pc.SEMANTIC_POSTIION].set(0.0, 0.9, 0.0);
+         * iterator.element[pc.SEMANTIC_COLOR].set(0, 0, 255, 255);
+         * iterator.end();
+         */
+        next(): void;
+
+        /**
+         * @function
+         * @name pc.VertexIterator#end
+         * @description Notifies the vertex buffer being iterated that writes are complete. Internally
+         * the vertex buffer is unlocked and vertex data is uploaded to video memory.
+         * @example
+         * var iterator = new pc.VertexIterator(vertexBuffer);
+         * iterator.element[pc.SEMANTIC_POSTIION].set(-0.9, -0.9, 0.0);
+         * iterator.element[pc.SEMANTIC_COLOR].set(255, 0, 0, 255);
+         * iterator.next();
+         * iterator.element[pc.SEMANTIC_POSTIION].set(0.9, -0.9, 0.0);
+         * iterator.element[pc.SEMANTIC_COLOR].set(0, 255, 0, 255);
+         * iterator.next();
+         * iterator.element[pc.SEMANTIC_POSTIION].set(0.0, 0.9, 0.0);
+         * iterator.element[pc.SEMANTIC_COLOR].set(0, 0, 255, 255);
+         * iterator.end();
+         */
+        end(): void;
+    }
+}
diff --git a/types/playcanvas/engine/input/controller.d.ts b/types/playcanvas/engine/input/controller.d.ts
new file mode 100644
index 0000000000..58cbc1153f
--- /dev/null
+++ b/types/playcanvas/engine/input/controller.d.ts
@@ -0,0 +1,115 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Controller
+     * @class A general input handler which handles both mouse and keyboard input assigned to named actions.
+     * This allows you to define input handlers separately to defining keyboard/mouse configurations.
+     * @description Create a new instance of a Controller.
+     * @param {Element} [element] Element to attach Controller to.
+     * @param {Object} [options] Optional arguments.
+     * @param {pc.Keyboard} [options.keyboard] A Keyboard object to use.
+     * @param {pc.Mouse} [options.mouse] A Mouse object to use.
+     * @param {pc.GamePads} [options.gamepads] A Gamepads object to use.
+     * @example
+     * var c = new pc.Controller(document)
+     *
+     * // Register the "fire" action and assign it to both the Enter key and the Spacebar.
+     * c.registerKeys("fire", [pc.KEY_ENTER, pc.KEY_SPACE]);
+     */
+    class Controller {
+        constructor(element?: Element, options?: {
+            keyboard?: pc.Keyboard,
+            mouse?: pc.Mouse,
+            gamepads: pc.GamePads
+        })
+
+        /**
+         * @function
+         * @name pc.Controller#attach
+         * @description Attach Controller to a Element, this is required before you can monitor for key/mouse inputs.
+         * @param {Element} element The element to attach mouse and keyboard event handler too
+         */
+        attach(element: Element): void;
+
+        /**
+         * @function
+         * @name pc.Controller#detach
+         * @description Detach Controller from an Element, this should be done before the Controller is destroyed
+         */
+        detach(): void;
+
+        /**
+         * @function
+         * @name pc.Controller#disableContextMenu
+         * @description Disable the context menu usually activated with the right mouse button.
+         */
+        disableContextMenu(): void;
+
+        /**
+         * @function
+         * @name pc.Controller#enableContextMenu
+         * @description Enable the context menu usually activated with the right mouse button. This is enabled by default.
+         */
+        enableContextMenu(): void;
+
+        /**
+         * @function
+         * @name pc.Controller#update
+         * @description Update the Keyboard and Mouse handlers
+         * @param {Object} dt The time since the last frame
+         */
+        update(dt: number): void;
+
+        /**
+         * @function
+         * @name pc.Controller#registerKeys
+         * @description Create or update a action which is enabled when the supplied keys are pressed.
+         * @param {String} action The name of the action
+         * @param {Number[]} keys A list of keycodes
+         */
+        registerKeys(action: string, keys: number[]): void;
+        /**
+         * @function
+         * @name pc.Controller#registerMouse
+         * @description Create or update an action which is enabled when the supplied mouse button is pressed
+         * @param {String} action The name of the action
+         * @param {Number} button The mouse button
+         */
+        registerMouse(action: string, button: number): void;
+
+        /**
+         * @function
+         * @name pc.Controller#registerPadButton
+         * @description Create or update an action which is enabled when the gamepad button is pressed
+         * @param {String} action The name of the action
+         * @param {Number} pad The index of the pad to register (use pc.PAD_1, etc)
+         * @param {Number} button The pad button
+         */
+        registerPadButton(action: string, pad: number, button: number): void;
+
+        /**
+        * @function
+        * @name pc.Controller#registerAxis
+        * @param {Object} [options]
+        * @param {Object} [options.pad] The index of the game pad to register for (use pc.PAD_1, etc)
+        */
+        registerAxis(options?: { pad?: number }): void;
+
+        /**
+         * @function
+         * @name pc.Controller#isPressed
+         * @description Return true if the current action is enabled
+         * @param {String} action The name of the action
+         */
+        isPressed(actionName: string): boolean;
+
+        /**
+         * @function
+         * @name pc.Controller#wasPressed
+         * @description Returns true if the action was enabled this since the last update
+         * @param {String} action The name of the action
+         * @returns {Boolean} True if the action was enabled this since the last update
+         */
+        wasPressed(actionName: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/input/element-input.d.ts b/types/playcanvas/engine/input/element-input.d.ts
new file mode 100644
index 0000000000..509f5be2ae
--- /dev/null
+++ b/types/playcanvas/engine/input/element-input.d.ts
@@ -0,0 +1,117 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ElementInputEvent
+     * @class Represents an input event fired on a {@link pc.ElementComponent}. When an event is raised on an ElementComponent it bubbles up to its parent ElementComponents unless we call stopPropagation().
+     * @description Create an instance of a pc.ElementInputEvent.
+     * @param {MouseEvent|TouchEvent} event The MouseEvent or TouchEvent that was originally raised.
+     * @property {MouseEvent|TouchEvent} event The MouseEvent or TouchEvent that was originally raised.
+     * @property {pc.ElementComponent} element The ElementComponent that this event was originally raised on.
+     */
+    class ElementInputEvent {
+        constructor(event: BrowserMouseEvent | BrowserTouchEvent, element: pc.ElementComponent)
+
+        event: BrowserMouseEvent | BrowserTouchEvent;
+        element: pc.ElementComponent;
+
+        /**
+         * @function
+         * @name pc.ElementInputEvent#stopPropagation
+         * @description Stop propagation of the event to parent {@link pc.ElementComponent}s. This also stops propagation of the event to other event listeners of the original DOM Event.
+         */
+        stopPropagation(): void;
+    }
+
+    /**
+     * @name pc.ElementMouseEvent
+     * @class Represents a Mouse event fired on a {@link pc.ElementComponent}.
+     * @extends pc.ElementInputEvent
+     * @description Create an instance of a pc.ElementMouseEvent.
+     * @param {MouseEvent} event The MouseEvent that was originally raised.
+     * @param {pc.ElementComponent} element The ElementComponent that this event was originally raised on.
+     * @param {Number} x The x coordinate
+     * @param {Number} y The y coordinate
+     * @param {Number} lastX The last x coordinate
+     * @param {Number} lastY The last y coordinate
+     * @property {Boolean} ctrlKey Whether the ctrl key was pressed
+     * @property {Boolean} altKey Whether the alt key was pressed
+     * @property {Boolean} shiftKey Whether the shift key was pressed
+     * @property {Boolean} metaKey Whether the meta key was pressed
+     * @property {Number} button The mouse button
+     * @property {Number} dx The amount of horizontal movement of the cursor
+     * @property {Number} dy The amount of vertical movement of the cursor
+     * @property {Number} wheel The amount of the wheel movement
+     */
+    class ElementMouseEvent extends pc.ElementInputEvent {
+        constructor(event: BrowserMouseEvent, element: pc.ElementComponent, x: number, y: number, lastX: number, lastY: number)
+
+        ctrlKey: boolean;
+        altKey: boolean;
+        shiftKey: boolean;
+        metaKey: boolean;
+        button: number;
+        dx: number;
+        dy: number;
+        wheel: number;
+    }
+
+    /**
+     * @name pc.ElementTouchEvent
+     * @class Represents a TouchEvent fired on a {@link pc.ElementComponent}.
+     * @extends pc.ElementInputEvent
+     * @description Create an instance of a pc.ElementTouchEvent.
+     * @param {TouchEvent} event The TouchEvent that was originally raised.
+     * @param {pc.ElementComponent} element The ElementComponent that this event was originally raised on.
+     * @param {pc.ElementInput} input The pc.ElementInput instance
+     * @property {Touch[]} touches The Touch objects representing all current points of contact with the surface, regardless of target or changed status.
+     * @property {Touch[]} changedTouches The Touch objects representing individual points of contact whose states changed between the previous touch event and this one.
+     */
+    class ElementTouchEvent extends pc.ElementInputEvent {
+        constructor(event: BrowserTouchEvent, element: pc.ElementComponent, input: pc.ElementInput)
+
+        touches: BrowserTouch[];
+        changedTouches: BrowserTouch[];
+    }
+
+    /**
+     * @name pc.ElementInput
+     * @class Handles mouse and touch events for {@link pc.ElementComponent}s. When input events
+     * occur on an ElementComponent this fires the appropriate events on the ElementComponent.
+     * @description Create a new pc.ElementInput instance.
+     * @param {Element} domElement The DOM element
+     */
+    class ElementInput {
+        constructor(domElement: Element)
+
+        /**
+         * @function
+         * @name pc.ElementInput#attach
+         * @description Attach mouse and touch events to a DOM element.
+         * @param {Element} domElement The DOM element
+         */
+        attach(domElement: Element): void;
+
+        /**
+         * @function
+         * @name pc.ElementInput#detach
+         * @description Remove mouse and touch events from the DOM element that it is attached to
+         */
+        detach(): void;
+
+        /**
+         * @function
+         * @name pc.ElementInput#addElement
+         * @description Add a {@link pc.ElementComponent} to the internal list of ElementComponents that are being checked for input.
+         * @param {pc.ElementComponent} element The ElementComponent
+         */
+        addElement(element: pc.ElementComponent): void;
+
+        /**
+         * @function
+         * @name pc.ElementInput#removeElement
+         * @description Remove a {@link pc.ElementComponent} from the internal list of ElementComponents that are being checked for input.
+         * @param {pc.ElementComponent} element The ElementComponent
+         */
+        removeElement(element: pc.ElementComponent): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/input/game-pads.d.ts b/types/playcanvas/engine/input/game-pads.d.ts
new file mode 100644
index 0000000000..7b395ccc12
--- /dev/null
+++ b/types/playcanvas/engine/input/game-pads.d.ts
@@ -0,0 +1,57 @@
+declare namespace pc {
+    /**
+    * @name pc.GamePads
+    * @class Input handler for accessing GamePad input
+    */
+    class GamePads {
+        /**
+        * @function
+        * @name pc.GamePads#update
+        * @description Update the current and previous state of the gamepads. This must be called every frame for wasPressed()
+        * to work
+        */
+        update(dt: number): void;
+
+        /**
+        * @function
+        * @name pc.GamePads#poll
+        * @description Poll for the latest data from the gamepad API.
+        * @returns {Object[]} An array of gamepads and mappings for the model of gamepad that is attached
+        * @example
+        *   var gamepads = new pc.GamePads();
+        *   var pads = gamepads.poll();
+        *   // pads[0] = { map: <map>, pad: <pad> }
+        */
+        poll(): { map: any, pad: any };
+
+        /**
+        * @function
+        * @name pc.GamePads#isPressed
+        * @description Returns true if the button on the pad requested is pressed
+        * @param {Number} index The index of the pad to check, use constants pc.PAD_1, pc.PAD_2, etc
+        * @param {Number} button The button to test, use constants pc.PAD_FACE_1, etc
+        * @returns {Boolean} True if the button is pressed
+        */
+        isPressed(index: number, button: number): boolean;
+
+        /**
+        * @function
+        * @name pc.GamePads#wasPressed
+        * @description Returns true if the button was pressed since the last frame
+        * @param {Number} index The index of the pad to check, use constants pc.PAD_1, pc.PAD_2, etc
+        * @param {Number} button The button to test, use constants pc.PAD_FACE_1, etc
+        * @returns {Boolean} True if the button was pressed since the last frame
+        */
+        wasPressed(index: number, button: number): boolean;
+
+        /**
+        * @function
+        * @name pc.GamePads#getAxis
+        * @description Get the value of one of the analogue axes of the pad
+        * @param {Number} index The index of the pad to check, use constants pc.PAD_1, pc.PAD_2, etc
+        * @param {Number} axes The axes to get the value of, use constants pc.PAD_L_STICK_X, etc
+        * @returns {Number} The value of the axis between -1 and 1.
+        */
+        getAxis(index: number, axes: number): number;
+    }    
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/input/input.d.ts b/types/playcanvas/engine/input/input.d.ts
new file mode 100644
index 0000000000..d132539b36
--- /dev/null
+++ b/types/playcanvas/engine/input/input.d.ts
@@ -0,0 +1,695 @@
+declare namespace pc {
+        
+        /**
+         * @enum pc.EVENT
+         * @name pc.EVENT_KEYDOWN
+         * @description Name of event fired when a key is pressed
+         */
+        const EVENT_KEYDOWN = 'keydown';         
+        /**
+         * @enum pc.EVENT
+         * @name pc.EVENT_KEYUP
+         * @description Name of event fired when a key is released
+         */
+        const EVENT_KEYUP = 'keyup'; 
+        /**
+         * @enum pc.EVENT
+         * @name pc.EVENT_MOUSEDOWN
+         * @description Name of event fired when a mouse button is pressed
+         */
+        const EVENT_MOUSEDOWN = "mousedown";        
+        /**
+         * @enum pc.EVENT
+         * @name pc.EVENT_MOUSEMOVE
+         * @description Name of event fired when the mouse is moved
+         */
+        const EVENT_MOUSEMOVE = "mousemove";        
+        /**
+         * @enum pc.EVENT
+         * @name pc.EVENT_MOUSEUP
+         * @description Name of event fired when a mouse button is released
+         */
+        const EVENT_MOUSEUP = "mouseup";        
+        /**
+         * @enum pc.EVENT
+         * @name pc.EVENT_MOUSEWHEEL
+         * @description Name of event fired when the mouse wheel is rotated
+         */
+        const EVENT_MOUSEWHEEL = "mousewheel"; 
+        /**
+        * @enum pc.EVENT
+        * @name pc.EVENT_TOUCHSTART
+        * @description Name of event fired when a new touch occurs. For example, a finger is placed on the device.
+        */
+        const VENT_TOUCHSTART = 'touchstart';
+        /**
+        * @enum pc.EVENT
+        * @name pc.EVENT_TOUCHEND
+        * @description Name of event fired when touch ends. For example, a finger is lifted off the device.
+        */
+        const VENT_TOUCHEND = 'touchend';
+        /**
+        * @enum pc.EVENT
+        * @name pc.EVENT_TOUCHMOVE
+        * @description Name of event fired when a touch moves.
+        */
+        const VENT_TOUCHMOVE = 'touchmove';
+        /**
+        * @enum pc.EVENT
+        * @name pc.EVENT_TOUCHCANCEL
+        * @description Name of event fired when a touch point is interrupted in some way.
+        * The exact reasons for cancelling a touch can vary from device to device.
+        * For example, a modal alert pops up during the interaction; the touch point leaves the document area;
+        * or there are more touch points than the device supports, in which case the earliest touch point is canceled.
+        */
+        const VENT_TOUCHCANCEL = 'touchcancel';
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_BACKSPACE
+         */
+        const EY_BACKSPACE = 8;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_TAB
+         */
+        const EY_TAB = 9;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_RETURN
+         */
+        const KEY_RETURN = 13;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_ENTER
+         */
+        const KEY_ENTER = 13;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_SHIFT
+         */
+        const KEY_SHIFT = 16;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_CONTROL
+         */
+        const KEY_CONTROL = 17;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_ALT
+         */
+        const KEY_ALT = 18;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_PAUSE
+         */
+        const KEY_PAUSE = 19;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_CAPS_LOCK
+         */
+        const KEY_CAPS_LOCK = 20;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_ESCAPE
+         */
+        const KEY_ESCAPE = 27;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_SPACE
+         */
+        const KEY_SPACE = 32;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_PAGE_UP
+         */
+        const KEY_PAGE_UP = 33;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_PAGE_DOWN
+         */
+        const KEY_PAGE_DOWN = 34;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_END
+         */
+        const KEY_END = 35;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_HOME
+         */
+        const KEY_HOME = 36;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_LEFT
+         */
+        const KEY_LEFT = 37;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_UP
+         */
+        const KEY_UP = 38;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_RIGHT
+         */
+        const KEY_RIGHT = 39;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_DOWN
+         */
+        const KEY_DOWN = 40;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_PRINT_SCREEN
+         */
+        const KEY_PRINT_SCREEN = 44;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_INSERT
+         */
+        const KEY_INSERT = 45;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_DELETE
+         */
+        const KEY_DELETE = 46;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_0
+         */
+        const KEY_0 = 48;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_1
+         */
+        const KEY_1 = 49;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_2
+         */
+        const KEY_2 = 50;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_3
+         */
+        const KEY_3 = 51;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_4
+         */
+        const KEY_4 = 52;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_5
+         */
+        const KEY_5 = 53;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_6
+         */
+        const KEY_6 = 54;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_7
+         */
+        const KEY_7 = 55;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_8
+         */
+        const KEY_8 = 56;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_9
+         */
+        const KEY_9 = 57;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_SEMICOLON
+         */
+        const KEY_SEMICOLON = 59;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_EQUAL
+         */
+        const KEY_EQUAL = 61;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_A
+         */
+        const KEY_A = 65;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_B
+         */
+        const KEY_B = 66;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_C
+         */
+        const KEY_C = 67;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_D
+         */
+        const KEY_D = 68;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_E
+         */
+        const KEY_E = 69;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F
+         */
+        const KEY_F = 70;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_G
+         */
+        const KEY_G = 71;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_H
+         */
+        const KEY_H = 72;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_I
+         */
+        const KEY_I = 73;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_J
+         */
+        const KEY_J = 74;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_K
+         */
+        const KEY_K = 75;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_L
+         */
+        const KEY_L = 76;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_M
+         */
+        const KEY_M = 77;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_N
+         */
+        const KEY_N = 78;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_O
+         */
+        const KEY_O = 79;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_P
+         */
+        const KEY_P = 80;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_Q
+         */
+        const KEY_Q = 81;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_R
+         */
+        const KEY_R = 82;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_S
+         */
+        const KEY_S = 83;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_T
+         */
+        const KEY_T = 84;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_U
+         */
+        const KEY_U = 85;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_V
+         */
+        const KEY_V = 86;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_W
+         */
+        const KEY_W = 87;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_X
+         */
+        const KEY_X = 88;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_Y
+         */
+        const KEY_Y = 89;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_Z
+         */
+        const KEY_Z = 90;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_WINDOWS
+         */
+        const KEY_WINDOWS = 91;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_CONTEXT_MENU
+         */
+        const KEY_CONTEXT_MENU = 93;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_0
+         */
+        const KEY_NUMPAD_0 = 96;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_1
+         */
+        const KEY_NUMPAD_1 = 97;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_2
+         */
+        const KEY_NUMPAD_2 = 98;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_3
+         */
+        const KEY_NUMPAD_3 = 99;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_4
+         */
+        const KEY_NUMPAD_4 = 100;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_5
+         */
+        const KEY_NUMPAD_5 = 101;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_6
+         */
+        const KEY_NUMPAD_6 = 102;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_7
+         */
+        const KEY_NUMPAD_7 = 103;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_8
+         */
+        const KEY_NUMPAD_8 = 104;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_NUMPAD_9
+         */
+        const KEY_NUMPAD_9 = 105;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_MULTIPLY
+         */
+        const KEY_MULTIPLY = 106;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_ADD
+         */
+        const KEY_ADD = 107;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_SEPARATOR
+         */
+        const KEY_SEPARATOR = 108;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_SUBTRACT
+         */
+        const KEY_SUBTRACT = 109;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_DECIMAL
+         */
+        const KEY_DECIMAL = 110;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_DIVIDE
+         */
+        const KEY_DIVIDE = 111;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F1
+         */
+        const KEY_F1 = 112;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F2
+         */
+        const KEY_F2 = 113;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F3
+         */
+        const KEY_F3 = 114;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F4
+         */
+        const KEY_F4 = 115;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F5
+         */
+        const KEY_F5 = 116;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F6
+         */
+        const KEY_F6 = 117;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F7
+         */
+        const KEY_F7 = 118;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F8
+         */
+        const KEY_F8 = 119;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F9
+         */
+        const KEY_F9 = 120;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F10
+         */
+        const KEY_F10 = 121;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F11
+         */
+        const KEY_F11 = 122;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_F12
+         */
+        const KEY_F12 = 123;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_COMMA
+         */
+        const KEY_COMMA = 188;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_PERIOD
+         */
+        const KEY_PERIOD = 190;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_SLASH
+         */
+        const KEY_SLASH = 191;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_OPEN_BRACKET
+         */
+        const KEY_OPEN_BRACKET = 219;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_BACK_SLASH
+         */
+        const KEY_BACK_SLASH = 220;
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_CLOSE_BRACKET
+         */
+        const KEY_CLOSE_BRACKET = 221;
+
+        /**
+         * @enum pc.KEY
+         * @name pc.KEY_META
+         */
+        const KEY_META = 224;
+    
+        /**
+         * @enum pc.MOUSEBUTTON
+         * @name pc.MOUSEBUTTON_NONE
+         * @description No mouse buttons pressed
+         */
+        const MOUSEBUTTON_NONE = -1;
+        /**
+         * @enum pc.MOUSEBUTTON
+         * @name pc.MOUSEBUTTON_LEFT
+         * @description The left mouse button
+         */
+        const MOUSEBUTTON_LEFT = 0;
+        /**
+         * @enum pc.MOUSEBUTTON
+         * @name pc.MOUSEBUTTON_MIDDLE
+         * @description The middle mouse button
+         */
+        const MOUSEBUTTON_MIDDLE = 1;
+        /**
+         * @enum pc.MOUSEBUTTON
+         * @name pc.MOUSEBUTTON_RIGHT
+         * @description The right mouse button
+         */
+        const MOUSEBUTTON_RIGHT = 2;
+
+        /**
+        * @description Index for pad 1
+        */
+        const PAD_1 = 0;
+        /**
+        * @description Index for pad 2
+        */
+        const PAD_2 = 1;
+        /**
+        * @description Index for pad 3
+        */
+        const PAD_3 = 2;
+        /**
+        * @description Index for pad 4
+        */
+        const PAD_4 = 3;
+
+        /**
+        * @description The first face button, from bottom going clockwise
+        */
+        const PAD_FACE_1 = 0;
+        /**
+        * @description The second face button, from bottom going clockwise
+        */
+        const PAD_FACE_2 = 1;
+        /**
+        * @description The third face button, from bottom going clockwise
+        */
+        const PAD_FACE_3 = 2;
+        /**
+        * @description The fourth face button, from bottom going clockwise
+        */
+        const PAD_FACE_4 = 3;
+
+
+        /**
+        * @description The first shoulder button on the left
+        */
+        const PAD_L_SHOULDER_1 = 4;
+        /**
+        * @description The first shoulder button on the right
+        */
+        const PAD_R_SHOULDER_1 = 5;
+        /**
+        * @description The second shoulder button on the left
+        */
+        const PAD_L_SHOULDER_2 = 6;
+        /**
+        * @description The second shoulder button on the right
+        */
+        const PAD_R_SHOULDER_2 = 7;
+
+        /**
+        * @description The select button
+        */
+        const PAD_SELECT = 8;
+        /**
+        * @description The start button
+        */
+        const PAD_START = 9;
+
+        /**
+        * @description The button when depressing the left analogue stick
+        */
+        const PAD_L_STICK_BUTTON = 10;
+        /**
+        * @description The button when depressing the right analogue stick
+        */
+        const PAD_R_STICK_BUTTON = 11;
+
+        /**
+        * @description Direction pad up
+        */
+        const PAD_UP = 12;
+        /**
+        * @description Direction pad down
+        */
+        const PAD_DOWN = 13;
+        /**
+        * @description Direction pad left
+        */
+        const PAD_LEFT = 14;
+        /**
+        * @description Direction pad right
+        */
+        const PAD_RIGHT = 15;
+
+        /**
+        * @description Vendor specific button
+        */
+        const PAD_VENDOR = 16;
+
+        /**
+        * @description Horizontal axis on the left analogue stick
+        */
+        const PAD_L_STICK_X = 0;
+        /**
+        * @description Vertical axis on the left analogue stick
+        */
+        const PAD_L_STICK_Y = 1;
+        /**
+        * @description Horizontal axis on the right analogue stick
+        */
+        const PAD_R_STICK_X = 2;
+        /**
+        * @description Vertical axis on the right analogue stick
+        */
+        const PAD_R_STICK_Y = 3;   
+}
diff --git a/types/playcanvas/engine/input/keyboard.d.ts b/types/playcanvas/engine/input/keyboard.d.ts
new file mode 100644
index 0000000000..7936b745e4
--- /dev/null
+++ b/types/playcanvas/engine/input/keyboard.d.ts
@@ -0,0 +1,192 @@
+type BrowserKeyboardEvent = typeof KeyboardEvent;
+
+declare namespace pc {
+
+    /**
+    * @name pc.KeyboardEvent
+    * @class The KeyboardEvent is passed into all event callbacks from the {@link pc.Keyboard}. It corresponds to a key press or release.
+    * @description Create a new KeyboardEvent
+    * @param {pc.Keyboard} keyboard The keyboard object which is firing the event.
+    * @param {pc.KeyboardEvent} event The original browser event that was fired.
+    * @property {Number} key The keyCode of the key that has changed. See the pc.KEY_* constants.
+    * @property {Element} element The element that fired the keyboard event.
+    * @property {KeyboardEvent} event The original browser event which was fired.
+    * @example
+    * var onKeyDown = function (e) {
+    *     if (e.key === pc.KEY_SPACE) {
+    *         // space key pressed
+    *     }
+    *     e.event.preventDefault(); // Use original browser event to prevent browser action.
+    * };
+    * app.keyboard.on("keydown", onKeyDown, this);
+    */
+    class KeyboardEvent {
+        constructor(keyboard: pc.Keyboard, event: BrowserKeyboardEvent)
+
+        key: number;
+        element: Element;
+        event: BrowserKeyboardEvent
+    }
+
+    /**
+     * @private
+     * @function
+     * @name pc.toKeyCode
+     * @description Convert a string or keycode to a keycode
+     * @param {String | Number} s
+     */
+    function toKeyCode(s: string | number): number;
+
+    /**
+     * @name pc.Keyboard
+     * @class A Keyboard device bound to an Element. Allows you to detect the state of the key presses.
+     * Note, Keyboard object must be attached to an Element before it can detect any key presses.
+     * @description Create a new Keyboard object
+     * @param {Element} [element] Element to attach Keyboard to. Note that elements like &lt;div&gt; can't
+     * accept focus by default. To use keyboard events on an element like this it must have a value of 'tabindex' e.g. tabindex="0". For more details: <a href="http://www.w3.org/WAI/GL/WCAG20/WD-WCAG20-TECHS/SCR29.html">http://www.w3.org/WAI/GL/WCAG20/WD-WCAG20-TECHS/SCR29.html</a>
+     * @param {Object} [options]
+     * @param {Boolean} [options.preventDefault] Call preventDefault() in key event handlers. This stops the default action of the event occurring. e.g. Ctrl+T will not open a new browser tab
+     * @param {Boolean} [options.stopPropagation] Call stopPropagation() in key event handlers. This stops the event bubbling up the DOM so no parent handlers will be notified of the event
+     * @example
+     * var keyboard = new pc.Keyboard(window); // attach keyboard listeners to the window
+     */
+    class Keyboard {
+        constructor(element?: Element, options?: { preventDefault?: boolean, stopPropagation?: boolean })
+
+        /**
+        * @function
+        * @name pc.Keyboard#attach
+        * @description Attach the keyboard event handlers to an Element
+        * @param {Element} element The element to listen for keyboard events on.
+        */
+        attach(element: Element): void;
+
+        /**
+        * @function
+        * @name pc.Keyboard#detach
+        * @description Detach the keyboard event handlers from the element it is attached to.
+        */
+        detach(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Keyboard#toKeyIdentifier
+         * @description Convert a key code into a key identifier
+         * @param {Number} keyCode
+         */
+        private toKeyIdentifier(keyCode: number): string;
+
+
+        /**
+         * @private
+         * @function
+         * @name pc.Keyboard#update
+         * @description Called once per frame to update internal state.
+         */
+        private update(dt: number): void;
+
+        /**
+         * @function
+         * @name pc.Keyboard#isPressed
+         * @description Return true if the key is currently down.
+         * @param {Number} key The keyCode of the key to test. See the pc.KEY_* constants.
+         * @return {Boolean} True if the key was pressed, false if not.
+         */
+        isPressed(key: number): boolean;
+
+        /**
+         * @function
+         * @name pc.Keyboard#wasPressed
+         * @description Returns true if the key was pressed since the last update.
+         * @param {Number} key The keyCode of the key to test. See the pc.KEY_* constants.
+         * @return {Boolean} true if the key was pressed.
+         */
+        wasPressed(key: number): boolean;
+
+        /**
+         * @function
+         * @name pc.Keyboard#wasReleased
+         * @description Returns true if the key was released since the last update.
+         * @param {Number} key The keyCode of the key to test. See the pc.KEY_* constants.
+         * @return {Boolean} true if the key was pressed.
+         */
+        wasReleased(key: number): boolean;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.Keyboard#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Keyboard#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Keyboard#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.Keyboard#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.Keyboard#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/input/mouse.d.ts b/types/playcanvas/engine/input/mouse.d.ts
new file mode 100644
index 0000000000..524e2c40c6
--- /dev/null
+++ b/types/playcanvas/engine/input/mouse.d.ts
@@ -0,0 +1,222 @@
+type BrowserMouseEvent = typeof MouseEvent;
+
+declare namespace pc {
+    /**
+    * @name pc.MouseEvent
+    * @class MouseEvent object that is passed to events 'mousemove', 'mouseup', 'mousedown' and 'mousewheel'.
+    * @description Create an new MouseEvent
+    * @param {pc.Mouse} mouse The Mouse device that is firing this event
+    * @param {MouseEvent} event The original browser event that fired
+    * @property {Number} x The x co-ordinate of the mouse pointer relative to the element pc.Mouse is attached to
+    * @property {Number} y The y co-ordinate of the mouse pointer relative to the element pc.Mouse is attached to
+    * @property {Number} dx The change in x co-ordinate since the last mouse event
+    * @property {Number} dy The change in y co-ordinate since the last mouse event
+    * @property {pc.MOUSEBUTTON} button The button
+    * @property {Number} wheel A value representing the amount the mouse wheel has moved, only valid for {@link mousemove} events
+    * @property {Element} element The element that the mouse was fired from
+    * @property {Boolean} ctrlKey True if the ctrl key was pressed when this event was fired
+    * @property {Boolean} shiftKey True if the shift key was pressed when this event was fired
+    * @property {Boolean} altKey True if the alt key was pressed when this event was fired
+    * @property {Boolean} metaKey True if the meta key was pressed when this event was fired
+    * @property {MouseEvent} event The original browser event
+    * @since 0.88.0
+    */
+    class MouseEvent {
+        constructor(mouse: pc.Mouse, event: BrowserMouseEvent)
+
+        x: number;
+        y: number;
+        dx: number;
+        dy: number;
+        button: number;
+        wheel: number;
+        element: Element;
+        ctrlKey: boolean;
+        shiftKey: boolean;
+        altKey: boolean;
+        metaKey: boolean;
+        event: BrowserMouseEvent;
+    }
+
+    /**
+     * @name pc.Mouse
+     * @class A Mouse Device, bound to a DOM Element.
+     * @description Create a new Mouse device
+     * @param {Element} [element] The Element that the mouse events are attached to
+     */
+    class Mouse {
+        constructor(element?: Element)
+
+        /**
+        * @function
+        * @name pc.Mouse.isPointerLocked
+        * @description Check if the mouse pointer has been locked, using {@link pc.Mouse#enabledPointerLock}
+        * @returns {Boolean} True if locked
+        */
+        isPointerLocked(): void;
+
+
+        /**
+         * @function
+         * @name pc.Mouse#attach
+         * @description Attach mouse events to an Element.
+         * @param {Element} element
+         */
+        attach(element: Element): void;
+
+        /**
+         * @function
+         * @name pc.Mouse#detach
+         * @description Remove mouse events from the element that it is attached to
+         */
+        detach(): void;
+
+        /**
+         * @function
+         * @name pc.Mouse#disableContextMenu
+         * @description Disable the context menu usually activated with right-click
+         */
+        disableContextMenu(): void;
+
+        /**
+         * @function
+         * @name pc.Mouse#enableContextMenu
+         * @description Enable the context menu usually activated with right-click. This option is active by default.
+         */
+        enableContextMenu(): void;
+
+        /**
+        * @function
+        * @name pc.Mouse#enablePointerLock
+        * @description Request that the browser hides the mouse cursor and locks the mouse to the element.
+        * Allowing raw access to mouse movement input without risking the mouse exiting the element.
+        * Notes: <br />
+        * <ul>
+        * <li>In some browsers this will only work when the browser is running in fullscreen mode. See {@link pc.Application#enableFullscreen}
+        * <li>Enabling pointer lock can only be initiated by a user action e.g. in the event handler for a mouse or keyboard input.
+        * </ul>
+        * @param {Function} [success] Function called if the request for mouse lock is successful.
+        * @param {Function} [error] Function called if the request for mouse lock is unsuccessful.
+        */
+        enablePointerLock(success?: (...args: any[]) => {}, error?: (...args: any[]) => {}): void;
+
+        /**
+        * @function
+        * @name pc.Mouse#disablePointerLock
+        * @description Return control of the mouse cursor to the user
+        * @param {Function} [success] Function called when the mouse lock is disabled
+        */
+        disablePointerLock(success?: (...args: any[]) => {}): void;
+
+        /**
+         * @function
+         * @name pc.Mouse#update
+         * @description Update method, should be called once per frame
+         * @param {Object} dt
+         */
+        update(dt: number): void;
+
+        /**
+         * @function
+         * @name pc.Mouse#isPressed
+         * @description Returns true if the mouse button is currently pressed
+         * @param {pc.MOUSEBUTTON} button
+         * @returns {Boolean} True if the mouse button is current pressed
+         */
+        isPressed(button: number): boolean;
+
+        /**
+         * @function
+         * @name pc.Mouse#wasPressed
+         * @description Returns true if the mouse button was pressed this frame (since the last call to update).
+         * @param {pc.MOUSEBUTTON} button
+         * @returns {Boolean} True if the mouse button was pressed since the last update
+         */
+        wasPressed(button: number): boolean;
+
+        /**
+         * @function
+         * @name pc.Mouse#wasReleased
+         * @description Returns true if the mouse button was released this frame (since the last call to update).
+         * @param {pc.MOUSEBUTTON} button
+         * @returns {Boolean} True if the mouse button was released since the last update
+         */
+        wasReleased(button: number): boolean;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.Mouse#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Mouse#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Mouse#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.Mouse#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.Mouse#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/input/touch.d.ts b/types/playcanvas/engine/input/touch.d.ts
new file mode 100644
index 0000000000..d94f8167b7
--- /dev/null
+++ b/types/playcanvas/engine/input/touch.d.ts
@@ -0,0 +1,169 @@
+type BrowserTouchEvent = typeof TouchEvent;
+type BrowserTouch = typeof Touch;
+
+declare namespace pc {
+
+    /**
+    * @name pc.TouchEvent
+    * @class A Event corresponding to touchstart, touchend, touchmove or touchcancel. TouchEvent wraps the standard
+    * browser event and provides lists of {@link pc.Touch} objects.
+    * @description Create a new TouchEvent from an existing browser event
+    * @param {pc.TouchDevice} device The source device of the touch events
+    * @param {TouchEvent} event The original browser TouchEvent
+    * @property {Element} element The target Element that the event was fired from
+    * @property {pc.Touch[]} touches A list of all touches currently in contact with the device
+    * @property {pc.Touch[]} changedTouches A list of touches that have changed since the last event
+    */
+    class TouchEvent {
+        constructor(device: pc.TouchDevice, event: BrowserTouchEvent)
+
+        element: Element;
+        touches: pc.Touch[];
+        changedTouches: pc.Touch[];
+
+        /**
+        * @function
+        * @name pc.TouchEvent#getTouchById
+        * @description Get an event from one of the touch lists by the id. It is useful to access
+        * touches by their id so that you can be sure you are referencing the same touch.
+        * @param {Number} id The identifier of the touch.
+        * @param {pc.Touch[]} list An array of touches to search.
+        * @returns {pc.Touch} The {@link pc.Touch} object or null.
+        */
+        getTouchById(id: number, list: pc.Touch[]): pc.Touch | null
+    }
+
+    /**
+    * @name pc.Touch
+    * @class A instance of a single point touch on a {@link pc.TouchDevice}
+    * @description Create a new Touch object from the browser Touch
+    * @param {Touch} touch The browser Touch object
+    * @property {Number} id The identifier of the touch
+    * @property {Number} x The x co-ordinate relative to the element that the TouchDevice is attached to
+    * @property {Number} y The y co-ordinate relative to the element that the TouchDevice is attached to
+    * @property {Element} target The target element of the touch event
+    * @property {Touch} touch The original browser Touch object
+    */
+    class Touch {
+        constructor(touch: BrowserTouch)
+        id: number;
+        x: number;
+        y: number;
+        target: Element;
+        touch: BrowserTouch;
+    }
+
+    /**
+    * @name pc.TouchDevice
+    * @class Attach a TouchDevice to an element and it will receive and fire events when the element is touched.
+    * See also {@link pc.Touch} and {@link pc.TouchEvent}
+    * @description Create a new touch device and attach it to an element
+    * @param {Element} element The element to attach listen for events on
+    */
+    class TouchDevice {
+        constructor(element: Element)
+
+        /**
+        * @function
+        * @name pc.TouchDevice#attach
+        * @description Attach a device to an element in the DOM.
+        * If the device is already attached to an element this method will detach it first
+        * @param {Element} element The element to attach to
+        */
+        attach(element: Element): void;
+
+        /**
+        * @function
+        * @name pc.TouchDevice#detach
+        * @description Detach a device from the element it is attached to
+        */
+        detach(): void;
+
+        /**
+        * @function
+        * @name pc.getTouchTargetCoords
+        * @description Similiar to {@link pc.getTargetCoords} for the MouseEvents.
+        * This function takes a browser Touch object and returns the co-ordinates of the
+        * touch relative to the target element.
+        * @param {Touch} touch The browser Touch object
+        * @returns {Object} The co-ordinates of the touch relative to the touch.target element. In the format {x, y}
+        */
+        getTouchTargetCoords(touch: BrowserTouch): { x: number, y: number };
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.Touch#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Touch#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.Touch#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.Touch#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.Touch#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/math/curve-set.d.ts b/types/playcanvas/engine/math/curve-set.d.ts
new file mode 100644
index 0000000000..be655a97b9
--- /dev/null
+++ b/types/playcanvas/engine/math/curve-set.d.ts
@@ -0,0 +1,63 @@
+declare namespace pc {
+    /**
+     * @name pc.CurveSet
+     * @class A curve set is a collection of curves.
+     * @description Creates a new curve set.
+     * @param {Array} [curveKeys] An array of arrays of keys (pairs of numbers with
+     * the time first and value second).
+     */
+    class CurveSet {
+        constructor(curveKeys?: number[][])
+
+        /**
+         * @function
+         * @name pc.CurveSet#get
+         * @description Return a specific curve in the curve set.
+         * @param {Number} index The index of the curve to return
+         * @returns {pc.Curve} The curve at the specified index
+         */
+        get(index: number): pc.Curve;
+
+        /**
+         * @function
+         * @name pc.CurveSet#value
+         * @description Returns the interpolated value of all curves in the curve
+         * set at the specified time.
+         * @param {Number} time The time at which to calculate the value
+         * @param {Array} [result] The interpolated curve values at the specified time.
+         * If this parameter is not supplied, the function allocates a new array internally
+         * to return the result.
+         * @return {Array} The interpolated curve values at the specified time
+         */
+        value(time: number, result?: any[]): any[];
+
+        /**
+         * @function
+         * @name pc.CurveSet#clone
+         * @description Returns a clone of the specified curve set object.
+         * @returns {pc.CurveSet} A clone of the specified curve set
+         */
+        clone(): pc.CurveSet
+
+        /**
+         * @readonly
+         * @name pc.CurveSet#length
+         * @type Number
+         * @description The number of curves in the curve set.
+         */
+        readonly length: number;
+
+        /**
+         * @name pc.CurveSet#type
+         * @type Number
+         * @description The interpolation scheme applied to all curves in the curve set. Can be:
+         * <ul>
+         *     <li>pc.CURVE_LINEAR</li>
+         *     <li>pc.CURVE_SMOOTHSTEP</li>
+         *     <li>pc.CURVE_CATMULL</li>
+         *     <li>pc.CURVE_CARDINAL</li>
+         * </ul>
+         */
+        type: number;
+    }
+}
diff --git a/types/playcanvas/engine/math/curve.d.ts b/types/playcanvas/engine/math/curve.d.ts
new file mode 100644
index 0000000000..31905091b1
--- /dev/null
+++ b/types/playcanvas/engine/math/curve.d.ts
@@ -0,0 +1,85 @@
+declare namespace pc {
+
+    /**
+     * @enum pc.CURVE
+     * @name pc.CURVE_LINEAR
+     * @description A linear interpolation scheme.
+     */
+    const CURVE_LINEAR = 0;
+    /**
+     * @enum pc.CURVE
+     * @name pc.CURVE_SMOOTHSTEP
+     * @description A smooth step interpolation scheme.
+     */
+    const CURVE_SMOOTHSTEP = 1;
+    /**
+     * @enum pc.CURVE
+     * @name pc.CURVE_CATMULL
+     * @description A Catmull-Rom spline interpolation scheme.
+     */
+    const CURVE_CATMULL = 2;
+    /**
+     * @enum pc.CURVE
+     * @name pc.CURVE_CARDINAL
+     * @description A cardinal spline interpolation scheme.
+     */
+    const CURVE_CARDINAL = 3;
+
+    /**
+     * @name pc.Curve
+     * @class A curve is a collection of keys (time/value pairs). The shape of the
+     * curve is defined by its type that specifies an interpolation scheme for the keys.
+     * @description Creates a new curve.
+     * @param {Number[]} [data] An array of keys (pairs of numbers with the time first and
+     * value second)
+     * @property {Number} length The number of keys in the curve. [read only]
+     */
+    class Curve {
+        constructor(data?: number[])
+
+        length: number;
+
+        /**
+         * @function
+         * @name pc.Curve#add
+         * @description Add a new key to the curve.
+         * @param {Number} time Time to add new key
+         * @param {Number} value Value of new key
+         * @returns {Number[]} [time, value] pair
+         */
+        add(time: number, value: number): number[];
+
+        /**
+         * @function
+         * @name pc.Curve#get
+         * @description Return a specific key.
+         * @param {Number} index The index of the key to return
+         * @returns {Number[]} The key at the specified index
+         */
+        get(index: number): number[];
+
+        /**
+         * @function
+         * @name pc.Curve#sort
+         * @description Sort keys by time.
+         */
+        sort(): void;
+
+        /**
+         * @function
+         * @name pc.Curve#value
+         * @description Returns the interpolated value of the curve at specified time.
+         * @param {Number} time The time at which to calculate the value
+         * @return {Number} The interpolated value
+         */
+        value(time: number): number;
+
+        /**
+         * @function
+         * @name pc.Curve#clone
+         * @description Returns a clone of the specified curve object.
+         * @returns {pc.Curve} A clone of the specified curve
+         */
+        clone(): pc.Curve;
+    }
+}
diff --git a/types/playcanvas/engine/math/mat3.d.ts b/types/playcanvas/engine/math/mat3.d.ts
new file mode 100644
index 0000000000..d84f39d124
--- /dev/null
+++ b/types/playcanvas/engine/math/mat3.d.ts
@@ -0,0 +1,128 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Mat3
+    * @class A 3x3 matrix.
+    * @description Creates a new Mat3 object
+    * @param {Number} [v0] The value in row 0, column 0. If v0 is an array of length 9, the array will be used to populate all components.
+    * @param {Number} [v1] The value in row 1, column 0.
+    * @param {Number} [v2] The value in row 2, column 0.
+    * @param {Number} [v3] The value in row 0, column 1.
+    * @param {Number} [v4] The value in row 1, column 1.
+    * @param {Number} [v5] The value in row 2, column 1.
+    * @param {Number} [v6] The value in row 0, column 2.
+    * @param {Number} [v7] The value in row 1, column 2.
+    * @param {Number} [v8] The value in row 2, column 2.
+    */
+    class Mat3 {
+        constructor(v0: number, v1: number, v2: number, v3: number, v4: number, v5: number, v6: number, v7: number, v8: number)
+        constructor(v0: [number, number, number, number, number, number, number, number, number])
+
+        /**
+         * @function
+         * @name pc.Mat3#clone
+         * @description Creates a duplicate of the specified matrix.
+         * @returns {pc.Mat3} A duplicate matrix.
+         * @example
+         * var src = new pc.Mat3().translate(10, 20, 30);
+         * var dst = new pc.Mat3();
+         * dst.copy(src);
+         * console.log("The two matrices are " + (src.equal(dst) ? "equal" : "different"));
+         */
+        clone(): pc.Mat3;
+
+        /**
+         * @function
+         * @name pc.Mat3#copy
+         * @description Copies the contents of a source 3x3 matrix to a destination 3x3 matrix.
+         * @param {pc.Mat3} src A 3x3 matrix to be copied.
+         * @returns {pc.Mat3} Self for chaining
+         * @example
+         * var src = new pc.Mat3().translate(10, 20, 30);
+         * var dst = new pc.Mat3();
+         * dst.copy(src);
+         * console.log("The two matrices are " + (src.equal(dst) ? "equal" : "different"));
+         */
+        copy(rhs: pc.Mat3): this;
+
+        /**
+         * @function
+         * @name pc.Mat3#equals
+         * @param {pc.Mat3} rhs The other matrix.
+         * @description Reports whether two matrices are equal.
+         * @returns {Boolean} true if the matrices are equal and false otherwise.
+         * @example
+         * var a = new pc.Mat3().translate(10, 20, 30);
+         * var b = new pc.Mat3();
+         * console.log("The two matrices are " + (a.equals(b) ? "equal" : "different"));
+         */
+        equals(rhs: pc.Mat3): boolean;
+
+        /**
+         * @function
+         * @name pc.Mat3#isIdentity
+         * @description Reports whether the specified matrix is the identity matrix.
+         * @returns {Boolean} true if the matrix is identity and false otherwise.
+         * @example
+         * var m = new pc.Mat3();
+         * console.log("The matrix is " + (m.isIdentity() ? "identity" : "not identity"));
+         */
+        isIdentity(): boolean;
+
+        /**
+         * @function
+         * @name pc.Mat3#setIdentity
+         * @description Sets the matrix to the identity matrix.
+         * @returns {pc.Mat3} Self for chaining.
+         * @example
+         * m.setIdentity();
+         * console.log("The two matrices are " + (src.equal(dst) ? "equal" : "different"));
+         */
+        setIdentity(): this;
+
+        /**
+         * @function
+         * @name pc.Mat3#toString
+         * @description Converts the matrix to string form.
+         * @returns {String} The matrix in string form.
+         * @example
+         * var m = new pc.Mat3();
+         * // Should output '[1, 0, 0, 0, 1, 0, 0, 0, 1]'
+         * console.log(m.toString());
+         */
+        toString(): string;
+
+        /**
+         * @function
+         * @name pc.Mat3#transpose
+         * @description Generates the transpose of the specified 3x3 matrix.
+         * @returns {pc.Mat3} Self for chaining.
+         * @example
+         * var m = new pc.Mat3();
+         *
+         * // Transpose in place
+         * m.transpose();
+         */
+        transpose(): this;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Mat3
+         * @name pc.Mat3.IDENTITY
+         * @description A constant matrix set to the identity.
+         */
+        static readonly IDENTITY: pc.Mat3;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Mat3
+         * @name pc.Mat3.ZERO
+         * @description A constant matrix with all elements set to 0.
+         */
+        static readonly ZERO: pc.Mat3;
+    }
+}
diff --git a/types/playcanvas/engine/math/mat4.d.ts b/types/playcanvas/engine/math/mat4.d.ts
new file mode 100644
index 0000000000..73306d52c7
--- /dev/null
+++ b/types/playcanvas/engine/math/mat4.d.ts
@@ -0,0 +1,546 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Mat4
+    * @class A 4x4 matrix.
+    * @description Creates a new Mat4 object
+    * @param {Number} [v0] The value in row 0, column 0. If v0 is an array of length 16, the array will be used to populate all components.
+    * @param {Number} [v1] The value in row 1, column 0.
+    * @param {Number} [v2] The value in row 2, column 0.
+    * @param {Number} [v3] The value in row 3, column 0.
+    * @param {Number} [v4] The value in row 0, column 1.
+    * @param {Number} [v5] The value in row 1, column 1.
+    * @param {Number} [v6] The value in row 2, column 1.
+    * @param {Number} [v7] The value in row 3, column 1.
+    * @param {Number} [v8] The value in row 0, column 2.
+    * @param {Number} [v9] The value in row 1, column 2.
+    * @param {Number} [v10] The value in row 2, column 2.
+    * @param {Number} [v11] The value in row 3, column 2.
+    * @param {Number} [v12] The value in row 0, column 3.
+    * @param {Number} [v13] The value in row 1, column 3.
+    * @param {Number} [v14] The value in row 2, column 3.
+    * @param {Number} [v15] The value in row 3, column 3.
+    */
+    class Mat4 {
+        constructor(
+            v0: number, v1: number, v2: number, v3: number, v4: number, v5: number, v6: number, v7: number, v8: number,
+            v9: number, v10: number, v11: number, v12: number, v13: number, v14: number, v15: number
+        );
+        constructor(v0: [
+            number, number, number, number, number, number, number, number,
+            number, number, number, number, number, number, number, number
+        ]);
+        constructor();
+
+        /**
+         * @function
+         * @name pc.Mat4#add2
+         * @description Adds the specified 4x4 matrices together and stores the result in
+         * the current instance.
+         * @param {pc.Mat4} lhs The 4x4 matrix used as the first operand of the addition.
+         * @param {pc.Mat4} rhs The 4x4 matrix used as the second operand of the addition.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var m = new pc.Mat4();
+         *
+         * m.add2(pc.Mat4.INDENTITY, pc.Mat4.ONE);
+         *
+         * console.log("The result of the addition is: " a.toString());
+         */
+        add2(lhs: pc.Mat4, rhs: pc.Mat4): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#add
+         * @description Adds the specified 4x4 matrix to the current instance.
+         * @param {pc.Mat4} rhs The 4x4 matrix used as the second operand of the addition.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var m = new pc.Mat4();
+         *
+         * m.add(pc.Mat4.ONE);
+         *
+         * console.log("The result of the addition is: " a.toString());
+         */
+        add(rhs: pc.Mat4): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#clone
+         * @description Creates a duplicate of the specified matrix.
+         * @returns {pc.Mat4} A duplicate matrix.
+         * @example
+         * var src = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         * var dst = new pc.Mat4();
+         * dst.copy(src);
+         * console.log("The two matrices are " + (src.equal(dst) ? "equal" : "different"));
+         */
+        clone(): pc.Mat4;
+
+        /**
+         * @function
+         * @name pc.Mat4#copy
+         * @description Copies the contents of a source 4x4 matrix to a destination 4x4 matrix.
+         * @param {pc.Mat4} rhs A 4x4 matrix to be copied.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var src = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         * var dst = new pc.Mat4();
+         * dst.copy(src);
+         * console.log("The two matrices are " + (src.equal(dst) ? "equal" : "different"));
+         */
+        copy(rhs: pc.Mat4): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#equals
+         * @description Reports whether two matrices are equal.
+         * @param {pc.Mat4} rhs The other matrix.
+         * @returns {Boolean} true if the matrices are equal and false otherwise.
+         * @example
+         * var a = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         * var b = new pc.Mat4();
+         * console.log("The two matrices are " + (a.equals(b) ? "equal" : "different"));
+         */
+        equals(rhs: pc.Mat4): boolean;
+
+        /**
+         * @function
+         * @name pc.Mat4#isIdentity
+         * @description Reports whether the specified matrix is the identity matrix.
+         * @returns {Boolean} true if the matrix is identity and false otherwise.
+         * @example
+         * var m = new pc.Mat4();
+         * console.log("The matrix is " + (m.isIdentity() ? "identity" : "not identity"));
+         */
+        isIdentity(): boolean;
+
+        /**
+         * @function
+         * @name pc.Mat4#mul2
+         * @description Multiplies the specified 4x4 matrices together and stores the result in
+         * the current instance.
+         * @param {pc.Mat4} lhs The 4x4 matrix used as the first multiplicand of the operation.
+         * @param {pc.Mat4} rhs The 4x4 matrix used as the second multiplicand of the operation.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var a = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         * var b = new pc.Mat4().setFromAxisAngle(pc.Vec3.UP, 180);
+         * var r = new pc.Mat4();
+         *
+         * // r = a * b
+         * r.mul2(a, b);
+         *
+         * console.log("The result of the multiplication is: " r.toString());
+         */
+        mul2(lhs: pc.Mat4, rhs: pc.Mat4): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#mul
+         * @description Multiplies the current instance by the specified 4x4 matrix.
+         * @param {pc.Mat4} rhs The 4x4 matrix used as the second multiplicand of the operation.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var a = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         * var b = new pc.Mat4().setFromAxisAngle(pc.Vec3.UP, 180);
+         *
+         * // a = a * b
+         * a.mul(b);
+         *
+         * console.log("The result of the multiplication is: " a.toString());
+         */
+        mul(rhs: pc.Mat4): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#transformPoint
+         * @description Transforms a 3-dimensional point by a 4x4 matrix.
+         * @param {pc.Vec3} vec The 3-dimensional point to be transformed.
+         * @param {pc.Vec3} [res] An optional 3-dimensional point to receive the result of the transformation.
+         * @returns {pc.Vec3} The input point v transformed by the current instance.
+         * @example
+         * // Create a 3-dimensional point
+         * var v = new pc.Vec3(1, 2, 3);
+         *
+         * // Create a 4x4 rotation matrix
+         * var m = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         *
+         * var tv = m.transformPoint(v);
+         */
+        transformPoint(vec: pc.Vec3, res?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Mat4#transformVector
+         * @description Transforms a 3-dimensional vector by a 4x4 matrix.
+         * @param {pc.Vec3} vec The 3-dimensional vector to be transformed.
+         * @param {pc.Vec3} [res] An optional 3-dimensional vector to receive the result of the transformation.
+         * @returns {pc.Vec3} The input vector v transformed by the current instance.
+         * @example
+         * // Create a 3-dimensional vector
+         * var v = new pc.Vec3(1, 2, 3);
+         *
+         * // Create a 4x4 rotation matrix
+         * var m = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         *
+         * var tv = m.transformVector(v);
+         */
+        transformVector(vec: pc.Vec3, res?: pc.Vec3): pc.Vec3
+
+        /**
+         * @function
+         * @name pc.Mat4#transformVec4
+         * @description Transforms a 4-dimensional vector by a 4x4 matrix.
+         * @param {pc.Vec4} vec The 4-dimensional vector to be transformed.
+         * @param {pc.Vec4} [res] An optional 4-dimensional vector to receive the result of the transformation.
+         * @returns {pc.Vec4} The input vector v transformed by the current instance.
+         * @example
+         * // Create an input 4-dimensional vector
+         * var v = new pc.Vec4(1, 2, 3, 4);
+         *
+         * // Create an output 4-dimensional vector
+         * var result = new pc.Vec4();
+         *
+         * // Create a 4x4 rotation matrix
+         * var m = new pc.Mat4().setFromEulerAngles(10, 20, 30);
+         *
+         * m.transformVec4(v, result);
+         */
+        transformVec4(vec: pc.Vec4, res: pc.Vec4): pc.Vec4;
+
+        /**
+         * @function
+         * @name pc.Mat4#setLookAt
+         * @description Sets the specified matrix to a viewing matrix derived from an eye point, a target point
+         * and an up vector. The matrix maps the target point to the negative z-axis and the eye point to the
+         * origin, so that when you use a typical projection matrix, the center of the scene maps to the center
+         * of the viewport. Similarly, the direction described by the up vector projected onto the viewing plane
+         * is mapped to the positive y-axis so that it points upward in the viewport. The up vector must not be
+         * parallel to the line of sight from the eye to the reference point.
+         * @param {pc.Vec3} position 3-d vector holding view position.
+         * @param {pc.Vec3} target 3-d vector holding reference point.
+         * @param {pc.Vec3} up 3-d vector holding the up direction.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var position = new pc.Vec3(10, 10, 10);
+         * var target = new pc.Vec3(0, 0, 0);
+         * var up = new pc.Vec3(0, 1, 0);
+         * var m = new pc.Mat4().setLookAt(position, target, up);
+         */
+        setLookAt(position: pc.Vec3, target: pc.Vec3, up: pc.Vec3): this;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Mat4#setFrustum
+         * @description Sets the specified matrix to a perspective projection matrix. The function's parameters define
+         * the shape of a frustum.
+         * @param {Number} left The x-coordinate for the left edge of the camera's projection plane in eye space.
+         * @param {Number} right The x-coordinate for the right edge of the camera's projection plane in eye space.
+         * @param {Number} bottom The y-coordinate for the bottom edge of the camera's projection plane in eye space.
+         * @param {Number} top The y-coordinate for the top edge of the camera's projection plane in eye space.
+         * @param {Number} znear The near clip plane in eye coordinates.
+         * @param {Number} zfar The far clip plane in eye coordinates.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * // Create a 4x4 perspective projection matrix
+         * var f = pc.Mat4().setFrustum(-2, 2, -1, 1, 1, 1000);
+         */
+        setFrustum(left: number, right: number, bottom: number, top: number, znear: number, zfar: number): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#setPerspective
+         * @description Sets the specified matrix to a perspective projection matrix. The function's
+         * parameters define the shape of a frustum.
+         * @param {Number} fovy The field of view in the frustum in the Y-axis of eye space (or X axis if fovIsHorizontal is true).
+         * @param {Number} aspect The aspect ratio of the frustum's projection plane (width / height).
+         * @param {Number} znear The near clip plane in eye coordinates.
+         * @param {Number} zfar The far clip plane in eye coordinates.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * // Create a 4x4 perspective projection matrix
+         * var persp = pc.Mat4().setPerspective(45, 16 / 9, 1, 1000);
+         */
+        setPerspective(fovy: number, aspect: number, znear: number, zfar: number, fovIsHorizontal?: boolean): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#setOrtho
+         * @description Sets the specified matrix to an orthographic projection matrix. The function's parameters
+         * define the shape of a cuboid-shaped frustum.
+         * @param {Number} left The x-coordinate for the left edge of the camera's projection plane in eye space.
+         * @param {Number} right The x-coordinate for the right edge of the camera's projection plane in eye space.
+         * @param {Number} bottom The y-coordinate for the bottom edge of the camera's projection plane in eye space.
+         * @param {Number} top The y-coordinate for the top edge of the camera's projection plane in eye space.
+         * @param {Number} znear The near clip plane in eye coordinates.
+         * @param {Number} zfar The far clip plane in eye coordinates.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * // Create a 4x4 orthographic projection matrix
+         * var ortho = pc.Mat4().ortho(-2, 2, -2, 2, 1, 1000);
+         */
+        setOrtho(left: number, right: number, bottom: number, top: number, near: number, far: number): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#setFromAxisAngle
+         * @description Sets the specified matrix to a rotation matrix equivalent to a rotation around
+         * an axis. The axis must be normalized (unit length) and the angle must be specified in degrees.
+         * @param {pc.Vec3} axis The normalized axis vector around which to rotate.
+         * @param {Number} angle The angle of rotation in degrees.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * // Create a 4x4 rotation matrix
+         * var rm = new pc.Mat4().setFromAxisAngle(pc.Vec3.UP, 90);
+         */
+        setFromAxisAngle(axis: pc.Vec3, angle: number): this;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Mat4#setTranslate
+         * @description Sets the specified matrix to a translation matrix.
+         * @param {Number} x The x-component of the translation.
+         * @param {Number} y The y-component of the translation.
+         * @param {Number} z The z-component of the translation.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * // Create a 4x4 translation matrix
+         * var tm = new pc.Mat4().setTranslate(10, 10, 10);
+         */
+        setTranslate(tx: number, ty: number, tz: number): this;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Mat4#setScale
+         * @description Sets the specified matrix to a scale matrix.
+         * @param {Number} x The x-component of the scale.
+         * @param {Number} y The y-component of the scale.
+         * @param {Number} z The z-component of the scale.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * // Create a 4x4 scale matrix
+         * var sm = new pc.Mat4().setScale(10, 10, 10);
+         */
+        setScale(sx: number, sy: number, sz: number): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#invert
+         * @description Sets the specified matrix to its inverse.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * // Create a 4x4 rotation matrix of 180 degrees around the y-axis
+         * var rot = new pc.Mat4().setFromAxisAngle(pc.Vec3.UP, 180);
+         *
+         * // Invert in place
+         * rot.invert();
+         */
+        invert(): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#set
+         * @description Sets matrix data from an array.
+         * @param {Array} Source array. Must have 16 values.
+         */
+        set(src: [
+            number, number, number, number,
+            number, number, number, number,
+            number, number, number, number,
+            number, number, number, number
+        ]): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#setIdentity
+         * @description Sets the specified matrix to the identity matrix.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * m.setIdentity();
+         * console.log("The two matrices are " + (src.equal(dst) ? "equal" : "different"));
+         */
+        setIdentity(): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#setTRS
+         * @description Sets the specified matrix to the concatenation of a translation, a
+         * quaternion rotation and a scale.
+         * @param {pc.Vec3} t A 3-d vector translation.
+         * @param {pc.Quat} r A quaternion rotation.
+         * @param {pc.Vec3} s A 3-d vector scale.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var t = new pc.Vec3(10, 20, 30);
+         * var r = new pc.Quat();
+         * var s = new pc.Vec3(2, 2, 2);
+         *
+         * var m = new pc.Mat4();
+         * m.setTRS(t, r, s);
+         */
+        setTRS(t: pc.Vec3, r: pc.Quat, s: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#transpose
+         * @description Sets the specified matrix to its transpose.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var m = new pc.Mat4();
+         *
+         * // Transpose in place
+         * m.transpose();
+         */
+        transpose(): this;
+
+        invertTo3x3(res: pc.Mat4): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#getTranslation
+         * @description Extracts the translational component from the specified 4x4 matrix.
+         * @param {pc.Vec3} [t] The vector to receive the translation of the matrix.
+         * @returns {pc.Vec3} The translation of the specified 4x4 matrix.
+         * @example
+         * // Create a 4x4 matrix
+         * var m = new pc.Mat4();
+         *
+         * // Query the z-axis component
+         * var t = new pc.Vec3();
+         * m.getTranslation(t);
+         */
+        getTranslation(t?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Mat4#getX
+         * @description Extracts the x-axis from the specified 4x4 matrix.
+         * @param {pc.Vec3} [x] The vector to receive the x axis of the matrix.
+         * @returns {pc.Vec3} The x-axis of the specified 4x4 matrix.
+         * @example
+         * // Create a 4x4 matrix
+         * var m = new pc.Mat4();
+         *
+         * // Query the z-axis component
+         * var x = new pc.Vec3();
+         * m.getX(x);
+         */
+        getX(x?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Mat4#getY
+         * @description Extracts the y-axis from the specified 4x4 matrix.
+         * @param {pc.Vec3} [y] The vector to receive the y axis of the matrix.
+         * @returns {pc.Vec3} The y-axis of the specified 4x4 matrix.
+         * @example
+         * // Create a 4x4 matrix
+         * var m = new pc.Mat4();
+         *
+         * // Query the z-axis component
+         * var y = new pc.Vec3();
+         * m.getY(y);
+         */
+        getY(y?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Mat4#getZ
+         * @description Extracts the z-axis from the specified 4x4 matrix.
+         * @param {pc.Vec3} [z] The vector to receive the z axis of the matrix.
+         * @returns {pc.Vec3} The z-axis of the specified 4x4 matrix.
+         * @example
+         * // Create a 4x4 matrix
+         * var m = new pc.Mat4();
+         *
+         * // Query the z-axis component
+         * var z = new pc.Vec3();
+         * m.getZ(z);
+         */
+        getZ(z?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Mat4#getScale
+         * @description Extracts the scale component from the specified 4x4 matrix.
+         * @param {pc.Vec3} [scale] Vector to receive the scale.
+         * @returns {pc.Vec3} The scale in X, Y and Z of the specified 4x4 matrix.
+         * @example
+         * // Create a 4x4 scale matrix
+         * var m = new pc.Mat4().scale(2, 3, 4);
+         *
+         * // Query the scale component
+         * var scale = m.getScale();
+         */
+        getScale(scale?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Mat4#setFromEulerAngles
+         * @description Sets the specified matrix to a rotation matrix defined by
+         * Euler angles. The Euler angles are specified in XYZ order and in degrees.
+         * @param {Number} ex Angle to rotate around X axis in degrees.
+         * @param {Number} ey Angle to rotate around Y axis in degrees.
+         * @param {Number} ez Angle to rotate around Z axis in degrees.
+         * @returns {pc.Mat4} Self for chaining.
+         * @example
+         * var m = new pc.Mat4();
+         * m.setFromEulerAngles(45, 90, 180);
+         */
+        // http://en.wikipedia.org/wiki/Rotation_matrix#Conversion_from_and_to_axis-angle
+        // The 3D space is right-handed, so the rotation around each axis will be counterclockwise
+        // for an observer placed so that the axis goes in his or her direction (Right-hand rule).
+        setFromEulerAngles(ex: number, ey: number, ez: number): this;
+
+        /**
+         * @function
+         * @name pc.Mat4#getEulerAngles
+         * @description Extracts the Euler angles equivalent to the rotational portion
+         * of the specified matrix. The returned Euler angles are in XYZ order an in degrees.
+         * @param {pc.Vec3} [eulers] A 3-d vector to receive the Euler angles.
+         * @returns {pc.Vec3} A 3-d vector containing the Euler angles.
+         * @example
+         * // Create a 4x4 rotation matrix of 45 degrees around the y-axis
+         * var m = new pc.Mat4().setFromAxisAngle(pc.Vec3.UP, 45);
+         *
+         * var eulers = m.getEulerAngles();
+         */
+        getEulerAngles(eulers?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Mat4#toString
+         * @description Converts the specified matrix to string form.
+         * @returns {String} The matrix in string form.
+         * @example
+         * var m = new pc.Mat4();
+         * // Should output '[1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]'
+         * console.log(m.toString());
+         */
+        toString(): string;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Mat4
+         * @name pc.Mat4.IDENTITY
+         * @description A constant matrix set to the identity.
+         */
+        static readonly IDENTITY: pc.Mat4;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Mat4
+         * @name pc.Mat4.ZERO
+         * @description A constant matrix with all elements set to 0.
+         */
+        static readonly ZERO: pc.Mat4;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/math/math.d.ts b/types/playcanvas/engine/math/math.d.ts
new file mode 100644
index 0000000000..37118f3a0b
--- /dev/null
+++ b/types/playcanvas/engine/math/math.d.ts
@@ -0,0 +1,192 @@
+declare namespace pc {
+
+    /**
+     * @name pc.math
+     * @namespace
+     * @description Math API
+     */
+    namespace math {
+        /**
+         * @name pc.math.DEG_TO_RAD
+         * @description Conversion factor between degrees and radians
+         * @type Number
+         * @example
+         * // Convert 180 degrees to pi radians
+         * var rad = 180 * pc.math.DEG_TO_RAD;
+         */
+        const DEG_TO_RAD: number;
+
+        /**
+         * @name pc.math.RAD_TO_DEG
+         * @description Conversion factor between degrees and radians
+         * @type Number
+         * @example
+         * // Convert pi radians to 180 degrees
+         * var deg = Math.PI * pc.math.RAD_TO_DEG;
+         */
+        const RAD_TO_DEG: number;
+
+        /**
+        * @name pc.math.INV_LOG2
+        * @description Inverse log 2
+        * @type Number
+        */
+        const INV_LOG2: number;
+
+        /**
+         * @function
+         * @name pc.math.clamp
+         * @description Clamp a number between min and max inclusive.
+         * @param {Number} value Number to clamp
+         * @param {Number} min Min value
+         * @param {Number} max Max value
+         * @returns {Number} The clamped value
+         */
+        function clamp(value: number, min: number, max: number): number;
+
+        /**
+         * @function
+         * @name pc.math.intToBytes24
+         * @description Convert an 24 bit integer into an array of 3 bytes.
+         * @param {Number} i Number holding an integer value
+         * @returns {Number[]} An array of 3 bytes.
+         * @example
+         * // Set bytes to [0x11, 0x22, 0x33]
+         * var bytes = pc.math.intToBytes24(0x112233);
+         */
+        function intToBytes24(i: number): [number, number, number];
+
+        /**
+         * @function
+         * @name pc.math.intToBytes32
+         * @description Convert an 32 bit integer into an array of 4 bytes.
+         * @returns {Number[]} An array of 4 bytes
+         * @param {Number} i Number holding an integer value
+         * @example
+         * // Set bytes to [0x11, 0x22, 0x33, 0x44]
+         * var bytes = pc.math.intToBytes32(0x11223344);
+         */
+        function intToBytes32(i: number): [number, number, number, number];
+
+        /**
+         * @function
+         * @name pc.math.bytesToInt24
+         * @description Convert 3 8 bit Numbers into a single unsigned 24 bit Number.
+         * @example
+         * // Set result1 to 0x112233 from an array of 3 values
+         * var result1 = pc.math.bytesToInt24([0x11, 0x22, 0x33]);
+         *
+         * // Set result2 to 0x112233 from 3 discrete values
+         * var result2 = pc.math.bytesToInt24(0x11, 0x22, 0x33);
+         * @param {Number} r A single byte (0-255)
+         * @param {Number} g A single byte (0-255)
+         * @param {Number} b A single byte (0-255)
+         * @returns {Number} A single unsigned 24 bit Number.
+         */
+        function bytesToInt24(r: number, g: number, b: number): number;
+
+        /**
+         * @function
+         * @name pc.math.bytesToInt32
+         * @description Convert 4 1-byte Numbers into a single unsigned 32bit Number.
+         * @returns {Number} A single unsigned 32bit Number.
+         * @example
+          * // Set result1 to 0x11223344 from an array of 4 values
+          * var result1 = pc.math.bytesToInt32([0x11, 0x22, 0x33, 0x44]);
+          *
+          * // Set result2 to 0x11223344 from 4 discrete values
+          * var result2 = pc.math.bytesToInt32(0x11, 0x22, 0x33, 0x44);
+         * @param {Number} r A single byte (0-255)
+         * @param {Number} g A single byte (0-255)
+         * @param {Number} b A single byte (0-255)
+         * @param {Number} a A single byte (0-255)
+         */
+        function bytesToInt32(r: number, g: number, b: number, a: number): number
+
+        /**
+         * @function
+         * @name pc.math.lerp
+         * @returns {Number} The linear interpolation of two numbers.
+         * @description Calculates the linear interpolation of two numbers.
+         * @param {Number} a Number to linearly interpolate from.
+         * @param {Number} b Number to linearly interpolate to.
+         * @param {Number} alpha The value controlling the result of interpolation. When alpha is 0,
+         * a is returned. When alpha is 1, b is returned. Between 0 and 1, a linear interpolation between
+         * a and b is returned. alpha is clamped between 0 and 1.
+         */
+        function lerp(a: number, b: number, alpha: number): number
+
+        /**
+         * @function
+         * @name pc.math.lerpAngle
+         * @description Calculates the linear interpolation of two angles ensuring that interpolation
+         * is correctly performed across the 360 to 0 degree boundary. Angles are supplied in degrees.
+         * @returns {Number} The linear interpolation of two angles
+         * @param {Number} a Angle (in degrees) to linearly interpolate from.
+         * @param {Number} b Angle (in degrees) to linearly interpolate to.
+         * @param {Number} alpha The value controlling the result of interpolation. When alpha is 0,
+         * a is returned. When alpha is 1, b is returned. Between 0 and 1, a linear interpolation between
+         * a and b is returned. alpha is clamped between 0 and 1.
+         */
+        function lerpAngle(a: number, b: number, alpha: number): number;
+
+        /**
+         * @function
+         * @name pc.math.powerOfTwo
+         * @description Returns true if argument is a power-of-two and false otherwise.
+         * @param {Number} x Number to check for power-of-two property.
+         * @returns {Boolean} true if power-of-two and false otherwise.
+         */
+        function powerOfTwo(x: number): boolean;
+
+        /**
+         * @function
+         * @name pc.math.nextPowerOfTwo
+         * @description Returns the next power of 2 for the specified value.
+         * @param {Number} val The value for which to calculate the next power of 2.
+         * @return {Number} The next power of 2.
+         */
+        function nextPowerOfTwo(val: number): number;
+
+        /**
+         * @function
+         * @name pc.math.random
+         * @description Return a pseudo-random number between min and max.
+         * The number generated is in the range [min, max), that is inclusive of the minimum but exclusive of the maximum.
+         * @param {Number} min Lower bound for range.
+         * @param {Number} max Upper bound for range.
+         * @returns {Number} Pseudo-random number between the supplied range.
+         */
+        function random(min: number, max: number): number
+
+        /**
+         * @function
+         * @name pc.math.smoothstep
+         * @description The function interpolates smoothly between two input values based on
+         * a third one that should be between the first two. The returned value is clamped
+         * between 0 and 1.
+         * <br/>The slope (i.e. derivative) of the smoothstep function starts at 0 and ends at 0.
+         * This makes it easy to create a sequence of transitions using smoothstep to interpolate
+         * each segment rather than using a more sophisticated or expensive interpolation technique.
+         * <br/>See http://en.wikipedia.org/wiki/Smoothstep for more details.
+         * @param {Number} min The lower bound of the interpolation range.
+         * @param {Number} max The upper bound of the interpolation range.
+         * @param {Number} x The value to interpolate.
+         * @returns {Number} The smoothly interpolated value clamped between zero and one.
+         */
+        function smoothstep(min: number, max: number, x: number): number;
+
+        /**
+         * @function
+         * @name pc.math.smootherstep
+         * @description An improved version of the pc.math.smoothstep function which has zero
+         * 1st and 2nd order derivatives at t=0 and t=1.
+         * <br/>See http://en.wikipedia.org/wiki/Smoothstep for more details.
+         * @param {Number} min The lower bound of the interpolation range.
+         * @param {Number} max The upper bound of the interpolation range.
+         * @param {Number} x The value to interpolate.
+         * @returns {Number} The smoothly interpolated value clamped between zero and one.
+         */
+        function smootherstep(min: number, max: number, x: number): number;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/math/quat.d.ts b/types/playcanvas/engine/math/quat.d.ts
new file mode 100644
index 0000000000..20e3781670
--- /dev/null
+++ b/types/playcanvas/engine/math/quat.d.ts
@@ -0,0 +1,358 @@
+declare namespace pc {
+    /**
+    * @name pc.Quat
+    * @class A quaternion.
+    * @description Create a new Quat object
+    * @param {Number} [x] The quaternion's x component. Default value 0. If x is an array of length 4, the array will be used to populate all components.
+    * @param {Number} [y] The quaternion's y component. Default value 0.
+    * @param {Number} [z] The quaternion's z component. Default value 0.
+    * @param {Number} [w] The quaternion's w component. Default value 1.
+    */
+
+    class Quat {
+        constructor(x: number, y: number, z: number, w: number)
+        constructor(x: [number, number, number, number])
+        constructor()
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Quat#x
+         * @description The x component of the quaternion.
+         * @example
+         * var quat = new pc.Quat();
+         *
+         * // Get x
+         * var x = quat.x;
+         *
+         * // Set x
+         * quat.x = 0;
+         */
+        x: number;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Quat#y
+         * @description The y component of the quaternion.
+         * @example
+         * var quat = new pc.Quat();
+         *
+         * // Get y
+         * var y = quat.y;
+         *
+         * // Set y
+         * quat.y = 0;
+         */
+        y: number;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Quat#z
+         * @description The z component of the quaternion.
+         * @example
+         * var quat = new pc.Quat();
+         *
+         * // Get z
+         * var z = quat.z;
+         *
+         * // Set z
+         * quat.z = 0;
+         */
+        z: number;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Quat#w
+         * @description The w component of the quaternion.
+         * @example
+         * var quat = new pc.Quat();
+         *
+         * // Get w
+         * var w = quat.w;
+         *
+         * // Set w
+         * quat.w = 0;
+         */
+        w: number;
+
+        /**
+         * @function
+         * @name pc.Quat#clone
+         * @description Returns an identical copy of the specified quaternion.
+         * @returns {pc.Quat} A quaternion containing the result of the cloning.
+         * @example
+         * var q = new pc.Quat(-0.11, -0.15, -0.46, 0.87);
+         * var qclone = q.clone();
+         *
+         * console.log("The result of the cloning is: " + q.toString());
+         */
+        clone(): pc.Quat;
+
+        conjugate(): this;
+
+        /**
+         * @function
+         * @name pc.Quat#copy
+         * @description Copies the contents of a source quaternion to a destination quaternion.
+         * @param {pc.Quat} rhs The quaternion to be copied.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * var src = new pc.Quat();
+         * var dst = new pc.Quat();
+         * dst.copy(src, src);
+         * console.log("The two quaternions are " + (src.equals(dst) ? "equal" : "different"));
+         */
+        copy(rhs: pc.Quat): this;
+
+        /**
+         * @function
+         * @name pc.Quat#equals
+         * @description Reports whether two quaternions are equal.
+         * @returns {Boolean} true if the quaternions are equal and false otherwise.
+         * @example
+         * var a = new pc.Quat();
+         * var b = new pc.Quat();
+         * console.log("The two quaternions are " + (a.equals(b) ? "equal" : "different"));
+         */
+        equals(that: pc.Quat): boolean;
+
+        /**
+         * @function
+         * @name pc.Quat#getEulerAngles
+         * @description Converts the supplied quaternion to Euler angles.
+         * @param {pc.Vec3} [eulers] The 3-dimensional vector to receive the Euler angles.
+         * @returns {pc.Vec3} The 3-dimensional vector holding the Euler angles that
+         * correspond to the supplied quaternion.
+         */
+        getEulerAngles(eulers?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Quat#invert
+         * @description Generates the inverse of the specified quaternion.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * // Create a quaternion rotated 180 degrees around the y-axis
+         * var rot = new pc.Quat().setFromEulerAngles(0, 180, 0);
+         *
+         * // Invert in place
+         * rot.invert();
+         */
+        invert(): this;
+
+        /**
+         * @function
+         * @name pc.Quat#length
+         * @description Returns the magnitude of the specified quaternion.
+         * @returns {Number} The magnitude of the specified quaternion.
+         * @example
+         * var q = new pc.Quat(0, 0, 0, 5);
+         * var len = q.length();
+         * // Should output 5
+         * console.log("The length of the quaternion is: " + len);
+         */
+        length(): number;
+
+        /**
+         * @function
+         * @name pc.Quat#lengthSq
+         * @description Returns the magnitude squared of the specified quaternion.
+         * @returns {Number} The magnitude of the specified quaternion.
+         * @example
+         * var q = new pc.Quat(3, 4, 0);
+         * var lenSq = q.lengthSq();
+         * // Should output 25
+         * console.log("The length squared of the quaternion is: " + lenSq);
+         */
+        lengthSq(): number;
+
+        /**
+         * @function
+         * @name pc.Quat#mul
+         * @description Returns the result of multiplying the specified quaternions together.
+         * @param {pc.Quat} rhs The quaternion used as the second multiplicand of the operation.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * var a = new pc.Quat().setFromEulerAngles(0, 30, 0);
+         * var b = new pc.Quat().setFromEulerAngles(0, 60, 0);
+         *
+         * // a becomes a 90 degree rotation around the Y axis
+         * // In other words, a = a * b
+         * a.mul(b);
+         *
+         * console.log("The result of the multiplication is: " a.toString());
+         */
+        mul(rhs: pc.Quat): this;
+
+        /**
+         * @function
+         * @name pc.Quat#mul2
+         * @description Returns the result of multiplying the specified quaternions together.
+         * @param {pc.Quat} lhs The quaternion used as the first multiplicand of the operation.
+         * @param {pc.Quat} rhs The quaternion used as the second multiplicand of the operation.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * var a = new pc.Quat().setFromEulerAngles(0, 30, 0);
+         * var b = new pc.Quat().setFromEulerAngles(0, 60, 0);
+         * var r = new pc.Quat();
+         *
+         * // r is set to a 90 degree rotation around the Y axis
+         * // In other words, r = a * b
+         * r.mul2(a, b);
+         *
+         * console.log("The result of the multiplication is: " r.toString());
+         */
+        mul2(lhs: pc.Quat, rhs: pc.Quat): pc.Quat;
+
+        /**
+         * @function
+         * @name pc.Quat#normalize
+         * @description Returns the specified quaternion converted in place to a unit quaternion.
+         * @returns {pc.Quat} The result of the normalization.
+         * @example
+         * var v = new pc.Quat(0, 0, 0, 5);
+         *
+         * v.normalize();
+         *
+         * // Should output 0, 0, 0, 1
+         * console.log("The result of the vector normalization is: " + v.toString());
+         */
+        normalize(): this;
+
+        /**
+         * @function
+         * @name pc.Quat#set
+         * @description Sets the specified quaternion to the supplied numerical values.
+         * @param {Number} x The x component of the quaternion.
+         * @param {Number} y The y component of the quaternion.
+         * @param {Number} z The z component of the quaternion.
+         * @param {Number} w The w component of the quaternion.
+         * @example
+         * var q = new pc.Quat();
+         * q.set(1, 0, 0, 0);
+         *
+         * // Should output 1, 0, 0, 0
+         * console.log("The result of the vector set is: " + q.toString());
+         */
+        set(x: number, y: number, z: number, w: number): this;
+
+        /**
+         * @function
+         * @name pc.Quat#setFromAxisAngle
+         * @description Sets a quaternion from an angular rotation around an axis.
+         * @param {pc.Vec3} axis World space axis around which to rotate.
+         * @param {Number} angle Angle to rotate around the given axis in degrees.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * var q = new pc.Quat();
+         * q.setFromAxisAngle(pc.Vec3.UP, 90);
+         */
+        setFromAxisAngle(axis: pc.Vec3, angle: number): this;
+
+        /**
+         * @function
+         * @name pc.Quat#setFromEulerAngles
+         * @description Sets a quaternion from Euler angles specified in XYZ order.
+         * @param {Number} ex Angle to rotate around X axis in degrees.
+         * @param {Number} ey Angle to rotate around Y axis in degrees.
+         * @param {Number} ez Angle to rotate around Z axis in degrees.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * var q = new pc.Quat();
+         * q.setFromEulerAngles(45, 90, 180);
+         */
+        setFromEulerAngles(ex: number, ey: number, ez: number): this;
+
+        /**
+         * @function
+         * @name pc.Quat#setFromMat4
+         * @description Converts the specified 4x4 matrix to a quaternion. Note that since
+         * a quaternion is purely a representation for orientation, only the translational part
+         * of the matrix is lost.
+         * @param {pc.Mat4} m The 4x4 matrix to convert.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * // Create a 4x4 rotation matrix of 180 degrees around the y-axis
+         * var rot = new pc.Mat4().setFromAxisAngle(pc.Vec3.UP, 180);
+         *
+         * // Convert to a quaternion
+         * var q = new pc.Quat().setFromMat4(rot);
+         */
+        setFromMat4(m: pc.Mat4): this;
+
+        /**
+         * @function
+         * @name pc.Quat#slerp
+         * @description Performs a spherical interpolation between two quaternions. The result of
+         * the interpolation is written to the quaternion calling the function.
+         * @param {pc.Quat} lhs The quaternion to interpolate from.
+         * @param {pc.Quat} rhs The quaternion to interpolate to.
+         * @param {Number} alpha The value controlling the interpolation in relation to the two input
+         * quaternions. The value is in the range 0 to 1, 0 generating q1, 1 generating q2 and anything
+         * in between generating a spherical interpolation between the two.
+         * @returns {pc.Quat} Self for chaining.
+         * @example
+         * var q1 = new pc.Quat(-0.11,-0.15,-0.46,0.87);
+         * var q2 = new pc.Quat(-0.21,-0.21,-0.67,0.68);
+         *
+         * var result;
+         * result = new pc.Quat().slerp(q1, q2, 0);   // Return q1
+         * result = new pc.Quat().slerp(q1, q2, 0.5); // Return the midpoint interpolant
+         * result = new pc.Quat().slerp(q1, q2, 1);   // Return q2
+         */
+        slerp(lhs: pc.Quat, rhs: pc.Quat, alpha: number): this;
+
+        /**
+         * @function
+         * @name pc.Quat#transformVector
+         * @description Transforms a 3-dimensional vector by the specified quaternion.
+         * @param {pc.Vec3} vec The 3-dimensional vector to be transformed.
+         * @param {pc.Vec3} [res] An optional 3-dimensional vector to receive the result of the transformation.
+         * @returns {pc.Vec3} The input vector v transformed by the current instance.
+         * @example
+         * // Create a 3-dimensional vector
+         * var v = new pc.Vec3(1, 2, 3);
+         *
+         * // Create a 4x4 rotation matrix
+         * var q = new pc.Quat().setFromEulerAngles(10, 20, 30);
+         *
+         * var tv = q.transformVector(v);
+         */
+        transformVector(vec: pc.Vec3, res?: pc.Vec3): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Quat#toString
+         * @description Converts the quaternion to string form.
+         * @returns {String} The quaternion in string form.
+         * @example
+         * var v = new pc.Quat(0, 0, 0, 1);
+         * // Should output '[0, 0, 0, 1]'
+         * console.log(v.toString());
+         */
+        toString(): string;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Quat
+         * @name pc.Quat.IDENTITY
+         * @description A constant quaternion set to [0, 0, 0, 1] (the identity).
+         */
+        static readonly IDENTITY: pc.Quat;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Quat
+         * @name pc.Quat.ZERO
+         * @description A constant quaternion set to [0, 0, 0, 0].
+         */
+        static readonly ZERO: pc.Quat;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/math/vec2.d.ts b/types/playcanvas/engine/math/vec2.d.ts
new file mode 100644
index 0000000000..ec02347f46
--- /dev/null
+++ b/types/playcanvas/engine/math/vec2.d.ts
@@ -0,0 +1,360 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Vec2
+    * @class A 2-dimensional vector.
+    * @description Creates a new Vec2 object
+    * @param {Number} [x] The x value. If x is an array of length 2, the array will be used to populate all components.
+    * @param {Number} [y] The y value
+    */
+    class Vec2 {
+        constructor(x: number, y: number)
+
+        /**
+         * @function
+         * @name pc.Vec2#add
+         * @description Adds a 2-dimensional vector to another in place.
+         * @param {pc.Vec2} rhs The vector to add to the specified vector.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var a = new pc.Vec2(10, 10);
+         * var b = new pc.Vec2(20, 20);
+         *
+         * a.add(b);
+         *
+         * // Should output [30, 30]
+         * console.log("The result of the addition is: " + a.toString());
+         */
+        add(rhs: pc.Vec2): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#add2
+         * @description Adds two 2-dimensional vectors together and returns the result.
+         * @param {pc.Vec2} lhs The first vector operand for the addition.
+         * @param {pc.Vec2} rhs The second vector operand for the addition.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var a = new pc.Vec2(10, 10);
+         * var b = new pc.Vec2(20, 20);
+         * var r = new pc.Vec2();
+         *
+         * r.add2(a, b);
+         * // Should output [30, 30]
+         *
+         * console.log("The result of the addition is: " + r.toString());
+         */
+        add2(lhs: pc.Vec2, rhs: pc.Vec2): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#clone
+         * @description Returns an identical copy of the specified 2-dimensional vector.
+         * @returns {pc.Vec2} A 2-dimensional vector containing the result of the cloning.
+         * @example
+         * var v = new pc.Vec2(10, 20);
+         * var vclone = v.clone();
+         * console.log("The result of the cloning is: " + vclone.toString());
+         */
+        clone(): pc.Vec2;
+
+        /**
+         * @function
+         * @name pc.Vec2#copy
+         * @description Copied the contents of a source 2-dimensional vector to a destination 2-dimensional vector.
+         * @param {pc.Vec2} rhs A vector to copy to the specified vector.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var src = new pc.Vec2(10, 20);
+         * var dst = new pc.Vec2();
+         *
+         * dst.copy(src);
+         *
+         * console.log("The two vectors are " + (dst.equals(src) ? "equal" : "different"));
+         */
+        copy(rhs: pc.Vec2): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#dot
+         * @description Returns the result of a dot product operation performed on the two specified 2-dimensional vectors.
+         * @param {pc.Vec2} rhs The second 2-dimensional vector operand of the dot product.
+         * @returns {Number} The result of the dot product operation.
+         * @example
+         * var v1 = new pc.Vec2(5, 10);
+         * var v2 = new pc.Vec2(10, 20);
+         * var v1dotv2 = v1.dot(v2);
+         * console.log("The result of the dot product is: " + v1dotv2);
+         */
+        dot(rhs: pc.Vec2): number;
+
+        /**
+         * @function
+         * @name pc.Vec2#equals
+         * @description Reports whether two vectors are equal.
+         * @param {pc.Vec2} rhs The vector to compare to the specified vector.
+         * @returns {Boolean} true if the vectors are equal and false otherwise.
+         * @example
+         * var a = new pc.Vec2(1, 2);
+         * var b = new pc.Vec2(4, 5);
+         * console.log("The two vectors are " + (a.equals(b) ? "equal" : "different"));
+         */
+        equals(rhs: pc.Vec2): boolean;
+
+        /**
+         * @function
+         * @name pc.Vec2#length
+         * @description Returns the magnitude of the specified 2-dimensional vector.
+         * @returns {Number} The magnitude of the specified 2-dimensional vector.
+         * @example
+         * var vec = new pc.Vec2(3, 4);
+         * var len = vec.length();
+         * // Should output 5
+         * console.log("The length of the vector is: " + len);
+         */
+        length(): number;
+
+        /**
+         * @function
+         * @name pc.Vec2#lengthSq
+         * @description Returns the magnitude squared of the specified 2-dimensional vector.
+         * @returns {Number} The magnitude of the specified 2-dimensional vector.
+         * @example
+         * var vec = new pc.Vec2(3, 4);
+         * var len = vec.lengthSq();
+         * // Should output 25
+         * console.log("The length squared of the vector is: " + len);
+         */
+        lengthSq(): number;
+
+        /**
+         * @function
+         * @name pc.Vec2#lerp
+         * @description Returns the result of a linear interpolation between two specified 2-dimensional vectors.
+         * @param {pc.Vec2} lhs The 2-dimensional to interpolate from.
+         * @param {pc.Vec2} rhs The 2-dimensional to interpolate to.
+         * @param {Number} alpha The value controlling the point of interpolation. Between 0 and 1, the linear interpolant
+         * will occur on a straight line between lhs and rhs. Outside of this range, the linear interpolant will occur on
+         * a ray extrapolated from this line.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var a = new pc.Vec2(0, 0);
+         * var b = new pc.Vec2(10, 10);
+         * var r = new pc.Vec2();
+         *
+         * r.lerp(a, b, 0);   // r is equal to a
+         * r.lerp(a, b, 0.5); // r is 5, 5
+         * r.lerp(a, b, 1);   // r is equal to b
+         */
+        lerp(lhs: pc.Vec2, rhs: pc.Vec2, alpha: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#mul
+         * @description Multiplies a 2-dimensional vector to another in place.
+         * @param {pc.Vec2} rhs The 2-dimensional vector used as the second multiplicand of the operation.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var a = new pc.Vec2(2, 3);
+         * var b = new pc.Vec2(4, 5);
+         *
+         * a.mul(b);
+         *
+         * // Should output 8, 15
+         * console.log("The result of the multiplication is: " + a.toString());
+         */
+        mul(rhs: pc.Vec2): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#mul2
+         * @description Returns the result of multiplying the specified 2-dimensional vectors together.
+         * @param {pc.Vec2} lhs The 2-dimensional vector used as the first multiplicand of the operation.
+         * @param {pc.Vec2} rhs The 2-dimensional vector used as the second multiplicand of the operation.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var a = new pc.Vec2(2, 3);
+         * var b = new pc.Vec2(4, 5);
+         * var r = new pc.Vec2();
+         *
+         * r.mul2(a, b);
+         *
+         * // Should output 8, 15
+         * console.log("The result of the multiplication is: " + r.toString());
+         */
+        mul2(lhs: pc.Vec2, rhs: pc.Vec2): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#normalize
+         * @description Returns the specified 2-dimensional vector copied and converted to a unit vector.
+         * If the vector has a length of zero, the vector's elements will be set to zero.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var v = new pc.Vec2(25, 0);
+         *
+         * v.normalize();
+         *
+         * // Should output 1, 0
+         * console.log("The result of the vector normalization is: " + v.toString());
+         */
+        normalize(): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#scale
+         * @description Scales each component of the specified 2-dimensional vector by the supplied
+         * scalar value.
+         * @param {Number} scalar The value by which each vector component is multiplied.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var v = new pc.Vec2(2, 4);
+         *
+         * // Multiply by 2
+         * v.scale(2);
+         *
+         * // Negate
+         * v.scale(-1);
+         *
+         * // Divide by 2
+         * v.scale(0.5);
+         */
+        scale(scalar: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#set
+         * @description Sets the specified 2-dimensional vector to the supplied numerical values.
+         * @param {Number} x The value to set on the first component of the vector.
+         * @param {Number} y The value to set on the second component of the vector.
+         * @example
+         * var v = new pc.Vec2();
+         * v.set(5, 10);
+         *
+         * // Should output 5, 10
+         * console.log("The result of the vector set is: " + v.toString());
+         */
+        set(x: number, y: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#sub
+         * @description Subtracts a 2-dimensional vector from another in place.
+         * @param {pc.Vec2} rhs The vector to add to the specified vector.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var a = new pc.Vec2(10, 10);
+         * var b = new pc.Vec2(20, 20);
+         *
+         * a.sub(b);
+         *
+         * // Should output [-10, -10]
+         * console.log("The result of the addition is: " + a.toString());
+         */
+        sub(rhs: pc.Vec2): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#sub2
+         * @description Subtracts two 2-dimensional vectors from one another and returns the result.
+         * @param {pc.Vec2} lhs The first vector operand for the addition.
+         * @param {pc.Vec2} rhs The second vector operand for the addition.
+         * @returns {pc.Vec2} Self for chaining.
+         * @example
+         * var a = new pc.Vec2(10, 10);
+         * var b = new pc.Vec2(20, 20);
+         * var r = new pc.Vec2();
+         *
+         * r.sub2(a, b);
+         *
+         * // Should output [-10, -10]
+         * console.log("The result of the addition is: " + r.toString());
+         */
+        sub2(lhs: pc.Vec2, rhs: pc.Vec2): this;
+
+        /**
+         * @function
+         * @name pc.Vec2#toString
+         * @description Converts the vector to string form.
+         * @returns {String} The vector in string form.
+         * @example
+         * var v = new pc.Vec2(20, 10);
+         * // Should output '[20, 10]'
+         * console.log(v.toString());
+         */
+        toString(): string;
+
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Vec2#x
+         * @description The first element of the vector.
+         * @example
+         * var vec = new pc.Vec2(10, 20);
+         *
+         * // Get x
+         * var x = vec.x;
+         *
+         * // Set x
+         * vec.x = 0;
+         */
+        x: number;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Vec2#y
+         * @description The second element of the vector.
+         * @example
+         * var vec = new pc.Vec2(10, 20);
+         *
+         * // Get y
+         * var y = vec.y;
+         *
+         * // Set y
+         * vec.y = 0;
+         */
+        y: number;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec2
+         * @name pc.Vec2.ONE
+         * @description A constant vector set to [1, 1].
+         */
+        static readonly ONE: pc.Vec2;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec2
+         * @name pc.Vec2.RIGHT
+         * @description A constant vector set to [1, 0].
+         */
+        static readonly RIGHT: pc.Vec2;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec2
+         * @name pc.Vec2.UP
+         * @description A constant vector set to [0, 1].
+         */
+        static readonly UP: pc.Vec2;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec2
+         * @name pc.Vec2.ZERO
+         * @description A constant vector set to [0, 0].
+         */
+        static readonly ZERO: pc.Vec2;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/math/vec3.d.ts b/types/playcanvas/engine/math/vec3.d.ts
new file mode 100644
index 0000000000..cc298d6a4e
--- /dev/null
+++ b/types/playcanvas/engine/math/vec3.d.ts
@@ -0,0 +1,454 @@
+declare namespace pc {
+    /**
+    * @name pc.Vec3
+    * @class A 3-dimensional vector.
+    * @description Creates a new Vec3 object
+    * @param {Number} [x] The x value. If x is an array of length 3, the array will be used to populate all components.
+    * @param {Number} [y] The y value
+    * @param {Number} [z] The z value
+    * @example
+    * var v = new pc.Vec3(1,2,3);
+    */
+    class Vec3 {
+
+        constructor(x: number, y: number, z: number)
+        constructor(x: [number, number, number])
+        constructor()
+
+        /**
+         * @function
+         * @name pc.Vec3#add
+         * @description Adds a 3-dimensional vector to another in place.
+         * @param {pc.Vec3} rhs The vector to add to the specified vector.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var a = new pc.Vec3(10, 10, 10);
+         * var b = new pc.Vec3(20, 20, 20);
+         *
+         * a.add(b);
+         *
+         * // Should output [30, 30, 30]
+         * console.log("The result of the addition is: " + a.toString());
+         */
+        add(rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#add2
+         * @description Adds two 3-dimensional vectors together and returns the result.
+         * @param {pc.Vec3} lhs The first vector operand for the addition.
+         * @param {pc.Vec3} rhs The second vector operand for the addition.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var a = new pc.Vec3(10, 10, 10);
+         * var b = new pc.Vec3(20, 20, 20);
+         * var r = new pc.Vec3();
+         *
+         * r.add2(a, b);
+         * // Should output [30, 30, 30]
+         *
+         * console.log("The result of the addition is: " + r.toString());
+         */
+        add2(lhs: pc.Vec3, rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#clone
+         * @description Returns an identical copy of the specified 3-dimensional vector.
+         * @returns {pc.Vec3} A 3-dimensional vector containing the result of the cloning.
+         * @example
+         * var v = new pc.Vec3(10, 20, 30);
+         * var vclone = v.clone();
+         * console.log("The result of the cloning is: " + vclone.toString());
+         */
+        clone(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.Vec3#copy
+         * @description Copied the contents of a source 3-dimensional vector to a destination 3-dimensional vector.
+         * @param {pc.Vec3} rhs A vector to copy to the specified vector.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var src = new pc.Vec3(10, 20, 30);
+         * var dst = new pc.Vec3();
+         *
+         * dst.copy(src);
+         *
+         * console.log("The two vectors are " + (dst.equals(src) ? "equal" : "different"));
+         */
+        copy(rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#cross
+         * @description Returns the result of a cross product operation performed on the two specified 3-dimensional vectors.
+         * @param {pc.Vec3} lhs The first 3-dimensional vector operand of the cross product.
+         * @param {pc.Vec3} rhs The second 3-dimensional vector operand of the cross product.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var back = new pc.Vec3().cross(pc.Vec3.RIGHT, pc.Vec3.UP);
+         *
+         * // Should print the Z axis (i.e. [0, 0, 1])
+         * console.log("The result of the cross product is: " + back.toString());
+         */
+        cross(lhs: pc.Vec3, rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#dot
+         * @description Returns the result of a dot product operation performed on the two specified 3-dimensional vectors.
+         * @param {pc.Vec3} rhs The second 3-dimensional vector operand of the dot product.
+         * @returns {Number} The result of the dot product operation.
+         * @example
+         * var v1 = new pc.Vec3(5, 10, 20);
+         * var v2 = new pc.Vec3(10, 20, 40);
+         * var v1dotv2 = v1.dot(v2);
+         * console.log("The result of the dot product is: " + v1dotv2);
+         */
+        dot(rhs: pc.Vec3): number;
+
+        /**
+         * @function
+         * @name pc.Vec3#equals
+         * @description Reports whether two vectors are equal.
+         * @param {pc.Vec3} rhs The vector to compare to the specified vector.
+         * @returns {Boolean} true if the vectors are equal and false otherwise.
+         * @example
+         * var a = new pc.Vec3(1, 2, 3);
+         * var b = new pc.Vec3(4, 5, 6);
+         * console.log("The two vectors are " + (a.equals(b) ? "equal" : "different"));
+         */
+        equals(rhs: pc.Vec3): boolean;
+
+        /**
+         * @function
+         * @name pc.Vec3#length
+         * @description Returns the magnitude of the specified 3-dimensional vector.
+         * @returns {Number} The magnitude of the specified 3-dimensional vector.
+         * @example
+         * var vec = new pc.Vec3(3, 4, 0);
+         * var len = vec.length();
+         * // Should output 5
+         * console.log("The length of the vector is: " + len);
+         */
+        length(): number;
+
+        /**
+         * @function
+         * @name pc.Vec3#lengthSq
+         * @description Returns the magnitude squared of the specified 3-dimensional vector.
+         * @returns {Number} The magnitude of the specified 3-dimensional vector.
+         * @example
+         * var vec = new pc.Vec3(3, 4, 0);
+         * var len = vec.lengthSq();
+         * // Should output 25
+         * console.log("The length squared of the vector is: " + len);
+         */
+        lengthSq(): number;
+
+        /**
+         * @function
+         * @name pc.Vec3#lerp
+         * @description Returns the result of a linear interpolation between two specified 3-dimensional vectors.
+         * @param {pc.Vec3} lhs The 3-dimensional to interpolate from.
+         * @param {pc.Vec3} rhs The 3-dimensional to interpolate to.
+         * @param {Number} alpha The value controlling the point of interpolation. Between 0 and 1, the linear interpolant
+         * will occur on a straight line between lhs and rhs. Outside of this range, the linear interpolant will occur on
+         * a ray extrapolated from this line.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var a = new pc.Vec3(0, 0, 0);
+         * var b = new pc.Vec3(10, 10, 10);
+         * var r = new pc.Vec3();
+         *
+         * r.lerp(a, b, 0);   // r is equal to a
+         * r.lerp(a, b, 0.5); // r is 5, 5, 5
+         * r.lerp(a, b, 1);   // r is equal to b
+         */
+        lerp(lhs: pc.Vec3, rhs: pc.Vec3, alpha: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#mul
+         * @description Multiplies a 3-dimensional vector to another in place.
+         * @param {pc.Vec3} rhs The 3-dimensional vector used as the second multiplicand of the operation.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var a = new pc.Vec3(2, 3, 4);
+         * var b = new pc.Vec3(4, 5, 6);
+         *
+         * a.mul(b);
+         *
+         * // Should output 8, 15, 24
+         * console.log("The result of the multiplication is: " + a.toString());
+         */
+        mul(rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#mul2
+         * @description Returns the result of multiplying the specified 3-dimensional vectors together.
+         * @param {pc.Vec3} lhs The 3-dimensional vector used as the first multiplicand of the operation.
+         * @param {pc.Vec3} rhs The 3-dimensional vector used as the second multiplicand of the operation.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var a = new pc.Vec3(2, 3, 4);
+         * var b = new pc.Vec3(4, 5, 6);
+         * var r = new pc.Vec3();
+         *
+         * r.mul2(a, b);
+         *
+         * // Should output 8, 15, 24
+         * console.log("The result of the multiplication is: " + r.toString());
+         */
+        mul2(lhs: pc.Vec3, rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#normalize
+         * @description Returns the specified 3-dimensional vector copied and converted to a unit vector.
+         * If the vector has a length of zero, the vector's elements will be set to zero.
+         * @returns {pc.Vec3} The result of the normalization.
+         * @example
+         * var v = new pc.Vec3(25, 0, 0);
+         *
+         * v.normalize();
+         *
+         * // Should output 1, 0, 0, 0
+         * console.log("The result of the vector normalization is: " + v.toString());
+         */
+        normalize(): this;
+
+        /**
+         * @function
+         * @name  pc.Vec3#project
+         * @description Projects this 3-dimensional vector onto the specified vector.
+         * @param {pc.Vec3} rhs The vector onto which the original vector will be projected on.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var v = new pc.Vec3(5, 5, 5);
+         * var normal = new pc.Vec3(1, 0, 0);
+         *
+         * v.project(normal);
+         *
+         * // Should output 5, 0, 0
+         * console.log("The result of the vector projection is: " + v.toString());
+         */
+        project(rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#scale
+         * @description Scales each dimension of the specified 3-dimensional vector by the supplied
+         * scalar value.
+         * @param {Number} scalar The value by which each vector component is multiplied.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var v = new pc.Vec3(2, 4, 8);
+         *
+         * // Multiply by 2
+         * v.scale(2);
+         *
+         * // Negate
+         * v.scale(-1);
+         *
+         * // Divide by 2
+         * v.scale(0.5);
+         */
+        scale(scalar: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#set
+         * @description Sets the specified 3-dimensional vector to the supplied numerical values.
+         * @param {Number} x The value to set on the first component of the vector.
+         * @param {Number} y The value to set on the second component of the vector.
+         * @param {Number} z The value to set on the third component of the vector.
+         * @example
+         * var v = new pc.Vec3();
+         * v.set(5, 10, 20);
+         *
+         * // Should output 5, 10, 20
+         * console.log("The result of the vector set is: " + v.toString());
+         */
+        set(x: number, y: number, z: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#sub
+         * @description Subtracts a 3-dimensional vector from another in place.
+         * @param {pc.Vec3} rhs The vector to add to the specified vector.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var a = new pc.Vec3(10, 10, 10);
+         * var b = new pc.Vec3(20, 20, 20);
+         *
+         * a.sub(b);
+         *
+         * // Should output [-10, -10, -10]
+         * console.log("The result of the addition is: " + a.toString());
+         */
+        sub(rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#sub2
+         * @description Subtracts two 3-dimensional vectors from one another and returns the result.
+         * @param {pc.Vec3} lhs The first vector operand for the addition.
+         * @param {pc.Vec3} rhs The second vector operand for the addition.
+         * @returns {pc.Vec3} Self for chaining.
+         * @example
+         * var a = new pc.Vec3(10, 10, 10);
+         * var b = new pc.Vec3(20, 20, 20);
+         * var r = new pc.Vec3();
+         *
+         * r.sub2(a, b);
+         *
+         * // Should output [-10, -10, -10]
+         * console.log("The result of the addition is: " + r.toString());
+         */
+        sub2(lhs: pc.Vec3, rhs: pc.Vec3): this;
+
+        /**
+         * @function
+         * @name pc.Vec3#toString
+         * @description Converts the vector to string form.
+         * @returns {String} The vector in string form.
+         * @example
+         * var v = new pc.Vec3(20, 10, 5);
+         * // Should output '[20, 10, 5]'
+         * console.log(v.toString());
+         */
+        toString(): string;
+
+        /**
+         * @name pc.Vec3#x
+         * @type Number
+         * @description The first component of the vector.
+         * @example
+         * var vec = new pc.Vec3(10, 20, 30);
+         *
+         * // Get x
+         * var x = vec.x;
+         *
+         * // Set x
+         * vec.x = 0;
+         */
+        x: number;
+
+        /**
+         * @name pc.Vec3#y
+         * @type Number
+         * @description The second component of the vector.
+         * @example
+         * var vec = new pc.Vec3(10, 20, 30);
+         *
+         * // Get y
+         * var y = vec.y;
+         *
+         * // Set y
+         * vec.y = 0;
+         */
+        y: number;
+
+        /**
+         * @name pc.Vec3#z
+         * @type Number
+         * @description The third component of the vector.
+         * @example
+         * var vec = new pc.Vec3(10, 20, 30);
+         *
+         * // Get z
+         * var z = vec.z;
+         *
+         * // Set z
+         * vec.z = 0;
+         */
+        z: number;
+
+        /**
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.BACK
+         * @description A constant vector set to [0, 0, 1].
+         */
+        static readonly BACK: pc.Vec3;
+
+        /**
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.DOWN
+         * @description A constant vector set to [0, -1, 0].
+         */
+        static readonly DOWN: pc.Vec3;
+
+        /**
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.FORWARD
+         * @description A constant vector set to [0, 0, -1].
+         */
+        static readonly FORWARD: pc.Vec3;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.LEFT
+         * @description A constant vector set to [-1, 0, 0].
+         */
+        static readonly LEFT: pc.Vec3;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.ONE
+         * @description A constant vector set to [1, 1, 1].
+         */
+        static readonly ONE: pc.Vec3;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.RIGHT
+         * @description A constant vector set to [1, 0, 0].
+         */
+        static readonly RIGHT: pc.Vec3;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.UP
+         * @description A constant vector set to [0, 1, 0].
+         */
+        static readonly UP: pc.Vec3;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec3
+         * @name pc.Vec3.ZERO
+         * @description A constant vector set to [0, 0, 0].
+         */
+        static readonly ZERO: pc.Vec3
+
+
+
+
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/math/vec4.d.ts b/types/playcanvas/engine/math/vec4.d.ts
new file mode 100644
index 0000000000..f562eeb6bc
--- /dev/null
+++ b/types/playcanvas/engine/math/vec4.d.ts
@@ -0,0 +1,378 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Vec4
+    * @class A 4-dimensional vector.
+    * @description Creates a new Vec4 object
+    * @param {Number} [x] The x value. If x is an array of length 4, the array will be used to populate all components.
+    * @param {Number} [y] The y value
+    * @param {Number} [z] The z value
+    * @param {Number} [w] The w value
+    */
+    class Vec4 {
+        constructor(x: number, y: number, z: number, w: number)
+        constructor(x: [number, number, number, number])
+        constructor();
+
+
+        /**
+             * @function
+             * @name pc.Vec4#add
+             * @description Adds a 4-dimensional vector to another in place.
+             * @param {pc.Vec4} rhs The vector to add to the specified vector.
+             * @returns {pc.Vec4} Self for chaining.
+             * @example
+             * var a = new pc.Vec4(10, 10, 10, 10);
+             * var b = new pc.Vec4(20, 20, 20, 20);
+             *
+             * a.add(b);
+             *
+             * // Should output [30, 30, 30]
+             * console.log("The result of the addition is: " + a.toString());
+             */
+        add(rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#add2
+         * @description Adds two 4-dimensional vectors together and returns the result.
+         * @param {pc.Vec4} lhs The first vector operand for the addition.
+         * @param {pc.Vec4} rhs The second vector operand for the addition.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var a = new pc.Vec4(10, 10, 10, 10);
+         * var b = new pc.Vec4(20, 20, 20, 20);
+         * var r = new pc.Vec4();
+         *
+         * r.add2(a, b);
+         * // Should output [30, 30, 30]
+         *
+         * console.log("The result of the addition is: " + r.toString());
+         */
+        add2(lhs: pc.Vec4, rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#clone
+         * @description Returns an identical copy of the specified 4-dimensional vector.
+         * @returns {pc.Vec4} A 4-dimensional vector containing the result of the cloning.
+         * @example
+         * var v = new pc.Vec4(10, 20, 30, 40);
+         * var vclone = v.clone();
+         * console.log("The result of the cloning is: " + vclone.toString());
+         */
+        clone(): pc.Vec4;
+
+        /**
+         * @function
+         * @name pc.Vec4#copy
+         * @description Copied the contents of a source 4-dimensional vector to a destination 4-dimensional vector.
+         * @param {pc.Vec4} rhs A vector to copy to the specified vector.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var src = new pc.Vec4(10, 20, 30, 40);
+         * var dst = new pc.Vec4();
+         *
+         * dst.copy(src);
+         *
+         * console.log("The two vectors are " + (dst.equals(src) ? "equal" : "different"));
+         */
+        copy(rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#dot
+         * @description Returns the result of a dot product operation performed on the two specified 4-dimensional vectors.
+         * @param {pc.Vec4} rhs The second 4-dimensional vector operand of the dot product.
+         * @returns {Number} The result of the dot product operation.
+         * @example
+         * var v1 = new pc.Vec4(5, 10, 20, 40);
+         * var v2 = new pc.Vec4(10, 20, 40, 80);
+         * var v1dotv2 = v1.dot(v2);
+         * console.log("The result of the dot product is: " + v1dotv2);
+         */
+        dot(rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#equals
+         * @description Reports whether two vectors are equal.
+         * @param {pc.Vec4} rhs The vector to compare to the specified vector.
+         * @returns {Boolean} true if the vectors are equal and false otherwise.
+         * @example
+         * var a = new pc.Vec4(1, 2, 3, 4);
+         * var b = new pc.Vec4(5, 6, 7, 8);
+         * console.log("The two vectors are " + (a.equals(b) ? "equal" : "different"));
+         */
+        equals(rhs: pc.Vec4): boolean;
+
+        /**
+         * @function
+         * @name pc.Vec4#length
+         * @description Returns the magnitude of the specified 4-dimensional vector.
+         * @returns {Number} The magnitude of the specified 4-dimensional vector.
+         * @example
+         * var vec = new pc.Vec4(3, 4, 0, 0);
+         * var len = vec.length();
+         * // Should output 5
+         * console.log("The length of the vector is: " + len);
+         */
+        length(): number;
+
+        /**
+         * @function
+         * @name pc.Vec4#lengthSq
+         * @description Returns the magnitude squared of the specified 4-dimensional vector.
+         * @returns {Number} The magnitude of the specified 4-dimensional vector.
+         * @example
+         * var vec = new pc.Vec4(3, 4, 0);
+         * var len = vec.lengthSq();
+         * // Should output 25
+         * console.log("The length squared of the vector is: " + len);
+         */
+        lengthSq(): number;
+
+        /**
+         * @function
+         * @name pc.Vec4#lerp
+         * @description Returns the result of a linear interpolation between two specified 4-dimensional vectors.
+         * @param {pc.Vec4} lhs The 4-dimensional to interpolate from.
+         * @param {pc.Vec4} rhs The 4-dimensional to interpolate to.
+         * @param {Number} alpha The value controlling the point of interpolation. Between 0 and 1, the linear interpolant
+         * will occur on a straight line between lhs and rhs. Outside of this range, the linear interpolant will occur on
+         * a ray extrapolated from this line.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var a = new pc.Vec4(0, 0, 0, 0);
+         * var b = new pc.Vec4(10, 10, 10, 10);
+         * var r = new pc.Vec4();
+         *
+         * r.lerp(a, b, 0);   // r is equal to a
+         * r.lerp(a, b, 0.5); // r is 5, 5, 5, 5
+         * r.lerp(a, b, 1);   // r is equal to b
+         */
+        lerp(lhs: pc.Vec4, rhs: pc.Vec4, alpha: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#mul
+         * @description Multiplies a 4-dimensional vector to another in place.
+         * @param {pc.Vec4} rhs The 4-dimensional vector used as the second multiplicand of the operation.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var a = new pc.Vec4(2, 3, 4, 5);
+         * var b = new pc.Vec4(4, 5, 6, 7);
+         *
+         * a.mul(b);
+         *
+         * // Should output 8, 15, 24, 35
+         * console.log("The result of the multiplication is: " + a.toString());
+         */
+        mul(rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#mul2
+         * @description Returns the result of multiplying the specified 4-dimensional vectors together.
+         * @param {pc.Vec4} lhs The 4-dimensional vector used as the first multiplicand of the operation.
+         * @param {pc.Vec4} rhs The 4-dimensional vector used as the second multiplicand of the operation.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var a = new pc.Vec4(2, 3, 4, 5);
+         * var b = new pc.Vec4(4, 5, 6, 7);
+         * var r = new pc.Vec4();
+         *
+         * r.mul2(a, b);
+         *
+         * // Should output 8, 15, 24, 35
+         * console.log("The result of the multiplication is: " + r.toString());
+         */
+        mul2(lhs: pc.Vec4, rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#normalize
+         * @description Returns the specified 4-dimensional vector copied and converted to a unit vector.
+         * If the vector has a length of zero, the vector's elements will be set to zero.
+         * @returns {pc.Vec4} The result of the normalization.
+         * @example
+         * var v = new pc.Vec4(25, 0, 0, 0);
+         *
+         * v.normalize();
+         *
+         * // Should output 1, 0, 0, 0
+         * console.log("The result of the vector normalization is: " + v.toString());
+         */
+        normalize(): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#scale
+         * @description Scales each dimension of the specified 4-dimensional vector by the supplied
+         * scalar value.
+         * @param {Number} scalar The value by which each vector component is multiplied.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var v = new pc.Vec4(2, 4, 8, 16);
+         *
+         * // Multiply by 2
+         * v.scale(2);
+         *
+         * // Negate
+         * v.scale(-1);
+         *
+         * // Divide by 2
+         * v.scale(0.5);
+         */
+        scale(scalar: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#set
+         * @description Sets the specified 4-dimensional vector to the supplied numerical values.
+         * @param {Number} x The value to set on the first component of the vector.
+         * @param {Number} y The value to set on the second component of the vector.
+         * @param {Number} z The value to set on the third component of the vector.
+         * @param {Number} w The value to set on the fourth component of the vector.
+         * @example
+         * var v = new pc.Vec4();
+         * v.set(5, 10, 20, 40);
+         *
+         * // Should output 5, 10, 20, 40
+         * console.log("The result of the vector set is: " + v.toString());
+         */
+        set(x: number, y: number, z: number, w: number): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#sub
+         * @description Subtracts a 4-dimensional vector from another in place.
+         * @param {pc.Vec4} rhs The vector to add to the specified vector.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var a = new pc.Vec4(10, 10, 10, 10);
+         * var b = new pc.Vec4(20, 20, 20, 20);
+         *
+         * a.sub(b);
+         *
+         * // Should output [-10, -10, -10, -10]
+         * console.log("The result of the subtraction is: " + a.toString());
+         */
+        sub(rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#sub2
+         * @description Subtracts two 4-dimensional vectors from one another and returns the result.
+         * @param {pc.Vec4} lhs The first vector operand for the subtraction.
+         * @param {pc.Vec4} rhs The second vector operand for the subtraction.
+         * @returns {pc.Vec4} Self for chaining.
+         * @example
+         * var a = new pc.Vec4(10, 10, 10, 10);
+         * var b = new pc.Vec4(20, 20, 20, 20);
+         * var r = new pc.Vec4();
+         *
+         * r.sub2(a, b);
+         *
+         * // Should output [-10, -10, -10, -10]
+         * console.log("The result of the subtraction is: " + r.toString());
+         */
+        sub2(lhs: pc.Vec4, rhs: pc.Vec4): this;
+
+        /**
+         * @function
+         * @name pc.Vec4#toString
+         * @description Converts the vector to string form.
+         * @returns {String} The vector in string form.
+         * @example
+         * var v = new pc.Vec4(20, 10, 5, 0);
+         * // Should output '[20, 10, 5, 0]'
+         * console.log(v.toString());
+         */
+        toString(): string;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Vec4#x
+         * @description The first component of the vector.
+         * @example
+         * var vec = new pc.Vec4(10, 20, 30, 40);
+         *
+         * // Get x
+         * var x = vec.x;
+         *
+         * // Set x
+         * vec.x = 0;
+         */
+        x: number;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Vec4#y
+         * @description The second component of the vector.
+         * @example
+         * var vec = new pc.Vec4(10, 20, 30, 40);
+         *
+         * // Get y
+         * var y = vec.y;
+         *
+         * // Set y
+         * vec.y = 0;
+         */
+        y: number;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Vec4#z
+         * @description The third component of the vector.
+         * @example
+         * var vec = new pc.Vec4(10, 20, 30, 40);
+         *
+         * // Get z
+         * var z = vec.z;
+         *
+         * // Set z
+         * vec.z = 0;
+         */
+        z: number;
+
+        /**
+         * @field
+         * @type Number
+         * @name pc.Vec4#w
+         * @description The fourth component of the vector.
+         * @example
+         * var vec = new pc.Vec4(10, 20, 30, 40);
+         *
+         * // Get w
+         * var w = vec.w;
+         *
+         * // Set w
+         * vec.w = 0;
+         */
+        w: number;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec4
+         * @name pc.Vec4.ONE
+         * @description A constant vector set to [1, 1, 1, 1].
+         */
+        static readonly ONE: pc.Vec4
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.Vec4
+         * @name pc.Vec4.ZERO
+         * @description A constant vector set to [0, 0, 0, 0].
+         */
+        static readonly ZERO: pc.Vec4
+    }
+}
diff --git a/types/playcanvas/engine/net/http.d.ts b/types/playcanvas/engine/net/http.d.ts
new file mode 100644
index 0000000000..d836174c43
--- /dev/null
+++ b/types/playcanvas/engine/net/http.d.ts
@@ -0,0 +1,140 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Http
+    * @class Used to send and receive HTTP requests.
+    * @description Create a new Http instance. Note: By default a PlayCanvas application creates an instance of this object at `pc.http`.
+    */
+    class Http {
+
+        /**
+         * @function
+         * @name pc.Http#get
+         * @description Perform an HTTP GET request to the given url.
+         * @param {String} url
+         * @param {Object} [options] Additional options
+         * @param {Object} [options.headers] HTTP headers to add to the request
+         * @param {Boolean} [options.async] Make the request asynchronously (default: true)
+         * @param {Object} [options.cache] If false, then add a timestamp to the request to prevent caching
+         * @param {Boolean} [options.withCredentials] Send cookies with this request (default: true)
+         * @param {String} [options.responseType] Override the response type
+         * @param {Document | Object} [options.postdata] Data to send in the body of the request.
+         * Some content types are handled automatically, If postdata is an XML Document it is handled, if the Content-Type header is set to 'application/json' then
+         * the postdata is JSON stringified, otherwise by default the data is sent as form-urlencoded
+         * @param {Object} [options.cache] If false, then add a timestamp to the request to prevent caching
+         * @param {Function} callback The callback used when the response has returned. Passed (err, data) where data is the response (format depends on response type, text, Object, ArrayBuffer, XML) and err is the error code.
+         * @example
+         * pc.http.get("http://example.com/", function (err, response) {
+         *     console.log(response);
+         * });
+         */
+        get(url: string, options: {
+            headers: {},
+            async: boolean,
+            cache: {},
+            withCredentials: boolean,
+            responseType: string,
+            postData: Document | {}
+        } | Function, callback?: Function): void;
+
+        /**
+         * @function
+         * @name pc.Http#post
+         * @description Perform an HTTP POST request to the given url
+         * @param {String} url The URL to make the request to
+         * @param {Object} [options] Additional options
+         * @param {Object} [options.headers] HTTP headers to add to the request
+         * @param {Boolean} [options.async] Make the request asynchronously (default: true)
+         * @param {Object} [options.cache] If false, then add a timestamp to the request to prevent caching
+         * @param {Boolean} [options.withCredentials] Send cookies with this request (default: true)
+         * @param {String} [options.responseType] Override the response type
+         * @param {Object} data Data to send in the body of the request.
+         * Some content types are handled automatically, If postdata is an XML Document it is handled, if the Content-Type header is set to 'application/json' then
+         * the postdata is JSON stringified, otherwise by default the data is sent as form-urlencoded
+         * @param {Function} callback The callback used when the response has returned. Passed (err, data) where data is the response (format depends on response type, text, Object, ArrayBuffer, XML) and err is the error code.
+         */
+        post(url: string, data: Document | {}, options: {
+            headers: {},
+            async: boolean,
+            cache: {},
+            withCredentials: boolean,
+            responseType: string,
+        } | Function, callback?: Function): void;
+
+        /**
+         * @function
+         * @name pc.Http#put
+         * @description Perform an HTTP PUT request to the given url
+         * @param {String} url The URL to make the request to
+         * @param {Object} [options] Additional options
+         * @param {Object} [options.headers] HTTP headers to add to the request
+         * @param {Boolean} [options.async] Make the request asynchronously (default: true)
+         * @param {Object} [options.cache] If false, then add a timestamp to the request to prevent caching
+         * @param {Boolean} [options.withCredentials] Send cookies with this request (default: true)
+         * @param {String} [options.responseType] Override the response type
+         * @param {Object} [options.cache] If false, then add a timestamp to the request to prevent caching
+         * @param {Document | Object} data Data to send in the body of the request.
+         * Some content types are handled automatically, If postdata is an XML Document it is handled, if the Content-Type header is set to 'application/json' then
+         * the postdata is JSON stringified, otherwise by default the data is sent as form-urlencoded
+         * @param {Function} callback The callback used when the response has returned. Passed (err, data) where data is the response (format depends on response type, text, Object, ArrayBuffer, XML) and err is the error code.
+         */
+        put(url: string, data: Document | {}, options: {
+            headers: {},
+            async: boolean,
+            cache: {},
+            withCredentials: boolean,
+            responseType: string,
+        } | Function, callback?: Function): void;
+
+        /**
+         * @function
+         * @name pc.Http#del
+         * @description Perform an HTTP DELETE request to the given url
+         * @param {Object} url The URL to make the request to
+         * @param {Object} [options] Additional options
+         * @param {Object} [options.headers] HTTP headers to add to the request
+         * @param {Boolean} [options.async] Make the request asynchronously (default: true)
+         * @param {Object} [options.cache] If false, then add a timestamp to the request to prevent caching
+         * @param {Boolean} [options.withCredentials] Send cookies with this request (default: true)
+         * @param {String} [options.responseType] Override the response type
+         * @param {Document | Object} [options.postdata] Data to send in the body of the request.
+         * Some content types are handled automatically, If postdata is an XML Document it is handled, if the Content-Type header is set to 'application/json' then
+         * the postdata is JSON stringified, otherwise by default the data is sent as form-urlencoded
+         * @param {Function} callback The callback used when the response has returned. Passed (err, data) where data is the response (format depends on response type, text, Object, ArrayBuffer, XML) and err is the error code.
+         */
+        del(url: string, options: {
+            headers: {},
+            async: boolean,
+            cache: {},
+            withCredentials: boolean,
+            responseType: string,
+            postData: Document | {}
+        } | Function, callback?: Function): void;
+
+        /**
+         * @function
+         * @name pc.Http#request
+         * @description Make a general purpose HTTP request.
+         * @param {String} method The HTTP method "GET", "POST", "PUT", "DELETE"
+         * @param {String} url The url to make the request to
+         * @param {Object} [options] Additional options
+         * @param {Object} [options.headers] HTTP headers to add to the request
+         * @param {Boolean} [options.async] Make the request asynchronously (default: true)
+         * @param {Object} [options.cache] If false, then add a timestamp to the request to prevent caching
+         * @param {Boolean} [options.withCredentials] Send cookies with this request (default: true)
+         * @param {String} [options.responseType] Override the response type
+         * @param {Document|Object} [options.postdata] Data to send in the body of the request.
+         * Some content types are handled automatically, If postdata is an XML Document it is handled, if the Content-Type header is set to 'application/json' then
+         * the postdata is JSON stringified, otherwise by default the data is sent as form-urlencoded
+         * @param {Function} callback The callback used when the response has retured. Passed (err, data) where data is the response (format depends on response type, text, Object, ArrayBuffer, XML) and err is the error code.
+         */
+        request(method: string, url: string, options: {
+            headers: {},
+            async: boolean,
+            cache: {},
+            withCredentials: boolean,
+            responseType: string,
+            postData: Document | {}
+        } | Function, callback?: Function): void;
+    }
+}
diff --git a/types/playcanvas/engine/resources/css.d.ts b/types/playcanvas/engine/resources/css.d.ts
new file mode 100644
index 0000000000..1a011f4af5
--- /dev/null
+++ b/types/playcanvas/engine/resources/css.d.ts
@@ -0,0 +1,15 @@
+declare namespace pc {
+
+    /**
+     * @function
+     * @name pc.createStyle
+     * @description Creates a &lt;style&gt; DOM element from a string that contains CSS
+     * @param {String} cssString A string that contains valid CSS
+     * @example
+     * var css = 'body {height: 100;}';
+     * var style = pc.createStyle(css);
+     * document.head.appendChild(style);
+     * @return {Element} The style DOM element
+     */
+    function createStyle(cssString: string): Element;
+}
diff --git a/types/playcanvas/engine/resources/loader.d.ts b/types/playcanvas/engine/resources/loader.d.ts
new file mode 100644
index 0000000000..61e99b179a
--- /dev/null
+++ b/types/playcanvas/engine/resources/loader.d.ts
@@ -0,0 +1,71 @@
+declare namespace pc {
+
+    interface ResourceHandler {
+        load: (url: 'string', callback: (...args: any[]) => {}) => {};
+        open: (url: 'string', date: any) => {};
+    }
+
+    /**
+    * @name pc.ResourceLoader
+    * @class Load resource data, potentially from remote sources. Caches resource on load to prevent multiple requests
+    * Add ResourceHandlers to handle different types of resources
+    */
+    class ResourceLoader {
+
+        /**
+        * @function
+        * @name pc.ResourceLoader#addHandler
+        * @description Add a handler for a resource type. Handler should support: load(url, callback) and open(url, data).
+        * Handlers can optionally support patch(asset, assets) to handle dependencies on other assets
+        * @param {String} type The name of the type that the handler will load
+        * @param {pc.ResourceHandler} handler An instance of a resource handler supporting load() and open().
+        * @example
+        * var loader = new ResourceLoader();
+        * loader.addHandler("json", new pc.JsonHandler());
+        */
+        addHandler(type: string, handler: pc.ResourceHandler): void;
+
+        /**
+        * @function
+        * @name pc.ResourceLoader#load
+        * @description Make a request for a resource from a remote URL. Parse the returned data using the handler for the specified type
+        * When loaded and parsed use the callback to return an instance of the resource. Handles multiple requests for
+        * @param {String} url The URL of the resource to load
+        * @param {String} type The type of resource expected
+        * @param {Function} callback The callback used when the resource is loaded or an error occurs. Passed (err, resource) where err is null if there are no errors
+        * @example
+        * app.loader.load("../path/to/texture.png", "texture", function (err, texture) {
+        *     // use texture here
+        * });
+        */
+        load(url: string, type: string, callback: (...args: any[]) => {}, asset?: any): void;
+
+        /**
+        * @function
+        * @name pc.ResourceLoader#open
+        * @description Convert raw resource data into a resource instance. e.g. take 3D model format JSON and return a pc.Model.
+        */
+        open(type: string, data: any): any;
+
+        /**
+        * @function
+        * @name pc.ResourceLoader#patch
+        * @description Perform any operations on a resource, that requires a dependency on it's asset data or any other asset data
+        */
+        patch(asset: any, assets: any): void;
+
+        /**
+        * @function
+        * @name pc.ResourceLoader#getFromCache
+        * @description Check cache for resource from a URL. If present return the cached value
+        */
+        getFromCache(url: string, type: string): any;
+
+        /**
+        * @function
+        * @name  pc.ResourceLoader#destroy
+        * @description Destroys resource loader
+        */
+        destroy(): void;
+    }
+}
diff --git a/types/playcanvas/engine/resources/model.d.ts b/types/playcanvas/engine/resources/model.d.ts
new file mode 100644
index 0000000000..a5d7dbd8e7
--- /dev/null
+++ b/types/playcanvas/engine/resources/model.d.ts
@@ -0,0 +1,39 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ModelHandler
+     * @class Resource Handler for creating pc.Model resources
+     * @description {@link pc.ResourceHandler} use to load 3D model resources
+     * @param {pc.GraphicsDevice} device The graphics device that will be rendering
+     */
+    class ModelHandler {
+        constructor(device: pc.GraphicsDevice)
+
+        /**
+         * @function
+         * @name pc.ModelHandler#load
+         * @description Fetch model data from a remote url
+         */
+        load(url: string, callback: Function): void;
+
+        /**
+         * @function
+         * @name pc.ModelHandler#open
+         * @description Process data in deserialized format into a pc.Model object
+         * @param {Object} data The data from model file deserialized into a JavaScript Object
+         */
+        open(url: string, data: any): any;
+
+        /**
+         * @function
+         * @name pc.ModelHandler#addParser
+         * @description Add a parser that converts raw data into a {@link pc.Model}
+         * Default parser is for JSON models
+         * @param {Object} parser See JsonModelParser for example
+         * @param {Function} decider Function that decides on which parser to use. 
+         * Function should take (url, data) arguments and return true if this parser should be used to parse the data into a {@link pc.Model}.
+         * The first parser to return true is used.
+         */
+        addParser(parser: {}, decider: Function): void;
+    }
+}
diff --git a/types/playcanvas/engine/resources/script.d.ts b/types/playcanvas/engine/resources/script.d.ts
new file mode 100644
index 0000000000..3f7fd26292
--- /dev/null
+++ b/types/playcanvas/engine/resources/script.d.ts
@@ -0,0 +1,14 @@
+declare namespace pc {
+
+    /**
+     * @name pc.ScriptHandler
+     * @class ResourceHandler for loading JavaScript files dynamically
+     * Two types of JavaScript files can be loaded, PlayCanvas scripts which contain calls to {@link pc.createScript},
+     * or regular JavaScript files, such as third-party libraries.
+     * @param {pc.Application} app The running {pc.Application}
+     */
+    class ScriptHandler {
+        constructor(app: pc.Application)
+
+    }
+}
diff --git a/types/playcanvas/engine/scene/basic-material.d.ts b/types/playcanvas/engine/scene/basic-material.d.ts
new file mode 100644
index 0000000000..6bca34dfd5
--- /dev/null
+++ b/types/playcanvas/engine/scene/basic-material.d.ts
@@ -0,0 +1,35 @@
+declare namespace pc {
+
+    /**
+     * @name pc.BasicMaterial
+     * @class A Basic material is for rendering unlit geometry, either using a constant color or a
+     * color map modulated with a color.
+     * @property {pc.Color} color The flat color of the material (RGBA, where each component is 0 to 1).
+     * @property {pc.Texture} colorMap The color map of the material. If specified, the color map is
+     * modulated by the color property.
+     * @example
+     * // Create a new Basic material
+     * var material = new pc.BasicMaterial();
+     *
+     * // Set the material to have a texture map that is multiplied by a red color
+     * material.color.set(1, 0, 0);
+     * material.colorMap = diffuseMap;
+     *
+     * // Notify the material that it has been modified
+     * material.update();
+     *
+     * @extends pc.Material
+     * @author Will Eastcott
+     */
+    class BasicMaterial extends pc.Material {
+
+        /**
+         * @function
+         * @name pc.BasicMaterial#clone
+         * @description Duplicates a Basic material. All properties are duplicated except textures
+         * where only the references are copied.
+         * @returns {pc.BasicMaterial} A cloned Basic material.
+         */
+        clone(): pc.BasicMaterial;
+    }
+}
diff --git a/types/playcanvas/engine/scene/batching.d.ts b/types/playcanvas/engine/scene/batching.d.ts
new file mode 100644
index 0000000000..89002d026c
--- /dev/null
+++ b/types/playcanvas/engine/scene/batching.d.ts
@@ -0,0 +1,167 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Batch
+     * @class Holds information about batched mesh instances. Created in {@link pc.BatchManager#create}.
+     * @property {Array} origMeshInstances An array of original mesh instances, from which this batch was generated.
+     * @property {pc.MeshInstance} meshInstance A single combined mesh instance, the result of batching.
+     * @property {pc.Model} model A handy model object, ready to use in {@link pc.Scene#addModel} and {@link pc.Scene#removeModel}.
+     * @property {Boolean} dynamic Whether this batch is dynamic (supports transforming mesh instances at runtime).
+     * @property {Number} [batchGroupId] Link this batch to a specific batch group. This is done automatically with default batches.
+     */
+    class Batch {
+        constructor(meshInstances: pc.MeshInstance[], dynamic: boolean, batchGroupId: number)
+
+        origMeshIntances: pc.MeshInstance[];
+        meshInstance: pc.MeshInstance;
+        model: pc.Model;
+        dynamic: boolean;
+        batchGroupId: number;
+    }
+
+    /**
+     * @name pc.BatchGroup
+     * @class Holds mesh batching settings and a unique id. Created via {@link pc.BatchManager#addGroup}.
+     * @property {Boolean} dynamic Whether objects within this batch group should support transforming at runtime.
+     * @property {Number} maxAabbSize Maximum size of any dimension of a bounding box around batched objects.
+     * {@link pc.BatchManager#prepare} will split objects into local groups based on this size.
+     * @property {Number} id Unique id. Can be assigned to model and element components.
+     * @property {String} name Name of the group.
+     */
+    class BatchGroup {
+        constructor(id: number, name: string, dynamic: boolean, maxAabbSize: number)
+
+        dynamic: boolean;
+        maxAabbSize: number;
+        id: number;
+        name: string;
+    }
+
+    /**
+     * @name pc.BatchManager
+     * @class Glues many mesh instances into a single one for better performance.
+     */
+    class BatchManager {
+        constructor(device: any, root: pc.Entity, scene: pc.Scene)
+
+        device: any;
+        root: pc.Entity;
+        scene: pc.Scene;
+
+        /**
+         * @function
+         * @name pc.BatchManager#addGroup
+         * @description Adds new global batch group.
+         * @param {String} name Custom name
+         * @param {Boolean} dynamic Is this batch group dynamic? Will these objects move/rotate/scale after being batched?
+         * @param {Number} maxAabbSize Maximum size of any dimension of a bounding box around batched objects.
+         * {@link pc.BatchManager#prepare} will split objects into local groups based on this size.
+         * @param {Number} [id] Optional custom unique id for the group (will be generated automatically otherwise).
+         * @returns {pc.BatchGroup} Group object.
+         */
+        addGroup(name: string, dynamic: boolean, maxAabbSize: number, id?: number): pc.BatchGroup;
+
+        /**
+         * @function
+         * @name pc.BatchManager#removeGroup
+         * @description Remove global batch group by id.
+         * @param {String} id Group id
+         */
+        removeGroup(id: string): void;
+
+        /**
+         * @function
+         * @name pc.BatchManager#generate
+         * @description Destroys all batches and creates new based on scene models. Hides original models. Called by engine automatically on app start, and if batchGroupIds on models are changed.
+         * @param {Array} [groupIds] Optional array of batch group IDs to update. Otherwise all groups are updated.
+         */
+        generate(groupIds?: number[]): void;
+
+        /**
+         * @function
+         * @name pc.BatchManager#getGroupByName
+         * @description Retrieves a {@link pc.BatchGroup} object with a corresponding name, if it exists, or null otherwise.
+         * @param {String} name Name
+         * @returns {pc.BatchGroup} Group object.
+         */
+        getGroupByName(name: string): pc.BatchGroup;
+
+        /**
+         * @function
+         * @name pc.BatchManager#prepare
+         * @description Takes a list of mesh instances to be batched and sorts them into lists one for each draw call.
+         * The input list will be split, if:
+         * <ul>
+         *     <li>Mesh instances use different materials</li>
+         *     <li>Mesh instances have different parameters (e.g. lightmaps or static lights)</li>
+         *     <li>Mesh instances have different layers</li>
+         *     <li>Mesh instances have different shader defines (shadow receiving, being aligned to screen space, etc)</li>
+         *     <li>Too many vertices for a single batch (65535 is maximum)</li>
+         *     <li>Too many instances for a single batch (hardware-dependent, expect 128 on low-end and 1024 on high-end)</li>
+         *     <li>Bounding box of a batch is larger than maxAabbSize in any dimension</li>
+         * </ul>
+         * @param {Array} meshInstances Input list of mesh instances
+         * @param {Boolean} dynamic Are we preparing for a dynamic batch? Instance count will matter then (otherwise not).
+         * @param {Number} maxAabbSize Maximum size of any dimension of a bounding box around batched objects.
+         * This is useful to keep a balance between the number of draw calls and the number of drawn triangles, because smaller batches can be hidden when not visible in camera.
+         * @returns {Array} An array of arrays of mesh instances, each valid to pass to {@link pc.BatchManager#create}.
+         */
+        prepare(meshInstances: pc.MeshInstance[], dynamic: boolean, maxAabbSize: number): pc.MeshInstance[][]
+
+        /**
+         * @function
+         * @name pc.BatchManager#create
+         * @description Takes a mesh instance list that has been prepared by {@link pc.BatchManager#prepare}, and returns a {@link pc.Batch} object. This method assumes that all mesh instances provided can be rendered in a single draw call.
+         * @param {Array} meshInstances Input list of mesh instances
+         * @param {Boolean} dynamic Is it a static or dynamic batch? Will objects be transformed after batching?
+         * @param {Number} [batchGroupId] Link this batch to a specific batch group. This is done automatically with default batches.
+         * @returns {pc.Batch} The resulting batch object.
+         */
+        create(meshInstances: pc.MeshInstance[], dynamic: boolean, batchGroupId?: number): pc.Batch;
+
+        /**
+         * @private
+         * @function
+         * @name pc.BatchManager#update
+         * @description Updates bounding box for a batch. Called automatically.
+         * @param {pc.Batch} batch A batch object
+         */
+        private update(batch: pc.Batch): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.BatchManager#updateAll
+         * @description Updates bounding boxes for all dynamic batches. Called automatically.
+         */
+        private updateAll(): void;
+
+        /**
+         * @function
+         * @name pc.BatchManager#clone
+         * @description Clones a batch. This method doesn't rebuild batch geometry, but only creates a new model and batch objects, linked to different source mesh instances.
+         * @param {pc.Batch} batch A batch object
+         * @param {Array} clonedMeshInstances New mesh instances
+         * @returns {pc.Batch} New batch object
+         */
+        clone(batch: pc.Batch, clonedMeshInstances: pc.MeshInstance[]): pc.Batch;
+
+        /**
+         * @function
+         * @name pc.BatchManager#destroy
+         * @description Decrements reference counter on a batch. If it's zero, the batch is removed from scene, and its geometry is deleted from memory.
+         * @param {pc.Batch} batch A batch object
+         */
+        destroy(batch: pc.Batch): void;
+
+        /**
+         * @function
+         * @name pc.BatchManager#register
+         * @description Registers entities as used inside the batch, and sets batch's reference counter to entity count.
+         * If these entities are destroyed, {@link pc.BatchManager#destroy} will be called on the batch.
+         * @param {pc.Batch} batch A batch object
+         * @param {Array} entities An array of pc.Entity
+         */
+        register(batch: pc.BatchGroup, entities: pc.Entity[]): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/scene/camera.d.ts b/types/playcanvas/engine/scene/camera.d.ts
new file mode 100644
index 0000000000..e3b8e3d668
--- /dev/null
+++ b/types/playcanvas/engine/scene/camera.d.ts
@@ -0,0 +1,171 @@
+declare namespace pc {
+
+    /**
+     * @private
+     * @name pc.Camera
+     * @class A camera.
+     */
+    class Camera {
+
+        /**
+         * @private
+         * @function
+         * @name pc.Camera#clone
+         * @description Duplicates a camera node but does not 'deep copy' the hierarchy.
+         * @returns {pc.Camera} A cloned Camera.
+         */
+        private clone(): pc.Camera;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Camera#worldToScreen
+         * @description Convert a point from 3D world space to 2D canvas pixel space.
+         * @param {pc.Vec3} worldCoord The world space coordinate to transform.
+         * @param {Number} cw The width of PlayCanvas' canvas element.
+         * @param {Number} ch The height of PlayCanvas' canvas element.
+         * @param {pc.Vec3} [screenCoord] 3D vector to receive screen coordinate result.
+         * @returns {pc.Vec3} The screen space coordinate.
+         */
+        private worldToScreen(worldCoord: pc.Vec3, cw: number, ch: number, screenCoord?: pc.Vec3): pc.Vec3
+
+        /**
+         * @private
+         * @function
+         * @name pc.Camera#screenToWorld
+         * @description Convert a point from 2D canvas pixel space to 3D world space.
+         * @param {Number} x x coordinate on PlayCanvas' canvas element.
+         * @param {Number} y y coordinate on PlayCanvas' canvas element.
+         * @param {Number} z The distance from the camera in world space to create the new point.
+         * @param {Number} cw The width of PlayCanvas' canvas element.
+         * @param {Number} ch The height of PlayCanvas' canvas element.
+         * @param {pc.Vec3} [worldCoord] 3D vector to receive world coordinate result.
+         * @returns {pc.Vec3} The world space coordinate.
+         */
+        private screenToWorld(x: number, y: number, z: number, cw: number, ch: number, worldCoord?: pc.Vec3): pc.Vec3
+
+        /**
+         * @private
+         * @function
+         * @name pc.Camera#getClearOptions
+         * @description Retrieves the options used to determine how the camera's render target will be cleared.
+         * @return {Object} The options determining the behaviour of render target clears.
+         */
+        private getClearOptions(): {};
+
+        /**
+         * @private
+         * @function
+         * @name pc.Camera#getProjectionMatrix
+         * @description Retrieves the projection matrix for the specified camera.
+         * @returns {pc.Mat4} The camera's projection matrix.
+         */
+        private getProjectionMatrix(): pc.Mat4
+
+        /**
+         * @private
+         * @function
+         * @name pc.Camera#setClearOptions
+         * @description Sets the options used to determine how the camera's render target will be cleared.
+         * @param {Object} clearOptions The options determining the behaviour of subsequent render target clears.
+         * @param {Number[]} clearOptions.color The options determining the behaviour of subsequent render target clears.
+         * @param {Number} clearOptions.depth The options determining the behaviour of subsequent render target clears.
+         * @param {pc.CLEARFLAG} clearOptions.flags The options determining the behaviour of subsequent render target clears.
+         */
+        setClearOptions(options: { color: number[], depth: number, flags: any }): void;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#aspectRatio
+         * @description Camera's aspect ratio.
+         */
+        private aspectRatio: number;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#projection
+         * @description Camera's projection type, to specify whether projection is orthographic (parallel projection) or perspective. Can be:
+         * <ul>
+         *     <li>{@link pc.PROJECTION_PERSPECTIVE}</li>
+         *     <li>{@link pc.PROJECTION_ORTHOGRAPHIC}</li>
+         * </ul>
+         */
+        private projection: number;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#nearClip
+         * @description Camera's distance to near clipping plane
+         */
+        private nearClip: number;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#farClip
+         * @description Camera's distance to far clipping plane
+         */
+        private farClip: number;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#fov
+         * @description Camera's field of view in degrees. This angle is in degrees
+         * and is measured vertically or horizontally between the sides of camera planes.
+         * hirozontalFov property defines the fov axis - vertical or horizontal.
+         */
+        private fov: number;
+
+        /**
+         * @private
+         * @type Boolean
+         * @name pc.Camera#horizontalFov
+         * @description Camera's horizontal or vertical field of view.
+         */
+        private horizontalFov: boolean;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#orthoHeight
+         * @description Camera's half height of the orthographics view.
+         */
+        private orthoHeight: number;
+
+        /**
+         * @private
+         * @type Array
+         * @name pc.Camera#clearColor
+         * @description Camera's clear color.
+         */
+        private clearColor: any[];
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#clearDepth
+         * @description Camera's clear depth value.
+         */
+        private clearDepth: number;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#clearStencil
+         * @description Camera's clear stencil value.
+         */
+        private clearStencil: number;
+
+        /**
+         * @private
+         * @type Number
+         * @name pc.Camera#clearFlags
+         * @description Camera's clear flags bits value.
+         */
+        private clearFlags: number;
+    }
+}
diff --git a/types/playcanvas/engine/scene/graph-node.d.ts b/types/playcanvas/engine/scene/graph-node.d.ts
new file mode 100644
index 0000000000..f9d587f8af
--- /dev/null
+++ b/types/playcanvas/engine/scene/graph-node.d.ts
@@ -0,0 +1,784 @@
+declare namespace pc {
+    /**
+     * @name pc.GraphNode
+     * @class A hierarchical scene node.
+     * @param {String} [name] The non-unique name of the graph node, default is "Untitled".
+     * @property {String} name The non-unique name of a graph node.
+     * @property {pc.Tags} tags Interface for tagging graph nodes. Tag based searches can be performed using the {@link pc.GraphNode#findByTag} function.
+     */
+    class GraphNode {
+        constructor(name?: string)
+
+        /**
+         * @readonly
+         * @name pc.GraphNode#right
+         * @description The normalized local space X-axis vector of the graph node in world space.
+         * @type pc.Vec3
+         */
+        readonly right: pc.Vec3;
+
+        /**
+         * @readonly
+         * @name pc.GraphNode#up
+         * @description The normalized local space Y-axis vector of the graph node in world space.
+         * @type pc.Vec3
+         */
+        readonly up: pc.Vec3;
+
+        /**
+         * @readonly
+         * @name pc.GraphNode#forward
+         * @description The normalized local space negative Z-axis vector of the graph node in world space.
+         * @type pc.Vec3
+         */
+        readonly forward: pc.Vec3;
+
+        /**
+         * @name pc.GraphNode#enabled
+         * @type Boolean
+         * @description Enable or disable a GraphNode. If one of the GraphNode's parents is disabled
+         * there will be no other side effects. If all the parents are enabled then
+         * the new value will activate / deactivate all the enabled children of the GraphNode.
+         */
+        enabled: boolean;
+
+        /**
+         * @readonly
+         * @name pc.GraphNode#parent
+         * @type pc.GraphNode
+         * @description A read-only property to get a parent graph node
+         */
+        readonly parent: pc.GraphNode;
+
+        /**
+         * @readonly
+         * @name pc.GraphNode#root
+         * @type pc.GraphNode
+         * @description A read-only property to get highest graph node from current node
+         */
+        readonly root: pc.GraphNode;
+
+        /**
+         * @readonly
+         * @name pc.GraphNode#children
+         * @type pc.GraphNode[]
+         * @description A read-only property to get the children of this graph node.
+         */
+        readonly children: pc.GraphNode;
+
+        /**
+         * @function
+         * @name pc.GraphNode#find
+         * @description Search the graph for nodes that satisfy conditions.
+         * @param {Function|String} attr This can either be a method or a string.
+         * If it's a method it is executed for each descendant node, to test if node satisfies search logic.
+         * Returning true from that method will include node into results.
+         * If it's a string then it represents the name of a field or a method of the node.
+         * If this is the name of a field then the value passed as the second argument will be checked for equality.
+         * If this is the name of a function then the return value of the function will be checked for equality against the valued passed as the second argument to this function.
+         * @param {Object} value If the first argument (attr) is a property name then this value will be checked against the value of the property.
+         * @returns {pc.GraphNode[]} An array of GraphNodes
+         * @example
+         * // finds all nodes that have model component and have `door` in their lower cased name
+         * var doors = house.find(function(node) {
+         *     return node.model && node.name.toLowerCase().indexOf('door') !== -1;
+         * });
+         *
+         * @example
+         * // finds all nodes that have name equal to 'Test'
+         * var entities = parent.find('name', 'Test');
+         *
+         */
+        find(attr: String, value: any): pc.GraphNode[];
+        find(attr: (node: pc.GraphNode) => boolean): pc.GraphNode[];
+
+        /**
+         * @function
+         * @name pc.GraphNode#findOne
+         * @description Depth first search the graph for nodes using supplied method to find first matching node.
+         * @param {Function} fn Method which is executed for each descendant node, to test if node satisfies search logic. Returning true from that method will stop search and return that node.
+         * @returns {pc.GraphNode} A single graph node.
+         * @example
+         * // find node that is called `head` and have model component
+         * var head = player.find(function(node) {
+         *     return node.model && node.name === 'head';
+         * });
+         */
+        findOne(attr: (node: pc.GraphNode) => boolean): pc.GraphNode
+
+        /**
+         * @function
+         * @name pc.GraphNode#findByTag
+         * @description Return all graph nodes that satisfy the search query.
+         * Query can be simply a string, or comma separated strings,
+         * to have inclusive results of assets that match at least one query.
+         * A query that consists of an array of tags can be used to match graph nodes that have each tag of array
+         * @param {String} query Name of a tag or array of tags
+         * @returns {pc.GraphNode[]} A list of all graph nodes that match the query
+         * @example
+         * var animals = node.findByTag("animal");
+         * // returns all graph nodes that tagged by `animal`
+         * @example
+         * var birdsAndMammals = node.findByTag("bird", "mammal");
+         * // returns all graph nodes that tagged by `bird` OR `mammal`
+         * @example
+         * var meatEatingMammals = node.findByTag([ "carnivore", "mammal" ]);
+         * // returns all assets that tagged by `carnivore` AND `mammal`
+         * @example
+         * var meatEatingMammalsAndReptiles = node.findByTag([ "carnivore", "mammal" ], [ "carnivore", "reptile" ]);
+         * // returns all assets that tagged by (`carnivore` AND `mammal`) OR (`carnivore` AND `reptile`)
+         */
+        findByTag(...args: Array<string | string[]>): pc.GraphNode[]
+
+        /**
+         * @function
+         * @name pc.GraphNode#findByName
+         * @description Get the first node found in the graph with the name. The search
+         * is depth first.
+         * @param {String} name The name of the graph.
+         * @returns {pc.GraphNode} The first node to be found matching the supplied name.
+         */
+        findByName(name: string): pc.GraphNode;
+
+        /**
+         * @function
+         * @name pc.GraphNode#findByPath
+         * @description Get the first node found in the graph by its full path in the graph.
+         * The full path has this form 'parent/child/sub-child'. The search is depth first.
+         * @param {String} path The full path of the pc.GraphNode.
+         * @returns {pc.GraphNode} The first node to be found matching the supplied path.
+         * @example
+         * var path = this.entity.findByPath('child/another_child');
+         */
+        findByPath(path: string): pc.GraphNode;
+
+        /**
+         * @function
+         * @name  pc.GraphNode#getPath
+         * @description Gets the path of the entity relative to the root of the hierarchy
+         * @return {String} The path
+         * @example
+         * var path = this.entity.getPath();
+         */
+        getPath(): string;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#getRoot
+         * @description Get the highest ancestor node from this graph node.
+         * @return {pc.GraphNode} The root node of the hierarchy to which this node belongs.
+         * @example
+         * var root = this.entity.getRoot();
+         */
+        private getRoot(): pc.GraphNode;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#getParent
+         * @description Get the parent GraphNode
+         * @returns {pc.GraphNode} The parent node
+         * @example
+         * var parent = this.entity.getParent();
+         */
+        private getParent(): pc.GraphNode;
+
+        /**
+         * @function
+         * @name pc.GraphNode#isDescendantOf
+         * @description Check if node is descendant of another node.
+         * @returns {Boolean} if node is descendant of another node
+         * @example
+         * if (roof.isDescendantOf(house)) {
+         *     // roof is descendant of house entity
+         * }
+         */
+        isDescendantOf(node: pc.GraphNode): boolean;
+
+        /**
+         * @function
+         * @name pc.GraphNode#isAncestorOf
+         * @description Check if node is ancestor for another node.
+         * @returns {Boolean} if node is ancestor for another node
+         * @example
+         * if (body.isAncestorOf(foot)) {
+         *     // foot is within body's hierarchy
+         * }
+         */
+        isAncestorOf(node: pc.GraphNode): boolean;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#getChildren
+         * @description Get the children of this graph node.
+         * @returns {pc.GraphNode[]} The child array of this node.
+         * @example
+         * var children = this.entity.getChildren();
+         * for (i = 0; i < children.length; i++) {
+         * // children[i]
+         * }
+         */
+        private getChildren(): pc.GraphNode[];
+
+        /**
+         * @function
+         * @name pc.GraphNode#getEulerAngles
+         * @description Get the world space rotation for the specified GraphNode in Euler angle
+         * form. The order of the returned Euler angles is XYZ. The value returned by this function
+         * should be considered read-only. In order to set the world-space rotation of the graph
+         * node, use {@link pc.GraphNode#setEulerAngles}.
+         * @returns {pc.Vec3} The world space rotation of the graph node in Euler angle form.
+         * @example
+         * var angles = this.entity.getEulerAngles(); // [0,0,0]
+         * angles[1] = 180; // rotate the entity around Y by 180 degrees
+         * this.entity.setEulerAngles(angles);
+         */
+        getEulerAngles(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.GraphNode#getLocalEulerAngles
+         * @description Get the rotation in local space for the specified GraphNode. The rotation
+         * is returned as euler angles in a 3-dimensional vector where the order is XYZ. The
+         * returned vector should be considered read-only. To update the local rotation, use
+         * {@link pc.GraphNode#setLocalEulerAngles}.
+         * @returns {pc.Vec3} The local space rotation of the graph node as euler angles in XYZ order.
+         * @example
+         * var angles = this.entity.getLocalEulerAngles();
+         * angles[1] = 180;
+         * this.entity.setLocalEulerAngles(angles);
+         */
+        getLocalEulerAngles(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.GraphNode#getLocalPosition
+         * @description Get the position in local space for the specified GraphNode. The position
+         * is returned as a 3-dimensional vector. The returned vector should be considered read-only.
+         * To update the local position, use {@link pc.GraphNode#setLocalPosition}.
+         * @returns {pc.Vec3} The local space position of the graph node.
+         * @example
+         * var position = this.entity.getLocalPosition();
+         * position[0] += 1; // move the entity 1 unit along x.
+         * this.entity.setLocalPosition(position);
+         */
+        getLocalPosition(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.GraphNode#getLocalRotation
+         * @description Get the rotation in local space for the specified GraphNode. The rotation
+         * is returned as a quaternion. The returned quaternion should be considered read-only.
+         * To update the local rotation, use {@link pc.GraphNode#setLocalRotation}.
+         * @returns {pc.Quat} The local space rotation of the graph node as a quaternion.
+         * @example
+         * var rotation = this.entity.getLocalRotation();
+         */
+        getLocalRotation(): pc.Quat
+
+        /**
+         * @function
+         * @name pc.GraphNode#getLocalScale
+         * @description Get the scale in local space for the specified GraphNode. The scale
+         * is returned as a 3-dimensional vector. The returned vector should be considered read-only.
+         * To update the local scale, use {@link pc.GraphNode#setLocalScale}.
+         * @returns {pc.Vec3} The local space scale of the graph node.
+         * @example
+         * var scale = this.entity.getLocalScale();
+         * scale.x = 100;
+         * this.entity.setLocalScale(scale);
+         */
+        getLocalScale(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.GraphNode#getLocalTransform
+         * @description Get the local transform matrix for this graph node. This matrix
+         * is the transform relative to the node's parent's world transformation matrix.
+         * @returns {pc.Mat4} The node's local transformation matrix.
+         * @example
+         * var transform = this.entity.getLocalTransform();
+         */
+        getLocalTransform(): pc.Mat4;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#getName
+         * @description Get the human-readable name for this graph node. Note the name
+         * is not guaranteed to be unique. For Entities, this is the name that is set in the PlayCanvas Editor.
+         * @returns {String} The name of the node.
+         * @example
+         * if (this.entity.getName() === "My Entity") {
+         *     console.log("My Entity Found");
+         * }
+         */
+        getName(): string;
+
+        /**
+         * @function
+         * @name pc.GraphNode#getPosition
+         * @description Get the world space position for the specified GraphNode. The
+         * value returned by this function should be considered read-only. In order to set
+         * the world-space position of the graph node, use {@link pc.GraphNode#setPosition}.
+         * @returns {pc.Vec3} The world space position of the graph node.
+         * @example
+         * var position = this.entity.getPosition();
+         * position.x = 10;
+         * this.entity.setPosition(position);
+         */
+        getPosition(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.GraphNode#getRotation
+         * @description Get the world space rotation for the specified GraphNode in quaternion
+         * form. The value returned by this function should be considered read-only. In order
+         * to set the world-space rotation of the graph node, use {@link pc.GraphNode#setRotation}.
+         * @returns {pc.Quat} The world space rotation of the graph node as a quaternion.
+         * @example
+         * var rotation = this.entity.getRotation();
+         */
+        getRotation(): pc.Quat;
+
+        /**
+         * @function
+         * @name pc.GraphNode#getWorldTransform
+         * @description Get the world transformation matrix for this graph node.
+         * @returns {pc.Mat4} The node's world transformation matrix.
+         * @example
+         * var transform = this.entity.getWorldTransform();
+         */
+        getWorldTransform(): pc.Mat4;
+
+        /**
+         * @function
+         * @name pc.GraphNode#reparent
+         * @description Remove graph node from current parent and add as child to new parent
+         * @param {pc.GraphNode} parent New parent to attach graph node to
+         * @param {Number} index (optional) The child index where the child node should be placed.
+         */
+        reparent(parent: pc.GraphNode, index?: number): void
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalEulerAngles
+         * @description Sets the local space rotation of the specified graph node using euler angles.
+         * Eulers are interpreted in XYZ order. Eulers must be specified in degrees.
+         * @param {Number} x rotation around x-axis in degrees.
+         * @param {Number} y rotation around y-axis in degrees.
+         * @param {Number} z rotation around z-axis in degrees.
+         * @example
+         * this.entity.setLocalEulerAngles(0, 90, 0); // Set rotation of 90 degrees around y-axis.
+         */
+        setLocalEulerAngles(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalEulerAngles^2
+         * @description Sets the local space rotation of the specified graph node using euler angles.
+         * Eulers are interpreted in XYZ order. Eulers must be specified in degrees.
+         * @param {pc.Vec3} e vector containing euler angles in XYZ order.
+         * @example
+         * var angles = new pc.Vec3(0, 90, 0);
+         * this.entity.setLocalEulerAngles(angles); // Set rotation of 90 degrees around y-axis.
+         */
+        setLocalEulerAngles(e: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalPosition
+         * @description Sets the local space position of the specified graph node.
+         * @param {Number} x x-coordinate of local-space position.
+         * @param {Number} y y-coordinate of local-space position.
+         * @param {Number} z z-coordinate of local-space position.
+         * @example
+         * this.entity.setLocalPosition(0, 10, 0);
+         */
+        setLocalPosition(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalPosition^2
+         * @description Sets the local space position of the specified graph node.
+         * @param {pc.Vec3} pos position vector of graph node in local space.
+         * @example
+         * var pos = new pc.Vec3(0, 10, 0);
+         * this.entity.setLocalPosition(pos)
+         */
+        setLocalPosition(pos: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalRotation
+         * @description Sets the local space rotation of the specified graph node.
+         * @param {pc.Quat} q quaternion representing rotation of graph node in local space.
+         * var q = pc.Quat();
+         * this.entity.setLocalRotation(q);
+         */
+        setLocalRotation(q: pc.Quat): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalRotation^2
+         * @description Sets the local space rotation of the specified graph node.
+         * @param {Number} x X component of local space quaternion rotation.
+         * @param {Number} y Y component of local space quaternion rotation.
+         * @param {Number} z Z component of local space quaternion rotation.
+         * @param {Number} w W component of local space quaternion rotation.
+         * @example
+         * // Set to the identity quaternion
+         * this.entity.setLocalRotation(0, 0, 0, 1);
+         */
+        setLocalRotation(x: number, y: number, z: number, w: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalScale
+         * @description Sets the local space scale factor of the specified graph node.
+         * @param {Number} x x-coordinate of local-space scale.
+         * @param {Number} y y-coordinate of local-space scale.
+         * @param {Number} z z-coordinate of local-space scale.
+         * @example
+         * this.entity.setLocalScale(10, 10, 10);
+         */
+        setLocalScale(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setLocalScale^2
+         * @description Sets the local space scale factor of the specified graph node.
+         * @param {pc.Vec3} scale xyz-scale of graph node in local space.
+         * @example
+         * var scale = new pc.Vec3(10, 10, 10);
+         * this.entity.setLocalScale(scale);
+         */
+        setLocalScale(scale: pc.Vec3): void;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#setName
+         * @description Sets the non-unique name for this graph node.
+         * @param {String} name The name for the node.
+         * @example
+         * this.entity.setName("My Entity");
+         */
+        private setName(name: string): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setPosition
+         * @description Sets the world space position of the specified graph node.
+         * @param {Number} x x-coordinate of world-space position.
+         * @param {Number} y y-coordinate of world-space position.
+         * @param {Number} z z-coordinate of world-space position.
+         * @example
+         * this.entity.setPosition(0, 10, 0);
+         */
+        setPosition(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setPosition^2
+         * @description Sets the world space position of the specified graph node.
+         * @param {pc.Vec3} position world space position (xyz) of graph node.
+         * @example
+         * var position = new pc.Vec3(0, 10, 0);
+         * this.entity.setPosition(position);
+         */
+        setPosition(position: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setRotation
+         * @description Sets the world space rotation of the specified graph node using
+         * a quaternion.
+         * @param {pc.Quat} rot World space rotation (xyz) of graph node.
+         * @example
+         * var q = new pc.Quat();
+         * this.entity.setRotation(q);
+         */
+        setRotation(rot: pc.Quat): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setRotation^2
+         * @description Sets the world space rotation of the specified graph node using
+         * the 4 components of a quaternion.
+         * @param {Number} x X component of world space quaternion rotation.
+         * @param {Number} y Y component of world space quaternion rotation.
+         * @param {Number} z Z component of world space quaternion rotation.
+         * @param {Number} w W component of world space quaternion rotation.
+         * @example
+         * this.entity.setRotation(0, 0, 0, 1);
+         */
+        setRotation(x: number, y: number, z: number, w: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setEulerAngles
+         * @description Sets the world space orientation of the specified graph node
+         * using Euler angles. Angles are specified in degrees in XYZ order.
+         * @param {Number} ex Rotation around world space X axis in degrees.
+         * @param {Number} ey Rotation around world space Y axis in degrees.
+         * @param {Number} ez Rotation around world space Z axis in degrees.
+         * @example
+         * this.entity.setEulerAngles(0, 90, 0);
+         */
+        setEulerAngles(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#setEulerAngles^2
+         * @description Sets the world space orientation of the specified graph node
+         * using Euler angles. Angles are specified in degrees in XYZ order.
+         * @param {pc.Vec3} angles Euler angles in degrees (XYZ order).
+         * @example
+         * var angles = new pc.Vec3(0, 90, 0);
+         * this.entity.setEulerAngles(angles);
+         */
+        setEulerAngles(angles: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#addChild
+         * @description Add a new child to the child list and update the parent value of the child node
+         * @param {pc.GraphNode} node The new child to add
+         * @example
+         * var e = new pc.Entity(app);
+         * this.entity.addChild(e);
+         */
+        addChild(node: pc.GraphNode): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#insertChild
+         * @description Insert a new child to the child list at the specified index and update the parent value of the child node
+         * @param {pc.GraphNode} node The new child to insert
+         * @param {Number} index The index in the child list of the parent where the new node will be inserted
+         * @example
+         * var e = new pc.Entity(app);
+         * this.entity.insertChild(e, 1);
+         */
+        insertChild(node: pc.GraphNode, index: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#removeChild
+         * @description Remove the node from the child list and update the parent value of the child.
+         * @param {pc.GraphNode} node The node to remove
+         * @example
+         * var child = this.entity.children[0];
+         * this.entity.removeChild(child);
+         */
+        removeChild(child: pc.GraphNode): void;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#addLabel
+         * @description Add a string label to this graph node, labels can be used to group
+         * and filter nodes. For example, the 'enemies' label could be applied to a group of NPCs
+         * who are enemies.
+         * @param {String} label The label to apply to this graph node.
+         */
+        private addLabel(label: string): void;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#getLabels
+         * @description Get an array of all labels applied to this graph node.
+         * @returns {String[]} An array of all labels.
+         */
+        private getLabels(): string;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#hasLabel
+         * @description Test if a label has been applied to this graph node.
+         * @param {String} label The label to test for.
+         * @returns {Boolean} True if the label has been added to this GraphNode.
+         *
+         */
+        private hasLabel(label: string): boolean;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#removeLabel
+         * @description Remove label from this graph node.
+         * @param {String} label The label to remove from this node.
+         */
+        private removeLabel(label: string): void;
+
+        /**
+         * @private
+         * @deprecated
+         * @function
+         * @name pc.GraphNode#findByLabel
+         * @description Find all graph nodes from the root and all descendants with the label.
+         * @param {String} label The label to search for.
+         * @param {pc.GraphNode[]} [results] An array to store the results in.
+         * @returns {pc.GraphNode[]} The array passed in or a new array of results.
+         */
+        private findByLabel(label: string, results: pc.GraphNode[]): pc.GraphNode[];
+
+
+        /**
+         * @function
+         * @name pc.GraphNode#syncHierarchy
+         * @description Updates the world transformation matrices at this node and all of its descendants.
+         */
+        syncHierarchy(): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#lookAt
+         * @description Reorients the graph node so that the negative z axis points towards the target.
+         * @param {pc.Vec3} target The world space coordinate to 'look at'.
+         * @param {pc.Vec3} [up] The up vector for the look at transform. If left unspecified,
+         * this is set to the world space y axis.
+         * @example
+         * var position = ... // get position from somewhere
+         * // Look at a position, use default 'up' of [0,1,0]
+         * this.entity.lookAt(position);
+         * // Use a custom up value
+         * this.entity.lookAt(position, this.entity.up);
+         * // Specify position as elements
+         * this.entity.lookAt(0, 0, 0);
+         */
+        lookAt(target: pc.Vec3, up?: pc.Vec3): void
+
+        /**
+         * @function
+         * @name pc.GraphNode#lookAt^2
+         * @description Reorients the graph node so that the negative z axis points towards the target.
+         * @param {Number} tx X-component of the world space coordinate to 'look at'.
+         * @param {Number} ty Y-component of the world space coordinate to 'look at'.
+         * @param {Number} tz Z-component of the world space coordinate to 'look at'.
+         * @param {Number} [ux] X-component of the up vector for the look at transform. If left unspecified,
+         * this is set to the world space y axis.
+         * @param {Number} [uy] Y-component of the up vector for the look at transform. If left unspecified,
+         * this is set to the world space y axis.
+         * @param {Number} [uz] Z-component of the up vector for the look at transform. If left unspecified,
+         * this is set to the world space y axis.
+         * @example
+         * // Look at the world space origin, use default 'up' of [0,1,0]
+         * this.entity.lookAt(0, 0, 0);
+         * // Look at 10, 10, 10 with an inverted up value
+         * this.entity.lookAt(10, 10, 10, 0, -1, 0);
+         */
+        lookAt(tx: number, ty: number, tz: number, ux: number, uy: number, uz: number): void
+        lookAt(tx: number, ty: number, tz: number): void
+
+        /**
+         * @function
+         * @name pc.GraphNode#translate
+         * @description Translates the graph node in world space by the specified translation vector.
+         * @param {Number} x x-component of the translation vector.
+         * @param {Number} y y-component of the translation vector.
+         * @param {Number} z z-component of the translation vector.
+         * @example
+         * this.entity.translate(10, 0, 0);
+         */
+        translate(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#translate^2
+         * @description Translates the graph node in world space by the specified translation vector.
+         * @param {pc.Vec3} translation The world space translation vector to apply.
+         * @example
+         * var t = new pc.Vec3(10, 0, 0);
+         * this.entity.translate(t);
+         */
+        translate(translation: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#translateLocal
+         * @description Translates the graph node in local space by the specified translation vector.
+         * @param {Number} x x-component of the translation vector.
+         * @param {Number} y y-component of the translation vector.
+         * @param {Number} z z-component of the translation vector.
+         * @example
+         * this.entity.translateLocal(10, 0, 0);
+         */
+        translateLocal(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#translateLocal^2
+         * @description Translates the graph node in local space by the specified translation vector.
+         * @param {pc.Vec3} translation The local space translation vector to apply.
+         * @example
+         * var t = new pc.Vec3(10, 0, 0);
+         * this.entity.translateLocal(t);
+         */
+        translateLocal(translation: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#rotate
+         * @description Rotates the graph node in world space by the specified Euler angles.
+         * Eulers are specified in degrees in XYZ order.
+         * @param {Number} ex Rotation around world space X axis in degrees.
+         * @param {Number} ey Rotation around world space Y axis in degrees.
+         * @param {Number} ez Rotation around world space Z axis in degrees.
+         * @example
+         * this.entity.rotate(0, 90, 0);
+         */
+        rotate(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#rotate^2
+         * @description Rotates the graph node in world space by the specified Euler angles.
+         * Eulers are specified in degrees in XYZ order.
+         * @param {pc.Vec3} rot World space rotation (xyz) of graph node.
+         * @example
+         * var r = new pc.Vec3(0, 90, 0);
+         * this.entity.rotate(r);
+         */
+        rotate(rot: pc.Vec3): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#rotateLocal
+         * @description Rotates the graph node in local space by the specified Euler angles.
+         * Eulers are specified in degrees in XYZ order.
+         * @param {Number} ex Rotation around local space X axis in degrees.
+         * @param {Number} ey Rotation around local space Y axis in degrees.
+         * @param {Number} ez Rotation around local space Z axis in degrees.
+         * @example
+         * this.entity.rotateLocal(0, 90, 0);
+         */
+        rotateLocal(x: number, y: number, z: number): void;
+
+        /**
+         * @function
+         * @name pc.GraphNode#rotateLocal^2
+         * @description Rotates the graph node in local space by the specified Euler angles.
+         * Eulers are specified in degrees in XYZ order.
+         * @param {pc.Vec3} rot Local space rotation (xyz) of graph node.
+         * @example
+         * var r = new pc.Vec3(0, 90, 0);
+         * this.entity.rotateLocal(r);
+         */
+        rotateLocal(rot: pc.Vec3): void;
+    }
+}
diff --git a/types/playcanvas/engine/scene/lightmapper.d.ts b/types/playcanvas/engine/scene/lightmapper.d.ts
new file mode 100644
index 0000000000..6b8a9d7253
--- /dev/null
+++ b/types/playcanvas/engine/scene/lightmapper.d.ts
@@ -0,0 +1,24 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Lightmapper
+     * @class The lightmapper is used to bake scene lights into textures.
+     */
+    class Lightmapper {
+        constructor(device: pc.GraphicsDevice, root: pc.Entity, scene: pc.Scene, renderer: any, assets: pc.Asset[])
+
+        /**
+         * @function
+         * @name pc.Lightmapper#bake
+         * @description Generates and applies the lightmaps.
+         * @param {pc.Entity} nodes An array of models to render lightmaps for. If not supplied, full scene will be baked.
+         * @param {Number} mode Baking mode. Possible values:
+         * <ul>
+         *     <li>pc.BAKE_COLOR: single color lightmap
+         *     <li>pc.BAKE_COLORDIR: single color lightmap + dominant light direction (used for bump/specular)
+         * </ul>
+         * Only lights with bakeDir=true will be used for generating the dominant light direction.
+         */
+        bake(nodes: pc.Entity, mode: number): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/scene/material.d.ts b/types/playcanvas/engine/scene/material.d.ts
new file mode 100644
index 0000000000..1cb8d487f7
--- /dev/null
+++ b/types/playcanvas/engine/scene/material.d.ts
@@ -0,0 +1,158 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Material
+     * @class A material determines how a particular mesh instance is rendered. It specifies the shader and render state that is
+     * set before the mesh instance is submitted to the graphics device.
+     * @description Create a new Material instance
+     * @property {Number} alphaTest The alpha test reference value to control which fragments are written to the currently
+     * active render target based on alpha value. All fragments with an alpha value of less than the alphaTest reference value
+     * will be discarded. alphaTest defaults to 0 (all fragments pass).
+     * @property {Boolean} alphaToCoverage Enables or disables alpha to coverage (WebGL2 only). When enabled, and if hardware anti-aliasing is on,
+     * limited order-independent transparency can be achieved. Quality depends on the number of MSAA samples of the current render target.
+     * It can nicely soften edges of otherwise sharp alpha cutouts, but isn't recommended for large area semi-transparent surfaces.
+     * Note, that you don't need to enable blending to make alpha to coverage work. It will work without it, just like alphaTest.
+     * @property {Boolean} alphaWrite If true, the alpha component of fragments generated by the shader of this material is written to
+     * the color buffer of the currently active render target. If false, the alpha component will not be written. Defaults to true.
+     * @property {Number} blendType Controls how primitives are blended when being written to the currently active render target.
+     * Can be one of the following values:
+     * <ul>
+     * <li>{@link pc.BLEND_SUBTRACTIVE}: Subtract the color of the source fragment from the destination fragment and write the result to the frame buffer.</li>
+     * <li>{@link pc.BLEND_ADDITIVE}: Add the color of the source fragment to the destination fragment and write the result to the frame buffer.</li>
+     * <li>{@link pc.BLEND_NORMAL}: Enable simple translucency for materials such as glass. This is equivalent to enabling a source blend mode of pc.BLENDMODE_SRC_ALPHA and a destination blend mode of pc.BLENDMODE_ONE_MINUS_SRC_ALPHA.</li>
+     * <li>{@link pc.BLEND_NONE}: Disable blending.</li>
+     * <li>{@link pc.BLEND_PREMULTIPLIED}: Similar to pc.BLEND_NORMAL expect the source fragment is assumed to have already been multiplied by the source alpha value.</li>
+     * <li>{@link pc.BLEND_MULTIPLICATIVE}: Multiply the color of the source fragment by the color of the destination fragment and write the result to the frame buffer.</li>
+     * <li>{@link pc.BLEND_ADDITIVEALPHA}: Same as pc.BLEND_ADDITIVE except the source RGB is multiplied by the source alpha.</li>
+     * </ul>
+     * Defaults to pc.BLEND_NONE.
+     * @property {Boolean} blueWrite If true, the blue component of fragments generated by the shader of this material is written to
+     * the color buffer of the currently active render target. If false, the blue component will not be written. Defaults to true.
+     * @property {Number} cull Controls how triangles are culled based on their face direction with respect to the viewpoint.
+     * Can be one of the following values:
+     * <ul>
+     * <li>{@link pc.CULLFACE_NONE}: Do not cull triangles based on face direction.</li>
+     * <li>{@link pc.CULLFACE_BACK}: Cull the back faces of triangles (do not render triangles facing away from the view point).</li>
+     * <li>{@link pc.CULLFACE_FRONT}: Cull the front faces of triangles (do not render triangles facing towards the view point).</li>
+     * <li>{@link pc.CULLFACE_FRONTANDBACK}: Cull both front and back faces (triangles will not be rendered).</li>
+     * </ul>
+     * Defaults to pc.CULLFACE_BACK.
+     * @property {Boolean} depthTest If true, fragments generated by the shader of this material are only written to the
+     * current render target if they pass the depth test. If false, fragments generated by the shader of this material are
+     * written to the current render target regardless of what is in the depth buffer. Defaults to true.
+     * @property {Boolean} depthWrite If true, fragments generated by the shader of this material write a depth value to
+     * the depth buffer of the currently active render target. If false, no depth value is written. Defaults to true.
+     * @property {Boolean} greenWrite If true, the green component of fragments generated by the shader of this material is written to
+     * the color buffer of the currently active render target. If false, the green component will not be written. Defaults to true.
+     * @property {String} name The name of the material.
+     * @property {Boolean} redWrite If true, the red component of fragments generated by the shader of this material is written to
+     * the color buffer of the currently active render target. If false, the red component will not be written. Defaults to true.
+     * @property {pc.Shader} shader The shader used by this material to render mesh instances.
+     * @property {pc.StencilParameters} stencilFront Stencil parameters for front faces (default is null).
+     * @property {pc.StencilParameters} stencilBack Stencil parameters for back faces (default is null).
+     * @author Will Eastcott and Arthur Rahteenko
+     */
+    class Material {
+
+        alphaTest: number;
+        alphaToCoverage: boolean;
+        alphaWrite: boolean;
+        blendType: number;
+        blueWrite: boolean;
+        cull: number;
+        depthTest: boolean;
+        depthWrite: boolean;
+        greenWrite: boolean;
+        name: string;
+        redWrite: boolean;
+        shader: pc.Shader;
+        stencilFront: pc.StencilParameters;
+        stencilBack: pc.StencilParameters;
+
+        /**
+         * @function
+         * @name pc.Material#getParameter
+         * @description Retrieves the specified shader parameter from a material.
+         * @param {String} name The name of the parameter to query.
+         * @returns {Object} The named parameter.
+         * @author Will Eastcott
+         */
+        getParameter(name: string): number | any[] | pc.Texture;
+
+        /**
+         * @function
+         * @name pc.Material#setParameter
+         * @description Sets a shader parameter on a material.
+         * @param {String} name The name of the parameter to set.
+         * @param {Number|Array|pc.Texture} data The value for the specified parameter.
+         * @author Will Eastcott
+         */
+        setParameter(name: string, data: number | any[] | pc.Texture, passFlags?: number): void;
+
+        /**
+         * @function
+         * @name pc.Material#deleteParameter
+         * @description Deletes a shader parameter on a material.
+         * @param {String} name The name of the parameter to delete.
+         * @author Will Eastcott
+         */
+        deleteParameter(name: string): void;
+
+        /**
+         * @function
+         * @name pc.Material#setParameters
+         * @description Pushes all material parameters into scope.
+         * @author Will Eastcott
+         */
+        setParameters(): void;
+
+        /**
+         * @function
+         * @name pc.Material#update
+         * @description Applies any changes made to the material's properties.
+         */
+        update(): Error;
+
+        /**
+         * @function
+         * @description Initializes the material with the properties in the specified data.
+         * @name pc.Material#init
+         * @param {Object} data The initial data for the material.
+         */
+        init(data: any): Error;
+    }
+
+    /**
+     * @name pc.StencilParameters
+     * @class Holds stencil test settings
+     * @description Create a new StencilParameters instance
+     * @property {Number} func Sets stencil test function. See pc.GraphicsDevice#setStencilFunc
+     * @property {Number} ref Sets stencil test reference value. See pc.GraphicsDevice#setStencilFunc
+     * @property {Number} fail Sets operation to perform if stencil test is failed. See pc.GraphicsDevice#setStencilOperation
+     * @property {Number} zfail Sets operation to perform if depth test is failed. See pc.GraphicsDevice#setStencilOperation
+     * @property {Number} zpass Sets operation to perform if both stencil and depth test are passed. See pc.GraphicsDevice#setStencilOperation
+     * @property {Number} readMask Sets stencil test reading mask. See pc.GraphicsDevice#setStencilFunc
+     * @property {Number} writeMask Sets stencil test writing mask. See pc.GraphicsDevice#setStencilOperation
+    */
+    class StencilParameters {
+        constructor(options?: {
+            func?: number;
+            ref?: number;
+            readMask?: number;
+            writeMask?: number;
+            fail?: number;
+            zfail?: number;
+            zpass?: number;
+        })
+
+        func: number;
+        ref: number;
+        readMask: number;
+        writeMask: number;
+        fail: number;
+        zfail: number;
+        zpass: number;
+
+
+    }
+}
diff --git a/types/playcanvas/engine/scene/mesh.d.ts b/types/playcanvas/engine/scene/mesh.d.ts
new file mode 100644
index 0000000000..6a0dca71e6
--- /dev/null
+++ b/types/playcanvas/engine/scene/mesh.d.ts
@@ -0,0 +1,86 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Mesh
+     * @class A graphical primitive. The mesh is defined by a {@link pc.VertexBuffer} and an optional
+     * {@link pc.IndexBuffer}. It also contains a primitive definition which controls the type of the
+     * primitive and the portion of the vertex or index buffer to use.
+     * @description Create a new mesh.
+     * @property {pc.VertexBuffer} vertexBuffer The vertex buffer holding the vertex data of the mesh.
+     * @property {pc.IndexBuffer[]} indexBuffer An array of index buffers. For unindexed meshes, this array can
+     * be empty. The first index buffer in the array is used by {@link pc.MeshInstance}s with a renderStyle
+     * property set to pc.RENDERSTYLE_SOLID. The second index buffer in the array is used if renderStyle is
+     * set to pc.RENDERSTYLE_WIREFRAME.
+     * @property {Object[]} primitive Array of primitive objects defining how vertex (and index) data in the
+     * mesh should be interpreted by the graphics device. For details on the primitive object, see
+     * {@link pc.GraphicsDevice#draw}. The primitive is ordered based on render style like the indexBuffer property.
+     * @property {pc.BoundingBox} aabb The axis-aligned bounding box for the object space vertices of this mesh.
+     */
+    class Mesh {
+        vertexBuffer: pc.VertexBuffer;
+        indexBuffer: pc.IndexBuffer;
+        primitive: {}[];
+        aabb: pc.BoundingBox;
+    }
+
+    /**
+     * @name pc.MeshInstance
+     * @class An instance of a {@link pc.Mesh}. A single mesh can be referenced by many
+     * mesh instances that can have different transforms and materials.
+     * @description Create a new mesh instance.
+     * @param {pc.GraphNode} node The graph node defining the transform for this instance.
+     * @param {pc.Mesh} mesh The graphics mesh being instanced.
+     * @param {pc.Material} material The material used to render this instance.
+     * @example
+     * // Create a mesh instance pointing to a 1x1x1 'cube' mesh
+     * var mesh = pc.createBox(graphicsDevice);
+     * var material = new pc.StandardMaterial();
+     * var node = new pc.GraphNode();
+     * var meshInstance = new pc.MeshInstance(node, mesh, material);
+     * @property {pc.BoundingBox} aabb The world space axis-aligned bounding box for this
+     * mesh instance.
+     * @property {Boolean} castShadow Controls whether the mesh instance casts shadows.
+     * Defaults to false.
+     * @property {Boolean} visible Enable rendering for this mesh instance. Use visible property to enable/disable rendering without overhead of removing from scene.
+     * But note that the mesh instance is still in the hierarchy and still in the draw call list.
+     * @property {Number} layer The layer used by this mesh instance. Layers define drawing order. Can be:
+     * <ul>
+     *     <li>pc.LAYER_WORLD or 15</li>
+     *     <li>pc.LAYER_FX or 2</li>
+     *     <li>pc.LAYER_GIZMO or 1</li>
+     *     <li>pc.LAYER_HUD or 0</li>
+     *     <li>Any number between 3 and 14 can be used as a custom layer.</li>
+     * </ul>
+     * Defaults to pc.LAYER_WORLD.
+     * @property {pc.Material} material The material used by this mesh instance.
+     * @property {Number} renderStyle The render style of the mesh instance. Can be:
+     * <ul>
+     *     <li>pc.RENDERSTYLE_SOLID</li>
+     *     <li>pc.RENDERSTYLE_WIREFRAME</li>
+     *     <li>pc.RENDERSTYLE_POINTS</li>
+     * </ul>
+     * Defaults to pc.RENDERSTYLE_SOLID.
+     * @property {Boolean} cull Controls whether the mesh instance can be culled with frustum culling
+     */
+    class MeshInstance {
+        constructor(node: pc.GraphNode, mesh: pc.Mesh, material: pc.Material)
+
+        aabb: pc.BoundingBox;
+        castShadow: boolean;
+        visible: boolean;
+        layer: number;
+        material: pc.Material;
+        renderStyle: number;
+        cull: boolean;
+
+        /**
+         * @name pc.MeshInstance#mask
+         * @type Number
+         * @description Mask controlling which {@link pc.LightComponent}s light this mesh instance.
+         * To ignore all dynamic lights, set mask to 0. Defaults to 1.
+         */
+        mask: number;
+
+
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/scene/model.d.ts b/types/playcanvas/engine/scene/model.d.ts
new file mode 100644
index 0000000000..0961d443af
--- /dev/null
+++ b/types/playcanvas/engine/scene/model.d.ts
@@ -0,0 +1,57 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Model
+     * @class A model is a graphical object that can be added to or removed from a scene.
+     * It contains a hierarchy and any number of mesh instances.
+     * @description Creates a new model.
+     * @example
+     * // Create a new model
+     * var model = new pc.Model();
+     * @property {pc.GraphNode} graph The root node of the model's graph node hierarchy.
+     * @property {pc.MeshInstance[]} meshInstances An array of meshInstances contained in this model.
+     */
+    class Model {
+        graph: pc.GraphNode;
+        meshInstances: pc.MeshInstance[];
+
+        /**
+         * @function
+         * @name pc.Model#clone
+         * @description Clones a model. The returned model has a newly created hierarchy
+         * and mesh instances, but meshes are shared between the clone and the specified
+         * model.
+         * @returns {pc.Model} A clone of the specified model.
+         * @example
+         * var clonedModel = model.clone();
+         * @author Will Eastcott
+         */
+        clone(): pc.Model;
+
+        /**
+         * @function
+         * @name pc.Model#destroy
+         * @description destroys skinning texture and possibly deletes vertex/index buffers of a model.
+         * Mesh is reference-counted, so buffers are only deleted if all models with referencing mesh instances were deleted.
+         * That means all in-scene models + the "base" one (asset.resource) which is created when the model is parsed.
+         * It is recommended to use asset.unload() instead, which will also remove the model from the scene.
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.Model#generateWireframe
+         * @description Generates the necessary internal data for a model to be
+         * renderable as wireframe. Once this function has been called, any mesh
+         * instance in the model can have its renderStyle property set to
+         * pc.RENDERSTYLE_WIREFRAME
+         * @example
+         * model.generateWireframe();
+         * for (var i = 0; i < model.meshInstances.length; i++) {
+         *     model.meshInstances[i].renderStyle = pc.RENDERSTYLE_WIREFRAME;
+         * }
+         * @author Will Eastcott
+         */
+        generateWireframe(): void;
+    }
+}
diff --git a/types/playcanvas/engine/scene/pick.d.ts b/types/playcanvas/engine/scene/pick.d.ts
new file mode 100644
index 0000000000..fe7a4223c6
--- /dev/null
+++ b/types/playcanvas/engine/scene/pick.d.ts
@@ -0,0 +1,65 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Picker
+     * @class Picker object used to select mesh instances from screen coordinates.
+     * @description Create a new instance of a Picker object
+     * @param {pc.GraphicsDevice} device Graphics device used to manage internal graphics resources.
+     * @param {Number} width The width of the pick buffer in pixels.
+     * @param {Number} height The height of the pick buffer in pixels.
+     * @property {Number} width Width of the pick buffer in pixels (read-only).
+     * @property {Number} height Height of the pick buffer in pixels (read-only).
+     * @property {pc.RenderTarget} renderTarget The render target used by the picker internally (read-only).
+     */
+    class Picker {
+        constructor(device: pc.GraphicsDevice, width: number, height: number)
+
+        width: number;
+        height: number;
+        renderTarget: pc.RenderTarget;
+
+        /**
+         * @function
+         * @name pc.Picker#getSelection
+         * @description Return the list of mesh instances selected by the specified rectangle in the
+         * previously prepared pick buffer.The rectangle using top-left coordinate system.
+         * @param {Number} x The left edge of the rectangle
+         * @param {Number} y The top edge of the rectangle
+         * @param {Number} [width] The width of the rectangle
+         * @param {Number} [height] The height of the rectangle
+         * @returns {pc.MeshInstance[]} An array of mesh instances that are in the selection
+         * @example
+         * // Get the selection at the point (10,20)
+         * var selection = picker.getSelection(10, 20);
+         *
+         * // Get all models in rectangle with corners at (10,20) and (20,40)
+         * var selection = picker.getSelection(10, 20, 10, 20);
+         */
+        getSelection(x: number, y: number, width?: number, height?: number): pc.MeshInstance[];
+
+        /**
+         * @function
+         * @name pc.Picker#prepare
+         * @description Primes the pick buffer with a rendering of the specified models from the point of view
+         * of the supplied camera. Once the pick buffer has been prepared, pc.Picker#getSelection can be
+         * called multiple times on the same picker object. Therefore, if the models or camera do not change
+         * in any way, pc.Picker#prepare does not need to be called again.
+         * @param {pc.Camera} camera The camera used to render the scene, note this is the CameraNode, not an Entity
+         * @param {pc.Scene} scene The scene containing the pickable mesh instances.
+         */
+        prepare(camera: pc.Camera, scene: pc.Scene): void;
+
+        /**
+         * @function
+         * @name pc.Picker#resize
+         * @description Sets the resolution of the pick buffer. The pick buffer resolution does not need
+         * to match the resolution of the corresponding frame buffer use for general rendering of the
+         * 3D scene. However, the lower the resolution of the pick buffer, the less accurate the selection
+         * results returned by pc.Picker#getSelection. On the other hand, smaller pick buffers will
+         * yield greater performance, so there is a trade off.
+         * @param {Number} width The width of the pick buffer in pixels.
+         * @param {Number} height The height of the pick buffer in pixels.
+         */
+        resize(width: number, height: number): void;
+    }
+}
diff --git a/types/playcanvas/engine/scene/procedural.d.ts b/types/playcanvas/engine/scene/procedural.d.ts
new file mode 100644
index 0000000000..9b1f3e66d6
--- /dev/null
+++ b/types/playcanvas/engine/scene/procedural.d.ts
@@ -0,0 +1,242 @@
+declare namespace pc {
+
+    /**
+     * @function
+     * @name pc.calculateNormals
+     * @description Generates normal information from the specified positions and triangle indices. See {@link pc.createMesh}.
+     * @param {Number[]} positions An array of 3-dimensional vertex positions.
+     * @param {Number[]} indices An array of triangle indices.
+     * @returns {Number[]} An array of 3-dimensional vertex normals.
+     * @example
+     * var normals = pc.calculateNormals(positions, indices);
+     * var tangents = pc.calculateTangents(positions, normals, uvs, indices);
+     * var mesh = pc.createMesh(positions, normals, tangents, uvs, indices);
+     * @author Will Eas
+     * tcott
+     */
+    function calculateNormals(positions: number[], indices: number[]): number[];
+
+    /**
+     * @function
+     * @name pc.calculateTangents
+     * @description Generates tangent information from the specified positions, normals, texture coordinates
+     * and triangle indices. See {@link pc.createMesh}.
+     * @param {Number[]} positions An array of 3-dimensional vertex positions.
+     * @param {Number[]} normals An array of 3-dimensional vertex normals.
+     * @param {Number[]} uvs An array of 2-dimensional vertex texture coordinates.
+     * @param {Number[]} indices An array of triangle indices.
+     * @returns {Number[]} An array of 3-dimensional vertex tangents.
+     * @example
+     * var tangents = pc.calculateTangents(positions, normals, uvs, indices);
+     * var mesh = pc.createMesh(positions, normals, tangents, uvs, indices);
+     * @author Will Eastcott
+     */
+    function calculateTangents(positions: number[], normals: number[], uvs: number[], indices: number[]): number[];
+
+    /**
+     * @function
+     * @name pc.createMesh
+     * @description Creates a new mesh object from the supplied vertex information and topology.
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Number[]} positions An array of 3-dimensional vertex positions.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {Number[]} opts.normals An array of 3-dimensional vertex normals.
+     * @param {Number[]} opts.tangents An array of 3-dimensional vertex tangents.
+     * @param {Number[]} opts.colors An array of 4-dimensional vertex colors.
+     * @param {Number[]} opts.uvs An array of 2-dimensional vertex texture coordinates.
+     * @param {Number[]} opts.uvs1 Same as opts.uvs, but for additional UV set
+     * @param {Number[]} opts.indices An array of triangle indices.
+     * @returns {pc.Mesh} A new Geometry constructed from the supplied vertex and triangle data.
+     * @example
+     * // Create a new mesh supplying optional parameters using object literal notation
+     * var mesh = pc.createMesh(
+     *     graphicsDevice,
+     *     positions,
+     *     {
+     *         normals: treeNormals,
+     *         uvs: treeUvs,
+     *         indices: treeIndices
+     *     });
+     * @author Will Eastcott
+     */
+    function createMesh(device: pc.GraphicsDevice, positions: number[], opts: {
+        normals: number[],
+        tangents: number[],
+        colors: number[],
+        uvs: number[],
+        uvs1: number[],
+        indices: number[],
+    }): pc.Mesh;
+
+    /**
+     * @function
+     * @name pc.createTorus
+     * @description Creates a procedural torus-shaped mesh.
+     * The size, shape and tesselation properties of the torus can be controlled via function parameters.
+     * By default, the function will create a torus in the XZ-plane with a tube radius of 0.2, a ring radius
+     * of 0.3, 20 segments and 30 sides.<br />
+     * Note that the torus is created with UVs in the range of 0 to 1. Additionally, tangent information
+     * is generated into the vertex buffer of the torus's mesh.<br />
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {Number} opts.tubeRadius The radius of the tube forming the body of the torus (defaults to 0.2).
+     * @param {Number} opts.ringRadius The radius from the centre of the torus to the centre of the tube (defaults to 0.3).
+     * @param {Number} opts.segments The number of radial divisions forming cross-sections of the torus ring (defaults to 20).
+     * @param {Number} opts.sides The number of divisions around the tubular body of the torus ring (defaults to 30).
+     * @returns {pc.Mesh} A new torus-shaped mesh.
+     * @author Will Eastcott
+     */
+    function createTorus(device: pc.GraphicsDevice, opts: {
+        tubeRadius: number,
+        ringRadius: number,
+        segments: number,
+        sides: number
+    }): pc.Mesh;
+
+    /**
+     * @function
+     * @name pc.createCylinder
+     * @description Creates a procedural cylinder-shaped mesh.
+     * The size, shape and tesselation properties of the cylinder can be controlled via function parameters.
+     * By default, the function will create a cylinder standing vertically centred on the XZ-plane with a radius
+     * of 0.5, a height of 1.0, 1 height segment and 20 cap segments.<br />
+     * Note that the cylinder is created with UVs in the range of 0 to 1. Additionally, tangent information
+     * is generated into the vertex buffer of the cylinder's mesh.<br />
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {Number} opts.radius The radius of the tube forming the body of the cylinder (defaults to 0.5).
+     * @param {Number} opts.height The length of the body of the cylinder (defaults to 1.0).
+     * @param {Number} opts.heightSegments The number of divisions along the length of the cylinder (defaults to 5).
+     * @param {Number} opts.capSegments The number of divisions around the tubular body of the cylinder (defaults to 20).
+     * @returns {pc.Mesh} A new cylinder-shaped mesh.
+     * @author Will Eastcott
+     */
+    function createCylinder(device: pc.GraphicsDevice, opts: {
+        radius: number,
+        height: number,
+        heightSegments: number,
+        capSegments: number,
+    }): pc.Mesh;
+
+    /**
+     * @function
+     * @name pc.createCapsule
+     * @description Creates a procedural capsule-shaped mesh.
+     * The size, shape and tesselation properties of the capsule can be controlled via function parameters.
+     * By default, the function will create a capsule standing vertically centred on the XZ-plane with a radius
+     * of 0.25, a height of 1.0, 1 height segment and 10 cap segments.<br />
+     * Note that the capsule is created with UVs in the range of 0 to 1. Additionally, tangent information
+     * is generated into the vertex buffer of the capsule's mesh.<br />
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {Number} opts.radius The radius of the tube forming the body of the capsule (defaults to 0.3).
+     * @param {Number} opts.height The length of the body of the capsule from tip to tip (defaults to 1.0).
+     * @param {Number} opts.heightSegments The number of divisions along the tubular length of the capsule (defaults to 1).
+     * @param {Number} opts.sides The number of divisions around the tubular body of the capsule (defaults to 20).
+     * @returns {pc.Mesh} A new cylinder-shaped mesh.
+     * @author Will Eastcott
+     */
+    function createCapsule(device: pc.GraphicsDevice, opts: {
+        radius: number,
+        height: number,
+        heightSegments: number,
+        sides: number
+    }): pc.Mesh;
+
+    /**
+     * @function
+     * @name pc.createCone
+     * @description Creates a procedural cone-shaped mesh.</p>
+     * The size, shape and tesselation properties of the cone can be controlled via function parameters.
+     * By default, the function will create a cone standing vertically centred on the XZ-plane with a base radius
+     * of 0.5, a height of 1.0, 5 height segments and 20 cap segments.<br />
+     * Note that the cone is created with UVs in the range of 0 to 1. Additionally, tangent information
+     * is generated into the vertex buffer of the cone's mesh.<br />
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {Number} opts.baseRadius The base radius of the cone (defaults to 0.5).
+     * @param {Number} opts.peakRadius The peak radius of the cone (defaults to 0.0).
+     * @param {Number} opts.height The length of the body of the cone (defaults to 1.0).
+     * @param {Number} opts.heightSegments The number of divisions along the length of the cone (defaults to 5).
+     * @param {Number} opts.capSegments The number of divisions around the tubular body of the cone (defaults to 18).
+     * @returns {pc.Mesh} A new cone-shaped mesh.
+     * @author Will Eastcott
+     */
+    function createCone(device: pc.GraphicsDevice, opts: {
+        baseRadius: number,
+        peakRadius: number,
+        height: number,
+        heightSegments: number,
+        capSegments: number
+    }): pc.Mesh;
+
+    /**
+     * @function
+     * @name pc.createSphere
+     * @description Creates a procedural sphere-shaped mesh.
+     * The size and tesselation properties of the sphere can be controlled via function parameters. By
+     * default, the function will create a sphere centred on the object space origin with a radius of 0.5
+     * and 16 segments in both longitude and latitude.<br />
+     * Note that the sphere is created with UVs in the range of 0 to 1. Additionally, tangent information
+     * is generated into the vertex buffer of the sphere's mesh.<br />
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {Number} opts.radius The radius of the sphere (defaults to 0.5).
+     * @param {Number} opts.segments The number of divisions along the longitudinal and latitudinal axes of the sphere (defaults to 16).
+     * @returns {pc.Mesh} A new sphere-shaped mesh.
+     * @author Will Eastcott
+     */
+    function createSphere(device: pc.GraphicsDevice, opts: {
+        radius: number,
+        segments: number
+    }): pc.Mesh;
+
+    /**
+     * @function
+     * @name pc.createPlane
+     * @description Creates a procedural plane-shaped mesh.
+     * The size and tesselation properties of the plane can be controlled via function parameters. By
+     * default, the function will create a plane centred on the object space origin with a width and
+     * length of 1.0 and 5 segments in either axis (50 triangles). The normal vector of the plane is aligned
+     * along the positive Y axis.<br />
+     * Note that the plane is created with UVs in the range of 0 to 1. Additionally, tangent information
+     * is generated into the vertex buffer of the plane's mesh.<br />
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {pc.Vec2} opts.halfExtents The half dimensions of the plane in the X and Z axes (defaults to [0.5, 0.5]).
+     * @param {Number} opts.widthSegments The number of divisions along the X axis of the plane (defaults to 5).
+     * @param {Number} opts.lengthSegments The number of divisions along the Z axis of the plane (defaults to 5).
+     * @returns {pc.Mesh} A new plane-shaped mesh.
+     * @author Will Eastcott
+     */
+    function createPlane(device: pc.GraphicsDevice, opts: {
+        halfExtents: pc.Vec2,
+        widthSegments: number,
+        lenghtSegments: number
+    }): pc.Mesh;
+
+    /**
+     * @function
+     * @name pc.createBox
+     * @description Creates a procedural box-shaped mesh.
+     * The size, shape and tesselation properties of the box can be controlled via function parameters. By
+     * default, the function will create a box centred on the object space origin with a width, length and
+     * height of 1.0 unit and 10 segments in either axis (50 triangles per face).<br />
+     * Note that the box is created with UVs in the range of 0 to 1 on each face. Additionally, tangent
+     * information is generated into the vertex buffer of the box's mesh.<br />
+     * @param {pc.GraphicsDevice} device The graphics device used to manage the mesh.
+     * @param {Object} opts An object that specifies optional inputs for the function as follows:
+     * @param {pc.Vec3} opts.halfExtents The half dimensions of the box in each axis (defaults to [0.5, 0.5, 0.5]).
+     * @param {Number} opts.widthSegments The number of divisions along the X axis of the box (defaults to 1).
+     * @param {Number} opts.lengthSegments The number of divisions along the Z axis of the box (defaults to 1).
+     * @param {Number} opts.heightSegments The number of divisions along the Y axis of the box (defaults to 1).
+     * @return {pc.Mesh} A new box-shaped mesh.
+     * @author Will Eastcott
+     */
+    function createBox(device: pc.GraphicsDevice, opts: {
+        halfExtents: pc.Vec3,
+        widthSegments: number,
+        lengthSegments: number,
+        heightSegments: number
+    }): pc.Mesh;
+}
diff --git a/types/playcanvas/engine/scene/scene.d.ts b/types/playcanvas/engine/scene/scene.d.ts
new file mode 100644
index 0000000000..87bf620a9e
--- /dev/null
+++ b/types/playcanvas/engine/scene/scene.d.ts
@@ -0,0 +1,330 @@
+declare namespace pc {
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_SUBTRACTIVE
+     * @description Subtract the color of the source fragment from the destination fragment
+     * and write the result to the frame buffer.
+     */
+    const BLEND_SUBTRACTIVE: 0;
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_ADDITIVE
+     * @description Add the color of the source fragment to the destination fragment
+     * and write the result to the frame buffer.
+     */
+    const BLEND_ADDITIVE: 1;
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_NORMAL
+     * @description Enable simple translucency for materials such as glass. This is
+     * equivalent to enabling a source blend mode of pc.BLENDMODE_SRC_ALPHA and a destination
+     * blend mode of pc.BLENDMODE_ONE_MINUS_SRC_ALPHA.
+     */
+    const BLEND_NORMAL: 2;
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_NONE
+     * @description Disable blending.
+     */
+    const BLEND_NONE: 3;
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_PREMULTIPLIED
+     * @description Similar to pc.BLEND_NORMAL expect the source fragment is assumed to have
+     * already been multiplied by the source alpha value.
+     */
+    const BLEND_PREMULTIPLIED: 4;
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_MULTIPLICATIVE
+     * @description Multiply the color of the source fragment by the color of the destination
+     * fragment and write the result to the frame buffer.
+     */
+    const BLEND_MULTIPLICATIVE: 5;
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_ADDITIVEALPHA
+     * @description Same as pc.BLEND_ADDITIVE except the source RGB is multiplied by the source alpha.
+     */
+    const BLEND_ADDITIVEALPHA: 6;
+
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_MULTIPLICATIVE2X
+     * @description Multiplies colors and doubles the result
+     */
+    const BLEND_MULTIPLICATIVE2X: 7;
+
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_SCREEN
+     * @description Softer version of additive
+     */
+    const BLEND_SCREEN: 8;
+
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_MIN
+     * @description Minimum color. Check app.graphicsDevice.extBlendMinmax for support.
+     */
+    const BLEND_MIN: 9;
+
+    /**
+     * @enum pc.BLEND
+     * @name pc.BLEND_MAX
+     * @description Maximum color. Check app.graphicsDevice.extBlendMinmax for support.
+     */
+    const BLEND_MAX: 10;
+
+    /**
+     * @enum pc.FOG
+     * @name pc.FOG_NONE
+     * @description No fog is applied to the scene.
+     */
+    const FOG_NONE: 'none';
+    /**
+     * @enum pc.FOG
+     * @name pc.FOG_LINEAR
+     * @description Fog rises linearly from zero to 1 between a start and end depth.
+     */
+    const FOG_LINEAR: 'linear';
+    /**
+     * @enum pc.FOG
+     * @name pc.FOG_EXP
+     * @description Fog rises according to an exponential curve controlled by a density value.
+     */
+    const FOG_EXP: 'exp';
+    /**
+     * @enum pc.FOG
+     * @name pc.FOG_EXP2
+     * @description Fog rises according to an exponential curve controlled by a density value.
+     */
+    const FOG_EXP2: 'exp2';
+
+    const FRESNEL_NONE: 0;
+    const FRESNEL_SCHLICK: 2;
+
+    const LAYER_HUD: 0;
+    const LAYER_GIZMO: 1;
+    const LAYER_FX: 2;
+    // 3 - 14 are custom user layers
+    const LAYER_WORLD: 15;
+
+    /**
+     * @enum pc.LIGHTTYPE
+     * @name pc.LIGHTTYPE_DIRECTIONAL
+     * @description Directional (global) light source.
+     */
+    const LIGHTTYPE_DIRECTIONAL: 0;
+    /**
+     * @enum pc.LIGHTTYPE
+     * @name pc.LIGHTTYPE_POINT
+     * @description Point (local) light source.
+     */
+    const LIGHTTYPE_POINT: 1;
+    /**
+     * @enum pc.LIGHTTYPE
+     * @name pc.LIGHTTYPE_SPOT
+     * @description Spot (local) light source.
+     */
+    const LIGHTTYPE_SPOT: 2;
+
+    const LIGHTFALLOFF_LINEAR: 0;
+    const LIGHTFALLOFF_INVERSESQUARED: 1;
+
+    const SHADOW_PCF3: 0;
+    const SHADOW_DEPTH: 0; // alias for SHADOW_PCF3 for backwards compatibility
+    const SHADOW_VSM8: 1;
+    const SHADOW_VSM16: 2;
+    const SHADOW_VSM32: 3;
+    const SHADOW_PCF5: 4;
+
+    const BLUR_BOX: 0;
+    const BLUR_GAUSSIAN: 1;
+
+    const PARTICLESORT_NONE: 0;
+    const PARTICLESORT_DISTANCE: 1;
+    const PARTICLESORT_NEWER_FIRST: 2;
+    const PARTICLESORT_OLDER_FIRST: 3;
+    const PARTICLEMODE_GPU: 0;
+    const PARTICLEMODE_CPU: 1;
+    const EMITTERSHAPE_BOX: 0;
+    const EMITTERSHAPE_SPHERE: 1;
+
+    /**
+     * @enum pc.PROJECTION
+     * @name pc.PROJECTION_PERSPECTIVE
+     * @description A perspective camera projection where the frustum shape is essentially pyramidal.
+     */
+    const PROJECTION_PERSPECTIVE: 0;
+    /**
+     * @enum pc.PROJECTION
+     * @name pc.PROJECTION_ORTHOGRAPHIC
+     * @description An orthographic camera projection where the frustum shape is essentially a cuboid.
+     */
+    const PROJECTION_ORTHOGRAPHIC: 1;
+
+    const RENDERSTYLE_SOLID: 0;
+    const RENDERSTYLE_WIREFRAME: 1;
+    const RENDERSTYLE_POINTS: 2;
+
+    const CUBEPROJ_NONE: 0;
+    const CUBEPROJ_BOX: 1;
+
+    const SPECULAR_PHONG: 0;
+    const SPECULAR_BLINN: 1;
+
+    const GAMMA_NONE: 0;
+    const GAMMA_SRGB: 1;
+    const GAMMA_SRGBFAST: 2; // deprecated
+    const GAMMA_SRGBHDR: 3;
+
+    const TONEMAP_LINEAR: 0;
+    const TONEMAP_FILMIC: 1;
+    const TONEMAP_HEJL: 2;
+    const TONEMAP_ACES: 3;
+    const TONEMAP_ACES2: 4;
+
+    const SPECOCC_NONE: 0;
+    const SPECOCC_AO: 1;
+    const SPECOCC_GLOSSDEPENDENT: 2;
+
+    const SHADERDEF_NOSHADOW: 1;
+    const SHADERDEF_SKIN: 2;
+    const SHADERDEF_UV0: 4;
+    const SHADERDEF_UV1: 8;
+    const SHADERDEF_VCOLOR: 16;
+    const SHADERDEF_INSTANCING: 32;
+    const SHADERDEF_LM: 64;
+    const SHADERDEF_DIRLM: 128;
+    const SHADERDEF_SCREENSPACE: 256;
+
+    const LINEBATCH_WORLD: 0;
+    const LINEBATCH_OVERLAY: 1;
+    const LINEBATCH_GIZMO: 2;
+
+    const SHADOWUPDATE_NONE: 0;
+    const SHADOWUPDATE_THISFRAME: 1;
+    const SHADOWUPDATE_REALTIME: 2;
+
+    const SORTKEY_FORWARD: 0;
+    const SORTKEY_DEPTH: 1;
+
+    const SHADER_FORWARD: 0;
+    const SHADER_FORWARDHDR: 1;
+    const SHADER_DEPTH: 2;
+    const SHADER_SHADOW: 3; // PCF3
+    // 4: VSM8,
+    // 5: VSM16,
+    // 6: VSM32,
+    // 7: PCF5,
+    // 8: PCF3 POINT
+    // 9: VSM8 POINT,
+    // 10: VSM16 POINT,
+    // 11: VSM32 POINT,
+    // 12: PCF5 POINT
+    // 13: PCF3 SPOT
+    // 14: VSM8 SPOT,
+    // 15: VSM16 SPOT,
+    // 16: VSM32 SPOT,
+    // 17: PCF5 SPOT
+    const SHADER_PICK: 18;
+
+    const BAKE_COLOR: 0;
+    const BAKE_COLORDIR: 1;
+
+    const VIEW_CENTER: 0;
+    const VIEW_LEFT: 1;
+    const VIEW_RIGHT: 2
+
+    /**
+     * @name pc.Scene
+     * @class A scene is graphical representation of an environment. It manages the scene hierarchy, all
+     * graphical objects, lights, and scene-wide properties.
+     * @description Creates a new Scene.
+     * @property {pc.Color} ambientLight The color of the scene's ambient light. Defaults to black (0, 0, 0).
+     * @property {String} fog The type of fog used by the scene. Can be:
+     * <ul>
+     *     <li>pc.FOG_NONE</li>
+     *     <li>pc.FOG_LINEAR</li>
+     *     <li>pc.FOG_EXP</li>
+     *     <li>pc.FOG_EXP2</li>
+     * </ul>
+     * Defaults to pc.FOG_NONE.
+     * @property {pc.Color} fogColor The color of the fog (if enabled). Defaults to black (0, 0, 0).
+     * @property {Number} fogDensity The density of the fog (if enabled). This property is only valid if the
+     * fog property is set to pc.FOG_EXP or pc.FOG_EXP2. Defaults to 0.
+     * @property {Number} fogEnd The distance from the viewpoint where linear fog reaches its maximum. This
+     * property is only valid if the fog property is set to pc.FOG_LINEAR. Defaults to 1000.
+     * @property {Number} fogStart The distance from the viewpoint where linear fog begins. This property is
+     * only valid if the fog property is set to pc.FOG_LINEAR. Defaults to 1.
+     * @property {Number} gammaCorrection The gamma correction to apply when rendering the scene. Can be:
+     * <ul>
+     *     <li>pc.GAMMA_NONE</li>
+     *     <li>pc.GAMMA_SRGB</li>
+     * </ul>
+     * Defaults to pc.GAMMA_NONE.
+     * @property {Number} toneMapping The tonemapping transform to apply when writing fragments to the
+     * frame buffer. Can be:
+     * <ul>
+     *     <li>pc.TONEMAP_LINEAR</li>
+     *     <li>pc.TONEMAP_FILMIC</li>
+     *     <li>pc.TONEMAP_HEJL</li>
+     *     <li>pc.TONEMAP_ACES</li>
+     * </ul>
+     * Defaults to pc.TONEMAP_LINEAR.
+     * @property {pc.Texture} skybox A cube map texture used as the scene's skybox. Defaults to null.
+     * @property {Number} skyboxIntensity Multiplier for skybox intensity. Defaults to 1.
+     * @property {Number} skyboxMip The mip level of the skybox to be displayed. Only valid for prefiltered
+     * cubemap skyboxes. Defaults to 0 (base level).
+     * @property {Number} lightmapSizeMultiplier The lightmap resolution multiplier. Defaults to 1.
+     * @property {Number} lightmapMaxResolution The maximum lightmap resolution. Defaults to 2048.
+     * @property {Number} lightmapMode The lightmap baking mode. Can be:
+     * <ul>
+     *     <li>pc.BAKE_COLOR: single color lightmap
+     *     <li>pc.BAKE_COLORDIR: single color lightmap + dominant light direction (used for bump/specular)
+     * </ul>
+     * Only lights with bakeDir=true will be used for generating the dominant light direction. Defaults to
+     * pc.BAKE_COLORDIR.
+     */
+    class Scene {
+        ambientLight: pc.Color;
+        fog: string;
+        fogColor: pc.Color;
+        fogDensity: number;
+        fogEnd: number;
+        fogStart: number;
+        gammaCorrection: number;
+        lightmapMaxResolution: number;
+        lightmapMode: number;
+        lightmapSizeMultiplier: number;
+        skybox: pc.Texture;
+        skyboxIntensity: number;
+        skyboxMip: number;
+        toneMapping: number;
+
+        /**
+         * @function
+         * @name pc.Scene#addModel
+         * @description Adds the specified model to the scene.
+         * @author Will Eastcott
+         */
+        addModel(model: pc.Model): void;
+
+        /**
+         * @function
+         * @name pc.Scene#removeModel
+         * @description Removes the specified model from the scene.
+         * @author Will Eastcott
+         */
+        removeModel(model: pc.Model): void;
+
+        /**
+         * @function
+         * @name pc.Scene#update
+         * @description Synchronizes the graph node hierarchy of every model in the scene.
+         * @author Will Eastcott
+         */
+        update(): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/scene/skin.d.ts b/types/playcanvas/engine/scene/skin.d.ts
new file mode 100644
index 0000000000..0b5c35b907
--- /dev/null
+++ b/types/playcanvas/engine/scene/skin.d.ts
@@ -0,0 +1,28 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Skin
+     * @class A skin contains data about the bones in a hierarchy that drive a skinned mesh animation.
+     * Specifically, the skin stores the bone name and inverse bind matrix and for each bone.
+     * Inverse bind matrices are instrumental in the mathematics of vertex skinning.
+     * @param {pc.GraphicsDevice} graphicsDevice The graphics device used to manage this skin.
+     * @param {pc.Mat4[]} ibp The array of inverse bind matrices.
+     * @param {String[]} boneNames The array of bone names for the bones referenced by this skin.
+     * @author Will Eastcott
+     */
+    class Skin {
+        constructor(graphicsDevice: pc.GraphicsDevice, ibp: pc.Mat4[], boneNames: string[])
+    }
+
+    /**
+     * @name pc.SkinInstance
+     * @class A skin instance is responsible for generating the matrix palette that is used to
+     * skin vertices from object space to world space.
+     * @param {pc.Skin} skin The skin that will provide the inverse bind pose matrices to
+     * generate the final matrix palette.
+     * @author Will Eastcott
+     */
+    class SkinInstance {
+        constructor(skin: pc.Skin, node: pc.GraphNode)
+    }
+}
diff --git a/types/playcanvas/engine/scene/standard-material.d.ts b/types/playcanvas/engine/scene/standard-material.d.ts
new file mode 100644
index 0000000000..023e7d071d
--- /dev/null
+++ b/types/playcanvas/engine/scene/standard-material.d.ts
@@ -0,0 +1,253 @@
+declare namespace pc {
+
+    /**
+     * @name pc.StandardMaterial
+     * @class A Standard material is the main, general purpose material that is most often used for rendering.
+     * It can approximate a wide variety of surface types and can simulate dynamic reflected light.
+     * @property {pc.Color} ambient The ambient color of the material. This color value is 3-component (RGB),
+     * where each component is between 0 and 1.
+     * @property {pc.Color} diffuse The diffuse color of the material. This color value is 3-component (RGB),
+     * where each component is between 0 and 1.
+     * @property {pc.Texture} diffuseMap The diffuse map of the material. This must be a 2D texture rather
+     * than a cube map. If this property is set to a valid texture, the texture is used as the source for diffuse
+     * color in preference to the 'diffuse' property.
+     * @property {Number} diffuseMapUv Diffuse map UV channel
+     * @property {String} diffuseMapChannel Color channels of the diffuse map to use. Can be "r", "g", "b", "a", "rgb" or any swizzled combination.
+     * @property {Boolean} diffuseMapVertexColor Use vertex colors for diffuse instead of a map
+     * @property {pc.Vec2} diffuseMapTiling Controls the 2D tiling of the diffuse map.
+     * @property {pc.Vec2} diffuseMapOffset Controls the 2D offset of the diffuse map. Each component is between 0 and 1.
+     * @property {pc.Color} specular The specular color of the material. This color value is 3-component (RGB),
+     * @property {pc.Texture} specularMap The per-pixel specular map of the material. This must be a 2D texture
+     * rather than a cube map. If this property is set to a valid texture, the texture is used as the source for
+     * specular color in preference to the 'specular' property.
+     * @property {Number} specularMapUv Specular map UV channel
+     * @property {String} specularMapChannel Color channels of the specular map to use. Can be "r", "g", "b", "a", "rgb" or any swizzled combination.
+     * @property {Boolean} specularMapVertexColor Use vertex colors for specular instead of a map
+     * @property {pc.Vec2} specularMapTiling Controls the 2D tiling of the specular map.
+     * @property {pc.Vec2} specularMapOffset Controls the 2D offset of the specular map. Each component is between 0 and 1.
+     * @property {Number} metalness Defines how much the surface is metallic. From 0 (dielectric) to 1 (metal).
+     * This can be used as alternative to specular color to save space.
+     * Metallic surfaces have their reflection tinted with diffuse color.
+     * @property {pc.Texture} metalnessMap Monochrome metalness map.
+     * @property {Number} metalnessMapUv Metalness map UV channel
+     * @property {String} metalnessMapChannel Color channel of the metalness map to use. Can be "r", "g", "b" or "a".
+     * @property {Boolean} metalnessMapVertexColor Use vertex colors for metalness instead of a map
+     * @property {pc.Vec2} metalnessMapTiling Controls the 2D tiling of the metalness map.
+     * @property {pc.Vec2} metalnessMapOffset Controls the 2D offset of the metalness map. Each component is between 0 and 1.
+     * @property {Boolean} useMetalness Use metalness properties instead of specular.
+     * @property {Number} shininess Defines glossiness of the material from 0 (rough) to 100 (mirror).
+     * A higher shininess value results in a more focussed specular highlight.
+     * @property {pc.Texture} glossMap The per-pixel gloss of the material. This must be a 2D texture
+     * rather than a cube map. If this property is set to a valid texture, the texture is used as the source for
+     * shininess in preference to the 'shininess' property.
+     * @property {Number} glossMapUv Gloss map UV channel
+     * @property {String} glossMapChannel Color channel of the gloss map to use. Can be "r", "g", "b" or "a".
+     * @property {Boolean} glossMapVertexColor Use vertex colors for glossiness instead of a map
+     * @property {pc.Vec2} glossMapTiling Controls the 2D tiling of the gloss map.
+     * @property {pc.Vec2} glossMapOffset Controls the 2D offset of the gloss map. Each component is between 0 and 1.
+     * @property {Number} refraction Defines the visibility of refraction. Material can refract the same cube map as used for reflections.
+     * @property {Number} refractionIndex Defines the index of refraction, i.e. the amount of distortion.
+     * The value is calculated as (outerIor / surfaceIor), where inputs are measured indices of refraction, the one around the object and the one of it's own surface.
+     * In most situations outer medium is air, so outerIor will be approximately 1. Then you only need to do (1.0 / surfaceIor).
+     * @property {pc.Color} emissive The emissive color of the material. This color value is 3-component (RGB),
+     * where each component is between 0 and 1.
+     * @property {pc.Texture} emissiveMap The emissive map of the material. This must be a 2D texture rather
+     * than a cube map. If this property is set to a valid texture, the texture is used as the source for emissive
+     * color in preference to the 'emissive' property.
+     * @property {Number} emissiveIntensity Emissive color multiplier.
+     * @property {Number} emissiveMapUv Emissive map UV channel
+     * @property {String} emissiveMapChannel Color channels of the emissive map to use. Can be "r", "g", "b", "a", "rgb" or any swizzled combination.
+     * @property {Boolean} emissiveMapVertexColor Use vertex colors for emission instead of a map
+     * @property {pc.Vec2} emissiveMapTiling Controls the 2D tiling of the emissive map.
+     * @property {pc.Vec2} emissiveMapOffset Controls the 2D offset of the emissive map. Each component is between 0 and 1.
+     * @property {Number} opacity The opacity of the material. This value can be between 0 and 1, where 0 is fully
+     * transparent and 1 is fully opaque. If you want the material to be transparent you also need to
+     * set the {@link pc.Material#blendType} to pc.BLEND_NORMAL or pc.BLEND_ADDITIVE.
+     * @property {pc.Texture} opacityMap The opacity map of the material. This must be a 2D texture rather
+     * than a cube map. If this property is set to a valid texture, the texture is used as the source for opacity
+     * in preference to the 'opacity' property. If you want the material to be transparent you also need to
+     * set the {@link pc.Material#blendType} to pc.BLEND_NORMAL or pc.BLEND_ADDITIVE.
+     * @property {Number} opacityMapUv Opacity map UV channel
+     * @property {String} opacityMapChannel Color channel of the opacity map to use. Can be "r", "g", "b" or "a".
+     * @property {Boolean} opacityMapVertexColor Use vertex colors for opacity instead of a map
+     * @property {pc.Vec2} opacityMapTiling Controls the 2D tiling of the opacity map.
+     * @property {pc.Vec2} opacityMapOffset Controls the 2D offset of the opacity map. Each component is between 0 and 1.
+     * @property {pc.Texture} normalMap The normal map of the material. This must be a 2D texture rather
+     * than a cube map. The texture must contains normalized, tangent space normals.
+     * @property {Number} normalMapUv Normal map UV channel
+     * @property {pc.Vec2} normalMapTiling Controls the 2D tiling of the normal map.
+     * @property {pc.Vec2} normalMapOffset Controls the 2D offset of the normal map. Each component is between 0 and 1.
+     * @property {pc.Texture} heightMap The height map of the material. This must be a 2D texture rather
+     * than a cube map. The texture contain values defining the height of the surface at that point where darker
+     * pixels are lower and lighter pixels are higher.
+     * @property {Number} heightMapUv Height map UV channel
+     * @property {String} heightMapChannel Color channel of the height map to use. Can be "r", "g", "b" or "a".
+     * @property {pc.Vec2} heightMapTiling Controls the 2D tiling of the height map.
+     * @property {pc.Vec2} heightMapOffset Controls the 2D offset of the height map. Each component is between 0 and 1.
+     * @property {Number} bumpiness The bumpiness of the material. This value scales the assigned normal map
+     * and can be between 0 and 1, where 0 shows no contribution from the normal map and 1 results in a full contribution.
+     * @property {Number} heightMapFactor Height map multiplier. Height maps are used to create a parallax mapping effect
+     * and modifying this value will alter the strength of the parallax effect.
+     * @property {pc.Texture} sphereMap The spherical environment map of the material.
+     * @property {pc.Texture} cubeMap The cubic environment map of the material.
+     * @property {Number} cubeMapProjection The type of projection applied to the cubeMap property:
+     * <ul>
+     *     <li>{@link pc.CUBEPROJ_NONE}: The cube map is treated as if it is infinitely far away.</li>
+     *     <li>{@link pc.CUBEPROJ_BOX}: Box-projection based on a world space axis-aligned bounding box.</li>
+     * </ul>
+     * Defaults to pc.CUBEPROJ_NONE.
+     * @property {pc.BoundingBox} cubeMapProjectionBox The world space axis-aligned bounding box defining the
+     * box-projection used for the cubeMap property. Only used when cubeMapProjection is set to pc.CUBEPROJ_BOX.
+     * @property {Number} reflectivity The reflectivity of the material. This value scales the reflection map and
+     * can be between 0 and 1, where 0 shows no reflection and 1 is fully reflective.
+     * @property {pc.Texture} lightMap The light map of the material.
+     * @property {Number} lightMapUv Lightmap UV channel
+     * @property {String} lightMapChannel Color channels of the lightmap to use. Can be "r", "g", "b", "a", "rgb" or any swizzled combination.
+     * @property {Boolean} lightMapVertexColor Use vertex lightmap instead of a texture-based one
+     * @property {pc.Vec2} lightMapTiling Controls the 2D tiling of the lightmap.
+     * @property {pc.Vec2} lightMapOffset Controls the 2D offset of the lightmap. Each component is between 0 and 1.
+     * @property {Boolean} ambientTint Enables scene ambient multiplication by material ambient color.
+     * @property {Boolean} diffuseMapTint Enables diffuseMap multiplication by diffuse color.
+     * @property {Boolean} specularMapTint Enables specularMap multiplication by specular color.
+     * @property {Boolean} emissiveMapTint Enables emissiveMap multiplication by emissive color.
+     * @property {pc.Texture} aoMap Baked ambient occlusion map. Modulates ambient color.
+     * @property {Number} aoMapUv AO map UV channel
+     * @property {String} aoMapChannel Color channel of the AO map to use. Can be "r", "g", "b" or "a".
+     * @property {Boolean} aoMapVertexColor Use vertex colors for AO instead of a map
+     * @property {pc.Vec2} aoMapTiling Controls the 2D tiling of the AO map.
+     * @property {pc.Vec2} aoMapOffset Controls the 2D offset of the AO map. Each component is between 0 and 1.
+     * @property {Number} occludeSpecular Uses aoMap to occlude specular/reflection. It's a hack, because real specular occlusion is view-dependent. However, it's much better than nothing.
+     * <ul>
+     *     <li>{@link pc.SPECOCC_NONE}: No specular occlusion</li>
+     *     <li>{@link pc.SPECOCC_AO}: Use AO map directly to occlude specular.</li>
+     *     <li>{@link pc.SPECOCC_GLOSSDEPENDENT}: Modify AO map based on material glossiness/view angle to occlude specular.</li>
+     * </ul>
+     * @property {Number} occludeSpecularIntensity Controls visibility of specular occlusion.
+     * @property {Boolean} specularAntialias Enables Toksvig AA for mipmapped normal maps with specular.
+     * @property {Boolean} conserveEnergy Defines how diffuse and specular components are combined when Fresnel is on.
+        It is recommended that you leave this option enabled, although you may want to disable it in case when all reflection comes only from a few light sources, and you don't use an environment map, therefore having mostly black reflection.
+     * @property {Number} shadingModel Defines the shading model.
+     * <ul>
+     *     <li>{@link pc.SPECULAR_PHONG}: Phong without energy conservation. You should only use it as a backwards compatibility with older projects.</li>
+     *     <li>{@link pc.SPECULAR_BLINN}: Energy-conserving Blinn-Phong.</li>
+     * </ul>
+     * @property {Number} fresnelModel Defines the formula used for Fresnel effect.
+     As a side-effect, enabling any Fresnel model changes the way diffuse and reflection components are combined.
+     When Fresnel is off, legacy non energy-conserving combining is used. When it is on, combining behaviour is defined by conserveEnergy parameter.
+     * <ul>
+     *     <li>{@link pc.FRESNEL_NONE}: No Fresnel.</li>
+     *     <li>{@link pc.FRESNEL_SCHLICK}: Schlick's approximation of Fresnel (recommended). Parameterized by specular color.</li>
+     * </ul>
+     * @property {Boolean} useFog Apply fogging (as configured in scene settings)
+     * @property {Boolean} useLighting Apply lighting
+     * @property {Boolean} useSkybox Apply scene skybox as prefiltered environment map
+     * @property {Boolean} useGammaTonemap Apply gamma correction and tonemapping (as configured in scene settings)
+     * @property {Boolean} twoSidedLighting Calculate proper normals (and therefore lighting) on backfaces
+     *
+     * @example
+     * // Create a new Standard material
+     * var material = new pc.StandardMaterial();
+     *
+     * // Update the material's diffuse and specular properties
+     * material.diffuse.set(1, 0, 0);
+     * material.specular.set(1, 1, 1);
+     *
+     * // Notify the material that it has been modified
+     * material.update();
+     *
+     * @extends pc.Material
+     * @author Will Eastcott and Arthur Rahteenko
+     */
+    class StandardMaterial extends pc.Material {
+        ambient: pc.Color;
+        diffuse: pc.Color;
+        diffuseMap: pc.Texture;
+        diffuseMapUv: number;
+        diffuseMapChannel: string;
+        diffuseMapVertexColor: boolean;
+        diffuseMapTiling: pc.Vec2;
+        diffuseMapOffset: pc.Vec2;
+        specular: pc.Color;
+        specularMap: pc.Texture;
+        specularMapUv: number;
+        specularMapChannel: string;
+        specularMapVertexColor: boolean;
+        specularMapTiling: pc.Vec2;
+        specularMapOffset: pc.Vec2;
+        metalness: number;
+        metalnessMap: pc.Texture;
+        metalnessMapUv: number;
+        metalnessMapChannel: string;
+        metalnessMapVertexColor: boolean;
+        metalnessMapTiling: pc.Vec2;
+        metalnessMapOffset: pc.Vec2;
+        useMetalness: boolean;
+        shininess: number;
+        glossMap: pc.Texture;
+        glossMapUv: number;
+        glossMapChannel: string;
+        glossMapVertexColor: boolean;
+        glossMapTiling: pc.Vec2;
+        glossMapOffset: pc.Vec2;
+        refraction: number;
+        refractionIndex: number;
+        emissive: pc.Color;
+        emissiveMap: pc.Texture;
+        emissiveIntensity: number;
+        emissiveMapUv: number;
+        emissiveMapChannel: string;
+        emissiveMapVertexColor: boolean;
+        emissiveMapTiling: pc.Vec2;
+        emissiveMapOffset: pc.Vec2;
+        opacity: number;
+        opacityMap: pc.Texture;
+        opacityMapUv: number;
+        opacityMapChannel: string;
+        opacityMapVertexColor: boolean;
+        opacityMapTiling: pc.Vec2;
+        opacityMapOffset: pc.Vec2;
+        normalMap: pc.Texture;
+        normalMapUv: number;
+        normalMapTiling: pc.Vec2;
+        normalMapOffset: pc.Vec2;
+        heightMap: pc.Texture;
+        heightMapUv: number;
+        heightMapChannel: string;
+        heightMapTiling: pc.Vec2;
+        heightMapOffset: pc.Vec2;
+        bumpiness: number;
+        heightMapFactor: number;
+        shereMap: pc.Texture;
+        cubeMap: pc.Texture;
+        cubeMapProjection: number;
+        cubeMapProjectionBox: pc.BoundingBox;
+        reflectivity: number;
+        lightMap: pc.Texture;
+        lightMapUv: number;
+        lightMapChannel: string;
+        lightMapVertexColor: boolean;
+        lightMapTiling: pc.Vec2;
+        lightMapOffset: pc.Vec2;
+        ambientTint: boolean;
+        diffuseMapTint: boolean;
+        specularMapTing: boolean;
+        emissiveMapTint: boolean;
+        aoMap: pc.Texture;
+        aoMapUv: number;
+        aoMapChannel: string;
+        aoMapVertexColor: boolean;
+        aoMapTiling: pc.Vec2;
+        aoMapOffset: pc.Vec2;
+        occludeSpecular: number;
+        occludeSpecularIntensity: number;
+        specularAntialias: boolean;
+        conserveEnergy: boolean;
+        shadingModel: number;
+        fresnelModel: number;
+        useFog: boolean;
+        useLighting: boolean;
+        useSkybox: boolean;
+        useGammaTonemap: boolean;
+        twoSidedLighting: boolean;
+    }
+}
diff --git a/types/playcanvas/engine/script/script-registry.d.ts b/types/playcanvas/engine/script/script-registry.d.ts
new file mode 100644
index 0000000000..117f21a969
--- /dev/null
+++ b/types/playcanvas/engine/script/script-registry.d.ts
@@ -0,0 +1,80 @@
+declare namespace pc {
+
+    /**
+    * @name pc.ScriptRegistry
+    * @class Container for all Script Types that are available to this application
+    * @description Create an instance of a pc.ScriptRegistry.
+    * Note: PlayCanvas scripts can access the Script Registry from inside the application with {@link pc.Application#scripts} {@link pc.ADDRESS_REPEAT}.
+    * @param {pc.Application} app Application to attach registry to.
+    */
+    class ScriptRegistry {
+        constructor(app: pc.Application)
+
+        app: pc.Application;
+
+        /**
+         * @function
+         * @name pc.ScriptRegistry#add
+         * @description Add {@link ScriptType} to registry.
+         * Note: when {@link pc.createScript} is called, it will add the {@link ScriptType} to the registry automatically.
+         * If a script already exists in registry, and the new script has a `swap` method defined,
+         * it will perform code hot swapping automatically in async manner.
+         * @param {ScriptType} scriptType Script Type that is created using {@link pc.createScript}
+         * @returns {Boolean} True if added for the first time or false if script already exists
+         * @example
+         * var PlayerController = pc.createScript('playerController');
+         * // playerController Script Type will be added to pc.ScriptRegistry automatically
+         * app.scripts.has('playerController') === true; // true
+         */
+        add(script: ScriptType): boolean;
+
+        /**
+         * @function
+         * @name pc.ScriptRegistry#remove
+         * @description Remove {@link ScriptType}.
+         * @param {String} name Name of a {@link ScriptType} to remove
+         * @returns {Boolean} True if removed or False if already not in registry
+         * @example
+         * app.scripts.remove('playerController');
+         */
+        remove(script: string): boolean;
+
+        /**
+         * @function
+         * @name pc.ScriptRegistry#get
+         * @description Get {@link ScriptType} by name.
+         * @param {String} name Name of a {@link ScriptType}.
+         * @returns {ScriptType} The Script Type if it exists in the registry or null otherwise.
+         * @example
+         * var PlayerController = app.scripts.get('playerController');
+         */
+        get(name: string): ScriptType;
+
+        /**
+         * @function
+         * @name pc.ScriptRegistry#has
+         * @description Check if a {@link ScriptType} with the specified name is in the registry.
+         * @param {String} name Name of a {@link ScriptType}
+         * @returns {Boolean} True if {@link ScriptType} is in registry
+         * @example
+         * if (app.scripts.has('playerController')) {
+         *     // playerController is in pc.ScriptRegistry
+         * }
+         */
+        has(name: string): boolean;
+
+        /**
+         * @function
+         * @name pc.ScriptRegistry#list
+         * @description Get list of all {@link ScriptType}s from registry.
+         * @returns {ScriptType[]} list of all {@link ScriptType}s in registry
+         * @example
+         * // logs array of all Script Type names available in registry
+         * console.log(app.scripts.list().map(function(o) {
+         *     return o.name;
+         * }));
+         */
+        list(): ScriptType[];
+
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/script/script.d.ts b/types/playcanvas/engine/script/script.d.ts
new file mode 100644
index 0000000000..21cd5540d9
--- /dev/null
+++ b/types/playcanvas/engine/script/script.d.ts
@@ -0,0 +1,338 @@
+declare namespace pc {
+    type AttributesType = 'boolean' | 'number' | 'string' | 'json' | 'asset' | 'entity' |
+        'rgb' | 'rgba' | 'vec2' | 'vec3' | 'vec4' | 'curve';
+    type AttributesArgs = {
+        type: AttributesType;
+        default?: any;
+        title?: string;
+        description?: string;
+        placeholder?: string | string[];
+        array?: boolean;
+        size?: number;
+        min?: number;
+        max?: number;
+        precision?: number;
+        assetType?: string;
+        curves?: string[];
+        color?: string;
+        enum?: object[];
+    }
+
+    /**
+    * @name pc.ScriptAttributes
+    * @class Container of Script Attribute definitions. Implements an interface to add/remove attributes and store their definition for a {@link ScriptType}.
+    * Note: An instance of pc.ScriptAttributes is created automatically by each {@link ScriptType}.
+    * @param {ScriptType} scriptType Script Type that attributes relate to.
+    */
+    class ScriptAttributes {
+        constructor(scriptType: ScriptType)
+
+        /**
+         * @function
+         * @name pc.ScriptAttributes#add
+         * @description Add Attribute
+         * @param {String} name Name of an attribute
+         * @param {Object} args Object with Arguments for an attribute
+         * @param {String} args.type Type of an attribute value, list of possible types:
+         * boolean, number, string, json, asset, entity, rgb, rgba, vec2, vec3, vec4, curve
+         * @param {?} [args.default] Default attribute value
+         * @param {String} [args.title] Title for Editor's for field UI
+         * @param {String} [args.description] Description for Editor's for field UI
+         * @param {(String|String[])} [args.placeholder] Placeholder for Editor's for field UI.
+         * For multi-field types, such as vec2, vec3, and others use array of strings.
+         * @param {Boolean} [args.array] If attribute can hold single or multiple values
+         * @param {Number} [args.size] If attribute is array, maximum number of values can be set
+         * @param {Number} [args.min] Minimum value for type 'number', if max and min defined, slider will be rendered in Editor's UI
+         * @param {Number} [args.max] Maximum value for type 'number', if max and min defined, slider will be rendered in Editor's UI
+         * @param {Number} [args.precision] Level of precision for field type 'number' with floating values
+         * @param {String} [args.assetType] Name of asset type to be used in 'asset' type attribute picker in Editor's UI, defaults to '*' (all)
+         * @param {String[]} [args.curves] List of names for Curves for field type 'curve'
+         * @param {String} [args.color] String of color channels for Curves for field type 'curve', can be any combination of `rgba` characters.
+         * Defining this property will render Gradient in Editor's field UI
+         * @param {Object[]} [args.enum] List of fixed choices for field, defined as array of objects, where key in object is a title of an option
+         * @example
+         * PlayerController.attributes.add('fullName', {
+         *     type: 'string',
+         * });
+         * @example
+         * PlayerController.attributes.add('speed', {
+         *     type: 'number',
+         *     title: 'Speed',
+         *     placeholder: 'km/h',
+         *     default: 22.2
+         * });
+         * @example
+         * PlayerController.attributes.add('resolution', {
+         *     type: 'number',
+         *     default: 32,
+         *     enum: [
+         *        { '32x32': 32 },
+         *        { '64x64': 64 },
+         *        { '128x128': 128 }
+         *     ]
+         * });
+         */
+        add(name: string, args: AttributesArgs): void;
+
+        /**
+         * @function
+         * @name pc.ScriptAttributes#remove
+         * @description Remove Attribute.
+         * @param {String} name Name of an attribute
+         * @returns {Boolean} True if removed or false if not defined
+         * @example
+         * PlayerController.attributes.remove('fullName');
+         */
+        remove(name: string): boolean;
+
+        /**
+         * @function
+         * @name pc.ScriptAttributes#has
+         * @description Detect if Attribute is added.
+         * @param {String} name Name of an attribute
+         * @returns {Boolean} True if Attribute is defined
+         * @example
+         * if (PlayerController.attributes.has('fullName')) {
+         *     // attribute `fullName` is defined
+         * });
+         */
+        has(name: string): boolean;
+
+        /**
+         * @function
+         * @name pc.ScriptAttributes#get
+         * @description Get object with attribute arguments.
+         * Note: Changing argument properties will not affect existing Script Instances.
+         * @param {String} name Name of an attribute
+         * @returns {?Object} Arguments with attribute properties
+         * @example
+         * // changing default value for an attribute 'fullName'
+         * var attr = PlayerController.attributes.get('fullName');
+         * if (attr) attr.default = 'Unknown';
+         */
+        get(name: string): AttributesArgs;
+    }
+
+    /**
+    * @static
+    * @function
+    * @name pc.createScript
+    * @description Method to create named {@link ScriptType}.
+    * It returns new function (class) "Script Type", which is auto-registered to {@link pc.ScriptRegistry} using it's name.
+    * This is the main interface to create Script Types, to define custom logic using JavaScript, that is used to create interaction for entities.
+    * @param {String} name unique Name of a Script Type.
+    * If a Script Type with the same name has already been registered and the new one has a `swap` method defined in its prototype,
+    * then it will perform hot swapping of existing Script Instances on entities using this new Script Type.
+    * Note: There is a reserved list of names that cannot be used, such as list below as well as some starting from `_` (underscore):
+    * system, entity, create, destroy, swap, move, scripts, onEnable, onDisable, onPostStateChange, has, on, off, fire, once, hasEvent
+    * @param {pc.Application} [app] Optional application handler, to choose which {@link pc.ScriptRegistry} to add a script to.
+    * By default it will use `pc.Application.getApplication()` to get current {@link pc.Application}.
+    * @returns {Function} The constructor of a {@link ScriptType}, which the developer is meant to extend by adding attributes and prototype methods.
+    * @example
+    * var Turning = pc.createScript('turn');
+    *
+    * // define `speed` attribute that is available in Editor UI
+    * Turning.attributes.add('speed', {
+    *     type: 'number',
+    *     default: 180,
+    *     placeholder: 'deg/s'
+    * });
+    *
+    * // runs every tick
+    * Turning.prototype.update = function(dt) {
+    *     this.entity.rotate(0, this.speed * dt, 0);
+    * };
+    */
+    function createScript<Instance extends ScriptType, Class extends ScriptTypeConstructor<Instance>>(name: string, app?: pc.Application): Class;
+
+    /**
+    * @name ScriptType
+    * @class Represents the type of a script. It is returned by {@link pc.createScript}. Also referred to as Script Type.<br />
+    * The type is to be extended using its JavaScript prototype. There is a <strong>list of methods</strong>
+    * that will be executed by the engine on instances of this type, such as: <ul><li>initialize</li><li>postInitialize</li><li>update</li><li>postUpdate</li><li>swap</li></ul>
+    * <strong>initialize</strong> and <strong>postInitialize</strong> - are called if defined when script is about to run for the first time - postInitialize will run after all initialize methods are executed in the same tick or enabling chain of actions.<br />
+    * <strong>update</strong> and <strong>postUpdate</strong> - methods are called if defined for enabled (running state) scripts on each tick.<br />
+    * <strong>swap</strong> - This method will be called when a {@link ScriptType} that already exists in the registry gets redefined.
+    * If the new {@link ScriptType} has a `swap` method in its prototype, then it will be executed to perform hot-reload at runtime.
+    * @property {pc.Application} app The {@link pc.Application} that the instance of this type belongs to.
+    * @property {pc.Entity} entity The {@link pc.Entity} that the instance of this type belongs to.
+    * @property {Boolean} enabled True if the instance of this type is in running state. False when script is not running,
+    * because the Entity or any of its parents are disabled or the Script Component is disabled or the Script Instance is disabled.
+    * When disabled no update methods will be called on each tick.
+    * initialize and postInitialize methods will run once when the script instance is in `enabled` state during app tick.
+    */
+    interface ScriptTypeConstructor<S extends ScriptType> {
+        [key: string]: any;
+
+        /**
+         * @private
+         * @readonly
+         * @static
+         * @name ScriptType.__name
+         * @type String
+         * @description Name of a Script Type.
+         */
+        _name: string;
+
+        /**
+         * @field
+         * @static
+         * @readonly
+         * @type pc.ScriptAttributes
+         * @name ScriptType.attributes
+         * @description The interface to define attributes for Script Types. Refer to {@link pc.ScriptAttributes}
+         * @example
+         * var PlayerController = pc.createScript('playerController');
+         *
+         * PlayerController.attributes.add('speed', {
+         *     type: 'number',
+         *     title: 'Speed',
+         *     placeholder: 'km/h',
+         *     default: 22.2
+         * });
+         */
+        attributes: ScriptAttributes;
+
+        /**
+         * @readonly
+         * @static
+         * @function
+         * @name ScriptType.extend
+         * @param {Object} methods Object with methods, where key - is name of method, and value - is function.
+         * @description Shorthand function to extend Script Type prototype with list of methods.
+         * @example
+         * var PlayerController = pc.createScript('playerController');
+         *
+         * PlayerController.extend({
+         *     initialize: function() {
+         *         // called once on initialize
+         *     },
+         *     update: function(dt) {
+         *         // called each tick
+         *     }
+         * })
+         */
+        extend?(methods: { [key: string]: () => any }): void;
+
+        new(args: { app: pc.Application, entity: pc.Entity, enabled?: boolean}): S;
+        readonly prototype: S;
+    }
+
+    interface ScriptType {
+        [key: string]: any;
+        app: pc.Application;
+        entity: pc.Entity;
+        enabled: boolean;
+
+        /**
+         * initialize is called if defined when script is about to run for the first time.
+         * @memberof ScriptType
+         */
+        initialize?(): void;
+
+        /**
+         * postInitialize will run after all initialize methods are executed in the  
+         * same tick or enabling chain of actions.
+         * @memberof ScriptType
+         */
+        postInitialize?(): void;
+
+        /**
+         * update is called if defined for enabled (running state) scripts on each tick.
+         * @param {number} dt 
+         * @memberof ScriptType
+         */
+        update?(dt: number): void;
+
+        /**
+         * postUpdate is called if defined for enabled (running state) scripts on each tick,  
+         * after update.
+         * @memberof ScriptType
+         */
+        postUpdate?(): void;
+
+        /**
+         * This method will be called when a ScriptType that already exists in the registry   
+         * gets redefined. If the new ScriptType has a `swap` method in its prototype, 
+         * then it will be executed to perform hot-reload at runtime. 
+         * @memberof ScriptType
+         */
+        swap?(): void;
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.ScriptType#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.ScriptType#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.ScriptType#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.ScriptType#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.ScriptType#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/scriptype.d.ts b/types/playcanvas/engine/scriptype.d.ts
new file mode 100644
index 0000000000..89fb94c5c4
--- /dev/null
+++ b/types/playcanvas/engine/scriptype.d.ts
@@ -0,0 +1,45 @@
+interface ScriptType {
+    name: string;
+
+    /**
+     * Interface to define public script attributes available in the editor. 
+     * @type {{ [key: string]: pc.AttributesArgs }}
+     * @memberof Script
+     */
+    attributes?: { [key: string]: pc.AttributesArgs };
+
+    /**
+     * initialize is called if defined when script is about to run for the first time.
+     * @memberof ScriptType
+     */
+    initialize?(): void;
+    
+    /**
+     * postInitialize will run after all initialize methods are executed in the  
+     * same tick or enabling chain of actions.
+     * @memberof ScriptType
+     */
+    postInitialize?(): void;
+
+    /**
+     * update is called if defined for enabled (running state) scripts on each tick.
+     * @param {number} dt 
+     * @memberof ScriptType
+     */
+    update?(dt: number): void;
+
+    /**
+     * postUpdate is called if defined for enabled (running state) scripts on each tick,  
+     * after update.
+     * @memberof ScriptType
+     */
+    postUpdate?(): void;
+
+    /**
+     * This method will be called when a ScriptType that already exists in the registry   
+     * gets redefined. If the new ScriptType has a `swap` method in its prototype, 
+     * then it will be executed to perform hot-reload at runtime. 
+     * @memberof ScriptType
+     */
+    swap?(): void;
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/shape/bounding-box.d.ts b/types/playcanvas/engine/shape/bounding-box.d.ts
new file mode 100644
index 0000000000..67340a2246
--- /dev/null
+++ b/types/playcanvas/engine/shape/bounding-box.d.ts
@@ -0,0 +1,87 @@
+declare namespace pc {
+
+    /**
+     * @name pc.BoundingBox
+     * @description Create a new axis-aligned bounding box.
+     * @class Axis-Aligned Bounding Box.
+     * @param {pc.Vec3} [center] Center of box. The constructor takes a reference of this parameter.
+     * @param {pc.Vec3} [halfExtents] Half the distance across the box in each axis. The constructor takes a reference of this parameter.
+     */
+    class BoundingBox {
+        constructor(center?: pc.Vec3, halfExtents?: pc.Vec3)
+
+        center: pc.Vec3;
+        halfExtents: pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#add
+         * @description Combines two bounding boxes into one, enclosing both.
+         * @param {pc.BoundingBox} other Bounding box to add.
+         */
+        add(other: pc.BoundingBox): void;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#intersects
+         * @description Test whether two axis-aligned bounding boxes intersect.
+         * @param {pc.BoundingBox} other Bounding box to test against.
+         * @returns {Boolean} True if there is an intersection.
+         */
+        intersects(other: pc.BoundingBox): boolean;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#intersectsRay
+         * @description Test if a ray intersects with the AABB.
+         * @param {pc.Ray} ray Ray to test against (direction must be normalized).
+         * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here.
+         * @returns {Boolean} True if there is an intersection.
+         */
+        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#getMin
+         * @description Return the minimum corner of the AABB.
+         * @returns {pc.Vec3} minimum corner.
+         */
+        getMin(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#getMax
+         * @description Return the maximum corner of the AABB.
+         * @returns {pc.Vec3} maximum corner.
+         */
+        getMax(): pc.Vec3;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#containsPoint
+         * @description Test if a point is inside a AABB.
+         * @param {pc.Vec3} point Point to test.
+         * @returns {Boolean} true if the point is inside the AABB and false otherwise.
+         */
+        containsPoint(point: pc.Vec3): true;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#setFromTransformedAabb
+         * @description Set an AABB to enclose the specified AABB if it were to be
+         * transformed by the specified 4x4 matrix.
+         * @param {pc.BoundingBox} aabb Box to transform and enclose
+         * @param {pc.Mat4} m Transformation matrix to apply to source AABB.
+         */
+        setFromTransformedAabb(aabb: pc.BoundingBox, m: pc.Mat4): void;
+
+        /**
+         * @function
+         * @name pc.BoundingBox#intersectsBoundingSphere
+         * @description Test if a Bounding Sphere is overlapping, enveloping, or inside this AABB.
+         * @param {pc.BoundingSphere} sphere Bounding Sphere to test.
+         * @returns {Boolean} true if the Bounding Sphere is overlapping, enveloping, or inside the AABB and false otherwise.
+         */
+        intersectsBoundingSphere(sphere: pc.BoundingSphere): void;
+    }
+}
diff --git a/types/playcanvas/engine/shape/bounding-sphere.d.ts b/types/playcanvas/engine/shape/bounding-sphere.d.ts
new file mode 100644
index 0000000000..5fd1c3503f
--- /dev/null
+++ b/types/playcanvas/engine/shape/bounding-sphere.d.ts
@@ -0,0 +1,38 @@
+declare namespace pc {
+
+    /**
+     * @name pc.BoundingSphere
+     * @class A bounding sphere is a volume for facilitating fast intersection testing.
+     * @description Creates a new bounding sphere.
+     * @example
+     * // Create a new bounding sphere centered on the origin with a radius of 0.5
+     * var sphere = new pc.BoundingSphere();
+     * @param {pc.Vec3} [center] The world space coordinate marking the center of the sphere. The constructor takes a reference of this parameter.
+     * @param {Number} [radius] The radius of the bounding sphere. Defaults to 0.5.
+     */
+    class BoundingSphere {
+        constructor(center?: pc.Vec3, radius?: number)
+
+        center: pc.Vec3;
+        radius: number;
+
+        /**
+         * @function
+         * @name pc.BoundingSphere#intersectsRay
+         * @description Test if a ray intersects with the sphere.
+         * @param {pc.Ray} ray Ray to test against (direction must be normalized).
+         * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here.
+         * @returns {Boolean} True if there is an intersection.
+         */
+        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+
+        /**
+         * @function
+         * @name pc.BoundingSphere#intersectsBoundingSphere
+         * @description Test if a Bounding Sphere is overlapping, enveloping, or inside this Bounding Sphere.
+         * @param {pc.BoundingSphere} sphere Bounding Sphere to test.
+         * @returns {Boolean} true if the Bounding Sphere is overlapping, enveloping, or inside this Bounding Sphere and false otherwise.
+         */
+        intersectsBoundingSphere(sphere: pc.BoundingSphere): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/shape/frustum.d.ts b/types/playcanvas/engine/shape/frustum.d.ts
new file mode 100644
index 0000000000..602d17e020
--- /dev/null
+++ b/types/playcanvas/engine/shape/frustum.d.ts
@@ -0,0 +1,50 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Frustum
+     * @class A frustum is a shape that defines the viewing space of a camera.
+     * @description Creates a new frustum shape.
+     * @example
+     * // Create a new frustum equivalent to one held by a camera component
+     * var projectionMatrix = entity.camera.projectionMatrix;
+     * var viewMatrix = entity.camera.viewMatrix;
+     * var frustum = new pc.Frustum(projectionMatrix, viewMatrix);
+     * @param {pc.Mat4} projectionMatrix The projection matrix describing the shape of the frustum.
+     * @param {pc.Mat4} viewMatrix The inverse of the world transformation matrix for the frustum.
+     */
+    class Frustum {
+        constructor(projectionMatrix: pc.Mat4, viewMatrix: pc.Mat4)
+
+        /**
+         * @function
+         * @name pc.Frustum#update
+         * @description Updates the frustum shape based on a view matrix and a projection matrix.
+         * @param {pc.Mat4} projectionMatrix The projection matrix describing the shape of the frustum.
+         * @param {pc.Mat4} viewMatrix The inverse of the world transformation matrix for the frustum.
+         */
+        update(projectionMatrix: pc.Mat4, viewMatrix: pc.Mat4): void;
+
+        /**
+         * @function
+         * @name pc.Frustum#containsPoint
+         * @description Tests whether a point is inside the frustum. Note that points lying in a frustum plane are
+         * considered to be outside the frustum.
+         * @param {pc.Vec3} point The point to test
+         * @returns {Boolean} true if the point is inside the frustum, false otherwise
+         */
+        containsPoint(point: pc.Vec3): boolean;
+
+        /**
+         * @function
+         * @name pc.Frustum#containsSphere
+         * @description Tests whether a bounding sphere intersects the frustum. If the sphere is outside the frustum,
+         * zero is returned. If the sphere intersects the frustum, 1 is returned. If the sphere is completely inside
+         * the frustum, 2 is returned. Note that a sphere touching a frustum plane from the outside is considered to
+         * be outside the frustum.
+         * @param {pc.BoundingSphere} sphere The sphere to test
+         * @returns {Number} 0 if the bounding sphere is outside the frustum, 1 if it intersects the frustum and 2 if
+         * it is contained by the frustum
+         */
+        containsSphere(sphere: pc.BoundingSphere): number;
+    }
+}
diff --git a/types/playcanvas/engine/shape/oriented-box.d.ts b/types/playcanvas/engine/shape/oriented-box.d.ts
new file mode 100644
index 0000000000..47ca9df330
--- /dev/null
+++ b/types/playcanvas/engine/shape/oriented-box.d.ts
@@ -0,0 +1,44 @@
+declare namespace pc {
+
+    /**
+     * @name pc.OrientedBox
+     * @description Create a new oriented box.
+     * @class Oriented Box.
+     * @property {pc.Mat4} [worldTransform] The world transform of the OBB
+     * @param {pc.Mat4} [worldTransform] Transform that has the orientation and position of the box. Scale is assumed to be one.
+     * @param {pc.Vec3} [halfExtents] Half the distance across the box in each local axis. The constructor takes a reference of this parameter.
+     */
+    class OrientedBox {
+        constructor(worldTransform?: pc.Mat4, halfExtents?: pc.Vec3)
+
+        worldTransform: pc.Mat4;
+
+        /**
+         * @function
+         * @name pc.OrientedBox#intersectsRay
+         * @description Test if a ray intersects with the OBB.
+         * @param {pc.Ray} ray Ray to test against (direction must be normalized).
+         * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here.
+         * @returns {Boolean} True if there is an intersection.
+         */
+        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+
+        /**
+         * @function
+         * @name pc.OrientedBox#containsPoint
+         * @description Test if a point is inside a OBB.
+         * @param {pc.Vec3} point Point to test.
+         * @returns {Boolean} true if the point is inside the OBB and false otherwise.
+         */
+        containsPoint(point: pc.Vec3): boolean;
+
+        /**
+         * @function
+         * @name pc.OrientedBox#intersectsBoundingSphere
+         * @description Test if a Bounding Sphere is overlapping, enveloping, or inside this OBB.
+         * @param {pc.BoundingSphere} sphere Bounding Sphere to test.
+         * @returns {Boolean} true if the Bounding Sphere is overlapping, enveloping or inside this OBB and false otherwise.
+         */
+        intersectsBoundingSphere(sphere: pc.BoundingSphere): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/shape/plane.d.ts b/types/playcanvas/engine/shape/plane.d.ts
new file mode 100644
index 0000000000..a7ce142fd6
--- /dev/null
+++ b/types/playcanvas/engine/shape/plane.d.ts
@@ -0,0 +1,35 @@
+declare namespace pc {
+
+    /**
+     * @private
+     * @name pc.Plane
+     * @class An infinite plane.
+     * @description Create an infinite plane.
+     * @param {pc.Vec3} [point] Point position on the plane. The constructor takes a reference of this parameter.
+     * @param {pc.Vec3} [normal] Normal of the plane. The constructor takes a reference of this parameter.
+     */
+    class Plane {
+        constructor(point: pc.Vec3, normal: pc.Vec3)
+
+        /**
+         * @function
+         * @name pc.Plane#intersectsLine
+         * @description Test if the plane intersects between two points.
+         * @param {pc.Vec3} start Start position of line.
+         * @param {pc.Vec3} end End position of line.
+         * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here.
+         * @returns {Boolean} True if there is an intersection.
+         */
+        intersectsLine(start: pc.Vec3, end: pc.Vec3, point?: pc.Vec3): boolean;
+
+        /**
+         * @function
+         * @name pc.Plane#intersectsRay
+         * @description Test if a ray intersects with the infinite plane
+         * @param {pc.Ray} ray Ray to test against (direction must be normalized)
+         * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here
+         * @returns {Boolean} True if there is an intersection
+         */
+        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/shape/ray.d.ts b/types/playcanvas/engine/shape/ray.d.ts
new file mode 100644
index 0000000000..49e133c66c
--- /dev/null
+++ b/types/playcanvas/engine/shape/ray.d.ts
@@ -0,0 +1,22 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Ray
+     * @class An infinite ray
+     * @description Creates a new infinite ray starting at a given origin and pointing in a given direction.
+     * @example
+     * // Create a new ray starting at the position of this entity and pointing down
+     * // the entity's negative Z axis
+     * var ray = new pc.Ray(this.entity.getPosition(), this.entity.forward);
+     * @param {pc.Vec3} [origin] The starting point of the ray. The constructor takes a reference of this parameter.
+     * Defaults to the origin (0, 0, 0).
+     * @param {pc.Vec3} [direction] The direction of the ray. The constructor takes a reference of this parameter.
+     * Defaults to a direction down the world negative Z axis (0, 0, -1).
+     */
+    class Ray {
+        constructor(origin?: pc.Vec3, direction?: pc.Vec3)
+
+        origin: pc.Vec3;
+        direction: pc.Vec3;
+    }
+}
diff --git a/types/playcanvas/engine/sound/instance.d.ts b/types/playcanvas/engine/sound/instance.d.ts
new file mode 100644
index 0000000000..5eedb279d9
--- /dev/null
+++ b/types/playcanvas/engine/sound/instance.d.ts
@@ -0,0 +1,260 @@
+declare namespace pc {
+
+    /**
+    * @name pc.SoundInstance
+    * @class A pc.SoundInstance plays a {@link pc.Sound}
+    * @param {pc.SoundManager} manager The sound manager
+    * @param {pc.Sound} sound The sound to play
+    * @param {Object} options Options for the instance
+    * @param {Number} [options.volume=1] The playback volume, between 0 and 1.
+    * @param {Number} [options.pitch=1] The relative pitch, default of 1, plays at normal pitch.
+    * @param {Boolean} [options.loop=false] Whether the sound should loop when it reaches the end or not.
+    * @param {Number} [options.startTime=0] The time from which the playback will start. Default is 0 to start at the beginning.
+    * @param {Number} [options.duration=null] The total time after the startTime when playback will stop or restart if loop is true.
+    * @param {Function} [options.onPlay=null] Function called when the instance starts playing.
+    * @param {Function} [options.onPause=null] Function called when the instance is paused.
+    * @param {Function} [options.onResume=null] Function called when the instance is resumed.
+    * @param {Function} [options.onStop=null] Function called when the instance is stopped.
+    * @param {Function} [options.onEnd=null] Function called when the instance ends.
+    * @property {Number} volume The volume modifier to play the sound with. In range 0-1.
+    * @property {Number} pitch The pitch modifier to play the sound with. Must be larger than 0.01
+    * @property {Number} startTime The start time from which the sound will start playing.
+    * @property {Number} currentTime Gets or sets the current time of the sound that is playing. If the value provided is bigger than the duration of the instance it will wrap from the beginning.
+    * @property {Number} duration The duration of the sound that the instance will play starting from startTime.
+    * @property {Boolean} loop If true the instance will restart when it finishes playing
+    * @property {Boolean} isPlaying Returns true if the instance is currently playing.
+    * @property {Boolean} isPaused Returns true if the instance is currently paused.
+    * @property {Boolean} isStopped Returns true if the instance is currently stopped.
+    * @property {Boolean} isSuspended Returns true if the instance is currently suspended because the window is not focused.
+    * @property {AudioBufferSourceNode} source Gets the source that plays the sound resource. If the Web Audio API is not supported the type of source is <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/audio" target="_blank">Audio</a>. Source is only available after calling play.
+    * @property {pc.Sound} sound The sound resource that the instance will play.
+    */
+    class SoundInstance {
+        constructor(manager: pc.SoundManager, sound: pc.Sound, options: {
+            volume?: number;
+            pitch?: number;
+            loop?: boolean;
+            startTime?: number;
+            duration?: number;
+            onPlay?: Function;
+            onPause?: Function;
+            onResume?: Function;
+            onStop?: Function;
+            onEnd?: Function;
+        })
+
+        volume: number;
+        pitch: number;
+        startTime: number;
+        currentTime: number;
+        duration: number;
+        loop: boolean;
+        isPlaying: boolean;
+        isPaused: boolean;
+        isStopped: boolean;
+        isSuspended: boolean;
+        source: AudioBufferSourceNode;
+        sound: pc.Sound;
+
+        /**
+         * @function
+         * @private
+         * @name pc.SoundInstance#_initializeNodes
+         * @description Creates internal audio nodes and connects them
+         */
+        private _initializeNodes(): void;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#play
+         * @description Begins playback of sound. If the sound is not loaded this will return false.
+         * If the sound is already playing this will restart the sound.
+         * @returns {Boolean} True if the sound was started.
+         */
+        play(): boolean;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#pause
+         * @description Pauses playback of sound. Call resume() to resume playback from the same position.
+         * @returns {Boolean} Returns true if the sound was paused
+         */
+        pause(): boolean;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#resume
+         * @description Resumes playback of the sound. Playback resumes at the point that the audio was paused
+         * @returns {Boolean} Returns true if the sound was resumed.
+         */
+        resume(): void;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#stop
+         * @description Stops playback of sound. Calling play() again will restart playback from the beginning of the sound.
+         */
+        stop(): boolean;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#setExternalNodes
+         * @description Connects external Web Audio API nodes. You need to pass
+         * the first node of the node graph that you created externally and the last node of that graph. The first
+         * node will be connected to the audio source and the last node will be connected to the destination of the
+         * AudioContext (e.g. speakers). Requires Web Audio API support.
+         * @param {AudioNode} firstNode The first node that will be connected to the audio source of sound instances.
+         * @param {AudioNode} [lastNode] The last node that will be connected to the destination of the AudioContext.
+         * If unspecified then the firstNode will be connected to the destination instead.
+         * @example
+         * var context = app.systems.sound.context;
+         * var analyzer = context.createAnalyzer();
+         * var distortion = context.createWaveShaper();
+         * var filter = context.createBiquadFilter();
+         * analyzer.connect(distortion);
+         * distortion.connect(filter);
+         * instance.setExternalNodes(analyzer, filter);
+         */
+        setExternalNodes(firstNode: AudioNode, lastNode?: AudioNode): void;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#clearExternalNodes
+         * @description Clears any external nodes set by {@link pc.SoundInstance#setExternalNodes}.
+         */
+        clearExternalNodes(): void;
+
+
+        /**
+         * @function
+         * @name pc.SoundInstance#getExternalNodes
+         * @description Gets any external nodes set by {@link pc.SoundInstance#setExternalNodes}.
+         * @return {AudioNode[]} Returns an array that contains the two nodes set by {@link pc.SoundInstance#setExternalNodes}.
+         */
+        getExternalNodes(): AudioNode[];
+
+        /**
+         * @private
+         * @function
+         * @description Creates the source for the instance
+         */
+
+        private _createSource(): AudioBufferSourceNode;
+
+        /**
+        * @private
+        * @function
+        * @name pc.SoundInstance#_updateCurrentTime
+        * @description Sets the current time taking into account the time the instance started playing, the current pitch and the current time offset.
+        */
+        private _updateCurrentTime(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.SoundInstance#_onManagerDestroy
+         * @description Handle the manager's 'destroy' event.
+         */
+        private _onManagerDestroy(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.SoundInstance#_onManagerVolumeChange
+         * @description Handle the manager's 'volumechange' event.
+         */
+        private _onManagerVolumeChange(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.SoundInstance#_onManagerSuspend
+         * @description Handle the manager's 'suspend' event.
+         */
+        private _onManagerSuspend(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.SoundInstance#_onManagerResume
+         * @description Handle the manager's 'resume' event.
+         */
+        private _onManagerResume(): void;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.SoundInstance#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.SoundInstance#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.SoundInstance#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/engine/sound/instance3d.d.ts b/types/playcanvas/engine/sound/instance3d.d.ts
new file mode 100644
index 0000000000..83cc6ca662
--- /dev/null
+++ b/types/playcanvas/engine/sound/instance3d.d.ts
@@ -0,0 +1,48 @@
+declare namespace pc {
+
+    /**
+    * @name pc.SoundInstance3d
+    * @extends pc.SoundInstance
+    * @class A pc.SoundInstance3d plays a {@link pc.Sound} in 3D
+    * @param {pc.SoundManager} manager The sound manager
+    * @param {pc.Sound} sound The sound to play
+    * @param {Object} options Options for the instance
+    * @param {Number} [options.volume=1] The playback volume, between 0 and 1.
+    * @param {Number} [options.pitch=1] The relative pitch, default of 1, plays at normal pitch.
+    * @param {Boolean} [options.loop=false] Whether the sound should loop when it reaches the end or not.
+    * @param {Number} [options.startTime=0] The time from which the playback will start. Default is 0 to start at the beginning.
+    * @param {Number} [options.duration=null] The total time after the startTime when playback will stop or restart if loop is true.
+    * @param {pc.Vec3} [options.position=null] The position of the sound in 3D space.
+    * @param {pc.Vec3} [options.velocity=null] The velocity of the sound.
+    * @param {String} [options.distanceModel=pc.DISTANCE_LINEAR] Determines which algorithm to use to reduce the volume of the audio as it moves away from the listener. Can be one of {@link pc.DISTANCE_LINEAR}, {@link pc.DISTANCE_INVERSE} or {@link pc.DISTANCE_EXPONENTIAL}. Default is {@link pc.DISTANCE_LINEAR}.
+    * @param {Number} [options.refDistance=1] The reference distance for reducing volume as the sound source moves further from the listener.
+    * @param {Number} [options.maxDistance=10000] The maximum distance from the listener at which audio falloff stops. Note the volume of the audio is not 0 after this distance, but just doesn't fall off anymore.
+    * @param {Number} [options.rollOffFactor=1] The factor used in the falloff equation.
+    * @property {pc.Vec3} position The position of the sound in 3D space.
+    * @property {pc.Vec3} velocity The velocity of the sound.
+    * @property {String} distanceModel Determines which algorithm to use to reduce the volume of the audio as it moves away from the listener. Can be one of {@link pc.DISTANCE_LINEAR}, {@link pc.DISTANCE_INVERSE} or {@link pc.DISTANCE_EXPONENTIAL}. Default is {@link pc.DISTANCE_LINEAR}.        * @property {Number} refDistance The reference distance for reducing volume as the sound source moves further from the listener.
+    * @property {Number} maxDistance The maximum distance from the listener at which audio falloff stops. Note the volume of the audio is not 0 after this distance, but just doesn't fall off anymore.
+    * @property {Number} rollOffFactor The factor used in the falloff equation.
+    */
+    class SoundInstance3d extends SoundInstance {
+        constructor(manager: pc.SoundManager, sound: pc.Sound, options: {
+            volume?: number;
+            pitch?: number;
+            loop?: boolean;
+            startTime?: number;
+            duration?: number;
+            position?: pc.Vec3;
+            velocity?: pc.Vec3;
+            distanceModel?: string;
+            refDistance: number;
+            maxDistance: number;
+            rollOffFactor: number;
+        })
+
+        position: pc.Vec3;
+        velocity: pc.Vec3;
+        distanceModel: string;
+        maxDistance: number;
+        rollOffFactor: number;
+    }
+}
diff --git a/types/playcanvas/engine/sound/listener.d.ts b/types/playcanvas/engine/sound/listener.d.ts
new file mode 100644
index 0000000000..790e0b3034
--- /dev/null
+++ b/types/playcanvas/engine/sound/listener.d.ts
@@ -0,0 +1,11 @@
+declare namespace pc {
+
+    /**
+     * @name pc.Listener
+     * @class Represents an audio listener - used internally.
+     * @param {pc.SoundManager} manager The sound manager
+     */
+    class Listener {
+        constructor(manager: pc.SoundManager)
+    }
+}
diff --git a/types/playcanvas/engine/sound/manager.d.ts b/types/playcanvas/engine/sound/manager.d.ts
new file mode 100644
index 0000000000..5892e5e13a
--- /dev/null
+++ b/types/playcanvas/engine/sound/manager.d.ts
@@ -0,0 +1,62 @@
+declare namespace pc {
+
+    /**
+     * @name pc.SoundManager
+     * @class The SoundManager is used to load and play audio. As well as apply system-wide settings
+     * like global volume, suspend and resume.
+     * @description Creates a new sound manager.
+     * @param {Object} [options]
+     * @param {Boolean} [options.forceWebAudioApi] Always use the Web Audio API even check indicates that it if not available
+     * @property {pc.Listener} listener Gets / sets the audio listener
+     * @property {Number} volume Global volume for the manager. All {@link pc.SoundInstance}s will scale their volume with this volume. Valid between [0, 1].
+     */
+    class SoundManager {
+        constructor(options: { forceWebAudioApi: boolean })
+
+        listener: pc.Listener;
+        volume: number;
+
+        /**
+         * @private
+         * @function
+         * @name pc.SoundManager.hasAudio
+         * @description Reports whether this device supports the HTML5 Audio tag API
+         * @returns true if HTML5 Audio tag API is supported and false otherwise
+         */
+        private hasAudio(): boolean;
+
+        /**
+         * @private
+         * @function
+         * @name pc.SoundManager.hasAudioContext
+         * @description Reports whether this device supports the Web Audio API
+         * @returns true if Web Audio is supported and false otherwise
+         */
+        private hasAudioContext(): boolean;
+
+        /**
+        * @private
+        * @function
+        * @name pc.SoundManager#playSound
+        * @description Create a new pc.Channel and begin playback of the sound.
+        * @param {pc.Sound} sound The Sound object to play.
+        * @param {Object} options
+        * @param {Number} [options.volume] The volume to playback at, between 0 and 1.
+        * @param {Boolean} [options.loop] Whether to loop the sound when it reaches the end.
+        */
+        private playSound(sound: pc.Sound, options: { volume: number, loop: boolean }): pc.Channel;
+
+        /**
+        * @private
+        * @function
+        * @name pc.SoundManager#playSound3d
+        * @description Create a new pc.Channel3d and begin playback of the sound at the position specified
+        * @param {pc.Sound} sound The Sound object to play.
+        * @param {pc.Vec3} position The position of the sound in 3D space.
+        * @param {Object} options
+        * @param {Number} [options.volume] The volume to playback at, between 0 and 1.
+        * @param {Boolean} [options.loop] Whether to loop the sound when it reaches the end.
+        */
+        private playSound3d(sound: pc.Sound, position: pc.Vec3, options: { volume: number, loop: boolean }): pc.Channel3d;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/sound/sound.d.ts b/types/playcanvas/engine/sound/sound.d.ts
new file mode 100644
index 0000000000..347d382e3a
--- /dev/null
+++ b/types/playcanvas/engine/sound/sound.d.ts
@@ -0,0 +1,17 @@
+declare namespace pc {
+
+    /**
+    * @name pc.Sound
+    * @class Represents the resource of an audio asset.
+    * @property {AudioBuffer} buffer If the Web Audio API is supported this contains the audio data
+    * @property {Audio} audio If the Web Audio API is not supported this contains the audio data
+    * @property {Number} duration Returns the duration of the sound. If the sound is not loaded it returns 0.
+    */
+    class Sound {
+        constructor(resource: HTMLAudioElement | AudioBuffer)
+
+        buffer?: AudioBuffer;
+        audio?: HTMLAudioElement;
+        duration: number;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/vr/vr-display.d.ts b/types/playcanvas/engine/vr/vr-display.d.ts
new file mode 100644
index 0000000000..a39562c143
--- /dev/null
+++ b/types/playcanvas/engine/vr/vr-display.d.ts
@@ -0,0 +1,101 @@
+type NativeVRDisplay = typeof VRDisplay;
+type NativeVRDisplayCapabilities = typeof VRDisplayCapabilities;
+
+declare namespace pc {
+
+    /**
+     * @name pc.VrDisplay
+     * @class Represents a single Display for VR content. This could be a Head Mounted display that can present content on a separate screen
+     * or a phone which can display content full screen on the same screen. This object contains the native `navigator.VRDisplay` object
+     * from the WebVR API.
+     * @description Represents a single Display for VR content. This could be a Head Mounted display that can present content on a separate screen
+     * or a phone which can display content full screen on the same screen. This object contains the native `navigator.VRDisplay` object
+     * from the WebVR API.
+     * @property {Number} id An identifier for this distinct VRDisplay
+     * @property {VRDisplay} display The native VRDisplay object from the WebVR API
+     * @property {Boolean} presenting True if this display is currently presenting VR content
+     * @property {VRDisplayCapabilities} capabilities Returns the <a href="https://w3c.github.io/webvr/#interface-vrdisplaycapabilities" target="_blank">VRDisplayCapabilities</a> object from the VRDisplay.
+     * This can be used to determine what features are available on this display.
+     * @returns {pc.VrDisplay} A new pc.VrDisplay.
+     */
+    class VrDisplay {
+        constructor(app: pc.Application, display: NativeVRDisplay)
+
+        id: number;
+        display: NativeVRDisplay;
+        presenting: boolean;
+        capabilities: NativeVRDisplayCapabilities;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#destroy
+        * @description Destroy this display object
+        */
+        destroy(): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#poll
+        * @description Called once per frame to update the current status from the display. Usually called by {@link pc.VrManager}.
+        */
+        poll(): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#requestPresent
+        * @description Try to present full screen VR content on this display
+        * @param {Function} callback Called when the request is completed. Callback takes a single argument (err) that is the error message return
+        * if presenting fails, or null if the call succeeds. Usually called by {@link pc.CameraComponent#enterVr}.
+        */
+        requestPresent(callback: Function): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#exitPresent
+        * @description Try to stop presenting VR content on this display
+        * @param {Function} callback Called when the request is completed. Callback takes a single argument (err) that is the error message return
+        * if presenting fails, or null if the call succeeds. Usually called by {@link pc.CameraComponent#exitVr}.
+        */
+        exitPresent(callback: Function): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#requestAnimationFrame
+        * @description Used in the main application loop instead of the regular `window.requestAnimationFrame`. Usually only called from inside {@link pc.Application}
+        * @param {Function} fn Function called when it is time to update the frame.
+        */
+        requestAnimationFrame(fn: Function): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#submitFrame
+        * @description Called when animation update is complete and the frame is ready to be sent to the display. Usually only called from inside {@link pc.Application}.
+        */
+        submitFrame(): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#reset
+        * @description Called to reset the pose of the pc.VrDisplay. Treating its current pose as the origin/zero. This should only be called in 'sitting' experiences.
+        */
+        reset(): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#setClipPlanes
+        * @description Set the near and far depth plans of the display. This enables mapping of values in the
+        * render target depth attachment to scene coordinates
+        * @param {Number} n The near depth distance
+        * @param {Number} f The far depth distance
+        */
+        setClipPlanes(n: number, f: number): void;
+
+        /**
+        * @function
+        * @name pc.VrDisplay#getFrameData
+        * @description Return the current frame data that is updated during polling.
+        * @returns {VRFrameData} The frame data object
+        */
+        getFrameData(): void;    
+    }
+}
diff --git a/types/playcanvas/engine/vr/vr-manager.d.ts b/types/playcanvas/engine/vr/vr-manager.d.ts
new file mode 100644
index 0000000000..b410c15045
--- /dev/null
+++ b/types/playcanvas/engine/vr/vr-manager.d.ts
@@ -0,0 +1,111 @@
+declare namespace pc {
+
+    /**
+     * @name pc.VrManager
+     * @class Manage and update {@link pc.VrDisplay}s that are attached to this device.
+     * @description Manage and update {@link pc.VrDisplay}s that are attached to this device.
+     * @param {pc.Application} app The main application
+     * @property {pc.VrDisplay[]} displays The list of {@link pc.VrDisplay}s that are attached to this device
+     * @property {pc.VrDisplay} display The default {@link pc.VrDisplay} to be used. Usually the first in the `displays` list
+     * @property {Boolean} isSupported Reports whether this device supports the WebVR API
+     * @property {Boolean} usesPolyfill Reports whether this device supports the WebVR API using a polyfill
+     */
+    class VrManager {
+        constructor(app: pc.Application)
+
+        displays: pc.VrDisplay[];
+        display: pc.VrDisplay;
+        static isSupported: boolean;
+        static usesPolyfill: boolean;
+
+        /**
+         * @function
+         * @name pc.VrManager#destroy
+         * @description Remove events and clear up manager
+         */
+        destroy(): void;
+
+        /**
+         * @function
+         * @name pc.VrManager#poll
+         * @description Called once per frame to poll all attached displays
+         */
+        poll(): void;
+
+
+        // Events
+
+        /**
+         * @function
+         * @name pc.VrManager#on
+         * @description Attach an event handler to an event
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.on('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         */
+        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.VrManager#off
+         * @description Detach an event handler from an event. If callback is not provided then all callbacks are unbound from the event,
+         * if scope is not provided then all events with the callback will be unbound.
+         * @param {String} [name] Name of the event to unbind
+         * @param {Function} [callback] Function to be unbound
+         * @param {Object} [scope] Scope that was used as the this when the event is fired
+         * @example
+         * var handler = function () {
+         * };
+         * obj.on('test', handler);
+         *
+         * obj.off(); // Removes all events
+         * obj.off('test'); // Removes all events called 'test'
+         * obj.off('test', handler); // Removes all handler functions, called 'test'
+         * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
+         */
+        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+         * @function
+         * @name pc.VrManager#fire
+         * @description Fire an event, all additional arguments are passed on to the event listener
+         * @param {Object} name Name of event to fire
+         * @param {*} [...] Arguments that are passed to the event handler
+         * @example
+         * obj.fire('test', 'This is the message');
+         */
+        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+
+        /**
+         * @function
+         * @name pc.VrManager#once
+         * @description Attach an event handler to an event. This handler will be removed after being fired once.
+         * @param {String} name Name of the event to bind the callback to
+         * @param {Function} callback Function that is called when event is fired. Note the callback is limited to 8 arguments.
+         * @param {Object} [scope] Object to use as 'this' when the event is fired, defaults to current this
+         * @example
+         * obj.once('test', function (a, b) {
+         *     console.log(a + b);
+         * });
+         * obj.fire('test', 1, 2); // prints 3 to the console
+         * obj.fire('test', 1, 2); // not going to get handled
+         */
+        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+
+        /**
+        * @function
+        * @name pc.VrManager#hasEvent
+        * @description Test if there are any handlers bound to an event name
+        * @param {String} name The name of the event to test
+        * @example
+        * obj.on('test', function () { }); // bind an event to 'test'
+        * obj.hasEvent('test'); // returns true
+        */
+        hasEvent(name: string): boolean;
+    }
+}
diff --git a/types/playcanvas/index.d.ts b/types/playcanvas/index.d.ts
new file mode 100644
index 0000000000..03899cd1b9
--- /dev/null
+++ b/types/playcanvas/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for playcanvas 0.221
+// Project: https://github.com/playcanvas/engine
+// Definitions by: Philippe Vaillancourt <https://github.com/Neoflash1979>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./engine/scriptype.d.ts" />
+/// <reference path="./engine/core/debug.d.ts" />
+/// <reference path="./engine/core/color.d.ts" />
+/// <reference path="./engine/core/core.d.ts" />
+/// <reference path="./engine/core/events.d.ts" />
+/// <reference path="./engine/core/log.d.ts" />
+/// <reference path="./engine/core/guid.d.ts" />
+/// <reference path="./engine/core/inheritance.d.ts" />
+/// <reference path="./engine/core/path.d.ts" />
+/// <reference path="./engine/core/platform.d.ts" />
+/// <reference path="./engine/core/time.d.ts" />
+/// <reference path="./engine/core/tags.d.ts" />
+/// <reference path="./engine/core/string.d.ts" />
+/// <reference path="./engine/core/uri.d.ts" />
+/// <reference path="./engine/anim/skeleton.d.ts" />
+/// <reference path="./engine/anim/animation.d.ts" />
+/// <reference path="./engine/audio/channel.d.ts" />
+/// <reference path="./engine/audio/channel3d.d.ts" />
+/// <reference path="./engine/asset/asset-registry.d.ts" />
+/// <reference path="./engine/asset/asset.d.ts" />
+/// <reference path="./engine/graphics/device.d.ts" />
+/// <reference path="./engine/graphics/index-buffer.d.ts" />
+/// <reference path="./engine/graphics/graphics.d.ts" />
+/// <reference path="./engine/graphics/post-effect.d.ts" />
+/// <reference path="./engine/graphics/program-library.d.ts" />
+/// <reference path="./engine/graphics/shader.d.ts" />
+/// <reference path="./engine/graphics/render-target.d.ts" />
+/// <reference path="./engine/graphics/texture.d.ts" />
+/// <reference path="./engine/graphics/vertex-buffer.d.ts" />
+/// <reference path="./engine/graphics/transform-feedback.d.ts" />
+/// <reference path="./engine/graphics/vertex-format.d.ts" />
+/// <reference path="./engine/graphics/vertex-iterator.d.ts" />
+/// <reference path="./engine/input/controller.d.ts" />
+/// <reference path="./engine/input/element-input.d.ts" />
+/// <reference path="./engine/input/game-pads.d.ts" />
+/// <reference path="./engine/input/input.d.ts" />
+/// <reference path="./engine/input/keyboard.d.ts" />
+/// <reference path="./engine/input/mouse.d.ts" />
+/// <reference path="./engine/input/touch.d.ts" />
+/// <reference path="./engine/math/curve-set.d.ts" />
+/// <reference path="./engine/math/curve.d.ts" />
+/// <reference path="./engine/math/mat3.d.ts" />
+/// <reference path="./engine/math/mat4.d.ts" />
+/// <reference path="./engine/math/math.d.ts" />
+/// <reference path="./engine/math/quat.d.ts" />
+/// <reference path="./engine/math/vec2.d.ts" />
+/// <reference path="./engine/math/vec3.d.ts" />
+/// <reference path="./engine/math/vec4.d.ts" />
+/// <reference path="./engine/net/http.d.ts" />
+/// <reference path="./engine/resources/css.d.ts" />
+/// <reference path="./engine/resources/loader.d.ts" />
+/// <reference path="./engine/resources/script.d.ts" />
+/// <reference path="./engine/resources/model.d.ts" />
+/// <reference path="./engine/script/script-registry.d.ts" />
+/// <reference path="./engine/script/script.d.ts" />
+/// <reference path="./engine/shape/bounding-box.d.ts" />
+/// <reference path="./engine/shape/bounding-sphere.d.ts" />
+/// <reference path="./engine/shape/oriented-box.d.ts" />
+/// <reference path="./engine/shape/frustum.d.ts" />
+/// <reference path="./engine/shape/plane.d.ts" />
+/// <reference path="./engine/shape/ray.d.ts" />
+/// <reference path="./engine/scene/basic-material.d.ts" />
+/// <reference path="./engine/scene/batching.d.ts" />
+/// <reference path="./engine/scene/graph-node.d.ts" />
+/// <reference path="./engine/scene/camera.d.ts" />
+/// <reference path="./engine/scene/lightmapper.d.ts" />
+/// <reference path="./engine/scene/material.d.ts" />
+/// <reference path="./engine/scene/mesh.d.ts" />
+/// <reference path="./engine/scene/model.d.ts" />
+/// <reference path="./engine/scene/pick.d.ts" />
+/// <reference path="./engine/scene/scene.d.ts" />
+/// <reference path="./engine/scene/procedural.d.ts" />
+/// <reference path="./engine/scene/skin.d.ts" />
+/// <reference path="./engine/scene/standard-material.d.ts" />
+/// <reference path="./engine/sound/instance.d.ts" />
+/// <reference path="./engine/sound/instance3d.d.ts" />
+/// <reference path="./engine/sound/manager.d.ts" />
+/// <reference path="./engine/sound/listener.d.ts" />
+/// <reference path="./engine/sound/sound.d.ts" />
+/// <reference path="./engine/vr/vr-display.d.ts" />
+/// <reference path="./engine/vr/vr-manager.d.ts" />
+/// <reference path="./engine/framework/entity.d.ts" />
+/// <reference path="./engine/framework/application.d.ts" />
+/// <reference path="./engine/framework/script.d.ts" />
+/// <reference path="./engine/framework/components/component.d.ts" />
+/// <reference path="./engine/framework/components/data.d.ts" />
+/// <reference path="./engine/framework/components/registry.d.ts" />
+/// <reference path="./engine/framework/components/system.d.ts" />
+/// <reference path="./engine/framework/components/animation/component.d.ts" />
+/// <reference path="./engine/framework/components/animation/system.d.ts" />
+/// <reference path="./engine/framework/components/audio-listener/component.d.ts" />
+/// <reference path="./engine/framework/components/audio-listener/system.d.ts" />
+/// <reference path="./engine/framework/components/audio-source/component.d.ts" />
+/// <reference path="./engine/framework/components/audio-source/system.d.ts" />
+/// <reference path="./engine/framework/components/collision/system.d.ts" />
+/// <reference path="./engine/framework/components/collision/component.d.ts" />
+/// <reference path="./engine/framework/components/element/component.d.ts" />
+/// <reference path="./engine/framework/components/element/system.d.ts" />
+/// <reference path="./engine/framework/components/model/component.d.ts" />
+/// <reference path="./engine/framework/components/model/system.d.ts" />
+/// <reference path="./engine/framework/components/light/component.d.ts" />
+/// <reference path="./engine/framework/components/light/system.d.ts" />
+/// <reference path="./engine/framework/components/camera/component.d.ts" />
+/// <reference path="./engine/framework/components/camera/post-effect-queue.d.ts" />
+/// <reference path="./engine/framework/components/camera/system.d.ts" />
+/// <reference path="./engine/framework/components/particle-system/component.d.ts" />
+/// <reference path="./engine/framework/components/particle-system/system.d.ts" />
+/// <reference path="./engine/framework/components/rigid-body.d.ts/component.d.ts" />
+/// <reference path="./engine/framework/components/rigid-body.d.ts/constants.d.ts" />
+/// <reference path="./engine/framework/components/rigid-body.d.ts/system.d.ts" />
+/// <reference path="./engine/framework/components/screen/component.d.ts" />
+/// <reference path="./engine/framework/components/screen/system.d.ts" />
+/// <reference path="./engine/framework/components/script/component.d.ts" />
+/// <reference path="./engine/framework/components/script/system.d.ts" />
+/// <reference path="./engine/framework/components/text/font.d.ts" />
+/// <reference path="./engine/framework/components/sound/component.d.ts" />
+/// <reference path="./engine/framework/components/sound/constants.d.ts" />
+/// <reference path="./engine/framework/components/sound/system.d.ts" />
+/// <reference path="./engine/framework/components/sound/slot.d.ts" />
+/// <reference path="./engine/framework/components/zone/component.d.ts" />
+/// <reference path="./engine/framework/components/zone/system.d.ts" />
diff --git a/types/playcanvas/playcanvas-tests.ts b/types/playcanvas/playcanvas-tests.ts
new file mode 100644
index 0000000000..95f0721dd6
--- /dev/null
+++ b/types/playcanvas/playcanvas-tests.ts
@@ -0,0 +1,43 @@
+// create a PlayCanvas application
+const canvas = document.getElementById('application') as HTMLCanvasElement;
+const app = new pc.Application(canvas, { });
+app.start();
+
+// fill the available space at full resolution
+app.setCanvasFillMode(pc.FILLMODE_FILL_WINDOW);
+app.setCanvasResolution(pc.RESOLUTION_AUTO);
+
+// ensure canvas is resized when window changes size
+window.addEventListener('resize', () => {
+    app.resizeCanvas();
+});
+
+// create box entity
+const cube = new pc.Entity('cube');
+cube.addComponent('model', {
+    type: 'box'
+});
+
+// create camera entity
+const camera = new pc.Entity('camera');
+camera.addComponent('camera', {
+    clearColor: new pc.Color(0.1, 0.1, 0.1)
+});
+
+// create directional light entity
+const light = new pc.Entity('light');
+light.addComponent('light');
+
+// add to hierarchy
+app.root.addChild(cube);
+app.root.addChild(camera);
+app.root.addChild(light);
+
+// set up initial positions and orientations
+camera.setPosition(0, 0, 3);
+light.setEulerAngles(45, 0, 0);
+
+// register a global update event
+app.on('update', deltaTime => {
+    cube.rotate(10 * deltaTime, 20 * deltaTime, 30 * deltaTime);
+});
diff --git a/types/playcanvas/tsconfig.json b/types/playcanvas/tsconfig.json
new file mode 100644
index 0000000000..a2a2c895a0
--- /dev/null
+++ b/types/playcanvas/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "playcanvas-tests.ts"
+    ]
+}
diff --git a/types/playcanvas/tslint.json b/types/playcanvas/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/playcanvas/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/playerframework/tslint.json b/types/playerframework/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/playerframework/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pleasejs/tslint.json b/types/pleasejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pleasejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 863daf8085..81286fe0a4 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -94,23 +94,30 @@ export function downloadImage(root: Root, opts: DownloadImgopts): Promise<string
 // Layout
 export interface Layout {
 	title: string;
+	titlefont: Partial<Font>;
 	autosize: boolean;
 	showlegend: boolean;
-	xaxis: Partial<Axis>;
-	yaxis: Partial<Axis>;
-	yaxis2: Partial<Axis>;
-	yaxis3: Partial<Axis>;
-	yaxis4: Partial<Axis>;
-	yaxis5: Partial<Axis>;
-	yaxis6: Partial<Axis>;
-	yaxis7: Partial<Axis>;
-	yaxis8: Partial<Axis>;
-	yaxis9: Partial<Axis>;
+	paper_bgcolor: Color;
+    plot_bgcolor: Color;
+    separators: string;
+    hidesources: boolean;
+    xaxis: Partial<LayoutAxis>;
+	yaxis: Partial<LayoutAxis>;
+	yaxis2: Partial<LayoutAxis>;
+	yaxis3: Partial<LayoutAxis>;
+	yaxis4: Partial<LayoutAxis>;
+	yaxis5: Partial<LayoutAxis>;
+	yaxis6: Partial<LayoutAxis>;
+	yaxis7: Partial<LayoutAxis>;
+	yaxis8: Partial<LayoutAxis>;
+	yaxis9: Partial<LayoutAxis>;
 	margin: Partial<Margin>;
 	height: number;
 	width: number;
-	hovermode: "closest" | "x" | "y" | false;
-	'xaxis.range': [Datum, Datum];
+	hovermode: 'closest' | 'x' | 'y' | false;
+	hoverlabel: Partial<Label>;
+	calendar: Calendar;
+    'xaxis.range': [Datum, Datum];
 	'xaxis.range[0]': Datum;
 	'xaxis.range[1]': Datum;
 	'yaxis.range': [Datum, Datum];
@@ -120,45 +127,112 @@ export interface Layout {
 	'xaxis.type': AxisType;
 	'xaxis.autorange': boolean;
 	'yaxis.autorange': boolean;
-	dragmode: "lasso" | "pan" | "select" | "zoom";
+	ternary: {}; // TODO
+    geo: {}; // TODO
+    mapbox: {}; // TODO
+	radialaxis: {}; // TODO
+    angularaxis: {}; // TODO
+    direction: 'clockwise' | 'counterclockwise';
+    dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
+    orientation: number;
+    annotations: {}; // TODO
 	shapes: Array<Partial<Shape>>;
-	legend: Partial<Legend>;
+    images: {}; // TODO
+    updatemenus: {}; // TODO
+    sliders: {}; // TODO
+    legend: Partial<Legend>;
+	font: Partial<Font>;
+	scene: Partial<Scene>;
 }
 
-export interface Legend {
-	traceorder: "grouped" | "normal" | "reversed";
+export interface Legend extends Label {
+	traceorder: 'grouped' | 'normal' | 'reversed';
 	x: number;
 	y: number;
-	font: Partial<Font>;
-	bgcolor: string;
-	bordercolor: string;
 	borderwidth: number;
-	orientation: "v" | "h";
+	orientation: 'v' | 'h';
 	tracegroupgap: number;
 	xanchor: 'auto' | 'left' | 'center' | 'right';
 	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
 }
 
-export type AxisType = "date" | "log" | "linear";
+export type AxisType = '-' | 'linear' | 'log' | 'date' | 'category';
 
 export interface Axis {
-	title: string;
-	showgrid: boolean;
-	fixedrange: boolean;
-	rangemode: "tozero" | 'normal' | 'nonnegative';
-	domain: number[];
-	type: AxisType;
-	tickformat: string;
-	hoverformat: string;
-	rangeslider: Partial<RangeSlider>;
-	rangeselector: Partial<RangeSelector>;
-	range: [Datum, Datum];
-	showticklabels: boolean;
-	autotick: boolean;
-	zeroline: boolean;
-	autorange: boolean | 'reversed';
-	side: "top" | "bottom" | "left" | "right";
-	overlaying: "free" | "/^x([2-9]|[1-9][0-9]+)?$/" | "/^y([2-9]|[1-9][0-9]+)?$/";
+    visible: boolean;
+    color: Color;
+    title: string;
+    titlefont: Partial<Font>;
+    type: AxisType;
+    autorange: true | false | 'reversed';
+    rangemode: 'normal' | 'tozero' | 'nonnegative';
+    range: any[];
+    tickmode: 'auto' | 'linear' | 'array';
+    nticks: number;
+    tick0: number | string;
+    dtick: number | string;
+    tickvals: any[];
+    ticktext: string[];
+    ticks: 'outside' | 'inside' | '';
+    mirror: true | 'ticks' | false | 'all' | 'allticks';
+    ticklen: number;
+    tickwidth: number;
+    tickcolor: Color;
+    showticklabels: boolean;
+    showspikes: boolean;
+    spikecolor: Color;
+    spikethickness: number;
+    categoryorder: 'trace' | 'category ascending' | 'category descending' | 'array';
+    categoryarray: any[];
+    tickfont: Partial<Font>;
+    tickangle: number;
+    tickprefix: string;
+    showtickprefix: 'all' | 'first' | 'last' | 'none';
+    ticksuffix: string;
+    showticksuffix: 'all' | 'first' | 'last' | 'none';
+    showexponent: 'all' | 'first' | 'last' | 'none';
+    exponentformat: 'none' | 'e' | 'E' | 'power' | 'SI' | 'B';
+    separatethousands: boolean;
+    tickformat: string;
+    hoverformat: string;
+    showline: boolean;
+    linecolor: Color;
+    linewidth: number;
+    showgrid: boolean;
+    gridcolor: Color;
+    gridwidth: number;
+    zeroline: boolean;
+    zerolinecolor: Color;
+    zerolinewidth: number;
+    calendar: Calendar;
+}
+
+export type Calendar = 'gregorian' | 'chinese' | 'coptic' | 'discworld' | 'ethiopian' | 'hebrew' | 'islamic' | 'julian' | 'mayan' |
+    'nanakshahi' | 'nepali' | 'persian' | 'jalali' | 'taiwan' | 'thai' | 'ummalqura';
+
+export interface LayoutAxis extends Axis {
+    fixedrange: boolean;
+    scaleanchor: '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    scaleratio: number;
+    constrain: 'range' | 'domain';
+    constraintoward: 'left' | 'center' | 'right' | 'top' | 'middle' | 'bottom';
+    spikedash: string;
+    spikemode: string;
+    anchor: 'free' | '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    side: 'top' | 'bottom' | 'left' | 'right';
+    overlaying: 'free' | '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    layer: 'above traces' | 'below traces';
+    domain: number[];
+    position: number;
+    rangeslider: Partial<RangeSlider>;
+    rangeselector: Partial<RangeSelector>;
+}
+
+export interface SceneAxis extends Axis {
+    spikesides: boolean;
+    showbackground: boolean;
+    backgroundcolor: Color;
+    showaxeslabels: boolean;
 }
 
 export interface ShapeLine {
@@ -210,7 +284,7 @@ export type Color = string | Array<string | undefined | null> | Array<Array<stri
 
 // Bar Scatter
 export interface ScatterData {
-	type: 'bar' | 'scatter' | 'scattergl';
+	type: 'bar' | 'scatter' | 'scattergl' | 'scatter3d';
 	x: Datum[] | Datum[][];
 	y: Datum[] | Datum[][];
 	z: Datum[] | Datum[][] | Datum[][][];
@@ -232,13 +306,13 @@ export interface ScatterData {
 	'marker.maxdisplayed': number;
 	'marker.sizeref': number;
 	'marker.sizemin': number;
-	'marker.sizemode': "diameter" | "area";
+	'marker.sizemode': 'diameter' | 'area';
 	'marker.showscale': boolean;
-	'marker.line': {}; // TODO
+	'marker.line': Partial<ScatterMarkerLine>;
 	'marker.colorbar': {}; // TODO
-	mode: "lines" | "markers" | "text" | "lines+markers" | "text+markers" | "text+lines" | "text+lines+markers" | "none";
-	hoveron: "points" | "fills";
-	hoverinfo: "text";
+	mode: 'lines' | 'markers' | 'text' | 'lines+markers' | 'text+markers' | 'text+lines' | 'text+lines+markers' | 'none';
+	hoveron: 'points' | 'fills';
+	hoverinfo: 'text';
 	fill: 'none' | 'tozeroy' | 'tozerox' | 'tonexty' | 'tonextx' | 'toself' | 'tonext';
 	fillcolor: string;
 	legendgroup: string;
@@ -248,16 +322,34 @@ export interface ScatterData {
 
 export interface ScatterMarker {
 	symbol: string | string[]; // Drawing.symbolList
-	color: Color;
+	color: Color | number[];
+	colorscale: string | string[];
+	cauto: boolean;
+	cmax: boolean;
+	cmin: boolean;
+	autocolorscale: boolean;
+    reversescale: boolean;
 	opacity: number | number[];
 	size: number | number[];
 	maxdisplayed: number;
 	sizeref: number;
 	sizemin: number;
-	sizemode: "diameter" | "area";
+	sizemode: 'diameter' | 'area';
 	showscale: boolean;
-	line: {}; // TODO
+	line: Partial<ScatterMarkerLine>;
 	colorbar: {}; // TODO
+    gradient: {}; // TODO
+}
+
+export interface ScatterMarkerLine {
+    width: number | number[];
+    color: Color;
+    colorscale: string | string[];
+    cauto: boolean;
+    cmax: number;
+    cmin: number;
+    autocolorscale: boolean;
+    reversescale: boolean;
 }
 
 export interface ScatterLine {
@@ -378,16 +470,73 @@ export interface RangeSelectorButton {
 	label: string;
 }
 
-export interface RangeSelector {
+export interface RangeSelector extends Label {
 	buttons: Array<Partial<RangeSelectorButton>>;
 	visible: boolean;
 	x: number;
 	xanchor: 'auto' | 'left' | 'center' | 'right';
 	y: number;
 	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
-	bgcolor: string;
 	activecolor: string;
-	bordercolor: string;
 	borderwidth: number;
+}
+
+export interface Camera {
+	up: Partial<Point>;
+	center: Partial<Point>;
+	eye: Partial<Point>;
+}
+
+export interface Label {
+	bgcolor: string;
+	bordercolor: string;
 	font: Partial<Font>;
 }
+
+export interface Annotations extends Point, Label {
+	visible: boolean;
+	ax: number;
+	ay: number;
+	xanchor: 'auto' | 'left' | 'center' | 'right';
+	xshift: number;
+	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
+	yshift: number;
+	text: string;
+	textangle: string;
+	width: number;
+	height: number;
+	opacity: number;
+	align: 'left' | 'center' | 'right';
+	valign: 'top' | 'middle' | 'bottom';
+	borderpad: number;
+	borderwidth: number;
+	showarrow: boolean;
+	arrowcolor: string;
+	arrowhead: number;
+	arrowsize: number;
+	arrowwidth: number;
+	standoff: number;
+	hovertext: string;
+	hoverlabel: Partial<Label>;
+	captureevents: boolean;
+}
+
+export interface Scene {
+	bgcolor: string;
+	camera: Partial<Camera>;
+	domain: Partial<Domain>;
+	aspectmode: 'auto' | 'cube' | 'data' | 'manual';
+	aspectratio: Partial<Point>;
+	xaxis: Partial<SceneAxis>;
+	yaxis: Partial<SceneAxis>;
+	zaxis: Partial<SceneAxis>;
+	dragmode: 'orbit' | 'turntable' | 'zoom' | 'pan' | false;
+	hovermode: 'closest' | false;
+	annotations: Partial<Annotations> | Array<Partial<Annotations>>;
+	captureevents: boolean;
+}
+
+export interface Domain {
+    x: number[];
+    y: number[];
+}
diff --git a/types/plottable/index.d.ts b/types/plottable/index.d.ts
deleted file mode 100644
index ee52e5fc4d..0000000000
--- a/types/plottable/index.d.ts
+++ /dev/null
@@ -1,4121 +0,0 @@
-// Type definitions for Plottable v1.4.0
-// Project: http://plottablejs.org/
-// Definitions by: Plottable Team <https://github.com/palantir/plottable>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as d3 from "d3";
-
-declare global {
-    namespace Plottable {
-        namespace Utils {
-            namespace Math {
-                /**
-                 * Checks if x is between a and b.
-                 *
-                 * @param {number} x The value to test if in range
-                 * @param {number} a The beginning of the (inclusive) range
-                 * @param {number} b The ending of the (inclusive) range
-                 * @return {boolean} Whether x is in [a, b]
-                 */
-                function inRange(x: number, a: number, b: number): boolean;
-                /**
-                 * Clamps x to the range [min, max].
-                 *
-                 * @param {number} x The value to be clamped.
-                 * @param {number} min The minimum value.
-                 * @param {number} max The maximum value.
-                 * @return {number} A clamped value in the range [min, max].
-                 */
-                function clamp(x: number, min: number, max: number): number;
-                /**
-                 * Applies the accessor, if provided, to each element of `array` and returns the maximum value.
-                 * If no maximum value can be computed, returns defaultValue.
-                 */
-                function max<C>(array: C[], defaultValue: C): C;
-                function max<T, C>(array: T[], accessor: (t?: T, i?: number) => C, defaultValue: C): C;
-                /**
-                 * Applies the accessor, if provided, to each element of `array` and returns the minimum value.
-                 * If no minimum value can be computed, returns defaultValue.
-                 */
-                function min<C>(array: C[], defaultValue: C): C;
-                function min<T, C>(array: T[], accessor: (t?: T, i?: number) => C, defaultValue: C): C;
-                /**
-                 * Returns true **only** if x is NaN
-                 */
-                function isNaN(n: any): boolean;
-                /**
-                 * Returns true if the argument is a number, which is not NaN
-                 * Numbers represented as strings do not pass this function
-                 */
-                function isValidNumber(n: any): boolean;
-                /**
-                 * Generates an array of consecutive, strictly increasing numbers
-                 * in the range [start, stop) separeted by step
-                 */
-                function range(start: number, stop: number, step?: number): number[];
-                /**
-                 * Returns the square of the distance between two points
-                 *
-                 * @param {Point} p1
-                 * @param {Point} p2
-                 * @return {number} dist(p1, p2)^2
-                 */
-                function distanceSquared(p1: Point, p2: Point): number;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            /**
-             * Shim for ES6 map.
-             * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map
-             */
-            class Map<K, V> {
-                constructor();
-                set(key: K, value: V): Map<K, V>;
-                get(key: K): V;
-                has(key: K): boolean;
-                forEach(callbackFn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: any): void;
-                delete(key: K): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            /**
-             * Shim for ES6 set.
-             * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set
-             */
-            class Set<T> {
-                size: number;
-                constructor();
-                add(value: T): Set<T>;
-                delete(value: T): boolean;
-                has(value: T): boolean;
-                forEach(callback: (value: T, value2: T, set: Set<T>) => void, thisArg?: any): void;
-            }
-        }
-    }
-
-    namespace Plottable {
-        namespace Utils {
-            namespace DOM {
-                /**
-                 * Gets the bounding box of an element.
-                 * @param {d3.Selection} element
-                 * @returns {SVGRed} The bounding box.
-                 */
-                function elementBBox(element: d3.Selection<any>): SVGRect;
-                /**
-                 * Screen refresh rate which is assumed to be 60fps
-                 */
-                var SCREEN_REFRESH_RATE_MILLISECONDS: number;
-                /**
-                 * Polyfill for `window.requestAnimationFrame`.
-                 * If the function exists, then we use the function directly.
-                 * Otherwise, we set a timeout on `SCREEN_REFRESH_RATE_MILLISECONDS` and then perform the function.
-                 *
-                 * @param {() => void} callback The callback to call in the next animation frame
-                 */
-                function requestAnimationFramePolyfill(callback: () => void): void;
-                /**
-                 * Calculates the width of the element.
-                 * The width includes the padding and the border on the element's left and right sides.
-                 *
-                 * @param {Element} element The element to query
-                 * @returns {number} The width of the element.
-                 */
-                function elementWidth(element: Element): number;
-                /**
-                 * Calculates the height of the element.
-                 * The height includes the padding the and the border on the element's top and bottom sides.
-                 *
-                 * @param {Element} element The element to query
-                 * @returns {number} The height of the element
-                 */
-                function elementHeight(element: Element): number;
-                /**
-                 * Retrieves the number array representing the translation for the selection
-                 *
-                 * @param {d3.Selection<any>} selection The selection to query
-                 * @returns {[number, number]} The number array representing the translation
-                 */
-                function translate(selection: d3.Selection<any>): [number, number];
-                /**
-                 * Translates the given selection by the input x / y pixel amounts.
-                 *
-                 * @param {d3.Selection<any>} selection The selection to translate
-                 * @param {number} x The amount to translate in the x direction
-                 * @param {number} y The amount to translate in the y direction
-                 * @returns {d3.Selection<any>} The input selection
-                 */
-                function translate(selection: d3.Selection<any>, x: number, y: number): d3.Selection<any>;
-                /**
-                 * Checks if the first ClientRect overlaps the second.
-                 *
-                 * @param {ClientRect} clientRectA The first ClientRect
-                 * @param {ClientRect} clientRectB The second ClientRect
-                 * @returns {boolean} If the ClientRects overlap each other.
-                 */
-                function clientRectsOverlap(clientRectA: ClientRect, clientRectB: ClientRect): boolean;
-                /**
-                 * Returns true if and only if innerClientRect is inside outerClientRect.
-                 *
-                 * @param {ClientRect} innerClientRect The first ClientRect
-                 * @param {ClientRect} outerClientRect The second ClientRect
-                 * @returns {boolean} If and only if the innerClientRect is inside outerClientRect.
-                 */
-                function clientRectInside(innerClientRect: ClientRect, outerClientRect: ClientRect): boolean;
-                /**
-                 * Retrieves the bounding svg of the input element
-                 *
-                 * @param {SVGElement} element The element to query
-                 * @returns {SVGElement} The bounding svg
-                 */
-                function boundingSVG(element: SVGElement): SVGElement;
-                /**
-                 * Generates a ClipPath ID that is unique for this instance of Plottable
-                 */
-                function generateUniqueClipPathId(): string;
-                /**
-                 * Returns true if the supplied coordinates or Ranges intersect or are contained by bbox.
-                 *
-                 * @param {number | Range} xValOrRange The x coordinate or Range to test
-                 * @param {number | Range} yValOrRange The y coordinate or Range to test
-                 * @param {SVGRect} bbox The bbox
-                 * @param {number} tolerance Amount by which to expand bbox, in each dimension, before
-                 * testing intersection
-                 *
-                 * @returns {boolean} True if the supplied coordinates or Ranges intersect or are
-                 * contained by bbox, false otherwise.
-                 */
-                function intersectsBBox(xValOrRange: number | Range, yValOrRange: number | Range, bbox: SVGRect, tolerance?: number): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            namespace Color {
-                /**
-                 * Return contrast ratio between two colors
-                 * Based on implementation from chroma.js by Gregor Aisch (gka) (licensed under BSD)
-                 * chroma.js may be found here: https://github.com/gka/chroma.js
-                 * License may be found here: https://github.com/gka/chroma.js/blob/master/LICENSE
-                 * see http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
-                 */
-                function contrast(a: string, b: string): number;
-                /**
-                 * Returns a brighter copy of this color. Each channel is multiplied by 0.7 ^ -factor.
-                 * Channel values are capped at the maximum value of 255, and the minimum value of 30.
-                 */
-                function lightenColor(color: string, factor: number): string;
-                /**
-                 * Gets the Hex Code of the color resulting by applying the className CSS class to the
-                 * colorTester selection. Returns null if the tester is transparent.
-                 *
-                 * @param {d3.Selection<void>} colorTester The d3 selection to apply the CSS class to
-                 * @param {string} className The name of the class to be applied
-                 * @return {string} The hex code of the computed color
-                 */
-                function colorTest(colorTester: d3.Selection<void>, className: string): string;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            namespace Array {
-                /**
-                 * Takes two arrays of numbers and adds them together
-                 *
-                 * @param {number[]} aList The first array of numbers
-                 * @param {number[]} bList The second array of numbers
-                 * @return {number[]} An array of numbers where x[i] = aList[i] + bList[i]
-                 */
-                function add(aList: number[], bList: number[]): number[];
-                /**
-                 * Take an array of values, and return the unique values.
-                 * Will work iff ∀ a, b, a.toString() == b.toString() => a == b; will break on Object inputs
-                 *
-                 * @param {T[]} values The values to find uniqueness for
-                 * @return {T[]} The unique values
-                 */
-                function uniq<T>(arr: T[]): T[];
-                /**
-                 * @param {T[][]} a The 2D array that will have its elements joined together.
-                 * @return {T[]} Every array in a, concatenated together in the order they appear.
-                 */
-                function flatten<T>(a: T[][]): T[];
-                /**
-                 * Creates an array of length `count`, filled with value or (if value is a function), value()
-                 *
-                 * @param {T | ((index?: number) => T)} value The value to fill the array with or a value generator (called with index as arg)
-                 * @param {number} count The length of the array to generate
-                 * @return {any[]}
-                 */
-                function createFilledArray<T>(value: T | ((index?: number) => T), count: number): T[];
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            /**
-             * A set of callbacks which can be all invoked at once.
-             * Each callback exists at most once in the set (based on reference equality).
-             * All callbacks should have the same signature.
-             */
-            class CallbackSet<CB extends Function> extends Set<CB> {
-                callCallbacks(...args: any[]): CallbackSet<CB>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            namespace Stacking {
-                type StackedDatum = {
-                    value: number;
-                    offset: number;
-                };
-                type StackingResult = Utils.Map<Dataset, Utils.Map<string, StackedDatum>>;
-                /**
-                 * Computes the StackingResult (value and offset) for each data point in each Dataset.
-                 *
-                 * @param {Dataset[]} datasets The Datasets to be stacked on top of each other in the order of stacking
-                 * @param {Accessor<any>} keyAccessor Accessor for the key of the data
-                 * @param {Accessor<number>} valueAccessor Accessor for the value of the data
-                 * @return {StackingResult} value and offset for each datapoint in each Dataset
-                 */
-                function stack(datasets: Dataset[], keyAccessor: Accessor<any>, valueAccessor: Accessor<number>): StackingResult;
-                /**
-                 * Computes the total extent over all data points in all Datasets, taking stacking into consideration.
-                 *
-                 * @param {StackingResult} stackingResult The value and offset information for each datapoint in each dataset
-                 * @oaram {Accessor<any>} keyAccessor Accessor for the key of the data existent in the stackingResult
-                 * @param {Accessor<boolean>} filter A filter for data to be considered when computing the total extent
-                 * @return {[number, number]} The total extent
-                 */
-                function stackedExtent(stackingResult: StackingResult, keyAccessor: Accessor<any>, filter: Accessor<boolean>): number[];
-                /**
-                 * Normalizes a key used for stacking
-                 *
-                 * @param {any} key The key to be normalized
-                 * @return {string} The stringified key
-                 */
-                function normalizeKey(key: any): string;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            namespace Window {
-                /**
-                 * Print a warning message to the console, if it is available.
-                 *
-                 * @param {string} The warnings to print
-                 */
-                function warn(warning: string): void;
-                /**
-                 * Is like setTimeout, but activates synchronously if time=0
-                 * We special case 0 because of an observed issue where calling setTimeout causes visible flickering.
-                 * We believe this is because when requestAnimationFrame calls into the paint function, as soon as that function finishes
-                 * evaluating, the results are painted to the screen. As a result, if we want something to occur immediately but call setTimeout
-                 * with time=0, then it is pushed to the call stack and rendered in the next frame, so the component that was rendered via
-                 * setTimeout appears out-of-sync with the rest of the plot.
-                 */
-                function setTimeout(f: Function, time: number, ...args: any[]): number;
-                /**
-                 * Sends a deprecation warning to the console. The warning includes the name of the deprecated method,
-                 * version number of the deprecation, and an optional message.
-                 *
-                 * To be used in the first line of a deprecated method.
-                 *
-                 * @param {string} callingMethod The name of the method being deprecated
-                 * @param {string} version The version when the tagged method became obsolete
-                 * @param {string?} message Optional message to be shown with the warning
-                 */
-                function deprecated(callingMethod: string, version: string, message?: string): void;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Utils {
-            class ClientToSVGTranslator {
-                /**
-                 * Returns the ClientToSVGTranslator for the <svg> containing elem.
-                 * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
-                 */
-                static getTranslator(elem: SVGElement): ClientToSVGTranslator;
-                constructor(svg: SVGElement);
-                /**
-                 * Computes the position relative to the <svg> in svg-coordinate-space.
-                 */
-                computePosition(clientX: number, clientY: number): Point;
-                /**
-                 * Checks whether event happened inside <svg> element.
-                 */
-                insideSVG(e: Event): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Configs {
-            /**
-             * Specifies if Plottable should show warnings.
-             */
-            var SHOW_WARNINGS: boolean;
-        }
-    }
-
-
-    namespace Plottable {
-        var version: string;
-    }
-
-
-    namespace Plottable {
-        type DatasetCallback = (dataset: Dataset) => void;
-        class Dataset {
-            /**
-             * A Dataset contains an array of data and some metadata.
-             * Changes to the data or metadata will cause anything subscribed to the Dataset to update.
-             *
-             * @constructor
-             * @param {any[]} [data=[]] The data for this Dataset.
-             * @param {any} [metadata={}] An object containing additional information.
-             */
-            constructor(data?: any[], metadata?: any);
-            /**
-             * Adds a callback to be called when the Dataset updates.
-             *
-             * @param {DatasetCallback} callback.
-             * @returns {Dataset} The calling Dataset.
-             */
-            onUpdate(callback: DatasetCallback): Dataset;
-            /**
-             * Removes a callback that would be called when the Dataset updates.
-             *
-             * @param {DatasetCallback} callback
-             * @returns {Dataset} The calling Dataset.
-             */
-            offUpdate(callback: DatasetCallback): Dataset;
-            /**
-             * Gets the data.
-             *
-             * @returns {any[]}
-             */
-            data(): any[];
-            /**
-             * Sets the data.
-             *
-             * @param {any[]} data
-             * @returns {Dataset} The calling Dataset.
-             */
-            data(data: any[]): Dataset;
-            /**
-             * Gets the metadata.
-             *
-             * @returns {any}
-             */
-            metadata(): any;
-            /**
-             * Sets the metadata.
-             *
-             * @param {any} metadata
-             * @returns {Dataset} The calling Dataset.
-             */
-            metadata(metadata: any): Dataset;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace RenderPolicies {
-            /**
-             * A policy for rendering Components.
-             */
-            interface RenderPolicy {
-                render(): any;
-            }
-            /**
-             * Renders Components immediately after they are enqueued.
-             * Useful for debugging, horrible for performance.
-             */
-            class Immediate implements RenderPolicy {
-                render(): void;
-            }
-            /**
-             * The default way to render, which only tries to render every frame
-             * (usually, 1/60th of a second).
-             */
-            class AnimationFrame implements RenderPolicy {
-                render(): void;
-            }
-            /**
-             * Renders with `setTimeout()`.
-             * Generally an inferior way to render compared to `requestAnimationFrame`,
-             * but useful for browsers that don't suppoort `requestAnimationFrame`.
-             */
-            class Timeout implements RenderPolicy {
-                render(): void;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        /**
-         * The RenderController is responsible for enqueueing and synchronizing
-         * layout and render calls for Components.
-         *
-         * Layout and render calls occur inside an animation callback
-         * (window.requestAnimationFrame if available).
-         *
-         * RenderController.flush() immediately lays out and renders all Components currently enqueued.
-         *
-         * To always have immediate rendering (useful for debugging), call
-         * ```typescript
-         * Plottable.RenderController.setRenderPolicy(
-         *   new Plottable.RenderPolicies.Immediate()
-         * );
-         * ```
-         */
-        namespace RenderController {
-            namespace Policy {
-                var IMMEDIATE: string;
-                var ANIMATION_FRAME: string;
-                var TIMEOUT: string;
-            }
-            function renderPolicy(): RenderPolicies.RenderPolicy;
-            function renderPolicy(renderPolicy: string): void;
-            /**
-             * Enqueues the Component for rendering.
-             *
-             * @param {Component} component
-             */
-            function registerToRender(component: Component): void;
-            /**
-             * Enqueues the Component for layout and rendering.
-             *
-             * @param {Component} component
-             */
-            function registerToComputeLayout(component: Component): void;
-            /**
-             * Renders all Components waiting to be rendered immediately
-             * instead of waiting until the next frame.
-             *
-             * Useful to call when debugging.
-             */
-            function flush(): void;
-        }
-    }
-
-    namespace Plottable {
-        /**
-         * Accesses a specific datum property.
-         */
-        interface Accessor<T> {
-            (datum: any, index: number, dataset: Dataset): T;
-        }
-        /**
-         * Retrieves a scaled datum property.
-         * Essentially passes the result of an Accessor through a Scale.
-         */
-        type Projector = (datum: any, index: number, dataset: Dataset) => any;
-        /**
-         * A mapping from attributes ("x", "fill", etc.) to the functions that get
-         * that information out of the data.
-         */
-        type AttributeToProjector = {
-            [attr: string]: Projector;
-        };
-        /**
-         * A function that generates attribute values from the datum and index.
-         * Essentially a Projector with a particular Dataset rolled in.
-         */
-        type AppliedProjector = (datum: any, index: number) => any;
-        /**
-         * A mapping from attributes to the AppliedProjectors used to generate them.
-         */
-        type AttributeToAppliedProjector = {
-            [attr: string]: AppliedProjector;
-        };
-        /**
-         * Space request used during layout negotiation.
-         *
-         * @member {number} minWidth The minimum acceptable width given the offered space.
-         * @member {number} minHeight the minimum acceptable height given the offered space.
-         */
-        type SpaceRequest = {
-            minWidth: number;
-            minHeight: number;
-        };
-        /**
-         * Min and max values for a particular property.
-         */
-        type Range = {
-            min: number;
-            max: number;
-        };
-        /**
-         * A location in pixel-space.
-         */
-        type Point = {
-            x: number;
-            y: number;
-        };
-        /**
-         * The corners of a box.
-         */
-        type Bounds = {
-            topLeft: Point;
-            bottomRight: Point;
-        };
-        /**
-         * An object representing a data-backed visual entity inside a Component.
-         */
-        interface Entity<C extends Component> {
-            datum: any;
-            position: Point;
-            selection: d3.Selection<any>;
-            component: C;
-        }
-    }
-
-
-    namespace Plottable {
-        type Formatter = (d: any) => string;
-        /**
-         * This field is deprecated and will be removed in v2.0.0.
-         *
-         * The number of milliseconds between midnight one day and the next is
-         * not a fixed quantity.
-         *
-         * Use date.setDate(date.getDate() + number_of_days) instead.
-         *
-         */
-        var MILLISECONDS_IN_ONE_DAY: number;
-        namespace Formatters {
-            /**
-             * Creates a formatter for currency values.
-             *
-             * @param {number} [precision] The number of decimal places to show (default 2).
-             * @param {string} [symbol] The currency symbol to use (default "$").
-             * @param {boolean} [prefix] Whether to prepend or append the currency symbol (default true).
-             * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-             *
-             * @returns {Formatter} A formatter for currency values.
-             */
-            function currency(precision?: number, symbol?: string, prefix?: boolean): (d: any) => string;
-            /**
-             * Creates a formatter that displays exactly [precision] decimal places.
-             *
-             * @param {number} [precision] The number of decimal places to show (default 3).
-             * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-             *
-             * @returns {Formatter} A formatter that displays exactly [precision] decimal places.
-             */
-            function fixed(precision?: number): (d: any) => string;
-            /**
-             * Creates a formatter that formats numbers to show no more than
-             * [precision] decimal places. All other values are stringified.
-             *
-             * @param {number} [precision] The number of decimal places to show (default 3).
-             * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-             *
-             * @returns {Formatter} A formatter for general values.
-             */
-            function general(precision?: number): (d: any) => string;
-            /**
-             * Creates a formatter that stringifies its input.
-             *
-             * @returns {Formatter} A formatter that stringifies its input.
-             */
-            function identity(): (d: any) => string;
-            /**
-             * Creates a formatter for percentage values.
-             * Multiplies the input by 100 and appends "%".
-             *
-             * @param {number} [precision] The number of decimal places to show (default 0).
-             * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-             *
-             * @returns {Formatter} A formatter for percentage values.
-             */
-            function percentage(precision?: number): (d: any) => string;
-            /**
-             * Creates a formatter for values that displays [precision] significant figures
-             * and puts SI notation.
-             *
-             * @param {number} [precision] The number of significant figures to show (default 3).
-             *
-             * @returns {Formatter} A formatter for SI values.
-             */
-            function siSuffix(precision?: number): (d: any) => string;
-            /**
-             * Creates a multi time formatter that displays dates.
-             *
-             * @returns {Formatter} A formatter for time/date values.
-             */
-            function multiTime(): (d: any) => string;
-            /**
-             * Creates a time formatter that displays time/date using given specifier.
-             *
-             * List of directives can be found on: https://github.com/mbostock/d3/wiki/Time-Formatting#format
-             *
-             * @param {string} [specifier] The specifier for the formatter.
-             *
-             * @returns {Formatter} A formatter for time/date values.
-             */
-            function time(specifier: string): Formatter;
-            /**
-             * Creates a formatter for relative dates.
-             *
-             * @param {number} baseValue The start date (as epoch time) used in computing relative dates (default 0)
-             * @param {number} increment The unit used in calculating relative date values (default MILLISECONDS_IN_ONE_DAY)
-             * @param {string} label The label to append to the formatted string (default "")
-             *
-             * @returns {Formatter} A formatter for time/date values.
-             */
-            function relativeDate(baseValue?: number, increment?: number, label?: string): (d: any) => string;
-        }
-    }
-
-
-    namespace Plottable {
-        /**
-         * A SymbolFactory is a function that takes in a symbolSize which is the edge length of the render area
-         * and returns a string representing the 'd' attribute of the resultant 'path' element
-         */
-        type SymbolFactory = (symbolSize: number) => string;
-        namespace SymbolFactories {
-            function circle(): SymbolFactory;
-            function square(): SymbolFactory;
-            function cross(): SymbolFactory;
-            function diamond(): SymbolFactory;
-            function triangleUp(): SymbolFactory;
-            function triangleDown(): SymbolFactory;
-        }
-    }
-
-
-    namespace Plottable {
-        interface ScaleCallback<S extends Scale<any, any>> {
-            (scale: S): any;
-        }
-        namespace Scales {
-            /**
-             * A function that supplies domain values to be included into a Scale.
-             *
-             * @param {Scale} scale
-             * @returns {D[]} An array of values that should be included in the Scale.
-             */
-            interface IncludedValuesProvider<D> {
-                (scale: Scale<D, any>): D[];
-            }
-            /**
-             * A function that supplies padding exception values for the Scale.
-             * If one end of the domain is set to an excepted value as a result of autoDomain()-ing,
-             * that end of the domain will not be padded.
-             *
-             * @param {QuantitativeScale} scale
-             * @returns {D[]} An array of values that should not be padded.
-             */
-            interface PaddingExceptionsProvider<D> {
-                (scale: QuantitativeScale<D>): D[];
-            }
-        }
-        class Scale<D, R> {
-            /**
-             * A Scale is a function (in the mathematical sense) that maps values from a domain to a range.
-             *
-             * @constructor
-             */
-            constructor();
-            /**
-             * Given an array of potential domain values, computes the extent of those values.
-             *
-             * @param {D[]} values
-             * @returns {D[]} The extent of the input values.
-             */
-            extentOfValues(values: D[]): D[];
-            protected _getAllIncludedValues(): D[];
-            protected _getExtent(): D[];
-            /**
-             * Adds a callback to be called when the Scale updates.
-             *
-             * @param {ScaleCallback} callback.
-             * @returns {Scale} The calling Scale.
-             */
-            onUpdate(callback: ScaleCallback<Scale<D, R>>): Scale<D, R>;
-            /**
-             * Removes a callback that would be called when the Scale updates.
-             *
-             * @param {ScaleCallback} callback.
-             * @returns {Scale} The calling Scale.
-             */
-            offUpdate(callback: ScaleCallback<Scale<D, R>>): Scale<D, R>;
-            protected _dispatchUpdate(): void;
-            /**
-             * Sets the Scale's domain so that it spans the Extents of all its ExtentsProviders.
-             *
-             * @returns {Scale} The calling Scale.
-             */
-            autoDomain(): Scale<D, R>;
-            protected _autoDomainIfAutomaticMode(): void;
-            /**
-             * Computes the range value corresponding to a given domain value.
-             *
-             * @param {D} value
-             * @returns {R} The range value corresponding to the supplied domain value.
-             */
-            scale(value: D): R;
-            /**
-             * Gets the domain.
-             *
-             * @returns {D[]} The current domain.
-             */
-            domain(): D[];
-            /**
-             * Sets the domain.
-             *
-             * @param {D[]} values
-             * @returns {Scale} The calling Scale.
-             */
-            domain(values: D[]): Scale<D, R>;
-            protected _getDomain(): void;
-            protected _setDomain(values: D[]): void;
-            protected _setBackingScaleDomain(values: D[]): void;
-            /**
-             * Gets the range.
-             *
-             * @returns {R[]} The current range.
-             */
-            range(): R[];
-            /**
-             * Sets the range.
-             *
-             * @param {R[]} values
-             * @returns {Scale} The calling Scale.
-             */
-            range(values: R[]): Scale<D, R>;
-            protected _getRange(): void;
-            protected _setRange(values: R[]): void;
-            /**
-             * Adds an IncludedValuesProvider to the Scale.
-             *
-             * @param {Scales.IncludedValuesProvider} provider
-             * @returns {Scale} The calling Scale.
-             */
-            addIncludedValuesProvider(provider: Scales.IncludedValuesProvider<D>): Scale<D, R>;
-            /**
-             * Removes the IncludedValuesProvider from the Scale.
-             *
-             * @param {Scales.IncludedValuesProvider} provider
-             * @returns {Scale} The calling Scale.
-             */
-            removeIncludedValuesProvider(provider: Scales.IncludedValuesProvider<D>): Scale<D, R>;
-        }
-    }
-
-
-    namespace Plottable {
-        class QuantitativeScale<D> extends Scale<D, number> {
-            protected static _DEFAULT_NUM_TICKS: number;
-            /**
-             * A QuantitativeScale is a Scale that maps number-like values to numbers.
-             * It is invertible and continuous.
-             *
-             * @constructor
-             */
-            constructor();
-            autoDomain(): QuantitativeScale<D>;
-            protected _autoDomainIfAutomaticMode(): void;
-            protected _getExtent(): D[];
-            /**
-             * Adds a padding exception provider.
-             * If one end of the domain is set to an excepted value as a result of autoDomain()-ing,
-             * that end of the domain will not be padded.
-             *
-             * @param {Scales.PaddingExceptionProvider<D>} provider The provider function.
-             * @returns {QuantitativeScale} The calling QuantitativeScale.
-             */
-            addPaddingExceptionsProvider(provider: Scales.PaddingExceptionsProvider<D>): QuantitativeScale<D>;
-            /**
-             * Removes the padding exception provider.
-             *
-             * @param {Scales.PaddingExceptionProvider<D>} provider The provider function.
-             * @returns {QuantitativeScale} The calling QuantitativeScale.
-             */
-            removePaddingExceptionsProvider(provider: Scales.PaddingExceptionsProvider<D>): QuantitativeScale<D>;
-            /**
-             * Gets the padding proportion.
-             */
-            padProportion(): number;
-            /**
-             * Sets the padding porportion.
-             * When autoDomain()-ing, the computed domain will be expanded by this proportion,
-             * then rounded to human-readable values.
-             *
-             * @param {number} padProportion The padding proportion. Passing 0 disables padding.
-             * @returns {QuantitativeScale} The calling QuantitativeScale.
-             */
-            padProportion(padProportion: number): QuantitativeScale<D>;
-            protected _expandSingleValueDomain(singleValueDomain: D[]): D[];
-            /**
-             * Computes the domain value corresponding to a supplied range value.
-             *
-             * @param {number} value: A value from the Scale's range.
-             * @returns {D} The domain value corresponding to the supplied range value.
-             */
-            invert(value: number): D;
-            domain(): D[];
-            domain(values: D[]): QuantitativeScale<D>;
-            /**
-             * Gets the lower end of the domain.
-             *
-             * @return {D}
-             */
-            domainMin(): D;
-            /**
-             * Sets the lower end of the domain.
-             *
-             * @return {QuantitativeScale} The calling QuantitativeScale.
-             */
-            domainMin(domainMin: D): QuantitativeScale<D>;
-            /**
-             * Gets the upper end of the domain.
-             *
-             * @return {D}
-             */
-            domainMax(): D;
-            /**
-             * Sets the upper end of the domain.
-             *
-             * @return {QuantitativeScale} The calling QuantitativeScale.
-             */
-            domainMax(domainMax: D): QuantitativeScale<D>;
-            extentOfValues(values: D[]): D[];
-            protected _setDomain(values: D[]): void;
-            /**
-             * Gets the array of tick values generated by the default algorithm.
-             */
-            defaultTicks(): D[];
-            /**
-             * Gets an array of tick values spanning the domain.
-             *
-             * @returns {D[]}
-             */
-            ticks(): D[];
-            /**
-             * Given a domain, expands its domain onto "nice" values, e.g. whole
-             * numbers.
-             */
-            protected _niceDomain(domain: D[], count?: number): D[];
-            protected _defaultExtent(): D[];
-            /**
-             * Gets the TickGenerator.
-             */
-            tickGenerator(): Scales.TickGenerators.TickGenerator<D>;
-            /**
-             * Sets the TickGenerator
-             *
-             * @param {TickGenerator} generator
-             * @return {QuantitativeScale} The calling QuantitativeScale.
-             */
-            tickGenerator(generator: Scales.TickGenerators.TickGenerator<D>): QuantitativeScale<D>;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Scales {
-            class Linear extends QuantitativeScale<number> {
-                /**
-                 * @constructor
-                 */
-                constructor();
-                protected _defaultExtent(): number[];
-                protected _expandSingleValueDomain(singleValueDomain: number[]): number[];
-                scale(value: number): number;
-                protected _getDomain(): number[];
-                protected _setBackingScaleDomain(values: number[]): void;
-                protected _getRange(): number[];
-                protected _setRange(values: number[]): void;
-                invert(value: number): number;
-                defaultTicks(): number[];
-                protected _niceDomain(domain: number[], count?: number): number[];
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Scales {
-            class ModifiedLog extends QuantitativeScale<number> {
-                /**
-                 * A ModifiedLog Scale acts as a regular log scale for large numbers.
-                 * As it approaches 0, it gradually becomes linear.
-                 * Consequently, a ModifiedLog Scale can process 0 and negative numbers.
-                 *
-                 * @constructor
-                 * @param {number} [base=10]
-                 *        The base of the log. Must be > 1.
-                 *
-                 *        For x <= base, scale(x) = log(x).
-                 *
-                 *        For 0 < x < base, scale(x) will become more and more
-                 *        linear as it approaches 0.
-                 *
-                 *        At x == 0, scale(x) == 0.
-                 *
-                 *        For negative values, scale(-x) = -scale(x).
-                 */
-                constructor(base?: number);
-                scale(x: number): number;
-                invert(x: number): number;
-                protected _getDomain(): number[];
-                protected _setDomain(values: number[]): void;
-                protected _setBackingScaleDomain(values: number[]): void;
-                ticks(): number[];
-                protected _niceDomain(domain: number[], count?: number): number[];
-                protected _defaultExtent(): number[];
-                protected _expandSingleValueDomain(singleValueDomain: number[]): number[];
-                protected _getRange(): number[];
-                protected _setRange(values: number[]): void;
-                defaultTicks(): number[];
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Scales {
-            class Category extends Scale<string, number> {
-                /**
-                 * A Category Scale maps strings to numbers.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                extentOfValues(values: string[]): string[];
-                protected _getExtent(): string[];
-                domain(): string[];
-                domain(values: string[]): Category;
-                protected _setDomain(values: string[]): void;
-                range(): [number, number];
-                range(values: [number, number]): Category;
-                /**
-                 * Returns the width of the range band.
-                 *
-                 * @returns {number} The range band width
-                 */
-                rangeBand(): number;
-                /**
-                 * Returns the step width of the scale.
-                 *
-                 * The step width is the pixel distance between adjacent values in the domain.
-                 *
-                 * @returns {number}
-                 */
-                stepWidth(): number;
-                /**
-                 * Gets the inner padding.
-                 *
-                 * The inner padding is defined as the padding in between bands on the scale,
-                 * expressed as a multiple of the rangeBand().
-                 *
-                 * @returns {number}
-                 */
-                innerPadding(): number;
-                /**
-                 * Sets the inner padding.
-                 *
-                 * The inner padding is defined as the padding in between bands on the scale,
-                 * expressed as a multiple of the rangeBand().
-                 *
-                 * @returns {Category} The calling Category Scale.
-                 */
-                innerPadding(innerPadding: number): Category;
-                /**
-                 * Gets the outer padding.
-                 *
-                 * The outer padding is the padding in between the outer bands and the edges of the range,
-                 * expressed as a multiple of the rangeBand().
-                 *
-                 * @returns {number}
-                 */
-                outerPadding(): number;
-                /**
-                 * Sets the outer padding.
-                 *
-                 * The outer padding is the padding in between the outer bands and the edges of the range,
-                 * expressed as a multiple of the rangeBand().
-                 *
-                 * @returns {Category} The calling Category Scale.
-                 */
-                outerPadding(outerPadding: number): Category;
-                scale(value: string): number;
-                protected _getDomain(): string[];
-                protected _setBackingScaleDomain(values: string[]): void;
-                protected _getRange(): number[];
-                protected _setRange(values: number[]): void;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Scales {
-            class Color extends Scale<string, string> {
-                /**
-                 * A Color Scale maps string values to color hex values expressed as a string.
-                 *
-                 * @constructor
-                 * @param {string} [scaleType] One of "Category10"/"Category20"/"Category20b"/"Category20c".
-                 *   (see https://github.com/mbostock/d3/wiki/Ordinal-Scales#categorical-colors)
-                 *   If not supplied, reads the colors defined using CSS -- see plottable.css.
-                 */
-                constructor(scaleType?: string);
-                extentOfValues(values: string[]): string[];
-                protected _getExtent(): string[];
-                static invalidateColorCache(): void;
-                /**
-                 * Returns the color-string corresponding to a given string.
-                 * If there are not enough colors in the range(), a lightened version of an existing color will be used.
-                 *
-                 * @param {string} value
-                 * @returns {string}
-                 */
-                scale(value: string): string;
-                protected _getDomain(): string[];
-                protected _setBackingScaleDomain(values: string[]): void;
-                protected _getRange(): string[];
-                protected _setRange(values: string[]): void;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Scales {
-            class Time extends QuantitativeScale<Date> {
-                /**
-                 * A Time Scale maps Date objects to numbers.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                /**
-                 * Returns an array of ticks values separated by the specified interval.
-                 *
-                 * @param {string} interval A string specifying the interval unit.
-                 * @param {number?} [step] The number of multiples of the interval between consecutive ticks.
-                 * @return {Date[]}
-                 */
-                tickInterval(interval: string, step?: number): Date[];
-                protected _setDomain(values: Date[]): void;
-                protected _defaultExtent(): Date[];
-                protected _expandSingleValueDomain(singleValueDomain: Date[]): Date[];
-                scale(value: Date): number;
-                protected _getDomain(): Date[];
-                protected _setBackingScaleDomain(values: Date[]): void;
-                protected _getRange(): number[];
-                protected _setRange(values: number[]): void;
-                invert(value: number): Date;
-                defaultTicks(): Date[];
-                protected _niceDomain(domain: Date[]): Date[];
-                /**
-                 * Transforms the Plottable TimeInterval string into a d3 time interval equivalent.
-                 * If the provided TimeInterval is incorrect, the default is d3.time.year
-                 */
-                static timeIntervalToD3Time(timeInterval: string): d3.time.Interval;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Scales {
-            class InterpolatedColor extends Scale<number, string> {
-                static REDS: string[];
-                static BLUES: string[];
-                static POSNEG: string[];
-                /**
-                 * An InterpolatedColor Scale maps numbers to color hex values, expressed as strings.
-                 *
-                 * @param {string} [scaleType="linear"] One of "linear"/"log"/"sqrt"/"pow".
-                 */
-                constructor(scaleType?: string);
-                extentOfValues(values: number[]): number[];
-                autoDomain(): InterpolatedColor;
-                scale(value: number): string;
-                protected _getDomain(): number[];
-                protected _setBackingScaleDomain(values: number[]): void;
-                protected _getRange(): string[];
-                protected _setRange(range: string[]): void;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Scales {
-            namespace TickGenerators {
-                /**
-                 * Generates an array of tick values for the specified scale.
-                 *
-                 * @param {QuantitativeScale} scale
-                 * @returns {D[]}
-                 */
-                interface TickGenerator<D> {
-                    (scale: Plottable.QuantitativeScale<D>): D[];
-                }
-                /**
-                 * Creates a TickGenerator using the specified interval.
-                 *
-                 * Generates ticks at multiples of the interval while also including the domain boundaries.
-                 *
-                 * @param {number} interval
-                 * @returns {TickGenerator}
-                 */
-                function intervalTickGenerator(interval: number): TickGenerator<number>;
-                /**
-                 * Creates a TickGenerator returns only integer tick values.
-                 *
-                 * @returns {TickGenerator}
-                 */
-                function integerTickGenerator(): TickGenerator<number>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Drawers {
-            /**
-             * A step for the drawer to draw.
-             *
-             * Specifies how AttributeToProjector needs to be animated.
-             */
-            type DrawStep = {
-                attrToProjector: AttributeToProjector;
-                animator: Animator;
-            };
-            /**
-             * A DrawStep that carries an AttributeToAppliedProjector map.
-             */
-            type AppliedDrawStep = {
-                attrToAppliedProjector: AttributeToAppliedProjector;
-                animator: Animator;
-            };
-        }
-        class Drawer {
-            protected _svgElementName: string;
-            protected _className: string;
-            /**
-             * A Drawer draws svg elements based on the input Dataset.
-             *
-             * @constructor
-             * @param {Dataset} dataset The dataset associated with this Drawer
-             */
-            constructor(dataset: Dataset);
-            /**
-             * Retrieves the renderArea selection for the Drawer.
-             */
-            renderArea(): d3.Selection<void>;
-            /**
-             * Sets the renderArea selection for the Drawer.
-             *
-             * @param {d3.Selection} Selection containing the <g> to render to.
-             * @returns {Drawer} The calling Drawer.
-             */
-            renderArea(area: d3.Selection<void>): Drawer;
-            /**
-             * Removes the Drawer and its renderArea
-             */
-            remove(): void;
-            protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
-            /**
-             * Calculates the total time it takes to use the input drawSteps to draw the input data
-             *
-             * @param {any[]} data The data that would have been drawn
-             * @param {Drawers.DrawStep[]} drawSteps The DrawSteps to use
-             * @returns {number} The total time it takes to draw
-             */
-            totalDrawTime(data: any[], drawSteps: Drawers.DrawStep[]): number;
-            /**
-             * Draws the data into the renderArea using the spefic steps and metadata
-             *
-             * @param{any[]} data The data to be drawn
-             * @param{DrawStep[]} drawSteps The list of steps, which needs to be drawn
-             */
-            draw(data: any[], drawSteps: Drawers.DrawStep[]): Drawer;
-            selection(): d3.Selection<any>;
-            /**
-             * Returns the CSS selector for this Drawer's visual elements.
-             */
-            selector(): string;
-            /**
-             * Returns the D3 selection corresponding to the datum with the specified index.
-             */
-            selectionForIndex(index: number): d3.Selection<any>;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Drawers {
-            class Line extends Drawer {
-                constructor(dataset: Dataset);
-                protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
-                selectionForIndex(index: number): d3.Selection<any>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Drawers {
-            class Area extends Drawer {
-                constructor(dataset: Dataset);
-                protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
-                selectionForIndex(index: number): d3.Selection<any>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Drawers {
-            class Rectangle extends Drawer {
-                constructor(dataset: Dataset);
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Drawers {
-            class Arc extends Drawer {
-                constructor(dataset: Dataset);
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Drawers {
-            class Symbol extends Drawer {
-                constructor(dataset: Dataset);
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Drawers {
-            class Segment extends Drawer {
-                constructor(dataset: Dataset);
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        type ComponentCallback = (component: Component) => void;
-        namespace Components {
-            class Alignment {
-                static TOP: string;
-                static BOTTOM: string;
-                static LEFT: string;
-                static RIGHT: string;
-                static CENTER: string;
-            }
-        }
-        class Component {
-            protected _boundingBox: d3.Selection<void>;
-            protected _clipPathEnabled: boolean;
-            protected _isSetup: boolean;
-            protected _isAnchored: boolean;
-            constructor();
-            /**
-             * Attaches the Component as a child of a given d3 Selection.
-             *
-             * @param {d3.Selection} selection.
-             * @returns {Component} The calling Component.
-             */
-            anchor(selection: d3.Selection<void>): Component;
-            /**
-             * Adds a callback to be called on anchoring the Component to the DOM.
-             * If the Component is already anchored, the callback is called immediately.
-             *
-             * @param {ComponentCallback} callback
-             * @return {Component}
-             */
-            onAnchor(callback: ComponentCallback): Component;
-            /**
-             * Removes a callback that would be called on anchoring the Component to the DOM.
-             * The callback is identified by reference equality.
-             *
-             * @param {ComponentCallback} callback
-             * @return {Component}
-             */
-            offAnchor(callback: ComponentCallback): Component;
-            /**
-             * Creates additional elements as necessary for the Component to function.
-             * Called during anchor() if the Component's element has not been created yet.
-             * Override in subclasses to provide additional functionality.
-             */
-            protected _setup(): void;
-            /**
-             * Given available space in pixels, returns the minimum width and height this Component will need.
-             *
-             * @param {number} availableWidth
-             * @param {number} availableHeight
-             * @returns {SpaceRequest}
-             */
-            requestedSpace(availableWidth: number, availableHeight: number): SpaceRequest;
-            /**
-             * Computes and sets the size, position, and alignment of the Component from the specified values.
-             * If no parameters are supplied and the Component is a root node,
-             * they are inferred from the size of the Component's element.
-             *
-             * @param {Point} [origin] Origin of the space offered to the Component.
-             * @param {number} [availableWidth] Available width in pixels.
-             * @param {number} [availableHeight] Available height in pixels.
-             * @returns {Component} The calling Component.
-             */
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Component;
-            protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-                width: number;
-                height: number;
-            };
-            /**
-             * Queues the Component for rendering.
-             *
-             * @returns {Component} The calling Component.
-             */
-            render(): Component;
-            /**
-             * Renders the Component without waiting for the next frame.
-             */
-            renderImmediately(): Component;
-            /**
-             * Causes the Component to re-layout and render.
-             *
-             * This function should be called when a CSS change has occured that could
-             * influence the layout of the Component, such as changing the font size.
-             *
-             * @returns {Component} The calling Component.
-             */
-            redraw(): Component;
-            /**
-             * Renders the Component to a given <svg>.
-             *
-             * @param {String|d3.Selection} element A selector-string for the <svg>, or a d3 selection containing an <svg>.
-             * @returns {Component} The calling Component.
-             */
-            renderTo(element: String | d3.Selection<void>): Component;
-            /**
-             * Gets the x alignment of the Component.
-             */
-            xAlignment(): string;
-            /**
-             * Sets the x alignment of the Component.
-             *
-             * @param {string} xAlignment The x alignment of the Component ("left"/"center"/"right").
-             * @returns {Component} The calling Component.
-             */
-            xAlignment(xAlignment: string): Component;
-            /**
-             * Gets the y alignment of the Component.
-             */
-            yAlignment(): string;
-            /**
-             * Sets the y alignment of the Component.
-             *
-             * @param {string} yAlignment The y alignment of the Component ("top"/"center"/"bottom").
-             * @returns {Component} The calling Component.
-             */
-            yAlignment(yAlignment: string): Component;
-            /**
-             * Checks if the Component has a given CSS class.
-             *
-             * @param {string} cssClass The CSS class to check for.
-             */
-            hasClass(cssClass: string): boolean;
-            /**
-             * Adds a given CSS class to the Component.
-             *
-             * @param {string} cssClass The CSS class to add.
-             * @returns {Component} The calling Component.
-             */
-            addClass(cssClass: string): Component;
-            /**
-             * Removes a given CSS class from the Component.
-             *
-             * @param {string} cssClass The CSS class to remove.
-             * @returns {Component} The calling Component.
-             */
-            removeClass(cssClass: string): Component;
-            /**
-             * Checks if the Component has a fixed width or if it grows to fill available space.
-             * Returns false by default on the base Component class.
-             */
-            fixedWidth(): boolean;
-            /**
-             * Checks if the Component has a fixed height or if it grows to fill available space.
-             * Returns false by default on the base Component class.
-             */
-            fixedHeight(): boolean;
-            /**
-             * Detaches a Component from the DOM. The Component can be reused.
-             *
-             * This should only be used if you plan on reusing the calling Component. Otherwise, use destroy().
-             *
-             * @returns The calling Component.
-             */
-            detach(): Component;
-            /**
-             * Adds a callback to be called when the Component is detach()-ed.
-             *
-             * @param {ComponentCallback} callback
-             * @return {Component} The calling Component.
-             */
-            onDetach(callback: ComponentCallback): Component;
-            /**
-             * Removes a callback to be called when the Component is detach()-ed.
-             * The callback is identified by reference equality.
-             *
-             * @param {ComponentCallback} callback
-             * @return {Component} The calling Component.
-             */
-            offDetach(callback: ComponentCallback): Component;
-            /**
-             * Gets the parent ComponentContainer for this Component.
-             */
-            parent(): ComponentContainer;
-            /**
-             * Sets the parent ComponentContainer for this Component.
-             * An error will be thrown if the parent does not contain this Component.
-             * Adding a Component to a ComponentContainer should be done
-             * using the appropriate method on the ComponentContainer.
-             */
-            parent(parent: ComponentContainer): Component;
-            /**
-             * Removes a Component from the DOM and disconnects all listeners.
-             */
-            destroy(): void;
-            /**
-             * Gets the width of the Component in pixels.
-             */
-            width(): number;
-            /**
-             * Gets the height of the Component in pixels.
-             */
-            height(): number;
-            /**
-             * Gets the origin of the Component relative to its parent.
-             *
-             * @return {Point}
-             */
-            origin(): Point;
-            /**
-             * Gets the origin of the Component relative to the root <svg>.
-             *
-             * @return {Point}
-             */
-            originToSVG(): Point;
-            /**
-             * Gets the Selection containing the <g> in front of the visual elements of the Component.
-             *
-             * Will return undefined if the Component has not been anchored.
-             *
-             * @return {d3.Selection}
-             */
-            foreground(): d3.Selection<void>;
-            /**
-             * Gets a Selection containing a <g> that holds the visual elements of the Component.
-             *
-             * Will return undefined if the Component has not been anchored.
-             *
-             * @return {d3.Selection} content selection for the Component
-             */
-            content(): d3.Selection<void>;
-            /**
-             * Gets the Selection containing the <g> behind the visual elements of the Component.
-             *
-             * Will return undefined if the Component has not been anchored.
-             *
-             * @return {d3.Selection} background selection for the Component
-             */
-            background(): d3.Selection<void>;
-        }
-    }
-
-
-    namespace Plottable {
-        class ComponentContainer extends Component {
-            constructor();
-            anchor(selection: d3.Selection<void>): ComponentContainer;
-            render(): ComponentContainer;
-            /**
-             * Checks whether the specified Component is in the ComponentContainer.
-             */
-            has(component: Component): boolean;
-            protected _adoptAndAnchor(component: Component): void;
-            /**
-             * Removes the specified Component from the ComponentContainer.
-             */
-            remove(component: Component): ComponentContainer;
-            /**
-             * Carry out the actual removal of a Component.
-             * Implementation dependent on the type of container.
-             *
-             * @return {boolean} true if the Component was successfully removed, false otherwise.
-             */
-            protected _remove(component: Component): boolean;
-            /**
-             * Invokes a callback on each Component in the ComponentContainer.
-             */
-            protected _forEach(callback: (component: Component) => void): void;
-            /**
-             * Destroys the ComponentContainer and all Components within it.
-             */
-            destroy(): void;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class Group extends ComponentContainer {
-                /**
-                 * Constructs a Group.
-                 *
-                 * A Group contains Components that will be rendered on top of each other.
-                 * Components added later will be rendered above Components already in the Group.
-                 *
-                 * @constructor
-                 * @param {Component[]} [components=[]] Components to be added to the Group.
-                 */
-                constructor(components?: Component[]);
-                protected _forEach(callback: (component: Component) => any): void;
-                /**
-                 * Checks whether the specified Component is in the Group.
-                 */
-                has(component: Component): boolean;
-                requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-                computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Group;
-                protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-                    width: number;
-                    height: number;
-                };
-                fixedWidth(): boolean;
-                fixedHeight(): boolean;
-                /**
-                 * @return {Component[]} The Components in this Group.
-                 */
-                components(): Component[];
-                /**
-                 * Adds a Component to this Group.
-                 * The added Component will be rendered above Components already in the Group.
-                 */
-                append(component: Component): Group;
-                protected _remove(component: Component): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        class Axis<D> extends Component {
-            /**
-             * The css class applied to each end tick mark (the line on the end tick).
-             */
-            static END_TICK_MARK_CLASS: string;
-            /**
-             * The css class applied to each tick mark (the line on the tick).
-             */
-            static TICK_MARK_CLASS: string;
-            /**
-             * The css class applied to each tick label (the text associated with the tick).
-             */
-            static TICK_LABEL_CLASS: string;
-            protected _tickMarkContainer: d3.Selection<void>;
-            protected _tickLabelContainer: d3.Selection<void>;
-            protected _baseline: d3.Selection<void>;
-            protected _scale: Scale<D, number>;
-            protected _computedWidth: number;
-            protected _computedHeight: number;
-            /**
-             * Constructs an Axis.
-             * An Axis is a visual representation of a Scale.
-             *
-             * @constructor
-             * @param {Scale} scale
-             * @param {string} orientation One of "top"/"bottom"/"left"/"right".
-             */
-            constructor(scale: Scale<D, number>, orientation: string);
-            destroy(): void;
-            protected _isHorizontal(): boolean;
-            protected _computeWidth(): number;
-            protected _computeHeight(): number;
-            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-            fixedHeight(): boolean;
-            fixedWidth(): boolean;
-            protected _rescale(): void;
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Axis<D>;
-            protected _setup(): void;
-            protected _getTickValues(): D[];
-            renderImmediately(): Axis<D>;
-            protected _generateBaselineAttrHash(): {
-                [key: string]: number;
-            };
-            protected _generateTickMarkAttrHash(isEndTickMark?: boolean): {
-                [key: string]: number | ((d: any) => number);
-            };
-            redraw(): Component;
-            protected _setDefaultAlignment(): void;
-            /**
-             * Gets the Formatter on the Axis. Tick values are passed through the
-             * Formatter before being displayed.
-             */
-            formatter(): Formatter;
-            /**
-             * Sets the Formatter on the Axis. Tick values are passed through the
-             * Formatter before being displayed.
-             *
-             * @param {Formatter} formatter
-             * @returns {Axis} The calling Axis.
-             */
-            formatter(formatter: Formatter): Axis<D>;
-            /**
-             * @deprecated As of release 1.3, replaced by innerTickLength()
-             *
-             * Gets the tick mark length in pixels.
-             */
-            tickLength(): number;
-            /**
-             * Sets the tick mark length in pixels.
-             *
-             * @param {number} length
-             * @returns {Axis} The calling Axis.
-             */
-            tickLength(length: number): Axis<D>;
-            /**
-             * Gets the tick mark length in pixels.
-             */
-            innerTickLength(): number;
-            /**
-             * Sets the tick mark length in pixels.
-             *
-             * @param {number} length
-             * @returns {Axis} The calling Axis.
-             */
-            innerTickLength(length: number): Axis<D>;
-            /**
-             * Gets the end tick mark length in pixels.
-             */
-            endTickLength(): number;
-            /**
-             * Sets the end tick mark length in pixels.
-             *
-             * @param {number} length
-             * @returns {Axis} The calling Axis.
-             */
-            endTickLength(length: number): Axis<D>;
-            protected _maxLabelTickLength(): number;
-            /**
-             * Gets the padding between each tick mark and its associated label in pixels.
-             */
-            tickLabelPadding(): number;
-            /**
-             * Sets the padding between each tick mark and its associated label in pixels.
-             *
-             * @param {number} padding
-             * @returns {Axis} The calling Axis.
-             */
-            tickLabelPadding(padding: number): Axis<D>;
-            /**
-             * Gets the margin in pixels.
-             * The margin is the amount of space between the tick labels and the outer edge of the Axis.
-             */
-            margin(): number;
-            /**
-             * Sets the margin in pixels.
-             * The margin is the amount of space between the tick labels and the outer edge of the Axis.
-             *
-             * @param {number} size
-             * @returns {Axis} The calling Axis.
-             */
-            margin(size: number): Axis<D>;
-            /**
-             * Gets the orientation of the Axis.
-             */
-            orientation(): string;
-            /**
-             * Sets the orientation of the Axis.
-             *
-             * @param {number} orientation One of "top"/"bottom"/"left"/"right".
-             * @returns {Axis} The calling Axis.
-             */
-            orientation(orientation: string): Axis<D>;
-            /**
-             * Gets whether the Axis shows the end tick labels.
-             */
-            showEndTickLabels(): boolean;
-            /**
-             * Sets whether the Axis shows the end tick labels.
-             *
-             * @param {boolean} show
-             * @returns {Axis} The calling Axis.
-             */
-            showEndTickLabels(show: boolean): Axis<D>;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace TimeInterval {
-            var second: string;
-            var minute: string;
-            var hour: string;
-            var day: string;
-            var week: string;
-            var month: string;
-            var year: string;
-        }
-        namespace Axes {
-            /**
-             * Defines a configuration for a Time Axis tier.
-             * For details on how ticks are generated see: https://github.com/mbostock/d3/wiki/Time-Scales#ticks
-             * interval - A time unit associated with this configuration (seconds, minutes, hours, etc).
-             * step - number of intervals between each tick.
-             * formatter - formatter used to format tick labels.
-             */
-            type TimeAxisTierConfiguration = {
-                interval: string;
-                step: number;
-                formatter: Formatter;
-            };
-            /**
-             * An array of linked TimeAxisTierConfigurations.
-             * Each configuration will be shown on a different tier.
-             * Currently, up to two tiers are supported.
-             */
-            type TimeAxisConfiguration = TimeAxisTierConfiguration[];
-            class Time extends Axis<Date> {
-                /**
-                 * The CSS class applied to each Time Axis tier
-                 */
-                static TIME_AXIS_TIER_CLASS: string;
-                /**
-                 * Constructs a Time Axis.
-                 *
-                 * A Time Axis is a visual representation of a Time Scale.
-                 *
-                 * @constructor
-                 * @param {Scales.Time} scale
-                 * @param {string} orientation One of "top"/"bottom".
-                 */
-                constructor(scale: Scales.Time, orientation: string);
-                /**
-                 * Gets the label positions for each tier.
-                 */
-                tierLabelPositions(): string[];
-                /**
-                 * Sets the label positions for each tier.
-                 *
-                 * @param {string[]} newPositions The positions for each tier. "bottom" and "center" are the only supported values.
-                 * @returns {Axes.Time} The calling Time Axis.
-                 */
-                tierLabelPositions(newPositions: string[]): Time;
-                /**
-                 * Gets the possible TimeAxisConfigurations.
-                 */
-                axisConfigurations(): TimeAxisConfiguration[];
-                /**
-                 * Sets the possible TimeAxisConfigurations.
-                 * The Time Axis will choose the most precise configuration that will display in the available space.
-                 *
-                 * @param {TimeAxisConfiguration[]} configurations
-                 * @returns {Axes.Time} The calling Time Axis.
-                 */
-                axisConfigurations(configurations: TimeAxisConfiguration[]): Time;
-                orientation(): string;
-                orientation(orientation: string): Time;
-                protected _computeHeight(): number;
-                protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-                    width: number;
-                    height: number;
-                };
-                protected _setup(): void;
-                protected _getTickValues(): any[];
-                renderImmediately(): Time;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Axes {
-            class Numeric extends Axis<number> {
-                /**
-                 * Constructs a Numeric Axis.
-                 *
-                 * A Numeric Axis is a visual representation of a QuantitativeScale.
-                 *
-                 * @constructor
-                 * @param {QuantitativeScale} scale
-                 * @param {string} orientation One of "top"/"bottom"/"left"/"right".
-                 */
-                constructor(scale: QuantitativeScale<number>, orientation: string);
-                protected _setup(): void;
-                protected _computeWidth(): number;
-                protected _computeHeight(): number;
-                protected _getTickValues(): number[];
-                protected _rescale(): void;
-                renderImmediately(): Numeric;
-                /**
-                 * Gets the tick label position relative to the tick marks.
-                 *
-                 * @returns {string} The current tick label position.
-                 */
-                tickLabelPosition(): string;
-                /**
-                 * Sets the tick label position relative to the tick marks.
-                 *
-                 * @param {string} position "top"/"center"/"bottom" for a vertical Numeric Axis,
-                 *                          "left"/"center"/"right" for a horizontal Numeric Axis.
-                 * @returns {Numeric} The calling Numeric Axis.
-                 */
-                tickLabelPosition(position: string): Numeric;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Axes {
-            class Category extends Axis<string> {
-                /**
-                 * Constructs a Category Axis.
-                 *
-                 * A Category Axis is a visual representation of a Category Scale.
-                 *
-                 * @constructor
-                 * @param {Scales.Category} scale
-                 * @param {string} [orientation="bottom"] One of "top"/"bottom"/"left"/"right".
-                 */
-                constructor(scale: Scales.Category, orientation: string);
-                protected _setup(): void;
-                protected _rescale(): Component;
-                requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-                protected _getTickValues(): string[];
-                /**
-                 * Gets the tick label angle in degrees.
-                 */
-                tickLabelAngle(): number;
-                /**
-                 * Sets the tick label angle in degrees.
-                 * Right now only -90/0/90 are supported. 0 is horizontal.
-                 *
-                 * @param {number} angle
-                 * @returns {Category} The calling Category Axis.
-                 */
-                tickLabelAngle(angle: number): Category;
-                renderImmediately(): Category;
-                computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Axis<string>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class Label extends Component {
-                /**
-                 * A Label is a Component that displays a single line of text.
-                 *
-                 * @constructor
-                 * @param {string} [displayText=""] The text of the Label.
-                 * @param {number} [angle=0] The angle of the Label in degrees (-90/0/90). 0 is horizontal.
-                 */
-                constructor(displayText?: string, angle?: number);
-                requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-                protected _setup(): void;
-                /**
-                 * Gets the Label's text.
-                 */
-                text(): string;
-                /**
-                 * Sets the Label's text.
-                 *
-                 * @param {string} displayText
-                 * @returns {Label} The calling Label.
-                 */
-                text(displayText: string): Label;
-                /**
-                 * Gets the angle of the Label in degrees.
-                 */
-                angle(): number;
-                /**
-                 * Sets the angle of the Label in degrees.
-                 *
-                 * @param {number} angle One of -90/0/90. 0 is horizontal.
-                 * @returns {Label} The calling Label.
-                 */
-                angle(angle: number): Label;
-                /**
-                 * Gets the amount of padding around the Label in pixels.
-                 */
-                padding(): number;
-                /**
-                 * Sets the amount of padding around the Label in pixels.
-                 *
-                 * @param {number} padAmount
-                 * @returns {Label} The calling Label.
-                 */
-                padding(padAmount: number): Label;
-                fixedWidth(): boolean;
-                fixedHeight(): boolean;
-                renderImmediately(): Label;
-            }
-            class TitleLabel extends Label {
-                static TITLE_LABEL_CLASS: string;
-                /**
-                 * @constructor
-                 * @param {string} [text]
-                 * @param {number} [angle] One of -90/0/90. 0 is horizontal.
-                 */
-                constructor(text?: string, angle?: number);
-            }
-            class AxisLabel extends Label {
-                static AXIS_LABEL_CLASS: string;
-                /**
-                 * @constructor
-                 * @param {string} [text]
-                 * @param {number} [angle] One of -90/0/90. 0 is horizontal.
-                 */
-                constructor(text?: string, angle?: number);
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class Legend extends Component {
-                /**
-                 * The css class applied to each legend row
-                 */
-                static LEGEND_ROW_CLASS: string;
-                /**
-                 * The css class applied to each legend entry
-                 */
-                static LEGEND_ENTRY_CLASS: string;
-                /**
-                 * The css class applied to each legend symbol
-                 */
-                static LEGEND_SYMBOL_CLASS: string;
-                /**
-                 * The Legend consists of a series of entries, each with a color and label taken from the Color Scale.
-                 *
-                 * @constructor
-                 * @param {Scale.Color} scale
-                 */
-                constructor(colorScale: Scales.Color);
-                protected _setup(): void;
-                /**
-                 * Gets the maximum number of entries per row.
-                 *
-                 * @returns {number}
-                 */
-                maxEntriesPerRow(): number;
-                /**
-                 * Sets the maximum number of entries perrow.
-                 *
-                 * @param {number} maxEntriesPerRow
-                 * @returns {Legend} The calling Legend.
-                 */
-                maxEntriesPerRow(maxEntriesPerRow: number): Legend;
-                /**
-                 * Gets the current comparator for the Legend's entries.
-                 *
-                 * @returns {(a: string, b: string) => number}
-                 */
-                comparator(): (a: string, b: string) => number;
-                /**
-                 * Sets a new comparator for the Legend's entries.
-                 * The comparator is used to set the display order of the entries.
-                 *
-                 * @param {(a: string, b: string) => number} comparator
-                 * @returns {Legend} The calling Legend.
-                 */
-                comparator(comparator: (a: string, b: string) => number): Legend;
-                /**
-                 * Gets the Color Scale.
-                 *
-                 * @returns {Scales.Color}
-                 */
-                colorScale(): Scales.Color;
-                /**
-                 * Sets the Color Scale.
-                 *
-                 * @param {Scales.Color} scale
-                 * @returns {Legend} The calling Legend.
-                 */
-                colorScale(colorScale: Scales.Color): Legend;
-                destroy(): void;
-                requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-                /**
-                 * Gets the Entities (representing Legend entries) at a particular point.
-                 * Returns an empty array if no Entities are present at that location.
-                 *
-                 * @param {Point} p
-                 * @returns {Entity<Legend>[]}
-                 */
-                entitiesAt(p: Point): Entity<Legend>[];
-                renderImmediately(): Legend;
-                /**
-                 * Gets the function determining the symbols of the Legend.
-                 *
-                 * @returns {(datum: any, index: number) => symbolFactory}
-                 */
-                symbol(): (datum: any, index: number) => SymbolFactory;
-                /**
-                 * Sets the function determining the symbols of the Legend.
-                 *
-                 * @param {(datum: any, index: number) => SymbolFactory} symbol
-                 * @returns {Legend} The calling Legend
-                 */
-                symbol(symbol: (datum: any, index: number) => SymbolFactory): Legend;
-                fixedWidth(): boolean;
-                fixedHeight(): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class InterpolatedColorLegend extends Component {
-                /**
-                 * The css class applied to the legend labels.
-                 */
-                static LEGEND_LABEL_CLASS: string;
-                /**
-                 * Creates an InterpolatedColorLegend.
-                 *
-                 * The InterpolatedColorLegend consists of a sequence of swatches that show the
-                 * associated InterpolatedColor Scale sampled at various points.
-                 * Two labels show the maximum and minimum values of the InterpolatedColor Scale.
-                 *
-                 * @constructor
-                 * @param {Scales.InterpolatedColor} interpolatedColorScale
-                 */
-                constructor(interpolatedColorScale: Scales.InterpolatedColor);
-                destroy(): void;
-                /**
-                 * Gets the Formatter for the labels.
-                 */
-                formatter(): Formatter;
-                /**
-                 * Sets the Formatter for the labels.
-                 *
-                 * @param {Formatter} formatter
-                 * @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
-                 */
-                formatter(formatter: Formatter): InterpolatedColorLegend;
-                /**
-                 * Gets the orientation.
-                 */
-                orientation(): string;
-                /**
-                 * Sets the orientation.
-                 *
-                 * @param {string} orientation One of "horizontal"/"left"/"right".
-                 * @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
-                 */
-                orientation(orientation: string): InterpolatedColorLegend;
-                fixedWidth(): boolean;
-                fixedHeight(): boolean;
-                protected _setup(): void;
-                requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-                renderImmediately(): InterpolatedColorLegend;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class Gridlines extends Component {
-                /**
-                 * @constructor
-                 * @param {QuantitativeScale} xScale The scale to base the x gridlines on. Pass null if no gridlines are desired.
-                 * @param {QuantitativeScale} yScale The scale to base the y gridlines on. Pass null if no gridlines are desired.
-                 */
-                constructor(xScale: QuantitativeScale<any>, yScale: QuantitativeScale<any>);
-                destroy(): Gridlines;
-                protected _setup(): void;
-                renderImmediately(): Gridlines;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class Table extends ComponentContainer {
-                /**
-                 * A Table combines Components in the form of a grid. A
-                 * common case is combining a y-axis, x-axis, and the plotted data via
-                 * ```typescript
-                 * new Table([[yAxis, plot],
-                 *            [null,  xAxis]]);
-                 * ```
-                 *
-                 * @constructor
-                 * @param {Component[][]} [rows=[]] A 2-D array of Components to be added to the Table.
-                 *   null can be used if a cell is empty.
-                 */
-                constructor(rows?: Component[][]);
-                protected _forEach(callback: (component: Component) => any): void;
-                /**
-                 * Checks whether the specified Component is in the Table.
-                 */
-                has(component: Component): boolean;
-                /**
-                 * Adds a Component in the specified row and column position.
-                 *
-                 * For example, instead of calling `new Table([[a, b], [null, c]])`, you
-                 * could call
-                 * ```typescript
-                 * var table = new Table();
-                 * table.add(a, 0, 0);
-                 * table.add(b, 0, 1);
-                 * table.add(c, 1, 1);
-                 * ```
-                 *
-                 * @param {Component} component The Component to be added.
-                 * @param {number} row
-                 * @param {number} col
-                 * @returns {Table} The calling Table.
-                 */
-                add(component: Component, row: number, col: number): Table;
-                protected _remove(component: Component): boolean;
-                requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-                computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Table;
-                /**
-                 * Gets the padding above and below each row in pixels.
-                 */
-                rowPadding(): number;
-                /**
-                 * Sets the padding above and below each row in pixels.
-                 *
-                 * @param {number} rowPadding
-                 * @returns {Table} The calling Table.
-                 */
-                rowPadding(rowPadding: number): Table;
-                /**
-                 * Gets the padding to the left and right of each column in pixels.
-                 */
-                columnPadding(): number;
-                /**
-                 * Sets the padding to the left and right of each column in pixels.
-                 *
-                 * @param {number} columnPadding
-                 * @returns {Table} The calling Table.
-                 */
-                columnPadding(columnPadding: number): Table;
-                /**
-                 * Gets the weight of the specified row.
-                 *
-                 * @param {number} index
-                 */
-                rowWeight(index: number): number;
-                /**
-                 * Sets the weight of the specified row.
-                 * Space is allocated to rows based on their weight. Rows with higher weights receive proportionally more space.
-                 *
-                 * A common case would be to have one row take up 2/3rds of the space,
-                 * and the other row take up 1/3rd.
-                 *
-                 * Example:
-                 *
-                 * ```JavaScript
-                 * plot = new Plottable.Component.Table([
-                 *  [row1],
-                 *  [row2]
-                 * ]);
-                 *
-                 * // assign twice as much space to the first row
-                 * plot
-                 *  .rowWeight(0, 2)
-                 *  .rowWeight(1, 1)
-                 * ```
-                 *
-                 * @param {number} index
-                 * @param {number} weight
-                 * @returns {Table} The calling Table.
-                 */
-                rowWeight(index: number, weight: number): Table;
-                /**
-                 * Gets the weight of the specified column.
-                 *
-                 * @param {number} index
-                 */
-                columnWeight(index: number): number;
-                /**
-                 * Sets the weight of the specified column.
-                 * Space is allocated to columns based on their weight. Columns with higher weights receive proportionally more space.
-                 *
-                 * Please see `rowWeight` docs for an example.
-                 *
-                 * @param {number} index
-                 * @param {number} weight
-                 * @returns {Table} The calling Table.
-                 */
-                columnWeight(index: number, weight: number): Table;
-                fixedWidth(): boolean;
-                fixedHeight(): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class SelectionBoxLayer extends Component {
-                protected _box: d3.Selection<void>;
-                constructor();
-                protected _setup(): void;
-                protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-                    width: number;
-                    height: number;
-                };
-                /**
-                 * Gets the Bounds of the box.
-                 */
-                bounds(): Bounds;
-                /**
-                 * Sets the Bounds of the box.
-                 *
-                 * @param {Bounds} newBounds
-                 * @return {SelectionBoxLayer} The calling SelectionBoxLayer.
-                 */
-                bounds(newBounds: Bounds): SelectionBoxLayer;
-                protected _setBounds(newBounds: Bounds): void;
-                renderImmediately(): SelectionBoxLayer;
-                /**
-                 * Gets whether the box is being shown.
-                 */
-                boxVisible(): boolean;
-                /**
-                 * Shows or hides the selection box.
-                 *
-                 * @param {boolean} show Whether or not to show the box.
-                 * @return {SelectionBoxLayer} The calling SelectionBoxLayer.
-                 */
-                boxVisible(show: boolean): SelectionBoxLayer;
-                fixedWidth(): boolean;
-                fixedHeight(): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            interface PlotEntity extends Entity<Plot> {
-                dataset: Dataset;
-                index: number;
-                component: Plot;
-            }
-            interface AccessorScaleBinding<D, R> {
-                accessor: Accessor<any>;
-                scale?: Scale<D, R>;
-            }
-            namespace Animator {
-                var MAIN: string;
-                var RESET: string;
-            }
-        }
-        class Plot extends Component {
-            protected static _ANIMATION_MAX_DURATION: number;
-            protected _renderArea: d3.Selection<void>;
-            protected _renderCallback: ScaleCallback<Scale<any, any>>;
-            protected _propertyExtents: d3.Map<any[]>;
-            protected _propertyBindings: d3.Map<Plots.AccessorScaleBinding<any, any>>;
-            /**
-             * A Plot draws some visualization of the inputted Datasets.
-             *
-             * @constructor
-             */
-            constructor();
-            anchor(selection: d3.Selection<void>): Plot;
-            protected _setup(): void;
-            destroy(): void;
-            /**
-             * Adds a Dataset to the Plot.
-             *
-             * @param {Dataset} dataset
-             * @returns {Plot} The calling Plot.
-             */
-            addDataset(dataset: Dataset): Plot;
-            protected _createNodesForDataset(dataset: Dataset): Drawer;
-            protected _createDrawer(dataset: Dataset): Drawer;
-            protected _getAnimator(key: string): Animator;
-            protected _onDatasetUpdate(): void;
-            /**
-             * Gets the AccessorScaleBinding for a particular attribute.
-             *
-             * @param {string} attr
-             */
-            attr<A>(attr: string): Plots.AccessorScaleBinding<A, number | string>;
-            /**
-             * Sets a particular attribute to a constant value or the result of an Accessor.
-             *
-             * @param {string} attr
-             * @param {number|string|Accessor<number>|Accessor<string>} attrValue
-             * @returns {Plot} The calling Plot.
-             */
-            attr(attr: string, attrValue: number | string | Accessor<number> | Accessor<string>): Plot;
-            /**
-             * Sets a particular attribute to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the attribute values when autoDomain()-ing.
-             *
-             * @param {string} attr
-             * @param {A|Accessor<A>} attrValue
-             * @param {Scale<A, number | string>} scale The Scale used to scale the attrValue.
-             * @returns {Plot} The calling Plot.
-             */
-            attr<A>(attr: string, attrValue: A | Accessor<A>, scale: Scale<A, number | string>): Plot;
-            protected _bindProperty(property: string, value: any, scale: Scale<any, any>): void;
-            protected _generateAttrToProjector(): AttributeToProjector;
-            renderImmediately(): Plot;
-            /**
-             * Returns whether the plot will be animated.
-             */
-            animated(): boolean;
-            /**
-             * Enables or disables animation.
-             */
-            animated(willAnimate: boolean): Plot;
-            detach(): Plot;
-            /**
-             * Updates the extents associated with each attribute, then autodomains all scales the Plot uses.
-             */
-            protected _updateExtents(): void;
-            protected _updateExtentsForProperty(property: string): void;
-            protected _filterForProperty(property: string): Accessor<boolean>;
-            /**
-             * Override in subclass to add special extents, such as included values
-             */
-            protected _extentsForProperty(property: string): any[];
-            /**
-             * Get the Animator associated with the specified Animator key.
-             *
-             * @return {Animator}
-             */
-            animator(animatorKey: string): Animator;
-            /**
-             * Set the Animator associated with the specified Animator key.
-             *
-             * @param {string} animatorKey
-             * @param {Animator} animator
-             * @returns {Plot} The calling Plot.
-             */
-            animator(animatorKey: string, animator: Animator): Plot;
-            /**
-             * Removes a Dataset from the Plot.
-             *
-             * @param {Dataset} dataset
-             * @returns {Plot} The calling Plot.
-             */
-            removeDataset(dataset: Dataset): Plot;
-            protected _removeDatasetNodes(dataset: Dataset): void;
-            datasets(): Dataset[];
-            datasets(datasets: Dataset[]): Plot;
-            protected _getDrawersInOrder(): Drawer[];
-            protected _generateDrawSteps(): Drawers.DrawStep[];
-            protected _additionalPaint(time: number): void;
-            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-            /**
-             * Retrieves Selections of this Plot for the specified Datasets.
-             *
-             * @param {Dataset[]} [datasets] The Datasets to retrieve the Selections for.
-             *   If not provided, Selections will be retrieved for all Datasets on the Plot.
-             * @returns {d3.Selection}
-             */
-            selections(datasets?: Dataset[]): d3.Selection<any>;
-            /**
-             * Gets the Entities associated with the specified Datasets.
-             *
-             * @param {dataset[]} datasets The Datasets to retrieve the Entities for.
-             *   If not provided, returns defaults to all Datasets on the Plot.
-             * @return {Plots.PlotEntity[]}
-             */
-            entities(datasets?: Dataset[]): Plots.PlotEntity[];
-            /**
-             * Returns the PlotEntity nearest to the query point by the Euclidian norm, or undefined if no PlotEntity can be found.
-             *
-             * @param {Point} queryPoint
-             * @returns {Plots.PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
-             */
-            entityNearest(queryPoint: Point): Plots.PlotEntity;
-            protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
-            protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
-            protected _uninstallScaleForKey(scale: Scale<any, any>, key: string): void;
-            protected _installScaleForKey(scale: Scale<any, any>, key: string): void;
-            protected _propertyProjectors(): AttributeToProjector;
-            protected static _scaledAccessor<D, R>(binding: Plots.AccessorScaleBinding<D, R>): Accessor<any>;
-            protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
-            protected _animateOnNextRender(): boolean;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Pie extends Plot {
-                /**
-                 * @constructor
-                 */
-                constructor();
-                computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Pie;
-                addDataset(dataset: Dataset): Pie;
-                removeDataset(dataset: Dataset): Pie;
-                protected _onDatasetUpdate(): void;
-                protected _createDrawer(dataset: Dataset): Drawers.Arc;
-                entities(datasets?: Dataset[]): PlotEntity[];
-                /**
-                 * Gets the AccessorScaleBinding for the sector value.
-                 */
-                sectorValue<S>(): AccessorScaleBinding<S, number>;
-                /**
-                 * Sets the sector value to a constant number or the result of an Accessor<number>.
-                 *
-                 * @param {number|Accessor<number>} sectorValue
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                sectorValue(sectorValue: number | Accessor<number>): Plots.Pie;
-                /**
-                 * Sets the sector value to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {S|Accessor<S>} sectorValue
-                 * @param {Scale<S, number>} scale
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                sectorValue<S>(sectorValue: S | Accessor<S>, scale: Scale<S, number>): Plots.Pie;
-                /**
-                 * Gets the AccessorScaleBinding for the inner radius.
-                 */
-                innerRadius<R>(): AccessorScaleBinding<R, number>;
-                /**
-                 * Sets the inner radius to a constant number or the result of an Accessor<number>.
-                 *
-                 * @param {number|Accessor<number>} innerRadius
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                innerRadius(innerRadius: number | Accessor<number>): Plots.Pie;
-                /**
-                 * Sets the inner radius to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {R|Accessor<R>} innerRadius
-                 * @param {Scale<R, number>} scale
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                innerRadius<R>(innerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
-                /**
-                 * Gets the AccessorScaleBinding for the outer radius.
-                 */
-                outerRadius<R>(): AccessorScaleBinding<R, number>;
-                /**
-                 * Sets the outer radius to a constant number or the result of an Accessor<number>.
-                 *
-                 * @param {number|Accessor<number>} outerRadius
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                outerRadius(outerRadius: number | Accessor<number>): Plots.Pie;
-                /**
-                 * Sets the outer radius to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {R|Accessor<R>} outerRadius
-                 * @param {Scale<R, number>} scale
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                outerRadius<R>(outerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
-                /**
-                 * Get whether slice labels are enabled.
-                 *
-                 * @returns {boolean} Whether slices should display labels or not.
-                 */
-                labelsEnabled(): boolean;
-                /**
-                 * Sets whether labels are enabled.
-                 *
-                 * @param {boolean} labelsEnabled
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                labelsEnabled(enabled: boolean): Pie;
-                /**
-                 * Gets the Formatter for the labels.
-                 */
-                labelFormatter(): Formatter;
-                /**
-                 * Sets the Formatter for the labels.
-                 *
-                 * @param {Formatter} formatter
-                 * @returns {Pie} The calling Pie Plot.
-                 */
-                labelFormatter(formatter: Formatter): Pie;
-                entitiesAt(queryPoint: Point): PlotEntity[];
-                protected _propertyProjectors(): AttributeToProjector;
-                protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-                protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
-                    x: number;
-                    y: number;
-                };
-                protected _additionalPaint(time: number): void;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        class XYPlot<X, Y> extends Plot {
-            protected static _X_KEY: string;
-            protected static _Y_KEY: string;
-            /**
-             * An XYPlot is a Plot that displays data along two primary directions, X and Y.
-             *
-             * @constructor
-             * @param {Scale} xScale The x scale to use.
-             * @param {Scale} yScale The y scale to use.
-             */
-            constructor();
-            /**
-             * Returns the whether or not the rendering is deferred for performance boost.
-             * @return {boolean} The deferred rendering option
-             */
-            deferredRendering(): boolean;
-            /**
-             * Sets / unsets the deferred rendering option
-             * Activating this option improves the performance of plot interaction (pan / zoom) by
-             * performing lazy renders, only after the interaction has stopped. Because re-rendering
-             * is no longer performed during the interaction, the zooming might experience a small
-             * resolution degradation, before the lazy re-render is performed.
-             *
-             * This option is intended for cases where performance is an issue.
-             */
-            deferredRendering(deferredRendering: boolean): XYPlot<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for X.
-             */
-            x(): Plots.AccessorScaleBinding<X, number>;
-            /**
-             * Sets X to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} x
-             * @returns {XYPlot} The calling XYPlot.
-             */
-            x(x: number | Accessor<number>): XYPlot<X, Y>;
-            /**
-             * Sets X to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {X|Accessor<X>} x
-             * @param {Scale<X, number>} xScale
-             * @returns {XYPlot} The calling XYPlot.
-             */
-            x(x: X | Accessor<X>, xScale: Scale<X, number>): XYPlot<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for Y.
-             */
-            y(): Plots.AccessorScaleBinding<Y, number>;
-            /**
-             * Sets Y to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} y
-             * @returns {XYPlot} The calling XYPlot.
-             */
-            y(y: number | Accessor<number>): XYPlot<X, Y>;
-            /**
-             * Sets Y to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {Y|Accessor<Y>} y
-             * @param {Scale<Y, number>} yScale
-             * @returns {XYPlot} The calling XYPlot.
-             */
-            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): XYPlot<X, Y>;
-            protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
-            protected _uninstallScaleForKey(scale: Scale<any, any>, key: string): void;
-            protected _installScaleForKey(scale: Scale<any, any>, key: string): void;
-            destroy(): XYPlot<X, Y>;
-            /**
-             * Gets the automatic domain adjustment mode for visible points.
-             */
-            autorangeMode(): string;
-            /**
-             * Sets the automatic domain adjustment mode for visible points to operate against the X Scale, Y Scale, or neither.
-             * If "x" or "y" is specified the adjustment is immediately performed.
-             *
-             * @param {string} autorangeMode One of "x"/"y"/"none".
-             *   "x" will adjust the x Scale in relation to changes in the y domain.
-             *   "y" will adjust the y Scale in relation to changes in the x domain.
-             *   "none" means neither Scale will change automatically.
-             * @returns {XYPlot} The calling XYPlot.
-             */
-            autorangeMode(autorangeMode: string): XYPlot<X, Y>;
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): XYPlot<X, Y>;
-            /**
-             * Adjusts the domains of both X and Y scales to show all data.
-             * This call does not override the autorange() behavior.
-             *
-             * @returns {XYPlot} The calling XYPlot.
-             */
-            showAllData(): XYPlot<X, Y>;
-            protected _projectorsReady(): boolean;
-            protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
-            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Rectangle<X, Y> extends XYPlot<X, Y> {
-                /**
-                 * A Rectangle Plot displays rectangles based on the data.
-                 * The left and right edges of each rectangle can be set with x() and x2().
-                 *   If only x() is set the Rectangle Plot will attempt to compute the correct left and right edge positions.
-                 * The top and bottom edges of each rectangle can be set with y() and y2().
-                 *   If only y() is set the Rectangle Plot will attempt to compute the correct top and bottom edge positions.
-                 *
-                 * @constructor
-                 * @param {Scale.Scale} xScale
-                 * @param {Scale.Scale} yScale
-                 */
-                constructor();
-                protected _createDrawer(dataset: Dataset): Drawers.Rectangle;
-                protected _generateAttrToProjector(): {
-                    [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-                };
-                protected _generateDrawSteps(): Drawers.DrawStep[];
-                protected _updateExtentsForProperty(property: string): void;
-                protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
-                /**
-                 * Gets the AccessorScaleBinding for X.
-                 */
-                x(): AccessorScaleBinding<X, number>;
-                /**
-                 * Sets X to a constant number or the result of an Accessor<number>.
-                 *
-                 * @param {number|Accessor<number>} x
-                 * @returns {Plots.Rectangle} The calling Rectangle Plot.
-                 */
-                x(x: number | Accessor<number>): Plots.Rectangle<X, Y>;
-                /**
-                 * Sets X to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {X|Accessor<X>} x
-                 * @param {Scale<X, number>} xScale
-                 * @returns {Plots.Rectangle} The calling Rectangle Plot.
-                 */
-                x(x: X | Accessor<X>, xScale: Scale<X, number>): Plots.Rectangle<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for X2.
-                 */
-                x2(): AccessorScaleBinding<X, number>;
-                /**
-                 * Sets X2 to a constant number or the result of an Accessor.
-                 * If a Scale has been set for X, it will also be used to scale X2.
-                 *
-                 * @param {number|Accessor<number>|X|Accessor<X>} x2
-                 * @returns {Plots.Rectangle} The calling Rectangle Plot.
-                 */
-                x2(x2: number | Accessor<number> | X | Accessor<X>): Plots.Rectangle<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for Y.
-                 */
-                y(): AccessorScaleBinding<Y, number>;
-                /**
-                 * Sets Y to a constant number or the result of an Accessor<number>.
-                 *
-                 * @param {number|Accessor<number>} y
-                 * @returns {Plots.Rectangle} The calling Rectangle Plot.
-                 */
-                y(y: number | Accessor<number>): Plots.Rectangle<X, Y>;
-                /**
-                 * Sets Y to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {Y|Accessor<Y>} y
-                 * @param {Scale<Y, number>} yScale
-                 * @returns {Plots.Rectangle} The calling Rectangle Plot.
-                 */
-                y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Plots.Rectangle<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for Y2.
-                 */
-                y2(): AccessorScaleBinding<Y, number>;
-                /**
-                 * Sets Y2 to a constant number or the result of an Accessor.
-                 * If a Scale has been set for Y, it will also be used to scale Y2.
-                 *
-                 * @param {number|Accessor<number>|Y|Accessor<Y>} y2
-                 * @returns {Plots.Rectangle} The calling Rectangle Plot.
-                 */
-                y2(y2: number | Accessor<number> | Y | Accessor<Y>): Plots.Rectangle<X, Y>;
-                protected _propertyProjectors(): AttributeToProjector;
-                protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
-                    x: any;
-                    y: any;
-                };
-                protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Scatter<X, Y> extends XYPlot<X, Y> {
-                /**
-                 * A Scatter Plot draws a symbol at each data point.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                protected _createDrawer(dataset: Dataset): Drawers.Symbol;
-                /**
-                 * Gets the AccessorScaleBinding for the size property of the plot.
-                 * The size property corresponds to the area of the symbol.
-                 */
-                size<S>(): AccessorScaleBinding<S, number>;
-                /**
-                 * Sets the size property to a constant number or the result of an Accessor<number>.
-                 *
-                 * @param {number|Accessor<number>} size
-                 * @returns {Plots.Scatter} The calling Scatter Plot.
-                 */
-                size(size: number | Accessor<number>): Plots.Scatter<X, Y>;
-                /**
-                 * Sets the size property to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {S|Accessor<S>} sectorValue
-                 * @param {Scale<S, number>} scale
-                 * @returns {Plots.Scatter} The calling Scatter Plot.
-                 */
-                size<S>(size: S | Accessor<S>, scale: Scale<S, number>): Plots.Scatter<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for the symbol property of the plot.
-                 * The symbol property corresponds to how the symbol will be drawn.
-                 */
-                symbol(): AccessorScaleBinding<any, any>;
-                /**
-                 * Sets the symbol property to an Accessor<SymbolFactory>.
-                 *
-                 * @param {Accessor<SymbolFactory>} symbol
-                 * @returns {Plots.Scatter} The calling Scatter Plot.
-                 */
-                symbol(symbol: Accessor<SymbolFactory>): Plots.Scatter<X, Y>;
-                protected _generateDrawSteps(): Drawers.DrawStep[];
-                protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
-                protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
-                protected _propertyProjectors(): AttributeToProjector;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Bar<X, Y> extends XYPlot<X, Y> {
-                static ORIENTATION_VERTICAL: string;
-                static ORIENTATION_HORIZONTAL: string;
-                protected _isVertical: boolean;
-                /**
-                 * A Bar Plot draws bars growing out from a baseline to some value
-                 *
-                 * @constructor
-                 * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
-                 */
-                constructor(orientation?: string);
-                x(): Plots.AccessorScaleBinding<X, number>;
-                x(x: number | Accessor<number>): Bar<X, Y>;
-                x(x: X | Accessor<X>, xScale: Scale<X, number>): Bar<X, Y>;
-                y(): Plots.AccessorScaleBinding<Y, number>;
-                y(y: number | Accessor<number>): Bar<X, Y>;
-                y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Bar<X, Y>;
-                /**
-                 * Gets the orientation of the plot
-                 *
-                 * @return "vertical" | "horizontal"
-                 */
-                orientation(): string;
-                render(): Bar<X, Y>;
-                protected _createDrawer(dataset: Dataset): Drawers.Rectangle;
-                protected _setup(): void;
-                /**
-                 * Gets the baseline value.
-                 * The baseline is the line that the bars are drawn from.
-                 *
-                 * @returns {X|Y}
-                 */
-                baselineValue(): X | Y;
-                /**
-                 * Sets the baseline value.
-                 * The baseline is the line that the bars are drawn from.
-                 *
-                 * @param {X|Y} value
-                 * @returns {Bar} The calling Bar Plot.
-                 */
-                baselineValue(value: X | Y): Bar<X, Y>;
-                addDataset(dataset: Dataset): Bar<X, Y>;
-                removeDataset(dataset: Dataset): Bar<X, Y>;
-                /**
-                 * Get whether bar labels are enabled.
-                 *
-                 * @returns {boolean} Whether bars should display labels or not.
-                 */
-                labelsEnabled(): boolean;
-                /**
-                 * Sets whether labels are enabled.
-                 *
-                 * @param {boolean} labelsEnabled
-                 * @returns {Bar} The calling Bar Plot.
-                 */
-                labelsEnabled(enabled: boolean): Bar<X, Y>;
-                /**
-                 * Gets the Formatter for the labels.
-                 */
-                labelFormatter(): Formatter;
-                /**
-                 * Sets the Formatter for the labels.
-                 *
-                 * @param {Formatter} formatter
-                 * @returns {Bar} The calling Bar Plot.
-                 */
-                labelFormatter(formatter: Formatter): Bar<X, Y>;
-                protected _createNodesForDataset(dataset: Dataset): Drawer;
-                protected _removeDatasetNodes(dataset: Dataset): void;
-                /**
-                 * Returns the PlotEntity nearest to the query point according to the following algorithm:
-                 *   - If the query point is inside a bar, returns the PlotEntity for that bar.
-                 *   - Otherwise, gets the nearest PlotEntity by the primary direction (X for vertical, Y for horizontal),
-                 *     breaking ties with the secondary direction.
-                 * Returns undefined if no PlotEntity can be found.
-                 *
-                 * @param {Point} queryPoint
-                 * @returns {PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
-                 */
-                entityNearest(queryPoint: Point): PlotEntity;
-                protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
-                protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
-                /**
-                 * Gets the Entities at a particular Point.
-                 *
-                 * @param {Point} p
-                 * @returns {PlotEntity[]}
-                 */
-                entitiesAt(p: Point): PlotEntity[];
-                /**
-                 * Gets the Entities that intersect the Bounds.
-                 *
-                 * @param {Bounds} bounds
-                 * @returns {PlotEntity[]}
-                 */
-                entitiesIn(bounds: Bounds): PlotEntity[];
-                /**
-                 * Gets the Entities that intersect the area defined by the ranges.
-                 *
-                 * @param {Range} xRange
-                 * @param {Range} yRange
-                 * @returns {PlotEntity[]}
-                 */
-                entitiesIn(xRange: Range, yRange: Range): PlotEntity[];
-                protected _additionalPaint(time: number): void;
-                protected _generateDrawSteps(): Drawers.DrawStep[];
-                protected _generateAttrToProjector(): {
-                    [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-                };
-                /**
-                 * Computes the barPixelWidth of all the bars in the plot.
-                 *
-                 * If the position scale of the plot is a CategoryScale and in bands mode, then the rangeBands function will be used.
-                 * If the position scale of the plot is a CategoryScale and in points mode, then
-                 *   from https://github.com/mbostock/d3/wiki/Ordinal-Scales#ordinal_rangePoints, the max barPixelWidth is step * padding
-                 * If the position scale of the plot is a QuantitativeScale, then _getMinimumDataWidth is scaled to compute the barPixelWidth
-                 */
-                protected _getBarPixelWidth(): number;
-                entities(datasets?: Dataset[]): PlotEntity[];
-                protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
-                    x: any;
-                    y: any;
-                };
-                protected _uninstallScaleForKey(scale: Scale<any, number>, key: string): void;
-                protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Line<X> extends XYPlot<X, number> {
-                /**
-                 * A Line Plot draws line segments starting from the first data point to the next.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                protected _createDrawer(dataset: Dataset): Drawer;
-                protected _getResetYFunction(): (d: any, i: number, dataset: Dataset) => number;
-                protected _generateDrawSteps(): Drawers.DrawStep[];
-                protected _generateAttrToProjector(): {
-                    [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-                };
-                /**
-                 * Returns the PlotEntity nearest to the query point by X then by Y, or undefined if no PlotEntity can be found.
-                 *
-                 * @param {Point} queryPoint
-                 * @returns {PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
-                 */
-                entityNearest(queryPoint: Point): PlotEntity;
-                protected _propertyProjectors(): AttributeToProjector;
-                protected _constructLineProjector(xProjector: Projector, yProjector: Projector): (datum: any, index: number, dataset: Dataset) => string;
-                protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Area<X> extends Line<X> {
-                /**
-                 * An Area Plot draws a filled region (area) between Y and Y0.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                protected _setup(): void;
-                y(): Plots.AccessorScaleBinding<number, number>;
-                y(y: number | Accessor<number>): Area<X>;
-                y(y: number | Accessor<number>, yScale: QuantitativeScale<number>): Area<X>;
-                /**
-                 * Gets the AccessorScaleBinding for Y0.
-                 */
-                y0(): Plots.AccessorScaleBinding<number, number>;
-                /**
-                 * Sets Y0 to a constant number or the result of an Accessor<number>.
-                 * If a Scale has been set for Y, it will also be used to scale Y0.
-                 *
-                 * @param {number|Accessor<number>} y0
-                 * @returns {Area} The calling Area Plot.
-                 */
-                y0(y0: number | Accessor<number>): Area<X>;
-                protected _onDatasetUpdate(): void;
-                addDataset(dataset: Dataset): Area<X>;
-                protected _removeDatasetNodes(dataset: Dataset): void;
-                protected _additionalPaint(): void;
-                protected _createDrawer(dataset: Dataset): Drawers.Area;
-                protected _generateDrawSteps(): Drawers.DrawStep[];
-                protected _updateYScale(): void;
-                protected _getResetYFunction(): Accessor<any>;
-                protected _propertyProjectors(): AttributeToProjector;
-                selections(datasets?: Dataset[]): d3.Selection<any>;
-                protected _constructAreaProjector(xProjector: Projector, yProjector: Projector, y0Projector: Projector): (datum: any[], index: number, dataset: Dataset) => string;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class ClusteredBar<X, Y> extends Bar<X, Y> {
-                /**
-                 * A ClusteredBar Plot groups bars across Datasets based on the primary value of the bars.
-                 *   On a vertical ClusteredBar Plot, the bars with the same X value are grouped.
-                 *   On a horizontal ClusteredBar Plot, the bars with the same Y value are grouped.
-                 *
-                 * @constructor
-                 * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
-                 */
-                constructor(orientation?: string);
-                protected _generateAttrToProjector(): {
-                    [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-                };
-                protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class StackedArea<X> extends Area<X> {
-                /**
-                 * @constructor
-                 */
-                constructor();
-                protected _getAnimator(key: string): Animator;
-                protected _setup(): void;
-                x(): Plots.AccessorScaleBinding<X, number>;
-                x(x: number | Accessor<number>): StackedArea<X>;
-                x(x: X | Accessor<X>, xScale: Scale<X, number>): StackedArea<X>;
-                y(): Plots.AccessorScaleBinding<number, number>;
-                y(y: number | Accessor<number>): StackedArea<X>;
-                y(y: number | Accessor<number>, yScale: QuantitativeScale<number>): StackedArea<X>;
-                protected _additionalPaint(): void;
-                protected _updateYScale(): void;
-                protected _onDatasetUpdate(): StackedArea<X>;
-                protected _updateExtentsForProperty(property: string): void;
-                protected _extentsForProperty(attr: string): any[];
-                protected _propertyProjectors(): AttributeToProjector;
-                protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class StackedBar<X, Y> extends Bar<X, Y> {
-                /**
-                 * A StackedBar Plot stacks bars across Datasets based on the primary value of the bars.
-                 *   On a vertical StackedBar Plot, the bars with the same X value are stacked.
-                 *   On a horizontal StackedBar Plot, the bars with the same Y value are stacked.
-                 *
-                 * @constructor
-                 * @param {Scale} xScale
-                 * @param {Scale} yScale
-                 * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
-                 */
-                constructor(orientation?: string);
-                x(): Plots.AccessorScaleBinding<X, number>;
-                x(x: number | Accessor<number>): StackedBar<X, Y>;
-                x(x: X | Accessor<X>, xScale: Scale<X, number>): StackedBar<X, Y>;
-                y(): Plots.AccessorScaleBinding<Y, number>;
-                y(y: number | Accessor<number>): StackedBar<X, Y>;
-                y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): StackedBar<X, Y>;
-                protected _generateAttrToProjector(): {
-                    [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-                };
-                protected _onDatasetUpdate(): StackedBar<X, Y>;
-                protected _updateExtentsForProperty(property: string): void;
-                protected _extentsForProperty(attr: string): any[];
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Segment<X, Y> extends XYPlot<X, Y> {
-                /**
-                 * A Segment Plot displays line segments based on the data.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                protected _createDrawer(dataset: Dataset): Drawers.Segment;
-                protected _generateDrawSteps(): Drawers.DrawStep[];
-                protected _updateExtentsForProperty(property: string): void;
-                protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
-                /**
-                 * Gets the AccessorScaleBinding for X
-                 */
-                x(): AccessorScaleBinding<X, number>;
-                /**
-                 * Sets X to a constant value or the result of an Accessor.
-                 *
-                 * @param {X|Accessor<X>} x
-                 * @returns {Plots.Segment} The calling Segment Plot.
-                 */
-                x(x: number | Accessor<number>): Plots.Segment<X, Y>;
-                /**
-                 * Sets X to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {X|Accessor<X>} x
-                 * @param {Scale<X, number>} xScale
-                 * @returns {Plots.Segment} The calling Segment Plot.
-                 */
-                x(x: X | Accessor<X>, xScale: Scale<X, number>): Plots.Segment<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for X2
-                 */
-                x2(): AccessorScaleBinding<X, number>;
-                /**
-                 * Sets X2 to a constant number or the result of an Accessor.
-                 * If a Scale has been set for X, it will also be used to scale X2.
-                 *
-                 * @param {number|Accessor<number>|Y|Accessor<Y>} y2
-                 * @returns {Plots.Segment} The calling Segment Plot
-                 */
-                x2(x2: number | Accessor<number> | X | Accessor<X>): Plots.Segment<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for Y
-                 */
-                y(): AccessorScaleBinding<Y, number>;
-                /**
-                 * Sets Y to a constant value or the result of an Accessor.
-                 *
-                 * @param {Y|Accessor<Y>} y
-                 * @returns {Plots.Segment} The calling Segment Plot.
-                 */
-                y(y: number | Accessor<number>): Plots.Segment<X, Y>;
-                /**
-                 * Sets Y to a scaled constant value or scaled result of an Accessor.
-                 * The provided Scale will account for the values when autoDomain()-ing.
-                 *
-                 * @param {Y|Accessor<Y>} y
-                 * @param {Scale<Y, number>} yScale
-                 * @returns {Plots.Segment} The calling Segment Plot.
-                 */
-                y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Plots.Segment<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for Y2.
-                 */
-                y2(): AccessorScaleBinding<Y, number>;
-                /**
-                 * Sets Y2 to a constant number or the result of an Accessor.
-                 * If a Scale has been set for Y, it will also be used to scale Y2.
-                 *
-                 * @param {number|Accessor<number>|Y|Accessor<Y>} y2
-                 * @returns {Plots.Segment} The calling Segment Plot.
-                 */
-                y2(y2: number | Accessor<number> | Y | Accessor<Y>): Plots.Segment<X, Y>;
-                protected _propertyProjectors(): AttributeToProjector;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Plots {
-            class Waterfall<X, Y> extends Bar<X, number> {
-                constructor();
-                /**
-                 * Gets whether connectors are enabled.
-                 *
-                 * @returns {boolean} Whether connectors should be shown or not.
-                 */
-                connectorsEnabled(): boolean;
-                /**
-                 * Sets whether connectors are enabled.
-                 *
-                 * @param {boolean} enabled
-                 * @returns {Plots.Waterfall} The calling Waterfall Plot.
-                 */
-                connectorsEnabled(enabled: boolean): Waterfall<X, Y>;
-                /**
-                 * Gets the AccessorScaleBinding for whether a bar represents a total or a delta.
-                 */
-                total<T>(): Plots.AccessorScaleBinding<T, boolean>;
-                /**
-                 * Sets total to a constant number or the result of an Accessor
-                 *
-                 * @param {Accessor<boolean>}
-                 * @returns {Plots.Waterfall} The calling Waterfall Plot.
-                 */
-                total(total: Accessor<boolean>): Waterfall<X, Y>;
-                protected _additionalPaint(time: number): void;
-                protected _createNodesForDataset(dataset: Dataset): Drawer;
-                protected _extentsForProperty(attr: string): any[];
-                protected _generateAttrToProjector(): {
-                    [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-                };
-                protected _onDatasetUpdate(): Waterfall<X, Y>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        interface Animator {
-            /**
-             * Applies the supplied attributes to a d3.Selection with some animation.
-             *
-             * @param {d3.Selection} selection The update selection or transition selection that we wish to animate.
-             * @param {AttributeToAppliedProjector} attrToAppliedProjector The set of
-             *     AppliedProjectors that we will use to set attributes on the selection.
-             * @return {any} Animators should return the selection or
-             *     transition object so that plots may chain the transitions between
-             *     animators.
-             */
-            animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Selection<any> | d3.Transition<any>;
-            /**
-             * Given the number of elements, return the total time the animation requires
-             *
-             * @param {number} numberofIterations The number of elements that will be drawn
-             * @returns {number}
-             */
-            totalTime(numberOfIterations: number): number;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Animators {
-            /**
-             * An animator implementation with no animation. The attributes are
-             * immediately set on the selection.
-             */
-            class Null implements Animator {
-                totalTime(selection: any): number;
-                animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Selection<any>;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Animators {
-            /**
-             * An Animator with easing and configurable durations and delays.
-             */
-            class Easing implements Animator {
-                /**
-                 * Constructs the default animator
-                 *
-                 * @constructor
-                 */
-                constructor();
-                totalTime(numberOfSteps: number): number;
-                animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Transition<any>;
-                /**
-                 * Gets the start delay of the animation in milliseconds.
-                 *
-                 * @returns {number} The current start delay.
-                 */
-                startDelay(): number;
-                /**
-                 * Sets the start delay of the animation in milliseconds.
-                 *
-                 * @param {number} startDelay The start delay in milliseconds.
-                 * @returns {Easing} The calling Easing Animator.
-                 */
-                startDelay(startDelay: number): Easing;
-                /**
-                 * Gets the duration of one animation step in milliseconds.
-                 *
-                 * @returns {number} The current duration.
-                 */
-                stepDuration(): number;
-                /**
-                 * Sets the duration of one animation step in milliseconds.
-                 *
-                 * @param {number} stepDuration The duration in milliseconds.
-                 * @returns {Easing} The calling Easing Animator.
-                 */
-                stepDuration(stepDuration: number): Easing;
-                /**
-                 * Gets the maximum start delay between animation steps in milliseconds.
-                 *
-                 * @returns {number} The current maximum iterative delay.
-                 */
-                stepDelay(): number;
-                /**
-                 * Sets the maximum start delay between animation steps in milliseconds.
-                 *
-                 * @param {number} stepDelay The maximum iterative delay in milliseconds.
-                 * @returns {Easing} The calling Easing Animator.
-                 */
-                stepDelay(stepDelay: number): Easing;
-                /**
-                 * Gets the maximum total animation duration constraint in milliseconds.
-                 *
-                 * If the animation time would exceed the specified time, the duration of each step
-                 * and the delay between each step will be reduced until the animation fits within
-                 * the specified time.
-                 *
-                 * @returns {number} The current maximum total animation duration.
-                 */
-                maxTotalDuration(): number;
-                /**
-                 * Sets the maximum total animation duration constraint in miliseconds.
-                 *
-                 * If the animation time would exceed the specified time, the duration of each step
-                 * and the delay between each step will be reduced until the animation fits within
-                 * the specified time.
-                 *
-                 * @param {number} maxTotalDuration The maximum total animation duration in milliseconds.
-                 * @returns {Easing} The calling Easing Animator.
-                 */
-                maxTotalDuration(maxTotalDuration: number): Easing;
-                /**
-                 * Gets the current easing mode of the animation.
-                 *
-                 * @returns {string} the current easing mode.
-                 */
-                easingMode(): string;
-                /**
-                 * Sets the easing mode of the animation.
-                 *
-                 * @param {string} easingMode The desired easing mode.
-                 * @returns {Easing} The calling Easing Animator.
-                 */
-                easingMode(easingMode: string): Easing;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        class Dispatcher {
-            protected _eventToCallback: {
-                [eventName: string]: (e: Event) => any;
-            };
-            protected _callbacks: Utils.CallbackSet<Function>[];
-            protected _setCallback(callbackSet: Utils.CallbackSet<Function>, callback: Function): void;
-            protected _unsetCallback(callbackSet: Utils.CallbackSet<Function>, callback: Function): void;
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Dispatchers {
-            type MouseCallback = (p: Point, event: MouseEvent) => void;
-            class Mouse extends Dispatcher {
-                /**
-                 * Get a Mouse Dispatcher for the <svg> containing elem.
-                 * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
-                 *
-                 * @param {SVGElement} elem
-                 * @return {Dispatchers.Mouse}
-                 */
-                static getDispatcher(elem: SVGElement): Dispatchers.Mouse;
-                /**
-                 * This constructor not be invoked directly.
-                 *
-                 * @constructor
-                 * @param {SVGElement} svg The root <svg> to attach to.
-                 */
-                constructor(svg: SVGElement);
-                /**
-                 * Registers a callback to be called when the mouse position changes.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                onMouseMove(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Removes a callback that would be called when the mouse position changes.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                offMouseMove(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Registers a callback to be called when a mousedown occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                onMouseDown(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Removes a callback that would be called when a mousedown occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                offMouseDown(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Registers a callback to be called when a mouseup occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                onMouseUp(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Removes a callback that would be called when a mouseup occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                offMouseUp(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Registers a callback to be called when a wheel event occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                onWheel(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Removes a callback that would be called when a wheel event occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                offWheel(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Registers a callback to be called when a dblClick occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                onDblClick(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Removes a callback that would be called when a dblClick occurs.
-                 *
-                 * @param {MouseCallback} callback
-                 * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-                 */
-                offDblClick(callback: MouseCallback): Dispatchers.Mouse;
-                /**
-                 * Returns the last computed mouse position in <svg> coordinate space.
-                 *
-                 * @return {Point}
-                 */
-                lastMousePosition(): Point;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Dispatchers {
-            type TouchCallback = (ids: number[], idToPoint: {
-                [id: number]: Point;
-            }, event: TouchEvent) => void;
-            class Touch extends Dispatcher {
-                /**
-                 * Gets a Touch Dispatcher for the <svg> containing elem.
-                 * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
-                 *
-                 * @param {SVGElement} elem
-                 * @return {Dispatchers.Touch}
-                 */
-                static getDispatcher(elem: SVGElement): Dispatchers.Touch;
-                /**
-                 * This constructor should not be invoked directly.
-                 *
-                 * @constructor
-                 * @param {SVGElement} svg The root <svg> to attach to.
-                 */
-                constructor(svg: SVGElement);
-                /**
-                 * Registers a callback to be called when a touch starts.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                onTouchStart(callback: TouchCallback): Dispatchers.Touch;
-                /**
-                 * Removes a callback that would be called when a touch starts.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                offTouchStart(callback: TouchCallback): Dispatchers.Touch;
-                /**
-                 * Registers a callback to be called when the touch position changes.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                onTouchMove(callback: TouchCallback): Dispatchers.Touch;
-                /**
-                 * Removes a callback that would be called when the touch position changes.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                offTouchMove(callback: TouchCallback): Dispatchers.Touch;
-                /**
-                 * Registers a callback to be called when a touch ends.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                onTouchEnd(callback: TouchCallback): Dispatchers.Touch;
-                /**
-                 * Removes a callback that would be called when a touch ends.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                offTouchEnd(callback: TouchCallback): Dispatchers.Touch;
-                /**
-                 * Registers a callback to be called when a touch is cancelled.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                onTouchCancel(callback: TouchCallback): Dispatchers.Touch;
-                /**
-                 * Removes a callback that would be called when a touch is cancelled.
-                 *
-                 * @param {TouchCallback} callback
-                 * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-                 */
-                offTouchCancel(callback: TouchCallback): Dispatchers.Touch;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Dispatchers {
-            type KeyCallback = (keyCode: number, event: KeyboardEvent) => void;
-            class Key extends Dispatcher {
-                /**
-                 * Gets a Key Dispatcher. If one already exists it will be returned;
-                 * otherwise, a new one will be created.
-                 *
-                 * @return {Dispatchers.Key}
-                 */
-                static getDispatcher(): Dispatchers.Key;
-                /**
-                 * This constructor should not be invoked directly.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                /**
-                 * Registers a callback to be called whenever a key is pressed.
-                 *
-                 * @param {KeyCallback} callback
-                 * @return {Dispatchers.Key} The calling Key Dispatcher.
-                 */
-                onKeyDown(callback: KeyCallback): Key;
-                /**
-                 * Removes the callback to be called whenever a key is pressed.
-                 *
-                 * @param {KeyCallback} callback
-                 * @return {Dispatchers.Key} The calling Key Dispatcher.
-                 */
-                offKeyDown(callback: KeyCallback): Key;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        class Interaction {
-            protected _componentAttachedTo: Component;
-            protected _anchor(component: Component): void;
-            protected _unanchor(): void;
-            /**
-             * Attaches this Interaction to a Component.
-             * If the Interaction was already attached to a Component, it first detaches itself from the old Component.
-             *
-             * @param {Component} component
-             * @returns {Interaction} The calling Interaction.
-             */
-            attachTo(component: Component): Interaction;
-            /**
-             * Detaches this Interaction from the Component.
-             * This Interaction can be reused.
-             *
-             * @param {Component} component
-             * @returns {Interaction} The calling Interaction.
-             */
-            detachFrom(component: Component): Interaction;
-            /**
-             * Gets whether this Interaction is enabled.
-             */
-            enabled(): boolean;
-            /**
-             * Enables or disables this Interaction.
-             *
-             * @param {boolean} enabled Whether the Interaction should be enabled.
-             * @return {Interaction} The calling Interaction.
-             */
-            enabled(enabled: boolean): Interaction;
-            /**
-             * Translates an <svg>-coordinate-space point to Component-space coordinates.
-             *
-             * @param {Point} p A Point in <svg>-space coordinates.
-             * @return {Point} The same location in Component-space coordinates.
-             */
-            protected _translateToComponentSpace(p: Point): Point;
-            /**
-             * Checks whether a Component-coordinate-space Point is inside the Component.
-             *
-             * @param {Point} p A Point in Compoennt-space coordinates.
-             * @return {boolean} Whether or not the point is inside the Component.
-             */
-            protected _isInsideComponent(p: Point): boolean;
-        }
-    }
-
-
-    namespace Plottable {
-        type ClickCallback = (point: Point) => void;
-        namespace Interactions {
-            class Click extends Interaction {
-                protected _anchor(component: Component): void;
-                protected _unanchor(): void;
-                /**
-                 * Adds a callback to be called when the Component is clicked.
-                 *
-                 * @param {ClickCallback} callback
-                 * @return {Interactions.Click} The calling Click Interaction.
-                 */
-                onClick(callback: ClickCallback): Click;
-                /**
-                 * Removes a callback that would be called when the Component is clicked.
-                 *
-                 * @param {ClickCallback} callback
-                 * @return {Interactions.Click} The calling Click Interaction.
-                 */
-                offClick(callback: ClickCallback): Click;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Interactions {
-            class DoubleClick extends Interaction {
-                protected _anchor(component: Component): void;
-                protected _unanchor(): void;
-                /**
-                 * Adds a callback to be called when the Component is double-clicked.
-                 *
-                 * @param {ClickCallback} callback
-                 * @return {Interactions.DoubleClick} The calling DoubleClick Interaction.
-                 */
-                onDoubleClick(callback: ClickCallback): DoubleClick;
-                /**
-                 * Removes a callback that would be called when the Component is double-clicked.
-                 *
-                 * @param {ClickCallback} callback
-                 * @return {Interactions.DoubleClick} The calling DoubleClick Interaction.
-                 */
-                offDoubleClick(callback: ClickCallback): DoubleClick;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        type KeyCallback = (keyCode: number) => void;
-        namespace Interactions {
-            class Key extends Interaction {
-                protected _anchor(component: Component): void;
-                protected _unanchor(): void;
-                /**
-                 * Adds a callback to be called when the key with the given keyCode is
-                 * pressed and the user is moused over the Component.
-                 *
-                 * @param {number} keyCode
-                 * @param {KeyCallback} callback
-                 * @returns {Interactions.Key} The calling Key Interaction.
-                 */
-                onKeyPress(keyCode: number, callback: KeyCallback): Key;
-                /**
-                 * Removes a callback that would be called when the key with the given keyCode is
-                 * pressed and the user is moused over the Component.
-                 *
-                 * @param {number} keyCode
-                 * @param {KeyCallback} callback
-                 * @returns {Interactions.Key} The calling Key Interaction.
-                 */
-                offKeyPress(keyCode: number, callback: KeyCallback): Key;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        type PointerCallback = (point: Point) => void;
-        namespace Interactions {
-            class Pointer extends Interaction {
-                protected _anchor(component: Component): void;
-                protected _unanchor(): void;
-                /**
-                 * Adds a callback to be called when the pointer enters the Component.
-                 *
-                 * @param {PointerCallback} callback
-                 * @return {Interactions.Pointer} The calling Pointer Interaction.
-                 */
-                onPointerEnter(callback: PointerCallback): Pointer;
-                /**
-                 * Removes a callback that would be called when the pointer enters the Component.
-                 *
-                 * @param {PointerCallback} callback
-                 * @return {Interactions.Pointer} The calling Pointer Interaction.
-                 */
-                offPointerEnter(callback: PointerCallback): Pointer;
-                /**
-                 * Adds a callback to be called when the pointer moves within the Component.
-                 *
-                 * @param {PointerCallback} callback
-                 * @return {Interactions.Pointer} The calling Pointer Interaction.
-                 */
-                onPointerMove(callback: PointerCallback): Pointer;
-                /**
-                 * Removes a callback that would be called when the pointer moves within the Component.
-                 *
-                 * @param {PointerCallback} callback
-                 * @return {Interactions.Pointer} The calling Pointer Interaction.
-                 */
-                offPointerMove(callback: PointerCallback): Pointer;
-                /**
-                 * Adds a callback to be called when the pointer exits the Component.
-                 *
-                 * @param {PointerCallback} callback
-                 * @return {Interactions.Pointer} The calling Pointer Interaction.
-                 */
-                onPointerExit(callback: PointerCallback): Pointer;
-                /**
-                 * Removes a callback that would be called when the pointer exits the Component.
-                 *
-                 * @param {PointerCallback} callback
-                 * @return {Interactions.Pointer} The calling Pointer Interaction.
-                 */
-                offPointerExit(callback: PointerCallback): Pointer;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Interactions {
-            class PanZoom extends Interaction {
-                /**
-                 * A PanZoom Interaction updates the domains of an x-scale and/or a y-scale
-                 * in response to the user panning or zooming.
-                 *
-                 * @constructor
-                 * @param {QuantitativeScale} [xScale] The x-scale to update on panning/zooming.
-                 * @param {QuantitativeScale} [yScale] The y-scale to update on panning/zooming.
-                 */
-                constructor(xScale?: QuantitativeScale<any>, yScale?: QuantitativeScale<any>);
-                protected _anchor(component: Component): void;
-                protected _unanchor(): void;
-                /**
-                 * Gets the x scales for this PanZoom Interaction.
-                 */
-                xScales(): QuantitativeScale<any>[];
-                /**
-                 * Sets the x scales for this PanZoom Interaction.
-                 *
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                xScales(xScales: QuantitativeScale<any>[]): Interactions.PanZoom;
-                /**
-                 * Gets the y scales for this PanZoom Interaction.
-                 */
-                yScales(): QuantitativeScale<any>[];
-                /**
-                 * Sets the y scales for this PanZoom Interaction.
-                 *
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                yScales(yScales: QuantitativeScale<any>[]): Interactions.PanZoom;
-                /**
-                 * Adds an x scale to this PanZoom Interaction
-                 *
-                 * @param {QuantitativeScale<any>} An x scale to add
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                addXScale(xScale: QuantitativeScale<any>): PanZoom;
-                /**
-                 * Removes an x scale from this PanZoom Interaction
-                 *
-                 * @param {QuantitativeScale<any>} An x scale to remove
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                removeXScale(xScale: QuantitativeScale<any>): PanZoom;
-                /**
-                 * Adds a y scale to this PanZoom Interaction
-                 *
-                 * @param {QuantitativeScale<any>} A y scale to add
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                addYScale(yScale: QuantitativeScale<any>): PanZoom;
-                /**
-                 * Removes a y scale from this PanZoom Interaction
-                 *
-                 * @param {QuantitativeScale<any>} A y scale to remove
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                removeYScale(yScale: QuantitativeScale<any>): PanZoom;
-                /**
-                 * Gets the minimum domain extent for the scale, specifying the minimum allowable amount
-                 * between the ends of the domain.
-                 *
-                 * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-                 *
-                 * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-                 * @returns {D} The minimum domain extent for the scale.
-                 */
-                minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>): D;
-                /**
-                 * Sets the minimum domain extent for the scale, specifying the minimum allowable amount
-                 * between the ends of the domain.
-                 *
-                 * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-                 *
-                 * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-                 * @param {D} minDomainExtent The minimum domain extent for the scale.
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent: D): Interactions.PanZoom;
-                /**
-                 * Gets the maximum domain extent for the scale, specifying the maximum allowable amount
-                 * between the ends of the domain.
-                 *
-                 * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-                 *
-                 * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-                 * @returns {D} The maximum domain extent for the scale.
-                 */
-                maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>): D;
-                /**
-                 * Sets the maximum domain extent for the scale, specifying the maximum allowable amount
-                 * between the ends of the domain.
-                 *
-                 * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-                 *
-                 * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-                 * @param {D} minDomainExtent The maximum domain extent for the scale.
-                 * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-                 */
-                maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent: D): Interactions.PanZoom;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        type DragCallback = (start: Point, end: Point) => void;
-        namespace Interactions {
-            class Drag extends Interaction {
-                protected _anchor(component: Component): void;
-                protected _unanchor(): void;
-                /**
-                 * Gets whether the Drag Interaction constrains Points passed to its
-                 * callbacks to lie inside its Component.
-                 *
-                 * If true, when the user drags outside of the Component, the closest Point
-                 * inside the Component will be passed to the callback instead of the actual
-                 * cursor position.
-                 *
-                 * @return {boolean}
-                 */
-                constrainedToComponent(): boolean;
-                /**
-                 * Sets whether the Drag Interaction constrains Points passed to its
-                 * callbacks to lie inside its Component.
-                 *
-                 * If true, when the user drags outside of the Component, the closest Point
-                 * inside the Component will be passed to the callback instead of the actual
-                 * cursor position.
-                 *
-                 * @param {boolean}
-                 * @return {Interactions.Drag} The calling Drag Interaction.
-                 */
-                constrainedToComponent(constrainedToComponent: boolean): Drag;
-                /**
-                 * Adds a callback to be called when dragging starts.
-                 *
-                 * @param {DragCallback} callback
-                 * @returns {Drag} The calling Drag Interaction.
-                 */
-                onDragStart(callback: DragCallback): Drag;
-                /**
-                 * Removes a callback that would be called when dragging starts.
-                 *
-                 * @param {DragCallback} callback
-                 * @returns {Drag} The calling Drag Interaction.
-                 */
-                offDragStart(callback: DragCallback): Drag;
-                /**
-                 * Adds a callback to be called during dragging.
-                 *
-                 * @param {DragCallback} callback
-                 * @returns {Drag} The calling Drag Interaction.
-                 */
-                onDrag(callback: DragCallback): Drag;
-                /**
-                 * Removes a callback that would be called during dragging.
-                 *
-                 * @param {DragCallback} callback
-                 * @returns {Drag} The calling Drag Interaction.
-                 */
-                offDrag(callback: DragCallback): Drag;
-                /**
-                 * Adds a callback to be called when dragging ends.
-                 *
-                 * @param {DragCallback} callback
-                 * @returns {Drag} The calling Drag Interaction.
-                 */
-                onDragEnd(callback: DragCallback): Drag;
-                /**
-                 * Removes a callback that would be called when dragging ends.
-                 *
-                 * @param {DragCallback} callback
-                 * @returns {Drag} The calling Drag Interaction.
-                 */
-                offDragEnd(callback: DragCallback): Drag;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        type DragBoxCallback = (bounds: Bounds) => void;
-        namespace Components {
-            class DragBoxLayer extends Components.SelectionBoxLayer {
-                protected _hasCorners: boolean;
-                /**
-                 * Constructs a DragBoxLayer.
-                 *
-                 * A DragBoxLayer is a SelectionBoxLayer with a built-in Drag Interaction.
-                 * A drag gesture will set the Bounds of the box.
-                 * If resizing is enabled using resizable(true), the edges of box can be repositioned.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                protected _setup(): void;
-                renderImmediately(): DragBoxLayer;
-                /**
-                 * Gets the detection radius of the drag box in pixels.
-                 */
-                detectionRadius(): number;
-                /**
-                 * Sets the detection radius of the drag box in pixels.
-                 *
-                 * @param {number} r
-                 * @return {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                detectionRadius(r: number): DragBoxLayer;
-                /**
-                 * Gets whether or not the drag box is resizable.
-                 */
-                resizable(): boolean;
-                /**
-                 * Sets whether or not the drag box is resizable.
-                 *
-                 * @param {boolean} canResize
-                 * @return {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                resizable(canResize: boolean): DragBoxLayer;
-                protected _setResizableClasses(canResize: boolean): void;
-                /**
-                 * Sets the callback to be called when dragging starts.
-                 *
-                 * @param {DragBoxCallback} callback
-                 * @returns {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                onDragStart(callback: DragBoxCallback): DragBoxLayer;
-                /**
-                 * Removes a callback to be called when dragging starts.
-                 *
-                 * @param {DragBoxCallback} callback
-                 * @returns {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                offDragStart(callback: DragBoxCallback): DragBoxLayer;
-                /**
-                 * Sets a callback to be called during dragging.
-                 *
-                 * @param {DragBoxCallback} callback
-                 * @returns {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                onDrag(callback: DragBoxCallback): DragBoxLayer;
-                /**
-                 * Removes a callback to be called during dragging.
-                 *
-                 * @param {DragBoxCallback} callback
-                 * @returns {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                offDrag(callback: DragBoxCallback): DragBoxLayer;
-                /**
-                 * Sets a callback to be called when dragging ends.
-                 *
-                 * @param {DragBoxCallback} callback
-                 * @returns {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                onDragEnd(callback: DragBoxCallback): DragBoxLayer;
-                /**
-                 * Removes a callback to be called when dragging ends.
-                 *
-                 * @param {DragBoxCallback} callback
-                 * @returns {DragBoxLayer} The calling DragBoxLayer.
-                 */
-                offDragEnd(callback: DragBoxCallback): DragBoxLayer;
-                /**
-                 * Gets the internal Interactions.Drag of the DragBoxLayer.
-                 */
-                dragInteraction(): Interactions.Drag;
-                /**
-                 * Enables or disables the interaction and drag box.
-                 */
-                enabled(enabled: boolean): DragBoxLayer;
-                /**
-                 * Gets the enabled state.
-                 */
-                enabled(): boolean;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class XDragBoxLayer extends DragBoxLayer {
-                /**
-                 * An XDragBoxLayer is a DragBoxLayer whose size can only be set in the X-direction.
-                 * The y-values of the bounds() are always set to 0 and the height() of the XDragBoxLayer.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): XDragBoxLayer;
-                protected _setBounds(newBounds: Bounds): void;
-                protected _setResizableClasses(canResize: boolean): void;
-            }
-        }
-    }
-
-
-    namespace Plottable {
-        namespace Components {
-            class YDragBoxLayer extends DragBoxLayer {
-                /**
-                 * A YDragBoxLayer is a DragBoxLayer whose size can only be set in the Y-direction.
-                 * The x-values of the bounds() are always set to 0 and the width() of the YDragBoxLayer.
-                 *
-                 * @constructor
-                 */
-                constructor();
-                computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): YDragBoxLayer;
-                protected _setBounds(newBounds: Bounds): void;
-                protected _setResizableClasses(canResize: boolean): void;
-            }
-        }
-    }
-}
diff --git a/types/plottable/plottable-tests.ts b/types/plottable/plottable-tests.ts
deleted file mode 100644
index 1dbc306eb7..0000000000
--- a/types/plottable/plottable-tests.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-var data = [
-  { x: 1, y: 1, x2: 2, y2: 2 },
-  { x: 4, y: 4, x2: 3, y2: 3 },
-  { x: 2, y: 2, x2: 3, y2: 3 }
-];
-
-// Create a dataset
-var dataset = new Plottable.Dataset(data);
-
-// Generate a bunch of scales
-var linearScale = new Plottable.Scales.Linear();
-var modifiedLogScale = new Plottable.Scales.ModifiedLog();
-var categoryScale = new Plottable.Scales.Category();
-var categorySecondaryScale = new Plottable.Scales.Category();
-
-// Generate a bunch of axes
-var numericAxis = new Plottable.Axes.Numeric(linearScale, "bottom");
-var numericSecondaryAxis = new Plottable.Axes.Numeric(modifiedLogScale, "left");
-var categoryAxis = new Plottable.Axes.Category(categoryScale, "bottom");
-var categorySecondaryAxis = new Plottable.Axes.Category(categorySecondaryScale, "left");
-
-// Scatter plot
-var scatter = new Plottable.Plots.Scatter()
-  .x((d) => d.x, linearScale)
-  .y((d) => d.y, categoryScale)
-  .addDataset(dataset);
-
-// Line plot
-var line = new Plottable.Plots.Line()
-  .x((d) => d.x, linearScale)
-  .y((d) => d.y, modifiedLogScale)
-  .addDataset(dataset);
-
-// Rectangle plot
-var rectangle = new Plottable.Plots.Rectangle()
-  .x((d) => d.x, linearScale)
-  .y((d) => d.y, modifiedLogScale)
-  .x2((d) => d.x2)
-  .y2((d) => d.y2)
-  .addDataset(dataset);
-
-// Create a group of plots
-var group = new Plottable.Components.Group([line, scatter]);
-
-// Make a chart
-new Plottable.Components.Table([
-  [numericSecondaryAxis, group],
-  [null, numericAxis]
-]);
\ No newline at end of file
diff --git a/types/plottable/tsconfig.json b/types/plottable/tsconfig.json
deleted file mode 100644
index 3eb45943e1..0000000000
--- a/types/plottable/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "paths": {
-            "d3": [
-                "d3/v3"
-            ]
-        },
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "plottable-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/plugin-error/index.d.ts b/types/plugin-error/index.d.ts
new file mode 100644
index 0000000000..800f0932ba
--- /dev/null
+++ b/types/plugin-error/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for plugin-error 0.1
+// Project: https://github.com/jonschlinkert/plugin-error
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = PluginError;
+
+declare namespace PluginError {
+    interface PluginErrorOpts {
+        /**
+         * By default the stack will not be shown. Set options.showStack to true if you think the stack is important for your error.
+         */
+        showStack?: boolean;
+        /**
+         * Error properties will be included in err.toString(), but may be omitted by including {showProperties: false} in the options
+         */
+        showProperties?: boolean;
+    }
+
+    interface PluginErrorOpts2 extends PluginErrorOpts {
+        /**
+         * If you pass an error object as the message the stack will be pulled from that, otherwise one will be created.
+         */
+        message?: string | Error;
+    }
+
+    interface PluginErrorOpts3 extends PluginErrorOpts2 {
+        /**
+         * The name of the plugin
+         */
+        plugin?: string;
+    }
+}
+
+declare class PluginError extends Error {
+    /**
+     * Constructor
+     * @param pluginName The name of your plugin
+     * @param message If you pass an error object as the message the stack will be pulled from that, otherwise one will be created.
+     * @param options Options
+     */
+    constructor(pluginName: string, message: string | Error, options?: PluginError.PluginErrorOpts);
+
+    /**
+     * Constructor
+     * @param pluginName The name of your plugin
+     * @param options Options, including message
+     */
+    constructor(pluginName: string, options: PluginError.PluginErrorOpts2);
+
+    /**
+     * Constructor
+     * @param options Options, including message and plugin name
+     */
+    constructor(options: PluginError.PluginErrorOpts3);
+}
diff --git a/types/plugin-error/plugin-error-tests.ts b/types/plugin-error/plugin-error-tests.ts
new file mode 100644
index 0000000000..590d5868ce
--- /dev/null
+++ b/types/plugin-error/plugin-error-tests.ts
@@ -0,0 +1,23 @@
+import PluginError = require('plugin-error');
+
+let e: PluginError;
+
+// string message
+e = new PluginError('my-plugin', 'message');
+e = new PluginError('my-plugin', 'message', { showProperties: false, showStack: false });
+e = new PluginError('my-plugin', { showProperties: false, showStack: false, message: 'message' });
+e = new PluginError({ showProperties: false, showStack: false, message: 'message', plugin: 'my-plugin' });
+
+// error instead of message
+e = new PluginError('my-plugin', new Error('message'));
+e = new PluginError('my-plugin', new Error('message'), { showProperties: false, showStack: false });
+e = new PluginError('my-plugin', { showProperties: false, showStack: false, message: new Error('message') });
+e = new PluginError({ showProperties: false, showStack: false, message: new Error('message'), plugin: 'my-plugin' });
+
+// without non-mandatory options
+e = new PluginError('my-plugin', 'message', {});
+e = new PluginError('my-plugin', { message: 'message' });
+e = new PluginError({ message: 'message', plugin: 'my-plugin' });
+
+// check Error base class
+const f: Error = e;
diff --git a/types/plugin-error/tsconfig.json b/types/plugin-error/tsconfig.json
new file mode 100644
index 0000000000..ee9cd8e61f
--- /dev/null
+++ b/types/plugin-error/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "plugin-error-tests.ts"
+    ]
+}
diff --git a/types/plugin-error/tslint.json b/types/plugin-error/tslint.json
new file mode 100644
index 0000000000..4c4fc86ace
--- /dev/null
+++ b/types/plugin-error/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/plupload/tslint.json b/types/plupload/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/plupload/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pluralize/index.d.ts b/types/pluralize/index.d.ts
index 0a77d87a59..7a11a23839 100644
--- a/types/pluralize/index.d.ts
+++ b/types/pluralize/index.d.ts
@@ -57,9 +57,23 @@ interface PluralizeStatic {
      * @param word
      */
     addUncountableRule(word: string|RegExp): void;
+
+    /**
+     * Test if provided word is plural.
+     *
+     * @param word
+     */
+    isPlural(word: string): boolean;
+
+    /**
+     * Test if provided word is singular.
+     *
+     * @param word
+     */
+    isSingular(word: string): boolean;
 }
 
 declare module "pluralize" {
     export = pluralize;
 }
-declare var pluralize: PluralizeStatic;
\ No newline at end of file
+declare var pluralize: PluralizeStatic;
diff --git a/types/pluralize/pluralize-tests.ts b/types/pluralize/pluralize-tests.ts
index 951fe0b91a..16c599aab8 100644
--- a/types/pluralize/pluralize-tests.ts
+++ b/types/pluralize/pluralize-tests.ts
@@ -22,4 +22,10 @@ pluralize.plural('irregular'); //=> "regular"
 
 pluralize.plural('paper'); //=> "papers"
 pluralize.addUncountableRule('paper');
-pluralize.plural('paper'); //=> "paper"
\ No newline at end of file
+pluralize.plural('paper'); //=> "paper"
+
+pluralize.isPlural('test') //=> false
+pluralize.isSingular('test') //=> true
+
+pluralize.isPlural('tests') //=> true
+pluralize.isSingular('tests') //=> false
diff --git a/types/pluralize/tslint.json b/types/pluralize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pluralize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/png-async/tslint.json b/types/png-async/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/png-async/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pngjs2/tslint.json b/types/pngjs2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pngjs2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/podcast/tslint.json b/types/podcast/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/podcast/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/podium/tslint.json b/types/podium/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/podium/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/polylabel/index.d.ts b/types/polylabel/index.d.ts
index b9a16ed265..f43724741a 100644
--- a/types/polylabel/index.d.ts
+++ b/types/polylabel/index.d.ts
@@ -6,10 +6,9 @@
 /**
  * Polylabel returns the pole of inaccessibility coordinate in [x, y] format.
  *
- * @param {Array<number>} polygon - Given polygon coordinates in GeoJSON-like format
- * @param {number} precision - Precision (1.0 by default)
- * @param {boolean} debug - Debugging for Console
- * @return {Array<number>}
+ * @param polygon - Given polygon coordinates in GeoJSON-like format
+ * @param precision - Precision (1.0 by default)
+ * @param debug - Debugging for Console
  * @example
  * var p = polylabel(polygon, 1.0);
  */
diff --git a/types/polyline/index.d.ts b/types/polyline/index.d.ts
index bead8d9e5e..7a8b7eeb19 100644
--- a/types/polyline/index.d.ts
+++ b/types/polyline/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mapbox/polyline
 // Definitions by: Arseniy Maximov <https://github.com/Kern0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="geojson" />
 
diff --git a/types/polyline/tslint.json b/types/polyline/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/polyline/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/polymer-ts/tslint.json b/types/polymer-ts/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/polymer-ts/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/polymer/index.d.ts b/types/polymer/index.d.ts
index b1f76d83c6..eee6a6250f 100644
--- a/types/polymer/index.d.ts
+++ b/types/polymer/index.d.ts
@@ -53,7 +53,7 @@ declare global {
 
       // Debouncer
 
-      debounce?(jobName: string, callback: Function, wait: number): void;
+      debounce?(jobName: string, callback: Function, wait?: number): void;
 
       isDebouncerActive?(jobName: string): boolean;
 
diff --git a/types/polymer/tslint.json b/types/polymer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/polymer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/popcorn/tslint.json b/types/popcorn/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/popcorn/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/popper.js/index.d.ts b/types/popper.js/index.d.ts
deleted file mode 100644
index 19e892cc03..0000000000
--- a/types/popper.js/index.d.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-// Type definitions for popper.js 1.10
-// Project: https://github.com/FezVrasta/popper.js/
-// Definitions by: rhysd <https://github.com/rhysd>
-//                 joscha <https://github.com/joscha>
-//                 seckardt <https://github.com/seckardt>
-//                 marcfallows <https://github.com/marcfallows>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Popper {
-  type Position = 'top' | 'right' | 'bottom' | 'left';
-  type Placement = 'auto-start'
-      | 'auto'
-      | 'auto-end'
-      | 'top-start'
-      | 'top'
-      | 'top-end'
-      | 'right-start'
-      | 'right'
-      | 'right-end'
-      | 'bottom-end'
-      | 'bottom'
-      | 'bottom-start'
-      | 'left-end'
-      | 'left'
-      | 'left-start';
-  interface PopperOptions {
-    placement?: Placement;
-    eventsEnabled?: boolean;
-    modifiers?: Modifiers;
-    removeOnDestroy?: boolean;
-    onCreate?(data: Data): void;
-    onUpdate?(data: Data): void;
-  }
-  type ModifierFn = (data: Data, options: Object) => Data;
-  interface BaseModifier {
-    order?: number;
-    enabled?: boolean;
-    fn?: ModifierFn;
-  }
-  class Modifiers {
-    shift?: BaseModifier;
-    offset?: BaseModifier & {
-      offset?: number | string,
-    };
-    preventOverflow?: BaseModifier & {
-      priority?: Position[],
-      padding?: number,
-      boundariesElement?: string | Element,
-    };
-    keepTogether?: BaseModifier;
-    arrow?: BaseModifier & {
-      element?: string | Element,
-    };
-    flip?: BaseModifier & {
-      behavior?: 'flip' | 'clockwise' | 'counterclockwise' | Position[],
-      padding?: number,
-      boundariesElement?: string | Element,
-    };
-    inner?: BaseModifier;
-    hide?: BaseModifier;
-    applyStyle?: BaseModifier & {
-      onLoad?: Function,
-      gpuAcceleration?: boolean,
-    };
-  }
-  interface Offset {
-    top: number;
-    left: number;
-    width: number;
-    height: number;
-  }
-  interface Data {
-    instance: Popper;
-    placement: Placement;
-    originalPlacement: Placement;
-    flipped: boolean;
-    hide: boolean;
-    arrowElement: Element;
-    styles: Object;
-    boundaries: Object;
-    offsets: {
-      popper: Offset,
-      reference: Offset,
-      arrow: {
-        top: number,
-        left: number,
-      },
-    };
-  }
-}
-
-declare class Popper {
-  static modifiers: Object[];
-  static placements: Popper.Placement[];
-  static Defaults: Popper.PopperOptions;
-
-  constructor(reference: Element, popper: Element | Object, options?: Popper.PopperOptions);
-
-  destroy(): void;
-  update(): void;
-  scheduleUpdate(): void;
-  enableEventListeners(): void;
-  disableEventListeners(): void;
-}
-
-// Popper.js is globally available directly, but in a module it's only available as a default export.
-// tslint:disable-next-line no-single-declare-module no-declare-current-package
-declare module 'popper.js' {
-  export default Popper;
-}
diff --git a/types/popper.js/popper.js-tests.ts b/types/popper.js/popper.js-tests.ts
deleted file mode 100644
index b261577264..0000000000
--- a/types/popper.js/popper.js-tests.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import Popper from 'popper.js';
-
-const reference = document.querySelector('.my-button');
-const popper = document.querySelector('.my-popper');
-const boundary = document.querySelector('.my-boundary');
-const arrow = document.querySelector('.my-arrow');
-
-const thePopper = new Popper(
-    reference,
-    popper,
-);
-thePopper.update();
-thePopper.scheduleUpdate();
-thePopper.destroy();
-thePopper.enableEventListeners();
-thePopper.disableEventListeners();
-
-Popper.modifiers.forEach(console.log.bind(console));
-Popper.placements.forEach(console.log.bind(console));
-
-const thePopperWithOptions = new Popper(
-    reference,
-    popper,
-    {
-        placement: 'bottom',
-        eventsEnabled: true,
-        removeOnDestroy: true,
-        modifiers: {
-            shift: {
-                enabled: true,
-                fn: (data) => data,
-                order: 100,
-            },
-            offset: {
-                enabled: true,
-                fn: (data) => data,
-                order: 100,
-                offset: 0,
-            },
-            preventOverflow: {
-                enabled: true,
-                fn: (data) => data,
-                order: 100,
-                priority: ['top', 'bottom'],
-                padding: 1,
-                boundariesElement: boundary,
-            },
-            keepTogether: {
-                enabled: false,
-                fn: (data) => data,
-                order: 200,
-            },
-            arrow: {
-                enabled: true,
-                fn: (data) => data,
-                order: 400,
-                element: arrow,
-            },
-            flip: {
-                enabled: true,
-                fn: (data) => data,
-                order: 400,
-                behavior: ['top', 'right'],
-                padding: 5,
-                boundariesElement: boundary,
-            },
-            inner: {
-                enabled: true,
-                fn: (data) => data,
-                order: 400,
-            },
-            hide: {
-                enabled: true,
-                fn: (data) => data,
-                order: 400,
-            },
-            applyStyle: {
-                enabled: true,
-                fn: (data) => data,
-                order: 400,
-                onLoad: () => 0,
-            },
-        }
-    }
-);
-
-const anotherPoppanotherPopper = new Popper(reference, popper);
-
-const anotherAnotherPopper = new Popper(reference, popper, {
-    modifiers: {
-        flip: {
-            behavior: 'clockwise'
-        }
-    },
-    onCreate: (data => console.log(data)),
-    onUpdate: (data => {
-        data.instance.scheduleUpdate();
-        const p = data.offsets.popper;
-        console.log(`top: ${p.top}, left: ${p.left}, width: ${p.width}, height: ${p.height}`);
-    })
-});
diff --git a/types/popper.js/tsconfig.json b/types/popper.js/tsconfig.json
deleted file mode 100644
index e5f5d39e07..0000000000
--- a/types/popper.js/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "popper.js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/popper.js/tslint.json b/types/popper.js/tslint.json
deleted file mode 100644
index fd7e538a58..0000000000
--- a/types/popper.js/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "dtslint/dt.json",
-  "rules": {
-    // TODO
-    "ban-types": false
-  }
-}
diff --git a/types/postal/tslint.json b/types/postal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/postal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/postal/v0/tslint.json b/types/postal/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/postal/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pouch-redux-middleware/package.json b/types/pouch-redux-middleware/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/pouch-redux-middleware/package.json
+++ b/types/pouch-redux-middleware/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/pouchdb-adapter-fruitdown/index.d.ts b/types/pouchdb-adapter-fruitdown/index.d.ts
index 63484904ac..1cf2b78952 100644
--- a/types/pouchdb-adapter-fruitdown/index.d.ts
+++ b/types/pouchdb-adapter-fruitdown/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace FruitDOWNAdapter {
         interface FruitDOWNAdapterConfiguration
diff --git a/types/pouchdb-adapter-fruitdown/tslint.json b/types/pouchdb-adapter-fruitdown/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-adapter-fruitdown/tslint.json
+++ b/types/pouchdb-adapter-fruitdown/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-adapter-http/index.d.ts b/types/pouchdb-adapter-http/index.d.ts
index 07eb5bbbfb..74ea96fd5b 100644
--- a/types/pouchdb-adapter-http/index.d.ts
+++ b/types/pouchdb-adapter-http/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace HttpAdapter {
         interface HttpAdapterConfiguration
diff --git a/types/pouchdb-adapter-http/tslint.json b/types/pouchdb-adapter-http/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-adapter-http/tslint.json
+++ b/types/pouchdb-adapter-http/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-adapter-idb/index.d.ts b/types/pouchdb-adapter-idb/index.d.ts
index e8ad990b45..4de6491c64 100644
--- a/types/pouchdb-adapter-idb/index.d.ts
+++ b/types/pouchdb-adapter-idb/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace Core {
         interface DatabaseInfo {
diff --git a/types/pouchdb-adapter-idb/tslint.json b/types/pouchdb-adapter-idb/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-adapter-idb/tslint.json
+++ b/types/pouchdb-adapter-idb/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-adapter-leveldb/index.d.ts b/types/pouchdb-adapter-leveldb/index.d.ts
index a3dd9ad6d7..087cc4170a 100644
--- a/types/pouchdb-adapter-leveldb/index.d.ts
+++ b/types/pouchdb-adapter-leveldb/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace LevelDbAdapter {
         interface LevelDbAdapterConfiguration extends Configuration.LocalDatabaseConfiguration {
diff --git a/types/pouchdb-adapter-leveldb/tslint.json b/types/pouchdb-adapter-leveldb/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-adapter-leveldb/tslint.json
+++ b/types/pouchdb-adapter-leveldb/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-adapter-localstorage/index.d.ts b/types/pouchdb-adapter-localstorage/index.d.ts
index 04823352de..5f4da8b599 100644
--- a/types/pouchdb-adapter-localstorage/index.d.ts
+++ b/types/pouchdb-adapter-localstorage/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace LocalStorageAdapter {
         interface LocalStorageAdapterConfiguration
diff --git a/types/pouchdb-adapter-localstorage/tslint.json b/types/pouchdb-adapter-localstorage/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-adapter-localstorage/tslint.json
+++ b/types/pouchdb-adapter-localstorage/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-adapter-memory/index.d.ts b/types/pouchdb-adapter-memory/index.d.ts
index 3cbc0c664e..41149a2dc6 100644
--- a/types/pouchdb-adapter-memory/index.d.ts
+++ b/types/pouchdb-adapter-memory/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace MemoryAdapter {
         interface MemoryAdapterConfiguration
diff --git a/types/pouchdb-adapter-memory/tslint.json b/types/pouchdb-adapter-memory/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-adapter-memory/tslint.json
+++ b/types/pouchdb-adapter-memory/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-adapter-node-websql/index.d.ts b/types/pouchdb-adapter-node-websql/index.d.ts
index 25dcc7d8cf..442a5326a2 100644
--- a/types/pouchdb-adapter-node-websql/index.d.ts
+++ b/types/pouchdb-adapter-node-websql/index.d.ts
@@ -7,10 +7,5 @@
 /// <reference types="pouchdb-core" />
 /// <reference types="pouchdb-adapter-websql" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
-declare module 'pouchdb-adapter-node-websql' {
-    const plugin: PouchDB.Plugin;
-    export = plugin;
-}
+declare const plugin: PouchDB.Plugin;
+export = plugin;
diff --git a/types/pouchdb-adapter-node-websql/tslint.json b/types/pouchdb-adapter-node-websql/tslint.json
index 0dab80c69a..3db14f85ea 100644
--- a/types/pouchdb-adapter-node-websql/tslint.json
+++ b/types/pouchdb-adapter-node-websql/tslint.json
@@ -1,7 +1 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODOs
-		"no-declare-current-package": false
-	}
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-websql/index.d.ts b/types/pouchdb-adapter-websql/index.d.ts
index b7cc5af65b..2b0e2b6178 100644
--- a/types/pouchdb-adapter-websql/index.d.ts
+++ b/types/pouchdb-adapter-websql/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace Core {
         interface DatabaseInfo {
diff --git a/types/pouchdb-adapter-websql/tslint.json b/types/pouchdb-adapter-websql/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-adapter-websql/tslint.json
+++ b/types/pouchdb-adapter-websql/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-browser/index.d.ts b/types/pouchdb-browser/index.d.ts
index 3872feef98..d41a41b341 100644
--- a/types/pouchdb-browser/index.d.ts
+++ b/types/pouchdb-browser/index.d.ts
@@ -11,10 +11,5 @@
 /// <reference types="pouchdb-mapreduce" />
 /// <reference types="pouchdb-replication" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
-declare module 'pouchdb-browser' {
-    const PouchDb: PouchDB.Static;
-    export = PouchDb;
-}
+declare const PouchDb: PouchDB.Static;
+export = PouchDb;
diff --git a/types/pouchdb-browser/tslint.json b/types/pouchdb-browser/tslint.json
index 0dab80c69a..3db14f85ea 100644
--- a/types/pouchdb-browser/tslint.json
+++ b/types/pouchdb-browser/tslint.json
@@ -1,7 +1 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODOs
-		"no-declare-current-package": false
-	}
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 4314644b58..59e5650e62 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -64,9 +64,6 @@ interface Buffer extends Uint8Array {
     values(): IterableIterator<number>;
 }
 
-// TODO: tslint doesn't like the listener: Function signatures but they are from the
-// original node declarations so I didn't want to touch them
-/* tslint:disable:ban-types */
 interface EventEmitter {
     addListener(event: string | symbol, listener: Function): this;
     on(event: string | symbol, listener: Function): this;
@@ -82,10 +79,6 @@ interface EventEmitter {
     prependOnceListener(event: string | symbol, listener: Function): this;
     eventNames(): Array<string | symbol>;
 }
-/* tslint:eisable:ban-types */
-
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
 
 declare namespace PouchDB {
     namespace Core {
@@ -160,7 +153,8 @@ declare namespace PouchDB {
             _rev: RevisionId;
         }
         interface GetMeta {
-            /** Conflicting leaf revisions.
+            /**
+             * Conflicting leaf revisions.
              *
              * Only present if `GetOptions.conflicts` is `true`
              */
@@ -252,7 +246,8 @@ declare namespace PouchDB {
         };
 
         interface AllDocsOptions extends Options {
-            /** Include attachment data for each document.
+            /**
+             * Include attachment data for each document.
              *
              * Requires `include_docs` to be `true`.
              *
@@ -260,13 +255,15 @@ declare namespace PouchDB {
              * @see binary
              */
             attachments?: boolean;
-            /** Return attachments as Buffers.
+            /**
+             * Return attachments as Buffers.
              *
              * Requires `include_docs` to be `true`.
              * Requires `attachments` to be `true`.
              */
             binary?: boolean;
-            /** Include conflict information for each document.
+            /**
+             * Include conflict information for each document.
              *
              * Requires `include_docs` to be `true`.
              */
@@ -277,7 +274,8 @@ declare namespace PouchDB {
             include_docs?: boolean;
             /** Maximum number of documents to return. */
             limit?: number;
-            /** Number of documents to skip before returning.
+            /**
+             * Number of documents to skip before returning.
              *
              * Causes poor performance on IndexedDB and LevelDB.
              */
@@ -296,7 +294,8 @@ declare namespace PouchDB {
             startkey: DocumentKey;
             /** High end of range, or low end if `descending` is `true`. */
             endkey: DocumentKey;
-            /** Include any documents identified by `endkey`.
+            /**
+             * Include any documents identified by `endkey`.
              *
              * Defaults to `true`.
              */
@@ -336,9 +335,10 @@ declare namespace PouchDB {
         }
 
         interface BulkGetResponse<Content extends {}> {
-            results: {
-                docs: Array<{ ok: Content & GetMeta } | { error: Error }>;
-            };
+            results: Array<{
+                id: string,
+                docs: Array<{ ok: Content & GetMeta } | { error: Error }>
+            }>;
         }
 
         interface ChangesMeta {
@@ -443,7 +443,8 @@ declare namespace PouchDB {
             rev?: RevisionId;
             /** Include revision history of the document. */
             revs?: boolean;
-            /** Include a list of revisions of the document, and their
+            /**
+             * Include a list of revisions of the document, and their
              * availability.
              */
             revs_info?: boolean;
@@ -459,7 +460,8 @@ declare namespace PouchDB {
         }
 
         interface GetOpenRevisions extends Options {
-            /** Fetch all leaf revisions if open_revs="all" or fetch all leaf
+            /**
+             * Fetch all leaf revisions if open_revs="all" or fetch all leaf
              * revisions specified in open_revs array. Leaves will be returned
              * in the same order as specified in input array.
              */
@@ -640,7 +642,8 @@ declare namespace PouchDB {
                    options: Core.GetOpenRevisions
                   ): Promise<Array<Core.Revision<Content & Model>>>;
 
-        /** Create a new document without providing an id.
+        /**
+         * Create a new document without providing an id.
          *
          * You should prefer put() to post(), because when you post(), you are
          * missing an opportunity to use allDocs() to sort documents by _id
@@ -652,7 +655,8 @@ declare namespace PouchDB {
                     options: Core.Options | null,
                     callback: Core.Callback<Core.Response>): void;
 
-        /** Create a new document without providing an id.
+        /**
+         * Create a new document without providing an id.
          *
          * You should prefer put() to post(), because when you post(), you are
          * missing an opportunity to use allDocs() to sort documents by _id
@@ -663,7 +667,8 @@ declare namespace PouchDB {
         post<Model>(doc: Core.PostDocument<Content & Model>,
                     options?: Core.Options): Promise<Core.Response>;
 
-        /** Create a new document or update an existing document.
+        /**
+         * Create a new document or update an existing document.
          *
          * If the document already exists, you must specify its revision _rev,
          * otherwise a conflict will occur.
@@ -675,7 +680,8 @@ declare namespace PouchDB {
                    options: Core.Options | null,
                    callback: Core.Callback<Core.Response>): void;
 
-        /** Create a new document or update an existing document.
+        /**
+         * Create a new document or update an existing document.
          *
          * If the document already exists, you must specify its revision _rev,
          * otherwise a conflict will occur.
diff --git a/types/pouchdb-core/pouchdb-core-tests.ts b/types/pouchdb-core/pouchdb-core-tests.ts
index 523eed7d04..d050b4c6a6 100644
--- a/types/pouchdb-core/pouchdb-core-tests.ts
+++ b/types/pouchdb-core/pouchdb-core-tests.ts
@@ -60,7 +60,14 @@ function testBulkDocs() {
 
 function testBulkGet() {
     const db = new PouchDB();
-    db.bulkGet({docs: [{id: 'a', rev: 'b'}, {id: 'b', rev: 'c'}, {id: 'c', rev: 'd'}]}).then((result) => {});
+    db.bulkGet({docs: [{id: 'a', rev: 'b'}, {id: 'b', rev: 'c'}, {id: 'c', rev: 'd'}]}).then((response) => {
+        const results = response.results;
+        results.forEach((result) => {
+            const id = result.id;
+            const docs = result.docs;
+            docs.map((doc) => doc);
+        });
+    });
     db.bulkGet({docs: [{id: 'a', rev: 'b'}, {id: 'b', rev: 'c'}, {id: 'c', rev: 'd'}]}, (error, response) => {});
 }
 function testRevsDiff() {
diff --git a/types/pouchdb-core/tslint.json b/types/pouchdb-core/tslint.json
index 53941b68e7..bb158a6af2 100644
--- a/types/pouchdb-core/tslint.json
+++ b/types/pouchdb-core/tslint.json
@@ -3,6 +3,11 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: tslint doesn't like the listener: Function signatures but they are from the
+        // original node declarations so I didn't want to touch them
+        "ban-types": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-find/index.d.ts b/types/pouchdb-find/index.d.ts
index d45b8c40bc..7f5f925f8c 100644
--- a/types/pouchdb-find/index.d.ts
+++ b/types/pouchdb-find/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace Find {
         interface ConditionOperators {
@@ -45,7 +42,8 @@ declare namespace PouchDB {
             /** Special condition to match the length of an array field in a document. Non-array fields cannot match this condition. */
             $size?: number;
 
-            /** Divisor and Remainder are both positive or negative integers.
+            /**
+             * Divisor and Remainder are both positive or negative integers.
              * Non-integer values result in a 404 status.
              * Matches documents where (field % Divisor == Remainder) is true, and only when the document field is an integer.
              * [divisor, remainder]
diff --git a/types/pouchdb-find/tslint.json b/types/pouchdb-find/tslint.json
index 0512521e8a..9e12c34857 100644
--- a/types/pouchdb-find/tslint.json
+++ b/types/pouchdb-find/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-any-union": false
+        "no-any-union": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-http/index.d.ts b/types/pouchdb-http/index.d.ts
index 8c5dfd3104..cccf52a21f 100644
--- a/types/pouchdb-http/index.d.ts
+++ b/types/pouchdb-http/index.d.ts
@@ -7,10 +7,5 @@
 /// <reference types="pouchdb-core" />
 /// <reference types="pouchdb-adapter-http" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
-declare module 'pouchdb-http' {
-    const PouchDb: PouchDB.Static;
-    export = PouchDb;
-}
+declare const PouchDb: PouchDB.Static;
+export = PouchDb;
diff --git a/types/pouchdb-http/tslint.json b/types/pouchdb-http/tslint.json
index 462c618bbf..3db14f85ea 100644
--- a/types/pouchdb-http/tslint.json
+++ b/types/pouchdb-http/tslint.json
@@ -1,7 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODOs
-        "no-declare-current-package": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-mapreduce/index.d.ts b/types/pouchdb-mapreduce/index.d.ts
index 430cafe8d6..cb8b1caf2a 100644
--- a/types/pouchdb-mapreduce/index.d.ts
+++ b/types/pouchdb-mapreduce/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     type BuiltInReducers = '_sum' | '_count' | '_stats';
     /**
diff --git a/types/pouchdb-mapreduce/tslint.json b/types/pouchdb-mapreduce/tslint.json
index ba44da1be1..d1bd797c5e 100644
--- a/types/pouchdb-mapreduce/tslint.json
+++ b/types/pouchdb-mapreduce/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-any-union": false,
-        "no-declare-current-package": false
+        "no-declare-current-package": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-node/index.d.ts b/types/pouchdb-node/index.d.ts
index c0f48adb23..7df750b742 100644
--- a/types/pouchdb-node/index.d.ts
+++ b/types/pouchdb-node/index.d.ts
@@ -10,9 +10,6 @@
 /// <reference types="pouchdb-mapreduce" />
 /// <reference types="pouchdb-replication" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace Core {
         interface DatabaseInfo {
diff --git a/types/pouchdb-node/tslint.json b/types/pouchdb-node/tslint.json
index 462c618bbf..fac23123f9 100644
--- a/types/pouchdb-node/tslint.json
+++ b/types/pouchdb-node/tslint.json
@@ -2,6 +2,8 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // TODOs
-        "no-declare-current-package": false
+        "no-declare-current-package": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb-replication/index.d.ts b/types/pouchdb-replication/index.d.ts
index aeddd61872..b0611b840a 100644
--- a/types/pouchdb-replication/index.d.ts
+++ b/types/pouchdb-replication/index.d.ts
@@ -6,9 +6,6 @@
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
     namespace Replication {
         interface ReplicateOptions {
diff --git a/types/pouchdb-replication/tslint.json b/types/pouchdb-replication/tslint.json
index 998776b847..fac23123f9 100644
--- a/types/pouchdb-replication/tslint.json
+++ b/types/pouchdb-replication/tslint.json
@@ -1,7 +1,9 @@
 {
-	"extends": "dtslint/dt.json",
-	"rules": {
+    "extends": "dtslint/dt.json",
+    "rules": {
         // TODOs
-        "no-declare-current-package": false
-	}
+        "no-declare-current-package": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
+    }
 }
diff --git a/types/pouchdb-upsert/index.d.ts b/types/pouchdb-upsert/index.d.ts
index e893a052aa..003f310ad7 100644
--- a/types/pouchdb-upsert/index.d.ts
+++ b/types/pouchdb-upsert/index.d.ts
@@ -1,14 +1,11 @@
-// Type definitions for pouchdb-upsert 2.0
+// Type definitions for pouchdb-upsert 2.2
 // Project: https://github.com/pouchdb/upsert
-// Definitions by: Keith D. Moore <https://github.com/keithdmoore>, Andrew Mitchell <https://github.com/hotforfeature>
+// Definitions by: Keith D. Moore <https://github.com/keithdmoore>, Andrew Mitchell <https://github.com/hotforfeature>, Eddie Hsu <https://github.com/apolkingg8>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="pouchdb-core" />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
 declare namespace PouchDB {
   interface Database<Content extends {} = {}> {
     /**
@@ -20,7 +17,7 @@ declare namespace PouchDB {
      * If the document does not already exist, then {} will be the input to diffFunc.
      *
      */
-    upsert<Model>(docId: Core.DocumentId, diffFun: UpsertDiffCallback<Content & Model>): Promise<Core.Response>;
+    upsert<Model>(docId: Core.DocumentId, diffFun: UpsertDiffCallback<Content & Model>): Promise<UpsertResponse>;
 
     /**
      * Perform an upsert (update or insert) operation. If a callback is not provided, the Promise based version
@@ -33,7 +30,7 @@ declare namespace PouchDB {
      * @param callback - called with the results after operation is completed.
      */
     upsert<Model>(docId: Core.DocumentId, diffFun: UpsertDiffCallback<Content & Model>,
-                  callback: Core.Callback<Core.Response>): void;
+                  callback: Core.Callback<UpsertResponse>): void;
 
     /**
      * Put a new document with the given docId, if it doesn't already exist. Returns a Promise.
@@ -41,7 +38,7 @@ declare namespace PouchDB {
      * @param doc - the document to insert. Should contain an _id if docId is not specified
      * If the document already exists, then the Promise will just resolve immediately.
      */
-    putIfNotExists<Model>(doc: Core.Document<Content & Model>): Promise<Core.Response>;
+    putIfNotExists<Model>(doc: Core.Document<Content & Model>): Promise<UpsertResponse>;
 
     //
     /**
@@ -55,10 +52,16 @@ declare namespace PouchDB {
      * will return a Promise.
      */
     putIfNotExists<Model>(doc: Core.Document<Content & Model>,
-                          callback: Core.Callback<Core.Response>): void;
+                          callback: Core.Callback<UpsertResponse>): void;
   }
 
-  type UpsertDiffCallback<Content extends {}> = (doc: Core.Document<Content>) => Core.Document<Content> | boolean;
+  type UpsertDiffCallback<Content extends {}> = (doc: Core.Document<Content> | {}) => Core.Document<Content> | boolean;
+
+  interface UpsertResponse {
+    id: Core.DocumentId;
+    rev: Core.RevisionId;
+    updated: boolean;
+  }
 }
 
 declare module 'pouchdb-upsert' {
diff --git a/types/pouchdb-upsert/pouchdb-upsert-tests.ts b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
index c3d261bb5c..55697e88d6 100644
--- a/types/pouchdb-upsert/pouchdb-upsert-tests.ts
+++ b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
@@ -12,7 +12,7 @@ function testUpsert_WithPromise_AndReturnDoc() {
   db.upsert(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
     // Make some updates....
     return doc;
-  }).then((res: PouchDB.Core.Response) => {
+  }).then((res: PouchDB.UpsertResponse) => {
   });
 }
 
@@ -20,7 +20,7 @@ function testUpsert_WithPromise_AndReturnBoolean() {
   db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
     // Make some updates....
     return false;
-  }).then((res: PouchDB.Core.Response) => {
+  }).then((res: PouchDB.UpsertResponse) => {
   });
 }
 
@@ -28,7 +28,7 @@ function testUpsert_WithCallback_AndReturnDoc() {
   db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
     // Make some updates....
     return doc;
-  }, (res: PouchDB.Core.Response) => {});
+  }, (res: PouchDB.UpsertResponse) => {});
 }
 
 function testUpsert_WithCallback_AndReturnBoolean() {
@@ -36,13 +36,13 @@ function testUpsert_WithCallback_AndReturnBoolean() {
   db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
     // Make some updates....
     return false;
-  }, (res: PouchDB.Core.Response) => {});
+  }, (res: PouchDB.UpsertResponse) => {});
 }
 
 function testPutIfNotExists_WithPromise() {
-  db.putIfNotExists(docToUpsert).then((res: PouchDB.Core.Response) => {});
+  db.putIfNotExists(docToUpsert).then((res: PouchDB.UpsertResponse) => {});
 }
 
 function testPutIfNotExists_WithCallback() {
-  db.putIfNotExists(docToUpsert, (res: PouchDB.Core.Response) => {});
+  db.putIfNotExists(docToUpsert, (res: PouchDB.UpsertResponse) => {});
 }
diff --git a/types/pouchdb-upsert/tslint.json b/types/pouchdb-upsert/tslint.json
index 53941b68e7..702315d133 100644
--- a/types/pouchdb-upsert/tslint.json
+++ b/types/pouchdb-upsert/tslint.json
@@ -3,6 +3,8 @@
     "rules": {
         // TODOs
         "no-declare-current-package": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        // TODO: Fixing this lint error will require a large refactor
+        "no-single-declare-module": false
     }
 }
diff --git a/types/pouchdb/index.d.ts b/types/pouchdb/index.d.ts
index 3f17f3ff3d..cdc34a44df 100644
--- a/types/pouchdb/index.d.ts
+++ b/types/pouchdb/index.d.ts
@@ -19,10 +19,5 @@
 /// <reference types='pouchdb-node' />
 /// <reference types='pouchdb-replication' />
 
-// TODO: Fixing this lint error will require a large refactor
-/* tslint:disable:no-single-declare-module */
-
-declare module 'pouchdb' {
-    const plugin: PouchDB.Static;
-    export = plugin;
-}
+declare const plugin: PouchDB.Static;
+export = plugin;
diff --git a/types/pouchdb/tslint.json b/types/pouchdb/tslint.json
index 57b8e6b18b..3db14f85ea 100644
--- a/types/pouchdb/tslint.json
+++ b/types/pouchdb/tslint.json
@@ -1,6 +1 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		"no-declare-current-package": false
-	}
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/power-assert-formatter/tslint.json b/types/power-assert-formatter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/power-assert-formatter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/power-assert/tslint.json b/types/power-assert/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/power-assert/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/precise/tslint.json b/types/precise/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/precise/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/precond/tslint.json b/types/precond/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/precond/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/preloadjs/tslint.json b/types/preloadjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/preloadjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/prelude-ls/tslint.json b/types/prelude-ls/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/prelude-ls/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 1ed2568a1e..32c541fda6 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -1,15 +1,25 @@
-// Type definitions for prettier 1.7
+// Type definitions for prettier 1.9
 // Project: https://github.com/prettier/prettier
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { File } from 'babel-types';
 
 export type AST = File;
 
 export type BuiltInParser = (text: string, options?: any) => AST;
-export type BuiltInParserName = 'babylon' | 'flow' | 'typescript' | 'postcss' | 'json' | 'graphql';
+export type BuiltInParserName =
+    | 'babylon'
+    | 'flow'
+    | 'typescript'
+    | 'postcss' // deprecated
+    | 'css'
+    | 'less'
+    | 'scss'
+    | 'json'
+    | 'graphql'
+    | 'markdown';
 
 export type CustomParser = (text: string, parsers: Record<BuiltInParserName, BuiltInParser>, options: Options) => AST;
 
@@ -67,6 +77,26 @@ export interface Options {
      * This is very useful when gradually transitioning large, unformatted codebases to prettier.
      */
     requirePragma?: boolean;
+    /**
+     * Prettier can insert a special @format marker at the top of files specifying that
+     * the file has been formatted with prettier. This works well when used in tandem with
+     * the --require-pragma option. If there is already a docblock at the top of
+     * the file then this option will add a newline to it with the @format marker.
+     */
+    insertPragma?: boolean;
+    /**
+     * By default, Prettier will wrap markdown text as-is since some services use a linebreak-sensitive renderer.
+     * In some cases you may want to rely on editor/viewer soft wrapping instead, so this option allows you to opt out.
+     */
+    proseWrap?:
+        | boolean // deprecated
+        | 'always'
+        | 'never'
+        | 'preserve';
+    /**
+     * Include parentheses around a sole arrow function parameter.
+     */
+    arrowParens?: 'avoid' | 'always';
 }
 
 export interface CursorOptions extends Options {
@@ -107,11 +137,28 @@ export interface ResolveConfigOptions {
      * If set to `false`, all caching will be bypassed.
      */
     useCache?: boolean;
+    /**
+     * Pass directly the path of the config file if you don't wish to search for it.
+     */
+    config?: string;
+    /**
+     * If set to `true` and an `.editorconfig` file is in your project,
+     * Prettier will parse it and convert its properties to the corresponding prettier configuration.
+     * This configuration will be overridden by `.prettierrc`, etc. Currently,
+     * the following EditorConfig properties are supported:
+     * - indent_style
+     * - indent_size/tab_width
+     * - max_line_length
+     */
+    editorconfig?: boolean;
 }
 
 /**
- * `resolveConfig` can be used to resolve configuration for a given source file.
- * The function optionally accepts an input file path as an argument, which defaults to the current working directory.
+ * `resolveConfig` can be used to resolve configuration for a given source file,
+ * passing its path as the first argument. The config search will start at the
+ * file path and continue to search up the directory.
+ * (You can use `process.cwd()` to start searching from the current directory).
+ *
  * A promise is returned which will resolve to:
  *
  *  - An options object, providing a [config file](https://github.com/prettier/prettier#configuration-file) was found.
@@ -119,9 +166,9 @@ export interface ResolveConfigOptions {
  *
  * The promise will be rejected if there was an error parsing the configuration file.
  */
-export function resolveConfig(filePath?: string, options?: ResolveConfigOptions): Promise<null | Options>;
+export function resolveConfig(filePath: string, options?: ResolveConfigOptions): Promise<null | Options>;
 export namespace resolveConfig {
-    function sync(filePath?: string, options?: ResolveConfigOptions): null | Options;
+    function sync(filePath: string, options?: ResolveConfigOptions): null | Options;
 }
 
 /**
@@ -130,6 +177,33 @@ export namespace resolveConfig {
  */
 export function clearConfigCache(): void;
 
+export interface SupportLanguage {
+    name: string;
+    since: string;
+    parsers: string[];
+    group?: string;
+    tmScope: string;
+    aceMode: string;
+    codemirrorMode: string;
+    codemirrorMimeType: string;
+    aliases?: string[];
+    extensions: string[];
+    filenames?: string[];
+    linguistLanguageId: number;
+    vscodeLanguageIds: string[];
+}
+
+export interface SupportInfo {
+    languages: SupportLanguage[];
+}
+
+/**
+ * Returns an object representing the parsers, languages and file types Prettier supports.
+ * If `version` is provided (e.g. `"1.5.0"`), information for that version will be returned,
+ * otherwise information for the current version will be returned.
+ */
+export function getSupportInfo(version?: string): SupportInfo;
+
 /**
  * `version` field in `package.json`
  */
diff --git a/types/prettier/prettier-tests.ts b/types/prettier/prettier-tests.ts
index 8d95196101..47edb63ce9 100644
--- a/types/prettier/prettier-tests.ts
+++ b/types/prettier/prettier-tests.ts
@@ -24,9 +24,15 @@ prettier.resolveConfig('path/to/somewhere').then(options => {
     }
 });
 
+// $ExpectError
+prettier.resolveConfig();
+
 const options = prettier.resolveConfig.sync('path/to/somewhere');
 if (options !== null) {
     const formatted = prettier.format('hello world', options);
 }
 
 prettier.clearConfigCache();
+
+const currentSupportInfo = prettier.getSupportInfo();
+const specificSupportInfo = prettier.getSupportInfo("1.8.0");
diff --git a/types/prettyjson/tslint.json b/types/prettyjson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/prettyjson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/priorityqueuejs/tslint.json b/types/priorityqueuejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/priorityqueuejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/prismjs/index.d.ts b/types/prismjs/index.d.ts
index 1476f56291..86f2c55d95 100644
--- a/types/prismjs/index.d.ts
+++ b/types/prismjs/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for prism 1.6
+// Type definitions for prism 1.9
 // Project: http://prismjs.com/
-// Definitions by: Erik Lieben <https://github.com/eriklieben>, Andre Wiggins <https://github.com/andrewiggins>
+// Definitions by: Erik Lieben <https://github.com/eriklieben>
+//                 Andre Wiggins <https://github.com/andrewiggins>
+//                 Michał Miszczyszyn <https://github.com/mmiszy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace Prism;
@@ -11,39 +13,50 @@ export const plugins: any;
 export const hooks: Hooks;
 
 /**
- * This is the most high-level function in Prism’s API. It fetches all the elements that have a .language-xxxx class and
- * then calls Prism.highlightElement() on each one of them.
+ * Used to highlight all elements on current website. Calls Prism.highlightAllUnder on `document`.
  *
- * @param {boolean} async Whether to use Web Workers to improve performance and avoid blocking the UI when highlighting
+ * @see highlightAllUnder
+ * @param async Whether to use Web Workers to improve performance and avoid blocking the UI when highlighting
  * very large chunks of code. False by default.
- * @param {Function} callback An optional callback to be invoked after the highlighting is done. Mostly useful when async
+ * @param callback An optional callback to be invoked after the highlighting is done. Mostly useful when async
  * is true, since in that case, the highlighting is done asynchronously.
  */
-export function highlightAll(async: boolean, callback?: (element: Element) => void): void;
+export function highlightAll(async?: boolean, callback?: (element: Element) => void): void;
+
+/**
+ * This is the most high-level function in Prism’s API. It fetches all the elements inside `container` that
+ * have a .language-xxxx class and then calls Prism.highlightElement() on each one of them.
+ *
+ * @param container The element which contains elements containing code.
+ * @param async Whether to use Web Workers to improve performance and avoid blocking the UI when highlighting
+ * very large chunks of code. False by default.
+ * @param callback An optional callback to be invoked after the highlighting is done. Mostly useful when async
+ * is true, since in that case, the highlighting is done asynchronously.
+ */
+export function highlightAllUnder(container: Element, async?: boolean, callback?: (element: Element) => void): void;
 
 /**
  * Highlights the code inside a single element.
  *
- * @param {Elment} element The element containing the code. It must have a class of language-xxxx to be processed,
+ * @param element The element containing the code. It must have a class of language-xxxx to be processed,
  * where xxxx is a valid language identifier.
- * @param {boolean} async Whether to use Web Workers to improve performance and avoid blocking the UI when
+ * @param async Whether to use Web Workers to improve performance and avoid blocking the UI when
  * highlighting very large chunks of code. False by default.
- * @param {Function} callback An optional callback to be invoked after the highlighting is done.
+ * @param callback An optional callback to be invoked after the highlighting is done.
  * Mostly useful when async is true, since in that case, the highlighting is done asynchronously.
  */
-export function highlightElement(element: Element, async: boolean, callback?: (element: Element) => void): void;
+export function highlightElement(element: Element, async?: boolean, callback?: (element: Element) => void): void;
 
 /**
  * Low-level function, only use if you know what you’re doing. It accepts a string of text as input and the language
  * definitions to use, and returns a string with the HTML produced.
  *
- * @param {string} text A string with the code to be highlighted.
- * @param {LanguageDefinition} grammer - An object containing the tokens to use. Usually a language definition like
+ * @param text A string with the code to be highlighted.
+ * @param grammar - An object containing the tokens to use. Usually a language definition like
  * Prism.languages.markup
- * @param {LanguageDefinition} language
- * @returns {string} The highlighted HTML
+ * @returns The highlighted HTML
  */
-export function highlight(text: string, grammer: LanguageDefinition, language?: LanguageDefinition): string;
+export function highlight(text: string, grammar: LanguageDefinition, language?: LanguageDefinition): string;
 
 /**
  * This is the heart of Prism, and the most low-level function you can use. It accepts a string of text as input and the
@@ -51,10 +64,10 @@ export function highlight(text: string, grammer: LanguageDefinition, language?:
  * nested tokens, the function is called recursively on each of these tokens. This method could be useful in other
  * contexts as well, as a very crude parser.
  *
- * @param  {string} text A string with the code to be highlighted.
- * @param  {LanguageDefinition} grammar An object containing the tokens to use. Usually a language definition like
+ * @param text A string with the code to be highlighted.
+ * @param grammar An object containing the tokens to use. Usually a language definition like
  * Prism.languages.markup
- * @returns {Array} An array of strings, tokens (class Prism.Token) and other arrays.
+ * @returns An array of strings, tokens (class Prism.Token) and other arrays.
  */
 export function tokenize(text: string, grammar: LanguageDefinition): Array<Token | string>;
 
diff --git a/types/prismjs/prismjs-tests.ts b/types/prismjs/prismjs-tests.ts
index bf1bdc859a..fea94ac713 100644
--- a/types/prismjs/prismjs-tests.ts
+++ b/types/prismjs/prismjs-tests.ts
@@ -1,10 +1,16 @@
 const element = document.createElement("code");
+const container = document.querySelector("div");
 const callback = (element: Element) => console.log(element);
 
 Prism.highlightElement(element, false, callback);
 Prism.highlightElement(element, false);
+Prism.highlightElement(element);
 Prism.highlightAll(true, callback);
 Prism.highlightAll(true);
+Prism.highlightAll();
+if (container) {
+    Prism.highlightAllUnder(container);
+}
 
 const hookCallback: Prism.HookCallback = env => null;
 Prism.hooks.add("before-highlightall", hookCallback);
diff --git a/types/progress/index.d.ts b/types/progress/index.d.ts
index 1989ebbed8..74596c4c13 100644
--- a/types/progress/index.d.ts
+++ b/types/progress/index.d.ts
@@ -120,14 +120,17 @@ declare class ProgressBar {
      *   overall completion to.
      */
     update(ratio: number, tokens?: any): void;
-
+    
+    /**
+     * "interrupt" the progress bar and write a message above it.
+     */
+    interrupt(message: string): void;
 
     /**
      * Terminates a progress bar.
-     */
+     */ 
     terminate(): void;
 
-
     /**
      * Completed status of progress (Boolean)
      */
diff --git a/types/progress/progress-tests.ts b/types/progress/progress-tests.ts
index 12774e7183..561f226b64 100644
--- a/types/progress/progress-tests.ts
+++ b/types/progress/progress-tests.ts
@@ -27,3 +27,16 @@ bar.tick(2, {
   'token1': "Goodbye",
   'token2': "World!"
 });
+
+/**
+ * Interrupt example from https://github.com/visionmedia/node-progress
+ */
+var bar = new ProgressBar(':bar :current/:total', { total: 10 });
+var timer = setInterval(function () {
+  bar.tick();
+  if (bar.complete) {
+    clearInterval(timer);
+  } else if (bar.curr === 5) {
+    bar.interrupt('this message appears above the progress bar\ncurrent progress is ' + bar.curr + '/' + bar.total);
+  }
+}, 1000);
\ No newline at end of file
diff --git a/types/progress/tslint.json b/types/progress/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/progress/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/progressjs/tslint.json b/types/progressjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/progressjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/proj4leaflet/index.d.ts b/types/proj4leaflet/index.d.ts
index 1d88365237..a33a3efb32 100644
--- a/types/proj4leaflet/index.d.ts
+++ b/types/proj4leaflet/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kartena/Proj4Leaflet#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as geojson from 'geojson';
 import * as L from 'leaflet';
@@ -41,7 +42,7 @@ declare module 'leaflet' {
 
     class GeoJSON extends L.GeoJSON {}
 
-    const geoJson: (geojson?: geojson.GeoJsonObject, options?: GeoJSONOptions) => GeoJSON;
+    const geoJson: (geojson?: Proj4GeoJSONFeature, options?: GeoJSONOptions) => GeoJSON;
 
     class ImageOverlay extends L.ImageOverlay {}
 
@@ -56,3 +57,6 @@ declare module 'leaflet' {
     }
   }
 }
+export type Proj4GeoJSONFeature = geojson.Feature<geojson.GeometryObject> & {
+  crs?: { type: string; properties: { name: string } }
+};
diff --git a/types/proj4leaflet/proj4leaflet-tests.ts b/types/proj4leaflet/proj4leaflet-tests.ts
index e061a4ca3a..930473d793 100644
--- a/types/proj4leaflet/proj4leaflet-tests.ts
+++ b/types/proj4leaflet/proj4leaflet-tests.ts
@@ -1,6 +1,5 @@
 import * as L from 'leaflet';
-import 'proj4leaflet';
-
+import * as proj4leaflet from "proj4leaflet";
 import * as proj4 from 'proj4';
 
 import LatLngBoundsExpression = L.LatLngBoundsExpression;
@@ -43,12 +42,13 @@ const crs3 = new L.Proj.CRS('EPSG:3006',
 // geoJson
 proj4.defs("urn:ogc:def:crs:EPSG::26915", "+proj=utm +zone=15 +ellps=GRS80 +datum=NAD83 +units=m +no_defs");
 
-const geojson = {
+const geojson: proj4leaflet.Proj4GeoJSONFeature = {
   type: "Feature",
   geometry: {
     type: "Point",
     coordinates: [481650, 4980105]
   },
+  properties: {},
   crs: {
     type: "name",
     properties: {
diff --git a/types/project-oxford/tslint.json b/types/project-oxford/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/project-oxford/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/promise-pg/index.d.ts b/types/promise-pg/index.d.ts
index 0cc7e232ca..d9461d77ae 100644
--- a/types/promise-pg/index.d.ts
+++ b/types/promise-pg/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://bitbucket.org/lplabs/promise-pg
 // Definitions by: Chris Charabaruk <https://github.com/coldacid>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/promise-pg/tslint.json b/types/promise-pg/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/promise-pg/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/promise-polyfill/tslint.json b/types/promise-polyfill/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/promise-polyfill/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/promise-pool/index.d.ts b/types/promise-pool/index.d.ts
index 51af449480..947500b0f5 100644
--- a/types/promise-pool/index.d.ts
+++ b/types/promise-pool/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/vilic/promise-pool
 // Definitions by: VILIC VANE <https://github.com/vilic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="q-retry" />
 
diff --git a/types/promise-pool/tslint.json b/types/promise-pool/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/promise-pool/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/promise-retry/index.d.ts b/types/promise-retry/index.d.ts
new file mode 100644
index 0000000000..e31fe3a657
--- /dev/null
+++ b/types/promise-retry/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for promise-retry 1.1
+// Project: https://github.com/IndigoUnited/node-promise-retry
+// Definitions by: Jamie Birch <https://github.com/shirakaba>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { WrapOptions } from "retry";
+/**
+ * A function that is retryable, by having implicitly-bound params for both an error handler and an attempt number.
+ *
+ * @param retry The retry callback upon any rejection. Essentially throws the error on in the form of a { retried: err }
+ * wrapper, and tags it with a 'code' field of value "EPROMISERETRY" so that it is recognised as needing retrying. Call
+ * this from the catch() block when you want to retry a rejected attempt.
+ * @param attempt The number of the attempt.
+ * @returns A Promise for anything (eg. a HTTP response).
+ */
+type RetryableFn = ((retry: (error: any) => never, attempt: number) => Promise<any>);
+/**
+ * Wrap all functions of the object with retry. The params can be entered in either order, just like in the original library.
+ *
+ * @param retryableFn The function to retry.
+ * @param options The options for how long/often to retry the function for.
+ * @returns The Promise resolved by the input retryableFn, or rejected (if not retried) from its catch block.
+ */
+declare function promiseRetry(retryableFn: RetryableFn, options?: WrapOptions): Promise<any>;
+declare function promiseRetry(options: WrapOptions, retryableFn: RetryableFn): Promise<any>;
+export = promiseRetry;
diff --git a/types/promise-retry/promise-retry-tests.ts b/types/promise-retry/promise-retry-tests.ts
new file mode 100644
index 0000000000..80abc7046d
--- /dev/null
+++ b/types/promise-retry/promise-retry-tests.ts
@@ -0,0 +1,93 @@
+import promiseRetry = require('promise-retry');
+
+// From sleep
+declare function sleep(milliseconds: number): Promise<void>;
+
+// Adapted from Chai
+interface Assertion {
+    equal: Equal;
+    not: Assertion;
+    to: Assertion;
+}
+type Equal = (value: any, message?: string) => Assertion;
+type Operator = string; // "==" | "===" | ">" | ">=" | "<" | "<=" | "!=" | "!==";
+interface ExpectStatic {
+    (target: any, message?: string): Assertion;
+    fail(actual?: any, expected?: any, message?: string, operator?: Operator): void;
+}
+declare const expect: ExpectStatic;
+
+// Adapted from Mocha
+interface ContextDefinition {
+    (desc: string, f: () => void): void;
+    timeout(ms: number): void;
+}
+declare const describe: ContextDefinition;
+interface Runnable {
+    timeout(n: number): this;
+}
+interface TestDefinition {
+    (desc: string, f: (done?: (error?: Error) => void) => void): Runnable;
+    timeout(ms: number): void;
+}
+declare const it: TestDefinition;
+
+// Adapted from lib.d.ts
+interface Console {
+    assert(test?: boolean, message?: string, ...optionalParams: any[]): void;
+    error(message?: any, ...optionalParams: any[]): void;
+    log(message?: any, ...optionalParams: any[]): void;
+}
+declare let Console: {
+    prototype: Console;
+    new(): Console;
+};
+declare let console: Console;
+
+describe("Promise-retry tests", () => {
+    it('should allow params to be input either way round', () => {
+        let count = 0;
+
+        promiseRetry(
+            (retryCb, attemptNumber) => {
+                count += 1;
+
+                return Promise.resolve()
+                .then(() => {
+                    console.log("Count in then()", count);
+                    if (count > 1) return Promise.resolve('final');
+                    else return Promise.reject(new Error('arbitrary excuse to retry'));
+                })
+                .catch((err: any) => {
+                    console.log("Count in catch()", count);
+                    if (count > 1) return Promise.resolve('final');
+                    else return retryCb(err);
+                });
+            },
+            {forever: true, factor: 1, minTimeout: 0, maxTimeout: 30, randomize: false}
+        )
+        .then((value: any) => console.log("Finished with value ", value))
+        .catch((err: any) => console.error(err.message || err));
+
+        promiseRetry(
+            {forever: true, factor: 1, minTimeout: 0, maxTimeout: 30, randomize: false},
+            (retryCb, attemptNumber) => {
+                count += 1;
+
+                return Promise.resolve()
+                .then(() => {
+                    console.log("Count in then()", count);
+                    if (count > 1) return Promise.resolve('final');
+                    else return Promise.reject(new Error('arbitrary excuse to retry'));
+                })
+                .catch((err: any) => {
+                    console.log("Count in catch()", count);
+                    if (count > 1) return Promise.resolve('final');
+                    else return retryCb(err);
+                });
+            }
+        )
+        .then((value: any) => console.log("Finished with value ", value))
+        .catch((err: any) => console.error(err.message || err));
+    });
+});
diff --git a/types/promise-retry/tsconfig.json b/types/promise-retry/tsconfig.json
new file mode 100644
index 0000000000..cd598fc1f4
--- /dev/null
+++ b/types/promise-retry/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-retry-tests.ts"
+    ]
+}
diff --git a/types/promise-retry/tslint.json b/types/promise-retry/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/promise-retry/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/promisify-node/tslint.json b/types/promisify-node/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/promisify-node/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/promisify-supertest/tslint.json b/types/promisify-supertest/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/promisify-supertest/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/prompt-sync-history/tslint.json b/types/prompt-sync-history/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/prompt-sync-history/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/prompt-sync/tslint.json b/types/prompt-sync/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/prompt-sync/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/promptly/tslint.json b/types/promptly/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/promptly/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/prosemirror-collab/index.d.ts b/types/prosemirror-collab/index.d.ts
index c4fb3cb7fa..4b84101159 100644
--- a/types/prosemirror-collab/index.d.ts
+++ b/types/prosemirror-collab/index.d.ts
@@ -1,14 +1,43 @@
-// Type definitions for prosemirror-collab 0.21
+// Type definitions for prosemirror-collab 1.0
 // Project: https://github.com/ProseMirror/prosemirror-collab
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
 
-import { Plugin, EditorState, Transaction } from 'prosemirror-state';
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
+import { EditorState, Plugin, Transaction } from 'prosemirror-state';
 import { Step } from 'prosemirror-transform';
 
-export function collab<T>(config?: { version?: number, clientID?: number | string }): Plugin<T>;
+/**
+ * Creates a plugin that enables the collaborative editing framework
+ * for the editor.
+ */
+export function collab(config?: { version?: number | null, clientID?: number | string | null }): Plugin;
+/**
+ * Create a transaction that represents a set of new steps received from
+ * the authority. Applying this transaction moves the state forward to
+ * adjust to the authority's view of the document.
+ */
 export function receiveTransaction(state: EditorState, steps: Step[], clientIDs: Array<number | string>): Transaction;
-export function sendableSteps(state: EditorState): { version: number, steps: Step[], clientID: number | string, origins: Transaction[] } | null;
+/**
+ * Provides data describing the editor's unconfirmed steps, which need
+ * to be sent to the central authority. Returns null when there is
+ * nothing to send.
+ *
+ * `origins` holds the _original_ transactions that produced each
+ * steps. This can be useful for looking up time stamps and other
+ * metadata for the steps, but note that the steps may have been
+ * rebased, whereas the origin transactions are still the old,
+ * unchanged objects.
+ */
+export function sendableSteps(state: EditorState): { version: number, steps: Step[], clientID: number | string, origins: Transaction[] } | null | void;
+/**
+ * Get the version up to which the collab plugin has synced with the
+ * central authority.
+ */
 export function getVersion(state: EditorState): number;
diff --git a/types/prosemirror-commands/index.d.ts b/types/prosemirror-commands/index.d.ts
index df531d3663..5f8cb75946 100644
--- a/types/prosemirror-commands/index.d.ts
+++ b/types/prosemirror-commands/index.d.ts
@@ -1,35 +1,178 @@
-// Type definitions for prosemirror-commands 0.24
+// Type definitions for prosemirror-commands 1.0
 // Project: https://github.com/ProseMirror/prosemirror-commands
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.1
 
-import { MarkType, Node, NodeType } from 'prosemirror-model';
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
+import { MarkType, Node as ProsemirrorNode, NodeType } from 'prosemirror-model';
 import { EditorState, Transaction } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 
+/**
+ * Delete the selection, if there is one.
+ */
 export function deleteSelection(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * If the selection is empty and at the start of a textblock, try to
+ * reduce the distance between that block and the one before it—if
+ * there's a block directly before it that can be joined, join them.
+ * If not, try to move the selected block closer to the next one in
+ * the document structure by lifting it out of its parent or moving it
+ * into a parent of the previous block. Will use the view for accurate
+ * (bidi-aware) start-of-textblock detection if given.
+ */
 export function joinBackward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean;
+/**
+ * When the selection is empty and at the start of a textblock, select
+ * the node before that textblock, if possible. This is intended to be
+ * bound to keys like backspace, after
+ * [`joinBackward`](#commands.joinBackward) or other deleting
+ * commands, as a fall-back behavior when the schema doesn't allow
+ * deletion at the selected point.
+ */
 export function selectNodeBackward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean;
-export function selectNodeForward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean;
+/**
+ * If the selection is empty and the cursor is at the end of a
+ * textblock, try to reduce or remove the boundary between that block
+ * and the one after it, either by joining them or by moving the other
+ * block closer to this one in the tree structure. Will use the view
+ * for accurate start-of-textblock detection if given.
+ */
 export function joinForward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean;
+/**
+ * When the selection is empty and at the end of a textblock, select
+ * the node coming after that textblock, if possible. This is intended
+ * to be bound to keys like delete, after
+ * [`joinForward`](#commands.joinForward) and similar deleting
+ * commands, to provide a fall-back behavior when the schema doesn't
+ * allow deletion at the selected point.
+ */
+export function selectNodeForward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean;
+/**
+ * Join the selected block or, if there is a text selection, the
+ * closest ancestor block of the selection that can be joined, with
+ * the sibling above it.
+ */
 export function joinUp(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * Join the selected block, or the closest ancestor of the selection
+ * that can be joined, with the sibling after it.
+ */
 export function joinDown(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * Lift the selected block, or the closest ancestor block of the
+ * selection that can be lifted, out of its parent node.
+ */
 export function lift(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * If the selection is in a node whose type has a truthy
+ * [`code`](#model.NodeSpec.code) property in its spec, replace the
+ * selection with a newline character.
+ */
 export function newlineInCode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * When the selection is in a node with a truthy
+ * [`code`](#model.NodeSpec.code) property in its spec, create a
+ * default block after the code block, and move the cursor there.
+ */
 export function exitCode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * If a block node is selected, create an empty paragraph before (if
+ * it is its parent's first child) or after it.
+ */
 export function createParagraphNear(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * If the cursor is in an empty textblock that can be lifted, lift the
+ * block.
+ */
 export function liftEmptyBlock(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * Split the parent block of the selection. If the selection is a text
+ * selection, also delete its content.
+ */
 export function splitBlock(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * Acts like [`splitBlock`](#commands.splitBlock), but without
+ * resetting the set of active marks at the cursor.
+ */
 export function splitBlockKeepMarks(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * Move the selection to the node wrapping the current selection, if
+ * any. (Will not select the document node.)
+ */
 export function selectParentNode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * Select the whole document.
+ */
 export function selectAll(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
-export function wrapIn(nodeType: NodeType, attrs?: object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
-export function setBlockType(nodeType: NodeType, attrs?: object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
-export function toggleMark(markType: MarkType, attrs?: object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+/**
+ * Wrap the selection in a node of the given type with the given
+ * attributes.
+ */
+export function wrapIn(nodeType: NodeType, attrs?: { [key: string]: any }): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+/**
+ * Returns a command that tries to set the textblock around the
+ * selection to the given node type with the given attributes.
+ */
+export function setBlockType(nodeType: NodeType, attrs?: { [key: string]: any }): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+/**
+ * Create a command function that toggles the given mark with the
+ * given attributes. Will return `false` when the current selection
+ * doesn't support that mark. This will remove the mark if any marks
+ * of that type exist in the selection, or add it otherwise. If the
+ * selection is empty, this applies to the [stored
+ * marks](#state.EditorState.storedMarks) instead of a range of the
+ * document.
+ */
+export function toggleMark(markType: MarkType, attrs?: { [key: string]: any }): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+/**
+ * Wrap a command so that, when it produces a transform that causes
+ * two joinable nodes to end up next to each other, those are joined.
+ * Nodes are considered joinable when they are of the same type and
+ * when the `isJoinable` predicate returns true for them or, if an
+ * array of strings was passed, if their node type name is in that
+ * array.
+ */
 export function autoJoin(
-    command: (state: EditorState, p1?: (tr: Transaction) => void) => boolean,
-    isJoinable: ((before: Node, after: Node) => boolean) | string[]): (state: EditorState, p1?: (tr: Transaction) => void) => boolean;
-export function chainCommands(...commands: Array<(p1: EditorState, p2?: (tr: Transaction) => void) => boolean>): (p1: EditorState, p2?: (tr: Transaction) => void) => boolean;
-export const baseKeymap: { [key: string]: any };
+  command: (state: EditorState, p1?: (tr: Transaction) => void) => boolean,
+  isJoinable: ((before: ProsemirrorNode, after: ProsemirrorNode) => boolean) | string[]
+): (state: EditorState, p1?: (tr: Transaction) => void) => boolean;
+/**
+ * Combine a number of command functions into a single function (which
+ * calls them one by one until one returns true).
+ */
+export function chainCommands(
+  ...commands: Array<(p1: EditorState, p2?: (tr: Transaction) => void, p3?: EditorView) => boolean>
+): (p1: EditorState, p2?: (tr: Transaction) => void, p3?: EditorView) => boolean;
+/**
+ * A basic keymap containing bindings not specific to any schema.
+ * Binds the following keys (when multiple commands are listed, they
+ * are chained with [`chainCommands`](#commands.chainCommands)):
+ *
+ * * **Enter** to `newlineInCode`, `createParagraphNear`, `liftEmptyBlock`, `splitBlock`
+ * * **Mod-Enter** to `exitCode`
+ * * **Backspace** and **Mod-Backspace** to `deleteSelection`, `joinBackward`, `selectNodeBackward`
+ * * **Delete** and **Mod-Delete** to `deleteSelection`, `joinForward`, `selectNodeForward`
+ * * **Mod-Delete** to `deleteSelection`, `joinForward`, `selectNodeForward`
+ * * **Mod-a** to `selectAll`
+ */
+export let pcBaseKeymap: { [key: string]: any };
+/**
+ * A copy of `pcBaseKeymap` that also binds **Ctrl-h** like Backspace,
+ * **Ctrl-d** like Delete, **Alt-Backspace** like Ctrl-Backspace, and
+ * **Ctrl-Alt-Backspace**, **Alt-Delete**, and **Alt-d** like
+ * Ctrl-Delete.
+ */
+export let macBaseKeymap: { [key: string]: any };
+/**
+ * Depending on the detected platform, this will hold
+ * [`pcBasekeymap`](#commands.pcBaseKeymap) or
+ * [`macBaseKeymap`](#commands.macBaseKeymap).
+ */
+export let baseKeymap: { [key: string]: any };
diff --git a/types/prosemirror-gapcursor/index.d.ts b/types/prosemirror-gapcursor/index.d.ts
new file mode 100644
index 0000000000..41edf50e3f
--- /dev/null
+++ b/types/prosemirror-gapcursor/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for prosemirror-gapcursor 1.0
+// Project: https://github.com/ProseMirror/prosemirror-gapcursor
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
+import { Plugin, Selection } from 'prosemirror-state';
+
+/**
+ * Gap cursor selections are represented using this class. Its
+ * `$anchor` and `$head` properties both point at the cursor position.
+ */
+export class GapCursor extends Selection {
+}
+/**
+ * Create a gap cursor plugin. When enabled, this will capture clicks
+ * near and arrow-key-motion past places that don't have a normally
+ * selectable position nearby, and create a gap cursor selection for
+ * them. The cursor is drawn as an element with class
+ * `ProseMirror-gapcursor`. You can either include
+ * `style/gapcursor.css` from the package's directory or add your own
+ * styles to make it visible.
+ */
+export function gapCursor(): Plugin;
diff --git a/types/prosemirror-gapcursor/prosemirror-gapcursor-tests.ts b/types/prosemirror-gapcursor/prosemirror-gapcursor-tests.ts
new file mode 100644
index 0000000000..1a3ecf2d0a
--- /dev/null
+++ b/types/prosemirror-gapcursor/prosemirror-gapcursor-tests.ts
@@ -0,0 +1,4 @@
+import { gapCursor } from 'prosemirror-gapcursor';
+import { Plugin } from 'prosemirror-state';
+
+const gapCursorPlugin: Plugin = gapCursor();
diff --git a/types/prosemirror-gapcursor/tsconfig.json b/types/prosemirror-gapcursor/tsconfig.json
new file mode 100644
index 0000000000..957316926f
--- /dev/null
+++ b/types/prosemirror-gapcursor/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "prosemirror-gapcursor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/prosemirror-gapcursor/tslint.json b/types/prosemirror-gapcursor/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/prosemirror-gapcursor/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/prosemirror-history/index.d.ts b/types/prosemirror-history/index.d.ts
index 55895338a9..4fbb59ecb9 100644
--- a/types/prosemirror-history/index.d.ts
+++ b/types/prosemirror-history/index.d.ts
@@ -1,15 +1,46 @@
-// Type definitions for prosemirror-history 0.21
+// Type definitions for prosemirror-history 1.0
 // Project: https://github.com/ProseMirror/prosemirror-history
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
 
-import { Plugin, EditorState, Transaction } from 'prosemirror-state';
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
 
+import { EditorState, Plugin, Transaction } from 'prosemirror-state';
+
+/**
+ * Set a flag on the given transaction that will prevent further steps
+ * from being appended to an existing history event (so that they
+ * require a separate undo command to undo).
+ */
 export function closeHistory(tr: Transaction): Transaction;
-export function history<T>(config?: { depth?: number, newGroupDelay: number, preserveItems?: boolean }): Plugin<T>;
+/**
+ * Returns a plugin that enables the undo history for an editor. The
+ * plugin will track undo and redo stacks, which can be used with the
+ * [`undo`](#history.undo) and [`redo`](#history.redo) commands.
+ *
+ * You can set an `"addToHistory"` [metadata
+ * property](#state.Transaction.setMeta) of `false` on a transaction
+ * to prevent it from being rolled back by undo.
+ */
+export function history(config?: { depth?: number | null, newGroupDelay?: number | null }): Plugin;
+/**
+ * A command function that undoes the last change, if any.
+ */
 export function undo(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * A command function that redoes the last undone change, if any.
+ */
 export function redo(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+/**
+ * The amount of undoable events available in a given state.
+ */
 export function undoDepth(state: EditorState): number;
+/**
+ * The amount of redoable events available in a given editor state.
+ */
 export function redoDepth(state: EditorState): number;
diff --git a/types/prosemirror-inputrules/index.d.ts b/types/prosemirror-inputrules/index.d.ts
index d2c6d9c876..a75dc9cff5 100644
--- a/types/prosemirror-inputrules/index.d.ts
+++ b/types/prosemirror-inputrules/index.d.ts
@@ -1,30 +1,111 @@
-// Type definitions for prosemirror-inputrules 0.21
+// Type definitions for prosemirror-inputrules 1.0
 // Project: https://github.com/ProseMirror/prosemirror-inputrules
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
 
-import { Node, NodeType } from 'prosemirror-model';
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
+import { Node as ProsemirrorNode, NodeType } from 'prosemirror-model';
 import { EditorState, Plugin, Transaction } from 'prosemirror-state';
 
+/**
+ * Input rules are regular expressions describing a piece of text
+ * that, when typed, causes something to happen. This might be
+ * changing two dashes into an emdash, wrapping a paragraph starting
+ * with `"> "` into a blockquote, or something entirely different.
+ */
 export class InputRule {
-  constructor(match: RegExp, handler: string | ((state: EditorState, match: string[], start: number, end: number) => Transaction | null | undefined))
+  /**
+   * Create an input rule. The rule applies when the user typed
+   * something and the text directly in front of the cursor matches
+   * `match`, which should probably end with `$`.
+   *
+   * The `handler` can be a string, in which case the matched text, or
+   * the first matched group in the regexp, is replaced by that
+   * string.
+   *
+   * Or a it can be a function, which will be called with the match
+   * array produced by
+   * [`RegExp.exec`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/exec),
+   * as well as the start and end of the matched range, and which can
+   * return a [transaction](#state.Transaction) that describes the
+   * rule's effect, or null to indicate the input was not handled.
+   */
+  constructor(match: RegExp, handler: string | ((state: EditorState, match: string[], start: number, end: number) => Transaction | null | void));
 }
+/**
+ * Create an input rules plugin. When enabled, it will cause text
+ * input that matches any of the given rules to trigger the rule's
+ * action.
+ */
 export function inputRules(config: { rules: InputRule[] }): Plugin;
+/**
+ * This is a command that will undo an input rule, if applying such a
+ * rule was the last thing that the user did.
+ */
 export function undoInputRule(state: EditorState, dispatch?: (p: Transaction) => void): boolean;
+/**
+ * Build an input rule for automatically wrapping a textblock when a
+ * given string is typed. The `regexp` argument is
+ * directly passed through to the `InputRule` constructor. You'll
+ * probably want the regexp to start with `^`, so that the pattern can
+ * only occur at the start of a textblock.
+ *
+ * `nodeType` is the type of node to wrap in. If it needs attributes,
+ * you can either pass them directly, or pass a function that will
+ * compute them from the regular expression match.
+ *
+ * By default, if there's a node with the same type above the newly
+ * wrapped node, the rule will try to [join](#transform.Transform.join) those
+ * two nodes. You can pass a join predicate, which takes a regular
+ * expression match and the node before the wrapped node, and can
+ * return a boolean to indicate whether a join should happen.
+ */
+export function wrappingInputRule(
+  regexp: RegExp,
+  nodeType: NodeType,
+  getAttrs?: { [key: string]: any } | ((p: string[]) => { [key: string]: any } | null | void),
+  joinPredicate?: (p1: string[], p2: ProsemirrorNode) => boolean
+): InputRule;
+/**
+ * Build an input rule that changes the type of a textblock when the
+ * matched text is typed into it. You'll usually want to start your
+ * regexp with `^` to that it is only matched at the start of a
+ * textblock. The optional `getAttrs` parameter can be used to compute
+ * the new node's attributes, and works the same as in the
+ * `wrappingInputRule` function.
+ */
+export function textblockTypeInputRule(regexp: RegExp, nodeType: NodeType, getAttrs?: { [key: string]: any } | ((p: string[]) => { [key: string]: any } | null | void)): InputRule;
+/**
+ * Converts double dashes to an emdash.
+ */
 export let emDash: InputRule;
+/**
+ * Converts three dots to an ellipsis character.
+ */
 export let ellipsis: InputRule;
+/**
+ * “Smart� opening double quotes.
+ */
 export let openDoubleQuote: InputRule;
+/**
+ * “Smart� closing double quotes.
+ */
 export let closeDoubleQuote: InputRule;
+/**
+ * “Smart� opening single quotes.
+ */
 export let openSingleQuote: InputRule;
+/**
+ * “Smart� closing single quotes.
+ */
 export let closeSingleQuote: InputRule;
+/**
+ * Smart-quote related input rules.
+ */
 export let smartQuotes: InputRule[];
-export let allInputRules: InputRule[];
-export function wrappingInputRule(regexp: RegExp, nodeType: NodeType, getAttrs?: object | ((p: string[]) => object | null | undefined), joinPredicate?: (p1: string[], p2: Node) => boolean): InputRule;
-export function textblockTypeInputRule(regexp: RegExp, nodeType: NodeType, getAttrs?: object | ((p: string[]) => object | null | undefined)): InputRule;
-export function blockQuoteRule(nodeType: NodeType): InputRule;
-export function orderedListRule(nodeType: NodeType): InputRule;
-export function bulletListRule(nodeType: NodeType): InputRule;
-export function codeBlockRule(nodeType: NodeType): InputRule;
-export function headingRule(nodeType: NodeType, maxLevel: number): InputRule;
diff --git a/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts b/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts
index fbfe71ccd3..0d59a02be7 100644
--- a/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts
+++ b/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts
@@ -2,4 +2,4 @@ import * as inputrules from 'prosemirror-inputrules';
 import { NodeType } from 'prosemirror-model';
 
 const nodeType = new NodeType();
-const rule = inputrules.blockQuoteRule(nodeType);
+const rule: inputrules.InputRule = inputrules.wrappingInputRule(/^\$/, nodeType);
diff --git a/types/prosemirror-inputrules/tslint.json b/types/prosemirror-inputrules/tslint.json
index f93cf8562a..f0f7a6f17a 100644
--- a/types/prosemirror-inputrules/tslint.json
+++ b/types/prosemirror-inputrules/tslint.json
@@ -1,3 +1,7 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "no-unnecessary-class": false
+    }
 }
diff --git a/types/prosemirror-keymap/index.d.ts b/types/prosemirror-keymap/index.d.ts
index 9e190f33b3..2e049948d5 100644
--- a/types/prosemirror-keymap/index.d.ts
+++ b/types/prosemirror-keymap/index.d.ts
@@ -1,16 +1,53 @@
-// Type definitions for prosemirror-keymap 0.24
+// Type definitions for prosemirror-keymap 1.0
 // Project: https://github.com/ProseMirror/prosemirror-keymap
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
+
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
 
 import { Plugin } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 
-export interface Bindings {
-    [key: string]: any;
-}
-
-export function keymap<T>(bindings: Bindings): Plugin<T>;
-export function keydownHandler(bindings: Bindings): (view: EditorView, event: Event) => boolean;
+/**
+ * Create a keymap plugin for the given set of bindings.
+ *
+ * Bindings should map key names to [command](#commands)-style
+ * functions, which will be called with `(EditorState, dispatch,
+ * EditorView)` arguments, and should return true when they've handled
+ * the key. Note that the view argument isn't part of the command
+ * protocol, but can be used as an escape hatch if a binding needs to
+ * directly interact with the UI.
+ *
+ * Key names may be strings like `"Shift-Ctrl-Enter"`—a key
+ * identifier prefixed with zero or more modifiers. Key identifiers
+ * are based on the strings that can appear in
+ * [`KeyEvent.key`](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key).
+ * Use lowercase letters to refer to letter keys (or uppercase letters
+ * if you want shift to be held). You may use `"Space"` as an alias
+ * for the `" "` name.
+ *
+ * Modifiers can be given in any order. `Shift-` (or `s-`), `Alt-` (or
+ * `a-`), `Ctrl-` (or `c-` or `Control-`) and `Cmd-` (or `m-` or
+ * `Meta-`) are recognized. For characters that are created by holding
+ * shift, the `Shift-` prefix is implied, and should not be added
+ * explicitly.
+ *
+ * You can use `Mod-` as a shorthand for `Cmd-` on Mac and `Ctrl-` on
+ * other platforms.
+ *
+ * You can add multiple keymap plugins to an editor. The order in
+ * which they appear determines their precedence (the ones early in
+ * the array get to dispatch first).
+ */
+export function keymap(bindings: { [key: string]: any }): Plugin;
+/**
+ * Given a set of bindings (using the same format as
+ * [`keymap`](#keymap.keymap), return a [keydown
+ * handler](#view.EditorProps.handleKeyDown) handles them.
+ */
+export function keydownHandler(bindings: { [key: string]: any }): (view: EditorView, event: Event) => boolean;
diff --git a/types/prosemirror-markdown/index.d.ts b/types/prosemirror-markdown/index.d.ts
index 0f91962dd6..6617166c6e 100644
--- a/types/prosemirror-markdown/index.d.ts
+++ b/types/prosemirror-markdown/index.d.ts
@@ -1,60 +1,176 @@
-// Type definitions for prosemirror-markdown 0.21
+// Type definitions for prosemirror-markdown 1.0
 // Project: https://github.com/ProseMirror/prosemirror-markdown
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
+
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
 
 import { MarkdownIt } from 'markdown-it';
-import { Mark, Node, Schema } from 'prosemirror-model';
+import { Node as ProsemirrorNode, Schema } from 'prosemirror-model';
 
+/**
+ * A configuration of a Markdown parser. Such a parser uses
+ * [markdown-it](https://github.com/markdown-it/markdown-it) to
+ * tokenize a file, and then runs the custom rules it is given over
+ * the tokens to create a ProseMirror document tree.
+ */
 export class MarkdownParser {
+  /**
+   * Create a parser with the given configuration. You can configure
+   * the markdown-it parser to parse the dialect you want, and provide
+   * a description of the ProseMirror entities those tokens map to in
+   * the `tokens` object, which maps token names to descriptions of
+   * what to do with them. Such a description is an object, and may
+   * have the following properties:
+   *
+   * **`node`**`: ?string`
+   * : This token maps to a single node, whose type can be looked up
+   * in the schema under the given name. Exactly one of `node`,
+   * `block`, or `mark` must be set.
+   *
+   * **`block`**`: ?string`
+   * : This token comes in `_open` and `_close` variants (which are
+   * appended to the base token name provides a the object
+   * property), and wraps a block of content. The block should be
+   * wrapped in a node of the type named to by the property's
+   * value.
+   *
+   * **`mark`**`: ?string`
+   * : This token also comes in `_open` and `_close` variants, but
+   * should add a mark (named by the value) to its content, rather
+   * than wrapping it in a node.
+   *
+   * **`attrs`**`: ?Object`
+   * : Attributes for the node or mark. When `getAttrs` is provided,
+   * it takes precedence.
+   *
+   * **`getAttrs`**`: ?(MarkdownToken) → Object`
+   * : A function used to compute the attributes for the node or mark
+   * that takes a [markdown-it
+   * token](https://markdown-it.github.io/markdown-it/#Token) and
+   * returns an attribute object.
+   *
+   * **`ignore`**`: ?bool`
+   * : When true, ignore content for the matched token.
+   */
   constructor(schema: Schema, tokenizer: MarkdownIt, tokens: { [key: string]: any });
+  /**
+   * The value of the `tokens` object used to construct
+   * this parser. Can be useful to copy and modify to base other
+   * parsers on.
+   */
+  tokens: { [key: string]: any };
+  /**
+   * Parse a string as [CommonMark](http://commonmark.org/) markup,
+   * and create a ProseMirror document as prescribed by this parser's
+   * rules.
+   */
+  parse(text: string): ProsemirrorNode;
 }
-
-export type NodeSerializer = (state: MarkdownSerializerState, node?: Node, parent?: Node, index?: number) => void;
-
-export interface MarkSerializer {
-  open: string | ((state: MarkdownSerializerState, mark: Mark) => string);
-  close: string | ((state: MarkdownSerializerState, mark: Mark) => string);
-  mixable?: boolean;
-}
-
-export interface NodeSerializerSpec {
-    [ nodeName: string ]: NodeSerializer;
-}
-
-export interface MarkSerializerSpec {
-    [ markName: string ]: MarkSerializer;
-}
-
+/**
+ * A parser parsing unextended [CommonMark](http://commonmark.org/),
+ * without inline HTML, and producing a document in the basic schema.
+ */
+export let defaultMarkdownParser: MarkdownParser;
+/**
+ * A specification for serializing a ProseMirror document as
+ * Markdown/CommonMark text.
+ */
 export class MarkdownSerializer {
-  constructor(nodes: NodeSerializerSpec, marks: MarkSerializerSpec);
-  serialize(content: Node, options?: { [key: string]: any }): string;
-  nodes: any;
-  marks: any;
+  constructor(nodes: { [name: string]: (state: MarkdownSerializerState, node: ProsemirrorNode, parent: ProsemirrorNode, index: number) => void }, marks: { [key: string]: any });
+  /**
+   * The node serializer
+   * functions for this serializer.
+   */
+  nodes: { [name: string]: (p1: MarkdownSerializerState, p2: ProsemirrorNode) => void };
+  /**
+   * The mark serializer info.
+   */
+  marks: { [key: string]: any };
+  /**
+   * Serialize the content of the given node to
+   * [CommonMark](http://commonmark.org/).
+   */
+  serialize(content: ProsemirrorNode, options?: { [key: string]: any }): string;
 }
-
-export const defaultMarkdownSerializer: MarkdownSerializer;
-
+/**
+ * A serializer for the [basic schema](#schema).
+ */
+export let defaultMarkdownSerializer: MarkdownSerializer;
+/**
+ * This is an object used to track state and expose
+ * methods related to markdown serialization. Instances are passed to
+ * node and mark serialization methods (see `toMarkdown`).
+ */
 export class MarkdownSerializerState {
-  constructor(nodes: NodeSerializerSpec, marks: MarkSerializerSpec, options?: object);
-  flushClose(size: number): void;
-  wrapBlock(delim: string, firstDelim: string | null, node: Node, f: (...args: any[]) => void): void;
-  atBlank(): boolean;
+  /**
+   * The options passed to the serializer.
+   */
+  options: { tightLists?: boolean | null };
+  /**
+   * Render a block, prefixing each line with `delim`, and the first
+   * line in `firstDelim`. `node` should be the node that is closed at
+   * the end of the block, and `f` is a function that renders the
+   * content of the block.
+   */
+  wrapBlock(delim: string, firstDelim: string | undefined, node: ProsemirrorNode, f: () => void): void;
+  /**
+   * Ensure the current content ends with a newline.
+   */
   ensureNewLine(): void;
+  /**
+   * Prepare the state for writing output (closing closed paragraphs,
+   * adding delimiters, and so on), and then optionally add content
+   * (unescaped) to the output.
+   */
   write(content?: string): void;
-  closeBlock(node: Node): void;
+  /**
+   * Close the block for the given node.
+   */
+  closeBlock(node: ProsemirrorNode): void;
+  /**
+   * Add the given text to the document. When escape is not `false`,
+   * it will be escaped.
+   */
   text(text: string, escape?: boolean): void;
-  render(node: Node, parent: Node, index: number): void;
-  renderContent(parent: Node): void;
-  renderInline(parent: Node): void;
-  renderList(node: Node, delim: string, firstDelim: (number: number) => string): void;
+  /**
+   * Render the given node as a block.
+   */
+  render(node: ProsemirrorNode): void;
+  /**
+   * Render the contents of `parent` as block nodes.
+   */
+  renderContent(parent: ProsemirrorNode): void;
+  /**
+   * Render the contents of `parent` as inline content.
+   */
+  renderInline(parent: ProsemirrorNode): void;
+  /**
+   * Render a node's content as a list. `delim` should be the extra
+   * indentation added to all lines except the first in an item,
+   * `firstDelim` is a function going from an item index to a
+   * delimiter for the first line of the item.
+   */
+  renderList(node: ProsemirrorNode, delim: string, firstDelim: (p: number) => string): void;
+  /**
+   * Escape the given string so that it can safely appear in Markdown
+   * content. If `startOfLine` is true, also escape characters that
+   * has special meaning only at the start of the line.
+   */
   esc(str: string, startOfLine?: boolean): string;
-  quote(str: string): string;
+  /**
+   * Repeat the given string `n` times.
+   */
   repeat(str: string, n: number): string;
-  markString(mark: Mark, open: boolean): string;
-  out: any;
-  closed: any;
-  nodes: any;
-  marks: any;
+  /**
+   * Get leading and trailing whitespace from a string. Values of
+   * leading or trailing property of the return object will be undefined
+   * if there is no match.
+   */
+  getEnclosingWhitespace(text: string): { leading?: string | null, trailing?: string | null };
 }
diff --git a/types/prosemirror-markdown/tslint.json b/types/prosemirror-markdown/tslint.json
index 3db14f85ea..d5ed3f0240 100644
--- a/types/prosemirror-markdown/tslint.json
+++ b/types/prosemirror-markdown/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODOs
+		"no-unnecessary-class": false
+	}
+}
diff --git a/types/prosemirror-menu/index.d.ts b/types/prosemirror-menu/index.d.ts
index 43b4cf59d6..898fdffd20 100644
--- a/types/prosemirror-menu/index.d.ts
+++ b/types/prosemirror-menu/index.d.ts
@@ -1,49 +1,214 @@
-// Type definitions for prosemirror-menu 0.21
+// Type definitions for prosemirror-menu 1.0
 // Project: https://github.com/ProseMirror/prosemirror-menu
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
+
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
 
 import { NodeType } from 'prosemirror-model';
 import { EditorState, Plugin, Transaction } from 'prosemirror-state';
-import { EditorProps, EditorView } from 'prosemirror-view';
+import { EditorView } from 'prosemirror-view';
 
+/**
+ * The types defined in this module aren't the only thing you can
+ * display in your menu. Anything that conforms to this interface can
+ * be put into a menu structure.
+ */
 export interface MenuElement {
-  render(pm: any): Node;
+  /**
+   * Render the element for display in the menu. Must return a DOM
+   * element and a function that can be used to update the element to
+   * a new state. The `update` function will return false if the
+   * update hid the entire element.
+   */
+  render(pm: EditorView): { dom: Node, update(p: EditorState): boolean };
 }
+/**
+ * An icon or label that, when clicked, executes a command.
+ */
 export class MenuItem {
-  constructor(spec: MenuItemSpec)
+  constructor(spec: MenuItemSpec);
+  /**
+   * The spec used to create the menu item.
+   */
   spec: MenuItemSpec;
-  render(view: EditorView): Node;
+  /**
+   * Renders the icon according to its [display
+   * spec](#menu.MenuItemSpec.display), and adds an event handler which
+   * executes the command when the representation is clicked.
+   */
+  render(view: EditorView): { dom: Node, update(p: EditorState): boolean };
 }
+/**
+ * The configuration object passed to the `MenuItem` constructor.
+ */
 export interface MenuItemSpec {
-  run(p1: EditorState, fn: (p: Transaction) => void, p2: EditorView, ev: Event): void;
-  select?(p: EditorState): boolean;
-  onDeselected?: string;
-  active?(p: EditorState): boolean;
-  render?(p: EditorView): Node;
-  icon?: { [key: string]: any };
-  label?: string;
-  title?: string | ((s: EditorState) => string);
+  /**
+   * The function to execute when the menu item is activated.
+   */
+  run(p1: EditorState, p2: (p: Transaction) => void, p3: EditorView, p4: Event): void;
+  /**
+   * Optional function that is used to determine whether the item is
+   * appropriate at the moment. Deselected items will be hidden.
+   */
+  select?: ((p: EditorState) => boolean) | null;
+  /**
+   * Function that is used to determine if the item is enabled. If
+   * given and returning false, the item will be given a disabled
+   * styling.
+   */
+  enable?: ((p: EditorState) => boolean) | null;
+  /**
+   * A predicate function to determine whether the item is 'active' (for
+   * example, the item for toggling the strong mark might be active then
+   * the cursor is in strong text).
+   */
+  active?: ((p: EditorState) => boolean) | null;
+  /**
+   * A function that renders the item. You must provide either this,
+   * [`icon`](#menu.MenuItemSpec.icon), or [`label`](#MenuItemSpec.label).
+   */
+  render?: ((p: EditorView) => Node) | null;
+  /**
+   * Describes an icon to show for this item. The object may specify
+   * an SVG icon, in which case its `path` property should be an [SVG
+   * path
+   * spec](https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/d),
+   * and `width` and `height` should provide the viewbox in which that
+   * path exists. Alternatively, it may have a `text` property
+   * specifying a string of text that makes up the icon, with an
+   * optional `css` property giving additional CSS styling for the
+   * text. _Or_ it may contain `dom` property containing a DOM node.
+   */
+  icon?: { [key: string]: any } | null;
+  /**
+   * Makes the item show up as a text label. Mostly useful for items
+   * wrapped in a [drop-down](#menu.Dropdown) or similar menu. The object
+   * should have a `label` property providing the text to display.
+   */
+  label?: string | null;
+  /**
+   * Defines DOM title (mouseover) text for the item.
+   */
+  title?: string | ((p: EditorState) => string) | null;
+  /**
+   * Optionally adds a CSS class to the item's DOM representation.
+   */
   class: string;
+  /**
+   * Optionally adds a string of inline CSS to the item's DOM
+   * representation.
+   */
   css: string;
+  /**
+   * Defines which event on the command's DOM representation should
+   * trigger the execution of the command. Defaults to mousedown.
+   */
   execEvent: string;
 }
+/**
+ * A drop-down menu, displayed as a label with a downwards-pointing
+ * triangle to the right of it.
+ */
 export class Dropdown {
-  constructor(content: MenuElement[], options?: object)
-  render(view: EditorView): Node;
+  /**
+   * Create a dropdown wrapping the elements. Options may include
+   * the following properties:
+   *
+   * **`label`**`: string`
+   * : The label to show on the drop-down control.
+   *
+   * **`title`**`: string`
+   * : Sets the
+   * [`title`](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/title)
+   * attribute given to the menu control.
+   *
+   * **`class`**`: string`
+   * : When given, adds an extra CSS class to the menu control.
+   *
+   * **`css`**`: string`
+   * : When given, adds an extra set of CSS styles to the menu control.
+   */
+  constructor(content: MenuElement[], options?: { [key: string]: any });
+  /**
+   * Render the dropdown menu and sub-items.
+   */
+  render(view: EditorView): { dom: Node, update(p: EditorState): void };
 }
+/**
+ * Represents a submenu wrapping a group of elements that start
+ * hidden and expand to the right when hovered over or tapped.
+ */
 export class DropdownSubmenu {
-  constructor(content: MenuElement[], options?: object)
-  render(view: EditorView): Node;
+  /**
+   * Creates a submenu for the given group of menu elements. The
+   * following options are recognized:
+   *
+   * **`label`**`: string`
+   * : The label to show on the submenu.
+   */
+  constructor(content: MenuElement[], options?: { [key: string]: any });
+  /**
+   * Renders the submenu.
+   */
+  render(view: EditorView): { dom: Node, update(p: EditorState): boolean };
 }
-export function renderGrouped(view: EditorView, content: MenuElement | MenuElement[][]): DocumentFragment;
+/**
+ * Render the given, possibly nested, array of menu elements into a
+ * document fragment, placing separators between them (and ensuring no
+ * superfluous separators appear when some of the groups turn out to
+ * be empty).
+ */
+export function renderGrouped(view: EditorView, content: Array<MenuElement | MenuElement[]>): { dom?: DocumentFragment | null, update(p: EditorState): boolean };
+/**
+ * A set of basic editor-related icons. Contains the properties
+ * `join`, `lift`, `selectParentNode`, `undo`, `redo`, `strong`, `em`,
+ * `code`, `link`, `bulletList`, `orderedList`, and `blockquote`, each
+ * holding an object that can be used as the `icon` option to
+ * `MenuItem`.
+ */
 export let icons: { [key: string]: any };
+/**
+ * Menu item for the `joinUp` command.
+ */
 export let joinUpItem: MenuItem;
+/**
+ * Menu item for the `lift` command.
+ */
 export let liftItem: MenuItem;
+/**
+ * Menu item for the `selectParentNode` command.
+ */
 export let selectParentNodeItem: MenuItem;
-export function undoItem(p: object): MenuItem;
-export function redoItem(p: object): MenuItem;
-export function wrapItem(nodeType: NodeType, options: object): MenuItem;
-export function blockTypeItem(nodeType: NodeType, options: object): MenuItem;
-export function menuBar(options: { content: MenuElement[][], floating?: boolean }): Plugin;
+/**
+ * Menu item for the `undo` command.
+ */
+export function undoItem(p: { [key: string]: any }): MenuItem;
+/**
+ * Menu item for the `redo` command.
+ */
+export function redoItem(p: { [key: string]: any }): MenuItem;
+/**
+ * Build a menu item for wrapping the selection in a given node type.
+ * Adds `run` and `select` properties to the ones present in
+ * `options`. `options.attrs` may be an object or a function, as in
+ * `toggleMarkItem`.
+ */
+export function wrapItem(nodeType: NodeType, options: { [key: string]: any }): MenuItem;
+/**
+ * Build a menu item for changing the type of the textblock around the
+ * selection to the given type. Provides `run`, `active`, and `select`
+ * properties. Others must be given in `options`. `options.attrs` may
+ * be an object to provide the attributes for the textblock node.
+ */
+export function blockTypeItem(nodeType: NodeType, options: { [key: string]: any }): MenuItem;
+/**
+ * A plugin that will place a menu bar above the editor. Note that
+ * this involves wrapping the editor in an additional `<div>`.
+ */
+export function menuBar(options: { content: MenuElement[][], floating?: boolean | null }): Plugin;
diff --git a/types/prosemirror-model/dom.d.ts b/types/prosemirror-model/dom.d.ts
deleted file mode 100644
index b4b02d1c24..0000000000
--- a/types/prosemirror-model/dom.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export type DOMDataTransfer = DataTransfer;
-export type DOMDocument = Document;
-export type DOMElement = HTMLElement;
-export type DOMEvent = Event;
-export type DOMFragment = DocumentFragment;
-export type DOMKeyboardEvent = KeyboardEvent;
-export type DOMMouseEvent = MouseEvent;
-export type DOMMutationRecord = MutationRecord;
-export type DOMNode = Node;
-
-export {
-  DOMDataTransfer as DataTransfer,
-  DOMDocument as Document,
-  DOMElement as Element,
-  DOMEvent as Event,
-  DOMFragment as DocumentFragment,
-  DOMKeyboardEvent as KeyboardEvent,
-  DOMMouseEvent as MouseEvent,
-  DOMMutationRecord as MutationRecord,
-  DOMNode as Node,
-};
diff --git a/types/prosemirror-model/index.d.ts b/types/prosemirror-model/index.d.ts
index 805e9fe46d..47741b200e 100644
--- a/types/prosemirror-model/index.d.ts
+++ b/types/prosemirror-model/index.d.ts
@@ -1,259 +1,1291 @@
-// Type definitions for prosemirror-model 0.24
+// Type definitions for prosemirror-model 1.1
 // Project: https://github.com/ProseMirror/prosemirror-model
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
+//                 Malte Blanken <https://github.com/neknalb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
 import OrderedMap = require('orderedmap');
-import * as dom from './dom';
-
-export interface AnyObject {
-  [key: string]: any;
-}
 
+/**
+ * Instances of this class represent a match state of a node
+ * type's [content expression](#model.NodeSpec.content), and can be
+ * used to find out whether further content matches here, and whether
+ * a given position is a valid end of the node.
+ */
 export class ContentMatch {
-  matchType(type: NodeType, attrs?: AnyObject, marks?: Mark[]): ContentMatch | null | undefined;
-  matchFragment(fragment: Fragment, from?: number, to?: number): ContentMatch | boolean | null | undefined;
+  /**
+   * True when this match state represents a valid end of the node.
+   */
   validEnd: boolean;
-  fillBefore(after: Fragment, toEnd: boolean, startIndex?: number): Fragment | null | undefined;
-  findWrapping(target: NodeType): NodeType[] | null;
+  /**
+   * Match a node type and marks, returning a match after that node
+   * if successful.
+   */
+  matchType(type: NodeType): ContentMatch | null | void;
+  /**
+   * Try to match a fragment. Returns the resulting match when
+   * successful.
+   */
+  matchFragment(frag: Fragment, start?: number, end?: number): ContentMatch | null | void;
+  /**
+   * Try to match the given fragment, and if that fails, see if it can
+   * be made to match by inserting nodes in front of it. When
+   * successful, return a fragment of inserted nodes (which may be
+   * empty if nothing had to be inserted). When `toEnd` is true, only
+   * return a fragment if the resulting match goes to the end of the
+   * content expression.
+   */
+  fillBefore(after: Fragment, toEnd?: boolean, startIndex?: number): Fragment | null | void;
+  /**
+   * Find a set of wrapping node types that would allow a node of the
+   * given type to appear at this position. The result may be empty
+   * (when it fits directly) and will be null when no such wrapping
+   * exists.
+   */
+  findWrapping(target: NodeType): NodeType[] | null | void;
 }
+/**
+ * A fragment represents a node's collection of child nodes.
+ *
+ * Like nodes, fragments are persistent data structures, and you
+ * should not mutate them or their content. Rather, you create new
+ * instances whenever needed. The API tries to make this easy.
+ */
 export class Fragment {
+  /**
+   * The size of the fragment, which is the total of the size of its
+   * content nodes.
+   */
   size: number;
-  nodesBetween(from: number, to: number, f: (node: Node, start: number, parent: Node, index: number) => boolean | null | void): void;
-  descendants(f: (node: Node, pos: number, parent: Node) => boolean | null | void): void;
+  /**
+   * Invoke a callback for all descendant nodes between the given two
+   * positions (relative to start of this fragment). Doesn't descend
+   * into a node when the callback returns `false`.
+   */
+  nodesBetween(from: number, to: number, f: (node: ProsemirrorNode, start: number, parent: ProsemirrorNode, index: number) => boolean | null | void): void;
+  /**
+   * Call the given callback for every descendant node. The callback
+   * may return `false` to prevent traversal of a given node's children.
+   */
+  descendants(f: (node: ProsemirrorNode, pos: number, parent: ProsemirrorNode) => boolean | null | void): void;
+  /**
+   * Create a new fragment containing the combined content of this
+   * fragment and the other.
+   */
   append(other: Fragment): Fragment;
+  /**
+   * Cut out the sub-fragment between the two given positions.
+   */
   cut(from: number, to?: number): Fragment;
-  replaceChild(index: number, node: Node): Fragment;
+  /**
+   * Create a new fragment in which the node at the given index is
+   * replaced by the given node.
+   */
+  replaceChild(index: number, node: ProsemirrorNode): Fragment;
+  /**
+   * Compare this fragment to another one.
+   */
   eq(other: Fragment): boolean;
-  firstChild?: Node | null;
-  lastChild?: Node | null;
+  /**
+   * The first child of the fragment, or `null` if it is empty.
+   */
+  firstChild?: ProsemirrorNode | null;
+  /**
+   * The last child of the fragment, or `null` if it is empty.
+   */
+  lastChild?: ProsemirrorNode | null;
+  /**
+   * The number of child nodes in this fragment.
+   */
   childCount: number;
-  child(index: number): Node;
-  maybeChild(index: number): Node | null | undefined;
-  forEach(f: (node: Node, offset: number, index: number) => void): void;
-  findDiffStart(other: Fragment): number | null | undefined;
-  findDiffEnd(other: Node): { a: number, b: number } | null | undefined;
+  /**
+   * Get the child node at the given index. Raise an error when the
+   * index is out of range.
+   */
+  child(index: number): ProsemirrorNode;
+  /**
+   * Get the child node at the given index, if it exists.
+   */
+  maybeChild(index: number): ProsemirrorNode | null | void;
+  /**
+   * Call `f` for every child node, passing the node, its offset
+   * into this parent node, and its index.
+   */
+  forEach(f: (node: ProsemirrorNode, offset: number, index: number) => void): void;
+  /**
+   * Find the first position at which this fragment and another
+   * fragment differ, or `null` if they are the same.
+   */
+  findDiffStart(other: Fragment): number | null | void;
+  /**
+   * Find the first position, searching from the end, at which this
+   * fragment and the given fragment differ, or `null` if they are the
+   * same. Since this position will not be the same in both nodes, an
+   * object with two separate positions is returned.
+   */
+  findDiffEnd(other: ProsemirrorNode): { a: number, b: number } | null | void;
+  /**
+   * Return a debugging string that describes this fragment.
+   */
   toString(): string;
-  toJSON(): AnyObject | null | undefined;
-  static fromJSON(schema: Schema, value?: AnyObject): Fragment;
-  static fromArray(array: Node[]): Fragment;
-  static from(nodes?: Fragment | Node | Node[]): Fragment;
+  /**
+   * Create a JSON-serializeable representation of this fragment.
+   */
+  toJSON(): { [key: string]: any } | null | void;
+  /**
+   * Deserialize a fragment from its JSON representation.
+   */
+  static fromJSON(schema: Schema, value?: { [key: string]: any }): Fragment;
+  /**
+   * Build a fragment from an array of nodes. Ensures that adjacent
+   * text nodes with the same marks are joined together.
+   */
+  static fromArray(array: ProsemirrorNode[]): Fragment;
+  /**
+   * Create a fragment from something that can be interpreted as a set
+   * of nodes. For `null`, it returns the empty fragment. For a
+   * fragment, the fragment itself. For a node or array of nodes, a
+   * fragment containing those nodes.
+   */
+  static from(nodes?: Fragment | ProsemirrorNode | ProsemirrorNode[]): Fragment;
+  /**
+   * An empty fragment. Intended to be reused whenever a node doesn't
+   * contain anything (rather than allocating a new empty fragment for
+   * each leaf node).
+   */
   static empty: Fragment;
 }
-export interface ParseRule {
-  tag?: string | null;
-  namespace?: string | null;
-  style?: string | null;
-  context?: string | null;
-  node?: string | null;
-  mark?: string | null;
-  priority?: number | null;
-  ignore?: boolean | null;
-  skip?: boolean | null;
-  attrs?: AnyObject | null;
-  getAttrs?: ((p: dom.Node | string) => boolean | AnyObject | null | void) | null;
-  contentElement?: string | ((p: dom.Node) => dom.Node) | null;
-  getContent?: ((p: dom.Node) => Fragment) | null;
-  preserveWhitespace?: boolean | 'full' | null;
+/**
+ * These are the options recognized by the
+ * [`parse`](#model.DOMParser.parse) and
+ * [`parseSlice`](#model.DOMParser.parseSlice) methods.
+ */
+export interface ParseOptions {
+  /**
+   * By default, whitespace is collapsed as per HTML's rules. Pass
+   * `true` to preserve whitespace, but normalize newlines to
+   * spaces, and `"full"` to preserve whitespace entirely.
+   */
+  preserveWhitespace?: boolean | "full" | null;
+  /**
+   * When given, the parser will, beside parsing the content,
+   * record the document positions of the given DOM positions. It
+   * will do so by writing to the objects, adding a `pos` property
+   * that holds the document position. DOM positions that are not
+   * in the parsed content will not be written to.
+   */
+  findPositions?: Array<{ node: Node, offset: number }> | null;
+  /**
+   * The child node index to start parsing from.
+   */
+  from?: number | null;
+  /**
+   * The child node index to stop parsing at.
+   */
+  to?: number | null;
+  /**
+   * By default, the content is parsed into the schema's default
+   * [top node type](#model.Schema.topNodeType). You can pass this
+   * option to use the type and attributes from a different node
+   * as the top container.
+   */
+  topNode?: ProsemirrorNode | null;
+  /**
+   * Provide the starting content match that content parsed into the
+   * top node is matched against.
+   */
+  topMatch?: ContentMatch | null;
+  /**
+   * A set of additional nodes to count as
+   * [context](#model.ParseRule.context) when parsing, above the
+   * given [top node](#model.ParseOptions.topNode).
+   */
+  context?: ResolvedPos | null;
 }
+/**
+ * A value that describes how to parse a given DOM node or inline
+ * style as a ProseMirror node or mark.
+ */
+export interface ParseRule {
+  /**
+   * A CSS selector describing the kind of DOM elements to match. A
+   * single rule should have _either_ a `tag` or a `style` property.
+   */
+  tag?: string | null;
+  /**
+   * The namespace to match. This should be used with `tag`.
+   * Nodes are only matched when the namespace matches or this property
+   * is null.
+   */
+  namespace?: string | null;
+  /**
+   * A CSS property name to match. When given, this rule matches
+   * inline styles that list that property. May also have the form
+   * `"property=value"`, in which case the rule only matches if the
+   * propery's value exactly matches the given value. (For more
+   * complicated filters, use [`getAttrs`](#model.ParseRule.getAttrs)
+   * and return undefined to indicate that the match failed.)
+   */
+  style?: string | null;
+  /**
+   * Can be used to change the order in which the parse rules in a
+   * schema are tried. Those with higher priority come first. Rules
+   * without a priority are counted as having priority 50. This
+   * property is only meaningful in a schema—when directly
+   * constructing a parser, the order of the rule array is used.
+   */
+  priority?: number | null;
+  /**
+   * When given, restricts this rule to only match when the current
+   * context—the parent nodes into which the content is being
+   * parsed—matches this expression. Should contain one or more node
+   * names or node group names followed by single or double slashes.
+   * For example `"paragraph/"` means the rule only matches when the
+   * parent node is a paragraph, `"blockquote/paragraph/"` restricts
+   * it to be in a paragraph that is inside a blockquote, and
+   * `"section//"` matches any position inside a section—a double
+   * slash matches any sequence of ancestor nodes. To allow multiple
+   * different contexts, they can be separated by a pipe (`|`)
+   * character, as in `"blockquote/|list_item/"`.
+   */
+  context?: string | null;
+  /**
+   * The name of the node type to create when this rule matches. Only
+   * valid for rules with a `tag` property, not for style rules. Each
+   * rule should have one of a `node`, `mark`, or `ignore` property
+   * (except when it appears in a [node](#model.NodeSpec.parseDOM) or
+   * [mark spec](#model.MarkSpec.parseDOM), in which case the `node`
+   * or `mark` property will be derived from its position).
+   */
+  node?: string | null;
+  /**
+   * The name of the mark type to wrap the matched content in.
+   */
+  mark?: string | null;
+  /**
+   * When true, ignore content that matches this rule.
+   */
+  ignore?: boolean | null;
+  /**
+   * When true, ignore the node that matches this rule, but do parse
+   * its content.
+   */
+  skip?: boolean | null;
+  /**
+   * Attributes for the node or mark created by this rule. When
+   * `getAttrs` is provided, it takes precedence.
+   */
+  attrs?: { [key: string]: any } | null;
+  /**
+   * A function used to compute the attributes for the node or mark
+   * created by this rule. Can also be used to describe further
+   * conditions the DOM element or style must match. When it returns
+   * `false`, the rule won't match. When it returns null or undefined,
+   * that is interpreted as an empty/default set of attributes.
+   *
+   * Called with a DOM Element for `tag` rules, and with a string (the
+   * style's value) for `style` rules.
+   */
+  getAttrs?: ((p: Node | string) => { [key: string]: any } | false | null | void) | null;
+  /**
+   * For `tag` rules that produce non-leaf nodes or marks, by default
+   * the content of the DOM element is parsed as content of the mark
+   * or node. If the child nodes are in a descendent node, this may be
+   * a CSS selector string that the parser must use to find the actual
+   * content element, or a function that returns the actual content
+   * element to the parser.
+   */
+  contentElement?: string | ((p: Node) => Node) | null;
+  /**
+   * Can be used to override the content of a matched node. When
+   * present, instead of parsing the node's child nodes, the result of
+   * this function is used.
+   */
+  getContent?: ((p: Node) => Fragment) | null;
+  /**
+   * Controls whether whitespace should be preserved when parsing the
+   * content inside the matched element. `false` means whitespace may
+   * be collapsed, `true` means that whitespace should be preserved
+   * but newlines normalized to spaces, and `"full"` means that
+   * newlines should also be preserved.
+   */
+  preserveWhitespace?: boolean | "full" | null;
+}
+/**
+ * A DOM parser represents a strategy for parsing DOM content into
+ * a ProseMirror document conforming to a given schema. Its behavior
+ * is defined by an array of [rules](#model.ParseRule).
+ */
 export class DOMParser {
-  constructor(schema: Schema, rules: ParseRule[])
+  /**
+   * Create a parser that targets the given schema, using the given
+   * parsing rules.
+   */
+  constructor(schema: Schema, rules: ParseRule[]);
+  /**
+   * The schema into which the parser parses.
+   */
   schema: Schema;
+  /**
+   * The set of [parse rules](#model.ParseRule) that the parser
+   * uses, in order of precedence.
+   */
   rules: ParseRule[];
-  parse(dom: dom.Node, options?: {
-    preserveWhitespace?: boolean | 'full' | null,
-    findPositions?: Array<{ node: Node, offset: number }> | null,
-    from?: number | null,
-    to?: number | null,
-    topNode?: Node | null,
-    topMatch?: ContentMatch | null,
-    context?: ResolvedPos | null
-  }): Node;
-  parseSlice(dom: dom.Node, options?: AnyObject): Slice;
+  /**
+   * Parse a document from the content of a DOM node.
+   */
+  parse(dom: Node, options?: ParseOptions): ProsemirrorNode;
+  /**
+   * Parses the content of the given DOM node, like
+   * [`parse`](#model.DOMParser.parse), and takes the same set of
+   * options. But unlike that method, which produces a whole node,
+   * this one returns a slice that is open at the sides, meaning that
+   * the schema constraints aren't applied to the start of nodes to
+   * the left of the input and the end of nodes at the end.
+   */
+  parseSlice(dom: Node, options?: ParseOptions): Slice;
+  /**
+   * Construct a DOM parser using the parsing rules listed in a
+   * schema's [node specs](#model.NodeSpec.parseDOM), reordered by
+   * [priority](#model.ParseRule.priority).
+   */
   static fromSchema(schema: Schema): DOMParser;
 }
+/**
+ * A mark is a piece of information that can be attached to a node,
+ * such as it being emphasized, in code font, or a link. It has a type
+ * and optionally a set of attributes that provide further information
+ * (such as the target of the link). Marks are created through a
+ * `Schema`, which controls which types exist and which
+ * attributes they have.
+ */
 export class Mark {
+  /**
+   * The type of this mark.
+   */
   type: MarkType;
-  attrs: AnyObject;
+  /**
+   * The attributes associated with this mark.
+   */
+  attrs: { [key: string]: any };
+  /**
+   * Given a set of marks, create a new set which contains this one as
+   * well, in the right position. If this mark is already in the set,
+   * the set itself is returned. If any marks that are set to be
+   * [exclusive](#model.MarkSpec.excludes) with this mark are present,
+   * those are replaced by this one.
+   */
   addToSet(set: Mark[]): Mark[];
+  /**
+   * Remove this mark from the given set, returning a new set. If this
+   * mark is not in the set, the set itself is returned.
+   */
   removeFromSet(set: Mark[]): Mark[];
+  /**
+   * Test whether this mark is in the given set of marks.
+   */
   isInSet(set: Mark[]): boolean;
+  /**
+   * Test whether this mark has the same type and attributes as
+   * another mark.
+   */
   eq(other: Mark): boolean;
-  toJSON(): AnyObject;
-  static fromJSON(schema: Schema, json: AnyObject): Mark;
+  /**
+   * Convert this mark to a JSON-serializeable representation.
+   */
+  toJSON(): { [key: string]: any };
+  static fromJSON(schema: Schema, json: { [key: string]: any }): Mark;
+  /**
+   * Test whether two sets of marks are identical.
+   */
   static sameSet(a: Mark[], b: Mark[]): boolean;
+  /**
+   * Create a properly sorted mark set from null, a single mark, or an
+   * unsorted array of marks.
+   */
   static setFrom(marks?: Mark | Mark[]): Mark[];
+  /**
+   * The empty set of marks.
+   */
   static none: Mark[];
 }
-export class Node {
+/**
+ * This class represents a node in the tree that makes up a
+ * ProseMirror document. So a document is an instance of `Node`, with
+ * children that are also instances of `Node`.
+ *
+ * Nodes are persistent data structures. Instead of changing them, you
+ * create new ones with the content you want. Old ones keep pointing
+ * at the old document shape. This is made cheaper by sharing
+ * structure between the old and new data as much as possible, which a
+ * tree shape like this (without back pointers) makes easy.
+ *
+ * **Do not** directly mutate the properties of a `Node` object. See
+ * [the guide](/docs/guide/#doc) for more information.
+ */
+declare class ProsemirrorNode {
+  /**
+   * The type of node that this is.
+   */
   type: NodeType;
+  /**
+   * An object mapping attribute names to values. The kind of
+   * attributes allowed and required are
+   * [determined](#model.NodeSpec.attrs) by the node type.
+   */
   attrs: { [key: string]: any };
+  /**
+   * A container holding the node's children.
+   */
   content: Fragment;
+  /**
+   * The marks (things like whether it is emphasized or part of a
+   * link) applied to this node.
+   */
   marks: Mark[];
+  /**
+   * For text nodes, this contains the node's text content.
+   */
   text?: string | null;
+  /**
+   * The size of this node, as defined by the integer-based [indexing
+   * scheme](/docs/guide/#doc.indexing). For text nodes, this is the
+   * amount of characters. For other leaf nodes, it is one. For
+   * non-leaf nodes, it is the size of the content plus two (the start
+   * and end token).
+   */
   nodeSize: number;
+  /**
+   * The number of children that the node has.
+   */
   childCount: number;
-  child(index: number): Node;
-  maybeChild(index: number): Node | null | undefined;
-  forEach(f: (node: Node, offset: number, index: number) => void): void;
-  nodesBetween(from: number | undefined, to: number | undefined, f: (node: Node, pos: number, parent: Node, index: number) => boolean | null | void): void;
-  descendants(f: (node: Node, pos: number, parent: Node) => boolean | null | void): void;
+  /**
+   * Get the child node at the given index. Raises an error when the
+   * index is out of range.
+   */
+  child(index: number): ProsemirrorNode;
+  /**
+   * Get the child node at the given index, if it exists.
+   */
+  maybeChild(index: number): ProsemirrorNode | null | void;
+  /**
+   * Call `f` for every child node, passing the node, its offset
+   * into this parent node, and its index.
+   */
+  forEach(f: (node: ProsemirrorNode, offset: number, index: number) => void): void;
+  /**
+   * Invoke a callback for all descendant nodes recursively between
+   * the given two positions that are relative to start of this node's
+   * content. The callback is invoked with the node, its
+   * parent-relative position, its parent node, and its child index.
+   * When the callback returns false for a given node, that node's
+   * children will not be recursed over.
+   */
+  nodesBetween(from: number, to: number, f: (node: ProsemirrorNode, pos: number, parent: ProsemirrorNode, index: number) => boolean | null | void): void;
+  /**
+   * Call the given callback for every descendant node. Doesn't
+   * descend into a node when the callback returns `false`.
+   */
+  descendants(f: (node: ProsemirrorNode, pos: number, parent: ProsemirrorNode) => boolean | null | void): void;
+  /**
+   * Concatenates all the text nodes found in this fragment and its
+   * children.
+   */
   textContent: string;
+  /**
+   * Get all text between positions `from` and `to`. When
+   * `blockSeparator` is given, it will be inserted whenever a new
+   * block node is started. When `leafText` is given, it'll be
+   * inserted for every non-text leaf node encountered.
+   */
   textBetween(from: number, to: number, blockSeparator?: string, leafText?: string): string;
-  firstChild?: Node | null;
-  lastChild?: Node | null;
-  eq(other: Node): boolean;
-  sameMarkup(other: Node): boolean;
-  hasMarkup(type: NodeType, attrs?: AnyObject, marks?: Mark[]): boolean;
-  copy(content?: Fragment): Node;
-  mark(marks: Mark[]): Node;
-  cut(from: number, to?: number): Node;
+  /**
+   * Returns this node's first child, or `null` if there are no
+   * children.
+   */
+  firstChild?: ProsemirrorNode | null;
+  /**
+   * Returns this node's last child, or `null` if there are no
+   * children.
+   */
+  lastChild?: ProsemirrorNode | null;
+  /**
+   * Test whether two nodes represent the same piece of document.
+   */
+  eq(other: ProsemirrorNode): boolean;
+  /**
+   * Compare the markup (type, attributes, and marks) of this node to
+   * those of another. Returns `true` if both have the same markup.
+   */
+  sameMarkup(other: ProsemirrorNode): boolean;
+  /**
+   * Check whether this node's markup correspond to the given type,
+   * attributes, and marks.
+   */
+  hasMarkup(type: NodeType, attrs?: { [key: string]: any }, marks?: Mark[]): boolean;
+  /**
+   * Create a new node with the same markup as this node, containing
+   * the given content (or empty, if no content is given).
+   */
+  copy(content?: Fragment): ProsemirrorNode;
+  /**
+   * Create a copy of this node, with the given set of marks instead
+   * of the node's own marks.
+   */
+  mark(marks: Mark[]): ProsemirrorNode;
+  /**
+   * Create a copy of this node with only the content between the
+   * given positions. If `to` is not given, it defaults to the end of
+   * the node.
+   */
+  cut(from: number, to?: number): ProsemirrorNode;
+  /**
+   * Cut out the part of the document between the given positions, and
+   * return it as a `Slice` object.
+   */
   slice(from: number, to?: number): Slice;
-  replace(from: number, to: number, slice: Slice): Node;
-  nodeAt(pos: number): Node | null | undefined;
-  childAfter(pos: number): { node?: Node | null, index: number, offset: number };
-  childBefore(pos: number): { node?: Node | null, index: number, offset: number };
+  /**
+   * Replace the part of the document between the given positions with
+   * the given slice. The slice must 'fit', meaning its open sides
+   * must be able to connect to the surrounding content, and its
+   * content nodes must be valid children for the node they are placed
+   * into. If any of this is violated, an error of type
+   * [`ReplaceError`](#model.ReplaceError) is thrown.
+   */
+  replace(from: number, to: number, slice: Slice): ProsemirrorNode;
+  /**
+   * Find the node starting at the given position.
+   */
+  nodeAt(pos: number): ProsemirrorNode | null | void;
+  /**
+   * Find the (direct) child node after the given offset, if any,
+   * and return it along with its index and offset relative to this
+   * node.
+   */
+  childAfter(pos: number): { node?: ProsemirrorNode | null, index: number, offset: number };
+  /**
+   * Find the (direct) child node before the given offset, if any,
+   * and return it along with its index and offset relative to this
+   * node.
+   */
+  childBefore(pos: number): { node?: ProsemirrorNode | null, index: number, offset: number };
+  /**
+   * Resolve the given position in the document, returning an
+   * [object](#model.ResolvedPos) with information about its context.
+   */
   resolve(pos: number): ResolvedPos;
-  rangeHasMark(from: number | undefined, to: number | undefined, type: MarkType): boolean;
+  /**
+   * Test whether a mark of the given type occurs in this document
+   * between the two given positions.
+   */
+  rangeHasMark(from: number, to: number, type: MarkType): boolean;
+  /**
+   * True when this is a block (non-inline node)
+   */
   isBlock: boolean;
+  /**
+   * True when this is a textblock node, a block node with inline
+   * content.
+   */
   isTextblock: boolean;
+  /**
+   * True when this node has inline content.
+   */
   inlineContent: boolean;
+  /**
+   * True when this is an inline node (a text node or a node that can
+   * appear among text).
+   */
   isInline: boolean;
+  /**
+   * True when this is a text node.
+   */
   isText: boolean;
+  /**
+   * True when this is a leaf node.
+   */
   isLeaf: boolean;
+  /**
+   * True when this is an atom, i.e. when it does not have directly
+   * editable content. This is usually the same as `isLeaf`, but can
+   * be configured with the [`atom` property](#model.NodeSpec.atom) on
+   * a node's spec (typically used when the node is displayed as an
+   * uneditable [node view](#view.NodeView)).
+   */
   isAtom: boolean;
+  /**
+   * Return a string representation of this node for debugging
+   * purposes.
+   */
   toString(): string;
+  /**
+   * Get the content match in this node at the given index.
+   */
   contentMatchAt(index: number): ContentMatch;
+  /**
+   * Test whether replacing the range between `from` and `to` (by
+   * child index) with the given replacement fragment (which defaults
+   * to the empty fragment) would leave the node's content valid. You
+   * can optionally pass `start` and `end` indices into the
+   * replacement fragment.
+   */
   canReplace(from: number, to: number, replacement?: Fragment, start?: number, end?: number): boolean;
-  canReplaceWith(from: number, to: number, type: NodeType, attrs?: Mark[]): boolean;
-  canAppend(other: Node): boolean;
+  /**
+   * Test whether replacing the range `from` to `to` (by index) with a
+   * node of the given type.
+   */
+  canReplaceWith(from: number, to: number, type: NodeType, marks?: Mark[]): boolean;
+  /**
+   * Test whether the given node's content could be appended to this
+   * node. If that node is empty, this will only return true if there
+   * is at least one node type that can appear in both nodes (to avoid
+   * merging completely incompatible nodes).
+   */
+  canAppend(other: ProsemirrorNode): boolean;
+  /**
+   * Check whether this node and its descendants conform to the
+   * schema, and raise error when they do not.
+   */
   check(): void;
-  toJSON(): AnyObject;
-  static fromJSON(schema: Schema, json: AnyObject): Node;
+  /**
+   * Return a JSON-serializeable representation of this node.
+   */
+  toJSON(): { [key: string]: any };
+  /**
+   * Deserialize a node from its JSON representation.
+   */
+  static fromJSON(schema: Schema, json: { [key: string]: any }): ProsemirrorNode;
 }
+export { ProsemirrorNode as Node };
+/**
+ * Error type raised by [`Node.replace`](#model.Node.replace) when
+ * given an invalid replacement.
+ */
 export class ReplaceError extends Error {
 }
+/**
+ * A slice represents a piece cut out of a larger document. It
+ * stores not only a fragment, but also the depth up to which nodes on
+ * both side are ‘open’ (cut through).
+ */
 export class Slice {
-  constructor(content: Fragment, openStart: number, openEnd: number)
+  /**
+   * Create a slice. When specifying a non-zero open depth, you must
+   * make sure that there are nodes of at least that depth at the
+   * appropriate side of the fragment—i.e. if the fragment is an empty
+   * paragraph node, `openStart` and `openEnd` can't be greater than
+   * 1.
+   *
+   * It is not necessary for the content of open nodes to conform to
+   * the schema's content constraints, though it should be a valid
+   * start/end/middle for such a node, depending on which sides are
+   * open.
+   */
+  constructor(content: Fragment, openStart: number, openEnd: number);
+  /**
+   * The slice's content.
+   */
   content: Fragment;
+  /**
+   * The open depth at the start.
+   */
   openStart: number;
+  /**
+   * The open depth at the end.
+   */
   openEnd: number;
+  /**
+   * The size this slice would add when inserted into a document.
+   */
   size: number;
+  /**
+   * Tests whether this slice is equal to another slice.
+   */
   eq(other: Slice): boolean;
-  toJSON(): AnyObject | null | undefined;
-  static fromJSON(schema: Schema, json?: AnyObject): Slice;
-  static maxOpen(fragment: Fragment): Slice;
+  /**
+   * Convert a slice to a JSON-serializable representation.
+   */
+  toJSON(): { [key: string]: any } | null | void;
+  /**
+   * Deserialize a slice from its JSON representation.
+   */
+  static fromJSON(schema: Schema, json?: { [key: string]: any }): Slice;
+  /**
+   * Create a slice from a fragment by taking the maximum possible
+   * open value on both side of the fragment.
+   */
+  static maxOpen(fragment: Fragment, openIsolating?: boolean): Slice;
+  /**
+   * The empty slice.
+   */
   static empty: Slice;
 }
+/**
+ * You can [_resolve_](#model.Node.resolve) a position to get more
+ * information about it. Objects of this class represent such a
+ * resolved position, providing various pieces of context information,
+ * and some helper methods.
+ *
+ * Throughout this interface, methods that take an optional `depth`
+ * parameter will interpret undefined as `this.depth` and negative
+ * numbers as `this.depth + value`.
+ */
 export class ResolvedPos {
+  /**
+   * The position that was resolved.
+   */
   pos: number;
+  /**
+   * The number of levels the parent node is from the root. If this
+   * position points directly into the root node, it is 0. If it
+   * points into a top-level paragraph, 1, and so on.
+   */
   depth: number;
+  /**
+   * The offset this position has into its parent node.
+   */
   parentOffset: number;
-  parent: Node;
-  doc: Node;
-  node(depth?: number): Node;
+  /**
+   * The parent node that the position points into. Note that even if
+   * a position points into a text node, that node is not considered
+   * the parent—text nodes are ‘flat’ in this model, and have no content.
+   */
+  parent: ProsemirrorNode;
+  /**
+   * The root node in which the position was resolved.
+   */
+  doc: ProsemirrorNode;
+  /**
+   * The ancestor node at the given level. `p.node(p.depth)` is the
+   * same as `p.parent`.
+   */
+  node(depth?: number): ProsemirrorNode;
+  /**
+   * The index into the ancestor at the given level. If this points at
+   * the 3rd node in the 2nd paragraph on the top level, for example,
+   * `p.index(0)` is 2 and `p.index(1)` is 3.
+   */
   index(depth?: number): number;
+  /**
+   * The index pointing after this position into the ancestor at the
+   * given level.
+   */
   indexAfter(depth?: number): number;
+  /**
+   * The (absolute) position at the start of the node at the given
+   * level.
+   */
   start(depth?: number): number;
+  /**
+   * The (absolute) position at the end of the node at the given
+   * level.
+   */
   end(depth?: number): number;
+  /**
+   * The (absolute) position directly before the wrapping node at the
+   * given level, or, when `level` is `this.depth + 1`, the original
+   * position.
+   */
   before(depth?: number): number;
+  /**
+   * The (absolute) position directly after the wrapping node at the
+   * given level, or the original position when `level` is `this.depth + 1`.
+   */
   after(depth?: number): number;
+  /**
+   * When this position points into a text node, this returns the
+   * distance between the position and the start of the text node.
+   * Will be zero for positions that point between nodes.
+   */
   textOffset: number;
-  nodeAfter?: Node | null;
-  nodeBefore?: Node | null;
+  /**
+   * Get the node directly after the position, if any. If the position
+   * points into a text node, only the part of that node after the
+   * position is returned.
+   */
+  nodeAfter?: ProsemirrorNode | null;
+  /**
+   * Get the node directly before the position, if any. If the
+   * position points into a text node, only the part of that node
+   * before the position is returned.
+   */
+  nodeBefore?: ProsemirrorNode | null;
+  /**
+   * Get the marks at this position, factoring in the surrounding
+   * marks' [`inclusive`](#model.MarkSpec.inclusive) property. If the
+   * position is at the start of a non-empty node, the marks of the
+   * node after it (if any) are returned.
+   */
   marks(): Mark[];
-  marksAcross(): Mark[] | null;
+  /**
+   * Get the marks after the current position, if any, except those
+   * that are non-inclusive and not present at position `$end`. This
+   * is mostly useful for getting the set of marks to preserve after a
+   * deletion. Will return `null` if this position is at the end of
+   * its parent node or its parent node isn't a textblock (in which
+   * case no marks should be preserved).
+   */
+  marksAcross(): Mark[] | null | void;
+  /**
+   * The depth up to which this position and the given (non-resolved)
+   * position share the same parent nodes.
+   */
   sharedDepth(pos: number): number;
-  blockRange(other?: ResolvedPos, pred?: (p: Node) => boolean): NodeRange | null | undefined;
+  /**
+   * Returns a range based on the place where this position and the
+   * given position diverge around block content. If both point into
+   * the same textblock, for example, a range around that textblock
+   * will be returned. If they point into different blocks, the range
+   * around those blocks in their shared ancestor is returned. You can
+   * pass in an optional predicate that will be called with a parent
+   * node to see if a range into that parent is acceptable.
+   */
+  blockRange(other?: ResolvedPos, pred?: (p: ProsemirrorNode) => boolean): NodeRange | null | void;
+  /**
+   * Query whether the given position shares the same parent node.
+   */
   sameParent(other: ResolvedPos): boolean;
+  /**
+   * Return the greater of this and the given position.
+   */
   max(other: ResolvedPos): ResolvedPos;
+  /**
+   * Return the smaller of this and the given position.
+   */
   min(other: ResolvedPos): ResolvedPos;
 }
+/**
+ * Represents a flat range of content, i.e. one that starts and
+ * ends in the same node.
+ */
 export class NodeRange {
+  /**
+   * Construct a node range. `$from` and `$to` should point into the
+   * same node until at least the given `depth`, since a node range
+   * denotes an adjacent set of nodes in a single parent node.
+   */
   constructor($from: ResolvedPos, $to: ResolvedPos, depth: number);
+  /**
+   * A resolved position along the start of the
+   * content. May have a `depth` greater than this object's `depth`
+   * property, since these are the positions that were used to
+   * compute the range, not re-resolved positions directly at its
+   * boundaries.
+   */
   $from: ResolvedPos;
+  /**
+   * A position along the end of the content. See
+   * caveat for [`$from`](#model.NodeRange.$from).
+   */
   $to: ResolvedPos;
+  /**
+   * The depth of the node that this range points into.
+   */
   depth: number;
+  /**
+   * The position at the start of the range.
+   */
   start: number;
+  /**
+   * The position at the end of the range.
+   */
   end: number;
-  parent: Node;
+  /**
+   * The parent node that the range points into.
+   */
+  parent: ProsemirrorNode;
+  /**
+   * The start index of the range in the parent node.
+   */
   startIndex: number;
+  /**
+   * The end index of the range in the parent node.
+   */
   endIndex: number;
 }
+/**
+ * Node types are objects allocated once per `Schema` and used to
+ * [tag](#model.Node.type) `Node` instances. They contain information
+ * about the node type, such as its name and what kind of node it
+ * represents.
+ */
 export class NodeType {
+  /**
+   * The name the node type has in this schema.
+   */
   name: string;
+  /**
+   * A link back to the `Schema` the node type belongs to.
+   */
   schema: Schema;
+  /**
+   * The spec that this type is based on
+   */
   spec: NodeSpec;
+  /**
+   * The starting match of the node type's content expression.
+   */
   contentMatch: ContentMatch;
-  isBlock: boolean;
-  isText: boolean;
-  isInline: boolean;
-  isTextblock: boolean;
+  /**
+   * True if this node type has inline content.
+   */
   inlineContent: boolean;
+  /**
+   * True if this is a block type
+   */
+  isBlock: boolean;
+  /**
+   * True if this is the text node type.
+   */
+  isText: boolean;
+  /**
+   * True if this is an inline type.
+   */
+  isInline: boolean;
+  /**
+   * True if this is a textblock type, a block that contains inline
+   * content.
+   */
+  isTextblock: boolean;
+  /**
+   * True for node types that allow no content.
+   */
   isLeaf: boolean;
+  /**
+   * True when this node is an atom, i.e. when it does not have
+   * directly editable content.
+   */
   isAtom: boolean;
-  create(attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node;
-  createChecked(attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node;
-  createAndFill(attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node | null | undefined;
-  validContent(content: Fragment, attrs?: AnyObject): boolean;
+  /**
+   * Create a `Node` of this type. The given attributes are
+   * checked and defaulted (you can pass `null` to use the type's
+   * defaults entirely, if no required attributes exist). `content`
+   * may be a `Fragment`, a node, an array of nodes, or
+   * `null`. Similarly `marks` may be `null` to default to the empty
+   * set of marks.
+   */
+  create(attrs?: { [key: string]: any }, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode;
+  /**
+   * Like [`create`](#model.NodeType.create), but check the given content
+   * against the node type's content restrictions, and throw an error
+   * if it doesn't match.
+   */
+  createChecked(attrs?: { [key: string]: any }, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode;
+  /**
+   * Like [`create`](#model.NodeType.create), but see if it is necessary to
+   * add nodes to the start or end of the given fragment to make it
+   * fit the node. If no fitting wrapping can be found, return null.
+   * Note that, due to the fact that required nodes can always be
+   * created, this will always succeed if you pass null or
+   * `Fragment.empty` as content.
+   */
+  createAndFill(attrs?: { [key: string]: any }, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode | null | void;
+  /**
+   * Returns true if the given fragment is valid content for this node
+   * type with the given attributes.
+   */
+  validContent(content: Fragment): boolean;
+  /**
+   * Check whether the given mark type is allowed in this node.
+   */
   allowsMarkType(markType: MarkType): boolean;
+  /**
+   * Test whether the given set of marks are allowed in this node.
+   */
   allowsMarks(marks: Mark[]): boolean;
+  /**
+   * Removes the marks that are not allowed in this node from the given set.
+   */
   allowedMarks(marks: Mark[]): Mark[];
 }
+/**
+ * Like nodes, marks (which are associated with nodes to signify
+ * things like emphasis or being part of a link) are
+ * [tagged](#model.Mark.type) with type objects, which are
+ * instantiated once per `Schema`.
+ */
 export class MarkType {
+  /**
+   * The name of the mark type.
+   */
   name: string;
+  /**
+   * The schema that this mark type instance is part of.
+   */
   schema: Schema;
+  /**
+   * The spec on which the type is based.
+   */
   spec: MarkSpec;
-  create(attrs?: AnyObject): Mark;
+  /**
+   * Create a mark of this type. `attrs` may be `null` or an object
+   * containing only some of the mark's attributes. The others, if
+   * they have defaults, will be added.
+   */
+  create(attrs?: { [key: string]: any }): Mark;
+  /**
+   * When there is a mark of this type in the given set, a new set
+   * without it is returned. Otherwise, the input set is returned.
+   */
   removeFromSet(set: Mark[]): Mark[];
-  isInSet(set: Mark[]): Mark | null | undefined;
+  /**
+   * Tests whether there is a mark of this type in the given set.
+   */
+  isInSet(set: Mark[]): Mark | null | void;
+  /**
+   * Queries whether a given mark type is
+   * [excluded](#model.MarkSpec.excludes) by this one.
+   */
   excludes(other: MarkType): boolean;
 }
+/**
+ * An object describing a schema, as passed to the [`Schema`](#model.Schema)
+ * constructor.
+ */
 export interface SchemaSpec {
+  /**
+   * The node types in this schema. Maps names to
+   * [`NodeSpec`](#model.NodeSpec) objects that describe the node type
+   * associated with that name. Their order is significant—it
+   * determines which [parse rules](#model.NodeSpec.parseDOM) take
+   * precedence by default, and which nodes come first in a given
+   * [group](#model.NodeSpec.group).
+   */
   nodes: { [name: string]: NodeSpec } | OrderedMap<NodeSpec>;
+  /**
+   * The mark types that exist in this schema. The order in which they
+   * are provided determines the order in which [mark
+   * sets](#model.Mark.addToSet) are sorted and in which [parse
+   * rules](#model.MarkSpec.parseDOM) are tried.
+   */
   marks?: { [name: string]: MarkSpec } | OrderedMap<MarkSpec> | null;
+  /**
+   * The name of the default top-level node for the schema. Defaults
+   * to `"doc"`.
+   */
   topNode?: string | null;
 }
 export interface NodeSpec {
+  /**
+   * The content expression for this node, as described in the [schema
+   * guide](/docs/guide/#schema.content_expressions). When not given,
+   * the node does not allow any content.
+   */
   content?: string | null;
+  /**
+   * The marks that are allowed inside of this node. May be a
+   * space-separated string referring to mark names or groups, `"_"`
+   * to explicitly allow all marks, or `""` to disallow marks. When
+   * not given, nodes with inline content default to allowing all
+   * marks, other nodes default to not allowing marks.
+   */
   marks?: string | null;
+  /**
+   * The group or space-separated groups to which this node belongs,
+   * which can be referred to in the content expressions for the
+   * schema.
+   */
   group?: string | null;
+  /**
+   * Should be set to true for inline nodes. (Implied for text nodes.)
+   */
   inline?: boolean | null;
+  /**
+   * Can be set to true to indicate that, though this isn't a [leaf
+   * node](#model.NodeType.isLeaf), it doesn't have directly editable
+   * content and should be treated as a single unit in the view.
+   */
   atom?: boolean | null;
+  /**
+   * The attributes that nodes of this type get.
+   */
   attrs?: { [name: string]: AttributeSpec } | null;
+  /**
+   * Controls whether nodes of this type can be selected as a [node
+   * selection](#state.NodeSelection). Defaults to true for non-text
+   * nodes.
+   */
   selectable?: boolean | null;
+  /**
+   * Determines whether nodes of this type can be dragged without
+   * being selected. Defaults to false.
+   */
   draggable?: boolean | null;
+  /**
+   * Can be used to indicate that this node contains code, which
+   * causes some commands to behave differently.
+   */
   code?: boolean | null;
+  /**
+   * Determines whether this node is considered an important parent
+   * node during replace operations (such as paste). Non-defining (the
+   * default) nodes get dropped when their entire content is replaced,
+   * whereas defining nodes persist and wrap the inserted content.
+   * Likewise, in _inserted_ content the defining parents of the
+   * content are preserved when possible. Typically,
+   * non-default-paragraph textblock types, and possibly list items,
+   * are marked as defining.
+   */
   defining?: boolean | null;
+  /**
+   * When enabled (default is false), the sides of nodes of this type
+   * count as boundaries that regular editing operations, like
+   * backspacing or lifting, won't cross. An example of a node that
+   * should probably have this enabled is a table cell.
+   */
   isolating?: boolean | null;
-  toDOM?: ((node: Node) => DOMOutputSpec) | null;
+  /**
+   * Defines the default way a node of this type should be serialized
+   * to DOM/HTML (as used by
+   * [`DOMSerializer.fromSchema`](#model.DOMSerializer^fromSchema)).
+   * Should return a DOM node or an [array
+   * structure](#model.DOMOutputSpec) that describes one, with an
+   * optional number zero (“hole�) in it to indicate where the node's
+   * content should be inserted.
+   *
+   * For text nodes, the default is to create a text DOM node. Though
+   * it is possible to create a serializer where text is rendered
+   * differently, this is not supported inside the editor, so you
+   * shouldn't override that in your text node spec.
+   */
+  toDOM?: ((node: ProsemirrorNode) => DOMOutputSpec) | null;
+  /**
+   * Associates DOM parser information with this node, which can be
+   * used by [`DOMParser.fromSchema`](#model.DOMParser^fromSchema) to
+   * automatically derive a parser. The `node` field in the rules is
+   * implied (the name of this node will be filled in automatically).
+   * If you supply your own parser, you do not need to also specify
+   * parsing rules in your schema.
+   */
   parseDOM?: ParseRule[] | null;
 }
 export interface MarkSpec {
+  /**
+   * The attributes that marks of this type get.
+   */
   attrs?: { [name: string]: AttributeSpec } | null;
+  /**
+   * Whether this mark should be active when the cursor is positioned
+   * at its end (or at its start when that is also the start of the
+   * parent node). Defaults to true.
+   */
   inclusive?: boolean | null;
+  /**
+   * Determines which other marks this mark can coexist with. Should
+   * be a space-separated strings naming other marks or groups of marks.
+   * When a mark is [added](#model.Mark.addToSet) to a set, all marks
+   * that it excludes are removed in the process. If the set contains
+   * any mark that excludes the new mark but is not, itself, excluded
+   * by the new mark, the mark can not be added an the set. You can
+   * use the value `"_"` to indicate that the mark excludes all
+   * marks in the schema.
+   *
+   * Defaults to only being exclusive with marks of the same type. You
+   * can set it to an empty string (or any string not containing the
+   * mark's own name) to allow multiple marks of a given type to
+   * coexist (as long as they have different attributes).
+   */
   excludes?: string | null;
+  /**
+   * The group or space-separated groups to which this mark belongs.
+   */
   group?: string | null;
+  /**
+   * Defines the default way marks of this type should be serialized
+   * to DOM/HTML.
+   */
   toDOM?: ((mark: Mark, inline: boolean) => DOMOutputSpec) | null;
+  /**
+   * Associates DOM parser information with this mark (see the
+   * corresponding [node spec field](#model.NodeSpec.parseDOM)). The
+   * `mark` field in the rules is implied.
+   */
   parseDOM?: ParseRule[] | null;
 }
+/**
+ * Used to [define](#model.NodeSpec.attrs) attributes on nodes or
+ * marks.
+ */
 export interface AttributeSpec {
-  default?: any | null;
+  /**
+   * The default value for this attribute, to use when no explicit
+   * value is provided. Attributes that have no default must be
+   * provided whenever a node or mark of a type that has them is
+   * created.
+   */
+  default?: any;
 }
+/**
+ * A document schema. Holds [node](#model.NodeType) and [mark
+ * type](#model.MarkType) objects for the nodes and marks that may
+ * occur in conforming documents, and provides functionality for
+ * creating and deserializing such documents.
+ */
 export class Schema {
-  constructor(spec: SchemaSpec)
+  /**
+   * Construct a schema from a schema [specification](#model.SchemaSpec).
+   */
+  constructor(spec: SchemaSpec);
+  /**
+   * The [spec](#model.SchemaSpec) on which the schema is based,
+   * with the added guarantee that its `nodes` and `marks`
+   * properties are
+   * [`OrderedMap`](https://github.com/marijnh/orderedmap) instances
+   * (not raw objects).
+   */
   spec: SchemaSpec;
+  /**
+   * An object mapping the schema's node names to node type objects.
+   */
   nodes: { [name: string]: NodeType };
+  /**
+   * A map from mark names to mark type objects.
+   */
   marks: { [name: string]: MarkType };
-  cached: AnyObject;
+  /**
+   * The type of the [default top node](#model.SchemaSpec.topNode)
+   * for this schema.
+   */
   topNodeType: NodeType;
-  node(type: string | NodeType, attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node;
-  text(text: string, marks?: Mark[]): Node;
-  mark(type: string | MarkType, attrs?: AnyObject): Mark;
-  nodeFromJSON(json: AnyObject): Node;
-  markFromJSON(json: AnyObject): Mark;
+  /**
+   * An object for storing whatever values modules may want to
+   * compute and cache per schema. (If you want to store something
+   * in it, try to use property names unlikely to clash.)
+   */
+  cached: { [key: string]: any };
+  /**
+   * Create a node in this schema. The `type` may be a string or a
+   * `NodeType` instance. Attributes will be extended
+   * with defaults, `content` may be a `Fragment`,
+   * `null`, a `Node`, or an array of nodes.
+   */
+  node(type: string | NodeType, attrs?: { [key: string]: any }, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode;
+  /**
+   * Create a text node in the schema. Empty text nodes are not
+   * allowed.
+   */
+  text(text: string, marks?: Mark[]): ProsemirrorNode;
+  /**
+   * Create a mark with the given type and attributes.
+   */
+  mark(type: string | MarkType, attrs?: { [key: string]: any }): Mark;
+  /**
+   * Deserialize a node from its JSON representation. This method is
+   * bound.
+   */
+  nodeFromJSON(json: { [key: string]: any }): ProsemirrorNode;
+  /**
+   * Deserialize a mark from its JSON representation. This method is
+   * bound.
+   */
+  markFromJSON(json: { [key: string]: any }): Mark;
 }
 export interface DOMOutputSpecArray {
   0: string;
@@ -268,15 +1300,56 @@ export interface DOMOutputSpecArray {
   9?: DOMOutputSpec | 0;
 }
 export type DOMOutputSpec
-    = string
-    | dom.Node
-    | DOMOutputSpecArray;
+  = string
+  | Node
+  | DOMOutputSpecArray;
+/**
+ * A DOM serializer knows how to convert ProseMirror nodes and
+ * marks of various types to DOM nodes.
+ */
 export class DOMSerializer {
-  constructor(nodes: { [name: string]: (node: Node) => DOMOutputSpec }, marks: { [name: string]: (mark: Mark, inline: boolean) => DOMOutputSpec })
-  nodes: { [name: string]: (node: Node) => DOMOutputSpec };
-  marks: { [name: string]: (mark: Mark) => DOMOutputSpec };
-  serializeFragment(fragment: Fragment, options?: AnyObject): DocumentFragment;
-  serializeNode(node: Node, options?: AnyObject): Node;
+  /**
+   * Create a serializer. `nodes` should map node names to functions
+   * that take a node and return a description of the corresponding
+   * DOM. `marks` does the same for mark names, but also gets an
+   * argument that tells it whether the mark's content is block or
+   * inline content (for typical use, it'll always be inline). A mark
+   * serializer may be `null` to indicate that marks of that type
+   * should not be serialized.
+   */
+  constructor(nodes: { [name: string]: (node: ProsemirrorNode) => DOMOutputSpec }, marks: { [name: string]: (mark: Mark, inline: boolean) => DOMOutputSpec });
+  /**
+   * The node serialization functions.
+   */
+  nodes: { [name: string]: (node: ProsemirrorNode) => DOMOutputSpec };
+  /**
+   * The mark serialization functions.
+   */
+  marks: { [name: string]: (mark: Mark, inline: boolean) => DOMOutputSpec };
+  /**
+   * Serialize the content of this fragment to a DOM fragment. When
+   * not in the browser, the `document` option, containing a DOM
+   * document, should be passed so that the serializer can create
+   * nodes.
+   */
+  serializeFragment(fragment: Fragment, options?: { [key: string]: any }): DocumentFragment;
+  /**
+   * Serialize this node to a DOM node. This can be useful when you
+   * need to serialize a part of a document, as opposed to the whole
+   * document. To serialize a whole document, use
+   * [`serializeFragment`](#model.DOMSerializer.serializeFragment) on
+   * its [content](#model.Node.content).
+   */
+  serializeNode(node: ProsemirrorNode, options?: { [key: string]: any }): Node;
+  /**
+   * Render an [output spec](#model.DOMOutputSpec) to a DOM node. If
+   * the spec has a hole (zero) in it, `contentDOM` will point at the
+   * node with the hole.
+   */
   static renderSpec(doc: Document, structure: DOMOutputSpec): { dom: Node, contentDOM?: Node | null };
+  /**
+   * Build a serializer using the [`toDOM`](#model.NodeSpec.toDOM)
+   * properties in a schema's node and mark specs.
+   */
   static fromSchema(schema: Schema): DOMSerializer;
 }
diff --git a/types/prosemirror-model/tslint.json b/types/prosemirror-model/tslint.json
index b1439230db..ef60a6f2cc 100644
--- a/types/prosemirror-model/tslint.json
+++ b/types/prosemirror-model/tslint.json
@@ -1,7 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "no-any-union": false
+        // Node is declared as `ProsemirrorNode` to avoid name-clash with `Node` from the DOM
+        "strict-export-declare-modifiers": false
     }
 }
diff --git a/types/prosemirror-schema-basic/index.d.ts b/types/prosemirror-schema-basic/index.d.ts
index e5db9ffb80..0e7a6f7846 100644
--- a/types/prosemirror-schema-basic/index.d.ts
+++ b/types/prosemirror-schema-basic/index.d.ts
@@ -1,27 +1,42 @@
-// Type definitions for prosemirror-schema-basic 0.21
+// Type definitions for prosemirror-schema-basic 1.0
 // Project: https://github.com/ProseMirror/prosemirror-schema-basic
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
 import { MarkSpec, NodeSpec, Schema } from 'prosemirror-model';
 
+/**
+ * [Specs](#model.NodeSpec) for the nodes defined in this schema.
+ */
 export let nodes: {
-    doc: NodeSpec,
-    paragraph: NodeSpec,
-    blockquote: NodeSpec,
-    horizontal_rule: NodeSpec,
-    heading: NodeSpec,
-    code_block: NodeSpec,
-    text: NodeSpec,
-    image: NodeSpec,
-    hard_break: NodeSpec
-};
-export let marks: {
-    link: MarkSpec,
-    em: MarkSpec,
-    strong: MarkSpec,
-    code: MarkSpec
+  doc: NodeSpec,
+  paragraph: NodeSpec,
+  blockquote: NodeSpec,
+  horizontal_rule: NodeSpec,
+  heading: NodeSpec,
+  code_block: NodeSpec,
+  text: NodeSpec,
+  image: NodeSpec,
+  hard_break: NodeSpec
 };
+/**
+ * [Specs](#model.MarkSpec) for the marks in the schema.
+ */
+export let marks: { link: MarkSpec, em: MarkSpec, strong: MarkSpec, code: MarkSpec };
+/**
+ * This schema rougly corresponds to the document schema used by
+ * [CommonMark](http://commonmark.org/), minus the list elements,
+ * which are defined in the [`prosemirror-schema-list`](#schema-list)
+ * module.
+ *
+ * To reuse elements from this schema, extend or read from its
+ * `spec.nodes` and `spec.marks` [properties](#model.Schema.spec).
+ */
 export let schema: Schema;
diff --git a/types/prosemirror-schema-list/index.d.ts b/types/prosemirror-schema-list/index.d.ts
index 2378dc8b3c..01053b06cd 100644
--- a/types/prosemirror-schema-list/index.d.ts
+++ b/types/prosemirror-schema-list/index.d.ts
@@ -1,19 +1,68 @@
-// Type definitions for prosemirror-schema-list 0.21
+// Type definitions for prosemirror-schema-list 1.0
 // Project: https://github.com/ProseMirror/prosemirror-schema-list
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
 import OrderedMap = require('orderedmap');
 import { NodeSpec, NodeType } from 'prosemirror-model';
 import { EditorState, Transaction } from 'prosemirror-state';
 
+/**
+ * An ordered list [node spec](#model.NodeSpec). Has a single
+ * attribute, `order`, which determines the number at which the list
+ * starts counting, and defaults to 1. Represented as an `<ol>`
+ * element.
+ */
 export let orderedList: NodeSpec;
+/**
+ * A bullet list node spec, represented in the DOM as `<ul>`.
+ */
 export let bulletList: NodeSpec;
+/**
+ * A list item (`<li>`) spec.
+ */
 export let listItem: NodeSpec;
-export function addListNodes<T>(nodes: OrderedMap<T>, itemContent: string, listGroup?: string): OrderedMap<T>;
+/**
+ * Convenience function for adding list-related node types to a map
+ * specifying the nodes for a schema. Adds
+ * [`orderedList`](#schema-list.orderedList) as `"ordered_list"`,
+ * [`bulletList`](#schema-list.bulletList) as `"bullet_list"`, and
+ * [`listItem`](#schema-list.listItem) as `"list_item"`.
+ *
+ * `itemContent` determines the content expression for the list items.
+ * If you want the commands defined in this module to apply to your
+ * list structure, it should have a shape like `"paragraph block*"` or
+ * `"paragraph (ordered_list | bullet_list)*"`. `listGroup` can be
+ * given to assign a group name to the list node types, for example
+ * `"block"`.
+ */
+export function addListNodes(nodes: OrderedMap<NodeSpec>, itemContent: string, listGroup?: string): OrderedMap<NodeSpec>;
+/**
+ * Returns a command function that wraps the selection in a list with
+ * the given type an attributes. If `dispatch` is null, only return a
+ * value to indicate whether this is possible, but don't actually
+ * perform the change.
+ */
 export function wrapInList(listType: NodeType, attrs?: { [key: string]: any }): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+/**
+ * Build a command that splits a non-empty textblock at the top level
+ * of a list item by also splitting that list item.
+ */
 export function splitListItem(itemType: NodeType): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+/**
+ * Create a command to lift the list item around the selection up into
+ * a wrapping list.
+ */
 export function liftListItem(itemType: NodeType): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+/**
+ * Create a command to sink the list item around the selection down
+ * into an inner list.
+ */
 export function sinkListItem(itemType: NodeType): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
diff --git a/types/prosemirror-state/index.d.ts b/types/prosemirror-state/index.d.ts
index 93e6582c71..781a1459e9 100644
--- a/types/prosemirror-state/index.d.ts
+++ b/types/prosemirror-state/index.d.ts
@@ -1,162 +1,562 @@
-// Type definitions for prosemirror-state 0.24
+// Type definitions for prosemirror-state 1.0
 // Project: https://github.com/ProseMirror/prosemirror-state
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
 
-import { Mark, MarkType, Node, ResolvedPos, Schema, Slice } from 'prosemirror-model';
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
+import { Mark, MarkType, Node as ProsemirrorNode, ResolvedPos, Schema, Slice } from 'prosemirror-model';
 import { Mappable, Mapping, Transform } from 'prosemirror-transform';
 import { EditorProps, EditorView } from 'prosemirror-view';
 
-export interface AnyObject {
-  [key: string]: any;
-}
-
-export interface PluginSpecProps {
-  // State is not part of this type.
-  // state: EditorProps["state"];
-  // dispatchTransaction?: EditorProps["dispatchTransaction"];
-  handleDOMEvents?: EditorProps["handleDOMEvents"];
-  handleKeyDown?: EditorProps["handleKeyDown"];
-  handleKeyPress?: EditorProps["handleKeyPress"];
-  handleTextInput?: EditorProps["handleTextInput"];
-  handleClickOn?: EditorProps["handleClickOn"];
-  handleClick?: EditorProps["handleClick"];
-  handleDoubleClickOn?: EditorProps["handleDoubleClickOn"];
-  handleDoubleClick?: EditorProps["handleDoubleClick"];
-  handleTripleClickOn?: EditorProps["handleTripleClickOn"];
-  handleTripleClick?: EditorProps["handleTripleClick"];
-  handlePaste?: EditorProps["handlePaste"];
-  handleDrop?: EditorProps["handleDrop"];
-  createSelectionBetween?: EditorProps["createSelectionBetween"];
-  domParser?: EditorProps["domParser"];
-  clipboardParser?: EditorProps["clipboardParser"];
-  transformPasted?: EditorProps["transformPasted"];
-  transformPastedHTML?: EditorProps["transformPastedHTML"];
-  transformPastedText?: EditorProps["transformPastedText"];
-  nodeViews?: EditorProps["nodeViews"];
-  clipboardSerializer?: EditorProps["clipboardSerializer"];
-  decorations?: EditorProps["decorations"];
-  editable?: EditorProps["editable"];
-  attributes?: EditorProps["attributes"];
-  scrollThreshold?: EditorProps["scrollThreshold"];
-  scrollMargin?: EditorProps["scrollMargin"];
-}
-
-export interface PluginSpec<T = any> {
-  props?: PluginSpecProps | null;
-  state?: StateField<T> | null;
+/**
+ * This is the type passed to the [`Plugin`](#state.Plugin)
+ * constructor. It provides a definition for a plugin.
+ */
+export interface PluginSpec {
+  /**
+   * The [view props](#view.EditorProps) added by this plugin. Props
+   * that are functions will be bound to have the plugin instance as
+   * their `this` binding.
+   */
+  props?: EditorProps | null;
+  /**
+   * Allows a plugin to define a [state field](#state.StateField), an
+   * extra slot in the state object in which it can keep its own data.
+   */
+  state?: StateField<any> | null;
+  /**
+   * Can be used to make this a keyed plugin. You can have only one
+   * plugin with a given key in a given state, but it is possible to
+   * access the plugin's configuration and state through the key,
+   * without having access to the plugin instance object.
+   */
   key?: PluginKey | null;
-  view?: ((p: EditorView) => {
-    update?: ((view: EditorView, prevState: EditorState) => void) | null,
-    destroy?: (() => void) | null
-  }) | null;
+  /**
+   * When the plugin needs to interact with the editor view, or
+   * set something up in the DOM, use this field. The function
+   * will be called when the plugin's state is associated with an
+   * editor view.
+   */
+  view?: ((p: EditorView) => { update?: ((view: EditorView, prevState: EditorState) => void) | null, destroy?: (() => void) | null }) | null;
+  /**
+   * When present, this will be called before a transaction is
+   * applied by the state, allowing the plugin to cancel it (by
+   * returning false).
+   */
   filterTransaction?: ((p1: Transaction, p2: EditorState) => boolean) | null;
-  appendTransaction?: ((transactions: Transaction[], oldState: EditorState, newState: EditorState) => Transaction | null | undefined) | null;
+  /**
+   * Allows the plugin to append another transaction to be applied
+   * after the given array of transactions. When another plugin
+   * appends a transaction after this was called, it is called again
+   * with the new state and new transactions—but only the new
+   * transactions, i.e. it won't be passed transactions that it
+   * already saw.
+   */
+  appendTransaction?: ((transactions: Transaction[], oldState: EditorState, newState: EditorState) => Transaction | null | void) | null;
 }
-
-export class Plugin<T = any> {
-  constructor(spec: PluginSpec<T>)
-  props: PluginSpecProps;
-  spec: AnyObject;
-  getState(state: EditorState): T | undefined;
+/**
+ * Plugins bundle functionality that can be added to an editor.
+ * They are part of the [editor state](#state.EditorState) and
+ * may influence that state and the view that contains it.
+ */
+export class Plugin {
+  /**
+   * Create a plugin.
+   */
+  constructor(spec: PluginSpec);
+  /**
+   * The [props](#view.EditorProps) exported by this plugin.
+   */
+  props: EditorProps;
+  /**
+   * The plugin's [spec object](#state.PluginSpec).
+   */
+  spec: { [key: string]: any };
+  /**
+   * Extract the plugin's state field from an editor state.
+   */
+  getState(state: EditorState): any;
 }
-
+/**
+ * A plugin spec may provide a state field (under its
+ * [`state`](#state.PluginSpec.state) property) of this type, which
+ * describes the state it wants to keep. Functions provided here are
+ * always called with the plugin instance as their `this` binding.
+ */
 export interface StateField<T> {
-  init(config: AnyObject, instance: EditorState): T;
+  /**
+   * Initialize the value of the field. `config` will be the object
+   * passed to [`EditorState.create`](#state.EditorState^create). Note
+   * that `instance` is a half-initialized state instance, and will
+   * not have values for plugin fields initialized after this one.
+   */
+  init(config: { [key: string]: any }, instance: EditorState): T;
+  /**
+   * Apply the given transaction to this state field, producing a new
+   * field value. Note that the `newState` argument is again a partially
+   * constructed state does not yet contain the state from plugins
+   * coming after this one.
+   */
   apply(tr: Transaction, value: T, oldState: EditorState, newState: EditorState): T;
+  /**
+   * Convert this field to JSON. Optional, can be left off to disable
+   * JSON serialization for the field.
+   */
   toJSON?: ((value: T) => any) | null;
-  fromJSON?: ((config: AnyObject, value: any, state: EditorState) => T) | null;
+  /**
+   * Deserialize the JSON representation of this field. Note that the
+   * `state` argument is again a half-initialized state.
+   */
+  fromJSON?: ((config: { [key: string]: any }, value: any, state: EditorState) => T) | null;
 }
+/**
+ * A key is used to [tag](#state.PluginSpec.key)
+ * plugins in a way that makes it possible to find them, given an
+ * editor state. Assigning a key does mean only one plugin of that
+ * type can be active in a state.
+ */
 export class PluginKey {
-  constructor(name?: string)
-  get(state: EditorState): Plugin | null | undefined;
-  getState(state: EditorState): any | null | undefined;
+  /**
+   * Create a plugin key.
+   */
+  constructor(name?: string);
+  /**
+   * Get the active plugin with this key, if any, from an editor
+   * state.
+   */
+  get(state: EditorState): Plugin | null | void;
+  /**
+   * Get the plugin's state from an editor state.
+   */
+  getState(state: EditorState): any | null | void;
 }
+/**
+ * Superclass for editor selections. Every selection type should
+ * extend this. Should not be instantiated directly.
+ */
 export class Selection {
-  constructor($anchor: ResolvedPos, $head: ResolvedPos, ranges?: SelectionRange[])
+  /**
+   * Initialize a selection with the head and anchor and ranges. If no
+   * ranges are given, constructs a single range across `$anchor` and
+   * `$head`.
+   */
+  constructor($anchor: ResolvedPos, $head: ResolvedPos, ranges?: SelectionRange[]);
+  /**
+   * The ranges covered by the selection.
+   */
   ranges: SelectionRange[];
+  /**
+   * The resolved anchor of the selection (the side that stays in
+   * place when the selection is modified).
+   */
   $anchor: ResolvedPos;
+  /**
+   * The resolved head of the selection (the side that moves when
+   * the selection is modified).
+   */
   $head: ResolvedPos;
+  /**
+   * The selection's anchor, as an unresolved position.
+   */
   anchor: number;
+  /**
+   * The selection's head.
+   */
   head: number;
+  /**
+   * The lower bound of the selection's main range.
+   */
   from: number;
+  /**
+   * The upper bound of the selection's main range.
+   */
   to: number;
+  /**
+   * The resolved lower  bound of the selection's main range.
+   */
   $from: ResolvedPos;
+  /**
+   * The resolved upper bound of the selection's main range.
+   */
   $to: ResolvedPos;
+  /**
+   * Indicates whether the selection contains any content.
+   */
   empty: boolean;
+  /**
+   * Test whether the selection is the same as another selection.
+   */
   eq(p: Selection): boolean;
-  map(doc: Node, mapping: Mappable): Selection;
+  /**
+   * Map this selection through a [mappable](#transform.Mappable) thing. `doc`
+   * should be the new document to which we are mapping.
+   */
+  map(doc: ProsemirrorNode, mapping: Mappable): Selection;
+  /**
+   * Get the content of this selection as a slice.
+   */
   content(): Slice;
+  /**
+   * Replace the selection with a slice or, if no slice is given,
+   * delete the selection. Will append to the given transaction.
+   */
   replace(tr: Transaction, content?: Slice): void;
-  replaceWith(tr: Transaction, node: Node): void;
-  toJSON(): AnyObject;
+  /**
+   * Replace the selection with the given node, appending the changes
+   * to the given transaction.
+   */
+  replaceWith(tr: Transaction, node: ProsemirrorNode): void;
+  /**
+   * Convert the selection to a JSON representation. When implementing
+   * this for a custom selection class, make sure to give the object a
+   * `type` property whose value matches the ID under which you
+   * [registered](#state.Selection^jsonID) your class.
+   */
+  toJSON(): { [key: string]: any };
+  /**
+   * Get a [bookmark](#state.SelectionBookmark) for this selection,
+   * which is a value that can be mapped without having access to a
+   * current document, and later resolved to a real selection for a
+   * given document again. (This is used mostly by the history to
+   * track and restore old selections.) The default implementation of
+   * this method just converts the selection to a text selection and
+   * returns the bookmark for that.
+   */
   getBookmark(): SelectionBookmark;
+  /**
+   * Controls whether, when a selection of this type is active in the
+   * browser, the selected range should be visible to the user. Defaults
+   * to `true`.
+   */
   visible: boolean;
-  static findFrom($pos: ResolvedPos, dir: number, textOnly?: boolean): Selection | null | undefined;
+  /**
+   * Find a valid cursor or leaf node selection starting at the given
+   * position and searching back if `dir` is negative, and forward if
+   * positive. When `textOnly` is true, only consider cursor
+   * selections. Will return null when no valid selection position is
+   * found.
+   */
+  static findFrom($pos: ResolvedPos, dir: number, textOnly?: boolean): Selection | null | void;
+  /**
+   * Find a valid cursor or leaf node selection near the given
+   * position. Searches forward first by default, but if `bias` is
+   * negative, it will search backwards first.
+   */
   static near($pos: ResolvedPos, bias?: number): Selection;
-  static atStart(doc: Node): Selection;
-  static atEnd(doc: Node): Selection;
-  static fromJSON(doc: Node, json: AnyObject): Selection;
+  /**
+   * Find the cursor or leaf node selection closest to the start of
+   * the given document. Will return an
+   * [`AllSelection`](#state.AllSelection) if no valid position
+   * exists.
+   */
+  static atStart(doc: ProsemirrorNode): Selection;
+  /**
+   * Find the cursor or leaf node selection closest to the end of the
+   * given document.
+   */
+  static atEnd(doc: ProsemirrorNode): Selection;
+  /**
+   * Deserialize the JSON representation of a selection. Must be
+   * implemented for custom classes (as a static class method).
+   */
+  static fromJSON(doc: ProsemirrorNode, json: { [key: string]: any }): Selection;
+  /**
+   * To be able to deserialize selections from JSON, custom selection
+   * classes must register themselves with an ID string, so that they
+   * can be disambiguated. Try to pick something that's unlikely to
+   * clash with classes from other modules.
+   */
   static jsonID(id: string, selectionClass: { new(...args: any[]): Selection }): void;
 }
+/**
+ * A lightweight, document-independent representation of a selection.
+ * You can define a custom bookmark type for a custom selection class
+ * to make the history handle it well.
+ */
 export interface SelectionBookmark {
+  /**
+   * Map the bookmark through a set of changes.
+   */
   map(mapping: Mapping): SelectionBookmark;
-  resolve(doc: Node): Selection;
+  /**
+   * Resolve the bookmark to a real selection again. This may need to
+   * do some error checking and may fall back to a default (usually
+   * [`TextSelection.between`](#state.TextSelection^between)) if
+   * mapping made the bookmark invalid.
+   */
+  resolve(doc: ProsemirrorNode): Selection;
 }
+/**
+ * Represents a selected range in a document.
+ */
 export class SelectionRange {
-  constructor($from: ResolvedPos, $to: ResolvedPos)
+  constructor($from: ResolvedPos, $to: ResolvedPos);
+  /**
+   * The lower bound of the range.
+   */
   $from: ResolvedPos;
+  /**
+   * The upper bound of the range.
+   */
   $to: ResolvedPos;
 }
+/**
+ * A text selection represents a classical editor selection, with
+ * a head (the moving side) and anchor (immobile side), both of which
+ * point into textblock nodes. It can be empty (a regular cursor
+ * position).
+ */
 export class TextSelection extends Selection {
-  constructor($anchor: ResolvedPos, $head?: ResolvedPos)
+  /**
+   * Construct a text selection between the given points.
+   */
+  constructor($anchor: ResolvedPos, $head?: ResolvedPos);
+  /**
+   * Returns a resolved position if this is a cursor selection (an
+   * empty text selection), and null otherwise.
+   */
   $cursor?: ResolvedPos | null;
-  static create(doc: Node, anchor: number, head?: number): TextSelection;
+  /**
+   * Create a text selection from non-resolved positions.
+   */
+  static create(doc: ProsemirrorNode, anchor: number, head?: number): TextSelection;
+  /**
+   * Return a text selection that spans the given positions or, if
+   * they aren't text positions, find a text selection near them.
+   * `bias` determines whether the method searches forward (default)
+   * or backwards (negative number) first. Will fall back to calling
+   * [`Selection.near`](#state.Selection^near) when the document
+   * doesn't contain a valid text position.
+   */
   static between($anchor: ResolvedPos, $head: ResolvedPos, bias?: number): Selection;
 }
+/**
+ * A node selection is a selection that points at a single node.
+ * All nodes marked [selectable](#model.NodeSpec.selectable) can be
+ * the target of a node selection. In such a selection, `from` and
+ * `to` point directly before and after the selected node, `anchor`
+ * equals `from`, and `head` equals `to`..
+ */
 export class NodeSelection extends Selection {
-  constructor($pos: ResolvedPos)
-  node: Node;
-  static create(doc: Node, from: number, p1?: number): NodeSelection;
-  static isSelectable(node: Node): boolean;
+  /**
+   * Create a node selection. Does not verify the validity of its
+   * argument.
+   */
+  constructor($pos: ResolvedPos);
+  /**
+   * The selected node.
+   */
+  node: ProsemirrorNode;
+  /**
+   * Create a node selection from non-resolved positions.
+   */
+  static create(doc: ProsemirrorNode, from: number): NodeSelection;
+  /**
+   * Determines whether the given node may be selected as a node
+   * selection.
+   */
+  static isSelectable(node: ProsemirrorNode): boolean;
 }
+/**
+ * A selection type that represents selecting the whole document
+ * (which can not necessarily be expressed with a text selection, when
+ * there are for example leaf block nodes at the start or end of the
+ * document).
+ */
 export class AllSelection extends Selection {
-  constructor(doc: Node)
+  /**
+   * Create an all-selection over the given document.
+   */
+  constructor(doc: ProsemirrorNode);
 }
+/**
+ * The state of a ProseMirror editor is represented by an object
+ * of this type. A state is a persistent data structure—it isn't
+ * updated, but rather a new state value is computed from an old one
+ * using the [`apply`](#state.EditorState.apply) method.
+ *
+ * A state holds a number of built-in fields, and plugins can
+ * [define](#state.PluginSpec.state) additional fields.
+ */
 export class EditorState {
-  doc: Node;
+  /**
+   * The current document.
+   */
+  doc: ProsemirrorNode;
+  /**
+   * The selection.
+   */
   selection: Selection;
+  /**
+   * A set of marks to apply to the next input. Will be null when
+   * no explicit marks have been set.
+   */
   storedMarks?: Mark[] | null;
+  /**
+   * The schema of the state's document.
+   */
   schema: Schema;
+  /**
+   * The plugins that are active in this state.
+   */
   plugins: Plugin[];
+  /**
+   * Apply the given transaction to produce a new state.
+   */
   apply(tr: Transaction): EditorState;
+  /**
+   * Verbose variant of [`apply`](#state.EditorState.apply) that
+   * returns the precise transactions that were applied (which might
+   * be influenced by the [transaction
+   * hooks](#state.PluginSpec.filterTransaction) of
+   * plugins) along with the new state.
+   */
   applyTransaction(tr: Transaction): { state: EditorState, transactions: Transaction[] };
+  /**
+   * Start a [transaction](#state.Transaction) from this state.
+   */
   tr: Transaction;
-  reconfigure(config: AnyObject): EditorState;
-  toJSON(pluginFields?: { [name: string]: Plugin }): AnyObject;
-  static create(config: AnyObject): EditorState;
-  static fromJSON(config: AnyObject, json: AnyObject, pluginFields?: { [name: string]: Plugin }): EditorState;
+  /**
+   * Create a new state based on this one, but with an adjusted set of
+   * active plugins. State fields that exist in both sets of plugins
+   * are kept unchanged. Those that no longer exist are dropped, and
+   * those that are new are initialized using their
+   * [`init`](#state.StateField.init) method, passing in the new
+   * configuration object..
+   */
+  reconfigure(config: { schema?: Schema | null, plugins?: Plugin[] | null }): EditorState;
+  /**
+   * Serialize this state to JSON. If you want to serialize the state
+   * of plugins, pass an object mapping property names to use in the
+   * resulting JSON object to plugin objects.
+   */
+  toJSON(pluginFields?: { [name: string]: Plugin }): { [key: string]: any };
+  /**
+   * Create a new state.
+   */
+  static create(config: { schema?: Schema | null, doc?: ProsemirrorNode | null, selection?: Selection | null, plugins?: Plugin[] | null }): EditorState;
+  /**
+   * Deserialize a JSON representation of a state. `config` should
+   * have at least a `schema` field, and should contain array of
+   * plugins to initialize the state with. `pluginFields` can be used
+   * to deserialize the state of plugins, by associating plugin
+   * instances with the property names they use in the JSON object.
+   */
+  static fromJSON(config: { schema: Schema, plugins?: Plugin[] | null }, json: { [key: string]: any }, pluginFields?: { [name: string]: Plugin }): EditorState;
 }
+/**
+ * An editor state transaction, which can be applied to a state to
+ * create an updated state. Use
+ * [`EditorState.tr`](#state.EditorState.tr) to create an instance.
+ *
+ * Transactions track changes to the document (they are a subclass of
+ * [`Transform`](#transform.Transform)), but also other state changes,
+ * like selection updates and adjustments of the set of [stored
+ * marks](#state.EditorState.storedMarks). In addition, you can store
+ * metadata properties in a transaction, which are extra pieces of
+ * information that client code or plugins can use to describe what a
+ * transacion represents, so that they can update their [own
+ * state](#state.StateField) accordingly.
+ *
+ * The [editor view](#view.EditorView) uses a few metadata properties:
+ * it will attach a property `"pointer"` with the value `true` to
+ * selection transactions directly caused by mouse or touch input, and
+ * a `"paste"` property of true to transactions caused by a paste..
+ */
 export class Transaction extends Transform {
+  /**
+   * The timestamp associated with this transaction, in the same
+   * format as `Date.now()`.
+   */
   time: number;
+  /**
+   * The stored marks set by this transaction, if any.
+   */
   storedMarks?: Mark[] | null;
+  /**
+   * The transaction's current selection. This defaults to the editor
+   * selection [mapped](#state.Selection.map) through the steps in the
+   * transaction, but can be overwritten with
+   * [`setSelection`](#state.Transaction.setSelection).
+   */
   selection: Selection;
+  /**
+   * Update the transaction's current selection. Will determine the
+   * selection that the editor gets when the transaction is applied.
+   */
   setSelection(selection: Selection): Transaction;
+  /**
+   * Whether the selection was explicitly updated by this transaction.
+   */
   selectionSet: boolean;
+  /**
+   * Set the current stored marks.
+   */
   setStoredMarks(marks?: Mark[]): Transaction;
+  /**
+   * Make sure the current stored marks or, if that is null, the marks
+   * at the selection, match the given set of marks. Does nothing if
+   * this is already the case.
+   */
   ensureMarks(marks: Mark[]): Transaction;
-  storedMarksSet: boolean;
-  setTime(time: number): Transaction;
-  replaceSelection(slice: Slice): Transaction;
-  replaceSelectionWith(node: Node, inheritMarks?: boolean): Transaction;
-  deleteSelection(): Transaction;
-  insertText(text: string, from?: number, to?: number): Transaction;
-  setMeta(key: string | Plugin | PluginKey, value: any): Transaction;
-  getMeta(key: string | Plugin | PluginKey): any;
-  isGeneric: boolean;
-  scrollIntoView(): Transaction;
+  /**
+   * Add a mark to the set of stored marks.
+   */
   addStoredMark(mark: Mark): Transaction;
+  /**
+   * Remove a mark or mark type from the set of stored marks.
+   */
   removeStoredMark(mark: Mark | MarkType): Transaction;
+  /**
+   * Whether the stored marks were explicitly set for this transaction.
+   */
+  storedMarksSet: boolean;
+  /**
+   * Update the timestamp for the transaction.
+   */
+  setTime(time: number): Transaction;
+  /**
+   * Replace the current selection with the given slice.
+   */
+  replaceSelection(slice: Slice): Transaction;
+  /**
+   * Replace the selection with the given node. When `inheritMarks` is
+   * true and the content is inline, it inherits the marks from the
+   * place where it is inserted.
+   */
+  replaceSelectionWith(node: ProsemirrorNode, inheritMarks?: boolean): Transaction;
+  /**
+   * Delete the selection.
+   */
+  deleteSelection(): Transaction;
+  /**
+   * Replace the given range, or the selection if no range is given,
+   * with a text node containing the given string.
+   */
+  insertText(text: string, from?: number, to?: number): Transaction;
+  /**
+   * Store a metadata property in this transaction, keyed either by
+   * name or by plugin.
+   */
+  setMeta(key: string | Plugin | PluginKey, value: any): Transaction;
+  /**
+   * Retrieve a metadata property for a given name or plugin.
+   */
+  getMeta(key: string | Plugin | PluginKey): any;
+  /**
+   * Returns true if this transaction doesn't contain any metadata,
+   * and can thus safely be extended.
+   */
+  isGeneric: boolean;
+  /**
+   * Indicate that the editor should scroll the selection into view
+   * when updated to the state produced by this transaction.
+   */
+  scrollIntoView(): Transaction;
 }
diff --git a/types/prosemirror-state/prosemirror-state-tests.ts b/types/prosemirror-state/prosemirror-state-tests.ts
index 7b8ff3578a..0c1cddc24e 100644
--- a/types/prosemirror-state/prosemirror-state-tests.ts
+++ b/types/prosemirror-state/prosemirror-state-tests.ts
@@ -20,23 +20,23 @@ const nodeRange = {} as model.NodeRange;
 const step = {} as transform.Step;
 const nodeType = {} as model.NodeType;
 
-let transaction: state.Transaction;
+let transaction = {} as state.Transaction;
 
-transaction = new state.Transaction(node).delete(0, 0);
-transaction = new state.Transaction(node).addMark(0, 0, mark);
-transaction = new state.Transaction(node).removeMark(0, 0);
-transaction = new state.Transaction(node).clearIncompatible(0, nodeType);
-transaction = new state.Transaction(node).replaceRange(0, 0, slice);
-transaction = new state.Transaction(node).replaceRangeWith(0, 0, node);
-transaction = new state.Transaction(node).deleteRange(0, 0);
-transaction = new state.Transaction(node).delete(0, 0);
-transaction = new state.Transaction(node).replace(0, 0);
-transaction = new state.Transaction(node).replaceWith(0, 0, node);
-transaction = new state.Transaction(node).insert(0, node);
-transaction = new state.Transaction(node).lift(nodeRange, 0);
-transaction = new state.Transaction(node).wrap(nodeRange, []);
-transaction = new state.Transaction(node).setBlockType(0, 0, node.type);
-transaction = new state.Transaction(node).setNodeMarkup(0);
-transaction = new state.Transaction(node).split(0);
-transaction = new state.Transaction(node).join(0);
-transaction = new state.Transaction(node).step(step);
+transaction = transaction.delete(0, 0);
+transaction = transaction.addMark(0, 0, mark);
+transaction = transaction.removeMark(0, 0);
+transaction = transaction.clearIncompatible(0, nodeType);
+transaction = transaction.replaceRange(0, 0, slice);
+transaction = transaction.replaceRangeWith(0, 0, node);
+transaction = transaction.deleteRange(0, 0);
+transaction = transaction.delete(0, 0);
+transaction = transaction.replace(0, 0);
+transaction = transaction.replaceWith(0, 0, node);
+transaction = transaction.insert(0, node);
+transaction = transaction.lift(nodeRange, 0);
+transaction = transaction.wrap(nodeRange, []);
+transaction = transaction.setBlockType(0, 0, node.type);
+transaction = transaction.setNodeMarkup(0);
+transaction = transaction.split(0);
+transaction = transaction.join(0);
+transaction = transaction.step(step);
diff --git a/types/prosemirror-tables/dom.d.ts b/types/prosemirror-tables/dom.d.ts
deleted file mode 100644
index b4b02d1c24..0000000000
--- a/types/prosemirror-tables/dom.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export type DOMDataTransfer = DataTransfer;
-export type DOMDocument = Document;
-export type DOMElement = HTMLElement;
-export type DOMEvent = Event;
-export type DOMFragment = DocumentFragment;
-export type DOMKeyboardEvent = KeyboardEvent;
-export type DOMMouseEvent = MouseEvent;
-export type DOMMutationRecord = MutationRecord;
-export type DOMNode = Node;
-
-export {
-  DOMDataTransfer as DataTransfer,
-  DOMDocument as Document,
-  DOMElement as Element,
-  DOMEvent as Event,
-  DOMFragment as DocumentFragment,
-  DOMKeyboardEvent as KeyboardEvent,
-  DOMMouseEvent as MouseEvent,
-  DOMMutationRecord as MutationRecord,
-  DOMNode as Node,
-};
diff --git a/types/prosemirror-tables/index.d.ts b/types/prosemirror-tables/index.d.ts
index fe24b41189..59f54b697b 100644
--- a/types/prosemirror-tables/index.d.ts
+++ b/types/prosemirror-tables/index.d.ts
@@ -5,8 +5,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 import { EditorState, Plugin, SelectionRange, Transaction } from 'prosemirror-state';
-import { Node, NodeSpec, Slice, ResolvedPos } from 'prosemirror-model';
-import * as dom from './dom';
+import { Node as ProsemirrorNode, NodeSpec, Slice, ResolvedPos } from 'prosemirror-model';
 
 export interface TableNodesOptions {
   tableGroup?: string;
@@ -14,7 +13,7 @@ export interface TableNodesOptions {
   cellAttributes: { [key: string]: CellAttributes };
 }
 
-export type getFromDOM = (dom: dom.DOMElement) => any;
+export type getFromDOM = (dom: Element) => any;
 export type setDOMAttr = (value: any, attrs: any) => any;
 
 export interface CellAttributes {
@@ -54,11 +53,11 @@ export class CellSelection {
   empty: boolean;
   ranges: SelectionRange[];
 
-  map(doc: Node, mapping: any): any;
+  map(doc: ProsemirrorNode, mapping: any): any;
   content(): Slice;
   replace(tr: Transaction, content: Slice): void;
-  replaceWith(tr: Transaction, node: Node): void;
-  forEachCell(f: (node: Node, pos: number) => void): void;
+  replaceWith(tr: Transaction, node: ProsemirrorNode): void;
+  forEachCell(f: (node: ProsemirrorNode, pos: number) => void): void;
   isRowSelection(): boolean;
   isColSelection(): boolean;
   eq(other: any): boolean;
@@ -67,8 +66,8 @@ export class CellSelection {
 
   static colSelection(anchorCell: ResolvedPos, headCell?: ResolvedPos): CellSelection;
   static rowSelection(anchorCell: ResolvedPos, headCell?: ResolvedPos): CellSelection;
-  static create(doc: Node, anchorCell: number, headCell?: number): CellSelection;
-  static fromJSON(doc: Node, json: CellSelectionJSON): CellSelection;
+  static create(doc: ProsemirrorNode, anchorCell: number, headCell?: number): CellSelection;
+  static fromJSON(doc: ProsemirrorNode, json: CellSelectionJSON): CellSelection;
 }
 
 export interface Rect {
@@ -89,9 +88,9 @@ export class TableMap {
   nextCell(pos: number, axis: string, dir: number): number;
   rectBetween(a: number, b: number): Rect;
   cellsInRect(rect: Rect): number[];
-  positionAt(row: number, col: number, table: Node): number;
+  positionAt(row: number, col: number, table: ProsemirrorNode): number;
 
-  static get(table: Node): TableMap;
+  static get(table: ProsemirrorNode): TableMap;
 }
 
 export function tableEditing(): Plugin;
diff --git a/types/prosemirror-transform/index.d.ts b/types/prosemirror-transform/index.d.ts
index 15cc94e936..8f386b4bd3 100644
--- a/types/prosemirror-transform/index.d.ts
+++ b/types/prosemirror-transform/index.d.ts
@@ -1,100 +1,487 @@
-// Type definitions for prosemirror-transform 0.24
+// Type definitions for prosemirror-transform 1.0
 // Project: https://github.com/ProseMirror/prosemirror-transform
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
 
-import { Fragment, Mark, MarkType, Node, NodeRange, NodeType, Schema, Slice, ContentMatch } from 'prosemirror-model';
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
 
+import { ContentMatch, Fragment, Mark, MarkType, Node as ProsemirrorNode, NodeRange, NodeType, Schema, Slice } from 'prosemirror-model';
+
+/**
+ * There are several things that positions can be mapped through.
+ * Such objects conform to this interface.
+ */
 export interface Mappable {
+  /**
+   * Map a position through this object. When given, `assoc` (should
+   * be -1 or 1, defaults to 1) determines with which side the
+   * position is associated, which determines in which direction to
+   * move when a chunk of content is inserted at the mapped position.
+   */
   map(pos: number, assoc?: number): number;
+  /**
+   * Map a position, and return an object containing additional
+   * information about the mapping. The result's `deleted` field tells
+   * you whether the position was deleted (completely enclosed in a
+   * replaced range) during the mapping. When content on only one side
+   * is deleted, the position itself is only considered deleted when
+   * `assoc` points in the direction of the deleted content.
+   */
   mapResult(pos: number, assoc?: number): MapResult;
 }
+/**
+ * An object representing a mapped position with extra
+ * information.
+ */
 export class MapResult {
+  /**
+   * The mapped version of the position.
+   */
   pos: number;
+  /**
+   * Tells you whether the position was deleted, that is,
+   * whether the step removed its surroundings from the document.
+   */
   deleted: boolean;
 }
-export class StepMap {
-  constructor(ranges: number[])
-  mapResult(pos: number, assoc?: number): MapResult;
-  map(pos: number, assoc?: number): number;
+/**
+ * A map describing the deletions and insertions made by a step, which
+ * can be used to find the correspondence between positions in the
+ * pre-step version of a document and the same position in the
+ * post-step version.
+ */
+export class StepMap implements Mappable {
+  /**
+   * Create a position map. The modifications to the document are
+   * represented as an array of numbers, in which each group of three
+   * represents a modified chunk as `[start, oldSize, newSize]`.
+   */
+  constructor(ranges: number[]);
+  /**
+   * Calls the given function on each of the changed ranges included in
+   * this map.
+   */
   forEach(f: (oldStart: number, oldEnd: number, newStart: number, newEnd: number) => void): void;
+  /**
+   * Create an inverted version of this map. The result can be used to
+   * map positions in the post-step document to the pre-step document.
+   */
   invert(): StepMap;
+  /**
+   * Map a position through this object. When given, `assoc` (should
+   * be -1 or 1, defaults to 1) determines with which side the
+   * position is associated, which determines in which direction to
+   * move when a chunk of content is inserted at the mapped position.
+   */
+  map(pos: number, assoc?: number): number;
+  /**
+   * Map a position, and return an object containing additional
+   * information about the mapping. The result's `deleted` field tells
+   * you whether the position was deleted (completely enclosed in a
+   * replaced range) during the mapping. When content on only one side
+   * is deleted, the position itself is only considered deleted when
+   * `assoc` points in the direction of the deleted content.
+   */
+  mapResult(pos: number, assoc?: number): MapResult;
+  /**
+   * Create a map that moves all positions by offset `n` (which may be
+   * negative). This can be useful when applying steps meant for a
+   * sub-document to a larger document, or vice-versa.
+   */
   static offset(n: number): StepMap;
 }
-export class Mapping {
-  constructor(maps?: StepMap[])
+/**
+ * A mapping represents a pipeline of zero or more [step
+ * maps](#transform.StepMap). It has special provisions for losslessly
+ * handling mapping positions through a series of steps in which some
+ * steps are inverted versions of earlier steps. (This comes up when
+ * ‘[rebasing](/docs/guide/#transform.rebasing)’ steps for
+ * collaboration or history management.)
+ */
+export class Mapping implements Mappable {
+  /**
+   * Create a new mapping with the given position maps.
+   */
+  constructor(maps?: StepMap[]);
+  /**
+   * The step maps in this mapping.
+   */
   maps: StepMap[];
+  /**
+   * The starting position in the `maps` array, used when `map` or
+   * `mapResult` is called.
+   */
   from: number;
+  /**
+   * The end position in the `maps` array.
+   */
   to: number;
+  /**
+   * Create a mapping that maps only through a part of this one.
+   */
   slice(from?: number, to?: number): Mapping;
+  /**
+   * Add a step map to the end of this mapping. If `mirrors` is
+   * given, it should be the index of the step map that is the mirror
+   * image of this one.
+   */
   appendMap(map: StepMap, mirrors?: number): void;
+  /**
+   * Add all the step maps in a given mapping to this one (preserving
+   * mirroring information).
+   */
   appendMapping(mapping: Mapping): void;
+  /**
+   * Append the inverse of the given mapping to this one.
+   */
   appendMappingInverted(mapping: Mapping): void;
+  /**
+   * Map a position through this object. When given, `assoc` (should
+   * be -1 or 1, defaults to 1) determines with which side the
+   * position is associated, which determines in which direction to
+   * move when a chunk of content is inserted at the mapped position.
+   */
   map(pos: number, assoc?: number): number;
+  /**
+   * Map a position, and return an object containing additional
+   * information about the mapping. The result's `deleted` field tells
+   * you whether the position was deleted (completely enclosed in a
+   * replaced range) during the mapping. When content on only one side
+   * is deleted, the position itself is only considered deleted when
+   * `assoc` points in the direction of the deleted content.
+   */
   mapResult(pos: number, assoc?: number): MapResult;
 }
+/**
+ * Add a mark to all inline content between two positions.
+ */
 export class AddMarkStep extends Step {
-  constructor(from: number, to: number, mark: Mark)
+  constructor(from: number, to: number, mark: Mark);
 }
+/**
+ * Remove a mark from all inline content between two positions.
+ */
 export class RemoveMarkStep extends Step {
-  constructor(from: number, to: number, mark: Mark)
+  constructor(from: number, to: number, mark: Mark);
 }
+/**
+ * Abstraction to build up and track an array of
+ * [steps](#transform.Step) representing a document transformation.
+ *
+ * Most transforming methods return the `Transform` object itself, so
+ * that they can be chained.
+ */
 export class Transform {
-  constructor(doc: Node)
+  /**
+   * Create a transform that starts with the given document.
+   */
+  constructor(doc: ProsemirrorNode);
+  /**
+   * Add the given mark to the inline content between `from` and `to`.
+   */
   addMark(from: number, to: number, mark: Mark): this;
+  /**
+   * Remove marks from inline nodes between `from` and `to`. When `mark`
+   * is a single mark, remove precisely that mark. When it is a mark type,
+   * remove all marks of that type. When it is null, remove all marks of
+   * any type.
+   */
   removeMark(from: number, to: number, mark?: Mark | MarkType): this;
-  clearIncompatible(pos: number, parentType: NodeType, match?: ContentMatch | null): this;
-  replaceRange(from: number, to: number, slice: Slice): this;
-  replaceRangeWith(from: number, to: number, node: Node): this;
-  deleteRange(from: number, to: number): this;
-  delete(from: number, to: number): this;
+  /**
+   * Removes all marks and nodes from the content of the node at `pos`
+   * that don't match the given new parent node type. Accepts an
+   * optional starting [content match](#model.ContentMatch) as third
+   * argument.
+   */
+  clearIncompatible(pos: number, parentType: NodeType, match?: ContentMatch): this;
+  /**
+   * Replace the part of the document between `from` and `to` with the
+   * given `slice`.
+   */
   replace(from: number, to?: number, slice?: Slice): this;
-  replaceWith(from: number, to: number, content: Fragment | Node | Node[]): this;
-  insert(pos: number, content: Fragment | Node | Node[]): this;
+  /**
+   * Replace the given range with the given content, which may be a
+   * fragment, node, or array of nodes.
+   */
+  replaceWith(from: number, to: number, content: Fragment | ProsemirrorNode | ProsemirrorNode[]): this;
+  /**
+   * Delete the content between the given positions.
+   */
+  delete(from: number, to: number): this;
+  /**
+   * Insert the given content at the given position.
+   */
+  insert(pos: number, content: Fragment | ProsemirrorNode | ProsemirrorNode[]): this;
+  /**
+   * Replace a range of the document with a given slice, using `from`,
+   * `to`, and the slice's [`openStart`](#model.Slice.openStart) property
+   * as hints, rather than fixed start and end points. This method may
+   * grow the replaced area or close open nodes in the slice in order to
+   * get a fit that is more in line with WYSIWYG expectations, by
+   * dropping fully covered parent nodes of the replaced region when
+   * they are marked [non-defining](#model.NodeSpec.defining), or
+   * including an open parent node from the slice that _is_ marked as
+   * [defining](#model.NodeSpec.defining).
+   *
+   * This is the method, for example, to handle paste. The similar
+   * [`replace`](#transform.Transform.replace) method is a more
+   * primitive tool which will _not_ move the start and end of its given
+   * range, and is useful in situations where you need more precise
+   * control over what happens.
+   */
+  replaceRange(from: number, to: number, slice: Slice): this;
+  /**
+   * Replace the given range with a node, but use `from` and `to` as
+   * hints, rather than precise positions. When from and to are the same
+   * and are at the start or end of a parent node in which the given
+   * node doesn't fit, this method may _move_ them out towards a parent
+   * that does allow the given node to be placed. When the given range
+   * completely covers a parent node, this method may completely replace
+   * that parent node.
+   */
+  replaceRangeWith(from: number, to: number, node: ProsemirrorNode): this;
+  /**
+   * Delete the given range, expanding it to cover fully covered
+   * parent nodes until a valid replace is found.
+   */
+  deleteRange(from: number, to: number): this;
+  /**
+   * Split the content in the given range off from its parent, if there
+   * is sibling content before or after it, and move it up the tree to
+   * the depth specified by `target`. You'll probably want to use
+   * [`liftTarget`](#transform.liftTarget) to compute `target`, to make
+   * sure the lift is valid.
+   */
   lift(range: NodeRange, target: number): this;
-  wrap(range: NodeRange, wrappers: Array<{ type: NodeType, attrs?: object | null }>): this;
-  setBlockType(from: number, to: number | undefined, type: NodeType, attrs?: object): this;
-  setNodeMarkup(pos: number, type?: NodeType, attrs?: object, marks?: Mark[]): this;
-  split(pos: number, depth?: number, typesAfter?: Array<{ type: NodeType, attrs?: object | null }>): this;
+  /**
+   * Wrap the given [range](#model.NodeRange) in the given set of wrappers.
+   * The wrappers are assumed to be valid in this position, and should
+   * probably be computed with [`findWrapping`](#transform.findWrapping).
+   */
+  wrap(range: NodeRange, wrappers: Array<{ type: NodeType, attrs?: { [key: string]: any } | null }>): this;
+  /**
+   * Set the type of all textblocks (partly) between `from` and `to` to
+   * the given node type with the given attributes.
+   */
+  setBlockType(from: number, to: number | undefined, type: NodeType, attrs?: { [key: string]: any }): this;
+  /**
+   * Change the type, attributes, and/or marks of the node at `pos`.
+   * When `nodeType` is null, the existing node type is preserved,
+   */
+  setNodeMarkup(pos: number, type?: NodeType, attrs?: { [key: string]: any }, marks?: Mark[]): this;
+  /**
+   * Split the node at the given position, and optionally, if `depth` is
+   * greater than one, any number of nodes above that. By default, the
+   * parts split off will inherit the node type of the original node.
+   * This can be changed by passing an array of types and attributes to
+   * use after the split.
+   */
+  split(pos: number, depth?: number, typesAfter?: Array<{ type: NodeType, attrs?: { [key: string]: any } | null }>): this;
+  /**
+   * Join the blocks around the given position. If depth is 2, their
+   * last and first siblings are also joined, and so on.
+   */
   join(pos: number, depth?: number, p1?: boolean): this;
-  doc: Node;
+  /**
+   * The current document (the result of applying the steps in the
+   * transform).
+   */
+  doc: ProsemirrorNode;
+  /**
+   * The steps in this transform.
+   */
   steps: Step[];
-  docs: Node[];
+  /**
+   * The documents before each of the steps.
+   */
+  docs: ProsemirrorNode[];
+  /**
+   * A mapping with the maps for each of the steps in this transform.
+   */
   mapping: Mapping;
-  before: Node;
+  /**
+   * The starting document.
+   */
+  before: ProsemirrorNode;
+  /**
+   * Apply a new step in this transform, saving the result. Throws an
+   * error when the step fails.
+   */
   step(step: Step): this;
+  /**
+   * Try to apply a step in this transformation, ignoring it if it
+   * fails. Returns the step result.
+   */
   maybeStep(step: Step): StepResult;
+  /**
+   * True when the document has been changed (when there are any
+   * steps).
+   */
   docChanged: boolean;
 }
+/**
+ * Replace a part of the document with a slice of new content.
+ */
 export class ReplaceStep extends Step {
-  constructor(from: number, to: number, slice: Slice, structure?: boolean)
+  /**
+   * The given `slice` should fit the 'gap' between `from` and
+   * `to`—the depths must line up, and the surrounding nodes must be
+   * able to be joined with the open sides of the slice. When
+   * `structure` is true, the step will fail if the content between
+   * from and to is not just a sequence of closing and then opening
+   * tokens (this is to guard against rebased replace steps
+   * overwriting something they weren't supposed to).
+   */
+  constructor(from: number, to: number, slice: Slice, structure?: boolean);
 }
+/**
+ * Replace a part of the document with a slice of content, but
+ * preserve a range of the replaced content by moving it into the
+ * slice.
+ */
 export class ReplaceAroundStep extends Step {
-  constructor(from: number, to: number, gapFrom: number, gapTo: number, slice: Slice, insert: number, structure?: boolean)
+  /**
+   * Create a replace-around step with the given range and gap.
+   * `insert` should be the point in the slice into which the content
+   * of the gap should be moved. `structure` has the same meaning as
+   * it has in the [`ReplaceStep`](#transform.ReplaceStep) class.
+   */
+  constructor(from: number, to: number, gapFrom: number, gapTo: number, slice: Slice, insert: number, structure?: boolean);
 }
-export function replaceStep(doc: Node, from: number, to?: number, slice?: Slice): Step | null | undefined;
+/**
+ * ‘Fit’ a slice into a given position in the document, producing a
+ * [step](#transform.Step) that inserts it. Will return null if
+ * there's no meaningful way to insert the slice here, or inserting it
+ * would be a no-op (an empty slice over an empty range).
+ */
+export function replaceStep(doc: ProsemirrorNode, from: number, to?: number, slice?: Slice): Step | null | void;
+/**
+ * A step object represents an atomic change. It generally applies
+ * only to the document it was created for, since the positions
+ * stored in it will only make sense for that document.
+ *
+ * New steps are defined by creating classes that extend `Step`,
+ * overriding the `apply`, `invert`, `map`, `getMap` and `fromJSON`
+ * methods, and registering your class with a unique
+ * JSON-serialization identifier using
+ * [`Step.jsonID`](#transform.Step^jsonID).
+ */
 export class Step {
-  apply(doc: Node): StepResult;
+  /**
+   * Applies this step to the given document, returning a result
+   * object that either indicates failure, if the step can not be
+   * applied to this document, or indicates success by containing a
+   * transformed document.
+   */
+  apply(doc: ProsemirrorNode): StepResult;
+  /**
+   * Get the step map that represents the changes made by this step,
+   * and which can be used to transform between positions in the old
+   * and the new document.
+   */
   getMap(): StepMap;
-  invert(doc: Node): Step;
-  map(mapping: Mappable): Step | null | undefined;
-  merge(other: Step): Step | null | undefined;
-  toJSON(): object;
-  static fromJSON(schema: Schema, json: object): Step;
+  /**
+   * Create an inverted version of this step. Needs the document as it
+   * was before the step as argument.
+   */
+  invert(doc: ProsemirrorNode): Step;
+  /**
+   * Map this step through a mappable thing, returning either a
+   * version of that step with its positions adjusted, or `null` if
+   * the step was entirely deleted by the mapping.
+   */
+  map(mapping: Mappable): Step | null | void;
+  /**
+   * Try to merge this step with another one, to be applied directly
+   * after it. Returns the merged step when possible, null if the
+   * steps can't be merged.
+   */
+  merge(other: Step): Step | null | void;
+  /**
+   * Create a JSON-serializeable representation of this step. When
+   * defining this for a custom subclass, make sure the result object
+   * includes the step type's [JSON id](#transform.Step^jsonID) under
+   * the `stepType` property.
+   */
+  toJSON(): { [key: string]: any };
+  /**
+   * Deserialize a step from its JSON representation. Will call
+   * through to the step class' own implementation of this method.
+   */
+  static fromJSON(schema: Schema, json: { [key: string]: any }): Step;
+  /**
+   * To be able to serialize steps to JSON, each step needs a string
+   * ID to attach to its JSON representation. Use this method to
+   * register an ID for your step classes. Try to pick something
+   * that's unlikely to clash with steps from other modules.
+   */
   static jsonID(id: string, stepClass: { new(...args: any[]): Step }): void;
 }
+/**
+ * The result of [applying](#transform.Step.apply) a step. Contains either a
+ * new document or a failure value.
+ */
 export class StepResult {
-  doc?: Node | null;
+  /**
+   * The transformed document.
+   */
+  doc?: ProsemirrorNode | null;
+  /**
+   * Text providing information about a failed step.
+   */
   failed?: string | null;
-  static ok(doc: Node): StepResult;
+  /**
+   * Create a successful step result.
+   */
+  static ok(doc: ProsemirrorNode): StepResult;
+  /**
+   * Create a failed step result.
+   */
   static fail(message: string): StepResult;
-  static fromReplace(doc: Node, from: number, to: number, slice: Slice): StepResult;
+  /**
+   * Call [`Node.replace`](#model.Node.replace) with the given
+   * arguments. Create a successful result if it succeeds, and a
+   * failed one if it throws a `ReplaceError`.
+   */
+  static fromReplace(doc: ProsemirrorNode, from: number, to: number, slice: Slice): StepResult;
 }
-export function liftTarget(range: NodeRange): number | null | undefined;
-export function findWrapping(range: NodeRange, nodeType: NodeType, attrs?: object): Array<{ type: NodeType, attrs?: object | null }> | null | undefined;
-export function canSplit(doc: Node, pos: number, depth?: number, typesAfter?: Array<{ type: NodeType, attrs?: object | null }>): boolean;
-export function canJoin(doc: Node, pos: number): boolean;
-export function joinPoint(doc: Node, pos: number, dir?: number): number | null | undefined;
-export function insertPoint(doc: Node, pos: number, nodeType: NodeType, attrs?: object): number | null | undefined;
+/**
+ * Try to find a target depth to which the content in the given range
+ * can be lifted. Will not go across
+ * [isolating](#model.NodeSpec.isolating) parent nodes.
+ */
+export function liftTarget(range: NodeRange): number | null | void;
+/**
+ * Try to find a valid way to wrap the content in the given range in a
+ * node of the given type. May introduce extra nodes around and inside
+ * the wrapper node, if necessary. Returns null if no valid wrapping
+ * could be found.
+ */
+export function findWrapping(range: NodeRange, nodeType: NodeType, attrs?: { [key: string]: any }): Array<{ type: NodeType, attrs?: { [key: string]: any } | null }> | null | void;
+/**
+ * Check whether splitting at the given position is allowed.
+ */
+export function canSplit(doc: ProsemirrorNode, pos: number, depth?: number, typesAfter?: Array<{ type: NodeType, attrs?: { [key: string]: any } | null }>): boolean;
+/**
+ * Test whether the blocks before and after a given position can be
+ * joined.
+ */
+export function canJoin(doc: ProsemirrorNode, pos: number): boolean;
+/**
+ * Find an ancestor of the given position that can be joined to the
+ * block before (or after if `dir` is positive). Returns the joinable
+ * point, if any.
+ */
+export function joinPoint(doc: ProsemirrorNode, pos: number, dir?: number): number | null | void;
+/**
+ * Try to find a point where a node of the given type can be inserted
+ * near `pos`, by searching up the node hierarchy when `pos` itself
+ * isn't a valid place but is at the start or end of a node. Return
+ * null if no position was found.
+ */
+export function insertPoint(doc: ProsemirrorNode, pos: number, nodeType: NodeType): number | null | void;
diff --git a/types/prosemirror-view/dom.d.ts b/types/prosemirror-view/dom.d.ts
deleted file mode 100644
index b4b02d1c24..0000000000
--- a/types/prosemirror-view/dom.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export type DOMDataTransfer = DataTransfer;
-export type DOMDocument = Document;
-export type DOMElement = HTMLElement;
-export type DOMEvent = Event;
-export type DOMFragment = DocumentFragment;
-export type DOMKeyboardEvent = KeyboardEvent;
-export type DOMMouseEvent = MouseEvent;
-export type DOMMutationRecord = MutationRecord;
-export type DOMNode = Node;
-
-export {
-  DOMDataTransfer as DataTransfer,
-  DOMDocument as Document,
-  DOMElement as Element,
-  DOMEvent as Event,
-  DOMFragment as DocumentFragment,
-  DOMKeyboardEvent as KeyboardEvent,
-  DOMMouseEvent as MouseEvent,
-  DOMMutationRecord as MutationRecord,
-  DOMNode as Node,
-};
diff --git a/types/prosemirror-view/index.d.ts b/types/prosemirror-view/index.d.ts
index bad46cd6ef..0ce2e37794 100644
--- a/types/prosemirror-view/index.d.ts
+++ b/types/prosemirror-view/index.d.ts
@@ -1,93 +1,518 @@
-// Type definitions for prosemirror-view 0.24
+// Type definitions for prosemirror-view 1.0
 // Project: https://github.com/ProseMirror/prosemirror-view
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
+//                 Tim Baumann <https://github.com/timjb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.1
 
-import { DOMParser, DOMSerializer, Node, ResolvedPos, Slice } from 'prosemirror-model';
+// IMPORTANT
+// This file was generated by https://github.com/bradleyayers/getdocs2ts. Please do not edit manually.
+// When you find an error in these declarations, fix the getdocs comment upstream or 'getdocs2ts', then regenerate.
+
+import { DOMParser, DOMSerializer, Node as ProsemirrorNode, ResolvedPos, Slice } from 'prosemirror-model';
 import { EditorState, Selection, Transaction } from 'prosemirror-state';
 import { Mapping } from 'prosemirror-transform';
-import * as dom from './dom';
 
+/**
+ * Decoration objects can be provided to the view through the
+ * [`decorations` prop](#view.EditorProps.decorations). They come in
+ * several variants—see the static members of this class for details.
+ */
 export class Decoration {
-  spec: object;
-  static widget(pos: number, dom: dom.Node, spec?: { side?: number | null, stopEvent?: ((event: Event) => boolean) | null, key?: string | null }): Decoration;
+  /**
+   * The start position of the decoration.
+   */
+  from: number;
+  /**
+   * The end position. Will be the same as `from` for [widget
+   * decorations](#view.Decoration^widget).
+   */
+  to: number;
+  /**
+   * The spec provided when creating this decoration. Can be useful
+   * if you've stored extra information in that object.
+   */
+  spec: { [key: string]: any };
+  /**
+   * Creates a widget decoration, which is a DOM node that's shown in
+   * the document at the given position.
+   */
+  static widget(pos: number, dom: Node, spec?: { side?: number | null, stopEvent?: ((event: Event) => boolean) | null, key?: string | null }): Decoration;
+  /**
+   * Creates an inline decoration, which adds the given attributes to
+   * each inline node between `from` and `to`.
+   */
   static inline(from: number, to: number, attrs: DecorationAttrs, spec?: { inclusiveStart?: boolean | null, inclusiveEnd?: boolean | null }): Decoration;
-  static node(from: number, to: number, attrs: DecorationAttrs, spec?: object): Decoration;
+  /**
+   * Creates a node decoration. `from` and `to` should point precisely
+   * before and after a node in the document. That node, and only that
+   * node, will receive the given attributes.
+   */
+  static node(from: number, to: number, attrs: DecorationAttrs, spec?: { [key: string]: any }): Decoration;
 }
+/**
+ * A set of attributes to add to a decorated node. Most properties
+ * simply directly correspond to DOM attributes of the same name,
+ * which will be set to the property's value. These are exceptions:
+ */
 export interface DecorationAttrs {
+  /**
+   * A CSS class name or a space-separated set of class names to be
+   * _added_ to the classes that the node already had.
+   */
   class?: string | null;
+  /**
+   * A string of CSS to be _added_ to the node's existing `style` property.
+   */
   style?: string | null;
+  /**
+   * When non-null, the target node is wrapped in a DOM element of
+   * this type (and the other attributes are applied to this element).
+   */
   nodeName?: string | null;
 }
+/**
+ * A collection of [decorations](#view.Decoration), organized in
+ * such a way that the drawing algorithm can efficiently use and
+ * compare them. This is a persistent data structure—it is not
+ * modified, updates create a new value.
+ */
 export class DecorationSet {
-  find(start?: number, end?: number, predicate?: ((spec: object) => boolean) | null): Decoration[];
-  map(mapping: Mapping, doc: Node, options?: { onRemove?: ((decorationSpec: object) => void) | null }): DecorationSet;
-  add(doc: Node, decorations: Decoration[]): DecorationSet;
+  /**
+   * Find all decorations in this set which touch the given range
+   * (including decorations that start or end directly at the
+   * boundaries) and match the given predicate on their spec. When
+   * `start` and `end` are omitted, all decorations in the set are
+   * considered. When `predicate` isn't given, all decorations are
+   * asssumed to match.
+   */
+  find(start?: number, end?: number, predicate?: (spec: { [key: string]: any }) => boolean): Decoration[];
+  /**
+   * Map the set of decorations in response to a change in the
+   * document.
+   */
+  map(mapping: Mapping, doc: ProsemirrorNode, options?: { onRemove?: ((decorationSpec: { [key: string]: any }) => void) | null }): DecorationSet;
+  /**
+   * Add the given array of decorations to the ones in the set,
+   * producing a new set. Needs access to the current document to
+   * create the appropriate tree structure.
+   */
+  add(doc: ProsemirrorNode, decorations: Decoration[]): DecorationSet;
+  /**
+   * Create a new set that contains the decorations in this set, minus
+   * the ones in the given array.
+   */
   remove(decorations: Decoration[]): DecorationSet;
-  static create(doc: Node, decorations: Decoration[]): DecorationSet;
+  /**
+   * Create a set of decorations, using the structure of the given
+   * document.
+   */
+  static create(doc: ProsemirrorNode, decorations: Decoration[]): DecorationSet;
+  /**
+   * The empty set of decorations.
+   */
   static empty: DecorationSet;
 }
+/**
+ * An editor view manages the DOM structure that represents an
+ * editable document. Its state and behavior are determined by its
+ * [props](#view.DirectEditorProps).
+ */
 export class EditorView {
-  constructor(place: dom.Node | ((p: dom.Node) => void) | { mount: dom.Node } | undefined, props: EditorProps)
+  /**
+   * Create a view. `place` may be a DOM node that the editor should
+   * be appended to, a function that will place it into the document,
+   * or an object whose `mount` property holds the node to use as the
+   * document container. If it is `null`, the editor will not be added
+   * to the document.
+   */
+  constructor(place: Node | ((p: Node) => void) | { mount: Node } | undefined, props: DirectEditorProps);
+  /**
+   * The view's current [state](#state.EditorState).
+   */
   state: EditorState;
+  /**
+   * An editable DOM node containing the document. (You probably
+   * should not directly interfere with its content.)
+   */
   dom: Element;
-  props: EditorProps;
-  update(props: EditorProps): void;
-  setProps(props: EditorProps): void;
+  /**
+   * When editor content is being dragged, this object contains
+   * information about the dragged slice and whether it is being
+   * copied or moved. At any other time, it is null.
+   */
+  dragging?: { slice: Slice, move: boolean } | null;
+  /**
+   * The view's current [props](#view.EditorProps).
+   */
+  props: DirectEditorProps;
+  /**
+   * Update the view's props. Will immediately cause an update to
+   * the DOM.
+   */
+  update(props: DirectEditorProps): void;
+  /**
+   * Update the view by updating existing props object with the object
+   * given as argument. Equivalent to `view.update(Object.assign({},
+   * view.props, props))`.
+   */
+  setProps(props: DirectEditorProps): void;
+  /**
+   * Update the editor's `state` prop, without touching any of the
+   * other props.
+   */
   updateState(state: EditorState): void;
+  /**
+   * Goes over the values of a prop, first those provided directly,
+   * then those from plugins (in order), and calls `f` every time a
+   * non-undefined value is found. When `f` returns a truthy value,
+   * that is immediately returned. When `f` isn't provided, it is
+   * treated as the identity function (the prop value is returned
+   * directly).
+   */
+  someProp(propName: string, f?: (prop: any) => any): any;
+  /**
+   * Query whether the view has focus.
+   */
   hasFocus(): boolean;
-  someProp(propName: string, f: (prop: any) => any): any;
+  /**
+   * Focus the editor.
+   */
   focus(): void;
+  /**
+   * Get the document root in which the editor exists. This will
+   * usually be the top-level `document`, but might be a [shadow
+   * DOM](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Shadow_DOM)
+   * root if the editor is inside one.
+   */
   root: Document | DocumentFragment;
-  posAtCoords(coords: { left: number, top: number }): { pos: number, inside: number } | null | undefined;
+  /**
+   * Given a pair of viewport coordinates, return the document
+   * position that corresponds to them. May return null if the given
+   * coordinates aren't inside of the visible editor. When an object
+   * is returned, its `pos` property is the position nearest to the
+   * coordinates, and its `inside` property holds the position of the
+   * inner node that the position falls inside of, or -1 if it is at
+   * the top level, not in any node.
+   */
+  posAtCoords(coords: { left: number, top: number }): { pos: number, inside: number } | null | void;
+  /**
+   * Returns the viewport rectangle at a given document position. `left`
+   * and `right` will be the same number, as this returns a flat
+   * cursor-ish rectangle.
+   */
   coordsAtPos(pos: number): { left: number, right: number, top: number, bottom: number };
-  domAtPos(pos: number): { node: dom.Node; offset: number };
-  endOfTextblock(dir: 'up' | 'down' | 'left' | 'right' | 'forward' | 'backward', state?: EditorState): boolean;
+  /**
+   * Find the DOM position that corresponds to the given document
+   * position. Note that you should **not** mutate the editor's
+   * internal DOM, only inspect it (and even that is usually not
+   * necessary).
+   */
+  domAtPos(pos: number): { node: Node, offset: number };
+  /**
+   * Find out whether the selection is at the end of a textblock when
+   * moving in a given direction. When, for example, given `"left"`,
+   * it will return true if moving left from the current cursor
+   * position would leave that position's parent textblock. Will apply
+   * to the view's current state by default, but it is possible to
+   * pass a different state.
+   */
+  endOfTextblock(dir: "up" | "down" | "left" | "right" | "forward" | "backward", state?: EditorState): boolean;
+  /**
+   * Removes the editor from the DOM and destroys all [node
+   * views](#view.NodeView).
+   */
   destroy(): void;
+  /**
+   * Dispatch a transaction. Will call
+   * [`dispatchTransaction`](#view.DirectEditorProps.dispatchTransaction)
+   * when given, and otherwise defaults to applying the transaction to
+   * the current state and calling
+   * [`updateState`](#view.EditorView.updateState) with the result.
+   * This method is bound to the view instance, so that it can be
+   * easily passed around.
+   */
   dispatch(tr: Transaction): void;
 }
+/**
+ * Props are configuration values that can be passed to an editor view
+ * or included in a plugin. This interface lists the supported props.
+ *
+ * The various event-handling functions may all return `true` to
+ * indicate that they handled the given event. The view will then take
+ * care to call `preventDefault` on the event, except with
+ * `handleDOMEvents`, where the handler itself is responsible for that.
+ *
+ * How a prop is resolved depends on the prop. Handler functions are
+ * called one at a time, starting with the base props and then
+ * searching through the plugins (in order of appearance) until one of
+ * them returns true. For some props, the first plugin that yields a
+ * value gets precedence.
+ */
 export interface EditorProps {
-  state: EditorState;
-  dispatchTransaction?: ((tr: Transaction) => void) | null;
+  /**
+   * Can be an object mapping DOM event type names to functions that
+   * handle them. Such functions will be called before any handling
+   * ProseMirror does of events fired on the editable DOM element.
+   * Contrary to the other event handling props, when returning true
+   * from such a function, you are responsible for calling
+   * `preventDefault` yourself (or not, if you want to allow the
+   * default behavior).
+   */
   handleDOMEvents?: { [name: string]: (view: EditorView, event: Event) => boolean } | null;
+  /**
+   * Called when the editor receives a `keydown` event.
+   */
   handleKeyDown?: ((view: EditorView, event: KeyboardEvent) => boolean) | null;
+  /**
+   * Handler for `keypress` events.
+   */
   handleKeyPress?: ((view: EditorView, event: KeyboardEvent) => boolean) | null;
+  /**
+   * Whenever the user directly input text, this handler is called
+   * before the input is applied. If it returns `true`, the default
+   * behavior of actually inserting the text is suppressed.
+   */
   handleTextInput?: ((view: EditorView, from: number, to: number, text: string) => boolean) | null;
-  handleClickOn?: ((view: EditorView, pos: number, node: Node, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  /**
+   * Called for each node around a click, from the inside out. The
+   * `direct` flag will be true for the inner node.
+   */
+  handleClickOn?: ((view: EditorView, pos: number, node: ProsemirrorNode, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  /**
+   * Called when the editor is clicked, after `handleClickOn` handlers
+   * have been called.
+   */
   handleClick?: ((view: EditorView, pos: number, event: MouseEvent) => boolean) | null;
-  handleDoubleClickOn?: ((view: EditorView, pos: number, node: Node, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  /**
+   * Called for each node around a double click.
+   */
+  handleDoubleClickOn?: ((view: EditorView, pos: number, node: ProsemirrorNode, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  /**
+   * Called when the editor is double-clicked, after `handleDoubleClickOn`.
+   */
   handleDoubleClick?: ((view: EditorView, pos: number, event: MouseEvent) => boolean) | null;
-  handleTripleClickOn?: ((view: EditorView, pos: number, node: Node, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  /**
+   * Called for each node around a triple click.
+   */
+  handleTripleClickOn?: ((view: EditorView, pos: number, node: ProsemirrorNode, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  /**
+   * Called when the editor is triple-clicked, after `handleTripleClickOn`.
+   */
   handleTripleClick?: ((view: EditorView, pos: number, event: MouseEvent) => boolean) | null;
+  /**
+   * Can be used to override the behavior of pasting. `slice` is the
+   * pasted content parsed by the editor, but you can directly access
+   * the event to get at the raw content.
+   */
   handlePaste?: ((view: EditorView, event: Event, slice: Slice) => boolean) | null;
+  /**
+   * Called when something is dropped on the editor. `moved` will be
+   * true if this drop moves from the current selection (which should
+   * thus be deleted).
+   */
   handleDrop?: ((view: EditorView, event: Event, slice: Slice, moved: boolean) => boolean) | null;
+  /**
+   * Called when the view, after updating its state, tries to scroll
+   * the selection into view. A handler function may return false to
+   * indicate that it did not handle the scrolling and further
+   * handlers or the default behavior should be tried.
+   */
   handleScrollToSelection?: ((view: EditorView) => boolean) | null;
-  createSelectionBetween?: ((view: EditorView, anchor: ResolvedPos, head: ResolvedPos) => Selection | null | undefined) | null;
+  /**
+   * Can be used to override the way a selection is created when
+   * reading a DOM selection between the given anchor and head.
+   */
+  createSelectionBetween?: ((view: EditorView, anchor: ResolvedPos, head: ResolvedPos) => Selection | null | void) | null;
+  /**
+   * The [parser](#model.DOMParser) to use when reading editor changes
+   * from the DOM. Defaults to calling
+   * [`DOMParser.fromSchema`](#model.DOMParser^fromSchema) on the
+   * editor's schema.
+   */
   domParser?: DOMParser | null;
+  /**
+   * Can be used to transform pasted HTML text, _before_ it is parsed,
+   * for example to clean it up.
+   */
+  transformPastedHTML?: ((html: string) => string) | null;
+  /**
+   * The [parser](#model.DOMParser) to use when reading content from
+   * the clipboard. When not given, the value of the
+   * [`domParser`](#view.EditorProps.domParser) prop is used.
+   */
   clipboardParser?: DOMParser | null;
-  clipboardTextParser?: ((p: string, $context: ResolvedPos) => Slice) | null;
+  /**
+   * Transform pasted plain text.
+   */
+  transformPastedText?: ((text: string) => string) | null;
+  /**
+   * A function to parse text from the clipboard into a document
+   * slice. Called after
+   * [`transformPastedText`](#view.EditorProps.transformPastedText).
+   * The default behavior is to split the text into lines, wrap them
+   * in `<p>` tags, and call
+   * [`clipboardParser`](#view.EditorProps.clipboardParser) on it.
+   */
+  clipboardTextParser?: ((text: string, $context: ResolvedPos) => Slice) | null;
+  /**
+   * Can be used to transform pasted content before it is applied to
+   * the document.
+   */
   transformPasted?: ((p: Slice) => Slice) | null;
-  transformPastedHTML?: ((p: string) => string) | null;
-  transformPastedText?: ((p: string) => string) | null;
-  nodeViews?: { [name: string]: (node: Node, view: EditorView, getPos: () => number, decorations: Decoration[]) => NodeView } | null;
+  /**
+   * Allows you to pass custom rendering and behavior logic for nodes
+   * and marks. Should map node and mark names to constructor
+   * functions that produce a [`NodeView`](#view.NodeView) object
+   * implementing the node's display behavior. `getPos` is a function
+   * that can be called to get the node's current position, which can
+   * be useful when creating transactions to update it.
+   *
+   * `decorations` is an array of node or inline decorations that are
+   * active around the node. They are automatically drawn in the
+   * normal way, and you will usually just want to ignore this, but
+   * they can also be used as a way to provide context information to
+   * the node view without adding it to the document itself.
+   */
+  nodeViews?: { [name: string]: (node: ProsemirrorNode, view: EditorView, getPos: () => number, decorations: Decoration[]) => NodeView } | null;
+  /**
+   * The DOM serializer to use when putting content onto the
+   * clipboard. If not given, the result of
+   * [`DOMSerializer.fromSchema`](#model.DOMSerializer^fromSchema)
+   * will be used.
+   */
   clipboardSerializer?: DOMSerializer | null;
-  clipboardTextSerializer?: ((slice: Slice) => string) | null;
-  decorations?: ((p: EditorState) => DecorationSet | null | undefined) | null;
-  editable?: ((p: EditorState) => boolean) | null;
-  attributes?: { [name: string]: string } | ((p: EditorState) => { [name: string]: string } | null | undefined) | null;
+  /**
+   * A function that will be called to get the text for the current
+   * selection when copying text to the clipboard. By default, the
+   * editor will use [`textBetween`](#model.Node.textBetween) on the
+   * selected range.
+   */
+  clipboardTextSerializer?: ((p: Slice) => string) | null;
+  /**
+   * A set of [document decorations](#view.Decoration) to show in the
+   * view.
+   */
+  decorations?: ((state: EditorState) => DecorationSet | null | void) | null;
+  /**
+   * When this returns false, the content of the view is not directly
+   * editable.
+   */
+  editable?: ((state: EditorState) => boolean) | null;
+  /**
+   * Control the DOM attributes of the editable element. May be either
+   * an object or a function going from an editor state to an object.
+   * By default, the element will get a class `"ProseMirror"`, and
+   * will have its `contentEditable` attribute determined by the
+   * [`editable` prop](#view.EditorProps.editable). Additional classes
+   * provided here will be added to the class. For other attributes,
+   * the value provided first (as in
+   * [`someProp`](#view.EditorView.someProp)) will be used.
+   */
+  attributes?: { [name: string]: string } | ((p: EditorState) => { [name: string]: string } | null | void) | null;
+  /**
+   * Determines the distance (in pixels) between the cursor and the
+   * end of the visible viewport at which point, when scrolling the
+   * cursor into view, scrolling takes place. Defaults to 0.
+   */
   scrollThreshold?: number | null;
+  /**
+   * Determines the extra space (in pixels) that is left above or
+   * below the cursor when it is scrolled into view. Defaults to 5.
+   */
   scrollMargin?: number | null;
 }
+/**
+ * The props object given directly to the editor view supports two
+ * fields that can't be used in plugins:
+ */
+export interface DirectEditorProps extends EditorProps {
+  /**
+   * The current state of the editor.
+   */
+  state: EditorState;
+  /**
+   * The callback over which to send transactions (state updates)
+   * produced by the view. If you specify this, you probably want to
+   * make sure this ends up calling the view's
+   * [`updateState`](#view.EditorView.updateState) method with a new
+   * state that has the transaction
+   * [applied](#state.EditorState.apply).
+   */
+  dispatchTransaction?: ((tr: Transaction) => void) | null;
+}
+/**
+ * By default, document nodes are rendered using the result of the
+ * [`toDOM`](#model.NodeSpec.toDOM) method of their spec, and managed
+ * entirely by the editor. For some use cases, such as embedded
+ * node-specific editing interfaces, you want more control over
+ * the behavior of a node's in-editor representation, and need to
+ * [define](#view.EditorProps.nodeViews) a custom node view.
+ *
+ * Objects returned as node views must conform to this interface.
+ */
 export interface NodeView {
-  dom?: dom.Node | null;
-  contentDOM?: dom.Node | null;
-  update?: ((node: Node, decorations: Decoration[]) => boolean) | null;
+  /**
+   * The outer DOM node that represents the document node. When not
+   * given, the default strategy is used to create a DOM node.
+   */
+  dom?: Node | null;
+  /**
+   * The DOM node that should hold the node's content. Only meaningful
+   * if the node view also defines a `dom` property and if its node
+   * type is not a leaf node type. When this is present, ProseMirror
+   * will take care of rendering the node's children into it. When it
+   * is not present, the node view itself is responsible for rendering
+   * (or deciding not to render) its child nodes.
+   */
+  contentDOM?: Node | null;
+  /**
+   * When given, this will be called when the view is updating itself.
+   * It will be given a node (possibly of a different type), and an
+   * array of active decorations (which are automatically drawn, and
+   * the node view may ignore if it isn't interested in them), and
+   * should return true if it was able to update to that node, and
+   * false otherwise. If the node view has a `contentDOM` property (or
+   * no `dom` property), updating its child nodes will be handled by
+   * ProseMirror.
+   */
+  update?: ((node: ProsemirrorNode, decorations: Decoration[]) => boolean) | null;
+  /**
+   * Can be used to override the way the node's selected status (as a
+   * node selection) is displayed.
+   */
   selectNode?: (() => void) | null;
+  /**
+   * When defining a `selectNode` method, you should also provide a
+   * `deselectNode` method to remove the effect again.
+   */
   deselectNode?: (() => void) | null;
+  /**
+   * This will be called to handle setting the selection inside the
+   * node. The `anchor` and `head` positions are relative to the start
+   * of the node. By default, a DOM selection will be created between
+   * the DOM positions corresponding to those positions, but if you
+   * override it you can do something else.
+   */
   setSelection?: ((anchor: number, head: number, root: Document) => void) | null;
+  /**
+   * Can be used to prevent the editor view from trying to handle some
+   * or all DOM events that bubble up from the node view. Events for
+   * which this returns true are not handled by the editor.
+   */
   stopEvent?: ((event: Event) => boolean) | null;
+  /**
+   * Called when a DOM
+   * [mutation](https://developer.mozilla.org/en-US/docs/Web/API/MutationObserver)
+   * happens within the view. Return false if the editor should
+   * re-parse the range around the mutation, true if it can safely be
+   * ignored.
+   */
   ignoreMutation?: ((p: MutationRecord) => boolean) | null;
+  /**
+   * Called when the node view is removed from the editor or the whole
+   * editor is destroyed.
+   */
   destroy?: (() => void) | null;
 }
diff --git a/types/protobufjs/index.d.ts b/types/protobufjs/index.d.ts
deleted file mode 100644
index dd22beee44..0000000000
--- a/types/protobufjs/index.d.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-// Type definitions for ProtoBuf.js 5.0.1
-// Project: https://github.com/dcodeIO/ProtoBuf.js
-// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="bytebuffer" />
-/// <reference types="node" />
-
-declare namespace ProtoBuf {
-    // ==========
-    // protobufjs/src/ProtoBuf.js
-
-    var Builder: Builder;
-    var Long: LongStatic;
-    var DotProto: DotProto;
-    var Reflect: Reflect;
-    var Util: Util;
-    var convertFieldsToCamelCase: boolean;
-
-    // var Lang: Lang; TODO: implement interface Lang
-
-    export function loadJson(json: string, builder?: ProtoBuilder | string | {},
-        filename?: string | {}): ProtoBuilder;
-
-    export function loadJsonFile(filename: string | {},
-        callback?: (error: any, builder: ProtoBuilder) => void,
-        builder?: ProtoBuilder): ProtoBuilder;
-
-    export function loadProto(proto: string, builder?: ProtoBuilder | string | {},
-        filename?: string | {}): ProtoBuilder;
-
-    export function loadProtoFile(filePath: string | {},
-        callback?: (error: any, builder: ProtoBuilder) => void,
-        builder?: ProtoBuilder): ProtoBuilder;
-
-    export function newBuilder(options?: {[key: string]: any}): ProtoBuilder;
-
-    export interface LongStatic {
-      new(low?: number, high?: number, unsigned?:boolean): Long;
-
-      MAX_UNSIGNED_VALUE: Long;
-      MAX_VALUE: Long;
-      MIN_VALUE: Long;
-      NEG_ONE: Long;
-      ONE: Long;
-      UONE: Long;
-      UZERO: Long;
-      ZERO: 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;
-    }
-
-    // Based on https://github.com/dcodeIO/Long.js and https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/long/long.d.ts
-    export interface Long {
-      high: number;
-      low: number;
-      unsigned :boolean;
-
-      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;
-    }
-
-    // ==========
-    // protobufjs/src/ProtoBuf/Builder.js
-
-    export interface Builder {
-        new(options?: {[key: string]: any}): ProtoBuilder;
-        Message: Message;
-        Service: Service;
-        isValidMessage(def: {[key: string]: any}): boolean;
-        isValidMessageField(def: {[key: string]: any}): boolean;
-        isValidEnum(def: {[key: string]: any}): boolean;
-        isValidService(def: {[key: string]: any}): boolean;
-        isValidExtend(def: {[key: string]: any}): boolean;
-    }
-
-    /**
-     * TODO: Confirm that message needs no further implementation
-     */
-    export interface Message {
-        new(values?: {[key: string]: any}, var_args?: string[]): Message;
-        $add(key: string, value: any, noAssert?: boolean): Message;
-        $get<T>(key: string): T;
-        $set(key: string | {[key: string]: any}, value?: any | boolean, noAssert?: boolean): void;
-        add(key: string, value: any, noAssert?: boolean): Message;
-        calculate(): number;
-        encode(buffer?: ByteBuffer | boolean, noVerify?: boolean): ByteBuffer;
-        encode64(): string;
-        encodeAB(): ArrayBuffer;
-        encodeNB(): Buffer;
-        encodeHex(): string;
-        encodeJSON(): string;
-        encodeDelimited(buffer?: ByteBuffer | boolean, noVerify?: boolean): ByteBuffer;
-        get<T>(key: string, noAssert?: boolean): T;
-        set(key: string | {[key: string]: any}, value?: any | boolean, noAssert?: boolean): void;
-        toArrayBuffer(): ArrayBuffer;
-        toBase64(): string;
-        toBuffer(): Buffer;
-        toHex(): string;
-        toRaw(binaryAsBase64?: boolean, longsAsStrings?: boolean): {[key: string]: any};
-        toString(): string;
-        [field: string]: any;
-  	}
-
-    /**
-     * TODO: Implement service interface
-     */
-    export interface Service {
-        new(rpcImpl?: Function): Service;
-    }
-
-
-    // ==========
-    // meta objects for constructing protobufs
-
-    export interface ProtoBuilder {
-        ns: ReflectNamespace;
-        ptr: ReflectNamespace;
-        resolved: boolean;
-        result: ProtoBuf;
-        files: string[];
-        importRoot: string;
-        options: {[key: string]: any};
-        syntax: string;
-        reset(): void;
-        define(pkg: string, options?: {[key: string]: any}): ProtoBuilder;
-        create(defs?: {[key: string]: any}[]): ProtoBuilder;
-        resolveAll(): void;
-        build(path?: string | [string]): MetaMessage<Message>;
-   	    build<T>(path?: string | [string]): MetaMessage<T>;
-        lookup(path?: string): ReflectT;
-  	}
-
-    export interface ProtoBuf {
-        [package: string]: {[key: string]: MetaMessage<Message> | any};
-    }
-
-    export interface MetaMessage<T> {
-        new(values?: {[key: string]: any}, var_args?: string[]): T & Message;
-        decode(buffer: ArrayBuffer | ByteBuffer | Buffer | string, length?: number | string, enc?: string): T & Message;
-        decodeDelimited(buffer: ByteBuffer | ArrayBuffer | Buffer | string, enc?: string): T & Message;
-        decode64(str: string): T & Message;
-        decodeHex(str: string): T & Message;
-        decodeJSON(str: string): T & Message;
-    }
-
-    // ==========
-    // protobufjs/src/ProtoBuf/DotProto.js
-
-    export interface DotProto {
-        Parser: Parser;
-        Tokenizer: Tokenizer;
-    }
-
-    export interface Parser {
-        new(proto: string): Parser;
-        tn: Tokenizer;
-        parse(): MetaProto;
-        toString(): string;
-    }
-
-    export interface Tokenizer {
-        new(proto: string): Tokenizer;
-        source: string;
-        index: number;
-        line: number;
-        stack: string[];
-        readingString: boolean;
-        stringEndsWith: string;
-        next(): string;
-        peek(): string;
-        toString(): string;
-    }
-
-    // ==========
-    // proto meta information returned by the Parser
-
-    export interface MetaProto {
-        package: string;
-        messages: ProtoMessage[];
-        enums: ProtoEnum[];
-        imports: string[];
-        options: {[key: string]: any};
-        services: ProtoService[];
-    }
-
-    export interface ProtoEnum {
-        name: string;
-        values: ProtoEnumValue[];
-        options: {[key: string]: any};
-    }
-
-    export interface ProtoEnumValue {
-        name: string;
-        id: string;
-    }
-
-    export interface ProtoField {
-        rule: string;
-        options: {[key: string]: any};
-        type: string;
-        name: string;
-        id: number;
-        oneof?: string;
-    }
-
-    export interface ProtoMessage {
-        name: string;
-        isGroup?: boolean;
-        fields: ProtoField[];
-        enums: ProtoEnum[];
-        messages: ProtoMessage[];
-        options: {[key: string]: any};
-        oneofs: {[key: string]:number[]};
-    }
-
-    export interface ProtoRpcService {
-        request: string;
-        response: string;
-        options: {[key: string]: any};
-    }
-
-    export interface ProtoService {
-        name: string;
-        rpc: {[key: string]:ProtoRpcService};
-        options: {[key: string]: any};
-    }
-
-    // ==========
-    // protobufjs/src/ProtoBuf/Util.js
-
-    export interface Util {
-        IS_NODE: boolean
-        fetch(path: string, callback?: (data: string) => any): string;
-        toCamelCase(str: string): string;
-        XHR(): XMLHttpRequest;
-    }
-
-    // ==========
-    // protobufjs/src/ProtoBuf/Reflect.js
-
-    export interface Reflect {
-        T: ReflectT;
-        Namespace: ReflectNamespace;
-        Message: ReflectMessage;
-        Enum: ReflectEnum;
-        Extension: ReflectExtension;
-        Service: ReflectService;
-    }
-
-    export interface ReflectT {
-        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string): ReflectT;
-        builder: ProtoBuilder;
-        parent: ReflectT;
-        name: string;
-        fqn(): string;
-        toString(includeClass?: boolean): string;
-    }
-
-    export interface ReflectNamespace extends ReflectT {
-        new(builder?: ProtoBuilder, parent?: ReflectNamespace, name?: string,
-            options?: {[key: string]: any}): ReflectNamespace;
-        className: string;
-        children: ReflectT[];
-        options: {[key: string]: any};
-        syntax: string;
-        getChildren(type?: ReflectT): ReflectT[];
-        addChild(child: ReflectT): void;
-        getChild(nameOrId?: string | number): ReflectT;
-        resolve(qn: string, excludeFields?: boolean): ReflectNamespace;
-        build(): ProtoBuf;
-        buildOpt(): {[key: string]: any};
-        getOption(name?: string): any;
-    }
-
-    export interface ReflectMessage extends ReflectNamespace {
-        new(builder?: ProtoBuilder, parent?: ReflectNamespace, name?: string,
-            options?: {[key: string]: any}, isGroup?: boolean): ReflectMessage;
-        Field: ReflectField; // NOTE: only for new ProtoBuf.Reflect.Message.Field();
-        ExtensionField: ReflectExtensionField; // NOTE: only for
-                                          // new ProtoBuf.Reflect.Message.ExtensionField();
-        OneOf: ReflectOneOf; // NOTE: only for new ProtoBuf.Reflect.Message.OneOf();
-        extensions: number[];
-        clazz(): MetaMessage<Message>;
-        isGroup: boolean;
-        build(rebuild?: boolean): MetaMessage<Message>|any;
-        build<T>(rebuild?: boolean): MetaMessage<T>|any;
-        encode(message: Message, buffer: Buffer, noVerify?: boolean): Buffer;
-        calculate(message: Message): number;
-        decode(buffer: Buffer, length?: number, expectedGroupEndId?: number): Message;
-    }
-
-    export interface ReflectEnum extends ReflectNamespace {
-        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string,
-            options?: {[key: string]: any}): ReflectEnum;
-        Value: ReflectValue; // NOTE: only for new ProtoBuf.Reflect.Enum.Value();
-        object: {[key: string]:number};
-        build(): {[key: string]: any};
-    }
-
-    export interface ReflectExtension extends ReflectT {
-        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string,
-            field?: ReflectField): ReflectExtension;
-        field: ReflectField;
-    }
-
-    export interface ReflectService extends ReflectNamespace {
-        new(): ReflectService;
-        Method: ReflectMethod; // NOTE: only for new ProtoBuf.Reflect.Service.Method();
-        RPCMethod: ReflectRPCMethod; // NOTE: only for new ProtoBuf.Reflect.Service.RPCMethod();
-        clazz(): Function;
-        build(rebuild?: boolean): Function|any;
-    }
-
-    // TODO: check that the runtime instance of this type reflects this definition
-    export interface ReflectField extends ReflectT {
-        new(builder: ProtoBuilder, message: ReflectMessage, rule: string, type: string,
-            name: string, id: number, options: {[key: string]: any}, oneof: ReflectOneOf): ReflectField;
-        className: string;
-        required: boolean;
-        repeated: boolean;
-        type: string | WireTuple;
-        resolvedType: ReflectT;
-        id: number;
-        options: {[key: string]: any};
-        defaultValue: any;
-        oneof: ReflectOneOf;
-        originalName: string;
-        build(): {[key: string]: any};
-        mkLong(value: any, unsigned?: boolean): number;
-        verifyValue(value: any, skipRepeated?: boolean): any;
-        encode(value: any, buffer: Buffer): Buffer;
-        encodeValue(value: any, buffer: Buffer): Buffer;
-        calculate(value: any): number;
-        calculateValue(value: any): number;
-        decode(wireType: number, buffer: Buffer, skipRepeated?: boolean): any;
-    }
-
-    export interface WireTuple {
-      name: string;
-      wireType: number;
-    }
-
-    // TODO: check that the runtime instance of this type reflects this definition
-    export interface ReflectExtensionField extends ReflectField {
-        new(builder: ProtoBuilder, message: ReflectMessage, rule: string, type: string,
-            name: string, id: number, options: {[key: string]: any}): ReflectExtensionField;
-        extension: ReflectExtension;
-    }
-
-    export interface ReflectOneOf extends ReflectT {
-        new(builder?: ProtoBuilder, message?: ReflectMessage, name?: string): ReflectOneOf;
-        fields: ReflectField[];
-    }
-
-    export interface ReflectValue extends ReflectT {
-        new(builder?: ProtoBuilder, enm?: ReflectEnum, name?: string, id?: number): ReflectValue;
-        className: string;
-        id: number;
-    }
-
-    export interface ReflectMethod extends ReflectT {
-        new(builder?: ProtoBuilder, svc?: ReflectService, name?: string,
-            options?: {[key: string]: any}): ReflectMethod;
-        className: string;
-        options: {[key: string]: any};
-        buildOpt(): {[key: string]: any};
-    }
-
-    export interface ReflectRPCMethod extends ReflectMethod {
-        new(builder?: ProtoBuilder, svc?: ReflectService, name?: string, request?: string,
-            response?: string, options?: {[key: string]: any}): ReflectRPCMethod;
-        requestName: string;
-        responseName: string;
-        resolvedRequestType: ReflectMessage;
-        resolvedResponseType: ReflectMessage;
-    }
-
-}
-
-declare module "protobufjs" {
-    export = ProtoBuf;
-}
-
-declare module "protobufjs/dist/protobuf-light" {
-    export = ProtoBuf;
-}
diff --git a/types/protobufjs/protobufjs-tests.ts b/types/protobufjs/protobufjs-tests.ts
deleted file mode 100644
index eccb69a3c2..0000000000
--- a/types/protobufjs/protobufjs-tests.ts
+++ /dev/null
@@ -1,421 +0,0 @@
-/// <reference types="chai" />
-
-
-var assert = require('chai').assert;
-var readFileSync = require('fs').readFileSync;
-import ProtoBuf = require("protobufjs");
-
-function testProtoBufJs() {
-    assert.ok("Builder" in ProtoBuf, "ProtoBuf should contain property Builder");
-    assert.ok("ByteBuffer" in ProtoBuf, "ProtoBuf should contain property ByteBuffer");
-    assert.ok("DotProto" in ProtoBuf, "ProtoBuf should contain property DotProto");
-    assert.ok("Reflect" in ProtoBuf, "ProtoBuf should contain property Reflect");
-    assert.ok("loadJson" in ProtoBuf, "ProtoBuf should contain property loadJson");
-    assert.ok("loadJsonFile" in ProtoBuf, "ProtoBuf should contain property loadJsonFile");
-    assert.ok("loadProto" in ProtoBuf, "ProtoBuf should contain property loadProto");
-    assert.ok("loadProtoFile" in ProtoBuf, "ProtoBuf should contain property loadProtoFile");
-    assert.ok("newBuilder" in ProtoBuf, "ProtoBuf should contain property newBuilder");
-
-    var jsonProto: ProtoBuf.ProtoBuilder = ProtoBuf.loadJson(readFileSync("test.json",
-        {"encoding": "utf8"}));
-    assertIsProtoBuilder(jsonProto, "loadJson");
-
-    var jsonFileProto: ProtoBuf.ProtoBuilder = ProtoBuf.loadJsonFile("test.json");
-    assertIsProtoBuilder(jsonFileProto, "loadJsonFile");
-
-    ProtoBuf.loadJsonFile("test.json", (error: any, builder: ProtoBuf.ProtoBuilder) => {
-        assertIsProtoBuilder(builder, "loadJsonFile callback");
-      });
-
-    var proto: ProtoBuf.ProtoBuilder = ProtoBuf.loadProto(readFileSync("test.proto",
-        {"encoding": "utf8"}));
-    assertIsProtoBuilder(proto, "loadProto");
-
-    var protoFile: ProtoBuf.ProtoBuilder = ProtoBuf.loadProtoFile("test.proto");
-    assertIsProtoBuilder(protoFile, "loadProtoFile");
-
-    ProtoBuf.loadProtoFile("test.proto", (error: any, builder: ProtoBuf.ProtoBuilder) => {
-        assertIsProtoBuilder(builder, "loadProtoFile callback");
-      });
-
-     var newBuilder: ProtoBuf.ProtoBuilder = ProtoBuf.newBuilder();
-     assertIsProtoBuilder(newBuilder, "newBuilder");
-
-     assertIsNamespace(protoFile.ns, "protoFile.ns");
-     assertIsNamespace(protoFile.ptr, "protoFile.ptr");
-
-     assertIsMetaMessage<any>(protoFile.build(), "protoFile.build()");
-     assertIsProtoBuf(protoFile.result, "protoFile.result");
-
-     assertIsProtoBuilder(protoFile.create(), "protoFile.create()");
-     assertIsProtoBuilder(protoFile.define("js"), "protoFile.define()");
-
-     assertIsT(protoFile.lookup(), "protoFile.lookup()");
-}
-
-function testBuilderJs() {
-    var Builder: ProtoBuf.Builder = ProtoBuf.Builder;
-    assertIsBuilder(Builder, "Builder");
-
-    var newBuilder: ProtoBuf.ProtoBuilder = new ProtoBuf.Builder();
-    assertIsProtoBuilder(newBuilder, "new Builder()");
-
-    var Message: ProtoBuf.Message = Builder.Message;
-    var Service: ProtoBuf.Service = Builder.Service;
-}
-
-function testDotProtoJs() {
-    var DotProto: ProtoBuf.DotProto = ProtoBuf.DotProto;
-    assertIsDotProto(DotProto, "DotProto");
-}
-
-function testReflectJs() {
-    var Reflect: ProtoBuf.Reflect = ProtoBuf.Reflect;
-    assertIsReflect(Reflect, "Reflect");
-}
-
-function assertIsProtoBuilder(pb: ProtoBuf.ProtoBuilder, name: string) {
-    if (pb != null && pb != undefined) {
-        assert.ok("ns" in pb, name + " should contain property ns");
-        assert.ok("ptr" in pb, name + " should contain property ptr");
-        assert.ok("resolved" in pb, name + " should contain property resolved");
-        assert.ok("result" in pb, name + " should contain property result");
-        assert.ok("files" in pb, name + " should contain property files");
-        assert.ok("importRoot" in pb, name + " should contain property importRoot");
-        assert.ok("options" in pb, name + " should contain property options");
-        assert.ok("reset" in pb, name + " should contain property reset");
-        assert.ok("define" in pb, name + " should contain property define");
-        assert.ok("create" in pb, name + " should contain property create");
-        assert.ok("resolveAll" in pb, name + " should contain property resolveAll");
-        assert.ok("build" in pb, name + " should contain property build");
-        assert.ok("lookup" in pb, name + " should contain property lookup");
-        assert.ok("syntax" in pb, name + " should contain property syntax");
-    }
-}
-
-function assertIsBuilder(b: ProtoBuf.Builder, name: string) {
-    assert.ok("Message" in b, name + " should contain property Message");
-    assert.ok("Service" in b, name + " should contain property Service");
-    assert.ok("isValidMessage" in b, name + " should contain property isValidMessage");
-    assert.ok("isValidMessageField" in b, name + " should contain property isValidMessageField");
-    assert.ok("isValidEnum" in b, name + " should contain property isValidEnum");
-    assert.ok("isValidService" in b, name + " should contain property isValidService");
-    assert.ok("isValidExtend" in b, name + " should contain property isValidExtend");
-}
-
-function assertIsProtoBuf(pb: ProtoBuf.ProtoBuf, name: string) {
-    for (var pkg in pb) {
-        if (pb.hasOwnProperty(pkg)) {
-            for (var property in pb[pkg]) {
-                if (typeof pb[pkg][property] == typeof Object
-                      && pb[pkg].hasOwnProperty(property)) {
-                    assertIsMetaMessage(pb[pkg][property],
-                        name + "." + pkg + "." + property);
-                }
-            }
-        }
-    }
-}
-
-function assertIsMetaMessage<T>(mm: ProtoBuf.MetaMessage<T>, name: string) {
-    assert.ok("decode" in mm, name + " should contain property decode");
-    assert.ok("decodeDelimited" in mm, name + " should contain property decodeDelimited");
-    assert.ok("decode64" in mm, name + " should contain property decode64");
-    assert.ok("decodeHex" in mm, name + " should contain property decodeHex");
-    assert.ok("decodeJSON" in mm, name + " should contain property decodeJSON");
-}
-
-function assertIsDotProto(dp: ProtoBuf.DotProto, name: string) {
-    assert.ok("Parser" in dp, name + " should contain property Parser");
-    assert.ok("Tokenizer" in dp, name + " should contain property Tokenizer");
-
-    assertIsParser(new dp.Parser(readFileSync("test.proto", {"encoding": "utf8"})),
-        name + ".Parser");
-    assertIsTokenizer(new dp.Tokenizer(readFileSync("test.proto", {"encoding": "utf8"})),
-        name + ".Tokenizer");
-}
-
-function assertIsParser(p: ProtoBuf.Parser, name: string) {
-    assert.ok("tn" in p, name + " should contain property tn");
-    assert.ok("parse" in p, name + " should contain property parse");
-    assert.ok("toString" in p, name + " should contain property toString");
-
-    assertIsTokenizer(p.tn, name + ".tn");
-    assertIsMetaProto(p.parse(), name + ".parse()");
-}
-
-function assertIsTokenizer(t: ProtoBuf.Tokenizer, name: string) {
-    assert.ok("source" in t, name + " should contain property source");
-    assert.ok("index" in t, name + " should contain property index");
-    assert.ok("line" in t, name + " should contain property line");
-    assert.ok("stack" in t, name + " should contain property stack");
-    assert.ok("readingString" in t, name + " should contain property readingString");
-    assert.ok("stringEndsWith" in t, name + " should contain property stringEndsWith");
-    assert.ok("next" in t, name + " should contain property next");
-    assert.ok("peek" in t, name + " should contain property peek");
-    assert.ok("toString" in t, name + " should contain property toString");
-}
-
-function assertIsMetaProto(mp: ProtoBuf.MetaProto, name: string) {
-    assert.ok("package" in mp, name + " should contain proeprty package");
-    assert.ok("messages" in mp, name + " should contain proeprty messages");
-    assert.ok("enums" in mp, name + " should contain proeprty enums");
-    assert.ok("imports" in mp, name + " should contain proeprty imports");
-    assert.ok("options" in mp, name + " should contain proeprty options");
-    assert.ok("services" in mp, name + " should contain proeprty services");
-
-    for (var message in mp.messages) {
-        assertIsProtoMessage(mp.messages[message], name + ".messages." + message);
-    }
-    for (var en in mp.enums) {
-        assertIsProtoEnum(mp.enums[en], name + ".enums." + en);
-    }
-    for (var serv in mp.services) {
-        assertIsProtoService(mp.services[serv], name + ".services." + serv);
-    }
-}
-
-function assertIsProtoEnum(pe: ProtoBuf.ProtoEnum, name: string) {
-    assert.ok("name" in pe, name + " should contain property name");
-    assert.ok("values" in pe, name + " should contain property values");
-    assert.ok("options" in pe, name + " should contain property options");
-
-    for (var value in pe.values) {
-        assertIsProtoEnumValue(pe.values[value], name + ".values." + value);
-    }
-}
-
-function assertIsProtoEnumValue(pev: ProtoBuf.ProtoEnumValue, name: string) {
-    assert.ok("name" in pev, name + " should contain property name");
-    assert.ok("id" in pev, name + " should contain property id");
-}
-
-function assertIsProtoField(pf: ProtoBuf.ProtoField, name: string) {
-    assert.ok("rule" in pf, name + " should contain property rule");
-    assert.ok("options" in pf, name + " should contain property options");
-    assert.ok("type" in pf, name + " should contain property type");
-    assert.ok("name" in pf, name + " should contain property name");
-    assert.ok("id" in pf, name + " should contain property id");
-}
-
-function assertIsProtoMessage(pm: ProtoBuf.ProtoMessage, name: string) {
-    assert.ok("name" in pm, name + " should contain property name");
-    assert.ok("fields" in pm, name + " should contain property fields");
-    assert.ok("enums" in pm, name + " should contain property enums");
-    assert.ok("messages" in pm, name + " should contain property messages");
-    assert.ok("options" in pm, name + " should contain property options");
-    assert.ok("oneofs" in pm, name + " should contain property oneofs");
-
-    for (var f in pm.fields) {
-        assertIsProtoField(pm.fields[f], name + ".fields." + f);
-    }
-    for (var en in pm.enums) {
-        assertIsProtoEnum(pm.enums[en], name + ".enums." + en);
-    }
-    for (var m in pm.messages) {
-        assertIsProtoMessage(pm.messages[m], name + ".messages." + m);
-    }
-}
-
-function assertIsProtoRpcService(rpc: ProtoBuf.ProtoRpcService, name: string) {
-    assert.ok("request" in rpc, name + " should contain property request");
-    assert.ok("response" in rpc, name + " should contain property response");
-    assert.ok("options" in rpc, name + " should contain property options");
-}
-
-function assertIsProtoService(ps: ProtoBuf.ProtoService, name: string) {
-    assert.ok("name" in ps, name + " should contain property name");
-    assert.ok("rpc" in ps, name + " should contain property rpc");
-    assert.ok("options" in ps, name + " should contain property options");
-
-    for (var rpc in ps.rpc) {
-      assertIsProtoRpcService(ps.rpc[rpc], name + ".rpc." + rpc);
-    }
-}
-
-function assertIsReflect(r: ProtoBuf.Reflect, name: string) {
-    assert.ok("T" in r, name + " should contain property T");
-    assert.ok("Namespace" in r, name + " should contain property Namespace");
-    assert.ok("Message" in r, name + " should contain property Message");
-    assert.ok("Enum" in r, name + " should contain property Enum");
-    assert.ok("Extension" in r, name + " should contain property Extension");
-    assert.ok("Service" in r, name + " should contain property Service");
-
-    assertIsT(new ProtoBuf.Reflect.T(), "new ProtoBuf.Reflect.T()");
-    assertIsNamespace(new ProtoBuf.Reflect.Namespace(), "new ProtoBuf.Reflect.Namespace()");
-    assertIsMessage(new ProtoBuf.Reflect.Message(), "new ProtoBuf.Reflect.Message()");
-    assertIsEnum(new ProtoBuf.Reflect.Enum(), "new ProtoBuf.Reflect.Enum()");
-    assertIsExtension(new ProtoBuf.Reflect.Extension(), "new ProtoBuf.Reflect.Extension()");
-    assertIsService(new ProtoBuf.Reflect.Service(), "new ProtoBuf.Reflect.Service()");
-
-    assertIsValue(new ProtoBuf.Reflect.Enum.Value(), "new ProtoBuf.Reflect.Enum.Value()");
-    assertIsOneOf(new ProtoBuf.Reflect.Message.OneOf(), "new ProtoBuf.Reflect.Message.OneOf()");
-    assertIsMethod(new ProtoBuf.Reflect.Service.Method(), "new ProtoBuf.Reflect.Service.Method()");
-    assertIsRPCMethod(new ProtoBuf.Reflect.Service.RPCMethod(),
-        "new ProtoBuf.Reflect.Service.RPCMethod()");
-}
-
-function assertIsT(t: ProtoBuf.ReflectT, name: string) {
-    if (t != null && t != undefined) {
-        assertIsTNoRecursion(t, name);
-
-        assertIsProtoBuilder(t.builder, name + ".builder");
-        assertIsTNoRecursion(t.parent, name + ".parent");
-    }
-}
-
-function assertIsTNoRecursion(t: ProtoBuf.ReflectT, name: string) {
-    if (t != null) {
-        assert.ok("builder" in t, name + " should contain property builder");
-        assert.ok("parent" in t, name + " should contain property parent");
-        assert.ok("name" in t, name + " should contain property name");
-        assert.ok("fqn" in t, name + " should contain property fqn");
-        assert.ok("toString" in t, name + " should contain property toString");
-    }
-}
-
-function assertIsNamespace(ns: ProtoBuf.ReflectNamespace, name: string) {
-    assertIsNamespaceNoRecursion(ns, name);
-
-    assertIsT(ns, name);
-
-    for (var child in ns.children) {
-        assertIsT(ns.children[child], name + ".children." + child);
-    }
-    for (var child in ns.getChildren()) {
-        assertIsT(ns.getChildren()[child], name + ".getChildren()." + child);
-    }
-    assertIsT(ns.getChild(), name + ".getChild()");
-}
-
-function assertIsNamespaceNoRecursion(ns: ProtoBuf.ReflectNamespace, name: string) {
-    assert.ok("className" in ns, name + " should contain property className");
-    assert.ok("children" in ns, name + " should contain property children");
-    assert.ok("options" in ns, name + " should contain property options");
-    assert.ok("syntax" in ns, name + " should contain property syntax");
-    assert.ok("getChildren" in ns, name + " should contain property getChildren");
-    assert.ok("addChild" in ns, name + " should contain property addChild");
-    assert.ok("getChild" in ns, name + " should contain property getChild");
-    assert.ok("resolve" in ns, name + " should contain property resolve");
-    assert.ok("build" in ns, name + " should contain property build");
-    assert.ok("buildOpt" in ns, name + " should contain property buildOpt");
-    assert.ok("getOption" in ns, name + " should contain property getOption");
-}
-
-function assertIsMessage(m: ProtoBuf.ReflectMessage, name: string) {
-    if (m != null && m != undefined) {
-        assert.ok("extensions" in m, name + " should contain property extensions");
-        assert.ok("clazz" in m, name + " should contain property clazz");
-        assert.ok("isGroup" in m, name + " should contain property isGroup");
-        assert.ok("build" in m, name + " should contain property build");
-        assert.ok("encode" in m, name + " should contain property encode");
-        assert.ok("calculate" in m, name + " should contain property calculate");
-        assert.ok("decode" in m, name + " should contain property decode");
-
-        assertIsNamespace(m, name);
-    }
-}
-
-function assertIsEnum(e: ProtoBuf.ReflectEnum, name: string) {
-    assert.ok("object" in e, name + " should contain property object");
-    assert.ok("build" in e, name + " should contain property build");
-
-    assertIsNamespace(e, name);
-}
-
-function assertIsExtension(e: ProtoBuf.ReflectExtension, name: string) {
-    assert.ok("field" in e, name + " should contain property field");
-
-    assertIsT(e, name);
-
-    assertIsField(e.field, name + ".field");
-}
-
-function assertIsService(s: ProtoBuf.ReflectService, name: string) {
-    assert.ok("clazz" in s, name + " should contain property clazz");
-    assert.ok("build" in s, name + " should contain property build");
-
-    assertIsNamespace(s, name);
-}
-
-function assertIsField(f: ProtoBuf.ReflectField, name: string) {
-    if (f != null && f != undefined) {
-        assert.ok("className" in f, name + " should contain property className");
-        assert.ok("required" in f, name + " should contain property required");
-        assert.ok("repeated" in f, name + " should contain property repeated");
-        assert.ok("type" in f, name + " should contain property type");
-        assert.ok("resolvedType" in f, name + " should contain property resolvedType");
-        assert.ok("id" in f, name + " should contain property id");
-        assert.ok("options" in f, name + " should contain property options");
-        assert.ok("defaultValue" in f, name + " should contain property defaultValue");
-        assert.ok("oneof" in f, name + " should contain property oneof");
-        assert.ok("originalName" in f, name + " should contain property originalName");
-        assert.ok("build" in f, name + " should contain property build");
-        assert.ok("mkLong" in f, name + " should contain property mkLong");
-        assert.ok("verifyValue" in f, name + " should contain property verifyValue");
-        assert.ok("encode" in f, name + " should contain property encode");
-        assert.ok("encodeValue" in f, name + " should contain property encodeValue");
-        assert.ok("calculate" in f, name + " should contain property calculate");
-        assert.ok("calculateValue" in f, name + " should contain property calculateValue");
-        assert.ok("decode" in f, name + " should contain property decode");
-
-        assertIsT(f, name);
-
-        assertIsT(f.resolvedType, name + ".resolvedType");
-        assertIsOneOf(f.oneof, name + ".oneof");
-    }
-}
-
-function assertIsWireTuple(wt: ProtoBuf.WireTuple, name: string) {
-    assert.ok("name" in wt, name + " should contain property name");
-    assert.ok("wireType" in wt, name + " should contain property wireType");
-}
-
-function assertIsExtensionField(ef: ProtoBuf.ReflectExtensionField, name: string) {
-    assert.ok("extension" in ef, name + " should contain property extension");
-
-    assertIsField(ef, name);
-
-    assertIsExtension(ef.extension, name + ".extension");
-}
-
-function assertIsOneOf(oo: ProtoBuf.ReflectOneOf, name: string) {
-    assert.ok("fields" in oo, name + " should contain property fields");
-
-    for (var f in oo.fields) {
-        assertIsField(oo.fields[f], name + ".fields." + f);
-    }
-}
-
-function assertIsValue(v: ProtoBuf.ReflectValue, name: string) {
-    assert.ok("className" in v, name + " should contain property className");
-    assert.ok("id" in v, name + " should contain property id");
-
-    assertIsT(v, name);
-}
-
-function assertIsMethod(m: ProtoBuf.ReflectMethod, name: string) {
-    assert.ok("className" in m, name + " should contain property className");
-    assert.ok("options" in m, name + " should contain property options");
-    assert.ok("buildOpt" in m, name + " should contain property buildOpt");
-
-    assertIsT(m, name);
-}
-
-function assertIsRPCMethod(rpc: ProtoBuf.ReflectRPCMethod, name: string) {
-    assert.ok("requestName" in rpc, name + " should contain property requestName");
-    assert.ok("responseName" in rpc, name + " should contain property responseName");
-    assert.ok("resolvedRequestType" in rpc, name + " should contain property resolvedRequestType");
-    assert.ok("resolvedResponseType" in rpc,
-        name + " should contain property resolvedResponseType");
-
-    assertIsMethod(rpc, name);
-
-    assertIsMessage(rpc.resolvedRequestType, name + ".resolvedRequestType");
-    assertIsMessage(rpc.resolvedResponseType, name + ".resolvedResponsetype");
-}
-
-testProtoBufJs();
-testBuilderJs();
-testDotProtoJs();
-testReflectJs();
diff --git a/types/protobufjs/tsconfig.json b/types/protobufjs/tsconfig.json
deleted file mode 100644
index 30ec4a0f3e..0000000000
--- a/types/protobufjs/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "protobufjs-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/protractor-browser-logs/index.d.ts b/types/protractor-browser-logs/index.d.ts
index 276c22fad8..8968e24cb1 100644
--- a/types/protractor-browser-logs/index.d.ts
+++ b/types/protractor-browser-logs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/protractor-browser-logs, https://github.com/wix/protractor-browser-logs
 // Definitions by: Saqib Rokadia <https://github.com/rokadias>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webdriver from 'selenium-webdriver';
 import Entry = webdriver.logging.Entry;
diff --git a/types/protractor-browser-logs/package.json b/types/protractor-browser-logs/package.json
index bd26c57008..6e5104b930 100644
--- a/types/protractor-browser-logs/package.json
+++ b/types/protractor-browser-logs/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "protractor": "latest"
     }
-}
\ No newline at end of file
+}
diff --git a/types/protractor-helpers/tslint.json b/types/protractor-helpers/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/protractor-helpers/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/protractor-http-mock/index.d.ts b/types/protractor-http-mock/index.d.ts
index 110883a8d3..7dfdd9057e 100644
--- a/types/protractor-http-mock/index.d.ts
+++ b/types/protractor-http-mock/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/atecarlos/protractor-http-mock
 // Definitions by: Crevil <https://github.com/Crevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import * as webdriver from 'selenium-webdriver';
 
diff --git a/types/protractor-http-mock/tslint.json b/types/protractor-http-mock/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/protractor-http-mock/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/provinces/index.d.ts b/types/provinces/index.d.ts
new file mode 100644
index 0000000000..2601d14da4
--- /dev/null
+++ b/types/provinces/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for provinces 1.11
+// Project: https://github.com/substack/provinces
+// Definitions by: My Self <https://github.com/gatimus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare global {
+    /**
+     * @see {@link https://github.com/substack/provinces#data-format}
+     */
+    interface Province {
+        /**
+         * full name of the province or state
+         */
+        name: string;
+        /**
+         * country abbreviation
+         */
+        country: string;
+        /**
+         * optional 2 or 3 character short name
+         */
+        short?: string;
+        /**
+         * optional array of additional names and abbreviations
+         */
+        alt?: string[];
+        /**
+         * optional region of a country (for example: "Wales")
+         */
+        region?: string;
+    }
+}
+
+/**
+ * @see {@link https://github.com/substack/provinces#methods}
+ */
+declare const provinces: Province[];
+
+export = provinces;
diff --git a/types/provinces/provinces-tests.ts b/types/provinces/provinces-tests.ts
new file mode 100644
index 0000000000..cd81d2d36a
--- /dev/null
+++ b/types/provinces/provinces-tests.ts
@@ -0,0 +1,16 @@
+import * as provinces from 'provinces';
+
+provinces.forEach((province: Province) => {
+    // https://github.com/substack/provinces#data-format
+    let name: string;
+    let country: string;
+    let short: string;
+    let alt: string[];
+    let region: string;
+
+    name = province.name;
+    country = province.country;
+    short = province.short ? province.short : '';
+    alt = province.alt ? province.alt : [];
+    region = province.region ? province.region : '';
+});
diff --git a/types/provinces/tsconfig.json b/types/provinces/tsconfig.json
new file mode 100644
index 0000000000..d08b599b71
--- /dev/null
+++ b/types/provinces/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "provinces-tests.ts"
+    ]
+}
diff --git a/types/provinces/tslint.json b/types/provinces/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/provinces/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/proxyquire/tslint.json b/types/proxyquire/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/proxyquire/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pty.js/tslint.json b/types/pty.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pty.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pubnub/index.d.ts b/types/pubnub/index.d.ts
new file mode 100644
index 0000000000..3ad70755a0
--- /dev/null
+++ b/types/pubnub/index.d.ts
@@ -0,0 +1,185 @@
+// Type definitions for pubnub 4.0
+// Project: https://github.com/pubnub/javascript
+// Definitions by: bitbankinc <https://github.com/bitbankinc>, rollymaduk <https://github.com/rollymaduk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// @see https://www.pubnub.com/docs/web-javascript/api-reference-configuration
+
+declare class Pubnub {
+  constructor(config: Pubnub.PubnubConfig);
+
+  setAuthKey(authKey: string): void;
+
+  setFilterExpression(filterExpression: string): void;
+
+  getFilterExpression(): string;
+
+  publish(
+    params: Pubnub.PublishParameters,
+    callback: (status: any, response: Pubnub.PublishResponse) => void
+  ): void;
+
+  publish(
+    params: Pubnub.PublishParameters
+  ): Promise<Pubnub.PublishResponse>;
+
+  fire(
+    params: Pubnub.FireParameters,
+    callback: (status: any, response: Pubnub.PublishResponse) => void
+  ): void;
+
+  fire(
+    params: Pubnub.FireParameters
+  ): Promise<Pubnub.PublishResponse>;
+
+  subscribe(params: Pubnub.SubscribeParameters): void;
+
+  unsubscribe(params: Pubnub.UnsubscribeParameters): void;
+
+  unsubscribeAll(): void;
+
+  stop(): void;
+
+  addListener(params: Pubnub.ListenerParameters): void;
+
+  removeListener(params: Pubnub.ListenerParameters): void;
+
+  hereNow(
+    params: Pubnub.HereNowParameters,
+    callback: (status: any, response: Pubnub.HereNowResponse) => void
+  ): void;
+
+  hereNow(
+    params: Pubnub.HereNowParameters
+  ): Promise<Pubnub.HereNowResponse>;
+
+  whereNow(
+    params: {uuid: string},
+    callback: (status: Pubnub.WhereNowStatus, response: Pubnub.WhereNowResponse) => void
+  ): void;
+}
+
+declare namespace Pubnub {
+  interface PubnubConfig {
+    subscribeKey: string;
+    publishKey?: string;
+    cipherKey?: string;
+    authKey?: string;
+    logVerbosity?: boolean;
+    uuid?: string;
+    ssl?: boolean;
+    origin?: string;
+    presenceTimeout?: number;
+    heartbeatInterval?: number;
+    restore?: boolean;
+    keepAlive?: boolean;
+    keepAliveSettings?: {
+      keepAliveMsecs?: number;
+      freeSocketKeepAliveTimeout?: number;
+      timeout?: number;
+      maxSockets?: number;
+      maxFreeSockets?: number;
+    };
+    suppressLeaveEvents?: boolean;
+    secretKey?: string;
+  }
+
+  interface PubnubData {
+    actualChannel: string;
+    channel: string;
+    message: any;
+  }
+
+  interface StatusEvent {
+    category: string;
+    operation: string;
+    affectedChannels: string[];
+    subscribedChannels: string[];
+    affectedChannelGroups: string[];
+    lastTimetoken: number | string;
+    currentTimetoken: number | string;
+  }
+
+  // publish
+  interface PublishParameters {
+    message: any;
+    channel: string;
+    storeInHistory?: boolean;
+    sendByPost?: boolean;
+    meta?: any;
+    ttl?: number;
+  }
+
+  interface PublishResponse {
+    timetoken: number;
+  }
+
+  // fire
+  interface FireParameters {
+    message: any;
+    channel: string;
+    sendByPost?: boolean;
+    meta?: any;
+  }
+
+  // subscribe
+  interface SubscribeParameters {
+    channels?: string[];
+    channelGroups?: string[];
+    withPresence?: boolean;
+    timetoken?: number;
+  }
+
+  // unsubscribe
+  interface UnsubscribeParameters {
+    channels?: string[];
+    channelGroups?: string[];
+  }
+
+  // addListener
+  interface ListenerParameters {
+    status?: (statusEvent: StatusEvent) => void;
+    message?: (data: PubnubData) => void;
+    presence?: (presenceEvent: any) => void;
+  }
+
+  // hereNow
+  interface HereNowParameters {
+    channels?: string[];
+    channelGroups?: string[];
+    includeUUIDs?: boolean;
+    includeState?: boolean;
+  }
+
+  interface HereNowResponse {
+    totalChannels: number;
+    totalOccupancy: number;
+    channels: {[channel: string]: any};
+  }
+
+  // whereNow
+  interface WhereNowStatus {
+    error: boolean;
+    operation: string;
+    statusCode: number;
+  }
+
+  interface WhereNowResponse {
+    channels: string[];
+  }
+
+  // setState
+  interface SetStateParameters {
+    channels?: string[];
+    channelGroups?: string[];
+    state?: any;
+  }
+
+  // getState
+  interface GetStateParameters {
+    uuid?: string;
+    channels?: string[];
+    channelGroups?: string[];
+  }
+}
+
+export default Pubnub;
diff --git a/types/pubnub/pubnub-tests.ts b/types/pubnub/pubnub-tests.ts
new file mode 100644
index 0000000000..291fc035fe
--- /dev/null
+++ b/types/pubnub/pubnub-tests.ts
@@ -0,0 +1,51 @@
+import Pubnub from 'pubnub';
+
+const console = {
+  log: (params: any) => {}
+};
+
+const config: Pubnub.PubnubConfig = {
+  subscribeKey: '',
+  publishKey: '',
+  secretKey: '',
+  ssl: true,
+  authKey: ''
+};
+
+const pubnub = new Pubnub(config);
+
+pubnub.setAuthKey('myAuthenKey');
+
+// publish with callback
+pubnub.publish({channel: 'channel-1', message: {data: 1}}, (status, response) => {
+  /*
+   * Do something
+   */
+   console.log(response.timetoken);
+});
+
+// publish promise
+pubnub.publish({channel: 'channel-1', message: {data: 1}}).then((response) => {
+  /*
+   * Do something
+   */
+   console.log(response.timetoken);
+});
+
+pubnub.subscribe({channels: ['channel-1']});
+
+pubnub.addListener({
+  status: statusEvent => {
+    if (statusEvent.category === "PNConnectedCategory") {
+      console.log(statusEvent.category);
+    }
+  },
+  message: message => {
+    // handle message
+  },
+  presence: presenceEvent => {
+    // handle presence
+  }
+});
+
+pubnub.unsubscribe({channels: ['channel-1']});
diff --git a/types/pubnub/tsconfig.json b/types/pubnub/tsconfig.json
new file mode 100644
index 0000000000..fab1a92335
--- /dev/null
+++ b/types/pubnub/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "pubnub-tests.ts"
+  ]
+}
diff --git a/types/pubnub/tslint.json b/types/pubnub/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pubnub/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pubsub-js/tslint.json b/types/pubsub-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pubsub-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pug/tslint.json b/types/pug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pupa/index.d.ts b/types/pupa/index.d.ts
new file mode 100644
index 0000000000..557d93ae98
--- /dev/null
+++ b/types/pupa/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for pupa 1.0
+// Project: https://github.com/sindresorhus/pupa
+// Definitions by: nju33 <https://github.com/nju33>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function pupa(tpl: string, data: any[] | {[key: string]: any}): string;
+
+export = pupa;
diff --git a/types/pupa/pupa-tests.ts b/types/pupa/pupa-tests.ts
new file mode 100644
index 0000000000..87b42d87e3
--- /dev/null
+++ b/types/pupa/pupa-tests.ts
@@ -0,0 +1,4 @@
+import pupa = require('pupa');
+
+pupa('{str}ing', {str: 'str'});
+pupa('{0}{1}', ['str', 'ing']);
diff --git a/types/pupa/tsconfig.json b/types/pupa/tsconfig.json
new file mode 100644
index 0000000000..3800bab180
--- /dev/null
+++ b/types/pupa/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pupa-tests.ts"
+    ]
+}
diff --git a/types/pupa/tslint.json b/types/pupa/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pupa/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index fabd9060ed..d0958706e9 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1,46 +1,132 @@
-// Type definitions for puppeteer 0.10
+// Type definitions for puppeteer 0.13
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
+//                 Christopher Deutsch <https://github.com/cdeutsch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="node" />
 
+import { EventEmitter } from "events";
+
+/** Keyboard provides an api for managing a virtual keyboard. */
 export interface Keyboard {
-  down(key: string, options?: { text: string }): Promise<void>;
+  /**
+   * Dispatches a keydown event.
+   * @param key Name of key to press, such as ArrowLeft.
+   * @param options Specifies a input text event.
+   */
+  down(key: string, options?: { text?: string }): Promise<void>;
+
+  /** Shortcut for `keyboard.down` and `keyboard.up`. */
+  press(key: string, options?: { text?: string, delay?: number }): Promise<void>;
+
+  /** Dispatches a `keypress` and `input` event. This does not send a `keydown` or keyup `event`. */
   sendCharacter(char: string): Promise<void>;
+
+  /**
+   * Sends a keydown, keypress/input, and keyup event for each character in the text.
+   * @param text A text to type into a focused element.
+   * @param options Specifies the typing options.
+   */
+  type(text: string, options?: { delay?: number }): Promise<void>;
+
+  /**
+   * Dispatches a keyup event.
+   * @param key Name of key to release, such as ArrowLeft.
+   */
   up(key: string): Promise<void>;
 }
 
 export interface MousePressOptions {
+  /**
+   * left, right, or middle.
+   * @default left
+   */
   button?: MouseButtons;
+  /**
+   * The number of clicks.
+   * @default 1
+   */
   clickCount?: number;
 }
 
 export interface Mouse {
-  click(x: number, y: number, options: ClickOptions): Promise<void>;
+  /**
+   * Shortcut for `mouse.move`, `mouse.down` and `mouse.up`.
+   * @param x The x position.
+   * @param y The y position.
+   * @param options The click options.
+   */
+  click(x: number, y: number, options?: ClickOptions): Promise<void>;
+  /**
+   * Dispatches a `mousedown` event.
+   * @param options The mouse press options.
+   */
   down(options?: MousePressOptions): Promise<void>;
+
+  /**
+   * Dispatches a `mousemove` event.
+   * @param x The x position.
+   * @param y The y position.
+   * @param options The mouse move options.
+   */
   move(x: number, y: number, options?: { steps: number }): Promise<void>;
+  /**
+   * Dispatches a `mouseup` event.
+   * @param options The mouse press options.
+   */
   up(options?: MousePressOptions): Promise<void>;
 }
 
 export interface Touchscreen {
+  /**
+   * Dispatches a touchstart and touchend event.
+   * @param x The x position.
+   * @param y The y position.
+   */
   tap(x: number, y: number): Promise<void>;
 }
-
+/**
+ * You can use `tracing.start` and `tracing.stop` to create a trace file which can be opened in Chrome DevTools or timeline viewer.
+ */
 export interface Tracing {
   start(options: { path: string; screenshots?: boolean }): Promise<void>;
   stop(): Promise<void>;
 }
 
+/** Dialog objects are dispatched by page via the 'dialog' event. */
 export interface Dialog {
+  /**
+   * Accepts the dialog.
+   * @param promptText A text to enter in prompt. Does not cause any effects if the dialog's type is not prompt.
+   */
   accept(promptText?: string): Promise<void>;
+
+  /** If dialog is prompt, returns default prompt value. Otherwise, returns empty string. */
   defaultValue(): string;
+
+  /** Dismiss the dialog */
   dismiss(): Promise<void>;
+
+  /** Returns the message displayed in the dialog. */
   message(): string;
+
+  /** The dialog type. Dialog's type, can be one of `alert`, `beforeunload`, `confirm` or `prompt`. */
   type: "alert" | "beforeunload" | "confirm" | "prompt";
 }
 
+/** ConsoleMessage objects are dispatched by page via the 'console' event. */
+export interface ConsoleMessage {
+  /** The message arguments. */
+  args: JSHandle[];
+  /** The message text. */
+  text: string;
+  type: 'log' | 'debug' | 'info' | 'error' | 'warning' | 'dir' | 'dirxml' | 'table' |
+  'trace' | 'clear' | 'startGroup' | 'startGroupCollapsed' | 'endGroup' | 'assert' |
+  'profile' | 'profileEnd' | 'count' | 'timeEnd';
+}
+
 export type PageEvents =
   | "console"
   | "dialog"
@@ -55,6 +141,12 @@ export type PageEvents =
   | "requestfinished"
   | "response";
 
+export type BrowserEvents =
+  | "disconnected"
+  | "targetchanged"
+  | "targetcreated"
+  | "targetdestroyed";
+
 export interface AuthOptions {
   username: string;
   password: string;
@@ -74,38 +166,111 @@ export interface ClickOptions {
   delay?: number;
 }
 
+/** Represents a browser cookie. */
 export interface Cookie {
+  /** The cookie name. */
   name: string;
+  /** The cookie value. */
   value: string;
+  /** The cookie domain. */
   domain: string;
+  /** The cookie path. */
   path: string;
+  /** The cookie Unix expiration time in seconds. */
   expires: number;
+  /** The cookie http only flag. */
   httpOnly: boolean;
+  /** The cookie secure flag. */
   secure: boolean;
+  /** The cookie same site definition. */
   sameSite: "Strict" | "Lax";
 }
 
+export interface DeleteCookie {
+  /** The cookie name. */
+  name: string;
+  url?: string;
+  domain?: string;
+  path?: string;
+  secure?: boolean;
+}
+
+export interface SetCookie {
+  /** The cookie name. */
+  name: string;
+  /** The cookie value. */
+  value: string;
+  /** The request-URI to associate with the setting of the cookie. This value can affect the default domain and path values of the created cookie. */
+  url?: string;
+  /** The cookie domain. */
+  domain?: string;
+  /** The cookie path. */
+  path?: string;
+  /** The cookie Unix expiration time in seconds. */
+  expires?: number;
+  /** The cookie http only flag. */
+  httpOnly?: boolean;
+  /** The cookie secure flag. */
+  secure?: boolean;
+  /** The cookie same site definition. */
+  sameSite?: "Strict" | "Lax";
+}
+
 export interface Viewport {
+  /** The page width in pixels. */
   width: number;
+  /** The page height in pixels. */
   height: number;
+  /**
+   * Specify device scale factor (can be thought of as dpr).
+   * @default 1
+   */
   deviceScaleFactor?: number;
+  /**
+   * Whether the `meta viewport` tag is taken into account.
+   * @default false
+   */
   isMobile?: boolean;
+  /**
+   * Specifies if viewport supports touch events.
+   * @default false
+   */
   hasTouch?: boolean;
+  /**
+   * Specifies if viewport is in landscape mode.
+   * @default false
+   */
   isLandscape?: boolean;
 }
 
+/** Page emulation options. */
 export interface EmulateOptions {
+  /** The viewport emulation options. */
   viewport?: Viewport;
+  /** The emulated user-agent. */
   userAgent?: string;
 }
 
-export type EvaluateFn<T> = (elem?: ElementHandle) => Promise<T>;
+export type EvaluateFn = string | ((...args: any[]) => any);
 
+export type LoadEvent =
+  | "load"
+  | "domcontentloaded"
+  | "networkidle0"
+  | "networkidle2";
+
+/** The navigation options. */
 export interface NavigationOptions {
+  /**
+   * Maximum navigation time in milliseconds, pass 0 to disable timeout.
+   * @default 30000
+   */
   timeout?: number;
-  waitUntil?: "load" | "networkidle" | "networkIdleTimeout";
-  networkIdleInflight?: number;
-  networkIdleTimeout?: number;
+  /**
+   * When to consider navigation succeeded.
+   * @default load Navigation is consider when the `load` event is fired.
+   */
+  waitUntil?: LoadEvent | LoadEvent[];
 }
 
 export type PDFFormat =
@@ -121,56 +286,263 @@ export type PDFFormat =
   | "A5";
 
 export interface PDFOptions {
-  /** If no path is provided, the PDF won't be saved to the disk. */
+  /**
+   * The file path to save the PDF to.
+   * If `path` is a relative path, then it is resolved relative to current working directory.
+   * If no path is provided, the PDF won't be saved to the disk.
+   */
   path?: string;
+  /**
+   * Scale of the webpage rendering.
+   * @default 1
+   */
   scale?: number;
+  /**
+   * Display header and footer.
+   * @default false
+   */
   displayHeaderFooter?: boolean;
+  /**
+   * Print background graphics.
+   * @default false
+   */
   printBackground?: boolean;
+  /**
+   * Paper orientation.
+   * @default false
+   */
   landscape?: boolean;
   /**
    * Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty
    * string, which means print all pages.
    */
   pageRanges?: string;
+  /** Paper format. If set, takes priority over width or height options. Defaults to 'Letter'. */
   format?: PDFFormat;
+  /** Paper width, accepts values labeled with units. */
   width?: string;
+  /** Paper height, accepts values labeled with units. */
   height?: string;
+  /** Paper margins, defaults to none.  */
   margin?: {
+    /** Top margin, accepts values labeled with units. */
     top?: string;
+    /** Right margin, accepts values labeled with units. */
     right?: string;
+    /** Bottom margin, accepts values labeled with units. */
     bottom?: string;
+    /** Left margin, accepts values labeled with units. */
     left?: string;
   };
 }
 
+/** Defines the screenshot options. */
 export interface ScreenshotOptions {
+  /**
+   * The file path to save the image to. The screenshot type will be inferred from file extension.
+   * If `path` is a relative path, then it is resolved relative to current working directory.
+   * If no path is provided, the image won't be saved to the disk.
+   */
   path?: string;
+  /**
+   * The screenshot type.
+   * @default png
+   */
   type?: "jpeg" | "png";
   /** The quality of the image, between 0-100. Not applicable to png images. */
   quality?: number;
+  /**
+   * When true, takes a screenshot of the full scrollable page.
+   * @default false
+   */
   fullPage?: boolean;
-  clip?: {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-  };
+  /**
+   * An object which specifies clipping region of the page.
+   */
+  clip?: BoundingBox;
+  /**
+   * Hides default white background and allows capturing screenshots with transparency.
+   * @default false
+   */
   omitBackground?: boolean;
 }
 
+/** Options for `addStyleTag` */
+export interface StyleTagOptions {
+  /** Url of the <link> tag. */
+  url?: string;
+  /** Path to the CSS file to be injected into frame. If `path` is a relative path, then it is resolved relative to current working directory. */
+  path?: string;
+  /** Raw CSS content to be injected into frame. */
+  content?: string;
+}
+/** Options for `addScriptTag` */
+export interface ScriptTagOptions {
+  /** Url of a script to be added. */
+  url?: string;
+  /** Path to the JavaScript file to be injected into frame. If `path` is a relative path, then it is resolved relative to current working directory. */
+  path?: string;
+  /** Raw JavaScript content to be injected into frame. */
+  content?: string;
+}
+
 export interface PageFnOptions {
   polling?: "raf" | "mutation" | number;
   timeout?: number;
 }
 
-export interface ElementHandle {
+export interface BoundingBox {
+  /** The x-coordinate of top-left corner. */
+  x: number;
+  /** The y-coordinate of top-left corner. */
+  y: number;
+  /** The width. */
+  width: number;
+  /** The height. */
+  height: number;
+}
+
+/**
+ * Represents an in-page DOM element. ElementHandles can be created with the page.$ method.
+ */
+export interface ElementHandle extends JSHandle {
+  /**
+   * The method runs element.querySelector within the page. If no element matches the selector, the return value resolve to null.
+   * @param selector A selector to query element for
+   * @since 0.13.0
+   */
+  $(selector: string): Promise<ElementHandle | null>;
+  /**
+   * The method runs element.querySelectorAll within the page. If no elements match the selector, the return value resolve to [].
+   * @param selector A selector to query element for
+   * @since 0.13.0
+   */
+  $$(selector: string): Promise<ElementHandle[]>;
+  /**
+   * This method returns the value resolve to the bounding box of the element (relative to the main frame), or null if the element is not visible.
+   */
+  boundingBox(): Promise<BoundingBox | null>;
+  /**
+   * This method scrolls element into view if needed, and then uses page.mouse to click in the center of the element.
+   * If the element is detached from DOM, the method throws an error.
+   * @param options Specifies the options.
+   * @since 0.9.0
+   */
   click(options?: ClickOptions): Promise<void>;
-  dispose(): Promise<void>;
+  /**
+   * Calls focus on the element.
+   */
+  focus(): Promise<void>;
+  /**
+   * This method scrolls element into view if needed, and then uses page.mouse to hover over the center of the element.
+   * If the element is detached from DOM, the method throws an error.
+   */
   hover(): Promise<void>;
+  /**
+   * Focuses the element, and then uses keyboard.down and keyboard.up.
+   * @param key Name of key to press, such as ArrowLeft. See USKeyboardLayout for a list of all key names.
+   * @param options The text and delay options.
+   */
+  press(key: string, options?: { text?: string, delay?: number }): Promise<void>;
+  /**
+   * This method scrolls element into view if needed, and then uses page.screenshot to take a screenshot of the element.
+   * If the element is detached from DOM, the method throws an error.
+   * @param options Same options as in page.screenshot.
+   */
+  screenshot(options?: ScreenshotOptions): Promise<Buffer>;
+  /**
+   * This method scrolls element into view if needed, and then uses touchscreen.tap to tap in the center of the element.
+   * If the element is detached from DOM, the method throws an error.
+   */
   tap(): Promise<void>;
+  toString(): string;
+  /**
+   * Focuses the element, and then sends a keydown, keypress/input, and keyup event for each character in the text.
+   * @param text A text to type into a focused element.
+   * @param options The typing options.
+   */
+  type(text: string, options?: { delay: number }): Promise<void>;
+  /**
+   * This method expects elementHandle to point to an input element.
+   * @param filePaths Sets the value of the file input these paths. If some of the filePaths are relative paths, then they are resolved relative to current working directory.
+   */
   uploadFile(...filePaths: string[]): Promise<void>;
 }
 
+/** The class represents a context for JavaScript execution. */
+export interface ExecutionContext {
+  evaluate(
+    fn: EvaluateFn,
+    ...args: any[]
+  ): Promise<any>;
+  evaluateHandle(
+    fn: EvaluateFn,
+    ...args: any[]
+  ): Promise<JSHandle>;
+  queryObjects(prototypeHandle: JSHandle): JSHandle;
+}
+
+/** JSHandle represents an in-page JavaScript object. */
+export interface JSHandle {
+  /**
+   * Returns a ElementHandle
+   */
+  asElement(): ElementHandle | null;
+  /**
+   * Stops referencing the element handle.
+   */
+  dispose(): Promise<void>;
+  /**
+   * Gets the execution context.
+   */
+  executionContext(): ExecutionContext;
+  /**
+   * Returns a map with property names as keys and JSHandle instances for the property values.
+   */
+  getProperties(): Promise<Map<string, JSHandle>>;
+  /**
+   * Fetches a single property from the objectHandle.
+   * @param propertyName The property to get.
+   */
+  getProperty(propertyName: string): Promise<JSHandle>;
+
+  /**
+   * Returns a JSON representation of the object.
+   * The JSON is generated by running JSON.stringify on the object in page and consequent JSON.parse in puppeteer.
+   * @throws The method will throw if the referenced object is not stringifiable.
+   */
+  jsonValue(): Promise<any>;
+}
+
+export interface Metrics {
+  /** The timestamp when the metrics sample was taken. */
+  Timestamp: number;
+  /** Number of documents in the page. */
+  Documents: number;
+  /** Number of frames in the page. */
+  Frames: number;
+  /** Number of events in the page. */
+  JSEventListeners: number;
+  /** Number of DOM nodes in the page. */
+  Nodes: number;
+  /** Total number of full or partial page layout. */
+  LayoutCount: number;
+  /** Total number of page style recalculations. */
+  RecalcStyleCount: number;
+  /** Combined durations of all page layouts. */
+  LayoutDuration: number;
+  /** Combined duration of all page style recalculations. */
+  RecalcStyleDuration: number;
+  /** Combined duration of JavaScript execution. */
+  ScriptDuration: number;
+  /** Combined duration of all tasks performed by the browser. */
+  TaskDuration: number;
+  /** Used JavaScript heap size. */
+  JSHeapUsedSize: number;
+  /** Total JavaScript heap size. */
+  JSHeapTotalSize: number;
+}
+
 export type Headers = Record<string, string>;
 export type HttpMethod =
   | "GET"
@@ -181,19 +553,19 @@ export type HttpMethod =
   | "OPTIONS";
 
 export type ResourceType =
-  | "Document"
-  | "Stylesheet"
-  | "Image"
-  | "Media"
-  | "Font"
-  | "Script"
-  | "TextTrack"
-  | "XHR"
-  | "Fetch"
-  | "EventSource"
-  | "WebSocket"
-  | "Manifest"
-  | "Other";
+  | "document"
+  | "stylesheet"
+  | "image"
+  | "media"
+  | "font"
+  | "script"
+  | "texttrack"
+  | "xhr"
+  | "fetch"
+  | "eventsource"
+  | "websocket"
+  | "manifest"
+  | "other";
 
 export interface Overrides {
   url?: string;
@@ -202,49 +574,157 @@ export interface Overrides {
   headers?: Headers;
 }
 
+/** Represents a page request. */
 export interface Request {
+  /**
+   * Aborts request.
+   * To use this, request interception should be enabled with `page.setRequestInterception`.
+   * @throws An exception is immediately thrown if the request interception is not enabled.
+   */
   abort(): Promise<void>;
+
+  /**
+   * Continues request with optional request overrides.
+   * To use this, request interception should be enabled with `page.setRequestInterception`.
+   * @throws An exception is immediately thrown if the request interception is not enabled.
+   */
   continue(overrides?: Overrides): Promise<void>;
+
+  /**
+   * An object with HTTP headers associated with the request.
+   * All header names are lower-case.
+   */
   headers: Headers;
+  /** Returns the request's method (GET, POST, etc.) */
+
   method: HttpMethod;
+
+  /** Contains the request's post body, if any. */
   postData: string | undefined;
+
+  /** Contains the request's resource type as it was perceived by the rendering engine.  */
   resourceType: ResourceType;
+
+  /**
+   * Fulfills request with given response.
+   * To use this, request interception should be enabled with `page.setRequestInterception`.
+   * @throws An exception is immediately thrown if the request interception is not enabled.
+   * @param response The response options that will fulfill this request.
+   */
+  respond(response: RespondOptions): Promise<void>;
+
+  /** A matching `Response` object, or `null` if the response has not been received yet. */
   response(): Response | null;
+
+  /** Contains the URL of the request. */
   url: string;
 }
+/** Options for `Request.respond` method */
+export interface RespondOptions {
+  /**
+   * Specifies the response status code.
+   * @default 200
+   */
+  status?: number;
+  /** Specifies the response headers. */
+  headers?: Headers;
+  /** Specifies the Content-Type response header. */
+  contentType?: string;
+  /** Specifies the response body. */
+  body?: Buffer | string;
+}
 
+/** Response class represents responses which are received by page. */
 export interface Response {
+  /** Promise which resolves to a buffer with response body. */
   buffer(): Promise<Buffer>;
+  /** An object with HTTP headers associated with the response. All header names are lower-case. */
   headers: Headers;
-  json(): Promise<object>;
+  /**
+   * Promise which resolves to a JSON representation of response body.
+   * @throws This method will throw if the response body is not parsable via `JSON.parse`.
+   */
+  json(): Promise<any>;
+  /** Contains a boolean stating whether the response was successful (status in the range 200-299) or not. */
   ok: boolean;
+  /** A matching Request object. */
   request(): Request;
+  /** Contains the status code of the response (e.g., 200 for a success). */
   status: number;
+  /** Promise which resolves to a text representation of response body. */
   text(): Promise<string>;
+  /** Contains the URL of the response. */
   url: string;
 }
 
 export interface FrameBase {
-  $(selector: string): Promise<ElementHandle>;
+  /**
+   * The method runs document.querySelector within the page.
+   * If no element matches the selector, the return value resolve to null.
+   */
+  $(selector: string): Promise<ElementHandle | null>;
+  /**
+   * The method runs document.querySelectorAll within the page. If no elements match the selector, the return value resolve to [].
+   */
   $$(selector: string): Promise<ElementHandle[]>;
+
+  /**
+   * This method runs document.querySelector within the page and passes it as the first argument to `fn`.
+   * If there's no element matching selector, the method throws an error.
+   * If `fn` returns a Promise, then $eval would wait for the promise to resolve and return its value.
+   */
   $eval(
     selector: string,
-    fn: (...args: Array<object | ElementHandle>) => void
-  ): Promise<object>;
-  addScriptTag(url: string): Promise<void>;
-  injectFile(filePath: string): Promise<void>;
-  evaluate<T = string>(
-    fn: T | EvaluateFn<T>,
-    ...args: Array<object | ElementHandle>
-  ): Promise<T>;
+    pageFunction: (element: Element, ...args: any[]) => any,
+    ...args: any[]
+  ): Promise<any>;
+
+  /**
+   * This method runs document.querySelectorAll within the page and passes it as the first argument to `fn`.
+   * If `fn` returns a Promise, then $$eval would wait for the promise to resolve and return its value.
+   * @param selector A selector to query frame for
+   * @param fn Function to be evaluated in browser context
+   * @param args Arguments to pass to pageFunction
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $$eval(
+    selector: string,
+    pageFunction: (elements: NodeListOf<Element>, ...args: any[]) => any,
+    ...args: any[]
+  ): Promise<any>;
+
+  /** Adds a `<script>` tag into the page with the desired url or content. */
+  addScriptTag(options: ScriptTagOptions): Promise<void>;
+
+  /** Adds a `<link rel="stylesheet">` tag into the page with the desired url or a `<style type="text/css">` tag with the content. */
+  addStyleTag(options: StyleTagOptions): Promise<void>;
+
+  /**
+   * Evaluates a function in the browser context.
+   * If the function, passed to the frame.evaluate, returns a Promise, then frame.evaluate would wait for the promise to resolve and return its value.
+   * If the function passed into frame.evaluate returns a non-Serializable value, then frame.evaluate resolves to undefined.
+   * @param fn Function to be evaluated in browser context
+   * @param args Arguments to pass to `fn`
+   */
+  evaluate(
+    fn: EvaluateFn,
+    ...args: any[]
+  ): Promise<any>;
+
+  /** Returns page's title. */
   title(): Promise<string>;
-  url(): Promise<string>;
+
+  /** Returns frame's url. */
+  url(): string;
+
   waitFor(
     // fn can be an abritary function
     // tslint:disable-next-line ban-types
     selectorOrFunctionOrTimeout: string | number | Function,
-    options?: object
+    options?: any,
+    ...args: any[]
   ): Promise<void>;
+
   waitForFunction(
     // fn can be an abritary function
     // tslint:disable-next-line ban-types
@@ -252,91 +732,408 @@ export interface FrameBase {
     options?: PageFnOptions,
     ...args: any[]
   ): Promise<void>;
-  waitForNavigation(options?: NavigationOptions): Promise<Response>;
   waitForSelector(
     selector: string,
-    options?: { visible: boolean; timeout: number }
+    options?: { visible?: boolean; hidden?: boolean; timeout?: number }
   ): Promise<void>;
 }
 
 export interface Frame extends FrameBase {
   childFrames(): Frame[];
+  /** Execution context associated with this frame. */
+  executionContext(): ExecutionContext;
+  /** Returns `true` if the frame has been detached, or `false` otherwise. */
   isDetached(): boolean;
+  /** Returns frame's name attribute as specified in the tag. */
   name(): string;
-  parentFrame(): Frame | undefined;
+  /** Returns parent frame, if any. Detached frames and main frames return null. */
+  parentFrame(): Frame | null;
 }
 
-export interface EventObj {
-  console: string;
+export interface PageEventObj {
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. console.log or console.dir.
+   * Also emitted if the page throws an error or a warning.
+   */
+  console: ConsoleMessage;
+  /**
+   * Emitted when a JavaScript dialog appears, such as alert, prompt, confirm or beforeunload.
+   * Puppeteer can respond to the dialog via Dialog's accept or dismiss methods.
+   */
   dialog: Dialog;
+  /** Emitted when the page crashes. */
   error: Error;
+  /** Emitted when a frame is attached. */
   frameattached: Frame;
+  /** Emitted when a frame is detached. */
   framedetached: Frame;
+  /** Emitted when a frame is navigated to a new url. */
   framenavigated: Frame;
+  /** Emitted when the JavaScript load event is dispatched. */
   load: undefined;
+  /**
+   * Emitted when the JavaScript code makes a call to `console.timeStamp`.
+   * For the list of metrics see `page.metrics`.
+   */
+  metrics: { title: string, metrics: any };
+  /** Emitted when an uncaught exception happens within the page. */
   pageerror: string;
+  /**
+   * Emitted when a page issues a request. The request object is read-only.
+   * In order to intercept and mutate requests, see page.setRequestInterceptionEnabled.
+   */
   request: Request;
+  /** Emitted when a request fails, for example by timing out. */
   requestfailed: Request;
+  /** Emitted when a request finishes successfully. */
   requestfinished: Request;
+  /** Emitted when a response is received. */
   response: Response;
 }
 
-export interface Page extends FrameBase {
-  on(event: "console", handler: (...args: any[]) => void): void;
-  on<K extends keyof EventObj>(
-    event: K,
-    handler: (e: EventObj[K], ...args: any[]) => void
-  ): void;
+/** Page provides methods to interact with a single tab in Chromium. One Browser instance might have multiple Page instances. */
+export interface Page extends EventEmitter, FrameBase {
+  /**
+   * Adds the listener function to the end of the listeners array for the event named `eventName`.
+   * No checks are made to see if the listener has already been added. Multiple calls passing the same combination of
+   * `eventName` and listener will result in the listener being added, and called, multiple times.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
+  on<K extends keyof PageEventObj>(
+    eventName: K,
+    handler: (e: PageEventObj[K], ...args: any[]) => void
+  ): this;
+
+  /**
+   * Adds a one time listener function for the event named `eventName`.
+   * The next time `eventName` is triggered, this listener is removed and then invoked.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
+  once<K extends keyof PageEventObj>(
+    eventName: K,
+    handler: (e: PageEventObj[K], ...args: any[]) => void
+  ): this;
+
+  /**
+   * Provide credentials for http authentication.
+   * To disable authentication, pass `null`.
+   */
   authenticate(credentials: AuthOptions | null): Promise<void>;
+
+  /** Brings page to front (activates tab). */
+  bringToFront(): Promise<void>;
+
+  /**
+   * This method fetches an element with selector, scrolls it into view if needed, and
+   * then uses `page.mouse` to click in the center of the element. If there's no element
+   * matching selector, the method throws an error.
+   * @param selector A selector to search for element to click. If there are multiple elements satisfying the selector, the first will be clicked.
+   * @param options Specifies the click options.
+   */
   click(selector: string, options?: ClickOptions): Promise<void>;
+
+  /** Closes the current page. */
   close(): Promise<void>;
+
+  /** Gets the full HTML contents of the page, including the doctype. */
   content(): Promise<string>;
-  cookies(...urls: string[]): Cookie;
+
+  /**
+   * Gets the cookies.
+   * If no URLs are specified, this method returns cookies for the current page URL.
+   * If URLs are specified, only cookies for those URLs are returned.
+   */
+  cookies(...urls: string[]): Promise<Cookie[]>;
+
+  /**
+   * Deletes the specified cookies.
+   */
+  deleteCookie(...cookies: DeleteCookie[]): Promise<void>;
+
+  /** Emulates given device metrics and user agent. This method is a shortcut for `setUserAgent` and `setViewport`.  */
   emulate(options: Partial<EmulateOptions>): Promise<void>;
-  emulateMedia(mediaType: string | null): Promise<void>;
+
+  /** Emulates the media. */
+  emulateMedia(mediaType: 'screen' | 'print' | null): Promise<void>;
+
+  /**
+   * Evaluates a function in the page context.
+   * If the function, passed to the page.evaluateHandle, returns a Promise, then page.evaluateHandle
+   * would wait for the promise to resolve and return its value.
+   * @param fn The function to be evaluated in the page context.
+   * @param args The arguments to pass to the `fn`.
+   * @returns A promise which resolves to return value of `fn`.
+   */
+  evaluateHandle(
+    fn: EvaluateFn,
+    ...args: any[]
+  ): Promise<JSHandle>;
+
+  /**
+   * Adds a function which would be invoked in one of the following scenarios: whenever the page is navigated; whenever the child frame is attached or navigated.
+   * The function is invoked after the document was created but before any of its scripts were run. This is useful to amend JavaScript environment, e.g. to seed Math.random.
+   * @param fn The function to be evaluated in browser context.
+   * @param args The arguments to pass to the `fn`.
+   */
   evaluateOnNewDocument(
-    fn: EvaluateFn<string>,
-    ...args: object[]
+    fn: EvaluateFn,
+    ...args: any[]
   ): Promise<void>;
 
-  // Argument `fn` can be an arbitrary function
-  exposeFunction(name: string, fn: any): Promise<void>;
+  /**
+   * The method adds a function called name on the page's `window` object.
+   * When called, the function executes `puppeteerFunction` in node.js and returns a
+   * Promise which resolves to the return value of `puppeteerFunction`.
+   * @param name The name of the function on the window object.
+   * @param fn Callback function which will be called in Puppeteer's context.
+   */
+  exposeFunction(name: string, puppeteerFunction: (...args: any[]) => any): Promise<void>;
 
+  /** This method fetches an element with selector and focuses it. */
   focus(selector: string): Promise<void>;
+
+  /** An array of all frames attached to the page. */
   frames(): Frame[];
-  goBack(options?: Partial<NavigationOptions>): Promise<Response>;
-  goForward(options?: Partial<NavigationOptions>): Promise<Response>;
-  goto(url: string, options?: Partial<NavigationOptions>): Promise<Response>;
+
+  /**
+   * Navigate to the previous page in history.
+   * @param options The navigation parameters.
+   */
+  goBack(options?: Partial<NavigationOptions>): Promise<Response | null>;
+
+  /**
+   * Navigate to the next page in history.
+   * @param options The navigation parameters.
+   */
+  goForward(options?: Partial<NavigationOptions>): Promise<Response | null>;
+
+  /**
+   * Navigates to a URL.
+   * @param url URL to navigate page to. The url should include scheme, e.g. `https://`
+   * @param options The navigation parameters.
+   */
+  goto(url: string, options?: Partial<NavigationOptions>): Promise<Response | null>;
+
+  /**
+   * This method fetches an element with `selector`, scrolls it into view if needed,
+   * and then uses page.mouse to hover over the center of the element. If there's no
+   * element matching `selector`, the method throws an error.
+   * @param selector A selector to search for element to hover. If there are multiple elements satisfying the selector, the first will be hovered.
+   */
   hover(selector: string): Promise<void>;
+
+  /** Returns the virtual keyboard. */
   keyboard: Keyboard;
+
+  /** Page is guaranteed to have a main frame which persists during navigation's. */
   mainFrame(): Frame;
+
+  /** Gets the page metrics. */
+  metrics(): Promise<Metrics>;
+
+  /** Gets the virtual mouse. */
   mouse: Mouse;
+
+  /**
+   * Generates a PDF of the page with `print` css media.
+   * To generate a pdf with `screen` media, call `page.emulateMedia('screen')` before calling `page.pdf()`:
+   * @param options The PDF parameters.
+   */
   pdf(options?: Partial<PDFOptions>): Promise<Buffer>;
-  plainText(): Promise<string>;
-  press(key: string, options?: { text: string; delay: number }): Promise<void>;
+
+  /**
+   * The method iterates JavaScript heap and finds all the objects with the given prototype.
+   * @param prototypeHandle A handle to the object prototype.
+   */
+  queryObjects(prototypeHandle: JSHandle): Promise<JSHandle>;
+
+  /**
+   * Reloads the current page.
+   * @param options The navigation parameters.
+   */
   reload(options?: NavigationOptions): Promise<Response>;
+
+  /**
+   * Captures a screenshot of the page.
+   * @param options The screenshot options.
+   */
   screenshot(options?: ScreenshotOptions): Promise<Buffer>;
+
+  /**
+   * Triggers a `change` and `input` event once all the provided options have been selected.
+   * If there's no `<select>` element matching selector, the method throws an error.
+   * @param selector A selector to query page for.
+   * @param values Values of options to select. If the `<select>` has the `multiple` attribute,
+   * all values are considered, otherwise only the first one is taken into account.
+   */
+  select(selector: string, ...values: string[]): Promise<string[]>;
+
+  /**
+   * Sets the page content.
+   * @param html HTML markup to assign to the page.
+   */
   setContent(html: string): Promise<void>;
-  setCookie(...cookies: Cookie[]): Promise<void>;
+  /**
+   * Sets the cookies on the page.
+   * @param cookies The cookies to set.
+   */
+  setCookie(...cookies: SetCookie[]): Promise<void>;
+
+  /**
+   * The extra HTTP headers will be sent with every request the page initiates.
+   * @param headers An object containing additional http headers to be sent with every request. All header values must be strings.
+   */
   setExtraHTTPHeaders(headers: Headers): Promise<void>;
+
+  /**
+   * Determines whether JavaScript is enabled on the page.
+   * @param enable Whether or not to enable JavaScript on the page.
+   */
   setJavaScriptEnabled(enabled: boolean): Promise<void>;
-  setRequestInterceptionEnabled(value: boolean): Promise<void>;
+
+  /**
+   * Determines whether the offline mode is enabled.
+   * @param enabled When `true`, enables the offline mode for the page.
+   */
+  setOfflineMode(enabled: boolean): Promise<void>;
+
+  /**
+   * Determines whether the request interception is enabled.
+   * @param enabled When `true` the methods `request.abort`, `request.continue` and `request.respond` must be used.
+   */
+  setRequestInterception(enabled: boolean): Promise<void>;
+
+  /**
+   * Specifies the User-Agent used in this page.
+   * @param userAgent The user-agent to be used in the page.
+   */
   setUserAgent(userAgent: string): Promise<void>;
+  /**
+   * Sets the viewport of the page.
+   * @param viewport The viewport parameters.
+   */
   setViewport(viewport: Viewport): Promise<void>;
+
+  /**
+   * This method fetches an element with `selector`, scrolls it into view if needed,
+   * and then uses page.touchscreen to tap in the center of the element.
+   * @param selector A `selector` to search for element to tap. If there are multiple elements
+   * satisfying the selector, the first will be tapped.
+   */
   tap(selector: string): Promise<void>;
+
+  /** Returns the page's title. */
+  title(): Promise<string>;
+
+  /** Returns the virtual touchscreen object. */
   touchscreen: Touchscreen;
+
+  /** Returns the tracing object. */
   tracing: Tracing;
-  type(text: string, options?: { delay: number }): Promise<void>;
+
+  /**
+   * Sends a `keydown`, `keypress/input`, and `keyup` event for each character in the text.
+   * @param selector A selector of an element to type into. If there are multiple elements satisfying the selector, the first will be used.
+   * @param text: A text to type into a focused element.
+   * @param options: The typing parameters.
+   */
+  type(selector: string, text: string, options?: { delay: number }): Promise<void>;
+
+  /**
+   * The page's URL. This is a shortcut for `page.mainFrame().url()`
+   */
+  url(): string;
+
+  /** Gets the page viewport. */
   viewport(): Viewport;
+
+  /**
+   * Wait for the page navigation occur.
+   * @param options The navigation parameters.
+   */
+  waitForNavigation(options?: NavigationOptions): Promise<Response>;
 }
 
-export interface Browser {
+/** A Browser is created when Puppeteer connects to a Chromium instance, either through puppeteer.launch or puppeteer.connect. */
+export interface Browser extends EventEmitter {
+  /**
+   * Adds the listener function to the end of the listeners array for the event named `eventName`.
+   * No checks are made to see if the listener has already been added. Multiple calls passing the same combination of
+   * `eventName` and listener will result in the listener being added, and called, multiple times.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
+  on<K extends keyof BrowserEventObj>(
+    eventName: K,
+    handler: (e: BrowserEventObj[K], ...args: any[]) => void
+  ): this;
+
+  /**
+   * Adds a one time listener function for the event named `eventName`.
+   * The next time `eventName` is triggered, this listener is removed and then invoked.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
+  once<K extends keyof BrowserEventObj>(
+    eventName: K,
+    handler: (e: BrowserEventObj[K], ...args: any[]) => void
+  ): this;
+
+  /**
+   * Closes browser with all the pages (if any were opened).
+   * The browser object itself is considered to be disposed and can not be used anymore.
+   */
   close(): Promise<void>;
+
+  /**
+   * Disconnects Puppeteer from the browser, but leaves the Chromium process running.
+   * After calling `disconnect`, the browser object is considered disposed and cannot be used anymore.
+   */
+  disconnect(): void;
+
+  /** Promise which resolves to a new Page object. */
   newPage(): Promise<Page>;
+
+  /** Promise which resolves to an array of all open pages. */
+  pages(): Promise<Page[]>;
+
+  /** Promise which resolves to an array of all active targets. */
+  targets(): Promise<Target[]>;
+
+  /** For headless Chromium, this is similar to HeadlessChrome/61.0.3153.0. For non-headless, this is similar to Chrome/61.0.3153.0. */
   version(): Promise<string>;
+
+  /** Browser websocket endpoint which can be used as an argument to puppeteer.connect. The format is ws://${host}:${port}/devtools/browser/<id> */
   wsEndpoint(): string;
 }
 
+export interface BrowserEventObj {
+  /** Emitted when puppeteer gets disconnected from the browser instance. */
+  disconnected: undefined;
+
+  /** Emitted when the url of a target changes. */
+  targetchanged: Target;
+
+  /** Emitted when a target is created, for example when a new page is opened by `window.open` or `browser.newPage`. */
+  targetcreated: Target;
+
+  /** Emitted when a target is destroyed, for example when a page is closed. */
+  targetdestroyed: Target;
+}
+
+export interface Target {
+  /** Returns the target `Page` or a `null` if the type of the page is not "page". */
+  page(): Promise<Page>;
+
+  /** Identifies what kind of target this is.  */
+  type(): "page" | "service_worker" | "other";
+
+  /** Returns the target URL. */
+  url(): string;
+}
+
 export interface LaunchOptions {
   /** Whether to ignore HTTPS errors during navigation. Defaults to false. */
   ignoreHTTPSErrors?: boolean;
@@ -360,6 +1157,10 @@ export interface LaunchOptions {
   args?: string[];
   /** Close chrome process on Ctrl-C. Defaults to true. */
   handleSIGINT?: boolean;
+  /** Close chrome process on SIGTERM. Defaults to true. */
+  handleSIGTERM?: boolean;
+  /** Close chrome process on SIGHUP. Defaults to true. */
+  handleSIGHUP?: boolean;
   /**
    * Maximum time in milliseconds to wait for the Chrome instance to start.
    * Defaults to 30000 (30 seconds). Pass 0 to disable timeout.
@@ -372,10 +1173,19 @@ export interface LaunchOptions {
   dumpio?: boolean;
   /** Path to a User Data Directory. */
   userDataDir?: string;
+  /** Specify environment variables that will be visible to Chromium. Defaults to process.env. */
+  env?: any;
+  /** Whether to auto-open DevTools panel for each tab. If this option is true, the headless option will be set false. */
+  devtools?: boolean;
 }
 
 export interface ConnectOptions {
+  /** A browser websocket endpoint to connect to. */
   browserWSEndpoint?: string;
+  /**
+   * Whether to ignore HTTPS errors during navigation.
+   * @default false
+   */
   ignoreHTTPSErrors?: boolean;
 }
 
@@ -383,4 +1193,5 @@ export interface ConnectOptions {
 export function connect(options?: ConnectOptions): Promise<Browser>;
 /** Path where Puppeteer expects to find bundled Chromium */
 export function executablePath(): string;
+/** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */
 export function launch(options?: LaunchOptions): Promise<Browser>;
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index b7ca789cde..913d46a789 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -13,7 +13,7 @@ import * as puppeteer from "puppeteer";
 (async () => {
   const browser = await puppeteer.launch();
   const page = await browser.newPage();
-  await page.goto("https://news.ycombinator.com", { waitUntil: "networkidle" });
+  await page.goto("https://news.ycombinator.com", { waitUntil: "networkidle0" });
   await page.pdf({ path: "hn.pdf", format: "A4" });
 
   browser.close();
@@ -41,7 +41,7 @@ import * as puppeteer from "puppeteer";
 // The following examples are taken from the docs itself
 puppeteer.launch().then(async browser => {
   const page = await browser.newPage();
-  page.on("console", (...args) => {
+  page.on("console", (...args: any[]) => {
     for (let i = 0; i < args.length; ++i) console.log(`${i}: ${args[i]}`);
   });
   page.evaluate(() => console.log(5, "hello", { foo: "bar" }));
@@ -99,7 +99,7 @@ puppeteer.launch().then(async browser => {
   await page.emulateMedia("screen");
   await page.pdf({ path: "page.pdf" });
 
-  await page.setRequestInterceptionEnabled(true);
+  await page.setRequestInterception(true);
   page.on("request", interceptedRequest => {
     if (
       interceptedRequest.url.endsWith(".png") ||
@@ -109,8 +109,8 @@ puppeteer.launch().then(async browser => {
     else interceptedRequest.continue();
   });
 
-  page.type("Hello"); // Types instantly
-  page.type("World", { delay: 100 }); // Types slower, like a user
+  page.keyboard.type("Hello"); // Types instantly
+  page.keyboard.type("World", { delay: 100 }); // Types slower, like a user
 
   const watchDog = page.waitForFunction("window.innerWidth < 100");
   page.setViewport({ width: 50, height: 50 });
@@ -118,7 +118,7 @@ puppeteer.launch().then(async browser => {
 
   let currentURL: string;
   page
-    .waitForSelector("img")
+    .waitForSelector("img", { visible: true })
     .then(() => console.log("First URL with image: " + currentURL));
   for (currentURL of [
     "https://example.com",
@@ -128,16 +128,16 @@ puppeteer.launch().then(async browser => {
     await page.goto(currentURL);
   }
 
-  page.type("Hello World!");
-  page.press("ArrowLeft");
+  page.keyboard.type("Hello World!");
+  page.keyboard.press("ArrowLeft");
 
   page.keyboard.down("Shift");
   // tslint:disable-next-line prefer-for-of
   for (let i = 0; i < " World".length; i++) {
-    page.press("ArrowLeft");
+    page.keyboard.press("ArrowLeft");
   }
   page.keyboard.up("Shift");
-  page.press("Backspace");
+  page.keyboard.press("Backspace");
   page.keyboard.sendCharacter("å—¨");
 
   await page.tracing.start({ path: "trace.json" });
@@ -150,7 +150,7 @@ puppeteer.launch().then(async browser => {
     browser.close();
   });
 
-  const inputElement = await page.$("input[type=submit]");
+  const inputElement = (await page.$("input[type=submit]"))!;
   await inputElement.click();
 });
 
@@ -160,7 +160,10 @@ puppeteer.launch().then(async browser => {
     args: [
       '--no-sandbox',
       '--disable-setuid-sandbox',
-    ]
+    ],
+    handleSIGINT: true,
+    handleSIGHUP: true,
+    handleSIGTERM: true,
   });
   const page = await browser.newPage();
   await page.goto("https://example.com");
@@ -168,3 +171,113 @@ puppeteer.launch().then(async browser => {
 
   browser.close();
 })();
+
+// Test v0.12 features
+(async () => {
+  const browser = await puppeteer.launch({
+    devtools: true,
+    env: {
+      JEST_TEST: true
+    }
+  });
+  const page = await browser.newPage();
+  const button = (await page.$("#myButton"))!;
+  const div = (await page.$("#myDiv"))!;
+  const input = (await page.$("#myInput"))!;
+
+  if (!button)
+    throw new Error('Unable to select myButton');
+
+  if (!input)
+    throw new Error('Unable to select myInput');
+
+  await page.addStyleTag({
+    url: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+  });
+
+  console.log(page.url());
+
+  page.type("#myInput", "Hello World!");
+
+  page.on("console", (event: puppeteer.ConsoleMessage, ...args: any[]) => {
+    console.log(event.text, event.type);
+    for (let i = 0; i < args.length; ++i) console.log(`${i}: ${args[i]}`);
+  });
+
+  await button.focus();
+  await button.press("Enter");
+  await button.screenshot({
+    type: "jpeg",
+    omitBackground: true,
+    clip: {
+      x: 0,
+      y: 0,
+      width: 200,
+      height: 100
+    }
+  });
+  console.log(button.toString());
+  input.type("Hello World", { delay: 10 });
+
+  const buttonText = await (await button.getProperty('textContent')).jsonValue();
+
+  await page.deleteCookie(...await page.cookies());
+
+  const metrics = await page.metrics();
+  console.log(metrics.Documents, metrics.Frames, metrics.JSEventListeners);
+
+  const navResponse = await page.waitForNavigation({
+    timeout: 1000
+  });
+  console.log(navResponse.ok, navResponse.status, navResponse.url, navResponse.headers);
+
+  // evaluate example
+  const bodyHandle = (await page.$('body'))!;
+  const html = await page.evaluate(body => body.innerHTML, bodyHandle);
+  await bodyHandle.dispose();
+
+  // getProperties example
+  const handle = await page.evaluateHandle(() => ({ window, document }));
+  const properties = await handle.getProperties();
+  const windowHandle = properties.get('window');
+  const documentHandle = properties.get('document');
+  await handle.dispose();
+
+  // queryObjects example
+  // Create a Map object
+  await page.evaluate(() => (window as any).map = new Map());
+  // Get a handle to the Map object prototype
+  const mapPrototype = await page.evaluateHandle(() => Map.prototype);
+  // Query all map instances into an array
+  const mapInstances = await page.queryObjects(mapPrototype);
+  // Count amount of map objects in heap
+  const count = await page.evaluate(maps => maps.length, mapInstances);
+  await mapInstances.dispose();
+  await mapPrototype.dispose();
+
+  // evaluateHandle example
+  const aHandle = await page.evaluateHandle(() => document.body);
+  const resultHandle = await page.evaluateHandle(body => body.innerHTML, aHandle);
+  console.log(await resultHandle.jsonValue());
+  await resultHandle.dispose();
+
+  browser.close();
+})();
+
+// test $eval and $$eval
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  await page.goto("https://example.com");
+  let elementText = await page.$eval('#someElement', (element) => {
+    return element.innerHTML;
+  });
+
+  elementText = await page.$$eval('.someClassName', (elements) => {
+    console.log(elements.length);
+    console.log(elements.item(0).outerHTML);
+    return elements[3].innerHTML;
+  });
+
+  browser.close();
+})();
diff --git a/types/pure-render-decorator/tslint.json b/types/pure-render-decorator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pure-render-decorator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/purl/tslint.json b/types/purl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/purl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pusher-js/index.d.ts b/types/pusher-js/index.d.ts
index 0a9f3470b0..383277f121 100644
--- a/types/pusher-js/index.d.ts
+++ b/types/pusher-js/index.d.ts
@@ -228,4 +228,6 @@ declare namespace pusher {
 
 declare var pusher: pusher.PusherStatic;
 
+export as namespace Pusher;
+
 export = pusher;
diff --git a/types/pusher-js/tslint.json b/types/pusher-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pusher-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/pvutils/tslint.json b/types/pvutils/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/pvutils/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/q-io/index.d.ts b/types/q-io/index.d.ts
index 783f70ddc4..3b9e0462a1 100644
--- a/types/q-io/index.d.ts
+++ b/types/q-io/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kriskowal/q-io
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/q-io/tslint.json b/types/q-io/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/q-io/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/q-retry/index.d.ts b/types/q-retry/index.d.ts
index 2d06f97f2e..d9b05477f8 100644
--- a/types/q-retry/index.d.ts
+++ b/types/q-retry/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/vilic/q-retry
 // Definitions by: VILIC VANE <https://github.com/vilic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Q from 'q';
 
diff --git a/types/q-retry/tslint.json b/types/q-retry/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/q-retry/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/q/index.d.ts b/types/q/index.d.ts
index e192b6692b..f7158f7436 100644
--- a/types/q/index.d.ts
+++ b/types/q/index.d.ts
@@ -382,7 +382,7 @@ declare namespace Q {
 	/**
 	 * Resets the global "Q" variable to the value it has before Q was loaded.
 	 * This will either be undefined if there was no version or the version of Q which was already loaded before.
-	 * @returns { The last version of Q. }
+	 * @returns The last version of Q.
 	 */
 	export function noConflict(): typeof Q;
 }
diff --git a/types/q/q-tests.ts b/types/q/q-tests.ts
index f54f913e07..8489625736 100644
--- a/types/q/q-tests.ts
+++ b/types/q/q-tests.ts
@@ -1,4 +1,3 @@
-/* tslint:disable:no-namespace */
 /// <reference types="jquery" />
 
 import Q = require('q');
@@ -154,7 +153,7 @@ Q.nfbind<string>(nodeStyle)('foo').done((result: string) => {
 });
 
 class Repo {
-	private items: any[] = [
+	private readonly items: any[] = [
 		{name: 'Max', cute: false},
 		{name: 'Annie', cute: true}
 	];
@@ -177,7 +176,7 @@ Q.nbind<any[]>(kitty.find, kitty)({cute: true}).done((kitties: any[]) => {
 /**
  * Test: Can "rethrow" rejected promises
  */
-namespace TestCanRethrowRejectedPromises {
+function TestCanRethrowRejectedPromises() {
 	interface Foo {
 		a: number;
 	}
diff --git a/types/q/v0/q-tests.ts b/types/q/v0/q-tests.ts
index 9bd95a77c8..7fb1e7e88d 100644
--- a/types/q/v0/q-tests.ts
+++ b/types/q/v0/q-tests.ts
@@ -144,7 +144,7 @@ Q.nfbind(nodeStyle)('foo').done((result: string) => {});
 
 
 class Repo {
-    private items: any[] = [
+    private readonly items: any[] = [
         { name: 'Max', cute: false },
         { name: 'Annie', cute: true }
     ];
diff --git a/types/q/v0/tslint.json b/types/q/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/q/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/qlik-engineapi/index.d.ts b/types/qlik-engineapi/index.d.ts
index 8cb5d2e3c2..309a30f2b0 100644
--- a/types/qlik-engineapi/index.d.ts
+++ b/types/qlik-engineapi/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for qlik-engineapi 12.20
-// Project: http://help.qlik.com/en-US/sense-developer/June2017/Subsystems/EngineAPI/Content/introducing-engine-API.htm
+// Type definitions for qlik-engineapi 12.67
+// Project: http://help.qlik.com/en-US/sense-developer/November2017/Subsystems/EngineAPI/Content/introducing-engine-API.htm
 // Definitions by: Konrad Mattheis <https://github.com/konne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
@@ -10,6 +10,20 @@ declare namespace EngineAPI {
     type FieldAttributesType = "U" | "A" | "I" | "R" | "F" | "M" | "D" | "T" | "TS" | "IV";
     type FileDataFormatType = "CSV" | "FIX" | "DIF" | "EXCEL_BIFF" | "EXCEL_OOXML" | "HTML" | "XML" | "QVX" | "JSON" | "KML";
     type TableRecordKeyType = "NOT_KEY" | "ANY_KEY" | "PRIMARY_KEY" | "PERFECT_KEY";
+
+    /**
+     * One of:
+     * - Cleared: In this mode, the first step is to clear any current selections in the app.
+     *            The second step is to search for one or more terms in the values of the app.
+     * - LockedFieldsOnly: In this mode, the search applies only to the values associated with
+     *                     the selections made in locked fields, ignoring selections in any unlocked field.
+     *                     If no locked fields, the behavior is identical to the Cleared context.
+     *                     You cannot make any new selections in a locked field. You can get search hits for
+     *                     the associated values of a locked field but you cannot get the search hits for the non associative values.
+     * - CurrentSelections: In this mode, the current selections are kept (if any). Search for one or more terms in the values of the app.
+     *                      New selections are made on top of the current selections. If no selections were made before the search,
+     *                      this mode is identical to the Cleared context.
+     */
     type ContextType = "Cleared" | "LockedFieldsOnly" | "CurrentSelections";
     type SearchObjectsGroupType = "DatasetType" | "GenericObjectsType";
     type SearchObjectsItemType = "0" | "1";
@@ -27,19 +41,114 @@ declare namespace EngineAPI {
     type OtherLimitModeType = "OTHER_GE_LIMIT" | "OTHER_LE_LIMIT" | "OTHER_GT_LIMIT" | "OTHER_LT_LIMIT";
     type OtherSortModeType = "OTHER_SORT_DEFAULT" | "OTHER_SORT_DESCENDING" | "OTHER_SORT_ASCENDING";
     type TotalModeType = "TOTAL_OFF" | "TOTAL_EXPR";
+
     type BnfType = "S" | "E";
+    /**
+     * One of:
+     * - N for NOT_META
+     * - D for META_DOC_NAME
+     * - R for META_RET_TYPE
+     */
     type MTType = "N" | "D" | "R";
+
+    /**
+     * One of:
+     * - CONNECT_DEFAULT: used internally
+     * - CONNECT_64
+     * - CONNECT_32
+     */
     type MachineModeType = "CONNECT_DEFAULT" | "CONNECT_64" | "CONNECT_32";
+
+    /**
+     * One of:
+     * - IT_SCRIPTLINE; the engine returns the statement that will be executed next.
+     * - IT_MSGBOX; the engine returns a script execution error message. This type can only be returned if the parameter qInteractOnError was set to true when calling the ConfigureReload method.
+     * - IT_BREAK; the engine breaks and waits for a response on what to do next.
+     * - IT_END; the engine has finished to execute all statements in the script.
+     */
     type InteractionType = "IT_SCRIPTLINE" | "IT_MSGBOX" | "IT_BREAK" | "IT_END";
+
     type ErrorDataCodeType = "0" | "1" | "2";
+
+    /**
+     * One of:
+     * - ALL for FUNC_GROUP_ALL,
+     * - U for FUNC_GROUP_UNKNOWN,
+     * - NONE for FUNC_GROUP_NONE,
+     * - AGGR for FUNC_GROUP_AGGR,
+     * - NUM for FUNC_GROUP_NUMERIC,
+     * - RNG for FUNC_GROUP_RANGE,
+     * - EXP for FUNC_GROUP_EXPONENTIAL_AND_LOGARITHMIC,
+     * - TRIG for FUNC_GROUP_TRIGONOMETRIC_AND_HYPERBOLIC,
+     * - FIN for FUNC_GROUP_FINANCIAL,
+     * - MATH for FUNC_GROUP_MATH_CONSTANT_AND_PARAM_FREE,
+     * - COUNT for FUNC_GROUP_COUNTER,
+     * - STR for FUNC_GROUP_STRING,
+     * - MAPP for FUNC_GROUP_MAPPING,
+     * - RCRD for FUNC_GROUP_INTER_RECORD,
+     * - CND for FUNC_GROUP_CONDITIONAL,
+     * - LOG for FUNC_GROUP_LOGICAL,
+     * - NULL for FUNC_GROUP_NULL,
+     * - SYS for FUNC_GROUP_SYSTEM,
+     * - FILE for FUNC_GROUP_FILE,
+     * - TBL for FUNC_GROUP_TABLE,
+     * - DATE for FUNC_GROUP_DATE_AND_TIME,
+     * - NUMI for FUNC_GROUP_NUMBER_INTERPRET,
+     * - FRMT for FUNC_GROUP_FORMATTING,
+     * - CLR for FUNC_GROUP_COLOR,
+     * - RNK for FUNC_GROUP_RANKING
+     * - GEO for FUNC_GROUP_GEO
+     * - EXT for FUNC_GROUP_EXTERNAL
+     */
     type FunctionGroupType = "ALL" | "U" | "NONE" | "AGGR" | "NUM" | "RNG" | "EXP" | "TRIG" | "FIN" | "MATH" | "COUNT" | "STR" | "MAPP" |
         "RCRD" | "CND" | "LOG" | "NULL" | "SYS" | "FILE" | "TBL" | "DATE" | "NUMI" | "FRMT" | "CLR" | "RNK" | "GEO" | "EXT";
+
     type DimensionType = "D" | "N" | "T";
-    type NxHypercubeMode = "P" | "K" | "S" | string;
+
+    /**
+     * One of:
+     * - S for DATA_MODE_STRAIGHT; straight table representation
+     * - P for DATA_MODE_PIVOT; pivot table representation
+     * - K for DATA_MODE_PIVOT_STACK; stacked table representation
+     * - T for DATA_MODE_TREE; tree representation
+     */
+    type NxHypercubeMode = "S" | "P" | "K" | "T";
+
+    /**
+     * One of:
+     * - NX_FREQUENCY_NONE
+     * - NX_FREQUENCY_VALUE
+     * - NX_FREQUENCY_PERCENT. The percentage is between 0 and 100.
+     * - NX_FREQUENCY_RELATIVE. Same as percent except that the relative value is between 0 and 1.
+     */
     type FrequencyModeType = "NX_FREQUENCY_NONE" | "NX_FREQUENCY_VALUE" | "NX_FREQUENCY_PERCENT" | "NX_FREQUENCY_RELATIVE";
+
     type TypeSortDirection = "1" | "-1" | "0";
+
+    /**
+     * Type of the drive. Can be:
+     * - REMOVABLE
+     * - FIXED
+     * - NETWORK
+     * - CD_ROM
+     * - RAM
+     * - UNKNOWN_TYPE
+     */
     type DriveType = "REMOVABLE" | "FIXED" | "NETWORK" | "CD_ROM" | "RAM" | "UNKNOWN_TYPE";
 
+    /**
+     * One of:
+     * - V for NX_DIM_CELL_VALUE. Applies to values in the data matrix.
+     * - E for NX_DIM_CELL_EMPTY. Applies to empty cells in the top and left dimensions.
+     * - G for NX_DIM_CELL_GENERATED. Applies to generated nodes that are inserted into the returned tree when there is no actual value (qAllValues in NxPageTreeNode set to true).
+     * - N for NX_DIM_CELL_NORMAL. Applies to left and top dimensions cells.
+     * - T for NX_DIM_CELL_TOTAL. Applies to cells marked with Total.
+     * - P for NX_DIM_CELL_PSEUDO. Applies to pseudo dimensions.
+     * - R for NX_DIM_CELL_ROOT. Applies to root node.
+     * - U for NX_DIM_CELL_NULL. Applies to Null values in the data matrix.
+     */
+    type NxTreeNodeType = "V" | "E" | "G" | "N" | "T" | "P" | "R" | "U";
+
     /**
      * NxRange...
      */
@@ -421,7 +530,7 @@ declare namespace EngineAPI {
         qThou: string;
 
         /**
-         *
+         * no / empty docu
          */
         qSAFEARRAY: any[];
     }
@@ -1036,7 +1145,7 @@ declare namespace EngineAPI {
 
         /**
          * String that marks the beginning of the comment line.
-         * Example: “#” or “//”
+         * Example: # or //
          * The engine ignores the commented lines during the data load.
          * This property is only used for delimited files.
          */
@@ -2135,11 +2244,11 @@ declare namespace EngineAPI {
          * For example, if the user requests SearchObjects with SearchObjectOptions.qAttributes = [],
          * then the outputted qAttributes will be empty.
          *
-         * Otherwise, if SearchObjectOptions.qAttributes = [“qProperty”],
-         * SearchGroupItemMatch.qAttributes = [“qProperty”, qMetaDef/title”]
+         * Otherwise, if SearchObjectOptions.qAttributes = [qProperty],
+         * SearchGroupItemMatch.qAttributes = [qProperty, qMetaDef/title]
          * if the match has been found in the title of the item.
          *
-         * For dimension values, the returned “qProperty” will be “*”.
+         * For dimension values, the returned qProperty will be *.
          */
         qAttributes: ISearchAttribute[];
 
@@ -2293,49 +2402,49 @@ declare namespace EngineAPI {
      * This class describes all the methods that apply at app level.
      * The handle member in the JSON request for all methods listed in this section is the handle of the app.
      */
-    interface IApp {
+    interface IApp extends enigmaJS.IGeneratedAPI {
         global: IGlobal;
 
         /**
          * Aborts any selection mode in an app. For more information about selection mode!
-         * @param {boolean} qAccept - Set this parameter to true to accept the selections before exiting the selection mode.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qAccept - Set this parameter to true to accept the selections before exiting the selection mode.
+         * @returns - A promise of a Qlik engine reply.
          */
         abortModal(qAccept: boolean): Promise<void>;
 
         /**
          * You can create multiple states within a Qlik Sense app and apply these states to specific objects within the app.
          * Objects in a given state are not affected by user selections in the other states.
-         * @param {string} qStateName - Name of the alternate state. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qStateName - Name of the alternate state. >> This parameter is mandatory.
+         * @returns - A promise of a Qlik engine reply.
          */
         addAlternateState(qStateName: string): Promise<void>;
 
         /**
          * Adds a field on the fly. The expression of a field on the fly is persisted but not its values.
-         * @param {string} qName - Name of the field.
-         * @param {string} qExpr - Expression value. It is not possible to use all aggregation functions.
+         * @param qName - Name of the field.
+         * @param qExpr - Expression value. It is not possible to use all aggregation functions.
          * For example, you cannot add a field on the fly with an expression that uses the Sum or Count aggregation functions.
-         * @returns {Promise} - true or false
+         * @returns - true or false
          */
         addFieldFromExpression(qName: string, qExpr: string): Promise<boolean>;
 
         /**
          * Applies a bookmark.
-         * @param {string} qId - Identifier of the bookmark.
-         * @returns {Promise} - true or false
+         * @param qId - Identifier of the bookmark.
+         * @returns - true or false
          */
         applyBookmark(qId: string): Promise<boolean>;
 
         /**
          * Returns the number of entries on the Back stack..
-         * @returns {Promise} - "qReturn": <Number of entries in the back stack>
+         * @returns - "qReturn": <Number of entries in the back stack>
          */
         backCount(): Promise<number>;
 
         /**
          * Loads the last logical operation (if any).
-         * @returns {Promise} - "{}"
+         * @returns"
          */
         back(): Promise<void>;
 
@@ -2343,9 +2452,9 @@ declare namespace EngineAPI {
          * Checks if a given expression is valid.
          *
          * Note: The expression is correct if the parameters qErrorMsg, qBadFieldNames and qDangerousFieldNames are empty.
-         * @param {string} qExpr - Expression to check..
-         * @param {Array} qLabels - (Array of String) List of labels. This parameter is optional.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qExpr - Expression to check..
+         * @param qLabels - (Array of String) List of labels. This parameter is optional.
+         * @returns - A promise of a Qlik engine reply.
          */
         checkExpression(qExpr: string, qLabels?: string[]): Promise<ICheckExpressionResult>;
 
@@ -2356,8 +2465,8 @@ declare namespace EngineAPI {
          * - a number is correct according to the locale.
          *
          * Note: The expression is correct if the parameters qErrorMsg and qBadFieldNames are empty.
-         * @param {string} qExpr - Expression to check.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qExpr - Expression to check.
+         * @returns - A promise of a Qlik engine reply.
          */
         checkNumberOrExpression(qExpr: string): Promise<ICheckNumberOrExpressionResult>;
 
@@ -2380,26 +2489,26 @@ declare namespace EngineAPI {
 
         /**
          * Clears all selections in all fields of the current app.
-         * @param {Boolean} qLockedAlso - This parameter is optional. Default is false. Selections on locked fields are not cleared.
+         * @param qLockedAlso - This parameter is optional. Default is false. Selections on locked fields are not cleared.
          *                                Set this parameter to true to clear all selections, including the locked fields.
-         * @param {String} qStateName - Name of the alternate state. If an alternate state is defined in qStateName, only the selections
+         * @param qStateName - Name of the alternate state. If an alternate state is defined in qStateName, only the selections
          *                              related to this alternate state are cleared. This parameter is optional.
          *                              Default state is current selections.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         clearAll(qLockedAlso: boolean, qStateName?: string): Promise<void>;
 
         /**
          * Clears entirely the undo and redo buffer.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         clearUndoBuffer(): Promise<void>;
 
         /**
          * Clones a bookmark.
          *
-         * @param {String} qId - Identifier of the object to clone
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qId - Identifier of the object to clone
+         * @returns - A promise of a Qlik engine reply.
          */
         cloneBookmark(qId: string): Promise<string>;
 
@@ -2407,8 +2516,8 @@ declare namespace EngineAPI {
          * Clones a dimension.
          *
          * Note: The identifier is set by the engine.
-         * @param {String} qId - Identifier of the object to clone
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qId - Identifier of the object to clone
+         * @returns - A promise of a Qlik engine reply.
          */
         cloneDimension(qId: string): Promise<string>;
 
@@ -2416,8 +2525,8 @@ declare namespace EngineAPI {
          * Clones a measure.
          *
          * Note: The identifier is set by the engine.
-         * @param {String} qId - Identifier of the object to clone
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qId - Identifier of the object to clone
+         * @returns - A promise of a Qlik engine reply.
          */
         cloneMeasure(qId: string): Promise<string>;
 
@@ -2426,8 +2535,8 @@ declare namespace EngineAPI {
          * When you clone an object that contains children, the children are cloned as well.
          *
          * Note: The identifier is set by the engine.
-         * @param {String} qId - Identifier of the object to clone
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qId - Identifier of the object to clone
+         * @returns - A promise of a Qlik engine reply.
          */
         cloneObject(qId: string): Promise<string>;
 
@@ -2436,22 +2545,22 @@ declare namespace EngineAPI {
          * Committing a draft replaces the corresponding published object.
          *
          * Note: The identifier is set by the engine.
-         * @param {String} qId - Identifier of the draft to commit.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qId - Identifier of the draft to commit.
+         * @returns - A promise of a Qlik engine reply.
          */
         commitDraft(qId: string): Promise<void>;
 
         /**
          * Creates a bookmark.
-         * @param {GenericBookmarkProperties} qProp - Information about the object. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qProp - Information about the object. >> This parameter is mandatory.
+         * @returns - A promise of a Qlik engine reply.
          */
         createBookmark(qProp: IGenericBookmarkProperties): Promise<IGenericBookmark>;
 
         /**
          * Creates a connection. A connection indicates from which data source, the data should be taken.
-         * @param {Connection} qConnection - Information about the connection. >> This parameter is mandatory.
-         * @returns {Promise} - returns a ConnectionId
+         * @param qConnection - Information about the connection. >> This parameter is mandatory.
+         * @returns - returns a ConnectionId
          */
         createConnection(qConnection: IConnection): Promise<string>;
 
@@ -2459,8 +2568,8 @@ declare namespace EngineAPI {
          * Creates a master dimension.
          * A master dimension is stored in the library of an app and can be used in many objects.
          * Several generic objects can contain the same dimension.
-         * @param {GenericDimensionProperties} qProp - Information about the properties. >> This parameter is mandatory.
-         * @returns {Promise} - returns a GenericDimension object
+         * @param qProp - Information about the properties. >> This parameter is mandatory.
+         * @returns - returns a GenericDimension object
          */
         createDimension(qProp: IGenericDimensionProperties): Promise<IGenericDimension>;
 
@@ -2471,8 +2580,8 @@ declare namespace EngineAPI {
          * Replace the published object by the content of the draft by invoking the CommitDraft method.
          *
          * Note: The identifier is set by the engine.
-         * @param {String} qId - Identifier of the object to create a draft from.
-         * @returns {Promise} - returns a DraftId
+         * @param qId - Identifier of the object to create a draft from.
+         * @returns - returns a DraftId
          */
         createDraft(qId: string): Promise<string>;
 
@@ -2480,8 +2589,8 @@ declare namespace EngineAPI {
          * Creates a master measure.
          * A master measure is stored in the library of an app and can be used in many objects.
          * Several generic objects can contain the same measure.
-         * @param {GenericMeasureProperties} gProp - Information about the properties >> This parameter is mandatory.
-         * @returns {Promise} - returns a GenericMeasure
+         * @param gProp - Information about the properties >> This parameter is mandatory.
+         * @returns - returns a GenericMeasure
          */
         createMeasure(qProp: IGenericMeasureProperties): Promise<IGenericMeasure>;
 
@@ -2492,8 +2601,8 @@ declare namespace EngineAPI {
          * The linking object is defined in the properties of the linked object (in qExtendsId).
          * The linked object has the same properties as the linking object.
          * Notre: The linking object cannot be a transient object.
-         * @param {GenericObjectProperties} gProp - Information about the properties >> This parameter is mandatory.
-         * @returns {Promise} - returns a GenericObject
+         * @param gProp - Information about the properties >> This parameter is mandatory.
+         * @returns - returns a GenericObject
          */
         createObject(qProp: IGenericObjectProperties): Promise<IGenericObject>;
 
@@ -2503,24 +2612,24 @@ declare namespace EngineAPI {
          * A linked object is an object that points to a linking object.
          * The linking object is defined in the properties of the linked object (in qExtendsId).
          * The linked object has the same properties as the linking object.
-         * @param {GenericObjectProperties} gProp - Information about the properties >> This parameter is mandatory.
-         * @returns {Promise} - returns a GenericObject
+         * @param gProp - Information about the properties >> This parameter is mandatory.
+         * @returns - returns a GenericObject
          */
         createSessionObject(qProp: IGenericObjectProperties): Promise<IGenericObject>;
 
         /**
          * Creates a transient variable.
-         * @param {GenericVariableProperties} gProp - Name of the variable. Variable names are case sensitive.
+         * @param gProp - Name of the variable. Variable names are case sensitive.
          * >> This parameter is mandatory.
-         * @returns {Promise} - returns a GenericVariable
+         * @returns - returns a GenericVariable
          */
         createSessionVariable(qProp: IGenericVariableProperties): Promise<IGenericVariable>;
         /**
          * Creates a variable.
          *
          * Note: This method is deprecated (not recommended to use). Use CreateVariableEx method instead.
-         * @param {String} qName - Name of the variable. Variable names are case sensitive. >> This parameter is mandatory.
-         * @returns {Promise} - returns a Boolean
+         * @param qName - Name of the variable. Variable names are case sensitive. >> This parameter is mandatory.
+         * @returns - returns a Boolean
          */
         createVariable(qName: string): Promise<boolean>;
 
@@ -2528,9 +2637,9 @@ declare namespace EngineAPI {
          * Creates a variable.
          *
          * Note: This method is deprecated (not recommended to use). Use CreateVariableEx method instead.
-         * @param {GenericVariableProperties} qProp - Name of the variable. Variable names are case sensitive and must be unique.
+         * @param qProp - Name of the variable. Variable names are case sensitive and must be unique.
          *                                             >> This parameter is mandatory.
-         * @returns {Promise} - returns a NxInfo. Identifier and type of the object. >> This parameter is mandatory.
+         * @returns - returns a NxInfo. Identifier and type of the object. >> This parameter is mandatory.
          */
         createVariableEx(qProp: IGenericVariableProperties): Promise<INxInfo>;
 
@@ -2539,8 +2648,8 @@ declare namespace EngineAPI {
          * The AttachedFiles connection can only be removed by the administrator of the system.
          *
          * Note: In Qlik Sense Enterprise, there is an additional file connection named AttachedFiles.
-         * @param {String} qConnectionId - Identifier of the connection to remove. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qConnectionId - Identifier of the connection to remove. >> This parameter is mandatory.
+         * @returns - A promise of a Qlik engine reply.
          */
         deleteConnection(qConnectionId: string): Promise<void>;
 
@@ -2548,8 +2657,8 @@ declare namespace EngineAPI {
          * Removes a bookmark.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qId - Identifier of the bookmark
-         * @returns {Promise} - A promise of  Boolean
+         * @param qId - Identifier of the bookmark
+         * @returns - A promise of  Boolean
          */
         destroyBookmark(qId: string): Promise<boolean>;
 
@@ -2557,8 +2666,8 @@ declare namespace EngineAPI {
          * Removes a dimension.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qId - Identifier of the dimension to remove. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of  Boolean
+         * @param qId - Identifier of the dimension to remove. >> This parameter is mandatory.
+         * @returns - A promise of  Boolean
          */
         destroyDimension(qId: string): Promise<boolean>;
 
@@ -2566,9 +2675,9 @@ declare namespace EngineAPI {
          * Removes a dimension.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qId - Identifier of the draft object to remove. >> This parameter is mandatory.
-         * @param {String} qSourceId - Identifier of the source object (the object from which a draft was created).
-         * @returns {Promise} - A promise of  Boolean
+         * @param qId - Identifier of the draft object to remove. >> This parameter is mandatory.
+         * @param qSourceId - Identifier of the source object (the object from which a draft was created).
+         * @returns - A promise of  Boolean
          */
         destroyDraft(qId: string, qSourceId: string): Promise<boolean>;
 
@@ -2576,8 +2685,8 @@ declare namespace EngineAPI {
          * Removes a generic measure.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qId - Identifier of the measure to remove. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of  Boolean
+         * @param qId - Identifier of the measure to remove. >> This parameter is mandatory.
+         * @returns - A promise of  Boolean
          */
         destroyMeasure(qId: string): Promise<boolean>;
 
@@ -2585,8 +2694,8 @@ declare namespace EngineAPI {
          * Removes an app object.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qId - Identifier of the object to remove. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of  Boolean
+         * @param qId - Identifier of the object to remove. >> This parameter is mandatory.
+         * @returns - A promise of  Boolean
          */
         destroyObject(qId: string): Promise<boolean>;
 
@@ -2594,8 +2703,8 @@ declare namespace EngineAPI {
          * Removes a transient object.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qId - Identifier of the object to remove. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of Boolean
+         * @param qId - Identifier of the object to remove. >> This parameter is mandatory.
+         * @returns - A promise of Boolean
          */
         destroySessionObject(qId: string): Promise<boolean>;
 
@@ -2603,8 +2712,8 @@ declare namespace EngineAPI {
          * Removes a transient variable.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qId - Identifier of the object to remove. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of Boolean
+         * @param qId - Identifier of the object to remove. >> This parameter is mandatory.
+         * @returns - A promise of Boolean
          */
         destroySessionVariable(qId: string): Promise<boolean>;
 
@@ -2613,8 +2722,8 @@ declare namespace EngineAPI {
          *
          * Note: The operation is successful if qSuccess is set to true.
          * Script-defined variables cannot be removed using the DestroyVariableById method or the DestroyVariableByName method.
-         * @param {String} qId - Identifier of the variable.
-         * @returns {Promise} - A promise of Boolean
+         * @param qId - Identifier of the variable.
+         * @returns - A promise of Boolean
          */
         destroyVariableById(qId: string): Promise<boolean>;
 
@@ -2623,8 +2732,8 @@ declare namespace EngineAPI {
          *
          * Note: The operation is successful if qSuccess is set to true.
          * Script-defined variables cannot be removed using the DestroyVariableById method or the DestroyVariableByName method.
-         * @param {String} qName - Name of the variable..
-         * @returns {Promise} - A promise of Boolean
+         * @param qName - Name of the variable..
+         * @returns - A promise of Boolean
          */
         destroyVariableByName(qName: string): Promise<boolean>;
 
@@ -2632,19 +2741,19 @@ declare namespace EngineAPI {
          * Reloads the script that is set in an app.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {Integer} qMode - Error handling mode.
+         * @param qMode - Error handling mode.
          *
          * 0: for default mode
          * 1: for ABEND; the reload of the script ends if an error occurs
          * 2: for ignore; the reload of the script continues even if an error is detected in the script.
          *
          * This parameter is optional.
-         * @param {Boolean} qPartial - Set to true for partial reload. This parameter is optional.
+         * @param qPartial - Set to true for partial reload. This parameter is optional.
          * The default value is false.
-         * @param {Boolean} qDebug - Set to true if debug breakpoints are to be honored.
+         * @param qDebug - Set to true if debug breakpoints are to be honored.
          * The execution of the script will be in debug mode.
          * This parameter is optional. The default value is false.
-         * @returns {Promise} - A promise of Boolean
+         * @returns - A promise of Boolean
          */
         doReload(qMode?: number, qPartial?: boolean, qDebug?: boolean): Promise<boolean>;
 
@@ -2652,8 +2761,8 @@ declare namespace EngineAPI {
          * Reloads the script that is set in an app and returns the path to the script log file.
          *
          * Note: A log file is created per reload.
-         * @param {DoReloadExParams} qParams - This parameter is optional.
-         * @returns {Promise} - If the data load has successfully finished, no matter how the indexing behaves, true is returned.
+         * @param qParams - This parameter is optional.
+         * @returns - If the data load has successfully finished, no matter how the indexing behaves, true is returned.
          * This happens even if there is a timeout, a memory limit is reached or any other error occurs during the indexing.
          */
         doReloadEx(qParams?: IDoReloadExParams): Promise<IDoReloadExResult>;
@@ -2661,90 +2770,98 @@ declare namespace EngineAPI {
         /**
          * Saves an app. All objects and data in the data model are saved.
          * Script-defined variables cannot be removed using the DestroyVariableById method or the DestroyVariableByName method.
-         * @param {String} qFileName - Name of the file to save. This parameter is optional.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qFileName - Name of the file to save. This parameter is optional.
+         * @returns - A promise of a Qlik engine reply.
          */
         doSave(qFileName?: string): Promise<void>;
 
         /**
          * Evaluates an expression as a string.
          * Script-defined variables cannot be removed using the DestroyVariableById method or the DestroyVariableByName method.
-         * @param {String} qExpression - Expression to evaluate.
-         * @returns {Promise} - return a expression evaluated as a string
+         * @param qExpression - Expression to evaluate.
+         * @returns - return a expression evaluated as a string
          */
         evaluate(qExpression: string): Promise<string>;
 
         /**
          * Evaluates an expression as a dual.
          * Script-defined variables cannot be removed using the DestroyVariableById method or the DestroyVariableByName method.
-         * @param {String} qExpression - Expression to evaluate.
-         * @returns {Promise} - return a Promise width a FieldValue
+         * @param qExpression - Expression to evaluate.
+         * @returns - return a Promise with a FieldValue
          */
         evaluateEx(qExpression: string): Promise<IFieldValue>;
 
+        /**
+         * Export an Qlik QVF with a reduced datamodel
+         * @param qOptions - qBookmarkId - bookmark to export
+         *                   qExpires - download expires in [s]
+         * @returns - return a Promise with the qDownloadInfo
+         */
+        exportReducedData(qOptions?: { qBookmarkId?: string, qExpires?: number}): Promise<{ qDownloadInfo: any }>;
+
         /**
          * Retrieves any fields that belong to the same archipelago as the specified field and
          * that match at least one of the specified tags.
          * Tags set by Qlik Sense are prefixed by the $ sign.
-         * @param {String} qFieldName - Name of the field. This method looks for fields that
+         * @param qFieldName - Name of the field. This method looks for fields that
          * belong to the same archipelago as this specified field.
-         * @param {Array} qTags - List of tags. This method looks for fields that match at least one of the tags in this list.
-         * @returns {Promise} - A promise of FieldValue.
+         * @param qTags - List of tags. This method looks for fields that match at least one of the tags in this list.
+         * @returns - A promise of FieldValue.
          */
         findMatchingFields(qFieldName: string, qTags: string[]): Promise<INxMatchingFieldInfo[]>;
 
         /**
          * Loads the next logical operation (if any).
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         forward(): Promise<void>;
 
         /**
          * Returns the number of entries on the Forward stack.
-         * @returns {Promise} - A promise and Number of entries in the forward stack
+         * @returns - A promise and Number of entries in the forward stack
          */
         forwardCount(): Promise<number>;
 
         /**
          * Returns the identifier and the type of any generic object in the app.
          * Script-defined variables cannot be removed using the DestroyVariableById method or the DestroyVariableByName method.
-         * @param {Array} qInfos - (Array of NxInfo) Information about all generic objects in the app.
-         * @returns {Promise} - return a Promise Array of INxInfo
+         * @param qInfos - (Array of NxInfo) Information about all generic objects in the app.
+         * @returns - return a Promise Array of INxInfo
          */
         getAllInfos(): Promise<INxInfo[]>;
 
         /**
          * Returns dynamic properties (if any) in addition to the engine (fixed) properties.
          * Script-defined variables cannot be removed using the DestroyVariableById method or the DestroyVariableByName method.
-         * @returns {Promise} - return a Promise  of a data set NxAppLayout
+         * @returns - return a Promise  of a data set NxAppLayout
          */
         getAppLayout(): Promise<INxAppLayout>;
 
         /**
          * Gets the properties of an app.
-         * @returns {Promise} - return a Promise of NxAppProperties qProp. Information about the properties of the app.
+         * @returns - return a Promise of NxAppProperties qProp. Information about the properties of the app.
          */
         getAppProperties(): Promise<INxAppProperties>;
 
         /**
          * Computes a set of association scores for each pair of fields between two given tables that have been loaded in an app.
-         * @param {String} qTable1 - Name of the first table.
-         * @param {String} qTable2 - Name of the second table.
-         * @returns {Promise} - return a Promise of IAssociationScore qScore.
+         * @param qTable1 - Name of the first table.
+         * @param qTable2 - Name of the second table.
+         * @returns - return a Promise of IAssociationScore qScore.
          */
         getAssociationScores(qTable1: string, qTable2: string): Promise<IAssociationScore>;
 
         /**
          * Returns the handle of a bookmark.
-         * @param {String} qId - Identifier of the bookmark.
-         * @returns {Promise} - return a Promise of IGenericBookmark.
+         * @param qId - Identifier of the bookmark.
+         * @returns - return a Promise of IGenericBookmark.
          */
         getBookmark(qId: string): Promise<IGenericBookmark>;
 
         /**
          * Returns a list of bookmarks in the app.
-         * @param {INxGetBookmarkOptions} qOptions - Information about the list of bookmarks.
-         * @returns {Promise} - return a Promise of INxContainerEntry.
+         * @param qOptions - Information about the list of bookmarks.
+         * @returns - return a Promise of INxContainerEntry.
          */
         getBookmarks(qOptions: INxGetBookmarkOptions): Promise<INxContainerEntry<any>>;
 
@@ -2755,8 +2872,8 @@ declare namespace EngineAPI {
          * - The type of the connection
          * - The name of the connection
          * - The connection string
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @returns {Promise} - return a Connection.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @returns - return a Connection.
          */
         getConnection(qConnectionId: string): Promise<IConnection>;
 
@@ -2765,7 +2882,7 @@ declare namespace EngineAPI {
          *
          * Note: In Qlik Sense Enterprise, there is an additional file connection named AttachedFiles.
          * This connection is stored in the Qlik Sense repository.
-         * @returns {Promise} - return a Promise of Array of Connection.
+         * @returns - return a Promise of Array of Connection.
          */
         getConnections(): Promise<IConnection[]>;
 
@@ -2776,71 +2893,71 @@ declare namespace EngineAPI {
          * If this property is set to true, it means that the content library is app specific.
          *
          * Note: There is always one specific content library per app.
-         * @returns {Promise} - return a Promise of ContentLibraryList.
+         * @returns - return a Promise of ContentLibraryList.
          */
         getContentLibraries(): Promise<IContentLibraryList>;
 
         /**
          * Gives information about an ODBC, OLEDB or CUSTOM connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise of DatabaseInfo.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @returns - return a Promise of DatabaseInfo.
          */
         getDatabaseInfo(qConnectionId: string): Promise<IDatabaseInfo>;
 
         /**
          * Lists the owners of a database for a ODBC, OLEDB or CUSTOM connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qDatabase - Name of the database. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise Array of DatabaseOwner.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qDatabase - Name of the database. >> This parameter is mandatory.
+         * @returns - return a Promise Array of DatabaseOwner.
          */
         getDatabaseOwners(qConnectionId: string, qDatabase?: string): Promise<IDatabaseOwner[]>;
 
         /**
          * Lists the databases inside a ODBC, OLEDB or CUSTOM data source.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise Array of Database.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @returns - return a Promise Array of Database.
          */
         getDatabases(qConnectionId: string): Promise<IDatabase[]>;
 
         /**
          * Lists the fields inside a table of a database for a ODBC, OLEDB or CUSTOM connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qDatabase - Name of the database. >> This parameter is mandatory.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qDatabase - Name of the database. >> This parameter is mandatory.
          * (If qDatabase is not set then qOwner must be set.)
-         * @param {String} qOwner - Owner of the database. >> This parameter is mandatory.
+         * @param qOwner - Owner of the database. >> This parameter is mandatory.
          * (If qOwner is not set then qDatabase must be set.)
-         * @param {String} qTable - Name of the table. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise Array of DataField.
+         * @param qTable - Name of the table. >> This parameter is mandatory.
+         * @returns - return a Promise Array of DataField.
          */
         getDatabaseTableFields(qConnectionId: string, qTable: string, qDatabase?: string, qOwner?: string): Promise<IDataField[]>;
 
         /**
          * Retrieves the values of the specified table of a database for a ODBC, OLEDB or CUSTOM connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qDatabase - Name of the database. >> This parameter is mandatory.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qDatabase - Name of the database. >> This parameter is mandatory.
          * (If qDatabase is not set then qOwner must be set.)
-         * @param {String} qOwner - Owner of the database. >> This parameter is mandatory.
+         * @param qOwner - Owner of the database. >> This parameter is mandatory.
          * (If qOwner is not set then qDatabase must be set.)
-         * @param {String} qTable - Name of the table. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise Array of DataRecord.
+         * @param qTable - Name of the table. >> This parameter is mandatory.
+         * @returns - return a Promise Array of DataRecord.
          */
         getDatabaseTablePreview(qConnectionId: string, qTable: string, qDatabase?: string, qOwner?: string): Promise<IDataRecord[]>;
 
         /**
          * Lists the tables inside a database for a ODBC, OLEDB or CUSTOM connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qDatabase - Name of the database. >> This parameter is mandatory.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qDatabase - Name of the database. >> This parameter is mandatory.
          * (If qDatabase is not set then qOwner must be set.)
-         * @param {String} qOwner - Owner of the database. >> This parameter is mandatory.
+         * @param qOwner - Owner of the database. >> This parameter is mandatory.
          * (If qOwner is not set then qDatabase must be set.)
-         * @returns {Promise} - return a Promise Array of DataTable.
+         * @returns - return a Promise Array of DataTable.
          */
         getDatabaseTables(qConnectionId: string, qDatabase?: string, qOwner?: string): Promise<IDataTable[]>;
 
         /**
          * Returns the handle of a dimension.
-         * @param {String} qId - Identifier of the dimension. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise GenericDimension.
+         * @param qId - Identifier of the dimension. >> This parameter is mandatory.
+         * @returns - return a Promise GenericDimension.
          */
         getDimension(qId: string): Promise<IGenericDimension>;
 
@@ -2849,67 +2966,74 @@ declare namespace EngineAPI {
          * This section contains Set statements that give localized information from the regional settings of the computer.
          *
          * Note: The computer regional settings are retrieved when the engine starts.
-         * @param {String} qLocalizedMainSection - Name of the script section. The default value is Main. This parameter is optional.
-         * @returns {Promise} - return a Promise <List of script variables>.
+         * @param qLocalizedMainSection - Name of the script section. The default value is Main. This parameter is optional.
+         * @returns - return a Promise <List of script variables>.
          */
         getEmptyScript(qLocalizedMainSection?: string): Promise<string>;
 
         /**
          * Retrieves the variables that are tagged as favorite.
-         * @returns {Promise} - return a Promise 	Array of String
+         * @returns - return a Promise 	Array of String
          */
         getFavoriteVariables(): Promise<string[]>;
 
         /**
          * Retrieves the description of a field.
-         * @param {String} qFieldName - Name of the field. >> This parameter is mandatory
-         * @returns {Promise} - return a Promise of FieldDescription.
+         * @param qFieldName - Name of the field. >> This parameter is mandatory
+         * @returns - return a Promise of FieldDescription.
          */
         getFieldDescription(qFieldName: string): Promise<IFieldDescription>;
 
+        /**
+         * Fetches the Expression behind a Field that is declared with DECLARE FIELD DEFINITIO
+         * @param qReadableName: name of a Field that is declared with DECLARE FIELD DEFINITION
+         * @returns qname wich contains the expression
+         */
+        getFieldOnTheFlyByName(qReadableName: string): Promise<{qName: string}>;
+
         /**
          * Retrieves the description of a field.
-         * @param {String} qFieldName - Name of the field. >> This parameter is mandatory.
-         * @param {String} qStateName - Name of the alternate state. This parameter is optional. Default state is current selections.
-         * @returns {Promise} - return a Promise of FieldDescription.
+         * @param qFieldName - Name of the field. >> This parameter is mandatory.
+         * @param qStateName - Name of the alternate state. This parameter is optional. Default state is current selections.
+         * @returns - return a Promise of FieldDescription.
          */
         getField(qFieldName: string, qStateName?: string): Promise<IField>;
 
         /**
          * Lists the fields of a table for a folder connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qRelativePath - Path of the connection file. This parameter is optional.
-         * @param {FileDataFormat} qDataFormat - Type of the file.
-         * @param {String} qTable - Name of the table. This parameter must be set for XLS, XLSX, HTML and XML files.
-         * @returns {Promise} - return a Promise Array of DataField or String.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qRelativePath - Path of the connection file. This parameter is optional.
+         * @param qDataFormat - Type of the file.
+         * @param qTable - Name of the table. This parameter must be set for XLS, XLSX, HTML and XML files.
+         * @returns - return a Promise Array of DataField or String.
          */
         getFileTableFields(qConnectionId: string, qDataFormat: IFileDataFormat, qTable: string, qRelativePath?: string): Promise<IDataField[]> | Promise<string>;
 
         /**
          * Lists the values in a table for a folder connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qRelativePath - Path of the connection file. This parameter is optional.
-         * @param {FileDataFormat} qDataFormat - Type of the file.
-         * @param {String} qTable - Name of the table. This parameter must be set for XLS, XLSX, HTML and XML files.
-         * @returns {Promise} - return a Promise <Array of DataField> or <String>.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qRelativePath - Path of the connection file. This parameter is optional.
+         * @param qDataFormat - Type of the file.
+         * @param qTable - Name of the table. This parameter must be set for XLS, XLSX, HTML and XML files.
+         * @returns - return a Promise <Array of DataField> or <String>.
          */
         getFileTablePreview(qConnectionId: string, qRelativePath: string, qDataFormat: IFileDataFormat, qTable: string): Promise<IDataRecord[]> | Promise<string>;
 
         /**
          * Lists the tables and fields of a JSON or XML file for a folder connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qRelativePath - Path of the connection file. This parameter is optional.
-         * @param {FileDataFormat} qDataFormat - Type of the file.
-         * @returns {Promise} - return a Promise Array of DataTableEx.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qRelativePath - Path of the connection file. This parameter is optional.
+         * @param qDataFormat - Type of the file.
+         * @returns - return a Promise Array of DataTableEx.
          */
         getFileTablesEx(qConnectionId: string, qRelativePath: string, qDataFormat: IFileDataFormat): Promise<IDataTableEx[]>;
 
         /**
          * Lists the tables for a folder connection.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qRelativePath - Path of the connection file. This parameter is optional.
-         * @param {FileDataFormat} qDataFormat - Type of the file.
-         * @returns {Promise} - return a Promise Array of DataTable.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qRelativePath - Path of the connection file. This parameter is optional.
+         * @param qDataFormat - Type of the file.
+         * @returns - return a Promise Array of DataTable.
          */
         getFileTables(qConnectionId: string, qRelativePath: string, qDataFormat: IFileDataFormat): Promise<IDataTable[]>;
 
@@ -2917,32 +3041,38 @@ declare namespace EngineAPI {
          * There are two ways to specify the directory to retrieve the files from:
          * - Enter the connection identifier; the directory associated to the connection is used.
          * - Enter the connection identifier and a relative path
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {String} qRelativePath - Path of the connection file. This parameter is optional.
-         * @returns {Promise} - return a Promise Array of FolderItem.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qRelativePath - Path of the connection file. This parameter is optional.
+         * @returns - return a Promise Array of FolderItem.
          */
         getFolderItemsForConnection(qConnectionId: string, qRelativePath: string): Promise<IFolderItem[]>;
 
         /**
          * Gets the content of a file.
-         * @param {String} qLibPath - ["lib://CONNECTION_NAME\\<the name of the file you want to use>.txt"] or
+         * @param qLibPath - ["lib://CONNECTION_NAME\\<the name of the file you want to use>.txt"] or
          * - ["lib://Connection_Name\\<Folder under your connection>\\<the name of the file you want to use>.txt"]
          * - [ ] should be used when having a lib reference in the first variable.
-         * @returns {Promise} - return a Promise of String.
+         * @returns - return a Promise of String.
          */
         getIncludeFileContent(qLibPath: string): Promise<string>;
 
         /**
          * Returns the content of a library.
-         * @param {String} qName - Name of the content library. It corresponds to the property
+         * @param qName - Name of the content library. It corresponds to the property
          * qContentLibraryListItem/qName returned by the GetContentLibraries method.
-         * @returns {Promise} - return a Promise of StaticContentList.
+         * @returns - return a Promise of StaticContentList.
          */
         getLibraryContent(qName: string): Promise<IStaticContentList>;
 
+        /**
+         * Returns the lineage of the datamodel.
+         * @returns - return a Promise of qLineage.
+         */
+        getLineage(): Promise<{ qLineage: Array<{ qDiscriminator: string }> }>;
+
         /**
          * Retrieves locale information.
-         * @returns {Promise} - return a Promise of LocaleInfo.
+         * @returns - return a Promise of LocaleInfo.
          */
         getLocaleInfo(): Promise<ILocaleInfo>;
 
@@ -2957,7 +3087,7 @@ declare namespace EngineAPI {
          *
          * Note: The last three values in the vector are extra values. These values are for internal use.
          * Note: In case of circular references, the engine automatically create loosely coupled tables
-         * @returns {Promise} - return a Promise <Array of bytes>.
+         * @returns - return a Promise <Array of bytes>.
          */
         getLooselyCoupledVector(): Promise<number[]>;
 
@@ -2965,13 +3095,13 @@ declare namespace EngineAPI {
          * Retrieves any fields that match all or one of the specified tags in the data model of an app.
          *
          * Note: Tags set by Qlik Sense are prefixed by the $ sign.
-         * @param {Array} qTags - List of tags. Array of String
+         * @param qTags - List of tags. Array of String
          * The GetMatchingFields method looks for fields that match one or all of the tags in this list,
          * depending on the value of qMatchingFieldMode.
-         * @param {String} qMatchingFieldMode - Matching field mode.
+         * @param qMatchingFieldMode - Matching field mode.
          * This parameter is optional.
          * The default value is 0.
-         * @returns {Promise} - return a Promise Array of NxMatchingFieldInfo.
+         * @returns - return a Promise Array of NxMatchingFieldInfo.
          */
         getMatchingFields(qTags: string[], qMatchingFieldMode?: boolean): Promise<INxMatchingFieldInfo[]>;
 
@@ -2979,31 +3109,31 @@ declare namespace EngineAPI {
          * Lists the media files.
          *
          * Note: This method is deprecated (not recommended to use). Use GetLibraryContent method instead.
-         * @returns {Promise} - return a Promise Boolean or MediaList
+         * @returns - return a Promise Boolean or MediaList
          */
         getMediaList(): Promise<MediaList[]> | Promise<boolean>;
 
         /**
          * Returns the handle of a measure.
          *
-         * @param {String} qId - Identifier of the measure. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise String GenericMeasure
+         * @param qId - Identifier of the measure. >> This parameter is mandatory.
+         * @returns - return a Promise String GenericMeasure
          */
         getMeasure(qId: string): Promise<IGenericMeasure>;
 
         /**
          * Returns the type of the app object and the corresponding handle.
          *
-         * @param {String} qId - Identifier of the measure. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise String GenericObject
+         * @param qId - Identifier of the measure. >> This parameter is mandatory.
+         * @returns - return a Promise String GenericObject
          */
         getObject(qId: string): Promise<IGenericObject>;
 
         /**
          * Returns a list of objects in the app.
          *
-         * @param {INxGetObjectOptions} qOptions - Information about the list of objects.
-         * @returns {Promise} - return a Promise array of NxContainerEntry.
+         * @param qOptions - Information about the list of objects.
+         * @returns - return a Promise array of NxContainerEntry.
          */
         getObjects(qOptions: INxGetObjectOptions): Promise<INxContainerEntry<any>>;
 
@@ -3013,7 +3143,7 @@ declare namespace EngineAPI {
          * Returns the identifier and the definition of the measure.
          *
          * Note: If the member delta is set to true in the request object, only the delta is retrieved.
-         * @returns {Promise} - return a Promise GenericObject
+         * @returns - return a Promise GenericObject
          */
         getProperties(): Promise<INxAppProperties>;
 
@@ -3021,27 +3151,27 @@ declare namespace EngineAPI {
          * Lists the breakpoints in the script of an app.
          *
          * Returns information about the breakpoints. <Array of EditorBreakpoint>
-         * @returns {Promise} - return a Promise Array of EditorBreakpoint
+         * @returns - return a Promise Array of EditorBreakpoint
          */
         getScriptBreakpoints(): Promise<IEditorBreakpoint[]>;
 
         /**
          * Gets values in script.
-         * @returns {Promise} - return a Promise String <script values>
+         * @returns - return a Promise String <script values>
          */
         getScript(): Promise<string>;
 
         /**
          * Retrieves the data of a specific table.
-         * @param {Integer} qOffset - Position from the top
+         * @param qOffset - Position from the top
          * starting from 0.
          * If the offset is set to 0,
          * the rows starting from the position/index 0 are shown.
-         * @param {Integer} qRows - Number of rows to show.
-         * @param {Boolean} qSyntheticMode - If this parameter is set to true, the internal data/table representation is shown.
+         * @param qRows - Number of rows to show.
+         * @param qSyntheticMode - If this parameter is set to true, the internal data/table representation is shown.
          * Synthetic fields are present (if any).
-         * @param {String} qTableName - Name of the table.
-         * @returns {Promise} - return a Promise Array of TableRow.
+         * @param qTableName - Name of the table.
+         * @returns - return a Promise Array of TableRow.
          */
         getTableData(qOffset: number, qRows: number, qSyntheticMode: boolean, qTableName: string): Promise<ITableRow[]>;
 
@@ -3052,16 +3182,16 @@ declare namespace EngineAPI {
          * - the list of derived fields
          * - the list of key fields
          *
-         * @param {Size} qWindowSize - Defines the size of the window that is used to display the results.
-         * @param {Size} qNullSize
-         * @param {Integer} qCellHeight - Height of a cell in a table in pixels.
-         * @param {Boolean} qSyntheticMode  One of:
+         * @param qWindowSize - Defines the size of the window that is used to display the results.
+         * @param qNullSize - (no infos in help)
+         * @param qCellHeight - Height of a cell in a table in pixels.
+         * @param qSyntheticMode  One of:
          *   - true for internal table viewer
          *   - false for source table viewer
          *
          * >> This parameter is mandatory.
-         * @param {Boolean} qIncludeSysVars - If set to true, the system variables are included.
-         * @returns {Promise} - return a Promise <Array of TableRecord> or <Array of SourceKeyRecord>
+         * @param qIncludeSysVars - If set to true, the system variables are included.
+         * @returns - return a Promise <Array of TableRecord> or <Array of SourceKeyRecord>
          */
         getTablesAndKeys(qWindowSize: ISize, qNullSize: ISize, qCellHeight: number, qSyntheticMode: boolean, qIncludeSysVars: boolean): Promise<ITableRecord[]> | Promise<ISourceKeyRecord[]>;
 
@@ -3069,7 +3199,7 @@ declare namespace EngineAPI {
          * Fetches updated variables after a statement execution.
          *
          * Returns: List of variables. <Array of TextMacro>
-         * @returns {Promise} - return a Promise Array of TextMacro
+         * @returns - return a Promise Array of TextMacro
          */
         getTextMacros(): Promise<ITextMacro[]>;
 
@@ -3078,22 +3208,22 @@ declare namespace EngineAPI {
          *
          * Note: This method is deprecated (not recommended to use).
          * Use GetVariableById method or GetVariableByName method instead.
-         * @param {String} qName - Name of the variable. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise Variable
+         * @param qName - Name of the variable. >> This parameter is mandatory.
+         * @returns - return a Promise Variable
          */
         getVariable(qName: string): Promise<IVariable>;
 
         /**
          * Gets the handle of a variable.
-         * @param {String} qId - Identifier of the variable. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise GenericVariable
+         * @param qId - Identifier of the variable. >> This parameter is mandatory.
+         * @returns - return a Promise GenericVariable
          */
         getVariableById(qId: string): Promise<IGenericVariable>;
 
         /**
          * Gets the handle of a variable.
-         * @param {String} qName - Name of the variable. >> This parameter is mandatory.
-         * @returns {Promise} - return a Promise GenericVariable
+         * @param qName - Name of the variable. >> This parameter is mandatory.
+         * @returns - return a Promise GenericVariable
          */
         getVariableByName(qName: string): Promise<IGenericVariable>;
 
@@ -3101,7 +3231,7 @@ declare namespace EngineAPI {
          * Retrieves information about the position of the tables in the data model viewer.
          *
          * Note: The position of the broom points and the position of the connection points cannot be retrieved in Qlik Sense.
-         * @returns {Promise} - return a Promise of TableViewDlgSaveInfo
+         * @returns - return a Promise of TableViewDlgSaveInfo
          */
         getViewDlgSaveInfo(): Promise<ITableViewDlgSaveInfo>;
 
@@ -3121,34 +3251,50 @@ declare namespace EngineAPI {
          * - JSON for JSON format
          * - KML for KML file
          *
-         * @param {String} qConnectionId - Identifier of the connection file. >> This parameter is mandatory.
-         * @param {String} qRelativePath - Path of the connection file. This parameter is optional.
-         * @returns {Promise} - return a Promise of FileDataFormat
+         * @param qConnectionId - Identifier of the connection file. >> This parameter is mandatory.
+         * @param qRelativePath - Path of the connection file. This parameter is optional.
+         * @returns - return a Promise of FileDataFormat
          */
         guessFileType(qConnectionId: string, qRelativePath: string): Promise<IFileDataFormat>;
 
         /**
          * Locks all selections in all fields of the current app.
          *
-         * @param {string} qStateName - Alternate state name.
+         * @param qStateName - Alternate state name.
          * If this parameter is set, the method locks all selections that are in the specified state name.
          * This parameter is optional.
          * The default value is an empty string.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         lockAll(qStateName: string): Promise<void>;
 
+        /**
+         * migrateDerivedFields.
+         *
+         * Note: from shema file
+         * @returns - A promise of a Qlik engine reply.
+         */
+        migrateDerivedFields(): Promise<void>;
+
+        /**
+         * migrateDerivedFields.
+         *
+         * Note: from shema file
+         * @returns - A promise of a Qlik engine reply.
+         */
+        migrateVariables(): Promise<void>;
+
         /**
          * Updates a connection.
          *
          * Note: The identifier of a connection cannot be updated. qType cannot be modified with the ModifyConnection method.
-         * @param {String} qConnectionId - Identifier of the connection. >> This parameter is mandatory.
-         * @param {Connection} qConnection - Information about the connection.
+         * @param qConnectionId - Identifier of the connection. >> This parameter is mandatory.
+         * @param qConnection - Information about the connection.
          * Properties that can be updated.
          * >> This parameter is mandatory.
-         * @param {Boolean} qOverrideCredentials - Set this parameter to true to override the user name and password.
+         * @param qOverrideCredentials - Set this parameter to true to override the user name and password.
          * This parameter is optional.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         modifyConnection(qConnectionId: string, qConnection: IConnection, qOverrideCredentials: boolean): Promise<void>;
 
@@ -3158,10 +3304,10 @@ declare namespace EngineAPI {
          *
          * Note: This operation is possible only in Qlik Sense Enterprise.
          * Note: An app can only be published once and cannot be published to more than one stream.
-         * @param {String} qStreamId - Identifier of the stream.
-         * @param {String} qName - ame of the published app.
+         * @param qStreamId - Identifier of the stream.
+         * @param qName - ame of the published app.
          * This parameter is optional. If this parameter is not set, the engine automatically gives a new name to the published app.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         publish(qStreamId: string, qName: string): Promise<void>;
 
@@ -3169,14 +3315,14 @@ declare namespace EngineAPI {
          * Redoes the previous operation.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         redo(): Promise<boolean>;
 
         /**
          * Removes an alternate state in the app.
-         * @param {String} qStateName - Name of the alternate state. >> This parameter is mandatory.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qStateName - Name of the alternate state. >> This parameter is mandatory.
+         * @returns - A promise of a Qlik engine reply.
          */
         removeAlternateState(qStateName: string): Promise<void>;
 
@@ -3185,15 +3331,15 @@ declare namespace EngineAPI {
          *
          * Note: This method is deprecated (not recommended to use).
          * Use DestroyVariableById method or DestroyVariableByName method instead.
-         * @param {String} qName - Name of the variable. Variable names are case sensitive.
+         * @param qName - Name of the variable. Variable names are case sensitive.
          * >> This parameter is mandatory.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         removeVariable(qName: string): Promise<boolean>;
 
         /**
          * Resumes the app as the user left it.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         resume(): Promise<void>;
 
@@ -3202,10 +3348,18 @@ declare namespace EngineAPI {
          *
          * Note: Data from the data model are not saved.
          * Note: This operation is possible only in Qlik Sense Enterprise.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         saveObjects(): Promise<void>;
 
+        /**
+         * Scramble a field in the qlik datamodel.
+         *
+         * @param qFieldName - Fieldname
+         * @returns - A promise of a Qlik engine reply.
+         */
+        scramble(qFieldName: string): Promise<void>;
+
         /**
          * Returns the search matches for one or more search terms.
          * The search results depend on the search context.
@@ -3213,25 +3367,25 @@ declare namespace EngineAPI {
          * See: SearchCombinationOptions
          *
          * Note: This method is deprecated (not recommended to use). Use SearchResults method instead.
-         * @param {SearchCombinationOptions} qOptions - Information about the search fields and the search context.
-         * @param {Array} qTerms - List of terms to search for.
-         * @param {SearchPage} qPage - Array of pages to retrieve.
+         * @param qOptions - Information about the search fields and the search context.
+         * @param qTerms - List of terms to search for.
+         * @param qPage - Array of pages to retrieve.
          * >> This parameter is mandatory.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         searchAssociations(qOptions: ISearchCombinationOptions, qTerms: string[], qPage: ISearchPage): Promise<void>;
 
         /**
          * Returns the generic objects corresponding to one or more search terms. The search is performed within the title,
          * subtitle, footnote and type. In addition, associated dimension values are also searched in. For example,
-         * if the country “Japan” is selected and the object contains the dimension City, the object will appear in the
-         * results for “Osaka” but not for “Johannesburg”. The generic objects with the following types will never appear
+         * if the country Japan is selected and the object contains the dimension City, the object will appear in the
+         * results for Osaka but not for Johannesburg. The generic objects with the following types will never appear
          * in the results: slideitem, sheet, story, slide, masterobject, snapshot, LoadModel, appprops and searchhistory.
-         * @param {SearchCombinationOptions} qOptions - Information about the search fields and the search context.
-         * @param {Array} qTerms - List of terms to search for.
-         * @param {SearchPage} qPage - Array of pages to retrieve.
+         * @param qOptions - Information about the search fields and the search context.
+         * @param qTerms - List of terms to search for.
+         * @param qPage - Array of pages to retrieve.
          * >> This parameter is mandatory.
-         * @returns {Promise} - A Promise of SearchResult
+         * @returns - A Promise of SearchResult
          */
         searchObjects(qOptions: ISearchObjectOptions, qTerms: string[], qPage: ISearchPage): Promise<ISearchResult>;
 
@@ -3253,19 +3407,19 @@ declare namespace EngineAPI {
          * For every search group, there are one or more search group items.
          * Each subgroup item contains results that correspond to an item type (for example a field).
          * For every search group item, there are one or several search matches. The position of the match in each search result is given.
-         * @param {SearchCombinationOptions} qOptions - Information about the search fields and the search context.
-         * @param {Array} qTerms - List of terms to search for.
-         * @param {SearchPage} qPage - Array of pages to retrieve.
+         * @param qOptions - Information about the search fields and the search context.
+         * @param qTerms - List of terms to search for.
+         * @param qPage - Array of pages to retrieve.
          * >> This parameter is mandatory.
-         * @returns {Promise} - A Promise List of SearchResults
+         * @returns - A Promise List of SearchResults
          */
         searchResults(qOptions: ISearchCombinationOptions, qTerms: string[], qPage: ISearchPage): Promise<ISearchResult>;
 
         /**
          * For every search group item, there are one or several search matches. The position of the match in each search result is given.
-         * @param {SearchCombinationOptions} qOptions - Information about the search combinations.
-         * @param {Array} qTerms - List of terms to search for. <Array of String>
-         * @returns {Promise} - A Promise List of SearchSuggestionResults
+         * @param qOptions - Information about the search combinations.
+         * @param qTerms - List of terms to search for. <Array of String>
+         * @returns - A Promise List of SearchSuggestionResults
          */
         searchSuggest(qOptions: ISearchCombinationOptions, qTerms: string[]): Promise<ISearchSuggestionResult>;
 
@@ -3273,50 +3427,50 @@ declare namespace EngineAPI {
          * Selects all search hits for a specified group.
          * The results depend on the search context.
          * See: SearchCombinationOptions
-         * @param {SearchCombinationOptions} qOptions - Information about the search fields and the search context.
-         * @param {Array} qTerms - List of terms to search for.
-         * @param {Integer} qMatchIx - Index (value of qId) of the search result to select.
-         * @param {Boolean} qSoftLock - This parameter is deprecated and should not be set.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qOptions - Information about the search fields and the search context.
+         * @param qTerms - List of terms to search for.
+         * @param qMatchIx - Index (value of qId) of the search result to select.
+         * @param qSoftLock - This parameter is deprecated and should not be set.
+         * @returns - A promise of a Qlik engine reply.
          */
         selectAssociations(qOptions: ISearchCombinationOptions, qTerms: string[], qMatchIx: number, qSoftLock: boolean): Promise<void>;
 
         /**
          * Sends a generic command to a custom connector.
          * For more information on the commands that can be sent to a custom connector, see the QVX SDK help.
-         * @param {String} qProvider - Connector file name. Command to be executed by the connector.
-         * @param {String} qCommand  One of:
+         * @param qProvider - Connector file name. Command to be executed by the connector.
+         * @param qCommand  One of:
          *                               - JsonRequest
          *                               - GetCustomCaption
          *                               - IsConnected
          *                               - DisableQlikViewSelectButton
          *                               - HaveStarField
-         * @param {String} qMethod - Method name to be used within the command. The available methods depend on the chosen connector.
-         * @param {Array} qParameters - Parameters of the command. No parameters are required. This parameter is optional.
-         * @param {String} qAppendConnection - Name of the connection. This parameter is optional.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qMethod - Method name to be used within the command. The available methods depend on the chosen connector.
+         * @param qParameters - Parameters of the command. No parameters are required. This parameter is optional.
+         * @param qAppendConnection - Name of the connection. This parameter is optional.
+         * @returns - A promise of a Qlik engine reply.
          */
         sendGenericCommandToCustomConnector(qProvider: string, qCommand: CommandType, qMethod: string, qParameters: string[], qAppendConnection: string[]): Promise<string>;
 
         /**
          * Sets properties to an app.
-         * @param {NxAppProperties} qProp - Information about the properties of an app. / NxAppProperties
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qProp - Information about the properties of an app. / NxAppProperties
+         * @returns - A promise of a Qlik engine reply.
          */
         setAppProperties(qProp: INxAppProperties): Promise<void>;
 
         /**
          * Set some variables as favorite.
-         * @param {Array} qNames - Variables to set as favorite.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qNames - Variables to set as favorite.
+         * @returns - A promise of a Qlik engine reply.
          */
         setFavoriteVariables(qNames: string[]): Promise<void>;
 
         /**
          * Limits the number of rows of data to load from a data source.
          * This method works when reloading in debug mode.
-         * @param {Integer} qLimit - Fetch limit. Number of rows to load.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qLimit - Fetch limit. Number of rows to load.
+         * @returns - A promise of a Qlik engine reply.
          */
         setFetchLimit(qLimit: number): Promise<void>;
 
@@ -3326,27 +3480,27 @@ declare namespace EngineAPI {
          * Note: The last three values in the vector are extra values. These values are for internal use.
          *
          * Note: The engine returns true if the vector has been updated.
-         * @param {Array} qv - <Array of Byte> Vector of loosely coupled state flags, one element for each table in the app.
+         * @param qv - <Array of Byte> Vector of loosely coupled state flags, one element for each table in the app.
          * Set the flag to 1 to loose a table.
          * Set the flag to 0 to not loose a table.
          *
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         setLooselyCoupledVector(qv: number[]): Promise<boolean>;
 
         /**
          * Set some breakpoints in the script of an app.
          *
-         * @param {Array} qBreakpoints - Information about the breakpoints. <Array of EditorBreakpoint>
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qBreakpoints - Information about the breakpoints. <Array of EditorBreakpoint>
+         * @returns - A promise of a Qlik engine reply.
          */
         setScriptBreakpoints(qBreakpoints: IEditorBreakpoint[]): Promise<void>;
 
         /**
          * Sets values in script.
          *
-         * @param {String} qScript - Script content
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qScript - Script content
+         * @returns - A promise of a Qlik engine reply.
          */
         setScript(qScript: string): Promise<void>;
 
@@ -3354,8 +3508,8 @@ declare namespace EngineAPI {
          * Sets the positions of the tables in the data model viewer.
          *
          * Note: The position of the broom points and the position of the connection points cannot be set in Qlik Sense.
-         * @param {TableViewDlgSaveInfo} qInfo - Information about the table.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qInfo - Information about the table.
+         * @returns - A promise of a Qlik engine reply.
          */
         setViewDlgSaveInfo(qInfo: ITableViewDlgSaveInfo): Promise<void>;
 
@@ -3363,19 +3517,18 @@ declare namespace EngineAPI {
          * Undoes the previous operation.
          *
          * Note: The operation is successful if qSuccess is set to true.
-         * @param {String} qScript - Script content
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         undo(): Promise<boolean>;
 
         /**
          * Unlocks all selections in all fields of the current app.
          *
-         * @param {String} qStateName - Alternate state name.
+         * @param qStateName - Alternate state name.
          * If this parameter is set, the method unlocks all selections that are in the specified state name.
          * This parameter is optional.
          * The default value is an empty string.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         unlockAll(qStateName: string): Promise<void>;
     }
@@ -3391,10 +3544,10 @@ declare namespace EngineAPI {
     interface IField {
         /**
          * Maintains the selections in the current field while clearing the selections in the other fields.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         clearAllButThis(qSoftLock?: boolean): Promise<boolean>;
 
@@ -3402,7 +3555,7 @@ declare namespace EngineAPI {
          * Clears the selections in a specific field.
          *
          * Note: The operation is successful if qReturn is set to true.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         clear(): Promise<boolean>;
 
@@ -3410,7 +3563,7 @@ declare namespace EngineAPI {
          * Returns the AND mode status of a field.
          *
          * Note: The field is in AND mode if qReturn is set to true.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         getAndMode(): Promise<boolean>;
 
@@ -3418,13 +3571,13 @@ declare namespace EngineAPI {
          * Retrieves the number of distinct values in a field.
          *
          * Note: The field is in AND mode if qReturn is set to true.
-         * @returns {Promise} - A promise a number <cardinal value>
+         * @returns - A promise a number <cardinal value>
          */
         getCardinal(): Promise<number>;
 
         /**
          * Gets the properties of a field.
-         * @returns {Promise} - A promise of NxFieldProperties
+         * @returns - A promise of NxFieldProperties
          */
         getNxProperties(): Promise<INxFieldProperties>;
 
@@ -3432,7 +3585,7 @@ declare namespace EngineAPI {
          * Locks all selected values of a specific field.
          *
          * Note: The operation is successful if Return is set to true.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         lock(): Promise<boolean>;
 
@@ -3440,14 +3593,14 @@ declare namespace EngineAPI {
          * Selects some values in a field, by entering the element numbers related to the values to select.
          *
          * Note: The operation is successful if qReturn is set to true.
-         * @param {Array} qValues - Indexes (or element numbers) of the values to select.
-         * @param {Boolean} qToggleMode - Set to true to keep any selections present in the list object.
+         * @param qValues - Indexes (or element numbers) of the values to select.
+         * @param qToggleMode - Set to true to keep any selections present in the list object.
          * If this parameter is set to false, selections made before accepting the list object search become alternative.
          * >> This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         lowLevelSelect(qValues: number[], qToggleMode: boolean, qSoftLock?: boolean): Promise<boolean>;
 
@@ -3455,10 +3608,10 @@ declare namespace EngineAPI {
          * Selects all values of a field. Excluded values are also selected.
          *
          * Note: The operation is successful if qReturn is set to true.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         selectAll(qSoftLock?: boolean): Promise<boolean>;
 
@@ -3466,10 +3619,10 @@ declare namespace EngineAPI {
          * Selects all alternatives values in a specific field.
          *
          * Note: In a field that contains at least one selected value, the values that are neither selected nor excluded are alternatives values.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         selectAlternative(qSoftLock?: boolean): Promise<boolean>;
 
@@ -3477,10 +3630,10 @@ declare namespace EngineAPI {
          * Inverts the current selections.
          *
          * Note: In a field that contains at least one selected value, the values that are neither selected nor excluded are alternatives values.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         selectExcluded(qSoftLock?: boolean): Promise<boolean>;
 
@@ -3489,12 +3642,12 @@ declare namespace EngineAPI {
          *
          * Note: In a field that contains at least one selected value,
          * the values that are neither selected nor excluded are alternatives values.
-         * @param {String} qMatch - String to search for. Can contain wild cards or numeric search criteria.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qMatch - String to search for. Can contain wild cards or numeric search criteria.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @param {Integer} qExcludedValuesMode - Include excluded values in search. This parameter is optional.
-         * @returns {Promise} - A promise true or false
+         * @param qExcludedValuesMode - Include excluded values in search. This parameter is optional.
+         * @returns - A promise true or false
          */
         select(qMatch: string, qSoftLock?: boolean, qExcludedValuesMode?: number): Promise<boolean>;
 
@@ -3502,10 +3655,10 @@ declare namespace EngineAPI {
          * Selects all possible values in a specific field.
          *
          * Note: The operation is successful if qReturn is set to true.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         selectPossible(qSoftLock?: boolean): Promise<boolean>;
 
@@ -3513,12 +3666,12 @@ declare namespace EngineAPI {
          * Selects some values in a field, by entering the values to select.
          *
          * Note: The operation is successful if qReturn is set to true.
-         * @param {Array} qFieldValues - List of the values to select.
-         * @param {Boolean} qToggleMode - The default value is false. This parameter is optional.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qFieldValues - List of the values to select.
+         * @param qToggleMode - The default value is false. This parameter is optional.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         selectValues(qFieldValues: IFieldValue[], qToggleMode?: boolean, qSoftLock?: boolean): Promise<boolean>;
 
@@ -3526,10 +3679,10 @@ declare namespace EngineAPI {
          * Sets a field in the AND mode.
          *
          * Note: The operation is successful if Return is set to true.
-         * @param {Boolean} qAndMode - Specifies if the AND mode applies to the field.
+         * @param qAndMode - Specifies if the AND mode applies to the field.
          * Set this parameter to true to enter the AND mode.
          * >> This parameter is mandatory.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         setAndMode(qAndMode: boolean): Promise<void>;
 
@@ -3537,8 +3690,8 @@ declare namespace EngineAPI {
          * Sets some properties to a field.
          *
          * In addition to the properties described below, dynamic properties can be added.
-         * @param {NxFieldProperties} qProperties - Information about the properties of the field
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qProperties - Information about the properties of the field
+         * @returns - A promise of a Qlik engine reply.
          */
         setNxProperties(qProperties: INxFieldProperties): Promise<void>;
 
@@ -3546,19 +3699,19 @@ declare namespace EngineAPI {
          * Toggle selects field values matching a search string.
          *
          * In addition to the properties described below, dynamic properties can be added.
-         * @param {String} qMatch - String to search for. Can contain wild cards or numeric search criteria.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qMatch - String to search for. Can contain wild cards or numeric search criteria.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @param {Integer} qExcludedValuesMode - Include excluded values in search.
+         * @param qExcludedValuesMode - Include excluded values in search.
          * This parameter is optional.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         toggleSelect(qMatch: string, qSoftLock?: boolean, qExcludedValuesMode?: number): Promise<boolean>;
 
         /**
          * Unlocks all selected values of a specific field if the target (or handle ) is a field.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         unlock(): Promise<boolean>;
     }
@@ -3776,7 +3929,7 @@ declare namespace EngineAPI {
     interface IGenericBookmark {
         /**
          * Applies a bookmark.
-         * @returns {Promise} - A promise true or false
+         * @returns - A promise true or false
          */
         apply(): Promise<boolean>;
 
@@ -3784,11 +3937,22 @@ declare namespace EngineAPI {
          * Applies a patch to the properties of an object. Allows an update to some of the properties.
          *
          * Note: Applying a patch takes less time than resetting all the properties.
-         * @param {Array} qPatches - Array of patches.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qPatches - Array of patches.
+         * @returns - A promise of a Qlik engine reply.
          */
         applyPatches(qPatches: INxPatch[]): Promise<void>;
 
+        /**
+         * Get the selected values in the bookmark for a specific field.
+         *
+         * Note: from shema file
+         * @param qField - Name of the field
+         * @param qGetExcludedValues - Get Excluded Values
+         * @param qDataPage - Start and End of DataPage
+         * @returns - A promise of Array of FieldValues.
+         */
+        getFieldValues(qField: string, qGetExcludedValues: boolean, qDataPage: {"qStartIndex": number, "qEndIndex": number}): Promise<{qFieldValues: IFieldValue[]}>;
+
         /**
          * Returns:
          *
@@ -3796,27 +3960,27 @@ declare namespace EngineAPI {
          * - the identifier of the object
          *
          * Note: Applying a patch takes less time than resetting all the properties.
-         * @returns {Promise} - A promise InfoObject
+         * @returns - A promise InfoObject
          */
         getInfo(): Promise<INxInfo>;
 
         /**
          * Evaluates an object and displays its properties including the dynamic properties.
          * If the member delta is set to true in the request object, only the delta is evaluated..
-         * @returns {Promise} - A promise of GenericBookmarkLayout
+         * @returns - A promise of GenericBookmarkLayout
          */
         getLayout(): Promise<IGenericBookmarkLayout>;
 
         /**
          * Shows the properties of an object.
          * If the member delta is set to true in the request object, only the delta is retrieved.
-         * @returns {Promise} - A promise of GenericBookmarkProperties
+         * @returns - A promise of GenericBookmarkProperties
          */
         getProperties(): Promise<IGenericBookmarkProperties>;
 
         /**
          * Publishes a bookmark.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         publish(): Promise<void>;
 
@@ -3824,15 +3988,15 @@ declare namespace EngineAPI {
          * Sets some properties for a bookmark.
          *
          * Note: Applying a patch takes less time than resetting all the properties.
-         * @param {GenericBookmarkProperties} qProp - Information about the bookmark
+         * @param qProp - Information about the bookmark
          * >> This parameter is mandatory.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         setProperties(qProp: IGenericBookmarkProperties): Promise<void>;
 
         /**
          * Unpublishes a bookmark.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @returns - A promise of a Qlik engine reply.
          */
         unPublish(): Promise<void>;
     }
@@ -3903,7 +4067,7 @@ declare namespace EngineAPI {
         /**
          * Identifier and type of the dimension.
          */
-        qDim: INxLibraryMeasureDef;
+        qDim: INxLibraryDimensionDef;
 
         /**
          * Cardinal and tags related to the dimension.
@@ -3939,17 +4103,17 @@ declare namespace EngineAPI {
          * Applies a patch to the properties of an object. Allows an update to some of the properties.
          *
          * Note: Applying a patch takes less time than resetting all the properties.
-         * @param {Array} qPatches - Array of patches.
-         * @returns {Promise} - A promise of a Qlik engine reply.
+         * @param qPatches - Array of patches.
+         * @returns - A promise of a Qlik engine reply.
          */
         applyPatches(qPatches: INxPatch[]): Promise<void>;
 
         /**
          * Returns the definition of a dimension.
          *
-         * @returns {Promise} - A promise GenericDimension.
+         * @returns - A promise GenericDimension.
          */
-        getDimension(): Promise<IGenericDimension>;
+        getDimension(): Promise<IGenericDimensionProperties>;
 
         /**
          * Returns the type and identifier of the object.
@@ -3959,13 +4123,13 @@ declare namespace EngineAPI {
         /**
          * Evaluates a dimension and displays its properties, including the dynamic properties.
          *
-         * @returns {Promise} - A promise GenericDimensionLayout.
+         * @returns - A promise GenericDimensionLayout.
          */
         getLayout(): Promise<IGenericDimensionLayout>;
 
         /**
          * Return a lists the linked objects to a generic object, a dimension or a measure.
-         * @returns {Promise} - A promise Array of NxLinkedObjectInfo
+         * @returns - A promise Array of NxLinkedObjectInfo
          */
         getLinkedObjects(): Promise<INxLinkedObjectInfo[]>;
 
@@ -4785,39 +4949,139 @@ declare namespace EngineAPI {
          * Row index to select
          * Indexing starts from 0.
          * If the cell's type is:
-         *   D, the index is based on the data matrix.
-         *   T, the index is based on the top dimensions indexes
-         *   L, the index is based on the data matrix
+         * - D, the index is based on the data matrix.
+         * - T, the index is based on the top dimensions indexes
+         * - L, the index is based on the data matrix
          */
         qRow: number;
     }
 
-    /**
-     * ImplementOn...
-     */
-    interface IImplementOn {
+    interface INxTreeDataOption {
         /**
-         * register a function for events
-         * @param {String} event - function called if this event occures
-         * @param {object} func - function that is called
+         * Maximum number of nodes in the tree. If this limit is exceeded, no nodes are returned. All nodes are counted.
          */
-        on(event: "changed" | "closed", func: () => void): void;
+        MaxNbrOfNodes: number;
 
         /**
-         * manual emit an events
-         * @param {String} event - event that occures
+         * Defines areas of the tree to be fetched. Areas must be defined left to right.
          */
-        emit(event: "changed" | "closed"): void;
+        TreeNodes: INxPageTreeNode[];
 
-        // ? not in Docu
-        id: string;
+        /**
+         * Filters out complete dimensions from the fetched tree.
+         */
+        TreeLevels: INxPageTreeLevel;
+    }
+
+    interface INxPageTreeNode {
+        /**
+         * The area of the tree to be fetched. If no area is defined on a dimension, all existing nodes are included.
+         */
+        qArea: IRect;
+
+        /**
+         * When set to true, generated nodes (based on current selection) will be inserted into the returned tree even when
+         * there is no actual value. For example, suppose you are looking for hybrid car sales at all car dealerships.
+         * Normally, only dealerships where hybrid cars are sold would be part of the returned tree but with qAllValues set to true,
+         * all available dealerships will be included regardless if they sold any hybrid cars or not.
+         */
+        qAllValues: boolean;
+    }
+
+    interface INxPageTreeLevel {
+        /**
+         * The first dimension that is to be part of the tree, counted from the left.
+         * For example, if qLeft is equal to 1, omit nodes from the first dimension in the current sort order.
+         */
+        qLeft: number;
+
+        /**
+         * Number of dimensions to include in the tree.
+         */
+        qDepth: number;
+    }
+
+    interface INxTreeNode {
+        /**
+         * The text version of the value, if available.
+         */
+        qText: string;
+
+        /**
+         * Element number
+         */
+        qElemNo: number;
+
+        /**
+         * Row index in the data matrix.
+         * The indexing starts from 0.
+         */
+        qRow: number;
+
+        /**
+         * A generated number applicable to this page only. Used so that children can easily identify who their parents are.
+         */
+        qNodeNr: number;
+
+        /**
+         * The qNodeNr of this node's parent for the current page.
+         */
+        qParentNode: number;
+
+        /**
+         * Type of the cell.
+         */
+        qType: NxTreeNodeType;
+
+        /**
+         * The measures for this node.
+         */
+        qValues: INxTreeValue;
+
+        /**
+         * The children of this node in the tree structure.
+         */
+        qNodes: INxTreeNode;
+
+        /**
+         * Attribute expression values.
+         */
+        qAttrExps?: INxAttributeExpressionValues;
+
+        /**
+         * Attribute dimension values.
+         */
+        qAttrDims?: INxAttributeDimValues;
+    }
+
+    interface INxTreeValue {
+        /**
+         * The text version of the value, if available.
+         */
+        qText: string;
+
+        /**
+         * Value of the cell.
+         * Is set to NaN, if the value is not a number.
+         */
+        qValue: number;
+
+        /**
+         * Attribute expression values.
+         */
+        qAttrExps?: INxAttributeExpressionValues;
+
+        /**
+         * Attribute dimension values.
+         */
+        qAttrDims?: INxAttributeDimValues;
     }
 
     /**
      * This class describes all the methods that apply at generic object level.
      * The handle member in the JSON request for all methods listed in this section is the handle of the generic object.
      */
-    interface IGenericObject extends IImplementOn {
+    interface IGenericObject extends enigmaJS.IGeneratedAPI {
         /**
          * app describes all the methods that apply at app level.
          */
@@ -4828,9 +5092,9 @@ declare namespace EngineAPI {
          * Note: This method applies to list objects (objects with one dimension).
          * Note: After an abort on a list object search, the GetLayout method does not
          *       return any more search results but it does return the values in the field.
-         * @param {String} qPath - Path to the definition of the list object.
+         * @param qPath - Path to the definition of the list object.
          * For example, /qListObjectDef.
-         * @returns {Promise} -
+         * @returns -
          */
         abortListObjectSearch(qPath: string): Promise<void>;
 
@@ -4839,15 +5103,15 @@ declare namespace EngineAPI {
          *
          * Note: This method applies to list objects (objects with one dimension).
          * Note: The search results are displayed using the GetLayout method.
-         * @param {String} qPath - Path to the definition of the list object.
+         * @param qPath - Path to the definition of the list object.
          * For example, /qListObjectDef.
-         * @param {Boolean} qToggleMode - Set to true to keep any selections present in the list object.
+         * @param qToggleMode - Set to true to keep any selections present in the list object.
          * If this parameter is set to false, selections made before accepting the list object search become alternative.
          * >> This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * This parameter is optional.
-         * @returns {Promise} -
+         * @returns -
          */
         acceptListObjectSearch(qPath: string, qToggleMode: boolean, qSoftLock?: boolean): Promise<void>;
 
@@ -4862,12 +5126,12 @@ declare namespace EngineAPI {
          *
          * Note: Soft properties apply only to generic objects.
          * Check: Applying a patch takes less time than resetting all the properties.
-         * @param {Array} qPatches - Array of patches.
-         * @param {Boolean} qSoftPatch - If set to true, it means that the properties to be applied are not persistent.
+         * @param qPatches - Array of patches.
+         * @param qSoftPatch - If set to true, it means that the properties to be applied are not persistent.
          * The patch is a soft patch.
          * This parameter is optional.
          * Default is false.
-         * @returns {Promise} -
+         * @returns -
          */
         applyPatches(qPatches: INxPatch[], qSoftPatch?: boolean): Promise<void>;
 
@@ -4887,59 +5151,59 @@ declare namespace EngineAPI {
          *
          * A sheet contains a list object and a chart. If the list object is in selection mode then the chart cannot be in selection mode.
          * No selection on the chart can be made until the list object exits the selection mode.
-         * @param {Array} qPaths - List of the paths to the definition of the objects to enter selection mode.
+         * @param qPaths - List of the paths to the definition of the objects to enter selection mode.
          * For example, /qListObjectDef.
-         * @returns {Promise} -
+         * @returns -
          */
         beginSelections(qPaths: string[]): Promise<void>;
 
         /**
          * Clears the selections in a dimension of a visualization.
-         * @param {String} qPath - Path to the definition of the visualization.
+         * @param qPath - Path to the definition of the visualization.
          * For example, /qListObjectDef.
-         * @param {Array} qColIndices - Array of dimension numbers or indexes. The selections are cleared in the specified dimensions.
+         * @param qColIndices - Array of dimension numbers or indexes. The selections are cleared in the specified dimensions.
          * Dimension numbers/indexes start from 0.
          * This parameter is optional. If this parameter is not set, all dimensions are cleared.
-         * @returns {Promise} -
+         * @returns -
          */
         clearSelections(qPath: string, qColIndices?: number[]): Promise<void>;
 
         /**
          * Clears the soft properties of a generic object.
          * For more information on how to add soft properties to a generic object,
-         * @returns {Promise} -
+         * @returns -
          */
         clearSoftPatches(): Promise<void>;
 
         /**
          * Collapses the left dimensions of a pivot table. This method applies only to pivot tables that are not always fully expanded.
          * In the definition of the hypercube (in HyperCubeDef), the parameter qAlwaysFullyExpanded must be set to false.
-         * @param {String} qPath - Path to the definition of the object to be collapsed
+         * @param qPath - Path to the definition of the object to be collapsed
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Integer} qRow - Row index in the data matrix.
+         * @param qRow - Row index in the data matrix.
          * Indexing starts from 0.
-         * @param {Integer} qCol - Column index. The index is based on the left dimension indexes.
+         * @param qCol - Column index. The index is based on the left dimension indexes.
          * Indexing starts from 0.
-         * @param {Boolean} qAll - If set to true, it collapses all cells.
+         * @param qAll - If set to true, it collapses all cells.
          * Parameters qRow and qCol are not used if qAll is set to true, but they need to be set (for example to 0).
-         * @returns {Promise} -
+         * @returns -
          */
         collapseLeft(qPath: string, qRow: number, qCol: number, qAll: boolean): Promise<void>;
 
         /**
          * Collapses the top dimensions of a pivot table. This method applies only to pivot tables that are not always fully expanded.
          * In the definition of the hypercube (in HyperCubeDef), the parameter qAlwaysFullyExpanded must be set to false.
-         * @param {String} qPath - Path to the definition of the object to be collapsed
+         * @param qPath - Path to the definition of the object to be collapsed
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Integer} qRow - Row index in the data matrix.
+         * @param qRow - Row index in the data matrix.
          * Indexing starts from 0.
-         * @param {Integer} qCol - Column index. The index is based on the left dimension indexes.
+         * @param qCol - Column index. The index is based on the left dimension indexes.
          * Indexing starts from 0.
-         * @param {Boolean} qAll - If set to true, it collapses all cells.
+         * @param qAll - If set to true, it collapses all cells.
          * Parameters qRow and qCol are not used if qAll is set to true, but they need to be set (for example to 0).
-         * @returns {Promise} -
+         * @returns -
          */
         collapseTop(qPath: string, qRow: number, qCol: number, qAll: boolean): Promise<void>;
 
@@ -4948,8 +5212,8 @@ declare namespace EngineAPI {
          * The source object is specified by the parameter qFromId and the destination object is referenced by its handle.
          *
          * Note: The identifier of the destination object is the same as before the copy takes place.
-         * @param {GenericObjectProperties} qFromId - Identifier of the object to copy.
-         * @returns {Promise} -
+         * @param qFromId - Identifier of the object to copy.
+         * @returns -
          */
         copyFrom(qFromId: IGenericObjectProperties): Promise<void>;
 
@@ -4962,22 +5226,22 @@ declare namespace EngineAPI {
          *
          * Note: In addition to the parameters specified above, the parameter qProp
          * can get any properties defined in the Generic objects section.
-         * @param {GenericObjectProperties} qProp - Information about the child
+         * @param qProp - Information about the child
          * >> This parameter is mandatory.
          * It is possible to create a child that is linked to another object.
-         * @param {GenericObjectProperties} qPropForThis - This parameter is optional.
+         * @param qPropForThis - This parameter is optional.
          * Identifier of the parent's object.
          * Should be set to update the properties of the parent's object at the same time the child is created.
-         * @returns {Promise} - A Promise of GenericObject
+         * @returns - A Promise of GenericObject
          */
         createChild(qProp: IGenericObjectProperties, qPropForThis?: IGenericObjectProperties): Promise<IGenericObject>;
 
         /**
          * Removes all children and all children to the children on an object.
-         * @param {GenericObjectProperties} qPropForThis - This parameter is optional.
+         * @param qPropForThis - This parameter is optional.
          * Identifier of the parent's object and property to update.
          * Should be set to update the properties of the parent's object at the same time the child is created.
-         * @returns {Promise} -
+         * @returns -
          */
         destroyAllChildren(qPropForThis?: IGenericObjectProperties): Promise<void>;
 
@@ -4988,12 +5252,12 @@ declare namespace EngineAPI {
          *
          * Note: Removing a linked object, invalidate the linking object.
          *
-         * @param {String} qid - Identifier of the child to remove.
+         * @param qid - Identifier of the child to remove.
          * >> This parameter is mandatory.
-         * @param {GenericObjectProperties} qPropForThis - This parameter is optional.
+         * @param qPropForThis - This parameter is optional.
          * Identifier of the parent's object and property to update.
          * Should be set to update the properties of the parent's object at the same time the child is created.
-         * @returns {Promise} - true or false
+         * @returns - true or false
          */
         destroyChild(qid: string, qPropForThis?: IGenericObjectProperties): Promise<boolean>;
 
@@ -5003,14 +5267,14 @@ declare namespace EngineAPI {
          * (from a detailed level to a less detailed level of information).
          * You can go back to previous visualizations up to the highest level of the hierarchy.
          * If you try to drill up more steps than there are available levels, the first level of the hierarchy is displayed.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Integer} qDimNo - Dimension number or index starting from 0
+         * @param qDimNo - Dimension number or index starting from 0
          * The default value is 0.
-         * @param {Integer} qNbrSteps - Number of steps you want to drill up.
+         * @param qNbrSteps - Number of steps you want to drill up.
          * The default value is 0.
-         * @returns {Promise} -
+         * @returns -
          */
         drillUp(qPath: string, qDimNo: number, qNbrSteps: number): Promise<void>;
 
@@ -5020,16 +5284,16 @@ declare namespace EngineAPI {
          * Note: Only one snapshot can be embedded in a generic object.
          * Note: If you embed a snapshot in an object that already contains a snapshot,
          * the new snapshot overwrites the previous one.
-         * @param {String} qId Identifier of the bookmark. >> This parameter is mandatory.
-         * @returns {Promise} -
+         * @param qId Identifier of the bookmark. >> This parameter is mandatory.
+         * @returns -
          */
         embedSnapshotObject(qId: string): Promise<void>;
 
         /**
          * Ends the selection mode on a visualization. The selections are accepted or aborted when exiting the selection mode,
          * depending on the qAccept parameter value.
-         * @param {Boolean} qAccept - Set this parameter to true to accept the selections before exiting the selection mode.
-         * @returns {Promise} -
+         * @param qAccept - Set this parameter to true to accept the selections before exiting the selection mode.
+         * @returns -
          */
         endSelections(qAccept: boolean): Promise<void>;
 
@@ -5037,16 +5301,16 @@ declare namespace EngineAPI {
          * Expands the left dimensions of a pivot table.
          * This method applies only to pivot tables that are not always fully expanded.
          * In the definition of the hypercube (in HyperCubeDef), the parameter qAlwaysFullyExpanded must be set to false.
-         * @param {String} qPath - Path to the definition of the object to be collapsed
+         * @param qPath - Path to the definition of the object to be collapsed
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Integer} qRow - Row index in the data matrix.
+         * @param qRow - Row index in the data matrix.
          * Indexing starts from 0.
-         * @param {Integer} qCol - Column index. The index is based on the left dimension indexes.
+         * @param qCol - Column index. The index is based on the left dimension indexes.
          * Indexing starts from 0.
-         * @param {Boolean} qAll - If set to true, it collapses all cells.
+         * @param qAll - If set to true, it collapses all cells.
          * Parameters qRow and qCol are not used if qAll is set to true, but they need to be set (for example to 0).
-         * @returns {Promise} -
+         * @returns -
          */
         expandLeft(qPath: string, qRow: number, qCol: number, qAll: boolean): Promise<void>;
 
@@ -5054,16 +5318,16 @@ declare namespace EngineAPI {
          * Expands the top dimensions of a pivot table.
          * This method applies only to pivot tables that are not always fully expanded.
          * In the definition of the hypercube (in HyperCubeDef), the parameter qAlwaysFullyExpanded must be set to false.
-         * @param {String} qPath - Path to the definition of the object to be collapsed
+         * @param qPath - Path to the definition of the object to be collapsed
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Integer} qRow - Row index in the data matrix.
+         * @param qRow - Row index in the data matrix.
          * Indexing starts from 0.
-         * @param {Integer} qCol - Column index. The index is based on the left dimension indexes.
+         * @param qCol - Column index. The index is based on the left dimension indexes.
          * Indexing starts from 0.
-         * @param {Boolean} qAll - If set to true, it collapses all cells.
+         * @param qAll - If set to true, it collapses all cells.
          * Parameters qRow and qCol are not used if qAll is set to true, but they need to be set (for example to 0).
-         * @returns {Promise} -
+         * @returns -
          */
         expandTop(qPath: string, qRow: number, qCol: number, qAll: boolean): Promise<void>;
 
@@ -5088,18 +5352,18 @@ declare namespace EngineAPI {
          * If the exported file is larger than the maximum value, then an out of memory error with code 13000 is returned.
          *
          * Note: Exported files are temporary and are available only for a certain time span and only to the user who created them.
-         * @param {FileType} qFileType - Type of the file to export. >> This parameter is mandatory.
-         * @param {String} qPath - Path to the definition of the object to be exported. For example, /qHyperCubeDef.
+         * @param qFileType - Type of the file to export. >> This parameter is mandatory.
+         * @param qPath - Path to the definition of the object to be exported. For example, /qHyperCubeDef.
          * >> This parameter is mandatory if the file type is CSV_C or CSV_T.
-         * @param {String} qFileName - Name of the exported file after download from browser.
+         * @param qFileName - Name of the exported file after download from browser.
          * This parameter is optional and only used in Qlik Sense Desktop.
-         * @param {ExportStateType} qExportState - Defines the values to be exported.
+         * @param qExportState - Defines the values to be exported.
          * This parameter is optional.
          * One of:
          *           P to export only the possible values
          *           A to export all values (default)
          *
-         * @returns {Promise} - A Promise of String qUrl: <url of the exported file> and qWarnings: [1000] only if exported data is truncated
+         * @returns - A Promise of String qUrl: <url of the exported file> and qWarnings: [1000] only if exported data is truncated
          */
         exportData(qFileType: FileType, qPath: string, qFileName?: string, qExportState?: ExportStateType): Promise<string>;
 
@@ -5108,15 +5372,15 @@ declare namespace EngineAPI {
          * If the child contains extra properties in qInfos,these properties are returned.
          *
          * Note: Full dynamic properties are optional and are returned if they exist in the definition of the object.
-         * @returns {Promise} - A Promise Array of NxInfo
+         * @returns - A Promise Array of NxInfo
          */
         getChildInfos(): Promise<INxInfo[]>;
 
         /**
          * Returns the type of the object and the corresponding handle.
-         * @param {String} qId - Identifier of the object.
+         * @param qId - Identifier of the object.
          * >> This parameter is mandatory.
-         * @returns {Promise} - A Promise of GenericObject
+         * @returns - A Promise of GenericObject
          */
         getChild(qId: string): Promise<IGenericObject>;
 
@@ -5124,7 +5388,7 @@ declare namespace EngineAPI {
          * Returns the identifier, the type and the properties of the object.
          * If the object contains some soft properties, the soft properties are returned.
          * If the object is linked to another object, the properties of the linking object are returned.
-         * @returns {Promise} - A Promise of GenericObjectProperties
+         * @returns - A Promise of GenericObjectProperties
          */
         getEffectiveProperties(): Promise<IGenericObjectProperties>;
 
@@ -5133,7 +5397,7 @@ declare namespace EngineAPI {
          *       - a generic object
          *       - the children of the generic object
          *       - the bookmarks/embedded snapshots of the generic object
-         * @returns {Promise} - A Promise  GenericObjectEntry
+         * @returns - A Promise  GenericObjectEntry
          */
         getFullPropertyTree(): Promise<IGenericObjectEntry>;
 
@@ -5151,33 +5415,33 @@ declare namespace EngineAPI {
          * Note: The generic object should contain two or three measures and one dimension.
          * When the refinement is high, the first two measures are represented on the x-axis and on the y-axis,
          * while the third measure is visualized as color or point size.
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Array} qPages - Array of pages to retrieve.
+         * @param qPages - Array of pages to retrieve.
          * Since the generic object contains two measures and one dimension, qWidth should be set to 3.
          * If the value of a measure is Null, the value cannot be rendered. Therefore, the number of
          * elements rendered in a page can be less than the number defined in the property qHeight.
          * >> This parameter is mandatory.
-         * @param {NxViewPort} qViewport - Defines the canvas and the zoom level.
+         * @param qViewport - Defines the canvas and the zoom level.
          * This parameter is not yet used and is optional.
-         * @param {Array} qDataRanges - Range of the data to render.
+         * @param qDataRanges - Range of the data to render.
          * This range applies to the measure values.
          * The lowest and highest values of a measure can be retrieved
          * by using the GetLayout method ( in /qHyperCube/qMeasureInfo).
          * >> This parameter is mandatory.
-         * @param {Integer} qMaxNbrCells - Maximum number of cells in the grid.
+         * @param qMaxNbrCells - Maximum number of cells in the grid.
          * >> This parameter is mandatory.
-         * @param {Integer} qQueryLevel - Level of details. The higher the level, the more detailed information you get (zoom-in).
+         * @param qQueryLevel - Level of details. The higher the level, the more detailed information you get (zoom-in).
          * When the number of points to render falls below a certain threshold,
          * the values are no longer rendered as cells but as points.
          * The query level should be no greater than 20.
          * This parameter is optional.
-         * @param {Integer} qBinningMethod - Selects the algorithm.
+         * @param qBinningMethod - Selects the algorithm.
          * The default value is 0.
          * One of:
          *           0: Adaptive grid
-         * @returns {Promise} - A Promise Array of NxDataPage
+         * @returns - A Promise Array of NxDataPage
          */
         getHyperCubeBinnedData(qPath: string, qPages: INxPage[], qViewport: INxViewPort, qDataRanges: INxDataAreaPage,
                                qMaxNbrCells: number, qQueryLevel: number, qBinningMethod: number): Promise<INxDataPage[]>;
@@ -5187,35 +5451,35 @@ declare namespace EngineAPI {
          *
          * Note: Binning is done on the time stamp data as well as the date.
          * This means that you can zoom in to a level of granularity as low as seconds.
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qHyperCubeDef. >> This parameter is mandatory.
-         * @param {Array} qOptions - Array of (NxContinuousDataOptions)
+         * @param qOptions - Array of (NxContinuousDataOptions)
          * Options.NbrPoints is number of bins for binning.
          * Options.MaxNbrTicks - maximum number of ticks.
-         * @returns {Promise} - A Promise <Boolean> or <Array of NxDataPage> or <Array of NxAxisData>
+         * @returns - A Promise <Boolean> or <Array of NxDataPage> or <Array of NxAxisData>
          */
         getHyperCubeContinuousData(qPath: string, qOptions: IContinuousDataOptions[]): Promise<boolean> | Promise<INxDataPage[]> | Promise<INxAxisData[]>;
 
         /**
          * Retrieves the values of a chart, a table, or a scatter plot. It is possible to retrieve specific pages of data.
          * Note: This method does not apply to stacked tables.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Array} qPages - <Array of NxPage> to retrieve.
+         * @param qPages - <Array of NxPage> to retrieve.
          * >> This parameter is mandatory.
-         * @returns {Promise} - A data set Array of NxDataPage
+         * @returns - A data set Array of NxDataPage
          */
         getHyperCubeData(qPath: string, qPages: INxPage[]): Promise<INxDataPage[]>;
 
         /**
          * Retrieves the values of a pivot table. It is possible to retrieve specific pages of data.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Array} qPages - Array of pages to retrieve
+         * @param qPages - Array of pages to retrieve
          * >> This parameter is mandatory.
-         * @returns {Promise} - A data set Array of NxPivotPage
+         * @returns - A data set Array of NxPivotPage
          */
         getHyperCubePivotData(qPath: string, qPages: INxPage[]): Promise<INxPivotPage[]>;
 
@@ -5249,40 +5513,49 @@ declare namespace EngineAPI {
          *
          * Example:
          * If you have a scatter plot chart and the zoom factor is set to 2, the scatter plot chart resolution is reduced by 4.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
-         * @param {Array} Pages - Array of NxPage.
-         * @param {Integer} qZoomFactor - Defines the zoom factor.
+         * @param Pages - Array of NxPage.
+         * @param qZoomFactor - Defines the zoom factor.
          * If set to -1, the engine decides of the zoom factor.
          * If the reduction mode is D1 or S, the zoom factor is 2n.
          * If the zoom factor is 5, the data are reduced by a factor 32.
          * If the reduction mode is C, the zoom factor defines the number of centroids.
-         * @param {String} qReductionMode - Defines the reduction mode.
+         * @param qReductionMode - Defines the reduction mode.
          * One of:
          *       - N for no data reduction.
          *       - D1 to reduce a bar chart or line chart. The profile of the chart is reduced whatever the number of dimensions in the chart.
          *       - S to reduce the resolution of a scatter plot.
          *       - C to reduce the data of a scatter plot chart.
          *       - ST to reduce the data of a stacked pivot table.
-         * @returns {Promise} - A data set Array of NxDataPage.
+         * @returns - A data set Array of NxDataPage.
          */
         getHyperCubeReducedData(qPath: string, qPages: INxPage[], qZoomFactor: number, qReductionMode: ReductionModeType): Promise<INxDataPage[]>;
 
         /**
          * Retrieves the values of a stacked pivot table. It is possible to retrieve specific pages of data.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
-         * @param {Array} Pages - Array of pages to retrieve.
+         * @param Pages - Array of pages to retrieve.
          * >> This parameter is mandatory.
-         * @param {Integer} qMaxNbrCells - Maximum number of cells at outer level.
+         * @param qMaxNbrCells - Maximum number of cells at outer level.
          * >> This parameter is optional. The default value is 10 000.
-         * @returns {Promise} - A data set Array of NxStackPage.
+         * @returns - A data set Array of NxStackPage.
          */
         getHyperCubeStackData(qPath: string, qPages: INxPage[], qMaxNbrCells?: number): Promise<INxStackPage[]>;
 
+        /**
+         * Retrieves the values of a stacked pivot table. It is possible to retrieve specific pages of data.
+         * @param qPath - Path to the definition of the object to be selected.
+         * For example, /qHyperCubeDef.
+         * @param qNodeOptions - Specifies all the paging filters needed to define the tree to be fetched.
+         * @returns - A data set Array of NxTreeNode.
+         */
+        getHyperCubeTreeData(qPath: string, qNodeOptions: INxTreeDataOption[]): Promise<INxTreeNode>;
+
         /**
          * Returns the type and identifier of the object.
-         * @returns {Promise} - A Promise of NxInfo.
+         * @returns - A Promise of NxInfo.
          */
         getInfo(): Promise<INxInfo>;
 
@@ -5294,33 +5567,33 @@ declare namespace EngineAPI {
          * Note: In addition to the parameters displayed above, the GetLayout method can return other properties according
          * to what is defined in the generic object. For example, if qHyperCubeDef is defined in the generic object,
          * the GetLayout method returns the properties described in HyperCube.
-         * @returns {Promise} - A Promise of GenericBaseLayout.
+         * @returns - A Promise of GenericBaseLayout.
          */
         getLayout(): Promise<IGenericBaseLayout>;
 
         /**
          * Lists the linked objects to a generic object, a dimension or a measure.
-         * @returns {Array} - Array of NxLinkedObjectInfo
+         * @returns - Array of NxLinkedObjectInfo
          */
         getLinkedObjects(): Promise<INxLinkedObjectInfo[]>;
 
         /**
          * GetListObjectContinuousData method
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qHyperCubeDef.
          * This parameter is mandatory.
-         * @param {Array} qOptions - Options.NbrPoints is number of bins for binning.
+         * @param qOptions - Options.NbrPoints is number of bins for binning.
          * - Options.MaxNbrTicks - maximum number of ticks.
-         * @returns {Promise} - A data set Array of (NxDataPage) or (NxAxisData)
+         * @returns - A data set Array of (NxDataPage) or (NxAxisData)
          */
         getListObjectContinuousData(qPath: string, qOptions: IContinuousDataOptions): Promise<INxDataPage[]> | Promise<INxAxisData[]>;
 
         /**
          * Retrieves the values of a list object.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qListObjectDef.
-         * @param {Array} qPages -Array of pages you are interested in.
-         * @returns {Promise} - Array of NxDataPage
+         * @param qPages -Array of pages you are interested in.
+         * @returns - Array of NxDataPage
          */
         getListObjectData(qPath: string, qPages: INxPage[]): Promise<INxDataPage[]>;
 
@@ -5334,21 +5607,21 @@ declare namespace EngineAPI {
          * by the GetProperties method. Use the GetEffectiveProperties method instead.
          *
          * Note: If the member delta is set to true in the request object, only the delta is retrieved.
-         * @returns {Promise} - A Promise of GenericObjectProperties
+         * @returns - A Promise of GenericObjectProperties
          */
         getProperties(): Promise<IGenericObjectProperties>;
 
         /**
          * Returns the type of the object and the corresponding handle.
-         * @returns {Promise} - A Promise of GenericBookmark
+         * @returns - A Promise of GenericBookmark
          */
         getSnapshotObject(): Promise<IGenericBookmark>;
 
         /**
          * Locks the selected values of a generic object.
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qListObjectDef.
-         * @param {Array} qColIndices - Dimension numbers or dimension indexes where the lock should apply.
+         * @param qColIndices - Dimension numbers or dimension indexes where the lock should apply.
          * Dimension numbers/indexes start from 0.
          * This parameter is optional. If this parameter is not set, the selected values in all dimensions are locked.
          */
@@ -5365,50 +5638,50 @@ declare namespace EngineAPI {
          * Make range selections in measures.
          *
          * Note: This method applies to hypercubes. For example, bar charts, tables and scatter plots.
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qListObjectDef.
          * >> This parameter is mandatory.
-         * @param {Array} qRanges - Ranges of selection.
+         * @param qRanges - Ranges of selection.
          * >>This parameter is mandatory.
-         * @param {Array} qColumnsToSelect - Indicates which dimensions to select.
+         * @param qColumnsToSelect - Indicates which dimensions to select.
          * The dimensions numbering starts at 0 (first dimension is 0).
          * If the array is empty, all dimensions are selected.
          * >> This parameter is optional.
-         * @param {Boolean} qOrMode - Applies to hypercubes with multiple measures.
+         * @param qOrMode - Applies to hypercubes with multiple measures.
          * If set to true, it means that at least one of the measures must be in the range of
          * selections for the group of measures to be selected.
          * If set to false, it means that all measures must be in the range of
          * selections for the group of measures to be selected.
          * This parameter is optional. The default value is false.
-         * @param {Boolean} qDeselectOnlyOneSelected - Set this parameter to true to unselect the last
+         * @param qDeselectOnlyOneSelected - Set this parameter to true to unselect the last
          * single selected value. There must be only one selected value in the field.
          * >> The default value is false.
-         * @returns {Promise} - true or false
+         * @returns - true or false
          */
         multiRangeSelectHyperCubeValues(qPath: string, qRanges: INxMultiRangeSelectInfo, qDeselectOnlyOneSelected: boolean, qColumnsToSelect?: number[], qOrMode?: boolean): Promise<boolean>;
 
         /**
          * Make range selections in measures.
          * Note: This method applies to hypercubes. For example, bar charts, tables and scatter plots.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Array} qRanges - Ranges of selection.
+         * @param qRanges - Ranges of selection.
          * >>This parameter is mandatory.
-         * @param {Boolean} qDeselectOnlyOneSelected - Set this parameter to true to unselect the last
+         * @param qDeselectOnlyOneSelected - Set this parameter to true to unselect the last
          * single selected value. There must be only one selected value in the field.
          * >> The default value is false.
-         * @param {Array} qColumnsToSelect - Indicates which dimensions to select.
+         * @param qColumnsToSelect - Indicates which dimensions to select.
          * The dimensions numbering starts at 0 (first dimension is 0).
          * If the array is empty, all dimensions are selected.
          * >> This parameter is optional.
-         * @param {Boolean} qOrMode - Applies to hypercubes with multiple measures.
+         * @param qOrMode - Applies to hypercubes with multiple measures.
          * If set to true, it means that at least one of the measures must be in the range of
          * selections for the group of measures to be selected.
          * If set to false, it means that all measures must be in the range of
          * selections for the group of measures to be selected.
          * This parameter is optional. The default value is false.
-         * @returns {Promise} - true or false
+         * @returns - true or false
          */
         rangeSelectHyperCubeValues(qPath: string, qRanges: INxRangeSelectInfo[], qDeselectOnlyOneSelected: boolean, qColumnsToSelect?: number[], qOrMode?: boolean): Promise<boolean>;
 
@@ -5422,14 +5695,14 @@ declare namespace EngineAPI {
          *
          * Note: This method applies to list objects (objects with one dimension).
          * Note: The search results can be displayed using the GetLayout method.
-         * @param {String} qPath - Path to the definition of the list object.
+         * @param qPath - Path to the definition of the list object.
          * For example, /qListObjectDef.
-         * @param {String} qMatch - Search string.
+         * @param qMatch - Search string.
          * Wild card characters are allowed. The search is not case sensitive.
          * Examples:
          *        P*U*: retrieves only values that start with P and contain U
          *        P U S: retrieves values that start with P, U or S
-         * @returns {Promise} - The operation is successful if qSuccess is set to true.
+         * @returns - The operation is successful if qSuccess is set to true.
          */
         searchListObjectFor(qPath: string, qMatch: string): Promise<boolean>;
 
@@ -5437,13 +5710,13 @@ declare namespace EngineAPI {
          * Makes selections in multiple dimensions and measures.
          *
          * Note: This method applies to hypercubes, such as bar charts, tables and scatter plots.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
          * This parameter is mandatory.
-         * @param {Array} qRowIndices - Array of row indexes to select, starting from 0.
+         * @param qRowIndices - Array of row indexes to select, starting from 0.
          * If the array is empty [ ], all rows are selected.
          * >> This parameter is mandatory.
-         * @param {Array} qColIndices - Indexes of the columns to select, starting from 0.
+         * @param qColIndices - Indexes of the columns to select, starting from 0.
          * A column corresponds to a dimension or a measure depending on the definition of the hypercube.
          * Example:
          *   If the hypercube has two dimensions and one measure:
@@ -5452,26 +5725,26 @@ declare namespace EngineAPI {
          *        [2] selects the third column (i.e the measure)
          *    If the array is empty [ ], all columns are selected.
          * >>This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * >> This parameter is mandatory.
-         * @param {Boolean} qDeselectOnlyOneSelected - Set this parameter to true to unselect the last single selected value.
+         * @param qDeselectOnlyOneSelected - Set this parameter to true to unselect the last single selected value.
          * There must be only one selected value in the field.
          * The default value is false.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectHyperCubeCells(qPath: string, qRowIndices: number[], qColIndices: number[], qSoftLock: boolean, qDeselectOnlyOneSelected: boolean): Promise<boolean>;
 
         /**
          * SelectHyperCubeContinuousRange method
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qHyperCubeDef.
          * >>This parameter is mandatory.
-         * @param {Array} qRanges - Selects ranges in a hypercube in (Ranges[N].Min,Ranges[N].Max) intervals.
+         * @param qRanges - Selects ranges in a hypercube in (Ranges[N].Min,Ranges[N].Max) intervals.
          * If either Ranges[N].MinInclEq or Ranges[N].MaxInclEq, or both flags are set to true
          * then Min and Max values will be selected.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * >> This parameter is mandatory.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectHyperCubeContinuousRange(qPath: string, qRanges: INxContinuousRangeSelectInfo[], qSoftLock: boolean): Promise<boolean>;
 
@@ -5480,18 +5753,18 @@ declare namespace EngineAPI {
          * The values are identified by their element numbers.
          *
          * Note: This method applies to charts, tables and scatter plots.
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qHyperCubeDef.
          * >>This parameter is mandatory.
-         * @param {Integer} qDimNo - Dimension number or index to select.
+         * @param qDimNo - Dimension number or index to select.
          * Dimension numbers/index start from 0.
          * >> This parameter is mandatory.
-         * @param {Array} qValues - Element numbers of the field to select.
+         * @param qValues - Element numbers of the field to select.
          * You can select multiple elements; the separator is the comma.
          * >> This parameter is mandatory.
-         * @param {Boolean} qToggleMode - Set to true to toggle.
+         * @param qToggleMode - Set to true to toggle.
          * >> This parameter is mandatory.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectHyperCubeValues(qPath: string, qDimNo: number, qValues: number[], qToggleMode: boolean): Promise<boolean>;
 
@@ -5499,13 +5772,13 @@ declare namespace EngineAPI {
          * Selects all values of a field.
          *
          * Note: This method applies to list objects (objects with one dimension).
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qListObjectDef.
          * >> This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * >> This parameter is optional.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectListObjectAll(qPath: string, qSoftLock?: boolean): Promise<boolean>;
 
@@ -5513,27 +5786,27 @@ declare namespace EngineAPI {
          * Selects all values of a field.
          *
          * Note: This method applies to list objects (objects with one dimension).
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qListObjectDef.
          * >> This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * >> This parameter is optional.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectListObjectAlternative(qPath: string, qSoftLock?: boolean): Promise<boolean>;
 
         /**
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qListObjectDef.
          * >> This parameter is mandatory.
-         * @param {Array} qRanges -Selects ranges in a hypercube in (Ranges[N].Min,Ranges[N].Max) intervals.
+         * @param qRanges -Selects ranges in a hypercube in (Ranges[N].Min,Ranges[N].Max) intervals.
          * If either Ranges[N].MinInclEq or Ranges[N].MaxInclEq, or both flags are set to true
          * then Min and Max values will be selected.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * >> This parameter is optional.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectListObjectContinuousRange(qPath: string, qRanges: Range[], qSoftLock?: boolean): Promise<boolean>;
 
@@ -5541,13 +5814,13 @@ declare namespace EngineAPI {
          * Inverts the current selections in a specific field.
          *
          * Note: This method applies to list objects (objects with one dimension).
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qListObjectDef.
          * >> This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * >> This parameter is optional.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectListObjectExcluded(qPath: string, qSoftLock?: boolean): Promise<boolean>;
 
@@ -5555,13 +5828,13 @@ declare namespace EngineAPI {
          * Selects all possible values of a list object.
          *
          * Note: This method applies to list objects (objects with one dimension).
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qListObjectDef.
          * >> This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * >> This parameter is optional.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectListObjectPossible(qPath: string, qSoftLock?: boolean): Promise<boolean>;
 
@@ -5569,18 +5842,18 @@ declare namespace EngineAPI {
          * Makes single selections in dimensions.
          *
          * Note: This method applies to list objects only.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qListObjectDef.
          * >> This parameter is mandatory.
-         * @param {Array} qValues - Element numbers to select.
+         * @param qValues - Element numbers to select.
          * You can select multiple values; the separator is the comma.
          * >> This parameter is mandatory.
-         * @param {Boolean} qToggleMode - Set to true to toggle.
+         * @param qToggleMode - Set to true to toggle.
          * >> This parameter is mandatory.
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * >> This parameter is optional.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectListObjectValues(qPath: string, qValues: number[], qToggleMode: boolean, qSoftLock?: boolean): Promise<boolean>;
 
@@ -5596,17 +5869,17 @@ declare namespace EngineAPI {
          * Makes selections in the left dimension cells of a stacked table or in the data matrix.
          *
          * Note: There is no top dimensions in a stacked table. A stacked table can only contain one measure.
-         * @param {String} qPath - Path to the definition of the object to be selected.
+         * @param qPath - Path to the definition of the object to be selected.
          * For example, /qHyperCubeDef.
          * >> This parameter is mandatory.
-         * @param {Array} qSelections - Information about the selections to perform
-         * @param {Boolean} qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
+         * @param qSelections - Information about the selections to perform
+         * @param qSoftLock - Set to true to ignore locks; in that case, locked fields can be selected.
          * The default value is false.
          * >> This parameter is optional.
-         * @param {Boolean} qDeselectOnlyOneSelected - Set this parameter to true to unselect the last single selected value.
+         * @param qDeselectOnlyOneSelected - Set this parameter to true to unselect the last single selected value.
          * There must be only one selected value in the field.
          * The default value is false.
-         * @returns {Promise} - true or false.
+         * @returns - true or false.
          */
         selectPivotCells(qPath: string, qSelections: INxSelectionCell[], qDeselectOnlyOneSelected: boolean, qSoftLock?: boolean): Promise<boolean>;
 
@@ -5615,7 +5888,7 @@ declare namespace EngineAPI {
          *
          * Note: To change the order of the children in a generic object, the identifiers of all the children
          * must be included in the list of the identifiers (in qIds).
-         * @returns {Promise} -
+         * @returns -
          */
         setChildArrayOrder(qIds: string[]): Promise<void>;
 
@@ -5642,9 +5915,9 @@ declare namespace EngineAPI {
 
         /**
          * Unlocks the selected values of a generic object if the target (or handle ) is a generic object
-         * @param {String} qPath - Path to the definition of the object.
+         * @param qPath - Path to the definition of the object.
          * For example, /qListObjectDef.
-         * @param {Array} qColIndices - Dimension numbers/indexes where the unlock should apply.
+         * @param qColIndices - Dimension numbers/indexes where the unlock should apply.
          * Dimension numbers/indexes start from 0.
          * This parameter is optional. If this parameter is not set, the locked values in all dimensions are unlocked.
          */
@@ -5720,51 +5993,94 @@ declare namespace EngineAPI {
         qActiveExpression: number;
     }
 
+    interface IGenericDerivedFieldProperties extends IGenericProperties {
+    }
+
+    interface IGenericDerivedFields extends enigmaJS.IGeneratedAPI {
+        /**
+         * Shows the properties of an object.
+         * Returns the identifier and the definition of the derived field.
+         *
+         * @returns - A Promise IGenericDerivedFieldProperties
+         */
+        getProperties(): Promise<IGenericDerivedFieldProperties>;
+
+        /**
+         * @returns qInfo
+         */
+        getInfo(): Promise<any>;
+
+        /**
+         * @returns qData
+         */
+        getDerivedFieldData(): Promise<any>;
+
+        /**
+         * @returns qField
+         */
+        getDerivedField(qId: string): Promise<any>;
+
+        /**
+         * @returns qListData
+         */
+        getListData(): Promise<any>;
+
+        /**
+         * @returns qFields
+         */
+        getDerivedFields(): Promise<any>;
+
+        /**
+         * @returns qGroups
+         */
+        getDerivedGroups(): Promise<any>;
+    }
+
     /**
      * This class describes all the methods that apply at measure level.
      * The handle member in the JSON request for all methods listed in this section is the handle of the measure.
      */
-    interface IGenericMeasure extends IImplementOn {
+    interface IGenericMeasure extends enigmaJS.IGeneratedAPI {
         /**
          * Applies a patch to the properties of an object. Allows an update to some of the properties.
          *
          * Note: Applying a patch takes less time than resetting all the properties.
-         * @param {Array} qPatches - Array of patches.
-         * @returns {Promise} -
+         * @param qPatches - Array of patches.
+         * @returns -
          */
         applyPatches(qPatches: INxPatch[]): Promise<void>;
 
         /**
          * Returns the type and identifier of the object.
-         * @returns {Promise} - A Promise of NxInfo
+         * @returns - A Promise of NxInfo
          */
         getInfo(): Promise<INxInfo>;
 
         /**
          * Evaluates a measure and displays its properties, including the dynamic properties.
-         * @returns {Promise} - A Promise of GenericMeasureLayout
+         * @returns - A Promise of GenericMeasureLayout
          */
         getLayout(): Promise<IGenericMeasureLayout>;
 
         /**
          * Lists the linked objects to a generic object, a dimension or a measure.
-         * @returns {Promise} - Array of NxLinkedObjectInfo
+         * @returns - Array of NxLinkedObjectInfo
          */
         getLinkedObjects(): Promise<INxLinkedObjectInfo>;
 
         /**
          * Returns the definition of a measure
-         * @returns {Promise} - Information about the measure.
+         * @returns - Information about the measure.
          * >> This parameter is mandatory.
          */
-        getMeasure(): Promise<INxLibraryMeasureDef>;
+        getMeasure(): Promise<IGenericMeasureProperties>;
 
         /**
          * Shows the properties of an object.
          * Returns the identifier and the definition of the measure.
          *
          * Note: If the member delta is set to true in the request object, only the delta is retrieved.
-         * @returns {Promise} - A Promise GenericMeasureProperties
+         * @returns - A Promise GenericMeasureProperties
          * >> This parameter is mandatory.
          */
         getProperties(): Promise<IGenericMeasureProperties>;
@@ -5776,9 +6092,9 @@ declare namespace EngineAPI {
 
         /**
          * Sets some properties for a measure.
-         * @param {Array} qProp - Information about the measure.
+         * @param qProp - Information about the measure.
          * This parameter is mandatory.
-         * @returns {Promise} - A Promise of GenericMeasureProperties
+         * @returns - A Promise of GenericMeasureProperties
          */
         setProperties(qProp: IGenericMeasureProperties): Promise<void>;
 
@@ -5792,12 +6108,12 @@ declare namespace EngineAPI {
      * This class describes all the methods that apply at generic variable level.
      * The handle member in the JSON request for all methods listed in this section is the handle of the generic variable.
      */
-    interface IGenericVariable extends IImplementOn {
+    interface IGenericVariable extends enigmaJS.IGeneratedAPI {
         /**
          * Applies a patch to the properties of a variable. Allows an update to some of the properties.
          *
          * Note: Applying a patch takes less time than resetting all the properties.
-         * @param {Array} qPatches - Array of NxPatch
+         * @param qPatches - Array of NxPatch
          */
         applyPatches(qPatches: INxPatch[]): Promise<void>;
 
@@ -5809,7 +6125,7 @@ declare namespace EngineAPI {
         /**
          * Evaluates an object and displays its properties including the dynamic properties.
          * If the member delta is set to true in the request object, only the delta is evaluated.
-         * @returns {Promise} GenericVariableLayout Information on the object
+         * @returns GenericVariableLayout Information on the object
          */
         getLayout(): Promise<IGenericVariableLayout>;
 
@@ -5817,7 +6133,7 @@ declare namespace EngineAPI {
          * Shows the properties of an object.
          *
          * Note: If the member delta is set to true in the request, only the delta is retrieved.
-         * @returns {Promise} GenericVariableProperties Information about the generic object
+         * @returns GenericVariableProperties Information about the generic object
          */
         getProperties(): Promise<IGenericVariableProperties>;
 
@@ -5825,10 +6141,10 @@ declare namespace EngineAPI {
          * Sets the value of a dual variable.
          *
          * Note: These changes are not persistent. They only last the duration of the engine session.
-         * @param {String} qText - String representation of a dual value. Set this parameter to "",
+         * @param qText - String representation of a dual value. Set this parameter to "",
          * if the string representation is to be Null.
          * >> This parameter is mandatory.
-         * @param {Double} qNum - Numeric representation of a dual value.
+         * @param qNum - Numeric representation of a dual value.
          * >> This parameter is mandatory.
          */
         setDualValue(qText: string, qNum: number): Promise<void>;
@@ -5837,7 +6153,7 @@ declare namespace EngineAPI {
          * Sets a numerical value to a variable.
          *
          * Note: These changes are not persistent. They only last the duration of the engine session.
-         * @param {Double} qVal - Value of the variable.
+         * @param qVal - Value of the variable.
          */
         setNumValue(qVal: number): Promise<void>;
 
@@ -5846,7 +6162,7 @@ declare namespace EngineAPI {
          *
          * Note: The identifier of a variable cannot be modified.
          * You cannot update the properties of a script-defined variable using the SetProperties method.
-         * @param {GenericVariableProperties} - Information about the variable.
+         * @param - Information about the variable.
          * >> This parameter is mandatory.
          */
         setProperties(qProp: IGenericVariableProperties): Promise<void>;
@@ -5854,7 +6170,7 @@ declare namespace EngineAPI {
         /**
          * Sets a string value to a variable.
          * Note: These changes are not persistent. They only last the duration of the engine session.
-         * @param {String} qVal - Value of the variable. The string can contain an expression.
+         * @param qVal - Value of the variable. The string can contain an expression.
          */
         setStringValue(qVal: string): Promise<void>;
     }
@@ -5915,16 +6231,16 @@ declare namespace EngineAPI {
      *
      * The handle member in the JSON request for all methods listed in this section is the handle of the variable.
      */
-    interface IVariable extends IImplementOn {
+    interface IVariable extends enigmaJS.IGeneratedAPI {
         /**
          * Sets the value of a dual variable overriding any input constraints.
          *
          * Note: This method is deprecated (not recommended to use). Use SetProperties method instead.
          * Note: The ForceContent method does not evaluate any expression.
-         * @param {String} qs - String representation of a dual value.
+         * @param qs - String representation of a dual value.
          * Set this parameter to "", if the string representation is to be Null.
          * >> This parameter is mandatory.
-         * @param {Double} qd - Numeric representation of a dual value.
+         * @param qd - Numeric representation of a dual value.
          * >> This parameter is mandatory.
          */
         forceContent(qs: string, qd: number): Promise<void>;
@@ -5948,15 +6264,15 @@ declare namespace EngineAPI {
          *
          * Note: This method is deprecated (not recommended to use). Use GetProperties method instead.
          */
-        getRawContent(): string;
+        getRawContent(): Promise<string>;
 
         /**
          * Sets a value to a variable.
          *
          * Note: This method is deprecated (not recommended to use). Use SetProperties method instead.
-         * @param {String} qContent - Value of the variable.
+         * @param qContent - Value of the variable.
          * >> This parameter is mandatory.
-         * @param {Boolean} qUpdateMRU - If set to true, the value is added to the Most Recently Used (MRU) list.
+         * @param qUpdateMRU - If set to true, the value is added to the Most Recently Used (MRU) list.
          * >> This parameter is mandatory.
          */
         setContent(qContent: string, qUpdateMRU: boolean): Promise<boolean>;
@@ -5967,7 +6283,7 @@ declare namespace EngineAPI {
          * Note: This method is deprecated (not recommended to use). Use SetProperties method instead.
          *
          * In addition to the properties described below, dynamic properties can be added.
-         * @param {NxVariableProperties} qProperties - Information about the properties of the variable
+         * @param qProperties - Information about the properties of the variable
          */
         setNxProperties(qProperties: INxVariableProperties): Promise<void>;
     }
@@ -6549,11 +6865,54 @@ declare namespace EngineAPI {
         qSignature: string;
     }
 
+    interface IQDownloadInfo {
+        /**
+         * URL of the generated QVF
+         */
+        qUrl: string;
+
+        /**
+         * FileSize of the generated QVF
+         */
+        qFileSize: number;
+    }
+
+    interface IQVersion {
+        qVersion: {
+            qComponentVersion: string;
+        };
+    }
+
+    interface IQConfig {
+        qFeatures: {
+            qIsDesktop: boolean;
+            qSSOEnabled: boolean;
+        };
+
+        qServices: Array<{
+            /**
+             * Name of the Service
+             */
+            qName: string;
+            /**
+             * URL of the Service
+             */
+            qUrl: string;
+        }>;
+
+        qSystemProperties: {
+            /**
+             * Path Separator for the OS
+             */
+            qPathSeparator: string;
+        };
+    }
+
     /**
      * This class describes all the methods that apply at global level.
      * The handle member in the JSON request for all methods listed in this section is -1.
      */
-    interface IGlobal {
+    interface IGlobal extends enigmaJS.IGeneratedAPI {
         /**
          * Sets an abort flag on all pending and ongoing requests in the current engine session.
          * If an abort flag is set on a pending request, the request is aborted.
@@ -6562,7 +6921,13 @@ declare namespace EngineAPI {
         abortAll(): Promise<void>;
 
         /**
-         *
+         * Aborts a specific request
+         * @param qRequestId - Identifier of the request to stop.
+         */
+        abortRequest(qRequestId: number): Promise<void>;
+
+        /**
+         * no / empty docu
          */
         allowCreateApp(): Promise<boolean>;
 
@@ -6574,7 +6939,7 @@ declare namespace EngineAPI {
         /**
          * Cancels an ongoing reload. The reload of the app is stopped.
          * The indexation can be canceled and true is still the return value of the reload task.
-         * @param {Integer} qRequestId - Identifier of the request to stop.
+         * @param qRequestId - Identifier of the request to stop.
          */
         cancelRequest(qRequestId: number): Promise<void>;
 
@@ -6582,12 +6947,12 @@ declare namespace EngineAPI {
          * Configures the engine's behavior during a reload.
          *
          * Note: The ConfigureReload method should be run before the DoReload method.
-         * @param {Boolean} qCancelOnScriptError - If set to true, the script execution is halted on error.
+         * @param qCancelOnScriptError - If set to true, the script execution is halted on error.
          * Otherwise, the engine continues the script execution.
          * This parameter is relevant only if the variable ErrorMode is set to 1.
-         * @param {Boolean} qUseErrorData - If set to true, any script execution error
+         * @param qUseErrorData - If set to true, any script execution error
          * is returned in qErrorData by the GetProgress method.
-         * @param {Boolean} qInteractOnError - If set to true, the script execution is halted on error and
+         * @param qInteractOnError - If set to true, the script execution is halted on error and
          * the engine is waiting for an interaction to be performed. If the result from the interaction
          * is 1 (qDef.qResult is 1), the engine continues the script execution otherwise the execution is halted.
          *
@@ -6601,12 +6966,12 @@ declare namespace EngineAPI {
          * The engine copies the app into an app entity that was previously created by the repository. See the QRS API (REST API) help for more information.
          *
          * Note: This operation is possible only in Qlik Sense Enterprise.
-         * @param {String} qTargetAppId - Identifier (GUID) of the app entity in the Qlik Sense repository.
+         * @param qTargetAppId - Identifier (GUID) of the app entity in the Qlik Sense repository.
          * The app entity must have been previously created by the repository (via the REST API).
          * >> This parameter is mandatory.
-         * @param {String} qSrcAppId - Identifier (GUID) of the source app in the Qlik Sense repository.
+         * @param qSrcAppId - Identifier (GUID) of the source app in the Qlik Sense repository.
          * >> This parameter is mandatory.
-         * @param {Array} qIds - Array of QRS identifiers.
+         * @param qIds - Array of QRS identifiers.
          * The list of all the objects in the app to be copied must be given. This list must contain the GUIDs of all these objects.
          * If the list of the QRS identifiers is empty, the CopyApp method copies all objects to the target app.
          * Script-defined variables are automatically copied when copying an app. To be able to copy variables not created via script,
@@ -6616,16 +6981,16 @@ declare namespace EngineAPI {
          * The following example returns the QRS identifiers of all the objects in a specified app:
          * GET /qrs/app/9c3f8634-6191-4a34-a114-a39102058d13
          * Where 9c3f8634-6191-4a34-a114-a39102058d13 is the identifier of the app.
-         * @returns {Promise} - true or false
+         * @returns - true or false
          * Note: The operation is successful if qSuccess is set to true.
          */
         copyApp(qTargetAppId: string, qSrcAppId: string, qIds: string[]): Promise<boolean>;
 
         /**
          * Creates an app.
-         * @param {String} qAppName - Name of the app.
+         * @param qAppName - Name of the app.
          * >> This parameter is mandatory.
-         * @param {String} qLocalizedScriptMainSection - Name of the first section in the script editor.
+         * @param qLocalizedScriptMainSection - Name of the first section in the script editor.
          * >> This parameter is optional.
          * >> The default value is Main.
          */
@@ -6634,18 +6999,18 @@ declare namespace EngineAPI {
         /**
          * Creates an app and opens an engine session.
          * This operation is possible only in Qlik Sense Desktop.
-         * @param {String} qDocName - Name of the app.
+         * @param qDocName - Name of the app.
          * >> This parameter is mandatory.
-         * @param {String} qUserName - Name of the user.
+         * @param qUserName - Name of the user.
          * >> This parameter is optional.
-         * @param {String} qPassword - Password of the user.
+         * @param qPassword - Password of the user.
          * >> This parameter is optional.
-         * @param {String} qSerial - Current Qlik Sense serial number
+         * @param qSerial - Current Qlik Sense serial number
          * >> This parameter is optional.
-         * @param {String} qLocalizedScriptMainSection - Name of the first section in the script editor.
+         * @param qLocalizedScriptMainSection - Name of the first section in the script editor.
          * >> This parameter is optional.
          * >> The default value is Main.
-         * @returns {Promise} - A Promise of App
+         * @returns - A Promise of App
          */
         createDocEx(qDocName: string, qUserName?: string, qPassword?: string, qSerial?: string, qLocalizedScriptMainSection?: string): Promise<IApp>;
 
@@ -6656,7 +7021,7 @@ declare namespace EngineAPI {
          * The name of a session app cannot be chosen. The engine automatically assigns a unique identifier to the session app.
          * A session app is not persisted and cannot be saved. Everything created during a session app is non-persisted;
          * for example: objects, data connections.
-         * @returns {Promise} - A Promise of App
+         * @returns - A Promise of App
          */
         createSessionApp(): Promise<IApp>;
 
@@ -6669,10 +7034,10 @@ declare namespace EngineAPI {
          * - The name of a session app cannot be chosen. The engine automatically assigns a unique identifier to the session app.
          * - A session app is not persisted and cannot be saved. Everything created during a session app is non-persisted;
          *   for example: objects, data connections.
-         * @param {String} qSrcAppId - App identifier of the source app.
+         * @param qSrcAppId - App identifier of the source app.
          * It corresponds to qAppId returned by the CreateApp method when creating the source app.
          * This parameter is mandatory.
-         * @returns {Promise} - A Promise of App
+         * @returns - A Promise of App
          */
         createSessionAppFromApp(qSrcAppId: string): Promise<IApp>;
 
@@ -6686,30 +7051,36 @@ declare namespace EngineAPI {
          *
          * -- Qlik Sense Desktop --
          * The app is deleted from the directory %userprofile%\Documents\Qlik\Sense\Apps.
-         * @param {String} qAppId - Identifier of the app to delete.
+         * @param qAppId - Identifier of the app to delete.
          * In Qlik Sense Enterprise, the identifier of the app is a GUID in the Qlik Sense repository.
          * In Qlik Sense Desktop, the identifier of the app is the name of the app,
          * as defined in the apps folder %userprofile%\Documents\Qlik\Sense\Apps.
          * >> This parameter is mandatory.
-         * @returns {Promise} - true or false
+         * @returns - true or false
          *
          * Note: The operation is successful if qSuccess is set to true.
          */
         deleteApp(qAppId: string): Promise<boolean>;
 
+        /**
+         * Get the current EngineVersion
+         * @returns - qVersion
+         */
+        engineVersion(): Promise<IQVersion>;
+
         /**
          * Exports an app from the Qlik Sense repository to the file system.
          *
          * Note: This operation is possible only in Qlik Sense Enterprise.
-         * @param {String} qTargetPath - Path and name of the target app.
+         * @param qTargetPath - Path and name of the target app.
          * >> This parameter is mandatory.
-         * @param {String} qSrcAppId - Identifier of the source app.
+         * @param qSrcAppId - Identifier of the source app.
          * The identifier is a GUID from the Qlik Sense repository.
          * >> This parameter is mandatory.
-         * @param {Array} qIds - Array of identifiers.
+         * @param qIds - Array of identifiers.
          * The list of all the objects in the app to be exported must be given.
          * This list must contain the GUIDs of all these objects.
-         * @returns {Promise} The operation is successful if qSuccess is set to true.
+         * @returns The operation is successful if qSuccess is set to true.
          */
         exportApp(qTargetPath: string, qSrcAppId: string, qIds: string[]): Promise<boolean>;
 
@@ -6723,19 +7094,19 @@ declare namespace EngineAPI {
 
         /**
          * Retrieves the meta data of an app.
-         * @param {String} qAppID - Identifier of the app, as returned by the CreateApp method.
+         * @param qAppID - Identifier of the app, as returned by the CreateApp method.
          * One of:
          *           - Path and name of the app (Qlik Sense Desktop)
          *           - GUID (Qlik Sense Enterprise)
          *
          * >> This parameter is mandatory.
-         * @returns {Promise} A Promise of AppEntry
+         * @returns A Promise of AppEntry
          */
         getAppEntry(qAppID: string): Promise<IAppEntry>;
 
         /**
          * Retrieves information about the authenticated user.
-         * @returns {Promise} Returns UserDirectory=<directory>; UserId=<identifier>
+         * @returns Returns UserDirectory=<directory>; UserId=<identifier>
          */
         getAuthenticatedUser(): Promise<string>;
 
@@ -6750,10 +7121,10 @@ declare namespace EngineAPI {
          * BNF stands for Backus-Naur Form.
          * A token is a string of one or more characters that is significant as a group.
          * For example, a token can be a function name, a parenthesis '('.
-         * @param {BnfType} qBnfType - Returns a set of rules defining the syntax for:
+         * @param qBnfType - Returns a set of rules defining the syntax for:
          * - the script statements and the script functions if qBnfType is set to S.
          * - the chart functions if qBnfType is set to E.
-         * @returns {Promise} A Promise of  Array of BNFDef
+         * @returns A Promise of  Array of BNFDef
          */
         getBNF(qBnfType: BnfType): Promise<IBNFDef>;
 
@@ -6767,10 +7138,10 @@ declare namespace EngineAPI {
          * BNF stands for Backus- Naur Form.
          * A token is a string of one or more characters that is significant as a group.
          * For example, a token can be a function name, a parenthesis '('.
-         * @param { BnfType } qBnfType - Returns a set of rules defining the syntax for:
+         * @param qBnfType - Returns a set of rules defining the syntax for:
          * - the script statements and the script functions if qBnfType is set to S.
          * - the chart functions if qBnfType is set to E.
-         * @returns { Promise } A Promise of IBNFDefResult
+         * @returns A Promise of IBNFDefResult
          */
         getBaseBNF(qBnfType: BnfType): Promise<IBNFDefResult>;
 
@@ -6779,29 +7150,50 @@ declare namespace EngineAPI {
          * of the Qlik engine scripting language. If the hash changes between subsequent
          * calls to this method, this indicates that the BNF grammar has changed.
          *
-         * @param { BnfType } qBnfType - Returns a set of rules defining the syntax for:
+         * @param qBnfType - Returns a set of rules defining the syntax for:
          * - the script statements and the script functions if qBnfType is set to S.
          * - the chart functions if qBnfType is set to E.
-         * @returns { Promise } A Promise qBnfHash
+         * @returns A Promise qBnfHash
          */
         getBaseBNFHash(qBnfType: BnfType): Promise<{ qBnfHash: string }>;
 
+        /**
+         * Gets the current Backus-Naur Form (BNF) grammar of the Qlik engine scripting language,
+         * as well as a string hash calculated from that grammar. The BNF rules define the syntax
+         * for the script statements and the script or chart functions. If the hash changes between
+         * subsequent calls to this method, this indicates that the BNF has changed.
+         *
+         * In the Qlik engine grammars, a token is a string of one or more characters that is significant as a group.
+         * For example, a token could be a function name, a number, a letter, a parenthesis, and so on.
+         * @param qBnfType The type of grammar to return:
+         *                   S: returns the script statements and the script functions.
+         *                   E: returns the chart functions.
+         * @returns qBnfDefs and qBnfHash
+         */
+        getBaseBNFString(qBnfType: BnfType): Promise<{qBnfDefs: IBNFDef, qBnfHash: string}>;
+
+        /**
+         * Get a Config Object
+         * @returns A Promise qConfig
+         */
+        getConfiguration(): Promise<IQConfig>;
+
         /**
          * List the custom connectors available in the system.
-         * @param {Boolean} qReloadList Sets if the list of custom connectors should be reloaded or not.
+         * @param qReloadList Sets if the list of custom connectors should be reloaded or not.
          * This parameter is optional and the default value is false.
          * If set to false, only the connectors that were returned the previous time are returned.
          * If new connectors have been added since the last call to the GetCustomConnectors method was made,
          * the new connectors are not returned.
          * If set to true, the GetCustomConnectors method looks for new connectors in the file system.
-         * @returns {Promise} A Promise Array of CustomConnector
+         * @returns A Promise Array of CustomConnector
          */
         getCustomConnectors(qReloadList: boolean): Promise<ICustomConnector[]>;
 
         /**
          * Lists the databases in a ODBC, OLEDB or CUSTOM data source.
-         * @param {Connection} qConnection Information about the connection.
-         * @returns {Promise} A Promise Array of Database
+         * @param qConnection Information about the connection.
+         * @returns A Promise Array of Database
          */
         getDatabasesFromConnectionString(qConnection: IConnection): Promise<IDatabase[]>;
 
@@ -6809,7 +7201,7 @@ declare namespace EngineAPI {
          * Returns the folder where the apps are stored.
          *
          * Note: This method applies only if running Qlik Sense Desktop.
-         * @returns {Promise} Returns a path of the folder where the apps are stored.
+         * @returns Returns a path of the folder where the apps are stored.
          */
         getDefaultAppFolder(): Promise<string>;
 
@@ -6819,13 +7211,13 @@ declare namespace EngineAPI {
          * The list is generated by the QRS. The GetDocList method only returns documents the current user is allowed to access.
          * -- In Qlik Sense Desktop:
          * The apps are located in C:\Users\<user name>\Documents\Qlik\Sense\Apps.
-         * @returns {Promise} A Promise Array of DocListEntry
+         * @returns A Promise Array of DocListEntry
          */
         getDocList(): Promise<IDocListEntry>;
 
         /**
          * Returns the files and folders located at a specified path.
-         * @param {String} qPath Absolute or relative path.
+         * @param qPath Absolute or relative path.
          * Relative paths are relative to the default Apps folder.
          *
          * In Qlik Sense Enterprise:
@@ -6833,16 +7225,16 @@ declare namespace EngineAPI {
          *
          * In Qlik Sense Desktop:
          * The apps are located in C:\Users\<user name>\Documents\Qlik\Sense\Apps.
-         * @returns {Promise} Path of the folder where the apps are stored.
+         * @returns Path of the folder where the apps are stored.
          */
         getFolderItemsForPath(qPath: string): Promise<IFolderItem>;
 
         /**
          * Gets the list of all the script functions.
-         * @param {FunctionGroupType} qGroup Name of the group
+         * @param qGroup Name of the group
          * >> This parameter is optional.
          * >> Default is all groups.
-         * @returns {Promise} A Promise <Function> or undefined
+         * @returns A Promise <Function> or undefined
          */
         getFunctions(qGroup?: FunctionGroupType): Promise<IFunction | undefined>;
 
@@ -6860,9 +7252,9 @@ declare namespace EngineAPI {
          * To know if the engine is paused and waits for a response to an interaction request,
          * the GetProgress method should be used. The engine waits for a response if the property qUserInteractionWanted
          * is set to true in the response of the GetProgress request.
-         * @param {Integer} qRequestId Identifier of the request.
+         * @param qRequestId Identifier of the request.
          * Corresponds to the identifier of the DoReload request.
-         * @returns {Promise} A Promise of InteractDef
+         * @returns A Promise of InteractDef
          */
         getInteract(qRequestId: number): Promise<IInteractDef>;
 
@@ -6870,19 +7262,25 @@ declare namespace EngineAPI {
          * Lists the logical drives in the system.
          *
          * Note: This method applies only if running Qlik Sense Desktop.
-         * @returns {Promise} A Promise Array of DriveInfo
+         * @returns A Promise Array of DriveInfo
          */
         getLogicalDriveStrings(): Promise<IDriveInfo[]>;
 
+        /**
+         * Gets the MyDocumenstFolder Path in the system.
+         * @returns A Promise of the MyDocumenstFolder Path
+         */
+        getMyDocumentsFolder(): Promise<{ qFolder: string; }>;
+
         /**
          * Returns the list of the ODBC connectors that are installed in the system.
-         * @returns {Promise} A Promise Array of OdbcDsn
+         * @returns A Promise Array of OdbcDsn
          */
         getOdbcDsns(): Promise<IOdbcDsn[]>;
 
         /**
          * Returns the list of the OLEDB providers installed on the system.
-         * @returns {Promise} A Promise Array of OleDbProvider
+         * @returns A Promise Array of OleDbProvider
          */
         getOleDbProviders(): Promise<IOleDbProvider[]>;
 
@@ -6890,11 +7288,11 @@ declare namespace EngineAPI {
          * Gives information about the progress of the DoReload and DoSave calls.
          *
          * Note: For more information on DoReload and DoSave, see the DoReload method and DoSave method.
-         * @param {Integer} qRequestId Identifier of the DoReload or DoSave request or 0.
+         * @param qRequestId Identifier of the DoReload or DoSave request or 0.
          * Complete information is returned if the identifier of the request is given.
          * If the identifier is 0, less information is given. Progress messages and
          * error messages are returned but information like when the request started and finished is not returned.
-         * @returns {Promise} Information about the progress of the request.
+         * @returns Information about the progress of the request.
          */
         getProgress(qRequestId: number): Promise<IProgressData>;
 
@@ -6903,7 +7301,7 @@ declare namespace EngineAPI {
          *
          * Note: This method is deprecated (not recommended to use).
          * Use general purpose endpoint in QRS API: GET qrs/stream/ instead.
-         * @returns {Promise} Array of NxStreamListEntry
+         * @returns Array of NxStreamListEntry
          */
         getStreamList(): Promise<INxStreamListEntry[]>;
 
@@ -6916,17 +7314,38 @@ declare namespace EngineAPI {
          * Returns the unique identifier of the endpoint for the current user in the current app.
          *
          * Note: This unique identifier can be used for logging purposes.
-         * @returns {Promise} Identifier of the endpoint.
+         * @returns Identifier of the endpoint.
          * This identifier is unique.
          */
         getUniqueID(): Promise<string>;
 
+        /**
+         * Import an App
+         * @param qAppId - new AppId
+         * @param qSrcPath - source path
+         * @param qIds - ???
+         * Note: from shema file
+         * Note: This operation is possible only in Qlik Sense Enterprise.
+         */
+        importApp(qAppId: string, qSrcPath: string, qIds: string[]): Promise<void>;
+
+        /**
+         * Import an App Extended
+         * @param qAppId - new AppId
+         * @param qSrcPath - source path
+         * @param qIds - ???
+         * @param qExcludeConnections - true to exclude the embedded connection from import
+         * Note: from shema file
+         * Note: This operation is possible only in Qlik Sense Enterprise.
+         */
+        importAppEx(qAppId: string, qSrcPath: string, qIds: string[], qExcludeConnections: boolean): Promise<void>;
+
         /**
          * Informs the engine that a user interaction (which was earlier requested by the engine)
          * was performed and indicates the engine what to do next.
-         * @param {Integer} qRequestId Identifier of the request.
+         * @param qRequestId Identifier of the request.
          * Corresponds to the identifier of the DoReload request.
-         * @param {InteractDef} qDef User response to the current interaction.
+         * @param qDef User response to the current interaction.
          */
         interactDone(qRequestId: number, qDef: IInteractDef): Promise<void>;
 
@@ -6939,14 +7358,14 @@ declare namespace EngineAPI {
          * Indicates whether or not the user is working in personal mode (Qlik Sense Desktop).
          *
          * Note: This method is deprecated.
-         * @returns {Promise} The engine returns true if the user is working with Qlik Sense Desktop.
+         * @returns The engine returns true if the user is working with Qlik Sense Desktop.
          */
         isPersonalMode(): Promise<boolean>;
 
         /**
          * Checks if a connection string is valid.
-         * @param {Connection} qConnection Information about the connection.
-         * @returns {Promise} True means that the connection string is correct.
+         * @param qConnection Information about the connection.
+         * @returns True means that the connection string is correct.
          */
         isValidConnectionString(qConnection: IConnection): Promise<boolean>;
 
@@ -6967,19 +7386,19 @@ declare namespace EngineAPI {
          * In Qlik Sense Desktop, apps are automatically backed up before a migration.
          * The backup files are located in %userprofile%\Documents\Qlik\Sense\AppsBackup\<Qlik Sense Desktop version>.
          * In Qlik Sense Enterprise, no automatic back up is run. The back up should be done manually.
-         * @param {String} qDocName The GUID (in Qlik Sense Enterprise) or Name (in Qlik Sense Desktop) of the app to retrieve.
-         * @param {String} qUserName Name of the user that opens the app.
+         * @param qDocName The GUID (in Qlik Sense Enterprise) or Name (in Qlik Sense Desktop) of the app to retrieve.
+         * @param qUserName Name of the user that opens the app.
          * >> This parameter is optional.
-         * @param {String} qPassword Password of the user.
+         * @param qPassword Password of the user.
          * >> This parameter is optional.
-         * @param {String} qSerial Current Qlik Sense serial number.
+         * @param qSerial Current Qlik Sense serial number.
          * >> This parameter is optional.
-         * @param {String} qNoData Set this parameter to true to be able to open an app without loading its data.
+         * @param qNoData Set this parameter to true to be able to open an app without loading its data.
          * When this parameter is set to true, the objects in the app are present but contain no data.
          * The script can be edited and reloaded.
          * >> This parameter is optional
          * >> The default value is false.
-         * @returns {Promise} A Promise of App
+         * @returns A Promise of App
          */
         openDoc(qDocName: string, qUserName?: string, qPassword?: string, qSerial?: string, qNoData?: boolean): Promise<IApp>;
 
@@ -6999,6 +7418,15 @@ declare namespace EngineAPI {
          */
         productVersion(): Promise<string>;
 
+        /**
+         * Publish an App to a Stream
+         * @param qStreamId - Id of the stream there it should published
+         * @param qName - new name
+         * Note: from shema file
+         * Note: This operation is possible only in Qlik Sense Enterprise.
+         */
+        publishApp(qStreamId: string, qName: string): Promise<void>;
+
         /**
          * Returns the Qlik product name.
          */
@@ -7021,20 +7449,20 @@ declare namespace EngineAPI {
          * The list of objects in the app to be replaced must be defined in qIds.
          * Note: The data model of the app cannot be updated.
          * Note: This operation is possible only in Qlik Sense Enterprise.
-         * @param {String} qTargetAppId Identifier (GUID) of the target app.
+         * @param qTargetAppId Identifier (GUID) of the target app.
          * The target app is the app to be replaced.
          * >> This parameter is mandatory.
-         * @param {String} qSrcAppID Identifier (GUID) of the source app.
+         * @param qSrcAppID Identifier (GUID) of the source app.
          * The objects in the source app will replace the objects in the target app.
          * >> This parameter is mandatory.
-         * @param {Array} qIds QRS identifiers (GUID) of the objects in the target app to be replaced.
+         * @param qIds QRS identifiers (GUID) of the objects in the target app to be replaced.
          * Only QRS-approved GUIDs are applicable.
          * An object that is QRS-approved, is for example an object that has been published (i.e not private anymore).
          * If an object is private, it should not be included in this list.
          * If qIds is empty, the engine automatically creates a list that contains all QRS-approved objects.
          * If the array of identifiers contains objects that are not present in the source app,
          * the objects related to these identifiers are removed from the target app.
-         * @returns {Promise} The operation is successful if qSuccess is set to true.
+         * @returns The operation is successful if qSuccess is set to true.
          */
         replaceAppFromID(qTargetAppId: string, qSrcAppID: string, qIds: string[]): Promise<boolean>;
 
@@ -7715,12 +8143,12 @@ declare namespace EngineAPI {
         qAttributeDimensions?: INxAttrDimDef[];
 
         /**
-         *
+         * no / empty docu
          */
         qIncludeElemValue?: boolean; // ?Nicht in Doku
 
         /**
-         *
+         * no / empty docu
          */
         qShowTotal?: boolean; // ?Nicht in Doku
     }
@@ -7789,7 +8217,7 @@ declare namespace EngineAPI {
         qExpression?: IValueExpr;
 
         /**
-         *
+         * no / empty docu
          */
         qSortByGreyness?: TypeSortDirection; // ?Nicht in Doku
     }
@@ -8702,8 +9130,7 @@ declare namespace EngineAPI {
     /**
      * SelectionListObject width extend GenericObject
      */
-    interface ISelectionListObject extends IGenericObject {
-        getLayout(): Promise<IGenericSelectionListLayout>;
+    interface ISelectionListObject extends IGenericObjectPrototype<IGenericSelectionListProperties, IGenericSelectionListLayout> {
     }
 
     interface IApp {
@@ -8765,8 +9192,7 @@ declare namespace EngineAPI {
     /**
      * BookmarkListObject width extend GenericObject
      */
-    interface IBookmarkListObject extends IGenericObject {
-        getLayout(): Promise<IGenericBookmarkListLayout>;
+    interface IBookmarkListObject extends IGenericObjectPrototype<IGenericBookmarkListProperties, IGenericBookmarkListLayout> {
     }
 
     interface IApp {
@@ -8828,8 +9254,7 @@ declare namespace EngineAPI {
     /**
      * IMeassureListObject
      */
-    interface IMeassureListObject extends IGenericObject {
-        getLayout(): Promise<IGenericMeasureListLayout>;
+    interface IMeassureListObject extends IGenericObjectPrototype<IGenericMeasureListProperties, IGenericMeasureListLayout> {
     }
 
     interface IApp {
@@ -8896,8 +9321,7 @@ declare namespace EngineAPI {
         qData: any;
     }
 
-    interface IDimensionListObject extends IGenericObject {
-        getLayout(): Promise<IGenericDimensionListLayout>;
+    interface IDimensionListObject extends IGenericObjectPrototype<IGenericDimensionsListProperties, IGenericDimensionListLayout> {
     }
 
     interface IApp {
@@ -8974,15 +9398,15 @@ declare namespace EngineAPI {
     /**
      * VariableListObject...
      */
-    interface IVariableListObject {
+    interface IVariableList {
         qItems: INxVariableListItem[];
     }
 
     /**
      * GenericVariableLayout width extend GenericObjectLayout
      */
-    interface IGenericVariableLayout extends IGenericObjectLayout {
-        qVariableListObject: IVariableListObject;
+    interface IGenericVariableListLayout extends IGenericBaseLayout {
+        qVariableListObject: IVariableList;
     }
 
     /**
@@ -9020,8 +9444,7 @@ declare namespace EngineAPI {
     /**
      * VariableListObject width extend GenericObject
      */
-    interface IVariableListObject extends IGenericObject {
-        getLayout(): Promise<IGenericVariableLayout>;
+    interface IVariableListObject extends IGenericObjectPrototype<IGenericVariableListProperties, IGenericVariableListLayout> {
     }
 
     interface IApp {
@@ -9036,23 +9459,13 @@ declare namespace EngineAPI {
     /**
      * FieldListObject...
      */
-    interface IFieldListObject {
+    interface IFieldList {
         /**
          * NxFieldDescription[]
          */
         qItems: INxFieldDescription[];
     }
 
-    /**
-     * GenericFieldLayout width extend GenericObjectLayout
-     */
-    interface IGenericFieldLayout extends IGenericObjectLayout {
-        /**
-         * FieldListObject...
-         */
-        qFieldListObject: IFieldListObject;
-    }
-
     /**
      * GenericFieldListProperties width extend GenericProperties
      */
@@ -9267,9 +9680,30 @@ declare namespace EngineAPI {
         qShowImplicit?: boolean;
     }
 
+    /**
+     * GenericFieldLayout width extend GenericObjectLayout
+     */
+    interface IGenericFieldLayout extends IGenericBaseLayout {
+        /**
+         * FieldListObject...
+         */
+        qFieldListObject: IFieldList;
+    }
+
+    /**
+     * FieldListObject width extend GenericObject
+     */
+    interface IFieldListObject extends IGenericObjectPrototype<IGenericFieldListProperties, IGenericFieldLayout> {
+    }
+
     interface IApp {
         createObject(qProp: IGenericFieldListProperties): Promise<IFieldListObject>;
         createSessionObject(qProp: IGenericFieldListProperties): Promise<IFieldListObject>;
     }
 }
 //#endregion
+
+declare namespace enigmaJS {
+    interface IGeneratedAPI {
+    }
+}
diff --git a/types/qlik-visualizationextensions/index.d.ts b/types/qlik-visualizationextensions/index.d.ts
index 38cf9935b8..6baee98c1b 100644
--- a/types/qlik-visualizationextensions/index.d.ts
+++ b/types/qlik-visualizationextensions/index.d.ts
@@ -687,18 +687,18 @@ declare namespace BackendAPI {
 
         /**
          * Accepts the result of a search in a list object and the search result is selected in the field.
-         * @param {boolean} toggleMode - If true, toggle state for selected values
+         * @param toggleMode - If true, toggle state for selected values
          */
         acceptSearch(toggleMode: boolean): void;
 
         /**
          * Updates the properties for this object.
-         * @param {array} qPatches - Array of patches. Each path contains:
+         * @param qPatches - Array of patches. Each path contains:
          *        #qOp: Add/Remove/Replace
          *        #qPath: Path to property
          *        #qValue: The new value in string format. Strings need to be surrounded by \".
-         * @param {boolean} qSoftPatch - Set to True if properties should be soft, that is not persisted.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qSoftPatch - Set to True if properties should be soft, that is not persisted.
+         * @return - A promise of a Qlik engine reply.
          */
         applyPatches(qPatches: any[], qSoftPatch: boolean): ng.IPromise<any>;
 
@@ -710,171 +710,171 @@ declare namespace BackendAPI {
         /**
          * Clears all soft patches that has previously been applied for this object using the
          * applyPatches method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @return - A promise of a Qlik engine reply.
          */
         clearSoftPatches(): ng.IPromise<any>;
 
         /**
          * Collapse the left dimensions of a pivot table. Only works for hypercubes with
          * qMode = P which are not always fully expanded.
-         * @param {number} qRow - Row index.
-         * @param {number} qCol - Column index.
-         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qRow - Row index.
+         * @param qCol - Column index.
+         * @param [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return - A promise of a Qlik engine reply.
          */
         collapseLeft(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
 
         /**
          * Collapse the top dimensions of a pivot table. Only works for hypercubes with
          * qMode = P which are not always fully expanded.
-         * @param {number} qRow - Row index.
-         * @param {number} qCol - Column index.
-         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qRow - Row index.
+         * @param qCol - Column index.
+         * @param [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return - A promise of a Qlik engine reply.
          */
         collapseTop(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
 
         /**
          * Loops through data rows for this object. Only rows that are available client side will be used.
-         * @param {function} callback - Function to call for each row.
+         * @param callback - Function to call for each row.
          * Parameters are row number and row data as an array of NxCell objects.
          * The loop is terminated if the function returns false.
-         * @return {NxCell[]} - An array of NxCell.
+         * @return - An array of NxCell.
          */
         eachDataRow(callback: any): INxCell[];
 
         /**
          * Expands the left dimensions of a pivot table. Only works for hypercubes with
          * qMode = P which are not always fully expanded.
-         * @param {number} qRow - Row index.
-         * @param {number} qCol - Column index.
-         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qRow - Row index.
+         * @param qCol - Column index.
+         * @param [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return - A promise of a Qlik engine reply.
          */
         expandLeft(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
 
         /**
          * Expands the top dimensions of a pivot table. Only works for hypercubes with
          * qMode = P which are not always fully expanded.
-         * @param {number} qRow - Row index.
-         * @param {number} qCol - Column index.
-         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qRow - Row index.
+         * @param qCol - Column index.
+         * @param [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return - A promise of a Qlik engine reply.
          */
         expandTop(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
 
         /**
          * Geta data from Qlik engine for this object.
-         * @param {array} qPages - An array of NxPage objects.
-         * @return {Promise} - A promise of qDataPages.
+         * @param qPages - An array of NxPage objects.
+         * @return - A promise of qDataPages.
          */
         getData(qPages: INxPage[]): ng.IPromise<any>;
 
         /**
          * Gets a data row for this object.
-         * @param {number} rownum - The row number.
-         * @return {NxCell} - A row of NxCell or null if the row is not available client side
+         * @param rownum - The row number.
+         * @return - A row of NxCell or null if the row is not available client side
          *                    and need to be fetched with getData method.
          */
         getDataRow(rownum: number): INxCell;
 
         /**
          * Gets qDimensionInfo for this object.
-         * @return {NxDimensionInfo[]} - An array of qDimensionInfo objects.
+         * @return - An array of qDimensionInfo objects.
          */
         getDimensionInfos(): INxDimensionInfo[];
 
         /**
          * Gets qMeasureInfo for this object.
-         * @return {NxMeasureInfo} - An array of qMeasureInfo objects.
+         * @return - An array of qMeasureInfo objects.
          */
         getMeasureInfos(): INxMeasureInfo;
 
         /**
          * Gets pivot data from the Qlik engine for this object. Only works for hypercubes with qMode = P.
-         * @param {array} qPages - An array of request page objects.
-         * @return {Promise} - A promise of pivot data pages.
+         * @param qPages - An array of request page objects.
+         * @return - A promise of pivot data pages.
          */
         getPivotData(qPages: INxPage[]): ng.IPromise<INxPage[]>;
 
         /**
          * Get properties for this object.
-         * @return {Promise} - A promise of object properties.
+         * @return - A promise of object properties.
          */
         getProperties(): ng.IPromise<any>;
 
         /**
          * Get reduced data from the Qlik engine for this object. This method is intended for preserving the
          * shape of the data, not for viewing the actual data points.
-         * @param {array} qPages - An array of request page objects.
-         * @param {number} qZoomFactor - Zoom factor.
+         * @param qPages - An array of request page objects.
+         * @param qZoomFactor - Zoom factor.
          * If set to -1, the Qlik engine decides of the zoom factor.
          * If qReductionMode is D1 or S, the zoom factor is 2n.
          * If the zoom factor is 5, the data are reduced by a factor 32.
          * If qReductionMode is C, the zoom factor defines the number of centroids.
-         * @param {string} qReductionMode - Reduction mode.Can be:
+         * @param qReductionMode - Reduction mode.Can be:
          *        # N for no data reduction.
          *        # D1 to reduce a bar chart or line chart.
          *          The profile of the chart is reduced whatever the number of dimensions in the chart.
          *        # S to reduce the resolution of a scatter plot.
          *        # C to reduce the data of a scatter plot chart.
          *        # ST to reduce the data of a stacked pivot table.
-         * @return {Promise} - A promise of reduced data pages.
+         * @return - A promise of reduced data pages.
          */
         getReducedData(qPages: INxPage[], qZoomFactor: number, qReductionMode: string): ng.IPromise<any>;
 
         /**
          * Get total number of data rows for this object.
-         * @return {Number} - A number.
+         * @return - A number.
          */
         getRowCount(): number;
 
         /**
          * Get stacked data from the Qlik engine for this object. Only works for hypercubes with qMode = S.
-         * @param {array} qPages - An array of request page objects.
-         * @param {number} qMaxNbrCells - Maximum number of cells at outer level.
-         * @return {Promise} - A promise of stack data pages.
+         * @param qPages - An array of request page objects.
+         * @param qMaxNbrCells - Maximum number of cells at outer level.
+         * @return - A promise of stack data pages.
          */
         getStackedData(qPages: INxPage[], qMaxNbrCells: number): ng.IPromise<any>;
 
         /**
          * Find out if there are unconfirmed selections for this object.
-         * @return {boolean} - True if there are unconfirmed selections.
+         * @return - True if there are unconfirmed selections.
          */
         hasSelections(): boolean;
 
         /**
          * Save this object.
-         * @return {Promise} - A promise. In case of success, it returns "undefined". In case of failure it returns the error.
+         * @return - A promise. In case of success, it returns "undefined". In case of failure it returns the error.
          */
         save(): ng.IPromise<any>;
 
         /**
          * Search for a term in a list object. Results in an updated layout, containing only matching records.
-         * @param {string} term - Term to search for.
+         * @param term - Term to search for.
          */
         search(term: string): void;
 
         /**
          * Select values in this object using ranges.
-         * @param {array} qRanges - Array of ranges to select.
-         * @param {boolean} qOrMode - If true only one of the measures needs to be in range.
+         * @param qRanges - Array of ranges to select.
+         * @param qOrMode - If true only one of the measures needs to be in range.
          */
         selectRange(qRanges: IRange[], qOrMode: boolean): void;
 
         /**
          * Select values in this object with a Qlik engine call which triggers a repaint of the object.
-         * @param {number} qDimNo - Dimension number. 0 = first dimension.
-         * @param {array} qValues - Array of values (qElemNumber in the matrix from the Qlik engine) to select or deselect.
-         * @param {boolean} qToggleMode - If true, values in the field are selected in addition to any previously selected items.
+         * @param qDimNo - Dimension number. 0 = first dimension.
+         * @param qValues - Array of values (qElemNumber in the matrix from the Qlik engine) to select or deselect.
+         * @param qToggleMode - If true, values in the field are selected in addition to any previously selected items.
          * If false, values in the field are selected while previously selected items are deselected.
          */
         selectValues(qDimNo: number, qValues: any[], qToggleMode: boolean): void;
 
         /**
          * Set properties for this object.
-         * @param {object} props - The properties to set.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param props - The properties to set.
+         * @return - A promise of a Qlik engine reply.
          */
         setProperties(props: any): ng.IPromise<any>;
     }
@@ -975,26 +975,26 @@ declare namespace RootAPI {
     interface IRoot {
         /**
          * Calls the Qlik Sense repository.
-         * @param {string} path - Path to the Qlik Sense repository.
+         * @param path - Path to the Qlik Sense repository.
          * Refer to Qlik Sense repository documentation for the available paths.
-         * @param {string} [method] - Optional. HTTP method. Default is GET.
-         * @param {string} [body] - Optional. Body of the post.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [method] - Optional. HTTP method. Default is GET.
+         * @param [body] - Optional. Body of the post.
+         * @return - A promise of a Qlik engine reply.
          */
         callRepository(path: string, method?: string, body?: string): ng.IPromise<any>;
 
-        /** currApp
+        /**
          * Gets a reference to the current app. Use the currApp method in an extension to get a reference to the app currently displayed.
-         * @param {object} [reference] - Optional. Reference to extension object. Introduced in version 1.1.
-         * @return {IApp} - An App JavaScript object with app methods.
+         * @param [reference] - Optional. Reference to extension object. Introduced in version 1.1.
+         * @return - An App JavaScript object with app methods.
          */
         currApp(object?: any): AppAPI.IApp;
 
         /**
          * Gets a list of Qlik Sense apps that you potentially can connect to and registers a callback to receive the data.
          * The getAppList method opens a WebSocket, gets the app list, and then closes the WebSocket.
-         * @param {function} callback - Callback method.
-         * @param {object} [config] - Optional. Additional configuration parameters:
+         * @param callback - Callback method.
+         * @param [config] - Optional. Additional configuration parameters:
          * Name | Type | Descr | Name
          * host | String | Optional. Qlik host. | host
          * port | String or integer | Port number. | port
@@ -1008,28 +1008,29 @@ declare namespace RootAPI {
         /**
          * Gets a list of extensions installed for Qlik Sense. The reply contains all extensions,
          * that is widget libraries, visualization extensions and mashups.
-         * @param {function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         getExtensionList(callback?: any): ng.IPromise<any>;
 
         /**
          * Opens a WebSocekt connection to the Qlik engine for global methods.
-         * @param {object} [config] - Optional. Parameters:
+         * @param [config] - Optional. Parameters:
          * Name | Type | Description
          * host | String | Qlik Sense host
          * port | String | Port number
          * prefix | String | Qlik Sense virtual proxy. / if no virtual proxy
          * isSecure | Boolean | Use SSL
          * identity | String | Unique identity for the session. If omitted, the session will be shared.
-         * @return {ANY} - A global JavaScript object with global methods.
+         * @return - A global JavaScript object with global methods.
          */
         getGlobal(config: any): any;
 
-        /** Opens a Qlik Sense app. You can open multiple apps.
-         *      Most other methods are defined on the app. Returns:  App JavaScript object with app methods.
-         * @param {string} appId The app id.
-         * @param {object} [config] Optional. Additional configuration parameters:
+        /**
+         * Opens a Qlik Sense app. You can open multiple apps.
+         * Most other methods are defined on the app.
+         * @param appId The app id.
+         * @param [config] Optional. Additional configuration parameters:
          *     Name   |   Type   | Descr
          *     host   |   String   |   Optional. Qlik host.
          *     port   |   String or Integer   |   Port number.
@@ -1038,7 +1039,7 @@ declare namespace RootAPI {
          *     openWithoutData   |   Boolean   |   Optional. Open app without loading data. Introduced in version 1.1.
          *     identity   |   String   |   Optional. Unique identity for the session. If omitted, the session will be shared.
          *     Parameter updated in version 2.2.
-         * @return {any} - App JavaScript object with app methods.
+         * @return - App JavaScript object with app methods.
          */
         openApp(appId: string, config?: any): any;
 
@@ -1047,30 +1048,30 @@ declare namespace RootAPI {
          * Qlik Sense server and only available in the session where it is created.
          * As long as a JavaScript module is created in the correct format, it can be sent to
          * the registerExtension function.
-         * @param {string} id - Set the ID of the visualization extension.
-         * @param {object} impl - Set the extension implementation.
-         * @param {object} [metadata] - Optional. Extension meta-data, same format as the QEXT file. Default: {"type":"visualization"}
+         * @param id - Set the ID of the visualization extension.
+         * @param impl - Set the extension implementation.
+         * @param [metadata] - Optional. Extension meta-data, same format as the QEXT file. Default: {"type":"visualization"}
          */
         registerExtension(id: string, impl: any, metadata?: any): void;
 
         /**
          * Sends a resize event to all Qlik Sense objects.
-         * @param {string} [ID] - Object id. Optional: if no ID resize event will be sent to all objects.
+         * @param [ID] - Object id. Optional: if no ID resize event will be sent to all objects.
          */
         resize(ID?: string): void;
 
         /**
          * Creates a session app JavaScript object with app methods.
-         * @param {any} [config] - Additional configuration parameters
-         * @return {any} - App JavaScript object with app methods.
+         * @param [config] - Additional configuration parameters
+         * @return - App JavaScript object with app methods.
          */
         sessionApp(config?: ISessionAppConfig): AppAPI.IApp;
 
         /**
          * Creates a session app JavaScript object with app methods from an existing app. You can create one session app per app.
-         * @param {string} [appId] - App id of the app to base the session app upon.
-         * @param {any} [config] - Additional configuration parameters.
-         * @return {any} - App JavaScript object with app methods.
+         * @param [appId] - App id of the app to base the session app upon.
+         * @param [config] - Additional configuration parameters.
+         * @return - App JavaScript object with app methods.
          */
         sessionAppFromApp(appId: string, config?: ISessionAppConfig): AppAPI.IApp;
 
@@ -1078,7 +1079,7 @@ declare namespace RootAPI {
          * Sets a specific language for the Qlik Sense session.
          * Language should be defined before the app is opened meaning the setLanguage
          * method should be called before the openApp method is called.
-         * @param {string} lang - Language code. Can be:
+         * @param lang - Language code. Can be:
          *       # German: short: de long: de-DE
          *       # English: short: en long: en-US
          *       # Spanish: short: es long: es-ES
@@ -1100,16 +1101,16 @@ declare namespace RootAPI {
         /**
          * Registers a callback for error handling. Standard Qlik Sense error
          * handling is used if this method is not called.
-         * @param {function} onError - Error handling function
-         * @param {function} [onWarning] - Optional. Warning handling function. Introduced in version 2.1.
+         * @param onError - Error handling function
+         * @param [onWarning] - Optional. Warning handling function. Introduced in version 2.1.
          */
         setOnError(onError: any, onWarning?: any): void;
 
         /**
          * Create a QTable object that wraps data in your extension and provides an object oriented interface.
-         * @param {object} ext - Extension or angular scope for the extension.
-         * @param {string} [path] - Optional. Path to the hypercube. Default: qHyperCube
-         * @return {QTable} - A QTable object that holds data and options for the table.
+         * @param ext - Extension or angular scope for the extension.
+         * @param [path] - Optional. Path to the hypercube. Default: qHyperCube
+         * @return - A QTable object that holds data and options for the table.
          */
         table(ext: any, path?: string): TableAPI.IQTable;
 
@@ -1123,22 +1124,22 @@ declare namespace AppAPI {
          * Adds an alternate state in the app. Multiple states within a Qlik Sense
          * app can be created and applied to specific objects within the app.
          * Objects in a given state are not affected by user selection in the other states.
-         * @param {string} qStateName - Mandatory. Alternate state name.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qStateName - Mandatory. Alternate state name.
+         * @return - A promise of a Qlik engine reply.
          */
         addAlternateState(qStateName: string): ng.IPromise<any>;
 
         /**
          * Steps back in the list of selections.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @return - A promise of a Qlik engine reply.
          */
         back(): ng.IPromise<any>;
 
         /**
          * Clears all selections in all fields of the current Qlik Sense app.
-         * @param {boolean} [lockedAlso] - Optional. Alternate state name. Default: false Introduced in version 2.1.
-         * @param {string} [state] - Optional. Alternate state name. Default: $ Introduced in version 2.1.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [lockedAlso] - Optional. Alternate state name. Default: false Introduced in version 2.1.
+         * @param [state] - Optional. Alternate state name. Default: $ Introduced in version 2.1.
+         * @return - A promise of a Qlik engine reply.
          */
         clearAll(lockedAlso?: boolean, state?: string): ng.IPromise<any>;
 
@@ -1149,9 +1150,9 @@ declare namespace AppAPI {
 
         /**
          * Defines a hypercube and registers a callback to receive the data.
-         * @param {object} qHyperCubeDef - Cube definition.
-         * @param {function} [callback] - Optional. Callback method. Parameter will contain a qHyperCube.
-         * @return {Promise} - A promise of an object model.
+         * @param qHyperCubeDef - Cube definition.
+         * @param [callback] - Optional. Callback method. Parameter will contain a qHyperCube.
+         * @return - A promise of an object model.
          */
         createCube(qHyperCubeDef: any, callback?: any): ng.IPromise<any>;
 
@@ -1164,29 +1165,29 @@ declare namespace AppAPI {
          * The callback method will be called whenever the selection state changes
          * in a way that affects the generic object.
          * The parameter will be the evaluated version of the definition.
-         * @param {object} [def] - Optional. Generic object definition
-         * @param {function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of an object model.
+         * @param [def] - Optional. Generic object definition
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of an object model.
          */
         createGenericObject(def?: any, callback?: any): ng.IPromise<any>;
 
         /**
          * Defines a list of field values and registers a callback to receive the data.
-         * @param {object} qListObjectDef - List definition.
-         * @param {function} [callback] - Optional. Callback method. Parameter will contain a qListObject.
-         * @return {Promise} - A promise of an object model.
+         * @param qListObjectDef - List definition.
+         * @param [callback] - Optional. Callback method. Parameter will contain a qListObject.
+         * @return - A promise of an object model.
          */
         createList(qListObjectDef: any, callback?: any): ng.IPromise<any>;
 
         /**
          * Defines a hypercube for a table and is the entry point to the Table API.
          * It creates a table object that wraps the hypercube.
-         * @param {Array.<String|Object>} dimensions - Dimensions to use.
+         * @param dimensions - Dimensions to use.
          * Should, for each entry, be a field name or a NxDimension structure.
-         * @param {Array.<String|Object>} measures - Measures to use.
+         * @param measures - Measures to use.
          * Should, for each entry, be an expression or a NxMeasure structure.
-         * @param {object} [options] - Optional. Options to set.
-         * @return {QTable} - A table object of type QTable, which is initially
+         * @param [options] - Optional. Options to set.
+         * @return - A table object of type QTable, which is initially
          *                    empty but that eventually will contain data.
          *                    The table object will be updated when selection state changes.
          */
@@ -1197,73 +1198,73 @@ declare namespace AppAPI {
          * method or any of createCube, createList or getList methods.
          * Calling this method removes the object from the Qlik engine,
          * no more updates are sent to the client and all methods on the object are invalid.
-         * @param {string} id - Session object id.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param id - Session object id.
+         * @return - A promise of a Qlik engine reply.
          */
         destroySessionObject(id: string): ng.IPromise<any>;
 
         /**
          * Reloads the data in a Qlik Sense app.
-         * @param {string} [qMode] - Optional. Error handling mode:
+         * @param [qMode] - Optional. Error handling mode:
          *       # 0 = default mode.
          *       # 1 = attempt recovery on all errors.
          *       # 2 = fail on all errors.
-         * @param {boolean} [qPartial] - Optional. Set to true for partial reload.
-         * @param {boolean} [qDebug] - Optional. Set to true if debug breakpoints are honored. Execution of the script will be in debug mode.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [qPartial] - Optional. Set to true for partial reload.
+         * @param [qDebug] - Optional. Set to true if debug breakpoints are honored. Execution of the script will be in debug mode.
+         * @return - A promise of a Qlik engine reply.
          */
         doReload(qMode?: string, qPartial?: boolean, qDebug?: boolean): ng.IPromise<any>;
 
         /**
          * Saves a Qlik Sense app, including all objects and data in the data model.
-         * @param {string} [qFileName] - Optional. File name of the file to save.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [qFileName] - Optional. File name of the file to save.
+         * @return - A promise of a Qlik engine reply.
          */
         doSave(qFileName?: string): ng.IPromise<any>;
 
         /**
          * Gets a field reference with methods that can be used to manipulate the field.
-         * @param {string} [field] - Optional. Name of the field.
-         * @param {string} [state] - Optional. Alternate state name. Default is $.
-         * @return {QField} - A QField object with methods and properties that can be used to manipulate the field.
+         * @param [field] - Optional. Name of the field.
+         * @param [state] - Optional. Alternate state name. Default is $.
+         * @return - A QField object with methods and properties that can be used to manipulate the field.
          */
         field(field?: string, state?: string): FieldAPI.IQField;
 
         /**
          * Step forward in list of selections.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @return - A promise of a Qlik engine reply.
          */
         forward(): ng.IPromise<any>;
 
         /**
          * Gets a layout for this Qlik Sense app and registers a callback to receive the data.
          * Returns the dynamic properties (if any) in addition to the fixed properties.
-         * @param {function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         getAppLayout(callback?: any): ng.IPromise<any>;
 
         /**
          * Gets a list of sheets and visualizations and registers a callback to receive the data.
-         * @param {string} [field] - Optional. Type of object. One of:
+         * @param [field] - Optional. Type of object. One of:
          *        # sheet
          *        # masterobject
          * Default is sheet.
-         * @param {function} [callback] - Optional. Callback method.
+         * @param [callback] - Optional. Callback method.
          */
         getAppObjectList(type?: string, callback?: any): void;
 
         /**
          * Gets properties for a generic object, the children of the generic object
          * and the bookmarks and/or embedded snapshots of the generic object.
-         * @param {string} id - Object id.
-         * @return {Promise} - A promise of an object model.
+         * @param id - Object id.
+         * @return - A promise of an object model.
          */
         getFullPropertyTree(id: string): ng.IPromise<any>;
 
         /**
          * Gets a list of internal Qlik Sense objects and registers a callback to receive the data.
-         * @param {string} type - Type of object:
+         * @param type - Type of object:
          *       # FieldList
          *       # MeasureList
          *       # DimensionList
@@ -1275,8 +1276,8 @@ declare namespace AppAPI {
          *       # MasterObject (Introduced in version 1.1)
          *       # VariableList (Introduced in version 2.0)
          *       # story (Introduced in version 2.1)
-         * @param {function} [callback] - Optional. Registers a callback that is executed every time data is returned.
-         * @return {Promise} - A promise of an object model.
+         * @param [callback] - Optional. Registers a callback that is executed every time data is returned.
+         * @return - A promise of an object model.
          */
         getList(type: string, callback?: any): ng.IPromise<any>;
 
@@ -1285,30 +1286,30 @@ declare namespace AppAPI {
          * it into a HTML element. The object fills the HTML object, so you can size
          * and position the element to determine how large the Qlik Sense object will be.
          * If you supply only one parameter, you get the model without displaying the object.
-         * @param {string} id - Object id or 'CurrentSelections' if used for Selections bar.
-         * @param {Element | string} [elem] - Optional. HTML element.
+         * @param id - Object id or 'CurrentSelections' if used for Selections bar.
+         * @param [elem] - Optional. HTML element.
          * Since version 1.1 it is also possible to define a string of the HTML element id.
-         * @param {object} [options] - Optional.
+         * @param [options] - Optional.
          * Name | Type | Description
          * noInteraction | Boolean | Set to true if you want to disable interaction,
          *                           including selections, in the visualization.
          *                           Introduced in version 1.1 and updated in version 3.0.
          * noSelections  | Boolean | Set to true if you want to disable selections in the visualization.
          *                           Introduced in version 3.0.
-         * @return {Promise} - A promise of an object model.
+         * @return - A promise of an object model.
          */
         getObject(id: string, elem?: any | string, options?: any): ng.IPromise<any>;
 
         /**
          * Gets properties for a Qlik Sense object.
-         * @param {string} id - Object id.
-         * @return {Promise} - A promise of an object model.
+         * @param id - Object id.
+         * @return - A promise of an object model.
          */
         getObjectProperties(id: string): ng.IPromise<any>;
 
         /**
          * Gets the data load script of this app.
-         * @return {Promise} - A promise of an qScript object.
+         * @return - A promise of an qScript object.
          */
         getScript(): ng.IPromise<string>;
 
@@ -1317,37 +1318,37 @@ declare namespace AppAPI {
          * the HTML object so you can size and position the element to determine
          * how large the Qlik Sense object will be. If you only supply one parameter,
          * you will just get the model without displaying the object.
-         * @param {string} id - Snapshot ID.
-         * @param {element | string} [elem] - Optional. HTML element or string with HTML element id.
-         * @return {Promise} - A promise of an object model.
+         * @param id - Snapshot ID.
+         * @param [elem] - Optional. HTML element or string with HTML element id.
+         * @return - A promise of an object model.
          */
         getSnapshot(id: string, elem?: any | string): ng.IPromise<any>;
 
         /**
          * Locks all selections.
-         * @param {string} [state=$] - Optional. Alternate state name.
+         * @param [state=$] - Optional. Alternate state name.
          * Default: $
          * Introduced in version 2.1.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @return - A promise of a Qlik engine reply.
          */
         lockAll(state?: string): ng.IPromise<any>;
 
         /**
          * Removes an alternate state in the app.
-         * @param {string} qStateName - Alternate state name.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qStateName - Alternate state name.
+         * @return - A promise of a Qlik engine reply.
          */
         removeAlternateState(qStateName: string): ng.IPromise<any>;
 
         /**
          * Searches for one or more terms in the values of a Qlik Sense app.
-         * @param {array} qTerms - Terms to search for.
-         * @param {object} qPage - Properties:
+         * @param qTerms - Terms to search for.
+         * @param qPage - Properties:
          * Name | Type | Description
          * qOffset | Number | Position from the top, starting from 0.
          * qCount | Number | Number of search results to return.
          * qMaxNbrFieldMatches | Number | Maximum number of matching values to return per search result.
-         * @param {object} qOptions - Properties
+         * @param qOptions - Properties
          * Name | Type | Description
          * qSearchFields | Array | List of search fields.
          * qContext | | Search context. Can be one of:
@@ -1364,15 +1365,15 @@ declare namespace AppAPI {
          *                           are made on top of the current selections. If no selections were
          *                           made before the search, this mode is identical to the Cleared context.
          * | | Default value is LockedFieldsOnly.
-         * @param {function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         searchAssociations(qTerms: any[], qPage: any, qOptions: any, callback?: any): ng.IPromise<any>;
 
         /**
          * Searches for one or more terms in the values of a Qlik Sense app.
-         * @param {array} qTerms - Terms to search for.
-         * @param {object} qPage - Properties:
+         * @param qTerms - Terms to search for.
+         * @param qPage - Properties:
          * Name | Type | Description
          * qOffset | Number | Position from the top, starting from 0.
          * qCount | Number | Number of search results to return.
@@ -1395,49 +1396,49 @@ declare namespace AppAPI {
          *                           are made on top of the current selections. If no selections were
          *                           made before the search, this mode is identical to the Cleared context.
          * | | Default value is LockedFieldsOnly.
-         * @param {function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         searchResults(qTerms: any[], qPage: any, qOptions?: any, callback?: any): ng.IPromise<any>;
 
         /**
          * Returns suggestions of words from the values entered in the search. Acts as a helper for the searchAssociations method.
-         * @param {array} qTerms - Terms to search for.
-         * @param {object} [qOptions] - Optional. Search options. Properties:
+         * @param qTerms - Terms to search for.
+         * @param [qOptions] - Optional. Search options. Properties:
          * Name | Type | Description
          * qSearchFields | Array | List of search fields.
-         * @param {function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         searchSuggest(qTerms: any[], qOptions?: any, callback?: any): ng.IPromise<any>;
 
         /**
          * Makes a selection based on searchAssociation results.
-         * @param {number} qMatchIx - Index to search result.
-         * @param {array} qTerms - Values to select.
-         * @param {object} qOptions - Values to select.
-         * @param {array} [qTerms] - Optional. Parameter sent to the Qlik engine containing information about the search fields and the search context.
-         * @param {object} [qSoftLock] - Optional. This parameter was deprecated in version 2.0 and is ignored in newer versions. Use the qOtions.qContext parameter instead.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qMatchIx - Index to search result.
+         * @param qTerms - Values to select.
+         * @param qOptions - Values to select.
+         * @param [qTerms] - Optional. Parameter sent to the Qlik engine containing information about the search fields and the search context.
+         * @param [qSoftLock] - Optional. This parameter was deprecated in version 2.0 and is ignored in newer versions. Use the qOtions.qContext parameter instead.
+         * @return - A promise of a Qlik engine reply.
          */
         selectAssociations(qMatchIx: number, qTerms: any[], qOptions?: any, qSoftLock?: any): ng.IPromise<any>;
 
         /**
          * Sets the data load script of this app. Also validates the script syntax and returns the syntax errors if errors exist.
-         * @param {string} [state] - Optional. Sets the state. Default is $.
+         * @param [state] - Optional. Sets the state. Default is $.
          */
         selectionState(state?: string): SelectionStateAPI.IQSelectionState;
 
         /**
          * Creates a QSelectionState object that encapsulates the selection state. Entry point to the Selection API.
-         * @param {string} [script] - The script content.
-         * @return {Promise} - A promise of an empty object or a list of syntax errors depending on the validation result.
+         * @param [script] - The script content.
+         * @return - A promise of an empty object or a list of syntax errors depending on the validation result.
          */
         setScript(script: string): ng.IPromise<any>;
 
         /**
          * Unlocks all selections that has previously been locked.
-         * @param {string} [state] - Optional. Alternate state name. Default: $ Introduced in version 2.1.
+         * @param [state] - Optional. Alternate state name. Default: $ Introduced in version 2.1.
          */
         unlockAll(state?: string): ng.IPromise<any>;
     }
@@ -1447,24 +1448,24 @@ declare namespace BookmarkAPI {
     interface IBookmark {
         /**
          * Applies a bookmark.
-         * @param {string} id - Bookmark id.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param id - Bookmark id.
+         * @return - A promise of a Qlik engine reply.
          */
         apply(id: string): ng.IPromise<any>;
 
         /**
          * Creates a bookmark based on the current selection.
-         * @param {string} title - Bookmark title.
-         * @param {string} description - Bookmark description.
-         * @param {string} [sheetId] - Optional. Bookmark sheet id. Introduced in version 2.2.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param title - Bookmark title.
+         * @param description - Bookmark description.
+         * @param [sheetId] - Optional. Bookmark sheet id. Introduced in version 2.2.
+         * @return - A promise of a Qlik engine reply.
          */
         create(title: string, description: string, sheetId?: string): ng.IPromise<any>;
 
         /**
          * Removes a bookmark.
-         * @param {string} id - Bookmark id.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param id - Bookmark id.
+         * @return - A promise of a Qlik engine reply.
          */
         remove(id: string): ng.IPromise<any>;
     }
@@ -1474,14 +1475,14 @@ declare namespace FieldAPI {
     interface IQField {
         /**
          * Clears a field selection.
-         * @return {Promise} - A promise.
+         * @return - A promise.
          */
         clear(): ng.IPromise<any>;
 
         /**
          * Clears all fields except the selected one.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         clearOther(softlock?: boolean): ng.IPromise<any>;
 
@@ -1489,7 +1490,7 @@ declare namespace FieldAPI {
          * Gets field data. The values are available as QFieldValue in array
          * field.rows and will updated when the selection state changes.
          * Notification OnData will be triggered after each update.
-         * @param {boolean} [options] - Optional. Properties:
+         * @param [options] - Optional. Properties:
          * Name | Type | Description
          * rows | Number | Number of rows to fetch. Default: 200.
          * frequencyMode | String | Can be one of:
@@ -1498,89 +1499,89 @@ declare namespace FieldAPI {
          *       # R=Relative
          *       # N=No frequency
          *      |        | Default: V.
-         * @return {IQField} - The field object.
+         * @return - The field object.
          */
         getData(options?: boolean): IQField;
 
         /**
          * Gets more data for your field. Notification OnData is triggered when complete.
-         * @return {IQField} - The field object.
+         * @return - The field object.
          */
         getMoreData(): IQField;
 
         /**
          * Locks a field selection.
-         * @return {Promise} - A promise.
+         * @return - A promise.
          */
         lock(): ng.IPromise<any>;
 
         /**
          * Selects field values using indexes.
-         * @param {number[]} Array - Array of index values to select
-         * @param {boolean} [toggle] - Optional. If true, toggle selected state.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param Array - Array of index values to select
+         * @param [toggle] - Optional. If true, toggle selected state.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         select(Array: number[], toggle?: boolean, softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Selects all values in a field.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         selectAll(softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Selects alternative values in a field.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         selectAlternative(softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Selects excluded values in a field.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         selectExcluded(softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Selects matching field values.
-         * @param {string} match - Match string.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param match - Match string.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         selectMatch(match: string, softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Selects possible values in a field.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         selectPossible(softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Selects specific values in a field.
-         * @param {array} array - Array of qFieldValues to select. A simplified syntax with
+         * @param array - Array of qFieldValues to select. A simplified syntax with
          *                         strings or numbers also works since version 1.1.
          * For a numeric field you need to provide the numeric value.
-         * @param {boolean} [toggle] - Optional. If true, toggle selected state.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param [toggle] - Optional. If true, toggle selected state.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         selectValues(array: IQFieldValue[], toggle?: boolean, softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Toggles a field selection.
-         * @param {string} match - Match string.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param match - Match string.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         toggleSelect(match: string, softlock?: boolean): ng.IPromise<any>;
 
         /**
          * Unlocks field selections.
-         * @return {Promise} - A promise.
+         * @return - A promise.
          */
         unlock(): ng.IPromise<any>;
 
@@ -1629,9 +1630,9 @@ declare namespace FieldAPI {
 
         /**
          * Selects a field value.
-         * @param {boolean} [toggle] - Optional. If true, toggle selected state.
-         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
-         * @return {Promise} - A promise.
+         * @param [toggle] - Optional. If true, toggle selected state.
+         * @param [softlock] - Optional. If true, locked selections can be overridden.
+         * @return - A promise.
          */
         select(toggle?: boolean, softlock?: boolean): ng.IPromise<any>;
     }
@@ -1641,7 +1642,7 @@ declare namespace GlobalAPI {
     interface IGlobal {
         /**
          * Cancels an ongoing reload. The reload of the app is stopped.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @return - A promise of a Qlik engine reply.
          */
         cancelReload(): ng.IPromise<any>;
 
@@ -1650,45 +1651,45 @@ declare namespace GlobalAPI {
          * registers a callback to receive the data. Calling the getAppList method
          * opens a WebSocket, gets the app list, and then keeps the WebSocket open
          * for you to make other calls as well.
-         * @param {Function} callback - Callback method.
+         * @param callback - Callback method.
          */
         getAppList(callback: any): void;
 
         /**
          * Gets information (user directory and user id) about the authenticated user.
-         * @param {Function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         getAuthenticatedUser(callback?: any): ng.IPromise<any>;
 
         /**
          * Gets information about progress of doReload and doSave calls.
-         * @param {Number} qRequestId - Request id from doReload call or 0.
+         * @param qRequestId - Request id from doReload call or 0.
          * Complete information is returned if the identifier of the request is specified.
          * If qRequestId = 0, less information is returned.
-         * @param {Function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         getProgress(qRequestId: number, callback?: any): ng.IPromise<any>;
 
         /**
          * Gets the product version.
-         * @param {Function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         getProductVersion(callback?: any): ng.IPromise<any>;
 
         /**
          * Gets the Qlik product name.
-         * @param {Function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         getQTProduct(callback?: any): ng.IPromise<any>;
 
         /**
          * Gets the Qlik Sense version number.
-         * @param {Function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise.
          */
         getQvVersion(callback?: any): ng.IPromise<any>;
 
@@ -1696,8 +1697,8 @@ declare namespace GlobalAPI {
          * Gets information if the user is working in personal mode
          * (returns true if Qlik Sense Desktop is used) or not
          * (returns false if Qlik Sense Desktop is not used).
-         * @param {Function} [callback] - Optional. Callback method.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param [callback] - Optional. Callback method.
+         * @return - A promise of a Qlik engine reply.
          */
         isPersonalMode(callback?: any): ng.IPromise<any>;
     }
@@ -1742,7 +1743,8 @@ declare namespace NavigationAPI {
         errorMsg: string;
     }
 
-    /** Navigation API for Qlik Sense. The Navigation API allows you to navigate
+    /**
+     * Navigation API for Qlik Sense. The Navigation API allows you to navigate
      * within a Qlik Sense app, and is meant to be used in visualization extensions
      * and will not work in Mashup scenarios.
      */
@@ -1759,37 +1761,37 @@ declare namespace NavigationAPI {
 
         /**
          * Gets the current sheet ID.
-         * @return {NavigationResult} - A navigation result object.
+         * @return - A navigation result object.
          */
         getCurrentSheetId(): NavigationResult;
 
         /**
          * Gets the current mode.
-         * @return {string} - The current mode as a string.
+         * @return - The current mode as a string.
          */
         getMode(): string;
 
         /**
          * Navigate to a given sheet in the current app.
          * The method will return before the actual navigation takes place.
-         * @param {string} sheetId - Set the sheet ID to navigate to.
-         * @return {NavigationResult} - A navigation result object.
+         * @param sheetId - Set the sheet ID to navigate to.
+         * @return - A navigation result object.
          */
         gotoSheet(sheetId: string): NavigationResult;
 
         /**
          * Navigate to a given story in the current app.
          * The method will return before the actual navigation takes place.
-         * @param {string} storyId - Set the story ID to navigate to.
-         * @return {NavigationResult} - A navigation result object.
+         * @param storyId - Set the story ID to navigate to.
+         * @return - A navigation result object.
          */
         gotoStory(storyId: string): NavigationResult;
 
         /**
          * Checks if a given mode is allowed.
-         * @param {NavigationModeType} mode - Can be one of the strings: edit   |   analysis
+         * @param mode - Can be one of the strings: edit   |   analysis
          * or one of the constants: qlik.navigation.EDIT   |   qlik.navigation.ANALYSIS
-         * @return {boolean} - A Boolean value (true or false).
+         * @return - A Boolean value (true or false).
          */
         isModeAllowed(mode: NavigationModeType): boolean;
 
@@ -1797,7 +1799,7 @@ declare namespace NavigationAPI {
          * Go to the next sheet in the current app.
          * It will do nothing if you do not have sheets in the current context.
          * The method will return before the actual navigation takes place.
-         * @return {NavigationResult} - A navigation result object.
+         * @return - A navigation result object.
          */
         nextSheet(): NavigationResult;
 
@@ -1805,23 +1807,23 @@ declare namespace NavigationAPI {
          * Jumps to the previous sheet in the current app.
          * It will do nothing if you do not have sheets in the current context.
          * The method will return before the actual navigation takes place
-         * @return {NavigationResult} - A navigation result object.
+         * @return - A navigation result object.
          */
         prevSheet(): NavigationResult;
 
         /**
          * Sets the current working mode of Qlik Sense.
-         * @param {string | constant} mode - Can be one of the strings: edit   |   analysis
+         * @param mode - Can be one of the strings: edit   |   analysis
          * or one of the constants: qlik.navigation.EDIT   |   qlik.navigation.ANALYSIS
-         * @return {NavigationResult} - A navigation result object.
+         * @return - A navigation result object.
          */
         setMode(mode: string): NavigationResult;
 
         /**
          * Switches the working mode of Qlik Sense.
-         * @param {NavigationModeType} mode - Can be one of the strings: edit   |   analysis
+         * @param mode - Can be one of the strings: edit   |   analysis
          * or one of the constants: qlik.navigation.EDIT   |   qlik.navigation.ANALYSIS
-         * @return {NavigationResult} - A navigation result object.
+         * @return - A navigation result object.
          */
         switchMode(mode: NavigationModeType): NavigationResult;
     }
@@ -1916,20 +1918,20 @@ declare namespace SelectionStateAPI {
 
         /**
          * Cleara all selections in this state.
-         * @param {boolean} lockedAlso - Use to also clear locked fields.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param lockedAlso - Use to also clear locked fields.
+         * @return - A promise of a Qlik engine reply.
          */
         clearAll(lockedAlso: boolean): ng.IPromise<any>;
 
         /**
          * Locks all selections in this state.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @return - A promise of a Qlik engine reply.
          */
         lockAll(): ng.IPromise<any>;
 
         /**
          * Unlocks all selections in this state.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @return - A promise of a Qlik engine reply.
          */
         unlockAll(): ng.IPromise<any>;
     }
@@ -1964,7 +1966,7 @@ declare namespace TableAPI {
 
         /**
          * Exports data of the underlying hypercube in OOXML or CSV format.
-         * @param {object} [options] - Optional. Properties:
+         * @param [options] - Optional. Properties:
          * Name | Type | Description
          * format | String | Data format. Can be one of:
          *       # OOXML: open XML, default
@@ -1976,14 +1978,14 @@ declare namespace TableAPI {
          *       # A: all values
          *       # P: possible values (default)
          * download | Boolean | Automatically start download of file (with window.open).
-         * @param {Function} [callback] - Optional. Callback function returning the link to the exported file.
+         * @param [callback] - Optional. Callback function returning the link to the exported file.
          */
         exportData(options?: any, callback?: any): void;
 
         /**
          * Gets the column number for a given field name.
-         * @param {string} fld - Field name.
-         * @return {number} - Column number, starting with zero. Undefined if no column with that name exists.
+         * @param fld - Field name.
+         * @return - Column number, starting with zero. Undefined if no column with that name exists.
          */
         getColByName(fld: string): number;
 
@@ -2072,11 +2074,11 @@ declare namespace TableAPI {
 
         /**
          * Select a range in this measure.
-         * @param {number} min - Sets the minimum value of the range.
-         * @param {number} max - Sets the maximum value of the range.
-         * @param {boolean} [inclMin] - Optional. Set to true to include minimum value.
-         * @param {boolean} [inclMax] - Optional. Set to true to include maximum value.
-         * @return {Promise} - A promise.
+         * @param min - Sets the minimum value of the range.
+         * @param max - Sets the maximum value of the range.
+         * @param [inclMin] - Optional. Set to true to include minimum value.
+         * @param [inclMax] - Optional. Set to true to include maximum value.
+         * @return - A promise.
          */
         selectRange(min: number, max: number, inclMin?: boolean, inclMax?: boolean): ng.IPromise<any>;
     }
@@ -2143,7 +2145,7 @@ declare namespace VariableAPI {
     interface IVariable {
         /**
          * Creates a variable.
-         * @param {string | object} qProp - Variable name or properties. Properties:
+         * @param qProp - Variable name or properties. Properties:
          * Name | Type | Description
          * qInfo.qId | String | Optional. Variable id. If the selected ID is already in use, a new ID is automatically set by the engine.
          * qName | String | Variable name. The name must be unique.
@@ -2151,14 +2153,14 @@ declare namespace VariableAPI {
          * qDefinition | String | Optional. Variable definition.
          * qNumberPresentation | Object | Optional. Defines the format of the value.
          * qIncludeInBookmark | Boolean | Optional. Set to true to update the variable when applying a bookmark. The variable value will be persisted in the bookmark.
-         * @return {Promise} - Returns a promise of a variable model.
+         * @return - Returns a promise of a variable model.
          */
         create(qProp: string | any): ng.IPromise<any>;
 
         /**
          * Creates a session variable, that is a temporary variable which is not
          * persisted and needs to be recreated for each new session.
-         * @param {object} qProp - Variable properties:
+         * @param qProp - Variable properties:
          * Name | Type | Description
          * qInfo.qId | String | Optional. Variable id.
          * qName | String | Variable name.
@@ -2166,53 +2168,53 @@ declare namespace VariableAPI {
          * qDefinition | String | Optional. Variable definition.
          * qNumberPresentation | Object | Optional.
          * qIncludeInBookmark | Boolean | Optional. Include in bookmark flag.
-         * @return {Promise} - A promise of a variable model.
+         * @return - A promise of a variable model.
          */
         createSessionVariable(qProp: any): ng.IPromise<any>;
 
         /**
          * Gets a variable by id.
-         * @param {string} qId - Variable id.
-         * @return {Promise} - A promise of a variable model.
+         * @param qId - Variable id.
+         * @return - A promise of a variable model.
          */
         get(qId: string): ng.IPromise<any>;
 
         /**
          * Gets a variable by name.
-         * @param {string} qName - Variable name.
-         * @return {Promise} - A promise of a variable model.
+         * @param qName - Variable name.
+         * @return - A promise of a variable model.
          */
         getByName(qName: string): ng.IPromise<any>;
 
         /**
          * Gets variable content.
-         * @param {string} name - Variable name.
-         * @param {Function} callback - Callback to receive the content.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param name - Variable name.
+         * @param callback - Callback to receive the content.
+         * @return - A promise of a Qlik engine reply.
          */
         getContent(name: string, callback: any): ng.IPromise<any>;
 
         /**
          * Sets the content of a variable.
-         * @param {string} name - Variable name.
-         * @param {string} content - Variable content.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param name - Variable name.
+         * @param content - Variable content.
+         * @return - A promise of a Qlik engine reply.
          */
         setContent(name: string, content: string): ng.IPromise<any>;
 
         /**
          * Sets a numeric value as a variable.
-         * @param {string} qName - Variable name.
-         * @param {Number} qVal - Variable value.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qName - Variable name.
+         * @param qVal - Variable value.
+         * @return - A promise of a Qlik engine reply.
          */
         setNumValue(qName: string, qVal: number): ng.IPromise<any>;
 
         /**
          * Sets variable string value.
-         * @param {string} qName - Variable name.
-         * @param {string} qVal - Variable value.
-         * @return {Promise} - A promise of a Qlik engine reply.
+         * @param qName - Variable name.
+         * @param qVal - Variable value.
+         * @return - A promise of a Qlik engine reply.
          */
         setStringValue(qName: string, qVal: string): ng.IPromise<any>;
     }
@@ -2226,7 +2228,7 @@ declare namespace VisualizationAPI {
         /**
          * Create a new visualization on the fly based on a session object
          * and will not be persisted in the app.
-         * @param {VisualizationType} type - Visualization type. Can be:
+         * @param type - Visualization type. Can be:
          *       # barchart
          *       # combochart
          *       # gauge
@@ -2238,22 +2240,22 @@ declare namespace VisualizationAPI {
          *       # table
          *       # treemap
          *       # extension
-         * @param {array} [cols] - Optional. Column definitions, dimensions and measures.
+         * @param [cols] - Optional. Column definitions, dimensions and measures.
          *       Each entry can be of the following structures:
          *       # String
          *       # NxDimension
          *       # NxMeasure
          *       If the NxDimension or the NxMeasure refer to a library dimension
          *       or a library measure, you also need to add qType : "measure" or "dimension".
-         * @param {object} [options] - Optional. Options to set.
-         * @return {Promise} - A promise of a QVisualization.
+         * @param [options] - Optional. Options to set.
+         * @return - A promise of a QVisualization.
          */
         create(type: VisualizationType, cols?: any[], options?: any): ng.IPromise<any>;
 
         /**
          * Gets an existing visualization.
-         * @param {string} id - Id for an existing visualization.
-         * @return {Promise} - A promise of a QVisualization.
+         * @param id - Id for an existing visualization.
+         * @return - A promise of a QVisualization.
          */
         get(id: string): ng.IPromise<any>;
     }
@@ -2267,7 +2269,7 @@ declare namespace VisualizationAPI {
 
         /**
          * Closes a visualization and releases the session object.
-         * @return {Promise} - A promise.
+         * @return - A promise.
          */
         close(): ng.IPromise<any>;
 
@@ -2278,14 +2280,14 @@ declare namespace VisualizationAPI {
 
         /**
          * Sets options for a visualization.
-         * @param {object} options - Options to set (using applyPatches).
+         * @param options - Options to set (using applyPatches).
          */
         setOptions(options?: any): void;
 
         /**
          * Shows the visualization in an HTML element.
-         * @param {Element | string} [element] - Optional. HTML element or HTML element ID.
-         * @param {object} [options] - Optional.
+         * @param [element] - Optional. HTML element or HTML element ID.
+         * @param [options] - Optional.
          * Name | Type | Description
          * noInteraction | Boolean | Set to true if you want to disable all interaction, including selections, in the visualization.
          * noSelections | Boolean | Set to true if you want to disable selections in the visualization.
@@ -2563,3 +2565,45 @@ declare module "qvangular" {
     const e: IQVAngular;
     export = e;
 }
+
+/**
+ * This section is added because the Qlik Sense Client after > 3.2 contains a engineapi
+ * an this makes the handling more fluent for users of that files.
+ */
+declare namespace enigmaJS {
+    interface IGeneratedAPI {
+        /**
+         * This property contains the unique identifier for this API.
+         */
+        id: string;
+
+        /**
+         * This property contains the schema class name for this API.
+         */
+        type: string;
+
+        /**
+         * Despite the name, this property corresponds to the qInfo.qType property on your generic object's properties object.
+         */
+        genericType: string;
+
+        /**
+         * This property contains the handle QIX Engine assigned to the API.
+         * Used internally in enigma.js for caches and JSON-RPC
+         */
+        handle: number;
+
+        /**
+         * register a function for events
+         * @param event - function called if this event occures
+         * @param func - function that is called
+         */
+        on(event: "changed" | "closed", func: () => void): void;
+
+        /**
+         * manual emit an events
+         * @param event - event that occures
+         */
+        emit(event: "changed" | "closed"): void;
+    }
+}
diff --git a/types/qr-image/index.d.ts b/types/qr-image/index.d.ts
index 593adce02f..a84f9b10ce 100644
--- a/types/qr-image/index.d.ts
+++ b/types/qr-image/index.d.ts
@@ -10,16 +10,9 @@
  */
 export type ec_level = 'L' | 'M' | 'Q' | 'H';
 
-/**
- * image type. Possible values png (default), svg, pdf and eps.
- */
+/** @default 'png' */
 export type image_type = 'png' | 'svg' | 'pdf' | 'eps';
 
-/**
- * image options object:
- *
- * @interface IOptions
- */
 export interface Options {
 	ec_level?: ec_level;	// error correction level. One of L, M, Q, H. Default M.
 	type?: image_type;		// image type. Possible values png(default), svg, pdf and eps.
@@ -29,12 +22,12 @@ export interface Options {
 }
 
 export function image(text: string, level?: ec_level): NodeJS.ReadableStream;
-export function image(text: string, optoins?: Options): NodeJS.ReadableStream;
+export function image(text: string, options?: Options): NodeJS.ReadableStream;
 
 export function imageSync(text: string, level?: ec_level): Buffer;
-export function imageSync(text: string, optoins?: Options): string | Buffer;
+export function imageSync(text: string, options?: Options): string | Buffer;
 
 export function svgObject(text: string, level?: ec_level): any;
-export function svgObject(text: string, optoins?: Options): any;
+export function svgObject(text: string, options?: Options): any;
 
 export function matrix(text: string, level?: ec_level): any[][];
diff --git a/types/qrcode-generator/index.d.ts b/types/qrcode-generator/index.d.ts
deleted file mode 100644
index 1ca4fb0370..0000000000
--- a/types/qrcode-generator/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for grcode-generator
-// Project: https://github.com/kazuhikoarase/qrcode-generator
-// Definitions by: Stefan Huber <https://github.com/stefanhuber>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function qrcode(type: number, errorCorrectionLevel: string) : QRCode;
-export = qrcode;
-export as namespace qrcode;
-
-interface QRCode {
-    addData(data: string) : void;
-    make() : void;
-    
-    createTableTag(cellSize: number, margin: number) : string;
-    createSvgTag(cellSize: number, margin: number) : string;
-    createImageTag(cellSize: number, margin: number) : string;    
-}
diff --git a/types/qrcode-generator/qrcode-generator-tests.ts b/types/qrcode-generator/qrcode-generator-tests.ts
deleted file mode 100644
index 55a3fe372b..0000000000
--- a/types/qrcode-generator/qrcode-generator-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import qrcode = require('qrcode-generator');
-
-let qr = qrcode(4,'M');
-
-qr.addData('some arbitrary data');
-qr.make();
-
-let imgHtml = qr.createImageTag(5,5);
-let svgHtml = qr.createSvgTag(5,5);
-let tableHtml = qr.createTableTag(5,5);
\ No newline at end of file
diff --git a/types/qrcode-generator/tsconfig.json b/types/qrcode-generator/tsconfig.json
deleted file mode 100644
index d38967f679..0000000000
--- a/types/qrcode-generator/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "qrcode-generator-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/qrcode/tslint.json b/types/qrcode/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/qrcode/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/qs/index.d.ts b/types/qs/index.d.ts
index 2ecbed14be..2a3b10a273 100644
--- a/types/qs/index.d.ts
+++ b/types/qs/index.d.ts
@@ -5,6 +5,7 @@
 //                 Belinda Teh <https://github.com/tehbelinda>
 //                 Melvin Lee <https://github.com/zyml>
 //                 Arturs Vonda <https://github.com/artursvonda>
+//                 Carlos Bonetti <https://github.com/CarlosBonetti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = QueryString;
@@ -25,6 +26,7 @@ declare namespace QueryString {
         format?: 'RFC1738' | 'RFC3986';
         encodeValuesOnly?: boolean;
         addQueryPrefix?: boolean;
+        allowDots?: boolean;
     }
 
     interface IParseOptions {
diff --git a/types/qs/qs-tests.ts b/types/qs/qs-tests.ts
index 49fe89a4aa..2054292a1f 100644
--- a/types/qs/qs-tests.ts
+++ b/types/qs/qs-tests.ts
@@ -287,3 +287,7 @@ qs.parse('a=b&c=d', { delimiter: '&' });
 () => {
     assert.equal(qs.stringify({ a: 'b' }, { addQueryPrefix: true }), '?a=b');
 }
+
+() => {
+    assert.equal(qs.stringify({ a: { b: { c: 'd', e: 'f' } } }, { allowDots: true }), 'a.b.c=d&a.b.e=f');
+}
diff --git a/types/qs/tslint.json b/types/qs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/qs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/qtip2/tslint.json b/types/qtip2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/qtip2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/query-string/index.d.ts b/types/query-string/index.d.ts
index f2145df75f..e7f51453eb 100644
--- a/types/query-string/index.d.ts
+++ b/types/query-string/index.d.ts
@@ -13,7 +13,6 @@ export interface ParseOptions {
 /**
  * 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, options?: ParseOptions): any;
 
@@ -25,14 +24,10 @@ export interface StringifyOptions {
 
 /**
  * Stringify an object into a query string, sorting the keys.
- *
- * @param obj
  */
 export function stringify(obj: object, options?: StringifyOptions): 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/types/quill/index.d.ts b/types/quill/index.d.ts
index 6325913519..a996babf30 100644
--- a/types/quill/index.d.ts
+++ b/types/quill/index.d.ts
@@ -2,8 +2,11 @@
 // Project: https://github.com/quilljs/quill/
 // Definitions by: Sumit <https://github.com/sumitkm>
 //                 Guillaume <https://github.com/guillaume-ro-fr>
+//                 James Garbutt <https://github.com/43081j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import { Blot } from 'parchment/dist/src/blot/abstract/blot';
+
 /**
  * A stricter type definition would be:
  *
@@ -56,7 +59,9 @@ export interface QuillOptionsStatic {
 }
 
 export interface BoundsStatic {
+    bottom: number;
     left: number;
+    right: number;
     top: number;
     height: number;
     width: number;
@@ -136,6 +141,7 @@ export class Quill implements EventEmitter {
      */
     root: HTMLDivElement;
     clipboard: ClipboardStatic;
+    scroll: Blot;
     constructor(container: string | Element, options?: QuillOptionsStatic);
     deleteText(index: number, length: number, source?: Sources): DeltaStatic;
     disable(): void;
diff --git a/types/quill/package.json b/types/quill/package.json
new file mode 100644
index 0000000000..85d0ed05d1
--- /dev/null
+++ b/types/quill/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "parchment": "^1.1.2"
+    }
+}
diff --git a/types/quill/quill-tests.ts b/types/quill/quill-tests.ts
index 142c821ffa..f907092ed1 100644
--- a/types/quill/quill-tests.ts
+++ b/types/quill/quill-tests.ts
@@ -1,4 +1,5 @@
 import { Quill, Delta, DeltaStatic, RangeStatic, StringMap } from 'quill';
+import { Blot } from 'parchment/src/blot/abstract/blot';
 
 function test_quill() {
     const quillEditor = new Quill('#editor', {
@@ -10,6 +11,11 @@ function test_quill() {
     });
 }
 
+function test_scroll() {
+    const quillEditor = new Quill('#editor');
+    const blot: Blot = quillEditor.scroll;
+}
+
 function test_deleteText() {
     const quillEditor = new Quill('#editor');
     quillEditor.deleteText(0, 10);
diff --git a/types/quill/tslint.json b/types/quill/tslint.json
index b1439230db..77fbe508d5 100644
--- a/types/quill/tslint.json
+++ b/types/quill/tslint.json
@@ -1,7 +1,9 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "no-any-union": false
+        // TODOs
+        "no-any-union": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false
     }
 }
diff --git a/types/quixote/tslint.json b/types/quixote/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/quixote/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/qunit/tslint.json b/types/qunit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/qunit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/qunit/v1/tslint.json b/types/qunit/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/qunit/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/quoted-printable/tslint.json b/types/quoted-printable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/quoted-printable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/qwest/tslint.json b/types/qwest/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/qwest/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rabbit.js/tslint.json b/types/rabbit.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rabbit.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ractive/tslint.json b/types/ractive/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ractive/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/radium/tslint.json b/types/radium/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/radium/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/radius/tslint.json b/types/radius/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/radius/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 776c074b73..869fa0154e 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1,8 +1,7 @@
-// Type definitions for ramda 0.24
+// Type definitions for ramda 0.25
 // Project: https://github.com/donnut/typescript-ramda
 // Definitions by: Erwin Poeze <https://github.com/donnut>
 //                 Matt DeKrey <https://github.com/mdekrey>
-//                 Liam Goodacre <https://github.com/LiamGoodacre>
 //                 Matt Dziuban <https://github.com/mrdziuban>
 //                 Stephen King <https://github.com/sbking>
 //                 Alejandro Fernandez Haro <https://github.com/afharo>
@@ -10,6 +9,12 @@
 //                 Jordan Quagliatini <https://github.com/1M0reBug>
 //                 Simon Højberg <https://github.com/hojberg>
 //                 Charles-Philippe Clermont <https://github.com/charlespwd>
+//                 Samson Keung <https://github.com/samsonkeung>
+//                 Angelo Ocana <https://github.com/angeloocana>
+//                 Rayner Pupo <https://github.com/raynerd>
+//                 Miika Hänninen <https://github.com/googol>
+//                 Nikita Moshensky <https://github.com/moshensky>
+//                 Ethan Resnick <https://github.com/ethanresnick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -18,7 +23,7 @@ declare let R: R.Static;
 declare namespace R {
     type Ord = number | string | boolean;
 
-    type Path = Array<(number | string)>;
+    type Path = ReadonlyArray<(number | string)>;
 
     interface Functor<T> {
         map<U>(fn: (t: T) => U): Functor<U>;
@@ -48,6 +53,7 @@ declare namespace R {
     }
 
     type Pred = (...a: any[]) => boolean;
+    type SafePred<T> = (...a: T[]) => boolean;
 
     type ObjPred = (value: any, key: string) => boolean;
 
@@ -65,7 +71,7 @@ declare namespace R {
     }
 
     interface Filter<T> {
-      (list: T[]): T[];
+      (list: ReadonlyArray<T>): T[];
       (obj: Dictionary<T>): Dictionary<T>;
     }
 
@@ -144,9 +150,9 @@ declare namespace R {
         (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6): R;
     }
 
-    interface Reduced {
-        [index: number]: any;
-        [index: string]: any;
+    interface Reduced<T> {
+        '@@transducer/value': T;
+        '@@transducer/reduced': true;
     }
 
     interface Static {
@@ -162,29 +168,29 @@ declare namespace R {
          * Creates a new list iteration function from an existing one by adding two new parameters to its callback
          * function: the current index, and the entire list.
          */
-        addIndex<T, U>(fn: (f: (item: T) => U, list: T[]) => U[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => U, T[], U[]>;
+        addIndex<T, U>(fn: (f: (item: T) => U, list: T[]) => U[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => U, ReadonlyArray<T>, U[]>;
         /* Special case for forEach */
-        addIndex<T>(fn: (f: (item: T) => void, list: T[]) => T[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => void, T[], T[]>;
+        addIndex<T>(fn: (f: (item: T) => void, list: T[]) => T[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => void, ReadonlyArray<T>, T[]>;
         /* Special case for reduce */
-        addIndex<T, U>(fn: (f: (acc: U, item: T) => U, aci: U, list: T[]) => U): CurriedFunction3<(acc: U, item: T, idx: number, list?: T[]) => U, U, T[], U>;
+        addIndex<T, U>(fn: (f: (acc: U, item: T) => U, aci: U, list: T[]) => U): CurriedFunction3<(acc: U, item: T, idx: number, list?: T[]) => U, U, ReadonlyArray<T>, U>;
 
         /**
          * Applies a function to the value at the given index of an array, returning a new copy of the array with the
          * element at the given index replaced with the result of the function application.
          */
-        adjust<T>(fn: (a: T) => T, index: number, list: T[]): T[];
-        adjust<T>(fn: (a: T) => T, index: number): (list: T[]) => T[];
+        adjust<T>(fn: (a: T) => T, index: number, list: ReadonlyArray<T>): T[];
+        adjust<T>(fn: (a: T) => T, index: number): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Returns true if all elements of the list match the predicate, false if there are any that don't.
          */
-        all<T>(fn: (a: T) => boolean, list: T[]): boolean;
-        all<T>(fn: (a: T) => boolean): (list: T[]) => boolean;
+        all<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): boolean;
+        all<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => boolean;
 
         /**
          * Given a list of predicates, returns a new predicate that will be true exactly when all of them are.
          */
-        allPass(preds: Pred[]): Pred;
+        allPass(preds: ReadonlyArray<Pred>): Pred;
 
         /**
          * Returns a function that always returns the given value.
@@ -201,40 +207,39 @@ declare namespace R {
         /**
          * Returns true if at least one of elements of the list match the predicate, false otherwise.
          */
-        any<T>(fn: (a: T) => boolean, list: T[]): boolean;
-        any<T>(fn: (a: T) => boolean): (list: T[]) => boolean;
+        any<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): boolean;
+        any<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => boolean;
 
         /**
          * Given a list of predicates returns a new predicate that will be true exactly when any one of them is.
          */
-        anyPass(preds: Pred[]): Pred;
+        anyPass<T>(preds: ReadonlyArray<SafePred<T>>): SafePred<T>;
 
         /**
          * ap applies a list of functions to a list of values.
          */
-        ap<T, U>(fns: Array<((a: T) => U)>, vs: T[]): U[];
-        ap<T, U>(fns: Array<((a: T) => U)>): (vs: T[]) => U[];
+        ap<T, U>(fns: Array<((a: T) => U)>, vs: ReadonlyArray<T>): U[];
+        ap<T, U>(fns: Array<((a: T) => U)>): (vs: ReadonlyArray<T>) => U[];
 
         /**
          * Returns a new list, composed of n-tuples of consecutive elements If n is greater than the length of the list,
          * an empty list is returned.
          */
-        aperture<T>(n: number, list: T[]): T[][];
-        aperture(n: number): <T>(list: T[]) => T[][];
+        aperture<T>(n: number, list: ReadonlyArray<T>): T[][];
+        aperture(n: number): <T>(list: ReadonlyArray<T>) => T[][];
 
         /**
          * Returns a new list containing the contents of the given list, followed by the given element.
          */
-        append<U>(el: U): <T>(list: T[]) => Array<(T & U)>;
-        append<T, U>(el: U, list: T[]): Array<(T & U)>;
-        append<T>(el: T, list: string): Array<T & string>;
+        append<T>(el: T, list: ReadonlyArray<T>): T[];
+        append<T>(el: T): <T>(list: ReadonlyArray<T>) => T[];
 
         /**
          * Applies function fn to the argument list args. This is useful for creating a fixed-arity function from
          * a variadic function. fn should be a bound function if context is significant.
          */
-        apply<T, U, TResult>(fn: (arg0: T, ...args: T[]) => TResult, args: U[]): TResult;
-        apply<T, TResult>(fn: (arg0: T, ...args: T[]) => TResult): <U>(args: U[]) => TResult;
+        apply<T, U, TResult>(fn: (arg0: T, ...args: T[]) => TResult, args: ReadonlyArray<U>): TResult;
+        apply<T, TResult>(fn: (arg0: T, ...args: T[]) => TResult): <U>(args: ReadonlyArray<U>) => TResult;
 
         /**
          * Given a spec object recursively mapping properties to functions, creates a function producing an object
@@ -243,6 +248,13 @@ declare namespace R {
          */
         applySpec<T>(obj: any): (...args: any[]) => T;
 
+        /**
+         * Takes a value and applies a function to it.
+         * This function is also known as the thrush combinator.
+         */
+        applyTo<T, U>(el: T, fn: (t: T) => U): U;
+        applyTo<T>(el: T): <U>(fn: (t: T) => U) => U;
+
         /**
          * Makes an ascending comparator function out of a function that returns a value that can be compared with < and >.
          */
@@ -295,8 +307,8 @@ declare namespace R {
          * `chain` maps a function over a list and concatenates the results.
          * This implementation is compatible with the Fantasy-land Chain spec
          */
-        chain<T, U>(fn: (n: T) => U[], list: T[]): U[];
-        chain<T, U>(fn: (n: T) => U[]): (list: T[]) => U[];
+        chain<T, U>(fn: (n: T) => U[], list: ReadonlyArray<T>): U[];
+        chain<T, U>(fn: (n: T) => U[]): (list: ReadonlyArray<T>) => U[];
 
         /**
          * Restricts a number to be within a range.
@@ -311,7 +323,7 @@ declare namespace R {
          * Creates a deep copy of the value which may contain (nested) Arrays and Objects, Numbers, Strings, Booleans and Dates.
          */
         clone<T>(value: T): T;
-        clone<T>(value: T[]): T[];
+        clone<T>(value: ReadonlyArray<T>): T[];
 
         /**
          * Makes a comparator function out of a function that reports whether the first element is less than the second.
@@ -380,8 +392,8 @@ declare namespace R {
          * Returns a new list consisting of the elements of the first list followed by the elements
          * of the second.
          */
-        concat<T>(list1: T[], list2: T[]): T[];
-        concat<T>(list1: T[]): (list2: T[]) => T[];
+        concat<T>(list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        concat<T>(list1: ReadonlyArray<T>): (list2: ReadonlyArray<T>) => T[];
         concat(list1: string, list2: string): string;
         concat(list1: string): (list2: string) => string;
 
@@ -391,7 +403,7 @@ declare namespace R {
          * point fn returns the result of applying its arguments to the corresponding transformer. If none of the predicates
          * matches, fn returns undefined.
          */
-        cond(fns: Array<[Pred, (...a: any[]) => any]>): (...a: any[]) => any;
+        cond(fns: ReadonlyArray<[Pred, (...a: any[]) => any]>): (...a: any[]) => any;
 
         /**
          * Wraps a constructor function inside a curried function that can be called with the same arguments and returns the same type.
@@ -409,9 +421,9 @@ declare namespace R {
          * Equivalent to `indexOf(a)(list) > -1`. Uses strict (`===`) equality checking.
          */
         contains(a: string, list: string): boolean;
-        contains<T>(a: T, list: T[]): boolean;
+        contains<T>(a: T, list: ReadonlyArray<T>): boolean;
         contains(a: string): (list: string) => boolean;
-        contains<T>(a: T): (list: T[]) => boolean;
+        contains<T>(a: T): (list: ReadonlyArray<T>) => boolean;
 
         /**
          * Accepts a converging function and a list of branching functions and returns a new
@@ -419,7 +431,7 @@ declare namespace R {
          * function is applied to those same arguments. The results of each branching function
          * are passed as arguments to the converging function to produce the return value.
          */
-        converge(after: ((...a: any[]) => any), fns: Array<((...a: any[]) => any)>): (...a: any[]) => any;
+        converge(after: ((...a: any[]) => any), fns: ReadonlyArray<((...a: any[]) => any)>): (...a: any[]) => any;
 
         /**
          * Counts the elements of a list according to how many match each value
@@ -428,8 +440,8 @@ declare namespace R {
          * the list. Note that all keys are coerced to strings because of how
          * JavaScript objects work.
          */
-        countBy<T>(fn: (a: T) => string | number, list: T[]): { [index: string]: number };
-        countBy<T>(fn: (a: T) => string | number): (list: T[]) => { [index: string]: number };
+        countBy<T>(fn: (a: T) => string | number, list: ReadonlyArray<T>): { [index: string]: number };
+        countBy<T>(fn: (a: T) => string | number): (list: ReadonlyArray<T>) => { [index: string]: number };
 
         /**
          * Returns a curried equivalent of the provided function. The curried function has two unusual capabilities.
@@ -474,15 +486,15 @@ declare namespace R {
         /**
          * Finds the set (i.e. no duplicates) of all elements in the first list not contained in the second list.
          */
-        difference<T>(list1: T[], list2: T[]): T[];
-        difference<T>(list1: T[]): (list2: T[]) => T[];
+        difference<T>(list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        difference<T>(list1: ReadonlyArray<T>): (list2: ReadonlyArray<T>) => T[];
 
         /**
          * Finds the set (i.e. no duplicates) of all elements in the first list not contained in the second list.
          * Duplication is determined according to the value returned by applying the supplied predicate to two list
          * elements.
          */
-        differenceWith<T>(pred: (a: T, b: T) => boolean, list1: T[], list2: T[]): T[];
+        differenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
 
         /*
          * Returns a new object that does not contain a prop property.
@@ -506,20 +518,20 @@ declare namespace R {
         /**
          * Returns a new list containing all but the first n elements of the given list.
          */
-        drop<T>(n: number, xs: T[]): T[];
+        drop<T>(n: number, xs: ReadonlyArray<T>): T[];
         drop(n: number, xs: string): string;
         drop<T>(n: number): {
             (xs: string): string;
-            (xs: T[]): T[];
+            (xs: ReadonlyArray<T>): T[];
         };
 
         /**
          * Returns a list containing all but the last n elements of the given list.
          */
-        dropLast<T>(n: number, xs: T[]): T[];
+        dropLast<T>(n: number, xs: ReadonlyArray<T>): T[];
         dropLast(n: number, xs: string): string;
         dropLast<T>(n: number): {
-            (xs: T[]): T[];
+            (xs: ReadonlyArray<T>): T[];
             (xs: string): string;
         };
 
@@ -527,15 +539,15 @@ declare namespace R {
          * Returns a new list containing all but last then elements of a given list, passing each value from the
          * right to the supplied predicate function, skipping elements while the predicate function returns true.
          */
-        dropLastWhile<T>(fn: (a: T) => boolean, list: T[]): T[];
-        dropLastWhile<T>(fn: (a: T) => boolean): (list: T[]) => T[];
+        dropLastWhile<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): T[];
+        dropLastWhile<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Returns a new list containing the last n elements of a given list, passing each value to the supplied
          * predicate function, skipping elements while the predicate function returns true.
          */
-        dropWhile<T>(fn: (a: T) => boolean, list: T[]): T[];
-        dropWhile<T>(fn: (a: T) => boolean): (list: T[]) => T[];
+        dropWhile<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): T[];
+        dropWhile<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => T[];
 
         /**
          * A function wrapping calls to the two functions in an || operation, returning the result of the first
@@ -552,6 +564,14 @@ declare namespace R {
          */
         empty<T>(x: T): T;
 
+        /**
+         * Checks if a list ends with the provided values
+         */
+        endsWith(a: string, list: string): boolean;
+        endsWith(a: string): (list: string) => boolean;
+        endsWith<T>(a: T | ReadonlyArray<T>, list: ReadonlyArray<T>): boolean;
+        endsWith<T>(a: T | ReadonlyArray<T>): (list: ReadonlyArray<T>) => boolean;
+
         /**
          * Takes a function and two values in its domain and returns true if the values map to the same value in the
          * codomain; false otherwise.
@@ -565,7 +585,7 @@ declare namespace R {
          * Reports whether two functions have the same value for the specified property.
          */
         eqProps<T, U>(prop: string, obj1: T, obj2: U): boolean;
-        eqProps(prop: string): <T, U>(obj1: T, obj2: U) => boolean;
+        eqProps<P extends string>(prop: P): <T, U>(obj1: Record<P, T>, obj2: Record<P, U>) => boolean;
         eqProps<T>(prop: string, obj1: T): <U>(obj2: U) => boolean;
 
         /**
@@ -590,42 +610,42 @@ declare namespace R {
          * Returns a new list containing only those items that match a given predicate function. The predicate function is passed one argument: (value).
          */
         filter<T>(fn: (value: T) => boolean): Filter<T>;
-        filter<T>(fn: (value: T) => boolean, list: T[]): T[];
+        filter<T>(fn: (value: T) => boolean, list: ReadonlyArray<T>): T[];
         filter<T>(fn: (value: T) => boolean, obj: Dictionary<T>): Dictionary<T>;
 
         /**
          * Returns the first element of the list which matches the predicate, or `undefined` if no
          * element matches.
          */
-        find<T>(fn: (a: T) => boolean, list: T[]): T | undefined;
-        find<T>(fn: (a: T) => boolean): (list: T[]) => T | undefined;
+        find<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): T | undefined;
+        find<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => T | undefined;
 
         /**
          * Returns the index of the first element of the list which matches the predicate, or `-1`
          * if no element matches.
          */
-        findIndex<T>(fn: (a: T) => boolean, list: T[]): number;
-        findIndex<T>(fn: (a: T) => boolean): (list: T[]) => number;
+        findIndex<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): number;
+        findIndex<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => number;
 
         /**
          * Returns the last element of the list which matches the predicate, or `undefined` if no
          * element matches.
          */
-        findLast<T>(fn: (a: T) => boolean, list: T[]): T | undefined;
-        findLast<T>(fn: (a: T) => boolean): (list: T[]) => T | undefined;
+        findLast<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): T | undefined;
+        findLast<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => T | undefined;
 
         /**
          * Returns the index of the last element of the list which matches the predicate, or
          * `-1` if no element matches.
          */
-        findLastIndex<T>(fn: (a: T) => boolean, list: T[]): number;
-        findLastIndex<T>(fn: (a: T) => boolean): (list: T[]) => number;
+        findLastIndex<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): number;
+        findLastIndex<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => number;
 
         /**
          * Returns a new list by pulling every item out of it (and all its sub-arrays) and putting
          * them in a new array, depth-first.
          */
-        flatten<T>(x: T[] | T[][]): T[];
+        flatten<T>(x: ReadonlyArray<T> | ReadonlyArray<T[]>): T[];
 
         /**
          * Returns a new function much like the supplied one, except that the first two arguments'
@@ -639,6 +659,8 @@ declare namespace R {
          */
         forEach<T>(fn: (x: T) => void, list: T[]): T[];
         forEach<T>(fn: (x: T) => void): (list: T[]) => T[];
+        forEach<T>(fn: (x: T) => void, list: ReadonlyArray<T>): ReadonlyArray<T>;
+        forEach<T>(fn: (x: T) => void): (list: ReadonlyArray<T>) => ReadonlyArray<T>;
 
         /**
          * Iterate over an input object, calling a provided function fn for each key and value in the object.
@@ -657,13 +679,14 @@ declare namespace R {
          * calling a String-returning function
          * on each element, and grouping the results according to values returned.
          */
-        groupBy<T>(fn: (a: T) => string, list: T[]): { [index: string]: T[] };
-        groupBy<T>(fn: (a: T) => string): <T>(list: T[]) => { [index: string]: T[] };
+        groupBy<T>(fn: (a: T) => string, list: ReadonlyArray<T>): { [index: string]: T[] };
+        groupBy<T>(fn: (a: T) => string): <T>(list: ReadonlyArray<T>) => { [index: string]: T[] };
 
         /**
          * Takes a list and returns a list of lists where each sublist's elements are all "equal" according to the provided equality function
          */
-        groupWith<T>(fn: (x: T, y: T) => boolean, list: T[]): T[][];
+        groupWith<T>(fn: (x: T, y: T) => boolean): (list: ReadonlyArray<T>) => T[][];
+        groupWith<T>(fn: (x: T, y: T) => boolean, list: ReadonlyArray<T>): T[][];
         groupWith<T>(fn: (x: T, y: T) => boolean, list: string): string[];
 
         /**
@@ -694,7 +717,7 @@ declare namespace R {
          * Returns the first element in a list.
          * In some libraries this function is named `first`.
          */
-        head<T>(list: T[]): T | undefined;
+        head<T>(list: ReadonlyArray<T>): T | undefined;
         head(list: string): string;
 
         /**
@@ -725,44 +748,44 @@ declare namespace R {
          * Given a function that generates a key, turns a list of objects into an object indexing the objects
          * by the given key.
          */
-        indexBy<T, U>(fn: (a: T) => string, list: T[]): U;
-        indexBy<T>(fn: (a: T) => string): <U>(list: T[]) => U;
+        indexBy<T>(fn: (a: T) => string, list: ReadonlyArray<T>): { [key: string]: T };
+        indexBy<T>(fn: (a: T) => string): (list: ReadonlyArray<T>) => { [key: string]: T };
 
         /**
          * Returns the position of the first occurrence of an item in an array
          * (by strict equality),
          * or -1 if the item is not included in the array.
          */
-        indexOf<T>(target: T, list: T[]): number;
-        indexOf<T>(target: T): (list: T[]) => number;
+        indexOf<T>(target: T, list: ReadonlyArray<T>): number;
+        indexOf<T>(target: T): (list: ReadonlyArray<T>) => number;
 
         /**
          * Returns all but the last element of a list or string.
          */
-        init<T>(list: T[]): T[];
+        init<T>(list: ReadonlyArray<T>): T[];
         init(list: string): string;
 
         /**
          * Inserts the supplied element into the list, at index index. Note that
          * this is not destructive: it returns a copy of the list with the changes.
          */
-        insert<T>(index: number, elt: T, list: T[]): T[];
-        insert<T>(index: number, elt: T): (list: T[]) => T[];
-        insert(index: number): <T>(elt: T, list: T[]) => T[];
+        insert<T>(index: number, elt: T, list: ReadonlyArray<T>): T[];
+        insert<T>(index: number, elt: T): (list: ReadonlyArray<T>) => T[];
+        insert(index: number): <T>(elt: T, list: ReadonlyArray<T>) => T[];
 
         /**
          * Inserts the sub-list into the list, at index `index`.  _Note  that this
          * is not destructive_: it returns a copy of the list with the changes.
          */
-        insertAll<T>(index: number, elts: T[], list: T[]): T[];
-        insertAll<T>(index: number, elts: T[]): (list: T[]) => T[];
-        insertAll(index: number): <T>(elts: T[], list: T[]) => T[];
+        insertAll<T>(index: number, elts: ReadonlyArray<T>, list: ReadonlyArray<T>): T[];
+        insertAll<T>(index: number, elts: ReadonlyArray<T>): (list: ReadonlyArray<T>) => T[];
+        insertAll(index: number): <T>(elts: ReadonlyArray<T>, list: ReadonlyArray<T>) => T[];
 
         /**
          * Combines two lists into a set (i.e. no duplicates) composed of those elements common to both lists.
          */
-        intersection<T>(list1: T[], list2: T[]): T[];
-        intersection<T>(list1: T[]): (list2: T[]) => T[];
+        intersection<T>(list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        intersection<T>(list1: ReadonlyArray<T>): (list2: ReadonlyArray<T>) => T[];
 
         /**
          * Combines two lists into a set (i.e. no duplicates) composed of those
@@ -770,21 +793,21 @@ declare namespace R {
          * to the value returned by applying the supplied predicate to two list
          * elements.
          */
-        intersectionWith<T>(pred: (a: T, b: T) => boolean, list1: T[], list2: T[]): T[];
+        intersectionWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
 
         /**
          * Creates a new list with the separator interposed between elements.
          */
-        intersperse<T>(separator: T, list: T[]): T[];
-        intersperse<T>(separator: T): (list: T[]) => T[];
+        intersperse<T>(separator: T, list: ReadonlyArray<T>): T[];
+        intersperse<T>(separator: T): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Transforms the items of the list with the transducer and appends the transformed items to the accumulator
          * using an appropriate iterator function based on the accumulator type.
          */
-        into<T>(acc: any, xf: (...a: any[]) => any, list: T[]): T[];
-        into(acc: any, xf: (...a: any[]) => any): <T>(list: T[]) => T[];
-        into(acc: any): <T>(xf: (...a: any[]) => any, list: T[]) => T[];
+        into<T>(acc: any, xf: (...a: any[]) => any, list: ReadonlyArray<T>): T[];
+        into(acc: any, xf: (...a: any[]) => any): <T>(list: ReadonlyArray<T>) => T[];
+        into(acc: any): <T>(xf: (...a: any[]) => any, list: ReadonlyArray<T>) => T[];
 
         /**
          * Same as R.invertObj, however this accounts for objects with duplicate values by putting the values into an array.
@@ -797,15 +820,13 @@ declare namespace R {
         invertObj(obj: { [index: string]: string } | { [index: number]: string }): { [index: string]: string };
 
         /**
-         * Turns a named method of an object (or object prototype) into a function that can be
-         * called directly. Passing the optional `len` parameter restricts the returned function to
-         * the initial `len` parameters of the method.
+         * Turns a named method with a specified arity into a function that can be called directly
+         * supplied with arguments and a target object.
          *
-         * The returned function is curried and accepts `len + 1` parameters (or `method.length + 1`
-         * when `len` is not specified), and the final parameter is the target object.
+         * The returned function is curried and accepts `arity + 1` parameters where the final
+         * parameter is the target object.
          */
-        invoker(name: string, obj: any, len?: number): (...a: any[]) => any;
-        invoker(name: string): (obj: any, len?: number) => (...a: any[]) => any;
+        invoker(arity: number, method: string): (...a: any[]) => any;
 
         /**
          * See if an object (`val`) is an instance of the supplied constructor.
@@ -838,8 +859,8 @@ declare namespace R {
          * Returns a string made by inserting the `separator` between each
          * element and concatenating all the elements into a single string.
          */
-        join(x: string, xs: any[]): string;
-        join(x: string): (xs: any[]) => string;
+        join(x: string, xs: ReadonlyArray<any>): string;
+        join(x: string): (xs: ReadonlyArray<any>) => string;
 
         /**
          * Applies a list of functions to a list of values.
@@ -861,19 +882,19 @@ declare namespace R {
         /**
          * Returns the last element from a list.
          */
-        last<T>(list: T[]): T | undefined;
+        last<T>(list: ReadonlyArray<T>): T | undefined;
         last(list: string): string;
 
         /**
          * Returns the position of the last occurrence of an item (by strict equality) in
          * an array, or -1 if the item is not included in the array.
          */
-        lastIndexOf<T>(target: T, list: T[]): number;
+        lastIndexOf<T>(target: T, list: ReadonlyArray<T>): number;
 
         /**
          * Returns the number of elements in the array by returning list.length.
          */
-        length(list: any[]): number;
+        length<T>(list: ReadonlyArray<T>): number;
 
         /**
          * Returns a lens for the given getter and setter functions. The getter
@@ -929,25 +950,25 @@ declare namespace R {
         /**
          * Returns a new list, constructed by applying the supplied function to every element of the supplied list.
          */
-        map<T, U>(fn: (x: T) => U, list: T[]): U[];
+        map<T, U>(fn: (x: T) => U, list: ReadonlyArray<T>): U[];
         map<T, U>(fn: (x: T) => U, obj: Functor<T>): Functor<U>; // used in functors
-        map<T, U>(fn: (x: T) => U): (list: T[]) => U[];
+        map<T, U>(fn: (x: T) => U): (list: ReadonlyArray<T>) => U[];
         map<T extends object, U extends {[P in keyof T]: U[P]}>(fn: (x: T[keyof T]) => U[keyof T], obj: T): U;
         map<T extends object, U extends {[P in keyof T]: U[P]}>(fn: (x: T[keyof T]) => U[keyof T]): (obj: T) => U;
 
         /**
          * The mapAccum function behaves like a combination of map and reduce.
          */
-        mapAccum<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U, list: T[]): [U, TResult[]];
-        mapAccum<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult]): (acc: U, list: T[]) => [U, TResult[]];
-        mapAccum<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U): (list: T[]) => [U, TResult[]];
+        mapAccum<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U, list: ReadonlyArray<T>): [U, TResult[]];
+        mapAccum<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult]): (acc: U, list: ReadonlyArray<T>) => [U, TResult[]];
+        mapAccum<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U): (list: ReadonlyArray<T>) => [U, TResult[]];
 
         /**
          * The mapAccumRight function behaves like a combination of map and reduce.
          */
-        mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U, list: T[]): [U, TResult[]];
-        mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult]): (acc: U, list: T[]) => [U, TResult[]];
-        mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U): (list: T[]) => [U, TResult[]];
+        mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U, list: ReadonlyArray<T>): [U, TResult[]];
+        mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult]): (acc: U, list: ReadonlyArray<T>) => [U, TResult[]];
+        mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U): (list: ReadonlyArray<T>) => [U, TResult[]];
 
         /**
          * Like mapObj, but but passes additional arguments to the predicate function.
@@ -973,8 +994,8 @@ declare namespace R {
         /**
          * Returns the larger of its two arguments.
          */
-        max(a: Ord, b: Ord): Ord;
-        max(a: Ord): (b: Ord) => Ord;
+        max<T extends Ord>(a: T, b: T): T;
+        max<T extends Ord>(a: T): (b: T) => T;
 
         /**
          * Takes a function and two values, and returns whichever value produces
@@ -987,19 +1008,19 @@ declare namespace R {
         /**
          * Returns the mean of the given list of numbers.
          */
-        mean(list: number[]): number;
+        mean(list: ReadonlyArray<number>): number;
 
         /**
          * Returns the median of the given list of numbers.
          */
-        median(list: number[]): number;
+        median(list: ReadonlyArray<number>): number;
 
         /**
          * Creates a new function that, when invoked, caches the result of calling fn for a given argument set and
          * returns the result. Subsequent calls to the memoized fn with the same argument set will not result in an
          * additional call to fn; instead, the cached result for that set of arguments will be returned.
          */
-        memoize(fn: (...a: any[]) => any): (...a: any[]) => any;
+        memoize<T = any>(fn: (...a: any[]) => T): (...a: any[]) => T;
 
         /**
          * Create a new object with the own properties of a
@@ -1012,7 +1033,7 @@ declare namespace R {
         /**
          * Merges a list of objects together into one object.
          */
-        mergeAll<T>(list: any[]): T;
+        mergeAll<T>(list: ReadonlyArray<any>): T;
 
         /**
          * Creates a new object with the own properties of the first object merged with the own properties of the second object.
@@ -1076,8 +1097,8 @@ declare namespace R {
         /**
          * Returns the smaller of its two arguments.
          */
-        min(a: Ord, b: Ord): Ord;
-        min(a: Ord): (b: Ord) => Ord;
+        min<T extends Ord>(a: T, b: T): T;
+        min<T extends Ord>(a: T): (b: T) => T;
 
         /**
          * Takes a function and two values, and returns whichever value produces
@@ -1107,6 +1128,7 @@ declare namespace R {
          * Any extraneous parameters will not be passed to the supplied function.
          */
         nAry(n: number, fn: (...arg: any[]) => any): (...a: any[]) => any;
+        nAry(n: number): (fn: (...arg: any[]) => any) => (...a: any[]) => any;
 
         /**
          * Negates its argument.
@@ -1116,8 +1138,8 @@ declare namespace R {
         /**
          * Returns true if no elements of the list match the predicate, false otherwise.
          */
-        none<T>(fn: (a: T) => boolean, list: T[]): boolean;
-        none<T>(fn: (a: T) => boolean): (list: T[]) => boolean;
+        none<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): boolean;
+        none<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => boolean;
 
         /**
          * A function wrapping a call to the given function in a `!` operation.  It will return `true` when the
@@ -1128,8 +1150,8 @@ declare namespace R {
         /**
          * Returns the nth element in a list.
          */
-        nth<T>(n: number, list: T[]): T;
-        nth(n: number): <T>(list: T[]) => T;
+        nth<T>(n: number, list: ReadonlyArray<T>): T | undefined;
+        nth(n: number): <T>(list: ReadonlyArray<T>) => T | undefined;
 
         /**
          * Returns a function which returns its nth argument.
@@ -1150,8 +1172,8 @@ declare namespace R {
         /**
          * Returns a partial copy of an object omitting the keys specified.
          */
-        omit<T>(names: string[], obj: T): T;
-        omit(names: string[]): <T>(obj: T) => T;
+        omit<T>(names: ReadonlyArray<string>, obj: T): T;
+        omit(names: ReadonlyArray<string>): <T>(obj: T) => T;
 
         /**
          * Accepts a function fn and returns a function that guards invocation of fn such that fn can only ever be
@@ -1159,6 +1181,7 @@ declare namespace R {
          * returned in subsequent invocations.
          */
         once(fn: (...a: any[]) => any): (...a: any[]) => any;
+        once<T>(fn: (...a: any[]) => T): (...a: any[]) => T;
 
         /**
          * A function that returns the first truthy of two arguments otherwise the last argument. Note that this is
@@ -1187,27 +1210,45 @@ declare namespace R {
         pair<F, S>(fst: F, snd: S): [F, S];
 
         /**
-         * Accepts as its arguments a function and any number of values and returns a function that,
-         * when invoked, calls the original function with all of the values prepended to the
-         * original function's arguments list. In some libraries this function is named `applyLeft`.
+         * Takes a function `f` and a list of arguments, and returns a function `g`.
+         * When applied, `g` returns the result of applying `f` to the arguments
+         * provided initially followed by the arguments provided to `g`.
          */
-        partial(fn: (...a: any[]) => any, ...args: any[]): (...a: any[]) => any;
+        partial<V0, V1, T>(fn: (x0: V0, x1: V1) => T, args: [V0]): (x1: V1) => T;
+
+        partial<V0, V1, V2, T>(fn: (x0: V0, x1: V1, x2: V2) => T, args: [V0, V1]): (x2: V2) => T;
+        partial<V0, V1, V2, T>(fn: (x0: V0, x1: V1, x2: V2) => T, args: [V0]): (x1: V1, x2: V2) => T;
+
+        partial<V0, V1, V2, V3, T>(fn: (x0: V0, x1: V1, x2: V2, x3: V3) => T, args: [V0, V1, V2]): (x2: V3) => T;
+        partial<V0, V1, V2, V3, T>(fn: (x0: V0, x1: V1, x2: V2, x3: V3) => T, args: [V0, V1]): (x2: V2, x3: V3) => T;
+        partial<V0, V1, V2, V3, T>(fn: (x0: V0, x1: V1, x2: V2, x3: V3) => T, args: [V0]): (x1: V1, x2: V2, x3: V3) => T;
+
+        partial<T>(fn: (...a: any[]) => T, args: any[]): (...a: any[]) => T;
 
         /**
-         * Accepts as its arguments a function and any number of values and returns a function that,
-         * when invoked, calls the original function with all of the values appended to the original
-         * function's arguments list.
+         * Takes a function `f` and a list of arguments, and returns a function `g`.
+         * When applied, `g` returns the result of applying `f` to the arguments
+         * provided to `g` followed by the arguments provided initially.
          */
-        partialRight(fn: (...a: any[]) => any, ...args: any[]): (...a: any[]) => any;
+        partialRight<V0, V1, T>(fn: (x0: V0, x1: V1) => T, args: [V1]): (x1: V0) => T;
+
+        partialRight<V0, V1, V2, T>(fn: (x0: V0, x1: V1, x2: V2) => T, args: [V1, V2]): (x2: V0) => T;
+        partialRight<V0, V1, V2, T>(fn: (x0: V0, x1: V1, x2: V2) => T, args: [V2]): (x1: V0, x2: V1) => T;
+
+        partialRight<V0, V1, V2, V3, T>(fn: (x0: V0, x1: V1, x2: V2, x3: V3) => T, args: [V1, V2, V3]): (x0: V0) => T;
+        partialRight<V0, V1, V2, V3, T>(fn: (x0: V0, x1: V1, x2: V2, x3: V3) => T, args: [V2, V3]): (x0: V0, x1: V1) => T;
+        partialRight<V0, V1, V2, V3, T>(fn: (x0: V0, x1: V1, x2: V2, x3: V3) => T, args: [V3]): (x0: V0, x1: V1, x2: V2) => T;
+
+        partialRight<T>(fn: (...a: any[]) => T, args: any[]): (...a: any[]) => T;
 
         /**
          * Takes a predicate and a list and returns the pair of lists of elements
          * which do and do not satisfy the predicate, respectively.
          */
-        partition(fn: (a: string) => boolean, list: string[]): string[][];
-        partition<T>(fn: (a: T) => boolean, list: T[]): T[][];
-        partition<T>(fn: (a: T) => boolean): (list: T[]) => T[][];
-        partition(fn: (a: string) => boolean): (list: string[]) => string[][];
+        partition(fn: (a: string) => boolean, list: ReadonlyArray<string>): string[][];
+        partition<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): T[][];
+        partition<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => T[][];
+        partition(fn: (a: string) => boolean): (list: ReadonlyArray<string>) => string[][];
 
         /**
          * Retrieve the value at a given path.
@@ -1242,14 +1283,14 @@ declare namespace R {
          * Returns a partial copy of an object containing only the keys specified.  If the key does not exist, the
          * property is ignored.
          */
-        pick<T, K extends keyof T>(names: Array<K | string>, obj: T): Pick<T, K>;
-        pick(names: string[]): <T, U>(obj: T) => U;
+        pick<T, K extends keyof T>(names: ReadonlyArray<K | string>, obj: T): Pick<T, K>;
+        pick(names: ReadonlyArray<string>): <T, U>(obj: T) => U;
 
         /**
          * Similar to `pick` except that this one includes a `key: undefined` pair for properties that don't exist.
          */
-        pickAll<T, U>(names: string[], obj: T): U;
-        pickAll(names: string[]): <T, U>(obj: T) => U;
+        pickAll<T, U>(names: ReadonlyArray<string>, obj: T): U;
+        pickAll(names: ReadonlyArray<string>): <T, U>(obj: T) => U;
 
         /**
          * Returns a partial copy of an object containing only the keys that satisfy the supplied predicate.
@@ -1413,32 +1454,33 @@ declare namespace R {
         /**
          * Returns a new list by plucking the same named property off all objects in the list supplied.
          */
-        pluck<T>(p: string | number, list: any[]): T[];
-        pluck(p: string | number): <T>(list: any[]) => T[];
+        pluck<P extends string, T>(p: P, list: ReadonlyArray<Record<P, T>>): T[];
+        pluck<T>(p: number, list: ReadonlyArray<{ [k: number]: T }>): T[];
+        pluck<P extends string>(p: P): <T>(list: ReadonlyArray<Record<P, T>>) => T[];
+        pluck(p: number): <T>(list: ReadonlyArray<{ [k: number]: T }>) => T[];
 
         /**
          * Returns a new list with the given element at the front, followed by the contents of the
          * list.
          */
-        prepend<T>(el: T, list: T[]): T[];
-        prepend<T>(el: T): (list: T[]) => T[];
+        prepend<T>(el: T, list: ReadonlyArray<T>): T[];
+        prepend<T>(el: T): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Multiplies together all the elements of a list.
          */
-        product(list: number[]): number;
+        product(list: ReadonlyArray<number>): number;
 
         /**
          * Reasonable analog to SQL `select` statement.
          */
-        project<T, U>(props: string[], objs: T[]): U[];
+        project<T, U>(props: ReadonlyArray<string>, objs: ReadonlyArray<T>): U[];
 
         /**
          * Returns a function that when supplied an object returns the indicated property of that object, if it exists.
-         * Note: TS1.9 # replace any by dictionary
          */
-        prop<T>(p: string, obj: any): T;
-        prop<T>(p: string): (obj: any) => T;
+        prop<P extends keyof T, T>(p: P, obj: T): T[P];
+        prop<P extends string>(p: P): <T>(obj: Record<P, T>) => T;
 
         /**
          * Determines whether the given property of an object has a specific
@@ -1477,8 +1519,8 @@ declare namespace R {
          * The only difference from `prop` is the parameter order.
          * Note: TS1.9 # replace any by dictionary
          */
-        props<T>(ps: string[], obj: any): T[];
-        props(ps: string[]): <T>(obj: any) => T[];
+        props<P extends string, T>(ps: ReadonlyArray<P>, obj: Record<P, T>): T[];
+        props<P extends string>(ps: ReadonlyArray<P>): <T>(obj: Record<P, T>) => T[];
 
         /**
          * Returns true if the specified object property satisfies the given predicate; false otherwise.
@@ -1500,49 +1542,49 @@ declare namespace R {
          * function and passing it an accumulator value and the current value from the array, and
          * then passing the result to the next call.
          */
-        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced, acc: TResult, list: T[]): TResult;
-        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced): (acc: TResult, list: T[]) => TResult;
-        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced, acc: TResult): (list: T[]) => TResult;
+        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced<TResult>, acc: TResult, list: ReadonlyArray<T>): TResult;
+        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced<TResult>): (acc: TResult, list: ReadonlyArray<T>) => TResult;
+        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced<TResult>, acc: TResult): (list: ReadonlyArray<T>) => TResult;
 
         /**
          * Groups the elements of the list according to the result of calling the String-returning function keyFn on each
          * element and reduces the elements of each group to a single value via the reducer function valueFn.
          */
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string, list: T[]): { [index: string]: TResult };
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string): (list: T[]) => { [index: string]: TResult };
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult): CurriedFunction2<(elem: T) => string, T[], { [index: string]: TResult }>;
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult): CurriedFunction3<TResult, (elem: T) => string, T[], { [index: string]: TResult }>;
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string, list: ReadonlyArray<T>): { [index: string]: TResult };
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string): (list: ReadonlyArray<T>) => { [index: string]: TResult };
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult): CurriedFunction2<(elem: T) => string, ReadonlyArray<T>, { [index: string]: TResult }>;
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult): CurriedFunction3<TResult, (elem: T) => string, ReadonlyArray<T>, { [index: string]: TResult }>;
 
         /**
          * Returns a value wrapped to indicate that it is the final value of the reduce and
          * transduce functions. The returned value should be considered a black box: the internal
          * structure is not guaranteed to be stable.
          */
-        reduced<T>(elem: T): Reduced;
+        reduced<T>(elem: T): Reduced<T>;
 
         /**
          * Returns a single item by iterating through the list, successively calling the iterator
          * function and passing it an accumulator value and the current value from the array, and
          * then passing the result to the next call.
          */
-        reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult, acc: TResult, list: T[]): TResult;
-        reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult): (acc: TResult, list: T[]) => TResult;
-        reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult, acc: TResult): (list: T[]) => TResult;
+        reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult, acc: TResult, list: ReadonlyArray<T>): TResult;
+        reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult): (acc: TResult, list: ReadonlyArray<T>) => TResult;
+        reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult, acc: TResult): (list: ReadonlyArray<T>) => TResult;
 
         /**
          * Similar to `filter`, except that it keeps only values for which the given predicate
          * function returns falsy.
          */
         reject<T>(fn: (value: T) => boolean): Filter<T>;
-        reject<T>(fn: (value: T) => boolean, list: T[]): T[];
+        reject<T>(fn: (value: T) => boolean, list: ReadonlyArray<T>): T[];
         reject<T>(fn: (value: T) => boolean, obj: Dictionary<T>): Dictionary<T>;
 
         /**
          * Removes the sub-list of `list` starting at index `start` and containing `count` elements.
          */
-        remove<T>(start: number, count: number, list: T[]): T[];
-        remove<T>(start: number): (count: number, list: T[]) => T[];
-        remove<T>(start: number, count: number): (list: T[]) => T[];
+        remove<T>(start: number, count: number, list: ReadonlyArray<T>): T[];
+        remove<T>(start: number): (count: number, list: ReadonlyArray<T>) => T[];
+        remove<T>(start: number, count: number): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Returns a fixed list of size n containing a specified identical value.
@@ -1560,14 +1602,14 @@ declare namespace R {
         /**
          * Returns a new list with the same elements as the original list, just in the reverse order.
          */
-        reverse<T>(list: T[]): T[];
+        reverse<T>(list: ReadonlyArray<T>): T[];
 
         /**
          * Scan is similar to reduce, but returns a list of successively reduced values from the left.
          */
-        scan<T, TResult>(fn: (acc: TResult, elem: T) => any, acc: TResult, list: T[]): TResult[];
-        scan<T, TResult>(fn: (acc: TResult, elem: T) => any, acc: TResult): (list: T[]) => TResult[];
-        scan<T, TResult>(fn: (acc: TResult, elem: T) => any): (acc: TResult, list: T[]) => TResult[];
+        scan<T, TResult>(fn: (acc: TResult, elem: T) => any, acc: TResult, list: ReadonlyArray<T>): TResult[];
+        scan<T, TResult>(fn: (acc: TResult, elem: T) => any, acc: TResult): (list: ReadonlyArray<T>) => TResult[];
+        scan<T, TResult>(fn: (acc: TResult, elem: T) => any): (acc: TResult, list: ReadonlyArray<T>) => TResult[];
 
         /**
          * Returns the result of "setting" the portion of the given data structure focused by the given lens to the
@@ -1581,29 +1623,35 @@ declare namespace R {
          * Returns the elements from `xs` starting at `a` and ending at `b - 1`.
          */
         slice(a: number, b: number, list: string): string;
-        slice<T>(a: number, b: number, list: T[]): T[];
-        slice(a: number, b: number): <T>(list: string | T[]) => string | T[];
-        slice(a: number): <T>(b: number, list: string | T[]) => string | T[];
+        slice<T>(a: number, b: number, list: ReadonlyArray<T>): T[];
+        slice(a: number, b: number): {
+            (list: string): string;
+            <T>(list: ReadonlyArray<T>): T[];
+        };
+        slice(a: number): {
+            (b: number, list: string): string;
+            <T>(b: number, list: ReadonlyArray<T>): T[];
+        };
 
         /**
          * Returns a copy of the list, sorted according to the comparator function, which should accept two values at a
          * time and return a negative number if the first value is smaller, a positive number if it's larger, and zero
          * if they are equal.
          */
-        sort<T>(fn: (a: T, b: T) => number, list: T[]): T[];
-        sort<T>(fn: (a: T, b: T) => number): (list: T[]) => T[];
+        sort<T>(fn: (a: T, b: T) => number, list: ReadonlyArray<T>): T[];
+        sort<T>(fn: (a: T, b: T) => number): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Sorts the list according to a key generated by the supplied function.
          */
-        sortBy<T>(fn: (a: T) => Ord, list: T[]): T[];
-        sortBy(fn: (a: any) => Ord): <T>(list: T[]) => T[];
+        sortBy<T>(fn: (a: T) => Ord, list: ReadonlyArray<T>): T[];
+        sortBy(fn: (a: any) => Ord): <T>(list: ReadonlyArray<T>) => T[];
 
         /**
          * Sorts a list according to a list of comparators.
          */
-        sortWith<T>(fns: Array<((a: T, b: T) => number)>, list: T[]): T[];
-        sortWith<T>(fns: Array<((a: T, b: T) => number)>): (list: T[]) => T[];
+        sortWith<T>(fns: ReadonlyArray<((a: T, b: T) => number)>, list: ReadonlyArray<T>): T[];
+        sortWith<T>(fns: ReadonlyArray<((a: T, b: T) => number)>): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Splits a string into an array of strings based on the given
@@ -1615,16 +1663,22 @@ declare namespace R {
         /**
          * Splits a given list or string at a given index.
          */
-        splitAt<T>(index: number, list: T): T[];
-        splitAt(index: number): <T>(list: T) => T[];
-        splitAt<T>(index: number, list: T[]): T[][];
-        splitAt(index: number): <T>(list: T[]) => T[][];
+        splitAt<T>(index: number, list: ReadonlyArray<T>): [T[], T[]];
+        splitAt(index: number, list: string): [string, string];
+        splitAt(index: number): {
+            <T>(list: ReadonlyArray<T>): [T[], T[]];
+            (list: string): [string, string];
+        };
 
         /**
          * Splits a collection into slices of the specified length.
          */
-        splitEvery<T>(a: number, list: T[]): T[][];
-        splitEvery(a: number): <T>(list: T[]) => T[][];
+        splitEvery<T>(a: number, list: ReadonlyArray<T>): T[][];
+        splitEvery(a: number, list: string): string[];
+        splitEvery(a: number): {
+            (list: string): string[];
+            <T>(list: ReadonlyArray<T>): T[][];
+        };
 
         /**
          * Takes a list and a predicate and returns a pair of lists with the following properties:
@@ -1632,14 +1686,16 @@ declare namespace R {
          * - none of the elements of the first output list satisfies the predicate; and
          * - if the second output list is non-empty, its first element satisfies the predicate.
          */
-        splitWhen<T, U>(pred: (val: T) => boolean, list: U[]): U[][];
-        splitWhen<T>(pred: (val: T) => boolean): <U>(list: U[]) => U[][];
+        splitWhen<T, U>(pred: (val: T) => boolean, list: ReadonlyArray<U>): U[][];
+        splitWhen<T>(pred: (val: T) => boolean): <U>(list: ReadonlyArray<U>) => U[][];
 
         /**
          * Checks if a list starts with the provided values
          */
-        startsWith(a: any, list: any): boolean;
-        startsWith(a: any): (list: any) => boolean;
+        startsWith(a: string, list: string): boolean;
+        startsWith(a: string): (list: string) => boolean;
+        startsWith<T>(a: T | ReadonlyArray<T>, list: ReadonlyArray<T>): boolean;
+        startsWith<T>(a: T | ReadonlyArray<T>): (list: ReadonlyArray<T>) => boolean;
 
         /**
          * Subtracts two numbers. Equivalent to `a - b` but curried.
@@ -1650,20 +1706,20 @@ declare namespace R {
         /**
          * Adds together all the elements of a list.
          */
-        sum(list: number[]): number;
+        sum(list: ReadonlyArray<number>): number;
 
         /**
          * Finds the set (i.e. no duplicates) of all elements contained in the first or second list, but not both.
          */
-        symmetricDifference<T>(list1: T[], list2: T[]): T[];
-        symmetricDifference<T>(list: T[]): <T>(list: T[]) => T[];
+        symmetricDifference<T>(list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        symmetricDifference<T>(list: ReadonlyArray<T>): <T>(list: ReadonlyArray<T>) => T[];
 
         /**
          * Finds the set (i.e. no duplicates) of all elements contained in the first or second list, but not both.
          * Duplication is determined according to the value returned by applying the supplied predicate to two list elements.
          */
-        symmetricDifferenceWith<T>(pred: (a: T, b: T) => boolean, list1: T[], list2: T[]): T[];
-        symmetricDifferenceWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<T[], T[], T[]>;
+        symmetricDifferenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        symmetricDifferenceWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<ReadonlyArray<T>, ReadonlyArray<T>, T[]>;
 
         /**
          * A function that always returns true. Any passed in parameters are ignored.
@@ -1673,28 +1729,28 @@ declare namespace R {
         /**
          * Returns all but the first element of a list or string.
          */
-        tail<T>(list: T[]): T[];
+        tail<T>(list: ReadonlyArray<T>): T[];
         tail(list: string): string;
 
         /**
          * Returns a new list containing the first `n` elements of the given list.  If
          * `n > * list.length`, returns a list of `list.length` elements.
          */
-        take<T>(n: number, xs: T[]): T[];
+        take<T>(n: number, xs: ReadonlyArray<T>): T[];
         take(n: number, xs: string): string;
         take<T>(n: number): {
             (xs: string): string;
-            (xs: T[]): T[];
+            (xs: ReadonlyArray<T>): T[];
         };
 
         /**
          * Returns a new list containing the last n elements of the given list. If n > list.length,
          * returns a list of list.length elements.
          */
-        takeLast<T>(n: number, xs: T[]): T[];
+        takeLast<T>(n: number, xs: ReadonlyArray<T>): T[];
         takeLast(n: number, xs: string): string;
         takeLast(n: number): {
-            <T>(xs: T[]): T[];
+            <T>(xs: ReadonlyArray<T>): T[];
             (xs: string): string;
         };
 
@@ -1704,16 +1760,16 @@ declare namespace R {
          * false. Excludes the element that caused the predicate function to fail. The predicate
          * function is passed one argument: (value).
          */
-        takeLastWhile<T>(pred: (a: T) => boolean, list: T[]): T[];
-        takeLastWhile<T>(pred: (a: T) => boolean): <T>(list: T[]) => T[];
+        takeLastWhile<T>(pred: (a: T) => boolean, list: ReadonlyArray<T>): T[];
+        takeLastWhile<T>(pred: (a: T) => boolean): <T>(list: ReadonlyArray<T>) => T[];
 
         /**
          * Returns a new list containing the first `n` elements of a given list, passing each value
          * to the supplied predicate function, and terminating when the predicate function returns
          * `false`.
          */
-        takeWhile<T>(fn: (x: T) => boolean, list: T[]): T[];
-        takeWhile<T>(fn: (x: T) => boolean): (list: T[]) => T[];
+        takeWhile<T>(fn: (x: T) => boolean, list: ReadonlyArray<T>): T[];
+        takeWhile<T>(fn: (x: T) => boolean): (list: ReadonlyArray<T>) => T[];
 
         /**
          * The function to call with x. The return value of fn will be thrown away.
@@ -1777,24 +1833,24 @@ declare namespace R {
          * list, successively calling the transformed iterator function and passing it an accumulator value and the
          * current value from the array, and then passing the result to the next call.
          */
-        transduce<T, U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[], acc: T[], list: T[]): U;
-        transduce<T, U>(xf: (arg: T[]) => T[]): (fn: (acc: U[], val: U) => U[], acc: T[], list: T[]) => U;
-        transduce<T, U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[]): (acc: T[], list: T[]) => U;
-        transduce<T, U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[], acc: T[]): (list: T[]) => U;
+        transduce<T, U>(xf: (arg: T[]) => ReadonlyArray<T>, fn: (acc: U[], val: U) => ReadonlyArray<U>, acc: ReadonlyArray<T>, list: ReadonlyArray<T>): U;
+        transduce<T, U>(xf: (arg: T[]) => ReadonlyArray<T>): (fn: (acc: U[], val: U) => ReadonlyArray<U>, acc: ReadonlyArray<T>, list: ReadonlyArray<T>) => U;
+        transduce<T, U>(xf: (arg: T[]) => ReadonlyArray<T>, fn: (acc: U[], val: U) => ReadonlyArray<U>): (acc: ReadonlyArray<T>, list: ReadonlyArray<T>) => U;
+        transduce<T, U>(xf: (arg: T[]) => ReadonlyArray<T>, fn: (acc: U[], val: U) => ReadonlyArray<U>, acc: ReadonlyArray<T>): (list: ReadonlyArray<T>) => U;
 
         /**
          * Transposes the rows and columns of a 2D list. When passed a list of n lists of length x, returns a list of x lists of length n.
          */
-        transpose<T>(list: T[][]): T[][];
+        transpose<T>(list: ReadonlyArray<T[]>): T[][];
 
         /**
          * Maps an Applicative-returning function over a Traversable, then uses
          * sequence to transform the resulting Traversable of Applicative into
          * an Applicative of Traversable.
          */
-        traverse<T, U, A>(of: (a: U[]) => A, fn: (t: T) => U, list: T[]): A;
-        traverse<T, U, A>(of: (a: U[]) => A, fn: (t: T) => U): (list: T[]) => A;
-        traverse<T, U, A>(of: (a: U[]) => A): (fn: (t: T) => U, list: T[]) => A;
+        traverse<T, U, A>(of: (a: U[]) => A, fn: (t: T) => U, list: ReadonlyArray<T>): A;
+        traverse<T, U, A>(of: (a: U[]) => A, fn: (t: T) => U): (list: ReadonlyArray<T>) => A;
+        traverse<T, U, A>(of: (a: U[]) => A): (fn: (t: T) => U, list: ReadonlyArray<T>) => A;
 
         /**
          * Removes (strips) whitespace from both ends of the string.
@@ -1849,20 +1905,20 @@ declare namespace R {
          * Combines two lists into a set (i.e. no duplicates) composed of the
          * elements of each list.
          */
-        union<T>(as: T[], bs: T[]): T[];
-        union<T>(as: T[]): (bs: T[]) => T[];
+        union<T>(as: ReadonlyArray<T>, bs: ReadonlyArray<T>): T[];
+        union<T>(as: ReadonlyArray<T>): (bs: ReadonlyArray<T>) => T[];
 
         /**
          * Combines two lists into a set (i.e. no duplicates) composed of the elements of each list.  Duplication is
          * determined according to the value returned by applying the supplied predicate to two list elements.
          */
-        unionWith<T>(pred: (a: T, b: T) => boolean, list1: T[], list2: T[]): T[];
-        unionWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<T[], T[], T[]>;
+        unionWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        unionWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<ReadonlyArray<T>, ReadonlyArray<T>, T[]>;
 
         /**
          * Returns a new list containing only one copy of each element in the original list.
          */
-        uniq<T>(list: T[]): T[];
+        uniq<T>(list: ReadonlyArray<T>): T[];
 
         /**
          * Returns a new list containing only one copy of each element in the original list,
@@ -1870,15 +1926,15 @@ declare namespace R {
          * Prefers the first item if the supplied function produces the same value on two items.
          * R.equals is used for comparison.
          */
-        uniqBy<T, U>(fn: (a: T) => U, list: T[]): T[];
-        uniqBy<T, U>(fn: (a: T) => U): (list: T[]) => T[];
+        uniqBy<T, U>(fn: (a: T) => U, list: ReadonlyArray<T>): T[];
+        uniqBy<T, U>(fn: (a: T) => U): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Returns a new list containing only one copy of each element in the original list, based upon the value
          * returned by applying the supplied predicate to two list elements.
          */
-        uniqWith<T, U>(pred: (x: T, y: T) => boolean, list: T[]): T[];
-        uniqWith<T, U>(pred: (x: T, y: T) => boolean): (list: T[]) => T[];
+        uniqWith<T, U>(pred: (x: T, y: T) => boolean, list: ReadonlyArray<T>): T[];
+        uniqWith<T, U>(pred: (x: T, y: T) => boolean): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Tests the final argument by passing it to the given predicate function. If the predicate is not satisfied,
@@ -1892,7 +1948,7 @@ declare namespace R {
          * Returns a new list by pulling every item at the first level of nesting out, and putting
          * them in a new array.
          */
-        unnest<T>(x: T[][] | T[]): T[];
+        unnest<T>(x: ReadonlyArray<T[]> | ReadonlyArray<ReadonlyArray<T>> | ReadonlyArray<T>): T[];
 
         /**
          * Takes a predicate, a transformation function, and an initial value, and returns a value of the same type as
@@ -1905,8 +1961,8 @@ declare namespace R {
         /**
          * Returns a new copy of the array with the element at the provided index replaced with the given value.
          */
-        update<T>(index: number, value: T, list: T[]): T[];
-        update<T>(index: number, value: T): (list: T[]) => T[];
+        update<T>(index: number, value: T, list: ReadonlyArray<T>): T[];
+        update<T>(index: number, value: T): (list: ReadonlyArray<T>) => T[];
 
         /**
          * Accepts a function fn and a list of transformer functions and returns a new curried function.
@@ -1977,8 +2033,8 @@ declare namespace R {
          * Returns a new list without values in the first argument. R.equals is used to determine equality.
          * Acts as a transducer if a transformer is given in list position.
          */
-        without<T>(list1: T[], list2: T[]): T[];
-        without<T>(list1: T[]): (list2: T[]) => T[];
+        without<T>(list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        without<T>(list1: ReadonlyArray<T>): (list2: ReadonlyArray<T>) => T[];
 
         /**
          * Wrap a function inside another to allow you to make adjustments to the parameters, or do other processing
@@ -1989,30 +2045,30 @@ declare namespace R {
         /**
          * Creates a new list out of the two supplied by creating each possible pair from the lists.
          */
-        xprod<K, V>(as: K[], bs: V[]): Array<KeyValuePair<K, V>>;
-        xprod<K>(as: K[]): <V>(bs: V[]) => Array<KeyValuePair<K, V>>;
+        xprod<K, V>(as: ReadonlyArray<K>, bs: ReadonlyArray<V>): Array<KeyValuePair<K, V>>;
+        xprod<K>(as: ReadonlyArray<K>): <V>(bs: ReadonlyArray<V>) => Array<KeyValuePair<K, V>>;
 
         /**
          * Creates a new list out of the two supplied by pairing up equally-positioned items from
          * both lists. Note: `zip` is equivalent to `zipWith(function(a, b) { return [a, b] })`.
          */
-        zip<K, V>(list1: K[], list2: V[]): Array<KeyValuePair<K, V>>;
-        zip<K>(list1: K[]): <V>(list2: V[]) => Array<KeyValuePair<K, V>>;
+        zip<K, V>(list1: ReadonlyArray<K>, list2: ReadonlyArray<V>): Array<KeyValuePair<K, V>>;
+        zip<K>(list1: ReadonlyArray<K>): <V>(list2: ReadonlyArray<V>) => Array<KeyValuePair<K, V>>;
 
         /**
          * Creates a new object out of a list of keys and a list of values.
          */
         // TODO: Dictionary<T> as a return value is to specific, any seems to loose
-        zipObj<T>(keys: string[], values: T[]): { [index: string]: T };
-        zipObj(keys: string[]): <T>(values: T[]) => { [index: string]: T };
+        zipObj<T>(keys: ReadonlyArray<string>, values: ReadonlyArray<T>): { [index: string]: T };
+        zipObj(keys: ReadonlyArray<string>): <T>(values: ReadonlyArray<T>) => { [index: string]: T };
 
         /**
          * Creates a new list out of the two supplied by applying the function to each
          * equally-positioned pair in the lists.
          */
-        zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult, list1: T[], list2: U[]): TResult[];
-        zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult, list1: T[]): (list2: U[]) => TResult[];
-        zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult): (list1: T[], list2: U[]) => TResult[];
+        zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult, list1: ReadonlyArray<T>, list2: ReadonlyArray<U>): TResult[];
+        zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult, list1: ReadonlyArray<T>): (list2: ReadonlyArray<U>) => TResult[];
+        zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult): (list1: ReadonlyArray<T>, list2: ReadonlyArray<U>) => TResult[];
     }
 }
 
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 973edf29e3..a90263c0f8 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -77,6 +77,7 @@ class F2 {
     const y2: number   = R.curry(addFourNumbers)(1, 2)(3, 4);
     const y3: number   = R.curry(addFourNumbers)(1, 2, 3)(4);
 
+    R.nAry(0);
     R.nAry(0, takesNoArg);
     R.nAry(0, takesOneArg);
     R.nAry(1, takesTwoArgs);
@@ -201,8 +202,8 @@ class F2 {
 };
 
 () => {
-    R.invoker("charAt", String.prototype);
-    R.invoker("charAt", String.prototype, 1);
+    R.invoker(1, "slice")(6, "abcdefghijklm");
+    R.invoker(2, "slice")(6)(8, "abcdefghijklm");
 };
 
 (() => {
@@ -261,22 +262,22 @@ R.times(i, 5);
 })();
 
 (() => {
-    function multiply(a: number, b: number) {
+    function multiply(a: number, b: number): number {
         return a * b;
     }
 
-    const double = R.partial(multiply, 2);
+    const double = R.partial<number>(multiply, [2]);
     double(2); // => 4
 
     function greet(salutation: string, title: string, firstName: string, lastName: string) {
         return `${salutation}, ${title} ${firstName} ${lastName}!`;
     }
 
-    const sayHello     = R.partial(greet, "Hello");
-    const sayHelloToMs = R.partial(sayHello, "Ms.");
+    const sayHello     = R.partial(greet, ["Hello"]);
+    const sayHelloToMs = R.partial(sayHello, ["Ms."]);
     sayHelloToMs("Jane", "Jones"); // => 'Hello, Ms. Jane Jones!'
 
-    const greetMsJaneJones = R.partialRight(greet, "Ms.", "Jane", "Jones");
+    const greetMsJaneJones = R.partialRight(greet, ["Ms.", "Jane", "Jones"]);
     greetMsJaneJones("Hello"); // => 'Hello, Ms. Jane Jones!'
 })();
 
@@ -300,12 +301,20 @@ R.times(i, 5);
     // Note that argument order matters
     memoTrackedAdd(2, 1); // => 3
     numberOfCalls; // => 3
+
+    function stringLength(str: string): number {
+      return str.length;
+    }
+    const memoStringLength = R.memoize<number>(stringLength);
+    const isLong = memoStringLength('short') > 10; // false
 })();
 
 (() => {
     const addOneOnce = R.once((x: number) => x + 1);
     addOneOnce(10); // => 11
     addOneOnce(addOneOnce(50)); // => 11
+
+    const str = R.once<string>(() => 'test')();
 })();
 
 (() => {
@@ -442,10 +451,6 @@ R.times(i, 5);
     R.append("tests", ["write", "more"]); // => ['write', 'more', 'tests']
     R.append("tests")(["write", "more"]); // => ['write', 'more', 'tests']
     R.append("tests", []); // => ['tests']
-    R.append<string, string[]>(["tests"], ["write", "more"]); // => ['write', 'more', ['tests']]
-    R.append(["tests"], ["write", "more"]); // => ['write', 'more', ['tests']]
-    R.append<string[]>(["tests"])(["write", "more"]); // => ['write', 'more', ['tests']]
-    R.append(["tests"])(["write", "more"]); // => ['write', 'more', ['tests']]
 };
 
 () => {
@@ -653,6 +658,8 @@ interface Obj {
 };
 
 () => {
+    R.groupWith(R.equals)([0, 1, 1, 2, 3, 5, 8, 13, 21]);
+
     R.groupWith(R.equals, [0, 1, 1, 2, 3, 5, 8, 13, 21]);
     // [[0], [1, 1], [2, 3, 5, 8, 13, 21]]
 
@@ -673,10 +680,19 @@ interface Obj {
 };
 
 (() => {
-    const list = [{id: "xyz", title: "A"}, {id: "abc", title: "B"}];
-    const a1 = R.indexBy(R.prop<string>("id"), list);
-    const a2 = R.indexBy(R.prop<string>("id"))(list);
+    interface Book {
+        id: string;
+        title: string;
+    }
+    const list: Book[] = [{id: "xyz", title: "A"}, {id: "abc", title: "B"}];
+    const a1 = R.indexBy(R.prop("id"), list);
+    const a2 = R.indexBy(R.prop("id"))(list);
     const a3 = R.indexBy<{ id: string }>(R.prop<string>("id"))(list);
+
+    const titlesIndexedByTitles: { [k: string]: string } = R.pipe(
+        R.map((x: Book) => x.title),
+        R.indexBy(x => x),
+    )(list);
 });
 
 () => {
@@ -1209,7 +1225,7 @@ type Pair = KeyValuePair<string, number>;
     const o2                                        = {a: 10, b: 20, c: 3, d: 40};
     const a1                                      = R.eqProps("a", o1, o2); // => false
     const a2                                      = R.eqProps("c", o1, o2); // => true
-    const a3: <T, U>(obj1: T, obj2: U) => boolean = R.eqProps("c");
+    const a3: <T extends { c: any }, U extends { c: any }>(obj1: T, obj2: U) => boolean = R.eqProps("c");
     const a4: <U>(obj2: U) => boolean             = R.eqProps("c", o1);
 };
 
@@ -1530,7 +1546,16 @@ class Rectangle {
 
 () => {
     const x: number = R.prop("x", {x: 100}); // => 100
-    const a       = R.prop("x", {}); // => undefined
+    const obj = {
+        str: 'string',
+        num: 5,
+    };
+
+    const strVal: string = R.prop('str', obj); // => 'string'
+    const numVal: number = R.prop('num', obj); // => 5
+
+    const strValCur: string = R.prop('str')(obj); // => 'string'
+    const numValCur: number = R.prop('num')(obj); // => 5
 };
 
 () => {
@@ -1541,7 +1566,6 @@ class Rectangle {
     const favorite            = R.prop("favoriteLibrary");
     const favoriteWithDefault = R.propOr("Ramda", "favoriteLibrary");
 
-    const s1 = favorite(alice);  // => undefined
     const s2 = favoriteWithDefault(alice);  // => 'Ramda'
 };
 
@@ -1553,7 +1577,6 @@ class Rectangle {
 
 () => {
     R.props(["x", "y"], {x: 1, y: 2}); // => [1, 2]
-    R.props(["c", "a", "b"], {b: 2, a: 1}); // => [undefined, 1, 2]
 
     const fullName = R.compose(R.join(" "), R.props(["first", "last"]));
     fullName({last: "Bullet-Tooth", age: 33, first: "Tony"}); // => 'Tony Bullet-Tooth'
@@ -1854,7 +1877,7 @@ class Rectangle {
 };
 
 () => {
-    const sortByNameCaseInsensitive = R.sortBy(R.compose<string, string, string>(R.toLower, R.prop("name")));
+    const sortByNameCaseInsensitive = R.sortBy(R.compose<Record<'name', string>, string, string>(R.toLower, R.prop("name")));
     const alice                     = {
         name: "ALICE",
         age : 101
@@ -1876,6 +1899,14 @@ class Rectangle {
     const b: number[][] = R.splitAt(1)([1, 2, 3]);        // => [[1], [2, 3]]
     const c: string[]   = R.splitAt(5, "hello world");      // => ['hello', ' world']
     const d: string[]   = R.splitAt(-1, "foobar");          // => ['fooba', 'r']
+    const e: string[]   = R.splitAt(-1)("foobar");          // => ['fooba', 'r']
+};
+
+() => {
+    const a: number[][] = R.splitEvery(3, [1, 2, 3, 4, 5, 6, 7]); // => [[1, 2, 3], [4, 5, 6], [7]]
+    const b: number[][] = R.splitEvery(3)([1, 2, 3, 4, 5, 6, 7]); // => [[1, 2, 3], [4, 5, 6], [7]]
+    const c: string[]   = R.splitEvery(3, 'foobarbaz'); // => ['foo', 'bar', 'baz']
+    const d: string[]   = R.splitEvery(3)('foobarbaz'); // => ['foo', 'bar', 'baz']
 };
 
 () => {
@@ -1883,6 +1914,15 @@ class Rectangle {
     const b: number[][] = R.splitWhen(R.equals(2))([1, 2, 3, 1, 2, 3]);   // => [[1], [2, 3, 1, 2, 3]]
 };
 
+() => {
+    R.startsWith("a", "abc");   // => true
+    R.startsWith("a")("abc");   // => true
+    R.startsWith(1, [1, 2, 3]);   // => true
+    R.startsWith(1)([1, 2, 3]);   // => true
+    R.startsWith([1], [1, 2, 3]);   // => true
+    R.startsWith([1])([1, 2, 3]);   // => true
+};
+
 () => {
     R.add(2, 3);       // =>  5
     R.add(7)(10);      // => 17
@@ -1972,8 +2012,8 @@ class Rectangle {
 };
 
 () => {
-    const x: R.Ord = R.max(7, 3); // => 7
-    const y: R.Ord = R.max("a", "z"); // => 'z'
+    const x: number = R.max(7, 3); // => 7
+    const y: string = R.max("a", "z"); // => 'z'
 };
 
 () => {
@@ -2003,8 +2043,8 @@ class Rectangle {
 };
 
 () => {
-    const x: R.Ord = R.min(9, 3); // => 3
-    const y: R.Ord = R.min("a", "z"); // => 'a'
+    const x: number = R.min(9, 3); // => 3
+    const y: string = R.min("a", "z"); // => 'a'
 };
 
 () => {
@@ -2161,6 +2201,8 @@ class Rectangle {
     f(11); // => true
     f(8); // => true
     f(9); // => false
+
+    const f2 = R.anyPass<number>([gt10, even]);
 };
 
 () => {
@@ -2231,6 +2273,15 @@ class Rectangle {
     R.isEmpty({a: 1}); // => false
 };
 
+() => {
+    R.endsWith("c", "abc");   // => true
+    R.endsWith("c")("abc");   // => true
+    R.endsWith(3, [1, 2, 3]);   // => true
+    R.endsWith(3)([1, 2, 3]);   // => true
+    R.endsWith([3], [1, 2, 3]);   // => true
+    R.endsWith([3])([1, 2, 3]);   // => true
+};
+
 () => {
     R.not(true); // => false
     R.not(false); // => true
diff --git a/types/random-seed/index.d.ts b/types/random-seed/index.d.ts
index d90016b83d..6ac278b467 100644
--- a/types/random-seed/index.d.ts
+++ b/types/random-seed/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export interface RandomSeed {
+    (range: number): number;
     range(range: number): number;
     random(): number;
     floatBetween(min: number, max: number): number;
diff --git a/types/random-seed/random-seed-tests.ts b/types/random-seed/random-seed-tests.ts
index 9975608d8b..4c6f07dc28 100644
--- a/types/random-seed/random-seed-tests.ts
+++ b/types/random-seed/random-seed-tests.ts
@@ -9,9 +9,18 @@ const seed = 'My Secret String Value';
 const rand2 = create(seed);
 
 // API
+rand1(50);
 rand1.addEntropy();
 rand1.random();
 rand1.range(100);
 rand1.intBetween(0, 10);
 rand1.floatBetween(0, 1);
 rand1.seed("new seed");
+
+rand2(50);
+rand2.addEntropy();
+rand2.random();
+rand2.range(100);
+rand2.intBetween(0, 10);
+rand2.floatBetween(0, 1);
+rand2.seed("new seed");
diff --git a/types/random-string/tslint.json b/types/random-string/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/random-string/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/randomcolor/tslint.json b/types/randomcolor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/randomcolor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/randomstring/tslint.json b/types/randomstring/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/randomstring/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rangy/index.d.ts b/types/rangy/index.d.ts
index f140895cf6..e28a4d7b1c 100644
--- a/types/rangy/index.d.ts
+++ b/types/rangy/index.d.ts
@@ -60,7 +60,7 @@ interface RangyStatic {
     createRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
     createRangyRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
     getNativeSelection(win?:Window):Selection;
-    getSelection():RangySelection;
+    getSelection(doc?:Document|Window|HTMLIFrameElement):RangySelection;
     addInitListener(listener:(rangy:RangyStatic) => void):any;
     shim():any;
     createMissingNativeApi():any;
diff --git a/types/rangy/tslint.json b/types/rangy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rangy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rangyinputs/tslint.json b/types/rangyinputs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rangyinputs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/raphael/tslint.json b/types/raphael/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/raphael/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rappid/index.d.ts b/types/rappid/index.d.ts
index 321dbed671..a43871bdcb 100644
--- a/types/rappid/index.d.ts
+++ b/types/rappid/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="jointjs" />
-
 import * as joint from 'jointjs';
 import * as Backbone from "backbone";
 
diff --git a/types/rappid/package.json b/types/rappid/package.json
new file mode 100644
index 0000000000..4370406c35
--- /dev/null
+++ b/types/rappid/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "jointjs": "^2.0.1"
+    }
+}
diff --git a/types/rappid/tslint.json b/types/rappid/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/rappid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/raspi-board/index.d.ts b/types/raspi-board/index.d.ts
new file mode 100644
index 0000000000..a244577c2b
--- /dev/null
+++ b/types/raspi-board/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for raspi-board 5.0
+// Project: https://github.com/nebrius/raspi-board
+// Definitions by: Bryan Hughes <https://github.com/nebrius>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export const VERSION_1_MODEL_A = "rpi1_a";
+export const VERSION_1_MODEL_B_REV_1 = "rpi1_b1";
+export const VERSION_1_MODEL_B_REV_2 = "rpi1_b2";
+export const VERSION_1_MODEL_B_PLUS = "rpi1_bplus";
+export const VERSION_1_MODEL_A_PLUS = "rpi1_aplus";
+export const VERSION_1_MODEL_ZERO = "rpi1_zero";
+export const VERSION_1_MODEL_ZERO_W = "rpi1_zerow";
+export const VERSION_2_MODEL_B = "rpi2_b";
+export const VERSION_3_MODEL_B = "rpi3_b";
+export const VERSION_UNKNOWN = "unknown";
+export interface PinInfo {
+    pins: string[];
+    peripherals: string[];
+    gpio: number;
+}
+export function getBoardRevision(): string;
+export function getPins(): {
+    [wiringpi: number]: PinInfo;
+};
+export function getPinNumber(alias: string | number): number | null;
+export function getGpioNumber(alias: string | number): number | null;
diff --git a/types/raspi-board/raspi-board-tests.ts b/types/raspi-board/raspi-board-tests.ts
new file mode 100644
index 0000000000..23195168cf
--- /dev/null
+++ b/types/raspi-board/raspi-board-tests.ts
@@ -0,0 +1,6 @@
+import { getBoardRevision, getPins, getPinNumber, getGpioNumber } from 'raspi-board';
+
+getBoardRevision();
+getPins();
+getPinNumber('GPIO18');
+getGpioNumber('GPIO18');
diff --git a/types/raspi-board/tsconfig.json b/types/raspi-board/tsconfig.json
new file mode 100644
index 0000000000..a55a514726
--- /dev/null
+++ b/types/raspi-board/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "raspi-board-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/raspi-board/tslint.json b/types/raspi-board/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/raspi-board/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/raspi-peripheral/index.d.ts b/types/raspi-peripheral/index.d.ts
new file mode 100644
index 0000000000..d52ed3ec6c
--- /dev/null
+++ b/types/raspi-peripheral/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for raspi-peripheral 2.0
+// Project: https://github.com/nebrius/raspi-peripheral
+// Definitions by: Bryan Hughes <https://github.com/nebrius>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+export class Peripheral extends EventEmitter {
+    private _alive;
+    readonly alive: boolean;
+    private _pins;
+    readonly pins: number[];
+    constructor(pins: string | number | Array<string | number>);
+    destroy(): void;
+    validateAlive(): void;
+}
diff --git a/types/raspi-peripheral/raspi-peripheral-tests.ts b/types/raspi-peripheral/raspi-peripheral-tests.ts
new file mode 100644
index 0000000000..dc16f863a2
--- /dev/null
+++ b/types/raspi-peripheral/raspi-peripheral-tests.ts
@@ -0,0 +1,5 @@
+import { Peripheral } from 'raspi-peripheral';
+
+const myPeripheral = new Peripheral('GPIO2');
+myPeripheral.alive;
+myPeripheral.pins.filter((pin) => true);
diff --git a/types/raspi-peripheral/tsconfig.json b/types/raspi-peripheral/tsconfig.json
new file mode 100644
index 0000000000..4b24a67971
--- /dev/null
+++ b/types/raspi-peripheral/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "raspi-peripheral-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/raspi-peripheral/tslint.json b/types/raspi-peripheral/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/raspi-peripheral/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/raspi/index.d.ts b/types/raspi/index.d.ts
new file mode 100644
index 0000000000..9df97fe3cc
--- /dev/null
+++ b/types/raspi/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for raspi 5.0
+// Project: https://github.com/nebrius/raspi
+// Definitions by: Bryan Hughes <https://github.com/nebrius>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export function init(cb: () => void): void;
diff --git a/types/raspi/raspi-tests.ts b/types/raspi/raspi-tests.ts
new file mode 100644
index 0000000000..705aeacc31
--- /dev/null
+++ b/types/raspi/raspi-tests.ts
@@ -0,0 +1,3 @@
+import { init } from 'raspi';
+
+init(() => {});
diff --git a/types/raspi/tsconfig.json b/types/raspi/tsconfig.json
new file mode 100644
index 0000000000..6906d607cf
--- /dev/null
+++ b/types/raspi/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "raspi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/raspi/tslint.json b/types/raspi/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/raspi/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/ratelimiter/tslint.json b/types/ratelimiter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ratelimiter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/raty/tslint.json b/types/raty/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/raty/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/raven-for-redux/index.d.ts b/types/raven-for-redux/index.d.ts
new file mode 100644
index 0000000000..09e95542d3
--- /dev/null
+++ b/types/raven-for-redux/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for raven-for-redux 1.1
+// Project: https://github.com/captbaritone/raven-for-redux
+// Definitions by: Daniel Chiu <https://github.com/chiubaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Action, Middleware } from "redux";
+import * as Raven from "raven-js";
+
+export = createRavenMiddleware;
+
+declare function createRavenMiddleware(raven: Raven.RavenStatic, options?: createRavenMiddleware.RavenMiddlewareOptions<any>): Middleware;
+
+declare namespace createRavenMiddleware {
+    interface RavenUserContext {
+        id?: string;
+        username?: string;
+        email?: string;
+    }
+
+    interface RavenMiddlewareOptions<T> {
+        breadcrumbDataFromAction?: (action: Action) => any;
+        actionTransformer?: (action: Action) => Action;
+        stateTransformer?: (state: T) => T;
+        breadcrumbCategory?: string;
+        filterBreadcrumbActions?: (action: Action) => boolean;
+        getUserContext?: (state: T) => RavenUserContext;
+    }
+}
diff --git a/types/raven-for-redux/package.json b/types/raven-for-redux/package.json
new file mode 100644
index 0000000000..ee85fd6437
--- /dev/null
+++ b/types/raven-for-redux/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "dependencies": {
+        "raven-js": ">=3.21.0",
+        "redux": ">=3.7.2"
+    }
+}
diff --git a/types/raven-for-redux/raven-for-redux-tests.ts b/types/raven-for-redux/raven-for-redux-tests.ts
new file mode 100644
index 0000000000..957a2017c5
--- /dev/null
+++ b/types/raven-for-redux/raven-for-redux-tests.ts
@@ -0,0 +1,13 @@
+import * as Raven from "raven-js";
+import * as createRavenMiddleware from "raven-for-redux";
+import { applyMiddleware, createStore } from "redux";
+
+const middleware = createRavenMiddleware(Raven);
+
+createStore(
+    () => {
+        return null;
+    },
+    null,
+    applyMiddleware(middleware)
+);
diff --git a/types/raven-for-redux/tsconfig.json b/types/raven-for-redux/tsconfig.json
new file mode 100644
index 0000000000..b9ef813901
--- /dev/null
+++ b/types/raven-for-redux/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "raven-for-redux-tests.ts"
+    ]
+}
diff --git a/types/raven-for-redux/tslint.json b/types/raven-for-redux/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/raven-for-redux/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/raven/index.d.ts b/types/raven/index.d.ts
index 610122ab66..e2d5e18198 100644
--- a/types/raven/index.d.ts
+++ b/types/raven/index.d.ts
@@ -60,6 +60,9 @@ export interface ConstructorOptions {
     tags?: { [key: string]: string };
     extra?: { [key: string]: any };
     dataCallback?: DataCallback;
+    maxReqQueueCount?: number;
+    sampleRate?: number;
+    sendTimeout?: number;
     shouldSendCallback?: ShouldSendCallback;
     transport?(): void;
     captureUnhandledRejections?: boolean;
diff --git a/types/raygun4js/tslint.json b/types/raygun4js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/raygun4js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rbac-a/index.d.ts b/types/rbac-a/index.d.ts
new file mode 100644
index 0000000000..822a3f7cee
--- /dev/null
+++ b/types/rbac-a/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for rbac-a 0.2
+// Project: https://github.com/yanickrochon/rbac-a#readme
+// Definitions by: Tomek �aziuk <https://github.com/tlaziuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node"/>
+
+import {
+    EventEmitter,
+} from "events";
+
+export interface Roles {
+    [_: string]: number | Roles;
+}
+
+export class Provider {
+    /**
+     * Return all the roles available for the given user. The return value
+     * must be an object, recursively defining the associated roles for the
+     * specified user. Return an empty object if user has no roles.
+     * Ex: {
+     *       "role1": {
+     *         "role1.1": null,
+     *         "role1.2": { ... },
+     *         ...
+     *       },
+     *       "secondary": ...,
+     *       ...
+     *     }
+     * The method mey return a promise resolving with the
+     * expected return value.
+     */
+    getRoles(user: any): Roles | Promise<Roles>;
+    /**
+     * Return all permissions for the specified role. The return value
+     * must be an array. Return an empty array if role is missing or
+     * no permission for the specified role.
+     * Ex: ['permission1', 'permission2', ... ]
+     * The method mey return a promise resolving with the
+     * expected return value.
+     */
+    getPermission(role: string): string[] | Promise<string[]>;
+    /**
+     * Return all attributes for the specified role. The return value must
+     * be an array. Return an empty array if role is missing or if no
+     * attributes for the specified role.
+     * Ex: ['attribute1', 'attribute2', ... ]
+     * The method mey return a promise resolving with the
+     * expected return value.
+     */
+    getAttributes(role: string): string[] | Promise<string[]>;
+}
+
+export type AttributeFunction = (user: any, role: string, params: object) => any;
+
+/**
+ * Attributes Manager
+ * This class encapsulate attributes definition and validation.
+ * Usage
+ *   var roleValid = attributesManager.validate(attribute, user, role, params);
+ */
+export class AttributesManager {
+    protected _attributes: { [_: string]: AttributeFunction };
+    /** Define an attribute. The returned value is self for chaining. */
+    set(attribute: AttributeFunction): this;
+    /**
+     * Undefine an attribute, by name or function and return removed
+     * attribute function if one was found.
+     */
+    remove(attribute: string | AttributeFunction): AttributeFunction;
+    /**
+     * Validate the attribute with the specified user, role and parameters.
+     * The method will return a truthy value if the attribute valid, or a
+     * falsy otherwise.
+     * The method may also return a promise resolivng to the expected returne
+     * value, or reject. A rejected promise should be considered falsy.
+     * If the specified attribute does not exist, false is returned.
+     */
+    validate(attribute: string, user: any, role: string, params: object): any;
+}
+
+export class RBAC<P extends Provider, AM extends AttributesManager = AttributesManager> extends EventEmitter {
+    readonly provider: P;
+    readonly attributes: AM;
+    constructor(opts: { provider: P, attributes?: AM });
+    /**
+     * Check the user for the given permissions. The method will return
+     * a Promise resolving with a number. If the user has sufficient
+     * access to the specified permissions, the promise should resolve
+     * with a positive, non-zero value, or with NaN otherwise. If the
+     * Promise is rejected, it should be considered as if the user has
+     * insufficient access to the specified ressources.
+     */
+    check(user: any, permission: string | string[], params?: object): Promise<number>;
+}
+
+export const Providers: {
+    /** Basic JSON permissions provider */
+    JsonProvider: { new(roles: object): Provider };
+};
diff --git a/types/rbac-a/lib/attributes-manager.d.ts b/types/rbac-a/lib/attributes-manager.d.ts
new file mode 100644
index 0000000000..619370c6a1
--- /dev/null
+++ b/types/rbac-a/lib/attributes-manager.d.ts
@@ -0,0 +1,2 @@
+import { AttributesManager } from "..";
+export = AttributesManager;
diff --git a/types/rbac-a/lib/provider.d.ts b/types/rbac-a/lib/provider.d.ts
new file mode 100644
index 0000000000..9c94f32f1d
--- /dev/null
+++ b/types/rbac-a/lib/provider.d.ts
@@ -0,0 +1,2 @@
+import { Provider } from "..";
+export = Provider;
diff --git a/types/rbac-a/lib/rbac.d.ts b/types/rbac-a/lib/rbac.d.ts
new file mode 100644
index 0000000000..fae3c7321b
--- /dev/null
+++ b/types/rbac-a/lib/rbac.d.ts
@@ -0,0 +1,2 @@
+import { RBAC } from "..";
+export = RBAC;
diff --git a/types/rbac-a/rbac-a-tests.ts b/types/rbac-a/rbac-a-tests.ts
new file mode 100644
index 0000000000..da783a2617
--- /dev/null
+++ b/types/rbac-a/rbac-a-tests.ts
@@ -0,0 +1,40 @@
+import {
+    Provider,
+    RBAC,
+} from "rbac-a";
+
+class CustomProvider extends Provider { }
+
+const rbac = new RBAC({
+    provider: new CustomProvider()
+});
+
+const user = "ExampleUser";
+
+rbac.on('error', (err) => {
+    console.error('Error while checking $s/%s', err.role, err.user);
+    console.error(err.stack);
+});
+
+rbac.check(user, 'create').then((allowed) => {
+    if (allowed) {
+        console.log('User can create!');
+    } else {
+        console.log('User cannot create.');
+        console.info('Please contact your system admin for more information');
+    }
+}).catch((err) => {
+    console.error(err && err.stack || err || 'ERROR');
+});
+
+// specify attributes arguments
+rbac.check(user, 'edit', { time: Date.now() }).then((allowed) => {
+    if (allowed) {
+        console.log('User can edit!');
+    } else {
+        console.log('User cannot edit.');
+        console.info('Please contact your system admin for more information');
+    }
+}).catch((err) => {
+    console.error(err && err.stack || err || 'ERROR');
+});
diff --git a/types/rbac-a/tsconfig.json b/types/rbac-a/tsconfig.json
new file mode 100644
index 0000000000..be60bf248e
--- /dev/null
+++ b/types/rbac-a/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "lib/attributes-manager.d.ts",
+        "lib/provider.d.ts",
+        "lib/rbac.d.ts",
+        "rbac-a-tests.ts"
+    ]
+}
diff --git a/types/rbac-a/tslint.json b/types/rbac-a/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rbac-a/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rbush/tslint.json b/types/rbush/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rbush/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rc-select/rc-select-tests.ts b/types/rc-select/rc-select-tests.ts
index 5416919a6f..990c04639a 100644
--- a/types/rc-select/rc-select-tests.ts
+++ b/types/rc-select/rc-select-tests.ts
@@ -16,7 +16,7 @@ class Component extends React.Component {
         console.log('input changed');
     }
 
-    private defaultSelectProps = {
+    private readonly defaultSelectProps = {
         className: "my-select",
         prefixCls: "prefix",
         animation: "slide-up",
@@ -41,13 +41,13 @@ class Component extends React.Component {
         defaultActiveFirstOption: false
     };
 
-    private defaultOptGroupProps = {
+    private readonly defaultOptGroupProps = {
         label: "Option group",
         key: "option-group-0",
         value: "option-group-0"
     };
 
-    private defaultOptionProps = {
+    private readonly defaultOptionProps = {
         className: "option",
         disabled: true,
         key: "option-0",
diff --git a/types/rc-select/tslint.json b/types/rc-select/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rc-select/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rc-slider/README.md b/types/rc-slider/README.md
index 93b553217d..622c75a90e 100644
--- a/types/rc-slider/README.md
+++ b/types/rc-slider/README.md
@@ -5,7 +5,7 @@
 This package contains type definitions for rc-slider (https://github.com/react-component/slider).
 
 Additional Details
- * Last updated: Tue, 11 Oct 2017
+ * Last updated: Fri, 15 Dec 2017
  * Dependencies: react
  * Global values: none
 
diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index ec7a276ccd..f2010b3ec9 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -1,6 +1,9 @@
-// Type definitions for rc-slider 8.1
+// Type definitions for rc-slider 8.2
 // Project: https://github.com/react-component/slider
-// Definitions by: Marcinkus Mantas <https://github.com/mantasmarcinkus>, Alexander Mattoni <https://github.com/mattoni>
+// Definitions by: Marcinkus Mantas <https://github.com/mantasmarcinkus>
+//                 Alexander Mattoni <https://github.com/mattoni>
+//                 Austin Turner <https://github.com/paustint>
+//                 Jacob Froman <https://github.com/j-fro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -39,7 +42,7 @@ export interface CommonApiProps {
      * Value to be added or subtracted on each step the slider makes. Must be greater than zero, and max - min should be evenly divisible by the step value.
      *  @default 1
      */
-    step?: number;
+    step?: number | null;
     /**
      * If vertical is true, the slider will be vertical.
      * @default false
@@ -89,6 +92,11 @@ export interface CommonApiProps {
      */
     tipFormatter?: ((value: any) => any | undefined) | null;
 
+    /**
+     * The style used for the background and container. (both for slider(Object) and range(Array of Object), the array will be used for mutli handle follow element order)
+     */
+    style?: React.CSSProperties[] | React.CSSProperties;
+
     /**
      * The style used for handle. (both for slider(Object) and range(Array of Object), the array will be used for mutli handle follow element order)
      */
@@ -103,6 +111,16 @@ export interface CommonApiProps {
      * The style used for the track base color.
      */
     railStyle?: React.CSSProperties;
+
+    /**
+     * The style used for the dots.
+     */
+    dotStyle?: React.CSSProperties;
+
+    /**
+     * The style used for the active dots.
+     */
+    activeDotStyle?: React.CSSProperties;
 }
 
 export interface SliderProps extends CommonApiProps {
@@ -141,7 +159,7 @@ export interface RangeProps extends CommonApiProps {
      * pushable could be set as true to allow pushing of surrounding handles when moving an handle. When set to a number, the number will be the minimum ensured distance between handles.
      *  @default true
      */
-    pushable?: boolean;
+    pushable?: boolean | number;
 }
 
 export interface HandleProps extends CommonApiProps {
diff --git a/types/rc-slider/rc-slider-tests.tsx b/types/rc-slider/rc-slider-tests.tsx
index 8c2e8542c9..e08a674dca 100644
--- a/types/rc-slider/rc-slider-tests.tsx
+++ b/types/rc-slider/rc-slider-tests.tsx
@@ -35,6 +35,9 @@ ReactDOM.render(
         onAfterChange={() => { }}
         defaultValue={0.1}
         value={0.1}
+        style={{backgroundColor: 'plum'}}
+        dotStyle={{backgroundColor: 'antiquewhite'}}
+        activeDotStyle={{backgroundColor: 'antiquewhite'}}
     />,
     document.querySelector('.another-app')
 );
@@ -45,7 +48,8 @@ ReactDOM.render(
         value={[0, 1]}
         count={3}
         allowCross={false}
-        pushable={true} />,
+        pushable={true}
+    />,
     document.querySelector('.app')
 );
 
diff --git a/types/rc-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index 20f65e3059..be0246fc13 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -23,7 +23,7 @@ declare namespace RCTooltip {
 		overlayStyle?: React.CSSProperties;
 		prefixCls?: string;
 		transitionName?: string;
-		onVisibleChange?: () => void;
+		onVisibleChange?: (visible?: boolean) => void;
 		visible?: boolean;
 		defaultVisible?: boolean;
 		placement?: Placement | Object;
diff --git a/types/rc-tooltip/tslint.json b/types/rc-tooltip/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rc-tooltip/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rc/tslint.json b/types/rc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rcloader/tslint.json b/types/rcloader/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rcloader/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rdf-data-model/index.d.ts b/types/rdf-data-model/index.d.ts
index e7cec4243d..9c15063eee 100644
--- a/types/rdf-data-model/index.d.ts
+++ b/types/rdf-data-model/index.d.ts
@@ -5,62 +5,11 @@
 
 import * as RDF from "rdf-js";
 
-export class NamedNode implements RDF.NamedNode {
-    termType: "NamedNode";
-    value: string;
-    constructor(iri: string);
-    equals(other: RDF.Term): boolean;
-}
-
-export class BlankNode implements RDF.BlankNode {
-    static nextId: number;
-    termType: "BlankNode";
-    value: string;
-    constructor(id?: string);
-    equals(other: RDF.Term): boolean;
-}
-
-export class Literal implements RDF.Literal {
-    static readonly langStringDatatype: NamedNode;
-    termType: "Literal";
-    value: string;
-    language: string;
-    datatype: RDF.NamedNode;
-    constructor(value: string, language?: string, datatype?: RDF.NamedNode);
-    equals(other: RDF.Term): boolean;
-}
-
-export class Variable implements RDF.Variable {
-    termType: "Variable";
-    value: string;
-    constructor(name: string);
-    equals(other: RDF.Term): boolean;
-}
-
-export class DefaultGraph implements RDF.DefaultGraph {
-    termType: "DefaultGraph";
-    value: "";
-    constructor();
-    equals(other: RDF.Term): boolean;
-}
-
-export class Quad implements RDF.Quad {
-    subject: RDF.Term;
-    predicate: RDF.Term;
-    object: RDF.Term;
-    graph: RDF.Term;
-    constructor(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term, graph?: RDF.Term);
-    equals(other: RDF.Quad): boolean;
-}
-
-export class DataFactory implements RDF.DataFactory {
-    static defaultGraphInstance: RDF.DefaultGraph;
-    constructor();
-    namedNode(value: string): NamedNode;
-    blankNode(value?: string): BlankNode;
-    literal(value: string, languageOrDatatype?: string | RDF.NamedNode): Literal;
-    variable(value: string): Variable;
-    defaultGraph(): DefaultGraph;
-    triple(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term): Quad;
-    quad(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term, graph?: RDF.Term): Quad;
-}
+export const defaultGraphInstance: RDF.DefaultGraph;
+export function namedNode(value: string): RDF.NamedNode;
+export function blankNode(value?: string): RDF.BlankNode;
+export function literal(value: string, languageOrDatatype?: string | RDF.NamedNode): RDF.Literal;
+export function variable(value: string): RDF.Variable;
+export function defaultGraph(): RDF.DefaultGraph;
+export function triple(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term): RDF.Quad;
+export function quad(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term, graph?: RDF.Term): RDF.Quad;
diff --git a/types/rdf-data-model/rdf-data-model-tests.ts b/types/rdf-data-model/rdf-data-model-tests.ts
index 415df0b8a6..3e794f984d 100644
--- a/types/rdf-data-model/rdf-data-model-tests.ts
+++ b/types/rdf-data-model/rdf-data-model-tests.ts
@@ -1,65 +1,22 @@
 import * as RDF from "rdf-js";
-import { BlankNode, DataFactory, DefaultGraph, Literal, NamedNode, Quad, Variable } from "rdf-data-model";
-import { EventEmitter } from "events";
-
-function test_terms() {
-    // Only types are checked in this tests,
-    // so this does not have to be functional.
-    const someTerm: RDF.Term = <any> {};
-
-    const namedNode: RDF.NamedNode = new NamedNode('http://example.org');
-    const tt1: string = namedNode.termType;
-    const v1: string = namedNode.value;
-    const b1: boolean = namedNode.equals(someTerm);
-
-    const blankNode1: RDF.BlankNode = new BlankNode();
-    const blankNode2: RDF.BlankNode = new BlankNode('b100');
-    const tt2: string = blankNode1.termType;
-    const v2: string = blankNode1.value;
-    const b2: boolean = blankNode1.equals(someTerm);
-
-    const literal1: RDF.Literal = new Literal('abc', 'en-us');
-    const literal2: RDF.Literal = new Literal('abc', 'en-us', namedNode);
-    const literal3: RDF.Literal = new Literal('abc', undefined, namedNode);
-    const tt3: string = literal1.termType;
-    const v3: string = literal1.value;
-    const lang: string = literal1.language;
-    const datatype: RDF.NamedNode = literal1.datatype;
-    const b3: boolean = literal1.equals(someTerm);
-
-    const variable: RDF.Variable = new Variable('myvar');
-    const tt4: string = variable.termType;
-    const v4: string = variable.value;
-    const b4: boolean = variable.equals(someTerm);
-
-    const defaultGraph: RDF.DefaultGraph = new DefaultGraph();
-    const tt5: string = defaultGraph.termType;
-    const v5: string = defaultGraph.value;
-    const b5: boolean = defaultGraph.equals(someTerm);
-
-    const quad: RDF.Quad = new Quad(namedNode, namedNode, namedNode, namedNode);
-    const s: RDF.Term = quad.subject;
-    const p: RDF.Term = quad.predicate;
-    const o: RDF.Term = quad.object;
-    const g: RDF.Term = quad.graph;
-    const b: boolean = quad.equals(new Quad(namedNode, namedNode, namedNode));
-}
+import * as DataFactory from "rdf-data-model";
 
 function test_datafactory() {
-    const dataFactory: RDF.DataFactory = new DataFactory();
+    const namedNode: RDF.NamedNode = DataFactory.namedNode('http://example.org');
 
-    const namedNode: RDF.NamedNode = dataFactory.namedNode('http://example.org');
+    const blankNode1: RDF.BlankNode = DataFactory.blankNode('b1');
+    const blankNode2: RDF.BlankNode = DataFactory.blankNode();
 
-    const blankNode1: RDF.BlankNode = dataFactory.blankNode('b1');
-    const blankNode2: RDF.BlankNode = dataFactory.blankNode();
+    const literal1: RDF.Literal = DataFactory.literal('abc');
+    const literal2: RDF.Literal = DataFactory.literal('abc', 'en-us');
+    const literal3: RDF.Literal = DataFactory.literal('abc', namedNode);
 
-    const literal1: RDF.Literal = dataFactory.literal('abc');
-    const literal2: RDF.Literal = dataFactory.literal('abc', 'en-us');
-    const literal3: RDF.Literal = dataFactory.literal('abc', namedNode);
+    const variable: RDF.Variable = DataFactory.variable('v1');
 
-    const variable: RDF.Variable = dataFactory.variable ? dataFactory.variable('v1') : new Variable('myvar');
+    const defaultGraph1: RDF.DefaultGraph = DataFactory.defaultGraphInstance;
+    const defaultGraph2: RDF.DefaultGraph = DataFactory.defaultGraph();
 
     const term: RDF.Term = <any> {};
-    const triple: RDF.Quad = dataFactory.triple(term, term, term);
-    const quad: RDF.Quad = dataFactory.quad(term, term, term, term);
+    const triple: RDF.Quad = DataFactory.triple(term, term, term);
+    const quad: RDF.Quad = DataFactory.quad(term, term, term, term);
 }
diff --git a/types/rdf-js/index.d.ts b/types/rdf-js/index.d.ts
index 33a4557bbd..9911043b48 100644
--- a/types/rdf-js/index.d.ts
+++ b/types/rdf-js/index.d.ts
@@ -28,8 +28,8 @@ export interface Term {
     value: string;
 
     /**
-     * @param {RDF.Term} other The term to compare with.
-     * @return {boolean} If the termType is equal and the contents are equal (as defined by concrete subclasses).
+     * @param other The term to compare with.
+     * @return If the termType is equal and the contents are equal (as defined by concrete subclasses).
      */
     equals(other: Term): boolean;
 }
@@ -48,8 +48,8 @@ export interface NamedNode extends Term {
     value: string;
 
     /**
-     * @param {RDF.Term} other The term to compare with.
-     * @return {boolean} True if and only if other has termType "NamedNode" and the same `value`.
+     * @param other The term to compare with.
+     * @return True if and only if other has termType "NamedNode" and the same `value`.
      */
     equals(other: Term): boolean;
 }
@@ -71,8 +71,8 @@ export interface BlankNode extends Term {
     value: string;
 
     /**
-     * @param {RDF.Term} other The term to compare with.
-     * @return {boolean} True if and only if other has termType "BlankNode" and the same `value`.
+     * @param other The term to compare with.
+     * @return True if and only if other has termType "BlankNode" and the same `value`.
      */
     equals(other: Term): boolean;
 }
@@ -101,8 +101,8 @@ export interface Literal extends Term {
     datatype: NamedNode;
 
     /**
-     * @param {RDF.Term} other The term to compare with.
-     * @return {boolean} True if and only if other has termType "Literal"
+     * @param other The term to compare with.
+     * @return True if and only if other has termType "Literal"
      *                   and the same `value`, `language`, and `datatype`.
      */
     equals(other: Term): boolean;
@@ -122,8 +122,8 @@ export interface Variable extends Term {
     value: string;
 
     /**
-     * @param {RDF.Term} other The term to compare with.
-     * @return {boolean} True if and only if other has termType "Variable" and the same `value`.
+     * @param other The term to compare with.
+     * @return True if and only if other has termType "Variable" and the same `value`.
      */
     equals(other: Term): boolean;
 }
@@ -143,8 +143,8 @@ export interface DefaultGraph extends Term {
     value: "";
 
     /**
-     * @param {RDF.Term} other The term to compare with.
-     * @return {boolean} True if and only if other has termType "DefaultGraph".
+     * @param other The term to compare with.
+     * @return True if and only if other has termType "DefaultGraph".
      */
     equals(other: Term): boolean;
 }
@@ -184,8 +184,8 @@ export interface Quad {
     graph: Term;
 
     /**
-     * @param {RDF.Quad} other The term to compare with.
-     * @return {boolean} True if and only if the argument is a) of the same type b) has all components equal.
+     * @param other The term to compare with.
+     * @return True if and only if the argument is a) of the same type b) has all components equal.
      */
     equals(other: Quad): boolean;
 }
@@ -203,15 +203,15 @@ export interface Triple extends Quad {}
  */
 export interface DataFactory {
     /**
-     * @param {string} value The IRI for the named node.
-     * @return {RDF.NamedNode} A new instance of NamedNode.
+     * @param value The IRI for the named node.
+     * @return A new instance of NamedNode.
      * @see NamedNode
      */
     namedNode(value: string): NamedNode;
 
     /**
-     * @param {string} value The optional blank node identifier.
-     * @return {RDF.BlankNode} A new instance of BlankNode.
+     * @param value The optional blank node identifier.
+     * @return A new instance of BlankNode.
      *                         If the `value` parameter is undefined a new identifier
      *                         for the blank node is generated for each call.
      * @see BlankNode
@@ -219,35 +219,35 @@ export interface DataFactory {
     blankNode(value?: string): BlankNode;
 
     /**
-     * @param {string}                 value              The literal value.
-     * @param {string | RDF.NamedNode} languageOrDatatype The optional language or datatype.
+     * @param                 value              The literal value.
+     * @param languageOrDatatype The optional language or datatype.
      *                                                    If `languageOrDatatype` is a NamedNode,
      *                                                    then it is used for the value of `NamedNode.datatype`.
      *                                                    Otherwise `languageOrDatatype` is used for the value
      *                                                    of `NamedNode.language`.
-     * @return {RDF.Literal} A new instance of Literal.
+     * @return A new instance of Literal.
      * @see Literal
      */
     literal(value: string, languageOrDatatype?: string | NamedNode): Literal;
 
     /**
      * This method is optional.
-     * @param {string} value The variable name
-     * @return {RDF.Variable} A new instance of Variable.
+     * @param value The variable name
+     * @return A new instance of Variable.
      * @see Variable
      */
     variable?(value: string): Variable;
 
     /**
-     * @return {RDF.DefaultGraph} An instance of DefaultGraph.
+     * @return An instance of DefaultGraph.
      */
     defaultGraph(): DefaultGraph;
 
     /**
-     * @param {RDF.Term} subject   The triple subject term.
-     * @param {RDF.Term} predicate The triple predicate term.
-     * @param {RDF.Term} object    The triple object term.
-     * @return {RDF.Quad} A new instance of Quad with `Quad.graph` set to DefaultGraph.
+     * @param subject   The triple subject term.
+     * @param predicate The triple predicate term.
+     * @param object    The triple object term.
+     * @return A new instance of Quad with `Quad.graph` set to DefaultGraph.
      * @see Quad
      * @see Triple
      * @see DefaultGraph
@@ -255,11 +255,11 @@ export interface DataFactory {
     triple(subject: Term, predicate: Term, object: Term): Quad;
 
     /**
-     * @param {RDF.Term} subject   The quad subject term.
-     * @param {RDF.Term} predicate The quad predicate term.
-     * @param {RDF.Term} object    The quad object term.
-     * @param {RDF.Term} graph     The quad graph term.
-     * @return {RDF.Quad} A new instance of Quad.
+     * @param subject   The quad subject term.
+     * @param predicate The quad predicate term.
+     * @param object    The quad object term.
+     * @param graph     The quad graph term.
+     * @return A new instance of Quad.
      * @see Quad
      */
     quad(subject: Term, predicate: Term, object: Term, graph?: Term): Quad;
@@ -286,7 +286,7 @@ export interface Stream extends EventEmitter {
      * This method pulls a quad out of the internal buffer and returns it.
      * If there is no quad available, then it will return null.
      *
-     * @return {RDF.Quad} A quad from the internal buffer, or null if none is available.
+     * @return A quad from the internal buffer, or null if none is available.
      */
     read(): Quad;
 }
@@ -302,11 +302,11 @@ export interface Source {
     /**
      * Returns a stream that processes all quads matching the pattern.
      *
-     * @param {RDF.Term | RegExp} subject   The optional exact subject or subject regex to match.
-     * @param {RDF.Term | RegExp} predicate The optional exact predicate or predicate regex to match.
-     * @param {RDF.Term | RegExp} object    The optional exact object or object regex to match.
-     * @param {RDF.Term | RegExp} graph     The optional exact graph or graph regex to match.
-     * @return {RDF.Stream} The resulting quad stream.
+     * @param subject   The optional exact subject or subject regex to match.
+     * @param predicate The optional exact predicate or predicate regex to match.
+     * @param object    The optional exact object or object regex to match.
+     * @param graph     The optional exact graph or graph regex to match.
+     * @return The resulting quad stream.
      */
     match(subject?: Term | RegExp, predicate?: Term | RegExp, object?: Term | RegExp, graph?: Term | RegExp)
         : Stream;
@@ -327,8 +327,8 @@ export interface Sink {
      * Depending on the use case, subtypes of EventEmitter or Stream are used.
      * @see Stream
      *
-     * @param {RDF.Stream} stream The stream that will be consumed.
-     * @return {"events".internal.EventEmitter} The resulting event emitter.
+     * @param stream The stream that will be consumed.
+     * @return The resulting event emitter.
      */
     import(stream: Stream): EventEmitter;
 }
@@ -348,8 +348,8 @@ export interface Store extends Source, Sink {
      * The end and error events are used like described in the Stream interface.
      * @see Stream
      *
-     * @param {RDF.Stream} stream The stream that will be consumed.
-     * @return {"events".internal.EventEmitter} The resulting event emitter.
+     * @param stream The stream that will be consumed.
+     * @return The resulting event emitter.
      */
     remove(stream: Stream): EventEmitter;
 
@@ -359,11 +359,11 @@ export interface Store extends Source, Sink {
      * The `end` and `error` events are used like described in the Stream interface.
      * @see Stream
      *
-     * @param {RDF.Term | RegExp} subject   The optional exact subject or subject regex to match.
-     * @param {RDF.Term | RegExp} predicate The optional exact predicate or predicate regex to match.
-     * @param {RDF.Term | RegExp} object    The optional exact object or object regex to match.
-     * @param {RDF.Term | RegExp} graph     The optional exact graph or graph regex to match.
-     * @return {"events".internal.EventEmitter} The resulting event emitter.
+     * @param subject   The optional exact subject or subject regex to match.
+     * @param predicate The optional exact predicate or predicate regex to match.
+     * @param object    The optional exact object or object regex to match.
+     * @param graph     The optional exact graph or graph regex to match.
+     * @return The resulting event emitter.
      */
     removeMatches(subject?: Term | RegExp, predicate?: Term | RegExp, object?: Term | RegExp, graph?: Term | RegExp)
         : EventEmitter;
@@ -374,8 +374,8 @@ export interface Store extends Source, Sink {
      * The `end` and `error` events are used like described in the Stream interface.
      * @see Stream
      *
-     * @param {RDF.Term | string} graph The graph term or string to match.
-     * @return {"events".internal.EventEmitter} The resulting event emitter.
+     * @param graph The graph term or string to match.
+     * @return The resulting event emitter.
      */
     deleteGraph(graph: Term | string): EventEmitter;
 }
diff --git a/types/react-addons-create-fragment/tslint.json b/types/react-addons-create-fragment/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-create-fragment/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-css-transition-group/tslint.json b/types/react-addons-css-transition-group/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-css-transition-group/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-linked-state-mixin/tslint.json b/types/react-addons-linked-state-mixin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-linked-state-mixin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-perf/tslint.json b/types/react-addons-perf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-perf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-pure-render-mixin/tslint.json b/types/react-addons-pure-render-mixin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-pure-render-mixin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-shallow-compare/tslint.json b/types/react-addons-shallow-compare/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-shallow-compare/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-test-utils/tslint.json b/types/react-addons-test-utils/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/react-addons-test-utils/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-transition-group/tslint.json b/types/react-addons-transition-group/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-transition-group/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-addons-update/tslint.json b/types/react-addons-update/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-addons-update/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-alert/index.d.ts b/types/react-alert/index.d.ts
new file mode 100644
index 0000000000..d402d24ad2
--- /dev/null
+++ b/types/react-alert/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for react-alert 2.4
+// Project: https://github.com/schiehll/react-alert
+// Definitions by: Steve Syrell <https://github.com/ssyrell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export interface AlertContainerProps {
+    /**
+     * The offset of the alert from the page border, can be any number.
+     *
+     * Default: 14.
+     */
+    offset: number;
+
+    /**
+     * The position of the alert. Can be [bottom left, bottom right, top left, top right].
+     *
+     * Default: 'bottom left'
+     */
+    position: string;
+
+    /**
+     * The color theme of the alert. Can be [dark, light].
+     *
+     * Default: 'dark'
+     */
+    theme: string;
+
+    /**
+     * The time in milliseconds the alert is displayed. After this
+     * time ellapses, the alert will close itself. Use 0 to prevent self-closure
+     * (applies to all alerts).
+     *
+     * Default: 5000
+     */
+    time: number;
+
+    /**
+     * The transition animation. Can be [scale, fade].
+     *
+     * Default: 'scale'
+     */
+    transition: string;
+}
+
+export interface AlertShowOptions {
+    /**
+     * The time in milliseconds the alert is displayed. After this
+     * time ellapses, the alert will close itself. Use 0 to prevent self-closure.
+     */
+    time?: number;
+
+    /**
+     * The icon to show in the alert.
+     *
+     * Default: the icon which matches the type of alert to be shown.
+     */
+    icon?: React.ReactNode;
+
+    /**
+     * A callback function that will be called when the alert is closed.
+     */
+    onClose?: () => void;
+
+    /**
+     * The type of alert to show. This will only be used when calling show().
+     * Can be [info, success, error].
+     *
+     * Default: 'info'
+     */
+    type?: string;
+}
+
+export default class AlertContainer extends React.Component<AlertContainerProps> {
+    /**
+     * Show a success alert.
+     * @returns The id of the created alert.
+     */
+    success(message: string, options?: AlertShowOptions): string;
+
+    /**
+     * Show an error alert.
+     * @returns The id of the created alert.
+     */
+    error(message: string, options?: AlertShowOptions): string;
+
+    /**
+     * Show an info alert.
+     * @returns The id of the created alert.
+     */
+    info(message: string, options?: AlertShowOptions): string;
+
+    /**
+     * Show an alert.
+     * @returns The id of the created alert.
+     */
+    show(message: string, options?: AlertShowOptions): string;
+
+    /**
+     * Remove all alerts from the page.
+     */
+    removeAll(): void;
+
+    /**
+     * Removes the alert with the specified id from the page.
+     */
+    remove(id: string): void;
+}
diff --git a/types/react-alert/react-alert-tests.tsx b/types/react-alert/react-alert-tests.tsx
new file mode 100644
index 0000000000..84686ea73d
--- /dev/null
+++ b/types/react-alert/react-alert-tests.tsx
@@ -0,0 +1,48 @@
+import * as React from "react";
+import AlertContainer, { AlertContainerProps, AlertShowOptions } from "react-alert";
+
+export class ReactAlertTest extends React.Component {
+    private _alert: AlertContainer;
+    render() {
+        const props: AlertContainerProps = {
+            offset: 14,
+            position: "bottom left",
+            theme: "dark",
+            time: 5000,
+            transition: "scale"
+        };
+
+        return (
+            <div>
+                <AlertContainer ref={a => this._alert = a as AlertContainer} {...props} />
+            </div>
+        );
+    }
+
+    private _testMethods(): void {
+        const options: AlertShowOptions = {
+            time: 5000,
+            type: "info",
+            onClose: this._onAlertClosed,
+            icon: <img src="path/to/some/image/32x32.png" />
+        };
+
+        let alertId: string;
+        alertId = this._alert.show("show without options");
+        alertId = this._alert.show("show with options", options);
+
+        alertId = this._alert.error("error without options");
+        alertId = this._alert.error("error with options", options);
+
+        alertId = this._alert.info("info without options");
+        alertId = this._alert.info("info with options", options);
+
+        alertId = this._alert.success("success without options");
+        alertId = this._alert.success("success with options", options);
+
+        this._alert.remove(alertId);
+        this._alert.removeAll();
+    }
+
+    private _onAlertClosed(): void { }
+}
diff --git a/types/react-alert/tsconfig.json b/types/react-alert/tsconfig.json
new file mode 100644
index 0000000000..9332254f22
--- /dev/null
+++ b/types/react-alert/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-alert-tests.tsx"
+    ]
+}
diff --git a/types/react-alert/tslint.json b/types/react-alert/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-alert/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-alice-carousel/index.d.ts b/types/react-alice-carousel/index.d.ts
new file mode 100644
index 0000000000..47d4fd95de
--- /dev/null
+++ b/types/react-alice-carousel/index.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for react-alice-carousel 1.7
+// Project: https://github.com/maxmarinich/react-alice-carousel
+// Definitions by: endigo <https://github.com/endigo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export interface EventObject {
+	item: number;
+	slide: number;
+}
+
+export interface Props {
+	/**
+	 * Fired when the event object is changing / returns event object
+	 */
+	onSlideChange?: (e: EventObject) => void;
+	/**
+	 * Fired when the event object was changed / returns event object
+	 */
+	onSlideChanged?: (e: EventObject) => void;
+	/**
+	 * Disable keys controls (left, right, space)
+	 *
+	 * Default: false.
+	 */
+	keysControlDisabled?: boolean;
+	/**
+	 * Disable play/pause button
+	 *
+	 * Default: false.
+	 */
+	playButtonEnabled?: boolean;
+	/**
+	 * Disable buttons control
+	 *
+	 * Default: false.
+	 */
+	buttonsDisabled?: boolean;
+	/**
+	 * Disable dots navigation
+	 *
+	 * Default: false.
+	 */
+	dotsDisabled?: boolean;
+	/**
+	 * Disable swipe handlers
+	 *
+	 * Default: false.
+	 */
+	swipeDisabled?: boolean;
+	/**
+	 * Number of items in the slide.
+	 *
+	 * Default: {}.
+	 */
+	responsive?: {};
+	/**
+	 * Duration of slides transition (milliseconds)
+	 *
+	 * Default: 250.
+	 */
+	duration?: number;
+	/**
+	 * The starting index of the carousel
+	 *
+	 * Default: 0.
+	 */
+	startIndex?: number;
+	/**
+	 * Sets the carousel at the specified position
+	 *
+	 * Default: 0.
+	 */
+	slideToIndex?: number;
+	/**
+	 *  Set auto play mode
+	 *
+	 * Default: false.
+	 */
+	autoPlay?: boolean;
+	/**
+	 * Disable infinite mode
+	 *
+	 * Default: true.
+	 */
+	infinite?: boolean;
+	/**
+	 * The offset of the alert from the page border, can be any number.
+	 *
+	 * Default: 14.
+	 */
+	mouseDragEnabled?: boolean;
+	/**
+	 * Enable fadeout animation. Fired when 1 item is in the slide
+	 *
+	 * Default: false.
+	 */
+	fadeOutAnimation?: boolean;
+	/**
+	 * Interval of auto play animation (milliseconds). If specified, a larger value will be taken from comparing this property and the duration one
+	 *
+	 * Default: 250.
+	 */
+	autoPlayInterval?: number;
+	/**
+	 * To run auto play in the left direction specify rtl value
+	 *
+	 * Default: 'ltr'.
+	 */
+	autoPlayDirection?: string;
+	/**
+	 * If this property is identified as true auto play animation will be stopped after clicking user on any gallery button
+	 *
+	 * Default: false.
+	 */
+	autoPlayActionDisabled?: boolean;
+}
+
+export default class Carousel extends React.PureComponent<Props> {}
diff --git a/types/react-alice-carousel/react-alice-carousel-tests.tsx b/types/react-alice-carousel/react-alice-carousel-tests.tsx
new file mode 100644
index 0000000000..9a123a5748
--- /dev/null
+++ b/types/react-alice-carousel/react-alice-carousel-tests.tsx
@@ -0,0 +1,61 @@
+import * as React from 'react';
+import AliceCarousel, { Props, EventObject } from 'react-alice-carousel';
+
+class SimpleAliceCarousel extends React.Component<Props> {
+	render() {
+		return (
+			<div>
+				<AliceCarousel/>
+			</div>
+		);
+	}
+}
+
+class Gallery extends React.Component<Props> {
+	onSlideChange(e: EventObject) {
+		// console.log('Item`s position during a change: ', e.item);
+		// console.log('Slide`s position during a change: ', e.slide);
+	}
+
+	onSlideChanged(e: EventObject) {
+		// console.log('Item`s position after changes: ', e.item);
+		// console.log('Slide`s position after changes: ', e.slide);
+	}
+
+	render() {
+		const responsive = {
+			0: {
+				items: 1
+			},
+			600: {
+				items: 2
+			},
+			1024: {
+				items: 3
+			}
+		};
+
+		return (
+			<AliceCarousel
+				duration={400}
+				autoPlay={true}
+				startIndex = {1}
+				fadeOutAnimation={true}
+				mouseDragEnabled={true}
+				playButtonEnabled={true}
+				responsive={responsive}
+				autoPlayInterval={2000}
+				autoPlayDirection="rtl"
+				autoPlayActionDisabled={true}
+				onSlideChange={this.onSlideChange}
+				onSlideChanged={this.onSlideChanged}
+			>
+				<div className="yours-custom-class"><h2>1</h2></div>
+				<div className="yours-custom-class"><h2>2</h2></div>
+				<div className="yours-custom-class"><h2>3</h2></div>
+				<div className="yours-custom-class"><h2>4</h2></div>
+				<div className="yours-custom-class"><h2>5</h2></div>
+			</AliceCarousel>
+		);
+	}
+}
diff --git a/types/react-alice-carousel/tsconfig.json b/types/react-alice-carousel/tsconfig.json
new file mode 100644
index 0000000000..4245303823
--- /dev/null
+++ b/types/react-alice-carousel/tsconfig.json
@@ -0,0 +1,24 @@
+{
+	"compilerOptions": {
+			"module": "commonjs",
+			"lib": [
+					"es6"
+			],
+			"noImplicitAny": true,
+			"noImplicitThis": true,
+			"strictNullChecks": true,
+			"strictFunctionTypes": true,
+			"baseUrl": "../",
+			"typeRoots": [
+					"../"
+			],
+			"types": [],
+			"noEmit": true,
+			"forceConsistentCasingInFileNames": true,
+			"jsx": "react"
+	},
+	"files": [
+			"index.d.ts",
+			"react-alice-carousel-tests.tsx"
+	]
+}
diff --git a/types/react-alice-carousel/tslint.json b/types/react-alice-carousel/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-alice-carousel/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-autosuggest/README.md b/types/react-autosuggest/README.md
new file mode 100644
index 0000000000..44ff83ecc5
--- /dev/null
+++ b/types/react-autosuggest/README.md
@@ -0,0 +1,28 @@
+# react-autosuggest usage notes
+
+The definition uses generics for stronger typing. Read the [TypeScript deep dive on JSX Generic components](https://basarat.gitbooks.io/typescript/docs/jsx/tsx.html#react-jsx-tip-generic-components) for details on consuming these type definitions.
+
+## Example 
+
+```jsx
+import * as Autosuggest from 'react-autosuggest'
+interface Language {
+    name: string
+    year: number
+}
+
+const LanguageAutosuggest = Autosuggest as { new (): Autosuggest<Language> }
+
+<LanguageAutosuggest
+    suggestions={suggestions}
+    onSuggestionsFetchRequested={this.onSuggestionsFetchRequested.bind(this)}
+    getSuggestionValue={this.getSuggestionValue}
+    renderSuggestion={this.renderSuggestion}
+    onSuggestionSelected={this.onSuggestionsSelected}
+    alwaysRenderSuggestions={true}
+    inputProps={inputProps}
+    theme={theme}
+/>
+```
+
+Find multiple full examples in `react-autosuggest-tests.tsx`
diff --git a/types/react-autosuggest/index.d.ts b/types/react-autosuggest/index.d.ts
index 2afbd1960d..444753bd54 100644
--- a/types/react-autosuggest/index.d.ts
+++ b/types/react-autosuggest/index.d.ts
@@ -1,77 +1,204 @@
-// Type definitions for react-autosuggest 8.0
+// Type definitions for react-autosuggest 9.3
 // Project: http://react-autosuggest.js.org/
-// Definitions by: Nicolas Schmitt <https://github.com/nicolas-schmitt>, Philip Ottesen <https://github.com/pjo256>, Robert Essig <https://github.com/robessog>, Terry Bayne <https://github.com/tbayne>
+// Definitions by: Nicolas Schmitt <https://github.com/nicolas-schmitt>
+//                 Philip Ottesen <https://github.com/pjo256>
+//                 Robert Essig <https://github.com/robessog>
+//                 Terry Bayne <https://github.com/tbayne>
+//                 Christopher Deutsch <https://github.com/cdeutsch>
+//                 Kevin Ross <https://github.com/rosskevin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
-declare class Autosuggest extends React.Component<any> {}
+
+declare class Autosuggest<T = any> extends React.Component<Autosuggest.AutosuggestProps<T>> {}
 
 export = Autosuggest;
 
 declare namespace Autosuggest {
-  interface SuggestionsFetchRequest {
-    value: string;
-    reason: string;
-  }
+    /**
+     * Utilies types based on:
+     * https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-307871458
+     */
 
-  interface InputValues {
-    value: string;
-    valueBeforeUpDown?: string;
-  }
+    /** @internal */
+    type Diff<T extends string, U extends string> = ({ [P in T]: P } &
+        { [P in U]: never } & { [x: string]: never })[T];
 
-  interface ChangeEvent {
-    newValue: string;
-    method: 'down' | 'up' | 'escape' | 'enter' | 'click' | 'type';
-  }
+    /** @internal */
+    type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
 
-  interface BlurEvent {
-    focusedSuggestion: any;
-  }
+    interface SuggestionsFetchRequestedParams {
+        value: string;
+        reason:
+            | 'input-changed'
+            | 'input-focused'
+            | 'escape-pressed'
+            | 'suggestions-revealed'
+            | 'suggestion-selected';
+    }
 
-  interface InputProps extends React.HTMLAttributes<any> {
-    value: string;
-    onChange(event: React.FormEvent<any>, params?: ChangeEvent): void;
-    onBlur?(event: React.FormEvent<any>, params?: BlurEvent): void;
-  }
+    interface RenderSuggestionParams {
+        query: string;
+        isHighlighted: boolean;
+    }
 
-  interface SuggestionSelectedEventData<TSuggestion> {
-    method: 'click' | 'enter';
-    sectionIndex: number | null;
-    suggestion: TSuggestion;
-    suggestionValue: string;
-  }
+    interface SuggestionHighlightedParams {
+        suggestion: any;
+    }
 
-  interface Theme {
-    container?: string;
-    containerOpen?: string;
-    input?: string;
-    sectionContainer?: string;
-    sectionSuggestionsContainer?: string;
-    sectionTitle?: string;
-    suggestion?: string;
-    suggestionFocused?: string;
-    suggestionsContainer?: string;
-  }
+    interface ChangeEvent {
+        newValue: string;
+        method: 'down' | 'up' | 'escape' | 'enter' | 'click' | 'type';
+    }
 
-  interface AutosuggestProps extends React.Props<Autosuggest> {
-    suggestions: any[];
-    onSuggestionsFetchRequested(request: SuggestionsFetchRequest): void;
-    onSuggestionsClearRequested?(): void;
-    getSuggestionValue(suggestion: any): any;
-    renderSuggestion(suggestion: any, inputValues: InputValues): JSX.Element;
-    inputProps: InputProps;
-    onSuggestionSelected?(event: React.FormEvent<any>, data: SuggestionSelectedEventData<any>): void;
-    shouldRenderSuggestions?(value: string): boolean;
-    alwaysRenderSuggestions?: boolean;
-    focusFirstSuggestion?: boolean;
-    focusInputOnSuggestionClick?: boolean;
-    multiSection?: boolean;
-    renderSectionTitle?(section: any, inputValues: InputValues): JSX.Element;
-    getSectionSuggestions?(section: any): any[];
-    renderInputComponent?(): JSX.Element;
-    renderSuggestionsContainer?(children: any): JSX.Element;
-    theme?: Theme;
-    id?: string;
-  }
+    interface BlurEvent<TSuggestion> {
+        highlightedSuggestion: TSuggestion;
+    }
+
+    interface InputProps<TSuggestion>
+        extends Omit<React.InputHTMLAttributes<any>, 'onChange' | 'onBlur'> {
+        onChange(event: React.FormEvent<any>, params?: ChangeEvent): void;
+        onBlur?(event: React.FormEvent<any>, params?: BlurEvent<TSuggestion>): void;
+        value: string;
+        [key: string]: any;
+    }
+
+    interface SuggestionSelectedEventData<TSuggestion> {
+        suggestion: TSuggestion;
+        suggestionValue: string;
+        suggestionIndex: number;
+        sectionIndex: number | null;
+        method: 'click' | 'enter';
+    }
+
+    type ThemeKey =
+        | 'container'
+        | 'containerOpen'
+        | 'input'
+        | 'inputOpen'
+        | 'inputFocused'
+        | 'suggestionsContainer'
+        | 'suggestionsContainerOpen'
+        | 'suggestionsList'
+        | 'suggestion'
+        | 'suggestionFirst'
+        | 'suggestionHighlighted'
+        | 'sectionContainer'
+        | 'sectionContainerFirst'
+        | 'sectionTitle';
+
+    type Theme =
+        | Record<string, string | React.CSSProperties>
+        | Partial<Record<ThemeKey, string | React.CSSProperties>>;
+
+    interface RenderSuggestionsContainerParams {
+        containerProps: {
+            id: string;
+            key: string;
+            ref: any;
+            style: any;
+        };
+        children: React.ReactNode;
+        query: string;
+    }
+
+    // types for functions - allowing reuse externally - e.g. as props and bound in the constructor
+    type GetSectionSuggestions<TSuggestion> = (section: any) => TSuggestion[];
+    type GetSuggestionValue<TSuggestion> = (suggestion: TSuggestion) => string;
+    type OnSuggestionHighlighted = (params: SuggestionHighlightedParams) => void;
+    type SuggestionsFetchRequested = (request: SuggestionsFetchRequestedParams) => void;
+    type OnSuggestionsClearRequested = () => void;
+    type OnSuggestionSelected<TSuggestion> = (
+        event: React.FormEvent<any>,
+        data: SuggestionSelectedEventData<TSuggestion>,
+    ) => void;
+    type RenderInputComponent<TSuggestion> = (inputProps: InputProps<TSuggestion>) => React.ReactNode;
+    type RenderSuggestionsContainer = (params: RenderSuggestionsContainerParams) => React.ReactNode;
+    type RenderSectionTitle = (section: any) => React.ReactNode;
+    type RenderSuggestion<TSuggestion> = (
+        suggestion: TSuggestion,
+        params: RenderSuggestionParams,
+    ) => React.ReactNode;
+    type ShouldRenderSuggestions = (value: string) => boolean;
+
+    interface AutosuggestProps<TSuggestion> {
+        /**
+         * Set it to true if you'd like to render suggestions even when the input is not focused.
+         */
+        alwaysRenderSuggestions?: boolean;
+        /**
+         * Set it to false if you don't want Autosuggest to keep the input focused when suggestions are clicked/tapped.
+         */
+        focusInputOnSuggestionClick?: boolean;
+        /**
+         * Implement it to teach Autosuggest where to find the suggestions for every section.
+         */
+        getSectionSuggestions?: GetSectionSuggestions<TSuggestion>;
+        /**
+         * Implement it to teach Autosuggest what should be the input value when suggestion is clicked.
+         */
+        getSuggestionValue: GetSuggestionValue<TSuggestion>;
+        /**
+         * 	Set it to true if you'd like Autosuggest to automatically highlight the first suggestion.
+         */
+        highlightFirstSuggestion?: boolean;
+        /**
+         * Use it only if you have multiple Autosuggest components on a page.
+         */
+        id?: string;
+        /**
+         * Pass through arbitrary props to the input. It must contain at least value and onChange.
+         */
+        inputProps: InputProps<TSuggestion>;
+        /**
+         * Set it to true if you'd like to display suggestions in multiple sections (with optional titles).
+         */
+        multiSection?: boolean;
+        /**
+         * Will be called every time the highlighted suggestion changes.
+         */
+        onSuggestionHighlighted?: OnSuggestionHighlighted;
+        /**
+         * Will be called every time you need to recalculate suggestions.
+         */
+        onSuggestionsFetchRequested: SuggestionsFetchRequested;
+        /**
+         * Will be called every time you need to set suggestions to [].
+         */
+        onSuggestionsClearRequested?: OnSuggestionsClearRequested;
+        /**
+         * Will be called every time suggestion is selected via mouse or keyboard.
+         */
+        onSuggestionSelected?: OnSuggestionSelected<TSuggestion>;
+        /**
+         * Use it only if you need to customize the rendering of the input.
+         */
+        renderInputComponent?: RenderInputComponent<TSuggestion>;
+        /**
+         * Use it if you want to customize things inside the suggestions container beyond rendering the suggestions themselves.
+         */
+        renderSuggestionsContainer?: RenderSuggestionsContainer;
+        /**
+         * Use your imagination to define how section titles are rendered.
+         */
+        renderSectionTitle?: RenderSectionTitle;
+        /**
+         * Use your imagination to define how suggestions are rendered.
+         */
+        renderSuggestion: RenderSuggestion<TSuggestion>;
+        /**
+         * When the input is focused, Autosuggest will consult this function when to render suggestions.
+         * Use it, for example, if you want to display suggestions when input value is at least 2 characters long.
+         */
+        shouldRenderSuggestions?: ShouldRenderSuggestions;
+        /**
+         * These are the suggestions that will be displayed. Items can take an arbitrary shape.
+         */
+        suggestions: TSuggestion[];
+        /**
+         * Use your imagination to style the Autosuggest.
+         */
+        theme?: Theme;
+    }
 }
diff --git a/types/react-autosuggest/react-autosuggest-tests.tsx b/types/react-autosuggest/react-autosuggest-tests.tsx
index 252f5833fb..3747e8457b 100644
--- a/types/react-autosuggest/react-autosuggest-tests.tsx
+++ b/types/react-autosuggest/react-autosuggest-tests.tsx
@@ -85,10 +85,137 @@ export class ReactAutosuggestBasicTest extends React.Component<any, any> {
         const theme = {
             input: 'themed-input-class',
             container: 'themed-container-class',
-            suggestionFocused: 'active'
+            suggestionFocused: 'active',
+            sectionTitle: { color: 'blue' }
         };
 
         return <Autosuggest
+            suggestions={suggestions}
+            onSuggestionsFetchRequested={this
+                .onSuggestionsFetchRequested
+                .bind(this)}
+            getSuggestionValue={this.getSuggestionValue}
+            renderSuggestion={this.renderSuggestion}
+            onSuggestionSelected={this.onSuggestionsSelected}
+            alwaysRenderSuggestions={true}
+            inputProps={inputProps}
+            theme={theme}/>;
+    }
+
+    protected onSuggestionsSelected(event: React.FormEvent<any>, data: Autosuggest.SuggestionSelectedEventData<Language>): void {
+        alert(`Selected language is ${data.suggestion.name} (${data.suggestion.year}).`);
+    }
+
+    protected renderSuggestion(suggestion: Language, params: Autosuggest.RenderSuggestionParams): JSX.Element {
+        const className = params.isHighlighted ? "highlighted" : undefined;
+        return <span className={className}>{suggestion.name}</span>;
+    }
+    // endregion region Event handlers
+    protected onChange(event: React.FormEvent<any>, {newValue, method}: any): void {
+        this.setState({value: newValue});
+    }
+
+    protected onSuggestionsFetchRequested({value}: any): void {
+        this.setState({
+            suggestions: this.getSuggestions(value)
+        });
+    }
+    // endregion region Helper methods
+    protected getSuggestions(value: string): Language[] {
+        const escapedValue = escapeRegexCharacters(value.trim());
+
+        if (escapedValue === '') {
+            return [];
+        }
+
+        const regex = new RegExp('^' + escapedValue, 'i');
+
+        return ReactAutosuggestBasicTest
+            .languages
+            .filter(language => regex.test(language.name));
+    }
+
+    protected getSuggestionValue(suggestion: Language): string { return suggestion.name; }
+    // endregion
+}
+
+const LanguageAutosuggest = Autosuggest as { new (): Autosuggest<Language> };
+
+export class ReactAutosuggestTypedTest extends React.Component<any, any> {
+    // region Fields
+    static languages: Language[] = [
+        {
+            name: 'C',
+            year: 1972
+        }, {
+            name: 'C#',
+            year: 2000
+        }, {
+            name: 'C++',
+            year: 1983
+        }, {
+            name: 'Clojure',
+            year: 2007
+        }, {
+            name: 'Elm',
+            year: 2012
+        }, {
+            name: 'Go',
+            year: 2009
+        }, {
+            name: 'Haskell',
+            year: 1990
+        }, {
+            name: 'Java',
+            year: 1995
+        }, {
+            name: 'Javascript',
+            year: 1995
+        }, {
+            name: 'Perl',
+            year: 1987
+        }, {
+            name: 'PHP',
+            year: 1995
+        }, {
+            name: 'Python',
+            year: 1991
+        }, {
+            name: 'Ruby',
+            year: 1995
+        }, {
+            name: 'Scala',
+            year: 2003
+        }
+    ];
+    // endregion region Constructor
+    constructor(props: any) {
+        super(props);
+
+        this.state = {
+            value: '',
+            suggestions: this.getSuggestions('')
+        };
+    }
+    // endregion region Rendering methods
+    render(): JSX.Element {
+        const {value, suggestions} = this.state;
+        const inputProps = {
+            placeholder: `Type 'c'`,
+            value,
+            onChange: this
+                .onChange
+                .bind(this)
+        };
+
+        const theme = {
+            input: 'themed-input-class',
+            container: 'themed-container-class',
+            suggestionFocused: 'active',
+            sectionTitle: { color: 'blue' }
+        };
+
+        return <LanguageAutosuggest
             suggestions={suggestions}
             onSuggestionsFetchRequested={this
             .onSuggestionsFetchRequested
@@ -105,8 +232,9 @@ export class ReactAutosuggestBasicTest extends React.Component<any, any> {
         alert(`Selected language is ${data.suggestion.name} (${data.suggestion.year}).`);
     }
 
-    protected renderSuggestion(suggestion: Language): JSX.Element {
-        return <span>{suggestion.name}</span>;
+    protected renderSuggestion(suggestion: Language, params: Autosuggest.RenderSuggestionParams): JSX.Element {
+        const className = params.isHighlighted ? "highlighted" : undefined;
+        return <span className={className}>{suggestion.name}</span>;
     }
     // endregion region Event handlers
     protected onChange(event: React.FormEvent<any>, {newValue, method}: any): void {
@@ -223,7 +351,8 @@ export class ReactAutosuggestMultipleTest extends React.Component<any, any> {
 
         this.state = {
             value: '',
-            suggestions: this.getSuggestions('')
+            suggestions: this.getSuggestions(''),
+            highlighted: ''
         };
     }
     // endregion region Rendering methods
@@ -237,7 +366,7 @@ export class ReactAutosuggestMultipleTest extends React.Component<any, any> {
                 .bind(this)
         };
 
-        return <Autosuggest
+        return <LanguageAutosuggest
             multiSection={true}
             suggestions={suggestions}
             onSuggestionsFetchRequested={this
@@ -248,6 +377,10 @@ export class ReactAutosuggestMultipleTest extends React.Component<any, any> {
             renderSuggestion={this.renderSuggestion}
             renderSectionTitle={this.renderSectionTitle}
             getSectionSuggestions={this.getSectionSuggestions}
+            onSuggestionHighlighted={this.onSuggestionHighlighted}
+            highlightFirstSuggestion={true}
+            renderInputComponent={this.renderInputComponent}
+            renderSuggestionsContainer={this.renderSuggestionsContainer}
             inputProps={inputProps}/>;
     }
 
@@ -256,13 +389,30 @@ export class ReactAutosuggestMultipleTest extends React.Component<any, any> {
         alert(`Selected language is ${language.name} (${language.year}).`);
     }
 
-    protected renderSuggestion(suggestion: Language): JSX.Element {
-        return <span>{suggestion.name}</span>;
+    protected renderSuggestion(suggestion: Language, params: Autosuggest.RenderSuggestionParams): JSX.Element {
+        const className = params.isHighlighted ? "highlighted" : undefined;
+        return <span className={className}>{suggestion.name}</span>;
     }
 
     protected renderSectionTitle(section: LanguageGroup): JSX.Element {
         return <strong>{section.title}</strong>;
     }
+
+    protected renderInputComponent(inputProps: Autosuggest.InputProps<Language>): JSX.Element {
+        return (
+            <div>
+                <input {...inputProps} />
+            </div>
+        );
+    }
+
+    protected renderSuggestionsContainer({containerProps, children, query}: Autosuggest.RenderSuggestionsContainerParams): JSX.Element {
+        return (
+            <div {...containerProps}>
+                <span>{children}</span>
+            </div>
+        );
+    }
     // endregion region Event handlers
     protected onChange(event: React.FormEvent<any>, {newValue, method}: any): void {
         this.setState({value: newValue});
@@ -303,6 +453,12 @@ export class ReactAutosuggestMultipleTest extends React.Component<any, any> {
     protected getSectionSuggestions(section: LanguageGroup) {
         return section.languages;
     }
+
+    protected onSuggestionHighlighted(params: Autosuggest.SuggestionHighlightedParams): void {
+        this.setState({
+            highlighted: params.suggestion
+        });
+    }
     // endregion
 }
 
@@ -315,6 +471,8 @@ interface Person {
     twitter: string;
 }
 
+const PersonAutosuggest = Autosuggest as { new (): Autosuggest<Person> };
+
 export class ReactAutosuggestCustomTest extends React.Component<any, any> {
     // region Fields
     static people: Person[] = [
@@ -356,7 +514,7 @@ export class ReactAutosuggestCustomTest extends React.Component<any, any> {
                 .bind(this)
         };
 
-        return<Autosuggest
+        return<PersonAutosuggest
             suggestions={suggestions}
             onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
             getSuggestionValue={this.getSuggestionValue}
@@ -364,9 +522,9 @@ export class ReactAutosuggestCustomTest extends React.Component<any, any> {
             inputProps={inputProps}/>;
     }
 
-    protected renderSuggestion(suggestion: Person, {value, valueBeforeUpDown}: any): JSX.Element {
+    protected renderSuggestion(suggestion: Person, params: Autosuggest.RenderSuggestionParams): JSX.Element {
         const suggestionText = `${suggestion.first} ${suggestion.last}`;
-        const query = (valueBeforeUpDown || value).trim();
+        const query = params.query.trim();
         const parts = suggestionText
             .split(' ')
             .map((part: string) => {
diff --git a/types/react-autosuggest/tsconfig.json b/types/react-autosuggest/tsconfig.json
index b85bc369dc..fc78293096 100644
--- a/types/react-autosuggest/tsconfig.json
+++ b/types/react-autosuggest/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-autosuggest-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index d01c4ef81e..7bca09f9c3 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-beautiful-dnd 2.3
 // Project: https://github.com/atlassian/react-beautiful-dnd
 // Definitions by: varHarrie <https://github.com/varHarrie>
+//                 Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -73,9 +74,9 @@ export class Droppable extends React.Component<DroppableProps> {}
 export type DraggableStyle = any;
 
 export interface DragHandleProps {
-    onMouseDown(event: MouseEvent): void;
-    onKeyDown(event: KeyboardEvent): void;
-    onClick(event: MouseEvent): void;
+    onMouseDown: React.MouseEventHandler<any>;
+    onKeyDown: React.KeyboardEventHandler<any>;
+    onClick: React.MouseEventHandler<any>;
     tabIndex: number;
     'aria-grabbed': boolean;
     draggable: boolean;
@@ -98,6 +99,7 @@ export interface DraggableProps {
     draggableId: DroppableId;
     type?: TypeId;
     isDragDisabled?: boolean;
+    disableInteractiveElementBlocking?: boolean;
     children(provided: DraggableProvided, snapshot: DraggableStateSnapshot): React.ReactElement<any>;
 }
 
diff --git a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
index 3efc2529ce..8f961e0c7a 100644
--- a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
+++ b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
@@ -73,7 +73,7 @@ class App extends React.Component<{}, AppState> {
               style={getListStyle(snapshot.isDraggingOver)}
             >
               {this.state.items.map(item => (
-                <Draggable key={item.id} draggableId={item.id}>
+                <Draggable key={item.id} draggableId={item.id} disableInteractiveElementBlocking={true}>
                   {(provided, snapshot) => (
                     <div>
                       <div
diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 7fc53b0ea2..15b7ec2706 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -1,51 +1,179 @@
-// Type definitions for react-big-calendar 0.15.0
+// Type definitions for react-big-calendar 0.17.0
 // Project: https://github.com/intljusticemission/react-big-calendar
 // Definitions by: Piotr Witek <http://piotrwitek.github.io>
+//                 Austin Turner <https://github.com/paustint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 declare module 'react-big-calendar' {
     import * as React from 'react';
 
-    type stringOrDate = string | Date;
+    export type stringOrDate = string | Date;
+    export type View = 'month' | 'week' | 'work_week' | 'day' | 'agenda';
+    export type Navigate = 'PREV' | 'NEXT' | 'TODAY' | 'DATE';
+    export interface Format {
+      /**
+       * Format for the day of the month heading in the Month view.
+       * e.g. "01", "02", "03", etc
+       */
+      dateFormat?: string,
 
-    interface CalendarEvent {
-        title: string;
-        allDay: boolean;
-        start: Date;
-        end: Date;
-        desc: string;
+      /**
+       * A day of the week format for Week and Day headings,
+       * e.g. "Wed 01/04"
+       *
+       */
+      dayFormat?: string,
+
+      /**
+       * Week day name format for the Month week day headings,
+       * e.g: "Sun", "Mon", "Tue", etc
+       *
+       */
+      weekdayFormat?: string,
+
+      /**
+       * The timestamp cell formats in Week and Time views, e.g. "4:00 AM"
+       */
+      timeGutterFormat?: string,
+
+      /**
+       * Toolbar header format for the Month view, e.g "2015 April"
+       *
+       */
+      monthHeaderFormat?: string,
+
+      /**
+       * Toolbar header format for the Week views, e.g. "Mar 29 - Apr 04"
+       */
+      dayRangeHeaderFormat?: string,
+
+      /**
+       * Toolbar header format for the Day view, e.g. "Wednesday Apr 01"
+       */
+      dayHeaderFormat?: string,
+
+      /**
+       * Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"
+       */
+      agendaHeaderFormat?: string,
+
+      /**
+       * A time range format for selecting time slots, e.g "8:00am — 2:00pm"
+       */
+      selectRangeFormat?: string,
+
+      agendaDateFormat?: string,
+      agendaTimeFormat?: string,
+      agendaTimeRangeFormat?: string,
+
+      /**
+       * Time range displayed on events.
+       */
+      eventTimeRangeFormat?: string,
+
+      /**
+       * An optional event time range for events that continue onto another day
+       */
+      eventTimeRangeStartFormat?: string,
+
+      /**
+       * An optional event time range for events that continue from another day
+       */
+      eventTimeRangeEndFormat?: string,
+    }
+
+    export interface Components {
+        event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        eventWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        dayWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        dateCellWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        toolbar?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        agenda?: {
+          date?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+          time?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        },
+        day?: {
+          header?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        },
+        week?: {
+          header?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        },
+        month?: {
+          header?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+          dateHeader?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
+        },
+    }
+
+    export interface Messages {
+        allDay?: string;
+        previous?: string;
+        next?: string;
+        today?: string;
+        month?: string;
+        week?: string;
+        day?: string;
+        agenda?: string;
+        date?: string;
+        time?: string;
+        event?: string;
+        showMore?: string;
     }
 
     interface BigCalendarProps extends React.Props<BigCalendar> {
         date?: stringOrDate;
-        view?: string;
+        now?: Date;
+        view?: View;
         events?: Object[];
-        onNavigate?: Function;
-        onView?: Function;
-        onSelectSlot?: (slotInfo: { start: stringOrDate, end: stringOrDate, slots: Date[] | string[] }) => void;
-        onSelectEvent?: (event: CalendarEvent) => void;
-        onSelecting?: (slotInfo: { start: stringOrDate, end: stringOrDate }) => boolean;
-        views?: Object;
+        onNavigate?: (action: Navigate, newDate: Date) => void;
+        onView?: (view: View) => void;
+        onDrillDown?: (date: Date, view: View) => void;
+        onSelectSlot?: (slotInfo: { start: stringOrDate, end: stringOrDate, slots: Date[] | string[], action: 'select' | 'click' | 'doubleClick' }) => void;
+        onDoubleClickEvent?: (event: Object, e: React.SyntheticEvent<HTMLElement>) => void;
+        onSelectEvent?: (event: Object, e: React.SyntheticEvent<HTMLElement>) => void;
+        onSelecting?: (range: { start: stringOrDate, end: stringOrDate }) => boolean | undefined | null;
+        selected?: any;
+        views?: View[] | {
+            month: boolean | React.SFC | React.Component,
+            week: boolean | React.SFC | React.Component,
+            myweek: boolean | React.SFC | React.Component,
+        };
+        drilldownView?: View | null;
+        getDrilldownView?: ((targetDate: Date, currentViewName: View, configuredViewNames: View[]) => void) | null;
+        length?: number;
         toolbar?: boolean;
         popup?: boolean;
         popupOffset?: number | { x: number, y: number };
-        selectable?: boolean;
+        selectable?: boolean | 'ignoreEvents';
+        longPressThreshold?: number;
         step?: number;
+        timeslots?: number;
         rtl?: boolean;
-        eventPropGetter?: (event: Object, start: stringOrDate, end: stringOrDate, isSelected: boolean) => void;
-        titleAccessor?: string | ((row: Object) => string);
-        allDayAccessor?: string | ((row: Object) => boolean);
-        startAccessor?: string | ((row: Object) => Date);
-        endAccessor?: string | ((row: Object) => Date);
+        eventPropGetter?: (event: Object, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
+        slotPropGetter?: (date: Date) => { className?: string, style?: Object };
+        dayPropGetter?: (date: Date) => { className?: string, style?: Object };
+        showMultiDayTimes?: boolean;
         min?: stringOrDate;
         max?: stringOrDate;
-        scrollToTime?: stringOrDate;
-        formats?: Object;
-        components?: Object;
-        messages?: Object;
-        timeslots?: number;
-        defaultView?: string;
+        scrollToTime?: Date;
+        culture?: string;
+        formats?: Format;
+        components?: Components;
+        messages?: Messages;
+        titleAccessor?: string | ((event: any) => string);
+        allDayAccessor?: string | ((event: any) => boolean);
+        startAccessor?: string | ((event: any) => Date);
+        endAccessor?: string | ((event: any) => Date);
+        resourceAccessor?: string | ((event: any) => any);
+        resources?: any[];
+        resourceIdAccessor?: string | ((event: any) => any);
+        resourceTitleAccessor?: string | ((event: any) => string);
+        defaultView?: View;
+        defaultDate?: Date;
         className?: string;
         elementProps?: React.HTMLAttributes<HTMLElement>;
     }
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index 8afdc205e8..16ea44d859 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as ReactDOMServer from "react-dom/server";
-import BigCalendar from "react-big-calendar";
+import BigCalendar, { Navigate, View } from "react-big-calendar";
 
 // Don't want to add this as a dependency, because it is only used for tests.
 declare const moment: any;
@@ -29,7 +29,7 @@ class CalendarEvent {
 }
 
 // Basic Example Test
-const BasicExample = React.createClass({
+class BasicExample extends React.Component {
     render() {
         return (
             <BigCalendar
@@ -38,23 +38,23 @@ const BasicExample = React.createClass({
             />
         );
     }
-});
+}
 ReactDOM.render(<BasicExample />, document.body);
 const basicExampleHtml = ReactDOMServer.renderToString(<BasicExample />);
 console.log('Test Results -> BasicExample', basicExampleHtml);
 
 // Full API Example Test - based on API Documentation
 // http://intljusticemission.github.io/react-big-calendar/examples/index.html#api
-const FullAPIExample = React.createClass({
+class FullAPIExample extends React.Component<any, any> {
     render() {
         return (
             <BigCalendar
                 {...this.props}
                 date={new Date()}
-                view={'string'}
+                view={'day'}
                 events={getEvents()}
-                onNavigate={() => { } }
-                onView={() => { } }
+                onNavigate={(action: Navigate, newDate: Date) => { } }
+                onView={(view: View) => { } }
                 onSelectSlot={(slotInfo) => {
                     const start = slotInfo.start;
                     const end = slotInfo.end;
@@ -66,32 +66,40 @@ const FullAPIExample = React.createClass({
                     const end = slotInfo.end;
                     return true;
                 } }
-                views={{}}
+                views={['day']}
                 toolbar={true}
                 popup={true}
                 popupOffset={20}
                 selectable={true}
                 step={20}
                 rtl={true}
-                eventPropGetter={(event, start, end, isSelected) => { } }
+                eventPropGetter={(event, start, end, isSelected) => ({ className: 'some-class' }) }
                 titleAccessor={'title'}
-                allDayAccessor={(row:any) => !!row.allDay}
+                allDayAccessor={(event: any) => !!event.allDay}
                 startAccessor={'start'}
-                endAccessor={(row:any) => row.end || row.start}
+                endAccessor={(event: any) => event.end || event.start}
                 min={new Date()}
                 max={new Date()}
                 scrollToTime={new Date()}
                 formats={{}}
-                components={{}}
                 messages={{}}
                 timeslots={24}
                 defaultView={'month'}
                 className={'my-calendar'}
                 elementProps={{id: 'myCalendar'}}
+                components={{
+                    event: Event,
+                    agenda: {
+                        event: EventAgenda
+                    }
+                }}
+                dayPropGetter={customDayPropGetter}
+                slotPropGetter={customSlotPropGetter}
+                defaultDate={new Date()}
             />
         );
     }
-});
+}
 ReactDOM.render(<FullAPIExample />, document.body);
 const fullApiExampleHtml = ReactDOMServer.renderToString(<FullAPIExample />);
 console.log('Test Results -> FullAPIExample', fullApiExampleHtml);
@@ -114,3 +122,42 @@ function getEvents(): CalendarEvent[] {
     ];
     return events;
 };
+
+  class EventAgenda extends React.Component<any, any> {
+    render() {
+      // const { label } = this.props;
+      return (
+        <div>
+          <div>Calendar Events</div>
+        </div>
+      );
+    }
+  }
+
+  const customDayPropGetter = (date: Date) => {
+    if (date.getDate() === 7 || date.getDate() === 15)
+      return {
+        className: 'special-day',
+        style: {
+          border: 'solid 3px ' + (date.getDate() === 7 ? '#faa' : '#afa'),
+        },
+      }
+    else return {}
+  }
+
+  const customSlotPropGetter = (date: Date) => {
+    if (date.getDate() === 7 || date.getDate() === 15)
+      return {
+        className: 'special-day',
+      }
+    else return {}
+  }
+
+  function Event(event: any) {
+    return (
+      <span>
+        <strong>{event.title}</strong>
+        {event.desc && ':  ' + event.desc}
+      </span>
+    )
+  }
diff --git a/types/react-big-calendar/tslint.json b/types/react-big-calendar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-big-calendar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-bootstrap-daterangepicker/tslint.json b/types/react-bootstrap-daterangepicker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-bootstrap-daterangepicker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-bootstrap-table/index.d.ts b/types/react-bootstrap-table/index.d.ts
index 159470878a..d7618e4db0 100644
--- a/types/react-bootstrap-table/index.d.ts
+++ b/types/react-bootstrap-table/index.d.ts
@@ -1,107 +1,192 @@
-// Type definitions for react-bootstrap-table 2.6
+// Type definitions for react-bootstrap-table 4.3
 // Project: https://github.com/AllenFang/react-bootstrap-table
-// Definitions by: Frank Laub <https://github.com/flaub>, Aleksander Lode <https://github.com/alelode>, Josué Us <https://github.com/UJosue10>
+// Definitions by: Frank Laub <https://github.com/flaub>,
+//                 Aleksander Lode <https://github.com/alelode>,
+//                 Josué Us <https://github.com/UJosue10>
+//                 Janeene Beeforth <https://github.com/dawnmist>
+//                 Oscar Andersson <https://github.com/Ogglas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="node" />
-
 // documentation taken from http://allenfang.github.io/react-bootstrap-table/docs.html
 
-import { ComponentClass, Props, ReactElement } from 'react';
-import { EventEmitter } from 'events';
+import { Component, CSSProperties, Props, ReactElement, SyntheticEvent } from 'react';
+
+/**
+ * Table scroll position.
+ */
+export type ScrollPosition = 'Top' | 'Bottom';
+
+/**
+ * Row selection mode. Single selection = 'radio', multiple selection = 'checkbox'.
+ */
+export type SelectRowMode = 'none' | 'radio' | 'checkbox';
+
+/**
+ * Sort Order values. 'asc' = ascending, 'desc' = descending.
+ */
+export type SortOrder = 'asc' | 'desc';
+
+/**
+ * Type of selection for cell editing.
+ */
+export type CellEditClickMode = 'none' | 'click' | 'dbclick';
+
+/**
+ * Tell react-bootstrap-table how to trigger expanding by clicking on 'row' or 'column' level.
+ * If the value is 'column', by default all the columns are expandable. If you want to specify some columns as
+ * unexpandable, check expandable.
+ * Default is 'row'.
+ */
+export type ExpandBy = 'row' | 'column';
+
+/**
+ * Used to specify whether a dropdown button should use 'dropup' mode or 'dropdown' mode.
+ * Default is usually 'dropdown'.
+ */
+export type DropDirection = 'dropdown' | 'dropup';
+
+/**
+ * List of valid filter types.
+ * Note: ArrayFilter can only be used as part of the FilterData passed to the BootstrapTable.handleFilterData
+ * function. It is NOT valid for use when specifying a filter to the TableHeaderColumn filter properties.
+ */
+export type FilterType =
+	| 'TextFilter'
+	| 'RegexFilter'
+	| 'SelectFilter'
+	| 'NumberFilter'
+	| 'DateFilter'
+	| 'CustomFilter'
+	| 'ArrayFilter';
+
+/**
+ * Filter conditions that can be used with TextFilter/SelectFilter/RegexFilter filters.
+ */
+export type FilterCondition = 'eq' | 'like';
+
+/**
+ * Filter comparators used for NumberFilter/DateFilter filters
+ */
+export type FilterComparator = '=' | '<' | '<=' | '>' | '>=' | '!=';
+
+/**
+ * Element type to use for editing a particular column's cells.
+ */
+export type EditCellType = 'textarea' | 'select' | 'checkbox' | 'datetime';
+
+/**
+ * Position to show the Pagination Panel. Options are above the table ('top'), below the table ('bottom'), or both
+ * above and below the table ('both').
+ */
+export type PaginationPostion = 'top' | 'bottom' | 'both';
+
+/**
+ * Result type for validation when editing.
+ */
+export type EditValidatorType = 'success' | 'error';
+
+/**
+ * Used to specify the text alignment for a column.
+ */
+export type DataAlignType = 'left' | 'center' | 'right' | 'start' | 'end';
+
+/**
+ * Boostrap version number.
+ */
+export type BootstrapVersion = '3' | '4';
+
+/**
+ * CSV Field types supported.
+ */
+export type CSVFieldType = 'string' | 'number';
+
+/**
+ * Custom attributes for a column/cell/etc.
+ * Example: { 'data-attr': 'test' }
+ */
+export interface CustomAttrs {
+	[attrKey: string]: string | number | boolean;
+}
+
+/**
+ * Size per page list definition
+ */
+export type SizePerPageList = number[] | Array<{ text: string, value: number }>;
 
 /**
  * Interface spec for sepcifying functionality to handle remotely
  *
  * Consult [documentation](https://allenfang.github.io/react-bootstrap-table/docs.html#remote)
  * for more info
- *
- * @interface RemoteObjSpec
  */
 export interface RemoteObjSpec {
 	/**
 	 * If set, cell edits will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	cellEdit?: boolean;
 	/**
 	 * If set insertions will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	insertRow?: boolean;
 	/**
 	 * If set deletion will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	dropRow?: boolean;
 	/**
 	 * If set filters will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	filter?: boolean;
 	/**
 	 * If set search will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	search?: boolean;
 	/**
 	 * If set, exporting CSV will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	exportCSV?: boolean;
 	/**
 	 * If set sorting will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	sort?: boolean;
 	/**
 	 * If set pagination will be handled remotely
-	 *
-	 * @type {boolean}
-	 * @memberof RemoteObjSpec
 	 */
 	pagination?: boolean;
 }
 
 export interface BootstrapTableProps extends Props<BootstrapTable> {
 	/**
-	 * Set version='4' to use bootstrap@4, else bootstrap@3 is used.
+	 * Bootstrap version to use, values include '3' or '4'. Defaults to '3'.
 	 */
-    version?: string;
+	version?: BootstrapVersion;
 	/**
 	 * Use data to specify the data that you want to display on table.
 	 */
-	data: any[];
+	data: object[];
 	/**
-	 * If set, data is remote (use also fetchInfo)
+	 * Normally, react-bootstrap-table handles all the data sorting/filtering/pagination/etc itself internally.
+	 * If this is true, you need to handle all of those manually outside the table. By default it is false.
+	 * This is used mostly with an external/central data store, for example Redux or a database that returns
+	 * already filtered/sorted/paged data.
+	 *
+	 * If a function given, which means you can choose which functionality should be handled with remote or not.Currently,
+	 * we have following functionality you can control: sort, pagination, cellEdit, insertRow, dropRow, filter, search,
+	 * exportCSV.
 	 */
-	remote?: ((remobeObj: RemoteObjSpec) => RemoteObjSpec) | boolean; // Updated to support ^3.0.0
+	remote?: boolean | ((remobeObj: RemoteObjSpec) => RemoteObjSpec);
 	/**
 	 * Use keyField to tell table which column is unique. This is same as isKey in <TableHeaderColumn>
-	 * Tips: You need choose one configuration to set key field: keyField or isKey in <TableHeaderColumn>
+	 * Tips: react-bootstrap-table support data manipulation(CRUD) so that we need to fetch correct row by a unique column.
+	 *       You need choose one of configuration to set the key field: isKey or keyField in <BootstrapTable>.
 	 */
 	keyField?: string;
 	/**
-	 * Use height to set the height of table, default is 100%.
+	 * Use height to set the height of table, default is 100%. The string needs to have a unit, e.g. 'px', '%'.
 	 */
 	height?: string;
 	/**
-	 * Set the max column width (pixels)
+	 * Set the maximum height of table. You need give a string with an unit(px) value like height.
 	 */
 	maxHeight?: string;
 	/**
@@ -129,19 +214,19 @@ export interface BootstrapTableProps extends Props<BootstrapTable> {
 	 * If a string given, means the value will be presented as the row class.
 	 * If a function given, will pass rowData and rowIndex as params and should return string for presenting class. for examples:
 	 * @example
-	 * 		function trClassFormat(rowData,rowIndex){
-	 * 			return rowIndex%2==0?"tr-odd":"tr-even";  //return a class name.
-	 * 		}
+	 *    function trClassFormat(rowData,rowIndex) {
+	 *      return rowIndex % 2 == 0 ? "tr-odd" : "tr-even"; // return a class name.
+	 *    }
 	 */
 	trClassName?: string | ((rowData: any, rowIndex: number) => string);
 	/**
 	 * Enable row insertion by setting insertRow to true, default is false.
-	 * If you enable row insertion, there's a  button on the upper left side of table.
+	 * If you enable row insertion, there's a button on the upper left side of table.
 	 */
 	insertRow?: boolean;
 	/**
 	 * Enable row deletion by setting deleteRow to true, default is false.
-	 * If you enable row deletion, there's a  button on the upper left side of table.
+	 * If you enable row deletion, there's a button on the upper left side of table.
 	 */
 	deleteRow?: boolean;
 	/**
@@ -159,8 +244,8 @@ export interface BootstrapTableProps extends Props<BootstrapTable> {
 	 */
 	searchPlaceholder?: string;
 	/**
-	 * Enable strict search, default is false.
-	 * More info here: https://github.com/AllenFang/react-bootstrap-table/issues/1199
+	 * Strict search. Set this flag to apply search terms so that only rows that contain ALL terms are included in the
+	 * search results.
 	 */
 	strictSearch?: boolean;
 	/**
@@ -171,15 +256,101 @@ export interface BootstrapTableProps extends Props<BootstrapTable> {
 	multiColumnSearch?: boolean;
 	/**
 	 * Enable export csv function, default is false.
-	 * If you enable, there's a  button on the upper left side of table.
+	 * If you enable, there's a button on the upper left side of table.
 	 */
 	exportCSV?: boolean;
 	/**
 	 * Set CSV filename (e.g. items.csv). Default is spreadsheet.csv
 	 */
-	csvFileName?: () => string | string;
+	csvFileName?: string | (() => string);
 	/**
-	 * Enable row selection on table. selectRow accept an object which have the following properties
+	 * If true, it will hide the pagination if there is only one page, default is false.
+	 */
+	ignoreSinglePage?: boolean;
+	/**
+	 * Specify a fix position for the vertical bar if it exist. Available is a number or Top and Bottom
+	 */
+	scrollTop?: number | ScrollPosition;
+	/**
+	 * Add css styles to the react-bs-table-container class.
+	 * For example: containerStyle={ { background: '#00ff00' } }
+	 */
+	containerStyle?: CSSProperties;
+	/**
+	 * Add css styles to the react-bs-table class.
+	 */
+	tableStyle?: CSSProperties;
+	/**
+	 * Add css styles to the react-bs-container-header class.
+	 */
+	headerStyle?: CSSProperties;
+	/**
+	 * Add css styles to the react-bs-container-body class.
+	 */
+	bodyStyle?: CSSProperties;
+	/**
+	 * Add your own class names on the react-bs-table-container class
+	 */
+	containerClass?: string;
+	/**
+	 * Add your own class names on the react-bs-table class
+	 */
+	tableContainerClass?: string;
+	/**
+	 * Add your own class names on the react-bs-container-header class
+	 */
+	headerContainerClass?: string;
+	/**
+	 * Add your own class names on the react-bs-container-body class
+	 */
+	bodyContainerClass?: string;
+	/**
+	 * react-bootstrap-table separate two table element as header and body.
+	 * The tableHeaderClass is for the table element in the header
+	 */
+	tableHeaderClass?: string;
+	/**
+	 * react-bootstrap-table separate two table element as header and body.
+	 * The tableBodyClass is for the table element in the body
+	 */
+	tableBodyClass?: string;
+	/**
+	 * Tell react-bootstrap-table which rows are able to expand. This prop accepts
+	 * a callback function and is suppose to be return an Array of row keys.
+	 * expandableRow is always used with expandComponent, both of props are enable
+	 * the expand row functionality on table.
+	 */
+	expandableRow?(row: any): boolean;
+	/**
+	 * Tell react-bootstrap-table what's content should be rendered in the expanding
+	 * content. This props accept a callback function and is suppose to be return JSX
+	 * or String.
+	 * expandComponent is always used with expandableRow, both of props are enable
+	 * the expand row functionality on table.
+	 */
+	expandComponent?(row: any): string | ReactElement<any>;
+	/**
+	 * Assign some alternative options for expand row feature, expandColumnOptions
+	 * only have four available property currently.
+	 */
+	expandColumnOptions?: ExpandColumnOptions;
+	/**
+	 * Enable the multi sort on table and the number value is means max number of sorting column.
+	 */
+	multiColumnSort?: number;
+	/**
+	 * This prop will enable/disable the keyboard navigation cell by cell on table. This is new
+	 * feature from 3.0.0. Default is false. You can have a basic and simple keyboard navigation
+	 * feature on table by enabling keyBoardNav on BootstrapTable. For the usage of keyboard
+	 * navigation is you can click any cell to focus in or use ⬅ ⬆ ⬇ ➡ to natigate the cell.
+	 *
+	 * But if you want more advance features for keyboard navigation or to integrate with cell
+	 * editing, expand row or selection row, you may get interested to see how they work well
+	 * together: In the advance cases, you need to configure keyBoardNav as an object.
+	 */
+	keyBoardNav?: boolean | KeyboardNavigation;
+	/**
+	 * Enable row selection on table. SelectRow accept an object.
 	 */
 	selectRow?: SelectRow;
 	/**
@@ -190,51 +361,123 @@ export interface BootstrapTableProps extends Props<BootstrapTable> {
 	 * For some options setting on this component, you can set the options attribute and give an object which contain following properties
 	 */
 	options?: Options;
+	/**
+	 * Used to specify the total number of rows (matching current filter/sort/size per page) in a remote data source.
+	 * Documented in examples, but missing from the main docs. Essential for remote data pagination calculations.
+	 */
 	fetchInfo?: FetchInfo;
-	printable?: boolean;
-	tableStyle?: any;
-	containerStyle?: any;
-	headerStyle?: any;
-	bodyStyle?: any;
-	ignoreSinglePage?: boolean;
-	containerClass?: string;
-	tableContainerClass?: string;
-	headerContainerClass?: string;
-	bodyContainerClass?: string;
-	expandableRow?: (row: any) => boolean;
-	expandComponent?: (row: any) => any;
+	/**
+	 * Automatically collapses open rows when doing a sort/filter/search action if those options have been specified.
+	 * Is an object with three possible fields: sort, filter, search. Each field is a flag to specify whether that
+	 * action type should cause expanded rows to close. All three fields default to false.
+	 */
+	autoCollapse?: {
+		sort?: boolean;
+		filter?: boolean;
+		search?: boolean;
+	};
+	/**
+	 * Set a style to be used for the table rows. Example: https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/style/tr-style-table.js
+	 */
+	trStyle?: CSSProperties | ((rowData: any, rowIndex: number) => CSSProperties);
+	/**
+	 * Disable the automatic tabIndex for navigating between cells. This can be useful if you have a page with multiple
+	 * tables on the page, to stop the tab moving to another table. Default is false.
+	 */
+	withoutTabIndex?: boolean;
+	/**
+	 * Disable writing the header row when exporting to a CSV file.
+	 */
+	excludeCSVHeader?: boolean;
+	/**
+	 * Add a footer to the table.
+	 */
+	footer?: boolean;
+	/**
+	 * Data for the table footer. Format is an array of footer rows, each containing an array of column footer data.
+	 */
+	footerData?: FooterData[][];
+	/**
+	 * Table footer custom class
+	 */
+	tableFooterClass?: string;
+	/**
+	 * Render react-s-alert notifications
+	 */
+	renderAlert?: boolean;
 }
 
-export type SelectRowMode = 'none' | 'radio' | 'checkbox';
-
-export interface SelectRow {
+/**
+ * Footer Data for a column.
+ */
+export interface FooterData {
 	/**
-	 * For specifing the selection is single(radio) or multiple(checkbox).
+	 * Title to display for the column footer
+	 */
+	label: string;
+	/**
+	 * Index for the column that this footer belongs to
+	 */
+	columnIndex: number;
+	/**
+	 * Text alignment for the data in this footer.
+	 */
+	align?: DataAlignType;
+	/**
+	 * Formatting function for the data in this footer. Used to be able to do things like sum the contents of this
+	 * column in the table so that the footer can be used for totals, etc.
+	 *
+	 * The output value from the formatter function will be used instead of the label if the formatter function is
+	 * defined.
+	 */
+	formatter?(tableData: any[]): string | number | ReactElement<any>;
+}
+
+export interface SelectRow<TRow extends object = any> {
+	/**
+	 * Specify whether the selection column uses single(radio) or multiple(checkbox) selection modes. Required.
 	 */
 	mode: SelectRowMode;
 	/**
-	 * Click the row will trigger selection on that row if enable clickToSelect, default is false.
+	 * If true, clicking the row will trigger selection on that row, default is false.
 	 */
 	clickToSelect?: boolean;
 	/**
-	 * If true, click the row will trigger selection on that row and also trigger cell editing if you enabled cell edit. Default is false.
+	 * If true, clicking the row will trigger selection on that row and also trigger cell editing if you enabled cell edit. Default is false.
 	 */
 	clickToSelectAndEditCell?: boolean;
 	/**
-	 * You can assign the background color of row which be selected.
+	 * If true, clicking the row will trigger expanding the row. Default is false.
 	 */
-	bgColor?: string;
+	clickToExpand?: boolean;
 	/**
-	 * You can assign the class name of row which be selected.
+	 * You can assign the background color of row which be selected.
+	 * If your requirement is much complex, you can assign a function to bgColor that
+	 * returns a css color string.
 	 */
-	className?: string;
+	bgColor?: string | ((row: TRow, isSelect: boolean) => string);
+	/**
+	 * You can change the width of the selection column by columnWidth (include units).
+	 */
+	columnWidth?: string;
+	/**
+	 * You can assign the class name of selected rows. This can either be a string, or a function that takes two
+	 * arguments: row and isSelect.
+	 *   `row`: The current row data.
+	 *   `isSelect`: Flag indicating whether this particular row is selected.
+	 */
+	className?: string | ((row: TRow, isSelect: boolean) => string);
 	/**
 	 * Give an array data to perform which rows you want to be selected when table loading.
-	 * The content of array should be the rowkey which you want to be selected.
+	 * The content of array should be the rowkeys for the rows that you want to be selected.
 	 */
-	selected?: string[] | number[];
+	selected?: Array<number | string>;
 	/**
-	 * if true, the radio/checkbox column will be hide.
+	 * Provide a list of unselectable row keys.
+	 */
+	unselectable?: Array<number | string>;
+	/**
+	 * If true, the radio/checkbox column will be hidden.
 	 * You can enable this attribute if you enable clickToSelect and you don't want to show the selection column.
 	 */
 	hideSelectColumn?: boolean;
@@ -244,286 +487,656 @@ export interface SelectRow {
 	showOnlySelected?: boolean;
 	/**
 	 * Accept a custom callback function, if a row be selected or unselected, this function will be called.
-	 * This callback function taking three arguments row, isSelected and event:
-	 * 	`row`: is the row data which you wanted to select or unselect.
-	 * 	`isSelected`: it's a boolean value means "whether or not that row will be selected?".
-	 * 	`event`: The event target object.
-	 * If return value of this (function) is false, the select or deselect action will not be applied.
+	 * This callback function takes four arguments: row, isSelected, event, and rowIndex:
+	 *   `row`: is the row data which you wanted to select or unselect.
+	 *   `isSelected`: it's a boolean value means "whether or not that row will be selected?".
+	 *   `event`: The event target object.
+	 *   `rowIndex`: the index number for the row.
+	 * If the return value of this (function) is false, the select or deselect action will not be applied.
 	 */
-	onSelect?: (row: any, isSelected: boolean, event: any) => boolean;
+	onSelect?(row: TRow, isSelected: boolean, event: any, rowIndex: number): boolean | void;
 	/**
-	 * Accept a custom callback function, if click select all checkbox, this function will be called.
-	 * This callback function taking two arguments isSelected and currentSelectedAndDisplayData:
-	 * 	`isSelected`: it's a boolean value means "whether or not that row will be selected?".
-	 * 	`currentSelectedAndDisplayData`: If pagination enabled, this result is the data which in a page. In contrast, this is all data in table.
-	 * If return value of this function is false, the select all or deselect all action will not be applied.
+	 * Accept a custom callback function, if click select all checkbox, this function will be called. This callback
+	 * function taking two arguments: isSelected, rows.
+	 * isSelectedis a boolean value which means "whether or not that row will be selected?".
+	 * rows is the rows which be selected or unselected.
+	 *
+	 * Tips:
+	 * If the return value of this function is false, the select all or deselect all action will not be applied.
+	 * If return value of this function is an array of rowkeys, this array will be applied as selection row when
+	 * select all triggers. It's useful when you have a validation to filter some rows on selecting all.
 	 */
-	onSelectAll?: (isSelected: boolean, currentSelectedAndDisplayData: any) => boolean;
-
+	onSelectAll?(isSelected: boolean, rows: TRow[]): boolean | Array<number | string>;
 	/**
-	 * Provide a list of unselectable row keys.
+	 * Function that returns a component to customize the display of the selection checkbox or radio button with.
 	 */
-	unselectable?: number[];
+	customComponent?(props: CustomSelectProps): string | ReactElement<any>;
+	/**
+	 * Only unselect visible rows.
+	 */
+	onlyUnselectVisible?: boolean;
 }
 
-export type CellEditClickMode = 'none' | 'click' | 'dbclick';
-
-export interface CellEdit {
+/**
+ * react-bootstrap-table supports cell editing. When you enable this feature, react-bootstrap-table will make
+ * the target cell editable by either clicking or dbclicking (depending on the properties you set).
+ */
+export interface CellEdit<TRow extends object = any> {
 	/**
-	 * To spectify which condition will trigger cell editing.(click or dbclick)
+	 * Spectify which condition will trigger cell editing.(click or dbclick). Required.
 	 */
 	mode: CellEditClickMode;
 	/**
-	 * Enable blurToSave will trigger a saving event on cell when mouse blur on the input field. Default is false.
+	 * Enabling blurToSave will trigger a saving event on the cell when the input field becomes deselected. Default is false.
 	 * In the default condition, you need to press ENTER to save the cell.
 	 */
 	blurToSave?: boolean;
 	/**
-	 * Accept a custom callback function, before cell saving, this function will be called.
-	 * This callback function taking three arguments:row, cellName and cellValue
-	 * It's necessary to return a bool value which whether apply this cell editing.
+	 * Enabling blurToEscape will result in a cell edit being cancelled when the user clicks outside the table during
+	 * editing.
+	 * Default is false.
 	 */
-	beforeSaveCell?: (row: any, cellName: string, cellValue: any) => boolean;
+	blurToEscape?: boolean;
+	/**
+	 * nonEditableRows tell react-bootstrap-table which rows should not be edited on all of the columns. Briefly, its a row level limitation
+	 * Please assign a callback function, and this function is supposed to be return an array of row keys.
+	 */
+	nonEditableRows?(): Array<number | string>;
+	/**
+	 * Accept a custom callback function, before cell saving, this function will be called.
+	 * This callback function takes four arguments: row, cellName, cellValue and done.
+	 *   `row`: the row data to be saved.
+	 *   `cellName`: the column dataField cell name that has been modified.
+	 *   `cellValue`: the new cell value.
+	 *   `done`: a callback function to use if this is an async operation, to indicate if the save data is valid.
+	 *   `props`: an object containing the current cell's rowIndex and colIndex values.
+	 * If your validation is async, for example: you want to pop a confirm dialog for user to confim in this case,
+	 * react-bootstrap-table pass a callback function to you. You are supposed to call this callback function with a
+	 * bool value to perfom if it is valid or not in addition, you should return 1 from the main function to tell
+	 * react-bootstrap-table that this is a async operation.
+	 */
+	beforeSaveCell?<K extends keyof TRow>(
+		row: TRow,
+		cellName: K,
+		cellValue: TRow[K],
+		done: (isValid: boolean) => void,
+		props: { rowIndex: number; colIndex: number }
+	): boolean | 1;
 	/**
 	 * Accept a custom callback function, after cell saving, this function will be called.
-	 * This callback function taking three arguments:row, cellName and cellValue
+	 * This callback function takes three arguments: row, cellName and cellValue
+	 *   `row`: the row data that was saved.
+	 *   `cellName`: the column dataField cell name that has been modified.
+	 *   `cellValue`: the new cell value.
+	 *   `props`: an object containing the current cell's rowIndex and colIndex values.
 	 */
-	afterSaveCell?: (row: any, cellName: string, cellValue: any) => void;
+	afterSaveCell?<K extends keyof TRow>(
+		row: TRow,
+		cellName: K,
+		cellValue: TRow[K],
+		props: { rowIndex: number; colIndex: number }
+	): void;
 }
 
-export type SortOrder = 'asc' | 'desc';
-
-export interface Options {
+/**
+ * Main Options for the Bootstrap Table.
+ */
+export interface Options<TRow extends object = any> {
 	/**
-	 * Manage sort field by yourself
+	 * Provide the name of the column that should be sorted by.
+	 * If multi-column sort is active, this is an array of columns.
+	 * If there should be no active sort, both sortName and sortOrder should be undefined.
 	 */
-	sortName?: string;
+	sortName?: keyof TRow | Array<keyof TRow>;
 	/**
-	 * Manage sort order by yourself
+	 * Specify whether the sort should be ascending or descending.
+	 * If multi-column sort is active, this is an array of sortOrder items.
+	 * If there should be no active sort, both sortName and sortOrder should be undefined.
 	 */
-	sortOrder?: SortOrder;
+	sortOrder?: SortOrder | SortOrder[];
 	/**
-	 * Assign a default sort field.
+	 * Specify the default sort column.
+	 * Note: when using cleanSort(), this default sort column will be restored.
 	 */
-	defaultSortName?: string;
+	defaultSortName?: keyof TRow;
 	/**
-	 * Assign a default sort ordering.
+	 * Assign a default sort order.
+	 * Note: when using cleanSort(), this default sort order will be restored.
 	 */
 	defaultSortOrder?: SortOrder;
 	/**
-	 * False to disable sort indicator on header column, default is true.
+	 * Set to false to disable sort indicators on header columns, default is true.
 	 */
 	sortIndicator?: boolean;
 	/**
-	 * Change the displaying text on table if data is empty.
+	 * Assign a callback function which will be called after triggering sorting.
+	 * This function takes two argument: `sortName` and `sortOrder`.
+	 *   `sortName`: The sort column name, or array of column names if multi-column sort is active.
+	 *   `sortOrder`: The sort ordering, or array of ordering if multi-column sort is active.
+	 */
+	onSortChange?:
+		| ((sortName: keyof TRow, sortOrder: SortOrder) => void)
+		| ((sortName: ReadonlyArray<keyof TRow>, sortOrder: ReadonlyArray<SortOrder>) => void);
+	/**
+	 * Change the text displayed on the table if data is empty.
 	 */
 	noDataText?: string | ReactElement<any>;
+	/**
+	 * If true, this hides the noDataText on the table when the tableis empty. Default is false.
+	 */
+	withoutNoDataText?: boolean;
 	/**
 	 * A delay for trigger search after a keyup (millisecond)
 	 */
 	searchDelayTime?: number;
 	/**
-	 * A custom text on export csv button
-	 */
-	exportCSVText?: string;
-	/**
-	 * Default is false, if true means you want to ignore any editable configuration when row insert.
-	 */
-	ignoreEditable?: boolean;
-	/**
-	 * Only work on enable search. If true, there will be a button beside search input field for clear search field text.
+	 * Only work on enable search. If true, there will be a button beside the search input field
+	 * that will empty the field when clicked.
 	 */
 	clearSearch?: boolean;
 	/**
-	 * Assign a callback function which will be called after table update.
+	 * Set the default search condition.
 	 */
-	afterTableComplete?: Function;
+	defaultSearch?: string;
+	/**
+	 * Assign a callback function which will be called when search text changes. This function takes
+	 * three argument:
+	 *   `searchText`: the text from the search field.
+	 *   `colInfos`: Array of column settings (e.g. filterFormatted, etc).
+	 *   `multiColumnSearch`: True if multiple column search is enabled.
+	 * In most cases, you only need to use searchText. This function usually used for remote searching.
+	 */
+	onSearchChange?(searchText: string, colInfos: ReadonlyArray<ColumnDescription<TRow>>, multiColumnSearch: boolean): void;
+	/**
+	 * Assign a callback function which will be called after triggering searching.
+	 * This function takes two argument: search and result.
+	 *   `search`: The search text from the user.
+	 *   `result`: The results after searching (array of rows that matched the search).
+	 */
+	afterSearch?(search: string, result: ReadonlyArray<TRow>): void;
+	/**
+	 * Default is false, if true means you want to ignore any editable columns when creating the insert form.
+	 */
+	ignoreEditable?: boolean;
+	/**
+	 * Assign a callback function that will be called after table updates.
+	 */
+	afterTableComplete?(): void;
 	/**
 	 * Assign a callback function which will be called after row delete.
-	 * This function taking one argument: rowKeys, which means the row key you dropped.
+	 * This function takes two arguments:
+	 *   `rowKeys`: which means the row keys for the deleted rows
+	 *   `rows`: the array of row data that was deleted.
 	 */
-	afterDeleteRow?: (rowKeys: string[]) => void;
+	afterDeleteRow?(rowKeys: ReadonlyArray<number | string>, rows: ReadonlyArray<TRow>): void;
 	/**
-	 * Assign a callback function which will be called after row insert.
-	 * This function taking one argument: row, which means the whole row data you added.
+	 * Assign a callback function which will be called after inserting a row.
+	 * This function takes one argument: row, which means the whole row data you added.
 	 */
-	afterInsertRow?: (row: any) => void;
+	afterInsertRow?(row: TRow): void;
 	/**
-	 * Customize the text of previouse page button
+	 * Assign a callback function which will be called after triggering column filtering.
+	 * This function takes two arguments: filterConds and result.
+	 *   `filterConds`: It's an array object which contain all column filter conditions.
+	 *   `result`: The results after filtering.
+	 *
+	 * This function only work when you enable columnFilter on <BootstrapTable> or define
+	 * a filter on <TableHeaderColumn>.
 	 */
-	prePage?: string;
+	afterColumnFilter?(filterConds: ReadonlyArray<FilterData>, result: ReadonlyArray<TRow>): void;
 	/**
-	 * Customize the text of next page button
+	 * Assign a callback function which will be called when a row is added. This function
+	 * takes three arguments:
+	 *   `row`: which represents the new row data
+	 *   `colInfos`: Array of Column Descriptions for the table.
+	 *   `errorCallback`: Function to call to provide an async error message if the Add fails.
+	 * The function should either return a string immediately, or return false and then return a string through the
+	 * error callback function later.
 	 */
-	nextPage?: string;
+	onAddRow?(row: TRow, colInfo: ReadonlyArray<ColumnDescription<TRow>>, errorCallback: (message: string) => void): string | boolean;
 	/**
-	 * Customize the text of first page button
+	 * Assign a callback function which will be called when a filter condition changes.
+	 * This function takes one argument: filterObj which is an object which take dataField
+	 * as object key and the value is the filter condition.
 	 */
-	firstPage?: string;
+	onFilterChange?(filterObject: FilterData): void;
 	/**
-	 * Customize the text of last page button
+	 * Assign a callback function which will be called when the export csv button is clicked.
+	 * In this function, you need to return an array of rows to be exported.
 	 */
-	lastPage?: string;
+	onExportToCSV?(): TRow[];
+	/**
+	 * Assign a callback function which will be called when a row been deleted.
+	 * This function takes two arguments:
+	 *   `rowKeys`: keys for the rows to be deleted.
+	 *   `rows`: row data for the rows to be deleted.
+	 */
+	onDeleteRow?(rowKeys: ReadonlyArray<number | string>, rows: ReadonlyArray<TRow>): void;
+	/**
+	 * Assign a callback function which will be called after a row click.
+	 * This function takes four arguments:
+	 *   `row`: which is the row data that was clicked on.
+	 *   `columnIndex`: index of the column that was clicked on.
+	 *   `rowIndex`: index of the row that was clicked on.
+	 *   `event`: the click event.
+	 */
+	onRowClick?(row: TRow, columnIndex: number, rowIndex: number, event: React.MouseEvent<any>): void;
+	/**
+	 * Assign a callback function which will be called after a row double click.
+	 * This function takes two arguments:
+	 *   `row`: which is the row data that was double clicked on.
+	 *   `event`: the double click event.
+	 */
+	onRowDoubleClick?(row: TRow, event: React.MouseEvent<any>): void;
+	/**
+	 * Assign a callback function which will be called when mouse enters the table.
+	 */
+	onMouseEnter?(): void;
+	/**
+	 * Assign a callback function which will be called when mouse leaves the table.
+	 */
+	onMouseLeave?(): void;
+	/**
+	 * Assign a callback function which will be called when the mouse enters a row in table.
+	 * This function takes two arguments:
+	 *   `row`: the row data the mouse entered
+	 *   `e`: the mouse event data
+	 */
+	onRowMouseOver?(row: TRow, e: React.MouseEvent<any>): void;
+	/**
+	 * Assign a callback function which will be called when mouse leaves a row in table.
+	 * This function takes two arguments:
+	 *   `row`: the row data the mouse entered
+	 *   `e`: the mouse event data
+	 */
+	onRowMouseOut?(row: TRow, e: React.MouseEvent<any>): void;
+	/**
+	 * Assign a callback function which will be called when deleting a row.
+	 * It gives you a chance to customize your confirmation for row deletion.
+	 * This function takes two argument: next and rowKeys:
+	 *   `next`: If you confirm the delete, call next() to continue the process.
+	 *   `rowKeys` Is the row keys to be deleted, you can call the `next` function to apply this deletion.
+	 */
+	handleConfirmDeleteRow?(next: () => void, rowKeys: ReadonlyArray<number | string>): void;
+	/**
+	 * Customize the text of previouse page button.
+	 * If using the default pagination panel, this should be a string to use for the button label.
+	 * If creating a custom pagination panel, this is passed to the panel and can be of any type desired.
+	 */
+	prePage?: any;
+	/**
+	 * Customize the text of next page button.
+	 * If using the default pagination panel, this should be a string to use for the button label.
+	 * If creating a custom pagination panel, this is passed to the panel and can be of any type desired.
+	 */
+	nextPage?: any;
+	/**
+	 * Customize the text of first page button.
+	 * If using the default pagination panel, this should be a string to use for the button label.
+	 * If creating a custom pagination panel, this is passed to the panel and can be of any type desired.
+	 */
+	firstPage?: any;
+	/**
+	 * Customize the text of last page button.
+	 * If using the default pagination panel, this should be a string to use for the button label.
+	 * If creating a custom pagination panel, this is passed to the panel and can be of any type desired.
+	 */
+	lastPage?: any;
 	/**
 	 * Accept a number, which means the page you want to show as default.
 	 */
 	page?: number;
 	/**
 	 * You can change the dropdown list for size per page if you enable pagination.
+	 * Default is [10, 25, 30, 50].
 	 */
-	sizePerPageList?: number[];
+	sizePerPageList?: SizePerPageList;
 	/**
-	 * Means the size per page you want to locate as default.
+	 * Current chosen size per page.
 	 */
 	sizePerPage?: number;
 	/**
-	 * To define the pagination bar length, default is 5.
+	 * Number of page buttons to show on the pagination bar, default is 5.
+	 * i.e. previous 2 pages + current page + next two pages = 5.
 	 */
 	paginationSize?: number;
 	/**
-	 * To define where to start counting the pages.
+	 * Hide the dropdown list for size per page, default is false.
+	 */
+	hideSizePerPage?: boolean;
+	/**
+	 * Display a short text showing the total number of rows and current lines displayed,
+	 * default is false. If you want to customize this short text, you can give a function
+	 * and this function take three arguments:
+	 *  `start`: Current start index
+	 *  `to`: Current end index
+	 *  `total`: The total data volume.
+	 */
+	paginationShowsTotal?: boolean | ((start: number, to: number, total: number) => string | ReactElement<any>);
+	/**
+	 * Allows you to modify where to start counting the pages, e.g. to set the first page number to 0.
+	 * Default is 1.
 	 */
 	pageStartIndex?: number;
 	/**
 	 * Assign a callback function which will be called after page changed.
-	 * This function taking two argument: page and sizePerPage.
-	 * `page`: Current page.
-	 * `sizePerPage`: The data size which in one page.
+	 * This function takes two argument: page and sizePerPage.
+	 *   `page`: New page number
+	 *   `sizePerPage`: The number of rows to display in one page.
 	 */
-	onPageChange?: (page: number, sizePerPage: number) => void;
+	onPageChange?(page: number, sizePerPage: number): void;
 	/**
-	 * Assign a callback function which will be called after size per page dropdown changed.
-	 * This function taking one argument: sizePerPage.
-	 * `sizePerPage`: The data size which in one page.
+	 * Assign a callback function which will be called after the size per page (number of rows per page)
+	 * has been changed.
+	 * This function takes one argument: sizePerPage.
+	 *   `sizePerPage`: The new number of rows to display in one page.
 	 */
-	onSizePerPageList?: (sizePerPage: number) => void;
+	onSizePerPageList?(sizePerPage: number): void;
 	/**
-	 * Assign a callback function which will be called after trigger sorting.
-	 * This function taking two argument: `sortName` and `sortOrde`r.
-	 * 	`sortName`: The sort column name
-	 * 	`sortOrder`: The sort ordering.
+	 * Default is false. If true, the pagination list will be hidden when there is only one page.
 	 */
-	onSortChange?: (sortName: string, sortOrder: SortOrder) => void;
+	hidePageListOnlyOnePage?: boolean;
 	/**
-	 * Assign a callback function which will be called after trigger searching.
-	 * This function taking two argument: search and result.
-	 * `search`: The search text which user input.
-	 * `result`: The results after searching.
-	 */
-	afterSearch?: (search: string, result: any) => void;
-	/**
-	 * Assign a callback function which will be called after trigger column filtering.
-	 * This function taking two argument: filterConds and result.
-	 * `filterConds`: It's an array object which contain all column filter conditions.
-	 * `result`: The results after filtering.
-	 */
-	afterColumnFilter?: (filterConds: any[], result: any) => void;
-	/**
-	 * Assign a callback function which will be called after a row click.
-	 * This function taking one argument: row which is the row data which you click on.
-	 */
-	onRowClick?: (row: any) => void;
-	/**
-	 * Assign a callback function which will be called after a row double click.
-	 * This function taking one argument: row which is the row data which you double click on.
-	 */
-	onRowDoubleClick?: (row: any) => void;
-	/**
-	 * Background color on expanded rows.
+	 * Background color on expanded rows (css color value).
 	 */
 	expandRowBgColor?: string;
 	/**
-	 * Assign a callback function which will be called when mouse enter into the table.
+	 * Tell react-bootstrap-table how to trigger expanding by clicking on 'row' or 'column' level.
+	 * If the value is 'column', by default all the columns are expandable. If you want to specify some columns as
+	 * unexpandable, check expandable.
+	 * Default is 'row'.
 	 */
-	onMouseEnter?: Function;
+	expandBy?: ExpandBy;
 	/**
-	 * Assign a callback function which will be called when mouse leave from the table.
+	 * Customize the text on the insert button.
 	 */
-	onMouseLeave?: Function;
-	/**
-	 * Assign a callback function which will be called when mouse over a row in table.
-	 * This function taking one argument: row which is the row data which mouse over.
-	 */
-	onRowMouseOver?: Function;
-	/**
-	 * Assign a callback function which will be called when mouse leave from a row in table.
-	 * This function taking one argument: row which is the row data which mouse out.
-	 */
-	onRowMouseOut?: Function;
-
-	/**
-	 * Assign a callback function which will be called when row dropping.
-	 * It give you a chance to customize your confirmation for row deletion.
-	 * This function taking two argument: next and rowKeys:
-	 * `next`: If you confirm to drop row, call next() to continue the process
-	 * `rowKeys` is the row keys which been deleted, you can call next function to apply this deletion.
-	 */
-	handleConfirmDeleteRow?: (next: Function, rowKeys: any[]) => void;
-	paginationShowsTotal?: boolean | ReactElement<any>;
-	onSearchChange?: Function;
-	onAddRow?: Function;
-	onExportToCSV?: Function;
-
 	insertText?: string;
+	/**
+	 * Customize the text on the delete button.
+	 */
 	deleteText?: string;
+	/**
+	 * Customize the text on the save button in the insert modal.
+	 */
 	saveText?: string;
+	/**
+	 * Customize the text on the close button in the insert modal.
+	 */
 	closeText?: string;
-	// Customization properties
 	/**
-	 * Callback function to be called when a cell is modified
-	 *
-	 * https://allenfang.github.io/react-bootstrap-table/example.html#remote
-	 *
-	 * @memberof BootstrapTableProps
+	 * Customize the text on the export csv button
 	 */
-	onCellEdit?: (row: any, field: string, value: any) => any;
+	exportCSVText?: string;
 	/**
-	 * Callback function to be called when filter changing
-	 *
-	 * https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/remote/remote-store-filtering.js#L67
-	 *
-	 * @memberof BootstrapTableProps
+	 * You can do something before the toastr pop or even disable the toastr!!
+	 * Returning false or void will not trigger the toastr.
+	 * If you want the toastr popup, you should return true always.
+	 * Inputs match the EditValidatorObject.notification field types.
 	 */
-	onFilterChange?: (filterObj: any) => any;
+	beforeShowError?(type: EditValidatorType, msg: string, title: string): boolean | void;
 	/**
-	 * Callback function which will be called when a row will be deleted
-	 *
-	 * https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/remote/remote-store-delete-row.js#L27
-	 *
-	 * @memberof BootstrapTableProps
+	 * Default is true. If false, during printing the toolbar is hidden.
 	 */
-	onDeleteRow?: (rows: any) => any;
+	printToolBar?: boolean;
 	/**
-	 * A callback which will be called after page changed
-	 *
-	 * https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/remote/remote-store-paging.js#L30
-	 *
-	 * @memberof BootstrapTableProps
+	 * ToolBar is the area on the top of table, it contain the search panel, buttons for data manipulation.
+	 * After v3.0.0, you can custom all the components in the ToolBar also itself too.
+	 * Give a toolBar in options props and toolBar only accept a function and a JSX returned value is necessary.
 	 */
-	onpageChange?: (page: any, sizePerPage: number) => any;
+	toolBar?(props: ToolBarProps): ReactElement<any>;
+	/**
+	 * Button group which contain the insert, drop, show only select and export CSV buttons, these button all
+	 * grouped as btn-group class in bootstrap. This is a chance that you can custom this button group.
+	 * Give a btnGroup in options props and btnGroup only accept a function and a JSX returned value is necessary.
+	 * This lets you customize just the left-hand-side of the toolbar if desired.
+	 */
+	btnGroup?(props: ButtonGroupProps): ReactElement<any>;
+	/**
+	 * It's available to customize the insert button by configuring insertBtn in options props, insertBtn only
+	 * accept a function and a JSX returned value is necessary. This function will take one argument: onClick.
+	 *
+	 * The default `InsertButton` component is also exported as a component, so that you can use it as the base
+	 * for your custom component.
+	 */
+	insertBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	/**
+	 * It's available to customize delete button by configuring deleteBtn in options props, deleteBtn onl<y
+	 * accept a function and a JSX returned value is necessary. This function will take one argument: onClick.
+	 *
+	 * The default `DeleteButton` component is also exported as a component, so that you can use it as the base
+	 * for your custom component.
+	 */
+	deleteBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	/**
+	 * It's available to customize the export csv button by configuring exportCSVBtn in options props, exportCSVBtn only
+	 * accept a function and a JSX returned value is necessary. This function will take one argument: onClick.
+	 *
+	 * The default `ExportCSVButton` component is also exported as a component, so that you can use it as the base
+	 * for your custom component.
+	 */
+	exportCSVBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	/**
+	 * It's available to custom select only toggle button by configuring showSelectedOnlyBtn in options props.
+	 * showSelectedOnlyBtn only accept a function and a JSX returned value is necessary.
+	 * This function will take two argument: onClick and showSelected.
+	 *
+	 * The default `ShowSelectedOnlyButton` component is also exported as a component, so that you can use it as
+	 * the base for your custom component.
+	 */
+	showSelectedOnlyBtn?(onClick: (e: React.MouseEvent<any>) => void, showSelected: boolean): ReactElement<any>;
+	/**
+	 * You can custom the whole search panel(right side) by searchPanel in options props. searchPanel only accept
+	 * a function and a JSX returned value is necessary. This function will take one argument: props, that contains:
+	 *   `searchField`: the default search field component
+	 *   `clearBtn`: the default clear button component
+	 *   `defaultValue`: the default text for the search field
+	 *   `placeholder`: the default placeholder text for the search field
+	 *   `clearBtnClick`: the callback function to use when the clear search button is clicked
+	 *   `search`: the callback function for triggering the search, which takes the search text as an input.
+	 */
+	searchPanel?(props: SearchPanelProps): ReactElement<any>;
+	/**
+	 * You can custom the search input field only by searchField in options props. searchField only accept a
+	 * function and a JSX returned value is necessary.
+	 *
+	 * The default `SearchField` component is also exported as a component, so that you can use it as the base for
+	 * your custom component.
+	 */
+	searchField?(props: SearchFieldProps): ReactElement<Component<any> & SearchFieldInterface>;
+	/**
+	 * You can custom the clear button for search field by giving clearSearchBtn in options props.
+	 * clearSearchBtn only accept a function and a JSX returned value is necessary.
+	 *
+	 * The default `ClearSearchButton` component is also exported as a component, so that you can use it as the
+	 * base for your own custom component.
+	 */
+	clearSearchBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	/**
+	 * You can customize everything in the insert modal via options.insertModal and we give you the event
+	 * callback, props and some informations: onModalClose, onSave, columns, validateState, ignoreEditable
+	 * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/insert-modal/custom-insert-modal.js
+	 */
+	insertModal?(
+		onModalClose: () => void,
+		onSave: (row: TRow) => void,
+		columns: ReadonlyArray<InsertModalColumnDescription<TRow>>,
+		validateState: { [dataField: string]: string },
+		ignoreEditable: boolean
+	): ReactElement<any>;
+	/**
+	 * You can customize the body of the insert modal via options.insertModalBody and we give you the following
+	 * arguments: columns, validateState {[fieldname]: errorMsg}, ignoreEditable
+	 *
+	 * Note: There is no exported Insert Modal Body component - if you are customising this, you need to create your
+	 * own body component. That component needs to implement a `getFieldValue` method that returns the new row data. It
+	 * will be called by react-bootstrap-table when the save button is clicked in the insert modal window.
+	 */
+	insertModalBody?(
+		columns: ReadonlyArray<InsertModalColumnDescription<TRow>>,
+		validateState: { [dataField: string]: string },
+		ignoreEditable: boolean
+	): React.ReactElement<React.Component<any> & ModalBodyInterface<TRow>>;
+	/**
+	 * It's available to custom the header of insert modal by configuring options.insertModalHeader. It only accepts
+	 * a function and a JSX returned value is necessary. This function will take two arguments: closeModal and save.
+	 *   `closeModal`: callback function to trigger closing the modal window.
+	 *   `save`: callback function to trigger saving the new row data.
+	 *
+	 * The default `InsertModalHeader` component is also exported as a component, so that you can use it as the base
+	 * for your own custom component.
+	 */
+	insertModalHeader?(closeModal: () => void, save: () => void): ReactElement<any>;
+	/**
+	 * It's available to custom the footer of insert modal by configuring options.insertModalFooter. It only accepts
+	 * a function and a JSX returned value is necessary. This function will take two arguments: closeModal and save.
+	 *   `closeModal`: callback function to trigger closing the modal window.
+	 *   `save`: callback function to trigger saving the new row data.
+	 *
+	 * The default `InsertModalFooter` component is also exported as a component, so that you can use it as the base
+	 * for your own custom component.
+	 */
+	insertModalFooter?(closeModal: () => void, save: () => void): ReactElement<any>;
+	/**
+	 * Function to customize all of components for pagination, including the sizePerPage dropdown and the
+	 * pagination list.
+	 */
+	paginationPanel?(props: PaginationPanelProps): ReactElement<any>;
+	/**
+	 * Function to customize the sizePerPage dropdown.
+	 */
+	sizePerPageDropDown?(props: SizePerPageFunctionProps): ReactElement<any>;
+	/**
+	 * Location for the pagination panel to be displayed. Options are 'top' (above the table), 'bottom'
+	 * (below the table) and 'both' (above and below the table).
+	 */
+	paginationPosition?: PaginationPostion;
+	/**
+	 * Callback when the value in a cell has been modified. It accepts a function that takes three arguments:
+	 *   `row`: row that is being edited.
+	 *   `fieldName`: column dataField for the cell being edited.
+	 *   `value`: new value for the cell.
+	 * The function allows you to make further modifications to the cell value prior to it being saved. You need to
+	 * return the final cell value to use.
+	 */
+	onCellEdit?<K extends keyof TRow>(row: TRow, fieldName: K, value: TRow[K]): TRow[K];
+	/**
+	 * Custom message to show when the InsertModal save fails validation.
+	 * Default message is 'Form validate errors, please checking!'
+	 */
+	insertFailIndicator?: string;
+	/**
+	 * Function to verify that a key being generated in the Insert Modal is a valid key.
+	 * If the key fails validation, return a string error message.
+	 * If the key is ok, return void.
+	 */
+	isValidKey?(key: number | string): string | void;
+	/**
+	 * Ability to disable the BOM in the exported CSV file.
+	 * BOM = prepend BOM for UTF-8 XML and text/* types(including HTML) when saving the file.
+	 */
+	noAutoBOM?: boolean;
+	/**
+	 * Custom class to use for the expanded content section of an expanded row. This can either be a string, or a
+	 * function that returns a string and takes three arguments: row, rowIndex, isExpanding.
+	 *   `row`: the row expanding/collapsing.
+	 *   `rowIndex`: index number of the row.
+	 *   `isExpanding`: boolean flag specifying whether the field is expanding or collapsing.
+	 */
+	expandBodyClass?: string | ((row: TRow, rowIndex: number, isExpanding: boolean) => string);
+	/**
+	 * Custom class to use for the row itself for an expanded row when it has been expanded. This can either be a
+	 * string, or a function that returns a string and takes two arguments: row and rowIndex.
+	 *   `row`: the expanded row.
+	 *   `rowIndex`: index number of the row.
+	 */
+	expandParentClass?: string | ((row: TRow, rowIndex: number) => string);
+	/**
+	 * Customize the field separator in a CSV export file. Default is ','.
+	 */
+	exportCSVSeparator?: string;
+	/**
+	 * Set a function to be called when expanding or collapsing a row. This function takes three arguments:
+	 *   `rowKey`: dataField key for the row that is expanding or collapsing.
+	 *   `isExpand`: True if the row is expanding, false if it is collapsing.
+	 *   `event`: The click event.
+	 */
+	onExpand?(rowKey: number | string, isExpand: boolean, event: React.MouseEvent<any>): void;
+	/**
+	 * Specify that only one row should be able to be expanded at the same time.
+	 */
+	onlyOneExpanding?: boolean;
+	/**
+	 * Customize the tooltip text shown when hovering over the prePage button.
+	 */
+	prePageTitle?: string;
+	/**
+	 * Customize the tooltip text shown when hovering over the nextPage button.
+	 */
+	nextPageTitle?: string;
+	/**
+	 * Customize the tooltip text shown when hovering over the firstPage button.
+	 */
+	firstPageTitle?: string;
+	/**
+	 * Customize the tooltip text shown when hovering over the lastPage button.
+	 */
+	lastPageTitle?: string;
+	/**
+	 * Provide an array of expanded rows for the table.
+	 */
+	expanding?: Array<number | string>;
+	/**
+	 * Flag to indicate that the table should keep the SizePerPage dropdown open if the table rerenders without any
+	 * user interaction.
+	 */
+	keepSizePerPageState?: boolean;
+	/**
+	 * Flag to indicate that the table should always show next/previous buttons even when there is not next/previous
+	 * page.
+	 */
+	alwaysShowAllBtns?: boolean;
+	/**
+	 * Flag to indicate whether there should be buttons for First and Last page.
+	 */
+	withFirstAndLast?: boolean;
 }
 
-interface FetchInfo {
-	dataTotalSize?: number;
+/**
+ * Properties for data where only a portion of the data is loaded into the table at one time (i.e. remote data).
+ */
+export interface FetchInfo {
+	/**
+	 * Total number of rows that match the current table filter/search properties.
+	 */
+	dataTotalSize: number;
 }
 
-export interface BootstrapTable extends ComponentClass<BootstrapTableProps> {
+/**
+ * BootstrapTable class definition.
+ */
+export class BootstrapTable extends Component<BootstrapTableProps> {
 	/**
-	 * Call this function to insert an new row to table.
+	 * Call this function to insert a new row to table.
 	 */
 	handleAddRow(row: any): void;
 	/**
-	 * Call this function to insert an new row as first row on table.
+	 * Call this function to insert a new row as the first row in the table.
 	 */
 	handleAddRowAtBegin(row: any): void;
 	/**
-	 * Call this function to drop rows in table.
+	 * Call this function to drop/delete rows from the table.
 	 */
-	handleDropRow(rowKeys: any[]): void;
+	handleDropRow(rowKeys: Array<number | string>): void;
 	/**
 	 * Call this function to do column filtering on table.
+	 * @example:
+	 *  // Filtering passing an array of values
+	 *  this.refs.table.handleFilterData({
+	 *      name: { type: 'ArrayFilter', value: ['Item name 3', 'Item name 4'] },
+	 *      price: { type: 'ArrayFilter', value: [2100, 2104] }
+	 *  });
 	 */
-	handleFilterData(filter: any): void;
+	handleFilterData(filter: FilterData): void;
 	/**
 	 * Call this function with search text for fully searching.
 	 */
@@ -531,104 +1144,181 @@ export interface BootstrapTable extends ComponentClass<BootstrapTableProps> {
 	/**
 	 * Call this function to sort table.
 	 */
-	handleSort(order: SortOrder, field: string): void;
+	handleSort(order: SortOrder, dataField: string): void;
 	/**
 	 * Call this function to get the page by a rowkey
 	 */
-	getPageByRowKey(rowKey: string): any;
+	getPageByRowKey(rowKey: number | string): number;
 	/**
 	 * Call this function to export table as csv.
 	 */
 	handleExportCSV(): void;
 	/**
-	 * Clean all the selection state on table.
+	 * Reset the sort options to the defaults. Documented in examples but missing from main options list.
+	 * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/sort/clean-sorted-table.js
+	 */
+	cleanSort(): void;
+	/**
+	 * Deselect all rows in the table.
 	 */
 	cleanSelected(): void;
+	/**
+	 * Call reset to clean all the status on the table currently (sort, editing, filtering, search).
+	 */
+	reset(): void;
 }
-interface BootstrapTable extends ComponentClass<BootstrapTableProps> { }
-declare const BootstrapTable: BootstrapTable;
-export type DataAlignType = 'left' | 'center' | 'right' | 'start' | 'end';
 
 export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
 	/**
-	 * The field of data you want to show on column.
+	 * The field of data you want to show on column. This is used throughout react-bootstrap-table as the column field
+	 * name.
 	 */
 	dataField?: string;
 	/**
-	 * Use isKey to tell table which column is unique. This is same as keyField in <BootstrapTable>
-	 * Tips: You need choose one configuration to set key field: isKey or keyField in <BootstrapTable>
+	 * Use isKey to tell table which column is unique. This is same as the keyField in <BootstrapTable>
+	 * Tips: You need choose one configuration to set key field: isKey or the keyField in <BootstrapTable>
 	 */
 	isKey?: boolean;
 	/**
-	 * Set the column width. ex: 150, it's means 150px
+	 * Set the column width, including the units. e.g. '10%' or '150px'
 	 */
 	width?: string;
 	/**
-	 * Set align in column, value is left, center, right, start and end.
+	 * Set the text alignment in the column, possible values are 'left', 'center', 'right', 'start' and 'end'.
 	 */
 	dataAlign?: DataAlignType;
-
 	/**
 	 * Alignment of text in the column header.
+	 * Tip: If you don't set the headerAlign, it will default to the setting for dataAlign.
 	 */
 	headerAlign?: DataAlignType;
 	/**
-	 * True to enable table sorting. Default is disabled.
+	 * True to enable table sorting on this column. Default is disabled.
 	 */
 	dataSort?: boolean;
-	/**
-	 * Default search string.
-	 */
-	defaultSearch?: string;
 	/**
 	 * Allow user to render a custom sort caret. You should give a function and should return a JSX.
-	 * This function taking one arguments: order which present the sort order currently.
+	 * This function takes two arguments: order and fieldName.
+	 *   `direction`: the current sort order.
+	 *   `fieldName`: the dataField name of the field currently being sorted.
 	 */
-	caretRender?: Function;
-	/**
-	 * Give an Object like following to able to customize your own editing component.
-	 * This Object should contain these two property:
-	 * 		getElement(REQUIRED): Accept a callback function and take two arguments: onUpdate and props.
-	 * 		customEditorParameters: Another extra data for custom cell edit component.
-	 */
-	customEditor?: { getElement: (onUpdate: any, props: any) => ReactElement<any>, customEditorParameters?: object };
+	caretRender?(direction: SortOrder | null, fieldName: string): string | ReactElement<any>;
 	/**
 	 * To customize the column. This callback function should return a String or a React Component.
-	 * In addition, this function taking two argument: cell and row.
+	 * In addition, this function taking four argument: cell, row, formatExtraData, rowIdx.
+	 * The formatExtraData will be the value which you assign it on <TableHeaderColumn>
 	 */
-	dataFormat?: (cell: any, row: any, formatExtraData?: any) => string | ReactElement<any>;
+	dataFormat?(cell: any, row: any, formatExtraData: any, rowIndex: number): string | ReactElement<any>;
 	/**
-	 * To to enable search or filter data on formatting. Default is false
+	 * It's useful with dataFormat, you can give any data you want to be passed to the formatter.
+	 */
+	formatExtraData?: any;
+	/**
+	 * Allow you to add your custom attributes on TD element.
+	 * Example: tdAttr={ { 'data-attr': 'test' } }
+	 */
+	tdAttr?: CustomAttrs;
+	/**
+	 * Allow you to add your custom style object on TD element. Accepts either a CSS Properties object, or
+	 * a function that takes 4 arguments and returns a CSS Properties object. These arguments are:
+	 *   `cell`: The current cell value
+	 *   `row`: The current row data
+	 *   `rowIndex`: Index number for the current row data in the input data array.
+	 *   `columnIndex`: Index number for the current column that the cell is in.
+	 */
+	tdStyle?: CSSProperties | ((cell: any, row: any, rowIndex: number, columnIndex: number) => CSSProperties);
+	/**
+	 * Allow you to add your custom style object on TH element.
+	 */
+	thStyle?: CSSProperties;
+	/**
+	 * When true, the column will filter using the value returned by the column's formatter.
+	 * When false (default), the column will filter using the pre-formatted value.
 	 */
 	filterFormatted?: boolean;
 	/**
-	 * True to hide column.
+	 * Return the value you want to be filtered on that column.
+	 * It's useful if your column data is an object.
+	 * @example: (cell, row) => cell.fieldOne;
+	 * @see: https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/manipulation/search-format-table.js
+	 */
+	filterValue?(cell: any, row: any): any;
+	/**
+	 * Customize the cell content when exporting to a CSV file. This function takes two argument: cell, row.
+	 */
+	csvFormat?(cell: any, row: any): string;
+	/**
+	 * Customize the column header text for the column when exporting to a CSV file.
+	 */
+	csvHeader?: string;
+	/**
+	 * It's usually used with csvFormat, and it's same as formatExtraData.
+	 * You can give any additional data you want to be passed to the csvFormat function.
+	 */
+	csvFormatExtraData?: any;
+	/**
+	 * Set to true to hide the column. Default is false. Often used to hide rowKey columns that are required to
+	 * identify a row but that do not need to be visible.
 	 */
 	hidden?: boolean;
 	/**
-	 * True to hide from insert dialog
+	 * Used to specify whether a column will be exported to csv.
+	 *
+	 * If true, the column will be included in the export. This is usually used with hidden columns, as those are not
+	 * exported by default.
+	 *
+	 * If false, the column will be excluded from the csv export.
+	 */
+	export?: boolean;
+	/**
+	 * Usually used with Options.expandBy.
+	 * You can assign which columns will trigger a row expansion or not.
+	 * If false, clicking on a row inside this column will not cause the row to expand.
+	 */
+	expandable?: boolean;
+	/**
+	 * Set this to true to hide this column on insert modal. Default is false.
+	 *
+	 * This is often used together with autoValue for auto-generated columns like row keys.
 	 */
 	hiddenOnInsert?: boolean;
 	/**
-	 * True to hide the dropdown for sizePerPage.
+	 * It only work for enabling insertRow and be assign on rowKey column. If true, the value of rowkey will be
+	 * generated automatically after a row insertion. If a function given, you can customize the value by yourself and
+	 * remember to return the value for the cell from the function.
 	 */
-	hideSizePerPage?: boolean;
+	autovalue?: boolean | (() => any);
 	/**
 	 * False to disable search functionality on column, default is true.
 	 */
 	searchable?: boolean;
 	/**
-	 * Give a customize function for data sorting.
-	 * This function taking four arguments: a, b, order, sortField, extraData
+	 * Show the title on each column in the data section of the table.
+	 * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column/column-title-table.js
 	 */
-	sortFunc?: (a: any, b: any, order: SortOrder, sortField: any, extraData: any) => number;
+	columnTitle?: boolean | string | ((cell: any, row: any, rowIndex: number, colIndex: number) => string);
 	/**
-	 * It's a extra data for custom sort function, if defined, this data will be pass as fifth argument in sortFunc.
+	 * Show the title on each column in the header section of the table, default is true.
+	 */
+	headerTitle?: boolean;
+	/**
+	 * If the children of TableHeaderColumn is a JSX or Object, we prefer to add this prop to describe this column with
+	 * a pure text(String). It will be used on the placeholder or tips in the filter, search field or insert field etc.
+	 */
+	headerText?: string;
+	/**
+	 * Give a custom callback function for data sorting.
+	 * This function takes five arguments: a, b, order, sortField, extraData
+	 * The extraData value is the data from the sortFuncExtraData.
+	 */
+	sortFunc?(a: object, b: object, order: SortOrder, sortField: keyof object, extraData: any): number;
+	/**
+	 * Extra data for the custom sort function. If defined, this data will be passed as fifth argument in sortFunc.
 	 */
 	sortFuncExtraData?: any;
 	/**
 	 * Add custom css class on table header column, this attribute only accept String or Function.
-	 * If Function, it taking four arguments: cell, row, rowIndex, columnIndex.
+	 * If Function, it takes four arguments: cell, row, rowIndex, columnIndex.
 	 * In addition, this function should return a String which is the class name you want to add on.
 	 */
 	className?: string | ((cell: any, row: any, rowIndex: number, columnIndex: number) => string);
@@ -637,156 +1327,1338 @@ export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
 	 * If Function, it taking four arguments: cell, row, rowIndex, columnIndex.
 	 * In addition, this function should return a String which is the class name you want to add on.
 	 */
-	columnClassName?: String | ((cell: any, row: any, rowIndex: number, columnIndex: number) => string);
+	columnClassName?: string | ((cell: any, row: any, rowIndex: number, columnIndex: number) => string);
 	/**
-	 * Add True to set column editable, false is non-editable. If give Object,
-	 * you can do more customization when editing cell. This object have following properties:
-	 * @example
-	 * {
-	 * 	type: //edit type, avaiable value is textarea, select, checkbox
-	 * 	validator: //give function for validation and taking only one "cell value" as argument. This function should return Bool.
-	 * 	options:{
-	 * 		values: //values means data in select or checkbox.If checkbox, use ':'(colon) to separate value, ex: Y:N
-	 * 	}
-	 * }
+	 * Add custom css class on editing cell, if assign a callback function, you are supposed to return a String for class name
 	 */
-	editable?: boolean | Editable;
+	editColumnClassName?: string | ((cell: any, row: any) => string);
 	/**
-	 * It only work when you enable insertRow and be assign on rowKey column.
-	 * If true, the row key will be generated automatically after a row insertion.
+	 * Add custom css class for invalid editing cell, if assign a callback function, you are supposed to return a String for class name
 	 */
-	autoValue?: boolean;
+	invalidEditColumnClassName?: string | ((cell: any, row: any) => string);
+	/**
+	 * boolean: Add True to set column editable, false is non-editable.
+	 * function: You have ability to control the editable level on cell instead of column level. For this
+	 * callback function, you are supposed to be return a bool value to decide this cell editable or not
+	 * This callback accepts four arguments: cell, row, rowIndex, columnIndex.
+	 * object: @see Editable interface.
+	 */
+	editable?: boolean | Editable<any, any> | ((cell: any, row: any, rowIndex: number, columnIndex: number) => boolean | string | EditValidatorObject);
+	/**
+	 * Give an Object like following to able to customize your own editing component.
+	 * This Object should contain these two property:
+	 *   getElement(REQUIRED): Accept a callback function and take two arguments: onUpdate and props.
+	 *   customEditorParameters: Additional data for custom cell edit component.
+	 */
+	customEditor?: CustomEditor<any, any>;
 	/**
 	 * To Enable a column filter within header column.
-	 * This feature support a lots of filter type and condition. Please check example
-	 * Following is the format for filter
+	 * This feature support a lots of filter types and conditions.
 	 */
 	filter?: Filter;
-
-	onSort?: Function;
-
 	/**
-	 * Header for column in generated CSV file
-	 */
-	csvHeader?: string;
-	csvFormat?: Function;
-	columnTitle?: boolean;
-	sort?: SortOrder;
-	formatExtraData?: any;
-
-	/**
-	 * Row in the header on which this header column present.
+	 * This is always used together with rowSpan and colSpan, to create multi-row/multi-column headers.
+	 * Row is the header row on which this header column present.
 	 */
 	row?: number;
-
 	/**
 	 * Indicates how many rows this column takes.
 	 * Default: 1
 	 */
 	rowSpan?: number;
-
 	/**
 	 * Indicates how many columns this column takes.
 	 * Default: 1
 	 */
 	colSpan?: number;
-
 	/**
-	 * Return the value you want to be filtered on that column.
-	 * It's useful if your column data is an object.
+	 * Specify the field type to use when exporting this column to CSV. Available types are 'number' and 'string'.
+	 * Defaults to 'string'.
 	 */
-	filterValue?: Function;
-
+	csvFieldType?: CSVFieldType;
 	/**
-	 * Allow you to add your custom attributes on TD element.
+	 * Set the column class name for the actively filtered column. Can be either a string, or a function that takes two
+	 * parameters: order and dataField.
+	 *   `order`: current sort order for the column.
+	 *   `dataField`: current column's dataField.
+	 * This allows you to specify a different className depending on whether the current dataField is being sorted 'asc'
+	 * or 'desc'.
+	 * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/sort/sort-style-table.js#L36-L37
 	 */
-	tdAttr?: object;
-
+	sortHeaderColumnClassName?: string | ((order: SortOrder, dataField: string) => string);
 	/**
-	 * Allow you to add your custom style object on TD element.
+	 * Specify custom tdAttrs to use for a cell that is being edited within this column.
 	 */
-	tdStyle?: object;
-
+	editTdAttr?: CustomAttrs;
 	/**
-	 * Allow you to add your custom style object on TH element.
+	 * Custom insert editor element. This is a function to generate a custom edit element to display in the InsertModal
+	 * form. The function takes five arguments: column, attr, editorClass, ignoreEditable, defaultValue.
+	 *   `column`: column information given to the insert modal.
+	 *   `attr`: EditableAttrs from the TableHeader.editable object options.
+	 *   `editorClass`: className to apply to the editor component.
+	 *   `ignoreEditable`: boolean flag indicating whether editable fields should be ignored in the insert modal
+	 *   `defaultValue`: the default value to use for this cell.
+	 * The function should return either a JSX element for the field, or false to default back to the standard edit
+	 * element.
 	 */
-	thStyle?: object;
+	customInsertEditor?: {
+		getElement(
+			column: InsertModalColumnDescription,
+			attr: EditableAttrs,
+			editorClass: string,
+			ignoreEditable: boolean,
+			defaultValue: any
+		): ReactElement<any> | boolean;
+	};
+	/**
+	 * Support specifying that the column should start sorting with the 'asc' option.
+	 */
+	defaultASC?: boolean;
 }
-export interface Editable {
-	type?: string; // edit type, avaiable value is textarea, select, checkbox
-	/**
-	 * Function for validation and taking only one "cell value" as argument. This function should return Bool.
-	 */
-	validator?: (cell: any) => boolean;
-	/**
-	 * @example
-	 * {
-	 * 	 values: //values means data in select or checkbox. If checkbox, use ':'(colon) to separate value, ex: Y:N
-	 * }
-	 */
-	options?: any;
 
+/**
+ * Editable Attributes. Poorly documented, but used when creating custom editor components.
+ */
+export interface EditableAttrs {
 	/**
-	 * Configuration for the textarea editable type
+	 * Placeholder text to use for the cell editor field.
+	 */
+	placeholder?: string;
+	/**
+	 * Function to pass a reference to the input editor field.
+	 */
+	ref?(ref: any): any;
+	/**
+	 * Callback for onKeyDown.
+	 */
+	onKeyDown?(): void;
+	/**
+	 * Callback for on cell blur.
+	 */
+	onBlur?(): void;
+}
+
+/**
+ * Editable Select option values
+ */
+export type EditSelectOptionValue =
+	| Array<{ text: string; value: string; }>
+	| string[]
+	| number[];
+
+/**
+ * Editable Checkbox option values. This should be a string with the true/false value separated by a colon.
+ * e.g. "Yes:No"
+ */
+export type EditCheckboxOptionValue = string;
+
+/**
+ * Object to use to customize the properties for an editable column.
+ */
+export interface Editable<TRow extends object, K extends keyof TRow> {
+	/**
+	 * Edit field type, avaiable value is 'textarea', 'select', 'checkbox' and 'datetime'
+	 */
+	type?: EditCellType;
+	/**
+	 * Class name to use for the editor component.
+	 */
+	className?: string;
+	/**
+	 * Number of columns to display for a text area component.
 	 */
 	cols?: number;
+	/**
+	 * Number of rows to display for a text area component.
+	 */
 	rows?: number;
+	/**
+	 * Used to specify a field that can be modified in the insert modal when adding a new row, but cannot be edited
+	 * inside the table after the row has been inserted.
+	 */
+	readOnly?: boolean;
+	/**
+	 * CSS Style to use for the editor component.
+	 */
+	style?: CSSProperties;
+	/**
+	 * Validation function for the column. It takes the new "cell value" as argument. This function should return
+	 * a boolean true/false for isValid, or an EditValidatorObject (so that an error message can be provided).
+	 */
+	validator?(cell: TRow[K], row: TRow): boolean | string | EditValidatorObject;
+	/**
+	 * Data in a select or checkbox. If a checkbox, use a string with a ':'(colon) to separate the two values, ex: Y:N
+	 * The callback function can be used to customize the select options based on other field values within the row.
+	 * If the array is an array of objects, the fields 'text' can be used for the display text and 'value' to specify
+	 * the option's value.
+	 */
+	options?: {
+		values:
+		| EditSelectOptionValue
+		| EditCheckboxOptionValue
+		| ((row: TRow) => EditCheckboxOptionValue | EditSelectOptionValue);
+	};
+	/**
+	 * Default value to show in the edit field in the Insert Modal for this column.
+	 */
+	defaultValue?: TRow[K];
+	/**
+	 * @deprecated Use placeholder inside the attrs field instead.
+	 * Text to display as placeholder text in the editor component.
+	 */
+	placeholder?: string;
+	/**
+	 * Additional attributes for the editor component.
+	 */
+	attrs?: EditableAttrs;
 }
+
 export type SetFilterCallback = (targetValue: any) => boolean;
 export interface ApplyFilterParameter {
 	callback: SetFilterCallback;
 }
 
-export type FilterType = 'TextFilter' | 'RegexFilter' | 'SelectFilter' | 'NumberFilter' | 'DateFilter' | 'CustomFilter';
-export interface Filter {
+/**
+ * Text filter type.
+ */
+export interface TextFilter {
 	/**
-	 * "TextFilter"||"SelectFilter"||"NumberFilter"||"DateFilter"||"RegexFilter"||"YOUR_CUSTOM_FILTER"
+	 * Filter type must be 'TextFilter'.
 	 */
-	type?: FilterType;
+	type: 'TextFilter';
 	/**
-	 * Default value on filter. If type is NumberFilter or DateFilter, this value will like { number||date: xxx, comparator: '>' }
-	 */
-	defaultValue?: any;
-	/**
-	 * Assign a millisecond for delay when trigger filtering, default is 500.
+	 * Delay time in milliseconds after the last key press prior to applying the filter. Defaults to 500ms.
 	 */
 	delay?: number;
 	/**
-	 * Only work on TextFilter. Assign the placeholder text on text and regex filter
+	 * Placeholder text to show in the filter.
 	 */
-	placeholder?: string | RegExp;
+	placeholder?: string;
 	/**
-	 * Only work on NumberFilter. Accept an array which conatin the filter condition, like: ['<','>','=']
+	 * Condition. Can be 'eq' (exactly equal) or 'like' (contains the given string). Defaults to 'like'.
 	 */
-	numberComparators?: string[];
-
-    /**
-     * Options for the filter.
-     */
-	options?: any;
-
-    /**
-     * Comparison condition for the NumberFilter
-     */
-	condition?: string;
-
-    /**
-     * Get element which represent filter.
-     */
-	getElement?: (filterHandler: (parameters?: ApplyFilterParameter) => void, filterParameters: any) => JSX.Element;
-
-    /**
-     * Parameters for custom filter
-     */
-	customFilterParameters?: any;
+	condition?: FilterCondition;
+	/**
+	 * Default value for the text filter. Defaults to ''
+	 */
+	defaultValue?: string;
+	/**
+	 * CSS Style to use for the select filter.
+	 */
+	style?: CSSProperties;
 }
 
-export interface TableHeaderColumn extends ComponentClass<TableHeaderColumnProps> { }
-declare const TableHeaderColumn: TableHeaderColumn;
-
-declare class TableDataSet extends EventEmitter {
-	constructor(data: any);
-	setData(data: any): void;
-	clear(): void;
-	getData(): any;
+export interface SelectFilterOptionsType {
+	[value: string]: string | number | boolean;
+	[value: number]: string | number | boolean;
 }
+
+/**
+ * Select filter type
+ */
+export interface SelectFilter {
+	/**
+	 * Filter type must be 'SelectFilter'
+	 */
+	type: 'SelectFilter';
+	/**
+	 * Placeholder text to show in the filter.
+	 */
+	selectText?: string;
+	/**
+	 * Options for the filter select.
+	 */
+	options: SelectFilterOptionsType;
+	/**
+	 * Condition. Can be 'eq' (exactly equal) or 'like' (contains the given string). Defaults to 'like'.
+	 */
+	condition?: FilterCondition;
+	/**
+	 * Default value for the select filter.
+	 */
+	defaultValue?: string | number | boolean;
+	/**
+	 * CSS Style to use for the select filter.
+	 */
+	style?: CSSProperties;
+	/**
+	 * Disable the empty option in the dropdown filter.
+	 */
+	withoutEmptyOption?: boolean;
+}
+
+/**
+ * Regex filter type
+ */
+export interface RegexFilter {
+	/**
+	 * Filter type must be 'RegexFilter'
+	 */
+	type: 'RegexFilter';
+	/**
+	 * Delay time in milliseconds after the last key press prior to applying the filter. Defaults to 500ms.
+	 */
+	delay?: number;
+	/**
+	 * Placeholder text to show in the filter.
+	 */
+	placeholder?: string;
+	/**
+	 * Default value
+	 */
+	defaultValue?: string;
+	/**
+	 * CSS Style to use for the select filter.
+	 */
+	style?: CSSProperties;
+}
+
+/**
+ * Number filter type
+ */
+export interface NumberFilter {
+	/**
+	 * Filter type must be 'NumberFilter'
+	 */
+	type: 'NumberFilter';
+	/**
+	 * Delay time in milliseconds after the last key press prior to applying the filter. Defaults to 500ms.
+	 */
+	delay?: number;
+	/**
+	 * Placeholder text to show in the filter.
+	 */
+	placeholder?: string;
+	/**
+	 * Number filter comparators
+	 */
+	numberComparators?: FilterComparator[];
+	/**
+	 * Default value for the filter.
+	 */
+	defaultValue?: {
+		/**
+		 * Number value.
+		 */
+		number: number;
+		/**
+		 * Comparator value.
+		 */
+		comparator: FilterComparator;
+	};
+	/**
+	 * If this is a select number field, disable the empty option in the dropdown.
+	 */
+	withoutEmptyOption?: boolean;
+	/**
+	 * Specify that the comparator field MUST have a comparator selected.
+	 */
+	withoutEmptyComparatorOption?: boolean;
+	/**
+	 * Specify that the value field MUST have a number value specified.
+	 */
+	withoutEmptyNumberOption?: boolean;
+	/**
+	 * List of number options that can be selected, if the number field is a select dropdown instead of a text edit.
+	 */
+	options?: number[];
+	/**
+	 * CSS Style to use for the select filter.
+	 */
+	style?: {
+		number: CSSProperties;
+		comparator: CSSProperties;
+	};
+}
+
+/**
+ * Date filter type
+ */
+export interface DateFilter {
+	/**
+	 * Filter type must be 'DateFilter'
+	 */
+	type: 'DateFilter';
+	/**
+	 * Delay time in milliseconds after the last key press prior to applying the filter. Defaults to 500ms.
+	 */
+	delay?: number;
+	/**
+	 * Date filter comparators
+	 */
+	dateComparators?: FilterComparator[];
+	/**
+	 * Default value for the filter.
+	 */
+	defaultValue?: {
+		/**
+		 * Date value. String values will be automatically converted to dates.
+		 */
+		date: Date | string;
+		/**
+		 * Comparator value.
+		 */
+		comparator: FilterComparator;
+	};
+	/**
+	 * CSS Style to use for the select filter.
+	 */
+	style?: {
+		date: CSSProperties;
+		comparator: CSSProperties;
+	};
+}
+
+/**
+ * Custom filter type.
+ */
+export interface CustomFilter {
+	/**
+	 * Type must be 'CustomFilter'
+	 */
+	type: 'CustomFilter';
+	/**
+	 * Function to generate the filter component
+	 */
+	getElement(
+		filterHandler: (parameters?: ApplyFilterParameter) => void,
+		customFilterParameters: object
+	): ReactElement<any>;
+	/**
+	 * Custom filter parameters to be passed to the generator function
+	 */
+	customFilterParameters: object;
+}
+
+/**
+ * Collection of filter types.
+ */
+export type Filter = TextFilter | SelectFilter | RegexFilter | NumberFilter | DateFilter | CustomFilter;
+
+/**
+ * The "value" type for a number filter
+ */
+export interface NumberFilterValue {
+	number: number | string;
+	comparator: FilterComparator;
+}
+
+/**
+ * The "value" type for a date filter.
+ */
+export interface DateFilterValue {
+	date: Date | string;
+	comparator: FilterComparator;
+}
+
+/**
+ * Text Filter's data object.
+ */
+export interface TextFilterData {
+	type: 'TextFilter';
+	value: string;
+}
+
+/**
+ * Select Filter's data object.
+ */
+export interface SelectFilterData {
+	type: 'SelectFilter';
+	value: string;
+}
+
+/**
+ * Regex Filter's data object.
+ */
+export interface RegexFilterData {
+	type: 'RegexFilter';
+	value: string;
+}
+
+/**
+ * Number Filter's data object.
+ */
+export interface NumberFilterData {
+	type: 'NumberFilter';
+	value: NumberFilterValue;
+}
+
+/**
+ * Date Filter's data object.
+ */
+export interface DateFilterData {
+	type: 'DateFilter';
+	value: DateFilterValue;
+}
+
+/**
+ * Data object returned for an array filter.
+ */
+export interface ArrayFilterData {
+	type: 'ArrayFilter';
+	value: string[] | number[];
+}
+
+/**
+ * Valid types for the "value" field inside a filter's data object.
+ */
+export type FilterValueData = string | number | string[] | number[] | DateFilterValue | NumberFilterValue;
+
+/**
+ * Combined types of filter data objects.
+ */
+export type FilterValue =
+	| TextFilterData
+	| SelectFilterData
+	| RegexFilterData
+	| NumberFilterData
+	| DateFilterData
+	| ArrayFilterData;
+
+/**
+ * Filter object that can be passed to BootstrapTableFilter.handleFilterData function.
+ */
+export interface FilterData {
+	[dataField: string]: FilterValue;
+}
+
+/**
+ * TableHeaderColumn class definition.
+ */
+export class TableHeaderColumn extends Component<TableHeaderColumnProps> {
+	/**
+	 * Function to reset the filter on this column to the default values.
+	 */
+	cleanFiltered(): void;
+	/**
+	 * Apply a filter value.
+	 */
+	applyFilter(value: FilterValueData): void;
+}
+
+/**
+ * Customize the options for Keyboard Navigation.
+ */
+export interface KeyboardNavigation {
+	/**
+	 * Return a style object which will be applied on the navigating cell.
+	 */
+	customStyle?: CSSProperties;
+	/**
+	 * Set to false to disable click to navigate, usually user wants to click to select row instead of navigation.
+	 */
+	clickToNav?: boolean;
+	/**
+	 * Return a style object which will be applied on the both of navigating and editing cell.
+	 */
+	customStyleOnEditCell?: CSSProperties;
+	/**
+	 * When set to true, pressing ENTER will begin to edit the cell if cellEdit is also enabled.
+	 */
+	enterToEdit?: boolean;
+	/**
+	 * When set to true, pressing ENTER will expand or collapse the current row.
+	 */
+	enterToExpand?: boolean;
+	/**
+	 * When set to true, pressing ENTER will select or unselect the current row.
+	 */
+	enterToSelect?: boolean;
+}
+
+/**
+ * Input properties for the expandColumnComponent function when customising the expand indicator.
+ */
+export interface ExpandColumnComponentProps {
+	/**
+	 * True if the current row is able to be expanded.
+	 */
+	isExpandableRow: boolean;
+	/**
+	 * True if the current row is currently expanded.
+	 */
+	isExpanded: boolean;
+}
+
+/**
+ * Customize the options for expand row feature.
+ */
+export interface ExpandColumnOptions {
+	/**
+	 * Will enable an indicator column at first column if true. Default is false.
+	 */
+	expandColumnVisible?: boolean;
+	/**
+	 * a callback function to customize the appearance of the indicator column.
+	 */
+	expandColumnComponent?(props: ExpandColumnComponentProps): string | ReactElement<any>;
+	/**
+	 * set the width of indicator column.
+	 */
+	columnWidth?: number | string;
+	/**
+	 * If both an indicator column and a selection column are displaying, this specifies whether the indicator column
+	 * should be shown first. Default is true, false will move the expand indicator column after selection column.
+	 */
+	expandColumnBeforeSelectColumn?: boolean;
+}
+
+/**
+ * Properties provided in the callback to create a custom component for the selection column radio/checkboxes
+ */
+export interface CustomSelectProps {
+	/**
+	 * What type of selection should be used? Values are 'radio' (single) or 'checkbox' (multiple).
+	 */
+	type: SelectRowMode;
+	/**
+	 * True if the current row being drawn is selected.
+	 */
+	checked: boolean;
+	/**
+	 * True if the current row being drawn is not permitted to be selected.
+	 */
+	disabled: boolean;
+	/**
+	 * Callback that should be used when someone selects the current row.
+	 *   `event`: the current event target
+	 *   `rowIndex`: the index of the current row being toggled.
+	 */
+	onChange(event: any, rowIndex: string | number): void;
+	/**
+	 * Index for the row currently being rendered.
+	 * If the rowIndex is 'Header', it means this rendering is for header selection column.
+	 */
+	rowIndex: number | string;
+	/**
+	 * The indeterminate flag is used to indicate that there are some rows selected, but it is neither all rows nor
+	 * no rows. As far as the select all checkbox is concerned, it is neither true nor false.
+	 */
+	indeterminate: boolean;
+}
+
+/**
+ * Details of the column settings, provided to the Options.onSearchChange callback function.
+ * The values for these settings come from the <TableHeader> properties for a column.
+ *
+ * Note: the list of options is poorly documented. This list comes from double-checking the
+ * react-bootstrap-table source code to check what properties actually get passed to the
+ * onSearchChange callback function.
+ */
+export interface ColumnDescription<TRow extends object = any> {
+	/**
+	 * Name of the column.
+	 * Comes from TableHeader.dataField property.
+	 */
+	name: keyof TRow;
+	/**
+	 * Column text alignment setting
+	 * Comes from TableHeader.dataAlign property.
+	 */
+	align: DataAlignType;
+	/**
+	 * Column sorting setting. If true, the column can be used to sort the data.
+	 * Comes from TableHeader.dataSort property.
+	 */
+	sort: boolean;
+	/**
+	 * Column data format function.
+	 * Comes from TableHeader.dataFormat property.
+	 */
+	format(cell: any, row: TRow, formatExtraData: any, rowIndex: number): string | ReactElement<any>;
+	/**
+	 * The formatExtraData setting for the column.
+	 * Comes from TableHeader.formatExtraData property.
+	 */
+	formatExtraData: any;
+	/**
+	 * Whether data should be filtered based on the formatted value, or the raw data value.
+	 * Comes from TableHeader.filterFormatted property.
+	 */
+	filterFormatted: boolean;
+	/**
+	 * Filter function for the column.
+	 * Comes from TableHeader.filterValue property.
+	 */
+	filterValue(cell: any, row: TRow): any;
+	/**
+	 * Setting for whether the data in this column can be edited.
+	 * Comes from TableHeader.editable property.
+	 */
+	editable: boolean | Editable<TRow, any> | ((cell: any, row: TRow, rowIndex: number, columnIndex: number) => boolean | string | EditValidatorObject);
+	/**
+	 * Custom editor settings to use when editing the data in this column.
+	 * Comes from TableHeader.customEditor property.
+	 */
+	customEditor: CustomEditor<TRow, any>;
+	/**
+	 * Flag to indicate whether this column should be visible or not.
+	 * Comes from TableHeader.hidden property.
+	 */
+	hidden: boolean;
+	/**
+	 * Flag to indicate whether this column should be hidden on the insert modal.
+	 * Comes from TableHeader.hiddenOnInsert property.
+	 */
+	hiddenOnInsert: boolean;
+	/**
+	 * Flag to indicate whether the data in this column should be included in a search.
+	 * Comes from TableHeader.searchable property.
+	 */
+	searchable: boolean;
+	/**
+	 * Custom className setting for this column.
+	 * Comes from TableHeader.columnClassName property.
+	 */
+	className: string | ((cell: any, row: TRow, rowIndex: number, columnIndex: number) => string);
+	/**
+	 * Custom className setting for this column when a cell in the column is being edited.
+	 * Comes from TableHeader.editColumnClassName property.
+	 */
+	editClassName: string | ((cell: any, row: TRow) => string);
+	/**
+	 * Custom className setting for this column when a cell in the column contains invalid data.
+	 * Comes from TableHeader.invalidEditColumnClassName property.
+	 */
+	invalidEditColumnClassName: string | ((cell: any, row: TRow) => string);
+	/**
+	 * Custom title to display for this column.
+	 * Comes from TableHeader.columnTitle property.
+	 */
+	columnTitle: boolean;
+	/**
+	 * Width setting for this column.
+	 * Comes from TableHeader.width property.
+	 */
+	width: string;
+	/**
+	 * Custom header value/component/children to use for this column.
+	 * Comes from TableHeader.headerText || TableHeader.children properties.
+	 */
+	text: string | number | boolean | ReactElement<any>;
+	/**
+	 * Custom sort function to use for this column.
+	 * Comes from TableHeader.sortFunc property.
+	 */
+	sortFunc(a: TRow, b: TRow, order: SortOrder, sortField: keyof TRow, extraData: any): number;
+	/**
+	 * Extra data to be provided to the search function for this column.
+	 * Comes from TableHeader.sortFuncExtraData property.
+	 */
+	sortFuncExtraData: any;
+	/**
+	 * Flag to indicate whether this column should be included in a CSV export.
+	 * Comes from TableHeader.export property.
+	 */
+	export: boolean;
+	/**
+	 * Flag to indicate whether this column is expandable.
+	 * Comes from TableHeader.expandable property.
+	 */
+	expandable: boolean;
+	/**
+	 * Custom attributes (e.g. {'data-attr': 'test'}) to be applied to cells in this column.
+	 * Comes from TableHeader.tdAttr property.
+	 */
+	attrs: CustomAttrs;
+	/**
+	 * Custom attributes (e.g. {'data-attr': 'test'}) to use for cells that are being edited in this column.
+	 * Comes from TableHeader.editTdAttr property.
+	 */
+	editAttrs: CustomAttrs;
+	/**
+	 * CSS style properties to use for cells in this column.
+	 * Comes from TableHeader.tdStyle property.
+	 */
+	style: CSSProperties;
+}
+
+/**
+ * Props provided to the Options.toolBar callback function for creating a custom toolbar.
+ */
+export interface ToolBarProps {
+	/**
+	 * Rendered components to use in the toolbar.
+	 */
+	components: ButtonGroupProps & {
+		/**
+		 * Search panel component.
+		 */
+		searchPanel: ReactElement<any>;
+		/**
+		 * Button group components.
+		 */
+		btnGroup: ReactElement<any>; // button groups JSX
+		/**
+		 * The individual search field.
+		 */
+		searchField: ReactElement<any>; // search field JSX
+		/**
+		 * The button to clear the search field.
+		 */
+		clearBtn: ReactElement<any>; // clear search field JSX
+	};
+	/**
+	 * Event callbacks to use with a custom toolbar.
+	 */
+	event: {
+		/**
+		 * Callback to activate the insert row modal window.
+		 */
+		openInsertModal(): void;
+		/**
+		 * Callback to close the insert row modal window.
+		 */
+		closeInsertModal(): void;
+		/**
+		 * Callback to delete selected row(s) from the table.
+		 */
+		dropRow(): void;
+		/**
+		 * Callback to toggle between showing all rows and showing only selected rows.
+		 */
+		showOnlyToogle(): void;
+		/**
+		 * Callback to export the table to a CSV file.
+		 */
+		exportCSV(): void;
+		/**
+		 * Callback to apply a search.
+		 */
+		search(): void;
+	};
+}
+
+/**
+ * Left-hand side Button elements (used when customizing the toolbar).
+ */
+export interface ButtonGroupProps {
+	/**
+	 * Export to CSV button.
+	 */
+	exportCSVBtn: ReactElement<any>;
+	/**
+	 * Insert button (to add a row).
+	 */
+	insertBtn: ReactElement<any>;
+	/**
+	 * Delete button.
+	 */
+	deleteBtn: ReactElement<any>;
+	/**
+	 * Toggle button to switch between showing all rows and showing selected rows only.
+	 */
+	showSelectedOnlyBtn: ReactElement<any>;
+}
+
+/**
+ * Properties that are given to the Options.searchPanel callback function.
+ */
+export interface SearchPanelProps {
+	/**
+	 * Default search field component.
+	 */
+	searchField: ReactElement<any>;
+	/**
+	 * Default clear search field button component.
+	 */
+	clearBtn: ReactElement<any>;
+	/**
+	 * The default search text.
+	 */
+	defaultValue: string;
+	/**
+	 * The placeholder text for the search field.
+	 */
+	placeholder: string;
+	/**
+	 * A callback to trigger the clear search field event.
+	 */
+	clearBtnClick(): void;
+	/**
+	 * A callback to trigger a search, takes the search text as an input.
+	 */
+	search(searchText: string): void;
+}
+
+/**
+ * Properties passed as props to the Options.paginationPanel function when generating a custom pagination panel.
+ */
+export interface PaginationPanelProps {
+	/**
+	 * Current page number
+	 */
+	currPage: number;
+	/**
+	 * Current number of rows to show per page
+	 */
+	sizePerPage: number;
+	/**
+	 * Choices for size per page dropdown component
+	 */
+	sizePerPageList: SizePerPageList;
+	/**
+	 * Index number for the first page of data.
+	 * Comes from Options.pageStartIndex.
+	 */
+	pageStartIndex: number;
+	/**
+	 * Callback function to use to change page.
+	 */
+	changePage(pageNum: number): void;
+	/**
+	 * Callback function to trigger the toggle on sizePerPage dropdown button
+	 */
+	toggleDropDown(): void;
+	/**
+	 * Callback function to use to set a new size per page.
+	 */
+	changeSizePerPage(sizePerPage: number): void;
+	/**
+	 * The basic components for the pagination panel, provided here so that you have the option to use some of them
+	 * if you don't want to customize all of them.
+	 */
+	components: {
+		/**
+		 * Text/element to display when displaying the total number of rows.
+		 */
+		totalText: string | ReactElement<any>;
+		/**
+		 * Default sizePerPageDropdown component.
+		 */
+		sizePerPageDropDown: SizePerPageDropDown;
+		/**
+		 * The default list of page change buttons.
+		 */
+		pageList: HTMLUListElement;
+	};
+}
+
+/**
+ * Properties given to the Options.sizePerPageDropDown function used to generate a custom sizePerPage component to
+ * render in the pagination panel.
+ */
+export interface SizePerPageFunctionProps {
+	/**
+	 * Flag to indicate that the sizePerPage dropdown should currently be 'open'.
+	 */
+	open: boolean;
+	/**
+	 * Flag indicating that the sizePerPage dropdown should be hidden.
+	 */
+	hideSizePerPage: boolean;
+	/**
+	 * Current size per page as a string value.
+	 */
+	currSizePerPage: string;
+	/**
+	 * Array of the size per page options to display in the dropdown.
+	 */
+	sizePerPageList: SizePerPageList;
+	/**
+	 * On-click toggle function callback to open/close the size per page dropdown list.
+	 */
+	toggleDropDown(): void;
+	/**
+	 * Callback function to use to change the current size per page.
+	 */
+	changeSizePerPage(newSizePerPage: number): void;
+}
+
+/**
+ * Custom Editor Props passed to the getElement function in the TableHeader.customEditor object.
+ */
+export interface CustomEditorProps<TRow extends object, K extends keyof TRow> extends EditableAttrs {
+	/**
+	 * The row data for the cell being edited.
+	 */
+	row: TRow;
+	/**
+	 * Default value for the editor cell.
+	 */
+	defaultValue: TRow[K];
+	/**
+	 * Contents of the customEditorParameters object.
+	 */
+	[parameterName: string]: any;
+}
+
+/**
+ * Object to provide a custom editor component to use for a table column.
+ * @see: https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/cell-edit/custom-cell-edit-table.js
+ */
+export interface CustomEditor<TRow extends object, K extends keyof TRow> {
+	/**
+	 * Required. Function to use to create the custom cell editor. Takes two parameters:
+	 *   `onUpdate`: callback function to call to update the value inside the cell.
+	 *   `props`:
+	 */
+	getElement(onUpdate: (updatedCell: TRow[K]) => void, props: CustomEditorProps<TRow, K>): ReactElement<any>;
+	/**
+	 * Additional parameters to pass to the getElement function inside the props argument.
+	 */
+	customEditorParameters?: object;
+}
+
+/**
+ * Validation object that can be returned from cell editing validation.
+ */
+export interface EditValidatorObject {
+	/**
+	 * Boolean flag indicating whether the cell value is valid.
+	 */
+	isValid: boolean;
+	/**
+	 * Notification object providing details on the validation result.
+	 */
+	notification: {
+		/**
+		 * One of 'success' or 'error'
+		 */
+		type: EditValidatorType;
+		/**
+		 * A text message explaining the validation result.
+		 */
+		msg: string;
+		/**
+		 * A text title explaining the validation result.
+		 */
+		title: string;
+	};
+}
+
+/**
+ * Properties that can be passed to the InsertButton, DeleteButton, ExportCSVButton and ClearSearchButton
+ * components.
+ */
+export interface ButtonProps {
+	/**
+	 * Label for the button
+	 */
+	btnText?: string;
+	/**
+	 * Bootstrap css style class for the button, e.g. 'btn-warning'
+	 */
+	btnContextual?: string;
+	/**
+	 * Custom class for the button
+	 */
+	className?: string;
+	/**
+	 * Glyphicon glyph string for the button, e.g. 'glyphicon-edit'
+	 */
+	btnGlyphicon?: string;
+	/**
+	 * Function to be called to activate the normal onClick functionality for this button.
+	 */
+	onClick?(e: React.MouseEvent<any>): void;
+}
+
+/**
+ * Properties that can be passed to the ShowSelectedOnlyButton component.
+ */
+export interface ShowSelectedButtonProps {
+	/**
+	 * Label for when clicking the button will toggle the table back into "show all rows" mode.
+	 */
+	showAllText?: string;
+	/**
+	 * Label for when clicking the button will toggle the table into "show only selected rows" mode.
+	 */
+	showOnlySelectText?: string;
+	/**
+	 * Bootstrap css style class for the button, e.g. 'btn-warning'
+	 */
+	btnContextual?: string;
+	/**
+	 * Custom class for the button
+	 */
+	className?: string;
+	/**
+	 * Glyphicon glyph string for the button, e.g. 'glyphicon-edit'
+	 */
+	btnGlyphicon?: string;
+	/**
+	 * Function to be called to activate the normal onClick functionality for this button.
+	 */
+	onClick?(e: React.MouseEvent<any>): void;
+}
+
+/**
+ * Properties that can be passed to the SearchField component.
+ */
+export interface SearchFieldProps {
+	/**
+	 * Custom css class name
+	 */
+	className?: string;
+	/**
+	 * Default value for the search field
+	 */
+	defaultValue?: string;
+	/**
+	 * Placeholder text for the search field
+	 */
+	placeholder?: string;
+	/**
+	 * callback funciton to call when a key is released
+	 */
+	onKeyUp?(e: React.KeyboardEvent<any>): void;
+}
+
+/**
+ * Interface that must be implemented for a custom search field component.
+ */
+export interface SearchFieldInterface {
+	/**
+	 * getValue should return the current search text.
+	 */
+	getValue(): string;
+	/**
+	 * setValue should update the current search text to the given value.
+	 */
+	setValue(search: string): void;
+}
+
+/**
+ * Modal Column data passed to Options.insertModal and Options.insertModalBody.
+ */
+export interface InsertModalColumnDescription<TRow extends object = any> {
+	/**
+	 * Flag to indicate that this is the key field for the column. It is only present if there is more than
+	 * one column in the table.
+	 * Comes from TableHeader.isKey field.
+	 */
+	isKey?: boolean;
+	/**
+	 * Header text/element for the column.
+	 * Comes from TableHeader.headerText or TableHeader.children.
+	 */
+	name: string | ReactElement<any>;
+	/**
+	 * Field name for the column data.
+	 * Comes from TableHeader.dataField.
+	 */
+	field: keyof TRow; // children.props.dataField,
+	/**
+	 * Flag to indicate whether this column is editable.
+	 * Comes from TableHeader.editable.
+	 */
+	editable: boolean | Editable<TRow, keyof TRow> | ((cell: TRow[keyof TRow], row: TRow, rowIndex: number, columnIndex: number) => boolean | string | EditValidatorObject);
+	/**
+	 * Custom element to use for the Insert field element.
+	 * Comes from TableHeader.customInsertEditor.
+	 */
+	customInsertEditor(
+		column: InsertModalColumnDescription<TRow>,
+		attr: EditableAttrs,
+		editorClass: string,
+		ignoreEditable: boolean,
+		defaultValue: TRow[keyof TRow]
+	): ReactElement<any> | boolean;
+	/**
+	 * Flag to indicate whether this column should be hidden on the Insert Modal page.
+	 * Comes from TableHeader.hiddenOnInsert.
+	 */
+	hiddenOnInsert: boolean; // children.props.hiddenOnInsert,
+	/**
+	 * Flag to indicate whether the table should check that a key does not already exist.
+	 * Comes from TableHeader.keyValidator.
+	 */
+	keyValidator: boolean; // children.props.keyValidator
+	/**
+	 * Flag to indicate that the field should be auto-generated rather than edited. It is only present if there is more
+	 * than one column in the table.
+	 * Comes from TableHeader.autoValue.
+	 */
+	autoValue?: boolean;
+	/**
+	 * Format function for the field. It is only present if there is more than one column in the table. Value is either
+	 * 'false', meaning that there is no format function present, or a wrapper function that returns the formatted string
+	 * content for the field using the TableHeader.dataFormat function to generate that string.
+	 *
+	 * Based on from TableHeader.dataFormat, but is applied as a wrapper function around that function.
+	 */
+	format?: boolean | ((cell: TRow[keyof TRow]) => string);
+}
+
+/**
+ * Properties that can be passed to the InsertModalHeader component.
+ */
+export interface InsertModalHeaderProps {
+	/**
+	 * Header class name.
+	 */
+	className?: string;
+	/**
+	 * Title to display in the header.
+	 */
+	title?: string;
+	/**
+	 * Callback function to call prior to closing the Insert Modal window.
+	 */
+	beforeClose?(e: SyntheticEvent<any>): void;
+	/**
+	 * Callback function to call to close the Insert Modal window.
+	 */
+	onModalClose?(closeModal: () => void): void;
+	/**
+	 * Set to true to hide the close button. Default is false.
+	 */
+	hideClose?: boolean;
+	/**
+	 * Bootstrap version.
+	 */
+	version?: BootstrapVersion;
+}
+
+/**
+ * Properties that can be passed to the InsertModalFooter component.
+ */
+export interface InsertModalFooterProps {
+	/**
+	 * Header class name.
+	 */
+	className?: string;
+	/**
+	 * Text to display on the Save button
+	 */
+	saveBtnText?: string;
+	/**
+	 * Text to display on the Close button
+	 */
+	closeBtnText?: string;
+	/**
+	 * Bootstrap css class name for the close button, example: 'btn-warning'
+	 */
+	closeBtnContextual?: string;
+	/**
+	 * Bootstrap css class name for the save button, example: 'btn-success'
+	 */
+	saveBtnContextual?: string;
+	/**
+	 * Custom class name for the close button.
+	 */
+	closeBtnClass?: string;
+	/**
+	 * Custom class name for the save button.
+	 */
+	saveBtnClass?: string;
+	/**
+	 * Callback function to call prior to closing the Insert Modal window.
+	 */
+	beforeClose?(e: SyntheticEvent<any>): void;
+	/**
+	 * Callback function to call to close the Insert Modal window.
+	 */
+	onModalClose?(closeModal: () => void): void;
+	/**
+	 * Callback function to be called prior to saving the new row.
+	 */
+	beforeSave?(e: SyntheticEvent<any>): void;
+	/**
+	 * Callback function to be called to save the new row.
+	 */
+	onSave?(save: () => void): void;
+}
+
+/**
+ * Interface that must be implemented by a custom insert modal body component.
+ */
+export interface ModalBodyInterface<TRow extends object = any> {
+	/**
+	 * The required getFieldValue method that must be implemented on a customized insert modal body that returns the
+	 * new row data when the save button is clicked in the modal window.
+	 */
+	getFieldValue(): TRow;
+}
+
+/**
+ * Properties that can be given to the SizePerPageDropDown component.
+ */
+export interface SizePerPageDropDownProps {
+	/**
+	 * Custom class name to use for the component.
+	 */
+	className?: string;
+	/**
+	 * Bootstrap css style class for the button, e.g. 'btn-warning'
+	 */
+	btnContextual?: string;
+	/**
+	 * Whether the button menu should 'dropup' or 'dropdown'.
+	 */
+	variation?: DropDirection;
+	/**
+	 * Callback function that should be triggered when the user clicks on the dropdown button.
+	 */
+	onClick?(toggleDropDown: () => void): void;
+	/**
+	 * Current size per page
+	 */
+	currSizePerPage?: string;
+	/**
+	 * Size Per Page options list
+	 */
+	options?: number[] | Array<{ text: string, value: number }>;
+	/**
+	 * Flag to indicate that the dropdown is open
+	 */
+	open?: boolean;
+	/**
+	 * Flag to indicate that the dropdown is currently hidden
+	 */
+	hidden?: boolean;
+}
+
+/**
+ * Default InsertButton component. Can be used to create custom toolbars, etc.
+ */
+export class InsertButton extends Component<ButtonProps> {}
+
+/**
+ * Default DeleteButton component. Can be used to create custom toolbars, etc.
+ */
+export class DeleteButton extends Component<ButtonProps> {}
+
+/**
+ * Default ExportCSVButton component. Can be used to create custom toolbars, etc.
+ */
+export class ExportCSVButton extends Component<ButtonProps> {}
+
+/**
+ * Default ShowSelectedOnlyButton component for toggling between showing all rows or only
+ * selected rows. Can be used to create custom toolbars, etc.
+ */
+export class ShowSelectedOnlyButton extends Component<ShowSelectedButtonProps> {}
+
+/**
+ * Default SearchField component. Can be used to create custom toolbars, etc.
+ */
+export class SearchField extends Component<SearchFieldProps> implements SearchFieldInterface {
+	getValue(): string;
+	setValue(search: string): void;
+}
+
+/**
+ * Default ClearSearchButton component. Can be used to create custom toolbars, etc.
+ */
+export class ClearSearchButton extends Component<ButtonProps> {}
+
+/**
+ * Default header component used for the Insert modal. Can be used to customize the
+ * insert row modal form.
+ */
+export class InsertModalHeader extends Component<InsertModalHeaderProps> {}
+
+/**
+ * Default footer component used for the Insert modal. Can be used to customize the
+ * insert row modal form.
+ */
+export class InsertModalFooter extends Component<InsertModalFooterProps> {}
+
+/**
+ * Default size per page component used in the pagination row. Can be used to customize
+ * the size per page dropdown.
+ */
+export class SizePerPageDropDown extends Component<SizePerPageDropDownProps> {}
diff --git a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
index c8f25dfa56..edf2111b78 100644
--- a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
+++ b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
@@ -1,8 +1,49 @@
 import * as React from 'react';
 import { render } from 'react-dom';
-import { BootstrapTable, TableHeaderColumn, ApplyFilterParameter, Filter } from 'react-bootstrap-table';
+import {
+  ApplyFilterParameter,
+  BootstrapTable,
+  ButtonGroupProps,
+  CellEdit,
+  ColumnDescription,
+  CustomSelectProps,
+  DeleteButton,
+  EditableAttrs,
+  EditValidatorObject,
+  ExpandColumnComponentProps,
+  ExpandColumnOptions,
+  ExportCSVButton,
+  Filter,
+  FilterData,
+  FooterData,
+  InsertButton,
+  InsertModalColumnDescription,
+  InsertModalFooter,
+  InsertModalHeader,
+  ModalBodyInterface,
+  Options,
+  PaginationPanelProps,
+  SearchField,
+  SearchFieldInterface,
+  SearchFieldProps,
+  SearchPanelProps,
+  SelectRow,
+  ShowSelectedOnlyButton,
+  SizePerPageDropDown,
+  SortOrder,
+  TableHeaderColumn,
+  ToolBarProps
+} from 'react-bootstrap-table';
 
-const products = [{
+interface Product {
+  id: number;
+  name: string;
+  price?: number;
+  quality?: number;
+  inStockStatus?: number;
+  sales?: number;
+}
+const products: Product[] = [{
   id: 1,
   name: "Item name 1",
   price: 100
@@ -12,8 +53,40 @@ const products = [{
   price: 100
 }];
 
+type JobType = 'A' | 'B' | 'C' | 'D';
+interface Job {
+  id: number;
+  status: string;
+  name: string;
+  type: JobType;
+  active: 'Y' | 'N';
+}
+const jobs = [
+  { id: 1, status: '200', name: 'Item name 1', type: 'B', active: 'N' },
+  { id: 2, status: '200', name: 'Item name 2', type: 'B', active: 'Y' }
+];
+const jobTypes = ['A', 'B', 'C', 'D'];
+
+interface ExtendedJob {
+  id: number;
+  name: string;
+  type1: JobType;
+  type2: JobType;
+  active: 'Y' | 'N';
+  datetime: Date;
+}
+const extendedJobs = [
+  { id: 1, name: 'Item name 1', type1: 'A', type2: 'B', active: 'N', datetime: '2001-12-28T14:57:00' },
+  { id: 2, name: 'Item name 2', type1: 'A', type2: 'B', active: 'Y', datetime: '2002-12-28T14:57:00' }
+];
+
+const inStockStatus = {
+  1: 'yes',
+  2: 'no'
+};
+
 // It's a data format example.
-function priceFormatter(cell: any, row: any) {
+function priceFormatter(cell: number, row: Product) {
   return '<i class="glyphicon glyphicon-usd"></i> ' + cell;
 }
 
@@ -32,7 +105,8 @@ const qualityType = {
   2: 'unknown'
 };
 
-function enumFormatter(cell: any, row: any, enumObject: any) {
+function enumFormatter(cell: any, row: any, enumObject: any, rowIndex: number) {
+  console.log(`The row index: ${rowIndex}`);
   return enumObject[cell];
 }
 
@@ -91,7 +165,7 @@ class RemoteProps extends React.Component {
           return remoteObj;
         }}
         options={{
-          onCellEdit: (row: any, fieldName: string, value: any) => { console.info(row); }
+          onCellEdit: (row: any, fieldName: string, value: any) => { console.info(row); return value; }
         }}
       >
         <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
@@ -145,27 +219,20 @@ const thStyleExample = <BootstrapTable data={ products } search>
     <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
 </BootstrapTable>;
 
-// Adopted from https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-header-span/column-header-span-complex.js
-export default class ColumnHeaderSpanComplex extends React.Component {
+/**
+ * Adopted from https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-header-span/column-header-span-complex.js
+ */
+class ColumnHeaderSpanComplex extends React.Component {
   render() {
-    const selectRow = {
-      mode: 'checkbox',
-      bgColor: 'rgb(238, 193, 213)'
-    };
-
-    const cellEdit = {
-      mode: 'click',
-      blurToSave: true
-    };
+    const options: Options = { exportCSVSeparator: '##' };
     return (
-      <BootstrapTable data={products}
-        insertRow deleteRow exportCSV>
+      <BootstrapTable data={products} insertRow deleteRow exportCSV options={options}>
         <TableHeaderColumn row={0} rowSpan={2} dataField='id' isKey={true} >ID</TableHeaderColumn>
         <TableHeaderColumn row={0} colSpan={3} dataSort csvHeader='Product' headerAlign='right'>Product</TableHeaderColumn>
         <TableHeaderColumn row={1} dataField='name' width='175' dataAlign='center'>name</TableHeaderColumn>
         <TableHeaderColumn row={1} dataField='price' dataSort>price</TableHeaderColumn>
         <TableHeaderColumn row={1} dataField='coupon' width='70'>Coupon</TableHeaderColumn>
-        <TableHeaderColumn row={0} csvHeader='In stock' rowSpan={2} dataField='status'>In stock</TableHeaderColumn>
+        <TableHeaderColumn row={0} csvHeader='In stock' rowSpan={2} dataField='status' export={false}>In stock</TableHeaderColumn>
         <TableHeaderColumn row={0} colSpan={2} csvHeader='Customer' filter={{ type: 'TextFilter', delay: 1000 }}>Customer</TableHeaderColumn>
         <TableHeaderColumn row={1} csvHeader='name' dataField='customer'>name</TableHeaderColumn>
         <TableHeaderColumn row={1} csvHeader='order' dataField='order' dataSort>order</TableHeaderColumn>
@@ -173,3 +240,1297 @@ export default class ColumnHeaderSpanComplex extends React.Component {
     );
   }
 }
+
+/**
+ * Pagination options
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/pagination/custom-pagination-table.js
+ */
+class PaginationTable extends React.Component {
+  sizePerPageListChange = (sizePerPage: number) => {
+    alert(`sizePerPage: ${sizePerPage}`);
+  }
+
+  onPageChange = (page: number, sizePerPage: number) => {
+    alert(`page: ${page}, sizePerPage: ${sizePerPage}`);
+  }
+
+  renderShowsTotal = (start: number, to: number, total: number) => {
+    return (
+      <p style={{ color: 'blue' }}>
+        From {start} to {to}, totals is {total}&nbsp;&nbsp;(its a customize text)
+      </p>
+    );
+  }
+
+  render() {
+    const options: Options<Product> = {
+      onPageChange: this.onPageChange,
+      onSizePerPageList: this.sizePerPageListChange,
+      page: 2,  // which page you want to show as default
+      sizePerPageList: [{
+        text: '5', value: 5
+      }, {
+        text: '10', value: 10
+      }, {
+        text: 'All', value: products.length
+      }], // you can change the dropdown list for size per page
+      sizePerPage: 5, // which size per page you want to locate as default
+      pageStartIndex: 0, // where to start counting the pages
+      paginationSize: 3, // the pagination bar size.
+      prePage: 'Prev', // Previous page button text
+      nextPage: 'Next', // Next page button text
+      firstPage: 'First', // First page button text
+      lastPage: 'Last', // Last page button text
+      prePageTitle: 'Go to previous', // Previous page button title
+      nextPageTitle: 'Go to next', // Next page button title
+      firstPageTitle: 'Go to first', // First page button title
+      lastPageTitle: 'Go to Last', // Last page button title
+      paginationShowsTotal: this.renderShowsTotal, // Accept bool or function
+      paginationPosition: 'top', // default is bottom, top and both is all available
+      keepSizePerPageState: true, // default is false, enable will keep sizePerPage dropdown state(open/clode) when external rerender happened
+      hideSizePerPage: true, // You can hide the dropdown for sizePerPage
+      alwaysShowAllBtns: true, // Always show next and previous button
+      withFirstAndLast: false, // Hide the going to First and Last page button
+      hidePageListOnlyOnePage: true // Hide the page list if only one page.
+    };
+
+    return (
+      <BootstrapTable data={products} pagination={true} options={options}>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Adopted from https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/cell-edit/blur-to-escape-table.js
+ */
+class BlurToEscapeTable extends React.Component {
+  render() {
+    const cellEditProp: CellEdit<Product> = {
+      mode: 'click',
+      blurToEscape: true
+    };
+
+    return (
+      <BootstrapTable data={products} cellEdit={cellEditProp} striped={true} hover={true} condensed={true} bordered={false}>
+        <TableHeaderColumn width='150px' dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Cell classnames, row saving hooks.
+ * @see https://githum.com/AllenFang/react-bootstrap-table/blob/master/examples/js/cell-edit/cell-edit-classname.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/cell-edit/cell-edit-hook-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/manipulation/insert-row-table.js
+ */
+class EditCellClassNameTable extends React.Component {
+  jobNameValidator = (value: string) => {
+    const response: EditValidatorObject = { isValid: true, notification: { type: 'success', msg: '', title: '' } };
+    if (!value) {
+      response.isValid = false;
+      response.notification.type = 'error';
+      response.notification.msg = 'Value must be inserted';
+      response.notification.title = 'Requested Value';
+    } else if (value.length < 10) {
+      response.isValid = false;
+      response.notification.type = 'error';
+      response.notification.msg = 'Value must have 10+ characters';
+      response.notification.title = 'Invalid Value';
+    }
+    return response;
+  }
+
+  jobStatusValidator = (value: string) => {
+    const nan = isNaN(parseInt(value, 10));
+    if (nan) {
+      return 'Job Status must be a integer!';
+    }
+    return true;
+  }
+
+  invalidJobStatus = (cell: string, row: Job) => {
+    console.log(`${cell} at row id: ${row.id} fails on editing`);
+    return 'invalid-jobstatus-class';
+  }
+
+  editingJobStatus = (cell: string, row: Job) => {
+    console.log(`${cell} at row id: ${row.id} in current editing`);
+    return 'editing-jobstatus-class';
+  }
+
+  onBeforeSaveCellAsync = <K extends keyof Job>(row: Job, cellName: K, cellValue: Job[K], done: (ok: boolean) => void): boolean | 1 => {
+    setTimeout(() => {
+      done(false);   // it's not ok to save :(
+    }, 3000);
+    return 1;  // return 1 === async operation.
+  }
+
+  onAfterSaveCell(row: Job, cellName: string, cellValue: any) {
+    alert(`Save cell ${cellName} with value ${cellValue}`);
+    let rowStr = '';
+    for (const prop in row) {
+      rowStr += `${prop}: ${row[prop as keyof Job]}\n`;
+    }
+    alert('The whole row :\n' + rowStr);
+  }
+
+  onAfterInsertRow = (row: any) => {
+    let newRowStr = '';
+
+    for (const prop in row) {
+      newRowStr += `${prop}: ${row[prop]} \n`;
+    }
+    alert('The new row is:\n ' + newRowStr);
+  }
+
+  render() {
+    const cellEditProp: CellEdit<Job> = {
+      mode: 'dbclick',
+      blurToSave: true,
+      beforeSaveCell: this.onBeforeSaveCellAsync,
+      afterSaveCell: this.onAfterSaveCell
+    };
+    const options: Options<Job> = {
+      afterInsertRow: this.onAfterInsertRow   // A hook for after insert rows
+    };
+
+    return (
+      <BootstrapTable data={jobs} cellEdit={cellEditProp} insertRow={true} options={options}>
+        <TableHeaderColumn dataField='id' isKey={true} editable={false}>Job ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='status' editable={{ validator: this.jobStatusValidator }}
+          editColumnClassName={this.editingJobStatus} invalidEditColumnClassName={this.invalidJobStatus}>Job Status</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' editable={{ type: 'textarea', validator: this.jobNameValidator }}
+          editColumnClassName='editing-jobsname-class' invalidEditColumnClassName='invalid-jobsname-class'>Job Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='type' editable={{ type: 'select', options: { values: jobTypes } }}>Job Type</TableHeaderColumn>
+        <TableHeaderColumn dataField='active' editable={{ type: 'checkbox', options: { values: 'Y:N' } }}>Active</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Multiple field sorting, filtering, searching and clearing
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/manipulation/filter-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/manipulation/multi-search-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/manipulation/search-clear-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/manipulation/strict-multi-search-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/remote/remote-store-search.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/sort/custom-caret-sort-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/sort/custom-sort-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/sort/sort-style-table.js
+ */
+class MultiSortAndFiltering extends React.Component {
+  tableRef: BootstrapTable | null;
+  idRef: TableHeaderColumn | null;
+  state = { data: products };
+
+  onSortChange = (name: string, order: SortOrder) => {
+    console.log(`Next sort = ${name}:${order}`);
+  }
+
+  cleanSort = () => { this.tableRef.cleanSort(); };
+
+  cleanSelected = () => { this.tableRef.cleanSelected(); };
+
+  onFilterChange = (filter: FilterData) => {
+    Object.keys(filter).forEach((column) => {
+      console.log(`Filtering ${column}: ${JSON.stringify(filter[column])}`);
+    });
+  }
+
+  cleanFilters = () => { this.idRef.cleanFiltered(); };
+
+  afterColumnFilter = (filterConds: ReadonlyArray<FilterData>, result: ReadonlyArray<Product>) => {
+    console.log('Filter Conditions: ');
+    filterConds.forEach((filterCond: FilterData) => {
+      Object.keys(filterCond).forEach((fieldName: string) =>
+        console.log(`Filter column = ${fieldName}, Filter value = ${filterCond[fieldName]}`));
+    });
+    console.log('Result is:');
+    for (const resultItem of result) {
+      console.log(`Product: ${resultItem.id}, ${resultItem.name}, ${resultItem.price}`);
+    }
+  }
+
+  onSearchChange = (searchText: string, colInfos: ReadonlyArray<ColumnDescription<Product>>, multiColumnSearch: boolean) => {
+    this.setState({ data: products.filter((product) => product.name = searchText) });
+  }
+
+  afterSearch = (searchText: string, result: ReadonlyArray<Product>) => {
+    console.log(`Your search text is ${searchText}`);
+    console.log('Result is:');
+    for (const resultItem of result) {
+      console.log(`Product: ${resultItem.id}, ${resultItem.name}, ${resultItem.price}`);
+    }
+  }
+
+  getNameCaret = (direction: SortOrder | null, fieldName: string) =>
+    (direction === 'asc')
+      ? (<span> up</span>)
+      : (direction === 'desc')
+        ? (<span> down</span>)
+        : (<span> up/down</span>)
+
+  revertSortFunc = (a: Product, b: Product, order: SortOrder) =>
+    (order === 'desc') ? a.price - b.price : b.price - a.price
+
+  customSortStyle = (order: SortOrder, dataField: string) =>
+    (order === 'desc') ? 'sort-desc' : 'sort-asc'
+
+  render() {
+    const options: Options<Product> = {
+      onSortChange: this.onSortChange,
+      onFilterChange: this.onFilterChange,
+      noDataText: 'This is custom text for empty data',
+      withoutNoDataText: false,
+      afterColumnFilter: this.afterColumnFilter,
+      onSearchChange: this.onSearchChange,
+      afterSearch: this.afterSearch,
+      clearSearch: true,
+      sortIndicator: true
+    };
+    return (
+      <div>
+        <button className='btn ben-default' onClick={this.cleanSort}>Clean</button>
+        <BootstrapTable data={this.state.data} options={options} multiColumnSort={2}
+          multiColumnSearch={true} scrollTop={'Bottom'} strictSearch={true} fetchInfo={{ dataTotalSize: 5 }}>
+          <TableHeaderColumn dataField='id' isKey={true} searchable={false} dataSort={true}
+            filter={{ type: 'TextFilter', delay: 500 }} sortHeaderColumnClassName='sorted'>Product ID</TableHeaderColumn>
+          <TableHeaderColumn dataField='name' defaultASC={true} dataSort={true} caretRender={this.getNameCaret}
+            sortHeaderColumnClassName={this.customSortStyle}>Product Name</TableHeaderColumn>
+          <TableHeaderColumn dataField='price' sortFunc={this.revertSortFunc}
+            filter={{ type: 'NumberFilter', options: [10, 50, 100], numberComparators: ['>=', '<=', '='] }}>Product Price</TableHeaderColumn>
+        </BootstrapTable>
+      </div>
+    );
+  }
+}
+
+/**
+ * Sort with extra data.
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/sort/custom-sort-with-extra-data-table.js
+ */
+class CustomSortWithExtraDataTable extends React.Component {
+  sortByName = (a: any, b: any, order: SortOrder, field: string, enumObject: any) => {
+    if (order === 'desc') {
+      if (enumObject[a[field]] > enumObject[b[field]]) {
+        return -1;
+      } else if (enumObject[a[field]] < enumObject[b[field]]) {
+        return 1;
+      }
+      return 0;
+    }
+    if (enumObject[a[field]] < enumObject[b[field]]) {
+      return -1;
+    } else if (enumObject[a[field]] > enumObject[b[field]]) {
+      return 1;
+    }
+    return 0;
+  }
+
+  render() {
+    return (
+      <BootstrapTable data={products}>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='quality'
+          dataFormat={enumFormatter} formatExtraData={qualityType}
+          dataSort={true}
+          sortFunc={this.sortByName} sortFuncExtraData={qualityType}>
+          Product Quality</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Render custom pagination with provided SizePerPageDropDown component.
+ */
+class CustomPagination extends React.Component {
+  renderPagination = (props: PaginationPanelProps) => (
+    <div>
+      <SizePerPageDropDown variation='dropup' options={props.sizePerPageList} btnContextual='primary' currSizePerPage={props.sizePerPage.toString()} />
+      <div>
+        <button onClick={() => props.changeSizePerPage(25)} className='btn btn-default'>Click to force size per page as 25</button>
+        <button onClick={() => props.toggleDropDown()} className='btn btn-default'>Click to force toggle dropdown</button>
+        <button onClick={() => props.changePage(3)} className='btn btn-default'>Jump to page 3</button>
+      </div>
+    </div>
+  )
+
+  render() {
+    const options: Options = {
+      paginationPanel: this.renderPagination
+    };
+
+    return (
+      <BootstrapTable data={products} options={options} pagination>
+        <TableHeaderColumn dataField='id' />
+        <TableHeaderColumn dataField='name' />
+        <TableHeaderColumn dataField='price' />
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Customize the entire insert modal.
+ * Adapted from https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/insert-modal/custom-insert-modal.js
+ */
+class CustomModal extends React.Component {
+  handleSaveBtnClick = (columns: ReadonlyArray<InsertModalColumnDescription<Product>>, onSave: (row: any) => void) => {
+    const newRow: {[field: string]: string} = {};
+    columns.forEach((column, i) => {
+      newRow[column.field] = (this.refs[column.field] as HTMLInputElement).value;
+    }, this);
+    onSave(newRow);
+  }
+
+  createCustomModal = (
+    onModalClose: () => void,
+    onSave: (row: any) => void,
+    columns: ReadonlyArray<InsertModalColumnDescription<Product>>,
+    validateState: { [dataField: string]: string },
+    ignoreEditable: boolean
+  ) => (
+    <div style={{ backgroundColor: '#eeeeee' }} className='modal-content'>
+      <h2 style={{ color: 'red' }}>Custom Insert Modal</h2>
+      <div>
+        {
+          columns.map((column, i) => {
+            const {
+              editable,
+              format,
+              field,
+              name,
+              hiddenOnInsert
+            } = column;
+
+            if (hiddenOnInsert) {
+              return null;
+            }
+            const error = validateState[field] ?
+              (<span className='help-block bg-danger'>{validateState[field]}</span>) :
+              null;
+            return (
+              <div className='form-group' key={field}>
+                <label>{name} : </label>
+                <input ref={field} type='text' defaultValue={''} />
+                {error}
+              </div>
+            );
+          })
+        }
+      </div>
+      <div>
+        <button className='btn btn-danger' onClick={onModalClose}>Leave</button>
+        <button className='btn btn-success' onClick={(e) => this.handleSaveBtnClick(columns, onSave)}>Confirm</button>
+      </div>
+    </div>
+  )
+
+  render() {
+    const options: Options<Product> = {
+      insertModal: this.createCustomModal
+    };
+    return (
+      <BootstrapTable data={products} options={options} insertRow>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Custom Insert Modal Fields, both as a custom component and as custom fields.
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/insert-modal/custom-insert-modal-field.js
+ */
+class SalesRadioField extends React.Component<{editorClass: string, ignoreEditable: boolean}> {
+  yes: HTMLInputElement | null;
+  no: HTMLInputElement | null;
+
+  getFieldValue = () => {
+    return this.yes.checked ? 'Yes' : 'No';
+  }
+
+  render() {
+    return (
+      <div>
+        <label className='radio-inline'>
+          <input ref={(node) => { this.yes = node; }} type='radio' name='optradio' value='Yes' />Yes
+        </label>
+        <label className='radio-inline'>
+          <input ref={(node) => { this.no = node; }} type='radio' name='optradio' value='No' />No
+        </label>
+      </div>
+    );
+  }
+}
+class CustomInsertModalFieldTable extends React.Component {
+  customKeyField = (
+    column: InsertModalColumnDescription<Product>,
+    attr: EditableAttrs,
+    editorClass: string,
+    ignoreEditable: boolean
+  ) => {
+    const seqId = products.length;
+    return (
+      <input type='text' { ...attr } disabled value={seqId} className={`${editorClass}`} />
+    );
+  }
+
+  customNameField = (
+    column: InsertModalColumnDescription<Product>,
+    attr: EditableAttrs,
+    editorClass: string,
+    ignoreEditable: boolean,
+    defaultValue: any) => {
+    const fruits = ['banana', 'apple', 'orange', 'tomato', 'strawberries'];
+    return (
+      <select className={`${editorClass}`} { ...attr }>
+        {
+          fruits.map(name => (<option key={name} value={name}>{name}</option>))
+        }
+      </select>
+    );
+  }
+
+  customSaleField = (
+    column: InsertModalColumnDescription<Product>,
+    attr: EditableAttrs,
+    editorClass: string,
+    ignoreEditable: boolean,
+    defaultValue: any) => {
+    return (
+      <SalesRadioField ref={attr.ref} editorClass={editorClass} ignoreEditable={ignoreEditable} />
+    );
+  }
+
+  render() {
+    return (
+      <BootstrapTable ref='table' data={products} insertRow={true}>
+        <TableHeaderColumn dataField='id' isKey={true} customInsertEditor={{ getElement: this.customKeyField }}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' customInsertEditor={{ getElement: this.customNameField }}>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='sales' customInsertEditor={{ getElement: this.customSaleField }}>On Sales?</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Custom modal header, body & footer.
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/insert-modal/default-custom-insert-modal-header.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/insert-modal/custom-insert-modal-body.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/insert-modal/default-custom-insert-modal-footer.js
+ */
+interface MyCustomBodyProps {
+  columns: ReadonlyArray<InsertModalColumnDescription<Product>>;
+  validateState: { [dataField: string]: string };
+  ignoreEditable: boolean;
+}
+class MyCustomBody extends React.Component<MyCustomBodyProps> implements ModalBodyInterface<Product> {
+  getFieldValue() {
+    const newRow: Partial<Product> = {};
+    this.props.columns.forEach((column, i) => {
+      newRow[column.field] = (this.refs[column.field] as HTMLInputElement).value;
+    }, this);
+    return newRow as Product;
+  }
+
+  render() {
+    const { columns, validateState } = this.props;
+    return (
+      <div className='modal-body'>
+        <h2 style={{ color: 'red' }}>Custom body</h2>
+        <div>
+          {
+            this.props.columns.map((column, i) => {
+              const {
+                editable,
+                format,
+                field,
+                name,
+                hiddenOnInsert
+              } = column;
+
+              if (hiddenOnInsert) {
+                return null;
+              }
+              const error = validateState[field] ?
+                (<span className='help-block bg-danger'>{validateState[field]}</span>) :
+                null;
+              return (
+                <div className='form-group' key={field}>
+                  <label>{name}</label>
+                  <input ref={field} type='text' defaultValue={''} />
+                  {error}
+                </div>
+              );
+            })
+          }
+        </div>
+      </div>
+    );
+  }
+}
+class DefaultCustomInsertModalHeaderFooterTable extends React.Component {
+  createCustomModalFooter = (closeModal: () => void, save: () => void) => {
+    return (
+      <InsertModalFooter
+        className='my-custom-class'
+        saveBtnText='CustomSaveText'
+        closeBtnText='CustomCloseText'
+        closeBtnContextual='btn-warning'
+        saveBtnContextual='btn-success'
+        closeBtnClass='my-close-btn-class'
+        saveBtnClass='my-save-btn-class'
+        beforeClose={(e) => {}}
+        beforeSave={(e) => {}}
+        onModalClose={closeModal}
+        onSave={save} />
+    );
+  }
+
+  createCustomModalHeader = (closeModal: () => void, save: () => void) => {
+    return (
+      <InsertModalHeader
+        className='my-custom-class'
+        title='This is my custom title'
+        beforeClose={(e) => { }}
+        onModalClose={closeModal}
+        hideClose={true} />
+    );
+  }
+
+  createCustomModalBody = (
+    columns: ReadonlyArray<InsertModalColumnDescription<Product>>,
+    validateState: { [dataField: string]: string },
+    ignoreEditable: boolean
+  ) => (
+    <MyCustomBody
+      columns={columns}
+      validateState={validateState}
+      ignoreEditable={ignoreEditable}
+    />
+  )
+
+  render() {
+    const options: Options<Product> = {
+      insertModalFooter: this.createCustomModalFooter,
+      insertModalHeader: this.createCustomModalHeader,
+      insertModalBody: this.createCustomModalBody
+    };
+    return (
+      <BootstrapTable data={products} options={options} insertRow={true}>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Custom Toolbar, including Search Panel & Buttons, and custom delete confirmation.
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/toolbar/custom-button-group.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/toolbar/custom-toolbar-1.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/search/default-custom-search-field.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/search/custom-search-panel-1.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/search/fully-custom-search-field.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/insert-button/default-custom-insert-button.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/delete-button/default-custom-delete-button.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/custom/csv-button/default-custom-csv-button.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/manipulation/del-row-custom-confirm.js
+ */
+class MySearchField extends React.Component<SearchFieldProps> implements SearchFieldInterface {
+  field: SearchField | null;
+
+  getValue() {
+    return this.field.getValue();
+  }
+
+  setValue(search: string) {
+    this.field.setValue(search);
+  }
+
+  render() {
+    const { ...rest} = this.props;
+    return (
+      <SearchField
+        className={this.props.className}
+        defaultValue={this.props.defaultValue}
+        placeholder={this.props.placeholder}
+        onKeyUp={this.props.onKeyUp}
+        ref={(node) => { this.field = node; }}
+      />
+    );
+  }
+}
+class CustomButtonGroup extends React.Component {
+  createInsertButton = (onClick: (e: React.MouseEvent<{}>) => void) => (
+    <InsertButton
+      btnText='CustomInsertText'
+      btnContextual='btn-warning'
+      className='my-custom-class'
+      btnGlyphicon='glyphicon-edit'
+      onClick={onClick} />
+  )
+
+  createDeleteButton = (onClick: (e: React.MouseEvent<{}>) => void) => (
+    <DeleteButton
+      btnText='CustomDeleteText'
+      btnContextual='btn-danger'
+      className='my-custom-class'
+      btnGlyphicon='glyphicon-edit'
+      onClick={onClick} />
+  )
+
+  createExportCSVButton = (onClick: (e: React.MouseEvent<{}>) => void) => (
+      <ExportCSVButton
+        btnText='CustomExportText'
+        btnContextual='btn-danger'
+        className='my-custom-class'
+        btnGlyphicon='glyphicon-edit'
+        onClick={onClick} />
+  )
+
+  createShowSelectedOnlyButton = (onClick: (e: React.MouseEvent<{}>) => void, showSelected: boolean) => (
+    <ShowSelectedOnlyButton
+      showAllText='Show All'
+      showOnlySelectText='Show Selected'
+      btnContextual='btn-info'
+      className='my-custom-class'
+      onClick={onClick} />
+  )
+
+  createCustomButtonGroup = (props: ButtonGroupProps) => (
+    <div className='my-custom-class'>
+      {props.showSelectedOnlyBtn}
+      {props.exportCSVBtn}
+      {props.insertBtn}
+      {props.deleteBtn}
+      <button type='button'
+        className={`btn btn-primary`}>
+        MyCustomBtn
+        </button>
+    </div>
+  )
+
+  createCustomSearchField = (props: SearchFieldProps) => (
+    <MySearchField
+      className='my-custom-class'
+      defaultValue={props.defaultValue}
+      placeholder={props.placeholder}
+      onKeyUp={props.onKeyUp}
+    />
+  )
+
+  createCustomClearSearch = (onClick: (e: React.MouseEvent<{}>) => void) => (
+    <button
+      className='btn btn-success'
+      onClick={onClick}>
+      Clear Search
+    </button>
+  )
+
+  createCustomSearchPanel = (props: SearchPanelProps) => (
+    <div>
+      <div className='input-group'>
+        <span className='input-group-btn'>
+          {props.clearBtn}
+        </span>
+      </div>
+      {props.searchField}
+    </div>
+  )
+
+  createCustomToolBar = (props: ToolBarProps) => {
+    return (
+      <div style={{ margin: '15px' }}>
+        {props.components.btnGroup}
+        <div className='col-xs-8 col-sm-4 col-md-4 col-lg-2'>
+          {props.components.searchPanel}
+        </div>
+      </div>
+    );
+  }
+
+  customConfirm = (next: () => void, dropRowKeys: ReadonlyArray<number>) => {
+    const dropRowKeysStr = dropRowKeys.join(',');
+    if (confirm(`(It's a custom confirm)Are you sure you want to delete ${dropRowKeysStr}?`)) {
+      next();
+    }
+  }
+
+  render() {
+    const selectRow: SelectRow = {
+      mode: 'checkbox',
+      showOnlySelected: true
+    };
+    const options: Options<Product> = {
+      insertBtn: this.createInsertButton,
+      deleteBtn: this.createDeleteButton,
+      exportCSVBtn: this.createExportCSVButton,
+      showSelectedOnlyBtn: this.createShowSelectedOnlyButton,
+      btnGroup: this.createCustomButtonGroup,
+      clearSearch: true,
+      clearSearchBtn: this.createCustomClearSearch,
+      searchField: this.createCustomSearchField,
+      searchPanel: this.createCustomSearchPanel,
+      toolBar: this.createCustomToolBar,
+      searchDelayTime: 3000,
+      handleConfirmDeleteRow: this.customConfirm
+    };
+    return (
+      <BootstrapTable data={products}
+        options={options}
+        selectRow={selectRow}
+        insertRow={true}
+        deleteRow={true}
+        exportCSV={true}
+        search={true}>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Expanding Rows & Selection
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/expandRow/expand-row-by-column.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/expandRow/expand-row-with-selection.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/expandRow/custom-expand-indicator.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/expandRow/custom-expand-class.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/expandRow/auto-collapse.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/expandRow/manage-expanding.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/all-select.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/custom-multi-select-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/default-select-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/select-bgcolor-dynamic-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/select-filter-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/select-hook-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/select-row-class-table.js
+ */
+class ExpandRowExample extends React.Component<{}, {expanding: number[]}> {
+  isExpandableRow = (row: any) => row.id === 2;
+
+  expandComponent = (row: any) => (
+      <div>You expanded the row.</div>
+  )
+
+  expandColumnComponent = ({ isExpandableRow, isExpanded }: ExpandColumnComponentProps) => {
+    const content = isExpandableRow
+      ? (isExpanded ? '(-)' : '(+)')
+      : ' ';
+    return (
+      <div> {content} </div>
+    );
+  }
+
+  handleExpand = (rowKey: number, isExpand: boolean) => {
+    if (isExpand) {
+      this.setState({ expanding: [...this.state.expanding] });
+    } else {
+      this.setState({ expanding: [...this.state.expanding.filter(id => id !== rowKey)] });
+    }
+  }
+
+  onSelectAll = (isSelected: boolean) => (isSelected) ? products.map(row => row.id) : [];
+
+  onSelect = (row: Product, isSelected: boolean, e: React.MouseEvent<any>, rowIndex: number) => {
+    const rowStr = `id: "${row.id}", name: ${row.name}, price: ${row.price}`;
+    console.log(e);
+    alert(`Selected: ${isSelected}, rowIndex: ${rowIndex}, row: ${rowStr}`);
+  }
+
+  customMultiSelect = (props: CustomSelectProps) => (
+      <div className='checkbox-personalized'>
+        <input
+          type={props.type}
+          name={'checkbox' + props.rowIndex}
+          id={'checkbox' + props.rowIndex}
+          checked={props.checked}
+          disabled={props.disabled}
+          onChange={e => props.onChange(e, props.rowIndex)}
+          ref={input => {
+            if (input) {
+              input.indeterminate = props.indeterminate;
+            }
+          }} />
+        <label htmlFor={'checkbox' + props.rowIndex}>
+          <div className='check'></div>
+        </label>
+    </div>
+  )
+
+  selectedRowClass = (row: Product, isSelect: boolean) =>
+    (isSelect)
+      ? ((row.id >= 3) ? 'bigger-than-three-select-row' : 'less-than-three-select-row')
+      : ''
+
+  render() {
+    const options: Options<Product> = {
+      expandRowBgColor: 'rgb(242, 255, 163)',
+      expandBy: 'column',
+      onlyOneExpanding: true,
+      expanding: this.state.expanding,
+      onExpand: this.handleExpand,
+      expandParentClass: 'custom-expand-parent',
+      expandBodyClass: (row, rowIndex, isExpanding) => {
+        return (!isExpanding)
+          ? 'current-is-hidden'
+          : (rowIndex > 1)
+            ? 'custom-expand-body-1'
+            : 'custom-expand-body-0';
+      }
+    };
+    const selectRow: SelectRow<Product> = {
+      mode: 'checkbox',
+      bgColor: (row: Product, isSelect: boolean) =>
+        (isSelect)
+          ?  ((row.id < 2) ? 'blue' : ((row.id < 4) ?  'red' : 'yellow'))
+          : null,
+      clickToSelect: true,  // click to select, default is false
+      clickToExpand: true,  // click to expand row, default is false
+      onSelect: this.onSelect,
+      onSelectAll: this.onSelectAll,
+      customComponent: this.customMultiSelect,
+      hideSelectColumn: false,
+      selected: [0, 2],
+      showOnlySelected: true,
+      onlyUnselectVisible: true,
+      className: this.selectedRowClass,
+      columnWidth: '60px',
+      unselectable: [1, 3]
+    };
+    const expandColumnOptions: ExpandColumnOptions = {
+      expandColumnVisible: true,
+      expandColumnBeforeSelectColumn: false,
+      expandColumnComponent: this.expandColumnComponent,
+      columnWidth: 50
+    };
+    return (
+      <BootstrapTable data={products}
+        options={options}
+        expandableRow={this.isExpandableRow}
+        expandComponent={this.expandComponent}
+        expandColumnOptions={expandColumnOptions}
+        autoCollapse={{ sort: true, search: true, filter: true }}
+        selectRow={selectRow}>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' expandable={false}>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price' expandable={false}>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Table mouse enter/leave events
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/others/mouse-event-table.js
+ */
+class MouseEventTable extends React.Component {
+  render() {
+    const options: Options<Product> = {
+      onMouseLeave: () => { console.log('mouse left table'); },
+      onMouseEnter: () => { console.log('mouse entered table'); },
+      onRowMouseOut: (row: any, e: React.MouseEvent<{}>) => {
+        console.log(e);
+        console.log('mouse left row ' + row.id);
+      },
+      onRowMouseOver: (row: any, e: React.MouseEvent<{}>) => {
+        console.log(e);
+        console.log('mouse entered row ' + row.id);
+      }
+    };
+
+    return (
+      <BootstrapTable data={products} options={options}>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Hidden on insert modal with async row error callback & read-only field
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/advance/hide-on-insert-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/advance/insert-error-handle-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/advance/validator-table-read-only.js
+ */
+class HideOnInsertTable extends React.Component {
+  handleAddRowWithASyncError = (row: any, colInfo: ReadonlyArray<ColumnDescription<Job>>, errorCallback: (msg: string) => void) => {
+    setTimeout(() => {
+      errorCallback('Sorry, There\'s some error happend');
+    }, 5000);
+    return false;
+  }
+  render() {
+    const options: Options<Job> = {
+      onAddRow: this.handleAddRowWithASyncError
+    };
+    return (
+      <BootstrapTable data={jobs} insertRow={true} options={options}>
+        <TableHeaderColumn dataField='id' isKey={true} autovalue>Job ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' hiddenOnInsert>Job Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='type' editable={{ type: 'select', options: { values: jobTypes }, readOnly: true }}>Job Type</TableHeaderColumn>
+        <TableHeaderColumn dataField='active' editable={{ type: 'checkbox', options: { values: 'Y:N' } }}>Active</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Edit field types
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/advance/edit-type-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/advance/insert-default-value-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/advance/insert-error-handle-table.js
+ */
+class EditTypeTable extends React.Component {
+  formatType = (cell: string) => `TYPE_${cell}`;
+
+  jobTypes = (row: ExtendedJob) => (row.id > 2) ? ['A', 'B'] : ['B', 'C', 'D', 'E'];
+
+  handleAddRowWithSyncError = () => {
+    return 'Sorry, There\'s some error happend';
+  }
+
+  render() {
+    const attrs = {
+      rows: 10,
+      onKeyDown: () => { console.log('keydown event trigger'); }
+    };
+    const cellEditProp: CellEdit<ExtendedJob> = {
+      mode: 'click',
+      blurToSave: true
+    };
+    const options: Options<ExtendedJob> = {
+      onAddRow: this.handleAddRowWithSyncError
+    };
+    return (
+      <BootstrapTable data={extendedJobs} cellEdit={cellEditProp} options={options} insertRow={true}>
+        <TableHeaderColumn dataField='id' isKey={true}>Job ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' editable={{ type: 'textarea', attrs, defaultValue: 'Default Job Name' }}>Job Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='type1' dataFormat={this.formatType} editable={{ type: 'select', options: { values: jobTypes }, defaultValue: 'C' }}>Job Type1</TableHeaderColumn>
+        <TableHeaderColumn dataField='type2' editable={{ type: 'select', options: { values: this.jobTypes }, defaultValue: 'A' }}>Job Type2</TableHeaderColumn>
+        <TableHeaderColumn dataField='active' editable={{ type: 'checkbox', options: { values: 'Y:N' }, defaultValue: 'N' }}>Active</TableHeaderColumn>
+        <TableHeaderColumn dataField='datetime' editable={{ type: 'datetime', defaultValue: new Date() }}>Date Time</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * React component format for column.
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-format/react-column-format-table.js
+ */
+class ActiveFormatter extends React.Component<{ active: boolean }> {
+  render() {
+    return (
+      <input type='checkbox' checked={this.props.active} />
+    );
+  }
+}
+
+export default class ReactColumnFormatTable extends React.Component {
+  activeFormatter = (cell: boolean, row: ExtendedJob) => (<ActiveFormatter active={cell} />);
+  render() {
+    return (
+      <BootstrapTable data={extendedJobs}>
+        <TableHeaderColumn dataField='id' isKey={true} hidden={true}>Job ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Job Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='active' dataFormat={this.activeFormatter}>Active</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Format Extra Data
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-format/extra-data-column-format-table.js
+ */
+class ExtraDataColumnFormatTable extends React.Component {
+  enumFormatter = (cell: number, row: Product, enumObject: {[id: number]: string}) => enumObject[cell];
+  render() {
+    return (
+      <BootstrapTable data={products} >
+        <TableHeaderColumn dataField='id' isKey={true} dataAlign='center'>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' headerAlign='center' dataAlign='right'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='quality' dataFormat={enumFormatter} formatExtraData={qualityType}>Product Quality</TableHeaderColumn>
+        <TableHeaderColumn dataField='inStock' dataFormat={enumFormatter} formatExtraData={inStockStatus}>Product Stock Status</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Column titles
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column/column-title-table.js
+ */
+class ColumnAlignTable extends React.Component {
+  customTitle = (cell: number, row: any, rowIndex: number, colIndex: number) => `${row.name} for ${cell}`;
+
+  render() {
+    const options: Options<Product> = {
+      exportCSVText: 'my_export',
+      insertText: 'my_insert',
+      deleteText: 'my_delete',
+      saveText: 'my_save',
+      closeText: 'my_close'
+    };
+    return (
+      <BootstrapTable data={products} options={options}>
+        <TableHeaderColumn dataField='id' isKey={true} columnTitle={this.customTitle} >Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' width='50%' headerTitle={false} columnTitle={true}>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price' columnTitle='Hard code string' headerText='Custom Title'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Table Footer
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/footer/footer-table.js
+ */
+class FooterTable extends React.Component {
+  render() {
+    const footerData: FooterData[][] = [
+      [
+        { label: 'Total', columnIndex: 0 },
+        {
+          label: 'Total value',
+          columnIndex: 2,
+          align: 'right',
+          formatter: (tableData: Array<{price: number}>) => {
+            let label = 0;
+            for (let i = 0, tableDataLen = tableData.length; i < tableDataLen; i++) {
+              label += tableData[i].price;
+            }
+            return (
+              <strong>{label}</strong>
+            );
+          }
+        }
+      ]
+    ];
+
+    return (
+      <div>
+        <BootstrapTable data={products} footerData={footerData} footer pagination search keyBoardNav>
+          <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+          <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+          <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+        </BootstrapTable>
+      </div>
+    );
+  }
+}
+
+/**
+ * Keyboard navigation
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/keyboard-nav/custom-style-nav-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/keyboard-nav/custom-style-nav-with-cell-edit-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/keyboard-nav/disable-click-to-nav-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/keyboard-nav/enter-to-edit-with-nav-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/keyboard-nav/nav-with-expand-table.js
+ */
+class CustomStyleNavTable extends React.Component {
+  customStyle = (cell: any, row: any) => {
+    return {
+      backgroundColor: 'red'
+    };
+  }
+
+  render() {
+    const cellEdit: CellEdit<Product> = {
+      mode: 'click',
+      blurToSave: true
+    };
+    const keyBoardNav = {
+      customStyleOnEditCell: this.customStyle,
+      customStyle: this.customStyle,
+      clickToNav: false,
+      enterToEdit: true,
+      enterToExpand: false
+    };
+    return (
+      <BootstrapTable data={products} keyBoardNav={keyBoardNav} cellEdit={cellEdit}>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Table body styles
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/style/inline-style-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/style/table-class-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/style/td-class-string-table.js
+ */
+class TrClassStringTable extends React.Component {
+  render() {
+    return (
+      <BootstrapTable insertRow exportCSV data={products}
+        tableStyle={{ border: '#0000FF 2.5px solid' }}
+        containerStyle={{ border: '#FFBB73 2.5px solid' }}
+        headerStyle={{ border: 'red 1px solid' }}
+        bodyStyle={{ border: 'green 1px solid' }}
+        tableHeaderClass='my-header-class'
+        tableBodyClass='my-body-class'
+        containerClass='my-container-class'
+        tableContainerClass='my-table-container-class'
+        headerContainerClass='my-header-container-class'
+        bodyContainerClass='my-body-container-class'
+        trClassName='tr-string-example'>
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' columnClassName='td-column-string-example'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price' className='td-header-string-example'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Table styles set by functions.
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/style/td-class-function-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/style/tr-class-function-table.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/style/tr-style-table.js
+ */
+class TrClassFunctionTable extends React.Component {
+  headerColumnClassNameFormat = () => 'th-string-example';
+
+  columnClassNameFormat = (fieldValue: string | number, row: Product, rowIdx: number, colIdx: number) =>
+    rowIdx % 2 === 0 ? 'td-column-function-even-example' : 'td-column-function-odd-example'
+
+  trClassFormat = (rowData: ReadonlyArray<Product>, rIndex: number) =>
+    rIndex % 3 === 0 ? 'tr-function-example' : ''
+
+  trStyle = (row: Product, rowIndex: number) => ({ backgroundColor: '#FFFAFA' });
+
+  render() {
+    return (
+      <BootstrapTable data={products} trClassName={this.trClassFormat} trStyle={this.trStyle} >
+        <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' className={this.headerColumnClassNameFormat}>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price' columnClassName={this.columnClassNameFormat}>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Filter types.
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/all-filters.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/date-filter-programmatically.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/number-filter-programmatically.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/regex-filter-programmatically.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/select-filter-programmatically.js
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/text-filter-programmatically.js
+ */
+class AllFilters extends React.Component {
+  name1: TableHeaderColumn | null;
+  name2: TableHeaderColumn | null;
+  quality: TableHeaderColumn | null;
+  price: TableHeaderColumn | null;
+  satisfaction: TableHeaderColumn | null;
+  inStockDate: TableHeaderColumn | null;
+
+  handlerClickCleanFiltered = () => {
+    this.name1.cleanFiltered();
+    this.name2.cleanFiltered();
+    this.quality.cleanFiltered();
+    this.price.cleanFiltered();
+    this.satisfaction.cleanFiltered();
+    this.inStockDate.cleanFiltered();
+  }
+
+  applyFiltersProgramatically = () => {
+    this.name1.applyFilter('Item 1');
+    this.name2.applyFilter('[name]');
+    this.quality.applyFilter(1);
+    this.price.applyFilter({
+      number: 10.5,
+      comparator: '<='
+    });
+    this.satisfaction.applyFilter({
+      number: 2,
+      comparator: '>'
+    });
+    this.inStockDate.applyFilter({
+      date: new Date(2015, 0, 1),
+      comparator: '='
+    });
+  }
+
+  dateFormatter = (cell: Date, row: any) => {
+    if (typeof cell !== 'object') {
+      cell = new Date(cell);
+    }
+
+    return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
+  }
+
+  render() {
+    const satisfaction = [0, 1, 2, 3, 4, 5];
+    return (
+      <BootstrapTable ref='table' data={products}>
+        <TableHeaderColumn dataField='id' isKey={true}>
+          Product ID
+          <br /><a onClick={this.handlerClickCleanFiltered} style={{ cursor: 'pointer' }}>clear filters</a>
+        </TableHeaderColumn>
+        <TableHeaderColumn ref={(node) => { this.name1 = node; }} dataField='name' filter={{ type: 'TextFilter', placeholder: 'Please enter a value' }}>Product Name</TableHeaderColumn>
+        <TableHeaderColumn ref={(node) => { this.name2 = node; }} dataField='name' filter={{ type: 'RegexFilter', placeholder: 'Please enter a regex' }}>Product Name</TableHeaderColumn>
+        < TableHeaderColumn ref={(node) => { this.quality = node; }} dataField='quality' filter={{ type: 'SelectFilter', options: qualityType }}
+          dataFormat={enumFormatter} formatExtraData={qualityType}>Product Quality</TableHeaderColumn>
+        <TableHeaderColumn ref={(node) => { this.price = node; }} dataField='price' filter={{ type: 'NumberFilter', delay: 1000 }}>Product Price</TableHeaderColumn>
+        < TableHeaderColumn ref= {(node) => { this.satisfaction = node; }} dataField='satisfaction' filter={{ type: 'NumberFilter', options: satisfaction }}>Buyer Satisfaction</TableHeaderColumn>
+        < TableHeaderColumn ref= {(node) => { this.inStockDate = node; }} dataField='inStockDate' filter={{ type: 'DateFilter' }} dataFormat={this.dateFormatter}>In Stock From</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * Set Array filter programatically
+ * @see https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/array-filter-programmatically.js
+ */
+class ProgrammaticallyArrayFilter extends React.Component {
+  table: BootstrapTable | null;
+
+  /* Filtering passing an array of values */
+  handleBtnClick = () => {
+    this.table.handleFilterData({
+      name: { type: 'ArrayFilter', value: ['Item name 3', 'Item name 4'] },
+      price: { type: 'ArrayFilter', value: [2100, 2104] }
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <button onClick={this.handleBtnClick} className='btn btn-default'>Click to apply text filter</button>
+        <BootstrapTable ref={(node) => { this.table = node; }} data={products}>
+          <TableHeaderColumn dataField='id' isKey={true}>Product ID</TableHeaderColumn>
+          <TableHeaderColumn dataField='name' filter={{ type: 'TextFilter', delay: 1000 }}>Product Name</TableHeaderColumn>
+          <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+        </BootstrapTable>
+      </div>
+    );
+  }
+}
diff --git a/types/react-bootstrap-table/tslint.json b/types/react-bootstrap-table/tslint.json
index bf0a68ff4e..6fafe521cb 100644
--- a/types/react-bootstrap-table/tslint.json
+++ b/types/react-bootstrap-table/tslint.json
@@ -1,10 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-      // TODO
-      "ban-types": false,
-      "prefer-method-signature": false,
-      "strict-export-declare-modifiers": false,
-      "no-empty-interface": false
-    }
+    "extends": "dtslint/dt.json"
   }
diff --git a/types/react-bootstrap-table/v2/index.d.ts b/types/react-bootstrap-table/v2/index.d.ts
new file mode 100644
index 0000000000..11c0f7f943
--- /dev/null
+++ b/types/react-bootstrap-table/v2/index.d.ts
@@ -0,0 +1,758 @@
+// Type definitions for react-bootstrap-table 2.6
+// Project: https://github.com/AllenFang/react-bootstrap-table
+// Definitions by: Frank Laub <https://github.com/flaub>, Aleksander Lode <https://github.com/alelode>, Josué Us <https://github.com/UJosue10>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+// documentation taken from http://allenfang.github.io/react-bootstrap-table/docs.html
+
+import { ComponentClass, Props, ReactElement } from 'react';
+import { EventEmitter } from 'events';
+
+/**
+ * Interface spec for sepcifying functionality to handle remotely
+ *
+ * Consult [documentation](https://allenfang.github.io/react-bootstrap-table/docs.html#remote)
+ * for more info
+ */
+export interface RemoteObjSpec {
+	/**
+	 * If set, cell edits will be handled remotely
+	 */
+	cellEdit?: boolean;
+	/**
+	 * If set insertions will be handled remotely
+	 */
+	insertRow?: boolean;
+	/**
+	 * If set deletion will be handled remotely
+	 */
+	dropRow?: boolean;
+	/**
+	 * If set filters will be handled remotely
+	 */
+	filter?: boolean;
+	/**
+	 * If set search will be handled remotely
+	 */
+	search?: boolean;
+	/**
+	 * If set, exporting CSV will be handled remotely
+	 */
+	exportCSV?: boolean;
+	/**
+	 * If set sorting will be handled remotely
+	 */
+	sort?: boolean;
+	/**
+	 * If set pagination will be handled remotely
+	 */
+	pagination?: boolean;
+}
+
+export interface BootstrapTableProps extends Props<BootstrapTable> {
+	/**
+	 * Set version='4' to use bootstrap@4, else bootstrap@3 is used.
+	 */
+    version?: string;
+	/**
+	 * Use data to specify the data that you want to display on table.
+	 */
+	data: any[];
+	/**
+	 * If set, data is remote (use also fetchInfo)
+	 */
+	remote?: ((remobeObj: RemoteObjSpec) => RemoteObjSpec) | boolean; // Updated to support ^3.0.0
+	/**
+	 * Use keyField to tell table which column is unique. This is same as isKey in <TableHeaderColumn>
+	 * Tips: You need choose one configuration to set key field: keyField or isKey in <TableHeaderColumn>
+	 */
+	keyField?: string;
+	/**
+	 * Use height to set the height of table, default is 100%.
+	 */
+	height?: string;
+	/**
+	 * Set the max column width (pixels)
+	 */
+	maxHeight?: string;
+	/**
+	 * Enable striped by setting striped to true. Same as Bootstrap table class .table-striped, default is false.
+	 */
+	striped?: boolean;
+	/**
+	 * Enable hover by setting hover to true. Same as Bootstrap table class .table-hover, default is false.
+	 */
+	hover?: boolean;
+	/**
+	 * Enable condensed by setting condensed to true. Same as Bootstrap table class .table-condensed, default is false.
+	 */
+	condensed?: boolean;
+	/**
+	 * Become a borderless table by setting bordered to false, default is true.
+	 */
+	bordered?: boolean;
+	/**
+	 * Enable pagination by setting pagination to true, default is false.
+	 */
+	pagination?: boolean;
+	/**
+	 * Assign the class name of row(tr). This attribute accept a string or function and function is a better way to do more customization.
+	 * If a string given, means the value will be presented as the row class.
+	 * If a function given, will pass rowData and rowIndex as params and should return string for presenting class. for examples:
+	 * @example
+	 * 		function trClassFormat(rowData,rowIndex){
+	 * 			return rowIndex%2==0?"tr-odd":"tr-even";  //return a class name.
+	 * 		}
+	 */
+	trClassName?: string | ((rowData: any, rowIndex: number) => string);
+	/**
+	 * Enable row insertion by setting insertRow to true, default is false.
+	 * If you enable row insertion, there's a  button on the upper left side of table.
+	 */
+	insertRow?: boolean;
+	/**
+	 * Enable row deletion by setting deleteRow to true, default is false.
+	 * If you enable row deletion, there's a  button on the upper left side of table.
+	 */
+	deleteRow?: boolean;
+	/**
+	 * Enable column filter by setting columnFilter to true, default is false.
+	 * If enabled, there're input text field per column under the table, user can input your filter condition by each column.
+	 */
+	columnFilter?: boolean;
+	/**
+	 * Enable search by setting search to true, default is false.
+	 * If enabled, there is a on the upper left side of the table. The default place holder is Search
+	 */
+	search?: boolean;
+	/**
+	 * Set searchPlaceholder to change the placeholder in search field, default is Search.
+	 */
+	searchPlaceholder?: string;
+	/**
+	 * Enable strict search, default is false.
+	 * More info here: https://github.com/AllenFang/react-bootstrap-table/issues/1199
+	 */
+	strictSearch?: boolean;
+	/**
+	 * Enable multi search by multiColumnSearch, default is false.
+	 * If you want to use multi search, you must enable search at first.
+	 * Tips: Use space to delimited search text. EX: 3 4, which means match all 3 or 4 datas in table.
+	 */
+	multiColumnSearch?: boolean;
+	/**
+	 * Enable export csv function, default is false.
+	 * If you enable, there's a  button on the upper left side of table.
+	 */
+	exportCSV?: boolean;
+	/**
+	 * Set CSV filename (e.g. items.csv). Default is spreadsheet.csv
+	 */
+	csvFileName?: () => string | string;
+	/**
+	 * Enable row selection on table. selectRow accept an object which have the following properties
+	 */
+	selectRow?: SelectRow;
+	/**
+	 * Enable cell editing on table. cellEdit accept an object which have the following properties
+	 */
+	cellEdit?: CellEdit;
+	/**
+	 * For some options setting on this component, you can set the options attribute and give an object which contain following properties
+	 */
+	options?: Options;
+	fetchInfo?: FetchInfo;
+	printable?: boolean;
+	tableStyle?: any;
+	containerStyle?: any;
+	headerStyle?: any;
+	bodyStyle?: any;
+	ignoreSinglePage?: boolean;
+	containerClass?: string;
+	tableContainerClass?: string;
+	headerContainerClass?: string;
+	bodyContainerClass?: string;
+	expandableRow?: (row: any) => boolean;
+	expandComponent?: (row: any) => any;
+}
+
+export type SelectRowMode = 'none' | 'radio' | 'checkbox';
+
+export interface SelectRow {
+	/**
+	 * For specifing the selection is single(radio) or multiple(checkbox).
+	 */
+	mode: SelectRowMode;
+	/**
+	 * Click the row will trigger selection on that row if enable clickToSelect, default is false.
+	 */
+	clickToSelect?: boolean;
+	/**
+	 * If true, click the row will trigger selection on that row and also trigger cell editing if you enabled cell edit. Default is false.
+	 */
+	clickToSelectAndEditCell?: boolean;
+	/**
+	 * You can assign the background color of row which be selected.
+	 */
+	bgColor?: string;
+	/**
+	 * You can assign the class name of row which be selected.
+	 */
+	className?: string;
+	/**
+	 * Give an array data to perform which rows you want to be selected when table loading.
+	 * The content of array should be the rowkey which you want to be selected.
+	 */
+	selected?: string[] | number[];
+	/**
+	 * if true, the radio/checkbox column will be hide.
+	 * You can enable this attribute if you enable clickToSelect and you don't want to show the selection column.
+	 */
+	hideSelectColumn?: boolean;
+	/**
+	 * Default is false, if enabled, there will be a button on top of table for toggling selected rows only.
+	 */
+	showOnlySelected?: boolean;
+	/**
+	 * Accept a custom callback function, if a row be selected or unselected, this function will be called.
+	 * This callback function taking three arguments row, isSelected and event:
+	 * 	`row`: is the row data which you wanted to select or unselect.
+	 * 	`isSelected`: it's a boolean value means "whether or not that row will be selected?".
+	 * 	`event`: The event target object.
+	 * If return value of this (function) is false, the select or deselect action will not be applied.
+	 */
+	onSelect?: (row: any, isSelected: boolean, event: any) => boolean;
+	/**
+	 * Accept a custom callback function, if click select all checkbox, this function will be called.
+	 * This callback function taking two arguments isSelected and currentSelectedAndDisplayData:
+	 * 	`isSelected`: it's a boolean value means "whether or not that row will be selected?".
+	 * 	`currentSelectedAndDisplayData`: If pagination enabled, this result is the data which in a page. In contrast, this is all data in table.
+	 * If return value of this function is false, the select all or deselect all action will not be applied.
+	 */
+	onSelectAll?: (isSelected: boolean, currentSelectedAndDisplayData: any) => boolean;
+
+	/**
+	 * Provide a list of unselectable row keys.
+	 */
+	unselectable?: number[];
+}
+
+export type CellEditClickMode = 'none' | 'click' | 'dbclick';
+
+export interface CellEdit {
+	/**
+	 * To spectify which condition will trigger cell editing.(click or dbclick)
+	 */
+	mode: CellEditClickMode;
+	/**
+	 * Enable blurToSave will trigger a saving event on cell when mouse blur on the input field. Default is false.
+	 * In the default condition, you need to press ENTER to save the cell.
+	 */
+	blurToSave?: boolean;
+	/**
+	 * Accept a custom callback function, before cell saving, this function will be called.
+	 * This callback function taking three arguments:row, cellName and cellValue
+	 * It's necessary to return a bool value which whether apply this cell editing.
+	 */
+	beforeSaveCell?: (row: any, cellName: string, cellValue: any) => boolean;
+	/**
+	 * Accept a custom callback function, after cell saving, this function will be called.
+	 * This callback function taking three arguments:row, cellName and cellValue
+	 */
+	afterSaveCell?: (row: any, cellName: string, cellValue: any) => void;
+}
+
+export type SortOrder = 'asc' | 'desc';
+
+export interface Options {
+	/**
+	 * Manage sort field by yourself
+	 */
+	sortName?: string;
+	/**
+	 * Manage sort order by yourself
+	 */
+	sortOrder?: SortOrder;
+	/**
+	 * Assign a default sort field.
+	 */
+	defaultSortName?: string;
+	/**
+	 * Assign a default sort ordering.
+	 */
+	defaultSortOrder?: SortOrder;
+	/**
+	 * False to disable sort indicator on header column, default is true.
+	 */
+	sortIndicator?: boolean;
+	/**
+	 * Change the displaying text on table if data is empty.
+	 */
+	noDataText?: string | ReactElement<any>;
+	/**
+	 * A delay for trigger search after a keyup (millisecond)
+	 */
+	searchDelayTime?: number;
+	/**
+	 * A custom text on export csv button
+	 */
+	exportCSVText?: string;
+	/**
+	 * Default is false, if true means you want to ignore any editable configuration when row insert.
+	 */
+	ignoreEditable?: boolean;
+	/**
+	 * Only work on enable search. If true, there will be a button beside search input field for clear search field text.
+	 */
+	clearSearch?: boolean;
+	/**
+	 * Assign a callback function which will be called after table update.
+	 */
+	afterTableComplete?: Function;
+	/**
+	 * Assign a callback function which will be called after row delete.
+	 * This function taking one argument: rowKeys, which means the row key you dropped.
+	 */
+	afterDeleteRow?: (rowKeys: string[]) => void;
+	/**
+	 * Assign a callback function which will be called after row insert.
+	 * This function taking one argument: row, which means the whole row data you added.
+	 */
+	afterInsertRow?: (row: any) => void;
+	/**
+	 * Customize the text of previouse page button
+	 */
+	prePage?: string;
+	/**
+	 * Customize the text of next page button
+	 */
+	nextPage?: string;
+	/**
+	 * Customize the text of first page button
+	 */
+	firstPage?: string;
+	/**
+	 * Customize the text of last page button
+	 */
+	lastPage?: string;
+	/**
+	 * Accept a number, which means the page you want to show as default.
+	 */
+	page?: number;
+	/**
+	 * You can change the dropdown list for size per page if you enable pagination.
+	 */
+	sizePerPageList?: number[];
+	/**
+	 * Means the size per page you want to locate as default.
+	 */
+	sizePerPage?: number;
+	/**
+	 * To define the pagination bar length, default is 5.
+	 */
+	paginationSize?: number;
+	/**
+	 * To define where to start counting the pages.
+	 */
+	pageStartIndex?: number;
+	/**
+	 * Assign a callback function which will be called after page changed.
+	 * This function taking two argument: page and sizePerPage.
+	 * `page`: Current page.
+	 * `sizePerPage`: The data size which in one page.
+	 */
+	onPageChange?: (page: number, sizePerPage: number) => void;
+	/**
+	 * Assign a callback function which will be called after size per page dropdown changed.
+	 * This function taking one argument: sizePerPage.
+	 * `sizePerPage`: The data size which in one page.
+	 */
+	onSizePerPageList?: (sizePerPage: number) => void;
+	/**
+	 * Assign a callback function which will be called after trigger sorting.
+	 * This function taking two argument: `sortName` and `sortOrde`r.
+	 * 	`sortName`: The sort column name
+	 * 	`sortOrder`: The sort ordering.
+	 */
+	onSortChange?: (sortName: string, sortOrder: SortOrder) => void;
+	/**
+	 * Assign a callback function which will be called after trigger searching.
+	 * This function taking two argument: search and result.
+	 * `search`: The search text which user input.
+	 * `result`: The results after searching.
+	 */
+	afterSearch?: (search: string, result: any) => void;
+	/**
+	 * Assign a callback function which will be called after trigger column filtering.
+	 * This function taking two argument: filterConds and result.
+	 * `filterConds`: It's an array object which contain all column filter conditions.
+	 * `result`: The results after filtering.
+	 */
+	afterColumnFilter?: (filterConds: any[], result: any) => void;
+	/**
+	 * Assign a callback function which will be called after a row click.
+	 * This function taking one argument: row which is the row data which you click on.
+	 */
+	onRowClick?: (row: any) => void;
+	/**
+	 * Assign a callback function which will be called after a row double click.
+	 * This function taking one argument: row which is the row data which you double click on.
+	 */
+	onRowDoubleClick?: (row: any) => void;
+	/**
+	 * Background color on expanded rows.
+	 */
+	expandRowBgColor?: string;
+	/**
+	 * Assign a callback function which will be called when mouse enter into the table.
+	 */
+	onMouseEnter?: Function;
+	/**
+	 * Assign a callback function which will be called when mouse leave from the table.
+	 */
+	onMouseLeave?: Function;
+	/**
+	 * Assign a callback function which will be called when mouse over a row in table.
+	 * This function taking one argument: row which is the row data which mouse over.
+	 */
+	onRowMouseOver?: Function;
+	/**
+	 * Assign a callback function which will be called when mouse leave from a row in table.
+	 * This function taking one argument: row which is the row data which mouse out.
+	 */
+	onRowMouseOut?: Function;
+
+	/**
+	 * Assign a callback function which will be called when row dropping.
+	 * It give you a chance to customize your confirmation for row deletion.
+	 * This function taking two argument: next and rowKeys:
+	 * `next`: If you confirm to drop row, call next() to continue the process
+	 * `rowKeys` is the row keys which been deleted, you can call next function to apply this deletion.
+	 */
+	handleConfirmDeleteRow?: (next: Function, rowKeys: any[]) => void;
+	paginationShowsTotal?: boolean | ((start: number, to: number, total: number) => string | ReactElement<any>);
+	onSearchChange?: Function;
+	onAddRow?: Function;
+	onExportToCSV?: Function;
+
+	insertText?: string;
+	deleteText?: string;
+	saveText?: string;
+	closeText?: string;
+	// Customization properties
+	/**
+	 * Callback function to be called when a cell is modified
+	 *
+	 * https://allenfang.github.io/react-bootstrap-table/example.html#remote
+	 */
+	onCellEdit?: (row: any, field: string, value: any) => any;
+	/**
+	 * Callback function to be called when filter changing
+	 *
+	 * https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/remote/remote-store-filtering.js#L67
+	 */
+	onFilterChange?: (filterObj: any) => any;
+	/**
+	 * Callback function which will be called when a row will be deleted
+	 *
+	 * https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/remote/remote-store-delete-row.js#L27
+	 */
+	onDeleteRow?: (rows: any) => any;
+	/**
+	 * A callback which will be called after page changed
+	 *
+	 * https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/remote/remote-store-paging.js#L30
+	 */
+	onpageChange?: (page: any, sizePerPage: number) => any;
+}
+
+interface FetchInfo {
+	dataTotalSize?: number;
+}
+
+export interface BootstrapTable extends ComponentClass<BootstrapTableProps> {
+	/**
+	 * Call this function to insert an new row to table.
+	 */
+	handleAddRow(row: any): void;
+	/**
+	 * Call this function to insert an new row as first row on table.
+	 */
+	handleAddRowAtBegin(row: any): void;
+	/**
+	 * Call this function to drop rows in table.
+	 */
+	handleDropRow(rowKeys: any[]): void;
+	/**
+	 * Call this function to do column filtering on table.
+	 */
+	handleFilterData(filter: any): void;
+	/**
+	 * Call this function with search text for fully searching.
+	 */
+	handleSearch(search: string): void;
+	/**
+	 * Call this function to sort table.
+	 */
+	handleSort(order: SortOrder, field: string): void;
+	/**
+	 * Call this function to get the page by a rowkey
+	 */
+	getPageByRowKey(rowKey: string): any;
+	/**
+	 * Call this function to export table as csv.
+	 */
+	handleExportCSV(): void;
+	/**
+	 * Clean all the selection state on table.
+	 */
+	cleanSelected(): void;
+}
+interface BootstrapTable extends ComponentClass<BootstrapTableProps> { }
+declare const BootstrapTable: BootstrapTable;
+export type DataAlignType = 'left' | 'center' | 'right' | 'start' | 'end';
+
+export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
+	/**
+	 * The field of data you want to show on column.
+	 */
+	dataField?: string;
+	/**
+	 * Use isKey to tell table which column is unique. This is same as keyField in <BootstrapTable>
+	 * Tips: You need choose one configuration to set key field: isKey or keyField in <BootstrapTable>
+	 */
+	isKey?: boolean;
+	/**
+	 * Set the column width. ex: 150, it's means 150px
+	 */
+	width?: string;
+	/**
+	 * Set align in column, value is left, center, right, start and end.
+	 */
+	dataAlign?: DataAlignType;
+
+	/**
+	 * Alignment of text in the column header.
+	 */
+	headerAlign?: DataAlignType;
+	/**
+	 * True to enable table sorting. Default is disabled.
+	 */
+	dataSort?: boolean;
+	/**
+	 * Default search string.
+	 */
+	defaultSearch?: string;
+	/**
+	 * Allow user to render a custom sort caret. You should give a function and should return a JSX.
+	 * This function taking one arguments: order which present the sort order currently.
+	 */
+	caretRender?: Function;
+	/**
+	 * Give an Object like following to able to customize your own editing component.
+	 * This Object should contain these two property:
+	 * 		getElement(REQUIRED): Accept a callback function and take two arguments: onUpdate and props.
+	 * 		customEditorParameters: Another extra data for custom cell edit component.
+	 */
+	customEditor?: { getElement: (onUpdate: any, props: any) => ReactElement<any>, customEditorParameters?: object };
+	/**
+	 * To customize the column. This callback function should return a String or a React Component.
+	 * In addition, this function taking two argument: cell and row.
+	 */
+	dataFormat?: (cell: any, row: any, formatExtraData?: any) => string | ReactElement<any>;
+	/**
+	 * To to enable search or filter data on formatting. Default is false
+	 */
+	filterFormatted?: boolean;
+	/**
+	 * True to hide column.
+	 */
+	hidden?: boolean;
+	/**
+	 * True to hide from insert dialog
+	 */
+	hiddenOnInsert?: boolean;
+	/**
+	 * True to hide the dropdown for sizePerPage.
+	 */
+	hideSizePerPage?: boolean;
+	/**
+	 * False to disable search functionality on column, default is true.
+	 */
+	searchable?: boolean;
+	/**
+	 * Give a customize function for data sorting.
+	 * This function taking four arguments: a, b, order, sortField, extraData
+	 */
+	sortFunc?: (a: any, b: any, order: SortOrder, sortField: any, extraData: any) => number;
+	/**
+	 * It's a extra data for custom sort function, if defined, this data will be pass as fifth argument in sortFunc.
+	 */
+	sortFuncExtraData?: any;
+	/**
+	 * Add custom css class on table header column, this attribute only accept String or Function.
+	 * If Function, it taking four arguments: cell, row, rowIndex, columnIndex.
+	 * In addition, this function should return a String which is the class name you want to add on.
+	 */
+	className?: string | ((cell: any, row: any, rowIndex: number, columnIndex: number) => string);
+	/**
+	 * Add custom css class on table body column, this attribute only accept String or Function.
+	 * If Function, it taking four arguments: cell, row, rowIndex, columnIndex.
+	 * In addition, this function should return a String which is the class name you want to add on.
+	 */
+	columnClassName?: String | ((cell: any, row: any, rowIndex: number, columnIndex: number) => string);
+	/**
+	 * Add True to set column editable, false is non-editable. If give Object,
+	 * you can do more customization when editing cell. This object have following properties:
+	 * @example
+	 * {
+	 * 	type: //edit type, avaiable value is textarea, select, checkbox
+	 * 	validator: //give function for validation and taking only one "cell value" as argument. This function should return Bool.
+	 * 	options:{
+	 * 		values: //values means data in select or checkbox.If checkbox, use ':'(colon) to separate value, ex: Y:N
+	 * 	}
+	 * }
+	 */
+	editable?: boolean | Editable;
+	/**
+	 * It only work when you enable insertRow and be assign on rowKey column.
+	 * If true, the row key will be generated automatically after a row insertion.
+	 */
+	autoValue?: boolean;
+	/**
+	 * To Enable a column filter within header column.
+	 * This feature support a lots of filter type and condition. Please check example
+	 * Following is the format for filter
+	 */
+	filter?: Filter;
+
+	onSort?: Function;
+
+	/**
+	 * Header for column in generated CSV file
+	 */
+	csvHeader?: string;
+	csvFormat?: Function;
+	columnTitle?: boolean;
+	sort?: SortOrder;
+	formatExtraData?: any;
+
+	/**
+	 * Row in the header on which this header column present.
+	 */
+	row?: number;
+
+	/**
+	 * Indicates how many rows this column takes.
+	 * Default: 1
+	 */
+	rowSpan?: number;
+
+	/**
+	 * Indicates how many columns this column takes.
+	 * Default: 1
+	 */
+	colSpan?: number;
+
+	/**
+	 * Return the value you want to be filtered on that column.
+	 * It's useful if your column data is an object.
+	 */
+	filterValue?: Function;
+
+	/**
+	 * Allow you to add your custom attributes on TD element.
+	 */
+	tdAttr?: object;
+
+	/**
+	 * Allow you to add your custom style object on TD element.
+	 */
+	tdStyle?: object;
+
+	/**
+	 * Allow you to add your custom style object on TH element.
+	 */
+	thStyle?: object;
+}
+export interface Editable {
+	type?: string; // edit type, avaiable value is textarea, select, checkbox
+	/**
+	 * Function for validation and taking only one "cell value" as argument. This function should return Bool.
+	 */
+	validator?: (cell: any) => boolean;
+	/**
+	 * @example
+	 * {
+	 * 	 values: //values means data in select or checkbox. If checkbox, use ':'(colon) to separate value, ex: Y:N
+	 * }
+	 */
+	options?: any;
+
+	/**
+	 * Configuration for the textarea editable type
+	 */
+	cols?: number;
+	rows?: number;
+}
+export type SetFilterCallback = (targetValue: any) => boolean;
+export interface ApplyFilterParameter {
+	callback: SetFilterCallback;
+}
+
+export type FilterType = 'TextFilter' | 'RegexFilter' | 'SelectFilter' | 'NumberFilter' | 'DateFilter' | 'CustomFilter';
+export interface Filter {
+	/**
+	 * "TextFilter"||"SelectFilter"||"NumberFilter"||"DateFilter"||"RegexFilter"||"YOUR_CUSTOM_FILTER"
+	 */
+	type?: FilterType;
+	/**
+	 * Default value on filter. If type is NumberFilter or DateFilter, this value will like { number||date: xxx, comparator: '>' }
+	 */
+	defaultValue?: any;
+	/**
+	 * Assign a millisecond for delay when trigger filtering, default is 500.
+	 */
+	delay?: number;
+	/**
+	 * Only work on TextFilter. Assign the placeholder text on text and regex filter
+	 */
+	placeholder?: string | RegExp;
+	/**
+	 * Only work on NumberFilter. Accept an array which conatin the filter condition, like: ['<','>','=']
+	 */
+	numberComparators?: string[];
+
+    /**
+     * Options for the filter.
+     */
+	options?: any;
+
+    /**
+     * Comparison condition for the NumberFilter
+     */
+	condition?: string;
+
+    /**
+     * Get element which represent filter.
+     */
+	getElement?: (filterHandler: (parameters?: ApplyFilterParameter) => void, filterParameters: any) => JSX.Element;
+
+    /**
+     * Parameters for custom filter
+     */
+	customFilterParameters?: any;
+}
+
+export interface TableHeaderColumn extends ComponentClass<TableHeaderColumnProps> { }
+declare const TableHeaderColumn: TableHeaderColumn;
+
+declare class TableDataSet extends EventEmitter {
+	constructor(data: any);
+	setData(data: any): void;
+	clear(): void;
+	getData(): any;
+}
diff --git a/types/react-bootstrap-table/v2/react-bootstrap-table-tests.tsx b/types/react-bootstrap-table/v2/react-bootstrap-table-tests.tsx
new file mode 100644
index 0000000000..c8f25dfa56
--- /dev/null
+++ b/types/react-bootstrap-table/v2/react-bootstrap-table-tests.tsx
@@ -0,0 +1,175 @@
+import * as React from 'react';
+import { render } from 'react-dom';
+import { BootstrapTable, TableHeaderColumn, ApplyFilterParameter, Filter } from 'react-bootstrap-table';
+
+const products = [{
+  id: 1,
+  name: "Item name 1",
+  price: 100
+}, {
+  id: 2,
+  name: "Item name 2",
+  price: 100
+}];
+
+// It's a data format example.
+function priceFormatter(cell: any, row: any) {
+  return '<i class="glyphicon glyphicon-usd"></i> ' + cell;
+}
+
+render(
+  <BootstrapTable data={products} striped={true} hover={true} ignoreSinglePage>
+    <TableHeaderColumn dataField="id" isKey={true} dataAlign="center" dataSort={true}>Product ID</TableHeaderColumn>
+    <TableHeaderColumn dataField="name" dataSort={true} editable={{ type: 'textarea', rows: 10 }}>Product Name</TableHeaderColumn>
+    <TableHeaderColumn dataField="price" dataFormat={priceFormatter}>Product Price</TableHeaderColumn>
+  </BootstrapTable>,
+  document.getElementById("app")
+);
+
+const qualityType = {
+  0: 'good',
+  1: 'bad',
+  2: 'unknown'
+};
+
+function enumFormatter(cell: any, row: any, enumObject: any) {
+  return enumObject[cell];
+}
+
+class SelectFilterWithDefaultValue extends React.Component {
+  render() {
+    return (
+      <BootstrapTable data={products}>
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='quality' filterFormatted dataFormat={enumFormatter}
+          formatExtraData={qualityType} filter={{ type: 'SelectFilter', options: qualityType, defaultValue: 1 }}>Product Quality</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+class TextFilterWithCondition extends React.Component {
+  render() {
+    return (
+      <BootstrapTable data={products}>
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' filter={{ type: 'TextFilter', delay: 1000, condition: 'eq' }}>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+function getCustomFilter(filterHandler: (parameters?: ApplyFilterParameter) => void, customFilterParameters: any) {
+  return (
+    <div />
+  );
+}
+
+class CustomFilter extends React.Component {
+  render() {
+    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { textOK: 'yes', textNOK: 'no' } };
+    return (
+      <BootstrapTable data={products}>
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='isInStock' filter={filter}>Product Is In Stock</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+class RemoteProps extends React.Component {
+  render() {
+    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { textOK: 'yes', textNOK: 'no' } };
+    return (
+      <BootstrapTable
+        data={products}
+        remote={(remoteObj) => {
+          remoteObj.cellEdit = true;
+          return remoteObj;
+        }}
+        options={{
+          onCellEdit: (row: any, fieldName: string, value: any) => { console.info(row); }
+        }}
+      >
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='isInStock' filter={filter}>Product Is In Stock</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+class RemoteBool extends React.Component {
+  render() {
+    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { textOK: 'yes', textNOK: 'no' } };
+    return (
+      <BootstrapTable
+        data={products}
+        remote
+      >
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='isInStock' filter={filter}>Product Is In Stock</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+/**
+ * See http://allenfang.github.io/react-bootstrap-table/docs.html#tdAttr
+ */
+const tdAttrExample = <BootstrapTable data={ products } search>
+    <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+    <TableHeaderColumn dataField='name' tdAttr={ { "data-attr": 'test' } }>Product Name</TableHeaderColumn>
+    <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+</BootstrapTable>;
+
+/**
+ * See http://allenfang.github.io/react-bootstrap-table/docs.html#tdStyle
+ */
+const tdStyleExample = <BootstrapTable data={ products } search>
+    <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+    <TableHeaderColumn dataField='name' tdStyle={ { whiteSpace: 'normal' } }>Product Name</TableHeaderColumn>
+    <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+</BootstrapTable>;
+
+/**
+ * See http://allenfang.github.io/react-bootstrap-table/docs.html#thStyle
+ */
+const thStyleExample = <BootstrapTable data={ products } search>
+    <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+    <TableHeaderColumn dataField='name' thStyle={ { fontWeight: 'lighter' } }>Product Name</TableHeaderColumn>
+    <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+</BootstrapTable>;
+
+// Adopted from https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-header-span/column-header-span-complex.js
+export default class ColumnHeaderSpanComplex extends React.Component {
+  render() {
+    const selectRow = {
+      mode: 'checkbox',
+      bgColor: 'rgb(238, 193, 213)'
+    };
+
+    const cellEdit = {
+      mode: 'click',
+      blurToSave: true
+    };
+    return (
+      <BootstrapTable data={products}
+        insertRow deleteRow exportCSV>
+        <TableHeaderColumn row={0} rowSpan={2} dataField='id' isKey={true} >ID</TableHeaderColumn>
+        <TableHeaderColumn row={0} colSpan={3} dataSort csvHeader='Product' headerAlign='right'>Product</TableHeaderColumn>
+        <TableHeaderColumn row={1} dataField='name' width='175' dataAlign='center'>name</TableHeaderColumn>
+        <TableHeaderColumn row={1} dataField='price' dataSort>price</TableHeaderColumn>
+        <TableHeaderColumn row={1} dataField='coupon' width='70'>Coupon</TableHeaderColumn>
+        <TableHeaderColumn row={0} csvHeader='In stock' rowSpan={2} dataField='status'>In stock</TableHeaderColumn>
+        <TableHeaderColumn row={0} colSpan={2} csvHeader='Customer' filter={{ type: 'TextFilter', delay: 1000 }}>Customer</TableHeaderColumn>
+        <TableHeaderColumn row={1} csvHeader='name' dataField='customer'>name</TableHeaderColumn>
+        <TableHeaderColumn row={1} csvHeader='order' dataField='order' dataSort>order</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
diff --git a/types/react-bootstrap-table/v2/tsconfig.json b/types/react-bootstrap-table/v2/tsconfig.json
new file mode 100644
index 0000000000..eee5850865
--- /dev/null
+++ b/types/react-bootstrap-table/v2/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "paths": {
+            "react-bootstrap-table": [
+                "react-bootstrap-table/v2"
+            ]
+        },
+        "baseUrl": "../../",
+        "jsx": "react",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-bootstrap-table-tests.tsx"
+    ]
+}
diff --git a/types/react-bootstrap-table/v2/tslint.json b/types/react-bootstrap-table/v2/tslint.json
new file mode 100644
index 0000000000..bf0a68ff4e
--- /dev/null
+++ b/types/react-bootstrap-table/v2/tslint.json
@@ -0,0 +1,10 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+      // TODO
+      "ban-types": false,
+      "prefer-method-signature": false,
+      "strict-export-declare-modifiers": false,
+      "no-empty-interface": false
+    }
+  }
diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
new file mode 100644
index 0000000000..c31ddd63b5
--- /dev/null
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for react-bootstrap-typeahead 2.0
+// Project: https://github.com/ericgio/react-bootstrap-typeahead
+// Definitions by: Guymestef <https://github.com/Guymestef>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export interface TypeaheadProps<T> {
+    a11yNumResults?: () => void;
+    a11yNumSelected?: () => void;
+    align?: 'justify' | 'left' | 'right';
+    allowNew?: boolean;
+    autoFocus?: boolean;
+    bodyContainer?: boolean;
+    bsSize?: 'large' | 'lg' | 'small' | 'sm';
+    caseSensitive?: boolean;
+    clearButton?: boolean;
+    defaultSelected?: T[];
+    disabled?: boolean;
+    dropup?: boolean;
+    emptyLabel?: string;
+    filterBy?: (string[] | ((option: T | string, text: string) => boolean));
+    highlightOnlyResult?: boolean;
+    ignoreDiacritics?: boolean;
+    inputProps?: object;
+    labelKey?: string | ((option: T | string) => string);
+    maxHeight?: number;
+    maxResults?: number;
+    minLength?: number;
+    multiple?: boolean;
+    newSelectionPrefix?: string;
+    onBlur?: (e: Event) => any;
+    onChange?: (selected: T[]) => any;
+    onFocus?: (e: Event) => any;
+    onInputChange?: (input: string) => any;
+    onKeyDown?: (e: Event) => any;
+    onMenuHide?: (e: Event) => any;
+    onMenuShow?: (e: Event) => any;
+    onPaginate?: (e: Event) => any;
+    options: T[];
+    paginate?: boolean;
+    paginationText?: string;
+    placeholder?: string;
+    renderMenu?: (results: Array<T | string>, menuProps: any) => any;
+    renderMenuItemChildren?: (option: T, props: TypeaheadProps<T>, index: number) => any;
+    renderToken?: (selectedItem: T | string, onRemove: () => void) => any;
+    selected?: T[];
+    selectHintOnEnter?: boolean;
+    submitFormOnEnter?: boolean;
+}
+
+export const Typeahead: React.ClassicComponentClass<TypeaheadProps<any>>;
+
+export interface AsyncTypeaheadProps<T> extends TypeaheadProps<T> {
+    delay?: number;
+    isLoading: boolean;
+    onSearch: (query: string) => void;
+    promptText?: string;
+    searchText?: string;
+    useCache?: boolean;
+}
+
+export const AsyncTypeahead: React.ClassicComponentClass<AsyncTypeaheadProps<any>>;
diff --git a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
new file mode 100644
index 0000000000..425bfe313b
--- /dev/null
+++ b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
@@ -0,0 +1,32 @@
+import * as React from 'react';
+import { Typeahead } from 'react-bootstrap-typeahead';
+
+const options = [
+    { name: 'Alabama', population: 4780127, capital: 'Montgomery', region: 'South' },
+    { name: 'Alaska', population: 710249, capital: 'Juneau', region: 'West' },
+    { name: 'Arizona', population: 6392307, capital: 'Phoenix', region: 'West' },
+    { name: 'Arkansas', population: 2915958, capital: 'Little Rock', region: 'South' },
+    { name: 'California', population: 37254503, capital: 'Sacramento', region: 'West' },
+    { name: 'Colorado', population: 5029324, capital: 'Denver', region: 'West' },
+];
+
+class BasicExample extends React.Component {
+    state = {
+        multiple: false,
+    };
+
+    render() {
+        const { multiple } = this.state;
+
+        return (
+            <div>
+                <Typeahead
+                    labelKey="name"
+                    multiple={multiple}
+                    options={options}
+                    placeholder="Choose a state..."
+                />
+            </div>
+        );
+    }
+}
diff --git a/types/react-bootstrap-typeahead/tsconfig.json b/types/react-bootstrap-typeahead/tsconfig.json
new file mode 100644
index 0000000000..c8b63ad42b
--- /dev/null
+++ b/types/react-bootstrap-typeahead/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-bootstrap-typeahead-tests.tsx"
+    ]
+}
diff --git a/types/react-bootstrap-typeahead/tslint.json b/types/react-bootstrap-typeahead/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-bootstrap-typeahead/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index dcb5998f7a..e09bef50a4 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -6,9 +6,11 @@
 //                 Batbold Gansukh <https://github.com/Batbold-Gansukh>,
 //                 Raymond May Jr. <https://github.com/octatone>,
 //                 Cheng Sieu Ly <https://github.com/chengsieuly>,
+//                 Mercedes Retolaza <https://github.com/mretolaza>,
 //                 Kat Busch <https://github.com/katbusch>,
-//                 Vito Samson <https://github.com/vitosamson>
+//                 Vito Samson <https://github.com/vitosamson>,
 //                 Karol Janyst <https://github.com/LKay>
+//                 Aaron Beall <https://github.com/aaronbeall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/react-bootstrap/lib/DropdownButton.d.ts b/types/react-bootstrap/lib/DropdownButton.d.ts
index df66dd36dd..e2626e2bb7 100644
--- a/types/react-bootstrap/lib/DropdownButton.d.ts
+++ b/types/react-bootstrap/lib/DropdownButton.d.ts
@@ -10,6 +10,7 @@ declare namespace DropdownButton {
         navItem?: boolean;
         noCaret?: boolean;
         pullRight?: boolean;
+        title: React.ReactNode;
     }
 
     export type DropdownButtonProps = DropdownButtonBaseProps & React.HTMLProps<DropdownButton>;
diff --git a/types/react-bootstrap/lib/DropdownToggle.d.ts b/types/react-bootstrap/lib/DropdownToggle.d.ts
index e5655c22f8..d166c5ae25 100644
--- a/types/react-bootstrap/lib/DropdownToggle.d.ts
+++ b/types/react-bootstrap/lib/DropdownToggle.d.ts
@@ -9,6 +9,7 @@ declare namespace DropdownToggle {
         useAnchor?: boolean;
         bsClass?:string; // Added since v0.30.0
         bsStyle?:string;
+        bsSize?:string;
     }
 }
 declare class DropdownToggle extends React.Component<DropdownToggle.DropdownToggleProps> { }
diff --git a/types/react-bootstrap/lib/FormGroup.d.ts b/types/react-bootstrap/lib/FormGroup.d.ts
index aef2d19f1d..6b7207c215 100644
--- a/types/react-bootstrap/lib/FormGroup.d.ts
+++ b/types/react-bootstrap/lib/FormGroup.d.ts
@@ -6,7 +6,7 @@ declare namespace FormGroup {
         bsClass?: string;
         bsSize?: Sizes;
         controlId?: string;
-        validationState?: "success" | "warning" | "error";
+        validationState?: "success" | "warning" | "error" | null;
     }
 }
 declare class FormGroup extends React.Component<FormGroup.FormGroupProps> { }
diff --git a/types/react-bootstrap/lib/Glyphicon.d.ts b/types/react-bootstrap/lib/Glyphicon.d.ts
index 036af24cb3..17cf8e9fc7 100644
--- a/types/react-bootstrap/lib/Glyphicon.d.ts
+++ b/types/react-bootstrap/lib/Glyphicon.d.ts
@@ -4,6 +4,8 @@ declare namespace Glyphicon {
     export interface GlyphiconProps extends React.HTMLProps<Glyphicon> {
         // Required
         glyph: string;
+        // Optional
+        bsClass?: string;
     }
 }
 declare class Glyphicon extends React.Component<Glyphicon.GlyphiconProps> { }
diff --git a/types/react-bootstrap/lib/ModalHeader.d.ts b/types/react-bootstrap/lib/ModalHeader.d.ts
index 0500a5e445..c7ed09c495 100644
--- a/types/react-bootstrap/lib/ModalHeader.d.ts
+++ b/types/react-bootstrap/lib/ModalHeader.d.ts
@@ -5,6 +5,7 @@ declare namespace ModalHeader {
         closeButton?: boolean;
         closeLabel?: string;
         onHide?: Function;
+        bsClass?: string;
     }
 }
 declare class ModalHeader extends React.Component<ModalHeader.ModalHeaderProps> { }
diff --git a/types/react-bootstrap/lib/Popover.d.ts b/types/react-bootstrap/lib/Popover.d.ts
index 2af51da4b6..95abc38854 100644
--- a/types/react-bootstrap/lib/Popover.d.ts
+++ b/types/react-bootstrap/lib/Popover.d.ts
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Sizes } from 'react-bootstrap';
+import { Sizes, Omit } from 'react-bootstrap';
 
 declare namespace Popover {
-    export interface PopoverProps extends React.HTMLProps<Popover> {
+    export interface PopoverProps extends Omit<React.HTMLProps<Popover>, "title"> {
         // Optional
         arrowOffsetLeft?: number | string;
         arrowOffsetTop?: number | string;
@@ -11,6 +11,7 @@ declare namespace Popover {
         placement?: string;
         positionLeft?: number | string; // String support added since v0.30.0
         positionTop?: number | string; // String support added since v0.30.0
+        title?: React.ReactNode;
     }
 }
 declare class Popover extends React.Component<Popover.PopoverProps> { }
diff --git a/types/react-bootstrap/lib/ProgressBar.d.ts b/types/react-bootstrap/lib/ProgressBar.d.ts
index 89b2e07cc0..8fc408ac65 100644
--- a/types/react-bootstrap/lib/ProgressBar.d.ts
+++ b/types/react-bootstrap/lib/ProgressBar.d.ts
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Sizes } from 'react-bootstrap';
+import { Sizes, Omit } from 'react-bootstrap';
 
 declare namespace ProgressBar {
-    export interface ProgressBarProps extends React.HTMLProps<ProgressBar> {
+    export interface ProgressBarProps extends Omit<React.HTMLProps<ProgressBar>, "label"> {
         // Optional
         active?: boolean;
         bsSize?: Sizes;
@@ -13,6 +13,7 @@ declare namespace ProgressBar {
         now?: number;
         srOnly?: boolean;
         striped?: boolean;
+        label?: React.ReactNode;
     }
 }
 declare class ProgressBar extends React.Component<ProgressBar.ProgressBarProps> { }
diff --git a/types/react-bootstrap/lib/SplitButton.d.ts b/types/react-bootstrap/lib/SplitButton.d.ts
index 7f3d9d7f30..7b824cd647 100644
--- a/types/react-bootstrap/lib/SplitButton.d.ts
+++ b/types/react-bootstrap/lib/SplitButton.d.ts
@@ -1,13 +1,15 @@
 import * as React from 'react';
-import { Sizes } from 'react-bootstrap';
+import { Sizes, Omit } from 'react-bootstrap';
 
 declare namespace SplitButton {
-    export interface SplitButtonProps extends React.HTMLProps<SplitButton> {
+    export interface SplitButtonProps extends Omit<React.HTMLProps<SplitButton>, "title"> {
         bsStyle?: string;
         bsSize?: Sizes;
         dropdownTitle?: any; // TODO: Add more specific type
         dropup?: boolean;
         pullRight?: boolean;
+        title: React.ReactNode;
+        id: string;
     }
 }
 declare class SplitButton extends React.Component<SplitButton.SplitButtonProps> { }
diff --git a/types/react-bootstrap/lib/Tab.d.ts b/types/react-bootstrap/lib/Tab.d.ts
index f30264a562..1c98d8c0a3 100644
--- a/types/react-bootstrap/lib/Tab.d.ts
+++ b/types/react-bootstrap/lib/Tab.d.ts
@@ -1,17 +1,18 @@
 import * as React from 'react';
-import { TransitionCallbacks } from 'react-bootstrap';
+import { TransitionCallbacks, Omit } from 'react-bootstrap';
 import * as TabContainer from './TabContainer';
 import * as TabPane from './TabPane';
 import * as TabContent from './TabContent';
 
 declare namespace Tab {
-    export interface TabProps extends TransitionCallbacks, React.HTMLProps<Tab> {
+    export interface TabProps extends TransitionCallbacks, Omit<React.HTMLProps<Tab>, "title"> {
         animation?: boolean;
         'aria-labelledby'?: string;
         bsClass?: string;
         eventKey?: any; // TODO: Add more specific type
         unmountOnExit?: boolean;
         tabClassName?: string;
+        title?: React.ReactNode; // Override HTMLProps.title to allow nodes not just strings
     }
 }
 declare class Tab extends React.Component<Tab.TabProps> {
diff --git a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
index 78579dc953..ff2c5b7472 100644
--- a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
@@ -120,7 +120,7 @@ export class ReactBootstrapIndividualComponentsTest extends React.Component {
         <Collapse />
         <ControlLabel />
         <Dropdown id="foo" />
-        <DropdownButton id="foo" />
+        <DropdownButton id="foo" title="bar" />
         <DropdownMenu />
         <DropdownToggle />
         <Fade />
@@ -178,7 +178,7 @@ export class ReactBootstrapIndividualComponentsTest extends React.Component {
         <ResponsiveEmbed />
         <Row />
         <SafeAnchor />
-        <SplitButton />
+        <SplitButton id="foo" title="bar" />
         <SplitToggle />
         <Tab />
         <TabContainer />
diff --git a/types/react-breadcrumbs-dynamic/index.d.ts b/types/react-breadcrumbs-dynamic/index.d.ts
new file mode 100644
index 0000000000..21fb9f977a
--- /dev/null
+++ b/types/react-breadcrumbs-dynamic/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for react-breadcrumbs-dynamic 1.0
+// Project: https://github.com/oklas/react-breadcrumbs-dynamic
+// Definitions by: mitsuruog <https://github.com/mitsuruog>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export class BreadcrumbsProvider extends React.Component<BreadcrumbsProviderProps> {}
+
+export class Breadcrumbs extends React.Component<BreadcrumbsProps> {}
+
+export class BreadcrumbsItem extends React.Component<BreadcrumbsItemProps> {}
+
+export interface BreadcrumbsProviderProps {
+  shouldBreadcrumbsUpdate?: (...args: any[]) => any;
+}
+
+export interface BreadcrumbsProps {
+  container?: string | Element | {};
+  containerProps?: {};
+  item?: string | Element | {};
+  finalItem?: string | Element | {};
+  finalProps?: {};
+  separator?: string | Element | {};
+  renameProps?: {};
+  duplicateProps?: {};
+}
+
+export interface BreadcrumbsItemProps {
+  to: string;
+}
diff --git a/types/react-breadcrumbs-dynamic/react-breadcrumbs-dynamic-tests.tsx b/types/react-breadcrumbs-dynamic/react-breadcrumbs-dynamic-tests.tsx
new file mode 100644
index 0000000000..f5d9023d49
--- /dev/null
+++ b/types/react-breadcrumbs-dynamic/react-breadcrumbs-dynamic-tests.tsx
@@ -0,0 +1,47 @@
+import * as React from "react";
+import {
+    BreadcrumbsProvider,
+    Breadcrumbs,
+    BreadcrumbsItem,
+} from "react-breadcrumbs-dynamic";
+
+class Test1 extends React.Component {
+    render() {
+        return (
+            <BreadcrumbsProvider>
+                <div>
+                    <Breadcrumbs />
+                    <BreadcrumbsItem to="/">Home</BreadcrumbsItem>
+                </div>
+            </BreadcrumbsProvider>
+        );
+    }
+}
+
+const customProps = {
+    yay: "yay"
+};
+
+class Test2 extends React.Component {
+    render() {
+        return (
+            <BreadcrumbsProvider
+                shouldBreadcrumbsUpdate={() => {}}
+            >
+                <div>
+                    <Breadcrumbs
+                        container={"nav"}
+                        containerProps={customProps}
+                        item={"a"}
+                        finalItem={"strong"}
+                        finalProps={customProps}
+                        separator={"<span>/</span>"}
+                        renameProps={customProps}
+                        duplicateProps={customProps}
+                    />
+                    <BreadcrumbsItem to="/">Home</BreadcrumbsItem>
+                </div>
+            </BreadcrumbsProvider>
+        );
+    }
+}
diff --git a/types/react-breadcrumbs-dynamic/tsconfig.json b/types/react-breadcrumbs-dynamic/tsconfig.json
new file mode 100644
index 0000000000..8b058ae2d6
--- /dev/null
+++ b/types/react-breadcrumbs-dynamic/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-breadcrumbs-dynamic-tests.tsx"
+    ]
+}
diff --git a/types/react-breadcrumbs-dynamic/tslint.json b/types/react-breadcrumbs-dynamic/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-breadcrumbs-dynamic/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-breadcrumbs/index.d.ts b/types/react-breadcrumbs/index.d.ts
index 01a91fed5d..c004e4aba4 100644
--- a/types/react-breadcrumbs/index.d.ts
+++ b/types/react-breadcrumbs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/svenanders/react-breadcrumbs
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from "react";
 import * as ReactRouter from "react-router";
diff --git a/types/react-breadcrumbs/tslint.json b/types/react-breadcrumbs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-breadcrumbs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-broadcast/index.d.ts b/types/react-broadcast/index.d.ts
new file mode 100644
index 0000000000..8a9a3bf47b
--- /dev/null
+++ b/types/react-broadcast/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for react-broadcast 0.6
+// Project: https://github.com/ReactTraining/react-broadcast
+// Definitions by: Jaga Santagostino <https://github.com/kandros>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+export namespace Subscriber {
+    interface DefaultProps {
+        quiet: boolean;
+    }
+    interface Props<T> extends Partial<DefaultProps> {
+        channel: string;
+        children?: ((state: T) => React.ReactNode);
+    }
+}
+
+export namespace Broadcast {
+    interface DefaultProps<T> {
+        compareValues: (prevValue: T, nextValue: T) => boolean;
+    }
+    interface Props<T> extends Partial<DefaultProps<T>> {
+        channel: string;
+        children: React.ReactNode;
+        value: T;
+    }
+}
+
+export class Broadcast<T> extends React.Component<Broadcast.Props<T>, any> { }
+export class Subscriber<T> extends React.Component<Subscriber.Props<T>, any> { }
diff --git a/types/react-broadcast/react-broadcast-tests.tsx b/types/react-broadcast/react-broadcast-tests.tsx
new file mode 100644
index 0000000000..6f3466e729
--- /dev/null
+++ b/types/react-broadcast/react-broadcast-tests.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Broadcast, Subscriber } from 'react-broadcast';
+
+class ExampleOfUsingReactBroadcast extends React.Component {
+  render() {
+    const value = 42;
+    return (
+      <Broadcast channel="my-channel" value={42}>
+        <div>
+          <Subscriber channel="my-channel">
+            {state => <div>{state}</div>}
+          </Subscriber>
+        </div>
+      </Broadcast>
+    );
+  }
+}
diff --git a/types/react-broadcast/tsconfig.json b/types/react-broadcast/tsconfig.json
new file mode 100644
index 0000000000..270151cc33
--- /dev/null
+++ b/types/react-broadcast/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "module": "commonjs",
+    "lib": ["es6", "dom"],
+    "jsx": "react",
+    "strictNullChecks": true,
+    "strictFunctionTypes": false,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true
+  },
+  "files": ["index.d.ts", "react-broadcast-tests.tsx"]
+}
diff --git a/types/react-broadcast/tslint.json b/types/react-broadcast/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-broadcast/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/react-burger-menu/index.d.ts b/types/react-burger-menu/index.d.ts
index 2cfe6aaa4e..585026eeee 100644
--- a/types/react-burger-menu/index.d.ts
+++ b/types/react-burger-menu/index.d.ts
@@ -6,13 +6,17 @@
 
 import * as React from "react";
 
+export interface State {
+  isOpen: boolean;
+}
+
 export interface Props {
     burgerBarClassName?: string;
     burgerButtonClassName?: string;
     crossButtonClassName?: string;
     crossClassName?: string;
-    customBurgerIcon?: Element | false;
-    customCrossIcon?: Element | false;
+    customBurgerIcon?: JSX.Element | false;
+    customCrossIcon?: JSX.Element | false;
     id?: string;
     isOpen?: boolean;
     itemListClassName?: string;
@@ -20,7 +24,7 @@ export interface Props {
     morphShapeClassName?: string;
     noOverlay?: boolean;
     disableOverlayClick?: boolean;
-    onStateChange?(): void;
+    onStateChange?(state: State): void;
     // TODO (Rajab) This can be improved, though I do not know how. From PropTypes:
     // styles && styles.outerContainer ? PropTypes.string.isRequired : PropTypes.string
     outerContainerId?: string;
diff --git a/types/react-burger-menu/react-burger-menu-tests.tsx b/types/react-burger-menu/react-burger-menu-tests.tsx
index 573c59c023..07add1ef97 100644
--- a/types/react-burger-menu/react-burger-menu-tests.tsx
+++ b/types/react-burger-menu/react-burger-menu-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { slide as Menu } from 'react-burger-menu';
+import { slide as Menu, State } from 'react-burger-menu';
 
 class Example extends React.Component {
   showSettings(event: {
@@ -10,7 +10,11 @@ class Example extends React.Component {
 
   render() {
     return (
-      <Menu>
+      <Menu
+        customBurgerIcon={<img src="img/icon.svg" />}
+        customCrossIcon={<img src="img/icon.svg" />}
+        onStateChange={this.onStateChange}
+      >
         <a id="home" className="menu-item" href="/">Home</a>
         <a id="about" className="menu-item" href="/about">About</a>
         <a id="contact" className="menu-item" href="/contact">Contact</a>
@@ -18,4 +22,8 @@ class Example extends React.Component {
       </Menu>
     );
   }
+
+  onStateChange = (state: State): void => {
+    console.log(state.isOpen);
+  }
 }
diff --git a/types/react-bytesize-icons/tslint.json b/types/react-bytesize-icons/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-bytesize-icons/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-calendar-heatmap/index.d.ts b/types/react-calendar-heatmap/index.d.ts
new file mode 100644
index 0000000000..f15ff887ca
--- /dev/null
+++ b/types/react-calendar-heatmap/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for react-calendar-heatmap 1.6
+// Project: https://github.com/patientslikeme/react-calendar-heatmap
+// Definitions by: Keisuke Kan <https://github.com/9renpoto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export interface Props {
+    classForValue?: (value: any) => any;
+    endDate?: string | number | Date;
+    gutterSize?: number;
+    horizontal?: boolean;
+    monthLabels?: string[];
+    numDays?: number;
+    onClick?: (value: any) => void;
+    onMouseLeave?: (e: any, value: any) => void;
+    onMouseOver?: (e: any, value: any) => void;
+    showMonthLabels?: boolean;
+    showOutOfRangeDays?: boolean;
+    showWeekdayLabels?: boolean;
+    startDate?: string | number | Date;
+    titleForValue?: (value: any) => any;
+    tooltipDataAttrs?: object;
+    transformDayElement?: (rect: any, value: any, index: number) => any;
+    values: any[];
+    weekdayLabels?: string[];
+}
+
+export default class ReactCalendarHeatmap extends React.Component<Props> {}
diff --git a/types/react-calendar-heatmap/react-calendar-heatmap-tests.tsx b/types/react-calendar-heatmap/react-calendar-heatmap-tests.tsx
new file mode 100644
index 0000000000..4e807ddfcd
--- /dev/null
+++ b/types/react-calendar-heatmap/react-calendar-heatmap-tests.tsx
@@ -0,0 +1,16 @@
+import * as React from 'react';
+import CalendarHeatmap from 'react-calendar-heatmap';
+
+export default function() {
+    return (
+        <CalendarHeatmap
+            endDate={new Date('2016-04-01')}
+            numDays={100}
+            values={[
+                {date: '2016-01-01'},
+                {date: '2016-01-22'},
+                {date: '2016-01-30'}
+            ]}
+        />
+    );
+}
diff --git a/types/react-calendar-heatmap/tsconfig.json b/types/react-calendar-heatmap/tsconfig.json
new file mode 100644
index 0000000000..f605aa4478
--- /dev/null
+++ b/types/react-calendar-heatmap/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-calendar-heatmap-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-calendar-heatmap/tslint.json b/types/react-calendar-heatmap/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-calendar-heatmap/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-calendar-timeline/tslint.json b/types/react-calendar-timeline/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-calendar-timeline/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-cartographer/index.d.ts b/types/react-cartographer/index.d.ts
new file mode 100644
index 0000000000..918fcbef81
--- /dev/null
+++ b/types/react-cartographer/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for react-cartographer 0.4
+// Project: https://github.com/yahoo/react-cartographer
+// Definitions by: Tre`Von McKay <https://github.com/trevonmckay>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+import Map from './lib/components/Map';
+
+export {
+     Map
+};
diff --git a/types/react-cartographer/lib/components/Map.d.ts b/types/react-cartographer/lib/components/Map.d.ts
new file mode 100644
index 0000000000..c1afc8b3c8
--- /dev/null
+++ b/types/react-cartographer/lib/components/Map.d.ts
@@ -0,0 +1,69 @@
+import * as React from "react";
+
+export interface MapData {
+    locationLink: any;
+    locationText: string;
+}
+
+export interface MapObject {
+    mapId: string;
+    data: MapData;
+}
+
+export class BingMapService {
+    name(): string;
+
+    getMap(params: MapProps): MapObject;
+}
+
+export class GoogleMapService {
+    name(): string;
+
+    getMap(params: MapProps): MapObject;
+}
+
+export class YahooMapService {
+    name(): string;
+
+    getMap(params: MapProps): MapObject;
+}
+
+export class MapLocationFactory {
+    getMap(params: MapProps): MapObject;
+}
+
+export interface MapProps {
+    providerKey: string;
+
+    /** Default: yahoo */
+    provider: 'yahoo' | 'google' | 'bing';
+
+    /** Default: map */
+    mapId: string;
+
+    addressLine1?: string;
+
+    city?: string;
+
+    state?: string;
+
+    country?: string;
+
+    longitude?: number;
+
+    latitude?: number;
+
+    /** Default: 270 */
+    height: number;
+
+    /** Default: 580 */
+    width: number;
+
+    /** Default: 10 */
+    zoom: number;
+
+    /** Default: false */
+    useBackgroundImageStyle: boolean;
+}
+
+export default class Map extends React.Component<MapProps> {}
diff --git a/types/react-cartographer/react-cartographer-tests.tsx b/types/react-cartographer/react-cartographer-tests.tsx
new file mode 100644
index 0000000000..693c2945e5
--- /dev/null
+++ b/types/react-cartographer/react-cartographer-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from "react";
+import { Map } from "react-cartographer";
+
+class Test extends React.Component {
+    render() {
+        return (
+            <Map
+                providerKey=""
+                provider='bing'
+                mapId='map'
+                addressLine1='One Microsoft Way'
+                city='Redmond'
+                state='WA'
+                country='United States'
+                zoom={15}
+                height={270}
+                width={580}
+                useBackgroundImageStyle={true}
+            />
+        );
+    }
+}
diff --git a/types/react-cartographer/tsconfig.json b/types/react-cartographer/tsconfig.json
new file mode 100644
index 0000000000..dcf04419fe
--- /dev/null
+++ b/types/react-cartographer/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "lib/components/Map.d.ts",
+        "react-cartographer-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-cartographer/tslint.json b/types/react-cartographer/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-cartographer/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-chartjs-2/index.d.ts b/types/react-chartjs-2/index.d.ts
deleted file mode 100644
index d6b0fe41c4..0000000000
--- a/types/react-chartjs-2/index.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Type definitions for react-chartjs-2 2.0
-// Project: https://github.com/gor181/react-chartjs-2
-// Definitions by: Alexandre Paré <https://github.com/apare>
-//                 Fabien Lavocat <https://github.com/FabienLavocat>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import * as React from "react";
-import * as chartjs from "chart.js";
-
-export type ChartDataFunction<T extends chartjs.ChartData> = (element: HTMLElement) => T;
-export type ChartData<T extends chartjs.ChartData> = ChartDataFunction<T>| T;
-
-export interface ChartComponentProps {
-    data: ChartData<chartjs.ChartData>;
-    type?: chartjs.ChartType;
-    getDatasetAtEvent?(e: any): void;
-    getElementAtEvent?(e: any): void;
-    getElementsAtEvent?(e: any): void;
-    height?: number;
-    legend?: chartjs.ChartLegendOptions;
-    onElementsClick?(e: any): void; // alias for getElementsAtEvent (backward compatibility)
-    options?: chartjs.ChartOptions;
-    redraw?: boolean;
-    width?: number;
-}
-
-export interface LinearComponentProps extends ChartComponentProps {
-    data: ChartData<chartjs.ChartData>;
-}
-
-export default class ChartComponent<P extends ChartComponentProps> extends React.Component<P> {
-    chart_instance: chartjs;
-}
-
-export class Doughnut extends ChartComponent<ChartComponentProps> {
-}
-
-export class Pie extends ChartComponent<ChartComponentProps> {
-}
-
-export class Line extends ChartComponent<LinearComponentProps> {
-}
-
-export class Bar extends ChartComponent<LinearComponentProps> {
-}
-
-export class HorizontalBar extends ChartComponent<ChartComponentProps> {
-}
-
-export class Radar extends ChartComponent<ChartComponentProps> {
-}
-
-export class Polar extends ChartComponent<ChartComponentProps> {
-}
-
-export class Bubble extends ChartComponent<ChartComponentProps> {
-}
diff --git a/types/react-chartjs-2/test/bar.tsx b/types/react-chartjs-2/test/bar.tsx
deleted file mode 100644
index c1ff3a3567..0000000000
--- a/types/react-chartjs-2/test/bar.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as React from 'react';
-import { Bar } from 'react-chartjs-2';
-
-const data = {
-  labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-  datasets: [
-    {
-      label: 'My First dataset',
-      backgroundColor: 'rgba(255,99,132,0.2)',
-      borderColor: 'rgba(255,99,132,1)',
-      borderWidth: 1,
-      hoverBackgroundColor: 'rgba(255,99,132,0.4)',
-      hoverBorderColor: 'rgba(255,99,132,1)',
-      data: [65, 59, 80, 81, 56, 55, 40]
-    }
-  ]
-};
-
-export default React.createClass({
-  displayName: 'BarExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Bar Example (custom size)</h2>
-        <Bar
-          data={data}
-          width={100}
-          height={50}
-          options={{
-            maintainAspectRatio: false
-          }}
-        />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/bubble.tsx b/types/react-chartjs-2/test/bubble.tsx
deleted file mode 100755
index b52d306136..0000000000
--- a/types/react-chartjs-2/test/bubble.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as React from 'react';
-import { Bubble } from 'react-chartjs-2';
-
-const data = {
-  labels: ['January'],
-  datasets: [
-    {
-      label: 'My First dataset',
-      fill: false,
-      lineTension: 0.1,
-      backgroundColor: 'rgba(75,192,192,0.4)',
-      borderColor: 'rgba(75,192,192,1)',
-      borderCapStyle: 'butt',
-      borderDash: [] as any[],
-      borderDashOffset: 0.0,
-      borderJoinStyle: 'miter',
-      pointBorderColor: 'rgba(75,192,192,1)',
-      pointBackgroundColor: '#fff',
-      pointBorderWidth: 1,
-      pointHoverRadius: 5,
-      pointHoverBackgroundColor: 'rgba(75,192,192,1)',
-      pointHoverBorderColor: 'rgba(220,220,220,1)',
-      pointHoverBorderWidth: 2,
-      pointRadius: 1,
-      pointHitRadius: 10,
-      data: [{ x: 10, y: 20, r: 5 }]
-    }
-  ]
-};
-
-export default React.createClass({
-  displayName: 'BubbleExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Bubble Example</h2>
-        <Bubble data={data} />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/doughnut.tsx b/types/react-chartjs-2/test/doughnut.tsx
deleted file mode 100755
index 6a25d0354b..0000000000
--- a/types/react-chartjs-2/test/doughnut.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import * as React from 'react';
-import { Doughnut } from 'react-chartjs-2';
-
-const data = {
-	labels: [
-		'Red',
-		'Green',
-		'Yellow'
-	],
-	datasets: [{
-		data: [300, 50, 100],
-		backgroundColor: [
-		'#FF6384',
-		'#36A2EB',
-		'#FFCE56'
-		],
-		pointHoverBackgroundColor: [
-		'#FF6384',
-		'#36A2EB',
-		'#FFCE56'
-		]
-	}]
-};
-
-export default React.createClass({
-  displayName: 'DoughnutExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Doughnut Example</h2>
-        <Doughnut data={data} />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/dynamic-doughnut.tsx b/types/react-chartjs-2/test/dynamic-doughnut.tsx
deleted file mode 100755
index 977c5a9801..0000000000
--- a/types/react-chartjs-2/test/dynamic-doughnut.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as React from 'react';
-import { Doughnut } from 'react-chartjs-2';
-
-function getRandomInt(min: number, max: number) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
-const getState = () => ({
-  labels: [
-    'Red',
-    'Green',
-    'Yellow'
-  ],
-  datasets: [{
-    data: [getRandomInt(50, 200), getRandomInt(100, 150), getRandomInt(150, 250)],
-    backgroundColor: [
-      '#CCC',
-      '#36A2EB',
-      '#FFCE56'
-    ],
-    hoverBackgroundColor: [
-      '#FF6384',
-      '#36A2EB',
-      '#FFCE56'
-    ]
-  }]
-});
-
-export default class DynamicDoughnutExample extends React.Component {
-  getInitialState() {
-    return getState();
-  }
-
-  componentWillMount() {
-    setInterval(() => {
-      this.setState(getState());
-    }, 5000);
-  }
-
-  render() {
-    return (
-      <div>
-        <h2>Dynamically refreshed Doughnut Example</h2>
-        <Doughnut data={this.state} />
-      </div>
-    );
-  }
-}
diff --git a/types/react-chartjs-2/test/horizontalBar.tsx b/types/react-chartjs-2/test/horizontalBar.tsx
deleted file mode 100755
index bf66f6b9fc..0000000000
--- a/types/react-chartjs-2/test/horizontalBar.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as React from 'react';
-import { HorizontalBar } from 'react-chartjs-2';
-
-const data = {
-  labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-  datasets: [
-    {
-      label: 'My First dataset',
-      backgroundColor: 'rgba(255,99,132,0.2)',
-      borderColor: 'rgba(255,99,132,1)',
-      borderWidth: 1,
-      hoverBackgroundColor: 'rgba(255,99,132,0.4)',
-      hoverBorderColor: 'rgba(255,99,132,1)',
-      data: [65, 59, 80, 81, 56, 55, 40]
-    }
-  ]
-};
-
-export default React.createClass({
-  displayName: 'BarExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Horizontal Bar Example</h2>
-        <HorizontalBar data={data} />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/index.tsx b/types/react-chartjs-2/test/index.tsx
deleted file mode 100644
index 4032fe82e2..0000000000
--- a/types/react-chartjs-2/test/index.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-
-import DoughnutExample from './doughnut';
-import DynamicDoughnutExample from './dynamic-doughnut';
-import PieExample from './pie';
-import LineExample from './line';
-import BarExample from './bar';
-import HorizontalBarExample from './horizontalBar';
-import RadarExample from './radar';
-import PolarExample from './polar';
-import BubbleExample from './bubble';
-import MixedDataExample from './mix';
-import RandomizedDataLineExample from './randomizedLine';
-
-class App extends React.Component {
-	render() {
-		return (
-			<div>
-				<hr />
-				<DoughnutExample />
-				<hr />
-				<DynamicDoughnutExample />
-				<hr />
-				<PieExample />
-				<hr />
-				<LineExample />
-				<hr />
-				<BarExample />
-				<hr />
-				<HorizontalBarExample />
-				<hr />
-				<RadarExample />
-				<hr />
-				<PolarExample />
-				<hr />
-				<BubbleExample />
-				<hr />
-				<MixedDataExample />
-				<hr />
-				<RandomizedDataLineExample />
-			</div>
-		);
-	}
-}
-
-ReactDOM.render(<App />, document.getElementById('app'));
diff --git a/types/react-chartjs-2/test/line.tsx b/types/react-chartjs-2/test/line.tsx
deleted file mode 100755
index 55b0ad73fd..0000000000
--- a/types/react-chartjs-2/test/line.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as React from 'react';
-import { Line } from 'react-chartjs-2';
-
-const data = {
-  labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-  datasets: [
-    {
-      label: 'My First dataset',
-      fill: false,
-      lineTension: 0.1,
-      backgroundColor: 'rgba(75,192,192,0.4)',
-      borderColor: 'rgba(75,192,192,1)',
-      borderCapStyle: 'butt',
-      borderDash: [] as any[],
-      borderDashOffset: 0.0,
-      borderJoinStyle: 'miter',
-      pointBorderColor: 'rgba(75,192,192,1)',
-      pointBackgroundColor: '#fff',
-      pointBorderWidth: 1,
-      pointHoverRadius: 5,
-      pointHoverBackgroundColor: 'rgba(75,192,192,1)',
-      pointHoverBorderColor: 'rgba(220,220,220,1)',
-      pointHoverBorderWidth: 2,
-      pointRadius: 1,
-      pointHitRadius: 10,
-      data: [65, 59, 80, 81, 56, 55, 40]
-    }
-  ]
-};
-
-export default React.createClass({
-  displayName: 'LineExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Line Example</h2>
-        <Line data={data} />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/mix.tsx b/types/react-chartjs-2/test/mix.tsx
deleted file mode 100755
index 614e61723e..0000000000
--- a/types/react-chartjs-2/test/mix.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import * as React from 'react';
-import { Bar } from 'react-chartjs-2';
-import { ChartData, ChartOptions } from 'chart.js';
-
-const data: ChartData = {
-  labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-  datasets: [{
-    label: 'Sales',
-    type: 'line',
-    data: [51, 65, 40, 49, 60, 37, 40],
-    fill: false,
-    borderColor: '#EC932F',
-    backgroundColor: '#EC932F',
-    pointBorderColor: '#EC932F',
-    pointBackgroundColor: '#EC932F',
-    pointHoverBackgroundColor: '#EC932F',
-    pointHoverBorderColor: '#EC932F',
-    yAxisID: 'y-axis-2'
-  }, {
-    type: 'bar',
-    label: 'Visitor',
-    data: [200, 185, 590, 621, 250, 400, 95],
-    fill: false,
-    backgroundColor: '#71B37C',
-    borderColor: '#71B37C',
-    yAxisID: 'y-axis-1'
-  }]
-};
-
-const options: ChartOptions = {
-  responsive: true,
-  tooltips: {
-    mode: 'label'
-  },
-  elements: {
-    line: {
-      fill: false
-    }
-  },
-  scales: {
-    xAxes: [
-      {
-        display: true,
-        gridLines: {
-          display: false
-        }
-      }
-    ],
-    yAxes: [
-      {
-        type: 'linear',
-        display: true,
-        position: 'left',
-        id: 'y-axis-1',
-        gridLines: {
-          display: false
-        }
-      },
-      {
-        type: 'linear',
-        display: true,
-        position: 'right',
-        id: 'y-axis-2',
-        gridLines: {
-          display: false
-        }
-      }
-    ]
-  }
-};
-
-export default React.createClass({
-  displayName: 'MixExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Mixed data Example</h2>
-        <Bar
-          data={data}
-          options={options}
-        />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/pie.tsx b/types/react-chartjs-2/test/pie.tsx
deleted file mode 100755
index 9fb1912f5b..0000000000
--- a/types/react-chartjs-2/test/pie.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import * as React from 'react';
-import { Pie } from 'react-chartjs-2';
-
-const data = {
-	labels: [
-		'Red',
-		'Green',
-		'Yellow'
-	],
-	datasets: [{
-		data: [300, 50, 100],
-		backgroundColor: [
-		'#FF6384',
-		'#36A2EB',
-		'#FFCE56'
-		],
-		pointHoverBackgroundColor: [
-		'#FF6384',
-		'#36A2EB',
-		'#FFCE56'
-		]
-	}]
-};
-
-export default React.createClass({
-  displayName: 'PieExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Pie Example</h2>
-        <Pie data={data} />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/polar.tsx b/types/react-chartjs-2/test/polar.tsx
deleted file mode 100755
index d586ca44be..0000000000
--- a/types/react-chartjs-2/test/polar.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as React from 'react';
-import { Polar } from 'react-chartjs-2';
-
-const data = {
-  datasets: [{
-    data: [
-      11,
-      16,
-      7,
-      3,
-      14
-    ],
-    backgroundColor: [
-      '#FF6384',
-      '#4BC0C0',
-      '#FFCE56',
-      '#E7E9ED',
-      '#36A2EB'
-    ],
-    label: 'My dataset' // for legend
-  }],
-  labels: [
-    'Red',
-    'Green',
-    'Yellow',
-    'Grey',
-    'Blue'
-  ]
-};
-
-export default React.createClass({
-  displayName: 'PolarExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Polar Example</h2>
-        <Polar data={data} />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/radar.tsx b/types/react-chartjs-2/test/radar.tsx
deleted file mode 100755
index 5c6dbc7c7d..0000000000
--- a/types/react-chartjs-2/test/radar.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as React from 'react';
-import { Radar } from 'react-chartjs-2';
-
-const data = {
-  labels: ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'],
-  datasets: [
-    {
-      label: 'My First dataset',
-      backgroundColor: 'rgba(179,181,198,0.2)',
-      borderColor: 'rgba(179,181,198,1)',
-      pointBackgroundColor: 'rgba(179,181,198,1)',
-      pointBorderColor: '#fff',
-      pointHoverBackgroundColor: '#fff',
-      pointHoverBorderColor: 'rgba(179,181,198,1)',
-      data: [65, 59, 90, 81, 56, 55, 40]
-    },
-    {
-      label: 'My Second dataset',
-      backgroundColor: 'rgba(255,99,132,0.2)',
-      borderColor: 'rgba(255,99,132,1)',
-      pointBackgroundColor: 'rgba(255,99,132,1)',
-      pointBorderColor: '#fff',
-      pointHoverBackgroundColor: '#fff',
-      pointHoverBorderColor: 'rgba(255,99,132,1)',
-      data: [28, 48, 40, 19, 96, 27, 100]
-    }
-  ]
-};
-
-export default React.createClass({
-  displayName: 'RadarExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Radar Example</h2>
-        <Radar data={data} />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/test/randomizedLine.tsx b/types/react-chartjs-2/test/randomizedLine.tsx
deleted file mode 100755
index 66be548968..0000000000
--- a/types/react-chartjs-2/test/randomizedLine.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import * as React from 'react';
-import { Line } from 'react-chartjs-2';
-
-const initialState = {
-  labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-  datasets: [
-    {
-      label: 'My First dataset',
-      fill: false,
-      lineTension: 0.1,
-      backgroundColor: 'rgba(75,192,192,0.4)',
-      borderColor: 'rgba(75,192,192,1)',
-      borderCapStyle: 'butt',
-      borderDash: [] as any[],
-      borderDashOffset: 0.0,
-      borderJoinStyle: 'miter',
-      pointBorderColor: 'rgba(75,192,192,1)',
-      pointBackgroundColor: '#fff',
-      pointBorderWidth: 1,
-      pointHoverRadius: 5,
-      pointHoverBackgroundColor: 'rgba(75,192,192,1)',
-      pointHoverBorderColor: 'rgba(220,220,220,1)',
-      pointHoverBorderWidth: 2,
-      pointRadius: 1,
-      pointHitRadius: 10,
-      data: [65, 59, 80, 81, 56, 55, 40]
-    }
-  ]
-};
-
-class Graph extends React.Component<any, any> {
-  componentWillMount() {
-    this.setState(initialState);
-  }
-
-  componentDidMount() {
-    setInterval(() => {
-      const oldDataSet = this.state;
-      const newData: number[] = [];
-
-      this.state.labels.forEach(() => {
-        newData.push(Math.floor(Math.random() * 100));
-      });
-
-      const newDataSet = {
-        ...oldDataSet
-      };
-
-      newDataSet.data = newData;
-
-      this.setState({ datasets: [newDataSet] });
-    }, 5000);
-  }
-
-  render() {
-    return (
-      <Line data={this.state} />
-    );
-  }
-}
-
-export default React.createClass({
-  displayName: 'RandomizedDataLineExample',
-
-  render() {
-    return (
-      <div>
-        <h2>Random Animated Line Example</h2>
-        <Graph />
-      </div>
-    );
-  }
-});
diff --git a/types/react-chartjs-2/tsconfig.json b/types/react-chartjs-2/tsconfig.json
deleted file mode 100644
index ef5b3e00c9..0000000000
--- a/types/react-chartjs-2/tsconfig.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
-    },
-    "files": [
-        "index.d.ts",
-        "test/index.tsx",
-        "test/bar.tsx",
-        "test/bubble.tsx",
-        "test/doughnut.tsx",
-        "test/dynamic-doughnut.tsx",
-        "test/horizontalBar.tsx",
-        "test/line.tsx",
-        "test/mix.tsx",
-        "test/pie.tsx",
-        "test/polar.tsx",
-        "test/radar.tsx",
-        "test/randomizedLine.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-codemirror/tslint.json b/types/react-codemirror/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-codemirror/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-collapse/index.d.ts b/types/react-collapse/index.d.ts
new file mode 100644
index 0000000000..ebb15e2dbb
--- /dev/null
+++ b/types/react-collapse/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for react-collapse 4.0
+// Project: https://github.com/nkbt/react-collapse
+// Definitions by: Adam Binford <https://github.com/Kimahriman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+import * as React from 'react';
+
+export interface CollapseProps extends React.HTMLProps<Collapse> {
+    isOpened: boolean;
+    children: React.ReactNode;
+
+    springConfig?: { [key: string]: number }; // react-motion doesn't export the config interface
+    forceInitialAnimation?: boolean;
+    hasNestedCollapse?: boolean;
+    fixedHeight?: number;
+    theme?: {
+        collapse: string
+        content: string
+    };
+    style?: React.CSSProperties;
+    onRender?: ({ current, from, to }: { current: number; from: number; to: number; }) => void;
+    onRest?: () => void;
+    onMeasure?: ({ width, height }: { width: number; height: number; }) => void;
+}
+
+export class Collapse extends React.PureComponent<CollapseProps> { }
+
+export class UnmountClosed extends React.PureComponent<CollapseProps> { }
diff --git a/types/react-collapse/react-collapse-tests.tsx b/types/react-collapse/react-collapse-tests.tsx
new file mode 100644
index 0000000000..cb4177c18a
--- /dev/null
+++ b/types/react-collapse/react-collapse-tests.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react';
+import { Collapse, UnmountClosed } from 'react-collapse';
+
+class TestRequired extends React.Component {
+    render() {
+        return (
+            <div>
+                <Collapse
+                    isOpened>
+                    <div/>
+                </Collapse>
+                <UnmountClosed
+                    isOpened>
+                    <div/>
+                </UnmountClosed>
+            </div>
+        );
+    }
+}
+
+class TestAll extends React.Component {
+    render() {
+        const springConfig = {
+            stiffness: 1,
+            damping: 1,
+            precision: 1,
+        };
+
+        const theme = {
+            collapse: 'collapse-class',
+            content: 'content-class'
+        };
+
+        const style: React.CSSProperties = {
+            fontWeight: 'bold',
+            fontSize: 16
+        };
+
+        const onRender = (object: { current: number; from: number; to: number; }) => {};
+        const onRest = () => {};
+        const onMeasure = (object: { width: number; height: number }) => {};
+
+        return (
+            <div>
+                <Collapse
+                    isOpened
+                    springConfig={ springConfig }
+                    forceInitialAnimation
+                    hasNestedCollapse
+                    fixedHeight={ 0 }
+                    theme={ theme }
+                    style={ style }
+                    onRender={ onRender }
+                    onRest={ onRest }
+                    onMeasure={ onMeasure}>
+                    <div/>
+                </Collapse>
+                <UnmountClosed
+                    isOpened
+                    springConfig={ springConfig }
+                    forceInitialAnimation
+                    hasNestedCollapse
+                    fixedHeight={ 0 }
+                    theme={ theme }
+                    style={ style }
+                    onRender={ onRender }
+                    onRest={ onRest }
+                    onMeasure={ onMeasure}>
+                    <div/>
+                </UnmountClosed>
+            </div>
+        );
+    }
+}
diff --git a/types/react-collapse/tsconfig.json b/types/react-collapse/tsconfig.json
new file mode 100644
index 0000000000..291864c9d3
--- /dev/null
+++ b/types/react-collapse/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-collapse-tests.tsx"
+    ]
+}
diff --git a/types/react-collapse/tslint.json b/types/react-collapse/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-collapse/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-confirm/index.d.ts b/types/react-confirm/index.d.ts
new file mode 100644
index 0000000000..23b9f40772
--- /dev/null
+++ b/types/react-confirm/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for react-confirm 0.1
+// Project: https://github.com/haradakunihiko/react-confirm
+// Definitions by: santiagodoldan <https://github.com/santiagodoldan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export class PlainConfirmModal extends React.Component<any, any> { }
+
+export function confirmable(component: typeof PlainConfirmModal): React.Component<ReactConfirmProps>;
+export function createConfirmation(component: React.Component, unmountDelay?: number): (props: any) => Promise<string>;
+
+export interface ReactConfirmProps {
+    confirmation: string | React.ReactElement<any>;
+    dismiss: () => void;
+    proceed: (value?: string) => void;
+    cancel: (value?: string) => void;
+    show: boolean;
+}
diff --git a/types/react-confirm/react-confirm-tests.tsx b/types/react-confirm/react-confirm-tests.tsx
new file mode 100644
index 0000000000..a062b1e2a2
--- /dev/null
+++ b/types/react-confirm/react-confirm-tests.tsx
@@ -0,0 +1,61 @@
+import * as React from 'react';
+import { confirmable, createConfirmation, ReactConfirmProps } from 'react-confirm';
+
+interface CustomModalProps {
+  title: string;
+}
+
+class CustomModal extends React.Component<CustomModalProps & ReactConfirmProps> {
+    modalStyle(): string {
+        return this.props.show ? "display: none;" : "";
+    }
+
+    render() {
+        return (
+            <div style={this.modalStyle}>
+                <h1>{this.props.title}</h1>
+
+                <div>
+                    {this.props.confirmation}
+                </div>
+
+                <div>
+                    <button onClick={() => this.props.proceed()}>Yes</button>
+                    <button onClick={() => this.props.cancel()}>No</button>
+                </div>
+            </div>
+        );
+    }
+}
+
+// Adds ReactConfirmProps to CustomModal component
+const ConfirmModal = confirmable(CustomModal);
+
+// This is the function you need to call to open your modal, then you can use the
+//   Promise object it returns to handle "proceed()" or "cancel()" functions.
+const confirm = createConfirmation(ConfirmModal);
+
+const markup = (
+  <div>
+    <b>Are you sure you want to delete this item?</b>
+  </div>
+);
+
+// This is how you can detect what option ("Yes" or "No") the user has chosen.
+confirm({ confirmation: markup })
+  .then((result) => {
+    // User chose "Yes"
+  })
+  .catch((result) => {
+    // User chose "No"
+  });
+
+const text = "Are you sure you want to buy this product?";
+
+confirm({ confirmation: text })
+  .then((result) => {
+    // User chose "Yes"
+  })
+  .catch((result) => {
+    // User chose "No"
+  });
diff --git a/types/react-confirm/tsconfig.json b/types/react-confirm/tsconfig.json
new file mode 100644
index 0000000000..da3acdd363
--- /dev/null
+++ b/types/react-confirm/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-confirm-tests.tsx"
+    ]
+}
diff --git a/types/react-confirm/tslint.json b/types/react-confirm/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-confirm/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
new file mode 100644
index 0000000000..a8f320eaa9
--- /dev/null
+++ b/types/react-content-loader/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for react-content-loader 2.0
+// Project: https://github.com/danilowoz/react-content-loader
+// Definitions by: Alaa Masoud <https://github.com/alaatm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export interface ContentLoaderProps {
+    style?: React.CSSProperties;
+    type?: 'facebook' | 'instagram' | 'list' | 'bullet-list' | 'code';
+    speed?: number;
+    width?: number;
+    height?: number;
+    primaryColor?: string;
+    secondaryColor?: string;
+    preserveAspectRatio?: 'none' | 'xMinYMin meet' | 'xMidYMin meet' | 'xMaxYMin meet' | 'xMinYMid meet' | 'xMidYMid meet' | 'xMaxYMid meet' |
+    'xMinYMax meet' | 'xMidYMax meet' | 'xMaxYMax meet' | 'xMinYMin slice' | 'xMidYMin slice' | 'xMaxYMin slice' | 'xMinYMid slice' |
+    'xMidYMid slice' | 'xMaxYMid slice' | 'xMinYMax slice' | 'xMidYMax slice' | 'xMaxYMax slice';
+    className?: string;
+}
+export default class ContentLoader extends React.Component<ContentLoaderProps> { }
diff --git a/types/react-content-loader/react-content-loader-tests.tsx b/types/react-content-loader/react-content-loader-tests.tsx
new file mode 100644
index 0000000000..4eeeecedc1
--- /dev/null
+++ b/types/react-content-loader/react-content-loader-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import ContentLoader from 'react-content-loader';
+
+const CustomComponent = () => {
+    return (
+        <ContentLoader
+            style={{ borderBottom: '1px solid' }}
+            speed={1}
+            height={100}
+            width={100}
+            primaryColor="#333"
+            secondaryColor="#999"
+            preserveAspectRatio="xMinYMin meet"
+            className="my-class"
+        >
+            {/* Pure SVG */}
+            <rect x="0" y="0" rx="5" ry="5" width="70" height="70" />
+            <rect x="80" y="17" rx="4" ry="4" width="300" height="13" />
+            <rect x="80" y="40" rx="3" ry="3" width="250" height="10" />
+        </ContentLoader>
+    );
+};
diff --git a/types/react-content-loader/tsconfig.json b/types/react-content-loader/tsconfig.json
new file mode 100644
index 0000000000..4385503dc9
--- /dev/null
+++ b/types/react-content-loader/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-content-loader-tests.tsx"
+    ],
+    "compilerOptions": {
+        "jsx": "react",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/react-content-loader/tslint.json b/types/react-content-loader/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-content-loader/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-css-modules/index.d.ts b/types/react-css-modules/index.d.ts
index 6363a5797d..5ab7755478 100644
--- a/types/react-css-modules/index.d.ts
+++ b/types/react-css-modules/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-css-modules 4.2.0
+// Type definitions for react-css-modules 4.6.0
 // Project: https://github.com/gajus/react-css-modules
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>, Tadas Dailyda <https://github.com/skirsdeda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,7 +6,7 @@
 
 interface TypeOptions {
     allowMultiple?: boolean;
-    errorWhenNotFound?: boolean;
+    handleNotFoundStyleName?: 'throw' | 'log' | 'ignore';
 }
 
 type StylesObject = any;
diff --git a/types/react-css-modules/tslint.json b/types/react-css-modules/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-css-modules/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-css-transition-replace/tslint.json b/types/react-css-transition-replace/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-css-transition-replace/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-custom-scrollbars/tslint.json b/types/react-custom-scrollbars/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-custom-scrollbars/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-custom-scrollbars/v3/tslint.json b/types/react-custom-scrollbars/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-custom-scrollbars/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index d09784acb6..3e79703242 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -161,6 +161,13 @@ declare namespace AdazzleReactDataGrid {
          * @default false
          */
         enableCellSelect?: boolean
+
+        /**
+         * Enables cells to be dragged and dropped 
+         * @default false
+         */
+        enableDragAndDrop?: boolean
+        
         /**
          * Called when a cell is selected.
          * @param coordinates The row and column indices of the selected cell.
@@ -198,6 +205,13 @@ declare namespace AdazzleReactDataGrid {
          * @param row object behind the row
          */
         onRowClick?: (rowIdx : number, row : object) => void
+
+        /**
+         * An event function called when a row is expanded with the toggle
+         * @param props OnRowExpandToggle object
+         */
+        onRowExpandToggle?: (props: OnRowExpandToggle ) => void
+        
         /**
          * Responsible for returning an Array of values that can be used for filtering
          * a column that is column.filterable and using a column.filterRenderer that 
@@ -419,6 +433,24 @@ declare namespace AdazzleReactDataGrid {
         action: 'cellUpdate' | 'cellDrag' | 'columnFill' | 'copyPaste'
     }
 
+    /**
+     * Information about the row toggler
+     */
+    interface OnRowExpandToggle {
+        /**
+         * The name of the column group the row is in
+         */
+        columnGroupName: string
+        /**
+         * The name of the expanded row
+         */
+        name: string
+        /**
+         * If it should expand or not
+         */
+        shouldExpand: boolean
+    }
+
     /**
      * Some filter to be applied to the grid's contents
      */
@@ -455,6 +487,7 @@ declare namespace AdazzleReactDataGrid {
         export import DragHandleDoubleClickEvent = AdazzleReactDataGrid.DragHandleDoubleClickEvent;
         export import CellCopyPasteEvent = AdazzleReactDataGrid.CellCopyPasteEvent;
         export import GridRowsUpdatedEvent = AdazzleReactDataGrid.GridRowsUpdatedEvent;
+        export import OnRowExpandToggle = AdazzleReactDataGrid.OnRowExpandToggle;
 
         // Actual classes exposed on module.exports
         /**
diff --git a/types/react-data-grid/react-data-grid-tests.tsx b/types/react-data-grid/react-data-grid-tests.tsx
index 6d5ff3b4da..1b42af7ae6 100644
--- a/types/react-data-grid/react-data-grid-tests.tsx
+++ b/types/react-data-grid/react-data-grid-tests.tsx
@@ -249,6 +249,13 @@ class Example extends React.Component<any, any> {
         this.setState({rows: rows});
     }
 
+    onRowExpandToggle = ({ columnGroupName, name, shouldExpand }:ReactDataGrid.OnRowExpandToggle ) => {
+        let expandedRows = Object.assign({}, this.state.expandedRows);
+        expandedRows[columnGroupName] = Object.assign({}, expandedRows[columnGroupName]);
+        expandedRows[columnGroupName][name] = {isExpanded: shouldExpand};
+        this.setState({expandedRows: expandedRows});
+    }
+
     onRowClick(rowIdx:number, row: Object) {
         // Do nothing, just test that it accepts an event
     }
@@ -300,10 +307,12 @@ class Example extends React.Component<any, any> {
             <ReactDataGrid
                 ref='grid'
                 enableCellSelect={true}
+                enableDragAndDrop={true}
                 columns={this.getColumns()}
                 rowGetter={this.getRowAt}
                 rowsCount={this.getSize()}
                 onGridRowsUpdated={this.handleGridRowsUpdated}
+                onRowExpandToggle={this.onRowExpandToggle}
                 toolbar={<Toolbar onAddRow={this.handleAddRow}/>}
                 enableRowSelect={true}
                 rowHeight={50}
diff --git a/types/react-data-grid/tslint.json b/types/react-data-grid/tslint.json
new file mode 100644
index 0000000000..637071b426
--- /dev/null
+++ b/types/react-data-grid/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-object-spread": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-data-grid/v1/tslint.json b/types/react-data-grid/v1/tslint.json
new file mode 100644
index 0000000000..637071b426
--- /dev/null
+++ b/types/react-data-grid/v1/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-object-spread": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-datagrid/tslint.json b/types/react-datagrid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-datagrid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-date-range/index.d.ts b/types/react-date-range/index.d.ts
new file mode 100644
index 0000000000..68df9722bf
--- /dev/null
+++ b/types/react-date-range/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for react-date-range 0.94
+// Project: https://github.com/Adphorus/react-date-range/
+// Definitions by: Junbong Lee <https://github.com/Junbong>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import * as React from 'react';
+import * as moment from "moment-timezone";
+
+export type AnyDate = string | moment.Moment;
+export type DateFunc = (now: moment.Moment) => AnyDate;
+export type DateInputType = AnyDate | DateFunc;
+export type LanguageType = "cn" | "jp" | "fr" | "it" | "de" | "ko" | "es" | "ru" | "tr";
+export type SizeType = number;
+
+export interface DateContainerType {
+	date: moment.Moment;
+}
+
+export interface CalendarTheme {
+	DateRange?: React.CSSProperties;
+	Calendar?: React.CSSProperties;
+	Day?: React.CSSProperties;
+	DayPassive?: React.CSSProperties;
+	DayHover?: React.CSSProperties;
+	DayToday?: React.CSSProperties;
+	DaySunday?: React.CSSProperties;
+	DaySpecialDay?: React.CSSProperties;
+	DayActive?: React.CSSProperties;
+	DaySelected?: React.CSSProperties;
+	DayStartEdge?: React.CSSProperties;
+	DayEndEdge?: React.CSSProperties;
+	DayInRange?: React.CSSProperties;
+	Weekday?: React.CSSProperties;
+	MonthAndYear?: React.CSSProperties;
+	MonthButton?: React.CSSProperties;
+	MonthArrow?: React.CSSProperties;
+	MonthArrowPrev?: React.CSSProperties;
+	MonthArrowNext?: React.CSSProperties;
+	PredefinedRanges?: React.CSSProperties;
+	PredefinedRangesItem?: React.CSSProperties;
+	PredefinedRangesItemActive?: React.CSSProperties;
+}
+
+export interface Range {
+	/** default: today */
+	startDate?: moment.Moment;
+	/** default: today */
+	endDate?: moment.Moment;
+}
+
+export interface CommonCalendarProps {
+	/** default: DD/MM/YYY */
+	format?: string;
+	/** default: moment.localeData().firstDayOfWeek() */
+	firstDayOfWeek?: number;
+	theme?: CalendarTheme;
+	/** default: none */
+	onInit?: (range: Range) => void;
+	/** default: none */
+	onChange?: (range: Range) => void;
+	/** default: none */
+	minDate?: DateInputType;
+	/** default: none */
+	maxDate?: DateInputType;
+	/**
+	 * Calendar languages.
+	 * ('cn' - Chinese, 'jp' - Japanese,
+	 * 'fr' - French, 'it' - Italian,
+	 * 'de' - German, 'ko' - Korean,
+	 * 'es' - Spanish, 'ru' - Russian,
+	 * 'tr' - Turkish) default: none
+	 */
+	lang?: LanguageType;
+}
+
+export interface CalendarProps extends CommonCalendarProps {
+	/** default: today */
+	date: DateInputType;
+}
+
+export class Calendar extends React.Component<CalendarProps> { }
+
+export interface DateRangeProps extends Range, CommonCalendarProps {
+	/** default: false */
+	linkedCalendars?: boolean;
+	/** default: 2 */
+	calendars?: number;
+	/** default: none */
+	ranges?: object;
+	/** default: false */
+	twoStepChange?: boolean;
+	/** default: false */
+	rangedCalendars?: boolean;
+	/** default: none */
+	specialDays?: DateContainerType[];
+}
+
+export class DateRange extends React.Component<DateRangeProps> { }
+
+export type DateRangeIndex = "Today" | "Yesterday" | "Last 7 Days" | "Last 30 Days";
+
+export interface DateRangeObject {
+	startDate: (now: moment.Moment) => moment.Moment;
+	endDate: (now: moment.Moment) => moment.Moment;
+}
+export const defaultRanges: {
+	[measure: string]: DateRangeObject;
+};
diff --git a/types/react-date-range/react-date-range-tests.tsx b/types/react-date-range/react-date-range-tests.tsx
new file mode 100644
index 0000000000..d12e99b4ab
--- /dev/null
+++ b/types/react-date-range/react-date-range-tests.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+import { defaultRanges, DateRange, Range } from "react-date-range";
+
+class ReactDatePicker extends React.Component<any, any> {
+    constructor(props: {}) {
+        super(props);
+    }
+
+    handleChange(range: Range) {
+        console.log(range);
+    }
+
+    render() {
+        return (
+            <div>
+                <DateRange
+                    linkedCalendars={true}
+                    ranges={defaultRanges}
+                    onInit={this.handleChange}
+                    onChange={this.handleChange}
+                    theme={{
+                        Calendar: { width: 200 },
+                        PredefinedRanges: { marginLeft: 10, marginTop: 10 }
+                    }}
+                />
+            </div>
+        );
+    }
+}
diff --git a/types/react-date-range/tsconfig.json b/types/react-date-range/tsconfig.json
new file mode 100644
index 0000000000..91979c462d
--- /dev/null
+++ b/types/react-date-range/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-date-range-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-date-range/tslint.json b/types/react-date-range/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-date-range/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index 2a7ed3ceb6..cb68e8f0b2 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for react-datepicker 0.55
+// Type definitions for react-datepicker 1.0
 // Project: https://github.com/Hacker0x01/react-datepicker
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>,
 //                 Andrey Balokha <https://github.com/andrewBalekha>,
 //                 Greg Smith <https://github.com/smrq>,
 //                 Platon Pronko <https://github.com/Rogach>
 //                 Roy Xue <https://github.com/royxue>
+// 				   Koala Human <https://github.com/KoalaHuman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -12,6 +13,7 @@ import * as React from "react";
 import * as moment from "moment";
 
 export interface ReactDatePickerProps {
+	adjustDateOnChange?: boolean;
 	allowSameDay?: boolean;
 	autoComplete?: string;
 	autoFocus?: boolean;
@@ -19,12 +21,13 @@ export interface ReactDatePickerProps {
 	children?: any;
 	className?: string;
 	customInput?: React.ReactNode;
+	customInputRef?: string;
 	dateFormat?: string | string[];
 	dateFormatCalendar?: string;
 	dayClassName?(date: moment.Moment): string | null;
 	disabled?: boolean;
 	disabledKeyboardNavigation?: boolean;
-	dropdownMode?: string;
+	dropdownMode?: 'scroll' | 'select';
 	endDate?: moment.Moment;
 	excludeDates?: any[];
 	filterDate?(date: moment.Moment): boolean;
@@ -50,12 +53,14 @@ export interface ReactDatePickerProps {
 	onMonthChange?(date: moment.Moment): void;
 	onSelect?(date: moment.Moment, event: React.SyntheticEvent<any> | undefined): void;
 	onWeekSelect?(firstDayOfWeek: moment.Moment, weekNumber: string | number, event: React.SyntheticEvent<any> | undefined): void;
+	onYearChange?(date: moment.Moment): void;
 	openToDate?: moment.Moment;
 	peekNextMonth?: boolean;
 	placeholderText?: string;
 	popperClassName?: string;
 	popperModifiers?: any;
 	popperPlacement?: string;
+	preventOpenOnFocus?: boolean;
 	readOnly?: boolean;
 	required?: boolean;
 	scrollableYearDropdown?: boolean;
@@ -70,6 +75,7 @@ export interface ReactDatePickerProps {
 	title?: string;
 	todayButton?: string;
 	useWeekdaysShort?: boolean;
+	useShortMonthInDropdown?: boolean;
 	utcOffset?: number;
 	value?: string;
 	weekLabel?: string;
diff --git a/types/react-datepicker/package.json b/types/react-datepicker/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/react-datepicker/package.json
+++ b/types/react-datepicker/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-datepicker/react-datepicker-tests.tsx b/types/react-datepicker/react-datepicker-tests.tsx
index 5a29b38149..4d5edad58e 100644
--- a/types/react-datepicker/react-datepicker-tests.tsx
+++ b/types/react-datepicker/react-datepicker-tests.tsx
@@ -4,7 +4,7 @@ import DatePicker from 'react-datepicker';
 
 class ReactDatePicker extends React.Component<{}, { startDate: moment.Moment; displayName: string; }> {
 	constructor(props: {}) {
-		super();
+		super(props);
 		this.state = {
 			startDate: moment(),
 			displayName: 'Example'
@@ -18,11 +18,19 @@ class ReactDatePicker extends React.Component<{}, { startDate: moment.Moment; di
 		});
 	};
 
+	handleYearChange = (date: moment.Moment) => {
+		this.setState({
+			startDate: date
+		});
+	}
+
 	render() {
 		return (
 			<DatePicker
 				selected={this.state.startDate}
-				onChange={this.handleChange} />
+				onChange={this.handleChange}
+				onYearChange={this.handleYearChange}
+			/>
 		);
 	}
 }
diff --git a/types/react-daterange-picker/package.json b/types/react-daterange-picker/package.json
index 23ba3dc104..ac2bb42bad 100644
--- a/types/react-daterange-picker/package.json
+++ b/types/react-daterange-picker/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": "^2.18.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index c3559f5278..ef501229ff 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-dates v12.1.1
+// Type definitions for react-dates v16.0.0
 // Project: https://github.com/airbnb/react-dates
 // Definitions by: Artur Ampilogov <https://github.com/Artur-A>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -49,14 +49,18 @@ declare namespace ReactDates {
         customInputIcon?: string | JSX.Element,
         customArrowIcon?: string | JSX.Element,
         customCloseIcon?: string | JSX.Element,
+        noBorder?: boolean,
+        block?: boolean,
 
         // calendar presentation and interaction related props
+        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         orientation?: OrientationShape,
         anchorDirection?: AnchorDirectionShape,
         horizontalMargin?: number,
         withPortal?: boolean,
         withFullScreenPortal?: boolean,
         initialVisibleMonth?: () => momentPropTypes.momentObj,
+        firstDayOfWeek? : 0 | 1 | 2 | 3 | 4 | 5 | 6,
         numberOfMonths?: number,
         keepOpenOnDateSelect?: boolean,
         reopenPickerOnClearDates?: boolean,
@@ -70,9 +74,11 @@ declare namespace ReactDates {
         onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
+        transitionDuration?: number,
 
         // day presentation and interaction related props
-        renderDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         minimumNights?: number,
         enableOutsideDays?: boolean,
         isDayBlocked?: (day: any) => boolean,
@@ -83,6 +89,7 @@ declare namespace ReactDates {
         // internationalization props
         displayFormat?: (string | (() => string)),
         monthFormat?: string,
+        weekDayFormat?: string,
         phrases?: {
             closeDatePicker: string,
             clearDates: string,
@@ -136,19 +143,24 @@ declare namespace ReactDates {
         customCloseIcon?: string | JSX.Element,
         showDefaultInputIcon?: boolean,
         customInputIcon?: string | JSX.Element,
+        noBorder?: boolean,
+        block?: boolean,
 
         // calendar presentation and interaction related props
+        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         orientation?: OrientationShape,
         anchorDirection?: AnchorDirectionShape,
         horizontalMargin?: number,
         withPortal?: boolean,
         withFullScreenPortal?: boolean,
         initialVisibleMonth?: () => momentPropTypes.momentObj,
+        firstDayOfWeek? : 0 | 1 | 2 | 3 | 4 | 5 | 6,
         numberOfMonths?: number,
         keepOpenOnDateSelect?: boolean,
         reopenPickerOnClearDates?: boolean,
         renderCalendarInfo?: () => (string | JSX.Element),
         hideKeyboardShortcutsPanel?: boolean,
+        daySize?: number,
         isRTL?: boolean,
 
         // navigation related props
@@ -157,9 +169,11 @@ declare namespace ReactDates {
         onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
+        transitionDuration?: number,
 
         // day presentation and interaction related props
-        renderDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         enableOutsideDays?: boolean,
         isDayBlocked?: (day: any) => boolean,
         isOutsideRange?: (day: any) => boolean,
@@ -222,6 +236,8 @@ declare namespace ReactDates {
         renderCalendarInfo?: () => (string | JSX.Element),
         onOutsideClick?: (e: any) => void,
         keepOpenOnDateSelect?: boolean,
+        noBorder?: boolean,
+        firstDayOfWeek? : 0 | 1 | 2 | 3 | 4 | 5 | 6,
 
         // navigation related props
         navPrev?: string | JSX.Element,
@@ -229,9 +245,11 @@ declare namespace ReactDates {
         hideKeyboardShortcutsPanel?: boolean;
         onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
+        transitionDuration?: number,
 
         // day presentation and interaction related props
-        renderDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         minimumNights?: number,
         isOutsideRange?: (day: any) => boolean,
         isDayBlocked?: (day: any) => boolean,
diff --git a/types/react-dates/package.json b/types/react-dates/package.json
index 5dce3a7ebd..2e95eb1989 100644
--- a/types/react-dates/package.json
+++ b/types/react-dates/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.17.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-dates/react-dates-tests.tsx b/types/react-dates/react-dates-tests.tsx
index e8dd3752b3..f9d3118a4f 100644
--- a/types/react-dates/react-dates-tests.tsx
+++ b/types/react-dates/react-dates-tests.tsx
@@ -42,6 +42,8 @@ class SingleDatePickerFullTest extends React.Component {
                     placeholder="test"
                     required={false}
                     showClearDate={true}
+                    noBorder={true}
+                    block={false}
                     isDayBlocked={(day:any)=> false}
                     isOutsideRange={(day:any)=> false}
                     keepOpenOnDateSelect={true}
@@ -57,10 +59,11 @@ class SingleDatePickerFullTest extends React.Component {
                     onFocusChange={arg => {}}
                     onNextMonthClick={e => {}}
                     onPrevMonthClick={e => {}}
+                    firstDayOfWeek={0}
                     numberOfMonths={2}
                     orientation="horizontal"
                     monthFormat="MM"
-                    renderDay={day => day.toString()}
+                    renderDayContents={day => day.toString()}
                     />
     }
 }
@@ -89,6 +92,8 @@ class DateRangePickerFullTest extends React.Component {
                     showDefaultInputIcon={true}
                     required={false}
                     showClearDates={true}
+                    noBorder={true}
+                    block={false}
                     startDate={moment().add(3, 'days')}
                     endDate={moment().add(5, 'days')}
                     anchorDirection="left"
@@ -109,10 +114,11 @@ class DateRangePickerFullTest extends React.Component {
                     onFocusChange={arg => {}}
                     onNextMonthClick={e => {}}
                     onPrevMonthClick={e => {}}
+                    firstDayOfWeek={0}
                     numberOfMonths={2}
                     orientation="horizontal"
                     monthFormat="MM"
-                    renderDay={day => day.toString()}
+                    renderDayContents={day => day.toString()}
                     />
     }
 }
diff --git a/types/react-dates/tslint.json b/types/react-dates/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-dates/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-daum-postcode/index.d.ts b/types/react-daum-postcode/index.d.ts
index cd2713a459..058777bc29 100644
--- a/types/react-daum-postcode/index.d.ts
+++ b/types/react-daum-postcode/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kimminsik-bernard/react-daum-postcode
 // Definitions by: Sa-ryong Kang <https://github.com/Sa-ryong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Component } from 'react';
 
diff --git a/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts b/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
index 47fa6ab5d4..71a0d06039 100644
--- a/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
+++ b/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
@@ -2,9 +2,10 @@
 // http://gaearon.github.io/react-dnd/docs-tutorial.html
 
 import * as React from "react";
+import * as DOM from "react-dom-factories";
 import * as ReactDnd from "react-dnd";
 
-const r = React.DOM;
+const r = DOM;
 
 import DragSource = ReactDnd.DragSource;
 import DropTarget = ReactDnd.DropTarget;
@@ -153,7 +154,7 @@ namespace BoardSquare {
     export class BoardSquare extends React.Component<BoardSquareP> {
         static defaultProps: BoardSquareP;
 
-        private _renderOverlay = (color: string) => {
+        private readonly _renderOverlay = (color: string) => {
             return r.div({
                 style: {
                     position: 'absolute',
@@ -230,7 +231,7 @@ namespace Board {
     }
 
     export class Board extends React.Component<BoardP> {
-        private _renderPiece = (x: number, y: number) => {
+        private readonly _renderPiece = (x: number, y: number) => {
             const knightX = this.props.knightPosition[0];
             const knightY = this.props.knightPosition[1];
             return x === knightX && y === knightY ?
@@ -238,7 +239,7 @@ namespace Board {
                     null;
         }
 
-        private _renderSquare = (i: number) => {
+        private readonly _renderSquare = (i: number) => {
             const x = i % 8;
             const y = Math.floor(i / 8);
 
diff --git a/types/react-dnd-multi-backend/index.d.ts b/types/react-dnd-multi-backend/index.d.ts
new file mode 100644
index 0000000000..25029631cb
--- /dev/null
+++ b/types/react-dnd-multi-backend/index.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for react-dnd-multi-backend 3.0
+// Project: https://github.com/LouisBrunner/react-dnd-multi-backend
+// Definitions by: Janeene Beeforth <https://github.com/dawnmist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { CSSProperties, PureComponent } from "react";
+import { Backend } from "react-dnd";
+
+/**
+ * Callback function type definition for checking whether an event represents a transition between
+ * dragging and dropping.
+ * @param event Touch/Mouse/Keyboard/etc UI Event.
+ * @returns True if the event triggers the start of a transition.
+ */
+export type CheckFunction<E extends UIEvent> = (event: E) => boolean;
+
+/**
+ * Drag and drop Transition interface.
+ */
+export interface Transition {
+    /**
+     * ???
+     */
+    _isMBTransition: boolean;
+    /**
+     * Event type that this transition should check against. This will be an HTML event, such as
+     * "dragstart", "touchstart", etc.
+     */
+    event: string;
+    /**
+     * Check function to use for this transition.
+     */
+    check: CheckFunction<any>;
+}
+
+/**
+ * Function to create a custom/new Transition.
+ * @param eventType EventType string to identify the type of event being tested. This will be an
+ *                  HTML event, such as "dragstart", "touchstart", etc.
+ * @param check The CheckFunction to use to verify if an event matches the event type.
+ * @returns A Transition to indicate when a particular Backend should be used.
+ */
+export function createTransition(eventType: string, check: CheckFunction<any>): Transition;
+
+/**
+ * Declaration for a Drag and Drop backend to be used.
+ */
+export interface BackendDeclaration {
+    /**
+     * Backend - e.g. the one provided by react-dnd-html5-backend.
+     */
+    backend: Backend;
+    /**
+     * Flag to indicate that this backend needs to have a custom preview generated. This is mainly
+     * used for backends such as the react-dnd-touch-backend, where there is no default preview
+     * available.
+     */
+    preview?: boolean;
+    /**
+     * The transition that this backend should be used for.
+     */
+    transition?: Transition;
+}
+
+/**
+ * The declaration for the list of backends to be used.
+ */
+export interface Backends {
+    /**
+     * The array of backends to use. The first backend in the list is used as the default backend.
+     * This means that you can start with the html5 backend, and fall-back to a touch backend if
+     * the event is not one that is compatible with the html5 backend.
+     */
+    backends: BackendDeclaration[];
+}
+
+/**
+ * Properties for the Preview class
+ */
+export interface PreviewProps {
+    /**
+     * Callback function to generate a preview object when dragging. This preview will only be used
+     * with backends that have the 'preview' flag set to true.
+     * @param type: the type of the item (monitor.getItemType())
+     * @param item: the item being dragged (monitor.getItem())
+     * @param style: an object representing the style to use for the item, it should be passed to
+     *               your component's style property and is used for positioning.
+     * @returns The JSX element to display for the drag preview.
+     */
+    generator(type: string, item: any, style: CSSProperties): JSX.Element;
+}
+
+/**
+ * Class to use when generating a custom preview for a dragged item.
+ * This is frequently used with the Touch backend to provide a preview on mobile devices.
+ */
+export class Preview extends PureComponent<PreviewProps> {}
+
+/**
+ * Pre-existing/default react-dnd-touch-backend transition available to use.
+ * This transition has the setting for "enableMouseEvents" turned on.
+ */
+export const TouchTransition: Transition;
+/**
+ * Pre-existing/default react-dnd-html5-backend transition available to use.
+ */
+export const HTML5DragTransition: Transition;
+
+/**
+ * Primary construction function for react-dnd-multi-backend.
+ * @param backends The list of backends in descending order of preference to use for drag and drop.
+ * @returns A backend definition compatible with react-dnd.
+ */
+export default function(backends: Backends): Backend;
diff --git a/types/react-dnd-multi-backend/lib/HTML5toTouch.d.ts b/types/react-dnd-multi-backend/lib/HTML5toTouch.d.ts
new file mode 100644
index 0000000000..40c4ad627d
--- /dev/null
+++ b/types/react-dnd-multi-backend/lib/HTML5toTouch.d.ts
@@ -0,0 +1,11 @@
+import { Backends } from '../';
+
+/**
+ * Most commonly used set of Backends.
+ * The default backend is the react-dnd-html5-backend.
+ * The second backend is the react-dnd-touch-backend with enableMouseEvents = true,
+ * preview = true, and the transition triggering on the "touchstart" event.
+ */
+declare const HTML5ToTouch: Backends;
+
+export default HTML5ToTouch;
diff --git a/types/react-dnd-multi-backend/react-dnd-multi-backend-tests.tsx b/types/react-dnd-multi-backend/react-dnd-multi-backend-tests.tsx
new file mode 100644
index 0000000000..cbe6136585
--- /dev/null
+++ b/types/react-dnd-multi-backend/react-dnd-multi-backend-tests.tsx
@@ -0,0 +1,60 @@
+// Examples based on documentation at https://github.com/LouisBrunner/react-dnd-multi-backend
+
+import * as React from 'react';
+import * as ReactDnd from 'react-dnd';
+import MultiBackend, { Backends, createTransition, Preview, TouchTransition, HTML5DragTransition } from 'react-dnd-multi-backend';
+import HTML5toTouch from 'react-dnd-multi-backend/lib/HTML5toTouch';
+import HTML5Backend from 'react-dnd-html5-backend';
+import TouchBackend from 'react-dnd-touch-backend';
+
+const component = () => null;
+
+/**
+ * Most common use case - using the default HTML5 with Touch as a fallback.
+ */
+const multiDndComponent = ReactDnd.DragDropContext(MultiBackend(HTML5toTouch))(component);
+
+/**
+ * Creating a custom list of backends, including creating a touch transition.
+ */
+const CustomBackends: Backends = {
+    backends: [{
+        backend: HTML5Backend
+    },
+    {
+        backend: TouchBackend({ enableMouseEvents: false }),
+        preview: true,
+        transition: createTransition('touchstart', (event: TouchEvent) => {
+            return event.touches != null;
+        })
+    },
+    {
+        backend: HTML5Backend,
+        transition: HTML5DragTransition,
+        preview: true
+    },
+    {
+        backend: TouchBackend({}),
+        transition: TouchTransition
+    }]
+};
+const multiCustomBackendsComponent = ReactDnd.DragDropContext(MultiBackend(CustomBackends))(component);
+
+/**
+ * Testing the Preview component.
+ */
+class App extends React.Component {
+    generator = (type: string, item: any, style: React.CSSProperties) =>
+        (type === 'card')
+            ? <div style={style}>{item.label}</div>
+            : <div />
+
+    render() {
+        return (
+            <div>
+                <Preview generator={this.generator} />
+                <div>A page of text</div>
+            </div>
+        );
+    }
+}
diff --git a/types/react-dnd-multi-backend/tsconfig.json b/types/react-dnd-multi-backend/tsconfig.json
new file mode 100644
index 0000000000..e9857447ef
--- /dev/null
+++ b/types/react-dnd-multi-backend/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "lib/HTML5toTouch.d.ts",
+        "react-dnd-multi-backend-tests.tsx"
+    ]
+}
diff --git a/types/react-dnd-multi-backend/tslint.json b/types/react-dnd-multi-backend/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-dnd-multi-backend/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-dnd-test-backend/index.d.ts b/types/react-dnd-test-backend/index.d.ts
new file mode 100644
index 0000000000..07f13607dd
--- /dev/null
+++ b/types/react-dnd-test-backend/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for react-dnd-test-backend 2.5
+// Project: https://github.com/react-dnd/react-dnd#readme
+// Definitions by: Gustavo Henke <https://github.com/gustavohenke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as ReactDnd from "react-dnd";
+
+export default class TestBackend implements ReactDnd.Backend {
+    simulateBeginDrag(sourceIds: ReactDnd.Identifier[], options?: {}): void;
+    simulatePublishDragSource(): void;
+    simulateHover(targetIds: ReactDnd.Identifier[], options?: {}): void;
+    simulateDrop(): void;
+    simulateEndDrag(): void;
+}
diff --git a/types/react-dnd-test-backend/react-dnd-test-backend-tests.tsx b/types/react-dnd-test-backend/react-dnd-test-backend-tests.tsx
new file mode 100644
index 0000000000..aed3117e06
--- /dev/null
+++ b/types/react-dnd-test-backend/react-dnd-test-backend-tests.tsx
@@ -0,0 +1,17 @@
+import * as React from "react";
+import { ContextComponent, ContextComponentClass, DragDropContext } from "react-dnd";
+import TestBackend from "react-dnd-test-backend";
+
+const Component = DragDropContext(TestBackend)(() => <div/>);
+<Component ref={(instance: ContextComponent<{}, {}>) => {
+    const backend = instance.getManager().getBackend() as TestBackend;
+    backend.simulateBeginDrag(["1"]);
+    backend.simulateBeginDrag(["1"], { foo: "bar" });
+
+    backend.simulateHover(["2"]);
+    backend.simulateHover(["2"], { foo: "bar" });
+
+    backend.simulateDrop();
+    backend.simulateEndDrag();
+    backend.simulatePublishDragSource();
+}}/>;
diff --git a/types/react-dnd-test-backend/tsconfig.json b/types/react-dnd-test-backend/tsconfig.json
new file mode 100644
index 0000000000..aaf674e57e
--- /dev/null
+++ b/types/react-dnd-test-backend/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-dnd-test-backend-tests.tsx"
+    ]
+}
diff --git a/types/react-dnd-test-backend/tslint.json b/types/react-dnd-test-backend/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-dnd-test-backend/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-dnd-touch-backend/index.d.ts b/types/react-dnd-touch-backend/index.d.ts
new file mode 100644
index 0000000000..6cf6037048
--- /dev/null
+++ b/types/react-dnd-touch-backend/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for react-dnd-touch-backend 0.3
+// Project: https://github.com/yahoo/react-dnd-touch-backend#readme
+// Definitions by: Daniel Król <https://github.com/mleko>, Janeene Beeforth <https://github.com/dawnmist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as ReactDnd from "react-dnd";
+
+export default function createTouchBackend(options: TouchBackendOptions): ReactDnd.Backend;
+
+export interface TouchBackendOptions {
+    /**
+     * Support mouse events as well as touch events.
+     */
+    enableMouseEvents?: boolean;
+    /**
+     * Can cancel drag by hitting Escape if enableKeyboardEvents option is set to true
+     */
+    enableKeyboardEvents?: boolean;
+    /**
+     * Number of milliseconds that the item needs to be touched before the touch is considered the start of a drag.
+     * This is used to allow both flick-to-scroll and drag-n-drop on objects in a list.
+     */
+    delayTouchStart?: number;
+    /**
+     * Number of milliseconds that the item needs to be clicked on before the click is considered the start of a drag.
+     */
+    delayMouseStart?: number;
+    /**
+     * Number of milliseconds delay before the touch/click is considered a drag.
+     * @deprecated replaced by delayTouchStart and delayMouseStart, but is still supported at present.
+     */
+    delay?: number;
+}
diff --git a/types/react-dnd-touch-backend/react-dnd-touch-backend-tests.ts b/types/react-dnd-touch-backend/react-dnd-touch-backend-tests.ts
new file mode 100644
index 0000000000..3e77b52d78
--- /dev/null
+++ b/types/react-dnd-touch-backend/react-dnd-touch-backend-tests.ts
@@ -0,0 +1,13 @@
+import * as ReactDnd from "react-dnd";
+import TouchBackend from "react-dnd-touch-backend";
+
+const component = () => null;
+
+const dndComponent = ReactDnd.DragDropContext(TouchBackend)(component);
+const dndComponentMouseEvents = ReactDnd.DragDropContext(TouchBackend({enableMouseEvents: true}))(component);
+const dndComponentDelayTouchStart = ReactDnd.DragDropContext(TouchBackend({delayTouchStart: 200}))(component);
+const dndComponentDelayMouseStart = ReactDnd.DragDropContext(TouchBackend({enableMouseEvents: true, delayMouseStart: 100}));
+const dndComponentKeyboardEvents = ReactDnd.DragDropContext(TouchBackend({enableKeyboardEvents: true}));
+const dndComponentOldDelay = ReactDnd.DragDropContext(TouchBackend({delay: 300}));
+const dndComponentAllCurrentEvents = ReactDnd.DragDropContext(TouchBackend(
+    {enableKeyboardEvents: true, enableMouseEvents: true, delayMouseStart: 100, delayTouchStart: 200}));
diff --git a/types/react-dnd-touch-backend/tsconfig.json b/types/react-dnd-touch-backend/tsconfig.json
new file mode 100644
index 0000000000..926592e1c3
--- /dev/null
+++ b/types/react-dnd-touch-backend/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-dnd-touch-backend-tests.ts"
+    ]
+}
diff --git a/types/react-dnd-touch-backend/tslint.json b/types/react-dnd-touch-backend/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-dnd-touch-backend/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-dnd/react-dnd-tests.tsx b/types/react-dnd/react-dnd-tests.tsx
index 929d64b1f5..3016a3f523 100644
--- a/types/react-dnd/react-dnd-tests.tsx
+++ b/types/react-dnd/react-dnd-tests.tsx
@@ -2,9 +2,10 @@
 // http://gaearon.github.io/react-dnd/docs-tutorial.html
 
 import * as React from "react";
+import * as DOM from "react-dom-factories";
 import * as ReactDnd from "react-dnd";
 
-var r = React.DOM;
+var r = DOM;
 
 import DragSource = ReactDnd.DragSource;
 import DropTarget = ReactDnd.DropTarget;
@@ -166,7 +167,7 @@ namespace BoardSquare {
     export class BoardSquare extends React.Component<BoardSquareP> {
         static defaultProps: BoardSquareP;
 
-        private _renderOverlay = (color: string) => {
+        private readonly _renderOverlay = (color: string) => {
             return r.div({
                 style: {
                     position: 'absolute',
@@ -246,7 +247,7 @@ namespace Board {
     }
 
     export class Board extends React.Component<BoardP> {
-        private _renderPiece = (x: number, y: number) => {
+        private readonly _renderPiece = (x: number, y: number) => {
             var knightX = this.props.knightPosition[0];
             var knightY = this.props.knightPosition[1];
             return x === knightX && y === knightY ?
@@ -254,7 +255,7 @@ namespace Board {
                     null;
         };
 
-        private _renderSquare = (i: number) => {
+        private readonly _renderSquare = (i: number) => {
             var x = i % 8;
             var y = Math.floor(i / 8);
 
diff --git a/types/react-dnd/tslint.json b/types/react-dnd/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-dnd/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-document-title/index.d.ts b/types/react-document-title/index.d.ts
index 63acedfdeb..fa22fe30dc 100644
--- a/types/react-document-title/index.d.ts
+++ b/types/react-document-title/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/gaearon/react-document-title
 // Definitions by: Cleve Littlefield <https://github.com/cleverguy25>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
diff --git a/types/react-dom-factories/index.d.ts b/types/react-dom-factories/index.d.ts
new file mode 100644
index 0000000000..a0c63f0562
--- /dev/null
+++ b/types/react-dom-factories/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for react-dom-factories 1.0
+// Project: https://facebook.github.io/react/
+// Definitions by: John Gozde <https://github.com/jgoz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export as namespace ReactDOMFactories;
+export = ReactDOMFactories;
+
+import { ReactDOM } from "react";
+
+declare const ReactDOMFactories: ReactDOM;
diff --git a/types/react-dom-factories/react-dom-factories-tests.ts b/types/react-dom-factories/react-dom-factories-tests.ts
new file mode 100644
index 0000000000..de3b03819c
--- /dev/null
+++ b/types/react-dom-factories/react-dom-factories-tests.ts
@@ -0,0 +1,8 @@
+import * as DOM from "react-dom-factories";
+
+// tiny sampling of factories
+DOM.a({}, "a");
+DOM.div({},
+    DOM.span({}, DOM.b()),
+    DOM.ul({}, DOM.li({}, "test"))
+);
diff --git a/types/react-dom-factories/tsconfig.json b/types/react-dom-factories/tsconfig.json
new file mode 100644
index 0000000000..8cdf540399
--- /dev/null
+++ b/types/react-dom-factories/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-dom-factories-tests.ts"
+    ]
+}
diff --git a/types/react-dom-factories/tslint.json b/types/react-dom-factories/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-dom-factories/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index aeac0c8081..20b870a8b8 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -4,6 +4,7 @@
 //                 AssureSign <http://www.assuresign.com>
 //                 Microsoft <https://microsoft.com>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
+//                 Josh Rutherford <https://github.com/theruther4d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -12,12 +13,14 @@ export as namespace ReactDOM;
 import {
     ReactInstance, Component, ComponentState,
     ReactElement, SFCElement, CElement,
-    DOMAttributes, DOMElement
+    DOMAttributes, DOMElement, ReactNode, ReactPortal
 } from 'react';
 
 export function findDOMNode(instance: ReactInstance): Element;
 export function unmountComponentAtNode(container: Element): boolean;
 
+export function createPortal(children: ReactNode, container: Element): ReactPortal;
+
 export const version: string;
 export const render: Renderer;
 export const hydrate: Renderer;
diff --git a/types/react-dom/react-dom-tests.ts b/types/react-dom/react-dom-tests.ts
deleted file mode 100644
index 08eac7afdb..0000000000
--- a/types/react-dom/react-dom-tests.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import * as ReactDOMServer from 'react-dom/server';
-import * as ReactDOMNodeStream from 'react-dom/node-stream';
-import * as ReactTestUtils from 'react-dom/test-utils';
-
-declare function describe(desc: string, f: () => void): void;
-declare function it(desc: string, f: () => void): void;
-
-class TestComponent extends React.Component { }
-
-describe('ReactDOM', () => {
-    it('render', () => {
-        const rootElement = document.createElement('div');
-        ReactDOM.render(React.createElement('div'), rootElement);
-    });
-
-    it('hydrate', () => {
-        const rootElement = document.createElement('div');
-        ReactDOM.hydrate(React.createElement('div'), rootElement);
-    });
-
-    it('unmounts', () => {
-        const rootElement = document.createElement('div');
-        ReactDOM.render(React.createElement('div'), rootElement);
-        ReactDOM.unmountComponentAtNode(rootElement);
-    });
-
-    it('find dom node', () => {
-        const rootElement = document.createElement('div');
-        ReactDOM.render(React.createElement('div'), rootElement);
-        ReactDOM.findDOMNode(rootElement);
-    });
-});
-
-describe('ReactDOMServer', () => {
-    it('renderToString', () => {
-        const content: string = ReactDOMServer.renderToString(React.createElement('div'));
-    });
-
-    it('renderToStaticMarkup', () => {
-        const content: string = ReactDOMServer.renderToStaticMarkup(React.createElement('div'));
-    });
-});
-
-describe('ReactDOMNodeStream', () => {
-    it('renderToStream', () => {
-        const content: any = ReactDOMNodeStream.renderToStream(React.createElement('div'));
-    });
-
-    it('renderToStaticStream', () => {
-        const content: any = ReactDOMNodeStream.renderToStaticStream(React.createElement('div'));
-    });
-});
-
-describe('React dom test utils', () => {
-    it('Simulate', () => {
-        const element = document.createElement('div');
-        const dom = ReactDOM.render(
-            React.createElement('input', { type: 'text' }),
-            element
-        ) as Element;
-        const node = ReactDOM.findDOMNode(dom) as HTMLInputElement;
-
-        node.value = 'giraffe';
-        ReactTestUtils.Simulate.change(node);
-        ReactTestUtils.Simulate.keyDown(node, { key: "Enter", keyCode: 13, which: 13 });
-    });
-
-    it('renderIntoDocument', () => {
-        const element = React.createElement('input', { type: 'text' });
-        ReactTestUtils.renderIntoDocument(element);
-    });
-
-    it('mockComponent', () => {
-        ReactTestUtils.mockComponent(TestComponent, 'div');
-    });
-
-    it('isElement', () => {
-        const element = React.createElement(TestComponent);
-        const isReactElement: boolean = ReactTestUtils.isElement(element);
-    });
-
-    it('isElementOfType', () => {
-        const element = React.createElement(TestComponent);
-        const isReactElement: boolean = ReactTestUtils.isElementOfType(element, TestComponent);
-    });
-
-    it('isDOMComponent', () => {
-        const element = React.createElement('div');
-        const instance = ReactTestUtils.renderIntoDocument(element) as HTMLDivElement;
-        const isDOMElement: boolean = ReactTestUtils.isDOMComponent(instance);
-    });
-
-    it('isCompositeComponent', () => {
-        const element = React.createElement(TestComponent);
-        const instance: TestComponent = ReactTestUtils.renderIntoDocument(element);
-        const isCompositeComponent: boolean = ReactTestUtils.isCompositeComponent(instance);
-    });
-
-    it('isCompositeComponentWithType', () => {
-        const element = React.createElement(TestComponent);
-        const instance: TestComponent = ReactTestUtils.renderIntoDocument(element);
-        const isCompositeComponent: boolean = ReactTestUtils.isCompositeComponentWithType(instance, TestComponent);
-    });
-
-    it('findAllInRenderedTree', () => {
-        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
-        ReactTestUtils.findAllInRenderedTree(component, (i: React.ReactInstance) => true);
-    });
-
-    it('scryRenderedDOMComponentsWithClass', () => {
-        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
-        ReactTestUtils.scryRenderedDOMComponentsWithClass(component, 'class');
-    });
-
-    it('findRenderedDOMComponentWithClass', () => {
-        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
-        ReactTestUtils.findRenderedDOMComponentWithClass(component, 'class');
-    });
-
-    it('scryRenderedDOMComponentsWithTag', () => {
-        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
-        ReactTestUtils.scryRenderedDOMComponentsWithTag(component, 'div');
-    });
-
-    it('findRenderedDOMComponentWithTag', () => {
-        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
-        ReactTestUtils.findRenderedDOMComponentWithTag(component, 'tag');
-    });
-
-    it('scryRenderedComponentsWithType', () => {
-        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
-        ReactTestUtils.scryRenderedComponentsWithType(component, TestComponent);
-    });
-
-    it('findRenderedComponentWithType', () => {
-        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
-        ReactTestUtils.findRenderedComponentWithType(component, TestComponent);
-    });
-
-    describe('Shallow Rendering', () => {
-        it('createRenderer', () => {
-            const component = React.createElement(TestComponent);
-            const shallowRenderer = ReactTestUtils.createRenderer();
-        });
-
-        it('shallowRenderer.render', () => {
-            const component = React.createElement(TestComponent);
-            const shallowRenderer = ReactTestUtils.createRenderer();
-            shallowRenderer.render(component);
-        });
-
-        it('shallowRenderer.getRenderOutput', () => {
-            const component = React.createElement(TestComponent);
-            const shallowRenderer = ReactTestUtils.createRenderer();
-            shallowRenderer.getRenderOutput();
-        });
-    });
-});
diff --git a/types/react-dom/react-dom-tests.tsx b/types/react-dom/react-dom-tests.tsx
new file mode 100644
index 0000000000..3f153b0a75
--- /dev/null
+++ b/types/react-dom/react-dom-tests.tsx
@@ -0,0 +1,174 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as ReactDOMServer from 'react-dom/server';
+import * as ReactDOMNodeStream from 'react-dom/node-stream';
+import * as ReactTestUtils from 'react-dom/test-utils';
+
+declare function describe(desc: string, f: () => void): void;
+declare function it(desc: string, f: () => void): void;
+
+class TestComponent extends React.Component { }
+
+describe('ReactDOM', () => {
+    it('render', () => {
+        const rootElement = document.createElement('div');
+        ReactDOM.render(React.createElement('div'), rootElement);
+    });
+
+    it('hydrate', () => {
+        const rootElement = document.createElement('div');
+        ReactDOM.hydrate(React.createElement('div'), rootElement);
+    });
+
+    it('unmounts', () => {
+        const rootElement = document.createElement('div');
+        ReactDOM.render(React.createElement('div'), rootElement);
+        ReactDOM.unmountComponentAtNode(rootElement);
+    });
+
+    it('find dom node', () => {
+        const rootElement = document.createElement('div');
+        ReactDOM.render(React.createElement('div'), rootElement);
+        ReactDOM.findDOMNode(rootElement);
+    });
+
+    it('createPortal', () => {
+        const rootElement = document.createElement('div');
+        const portalTarget = document.createElement('div');
+
+        class ClassComponent extends React.Component {
+            render() {
+                return ReactDOM.createPortal(<div />, portalTarget);
+            }
+        }
+
+        ReactDOM.createPortal(React.createElement('div'), portalTarget);
+        ReactDOM.render(<ClassComponent />, rootElement);
+    });
+});
+
+describe('ReactDOMServer', () => {
+    it('renderToString', () => {
+        const content: string = ReactDOMServer.renderToString(React.createElement('div'));
+    });
+
+    it('renderToStaticMarkup', () => {
+        const content: string = ReactDOMServer.renderToStaticMarkup(React.createElement('div'));
+    });
+});
+
+describe('ReactDOMNodeStream', () => {
+    it('renderToStream', () => {
+        const content: any = ReactDOMNodeStream.renderToStream(React.createElement('div'));
+    });
+
+    it('renderToStaticStream', () => {
+        const content: any = ReactDOMNodeStream.renderToStaticStream(React.createElement('div'));
+    });
+});
+
+describe('React dom test utils', () => {
+    it('Simulate', () => {
+        const element = document.createElement('div');
+        const dom = ReactDOM.render(
+            React.createElement('input', { type: 'text' }),
+            element
+        ) as Element;
+        const node = ReactDOM.findDOMNode(dom) as HTMLInputElement;
+
+        node.value = 'giraffe';
+        ReactTestUtils.Simulate.change(node);
+        ReactTestUtils.Simulate.keyDown(node, { key: "Enter", keyCode: 13, which: 13 });
+    });
+
+    it('renderIntoDocument', () => {
+        const element = React.createElement('input', { type: 'text' });
+        ReactTestUtils.renderIntoDocument(element);
+    });
+
+    it('mockComponent', () => {
+        ReactTestUtils.mockComponent(TestComponent, 'div');
+    });
+
+    it('isElement', () => {
+        const element = React.createElement(TestComponent);
+        const isReactElement: boolean = ReactTestUtils.isElement(element);
+    });
+
+    it('isElementOfType', () => {
+        const element = React.createElement(TestComponent);
+        const isReactElement: boolean = ReactTestUtils.isElementOfType(element, TestComponent);
+    });
+
+    it('isDOMComponent', () => {
+        const element = React.createElement('div');
+        const instance = ReactTestUtils.renderIntoDocument(element) as HTMLDivElement;
+        const isDOMElement: boolean = ReactTestUtils.isDOMComponent(instance);
+    });
+
+    it('isCompositeComponent', () => {
+        const element = React.createElement(TestComponent);
+        const instance: TestComponent = ReactTestUtils.renderIntoDocument(element);
+        const isCompositeComponent: boolean = ReactTestUtils.isCompositeComponent(instance);
+    });
+
+    it('isCompositeComponentWithType', () => {
+        const element = React.createElement(TestComponent);
+        const instance: TestComponent = ReactTestUtils.renderIntoDocument(element);
+        const isCompositeComponent: boolean = ReactTestUtils.isCompositeComponentWithType(instance, TestComponent);
+    });
+
+    it('findAllInRenderedTree', () => {
+        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
+        ReactTestUtils.findAllInRenderedTree(component, (i: React.ReactInstance) => true);
+    });
+
+    it('scryRenderedDOMComponentsWithClass', () => {
+        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
+        ReactTestUtils.scryRenderedDOMComponentsWithClass(component, 'class');
+    });
+
+    it('findRenderedDOMComponentWithClass', () => {
+        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
+        ReactTestUtils.findRenderedDOMComponentWithClass(component, 'class');
+    });
+
+    it('scryRenderedDOMComponentsWithTag', () => {
+        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
+        ReactTestUtils.scryRenderedDOMComponentsWithTag(component, 'div');
+    });
+
+    it('findRenderedDOMComponentWithTag', () => {
+        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
+        ReactTestUtils.findRenderedDOMComponentWithTag(component, 'tag');
+    });
+
+    it('scryRenderedComponentsWithType', () => {
+        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
+        ReactTestUtils.scryRenderedComponentsWithType(component, TestComponent);
+    });
+
+    it('findRenderedComponentWithType', () => {
+        const component = ReactTestUtils.renderIntoDocument(React.createElement(TestComponent));
+        ReactTestUtils.findRenderedComponentWithType(component, TestComponent);
+    });
+
+    describe('Shallow Rendering', () => {
+        it('createRenderer', () => {
+            const component = React.createElement(TestComponent);
+            const shallowRenderer = ReactTestUtils.createRenderer();
+        });
+
+        it('shallowRenderer.render', () => {
+            const component = React.createElement(TestComponent);
+            const shallowRenderer = ReactTestUtils.createRenderer();
+            shallowRenderer.render(component);
+        });
+
+        it('shallowRenderer.getRenderOutput', () => {
+            const component = React.createElement(TestComponent);
+            const shallowRenderer = ReactTestUtils.createRenderer();
+            shallowRenderer.getRenderOutput();
+        });
+    });
+});
diff --git a/types/react-dom/test-utils/index.d.ts b/types/react-dom/test-utils/index.d.ts
index 05362460d4..caa5605ef5 100644
--- a/types/react-dom/test-utils/index.d.ts
+++ b/types/react-dom/test-utils/index.d.ts
@@ -59,7 +59,7 @@ export interface SyntheticEventData extends OptionalEventProperties {
 export type EventSimulator = (element: Element | Component<any>, eventData?: SyntheticEventData) => void;
 
 export interface MockedComponentClass {
-    new (): any;
+    new (props: {}): any;
 }
 
 export interface ShallowRenderer {
diff --git a/types/react-dom/tsconfig.json b/types/react-dom/tsconfig.json
index 010744a826..0d21b07029 100644
--- a/types/react-dom/tsconfig.json
+++ b/types/react-dom/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "files": [
         "index.d.ts",
-        "react-dom-tests.ts",
+        "react-dom-tests.tsx",
         "server/index.d.ts",
         "node-stream/index.d.ts",
         "test-utils/index.d.ts"
@@ -22,6 +22,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "preserve"
     }
 }
\ No newline at end of file
diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index 3ea828f350..423ce38462 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -1,51 +1,48 @@
-// Type definitions for react-dropzone 4.1.3
+// Type definitions for react-dropzone 4.2.3
 // Project: https://github.com/okonet/react-dropzone
 // Definitions by: Mathieu Larouche Dube <https://github.com/matdube>,
 //                 Ivo Jesus <https://github.com/LynxEyes>,
 //                 Luís Rodrigues <https://github.com/goblindegook>,
 //                 Ben Bayard <https://github.com/benbayard>,
 //                 Karol Janyst <https://github.com/LKay>,
-//                 Andris Causs <https://github.com/codeaid>
+//                 Andris Causs <https://github.com/codeaid>,
+//                 Juraj Husar <https://github.com/jurosh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { CSSProperties, Component, DragEvent, InputHTMLAttributes } from "react";
 
-declare namespace Dropzone {
-    export interface ImageFile extends File {
-        preview?: string;
-    }
-
-    export type DropFileEventHandler = (acceptedOrRejected: ImageFile[], event: DragEvent<HTMLDivElement>) => void;
-    export type DropFilesEventHandler = (accepted: ImageFile[], rejected: ImageFile[], event: DragEvent<HTMLDivElement>) => void;
-
-    type PickedAttributes = "accept" | "className" | "multiple" | "name" | "onClick" | "onDragStart" | "onDragEnter" | "onDragOver" | "onDragLeave" | "style";
-
-    export interface DropzoneProps extends Pick<InputHTMLAttributes<HTMLDivElement>, PickedAttributes> {
-        disableClick?: boolean;
-        disabled?: boolean;
-        disablePreview?: boolean;
-        preventDropOnDocument?: boolean;
-        inputProps?: InputHTMLAttributes<HTMLInputElement>;
-        maxSize?: number;
-        minSize?: number;
-        activeClassName?: string;
-        acceptClassName?: string;
-        rejectClassName?: string;
-        disabledClassName?: string;
-        activeStyle?: CSSProperties;
-        acceptStyle?: CSSProperties;
-        rejectStyle?: CSSProperties;
-        disabledStyle?: CSSProperties;
-        onDrop?: DropFilesEventHandler;
-        onDropAccepted?: DropFileEventHandler;
-        onDropRejected?: DropFileEventHandler;
-        onFileDialogCancel?: () => void;
-    }
+export interface ImageFile extends File {
+    preview?: string;
 }
 
-declare class Dropzone extends Component<Dropzone.DropzoneProps> {
+export type DropFileEventHandler = (acceptedOrRejected: ImageFile[], event: DragEvent<HTMLDivElement>) => void;
+export type DropFilesEventHandler = (accepted: ImageFile[], rejected: ImageFile[], event: DragEvent<HTMLDivElement>) => void;
+
+type PickedAttributes = "accept" | "className" | "multiple" | "name" | "onClick" | "onDragStart" | "onDragEnter" | "onDragOver" | "onDragLeave" | "style";
+
+export interface DropzoneProps extends Pick<InputHTMLAttributes<HTMLDivElement>, PickedAttributes> {
+    disableClick?: boolean;
+    disabled?: boolean;
+    disablePreview?: boolean;
+    preventDropOnDocument?: boolean;
+    inputProps?: InputHTMLAttributes<HTMLInputElement>;
+    maxSize?: number;
+    minSize?: number;
+    activeClassName?: string;
+    acceptClassName?: string;
+    rejectClassName?: string;
+    disabledClassName?: string;
+    activeStyle?: CSSProperties;
+    acceptStyle?: CSSProperties;
+    rejectStyle?: CSSProperties;
+    disabledStyle?: CSSProperties;
+    onDrop?: DropFilesEventHandler;
+    onDropAccepted?: DropFileEventHandler;
+    onDropRejected?: DropFileEventHandler;
+    onFileDialogCancel?: () => void;
+}
+
+export default class Dropzone extends Component<DropzoneProps> {
     open(): void;
 }
-
-export = Dropzone;
diff --git a/types/react-dropzone/react-dropzone-tests.tsx b/types/react-dropzone/react-dropzone-tests.tsx
index 8fcb16311a..67fa8eadb3 100644
--- a/types/react-dropzone/react-dropzone-tests.tsx
+++ b/types/react-dropzone/react-dropzone-tests.tsx
@@ -1,7 +1,6 @@
 import * as React from "react";
 import { DragEvent, SyntheticEvent } from "react";
-import Dropzone = require("react-dropzone");
-import { ImageFile } from "react-dropzone";
+import Dropzone, { ImageFile } from "react-dropzone";
 
 class Test extends React.Component {
 
diff --git a/types/react-dropzone/tslint.json b/types/react-dropzone/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-dropzone/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-dropzone/v2/tslint.json b/types/react-dropzone/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-dropzone/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-dropzone/v3/tslint.json b/types/react-dropzone/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-dropzone/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-easy-chart/tslint.json b/types/react-easy-chart/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-easy-chart/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-file-input/tslint.json b/types/react-file-input/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-file-input/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-flags-select/index.d.ts b/types/react-flags-select/index.d.ts
new file mode 100644
index 0000000000..6a2e1dc964
--- /dev/null
+++ b/types/react-flags-select/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for react-flags-select 1.1
+// Project: https://github.com/ekwonye-richard/react-flags-select#readme
+// Definitions by: Artur Sianiuk <https://github.com/senukartur>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Component } from 'react';
+
+interface Props {
+    countries?: string[];
+    blackList?: boolean;
+    customLabels?: {[propName: string]: string};
+    selectedSize?: number;
+    optionsSize?: number;
+    defaultCountry?: string;
+    placeholder?: string;
+    className?: string;
+    showSelectedLabel?: boolean;
+    showOptionLabel?: boolean;
+    alignOptions?: string;
+    onSelect?: (countryCode: string) => void;
+    disabled?: boolean;
+    searchable?: boolean;
+}
+declare class ReactFlagsSelect extends Component<Props> {
+    updateSelected(countryCode: string): void;
+}
+
+export default ReactFlagsSelect;
diff --git a/types/react-flags-select/react-flags-select-tests.tsx b/types/react-flags-select/react-flags-select-tests.tsx
new file mode 100644
index 0000000000..31bf921154
--- /dev/null
+++ b/types/react-flags-select/react-flags-select-tests.tsx
@@ -0,0 +1,73 @@
+import * as React from 'react';
+import ReactFlagsSelect from 'react-flags-select';
+
+export class ReactFlagsSelectTest extends React.Component {
+    countries = ['US', 'GB', 'FR', 'DE', 'IT'];
+    customLabels = {US: 'EN-US', GB: 'EN-GB', FR: 'FR', DE: 'DE', IT: 'IT'};
+    onSelectFlag(countryCode: string) { }
+    render() {
+        return (
+            <div>
+                <ReactFlagsSelect />
+                <ReactFlagsSelect defaultCountry='US' />
+                <ReactFlagsSelect searchable={true} />
+                <ReactFlagsSelect countries={this.countries} />
+                <ReactFlagsSelect countries={this.countries} blackList={true} />
+                <ReactFlagsSelect className='menu-flags' />
+                <ReactFlagsSelect alignOptions='left' />
+                <ReactFlagsSelect
+                    countries={this.countries}
+                    customLabels={this.customLabels}
+                />
+                <ReactFlagsSelect
+                    countries={this.countries}
+                    customLabels={this.customLabels}
+                    placeholder='Select Language'
+                />
+                <ReactFlagsSelect
+                    countries={this.countries}
+                    customLabels={this.customLabels}
+                    placeholder='Select Language'
+                    showSelectedLabel={false}
+                />
+                <ReactFlagsSelect
+                    countries={this.countries}
+                    customLabels={this.customLabels}
+                    placeholder='Select Language'
+                    showSelectedLabel={false}
+                    showOptionLabel={false}
+                />
+                <ReactFlagsSelect
+                    countries={this.countries}
+                    customLabels={this.customLabels}
+                    placeholder='Select Language'
+                    showSelectedLabel={false}
+                    showOptionLabel={false}
+                    selectedSize={14}
+                />
+                <ReactFlagsSelect
+                    countries={this.countries}
+                    customLabels={this.customLabels}
+                    placeholder='Select Language'
+                    showSelectedLabel={false}
+                    showOptionLabel={false}
+                    selectedSize={18}
+                    optionsSize={14}
+                />
+                <ReactFlagsSelect
+                    defaultCountry='US'
+                    showSelectedLabel={false}
+                    disabled={true}
+                />
+                <ReactFlagsSelect
+                    defaultCountry='GB'
+                    onSelect={this.onSelectFlag}
+                />
+                <ReactFlagsSelect
+                    ref='userFlag'
+                    defaultCountry='FR'
+                />
+            </div>
+        );
+    }
+}
diff --git a/types/react-flags-select/tsconfig.json b/types/react-flags-select/tsconfig.json
new file mode 100644
index 0000000000..f42fa48c4a
--- /dev/null
+++ b/types/react-flags-select/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-flags-select-tests.tsx"
+    ]
+}
diff --git a/types/react-flags-select/tslint.json b/types/react-flags-select/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-flags-select/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 68b2d793f8..ebac89f48d 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -5,12 +5,12 @@
 // TypeScript Version: 2.3
 
 import { Component } from 'react';
-import { EventCallback, Options } from 'flatpickr';
+import { Options } from 'flatpickr';
 
 export interface DateTimePickerProps {
     defaultValue?: string;
-    options?: Options;
-    onChange?: EventCallback;
+    options?: Options.Options;
+    onChange?: Options.Hook;
     value?: string;
 }
 
diff --git a/types/react-flatpickr/package.json b/types/react-flatpickr/package.json
new file mode 100644
index 0000000000..3042893929
--- /dev/null
+++ b/types/react-flatpickr/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "flatpickr": "^4.0.6"
+    }
+}
diff --git a/types/react-flatpickr/react-flatpickr-tests.tsx b/types/react-flatpickr/react-flatpickr-tests.tsx
index 948b65e84e..c3dc0f4adc 100644
--- a/types/react-flatpickr/react-flatpickr-tests.tsx
+++ b/types/react-flatpickr/react-flatpickr-tests.tsx
@@ -1,4 +1,4 @@
-import * as Flatpickr from 'flatpickr';
+import { Instance } from 'flatpickr';
 import * as React from 'react';
 import DatePicker from 'react-flatpickr';
 
@@ -12,7 +12,7 @@ const options = {
 const optionsElement = <DatePicker options={ options }/>;
 
 const onChange = (
-    selectedDates: Date[], dateStr: string, instance: Flatpickr,
+    selectedDates: Date[], dateStr: string, instance: Instance,
     elem: HTMLElement
 ) => null;
 const onChangeElement = <DatePicker onChange={ onChange }/>;
diff --git a/types/react-flex/tslint.json b/types/react-flex/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-flex/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-flexr/tslint.json b/types/react-flexr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-flexr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-flip-move/index.d.ts b/types/react-flip-move/index.d.ts
deleted file mode 100644
index 8480d50c28..0000000000
--- a/types/react-flip-move/index.d.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-// Type definitions for react-flip-move 2.9
-// Project: https://github.com/joshwcomeau/react-flip-move
-// Definitions by: Joey Hain <https://github.com/jmhain>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import { Component, ReactElement } from "react";
-
-export as namespace FlipMove;
-export = FlipMove;
-
-declare class FlipMove extends Component<FlipMove.FlipMoveProps> { }
-
-declare namespace FlipMove {
-    type AnimationPreset = "elevator" | "fade" | "accordionVertical" | "accordionHorizontal" | "none";
-
-    interface Animation {
-        from: Partial<CSSStyleDeclaration>;
-        to: Partial<CSSStyleDeclaration>;
-    }
-
-    interface FlipMoveProps {
-        className?: string;
-
-        /**
-         * Any valid CSS3 timing function (eg. "linear", "ease-in", "cubic-bezier(1, 0, 0, 1)").
-         *
-         * @default "ease-in-out"
-         */
-        easing?: string;
-
-        /**
-         * The length, in milliseconds, that the transition ought to take.
-         *
-         * @default 350
-         */
-        duration?: number;
-
-        /**
-         * The length, in milliseconds, to wait before the animation begins.
-         *
-         * @default 0
-         */
-        delay?: number;
-
-        /**
-         * The length, in milliseconds, to be added to the duration of each subsequent element.
-         *
-         * For example, if you are animating 4 elements with a `duration` of 200 and a `staggerDurationBy` of 20:
-         *
-         * - The first element will take 200ms to transition.
-         * - The second element will take 220ms to transition.
-         * - The third element will take 240ms to transition.
-         * - The fourth element will take 260ms to transition.
-         *
-         * This effect is great for "humanizing" transitions and making them feel less robotic.
-         */
-        staggerDurationBy?: number;
-
-        /**
-         * The length, in milliseconds, to be added to the delay of each subsequent element.
-         *
-         * For example, if you are animating 4 elements with a `delay` of 0 and a `staggerDelayBy` of 20:
-         *
-         * - The first element will start transitioning immediately.
-         * - The second element will start transitioning after 20ms.
-         * - The third element will start transitioning after 40ms.
-         * - The fourth element will start transitioning after 60ms.
-         *
-         * Similarly to staggerDurationBy, This effect is great for "humanizing" transitions and making them feel less
-         * robotic.
-         *
-         * **Protip**: You can make elements animate one-at-a-time by using an identical duration and staggerDelayBy.
-         *
-         * @default 0
-         */
-        staggerDelayBy?: number;
-
-        /**
-         * Control the appear animation that runs when the component mounts. Works identically to enterAnimation below, but
-         * only fires on the initial children.
-         */
-        appearAnimation?: AnimationPreset | Animation | boolean;
-
-        /**
-         * Control the onEnter animation that runs when new items are added to the DOM.
-         *
-         * Accepts several types:
-         *
-         * **String:** You can enter one of the following presets to select that as your enter animation:
-         *
-         *   - `elevator` (default)
-         *   - `fade`
-         *   - `accordionVertical`
-         *   - `accordionHorizontal`
-         *   - `none`
-         *
-         * **Boolean:** You can enter `false` to disable the enter animation, or `true` to select the default enter animation (elevator).
-         *
-         * **Object:** For fully granular control, you can pass in an object that contains the styles you'd like to animate.
-         *
-         * It requires two keys: `from` and `to`. Each key holds an object of CSS properties. You can supply any valid
-         * camelCase CSS properties, and flip-move will transition between the two, over the course of the specified
-         * `duration`.
-         *
-         * Example:
-         *
-         *     const customEnterAnimation = {
-         *       from: { transform: 'scale(0.5, 1)' },
-         *       to:   { transform: 'scale(1, 1)' }
-         *     };
-         *
-         *     <FlipMove enterAnimation={customEnterAnimation}>
-         *          {renderChildren()}
-         *     </FlipMove>
-         *
-         * @default "elevator"
-         */
-        enterAnimation?: AnimationPreset | Animation | boolean;
-
-        /**
-         * Control the onLeave animation that runs when new items are removed from the DOM.
-         *
-         * This property functions identically to `enterAnimation`.
-         *
-         * @default "elevator"
-         */
-        leaveAnimation?: AnimationPreset | Animation | boolean;
-
-        /**
-         * Do not collapse container height until after leaving animations complete.
-         *
-         * When false, children are immediately removed from the DOM flow as they animate away. Setting this value to true
-         * will maintain the height of the container until after their leaving animation completes.
-         *
-         * @default false
-         */
-        maintainContainerHeight?: boolean;
-
-        /**
-         * A callback to be invoked **once per child element** at the start of the animation.
-         *
-         * In general, it is advisable to ignore the domNode argument and work with the childElement. The domNode is just
-         * an escape hatch for doing complex things not otherwise possible.
-         *
-         * @param childElement  A reference to the React Element being animated.
-         * @param domNode       A reference to the unadulterated DOM node being animated.
-         */
-        onStart?(childElement: ReactElement<any>, domNode: HTMLElement): void;
-
-        /**
-         * A callback to be invoked **once per child element** at the end of the animation.
-         *
-         * In general, it is advisable to ignore the `domNode` argument and work with the `childElement`. The `domNode` is
-         * just an escape hatch for doing complex things not otherwise possible.
-         *
-         * @param childElement  A reference to the React Element being animated.
-         * @param domNode       A reference to the unadulterated DOM node being animated.
-         */
-        onFinish?(childElement: ReactElement<any>, domNode: HTMLElement): void;
-
-        /**
-         * A callback to be invoked **once per group** at the start of the animation.
-         *
-         * The callback arguments are similar to the ones provided for onStart, except we provide an array of the elements
-         * and nodes. The order of both arguments is guaranteed; this means you can use a zipping function like lodash's
-         * .zip to get pairs of element/node, if needed.
-         *
-         * In general, it is advisable to ignore the `domNodes` argument and work with the `childElements` The `domNodes`
-         *
-         * are just an escape hatch for doing complex things not otherwise possible.
-         *
-         * @param childElements An array of the references to the React Element(s) being animated.
-         * @param domNodes      An array of the references to the unadulterated DOM node(s) being animated.
-         */
-        onStartAll?(childElements: Array<ReactElement<any>>, domNodes: HTMLElement[]): void;
-
-        /**
-         * A callback to be invoked **once per group** at the end of the animation.
-         *
-         * The callback arguments are similar to the ones provided for onFinish, except we provide an array of the elements
-         * and nodes. The order of both arguments is guaranteed; this means you can use a zipping function like lodash's
-         * .zip to get pairs of element/node, if needed.
-         *
-         * In general, it is advisable to ignore the `domNodes` argument and work with the `childElements` The `domNodes`
-         * are just an escape hatch for doing complex things not otherwise possible.
-         *
-         * @param childElements An array of the references to the React Element(s) being animated.
-         * @param domNodes      An array of the references to the unadulterated DOM node(s) being animated.
-         */
-        onFinishAll?(childElements: Array<ReactElement<any>>, domNodes: HTMLElement[]): void;
-
-        /**
-         * Flip Move wraps your children in a container element. By default, this element is a div, but you may wish to
-         * provide a custom HTML element (for example, if your children are list items, you may wish to set this to ul).
-         *
-         * Any valid HTML element type is accepted, but peculiar things may happen if you use an unconventional element.
-         *
-         * @default "div"
-         */
-        typeName?: string;
-
-        /**
-         * Sometimes, you may wish to temporarily disable the animations and have the normal behaviour resumed. Setting this
-         * flag to true skips all animations.
-         *
-         * @default false
-         */
-        disableAllAnimations?: boolean;
-
-        /**
-         * This function is called with a DOM node as the only argument. It should return an object as specified by the
-         * getBoundingClientRect() spec.
-         *
-         * For normal usage of FlipMove you won't need this. An example of usage is when FlipMove is used in a container
-         * that is scaled using CSS. You can correct the values from getBoundingClientRect by using this prop.
-         */
-        getPosition?(node: HTMLElement): ClientRect;
-    }
-}
diff --git a/types/react-flip-move/react-flip-move-tests.tsx b/types/react-flip-move/react-flip-move-tests.tsx
deleted file mode 100644
index 19dac88a65..0000000000
--- a/types/react-flip-move/react-flip-move-tests.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import * as React from "react";
-import * as FlipMove from "react-flip-move";
-
-class DefaultTest extends React.Component {
-    render() {
-        return <FlipMove />;
-    }
-}
-
-class PresetTest extends React.Component {
-    render() {
-        return (
-            <FlipMove
-                appearAnimation="fade"
-                enterAnimation="accordionHorizontal"
-                leaveAnimation="accordionVertical"
-            />
-        );
-    }
-}
-
-class CustomAnimationTest extends React.Component {
-    render() {
-        const enterAnimation: FlipMove.Animation = {
-            from: { opacity: "0" },
-            to: { opacity: "1" }
-        };
-
-        const leaveAnimation: FlipMove.Animation = {
-            from: { opacity: "1" },
-            to: { opacity: "0" }
-        };
-
-        return (
-            <FlipMove
-                enterAnimation={enterAnimation}
-                appearAnimation={enterAnimation}
-                leaveAnimation={leaveAnimation}
-            />
-        );
-    }
-}
-
-class FlipMoveTest extends React.Component {
-    onStart = (childElement: React.ReactElement<any>, domNode: HTMLElement) => {};
-
-    onFinish = (childElement: React.ReactElement<any>, domNode: HTMLElement) => {};
-
-    onStartAll = (childElements: Array<React.ReactElement<any>>, domNodes: HTMLElement[]) => {};
-
-    onFinishAll = (childElements: Array<React.ReactElement<any>>, domNodes: HTMLElement[]) => {};
-
-    render() {
-        return (
-            <FlipMove
-                delay={0}
-                staggerDelayBy={20}
-                duration={200}
-                staggerDurationBy={20}
-                maintainContainerHeight
-                disableAllAnimations={false}
-                easing="cubic-bezier(1, 0, 0, 1)"
-                onStart={this.onStart}
-                onFinish={this.onFinish}
-                onStartAll={this.onStartAll}
-                onFinishAll={this.onFinishAll}
-            />
-        );
-    }
-}
diff --git a/types/react-flip-move/tsconfig.json b/types/react-flip-move/tsconfig.json
deleted file mode 100644
index 9472de4695..0000000000
--- a/types/react-flip-move/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
-    },
-    "files": [
-        "index.d.ts",
-        "react-flip-move-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-form/index.d.ts b/types/react-form/index.d.ts
index 4694efa926..965f55e7e7 100644
--- a/types/react-form/index.d.ts
+++ b/types/react-form/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-form 1.3
+// Type definitions for react-form 2.12
 // Project: https://github.com/tannerlinsley/react-form#readme
 // Definitions by: Cameron McAteer <https://github.com/cameron-mcateer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,6 +6,7 @@
 
 import * as React from 'react';
 
+// Helper Types
 export type FormValue = any;
 export type FormError = string | undefined;
 export interface Nested<T> {
@@ -13,24 +14,12 @@ export interface Nested<T> {
 }
 export type FormValues = Nested<FormValue>;
 export type Touched = Nested<boolean>;
-export type FormErrors = {[key: string]: FormError} | [{[key: string]: FormError}];
+export interface FormErrors {
+    [key: string]: FormError;
+}
 export type NestedErrors = Nested<FormErrors>;
 export type RenderReturn = JSX.Element | false | null;
 
-export interface FormProps {
-    loadState?(props: FormProps, self: Form): FormState | undefined;
-    defaultValues?: FormValues;
-    preValidate?(values: FormValues, state: FormState, props: FormProps, self: Form): FormValues;
-    validate?(values: FormValues, state: FormState, props: FormProps): FormErrors;
-    onValidationFail?(values: FormValues, state: FormState, props: FormProps, self: Form): void;
-    onChange?(state: FormState, props: FormProps, initial: boolean | FormProps, self: Form): void;
-    saveState?(state: FormState, props: FormProps, self: Form): void;
-    willUnmount?(state: FormState, props: FormProps, self: Form): void;
-    preSubmit?(values: FormValues, state: FormState, props: FormProps, self: Form): FormValues;
-    onSubmit?(values: FormValues, state: FormState, props: FormProps, self: Form): void;
-    postSubmit?(values: FormValues, state: FormState, props: FormProps, self: Form): void;
-}
-
 export interface FormState {
     values: FormValues;
     touched: Touched;
@@ -39,24 +28,56 @@ export interface FormState {
     dirty?: boolean;
 }
 
-export const FormDefaultProps: FormProps;
+export interface FormProps {
+    dontValidateOnMount?: boolean;
+    defaultValues?: FormValues;
+    onSubmit?(values: FormValues, submissionEvent: React.SyntheticEvent<any>, formApi: FormApi): void;
+    preSubmit?(values: FormValues, formApi: FormApi): FormValues;
+    onSubmitFailure?(errors: FormErrors, formApi: FormApi): void;
+    formDidUpdate?(formState: FormState): void;
+    preValidate?(values: FormValues): FormValues;
+    validateError?: ValidateValuesFunction;
+    validateWarning?: ValidateValuesFunction;
+    validateSuccess?: (values: FormValues, errors: FormErrors) => FormErrors;
+    asyncValidators?: {
+        [field: string]: (value: FormValue) => Promise<any>
+    };
+    dontPreventDefault?: boolean;
+}
 
 export interface FormApi {
-    setAllValues(values: FormValues, noTouch?: boolean): void;
-    setValue(field: string, value: any, noTouch?: boolean): void;
-    getValue(field: string, fallback?: any): any;
-    setNestedError(field: string, value?: boolean): void;
-    getError(field: string): FormError;
-    setTouched(field: string, value?: boolean): void;
-    getTouched(field: string): boolean;
-    addValue(field: string, value: any): void;
-    removeValue(field: string, index: number): void;
-    swapValues(field: string, index: number, destIndex: number): void;
-    setAllTouched(dirty?: boolean, state?: Partial<FormState>): void;
-    resetForm(): void;
-    submitForm(e?: Pick<React.SyntheticEvent<any>, 'preventDefault'>): void;
+    // State
+    values: FormValues;
+    touched: Touched;
+    errors: FormErrors;
+    warnings: FormErrors;
+    successes: FormErrors;
+    submits: number;
+    submitted: boolean;
+    asyncValidations: number;
+    validating: {[field: string]: boolean};
+    validationFailures: number;
+    validationFailed: {[field: string]: boolean};
+
+    // Methods
+    submitForm(event: React.SyntheticEvent<any>): void;
+    setValue(fieldName: string, value: any): void;
+    setAllValues(values: FormValues): void;
+    setError(field: string, error: string): void;
+    setWarning(field: string, warning: string): void;
+    setSuccess(field: string, success: string): void;
+    setTouched(field: string, touched: boolean): void;
+    setAllTouched(touches: {[field: string]: boolean}): void;
+    addValue(name: string, value: any): void;
+    removeValue(name: string, index: number): void;
+    swapValues(name: string, index1: number, index2: number): void;
+    resetAll(): void;
+    getFormState(): FormState;
+    setFormState(state: FormState): void;
 }
 
+export type ValidateValuesFunction = (values: FormValues) => FormErrors;
+
 export interface FormFunctionProps extends FormProps, FormState, FormApi {}
 
 export interface FormContext {
@@ -65,10 +86,9 @@ export interface FormContext {
 
 export class Form
     extends React.Component<
-        FormProps & { children?: ((props: FormFunctionProps) => RenderReturn) | RenderReturn },
-        FormState
+        FormProps & { children?: ((props: FormFunctionProps) => RenderReturn) | RenderReturn }
     >
-    implements FormApi, React.ChildContextProvider<FormContext> {
+    implements React.ChildContextProvider<FormContext> {
         static defaultProps: FormProps;
         static childContextTypes: {
             formApi: React.Validator<any>
@@ -80,207 +100,87 @@ export class Form
         componentWillReceiveProps(nextProps: Readonly<Partial<FormProps>>, nextContext: any): void;
         componentWillUmount(): void;
 
-        // API
-        setAllValues(values: FormValues, noTouch?: boolean): void;
-        setValue(field: string, value: any, noTouch?: boolean): void;
-        getValue(field: string, fallback?: any): any;
-        setNestedError(field: string, value?: boolean): void;
-        getError(field: string): FormError;
-        setTouched(field: string, value?: boolean): void;
-        getTouched(field: string): boolean;
-        addValue(field: string, value: any): void;
-        removeValue(field: string, index: number): void;
-        swapValues(field: string, index: number, destIndex: number): void;
-        setAllTouched(dirty?: boolean, state?: Partial<FormState>): void;
-        resetForm(): void;
-        submitForm(e?: Pick<React.SyntheticEvent<any>, 'preventDefault'>): void;
-
-        // Utils
-        getAPI(): FormApi;
-        setFormState(newState: Partial<FormState>, silent?: boolean): void;
-        emitChange(state: FormState, initial?: boolean): void;
-        validate(values: FormValues, state: FormState, props: FormProps): FormErrors;
         render(): RenderReturn;
     }
 
-export interface FormFieldApi {
-    setAllValues(values: FormValues, noTouch?: boolean): void;
-    setValue(value: any, noTouch?: boolean): void;
-    getValue(fallback?: any): any;
-    setNestedError(value?: boolean): void;
+export const NestedForm: React.StatelessComponent<FieldProps>;
+
+export function FormField(component: React.ComponentType<any>): React.ComponentClass<any>;
+
+// Fields
+
+export interface FieldApi {
+    getValue(): FormValue;
     getError(): FormError;
-    setTouched(value?: boolean): void;
+    getWarning(): FormError;
+    getSuccess(): FormError;
     getTouched(): boolean;
-    addValue(value: any): void;
-    removeValue(index: number): void;
-    swapValues(index: number, destIndex: number): void;
-    setAllTouched(dirty?: boolean, state?: Partial<FormState>): void;
-    resetForm(): void;
-    submitForm(e?: Pick<React.SyntheticEvent<any>, 'preventDefault'>): void;
+    getFieldName(): string;
+    setValue(value: FormValue): void;
+    setError(error: FormError): void;
+    setWarning(warning: FormError): void;
+    setSuccess(success: FormError): void;
+    setTouched(touched: boolean): void;
 }
 
-export interface FormFieldPropsWithField {
-    field?: string;
-    children(api: FormFieldApi): React.ReactElement<any> | null;
-}
-export interface FormFieldPropsWithoutField {
-    children(api: FormApi): RenderReturn;
-}
-export type FormFieldProps = FormFieldPropsWithField | FormFieldPropsWithoutField;
-export const FormField: React.SFC<FormFieldProps>;
-
-// FormError
-export interface FormErrorProps {
-    field?: FormFieldPropsWithField['field'];
-    className?: string;
-    style?: React.HTMLAttributes<HTMLElement>['style'];
-}
-export const FormError: React.SFC<FormErrorProps>;
-
-export interface FormInputProps {
-    field?: FormFieldPropsWithField['field'];
+export interface FieldProps {
+    field?: string | string[] | React.ReactText[] | Array<(string | React.ReactText[])>;
     showErrors?: boolean;
     errorBefore?: boolean;
     isForm?: boolean;
-    className?: string;
-    errorProps?: FormErrorProps;
 }
 
-export interface FormInputPropsWithChildren extends FormInputProps {
-    children(api: FormFieldApi): React.ReactElement<any> | null;
-}
-export const FormInput: React.SFC<FormInputPropsWithChildren>;
+export type SelectOptions = Array<{
+    value: FormValue
+    label: string
+}>;
 
-// ==============================
-//             Inputs
-// ==============================
+export interface SelectProps extends FieldProps, React.SelectHTMLAttributes<HTMLSelectElement> {
+    options: SelectOptions;
+}
 
-export type EventHandler<T, E> = (e: E, cb: () => void) => void;
-export type ChangeHandler<T> = EventHandler<T, React.ChangeEvent<T>>;
-export type FocusHandler<T> = EventHandler<T, React.FocusEvent<T>>;
-export type ClickHandler<T> = EventHandler<T, React.MouseEvent<T>>;
+export const Select: React.StatelessComponent<SelectProps>;
 
-// Prop interfaces are intermediate interfaces to "redefine" the type of some events
-// onChange:React.EventHandler => onChange:any => onChange:CustomEventHandler
+export const Text: React.StatelessComponent<FieldProps & React.InputHTMLAttributes<HTMLInputElement>>;
+export const TextArea: React.StatelessComponent<FieldProps & React.TextareaHTMLAttributes<HTMLTextAreaElement>>;
 
-export interface SelectOption {
-    label: string;
-    value: any;
-    disabled?: boolean;
-}
-export interface SelectAttrs extends React.SelectHTMLAttributes<HTMLSelectElement> {
-    onChange?: any;
-    onBlur?: any;
-}
-export interface SelectProps extends SelectAttrs {
-    options: ReadonlyArray<SelectOption>;
-    field?: FormInputProps['field'];
-    showErrors?: FormInputProps['showErrors'];
-    errorBefore?: FormInputProps['errorBefore'];
-    onChange?: ChangeHandler<HTMLSelectElement>;
-    onBlur?: FocusHandler<HTMLSelectElement>;
-    isForm?: FormInputProps['isForm'];
-    noTouch?: boolean;
-    errorProps?: FormInputProps['errorProps'];
-    placeholder?: string;
-}
-export const Select: React.SFC<SelectProps>;
-
-export interface InputAttrs extends React.InputHTMLAttributes<HTMLInputElement> {
-    onChange?: any;
-    onBlur?: any;
-}
-export interface CheckboxProps extends InputAttrs {
-    field?: FormInputProps['field'];
-    showErrors?: FormInputProps['showErrors'];
-    errorBefore?: FormInputProps['errorBefore'];
-    onChange?: ChangeHandler<HTMLInputElement>;
-    onBlur?: FocusHandler<HTMLInputElement>;
-    isForm?: FormInputProps['isForm'];
-    noTouch?: boolean;
-    errorProps?: FormInputProps['errorProps'];
-}
-export const Checkbox: React.SFC<CheckboxProps>;
-
-export interface TextareaAttrs extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
-    onChange?: any;
-    onBlur?: any;
-}
-export interface TextareaProps extends TextareaAttrs {
-    field?: FormInputProps['field'];
-    showErrors?: FormInputProps['showErrors'];
-    errorBefore?: FormInputProps['errorBefore'];
-    onChange?: ChangeHandler<HTMLTextAreaElement>;
-    onBlur?: FocusHandler<HTMLTextAreaElement>;
-    isForm?: FormInputProps['isForm'];
-    noTouch?: boolean;
-    errorProps?: FormInputProps['errorProps'];
-}
-export const Textarea: React.SFC<TextareaProps>;
-
-export interface NestedFormProps extends FormProps {
-    field?: FormInputProps['field'];
-    children?: React.ReactElement<FormProps> | [React.ReactElement<FormProps>];
-    errorProps?: FormInputProps['errorProps'];
-}
-export const NestedForm: React.SFC<NestedFormProps>;
-
-export interface TextProps extends InputAttrs {
-    field?: FormInputProps['field'];
-    showErrors?: FormInputProps['showErrors'];
-    errorBefore?: FormInputProps['errorBefore'];
-    onChange?: ChangeHandler<HTMLInputElement>;
-    onBlur?: FocusHandler<HTMLInputElement>;
-    isForm?: FormInputProps['isForm'];
-    noTouch?: boolean;
-    errorProps?: FormInputProps['errorProps'];
-}
-export const Text: React.SFC<TextProps>;
-
-export interface RadioGroupProps {
-    field?: FormInputProps['field'];
-    showErrors?: FormInputProps['showErrors'];
-    errorBefore?: FormInputProps['errorBefore'];
-    isForm?: FormInputProps['isForm'];
-    errorProps?: FormInputProps['errorProps'];
-}
 export interface RadioGroupContext {
-    formRadioGroup: RadioGroup;
+    group: FieldApi;
 }
-export class RadioGroup extends React.Component<RadioGroupProps> implements FormFieldApi {
-    static childContextTypes: {
-        formRadioGroup: React.Validator<any>
+
+export class RadioGroup
+    extends React.Component<
+        FieldProps & { children?: ((props: FieldApi) => RenderReturn) | RenderReturn }
+    >
+    implements React.ChildContextProvider<RadioGroupContext> {
+    getChildContext(): {
+        group: FieldApi;
     };
-
-    setAllValues: FormFieldApi['setAllValues'];
-    setValue: FormFieldApi['setValue'];
-    getValue: FormFieldApi['getValue'];
-    setNestedError: FormFieldApi['setNestedError'];
-    getError: FormFieldApi['getError'];
-    setTouched: FormFieldApi['setTouched'];
-    getTouched: FormFieldApi['getTouched'];
-    addValue: FormFieldApi['addValue'];
-    removeValue: FormFieldApi['removeValue'];
-    swapValues: FormFieldApi['swapValues'];
-    setAllTouched: FormFieldApi['setAllTouched'];
-    resetForm: FormFieldApi['resetForm'];
-    submitForm: FormFieldApi['submitForm'];
-
-    getChildContext(): RadioGroupContext;
 }
 
-export interface InputWIthoutClick extends InputAttrs {
-    onClick?: any;
+export const Radio: React.StatelessComponent<FieldProps & React.InputHTMLAttributes<HTMLInputElement> & {group: FieldApi}>;
+export const Checkbox: React.StatelessComponent<FieldProps & React.InputHTMLAttributes<HTMLInputElement>>;
+
+// Styled Fields
+
+export interface StyledProps extends FieldProps {
+    noMessage?: boolean;
+    messageBefore?: boolean;
+    touchValidation?: boolean;
 }
-export interface RadioProps extends InputWIthoutClick {
-    onClick?: ClickHandler<HTMLInputElement>;
-    onChange?: ChangeHandler<HTMLInputElement>;
-    onBlur?: FocusHandler<HTMLInputElement>;
-}
-export class Radio extends React.Component<RadioProps> {
-    static contextTypes: {
-        formRadioGroup: React.Validator<any>
+
+export const StyledCheckbox: React.StatelessComponent<StyledProps & React.InputHTMLAttributes<HTMLInputElement> & {label: string}>;
+export const StyledTextArea: React.StatelessComponent<StyledProps & React.TextareaHTMLAttributes<HTMLTextAreaElement>>;
+export const StyledSelect: React.StatelessComponent<StyledProps & SelectProps & React.InputHTMLAttributes<HTMLSelectElement>>;
+export const StyledText: React.StatelessComponent<StyledProps & React.InputHTMLAttributes<HTMLInputElement>>;
+export const StyledRadio: React.StatelessComponent<StyledProps & React.InputHTMLAttributes<HTMLInputElement> & {group: FieldApi, label: string}>;
+
+export class StyledRadioGroup
+    extends React.Component<
+        StyledProps & { children?: ((props: FieldApi) => RenderReturn) | RenderReturn }
+    >
+    implements React.ChildContextProvider<RadioGroupContext> {
+    getChildContext(): {
+        group: FieldApi
     };
-
-    context: RadioGroupContext;
 }
diff --git a/types/react-form/react-form-tests.tsx b/types/react-form/react-form-tests.tsx
index aad7f1b92f..2d08cc4b8a 100644
--- a/types/react-form/react-form-tests.tsx
+++ b/types/react-form/react-form-tests.tsx
@@ -1,78 +1,672 @@
 import * as React from 'react';
 import {
-		Form,
-		FormError,
-		FormInput,
-
-		// Inputs
-		Select,
-		Checkbox,
-		Textarea,
-		NestedForm,
-		Text,
-		RadioGroup,
-		Radio
+	Form,
+	Text,
+	TextArea,
+	Radio,
+	RadioGroup,
+	Select,
+	Checkbox,
+	NestedForm,
+	FormValues,
+	FormErrors,
+	StyledText,
+	StyledRadioGroup,
+	StyledRadio,
+	StyledTextArea,
+	StyledCheckbox,
+	StyledSelect,
+	FieldApi,
+	FormField,
+	FormApi
 } from 'react-form';
 
-<Form />;
+// Basic Form Example
+const statusOptions = [
+	{
+		label: 'Single',
+		value: 'single'
+	},
+	{
+		label: 'In a Relationship',
+		value: 'relationship'
+	},
+	{
+		label: "It's Complicated",
+		value: 'complicated'
+	}
+];
 
-<Form>
-		{() => null}
-</Form>;
+class BasicForm extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
 
-<Form>
-		{() => <div/>}
-</Form>;
+	render() {
+		return (
+			<div>
+				<Form onSubmit={submittedValues => this.setState({ submittedValues })}>
+					{ formApi => (
+						<form onSubmit={formApi.submitForm} id="form2">
+							<label htmlFor="firstName">First name</label>
+							<Text field="firstName" id="firstName" />
+							<label htmlFor="lastName">Last name</label>
+							<Text field="lastName" id="lastName" />
+							<RadioGroup field="gender">
+								{ group => (
+									<div>
+										<label htmlFor="male" className="mr-2">Male</label>
+										<Radio group={group} value="male" id="male" className="mr-3 d-inline-block" />
+										<label htmlFor="female" className="mr-2">Female</label>
+										<Radio group={group} value="female" id="female" className="d-inline-block" />
+									</div>
+								)}
+							</RadioGroup>
+							<label htmlFor="bio">Bio</label>
+							<TextArea field="bio" id="bio" />
+							<label htmlFor="authorize" className="mr-2">Authorize</label>
+							<Checkbox field="authorize" id="authorize" className="d-inline-block" />
+							<label htmlFor="status" className="d-block">Relationship status</label>
+							<Select field="status" id="status" options={statusOptions} />
+							<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+						</form>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
 
-<Form>
-		{ ({ submitForm }) => <button onClick={submitForm}>Submit</button> }
-</Form>;
+// Form with Arrays
+class FormWithArrays extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
 
-<FormError field="" />;
+	render() {
+		return (
+			<div>
+				<Form
+					onSubmit={submittedValues => this.setState({ submittedValues })}>
+					{ formApi => (
+						<form onSubmit={formApi.submitForm} id="form3">
+							<label htmlFor="firstName2">First name</label>
+							<Text field="firstName" id="firstName2" />
+							<label htmlFor="friend1">Friend1</label>
+							<Text field={['friends', 0]} id="friend1" />
+							<label htmlFor="friend2">Friend2</label>
+							<Text field={['friends', 1]} id="friend2" />
+							<label htmlFor="friend3">Friend3</label>
+							<Text field={['friends', 2]} id="friend3" />
+							<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+						</form>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
 
-const CustomInput: React.SFC<React.HTMLAttributes<HTMLInputElement> & {field?: string}> =
-		({field, ...rest}) => {
-				return (
-						<FormInput field={field}>
-								{({ setValue, getValue, setTouched }) => {
-										return (
-												<input
-														{...rest}
-														value={getValue()}
-														onChange={(e) => setValue(e.target.value)}
-														onBlur={() => setTouched(true)}
-												/>
-										);
-								}}
-						</FormInput>
-				);
+// Field Syntax
+const Friend = ({ i }: {i: number}) => (
+	<div>
+		<h2>Friend</h2>
+		<label htmlFor={`friend-first-${i}`}>First name</label>
+		<Text field={['friends', i, 'firstName']} id={`friend-first-${i}`} />
+		<label htmlFor={`friend-last-${i}`}>Last name</label>
+		<Text field={[['friends', i], 'lastName']} id={`friend-last-${i}`} />
+		<label htmlFor={`friend-street-${i}`}>Street</label>
+		<Text field={['friends', i, 'address', 'street']} id={`friend-street-${i}`} />
+		<label htmlFor={`friend-zip-${i}`}>Zipcode</label>
+		<Text field={['friends', i, 'lastName.zip']} id={`friend-zip-${i}`} />
+	</div>
+);
+
+class FormWithSpecialFieldSyntax extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
+
+	render() {
+		return (
+			<div>
+				<Form
+					onSubmit={submittedValues => this.setState({ submittedValues })}>
+					{ formApi => (
+						<form onSubmit={formApi.submitForm} id="syntax-form">
+							<label htmlFor="nickname1">Nickname</label>
+							<Text field={['nicknames', 0]} id="nickname1" />
+							<label htmlFor="nickname2">Nickname</label>
+							<Text field={['nicknames', 1]} id="nickname2" />
+							<Friend i={0} />
+							<Friend i={1} />
+							<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+						</form>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
+
+// Nested Form
+const Questions = () => (
+	<NestedForm field="questions">
+		<Form>
+			{ formApi => (
+				<div>
+					<label htmlFor="color">Whats your favorite color?</label>
+					<Text field="color" id="color" />
+					<label htmlFor="food">Whats your favorite food?</label>
+					<Text field="food" id="food" />
+					<label htmlFor="car">Whats type of car do you drive?</label>
+					<Text field="car" id="car" />
+				</div>
+			)}
+		</Form>
+	</NestedForm>
+);
+
+class NestedFormExample extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
+
+	render() {
+		return (
+			<div>
+				<Form onSubmit={submittedValues => this.setState({ submittedValues })}>
+					{ formApi => (
+						<form onSubmit={formApi.submitForm} id="form4">
+							<label htmlFor="firstName3">First name</label>
+							<Text field="firstName" id="firstName3" />
+							<Questions />
+							<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+						</form>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
+
+// Dynamic Forms
+class DynamicForm extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
+
+	render() {
+		return (
+			<div>
+				<Form
+					onSubmit={submittedValues => this.setState({ submittedValues })}>
+					{ formApi => (
+						<div>
+							<button
+								onClick={() => formApi.addValue('siblings', '')}
+								type="button"
+								className="mb-4 mr-4 btn btn-success">Add Sibling</button>
+							<form onSubmit={formApi.submitForm} id="dynamic-form">
+								<label htmlFor="dynamic-first">First name</label>
+								<Text field="firstName" id="dynamic-first" />
+								{ formApi.values.siblings && formApi.values.siblings.map((sibling: string, i: number) => (
+									<div key={`sibling${i}`}>
+										<label htmlFor={`sibling-name-${i}`}>Name</label>
+										<Text field={['siblings', i]} id={`sibling-name-${i}`} />
+										<button
+											onClick={() => formApi.removeValue('siblings', i)}
+											type="button"
+											className="mb-4 btn btn-danger">Remove</button>
+									</div>
+								))}
+								<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+							</form>
+						</div>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
+
+// Array of Nested Forms
+const MyFriend = ({ i }: {i: number}) => (
+	<NestedForm field={['friends', i]} key={`nested-friend-${i}`}>
+		<Form>
+			{ formApi => (
+				<div>
+					<h2>Friend</h2>
+					<label htmlFor={`nested-friend-first-${i}`}>First name</label>
+					<Text field="firstName" id={`nested-friend-first-${i}`} />
+					<label htmlFor={`nested-friend-last-${i}`}>Last name</label>
+					<Text field="lastName" id={`nested-friend-last-${i}`} />
+				</div>
+			)}
+		</Form>
+	</NestedForm>
+);
+
+class FormWithArrayOfNestedForms extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
+
+	render() {
+		return (
+			<div>
+				<Form
+					onSubmit={submittedValues => this.setState({ submittedValues })}>
+					{ formApi => (
+						<div>
+							<form onSubmit={formApi.submitForm} id="form3">
+								<MyFriend i={0} />
+								<MyFriend i={1} />
+								<MyFriend i={2} />
+								<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+							</form>
+						</div>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
+
+// Styled Form
+class StyledForm extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
+
+	errorValidator = (values: FormValues) => {
+		const validateFirstName = (firstName: string) => {
+			return !firstName ? 'First name is required.' : undefined;
 		};
+		const validateLastName = (lastName: string) => {
+			return !lastName ? 'Last name is required.' : undefined;
+		};
+		const validateGender = (gender: string) => {
+			return !gender ? 'Gender is required.' : undefined;
+		};
+		const validateBio = (bio: string) => {
+			return !bio ? 'Bio is required.' : undefined;
+		};
+		const validateAuthorize = (authorize: boolean) => {
+			return !authorize ? 'Please check authorize.' : undefined;
+		};
+		const validateStatus = (status: string) => {
+			return !status ? 'Status is required.' : undefined;
+		};
+		return {
+			firstName: validateFirstName(values.firstName),
+			lastName: validateLastName(values.lastName),
+			gender: validateGender(values.gender),
+			bio: validateBio(values.bio),
+			authorize: validateAuthorize(values.authorize),
+			status: validateStatus(values.status)
+		};
+	}
 
-const events = {
-		onChange: (e: React.SyntheticEvent<HTMLElement>, cb: () => void): null => null,
-		onBlur: (e: React.SyntheticEvent<HTMLElement>, cb: () => void): null => null
+	warningValidator = (values: FormValues) => {
+		const validateFirstName = (firstName: string) => {
+			return firstName && firstName.length < 2 ? 'First name must be longer than 2 characters.' : undefined;
+		};
+		const validateLastName = (lastName: string) => {
+			return lastName && lastName.length < 2 ? 'Last name must be longer than 2 characters.' : undefined;
+		};
+		const validateBio = (bio: string) => {
+			return bio && bio.replace(/s+/g, ' ').trim().split(' ').length < 5 ? 'Bio should have more than 5 words.' : undefined;
+		};
+		return {
+			firstName: validateFirstName(values.firstName),
+			lastName: validateLastName(values.lastName),
+			gender: undefined,
+			bio: validateBio(values.bio),
+			authorize: undefined,
+			status: undefined
+		};
+	}
+
+	successValidator = (values: FormValues, errors: FormErrors) => {
+		const validateFirstName = () => {
+			return !errors['firstName'] ? 'Nice name!' : undefined;
+		};
+		const validateLastName = () => {
+			return !errors['lastName'] ? 'Your last name is sick!' : undefined;
+		};
+		const validateGender = () => {
+			return !errors['gender'] ? 'Thanks for entering your gender.' : undefined;
+		};
+		const validateBio = () => {
+			return !errors['bio'] ? 'Cool Bio!' : undefined;
+		};
+		const validateAuthorize = () => {
+			return !errors['authorize'] ? 'You are now authorized.' : undefined;
+		};
+		const validateStatus = () => {
+			return !errors['status'] ? 'Thanks for entering your status.' : undefined;
+		};
+		return {
+			firstName: validateFirstName(),
+			lastName: validateLastName(),
+			gender: validateGender(),
+			bio: validateBio(),
+			authorize: validateAuthorize(),
+			status: validateStatus()
+		};
+	}
+
+	render() {
+		return <Form
+			validateError={this.errorValidator}
+			validateWarning={this.warningValidator}
+			validateSuccess={this.successValidator}
+			onSubmit={submittedValues => this.setState({ submittedValues })}>
+			{ formApi => (
+				<form onSubmit={formApi.submitForm} id="form2">
+					<label htmlFor="firstName">First name</label>
+					<StyledText field="firstName" id="firstName" />
+					<label htmlFor="lastName">Last name</label>
+					<StyledText field="lastName" id="lastName" />
+					<label>Choose Gender</label>
+					<StyledRadioGroup field="gender">
+						{ group => (
+							<div>
+								<StyledRadio group={group} value="male" id="male" label="Male" className="mr-3 d-inline-block" />
+								<StyledRadio group={group} value="female" id="female" label="Female" className="d-inline-block" />
+							</div>
+						)}
+					</StyledRadioGroup>
+					<label htmlFor="bio">Bio</label>
+					<StyledTextArea field="bio" id="bio" />
+					<StyledCheckbox field="authorize" id="authorize" label="Authorize" className="d-inline-block" />
+					<label htmlFor="status" className="d-block">Relationship status</label>
+					<StyledSelect field="status" id="status" options={statusOptions} />
+					<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+				</form>
+			)}
+		</Form>;
+	}
+}
+
+// Define a custom message component
+const Message = ({ color, message }: {color: string, message: string}) => {
+	return (
+		<div className="mb-4" style={{ color }}>
+			<small>{message}</small>
+		</div>
+	);
 };
-const onClick = (e: React.SyntheticEvent<HTMLElement>, cb: () => void): null => null;
 
-<Select options={[]} />;
-<Select field="" options={[{label: '', value: '', disabled: false}]} {...events} />;
+// Define your custom input
+// Note, the ...rest is important because it allows you to pass any
+// additional fields to the internal <input>.
+class CustomTextWrapper extends React.Component<{
+	fieldApi: FieldApi
+	onInput: any
+}> {
+	render() {
+		const {
+			fieldApi,
+			onInput,
+			...rest
+		} = this.props;
 
-<Checkbox />;
-<Checkbox field="" checked={false} {...events} />;
+		const {
+			getValue,
+			getError,
+			getWarning,
+			getSuccess,
+			setValue,
+			setTouched,
+		} = fieldApi;
 
-<Textarea />;
-<Textarea field="" {...events} />;
+		const error = getError();
+		const warning = getWarning();
+		const success = getSuccess();
 
-<Form>
-		<NestedForm>
-				<Form />
-		</NestedForm>
-</Form>;
+		return (
+			<div>
+				<input
+					value={getValue()}
+					onInput={(e) => {
+						setValue(e.currentTarget.value);
+						if (onInput) {
+							onInput(e);
+						}
+					}}
+					onBlur={() => {
+						setTouched(true);
+					}}
+					{...rest} />
+				{ error ? <Message color="red" message={error} /> : null }
+				{ !error && warning ? <Message color="orange" message={warning} /> : null }
+				{ !error && !warning && success ? <Message color="green" message={success} /> : null }
+			</div>
+		);
+	}
+}
 
-<Text />;
-<Text field="" {...events} />;
+// Use the form field and your custom input together to create your very own input!
+const CustomText = FormField(CustomTextWrapper);
 
-<RadioGroup field="">
-		<Radio />
-		<Radio {...events} onClick={onClick}  />
-</RadioGroup>;
+const errorValidator = (values: FormValues) => {
+	return {
+		hello: !values.hello || !values.hello.match(/Hello World/) ? "Input must contain 'Hello World'" : undefined
+	};
+};
+
+const warningValidator = (values: FormValues) => {
+	return {
+		hello: !values.hello ||
+					 !values.hello.match(/^Hello World$/) ? "Input should equal 'Hello World'" : undefined
+	};
+};
+
+const successValidator = (values: FormValues) => {
+	return {
+		hello: values.hello && values.hello.match(/Hello World/) ? "Thanks for entering 'Hello World'!" : undefined
+	};
+};
+
+class FormWithCustomInput extends React.Component {
+	render() {
+		return (
+			<div>
+				<Form
+					validateWarning={warningValidator}
+					validateSuccess={successValidator}
+					validateError={errorValidator}>
+					{ formApi => (
+						<form onSubmit={formApi.submitForm} id="form5">
+							<label htmlFor="firstName4">First name</label>
+							<Text field="firstName" id="firstName4" />
+							<label htmlFor="hello2">Custom hello world</label>
+							<CustomText field="hello" id="hello2" />
+							<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+						</form>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
+
+// Async Validators
+const aserrorValidator = (values: FormValues) => {
+	return {
+		username: !values.username || values.username.trim() === '' ? 'Username is a required field' : undefined
+	};
+};
+
+const assuccessValidator = (values: FormValues, errors: FormErrors) => {
+	return {
+		username: !errors.username ? 'Awesome! your username is good to go!' : undefined
+	};
+};
+
+const doesUsernameExist = (username: string) => new Promise((resolve, reject) => setTimeout(() => {
+	// Simulate username check
+	if (['joe', 'tanner', 'billy', 'bob'].indexOf(username)) {
+		resolve({ error: 'That username is taken', success: null });
+	}
+	// Simulate request faulure
+	if (username === 'reject') {
+		reject('Failure while making call to validate username does not exist');
+	}
+	// Sumulate username success check
+	resolve({});
+}, 2000));
+
+const asyncValidators = {
+	username: async (username: string) => {
+		const validations = await doesUsernameExist(username);
+		return validations;
+	}
+};
+
+class AsynchronousFormValidation extends React.Component {
+	render() {
+		return (
+			<div>
+				<Form
+					validateError={aserrorValidator}
+					validateSuccess={assuccessValidator}
+					asyncValidators={asyncValidators}>
+					{ formApi => (
+						<form onSubmit={formApi.submitForm} id="form6">
+							<label htmlFor="username">Username</label>
+							<Text field="username" id="username" />
+							<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+						</form>
+					)}
+				</Form>
+			</div>
+		);
+	}
+}
+
+// Nested Async Validators
+const NestedNestedFormContent = ({ formApi }: {formApi: FormApi}) => {
+	return (
+		<div>
+			<label htmlFor="username4">Nested Username</label>
+			<Text field="username" id="username4" />
+		</div>
+	);
+};
+
+const NestedFormContent = ({ formApi }: {formApi: FormApi}) => {
+	return (
+		<div>
+			<label htmlFor="username3">Nested Username</label>
+			<Text field="username" id="username3" />
+			<NestedForm field="nestednested">
+				<Form
+					validateError={errorValidator}
+					validateSuccess={successValidator}
+					asyncValidators={asyncValidators3}>
+					{
+						formApi =>
+							<NestedNestedFormContent formApi={formApi} />
+					}
+				</Form>
+			</NestedForm>
+		</div>
+	);
+};
+
+const FormContent = ({ formApi }: {formApi: FormApi}) => {
+	return (
+		<div>
+			<form onSubmit={formApi.submitForm} id="form7">
+				<label htmlFor="username2">Username</label>
+				<Text field="username" id="username2" />
+				<NestedForm field="nested">
+					<Form
+						validateError={errorValidator}
+						validateSuccess={successValidator}
+						asyncValidators={asyncValidators2}>
+						{
+							formApi =>
+								<NestedFormContent formApi={formApi} />
+						}
+					</Form>
+				</NestedForm>
+				<button type="submit" className="mb-4 btn btn-primary">Submit</button>
+			</form>
+		</div>
+	);
+};
+
+const naserrorValidator = (values: FormValues) => {
+	return {
+		username: !values.username || values.username.trim() === '' ? 'Username is a required field' : undefined
+	};
+};
+
+const nassuccessValidator = (values: FormValues, errors: FormErrors) => {
+	return {
+		username: !errors.username ? 'Awesome! your username is good to go!' : undefined
+	};
+};
+
+const nasdoesUsernameExist = (username: string, ms: number) => new Promise((resolve, reject) => setTimeout(() => {
+	// Simulate username check
+	if (['joe', 'tanner', 'billy', 'bob'].indexOf(username)) {
+		resolve({ error: 'That username is taken', success: null });
+	}
+	// Simulate request faulure
+	if (username === 'reject') {
+		reject('Failure while making call to validate username does not exist');
+	}
+	// Sumulate username success check
+	resolve({});
+}, ms));
+
+const nasasyncValidators = {
+	username: async (username: string) => {
+		const validations = await nasdoesUsernameExist(username, 2000);
+		return validations;
+	}
+};
+
+const asyncValidators2 = {
+	username: async (username: string) => {
+		const validations = await nasdoesUsernameExist(username, 4000);
+		return validations;
+	}
+};
+
+const asyncValidators3 = {
+	username: async (username: string) => {
+		const validations = await nasdoesUsernameExist(username, 6000);
+		return validations;
+	}
+};
+
+class NestedAsynchronousFormValidation extends React.Component {
+	render() {
+		return (
+			<div>
+				<Form
+					validateError={naserrorValidator}
+					validateSuccess={nassuccessValidator}
+					asyncValidators={nasasyncValidators}>
+					{
+						formApi =>
+							<FormContent formApi={formApi} />
+					}
+				</Form>
+			</div>
+		);
+	}
+}
diff --git a/types/react-form/v1/index.d.ts b/types/react-form/v1/index.d.ts
new file mode 100644
index 0000000000..4694efa926
--- /dev/null
+++ b/types/react-form/v1/index.d.ts
@@ -0,0 +1,286 @@
+// Type definitions for react-form 1.3
+// Project: https://github.com/tannerlinsley/react-form#readme
+// Definitions by: Cameron McAteer <https://github.com/cameron-mcateer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export type FormValue = any;
+export type FormError = string | undefined;
+export interface Nested<T> {
+    [key: string]: T | Nested<T>;
+}
+export type FormValues = Nested<FormValue>;
+export type Touched = Nested<boolean>;
+export type FormErrors = {[key: string]: FormError} | [{[key: string]: FormError}];
+export type NestedErrors = Nested<FormErrors>;
+export type RenderReturn = JSX.Element | false | null;
+
+export interface FormProps {
+    loadState?(props: FormProps, self: Form): FormState | undefined;
+    defaultValues?: FormValues;
+    preValidate?(values: FormValues, state: FormState, props: FormProps, self: Form): FormValues;
+    validate?(values: FormValues, state: FormState, props: FormProps): FormErrors;
+    onValidationFail?(values: FormValues, state: FormState, props: FormProps, self: Form): void;
+    onChange?(state: FormState, props: FormProps, initial: boolean | FormProps, self: Form): void;
+    saveState?(state: FormState, props: FormProps, self: Form): void;
+    willUnmount?(state: FormState, props: FormProps, self: Form): void;
+    preSubmit?(values: FormValues, state: FormState, props: FormProps, self: Form): FormValues;
+    onSubmit?(values: FormValues, state: FormState, props: FormProps, self: Form): void;
+    postSubmit?(values: FormValues, state: FormState, props: FormProps, self: Form): void;
+}
+
+export interface FormState {
+    values: FormValues;
+    touched: Touched;
+    errors: FormErrors;
+    nestedErrors: NestedErrors;
+    dirty?: boolean;
+}
+
+export const FormDefaultProps: FormProps;
+
+export interface FormApi {
+    setAllValues(values: FormValues, noTouch?: boolean): void;
+    setValue(field: string, value: any, noTouch?: boolean): void;
+    getValue(field: string, fallback?: any): any;
+    setNestedError(field: string, value?: boolean): void;
+    getError(field: string): FormError;
+    setTouched(field: string, value?: boolean): void;
+    getTouched(field: string): boolean;
+    addValue(field: string, value: any): void;
+    removeValue(field: string, index: number): void;
+    swapValues(field: string, index: number, destIndex: number): void;
+    setAllTouched(dirty?: boolean, state?: Partial<FormState>): void;
+    resetForm(): void;
+    submitForm(e?: Pick<React.SyntheticEvent<any>, 'preventDefault'>): void;
+}
+
+export interface FormFunctionProps extends FormProps, FormState, FormApi {}
+
+export interface FormContext {
+    formApi: FormApi;
+}
+
+export class Form
+    extends React.Component<
+        FormProps & { children?: ((props: FormFunctionProps) => RenderReturn) | RenderReturn },
+        FormState
+    >
+    implements FormApi, React.ChildContextProvider<FormContext> {
+        static defaultProps: FormProps;
+        static childContextTypes: {
+            formApi: React.Validator<any>
+        };
+
+        getDefaultState(): FormState;
+        getChildContext(): FormContext;
+        componentWillMount(): void;
+        componentWillReceiveProps(nextProps: Readonly<Partial<FormProps>>, nextContext: any): void;
+        componentWillUmount(): void;
+
+        // API
+        setAllValues(values: FormValues, noTouch?: boolean): void;
+        setValue(field: string, value: any, noTouch?: boolean): void;
+        getValue(field: string, fallback?: any): any;
+        setNestedError(field: string, value?: boolean): void;
+        getError(field: string): FormError;
+        setTouched(field: string, value?: boolean): void;
+        getTouched(field: string): boolean;
+        addValue(field: string, value: any): void;
+        removeValue(field: string, index: number): void;
+        swapValues(field: string, index: number, destIndex: number): void;
+        setAllTouched(dirty?: boolean, state?: Partial<FormState>): void;
+        resetForm(): void;
+        submitForm(e?: Pick<React.SyntheticEvent<any>, 'preventDefault'>): void;
+
+        // Utils
+        getAPI(): FormApi;
+        setFormState(newState: Partial<FormState>, silent?: boolean): void;
+        emitChange(state: FormState, initial?: boolean): void;
+        validate(values: FormValues, state: FormState, props: FormProps): FormErrors;
+        render(): RenderReturn;
+    }
+
+export interface FormFieldApi {
+    setAllValues(values: FormValues, noTouch?: boolean): void;
+    setValue(value: any, noTouch?: boolean): void;
+    getValue(fallback?: any): any;
+    setNestedError(value?: boolean): void;
+    getError(): FormError;
+    setTouched(value?: boolean): void;
+    getTouched(): boolean;
+    addValue(value: any): void;
+    removeValue(index: number): void;
+    swapValues(index: number, destIndex: number): void;
+    setAllTouched(dirty?: boolean, state?: Partial<FormState>): void;
+    resetForm(): void;
+    submitForm(e?: Pick<React.SyntheticEvent<any>, 'preventDefault'>): void;
+}
+
+export interface FormFieldPropsWithField {
+    field?: string;
+    children(api: FormFieldApi): React.ReactElement<any> | null;
+}
+export interface FormFieldPropsWithoutField {
+    children(api: FormApi): RenderReturn;
+}
+export type FormFieldProps = FormFieldPropsWithField | FormFieldPropsWithoutField;
+export const FormField: React.SFC<FormFieldProps>;
+
+// FormError
+export interface FormErrorProps {
+    field?: FormFieldPropsWithField['field'];
+    className?: string;
+    style?: React.HTMLAttributes<HTMLElement>['style'];
+}
+export const FormError: React.SFC<FormErrorProps>;
+
+export interface FormInputProps {
+    field?: FormFieldPropsWithField['field'];
+    showErrors?: boolean;
+    errorBefore?: boolean;
+    isForm?: boolean;
+    className?: string;
+    errorProps?: FormErrorProps;
+}
+
+export interface FormInputPropsWithChildren extends FormInputProps {
+    children(api: FormFieldApi): React.ReactElement<any> | null;
+}
+export const FormInput: React.SFC<FormInputPropsWithChildren>;
+
+// ==============================
+//             Inputs
+// ==============================
+
+export type EventHandler<T, E> = (e: E, cb: () => void) => void;
+export type ChangeHandler<T> = EventHandler<T, React.ChangeEvent<T>>;
+export type FocusHandler<T> = EventHandler<T, React.FocusEvent<T>>;
+export type ClickHandler<T> = EventHandler<T, React.MouseEvent<T>>;
+
+// Prop interfaces are intermediate interfaces to "redefine" the type of some events
+// onChange:React.EventHandler => onChange:any => onChange:CustomEventHandler
+
+export interface SelectOption {
+    label: string;
+    value: any;
+    disabled?: boolean;
+}
+export interface SelectAttrs extends React.SelectHTMLAttributes<HTMLSelectElement> {
+    onChange?: any;
+    onBlur?: any;
+}
+export interface SelectProps extends SelectAttrs {
+    options: ReadonlyArray<SelectOption>;
+    field?: FormInputProps['field'];
+    showErrors?: FormInputProps['showErrors'];
+    errorBefore?: FormInputProps['errorBefore'];
+    onChange?: ChangeHandler<HTMLSelectElement>;
+    onBlur?: FocusHandler<HTMLSelectElement>;
+    isForm?: FormInputProps['isForm'];
+    noTouch?: boolean;
+    errorProps?: FormInputProps['errorProps'];
+    placeholder?: string;
+}
+export const Select: React.SFC<SelectProps>;
+
+export interface InputAttrs extends React.InputHTMLAttributes<HTMLInputElement> {
+    onChange?: any;
+    onBlur?: any;
+}
+export interface CheckboxProps extends InputAttrs {
+    field?: FormInputProps['field'];
+    showErrors?: FormInputProps['showErrors'];
+    errorBefore?: FormInputProps['errorBefore'];
+    onChange?: ChangeHandler<HTMLInputElement>;
+    onBlur?: FocusHandler<HTMLInputElement>;
+    isForm?: FormInputProps['isForm'];
+    noTouch?: boolean;
+    errorProps?: FormInputProps['errorProps'];
+}
+export const Checkbox: React.SFC<CheckboxProps>;
+
+export interface TextareaAttrs extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
+    onChange?: any;
+    onBlur?: any;
+}
+export interface TextareaProps extends TextareaAttrs {
+    field?: FormInputProps['field'];
+    showErrors?: FormInputProps['showErrors'];
+    errorBefore?: FormInputProps['errorBefore'];
+    onChange?: ChangeHandler<HTMLTextAreaElement>;
+    onBlur?: FocusHandler<HTMLTextAreaElement>;
+    isForm?: FormInputProps['isForm'];
+    noTouch?: boolean;
+    errorProps?: FormInputProps['errorProps'];
+}
+export const Textarea: React.SFC<TextareaProps>;
+
+export interface NestedFormProps extends FormProps {
+    field?: FormInputProps['field'];
+    children?: React.ReactElement<FormProps> | [React.ReactElement<FormProps>];
+    errorProps?: FormInputProps['errorProps'];
+}
+export const NestedForm: React.SFC<NestedFormProps>;
+
+export interface TextProps extends InputAttrs {
+    field?: FormInputProps['field'];
+    showErrors?: FormInputProps['showErrors'];
+    errorBefore?: FormInputProps['errorBefore'];
+    onChange?: ChangeHandler<HTMLInputElement>;
+    onBlur?: FocusHandler<HTMLInputElement>;
+    isForm?: FormInputProps['isForm'];
+    noTouch?: boolean;
+    errorProps?: FormInputProps['errorProps'];
+}
+export const Text: React.SFC<TextProps>;
+
+export interface RadioGroupProps {
+    field?: FormInputProps['field'];
+    showErrors?: FormInputProps['showErrors'];
+    errorBefore?: FormInputProps['errorBefore'];
+    isForm?: FormInputProps['isForm'];
+    errorProps?: FormInputProps['errorProps'];
+}
+export interface RadioGroupContext {
+    formRadioGroup: RadioGroup;
+}
+export class RadioGroup extends React.Component<RadioGroupProps> implements FormFieldApi {
+    static childContextTypes: {
+        formRadioGroup: React.Validator<any>
+    };
+
+    setAllValues: FormFieldApi['setAllValues'];
+    setValue: FormFieldApi['setValue'];
+    getValue: FormFieldApi['getValue'];
+    setNestedError: FormFieldApi['setNestedError'];
+    getError: FormFieldApi['getError'];
+    setTouched: FormFieldApi['setTouched'];
+    getTouched: FormFieldApi['getTouched'];
+    addValue: FormFieldApi['addValue'];
+    removeValue: FormFieldApi['removeValue'];
+    swapValues: FormFieldApi['swapValues'];
+    setAllTouched: FormFieldApi['setAllTouched'];
+    resetForm: FormFieldApi['resetForm'];
+    submitForm: FormFieldApi['submitForm'];
+
+    getChildContext(): RadioGroupContext;
+}
+
+export interface InputWIthoutClick extends InputAttrs {
+    onClick?: any;
+}
+export interface RadioProps extends InputWIthoutClick {
+    onClick?: ClickHandler<HTMLInputElement>;
+    onChange?: ChangeHandler<HTMLInputElement>;
+    onBlur?: FocusHandler<HTMLInputElement>;
+}
+export class Radio extends React.Component<RadioProps> {
+    static contextTypes: {
+        formRadioGroup: React.Validator<any>
+    };
+
+    context: RadioGroupContext;
+}
diff --git a/types/react-form/v1/react-form-tests.tsx b/types/react-form/v1/react-form-tests.tsx
new file mode 100644
index 0000000000..aad7f1b92f
--- /dev/null
+++ b/types/react-form/v1/react-form-tests.tsx
@@ -0,0 +1,78 @@
+import * as React from 'react';
+import {
+		Form,
+		FormError,
+		FormInput,
+
+		// Inputs
+		Select,
+		Checkbox,
+		Textarea,
+		NestedForm,
+		Text,
+		RadioGroup,
+		Radio
+} from 'react-form';
+
+<Form />;
+
+<Form>
+		{() => null}
+</Form>;
+
+<Form>
+		{() => <div/>}
+</Form>;
+
+<Form>
+		{ ({ submitForm }) => <button onClick={submitForm}>Submit</button> }
+</Form>;
+
+<FormError field="" />;
+
+const CustomInput: React.SFC<React.HTMLAttributes<HTMLInputElement> & {field?: string}> =
+		({field, ...rest}) => {
+				return (
+						<FormInput field={field}>
+								{({ setValue, getValue, setTouched }) => {
+										return (
+												<input
+														{...rest}
+														value={getValue()}
+														onChange={(e) => setValue(e.target.value)}
+														onBlur={() => setTouched(true)}
+												/>
+										);
+								}}
+						</FormInput>
+				);
+		};
+
+const events = {
+		onChange: (e: React.SyntheticEvent<HTMLElement>, cb: () => void): null => null,
+		onBlur: (e: React.SyntheticEvent<HTMLElement>, cb: () => void): null => null
+};
+const onClick = (e: React.SyntheticEvent<HTMLElement>, cb: () => void): null => null;
+
+<Select options={[]} />;
+<Select field="" options={[{label: '', value: '', disabled: false}]} {...events} />;
+
+<Checkbox />;
+<Checkbox field="" checked={false} {...events} />;
+
+<Textarea />;
+<Textarea field="" {...events} />;
+
+<Form>
+		<NestedForm>
+				<Form />
+		</NestedForm>
+</Form>;
+
+<Text />;
+<Text field="" {...events} />;
+
+<RadioGroup field="">
+		<Radio />
+		<Radio {...events} onClick={onClick}  />
+</RadioGroup>;
diff --git a/types/react-form/v1/tsconfig.json b/types/react-form/v1/tsconfig.json
new file mode 100644
index 0000000000..c1691ba3b1
--- /dev/null
+++ b/types/react-form/v1/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6",
+          "dom"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../../",
+      "jsx": "react",
+      "typeRoots": [
+          "../../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true,
+      "paths": {
+        "react-form": [
+            "react-form/v1"
+        ]
+      }
+  },
+  "files": [
+      "index.d.ts",
+      "react-form-tests.tsx"
+  ]
+}
\ No newline at end of file
diff --git a/types/react-form/v1/tslint.json b/types/react-form/v1/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-form/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/react-foundation/utils.d.ts b/types/react-foundation/utils.d.ts
index b80b4879b0..ecb1abd683 100644
--- a/types/react-foundation/utils.d.ts
+++ b/types/react-foundation/utils.d.ts
@@ -7,7 +7,6 @@ export interface ClassNameProps {
 /**
  * Property types for general properties.
  *
- * @returns {Object}
  */
 export declare const GeneralPropTypes: {
     showFor: PropTypes.Requireable<any>;
@@ -40,8 +39,6 @@ export interface GeneralPropTypes extends ClassNameProps {
 /**
  * Creates class names from the given arguments.
  *
- * @param {*} args
- * @returns {string}
  */
 export declare function createClassName(...args: any[]): string;
 /**
@@ -78,46 +75,32 @@ export declare function objectKeys(object: object): string[];
  * Returns the values for the given object.
  * This method is used for getting the values for enumerables.
  *
- * @param {Object} object
- * @returns {Array}
  */
 export declare function objectValues(object: object): any[];
 /**
  * Removes properties from the given object.
  * This method is used for removing valid attributes from component props prior to rendering.
  *
- * @param {Object} object
- * @param {Array} remove
- * @returns {Object}
  */
 export declare function removeProps(object: object, remove: string[]): object;
 /**
  * Returns whether or not the given value is defined.
  *
- * @param {*} value
- * @returns {boolean}
  */
 export declare function isDefined(value: any): boolean;
 /**
  * Adds a breakpoint to a class if breakpoint is specified.
  *
- * @param {String} prop
- * @param {String} size
- * @returns {string}
  */
 export declare function addBreakpoint(prop: string, size: string): string;
 /**
  * Sets direction for grid and gutters (horizontal or vertical).
  *
- * @param {boolean} isVertical
- * @param {String} gutters
- * @returns {string}
  */
 export declare function setDirection(isVertical?: boolean, gutters?: string | null): string;
 /**
  * Property types for flexbox utilities.
  *
- * @returns {Object}
  */
 export declare const FlexboxPropTypes: {
     alignX: PropTypes.Requireable<any>;
@@ -156,8 +139,6 @@ export interface FlexboxPropTypes extends GeneralPropTypes {
 /**
  * Parses the flexbox class names from the given properties.
  *
- * @param {Object} props
- * @returns {Object}
  */
 export declare function flexboxClassNames(props: FlexboxPropTypes): {
     [name: string]: boolean | undefined;
diff --git a/types/react-ga/index.d.ts b/types/react-ga/index.d.ts
deleted file mode 100644
index 83d7a7218e..0000000000
--- a/types/react-ga/index.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for react-ga 2.1
-// Project: https://github.com/react-ga/react-ga
-// Definitions by: Tim Aldridge <https://github.com/telshin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export interface EventArgs {
-    category: string;
-    action: string;
-    label?: string;
-    value?: number;
-    nonInteraction?: boolean;
-}
-
-export interface GaOptions {
-    name?: string;
-    clientId?: string;
-    sampleRate?: number;
-    siteSpeedSampleRate?: number;
-    alwaysSendReferrer?: boolean;
-    allowAnchor?: boolean;
-    cookieName?: string;
-    cookieDomain?: string;
-    cookieExpires?: number;
-    legacyCookieDomain?: string;
-    legacyHistoryImport?: boolean;
-    allowLinker?: boolean;
-    userId?: string;
-}
-
-export interface InitializeOptions {
-    debug?: boolean;
-    titleCase?: boolean;
-    gaOptions?: GaOptions;
-}
-
-export interface FieldsObject {
-    [i: string]: any;
-}
-
-export interface TimingArgs {
-    category: string;
-    variable: string;
-    value: number;
-    label?: string;
-}
-
-export interface Plugin {
-    require(name: string, options: any): void;
-    execute(pluginName: string, action: string, actionTypeOrPayload: string|any, payload?: any): void;
-}
-
-export interface OutboundLinkArgs {
-    label: string;
-}
-
-export function initialize(trackingCode: string, options?: InitializeOptions): void;
-export function ga(): any;
-export function set(fieldsObject: FieldsObject): void;
-export function send(fieldsObject: FieldsObject): void;
-export function pageview(path: string): void;
-export function modalview(name: string): void;
-export function timing(args: TimingArgs): void;
-export function event(args: EventArgs): void;
-export function exception(fieldsObject: FieldsObject): void;
-export const plugin: Plugin;
-export function outboundLink(args: OutboundLinkArgs, hitCallback: () => void): void;
diff --git a/types/react-ga/react-ga-tests.ts b/types/react-ga/react-ga-tests.ts
deleted file mode 100644
index dbc1d0970c..0000000000
--- a/types/react-ga/react-ga-tests.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import * as ga from "react-ga";
-
-declare function describe(desc: string, f: () => void): void;
-declare function it(desc: string, f: () => void): void;
-
-describe("Testing react-ga initialize object", () => {
-    it("Able to initialize react-ga object", () => {
-        ga.initialize("UA-65432-1");
-    });
-    it("Able to initailize react-ga object", () => {
-        const options: ga.InitializeOptions = {
-            debug: true,
-        };
-
-        ga.initialize("UA-65432-1", options);
-    });
-});
-
-describe("Testing react-ga pageview calls", () => {
-    it("Able to make pageview calls", () => {
-        ga.initialize("UA-65432-1");
-        ga.pageview("http://telshin.com");
-    });
-});
-
-describe("Testing react-ga modal calls", () => {
-    it("Able to make modal calls", () => {
-        ga.initialize("UA-65432-1");
-
-        ga.modalview("Test modal");
-    });
-});
-
-describe("Testing react-ga event calls", () => {
-    it("Able to make event calls", () => {
-        ga.initialize("UA-65432-1");
-
-        const options: ga.EventArgs = {
-            category: "Test",
-            action: "CI",
-            label: "Running Jasmine tests for react-ga typscript library",
-            value: 4,
-            nonInteraction: true,
-        };
-
-        ga.event(options);
-    });
-});
-
-describe("Testing react-ga set calls", () => {
-    it("Able to make set calls", () => {
-        ga.initialize("UA-65432-1");
-
-        const fieldObject: ga.FieldsObject = {
-            page: '/users'
-        };
-
-        ga.set(fieldObject);
-    });
-});
-
-describe("Testing react-ga v2.1.2", () => {
-    it("Able to make ga calls", () => {
-        ga.ga();
-    });
-    it("Able to make send calls", () => {
-        const fieldObject: ga.FieldsObject = {
-            page: '/users'
-        };
-
-        ga.send(fieldObject);
-    });
-    it("Able to make timing calls", () => {
-        ga.timing({
-            category: 'string',
-            variable: 'string',
-            value: 1,
-            label: 'string'
-        });
-    });
-    it("Able to make exception calls", () => {
-        const fieldObject: ga.FieldsObject = {
-            page: '/users'
-        };
-        ga.exception(fieldObject);
-    });
-    it("Able to make plugin object calls", () => {
-        const execute = ga.plugin.execute;
-        const require = ga.plugin.require;
-        const payload = {};
-
-        execute('name', 'action', payload);
-        execute('name', 'action', 'type', payload);
-        require('name', {});
-    });
-    it("Able to make outboundLink calls", () => {
-        ga.outboundLink({label: 'string'}, () => {});
-    });
-});
diff --git a/types/react-ga/tsconfig.json b/types/react-ga/tsconfig.json
deleted file mode 100644
index e3bfb3b9b0..0000000000
--- a/types/react-ga/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "react-ga-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-ga/tslint.json b/types/react-ga/tslint.json
deleted file mode 100644
index b1439230db..0000000000
--- a/types/react-ga/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODO
-        "no-any-union": false
-    }
-}
diff --git a/types/react-google-recaptcha/index.d.ts b/types/react-google-recaptcha/index.d.ts
new file mode 100644
index 0000000000..fee09c3ec8
--- /dev/null
+++ b/types/react-google-recaptcha/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for React Google Recaptcha 0.9
+// Project: https://github.com/dozoisch/react-google-recaptcha
+// Definitions by: Koala Human <https://github.com/KoalaHuman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export default ReCAPTCHA;
+
+declare class ReCAPTCHA extends React.Component<ReCAPTCHAProps> {
+	/**
+	 * Resets the reCAPTCHA widget
+	 */
+	reset(): void;
+	/**
+	 * Programatically invoke the reCAPTCHA check. Used if the invisible reCAPTCHA is on a div instead of a button
+	 */
+	execute(): void;
+
+	/**
+	 * Gets the response for the reCAPTCHA widget.
+	 * @return the response of the reCAPTCHA widget.
+	 */
+	getValue(): string | null;
+
+	/**
+	 * Gets the widgetId of reCAPTCHA widget
+	 * @return widgetId | null
+	 */
+	getWidgetId(): number | null;
+}
+
+type Theme = "light" | "dark";
+type Type = "image" | "audio";
+type Size = "compact" | "normal" | "invisible";
+type Badge = "bottomright" | "bottomleft" | "inline";
+
+export interface ReCAPTCHAProps {
+	/**
+	 *  The API client key
+	 */
+	sitekey: string;
+	/**
+	 *  The function to be called when the user successfully completes the captcha. It will also be called
+	 *  with null, when captcha expires
+	 *  @param token string or null
+	 */
+	onChange: (token: string|null) => void;
+	/**
+	 *  Optional light or dark theme of the widget
+	 *  @default "light"
+	 */
+	theme?: Theme;
+	/**
+	 * Optional image or audio The type of initial captcha
+	 * @default "image"
+	 */
+	type?: Type;
+	/**
+	 *  Optional the tabindex of the element
+	 *  @default 0
+	 */
+	tabindex?: number;
+	/**
+	 *  Optional callback, called when a challenge expires and has to be redone by the user.
+	 */
+	onExpired?: () => void;
+	/**
+	 *  Optional set the stoken parameter, which allows the captcha to be used from different domains,
+	 *  @see reCAPTCHA secure-token
+	 */
+	stoken?: string;
+	/**
+	 *  Optional compact, normal or invisible. This allows you to change the size or do an invisible captcha
+	 */
+	size?: Size;
+	/**
+	 * Optional. The badge location for g-recaptcha with size of "invisible".
+	 *
+	 * @default "bottomright"
+	 */
+	badge?: Badge;
+}
diff --git a/types/react-google-recaptcha/react-google-recaptcha-tests.tsx b/types/react-google-recaptcha/react-google-recaptcha-tests.tsx
new file mode 100644
index 0000000000..b3e60d538b
--- /dev/null
+++ b/types/react-google-recaptcha/react-google-recaptcha-tests.tsx
@@ -0,0 +1,8 @@
+import ReCAPTCHA from 'react-google-recaptcha';
+import * as ReactDOM from 'react-dom';
+import * as React from 'react';
+
+ReactDOM.render(
+	<ReCAPTCHA sitekey="xxx" onChange={a => a}/>,
+	document.getElementById('example')
+);
diff --git a/types/react-google-recaptcha/tsconfig.json b/types/react-google-recaptcha/tsconfig.json
new file mode 100644
index 0000000000..bbd1cfd004
--- /dev/null
+++ b/types/react-google-recaptcha/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "jsx": "react",
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-google-recaptcha-tests.tsx"
+    ]
+}
diff --git a/types/react-google-recaptcha/tslint.json b/types/react-google-recaptcha/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-google-recaptcha/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-grid-layout/index.d.ts b/types/react-grid-layout/index.d.ts
index bf3f5805d9..8dddb624d1 100644
--- a/types/react-grid-layout/index.d.ts
+++ b/types/react-grid-layout/index.d.ts
@@ -64,6 +64,11 @@ declare namespace ReactGridLayout {
          */
         maxH?: number;
 
+        /**
+         * set by DragEvents (onDragStart, onDrag, onDragStop) and ResizeEvents (onResizeStart, onResize, onResizeStop)
+         */
+        moved?: boolean;
+
         /**
          * If true, equal to `isDraggable: false` and `isResizable: false`.
          */
@@ -135,7 +140,7 @@ declare namespace ReactGridLayout {
         /**
          * Compaction type.
          */
-        compactType?: "vertical" | "horizontal";
+        compactType?: "vertical" | "horizontal" | null;
 
         /**
          * This allows setting the initial width on the server side.
@@ -168,6 +173,16 @@ declare namespace ReactGridLayout {
          */
         isResizable?: boolean;
 
+        /**
+         * Enable or disable grid rearrangement when dragging/resizing an element.
+         */
+        isRearrangeable?: boolean;
+
+        /**
+         * If true, grid items won't change position when being dragged over.
+         */
+        preventCollision?: boolean;
+
         /**
          * Uses CSS3 `translate()` instead of position top/left.
          * This makes about 6x faster paint performance.
diff --git a/types/react-hamburger-menu/react-hamburger-menu-tests.tsx b/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
index d9a6b34463..dd0f6e20d3 100644
--- a/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
+++ b/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
@@ -19,7 +19,7 @@ export class ReactHamburgerMenuTest extends React.PureComponent<{}, State> {
         return <HamburgerMenu {...props}/>;
     }
 
-    private menuClicked = (): void => this.setState({isOpen: !this.state.isOpen});
+    private readonly menuClicked = (): void => this.setState({isOpen: !this.state.isOpen});
 }
 
 interface State {
diff --git a/types/react-helmet/tslint.json b/types/react-helmet/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-helmet/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-helmet/v4/tslint.json b/types/react-helmet/v4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-helmet/v4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-holder/tslint.json b/types/react-holder/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-holder/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-hot-loader/index.d.ts b/types/react-hot-loader/index.d.ts
index ecf84d2ffe..6bd1234259 100644
--- a/types/react-hot-loader/index.d.ts
+++ b/types/react-hot-loader/index.d.ts
@@ -13,6 +13,7 @@ interface ErrorReporterProps {
 export interface AppContainerProps {
   children?: React.ReactElement<any>,
   errorReporter?: React.ComponentClass<ErrorReporterProps> | React.StatelessComponent<ErrorReporterProps>
+  warnings?: boolean
 }
 
 export class AppContainer extends React.Component<AppContainerProps, React.ComponentState> {}
diff --git a/types/react-hot-loader/tslint.json b/types/react-hot-loader/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-hot-loader/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-hyperscript/index.d.ts b/types/react-hyperscript/index.d.ts
new file mode 100644
index 0000000000..207ffe18ce
--- /dev/null
+++ b/types/react-hyperscript/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for react-hyperscript 3.0
+// Project: https://github.com/mlmorg/react-hyperscript
+// Definitions by: tock203 <https://github.com/tock203>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ComponentClass, StatelessComponent, ReactElement } from 'react';
+
+declare namespace h {}
+
+type Element = ReactElement<any> | string | number | null;
+
+declare function h(
+    componentOrTag: ComponentClass | StatelessComponent | string,
+    children?: ReadonlyArray<Element> | Element
+): ReactElement<any>;
+
+declare function h<P extends {[attr: string]: any}>(
+    componentOrTag: ComponentClass<P> | StatelessComponent<P> | string,
+    properties: P,
+    children?: ReadonlyArray<Element> | Element
+): ReactElement<P>;
+
+export = h;
diff --git a/types/react-hyperscript/react-hyperscript-tests.ts b/types/react-hyperscript/react-hyperscript-tests.ts
new file mode 100644
index 0000000000..4be72a9b6a
--- /dev/null
+++ b/types/react-hyperscript/react-hyperscript-tests.ts
@@ -0,0 +1,47 @@
+import * as React from 'react';
+import * as h from 'react-hyperscript';
+
+interface PropTypes {
+    foo: string;
+}
+
+class SomeComponent extends React.Component<PropTypes> {
+    render() {
+        return React.createElement('div');
+    }
+}
+
+const StatelessComponent: React.StatelessComponent<PropTypes> = () => React.createElement('div');
+
+class MainComponent extends React.Component {
+    render() {
+        return h('div.example', [
+            h('h1#heading', 'This is hyperscript'),
+            h('h2', 'creating React.js markup'),
+            h(SomeComponent, {foo: 'bar'}, [
+                h('li', [
+                    h('a', {href: 'http://whatever.com'}, 'One list item')
+                ]),
+                h('li', 'Another list item')
+            ]),
+            h(StatelessComponent, {foo: 'bar'}, [
+                h('li', [
+                    h('a', {href: 'http://whatever.com'}, 'One list item')
+                ]),
+                h('li', 'Another list item')
+            ]),
+            h('img', {src: 'https://example.com/some-image'}),
+            h('span', 1234)
+        ]);
+    }
+}
+
+class MixedComponent extends React.Component {
+    render() {
+        return h('div', {className: 'some class'}, [
+            null,
+            h('span', 'some tag'),
+            'some text node'
+        ]);
+    }
+}
diff --git a/types/react-hyperscript/tsconfig.json b/types/react-hyperscript/tsconfig.json
new file mode 100644
index 0000000000..1ad5f62543
--- /dev/null
+++ b/types/react-hyperscript/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-hyperscript-tests.ts"
+    ]
+}
diff --git a/types/react-hyperscript/tslint.json b/types/react-hyperscript/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-hyperscript/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-i18next/index.d.ts b/types/react-i18next/index.d.ts
index d7bb05a30f..9831c0b049 100644
--- a/types/react-i18next/index.d.ts
+++ b/types/react-i18next/index.d.ts
@@ -1,11 +1,21 @@
-// Type definitions for react-i18next 4.6
+// Type definitions for react-i18next 7.3
 // Project: https://github.com/i18next/react-i18next
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+//                 Simon Baumann <https://github.com/chnoch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import { TranslationFunction } from "i18next";
 
+import {
+    setDefaults,
+    getDefaults,
+    setI18n,
+    getI18n,
+    ReactI18NextOptions,
+    reactI18nextModule
+} from "./src/context";
+import I18n from "./src/I18n";
 import I18nextProvider from "./src/I18nextProvider";
 import Interpolate from "./src/interpolate";
 import loadNamespaces from "./src/loadNamespaces";
@@ -13,25 +23,21 @@ import Trans from "./src/trans";
 import translate from "./src/translate";
 
 export {
+    setDefaults,
+    getDefaults,
+    setI18n,
+    getI18n,
+    ReactI18NextOptions,
+    reactI18nextModule,
+    I18n,
     I18nextProvider,
     Interpolate,
     loadNamespaces,
     Trans,
     translate,
-    // Exports for TypeScript only
     TranslationFunction
 };
 
-/**
- * Extend your component's Prop interface with this one to get access to `this.props.t`
- *
- * Please note that if you use the `translateFuncName` option, you should create
- * your own interface just like this one, but with your name of the translation function.
- *
- * interface MyComponentProps extends ReactI18next.InjectedTranslateProps {}
- */
-export interface InjectedTranslateProps {
-    t?: TranslationFunction;
-}
+export { InjectedI18nProps, InjectedTranslateProps } from "./src/props";
 
 export as namespace reactI18Next;
diff --git a/types/react-i18next/src/I18n.d.ts b/types/react-i18next/src/I18n.d.ts
new file mode 100644
index 0000000000..122249c6e8
--- /dev/null
+++ b/types/react-i18next/src/I18n.d.ts
@@ -0,0 +1,21 @@
+import * as React from "react";
+import { i18n, TranslationFunction } from "i18next";
+
+export interface Options {
+    i18n: i18n;
+    t: TranslationFunction;
+}
+
+export interface i18nProps {
+    wait?: boolean;
+    ns: string | string[];
+    nsMode?: string;
+    bindI18n?: string;
+    bindStore?: string;
+    i18n?: i18n;
+    initialI18nStore?: any;
+    initialLanguage?: string;
+    children: (t: TranslationFunction, options: Options) => JSX.Element;
+}
+
+export default class I18n extends React.Component<i18nProps> { }
diff --git a/types/react-i18next/src/I18nextProvider.d.ts b/types/react-i18next/src/I18nextProvider.d.ts
index 2ecb87f4a1..2cd4e333e3 100644
--- a/types/react-i18next/src/I18nextProvider.d.ts
+++ b/types/react-i18next/src/I18nextProvider.d.ts
@@ -4,9 +4,9 @@ import { i18n } from "i18next";
 // tslint:disable-next-line:interface-name
 export interface I18nextProviderProps {
     i18n: i18n;
-    children: React.ReactElement<any>;
     initialI18nStore?: any;
     initialLanguage?: string;
+    children: JSX.Element;
 }
 
 export default class I18nextProvider extends React.Component<I18nextProviderProps> { }
diff --git a/types/react-i18next/src/context.d.ts b/types/react-i18next/src/context.d.ts
new file mode 100644
index 0000000000..f772e8c1da
--- /dev/null
+++ b/types/react-i18next/src/context.d.ts
@@ -0,0 +1,26 @@
+import { i18n } from "i18next";
+
+export interface ReactI18NextOptions {
+    wait?: boolean;
+    withRef?: boolean;
+    bindI18n?: string;
+    bindStore?: string;
+    translateFuncName?: string;
+    nsMode?: string;
+}
+
+export function setDefaults(options: ReactI18NextOptions): void;
+
+export function getDefaults(): ReactI18NextOptions;
+
+export function setI18n(instance: i18n): void;
+
+export function getI18n(): i18n;
+
+export interface i18NextModule {
+    type: string;
+
+    init: (instance: i18n) => void;
+}
+
+export const reactI18nextModule: i18NextModule;
diff --git a/types/react-i18next/src/interpolate.d.ts b/types/react-i18next/src/interpolate.d.ts
index e6f07893ed..d6a4e64420 100644
--- a/types/react-i18next/src/interpolate.d.ts
+++ b/types/react-i18next/src/interpolate.d.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { InterpolationOptions } from "i18next";
+import { i18n, InterpolationOptions, TranslationFunction } from "i18next";
 
 export type InterpolateValue = string | JSX.Element;
 
@@ -12,6 +12,8 @@ export interface InterpolatePropsBase {
     i18nKey?: string;
     className?: string;
     style?: React.CSSProperties;
+    i18n?: i18n;
+    t?: TranslationFunction;
 }
 
 export interface OtherInterpolateProps {
@@ -20,4 +22,4 @@ export interface OtherInterpolateProps {
 
 export type InterpolateProps = InterpolatePropsBase & OtherInterpolateProps;
 
-export default class Interpolate extends React.Component<InterpolateProps> { }
+export default class Interpolate extends React.PureComponent<InterpolateProps> { }
diff --git a/types/react-i18next/src/props.d.ts b/types/react-i18next/src/props.d.ts
new file mode 100644
index 0000000000..62a201049a
--- /dev/null
+++ b/types/react-i18next/src/props.d.ts
@@ -0,0 +1,24 @@
+import {i18n as I18n, TranslationFunction} from "i18next";
+
+/**
+ * Extend your component's Prop interface with this one to get access to `this.props.t`
+ *
+ * Please note that if you use the `translateFuncName` option, you should create
+ * your own interface just like this one, but with your name of the translation function.
+ *
+ * interface MyComponentProps extends ReactI18next.InjectedTranslateProps {}
+ * 
+ * Then specify the name of the translate function as generic argument
+ * 
+ * const translated = translate<string, "_">("view", { translateFuncName: "_" })(YourComponent);
+ */
+export interface InjectedTranslateProps {
+    t: TranslationFunction;
+}
+
+/**
+ * Extend your component's Prop interface with this one to get access to `this.props.i18n`
+ */
+export interface InjectedI18nProps {
+    i18n: I18n
+}
diff --git a/types/react-i18next/src/trans.d.ts b/types/react-i18next/src/trans.d.ts
index 384e1605f9..8b12c81fc9 100644
--- a/types/react-i18next/src/trans.d.ts
+++ b/types/react-i18next/src/trans.d.ts
@@ -1,8 +1,12 @@
 import * as React from "react";
+import { i18n, TranslationFunction } from "i18next";
 
 export interface TransProps {
     i18nKey?: string;
-    [name: string]: any;
+    count?: number;
+    parent?: string;
+    i18n?: i18n;
+    t?: TranslationFunction;
 }
 
 export default class Trans extends React.Component<TransProps> { }
diff --git a/types/react-i18next/src/translate.d.ts b/types/react-i18next/src/translate.d.ts
index d41b4dc00a..0711d3895d 100644
--- a/types/react-i18next/src/translate.d.ts
+++ b/types/react-i18next/src/translate.d.ts
@@ -1,15 +1,64 @@
 import * as React from "react";
-import { i18n } from "i18next";
+import { i18n as I18n, TranslationFunction } from "i18next";
+import { InjectedTranslateProps, InjectedI18nProps } from "./props";
+import { setDefaults, setI18n } from "./context";
 
-export interface TranslateOptions {
+export interface TranslateOptions<TTranslateFuncName extends string = string> {
     withRef?: boolean;
     bindI18n?: string;
     bindStore?: string;
-    translateFuncName?: string;
+    translateFuncName?: TTranslateFuncName;
     wait?: boolean;
     nsMode?: string;
-    i18n?: i18n;
+    i18n?: I18n;
 }
 
-// tslint:disable-next-line:ban-types
-export default function translate<TKey extends string = string>(namespaces?: TKey[] | TKey, options?: TranslateOptions): <C extends Function>(WrappedComponent: C) => C;
+export interface TranslateHocProps {
+    i18n?: I18n;
+    initialI18nStore?: object;
+    initialLanguage?: string;
+}
+
+// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
+type Diff<T extends string, U extends string> = ({[P in T]: P } & {[P in U]: never } & { [x: string]: never })[T];
+type Omit<T, K extends string> = Pick<T, Diff<keyof T, K>>;
+
+type InjectedProps = InjectedI18nProps & InjectedTranslateProps;
+
+export interface WrapperComponentClass<P = {}, PWrapped = {}> extends React.ComponentClass<P & TranslateHocProps> {
+    new (props: P, context?: any): React.Component<P & TranslateHocProps, React.ComponentState> & { getWrappedInstance(): React.Component<PWrapped> };
+}
+
+// Injects props and removes them from the prop requirements.
+// Adds the new properties t (or whatever the translation function is called) and i18n if needed.
+export type InferableComponentEnhancerWithProps<TTranslateFunctionName extends string> =
+    <P extends {}>(component: React.ComponentClass<P> | React.StatelessComponent<P>) =>
+        React.ComponentClass<Omit<P, keyof InjectedI18nProps | TTranslateFunctionName> & TranslateHocProps>;
+
+export type InferableComponentEnhancerWithPropsAndRef<TTranslateFunctionName extends string> =
+    <P extends {}>(component: React.ComponentClass<P> | React.StatelessComponent<P>) =>
+        WrapperComponentClass<Omit<P, keyof InjectedI18nProps | TTranslateFunctionName>, P>;
+
+export interface Translate {
+    <TNamespace extends string>
+    (namespaces?: TNamespace | TNamespace[], options?: Omit<TranslateOptions, "translateFuncName"> & { withRef?: false }):
+        InferableComponentEnhancerWithProps<"t">;
+
+    <TNamespace extends string>
+    (namespaces?: TNamespace | TNamespace[], options?: Omit<TranslateOptions, "translateFuncName"> & { withRef: true }):
+        InferableComponentEnhancerWithPropsAndRef<"t">;
+
+    <TNamespace extends string, TTranslateFunctionName extends string>
+    (namespaces?: TNamespace | TNamespace[], options?: TranslateOptions<TTranslateFunctionName> & { withRef?: false }):
+        InferableComponentEnhancerWithProps<TTranslateFunctionName>;
+
+    <TNamespace extends string, TTranslateFunctionName extends string>
+    (namespaces?: TNamespace | TNamespace[], options?: TranslateOptions<TTranslateFunctionName> & { withRef: true }):
+        InferableComponentEnhancerWithPropsAndRef<TTranslateFunctionName>;
+
+    setDefaults: typeof setDefaults;
+    setI18n: typeof setI18n;
+}
+
+declare const translate: Translate;
+export default translate;
diff --git a/types/react-i18next/test/react-i18next-tests.tsx b/types/react-i18next/test/react-i18next-tests.tsx
index 6105ccf921..46d212e680 100644
--- a/types/react-i18next/test/react-i18next-tests.tsx
+++ b/types/react-i18next/test/react-i18next-tests.tsx
@@ -1,92 +1,181 @@
 import * as React from 'react';
 import * as i18n from 'i18next';
-import { translate, I18nextProvider, Interpolate, InjectedTranslateProps, TranslationFunction, loadNamespaces, Trans } from 'react-i18next';
+import {
+    setDefaults,
+    reactI18nextModule,
+    translate,
+    I18nextProvider,
+    Interpolate,
+    InjectedTranslateProps,
+    TranslationFunction,
+    loadNamespaces,
+    Trans,
+    I18n,
+    ReactI18NextOptions
+} from 'react-i18next';
+import { InjectedI18nProps } from 'react-i18next/src/props';
 
 interface InnerAnotherComponentProps {
-  _?: TranslationFunction;
+    _: TranslationFunction;
 }
 
 class InnerAnotherComponent extends React.Component<InnerAnotherComponentProps> {
-  render() {
-    const _ = this.props._!;
-    return <p>{_('content.text', { /* options t options */ })}</p>;
-  }
+    render() {
+        const _ = this.props._;
+        return <p>{_('content.text', {/* options t options */})}</p>;
+    }
 }
 
-const AnotherComponent = translate('view', { wait: true, translateFuncName: '_' })(InnerAnotherComponent);
+const AnotherComponent = translate<Key, "_">('view', {wait: true, translateFuncName: '_'})(InnerAnotherComponent);
+const instanceWithoutRef = new AnotherComponent({});
+instanceWithoutRef.componentWillReceiveProps!({
+    i18n,
+    initialI18nStore: { context: { text: "a message" } },
+    initialLanguage: "en"
+}, {});
+
+translate.setDefaults({ wait: false });
+translate.setI18n(i18n);
+
+const AnotherComponentWithRef = translate<Key, "_">("view" as Key, { translateFuncName: "_", withRef: true })(InnerAnotherComponent);
+const instanceWithRef = new AnotherComponentWithRef({});
+const ref = instanceWithRef.getWrappedInstance();
+instanceWithRef.componentWillReceiveProps!({
+    i18n,
+    initialI18nStore: { context: { text: "a message" } },
+    initialLanguage: "en"
+}, {});
 
 class InnerYetAnotherComponent extends React.Component<InjectedTranslateProps> {
-  render() {
-    const t = this.props.t!;
-    return <p>{t('usingDefaultNS', { /* options t options */ })}</p>;
-  }
+    render() {
+        const t = this.props.t;
+        return <p>{t('usingDefaultNS', {/* options t options */})}</p>;
+    }
 }
 
 const YetAnotherComponent = translate()(InnerYetAnotherComponent);
 
-@translate(['view', 'nav'], { wait: true })
+const YetAnotherComponentWithRef = translate(undefined, { withRef: true })(InnerYetAnotherComponent);
+new YetAnotherComponentWithRef({}).getWrappedInstance();
 class TranslatableView extends React.Component<InjectedTranslateProps> {
-  render() {
-    const t = this.props.t!;
-    const interpolateComponent = <strong>"a interpolated component"</strong>;
-
-    return (
-      <div>
-        <h1>{t('common:appName')}</h1>
-        <AnotherComponent />
-        <YetAnotherComponent />
-        <Interpolate
-          parent='p'
-          i18nKey='common:interpolateSample'
-          value='"some value in props"'
-          component={interpolateComponent}
-        />
-        <Interpolate
-          parent='p'
-          i18nKey='common:interpolateSample'
-          useDangerouslySetInnerHTML={true}
-          dangerouslySetInnerHTMLPartElement='span'
-          value='"some value in props"'
-          component={interpolateComponent}
-        />
-        <a href='https://github.com/i18next/react-i18next' target='_blank'>{t('nav:link1')}</a>
-      </div>
-    );
-  }
+    render() {
+        const t = this.props.t;
+        const interpolateComponent = <strong>"a interpolated component"</strong>;
+        const options: i18n.InterpolationOptions = {};
+        return (
+            <div>
+                <h1>{t('common:appName')}</h1>
+                <AnotherComponent/>
+                <YetAnotherComponent/>
+                <Interpolate
+                    parent='p'
+                    i18nKey='common:interpolateSample'
+                    value='"some value in props"'
+                    component={interpolateComponent}
+                />
+                <Interpolate
+                    parent='p'
+                    options={options}
+                    i18nKey='common:interpolateSample'
+                    useDangerouslySetInnerHTML={true}
+                    dangerouslySetInnerHTMLPartElement='span'
+                    value='"some value in props"'
+                    component={interpolateComponent}
+                    i18n={i18n.init()}
+                />
+                <a href='https://github.com/i18next/react-i18next' target='_blank'>{t('nav:link1')}</a>
+            </div>
+        );
+    }
 }
 
+const TranslatedView = translate(["view", "nav"] as Key[], { wait: true })(TranslatableView);
+
 class App extends React.Component {
   render() {
     return (
       <div className='main'>
         <main>
-          <TranslatableView />
+          <TranslatedView />
         </main>
       </div>
     );
   }
 }
 
-<I18nextProvider i18n={i18n}>
-  <App />
+<I18nextProvider i18n={i18n} initialLanguage={'en'} initialI18nStore={{}}>
+    <App/>
 </I18nextProvider>;
 
-loadNamespaces({ components: [App], i18n }).then(() => { }).catch(error => { });
+loadNamespaces({components: [App], i18n}).then(() => {
+}).catch(error => {
+});
 
-<Trans count={5} />;
-<Trans count={5} i18nKey="key" />;
+<Trans count={5}/>;
+<Trans count={5} i18nKey="key"/>;
+<Trans parent={'span'}/>;
+<Trans i18n={i18n.init()}/>;
+<Trans t={i18n.getFixedT('en')}/>;
 <Trans count={5}>
-  <App />
+    <App/>
 </Trans>;
 
 type Key = "view" | "nav";
 
-@translate<Key>(['view', 'nav'])
 class GenericsTest extends React.Component<InjectedTranslateProps> {
+    render() {
+        return null;
+    }
+}
+
+const TranslatedGenericsTest = translate(["view", "nav"] as Key[])(GenericsTest);
+<TranslatedGenericsTest />;
+
+class GenericsTest2 extends React.Component<InjectedTranslateProps> {
+    render() {
+        return null;
+    }
+}
+
+const TranslatedGenericsTest2 = translate("view" as Key)(GenericsTest2);
+<TranslatedGenericsTest2 />;
+
+class ComponentWithInjectedI18n extends React.Component<InjectedI18nProps> {
   render() { return null; }
 }
 
-@translate<Key>('view')
-class GenericsTest2 extends React.Component<InjectedTranslateProps> {
-  render() { return null; }
+const TranslatedComponentWithInjectedI18n = translate()(ComponentWithInjectedI18n);
+<TranslatedComponentWithInjectedI18n />;
+
+function StatlessComponent(props: InjectedTranslateProps) {
+  return <h1>{props.t("hy")}</h1>;
 }
+
+const TranslatedStatlessComponent = translate()(StatlessComponent);
+<TranslatedStatlessComponent />;
+
+interface CustomTranslateFunctionProps {
+  _: TranslationFunction;
+}
+
+<I18n ns={['defaultNamespace', 'anotherNamespace']} wait={true} nsMode={'string'} bindI18n={'languageChanged loaded'}
+      bindStore={'added removed'}>
+    {
+        (t, {i18n}) => (
+            <div>
+                <h1>{t('keyFromDefault')}</h1>
+                <p>{t('anotherNamespace:key.from.another.namespace', {/* options t options */})}</p>
+            </div>
+        )
+    }
+</I18n>;
+
+const defaults: ReactI18NextOptions = {
+    wait: true,
+    withRef: true,
+    bindI18n: 'string',
+    bindStore: 'string'
+};
+setDefaults(defaults);
+
+reactI18nextModule.init(i18n.init());
diff --git a/types/react-i18next/tsconfig.json b/types/react-i18next/tsconfig.json
index cbb9a8b45f..e38c27a93e 100644
--- a/types/react-i18next/tsconfig.json
+++ b/types/react-i18next/tsconfig.json
@@ -16,16 +16,19 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true,
         "jsx": "react",
         "experimentalDecorators": true
     },
     "files": [
         "index.d.ts",
         "test/react-i18next-tests.tsx",
+        "src/context.d.ts",
+        "src/I18n.d.ts",
         "src/I18nextProvider.d.ts",
         "src/interpolate.d.ts",
         "src/loadNamespaces.d.ts",
         "src/trans.d.ts",
         "src/translate.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-i18next/v1/tslint.json b/types/react-i18next/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-i18next/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-i18next/v4/I18nextProvider.d.ts b/types/react-i18next/v4/I18nextProvider.d.ts
new file mode 100644
index 0000000000..2ecb87f4a1
--- /dev/null
+++ b/types/react-i18next/v4/I18nextProvider.d.ts
@@ -0,0 +1,12 @@
+import * as React from "react";
+import { i18n } from "i18next";
+
+// tslint:disable-next-line:interface-name
+export interface I18nextProviderProps {
+    i18n: i18n;
+    children: React.ReactElement<any>;
+    initialI18nStore?: any;
+    initialLanguage?: string;
+}
+
+export default class I18nextProvider extends React.Component<I18nextProviderProps> { }
diff --git a/types/react-i18next/v4/index.d.ts b/types/react-i18next/v4/index.d.ts
new file mode 100644
index 0000000000..da6a12396d
--- /dev/null
+++ b/types/react-i18next/v4/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for react-i18next 4.6
+// Project: https://github.com/i18next/react-i18next
+// Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { TranslationFunction } from "i18next";
+
+import I18nextProvider from "./I18nextProvider";
+import Interpolate from "./interpolate";
+import loadNamespaces from "./loadNamespaces";
+import Trans from "./trans";
+import translate from "./translate";
+
+export {
+    I18nextProvider,
+    Interpolate,
+    loadNamespaces,
+    Trans,
+    translate,
+    // Exports for TypeScript only
+    TranslationFunction
+};
+
+/**
+ * Extend your component's Prop interface with this one to get access to `this.props.t`
+ *
+ * Please note that if you use the `translateFuncName` option, you should create
+ * your own interface just like this one, but with your name of the translation function.
+ *
+ * interface MyComponentProps extends ReactI18next.InjectedTranslateProps {}
+ */
+export interface InjectedTranslateProps {
+    t?: TranslationFunction;
+}
+
+export as namespace reactI18Next;
diff --git a/types/react-i18next/v4/interpolate.d.ts b/types/react-i18next/v4/interpolate.d.ts
new file mode 100644
index 0000000000..e6f07893ed
--- /dev/null
+++ b/types/react-i18next/v4/interpolate.d.ts
@@ -0,0 +1,23 @@
+import * as React from "react";
+import { InterpolationOptions } from "i18next";
+
+export type InterpolateValue = string | JSX.Element;
+
+export interface InterpolatePropsBase {
+    parent?: string;
+    regexp?: RegExp;
+    useDangerouslySetInnerHTML?: boolean;
+    dangerouslySetInnerHTMLPartElement?: string;
+    options?: InterpolationOptions;
+    i18nKey?: string;
+    className?: string;
+    style?: React.CSSProperties;
+}
+
+export interface OtherInterpolateProps {
+    [regexKey: string]: InterpolateValue | RegExp | InterpolationOptions | boolean | undefined;
+}
+
+export type InterpolateProps = InterpolatePropsBase & OtherInterpolateProps;
+
+export default class Interpolate extends React.Component<InterpolateProps> { }
diff --git a/types/react-i18next/v4/loadNamespaces.d.ts b/types/react-i18next/v4/loadNamespaces.d.ts
new file mode 100644
index 0000000000..d0e0b372f5
--- /dev/null
+++ b/types/react-i18next/v4/loadNamespaces.d.ts
@@ -0,0 +1,9 @@
+import * as React from "react";
+import { i18n } from "i18next";
+
+export interface LoadNamespacesArguments {
+    components: Array<React.ComponentClass<any> | React.StatelessComponent<any>>;
+    i18n: i18n;
+}
+
+export default function loadNamespaces(args: LoadNamespacesArguments): Promise<void>;
diff --git a/types/react-i18next/v4/react-i18next-tests.tsx b/types/react-i18next/v4/react-i18next-tests.tsx
new file mode 100644
index 0000000000..6105ccf921
--- /dev/null
+++ b/types/react-i18next/v4/react-i18next-tests.tsx
@@ -0,0 +1,92 @@
+import * as React from 'react';
+import * as i18n from 'i18next';
+import { translate, I18nextProvider, Interpolate, InjectedTranslateProps, TranslationFunction, loadNamespaces, Trans } from 'react-i18next';
+
+interface InnerAnotherComponentProps {
+  _?: TranslationFunction;
+}
+
+class InnerAnotherComponent extends React.Component<InnerAnotherComponentProps> {
+  render() {
+    const _ = this.props._!;
+    return <p>{_('content.text', { /* options t options */ })}</p>;
+  }
+}
+
+const AnotherComponent = translate('view', { wait: true, translateFuncName: '_' })(InnerAnotherComponent);
+
+class InnerYetAnotherComponent extends React.Component<InjectedTranslateProps> {
+  render() {
+    const t = this.props.t!;
+    return <p>{t('usingDefaultNS', { /* options t options */ })}</p>;
+  }
+}
+
+const YetAnotherComponent = translate()(InnerYetAnotherComponent);
+
+@translate(['view', 'nav'], { wait: true })
+class TranslatableView extends React.Component<InjectedTranslateProps> {
+  render() {
+    const t = this.props.t!;
+    const interpolateComponent = <strong>"a interpolated component"</strong>;
+
+    return (
+      <div>
+        <h1>{t('common:appName')}</h1>
+        <AnotherComponent />
+        <YetAnotherComponent />
+        <Interpolate
+          parent='p'
+          i18nKey='common:interpolateSample'
+          value='"some value in props"'
+          component={interpolateComponent}
+        />
+        <Interpolate
+          parent='p'
+          i18nKey='common:interpolateSample'
+          useDangerouslySetInnerHTML={true}
+          dangerouslySetInnerHTMLPartElement='span'
+          value='"some value in props"'
+          component={interpolateComponent}
+        />
+        <a href='https://github.com/i18next/react-i18next' target='_blank'>{t('nav:link1')}</a>
+      </div>
+    );
+  }
+}
+
+class App extends React.Component {
+  render() {
+    return (
+      <div className='main'>
+        <main>
+          <TranslatableView />
+        </main>
+      </div>
+    );
+  }
+}
+
+<I18nextProvider i18n={i18n}>
+  <App />
+</I18nextProvider>;
+
+loadNamespaces({ components: [App], i18n }).then(() => { }).catch(error => { });
+
+<Trans count={5} />;
+<Trans count={5} i18nKey="key" />;
+<Trans count={5}>
+  <App />
+</Trans>;
+
+type Key = "view" | "nav";
+
+@translate<Key>(['view', 'nav'])
+class GenericsTest extends React.Component<InjectedTranslateProps> {
+  render() { return null; }
+}
+
+@translate<Key>('view')
+class GenericsTest2 extends React.Component<InjectedTranslateProps> {
+  render() { return null; }
+}
diff --git a/types/react-i18next/v4/trans.d.ts b/types/react-i18next/v4/trans.d.ts
new file mode 100644
index 0000000000..384e1605f9
--- /dev/null
+++ b/types/react-i18next/v4/trans.d.ts
@@ -0,0 +1,8 @@
+import * as React from "react";
+
+export interface TransProps {
+    i18nKey?: string;
+    [name: string]: any;
+}
+
+export default class Trans extends React.Component<TransProps> { }
diff --git a/types/react-i18next/v4/translate.d.ts b/types/react-i18next/v4/translate.d.ts
new file mode 100644
index 0000000000..d41b4dc00a
--- /dev/null
+++ b/types/react-i18next/v4/translate.d.ts
@@ -0,0 +1,15 @@
+import * as React from "react";
+import { i18n } from "i18next";
+
+export interface TranslateOptions {
+    withRef?: boolean;
+    bindI18n?: string;
+    bindStore?: string;
+    translateFuncName?: string;
+    wait?: boolean;
+    nsMode?: string;
+    i18n?: i18n;
+}
+
+// tslint:disable-next-line:ban-types
+export default function translate<TKey extends string = string>(namespaces?: TKey[] | TKey, options?: TranslateOptions): <C extends Function>(WrappedComponent: C) => C;
diff --git a/types/react-i18next/v4/tsconfig.json b/types/react-i18next/v4/tsconfig.json
new file mode 100644
index 0000000000..1e7a8d9eea
--- /dev/null
+++ b/types/react-i18next/v4/tsconfig.json
@@ -0,0 +1,36 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "react-i18next": [
+                "react-i18next/v4"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "experimentalDecorators": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-i18next-tests.tsx",
+        "I18nextProvider.d.ts",
+        "interpolate.d.ts",
+        "loadNamespaces.d.ts",
+        "trans.d.ts",
+        "translate.d.ts"
+    ]
+}
diff --git a/types/react-i18next/v4/tslint.json b/types/react-i18next/v4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-i18next/v4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-icon-base/index.d.ts b/types/react-icon-base/index.d.ts
index e60719a762..0bd0005244 100644
--- a/types/react-icon-base/index.d.ts
+++ b/types/react-icon-base/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-icon-base 2.0
+// Type definitions for react-icon-base 2.1
 // Project: https://github.com/gorangajic/react-icon-base#readme
 // Definitions by: Alexandre Paré <https://github.com/apare>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,12 +6,8 @@
 
 import * as React from "react";
 
-export = IconBaseClass;
-
-declare namespace IconBaseClass {
-    interface IconBaseProps extends React.SVGProps<React.ReactSVGElement> {
-        size?: string | number;
-    }
+export interface IconBaseProps extends React.SVGProps<React.ReactSVGElement> {
+    size?: string | number;
 }
 
-declare class IconBaseClass extends React.Component<IconBaseClass.IconBaseProps> {}
+export default class IconBaseClass extends React.Component<IconBaseProps> {}
diff --git a/types/react-icon-base/react-icon-base-tests.tsx b/types/react-icon-base/react-icon-base-tests.tsx
index cb4fe929a9..d89f97a2ca 100644
--- a/types/react-icon-base/react-icon-base-tests.tsx
+++ b/types/react-icon-base/react-icon-base-tests.tsx
@@ -1,4 +1,4 @@
 import * as React from "react";
-import * as IconBase from "react-icon-base";
+import IconBase from "react-icon-base";
 
 export default <IconBase size={ 30 } color="aliceblue" style={ { margin: "30px" } } className="test" />;
diff --git a/types/react-icons/index.d.ts b/types/react-icons/index.d.ts
index 7c926b347f..fb0026ff40 100644
--- a/types/react-icons/index.d.ts
+++ b/types/react-icons/index.d.ts
@@ -2,5 +2,6 @@
 // Project: https://github.com/gorangajic/react-icons#readme
 // Definitions by: Alexandre Paré <https://github.com/apare>
 //                 John Reilly <https://github.com/johnnyreilly>
+//                 Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/react-icons/lib/fa/500px.d.ts b/types/react-icons/lib/fa/500px.d.ts
index 29c3f639f8..d70cfd4f19 100644
--- a/types/react-icons/lib/fa/500px.d.ts
+++ b/types/react-icons/lib/fa/500px.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class Fa500px extends React.Component<IconBaseProps> { }
+declare class Fa500px extends React.Component<IconBaseProps> { }
+export = Fa500px;
diff --git a/types/react-icons/lib/fa/adjust.d.ts b/types/react-icons/lib/fa/adjust.d.ts
index 7ca3d2cf03..af4b024240 100644
--- a/types/react-icons/lib/fa/adjust.d.ts
+++ b/types/react-icons/lib/fa/adjust.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAdjust extends React.Component<IconBaseProps> { }
+declare class FaAdjust extends React.Component<IconBaseProps> { }
+export = FaAdjust;
diff --git a/types/react-icons/lib/fa/adn.d.ts b/types/react-icons/lib/fa/adn.d.ts
index c2c5676047..f1b5d2be13 100644
--- a/types/react-icons/lib/fa/adn.d.ts
+++ b/types/react-icons/lib/fa/adn.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAdn extends React.Component<IconBaseProps> { }
+declare class FaAdn extends React.Component<IconBaseProps> { }
+export = FaAdn;
diff --git a/types/react-icons/lib/fa/align-center.d.ts b/types/react-icons/lib/fa/align-center.d.ts
index 718d401bcc..ffd972db6a 100644
--- a/types/react-icons/lib/fa/align-center.d.ts
+++ b/types/react-icons/lib/fa/align-center.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignCenter extends React.Component<IconBaseProps> { }
+declare class FaAlignCenter extends React.Component<IconBaseProps> { }
+export = FaAlignCenter;
diff --git a/types/react-icons/lib/fa/align-justify.d.ts b/types/react-icons/lib/fa/align-justify.d.ts
index 87df2f26fc..43432a6126 100644
--- a/types/react-icons/lib/fa/align-justify.d.ts
+++ b/types/react-icons/lib/fa/align-justify.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignJustify extends React.Component<IconBaseProps> { }
+declare class FaAlignJustify extends React.Component<IconBaseProps> { }
+export = FaAlignJustify;
diff --git a/types/react-icons/lib/fa/align-left.d.ts b/types/react-icons/lib/fa/align-left.d.ts
index 7a1c956b3f..ba9d433ee3 100644
--- a/types/react-icons/lib/fa/align-left.d.ts
+++ b/types/react-icons/lib/fa/align-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignLeft extends React.Component<IconBaseProps> { }
+declare class FaAlignLeft extends React.Component<IconBaseProps> { }
+export = FaAlignLeft;
diff --git a/types/react-icons/lib/fa/align-right.d.ts b/types/react-icons/lib/fa/align-right.d.ts
index 0ec0226c13..a85c63eb0f 100644
--- a/types/react-icons/lib/fa/align-right.d.ts
+++ b/types/react-icons/lib/fa/align-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignRight extends React.Component<IconBaseProps> { }
+declare class FaAlignRight extends React.Component<IconBaseProps> { }
+export = FaAlignRight;
diff --git a/types/react-icons/lib/fa/amazon.d.ts b/types/react-icons/lib/fa/amazon.d.ts
index d514c69672..bb037b45c4 100644
--- a/types/react-icons/lib/fa/amazon.d.ts
+++ b/types/react-icons/lib/fa/amazon.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAmazon extends React.Component<IconBaseProps> { }
+declare class FaAmazon extends React.Component<IconBaseProps> { }
+export = FaAmazon;
diff --git a/types/react-icons/lib/fa/ambulance.d.ts b/types/react-icons/lib/fa/ambulance.d.ts
index fbaa0eec3b..b826f5571a 100644
--- a/types/react-icons/lib/fa/ambulance.d.ts
+++ b/types/react-icons/lib/fa/ambulance.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAmbulance extends React.Component<IconBaseProps> { }
+declare class FaAmbulance extends React.Component<IconBaseProps> { }
+export = FaAmbulance;
diff --git a/types/react-icons/lib/fa/american-sign-language-interpreting.d.ts b/types/react-icons/lib/fa/american-sign-language-interpreting.d.ts
index 06925c79e5..5c83ce813a 100644
--- a/types/react-icons/lib/fa/american-sign-language-interpreting.d.ts
+++ b/types/react-icons/lib/fa/american-sign-language-interpreting.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAmericanSignLanguageInterpreting extends React.Component<IconBaseProps> { }
+declare class FaAmericanSignLanguageInterpreting extends React.Component<IconBaseProps> { }
+export = FaAmericanSignLanguageInterpreting;
diff --git a/types/react-icons/lib/fa/anchor.d.ts b/types/react-icons/lib/fa/anchor.d.ts
index 8812734dc4..340f0da07a 100644
--- a/types/react-icons/lib/fa/anchor.d.ts
+++ b/types/react-icons/lib/fa/anchor.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAnchor extends React.Component<IconBaseProps> { }
+declare class FaAnchor extends React.Component<IconBaseProps> { }
+export = FaAnchor;
diff --git a/types/react-icons/lib/fa/android.d.ts b/types/react-icons/lib/fa/android.d.ts
index 2ee9f5fb18..5f7c1fd608 100644
--- a/types/react-icons/lib/fa/android.d.ts
+++ b/types/react-icons/lib/fa/android.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAndroid extends React.Component<IconBaseProps> { }
+declare class FaAndroid extends React.Component<IconBaseProps> { }
+export = FaAndroid;
diff --git a/types/react-icons/lib/fa/angellist.d.ts b/types/react-icons/lib/fa/angellist.d.ts
index ce8afe7eda..e89b663a80 100644
--- a/types/react-icons/lib/fa/angellist.d.ts
+++ b/types/react-icons/lib/fa/angellist.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngellist extends React.Component<IconBaseProps> { }
+declare class FaAngellist extends React.Component<IconBaseProps> { }
+export = FaAngellist;
diff --git a/types/react-icons/lib/fa/angle-double-down.d.ts b/types/react-icons/lib/fa/angle-double-down.d.ts
index 93ce66d6b4..2d556e859e 100644
--- a/types/react-icons/lib/fa/angle-double-down.d.ts
+++ b/types/react-icons/lib/fa/angle-double-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleDown extends React.Component<IconBaseProps> { }
+declare class FaAngleDoubleDown extends React.Component<IconBaseProps> { }
+export = FaAngleDoubleDown;
diff --git a/types/react-icons/lib/fa/angle-double-left.d.ts b/types/react-icons/lib/fa/angle-double-left.d.ts
index ff9d38e1ad..6813d50bd2 100644
--- a/types/react-icons/lib/fa/angle-double-left.d.ts
+++ b/types/react-icons/lib/fa/angle-double-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleLeft extends React.Component<IconBaseProps> { }
+declare class FaAngleDoubleLeft extends React.Component<IconBaseProps> { }
+export = FaAngleDoubleLeft;
diff --git a/types/react-icons/lib/fa/angle-double-right.d.ts b/types/react-icons/lib/fa/angle-double-right.d.ts
index 2642210681..196cedf761 100644
--- a/types/react-icons/lib/fa/angle-double-right.d.ts
+++ b/types/react-icons/lib/fa/angle-double-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleRight extends React.Component<IconBaseProps> { }
+declare class FaAngleDoubleRight extends React.Component<IconBaseProps> { }
+export = FaAngleDoubleRight;
diff --git a/types/react-icons/lib/fa/angle-double-up.d.ts b/types/react-icons/lib/fa/angle-double-up.d.ts
index 9a3af8e4bf..b0084150ce 100644
--- a/types/react-icons/lib/fa/angle-double-up.d.ts
+++ b/types/react-icons/lib/fa/angle-double-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleUp extends React.Component<IconBaseProps> { }
+declare class FaAngleDoubleUp extends React.Component<IconBaseProps> { }
+export = FaAngleDoubleUp;
diff --git a/types/react-icons/lib/fa/angle-down.d.ts b/types/react-icons/lib/fa/angle-down.d.ts
index d9e5083f2a..6ff5e062e4 100644
--- a/types/react-icons/lib/fa/angle-down.d.ts
+++ b/types/react-icons/lib/fa/angle-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDown extends React.Component<IconBaseProps> { }
+declare class FaAngleDown extends React.Component<IconBaseProps> { }
+export = FaAngleDown;
diff --git a/types/react-icons/lib/fa/angle-left.d.ts b/types/react-icons/lib/fa/angle-left.d.ts
index bea87f2edd..4ce5ba28d0 100644
--- a/types/react-icons/lib/fa/angle-left.d.ts
+++ b/types/react-icons/lib/fa/angle-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleLeft extends React.Component<IconBaseProps> { }
+declare class FaAngleLeft extends React.Component<IconBaseProps> { }
+export = FaAngleLeft;
diff --git a/types/react-icons/lib/fa/angle-right.d.ts b/types/react-icons/lib/fa/angle-right.d.ts
index c5ecf220c6..5329f3c345 100644
--- a/types/react-icons/lib/fa/angle-right.d.ts
+++ b/types/react-icons/lib/fa/angle-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleRight extends React.Component<IconBaseProps> { }
+declare class FaAngleRight extends React.Component<IconBaseProps> { }
+export = FaAngleRight;
diff --git a/types/react-icons/lib/fa/angle-up.d.ts b/types/react-icons/lib/fa/angle-up.d.ts
index cdbc2fd506..6c069a95cd 100644
--- a/types/react-icons/lib/fa/angle-up.d.ts
+++ b/types/react-icons/lib/fa/angle-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleUp extends React.Component<IconBaseProps> { }
+declare class FaAngleUp extends React.Component<IconBaseProps> { }
+export = FaAngleUp;
diff --git a/types/react-icons/lib/fa/apple.d.ts b/types/react-icons/lib/fa/apple.d.ts
index 81a903285f..ab5ab406ac 100644
--- a/types/react-icons/lib/fa/apple.d.ts
+++ b/types/react-icons/lib/fa/apple.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaApple extends React.Component<IconBaseProps> { }
+declare class FaApple extends React.Component<IconBaseProps> { }
+export = FaApple;
diff --git a/types/react-icons/lib/fa/archive.d.ts b/types/react-icons/lib/fa/archive.d.ts
index a86eaae4d2..c61ba115a6 100644
--- a/types/react-icons/lib/fa/archive.d.ts
+++ b/types/react-icons/lib/fa/archive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArchive extends React.Component<IconBaseProps> { }
+declare class FaArchive extends React.Component<IconBaseProps> { }
+export = FaArchive;
diff --git a/types/react-icons/lib/fa/area-chart.d.ts b/types/react-icons/lib/fa/area-chart.d.ts
index 989eaa3b5d..7950cbc4ac 100644
--- a/types/react-icons/lib/fa/area-chart.d.ts
+++ b/types/react-icons/lib/fa/area-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAreaChart extends React.Component<IconBaseProps> { }
+declare class FaAreaChart extends React.Component<IconBaseProps> { }
+export = FaAreaChart;
diff --git a/types/react-icons/lib/fa/arrow-circle-down.d.ts b/types/react-icons/lib/fa/arrow-circle-down.d.ts
index e5551c84a8..034a89aa1b 100644
--- a/types/react-icons/lib/fa/arrow-circle-down.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleDown extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleDown extends React.Component<IconBaseProps> { }
+export = FaArrowCircleDown;
diff --git a/types/react-icons/lib/fa/arrow-circle-left.d.ts b/types/react-icons/lib/fa/arrow-circle-left.d.ts
index af722a058d..a6bd782c7b 100644
--- a/types/react-icons/lib/fa/arrow-circle-left.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleLeft extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleLeft extends React.Component<IconBaseProps> { }
+export = FaArrowCircleLeft;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-down.d.ts b/types/react-icons/lib/fa/arrow-circle-o-down.d.ts
index 3e06f22917..a0af735c04 100644
--- a/types/react-icons/lib/fa/arrow-circle-o-down.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-o-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleODown extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleODown extends React.Component<IconBaseProps> { }
+export = FaArrowCircleODown;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-left.d.ts b/types/react-icons/lib/fa/arrow-circle-o-left.d.ts
index 687373f29c..da661fb85c 100644
--- a/types/react-icons/lib/fa/arrow-circle-o-left.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-o-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleOLeft extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleOLeft extends React.Component<IconBaseProps> { }
+export = FaArrowCircleOLeft;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-right.d.ts b/types/react-icons/lib/fa/arrow-circle-o-right.d.ts
index c1378c89b6..e850fbc8b2 100644
--- a/types/react-icons/lib/fa/arrow-circle-o-right.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-o-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleORight extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleORight extends React.Component<IconBaseProps> { }
+export = FaArrowCircleORight;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-up.d.ts b/types/react-icons/lib/fa/arrow-circle-o-up.d.ts
index 6d67c2f160..38dfda171a 100644
--- a/types/react-icons/lib/fa/arrow-circle-o-up.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-o-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleOUp extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleOUp extends React.Component<IconBaseProps> { }
+export = FaArrowCircleOUp;
diff --git a/types/react-icons/lib/fa/arrow-circle-right.d.ts b/types/react-icons/lib/fa/arrow-circle-right.d.ts
index 0916b5328d..3875683a1d 100644
--- a/types/react-icons/lib/fa/arrow-circle-right.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleRight extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleRight extends React.Component<IconBaseProps> { }
+export = FaArrowCircleRight;
diff --git a/types/react-icons/lib/fa/arrow-circle-up.d.ts b/types/react-icons/lib/fa/arrow-circle-up.d.ts
index 1d4af5320c..a58794ce34 100644
--- a/types/react-icons/lib/fa/arrow-circle-up.d.ts
+++ b/types/react-icons/lib/fa/arrow-circle-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleUp extends React.Component<IconBaseProps> { }
+declare class FaArrowCircleUp extends React.Component<IconBaseProps> { }
+export = FaArrowCircleUp;
diff --git a/types/react-icons/lib/fa/arrow-down.d.ts b/types/react-icons/lib/fa/arrow-down.d.ts
index 845ae5bda7..f69d965a52 100644
--- a/types/react-icons/lib/fa/arrow-down.d.ts
+++ b/types/react-icons/lib/fa/arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowDown extends React.Component<IconBaseProps> { }
+declare class FaArrowDown extends React.Component<IconBaseProps> { }
+export = FaArrowDown;
diff --git a/types/react-icons/lib/fa/arrow-left.d.ts b/types/react-icons/lib/fa/arrow-left.d.ts
index b5333dd62c..2d0d8a3243 100644
--- a/types/react-icons/lib/fa/arrow-left.d.ts
+++ b/types/react-icons/lib/fa/arrow-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowLeft extends React.Component<IconBaseProps> { }
+declare class FaArrowLeft extends React.Component<IconBaseProps> { }
+export = FaArrowLeft;
diff --git a/types/react-icons/lib/fa/arrow-right.d.ts b/types/react-icons/lib/fa/arrow-right.d.ts
index 7cad9380d5..cc35c17bd7 100644
--- a/types/react-icons/lib/fa/arrow-right.d.ts
+++ b/types/react-icons/lib/fa/arrow-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowRight extends React.Component<IconBaseProps> { }
+declare class FaArrowRight extends React.Component<IconBaseProps> { }
+export = FaArrowRight;
diff --git a/types/react-icons/lib/fa/arrow-up.d.ts b/types/react-icons/lib/fa/arrow-up.d.ts
index eb96f4b47d..ad5df3bf2f 100644
--- a/types/react-icons/lib/fa/arrow-up.d.ts
+++ b/types/react-icons/lib/fa/arrow-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowUp extends React.Component<IconBaseProps> { }
+declare class FaArrowUp extends React.Component<IconBaseProps> { }
+export = FaArrowUp;
diff --git a/types/react-icons/lib/fa/arrows-alt.d.ts b/types/react-icons/lib/fa/arrows-alt.d.ts
index 0497e59469..b1b0e83089 100644
--- a/types/react-icons/lib/fa/arrows-alt.d.ts
+++ b/types/react-icons/lib/fa/arrows-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsAlt extends React.Component<IconBaseProps> { }
+declare class FaArrowsAlt extends React.Component<IconBaseProps> { }
+export = FaArrowsAlt;
diff --git a/types/react-icons/lib/fa/arrows-h.d.ts b/types/react-icons/lib/fa/arrows-h.d.ts
index 53e31e5671..fe27c6704c 100644
--- a/types/react-icons/lib/fa/arrows-h.d.ts
+++ b/types/react-icons/lib/fa/arrows-h.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsH extends React.Component<IconBaseProps> { }
+declare class FaArrowsH extends React.Component<IconBaseProps> { }
+export = FaArrowsH;
diff --git a/types/react-icons/lib/fa/arrows-v.d.ts b/types/react-icons/lib/fa/arrows-v.d.ts
index 6b4cb60249..fe497bc606 100644
--- a/types/react-icons/lib/fa/arrows-v.d.ts
+++ b/types/react-icons/lib/fa/arrows-v.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsV extends React.Component<IconBaseProps> { }
+declare class FaArrowsV extends React.Component<IconBaseProps> { }
+export = FaArrowsV;
diff --git a/types/react-icons/lib/fa/arrows.d.ts b/types/react-icons/lib/fa/arrows.d.ts
index 16175f7688..37a13e7360 100644
--- a/types/react-icons/lib/fa/arrows.d.ts
+++ b/types/react-icons/lib/fa/arrows.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrows extends React.Component<IconBaseProps> { }
+declare class FaArrows extends React.Component<IconBaseProps> { }
+export = FaArrows;
diff --git a/types/react-icons/lib/fa/assistive-listening-systems.d.ts b/types/react-icons/lib/fa/assistive-listening-systems.d.ts
index f6e1649de6..09c0dc1a5c 100644
--- a/types/react-icons/lib/fa/assistive-listening-systems.d.ts
+++ b/types/react-icons/lib/fa/assistive-listening-systems.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAssistiveListeningSystems extends React.Component<IconBaseProps> { }
+declare class FaAssistiveListeningSystems extends React.Component<IconBaseProps> { }
+export = FaAssistiveListeningSystems;
diff --git a/types/react-icons/lib/fa/asterisk.d.ts b/types/react-icons/lib/fa/asterisk.d.ts
index 89fc42ca05..943431df3b 100644
--- a/types/react-icons/lib/fa/asterisk.d.ts
+++ b/types/react-icons/lib/fa/asterisk.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAsterisk extends React.Component<IconBaseProps> { }
+declare class FaAsterisk extends React.Component<IconBaseProps> { }
+export = FaAsterisk;
diff --git a/types/react-icons/lib/fa/at.d.ts b/types/react-icons/lib/fa/at.d.ts
index a871055990..86af31e86b 100644
--- a/types/react-icons/lib/fa/at.d.ts
+++ b/types/react-icons/lib/fa/at.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAt extends React.Component<IconBaseProps> { }
+declare class FaAt extends React.Component<IconBaseProps> { }
+export = FaAt;
diff --git a/types/react-icons/lib/fa/audio-description.d.ts b/types/react-icons/lib/fa/audio-description.d.ts
index 476ef84b6a..97655de683 100644
--- a/types/react-icons/lib/fa/audio-description.d.ts
+++ b/types/react-icons/lib/fa/audio-description.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAudioDescription extends React.Component<IconBaseProps> { }
+declare class FaAudioDescription extends React.Component<IconBaseProps> { }
+export = FaAudioDescription;
diff --git a/types/react-icons/lib/fa/automobile.d.ts b/types/react-icons/lib/fa/automobile.d.ts
index 4a6a259ff3..224b7fa8c4 100644
--- a/types/react-icons/lib/fa/automobile.d.ts
+++ b/types/react-icons/lib/fa/automobile.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAutomobile extends React.Component<IconBaseProps> { }
+declare class FaAutomobile extends React.Component<IconBaseProps> { }
+export = FaAutomobile;
diff --git a/types/react-icons/lib/fa/backward.d.ts b/types/react-icons/lib/fa/backward.d.ts
index ac9bc7b820..3897d97cf0 100644
--- a/types/react-icons/lib/fa/backward.d.ts
+++ b/types/react-icons/lib/fa/backward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBackward extends React.Component<IconBaseProps> { }
+declare class FaBackward extends React.Component<IconBaseProps> { }
+export = FaBackward;
diff --git a/types/react-icons/lib/fa/balance-scale.d.ts b/types/react-icons/lib/fa/balance-scale.d.ts
index ae8446ed1b..70cb498e76 100644
--- a/types/react-icons/lib/fa/balance-scale.d.ts
+++ b/types/react-icons/lib/fa/balance-scale.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBalanceScale extends React.Component<IconBaseProps> { }
+declare class FaBalanceScale extends React.Component<IconBaseProps> { }
+export = FaBalanceScale;
diff --git a/types/react-icons/lib/fa/ban.d.ts b/types/react-icons/lib/fa/ban.d.ts
index b2f668bcef..aa11e72dfd 100644
--- a/types/react-icons/lib/fa/ban.d.ts
+++ b/types/react-icons/lib/fa/ban.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBan extends React.Component<IconBaseProps> { }
+declare class FaBan extends React.Component<IconBaseProps> { }
+export = FaBan;
diff --git a/types/react-icons/lib/fa/bank.d.ts b/types/react-icons/lib/fa/bank.d.ts
index 0d3a14ebf8..c52ff017ca 100644
--- a/types/react-icons/lib/fa/bank.d.ts
+++ b/types/react-icons/lib/fa/bank.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBank extends React.Component<IconBaseProps> { }
+declare class FaBank extends React.Component<IconBaseProps> { }
+export = FaBank;
diff --git a/types/react-icons/lib/fa/bar-chart.d.ts b/types/react-icons/lib/fa/bar-chart.d.ts
index b184edbda5..6dd339888f 100644
--- a/types/react-icons/lib/fa/bar-chart.d.ts
+++ b/types/react-icons/lib/fa/bar-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBarChart extends React.Component<IconBaseProps> { }
+declare class FaBarChart extends React.Component<IconBaseProps> { }
+export = FaBarChart;
diff --git a/types/react-icons/lib/fa/barcode.d.ts b/types/react-icons/lib/fa/barcode.d.ts
index 4f764358a7..14fcd7483f 100644
--- a/types/react-icons/lib/fa/barcode.d.ts
+++ b/types/react-icons/lib/fa/barcode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBarcode extends React.Component<IconBaseProps> { }
+declare class FaBarcode extends React.Component<IconBaseProps> { }
+export = FaBarcode;
diff --git a/types/react-icons/lib/fa/bars.d.ts b/types/react-icons/lib/fa/bars.d.ts
index 5a3272c896..4eb2a2c4ec 100644
--- a/types/react-icons/lib/fa/bars.d.ts
+++ b/types/react-icons/lib/fa/bars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBars extends React.Component<IconBaseProps> { }
+declare class FaBars extends React.Component<IconBaseProps> { }
+export = FaBars;
diff --git a/types/react-icons/lib/fa/battery-0.d.ts b/types/react-icons/lib/fa/battery-0.d.ts
index c7ad0b12b1..b522ea5f95 100644
--- a/types/react-icons/lib/fa/battery-0.d.ts
+++ b/types/react-icons/lib/fa/battery-0.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery0 extends React.Component<IconBaseProps> { }
+declare class FaBattery0 extends React.Component<IconBaseProps> { }
+export = FaBattery0;
diff --git a/types/react-icons/lib/fa/battery-1.d.ts b/types/react-icons/lib/fa/battery-1.d.ts
index a7db7a950f..51e5018032 100644
--- a/types/react-icons/lib/fa/battery-1.d.ts
+++ b/types/react-icons/lib/fa/battery-1.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery1 extends React.Component<IconBaseProps> { }
+declare class FaBattery1 extends React.Component<IconBaseProps> { }
+export = FaBattery1;
diff --git a/types/react-icons/lib/fa/battery-2.d.ts b/types/react-icons/lib/fa/battery-2.d.ts
index 345d261889..b203f533d3 100644
--- a/types/react-icons/lib/fa/battery-2.d.ts
+++ b/types/react-icons/lib/fa/battery-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery2 extends React.Component<IconBaseProps> { }
+declare class FaBattery2 extends React.Component<IconBaseProps> { }
+export = FaBattery2;
diff --git a/types/react-icons/lib/fa/battery-3.d.ts b/types/react-icons/lib/fa/battery-3.d.ts
index bc2a62de56..c95a67cd36 100644
--- a/types/react-icons/lib/fa/battery-3.d.ts
+++ b/types/react-icons/lib/fa/battery-3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery3 extends React.Component<IconBaseProps> { }
+declare class FaBattery3 extends React.Component<IconBaseProps> { }
+export = FaBattery3;
diff --git a/types/react-icons/lib/fa/battery-4.d.ts b/types/react-icons/lib/fa/battery-4.d.ts
index 0541fd5f79..da0aabf0b7 100644
--- a/types/react-icons/lib/fa/battery-4.d.ts
+++ b/types/react-icons/lib/fa/battery-4.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery4 extends React.Component<IconBaseProps> { }
+declare class FaBattery4 extends React.Component<IconBaseProps> { }
+export = FaBattery4;
diff --git a/types/react-icons/lib/fa/bed.d.ts b/types/react-icons/lib/fa/bed.d.ts
index 5eab8918d4..81f8b9973f 100644
--- a/types/react-icons/lib/fa/bed.d.ts
+++ b/types/react-icons/lib/fa/bed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBed extends React.Component<IconBaseProps> { }
+declare class FaBed extends React.Component<IconBaseProps> { }
+export = FaBed;
diff --git a/types/react-icons/lib/fa/beer.d.ts b/types/react-icons/lib/fa/beer.d.ts
index 79bbeb09d2..eb032e6207 100644
--- a/types/react-icons/lib/fa/beer.d.ts
+++ b/types/react-icons/lib/fa/beer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBeer extends React.Component<IconBaseProps> { }
+declare class FaBeer extends React.Component<IconBaseProps> { }
+export = FaBeer;
diff --git a/types/react-icons/lib/fa/behance-square.d.ts b/types/react-icons/lib/fa/behance-square.d.ts
index 550cb6b841..de83781aba 100644
--- a/types/react-icons/lib/fa/behance-square.d.ts
+++ b/types/react-icons/lib/fa/behance-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBehanceSquare extends React.Component<IconBaseProps> { }
+declare class FaBehanceSquare extends React.Component<IconBaseProps> { }
+export = FaBehanceSquare;
diff --git a/types/react-icons/lib/fa/behance.d.ts b/types/react-icons/lib/fa/behance.d.ts
index e51df4de64..9c15559ce1 100644
--- a/types/react-icons/lib/fa/behance.d.ts
+++ b/types/react-icons/lib/fa/behance.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBehance extends React.Component<IconBaseProps> { }
+declare class FaBehance extends React.Component<IconBaseProps> { }
+export = FaBehance;
diff --git a/types/react-icons/lib/fa/bell-o.d.ts b/types/react-icons/lib/fa/bell-o.d.ts
index 13f162cd71..813bd69eea 100644
--- a/types/react-icons/lib/fa/bell-o.d.ts
+++ b/types/react-icons/lib/fa/bell-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBellO extends React.Component<IconBaseProps> { }
+declare class FaBellO extends React.Component<IconBaseProps> { }
+export = FaBellO;
diff --git a/types/react-icons/lib/fa/bell-slash-o.d.ts b/types/react-icons/lib/fa/bell-slash-o.d.ts
index 49ae89d8d4..8db73c3d1f 100644
--- a/types/react-icons/lib/fa/bell-slash-o.d.ts
+++ b/types/react-icons/lib/fa/bell-slash-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBellSlashO extends React.Component<IconBaseProps> { }
+declare class FaBellSlashO extends React.Component<IconBaseProps> { }
+export = FaBellSlashO;
diff --git a/types/react-icons/lib/fa/bell-slash.d.ts b/types/react-icons/lib/fa/bell-slash.d.ts
index 305b77912b..d035fa6a1f 100644
--- a/types/react-icons/lib/fa/bell-slash.d.ts
+++ b/types/react-icons/lib/fa/bell-slash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBellSlash extends React.Component<IconBaseProps> { }
+declare class FaBellSlash extends React.Component<IconBaseProps> { }
+export = FaBellSlash;
diff --git a/types/react-icons/lib/fa/bell.d.ts b/types/react-icons/lib/fa/bell.d.ts
index 4ec0031ae6..0fbffd107f 100644
--- a/types/react-icons/lib/fa/bell.d.ts
+++ b/types/react-icons/lib/fa/bell.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBell extends React.Component<IconBaseProps> { }
+declare class FaBell extends React.Component<IconBaseProps> { }
+export = FaBell;
diff --git a/types/react-icons/lib/fa/bicycle.d.ts b/types/react-icons/lib/fa/bicycle.d.ts
index e0017c15ca..15b474f323 100644
--- a/types/react-icons/lib/fa/bicycle.d.ts
+++ b/types/react-icons/lib/fa/bicycle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBicycle extends React.Component<IconBaseProps> { }
+declare class FaBicycle extends React.Component<IconBaseProps> { }
+export = FaBicycle;
diff --git a/types/react-icons/lib/fa/binoculars.d.ts b/types/react-icons/lib/fa/binoculars.d.ts
index 5dd06d8ed4..510cbc7f7e 100644
--- a/types/react-icons/lib/fa/binoculars.d.ts
+++ b/types/react-icons/lib/fa/binoculars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBinoculars extends React.Component<IconBaseProps> { }
+declare class FaBinoculars extends React.Component<IconBaseProps> { }
+export = FaBinoculars;
diff --git a/types/react-icons/lib/fa/birthday-cake.d.ts b/types/react-icons/lib/fa/birthday-cake.d.ts
index 24af4a13f7..b24bb44278 100644
--- a/types/react-icons/lib/fa/birthday-cake.d.ts
+++ b/types/react-icons/lib/fa/birthday-cake.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBirthdayCake extends React.Component<IconBaseProps> { }
+declare class FaBirthdayCake extends React.Component<IconBaseProps> { }
+export = FaBirthdayCake;
diff --git a/types/react-icons/lib/fa/bitbucket-square.d.ts b/types/react-icons/lib/fa/bitbucket-square.d.ts
index e9c80979f9..6a7c1e9415 100644
--- a/types/react-icons/lib/fa/bitbucket-square.d.ts
+++ b/types/react-icons/lib/fa/bitbucket-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBitbucketSquare extends React.Component<IconBaseProps> { }
+declare class FaBitbucketSquare extends React.Component<IconBaseProps> { }
+export = FaBitbucketSquare;
diff --git a/types/react-icons/lib/fa/bitbucket.d.ts b/types/react-icons/lib/fa/bitbucket.d.ts
index 3e46e9e0a9..fcced54555 100644
--- a/types/react-icons/lib/fa/bitbucket.d.ts
+++ b/types/react-icons/lib/fa/bitbucket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBitbucket extends React.Component<IconBaseProps> { }
+declare class FaBitbucket extends React.Component<IconBaseProps> { }
+export = FaBitbucket;
diff --git a/types/react-icons/lib/fa/bitcoin.d.ts b/types/react-icons/lib/fa/bitcoin.d.ts
index 34e0ee64b3..0e8499c6f9 100644
--- a/types/react-icons/lib/fa/bitcoin.d.ts
+++ b/types/react-icons/lib/fa/bitcoin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBitcoin extends React.Component<IconBaseProps> { }
+declare class FaBitcoin extends React.Component<IconBaseProps> { }
+export = FaBitcoin;
diff --git a/types/react-icons/lib/fa/black-tie.d.ts b/types/react-icons/lib/fa/black-tie.d.ts
index 4586a07039..84def8b91a 100644
--- a/types/react-icons/lib/fa/black-tie.d.ts
+++ b/types/react-icons/lib/fa/black-tie.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBlackTie extends React.Component<IconBaseProps> { }
+declare class FaBlackTie extends React.Component<IconBaseProps> { }
+export = FaBlackTie;
diff --git a/types/react-icons/lib/fa/blind.d.ts b/types/react-icons/lib/fa/blind.d.ts
index eb3606ac4c..9407689ee6 100644
--- a/types/react-icons/lib/fa/blind.d.ts
+++ b/types/react-icons/lib/fa/blind.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBlind extends React.Component<IconBaseProps> { }
+declare class FaBlind extends React.Component<IconBaseProps> { }
+export = FaBlind;
diff --git a/types/react-icons/lib/fa/bluetooth-b.d.ts b/types/react-icons/lib/fa/bluetooth-b.d.ts
index 4ca6448c1a..0c88c2dad5 100644
--- a/types/react-icons/lib/fa/bluetooth-b.d.ts
+++ b/types/react-icons/lib/fa/bluetooth-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBluetoothB extends React.Component<IconBaseProps> { }
+declare class FaBluetoothB extends React.Component<IconBaseProps> { }
+export = FaBluetoothB;
diff --git a/types/react-icons/lib/fa/bluetooth.d.ts b/types/react-icons/lib/fa/bluetooth.d.ts
index 0aba8d08f5..79251f2caa 100644
--- a/types/react-icons/lib/fa/bluetooth.d.ts
+++ b/types/react-icons/lib/fa/bluetooth.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBluetooth extends React.Component<IconBaseProps> { }
+declare class FaBluetooth extends React.Component<IconBaseProps> { }
+export = FaBluetooth;
diff --git a/types/react-icons/lib/fa/bold.d.ts b/types/react-icons/lib/fa/bold.d.ts
index 65c28daedc..60666c9484 100644
--- a/types/react-icons/lib/fa/bold.d.ts
+++ b/types/react-icons/lib/fa/bold.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBold extends React.Component<IconBaseProps> { }
+declare class FaBold extends React.Component<IconBaseProps> { }
+export = FaBold;
diff --git a/types/react-icons/lib/fa/bolt.d.ts b/types/react-icons/lib/fa/bolt.d.ts
index f4ecb5e36e..0eeb09b26e 100644
--- a/types/react-icons/lib/fa/bolt.d.ts
+++ b/types/react-icons/lib/fa/bolt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBolt extends React.Component<IconBaseProps> { }
+declare class FaBolt extends React.Component<IconBaseProps> { }
+export = FaBolt;
diff --git a/types/react-icons/lib/fa/bomb.d.ts b/types/react-icons/lib/fa/bomb.d.ts
index 7d8f3fff70..e2e806217b 100644
--- a/types/react-icons/lib/fa/bomb.d.ts
+++ b/types/react-icons/lib/fa/bomb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBomb extends React.Component<IconBaseProps> { }
+declare class FaBomb extends React.Component<IconBaseProps> { }
+export = FaBomb;
diff --git a/types/react-icons/lib/fa/book.d.ts b/types/react-icons/lib/fa/book.d.ts
index 2925f2f925..977bc019b9 100644
--- a/types/react-icons/lib/fa/book.d.ts
+++ b/types/react-icons/lib/fa/book.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBook extends React.Component<IconBaseProps> { }
+declare class FaBook extends React.Component<IconBaseProps> { }
+export = FaBook;
diff --git a/types/react-icons/lib/fa/bookmark-o.d.ts b/types/react-icons/lib/fa/bookmark-o.d.ts
index 07b10ae683..ee3ada48ce 100644
--- a/types/react-icons/lib/fa/bookmark-o.d.ts
+++ b/types/react-icons/lib/fa/bookmark-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBookmarkO extends React.Component<IconBaseProps> { }
+declare class FaBookmarkO extends React.Component<IconBaseProps> { }
+export = FaBookmarkO;
diff --git a/types/react-icons/lib/fa/bookmark.d.ts b/types/react-icons/lib/fa/bookmark.d.ts
index 60f758e9ae..7dbc33515b 100644
--- a/types/react-icons/lib/fa/bookmark.d.ts
+++ b/types/react-icons/lib/fa/bookmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBookmark extends React.Component<IconBaseProps> { }
+declare class FaBookmark extends React.Component<IconBaseProps> { }
+export = FaBookmark;
diff --git a/types/react-icons/lib/fa/braille.d.ts b/types/react-icons/lib/fa/braille.d.ts
index 4619546218..022d390d2b 100644
--- a/types/react-icons/lib/fa/braille.d.ts
+++ b/types/react-icons/lib/fa/braille.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBraille extends React.Component<IconBaseProps> { }
+declare class FaBraille extends React.Component<IconBaseProps> { }
+export = FaBraille;
diff --git a/types/react-icons/lib/fa/briefcase.d.ts b/types/react-icons/lib/fa/briefcase.d.ts
index ef7d7a3e67..302ba644f7 100644
--- a/types/react-icons/lib/fa/briefcase.d.ts
+++ b/types/react-icons/lib/fa/briefcase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBriefcase extends React.Component<IconBaseProps> { }
+declare class FaBriefcase extends React.Component<IconBaseProps> { }
+export = FaBriefcase;
diff --git a/types/react-icons/lib/fa/bug.d.ts b/types/react-icons/lib/fa/bug.d.ts
index 3a386909a9..01098a9aa2 100644
--- a/types/react-icons/lib/fa/bug.d.ts
+++ b/types/react-icons/lib/fa/bug.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBug extends React.Component<IconBaseProps> { }
+declare class FaBug extends React.Component<IconBaseProps> { }
+export = FaBug;
diff --git a/types/react-icons/lib/fa/building-o.d.ts b/types/react-icons/lib/fa/building-o.d.ts
index 1dab73f883..c3045c9cd7 100644
--- a/types/react-icons/lib/fa/building-o.d.ts
+++ b/types/react-icons/lib/fa/building-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBuildingO extends React.Component<IconBaseProps> { }
+declare class FaBuildingO extends React.Component<IconBaseProps> { }
+export = FaBuildingO;
diff --git a/types/react-icons/lib/fa/building.d.ts b/types/react-icons/lib/fa/building.d.ts
index 1094d0547b..b1b7dce542 100644
--- a/types/react-icons/lib/fa/building.d.ts
+++ b/types/react-icons/lib/fa/building.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBuilding extends React.Component<IconBaseProps> { }
+declare class FaBuilding extends React.Component<IconBaseProps> { }
+export = FaBuilding;
diff --git a/types/react-icons/lib/fa/bullhorn.d.ts b/types/react-icons/lib/fa/bullhorn.d.ts
index 83424c5116..75d62ada6c 100644
--- a/types/react-icons/lib/fa/bullhorn.d.ts
+++ b/types/react-icons/lib/fa/bullhorn.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBullhorn extends React.Component<IconBaseProps> { }
+declare class FaBullhorn extends React.Component<IconBaseProps> { }
+export = FaBullhorn;
diff --git a/types/react-icons/lib/fa/bullseye.d.ts b/types/react-icons/lib/fa/bullseye.d.ts
index eaa9ba66fe..07754ecece 100644
--- a/types/react-icons/lib/fa/bullseye.d.ts
+++ b/types/react-icons/lib/fa/bullseye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBullseye extends React.Component<IconBaseProps> { }
+declare class FaBullseye extends React.Component<IconBaseProps> { }
+export = FaBullseye;
diff --git a/types/react-icons/lib/fa/bus.d.ts b/types/react-icons/lib/fa/bus.d.ts
index 7fc2f7bfc5..f665b70b03 100644
--- a/types/react-icons/lib/fa/bus.d.ts
+++ b/types/react-icons/lib/fa/bus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBus extends React.Component<IconBaseProps> { }
+declare class FaBus extends React.Component<IconBaseProps> { }
+export = FaBus;
diff --git a/types/react-icons/lib/fa/buysellads.d.ts b/types/react-icons/lib/fa/buysellads.d.ts
index 304c070cce..5c4ff08cec 100644
--- a/types/react-icons/lib/fa/buysellads.d.ts
+++ b/types/react-icons/lib/fa/buysellads.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBuysellads extends React.Component<IconBaseProps> { }
+declare class FaBuysellads extends React.Component<IconBaseProps> { }
+export = FaBuysellads;
diff --git a/types/react-icons/lib/fa/cab.d.ts b/types/react-icons/lib/fa/cab.d.ts
index cd6af6ddd4..0fef928008 100644
--- a/types/react-icons/lib/fa/cab.d.ts
+++ b/types/react-icons/lib/fa/cab.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCab extends React.Component<IconBaseProps> { }
+declare class FaCab extends React.Component<IconBaseProps> { }
+export = FaCab;
diff --git a/types/react-icons/lib/fa/calculator.d.ts b/types/react-icons/lib/fa/calculator.d.ts
index ed26af229f..529ee803cb 100644
--- a/types/react-icons/lib/fa/calculator.d.ts
+++ b/types/react-icons/lib/fa/calculator.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalculator extends React.Component<IconBaseProps> { }
+declare class FaCalculator extends React.Component<IconBaseProps> { }
+export = FaCalculator;
diff --git a/types/react-icons/lib/fa/calendar-check-o.d.ts b/types/react-icons/lib/fa/calendar-check-o.d.ts
index 9829dc60c3..5d1cb2ff90 100644
--- a/types/react-icons/lib/fa/calendar-check-o.d.ts
+++ b/types/react-icons/lib/fa/calendar-check-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarCheckO extends React.Component<IconBaseProps> { }
+declare class FaCalendarCheckO extends React.Component<IconBaseProps> { }
+export = FaCalendarCheckO;
diff --git a/types/react-icons/lib/fa/calendar-minus-o.d.ts b/types/react-icons/lib/fa/calendar-minus-o.d.ts
index 64a2d3a3e3..3543a84dee 100644
--- a/types/react-icons/lib/fa/calendar-minus-o.d.ts
+++ b/types/react-icons/lib/fa/calendar-minus-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarMinusO extends React.Component<IconBaseProps> { }
+declare class FaCalendarMinusO extends React.Component<IconBaseProps> { }
+export = FaCalendarMinusO;
diff --git a/types/react-icons/lib/fa/calendar-o.d.ts b/types/react-icons/lib/fa/calendar-o.d.ts
index 8a70d1c368..800d56b20e 100644
--- a/types/react-icons/lib/fa/calendar-o.d.ts
+++ b/types/react-icons/lib/fa/calendar-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarO extends React.Component<IconBaseProps> { }
+declare class FaCalendarO extends React.Component<IconBaseProps> { }
+export = FaCalendarO;
diff --git a/types/react-icons/lib/fa/calendar-plus-o.d.ts b/types/react-icons/lib/fa/calendar-plus-o.d.ts
index 0ff42b4d29..3aad9661ce 100644
--- a/types/react-icons/lib/fa/calendar-plus-o.d.ts
+++ b/types/react-icons/lib/fa/calendar-plus-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarPlusO extends React.Component<IconBaseProps> { }
+declare class FaCalendarPlusO extends React.Component<IconBaseProps> { }
+export = FaCalendarPlusO;
diff --git a/types/react-icons/lib/fa/calendar-times-o.d.ts b/types/react-icons/lib/fa/calendar-times-o.d.ts
index 2a81539d66..5553fd7d71 100644
--- a/types/react-icons/lib/fa/calendar-times-o.d.ts
+++ b/types/react-icons/lib/fa/calendar-times-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarTimesO extends React.Component<IconBaseProps> { }
+declare class FaCalendarTimesO extends React.Component<IconBaseProps> { }
+export = FaCalendarTimesO;
diff --git a/types/react-icons/lib/fa/calendar.d.ts b/types/react-icons/lib/fa/calendar.d.ts
index deec1eaeb4..e013516f56 100644
--- a/types/react-icons/lib/fa/calendar.d.ts
+++ b/types/react-icons/lib/fa/calendar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendar extends React.Component<IconBaseProps> { }
+declare class FaCalendar extends React.Component<IconBaseProps> { }
+export = FaCalendar;
diff --git a/types/react-icons/lib/fa/camera-retro.d.ts b/types/react-icons/lib/fa/camera-retro.d.ts
index 64821f1f67..3874bc78d8 100644
--- a/types/react-icons/lib/fa/camera-retro.d.ts
+++ b/types/react-icons/lib/fa/camera-retro.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCameraRetro extends React.Component<IconBaseProps> { }
+declare class FaCameraRetro extends React.Component<IconBaseProps> { }
+export = FaCameraRetro;
diff --git a/types/react-icons/lib/fa/camera.d.ts b/types/react-icons/lib/fa/camera.d.ts
index 4928697191..65c011e1ac 100644
--- a/types/react-icons/lib/fa/camera.d.ts
+++ b/types/react-icons/lib/fa/camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCamera extends React.Component<IconBaseProps> { }
+declare class FaCamera extends React.Component<IconBaseProps> { }
+export = FaCamera;
diff --git a/types/react-icons/lib/fa/caret-down.d.ts b/types/react-icons/lib/fa/caret-down.d.ts
index dbc43f0466..9c2cfb0314 100644
--- a/types/react-icons/lib/fa/caret-down.d.ts
+++ b/types/react-icons/lib/fa/caret-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretDown extends React.Component<IconBaseProps> { }
+declare class FaCaretDown extends React.Component<IconBaseProps> { }
+export = FaCaretDown;
diff --git a/types/react-icons/lib/fa/caret-left.d.ts b/types/react-icons/lib/fa/caret-left.d.ts
index 420ce16ba3..c4d40cd908 100644
--- a/types/react-icons/lib/fa/caret-left.d.ts
+++ b/types/react-icons/lib/fa/caret-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretLeft extends React.Component<IconBaseProps> { }
+declare class FaCaretLeft extends React.Component<IconBaseProps> { }
+export = FaCaretLeft;
diff --git a/types/react-icons/lib/fa/caret-right.d.ts b/types/react-icons/lib/fa/caret-right.d.ts
index 44e7429916..fa5bed855e 100644
--- a/types/react-icons/lib/fa/caret-right.d.ts
+++ b/types/react-icons/lib/fa/caret-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretRight extends React.Component<IconBaseProps> { }
+declare class FaCaretRight extends React.Component<IconBaseProps> { }
+export = FaCaretRight;
diff --git a/types/react-icons/lib/fa/caret-square-o-down.d.ts b/types/react-icons/lib/fa/caret-square-o-down.d.ts
index dd6d132183..c8a67aa27c 100644
--- a/types/react-icons/lib/fa/caret-square-o-down.d.ts
+++ b/types/react-icons/lib/fa/caret-square-o-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareODown extends React.Component<IconBaseProps> { }
+declare class FaCaretSquareODown extends React.Component<IconBaseProps> { }
+export = FaCaretSquareODown;
diff --git a/types/react-icons/lib/fa/caret-square-o-left.d.ts b/types/react-icons/lib/fa/caret-square-o-left.d.ts
index 042ada389c..5aad5ec1e4 100644
--- a/types/react-icons/lib/fa/caret-square-o-left.d.ts
+++ b/types/react-icons/lib/fa/caret-square-o-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareOLeft extends React.Component<IconBaseProps> { }
+declare class FaCaretSquareOLeft extends React.Component<IconBaseProps> { }
+export = FaCaretSquareOLeft;
diff --git a/types/react-icons/lib/fa/caret-square-o-right.d.ts b/types/react-icons/lib/fa/caret-square-o-right.d.ts
index 12cee8faf7..f84499954b 100644
--- a/types/react-icons/lib/fa/caret-square-o-right.d.ts
+++ b/types/react-icons/lib/fa/caret-square-o-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareORight extends React.Component<IconBaseProps> { }
+declare class FaCaretSquareORight extends React.Component<IconBaseProps> { }
+export = FaCaretSquareORight;
diff --git a/types/react-icons/lib/fa/caret-square-o-up.d.ts b/types/react-icons/lib/fa/caret-square-o-up.d.ts
index 36e0c7bee6..905bb5f071 100644
--- a/types/react-icons/lib/fa/caret-square-o-up.d.ts
+++ b/types/react-icons/lib/fa/caret-square-o-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareOUp extends React.Component<IconBaseProps> { }
+declare class FaCaretSquareOUp extends React.Component<IconBaseProps> { }
+export = FaCaretSquareOUp;
diff --git a/types/react-icons/lib/fa/caret-up.d.ts b/types/react-icons/lib/fa/caret-up.d.ts
index 4eaad4bb41..7960d7953b 100644
--- a/types/react-icons/lib/fa/caret-up.d.ts
+++ b/types/react-icons/lib/fa/caret-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretUp extends React.Component<IconBaseProps> { }
+declare class FaCaretUp extends React.Component<IconBaseProps> { }
+export = FaCaretUp;
diff --git a/types/react-icons/lib/fa/cart-arrow-down.d.ts b/types/react-icons/lib/fa/cart-arrow-down.d.ts
index 539933f702..d62cc7ab36 100644
--- a/types/react-icons/lib/fa/cart-arrow-down.d.ts
+++ b/types/react-icons/lib/fa/cart-arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCartArrowDown extends React.Component<IconBaseProps> { }
+declare class FaCartArrowDown extends React.Component<IconBaseProps> { }
+export = FaCartArrowDown;
diff --git a/types/react-icons/lib/fa/cart-plus.d.ts b/types/react-icons/lib/fa/cart-plus.d.ts
index 00e645e840..c8d1c7df7b 100644
--- a/types/react-icons/lib/fa/cart-plus.d.ts
+++ b/types/react-icons/lib/fa/cart-plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCartPlus extends React.Component<IconBaseProps> { }
+declare class FaCartPlus extends React.Component<IconBaseProps> { }
+export = FaCartPlus;
diff --git a/types/react-icons/lib/fa/cc-amex.d.ts b/types/react-icons/lib/fa/cc-amex.d.ts
index daede8980e..799b2ef861 100644
--- a/types/react-icons/lib/fa/cc-amex.d.ts
+++ b/types/react-icons/lib/fa/cc-amex.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcAmex extends React.Component<IconBaseProps> { }
+declare class FaCcAmex extends React.Component<IconBaseProps> { }
+export = FaCcAmex;
diff --git a/types/react-icons/lib/fa/cc-diners-club.d.ts b/types/react-icons/lib/fa/cc-diners-club.d.ts
index 5263120cb0..24a9063012 100644
--- a/types/react-icons/lib/fa/cc-diners-club.d.ts
+++ b/types/react-icons/lib/fa/cc-diners-club.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcDinersClub extends React.Component<IconBaseProps> { }
+declare class FaCcDinersClub extends React.Component<IconBaseProps> { }
+export = FaCcDinersClub;
diff --git a/types/react-icons/lib/fa/cc-discover.d.ts b/types/react-icons/lib/fa/cc-discover.d.ts
index 0d5e5d6daa..ab5013f5be 100644
--- a/types/react-icons/lib/fa/cc-discover.d.ts
+++ b/types/react-icons/lib/fa/cc-discover.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcDiscover extends React.Component<IconBaseProps> { }
+declare class FaCcDiscover extends React.Component<IconBaseProps> { }
+export = FaCcDiscover;
diff --git a/types/react-icons/lib/fa/cc-jcb.d.ts b/types/react-icons/lib/fa/cc-jcb.d.ts
index 3aeb4c483f..abce375354 100644
--- a/types/react-icons/lib/fa/cc-jcb.d.ts
+++ b/types/react-icons/lib/fa/cc-jcb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcJcb extends React.Component<IconBaseProps> { }
+declare class FaCcJcb extends React.Component<IconBaseProps> { }
+export = FaCcJcb;
diff --git a/types/react-icons/lib/fa/cc-mastercard.d.ts b/types/react-icons/lib/fa/cc-mastercard.d.ts
index 58e0e375c0..ef56888e0d 100644
--- a/types/react-icons/lib/fa/cc-mastercard.d.ts
+++ b/types/react-icons/lib/fa/cc-mastercard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcMastercard extends React.Component<IconBaseProps> { }
+declare class FaCcMastercard extends React.Component<IconBaseProps> { }
+export = FaCcMastercard;
diff --git a/types/react-icons/lib/fa/cc-paypal.d.ts b/types/react-icons/lib/fa/cc-paypal.d.ts
index 4fb116f8ab..5eb38ef785 100644
--- a/types/react-icons/lib/fa/cc-paypal.d.ts
+++ b/types/react-icons/lib/fa/cc-paypal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcPaypal extends React.Component<IconBaseProps> { }
+declare class FaCcPaypal extends React.Component<IconBaseProps> { }
+export = FaCcPaypal;
diff --git a/types/react-icons/lib/fa/cc-stripe.d.ts b/types/react-icons/lib/fa/cc-stripe.d.ts
index afb2d4cac8..fd72b8aa13 100644
--- a/types/react-icons/lib/fa/cc-stripe.d.ts
+++ b/types/react-icons/lib/fa/cc-stripe.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcStripe extends React.Component<IconBaseProps> { }
+declare class FaCcStripe extends React.Component<IconBaseProps> { }
+export = FaCcStripe;
diff --git a/types/react-icons/lib/fa/cc-visa.d.ts b/types/react-icons/lib/fa/cc-visa.d.ts
index 4e5b06b45f..d0dc3e793c 100644
--- a/types/react-icons/lib/fa/cc-visa.d.ts
+++ b/types/react-icons/lib/fa/cc-visa.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcVisa extends React.Component<IconBaseProps> { }
+declare class FaCcVisa extends React.Component<IconBaseProps> { }
+export = FaCcVisa;
diff --git a/types/react-icons/lib/fa/cc.d.ts b/types/react-icons/lib/fa/cc.d.ts
index e2c4036439..4a74a0e2c4 100644
--- a/types/react-icons/lib/fa/cc.d.ts
+++ b/types/react-icons/lib/fa/cc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCc extends React.Component<IconBaseProps> { }
+declare class FaCc extends React.Component<IconBaseProps> { }
+export = FaCc;
diff --git a/types/react-icons/lib/fa/certificate.d.ts b/types/react-icons/lib/fa/certificate.d.ts
index c8845fb117..edbb804b75 100644
--- a/types/react-icons/lib/fa/certificate.d.ts
+++ b/types/react-icons/lib/fa/certificate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCertificate extends React.Component<IconBaseProps> { }
+declare class FaCertificate extends React.Component<IconBaseProps> { }
+export = FaCertificate;
diff --git a/types/react-icons/lib/fa/chain-broken.d.ts b/types/react-icons/lib/fa/chain-broken.d.ts
index 87a8310d0a..e799c01fed 100644
--- a/types/react-icons/lib/fa/chain-broken.d.ts
+++ b/types/react-icons/lib/fa/chain-broken.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChainBroken extends React.Component<IconBaseProps> { }
+declare class FaChainBroken extends React.Component<IconBaseProps> { }
+export = FaChainBroken;
diff --git a/types/react-icons/lib/fa/chain.d.ts b/types/react-icons/lib/fa/chain.d.ts
index 8359a5f773..851a1bcc8e 100644
--- a/types/react-icons/lib/fa/chain.d.ts
+++ b/types/react-icons/lib/fa/chain.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChain extends React.Component<IconBaseProps> { }
+declare class FaChain extends React.Component<IconBaseProps> { }
+export = FaChain;
diff --git a/types/react-icons/lib/fa/check-circle-o.d.ts b/types/react-icons/lib/fa/check-circle-o.d.ts
index 32390d5c4c..dbb3f5bb83 100644
--- a/types/react-icons/lib/fa/check-circle-o.d.ts
+++ b/types/react-icons/lib/fa/check-circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckCircleO extends React.Component<IconBaseProps> { }
+declare class FaCheckCircleO extends React.Component<IconBaseProps> { }
+export = FaCheckCircleO;
diff --git a/types/react-icons/lib/fa/check-circle.d.ts b/types/react-icons/lib/fa/check-circle.d.ts
index c30263a3be..121f56e87a 100644
--- a/types/react-icons/lib/fa/check-circle.d.ts
+++ b/types/react-icons/lib/fa/check-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckCircle extends React.Component<IconBaseProps> { }
+declare class FaCheckCircle extends React.Component<IconBaseProps> { }
+export = FaCheckCircle;
diff --git a/types/react-icons/lib/fa/check-square-o.d.ts b/types/react-icons/lib/fa/check-square-o.d.ts
index b4aef21d8c..fdd433d5a7 100644
--- a/types/react-icons/lib/fa/check-square-o.d.ts
+++ b/types/react-icons/lib/fa/check-square-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckSquareO extends React.Component<IconBaseProps> { }
+declare class FaCheckSquareO extends React.Component<IconBaseProps> { }
+export = FaCheckSquareO;
diff --git a/types/react-icons/lib/fa/check-square.d.ts b/types/react-icons/lib/fa/check-square.d.ts
index f6ba4ce0bd..3c83c64db3 100644
--- a/types/react-icons/lib/fa/check-square.d.ts
+++ b/types/react-icons/lib/fa/check-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckSquare extends React.Component<IconBaseProps> { }
+declare class FaCheckSquare extends React.Component<IconBaseProps> { }
+export = FaCheckSquare;
diff --git a/types/react-icons/lib/fa/check.d.ts b/types/react-icons/lib/fa/check.d.ts
index b30727c61c..28ef292a15 100644
--- a/types/react-icons/lib/fa/check.d.ts
+++ b/types/react-icons/lib/fa/check.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheck extends React.Component<IconBaseProps> { }
+declare class FaCheck extends React.Component<IconBaseProps> { }
+export = FaCheck;
diff --git a/types/react-icons/lib/fa/chevron-circle-down.d.ts b/types/react-icons/lib/fa/chevron-circle-down.d.ts
index 35eb978aec..4faa5f1df4 100644
--- a/types/react-icons/lib/fa/chevron-circle-down.d.ts
+++ b/types/react-icons/lib/fa/chevron-circle-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleDown extends React.Component<IconBaseProps> { }
+declare class FaChevronCircleDown extends React.Component<IconBaseProps> { }
+export = FaChevronCircleDown;
diff --git a/types/react-icons/lib/fa/chevron-circle-left.d.ts b/types/react-icons/lib/fa/chevron-circle-left.d.ts
index e84cdd9146..b704b3f359 100644
--- a/types/react-icons/lib/fa/chevron-circle-left.d.ts
+++ b/types/react-icons/lib/fa/chevron-circle-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleLeft extends React.Component<IconBaseProps> { }
+declare class FaChevronCircleLeft extends React.Component<IconBaseProps> { }
+export = FaChevronCircleLeft;
diff --git a/types/react-icons/lib/fa/chevron-circle-right.d.ts b/types/react-icons/lib/fa/chevron-circle-right.d.ts
index d5e4d2429c..19672a33b7 100644
--- a/types/react-icons/lib/fa/chevron-circle-right.d.ts
+++ b/types/react-icons/lib/fa/chevron-circle-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleRight extends React.Component<IconBaseProps> { }
+declare class FaChevronCircleRight extends React.Component<IconBaseProps> { }
+export = FaChevronCircleRight;
diff --git a/types/react-icons/lib/fa/chevron-circle-up.d.ts b/types/react-icons/lib/fa/chevron-circle-up.d.ts
index bedcb877d6..8cb4ba33e8 100644
--- a/types/react-icons/lib/fa/chevron-circle-up.d.ts
+++ b/types/react-icons/lib/fa/chevron-circle-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleUp extends React.Component<IconBaseProps> { }
+declare class FaChevronCircleUp extends React.Component<IconBaseProps> { }
+export = FaChevronCircleUp;
diff --git a/types/react-icons/lib/fa/chevron-down.d.ts b/types/react-icons/lib/fa/chevron-down.d.ts
index 5c9ae23cf8..7a113a7bd3 100644
--- a/types/react-icons/lib/fa/chevron-down.d.ts
+++ b/types/react-icons/lib/fa/chevron-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronDown extends React.Component<IconBaseProps> { }
+declare class FaChevronDown extends React.Component<IconBaseProps> { }
+export = FaChevronDown;
diff --git a/types/react-icons/lib/fa/chevron-left.d.ts b/types/react-icons/lib/fa/chevron-left.d.ts
index b07fae8a5e..2a797f7bfb 100644
--- a/types/react-icons/lib/fa/chevron-left.d.ts
+++ b/types/react-icons/lib/fa/chevron-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronLeft extends React.Component<IconBaseProps> { }
+declare class FaChevronLeft extends React.Component<IconBaseProps> { }
+export = FaChevronLeft;
diff --git a/types/react-icons/lib/fa/chevron-right.d.ts b/types/react-icons/lib/fa/chevron-right.d.ts
index 27f6264560..0022750994 100644
--- a/types/react-icons/lib/fa/chevron-right.d.ts
+++ b/types/react-icons/lib/fa/chevron-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronRight extends React.Component<IconBaseProps> { }
+declare class FaChevronRight extends React.Component<IconBaseProps> { }
+export = FaChevronRight;
diff --git a/types/react-icons/lib/fa/chevron-up.d.ts b/types/react-icons/lib/fa/chevron-up.d.ts
index 3847054d06..b1cece9f2c 100644
--- a/types/react-icons/lib/fa/chevron-up.d.ts
+++ b/types/react-icons/lib/fa/chevron-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronUp extends React.Component<IconBaseProps> { }
+declare class FaChevronUp extends React.Component<IconBaseProps> { }
+export = FaChevronUp;
diff --git a/types/react-icons/lib/fa/child.d.ts b/types/react-icons/lib/fa/child.d.ts
index 08209ee585..3a9361e176 100644
--- a/types/react-icons/lib/fa/child.d.ts
+++ b/types/react-icons/lib/fa/child.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChild extends React.Component<IconBaseProps> { }
+declare class FaChild extends React.Component<IconBaseProps> { }
+export = FaChild;
diff --git a/types/react-icons/lib/fa/chrome.d.ts b/types/react-icons/lib/fa/chrome.d.ts
index 703caadb19..691dec5b26 100644
--- a/types/react-icons/lib/fa/chrome.d.ts
+++ b/types/react-icons/lib/fa/chrome.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChrome extends React.Component<IconBaseProps> { }
+declare class FaChrome extends React.Component<IconBaseProps> { }
+export = FaChrome;
diff --git a/types/react-icons/lib/fa/circle-o-notch.d.ts b/types/react-icons/lib/fa/circle-o-notch.d.ts
index ed18a9f78d..b58f16f73d 100644
--- a/types/react-icons/lib/fa/circle-o-notch.d.ts
+++ b/types/react-icons/lib/fa/circle-o-notch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleONotch extends React.Component<IconBaseProps> { }
+declare class FaCircleONotch extends React.Component<IconBaseProps> { }
+export = FaCircleONotch;
diff --git a/types/react-icons/lib/fa/circle-o.d.ts b/types/react-icons/lib/fa/circle-o.d.ts
index 05001b7669..f39a3363db 100644
--- a/types/react-icons/lib/fa/circle-o.d.ts
+++ b/types/react-icons/lib/fa/circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleO extends React.Component<IconBaseProps> { }
+declare class FaCircleO extends React.Component<IconBaseProps> { }
+export = FaCircleO;
diff --git a/types/react-icons/lib/fa/circle-thin.d.ts b/types/react-icons/lib/fa/circle-thin.d.ts
index 017b8a0e4d..20bb05625d 100644
--- a/types/react-icons/lib/fa/circle-thin.d.ts
+++ b/types/react-icons/lib/fa/circle-thin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleThin extends React.Component<IconBaseProps> { }
+declare class FaCircleThin extends React.Component<IconBaseProps> { }
+export = FaCircleThin;
diff --git a/types/react-icons/lib/fa/circle.d.ts b/types/react-icons/lib/fa/circle.d.ts
index 14b042ae0b..868df82fd0 100644
--- a/types/react-icons/lib/fa/circle.d.ts
+++ b/types/react-icons/lib/fa/circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircle extends React.Component<IconBaseProps> { }
+declare class FaCircle extends React.Component<IconBaseProps> { }
+export = FaCircle;
diff --git a/types/react-icons/lib/fa/clipboard.d.ts b/types/react-icons/lib/fa/clipboard.d.ts
index 6a15d300fb..e22d01efc8 100644
--- a/types/react-icons/lib/fa/clipboard.d.ts
+++ b/types/react-icons/lib/fa/clipboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClipboard extends React.Component<IconBaseProps> { }
+declare class FaClipboard extends React.Component<IconBaseProps> { }
+export = FaClipboard;
diff --git a/types/react-icons/lib/fa/clock-o.d.ts b/types/react-icons/lib/fa/clock-o.d.ts
index 021deeb65e..cdc63f0cff 100644
--- a/types/react-icons/lib/fa/clock-o.d.ts
+++ b/types/react-icons/lib/fa/clock-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClockO extends React.Component<IconBaseProps> { }
+declare class FaClockO extends React.Component<IconBaseProps> { }
+export = FaClockO;
diff --git a/types/react-icons/lib/fa/clone.d.ts b/types/react-icons/lib/fa/clone.d.ts
index 60b8d9d0b9..f0f4ffb33a 100644
--- a/types/react-icons/lib/fa/clone.d.ts
+++ b/types/react-icons/lib/fa/clone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClone extends React.Component<IconBaseProps> { }
+declare class FaClone extends React.Component<IconBaseProps> { }
+export = FaClone;
diff --git a/types/react-icons/lib/fa/close.d.ts b/types/react-icons/lib/fa/close.d.ts
index 81b3c24102..094b3e1b85 100644
--- a/types/react-icons/lib/fa/close.d.ts
+++ b/types/react-icons/lib/fa/close.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClose extends React.Component<IconBaseProps> { }
+declare class FaClose extends React.Component<IconBaseProps> { }
+export = FaClose;
diff --git a/types/react-icons/lib/fa/cloud-download.d.ts b/types/react-icons/lib/fa/cloud-download.d.ts
index 76834995ef..7c43077f87 100644
--- a/types/react-icons/lib/fa/cloud-download.d.ts
+++ b/types/react-icons/lib/fa/cloud-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCloudDownload extends React.Component<IconBaseProps> { }
+declare class FaCloudDownload extends React.Component<IconBaseProps> { }
+export = FaCloudDownload;
diff --git a/types/react-icons/lib/fa/cloud-upload.d.ts b/types/react-icons/lib/fa/cloud-upload.d.ts
index 68e7a59934..a1889f0e7a 100644
--- a/types/react-icons/lib/fa/cloud-upload.d.ts
+++ b/types/react-icons/lib/fa/cloud-upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCloudUpload extends React.Component<IconBaseProps> { }
+declare class FaCloudUpload extends React.Component<IconBaseProps> { }
+export = FaCloudUpload;
diff --git a/types/react-icons/lib/fa/cloud.d.ts b/types/react-icons/lib/fa/cloud.d.ts
index 555b3f5a09..3731c7dc7f 100644
--- a/types/react-icons/lib/fa/cloud.d.ts
+++ b/types/react-icons/lib/fa/cloud.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCloud extends React.Component<IconBaseProps> { }
+declare class FaCloud extends React.Component<IconBaseProps> { }
+export = FaCloud;
diff --git a/types/react-icons/lib/fa/cny.d.ts b/types/react-icons/lib/fa/cny.d.ts
index 816523c44e..0beb3d9267 100644
--- a/types/react-icons/lib/fa/cny.d.ts
+++ b/types/react-icons/lib/fa/cny.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCny extends React.Component<IconBaseProps> { }
+declare class FaCny extends React.Component<IconBaseProps> { }
+export = FaCny;
diff --git a/types/react-icons/lib/fa/code-fork.d.ts b/types/react-icons/lib/fa/code-fork.d.ts
index 520f347006..629cb69d31 100644
--- a/types/react-icons/lib/fa/code-fork.d.ts
+++ b/types/react-icons/lib/fa/code-fork.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCodeFork extends React.Component<IconBaseProps> { }
+declare class FaCodeFork extends React.Component<IconBaseProps> { }
+export = FaCodeFork;
diff --git a/types/react-icons/lib/fa/code.d.ts b/types/react-icons/lib/fa/code.d.ts
index 5a9b025804..c326599c5b 100644
--- a/types/react-icons/lib/fa/code.d.ts
+++ b/types/react-icons/lib/fa/code.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCode extends React.Component<IconBaseProps> { }
+declare class FaCode extends React.Component<IconBaseProps> { }
+export = FaCode;
diff --git a/types/react-icons/lib/fa/codepen.d.ts b/types/react-icons/lib/fa/codepen.d.ts
index e317fd7e6e..fca3ca9958 100644
--- a/types/react-icons/lib/fa/codepen.d.ts
+++ b/types/react-icons/lib/fa/codepen.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCodepen extends React.Component<IconBaseProps> { }
+declare class FaCodepen extends React.Component<IconBaseProps> { }
+export = FaCodepen;
diff --git a/types/react-icons/lib/fa/codiepie.d.ts b/types/react-icons/lib/fa/codiepie.d.ts
index 74deac600a..fe85ee642b 100644
--- a/types/react-icons/lib/fa/codiepie.d.ts
+++ b/types/react-icons/lib/fa/codiepie.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCodiepie extends React.Component<IconBaseProps> { }
+declare class FaCodiepie extends React.Component<IconBaseProps> { }
+export = FaCodiepie;
diff --git a/types/react-icons/lib/fa/coffee.d.ts b/types/react-icons/lib/fa/coffee.d.ts
index defdc05087..c180b18989 100644
--- a/types/react-icons/lib/fa/coffee.d.ts
+++ b/types/react-icons/lib/fa/coffee.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCoffee extends React.Component<IconBaseProps> { }
+declare class FaCoffee extends React.Component<IconBaseProps> { }
+export = FaCoffee;
diff --git a/types/react-icons/lib/fa/cog.d.ts b/types/react-icons/lib/fa/cog.d.ts
index 1fe2c08345..1a334e597a 100644
--- a/types/react-icons/lib/fa/cog.d.ts
+++ b/types/react-icons/lib/fa/cog.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCog extends React.Component<IconBaseProps> { }
+declare class FaCog extends React.Component<IconBaseProps> { }
+export = FaCog;
diff --git a/types/react-icons/lib/fa/cogs.d.ts b/types/react-icons/lib/fa/cogs.d.ts
index daf4b449d3..af3acaec4d 100644
--- a/types/react-icons/lib/fa/cogs.d.ts
+++ b/types/react-icons/lib/fa/cogs.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCogs extends React.Component<IconBaseProps> { }
+declare class FaCogs extends React.Component<IconBaseProps> { }
+export = FaCogs;
diff --git a/types/react-icons/lib/fa/columns.d.ts b/types/react-icons/lib/fa/columns.d.ts
index 8e88628b63..c4654d0a77 100644
--- a/types/react-icons/lib/fa/columns.d.ts
+++ b/types/react-icons/lib/fa/columns.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaColumns extends React.Component<IconBaseProps> { }
+declare class FaColumns extends React.Component<IconBaseProps> { }
+export = FaColumns;
diff --git a/types/react-icons/lib/fa/comment-o.d.ts b/types/react-icons/lib/fa/comment-o.d.ts
index e627ec6248..dd54ac16e0 100644
--- a/types/react-icons/lib/fa/comment-o.d.ts
+++ b/types/react-icons/lib/fa/comment-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentO extends React.Component<IconBaseProps> { }
+declare class FaCommentO extends React.Component<IconBaseProps> { }
+export = FaCommentO;
diff --git a/types/react-icons/lib/fa/comment.d.ts b/types/react-icons/lib/fa/comment.d.ts
index 82043adb6a..a047b84b08 100644
--- a/types/react-icons/lib/fa/comment.d.ts
+++ b/types/react-icons/lib/fa/comment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaComment extends React.Component<IconBaseProps> { }
+declare class FaComment extends React.Component<IconBaseProps> { }
+export = FaComment;
diff --git a/types/react-icons/lib/fa/commenting-o.d.ts b/types/react-icons/lib/fa/commenting-o.d.ts
index 40a4c3f058..62f564350d 100644
--- a/types/react-icons/lib/fa/commenting-o.d.ts
+++ b/types/react-icons/lib/fa/commenting-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentingO extends React.Component<IconBaseProps> { }
+declare class FaCommentingO extends React.Component<IconBaseProps> { }
+export = FaCommentingO;
diff --git a/types/react-icons/lib/fa/commenting.d.ts b/types/react-icons/lib/fa/commenting.d.ts
index 1031cc0ad6..d441889bfa 100644
--- a/types/react-icons/lib/fa/commenting.d.ts
+++ b/types/react-icons/lib/fa/commenting.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommenting extends React.Component<IconBaseProps> { }
+declare class FaCommenting extends React.Component<IconBaseProps> { }
+export = FaCommenting;
diff --git a/types/react-icons/lib/fa/comments-o.d.ts b/types/react-icons/lib/fa/comments-o.d.ts
index 191de8b6a3..fc8d61a241 100644
--- a/types/react-icons/lib/fa/comments-o.d.ts
+++ b/types/react-icons/lib/fa/comments-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentsO extends React.Component<IconBaseProps> { }
+declare class FaCommentsO extends React.Component<IconBaseProps> { }
+export = FaCommentsO;
diff --git a/types/react-icons/lib/fa/comments.d.ts b/types/react-icons/lib/fa/comments.d.ts
index e77e9f4b42..bfcc34638d 100644
--- a/types/react-icons/lib/fa/comments.d.ts
+++ b/types/react-icons/lib/fa/comments.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaComments extends React.Component<IconBaseProps> { }
+declare class FaComments extends React.Component<IconBaseProps> { }
+export = FaComments;
diff --git a/types/react-icons/lib/fa/compass.d.ts b/types/react-icons/lib/fa/compass.d.ts
index 36d4843b21..723d54adc2 100644
--- a/types/react-icons/lib/fa/compass.d.ts
+++ b/types/react-icons/lib/fa/compass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCompass extends React.Component<IconBaseProps> { }
+declare class FaCompass extends React.Component<IconBaseProps> { }
+export = FaCompass;
diff --git a/types/react-icons/lib/fa/compress.d.ts b/types/react-icons/lib/fa/compress.d.ts
index 7f2f48ca22..b74cdb1972 100644
--- a/types/react-icons/lib/fa/compress.d.ts
+++ b/types/react-icons/lib/fa/compress.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCompress extends React.Component<IconBaseProps> { }
+declare class FaCompress extends React.Component<IconBaseProps> { }
+export = FaCompress;
diff --git a/types/react-icons/lib/fa/connectdevelop.d.ts b/types/react-icons/lib/fa/connectdevelop.d.ts
index aae5bfa48c..efbff96350 100644
--- a/types/react-icons/lib/fa/connectdevelop.d.ts
+++ b/types/react-icons/lib/fa/connectdevelop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaConnectdevelop extends React.Component<IconBaseProps> { }
+declare class FaConnectdevelop extends React.Component<IconBaseProps> { }
+export = FaConnectdevelop;
diff --git a/types/react-icons/lib/fa/contao.d.ts b/types/react-icons/lib/fa/contao.d.ts
index c99ab675b4..bef2e66ee5 100644
--- a/types/react-icons/lib/fa/contao.d.ts
+++ b/types/react-icons/lib/fa/contao.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaContao extends React.Component<IconBaseProps> { }
+declare class FaContao extends React.Component<IconBaseProps> { }
+export = FaContao;
diff --git a/types/react-icons/lib/fa/copy.d.ts b/types/react-icons/lib/fa/copy.d.ts
index 3e6e11bf31..df23e99f5c 100644
--- a/types/react-icons/lib/fa/copy.d.ts
+++ b/types/react-icons/lib/fa/copy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCopy extends React.Component<IconBaseProps> { }
+declare class FaCopy extends React.Component<IconBaseProps> { }
+export = FaCopy;
diff --git a/types/react-icons/lib/fa/copyright.d.ts b/types/react-icons/lib/fa/copyright.d.ts
index 630383979f..5e4d25dddf 100644
--- a/types/react-icons/lib/fa/copyright.d.ts
+++ b/types/react-icons/lib/fa/copyright.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCopyright extends React.Component<IconBaseProps> { }
+declare class FaCopyright extends React.Component<IconBaseProps> { }
+export = FaCopyright;
diff --git a/types/react-icons/lib/fa/creative-commons.d.ts b/types/react-icons/lib/fa/creative-commons.d.ts
index eecacfd23c..0d7a0f343d 100644
--- a/types/react-icons/lib/fa/creative-commons.d.ts
+++ b/types/react-icons/lib/fa/creative-commons.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCreativeCommons extends React.Component<IconBaseProps> { }
+declare class FaCreativeCommons extends React.Component<IconBaseProps> { }
+export = FaCreativeCommons;
diff --git a/types/react-icons/lib/fa/credit-card-alt.d.ts b/types/react-icons/lib/fa/credit-card-alt.d.ts
index c9d2f20993..6a21316ced 100644
--- a/types/react-icons/lib/fa/credit-card-alt.d.ts
+++ b/types/react-icons/lib/fa/credit-card-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCreditCardAlt extends React.Component<IconBaseProps> { }
+declare class FaCreditCardAlt extends React.Component<IconBaseProps> { }
+export = FaCreditCardAlt;
diff --git a/types/react-icons/lib/fa/credit-card.d.ts b/types/react-icons/lib/fa/credit-card.d.ts
index 374f9efdda..0a66aa3502 100644
--- a/types/react-icons/lib/fa/credit-card.d.ts
+++ b/types/react-icons/lib/fa/credit-card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCreditCard extends React.Component<IconBaseProps> { }
+declare class FaCreditCard extends React.Component<IconBaseProps> { }
+export = FaCreditCard;
diff --git a/types/react-icons/lib/fa/crop.d.ts b/types/react-icons/lib/fa/crop.d.ts
index aa47690da9..d5a8fca0c0 100644
--- a/types/react-icons/lib/fa/crop.d.ts
+++ b/types/react-icons/lib/fa/crop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCrop extends React.Component<IconBaseProps> { }
+declare class FaCrop extends React.Component<IconBaseProps> { }
+export = FaCrop;
diff --git a/types/react-icons/lib/fa/crosshairs.d.ts b/types/react-icons/lib/fa/crosshairs.d.ts
index c54203bb33..9d0eec3c43 100644
--- a/types/react-icons/lib/fa/crosshairs.d.ts
+++ b/types/react-icons/lib/fa/crosshairs.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCrosshairs extends React.Component<IconBaseProps> { }
+declare class FaCrosshairs extends React.Component<IconBaseProps> { }
+export = FaCrosshairs;
diff --git a/types/react-icons/lib/fa/css3.d.ts b/types/react-icons/lib/fa/css3.d.ts
index 361b20e295..09da385a81 100644
--- a/types/react-icons/lib/fa/css3.d.ts
+++ b/types/react-icons/lib/fa/css3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCss3 extends React.Component<IconBaseProps> { }
+declare class FaCss3 extends React.Component<IconBaseProps> { }
+export = FaCss3;
diff --git a/types/react-icons/lib/fa/cube.d.ts b/types/react-icons/lib/fa/cube.d.ts
index ad9dc6b033..8ecf9e7fdb 100644
--- a/types/react-icons/lib/fa/cube.d.ts
+++ b/types/react-icons/lib/fa/cube.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCube extends React.Component<IconBaseProps> { }
+declare class FaCube extends React.Component<IconBaseProps> { }
+export = FaCube;
diff --git a/types/react-icons/lib/fa/cubes.d.ts b/types/react-icons/lib/fa/cubes.d.ts
index a2cdf49c8c..e2d2ea0f93 100644
--- a/types/react-icons/lib/fa/cubes.d.ts
+++ b/types/react-icons/lib/fa/cubes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCubes extends React.Component<IconBaseProps> { }
+declare class FaCubes extends React.Component<IconBaseProps> { }
+export = FaCubes;
diff --git a/types/react-icons/lib/fa/cut.d.ts b/types/react-icons/lib/fa/cut.d.ts
index 0c93d3cbc2..bba94e53ba 100644
--- a/types/react-icons/lib/fa/cut.d.ts
+++ b/types/react-icons/lib/fa/cut.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCut extends React.Component<IconBaseProps> { }
+declare class FaCut extends React.Component<IconBaseProps> { }
+export = FaCut;
diff --git a/types/react-icons/lib/fa/cutlery.d.ts b/types/react-icons/lib/fa/cutlery.d.ts
index f4496c61e3..74ace7cf30 100644
--- a/types/react-icons/lib/fa/cutlery.d.ts
+++ b/types/react-icons/lib/fa/cutlery.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCutlery extends React.Component<IconBaseProps> { }
+declare class FaCutlery extends React.Component<IconBaseProps> { }
+export = FaCutlery;
diff --git a/types/react-icons/lib/fa/dashboard.d.ts b/types/react-icons/lib/fa/dashboard.d.ts
index d763edb50d..20824e5f61 100644
--- a/types/react-icons/lib/fa/dashboard.d.ts
+++ b/types/react-icons/lib/fa/dashboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDashboard extends React.Component<IconBaseProps> { }
+declare class FaDashboard extends React.Component<IconBaseProps> { }
+export = FaDashboard;
diff --git a/types/react-icons/lib/fa/dashcube.d.ts b/types/react-icons/lib/fa/dashcube.d.ts
index ed15f887b2..2b11b28908 100644
--- a/types/react-icons/lib/fa/dashcube.d.ts
+++ b/types/react-icons/lib/fa/dashcube.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDashcube extends React.Component<IconBaseProps> { }
+declare class FaDashcube extends React.Component<IconBaseProps> { }
+export = FaDashcube;
diff --git a/types/react-icons/lib/fa/database.d.ts b/types/react-icons/lib/fa/database.d.ts
index cfb7bcbedd..ac4aae49de 100644
--- a/types/react-icons/lib/fa/database.d.ts
+++ b/types/react-icons/lib/fa/database.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDatabase extends React.Component<IconBaseProps> { }
+declare class FaDatabase extends React.Component<IconBaseProps> { }
+export = FaDatabase;
diff --git a/types/react-icons/lib/fa/deaf.d.ts b/types/react-icons/lib/fa/deaf.d.ts
index a53c48b057..a1c6fdd7b6 100644
--- a/types/react-icons/lib/fa/deaf.d.ts
+++ b/types/react-icons/lib/fa/deaf.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDeaf extends React.Component<IconBaseProps> { }
+declare class FaDeaf extends React.Component<IconBaseProps> { }
+export = FaDeaf;
diff --git a/types/react-icons/lib/fa/dedent.d.ts b/types/react-icons/lib/fa/dedent.d.ts
index 30db3c96d4..9d7c8bcf7c 100644
--- a/types/react-icons/lib/fa/dedent.d.ts
+++ b/types/react-icons/lib/fa/dedent.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDedent extends React.Component<IconBaseProps> { }
+declare class FaDedent extends React.Component<IconBaseProps> { }
+export = FaDedent;
diff --git a/types/react-icons/lib/fa/delicious.d.ts b/types/react-icons/lib/fa/delicious.d.ts
index 7a069105b3..b2e522393f 100644
--- a/types/react-icons/lib/fa/delicious.d.ts
+++ b/types/react-icons/lib/fa/delicious.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDelicious extends React.Component<IconBaseProps> { }
+declare class FaDelicious extends React.Component<IconBaseProps> { }
+export = FaDelicious;
diff --git a/types/react-icons/lib/fa/desktop.d.ts b/types/react-icons/lib/fa/desktop.d.ts
index 7ada5afec8..46bc3de05f 100644
--- a/types/react-icons/lib/fa/desktop.d.ts
+++ b/types/react-icons/lib/fa/desktop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDesktop extends React.Component<IconBaseProps> { }
+declare class FaDesktop extends React.Component<IconBaseProps> { }
+export = FaDesktop;
diff --git a/types/react-icons/lib/fa/deviantart.d.ts b/types/react-icons/lib/fa/deviantart.d.ts
index d3d8521e04..f81be1f6c7 100644
--- a/types/react-icons/lib/fa/deviantart.d.ts
+++ b/types/react-icons/lib/fa/deviantart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDeviantart extends React.Component<IconBaseProps> { }
+declare class FaDeviantart extends React.Component<IconBaseProps> { }
+export = FaDeviantart;
diff --git a/types/react-icons/lib/fa/diamond.d.ts b/types/react-icons/lib/fa/diamond.d.ts
index 1d54c78101..7e5ae9df3b 100644
--- a/types/react-icons/lib/fa/diamond.d.ts
+++ b/types/react-icons/lib/fa/diamond.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDiamond extends React.Component<IconBaseProps> { }
+declare class FaDiamond extends React.Component<IconBaseProps> { }
+export = FaDiamond;
diff --git a/types/react-icons/lib/fa/digg.d.ts b/types/react-icons/lib/fa/digg.d.ts
index 7ba32cbe41..23583964a5 100644
--- a/types/react-icons/lib/fa/digg.d.ts
+++ b/types/react-icons/lib/fa/digg.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDigg extends React.Component<IconBaseProps> { }
+declare class FaDigg extends React.Component<IconBaseProps> { }
+export = FaDigg;
diff --git a/types/react-icons/lib/fa/dollar.d.ts b/types/react-icons/lib/fa/dollar.d.ts
index 339fc41f86..5311f1a562 100644
--- a/types/react-icons/lib/fa/dollar.d.ts
+++ b/types/react-icons/lib/fa/dollar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDollar extends React.Component<IconBaseProps> { }
+declare class FaDollar extends React.Component<IconBaseProps> { }
+export = FaDollar;
diff --git a/types/react-icons/lib/fa/dot-circle-o.d.ts b/types/react-icons/lib/fa/dot-circle-o.d.ts
index 8479c5a1c1..35f9eb9650 100644
--- a/types/react-icons/lib/fa/dot-circle-o.d.ts
+++ b/types/react-icons/lib/fa/dot-circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDotCircleO extends React.Component<IconBaseProps> { }
+declare class FaDotCircleO extends React.Component<IconBaseProps> { }
+export = FaDotCircleO;
diff --git a/types/react-icons/lib/fa/download.d.ts b/types/react-icons/lib/fa/download.d.ts
index bd458b4c21..256c59de79 100644
--- a/types/react-icons/lib/fa/download.d.ts
+++ b/types/react-icons/lib/fa/download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDownload extends React.Component<IconBaseProps> { }
+declare class FaDownload extends React.Component<IconBaseProps> { }
+export = FaDownload;
diff --git a/types/react-icons/lib/fa/dribbble.d.ts b/types/react-icons/lib/fa/dribbble.d.ts
index 97c095c7f0..668a16710b 100644
--- a/types/react-icons/lib/fa/dribbble.d.ts
+++ b/types/react-icons/lib/fa/dribbble.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDribbble extends React.Component<IconBaseProps> { }
+declare class FaDribbble extends React.Component<IconBaseProps> { }
+export = FaDribbble;
diff --git a/types/react-icons/lib/fa/dropbox.d.ts b/types/react-icons/lib/fa/dropbox.d.ts
index 1534075582..8f780c1b1a 100644
--- a/types/react-icons/lib/fa/dropbox.d.ts
+++ b/types/react-icons/lib/fa/dropbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDropbox extends React.Component<IconBaseProps> { }
+declare class FaDropbox extends React.Component<IconBaseProps> { }
+export = FaDropbox;
diff --git a/types/react-icons/lib/fa/drupal.d.ts b/types/react-icons/lib/fa/drupal.d.ts
index c4318c69ed..7e1f23e073 100644
--- a/types/react-icons/lib/fa/drupal.d.ts
+++ b/types/react-icons/lib/fa/drupal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDrupal extends React.Component<IconBaseProps> { }
+declare class FaDrupal extends React.Component<IconBaseProps> { }
+export = FaDrupal;
diff --git a/types/react-icons/lib/fa/edge.d.ts b/types/react-icons/lib/fa/edge.d.ts
index bfe0ccba18..38b4368b33 100644
--- a/types/react-icons/lib/fa/edge.d.ts
+++ b/types/react-icons/lib/fa/edge.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEdge extends React.Component<IconBaseProps> { }
+declare class FaEdge extends React.Component<IconBaseProps> { }
+export = FaEdge;
diff --git a/types/react-icons/lib/fa/edit.d.ts b/types/react-icons/lib/fa/edit.d.ts
index e207eca02c..989dc37c64 100644
--- a/types/react-icons/lib/fa/edit.d.ts
+++ b/types/react-icons/lib/fa/edit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEdit extends React.Component<IconBaseProps> { }
+declare class FaEdit extends React.Component<IconBaseProps> { }
+export = FaEdit;
diff --git a/types/react-icons/lib/fa/eject.d.ts b/types/react-icons/lib/fa/eject.d.ts
index 6a8ba89e5b..bc9e34c4a8 100644
--- a/types/react-icons/lib/fa/eject.d.ts
+++ b/types/react-icons/lib/fa/eject.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEject extends React.Component<IconBaseProps> { }
+declare class FaEject extends React.Component<IconBaseProps> { }
+export = FaEject;
diff --git a/types/react-icons/lib/fa/ellipsis-h.d.ts b/types/react-icons/lib/fa/ellipsis-h.d.ts
index 6c97cce7ac..d00da1e799 100644
--- a/types/react-icons/lib/fa/ellipsis-h.d.ts
+++ b/types/react-icons/lib/fa/ellipsis-h.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEllipsisH extends React.Component<IconBaseProps> { }
+declare class FaEllipsisH extends React.Component<IconBaseProps> { }
+export = FaEllipsisH;
diff --git a/types/react-icons/lib/fa/ellipsis-v.d.ts b/types/react-icons/lib/fa/ellipsis-v.d.ts
index a6a862fcc0..d9d4e1c84e 100644
--- a/types/react-icons/lib/fa/ellipsis-v.d.ts
+++ b/types/react-icons/lib/fa/ellipsis-v.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEllipsisV extends React.Component<IconBaseProps> { }
+declare class FaEllipsisV extends React.Component<IconBaseProps> { }
+export = FaEllipsisV;
diff --git a/types/react-icons/lib/fa/empire.d.ts b/types/react-icons/lib/fa/empire.d.ts
index c898a570aa..5cc1dad476 100644
--- a/types/react-icons/lib/fa/empire.d.ts
+++ b/types/react-icons/lib/fa/empire.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEmpire extends React.Component<IconBaseProps> { }
+declare class FaEmpire extends React.Component<IconBaseProps> { }
+export = FaEmpire;
diff --git a/types/react-icons/lib/fa/envelope-o.d.ts b/types/react-icons/lib/fa/envelope-o.d.ts
index 91552afcb2..4469389609 100644
--- a/types/react-icons/lib/fa/envelope-o.d.ts
+++ b/types/react-icons/lib/fa/envelope-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelopeO extends React.Component<IconBaseProps> { }
+declare class FaEnvelopeO extends React.Component<IconBaseProps> { }
+export = FaEnvelopeO;
diff --git a/types/react-icons/lib/fa/envelope-square.d.ts b/types/react-icons/lib/fa/envelope-square.d.ts
index c984bceac4..6d3c1cf0f8 100644
--- a/types/react-icons/lib/fa/envelope-square.d.ts
+++ b/types/react-icons/lib/fa/envelope-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelopeSquare extends React.Component<IconBaseProps> { }
+declare class FaEnvelopeSquare extends React.Component<IconBaseProps> { }
+export = FaEnvelopeSquare;
diff --git a/types/react-icons/lib/fa/envelope.d.ts b/types/react-icons/lib/fa/envelope.d.ts
index c93f0c144b..219156d484 100644
--- a/types/react-icons/lib/fa/envelope.d.ts
+++ b/types/react-icons/lib/fa/envelope.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelope extends React.Component<IconBaseProps> { }
+declare class FaEnvelope extends React.Component<IconBaseProps> { }
+export = FaEnvelope;
diff --git a/types/react-icons/lib/fa/envira.d.ts b/types/react-icons/lib/fa/envira.d.ts
index 8ccf1e8183..4ab89938e7 100644
--- a/types/react-icons/lib/fa/envira.d.ts
+++ b/types/react-icons/lib/fa/envira.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvira extends React.Component<IconBaseProps> { }
+declare class FaEnvira extends React.Component<IconBaseProps> { }
+export = FaEnvira;
diff --git a/types/react-icons/lib/fa/eraser.d.ts b/types/react-icons/lib/fa/eraser.d.ts
index 1751f58630..ad40c75975 100644
--- a/types/react-icons/lib/fa/eraser.d.ts
+++ b/types/react-icons/lib/fa/eraser.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEraser extends React.Component<IconBaseProps> { }
+declare class FaEraser extends React.Component<IconBaseProps> { }
+export = FaEraser;
diff --git a/types/react-icons/lib/fa/eur.d.ts b/types/react-icons/lib/fa/eur.d.ts
index 466c340a42..6d18711dd5 100644
--- a/types/react-icons/lib/fa/eur.d.ts
+++ b/types/react-icons/lib/fa/eur.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEur extends React.Component<IconBaseProps> { }
+declare class FaEur extends React.Component<IconBaseProps> { }
+export = FaEur;
diff --git a/types/react-icons/lib/fa/exchange.d.ts b/types/react-icons/lib/fa/exchange.d.ts
index 61f666fcc6..86e1df628d 100644
--- a/types/react-icons/lib/fa/exchange.d.ts
+++ b/types/react-icons/lib/fa/exchange.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExchange extends React.Component<IconBaseProps> { }
+declare class FaExchange extends React.Component<IconBaseProps> { }
+export = FaExchange;
diff --git a/types/react-icons/lib/fa/exclamation-circle.d.ts b/types/react-icons/lib/fa/exclamation-circle.d.ts
index 074285abc3..b421e2dd49 100644
--- a/types/react-icons/lib/fa/exclamation-circle.d.ts
+++ b/types/react-icons/lib/fa/exclamation-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamationCircle extends React.Component<IconBaseProps> { }
+declare class FaExclamationCircle extends React.Component<IconBaseProps> { }
+export = FaExclamationCircle;
diff --git a/types/react-icons/lib/fa/exclamation-triangle.d.ts b/types/react-icons/lib/fa/exclamation-triangle.d.ts
index 0e6a2039ef..340cdae80e 100644
--- a/types/react-icons/lib/fa/exclamation-triangle.d.ts
+++ b/types/react-icons/lib/fa/exclamation-triangle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamationTriangle extends React.Component<IconBaseProps> { }
+declare class FaExclamationTriangle extends React.Component<IconBaseProps> { }
+export = FaExclamationTriangle;
diff --git a/types/react-icons/lib/fa/exclamation.d.ts b/types/react-icons/lib/fa/exclamation.d.ts
index 822c50b207..9faa259a47 100644
--- a/types/react-icons/lib/fa/exclamation.d.ts
+++ b/types/react-icons/lib/fa/exclamation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamation extends React.Component<IconBaseProps> { }
+declare class FaExclamation extends React.Component<IconBaseProps> { }
+export = FaExclamation;
diff --git a/types/react-icons/lib/fa/expand.d.ts b/types/react-icons/lib/fa/expand.d.ts
index 4648b519b9..8a85cf0f71 100644
--- a/types/react-icons/lib/fa/expand.d.ts
+++ b/types/react-icons/lib/fa/expand.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExpand extends React.Component<IconBaseProps> { }
+declare class FaExpand extends React.Component<IconBaseProps> { }
+export = FaExpand;
diff --git a/types/react-icons/lib/fa/expeditedssl.d.ts b/types/react-icons/lib/fa/expeditedssl.d.ts
index e30594333e..881ce2621c 100644
--- a/types/react-icons/lib/fa/expeditedssl.d.ts
+++ b/types/react-icons/lib/fa/expeditedssl.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExpeditedssl extends React.Component<IconBaseProps> { }
+declare class FaExpeditedssl extends React.Component<IconBaseProps> { }
+export = FaExpeditedssl;
diff --git a/types/react-icons/lib/fa/external-link-square.d.ts b/types/react-icons/lib/fa/external-link-square.d.ts
index f49858db95..9fb66091cb 100644
--- a/types/react-icons/lib/fa/external-link-square.d.ts
+++ b/types/react-icons/lib/fa/external-link-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExternalLinkSquare extends React.Component<IconBaseProps> { }
+declare class FaExternalLinkSquare extends React.Component<IconBaseProps> { }
+export = FaExternalLinkSquare;
diff --git a/types/react-icons/lib/fa/external-link.d.ts b/types/react-icons/lib/fa/external-link.d.ts
index 69b539a542..eb4af13164 100644
--- a/types/react-icons/lib/fa/external-link.d.ts
+++ b/types/react-icons/lib/fa/external-link.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExternalLink extends React.Component<IconBaseProps> { }
+declare class FaExternalLink extends React.Component<IconBaseProps> { }
+export = FaExternalLink;
diff --git a/types/react-icons/lib/fa/eye-slash.d.ts b/types/react-icons/lib/fa/eye-slash.d.ts
index cbf60ac206..ca8008324d 100644
--- a/types/react-icons/lib/fa/eye-slash.d.ts
+++ b/types/react-icons/lib/fa/eye-slash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEyeSlash extends React.Component<IconBaseProps> { }
+declare class FaEyeSlash extends React.Component<IconBaseProps> { }
+export = FaEyeSlash;
diff --git a/types/react-icons/lib/fa/eye.d.ts b/types/react-icons/lib/fa/eye.d.ts
index bec2d41708..74acb8f8d6 100644
--- a/types/react-icons/lib/fa/eye.d.ts
+++ b/types/react-icons/lib/fa/eye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEye extends React.Component<IconBaseProps> { }
+declare class FaEye extends React.Component<IconBaseProps> { }
+export = FaEye;
diff --git a/types/react-icons/lib/fa/eyedropper.d.ts b/types/react-icons/lib/fa/eyedropper.d.ts
index 87b2d74f41..41ec80d371 100644
--- a/types/react-icons/lib/fa/eyedropper.d.ts
+++ b/types/react-icons/lib/fa/eyedropper.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEyedropper extends React.Component<IconBaseProps> { }
+declare class FaEyedropper extends React.Component<IconBaseProps> { }
+export = FaEyedropper;
diff --git a/types/react-icons/lib/fa/facebook-official.d.ts b/types/react-icons/lib/fa/facebook-official.d.ts
index 3424fb90dd..1f1a4d12ff 100644
--- a/types/react-icons/lib/fa/facebook-official.d.ts
+++ b/types/react-icons/lib/fa/facebook-official.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebookOfficial extends React.Component<IconBaseProps> { }
+declare class FaFacebookOfficial extends React.Component<IconBaseProps> { }
+export = FaFacebookOfficial;
diff --git a/types/react-icons/lib/fa/facebook-square.d.ts b/types/react-icons/lib/fa/facebook-square.d.ts
index fb5c101a6b..9913daf360 100644
--- a/types/react-icons/lib/fa/facebook-square.d.ts
+++ b/types/react-icons/lib/fa/facebook-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebookSquare extends React.Component<IconBaseProps> { }
+declare class FaFacebookSquare extends React.Component<IconBaseProps> { }
+export = FaFacebookSquare;
diff --git a/types/react-icons/lib/fa/facebook.d.ts b/types/react-icons/lib/fa/facebook.d.ts
index d837e533dd..1644fe29eb 100644
--- a/types/react-icons/lib/fa/facebook.d.ts
+++ b/types/react-icons/lib/fa/facebook.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebook extends React.Component<IconBaseProps> { }
+declare class FaFacebook extends React.Component<IconBaseProps> { }
+export = FaFacebook;
diff --git a/types/react-icons/lib/fa/fast-backward.d.ts b/types/react-icons/lib/fa/fast-backward.d.ts
index 73f95fd419..1e7d42c3b6 100644
--- a/types/react-icons/lib/fa/fast-backward.d.ts
+++ b/types/react-icons/lib/fa/fast-backward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFastBackward extends React.Component<IconBaseProps> { }
+declare class FaFastBackward extends React.Component<IconBaseProps> { }
+export = FaFastBackward;
diff --git a/types/react-icons/lib/fa/fast-forward.d.ts b/types/react-icons/lib/fa/fast-forward.d.ts
index c28ea39eb7..6321e070d6 100644
--- a/types/react-icons/lib/fa/fast-forward.d.ts
+++ b/types/react-icons/lib/fa/fast-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFastForward extends React.Component<IconBaseProps> { }
+declare class FaFastForward extends React.Component<IconBaseProps> { }
+export = FaFastForward;
diff --git a/types/react-icons/lib/fa/fax.d.ts b/types/react-icons/lib/fa/fax.d.ts
index 9ca411f7f9..9b132d388d 100644
--- a/types/react-icons/lib/fa/fax.d.ts
+++ b/types/react-icons/lib/fa/fax.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFax extends React.Component<IconBaseProps> { }
+declare class FaFax extends React.Component<IconBaseProps> { }
+export = FaFax;
diff --git a/types/react-icons/lib/fa/feed.d.ts b/types/react-icons/lib/fa/feed.d.ts
index 448c3a2e24..38127134e7 100644
--- a/types/react-icons/lib/fa/feed.d.ts
+++ b/types/react-icons/lib/fa/feed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFeed extends React.Component<IconBaseProps> { }
+declare class FaFeed extends React.Component<IconBaseProps> { }
+export = FaFeed;
diff --git a/types/react-icons/lib/fa/female.d.ts b/types/react-icons/lib/fa/female.d.ts
index d18a20d305..03d6b92278 100644
--- a/types/react-icons/lib/fa/female.d.ts
+++ b/types/react-icons/lib/fa/female.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFemale extends React.Component<IconBaseProps> { }
+declare class FaFemale extends React.Component<IconBaseProps> { }
+export = FaFemale;
diff --git a/types/react-icons/lib/fa/fighter-jet.d.ts b/types/react-icons/lib/fa/fighter-jet.d.ts
index 124b4d63e3..e6cf5be901 100644
--- a/types/react-icons/lib/fa/fighter-jet.d.ts
+++ b/types/react-icons/lib/fa/fighter-jet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFighterJet extends React.Component<IconBaseProps> { }
+declare class FaFighterJet extends React.Component<IconBaseProps> { }
+export = FaFighterJet;
diff --git a/types/react-icons/lib/fa/file-archive-o.d.ts b/types/react-icons/lib/fa/file-archive-o.d.ts
index 6a3390c936..ff25fc06ad 100644
--- a/types/react-icons/lib/fa/file-archive-o.d.ts
+++ b/types/react-icons/lib/fa/file-archive-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileArchiveO extends React.Component<IconBaseProps> { }
+declare class FaFileArchiveO extends React.Component<IconBaseProps> { }
+export = FaFileArchiveO;
diff --git a/types/react-icons/lib/fa/file-audio-o.d.ts b/types/react-icons/lib/fa/file-audio-o.d.ts
index a360a79960..211c6fa6d9 100644
--- a/types/react-icons/lib/fa/file-audio-o.d.ts
+++ b/types/react-icons/lib/fa/file-audio-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileAudioO extends React.Component<IconBaseProps> { }
+declare class FaFileAudioO extends React.Component<IconBaseProps> { }
+export = FaFileAudioO;
diff --git a/types/react-icons/lib/fa/file-code-o.d.ts b/types/react-icons/lib/fa/file-code-o.d.ts
index 754fcb2d04..9a29a3c9b2 100644
--- a/types/react-icons/lib/fa/file-code-o.d.ts
+++ b/types/react-icons/lib/fa/file-code-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileCodeO extends React.Component<IconBaseProps> { }
+declare class FaFileCodeO extends React.Component<IconBaseProps> { }
+export = FaFileCodeO;
diff --git a/types/react-icons/lib/fa/file-excel-o.d.ts b/types/react-icons/lib/fa/file-excel-o.d.ts
index dd41811e82..4bbfd0bcea 100644
--- a/types/react-icons/lib/fa/file-excel-o.d.ts
+++ b/types/react-icons/lib/fa/file-excel-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileExcelO extends React.Component<IconBaseProps> { }
+declare class FaFileExcelO extends React.Component<IconBaseProps> { }
+export = FaFileExcelO;
diff --git a/types/react-icons/lib/fa/file-image-o.d.ts b/types/react-icons/lib/fa/file-image-o.d.ts
index 7c6b77a296..11ae1f0c6f 100644
--- a/types/react-icons/lib/fa/file-image-o.d.ts
+++ b/types/react-icons/lib/fa/file-image-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileImageO extends React.Component<IconBaseProps> { }
+declare class FaFileImageO extends React.Component<IconBaseProps> { }
+export = FaFileImageO;
diff --git a/types/react-icons/lib/fa/file-movie-o.d.ts b/types/react-icons/lib/fa/file-movie-o.d.ts
index ec9a9e0e0d..9ed9155780 100644
--- a/types/react-icons/lib/fa/file-movie-o.d.ts
+++ b/types/react-icons/lib/fa/file-movie-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileMovieO extends React.Component<IconBaseProps> { }
+declare class FaFileMovieO extends React.Component<IconBaseProps> { }
+export = FaFileMovieO;
diff --git a/types/react-icons/lib/fa/file-o.d.ts b/types/react-icons/lib/fa/file-o.d.ts
index 726de80769..d999ac3e54 100644
--- a/types/react-icons/lib/fa/file-o.d.ts
+++ b/types/react-icons/lib/fa/file-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileO extends React.Component<IconBaseProps> { }
+declare class FaFileO extends React.Component<IconBaseProps> { }
+export = FaFileO;
diff --git a/types/react-icons/lib/fa/file-pdf-o.d.ts b/types/react-icons/lib/fa/file-pdf-o.d.ts
index 79ae492b23..e2abcd0736 100644
--- a/types/react-icons/lib/fa/file-pdf-o.d.ts
+++ b/types/react-icons/lib/fa/file-pdf-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilePdfO extends React.Component<IconBaseProps> { }
+declare class FaFilePdfO extends React.Component<IconBaseProps> { }
+export = FaFilePdfO;
diff --git a/types/react-icons/lib/fa/file-powerpoint-o.d.ts b/types/react-icons/lib/fa/file-powerpoint-o.d.ts
index fd4016615c..447f354ee1 100644
--- a/types/react-icons/lib/fa/file-powerpoint-o.d.ts
+++ b/types/react-icons/lib/fa/file-powerpoint-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilePowerpointO extends React.Component<IconBaseProps> { }
+declare class FaFilePowerpointO extends React.Component<IconBaseProps> { }
+export = FaFilePowerpointO;
diff --git a/types/react-icons/lib/fa/file-text-o.d.ts b/types/react-icons/lib/fa/file-text-o.d.ts
index 5bf9475839..8d1d06d3fc 100644
--- a/types/react-icons/lib/fa/file-text-o.d.ts
+++ b/types/react-icons/lib/fa/file-text-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileTextO extends React.Component<IconBaseProps> { }
+declare class FaFileTextO extends React.Component<IconBaseProps> { }
+export = FaFileTextO;
diff --git a/types/react-icons/lib/fa/file-text.d.ts b/types/react-icons/lib/fa/file-text.d.ts
index 287aa5d5e9..d551df577a 100644
--- a/types/react-icons/lib/fa/file-text.d.ts
+++ b/types/react-icons/lib/fa/file-text.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileText extends React.Component<IconBaseProps> { }
+declare class FaFileText extends React.Component<IconBaseProps> { }
+export = FaFileText;
diff --git a/types/react-icons/lib/fa/file-word-o.d.ts b/types/react-icons/lib/fa/file-word-o.d.ts
index e8790d5988..7dd12a0dbb 100644
--- a/types/react-icons/lib/fa/file-word-o.d.ts
+++ b/types/react-icons/lib/fa/file-word-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileWordO extends React.Component<IconBaseProps> { }
+declare class FaFileWordO extends React.Component<IconBaseProps> { }
+export = FaFileWordO;
diff --git a/types/react-icons/lib/fa/file.d.ts b/types/react-icons/lib/fa/file.d.ts
index 92fb6d073a..90eea6dacf 100644
--- a/types/react-icons/lib/fa/file.d.ts
+++ b/types/react-icons/lib/fa/file.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFile extends React.Component<IconBaseProps> { }
+declare class FaFile extends React.Component<IconBaseProps> { }
+export = FaFile;
diff --git a/types/react-icons/lib/fa/film.d.ts b/types/react-icons/lib/fa/film.d.ts
index 639ec938b8..ccc05405ee 100644
--- a/types/react-icons/lib/fa/film.d.ts
+++ b/types/react-icons/lib/fa/film.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilm extends React.Component<IconBaseProps> { }
+declare class FaFilm extends React.Component<IconBaseProps> { }
+export = FaFilm;
diff --git a/types/react-icons/lib/fa/filter.d.ts b/types/react-icons/lib/fa/filter.d.ts
index 971ec8a2ab..02308d24fd 100644
--- a/types/react-icons/lib/fa/filter.d.ts
+++ b/types/react-icons/lib/fa/filter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilter extends React.Component<IconBaseProps> { }
+declare class FaFilter extends React.Component<IconBaseProps> { }
+export = FaFilter;
diff --git a/types/react-icons/lib/fa/fire-extinguisher.d.ts b/types/react-icons/lib/fa/fire-extinguisher.d.ts
index 347abc3091..2f2637ebfc 100644
--- a/types/react-icons/lib/fa/fire-extinguisher.d.ts
+++ b/types/react-icons/lib/fa/fire-extinguisher.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFireExtinguisher extends React.Component<IconBaseProps> { }
+declare class FaFireExtinguisher extends React.Component<IconBaseProps> { }
+export = FaFireExtinguisher;
diff --git a/types/react-icons/lib/fa/fire.d.ts b/types/react-icons/lib/fa/fire.d.ts
index 361e6b3f2a..16231c9435 100644
--- a/types/react-icons/lib/fa/fire.d.ts
+++ b/types/react-icons/lib/fa/fire.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFire extends React.Component<IconBaseProps> { }
+declare class FaFire extends React.Component<IconBaseProps> { }
+export = FaFire;
diff --git a/types/react-icons/lib/fa/firefox.d.ts b/types/react-icons/lib/fa/firefox.d.ts
index fb5b6faf5b..e4270d68f1 100644
--- a/types/react-icons/lib/fa/firefox.d.ts
+++ b/types/react-icons/lib/fa/firefox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFirefox extends React.Component<IconBaseProps> { }
+declare class FaFirefox extends React.Component<IconBaseProps> { }
+export = FaFirefox;
diff --git a/types/react-icons/lib/fa/flag-checkered.d.ts b/types/react-icons/lib/fa/flag-checkered.d.ts
index ad9439fe74..0593962a85 100644
--- a/types/react-icons/lib/fa/flag-checkered.d.ts
+++ b/types/react-icons/lib/fa/flag-checkered.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlagCheckered extends React.Component<IconBaseProps> { }
+declare class FaFlagCheckered extends React.Component<IconBaseProps> { }
+export = FaFlagCheckered;
diff --git a/types/react-icons/lib/fa/flag-o.d.ts b/types/react-icons/lib/fa/flag-o.d.ts
index 4af124ebe3..799d680b87 100644
--- a/types/react-icons/lib/fa/flag-o.d.ts
+++ b/types/react-icons/lib/fa/flag-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlagO extends React.Component<IconBaseProps> { }
+declare class FaFlagO extends React.Component<IconBaseProps> { }
+export = FaFlagO;
diff --git a/types/react-icons/lib/fa/flag.d.ts b/types/react-icons/lib/fa/flag.d.ts
index 05b3a41500..0ffe7c5e21 100644
--- a/types/react-icons/lib/fa/flag.d.ts
+++ b/types/react-icons/lib/fa/flag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlag extends React.Component<IconBaseProps> { }
+declare class FaFlag extends React.Component<IconBaseProps> { }
+export = FaFlag;
diff --git a/types/react-icons/lib/fa/flask.d.ts b/types/react-icons/lib/fa/flask.d.ts
index 53edd95b1c..3c6ed4067e 100644
--- a/types/react-icons/lib/fa/flask.d.ts
+++ b/types/react-icons/lib/fa/flask.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlask extends React.Component<IconBaseProps> { }
+declare class FaFlask extends React.Component<IconBaseProps> { }
+export = FaFlask;
diff --git a/types/react-icons/lib/fa/flickr.d.ts b/types/react-icons/lib/fa/flickr.d.ts
index 0642e63424..b35696f10a 100644
--- a/types/react-icons/lib/fa/flickr.d.ts
+++ b/types/react-icons/lib/fa/flickr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlickr extends React.Component<IconBaseProps> { }
+declare class FaFlickr extends React.Component<IconBaseProps> { }
+export = FaFlickr;
diff --git a/types/react-icons/lib/fa/floppy-o.d.ts b/types/react-icons/lib/fa/floppy-o.d.ts
index a36898567d..2eacb6d2da 100644
--- a/types/react-icons/lib/fa/floppy-o.d.ts
+++ b/types/react-icons/lib/fa/floppy-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFloppyO extends React.Component<IconBaseProps> { }
+declare class FaFloppyO extends React.Component<IconBaseProps> { }
+export = FaFloppyO;
diff --git a/types/react-icons/lib/fa/folder-o.d.ts b/types/react-icons/lib/fa/folder-o.d.ts
index 86c2f0853c..df997f3bbb 100644
--- a/types/react-icons/lib/fa/folder-o.d.ts
+++ b/types/react-icons/lib/fa/folder-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderO extends React.Component<IconBaseProps> { }
+declare class FaFolderO extends React.Component<IconBaseProps> { }
+export = FaFolderO;
diff --git a/types/react-icons/lib/fa/folder-open-o.d.ts b/types/react-icons/lib/fa/folder-open-o.d.ts
index 13c270457c..99f32e2b2c 100644
--- a/types/react-icons/lib/fa/folder-open-o.d.ts
+++ b/types/react-icons/lib/fa/folder-open-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderOpenO extends React.Component<IconBaseProps> { }
+declare class FaFolderOpenO extends React.Component<IconBaseProps> { }
+export = FaFolderOpenO;
diff --git a/types/react-icons/lib/fa/folder-open.d.ts b/types/react-icons/lib/fa/folder-open.d.ts
index 27eefcf390..0e9fac95ac 100644
--- a/types/react-icons/lib/fa/folder-open.d.ts
+++ b/types/react-icons/lib/fa/folder-open.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderOpen extends React.Component<IconBaseProps> { }
+declare class FaFolderOpen extends React.Component<IconBaseProps> { }
+export = FaFolderOpen;
diff --git a/types/react-icons/lib/fa/folder.d.ts b/types/react-icons/lib/fa/folder.d.ts
index 348ac25522..710bee7179 100644
--- a/types/react-icons/lib/fa/folder.d.ts
+++ b/types/react-icons/lib/fa/folder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolder extends React.Component<IconBaseProps> { }
+declare class FaFolder extends React.Component<IconBaseProps> { }
+export = FaFolder;
diff --git a/types/react-icons/lib/fa/font.d.ts b/types/react-icons/lib/fa/font.d.ts
index 70459022df..0ab7e0ef5c 100644
--- a/types/react-icons/lib/fa/font.d.ts
+++ b/types/react-icons/lib/fa/font.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFont extends React.Component<IconBaseProps> { }
+declare class FaFont extends React.Component<IconBaseProps> { }
+export = FaFont;
diff --git a/types/react-icons/lib/fa/fonticons.d.ts b/types/react-icons/lib/fa/fonticons.d.ts
index a124cfb0c2..a219058840 100644
--- a/types/react-icons/lib/fa/fonticons.d.ts
+++ b/types/react-icons/lib/fa/fonticons.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFonticons extends React.Component<IconBaseProps> { }
+declare class FaFonticons extends React.Component<IconBaseProps> { }
+export = FaFonticons;
diff --git a/types/react-icons/lib/fa/fort-awesome.d.ts b/types/react-icons/lib/fa/fort-awesome.d.ts
index a88e6a0118..af5c2699ca 100644
--- a/types/react-icons/lib/fa/fort-awesome.d.ts
+++ b/types/react-icons/lib/fa/fort-awesome.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFortAwesome extends React.Component<IconBaseProps> { }
+declare class FaFortAwesome extends React.Component<IconBaseProps> { }
+export = FaFortAwesome;
diff --git a/types/react-icons/lib/fa/forumbee.d.ts b/types/react-icons/lib/fa/forumbee.d.ts
index 58b96a9d83..6ba90b5966 100644
--- a/types/react-icons/lib/fa/forumbee.d.ts
+++ b/types/react-icons/lib/fa/forumbee.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaForumbee extends React.Component<IconBaseProps> { }
+declare class FaForumbee extends React.Component<IconBaseProps> { }
+export = FaForumbee;
diff --git a/types/react-icons/lib/fa/forward.d.ts b/types/react-icons/lib/fa/forward.d.ts
index 12eacceb4b..5a25112852 100644
--- a/types/react-icons/lib/fa/forward.d.ts
+++ b/types/react-icons/lib/fa/forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaForward extends React.Component<IconBaseProps> { }
+declare class FaForward extends React.Component<IconBaseProps> { }
+export = FaForward;
diff --git a/types/react-icons/lib/fa/foursquare.d.ts b/types/react-icons/lib/fa/foursquare.d.ts
index 8c2bf2cbf5..1092fdbd86 100644
--- a/types/react-icons/lib/fa/foursquare.d.ts
+++ b/types/react-icons/lib/fa/foursquare.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFoursquare extends React.Component<IconBaseProps> { }
+declare class FaFoursquare extends React.Component<IconBaseProps> { }
+export = FaFoursquare;
diff --git a/types/react-icons/lib/fa/frown-o.d.ts b/types/react-icons/lib/fa/frown-o.d.ts
index 06ebd02274..989c142ac7 100644
--- a/types/react-icons/lib/fa/frown-o.d.ts
+++ b/types/react-icons/lib/fa/frown-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFrownO extends React.Component<IconBaseProps> { }
+declare class FaFrownO extends React.Component<IconBaseProps> { }
+export = FaFrownO;
diff --git a/types/react-icons/lib/fa/futbol-o.d.ts b/types/react-icons/lib/fa/futbol-o.d.ts
index eaa4922a85..e98209d9ed 100644
--- a/types/react-icons/lib/fa/futbol-o.d.ts
+++ b/types/react-icons/lib/fa/futbol-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFutbolO extends React.Component<IconBaseProps> { }
+declare class FaFutbolO extends React.Component<IconBaseProps> { }
+export = FaFutbolO;
diff --git a/types/react-icons/lib/fa/gamepad.d.ts b/types/react-icons/lib/fa/gamepad.d.ts
index 9acea2828f..5c747b4850 100644
--- a/types/react-icons/lib/fa/gamepad.d.ts
+++ b/types/react-icons/lib/fa/gamepad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGamepad extends React.Component<IconBaseProps> { }
+declare class FaGamepad extends React.Component<IconBaseProps> { }
+export = FaGamepad;
diff --git a/types/react-icons/lib/fa/gavel.d.ts b/types/react-icons/lib/fa/gavel.d.ts
index 66e5593ffa..5e5e0e5084 100644
--- a/types/react-icons/lib/fa/gavel.d.ts
+++ b/types/react-icons/lib/fa/gavel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGavel extends React.Component<IconBaseProps> { }
+declare class FaGavel extends React.Component<IconBaseProps> { }
+export = FaGavel;
diff --git a/types/react-icons/lib/fa/gbp.d.ts b/types/react-icons/lib/fa/gbp.d.ts
index 1fb48290e3..ec7abd138a 100644
--- a/types/react-icons/lib/fa/gbp.d.ts
+++ b/types/react-icons/lib/fa/gbp.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGbp extends React.Component<IconBaseProps> { }
+declare class FaGbp extends React.Component<IconBaseProps> { }
+export = FaGbp;
diff --git a/types/react-icons/lib/fa/genderless.d.ts b/types/react-icons/lib/fa/genderless.d.ts
index 5ad672ddb3..a28ebcf09d 100644
--- a/types/react-icons/lib/fa/genderless.d.ts
+++ b/types/react-icons/lib/fa/genderless.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGenderless extends React.Component<IconBaseProps> { }
+declare class FaGenderless extends React.Component<IconBaseProps> { }
+export = FaGenderless;
diff --git a/types/react-icons/lib/fa/get-pocket.d.ts b/types/react-icons/lib/fa/get-pocket.d.ts
index 1f04b2974b..8184834bc9 100644
--- a/types/react-icons/lib/fa/get-pocket.d.ts
+++ b/types/react-icons/lib/fa/get-pocket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGetPocket extends React.Component<IconBaseProps> { }
+declare class FaGetPocket extends React.Component<IconBaseProps> { }
+export = FaGetPocket;
diff --git a/types/react-icons/lib/fa/gg-circle.d.ts b/types/react-icons/lib/fa/gg-circle.d.ts
index 580b37668c..08edcf12d9 100644
--- a/types/react-icons/lib/fa/gg-circle.d.ts
+++ b/types/react-icons/lib/fa/gg-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGgCircle extends React.Component<IconBaseProps> { }
+declare class FaGgCircle extends React.Component<IconBaseProps> { }
+export = FaGgCircle;
diff --git a/types/react-icons/lib/fa/gg.d.ts b/types/react-icons/lib/fa/gg.d.ts
index 2aaf1c7b23..923b9e251c 100644
--- a/types/react-icons/lib/fa/gg.d.ts
+++ b/types/react-icons/lib/fa/gg.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGg extends React.Component<IconBaseProps> { }
+declare class FaGg extends React.Component<IconBaseProps> { }
+export = FaGg;
diff --git a/types/react-icons/lib/fa/gift.d.ts b/types/react-icons/lib/fa/gift.d.ts
index 79b22324f5..3f2bbab5bd 100644
--- a/types/react-icons/lib/fa/gift.d.ts
+++ b/types/react-icons/lib/fa/gift.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGift extends React.Component<IconBaseProps> { }
+declare class FaGift extends React.Component<IconBaseProps> { }
+export = FaGift;
diff --git a/types/react-icons/lib/fa/git-square.d.ts b/types/react-icons/lib/fa/git-square.d.ts
index 28cf85a92a..6f35bf4d1e 100644
--- a/types/react-icons/lib/fa/git-square.d.ts
+++ b/types/react-icons/lib/fa/git-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGitSquare extends React.Component<IconBaseProps> { }
+declare class FaGitSquare extends React.Component<IconBaseProps> { }
+export = FaGitSquare;
diff --git a/types/react-icons/lib/fa/git.d.ts b/types/react-icons/lib/fa/git.d.ts
index 427ad2a4b8..e2f02405d1 100644
--- a/types/react-icons/lib/fa/git.d.ts
+++ b/types/react-icons/lib/fa/git.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGit extends React.Component<IconBaseProps> { }
+declare class FaGit extends React.Component<IconBaseProps> { }
+export = FaGit;
diff --git a/types/react-icons/lib/fa/github-alt.d.ts b/types/react-icons/lib/fa/github-alt.d.ts
index 8f3b4c4175..83433ff8c4 100644
--- a/types/react-icons/lib/fa/github-alt.d.ts
+++ b/types/react-icons/lib/fa/github-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGithubAlt extends React.Component<IconBaseProps> { }
+declare class FaGithubAlt extends React.Component<IconBaseProps> { }
+export = FaGithubAlt;
diff --git a/types/react-icons/lib/fa/github-square.d.ts b/types/react-icons/lib/fa/github-square.d.ts
index 8feea6aea6..97e33a57ce 100644
--- a/types/react-icons/lib/fa/github-square.d.ts
+++ b/types/react-icons/lib/fa/github-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGithubSquare extends React.Component<IconBaseProps> { }
+declare class FaGithubSquare extends React.Component<IconBaseProps> { }
+export = FaGithubSquare;
diff --git a/types/react-icons/lib/fa/github.d.ts b/types/react-icons/lib/fa/github.d.ts
index 6e5ff98328..47d9b29a3d 100644
--- a/types/react-icons/lib/fa/github.d.ts
+++ b/types/react-icons/lib/fa/github.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGithub extends React.Component<IconBaseProps> { }
+declare class FaGithub extends React.Component<IconBaseProps> { }
+export = FaGithub;
diff --git a/types/react-icons/lib/fa/gitlab.d.ts b/types/react-icons/lib/fa/gitlab.d.ts
index 1d185afb32..109562b8e7 100644
--- a/types/react-icons/lib/fa/gitlab.d.ts
+++ b/types/react-icons/lib/fa/gitlab.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGitlab extends React.Component<IconBaseProps> { }
+declare class FaGitlab extends React.Component<IconBaseProps> { }
+export = FaGitlab;
diff --git a/types/react-icons/lib/fa/gittip.d.ts b/types/react-icons/lib/fa/gittip.d.ts
index c96eaa0026..f24ab2ec75 100644
--- a/types/react-icons/lib/fa/gittip.d.ts
+++ b/types/react-icons/lib/fa/gittip.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGittip extends React.Component<IconBaseProps> { }
+declare class FaGittip extends React.Component<IconBaseProps> { }
+export = FaGittip;
diff --git a/types/react-icons/lib/fa/glass.d.ts b/types/react-icons/lib/fa/glass.d.ts
index 7f0fa030d9..daf740f992 100644
--- a/types/react-icons/lib/fa/glass.d.ts
+++ b/types/react-icons/lib/fa/glass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlass extends React.Component<IconBaseProps> { }
+declare class FaGlass extends React.Component<IconBaseProps> { }
+export = FaGlass;
diff --git a/types/react-icons/lib/fa/glide-g.d.ts b/types/react-icons/lib/fa/glide-g.d.ts
index c5601a2e6f..b3125de468 100644
--- a/types/react-icons/lib/fa/glide-g.d.ts
+++ b/types/react-icons/lib/fa/glide-g.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlideG extends React.Component<IconBaseProps> { }
+declare class FaGlideG extends React.Component<IconBaseProps> { }
+export = FaGlideG;
diff --git a/types/react-icons/lib/fa/glide.d.ts b/types/react-icons/lib/fa/glide.d.ts
index 7a7e2300f7..ff48d02cfd 100644
--- a/types/react-icons/lib/fa/glide.d.ts
+++ b/types/react-icons/lib/fa/glide.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlide extends React.Component<IconBaseProps> { }
+declare class FaGlide extends React.Component<IconBaseProps> { }
+export = FaGlide;
diff --git a/types/react-icons/lib/fa/globe.d.ts b/types/react-icons/lib/fa/globe.d.ts
index e71a1f6bd9..609ce3127a 100644
--- a/types/react-icons/lib/fa/globe.d.ts
+++ b/types/react-icons/lib/fa/globe.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlobe extends React.Component<IconBaseProps> { }
+declare class FaGlobe extends React.Component<IconBaseProps> { }
+export = FaGlobe;
diff --git a/types/react-icons/lib/fa/google-plus-square.d.ts b/types/react-icons/lib/fa/google-plus-square.d.ts
index 9d3428ec25..3f5f54ebe1 100644
--- a/types/react-icons/lib/fa/google-plus-square.d.ts
+++ b/types/react-icons/lib/fa/google-plus-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGooglePlusSquare extends React.Component<IconBaseProps> { }
+declare class FaGooglePlusSquare extends React.Component<IconBaseProps> { }
+export = FaGooglePlusSquare;
diff --git a/types/react-icons/lib/fa/google-plus.d.ts b/types/react-icons/lib/fa/google-plus.d.ts
index 3c1eba715e..080f4dcba2 100644
--- a/types/react-icons/lib/fa/google-plus.d.ts
+++ b/types/react-icons/lib/fa/google-plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGooglePlus extends React.Component<IconBaseProps> { }
+declare class FaGooglePlus extends React.Component<IconBaseProps> { }
+export = FaGooglePlus;
diff --git a/types/react-icons/lib/fa/google-wallet.d.ts b/types/react-icons/lib/fa/google-wallet.d.ts
index 8ab0d78a56..b19019fcff 100644
--- a/types/react-icons/lib/fa/google-wallet.d.ts
+++ b/types/react-icons/lib/fa/google-wallet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGoogleWallet extends React.Component<IconBaseProps> { }
+declare class FaGoogleWallet extends React.Component<IconBaseProps> { }
+export = FaGoogleWallet;
diff --git a/types/react-icons/lib/fa/google.d.ts b/types/react-icons/lib/fa/google.d.ts
index 3879f1c233..4318a2f68c 100644
--- a/types/react-icons/lib/fa/google.d.ts
+++ b/types/react-icons/lib/fa/google.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGoogle extends React.Component<IconBaseProps> { }
+declare class FaGoogle extends React.Component<IconBaseProps> { }
+export = FaGoogle;
diff --git a/types/react-icons/lib/fa/graduation-cap.d.ts b/types/react-icons/lib/fa/graduation-cap.d.ts
index 5c489d1118..daafb2481f 100644
--- a/types/react-icons/lib/fa/graduation-cap.d.ts
+++ b/types/react-icons/lib/fa/graduation-cap.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGraduationCap extends React.Component<IconBaseProps> { }
+declare class FaGraduationCap extends React.Component<IconBaseProps> { }
+export = FaGraduationCap;
diff --git a/types/react-icons/lib/fa/group.d.ts b/types/react-icons/lib/fa/group.d.ts
index 554bfb5fe6..9dbd8004a0 100644
--- a/types/react-icons/lib/fa/group.d.ts
+++ b/types/react-icons/lib/fa/group.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGroup extends React.Component<IconBaseProps> { }
+declare class FaGroup extends React.Component<IconBaseProps> { }
+export = FaGroup;
diff --git a/types/react-icons/lib/fa/h-square.d.ts b/types/react-icons/lib/fa/h-square.d.ts
index 0269ea9ebf..1f83d2fe5c 100644
--- a/types/react-icons/lib/fa/h-square.d.ts
+++ b/types/react-icons/lib/fa/h-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHSquare extends React.Component<IconBaseProps> { }
+declare class FaHSquare extends React.Component<IconBaseProps> { }
+export = FaHSquare;
diff --git a/types/react-icons/lib/fa/hacker-news.d.ts b/types/react-icons/lib/fa/hacker-news.d.ts
index 70ce441a26..fe36aed2e0 100644
--- a/types/react-icons/lib/fa/hacker-news.d.ts
+++ b/types/react-icons/lib/fa/hacker-news.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHackerNews extends React.Component<IconBaseProps> { }
+declare class FaHackerNews extends React.Component<IconBaseProps> { }
+export = FaHackerNews;
diff --git a/types/react-icons/lib/fa/hand-grab-o.d.ts b/types/react-icons/lib/fa/hand-grab-o.d.ts
index 44d508b041..d814d66263 100644
--- a/types/react-icons/lib/fa/hand-grab-o.d.ts
+++ b/types/react-icons/lib/fa/hand-grab-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandGrabO extends React.Component<IconBaseProps> { }
+declare class FaHandGrabO extends React.Component<IconBaseProps> { }
+export = FaHandGrabO;
diff --git a/types/react-icons/lib/fa/hand-lizard-o.d.ts b/types/react-icons/lib/fa/hand-lizard-o.d.ts
index 633375b976..7e239112be 100644
--- a/types/react-icons/lib/fa/hand-lizard-o.d.ts
+++ b/types/react-icons/lib/fa/hand-lizard-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandLizardO extends React.Component<IconBaseProps> { }
+declare class FaHandLizardO extends React.Component<IconBaseProps> { }
+export = FaHandLizardO;
diff --git a/types/react-icons/lib/fa/hand-o-down.d.ts b/types/react-icons/lib/fa/hand-o-down.d.ts
index d2a8580c81..1f2308b32e 100644
--- a/types/react-icons/lib/fa/hand-o-down.d.ts
+++ b/types/react-icons/lib/fa/hand-o-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandODown extends React.Component<IconBaseProps> { }
+declare class FaHandODown extends React.Component<IconBaseProps> { }
+export = FaHandODown;
diff --git a/types/react-icons/lib/fa/hand-o-left.d.ts b/types/react-icons/lib/fa/hand-o-left.d.ts
index ffce9da58b..6f6dd87b13 100644
--- a/types/react-icons/lib/fa/hand-o-left.d.ts
+++ b/types/react-icons/lib/fa/hand-o-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandOLeft extends React.Component<IconBaseProps> { }
+declare class FaHandOLeft extends React.Component<IconBaseProps> { }
+export = FaHandOLeft;
diff --git a/types/react-icons/lib/fa/hand-o-right.d.ts b/types/react-icons/lib/fa/hand-o-right.d.ts
index 4cc734bfe4..968a22b1db 100644
--- a/types/react-icons/lib/fa/hand-o-right.d.ts
+++ b/types/react-icons/lib/fa/hand-o-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandORight extends React.Component<IconBaseProps> { }
+declare class FaHandORight extends React.Component<IconBaseProps> { }
+export = FaHandORight;
diff --git a/types/react-icons/lib/fa/hand-o-up.d.ts b/types/react-icons/lib/fa/hand-o-up.d.ts
index 4c108e1765..38b891f8bc 100644
--- a/types/react-icons/lib/fa/hand-o-up.d.ts
+++ b/types/react-icons/lib/fa/hand-o-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandOUp extends React.Component<IconBaseProps> { }
+declare class FaHandOUp extends React.Component<IconBaseProps> { }
+export = FaHandOUp;
diff --git a/types/react-icons/lib/fa/hand-paper-o.d.ts b/types/react-icons/lib/fa/hand-paper-o.d.ts
index 634685b3ba..93dc962baf 100644
--- a/types/react-icons/lib/fa/hand-paper-o.d.ts
+++ b/types/react-icons/lib/fa/hand-paper-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPaperO extends React.Component<IconBaseProps> { }
+declare class FaHandPaperO extends React.Component<IconBaseProps> { }
+export = FaHandPaperO;
diff --git a/types/react-icons/lib/fa/hand-peace-o.d.ts b/types/react-icons/lib/fa/hand-peace-o.d.ts
index f5f4c083e0..10e5aff762 100644
--- a/types/react-icons/lib/fa/hand-peace-o.d.ts
+++ b/types/react-icons/lib/fa/hand-peace-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPeaceO extends React.Component<IconBaseProps> { }
+declare class FaHandPeaceO extends React.Component<IconBaseProps> { }
+export = FaHandPeaceO;
diff --git a/types/react-icons/lib/fa/hand-pointer-o.d.ts b/types/react-icons/lib/fa/hand-pointer-o.d.ts
index 98d03e1641..5ab960e769 100644
--- a/types/react-icons/lib/fa/hand-pointer-o.d.ts
+++ b/types/react-icons/lib/fa/hand-pointer-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPointerO extends React.Component<IconBaseProps> { }
+declare class FaHandPointerO extends React.Component<IconBaseProps> { }
+export = FaHandPointerO;
diff --git a/types/react-icons/lib/fa/hand-scissors-o.d.ts b/types/react-icons/lib/fa/hand-scissors-o.d.ts
index 8f95ce7463..18e8fda827 100644
--- a/types/react-icons/lib/fa/hand-scissors-o.d.ts
+++ b/types/react-icons/lib/fa/hand-scissors-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandScissorsO extends React.Component<IconBaseProps> { }
+declare class FaHandScissorsO extends React.Component<IconBaseProps> { }
+export = FaHandScissorsO;
diff --git a/types/react-icons/lib/fa/hand-spock-o.d.ts b/types/react-icons/lib/fa/hand-spock-o.d.ts
index e1ae444a79..7c52267033 100644
--- a/types/react-icons/lib/fa/hand-spock-o.d.ts
+++ b/types/react-icons/lib/fa/hand-spock-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandSpockO extends React.Component<IconBaseProps> { }
+declare class FaHandSpockO extends React.Component<IconBaseProps> { }
+export = FaHandSpockO;
diff --git a/types/react-icons/lib/fa/hashtag.d.ts b/types/react-icons/lib/fa/hashtag.d.ts
index c7c9be99a9..f992235c21 100644
--- a/types/react-icons/lib/fa/hashtag.d.ts
+++ b/types/react-icons/lib/fa/hashtag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHashtag extends React.Component<IconBaseProps> { }
+declare class FaHashtag extends React.Component<IconBaseProps> { }
+export = FaHashtag;
diff --git a/types/react-icons/lib/fa/hdd-o.d.ts b/types/react-icons/lib/fa/hdd-o.d.ts
index 1a04908493..e936e29487 100644
--- a/types/react-icons/lib/fa/hdd-o.d.ts
+++ b/types/react-icons/lib/fa/hdd-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHddO extends React.Component<IconBaseProps> { }
+declare class FaHddO extends React.Component<IconBaseProps> { }
+export = FaHddO;
diff --git a/types/react-icons/lib/fa/header.d.ts b/types/react-icons/lib/fa/header.d.ts
index 6f2e5d9137..386ceda142 100644
--- a/types/react-icons/lib/fa/header.d.ts
+++ b/types/react-icons/lib/fa/header.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeader extends React.Component<IconBaseProps> { }
+declare class FaHeader extends React.Component<IconBaseProps> { }
+export = FaHeader;
diff --git a/types/react-icons/lib/fa/headphones.d.ts b/types/react-icons/lib/fa/headphones.d.ts
index 9e6b4dc42a..b829255129 100644
--- a/types/react-icons/lib/fa/headphones.d.ts
+++ b/types/react-icons/lib/fa/headphones.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeadphones extends React.Component<IconBaseProps> { }
+declare class FaHeadphones extends React.Component<IconBaseProps> { }
+export = FaHeadphones;
diff --git a/types/react-icons/lib/fa/heart-o.d.ts b/types/react-icons/lib/fa/heart-o.d.ts
index e965f0636c..eba3e6b5cc 100644
--- a/types/react-icons/lib/fa/heart-o.d.ts
+++ b/types/react-icons/lib/fa/heart-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeartO extends React.Component<IconBaseProps> { }
+declare class FaHeartO extends React.Component<IconBaseProps> { }
+export = FaHeartO;
diff --git a/types/react-icons/lib/fa/heart.d.ts b/types/react-icons/lib/fa/heart.d.ts
index 495c26a5b3..57d8acf1b2 100644
--- a/types/react-icons/lib/fa/heart.d.ts
+++ b/types/react-icons/lib/fa/heart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeart extends React.Component<IconBaseProps> { }
+declare class FaHeart extends React.Component<IconBaseProps> { }
+export = FaHeart;
diff --git a/types/react-icons/lib/fa/heartbeat.d.ts b/types/react-icons/lib/fa/heartbeat.d.ts
index 74d47f94b1..706f8826c9 100644
--- a/types/react-icons/lib/fa/heartbeat.d.ts
+++ b/types/react-icons/lib/fa/heartbeat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeartbeat extends React.Component<IconBaseProps> { }
+declare class FaHeartbeat extends React.Component<IconBaseProps> { }
+export = FaHeartbeat;
diff --git a/types/react-icons/lib/fa/history.d.ts b/types/react-icons/lib/fa/history.d.ts
index 8af7a784c9..55885501cf 100644
--- a/types/react-icons/lib/fa/history.d.ts
+++ b/types/react-icons/lib/fa/history.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHistory extends React.Component<IconBaseProps> { }
+declare class FaHistory extends React.Component<IconBaseProps> { }
+export = FaHistory;
diff --git a/types/react-icons/lib/fa/home.d.ts b/types/react-icons/lib/fa/home.d.ts
index 404898ad6c..43b95643c9 100644
--- a/types/react-icons/lib/fa/home.d.ts
+++ b/types/react-icons/lib/fa/home.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHome extends React.Component<IconBaseProps> { }
+declare class FaHome extends React.Component<IconBaseProps> { }
+export = FaHome;
diff --git a/types/react-icons/lib/fa/hospital-o.d.ts b/types/react-icons/lib/fa/hospital-o.d.ts
index 1016140f7a..8b73adbf4a 100644
--- a/types/react-icons/lib/fa/hospital-o.d.ts
+++ b/types/react-icons/lib/fa/hospital-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHospitalO extends React.Component<IconBaseProps> { }
+declare class FaHospitalO extends React.Component<IconBaseProps> { }
+export = FaHospitalO;
diff --git a/types/react-icons/lib/fa/hourglass-1.d.ts b/types/react-icons/lib/fa/hourglass-1.d.ts
index 8ec87f4877..df93b9799e 100644
--- a/types/react-icons/lib/fa/hourglass-1.d.ts
+++ b/types/react-icons/lib/fa/hourglass-1.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass1 extends React.Component<IconBaseProps> { }
+declare class FaHourglass1 extends React.Component<IconBaseProps> { }
+export = FaHourglass1;
diff --git a/types/react-icons/lib/fa/hourglass-2.d.ts b/types/react-icons/lib/fa/hourglass-2.d.ts
index 600933c5e6..674576be63 100644
--- a/types/react-icons/lib/fa/hourglass-2.d.ts
+++ b/types/react-icons/lib/fa/hourglass-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass2 extends React.Component<IconBaseProps> { }
+declare class FaHourglass2 extends React.Component<IconBaseProps> { }
+export = FaHourglass2;
diff --git a/types/react-icons/lib/fa/hourglass-3.d.ts b/types/react-icons/lib/fa/hourglass-3.d.ts
index 31e8de7b99..eb3fa708bc 100644
--- a/types/react-icons/lib/fa/hourglass-3.d.ts
+++ b/types/react-icons/lib/fa/hourglass-3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass3 extends React.Component<IconBaseProps> { }
+declare class FaHourglass3 extends React.Component<IconBaseProps> { }
+export = FaHourglass3;
diff --git a/types/react-icons/lib/fa/hourglass-o.d.ts b/types/react-icons/lib/fa/hourglass-o.d.ts
index 5f2962e102..4052d297c9 100644
--- a/types/react-icons/lib/fa/hourglass-o.d.ts
+++ b/types/react-icons/lib/fa/hourglass-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglassO extends React.Component<IconBaseProps> { }
+declare class FaHourglassO extends React.Component<IconBaseProps> { }
+export = FaHourglassO;
diff --git a/types/react-icons/lib/fa/hourglass.d.ts b/types/react-icons/lib/fa/hourglass.d.ts
index 8bdcd7c8db..2e05acd88c 100644
--- a/types/react-icons/lib/fa/hourglass.d.ts
+++ b/types/react-icons/lib/fa/hourglass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass extends React.Component<IconBaseProps> { }
+declare class FaHourglass extends React.Component<IconBaseProps> { }
+export = FaHourglass;
diff --git a/types/react-icons/lib/fa/houzz.d.ts b/types/react-icons/lib/fa/houzz.d.ts
index ec4c55aecb..68e7283cc2 100644
--- a/types/react-icons/lib/fa/houzz.d.ts
+++ b/types/react-icons/lib/fa/houzz.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHouzz extends React.Component<IconBaseProps> { }
+declare class FaHouzz extends React.Component<IconBaseProps> { }
+export = FaHouzz;
diff --git a/types/react-icons/lib/fa/html5.d.ts b/types/react-icons/lib/fa/html5.d.ts
index 3b8bfcacbe..4829905b68 100644
--- a/types/react-icons/lib/fa/html5.d.ts
+++ b/types/react-icons/lib/fa/html5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHtml5 extends React.Component<IconBaseProps> { }
+declare class FaHtml5 extends React.Component<IconBaseProps> { }
+export = FaHtml5;
diff --git a/types/react-icons/lib/fa/i-cursor.d.ts b/types/react-icons/lib/fa/i-cursor.d.ts
index 77e0964814..fcbe8c366d 100644
--- a/types/react-icons/lib/fa/i-cursor.d.ts
+++ b/types/react-icons/lib/fa/i-cursor.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaICursor extends React.Component<IconBaseProps> { }
+declare class FaICursor extends React.Component<IconBaseProps> { }
+export = FaICursor;
diff --git a/types/react-icons/lib/fa/ils.d.ts b/types/react-icons/lib/fa/ils.d.ts
index 966e8bb384..046d06284a 100644
--- a/types/react-icons/lib/fa/ils.d.ts
+++ b/types/react-icons/lib/fa/ils.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIls extends React.Component<IconBaseProps> { }
+declare class FaIls extends React.Component<IconBaseProps> { }
+export = FaIls;
diff --git a/types/react-icons/lib/fa/image.d.ts b/types/react-icons/lib/fa/image.d.ts
index 69e435b56a..72edc4be49 100644
--- a/types/react-icons/lib/fa/image.d.ts
+++ b/types/react-icons/lib/fa/image.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaImage extends React.Component<IconBaseProps> { }
+declare class FaImage extends React.Component<IconBaseProps> { }
+export = FaImage;
diff --git a/types/react-icons/lib/fa/inbox.d.ts b/types/react-icons/lib/fa/inbox.d.ts
index 401aba5577..272e6a209c 100644
--- a/types/react-icons/lib/fa/inbox.d.ts
+++ b/types/react-icons/lib/fa/inbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInbox extends React.Component<IconBaseProps> { }
+declare class FaInbox extends React.Component<IconBaseProps> { }
+export = FaInbox;
diff --git a/types/react-icons/lib/fa/indent.d.ts b/types/react-icons/lib/fa/indent.d.ts
index c3022d3fc3..2829ca18c3 100644
--- a/types/react-icons/lib/fa/indent.d.ts
+++ b/types/react-icons/lib/fa/indent.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIndent extends React.Component<IconBaseProps> { }
+declare class FaIndent extends React.Component<IconBaseProps> { }
+export = FaIndent;
diff --git a/types/react-icons/lib/fa/index.d.ts b/types/react-icons/lib/fa/index.d.ts
index 04750fc303..073a1797a9 100644
--- a/types/react-icons/lib/fa/index.d.ts
+++ b/types/react-icons/lib/fa/index.d.ts
@@ -1,628 +1,628 @@
-export { default as Fa500px } from "./500px";
-export { default as FaAdjust } from "./adjust";
-export { default as FaAdn } from "./adn";
-export { default as FaAlignCenter } from "./align-center";
-export { default as FaAlignJustify } from "./align-justify";
-export { default as FaAlignLeft } from "./align-left";
-export { default as FaAlignRight } from "./align-right";
-export { default as FaAmazon } from "./amazon";
-export { default as FaAmbulance } from "./ambulance";
-export { default as FaAmericanSignLanguageInterpreting } from "./american-sign-language-interpreting";
-export { default as FaAnchor } from "./anchor";
-export { default as FaAndroid } from "./android";
-export { default as FaAngellist } from "./angellist";
-export { default as FaAngleDoubleDown } from "./angle-double-down";
-export { default as FaAngleDoubleLeft } from "./angle-double-left";
-export { default as FaAngleDoubleRight } from "./angle-double-right";
-export { default as FaAngleDoubleUp } from "./angle-double-up";
-export { default as FaAngleDown } from "./angle-down";
-export { default as FaAngleLeft } from "./angle-left";
-export { default as FaAngleRight } from "./angle-right";
-export { default as FaAngleUp } from "./angle-up";
-export { default as FaApple } from "./apple";
-export { default as FaArchive } from "./archive";
-export { default as FaAreaChart } from "./area-chart";
-export { default as FaArrowCircleDown } from "./arrow-circle-down";
-export { default as FaArrowCircleLeft } from "./arrow-circle-left";
-export { default as FaArrowCircleODown } from "./arrow-circle-o-down";
-export { default as FaArrowCircleOLeft } from "./arrow-circle-o-left";
-export { default as FaArrowCircleORight } from "./arrow-circle-o-right";
-export { default as FaArrowCircleOUp } from "./arrow-circle-o-up";
-export { default as FaArrowCircleRight } from "./arrow-circle-right";
-export { default as FaArrowCircleUp } from "./arrow-circle-up";
-export { default as FaArrowDown } from "./arrow-down";
-export { default as FaArrowLeft } from "./arrow-left";
-export { default as FaArrowRight } from "./arrow-right";
-export { default as FaArrowUp } from "./arrow-up";
-export { default as FaArrowsAlt } from "./arrows-alt";
-export { default as FaArrowsH } from "./arrows-h";
-export { default as FaArrowsV } from "./arrows-v";
-export { default as FaArrows } from "./arrows";
-export { default as FaAssistiveListeningSystems } from "./assistive-listening-systems";
-export { default as FaAsterisk } from "./asterisk";
-export { default as FaAt } from "./at";
-export { default as FaAudioDescription } from "./audio-description";
-export { default as FaAutomobile } from "./automobile";
-export { default as FaBackward } from "./backward";
-export { default as FaBalanceScale } from "./balance-scale";
-export { default as FaBan } from "./ban";
-export { default as FaBank } from "./bank";
-export { default as FaBarChart } from "./bar-chart";
-export { default as FaBarcode } from "./barcode";
-export { default as FaBars } from "./bars";
-export { default as FaBattery0 } from "./battery-0";
-export { default as FaBattery1 } from "./battery-1";
-export { default as FaBattery2 } from "./battery-2";
-export { default as FaBattery3 } from "./battery-3";
-export { default as FaBattery4 } from "./battery-4";
-export { default as FaBed } from "./bed";
-export { default as FaBeer } from "./beer";
-export { default as FaBehanceSquare } from "./behance-square";
-export { default as FaBehance } from "./behance";
-export { default as FaBellO } from "./bell-o";
-export { default as FaBellSlashO } from "./bell-slash-o";
-export { default as FaBellSlash } from "./bell-slash";
-export { default as FaBell } from "./bell";
-export { default as FaBicycle } from "./bicycle";
-export { default as FaBinoculars } from "./binoculars";
-export { default as FaBirthdayCake } from "./birthday-cake";
-export { default as FaBitbucketSquare } from "./bitbucket-square";
-export { default as FaBitbucket } from "./bitbucket";
-export { default as FaBitcoin } from "./bitcoin";
-export { default as FaBlackTie } from "./black-tie";
-export { default as FaBlind } from "./blind";
-export { default as FaBluetoothB } from "./bluetooth-b";
-export { default as FaBluetooth } from "./bluetooth";
-export { default as FaBold } from "./bold";
-export { default as FaBolt } from "./bolt";
-export { default as FaBomb } from "./bomb";
-export { default as FaBook } from "./book";
-export { default as FaBookmarkO } from "./bookmark-o";
-export { default as FaBookmark } from "./bookmark";
-export { default as FaBraille } from "./braille";
-export { default as FaBriefcase } from "./briefcase";
-export { default as FaBug } from "./bug";
-export { default as FaBuildingO } from "./building-o";
-export { default as FaBuilding } from "./building";
-export { default as FaBullhorn } from "./bullhorn";
-export { default as FaBullseye } from "./bullseye";
-export { default as FaBus } from "./bus";
-export { default as FaBuysellads } from "./buysellads";
-export { default as FaCab } from "./cab";
-export { default as FaCalculator } from "./calculator";
-export { default as FaCalendarCheckO } from "./calendar-check-o";
-export { default as FaCalendarMinusO } from "./calendar-minus-o";
-export { default as FaCalendarO } from "./calendar-o";
-export { default as FaCalendarPlusO } from "./calendar-plus-o";
-export { default as FaCalendarTimesO } from "./calendar-times-o";
-export { default as FaCalendar } from "./calendar";
-export { default as FaCameraRetro } from "./camera-retro";
-export { default as FaCamera } from "./camera";
-export { default as FaCaretDown } from "./caret-down";
-export { default as FaCaretLeft } from "./caret-left";
-export { default as FaCaretRight } from "./caret-right";
-export { default as FaCaretSquareODown } from "./caret-square-o-down";
-export { default as FaCaretSquareOLeft } from "./caret-square-o-left";
-export { default as FaCaretSquareORight } from "./caret-square-o-right";
-export { default as FaCaretSquareOUp } from "./caret-square-o-up";
-export { default as FaCaretUp } from "./caret-up";
-export { default as FaCartArrowDown } from "./cart-arrow-down";
-export { default as FaCartPlus } from "./cart-plus";
-export { default as FaCcAmex } from "./cc-amex";
-export { default as FaCcDinersClub } from "./cc-diners-club";
-export { default as FaCcDiscover } from "./cc-discover";
-export { default as FaCcJcb } from "./cc-jcb";
-export { default as FaCcMastercard } from "./cc-mastercard";
-export { default as FaCcPaypal } from "./cc-paypal";
-export { default as FaCcStripe } from "./cc-stripe";
-export { default as FaCcVisa } from "./cc-visa";
-export { default as FaCc } from "./cc";
-export { default as FaCertificate } from "./certificate";
-export { default as FaChainBroken } from "./chain-broken";
-export { default as FaChain } from "./chain";
-export { default as FaCheckCircleO } from "./check-circle-o";
-export { default as FaCheckCircle } from "./check-circle";
-export { default as FaCheckSquareO } from "./check-square-o";
-export { default as FaCheckSquare } from "./check-square";
-export { default as FaCheck } from "./check";
-export { default as FaChevronCircleDown } from "./chevron-circle-down";
-export { default as FaChevronCircleLeft } from "./chevron-circle-left";
-export { default as FaChevronCircleRight } from "./chevron-circle-right";
-export { default as FaChevronCircleUp } from "./chevron-circle-up";
-export { default as FaChevronDown } from "./chevron-down";
-export { default as FaChevronLeft } from "./chevron-left";
-export { default as FaChevronRight } from "./chevron-right";
-export { default as FaChevronUp } from "./chevron-up";
-export { default as FaChild } from "./child";
-export { default as FaChrome } from "./chrome";
-export { default as FaCircleONotch } from "./circle-o-notch";
-export { default as FaCircleO } from "./circle-o";
-export { default as FaCircleThin } from "./circle-thin";
-export { default as FaCircle } from "./circle";
-export { default as FaClipboard } from "./clipboard";
-export { default as FaClockO } from "./clock-o";
-export { default as FaClone } from "./clone";
-export { default as FaClose } from "./close";
-export { default as FaCloudDownload } from "./cloud-download";
-export { default as FaCloudUpload } from "./cloud-upload";
-export { default as FaCloud } from "./cloud";
-export { default as FaCny } from "./cny";
-export { default as FaCodeFork } from "./code-fork";
-export { default as FaCode } from "./code";
-export { default as FaCodepen } from "./codepen";
-export { default as FaCodiepie } from "./codiepie";
-export { default as FaCoffee } from "./coffee";
-export { default as FaCog } from "./cog";
-export { default as FaCogs } from "./cogs";
-export { default as FaColumns } from "./columns";
-export { default as FaCommentO } from "./comment-o";
-export { default as FaComment } from "./comment";
-export { default as FaCommentingO } from "./commenting-o";
-export { default as FaCommenting } from "./commenting";
-export { default as FaCommentsO } from "./comments-o";
-export { default as FaComments } from "./comments";
-export { default as FaCompass } from "./compass";
-export { default as FaCompress } from "./compress";
-export { default as FaConnectdevelop } from "./connectdevelop";
-export { default as FaContao } from "./contao";
-export { default as FaCopy } from "./copy";
-export { default as FaCopyright } from "./copyright";
-export { default as FaCreativeCommons } from "./creative-commons";
-export { default as FaCreditCardAlt } from "./credit-card-alt";
-export { default as FaCreditCard } from "./credit-card";
-export { default as FaCrop } from "./crop";
-export { default as FaCrosshairs } from "./crosshairs";
-export { default as FaCss3 } from "./css3";
-export { default as FaCube } from "./cube";
-export { default as FaCubes } from "./cubes";
-export { default as FaCut } from "./cut";
-export { default as FaCutlery } from "./cutlery";
-export { default as FaDashboard } from "./dashboard";
-export { default as FaDashcube } from "./dashcube";
-export { default as FaDatabase } from "./database";
-export { default as FaDeaf } from "./deaf";
-export { default as FaDedent } from "./dedent";
-export { default as FaDelicious } from "./delicious";
-export { default as FaDesktop } from "./desktop";
-export { default as FaDeviantart } from "./deviantart";
-export { default as FaDiamond } from "./diamond";
-export { default as FaDigg } from "./digg";
-export { default as FaDollar } from "./dollar";
-export { default as FaDotCircleO } from "./dot-circle-o";
-export { default as FaDownload } from "./download";
-export { default as FaDribbble } from "./dribbble";
-export { default as FaDropbox } from "./dropbox";
-export { default as FaDrupal } from "./drupal";
-export { default as FaEdge } from "./edge";
-export { default as FaEdit } from "./edit";
-export { default as FaEject } from "./eject";
-export { default as FaEllipsisH } from "./ellipsis-h";
-export { default as FaEllipsisV } from "./ellipsis-v";
-export { default as FaEmpire } from "./empire";
-export { default as FaEnvelopeO } from "./envelope-o";
-export { default as FaEnvelopeSquare } from "./envelope-square";
-export { default as FaEnvelope } from "./envelope";
-export { default as FaEnvira } from "./envira";
-export { default as FaEraser } from "./eraser";
-export { default as FaEur } from "./eur";
-export { default as FaExchange } from "./exchange";
-export { default as FaExclamationCircle } from "./exclamation-circle";
-export { default as FaExclamationTriangle } from "./exclamation-triangle";
-export { default as FaExclamation } from "./exclamation";
-export { default as FaExpand } from "./expand";
-export { default as FaExpeditedssl } from "./expeditedssl";
-export { default as FaExternalLinkSquare } from "./external-link-square";
-export { default as FaExternalLink } from "./external-link";
-export { default as FaEyeSlash } from "./eye-slash";
-export { default as FaEye } from "./eye";
-export { default as FaEyedropper } from "./eyedropper";
-export { default as FaFacebookOfficial } from "./facebook-official";
-export { default as FaFacebookSquare } from "./facebook-square";
-export { default as FaFacebook } from "./facebook";
-export { default as FaFastBackward } from "./fast-backward";
-export { default as FaFastForward } from "./fast-forward";
-export { default as FaFax } from "./fax";
-export { default as FaFeed } from "./feed";
-export { default as FaFemale } from "./female";
-export { default as FaFighterJet } from "./fighter-jet";
-export { default as FaFileArchiveO } from "./file-archive-o";
-export { default as FaFileAudioO } from "./file-audio-o";
-export { default as FaFileCodeO } from "./file-code-o";
-export { default as FaFileExcelO } from "./file-excel-o";
-export { default as FaFileImageO } from "./file-image-o";
-export { default as FaFileMovieO } from "./file-movie-o";
-export { default as FaFileO } from "./file-o";
-export { default as FaFilePdfO } from "./file-pdf-o";
-export { default as FaFilePowerpointO } from "./file-powerpoint-o";
-export { default as FaFileTextO } from "./file-text-o";
-export { default as FaFileText } from "./file-text";
-export { default as FaFileWordO } from "./file-word-o";
-export { default as FaFile } from "./file";
-export { default as FaFilm } from "./film";
-export { default as FaFilter } from "./filter";
-export { default as FaFireExtinguisher } from "./fire-extinguisher";
-export { default as FaFire } from "./fire";
-export { default as FaFirefox } from "./firefox";
-export { default as FaFlagCheckered } from "./flag-checkered";
-export { default as FaFlagO } from "./flag-o";
-export { default as FaFlag } from "./flag";
-export { default as FaFlask } from "./flask";
-export { default as FaFlickr } from "./flickr";
-export { default as FaFloppyO } from "./floppy-o";
-export { default as FaFolderO } from "./folder-o";
-export { default as FaFolderOpenO } from "./folder-open-o";
-export { default as FaFolderOpen } from "./folder-open";
-export { default as FaFolder } from "./folder";
-export { default as FaFont } from "./font";
-export { default as FaFonticons } from "./fonticons";
-export { default as FaFortAwesome } from "./fort-awesome";
-export { default as FaForumbee } from "./forumbee";
-export { default as FaForward } from "./forward";
-export { default as FaFoursquare } from "./foursquare";
-export { default as FaFrownO } from "./frown-o";
-export { default as FaFutbolO } from "./futbol-o";
-export { default as FaGamepad } from "./gamepad";
-export { default as FaGavel } from "./gavel";
-export { default as FaGbp } from "./gbp";
-export { default as FaGenderless } from "./genderless";
-export { default as FaGetPocket } from "./get-pocket";
-export { default as FaGgCircle } from "./gg-circle";
-export { default as FaGg } from "./gg";
-export { default as FaGift } from "./gift";
-export { default as FaGitSquare } from "./git-square";
-export { default as FaGit } from "./git";
-export { default as FaGithubAlt } from "./github-alt";
-export { default as FaGithubSquare } from "./github-square";
-export { default as FaGithub } from "./github";
-export { default as FaGitlab } from "./gitlab";
-export { default as FaGittip } from "./gittip";
-export { default as FaGlass } from "./glass";
-export { default as FaGlideG } from "./glide-g";
-export { default as FaGlide } from "./glide";
-export { default as FaGlobe } from "./globe";
-export { default as FaGooglePlusSquare } from "./google-plus-square";
-export { default as FaGooglePlus } from "./google-plus";
-export { default as FaGoogleWallet } from "./google-wallet";
-export { default as FaGoogle } from "./google";
-export { default as FaGraduationCap } from "./graduation-cap";
-export { default as FaGroup } from "./group";
-export { default as FaHSquare } from "./h-square";
-export { default as FaHackerNews } from "./hacker-news";
-export { default as FaHandGrabO } from "./hand-grab-o";
-export { default as FaHandLizardO } from "./hand-lizard-o";
-export { default as FaHandODown } from "./hand-o-down";
-export { default as FaHandOLeft } from "./hand-o-left";
-export { default as FaHandORight } from "./hand-o-right";
-export { default as FaHandOUp } from "./hand-o-up";
-export { default as FaHandPaperO } from "./hand-paper-o";
-export { default as FaHandPeaceO } from "./hand-peace-o";
-export { default as FaHandPointerO } from "./hand-pointer-o";
-export { default as FaHandScissorsO } from "./hand-scissors-o";
-export { default as FaHandSpockO } from "./hand-spock-o";
-export { default as FaHashtag } from "./hashtag";
-export { default as FaHddO } from "./hdd-o";
-export { default as FaHeader } from "./header";
-export { default as FaHeadphones } from "./headphones";
-export { default as FaHeartO } from "./heart-o";
-export { default as FaHeart } from "./heart";
-export { default as FaHeartbeat } from "./heartbeat";
-export { default as FaHistory } from "./history";
-export { default as FaHome } from "./home";
-export { default as FaHospitalO } from "./hospital-o";
-export { default as FaHourglass1 } from "./hourglass-1";
-export { default as FaHourglass2 } from "./hourglass-2";
-export { default as FaHourglass3 } from "./hourglass-3";
-export { default as FaHourglassO } from "./hourglass-o";
-export { default as FaHourglass } from "./hourglass";
-export { default as FaHouzz } from "./houzz";
-export { default as FaHtml5 } from "./html5";
-export { default as FaICursor } from "./i-cursor";
-export { default as FaIls } from "./ils";
-export { default as FaImage } from "./image";
-export { default as FaInbox } from "./inbox";
-export { default as FaIndent } from "./indent";
-export { default as FaIndustry } from "./industry";
-export { default as FaInfoCircle } from "./info-circle";
-export { default as FaInfo } from "./info";
-export { default as FaInr } from "./inr";
-export { default as FaInstagram } from "./instagram";
-export { default as FaInternetExplorer } from "./internet-explorer";
-export { default as FaIntersex } from "./intersex";
-export { default as FaIoxhost } from "./ioxhost";
-export { default as FaItalic } from "./italic";
-export { default as FaJoomla } from "./joomla";
-export { default as FaJsfiddle } from "./jsfiddle";
-export { default as FaKey } from "./key";
-export { default as FaKeyboardO } from "./keyboard-o";
-export { default as FaKrw } from "./krw";
-export { default as FaLanguage } from "./language";
-export { default as FaLaptop } from "./laptop";
-export { default as FaLastfmSquare } from "./lastfm-square";
-export { default as FaLastfm } from "./lastfm";
-export { default as FaLeaf } from "./leaf";
-export { default as FaLeanpub } from "./leanpub";
-export { default as FaLemonO } from "./lemon-o";
-export { default as FaLevelDown } from "./level-down";
-export { default as FaLevelUp } from "./level-up";
-export { default as FaLifeBouy } from "./life-bouy";
-export { default as FaLightbulbO } from "./lightbulb-o";
-export { default as FaLineChart } from "./line-chart";
-export { default as FaLinkedinSquare } from "./linkedin-square";
-export { default as FaLinkedin } from "./linkedin";
-export { default as FaLinux } from "./linux";
-export { default as FaListAlt } from "./list-alt";
-export { default as FaListOl } from "./list-ol";
-export { default as FaListUl } from "./list-ul";
-export { default as FaList } from "./list";
-export { default as FaLocationArrow } from "./location-arrow";
-export { default as FaLock } from "./lock";
-export { default as FaLongArrowDown } from "./long-arrow-down";
-export { default as FaLongArrowLeft } from "./long-arrow-left";
-export { default as FaLongArrowRight } from "./long-arrow-right";
-export { default as FaLongArrowUp } from "./long-arrow-up";
-export { default as FaLowVision } from "./low-vision";
-export { default as FaMagic } from "./magic";
-export { default as FaMagnet } from "./magnet";
-export { default as FaMailForward } from "./mail-forward";
-export { default as FaMailReplyAll } from "./mail-reply-all";
-export { default as FaMailReply } from "./mail-reply";
-export { default as FaMale } from "./male";
-export { default as FaMapMarker } from "./map-marker";
-export { default as FaMapO } from "./map-o";
-export { default as FaMapPin } from "./map-pin";
-export { default as FaMapSigns } from "./map-signs";
-export { default as FaMap } from "./map";
-export { default as FaMarsDouble } from "./mars-double";
-export { default as FaMarsStrokeH } from "./mars-stroke-h";
-export { default as FaMarsStrokeV } from "./mars-stroke-v";
-export { default as FaMarsStroke } from "./mars-stroke";
-export { default as FaMars } from "./mars";
-export { default as FaMaxcdn } from "./maxcdn";
-export { default as FaMeanpath } from "./meanpath";
-export { default as FaMedium } from "./medium";
-export { default as FaMedkit } from "./medkit";
-export { default as FaMehO } from "./meh-o";
-export { default as FaMercury } from "./mercury";
-export { default as FaMicrophoneSlash } from "./microphone-slash";
-export { default as FaMicrophone } from "./microphone";
-export { default as FaMinusCircle } from "./minus-circle";
-export { default as FaMinusSquareO } from "./minus-square-o";
-export { default as FaMinusSquare } from "./minus-square";
-export { default as FaMinus } from "./minus";
-export { default as FaMixcloud } from "./mixcloud";
-export { default as FaMobile } from "./mobile";
-export { default as FaModx } from "./modx";
-export { default as FaMoney } from "./money";
-export { default as FaMoonO } from "./moon-o";
-export { default as FaMotorcycle } from "./motorcycle";
-export { default as FaMousePointer } from "./mouse-pointer";
-export { default as FaMusic } from "./music";
-export { default as FaNeuter } from "./neuter";
-export { default as FaNewspaperO } from "./newspaper-o";
-export { default as FaObjectGroup } from "./object-group";
-export { default as FaObjectUngroup } from "./object-ungroup";
-export { default as FaOdnoklassnikiSquare } from "./odnoklassniki-square";
-export { default as FaOdnoklassniki } from "./odnoklassniki";
-export { default as FaOpencart } from "./opencart";
-export { default as FaOpenid } from "./openid";
-export { default as FaOpera } from "./opera";
-export { default as FaOptinMonster } from "./optin-monster";
-export { default as FaPagelines } from "./pagelines";
-export { default as FaPaintBrush } from "./paint-brush";
-export { default as FaPaperPlaneO } from "./paper-plane-o";
-export { default as FaPaperPlane } from "./paper-plane";
-export { default as FaPaperclip } from "./paperclip";
-export { default as FaParagraph } from "./paragraph";
-export { default as FaPauseCircleO } from "./pause-circle-o";
-export { default as FaPauseCircle } from "./pause-circle";
-export { default as FaPause } from "./pause";
-export { default as FaPaw } from "./paw";
-export { default as FaPaypal } from "./paypal";
-export { default as FaPencilSquare } from "./pencil-square";
-export { default as FaPencil } from "./pencil";
-export { default as FaPercent } from "./percent";
-export { default as FaPhoneSquare } from "./phone-square";
-export { default as FaPhone } from "./phone";
-export { default as FaPieChart } from "./pie-chart";
-export { default as FaPiedPiperAlt } from "./pied-piper-alt";
-export { default as FaPiedPiper } from "./pied-piper";
-export { default as FaPinterestP } from "./pinterest-p";
-export { default as FaPinterestSquare } from "./pinterest-square";
-export { default as FaPinterest } from "./pinterest";
-export { default as FaPlane } from "./plane";
-export { default as FaPlayCircleO } from "./play-circle-o";
-export { default as FaPlayCircle } from "./play-circle";
-export { default as FaPlay } from "./play";
-export { default as FaPlug } from "./plug";
-export { default as FaPlusCircle } from "./plus-circle";
-export { default as FaPlusSquareO } from "./plus-square-o";
-export { default as FaPlusSquare } from "./plus-square";
-export { default as FaPlus } from "./plus";
-export { default as FaPowerOff } from "./power-off";
-export { default as FaPrint } from "./print";
-export { default as FaProductHunt } from "./product-hunt";
-export { default as FaPuzzlePiece } from "./puzzle-piece";
-export { default as FaQq } from "./qq";
-export { default as FaQrcode } from "./qrcode";
-export { default as FaQuestionCircleO } from "./question-circle-o";
-export { default as FaQuestionCircle } from "./question-circle";
-export { default as FaQuestion } from "./question";
-export { default as FaQuoteLeft } from "./quote-left";
-export { default as FaQuoteRight } from "./quote-right";
-export { default as FaRa } from "./ra";
-export { default as FaRandom } from "./random";
-export { default as FaRecycle } from "./recycle";
-export { default as FaRedditAlien } from "./reddit-alien";
-export { default as FaRedditSquare } from "./reddit-square";
-export { default as FaReddit } from "./reddit";
-export { default as FaRefresh } from "./refresh";
-export { default as FaRegistered } from "./registered";
-export { default as FaRenren } from "./renren";
-export { default as FaRepeat } from "./repeat";
-export { default as FaRetweet } from "./retweet";
-export { default as FaRoad } from "./road";
-export { default as FaRocket } from "./rocket";
-export { default as FaRotateLeft } from "./rotate-left";
-export { default as FaRouble } from "./rouble";
-export { default as FaRssSquare } from "./rss-square";
-export { default as FaSafari } from "./safari";
-export { default as FaScribd } from "./scribd";
-export { default as FaSearchMinus } from "./search-minus";
-export { default as FaSearchPlus } from "./search-plus";
-export { default as FaSearch } from "./search";
-export { default as FaSellsy } from "./sellsy";
-export { default as FaServer } from "./server";
-export { default as FaShareAltSquare } from "./share-alt-square";
-export { default as FaShareAlt } from "./share-alt";
-export { default as FaShareSquareO } from "./share-square-o";
-export { default as FaShareSquare } from "./share-square";
-export { default as FaShield } from "./shield";
-export { default as FaShip } from "./ship";
-export { default as FaShirtsinbulk } from "./shirtsinbulk";
-export { default as FaShoppingBag } from "./shopping-bag";
-export { default as FaShoppingBasket } from "./shopping-basket";
-export { default as FaShoppingCart } from "./shopping-cart";
-export { default as FaSignIn } from "./sign-in";
-export { default as FaSignLanguage } from "./sign-language";
-export { default as FaSignOut } from "./sign-out";
-export { default as FaSignal } from "./signal";
-export { default as FaSimplybuilt } from "./simplybuilt";
-export { default as FaSitemap } from "./sitemap";
-export { default as FaSkyatlas } from "./skyatlas";
-export { default as FaSkype } from "./skype";
-export { default as FaSlack } from "./slack";
-export { default as FaSliders } from "./sliders";
-export { default as FaSlideshare } from "./slideshare";
-export { default as FaSmileO } from "./smile-o";
-export { default as FaSnapchatGhost } from "./snapchat-ghost";
-export { default as FaSnapchatSquare } from "./snapchat-square";
-export { default as FaSnapchat } from "./snapchat";
-export { default as FaSortAlphaAsc } from "./sort-alpha-asc";
-export { default as FaSortAlphaDesc } from "./sort-alpha-desc";
-export { default as FaSortAmountAsc } from "./sort-amount-asc";
-export { default as FaSortAmountDesc } from "./sort-amount-desc";
-export { default as FaSortAsc } from "./sort-asc";
-export { default as FaSortDesc } from "./sort-desc";
-export { default as FaSortNumericAsc } from "./sort-numeric-asc";
-export { default as FaSortNumericDesc } from "./sort-numeric-desc";
-export { default as FaSort } from "./sort";
-export { default as FaSoundcloud } from "./soundcloud";
-export { default as FaSpaceShuttle } from "./space-shuttle";
-export { default as FaSpinner } from "./spinner";
-export { default as FaSpoon } from "./spoon";
-export { default as FaSpotify } from "./spotify";
-export { default as FaSquareO } from "./square-o";
-export { default as FaSquare } from "./square";
-export { default as FaStackExchange } from "./stack-exchange";
-export { default as FaStackOverflow } from "./stack-overflow";
-export { default as FaStarHalfEmpty } from "./star-half-empty";
-export { default as FaStarHalf } from "./star-half";
-export { default as FaStarO } from "./star-o";
-export { default as FaStar } from "./star";
-export { default as FaSteamSquare } from "./steam-square";
-export { default as FaSteam } from "./steam";
-export { default as FaStepBackward } from "./step-backward";
-export { default as FaStepForward } from "./step-forward";
-export { default as FaStethoscope } from "./stethoscope";
-export { default as FaStickyNoteO } from "./sticky-note-o";
-export { default as FaStickyNote } from "./sticky-note";
-export { default as FaStopCircleO } from "./stop-circle-o";
-export { default as FaStopCircle } from "./stop-circle";
-export { default as FaStop } from "./stop";
-export { default as FaStreetView } from "./street-view";
-export { default as FaStrikethrough } from "./strikethrough";
-export { default as FaStumbleuponCircle } from "./stumbleupon-circle";
-export { default as FaStumbleupon } from "./stumbleupon";
-export { default as FaSubscript } from "./subscript";
-export { default as FaSubway } from "./subway";
-export { default as FaSuitcase } from "./suitcase";
-export { default as FaSunO } from "./sun-o";
-export { default as FaSuperscript } from "./superscript";
-export { default as FaTable } from "./table";
-export { default as FaTablet } from "./tablet";
-export { default as FaTag } from "./tag";
-export { default as FaTags } from "./tags";
-export { default as FaTasks } from "./tasks";
-export { default as FaTelevision } from "./television";
-export { default as FaTencentWeibo } from "./tencent-weibo";
-export { default as FaTerminal } from "./terminal";
-export { default as FaTextHeight } from "./text-height";
-export { default as FaTextWidth } from "./text-width";
-export { default as FaThLarge } from "./th-large";
-export { default as FaThList } from "./th-list";
-export { default as FaTh } from "./th";
-export { default as FaThumbTack } from "./thumb-tack";
-export { default as FaThumbsDown } from "./thumbs-down";
-export { default as FaThumbsODown } from "./thumbs-o-down";
-export { default as FaThumbsOUp } from "./thumbs-o-up";
-export { default as FaThumbsUp } from "./thumbs-up";
-export { default as FaTicket } from "./ticket";
-export { default as FaTimesCircleO } from "./times-circle-o";
-export { default as FaTimesCircle } from "./times-circle";
-export { default as FaTint } from "./tint";
-export { default as FaToggleOff } from "./toggle-off";
-export { default as FaToggleOn } from "./toggle-on";
-export { default as FaTrademark } from "./trademark";
-export { default as FaTrain } from "./train";
-export { default as FaTransgenderAlt } from "./transgender-alt";
-export { default as FaTrashO } from "./trash-o";
-export { default as FaTrash } from "./trash";
-export { default as FaTree } from "./tree";
-export { default as FaTrello } from "./trello";
-export { default as FaTripadvisor } from "./tripadvisor";
-export { default as FaTrophy } from "./trophy";
-export { default as FaTruck } from "./truck";
-export { default as FaTry } from "./try";
-export { default as FaTty } from "./tty";
-export { default as FaTumblrSquare } from "./tumblr-square";
-export { default as FaTumblr } from "./tumblr";
-export { default as FaTwitch } from "./twitch";
-export { default as FaTwitterSquare } from "./twitter-square";
-export { default as FaTwitter } from "./twitter";
-export { default as FaUmbrella } from "./umbrella";
-export { default as FaUnderline } from "./underline";
-export { default as FaUniversalAccess } from "./universal-access";
-export { default as FaUnlockAlt } from "./unlock-alt";
-export { default as FaUnlock } from "./unlock";
-export { default as FaUpload } from "./upload";
-export { default as FaUsb } from "./usb";
-export { default as FaUserMd } from "./user-md";
-export { default as FaUserPlus } from "./user-plus";
-export { default as FaUserSecret } from "./user-secret";
-export { default as FaUserTimes } from "./user-times";
-export { default as FaUser } from "./user";
-export { default as FaVenusDouble } from "./venus-double";
-export { default as FaVenusMars } from "./venus-mars";
-export { default as FaVenus } from "./venus";
-export { default as FaViacoin } from "./viacoin";
-export { default as FaViadeoSquare } from "./viadeo-square";
-export { default as FaViadeo } from "./viadeo";
-export { default as FaVideoCamera } from "./video-camera";
-export { default as FaVimeoSquare } from "./vimeo-square";
-export { default as FaVimeo } from "./vimeo";
-export { default as FaVine } from "./vine";
-export { default as FaVk } from "./vk";
-export { default as FaVolumeControlPhone } from "./volume-control-phone";
-export { default as FaVolumeDown } from "./volume-down";
-export { default as FaVolumeOff } from "./volume-off";
-export { default as FaVolumeUp } from "./volume-up";
-export { default as FaWechat } from "./wechat";
-export { default as FaWeibo } from "./weibo";
-export { default as FaWhatsapp } from "./whatsapp";
-export { default as FaWheelchairAlt } from "./wheelchair-alt";
-export { default as FaWheelchair } from "./wheelchair";
-export { default as FaWifi } from "./wifi";
-export { default as FaWikipediaW } from "./wikipedia-w";
-export { default as FaWindows } from "./windows";
-export { default as FaWordpress } from "./wordpress";
-export { default as FaWpbeginner } from "./wpbeginner";
-export { default as FaWpforms } from "./wpforms";
-export { default as FaWrench } from "./wrench";
-export { default as FaXingSquare } from "./xing-square";
-export { default as FaXing } from "./xing";
-export { default as FaYCombinator } from "./y-combinator";
-export { default as FaYahoo } from "./yahoo";
-export { default as FaYelp } from "./yelp";
-export { default as FaYoutubePlay } from "./youtube-play";
-export { default as FaYoutubeSquare } from "./youtube-square";
-export { default as FaYoutube } from "./youtube";
+export { default as Fa500px } from "../../fa/500px";
+export { default as FaAdjust } from "../../fa/adjust";
+export { default as FaAdn } from "../../fa/adn";
+export { default as FaAlignCenter } from "../../fa/align-center";
+export { default as FaAlignJustify } from "../../fa/align-justify";
+export { default as FaAlignLeft } from "../../fa/align-left";
+export { default as FaAlignRight } from "../../fa/align-right";
+export { default as FaAmazon } from "../../fa/amazon";
+export { default as FaAmbulance } from "../../fa/ambulance";
+export { default as FaAmericanSignLanguageInterpreting } from "../../fa/american-sign-language-interpreting";
+export { default as FaAnchor } from "../../fa/anchor";
+export { default as FaAndroid } from "../../fa/android";
+export { default as FaAngellist } from "../../fa/angellist";
+export { default as FaAngleDoubleDown } from "../../fa/angle-double-down";
+export { default as FaAngleDoubleLeft } from "../../fa/angle-double-left";
+export { default as FaAngleDoubleRight } from "../../fa/angle-double-right";
+export { default as FaAngleDoubleUp } from "../../fa/angle-double-up";
+export { default as FaAngleDown } from "../../fa/angle-down";
+export { default as FaAngleLeft } from "../../fa/angle-left";
+export { default as FaAngleRight } from "../../fa/angle-right";
+export { default as FaAngleUp } from "../../fa/angle-up";
+export { default as FaApple } from "../../fa/apple";
+export { default as FaArchive } from "../../fa/archive";
+export { default as FaAreaChart } from "../../fa/area-chart";
+export { default as FaArrowCircleDown } from "../../fa/arrow-circle-down";
+export { default as FaArrowCircleLeft } from "../../fa/arrow-circle-left";
+export { default as FaArrowCircleODown } from "../../fa/arrow-circle-o-down";
+export { default as FaArrowCircleOLeft } from "../../fa/arrow-circle-o-left";
+export { default as FaArrowCircleORight } from "../../fa/arrow-circle-o-right";
+export { default as FaArrowCircleOUp } from "../../fa/arrow-circle-o-up";
+export { default as FaArrowCircleRight } from "../../fa/arrow-circle-right";
+export { default as FaArrowCircleUp } from "../../fa/arrow-circle-up";
+export { default as FaArrowDown } from "../../fa/arrow-down";
+export { default as FaArrowLeft } from "../../fa/arrow-left";
+export { default as FaArrowRight } from "../../fa/arrow-right";
+export { default as FaArrowUp } from "../../fa/arrow-up";
+export { default as FaArrowsAlt } from "../../fa/arrows-alt";
+export { default as FaArrowsH } from "../../fa/arrows-h";
+export { default as FaArrowsV } from "../../fa/arrows-v";
+export { default as FaArrows } from "../../fa/arrows";
+export { default as FaAssistiveListeningSystems } from "../../fa/assistive-listening-systems";
+export { default as FaAsterisk } from "../../fa/asterisk";
+export { default as FaAt } from "../../fa/at";
+export { default as FaAudioDescription } from "../../fa/audio-description";
+export { default as FaAutomobile } from "../../fa/automobile";
+export { default as FaBackward } from "../../fa/backward";
+export { default as FaBalanceScale } from "../../fa/balance-scale";
+export { default as FaBan } from "../../fa/ban";
+export { default as FaBank } from "../../fa/bank";
+export { default as FaBarChart } from "../../fa/bar-chart";
+export { default as FaBarcode } from "../../fa/barcode";
+export { default as FaBars } from "../../fa/bars";
+export { default as FaBattery0 } from "../../fa/battery-0";
+export { default as FaBattery1 } from "../../fa/battery-1";
+export { default as FaBattery2 } from "../../fa/battery-2";
+export { default as FaBattery3 } from "../../fa/battery-3";
+export { default as FaBattery4 } from "../../fa/battery-4";
+export { default as FaBed } from "../../fa/bed";
+export { default as FaBeer } from "../../fa/beer";
+export { default as FaBehanceSquare } from "../../fa/behance-square";
+export { default as FaBehance } from "../../fa/behance";
+export { default as FaBellO } from "../../fa/bell-o";
+export { default as FaBellSlashO } from "../../fa/bell-slash-o";
+export { default as FaBellSlash } from "../../fa/bell-slash";
+export { default as FaBell } from "../../fa/bell";
+export { default as FaBicycle } from "../../fa/bicycle";
+export { default as FaBinoculars } from "../../fa/binoculars";
+export { default as FaBirthdayCake } from "../../fa/birthday-cake";
+export { default as FaBitbucketSquare } from "../../fa/bitbucket-square";
+export { default as FaBitbucket } from "../../fa/bitbucket";
+export { default as FaBitcoin } from "../../fa/bitcoin";
+export { default as FaBlackTie } from "../../fa/black-tie";
+export { default as FaBlind } from "../../fa/blind";
+export { default as FaBluetoothB } from "../../fa/bluetooth-b";
+export { default as FaBluetooth } from "../../fa/bluetooth";
+export { default as FaBold } from "../../fa/bold";
+export { default as FaBolt } from "../../fa/bolt";
+export { default as FaBomb } from "../../fa/bomb";
+export { default as FaBook } from "../../fa/book";
+export { default as FaBookmarkO } from "../../fa/bookmark-o";
+export { default as FaBookmark } from "../../fa/bookmark";
+export { default as FaBraille } from "../../fa/braille";
+export { default as FaBriefcase } from "../../fa/briefcase";
+export { default as FaBug } from "../../fa/bug";
+export { default as FaBuildingO } from "../../fa/building-o";
+export { default as FaBuilding } from "../../fa/building";
+export { default as FaBullhorn } from "../../fa/bullhorn";
+export { default as FaBullseye } from "../../fa/bullseye";
+export { default as FaBus } from "../../fa/bus";
+export { default as FaBuysellads } from "../../fa/buysellads";
+export { default as FaCab } from "../../fa/cab";
+export { default as FaCalculator } from "../../fa/calculator";
+export { default as FaCalendarCheckO } from "../../fa/calendar-check-o";
+export { default as FaCalendarMinusO } from "../../fa/calendar-minus-o";
+export { default as FaCalendarO } from "../../fa/calendar-o";
+export { default as FaCalendarPlusO } from "../../fa/calendar-plus-o";
+export { default as FaCalendarTimesO } from "../../fa/calendar-times-o";
+export { default as FaCalendar } from "../../fa/calendar";
+export { default as FaCameraRetro } from "../../fa/camera-retro";
+export { default as FaCamera } from "../../fa/camera";
+export { default as FaCaretDown } from "../../fa/caret-down";
+export { default as FaCaretLeft } from "../../fa/caret-left";
+export { default as FaCaretRight } from "../../fa/caret-right";
+export { default as FaCaretSquareODown } from "../../fa/caret-square-o-down";
+export { default as FaCaretSquareOLeft } from "../../fa/caret-square-o-left";
+export { default as FaCaretSquareORight } from "../../fa/caret-square-o-right";
+export { default as FaCaretSquareOUp } from "../../fa/caret-square-o-up";
+export { default as FaCaretUp } from "../../fa/caret-up";
+export { default as FaCartArrowDown } from "../../fa/cart-arrow-down";
+export { default as FaCartPlus } from "../../fa/cart-plus";
+export { default as FaCcAmex } from "../../fa/cc-amex";
+export { default as FaCcDinersClub } from "../../fa/cc-diners-club";
+export { default as FaCcDiscover } from "../../fa/cc-discover";
+export { default as FaCcJcb } from "../../fa/cc-jcb";
+export { default as FaCcMastercard } from "../../fa/cc-mastercard";
+export { default as FaCcPaypal } from "../../fa/cc-paypal";
+export { default as FaCcStripe } from "../../fa/cc-stripe";
+export { default as FaCcVisa } from "../../fa/cc-visa";
+export { default as FaCc } from "../../fa/cc";
+export { default as FaCertificate } from "../../fa/certificate";
+export { default as FaChainBroken } from "../../fa/chain-broken";
+export { default as FaChain } from "../../fa/chain";
+export { default as FaCheckCircleO } from "../../fa/check-circle-o";
+export { default as FaCheckCircle } from "../../fa/check-circle";
+export { default as FaCheckSquareO } from "../../fa/check-square-o";
+export { default as FaCheckSquare } from "../../fa/check-square";
+export { default as FaCheck } from "../../fa/check";
+export { default as FaChevronCircleDown } from "../../fa/chevron-circle-down";
+export { default as FaChevronCircleLeft } from "../../fa/chevron-circle-left";
+export { default as FaChevronCircleRight } from "../../fa/chevron-circle-right";
+export { default as FaChevronCircleUp } from "../../fa/chevron-circle-up";
+export { default as FaChevronDown } from "../../fa/chevron-down";
+export { default as FaChevronLeft } from "../../fa/chevron-left";
+export { default as FaChevronRight } from "../../fa/chevron-right";
+export { default as FaChevronUp } from "../../fa/chevron-up";
+export { default as FaChild } from "../../fa/child";
+export { default as FaChrome } from "../../fa/chrome";
+export { default as FaCircleONotch } from "../../fa/circle-o-notch";
+export { default as FaCircleO } from "../../fa/circle-o";
+export { default as FaCircleThin } from "../../fa/circle-thin";
+export { default as FaCircle } from "../../fa/circle";
+export { default as FaClipboard } from "../../fa/clipboard";
+export { default as FaClockO } from "../../fa/clock-o";
+export { default as FaClone } from "../../fa/clone";
+export { default as FaClose } from "../../fa/close";
+export { default as FaCloudDownload } from "../../fa/cloud-download";
+export { default as FaCloudUpload } from "../../fa/cloud-upload";
+export { default as FaCloud } from "../../fa/cloud";
+export { default as FaCny } from "../../fa/cny";
+export { default as FaCodeFork } from "../../fa/code-fork";
+export { default as FaCode } from "../../fa/code";
+export { default as FaCodepen } from "../../fa/codepen";
+export { default as FaCodiepie } from "../../fa/codiepie";
+export { default as FaCoffee } from "../../fa/coffee";
+export { default as FaCog } from "../../fa/cog";
+export { default as FaCogs } from "../../fa/cogs";
+export { default as FaColumns } from "../../fa/columns";
+export { default as FaCommentO } from "../../fa/comment-o";
+export { default as FaComment } from "../../fa/comment";
+export { default as FaCommentingO } from "../../fa/commenting-o";
+export { default as FaCommenting } from "../../fa/commenting";
+export { default as FaCommentsO } from "../../fa/comments-o";
+export { default as FaComments } from "../../fa/comments";
+export { default as FaCompass } from "../../fa/compass";
+export { default as FaCompress } from "../../fa/compress";
+export { default as FaConnectdevelop } from "../../fa/connectdevelop";
+export { default as FaContao } from "../../fa/contao";
+export { default as FaCopy } from "../../fa/copy";
+export { default as FaCopyright } from "../../fa/copyright";
+export { default as FaCreativeCommons } from "../../fa/creative-commons";
+export { default as FaCreditCardAlt } from "../../fa/credit-card-alt";
+export { default as FaCreditCard } from "../../fa/credit-card";
+export { default as FaCrop } from "../../fa/crop";
+export { default as FaCrosshairs } from "../../fa/crosshairs";
+export { default as FaCss3 } from "../../fa/css3";
+export { default as FaCube } from "../../fa/cube";
+export { default as FaCubes } from "../../fa/cubes";
+export { default as FaCut } from "../../fa/cut";
+export { default as FaCutlery } from "../../fa/cutlery";
+export { default as FaDashboard } from "../../fa/dashboard";
+export { default as FaDashcube } from "../../fa/dashcube";
+export { default as FaDatabase } from "../../fa/database";
+export { default as FaDeaf } from "../../fa/deaf";
+export { default as FaDedent } from "../../fa/dedent";
+export { default as FaDelicious } from "../../fa/delicious";
+export { default as FaDesktop } from "../../fa/desktop";
+export { default as FaDeviantart } from "../../fa/deviantart";
+export { default as FaDiamond } from "../../fa/diamond";
+export { default as FaDigg } from "../../fa/digg";
+export { default as FaDollar } from "../../fa/dollar";
+export { default as FaDotCircleO } from "../../fa/dot-circle-o";
+export { default as FaDownload } from "../../fa/download";
+export { default as FaDribbble } from "../../fa/dribbble";
+export { default as FaDropbox } from "../../fa/dropbox";
+export { default as FaDrupal } from "../../fa/drupal";
+export { default as FaEdge } from "../../fa/edge";
+export { default as FaEdit } from "../../fa/edit";
+export { default as FaEject } from "../../fa/eject";
+export { default as FaEllipsisH } from "../../fa/ellipsis-h";
+export { default as FaEllipsisV } from "../../fa/ellipsis-v";
+export { default as FaEmpire } from "../../fa/empire";
+export { default as FaEnvelopeO } from "../../fa/envelope-o";
+export { default as FaEnvelopeSquare } from "../../fa/envelope-square";
+export { default as FaEnvelope } from "../../fa/envelope";
+export { default as FaEnvira } from "../../fa/envira";
+export { default as FaEraser } from "../../fa/eraser";
+export { default as FaEur } from "../../fa/eur";
+export { default as FaExchange } from "../../fa/exchange";
+export { default as FaExclamationCircle } from "../../fa/exclamation-circle";
+export { default as FaExclamationTriangle } from "../../fa/exclamation-triangle";
+export { default as FaExclamation } from "../../fa/exclamation";
+export { default as FaExpand } from "../../fa/expand";
+export { default as FaExpeditedssl } from "../../fa/expeditedssl";
+export { default as FaExternalLinkSquare } from "../../fa/external-link-square";
+export { default as FaExternalLink } from "../../fa/external-link";
+export { default as FaEyeSlash } from "../../fa/eye-slash";
+export { default as FaEye } from "../../fa/eye";
+export { default as FaEyedropper } from "../../fa/eyedropper";
+export { default as FaFacebookOfficial } from "../../fa/facebook-official";
+export { default as FaFacebookSquare } from "../../fa/facebook-square";
+export { default as FaFacebook } from "../../fa/facebook";
+export { default as FaFastBackward } from "../../fa/fast-backward";
+export { default as FaFastForward } from "../../fa/fast-forward";
+export { default as FaFax } from "../../fa/fax";
+export { default as FaFeed } from "../../fa/feed";
+export { default as FaFemale } from "../../fa/female";
+export { default as FaFighterJet } from "../../fa/fighter-jet";
+export { default as FaFileArchiveO } from "../../fa/file-archive-o";
+export { default as FaFileAudioO } from "../../fa/file-audio-o";
+export { default as FaFileCodeO } from "../../fa/file-code-o";
+export { default as FaFileExcelO } from "../../fa/file-excel-o";
+export { default as FaFileImageO } from "../../fa/file-image-o";
+export { default as FaFileMovieO } from "../../fa/file-movie-o";
+export { default as FaFileO } from "../../fa/file-o";
+export { default as FaFilePdfO } from "../../fa/file-pdf-o";
+export { default as FaFilePowerpointO } from "../../fa/file-powerpoint-o";
+export { default as FaFileTextO } from "../../fa/file-text-o";
+export { default as FaFileText } from "../../fa/file-text";
+export { default as FaFileWordO } from "../../fa/file-word-o";
+export { default as FaFile } from "../../fa/file";
+export { default as FaFilm } from "../../fa/film";
+export { default as FaFilter } from "../../fa/filter";
+export { default as FaFireExtinguisher } from "../../fa/fire-extinguisher";
+export { default as FaFire } from "../../fa/fire";
+export { default as FaFirefox } from "../../fa/firefox";
+export { default as FaFlagCheckered } from "../../fa/flag-checkered";
+export { default as FaFlagO } from "../../fa/flag-o";
+export { default as FaFlag } from "../../fa/flag";
+export { default as FaFlask } from "../../fa/flask";
+export { default as FaFlickr } from "../../fa/flickr";
+export { default as FaFloppyO } from "../../fa/floppy-o";
+export { default as FaFolderO } from "../../fa/folder-o";
+export { default as FaFolderOpenO } from "../../fa/folder-open-o";
+export { default as FaFolderOpen } from "../../fa/folder-open";
+export { default as FaFolder } from "../../fa/folder";
+export { default as FaFont } from "../../fa/font";
+export { default as FaFonticons } from "../../fa/fonticons";
+export { default as FaFortAwesome } from "../../fa/fort-awesome";
+export { default as FaForumbee } from "../../fa/forumbee";
+export { default as FaForward } from "../../fa/forward";
+export { default as FaFoursquare } from "../../fa/foursquare";
+export { default as FaFrownO } from "../../fa/frown-o";
+export { default as FaFutbolO } from "../../fa/futbol-o";
+export { default as FaGamepad } from "../../fa/gamepad";
+export { default as FaGavel } from "../../fa/gavel";
+export { default as FaGbp } from "../../fa/gbp";
+export { default as FaGenderless } from "../../fa/genderless";
+export { default as FaGetPocket } from "../../fa/get-pocket";
+export { default as FaGgCircle } from "../../fa/gg-circle";
+export { default as FaGg } from "../../fa/gg";
+export { default as FaGift } from "../../fa/gift";
+export { default as FaGitSquare } from "../../fa/git-square";
+export { default as FaGit } from "../../fa/git";
+export { default as FaGithubAlt } from "../../fa/github-alt";
+export { default as FaGithubSquare } from "../../fa/github-square";
+export { default as FaGithub } from "../../fa/github";
+export { default as FaGitlab } from "../../fa/gitlab";
+export { default as FaGittip } from "../../fa/gittip";
+export { default as FaGlass } from "../../fa/glass";
+export { default as FaGlideG } from "../../fa/glide-g";
+export { default as FaGlide } from "../../fa/glide";
+export { default as FaGlobe } from "../../fa/globe";
+export { default as FaGooglePlusSquare } from "../../fa/google-plus-square";
+export { default as FaGooglePlus } from "../../fa/google-plus";
+export { default as FaGoogleWallet } from "../../fa/google-wallet";
+export { default as FaGoogle } from "../../fa/google";
+export { default as FaGraduationCap } from "../../fa/graduation-cap";
+export { default as FaGroup } from "../../fa/group";
+export { default as FaHSquare } from "../../fa/h-square";
+export { default as FaHackerNews } from "../../fa/hacker-news";
+export { default as FaHandGrabO } from "../../fa/hand-grab-o";
+export { default as FaHandLizardO } from "../../fa/hand-lizard-o";
+export { default as FaHandODown } from "../../fa/hand-o-down";
+export { default as FaHandOLeft } from "../../fa/hand-o-left";
+export { default as FaHandORight } from "../../fa/hand-o-right";
+export { default as FaHandOUp } from "../../fa/hand-o-up";
+export { default as FaHandPaperO } from "../../fa/hand-paper-o";
+export { default as FaHandPeaceO } from "../../fa/hand-peace-o";
+export { default as FaHandPointerO } from "../../fa/hand-pointer-o";
+export { default as FaHandScissorsO } from "../../fa/hand-scissors-o";
+export { default as FaHandSpockO } from "../../fa/hand-spock-o";
+export { default as FaHashtag } from "../../fa/hashtag";
+export { default as FaHddO } from "../../fa/hdd-o";
+export { default as FaHeader } from "../../fa/header";
+export { default as FaHeadphones } from "../../fa/headphones";
+export { default as FaHeartO } from "../../fa/heart-o";
+export { default as FaHeart } from "../../fa/heart";
+export { default as FaHeartbeat } from "../../fa/heartbeat";
+export { default as FaHistory } from "../../fa/history";
+export { default as FaHome } from "../../fa/home";
+export { default as FaHospitalO } from "../../fa/hospital-o";
+export { default as FaHourglass1 } from "../../fa/hourglass-1";
+export { default as FaHourglass2 } from "../../fa/hourglass-2";
+export { default as FaHourglass3 } from "../../fa/hourglass-3";
+export { default as FaHourglassO } from "../../fa/hourglass-o";
+export { default as FaHourglass } from "../../fa/hourglass";
+export { default as FaHouzz } from "../../fa/houzz";
+export { default as FaHtml5 } from "../../fa/html5";
+export { default as FaICursor } from "../../fa/i-cursor";
+export { default as FaIls } from "../../fa/ils";
+export { default as FaImage } from "../../fa/image";
+export { default as FaInbox } from "../../fa/inbox";
+export { default as FaIndent } from "../../fa/indent";
+export { default as FaIndustry } from "../../fa/industry";
+export { default as FaInfoCircle } from "../../fa/info-circle";
+export { default as FaInfo } from "../../fa/info";
+export { default as FaInr } from "../../fa/inr";
+export { default as FaInstagram } from "../../fa/instagram";
+export { default as FaInternetExplorer } from "../../fa/internet-explorer";
+export { default as FaIntersex } from "../../fa/intersex";
+export { default as FaIoxhost } from "../../fa/ioxhost";
+export { default as FaItalic } from "../../fa/italic";
+export { default as FaJoomla } from "../../fa/joomla";
+export { default as FaJsfiddle } from "../../fa/jsfiddle";
+export { default as FaKey } from "../../fa/key";
+export { default as FaKeyboardO } from "../../fa/keyboard-o";
+export { default as FaKrw } from "../../fa/krw";
+export { default as FaLanguage } from "../../fa/language";
+export { default as FaLaptop } from "../../fa/laptop";
+export { default as FaLastfmSquare } from "../../fa/lastfm-square";
+export { default as FaLastfm } from "../../fa/lastfm";
+export { default as FaLeaf } from "../../fa/leaf";
+export { default as FaLeanpub } from "../../fa/leanpub";
+export { default as FaLemonO } from "../../fa/lemon-o";
+export { default as FaLevelDown } from "../../fa/level-down";
+export { default as FaLevelUp } from "../../fa/level-up";
+export { default as FaLifeBouy } from "../../fa/life-bouy";
+export { default as FaLightbulbO } from "../../fa/lightbulb-o";
+export { default as FaLineChart } from "../../fa/line-chart";
+export { default as FaLinkedinSquare } from "../../fa/linkedin-square";
+export { default as FaLinkedin } from "../../fa/linkedin";
+export { default as FaLinux } from "../../fa/linux";
+export { default as FaListAlt } from "../../fa/list-alt";
+export { default as FaListOl } from "../../fa/list-ol";
+export { default as FaListUl } from "../../fa/list-ul";
+export { default as FaList } from "../../fa/list";
+export { default as FaLocationArrow } from "../../fa/location-arrow";
+export { default as FaLock } from "../../fa/lock";
+export { default as FaLongArrowDown } from "../../fa/long-arrow-down";
+export { default as FaLongArrowLeft } from "../../fa/long-arrow-left";
+export { default as FaLongArrowRight } from "../../fa/long-arrow-right";
+export { default as FaLongArrowUp } from "../../fa/long-arrow-up";
+export { default as FaLowVision } from "../../fa/low-vision";
+export { default as FaMagic } from "../../fa/magic";
+export { default as FaMagnet } from "../../fa/magnet";
+export { default as FaMailForward } from "../../fa/mail-forward";
+export { default as FaMailReplyAll } from "../../fa/mail-reply-all";
+export { default as FaMailReply } from "../../fa/mail-reply";
+export { default as FaMale } from "../../fa/male";
+export { default as FaMapMarker } from "../../fa/map-marker";
+export { default as FaMapO } from "../../fa/map-o";
+export { default as FaMapPin } from "../../fa/map-pin";
+export { default as FaMapSigns } from "../../fa/map-signs";
+export { default as FaMap } from "../../fa/map";
+export { default as FaMarsDouble } from "../../fa/mars-double";
+export { default as FaMarsStrokeH } from "../../fa/mars-stroke-h";
+export { default as FaMarsStrokeV } from "../../fa/mars-stroke-v";
+export { default as FaMarsStroke } from "../../fa/mars-stroke";
+export { default as FaMars } from "../../fa/mars";
+export { default as FaMaxcdn } from "../../fa/maxcdn";
+export { default as FaMeanpath } from "../../fa/meanpath";
+export { default as FaMedium } from "../../fa/medium";
+export { default as FaMedkit } from "../../fa/medkit";
+export { default as FaMehO } from "../../fa/meh-o";
+export { default as FaMercury } from "../../fa/mercury";
+export { default as FaMicrophoneSlash } from "../../fa/microphone-slash";
+export { default as FaMicrophone } from "../../fa/microphone";
+export { default as FaMinusCircle } from "../../fa/minus-circle";
+export { default as FaMinusSquareO } from "../../fa/minus-square-o";
+export { default as FaMinusSquare } from "../../fa/minus-square";
+export { default as FaMinus } from "../../fa/minus";
+export { default as FaMixcloud } from "../../fa/mixcloud";
+export { default as FaMobile } from "../../fa/mobile";
+export { default as FaModx } from "../../fa/modx";
+export { default as FaMoney } from "../../fa/money";
+export { default as FaMoonO } from "../../fa/moon-o";
+export { default as FaMotorcycle } from "../../fa/motorcycle";
+export { default as FaMousePointer } from "../../fa/mouse-pointer";
+export { default as FaMusic } from "../../fa/music";
+export { default as FaNeuter } from "../../fa/neuter";
+export { default as FaNewspaperO } from "../../fa/newspaper-o";
+export { default as FaObjectGroup } from "../../fa/object-group";
+export { default as FaObjectUngroup } from "../../fa/object-ungroup";
+export { default as FaOdnoklassnikiSquare } from "../../fa/odnoklassniki-square";
+export { default as FaOdnoklassniki } from "../../fa/odnoklassniki";
+export { default as FaOpencart } from "../../fa/opencart";
+export { default as FaOpenid } from "../../fa/openid";
+export { default as FaOpera } from "../../fa/opera";
+export { default as FaOptinMonster } from "../../fa/optin-monster";
+export { default as FaPagelines } from "../../fa/pagelines";
+export { default as FaPaintBrush } from "../../fa/paint-brush";
+export { default as FaPaperPlaneO } from "../../fa/paper-plane-o";
+export { default as FaPaperPlane } from "../../fa/paper-plane";
+export { default as FaPaperclip } from "../../fa/paperclip";
+export { default as FaParagraph } from "../../fa/paragraph";
+export { default as FaPauseCircleO } from "../../fa/pause-circle-o";
+export { default as FaPauseCircle } from "../../fa/pause-circle";
+export { default as FaPause } from "../../fa/pause";
+export { default as FaPaw } from "../../fa/paw";
+export { default as FaPaypal } from "../../fa/paypal";
+export { default as FaPencilSquare } from "../../fa/pencil-square";
+export { default as FaPencil } from "../../fa/pencil";
+export { default as FaPercent } from "../../fa/percent";
+export { default as FaPhoneSquare } from "../../fa/phone-square";
+export { default as FaPhone } from "../../fa/phone";
+export { default as FaPieChart } from "../../fa/pie-chart";
+export { default as FaPiedPiperAlt } from "../../fa/pied-piper-alt";
+export { default as FaPiedPiper } from "../../fa/pied-piper";
+export { default as FaPinterestP } from "../../fa/pinterest-p";
+export { default as FaPinterestSquare } from "../../fa/pinterest-square";
+export { default as FaPinterest } from "../../fa/pinterest";
+export { default as FaPlane } from "../../fa/plane";
+export { default as FaPlayCircleO } from "../../fa/play-circle-o";
+export { default as FaPlayCircle } from "../../fa/play-circle";
+export { default as FaPlay } from "../../fa/play";
+export { default as FaPlug } from "../../fa/plug";
+export { default as FaPlusCircle } from "../../fa/plus-circle";
+export { default as FaPlusSquareO } from "../../fa/plus-square-o";
+export { default as FaPlusSquare } from "../../fa/plus-square";
+export { default as FaPlus } from "../../fa/plus";
+export { default as FaPowerOff } from "../../fa/power-off";
+export { default as FaPrint } from "../../fa/print";
+export { default as FaProductHunt } from "../../fa/product-hunt";
+export { default as FaPuzzlePiece } from "../../fa/puzzle-piece";
+export { default as FaQq } from "../../fa/qq";
+export { default as FaQrcode } from "../../fa/qrcode";
+export { default as FaQuestionCircleO } from "../../fa/question-circle-o";
+export { default as FaQuestionCircle } from "../../fa/question-circle";
+export { default as FaQuestion } from "../../fa/question";
+export { default as FaQuoteLeft } from "../../fa/quote-left";
+export { default as FaQuoteRight } from "../../fa/quote-right";
+export { default as FaRa } from "../../fa/ra";
+export { default as FaRandom } from "../../fa/random";
+export { default as FaRecycle } from "../../fa/recycle";
+export { default as FaRedditAlien } from "../../fa/reddit-alien";
+export { default as FaRedditSquare } from "../../fa/reddit-square";
+export { default as FaReddit } from "../../fa/reddit";
+export { default as FaRefresh } from "../../fa/refresh";
+export { default as FaRegistered } from "../../fa/registered";
+export { default as FaRenren } from "../../fa/renren";
+export { default as FaRepeat } from "../../fa/repeat";
+export { default as FaRetweet } from "../../fa/retweet";
+export { default as FaRoad } from "../../fa/road";
+export { default as FaRocket } from "../../fa/rocket";
+export { default as FaRotateLeft } from "../../fa/rotate-left";
+export { default as FaRouble } from "../../fa/rouble";
+export { default as FaRssSquare } from "../../fa/rss-square";
+export { default as FaSafari } from "../../fa/safari";
+export { default as FaScribd } from "../../fa/scribd";
+export { default as FaSearchMinus } from "../../fa/search-minus";
+export { default as FaSearchPlus } from "../../fa/search-plus";
+export { default as FaSearch } from "../../fa/search";
+export { default as FaSellsy } from "../../fa/sellsy";
+export { default as FaServer } from "../../fa/server";
+export { default as FaShareAltSquare } from "../../fa/share-alt-square";
+export { default as FaShareAlt } from "../../fa/share-alt";
+export { default as FaShareSquareO } from "../../fa/share-square-o";
+export { default as FaShareSquare } from "../../fa/share-square";
+export { default as FaShield } from "../../fa/shield";
+export { default as FaShip } from "../../fa/ship";
+export { default as FaShirtsinbulk } from "../../fa/shirtsinbulk";
+export { default as FaShoppingBag } from "../../fa/shopping-bag";
+export { default as FaShoppingBasket } from "../../fa/shopping-basket";
+export { default as FaShoppingCart } from "../../fa/shopping-cart";
+export { default as FaSignIn } from "../../fa/sign-in";
+export { default as FaSignLanguage } from "../../fa/sign-language";
+export { default as FaSignOut } from "../../fa/sign-out";
+export { default as FaSignal } from "../../fa/signal";
+export { default as FaSimplybuilt } from "../../fa/simplybuilt";
+export { default as FaSitemap } from "../../fa/sitemap";
+export { default as FaSkyatlas } from "../../fa/skyatlas";
+export { default as FaSkype } from "../../fa/skype";
+export { default as FaSlack } from "../../fa/slack";
+export { default as FaSliders } from "../../fa/sliders";
+export { default as FaSlideshare } from "../../fa/slideshare";
+export { default as FaSmileO } from "../../fa/smile-o";
+export { default as FaSnapchatGhost } from "../../fa/snapchat-ghost";
+export { default as FaSnapchatSquare } from "../../fa/snapchat-square";
+export { default as FaSnapchat } from "../../fa/snapchat";
+export { default as FaSortAlphaAsc } from "../../fa/sort-alpha-asc";
+export { default as FaSortAlphaDesc } from "../../fa/sort-alpha-desc";
+export { default as FaSortAmountAsc } from "../../fa/sort-amount-asc";
+export { default as FaSortAmountDesc } from "../../fa/sort-amount-desc";
+export { default as FaSortAsc } from "../../fa/sort-asc";
+export { default as FaSortDesc } from "../../fa/sort-desc";
+export { default as FaSortNumericAsc } from "../../fa/sort-numeric-asc";
+export { default as FaSortNumericDesc } from "../../fa/sort-numeric-desc";
+export { default as FaSort } from "../../fa/sort";
+export { default as FaSoundcloud } from "../../fa/soundcloud";
+export { default as FaSpaceShuttle } from "../../fa/space-shuttle";
+export { default as FaSpinner } from "../../fa/spinner";
+export { default as FaSpoon } from "../../fa/spoon";
+export { default as FaSpotify } from "../../fa/spotify";
+export { default as FaSquareO } from "../../fa/square-o";
+export { default as FaSquare } from "../../fa/square";
+export { default as FaStackExchange } from "../../fa/stack-exchange";
+export { default as FaStackOverflow } from "../../fa/stack-overflow";
+export { default as FaStarHalfEmpty } from "../../fa/star-half-empty";
+export { default as FaStarHalf } from "../../fa/star-half";
+export { default as FaStarO } from "../../fa/star-o";
+export { default as FaStar } from "../../fa/star";
+export { default as FaSteamSquare } from "../../fa/steam-square";
+export { default as FaSteam } from "../../fa/steam";
+export { default as FaStepBackward } from "../../fa/step-backward";
+export { default as FaStepForward } from "../../fa/step-forward";
+export { default as FaStethoscope } from "../../fa/stethoscope";
+export { default as FaStickyNoteO } from "../../fa/sticky-note-o";
+export { default as FaStickyNote } from "../../fa/sticky-note";
+export { default as FaStopCircleO } from "../../fa/stop-circle-o";
+export { default as FaStopCircle } from "../../fa/stop-circle";
+export { default as FaStop } from "../../fa/stop";
+export { default as FaStreetView } from "../../fa/street-view";
+export { default as FaStrikethrough } from "../../fa/strikethrough";
+export { default as FaStumbleuponCircle } from "../../fa/stumbleupon-circle";
+export { default as FaStumbleupon } from "../../fa/stumbleupon";
+export { default as FaSubscript } from "../../fa/subscript";
+export { default as FaSubway } from "../../fa/subway";
+export { default as FaSuitcase } from "../../fa/suitcase";
+export { default as FaSunO } from "../../fa/sun-o";
+export { default as FaSuperscript } from "../../fa/superscript";
+export { default as FaTable } from "../../fa/table";
+export { default as FaTablet } from "../../fa/tablet";
+export { default as FaTag } from "../../fa/tag";
+export { default as FaTags } from "../../fa/tags";
+export { default as FaTasks } from "../../fa/tasks";
+export { default as FaTelevision } from "../../fa/television";
+export { default as FaTencentWeibo } from "../../fa/tencent-weibo";
+export { default as FaTerminal } from "../../fa/terminal";
+export { default as FaTextHeight } from "../../fa/text-height";
+export { default as FaTextWidth } from "../../fa/text-width";
+export { default as FaThLarge } from "../../fa/th-large";
+export { default as FaThList } from "../../fa/th-list";
+export { default as FaTh } from "../../fa/th";
+export { default as FaThumbTack } from "../../fa/thumb-tack";
+export { default as FaThumbsDown } from "../../fa/thumbs-down";
+export { default as FaThumbsODown } from "../../fa/thumbs-o-down";
+export { default as FaThumbsOUp } from "../../fa/thumbs-o-up";
+export { default as FaThumbsUp } from "../../fa/thumbs-up";
+export { default as FaTicket } from "../../fa/ticket";
+export { default as FaTimesCircleO } from "../../fa/times-circle-o";
+export { default as FaTimesCircle } from "../../fa/times-circle";
+export { default as FaTint } from "../../fa/tint";
+export { default as FaToggleOff } from "../../fa/toggle-off";
+export { default as FaToggleOn } from "../../fa/toggle-on";
+export { default as FaTrademark } from "../../fa/trademark";
+export { default as FaTrain } from "../../fa/train";
+export { default as FaTransgenderAlt } from "../../fa/transgender-alt";
+export { default as FaTrashO } from "../../fa/trash-o";
+export { default as FaTrash } from "../../fa/trash";
+export { default as FaTree } from "../../fa/tree";
+export { default as FaTrello } from "../../fa/trello";
+export { default as FaTripadvisor } from "../../fa/tripadvisor";
+export { default as FaTrophy } from "../../fa/trophy";
+export { default as FaTruck } from "../../fa/truck";
+export { default as FaTry } from "../../fa/try";
+export { default as FaTty } from "../../fa/tty";
+export { default as FaTumblrSquare } from "../../fa/tumblr-square";
+export { default as FaTumblr } from "../../fa/tumblr";
+export { default as FaTwitch } from "../../fa/twitch";
+export { default as FaTwitterSquare } from "../../fa/twitter-square";
+export { default as FaTwitter } from "../../fa/twitter";
+export { default as FaUmbrella } from "../../fa/umbrella";
+export { default as FaUnderline } from "../../fa/underline";
+export { default as FaUniversalAccess } from "../../fa/universal-access";
+export { default as FaUnlockAlt } from "../../fa/unlock-alt";
+export { default as FaUnlock } from "../../fa/unlock";
+export { default as FaUpload } from "../../fa/upload";
+export { default as FaUsb } from "../../fa/usb";
+export { default as FaUserMd } from "../../fa/user-md";
+export { default as FaUserPlus } from "../../fa/user-plus";
+export { default as FaUserSecret } from "../../fa/user-secret";
+export { default as FaUserTimes } from "../../fa/user-times";
+export { default as FaUser } from "../../fa/user";
+export { default as FaVenusDouble } from "../../fa/venus-double";
+export { default as FaVenusMars } from "../../fa/venus-mars";
+export { default as FaVenus } from "../../fa/venus";
+export { default as FaViacoin } from "../../fa/viacoin";
+export { default as FaViadeoSquare } from "../../fa/viadeo-square";
+export { default as FaViadeo } from "../../fa/viadeo";
+export { default as FaVideoCamera } from "../../fa/video-camera";
+export { default as FaVimeoSquare } from "../../fa/vimeo-square";
+export { default as FaVimeo } from "../../fa/vimeo";
+export { default as FaVine } from "../../fa/vine";
+export { default as FaVk } from "../../fa/vk";
+export { default as FaVolumeControlPhone } from "../../fa/volume-control-phone";
+export { default as FaVolumeDown } from "../../fa/volume-down";
+export { default as FaVolumeOff } from "../../fa/volume-off";
+export { default as FaVolumeUp } from "../../fa/volume-up";
+export { default as FaWechat } from "../../fa/wechat";
+export { default as FaWeibo } from "../../fa/weibo";
+export { default as FaWhatsapp } from "../../fa/whatsapp";
+export { default as FaWheelchairAlt } from "../../fa/wheelchair-alt";
+export { default as FaWheelchair } from "../../fa/wheelchair";
+export { default as FaWifi } from "../../fa/wifi";
+export { default as FaWikipediaW } from "../../fa/wikipedia-w";
+export { default as FaWindows } from "../../fa/windows";
+export { default as FaWordpress } from "../../fa/wordpress";
+export { default as FaWpbeginner } from "../../fa/wpbeginner";
+export { default as FaWpforms } from "../../fa/wpforms";
+export { default as FaWrench } from "../../fa/wrench";
+export { default as FaXingSquare } from "../../fa/xing-square";
+export { default as FaXing } from "../../fa/xing";
+export { default as FaYCombinator } from "../../fa/y-combinator";
+export { default as FaYahoo } from "../../fa/yahoo";
+export { default as FaYelp } from "../../fa/yelp";
+export { default as FaYoutubePlay } from "../../fa/youtube-play";
+export { default as FaYoutubeSquare } from "../../fa/youtube-square";
+export { default as FaYoutube } from "../../fa/youtube";
diff --git a/types/react-icons/lib/fa/industry.d.ts b/types/react-icons/lib/fa/industry.d.ts
index 70d7057743..be16903151 100644
--- a/types/react-icons/lib/fa/industry.d.ts
+++ b/types/react-icons/lib/fa/industry.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIndustry extends React.Component<IconBaseProps> { }
+declare class FaIndustry extends React.Component<IconBaseProps> { }
+export = FaIndustry;
diff --git a/types/react-icons/lib/fa/info-circle.d.ts b/types/react-icons/lib/fa/info-circle.d.ts
index 7ed29e6eec..dde66daea7 100644
--- a/types/react-icons/lib/fa/info-circle.d.ts
+++ b/types/react-icons/lib/fa/info-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInfoCircle extends React.Component<IconBaseProps> { }
+declare class FaInfoCircle extends React.Component<IconBaseProps> { }
+export = FaInfoCircle;
diff --git a/types/react-icons/lib/fa/info.d.ts b/types/react-icons/lib/fa/info.d.ts
index c67b3190a9..cfab006429 100644
--- a/types/react-icons/lib/fa/info.d.ts
+++ b/types/react-icons/lib/fa/info.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInfo extends React.Component<IconBaseProps> { }
+declare class FaInfo extends React.Component<IconBaseProps> { }
+export = FaInfo;
diff --git a/types/react-icons/lib/fa/inr.d.ts b/types/react-icons/lib/fa/inr.d.ts
index b47cb31531..bcbf062b74 100644
--- a/types/react-icons/lib/fa/inr.d.ts
+++ b/types/react-icons/lib/fa/inr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInr extends React.Component<IconBaseProps> { }
+declare class FaInr extends React.Component<IconBaseProps> { }
+export = FaInr;
diff --git a/types/react-icons/lib/fa/instagram.d.ts b/types/react-icons/lib/fa/instagram.d.ts
index 7770e19043..835238de67 100644
--- a/types/react-icons/lib/fa/instagram.d.ts
+++ b/types/react-icons/lib/fa/instagram.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInstagram extends React.Component<IconBaseProps> { }
+declare class FaInstagram extends React.Component<IconBaseProps> { }
+export = FaInstagram;
diff --git a/types/react-icons/lib/fa/internet-explorer.d.ts b/types/react-icons/lib/fa/internet-explorer.d.ts
index 924654fee2..055c5df0a4 100644
--- a/types/react-icons/lib/fa/internet-explorer.d.ts
+++ b/types/react-icons/lib/fa/internet-explorer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInternetExplorer extends React.Component<IconBaseProps> { }
+declare class FaInternetExplorer extends React.Component<IconBaseProps> { }
+export = FaInternetExplorer;
diff --git a/types/react-icons/lib/fa/intersex.d.ts b/types/react-icons/lib/fa/intersex.d.ts
index 77580bbb2d..f8948a1934 100644
--- a/types/react-icons/lib/fa/intersex.d.ts
+++ b/types/react-icons/lib/fa/intersex.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIntersex extends React.Component<IconBaseProps> { }
+declare class FaIntersex extends React.Component<IconBaseProps> { }
+export = FaIntersex;
diff --git a/types/react-icons/lib/fa/ioxhost.d.ts b/types/react-icons/lib/fa/ioxhost.d.ts
index b713d2c54a..9d2e89cf0f 100644
--- a/types/react-icons/lib/fa/ioxhost.d.ts
+++ b/types/react-icons/lib/fa/ioxhost.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIoxhost extends React.Component<IconBaseProps> { }
+declare class FaIoxhost extends React.Component<IconBaseProps> { }
+export = FaIoxhost;
diff --git a/types/react-icons/lib/fa/italic.d.ts b/types/react-icons/lib/fa/italic.d.ts
index 57572f5dbc..a33d3414d4 100644
--- a/types/react-icons/lib/fa/italic.d.ts
+++ b/types/react-icons/lib/fa/italic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaItalic extends React.Component<IconBaseProps> { }
+declare class FaItalic extends React.Component<IconBaseProps> { }
+export = FaItalic;
diff --git a/types/react-icons/lib/fa/joomla.d.ts b/types/react-icons/lib/fa/joomla.d.ts
index cdf3539275..39c73065c5 100644
--- a/types/react-icons/lib/fa/joomla.d.ts
+++ b/types/react-icons/lib/fa/joomla.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaJoomla extends React.Component<IconBaseProps> { }
+declare class FaJoomla extends React.Component<IconBaseProps> { }
+export = FaJoomla;
diff --git a/types/react-icons/lib/fa/jsfiddle.d.ts b/types/react-icons/lib/fa/jsfiddle.d.ts
index e17414bd20..8ff305e6b0 100644
--- a/types/react-icons/lib/fa/jsfiddle.d.ts
+++ b/types/react-icons/lib/fa/jsfiddle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaJsfiddle extends React.Component<IconBaseProps> { }
+declare class FaJsfiddle extends React.Component<IconBaseProps> { }
+export = FaJsfiddle;
diff --git a/types/react-icons/lib/fa/key.d.ts b/types/react-icons/lib/fa/key.d.ts
index b1fc11d702..cf50ee7c88 100644
--- a/types/react-icons/lib/fa/key.d.ts
+++ b/types/react-icons/lib/fa/key.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaKey extends React.Component<IconBaseProps> { }
+declare class FaKey extends React.Component<IconBaseProps> { }
+export = FaKey;
diff --git a/types/react-icons/lib/fa/keyboard-o.d.ts b/types/react-icons/lib/fa/keyboard-o.d.ts
index d8676809fd..1c63b5099a 100644
--- a/types/react-icons/lib/fa/keyboard-o.d.ts
+++ b/types/react-icons/lib/fa/keyboard-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaKeyboardO extends React.Component<IconBaseProps> { }
+declare class FaKeyboardO extends React.Component<IconBaseProps> { }
+export = FaKeyboardO;
diff --git a/types/react-icons/lib/fa/krw.d.ts b/types/react-icons/lib/fa/krw.d.ts
index a23710bcfd..79de06001e 100644
--- a/types/react-icons/lib/fa/krw.d.ts
+++ b/types/react-icons/lib/fa/krw.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaKrw extends React.Component<IconBaseProps> { }
+declare class FaKrw extends React.Component<IconBaseProps> { }
+export = FaKrw;
diff --git a/types/react-icons/lib/fa/language.d.ts b/types/react-icons/lib/fa/language.d.ts
index a04950506c..25b2433653 100644
--- a/types/react-icons/lib/fa/language.d.ts
+++ b/types/react-icons/lib/fa/language.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLanguage extends React.Component<IconBaseProps> { }
+declare class FaLanguage extends React.Component<IconBaseProps> { }
+export = FaLanguage;
diff --git a/types/react-icons/lib/fa/laptop.d.ts b/types/react-icons/lib/fa/laptop.d.ts
index d13d583fb7..eec3856a86 100644
--- a/types/react-icons/lib/fa/laptop.d.ts
+++ b/types/react-icons/lib/fa/laptop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLaptop extends React.Component<IconBaseProps> { }
+declare class FaLaptop extends React.Component<IconBaseProps> { }
+export = FaLaptop;
diff --git a/types/react-icons/lib/fa/lastfm-square.d.ts b/types/react-icons/lib/fa/lastfm-square.d.ts
index 057f801895..22115486cd 100644
--- a/types/react-icons/lib/fa/lastfm-square.d.ts
+++ b/types/react-icons/lib/fa/lastfm-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLastfmSquare extends React.Component<IconBaseProps> { }
+declare class FaLastfmSquare extends React.Component<IconBaseProps> { }
+export = FaLastfmSquare;
diff --git a/types/react-icons/lib/fa/lastfm.d.ts b/types/react-icons/lib/fa/lastfm.d.ts
index c8124c95ce..d155de9853 100644
--- a/types/react-icons/lib/fa/lastfm.d.ts
+++ b/types/react-icons/lib/fa/lastfm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLastfm extends React.Component<IconBaseProps> { }
+declare class FaLastfm extends React.Component<IconBaseProps> { }
+export = FaLastfm;
diff --git a/types/react-icons/lib/fa/leaf.d.ts b/types/react-icons/lib/fa/leaf.d.ts
index 9c4514a54f..330210dddf 100644
--- a/types/react-icons/lib/fa/leaf.d.ts
+++ b/types/react-icons/lib/fa/leaf.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLeaf extends React.Component<IconBaseProps> { }
+declare class FaLeaf extends React.Component<IconBaseProps> { }
+export = FaLeaf;
diff --git a/types/react-icons/lib/fa/leanpub.d.ts b/types/react-icons/lib/fa/leanpub.d.ts
index de2024c7a8..bbae6093d9 100644
--- a/types/react-icons/lib/fa/leanpub.d.ts
+++ b/types/react-icons/lib/fa/leanpub.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLeanpub extends React.Component<IconBaseProps> { }
+declare class FaLeanpub extends React.Component<IconBaseProps> { }
+export = FaLeanpub;
diff --git a/types/react-icons/lib/fa/lemon-o.d.ts b/types/react-icons/lib/fa/lemon-o.d.ts
index 74886cb79c..dc2e3f8f72 100644
--- a/types/react-icons/lib/fa/lemon-o.d.ts
+++ b/types/react-icons/lib/fa/lemon-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLemonO extends React.Component<IconBaseProps> { }
+declare class FaLemonO extends React.Component<IconBaseProps> { }
+export = FaLemonO;
diff --git a/types/react-icons/lib/fa/level-down.d.ts b/types/react-icons/lib/fa/level-down.d.ts
index caba9cef44..b906bf1a0e 100644
--- a/types/react-icons/lib/fa/level-down.d.ts
+++ b/types/react-icons/lib/fa/level-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLevelDown extends React.Component<IconBaseProps> { }
+declare class FaLevelDown extends React.Component<IconBaseProps> { }
+export = FaLevelDown;
diff --git a/types/react-icons/lib/fa/level-up.d.ts b/types/react-icons/lib/fa/level-up.d.ts
index 977a2d2c97..aaa9f46a90 100644
--- a/types/react-icons/lib/fa/level-up.d.ts
+++ b/types/react-icons/lib/fa/level-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLevelUp extends React.Component<IconBaseProps> { }
+declare class FaLevelUp extends React.Component<IconBaseProps> { }
+export = FaLevelUp;
diff --git a/types/react-icons/lib/fa/life-bouy.d.ts b/types/react-icons/lib/fa/life-bouy.d.ts
index 85205b3e62..d6a5ab382b 100644
--- a/types/react-icons/lib/fa/life-bouy.d.ts
+++ b/types/react-icons/lib/fa/life-bouy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLifeBouy extends React.Component<IconBaseProps> { }
+declare class FaLifeBouy extends React.Component<IconBaseProps> { }
+export = FaLifeBouy;
diff --git a/types/react-icons/lib/fa/lightbulb-o.d.ts b/types/react-icons/lib/fa/lightbulb-o.d.ts
index 48646e6261..3dfc3d7e82 100644
--- a/types/react-icons/lib/fa/lightbulb-o.d.ts
+++ b/types/react-icons/lib/fa/lightbulb-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLightbulbO extends React.Component<IconBaseProps> { }
+declare class FaLightbulbO extends React.Component<IconBaseProps> { }
+export = FaLightbulbO;
diff --git a/types/react-icons/lib/fa/line-chart.d.ts b/types/react-icons/lib/fa/line-chart.d.ts
index f0109467e2..0a08799a31 100644
--- a/types/react-icons/lib/fa/line-chart.d.ts
+++ b/types/react-icons/lib/fa/line-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLineChart extends React.Component<IconBaseProps> { }
+declare class FaLineChart extends React.Component<IconBaseProps> { }
+export = FaLineChart;
diff --git a/types/react-icons/lib/fa/linkedin-square.d.ts b/types/react-icons/lib/fa/linkedin-square.d.ts
index 2c538f5349..be3ee736d6 100644
--- a/types/react-icons/lib/fa/linkedin-square.d.ts
+++ b/types/react-icons/lib/fa/linkedin-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLinkedinSquare extends React.Component<IconBaseProps> { }
+declare class FaLinkedinSquare extends React.Component<IconBaseProps> { }
+export = FaLinkedinSquare;
diff --git a/types/react-icons/lib/fa/linkedin.d.ts b/types/react-icons/lib/fa/linkedin.d.ts
index 7e011b8f8f..2f6d18f996 100644
--- a/types/react-icons/lib/fa/linkedin.d.ts
+++ b/types/react-icons/lib/fa/linkedin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLinkedin extends React.Component<IconBaseProps> { }
+declare class FaLinkedin extends React.Component<IconBaseProps> { }
+export = FaLinkedin;
diff --git a/types/react-icons/lib/fa/linux.d.ts b/types/react-icons/lib/fa/linux.d.ts
index 55eb44cddb..1e2f751318 100644
--- a/types/react-icons/lib/fa/linux.d.ts
+++ b/types/react-icons/lib/fa/linux.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLinux extends React.Component<IconBaseProps> { }
+declare class FaLinux extends React.Component<IconBaseProps> { }
+export = FaLinux;
diff --git a/types/react-icons/lib/fa/list-alt.d.ts b/types/react-icons/lib/fa/list-alt.d.ts
index 4987907f75..168926a8e8 100644
--- a/types/react-icons/lib/fa/list-alt.d.ts
+++ b/types/react-icons/lib/fa/list-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaListAlt extends React.Component<IconBaseProps> { }
+declare class FaListAlt extends React.Component<IconBaseProps> { }
+export = FaListAlt;
diff --git a/types/react-icons/lib/fa/list-ol.d.ts b/types/react-icons/lib/fa/list-ol.d.ts
index 25c4509dd8..a741c78a9d 100644
--- a/types/react-icons/lib/fa/list-ol.d.ts
+++ b/types/react-icons/lib/fa/list-ol.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaListOl extends React.Component<IconBaseProps> { }
+declare class FaListOl extends React.Component<IconBaseProps> { }
+export = FaListOl;
diff --git a/types/react-icons/lib/fa/list-ul.d.ts b/types/react-icons/lib/fa/list-ul.d.ts
index be0d49470c..38d0b3db98 100644
--- a/types/react-icons/lib/fa/list-ul.d.ts
+++ b/types/react-icons/lib/fa/list-ul.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaListUl extends React.Component<IconBaseProps> { }
+declare class FaListUl extends React.Component<IconBaseProps> { }
+export = FaListUl;
diff --git a/types/react-icons/lib/fa/list.d.ts b/types/react-icons/lib/fa/list.d.ts
index 9b98e5d332..f17ee7343f 100644
--- a/types/react-icons/lib/fa/list.d.ts
+++ b/types/react-icons/lib/fa/list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaList extends React.Component<IconBaseProps> { }
+declare class FaList extends React.Component<IconBaseProps> { }
+export = FaList;
diff --git a/types/react-icons/lib/fa/location-arrow.d.ts b/types/react-icons/lib/fa/location-arrow.d.ts
index 67e69c5917..91d33d7ff4 100644
--- a/types/react-icons/lib/fa/location-arrow.d.ts
+++ b/types/react-icons/lib/fa/location-arrow.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLocationArrow extends React.Component<IconBaseProps> { }
+declare class FaLocationArrow extends React.Component<IconBaseProps> { }
+export = FaLocationArrow;
diff --git a/types/react-icons/lib/fa/lock.d.ts b/types/react-icons/lib/fa/lock.d.ts
index 751ba49fd6..3a200b8bfc 100644
--- a/types/react-icons/lib/fa/lock.d.ts
+++ b/types/react-icons/lib/fa/lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLock extends React.Component<IconBaseProps> { }
+declare class FaLock extends React.Component<IconBaseProps> { }
+export = FaLock;
diff --git a/types/react-icons/lib/fa/long-arrow-down.d.ts b/types/react-icons/lib/fa/long-arrow-down.d.ts
index 81282ef698..85adda07a2 100644
--- a/types/react-icons/lib/fa/long-arrow-down.d.ts
+++ b/types/react-icons/lib/fa/long-arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowDown extends React.Component<IconBaseProps> { }
+declare class FaLongArrowDown extends React.Component<IconBaseProps> { }
+export = FaLongArrowDown;
diff --git a/types/react-icons/lib/fa/long-arrow-left.d.ts b/types/react-icons/lib/fa/long-arrow-left.d.ts
index 673d2e6a36..3d6ad0f59a 100644
--- a/types/react-icons/lib/fa/long-arrow-left.d.ts
+++ b/types/react-icons/lib/fa/long-arrow-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowLeft extends React.Component<IconBaseProps> { }
+declare class FaLongArrowLeft extends React.Component<IconBaseProps> { }
+export = FaLongArrowLeft;
diff --git a/types/react-icons/lib/fa/long-arrow-right.d.ts b/types/react-icons/lib/fa/long-arrow-right.d.ts
index 1fafea7de3..b67d25b068 100644
--- a/types/react-icons/lib/fa/long-arrow-right.d.ts
+++ b/types/react-icons/lib/fa/long-arrow-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowRight extends React.Component<IconBaseProps> { }
+declare class FaLongArrowRight extends React.Component<IconBaseProps> { }
+export = FaLongArrowRight;
diff --git a/types/react-icons/lib/fa/long-arrow-up.d.ts b/types/react-icons/lib/fa/long-arrow-up.d.ts
index 6982118eef..844ceabee7 100644
--- a/types/react-icons/lib/fa/long-arrow-up.d.ts
+++ b/types/react-icons/lib/fa/long-arrow-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowUp extends React.Component<IconBaseProps> { }
+declare class FaLongArrowUp extends React.Component<IconBaseProps> { }
+export = FaLongArrowUp;
diff --git a/types/react-icons/lib/fa/low-vision.d.ts b/types/react-icons/lib/fa/low-vision.d.ts
index 60f19827fa..2e86c1f55b 100644
--- a/types/react-icons/lib/fa/low-vision.d.ts
+++ b/types/react-icons/lib/fa/low-vision.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLowVision extends React.Component<IconBaseProps> { }
+declare class FaLowVision extends React.Component<IconBaseProps> { }
+export = FaLowVision;
diff --git a/types/react-icons/lib/fa/magic.d.ts b/types/react-icons/lib/fa/magic.d.ts
index 7dca91beb2..adbed81f80 100644
--- a/types/react-icons/lib/fa/magic.d.ts
+++ b/types/react-icons/lib/fa/magic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMagic extends React.Component<IconBaseProps> { }
+declare class FaMagic extends React.Component<IconBaseProps> { }
+export = FaMagic;
diff --git a/types/react-icons/lib/fa/magnet.d.ts b/types/react-icons/lib/fa/magnet.d.ts
index 11cc56ef42..b6933258f5 100644
--- a/types/react-icons/lib/fa/magnet.d.ts
+++ b/types/react-icons/lib/fa/magnet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMagnet extends React.Component<IconBaseProps> { }
+declare class FaMagnet extends React.Component<IconBaseProps> { }
+export = FaMagnet;
diff --git a/types/react-icons/lib/fa/mail-forward.d.ts b/types/react-icons/lib/fa/mail-forward.d.ts
index 84585713b8..61680d6ff7 100644
--- a/types/react-icons/lib/fa/mail-forward.d.ts
+++ b/types/react-icons/lib/fa/mail-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMailForward extends React.Component<IconBaseProps> { }
+declare class FaMailForward extends React.Component<IconBaseProps> { }
+export = FaMailForward;
diff --git a/types/react-icons/lib/fa/mail-reply-all.d.ts b/types/react-icons/lib/fa/mail-reply-all.d.ts
index 7c8c4ed7eb..edad2bb045 100644
--- a/types/react-icons/lib/fa/mail-reply-all.d.ts
+++ b/types/react-icons/lib/fa/mail-reply-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMailReplyAll extends React.Component<IconBaseProps> { }
+declare class FaMailReplyAll extends React.Component<IconBaseProps> { }
+export = FaMailReplyAll;
diff --git a/types/react-icons/lib/fa/mail-reply.d.ts b/types/react-icons/lib/fa/mail-reply.d.ts
index 571aa76b4f..d179e93960 100644
--- a/types/react-icons/lib/fa/mail-reply.d.ts
+++ b/types/react-icons/lib/fa/mail-reply.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMailReply extends React.Component<IconBaseProps> { }
+declare class FaMailReply extends React.Component<IconBaseProps> { }
+export = FaMailReply;
diff --git a/types/react-icons/lib/fa/male.d.ts b/types/react-icons/lib/fa/male.d.ts
index 9bb9f216af..09dabdb0e6 100644
--- a/types/react-icons/lib/fa/male.d.ts
+++ b/types/react-icons/lib/fa/male.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMale extends React.Component<IconBaseProps> { }
+declare class FaMale extends React.Component<IconBaseProps> { }
+export = FaMale;
diff --git a/types/react-icons/lib/fa/map-marker.d.ts b/types/react-icons/lib/fa/map-marker.d.ts
index 116680b4b7..abd5361f41 100644
--- a/types/react-icons/lib/fa/map-marker.d.ts
+++ b/types/react-icons/lib/fa/map-marker.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapMarker extends React.Component<IconBaseProps> { }
+declare class FaMapMarker extends React.Component<IconBaseProps> { }
+export = FaMapMarker;
diff --git a/types/react-icons/lib/fa/map-o.d.ts b/types/react-icons/lib/fa/map-o.d.ts
index 366c05d45b..587fc2d689 100644
--- a/types/react-icons/lib/fa/map-o.d.ts
+++ b/types/react-icons/lib/fa/map-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapO extends React.Component<IconBaseProps> { }
+declare class FaMapO extends React.Component<IconBaseProps> { }
+export = FaMapO;
diff --git a/types/react-icons/lib/fa/map-pin.d.ts b/types/react-icons/lib/fa/map-pin.d.ts
index e46a8ca0e3..9ed4ed4c3a 100644
--- a/types/react-icons/lib/fa/map-pin.d.ts
+++ b/types/react-icons/lib/fa/map-pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapPin extends React.Component<IconBaseProps> { }
+declare class FaMapPin extends React.Component<IconBaseProps> { }
+export = FaMapPin;
diff --git a/types/react-icons/lib/fa/map-signs.d.ts b/types/react-icons/lib/fa/map-signs.d.ts
index 4c4a9c2f69..fab1cfec7a 100644
--- a/types/react-icons/lib/fa/map-signs.d.ts
+++ b/types/react-icons/lib/fa/map-signs.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapSigns extends React.Component<IconBaseProps> { }
+declare class FaMapSigns extends React.Component<IconBaseProps> { }
+export = FaMapSigns;
diff --git a/types/react-icons/lib/fa/map.d.ts b/types/react-icons/lib/fa/map.d.ts
index 52c55baf7f..e7fcc24810 100644
--- a/types/react-icons/lib/fa/map.d.ts
+++ b/types/react-icons/lib/fa/map.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMap extends React.Component<IconBaseProps> { }
+declare class FaMap extends React.Component<IconBaseProps> { }
+export = FaMap;
diff --git a/types/react-icons/lib/fa/mars-double.d.ts b/types/react-icons/lib/fa/mars-double.d.ts
index c6f7f4aa5d..23ae057446 100644
--- a/types/react-icons/lib/fa/mars-double.d.ts
+++ b/types/react-icons/lib/fa/mars-double.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsDouble extends React.Component<IconBaseProps> { }
+declare class FaMarsDouble extends React.Component<IconBaseProps> { }
+export = FaMarsDouble;
diff --git a/types/react-icons/lib/fa/mars-stroke-h.d.ts b/types/react-icons/lib/fa/mars-stroke-h.d.ts
index e6d9f035d0..8c413b89a1 100644
--- a/types/react-icons/lib/fa/mars-stroke-h.d.ts
+++ b/types/react-icons/lib/fa/mars-stroke-h.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStrokeH extends React.Component<IconBaseProps> { }
+declare class FaMarsStrokeH extends React.Component<IconBaseProps> { }
+export = FaMarsStrokeH;
diff --git a/types/react-icons/lib/fa/mars-stroke-v.d.ts b/types/react-icons/lib/fa/mars-stroke-v.d.ts
index cc1a01a592..7662429ca8 100644
--- a/types/react-icons/lib/fa/mars-stroke-v.d.ts
+++ b/types/react-icons/lib/fa/mars-stroke-v.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStrokeV extends React.Component<IconBaseProps> { }
+declare class FaMarsStrokeV extends React.Component<IconBaseProps> { }
+export = FaMarsStrokeV;
diff --git a/types/react-icons/lib/fa/mars-stroke.d.ts b/types/react-icons/lib/fa/mars-stroke.d.ts
index 69e9aec8b5..29c906f503 100644
--- a/types/react-icons/lib/fa/mars-stroke.d.ts
+++ b/types/react-icons/lib/fa/mars-stroke.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStroke extends React.Component<IconBaseProps> { }
+declare class FaMarsStroke extends React.Component<IconBaseProps> { }
+export = FaMarsStroke;
diff --git a/types/react-icons/lib/fa/mars.d.ts b/types/react-icons/lib/fa/mars.d.ts
index 7e21f481b4..c98f0b0963 100644
--- a/types/react-icons/lib/fa/mars.d.ts
+++ b/types/react-icons/lib/fa/mars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMars extends React.Component<IconBaseProps> { }
+declare class FaMars extends React.Component<IconBaseProps> { }
+export = FaMars;
diff --git a/types/react-icons/lib/fa/maxcdn.d.ts b/types/react-icons/lib/fa/maxcdn.d.ts
index ee9c0b0546..764a8a7cc9 100644
--- a/types/react-icons/lib/fa/maxcdn.d.ts
+++ b/types/react-icons/lib/fa/maxcdn.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMaxcdn extends React.Component<IconBaseProps> { }
+declare class FaMaxcdn extends React.Component<IconBaseProps> { }
+export = FaMaxcdn;
diff --git a/types/react-icons/lib/fa/meanpath.d.ts b/types/react-icons/lib/fa/meanpath.d.ts
index f479c77a85..70aeb9617a 100644
--- a/types/react-icons/lib/fa/meanpath.d.ts
+++ b/types/react-icons/lib/fa/meanpath.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMeanpath extends React.Component<IconBaseProps> { }
+declare class FaMeanpath extends React.Component<IconBaseProps> { }
+export = FaMeanpath;
diff --git a/types/react-icons/lib/fa/medium.d.ts b/types/react-icons/lib/fa/medium.d.ts
index a272177d20..178c3fb116 100644
--- a/types/react-icons/lib/fa/medium.d.ts
+++ b/types/react-icons/lib/fa/medium.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMedium extends React.Component<IconBaseProps> { }
+declare class FaMedium extends React.Component<IconBaseProps> { }
+export = FaMedium;
diff --git a/types/react-icons/lib/fa/medkit.d.ts b/types/react-icons/lib/fa/medkit.d.ts
index 4de9fc61f9..3b119f1fcb 100644
--- a/types/react-icons/lib/fa/medkit.d.ts
+++ b/types/react-icons/lib/fa/medkit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMedkit extends React.Component<IconBaseProps> { }
+declare class FaMedkit extends React.Component<IconBaseProps> { }
+export = FaMedkit;
diff --git a/types/react-icons/lib/fa/meh-o.d.ts b/types/react-icons/lib/fa/meh-o.d.ts
index 2a07cde429..07f39b354d 100644
--- a/types/react-icons/lib/fa/meh-o.d.ts
+++ b/types/react-icons/lib/fa/meh-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMehO extends React.Component<IconBaseProps> { }
+declare class FaMehO extends React.Component<IconBaseProps> { }
+export = FaMehO;
diff --git a/types/react-icons/lib/fa/mercury.d.ts b/types/react-icons/lib/fa/mercury.d.ts
index 616714b2fb..1ec67322b1 100644
--- a/types/react-icons/lib/fa/mercury.d.ts
+++ b/types/react-icons/lib/fa/mercury.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMercury extends React.Component<IconBaseProps> { }
+declare class FaMercury extends React.Component<IconBaseProps> { }
+export = FaMercury;
diff --git a/types/react-icons/lib/fa/microphone-slash.d.ts b/types/react-icons/lib/fa/microphone-slash.d.ts
index 39ddcefe4b..e57c4c0040 100644
--- a/types/react-icons/lib/fa/microphone-slash.d.ts
+++ b/types/react-icons/lib/fa/microphone-slash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMicrophoneSlash extends React.Component<IconBaseProps> { }
+declare class FaMicrophoneSlash extends React.Component<IconBaseProps> { }
+export = FaMicrophoneSlash;
diff --git a/types/react-icons/lib/fa/microphone.d.ts b/types/react-icons/lib/fa/microphone.d.ts
index b12fcd389c..30306ea4f7 100644
--- a/types/react-icons/lib/fa/microphone.d.ts
+++ b/types/react-icons/lib/fa/microphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMicrophone extends React.Component<IconBaseProps> { }
+declare class FaMicrophone extends React.Component<IconBaseProps> { }
+export = FaMicrophone;
diff --git a/types/react-icons/lib/fa/minus-circle.d.ts b/types/react-icons/lib/fa/minus-circle.d.ts
index 839cee0dbe..274e152b11 100644
--- a/types/react-icons/lib/fa/minus-circle.d.ts
+++ b/types/react-icons/lib/fa/minus-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusCircle extends React.Component<IconBaseProps> { }
+declare class FaMinusCircle extends React.Component<IconBaseProps> { }
+export = FaMinusCircle;
diff --git a/types/react-icons/lib/fa/minus-square-o.d.ts b/types/react-icons/lib/fa/minus-square-o.d.ts
index d2bfd3dbba..413f6b5da1 100644
--- a/types/react-icons/lib/fa/minus-square-o.d.ts
+++ b/types/react-icons/lib/fa/minus-square-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusSquareO extends React.Component<IconBaseProps> { }
+declare class FaMinusSquareO extends React.Component<IconBaseProps> { }
+export = FaMinusSquareO;
diff --git a/types/react-icons/lib/fa/minus-square.d.ts b/types/react-icons/lib/fa/minus-square.d.ts
index 8946d33f30..a4e9551139 100644
--- a/types/react-icons/lib/fa/minus-square.d.ts
+++ b/types/react-icons/lib/fa/minus-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusSquare extends React.Component<IconBaseProps> { }
+declare class FaMinusSquare extends React.Component<IconBaseProps> { }
+export = FaMinusSquare;
diff --git a/types/react-icons/lib/fa/minus.d.ts b/types/react-icons/lib/fa/minus.d.ts
index e7ae38ca8e..6d534eef94 100644
--- a/types/react-icons/lib/fa/minus.d.ts
+++ b/types/react-icons/lib/fa/minus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinus extends React.Component<IconBaseProps> { }
+declare class FaMinus extends React.Component<IconBaseProps> { }
+export = FaMinus;
diff --git a/types/react-icons/lib/fa/mixcloud.d.ts b/types/react-icons/lib/fa/mixcloud.d.ts
index 51b4f23bf2..5a7c07d730 100644
--- a/types/react-icons/lib/fa/mixcloud.d.ts
+++ b/types/react-icons/lib/fa/mixcloud.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMixcloud extends React.Component<IconBaseProps> { }
+declare class FaMixcloud extends React.Component<IconBaseProps> { }
+export = FaMixcloud;
diff --git a/types/react-icons/lib/fa/mobile.d.ts b/types/react-icons/lib/fa/mobile.d.ts
index e15d976418..b05eb0cd2f 100644
--- a/types/react-icons/lib/fa/mobile.d.ts
+++ b/types/react-icons/lib/fa/mobile.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMobile extends React.Component<IconBaseProps> { }
+declare class FaMobile extends React.Component<IconBaseProps> { }
+export = FaMobile;
diff --git a/types/react-icons/lib/fa/modx.d.ts b/types/react-icons/lib/fa/modx.d.ts
index c08b2d39fa..e54efad1ce 100644
--- a/types/react-icons/lib/fa/modx.d.ts
+++ b/types/react-icons/lib/fa/modx.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaModx extends React.Component<IconBaseProps> { }
+declare class FaModx extends React.Component<IconBaseProps> { }
+export = FaModx;
diff --git a/types/react-icons/lib/fa/money.d.ts b/types/react-icons/lib/fa/money.d.ts
index 4e14ce5956..0aa8c505ae 100644
--- a/types/react-icons/lib/fa/money.d.ts
+++ b/types/react-icons/lib/fa/money.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMoney extends React.Component<IconBaseProps> { }
+declare class FaMoney extends React.Component<IconBaseProps> { }
+export = FaMoney;
diff --git a/types/react-icons/lib/fa/moon-o.d.ts b/types/react-icons/lib/fa/moon-o.d.ts
index c1c2371ed0..bbcf6097ac 100644
--- a/types/react-icons/lib/fa/moon-o.d.ts
+++ b/types/react-icons/lib/fa/moon-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMoonO extends React.Component<IconBaseProps> { }
+declare class FaMoonO extends React.Component<IconBaseProps> { }
+export = FaMoonO;
diff --git a/types/react-icons/lib/fa/motorcycle.d.ts b/types/react-icons/lib/fa/motorcycle.d.ts
index 2fd0d87361..428b96d4be 100644
--- a/types/react-icons/lib/fa/motorcycle.d.ts
+++ b/types/react-icons/lib/fa/motorcycle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMotorcycle extends React.Component<IconBaseProps> { }
+declare class FaMotorcycle extends React.Component<IconBaseProps> { }
+export = FaMotorcycle;
diff --git a/types/react-icons/lib/fa/mouse-pointer.d.ts b/types/react-icons/lib/fa/mouse-pointer.d.ts
index 8c220aa32b..cd05b52643 100644
--- a/types/react-icons/lib/fa/mouse-pointer.d.ts
+++ b/types/react-icons/lib/fa/mouse-pointer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMousePointer extends React.Component<IconBaseProps> { }
+declare class FaMousePointer extends React.Component<IconBaseProps> { }
+export = FaMousePointer;
diff --git a/types/react-icons/lib/fa/music.d.ts b/types/react-icons/lib/fa/music.d.ts
index 711455b587..7b897563e3 100644
--- a/types/react-icons/lib/fa/music.d.ts
+++ b/types/react-icons/lib/fa/music.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMusic extends React.Component<IconBaseProps> { }
+declare class FaMusic extends React.Component<IconBaseProps> { }
+export = FaMusic;
diff --git a/types/react-icons/lib/fa/neuter.d.ts b/types/react-icons/lib/fa/neuter.d.ts
index a5ce0a9c93..54bc040a21 100644
--- a/types/react-icons/lib/fa/neuter.d.ts
+++ b/types/react-icons/lib/fa/neuter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaNeuter extends React.Component<IconBaseProps> { }
+declare class FaNeuter extends React.Component<IconBaseProps> { }
+export = FaNeuter;
diff --git a/types/react-icons/lib/fa/newspaper-o.d.ts b/types/react-icons/lib/fa/newspaper-o.d.ts
index 6f7f62737e..04afa361a9 100644
--- a/types/react-icons/lib/fa/newspaper-o.d.ts
+++ b/types/react-icons/lib/fa/newspaper-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaNewspaperO extends React.Component<IconBaseProps> { }
+declare class FaNewspaperO extends React.Component<IconBaseProps> { }
+export = FaNewspaperO;
diff --git a/types/react-icons/lib/fa/object-group.d.ts b/types/react-icons/lib/fa/object-group.d.ts
index 5454030a44..2f584e9792 100644
--- a/types/react-icons/lib/fa/object-group.d.ts
+++ b/types/react-icons/lib/fa/object-group.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaObjectGroup extends React.Component<IconBaseProps> { }
+declare class FaObjectGroup extends React.Component<IconBaseProps> { }
+export = FaObjectGroup;
diff --git a/types/react-icons/lib/fa/object-ungroup.d.ts b/types/react-icons/lib/fa/object-ungroup.d.ts
index 705abb0623..64ef562d0b 100644
--- a/types/react-icons/lib/fa/object-ungroup.d.ts
+++ b/types/react-icons/lib/fa/object-ungroup.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaObjectUngroup extends React.Component<IconBaseProps> { }
+declare class FaObjectUngroup extends React.Component<IconBaseProps> { }
+export = FaObjectUngroup;
diff --git a/types/react-icons/lib/fa/odnoklassniki-square.d.ts b/types/react-icons/lib/fa/odnoklassniki-square.d.ts
index d6d1c3fb5e..9eef0f65bc 100644
--- a/types/react-icons/lib/fa/odnoklassniki-square.d.ts
+++ b/types/react-icons/lib/fa/odnoklassniki-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOdnoklassnikiSquare extends React.Component<IconBaseProps> { }
+declare class FaOdnoklassnikiSquare extends React.Component<IconBaseProps> { }
+export = FaOdnoklassnikiSquare;
diff --git a/types/react-icons/lib/fa/odnoklassniki.d.ts b/types/react-icons/lib/fa/odnoklassniki.d.ts
index c9cdfc3f99..bd08137730 100644
--- a/types/react-icons/lib/fa/odnoklassniki.d.ts
+++ b/types/react-icons/lib/fa/odnoklassniki.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOdnoklassniki extends React.Component<IconBaseProps> { }
+declare class FaOdnoklassniki extends React.Component<IconBaseProps> { }
+export = FaOdnoklassniki;
diff --git a/types/react-icons/lib/fa/opencart.d.ts b/types/react-icons/lib/fa/opencart.d.ts
index dde7963cd7..6b91510b98 100644
--- a/types/react-icons/lib/fa/opencart.d.ts
+++ b/types/react-icons/lib/fa/opencart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOpencart extends React.Component<IconBaseProps> { }
+declare class FaOpencart extends React.Component<IconBaseProps> { }
+export = FaOpencart;
diff --git a/types/react-icons/lib/fa/openid.d.ts b/types/react-icons/lib/fa/openid.d.ts
index 763d13e24d..a2440e94c0 100644
--- a/types/react-icons/lib/fa/openid.d.ts
+++ b/types/react-icons/lib/fa/openid.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOpenid extends React.Component<IconBaseProps> { }
+declare class FaOpenid extends React.Component<IconBaseProps> { }
+export = FaOpenid;
diff --git a/types/react-icons/lib/fa/opera.d.ts b/types/react-icons/lib/fa/opera.d.ts
index c66bee6dca..5e4a4ad5d1 100644
--- a/types/react-icons/lib/fa/opera.d.ts
+++ b/types/react-icons/lib/fa/opera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOpera extends React.Component<IconBaseProps> { }
+declare class FaOpera extends React.Component<IconBaseProps> { }
+export = FaOpera;
diff --git a/types/react-icons/lib/fa/optin-monster.d.ts b/types/react-icons/lib/fa/optin-monster.d.ts
index 3a4973ca67..35a77228aa 100644
--- a/types/react-icons/lib/fa/optin-monster.d.ts
+++ b/types/react-icons/lib/fa/optin-monster.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOptinMonster extends React.Component<IconBaseProps> { }
+declare class FaOptinMonster extends React.Component<IconBaseProps> { }
+export = FaOptinMonster;
diff --git a/types/react-icons/lib/fa/pagelines.d.ts b/types/react-icons/lib/fa/pagelines.d.ts
index b9db5fd4ab..48db91303e 100644
--- a/types/react-icons/lib/fa/pagelines.d.ts
+++ b/types/react-icons/lib/fa/pagelines.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPagelines extends React.Component<IconBaseProps> { }
+declare class FaPagelines extends React.Component<IconBaseProps> { }
+export = FaPagelines;
diff --git a/types/react-icons/lib/fa/paint-brush.d.ts b/types/react-icons/lib/fa/paint-brush.d.ts
index 4d56d06006..e00ca97541 100644
--- a/types/react-icons/lib/fa/paint-brush.d.ts
+++ b/types/react-icons/lib/fa/paint-brush.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaintBrush extends React.Component<IconBaseProps> { }
+declare class FaPaintBrush extends React.Component<IconBaseProps> { }
+export = FaPaintBrush;
diff --git a/types/react-icons/lib/fa/paper-plane-o.d.ts b/types/react-icons/lib/fa/paper-plane-o.d.ts
index 5fa53c13f7..b21b883cde 100644
--- a/types/react-icons/lib/fa/paper-plane-o.d.ts
+++ b/types/react-icons/lib/fa/paper-plane-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperPlaneO extends React.Component<IconBaseProps> { }
+declare class FaPaperPlaneO extends React.Component<IconBaseProps> { }
+export = FaPaperPlaneO;
diff --git a/types/react-icons/lib/fa/paper-plane.d.ts b/types/react-icons/lib/fa/paper-plane.d.ts
index 18d0a9fada..f0396a87cf 100644
--- a/types/react-icons/lib/fa/paper-plane.d.ts
+++ b/types/react-icons/lib/fa/paper-plane.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperPlane extends React.Component<IconBaseProps> { }
+declare class FaPaperPlane extends React.Component<IconBaseProps> { }
+export = FaPaperPlane;
diff --git a/types/react-icons/lib/fa/paperclip.d.ts b/types/react-icons/lib/fa/paperclip.d.ts
index e037d9d2a9..073d3f8172 100644
--- a/types/react-icons/lib/fa/paperclip.d.ts
+++ b/types/react-icons/lib/fa/paperclip.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperclip extends React.Component<IconBaseProps> { }
+declare class FaPaperclip extends React.Component<IconBaseProps> { }
+export = FaPaperclip;
diff --git a/types/react-icons/lib/fa/paragraph.d.ts b/types/react-icons/lib/fa/paragraph.d.ts
index 2895b28ecb..16f3b33755 100644
--- a/types/react-icons/lib/fa/paragraph.d.ts
+++ b/types/react-icons/lib/fa/paragraph.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaParagraph extends React.Component<IconBaseProps> { }
+declare class FaParagraph extends React.Component<IconBaseProps> { }
+export = FaParagraph;
diff --git a/types/react-icons/lib/fa/pause-circle-o.d.ts b/types/react-icons/lib/fa/pause-circle-o.d.ts
index 4b02099cf7..237f29bba3 100644
--- a/types/react-icons/lib/fa/pause-circle-o.d.ts
+++ b/types/react-icons/lib/fa/pause-circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPauseCircleO extends React.Component<IconBaseProps> { }
+declare class FaPauseCircleO extends React.Component<IconBaseProps> { }
+export = FaPauseCircleO;
diff --git a/types/react-icons/lib/fa/pause-circle.d.ts b/types/react-icons/lib/fa/pause-circle.d.ts
index 96fcbf12d2..e596ec02db 100644
--- a/types/react-icons/lib/fa/pause-circle.d.ts
+++ b/types/react-icons/lib/fa/pause-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPauseCircle extends React.Component<IconBaseProps> { }
+declare class FaPauseCircle extends React.Component<IconBaseProps> { }
+export = FaPauseCircle;
diff --git a/types/react-icons/lib/fa/pause.d.ts b/types/react-icons/lib/fa/pause.d.ts
index 87af546f21..d84c25805f 100644
--- a/types/react-icons/lib/fa/pause.d.ts
+++ b/types/react-icons/lib/fa/pause.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPause extends React.Component<IconBaseProps> { }
+declare class FaPause extends React.Component<IconBaseProps> { }
+export = FaPause;
diff --git a/types/react-icons/lib/fa/paw.d.ts b/types/react-icons/lib/fa/paw.d.ts
index 6f88ab466f..6d0dd51dad 100644
--- a/types/react-icons/lib/fa/paw.d.ts
+++ b/types/react-icons/lib/fa/paw.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaw extends React.Component<IconBaseProps> { }
+declare class FaPaw extends React.Component<IconBaseProps> { }
+export = FaPaw;
diff --git a/types/react-icons/lib/fa/paypal.d.ts b/types/react-icons/lib/fa/paypal.d.ts
index d2878fe144..ac59970a20 100644
--- a/types/react-icons/lib/fa/paypal.d.ts
+++ b/types/react-icons/lib/fa/paypal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaypal extends React.Component<IconBaseProps> { }
+declare class FaPaypal extends React.Component<IconBaseProps> { }
+export = FaPaypal;
diff --git a/types/react-icons/lib/fa/pencil-square.d.ts b/types/react-icons/lib/fa/pencil-square.d.ts
index ae8d368315..d9853f6fea 100644
--- a/types/react-icons/lib/fa/pencil-square.d.ts
+++ b/types/react-icons/lib/fa/pencil-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPencilSquare extends React.Component<IconBaseProps> { }
+declare class FaPencilSquare extends React.Component<IconBaseProps> { }
+export = FaPencilSquare;
diff --git a/types/react-icons/lib/fa/pencil.d.ts b/types/react-icons/lib/fa/pencil.d.ts
index bae947d1d9..f4624c1974 100644
--- a/types/react-icons/lib/fa/pencil.d.ts
+++ b/types/react-icons/lib/fa/pencil.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPencil extends React.Component<IconBaseProps> { }
+declare class FaPencil extends React.Component<IconBaseProps> { }
+export = FaPencil;
diff --git a/types/react-icons/lib/fa/percent.d.ts b/types/react-icons/lib/fa/percent.d.ts
index 447838a4d4..6c63e0b1b0 100644
--- a/types/react-icons/lib/fa/percent.d.ts
+++ b/types/react-icons/lib/fa/percent.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPercent extends React.Component<IconBaseProps> { }
+declare class FaPercent extends React.Component<IconBaseProps> { }
+export = FaPercent;
diff --git a/types/react-icons/lib/fa/phone-square.d.ts b/types/react-icons/lib/fa/phone-square.d.ts
index 8595e9338b..c64fac18e4 100644
--- a/types/react-icons/lib/fa/phone-square.d.ts
+++ b/types/react-icons/lib/fa/phone-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPhoneSquare extends React.Component<IconBaseProps> { }
+declare class FaPhoneSquare extends React.Component<IconBaseProps> { }
+export = FaPhoneSquare;
diff --git a/types/react-icons/lib/fa/phone.d.ts b/types/react-icons/lib/fa/phone.d.ts
index 985d9a8867..7c9113a801 100644
--- a/types/react-icons/lib/fa/phone.d.ts
+++ b/types/react-icons/lib/fa/phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPhone extends React.Component<IconBaseProps> { }
+declare class FaPhone extends React.Component<IconBaseProps> { }
+export = FaPhone;
diff --git a/types/react-icons/lib/fa/pie-chart.d.ts b/types/react-icons/lib/fa/pie-chart.d.ts
index b5bd5b2c5c..b1f1532a75 100644
--- a/types/react-icons/lib/fa/pie-chart.d.ts
+++ b/types/react-icons/lib/fa/pie-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPieChart extends React.Component<IconBaseProps> { }
+declare class FaPieChart extends React.Component<IconBaseProps> { }
+export = FaPieChart;
diff --git a/types/react-icons/lib/fa/pied-piper-alt.d.ts b/types/react-icons/lib/fa/pied-piper-alt.d.ts
index 8a23255cad..c3e62c90c1 100644
--- a/types/react-icons/lib/fa/pied-piper-alt.d.ts
+++ b/types/react-icons/lib/fa/pied-piper-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPiedPiperAlt extends React.Component<IconBaseProps> { }
+declare class FaPiedPiperAlt extends React.Component<IconBaseProps> { }
+export = FaPiedPiperAlt;
diff --git a/types/react-icons/lib/fa/pied-piper.d.ts b/types/react-icons/lib/fa/pied-piper.d.ts
index e925634cd2..bcdea4439a 100644
--- a/types/react-icons/lib/fa/pied-piper.d.ts
+++ b/types/react-icons/lib/fa/pied-piper.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPiedPiper extends React.Component<IconBaseProps> { }
+declare class FaPiedPiper extends React.Component<IconBaseProps> { }
+export = FaPiedPiper;
diff --git a/types/react-icons/lib/fa/pinterest-p.d.ts b/types/react-icons/lib/fa/pinterest-p.d.ts
index c53adc8749..5387cd9430 100644
--- a/types/react-icons/lib/fa/pinterest-p.d.ts
+++ b/types/react-icons/lib/fa/pinterest-p.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterestP extends React.Component<IconBaseProps> { }
+declare class FaPinterestP extends React.Component<IconBaseProps> { }
+export = FaPinterestP;
diff --git a/types/react-icons/lib/fa/pinterest-square.d.ts b/types/react-icons/lib/fa/pinterest-square.d.ts
index a90c930b91..9f9dbb3869 100644
--- a/types/react-icons/lib/fa/pinterest-square.d.ts
+++ b/types/react-icons/lib/fa/pinterest-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterestSquare extends React.Component<IconBaseProps> { }
+declare class FaPinterestSquare extends React.Component<IconBaseProps> { }
+export = FaPinterestSquare;
diff --git a/types/react-icons/lib/fa/pinterest.d.ts b/types/react-icons/lib/fa/pinterest.d.ts
index c380cf2092..cc4dd7d77b 100644
--- a/types/react-icons/lib/fa/pinterest.d.ts
+++ b/types/react-icons/lib/fa/pinterest.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterest extends React.Component<IconBaseProps> { }
+declare class FaPinterest extends React.Component<IconBaseProps> { }
+export = FaPinterest;
diff --git a/types/react-icons/lib/fa/plane.d.ts b/types/react-icons/lib/fa/plane.d.ts
index 13373d06d7..d8c14730b6 100644
--- a/types/react-icons/lib/fa/plane.d.ts
+++ b/types/react-icons/lib/fa/plane.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlane extends React.Component<IconBaseProps> { }
+declare class FaPlane extends React.Component<IconBaseProps> { }
+export = FaPlane;
diff --git a/types/react-icons/lib/fa/play-circle-o.d.ts b/types/react-icons/lib/fa/play-circle-o.d.ts
index 7fa9627c4c..eff8fcd09f 100644
--- a/types/react-icons/lib/fa/play-circle-o.d.ts
+++ b/types/react-icons/lib/fa/play-circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlayCircleO extends React.Component<IconBaseProps> { }
+declare class FaPlayCircleO extends React.Component<IconBaseProps> { }
+export = FaPlayCircleO;
diff --git a/types/react-icons/lib/fa/play-circle.d.ts b/types/react-icons/lib/fa/play-circle.d.ts
index ea4f568b34..850c43afb9 100644
--- a/types/react-icons/lib/fa/play-circle.d.ts
+++ b/types/react-icons/lib/fa/play-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlayCircle extends React.Component<IconBaseProps> { }
+declare class FaPlayCircle extends React.Component<IconBaseProps> { }
+export = FaPlayCircle;
diff --git a/types/react-icons/lib/fa/play.d.ts b/types/react-icons/lib/fa/play.d.ts
index f6c6dafb12..54a66a1994 100644
--- a/types/react-icons/lib/fa/play.d.ts
+++ b/types/react-icons/lib/fa/play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlay extends React.Component<IconBaseProps> { }
+declare class FaPlay extends React.Component<IconBaseProps> { }
+export = FaPlay;
diff --git a/types/react-icons/lib/fa/plug.d.ts b/types/react-icons/lib/fa/plug.d.ts
index e88fc8c2ae..601b908307 100644
--- a/types/react-icons/lib/fa/plug.d.ts
+++ b/types/react-icons/lib/fa/plug.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlug extends React.Component<IconBaseProps> { }
+declare class FaPlug extends React.Component<IconBaseProps> { }
+export = FaPlug;
diff --git a/types/react-icons/lib/fa/plus-circle.d.ts b/types/react-icons/lib/fa/plus-circle.d.ts
index 9bf8af4e8d..af1595428f 100644
--- a/types/react-icons/lib/fa/plus-circle.d.ts
+++ b/types/react-icons/lib/fa/plus-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusCircle extends React.Component<IconBaseProps> { }
+declare class FaPlusCircle extends React.Component<IconBaseProps> { }
+export = FaPlusCircle;
diff --git a/types/react-icons/lib/fa/plus-square-o.d.ts b/types/react-icons/lib/fa/plus-square-o.d.ts
index e9b582ec2d..e9fb5b2ca1 100644
--- a/types/react-icons/lib/fa/plus-square-o.d.ts
+++ b/types/react-icons/lib/fa/plus-square-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusSquareO extends React.Component<IconBaseProps> { }
+declare class FaPlusSquareO extends React.Component<IconBaseProps> { }
+export = FaPlusSquareO;
diff --git a/types/react-icons/lib/fa/plus-square.d.ts b/types/react-icons/lib/fa/plus-square.d.ts
index b69d337311..478a80a7a4 100644
--- a/types/react-icons/lib/fa/plus-square.d.ts
+++ b/types/react-icons/lib/fa/plus-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusSquare extends React.Component<IconBaseProps> { }
+declare class FaPlusSquare extends React.Component<IconBaseProps> { }
+export = FaPlusSquare;
diff --git a/types/react-icons/lib/fa/plus.d.ts b/types/react-icons/lib/fa/plus.d.ts
index f6649123fb..3a8423a776 100644
--- a/types/react-icons/lib/fa/plus.d.ts
+++ b/types/react-icons/lib/fa/plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlus extends React.Component<IconBaseProps> { }
+declare class FaPlus extends React.Component<IconBaseProps> { }
+export = FaPlus;
diff --git a/types/react-icons/lib/fa/power-off.d.ts b/types/react-icons/lib/fa/power-off.d.ts
index 538e8c9886..091d3ee694 100644
--- a/types/react-icons/lib/fa/power-off.d.ts
+++ b/types/react-icons/lib/fa/power-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPowerOff extends React.Component<IconBaseProps> { }
+declare class FaPowerOff extends React.Component<IconBaseProps> { }
+export = FaPowerOff;
diff --git a/types/react-icons/lib/fa/print.d.ts b/types/react-icons/lib/fa/print.d.ts
index 5e49c43315..8efbedf76f 100644
--- a/types/react-icons/lib/fa/print.d.ts
+++ b/types/react-icons/lib/fa/print.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPrint extends React.Component<IconBaseProps> { }
+declare class FaPrint extends React.Component<IconBaseProps> { }
+export = FaPrint;
diff --git a/types/react-icons/lib/fa/product-hunt.d.ts b/types/react-icons/lib/fa/product-hunt.d.ts
index 2d790f199c..64b2613692 100644
--- a/types/react-icons/lib/fa/product-hunt.d.ts
+++ b/types/react-icons/lib/fa/product-hunt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaProductHunt extends React.Component<IconBaseProps> { }
+declare class FaProductHunt extends React.Component<IconBaseProps> { }
+export = FaProductHunt;
diff --git a/types/react-icons/lib/fa/puzzle-piece.d.ts b/types/react-icons/lib/fa/puzzle-piece.d.ts
index f25059cc09..200b21237b 100644
--- a/types/react-icons/lib/fa/puzzle-piece.d.ts
+++ b/types/react-icons/lib/fa/puzzle-piece.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPuzzlePiece extends React.Component<IconBaseProps> { }
+declare class FaPuzzlePiece extends React.Component<IconBaseProps> { }
+export = FaPuzzlePiece;
diff --git a/types/react-icons/lib/fa/qq.d.ts b/types/react-icons/lib/fa/qq.d.ts
index ff62c8cf78..84fde8990e 100644
--- a/types/react-icons/lib/fa/qq.d.ts
+++ b/types/react-icons/lib/fa/qq.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQq extends React.Component<IconBaseProps> { }
+declare class FaQq extends React.Component<IconBaseProps> { }
+export = FaQq;
diff --git a/types/react-icons/lib/fa/qrcode.d.ts b/types/react-icons/lib/fa/qrcode.d.ts
index 23c52561db..2fba577719 100644
--- a/types/react-icons/lib/fa/qrcode.d.ts
+++ b/types/react-icons/lib/fa/qrcode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQrcode extends React.Component<IconBaseProps> { }
+declare class FaQrcode extends React.Component<IconBaseProps> { }
+export = FaQrcode;
diff --git a/types/react-icons/lib/fa/question-circle-o.d.ts b/types/react-icons/lib/fa/question-circle-o.d.ts
index e3176c764b..6188c56712 100644
--- a/types/react-icons/lib/fa/question-circle-o.d.ts
+++ b/types/react-icons/lib/fa/question-circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestionCircleO extends React.Component<IconBaseProps> { }
+declare class FaQuestionCircleO extends React.Component<IconBaseProps> { }
+export = FaQuestionCircleO;
diff --git a/types/react-icons/lib/fa/question-circle.d.ts b/types/react-icons/lib/fa/question-circle.d.ts
index a3474eab77..c822c62d7e 100644
--- a/types/react-icons/lib/fa/question-circle.d.ts
+++ b/types/react-icons/lib/fa/question-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestionCircle extends React.Component<IconBaseProps> { }
+declare class FaQuestionCircle extends React.Component<IconBaseProps> { }
+export = FaQuestionCircle;
diff --git a/types/react-icons/lib/fa/question.d.ts b/types/react-icons/lib/fa/question.d.ts
index c825b26b4f..0d0756e81f 100644
--- a/types/react-icons/lib/fa/question.d.ts
+++ b/types/react-icons/lib/fa/question.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestion extends React.Component<IconBaseProps> { }
+declare class FaQuestion extends React.Component<IconBaseProps> { }
+export = FaQuestion;
diff --git a/types/react-icons/lib/fa/quote-left.d.ts b/types/react-icons/lib/fa/quote-left.d.ts
index 904a81703f..ca59dc3f83 100644
--- a/types/react-icons/lib/fa/quote-left.d.ts
+++ b/types/react-icons/lib/fa/quote-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuoteLeft extends React.Component<IconBaseProps> { }
+declare class FaQuoteLeft extends React.Component<IconBaseProps> { }
+export = FaQuoteLeft;
diff --git a/types/react-icons/lib/fa/quote-right.d.ts b/types/react-icons/lib/fa/quote-right.d.ts
index 3a4e38743d..fa325866d1 100644
--- a/types/react-icons/lib/fa/quote-right.d.ts
+++ b/types/react-icons/lib/fa/quote-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuoteRight extends React.Component<IconBaseProps> { }
+declare class FaQuoteRight extends React.Component<IconBaseProps> { }
+export = FaQuoteRight;
diff --git a/types/react-icons/lib/fa/ra.d.ts b/types/react-icons/lib/fa/ra.d.ts
index da2bd43b87..bf436d8019 100644
--- a/types/react-icons/lib/fa/ra.d.ts
+++ b/types/react-icons/lib/fa/ra.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRa extends React.Component<IconBaseProps> { }
+declare class FaRa extends React.Component<IconBaseProps> { }
+export = FaRa;
diff --git a/types/react-icons/lib/fa/random.d.ts b/types/react-icons/lib/fa/random.d.ts
index 02c7c7465e..c3864a6f9a 100644
--- a/types/react-icons/lib/fa/random.d.ts
+++ b/types/react-icons/lib/fa/random.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRandom extends React.Component<IconBaseProps> { }
+declare class FaRandom extends React.Component<IconBaseProps> { }
+export = FaRandom;
diff --git a/types/react-icons/lib/fa/recycle.d.ts b/types/react-icons/lib/fa/recycle.d.ts
index 3f2c35bb45..476931ca9a 100644
--- a/types/react-icons/lib/fa/recycle.d.ts
+++ b/types/react-icons/lib/fa/recycle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRecycle extends React.Component<IconBaseProps> { }
+declare class FaRecycle extends React.Component<IconBaseProps> { }
+export = FaRecycle;
diff --git a/types/react-icons/lib/fa/reddit-alien.d.ts b/types/react-icons/lib/fa/reddit-alien.d.ts
index 0c6152a524..27808c318d 100644
--- a/types/react-icons/lib/fa/reddit-alien.d.ts
+++ b/types/react-icons/lib/fa/reddit-alien.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRedditAlien extends React.Component<IconBaseProps> { }
+declare class FaRedditAlien extends React.Component<IconBaseProps> { }
+export = FaRedditAlien;
diff --git a/types/react-icons/lib/fa/reddit-square.d.ts b/types/react-icons/lib/fa/reddit-square.d.ts
index 2fe217fd2f..2938b4cd05 100644
--- a/types/react-icons/lib/fa/reddit-square.d.ts
+++ b/types/react-icons/lib/fa/reddit-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRedditSquare extends React.Component<IconBaseProps> { }
+declare class FaRedditSquare extends React.Component<IconBaseProps> { }
+export = FaRedditSquare;
diff --git a/types/react-icons/lib/fa/reddit.d.ts b/types/react-icons/lib/fa/reddit.d.ts
index 485e46b5b0..51ba88dbb0 100644
--- a/types/react-icons/lib/fa/reddit.d.ts
+++ b/types/react-icons/lib/fa/reddit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaReddit extends React.Component<IconBaseProps> { }
+declare class FaReddit extends React.Component<IconBaseProps> { }
+export = FaReddit;
diff --git a/types/react-icons/lib/fa/refresh.d.ts b/types/react-icons/lib/fa/refresh.d.ts
index ebf74b1515..57c4e5cc53 100644
--- a/types/react-icons/lib/fa/refresh.d.ts
+++ b/types/react-icons/lib/fa/refresh.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRefresh extends React.Component<IconBaseProps> { }
+declare class FaRefresh extends React.Component<IconBaseProps> { }
+export = FaRefresh;
diff --git a/types/react-icons/lib/fa/registered.d.ts b/types/react-icons/lib/fa/registered.d.ts
index 801dc66200..975627ad01 100644
--- a/types/react-icons/lib/fa/registered.d.ts
+++ b/types/react-icons/lib/fa/registered.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRegistered extends React.Component<IconBaseProps> { }
+declare class FaRegistered extends React.Component<IconBaseProps> { }
+export = FaRegistered;
diff --git a/types/react-icons/lib/fa/renren.d.ts b/types/react-icons/lib/fa/renren.d.ts
index 25055289d9..a608ad598d 100644
--- a/types/react-icons/lib/fa/renren.d.ts
+++ b/types/react-icons/lib/fa/renren.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRenren extends React.Component<IconBaseProps> { }
+declare class FaRenren extends React.Component<IconBaseProps> { }
+export = FaRenren;
diff --git a/types/react-icons/lib/fa/repeat.d.ts b/types/react-icons/lib/fa/repeat.d.ts
index c3f51ad288..013bfad3b5 100644
--- a/types/react-icons/lib/fa/repeat.d.ts
+++ b/types/react-icons/lib/fa/repeat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRepeat extends React.Component<IconBaseProps> { }
+declare class FaRepeat extends React.Component<IconBaseProps> { }
+export = FaRepeat;
diff --git a/types/react-icons/lib/fa/retweet.d.ts b/types/react-icons/lib/fa/retweet.d.ts
index f18d4bda7b..9c23c1e433 100644
--- a/types/react-icons/lib/fa/retweet.d.ts
+++ b/types/react-icons/lib/fa/retweet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRetweet extends React.Component<IconBaseProps> { }
+declare class FaRetweet extends React.Component<IconBaseProps> { }
+export = FaRetweet;
diff --git a/types/react-icons/lib/fa/road.d.ts b/types/react-icons/lib/fa/road.d.ts
index 0715ec2e7e..9a9afb3a9c 100644
--- a/types/react-icons/lib/fa/road.d.ts
+++ b/types/react-icons/lib/fa/road.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRoad extends React.Component<IconBaseProps> { }
+declare class FaRoad extends React.Component<IconBaseProps> { }
+export = FaRoad;
diff --git a/types/react-icons/lib/fa/rocket.d.ts b/types/react-icons/lib/fa/rocket.d.ts
index 2f1c2dc834..e559d0008e 100644
--- a/types/react-icons/lib/fa/rocket.d.ts
+++ b/types/react-icons/lib/fa/rocket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRocket extends React.Component<IconBaseProps> { }
+declare class FaRocket extends React.Component<IconBaseProps> { }
+export = FaRocket;
diff --git a/types/react-icons/lib/fa/rotate-left.d.ts b/types/react-icons/lib/fa/rotate-left.d.ts
index 2a93784c4e..429e6f63b4 100644
--- a/types/react-icons/lib/fa/rotate-left.d.ts
+++ b/types/react-icons/lib/fa/rotate-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRotateLeft extends React.Component<IconBaseProps> { }
+declare class FaRotateLeft extends React.Component<IconBaseProps> { }
+export = FaRotateLeft;
diff --git a/types/react-icons/lib/fa/rouble.d.ts b/types/react-icons/lib/fa/rouble.d.ts
index 9e61df412e..af4c0d834a 100644
--- a/types/react-icons/lib/fa/rouble.d.ts
+++ b/types/react-icons/lib/fa/rouble.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRouble extends React.Component<IconBaseProps> { }
+declare class FaRouble extends React.Component<IconBaseProps> { }
+export = FaRouble;
diff --git a/types/react-icons/lib/fa/rss-square.d.ts b/types/react-icons/lib/fa/rss-square.d.ts
index c840ec5513..ed6bad1e0d 100644
--- a/types/react-icons/lib/fa/rss-square.d.ts
+++ b/types/react-icons/lib/fa/rss-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRssSquare extends React.Component<IconBaseProps> { }
+declare class FaRssSquare extends React.Component<IconBaseProps> { }
+export = FaRssSquare;
diff --git a/types/react-icons/lib/fa/safari.d.ts b/types/react-icons/lib/fa/safari.d.ts
index 6bb95a70f0..0a4f5ffe3c 100644
--- a/types/react-icons/lib/fa/safari.d.ts
+++ b/types/react-icons/lib/fa/safari.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSafari extends React.Component<IconBaseProps> { }
+declare class FaSafari extends React.Component<IconBaseProps> { }
+export = FaSafari;
diff --git a/types/react-icons/lib/fa/scribd.d.ts b/types/react-icons/lib/fa/scribd.d.ts
index 39fc8c40a6..e7be0691fa 100644
--- a/types/react-icons/lib/fa/scribd.d.ts
+++ b/types/react-icons/lib/fa/scribd.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaScribd extends React.Component<IconBaseProps> { }
+declare class FaScribd extends React.Component<IconBaseProps> { }
+export = FaScribd;
diff --git a/types/react-icons/lib/fa/search-minus.d.ts b/types/react-icons/lib/fa/search-minus.d.ts
index b0045c94f4..7f94b39768 100644
--- a/types/react-icons/lib/fa/search-minus.d.ts
+++ b/types/react-icons/lib/fa/search-minus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSearchMinus extends React.Component<IconBaseProps> { }
+declare class FaSearchMinus extends React.Component<IconBaseProps> { }
+export = FaSearchMinus;
diff --git a/types/react-icons/lib/fa/search-plus.d.ts b/types/react-icons/lib/fa/search-plus.d.ts
index 3aaacffaea..59f8b7d49f 100644
--- a/types/react-icons/lib/fa/search-plus.d.ts
+++ b/types/react-icons/lib/fa/search-plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSearchPlus extends React.Component<IconBaseProps> { }
+declare class FaSearchPlus extends React.Component<IconBaseProps> { }
+export = FaSearchPlus;
diff --git a/types/react-icons/lib/fa/search.d.ts b/types/react-icons/lib/fa/search.d.ts
index 14c1b8eb87..1223413cc9 100644
--- a/types/react-icons/lib/fa/search.d.ts
+++ b/types/react-icons/lib/fa/search.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSearch extends React.Component<IconBaseProps> { }
+declare class FaSearch extends React.Component<IconBaseProps> { }
+export = FaSearch;
diff --git a/types/react-icons/lib/fa/sellsy.d.ts b/types/react-icons/lib/fa/sellsy.d.ts
index 9eb86d3b41..860ba7bfd4 100644
--- a/types/react-icons/lib/fa/sellsy.d.ts
+++ b/types/react-icons/lib/fa/sellsy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSellsy extends React.Component<IconBaseProps> { }
+declare class FaSellsy extends React.Component<IconBaseProps> { }
+export = FaSellsy;
diff --git a/types/react-icons/lib/fa/server.d.ts b/types/react-icons/lib/fa/server.d.ts
index f34b2bef92..6dda352faa 100644
--- a/types/react-icons/lib/fa/server.d.ts
+++ b/types/react-icons/lib/fa/server.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaServer extends React.Component<IconBaseProps> { }
+declare class FaServer extends React.Component<IconBaseProps> { }
+export = FaServer;
diff --git a/types/react-icons/lib/fa/share-alt-square.d.ts b/types/react-icons/lib/fa/share-alt-square.d.ts
index 31dc918f6c..d36315ee1f 100644
--- a/types/react-icons/lib/fa/share-alt-square.d.ts
+++ b/types/react-icons/lib/fa/share-alt-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareAltSquare extends React.Component<IconBaseProps> { }
+declare class FaShareAltSquare extends React.Component<IconBaseProps> { }
+export = FaShareAltSquare;
diff --git a/types/react-icons/lib/fa/share-alt.d.ts b/types/react-icons/lib/fa/share-alt.d.ts
index e95e1b249e..49c3f2ff3b 100644
--- a/types/react-icons/lib/fa/share-alt.d.ts
+++ b/types/react-icons/lib/fa/share-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareAlt extends React.Component<IconBaseProps> { }
+declare class FaShareAlt extends React.Component<IconBaseProps> { }
+export = FaShareAlt;
diff --git a/types/react-icons/lib/fa/share-square-o.d.ts b/types/react-icons/lib/fa/share-square-o.d.ts
index fbe2893547..d23c235045 100644
--- a/types/react-icons/lib/fa/share-square-o.d.ts
+++ b/types/react-icons/lib/fa/share-square-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareSquareO extends React.Component<IconBaseProps> { }
+declare class FaShareSquareO extends React.Component<IconBaseProps> { }
+export = FaShareSquareO;
diff --git a/types/react-icons/lib/fa/share-square.d.ts b/types/react-icons/lib/fa/share-square.d.ts
index 553b8b7d88..93c6e557f4 100644
--- a/types/react-icons/lib/fa/share-square.d.ts
+++ b/types/react-icons/lib/fa/share-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareSquare extends React.Component<IconBaseProps> { }
+declare class FaShareSquare extends React.Component<IconBaseProps> { }
+export = FaShareSquare;
diff --git a/types/react-icons/lib/fa/shield.d.ts b/types/react-icons/lib/fa/shield.d.ts
index 0358946bb0..8ca03c4657 100644
--- a/types/react-icons/lib/fa/shield.d.ts
+++ b/types/react-icons/lib/fa/shield.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShield extends React.Component<IconBaseProps> { }
+declare class FaShield extends React.Component<IconBaseProps> { }
+export = FaShield;
diff --git a/types/react-icons/lib/fa/ship.d.ts b/types/react-icons/lib/fa/ship.d.ts
index bbac7fa963..71b61a6e7b 100644
--- a/types/react-icons/lib/fa/ship.d.ts
+++ b/types/react-icons/lib/fa/ship.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShip extends React.Component<IconBaseProps> { }
+declare class FaShip extends React.Component<IconBaseProps> { }
+export = FaShip;
diff --git a/types/react-icons/lib/fa/shirtsinbulk.d.ts b/types/react-icons/lib/fa/shirtsinbulk.d.ts
index 1cdac4b3b2..8faaa7e15b 100644
--- a/types/react-icons/lib/fa/shirtsinbulk.d.ts
+++ b/types/react-icons/lib/fa/shirtsinbulk.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShirtsinbulk extends React.Component<IconBaseProps> { }
+declare class FaShirtsinbulk extends React.Component<IconBaseProps> { }
+export = FaShirtsinbulk;
diff --git a/types/react-icons/lib/fa/shopping-bag.d.ts b/types/react-icons/lib/fa/shopping-bag.d.ts
index 0e9ec2fd0d..e9617d3fd4 100644
--- a/types/react-icons/lib/fa/shopping-bag.d.ts
+++ b/types/react-icons/lib/fa/shopping-bag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingBag extends React.Component<IconBaseProps> { }
+declare class FaShoppingBag extends React.Component<IconBaseProps> { }
+export = FaShoppingBag;
diff --git a/types/react-icons/lib/fa/shopping-basket.d.ts b/types/react-icons/lib/fa/shopping-basket.d.ts
index 05b7d1417d..e479dc7343 100644
--- a/types/react-icons/lib/fa/shopping-basket.d.ts
+++ b/types/react-icons/lib/fa/shopping-basket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingBasket extends React.Component<IconBaseProps> { }
+declare class FaShoppingBasket extends React.Component<IconBaseProps> { }
+export = FaShoppingBasket;
diff --git a/types/react-icons/lib/fa/shopping-cart.d.ts b/types/react-icons/lib/fa/shopping-cart.d.ts
index 17d623f44d..784aa79f93 100644
--- a/types/react-icons/lib/fa/shopping-cart.d.ts
+++ b/types/react-icons/lib/fa/shopping-cart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingCart extends React.Component<IconBaseProps> { }
+declare class FaShoppingCart extends React.Component<IconBaseProps> { }
+export = FaShoppingCart;
diff --git a/types/react-icons/lib/fa/sign-in.d.ts b/types/react-icons/lib/fa/sign-in.d.ts
index 6122e57cab..6761643c9d 100644
--- a/types/react-icons/lib/fa/sign-in.d.ts
+++ b/types/react-icons/lib/fa/sign-in.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignIn extends React.Component<IconBaseProps> { }
+declare class FaSignIn extends React.Component<IconBaseProps> { }
+export = FaSignIn;
diff --git a/types/react-icons/lib/fa/sign-language.d.ts b/types/react-icons/lib/fa/sign-language.d.ts
index 92f5afb348..0006b1dfab 100644
--- a/types/react-icons/lib/fa/sign-language.d.ts
+++ b/types/react-icons/lib/fa/sign-language.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignLanguage extends React.Component<IconBaseProps> { }
+declare class FaSignLanguage extends React.Component<IconBaseProps> { }
+export = FaSignLanguage;
diff --git a/types/react-icons/lib/fa/sign-out.d.ts b/types/react-icons/lib/fa/sign-out.d.ts
index 0432e2a806..8a32ff2252 100644
--- a/types/react-icons/lib/fa/sign-out.d.ts
+++ b/types/react-icons/lib/fa/sign-out.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignOut extends React.Component<IconBaseProps> { }
+declare class FaSignOut extends React.Component<IconBaseProps> { }
+export = FaSignOut;
diff --git a/types/react-icons/lib/fa/signal.d.ts b/types/react-icons/lib/fa/signal.d.ts
index ff8c9215db..733f27f8b9 100644
--- a/types/react-icons/lib/fa/signal.d.ts
+++ b/types/react-icons/lib/fa/signal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignal extends React.Component<IconBaseProps> { }
+declare class FaSignal extends React.Component<IconBaseProps> { }
+export = FaSignal;
diff --git a/types/react-icons/lib/fa/simplybuilt.d.ts b/types/react-icons/lib/fa/simplybuilt.d.ts
index 2f6a53cab7..91a9058c72 100644
--- a/types/react-icons/lib/fa/simplybuilt.d.ts
+++ b/types/react-icons/lib/fa/simplybuilt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSimplybuilt extends React.Component<IconBaseProps> { }
+declare class FaSimplybuilt extends React.Component<IconBaseProps> { }
+export = FaSimplybuilt;
diff --git a/types/react-icons/lib/fa/sitemap.d.ts b/types/react-icons/lib/fa/sitemap.d.ts
index e6a3891028..20c0543ac2 100644
--- a/types/react-icons/lib/fa/sitemap.d.ts
+++ b/types/react-icons/lib/fa/sitemap.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSitemap extends React.Component<IconBaseProps> { }
+declare class FaSitemap extends React.Component<IconBaseProps> { }
+export = FaSitemap;
diff --git a/types/react-icons/lib/fa/skyatlas.d.ts b/types/react-icons/lib/fa/skyatlas.d.ts
index 58a376bec4..13854503aa 100644
--- a/types/react-icons/lib/fa/skyatlas.d.ts
+++ b/types/react-icons/lib/fa/skyatlas.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSkyatlas extends React.Component<IconBaseProps> { }
+declare class FaSkyatlas extends React.Component<IconBaseProps> { }
+export = FaSkyatlas;
diff --git a/types/react-icons/lib/fa/skype.d.ts b/types/react-icons/lib/fa/skype.d.ts
index 3e4b8465ce..ccf59938a6 100644
--- a/types/react-icons/lib/fa/skype.d.ts
+++ b/types/react-icons/lib/fa/skype.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSkype extends React.Component<IconBaseProps> { }
+declare class FaSkype extends React.Component<IconBaseProps> { }
+export = FaSkype;
diff --git a/types/react-icons/lib/fa/slack.d.ts b/types/react-icons/lib/fa/slack.d.ts
index 05ae812154..6d441ba2d1 100644
--- a/types/react-icons/lib/fa/slack.d.ts
+++ b/types/react-icons/lib/fa/slack.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSlack extends React.Component<IconBaseProps> { }
+declare class FaSlack extends React.Component<IconBaseProps> { }
+export = FaSlack;
diff --git a/types/react-icons/lib/fa/sliders.d.ts b/types/react-icons/lib/fa/sliders.d.ts
index 5b77a2c246..6dfda35100 100644
--- a/types/react-icons/lib/fa/sliders.d.ts
+++ b/types/react-icons/lib/fa/sliders.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSliders extends React.Component<IconBaseProps> { }
+declare class FaSliders extends React.Component<IconBaseProps> { }
+export = FaSliders;
diff --git a/types/react-icons/lib/fa/slideshare.d.ts b/types/react-icons/lib/fa/slideshare.d.ts
index 678418e560..0553b84e9d 100644
--- a/types/react-icons/lib/fa/slideshare.d.ts
+++ b/types/react-icons/lib/fa/slideshare.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSlideshare extends React.Component<IconBaseProps> { }
+declare class FaSlideshare extends React.Component<IconBaseProps> { }
+export = FaSlideshare;
diff --git a/types/react-icons/lib/fa/smile-o.d.ts b/types/react-icons/lib/fa/smile-o.d.ts
index 8db866e669..16b701ab67 100644
--- a/types/react-icons/lib/fa/smile-o.d.ts
+++ b/types/react-icons/lib/fa/smile-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSmileO extends React.Component<IconBaseProps> { }
+declare class FaSmileO extends React.Component<IconBaseProps> { }
+export = FaSmileO;
diff --git a/types/react-icons/lib/fa/snapchat-ghost.d.ts b/types/react-icons/lib/fa/snapchat-ghost.d.ts
index 83ca65e891..f1da37daa1 100644
--- a/types/react-icons/lib/fa/snapchat-ghost.d.ts
+++ b/types/react-icons/lib/fa/snapchat-ghost.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchatGhost extends React.Component<IconBaseProps> { }
+declare class FaSnapchatGhost extends React.Component<IconBaseProps> { }
+export = FaSnapchatGhost;
diff --git a/types/react-icons/lib/fa/snapchat-square.d.ts b/types/react-icons/lib/fa/snapchat-square.d.ts
index 7c1ac2dbc4..53ccacd856 100644
--- a/types/react-icons/lib/fa/snapchat-square.d.ts
+++ b/types/react-icons/lib/fa/snapchat-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchatSquare extends React.Component<IconBaseProps> { }
+declare class FaSnapchatSquare extends React.Component<IconBaseProps> { }
+export = FaSnapchatSquare;
diff --git a/types/react-icons/lib/fa/snapchat.d.ts b/types/react-icons/lib/fa/snapchat.d.ts
index bbc8bb62e3..ff7b4adfc1 100644
--- a/types/react-icons/lib/fa/snapchat.d.ts
+++ b/types/react-icons/lib/fa/snapchat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchat extends React.Component<IconBaseProps> { }
+declare class FaSnapchat extends React.Component<IconBaseProps> { }
+export = FaSnapchat;
diff --git a/types/react-icons/lib/fa/sort-alpha-asc.d.ts b/types/react-icons/lib/fa/sort-alpha-asc.d.ts
index 6b44132473..f9f29a4c20 100644
--- a/types/react-icons/lib/fa/sort-alpha-asc.d.ts
+++ b/types/react-icons/lib/fa/sort-alpha-asc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAlphaAsc extends React.Component<IconBaseProps> { }
+declare class FaSortAlphaAsc extends React.Component<IconBaseProps> { }
+export = FaSortAlphaAsc;
diff --git a/types/react-icons/lib/fa/sort-alpha-desc.d.ts b/types/react-icons/lib/fa/sort-alpha-desc.d.ts
index 2830f1986e..2c9d8f7b86 100644
--- a/types/react-icons/lib/fa/sort-alpha-desc.d.ts
+++ b/types/react-icons/lib/fa/sort-alpha-desc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAlphaDesc extends React.Component<IconBaseProps> { }
+declare class FaSortAlphaDesc extends React.Component<IconBaseProps> { }
+export = FaSortAlphaDesc;
diff --git a/types/react-icons/lib/fa/sort-amount-asc.d.ts b/types/react-icons/lib/fa/sort-amount-asc.d.ts
index 05da03032c..f665f0ff3a 100644
--- a/types/react-icons/lib/fa/sort-amount-asc.d.ts
+++ b/types/react-icons/lib/fa/sort-amount-asc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAmountAsc extends React.Component<IconBaseProps> { }
+declare class FaSortAmountAsc extends React.Component<IconBaseProps> { }
+export = FaSortAmountAsc;
diff --git a/types/react-icons/lib/fa/sort-amount-desc.d.ts b/types/react-icons/lib/fa/sort-amount-desc.d.ts
index c7e7242565..ba40b6eb2f 100644
--- a/types/react-icons/lib/fa/sort-amount-desc.d.ts
+++ b/types/react-icons/lib/fa/sort-amount-desc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAmountDesc extends React.Component<IconBaseProps> { }
+declare class FaSortAmountDesc extends React.Component<IconBaseProps> { }
+export = FaSortAmountDesc;
diff --git a/types/react-icons/lib/fa/sort-asc.d.ts b/types/react-icons/lib/fa/sort-asc.d.ts
index ce2c9fe0a2..51b442d7c6 100644
--- a/types/react-icons/lib/fa/sort-asc.d.ts
+++ b/types/react-icons/lib/fa/sort-asc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAsc extends React.Component<IconBaseProps> { }
+declare class FaSortAsc extends React.Component<IconBaseProps> { }
+export = FaSortAsc;
diff --git a/types/react-icons/lib/fa/sort-desc.d.ts b/types/react-icons/lib/fa/sort-desc.d.ts
index 0b4842a8f9..17888aae25 100644
--- a/types/react-icons/lib/fa/sort-desc.d.ts
+++ b/types/react-icons/lib/fa/sort-desc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortDesc extends React.Component<IconBaseProps> { }
+declare class FaSortDesc extends React.Component<IconBaseProps> { }
+export = FaSortDesc;
diff --git a/types/react-icons/lib/fa/sort-numeric-asc.d.ts b/types/react-icons/lib/fa/sort-numeric-asc.d.ts
index b7fa62fe1c..1778101b1b 100644
--- a/types/react-icons/lib/fa/sort-numeric-asc.d.ts
+++ b/types/react-icons/lib/fa/sort-numeric-asc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortNumericAsc extends React.Component<IconBaseProps> { }
+declare class FaSortNumericAsc extends React.Component<IconBaseProps> { }
+export = FaSortNumericAsc;
diff --git a/types/react-icons/lib/fa/sort-numeric-desc.d.ts b/types/react-icons/lib/fa/sort-numeric-desc.d.ts
index 2c124abd75..4ab06a613e 100644
--- a/types/react-icons/lib/fa/sort-numeric-desc.d.ts
+++ b/types/react-icons/lib/fa/sort-numeric-desc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortNumericDesc extends React.Component<IconBaseProps> { }
+declare class FaSortNumericDesc extends React.Component<IconBaseProps> { }
+export = FaSortNumericDesc;
diff --git a/types/react-icons/lib/fa/sort.d.ts b/types/react-icons/lib/fa/sort.d.ts
index ad64fd0c52..6b5e9ec071 100644
--- a/types/react-icons/lib/fa/sort.d.ts
+++ b/types/react-icons/lib/fa/sort.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSort extends React.Component<IconBaseProps> { }
+declare class FaSort extends React.Component<IconBaseProps> { }
+export = FaSort;
diff --git a/types/react-icons/lib/fa/soundcloud.d.ts b/types/react-icons/lib/fa/soundcloud.d.ts
index c357e174b0..774a3a60a7 100644
--- a/types/react-icons/lib/fa/soundcloud.d.ts
+++ b/types/react-icons/lib/fa/soundcloud.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSoundcloud extends React.Component<IconBaseProps> { }
+declare class FaSoundcloud extends React.Component<IconBaseProps> { }
+export = FaSoundcloud;
diff --git a/types/react-icons/lib/fa/space-shuttle.d.ts b/types/react-icons/lib/fa/space-shuttle.d.ts
index 0ce2f24916..a637be5956 100644
--- a/types/react-icons/lib/fa/space-shuttle.d.ts
+++ b/types/react-icons/lib/fa/space-shuttle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpaceShuttle extends React.Component<IconBaseProps> { }
+declare class FaSpaceShuttle extends React.Component<IconBaseProps> { }
+export = FaSpaceShuttle;
diff --git a/types/react-icons/lib/fa/spinner.d.ts b/types/react-icons/lib/fa/spinner.d.ts
index 36e2dd9285..dbd8124bca 100644
--- a/types/react-icons/lib/fa/spinner.d.ts
+++ b/types/react-icons/lib/fa/spinner.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpinner extends React.Component<IconBaseProps> { }
+declare class FaSpinner extends React.Component<IconBaseProps> { }
+export = FaSpinner;
diff --git a/types/react-icons/lib/fa/spoon.d.ts b/types/react-icons/lib/fa/spoon.d.ts
index 1112916912..e11b2b3df5 100644
--- a/types/react-icons/lib/fa/spoon.d.ts
+++ b/types/react-icons/lib/fa/spoon.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpoon extends React.Component<IconBaseProps> { }
+declare class FaSpoon extends React.Component<IconBaseProps> { }
+export = FaSpoon;
diff --git a/types/react-icons/lib/fa/spotify.d.ts b/types/react-icons/lib/fa/spotify.d.ts
index 94c862a866..1e643eaa82 100644
--- a/types/react-icons/lib/fa/spotify.d.ts
+++ b/types/react-icons/lib/fa/spotify.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpotify extends React.Component<IconBaseProps> { }
+declare class FaSpotify extends React.Component<IconBaseProps> { }
+export = FaSpotify;
diff --git a/types/react-icons/lib/fa/square-o.d.ts b/types/react-icons/lib/fa/square-o.d.ts
index 0d49bd6c23..2ec8731877 100644
--- a/types/react-icons/lib/fa/square-o.d.ts
+++ b/types/react-icons/lib/fa/square-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSquareO extends React.Component<IconBaseProps> { }
+declare class FaSquareO extends React.Component<IconBaseProps> { }
+export = FaSquareO;
diff --git a/types/react-icons/lib/fa/square.d.ts b/types/react-icons/lib/fa/square.d.ts
index d95485831d..c8c55b3742 100644
--- a/types/react-icons/lib/fa/square.d.ts
+++ b/types/react-icons/lib/fa/square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSquare extends React.Component<IconBaseProps> { }
+declare class FaSquare extends React.Component<IconBaseProps> { }
+export = FaSquare;
diff --git a/types/react-icons/lib/fa/stack-exchange.d.ts b/types/react-icons/lib/fa/stack-exchange.d.ts
index a1f2d0e265..9633c68c60 100644
--- a/types/react-icons/lib/fa/stack-exchange.d.ts
+++ b/types/react-icons/lib/fa/stack-exchange.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStackExchange extends React.Component<IconBaseProps> { }
+declare class FaStackExchange extends React.Component<IconBaseProps> { }
+export = FaStackExchange;
diff --git a/types/react-icons/lib/fa/stack-overflow.d.ts b/types/react-icons/lib/fa/stack-overflow.d.ts
index fd71beea7f..d2abb6200e 100644
--- a/types/react-icons/lib/fa/stack-overflow.d.ts
+++ b/types/react-icons/lib/fa/stack-overflow.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStackOverflow extends React.Component<IconBaseProps> { }
+declare class FaStackOverflow extends React.Component<IconBaseProps> { }
+export = FaStackOverflow;
diff --git a/types/react-icons/lib/fa/star-half-empty.d.ts b/types/react-icons/lib/fa/star-half-empty.d.ts
index 6e4b26ad53..6e43aa720b 100644
--- a/types/react-icons/lib/fa/star-half-empty.d.ts
+++ b/types/react-icons/lib/fa/star-half-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStarHalfEmpty extends React.Component<IconBaseProps> { }
+declare class FaStarHalfEmpty extends React.Component<IconBaseProps> { }
+export = FaStarHalfEmpty;
diff --git a/types/react-icons/lib/fa/star-half.d.ts b/types/react-icons/lib/fa/star-half.d.ts
index d373ba6a07..4bfe025587 100644
--- a/types/react-icons/lib/fa/star-half.d.ts
+++ b/types/react-icons/lib/fa/star-half.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStarHalf extends React.Component<IconBaseProps> { }
+declare class FaStarHalf extends React.Component<IconBaseProps> { }
+export = FaStarHalf;
diff --git a/types/react-icons/lib/fa/star-o.d.ts b/types/react-icons/lib/fa/star-o.d.ts
index cf950d4867..1b23442802 100644
--- a/types/react-icons/lib/fa/star-o.d.ts
+++ b/types/react-icons/lib/fa/star-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStarO extends React.Component<IconBaseProps> { }
+declare class FaStarO extends React.Component<IconBaseProps> { }
+export = FaStarO;
diff --git a/types/react-icons/lib/fa/star.d.ts b/types/react-icons/lib/fa/star.d.ts
index 3113155a96..a966cea689 100644
--- a/types/react-icons/lib/fa/star.d.ts
+++ b/types/react-icons/lib/fa/star.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStar extends React.Component<IconBaseProps> { }
+declare class FaStar extends React.Component<IconBaseProps> { }
+export = FaStar;
diff --git a/types/react-icons/lib/fa/steam-square.d.ts b/types/react-icons/lib/fa/steam-square.d.ts
index 3ac2c21b30..0beeef5491 100644
--- a/types/react-icons/lib/fa/steam-square.d.ts
+++ b/types/react-icons/lib/fa/steam-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSteamSquare extends React.Component<IconBaseProps> { }
+declare class FaSteamSquare extends React.Component<IconBaseProps> { }
+export = FaSteamSquare;
diff --git a/types/react-icons/lib/fa/steam.d.ts b/types/react-icons/lib/fa/steam.d.ts
index e1aa2f3313..deebcf4ba4 100644
--- a/types/react-icons/lib/fa/steam.d.ts
+++ b/types/react-icons/lib/fa/steam.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSteam extends React.Component<IconBaseProps> { }
+declare class FaSteam extends React.Component<IconBaseProps> { }
+export = FaSteam;
diff --git a/types/react-icons/lib/fa/step-backward.d.ts b/types/react-icons/lib/fa/step-backward.d.ts
index fe571ab271..c2fd350405 100644
--- a/types/react-icons/lib/fa/step-backward.d.ts
+++ b/types/react-icons/lib/fa/step-backward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStepBackward extends React.Component<IconBaseProps> { }
+declare class FaStepBackward extends React.Component<IconBaseProps> { }
+export = FaStepBackward;
diff --git a/types/react-icons/lib/fa/step-forward.d.ts b/types/react-icons/lib/fa/step-forward.d.ts
index b8b01f06a8..efc7eca537 100644
--- a/types/react-icons/lib/fa/step-forward.d.ts
+++ b/types/react-icons/lib/fa/step-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStepForward extends React.Component<IconBaseProps> { }
+declare class FaStepForward extends React.Component<IconBaseProps> { }
+export = FaStepForward;
diff --git a/types/react-icons/lib/fa/stethoscope.d.ts b/types/react-icons/lib/fa/stethoscope.d.ts
index 3f8cdcba2e..be5295c3f6 100644
--- a/types/react-icons/lib/fa/stethoscope.d.ts
+++ b/types/react-icons/lib/fa/stethoscope.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStethoscope extends React.Component<IconBaseProps> { }
+declare class FaStethoscope extends React.Component<IconBaseProps> { }
+export = FaStethoscope;
diff --git a/types/react-icons/lib/fa/sticky-note-o.d.ts b/types/react-icons/lib/fa/sticky-note-o.d.ts
index 5d54ced4ec..d3a5e10c9c 100644
--- a/types/react-icons/lib/fa/sticky-note-o.d.ts
+++ b/types/react-icons/lib/fa/sticky-note-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStickyNoteO extends React.Component<IconBaseProps> { }
+declare class FaStickyNoteO extends React.Component<IconBaseProps> { }
+export = FaStickyNoteO;
diff --git a/types/react-icons/lib/fa/sticky-note.d.ts b/types/react-icons/lib/fa/sticky-note.d.ts
index d30fedcdd7..6055d0e9a1 100644
--- a/types/react-icons/lib/fa/sticky-note.d.ts
+++ b/types/react-icons/lib/fa/sticky-note.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStickyNote extends React.Component<IconBaseProps> { }
+declare class FaStickyNote extends React.Component<IconBaseProps> { }
+export = FaStickyNote;
diff --git a/types/react-icons/lib/fa/stop-circle-o.d.ts b/types/react-icons/lib/fa/stop-circle-o.d.ts
index 244ffeb6cc..a8ef0eabdd 100644
--- a/types/react-icons/lib/fa/stop-circle-o.d.ts
+++ b/types/react-icons/lib/fa/stop-circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStopCircleO extends React.Component<IconBaseProps> { }
+declare class FaStopCircleO extends React.Component<IconBaseProps> { }
+export = FaStopCircleO;
diff --git a/types/react-icons/lib/fa/stop-circle.d.ts b/types/react-icons/lib/fa/stop-circle.d.ts
index ef7a92d310..20139906d9 100644
--- a/types/react-icons/lib/fa/stop-circle.d.ts
+++ b/types/react-icons/lib/fa/stop-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStopCircle extends React.Component<IconBaseProps> { }
+declare class FaStopCircle extends React.Component<IconBaseProps> { }
+export = FaStopCircle;
diff --git a/types/react-icons/lib/fa/stop.d.ts b/types/react-icons/lib/fa/stop.d.ts
index fd4356c3df..1b249e5195 100644
--- a/types/react-icons/lib/fa/stop.d.ts
+++ b/types/react-icons/lib/fa/stop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStop extends React.Component<IconBaseProps> { }
+declare class FaStop extends React.Component<IconBaseProps> { }
+export = FaStop;
diff --git a/types/react-icons/lib/fa/street-view.d.ts b/types/react-icons/lib/fa/street-view.d.ts
index d989035bde..18e5bae2b5 100644
--- a/types/react-icons/lib/fa/street-view.d.ts
+++ b/types/react-icons/lib/fa/street-view.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStreetView extends React.Component<IconBaseProps> { }
+declare class FaStreetView extends React.Component<IconBaseProps> { }
+export = FaStreetView;
diff --git a/types/react-icons/lib/fa/strikethrough.d.ts b/types/react-icons/lib/fa/strikethrough.d.ts
index f472c0fd77..46f2e36143 100644
--- a/types/react-icons/lib/fa/strikethrough.d.ts
+++ b/types/react-icons/lib/fa/strikethrough.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStrikethrough extends React.Component<IconBaseProps> { }
+declare class FaStrikethrough extends React.Component<IconBaseProps> { }
+export = FaStrikethrough;
diff --git a/types/react-icons/lib/fa/stumbleupon-circle.d.ts b/types/react-icons/lib/fa/stumbleupon-circle.d.ts
index ecc4d2122e..67cdbea5cc 100644
--- a/types/react-icons/lib/fa/stumbleupon-circle.d.ts
+++ b/types/react-icons/lib/fa/stumbleupon-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStumbleuponCircle extends React.Component<IconBaseProps> { }
+declare class FaStumbleuponCircle extends React.Component<IconBaseProps> { }
+export = FaStumbleuponCircle;
diff --git a/types/react-icons/lib/fa/stumbleupon.d.ts b/types/react-icons/lib/fa/stumbleupon.d.ts
index 64185df0f3..9585240ca8 100644
--- a/types/react-icons/lib/fa/stumbleupon.d.ts
+++ b/types/react-icons/lib/fa/stumbleupon.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStumbleupon extends React.Component<IconBaseProps> { }
+declare class FaStumbleupon extends React.Component<IconBaseProps> { }
+export = FaStumbleupon;
diff --git a/types/react-icons/lib/fa/subscript.d.ts b/types/react-icons/lib/fa/subscript.d.ts
index ac03fe6b89..a6c021ed1b 100644
--- a/types/react-icons/lib/fa/subscript.d.ts
+++ b/types/react-icons/lib/fa/subscript.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSubscript extends React.Component<IconBaseProps> { }
+declare class FaSubscript extends React.Component<IconBaseProps> { }
+export = FaSubscript;
diff --git a/types/react-icons/lib/fa/subway.d.ts b/types/react-icons/lib/fa/subway.d.ts
index ce4b09edbf..2be51ef087 100644
--- a/types/react-icons/lib/fa/subway.d.ts
+++ b/types/react-icons/lib/fa/subway.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSubway extends React.Component<IconBaseProps> { }
+declare class FaSubway extends React.Component<IconBaseProps> { }
+export = FaSubway;
diff --git a/types/react-icons/lib/fa/suitcase.d.ts b/types/react-icons/lib/fa/suitcase.d.ts
index 0bf3807780..bbf2b116f8 100644
--- a/types/react-icons/lib/fa/suitcase.d.ts
+++ b/types/react-icons/lib/fa/suitcase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSuitcase extends React.Component<IconBaseProps> { }
+declare class FaSuitcase extends React.Component<IconBaseProps> { }
+export = FaSuitcase;
diff --git a/types/react-icons/lib/fa/sun-o.d.ts b/types/react-icons/lib/fa/sun-o.d.ts
index 3ac6bfbdd3..1699728fa0 100644
--- a/types/react-icons/lib/fa/sun-o.d.ts
+++ b/types/react-icons/lib/fa/sun-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSunO extends React.Component<IconBaseProps> { }
+declare class FaSunO extends React.Component<IconBaseProps> { }
+export = FaSunO;
diff --git a/types/react-icons/lib/fa/superscript.d.ts b/types/react-icons/lib/fa/superscript.d.ts
index 07a901912e..5bce0a3419 100644
--- a/types/react-icons/lib/fa/superscript.d.ts
+++ b/types/react-icons/lib/fa/superscript.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSuperscript extends React.Component<IconBaseProps> { }
+declare class FaSuperscript extends React.Component<IconBaseProps> { }
+export = FaSuperscript;
diff --git a/types/react-icons/lib/fa/table.d.ts b/types/react-icons/lib/fa/table.d.ts
index a8ff4e9bf5..28afb1a308 100644
--- a/types/react-icons/lib/fa/table.d.ts
+++ b/types/react-icons/lib/fa/table.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTable extends React.Component<IconBaseProps> { }
+declare class FaTable extends React.Component<IconBaseProps> { }
+export = FaTable;
diff --git a/types/react-icons/lib/fa/tablet.d.ts b/types/react-icons/lib/fa/tablet.d.ts
index 37ea453d17..5d06494d0f 100644
--- a/types/react-icons/lib/fa/tablet.d.ts
+++ b/types/react-icons/lib/fa/tablet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTablet extends React.Component<IconBaseProps> { }
+declare class FaTablet extends React.Component<IconBaseProps> { }
+export = FaTablet;
diff --git a/types/react-icons/lib/fa/tag.d.ts b/types/react-icons/lib/fa/tag.d.ts
index 247756142e..62793c87bd 100644
--- a/types/react-icons/lib/fa/tag.d.ts
+++ b/types/react-icons/lib/fa/tag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTag extends React.Component<IconBaseProps> { }
+declare class FaTag extends React.Component<IconBaseProps> { }
+export = FaTag;
diff --git a/types/react-icons/lib/fa/tags.d.ts b/types/react-icons/lib/fa/tags.d.ts
index 3518af839a..acf244ad23 100644
--- a/types/react-icons/lib/fa/tags.d.ts
+++ b/types/react-icons/lib/fa/tags.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTags extends React.Component<IconBaseProps> { }
+declare class FaTags extends React.Component<IconBaseProps> { }
+export = FaTags;
diff --git a/types/react-icons/lib/fa/tasks.d.ts b/types/react-icons/lib/fa/tasks.d.ts
index f0b59f374e..8b789168d7 100644
--- a/types/react-icons/lib/fa/tasks.d.ts
+++ b/types/react-icons/lib/fa/tasks.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTasks extends React.Component<IconBaseProps> { }
+declare class FaTasks extends React.Component<IconBaseProps> { }
+export = FaTasks;
diff --git a/types/react-icons/lib/fa/television.d.ts b/types/react-icons/lib/fa/television.d.ts
index 88b8693a6a..46612f202e 100644
--- a/types/react-icons/lib/fa/television.d.ts
+++ b/types/react-icons/lib/fa/television.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTelevision extends React.Component<IconBaseProps> { }
+declare class FaTelevision extends React.Component<IconBaseProps> { }
+export = FaTelevision;
diff --git a/types/react-icons/lib/fa/tencent-weibo.d.ts b/types/react-icons/lib/fa/tencent-weibo.d.ts
index ce9a04848c..294778fdf7 100644
--- a/types/react-icons/lib/fa/tencent-weibo.d.ts
+++ b/types/react-icons/lib/fa/tencent-weibo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTencentWeibo extends React.Component<IconBaseProps> { }
+declare class FaTencentWeibo extends React.Component<IconBaseProps> { }
+export = FaTencentWeibo;
diff --git a/types/react-icons/lib/fa/terminal.d.ts b/types/react-icons/lib/fa/terminal.d.ts
index 75daa58c87..3dd4de7d08 100644
--- a/types/react-icons/lib/fa/terminal.d.ts
+++ b/types/react-icons/lib/fa/terminal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTerminal extends React.Component<IconBaseProps> { }
+declare class FaTerminal extends React.Component<IconBaseProps> { }
+export = FaTerminal;
diff --git a/types/react-icons/lib/fa/text-height.d.ts b/types/react-icons/lib/fa/text-height.d.ts
index 69271e359f..ec3593b58c 100644
--- a/types/react-icons/lib/fa/text-height.d.ts
+++ b/types/react-icons/lib/fa/text-height.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTextHeight extends React.Component<IconBaseProps> { }
+declare class FaTextHeight extends React.Component<IconBaseProps> { }
+export = FaTextHeight;
diff --git a/types/react-icons/lib/fa/text-width.d.ts b/types/react-icons/lib/fa/text-width.d.ts
index 820357df60..7bd6e24937 100644
--- a/types/react-icons/lib/fa/text-width.d.ts
+++ b/types/react-icons/lib/fa/text-width.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTextWidth extends React.Component<IconBaseProps> { }
+declare class FaTextWidth extends React.Component<IconBaseProps> { }
+export = FaTextWidth;
diff --git a/types/react-icons/lib/fa/th-large.d.ts b/types/react-icons/lib/fa/th-large.d.ts
index f059da9990..bb2e218190 100644
--- a/types/react-icons/lib/fa/th-large.d.ts
+++ b/types/react-icons/lib/fa/th-large.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThLarge extends React.Component<IconBaseProps> { }
+declare class FaThLarge extends React.Component<IconBaseProps> { }
+export = FaThLarge;
diff --git a/types/react-icons/lib/fa/th-list.d.ts b/types/react-icons/lib/fa/th-list.d.ts
index 09ef167885..1fad0c7ba2 100644
--- a/types/react-icons/lib/fa/th-list.d.ts
+++ b/types/react-icons/lib/fa/th-list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThList extends React.Component<IconBaseProps> { }
+declare class FaThList extends React.Component<IconBaseProps> { }
+export = FaThList;
diff --git a/types/react-icons/lib/fa/th.d.ts b/types/react-icons/lib/fa/th.d.ts
index 9d6674b5d3..f9694f9e41 100644
--- a/types/react-icons/lib/fa/th.d.ts
+++ b/types/react-icons/lib/fa/th.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTh extends React.Component<IconBaseProps> { }
+declare class FaTh extends React.Component<IconBaseProps> { }
+export = FaTh;
diff --git a/types/react-icons/lib/fa/thumb-tack.d.ts b/types/react-icons/lib/fa/thumb-tack.d.ts
index b84e262f77..6b89d609ea 100644
--- a/types/react-icons/lib/fa/thumb-tack.d.ts
+++ b/types/react-icons/lib/fa/thumb-tack.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbTack extends React.Component<IconBaseProps> { }
+declare class FaThumbTack extends React.Component<IconBaseProps> { }
+export = FaThumbTack;
diff --git a/types/react-icons/lib/fa/thumbs-down.d.ts b/types/react-icons/lib/fa/thumbs-down.d.ts
index c684e7ad5c..8aebed82ca 100644
--- a/types/react-icons/lib/fa/thumbs-down.d.ts
+++ b/types/react-icons/lib/fa/thumbs-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsDown extends React.Component<IconBaseProps> { }
+declare class FaThumbsDown extends React.Component<IconBaseProps> { }
+export = FaThumbsDown;
diff --git a/types/react-icons/lib/fa/thumbs-o-down.d.ts b/types/react-icons/lib/fa/thumbs-o-down.d.ts
index 0c9f640d18..734b175192 100644
--- a/types/react-icons/lib/fa/thumbs-o-down.d.ts
+++ b/types/react-icons/lib/fa/thumbs-o-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsODown extends React.Component<IconBaseProps> { }
+declare class FaThumbsODown extends React.Component<IconBaseProps> { }
+export = FaThumbsODown;
diff --git a/types/react-icons/lib/fa/thumbs-o-up.d.ts b/types/react-icons/lib/fa/thumbs-o-up.d.ts
index 9d5a487ae1..f01dc5e4c7 100644
--- a/types/react-icons/lib/fa/thumbs-o-up.d.ts
+++ b/types/react-icons/lib/fa/thumbs-o-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsOUp extends React.Component<IconBaseProps> { }
+declare class FaThumbsOUp extends React.Component<IconBaseProps> { }
+export = FaThumbsOUp;
diff --git a/types/react-icons/lib/fa/thumbs-up.d.ts b/types/react-icons/lib/fa/thumbs-up.d.ts
index 84348d3ac2..0ffa122424 100644
--- a/types/react-icons/lib/fa/thumbs-up.d.ts
+++ b/types/react-icons/lib/fa/thumbs-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsUp extends React.Component<IconBaseProps> { }
+declare class FaThumbsUp extends React.Component<IconBaseProps> { }
+export = FaThumbsUp;
diff --git a/types/react-icons/lib/fa/ticket.d.ts b/types/react-icons/lib/fa/ticket.d.ts
index 275a38e4dd..897c6bdd5b 100644
--- a/types/react-icons/lib/fa/ticket.d.ts
+++ b/types/react-icons/lib/fa/ticket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTicket extends React.Component<IconBaseProps> { }
+declare class FaTicket extends React.Component<IconBaseProps> { }
+export = FaTicket;
diff --git a/types/react-icons/lib/fa/times-circle-o.d.ts b/types/react-icons/lib/fa/times-circle-o.d.ts
index 5a96466de6..66cf92eb25 100644
--- a/types/react-icons/lib/fa/times-circle-o.d.ts
+++ b/types/react-icons/lib/fa/times-circle-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTimesCircleO extends React.Component<IconBaseProps> { }
+declare class FaTimesCircleO extends React.Component<IconBaseProps> { }
+export = FaTimesCircleO;
diff --git a/types/react-icons/lib/fa/times-circle.d.ts b/types/react-icons/lib/fa/times-circle.d.ts
index d73596cfb8..6a278a7af7 100644
--- a/types/react-icons/lib/fa/times-circle.d.ts
+++ b/types/react-icons/lib/fa/times-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTimesCircle extends React.Component<IconBaseProps> { }
+declare class FaTimesCircle extends React.Component<IconBaseProps> { }
+export = FaTimesCircle;
diff --git a/types/react-icons/lib/fa/tint.d.ts b/types/react-icons/lib/fa/tint.d.ts
index b4155f948c..0c072a94d0 100644
--- a/types/react-icons/lib/fa/tint.d.ts
+++ b/types/react-icons/lib/fa/tint.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTint extends React.Component<IconBaseProps> { }
+declare class FaTint extends React.Component<IconBaseProps> { }
+export = FaTint;
diff --git a/types/react-icons/lib/fa/toggle-off.d.ts b/types/react-icons/lib/fa/toggle-off.d.ts
index e4bd987307..f40e8262b0 100644
--- a/types/react-icons/lib/fa/toggle-off.d.ts
+++ b/types/react-icons/lib/fa/toggle-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaToggleOff extends React.Component<IconBaseProps> { }
+declare class FaToggleOff extends React.Component<IconBaseProps> { }
+export = FaToggleOff;
diff --git a/types/react-icons/lib/fa/toggle-on.d.ts b/types/react-icons/lib/fa/toggle-on.d.ts
index 69324fdd13..facfa825d0 100644
--- a/types/react-icons/lib/fa/toggle-on.d.ts
+++ b/types/react-icons/lib/fa/toggle-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaToggleOn extends React.Component<IconBaseProps> { }
+declare class FaToggleOn extends React.Component<IconBaseProps> { }
+export = FaToggleOn;
diff --git a/types/react-icons/lib/fa/trademark.d.ts b/types/react-icons/lib/fa/trademark.d.ts
index c8ddb8dbf6..19f3053e1b 100644
--- a/types/react-icons/lib/fa/trademark.d.ts
+++ b/types/react-icons/lib/fa/trademark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrademark extends React.Component<IconBaseProps> { }
+declare class FaTrademark extends React.Component<IconBaseProps> { }
+export = FaTrademark;
diff --git a/types/react-icons/lib/fa/train.d.ts b/types/react-icons/lib/fa/train.d.ts
index a686d3a677..d6220f152e 100644
--- a/types/react-icons/lib/fa/train.d.ts
+++ b/types/react-icons/lib/fa/train.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrain extends React.Component<IconBaseProps> { }
+declare class FaTrain extends React.Component<IconBaseProps> { }
+export = FaTrain;
diff --git a/types/react-icons/lib/fa/transgender-alt.d.ts b/types/react-icons/lib/fa/transgender-alt.d.ts
index 0794285d19..9908511cfa 100644
--- a/types/react-icons/lib/fa/transgender-alt.d.ts
+++ b/types/react-icons/lib/fa/transgender-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTransgenderAlt extends React.Component<IconBaseProps> { }
+declare class FaTransgenderAlt extends React.Component<IconBaseProps> { }
+export = FaTransgenderAlt;
diff --git a/types/react-icons/lib/fa/trash-o.d.ts b/types/react-icons/lib/fa/trash-o.d.ts
index c76a07e3f8..c4feb2f96e 100644
--- a/types/react-icons/lib/fa/trash-o.d.ts
+++ b/types/react-icons/lib/fa/trash-o.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrashO extends React.Component<IconBaseProps> { }
+declare class FaTrashO extends React.Component<IconBaseProps> { }
+export = FaTrashO;
diff --git a/types/react-icons/lib/fa/trash.d.ts b/types/react-icons/lib/fa/trash.d.ts
index f2f4ce4117..81360b601d 100644
--- a/types/react-icons/lib/fa/trash.d.ts
+++ b/types/react-icons/lib/fa/trash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrash extends React.Component<IconBaseProps> { }
+declare class FaTrash extends React.Component<IconBaseProps> { }
+export = FaTrash;
diff --git a/types/react-icons/lib/fa/tree.d.ts b/types/react-icons/lib/fa/tree.d.ts
index 7b94f9f52e..60ef0e51dd 100644
--- a/types/react-icons/lib/fa/tree.d.ts
+++ b/types/react-icons/lib/fa/tree.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTree extends React.Component<IconBaseProps> { }
+declare class FaTree extends React.Component<IconBaseProps> { }
+export = FaTree;
diff --git a/types/react-icons/lib/fa/trello.d.ts b/types/react-icons/lib/fa/trello.d.ts
index a231c272aa..8cdf39ce46 100644
--- a/types/react-icons/lib/fa/trello.d.ts
+++ b/types/react-icons/lib/fa/trello.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrello extends React.Component<IconBaseProps> { }
+declare class FaTrello extends React.Component<IconBaseProps> { }
+export = FaTrello;
diff --git a/types/react-icons/lib/fa/tripadvisor.d.ts b/types/react-icons/lib/fa/tripadvisor.d.ts
index 95ad22d7eb..2d3787a549 100644
--- a/types/react-icons/lib/fa/tripadvisor.d.ts
+++ b/types/react-icons/lib/fa/tripadvisor.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTripadvisor extends React.Component<IconBaseProps> { }
+declare class FaTripadvisor extends React.Component<IconBaseProps> { }
+export = FaTripadvisor;
diff --git a/types/react-icons/lib/fa/trophy.d.ts b/types/react-icons/lib/fa/trophy.d.ts
index 48f48edec1..24833b8bdc 100644
--- a/types/react-icons/lib/fa/trophy.d.ts
+++ b/types/react-icons/lib/fa/trophy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrophy extends React.Component<IconBaseProps> { }
+declare class FaTrophy extends React.Component<IconBaseProps> { }
+export = FaTrophy;
diff --git a/types/react-icons/lib/fa/truck.d.ts b/types/react-icons/lib/fa/truck.d.ts
index 00bc370441..a2e0768d49 100644
--- a/types/react-icons/lib/fa/truck.d.ts
+++ b/types/react-icons/lib/fa/truck.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTruck extends React.Component<IconBaseProps> { }
+declare class FaTruck extends React.Component<IconBaseProps> { }
+export = FaTruck;
diff --git a/types/react-icons/lib/fa/try.d.ts b/types/react-icons/lib/fa/try.d.ts
index fa4492d24b..1af849b3d9 100644
--- a/types/react-icons/lib/fa/try.d.ts
+++ b/types/react-icons/lib/fa/try.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTry extends React.Component<IconBaseProps> { }
+declare class FaTry extends React.Component<IconBaseProps> { }
+export = FaTry;
diff --git a/types/react-icons/lib/fa/tty.d.ts b/types/react-icons/lib/fa/tty.d.ts
index 76ec94f74e..ff3436e8ef 100644
--- a/types/react-icons/lib/fa/tty.d.ts
+++ b/types/react-icons/lib/fa/tty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTty extends React.Component<IconBaseProps> { }
+declare class FaTty extends React.Component<IconBaseProps> { }
+export = FaTty;
diff --git a/types/react-icons/lib/fa/tumblr-square.d.ts b/types/react-icons/lib/fa/tumblr-square.d.ts
index 2bf15bf460..a83b269822 100644
--- a/types/react-icons/lib/fa/tumblr-square.d.ts
+++ b/types/react-icons/lib/fa/tumblr-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTumblrSquare extends React.Component<IconBaseProps> { }
+declare class FaTumblrSquare extends React.Component<IconBaseProps> { }
+export = FaTumblrSquare;
diff --git a/types/react-icons/lib/fa/tumblr.d.ts b/types/react-icons/lib/fa/tumblr.d.ts
index c60ae76806..57c62ede41 100644
--- a/types/react-icons/lib/fa/tumblr.d.ts
+++ b/types/react-icons/lib/fa/tumblr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTumblr extends React.Component<IconBaseProps> { }
+declare class FaTumblr extends React.Component<IconBaseProps> { }
+export = FaTumblr;
diff --git a/types/react-icons/lib/fa/twitch.d.ts b/types/react-icons/lib/fa/twitch.d.ts
index 3e46ebac6c..7bb9fb61f2 100644
--- a/types/react-icons/lib/fa/twitch.d.ts
+++ b/types/react-icons/lib/fa/twitch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitch extends React.Component<IconBaseProps> { }
+declare class FaTwitch extends React.Component<IconBaseProps> { }
+export = FaTwitch;
diff --git a/types/react-icons/lib/fa/twitter-square.d.ts b/types/react-icons/lib/fa/twitter-square.d.ts
index fb77d182e6..3d1eea2b7a 100644
--- a/types/react-icons/lib/fa/twitter-square.d.ts
+++ b/types/react-icons/lib/fa/twitter-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitterSquare extends React.Component<IconBaseProps> { }
+declare class FaTwitterSquare extends React.Component<IconBaseProps> { }
+export = FaTwitterSquare;
diff --git a/types/react-icons/lib/fa/twitter.d.ts b/types/react-icons/lib/fa/twitter.d.ts
index e3d5259918..99d6f50e59 100644
--- a/types/react-icons/lib/fa/twitter.d.ts
+++ b/types/react-icons/lib/fa/twitter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitter extends React.Component<IconBaseProps> { }
+declare class FaTwitter extends React.Component<IconBaseProps> { }
+export = FaTwitter;
diff --git a/types/react-icons/lib/fa/umbrella.d.ts b/types/react-icons/lib/fa/umbrella.d.ts
index 74fefd9404..9f693678b6 100644
--- a/types/react-icons/lib/fa/umbrella.d.ts
+++ b/types/react-icons/lib/fa/umbrella.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUmbrella extends React.Component<IconBaseProps> { }
+declare class FaUmbrella extends React.Component<IconBaseProps> { }
+export = FaUmbrella;
diff --git a/types/react-icons/lib/fa/underline.d.ts b/types/react-icons/lib/fa/underline.d.ts
index af907eba18..9ed692f7ee 100644
--- a/types/react-icons/lib/fa/underline.d.ts
+++ b/types/react-icons/lib/fa/underline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUnderline extends React.Component<IconBaseProps> { }
+declare class FaUnderline extends React.Component<IconBaseProps> { }
+export = FaUnderline;
diff --git a/types/react-icons/lib/fa/universal-access.d.ts b/types/react-icons/lib/fa/universal-access.d.ts
index a02ba6c3be..5faf0a08df 100644
--- a/types/react-icons/lib/fa/universal-access.d.ts
+++ b/types/react-icons/lib/fa/universal-access.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUniversalAccess extends React.Component<IconBaseProps> { }
+declare class FaUniversalAccess extends React.Component<IconBaseProps> { }
+export = FaUniversalAccess;
diff --git a/types/react-icons/lib/fa/unlock-alt.d.ts b/types/react-icons/lib/fa/unlock-alt.d.ts
index 9d84986727..a611a062ec 100644
--- a/types/react-icons/lib/fa/unlock-alt.d.ts
+++ b/types/react-icons/lib/fa/unlock-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUnlockAlt extends React.Component<IconBaseProps> { }
+declare class FaUnlockAlt extends React.Component<IconBaseProps> { }
+export = FaUnlockAlt;
diff --git a/types/react-icons/lib/fa/unlock.d.ts b/types/react-icons/lib/fa/unlock.d.ts
index 5b1979f0cd..c1ecdfe0b4 100644
--- a/types/react-icons/lib/fa/unlock.d.ts
+++ b/types/react-icons/lib/fa/unlock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUnlock extends React.Component<IconBaseProps> { }
+declare class FaUnlock extends React.Component<IconBaseProps> { }
+export = FaUnlock;
diff --git a/types/react-icons/lib/fa/upload.d.ts b/types/react-icons/lib/fa/upload.d.ts
index 566ab8a65d..56b379f32c 100644
--- a/types/react-icons/lib/fa/upload.d.ts
+++ b/types/react-icons/lib/fa/upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUpload extends React.Component<IconBaseProps> { }
+declare class FaUpload extends React.Component<IconBaseProps> { }
+export = FaUpload;
diff --git a/types/react-icons/lib/fa/usb.d.ts b/types/react-icons/lib/fa/usb.d.ts
index 6ca16d94e8..dcf434b5e3 100644
--- a/types/react-icons/lib/fa/usb.d.ts
+++ b/types/react-icons/lib/fa/usb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUsb extends React.Component<IconBaseProps> { }
+declare class FaUsb extends React.Component<IconBaseProps> { }
+export = FaUsb;
diff --git a/types/react-icons/lib/fa/user-md.d.ts b/types/react-icons/lib/fa/user-md.d.ts
index 0d6f2d9781..4250285358 100644
--- a/types/react-icons/lib/fa/user-md.d.ts
+++ b/types/react-icons/lib/fa/user-md.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserMd extends React.Component<IconBaseProps> { }
+declare class FaUserMd extends React.Component<IconBaseProps> { }
+export = FaUserMd;
diff --git a/types/react-icons/lib/fa/user-plus.d.ts b/types/react-icons/lib/fa/user-plus.d.ts
index 659b2ecb13..90fc8b99da 100644
--- a/types/react-icons/lib/fa/user-plus.d.ts
+++ b/types/react-icons/lib/fa/user-plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserPlus extends React.Component<IconBaseProps> { }
+declare class FaUserPlus extends React.Component<IconBaseProps> { }
+export = FaUserPlus;
diff --git a/types/react-icons/lib/fa/user-secret.d.ts b/types/react-icons/lib/fa/user-secret.d.ts
index 43bf4e4ac3..154cf32bf3 100644
--- a/types/react-icons/lib/fa/user-secret.d.ts
+++ b/types/react-icons/lib/fa/user-secret.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserSecret extends React.Component<IconBaseProps> { }
+declare class FaUserSecret extends React.Component<IconBaseProps> { }
+export = FaUserSecret;
diff --git a/types/react-icons/lib/fa/user-times.d.ts b/types/react-icons/lib/fa/user-times.d.ts
index d235fd5463..c317fd3c0f 100644
--- a/types/react-icons/lib/fa/user-times.d.ts
+++ b/types/react-icons/lib/fa/user-times.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserTimes extends React.Component<IconBaseProps> { }
+declare class FaUserTimes extends React.Component<IconBaseProps> { }
+export = FaUserTimes;
diff --git a/types/react-icons/lib/fa/user.d.ts b/types/react-icons/lib/fa/user.d.ts
index cf7b5ac689..9267b99851 100644
--- a/types/react-icons/lib/fa/user.d.ts
+++ b/types/react-icons/lib/fa/user.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUser extends React.Component<IconBaseProps> { }
+declare class FaUser extends React.Component<IconBaseProps> { }
+export = FaUser;
diff --git a/types/react-icons/lib/fa/venus-double.d.ts b/types/react-icons/lib/fa/venus-double.d.ts
index 5a3602b516..303aa8e94f 100644
--- a/types/react-icons/lib/fa/venus-double.d.ts
+++ b/types/react-icons/lib/fa/venus-double.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVenusDouble extends React.Component<IconBaseProps> { }
+declare class FaVenusDouble extends React.Component<IconBaseProps> { }
+export = FaVenusDouble;
diff --git a/types/react-icons/lib/fa/venus-mars.d.ts b/types/react-icons/lib/fa/venus-mars.d.ts
index 70d7448d7e..528d6fb07d 100644
--- a/types/react-icons/lib/fa/venus-mars.d.ts
+++ b/types/react-icons/lib/fa/venus-mars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVenusMars extends React.Component<IconBaseProps> { }
+declare class FaVenusMars extends React.Component<IconBaseProps> { }
+export = FaVenusMars;
diff --git a/types/react-icons/lib/fa/venus.d.ts b/types/react-icons/lib/fa/venus.d.ts
index e80ab6053c..a36a82d280 100644
--- a/types/react-icons/lib/fa/venus.d.ts
+++ b/types/react-icons/lib/fa/venus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVenus extends React.Component<IconBaseProps> { }
+declare class FaVenus extends React.Component<IconBaseProps> { }
+export = FaVenus;
diff --git a/types/react-icons/lib/fa/viacoin.d.ts b/types/react-icons/lib/fa/viacoin.d.ts
index c9f1bef6f3..aef66b99c0 100644
--- a/types/react-icons/lib/fa/viacoin.d.ts
+++ b/types/react-icons/lib/fa/viacoin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaViacoin extends React.Component<IconBaseProps> { }
+declare class FaViacoin extends React.Component<IconBaseProps> { }
+export = FaViacoin;
diff --git a/types/react-icons/lib/fa/viadeo-square.d.ts b/types/react-icons/lib/fa/viadeo-square.d.ts
index 7f10d8302f..1e48563584 100644
--- a/types/react-icons/lib/fa/viadeo-square.d.ts
+++ b/types/react-icons/lib/fa/viadeo-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaViadeoSquare extends React.Component<IconBaseProps> { }
+declare class FaViadeoSquare extends React.Component<IconBaseProps> { }
+export = FaViadeoSquare;
diff --git a/types/react-icons/lib/fa/viadeo.d.ts b/types/react-icons/lib/fa/viadeo.d.ts
index 551545f5cc..dd10eb198e 100644
--- a/types/react-icons/lib/fa/viadeo.d.ts
+++ b/types/react-icons/lib/fa/viadeo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaViadeo extends React.Component<IconBaseProps> { }
+declare class FaViadeo extends React.Component<IconBaseProps> { }
+export = FaViadeo;
diff --git a/types/react-icons/lib/fa/video-camera.d.ts b/types/react-icons/lib/fa/video-camera.d.ts
index f3cf036582..48830c332c 100644
--- a/types/react-icons/lib/fa/video-camera.d.ts
+++ b/types/react-icons/lib/fa/video-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVideoCamera extends React.Component<IconBaseProps> { }
+declare class FaVideoCamera extends React.Component<IconBaseProps> { }
+export = FaVideoCamera;
diff --git a/types/react-icons/lib/fa/vimeo-square.d.ts b/types/react-icons/lib/fa/vimeo-square.d.ts
index 9b0357e7ca..c9d881981d 100644
--- a/types/react-icons/lib/fa/vimeo-square.d.ts
+++ b/types/react-icons/lib/fa/vimeo-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVimeoSquare extends React.Component<IconBaseProps> { }
+declare class FaVimeoSquare extends React.Component<IconBaseProps> { }
+export = FaVimeoSquare;
diff --git a/types/react-icons/lib/fa/vimeo.d.ts b/types/react-icons/lib/fa/vimeo.d.ts
index 7331ef98e8..a4928a0abc 100644
--- a/types/react-icons/lib/fa/vimeo.d.ts
+++ b/types/react-icons/lib/fa/vimeo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVimeo extends React.Component<IconBaseProps> { }
+declare class FaVimeo extends React.Component<IconBaseProps> { }
+export = FaVimeo;
diff --git a/types/react-icons/lib/fa/vine.d.ts b/types/react-icons/lib/fa/vine.d.ts
index b329619d15..b99a2d39e8 100644
--- a/types/react-icons/lib/fa/vine.d.ts
+++ b/types/react-icons/lib/fa/vine.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVine extends React.Component<IconBaseProps> { }
+declare class FaVine extends React.Component<IconBaseProps> { }
+export = FaVine;
diff --git a/types/react-icons/lib/fa/vk.d.ts b/types/react-icons/lib/fa/vk.d.ts
index 07b3cdb5a9..7851cdc69d 100644
--- a/types/react-icons/lib/fa/vk.d.ts
+++ b/types/react-icons/lib/fa/vk.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVk extends React.Component<IconBaseProps> { }
+declare class FaVk extends React.Component<IconBaseProps> { }
+export = FaVk;
diff --git a/types/react-icons/lib/fa/volume-control-phone.d.ts b/types/react-icons/lib/fa/volume-control-phone.d.ts
index 5212a54d80..6d23707c00 100644
--- a/types/react-icons/lib/fa/volume-control-phone.d.ts
+++ b/types/react-icons/lib/fa/volume-control-phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeControlPhone extends React.Component<IconBaseProps> { }
+declare class FaVolumeControlPhone extends React.Component<IconBaseProps> { }
+export = FaVolumeControlPhone;
diff --git a/types/react-icons/lib/fa/volume-down.d.ts b/types/react-icons/lib/fa/volume-down.d.ts
index 31c63f8901..7ccbf7d5f2 100644
--- a/types/react-icons/lib/fa/volume-down.d.ts
+++ b/types/react-icons/lib/fa/volume-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeDown extends React.Component<IconBaseProps> { }
+declare class FaVolumeDown extends React.Component<IconBaseProps> { }
+export = FaVolumeDown;
diff --git a/types/react-icons/lib/fa/volume-off.d.ts b/types/react-icons/lib/fa/volume-off.d.ts
index c0e0d7605e..e51c9049b9 100644
--- a/types/react-icons/lib/fa/volume-off.d.ts
+++ b/types/react-icons/lib/fa/volume-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeOff extends React.Component<IconBaseProps> { }
+declare class FaVolumeOff extends React.Component<IconBaseProps> { }
+export = FaVolumeOff;
diff --git a/types/react-icons/lib/fa/volume-up.d.ts b/types/react-icons/lib/fa/volume-up.d.ts
index 957cdc648b..645bb02c6e 100644
--- a/types/react-icons/lib/fa/volume-up.d.ts
+++ b/types/react-icons/lib/fa/volume-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeUp extends React.Component<IconBaseProps> { }
+declare class FaVolumeUp extends React.Component<IconBaseProps> { }
+export = FaVolumeUp;
diff --git a/types/react-icons/lib/fa/wechat.d.ts b/types/react-icons/lib/fa/wechat.d.ts
index 35b902956e..717b59bcac 100644
--- a/types/react-icons/lib/fa/wechat.d.ts
+++ b/types/react-icons/lib/fa/wechat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWechat extends React.Component<IconBaseProps> { }
+declare class FaWechat extends React.Component<IconBaseProps> { }
+export = FaWechat;
diff --git a/types/react-icons/lib/fa/weibo.d.ts b/types/react-icons/lib/fa/weibo.d.ts
index afbebd68a5..3025097a79 100644
--- a/types/react-icons/lib/fa/weibo.d.ts
+++ b/types/react-icons/lib/fa/weibo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWeibo extends React.Component<IconBaseProps> { }
+declare class FaWeibo extends React.Component<IconBaseProps> { }
+export = FaWeibo;
diff --git a/types/react-icons/lib/fa/whatsapp.d.ts b/types/react-icons/lib/fa/whatsapp.d.ts
index d4491b527e..0e6bda62ea 100644
--- a/types/react-icons/lib/fa/whatsapp.d.ts
+++ b/types/react-icons/lib/fa/whatsapp.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWhatsapp extends React.Component<IconBaseProps> { }
+declare class FaWhatsapp extends React.Component<IconBaseProps> { }
+export = FaWhatsapp;
diff --git a/types/react-icons/lib/fa/wheelchair-alt.d.ts b/types/react-icons/lib/fa/wheelchair-alt.d.ts
index beb76b7b56..dc1abda0b6 100644
--- a/types/react-icons/lib/fa/wheelchair-alt.d.ts
+++ b/types/react-icons/lib/fa/wheelchair-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWheelchairAlt extends React.Component<IconBaseProps> { }
+declare class FaWheelchairAlt extends React.Component<IconBaseProps> { }
+export = FaWheelchairAlt;
diff --git a/types/react-icons/lib/fa/wheelchair.d.ts b/types/react-icons/lib/fa/wheelchair.d.ts
index b93d14b52d..ddbb4b4ac3 100644
--- a/types/react-icons/lib/fa/wheelchair.d.ts
+++ b/types/react-icons/lib/fa/wheelchair.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWheelchair extends React.Component<IconBaseProps> { }
+declare class FaWheelchair extends React.Component<IconBaseProps> { }
+export = FaWheelchair;
diff --git a/types/react-icons/lib/fa/wifi.d.ts b/types/react-icons/lib/fa/wifi.d.ts
index 001d3cfc85..588ada2e51 100644
--- a/types/react-icons/lib/fa/wifi.d.ts
+++ b/types/react-icons/lib/fa/wifi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWifi extends React.Component<IconBaseProps> { }
+declare class FaWifi extends React.Component<IconBaseProps> { }
+export = FaWifi;
diff --git a/types/react-icons/lib/fa/wikipedia-w.d.ts b/types/react-icons/lib/fa/wikipedia-w.d.ts
index 279a74f1af..6403e0d3d5 100644
--- a/types/react-icons/lib/fa/wikipedia-w.d.ts
+++ b/types/react-icons/lib/fa/wikipedia-w.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWikipediaW extends React.Component<IconBaseProps> { }
+declare class FaWikipediaW extends React.Component<IconBaseProps> { }
+export = FaWikipediaW;
diff --git a/types/react-icons/lib/fa/windows.d.ts b/types/react-icons/lib/fa/windows.d.ts
index 7e201a440e..7f753ad855 100644
--- a/types/react-icons/lib/fa/windows.d.ts
+++ b/types/react-icons/lib/fa/windows.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWindows extends React.Component<IconBaseProps> { }
+declare class FaWindows extends React.Component<IconBaseProps> { }
+export = FaWindows;
diff --git a/types/react-icons/lib/fa/wordpress.d.ts b/types/react-icons/lib/fa/wordpress.d.ts
index 6419cd1638..8233d1d08c 100644
--- a/types/react-icons/lib/fa/wordpress.d.ts
+++ b/types/react-icons/lib/fa/wordpress.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWordpress extends React.Component<IconBaseProps> { }
+declare class FaWordpress extends React.Component<IconBaseProps> { }
+export = FaWordpress;
diff --git a/types/react-icons/lib/fa/wpbeginner.d.ts b/types/react-icons/lib/fa/wpbeginner.d.ts
index cccbdae9db..153271dd71 100644
--- a/types/react-icons/lib/fa/wpbeginner.d.ts
+++ b/types/react-icons/lib/fa/wpbeginner.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWpbeginner extends React.Component<IconBaseProps> { }
+declare class FaWpbeginner extends React.Component<IconBaseProps> { }
+export = FaWpbeginner;
diff --git a/types/react-icons/lib/fa/wpforms.d.ts b/types/react-icons/lib/fa/wpforms.d.ts
index 1ec4e76460..a832827f4f 100644
--- a/types/react-icons/lib/fa/wpforms.d.ts
+++ b/types/react-icons/lib/fa/wpforms.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWpforms extends React.Component<IconBaseProps> { }
+declare class FaWpforms extends React.Component<IconBaseProps> { }
+export = FaWpforms;
diff --git a/types/react-icons/lib/fa/wrench.d.ts b/types/react-icons/lib/fa/wrench.d.ts
index 0264b8d26b..8e0c85b7d1 100644
--- a/types/react-icons/lib/fa/wrench.d.ts
+++ b/types/react-icons/lib/fa/wrench.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWrench extends React.Component<IconBaseProps> { }
+declare class FaWrench extends React.Component<IconBaseProps> { }
+export = FaWrench;
diff --git a/types/react-icons/lib/fa/xing-square.d.ts b/types/react-icons/lib/fa/xing-square.d.ts
index 5f462112ea..91b9a2c908 100644
--- a/types/react-icons/lib/fa/xing-square.d.ts
+++ b/types/react-icons/lib/fa/xing-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaXingSquare extends React.Component<IconBaseProps> { }
+declare class FaXingSquare extends React.Component<IconBaseProps> { }
+export = FaXingSquare;
diff --git a/types/react-icons/lib/fa/xing.d.ts b/types/react-icons/lib/fa/xing.d.ts
index 1974b8c345..a01172d7fe 100644
--- a/types/react-icons/lib/fa/xing.d.ts
+++ b/types/react-icons/lib/fa/xing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaXing extends React.Component<IconBaseProps> { }
+declare class FaXing extends React.Component<IconBaseProps> { }
+export = FaXing;
diff --git a/types/react-icons/lib/fa/y-combinator.d.ts b/types/react-icons/lib/fa/y-combinator.d.ts
index 00fbccab76..f1df30eaa6 100644
--- a/types/react-icons/lib/fa/y-combinator.d.ts
+++ b/types/react-icons/lib/fa/y-combinator.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYCombinator extends React.Component<IconBaseProps> { }
+declare class FaYCombinator extends React.Component<IconBaseProps> { }
+export = FaYCombinator;
diff --git a/types/react-icons/lib/fa/yahoo.d.ts b/types/react-icons/lib/fa/yahoo.d.ts
index 20c14e5e13..9012569101 100644
--- a/types/react-icons/lib/fa/yahoo.d.ts
+++ b/types/react-icons/lib/fa/yahoo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYahoo extends React.Component<IconBaseProps> { }
+declare class FaYahoo extends React.Component<IconBaseProps> { }
+export = FaYahoo;
diff --git a/types/react-icons/lib/fa/yelp.d.ts b/types/react-icons/lib/fa/yelp.d.ts
index 72ade5360d..d0f6add472 100644
--- a/types/react-icons/lib/fa/yelp.d.ts
+++ b/types/react-icons/lib/fa/yelp.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYelp extends React.Component<IconBaseProps> { }
+declare class FaYelp extends React.Component<IconBaseProps> { }
+export = FaYelp;
diff --git a/types/react-icons/lib/fa/youtube-play.d.ts b/types/react-icons/lib/fa/youtube-play.d.ts
index f1829960cf..91a5d66658 100644
--- a/types/react-icons/lib/fa/youtube-play.d.ts
+++ b/types/react-icons/lib/fa/youtube-play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutubePlay extends React.Component<IconBaseProps> { }
+declare class FaYoutubePlay extends React.Component<IconBaseProps> { }
+export = FaYoutubePlay;
diff --git a/types/react-icons/lib/fa/youtube-square.d.ts b/types/react-icons/lib/fa/youtube-square.d.ts
index c0ccac4e45..81ad16b87c 100644
--- a/types/react-icons/lib/fa/youtube-square.d.ts
+++ b/types/react-icons/lib/fa/youtube-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutubeSquare extends React.Component<IconBaseProps> { }
+declare class FaYoutubeSquare extends React.Component<IconBaseProps> { }
+export = FaYoutubeSquare;
diff --git a/types/react-icons/lib/fa/youtube.d.ts b/types/react-icons/lib/fa/youtube.d.ts
index 7aee8011f5..0c683aea91 100644
--- a/types/react-icons/lib/fa/youtube.d.ts
+++ b/types/react-icons/lib/fa/youtube.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutube extends React.Component<IconBaseProps> { }
+declare class FaYoutube extends React.Component<IconBaseProps> { }
+export = FaYoutube;
diff --git a/types/react-icons/lib/go/alert.d.ts b/types/react-icons/lib/go/alert.d.ts
index 7380b75f13..8aef8e961b 100644
--- a/types/react-icons/lib/go/alert.d.ts
+++ b/types/react-icons/lib/go/alert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlert extends React.Component<IconBaseProps> { }
+declare class GoAlert extends React.Component<IconBaseProps> { }
+export = GoAlert;
diff --git a/types/react-icons/lib/go/alignment-align.d.ts b/types/react-icons/lib/go/alignment-align.d.ts
index b0279982e2..43132f6c6a 100644
--- a/types/react-icons/lib/go/alignment-align.d.ts
+++ b/types/react-icons/lib/go/alignment-align.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentAlign extends React.Component<IconBaseProps> { }
+declare class GoAlignmentAlign extends React.Component<IconBaseProps> { }
+export = GoAlignmentAlign;
diff --git a/types/react-icons/lib/go/alignment-aligned-to.d.ts b/types/react-icons/lib/go/alignment-aligned-to.d.ts
index 4d42f9aff5..9aad06232d 100644
--- a/types/react-icons/lib/go/alignment-aligned-to.d.ts
+++ b/types/react-icons/lib/go/alignment-aligned-to.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentAlignedTo extends React.Component<IconBaseProps> { }
+declare class GoAlignmentAlignedTo extends React.Component<IconBaseProps> { }
+export = GoAlignmentAlignedTo;
diff --git a/types/react-icons/lib/go/alignment-unalign.d.ts b/types/react-icons/lib/go/alignment-unalign.d.ts
index fcc4e84501..76e3d0701b 100644
--- a/types/react-icons/lib/go/alignment-unalign.d.ts
+++ b/types/react-icons/lib/go/alignment-unalign.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentUnalign extends React.Component<IconBaseProps> { }
+declare class GoAlignmentUnalign extends React.Component<IconBaseProps> { }
+export = GoAlignmentUnalign;
diff --git a/types/react-icons/lib/go/arrow-down.d.ts b/types/react-icons/lib/go/arrow-down.d.ts
index 88395ee5f4..065d81a32c 100644
--- a/types/react-icons/lib/go/arrow-down.d.ts
+++ b/types/react-icons/lib/go/arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowDown extends React.Component<IconBaseProps> { }
+declare class GoArrowDown extends React.Component<IconBaseProps> { }
+export = GoArrowDown;
diff --git a/types/react-icons/lib/go/arrow-left.d.ts b/types/react-icons/lib/go/arrow-left.d.ts
index 4bbebb5f65..341cada9b5 100644
--- a/types/react-icons/lib/go/arrow-left.d.ts
+++ b/types/react-icons/lib/go/arrow-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowLeft extends React.Component<IconBaseProps> { }
+declare class GoArrowLeft extends React.Component<IconBaseProps> { }
+export = GoArrowLeft;
diff --git a/types/react-icons/lib/go/arrow-right.d.ts b/types/react-icons/lib/go/arrow-right.d.ts
index 484a4f9317..f3329ea8f5 100644
--- a/types/react-icons/lib/go/arrow-right.d.ts
+++ b/types/react-icons/lib/go/arrow-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowRight extends React.Component<IconBaseProps> { }
+declare class GoArrowRight extends React.Component<IconBaseProps> { }
+export = GoArrowRight;
diff --git a/types/react-icons/lib/go/arrow-small-down.d.ts b/types/react-icons/lib/go/arrow-small-down.d.ts
index d4aa907034..764e8a0445 100644
--- a/types/react-icons/lib/go/arrow-small-down.d.ts
+++ b/types/react-icons/lib/go/arrow-small-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallDown extends React.Component<IconBaseProps> { }
+declare class GoArrowSmallDown extends React.Component<IconBaseProps> { }
+export = GoArrowSmallDown;
diff --git a/types/react-icons/lib/go/arrow-small-left.d.ts b/types/react-icons/lib/go/arrow-small-left.d.ts
index a3700b5837..2df8a30523 100644
--- a/types/react-icons/lib/go/arrow-small-left.d.ts
+++ b/types/react-icons/lib/go/arrow-small-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallLeft extends React.Component<IconBaseProps> { }
+declare class GoArrowSmallLeft extends React.Component<IconBaseProps> { }
+export = GoArrowSmallLeft;
diff --git a/types/react-icons/lib/go/arrow-small-right.d.ts b/types/react-icons/lib/go/arrow-small-right.d.ts
index 0ada4d71ee..5d8ff51263 100644
--- a/types/react-icons/lib/go/arrow-small-right.d.ts
+++ b/types/react-icons/lib/go/arrow-small-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallRight extends React.Component<IconBaseProps> { }
+declare class GoArrowSmallRight extends React.Component<IconBaseProps> { }
+export = GoArrowSmallRight;
diff --git a/types/react-icons/lib/go/arrow-small-up.d.ts b/types/react-icons/lib/go/arrow-small-up.d.ts
index 2bd6cdb4f3..cdcf14f8b5 100644
--- a/types/react-icons/lib/go/arrow-small-up.d.ts
+++ b/types/react-icons/lib/go/arrow-small-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallUp extends React.Component<IconBaseProps> { }
+declare class GoArrowSmallUp extends React.Component<IconBaseProps> { }
+export = GoArrowSmallUp;
diff --git a/types/react-icons/lib/go/arrow-up.d.ts b/types/react-icons/lib/go/arrow-up.d.ts
index 67a6866297..7fc9d7b6f7 100644
--- a/types/react-icons/lib/go/arrow-up.d.ts
+++ b/types/react-icons/lib/go/arrow-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowUp extends React.Component<IconBaseProps> { }
+declare class GoArrowUp extends React.Component<IconBaseProps> { }
+export = GoArrowUp;
diff --git a/types/react-icons/lib/go/beer.d.ts b/types/react-icons/lib/go/beer.d.ts
index 71baf9a3ac..1bd6a0bcea 100644
--- a/types/react-icons/lib/go/beer.d.ts
+++ b/types/react-icons/lib/go/beer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBeer extends React.Component<IconBaseProps> { }
+declare class GoBeer extends React.Component<IconBaseProps> { }
+export = GoBeer;
diff --git a/types/react-icons/lib/go/book.d.ts b/types/react-icons/lib/go/book.d.ts
index cd181328b6..51a7772680 100644
--- a/types/react-icons/lib/go/book.d.ts
+++ b/types/react-icons/lib/go/book.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBook extends React.Component<IconBaseProps> { }
+declare class GoBook extends React.Component<IconBaseProps> { }
+export = GoBook;
diff --git a/types/react-icons/lib/go/bookmark.d.ts b/types/react-icons/lib/go/bookmark.d.ts
index d3b156181f..8fa0cd40fa 100644
--- a/types/react-icons/lib/go/bookmark.d.ts
+++ b/types/react-icons/lib/go/bookmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBookmark extends React.Component<IconBaseProps> { }
+declare class GoBookmark extends React.Component<IconBaseProps> { }
+export = GoBookmark;
diff --git a/types/react-icons/lib/go/briefcase.d.ts b/types/react-icons/lib/go/briefcase.d.ts
index 984092ba9b..3079133875 100644
--- a/types/react-icons/lib/go/briefcase.d.ts
+++ b/types/react-icons/lib/go/briefcase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBriefcase extends React.Component<IconBaseProps> { }
+declare class GoBriefcase extends React.Component<IconBaseProps> { }
+export = GoBriefcase;
diff --git a/types/react-icons/lib/go/broadcast.d.ts b/types/react-icons/lib/go/broadcast.d.ts
index 6c40834a02..084c84f78c 100644
--- a/types/react-icons/lib/go/broadcast.d.ts
+++ b/types/react-icons/lib/go/broadcast.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBroadcast extends React.Component<IconBaseProps> { }
+declare class GoBroadcast extends React.Component<IconBaseProps> { }
+export = GoBroadcast;
diff --git a/types/react-icons/lib/go/browser.d.ts b/types/react-icons/lib/go/browser.d.ts
index c268f36ec0..beca5e62c5 100644
--- a/types/react-icons/lib/go/browser.d.ts
+++ b/types/react-icons/lib/go/browser.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBrowser extends React.Component<IconBaseProps> { }
+declare class GoBrowser extends React.Component<IconBaseProps> { }
+export = GoBrowser;
diff --git a/types/react-icons/lib/go/bug.d.ts b/types/react-icons/lib/go/bug.d.ts
index 8159ff886d..22adaa0d16 100644
--- a/types/react-icons/lib/go/bug.d.ts
+++ b/types/react-icons/lib/go/bug.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBug extends React.Component<IconBaseProps> { }
+declare class GoBug extends React.Component<IconBaseProps> { }
+export = GoBug;
diff --git a/types/react-icons/lib/go/calendar.d.ts b/types/react-icons/lib/go/calendar.d.ts
index 5c52a2bf67..120a146e51 100644
--- a/types/react-icons/lib/go/calendar.d.ts
+++ b/types/react-icons/lib/go/calendar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCalendar extends React.Component<IconBaseProps> { }
+declare class GoCalendar extends React.Component<IconBaseProps> { }
+export = GoCalendar;
diff --git a/types/react-icons/lib/go/check.d.ts b/types/react-icons/lib/go/check.d.ts
index f1f9c1536b..9222f5e01c 100644
--- a/types/react-icons/lib/go/check.d.ts
+++ b/types/react-icons/lib/go/check.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCheck extends React.Component<IconBaseProps> { }
+declare class GoCheck extends React.Component<IconBaseProps> { }
+export = GoCheck;
diff --git a/types/react-icons/lib/go/checklist.d.ts b/types/react-icons/lib/go/checklist.d.ts
index e1bfc3a76e..f94396328b 100644
--- a/types/react-icons/lib/go/checklist.d.ts
+++ b/types/react-icons/lib/go/checklist.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChecklist extends React.Component<IconBaseProps> { }
+declare class GoChecklist extends React.Component<IconBaseProps> { }
+export = GoChecklist;
diff --git a/types/react-icons/lib/go/chevron-down.d.ts b/types/react-icons/lib/go/chevron-down.d.ts
index 4879ed7129..8e2e05efc0 100644
--- a/types/react-icons/lib/go/chevron-down.d.ts
+++ b/types/react-icons/lib/go/chevron-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronDown extends React.Component<IconBaseProps> { }
+declare class GoChevronDown extends React.Component<IconBaseProps> { }
+export = GoChevronDown;
diff --git a/types/react-icons/lib/go/chevron-left.d.ts b/types/react-icons/lib/go/chevron-left.d.ts
index 36a6c0f96a..2d35c85701 100644
--- a/types/react-icons/lib/go/chevron-left.d.ts
+++ b/types/react-icons/lib/go/chevron-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronLeft extends React.Component<IconBaseProps> { }
+declare class GoChevronLeft extends React.Component<IconBaseProps> { }
+export = GoChevronLeft;
diff --git a/types/react-icons/lib/go/chevron-right.d.ts b/types/react-icons/lib/go/chevron-right.d.ts
index 55e19d951a..785db2e7df 100644
--- a/types/react-icons/lib/go/chevron-right.d.ts
+++ b/types/react-icons/lib/go/chevron-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronRight extends React.Component<IconBaseProps> { }
+declare class GoChevronRight extends React.Component<IconBaseProps> { }
+export = GoChevronRight;
diff --git a/types/react-icons/lib/go/chevron-up.d.ts b/types/react-icons/lib/go/chevron-up.d.ts
index 2eba9e55c4..3e2a2fba3f 100644
--- a/types/react-icons/lib/go/chevron-up.d.ts
+++ b/types/react-icons/lib/go/chevron-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronUp extends React.Component<IconBaseProps> { }
+declare class GoChevronUp extends React.Component<IconBaseProps> { }
+export = GoChevronUp;
diff --git a/types/react-icons/lib/go/circle-slash.d.ts b/types/react-icons/lib/go/circle-slash.d.ts
index 4400a217f6..f600dddd01 100644
--- a/types/react-icons/lib/go/circle-slash.d.ts
+++ b/types/react-icons/lib/go/circle-slash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCircleSlash extends React.Component<IconBaseProps> { }
+declare class GoCircleSlash extends React.Component<IconBaseProps> { }
+export = GoCircleSlash;
diff --git a/types/react-icons/lib/go/circuit-board.d.ts b/types/react-icons/lib/go/circuit-board.d.ts
index 396c2dc8e8..ca480fbb1e 100644
--- a/types/react-icons/lib/go/circuit-board.d.ts
+++ b/types/react-icons/lib/go/circuit-board.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCircuitBoard extends React.Component<IconBaseProps> { }
+declare class GoCircuitBoard extends React.Component<IconBaseProps> { }
+export = GoCircuitBoard;
diff --git a/types/react-icons/lib/go/clippy.d.ts b/types/react-icons/lib/go/clippy.d.ts
index 3483e7754e..56be220e23 100644
--- a/types/react-icons/lib/go/clippy.d.ts
+++ b/types/react-icons/lib/go/clippy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoClippy extends React.Component<IconBaseProps> { }
+declare class GoClippy extends React.Component<IconBaseProps> { }
+export = GoClippy;
diff --git a/types/react-icons/lib/go/clock.d.ts b/types/react-icons/lib/go/clock.d.ts
index 3cac2ddd8a..a17c01626d 100644
--- a/types/react-icons/lib/go/clock.d.ts
+++ b/types/react-icons/lib/go/clock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoClock extends React.Component<IconBaseProps> { }
+declare class GoClock extends React.Component<IconBaseProps> { }
+export = GoClock;
diff --git a/types/react-icons/lib/go/cloud-download.d.ts b/types/react-icons/lib/go/cloud-download.d.ts
index a04b70acac..d494af7071 100644
--- a/types/react-icons/lib/go/cloud-download.d.ts
+++ b/types/react-icons/lib/go/cloud-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCloudDownload extends React.Component<IconBaseProps> { }
+declare class GoCloudDownload extends React.Component<IconBaseProps> { }
+export = GoCloudDownload;
diff --git a/types/react-icons/lib/go/cloud-upload.d.ts b/types/react-icons/lib/go/cloud-upload.d.ts
index 07ac4f6286..8d0ea325a5 100644
--- a/types/react-icons/lib/go/cloud-upload.d.ts
+++ b/types/react-icons/lib/go/cloud-upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCloudUpload extends React.Component<IconBaseProps> { }
+declare class GoCloudUpload extends React.Component<IconBaseProps> { }
+export = GoCloudUpload;
diff --git a/types/react-icons/lib/go/code.d.ts b/types/react-icons/lib/go/code.d.ts
index 7bbb2b7348..38a49e3638 100644
--- a/types/react-icons/lib/go/code.d.ts
+++ b/types/react-icons/lib/go/code.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCode extends React.Component<IconBaseProps> { }
+declare class GoCode extends React.Component<IconBaseProps> { }
+export = GoCode;
diff --git a/types/react-icons/lib/go/color-mode.d.ts b/types/react-icons/lib/go/color-mode.d.ts
index f047381423..c5e8ef618b 100644
--- a/types/react-icons/lib/go/color-mode.d.ts
+++ b/types/react-icons/lib/go/color-mode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoColorMode extends React.Component<IconBaseProps> { }
+declare class GoColorMode extends React.Component<IconBaseProps> { }
+export = GoColorMode;
diff --git a/types/react-icons/lib/go/comment-discussion.d.ts b/types/react-icons/lib/go/comment-discussion.d.ts
index 62be81f952..ef8f85bade 100644
--- a/types/react-icons/lib/go/comment-discussion.d.ts
+++ b/types/react-icons/lib/go/comment-discussion.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCommentDiscussion extends React.Component<IconBaseProps> { }
+declare class GoCommentDiscussion extends React.Component<IconBaseProps> { }
+export = GoCommentDiscussion;
diff --git a/types/react-icons/lib/go/comment.d.ts b/types/react-icons/lib/go/comment.d.ts
index 2e14daa806..2560216eed 100644
--- a/types/react-icons/lib/go/comment.d.ts
+++ b/types/react-icons/lib/go/comment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoComment extends React.Component<IconBaseProps> { }
+declare class GoComment extends React.Component<IconBaseProps> { }
+export = GoComment;
diff --git a/types/react-icons/lib/go/credit-card.d.ts b/types/react-icons/lib/go/credit-card.d.ts
index d7dbb4127c..c312d533de 100644
--- a/types/react-icons/lib/go/credit-card.d.ts
+++ b/types/react-icons/lib/go/credit-card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCreditCard extends React.Component<IconBaseProps> { }
+declare class GoCreditCard extends React.Component<IconBaseProps> { }
+export = GoCreditCard;
diff --git a/types/react-icons/lib/go/dash.d.ts b/types/react-icons/lib/go/dash.d.ts
index c7c6ca094f..f80213934e 100644
--- a/types/react-icons/lib/go/dash.d.ts
+++ b/types/react-icons/lib/go/dash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDash extends React.Component<IconBaseProps> { }
+declare class GoDash extends React.Component<IconBaseProps> { }
+export = GoDash;
diff --git a/types/react-icons/lib/go/dashboard.d.ts b/types/react-icons/lib/go/dashboard.d.ts
index ab328f0213..d1eae63855 100644
--- a/types/react-icons/lib/go/dashboard.d.ts
+++ b/types/react-icons/lib/go/dashboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDashboard extends React.Component<IconBaseProps> { }
+declare class GoDashboard extends React.Component<IconBaseProps> { }
+export = GoDashboard;
diff --git a/types/react-icons/lib/go/database.d.ts b/types/react-icons/lib/go/database.d.ts
index 34758c332d..2a02e50ff8 100644
--- a/types/react-icons/lib/go/database.d.ts
+++ b/types/react-icons/lib/go/database.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDatabase extends React.Component<IconBaseProps> { }
+declare class GoDatabase extends React.Component<IconBaseProps> { }
+export = GoDatabase;
diff --git a/types/react-icons/lib/go/device-camera-video.d.ts b/types/react-icons/lib/go/device-camera-video.d.ts
index 9274c81fdd..a397108cd8 100644
--- a/types/react-icons/lib/go/device-camera-video.d.ts
+++ b/types/react-icons/lib/go/device-camera-video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceCameraVideo extends React.Component<IconBaseProps> { }
+declare class GoDeviceCameraVideo extends React.Component<IconBaseProps> { }
+export = GoDeviceCameraVideo;
diff --git a/types/react-icons/lib/go/device-camera.d.ts b/types/react-icons/lib/go/device-camera.d.ts
index 65a3f9aa8c..deffd102d3 100644
--- a/types/react-icons/lib/go/device-camera.d.ts
+++ b/types/react-icons/lib/go/device-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceCamera extends React.Component<IconBaseProps> { }
+declare class GoDeviceCamera extends React.Component<IconBaseProps> { }
+export = GoDeviceCamera;
diff --git a/types/react-icons/lib/go/device-desktop.d.ts b/types/react-icons/lib/go/device-desktop.d.ts
index 7c75dfe2f1..8f371a1599 100644
--- a/types/react-icons/lib/go/device-desktop.d.ts
+++ b/types/react-icons/lib/go/device-desktop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceDesktop extends React.Component<IconBaseProps> { }
+declare class GoDeviceDesktop extends React.Component<IconBaseProps> { }
+export = GoDeviceDesktop;
diff --git a/types/react-icons/lib/go/device-mobile.d.ts b/types/react-icons/lib/go/device-mobile.d.ts
index 046f63558d..8a83aea856 100644
--- a/types/react-icons/lib/go/device-mobile.d.ts
+++ b/types/react-icons/lib/go/device-mobile.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceMobile extends React.Component<IconBaseProps> { }
+declare class GoDeviceMobile extends React.Component<IconBaseProps> { }
+export = GoDeviceMobile;
diff --git a/types/react-icons/lib/go/diff-added.d.ts b/types/react-icons/lib/go/diff-added.d.ts
index bde41f0f53..3c6b5773af 100644
--- a/types/react-icons/lib/go/diff-added.d.ts
+++ b/types/react-icons/lib/go/diff-added.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffAdded extends React.Component<IconBaseProps> { }
+declare class GoDiffAdded extends React.Component<IconBaseProps> { }
+export = GoDiffAdded;
diff --git a/types/react-icons/lib/go/diff-ignored.d.ts b/types/react-icons/lib/go/diff-ignored.d.ts
index 2508e07fa9..a51e557b1f 100644
--- a/types/react-icons/lib/go/diff-ignored.d.ts
+++ b/types/react-icons/lib/go/diff-ignored.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffIgnored extends React.Component<IconBaseProps> { }
+declare class GoDiffIgnored extends React.Component<IconBaseProps> { }
+export = GoDiffIgnored;
diff --git a/types/react-icons/lib/go/diff-modified.d.ts b/types/react-icons/lib/go/diff-modified.d.ts
index af95e1337d..731b2479a0 100644
--- a/types/react-icons/lib/go/diff-modified.d.ts
+++ b/types/react-icons/lib/go/diff-modified.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffModified extends React.Component<IconBaseProps> { }
+declare class GoDiffModified extends React.Component<IconBaseProps> { }
+export = GoDiffModified;
diff --git a/types/react-icons/lib/go/diff-removed.d.ts b/types/react-icons/lib/go/diff-removed.d.ts
index 46b1e78387..87c2edc408 100644
--- a/types/react-icons/lib/go/diff-removed.d.ts
+++ b/types/react-icons/lib/go/diff-removed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffRemoved extends React.Component<IconBaseProps> { }
+declare class GoDiffRemoved extends React.Component<IconBaseProps> { }
+export = GoDiffRemoved;
diff --git a/types/react-icons/lib/go/diff-renamed.d.ts b/types/react-icons/lib/go/diff-renamed.d.ts
index c73850d52c..9681af78b4 100644
--- a/types/react-icons/lib/go/diff-renamed.d.ts
+++ b/types/react-icons/lib/go/diff-renamed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffRenamed extends React.Component<IconBaseProps> { }
+declare class GoDiffRenamed extends React.Component<IconBaseProps> { }
+export = GoDiffRenamed;
diff --git a/types/react-icons/lib/go/diff.d.ts b/types/react-icons/lib/go/diff.d.ts
index ebc0f14e2d..0198d4eea2 100644
--- a/types/react-icons/lib/go/diff.d.ts
+++ b/types/react-icons/lib/go/diff.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiff extends React.Component<IconBaseProps> { }
+declare class GoDiff extends React.Component<IconBaseProps> { }
+export = GoDiff;
diff --git a/types/react-icons/lib/go/ellipsis.d.ts b/types/react-icons/lib/go/ellipsis.d.ts
index b8a40f3e30..4723501dd1 100644
--- a/types/react-icons/lib/go/ellipsis.d.ts
+++ b/types/react-icons/lib/go/ellipsis.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoEllipsis extends React.Component<IconBaseProps> { }
+declare class GoEllipsis extends React.Component<IconBaseProps> { }
+export = GoEllipsis;
diff --git a/types/react-icons/lib/go/eye.d.ts b/types/react-icons/lib/go/eye.d.ts
index 91e5fe5385..7938360f17 100644
--- a/types/react-icons/lib/go/eye.d.ts
+++ b/types/react-icons/lib/go/eye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoEye extends React.Component<IconBaseProps> { }
+declare class GoEye extends React.Component<IconBaseProps> { }
+export = GoEye;
diff --git a/types/react-icons/lib/go/file-binary.d.ts b/types/react-icons/lib/go/file-binary.d.ts
index b5ab33f79a..52ac8d832f 100644
--- a/types/react-icons/lib/go/file-binary.d.ts
+++ b/types/react-icons/lib/go/file-binary.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileBinary extends React.Component<IconBaseProps> { }
+declare class GoFileBinary extends React.Component<IconBaseProps> { }
+export = GoFileBinary;
diff --git a/types/react-icons/lib/go/file-code.d.ts b/types/react-icons/lib/go/file-code.d.ts
index 297e89de52..e951dd2902 100644
--- a/types/react-icons/lib/go/file-code.d.ts
+++ b/types/react-icons/lib/go/file-code.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileCode extends React.Component<IconBaseProps> { }
+declare class GoFileCode extends React.Component<IconBaseProps> { }
+export = GoFileCode;
diff --git a/types/react-icons/lib/go/file-directory.d.ts b/types/react-icons/lib/go/file-directory.d.ts
index a64af8f137..209cff3957 100644
--- a/types/react-icons/lib/go/file-directory.d.ts
+++ b/types/react-icons/lib/go/file-directory.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileDirectory extends React.Component<IconBaseProps> { }
+declare class GoFileDirectory extends React.Component<IconBaseProps> { }
+export = GoFileDirectory;
diff --git a/types/react-icons/lib/go/file-media.d.ts b/types/react-icons/lib/go/file-media.d.ts
index 8cf5535220..d8e1153b32 100644
--- a/types/react-icons/lib/go/file-media.d.ts
+++ b/types/react-icons/lib/go/file-media.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileMedia extends React.Component<IconBaseProps> { }
+declare class GoFileMedia extends React.Component<IconBaseProps> { }
+export = GoFileMedia;
diff --git a/types/react-icons/lib/go/file-pdf.d.ts b/types/react-icons/lib/go/file-pdf.d.ts
index 43ae39d5a7..afedc960c7 100644
--- a/types/react-icons/lib/go/file-pdf.d.ts
+++ b/types/react-icons/lib/go/file-pdf.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFilePdf extends React.Component<IconBaseProps> { }
+declare class GoFilePdf extends React.Component<IconBaseProps> { }
+export = GoFilePdf;
diff --git a/types/react-icons/lib/go/file-submodule.d.ts b/types/react-icons/lib/go/file-submodule.d.ts
index 5a9499dbac..d043de364d 100644
--- a/types/react-icons/lib/go/file-submodule.d.ts
+++ b/types/react-icons/lib/go/file-submodule.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSubmodule extends React.Component<IconBaseProps> { }
+declare class GoFileSubmodule extends React.Component<IconBaseProps> { }
+export = GoFileSubmodule;
diff --git a/types/react-icons/lib/go/file-symlink-directory.d.ts b/types/react-icons/lib/go/file-symlink-directory.d.ts
index 5337059393..3065c11ecc 100644
--- a/types/react-icons/lib/go/file-symlink-directory.d.ts
+++ b/types/react-icons/lib/go/file-symlink-directory.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSymlinkDirectory extends React.Component<IconBaseProps> { }
+declare class GoFileSymlinkDirectory extends React.Component<IconBaseProps> { }
+export = GoFileSymlinkDirectory;
diff --git a/types/react-icons/lib/go/file-symlink-file.d.ts b/types/react-icons/lib/go/file-symlink-file.d.ts
index 0116f9d2f0..d3fefe9e42 100644
--- a/types/react-icons/lib/go/file-symlink-file.d.ts
+++ b/types/react-icons/lib/go/file-symlink-file.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSymlinkFile extends React.Component<IconBaseProps> { }
+declare class GoFileSymlinkFile extends React.Component<IconBaseProps> { }
+export = GoFileSymlinkFile;
diff --git a/types/react-icons/lib/go/file-text.d.ts b/types/react-icons/lib/go/file-text.d.ts
index 23b59dfcfd..c478a383b6 100644
--- a/types/react-icons/lib/go/file-text.d.ts
+++ b/types/react-icons/lib/go/file-text.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileText extends React.Component<IconBaseProps> { }
+declare class GoFileText extends React.Component<IconBaseProps> { }
+export = GoFileText;
diff --git a/types/react-icons/lib/go/file-zip.d.ts b/types/react-icons/lib/go/file-zip.d.ts
index e4f588b5db..c264cf3645 100644
--- a/types/react-icons/lib/go/file-zip.d.ts
+++ b/types/react-icons/lib/go/file-zip.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileZip extends React.Component<IconBaseProps> { }
+declare class GoFileZip extends React.Component<IconBaseProps> { }
+export = GoFileZip;
diff --git a/types/react-icons/lib/go/flame.d.ts b/types/react-icons/lib/go/flame.d.ts
index baa5aa3739..d4e3186919 100644
--- a/types/react-icons/lib/go/flame.d.ts
+++ b/types/react-icons/lib/go/flame.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFlame extends React.Component<IconBaseProps> { }
+declare class GoFlame extends React.Component<IconBaseProps> { }
+export = GoFlame;
diff --git a/types/react-icons/lib/go/fold.d.ts b/types/react-icons/lib/go/fold.d.ts
index 7ae869e942..4b3c9758e7 100644
--- a/types/react-icons/lib/go/fold.d.ts
+++ b/types/react-icons/lib/go/fold.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFold extends React.Component<IconBaseProps> { }
+declare class GoFold extends React.Component<IconBaseProps> { }
+export = GoFold;
diff --git a/types/react-icons/lib/go/gear.d.ts b/types/react-icons/lib/go/gear.d.ts
index 7fd837ffbc..6b6cdecc08 100644
--- a/types/react-icons/lib/go/gear.d.ts
+++ b/types/react-icons/lib/go/gear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGear extends React.Component<IconBaseProps> { }
+declare class GoGear extends React.Component<IconBaseProps> { }
+export = GoGear;
diff --git a/types/react-icons/lib/go/gift.d.ts b/types/react-icons/lib/go/gift.d.ts
index 98b9deb223..ff70fb3c03 100644
--- a/types/react-icons/lib/go/gift.d.ts
+++ b/types/react-icons/lib/go/gift.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGift extends React.Component<IconBaseProps> { }
+declare class GoGift extends React.Component<IconBaseProps> { }
+export = GoGift;
diff --git a/types/react-icons/lib/go/gist-secret.d.ts b/types/react-icons/lib/go/gist-secret.d.ts
index c69f135efd..6118caaefe 100644
--- a/types/react-icons/lib/go/gist-secret.d.ts
+++ b/types/react-icons/lib/go/gist-secret.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGistSecret extends React.Component<IconBaseProps> { }
+declare class GoGistSecret extends React.Component<IconBaseProps> { }
+export = GoGistSecret;
diff --git a/types/react-icons/lib/go/gist.d.ts b/types/react-icons/lib/go/gist.d.ts
index 8f1ff4e827..0575839e9c 100644
--- a/types/react-icons/lib/go/gist.d.ts
+++ b/types/react-icons/lib/go/gist.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGist extends React.Component<IconBaseProps> { }
+declare class GoGist extends React.Component<IconBaseProps> { }
+export = GoGist;
diff --git a/types/react-icons/lib/go/git-branch.d.ts b/types/react-icons/lib/go/git-branch.d.ts
index 52a90bd2a5..b6eea2dd39 100644
--- a/types/react-icons/lib/go/git-branch.d.ts
+++ b/types/react-icons/lib/go/git-branch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitBranch extends React.Component<IconBaseProps> { }
+declare class GoGitBranch extends React.Component<IconBaseProps> { }
+export = GoGitBranch;
diff --git a/types/react-icons/lib/go/git-commit.d.ts b/types/react-icons/lib/go/git-commit.d.ts
index a1ad866ee2..920abef608 100644
--- a/types/react-icons/lib/go/git-commit.d.ts
+++ b/types/react-icons/lib/go/git-commit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitCommit extends React.Component<IconBaseProps> { }
+declare class GoGitCommit extends React.Component<IconBaseProps> { }
+export = GoGitCommit;
diff --git a/types/react-icons/lib/go/git-compare.d.ts b/types/react-icons/lib/go/git-compare.d.ts
index 4336af1b22..a114d0e6ab 100644
--- a/types/react-icons/lib/go/git-compare.d.ts
+++ b/types/react-icons/lib/go/git-compare.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitCompare extends React.Component<IconBaseProps> { }
+declare class GoGitCompare extends React.Component<IconBaseProps> { }
+export = GoGitCompare;
diff --git a/types/react-icons/lib/go/git-merge.d.ts b/types/react-icons/lib/go/git-merge.d.ts
index f7d3457db7..0773f55a13 100644
--- a/types/react-icons/lib/go/git-merge.d.ts
+++ b/types/react-icons/lib/go/git-merge.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitMerge extends React.Component<IconBaseProps> { }
+declare class GoGitMerge extends React.Component<IconBaseProps> { }
+export = GoGitMerge;
diff --git a/types/react-icons/lib/go/git-pull-request.d.ts b/types/react-icons/lib/go/git-pull-request.d.ts
index 0c79ca8175..c956d9dff7 100644
--- a/types/react-icons/lib/go/git-pull-request.d.ts
+++ b/types/react-icons/lib/go/git-pull-request.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitPullRequest extends React.Component<IconBaseProps> { }
+declare class GoGitPullRequest extends React.Component<IconBaseProps> { }
+export = GoGitPullRequest;
diff --git a/types/react-icons/lib/go/globe.d.ts b/types/react-icons/lib/go/globe.d.ts
index b1893d7685..7f3ed7047a 100644
--- a/types/react-icons/lib/go/globe.d.ts
+++ b/types/react-icons/lib/go/globe.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGlobe extends React.Component<IconBaseProps> { }
+declare class GoGlobe extends React.Component<IconBaseProps> { }
+export = GoGlobe;
diff --git a/types/react-icons/lib/go/graph.d.ts b/types/react-icons/lib/go/graph.d.ts
index 8f1c24ba75..8b2f64778b 100644
--- a/types/react-icons/lib/go/graph.d.ts
+++ b/types/react-icons/lib/go/graph.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGraph extends React.Component<IconBaseProps> { }
+declare class GoGraph extends React.Component<IconBaseProps> { }
+export = GoGraph;
diff --git a/types/react-icons/lib/go/heart.d.ts b/types/react-icons/lib/go/heart.d.ts
index 8f56d447ef..8184dfc37d 100644
--- a/types/react-icons/lib/go/heart.d.ts
+++ b/types/react-icons/lib/go/heart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHeart extends React.Component<IconBaseProps> { }
+declare class GoHeart extends React.Component<IconBaseProps> { }
+export = GoHeart;
diff --git a/types/react-icons/lib/go/history.d.ts b/types/react-icons/lib/go/history.d.ts
index c91e923a69..e53a70ca2c 100644
--- a/types/react-icons/lib/go/history.d.ts
+++ b/types/react-icons/lib/go/history.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHistory extends React.Component<IconBaseProps> { }
+declare class GoHistory extends React.Component<IconBaseProps> { }
+export = GoHistory;
diff --git a/types/react-icons/lib/go/home.d.ts b/types/react-icons/lib/go/home.d.ts
index 97d032716f..a5141130b3 100644
--- a/types/react-icons/lib/go/home.d.ts
+++ b/types/react-icons/lib/go/home.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHome extends React.Component<IconBaseProps> { }
+declare class GoHome extends React.Component<IconBaseProps> { }
+export = GoHome;
diff --git a/types/react-icons/lib/go/horizontal-rule.d.ts b/types/react-icons/lib/go/horizontal-rule.d.ts
index 336e1f4eeb..543cf60a21 100644
--- a/types/react-icons/lib/go/horizontal-rule.d.ts
+++ b/types/react-icons/lib/go/horizontal-rule.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHorizontalRule extends React.Component<IconBaseProps> { }
+declare class GoHorizontalRule extends React.Component<IconBaseProps> { }
+export = GoHorizontalRule;
diff --git a/types/react-icons/lib/go/hourglass.d.ts b/types/react-icons/lib/go/hourglass.d.ts
index ad0fdf8563..e922565bbe 100644
--- a/types/react-icons/lib/go/hourglass.d.ts
+++ b/types/react-icons/lib/go/hourglass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHourglass extends React.Component<IconBaseProps> { }
+declare class GoHourglass extends React.Component<IconBaseProps> { }
+export = GoHourglass;
diff --git a/types/react-icons/lib/go/hubot.d.ts b/types/react-icons/lib/go/hubot.d.ts
index 984cc59a02..f465aa1993 100644
--- a/types/react-icons/lib/go/hubot.d.ts
+++ b/types/react-icons/lib/go/hubot.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHubot extends React.Component<IconBaseProps> { }
+declare class GoHubot extends React.Component<IconBaseProps> { }
+export = GoHubot;
diff --git a/types/react-icons/lib/go/inbox.d.ts b/types/react-icons/lib/go/inbox.d.ts
index fe75bf017e..5e8d3432c4 100644
--- a/types/react-icons/lib/go/inbox.d.ts
+++ b/types/react-icons/lib/go/inbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoInbox extends React.Component<IconBaseProps> { }
+declare class GoInbox extends React.Component<IconBaseProps> { }
+export = GoInbox;
diff --git a/types/react-icons/lib/go/index.d.ts b/types/react-icons/lib/go/index.d.ts
index 285be47453..8248b9cfc9 100644
--- a/types/react-icons/lib/go/index.d.ts
+++ b/types/react-icons/lib/go/index.d.ts
@@ -1,177 +1,177 @@
-export { default as GoAlert } from "./alert";
-export { default as GoAlignmentAlign } from "./alignment-align";
-export { default as GoAlignmentAlignedTo } from "./alignment-aligned-to";
-export { default as GoAlignmentUnalign } from "./alignment-unalign";
-export { default as GoArrowDown } from "./arrow-down";
-export { default as GoArrowLeft } from "./arrow-left";
-export { default as GoArrowRight } from "./arrow-right";
-export { default as GoArrowSmallDown } from "./arrow-small-down";
-export { default as GoArrowSmallLeft } from "./arrow-small-left";
-export { default as GoArrowSmallRight } from "./arrow-small-right";
-export { default as GoArrowSmallUp } from "./arrow-small-up";
-export { default as GoArrowUp } from "./arrow-up";
-export { default as GoBeer } from "./beer";
-export { default as GoBook } from "./book";
-export { default as GoBookmark } from "./bookmark";
-export { default as GoBriefcase } from "./briefcase";
-export { default as GoBroadcast } from "./broadcast";
-export { default as GoBrowser } from "./browser";
-export { default as GoBug } from "./bug";
-export { default as GoCalendar } from "./calendar";
-export { default as GoCheck } from "./check";
-export { default as GoChecklist } from "./checklist";
-export { default as GoChevronDown } from "./chevron-down";
-export { default as GoChevronLeft } from "./chevron-left";
-export { default as GoChevronRight } from "./chevron-right";
-export { default as GoChevronUp } from "./chevron-up";
-export { default as GoCircleSlash } from "./circle-slash";
-export { default as GoCircuitBoard } from "./circuit-board";
-export { default as GoClippy } from "./clippy";
-export { default as GoClock } from "./clock";
-export { default as GoCloudDownload } from "./cloud-download";
-export { default as GoCloudUpload } from "./cloud-upload";
-export { default as GoCode } from "./code";
-export { default as GoColorMode } from "./color-mode";
-export { default as GoCommentDiscussion } from "./comment-discussion";
-export { default as GoComment } from "./comment";
-export { default as GoCreditCard } from "./credit-card";
-export { default as GoDash } from "./dash";
-export { default as GoDashboard } from "./dashboard";
-export { default as GoDatabase } from "./database";
-export { default as GoDeviceCameraVideo } from "./device-camera-video";
-export { default as GoDeviceCamera } from "./device-camera";
-export { default as GoDeviceDesktop } from "./device-desktop";
-export { default as GoDeviceMobile } from "./device-mobile";
-export { default as GoDiffAdded } from "./diff-added";
-export { default as GoDiffIgnored } from "./diff-ignored";
-export { default as GoDiffModified } from "./diff-modified";
-export { default as GoDiffRemoved } from "./diff-removed";
-export { default as GoDiffRenamed } from "./diff-renamed";
-export { default as GoDiff } from "./diff";
-export { default as GoEllipsis } from "./ellipsis";
-export { default as GoEye } from "./eye";
-export { default as GoFileBinary } from "./file-binary";
-export { default as GoFileCode } from "./file-code";
-export { default as GoFileDirectory } from "./file-directory";
-export { default as GoFileMedia } from "./file-media";
-export { default as GoFilePdf } from "./file-pdf";
-export { default as GoFileSubmodule } from "./file-submodule";
-export { default as GoFileSymlinkDirectory } from "./file-symlink-directory";
-export { default as GoFileSymlinkFile } from "./file-symlink-file";
-export { default as GoFileText } from "./file-text";
-export { default as GoFileZip } from "./file-zip";
-export { default as GoFlame } from "./flame";
-export { default as GoFold } from "./fold";
-export { default as GoGear } from "./gear";
-export { default as GoGift } from "./gift";
-export { default as GoGistSecret } from "./gist-secret";
-export { default as GoGist } from "./gist";
-export { default as GoGitBranch } from "./git-branch";
-export { default as GoGitCommit } from "./git-commit";
-export { default as GoGitCompare } from "./git-compare";
-export { default as GoGitMerge } from "./git-merge";
-export { default as GoGitPullRequest } from "./git-pull-request";
-export { default as GoGlobe } from "./globe";
-export { default as GoGraph } from "./graph";
-export { default as GoHeart } from "./heart";
-export { default as GoHistory } from "./history";
-export { default as GoHome } from "./home";
-export { default as GoHorizontalRule } from "./horizontal-rule";
-export { default as GoHourglass } from "./hourglass";
-export { default as GoHubot } from "./hubot";
-export { default as GoInbox } from "./inbox";
-export { default as GoInfo } from "./info";
-export { default as GoIssueClosed } from "./issue-closed";
-export { default as GoIssueOpened } from "./issue-opened";
-export { default as GoIssueReopened } from "./issue-reopened";
-export { default as GoJersey } from "./jersey";
-export { default as GoJumpDown } from "./jump-down";
-export { default as GoJumpLeft } from "./jump-left";
-export { default as GoJumpRight } from "./jump-right";
-export { default as GoJumpUp } from "./jump-up";
-export { default as GoKey } from "./key";
-export { default as GoKeyboard } from "./keyboard";
-export { default as GoLaw } from "./law";
-export { default as GoLightBulb } from "./light-bulb";
-export { default as GoLinkExternal } from "./link-external";
-export { default as GoLink } from "./link";
-export { default as GoListOrdered } from "./list-ordered";
-export { default as GoListUnordered } from "./list-unordered";
-export { default as GoLocation } from "./location";
-export { default as GoLock } from "./lock";
-export { default as GoLogoGithub } from "./logo-github";
-export { default as GoMailRead } from "./mail-read";
-export { default as GoMailReply } from "./mail-reply";
-export { default as GoMail } from "./mail";
-export { default as GoMarkGithub } from "./mark-github";
-export { default as GoMarkdown } from "./markdown";
-export { default as GoMegaphone } from "./megaphone";
-export { default as GoMention } from "./mention";
-export { default as GoMicroscope } from "./microscope";
-export { default as GoMilestone } from "./milestone";
-export { default as GoMirror } from "./mirror";
-export { default as GoMortarBoard } from "./mortar-board";
-export { default as GoMoveDown } from "./move-down";
-export { default as GoMoveLeft } from "./move-left";
-export { default as GoMoveRight } from "./move-right";
-export { default as GoMoveUp } from "./move-up";
-export { default as GoMute } from "./mute";
-export { default as GoNoNewline } from "./no-newline";
-export { default as GoOctoface } from "./octoface";
-export { default as GoOrganization } from "./organization";
-export { default as GoPackage } from "./package";
-export { default as GoPaintcan } from "./paintcan";
-export { default as GoPencil } from "./pencil";
-export { default as GoPerson } from "./person";
-export { default as GoPin } from "./pin";
-export { default as GoPlaybackFastForward } from "./playback-fast-forward";
-export { default as GoPlaybackPause } from "./playback-pause";
-export { default as GoPlaybackPlay } from "./playback-play";
-export { default as GoPlaybackRewind } from "./playback-rewind";
-export { default as GoPlug } from "./plug";
-export { default as GoPlus } from "./plus";
-export { default as GoPodium } from "./podium";
-export { default as GoPrimitiveDot } from "./primitive-dot";
-export { default as GoPrimitiveSquare } from "./primitive-square";
-export { default as GoPulse } from "./pulse";
-export { default as GoPuzzle } from "./puzzle";
-export { default as GoQuestion } from "./question";
-export { default as GoQuote } from "./quote";
-export { default as GoRadioTower } from "./radio-tower";
-export { default as GoRepoClone } from "./repo-clone";
-export { default as GoRepoForcePush } from "./repo-force-push";
-export { default as GoRepoForked } from "./repo-forked";
-export { default as GoRepoPull } from "./repo-pull";
-export { default as GoRepoPush } from "./repo-push";
-export { default as GoRepo } from "./repo";
-export { default as GoRocket } from "./rocket";
-export { default as GoRss } from "./rss";
-export { default as GoRuby } from "./ruby";
-export { default as GoScreenFull } from "./screen-full";
-export { default as GoScreenNormal } from "./screen-normal";
-export { default as GoSearch } from "./search";
-export { default as GoServer } from "./server";
-export { default as GoSettings } from "./settings";
-export { default as GoSignIn } from "./sign-in";
-export { default as GoSignOut } from "./sign-out";
-export { default as GoSplit } from "./split";
-export { default as GoSquirrel } from "./squirrel";
-export { default as GoStar } from "./star";
-export { default as GoSteps } from "./steps";
-export { default as GoStop } from "./stop";
-export { default as GoSync } from "./sync";
-export { default as GoTag } from "./tag";
-export { default as GoTelescope } from "./telescope";
-export { default as GoTerminal } from "./terminal";
-export { default as GoThreeBars } from "./three-bars";
-export { default as GoTools } from "./tools";
-export { default as GoTrashcan } from "./trashcan";
-export { default as GoTriangleDown } from "./triangle-down";
-export { default as GoTriangleLeft } from "./triangle-left";
-export { default as GoTriangleRight } from "./triangle-right";
-export { default as GoTriangleUp } from "./triangle-up";
-export { default as GoUnfold } from "./unfold";
-export { default as GoUnmute } from "./unmute";
-export { default as GoVersions } from "./versions";
-export { default as GoX } from "./x";
-export { default as GoZap } from "./zap";
+export { default as GoAlert } from "../../go/alert";
+export { default as GoAlignmentAlign } from "../../go/alignment-align";
+export { default as GoAlignmentAlignedTo } from "../../go/alignment-aligned-to";
+export { default as GoAlignmentUnalign } from "../../go/alignment-unalign";
+export { default as GoArrowDown } from "../../go/arrow-down";
+export { default as GoArrowLeft } from "../../go/arrow-left";
+export { default as GoArrowRight } from "../../go/arrow-right";
+export { default as GoArrowSmallDown } from "../../go/arrow-small-down";
+export { default as GoArrowSmallLeft } from "../../go/arrow-small-left";
+export { default as GoArrowSmallRight } from "../../go/arrow-small-right";
+export { default as GoArrowSmallUp } from "../../go/arrow-small-up";
+export { default as GoArrowUp } from "../../go/arrow-up";
+export { default as GoBeer } from "../../go/beer";
+export { default as GoBook } from "../../go/book";
+export { default as GoBookmark } from "../../go/bookmark";
+export { default as GoBriefcase } from "../../go/briefcase";
+export { default as GoBroadcast } from "../../go/broadcast";
+export { default as GoBrowser } from "../../go/browser";
+export { default as GoBug } from "../../go/bug";
+export { default as GoCalendar } from "../../go/calendar";
+export { default as GoCheck } from "../../go/check";
+export { default as GoChecklist } from "../../go/checklist";
+export { default as GoChevronDown } from "../../go/chevron-down";
+export { default as GoChevronLeft } from "../../go/chevron-left";
+export { default as GoChevronRight } from "../../go/chevron-right";
+export { default as GoChevronUp } from "../../go/chevron-up";
+export { default as GoCircleSlash } from "../../go/circle-slash";
+export { default as GoCircuitBoard } from "../../go/circuit-board";
+export { default as GoClippy } from "../../go/clippy";
+export { default as GoClock } from "../../go/clock";
+export { default as GoCloudDownload } from "../../go/cloud-download";
+export { default as GoCloudUpload } from "../../go/cloud-upload";
+export { default as GoCode } from "../../go/code";
+export { default as GoColorMode } from "../../go/color-mode";
+export { default as GoCommentDiscussion } from "../../go/comment-discussion";
+export { default as GoComment } from "../../go/comment";
+export { default as GoCreditCard } from "../../go/credit-card";
+export { default as GoDash } from "../../go/dash";
+export { default as GoDashboard } from "../../go/dashboard";
+export { default as GoDatabase } from "../../go/database";
+export { default as GoDeviceCameraVideo } from "../../go/device-camera-video";
+export { default as GoDeviceCamera } from "../../go/device-camera";
+export { default as GoDeviceDesktop } from "../../go/device-desktop";
+export { default as GoDeviceMobile } from "../../go/device-mobile";
+export { default as GoDiffAdded } from "../../go/diff-added";
+export { default as GoDiffIgnored } from "../../go/diff-ignored";
+export { default as GoDiffModified } from "../../go/diff-modified";
+export { default as GoDiffRemoved } from "../../go/diff-removed";
+export { default as GoDiffRenamed } from "../../go/diff-renamed";
+export { default as GoDiff } from "../../go/diff";
+export { default as GoEllipsis } from "../../go/ellipsis";
+export { default as GoEye } from "../../go/eye";
+export { default as GoFileBinary } from "../../go/file-binary";
+export { default as GoFileCode } from "../../go/file-code";
+export { default as GoFileDirectory } from "../../go/file-directory";
+export { default as GoFileMedia } from "../../go/file-media";
+export { default as GoFilePdf } from "../../go/file-pdf";
+export { default as GoFileSubmodule } from "../../go/file-submodule";
+export { default as GoFileSymlinkDirectory } from "../../go/file-symlink-directory";
+export { default as GoFileSymlinkFile } from "../../go/file-symlink-file";
+export { default as GoFileText } from "../../go/file-text";
+export { default as GoFileZip } from "../../go/file-zip";
+export { default as GoFlame } from "../../go/flame";
+export { default as GoFold } from "../../go/fold";
+export { default as GoGear } from "../../go/gear";
+export { default as GoGift } from "../../go/gift";
+export { default as GoGistSecret } from "../../go/gist-secret";
+export { default as GoGist } from "../../go/gist";
+export { default as GoGitBranch } from "../../go/git-branch";
+export { default as GoGitCommit } from "../../go/git-commit";
+export { default as GoGitCompare } from "../../go/git-compare";
+export { default as GoGitMerge } from "../../go/git-merge";
+export { default as GoGitPullRequest } from "../../go/git-pull-request";
+export { default as GoGlobe } from "../../go/globe";
+export { default as GoGraph } from "../../go/graph";
+export { default as GoHeart } from "../../go/heart";
+export { default as GoHistory } from "../../go/history";
+export { default as GoHome } from "../../go/home";
+export { default as GoHorizontalRule } from "../../go/horizontal-rule";
+export { default as GoHourglass } from "../../go/hourglass";
+export { default as GoHubot } from "../../go/hubot";
+export { default as GoInbox } from "../../go/inbox";
+export { default as GoInfo } from "../../go/info";
+export { default as GoIssueClosed } from "../../go/issue-closed";
+export { default as GoIssueOpened } from "../../go/issue-opened";
+export { default as GoIssueReopened } from "../../go/issue-reopened";
+export { default as GoJersey } from "../../go/jersey";
+export { default as GoJumpDown } from "../../go/jump-down";
+export { default as GoJumpLeft } from "../../go/jump-left";
+export { default as GoJumpRight } from "../../go/jump-right";
+export { default as GoJumpUp } from "../../go/jump-up";
+export { default as GoKey } from "../../go/key";
+export { default as GoKeyboard } from "../../go/keyboard";
+export { default as GoLaw } from "../../go/law";
+export { default as GoLightBulb } from "../../go/light-bulb";
+export { default as GoLinkExternal } from "../../go/link-external";
+export { default as GoLink } from "../../go/link";
+export { default as GoListOrdered } from "../../go/list-ordered";
+export { default as GoListUnordered } from "../../go/list-unordered";
+export { default as GoLocation } from "../../go/location";
+export { default as GoLock } from "../../go/lock";
+export { default as GoLogoGithub } from "../../go/logo-github";
+export { default as GoMailRead } from "../../go/mail-read";
+export { default as GoMailReply } from "../../go/mail-reply";
+export { default as GoMail } from "../../go/mail";
+export { default as GoMarkGithub } from "../../go/mark-github";
+export { default as GoMarkdown } from "../../go/markdown";
+export { default as GoMegaphone } from "../../go/megaphone";
+export { default as GoMention } from "../../go/mention";
+export { default as GoMicroscope } from "../../go/microscope";
+export { default as GoMilestone } from "../../go/milestone";
+export { default as GoMirror } from "../../go/mirror";
+export { default as GoMortarBoard } from "../../go/mortar-board";
+export { default as GoMoveDown } from "../../go/move-down";
+export { default as GoMoveLeft } from "../../go/move-left";
+export { default as GoMoveRight } from "../../go/move-right";
+export { default as GoMoveUp } from "../../go/move-up";
+export { default as GoMute } from "../../go/mute";
+export { default as GoNoNewline } from "../../go/no-newline";
+export { default as GoOctoface } from "../../go/octoface";
+export { default as GoOrganization } from "../../go/organization";
+export { default as GoPackage } from "../../go/package";
+export { default as GoPaintcan } from "../../go/paintcan";
+export { default as GoPencil } from "../../go/pencil";
+export { default as GoPerson } from "../../go/person";
+export { default as GoPin } from "../../go/pin";
+export { default as GoPlaybackFastForward } from "../../go/playback-fast-forward";
+export { default as GoPlaybackPause } from "../../go/playback-pause";
+export { default as GoPlaybackPlay } from "../../go/playback-play";
+export { default as GoPlaybackRewind } from "../../go/playback-rewind";
+export { default as GoPlug } from "../../go/plug";
+export { default as GoPlus } from "../../go/plus";
+export { default as GoPodium } from "../../go/podium";
+export { default as GoPrimitiveDot } from "../../go/primitive-dot";
+export { default as GoPrimitiveSquare } from "../../go/primitive-square";
+export { default as GoPulse } from "../../go/pulse";
+export { default as GoPuzzle } from "../../go/puzzle";
+export { default as GoQuestion } from "../../go/question";
+export { default as GoQuote } from "../../go/quote";
+export { default as GoRadioTower } from "../../go/radio-tower";
+export { default as GoRepoClone } from "../../go/repo-clone";
+export { default as GoRepoForcePush } from "../../go/repo-force-push";
+export { default as GoRepoForked } from "../../go/repo-forked";
+export { default as GoRepoPull } from "../../go/repo-pull";
+export { default as GoRepoPush } from "../../go/repo-push";
+export { default as GoRepo } from "../../go/repo";
+export { default as GoRocket } from "../../go/rocket";
+export { default as GoRss } from "../../go/rss";
+export { default as GoRuby } from "../../go/ruby";
+export { default as GoScreenFull } from "../../go/screen-full";
+export { default as GoScreenNormal } from "../../go/screen-normal";
+export { default as GoSearch } from "../../go/search";
+export { default as GoServer } from "../../go/server";
+export { default as GoSettings } from "../../go/settings";
+export { default as GoSignIn } from "../../go/sign-in";
+export { default as GoSignOut } from "../../go/sign-out";
+export { default as GoSplit } from "../../go/split";
+export { default as GoSquirrel } from "../../go/squirrel";
+export { default as GoStar } from "../../go/star";
+export { default as GoSteps } from "../../go/steps";
+export { default as GoStop } from "../../go/stop";
+export { default as GoSync } from "../../go/sync";
+export { default as GoTag } from "../../go/tag";
+export { default as GoTelescope } from "../../go/telescope";
+export { default as GoTerminal } from "../../go/terminal";
+export { default as GoThreeBars } from "../../go/three-bars";
+export { default as GoTools } from "../../go/tools";
+export { default as GoTrashcan } from "../../go/trashcan";
+export { default as GoTriangleDown } from "../../go/triangle-down";
+export { default as GoTriangleLeft } from "../../go/triangle-left";
+export { default as GoTriangleRight } from "../../go/triangle-right";
+export { default as GoTriangleUp } from "../../go/triangle-up";
+export { default as GoUnfold } from "../../go/unfold";
+export { default as GoUnmute } from "../../go/unmute";
+export { default as GoVersions } from "../../go/versions";
+export { default as GoX } from "../../go/x";
+export { default as GoZap } from "../../go/zap";
diff --git a/types/react-icons/lib/go/info.d.ts b/types/react-icons/lib/go/info.d.ts
index 2359f0e299..76a01cf7f8 100644
--- a/types/react-icons/lib/go/info.d.ts
+++ b/types/react-icons/lib/go/info.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoInfo extends React.Component<IconBaseProps> { }
+declare class GoInfo extends React.Component<IconBaseProps> { }
+export = GoInfo;
diff --git a/types/react-icons/lib/go/issue-closed.d.ts b/types/react-icons/lib/go/issue-closed.d.ts
index b06460c581..d2754f369a 100644
--- a/types/react-icons/lib/go/issue-closed.d.ts
+++ b/types/react-icons/lib/go/issue-closed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueClosed extends React.Component<IconBaseProps> { }
+declare class GoIssueClosed extends React.Component<IconBaseProps> { }
+export = GoIssueClosed;
diff --git a/types/react-icons/lib/go/issue-opened.d.ts b/types/react-icons/lib/go/issue-opened.d.ts
index 331e3754a9..d4eee6c362 100644
--- a/types/react-icons/lib/go/issue-opened.d.ts
+++ b/types/react-icons/lib/go/issue-opened.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueOpened extends React.Component<IconBaseProps> { }
+declare class GoIssueOpened extends React.Component<IconBaseProps> { }
+export = GoIssueOpened;
diff --git a/types/react-icons/lib/go/issue-reopened.d.ts b/types/react-icons/lib/go/issue-reopened.d.ts
index 460fb426c8..d976356a2d 100644
--- a/types/react-icons/lib/go/issue-reopened.d.ts
+++ b/types/react-icons/lib/go/issue-reopened.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueReopened extends React.Component<IconBaseProps> { }
+declare class GoIssueReopened extends React.Component<IconBaseProps> { }
+export = GoIssueReopened;
diff --git a/types/react-icons/lib/go/jersey.d.ts b/types/react-icons/lib/go/jersey.d.ts
index 2c85c72ff0..654f119755 100644
--- a/types/react-icons/lib/go/jersey.d.ts
+++ b/types/react-icons/lib/go/jersey.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJersey extends React.Component<IconBaseProps> { }
+declare class GoJersey extends React.Component<IconBaseProps> { }
+export = GoJersey;
diff --git a/types/react-icons/lib/go/jump-down.d.ts b/types/react-icons/lib/go/jump-down.d.ts
index 8d0497969e..ae6ad27ac3 100644
--- a/types/react-icons/lib/go/jump-down.d.ts
+++ b/types/react-icons/lib/go/jump-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpDown extends React.Component<IconBaseProps> { }
+declare class GoJumpDown extends React.Component<IconBaseProps> { }
+export = GoJumpDown;
diff --git a/types/react-icons/lib/go/jump-left.d.ts b/types/react-icons/lib/go/jump-left.d.ts
index 9be1e1ded5..14ebccb8c8 100644
--- a/types/react-icons/lib/go/jump-left.d.ts
+++ b/types/react-icons/lib/go/jump-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpLeft extends React.Component<IconBaseProps> { }
+declare class GoJumpLeft extends React.Component<IconBaseProps> { }
+export = GoJumpLeft;
diff --git a/types/react-icons/lib/go/jump-right.d.ts b/types/react-icons/lib/go/jump-right.d.ts
index efdbf77170..9f23d34e2f 100644
--- a/types/react-icons/lib/go/jump-right.d.ts
+++ b/types/react-icons/lib/go/jump-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpRight extends React.Component<IconBaseProps> { }
+declare class GoJumpRight extends React.Component<IconBaseProps> { }
+export = GoJumpRight;
diff --git a/types/react-icons/lib/go/jump-up.d.ts b/types/react-icons/lib/go/jump-up.d.ts
index f8ee7030f0..02617bd211 100644
--- a/types/react-icons/lib/go/jump-up.d.ts
+++ b/types/react-icons/lib/go/jump-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpUp extends React.Component<IconBaseProps> { }
+declare class GoJumpUp extends React.Component<IconBaseProps> { }
+export = GoJumpUp;
diff --git a/types/react-icons/lib/go/key.d.ts b/types/react-icons/lib/go/key.d.ts
index 635b754f56..7a3c114038 100644
--- a/types/react-icons/lib/go/key.d.ts
+++ b/types/react-icons/lib/go/key.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoKey extends React.Component<IconBaseProps> { }
+declare class GoKey extends React.Component<IconBaseProps> { }
+export = GoKey;
diff --git a/types/react-icons/lib/go/keyboard.d.ts b/types/react-icons/lib/go/keyboard.d.ts
index 48e2f695ed..0e4b588ae8 100644
--- a/types/react-icons/lib/go/keyboard.d.ts
+++ b/types/react-icons/lib/go/keyboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoKeyboard extends React.Component<IconBaseProps> { }
+declare class GoKeyboard extends React.Component<IconBaseProps> { }
+export = GoKeyboard;
diff --git a/types/react-icons/lib/go/law.d.ts b/types/react-icons/lib/go/law.d.ts
index 59e6dd09c6..1e8869c457 100644
--- a/types/react-icons/lib/go/law.d.ts
+++ b/types/react-icons/lib/go/law.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLaw extends React.Component<IconBaseProps> { }
+declare class GoLaw extends React.Component<IconBaseProps> { }
+export = GoLaw;
diff --git a/types/react-icons/lib/go/light-bulb.d.ts b/types/react-icons/lib/go/light-bulb.d.ts
index b020b05d25..713bad1011 100644
--- a/types/react-icons/lib/go/light-bulb.d.ts
+++ b/types/react-icons/lib/go/light-bulb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLightBulb extends React.Component<IconBaseProps> { }
+declare class GoLightBulb extends React.Component<IconBaseProps> { }
+export = GoLightBulb;
diff --git a/types/react-icons/lib/go/link-external.d.ts b/types/react-icons/lib/go/link-external.d.ts
index 9e93717352..3e564c8593 100644
--- a/types/react-icons/lib/go/link-external.d.ts
+++ b/types/react-icons/lib/go/link-external.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLinkExternal extends React.Component<IconBaseProps> { }
+declare class GoLinkExternal extends React.Component<IconBaseProps> { }
+export = GoLinkExternal;
diff --git a/types/react-icons/lib/go/link.d.ts b/types/react-icons/lib/go/link.d.ts
index 7def9d9bd3..7959f5c753 100644
--- a/types/react-icons/lib/go/link.d.ts
+++ b/types/react-icons/lib/go/link.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLink extends React.Component<IconBaseProps> { }
+declare class GoLink extends React.Component<IconBaseProps> { }
+export = GoLink;
diff --git a/types/react-icons/lib/go/list-ordered.d.ts b/types/react-icons/lib/go/list-ordered.d.ts
index 31a2859733..b44bcc47df 100644
--- a/types/react-icons/lib/go/list-ordered.d.ts
+++ b/types/react-icons/lib/go/list-ordered.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoListOrdered extends React.Component<IconBaseProps> { }
+declare class GoListOrdered extends React.Component<IconBaseProps> { }
+export = GoListOrdered;
diff --git a/types/react-icons/lib/go/list-unordered.d.ts b/types/react-icons/lib/go/list-unordered.d.ts
index 59b89e921e..fd7cbd5584 100644
--- a/types/react-icons/lib/go/list-unordered.d.ts
+++ b/types/react-icons/lib/go/list-unordered.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoListUnordered extends React.Component<IconBaseProps> { }
+declare class GoListUnordered extends React.Component<IconBaseProps> { }
+export = GoListUnordered;
diff --git a/types/react-icons/lib/go/location.d.ts b/types/react-icons/lib/go/location.d.ts
index a382326479..bde5fb84db 100644
--- a/types/react-icons/lib/go/location.d.ts
+++ b/types/react-icons/lib/go/location.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLocation extends React.Component<IconBaseProps> { }
+declare class GoLocation extends React.Component<IconBaseProps> { }
+export = GoLocation;
diff --git a/types/react-icons/lib/go/lock.d.ts b/types/react-icons/lib/go/lock.d.ts
index 623ec47b53..80dc012968 100644
--- a/types/react-icons/lib/go/lock.d.ts
+++ b/types/react-icons/lib/go/lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLock extends React.Component<IconBaseProps> { }
+declare class GoLock extends React.Component<IconBaseProps> { }
+export = GoLock;
diff --git a/types/react-icons/lib/go/logo-github.d.ts b/types/react-icons/lib/go/logo-github.d.ts
index f57a2d07f7..9458204c5d 100644
--- a/types/react-icons/lib/go/logo-github.d.ts
+++ b/types/react-icons/lib/go/logo-github.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLogoGithub extends React.Component<IconBaseProps> { }
+declare class GoLogoGithub extends React.Component<IconBaseProps> { }
+export = GoLogoGithub;
diff --git a/types/react-icons/lib/go/mail-read.d.ts b/types/react-icons/lib/go/mail-read.d.ts
index e6820b2732..e64ee6e5d1 100644
--- a/types/react-icons/lib/go/mail-read.d.ts
+++ b/types/react-icons/lib/go/mail-read.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMailRead extends React.Component<IconBaseProps> { }
+declare class GoMailRead extends React.Component<IconBaseProps> { }
+export = GoMailRead;
diff --git a/types/react-icons/lib/go/mail-reply.d.ts b/types/react-icons/lib/go/mail-reply.d.ts
index 794cc6dca4..3a0e8d5eed 100644
--- a/types/react-icons/lib/go/mail-reply.d.ts
+++ b/types/react-icons/lib/go/mail-reply.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMailReply extends React.Component<IconBaseProps> { }
+declare class GoMailReply extends React.Component<IconBaseProps> { }
+export = GoMailReply;
diff --git a/types/react-icons/lib/go/mail.d.ts b/types/react-icons/lib/go/mail.d.ts
index bca60de455..fc209fa3a5 100644
--- a/types/react-icons/lib/go/mail.d.ts
+++ b/types/react-icons/lib/go/mail.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMail extends React.Component<IconBaseProps> { }
+declare class GoMail extends React.Component<IconBaseProps> { }
+export = GoMail;
diff --git a/types/react-icons/lib/go/mark-github.d.ts b/types/react-icons/lib/go/mark-github.d.ts
index 999521b725..9f98e3a09e 100644
--- a/types/react-icons/lib/go/mark-github.d.ts
+++ b/types/react-icons/lib/go/mark-github.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMarkGithub extends React.Component<IconBaseProps> { }
+declare class GoMarkGithub extends React.Component<IconBaseProps> { }
+export = GoMarkGithub;
diff --git a/types/react-icons/lib/go/markdown.d.ts b/types/react-icons/lib/go/markdown.d.ts
index 5533fd8deb..389bdbea07 100644
--- a/types/react-icons/lib/go/markdown.d.ts
+++ b/types/react-icons/lib/go/markdown.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMarkdown extends React.Component<IconBaseProps> { }
+declare class GoMarkdown extends React.Component<IconBaseProps> { }
+export = GoMarkdown;
diff --git a/types/react-icons/lib/go/megaphone.d.ts b/types/react-icons/lib/go/megaphone.d.ts
index c76f98d900..17341d4a48 100644
--- a/types/react-icons/lib/go/megaphone.d.ts
+++ b/types/react-icons/lib/go/megaphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMegaphone extends React.Component<IconBaseProps> { }
+declare class GoMegaphone extends React.Component<IconBaseProps> { }
+export = GoMegaphone;
diff --git a/types/react-icons/lib/go/mention.d.ts b/types/react-icons/lib/go/mention.d.ts
index 988f97ec6f..9e9bda7554 100644
--- a/types/react-icons/lib/go/mention.d.ts
+++ b/types/react-icons/lib/go/mention.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMention extends React.Component<IconBaseProps> { }
+declare class GoMention extends React.Component<IconBaseProps> { }
+export = GoMention;
diff --git a/types/react-icons/lib/go/microscope.d.ts b/types/react-icons/lib/go/microscope.d.ts
index 79f91de4ab..fe37fac38f 100644
--- a/types/react-icons/lib/go/microscope.d.ts
+++ b/types/react-icons/lib/go/microscope.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMicroscope extends React.Component<IconBaseProps> { }
+declare class GoMicroscope extends React.Component<IconBaseProps> { }
+export = GoMicroscope;
diff --git a/types/react-icons/lib/go/milestone.d.ts b/types/react-icons/lib/go/milestone.d.ts
index a5df7c65b1..dbcee6ba5c 100644
--- a/types/react-icons/lib/go/milestone.d.ts
+++ b/types/react-icons/lib/go/milestone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMilestone extends React.Component<IconBaseProps> { }
+declare class GoMilestone extends React.Component<IconBaseProps> { }
+export = GoMilestone;
diff --git a/types/react-icons/lib/go/mirror.d.ts b/types/react-icons/lib/go/mirror.d.ts
index c8f5f3a988..8ebefa09ce 100644
--- a/types/react-icons/lib/go/mirror.d.ts
+++ b/types/react-icons/lib/go/mirror.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMirror extends React.Component<IconBaseProps> { }
+declare class GoMirror extends React.Component<IconBaseProps> { }
+export = GoMirror;
diff --git a/types/react-icons/lib/go/mortar-board.d.ts b/types/react-icons/lib/go/mortar-board.d.ts
index e435c2f899..e0f7816128 100644
--- a/types/react-icons/lib/go/mortar-board.d.ts
+++ b/types/react-icons/lib/go/mortar-board.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMortarBoard extends React.Component<IconBaseProps> { }
+declare class GoMortarBoard extends React.Component<IconBaseProps> { }
+export = GoMortarBoard;
diff --git a/types/react-icons/lib/go/move-down.d.ts b/types/react-icons/lib/go/move-down.d.ts
index cceb4a2fc6..6cf46433f8 100644
--- a/types/react-icons/lib/go/move-down.d.ts
+++ b/types/react-icons/lib/go/move-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveDown extends React.Component<IconBaseProps> { }
+declare class GoMoveDown extends React.Component<IconBaseProps> { }
+export = GoMoveDown;
diff --git a/types/react-icons/lib/go/move-left.d.ts b/types/react-icons/lib/go/move-left.d.ts
index 81c57b58d1..03d1b9e7af 100644
--- a/types/react-icons/lib/go/move-left.d.ts
+++ b/types/react-icons/lib/go/move-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveLeft extends React.Component<IconBaseProps> { }
+declare class GoMoveLeft extends React.Component<IconBaseProps> { }
+export = GoMoveLeft;
diff --git a/types/react-icons/lib/go/move-right.d.ts b/types/react-icons/lib/go/move-right.d.ts
index b9baed854c..c59d02e53e 100644
--- a/types/react-icons/lib/go/move-right.d.ts
+++ b/types/react-icons/lib/go/move-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveRight extends React.Component<IconBaseProps> { }
+declare class GoMoveRight extends React.Component<IconBaseProps> { }
+export = GoMoveRight;
diff --git a/types/react-icons/lib/go/move-up.d.ts b/types/react-icons/lib/go/move-up.d.ts
index b649bd2bca..323a440aa2 100644
--- a/types/react-icons/lib/go/move-up.d.ts
+++ b/types/react-icons/lib/go/move-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveUp extends React.Component<IconBaseProps> { }
+declare class GoMoveUp extends React.Component<IconBaseProps> { }
+export = GoMoveUp;
diff --git a/types/react-icons/lib/go/mute.d.ts b/types/react-icons/lib/go/mute.d.ts
index 96aa49027f..2c80d9b279 100644
--- a/types/react-icons/lib/go/mute.d.ts
+++ b/types/react-icons/lib/go/mute.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMute extends React.Component<IconBaseProps> { }
+declare class GoMute extends React.Component<IconBaseProps> { }
+export = GoMute;
diff --git a/types/react-icons/lib/go/no-newline.d.ts b/types/react-icons/lib/go/no-newline.d.ts
index 2953cea8b0..10a616941d 100644
--- a/types/react-icons/lib/go/no-newline.d.ts
+++ b/types/react-icons/lib/go/no-newline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoNoNewline extends React.Component<IconBaseProps> { }
+declare class GoNoNewline extends React.Component<IconBaseProps> { }
+export = GoNoNewline;
diff --git a/types/react-icons/lib/go/octoface.d.ts b/types/react-icons/lib/go/octoface.d.ts
index 466708f844..3f7b80ae04 100644
--- a/types/react-icons/lib/go/octoface.d.ts
+++ b/types/react-icons/lib/go/octoface.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoOctoface extends React.Component<IconBaseProps> { }
+declare class GoOctoface extends React.Component<IconBaseProps> { }
+export = GoOctoface;
diff --git a/types/react-icons/lib/go/organization.d.ts b/types/react-icons/lib/go/organization.d.ts
index 321899f2bd..8f52ca1022 100644
--- a/types/react-icons/lib/go/organization.d.ts
+++ b/types/react-icons/lib/go/organization.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoOrganization extends React.Component<IconBaseProps> { }
+declare class GoOrganization extends React.Component<IconBaseProps> { }
+export = GoOrganization;
diff --git a/types/react-icons/lib/go/package.d.ts b/types/react-icons/lib/go/package.d.ts
index ecea623c3b..06688e276c 100644
--- a/types/react-icons/lib/go/package.d.ts
+++ b/types/react-icons/lib/go/package.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPackage extends React.Component<IconBaseProps> { }
+declare class GoPackage extends React.Component<IconBaseProps> { }
+export = GoPackage;
diff --git a/types/react-icons/lib/go/paintcan.d.ts b/types/react-icons/lib/go/paintcan.d.ts
index b38f9aa673..630fa3e367 100644
--- a/types/react-icons/lib/go/paintcan.d.ts
+++ b/types/react-icons/lib/go/paintcan.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPaintcan extends React.Component<IconBaseProps> { }
+declare class GoPaintcan extends React.Component<IconBaseProps> { }
+export = GoPaintcan;
diff --git a/types/react-icons/lib/go/pencil.d.ts b/types/react-icons/lib/go/pencil.d.ts
index 9a2cc3fe1c..4a02f3c400 100644
--- a/types/react-icons/lib/go/pencil.d.ts
+++ b/types/react-icons/lib/go/pencil.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPencil extends React.Component<IconBaseProps> { }
+declare class GoPencil extends React.Component<IconBaseProps> { }
+export = GoPencil;
diff --git a/types/react-icons/lib/go/person.d.ts b/types/react-icons/lib/go/person.d.ts
index 177c738660..2949b9d660 100644
--- a/types/react-icons/lib/go/person.d.ts
+++ b/types/react-icons/lib/go/person.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPerson extends React.Component<IconBaseProps> { }
+declare class GoPerson extends React.Component<IconBaseProps> { }
+export = GoPerson;
diff --git a/types/react-icons/lib/go/pin.d.ts b/types/react-icons/lib/go/pin.d.ts
index f083f58df7..901b36a91f 100644
--- a/types/react-icons/lib/go/pin.d.ts
+++ b/types/react-icons/lib/go/pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPin extends React.Component<IconBaseProps> { }
+declare class GoPin extends React.Component<IconBaseProps> { }
+export = GoPin;
diff --git a/types/react-icons/lib/go/playback-fast-forward.d.ts b/types/react-icons/lib/go/playback-fast-forward.d.ts
index faa2293f90..65348b544f 100644
--- a/types/react-icons/lib/go/playback-fast-forward.d.ts
+++ b/types/react-icons/lib/go/playback-fast-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackFastForward extends React.Component<IconBaseProps> { }
+declare class GoPlaybackFastForward extends React.Component<IconBaseProps> { }
+export = GoPlaybackFastForward;
diff --git a/types/react-icons/lib/go/playback-pause.d.ts b/types/react-icons/lib/go/playback-pause.d.ts
index 43c3830eae..50f1cacef1 100644
--- a/types/react-icons/lib/go/playback-pause.d.ts
+++ b/types/react-icons/lib/go/playback-pause.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackPause extends React.Component<IconBaseProps> { }
+declare class GoPlaybackPause extends React.Component<IconBaseProps> { }
+export = GoPlaybackPause;
diff --git a/types/react-icons/lib/go/playback-play.d.ts b/types/react-icons/lib/go/playback-play.d.ts
index 6d90eadb63..68a8dab132 100644
--- a/types/react-icons/lib/go/playback-play.d.ts
+++ b/types/react-icons/lib/go/playback-play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackPlay extends React.Component<IconBaseProps> { }
+declare class GoPlaybackPlay extends React.Component<IconBaseProps> { }
+export = GoPlaybackPlay;
diff --git a/types/react-icons/lib/go/playback-rewind.d.ts b/types/react-icons/lib/go/playback-rewind.d.ts
index 92080152af..a742b47fb6 100644
--- a/types/react-icons/lib/go/playback-rewind.d.ts
+++ b/types/react-icons/lib/go/playback-rewind.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackRewind extends React.Component<IconBaseProps> { }
+declare class GoPlaybackRewind extends React.Component<IconBaseProps> { }
+export = GoPlaybackRewind;
diff --git a/types/react-icons/lib/go/plug.d.ts b/types/react-icons/lib/go/plug.d.ts
index da0ec12aa1..8265b0a4b1 100644
--- a/types/react-icons/lib/go/plug.d.ts
+++ b/types/react-icons/lib/go/plug.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlug extends React.Component<IconBaseProps> { }
+declare class GoPlug extends React.Component<IconBaseProps> { }
+export = GoPlug;
diff --git a/types/react-icons/lib/go/plus.d.ts b/types/react-icons/lib/go/plus.d.ts
index 867c30b643..e8c290d841 100644
--- a/types/react-icons/lib/go/plus.d.ts
+++ b/types/react-icons/lib/go/plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlus extends React.Component<IconBaseProps> { }
+declare class GoPlus extends React.Component<IconBaseProps> { }
+export = GoPlus;
diff --git a/types/react-icons/lib/go/podium.d.ts b/types/react-icons/lib/go/podium.d.ts
index 1c16142450..228759200d 100644
--- a/types/react-icons/lib/go/podium.d.ts
+++ b/types/react-icons/lib/go/podium.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPodium extends React.Component<IconBaseProps> { }
+declare class GoPodium extends React.Component<IconBaseProps> { }
+export = GoPodium;
diff --git a/types/react-icons/lib/go/primitive-dot.d.ts b/types/react-icons/lib/go/primitive-dot.d.ts
index 9a74108de7..279fa40d18 100644
--- a/types/react-icons/lib/go/primitive-dot.d.ts
+++ b/types/react-icons/lib/go/primitive-dot.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPrimitiveDot extends React.Component<IconBaseProps> { }
+declare class GoPrimitiveDot extends React.Component<IconBaseProps> { }
+export = GoPrimitiveDot;
diff --git a/types/react-icons/lib/go/primitive-square.d.ts b/types/react-icons/lib/go/primitive-square.d.ts
index 4a387621dd..d3e5ab1072 100644
--- a/types/react-icons/lib/go/primitive-square.d.ts
+++ b/types/react-icons/lib/go/primitive-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPrimitiveSquare extends React.Component<IconBaseProps> { }
+declare class GoPrimitiveSquare extends React.Component<IconBaseProps> { }
+export = GoPrimitiveSquare;
diff --git a/types/react-icons/lib/go/pulse.d.ts b/types/react-icons/lib/go/pulse.d.ts
index 111540b6ea..946e7e1eaa 100644
--- a/types/react-icons/lib/go/pulse.d.ts
+++ b/types/react-icons/lib/go/pulse.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPulse extends React.Component<IconBaseProps> { }
+declare class GoPulse extends React.Component<IconBaseProps> { }
+export = GoPulse;
diff --git a/types/react-icons/lib/go/puzzle.d.ts b/types/react-icons/lib/go/puzzle.d.ts
index 759922a96d..d684b5837c 100644
--- a/types/react-icons/lib/go/puzzle.d.ts
+++ b/types/react-icons/lib/go/puzzle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPuzzle extends React.Component<IconBaseProps> { }
+declare class GoPuzzle extends React.Component<IconBaseProps> { }
+export = GoPuzzle;
diff --git a/types/react-icons/lib/go/question.d.ts b/types/react-icons/lib/go/question.d.ts
index 7dd4302a96..57824568fa 100644
--- a/types/react-icons/lib/go/question.d.ts
+++ b/types/react-icons/lib/go/question.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoQuestion extends React.Component<IconBaseProps> { }
+declare class GoQuestion extends React.Component<IconBaseProps> { }
+export = GoQuestion;
diff --git a/types/react-icons/lib/go/quote.d.ts b/types/react-icons/lib/go/quote.d.ts
index 47a6f2765a..13f1e5b5e7 100644
--- a/types/react-icons/lib/go/quote.d.ts
+++ b/types/react-icons/lib/go/quote.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoQuote extends React.Component<IconBaseProps> { }
+declare class GoQuote extends React.Component<IconBaseProps> { }
+export = GoQuote;
diff --git a/types/react-icons/lib/go/radio-tower.d.ts b/types/react-icons/lib/go/radio-tower.d.ts
index fee3702338..81184f0449 100644
--- a/types/react-icons/lib/go/radio-tower.d.ts
+++ b/types/react-icons/lib/go/radio-tower.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRadioTower extends React.Component<IconBaseProps> { }
+declare class GoRadioTower extends React.Component<IconBaseProps> { }
+export = GoRadioTower;
diff --git a/types/react-icons/lib/go/repo-clone.d.ts b/types/react-icons/lib/go/repo-clone.d.ts
index fb9957a21d..420126bd91 100644
--- a/types/react-icons/lib/go/repo-clone.d.ts
+++ b/types/react-icons/lib/go/repo-clone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoClone extends React.Component<IconBaseProps> { }
+declare class GoRepoClone extends React.Component<IconBaseProps> { }
+export = GoRepoClone;
diff --git a/types/react-icons/lib/go/repo-force-push.d.ts b/types/react-icons/lib/go/repo-force-push.d.ts
index 6b1bf3a2c1..402458e84f 100644
--- a/types/react-icons/lib/go/repo-force-push.d.ts
+++ b/types/react-icons/lib/go/repo-force-push.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoForcePush extends React.Component<IconBaseProps> { }
+declare class GoRepoForcePush extends React.Component<IconBaseProps> { }
+export = GoRepoForcePush;
diff --git a/types/react-icons/lib/go/repo-forked.d.ts b/types/react-icons/lib/go/repo-forked.d.ts
index e68f5a3df6..6f74430b17 100644
--- a/types/react-icons/lib/go/repo-forked.d.ts
+++ b/types/react-icons/lib/go/repo-forked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoForked extends React.Component<IconBaseProps> { }
+declare class GoRepoForked extends React.Component<IconBaseProps> { }
+export = GoRepoForked;
diff --git a/types/react-icons/lib/go/repo-pull.d.ts b/types/react-icons/lib/go/repo-pull.d.ts
index 916310f2bc..d850692812 100644
--- a/types/react-icons/lib/go/repo-pull.d.ts
+++ b/types/react-icons/lib/go/repo-pull.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoPull extends React.Component<IconBaseProps> { }
+declare class GoRepoPull extends React.Component<IconBaseProps> { }
+export = GoRepoPull;
diff --git a/types/react-icons/lib/go/repo-push.d.ts b/types/react-icons/lib/go/repo-push.d.ts
index 5e9a25d3a6..13969c2624 100644
--- a/types/react-icons/lib/go/repo-push.d.ts
+++ b/types/react-icons/lib/go/repo-push.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoPush extends React.Component<IconBaseProps> { }
+declare class GoRepoPush extends React.Component<IconBaseProps> { }
+export = GoRepoPush;
diff --git a/types/react-icons/lib/go/repo.d.ts b/types/react-icons/lib/go/repo.d.ts
index 87dd983849..88447bb207 100644
--- a/types/react-icons/lib/go/repo.d.ts
+++ b/types/react-icons/lib/go/repo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepo extends React.Component<IconBaseProps> { }
+declare class GoRepo extends React.Component<IconBaseProps> { }
+export = GoRepo;
diff --git a/types/react-icons/lib/go/rocket.d.ts b/types/react-icons/lib/go/rocket.d.ts
index 04a9f8fbbb..598924cb0b 100644
--- a/types/react-icons/lib/go/rocket.d.ts
+++ b/types/react-icons/lib/go/rocket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRocket extends React.Component<IconBaseProps> { }
+declare class GoRocket extends React.Component<IconBaseProps> { }
+export = GoRocket;
diff --git a/types/react-icons/lib/go/rss.d.ts b/types/react-icons/lib/go/rss.d.ts
index d18a40a2fb..589f26cd86 100644
--- a/types/react-icons/lib/go/rss.d.ts
+++ b/types/react-icons/lib/go/rss.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRss extends React.Component<IconBaseProps> { }
+declare class GoRss extends React.Component<IconBaseProps> { }
+export = GoRss;
diff --git a/types/react-icons/lib/go/ruby.d.ts b/types/react-icons/lib/go/ruby.d.ts
index 467aecdce6..bf16a7cefe 100644
--- a/types/react-icons/lib/go/ruby.d.ts
+++ b/types/react-icons/lib/go/ruby.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRuby extends React.Component<IconBaseProps> { }
+declare class GoRuby extends React.Component<IconBaseProps> { }
+export = GoRuby;
diff --git a/types/react-icons/lib/go/screen-full.d.ts b/types/react-icons/lib/go/screen-full.d.ts
index f3eae2a63e..4f324d4e81 100644
--- a/types/react-icons/lib/go/screen-full.d.ts
+++ b/types/react-icons/lib/go/screen-full.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoScreenFull extends React.Component<IconBaseProps> { }
+declare class GoScreenFull extends React.Component<IconBaseProps> { }
+export = GoScreenFull;
diff --git a/types/react-icons/lib/go/screen-normal.d.ts b/types/react-icons/lib/go/screen-normal.d.ts
index 59e38edc81..433d928425 100644
--- a/types/react-icons/lib/go/screen-normal.d.ts
+++ b/types/react-icons/lib/go/screen-normal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoScreenNormal extends React.Component<IconBaseProps> { }
+declare class GoScreenNormal extends React.Component<IconBaseProps> { }
+export = GoScreenNormal;
diff --git a/types/react-icons/lib/go/search.d.ts b/types/react-icons/lib/go/search.d.ts
index 54d1144369..9cb93f69d8 100644
--- a/types/react-icons/lib/go/search.d.ts
+++ b/types/react-icons/lib/go/search.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSearch extends React.Component<IconBaseProps> { }
+declare class GoSearch extends React.Component<IconBaseProps> { }
+export = GoSearch;
diff --git a/types/react-icons/lib/go/server.d.ts b/types/react-icons/lib/go/server.d.ts
index 1de141c1a2..c421874095 100644
--- a/types/react-icons/lib/go/server.d.ts
+++ b/types/react-icons/lib/go/server.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoServer extends React.Component<IconBaseProps> { }
+declare class GoServer extends React.Component<IconBaseProps> { }
+export = GoServer;
diff --git a/types/react-icons/lib/go/settings.d.ts b/types/react-icons/lib/go/settings.d.ts
index a583ebe0fe..9baafba18d 100644
--- a/types/react-icons/lib/go/settings.d.ts
+++ b/types/react-icons/lib/go/settings.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSettings extends React.Component<IconBaseProps> { }
+declare class GoSettings extends React.Component<IconBaseProps> { }
+export = GoSettings;
diff --git a/types/react-icons/lib/go/sign-in.d.ts b/types/react-icons/lib/go/sign-in.d.ts
index f1788d6395..68f20f5c22 100644
--- a/types/react-icons/lib/go/sign-in.d.ts
+++ b/types/react-icons/lib/go/sign-in.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSignIn extends React.Component<IconBaseProps> { }
+declare class GoSignIn extends React.Component<IconBaseProps> { }
+export = GoSignIn;
diff --git a/types/react-icons/lib/go/sign-out.d.ts b/types/react-icons/lib/go/sign-out.d.ts
index dd87a41f43..44fb263813 100644
--- a/types/react-icons/lib/go/sign-out.d.ts
+++ b/types/react-icons/lib/go/sign-out.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSignOut extends React.Component<IconBaseProps> { }
+declare class GoSignOut extends React.Component<IconBaseProps> { }
+export = GoSignOut;
diff --git a/types/react-icons/lib/go/split.d.ts b/types/react-icons/lib/go/split.d.ts
index 4b930df74c..66cf541941 100644
--- a/types/react-icons/lib/go/split.d.ts
+++ b/types/react-icons/lib/go/split.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSplit extends React.Component<IconBaseProps> { }
+declare class GoSplit extends React.Component<IconBaseProps> { }
+export = GoSplit;
diff --git a/types/react-icons/lib/go/squirrel.d.ts b/types/react-icons/lib/go/squirrel.d.ts
index 2c1bfdc544..fdbc692970 100644
--- a/types/react-icons/lib/go/squirrel.d.ts
+++ b/types/react-icons/lib/go/squirrel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSquirrel extends React.Component<IconBaseProps> { }
+declare class GoSquirrel extends React.Component<IconBaseProps> { }
+export = GoSquirrel;
diff --git a/types/react-icons/lib/go/star.d.ts b/types/react-icons/lib/go/star.d.ts
index a5f1a3718e..14d2ce7f4f 100644
--- a/types/react-icons/lib/go/star.d.ts
+++ b/types/react-icons/lib/go/star.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoStar extends React.Component<IconBaseProps> { }
+declare class GoStar extends React.Component<IconBaseProps> { }
+export = GoStar;
diff --git a/types/react-icons/lib/go/steps.d.ts b/types/react-icons/lib/go/steps.d.ts
index ae1bd0f758..493e4aa6d0 100644
--- a/types/react-icons/lib/go/steps.d.ts
+++ b/types/react-icons/lib/go/steps.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSteps extends React.Component<IconBaseProps> { }
+declare class GoSteps extends React.Component<IconBaseProps> { }
+export = GoSteps;
diff --git a/types/react-icons/lib/go/stop.d.ts b/types/react-icons/lib/go/stop.d.ts
index 6036ca3c7f..06ac2310bc 100644
--- a/types/react-icons/lib/go/stop.d.ts
+++ b/types/react-icons/lib/go/stop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoStop extends React.Component<IconBaseProps> { }
+declare class GoStop extends React.Component<IconBaseProps> { }
+export = GoStop;
diff --git a/types/react-icons/lib/go/sync.d.ts b/types/react-icons/lib/go/sync.d.ts
index 7a0ab4e316..b882bc2575 100644
--- a/types/react-icons/lib/go/sync.d.ts
+++ b/types/react-icons/lib/go/sync.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSync extends React.Component<IconBaseProps> { }
+declare class GoSync extends React.Component<IconBaseProps> { }
+export = GoSync;
diff --git a/types/react-icons/lib/go/tag.d.ts b/types/react-icons/lib/go/tag.d.ts
index ff161ead97..e24939fe9f 100644
--- a/types/react-icons/lib/go/tag.d.ts
+++ b/types/react-icons/lib/go/tag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTag extends React.Component<IconBaseProps> { }
+declare class GoTag extends React.Component<IconBaseProps> { }
+export = GoTag;
diff --git a/types/react-icons/lib/go/telescope.d.ts b/types/react-icons/lib/go/telescope.d.ts
index 943c1764db..5a4f2783d7 100644
--- a/types/react-icons/lib/go/telescope.d.ts
+++ b/types/react-icons/lib/go/telescope.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTelescope extends React.Component<IconBaseProps> { }
+declare class GoTelescope extends React.Component<IconBaseProps> { }
+export = GoTelescope;
diff --git a/types/react-icons/lib/go/terminal.d.ts b/types/react-icons/lib/go/terminal.d.ts
index e21c5a9461..3cf73c9c48 100644
--- a/types/react-icons/lib/go/terminal.d.ts
+++ b/types/react-icons/lib/go/terminal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTerminal extends React.Component<IconBaseProps> { }
+declare class GoTerminal extends React.Component<IconBaseProps> { }
+export = GoTerminal;
diff --git a/types/react-icons/lib/go/three-bars.d.ts b/types/react-icons/lib/go/three-bars.d.ts
index 75fe787e3f..6404d8df5a 100644
--- a/types/react-icons/lib/go/three-bars.d.ts
+++ b/types/react-icons/lib/go/three-bars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoThreeBars extends React.Component<IconBaseProps> { }
+declare class GoThreeBars extends React.Component<IconBaseProps> { }
+export = GoThreeBars;
diff --git a/types/react-icons/lib/go/tools.d.ts b/types/react-icons/lib/go/tools.d.ts
index 8229abce20..f5521eddd2 100644
--- a/types/react-icons/lib/go/tools.d.ts
+++ b/types/react-icons/lib/go/tools.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTools extends React.Component<IconBaseProps> { }
+declare class GoTools extends React.Component<IconBaseProps> { }
+export = GoTools;
diff --git a/types/react-icons/lib/go/trashcan.d.ts b/types/react-icons/lib/go/trashcan.d.ts
index 4b27fba299..f0fb6102fd 100644
--- a/types/react-icons/lib/go/trashcan.d.ts
+++ b/types/react-icons/lib/go/trashcan.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTrashcan extends React.Component<IconBaseProps> { }
+declare class GoTrashcan extends React.Component<IconBaseProps> { }
+export = GoTrashcan;
diff --git a/types/react-icons/lib/go/triangle-down.d.ts b/types/react-icons/lib/go/triangle-down.d.ts
index de19ba459a..faa8bad17c 100644
--- a/types/react-icons/lib/go/triangle-down.d.ts
+++ b/types/react-icons/lib/go/triangle-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleDown extends React.Component<IconBaseProps> { }
+declare class GoTriangleDown extends React.Component<IconBaseProps> { }
+export = GoTriangleDown;
diff --git a/types/react-icons/lib/go/triangle-left.d.ts b/types/react-icons/lib/go/triangle-left.d.ts
index 309b832111..7597f35cf4 100644
--- a/types/react-icons/lib/go/triangle-left.d.ts
+++ b/types/react-icons/lib/go/triangle-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleLeft extends React.Component<IconBaseProps> { }
+declare class GoTriangleLeft extends React.Component<IconBaseProps> { }
+export = GoTriangleLeft;
diff --git a/types/react-icons/lib/go/triangle-right.d.ts b/types/react-icons/lib/go/triangle-right.d.ts
index 989f428fb3..78038cb7fa 100644
--- a/types/react-icons/lib/go/triangle-right.d.ts
+++ b/types/react-icons/lib/go/triangle-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleRight extends React.Component<IconBaseProps> { }
+declare class GoTriangleRight extends React.Component<IconBaseProps> { }
+export = GoTriangleRight;
diff --git a/types/react-icons/lib/go/triangle-up.d.ts b/types/react-icons/lib/go/triangle-up.d.ts
index fae4ac1c25..36d850dddf 100644
--- a/types/react-icons/lib/go/triangle-up.d.ts
+++ b/types/react-icons/lib/go/triangle-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleUp extends React.Component<IconBaseProps> { }
+declare class GoTriangleUp extends React.Component<IconBaseProps> { }
+export = GoTriangleUp;
diff --git a/types/react-icons/lib/go/unfold.d.ts b/types/react-icons/lib/go/unfold.d.ts
index 1c00f170d5..20945933b9 100644
--- a/types/react-icons/lib/go/unfold.d.ts
+++ b/types/react-icons/lib/go/unfold.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoUnfold extends React.Component<IconBaseProps> { }
+declare class GoUnfold extends React.Component<IconBaseProps> { }
+export = GoUnfold;
diff --git a/types/react-icons/lib/go/unmute.d.ts b/types/react-icons/lib/go/unmute.d.ts
index 90eda20972..99c79e0b3f 100644
--- a/types/react-icons/lib/go/unmute.d.ts
+++ b/types/react-icons/lib/go/unmute.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoUnmute extends React.Component<IconBaseProps> { }
+declare class GoUnmute extends React.Component<IconBaseProps> { }
+export = GoUnmute;
diff --git a/types/react-icons/lib/go/versions.d.ts b/types/react-icons/lib/go/versions.d.ts
index d11586398f..d1935af3ec 100644
--- a/types/react-icons/lib/go/versions.d.ts
+++ b/types/react-icons/lib/go/versions.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoVersions extends React.Component<IconBaseProps> { }
+declare class GoVersions extends React.Component<IconBaseProps> { }
+export = GoVersions;
diff --git a/types/react-icons/lib/go/x.d.ts b/types/react-icons/lib/go/x.d.ts
index 379cb94d5c..3b2e98de7e 100644
--- a/types/react-icons/lib/go/x.d.ts
+++ b/types/react-icons/lib/go/x.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoX extends React.Component<IconBaseProps> { }
+declare class GoX extends React.Component<IconBaseProps> { }
+export = GoX;
diff --git a/types/react-icons/lib/go/zap.d.ts b/types/react-icons/lib/go/zap.d.ts
index 9dafc26355..811445fa12 100644
--- a/types/react-icons/lib/go/zap.d.ts
+++ b/types/react-icons/lib/go/zap.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoZap extends React.Component<IconBaseProps> { }
+declare class GoZap extends React.Component<IconBaseProps> { }
+export = GoZap;
diff --git a/types/react-icons/lib/io/alert-circled.d.ts b/types/react-icons/lib/io/alert-circled.d.ts
index 1fc164cf30..5f5151f700 100644
--- a/types/react-icons/lib/io/alert-circled.d.ts
+++ b/types/react-icons/lib/io/alert-circled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAlertCircled extends React.Component<IconBaseProps> { }
+declare class IoAlertCircled extends React.Component<IconBaseProps> { }
+export = IoAlertCircled;
diff --git a/types/react-icons/lib/io/alert.d.ts b/types/react-icons/lib/io/alert.d.ts
index f3f236a07b..c30dcde318 100644
--- a/types/react-icons/lib/io/alert.d.ts
+++ b/types/react-icons/lib/io/alert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAlert extends React.Component<IconBaseProps> { }
+declare class IoAlert extends React.Component<IconBaseProps> { }
+export = IoAlert;
diff --git a/types/react-icons/lib/io/android-add-circle.d.ts b/types/react-icons/lib/io/android-add-circle.d.ts
index 83301fe5b9..2f2e549c01 100644
--- a/types/react-icons/lib/io/android-add-circle.d.ts
+++ b/types/react-icons/lib/io/android-add-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAddCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidAddCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidAddCircle;
diff --git a/types/react-icons/lib/io/android-add.d.ts b/types/react-icons/lib/io/android-add.d.ts
index d6ec32e120..f96f955ae1 100644
--- a/types/react-icons/lib/io/android-add.d.ts
+++ b/types/react-icons/lib/io/android-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAdd extends React.Component<IconBaseProps> { }
+declare class IoAndroidAdd extends React.Component<IconBaseProps> { }
+export = IoAndroidAdd;
diff --git a/types/react-icons/lib/io/android-alarm-clock.d.ts b/types/react-icons/lib/io/android-alarm-clock.d.ts
index ba7424414a..6a168fddec 100644
--- a/types/react-icons/lib/io/android-alarm-clock.d.ts
+++ b/types/react-icons/lib/io/android-alarm-clock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAlarmClock extends React.Component<IconBaseProps> { }
+declare class IoAndroidAlarmClock extends React.Component<IconBaseProps> { }
+export = IoAndroidAlarmClock;
diff --git a/types/react-icons/lib/io/android-alert.d.ts b/types/react-icons/lib/io/android-alert.d.ts
index 23f9c0fc85..0f59d0103c 100644
--- a/types/react-icons/lib/io/android-alert.d.ts
+++ b/types/react-icons/lib/io/android-alert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAlert extends React.Component<IconBaseProps> { }
+declare class IoAndroidAlert extends React.Component<IconBaseProps> { }
+export = IoAndroidAlert;
diff --git a/types/react-icons/lib/io/android-apps.d.ts b/types/react-icons/lib/io/android-apps.d.ts
index 4ce9dca7c6..92be14083e 100644
--- a/types/react-icons/lib/io/android-apps.d.ts
+++ b/types/react-icons/lib/io/android-apps.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidApps extends React.Component<IconBaseProps> { }
+declare class IoAndroidApps extends React.Component<IconBaseProps> { }
+export = IoAndroidApps;
diff --git a/types/react-icons/lib/io/android-archive.d.ts b/types/react-icons/lib/io/android-archive.d.ts
index bd86f53213..d108a68ce1 100644
--- a/types/react-icons/lib/io/android-archive.d.ts
+++ b/types/react-icons/lib/io/android-archive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArchive extends React.Component<IconBaseProps> { }
+declare class IoAndroidArchive extends React.Component<IconBaseProps> { }
+export = IoAndroidArchive;
diff --git a/types/react-icons/lib/io/android-arrow-back.d.ts b/types/react-icons/lib/io/android-arrow-back.d.ts
index ccf8a5dc52..2263310de6 100644
--- a/types/react-icons/lib/io/android-arrow-back.d.ts
+++ b/types/react-icons/lib/io/android-arrow-back.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowBack extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowBack extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowBack;
diff --git a/types/react-icons/lib/io/android-arrow-down.d.ts b/types/react-icons/lib/io/android-arrow-down.d.ts
index 71d5471bb6..febd414373 100644
--- a/types/react-icons/lib/io/android-arrow-down.d.ts
+++ b/types/react-icons/lib/io/android-arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDown extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDown extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDown;
diff --git a/types/react-icons/lib/io/android-arrow-dropdown-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropdown-circle.d.ts
index 6a11a88c20..c74ce4befc 100644
--- a/types/react-icons/lib/io/android-arrow-dropdown-circle.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropdown-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropdownCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDropdownCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDropdownCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropdown.d.ts b/types/react-icons/lib/io/android-arrow-dropdown.d.ts
index ec91403322..a11298f79e 100644
--- a/types/react-icons/lib/io/android-arrow-dropdown.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropdown.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropdown extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDropdown extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDropdown;
diff --git a/types/react-icons/lib/io/android-arrow-dropleft-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropleft-circle.d.ts
index a972b89ae8..ba18e42e00 100644
--- a/types/react-icons/lib/io/android-arrow-dropleft-circle.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropleft-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropleftCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDropleftCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDropleftCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropleft.d.ts b/types/react-icons/lib/io/android-arrow-dropleft.d.ts
index 0477b93c0b..4e67f8ec1c 100644
--- a/types/react-icons/lib/io/android-arrow-dropleft.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropleft.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropleft extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDropleft extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDropleft;
diff --git a/types/react-icons/lib/io/android-arrow-dropright-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropright-circle.d.ts
index 2e53387d79..6282d02d58 100644
--- a/types/react-icons/lib/io/android-arrow-dropright-circle.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropright-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDroprightCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDroprightCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDroprightCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropright.d.ts b/types/react-icons/lib/io/android-arrow-dropright.d.ts
index b1ebcac3a3..0f6f702c6c 100644
--- a/types/react-icons/lib/io/android-arrow-dropright.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropright.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropright extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDropright extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDropright;
diff --git a/types/react-icons/lib/io/android-arrow-dropup-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropup-circle.d.ts
index cb8d87c3b7..0e4ed173e7 100644
--- a/types/react-icons/lib/io/android-arrow-dropup-circle.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropup-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropupCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDropupCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDropupCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropup.d.ts b/types/react-icons/lib/io/android-arrow-dropup.d.ts
index b52c196650..548a6503dc 100644
--- a/types/react-icons/lib/io/android-arrow-dropup.d.ts
+++ b/types/react-icons/lib/io/android-arrow-dropup.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropup extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowDropup extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowDropup;
diff --git a/types/react-icons/lib/io/android-arrow-forward.d.ts b/types/react-icons/lib/io/android-arrow-forward.d.ts
index a2e4cfcf3c..e2c44b78e6 100644
--- a/types/react-icons/lib/io/android-arrow-forward.d.ts
+++ b/types/react-icons/lib/io/android-arrow-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowForward extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowForward extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowForward;
diff --git a/types/react-icons/lib/io/android-arrow-up.d.ts b/types/react-icons/lib/io/android-arrow-up.d.ts
index 8d30e1f1d6..67a5f46f6c 100644
--- a/types/react-icons/lib/io/android-arrow-up.d.ts
+++ b/types/react-icons/lib/io/android-arrow-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowUp extends React.Component<IconBaseProps> { }
+declare class IoAndroidArrowUp extends React.Component<IconBaseProps> { }
+export = IoAndroidArrowUp;
diff --git a/types/react-icons/lib/io/android-attach.d.ts b/types/react-icons/lib/io/android-attach.d.ts
index 42b704ef71..3f1e724664 100644
--- a/types/react-icons/lib/io/android-attach.d.ts
+++ b/types/react-icons/lib/io/android-attach.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAttach extends React.Component<IconBaseProps> { }
+declare class IoAndroidAttach extends React.Component<IconBaseProps> { }
+export = IoAndroidAttach;
diff --git a/types/react-icons/lib/io/android-bar.d.ts b/types/react-icons/lib/io/android-bar.d.ts
index 0dbc0148db..ed6e223e2b 100644
--- a/types/react-icons/lib/io/android-bar.d.ts
+++ b/types/react-icons/lib/io/android-bar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBar extends React.Component<IconBaseProps> { }
+declare class IoAndroidBar extends React.Component<IconBaseProps> { }
+export = IoAndroidBar;
diff --git a/types/react-icons/lib/io/android-bicycle.d.ts b/types/react-icons/lib/io/android-bicycle.d.ts
index 7e8c1ef911..9d12e783cb 100644
--- a/types/react-icons/lib/io/android-bicycle.d.ts
+++ b/types/react-icons/lib/io/android-bicycle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBicycle extends React.Component<IconBaseProps> { }
+declare class IoAndroidBicycle extends React.Component<IconBaseProps> { }
+export = IoAndroidBicycle;
diff --git a/types/react-icons/lib/io/android-boat.d.ts b/types/react-icons/lib/io/android-boat.d.ts
index 59bf285c2b..61c5a805d3 100644
--- a/types/react-icons/lib/io/android-boat.d.ts
+++ b/types/react-icons/lib/io/android-boat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBoat extends React.Component<IconBaseProps> { }
+declare class IoAndroidBoat extends React.Component<IconBaseProps> { }
+export = IoAndroidBoat;
diff --git a/types/react-icons/lib/io/android-bookmark.d.ts b/types/react-icons/lib/io/android-bookmark.d.ts
index 1585e691ac..02286d994a 100644
--- a/types/react-icons/lib/io/android-bookmark.d.ts
+++ b/types/react-icons/lib/io/android-bookmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBookmark extends React.Component<IconBaseProps> { }
+declare class IoAndroidBookmark extends React.Component<IconBaseProps> { }
+export = IoAndroidBookmark;
diff --git a/types/react-icons/lib/io/android-bulb.d.ts b/types/react-icons/lib/io/android-bulb.d.ts
index 04b9d70acb..c8658f0f8a 100644
--- a/types/react-icons/lib/io/android-bulb.d.ts
+++ b/types/react-icons/lib/io/android-bulb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBulb extends React.Component<IconBaseProps> { }
+declare class IoAndroidBulb extends React.Component<IconBaseProps> { }
+export = IoAndroidBulb;
diff --git a/types/react-icons/lib/io/android-bus.d.ts b/types/react-icons/lib/io/android-bus.d.ts
index 2e93dc479b..f4e7c8742e 100644
--- a/types/react-icons/lib/io/android-bus.d.ts
+++ b/types/react-icons/lib/io/android-bus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBus extends React.Component<IconBaseProps> { }
+declare class IoAndroidBus extends React.Component<IconBaseProps> { }
+export = IoAndroidBus;
diff --git a/types/react-icons/lib/io/android-calendar.d.ts b/types/react-icons/lib/io/android-calendar.d.ts
index a884f3ff51..28331ff9ac 100644
--- a/types/react-icons/lib/io/android-calendar.d.ts
+++ b/types/react-icons/lib/io/android-calendar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCalendar extends React.Component<IconBaseProps> { }
+declare class IoAndroidCalendar extends React.Component<IconBaseProps> { }
+export = IoAndroidCalendar;
diff --git a/types/react-icons/lib/io/android-call.d.ts b/types/react-icons/lib/io/android-call.d.ts
index 2b13615abf..130ab96563 100644
--- a/types/react-icons/lib/io/android-call.d.ts
+++ b/types/react-icons/lib/io/android-call.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCall extends React.Component<IconBaseProps> { }
+declare class IoAndroidCall extends React.Component<IconBaseProps> { }
+export = IoAndroidCall;
diff --git a/types/react-icons/lib/io/android-camera.d.ts b/types/react-icons/lib/io/android-camera.d.ts
index 042a0b2694..8ec2f9732a 100644
--- a/types/react-icons/lib/io/android-camera.d.ts
+++ b/types/react-icons/lib/io/android-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCamera extends React.Component<IconBaseProps> { }
+declare class IoAndroidCamera extends React.Component<IconBaseProps> { }
+export = IoAndroidCamera;
diff --git a/types/react-icons/lib/io/android-cancel.d.ts b/types/react-icons/lib/io/android-cancel.d.ts
index 067a2a32f0..cce87b95f0 100644
--- a/types/react-icons/lib/io/android-cancel.d.ts
+++ b/types/react-icons/lib/io/android-cancel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCancel extends React.Component<IconBaseProps> { }
+declare class IoAndroidCancel extends React.Component<IconBaseProps> { }
+export = IoAndroidCancel;
diff --git a/types/react-icons/lib/io/android-car.d.ts b/types/react-icons/lib/io/android-car.d.ts
index fcb7c849d8..5b808e2ee3 100644
--- a/types/react-icons/lib/io/android-car.d.ts
+++ b/types/react-icons/lib/io/android-car.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCar extends React.Component<IconBaseProps> { }
+declare class IoAndroidCar extends React.Component<IconBaseProps> { }
+export = IoAndroidCar;
diff --git a/types/react-icons/lib/io/android-cart.d.ts b/types/react-icons/lib/io/android-cart.d.ts
index 7d944a55c5..d821947f1a 100644
--- a/types/react-icons/lib/io/android-cart.d.ts
+++ b/types/react-icons/lib/io/android-cart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCart extends React.Component<IconBaseProps> { }
+declare class IoAndroidCart extends React.Component<IconBaseProps> { }
+export = IoAndroidCart;
diff --git a/types/react-icons/lib/io/android-chat.d.ts b/types/react-icons/lib/io/android-chat.d.ts
index 8789c4f12b..ac3d6d6d84 100644
--- a/types/react-icons/lib/io/android-chat.d.ts
+++ b/types/react-icons/lib/io/android-chat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidChat extends React.Component<IconBaseProps> { }
+declare class IoAndroidChat extends React.Component<IconBaseProps> { }
+export = IoAndroidChat;
diff --git a/types/react-icons/lib/io/android-checkbox-blank.d.ts b/types/react-icons/lib/io/android-checkbox-blank.d.ts
index 2651183ba1..ea35930cd8 100644
--- a/types/react-icons/lib/io/android-checkbox-blank.d.ts
+++ b/types/react-icons/lib/io/android-checkbox-blank.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxBlank extends React.Component<IconBaseProps> { }
+declare class IoAndroidCheckboxBlank extends React.Component<IconBaseProps> { }
+export = IoAndroidCheckboxBlank;
diff --git a/types/react-icons/lib/io/android-checkbox-outline-blank.d.ts b/types/react-icons/lib/io/android-checkbox-outline-blank.d.ts
index cf6a3a3d5e..493db386e4 100644
--- a/types/react-icons/lib/io/android-checkbox-outline-blank.d.ts
+++ b/types/react-icons/lib/io/android-checkbox-outline-blank.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxOutlineBlank extends React.Component<IconBaseProps> { }
+declare class IoAndroidCheckboxOutlineBlank extends React.Component<IconBaseProps> { }
+export = IoAndroidCheckboxOutlineBlank;
diff --git a/types/react-icons/lib/io/android-checkbox-outline.d.ts b/types/react-icons/lib/io/android-checkbox-outline.d.ts
index 3a6347a302..8b27d97a12 100644
--- a/types/react-icons/lib/io/android-checkbox-outline.d.ts
+++ b/types/react-icons/lib/io/android-checkbox-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxOutline extends React.Component<IconBaseProps> { }
+declare class IoAndroidCheckboxOutline extends React.Component<IconBaseProps> { }
+export = IoAndroidCheckboxOutline;
diff --git a/types/react-icons/lib/io/android-checkbox.d.ts b/types/react-icons/lib/io/android-checkbox.d.ts
index cb21d62e65..743201b816 100644
--- a/types/react-icons/lib/io/android-checkbox.d.ts
+++ b/types/react-icons/lib/io/android-checkbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckbox extends React.Component<IconBaseProps> { }
+declare class IoAndroidCheckbox extends React.Component<IconBaseProps> { }
+export = IoAndroidCheckbox;
diff --git a/types/react-icons/lib/io/android-checkmark-circle.d.ts b/types/react-icons/lib/io/android-checkmark-circle.d.ts
index 3671ada3d0..b8bbf317e3 100644
--- a/types/react-icons/lib/io/android-checkmark-circle.d.ts
+++ b/types/react-icons/lib/io/android-checkmark-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckmarkCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidCheckmarkCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidCheckmarkCircle;
diff --git a/types/react-icons/lib/io/android-clipboard.d.ts b/types/react-icons/lib/io/android-clipboard.d.ts
index 3d93506b17..78c0a197fc 100644
--- a/types/react-icons/lib/io/android-clipboard.d.ts
+++ b/types/react-icons/lib/io/android-clipboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidClipboard extends React.Component<IconBaseProps> { }
+declare class IoAndroidClipboard extends React.Component<IconBaseProps> { }
+export = IoAndroidClipboard;
diff --git a/types/react-icons/lib/io/android-close.d.ts b/types/react-icons/lib/io/android-close.d.ts
index ad32b8b302..4e9797dbb8 100644
--- a/types/react-icons/lib/io/android-close.d.ts
+++ b/types/react-icons/lib/io/android-close.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidClose extends React.Component<IconBaseProps> { }
+declare class IoAndroidClose extends React.Component<IconBaseProps> { }
+export = IoAndroidClose;
diff --git a/types/react-icons/lib/io/android-cloud-circle.d.ts b/types/react-icons/lib/io/android-cloud-circle.d.ts
index 9c30f64677..976a7730e8 100644
--- a/types/react-icons/lib/io/android-cloud-circle.d.ts
+++ b/types/react-icons/lib/io/android-cloud-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidCloudCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidCloudCircle;
diff --git a/types/react-icons/lib/io/android-cloud-done.d.ts b/types/react-icons/lib/io/android-cloud-done.d.ts
index 6900251eec..38baf11c4b 100644
--- a/types/react-icons/lib/io/android-cloud-done.d.ts
+++ b/types/react-icons/lib/io/android-cloud-done.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudDone extends React.Component<IconBaseProps> { }
+declare class IoAndroidCloudDone extends React.Component<IconBaseProps> { }
+export = IoAndroidCloudDone;
diff --git a/types/react-icons/lib/io/android-cloud-outline.d.ts b/types/react-icons/lib/io/android-cloud-outline.d.ts
index a8144aad15..390718504b 100644
--- a/types/react-icons/lib/io/android-cloud-outline.d.ts
+++ b/types/react-icons/lib/io/android-cloud-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudOutline extends React.Component<IconBaseProps> { }
+declare class IoAndroidCloudOutline extends React.Component<IconBaseProps> { }
+export = IoAndroidCloudOutline;
diff --git a/types/react-icons/lib/io/android-cloud.d.ts b/types/react-icons/lib/io/android-cloud.d.ts
index e0fc48bfd5..276dde52c4 100644
--- a/types/react-icons/lib/io/android-cloud.d.ts
+++ b/types/react-icons/lib/io/android-cloud.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloud extends React.Component<IconBaseProps> { }
+declare class IoAndroidCloud extends React.Component<IconBaseProps> { }
+export = IoAndroidCloud;
diff --git a/types/react-icons/lib/io/android-color-palette.d.ts b/types/react-icons/lib/io/android-color-palette.d.ts
index 79ddef8b10..d27a8c686a 100644
--- a/types/react-icons/lib/io/android-color-palette.d.ts
+++ b/types/react-icons/lib/io/android-color-palette.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidColorPalette extends React.Component<IconBaseProps> { }
+declare class IoAndroidColorPalette extends React.Component<IconBaseProps> { }
+export = IoAndroidColorPalette;
diff --git a/types/react-icons/lib/io/android-compass.d.ts b/types/react-icons/lib/io/android-compass.d.ts
index c577a6a3fd..0e09fa8b02 100644
--- a/types/react-icons/lib/io/android-compass.d.ts
+++ b/types/react-icons/lib/io/android-compass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCompass extends React.Component<IconBaseProps> { }
+declare class IoAndroidCompass extends React.Component<IconBaseProps> { }
+export = IoAndroidCompass;
diff --git a/types/react-icons/lib/io/android-contact.d.ts b/types/react-icons/lib/io/android-contact.d.ts
index 933faca311..ee5ac203e7 100644
--- a/types/react-icons/lib/io/android-contact.d.ts
+++ b/types/react-icons/lib/io/android-contact.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContact extends React.Component<IconBaseProps> { }
+declare class IoAndroidContact extends React.Component<IconBaseProps> { }
+export = IoAndroidContact;
diff --git a/types/react-icons/lib/io/android-contacts.d.ts b/types/react-icons/lib/io/android-contacts.d.ts
index 22f23054ff..f7ad32a1c6 100644
--- a/types/react-icons/lib/io/android-contacts.d.ts
+++ b/types/react-icons/lib/io/android-contacts.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContacts extends React.Component<IconBaseProps> { }
+declare class IoAndroidContacts extends React.Component<IconBaseProps> { }
+export = IoAndroidContacts;
diff --git a/types/react-icons/lib/io/android-contract.d.ts b/types/react-icons/lib/io/android-contract.d.ts
index 87c6a88fa1..f5ee526460 100644
--- a/types/react-icons/lib/io/android-contract.d.ts
+++ b/types/react-icons/lib/io/android-contract.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContract extends React.Component<IconBaseProps> { }
+declare class IoAndroidContract extends React.Component<IconBaseProps> { }
+export = IoAndroidContract;
diff --git a/types/react-icons/lib/io/android-create.d.ts b/types/react-icons/lib/io/android-create.d.ts
index 38c4a7fa79..7974150c7b 100644
--- a/types/react-icons/lib/io/android-create.d.ts
+++ b/types/react-icons/lib/io/android-create.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCreate extends React.Component<IconBaseProps> { }
+declare class IoAndroidCreate extends React.Component<IconBaseProps> { }
+export = IoAndroidCreate;
diff --git a/types/react-icons/lib/io/android-delete.d.ts b/types/react-icons/lib/io/android-delete.d.ts
index 1863649507..3f4c83aa20 100644
--- a/types/react-icons/lib/io/android-delete.d.ts
+++ b/types/react-icons/lib/io/android-delete.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDelete extends React.Component<IconBaseProps> { }
+declare class IoAndroidDelete extends React.Component<IconBaseProps> { }
+export = IoAndroidDelete;
diff --git a/types/react-icons/lib/io/android-desktop.d.ts b/types/react-icons/lib/io/android-desktop.d.ts
index a8233e4c61..f826e3735a 100644
--- a/types/react-icons/lib/io/android-desktop.d.ts
+++ b/types/react-icons/lib/io/android-desktop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDesktop extends React.Component<IconBaseProps> { }
+declare class IoAndroidDesktop extends React.Component<IconBaseProps> { }
+export = IoAndroidDesktop;
diff --git a/types/react-icons/lib/io/android-document.d.ts b/types/react-icons/lib/io/android-document.d.ts
index b2a4c4d5a3..e24e4ddb2c 100644
--- a/types/react-icons/lib/io/android-document.d.ts
+++ b/types/react-icons/lib/io/android-document.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDocument extends React.Component<IconBaseProps> { }
+declare class IoAndroidDocument extends React.Component<IconBaseProps> { }
+export = IoAndroidDocument;
diff --git a/types/react-icons/lib/io/android-done-all.d.ts b/types/react-icons/lib/io/android-done-all.d.ts
index 9759331f5e..55ec050491 100644
--- a/types/react-icons/lib/io/android-done-all.d.ts
+++ b/types/react-icons/lib/io/android-done-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDoneAll extends React.Component<IconBaseProps> { }
+declare class IoAndroidDoneAll extends React.Component<IconBaseProps> { }
+export = IoAndroidDoneAll;
diff --git a/types/react-icons/lib/io/android-done.d.ts b/types/react-icons/lib/io/android-done.d.ts
index ef68fc8e34..5252d05cf6 100644
--- a/types/react-icons/lib/io/android-done.d.ts
+++ b/types/react-icons/lib/io/android-done.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDone extends React.Component<IconBaseProps> { }
+declare class IoAndroidDone extends React.Component<IconBaseProps> { }
+export = IoAndroidDone;
diff --git a/types/react-icons/lib/io/android-download.d.ts b/types/react-icons/lib/io/android-download.d.ts
index 35caf226ba..cec9c411ca 100644
--- a/types/react-icons/lib/io/android-download.d.ts
+++ b/types/react-icons/lib/io/android-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDownload extends React.Component<IconBaseProps> { }
+declare class IoAndroidDownload extends React.Component<IconBaseProps> { }
+export = IoAndroidDownload;
diff --git a/types/react-icons/lib/io/android-drafts.d.ts b/types/react-icons/lib/io/android-drafts.d.ts
index c143e50a3d..18be5b128c 100644
--- a/types/react-icons/lib/io/android-drafts.d.ts
+++ b/types/react-icons/lib/io/android-drafts.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDrafts extends React.Component<IconBaseProps> { }
+declare class IoAndroidDrafts extends React.Component<IconBaseProps> { }
+export = IoAndroidDrafts;
diff --git a/types/react-icons/lib/io/android-exit.d.ts b/types/react-icons/lib/io/android-exit.d.ts
index ad1c1fa91e..f2d97ecdc5 100644
--- a/types/react-icons/lib/io/android-exit.d.ts
+++ b/types/react-icons/lib/io/android-exit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidExit extends React.Component<IconBaseProps> { }
+declare class IoAndroidExit extends React.Component<IconBaseProps> { }
+export = IoAndroidExit;
diff --git a/types/react-icons/lib/io/android-expand.d.ts b/types/react-icons/lib/io/android-expand.d.ts
index 01e32a17c5..e4d957b4f0 100644
--- a/types/react-icons/lib/io/android-expand.d.ts
+++ b/types/react-icons/lib/io/android-expand.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidExpand extends React.Component<IconBaseProps> { }
+declare class IoAndroidExpand extends React.Component<IconBaseProps> { }
+export = IoAndroidExpand;
diff --git a/types/react-icons/lib/io/android-favorite-outline.d.ts b/types/react-icons/lib/io/android-favorite-outline.d.ts
index 9d26146836..b8736afb6b 100644
--- a/types/react-icons/lib/io/android-favorite-outline.d.ts
+++ b/types/react-icons/lib/io/android-favorite-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFavoriteOutline extends React.Component<IconBaseProps> { }
+declare class IoAndroidFavoriteOutline extends React.Component<IconBaseProps> { }
+export = IoAndroidFavoriteOutline;
diff --git a/types/react-icons/lib/io/android-favorite.d.ts b/types/react-icons/lib/io/android-favorite.d.ts
index 17fd1ebcb0..727facbe52 100644
--- a/types/react-icons/lib/io/android-favorite.d.ts
+++ b/types/react-icons/lib/io/android-favorite.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFavorite extends React.Component<IconBaseProps> { }
+declare class IoAndroidFavorite extends React.Component<IconBaseProps> { }
+export = IoAndroidFavorite;
diff --git a/types/react-icons/lib/io/android-film.d.ts b/types/react-icons/lib/io/android-film.d.ts
index d78bd6bf92..66b52ca996 100644
--- a/types/react-icons/lib/io/android-film.d.ts
+++ b/types/react-icons/lib/io/android-film.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFilm extends React.Component<IconBaseProps> { }
+declare class IoAndroidFilm extends React.Component<IconBaseProps> { }
+export = IoAndroidFilm;
diff --git a/types/react-icons/lib/io/android-folder-open.d.ts b/types/react-icons/lib/io/android-folder-open.d.ts
index b494784e58..f718448caa 100644
--- a/types/react-icons/lib/io/android-folder-open.d.ts
+++ b/types/react-icons/lib/io/android-folder-open.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFolderOpen extends React.Component<IconBaseProps> { }
+declare class IoAndroidFolderOpen extends React.Component<IconBaseProps> { }
+export = IoAndroidFolderOpen;
diff --git a/types/react-icons/lib/io/android-folder.d.ts b/types/react-icons/lib/io/android-folder.d.ts
index 19fa386920..378a96e3cd 100644
--- a/types/react-icons/lib/io/android-folder.d.ts
+++ b/types/react-icons/lib/io/android-folder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFolder extends React.Component<IconBaseProps> { }
+declare class IoAndroidFolder extends React.Component<IconBaseProps> { }
+export = IoAndroidFolder;
diff --git a/types/react-icons/lib/io/android-funnel.d.ts b/types/react-icons/lib/io/android-funnel.d.ts
index a43e13c0e5..d831baf36e 100644
--- a/types/react-icons/lib/io/android-funnel.d.ts
+++ b/types/react-icons/lib/io/android-funnel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFunnel extends React.Component<IconBaseProps> { }
+declare class IoAndroidFunnel extends React.Component<IconBaseProps> { }
+export = IoAndroidFunnel;
diff --git a/types/react-icons/lib/io/android-globe.d.ts b/types/react-icons/lib/io/android-globe.d.ts
index 7d27e58cc1..5e8ce6c9d1 100644
--- a/types/react-icons/lib/io/android-globe.d.ts
+++ b/types/react-icons/lib/io/android-globe.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidGlobe extends React.Component<IconBaseProps> { }
+declare class IoAndroidGlobe extends React.Component<IconBaseProps> { }
+export = IoAndroidGlobe;
diff --git a/types/react-icons/lib/io/android-hand.d.ts b/types/react-icons/lib/io/android-hand.d.ts
index 280652d333..7f875b0c47 100644
--- a/types/react-icons/lib/io/android-hand.d.ts
+++ b/types/react-icons/lib/io/android-hand.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHand extends React.Component<IconBaseProps> { }
+declare class IoAndroidHand extends React.Component<IconBaseProps> { }
+export = IoAndroidHand;
diff --git a/types/react-icons/lib/io/android-hangout.d.ts b/types/react-icons/lib/io/android-hangout.d.ts
index 452158902c..fa4c4dc137 100644
--- a/types/react-icons/lib/io/android-hangout.d.ts
+++ b/types/react-icons/lib/io/android-hangout.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHangout extends React.Component<IconBaseProps> { }
+declare class IoAndroidHangout extends React.Component<IconBaseProps> { }
+export = IoAndroidHangout;
diff --git a/types/react-icons/lib/io/android-happy.d.ts b/types/react-icons/lib/io/android-happy.d.ts
index 7343ceb5dd..0d81a84b94 100644
--- a/types/react-icons/lib/io/android-happy.d.ts
+++ b/types/react-icons/lib/io/android-happy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHappy extends React.Component<IconBaseProps> { }
+declare class IoAndroidHappy extends React.Component<IconBaseProps> { }
+export = IoAndroidHappy;
diff --git a/types/react-icons/lib/io/android-home.d.ts b/types/react-icons/lib/io/android-home.d.ts
index 75cc1ed488..267c85c98e 100644
--- a/types/react-icons/lib/io/android-home.d.ts
+++ b/types/react-icons/lib/io/android-home.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHome extends React.Component<IconBaseProps> { }
+declare class IoAndroidHome extends React.Component<IconBaseProps> { }
+export = IoAndroidHome;
diff --git a/types/react-icons/lib/io/android-image.d.ts b/types/react-icons/lib/io/android-image.d.ts
index 46d20ffdc2..8972e43e07 100644
--- a/types/react-icons/lib/io/android-image.d.ts
+++ b/types/react-icons/lib/io/android-image.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidImage extends React.Component<IconBaseProps> { }
+declare class IoAndroidImage extends React.Component<IconBaseProps> { }
+export = IoAndroidImage;
diff --git a/types/react-icons/lib/io/android-laptop.d.ts b/types/react-icons/lib/io/android-laptop.d.ts
index 749f603ebc..d5e07af8d4 100644
--- a/types/react-icons/lib/io/android-laptop.d.ts
+++ b/types/react-icons/lib/io/android-laptop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLaptop extends React.Component<IconBaseProps> { }
+declare class IoAndroidLaptop extends React.Component<IconBaseProps> { }
+export = IoAndroidLaptop;
diff --git a/types/react-icons/lib/io/android-list.d.ts b/types/react-icons/lib/io/android-list.d.ts
index d366495d98..ce01a34854 100644
--- a/types/react-icons/lib/io/android-list.d.ts
+++ b/types/react-icons/lib/io/android-list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidList extends React.Component<IconBaseProps> { }
+declare class IoAndroidList extends React.Component<IconBaseProps> { }
+export = IoAndroidList;
diff --git a/types/react-icons/lib/io/android-locate.d.ts b/types/react-icons/lib/io/android-locate.d.ts
index b99c14cf66..a5e54836d9 100644
--- a/types/react-icons/lib/io/android-locate.d.ts
+++ b/types/react-icons/lib/io/android-locate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLocate extends React.Component<IconBaseProps> { }
+declare class IoAndroidLocate extends React.Component<IconBaseProps> { }
+export = IoAndroidLocate;
diff --git a/types/react-icons/lib/io/android-lock.d.ts b/types/react-icons/lib/io/android-lock.d.ts
index 5447214ecf..d15e9dde78 100644
--- a/types/react-icons/lib/io/android-lock.d.ts
+++ b/types/react-icons/lib/io/android-lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLock extends React.Component<IconBaseProps> { }
+declare class IoAndroidLock extends React.Component<IconBaseProps> { }
+export = IoAndroidLock;
diff --git a/types/react-icons/lib/io/android-mail.d.ts b/types/react-icons/lib/io/android-mail.d.ts
index 29529c349f..2465408b77 100644
--- a/types/react-icons/lib/io/android-mail.d.ts
+++ b/types/react-icons/lib/io/android-mail.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMail extends React.Component<IconBaseProps> { }
+declare class IoAndroidMail extends React.Component<IconBaseProps> { }
+export = IoAndroidMail;
diff --git a/types/react-icons/lib/io/android-map.d.ts b/types/react-icons/lib/io/android-map.d.ts
index 521561d56e..3066749134 100644
--- a/types/react-icons/lib/io/android-map.d.ts
+++ b/types/react-icons/lib/io/android-map.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMap extends React.Component<IconBaseProps> { }
+declare class IoAndroidMap extends React.Component<IconBaseProps> { }
+export = IoAndroidMap;
diff --git a/types/react-icons/lib/io/android-menu.d.ts b/types/react-icons/lib/io/android-menu.d.ts
index f14d3f29fa..868ad478ff 100644
--- a/types/react-icons/lib/io/android-menu.d.ts
+++ b/types/react-icons/lib/io/android-menu.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMenu extends React.Component<IconBaseProps> { }
+declare class IoAndroidMenu extends React.Component<IconBaseProps> { }
+export = IoAndroidMenu;
diff --git a/types/react-icons/lib/io/android-microphone-off.d.ts b/types/react-icons/lib/io/android-microphone-off.d.ts
index 57ea0597db..b3df997b00 100644
--- a/types/react-icons/lib/io/android-microphone-off.d.ts
+++ b/types/react-icons/lib/io/android-microphone-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMicrophoneOff extends React.Component<IconBaseProps> { }
+declare class IoAndroidMicrophoneOff extends React.Component<IconBaseProps> { }
+export = IoAndroidMicrophoneOff;
diff --git a/types/react-icons/lib/io/android-microphone.d.ts b/types/react-icons/lib/io/android-microphone.d.ts
index 2e9105f34a..0ea8dc5a3f 100644
--- a/types/react-icons/lib/io/android-microphone.d.ts
+++ b/types/react-icons/lib/io/android-microphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMicrophone extends React.Component<IconBaseProps> { }
+declare class IoAndroidMicrophone extends React.Component<IconBaseProps> { }
+export = IoAndroidMicrophone;
diff --git a/types/react-icons/lib/io/android-more-horizontal.d.ts b/types/react-icons/lib/io/android-more-horizontal.d.ts
index 4bdb7f35fd..231574bf5d 100644
--- a/types/react-icons/lib/io/android-more-horizontal.d.ts
+++ b/types/react-icons/lib/io/android-more-horizontal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMoreHorizontal extends React.Component<IconBaseProps> { }
+declare class IoAndroidMoreHorizontal extends React.Component<IconBaseProps> { }
+export = IoAndroidMoreHorizontal;
diff --git a/types/react-icons/lib/io/android-more-vertical.d.ts b/types/react-icons/lib/io/android-more-vertical.d.ts
index f3b900b03a..aead3ae9fd 100644
--- a/types/react-icons/lib/io/android-more-vertical.d.ts
+++ b/types/react-icons/lib/io/android-more-vertical.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMoreVertical extends React.Component<IconBaseProps> { }
+declare class IoAndroidMoreVertical extends React.Component<IconBaseProps> { }
+export = IoAndroidMoreVertical;
diff --git a/types/react-icons/lib/io/android-navigate.d.ts b/types/react-icons/lib/io/android-navigate.d.ts
index c062fdb9a2..fdf359e643 100644
--- a/types/react-icons/lib/io/android-navigate.d.ts
+++ b/types/react-icons/lib/io/android-navigate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNavigate extends React.Component<IconBaseProps> { }
+declare class IoAndroidNavigate extends React.Component<IconBaseProps> { }
+export = IoAndroidNavigate;
diff --git a/types/react-icons/lib/io/android-notifications-none.d.ts b/types/react-icons/lib/io/android-notifications-none.d.ts
index a5df08d48a..67894b2bca 100644
--- a/types/react-icons/lib/io/android-notifications-none.d.ts
+++ b/types/react-icons/lib/io/android-notifications-none.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotificationsNone extends React.Component<IconBaseProps> { }
+declare class IoAndroidNotificationsNone extends React.Component<IconBaseProps> { }
+export = IoAndroidNotificationsNone;
diff --git a/types/react-icons/lib/io/android-notifications-off.d.ts b/types/react-icons/lib/io/android-notifications-off.d.ts
index 38e64be76b..2bfa60b253 100644
--- a/types/react-icons/lib/io/android-notifications-off.d.ts
+++ b/types/react-icons/lib/io/android-notifications-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotificationsOff extends React.Component<IconBaseProps> { }
+declare class IoAndroidNotificationsOff extends React.Component<IconBaseProps> { }
+export = IoAndroidNotificationsOff;
diff --git a/types/react-icons/lib/io/android-notifications.d.ts b/types/react-icons/lib/io/android-notifications.d.ts
index f3fdc7b4fe..21f92ed397 100644
--- a/types/react-icons/lib/io/android-notifications.d.ts
+++ b/types/react-icons/lib/io/android-notifications.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotifications extends React.Component<IconBaseProps> { }
+declare class IoAndroidNotifications extends React.Component<IconBaseProps> { }
+export = IoAndroidNotifications;
diff --git a/types/react-icons/lib/io/android-open.d.ts b/types/react-icons/lib/io/android-open.d.ts
index 8ef0abebde..186053e4fe 100644
--- a/types/react-icons/lib/io/android-open.d.ts
+++ b/types/react-icons/lib/io/android-open.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidOpen extends React.Component<IconBaseProps> { }
+declare class IoAndroidOpen extends React.Component<IconBaseProps> { }
+export = IoAndroidOpen;
diff --git a/types/react-icons/lib/io/android-options.d.ts b/types/react-icons/lib/io/android-options.d.ts
index 61640a419f..1a02e94789 100644
--- a/types/react-icons/lib/io/android-options.d.ts
+++ b/types/react-icons/lib/io/android-options.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidOptions extends React.Component<IconBaseProps> { }
+declare class IoAndroidOptions extends React.Component<IconBaseProps> { }
+export = IoAndroidOptions;
diff --git a/types/react-icons/lib/io/android-people.d.ts b/types/react-icons/lib/io/android-people.d.ts
index 4f19a67eda..f2ee5547f1 100644
--- a/types/react-icons/lib/io/android-people.d.ts
+++ b/types/react-icons/lib/io/android-people.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPeople extends React.Component<IconBaseProps> { }
+declare class IoAndroidPeople extends React.Component<IconBaseProps> { }
+export = IoAndroidPeople;
diff --git a/types/react-icons/lib/io/android-person-add.d.ts b/types/react-icons/lib/io/android-person-add.d.ts
index 4fe6408fe0..1a81999f85 100644
--- a/types/react-icons/lib/io/android-person-add.d.ts
+++ b/types/react-icons/lib/io/android-person-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPersonAdd extends React.Component<IconBaseProps> { }
+declare class IoAndroidPersonAdd extends React.Component<IconBaseProps> { }
+export = IoAndroidPersonAdd;
diff --git a/types/react-icons/lib/io/android-person.d.ts b/types/react-icons/lib/io/android-person.d.ts
index ad0e00481a..5ef1b2d2d5 100644
--- a/types/react-icons/lib/io/android-person.d.ts
+++ b/types/react-icons/lib/io/android-person.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPerson extends React.Component<IconBaseProps> { }
+declare class IoAndroidPerson extends React.Component<IconBaseProps> { }
+export = IoAndroidPerson;
diff --git a/types/react-icons/lib/io/android-phone-landscape.d.ts b/types/react-icons/lib/io/android-phone-landscape.d.ts
index bfff8ac323..ba076c50df 100644
--- a/types/react-icons/lib/io/android-phone-landscape.d.ts
+++ b/types/react-icons/lib/io/android-phone-landscape.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPhoneLandscape extends React.Component<IconBaseProps> { }
+declare class IoAndroidPhoneLandscape extends React.Component<IconBaseProps> { }
+export = IoAndroidPhoneLandscape;
diff --git a/types/react-icons/lib/io/android-phone-portrait.d.ts b/types/react-icons/lib/io/android-phone-portrait.d.ts
index 4a14130c8d..c0e8363ed5 100644
--- a/types/react-icons/lib/io/android-phone-portrait.d.ts
+++ b/types/react-icons/lib/io/android-phone-portrait.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPhonePortrait extends React.Component<IconBaseProps> { }
+declare class IoAndroidPhonePortrait extends React.Component<IconBaseProps> { }
+export = IoAndroidPhonePortrait;
diff --git a/types/react-icons/lib/io/android-pin.d.ts b/types/react-icons/lib/io/android-pin.d.ts
index 5819b33b52..928bd7247c 100644
--- a/types/react-icons/lib/io/android-pin.d.ts
+++ b/types/react-icons/lib/io/android-pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPin extends React.Component<IconBaseProps> { }
+declare class IoAndroidPin extends React.Component<IconBaseProps> { }
+export = IoAndroidPin;
diff --git a/types/react-icons/lib/io/android-plane.d.ts b/types/react-icons/lib/io/android-plane.d.ts
index 4b436e096b..98704916c8 100644
--- a/types/react-icons/lib/io/android-plane.d.ts
+++ b/types/react-icons/lib/io/android-plane.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPlane extends React.Component<IconBaseProps> { }
+declare class IoAndroidPlane extends React.Component<IconBaseProps> { }
+export = IoAndroidPlane;
diff --git a/types/react-icons/lib/io/android-playstore.d.ts b/types/react-icons/lib/io/android-playstore.d.ts
index 99174ccab2..26f14fea70 100644
--- a/types/react-icons/lib/io/android-playstore.d.ts
+++ b/types/react-icons/lib/io/android-playstore.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPlaystore extends React.Component<IconBaseProps> { }
+declare class IoAndroidPlaystore extends React.Component<IconBaseProps> { }
+export = IoAndroidPlaystore;
diff --git a/types/react-icons/lib/io/android-print.d.ts b/types/react-icons/lib/io/android-print.d.ts
index b2f5807f06..40c6cc7631 100644
--- a/types/react-icons/lib/io/android-print.d.ts
+++ b/types/react-icons/lib/io/android-print.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPrint extends React.Component<IconBaseProps> { }
+declare class IoAndroidPrint extends React.Component<IconBaseProps> { }
+export = IoAndroidPrint;
diff --git a/types/react-icons/lib/io/android-radio-button-off.d.ts b/types/react-icons/lib/io/android-radio-button-off.d.ts
index fc2f705ff1..d5e637b6c6 100644
--- a/types/react-icons/lib/io/android-radio-button-off.d.ts
+++ b/types/react-icons/lib/io/android-radio-button-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRadioButtonOff extends React.Component<IconBaseProps> { }
+declare class IoAndroidRadioButtonOff extends React.Component<IconBaseProps> { }
+export = IoAndroidRadioButtonOff;
diff --git a/types/react-icons/lib/io/android-radio-button-on.d.ts b/types/react-icons/lib/io/android-radio-button-on.d.ts
index be28d7626e..9ad7514123 100644
--- a/types/react-icons/lib/io/android-radio-button-on.d.ts
+++ b/types/react-icons/lib/io/android-radio-button-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRadioButtonOn extends React.Component<IconBaseProps> { }
+declare class IoAndroidRadioButtonOn extends React.Component<IconBaseProps> { }
+export = IoAndroidRadioButtonOn;
diff --git a/types/react-icons/lib/io/android-refresh.d.ts b/types/react-icons/lib/io/android-refresh.d.ts
index eee0a2b96f..deeb3fe43b 100644
--- a/types/react-icons/lib/io/android-refresh.d.ts
+++ b/types/react-icons/lib/io/android-refresh.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRefresh extends React.Component<IconBaseProps> { }
+declare class IoAndroidRefresh extends React.Component<IconBaseProps> { }
+export = IoAndroidRefresh;
diff --git a/types/react-icons/lib/io/android-remove-circle.d.ts b/types/react-icons/lib/io/android-remove-circle.d.ts
index 7c525668f8..80d0dfef57 100644
--- a/types/react-icons/lib/io/android-remove-circle.d.ts
+++ b/types/react-icons/lib/io/android-remove-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRemoveCircle extends React.Component<IconBaseProps> { }
+declare class IoAndroidRemoveCircle extends React.Component<IconBaseProps> { }
+export = IoAndroidRemoveCircle;
diff --git a/types/react-icons/lib/io/android-remove.d.ts b/types/react-icons/lib/io/android-remove.d.ts
index 3767b079d3..9255e5e859 100644
--- a/types/react-icons/lib/io/android-remove.d.ts
+++ b/types/react-icons/lib/io/android-remove.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRemove extends React.Component<IconBaseProps> { }
+declare class IoAndroidRemove extends React.Component<IconBaseProps> { }
+export = IoAndroidRemove;
diff --git a/types/react-icons/lib/io/android-restaurant.d.ts b/types/react-icons/lib/io/android-restaurant.d.ts
index 5bb7a6ef15..492c12f5d0 100644
--- a/types/react-icons/lib/io/android-restaurant.d.ts
+++ b/types/react-icons/lib/io/android-restaurant.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRestaurant extends React.Component<IconBaseProps> { }
+declare class IoAndroidRestaurant extends React.Component<IconBaseProps> { }
+export = IoAndroidRestaurant;
diff --git a/types/react-icons/lib/io/android-sad.d.ts b/types/react-icons/lib/io/android-sad.d.ts
index dc45162222..1ed6bf48e8 100644
--- a/types/react-icons/lib/io/android-sad.d.ts
+++ b/types/react-icons/lib/io/android-sad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSad extends React.Component<IconBaseProps> { }
+declare class IoAndroidSad extends React.Component<IconBaseProps> { }
+export = IoAndroidSad;
diff --git a/types/react-icons/lib/io/android-search.d.ts b/types/react-icons/lib/io/android-search.d.ts
index b5158286a1..e237357e4d 100644
--- a/types/react-icons/lib/io/android-search.d.ts
+++ b/types/react-icons/lib/io/android-search.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSearch extends React.Component<IconBaseProps> { }
+declare class IoAndroidSearch extends React.Component<IconBaseProps> { }
+export = IoAndroidSearch;
diff --git a/types/react-icons/lib/io/android-send.d.ts b/types/react-icons/lib/io/android-send.d.ts
index eebec03631..ee0efa2097 100644
--- a/types/react-icons/lib/io/android-send.d.ts
+++ b/types/react-icons/lib/io/android-send.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSend extends React.Component<IconBaseProps> { }
+declare class IoAndroidSend extends React.Component<IconBaseProps> { }
+export = IoAndroidSend;
diff --git a/types/react-icons/lib/io/android-settings.d.ts b/types/react-icons/lib/io/android-settings.d.ts
index c302aedf0c..ab7b4d2da1 100644
--- a/types/react-icons/lib/io/android-settings.d.ts
+++ b/types/react-icons/lib/io/android-settings.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSettings extends React.Component<IconBaseProps> { }
+declare class IoAndroidSettings extends React.Component<IconBaseProps> { }
+export = IoAndroidSettings;
diff --git a/types/react-icons/lib/io/android-share-alt.d.ts b/types/react-icons/lib/io/android-share-alt.d.ts
index dcdb8a648c..b833a5ea78 100644
--- a/types/react-icons/lib/io/android-share-alt.d.ts
+++ b/types/react-icons/lib/io/android-share-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidShareAlt extends React.Component<IconBaseProps> { }
+declare class IoAndroidShareAlt extends React.Component<IconBaseProps> { }
+export = IoAndroidShareAlt;
diff --git a/types/react-icons/lib/io/android-share.d.ts b/types/react-icons/lib/io/android-share.d.ts
index 6b61e7c4e9..045317149c 100644
--- a/types/react-icons/lib/io/android-share.d.ts
+++ b/types/react-icons/lib/io/android-share.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidShare extends React.Component<IconBaseProps> { }
+declare class IoAndroidShare extends React.Component<IconBaseProps> { }
+export = IoAndroidShare;
diff --git a/types/react-icons/lib/io/android-star-half.d.ts b/types/react-icons/lib/io/android-star-half.d.ts
index 6a9ce4048a..607b5f5035 100644
--- a/types/react-icons/lib/io/android-star-half.d.ts
+++ b/types/react-icons/lib/io/android-star-half.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStarHalf extends React.Component<IconBaseProps> { }
+declare class IoAndroidStarHalf extends React.Component<IconBaseProps> { }
+export = IoAndroidStarHalf;
diff --git a/types/react-icons/lib/io/android-star-outline.d.ts b/types/react-icons/lib/io/android-star-outline.d.ts
index 3413a8803c..ba99643a3e 100644
--- a/types/react-icons/lib/io/android-star-outline.d.ts
+++ b/types/react-icons/lib/io/android-star-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStarOutline extends React.Component<IconBaseProps> { }
+declare class IoAndroidStarOutline extends React.Component<IconBaseProps> { }
+export = IoAndroidStarOutline;
diff --git a/types/react-icons/lib/io/android-star.d.ts b/types/react-icons/lib/io/android-star.d.ts
index 0c6beadab5..830503a5dc 100644
--- a/types/react-icons/lib/io/android-star.d.ts
+++ b/types/react-icons/lib/io/android-star.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStar extends React.Component<IconBaseProps> { }
+declare class IoAndroidStar extends React.Component<IconBaseProps> { }
+export = IoAndroidStar;
diff --git a/types/react-icons/lib/io/android-stopwatch.d.ts b/types/react-icons/lib/io/android-stopwatch.d.ts
index 1094ca3036..fab66e6072 100644
--- a/types/react-icons/lib/io/android-stopwatch.d.ts
+++ b/types/react-icons/lib/io/android-stopwatch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStopwatch extends React.Component<IconBaseProps> { }
+declare class IoAndroidStopwatch extends React.Component<IconBaseProps> { }
+export = IoAndroidStopwatch;
diff --git a/types/react-icons/lib/io/android-subway.d.ts b/types/react-icons/lib/io/android-subway.d.ts
index 1939fd06d3..19adba3f4b 100644
--- a/types/react-icons/lib/io/android-subway.d.ts
+++ b/types/react-icons/lib/io/android-subway.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSubway extends React.Component<IconBaseProps> { }
+declare class IoAndroidSubway extends React.Component<IconBaseProps> { }
+export = IoAndroidSubway;
diff --git a/types/react-icons/lib/io/android-sunny.d.ts b/types/react-icons/lib/io/android-sunny.d.ts
index 382cc921aa..5cc49715d8 100644
--- a/types/react-icons/lib/io/android-sunny.d.ts
+++ b/types/react-icons/lib/io/android-sunny.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSunny extends React.Component<IconBaseProps> { }
+declare class IoAndroidSunny extends React.Component<IconBaseProps> { }
+export = IoAndroidSunny;
diff --git a/types/react-icons/lib/io/android-sync.d.ts b/types/react-icons/lib/io/android-sync.d.ts
index 27b8493ecf..e96dbf6b3d 100644
--- a/types/react-icons/lib/io/android-sync.d.ts
+++ b/types/react-icons/lib/io/android-sync.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSync extends React.Component<IconBaseProps> { }
+declare class IoAndroidSync extends React.Component<IconBaseProps> { }
+export = IoAndroidSync;
diff --git a/types/react-icons/lib/io/android-textsms.d.ts b/types/react-icons/lib/io/android-textsms.d.ts
index 8020ed572a..06c59d582b 100644
--- a/types/react-icons/lib/io/android-textsms.d.ts
+++ b/types/react-icons/lib/io/android-textsms.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTextsms extends React.Component<IconBaseProps> { }
+declare class IoAndroidTextsms extends React.Component<IconBaseProps> { }
+export = IoAndroidTextsms;
diff --git a/types/react-icons/lib/io/android-time.d.ts b/types/react-icons/lib/io/android-time.d.ts
index 741d66a005..934829c7db 100644
--- a/types/react-icons/lib/io/android-time.d.ts
+++ b/types/react-icons/lib/io/android-time.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTime extends React.Component<IconBaseProps> { }
+declare class IoAndroidTime extends React.Component<IconBaseProps> { }
+export = IoAndroidTime;
diff --git a/types/react-icons/lib/io/android-train.d.ts b/types/react-icons/lib/io/android-train.d.ts
index c55e985bdd..a37d8f8402 100644
--- a/types/react-icons/lib/io/android-train.d.ts
+++ b/types/react-icons/lib/io/android-train.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTrain extends React.Component<IconBaseProps> { }
+declare class IoAndroidTrain extends React.Component<IconBaseProps> { }
+export = IoAndroidTrain;
diff --git a/types/react-icons/lib/io/android-unlock.d.ts b/types/react-icons/lib/io/android-unlock.d.ts
index 5eec9a875c..4ee8e33508 100644
--- a/types/react-icons/lib/io/android-unlock.d.ts
+++ b/types/react-icons/lib/io/android-unlock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidUnlock extends React.Component<IconBaseProps> { }
+declare class IoAndroidUnlock extends React.Component<IconBaseProps> { }
+export = IoAndroidUnlock;
diff --git a/types/react-icons/lib/io/android-upload.d.ts b/types/react-icons/lib/io/android-upload.d.ts
index d5e092172f..e0643362b5 100644
--- a/types/react-icons/lib/io/android-upload.d.ts
+++ b/types/react-icons/lib/io/android-upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidUpload extends React.Component<IconBaseProps> { }
+declare class IoAndroidUpload extends React.Component<IconBaseProps> { }
+export = IoAndroidUpload;
diff --git a/types/react-icons/lib/io/android-volume-down.d.ts b/types/react-icons/lib/io/android-volume-down.d.ts
index ce256873be..9ec7c47caf 100644
--- a/types/react-icons/lib/io/android-volume-down.d.ts
+++ b/types/react-icons/lib/io/android-volume-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeDown extends React.Component<IconBaseProps> { }
+declare class IoAndroidVolumeDown extends React.Component<IconBaseProps> { }
+export = IoAndroidVolumeDown;
diff --git a/types/react-icons/lib/io/android-volume-mute.d.ts b/types/react-icons/lib/io/android-volume-mute.d.ts
index 0675809779..86dbdd1ca9 100644
--- a/types/react-icons/lib/io/android-volume-mute.d.ts
+++ b/types/react-icons/lib/io/android-volume-mute.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeMute extends React.Component<IconBaseProps> { }
+declare class IoAndroidVolumeMute extends React.Component<IconBaseProps> { }
+export = IoAndroidVolumeMute;
diff --git a/types/react-icons/lib/io/android-volume-off.d.ts b/types/react-icons/lib/io/android-volume-off.d.ts
index 76cbb85947..dd077d1d06 100644
--- a/types/react-icons/lib/io/android-volume-off.d.ts
+++ b/types/react-icons/lib/io/android-volume-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeOff extends React.Component<IconBaseProps> { }
+declare class IoAndroidVolumeOff extends React.Component<IconBaseProps> { }
+export = IoAndroidVolumeOff;
diff --git a/types/react-icons/lib/io/android-volume-up.d.ts b/types/react-icons/lib/io/android-volume-up.d.ts
index ff3531cf02..11ea99a2ae 100644
--- a/types/react-icons/lib/io/android-volume-up.d.ts
+++ b/types/react-icons/lib/io/android-volume-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeUp extends React.Component<IconBaseProps> { }
+declare class IoAndroidVolumeUp extends React.Component<IconBaseProps> { }
+export = IoAndroidVolumeUp;
diff --git a/types/react-icons/lib/io/android-walk.d.ts b/types/react-icons/lib/io/android-walk.d.ts
index 2d9c9fdfeb..df56fc72c7 100644
--- a/types/react-icons/lib/io/android-walk.d.ts
+++ b/types/react-icons/lib/io/android-walk.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWalk extends React.Component<IconBaseProps> { }
+declare class IoAndroidWalk extends React.Component<IconBaseProps> { }
+export = IoAndroidWalk;
diff --git a/types/react-icons/lib/io/android-warning.d.ts b/types/react-icons/lib/io/android-warning.d.ts
index ae0512a305..54dee71508 100644
--- a/types/react-icons/lib/io/android-warning.d.ts
+++ b/types/react-icons/lib/io/android-warning.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWarning extends React.Component<IconBaseProps> { }
+declare class IoAndroidWarning extends React.Component<IconBaseProps> { }
+export = IoAndroidWarning;
diff --git a/types/react-icons/lib/io/android-watch.d.ts b/types/react-icons/lib/io/android-watch.d.ts
index fd4f03a21d..5df467fbda 100644
--- a/types/react-icons/lib/io/android-watch.d.ts
+++ b/types/react-icons/lib/io/android-watch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWatch extends React.Component<IconBaseProps> { }
+declare class IoAndroidWatch extends React.Component<IconBaseProps> { }
+export = IoAndroidWatch;
diff --git a/types/react-icons/lib/io/android-wifi.d.ts b/types/react-icons/lib/io/android-wifi.d.ts
index 52f56bfd92..c9faee16ba 100644
--- a/types/react-icons/lib/io/android-wifi.d.ts
+++ b/types/react-icons/lib/io/android-wifi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWifi extends React.Component<IconBaseProps> { }
+declare class IoAndroidWifi extends React.Component<IconBaseProps> { }
+export = IoAndroidWifi;
diff --git a/types/react-icons/lib/io/aperture.d.ts b/types/react-icons/lib/io/aperture.d.ts
index 433117938f..bae5242d92 100644
--- a/types/react-icons/lib/io/aperture.d.ts
+++ b/types/react-icons/lib/io/aperture.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAperture extends React.Component<IconBaseProps> { }
+declare class IoAperture extends React.Component<IconBaseProps> { }
+export = IoAperture;
diff --git a/types/react-icons/lib/io/archive.d.ts b/types/react-icons/lib/io/archive.d.ts
index 90863a6615..0408f86352 100644
--- a/types/react-icons/lib/io/archive.d.ts
+++ b/types/react-icons/lib/io/archive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArchive extends React.Component<IconBaseProps> { }
+declare class IoArchive extends React.Component<IconBaseProps> { }
+export = IoArchive;
diff --git a/types/react-icons/lib/io/arrow-down-a.d.ts b/types/react-icons/lib/io/arrow-down-a.d.ts
index eadf0800bb..1dedc57504 100644
--- a/types/react-icons/lib/io/arrow-down-a.d.ts
+++ b/types/react-icons/lib/io/arrow-down-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownA extends React.Component<IconBaseProps> { }
+declare class IoArrowDownA extends React.Component<IconBaseProps> { }
+export = IoArrowDownA;
diff --git a/types/react-icons/lib/io/arrow-down-b.d.ts b/types/react-icons/lib/io/arrow-down-b.d.ts
index 281147e627..2317676b0d 100644
--- a/types/react-icons/lib/io/arrow-down-b.d.ts
+++ b/types/react-icons/lib/io/arrow-down-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownB extends React.Component<IconBaseProps> { }
+declare class IoArrowDownB extends React.Component<IconBaseProps> { }
+export = IoArrowDownB;
diff --git a/types/react-icons/lib/io/arrow-down-c.d.ts b/types/react-icons/lib/io/arrow-down-c.d.ts
index ab561572b2..9ff6bff0d2 100644
--- a/types/react-icons/lib/io/arrow-down-c.d.ts
+++ b/types/react-icons/lib/io/arrow-down-c.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownC extends React.Component<IconBaseProps> { }
+declare class IoArrowDownC extends React.Component<IconBaseProps> { }
+export = IoArrowDownC;
diff --git a/types/react-icons/lib/io/arrow-expand.d.ts b/types/react-icons/lib/io/arrow-expand.d.ts
index 273819c731..043d2e18a4 100644
--- a/types/react-icons/lib/io/arrow-expand.d.ts
+++ b/types/react-icons/lib/io/arrow-expand.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowExpand extends React.Component<IconBaseProps> { }
+declare class IoArrowExpand extends React.Component<IconBaseProps> { }
+export = IoArrowExpand;
diff --git a/types/react-icons/lib/io/arrow-graph-down-left.d.ts b/types/react-icons/lib/io/arrow-graph-down-left.d.ts
index db6c5aed00..e90bc57702 100644
--- a/types/react-icons/lib/io/arrow-graph-down-left.d.ts
+++ b/types/react-icons/lib/io/arrow-graph-down-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphDownLeft extends React.Component<IconBaseProps> { }
+declare class IoArrowGraphDownLeft extends React.Component<IconBaseProps> { }
+export = IoArrowGraphDownLeft;
diff --git a/types/react-icons/lib/io/arrow-graph-down-right.d.ts b/types/react-icons/lib/io/arrow-graph-down-right.d.ts
index f64ec5a4b5..bdbb62bcc3 100644
--- a/types/react-icons/lib/io/arrow-graph-down-right.d.ts
+++ b/types/react-icons/lib/io/arrow-graph-down-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphDownRight extends React.Component<IconBaseProps> { }
+declare class IoArrowGraphDownRight extends React.Component<IconBaseProps> { }
+export = IoArrowGraphDownRight;
diff --git a/types/react-icons/lib/io/arrow-graph-up-left.d.ts b/types/react-icons/lib/io/arrow-graph-up-left.d.ts
index d4c1f87aee..d664e9b362 100644
--- a/types/react-icons/lib/io/arrow-graph-up-left.d.ts
+++ b/types/react-icons/lib/io/arrow-graph-up-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphUpLeft extends React.Component<IconBaseProps> { }
+declare class IoArrowGraphUpLeft extends React.Component<IconBaseProps> { }
+export = IoArrowGraphUpLeft;
diff --git a/types/react-icons/lib/io/arrow-graph-up-right.d.ts b/types/react-icons/lib/io/arrow-graph-up-right.d.ts
index 2b79959860..4a2c256739 100644
--- a/types/react-icons/lib/io/arrow-graph-up-right.d.ts
+++ b/types/react-icons/lib/io/arrow-graph-up-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphUpRight extends React.Component<IconBaseProps> { }
+declare class IoArrowGraphUpRight extends React.Component<IconBaseProps> { }
+export = IoArrowGraphUpRight;
diff --git a/types/react-icons/lib/io/arrow-left-a.d.ts b/types/react-icons/lib/io/arrow-left-a.d.ts
index 3e7fb51bdd..b89b682227 100644
--- a/types/react-icons/lib/io/arrow-left-a.d.ts
+++ b/types/react-icons/lib/io/arrow-left-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftA extends React.Component<IconBaseProps> { }
+declare class IoArrowLeftA extends React.Component<IconBaseProps> { }
+export = IoArrowLeftA;
diff --git a/types/react-icons/lib/io/arrow-left-b.d.ts b/types/react-icons/lib/io/arrow-left-b.d.ts
index 537365c037..30af2945b4 100644
--- a/types/react-icons/lib/io/arrow-left-b.d.ts
+++ b/types/react-icons/lib/io/arrow-left-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftB extends React.Component<IconBaseProps> { }
+declare class IoArrowLeftB extends React.Component<IconBaseProps> { }
+export = IoArrowLeftB;
diff --git a/types/react-icons/lib/io/arrow-left-c.d.ts b/types/react-icons/lib/io/arrow-left-c.d.ts
index a831c73c50..8cfe94b64b 100644
--- a/types/react-icons/lib/io/arrow-left-c.d.ts
+++ b/types/react-icons/lib/io/arrow-left-c.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftC extends React.Component<IconBaseProps> { }
+declare class IoArrowLeftC extends React.Component<IconBaseProps> { }
+export = IoArrowLeftC;
diff --git a/types/react-icons/lib/io/arrow-move.d.ts b/types/react-icons/lib/io/arrow-move.d.ts
index 1a61a6c75c..9f777b2fcc 100644
--- a/types/react-icons/lib/io/arrow-move.d.ts
+++ b/types/react-icons/lib/io/arrow-move.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowMove extends React.Component<IconBaseProps> { }
+declare class IoArrowMove extends React.Component<IconBaseProps> { }
+export = IoArrowMove;
diff --git a/types/react-icons/lib/io/arrow-resize.d.ts b/types/react-icons/lib/io/arrow-resize.d.ts
index a8efbc36cf..af774ee064 100644
--- a/types/react-icons/lib/io/arrow-resize.d.ts
+++ b/types/react-icons/lib/io/arrow-resize.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowResize extends React.Component<IconBaseProps> { }
+declare class IoArrowResize extends React.Component<IconBaseProps> { }
+export = IoArrowResize;
diff --git a/types/react-icons/lib/io/arrow-return-left.d.ts b/types/react-icons/lib/io/arrow-return-left.d.ts
index 9e0a076927..7e94317274 100644
--- a/types/react-icons/lib/io/arrow-return-left.d.ts
+++ b/types/react-icons/lib/io/arrow-return-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowReturnLeft extends React.Component<IconBaseProps> { }
+declare class IoArrowReturnLeft extends React.Component<IconBaseProps> { }
+export = IoArrowReturnLeft;
diff --git a/types/react-icons/lib/io/arrow-return-right.d.ts b/types/react-icons/lib/io/arrow-return-right.d.ts
index 0bab75e6e9..13fd74b5e4 100644
--- a/types/react-icons/lib/io/arrow-return-right.d.ts
+++ b/types/react-icons/lib/io/arrow-return-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowReturnRight extends React.Component<IconBaseProps> { }
+declare class IoArrowReturnRight extends React.Component<IconBaseProps> { }
+export = IoArrowReturnRight;
diff --git a/types/react-icons/lib/io/arrow-right-a.d.ts b/types/react-icons/lib/io/arrow-right-a.d.ts
index e91a2984da..5644440a01 100644
--- a/types/react-icons/lib/io/arrow-right-a.d.ts
+++ b/types/react-icons/lib/io/arrow-right-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightA extends React.Component<IconBaseProps> { }
+declare class IoArrowRightA extends React.Component<IconBaseProps> { }
+export = IoArrowRightA;
diff --git a/types/react-icons/lib/io/arrow-right-b.d.ts b/types/react-icons/lib/io/arrow-right-b.d.ts
index e85dce6f12..ca3ede5d9f 100644
--- a/types/react-icons/lib/io/arrow-right-b.d.ts
+++ b/types/react-icons/lib/io/arrow-right-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightB extends React.Component<IconBaseProps> { }
+declare class IoArrowRightB extends React.Component<IconBaseProps> { }
+export = IoArrowRightB;
diff --git a/types/react-icons/lib/io/arrow-right-c.d.ts b/types/react-icons/lib/io/arrow-right-c.d.ts
index 5673e8df4c..5fe6a6febb 100644
--- a/types/react-icons/lib/io/arrow-right-c.d.ts
+++ b/types/react-icons/lib/io/arrow-right-c.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightC extends React.Component<IconBaseProps> { }
+declare class IoArrowRightC extends React.Component<IconBaseProps> { }
+export = IoArrowRightC;
diff --git a/types/react-icons/lib/io/arrow-shrink.d.ts b/types/react-icons/lib/io/arrow-shrink.d.ts
index 5fa8093af3..92ae49b26a 100644
--- a/types/react-icons/lib/io/arrow-shrink.d.ts
+++ b/types/react-icons/lib/io/arrow-shrink.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowShrink extends React.Component<IconBaseProps> { }
+declare class IoArrowShrink extends React.Component<IconBaseProps> { }
+export = IoArrowShrink;
diff --git a/types/react-icons/lib/io/arrow-swap.d.ts b/types/react-icons/lib/io/arrow-swap.d.ts
index 885a2c27ad..731f96350b 100644
--- a/types/react-icons/lib/io/arrow-swap.d.ts
+++ b/types/react-icons/lib/io/arrow-swap.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowSwap extends React.Component<IconBaseProps> { }
+declare class IoArrowSwap extends React.Component<IconBaseProps> { }
+export = IoArrowSwap;
diff --git a/types/react-icons/lib/io/arrow-up-a.d.ts b/types/react-icons/lib/io/arrow-up-a.d.ts
index a3967e9d42..0c77386594 100644
--- a/types/react-icons/lib/io/arrow-up-a.d.ts
+++ b/types/react-icons/lib/io/arrow-up-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpA extends React.Component<IconBaseProps> { }
+declare class IoArrowUpA extends React.Component<IconBaseProps> { }
+export = IoArrowUpA;
diff --git a/types/react-icons/lib/io/arrow-up-b.d.ts b/types/react-icons/lib/io/arrow-up-b.d.ts
index 1c91d058f7..7f72760763 100644
--- a/types/react-icons/lib/io/arrow-up-b.d.ts
+++ b/types/react-icons/lib/io/arrow-up-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpB extends React.Component<IconBaseProps> { }
+declare class IoArrowUpB extends React.Component<IconBaseProps> { }
+export = IoArrowUpB;
diff --git a/types/react-icons/lib/io/arrow-up-c.d.ts b/types/react-icons/lib/io/arrow-up-c.d.ts
index 9ca25a35a9..7d7c51f6bb 100644
--- a/types/react-icons/lib/io/arrow-up-c.d.ts
+++ b/types/react-icons/lib/io/arrow-up-c.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpC extends React.Component<IconBaseProps> { }
+declare class IoArrowUpC extends React.Component<IconBaseProps> { }
+export = IoArrowUpC;
diff --git a/types/react-icons/lib/io/asterisk.d.ts b/types/react-icons/lib/io/asterisk.d.ts
index a5b58bd24e..240751b3f6 100644
--- a/types/react-icons/lib/io/asterisk.d.ts
+++ b/types/react-icons/lib/io/asterisk.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAsterisk extends React.Component<IconBaseProps> { }
+declare class IoAsterisk extends React.Component<IconBaseProps> { }
+export = IoAsterisk;
diff --git a/types/react-icons/lib/io/at.d.ts b/types/react-icons/lib/io/at.d.ts
index cb7284b40f..d6790f610c 100644
--- a/types/react-icons/lib/io/at.d.ts
+++ b/types/react-icons/lib/io/at.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAt extends React.Component<IconBaseProps> { }
+declare class IoAt extends React.Component<IconBaseProps> { }
+export = IoAt;
diff --git a/types/react-icons/lib/io/backspace-outline.d.ts b/types/react-icons/lib/io/backspace-outline.d.ts
index 8ce9f476c5..c990c421b2 100644
--- a/types/react-icons/lib/io/backspace-outline.d.ts
+++ b/types/react-icons/lib/io/backspace-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBackspaceOutline extends React.Component<IconBaseProps> { }
+declare class IoBackspaceOutline extends React.Component<IconBaseProps> { }
+export = IoBackspaceOutline;
diff --git a/types/react-icons/lib/io/backspace.d.ts b/types/react-icons/lib/io/backspace.d.ts
index a1d19677b8..fbb75f30d2 100644
--- a/types/react-icons/lib/io/backspace.d.ts
+++ b/types/react-icons/lib/io/backspace.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBackspace extends React.Component<IconBaseProps> { }
+declare class IoBackspace extends React.Component<IconBaseProps> { }
+export = IoBackspace;
diff --git a/types/react-icons/lib/io/bag.d.ts b/types/react-icons/lib/io/bag.d.ts
index 538f19a520..a6533db865 100644
--- a/types/react-icons/lib/io/bag.d.ts
+++ b/types/react-icons/lib/io/bag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBag extends React.Component<IconBaseProps> { }
+declare class IoBag extends React.Component<IconBaseProps> { }
+export = IoBag;
diff --git a/types/react-icons/lib/io/battery-charging.d.ts b/types/react-icons/lib/io/battery-charging.d.ts
index b950673aae..1e0d59b846 100644
--- a/types/react-icons/lib/io/battery-charging.d.ts
+++ b/types/react-icons/lib/io/battery-charging.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryCharging extends React.Component<IconBaseProps> { }
+declare class IoBatteryCharging extends React.Component<IconBaseProps> { }
+export = IoBatteryCharging;
diff --git a/types/react-icons/lib/io/battery-empty.d.ts b/types/react-icons/lib/io/battery-empty.d.ts
index 0a8268869c..6ab2c64d9b 100644
--- a/types/react-icons/lib/io/battery-empty.d.ts
+++ b/types/react-icons/lib/io/battery-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryEmpty extends React.Component<IconBaseProps> { }
+declare class IoBatteryEmpty extends React.Component<IconBaseProps> { }
+export = IoBatteryEmpty;
diff --git a/types/react-icons/lib/io/battery-full.d.ts b/types/react-icons/lib/io/battery-full.d.ts
index 493488adf3..613a0f5859 100644
--- a/types/react-icons/lib/io/battery-full.d.ts
+++ b/types/react-icons/lib/io/battery-full.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryFull extends React.Component<IconBaseProps> { }
+declare class IoBatteryFull extends React.Component<IconBaseProps> { }
+export = IoBatteryFull;
diff --git a/types/react-icons/lib/io/battery-half.d.ts b/types/react-icons/lib/io/battery-half.d.ts
index 0671295096..3a850063a3 100644
--- a/types/react-icons/lib/io/battery-half.d.ts
+++ b/types/react-icons/lib/io/battery-half.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryHalf extends React.Component<IconBaseProps> { }
+declare class IoBatteryHalf extends React.Component<IconBaseProps> { }
+export = IoBatteryHalf;
diff --git a/types/react-icons/lib/io/battery-low.d.ts b/types/react-icons/lib/io/battery-low.d.ts
index 3c2964a52b..105b1275e1 100644
--- a/types/react-icons/lib/io/battery-low.d.ts
+++ b/types/react-icons/lib/io/battery-low.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryLow extends React.Component<IconBaseProps> { }
+declare class IoBatteryLow extends React.Component<IconBaseProps> { }
+export = IoBatteryLow;
diff --git a/types/react-icons/lib/io/beaker.d.ts b/types/react-icons/lib/io/beaker.d.ts
index 5f68a801f8..dd335ba0fa 100644
--- a/types/react-icons/lib/io/beaker.d.ts
+++ b/types/react-icons/lib/io/beaker.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBeaker extends React.Component<IconBaseProps> { }
+declare class IoBeaker extends React.Component<IconBaseProps> { }
+export = IoBeaker;
diff --git a/types/react-icons/lib/io/beer.d.ts b/types/react-icons/lib/io/beer.d.ts
index 9f2f5739ac..7328e0f20f 100644
--- a/types/react-icons/lib/io/beer.d.ts
+++ b/types/react-icons/lib/io/beer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBeer extends React.Component<IconBaseProps> { }
+declare class IoBeer extends React.Component<IconBaseProps> { }
+export = IoBeer;
diff --git a/types/react-icons/lib/io/bluetooth.d.ts b/types/react-icons/lib/io/bluetooth.d.ts
index 58eb2659e0..7b3138b4ab 100644
--- a/types/react-icons/lib/io/bluetooth.d.ts
+++ b/types/react-icons/lib/io/bluetooth.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBluetooth extends React.Component<IconBaseProps> { }
+declare class IoBluetooth extends React.Component<IconBaseProps> { }
+export = IoBluetooth;
diff --git a/types/react-icons/lib/io/bonfire.d.ts b/types/react-icons/lib/io/bonfire.d.ts
index c0ef9d7cae..8a41727ffe 100644
--- a/types/react-icons/lib/io/bonfire.d.ts
+++ b/types/react-icons/lib/io/bonfire.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBonfire extends React.Component<IconBaseProps> { }
+declare class IoBonfire extends React.Component<IconBaseProps> { }
+export = IoBonfire;
diff --git a/types/react-icons/lib/io/bookmark.d.ts b/types/react-icons/lib/io/bookmark.d.ts
index 3479c40e67..acece4e02d 100644
--- a/types/react-icons/lib/io/bookmark.d.ts
+++ b/types/react-icons/lib/io/bookmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBookmark extends React.Component<IconBaseProps> { }
+declare class IoBookmark extends React.Component<IconBaseProps> { }
+export = IoBookmark;
diff --git a/types/react-icons/lib/io/bowtie.d.ts b/types/react-icons/lib/io/bowtie.d.ts
index 6f983612ce..8c7e9724ef 100644
--- a/types/react-icons/lib/io/bowtie.d.ts
+++ b/types/react-icons/lib/io/bowtie.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBowtie extends React.Component<IconBaseProps> { }
+declare class IoBowtie extends React.Component<IconBaseProps> { }
+export = IoBowtie;
diff --git a/types/react-icons/lib/io/briefcase.d.ts b/types/react-icons/lib/io/briefcase.d.ts
index baa5708abd..b5f1877923 100644
--- a/types/react-icons/lib/io/briefcase.d.ts
+++ b/types/react-icons/lib/io/briefcase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBriefcase extends React.Component<IconBaseProps> { }
+declare class IoBriefcase extends React.Component<IconBaseProps> { }
+export = IoBriefcase;
diff --git a/types/react-icons/lib/io/bug.d.ts b/types/react-icons/lib/io/bug.d.ts
index a97e391988..600b179fe1 100644
--- a/types/react-icons/lib/io/bug.d.ts
+++ b/types/react-icons/lib/io/bug.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBug extends React.Component<IconBaseProps> { }
+declare class IoBug extends React.Component<IconBaseProps> { }
+export = IoBug;
diff --git a/types/react-icons/lib/io/calculator.d.ts b/types/react-icons/lib/io/calculator.d.ts
index 17bc0695d2..3b6747e607 100644
--- a/types/react-icons/lib/io/calculator.d.ts
+++ b/types/react-icons/lib/io/calculator.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCalculator extends React.Component<IconBaseProps> { }
+declare class IoCalculator extends React.Component<IconBaseProps> { }
+export = IoCalculator;
diff --git a/types/react-icons/lib/io/calendar.d.ts b/types/react-icons/lib/io/calendar.d.ts
index 48de2d1402..9bf379847e 100644
--- a/types/react-icons/lib/io/calendar.d.ts
+++ b/types/react-icons/lib/io/calendar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCalendar extends React.Component<IconBaseProps> { }
+declare class IoCalendar extends React.Component<IconBaseProps> { }
+export = IoCalendar;
diff --git a/types/react-icons/lib/io/camera.d.ts b/types/react-icons/lib/io/camera.d.ts
index f362c37794..b64c47fede 100644
--- a/types/react-icons/lib/io/camera.d.ts
+++ b/types/react-icons/lib/io/camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCamera extends React.Component<IconBaseProps> { }
+declare class IoCamera extends React.Component<IconBaseProps> { }
+export = IoCamera;
diff --git a/types/react-icons/lib/io/card.d.ts b/types/react-icons/lib/io/card.d.ts
index 4aa32829b4..411c4a2157 100644
--- a/types/react-icons/lib/io/card.d.ts
+++ b/types/react-icons/lib/io/card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCard extends React.Component<IconBaseProps> { }
+declare class IoCard extends React.Component<IconBaseProps> { }
+export = IoCard;
diff --git a/types/react-icons/lib/io/cash.d.ts b/types/react-icons/lib/io/cash.d.ts
index 8c8a23acfd..5877b0db9b 100644
--- a/types/react-icons/lib/io/cash.d.ts
+++ b/types/react-icons/lib/io/cash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCash extends React.Component<IconBaseProps> { }
+declare class IoCash extends React.Component<IconBaseProps> { }
+export = IoCash;
diff --git a/types/react-icons/lib/io/chatbox-working.d.ts b/types/react-icons/lib/io/chatbox-working.d.ts
index 6574ba5b9c..01b5873626 100644
--- a/types/react-icons/lib/io/chatbox-working.d.ts
+++ b/types/react-icons/lib/io/chatbox-working.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatboxWorking extends React.Component<IconBaseProps> { }
+declare class IoChatboxWorking extends React.Component<IconBaseProps> { }
+export = IoChatboxWorking;
diff --git a/types/react-icons/lib/io/chatbox.d.ts b/types/react-icons/lib/io/chatbox.d.ts
index 71907bcada..ad62e34582 100644
--- a/types/react-icons/lib/io/chatbox.d.ts
+++ b/types/react-icons/lib/io/chatbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbox extends React.Component<IconBaseProps> { }
+declare class IoChatbox extends React.Component<IconBaseProps> { }
+export = IoChatbox;
diff --git a/types/react-icons/lib/io/chatboxes.d.ts b/types/react-icons/lib/io/chatboxes.d.ts
index 6a4aff2857..83cb79b9a6 100644
--- a/types/react-icons/lib/io/chatboxes.d.ts
+++ b/types/react-icons/lib/io/chatboxes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatboxes extends React.Component<IconBaseProps> { }
+declare class IoChatboxes extends React.Component<IconBaseProps> { }
+export = IoChatboxes;
diff --git a/types/react-icons/lib/io/chatbubble-working.d.ts b/types/react-icons/lib/io/chatbubble-working.d.ts
index 667fb7fcde..84c5601b9a 100644
--- a/types/react-icons/lib/io/chatbubble-working.d.ts
+++ b/types/react-icons/lib/io/chatbubble-working.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubbleWorking extends React.Component<IconBaseProps> { }
+declare class IoChatbubbleWorking extends React.Component<IconBaseProps> { }
+export = IoChatbubbleWorking;
diff --git a/types/react-icons/lib/io/chatbubble.d.ts b/types/react-icons/lib/io/chatbubble.d.ts
index 08ecb48df7..424f84e125 100644
--- a/types/react-icons/lib/io/chatbubble.d.ts
+++ b/types/react-icons/lib/io/chatbubble.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubble extends React.Component<IconBaseProps> { }
+declare class IoChatbubble extends React.Component<IconBaseProps> { }
+export = IoChatbubble;
diff --git a/types/react-icons/lib/io/chatbubbles.d.ts b/types/react-icons/lib/io/chatbubbles.d.ts
index ebf87a1cc5..9d529047ae 100644
--- a/types/react-icons/lib/io/chatbubbles.d.ts
+++ b/types/react-icons/lib/io/chatbubbles.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubbles extends React.Component<IconBaseProps> { }
+declare class IoChatbubbles extends React.Component<IconBaseProps> { }
+export = IoChatbubbles;
diff --git a/types/react-icons/lib/io/checkmark-circled.d.ts b/types/react-icons/lib/io/checkmark-circled.d.ts
index 892e19a107..e0f02e8dd0 100644
--- a/types/react-icons/lib/io/checkmark-circled.d.ts
+++ b/types/react-icons/lib/io/checkmark-circled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmarkCircled extends React.Component<IconBaseProps> { }
+declare class IoCheckmarkCircled extends React.Component<IconBaseProps> { }
+export = IoCheckmarkCircled;
diff --git a/types/react-icons/lib/io/checkmark-round.d.ts b/types/react-icons/lib/io/checkmark-round.d.ts
index 1311db9d47..49ac0d7325 100644
--- a/types/react-icons/lib/io/checkmark-round.d.ts
+++ b/types/react-icons/lib/io/checkmark-round.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmarkRound extends React.Component<IconBaseProps> { }
+declare class IoCheckmarkRound extends React.Component<IconBaseProps> { }
+export = IoCheckmarkRound;
diff --git a/types/react-icons/lib/io/checkmark.d.ts b/types/react-icons/lib/io/checkmark.d.ts
index 0eda0d12da..7be9e5dbd7 100644
--- a/types/react-icons/lib/io/checkmark.d.ts
+++ b/types/react-icons/lib/io/checkmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmark extends React.Component<IconBaseProps> { }
+declare class IoCheckmark extends React.Component<IconBaseProps> { }
+export = IoCheckmark;
diff --git a/types/react-icons/lib/io/chevron-down.d.ts b/types/react-icons/lib/io/chevron-down.d.ts
index 0d9546467d..8f6050fe52 100644
--- a/types/react-icons/lib/io/chevron-down.d.ts
+++ b/types/react-icons/lib/io/chevron-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronDown extends React.Component<IconBaseProps> { }
+declare class IoChevronDown extends React.Component<IconBaseProps> { }
+export = IoChevronDown;
diff --git a/types/react-icons/lib/io/chevron-left.d.ts b/types/react-icons/lib/io/chevron-left.d.ts
index 96fbe2a03f..bcd78417b8 100644
--- a/types/react-icons/lib/io/chevron-left.d.ts
+++ b/types/react-icons/lib/io/chevron-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronLeft extends React.Component<IconBaseProps> { }
+declare class IoChevronLeft extends React.Component<IconBaseProps> { }
+export = IoChevronLeft;
diff --git a/types/react-icons/lib/io/chevron-right.d.ts b/types/react-icons/lib/io/chevron-right.d.ts
index a83489fa83..4b19891516 100644
--- a/types/react-icons/lib/io/chevron-right.d.ts
+++ b/types/react-icons/lib/io/chevron-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronRight extends React.Component<IconBaseProps> { }
+declare class IoChevronRight extends React.Component<IconBaseProps> { }
+export = IoChevronRight;
diff --git a/types/react-icons/lib/io/chevron-up.d.ts b/types/react-icons/lib/io/chevron-up.d.ts
index a56e43a584..f36ac3a678 100644
--- a/types/react-icons/lib/io/chevron-up.d.ts
+++ b/types/react-icons/lib/io/chevron-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronUp extends React.Component<IconBaseProps> { }
+declare class IoChevronUp extends React.Component<IconBaseProps> { }
+export = IoChevronUp;
diff --git a/types/react-icons/lib/io/clipboard.d.ts b/types/react-icons/lib/io/clipboard.d.ts
index 79fc2dd2f7..bd491a79ea 100644
--- a/types/react-icons/lib/io/clipboard.d.ts
+++ b/types/react-icons/lib/io/clipboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClipboard extends React.Component<IconBaseProps> { }
+declare class IoClipboard extends React.Component<IconBaseProps> { }
+export = IoClipboard;
diff --git a/types/react-icons/lib/io/clock.d.ts b/types/react-icons/lib/io/clock.d.ts
index 50d4dd2af1..1a74b43880 100644
--- a/types/react-icons/lib/io/clock.d.ts
+++ b/types/react-icons/lib/io/clock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClock extends React.Component<IconBaseProps> { }
+declare class IoClock extends React.Component<IconBaseProps> { }
+export = IoClock;
diff --git a/types/react-icons/lib/io/close-circled.d.ts b/types/react-icons/lib/io/close-circled.d.ts
index dd6fb5e9d2..73bc493bef 100644
--- a/types/react-icons/lib/io/close-circled.d.ts
+++ b/types/react-icons/lib/io/close-circled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCloseCircled extends React.Component<IconBaseProps> { }
+declare class IoCloseCircled extends React.Component<IconBaseProps> { }
+export = IoCloseCircled;
diff --git a/types/react-icons/lib/io/close-round.d.ts b/types/react-icons/lib/io/close-round.d.ts
index a918a8e534..a0a2647cfe 100644
--- a/types/react-icons/lib/io/close-round.d.ts
+++ b/types/react-icons/lib/io/close-round.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCloseRound extends React.Component<IconBaseProps> { }
+declare class IoCloseRound extends React.Component<IconBaseProps> { }
+export = IoCloseRound;
diff --git a/types/react-icons/lib/io/close.d.ts b/types/react-icons/lib/io/close.d.ts
index acc49f00ac..e63ad69a50 100644
--- a/types/react-icons/lib/io/close.d.ts
+++ b/types/react-icons/lib/io/close.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClose extends React.Component<IconBaseProps> { }
+declare class IoClose extends React.Component<IconBaseProps> { }
+export = IoClose;
diff --git a/types/react-icons/lib/io/closed-captioning.d.ts b/types/react-icons/lib/io/closed-captioning.d.ts
index 5a2b68d149..6989aecb2f 100644
--- a/types/react-icons/lib/io/closed-captioning.d.ts
+++ b/types/react-icons/lib/io/closed-captioning.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClosedCaptioning extends React.Component<IconBaseProps> { }
+declare class IoClosedCaptioning extends React.Component<IconBaseProps> { }
+export = IoClosedCaptioning;
diff --git a/types/react-icons/lib/io/cloud.d.ts b/types/react-icons/lib/io/cloud.d.ts
index 837051ce2f..529f05f5fa 100644
--- a/types/react-icons/lib/io/cloud.d.ts
+++ b/types/react-icons/lib/io/cloud.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCloud extends React.Component<IconBaseProps> { }
+declare class IoCloud extends React.Component<IconBaseProps> { }
+export = IoCloud;
diff --git a/types/react-icons/lib/io/code-download.d.ts b/types/react-icons/lib/io/code-download.d.ts
index 765b401172..7d63a84630 100644
--- a/types/react-icons/lib/io/code-download.d.ts
+++ b/types/react-icons/lib/io/code-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCodeDownload extends React.Component<IconBaseProps> { }
+declare class IoCodeDownload extends React.Component<IconBaseProps> { }
+export = IoCodeDownload;
diff --git a/types/react-icons/lib/io/code-working.d.ts b/types/react-icons/lib/io/code-working.d.ts
index 48cf64ecd5..c014c9fb3b 100644
--- a/types/react-icons/lib/io/code-working.d.ts
+++ b/types/react-icons/lib/io/code-working.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCodeWorking extends React.Component<IconBaseProps> { }
+declare class IoCodeWorking extends React.Component<IconBaseProps> { }
+export = IoCodeWorking;
diff --git a/types/react-icons/lib/io/code.d.ts b/types/react-icons/lib/io/code.d.ts
index 3d89e7aec1..15f8af880b 100644
--- a/types/react-icons/lib/io/code.d.ts
+++ b/types/react-icons/lib/io/code.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCode extends React.Component<IconBaseProps> { }
+declare class IoCode extends React.Component<IconBaseProps> { }
+export = IoCode;
diff --git a/types/react-icons/lib/io/coffee.d.ts b/types/react-icons/lib/io/coffee.d.ts
index f3122b5343..ff96c293fd 100644
--- a/types/react-icons/lib/io/coffee.d.ts
+++ b/types/react-icons/lib/io/coffee.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCoffee extends React.Component<IconBaseProps> { }
+declare class IoCoffee extends React.Component<IconBaseProps> { }
+export = IoCoffee;
diff --git a/types/react-icons/lib/io/compass.d.ts b/types/react-icons/lib/io/compass.d.ts
index c0b78dd711..d96268517f 100644
--- a/types/react-icons/lib/io/compass.d.ts
+++ b/types/react-icons/lib/io/compass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCompass extends React.Component<IconBaseProps> { }
+declare class IoCompass extends React.Component<IconBaseProps> { }
+export = IoCompass;
diff --git a/types/react-icons/lib/io/compose.d.ts b/types/react-icons/lib/io/compose.d.ts
index 5250bbf5f9..cd104c86e4 100644
--- a/types/react-icons/lib/io/compose.d.ts
+++ b/types/react-icons/lib/io/compose.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCompose extends React.Component<IconBaseProps> { }
+declare class IoCompose extends React.Component<IconBaseProps> { }
+export = IoCompose;
diff --git a/types/react-icons/lib/io/connectbars.d.ts b/types/react-icons/lib/io/connectbars.d.ts
index 2484005cf3..e9c503f259 100644
--- a/types/react-icons/lib/io/connectbars.d.ts
+++ b/types/react-icons/lib/io/connectbars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoConnectbars extends React.Component<IconBaseProps> { }
+declare class IoConnectbars extends React.Component<IconBaseProps> { }
+export = IoConnectbars;
diff --git a/types/react-icons/lib/io/contrast.d.ts b/types/react-icons/lib/io/contrast.d.ts
index 871e34e2b5..aea50a362f 100644
--- a/types/react-icons/lib/io/contrast.d.ts
+++ b/types/react-icons/lib/io/contrast.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoContrast extends React.Component<IconBaseProps> { }
+declare class IoContrast extends React.Component<IconBaseProps> { }
+export = IoContrast;
diff --git a/types/react-icons/lib/io/crop.d.ts b/types/react-icons/lib/io/crop.d.ts
index 1d9f6fe16f..6fca72b89d 100644
--- a/types/react-icons/lib/io/crop.d.ts
+++ b/types/react-icons/lib/io/crop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCrop extends React.Component<IconBaseProps> { }
+declare class IoCrop extends React.Component<IconBaseProps> { }
+export = IoCrop;
diff --git a/types/react-icons/lib/io/cube.d.ts b/types/react-icons/lib/io/cube.d.ts
index 0e20a500a0..87a041844d 100644
--- a/types/react-icons/lib/io/cube.d.ts
+++ b/types/react-icons/lib/io/cube.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCube extends React.Component<IconBaseProps> { }
+declare class IoCube extends React.Component<IconBaseProps> { }
+export = IoCube;
diff --git a/types/react-icons/lib/io/disc.d.ts b/types/react-icons/lib/io/disc.d.ts
index adb12527e7..ba1c411354 100644
--- a/types/react-icons/lib/io/disc.d.ts
+++ b/types/react-icons/lib/io/disc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDisc extends React.Component<IconBaseProps> { }
+declare class IoDisc extends React.Component<IconBaseProps> { }
+export = IoDisc;
diff --git a/types/react-icons/lib/io/document-text.d.ts b/types/react-icons/lib/io/document-text.d.ts
index 4c419e9766..d77721e7c5 100644
--- a/types/react-icons/lib/io/document-text.d.ts
+++ b/types/react-icons/lib/io/document-text.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDocumentText extends React.Component<IconBaseProps> { }
+declare class IoDocumentText extends React.Component<IconBaseProps> { }
+export = IoDocumentText;
diff --git a/types/react-icons/lib/io/document.d.ts b/types/react-icons/lib/io/document.d.ts
index 098ab00b2a..58dcac1802 100644
--- a/types/react-icons/lib/io/document.d.ts
+++ b/types/react-icons/lib/io/document.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDocument extends React.Component<IconBaseProps> { }
+declare class IoDocument extends React.Component<IconBaseProps> { }
+export = IoDocument;
diff --git a/types/react-icons/lib/io/drag.d.ts b/types/react-icons/lib/io/drag.d.ts
index 628c38c338..fc7e0809a5 100644
--- a/types/react-icons/lib/io/drag.d.ts
+++ b/types/react-icons/lib/io/drag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDrag extends React.Component<IconBaseProps> { }
+declare class IoDrag extends React.Component<IconBaseProps> { }
+export = IoDrag;
diff --git a/types/react-icons/lib/io/earth.d.ts b/types/react-icons/lib/io/earth.d.ts
index 5d502a5882..7a37407511 100644
--- a/types/react-icons/lib/io/earth.d.ts
+++ b/types/react-icons/lib/io/earth.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEarth extends React.Component<IconBaseProps> { }
+declare class IoEarth extends React.Component<IconBaseProps> { }
+export = IoEarth;
diff --git a/types/react-icons/lib/io/easel.d.ts b/types/react-icons/lib/io/easel.d.ts
index dc8b3ff32d..07f4eb9c1d 100644
--- a/types/react-icons/lib/io/easel.d.ts
+++ b/types/react-icons/lib/io/easel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEasel extends React.Component<IconBaseProps> { }
+declare class IoEasel extends React.Component<IconBaseProps> { }
+export = IoEasel;
diff --git a/types/react-icons/lib/io/edit.d.ts b/types/react-icons/lib/io/edit.d.ts
index ea10d7df2a..b226390e6b 100644
--- a/types/react-icons/lib/io/edit.d.ts
+++ b/types/react-icons/lib/io/edit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEdit extends React.Component<IconBaseProps> { }
+declare class IoEdit extends React.Component<IconBaseProps> { }
+export = IoEdit;
diff --git a/types/react-icons/lib/io/egg.d.ts b/types/react-icons/lib/io/egg.d.ts
index 39e63c2f48..7443c8e7c6 100644
--- a/types/react-icons/lib/io/egg.d.ts
+++ b/types/react-icons/lib/io/egg.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEgg extends React.Component<IconBaseProps> { }
+declare class IoEgg extends React.Component<IconBaseProps> { }
+export = IoEgg;
diff --git a/types/react-icons/lib/io/eject.d.ts b/types/react-icons/lib/io/eject.d.ts
index 1f859a0b76..4621d76261 100644
--- a/types/react-icons/lib/io/eject.d.ts
+++ b/types/react-icons/lib/io/eject.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEject extends React.Component<IconBaseProps> { }
+declare class IoEject extends React.Component<IconBaseProps> { }
+export = IoEject;
diff --git a/types/react-icons/lib/io/email-unread.d.ts b/types/react-icons/lib/io/email-unread.d.ts
index acdaefd764..76d66d544a 100644
--- a/types/react-icons/lib/io/email-unread.d.ts
+++ b/types/react-icons/lib/io/email-unread.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEmailUnread extends React.Component<IconBaseProps> { }
+declare class IoEmailUnread extends React.Component<IconBaseProps> { }
+export = IoEmailUnread;
diff --git a/types/react-icons/lib/io/email.d.ts b/types/react-icons/lib/io/email.d.ts
index 7323479361..5551df730a 100644
--- a/types/react-icons/lib/io/email.d.ts
+++ b/types/react-icons/lib/io/email.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEmail extends React.Component<IconBaseProps> { }
+declare class IoEmail extends React.Component<IconBaseProps> { }
+export = IoEmail;
diff --git a/types/react-icons/lib/io/erlenmeyer-flask-bubbles.d.ts b/types/react-icons/lib/io/erlenmeyer-flask-bubbles.d.ts
index fed2da9f1f..8075f8880b 100644
--- a/types/react-icons/lib/io/erlenmeyer-flask-bubbles.d.ts
+++ b/types/react-icons/lib/io/erlenmeyer-flask-bubbles.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoErlenmeyerFlaskBubbles extends React.Component<IconBaseProps> { }
+declare class IoErlenmeyerFlaskBubbles extends React.Component<IconBaseProps> { }
+export = IoErlenmeyerFlaskBubbles;
diff --git a/types/react-icons/lib/io/erlenmeyer-flask.d.ts b/types/react-icons/lib/io/erlenmeyer-flask.d.ts
index 0de1fd7c42..c7ac237769 100644
--- a/types/react-icons/lib/io/erlenmeyer-flask.d.ts
+++ b/types/react-icons/lib/io/erlenmeyer-flask.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoErlenmeyerFlask extends React.Component<IconBaseProps> { }
+declare class IoErlenmeyerFlask extends React.Component<IconBaseProps> { }
+export = IoErlenmeyerFlask;
diff --git a/types/react-icons/lib/io/eye-disabled.d.ts b/types/react-icons/lib/io/eye-disabled.d.ts
index 3bf20def2a..8950fa85cc 100644
--- a/types/react-icons/lib/io/eye-disabled.d.ts
+++ b/types/react-icons/lib/io/eye-disabled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEyeDisabled extends React.Component<IconBaseProps> { }
+declare class IoEyeDisabled extends React.Component<IconBaseProps> { }
+export = IoEyeDisabled;
diff --git a/types/react-icons/lib/io/eye.d.ts b/types/react-icons/lib/io/eye.d.ts
index 270c59505f..bc243f9ed5 100644
--- a/types/react-icons/lib/io/eye.d.ts
+++ b/types/react-icons/lib/io/eye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEye extends React.Component<IconBaseProps> { }
+declare class IoEye extends React.Component<IconBaseProps> { }
+export = IoEye;
diff --git a/types/react-icons/lib/io/female.d.ts b/types/react-icons/lib/io/female.d.ts
index cb795e884b..363f225e45 100644
--- a/types/react-icons/lib/io/female.d.ts
+++ b/types/react-icons/lib/io/female.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFemale extends React.Component<IconBaseProps> { }
+declare class IoFemale extends React.Component<IconBaseProps> { }
+export = IoFemale;
diff --git a/types/react-icons/lib/io/filing.d.ts b/types/react-icons/lib/io/filing.d.ts
index ba69d4eb8b..73e1fe47b1 100644
--- a/types/react-icons/lib/io/filing.d.ts
+++ b/types/react-icons/lib/io/filing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFiling extends React.Component<IconBaseProps> { }
+declare class IoFiling extends React.Component<IconBaseProps> { }
+export = IoFiling;
diff --git a/types/react-icons/lib/io/film-marker.d.ts b/types/react-icons/lib/io/film-marker.d.ts
index 4e4a7158f2..419dc10730 100644
--- a/types/react-icons/lib/io/film-marker.d.ts
+++ b/types/react-icons/lib/io/film-marker.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFilmMarker extends React.Component<IconBaseProps> { }
+declare class IoFilmMarker extends React.Component<IconBaseProps> { }
+export = IoFilmMarker;
diff --git a/types/react-icons/lib/io/fireball.d.ts b/types/react-icons/lib/io/fireball.d.ts
index e7056b1534..761f0f74db 100644
--- a/types/react-icons/lib/io/fireball.d.ts
+++ b/types/react-icons/lib/io/fireball.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFireball extends React.Component<IconBaseProps> { }
+declare class IoFireball extends React.Component<IconBaseProps> { }
+export = IoFireball;
diff --git a/types/react-icons/lib/io/flag.d.ts b/types/react-icons/lib/io/flag.d.ts
index c06630b1a6..604aa212da 100644
--- a/types/react-icons/lib/io/flag.d.ts
+++ b/types/react-icons/lib/io/flag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlag extends React.Component<IconBaseProps> { }
+declare class IoFlag extends React.Component<IconBaseProps> { }
+export = IoFlag;
diff --git a/types/react-icons/lib/io/flame.d.ts b/types/react-icons/lib/io/flame.d.ts
index d49d1bd2db..bf3a40331a 100644
--- a/types/react-icons/lib/io/flame.d.ts
+++ b/types/react-icons/lib/io/flame.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlame extends React.Component<IconBaseProps> { }
+declare class IoFlame extends React.Component<IconBaseProps> { }
+export = IoFlame;
diff --git a/types/react-icons/lib/io/flash-off.d.ts b/types/react-icons/lib/io/flash-off.d.ts
index 2b12ebe578..2a25f11369 100644
--- a/types/react-icons/lib/io/flash-off.d.ts
+++ b/types/react-icons/lib/io/flash-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlashOff extends React.Component<IconBaseProps> { }
+declare class IoFlashOff extends React.Component<IconBaseProps> { }
+export = IoFlashOff;
diff --git a/types/react-icons/lib/io/flash.d.ts b/types/react-icons/lib/io/flash.d.ts
index 32901f5a9d..11e4b408c1 100644
--- a/types/react-icons/lib/io/flash.d.ts
+++ b/types/react-icons/lib/io/flash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlash extends React.Component<IconBaseProps> { }
+declare class IoFlash extends React.Component<IconBaseProps> { }
+export = IoFlash;
diff --git a/types/react-icons/lib/io/folder.d.ts b/types/react-icons/lib/io/folder.d.ts
index dd14763f19..2f9eeabc0c 100644
--- a/types/react-icons/lib/io/folder.d.ts
+++ b/types/react-icons/lib/io/folder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFolder extends React.Component<IconBaseProps> { }
+declare class IoFolder extends React.Component<IconBaseProps> { }
+export = IoFolder;
diff --git a/types/react-icons/lib/io/fork-repo.d.ts b/types/react-icons/lib/io/fork-repo.d.ts
index 19dfd6a33c..91707b054e 100644
--- a/types/react-icons/lib/io/fork-repo.d.ts
+++ b/types/react-icons/lib/io/fork-repo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoForkRepo extends React.Component<IconBaseProps> { }
+declare class IoForkRepo extends React.Component<IconBaseProps> { }
+export = IoForkRepo;
diff --git a/types/react-icons/lib/io/fork.d.ts b/types/react-icons/lib/io/fork.d.ts
index b06aa1f455..c25327c58f 100644
--- a/types/react-icons/lib/io/fork.d.ts
+++ b/types/react-icons/lib/io/fork.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFork extends React.Component<IconBaseProps> { }
+declare class IoFork extends React.Component<IconBaseProps> { }
+export = IoFork;
diff --git a/types/react-icons/lib/io/forward.d.ts b/types/react-icons/lib/io/forward.d.ts
index 1b36aa1de7..5f8db1eb0a 100644
--- a/types/react-icons/lib/io/forward.d.ts
+++ b/types/react-icons/lib/io/forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoForward extends React.Component<IconBaseProps> { }
+declare class IoForward extends React.Component<IconBaseProps> { }
+export = IoForward;
diff --git a/types/react-icons/lib/io/funnel.d.ts b/types/react-icons/lib/io/funnel.d.ts
index be56fcd18c..564d37b5dd 100644
--- a/types/react-icons/lib/io/funnel.d.ts
+++ b/types/react-icons/lib/io/funnel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFunnel extends React.Component<IconBaseProps> { }
+declare class IoFunnel extends React.Component<IconBaseProps> { }
+export = IoFunnel;
diff --git a/types/react-icons/lib/io/gear-a.d.ts b/types/react-icons/lib/io/gear-a.d.ts
index b04f6af6c2..cac36e86a6 100644
--- a/types/react-icons/lib/io/gear-a.d.ts
+++ b/types/react-icons/lib/io/gear-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoGearA extends React.Component<IconBaseProps> { }
+declare class IoGearA extends React.Component<IconBaseProps> { }
+export = IoGearA;
diff --git a/types/react-icons/lib/io/gear-b.d.ts b/types/react-icons/lib/io/gear-b.d.ts
index b580d2bc7c..85d2ec806a 100644
--- a/types/react-icons/lib/io/gear-b.d.ts
+++ b/types/react-icons/lib/io/gear-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoGearB extends React.Component<IconBaseProps> { }
+declare class IoGearB extends React.Component<IconBaseProps> { }
+export = IoGearB;
diff --git a/types/react-icons/lib/io/grid.d.ts b/types/react-icons/lib/io/grid.d.ts
index b30f3a11c2..77f0971fc2 100644
--- a/types/react-icons/lib/io/grid.d.ts
+++ b/types/react-icons/lib/io/grid.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoGrid extends React.Component<IconBaseProps> { }
+declare class IoGrid extends React.Component<IconBaseProps> { }
+export = IoGrid;
diff --git a/types/react-icons/lib/io/hammer.d.ts b/types/react-icons/lib/io/hammer.d.ts
index 4ea6d0c306..cb96449ad8 100644
--- a/types/react-icons/lib/io/hammer.d.ts
+++ b/types/react-icons/lib/io/hammer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHammer extends React.Component<IconBaseProps> { }
+declare class IoHammer extends React.Component<IconBaseProps> { }
+export = IoHammer;
diff --git a/types/react-icons/lib/io/happy-outline.d.ts b/types/react-icons/lib/io/happy-outline.d.ts
index 3207610467..cd4ae57ef0 100644
--- a/types/react-icons/lib/io/happy-outline.d.ts
+++ b/types/react-icons/lib/io/happy-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHappyOutline extends React.Component<IconBaseProps> { }
+declare class IoHappyOutline extends React.Component<IconBaseProps> { }
+export = IoHappyOutline;
diff --git a/types/react-icons/lib/io/happy.d.ts b/types/react-icons/lib/io/happy.d.ts
index f773c9e528..3ab43dca46 100644
--- a/types/react-icons/lib/io/happy.d.ts
+++ b/types/react-icons/lib/io/happy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHappy extends React.Component<IconBaseProps> { }
+declare class IoHappy extends React.Component<IconBaseProps> { }
+export = IoHappy;
diff --git a/types/react-icons/lib/io/headphone.d.ts b/types/react-icons/lib/io/headphone.d.ts
index e1ebdc9185..2165a1ce1d 100644
--- a/types/react-icons/lib/io/headphone.d.ts
+++ b/types/react-icons/lib/io/headphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHeadphone extends React.Component<IconBaseProps> { }
+declare class IoHeadphone extends React.Component<IconBaseProps> { }
+export = IoHeadphone;
diff --git a/types/react-icons/lib/io/heart-broken.d.ts b/types/react-icons/lib/io/heart-broken.d.ts
index 822a928ac6..3dcef8a454 100644
--- a/types/react-icons/lib/io/heart-broken.d.ts
+++ b/types/react-icons/lib/io/heart-broken.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHeartBroken extends React.Component<IconBaseProps> { }
+declare class IoHeartBroken extends React.Component<IconBaseProps> { }
+export = IoHeartBroken;
diff --git a/types/react-icons/lib/io/heart.d.ts b/types/react-icons/lib/io/heart.d.ts
index e543207ae6..09596470cf 100644
--- a/types/react-icons/lib/io/heart.d.ts
+++ b/types/react-icons/lib/io/heart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHeart extends React.Component<IconBaseProps> { }
+declare class IoHeart extends React.Component<IconBaseProps> { }
+export = IoHeart;
diff --git a/types/react-icons/lib/io/help-buoy.d.ts b/types/react-icons/lib/io/help-buoy.d.ts
index 9a84933640..2d7596c318 100644
--- a/types/react-icons/lib/io/help-buoy.d.ts
+++ b/types/react-icons/lib/io/help-buoy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHelpBuoy extends React.Component<IconBaseProps> { }
+declare class IoHelpBuoy extends React.Component<IconBaseProps> { }
+export = IoHelpBuoy;
diff --git a/types/react-icons/lib/io/help-circled.d.ts b/types/react-icons/lib/io/help-circled.d.ts
index f36a8fd5f8..51ff2fa62a 100644
--- a/types/react-icons/lib/io/help-circled.d.ts
+++ b/types/react-icons/lib/io/help-circled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHelpCircled extends React.Component<IconBaseProps> { }
+declare class IoHelpCircled extends React.Component<IconBaseProps> { }
+export = IoHelpCircled;
diff --git a/types/react-icons/lib/io/help.d.ts b/types/react-icons/lib/io/help.d.ts
index 8eee2581c6..ba7fc4f358 100644
--- a/types/react-icons/lib/io/help.d.ts
+++ b/types/react-icons/lib/io/help.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHelp extends React.Component<IconBaseProps> { }
+declare class IoHelp extends React.Component<IconBaseProps> { }
+export = IoHelp;
diff --git a/types/react-icons/lib/io/home.d.ts b/types/react-icons/lib/io/home.d.ts
index 337bace8fa..17990b7afa 100644
--- a/types/react-icons/lib/io/home.d.ts
+++ b/types/react-icons/lib/io/home.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHome extends React.Component<IconBaseProps> { }
+declare class IoHome extends React.Component<IconBaseProps> { }
+export = IoHome;
diff --git a/types/react-icons/lib/io/icecream.d.ts b/types/react-icons/lib/io/icecream.d.ts
index 1c3f0bd2af..d766170158 100644
--- a/types/react-icons/lib/io/icecream.d.ts
+++ b/types/react-icons/lib/io/icecream.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIcecream extends React.Component<IconBaseProps> { }
+declare class IoIcecream extends React.Component<IconBaseProps> { }
+export = IoIcecream;
diff --git a/types/react-icons/lib/io/image.d.ts b/types/react-icons/lib/io/image.d.ts
index 3fbf7da59a..960fbd8e35 100644
--- a/types/react-icons/lib/io/image.d.ts
+++ b/types/react-icons/lib/io/image.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoImage extends React.Component<IconBaseProps> { }
+declare class IoImage extends React.Component<IconBaseProps> { }
+export = IoImage;
diff --git a/types/react-icons/lib/io/images.d.ts b/types/react-icons/lib/io/images.d.ts
index ae80a81b1e..562288e5b8 100644
--- a/types/react-icons/lib/io/images.d.ts
+++ b/types/react-icons/lib/io/images.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoImages extends React.Component<IconBaseProps> { }
+declare class IoImages extends React.Component<IconBaseProps> { }
+export = IoImages;
diff --git a/types/react-icons/lib/io/index.d.ts b/types/react-icons/lib/io/index.d.ts
index ef86c25e2b..340f0a0cea 100644
--- a/types/react-icons/lib/io/index.d.ts
+++ b/types/react-icons/lib/io/index.d.ts
@@ -1,733 +1,733 @@
-export { default as IoAlertCircled } from "./alert-circled";
-export { default as IoAlert } from "./alert";
-export { default as IoAndroidAddCircle } from "./android-add-circle";
-export { default as IoAndroidAdd } from "./android-add";
-export { default as IoAndroidAlarmClock } from "./android-alarm-clock";
-export { default as IoAndroidAlert } from "./android-alert";
-export { default as IoAndroidApps } from "./android-apps";
-export { default as IoAndroidArchive } from "./android-archive";
-export { default as IoAndroidArrowBack } from "./android-arrow-back";
-export { default as IoAndroidArrowDown } from "./android-arrow-down";
-export { default as IoAndroidArrowDropdownCircle } from "./android-arrow-dropdown-circle";
-export { default as IoAndroidArrowDropdown } from "./android-arrow-dropdown";
-export { default as IoAndroidArrowDropleftCircle } from "./android-arrow-dropleft-circle";
-export { default as IoAndroidArrowDropleft } from "./android-arrow-dropleft";
-export { default as IoAndroidArrowDroprightCircle } from "./android-arrow-dropright-circle";
-export { default as IoAndroidArrowDropright } from "./android-arrow-dropright";
-export { default as IoAndroidArrowDropupCircle } from "./android-arrow-dropup-circle";
-export { default as IoAndroidArrowDropup } from "./android-arrow-dropup";
-export { default as IoAndroidArrowForward } from "./android-arrow-forward";
-export { default as IoAndroidArrowUp } from "./android-arrow-up";
-export { default as IoAndroidAttach } from "./android-attach";
-export { default as IoAndroidBar } from "./android-bar";
-export { default as IoAndroidBicycle } from "./android-bicycle";
-export { default as IoAndroidBoat } from "./android-boat";
-export { default as IoAndroidBookmark } from "./android-bookmark";
-export { default as IoAndroidBulb } from "./android-bulb";
-export { default as IoAndroidBus } from "./android-bus";
-export { default as IoAndroidCalendar } from "./android-calendar";
-export { default as IoAndroidCall } from "./android-call";
-export { default as IoAndroidCamera } from "./android-camera";
-export { default as IoAndroidCancel } from "./android-cancel";
-export { default as IoAndroidCar } from "./android-car";
-export { default as IoAndroidCart } from "./android-cart";
-export { default as IoAndroidChat } from "./android-chat";
-export { default as IoAndroidCheckboxBlank } from "./android-checkbox-blank";
-export { default as IoAndroidCheckboxOutlineBlank } from "./android-checkbox-outline-blank";
-export { default as IoAndroidCheckboxOutline } from "./android-checkbox-outline";
-export { default as IoAndroidCheckbox } from "./android-checkbox";
-export { default as IoAndroidCheckmarkCircle } from "./android-checkmark-circle";
-export { default as IoAndroidClipboard } from "./android-clipboard";
-export { default as IoAndroidClose } from "./android-close";
-export { default as IoAndroidCloudCircle } from "./android-cloud-circle";
-export { default as IoAndroidCloudDone } from "./android-cloud-done";
-export { default as IoAndroidCloudOutline } from "./android-cloud-outline";
-export { default as IoAndroidCloud } from "./android-cloud";
-export { default as IoAndroidColorPalette } from "./android-color-palette";
-export { default as IoAndroidCompass } from "./android-compass";
-export { default as IoAndroidContact } from "./android-contact";
-export { default as IoAndroidContacts } from "./android-contacts";
-export { default as IoAndroidContract } from "./android-contract";
-export { default as IoAndroidCreate } from "./android-create";
-export { default as IoAndroidDelete } from "./android-delete";
-export { default as IoAndroidDesktop } from "./android-desktop";
-export { default as IoAndroidDocument } from "./android-document";
-export { default as IoAndroidDoneAll } from "./android-done-all";
-export { default as IoAndroidDone } from "./android-done";
-export { default as IoAndroidDownload } from "./android-download";
-export { default as IoAndroidDrafts } from "./android-drafts";
-export { default as IoAndroidExit } from "./android-exit";
-export { default as IoAndroidExpand } from "./android-expand";
-export { default as IoAndroidFavoriteOutline } from "./android-favorite-outline";
-export { default as IoAndroidFavorite } from "./android-favorite";
-export { default as IoAndroidFilm } from "./android-film";
-export { default as IoAndroidFolderOpen } from "./android-folder-open";
-export { default as IoAndroidFolder } from "./android-folder";
-export { default as IoAndroidFunnel } from "./android-funnel";
-export { default as IoAndroidGlobe } from "./android-globe";
-export { default as IoAndroidHand } from "./android-hand";
-export { default as IoAndroidHangout } from "./android-hangout";
-export { default as IoAndroidHappy } from "./android-happy";
-export { default as IoAndroidHome } from "./android-home";
-export { default as IoAndroidImage } from "./android-image";
-export { default as IoAndroidLaptop } from "./android-laptop";
-export { default as IoAndroidList } from "./android-list";
-export { default as IoAndroidLocate } from "./android-locate";
-export { default as IoAndroidLock } from "./android-lock";
-export { default as IoAndroidMail } from "./android-mail";
-export { default as IoAndroidMap } from "./android-map";
-export { default as IoAndroidMenu } from "./android-menu";
-export { default as IoAndroidMicrophoneOff } from "./android-microphone-off";
-export { default as IoAndroidMicrophone } from "./android-microphone";
-export { default as IoAndroidMoreHorizontal } from "./android-more-horizontal";
-export { default as IoAndroidMoreVertical } from "./android-more-vertical";
-export { default as IoAndroidNavigate } from "./android-navigate";
-export { default as IoAndroidNotificationsNone } from "./android-notifications-none";
-export { default as IoAndroidNotificationsOff } from "./android-notifications-off";
-export { default as IoAndroidNotifications } from "./android-notifications";
-export { default as IoAndroidOpen } from "./android-open";
-export { default as IoAndroidOptions } from "./android-options";
-export { default as IoAndroidPeople } from "./android-people";
-export { default as IoAndroidPersonAdd } from "./android-person-add";
-export { default as IoAndroidPerson } from "./android-person";
-export { default as IoAndroidPhoneLandscape } from "./android-phone-landscape";
-export { default as IoAndroidPhonePortrait } from "./android-phone-portrait";
-export { default as IoAndroidPin } from "./android-pin";
-export { default as IoAndroidPlane } from "./android-plane";
-export { default as IoAndroidPlaystore } from "./android-playstore";
-export { default as IoAndroidPrint } from "./android-print";
-export { default as IoAndroidRadioButtonOff } from "./android-radio-button-off";
-export { default as IoAndroidRadioButtonOn } from "./android-radio-button-on";
-export { default as IoAndroidRefresh } from "./android-refresh";
-export { default as IoAndroidRemoveCircle } from "./android-remove-circle";
-export { default as IoAndroidRemove } from "./android-remove";
-export { default as IoAndroidRestaurant } from "./android-restaurant";
-export { default as IoAndroidSad } from "./android-sad";
-export { default as IoAndroidSearch } from "./android-search";
-export { default as IoAndroidSend } from "./android-send";
-export { default as IoAndroidSettings } from "./android-settings";
-export { default as IoAndroidShareAlt } from "./android-share-alt";
-export { default as IoAndroidShare } from "./android-share";
-export { default as IoAndroidStarHalf } from "./android-star-half";
-export { default as IoAndroidStarOutline } from "./android-star-outline";
-export { default as IoAndroidStar } from "./android-star";
-export { default as IoAndroidStopwatch } from "./android-stopwatch";
-export { default as IoAndroidSubway } from "./android-subway";
-export { default as IoAndroidSunny } from "./android-sunny";
-export { default as IoAndroidSync } from "./android-sync";
-export { default as IoAndroidTextsms } from "./android-textsms";
-export { default as IoAndroidTime } from "./android-time";
-export { default as IoAndroidTrain } from "./android-train";
-export { default as IoAndroidUnlock } from "./android-unlock";
-export { default as IoAndroidUpload } from "./android-upload";
-export { default as IoAndroidVolumeDown } from "./android-volume-down";
-export { default as IoAndroidVolumeMute } from "./android-volume-mute";
-export { default as IoAndroidVolumeOff } from "./android-volume-off";
-export { default as IoAndroidVolumeUp } from "./android-volume-up";
-export { default as IoAndroidWalk } from "./android-walk";
-export { default as IoAndroidWarning } from "./android-warning";
-export { default as IoAndroidWatch } from "./android-watch";
-export { default as IoAndroidWifi } from "./android-wifi";
-export { default as IoAperture } from "./aperture";
-export { default as IoArchive } from "./archive";
-export { default as IoArrowDownA } from "./arrow-down-a";
-export { default as IoArrowDownB } from "./arrow-down-b";
-export { default as IoArrowDownC } from "./arrow-down-c";
-export { default as IoArrowExpand } from "./arrow-expand";
-export { default as IoArrowGraphDownLeft } from "./arrow-graph-down-left";
-export { default as IoArrowGraphDownRight } from "./arrow-graph-down-right";
-export { default as IoArrowGraphUpLeft } from "./arrow-graph-up-left";
-export { default as IoArrowGraphUpRight } from "./arrow-graph-up-right";
-export { default as IoArrowLeftA } from "./arrow-left-a";
-export { default as IoArrowLeftB } from "./arrow-left-b";
-export { default as IoArrowLeftC } from "./arrow-left-c";
-export { default as IoArrowMove } from "./arrow-move";
-export { default as IoArrowResize } from "./arrow-resize";
-export { default as IoArrowReturnLeft } from "./arrow-return-left";
-export { default as IoArrowReturnRight } from "./arrow-return-right";
-export { default as IoArrowRightA } from "./arrow-right-a";
-export { default as IoArrowRightB } from "./arrow-right-b";
-export { default as IoArrowRightC } from "./arrow-right-c";
-export { default as IoArrowShrink } from "./arrow-shrink";
-export { default as IoArrowSwap } from "./arrow-swap";
-export { default as IoArrowUpA } from "./arrow-up-a";
-export { default as IoArrowUpB } from "./arrow-up-b";
-export { default as IoArrowUpC } from "./arrow-up-c";
-export { default as IoAsterisk } from "./asterisk";
-export { default as IoAt } from "./at";
-export { default as IoBackspaceOutline } from "./backspace-outline";
-export { default as IoBackspace } from "./backspace";
-export { default as IoBag } from "./bag";
-export { default as IoBatteryCharging } from "./battery-charging";
-export { default as IoBatteryEmpty } from "./battery-empty";
-export { default as IoBatteryFull } from "./battery-full";
-export { default as IoBatteryHalf } from "./battery-half";
-export { default as IoBatteryLow } from "./battery-low";
-export { default as IoBeaker } from "./beaker";
-export { default as IoBeer } from "./beer";
-export { default as IoBluetooth } from "./bluetooth";
-export { default as IoBonfire } from "./bonfire";
-export { default as IoBookmark } from "./bookmark";
-export { default as IoBowtie } from "./bowtie";
-export { default as IoBriefcase } from "./briefcase";
-export { default as IoBug } from "./bug";
-export { default as IoCalculator } from "./calculator";
-export { default as IoCalendar } from "./calendar";
-export { default as IoCamera } from "./camera";
-export { default as IoCard } from "./card";
-export { default as IoCash } from "./cash";
-export { default as IoChatboxWorking } from "./chatbox-working";
-export { default as IoChatbox } from "./chatbox";
-export { default as IoChatboxes } from "./chatboxes";
-export { default as IoChatbubbleWorking } from "./chatbubble-working";
-export { default as IoChatbubble } from "./chatbubble";
-export { default as IoChatbubbles } from "./chatbubbles";
-export { default as IoCheckmarkCircled } from "./checkmark-circled";
-export { default as IoCheckmarkRound } from "./checkmark-round";
-export { default as IoCheckmark } from "./checkmark";
-export { default as IoChevronDown } from "./chevron-down";
-export { default as IoChevronLeft } from "./chevron-left";
-export { default as IoChevronRight } from "./chevron-right";
-export { default as IoChevronUp } from "./chevron-up";
-export { default as IoClipboard } from "./clipboard";
-export { default as IoClock } from "./clock";
-export { default as IoCloseCircled } from "./close-circled";
-export { default as IoCloseRound } from "./close-round";
-export { default as IoClose } from "./close";
-export { default as IoClosedCaptioning } from "./closed-captioning";
-export { default as IoCloud } from "./cloud";
-export { default as IoCodeDownload } from "./code-download";
-export { default as IoCodeWorking } from "./code-working";
-export { default as IoCode } from "./code";
-export { default as IoCoffee } from "./coffee";
-export { default as IoCompass } from "./compass";
-export { default as IoCompose } from "./compose";
-export { default as IoConnectbars } from "./connectbars";
-export { default as IoContrast } from "./contrast";
-export { default as IoCrop } from "./crop";
-export { default as IoCube } from "./cube";
-export { default as IoDisc } from "./disc";
-export { default as IoDocumentText } from "./document-text";
-export { default as IoDocument } from "./document";
-export { default as IoDrag } from "./drag";
-export { default as IoEarth } from "./earth";
-export { default as IoEasel } from "./easel";
-export { default as IoEdit } from "./edit";
-export { default as IoEgg } from "./egg";
-export { default as IoEject } from "./eject";
-export { default as IoEmailUnread } from "./email-unread";
-export { default as IoEmail } from "./email";
-export { default as IoErlenmeyerFlaskBubbles } from "./erlenmeyer-flask-bubbles";
-export { default as IoErlenmeyerFlask } from "./erlenmeyer-flask";
-export { default as IoEyeDisabled } from "./eye-disabled";
-export { default as IoEye } from "./eye";
-export { default as IoFemale } from "./female";
-export { default as IoFiling } from "./filing";
-export { default as IoFilmMarker } from "./film-marker";
-export { default as IoFireball } from "./fireball";
-export { default as IoFlag } from "./flag";
-export { default as IoFlame } from "./flame";
-export { default as IoFlashOff } from "./flash-off";
-export { default as IoFlash } from "./flash";
-export { default as IoFolder } from "./folder";
-export { default as IoForkRepo } from "./fork-repo";
-export { default as IoFork } from "./fork";
-export { default as IoForward } from "./forward";
-export { default as IoFunnel } from "./funnel";
-export { default as IoGearA } from "./gear-a";
-export { default as IoGearB } from "./gear-b";
-export { default as IoGrid } from "./grid";
-export { default as IoHammer } from "./hammer";
-export { default as IoHappyOutline } from "./happy-outline";
-export { default as IoHappy } from "./happy";
-export { default as IoHeadphone } from "./headphone";
-export { default as IoHeartBroken } from "./heart-broken";
-export { default as IoHeart } from "./heart";
-export { default as IoHelpBuoy } from "./help-buoy";
-export { default as IoHelpCircled } from "./help-circled";
-export { default as IoHelp } from "./help";
-export { default as IoHome } from "./home";
-export { default as IoIcecream } from "./icecream";
-export { default as IoImage } from "./image";
-export { default as IoImages } from "./images";
-export { default as IoInformatcircled } from "./informatcircled";
-export { default as IoInformation } from "./information";
-export { default as IoIonic } from "./ionic";
-export { default as IoIosAlarmOutline } from "./ios-alarm-outline";
-export { default as IoIosAlarm } from "./ios-alarm";
-export { default as IoIosAlbumsOutline } from "./ios-albums-outline";
-export { default as IoIosAlbums } from "./ios-albums";
-export { default as IoIosAmericanfootballOutline } from "./ios-americanfootball-outline";
-export { default as IoIosAmericanfootball } from "./ios-americanfootball";
-export { default as IoIosAnalyticsOutline } from "./ios-analytics-outline";
-export { default as IoIosAnalytics } from "./ios-analytics";
-export { default as IoIosArrowBack } from "./ios-arrow-back";
-export { default as IoIosArrowDown } from "./ios-arrow-down";
-export { default as IoIosArrowForward } from "./ios-arrow-forward";
-export { default as IoIosArrowLeft } from "./ios-arrow-left";
-export { default as IoIosArrowRight } from "./ios-arrow-right";
-export { default as IoIosArrowThinDown } from "./ios-arrow-thin-down";
-export { default as IoIosArrowThinLeft } from "./ios-arrow-thin-left";
-export { default as IoIosArrowThinRight } from "./ios-arrow-thin-right";
-export { default as IoIosArrowThinUp } from "./ios-arrow-thin-up";
-export { default as IoIosArrowUp } from "./ios-arrow-up";
-export { default as IoIosAtOutline } from "./ios-at-outline";
-export { default as IoIosAt } from "./ios-at";
-export { default as IoIosBarcodeOutline } from "./ios-barcode-outline";
-export { default as IoIosBarcode } from "./ios-barcode";
-export { default as IoIosBaseballOutline } from "./ios-baseball-outline";
-export { default as IoIosBaseball } from "./ios-baseball";
-export { default as IoIosBasketballOutline } from "./ios-basketball-outline";
-export { default as IoIosBasketball } from "./ios-basketball";
-export { default as IoIosBellOutline } from "./ios-bell-outline";
-export { default as IoIosBell } from "./ios-bell";
-export { default as IoIosBodyOutline } from "./ios-body-outline";
-export { default as IoIosBody } from "./ios-body";
-export { default as IoIosBoltOutline } from "./ios-bolt-outline";
-export { default as IoIosBolt } from "./ios-bolt";
-export { default as IoIosBookOutline } from "./ios-book-outline";
-export { default as IoIosBook } from "./ios-book";
-export { default as IoIosBookmarksOutline } from "./ios-bookmarks-outline";
-export { default as IoIosBookmarks } from "./ios-bookmarks";
-export { default as IoIosBoxOutline } from "./ios-box-outline";
-export { default as IoIosBox } from "./ios-box";
-export { default as IoIosBriefcaseOutline } from "./ios-briefcase-outline";
-export { default as IoIosBriefcase } from "./ios-briefcase";
-export { default as IoIosBrowsersOutline } from "./ios-browsers-outline";
-export { default as IoIosBrowsers } from "./ios-browsers";
-export { default as IoIosCalculatorOutline } from "./ios-calculator-outline";
-export { default as IoIosCalculator } from "./ios-calculator";
-export { default as IoIosCalendarOutline } from "./ios-calendar-outline";
-export { default as IoIosCalendar } from "./ios-calendar";
-export { default as IoIosCameraOutline } from "./ios-camera-outline";
-export { default as IoIosCamera } from "./ios-camera";
-export { default as IoIosCartOutline } from "./ios-cart-outline";
-export { default as IoIosCart } from "./ios-cart";
-export { default as IoIosChatboxesOutline } from "./ios-chatboxes-outline";
-export { default as IoIosChatboxes } from "./ios-chatboxes";
-export { default as IoIosChatbubbleOutline } from "./ios-chatbubble-outline";
-export { default as IoIosChatbubble } from "./ios-chatbubble";
-export { default as IoIosCheckmarkEmpty } from "./ios-checkmark-empty";
-export { default as IoIosCheckmarkOutline } from "./ios-checkmark-outline";
-export { default as IoIosCheckmark } from "./ios-checkmark";
-export { default as IoIosCircleFilled } from "./ios-circle-filled";
-export { default as IoIosCircleOutline } from "./ios-circle-outline";
-export { default as IoIosClockOutline } from "./ios-clock-outline";
-export { default as IoIosClock } from "./ios-clock";
-export { default as IoIosCloseEmpty } from "./ios-close-empty";
-export { default as IoIosCloseOutline } from "./ios-close-outline";
-export { default as IoIosClose } from "./ios-close";
-export { default as IoIosCloudDownloadOutline } from "./ios-cloud-download-outline";
-export { default as IoIosCloudDownload } from "./ios-cloud-download";
-export { default as IoIosCloudOutline } from "./ios-cloud-outline";
-export { default as IoIosCloudUploadOutline } from "./ios-cloud-upload-outline";
-export { default as IoIosCloudUpload } from "./ios-cloud-upload";
-export { default as IoIosCloud } from "./ios-cloud";
-export { default as IoIosCloudyNightOutline } from "./ios-cloudy-night-outline";
-export { default as IoIosCloudyNight } from "./ios-cloudy-night";
-export { default as IoIosCloudyOutline } from "./ios-cloudy-outline";
-export { default as IoIosCloudy } from "./ios-cloudy";
-export { default as IoIosCogOutline } from "./ios-cog-outline";
-export { default as IoIosCog } from "./ios-cog";
-export { default as IoIosColorFilterOutline } from "./ios-color-filter-outline";
-export { default as IoIosColorFilter } from "./ios-color-filter";
-export { default as IoIosColorWandOutline } from "./ios-color-wand-outline";
-export { default as IoIosColorWand } from "./ios-color-wand";
-export { default as IoIosComposeOutline } from "./ios-compose-outline";
-export { default as IoIosCompose } from "./ios-compose";
-export { default as IoIosContactOutline } from "./ios-contact-outline";
-export { default as IoIosContact } from "./ios-contact";
-export { default as IoIosCopyOutline } from "./ios-copy-outline";
-export { default as IoIosCopy } from "./ios-copy";
-export { default as IoIosCropStrong } from "./ios-crop-strong";
-export { default as IoIosCrop } from "./ios-crop";
-export { default as IoIosDownloadOutline } from "./ios-download-outline";
-export { default as IoIosDownload } from "./ios-download";
-export { default as IoIosDrag } from "./ios-drag";
-export { default as IoIosEmailOutline } from "./ios-email-outline";
-export { default as IoIosEmail } from "./ios-email";
-export { default as IoIosEyeOutline } from "./ios-eye-outline";
-export { default as IoIosEye } from "./ios-eye";
-export { default as IoIosFastforwardOutline } from "./ios-fastforward-outline";
-export { default as IoIosFastforward } from "./ios-fastforward";
-export { default as IoIosFilingOutline } from "./ios-filing-outline";
-export { default as IoIosFiling } from "./ios-filing";
-export { default as IoIosFilmOutline } from "./ios-film-outline";
-export { default as IoIosFilm } from "./ios-film";
-export { default as IoIosFlagOutline } from "./ios-flag-outline";
-export { default as IoIosFlag } from "./ios-flag";
-export { default as IoIosFlameOutline } from "./ios-flame-outline";
-export { default as IoIosFlame } from "./ios-flame";
-export { default as IoIosFlaskOutline } from "./ios-flask-outline";
-export { default as IoIosFlask } from "./ios-flask";
-export { default as IoIosFlowerOutline } from "./ios-flower-outline";
-export { default as IoIosFlower } from "./ios-flower";
-export { default as IoIosFolderOutline } from "./ios-folder-outline";
-export { default as IoIosFolder } from "./ios-folder";
-export { default as IoIosFootballOutline } from "./ios-football-outline";
-export { default as IoIosFootball } from "./ios-football";
-export { default as IoIosGameControllerAOutline } from "./ios-game-controller-a-outline";
-export { default as IoIosGameControllerA } from "./ios-game-controller-a";
-export { default as IoIosGameControllerBOutline } from "./ios-game-controller-b-outline";
-export { default as IoIosGameControllerB } from "./ios-game-controller-b";
-export { default as IoIosGearOutline } from "./ios-gear-outline";
-export { default as IoIosGear } from "./ios-gear";
-export { default as IoIosGlassesOutline } from "./ios-glasses-outline";
-export { default as IoIosGlasses } from "./ios-glasses";
-export { default as IoIosGridViewOutline } from "./ios-grid-view-outline";
-export { default as IoIosGridView } from "./ios-grid-view";
-export { default as IoIosHeartOutline } from "./ios-heart-outline";
-export { default as IoIosHeart } from "./ios-heart";
-export { default as IoIosHelpEmpty } from "./ios-help-empty";
-export { default as IoIosHelpOutline } from "./ios-help-outline";
-export { default as IoIosHelp } from "./ios-help";
-export { default as IoIosHomeOutline } from "./ios-home-outline";
-export { default as IoIosHome } from "./ios-home";
-export { default as IoIosInfiniteOutline } from "./ios-infinite-outline";
-export { default as IoIosInfinite } from "./ios-infinite";
-export { default as IoIosInformatempty } from "./ios-informatempty";
-export { default as IoIosInformation } from "./ios-information";
-export { default as IoIosInformatoutline } from "./ios-informatoutline";
-export { default as IoIosIonicOutline } from "./ios-ionic-outline";
-export { default as IoIosKeypadOutline } from "./ios-keypad-outline";
-export { default as IoIosKeypad } from "./ios-keypad";
-export { default as IoIosLightbulbOutline } from "./ios-lightbulb-outline";
-export { default as IoIosLightbulb } from "./ios-lightbulb";
-export { default as IoIosListOutline } from "./ios-list-outline";
-export { default as IoIosList } from "./ios-list";
-export { default as IoIosLocation } from "./ios-location";
-export { default as IoIosLocatoutline } from "./ios-locatoutline";
-export { default as IoIosLockedOutline } from "./ios-locked-outline";
-export { default as IoIosLocked } from "./ios-locked";
-export { default as IoIosLoopStrong } from "./ios-loop-strong";
-export { default as IoIosLoop } from "./ios-loop";
-export { default as IoIosMedicalOutline } from "./ios-medical-outline";
-export { default as IoIosMedical } from "./ios-medical";
-export { default as IoIosMedkitOutline } from "./ios-medkit-outline";
-export { default as IoIosMedkit } from "./ios-medkit";
-export { default as IoIosMicOff } from "./ios-mic-off";
-export { default as IoIosMicOutline } from "./ios-mic-outline";
-export { default as IoIosMic } from "./ios-mic";
-export { default as IoIosMinusEmpty } from "./ios-minus-empty";
-export { default as IoIosMinusOutline } from "./ios-minus-outline";
-export { default as IoIosMinus } from "./ios-minus";
-export { default as IoIosMonitorOutline } from "./ios-monitor-outline";
-export { default as IoIosMonitor } from "./ios-monitor";
-export { default as IoIosMoonOutline } from "./ios-moon-outline";
-export { default as IoIosMoon } from "./ios-moon";
-export { default as IoIosMoreOutline } from "./ios-more-outline";
-export { default as IoIosMore } from "./ios-more";
-export { default as IoIosMusicalNote } from "./ios-musical-note";
-export { default as IoIosMusicalNotes } from "./ios-musical-notes";
-export { default as IoIosNavigateOutline } from "./ios-navigate-outline";
-export { default as IoIosNavigate } from "./ios-navigate";
-export { default as IoIosNutrition } from "./ios-nutrition";
-export { default as IoIosNutritoutline } from "./ios-nutritoutline";
-export { default as IoIosPaperOutline } from "./ios-paper-outline";
-export { default as IoIosPaper } from "./ios-paper";
-export { default as IoIosPaperplaneOutline } from "./ios-paperplane-outline";
-export { default as IoIosPaperplane } from "./ios-paperplane";
-export { default as IoIosPartlysunnyOutline } from "./ios-partlysunny-outline";
-export { default as IoIosPartlysunny } from "./ios-partlysunny";
-export { default as IoIosPauseOutline } from "./ios-pause-outline";
-export { default as IoIosPause } from "./ios-pause";
-export { default as IoIosPawOutline } from "./ios-paw-outline";
-export { default as IoIosPaw } from "./ios-paw";
-export { default as IoIosPeopleOutline } from "./ios-people-outline";
-export { default as IoIosPeople } from "./ios-people";
-export { default as IoIosPersonOutline } from "./ios-person-outline";
-export { default as IoIosPerson } from "./ios-person";
-export { default as IoIosPersonaddOutline } from "./ios-personadd-outline";
-export { default as IoIosPersonadd } from "./ios-personadd";
-export { default as IoIosPhotosOutline } from "./ios-photos-outline";
-export { default as IoIosPhotos } from "./ios-photos";
-export { default as IoIosPieOutline } from "./ios-pie-outline";
-export { default as IoIosPie } from "./ios-pie";
-export { default as IoIosPintOutline } from "./ios-pint-outline";
-export { default as IoIosPint } from "./ios-pint";
-export { default as IoIosPlayOutline } from "./ios-play-outline";
-export { default as IoIosPlay } from "./ios-play";
-export { default as IoIosPlusEmpty } from "./ios-plus-empty";
-export { default as IoIosPlusOutline } from "./ios-plus-outline";
-export { default as IoIosPlus } from "./ios-plus";
-export { default as IoIosPricetagOutline } from "./ios-pricetag-outline";
-export { default as IoIosPricetag } from "./ios-pricetag";
-export { default as IoIosPricetagsOutline } from "./ios-pricetags-outline";
-export { default as IoIosPricetags } from "./ios-pricetags";
-export { default as IoIosPrinterOutline } from "./ios-printer-outline";
-export { default as IoIosPrinter } from "./ios-printer";
-export { default as IoIosPulseStrong } from "./ios-pulse-strong";
-export { default as IoIosPulse } from "./ios-pulse";
-export { default as IoIosRainyOutline } from "./ios-rainy-outline";
-export { default as IoIosRainy } from "./ios-rainy";
-export { default as IoIosRecordingOutline } from "./ios-recording-outline";
-export { default as IoIosRecording } from "./ios-recording";
-export { default as IoIosRedoOutline } from "./ios-redo-outline";
-export { default as IoIosRedo } from "./ios-redo";
-export { default as IoIosRefreshEmpty } from "./ios-refresh-empty";
-export { default as IoIosRefreshOutline } from "./ios-refresh-outline";
-export { default as IoIosRefresh } from "./ios-refresh";
-export { default as IoIosReload } from "./ios-reload";
-export { default as IoIosReverseCameraOutline } from "./ios-reverse-camera-outline";
-export { default as IoIosReverseCamera } from "./ios-reverse-camera";
-export { default as IoIosRewindOutline } from "./ios-rewind-outline";
-export { default as IoIosRewind } from "./ios-rewind";
-export { default as IoIosRoseOutline } from "./ios-rose-outline";
-export { default as IoIosRose } from "./ios-rose";
-export { default as IoIosSearchStrong } from "./ios-search-strong";
-export { default as IoIosSearch } from "./ios-search";
-export { default as IoIosSettingsStrong } from "./ios-settings-strong";
-export { default as IoIosSettings } from "./ios-settings";
-export { default as IoIosShuffleStrong } from "./ios-shuffle-strong";
-export { default as IoIosShuffle } from "./ios-shuffle";
-export { default as IoIosSkipbackwardOutline } from "./ios-skipbackward-outline";
-export { default as IoIosSkipbackward } from "./ios-skipbackward";
-export { default as IoIosSkipforwardOutline } from "./ios-skipforward-outline";
-export { default as IoIosSkipforward } from "./ios-skipforward";
-export { default as IoIosSnowy } from "./ios-snowy";
-export { default as IoIosSpeedometerOutline } from "./ios-speedometer-outline";
-export { default as IoIosSpeedometer } from "./ios-speedometer";
-export { default as IoIosStarHalf } from "./ios-star-half";
-export { default as IoIosStarOutline } from "./ios-star-outline";
-export { default as IoIosStar } from "./ios-star";
-export { default as IoIosStopwatchOutline } from "./ios-stopwatch-outline";
-export { default as IoIosStopwatch } from "./ios-stopwatch";
-export { default as IoIosSunnyOutline } from "./ios-sunny-outline";
-export { default as IoIosSunny } from "./ios-sunny";
-export { default as IoIosTelephoneOutline } from "./ios-telephone-outline";
-export { default as IoIosTelephone } from "./ios-telephone";
-export { default as IoIosTennisballOutline } from "./ios-tennisball-outline";
-export { default as IoIosTennisball } from "./ios-tennisball";
-export { default as IoIosThunderstormOutline } from "./ios-thunderstorm-outline";
-export { default as IoIosThunderstorm } from "./ios-thunderstorm";
-export { default as IoIosTimeOutline } from "./ios-time-outline";
-export { default as IoIosTime } from "./ios-time";
-export { default as IoIosTimerOutline } from "./ios-timer-outline";
-export { default as IoIosTimer } from "./ios-timer";
-export { default as IoIosToggleOutline } from "./ios-toggle-outline";
-export { default as IoIosToggle } from "./ios-toggle";
-export { default as IoIosTrashOutline } from "./ios-trash-outline";
-export { default as IoIosTrash } from "./ios-trash";
-export { default as IoIosUndoOutline } from "./ios-undo-outline";
-export { default as IoIosUndo } from "./ios-undo";
-export { default as IoIosUnlockedOutline } from "./ios-unlocked-outline";
-export { default as IoIosUnlocked } from "./ios-unlocked";
-export { default as IoIosUploadOutline } from "./ios-upload-outline";
-export { default as IoIosUpload } from "./ios-upload";
-export { default as IoIosVideocamOutline } from "./ios-videocam-outline";
-export { default as IoIosVideocam } from "./ios-videocam";
-export { default as IoIosVolumeHigh } from "./ios-volume-high";
-export { default as IoIosVolumeLow } from "./ios-volume-low";
-export { default as IoIosWineglassOutline } from "./ios-wineglass-outline";
-export { default as IoIosWineglass } from "./ios-wineglass";
-export { default as IoIosWorldOutline } from "./ios-world-outline";
-export { default as IoIosWorld } from "./ios-world";
-export { default as IoIpad } from "./ipad";
-export { default as IoIphone } from "./iphone";
-export { default as IoIpod } from "./ipod";
-export { default as IoJet } from "./jet";
-export { default as IoKey } from "./key";
-export { default as IoKnife } from "./knife";
-export { default as IoLaptop } from "./laptop";
-export { default as IoLeaf } from "./leaf";
-export { default as IoLevels } from "./levels";
-export { default as IoLightbulb } from "./lightbulb";
-export { default as IoLink } from "./link";
-export { default as IoLoadA } from "./load-a";
-export { default as IoLoadB } from "./load-b";
-export { default as IoLoadC } from "./load-c";
-export { default as IoLoadD } from "./load-d";
-export { default as IoLocation } from "./location";
-export { default as IoLockCombination } from "./lock-combination";
-export { default as IoLocked } from "./locked";
-export { default as IoLogIn } from "./log-in";
-export { default as IoLogOut } from "./log-out";
-export { default as IoLoop } from "./loop";
-export { default as IoMagnet } from "./magnet";
-export { default as IoMale } from "./male";
-export { default as IoMan } from "./man";
-export { default as IoMap } from "./map";
-export { default as IoMedkit } from "./medkit";
-export { default as IoMerge } from "./merge";
-export { default as IoMicA } from "./mic-a";
-export { default as IoMicB } from "./mic-b";
-export { default as IoMicC } from "./mic-c";
-export { default as IoMinusCircled } from "./minus-circled";
-export { default as IoMinusRound } from "./minus-round";
-export { default as IoMinus } from "./minus";
-export { default as IoModelS } from "./model-s";
-export { default as IoMonitor } from "./monitor";
-export { default as IoMore } from "./more";
-export { default as IoMouse } from "./mouse";
-export { default as IoMusicNote } from "./music-note";
-export { default as IoNaviconRound } from "./navicon-round";
-export { default as IoNavicon } from "./navicon";
-export { default as IoNavigate } from "./navigate";
-export { default as IoNetwork } from "./network";
-export { default as IoNoSmoking } from "./no-smoking";
-export { default as IoNuclear } from "./nuclear";
-export { default as IoOutlet } from "./outlet";
-export { default as IoPaintbrush } from "./paintbrush";
-export { default as IoPaintbucket } from "./paintbucket";
-export { default as IoPaperAirplane } from "./paper-airplane";
-export { default as IoPaperclip } from "./paperclip";
-export { default as IoPause } from "./pause";
-export { default as IoPersonAdd } from "./person-add";
-export { default as IoPersonStalker } from "./person-stalker";
-export { default as IoPerson } from "./person";
-export { default as IoPieGraph } from "./pie-graph";
-export { default as IoPin } from "./pin";
-export { default as IoPinpoint } from "./pinpoint";
-export { default as IoPizza } from "./pizza";
-export { default as IoPlane } from "./plane";
-export { default as IoPlanet } from "./planet";
-export { default as IoPlay } from "./play";
-export { default as IoPlaystation } from "./playstation";
-export { default as IoPlusCircled } from "./plus-circled";
-export { default as IoPlusRound } from "./plus-round";
-export { default as IoPlus } from "./plus";
-export { default as IoPodium } from "./podium";
-export { default as IoPound } from "./pound";
-export { default as IoPower } from "./power";
-export { default as IoPricetag } from "./pricetag";
-export { default as IoPricetags } from "./pricetags";
-export { default as IoPrinter } from "./printer";
-export { default as IoPullRequest } from "./pull-request";
-export { default as IoQrScanner } from "./qr-scanner";
-export { default as IoQuote } from "./quote";
-export { default as IoRadioWaves } from "./radio-waves";
-export { default as IoRecord } from "./record";
-export { default as IoRefresh } from "./refresh";
-export { default as IoReplyAll } from "./reply-all";
-export { default as IoReply } from "./reply";
-export { default as IoRibbonA } from "./ribbon-a";
-export { default as IoRibbonB } from "./ribbon-b";
-export { default as IoSadOutline } from "./sad-outline";
-export { default as IoSad } from "./sad";
-export { default as IoScissors } from "./scissors";
-export { default as IoSearch } from "./search";
-export { default as IoSettings } from "./settings";
-export { default as IoShare } from "./share";
-export { default as IoShuffle } from "./shuffle";
-export { default as IoSkipBackward } from "./skip-backward";
-export { default as IoSkipForward } from "./skip-forward";
-export { default as IoSocialAndroidOutline } from "./social-android-outline";
-export { default as IoSocialAndroid } from "./social-android";
-export { default as IoSocialAngularOutline } from "./social-angular-outline";
-export { default as IoSocialAngular } from "./social-angular";
-export { default as IoSocialAppleOutline } from "./social-apple-outline";
-export { default as IoSocialApple } from "./social-apple";
-export { default as IoSocialBitcoinOutline } from "./social-bitcoin-outline";
-export { default as IoSocialBitcoin } from "./social-bitcoin";
-export { default as IoSocialBufferOutline } from "./social-buffer-outline";
-export { default as IoSocialBuffer } from "./social-buffer";
-export { default as IoSocialChromeOutline } from "./social-chrome-outline";
-export { default as IoSocialChrome } from "./social-chrome";
-export { default as IoSocialCodepenOutline } from "./social-codepen-outline";
-export { default as IoSocialCodepen } from "./social-codepen";
-export { default as IoSocialCss3Outline } from "./social-css3-outline";
-export { default as IoSocialCss3 } from "./social-css3";
-export { default as IoSocialDesignernewsOutline } from "./social-designernews-outline";
-export { default as IoSocialDesignernews } from "./social-designernews";
-export { default as IoSocialDribbbleOutline } from "./social-dribbble-outline";
-export { default as IoSocialDribbble } from "./social-dribbble";
-export { default as IoSocialDropboxOutline } from "./social-dropbox-outline";
-export { default as IoSocialDropbox } from "./social-dropbox";
-export { default as IoSocialEuroOutline } from "./social-euro-outline";
-export { default as IoSocialEuro } from "./social-euro";
-export { default as IoSocialFacebookOutline } from "./social-facebook-outline";
-export { default as IoSocialFacebook } from "./social-facebook";
-export { default as IoSocialFoursquareOutline } from "./social-foursquare-outline";
-export { default as IoSocialFoursquare } from "./social-foursquare";
-export { default as IoSocialFreebsdDevil } from "./social-freebsd-devil";
-export { default as IoSocialGithubOutline } from "./social-github-outline";
-export { default as IoSocialGithub } from "./social-github";
-export { default as IoSocialGoogleOutline } from "./social-google-outline";
-export { default as IoSocialGoogle } from "./social-google";
-export { default as IoSocialGoogleplusOutline } from "./social-googleplus-outline";
-export { default as IoSocialGoogleplus } from "./social-googleplus";
-export { default as IoSocialHackernewsOutline } from "./social-hackernews-outline";
-export { default as IoSocialHackernews } from "./social-hackernews";
-export { default as IoSocialHtml5Outline } from "./social-html5-outline";
-export { default as IoSocialHtml5 } from "./social-html5";
-export { default as IoSocialInstagramOutline } from "./social-instagram-outline";
-export { default as IoSocialInstagram } from "./social-instagram";
-export { default as IoSocialJavascriptOutline } from "./social-javascript-outline";
-export { default as IoSocialJavascript } from "./social-javascript";
-export { default as IoSocialLinkedinOutline } from "./social-linkedin-outline";
-export { default as IoSocialLinkedin } from "./social-linkedin";
-export { default as IoSocialMarkdown } from "./social-markdown";
-export { default as IoSocialNodejs } from "./social-nodejs";
-export { default as IoSocialOctocat } from "./social-octocat";
-export { default as IoSocialPinterestOutline } from "./social-pinterest-outline";
-export { default as IoSocialPinterest } from "./social-pinterest";
-export { default as IoSocialPython } from "./social-python";
-export { default as IoSocialRedditOutline } from "./social-reddit-outline";
-export { default as IoSocialReddit } from "./social-reddit";
-export { default as IoSocialRssOutline } from "./social-rss-outline";
-export { default as IoSocialRss } from "./social-rss";
-export { default as IoSocialSass } from "./social-sass";
-export { default as IoSocialSkypeOutline } from "./social-skype-outline";
-export { default as IoSocialSkype } from "./social-skype";
-export { default as IoSocialSnapchatOutline } from "./social-snapchat-outline";
-export { default as IoSocialSnapchat } from "./social-snapchat";
-export { default as IoSocialTumblrOutline } from "./social-tumblr-outline";
-export { default as IoSocialTumblr } from "./social-tumblr";
-export { default as IoSocialTux } from "./social-tux";
-export { default as IoSocialTwitchOutline } from "./social-twitch-outline";
-export { default as IoSocialTwitch } from "./social-twitch";
-export { default as IoSocialTwitterOutline } from "./social-twitter-outline";
-export { default as IoSocialTwitter } from "./social-twitter";
-export { default as IoSocialUsdOutline } from "./social-usd-outline";
-export { default as IoSocialUsd } from "./social-usd";
-export { default as IoSocialVimeoOutline } from "./social-vimeo-outline";
-export { default as IoSocialVimeo } from "./social-vimeo";
-export { default as IoSocialWhatsappOutline } from "./social-whatsapp-outline";
-export { default as IoSocialWhatsapp } from "./social-whatsapp";
-export { default as IoSocialWindowsOutline } from "./social-windows-outline";
-export { default as IoSocialWindows } from "./social-windows";
-export { default as IoSocialWordpressOutline } from "./social-wordpress-outline";
-export { default as IoSocialWordpress } from "./social-wordpress";
-export { default as IoSocialYahooOutline } from "./social-yahoo-outline";
-export { default as IoSocialYahoo } from "./social-yahoo";
-export { default as IoSocialYenOutline } from "./social-yen-outline";
-export { default as IoSocialYen } from "./social-yen";
-export { default as IoSocialYoutubeOutline } from "./social-youtube-outline";
-export { default as IoSocialYoutube } from "./social-youtube";
-export { default as IoSoupCanOutline } from "./soup-can-outline";
-export { default as IoSoupCan } from "./soup-can";
-export { default as IoSpeakerphone } from "./speakerphone";
-export { default as IoSpeedometer } from "./speedometer";
-export { default as IoSpoon } from "./spoon";
-export { default as IoStar } from "./star";
-export { default as IoStatsBars } from "./stats-bars";
-export { default as IoSteam } from "./steam";
-export { default as IoStop } from "./stop";
-export { default as IoThermometer } from "./thermometer";
-export { default as IoThumbsdown } from "./thumbsdown";
-export { default as IoThumbsup } from "./thumbsup";
-export { default as IoToggleFilled } from "./toggle-filled";
-export { default as IoToggle } from "./toggle";
-export { default as IoTransgender } from "./transgender";
-export { default as IoTrashA } from "./trash-a";
-export { default as IoTrashB } from "./trash-b";
-export { default as IoTrophy } from "./trophy";
-export { default as IoTshirtOutline } from "./tshirt-outline";
-export { default as IoTshirt } from "./tshirt";
-export { default as IoUmbrella } from "./umbrella";
-export { default as IoUniversity } from "./university";
-export { default as IoUnlocked } from "./unlocked";
-export { default as IoUpload } from "./upload";
-export { default as IoUsb } from "./usb";
-export { default as IoVideocamera } from "./videocamera";
-export { default as IoVolumeHigh } from "./volume-high";
-export { default as IoVolumeLow } from "./volume-low";
-export { default as IoVolumeMedium } from "./volume-medium";
-export { default as IoVolumeMute } from "./volume-mute";
-export { default as IoWand } from "./wand";
-export { default as IoWaterdrop } from "./waterdrop";
-export { default as IoWifi } from "./wifi";
-export { default as IoWineglass } from "./wineglass";
-export { default as IoWoman } from "./woman";
-export { default as IoWrench } from "./wrench";
-export { default as IoXbox } from "./xbox";
+export { default as IoAlertCircled } from "../../io/alert-circled";
+export { default as IoAlert } from "../../io/alert";
+export { default as IoAndroidAddCircle } from "../../io/android-add-circle";
+export { default as IoAndroidAdd } from "../../io/android-add";
+export { default as IoAndroidAlarmClock } from "../../io/android-alarm-clock";
+export { default as IoAndroidAlert } from "../../io/android-alert";
+export { default as IoAndroidApps } from "../../io/android-apps";
+export { default as IoAndroidArchive } from "../../io/android-archive";
+export { default as IoAndroidArrowBack } from "../../io/android-arrow-back";
+export { default as IoAndroidArrowDown } from "../../io/android-arrow-down";
+export { default as IoAndroidArrowDropdownCircle } from "../../io/android-arrow-dropdown-circle";
+export { default as IoAndroidArrowDropdown } from "../../io/android-arrow-dropdown";
+export { default as IoAndroidArrowDropleftCircle } from "../../io/android-arrow-dropleft-circle";
+export { default as IoAndroidArrowDropleft } from "../../io/android-arrow-dropleft";
+export { default as IoAndroidArrowDroprightCircle } from "../../io/android-arrow-dropright-circle";
+export { default as IoAndroidArrowDropright } from "../../io/android-arrow-dropright";
+export { default as IoAndroidArrowDropupCircle } from "../../io/android-arrow-dropup-circle";
+export { default as IoAndroidArrowDropup } from "../../io/android-arrow-dropup";
+export { default as IoAndroidArrowForward } from "../../io/android-arrow-forward";
+export { default as IoAndroidArrowUp } from "../../io/android-arrow-up";
+export { default as IoAndroidAttach } from "../../io/android-attach";
+export { default as IoAndroidBar } from "../../io/android-bar";
+export { default as IoAndroidBicycle } from "../../io/android-bicycle";
+export { default as IoAndroidBoat } from "../../io/android-boat";
+export { default as IoAndroidBookmark } from "../../io/android-bookmark";
+export { default as IoAndroidBulb } from "../../io/android-bulb";
+export { default as IoAndroidBus } from "../../io/android-bus";
+export { default as IoAndroidCalendar } from "../../io/android-calendar";
+export { default as IoAndroidCall } from "../../io/android-call";
+export { default as IoAndroidCamera } from "../../io/android-camera";
+export { default as IoAndroidCancel } from "../../io/android-cancel";
+export { default as IoAndroidCar } from "../../io/android-car";
+export { default as IoAndroidCart } from "../../io/android-cart";
+export { default as IoAndroidChat } from "../../io/android-chat";
+export { default as IoAndroidCheckboxBlank } from "../../io/android-checkbox-blank";
+export { default as IoAndroidCheckboxOutlineBlank } from "../../io/android-checkbox-outline-blank";
+export { default as IoAndroidCheckboxOutline } from "../../io/android-checkbox-outline";
+export { default as IoAndroidCheckbox } from "../../io/android-checkbox";
+export { default as IoAndroidCheckmarkCircle } from "../../io/android-checkmark-circle";
+export { default as IoAndroidClipboard } from "../../io/android-clipboard";
+export { default as IoAndroidClose } from "../../io/android-close";
+export { default as IoAndroidCloudCircle } from "../../io/android-cloud-circle";
+export { default as IoAndroidCloudDone } from "../../io/android-cloud-done";
+export { default as IoAndroidCloudOutline } from "../../io/android-cloud-outline";
+export { default as IoAndroidCloud } from "../../io/android-cloud";
+export { default as IoAndroidColorPalette } from "../../io/android-color-palette";
+export { default as IoAndroidCompass } from "../../io/android-compass";
+export { default as IoAndroidContact } from "../../io/android-contact";
+export { default as IoAndroidContacts } from "../../io/android-contacts";
+export { default as IoAndroidContract } from "../../io/android-contract";
+export { default as IoAndroidCreate } from "../../io/android-create";
+export { default as IoAndroidDelete } from "../../io/android-delete";
+export { default as IoAndroidDesktop } from "../../io/android-desktop";
+export { default as IoAndroidDocument } from "../../io/android-document";
+export { default as IoAndroidDoneAll } from "../../io/android-done-all";
+export { default as IoAndroidDone } from "../../io/android-done";
+export { default as IoAndroidDownload } from "../../io/android-download";
+export { default as IoAndroidDrafts } from "../../io/android-drafts";
+export { default as IoAndroidExit } from "../../io/android-exit";
+export { default as IoAndroidExpand } from "../../io/android-expand";
+export { default as IoAndroidFavoriteOutline } from "../../io/android-favorite-outline";
+export { default as IoAndroidFavorite } from "../../io/android-favorite";
+export { default as IoAndroidFilm } from "../../io/android-film";
+export { default as IoAndroidFolderOpen } from "../../io/android-folder-open";
+export { default as IoAndroidFolder } from "../../io/android-folder";
+export { default as IoAndroidFunnel } from "../../io/android-funnel";
+export { default as IoAndroidGlobe } from "../../io/android-globe";
+export { default as IoAndroidHand } from "../../io/android-hand";
+export { default as IoAndroidHangout } from "../../io/android-hangout";
+export { default as IoAndroidHappy } from "../../io/android-happy";
+export { default as IoAndroidHome } from "../../io/android-home";
+export { default as IoAndroidImage } from "../../io/android-image";
+export { default as IoAndroidLaptop } from "../../io/android-laptop";
+export { default as IoAndroidList } from "../../io/android-list";
+export { default as IoAndroidLocate } from "../../io/android-locate";
+export { default as IoAndroidLock } from "../../io/android-lock";
+export { default as IoAndroidMail } from "../../io/android-mail";
+export { default as IoAndroidMap } from "../../io/android-map";
+export { default as IoAndroidMenu } from "../../io/android-menu";
+export { default as IoAndroidMicrophoneOff } from "../../io/android-microphone-off";
+export { default as IoAndroidMicrophone } from "../../io/android-microphone";
+export { default as IoAndroidMoreHorizontal } from "../../io/android-more-horizontal";
+export { default as IoAndroidMoreVertical } from "../../io/android-more-vertical";
+export { default as IoAndroidNavigate } from "../../io/android-navigate";
+export { default as IoAndroidNotificationsNone } from "../../io/android-notifications-none";
+export { default as IoAndroidNotificationsOff } from "../../io/android-notifications-off";
+export { default as IoAndroidNotifications } from "../../io/android-notifications";
+export { default as IoAndroidOpen } from "../../io/android-open";
+export { default as IoAndroidOptions } from "../../io/android-options";
+export { default as IoAndroidPeople } from "../../io/android-people";
+export { default as IoAndroidPersonAdd } from "../../io/android-person-add";
+export { default as IoAndroidPerson } from "../../io/android-person";
+export { default as IoAndroidPhoneLandscape } from "../../io/android-phone-landscape";
+export { default as IoAndroidPhonePortrait } from "../../io/android-phone-portrait";
+export { default as IoAndroidPin } from "../../io/android-pin";
+export { default as IoAndroidPlane } from "../../io/android-plane";
+export { default as IoAndroidPlaystore } from "../../io/android-playstore";
+export { default as IoAndroidPrint } from "../../io/android-print";
+export { default as IoAndroidRadioButtonOff } from "../../io/android-radio-button-off";
+export { default as IoAndroidRadioButtonOn } from "../../io/android-radio-button-on";
+export { default as IoAndroidRefresh } from "../../io/android-refresh";
+export { default as IoAndroidRemoveCircle } from "../../io/android-remove-circle";
+export { default as IoAndroidRemove } from "../../io/android-remove";
+export { default as IoAndroidRestaurant } from "../../io/android-restaurant";
+export { default as IoAndroidSad } from "../../io/android-sad";
+export { default as IoAndroidSearch } from "../../io/android-search";
+export { default as IoAndroidSend } from "../../io/android-send";
+export { default as IoAndroidSettings } from "../../io/android-settings";
+export { default as IoAndroidShareAlt } from "../../io/android-share-alt";
+export { default as IoAndroidShare } from "../../io/android-share";
+export { default as IoAndroidStarHalf } from "../../io/android-star-half";
+export { default as IoAndroidStarOutline } from "../../io/android-star-outline";
+export { default as IoAndroidStar } from "../../io/android-star";
+export { default as IoAndroidStopwatch } from "../../io/android-stopwatch";
+export { default as IoAndroidSubway } from "../../io/android-subway";
+export { default as IoAndroidSunny } from "../../io/android-sunny";
+export { default as IoAndroidSync } from "../../io/android-sync";
+export { default as IoAndroidTextsms } from "../../io/android-textsms";
+export { default as IoAndroidTime } from "../../io/android-time";
+export { default as IoAndroidTrain } from "../../io/android-train";
+export { default as IoAndroidUnlock } from "../../io/android-unlock";
+export { default as IoAndroidUpload } from "../../io/android-upload";
+export { default as IoAndroidVolumeDown } from "../../io/android-volume-down";
+export { default as IoAndroidVolumeMute } from "../../io/android-volume-mute";
+export { default as IoAndroidVolumeOff } from "../../io/android-volume-off";
+export { default as IoAndroidVolumeUp } from "../../io/android-volume-up";
+export { default as IoAndroidWalk } from "../../io/android-walk";
+export { default as IoAndroidWarning } from "../../io/android-warning";
+export { default as IoAndroidWatch } from "../../io/android-watch";
+export { default as IoAndroidWifi } from "../../io/android-wifi";
+export { default as IoAperture } from "../../io/aperture";
+export { default as IoArchive } from "../../io/archive";
+export { default as IoArrowDownA } from "../../io/arrow-down-a";
+export { default as IoArrowDownB } from "../../io/arrow-down-b";
+export { default as IoArrowDownC } from "../../io/arrow-down-c";
+export { default as IoArrowExpand } from "../../io/arrow-expand";
+export { default as IoArrowGraphDownLeft } from "../../io/arrow-graph-down-left";
+export { default as IoArrowGraphDownRight } from "../../io/arrow-graph-down-right";
+export { default as IoArrowGraphUpLeft } from "../../io/arrow-graph-up-left";
+export { default as IoArrowGraphUpRight } from "../../io/arrow-graph-up-right";
+export { default as IoArrowLeftA } from "../../io/arrow-left-a";
+export { default as IoArrowLeftB } from "../../io/arrow-left-b";
+export { default as IoArrowLeftC } from "../../io/arrow-left-c";
+export { default as IoArrowMove } from "../../io/arrow-move";
+export { default as IoArrowResize } from "../../io/arrow-resize";
+export { default as IoArrowReturnLeft } from "../../io/arrow-return-left";
+export { default as IoArrowReturnRight } from "../../io/arrow-return-right";
+export { default as IoArrowRightA } from "../../io/arrow-right-a";
+export { default as IoArrowRightB } from "../../io/arrow-right-b";
+export { default as IoArrowRightC } from "../../io/arrow-right-c";
+export { default as IoArrowShrink } from "../../io/arrow-shrink";
+export { default as IoArrowSwap } from "../../io/arrow-swap";
+export { default as IoArrowUpA } from "../../io/arrow-up-a";
+export { default as IoArrowUpB } from "../../io/arrow-up-b";
+export { default as IoArrowUpC } from "../../io/arrow-up-c";
+export { default as IoAsterisk } from "../../io/asterisk";
+export { default as IoAt } from "../../io/at";
+export { default as IoBackspaceOutline } from "../../io/backspace-outline";
+export { default as IoBackspace } from "../../io/backspace";
+export { default as IoBag } from "../../io/bag";
+export { default as IoBatteryCharging } from "../../io/battery-charging";
+export { default as IoBatteryEmpty } from "../../io/battery-empty";
+export { default as IoBatteryFull } from "../../io/battery-full";
+export { default as IoBatteryHalf } from "../../io/battery-half";
+export { default as IoBatteryLow } from "../../io/battery-low";
+export { default as IoBeaker } from "../../io/beaker";
+export { default as IoBeer } from "../../io/beer";
+export { default as IoBluetooth } from "../../io/bluetooth";
+export { default as IoBonfire } from "../../io/bonfire";
+export { default as IoBookmark } from "../../io/bookmark";
+export { default as IoBowtie } from "../../io/bowtie";
+export { default as IoBriefcase } from "../../io/briefcase";
+export { default as IoBug } from "../../io/bug";
+export { default as IoCalculator } from "../../io/calculator";
+export { default as IoCalendar } from "../../io/calendar";
+export { default as IoCamera } from "../../io/camera";
+export { default as IoCard } from "../../io/card";
+export { default as IoCash } from "../../io/cash";
+export { default as IoChatboxWorking } from "../../io/chatbox-working";
+export { default as IoChatbox } from "../../io/chatbox";
+export { default as IoChatboxes } from "../../io/chatboxes";
+export { default as IoChatbubbleWorking } from "../../io/chatbubble-working";
+export { default as IoChatbubble } from "../../io/chatbubble";
+export { default as IoChatbubbles } from "../../io/chatbubbles";
+export { default as IoCheckmarkCircled } from "../../io/checkmark-circled";
+export { default as IoCheckmarkRound } from "../../io/checkmark-round";
+export { default as IoCheckmark } from "../../io/checkmark";
+export { default as IoChevronDown } from "../../io/chevron-down";
+export { default as IoChevronLeft } from "../../io/chevron-left";
+export { default as IoChevronRight } from "../../io/chevron-right";
+export { default as IoChevronUp } from "../../io/chevron-up";
+export { default as IoClipboard } from "../../io/clipboard";
+export { default as IoClock } from "../../io/clock";
+export { default as IoCloseCircled } from "../../io/close-circled";
+export { default as IoCloseRound } from "../../io/close-round";
+export { default as IoClose } from "../../io/close";
+export { default as IoClosedCaptioning } from "../../io/closed-captioning";
+export { default as IoCloud } from "../../io/cloud";
+export { default as IoCodeDownload } from "../../io/code-download";
+export { default as IoCodeWorking } from "../../io/code-working";
+export { default as IoCode } from "../../io/code";
+export { default as IoCoffee } from "../../io/coffee";
+export { default as IoCompass } from "../../io/compass";
+export { default as IoCompose } from "../../io/compose";
+export { default as IoConnectbars } from "../../io/connectbars";
+export { default as IoContrast } from "../../io/contrast";
+export { default as IoCrop } from "../../io/crop";
+export { default as IoCube } from "../../io/cube";
+export { default as IoDisc } from "../../io/disc";
+export { default as IoDocumentText } from "../../io/document-text";
+export { default as IoDocument } from "../../io/document";
+export { default as IoDrag } from "../../io/drag";
+export { default as IoEarth } from "../../io/earth";
+export { default as IoEasel } from "../../io/easel";
+export { default as IoEdit } from "../../io/edit";
+export { default as IoEgg } from "../../io/egg";
+export { default as IoEject } from "../../io/eject";
+export { default as IoEmailUnread } from "../../io/email-unread";
+export { default as IoEmail } from "../../io/email";
+export { default as IoErlenmeyerFlaskBubbles } from "../../io/erlenmeyer-flask-bubbles";
+export { default as IoErlenmeyerFlask } from "../../io/erlenmeyer-flask";
+export { default as IoEyeDisabled } from "../../io/eye-disabled";
+export { default as IoEye } from "../../io/eye";
+export { default as IoFemale } from "../../io/female";
+export { default as IoFiling } from "../../io/filing";
+export { default as IoFilmMarker } from "../../io/film-marker";
+export { default as IoFireball } from "../../io/fireball";
+export { default as IoFlag } from "../../io/flag";
+export { default as IoFlame } from "../../io/flame";
+export { default as IoFlashOff } from "../../io/flash-off";
+export { default as IoFlash } from "../../io/flash";
+export { default as IoFolder } from "../../io/folder";
+export { default as IoForkRepo } from "../../io/fork-repo";
+export { default as IoFork } from "../../io/fork";
+export { default as IoForward } from "../../io/forward";
+export { default as IoFunnel } from "../../io/funnel";
+export { default as IoGearA } from "../../io/gear-a";
+export { default as IoGearB } from "../../io/gear-b";
+export { default as IoGrid } from "../../io/grid";
+export { default as IoHammer } from "../../io/hammer";
+export { default as IoHappyOutline } from "../../io/happy-outline";
+export { default as IoHappy } from "../../io/happy";
+export { default as IoHeadphone } from "../../io/headphone";
+export { default as IoHeartBroken } from "../../io/heart-broken";
+export { default as IoHeart } from "../../io/heart";
+export { default as IoHelpBuoy } from "../../io/help-buoy";
+export { default as IoHelpCircled } from "../../io/help-circled";
+export { default as IoHelp } from "../../io/help";
+export { default as IoHome } from "../../io/home";
+export { default as IoIcecream } from "../../io/icecream";
+export { default as IoImage } from "../../io/image";
+export { default as IoImages } from "../../io/images";
+export { default as IoInformatcircled } from "../../io/informatcircled";
+export { default as IoInformation } from "../../io/information";
+export { default as IoIonic } from "../../io/ionic";
+export { default as IoIosAlarmOutline } from "../../io/ios-alarm-outline";
+export { default as IoIosAlarm } from "../../io/ios-alarm";
+export { default as IoIosAlbumsOutline } from "../../io/ios-albums-outline";
+export { default as IoIosAlbums } from "../../io/ios-albums";
+export { default as IoIosAmericanfootballOutline } from "../../io/ios-americanfootball-outline";
+export { default as IoIosAmericanfootball } from "../../io/ios-americanfootball";
+export { default as IoIosAnalyticsOutline } from "../../io/ios-analytics-outline";
+export { default as IoIosAnalytics } from "../../io/ios-analytics";
+export { default as IoIosArrowBack } from "../../io/ios-arrow-back";
+export { default as IoIosArrowDown } from "../../io/ios-arrow-down";
+export { default as IoIosArrowForward } from "../../io/ios-arrow-forward";
+export { default as IoIosArrowLeft } from "../../io/ios-arrow-left";
+export { default as IoIosArrowRight } from "../../io/ios-arrow-right";
+export { default as IoIosArrowThinDown } from "../../io/ios-arrow-thin-down";
+export { default as IoIosArrowThinLeft } from "../../io/ios-arrow-thin-left";
+export { default as IoIosArrowThinRight } from "../../io/ios-arrow-thin-right";
+export { default as IoIosArrowThinUp } from "../../io/ios-arrow-thin-up";
+export { default as IoIosArrowUp } from "../../io/ios-arrow-up";
+export { default as IoIosAtOutline } from "../../io/ios-at-outline";
+export { default as IoIosAt } from "../../io/ios-at";
+export { default as IoIosBarcodeOutline } from "../../io/ios-barcode-outline";
+export { default as IoIosBarcode } from "../../io/ios-barcode";
+export { default as IoIosBaseballOutline } from "../../io/ios-baseball-outline";
+export { default as IoIosBaseball } from "../../io/ios-baseball";
+export { default as IoIosBasketballOutline } from "../../io/ios-basketball-outline";
+export { default as IoIosBasketball } from "../../io/ios-basketball";
+export { default as IoIosBellOutline } from "../../io/ios-bell-outline";
+export { default as IoIosBell } from "../../io/ios-bell";
+export { default as IoIosBodyOutline } from "../../io/ios-body-outline";
+export { default as IoIosBody } from "../../io/ios-body";
+export { default as IoIosBoltOutline } from "../../io/ios-bolt-outline";
+export { default as IoIosBolt } from "../../io/ios-bolt";
+export { default as IoIosBookOutline } from "../../io/ios-book-outline";
+export { default as IoIosBook } from "../../io/ios-book";
+export { default as IoIosBookmarksOutline } from "../../io/ios-bookmarks-outline";
+export { default as IoIosBookmarks } from "../../io/ios-bookmarks";
+export { default as IoIosBoxOutline } from "../../io/ios-box-outline";
+export { default as IoIosBox } from "../../io/ios-box";
+export { default as IoIosBriefcaseOutline } from "../../io/ios-briefcase-outline";
+export { default as IoIosBriefcase } from "../../io/ios-briefcase";
+export { default as IoIosBrowsersOutline } from "../../io/ios-browsers-outline";
+export { default as IoIosBrowsers } from "../../io/ios-browsers";
+export { default as IoIosCalculatorOutline } from "../../io/ios-calculator-outline";
+export { default as IoIosCalculator } from "../../io/ios-calculator";
+export { default as IoIosCalendarOutline } from "../../io/ios-calendar-outline";
+export { default as IoIosCalendar } from "../../io/ios-calendar";
+export { default as IoIosCameraOutline } from "../../io/ios-camera-outline";
+export { default as IoIosCamera } from "../../io/ios-camera";
+export { default as IoIosCartOutline } from "../../io/ios-cart-outline";
+export { default as IoIosCart } from "../../io/ios-cart";
+export { default as IoIosChatboxesOutline } from "../../io/ios-chatboxes-outline";
+export { default as IoIosChatboxes } from "../../io/ios-chatboxes";
+export { default as IoIosChatbubbleOutline } from "../../io/ios-chatbubble-outline";
+export { default as IoIosChatbubble } from "../../io/ios-chatbubble";
+export { default as IoIosCheckmarkEmpty } from "../../io/ios-checkmark-empty";
+export { default as IoIosCheckmarkOutline } from "../../io/ios-checkmark-outline";
+export { default as IoIosCheckmark } from "../../io/ios-checkmark";
+export { default as IoIosCircleFilled } from "../../io/ios-circle-filled";
+export { default as IoIosCircleOutline } from "../../io/ios-circle-outline";
+export { default as IoIosClockOutline } from "../../io/ios-clock-outline";
+export { default as IoIosClock } from "../../io/ios-clock";
+export { default as IoIosCloseEmpty } from "../../io/ios-close-empty";
+export { default as IoIosCloseOutline } from "../../io/ios-close-outline";
+export { default as IoIosClose } from "../../io/ios-close";
+export { default as IoIosCloudDownloadOutline } from "../../io/ios-cloud-download-outline";
+export { default as IoIosCloudDownload } from "../../io/ios-cloud-download";
+export { default as IoIosCloudOutline } from "../../io/ios-cloud-outline";
+export { default as IoIosCloudUploadOutline } from "../../io/ios-cloud-upload-outline";
+export { default as IoIosCloudUpload } from "../../io/ios-cloud-upload";
+export { default as IoIosCloud } from "../../io/ios-cloud";
+export { default as IoIosCloudyNightOutline } from "../../io/ios-cloudy-night-outline";
+export { default as IoIosCloudyNight } from "../../io/ios-cloudy-night";
+export { default as IoIosCloudyOutline } from "../../io/ios-cloudy-outline";
+export { default as IoIosCloudy } from "../../io/ios-cloudy";
+export { default as IoIosCogOutline } from "../../io/ios-cog-outline";
+export { default as IoIosCog } from "../../io/ios-cog";
+export { default as IoIosColorFilterOutline } from "../../io/ios-color-filter-outline";
+export { default as IoIosColorFilter } from "../../io/ios-color-filter";
+export { default as IoIosColorWandOutline } from "../../io/ios-color-wand-outline";
+export { default as IoIosColorWand } from "../../io/ios-color-wand";
+export { default as IoIosComposeOutline } from "../../io/ios-compose-outline";
+export { default as IoIosCompose } from "../../io/ios-compose";
+export { default as IoIosContactOutline } from "../../io/ios-contact-outline";
+export { default as IoIosContact } from "../../io/ios-contact";
+export { default as IoIosCopyOutline } from "../../io/ios-copy-outline";
+export { default as IoIosCopy } from "../../io/ios-copy";
+export { default as IoIosCropStrong } from "../../io/ios-crop-strong";
+export { default as IoIosCrop } from "../../io/ios-crop";
+export { default as IoIosDownloadOutline } from "../../io/ios-download-outline";
+export { default as IoIosDownload } from "../../io/ios-download";
+export { default as IoIosDrag } from "../../io/ios-drag";
+export { default as IoIosEmailOutline } from "../../io/ios-email-outline";
+export { default as IoIosEmail } from "../../io/ios-email";
+export { default as IoIosEyeOutline } from "../../io/ios-eye-outline";
+export { default as IoIosEye } from "../../io/ios-eye";
+export { default as IoIosFastforwardOutline } from "../../io/ios-fastforward-outline";
+export { default as IoIosFastforward } from "../../io/ios-fastforward";
+export { default as IoIosFilingOutline } from "../../io/ios-filing-outline";
+export { default as IoIosFiling } from "../../io/ios-filing";
+export { default as IoIosFilmOutline } from "../../io/ios-film-outline";
+export { default as IoIosFilm } from "../../io/ios-film";
+export { default as IoIosFlagOutline } from "../../io/ios-flag-outline";
+export { default as IoIosFlag } from "../../io/ios-flag";
+export { default as IoIosFlameOutline } from "../../io/ios-flame-outline";
+export { default as IoIosFlame } from "../../io/ios-flame";
+export { default as IoIosFlaskOutline } from "../../io/ios-flask-outline";
+export { default as IoIosFlask } from "../../io/ios-flask";
+export { default as IoIosFlowerOutline } from "../../io/ios-flower-outline";
+export { default as IoIosFlower } from "../../io/ios-flower";
+export { default as IoIosFolderOutline } from "../../io/ios-folder-outline";
+export { default as IoIosFolder } from "../../io/ios-folder";
+export { default as IoIosFootballOutline } from "../../io/ios-football-outline";
+export { default as IoIosFootball } from "../../io/ios-football";
+export { default as IoIosGameControllerAOutline } from "../../io/ios-game-controller-a-outline";
+export { default as IoIosGameControllerA } from "../../io/ios-game-controller-a";
+export { default as IoIosGameControllerBOutline } from "../../io/ios-game-controller-b-outline";
+export { default as IoIosGameControllerB } from "../../io/ios-game-controller-b";
+export { default as IoIosGearOutline } from "../../io/ios-gear-outline";
+export { default as IoIosGear } from "../../io/ios-gear";
+export { default as IoIosGlassesOutline } from "../../io/ios-glasses-outline";
+export { default as IoIosGlasses } from "../../io/ios-glasses";
+export { default as IoIosGridViewOutline } from "../../io/ios-grid-view-outline";
+export { default as IoIosGridView } from "../../io/ios-grid-view";
+export { default as IoIosHeartOutline } from "../../io/ios-heart-outline";
+export { default as IoIosHeart } from "../../io/ios-heart";
+export { default as IoIosHelpEmpty } from "../../io/ios-help-empty";
+export { default as IoIosHelpOutline } from "../../io/ios-help-outline";
+export { default as IoIosHelp } from "../../io/ios-help";
+export { default as IoIosHomeOutline } from "../../io/ios-home-outline";
+export { default as IoIosHome } from "../../io/ios-home";
+export { default as IoIosInfiniteOutline } from "../../io/ios-infinite-outline";
+export { default as IoIosInfinite } from "../../io/ios-infinite";
+export { default as IoIosInformatempty } from "../../io/ios-informatempty";
+export { default as IoIosInformation } from "../../io/ios-information";
+export { default as IoIosInformatoutline } from "../../io/ios-informatoutline";
+export { default as IoIosIonicOutline } from "../../io/ios-ionic-outline";
+export { default as IoIosKeypadOutline } from "../../io/ios-keypad-outline";
+export { default as IoIosKeypad } from "../../io/ios-keypad";
+export { default as IoIosLightbulbOutline } from "../../io/ios-lightbulb-outline";
+export { default as IoIosLightbulb } from "../../io/ios-lightbulb";
+export { default as IoIosListOutline } from "../../io/ios-list-outline";
+export { default as IoIosList } from "../../io/ios-list";
+export { default as IoIosLocation } from "../../io/ios-location";
+export { default as IoIosLocatoutline } from "../../io/ios-locatoutline";
+export { default as IoIosLockedOutline } from "../../io/ios-locked-outline";
+export { default as IoIosLocked } from "../../io/ios-locked";
+export { default as IoIosLoopStrong } from "../../io/ios-loop-strong";
+export { default as IoIosLoop } from "../../io/ios-loop";
+export { default as IoIosMedicalOutline } from "../../io/ios-medical-outline";
+export { default as IoIosMedical } from "../../io/ios-medical";
+export { default as IoIosMedkitOutline } from "../../io/ios-medkit-outline";
+export { default as IoIosMedkit } from "../../io/ios-medkit";
+export { default as IoIosMicOff } from "../../io/ios-mic-off";
+export { default as IoIosMicOutline } from "../../io/ios-mic-outline";
+export { default as IoIosMic } from "../../io/ios-mic";
+export { default as IoIosMinusEmpty } from "../../io/ios-minus-empty";
+export { default as IoIosMinusOutline } from "../../io/ios-minus-outline";
+export { default as IoIosMinus } from "../../io/ios-minus";
+export { default as IoIosMonitorOutline } from "../../io/ios-monitor-outline";
+export { default as IoIosMonitor } from "../../io/ios-monitor";
+export { default as IoIosMoonOutline } from "../../io/ios-moon-outline";
+export { default as IoIosMoon } from "../../io/ios-moon";
+export { default as IoIosMoreOutline } from "../../io/ios-more-outline";
+export { default as IoIosMore } from "../../io/ios-more";
+export { default as IoIosMusicalNote } from "../../io/ios-musical-note";
+export { default as IoIosMusicalNotes } from "../../io/ios-musical-notes";
+export { default as IoIosNavigateOutline } from "../../io/ios-navigate-outline";
+export { default as IoIosNavigate } from "../../io/ios-navigate";
+export { default as IoIosNutrition } from "../../io/ios-nutrition";
+export { default as IoIosNutritoutline } from "../../io/ios-nutritoutline";
+export { default as IoIosPaperOutline } from "../../io/ios-paper-outline";
+export { default as IoIosPaper } from "../../io/ios-paper";
+export { default as IoIosPaperplaneOutline } from "../../io/ios-paperplane-outline";
+export { default as IoIosPaperplane } from "../../io/ios-paperplane";
+export { default as IoIosPartlysunnyOutline } from "../../io/ios-partlysunny-outline";
+export { default as IoIosPartlysunny } from "../../io/ios-partlysunny";
+export { default as IoIosPauseOutline } from "../../io/ios-pause-outline";
+export { default as IoIosPause } from "../../io/ios-pause";
+export { default as IoIosPawOutline } from "../../io/ios-paw-outline";
+export { default as IoIosPaw } from "../../io/ios-paw";
+export { default as IoIosPeopleOutline } from "../../io/ios-people-outline";
+export { default as IoIosPeople } from "../../io/ios-people";
+export { default as IoIosPersonOutline } from "../../io/ios-person-outline";
+export { default as IoIosPerson } from "../../io/ios-person";
+export { default as IoIosPersonaddOutline } from "../../io/ios-personadd-outline";
+export { default as IoIosPersonadd } from "../../io/ios-personadd";
+export { default as IoIosPhotosOutline } from "../../io/ios-photos-outline";
+export { default as IoIosPhotos } from "../../io/ios-photos";
+export { default as IoIosPieOutline } from "../../io/ios-pie-outline";
+export { default as IoIosPie } from "../../io/ios-pie";
+export { default as IoIosPintOutline } from "../../io/ios-pint-outline";
+export { default as IoIosPint } from "../../io/ios-pint";
+export { default as IoIosPlayOutline } from "../../io/ios-play-outline";
+export { default as IoIosPlay } from "../../io/ios-play";
+export { default as IoIosPlusEmpty } from "../../io/ios-plus-empty";
+export { default as IoIosPlusOutline } from "../../io/ios-plus-outline";
+export { default as IoIosPlus } from "../../io/ios-plus";
+export { default as IoIosPricetagOutline } from "../../io/ios-pricetag-outline";
+export { default as IoIosPricetag } from "../../io/ios-pricetag";
+export { default as IoIosPricetagsOutline } from "../../io/ios-pricetags-outline";
+export { default as IoIosPricetags } from "../../io/ios-pricetags";
+export { default as IoIosPrinterOutline } from "../../io/ios-printer-outline";
+export { default as IoIosPrinter } from "../../io/ios-printer";
+export { default as IoIosPulseStrong } from "../../io/ios-pulse-strong";
+export { default as IoIosPulse } from "../../io/ios-pulse";
+export { default as IoIosRainyOutline } from "../../io/ios-rainy-outline";
+export { default as IoIosRainy } from "../../io/ios-rainy";
+export { default as IoIosRecordingOutline } from "../../io/ios-recording-outline";
+export { default as IoIosRecording } from "../../io/ios-recording";
+export { default as IoIosRedoOutline } from "../../io/ios-redo-outline";
+export { default as IoIosRedo } from "../../io/ios-redo";
+export { default as IoIosRefreshEmpty } from "../../io/ios-refresh-empty";
+export { default as IoIosRefreshOutline } from "../../io/ios-refresh-outline";
+export { default as IoIosRefresh } from "../../io/ios-refresh";
+export { default as IoIosReload } from "../../io/ios-reload";
+export { default as IoIosReverseCameraOutline } from "../../io/ios-reverse-camera-outline";
+export { default as IoIosReverseCamera } from "../../io/ios-reverse-camera";
+export { default as IoIosRewindOutline } from "../../io/ios-rewind-outline";
+export { default as IoIosRewind } from "../../io/ios-rewind";
+export { default as IoIosRoseOutline } from "../../io/ios-rose-outline";
+export { default as IoIosRose } from "../../io/ios-rose";
+export { default as IoIosSearchStrong } from "../../io/ios-search-strong";
+export { default as IoIosSearch } from "../../io/ios-search";
+export { default as IoIosSettingsStrong } from "../../io/ios-settings-strong";
+export { default as IoIosSettings } from "../../io/ios-settings";
+export { default as IoIosShuffleStrong } from "../../io/ios-shuffle-strong";
+export { default as IoIosShuffle } from "../../io/ios-shuffle";
+export { default as IoIosSkipbackwardOutline } from "../../io/ios-skipbackward-outline";
+export { default as IoIosSkipbackward } from "../../io/ios-skipbackward";
+export { default as IoIosSkipforwardOutline } from "../../io/ios-skipforward-outline";
+export { default as IoIosSkipforward } from "../../io/ios-skipforward";
+export { default as IoIosSnowy } from "../../io/ios-snowy";
+export { default as IoIosSpeedometerOutline } from "../../io/ios-speedometer-outline";
+export { default as IoIosSpeedometer } from "../../io/ios-speedometer";
+export { default as IoIosStarHalf } from "../../io/ios-star-half";
+export { default as IoIosStarOutline } from "../../io/ios-star-outline";
+export { default as IoIosStar } from "../../io/ios-star";
+export { default as IoIosStopwatchOutline } from "../../io/ios-stopwatch-outline";
+export { default as IoIosStopwatch } from "../../io/ios-stopwatch";
+export { default as IoIosSunnyOutline } from "../../io/ios-sunny-outline";
+export { default as IoIosSunny } from "../../io/ios-sunny";
+export { default as IoIosTelephoneOutline } from "../../io/ios-telephone-outline";
+export { default as IoIosTelephone } from "../../io/ios-telephone";
+export { default as IoIosTennisballOutline } from "../../io/ios-tennisball-outline";
+export { default as IoIosTennisball } from "../../io/ios-tennisball";
+export { default as IoIosThunderstormOutline } from "../../io/ios-thunderstorm-outline";
+export { default as IoIosThunderstorm } from "../../io/ios-thunderstorm";
+export { default as IoIosTimeOutline } from "../../io/ios-time-outline";
+export { default as IoIosTime } from "../../io/ios-time";
+export { default as IoIosTimerOutline } from "../../io/ios-timer-outline";
+export { default as IoIosTimer } from "../../io/ios-timer";
+export { default as IoIosToggleOutline } from "../../io/ios-toggle-outline";
+export { default as IoIosToggle } from "../../io/ios-toggle";
+export { default as IoIosTrashOutline } from "../../io/ios-trash-outline";
+export { default as IoIosTrash } from "../../io/ios-trash";
+export { default as IoIosUndoOutline } from "../../io/ios-undo-outline";
+export { default as IoIosUndo } from "../../io/ios-undo";
+export { default as IoIosUnlockedOutline } from "../../io/ios-unlocked-outline";
+export { default as IoIosUnlocked } from "../../io/ios-unlocked";
+export { default as IoIosUploadOutline } from "../../io/ios-upload-outline";
+export { default as IoIosUpload } from "../../io/ios-upload";
+export { default as IoIosVideocamOutline } from "../../io/ios-videocam-outline";
+export { default as IoIosVideocam } from "../../io/ios-videocam";
+export { default as IoIosVolumeHigh } from "../../io/ios-volume-high";
+export { default as IoIosVolumeLow } from "../../io/ios-volume-low";
+export { default as IoIosWineglassOutline } from "../../io/ios-wineglass-outline";
+export { default as IoIosWineglass } from "../../io/ios-wineglass";
+export { default as IoIosWorldOutline } from "../../io/ios-world-outline";
+export { default as IoIosWorld } from "../../io/ios-world";
+export { default as IoIpad } from "../../io/ipad";
+export { default as IoIphone } from "../../io/iphone";
+export { default as IoIpod } from "../../io/ipod";
+export { default as IoJet } from "../../io/jet";
+export { default as IoKey } from "../../io/key";
+export { default as IoKnife } from "../../io/knife";
+export { default as IoLaptop } from "../../io/laptop";
+export { default as IoLeaf } from "../../io/leaf";
+export { default as IoLevels } from "../../io/levels";
+export { default as IoLightbulb } from "../../io/lightbulb";
+export { default as IoLink } from "../../io/link";
+export { default as IoLoadA } from "../../io/load-a";
+export { default as IoLoadB } from "../../io/load-b";
+export { default as IoLoadC } from "../../io/load-c";
+export { default as IoLoadD } from "../../io/load-d";
+export { default as IoLocation } from "../../io/location";
+export { default as IoLockCombination } from "../../io/lock-combination";
+export { default as IoLocked } from "../../io/locked";
+export { default as IoLogIn } from "../../io/log-in";
+export { default as IoLogOut } from "../../io/log-out";
+export { default as IoLoop } from "../../io/loop";
+export { default as IoMagnet } from "../../io/magnet";
+export { default as IoMale } from "../../io/male";
+export { default as IoMan } from "../../io/man";
+export { default as IoMap } from "../../io/map";
+export { default as IoMedkit } from "../../io/medkit";
+export { default as IoMerge } from "../../io/merge";
+export { default as IoMicA } from "../../io/mic-a";
+export { default as IoMicB } from "../../io/mic-b";
+export { default as IoMicC } from "../../io/mic-c";
+export { default as IoMinusCircled } from "../../io/minus-circled";
+export { default as IoMinusRound } from "../../io/minus-round";
+export { default as IoMinus } from "../../io/minus";
+export { default as IoModelS } from "../../io/model-s";
+export { default as IoMonitor } from "../../io/monitor";
+export { default as IoMore } from "../../io/more";
+export { default as IoMouse } from "../../io/mouse";
+export { default as IoMusicNote } from "../../io/music-note";
+export { default as IoNaviconRound } from "../../io/navicon-round";
+export { default as IoNavicon } from "../../io/navicon";
+export { default as IoNavigate } from "../../io/navigate";
+export { default as IoNetwork } from "../../io/network";
+export { default as IoNoSmoking } from "../../io/no-smoking";
+export { default as IoNuclear } from "../../io/nuclear";
+export { default as IoOutlet } from "../../io/outlet";
+export { default as IoPaintbrush } from "../../io/paintbrush";
+export { default as IoPaintbucket } from "../../io/paintbucket";
+export { default as IoPaperAirplane } from "../../io/paper-airplane";
+export { default as IoPaperclip } from "../../io/paperclip";
+export { default as IoPause } from "../../io/pause";
+export { default as IoPersonAdd } from "../../io/person-add";
+export { default as IoPersonStalker } from "../../io/person-stalker";
+export { default as IoPerson } from "../../io/person";
+export { default as IoPieGraph } from "../../io/pie-graph";
+export { default as IoPin } from "../../io/pin";
+export { default as IoPinpoint } from "../../io/pinpoint";
+export { default as IoPizza } from "../../io/pizza";
+export { default as IoPlane } from "../../io/plane";
+export { default as IoPlanet } from "../../io/planet";
+export { default as IoPlay } from "../../io/play";
+export { default as IoPlaystation } from "../../io/playstation";
+export { default as IoPlusCircled } from "../../io/plus-circled";
+export { default as IoPlusRound } from "../../io/plus-round";
+export { default as IoPlus } from "../../io/plus";
+export { default as IoPodium } from "../../io/podium";
+export { default as IoPound } from "../../io/pound";
+export { default as IoPower } from "../../io/power";
+export { default as IoPricetag } from "../../io/pricetag";
+export { default as IoPricetags } from "../../io/pricetags";
+export { default as IoPrinter } from "../../io/printer";
+export { default as IoPullRequest } from "../../io/pull-request";
+export { default as IoQrScanner } from "../../io/qr-scanner";
+export { default as IoQuote } from "../../io/quote";
+export { default as IoRadioWaves } from "../../io/radio-waves";
+export { default as IoRecord } from "../../io/record";
+export { default as IoRefresh } from "../../io/refresh";
+export { default as IoReplyAll } from "../../io/reply-all";
+export { default as IoReply } from "../../io/reply";
+export { default as IoRibbonA } from "../../io/ribbon-a";
+export { default as IoRibbonB } from "../../io/ribbon-b";
+export { default as IoSadOutline } from "../../io/sad-outline";
+export { default as IoSad } from "../../io/sad";
+export { default as IoScissors } from "../../io/scissors";
+export { default as IoSearch } from "../../io/search";
+export { default as IoSettings } from "../../io/settings";
+export { default as IoShare } from "../../io/share";
+export { default as IoShuffle } from "../../io/shuffle";
+export { default as IoSkipBackward } from "../../io/skip-backward";
+export { default as IoSkipForward } from "../../io/skip-forward";
+export { default as IoSocialAndroidOutline } from "../../io/social-android-outline";
+export { default as IoSocialAndroid } from "../../io/social-android";
+export { default as IoSocialAngularOutline } from "../../io/social-angular-outline";
+export { default as IoSocialAngular } from "../../io/social-angular";
+export { default as IoSocialAppleOutline } from "../../io/social-apple-outline";
+export { default as IoSocialApple } from "../../io/social-apple";
+export { default as IoSocialBitcoinOutline } from "../../io/social-bitcoin-outline";
+export { default as IoSocialBitcoin } from "../../io/social-bitcoin";
+export { default as IoSocialBufferOutline } from "../../io/social-buffer-outline";
+export { default as IoSocialBuffer } from "../../io/social-buffer";
+export { default as IoSocialChromeOutline } from "../../io/social-chrome-outline";
+export { default as IoSocialChrome } from "../../io/social-chrome";
+export { default as IoSocialCodepenOutline } from "../../io/social-codepen-outline";
+export { default as IoSocialCodepen } from "../../io/social-codepen";
+export { default as IoSocialCss3Outline } from "../../io/social-css3-outline";
+export { default as IoSocialCss3 } from "../../io/social-css3";
+export { default as IoSocialDesignernewsOutline } from "../../io/social-designernews-outline";
+export { default as IoSocialDesignernews } from "../../io/social-designernews";
+export { default as IoSocialDribbbleOutline } from "../../io/social-dribbble-outline";
+export { default as IoSocialDribbble } from "../../io/social-dribbble";
+export { default as IoSocialDropboxOutline } from "../../io/social-dropbox-outline";
+export { default as IoSocialDropbox } from "../../io/social-dropbox";
+export { default as IoSocialEuroOutline } from "../../io/social-euro-outline";
+export { default as IoSocialEuro } from "../../io/social-euro";
+export { default as IoSocialFacebookOutline } from "../../io/social-facebook-outline";
+export { default as IoSocialFacebook } from "../../io/social-facebook";
+export { default as IoSocialFoursquareOutline } from "../../io/social-foursquare-outline";
+export { default as IoSocialFoursquare } from "../../io/social-foursquare";
+export { default as IoSocialFreebsdDevil } from "../../io/social-freebsd-devil";
+export { default as IoSocialGithubOutline } from "../../io/social-github-outline";
+export { default as IoSocialGithub } from "../../io/social-github";
+export { default as IoSocialGoogleOutline } from "../../io/social-google-outline";
+export { default as IoSocialGoogle } from "../../io/social-google";
+export { default as IoSocialGoogleplusOutline } from "../../io/social-googleplus-outline";
+export { default as IoSocialGoogleplus } from "../../io/social-googleplus";
+export { default as IoSocialHackernewsOutline } from "../../io/social-hackernews-outline";
+export { default as IoSocialHackernews } from "../../io/social-hackernews";
+export { default as IoSocialHtml5Outline } from "../../io/social-html5-outline";
+export { default as IoSocialHtml5 } from "../../io/social-html5";
+export { default as IoSocialInstagramOutline } from "../../io/social-instagram-outline";
+export { default as IoSocialInstagram } from "../../io/social-instagram";
+export { default as IoSocialJavascriptOutline } from "../../io/social-javascript-outline";
+export { default as IoSocialJavascript } from "../../io/social-javascript";
+export { default as IoSocialLinkedinOutline } from "../../io/social-linkedin-outline";
+export { default as IoSocialLinkedin } from "../../io/social-linkedin";
+export { default as IoSocialMarkdown } from "../../io/social-markdown";
+export { default as IoSocialNodejs } from "../../io/social-nodejs";
+export { default as IoSocialOctocat } from "../../io/social-octocat";
+export { default as IoSocialPinterestOutline } from "../../io/social-pinterest-outline";
+export { default as IoSocialPinterest } from "../../io/social-pinterest";
+export { default as IoSocialPython } from "../../io/social-python";
+export { default as IoSocialRedditOutline } from "../../io/social-reddit-outline";
+export { default as IoSocialReddit } from "../../io/social-reddit";
+export { default as IoSocialRssOutline } from "../../io/social-rss-outline";
+export { default as IoSocialRss } from "../../io/social-rss";
+export { default as IoSocialSass } from "../../io/social-sass";
+export { default as IoSocialSkypeOutline } from "../../io/social-skype-outline";
+export { default as IoSocialSkype } from "../../io/social-skype";
+export { default as IoSocialSnapchatOutline } from "../../io/social-snapchat-outline";
+export { default as IoSocialSnapchat } from "../../io/social-snapchat";
+export { default as IoSocialTumblrOutline } from "../../io/social-tumblr-outline";
+export { default as IoSocialTumblr } from "../../io/social-tumblr";
+export { default as IoSocialTux } from "../../io/social-tux";
+export { default as IoSocialTwitchOutline } from "../../io/social-twitch-outline";
+export { default as IoSocialTwitch } from "../../io/social-twitch";
+export { default as IoSocialTwitterOutline } from "../../io/social-twitter-outline";
+export { default as IoSocialTwitter } from "../../io/social-twitter";
+export { default as IoSocialUsdOutline } from "../../io/social-usd-outline";
+export { default as IoSocialUsd } from "../../io/social-usd";
+export { default as IoSocialVimeoOutline } from "../../io/social-vimeo-outline";
+export { default as IoSocialVimeo } from "../../io/social-vimeo";
+export { default as IoSocialWhatsappOutline } from "../../io/social-whatsapp-outline";
+export { default as IoSocialWhatsapp } from "../../io/social-whatsapp";
+export { default as IoSocialWindowsOutline } from "../../io/social-windows-outline";
+export { default as IoSocialWindows } from "../../io/social-windows";
+export { default as IoSocialWordpressOutline } from "../../io/social-wordpress-outline";
+export { default as IoSocialWordpress } from "../../io/social-wordpress";
+export { default as IoSocialYahooOutline } from "../../io/social-yahoo-outline";
+export { default as IoSocialYahoo } from "../../io/social-yahoo";
+export { default as IoSocialYenOutline } from "../../io/social-yen-outline";
+export { default as IoSocialYen } from "../../io/social-yen";
+export { default as IoSocialYoutubeOutline } from "../../io/social-youtube-outline";
+export { default as IoSocialYoutube } from "../../io/social-youtube";
+export { default as IoSoupCanOutline } from "../../io/soup-can-outline";
+export { default as IoSoupCan } from "../../io/soup-can";
+export { default as IoSpeakerphone } from "../../io/speakerphone";
+export { default as IoSpeedometer } from "../../io/speedometer";
+export { default as IoSpoon } from "../../io/spoon";
+export { default as IoStar } from "../../io/star";
+export { default as IoStatsBars } from "../../io/stats-bars";
+export { default as IoSteam } from "../../io/steam";
+export { default as IoStop } from "../../io/stop";
+export { default as IoThermometer } from "../../io/thermometer";
+export { default as IoThumbsdown } from "../../io/thumbsdown";
+export { default as IoThumbsup } from "../../io/thumbsup";
+export { default as IoToggleFilled } from "../../io/toggle-filled";
+export { default as IoToggle } from "../../io/toggle";
+export { default as IoTransgender } from "../../io/transgender";
+export { default as IoTrashA } from "../../io/trash-a";
+export { default as IoTrashB } from "../../io/trash-b";
+export { default as IoTrophy } from "../../io/trophy";
+export { default as IoTshirtOutline } from "../../io/tshirt-outline";
+export { default as IoTshirt } from "../../io/tshirt";
+export { default as IoUmbrella } from "../../io/umbrella";
+export { default as IoUniversity } from "../../io/university";
+export { default as IoUnlocked } from "../../io/unlocked";
+export { default as IoUpload } from "../../io/upload";
+export { default as IoUsb } from "../../io/usb";
+export { default as IoVideocamera } from "../../io/videocamera";
+export { default as IoVolumeHigh } from "../../io/volume-high";
+export { default as IoVolumeLow } from "../../io/volume-low";
+export { default as IoVolumeMedium } from "../../io/volume-medium";
+export { default as IoVolumeMute } from "../../io/volume-mute";
+export { default as IoWand } from "../../io/wand";
+export { default as IoWaterdrop } from "../../io/waterdrop";
+export { default as IoWifi } from "../../io/wifi";
+export { default as IoWineglass } from "../../io/wineglass";
+export { default as IoWoman } from "../../io/woman";
+export { default as IoWrench } from "../../io/wrench";
+export { default as IoXbox } from "../../io/xbox";
diff --git a/types/react-icons/lib/io/informatcircled.d.ts b/types/react-icons/lib/io/informatcircled.d.ts
index 2ef20abca7..829ad4b409 100644
--- a/types/react-icons/lib/io/informatcircled.d.ts
+++ b/types/react-icons/lib/io/informatcircled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoInformatcircled extends React.Component<IconBaseProps> { }
+declare class IoInformatcircled extends React.Component<IconBaseProps> { }
+export = IoInformatcircled;
diff --git a/types/react-icons/lib/io/information.d.ts b/types/react-icons/lib/io/information.d.ts
index 02652a360f..eceb48a8c3 100644
--- a/types/react-icons/lib/io/information.d.ts
+++ b/types/react-icons/lib/io/information.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoInformation extends React.Component<IconBaseProps> { }
+declare class IoInformation extends React.Component<IconBaseProps> { }
+export = IoInformation;
diff --git a/types/react-icons/lib/io/ionic.d.ts b/types/react-icons/lib/io/ionic.d.ts
index 9e19c402cf..dcf5655c61 100644
--- a/types/react-icons/lib/io/ionic.d.ts
+++ b/types/react-icons/lib/io/ionic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIonic extends React.Component<IconBaseProps> { }
+declare class IoIonic extends React.Component<IconBaseProps> { }
+export = IoIonic;
diff --git a/types/react-icons/lib/io/ios-alarm-outline.d.ts b/types/react-icons/lib/io/ios-alarm-outline.d.ts
index c211ebccee..b6b321d531 100644
--- a/types/react-icons/lib/io/ios-alarm-outline.d.ts
+++ b/types/react-icons/lib/io/ios-alarm-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlarmOutline extends React.Component<IconBaseProps> { }
+declare class IoIosAlarmOutline extends React.Component<IconBaseProps> { }
+export = IoIosAlarmOutline;
diff --git a/types/react-icons/lib/io/ios-alarm.d.ts b/types/react-icons/lib/io/ios-alarm.d.ts
index c61987318d..a343e709e3 100644
--- a/types/react-icons/lib/io/ios-alarm.d.ts
+++ b/types/react-icons/lib/io/ios-alarm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlarm extends React.Component<IconBaseProps> { }
+declare class IoIosAlarm extends React.Component<IconBaseProps> { }
+export = IoIosAlarm;
diff --git a/types/react-icons/lib/io/ios-albums-outline.d.ts b/types/react-icons/lib/io/ios-albums-outline.d.ts
index 48e06ad4b8..dba1c52063 100644
--- a/types/react-icons/lib/io/ios-albums-outline.d.ts
+++ b/types/react-icons/lib/io/ios-albums-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlbumsOutline extends React.Component<IconBaseProps> { }
+declare class IoIosAlbumsOutline extends React.Component<IconBaseProps> { }
+export = IoIosAlbumsOutline;
diff --git a/types/react-icons/lib/io/ios-albums.d.ts b/types/react-icons/lib/io/ios-albums.d.ts
index be7c86317a..70e77f84aa 100644
--- a/types/react-icons/lib/io/ios-albums.d.ts
+++ b/types/react-icons/lib/io/ios-albums.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlbums extends React.Component<IconBaseProps> { }
+declare class IoIosAlbums extends React.Component<IconBaseProps> { }
+export = IoIosAlbums;
diff --git a/types/react-icons/lib/io/ios-americanfootball-outline.d.ts b/types/react-icons/lib/io/ios-americanfootball-outline.d.ts
index d7041c17d3..0d3f7105e4 100644
--- a/types/react-icons/lib/io/ios-americanfootball-outline.d.ts
+++ b/types/react-icons/lib/io/ios-americanfootball-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAmericanfootballOutline extends React.Component<IconBaseProps> { }
+declare class IoIosAmericanfootballOutline extends React.Component<IconBaseProps> { }
+export = IoIosAmericanfootballOutline;
diff --git a/types/react-icons/lib/io/ios-americanfootball.d.ts b/types/react-icons/lib/io/ios-americanfootball.d.ts
index 4af77520ff..a3502d9745 100644
--- a/types/react-icons/lib/io/ios-americanfootball.d.ts
+++ b/types/react-icons/lib/io/ios-americanfootball.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAmericanfootball extends React.Component<IconBaseProps> { }
+declare class IoIosAmericanfootball extends React.Component<IconBaseProps> { }
+export = IoIosAmericanfootball;
diff --git a/types/react-icons/lib/io/ios-analytics-outline.d.ts b/types/react-icons/lib/io/ios-analytics-outline.d.ts
index 6192de6c58..52d3b2a664 100644
--- a/types/react-icons/lib/io/ios-analytics-outline.d.ts
+++ b/types/react-icons/lib/io/ios-analytics-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAnalyticsOutline extends React.Component<IconBaseProps> { }
+declare class IoIosAnalyticsOutline extends React.Component<IconBaseProps> { }
+export = IoIosAnalyticsOutline;
diff --git a/types/react-icons/lib/io/ios-analytics.d.ts b/types/react-icons/lib/io/ios-analytics.d.ts
index 9f3d9e110e..da9c6b9d91 100644
--- a/types/react-icons/lib/io/ios-analytics.d.ts
+++ b/types/react-icons/lib/io/ios-analytics.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAnalytics extends React.Component<IconBaseProps> { }
+declare class IoIosAnalytics extends React.Component<IconBaseProps> { }
+export = IoIosAnalytics;
diff --git a/types/react-icons/lib/io/ios-arrow-back.d.ts b/types/react-icons/lib/io/ios-arrow-back.d.ts
index 1466e59a6d..d673fc84ba 100644
--- a/types/react-icons/lib/io/ios-arrow-back.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-back.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowBack extends React.Component<IconBaseProps> { }
+declare class IoIosArrowBack extends React.Component<IconBaseProps> { }
+export = IoIosArrowBack;
diff --git a/types/react-icons/lib/io/ios-arrow-down.d.ts b/types/react-icons/lib/io/ios-arrow-down.d.ts
index 91773f927b..3e206b984c 100644
--- a/types/react-icons/lib/io/ios-arrow-down.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowDown extends React.Component<IconBaseProps> { }
+declare class IoIosArrowDown extends React.Component<IconBaseProps> { }
+export = IoIosArrowDown;
diff --git a/types/react-icons/lib/io/ios-arrow-forward.d.ts b/types/react-icons/lib/io/ios-arrow-forward.d.ts
index a2bf7fe213..d67662f144 100644
--- a/types/react-icons/lib/io/ios-arrow-forward.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowForward extends React.Component<IconBaseProps> { }
+declare class IoIosArrowForward extends React.Component<IconBaseProps> { }
+export = IoIosArrowForward;
diff --git a/types/react-icons/lib/io/ios-arrow-left.d.ts b/types/react-icons/lib/io/ios-arrow-left.d.ts
index 0588edeed0..93f66481cf 100644
--- a/types/react-icons/lib/io/ios-arrow-left.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowLeft extends React.Component<IconBaseProps> { }
+declare class IoIosArrowLeft extends React.Component<IconBaseProps> { }
+export = IoIosArrowLeft;
diff --git a/types/react-icons/lib/io/ios-arrow-right.d.ts b/types/react-icons/lib/io/ios-arrow-right.d.ts
index 5642202b5c..cea88a4483 100644
--- a/types/react-icons/lib/io/ios-arrow-right.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowRight extends React.Component<IconBaseProps> { }
+declare class IoIosArrowRight extends React.Component<IconBaseProps> { }
+export = IoIosArrowRight;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-down.d.ts b/types/react-icons/lib/io/ios-arrow-thin-down.d.ts
index 183b547848..7d38c834a7 100644
--- a/types/react-icons/lib/io/ios-arrow-thin-down.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-thin-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinDown extends React.Component<IconBaseProps> { }
+declare class IoIosArrowThinDown extends React.Component<IconBaseProps> { }
+export = IoIosArrowThinDown;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-left.d.ts b/types/react-icons/lib/io/ios-arrow-thin-left.d.ts
index 4fea91fe45..6ca695d67f 100644
--- a/types/react-icons/lib/io/ios-arrow-thin-left.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-thin-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinLeft extends React.Component<IconBaseProps> { }
+declare class IoIosArrowThinLeft extends React.Component<IconBaseProps> { }
+export = IoIosArrowThinLeft;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-right.d.ts b/types/react-icons/lib/io/ios-arrow-thin-right.d.ts
index 5e70abd099..5fa30f116d 100644
--- a/types/react-icons/lib/io/ios-arrow-thin-right.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-thin-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinRight extends React.Component<IconBaseProps> { }
+declare class IoIosArrowThinRight extends React.Component<IconBaseProps> { }
+export = IoIosArrowThinRight;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-up.d.ts b/types/react-icons/lib/io/ios-arrow-thin-up.d.ts
index 412e0b53a2..6e3168d95d 100644
--- a/types/react-icons/lib/io/ios-arrow-thin-up.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-thin-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinUp extends React.Component<IconBaseProps> { }
+declare class IoIosArrowThinUp extends React.Component<IconBaseProps> { }
+export = IoIosArrowThinUp;
diff --git a/types/react-icons/lib/io/ios-arrow-up.d.ts b/types/react-icons/lib/io/ios-arrow-up.d.ts
index 2adf431795..e140f1c883 100644
--- a/types/react-icons/lib/io/ios-arrow-up.d.ts
+++ b/types/react-icons/lib/io/ios-arrow-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowUp extends React.Component<IconBaseProps> { }
+declare class IoIosArrowUp extends React.Component<IconBaseProps> { }
+export = IoIosArrowUp;
diff --git a/types/react-icons/lib/io/ios-at-outline.d.ts b/types/react-icons/lib/io/ios-at-outline.d.ts
index 7d20c06912..568676c927 100644
--- a/types/react-icons/lib/io/ios-at-outline.d.ts
+++ b/types/react-icons/lib/io/ios-at-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAtOutline extends React.Component<IconBaseProps> { }
+declare class IoIosAtOutline extends React.Component<IconBaseProps> { }
+export = IoIosAtOutline;
diff --git a/types/react-icons/lib/io/ios-at.d.ts b/types/react-icons/lib/io/ios-at.d.ts
index 5789d0b976..bb359ef077 100644
--- a/types/react-icons/lib/io/ios-at.d.ts
+++ b/types/react-icons/lib/io/ios-at.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAt extends React.Component<IconBaseProps> { }
+declare class IoIosAt extends React.Component<IconBaseProps> { }
+export = IoIosAt;
diff --git a/types/react-icons/lib/io/ios-barcode-outline.d.ts b/types/react-icons/lib/io/ios-barcode-outline.d.ts
index a82a5b88c8..0e733f7426 100644
--- a/types/react-icons/lib/io/ios-barcode-outline.d.ts
+++ b/types/react-icons/lib/io/ios-barcode-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBarcodeOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBarcodeOutline extends React.Component<IconBaseProps> { }
+export = IoIosBarcodeOutline;
diff --git a/types/react-icons/lib/io/ios-barcode.d.ts b/types/react-icons/lib/io/ios-barcode.d.ts
index 20a769e78e..170a0c1458 100644
--- a/types/react-icons/lib/io/ios-barcode.d.ts
+++ b/types/react-icons/lib/io/ios-barcode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBarcode extends React.Component<IconBaseProps> { }
+declare class IoIosBarcode extends React.Component<IconBaseProps> { }
+export = IoIosBarcode;
diff --git a/types/react-icons/lib/io/ios-baseball-outline.d.ts b/types/react-icons/lib/io/ios-baseball-outline.d.ts
index 99856309a9..8893ad7e66 100644
--- a/types/react-icons/lib/io/ios-baseball-outline.d.ts
+++ b/types/react-icons/lib/io/ios-baseball-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBaseballOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBaseballOutline extends React.Component<IconBaseProps> { }
+export = IoIosBaseballOutline;
diff --git a/types/react-icons/lib/io/ios-baseball.d.ts b/types/react-icons/lib/io/ios-baseball.d.ts
index 1470fd138c..06626537a4 100644
--- a/types/react-icons/lib/io/ios-baseball.d.ts
+++ b/types/react-icons/lib/io/ios-baseball.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBaseball extends React.Component<IconBaseProps> { }
+declare class IoIosBaseball extends React.Component<IconBaseProps> { }
+export = IoIosBaseball;
diff --git a/types/react-icons/lib/io/ios-basketball-outline.d.ts b/types/react-icons/lib/io/ios-basketball-outline.d.ts
index 5b2d8845df..e2387f5695 100644
--- a/types/react-icons/lib/io/ios-basketball-outline.d.ts
+++ b/types/react-icons/lib/io/ios-basketball-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBasketballOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBasketballOutline extends React.Component<IconBaseProps> { }
+export = IoIosBasketballOutline;
diff --git a/types/react-icons/lib/io/ios-basketball.d.ts b/types/react-icons/lib/io/ios-basketball.d.ts
index 294798f648..17c4d6fd5f 100644
--- a/types/react-icons/lib/io/ios-basketball.d.ts
+++ b/types/react-icons/lib/io/ios-basketball.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBasketball extends React.Component<IconBaseProps> { }
+declare class IoIosBasketball extends React.Component<IconBaseProps> { }
+export = IoIosBasketball;
diff --git a/types/react-icons/lib/io/ios-bell-outline.d.ts b/types/react-icons/lib/io/ios-bell-outline.d.ts
index c03c49121e..e346d2754a 100644
--- a/types/react-icons/lib/io/ios-bell-outline.d.ts
+++ b/types/react-icons/lib/io/ios-bell-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBellOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBellOutline extends React.Component<IconBaseProps> { }
+export = IoIosBellOutline;
diff --git a/types/react-icons/lib/io/ios-bell.d.ts b/types/react-icons/lib/io/ios-bell.d.ts
index d1b90b21f9..a899c4f941 100644
--- a/types/react-icons/lib/io/ios-bell.d.ts
+++ b/types/react-icons/lib/io/ios-bell.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBell extends React.Component<IconBaseProps> { }
+declare class IoIosBell extends React.Component<IconBaseProps> { }
+export = IoIosBell;
diff --git a/types/react-icons/lib/io/ios-body-outline.d.ts b/types/react-icons/lib/io/ios-body-outline.d.ts
index 235ed9bca0..5850273998 100644
--- a/types/react-icons/lib/io/ios-body-outline.d.ts
+++ b/types/react-icons/lib/io/ios-body-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBodyOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBodyOutline extends React.Component<IconBaseProps> { }
+export = IoIosBodyOutline;
diff --git a/types/react-icons/lib/io/ios-body.d.ts b/types/react-icons/lib/io/ios-body.d.ts
index 89712f6b0e..fc8b1ecc9f 100644
--- a/types/react-icons/lib/io/ios-body.d.ts
+++ b/types/react-icons/lib/io/ios-body.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBody extends React.Component<IconBaseProps> { }
+declare class IoIosBody extends React.Component<IconBaseProps> { }
+export = IoIosBody;
diff --git a/types/react-icons/lib/io/ios-bolt-outline.d.ts b/types/react-icons/lib/io/ios-bolt-outline.d.ts
index acc1db40e6..86ec284228 100644
--- a/types/react-icons/lib/io/ios-bolt-outline.d.ts
+++ b/types/react-icons/lib/io/ios-bolt-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBoltOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBoltOutline extends React.Component<IconBaseProps> { }
+export = IoIosBoltOutline;
diff --git a/types/react-icons/lib/io/ios-bolt.d.ts b/types/react-icons/lib/io/ios-bolt.d.ts
index a953af8901..74e19bba18 100644
--- a/types/react-icons/lib/io/ios-bolt.d.ts
+++ b/types/react-icons/lib/io/ios-bolt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBolt extends React.Component<IconBaseProps> { }
+declare class IoIosBolt extends React.Component<IconBaseProps> { }
+export = IoIosBolt;
diff --git a/types/react-icons/lib/io/ios-book-outline.d.ts b/types/react-icons/lib/io/ios-book-outline.d.ts
index d6587de870..87ed84a220 100644
--- a/types/react-icons/lib/io/ios-book-outline.d.ts
+++ b/types/react-icons/lib/io/ios-book-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBookOutline extends React.Component<IconBaseProps> { }
+export = IoIosBookOutline;
diff --git a/types/react-icons/lib/io/ios-book.d.ts b/types/react-icons/lib/io/ios-book.d.ts
index 9bcddd9e60..401fadbe2e 100644
--- a/types/react-icons/lib/io/ios-book.d.ts
+++ b/types/react-icons/lib/io/ios-book.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBook extends React.Component<IconBaseProps> { }
+declare class IoIosBook extends React.Component<IconBaseProps> { }
+export = IoIosBook;
diff --git a/types/react-icons/lib/io/ios-bookmarks-outline.d.ts b/types/react-icons/lib/io/ios-bookmarks-outline.d.ts
index c999d5cdd5..1a3428a1d5 100644
--- a/types/react-icons/lib/io/ios-bookmarks-outline.d.ts
+++ b/types/react-icons/lib/io/ios-bookmarks-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookmarksOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBookmarksOutline extends React.Component<IconBaseProps> { }
+export = IoIosBookmarksOutline;
diff --git a/types/react-icons/lib/io/ios-bookmarks.d.ts b/types/react-icons/lib/io/ios-bookmarks.d.ts
index 42a926adda..8910a86f2b 100644
--- a/types/react-icons/lib/io/ios-bookmarks.d.ts
+++ b/types/react-icons/lib/io/ios-bookmarks.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookmarks extends React.Component<IconBaseProps> { }
+declare class IoIosBookmarks extends React.Component<IconBaseProps> { }
+export = IoIosBookmarks;
diff --git a/types/react-icons/lib/io/ios-box-outline.d.ts b/types/react-icons/lib/io/ios-box-outline.d.ts
index 02b34cefc1..d7b4985041 100644
--- a/types/react-icons/lib/io/ios-box-outline.d.ts
+++ b/types/react-icons/lib/io/ios-box-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBoxOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBoxOutline extends React.Component<IconBaseProps> { }
+export = IoIosBoxOutline;
diff --git a/types/react-icons/lib/io/ios-box.d.ts b/types/react-icons/lib/io/ios-box.d.ts
index 67ab43d367..7dd3759007 100644
--- a/types/react-icons/lib/io/ios-box.d.ts
+++ b/types/react-icons/lib/io/ios-box.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBox extends React.Component<IconBaseProps> { }
+declare class IoIosBox extends React.Component<IconBaseProps> { }
+export = IoIosBox;
diff --git a/types/react-icons/lib/io/ios-briefcase-outline.d.ts b/types/react-icons/lib/io/ios-briefcase-outline.d.ts
index bcba814767..e778987aa3 100644
--- a/types/react-icons/lib/io/ios-briefcase-outline.d.ts
+++ b/types/react-icons/lib/io/ios-briefcase-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBriefcaseOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBriefcaseOutline extends React.Component<IconBaseProps> { }
+export = IoIosBriefcaseOutline;
diff --git a/types/react-icons/lib/io/ios-briefcase.d.ts b/types/react-icons/lib/io/ios-briefcase.d.ts
index 03409c1dc4..ec269077a8 100644
--- a/types/react-icons/lib/io/ios-briefcase.d.ts
+++ b/types/react-icons/lib/io/ios-briefcase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBriefcase extends React.Component<IconBaseProps> { }
+declare class IoIosBriefcase extends React.Component<IconBaseProps> { }
+export = IoIosBriefcase;
diff --git a/types/react-icons/lib/io/ios-browsers-outline.d.ts b/types/react-icons/lib/io/ios-browsers-outline.d.ts
index a85fd4dfc9..5f011531e3 100644
--- a/types/react-icons/lib/io/ios-browsers-outline.d.ts
+++ b/types/react-icons/lib/io/ios-browsers-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBrowsersOutline extends React.Component<IconBaseProps> { }
+declare class IoIosBrowsersOutline extends React.Component<IconBaseProps> { }
+export = IoIosBrowsersOutline;
diff --git a/types/react-icons/lib/io/ios-browsers.d.ts b/types/react-icons/lib/io/ios-browsers.d.ts
index 155d546472..dbadb14b0a 100644
--- a/types/react-icons/lib/io/ios-browsers.d.ts
+++ b/types/react-icons/lib/io/ios-browsers.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBrowsers extends React.Component<IconBaseProps> { }
+declare class IoIosBrowsers extends React.Component<IconBaseProps> { }
+export = IoIosBrowsers;
diff --git a/types/react-icons/lib/io/ios-calculator-outline.d.ts b/types/react-icons/lib/io/ios-calculator-outline.d.ts
index 19453725e5..b3a0eb7f5c 100644
--- a/types/react-icons/lib/io/ios-calculator-outline.d.ts
+++ b/types/react-icons/lib/io/ios-calculator-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalculatorOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCalculatorOutline extends React.Component<IconBaseProps> { }
+export = IoIosCalculatorOutline;
diff --git a/types/react-icons/lib/io/ios-calculator.d.ts b/types/react-icons/lib/io/ios-calculator.d.ts
index 736a4f431f..5237308ae6 100644
--- a/types/react-icons/lib/io/ios-calculator.d.ts
+++ b/types/react-icons/lib/io/ios-calculator.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalculator extends React.Component<IconBaseProps> { }
+declare class IoIosCalculator extends React.Component<IconBaseProps> { }
+export = IoIosCalculator;
diff --git a/types/react-icons/lib/io/ios-calendar-outline.d.ts b/types/react-icons/lib/io/ios-calendar-outline.d.ts
index 131eba8430..2f38e2977b 100644
--- a/types/react-icons/lib/io/ios-calendar-outline.d.ts
+++ b/types/react-icons/lib/io/ios-calendar-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalendarOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCalendarOutline extends React.Component<IconBaseProps> { }
+export = IoIosCalendarOutline;
diff --git a/types/react-icons/lib/io/ios-calendar.d.ts b/types/react-icons/lib/io/ios-calendar.d.ts
index 3275cc770c..fdfc45ecaa 100644
--- a/types/react-icons/lib/io/ios-calendar.d.ts
+++ b/types/react-icons/lib/io/ios-calendar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalendar extends React.Component<IconBaseProps> { }
+declare class IoIosCalendar extends React.Component<IconBaseProps> { }
+export = IoIosCalendar;
diff --git a/types/react-icons/lib/io/ios-camera-outline.d.ts b/types/react-icons/lib/io/ios-camera-outline.d.ts
index 194cacb253..6cafe009b2 100644
--- a/types/react-icons/lib/io/ios-camera-outline.d.ts
+++ b/types/react-icons/lib/io/ios-camera-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCameraOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCameraOutline extends React.Component<IconBaseProps> { }
+export = IoIosCameraOutline;
diff --git a/types/react-icons/lib/io/ios-camera.d.ts b/types/react-icons/lib/io/ios-camera.d.ts
index 346d035f8c..e909b8e2b5 100644
--- a/types/react-icons/lib/io/ios-camera.d.ts
+++ b/types/react-icons/lib/io/ios-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCamera extends React.Component<IconBaseProps> { }
+declare class IoIosCamera extends React.Component<IconBaseProps> { }
+export = IoIosCamera;
diff --git a/types/react-icons/lib/io/ios-cart-outline.d.ts b/types/react-icons/lib/io/ios-cart-outline.d.ts
index d7f76296dd..affa96342b 100644
--- a/types/react-icons/lib/io/ios-cart-outline.d.ts
+++ b/types/react-icons/lib/io/ios-cart-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCartOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCartOutline extends React.Component<IconBaseProps> { }
+export = IoIosCartOutline;
diff --git a/types/react-icons/lib/io/ios-cart.d.ts b/types/react-icons/lib/io/ios-cart.d.ts
index 918b941efc..2336583666 100644
--- a/types/react-icons/lib/io/ios-cart.d.ts
+++ b/types/react-icons/lib/io/ios-cart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCart extends React.Component<IconBaseProps> { }
+declare class IoIosCart extends React.Component<IconBaseProps> { }
+export = IoIosCart;
diff --git a/types/react-icons/lib/io/ios-chatboxes-outline.d.ts b/types/react-icons/lib/io/ios-chatboxes-outline.d.ts
index 1db97e7086..3cb365f247 100644
--- a/types/react-icons/lib/io/ios-chatboxes-outline.d.ts
+++ b/types/react-icons/lib/io/ios-chatboxes-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatboxesOutline extends React.Component<IconBaseProps> { }
+declare class IoIosChatboxesOutline extends React.Component<IconBaseProps> { }
+export = IoIosChatboxesOutline;
diff --git a/types/react-icons/lib/io/ios-chatboxes.d.ts b/types/react-icons/lib/io/ios-chatboxes.d.ts
index a32fdd72c4..3fb39f6ee1 100644
--- a/types/react-icons/lib/io/ios-chatboxes.d.ts
+++ b/types/react-icons/lib/io/ios-chatboxes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatboxes extends React.Component<IconBaseProps> { }
+declare class IoIosChatboxes extends React.Component<IconBaseProps> { }
+export = IoIosChatboxes;
diff --git a/types/react-icons/lib/io/ios-chatbubble-outline.d.ts b/types/react-icons/lib/io/ios-chatbubble-outline.d.ts
index ba2b57a053..3b45250dda 100644
--- a/types/react-icons/lib/io/ios-chatbubble-outline.d.ts
+++ b/types/react-icons/lib/io/ios-chatbubble-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatbubbleOutline extends React.Component<IconBaseProps> { }
+declare class IoIosChatbubbleOutline extends React.Component<IconBaseProps> { }
+export = IoIosChatbubbleOutline;
diff --git a/types/react-icons/lib/io/ios-chatbubble.d.ts b/types/react-icons/lib/io/ios-chatbubble.d.ts
index bb9d024821..62bad0c4aa 100644
--- a/types/react-icons/lib/io/ios-chatbubble.d.ts
+++ b/types/react-icons/lib/io/ios-chatbubble.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatbubble extends React.Component<IconBaseProps> { }
+declare class IoIosChatbubble extends React.Component<IconBaseProps> { }
+export = IoIosChatbubble;
diff --git a/types/react-icons/lib/io/ios-checkmark-empty.d.ts b/types/react-icons/lib/io/ios-checkmark-empty.d.ts
index 328adb1f00..a474963f5d 100644
--- a/types/react-icons/lib/io/ios-checkmark-empty.d.ts
+++ b/types/react-icons/lib/io/ios-checkmark-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmarkEmpty extends React.Component<IconBaseProps> { }
+declare class IoIosCheckmarkEmpty extends React.Component<IconBaseProps> { }
+export = IoIosCheckmarkEmpty;
diff --git a/types/react-icons/lib/io/ios-checkmark-outline.d.ts b/types/react-icons/lib/io/ios-checkmark-outline.d.ts
index cb19eebc9b..5f700d3698 100644
--- a/types/react-icons/lib/io/ios-checkmark-outline.d.ts
+++ b/types/react-icons/lib/io/ios-checkmark-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmarkOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCheckmarkOutline extends React.Component<IconBaseProps> { }
+export = IoIosCheckmarkOutline;
diff --git a/types/react-icons/lib/io/ios-checkmark.d.ts b/types/react-icons/lib/io/ios-checkmark.d.ts
index 3fcabda1bf..dd5fe54c42 100644
--- a/types/react-icons/lib/io/ios-checkmark.d.ts
+++ b/types/react-icons/lib/io/ios-checkmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmark extends React.Component<IconBaseProps> { }
+declare class IoIosCheckmark extends React.Component<IconBaseProps> { }
+export = IoIosCheckmark;
diff --git a/types/react-icons/lib/io/ios-circle-filled.d.ts b/types/react-icons/lib/io/ios-circle-filled.d.ts
index 4b4192096d..f9cb3574c6 100644
--- a/types/react-icons/lib/io/ios-circle-filled.d.ts
+++ b/types/react-icons/lib/io/ios-circle-filled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCircleFilled extends React.Component<IconBaseProps> { }
+declare class IoIosCircleFilled extends React.Component<IconBaseProps> { }
+export = IoIosCircleFilled;
diff --git a/types/react-icons/lib/io/ios-circle-outline.d.ts b/types/react-icons/lib/io/ios-circle-outline.d.ts
index 99a0ae723f..85165c8f58 100644
--- a/types/react-icons/lib/io/ios-circle-outline.d.ts
+++ b/types/react-icons/lib/io/ios-circle-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCircleOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCircleOutline extends React.Component<IconBaseProps> { }
+export = IoIosCircleOutline;
diff --git a/types/react-icons/lib/io/ios-clock-outline.d.ts b/types/react-icons/lib/io/ios-clock-outline.d.ts
index 2d5febf0a9..5d6466efe1 100644
--- a/types/react-icons/lib/io/ios-clock-outline.d.ts
+++ b/types/react-icons/lib/io/ios-clock-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClockOutline extends React.Component<IconBaseProps> { }
+declare class IoIosClockOutline extends React.Component<IconBaseProps> { }
+export = IoIosClockOutline;
diff --git a/types/react-icons/lib/io/ios-clock.d.ts b/types/react-icons/lib/io/ios-clock.d.ts
index aa160a4bd7..7ea19dbd7b 100644
--- a/types/react-icons/lib/io/ios-clock.d.ts
+++ b/types/react-icons/lib/io/ios-clock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClock extends React.Component<IconBaseProps> { }
+declare class IoIosClock extends React.Component<IconBaseProps> { }
+export = IoIosClock;
diff --git a/types/react-icons/lib/io/ios-close-empty.d.ts b/types/react-icons/lib/io/ios-close-empty.d.ts
index 44a0c8d17b..4e71a33216 100644
--- a/types/react-icons/lib/io/ios-close-empty.d.ts
+++ b/types/react-icons/lib/io/ios-close-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloseEmpty extends React.Component<IconBaseProps> { }
+declare class IoIosCloseEmpty extends React.Component<IconBaseProps> { }
+export = IoIosCloseEmpty;
diff --git a/types/react-icons/lib/io/ios-close-outline.d.ts b/types/react-icons/lib/io/ios-close-outline.d.ts
index 323c5b9d4a..91e3af7f9e 100644
--- a/types/react-icons/lib/io/ios-close-outline.d.ts
+++ b/types/react-icons/lib/io/ios-close-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloseOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCloseOutline extends React.Component<IconBaseProps> { }
+export = IoIosCloseOutline;
diff --git a/types/react-icons/lib/io/ios-close.d.ts b/types/react-icons/lib/io/ios-close.d.ts
index 21ed802d2a..2599814819 100644
--- a/types/react-icons/lib/io/ios-close.d.ts
+++ b/types/react-icons/lib/io/ios-close.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClose extends React.Component<IconBaseProps> { }
+declare class IoIosClose extends React.Component<IconBaseProps> { }
+export = IoIosClose;
diff --git a/types/react-icons/lib/io/ios-cloud-download-outline.d.ts b/types/react-icons/lib/io/ios-cloud-download-outline.d.ts
index 3e4358be6d..d62d37296e 100644
--- a/types/react-icons/lib/io/ios-cloud-download-outline.d.ts
+++ b/types/react-icons/lib/io/ios-cloud-download-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudDownloadOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCloudDownloadOutline extends React.Component<IconBaseProps> { }
+export = IoIosCloudDownloadOutline;
diff --git a/types/react-icons/lib/io/ios-cloud-download.d.ts b/types/react-icons/lib/io/ios-cloud-download.d.ts
index 593e0c7730..ea75ea90cf 100644
--- a/types/react-icons/lib/io/ios-cloud-download.d.ts
+++ b/types/react-icons/lib/io/ios-cloud-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudDownload extends React.Component<IconBaseProps> { }
+declare class IoIosCloudDownload extends React.Component<IconBaseProps> { }
+export = IoIosCloudDownload;
diff --git a/types/react-icons/lib/io/ios-cloud-outline.d.ts b/types/react-icons/lib/io/ios-cloud-outline.d.ts
index c70f0794c3..34ef0e3bd6 100644
--- a/types/react-icons/lib/io/ios-cloud-outline.d.ts
+++ b/types/react-icons/lib/io/ios-cloud-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCloudOutline extends React.Component<IconBaseProps> { }
+export = IoIosCloudOutline;
diff --git a/types/react-icons/lib/io/ios-cloud-upload-outline.d.ts b/types/react-icons/lib/io/ios-cloud-upload-outline.d.ts
index 2796f586ec..1a2ec79df1 100644
--- a/types/react-icons/lib/io/ios-cloud-upload-outline.d.ts
+++ b/types/react-icons/lib/io/ios-cloud-upload-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudUploadOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCloudUploadOutline extends React.Component<IconBaseProps> { }
+export = IoIosCloudUploadOutline;
diff --git a/types/react-icons/lib/io/ios-cloud-upload.d.ts b/types/react-icons/lib/io/ios-cloud-upload.d.ts
index b34cc692a2..75bbd1d136 100644
--- a/types/react-icons/lib/io/ios-cloud-upload.d.ts
+++ b/types/react-icons/lib/io/ios-cloud-upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudUpload extends React.Component<IconBaseProps> { }
+declare class IoIosCloudUpload extends React.Component<IconBaseProps> { }
+export = IoIosCloudUpload;
diff --git a/types/react-icons/lib/io/ios-cloud.d.ts b/types/react-icons/lib/io/ios-cloud.d.ts
index a802116f9f..1327ad5865 100644
--- a/types/react-icons/lib/io/ios-cloud.d.ts
+++ b/types/react-icons/lib/io/ios-cloud.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloud extends React.Component<IconBaseProps> { }
+declare class IoIosCloud extends React.Component<IconBaseProps> { }
+export = IoIosCloud;
diff --git a/types/react-icons/lib/io/ios-cloudy-night-outline.d.ts b/types/react-icons/lib/io/ios-cloudy-night-outline.d.ts
index 4845f7470d..9a998a4f3d 100644
--- a/types/react-icons/lib/io/ios-cloudy-night-outline.d.ts
+++ b/types/react-icons/lib/io/ios-cloudy-night-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyNightOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCloudyNightOutline extends React.Component<IconBaseProps> { }
+export = IoIosCloudyNightOutline;
diff --git a/types/react-icons/lib/io/ios-cloudy-night.d.ts b/types/react-icons/lib/io/ios-cloudy-night.d.ts
index 9298dc5823..ce8505d3fd 100644
--- a/types/react-icons/lib/io/ios-cloudy-night.d.ts
+++ b/types/react-icons/lib/io/ios-cloudy-night.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyNight extends React.Component<IconBaseProps> { }
+declare class IoIosCloudyNight extends React.Component<IconBaseProps> { }
+export = IoIosCloudyNight;
diff --git a/types/react-icons/lib/io/ios-cloudy-outline.d.ts b/types/react-icons/lib/io/ios-cloudy-outline.d.ts
index cfcfd72e69..e6bdfa8ca4 100644
--- a/types/react-icons/lib/io/ios-cloudy-outline.d.ts
+++ b/types/react-icons/lib/io/ios-cloudy-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCloudyOutline extends React.Component<IconBaseProps> { }
+export = IoIosCloudyOutline;
diff --git a/types/react-icons/lib/io/ios-cloudy.d.ts b/types/react-icons/lib/io/ios-cloudy.d.ts
index 1d30070268..10cb92b074 100644
--- a/types/react-icons/lib/io/ios-cloudy.d.ts
+++ b/types/react-icons/lib/io/ios-cloudy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudy extends React.Component<IconBaseProps> { }
+declare class IoIosCloudy extends React.Component<IconBaseProps> { }
+export = IoIosCloudy;
diff --git a/types/react-icons/lib/io/ios-cog-outline.d.ts b/types/react-icons/lib/io/ios-cog-outline.d.ts
index 8553742da2..4153320627 100644
--- a/types/react-icons/lib/io/ios-cog-outline.d.ts
+++ b/types/react-icons/lib/io/ios-cog-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCogOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCogOutline extends React.Component<IconBaseProps> { }
+export = IoIosCogOutline;
diff --git a/types/react-icons/lib/io/ios-cog.d.ts b/types/react-icons/lib/io/ios-cog.d.ts
index b834fcb3c8..dc35f2908c 100644
--- a/types/react-icons/lib/io/ios-cog.d.ts
+++ b/types/react-icons/lib/io/ios-cog.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCog extends React.Component<IconBaseProps> { }
+declare class IoIosCog extends React.Component<IconBaseProps> { }
+export = IoIosCog;
diff --git a/types/react-icons/lib/io/ios-color-filter-outline.d.ts b/types/react-icons/lib/io/ios-color-filter-outline.d.ts
index a3a38a75c9..3efb45b3e8 100644
--- a/types/react-icons/lib/io/ios-color-filter-outline.d.ts
+++ b/types/react-icons/lib/io/ios-color-filter-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorFilterOutline extends React.Component<IconBaseProps> { }
+declare class IoIosColorFilterOutline extends React.Component<IconBaseProps> { }
+export = IoIosColorFilterOutline;
diff --git a/types/react-icons/lib/io/ios-color-filter.d.ts b/types/react-icons/lib/io/ios-color-filter.d.ts
index 20fcdef6df..b06b0178e1 100644
--- a/types/react-icons/lib/io/ios-color-filter.d.ts
+++ b/types/react-icons/lib/io/ios-color-filter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorFilter extends React.Component<IconBaseProps> { }
+declare class IoIosColorFilter extends React.Component<IconBaseProps> { }
+export = IoIosColorFilter;
diff --git a/types/react-icons/lib/io/ios-color-wand-outline.d.ts b/types/react-icons/lib/io/ios-color-wand-outline.d.ts
index ddb1cb938c..c16dcb880c 100644
--- a/types/react-icons/lib/io/ios-color-wand-outline.d.ts
+++ b/types/react-icons/lib/io/ios-color-wand-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorWandOutline extends React.Component<IconBaseProps> { }
+declare class IoIosColorWandOutline extends React.Component<IconBaseProps> { }
+export = IoIosColorWandOutline;
diff --git a/types/react-icons/lib/io/ios-color-wand.d.ts b/types/react-icons/lib/io/ios-color-wand.d.ts
index 2cffa4f89e..901482ab4d 100644
--- a/types/react-icons/lib/io/ios-color-wand.d.ts
+++ b/types/react-icons/lib/io/ios-color-wand.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorWand extends React.Component<IconBaseProps> { }
+declare class IoIosColorWand extends React.Component<IconBaseProps> { }
+export = IoIosColorWand;
diff --git a/types/react-icons/lib/io/ios-compose-outline.d.ts b/types/react-icons/lib/io/ios-compose-outline.d.ts
index 30d416ed90..56213af99b 100644
--- a/types/react-icons/lib/io/ios-compose-outline.d.ts
+++ b/types/react-icons/lib/io/ios-compose-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosComposeOutline extends React.Component<IconBaseProps> { }
+declare class IoIosComposeOutline extends React.Component<IconBaseProps> { }
+export = IoIosComposeOutline;
diff --git a/types/react-icons/lib/io/ios-compose.d.ts b/types/react-icons/lib/io/ios-compose.d.ts
index 9445eed5c1..700acd9df0 100644
--- a/types/react-icons/lib/io/ios-compose.d.ts
+++ b/types/react-icons/lib/io/ios-compose.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCompose extends React.Component<IconBaseProps> { }
+declare class IoIosCompose extends React.Component<IconBaseProps> { }
+export = IoIosCompose;
diff --git a/types/react-icons/lib/io/ios-contact-outline.d.ts b/types/react-icons/lib/io/ios-contact-outline.d.ts
index 7eb6eb546f..b6c3c9256f 100644
--- a/types/react-icons/lib/io/ios-contact-outline.d.ts
+++ b/types/react-icons/lib/io/ios-contact-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosContactOutline extends React.Component<IconBaseProps> { }
+declare class IoIosContactOutline extends React.Component<IconBaseProps> { }
+export = IoIosContactOutline;
diff --git a/types/react-icons/lib/io/ios-contact.d.ts b/types/react-icons/lib/io/ios-contact.d.ts
index 59c2798235..b84fc3d06c 100644
--- a/types/react-icons/lib/io/ios-contact.d.ts
+++ b/types/react-icons/lib/io/ios-contact.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosContact extends React.Component<IconBaseProps> { }
+declare class IoIosContact extends React.Component<IconBaseProps> { }
+export = IoIosContact;
diff --git a/types/react-icons/lib/io/ios-copy-outline.d.ts b/types/react-icons/lib/io/ios-copy-outline.d.ts
index 5af5717e89..a10a0de758 100644
--- a/types/react-icons/lib/io/ios-copy-outline.d.ts
+++ b/types/react-icons/lib/io/ios-copy-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCopyOutline extends React.Component<IconBaseProps> { }
+declare class IoIosCopyOutline extends React.Component<IconBaseProps> { }
+export = IoIosCopyOutline;
diff --git a/types/react-icons/lib/io/ios-copy.d.ts b/types/react-icons/lib/io/ios-copy.d.ts
index 2523a14f88..17210fcf39 100644
--- a/types/react-icons/lib/io/ios-copy.d.ts
+++ b/types/react-icons/lib/io/ios-copy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCopy extends React.Component<IconBaseProps> { }
+declare class IoIosCopy extends React.Component<IconBaseProps> { }
+export = IoIosCopy;
diff --git a/types/react-icons/lib/io/ios-crop-strong.d.ts b/types/react-icons/lib/io/ios-crop-strong.d.ts
index b0126c2482..1d22950da5 100644
--- a/types/react-icons/lib/io/ios-crop-strong.d.ts
+++ b/types/react-icons/lib/io/ios-crop-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCropStrong extends React.Component<IconBaseProps> { }
+declare class IoIosCropStrong extends React.Component<IconBaseProps> { }
+export = IoIosCropStrong;
diff --git a/types/react-icons/lib/io/ios-crop.d.ts b/types/react-icons/lib/io/ios-crop.d.ts
index ab76318d3a..d3dfb5e071 100644
--- a/types/react-icons/lib/io/ios-crop.d.ts
+++ b/types/react-icons/lib/io/ios-crop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCrop extends React.Component<IconBaseProps> { }
+declare class IoIosCrop extends React.Component<IconBaseProps> { }
+export = IoIosCrop;
diff --git a/types/react-icons/lib/io/ios-download-outline.d.ts b/types/react-icons/lib/io/ios-download-outline.d.ts
index 4498357495..c02ba7586d 100644
--- a/types/react-icons/lib/io/ios-download-outline.d.ts
+++ b/types/react-icons/lib/io/ios-download-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDownloadOutline extends React.Component<IconBaseProps> { }
+declare class IoIosDownloadOutline extends React.Component<IconBaseProps> { }
+export = IoIosDownloadOutline;
diff --git a/types/react-icons/lib/io/ios-download.d.ts b/types/react-icons/lib/io/ios-download.d.ts
index 35aaac4be0..3550abd427 100644
--- a/types/react-icons/lib/io/ios-download.d.ts
+++ b/types/react-icons/lib/io/ios-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDownload extends React.Component<IconBaseProps> { }
+declare class IoIosDownload extends React.Component<IconBaseProps> { }
+export = IoIosDownload;
diff --git a/types/react-icons/lib/io/ios-drag.d.ts b/types/react-icons/lib/io/ios-drag.d.ts
index 17979b680a..22be50c994 100644
--- a/types/react-icons/lib/io/ios-drag.d.ts
+++ b/types/react-icons/lib/io/ios-drag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDrag extends React.Component<IconBaseProps> { }
+declare class IoIosDrag extends React.Component<IconBaseProps> { }
+export = IoIosDrag;
diff --git a/types/react-icons/lib/io/ios-email-outline.d.ts b/types/react-icons/lib/io/ios-email-outline.d.ts
index 3ad2b9cb16..b4708c7cc9 100644
--- a/types/react-icons/lib/io/ios-email-outline.d.ts
+++ b/types/react-icons/lib/io/ios-email-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEmailOutline extends React.Component<IconBaseProps> { }
+declare class IoIosEmailOutline extends React.Component<IconBaseProps> { }
+export = IoIosEmailOutline;
diff --git a/types/react-icons/lib/io/ios-email.d.ts b/types/react-icons/lib/io/ios-email.d.ts
index ac81192fe0..419a9e90da 100644
--- a/types/react-icons/lib/io/ios-email.d.ts
+++ b/types/react-icons/lib/io/ios-email.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEmail extends React.Component<IconBaseProps> { }
+declare class IoIosEmail extends React.Component<IconBaseProps> { }
+export = IoIosEmail;
diff --git a/types/react-icons/lib/io/ios-eye-outline.d.ts b/types/react-icons/lib/io/ios-eye-outline.d.ts
index 8f83b25a13..bdb78dd911 100644
--- a/types/react-icons/lib/io/ios-eye-outline.d.ts
+++ b/types/react-icons/lib/io/ios-eye-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEyeOutline extends React.Component<IconBaseProps> { }
+declare class IoIosEyeOutline extends React.Component<IconBaseProps> { }
+export = IoIosEyeOutline;
diff --git a/types/react-icons/lib/io/ios-eye.d.ts b/types/react-icons/lib/io/ios-eye.d.ts
index 2a3db8b839..7910e77eb5 100644
--- a/types/react-icons/lib/io/ios-eye.d.ts
+++ b/types/react-icons/lib/io/ios-eye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEye extends React.Component<IconBaseProps> { }
+declare class IoIosEye extends React.Component<IconBaseProps> { }
+export = IoIosEye;
diff --git a/types/react-icons/lib/io/ios-fastforward-outline.d.ts b/types/react-icons/lib/io/ios-fastforward-outline.d.ts
index ebc30ba915..b2f8ad2c63 100644
--- a/types/react-icons/lib/io/ios-fastforward-outline.d.ts
+++ b/types/react-icons/lib/io/ios-fastforward-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFastforwardOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFastforwardOutline extends React.Component<IconBaseProps> { }
+export = IoIosFastforwardOutline;
diff --git a/types/react-icons/lib/io/ios-fastforward.d.ts b/types/react-icons/lib/io/ios-fastforward.d.ts
index 2fedece46c..3318050327 100644
--- a/types/react-icons/lib/io/ios-fastforward.d.ts
+++ b/types/react-icons/lib/io/ios-fastforward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFastforward extends React.Component<IconBaseProps> { }
+declare class IoIosFastforward extends React.Component<IconBaseProps> { }
+export = IoIosFastforward;
diff --git a/types/react-icons/lib/io/ios-filing-outline.d.ts b/types/react-icons/lib/io/ios-filing-outline.d.ts
index 07291ebfd3..be70683001 100644
--- a/types/react-icons/lib/io/ios-filing-outline.d.ts
+++ b/types/react-icons/lib/io/ios-filing-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilingOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFilingOutline extends React.Component<IconBaseProps> { }
+export = IoIosFilingOutline;
diff --git a/types/react-icons/lib/io/ios-filing.d.ts b/types/react-icons/lib/io/ios-filing.d.ts
index 0ccb6e3e3b..c152ce0a54 100644
--- a/types/react-icons/lib/io/ios-filing.d.ts
+++ b/types/react-icons/lib/io/ios-filing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFiling extends React.Component<IconBaseProps> { }
+declare class IoIosFiling extends React.Component<IconBaseProps> { }
+export = IoIosFiling;
diff --git a/types/react-icons/lib/io/ios-film-outline.d.ts b/types/react-icons/lib/io/ios-film-outline.d.ts
index 5528977dce..2ee7168846 100644
--- a/types/react-icons/lib/io/ios-film-outline.d.ts
+++ b/types/react-icons/lib/io/ios-film-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilmOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFilmOutline extends React.Component<IconBaseProps> { }
+export = IoIosFilmOutline;
diff --git a/types/react-icons/lib/io/ios-film.d.ts b/types/react-icons/lib/io/ios-film.d.ts
index 447ebbe08e..6d5738e4a3 100644
--- a/types/react-icons/lib/io/ios-film.d.ts
+++ b/types/react-icons/lib/io/ios-film.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilm extends React.Component<IconBaseProps> { }
+declare class IoIosFilm extends React.Component<IconBaseProps> { }
+export = IoIosFilm;
diff --git a/types/react-icons/lib/io/ios-flag-outline.d.ts b/types/react-icons/lib/io/ios-flag-outline.d.ts
index f602c44993..33066e4133 100644
--- a/types/react-icons/lib/io/ios-flag-outline.d.ts
+++ b/types/react-icons/lib/io/ios-flag-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlagOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFlagOutline extends React.Component<IconBaseProps> { }
+export = IoIosFlagOutline;
diff --git a/types/react-icons/lib/io/ios-flag.d.ts b/types/react-icons/lib/io/ios-flag.d.ts
index d6095c22f3..c6ed11469c 100644
--- a/types/react-icons/lib/io/ios-flag.d.ts
+++ b/types/react-icons/lib/io/ios-flag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlag extends React.Component<IconBaseProps> { }
+declare class IoIosFlag extends React.Component<IconBaseProps> { }
+export = IoIosFlag;
diff --git a/types/react-icons/lib/io/ios-flame-outline.d.ts b/types/react-icons/lib/io/ios-flame-outline.d.ts
index 0e8b7410e9..55c2c3bc85 100644
--- a/types/react-icons/lib/io/ios-flame-outline.d.ts
+++ b/types/react-icons/lib/io/ios-flame-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlameOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFlameOutline extends React.Component<IconBaseProps> { }
+export = IoIosFlameOutline;
diff --git a/types/react-icons/lib/io/ios-flame.d.ts b/types/react-icons/lib/io/ios-flame.d.ts
index a21289710b..c538dca10c 100644
--- a/types/react-icons/lib/io/ios-flame.d.ts
+++ b/types/react-icons/lib/io/ios-flame.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlame extends React.Component<IconBaseProps> { }
+declare class IoIosFlame extends React.Component<IconBaseProps> { }
+export = IoIosFlame;
diff --git a/types/react-icons/lib/io/ios-flask-outline.d.ts b/types/react-icons/lib/io/ios-flask-outline.d.ts
index 2082d7a326..3f746b4a81 100644
--- a/types/react-icons/lib/io/ios-flask-outline.d.ts
+++ b/types/react-icons/lib/io/ios-flask-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlaskOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFlaskOutline extends React.Component<IconBaseProps> { }
+export = IoIosFlaskOutline;
diff --git a/types/react-icons/lib/io/ios-flask.d.ts b/types/react-icons/lib/io/ios-flask.d.ts
index 0b622f18e2..721abe351c 100644
--- a/types/react-icons/lib/io/ios-flask.d.ts
+++ b/types/react-icons/lib/io/ios-flask.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlask extends React.Component<IconBaseProps> { }
+declare class IoIosFlask extends React.Component<IconBaseProps> { }
+export = IoIosFlask;
diff --git a/types/react-icons/lib/io/ios-flower-outline.d.ts b/types/react-icons/lib/io/ios-flower-outline.d.ts
index 7886cbc193..4f7133078e 100644
--- a/types/react-icons/lib/io/ios-flower-outline.d.ts
+++ b/types/react-icons/lib/io/ios-flower-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlowerOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFlowerOutline extends React.Component<IconBaseProps> { }
+export = IoIosFlowerOutline;
diff --git a/types/react-icons/lib/io/ios-flower.d.ts b/types/react-icons/lib/io/ios-flower.d.ts
index 9e1ba1e0bc..3f016b41e3 100644
--- a/types/react-icons/lib/io/ios-flower.d.ts
+++ b/types/react-icons/lib/io/ios-flower.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlower extends React.Component<IconBaseProps> { }
+declare class IoIosFlower extends React.Component<IconBaseProps> { }
+export = IoIosFlower;
diff --git a/types/react-icons/lib/io/ios-folder-outline.d.ts b/types/react-icons/lib/io/ios-folder-outline.d.ts
index 43c60dc202..a081df582e 100644
--- a/types/react-icons/lib/io/ios-folder-outline.d.ts
+++ b/types/react-icons/lib/io/ios-folder-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFolderOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFolderOutline extends React.Component<IconBaseProps> { }
+export = IoIosFolderOutline;
diff --git a/types/react-icons/lib/io/ios-folder.d.ts b/types/react-icons/lib/io/ios-folder.d.ts
index 785495d440..6060787ea9 100644
--- a/types/react-icons/lib/io/ios-folder.d.ts
+++ b/types/react-icons/lib/io/ios-folder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFolder extends React.Component<IconBaseProps> { }
+declare class IoIosFolder extends React.Component<IconBaseProps> { }
+export = IoIosFolder;
diff --git a/types/react-icons/lib/io/ios-football-outline.d.ts b/types/react-icons/lib/io/ios-football-outline.d.ts
index 6f669b0cd0..eb888637dd 100644
--- a/types/react-icons/lib/io/ios-football-outline.d.ts
+++ b/types/react-icons/lib/io/ios-football-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFootballOutline extends React.Component<IconBaseProps> { }
+declare class IoIosFootballOutline extends React.Component<IconBaseProps> { }
+export = IoIosFootballOutline;
diff --git a/types/react-icons/lib/io/ios-football.d.ts b/types/react-icons/lib/io/ios-football.d.ts
index 0ece60db03..8683cbbfe5 100644
--- a/types/react-icons/lib/io/ios-football.d.ts
+++ b/types/react-icons/lib/io/ios-football.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFootball extends React.Component<IconBaseProps> { }
+declare class IoIosFootball extends React.Component<IconBaseProps> { }
+export = IoIosFootball;
diff --git a/types/react-icons/lib/io/ios-game-controller-a-outline.d.ts b/types/react-icons/lib/io/ios-game-controller-a-outline.d.ts
index 200c64a673..175d7980de 100644
--- a/types/react-icons/lib/io/ios-game-controller-a-outline.d.ts
+++ b/types/react-icons/lib/io/ios-game-controller-a-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerAOutline extends React.Component<IconBaseProps> { }
+declare class IoIosGameControllerAOutline extends React.Component<IconBaseProps> { }
+export = IoIosGameControllerAOutline;
diff --git a/types/react-icons/lib/io/ios-game-controller-a.d.ts b/types/react-icons/lib/io/ios-game-controller-a.d.ts
index e9e7048f94..4476bd0887 100644
--- a/types/react-icons/lib/io/ios-game-controller-a.d.ts
+++ b/types/react-icons/lib/io/ios-game-controller-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerA extends React.Component<IconBaseProps> { }
+declare class IoIosGameControllerA extends React.Component<IconBaseProps> { }
+export = IoIosGameControllerA;
diff --git a/types/react-icons/lib/io/ios-game-controller-b-outline.d.ts b/types/react-icons/lib/io/ios-game-controller-b-outline.d.ts
index d7d82be788..b7bca018ab 100644
--- a/types/react-icons/lib/io/ios-game-controller-b-outline.d.ts
+++ b/types/react-icons/lib/io/ios-game-controller-b-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerBOutline extends React.Component<IconBaseProps> { }
+declare class IoIosGameControllerBOutline extends React.Component<IconBaseProps> { }
+export = IoIosGameControllerBOutline;
diff --git a/types/react-icons/lib/io/ios-game-controller-b.d.ts b/types/react-icons/lib/io/ios-game-controller-b.d.ts
index 6e5435416c..59cefc38a8 100644
--- a/types/react-icons/lib/io/ios-game-controller-b.d.ts
+++ b/types/react-icons/lib/io/ios-game-controller-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerB extends React.Component<IconBaseProps> { }
+declare class IoIosGameControllerB extends React.Component<IconBaseProps> { }
+export = IoIosGameControllerB;
diff --git a/types/react-icons/lib/io/ios-gear-outline.d.ts b/types/react-icons/lib/io/ios-gear-outline.d.ts
index 22181a1a55..a442d8731e 100644
--- a/types/react-icons/lib/io/ios-gear-outline.d.ts
+++ b/types/react-icons/lib/io/ios-gear-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGearOutline extends React.Component<IconBaseProps> { }
+declare class IoIosGearOutline extends React.Component<IconBaseProps> { }
+export = IoIosGearOutline;
diff --git a/types/react-icons/lib/io/ios-gear.d.ts b/types/react-icons/lib/io/ios-gear.d.ts
index e899faa7a9..25211de0c8 100644
--- a/types/react-icons/lib/io/ios-gear.d.ts
+++ b/types/react-icons/lib/io/ios-gear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGear extends React.Component<IconBaseProps> { }
+declare class IoIosGear extends React.Component<IconBaseProps> { }
+export = IoIosGear;
diff --git a/types/react-icons/lib/io/ios-glasses-outline.d.ts b/types/react-icons/lib/io/ios-glasses-outline.d.ts
index 049fc5bd95..e49413038b 100644
--- a/types/react-icons/lib/io/ios-glasses-outline.d.ts
+++ b/types/react-icons/lib/io/ios-glasses-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGlassesOutline extends React.Component<IconBaseProps> { }
+declare class IoIosGlassesOutline extends React.Component<IconBaseProps> { }
+export = IoIosGlassesOutline;
diff --git a/types/react-icons/lib/io/ios-glasses.d.ts b/types/react-icons/lib/io/ios-glasses.d.ts
index 585312b1f7..0b8a7ec4d0 100644
--- a/types/react-icons/lib/io/ios-glasses.d.ts
+++ b/types/react-icons/lib/io/ios-glasses.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGlasses extends React.Component<IconBaseProps> { }
+declare class IoIosGlasses extends React.Component<IconBaseProps> { }
+export = IoIosGlasses;
diff --git a/types/react-icons/lib/io/ios-grid-view-outline.d.ts b/types/react-icons/lib/io/ios-grid-view-outline.d.ts
index f1cf87b7d6..705beee99d 100644
--- a/types/react-icons/lib/io/ios-grid-view-outline.d.ts
+++ b/types/react-icons/lib/io/ios-grid-view-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGridViewOutline extends React.Component<IconBaseProps> { }
+declare class IoIosGridViewOutline extends React.Component<IconBaseProps> { }
+export = IoIosGridViewOutline;
diff --git a/types/react-icons/lib/io/ios-grid-view.d.ts b/types/react-icons/lib/io/ios-grid-view.d.ts
index 00f6bb916c..9331805663 100644
--- a/types/react-icons/lib/io/ios-grid-view.d.ts
+++ b/types/react-icons/lib/io/ios-grid-view.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGridView extends React.Component<IconBaseProps> { }
+declare class IoIosGridView extends React.Component<IconBaseProps> { }
+export = IoIosGridView;
diff --git a/types/react-icons/lib/io/ios-heart-outline.d.ts b/types/react-icons/lib/io/ios-heart-outline.d.ts
index 354c5543f3..35398f9c6a 100644
--- a/types/react-icons/lib/io/ios-heart-outline.d.ts
+++ b/types/react-icons/lib/io/ios-heart-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHeartOutline extends React.Component<IconBaseProps> { }
+declare class IoIosHeartOutline extends React.Component<IconBaseProps> { }
+export = IoIosHeartOutline;
diff --git a/types/react-icons/lib/io/ios-heart.d.ts b/types/react-icons/lib/io/ios-heart.d.ts
index 254ce938f3..b9aa1e9f0e 100644
--- a/types/react-icons/lib/io/ios-heart.d.ts
+++ b/types/react-icons/lib/io/ios-heart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHeart extends React.Component<IconBaseProps> { }
+declare class IoIosHeart extends React.Component<IconBaseProps> { }
+export = IoIosHeart;
diff --git a/types/react-icons/lib/io/ios-help-empty.d.ts b/types/react-icons/lib/io/ios-help-empty.d.ts
index cd94f6ceed..66bf6aae72 100644
--- a/types/react-icons/lib/io/ios-help-empty.d.ts
+++ b/types/react-icons/lib/io/ios-help-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelpEmpty extends React.Component<IconBaseProps> { }
+declare class IoIosHelpEmpty extends React.Component<IconBaseProps> { }
+export = IoIosHelpEmpty;
diff --git a/types/react-icons/lib/io/ios-help-outline.d.ts b/types/react-icons/lib/io/ios-help-outline.d.ts
index 3e73ec588b..0dd7359a78 100644
--- a/types/react-icons/lib/io/ios-help-outline.d.ts
+++ b/types/react-icons/lib/io/ios-help-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelpOutline extends React.Component<IconBaseProps> { }
+declare class IoIosHelpOutline extends React.Component<IconBaseProps> { }
+export = IoIosHelpOutline;
diff --git a/types/react-icons/lib/io/ios-help.d.ts b/types/react-icons/lib/io/ios-help.d.ts
index 00ede643d8..e62f96ad19 100644
--- a/types/react-icons/lib/io/ios-help.d.ts
+++ b/types/react-icons/lib/io/ios-help.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelp extends React.Component<IconBaseProps> { }
+declare class IoIosHelp extends React.Component<IconBaseProps> { }
+export = IoIosHelp;
diff --git a/types/react-icons/lib/io/ios-home-outline.d.ts b/types/react-icons/lib/io/ios-home-outline.d.ts
index 17f1432ff8..6b5123859e 100644
--- a/types/react-icons/lib/io/ios-home-outline.d.ts
+++ b/types/react-icons/lib/io/ios-home-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHomeOutline extends React.Component<IconBaseProps> { }
+declare class IoIosHomeOutline extends React.Component<IconBaseProps> { }
+export = IoIosHomeOutline;
diff --git a/types/react-icons/lib/io/ios-home.d.ts b/types/react-icons/lib/io/ios-home.d.ts
index c0f80ecaf3..acd8d81c24 100644
--- a/types/react-icons/lib/io/ios-home.d.ts
+++ b/types/react-icons/lib/io/ios-home.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHome extends React.Component<IconBaseProps> { }
+declare class IoIosHome extends React.Component<IconBaseProps> { }
+export = IoIosHome;
diff --git a/types/react-icons/lib/io/ios-infinite-outline.d.ts b/types/react-icons/lib/io/ios-infinite-outline.d.ts
index 0b043764ee..b860546ab4 100644
--- a/types/react-icons/lib/io/ios-infinite-outline.d.ts
+++ b/types/react-icons/lib/io/ios-infinite-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInfiniteOutline extends React.Component<IconBaseProps> { }
+declare class IoIosInfiniteOutline extends React.Component<IconBaseProps> { }
+export = IoIosInfiniteOutline;
diff --git a/types/react-icons/lib/io/ios-infinite.d.ts b/types/react-icons/lib/io/ios-infinite.d.ts
index bf78e5f95b..042c5afee0 100644
--- a/types/react-icons/lib/io/ios-infinite.d.ts
+++ b/types/react-icons/lib/io/ios-infinite.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInfinite extends React.Component<IconBaseProps> { }
+declare class IoIosInfinite extends React.Component<IconBaseProps> { }
+export = IoIosInfinite;
diff --git a/types/react-icons/lib/io/ios-informatempty.d.ts b/types/react-icons/lib/io/ios-informatempty.d.ts
index 34c1b0c19c..5de872ba67 100644
--- a/types/react-icons/lib/io/ios-informatempty.d.ts
+++ b/types/react-icons/lib/io/ios-informatempty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformatempty extends React.Component<IconBaseProps> { }
+declare class IoIosInformatempty extends React.Component<IconBaseProps> { }
+export = IoIosInformatempty;
diff --git a/types/react-icons/lib/io/ios-information.d.ts b/types/react-icons/lib/io/ios-information.d.ts
index f6e3295ac3..16fe378595 100644
--- a/types/react-icons/lib/io/ios-information.d.ts
+++ b/types/react-icons/lib/io/ios-information.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformation extends React.Component<IconBaseProps> { }
+declare class IoIosInformation extends React.Component<IconBaseProps> { }
+export = IoIosInformation;
diff --git a/types/react-icons/lib/io/ios-informatoutline.d.ts b/types/react-icons/lib/io/ios-informatoutline.d.ts
index 038ce93a28..836c4124cf 100644
--- a/types/react-icons/lib/io/ios-informatoutline.d.ts
+++ b/types/react-icons/lib/io/ios-informatoutline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformatoutline extends React.Component<IconBaseProps> { }
+declare class IoIosInformatoutline extends React.Component<IconBaseProps> { }
+export = IoIosInformatoutline;
diff --git a/types/react-icons/lib/io/ios-ionic-outline.d.ts b/types/react-icons/lib/io/ios-ionic-outline.d.ts
index bd42bf2316..54f711ed77 100644
--- a/types/react-icons/lib/io/ios-ionic-outline.d.ts
+++ b/types/react-icons/lib/io/ios-ionic-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosIonicOutline extends React.Component<IconBaseProps> { }
+declare class IoIosIonicOutline extends React.Component<IconBaseProps> { }
+export = IoIosIonicOutline;
diff --git a/types/react-icons/lib/io/ios-keypad-outline.d.ts b/types/react-icons/lib/io/ios-keypad-outline.d.ts
index 9adff455e3..eeafb0c854 100644
--- a/types/react-icons/lib/io/ios-keypad-outline.d.ts
+++ b/types/react-icons/lib/io/ios-keypad-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosKeypadOutline extends React.Component<IconBaseProps> { }
+declare class IoIosKeypadOutline extends React.Component<IconBaseProps> { }
+export = IoIosKeypadOutline;
diff --git a/types/react-icons/lib/io/ios-keypad.d.ts b/types/react-icons/lib/io/ios-keypad.d.ts
index a804cf857f..6e92f86ed6 100644
--- a/types/react-icons/lib/io/ios-keypad.d.ts
+++ b/types/react-icons/lib/io/ios-keypad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosKeypad extends React.Component<IconBaseProps> { }
+declare class IoIosKeypad extends React.Component<IconBaseProps> { }
+export = IoIosKeypad;
diff --git a/types/react-icons/lib/io/ios-lightbulb-outline.d.ts b/types/react-icons/lib/io/ios-lightbulb-outline.d.ts
index 4c92bdd5d6..70985fda1c 100644
--- a/types/react-icons/lib/io/ios-lightbulb-outline.d.ts
+++ b/types/react-icons/lib/io/ios-lightbulb-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLightbulbOutline extends React.Component<IconBaseProps> { }
+declare class IoIosLightbulbOutline extends React.Component<IconBaseProps> { }
+export = IoIosLightbulbOutline;
diff --git a/types/react-icons/lib/io/ios-lightbulb.d.ts b/types/react-icons/lib/io/ios-lightbulb.d.ts
index a7bbb177bb..da9af32ea4 100644
--- a/types/react-icons/lib/io/ios-lightbulb.d.ts
+++ b/types/react-icons/lib/io/ios-lightbulb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLightbulb extends React.Component<IconBaseProps> { }
+declare class IoIosLightbulb extends React.Component<IconBaseProps> { }
+export = IoIosLightbulb;
diff --git a/types/react-icons/lib/io/ios-list-outline.d.ts b/types/react-icons/lib/io/ios-list-outline.d.ts
index 839d753887..5988c619a3 100644
--- a/types/react-icons/lib/io/ios-list-outline.d.ts
+++ b/types/react-icons/lib/io/ios-list-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosListOutline extends React.Component<IconBaseProps> { }
+declare class IoIosListOutline extends React.Component<IconBaseProps> { }
+export = IoIosListOutline;
diff --git a/types/react-icons/lib/io/ios-list.d.ts b/types/react-icons/lib/io/ios-list.d.ts
index 9789a06dc7..931104f063 100644
--- a/types/react-icons/lib/io/ios-list.d.ts
+++ b/types/react-icons/lib/io/ios-list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosList extends React.Component<IconBaseProps> { }
+declare class IoIosList extends React.Component<IconBaseProps> { }
+export = IoIosList;
diff --git a/types/react-icons/lib/io/ios-location.d.ts b/types/react-icons/lib/io/ios-location.d.ts
index 617b853698..c8082c6164 100644
--- a/types/react-icons/lib/io/ios-location.d.ts
+++ b/types/react-icons/lib/io/ios-location.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocation extends React.Component<IconBaseProps> { }
+declare class IoIosLocation extends React.Component<IconBaseProps> { }
+export = IoIosLocation;
diff --git a/types/react-icons/lib/io/ios-locatoutline.d.ts b/types/react-icons/lib/io/ios-locatoutline.d.ts
index 141e72e594..52c091939f 100644
--- a/types/react-icons/lib/io/ios-locatoutline.d.ts
+++ b/types/react-icons/lib/io/ios-locatoutline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocatoutline extends React.Component<IconBaseProps> { }
+declare class IoIosLocatoutline extends React.Component<IconBaseProps> { }
+export = IoIosLocatoutline;
diff --git a/types/react-icons/lib/io/ios-locked-outline.d.ts b/types/react-icons/lib/io/ios-locked-outline.d.ts
index 3f0855a38d..c4724ffbda 100644
--- a/types/react-icons/lib/io/ios-locked-outline.d.ts
+++ b/types/react-icons/lib/io/ios-locked-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLockedOutline extends React.Component<IconBaseProps> { }
+declare class IoIosLockedOutline extends React.Component<IconBaseProps> { }
+export = IoIosLockedOutline;
diff --git a/types/react-icons/lib/io/ios-locked.d.ts b/types/react-icons/lib/io/ios-locked.d.ts
index b22a3238d4..a5cf385852 100644
--- a/types/react-icons/lib/io/ios-locked.d.ts
+++ b/types/react-icons/lib/io/ios-locked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocked extends React.Component<IconBaseProps> { }
+declare class IoIosLocked extends React.Component<IconBaseProps> { }
+export = IoIosLocked;
diff --git a/types/react-icons/lib/io/ios-loop-strong.d.ts b/types/react-icons/lib/io/ios-loop-strong.d.ts
index 900c41d788..3d4939fdc7 100644
--- a/types/react-icons/lib/io/ios-loop-strong.d.ts
+++ b/types/react-icons/lib/io/ios-loop-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLoopStrong extends React.Component<IconBaseProps> { }
+declare class IoIosLoopStrong extends React.Component<IconBaseProps> { }
+export = IoIosLoopStrong;
diff --git a/types/react-icons/lib/io/ios-loop.d.ts b/types/react-icons/lib/io/ios-loop.d.ts
index 0235e4f546..9055d01a4a 100644
--- a/types/react-icons/lib/io/ios-loop.d.ts
+++ b/types/react-icons/lib/io/ios-loop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLoop extends React.Component<IconBaseProps> { }
+declare class IoIosLoop extends React.Component<IconBaseProps> { }
+export = IoIosLoop;
diff --git a/types/react-icons/lib/io/ios-medical-outline.d.ts b/types/react-icons/lib/io/ios-medical-outline.d.ts
index dadb2e61ae..63cf7215ea 100644
--- a/types/react-icons/lib/io/ios-medical-outline.d.ts
+++ b/types/react-icons/lib/io/ios-medical-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedicalOutline extends React.Component<IconBaseProps> { }
+declare class IoIosMedicalOutline extends React.Component<IconBaseProps> { }
+export = IoIosMedicalOutline;
diff --git a/types/react-icons/lib/io/ios-medical.d.ts b/types/react-icons/lib/io/ios-medical.d.ts
index 1d63e24694..2772059c0d 100644
--- a/types/react-icons/lib/io/ios-medical.d.ts
+++ b/types/react-icons/lib/io/ios-medical.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedical extends React.Component<IconBaseProps> { }
+declare class IoIosMedical extends React.Component<IconBaseProps> { }
+export = IoIosMedical;
diff --git a/types/react-icons/lib/io/ios-medkit-outline.d.ts b/types/react-icons/lib/io/ios-medkit-outline.d.ts
index 367cb88b6f..00492e10aa 100644
--- a/types/react-icons/lib/io/ios-medkit-outline.d.ts
+++ b/types/react-icons/lib/io/ios-medkit-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedkitOutline extends React.Component<IconBaseProps> { }
+declare class IoIosMedkitOutline extends React.Component<IconBaseProps> { }
+export = IoIosMedkitOutline;
diff --git a/types/react-icons/lib/io/ios-medkit.d.ts b/types/react-icons/lib/io/ios-medkit.d.ts
index bf5d378f58..72255a3bbe 100644
--- a/types/react-icons/lib/io/ios-medkit.d.ts
+++ b/types/react-icons/lib/io/ios-medkit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedkit extends React.Component<IconBaseProps> { }
+declare class IoIosMedkit extends React.Component<IconBaseProps> { }
+export = IoIosMedkit;
diff --git a/types/react-icons/lib/io/ios-mic-off.d.ts b/types/react-icons/lib/io/ios-mic-off.d.ts
index 093cc13897..d12dd27d16 100644
--- a/types/react-icons/lib/io/ios-mic-off.d.ts
+++ b/types/react-icons/lib/io/ios-mic-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMicOff extends React.Component<IconBaseProps> { }
+declare class IoIosMicOff extends React.Component<IconBaseProps> { }
+export = IoIosMicOff;
diff --git a/types/react-icons/lib/io/ios-mic-outline.d.ts b/types/react-icons/lib/io/ios-mic-outline.d.ts
index 1e2a4f7ca6..a115747ba9 100644
--- a/types/react-icons/lib/io/ios-mic-outline.d.ts
+++ b/types/react-icons/lib/io/ios-mic-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMicOutline extends React.Component<IconBaseProps> { }
+declare class IoIosMicOutline extends React.Component<IconBaseProps> { }
+export = IoIosMicOutline;
diff --git a/types/react-icons/lib/io/ios-mic.d.ts b/types/react-icons/lib/io/ios-mic.d.ts
index a561e50887..f017a3e55a 100644
--- a/types/react-icons/lib/io/ios-mic.d.ts
+++ b/types/react-icons/lib/io/ios-mic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMic extends React.Component<IconBaseProps> { }
+declare class IoIosMic extends React.Component<IconBaseProps> { }
+export = IoIosMic;
diff --git a/types/react-icons/lib/io/ios-minus-empty.d.ts b/types/react-icons/lib/io/ios-minus-empty.d.ts
index d33c1a6e8c..a7e6545790 100644
--- a/types/react-icons/lib/io/ios-minus-empty.d.ts
+++ b/types/react-icons/lib/io/ios-minus-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinusEmpty extends React.Component<IconBaseProps> { }
+declare class IoIosMinusEmpty extends React.Component<IconBaseProps> { }
+export = IoIosMinusEmpty;
diff --git a/types/react-icons/lib/io/ios-minus-outline.d.ts b/types/react-icons/lib/io/ios-minus-outline.d.ts
index d7373a37df..b49b0d3293 100644
--- a/types/react-icons/lib/io/ios-minus-outline.d.ts
+++ b/types/react-icons/lib/io/ios-minus-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinusOutline extends React.Component<IconBaseProps> { }
+declare class IoIosMinusOutline extends React.Component<IconBaseProps> { }
+export = IoIosMinusOutline;
diff --git a/types/react-icons/lib/io/ios-minus.d.ts b/types/react-icons/lib/io/ios-minus.d.ts
index abc0a2679e..8b5b596a71 100644
--- a/types/react-icons/lib/io/ios-minus.d.ts
+++ b/types/react-icons/lib/io/ios-minus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinus extends React.Component<IconBaseProps> { }
+declare class IoIosMinus extends React.Component<IconBaseProps> { }
+export = IoIosMinus;
diff --git a/types/react-icons/lib/io/ios-monitor-outline.d.ts b/types/react-icons/lib/io/ios-monitor-outline.d.ts
index 8dd207f86e..a12e192cc2 100644
--- a/types/react-icons/lib/io/ios-monitor-outline.d.ts
+++ b/types/react-icons/lib/io/ios-monitor-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMonitorOutline extends React.Component<IconBaseProps> { }
+declare class IoIosMonitorOutline extends React.Component<IconBaseProps> { }
+export = IoIosMonitorOutline;
diff --git a/types/react-icons/lib/io/ios-monitor.d.ts b/types/react-icons/lib/io/ios-monitor.d.ts
index 965a9b5d3b..5c15845b90 100644
--- a/types/react-icons/lib/io/ios-monitor.d.ts
+++ b/types/react-icons/lib/io/ios-monitor.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMonitor extends React.Component<IconBaseProps> { }
+declare class IoIosMonitor extends React.Component<IconBaseProps> { }
+export = IoIosMonitor;
diff --git a/types/react-icons/lib/io/ios-moon-outline.d.ts b/types/react-icons/lib/io/ios-moon-outline.d.ts
index e35e94911f..969a448406 100644
--- a/types/react-icons/lib/io/ios-moon-outline.d.ts
+++ b/types/react-icons/lib/io/ios-moon-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoonOutline extends React.Component<IconBaseProps> { }
+declare class IoIosMoonOutline extends React.Component<IconBaseProps> { }
+export = IoIosMoonOutline;
diff --git a/types/react-icons/lib/io/ios-moon.d.ts b/types/react-icons/lib/io/ios-moon.d.ts
index cee7a782f1..b980bf0579 100644
--- a/types/react-icons/lib/io/ios-moon.d.ts
+++ b/types/react-icons/lib/io/ios-moon.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoon extends React.Component<IconBaseProps> { }
+declare class IoIosMoon extends React.Component<IconBaseProps> { }
+export = IoIosMoon;
diff --git a/types/react-icons/lib/io/ios-more-outline.d.ts b/types/react-icons/lib/io/ios-more-outline.d.ts
index a5a83f41cf..225f87ad5e 100644
--- a/types/react-icons/lib/io/ios-more-outline.d.ts
+++ b/types/react-icons/lib/io/ios-more-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoreOutline extends React.Component<IconBaseProps> { }
+declare class IoIosMoreOutline extends React.Component<IconBaseProps> { }
+export = IoIosMoreOutline;
diff --git a/types/react-icons/lib/io/ios-more.d.ts b/types/react-icons/lib/io/ios-more.d.ts
index 9fb63209db..0f980fc024 100644
--- a/types/react-icons/lib/io/ios-more.d.ts
+++ b/types/react-icons/lib/io/ios-more.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMore extends React.Component<IconBaseProps> { }
+declare class IoIosMore extends React.Component<IconBaseProps> { }
+export = IoIosMore;
diff --git a/types/react-icons/lib/io/ios-musical-note.d.ts b/types/react-icons/lib/io/ios-musical-note.d.ts
index 123b990474..1558f0f2cb 100644
--- a/types/react-icons/lib/io/ios-musical-note.d.ts
+++ b/types/react-icons/lib/io/ios-musical-note.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMusicalNote extends React.Component<IconBaseProps> { }
+declare class IoIosMusicalNote extends React.Component<IconBaseProps> { }
+export = IoIosMusicalNote;
diff --git a/types/react-icons/lib/io/ios-musical-notes.d.ts b/types/react-icons/lib/io/ios-musical-notes.d.ts
index 54daf1715e..5669628bea 100644
--- a/types/react-icons/lib/io/ios-musical-notes.d.ts
+++ b/types/react-icons/lib/io/ios-musical-notes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMusicalNotes extends React.Component<IconBaseProps> { }
+declare class IoIosMusicalNotes extends React.Component<IconBaseProps> { }
+export = IoIosMusicalNotes;
diff --git a/types/react-icons/lib/io/ios-navigate-outline.d.ts b/types/react-icons/lib/io/ios-navigate-outline.d.ts
index daaafc5c76..7fef63a930 100644
--- a/types/react-icons/lib/io/ios-navigate-outline.d.ts
+++ b/types/react-icons/lib/io/ios-navigate-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNavigateOutline extends React.Component<IconBaseProps> { }
+declare class IoIosNavigateOutline extends React.Component<IconBaseProps> { }
+export = IoIosNavigateOutline;
diff --git a/types/react-icons/lib/io/ios-navigate.d.ts b/types/react-icons/lib/io/ios-navigate.d.ts
index 3a8a955fa6..499f1712a5 100644
--- a/types/react-icons/lib/io/ios-navigate.d.ts
+++ b/types/react-icons/lib/io/ios-navigate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNavigate extends React.Component<IconBaseProps> { }
+declare class IoIosNavigate extends React.Component<IconBaseProps> { }
+export = IoIosNavigate;
diff --git a/types/react-icons/lib/io/ios-nutrition.d.ts b/types/react-icons/lib/io/ios-nutrition.d.ts
index 19b5f0eae6..ee8c95bfd7 100644
--- a/types/react-icons/lib/io/ios-nutrition.d.ts
+++ b/types/react-icons/lib/io/ios-nutrition.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNutrition extends React.Component<IconBaseProps> { }
+declare class IoIosNutrition extends React.Component<IconBaseProps> { }
+export = IoIosNutrition;
diff --git a/types/react-icons/lib/io/ios-nutritoutline.d.ts b/types/react-icons/lib/io/ios-nutritoutline.d.ts
index 9ce2ea6d24..5942c17ae5 100644
--- a/types/react-icons/lib/io/ios-nutritoutline.d.ts
+++ b/types/react-icons/lib/io/ios-nutritoutline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNutritoutline extends React.Component<IconBaseProps> { }
+declare class IoIosNutritoutline extends React.Component<IconBaseProps> { }
+export = IoIosNutritoutline;
diff --git a/types/react-icons/lib/io/ios-paper-outline.d.ts b/types/react-icons/lib/io/ios-paper-outline.d.ts
index f491c2a055..d1579a4653 100644
--- a/types/react-icons/lib/io/ios-paper-outline.d.ts
+++ b/types/react-icons/lib/io/ios-paper-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPaperOutline extends React.Component<IconBaseProps> { }
+export = IoIosPaperOutline;
diff --git a/types/react-icons/lib/io/ios-paper.d.ts b/types/react-icons/lib/io/ios-paper.d.ts
index bf98a1330d..8213cddccb 100644
--- a/types/react-icons/lib/io/ios-paper.d.ts
+++ b/types/react-icons/lib/io/ios-paper.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaper extends React.Component<IconBaseProps> { }
+declare class IoIosPaper extends React.Component<IconBaseProps> { }
+export = IoIosPaper;
diff --git a/types/react-icons/lib/io/ios-paperplane-outline.d.ts b/types/react-icons/lib/io/ios-paperplane-outline.d.ts
index 381b337e35..5d04a87a3b 100644
--- a/types/react-icons/lib/io/ios-paperplane-outline.d.ts
+++ b/types/react-icons/lib/io/ios-paperplane-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperplaneOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPaperplaneOutline extends React.Component<IconBaseProps> { }
+export = IoIosPaperplaneOutline;
diff --git a/types/react-icons/lib/io/ios-paperplane.d.ts b/types/react-icons/lib/io/ios-paperplane.d.ts
index 3999ec063c..180221081d 100644
--- a/types/react-icons/lib/io/ios-paperplane.d.ts
+++ b/types/react-icons/lib/io/ios-paperplane.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperplane extends React.Component<IconBaseProps> { }
+declare class IoIosPaperplane extends React.Component<IconBaseProps> { }
+export = IoIosPaperplane;
diff --git a/types/react-icons/lib/io/ios-partlysunny-outline.d.ts b/types/react-icons/lib/io/ios-partlysunny-outline.d.ts
index 96fddf3405..c0f6459de8 100644
--- a/types/react-icons/lib/io/ios-partlysunny-outline.d.ts
+++ b/types/react-icons/lib/io/ios-partlysunny-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPartlysunnyOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPartlysunnyOutline extends React.Component<IconBaseProps> { }
+export = IoIosPartlysunnyOutline;
diff --git a/types/react-icons/lib/io/ios-partlysunny.d.ts b/types/react-icons/lib/io/ios-partlysunny.d.ts
index f0f7b24a0f..569d0bc712 100644
--- a/types/react-icons/lib/io/ios-partlysunny.d.ts
+++ b/types/react-icons/lib/io/ios-partlysunny.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPartlysunny extends React.Component<IconBaseProps> { }
+declare class IoIosPartlysunny extends React.Component<IconBaseProps> { }
+export = IoIosPartlysunny;
diff --git a/types/react-icons/lib/io/ios-pause-outline.d.ts b/types/react-icons/lib/io/ios-pause-outline.d.ts
index a3c096ec70..97bd9b6790 100644
--- a/types/react-icons/lib/io/ios-pause-outline.d.ts
+++ b/types/react-icons/lib/io/ios-pause-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPauseOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPauseOutline extends React.Component<IconBaseProps> { }
+export = IoIosPauseOutline;
diff --git a/types/react-icons/lib/io/ios-pause.d.ts b/types/react-icons/lib/io/ios-pause.d.ts
index 5be0dbb44e..414c36c5ee 100644
--- a/types/react-icons/lib/io/ios-pause.d.ts
+++ b/types/react-icons/lib/io/ios-pause.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPause extends React.Component<IconBaseProps> { }
+declare class IoIosPause extends React.Component<IconBaseProps> { }
+export = IoIosPause;
diff --git a/types/react-icons/lib/io/ios-paw-outline.d.ts b/types/react-icons/lib/io/ios-paw-outline.d.ts
index 59ff2ba1f0..b6dc0e217b 100644
--- a/types/react-icons/lib/io/ios-paw-outline.d.ts
+++ b/types/react-icons/lib/io/ios-paw-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPawOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPawOutline extends React.Component<IconBaseProps> { }
+export = IoIosPawOutline;
diff --git a/types/react-icons/lib/io/ios-paw.d.ts b/types/react-icons/lib/io/ios-paw.d.ts
index 8907243697..80db78ab15 100644
--- a/types/react-icons/lib/io/ios-paw.d.ts
+++ b/types/react-icons/lib/io/ios-paw.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaw extends React.Component<IconBaseProps> { }
+declare class IoIosPaw extends React.Component<IconBaseProps> { }
+export = IoIosPaw;
diff --git a/types/react-icons/lib/io/ios-people-outline.d.ts b/types/react-icons/lib/io/ios-people-outline.d.ts
index fca7beebf0..d7b2d3b21b 100644
--- a/types/react-icons/lib/io/ios-people-outline.d.ts
+++ b/types/react-icons/lib/io/ios-people-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPeopleOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPeopleOutline extends React.Component<IconBaseProps> { }
+export = IoIosPeopleOutline;
diff --git a/types/react-icons/lib/io/ios-people.d.ts b/types/react-icons/lib/io/ios-people.d.ts
index 47167ca242..d80eb07bea 100644
--- a/types/react-icons/lib/io/ios-people.d.ts
+++ b/types/react-icons/lib/io/ios-people.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPeople extends React.Component<IconBaseProps> { }
+declare class IoIosPeople extends React.Component<IconBaseProps> { }
+export = IoIosPeople;
diff --git a/types/react-icons/lib/io/ios-person-outline.d.ts b/types/react-icons/lib/io/ios-person-outline.d.ts
index d9dcad6337..d3418bba82 100644
--- a/types/react-icons/lib/io/ios-person-outline.d.ts
+++ b/types/react-icons/lib/io/ios-person-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPersonOutline extends React.Component<IconBaseProps> { }
+export = IoIosPersonOutline;
diff --git a/types/react-icons/lib/io/ios-person.d.ts b/types/react-icons/lib/io/ios-person.d.ts
index c0a721cdc9..742a75f87f 100644
--- a/types/react-icons/lib/io/ios-person.d.ts
+++ b/types/react-icons/lib/io/ios-person.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPerson extends React.Component<IconBaseProps> { }
+declare class IoIosPerson extends React.Component<IconBaseProps> { }
+export = IoIosPerson;
diff --git a/types/react-icons/lib/io/ios-personadd-outline.d.ts b/types/react-icons/lib/io/ios-personadd-outline.d.ts
index 0c2ef41134..da6f7ad817 100644
--- a/types/react-icons/lib/io/ios-personadd-outline.d.ts
+++ b/types/react-icons/lib/io/ios-personadd-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonaddOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPersonaddOutline extends React.Component<IconBaseProps> { }
+export = IoIosPersonaddOutline;
diff --git a/types/react-icons/lib/io/ios-personadd.d.ts b/types/react-icons/lib/io/ios-personadd.d.ts
index 76064513f6..2c2312066b 100644
--- a/types/react-icons/lib/io/ios-personadd.d.ts
+++ b/types/react-icons/lib/io/ios-personadd.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonadd extends React.Component<IconBaseProps> { }
+declare class IoIosPersonadd extends React.Component<IconBaseProps> { }
+export = IoIosPersonadd;
diff --git a/types/react-icons/lib/io/ios-photos-outline.d.ts b/types/react-icons/lib/io/ios-photos-outline.d.ts
index b6bcf6e60a..95625f46dc 100644
--- a/types/react-icons/lib/io/ios-photos-outline.d.ts
+++ b/types/react-icons/lib/io/ios-photos-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPhotosOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPhotosOutline extends React.Component<IconBaseProps> { }
+export = IoIosPhotosOutline;
diff --git a/types/react-icons/lib/io/ios-photos.d.ts b/types/react-icons/lib/io/ios-photos.d.ts
index 1f4a1d7b0a..938e0fc00b 100644
--- a/types/react-icons/lib/io/ios-photos.d.ts
+++ b/types/react-icons/lib/io/ios-photos.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPhotos extends React.Component<IconBaseProps> { }
+declare class IoIosPhotos extends React.Component<IconBaseProps> { }
+export = IoIosPhotos;
diff --git a/types/react-icons/lib/io/ios-pie-outline.d.ts b/types/react-icons/lib/io/ios-pie-outline.d.ts
index a370ac6e6e..cbe879f3a3 100644
--- a/types/react-icons/lib/io/ios-pie-outline.d.ts
+++ b/types/react-icons/lib/io/ios-pie-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPieOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPieOutline extends React.Component<IconBaseProps> { }
+export = IoIosPieOutline;
diff --git a/types/react-icons/lib/io/ios-pie.d.ts b/types/react-icons/lib/io/ios-pie.d.ts
index 4a1c78801a..0ac63e3ed9 100644
--- a/types/react-icons/lib/io/ios-pie.d.ts
+++ b/types/react-icons/lib/io/ios-pie.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPie extends React.Component<IconBaseProps> { }
+declare class IoIosPie extends React.Component<IconBaseProps> { }
+export = IoIosPie;
diff --git a/types/react-icons/lib/io/ios-pint-outline.d.ts b/types/react-icons/lib/io/ios-pint-outline.d.ts
index d400fd801a..f32a6650f3 100644
--- a/types/react-icons/lib/io/ios-pint-outline.d.ts
+++ b/types/react-icons/lib/io/ios-pint-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPintOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPintOutline extends React.Component<IconBaseProps> { }
+export = IoIosPintOutline;
diff --git a/types/react-icons/lib/io/ios-pint.d.ts b/types/react-icons/lib/io/ios-pint.d.ts
index 21bd07ccd5..39f8fea7ba 100644
--- a/types/react-icons/lib/io/ios-pint.d.ts
+++ b/types/react-icons/lib/io/ios-pint.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPint extends React.Component<IconBaseProps> { }
+declare class IoIosPint extends React.Component<IconBaseProps> { }
+export = IoIosPint;
diff --git a/types/react-icons/lib/io/ios-play-outline.d.ts b/types/react-icons/lib/io/ios-play-outline.d.ts
index 4c7a550e46..9f2b845a65 100644
--- a/types/react-icons/lib/io/ios-play-outline.d.ts
+++ b/types/react-icons/lib/io/ios-play-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlayOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPlayOutline extends React.Component<IconBaseProps> { }
+export = IoIosPlayOutline;
diff --git a/types/react-icons/lib/io/ios-play.d.ts b/types/react-icons/lib/io/ios-play.d.ts
index 18f66a8f59..c4ea5f89df 100644
--- a/types/react-icons/lib/io/ios-play.d.ts
+++ b/types/react-icons/lib/io/ios-play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlay extends React.Component<IconBaseProps> { }
+declare class IoIosPlay extends React.Component<IconBaseProps> { }
+export = IoIosPlay;
diff --git a/types/react-icons/lib/io/ios-plus-empty.d.ts b/types/react-icons/lib/io/ios-plus-empty.d.ts
index a7235d6322..8b84b5fce5 100644
--- a/types/react-icons/lib/io/ios-plus-empty.d.ts
+++ b/types/react-icons/lib/io/ios-plus-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlusEmpty extends React.Component<IconBaseProps> { }
+declare class IoIosPlusEmpty extends React.Component<IconBaseProps> { }
+export = IoIosPlusEmpty;
diff --git a/types/react-icons/lib/io/ios-plus-outline.d.ts b/types/react-icons/lib/io/ios-plus-outline.d.ts
index 719bce1444..abe56b67b3 100644
--- a/types/react-icons/lib/io/ios-plus-outline.d.ts
+++ b/types/react-icons/lib/io/ios-plus-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlusOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPlusOutline extends React.Component<IconBaseProps> { }
+export = IoIosPlusOutline;
diff --git a/types/react-icons/lib/io/ios-plus.d.ts b/types/react-icons/lib/io/ios-plus.d.ts
index 7d29ea3f40..a873d41eb9 100644
--- a/types/react-icons/lib/io/ios-plus.d.ts
+++ b/types/react-icons/lib/io/ios-plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlus extends React.Component<IconBaseProps> { }
+declare class IoIosPlus extends React.Component<IconBaseProps> { }
+export = IoIosPlus;
diff --git a/types/react-icons/lib/io/ios-pricetag-outline.d.ts b/types/react-icons/lib/io/ios-pricetag-outline.d.ts
index 23a4c0c869..b019c2f832 100644
--- a/types/react-icons/lib/io/ios-pricetag-outline.d.ts
+++ b/types/react-icons/lib/io/ios-pricetag-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetagOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPricetagOutline extends React.Component<IconBaseProps> { }
+export = IoIosPricetagOutline;
diff --git a/types/react-icons/lib/io/ios-pricetag.d.ts b/types/react-icons/lib/io/ios-pricetag.d.ts
index 601743c434..e4de3e1503 100644
--- a/types/react-icons/lib/io/ios-pricetag.d.ts
+++ b/types/react-icons/lib/io/ios-pricetag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetag extends React.Component<IconBaseProps> { }
+declare class IoIosPricetag extends React.Component<IconBaseProps> { }
+export = IoIosPricetag;
diff --git a/types/react-icons/lib/io/ios-pricetags-outline.d.ts b/types/react-icons/lib/io/ios-pricetags-outline.d.ts
index 0e1e574dac..b138f8dc86 100644
--- a/types/react-icons/lib/io/ios-pricetags-outline.d.ts
+++ b/types/react-icons/lib/io/ios-pricetags-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetagsOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPricetagsOutline extends React.Component<IconBaseProps> { }
+export = IoIosPricetagsOutline;
diff --git a/types/react-icons/lib/io/ios-pricetags.d.ts b/types/react-icons/lib/io/ios-pricetags.d.ts
index 4cc3aebb75..6587e21167 100644
--- a/types/react-icons/lib/io/ios-pricetags.d.ts
+++ b/types/react-icons/lib/io/ios-pricetags.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetags extends React.Component<IconBaseProps> { }
+declare class IoIosPricetags extends React.Component<IconBaseProps> { }
+export = IoIosPricetags;
diff --git a/types/react-icons/lib/io/ios-printer-outline.d.ts b/types/react-icons/lib/io/ios-printer-outline.d.ts
index d20dcedadf..d6925cf18f 100644
--- a/types/react-icons/lib/io/ios-printer-outline.d.ts
+++ b/types/react-icons/lib/io/ios-printer-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPrinterOutline extends React.Component<IconBaseProps> { }
+declare class IoIosPrinterOutline extends React.Component<IconBaseProps> { }
+export = IoIosPrinterOutline;
diff --git a/types/react-icons/lib/io/ios-printer.d.ts b/types/react-icons/lib/io/ios-printer.d.ts
index dc9bccfb25..463ae865ba 100644
--- a/types/react-icons/lib/io/ios-printer.d.ts
+++ b/types/react-icons/lib/io/ios-printer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPrinter extends React.Component<IconBaseProps> { }
+declare class IoIosPrinter extends React.Component<IconBaseProps> { }
+export = IoIosPrinter;
diff --git a/types/react-icons/lib/io/ios-pulse-strong.d.ts b/types/react-icons/lib/io/ios-pulse-strong.d.ts
index 8f7e12017a..c7cb6779bd 100644
--- a/types/react-icons/lib/io/ios-pulse-strong.d.ts
+++ b/types/react-icons/lib/io/ios-pulse-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPulseStrong extends React.Component<IconBaseProps> { }
+declare class IoIosPulseStrong extends React.Component<IconBaseProps> { }
+export = IoIosPulseStrong;
diff --git a/types/react-icons/lib/io/ios-pulse.d.ts b/types/react-icons/lib/io/ios-pulse.d.ts
index a7ff149ddf..28069451ed 100644
--- a/types/react-icons/lib/io/ios-pulse.d.ts
+++ b/types/react-icons/lib/io/ios-pulse.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPulse extends React.Component<IconBaseProps> { }
+declare class IoIosPulse extends React.Component<IconBaseProps> { }
+export = IoIosPulse;
diff --git a/types/react-icons/lib/io/ios-rainy-outline.d.ts b/types/react-icons/lib/io/ios-rainy-outline.d.ts
index 7e283d1cb3..4a41260cc0 100644
--- a/types/react-icons/lib/io/ios-rainy-outline.d.ts
+++ b/types/react-icons/lib/io/ios-rainy-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRainyOutline extends React.Component<IconBaseProps> { }
+declare class IoIosRainyOutline extends React.Component<IconBaseProps> { }
+export = IoIosRainyOutline;
diff --git a/types/react-icons/lib/io/ios-rainy.d.ts b/types/react-icons/lib/io/ios-rainy.d.ts
index a701475ef0..ae4c36367e 100644
--- a/types/react-icons/lib/io/ios-rainy.d.ts
+++ b/types/react-icons/lib/io/ios-rainy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRainy extends React.Component<IconBaseProps> { }
+declare class IoIosRainy extends React.Component<IconBaseProps> { }
+export = IoIosRainy;
diff --git a/types/react-icons/lib/io/ios-recording-outline.d.ts b/types/react-icons/lib/io/ios-recording-outline.d.ts
index 9fc2e6ffca..9b29082903 100644
--- a/types/react-icons/lib/io/ios-recording-outline.d.ts
+++ b/types/react-icons/lib/io/ios-recording-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRecordingOutline extends React.Component<IconBaseProps> { }
+declare class IoIosRecordingOutline extends React.Component<IconBaseProps> { }
+export = IoIosRecordingOutline;
diff --git a/types/react-icons/lib/io/ios-recording.d.ts b/types/react-icons/lib/io/ios-recording.d.ts
index 77d0e299cd..41f43eb0d2 100644
--- a/types/react-icons/lib/io/ios-recording.d.ts
+++ b/types/react-icons/lib/io/ios-recording.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRecording extends React.Component<IconBaseProps> { }
+declare class IoIosRecording extends React.Component<IconBaseProps> { }
+export = IoIosRecording;
diff --git a/types/react-icons/lib/io/ios-redo-outline.d.ts b/types/react-icons/lib/io/ios-redo-outline.d.ts
index 47bae67c99..5223876ed7 100644
--- a/types/react-icons/lib/io/ios-redo-outline.d.ts
+++ b/types/react-icons/lib/io/ios-redo-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRedoOutline extends React.Component<IconBaseProps> { }
+declare class IoIosRedoOutline extends React.Component<IconBaseProps> { }
+export = IoIosRedoOutline;
diff --git a/types/react-icons/lib/io/ios-redo.d.ts b/types/react-icons/lib/io/ios-redo.d.ts
index 0935996be6..cd7edf5608 100644
--- a/types/react-icons/lib/io/ios-redo.d.ts
+++ b/types/react-icons/lib/io/ios-redo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRedo extends React.Component<IconBaseProps> { }
+declare class IoIosRedo extends React.Component<IconBaseProps> { }
+export = IoIosRedo;
diff --git a/types/react-icons/lib/io/ios-refresh-empty.d.ts b/types/react-icons/lib/io/ios-refresh-empty.d.ts
index 0e7f151339..52cf8d00f7 100644
--- a/types/react-icons/lib/io/ios-refresh-empty.d.ts
+++ b/types/react-icons/lib/io/ios-refresh-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefreshEmpty extends React.Component<IconBaseProps> { }
+declare class IoIosRefreshEmpty extends React.Component<IconBaseProps> { }
+export = IoIosRefreshEmpty;
diff --git a/types/react-icons/lib/io/ios-refresh-outline.d.ts b/types/react-icons/lib/io/ios-refresh-outline.d.ts
index 7679405065..f9678f6488 100644
--- a/types/react-icons/lib/io/ios-refresh-outline.d.ts
+++ b/types/react-icons/lib/io/ios-refresh-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefreshOutline extends React.Component<IconBaseProps> { }
+declare class IoIosRefreshOutline extends React.Component<IconBaseProps> { }
+export = IoIosRefreshOutline;
diff --git a/types/react-icons/lib/io/ios-refresh.d.ts b/types/react-icons/lib/io/ios-refresh.d.ts
index 420affa507..303ee2a427 100644
--- a/types/react-icons/lib/io/ios-refresh.d.ts
+++ b/types/react-icons/lib/io/ios-refresh.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefresh extends React.Component<IconBaseProps> { }
+declare class IoIosRefresh extends React.Component<IconBaseProps> { }
+export = IoIosRefresh;
diff --git a/types/react-icons/lib/io/ios-reload.d.ts b/types/react-icons/lib/io/ios-reload.d.ts
index 93e947db67..2a82caa3db 100644
--- a/types/react-icons/lib/io/ios-reload.d.ts
+++ b/types/react-icons/lib/io/ios-reload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReload extends React.Component<IconBaseProps> { }
+declare class IoIosReload extends React.Component<IconBaseProps> { }
+export = IoIosReload;
diff --git a/types/react-icons/lib/io/ios-reverse-camera-outline.d.ts b/types/react-icons/lib/io/ios-reverse-camera-outline.d.ts
index 808d6ca0bf..1e3f277186 100644
--- a/types/react-icons/lib/io/ios-reverse-camera-outline.d.ts
+++ b/types/react-icons/lib/io/ios-reverse-camera-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReverseCameraOutline extends React.Component<IconBaseProps> { }
+declare class IoIosReverseCameraOutline extends React.Component<IconBaseProps> { }
+export = IoIosReverseCameraOutline;
diff --git a/types/react-icons/lib/io/ios-reverse-camera.d.ts b/types/react-icons/lib/io/ios-reverse-camera.d.ts
index 0e74f82ab0..ea5a99cf35 100644
--- a/types/react-icons/lib/io/ios-reverse-camera.d.ts
+++ b/types/react-icons/lib/io/ios-reverse-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReverseCamera extends React.Component<IconBaseProps> { }
+declare class IoIosReverseCamera extends React.Component<IconBaseProps> { }
+export = IoIosReverseCamera;
diff --git a/types/react-icons/lib/io/ios-rewind-outline.d.ts b/types/react-icons/lib/io/ios-rewind-outline.d.ts
index dfc69fc86d..8c4435f4e3 100644
--- a/types/react-icons/lib/io/ios-rewind-outline.d.ts
+++ b/types/react-icons/lib/io/ios-rewind-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRewindOutline extends React.Component<IconBaseProps> { }
+declare class IoIosRewindOutline extends React.Component<IconBaseProps> { }
+export = IoIosRewindOutline;
diff --git a/types/react-icons/lib/io/ios-rewind.d.ts b/types/react-icons/lib/io/ios-rewind.d.ts
index 7f883de8bf..01793439e9 100644
--- a/types/react-icons/lib/io/ios-rewind.d.ts
+++ b/types/react-icons/lib/io/ios-rewind.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRewind extends React.Component<IconBaseProps> { }
+declare class IoIosRewind extends React.Component<IconBaseProps> { }
+export = IoIosRewind;
diff --git a/types/react-icons/lib/io/ios-rose-outline.d.ts b/types/react-icons/lib/io/ios-rose-outline.d.ts
index dc112023a5..5fb990a6e0 100644
--- a/types/react-icons/lib/io/ios-rose-outline.d.ts
+++ b/types/react-icons/lib/io/ios-rose-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRoseOutline extends React.Component<IconBaseProps> { }
+declare class IoIosRoseOutline extends React.Component<IconBaseProps> { }
+export = IoIosRoseOutline;
diff --git a/types/react-icons/lib/io/ios-rose.d.ts b/types/react-icons/lib/io/ios-rose.d.ts
index 8cd590321f..d7764d477a 100644
--- a/types/react-icons/lib/io/ios-rose.d.ts
+++ b/types/react-icons/lib/io/ios-rose.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRose extends React.Component<IconBaseProps> { }
+declare class IoIosRose extends React.Component<IconBaseProps> { }
+export = IoIosRose;
diff --git a/types/react-icons/lib/io/ios-search-strong.d.ts b/types/react-icons/lib/io/ios-search-strong.d.ts
index 3b0ab67ed2..b182f713a2 100644
--- a/types/react-icons/lib/io/ios-search-strong.d.ts
+++ b/types/react-icons/lib/io/ios-search-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSearchStrong extends React.Component<IconBaseProps> { }
+declare class IoIosSearchStrong extends React.Component<IconBaseProps> { }
+export = IoIosSearchStrong;
diff --git a/types/react-icons/lib/io/ios-search.d.ts b/types/react-icons/lib/io/ios-search.d.ts
index bd95701f4d..e1a76af33b 100644
--- a/types/react-icons/lib/io/ios-search.d.ts
+++ b/types/react-icons/lib/io/ios-search.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSearch extends React.Component<IconBaseProps> { }
+declare class IoIosSearch extends React.Component<IconBaseProps> { }
+export = IoIosSearch;
diff --git a/types/react-icons/lib/io/ios-settings-strong.d.ts b/types/react-icons/lib/io/ios-settings-strong.d.ts
index 0bb6ef49aa..cdd4bb5c03 100644
--- a/types/react-icons/lib/io/ios-settings-strong.d.ts
+++ b/types/react-icons/lib/io/ios-settings-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSettingsStrong extends React.Component<IconBaseProps> { }
+declare class IoIosSettingsStrong extends React.Component<IconBaseProps> { }
+export = IoIosSettingsStrong;
diff --git a/types/react-icons/lib/io/ios-settings.d.ts b/types/react-icons/lib/io/ios-settings.d.ts
index 26ff75fb04..76ac7176fb 100644
--- a/types/react-icons/lib/io/ios-settings.d.ts
+++ b/types/react-icons/lib/io/ios-settings.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSettings extends React.Component<IconBaseProps> { }
+declare class IoIosSettings extends React.Component<IconBaseProps> { }
+export = IoIosSettings;
diff --git a/types/react-icons/lib/io/ios-shuffle-strong.d.ts b/types/react-icons/lib/io/ios-shuffle-strong.d.ts
index 15d2841c2f..6868edf37d 100644
--- a/types/react-icons/lib/io/ios-shuffle-strong.d.ts
+++ b/types/react-icons/lib/io/ios-shuffle-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosShuffleStrong extends React.Component<IconBaseProps> { }
+declare class IoIosShuffleStrong extends React.Component<IconBaseProps> { }
+export = IoIosShuffleStrong;
diff --git a/types/react-icons/lib/io/ios-shuffle.d.ts b/types/react-icons/lib/io/ios-shuffle.d.ts
index 305b4ff79b..e06f262339 100644
--- a/types/react-icons/lib/io/ios-shuffle.d.ts
+++ b/types/react-icons/lib/io/ios-shuffle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosShuffle extends React.Component<IconBaseProps> { }
+declare class IoIosShuffle extends React.Component<IconBaseProps> { }
+export = IoIosShuffle;
diff --git a/types/react-icons/lib/io/ios-skipbackward-outline.d.ts b/types/react-icons/lib/io/ios-skipbackward-outline.d.ts
index fa9db170bd..f9a71c7bcf 100644
--- a/types/react-icons/lib/io/ios-skipbackward-outline.d.ts
+++ b/types/react-icons/lib/io/ios-skipbackward-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipbackwardOutline extends React.Component<IconBaseProps> { }
+declare class IoIosSkipbackwardOutline extends React.Component<IconBaseProps> { }
+export = IoIosSkipbackwardOutline;
diff --git a/types/react-icons/lib/io/ios-skipbackward.d.ts b/types/react-icons/lib/io/ios-skipbackward.d.ts
index d9b009ed49..48e13dc7ad 100644
--- a/types/react-icons/lib/io/ios-skipbackward.d.ts
+++ b/types/react-icons/lib/io/ios-skipbackward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipbackward extends React.Component<IconBaseProps> { }
+declare class IoIosSkipbackward extends React.Component<IconBaseProps> { }
+export = IoIosSkipbackward;
diff --git a/types/react-icons/lib/io/ios-skipforward-outline.d.ts b/types/react-icons/lib/io/ios-skipforward-outline.d.ts
index 63c174f6b2..3d9f4bbb95 100644
--- a/types/react-icons/lib/io/ios-skipforward-outline.d.ts
+++ b/types/react-icons/lib/io/ios-skipforward-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipforwardOutline extends React.Component<IconBaseProps> { }
+declare class IoIosSkipforwardOutline extends React.Component<IconBaseProps> { }
+export = IoIosSkipforwardOutline;
diff --git a/types/react-icons/lib/io/ios-skipforward.d.ts b/types/react-icons/lib/io/ios-skipforward.d.ts
index 39ce459a57..7ffc3c5e45 100644
--- a/types/react-icons/lib/io/ios-skipforward.d.ts
+++ b/types/react-icons/lib/io/ios-skipforward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipforward extends React.Component<IconBaseProps> { }
+declare class IoIosSkipforward extends React.Component<IconBaseProps> { }
+export = IoIosSkipforward;
diff --git a/types/react-icons/lib/io/ios-snowy.d.ts b/types/react-icons/lib/io/ios-snowy.d.ts
index f55f087752..c142557efd 100644
--- a/types/react-icons/lib/io/ios-snowy.d.ts
+++ b/types/react-icons/lib/io/ios-snowy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSnowy extends React.Component<IconBaseProps> { }
+declare class IoIosSnowy extends React.Component<IconBaseProps> { }
+export = IoIosSnowy;
diff --git a/types/react-icons/lib/io/ios-speedometer-outline.d.ts b/types/react-icons/lib/io/ios-speedometer-outline.d.ts
index b0263dc761..fe30530881 100644
--- a/types/react-icons/lib/io/ios-speedometer-outline.d.ts
+++ b/types/react-icons/lib/io/ios-speedometer-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSpeedometerOutline extends React.Component<IconBaseProps> { }
+declare class IoIosSpeedometerOutline extends React.Component<IconBaseProps> { }
+export = IoIosSpeedometerOutline;
diff --git a/types/react-icons/lib/io/ios-speedometer.d.ts b/types/react-icons/lib/io/ios-speedometer.d.ts
index f5d6862d1a..57bde6cf81 100644
--- a/types/react-icons/lib/io/ios-speedometer.d.ts
+++ b/types/react-icons/lib/io/ios-speedometer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSpeedometer extends React.Component<IconBaseProps> { }
+declare class IoIosSpeedometer extends React.Component<IconBaseProps> { }
+export = IoIosSpeedometer;
diff --git a/types/react-icons/lib/io/ios-star-half.d.ts b/types/react-icons/lib/io/ios-star-half.d.ts
index 03adf4a4d2..8654211883 100644
--- a/types/react-icons/lib/io/ios-star-half.d.ts
+++ b/types/react-icons/lib/io/ios-star-half.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStarHalf extends React.Component<IconBaseProps> { }
+declare class IoIosStarHalf extends React.Component<IconBaseProps> { }
+export = IoIosStarHalf;
diff --git a/types/react-icons/lib/io/ios-star-outline.d.ts b/types/react-icons/lib/io/ios-star-outline.d.ts
index 61dfe85fc1..96a337becf 100644
--- a/types/react-icons/lib/io/ios-star-outline.d.ts
+++ b/types/react-icons/lib/io/ios-star-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStarOutline extends React.Component<IconBaseProps> { }
+declare class IoIosStarOutline extends React.Component<IconBaseProps> { }
+export = IoIosStarOutline;
diff --git a/types/react-icons/lib/io/ios-star.d.ts b/types/react-icons/lib/io/ios-star.d.ts
index 763d68d34c..4187ae15ff 100644
--- a/types/react-icons/lib/io/ios-star.d.ts
+++ b/types/react-icons/lib/io/ios-star.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStar extends React.Component<IconBaseProps> { }
+declare class IoIosStar extends React.Component<IconBaseProps> { }
+export = IoIosStar;
diff --git a/types/react-icons/lib/io/ios-stopwatch-outline.d.ts b/types/react-icons/lib/io/ios-stopwatch-outline.d.ts
index 73a9091d13..0486f760d2 100644
--- a/types/react-icons/lib/io/ios-stopwatch-outline.d.ts
+++ b/types/react-icons/lib/io/ios-stopwatch-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStopwatchOutline extends React.Component<IconBaseProps> { }
+declare class IoIosStopwatchOutline extends React.Component<IconBaseProps> { }
+export = IoIosStopwatchOutline;
diff --git a/types/react-icons/lib/io/ios-stopwatch.d.ts b/types/react-icons/lib/io/ios-stopwatch.d.ts
index 27bf6e3b40..b2d9823c11 100644
--- a/types/react-icons/lib/io/ios-stopwatch.d.ts
+++ b/types/react-icons/lib/io/ios-stopwatch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStopwatch extends React.Component<IconBaseProps> { }
+declare class IoIosStopwatch extends React.Component<IconBaseProps> { }
+export = IoIosStopwatch;
diff --git a/types/react-icons/lib/io/ios-sunny-outline.d.ts b/types/react-icons/lib/io/ios-sunny-outline.d.ts
index 6c1f62f799..8638d5a738 100644
--- a/types/react-icons/lib/io/ios-sunny-outline.d.ts
+++ b/types/react-icons/lib/io/ios-sunny-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSunnyOutline extends React.Component<IconBaseProps> { }
+declare class IoIosSunnyOutline extends React.Component<IconBaseProps> { }
+export = IoIosSunnyOutline;
diff --git a/types/react-icons/lib/io/ios-sunny.d.ts b/types/react-icons/lib/io/ios-sunny.d.ts
index e570cdf17c..3993cf8f2e 100644
--- a/types/react-icons/lib/io/ios-sunny.d.ts
+++ b/types/react-icons/lib/io/ios-sunny.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSunny extends React.Component<IconBaseProps> { }
+declare class IoIosSunny extends React.Component<IconBaseProps> { }
+export = IoIosSunny;
diff --git a/types/react-icons/lib/io/ios-telephone-outline.d.ts b/types/react-icons/lib/io/ios-telephone-outline.d.ts
index 91d22539d0..9566ebbe70 100644
--- a/types/react-icons/lib/io/ios-telephone-outline.d.ts
+++ b/types/react-icons/lib/io/ios-telephone-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTelephoneOutline extends React.Component<IconBaseProps> { }
+declare class IoIosTelephoneOutline extends React.Component<IconBaseProps> { }
+export = IoIosTelephoneOutline;
diff --git a/types/react-icons/lib/io/ios-telephone.d.ts b/types/react-icons/lib/io/ios-telephone.d.ts
index 349826b187..6e8b47eacf 100644
--- a/types/react-icons/lib/io/ios-telephone.d.ts
+++ b/types/react-icons/lib/io/ios-telephone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTelephone extends React.Component<IconBaseProps> { }
+declare class IoIosTelephone extends React.Component<IconBaseProps> { }
+export = IoIosTelephone;
diff --git a/types/react-icons/lib/io/ios-tennisball-outline.d.ts b/types/react-icons/lib/io/ios-tennisball-outline.d.ts
index df889878d4..469243b80e 100644
--- a/types/react-icons/lib/io/ios-tennisball-outline.d.ts
+++ b/types/react-icons/lib/io/ios-tennisball-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTennisballOutline extends React.Component<IconBaseProps> { }
+declare class IoIosTennisballOutline extends React.Component<IconBaseProps> { }
+export = IoIosTennisballOutline;
diff --git a/types/react-icons/lib/io/ios-tennisball.d.ts b/types/react-icons/lib/io/ios-tennisball.d.ts
index 177485e5ea..eb0fa83b49 100644
--- a/types/react-icons/lib/io/ios-tennisball.d.ts
+++ b/types/react-icons/lib/io/ios-tennisball.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTennisball extends React.Component<IconBaseProps> { }
+declare class IoIosTennisball extends React.Component<IconBaseProps> { }
+export = IoIosTennisball;
diff --git a/types/react-icons/lib/io/ios-thunderstorm-outline.d.ts b/types/react-icons/lib/io/ios-thunderstorm-outline.d.ts
index ac3f8120a7..8d977d2ebe 100644
--- a/types/react-icons/lib/io/ios-thunderstorm-outline.d.ts
+++ b/types/react-icons/lib/io/ios-thunderstorm-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosThunderstormOutline extends React.Component<IconBaseProps> { }
+declare class IoIosThunderstormOutline extends React.Component<IconBaseProps> { }
+export = IoIosThunderstormOutline;
diff --git a/types/react-icons/lib/io/ios-thunderstorm.d.ts b/types/react-icons/lib/io/ios-thunderstorm.d.ts
index 9612dc49cc..fee0ea6196 100644
--- a/types/react-icons/lib/io/ios-thunderstorm.d.ts
+++ b/types/react-icons/lib/io/ios-thunderstorm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosThunderstorm extends React.Component<IconBaseProps> { }
+declare class IoIosThunderstorm extends React.Component<IconBaseProps> { }
+export = IoIosThunderstorm;
diff --git a/types/react-icons/lib/io/ios-time-outline.d.ts b/types/react-icons/lib/io/ios-time-outline.d.ts
index 8067387f05..cb363cf705 100644
--- a/types/react-icons/lib/io/ios-time-outline.d.ts
+++ b/types/react-icons/lib/io/ios-time-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimeOutline extends React.Component<IconBaseProps> { }
+declare class IoIosTimeOutline extends React.Component<IconBaseProps> { }
+export = IoIosTimeOutline;
diff --git a/types/react-icons/lib/io/ios-time.d.ts b/types/react-icons/lib/io/ios-time.d.ts
index cdc944bd0b..f0695cc3e2 100644
--- a/types/react-icons/lib/io/ios-time.d.ts
+++ b/types/react-icons/lib/io/ios-time.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTime extends React.Component<IconBaseProps> { }
+declare class IoIosTime extends React.Component<IconBaseProps> { }
+export = IoIosTime;
diff --git a/types/react-icons/lib/io/ios-timer-outline.d.ts b/types/react-icons/lib/io/ios-timer-outline.d.ts
index 21b2cdca0f..901b60f19e 100644
--- a/types/react-icons/lib/io/ios-timer-outline.d.ts
+++ b/types/react-icons/lib/io/ios-timer-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimerOutline extends React.Component<IconBaseProps> { }
+declare class IoIosTimerOutline extends React.Component<IconBaseProps> { }
+export = IoIosTimerOutline;
diff --git a/types/react-icons/lib/io/ios-timer.d.ts b/types/react-icons/lib/io/ios-timer.d.ts
index 729f3f79d4..5f1b5b7583 100644
--- a/types/react-icons/lib/io/ios-timer.d.ts
+++ b/types/react-icons/lib/io/ios-timer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimer extends React.Component<IconBaseProps> { }
+declare class IoIosTimer extends React.Component<IconBaseProps> { }
+export = IoIosTimer;
diff --git a/types/react-icons/lib/io/ios-toggle-outline.d.ts b/types/react-icons/lib/io/ios-toggle-outline.d.ts
index fa23191d8c..9e6db326b7 100644
--- a/types/react-icons/lib/io/ios-toggle-outline.d.ts
+++ b/types/react-icons/lib/io/ios-toggle-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosToggleOutline extends React.Component<IconBaseProps> { }
+declare class IoIosToggleOutline extends React.Component<IconBaseProps> { }
+export = IoIosToggleOutline;
diff --git a/types/react-icons/lib/io/ios-toggle.d.ts b/types/react-icons/lib/io/ios-toggle.d.ts
index e01579ec53..0cb2bec203 100644
--- a/types/react-icons/lib/io/ios-toggle.d.ts
+++ b/types/react-icons/lib/io/ios-toggle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosToggle extends React.Component<IconBaseProps> { }
+declare class IoIosToggle extends React.Component<IconBaseProps> { }
+export = IoIosToggle;
diff --git a/types/react-icons/lib/io/ios-trash-outline.d.ts b/types/react-icons/lib/io/ios-trash-outline.d.ts
index 55412f0ae2..87f7970799 100644
--- a/types/react-icons/lib/io/ios-trash-outline.d.ts
+++ b/types/react-icons/lib/io/ios-trash-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTrashOutline extends React.Component<IconBaseProps> { }
+declare class IoIosTrashOutline extends React.Component<IconBaseProps> { }
+export = IoIosTrashOutline;
diff --git a/types/react-icons/lib/io/ios-trash.d.ts b/types/react-icons/lib/io/ios-trash.d.ts
index 296e42671e..41ae428e61 100644
--- a/types/react-icons/lib/io/ios-trash.d.ts
+++ b/types/react-icons/lib/io/ios-trash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTrash extends React.Component<IconBaseProps> { }
+declare class IoIosTrash extends React.Component<IconBaseProps> { }
+export = IoIosTrash;
diff --git a/types/react-icons/lib/io/ios-undo-outline.d.ts b/types/react-icons/lib/io/ios-undo-outline.d.ts
index 093074d857..f4c5958de8 100644
--- a/types/react-icons/lib/io/ios-undo-outline.d.ts
+++ b/types/react-icons/lib/io/ios-undo-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUndoOutline extends React.Component<IconBaseProps> { }
+declare class IoIosUndoOutline extends React.Component<IconBaseProps> { }
+export = IoIosUndoOutline;
diff --git a/types/react-icons/lib/io/ios-undo.d.ts b/types/react-icons/lib/io/ios-undo.d.ts
index 4bcdef2e88..6f17b7375b 100644
--- a/types/react-icons/lib/io/ios-undo.d.ts
+++ b/types/react-icons/lib/io/ios-undo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUndo extends React.Component<IconBaseProps> { }
+declare class IoIosUndo extends React.Component<IconBaseProps> { }
+export = IoIosUndo;
diff --git a/types/react-icons/lib/io/ios-unlocked-outline.d.ts b/types/react-icons/lib/io/ios-unlocked-outline.d.ts
index d14b0f7ffc..950ada1a97 100644
--- a/types/react-icons/lib/io/ios-unlocked-outline.d.ts
+++ b/types/react-icons/lib/io/ios-unlocked-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUnlockedOutline extends React.Component<IconBaseProps> { }
+declare class IoIosUnlockedOutline extends React.Component<IconBaseProps> { }
+export = IoIosUnlockedOutline;
diff --git a/types/react-icons/lib/io/ios-unlocked.d.ts b/types/react-icons/lib/io/ios-unlocked.d.ts
index d873e5f8d1..d7c8ac1110 100644
--- a/types/react-icons/lib/io/ios-unlocked.d.ts
+++ b/types/react-icons/lib/io/ios-unlocked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUnlocked extends React.Component<IconBaseProps> { }
+declare class IoIosUnlocked extends React.Component<IconBaseProps> { }
+export = IoIosUnlocked;
diff --git a/types/react-icons/lib/io/ios-upload-outline.d.ts b/types/react-icons/lib/io/ios-upload-outline.d.ts
index 5f397a2bd8..04dd2108f5 100644
--- a/types/react-icons/lib/io/ios-upload-outline.d.ts
+++ b/types/react-icons/lib/io/ios-upload-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUploadOutline extends React.Component<IconBaseProps> { }
+declare class IoIosUploadOutline extends React.Component<IconBaseProps> { }
+export = IoIosUploadOutline;
diff --git a/types/react-icons/lib/io/ios-upload.d.ts b/types/react-icons/lib/io/ios-upload.d.ts
index 5b9acf6b9c..355a35d459 100644
--- a/types/react-icons/lib/io/ios-upload.d.ts
+++ b/types/react-icons/lib/io/ios-upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUpload extends React.Component<IconBaseProps> { }
+declare class IoIosUpload extends React.Component<IconBaseProps> { }
+export = IoIosUpload;
diff --git a/types/react-icons/lib/io/ios-videocam-outline.d.ts b/types/react-icons/lib/io/ios-videocam-outline.d.ts
index 96fac95c0e..e530729768 100644
--- a/types/react-icons/lib/io/ios-videocam-outline.d.ts
+++ b/types/react-icons/lib/io/ios-videocam-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVideocamOutline extends React.Component<IconBaseProps> { }
+declare class IoIosVideocamOutline extends React.Component<IconBaseProps> { }
+export = IoIosVideocamOutline;
diff --git a/types/react-icons/lib/io/ios-videocam.d.ts b/types/react-icons/lib/io/ios-videocam.d.ts
index a55ede9155..816ebb388b 100644
--- a/types/react-icons/lib/io/ios-videocam.d.ts
+++ b/types/react-icons/lib/io/ios-videocam.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVideocam extends React.Component<IconBaseProps> { }
+declare class IoIosVideocam extends React.Component<IconBaseProps> { }
+export = IoIosVideocam;
diff --git a/types/react-icons/lib/io/ios-volume-high.d.ts b/types/react-icons/lib/io/ios-volume-high.d.ts
index 9ae46e1936..9995c03916 100644
--- a/types/react-icons/lib/io/ios-volume-high.d.ts
+++ b/types/react-icons/lib/io/ios-volume-high.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVolumeHigh extends React.Component<IconBaseProps> { }
+declare class IoIosVolumeHigh extends React.Component<IconBaseProps> { }
+export = IoIosVolumeHigh;
diff --git a/types/react-icons/lib/io/ios-volume-low.d.ts b/types/react-icons/lib/io/ios-volume-low.d.ts
index 402ee999cb..829e862b24 100644
--- a/types/react-icons/lib/io/ios-volume-low.d.ts
+++ b/types/react-icons/lib/io/ios-volume-low.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVolumeLow extends React.Component<IconBaseProps> { }
+declare class IoIosVolumeLow extends React.Component<IconBaseProps> { }
+export = IoIosVolumeLow;
diff --git a/types/react-icons/lib/io/ios-wineglass-outline.d.ts b/types/react-icons/lib/io/ios-wineglass-outline.d.ts
index 3e34e8f73d..f4bf78ca4e 100644
--- a/types/react-icons/lib/io/ios-wineglass-outline.d.ts
+++ b/types/react-icons/lib/io/ios-wineglass-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWineglassOutline extends React.Component<IconBaseProps> { }
+declare class IoIosWineglassOutline extends React.Component<IconBaseProps> { }
+export = IoIosWineglassOutline;
diff --git a/types/react-icons/lib/io/ios-wineglass.d.ts b/types/react-icons/lib/io/ios-wineglass.d.ts
index aaf3e6bd56..af091597cc 100644
--- a/types/react-icons/lib/io/ios-wineglass.d.ts
+++ b/types/react-icons/lib/io/ios-wineglass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWineglass extends React.Component<IconBaseProps> { }
+declare class IoIosWineglass extends React.Component<IconBaseProps> { }
+export = IoIosWineglass;
diff --git a/types/react-icons/lib/io/ios-world-outline.d.ts b/types/react-icons/lib/io/ios-world-outline.d.ts
index 4b5d4ab7b1..55e2b6d7e8 100644
--- a/types/react-icons/lib/io/ios-world-outline.d.ts
+++ b/types/react-icons/lib/io/ios-world-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWorldOutline extends React.Component<IconBaseProps> { }
+declare class IoIosWorldOutline extends React.Component<IconBaseProps> { }
+export = IoIosWorldOutline;
diff --git a/types/react-icons/lib/io/ios-world.d.ts b/types/react-icons/lib/io/ios-world.d.ts
index 6a2b5a3392..c00b081e91 100644
--- a/types/react-icons/lib/io/ios-world.d.ts
+++ b/types/react-icons/lib/io/ios-world.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWorld extends React.Component<IconBaseProps> { }
+declare class IoIosWorld extends React.Component<IconBaseProps> { }
+export = IoIosWorld;
diff --git a/types/react-icons/lib/io/ipad.d.ts b/types/react-icons/lib/io/ipad.d.ts
index 5f534f3a70..97ef83ed9f 100644
--- a/types/react-icons/lib/io/ipad.d.ts
+++ b/types/react-icons/lib/io/ipad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIpad extends React.Component<IconBaseProps> { }
+declare class IoIpad extends React.Component<IconBaseProps> { }
+export = IoIpad;
diff --git a/types/react-icons/lib/io/iphone.d.ts b/types/react-icons/lib/io/iphone.d.ts
index 4b4fc084d6..068e6d873f 100644
--- a/types/react-icons/lib/io/iphone.d.ts
+++ b/types/react-icons/lib/io/iphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIphone extends React.Component<IconBaseProps> { }
+declare class IoIphone extends React.Component<IconBaseProps> { }
+export = IoIphone;
diff --git a/types/react-icons/lib/io/ipod.d.ts b/types/react-icons/lib/io/ipod.d.ts
index 793b8f7f92..d88bcfd2e8 100644
--- a/types/react-icons/lib/io/ipod.d.ts
+++ b/types/react-icons/lib/io/ipod.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIpod extends React.Component<IconBaseProps> { }
+declare class IoIpod extends React.Component<IconBaseProps> { }
+export = IoIpod;
diff --git a/types/react-icons/lib/io/jet.d.ts b/types/react-icons/lib/io/jet.d.ts
index 7f8ef429e2..c5a5d952d4 100644
--- a/types/react-icons/lib/io/jet.d.ts
+++ b/types/react-icons/lib/io/jet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoJet extends React.Component<IconBaseProps> { }
+declare class IoJet extends React.Component<IconBaseProps> { }
+export = IoJet;
diff --git a/types/react-icons/lib/io/key.d.ts b/types/react-icons/lib/io/key.d.ts
index 8a84a24518..603fe5ce7f 100644
--- a/types/react-icons/lib/io/key.d.ts
+++ b/types/react-icons/lib/io/key.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoKey extends React.Component<IconBaseProps> { }
+declare class IoKey extends React.Component<IconBaseProps> { }
+export = IoKey;
diff --git a/types/react-icons/lib/io/knife.d.ts b/types/react-icons/lib/io/knife.d.ts
index f9683f399b..9318e4eaef 100644
--- a/types/react-icons/lib/io/knife.d.ts
+++ b/types/react-icons/lib/io/knife.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoKnife extends React.Component<IconBaseProps> { }
+declare class IoKnife extends React.Component<IconBaseProps> { }
+export = IoKnife;
diff --git a/types/react-icons/lib/io/laptop.d.ts b/types/react-icons/lib/io/laptop.d.ts
index ffd3252609..51c058f363 100644
--- a/types/react-icons/lib/io/laptop.d.ts
+++ b/types/react-icons/lib/io/laptop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLaptop extends React.Component<IconBaseProps> { }
+declare class IoLaptop extends React.Component<IconBaseProps> { }
+export = IoLaptop;
diff --git a/types/react-icons/lib/io/leaf.d.ts b/types/react-icons/lib/io/leaf.d.ts
index bc0235a24a..19203a67de 100644
--- a/types/react-icons/lib/io/leaf.d.ts
+++ b/types/react-icons/lib/io/leaf.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLeaf extends React.Component<IconBaseProps> { }
+declare class IoLeaf extends React.Component<IconBaseProps> { }
+export = IoLeaf;
diff --git a/types/react-icons/lib/io/levels.d.ts b/types/react-icons/lib/io/levels.d.ts
index 0bd2e2c1e9..5638dc6579 100644
--- a/types/react-icons/lib/io/levels.d.ts
+++ b/types/react-icons/lib/io/levels.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLevels extends React.Component<IconBaseProps> { }
+declare class IoLevels extends React.Component<IconBaseProps> { }
+export = IoLevels;
diff --git a/types/react-icons/lib/io/lightbulb.d.ts b/types/react-icons/lib/io/lightbulb.d.ts
index c16e16a2fa..af434a2ba2 100644
--- a/types/react-icons/lib/io/lightbulb.d.ts
+++ b/types/react-icons/lib/io/lightbulb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLightbulb extends React.Component<IconBaseProps> { }
+declare class IoLightbulb extends React.Component<IconBaseProps> { }
+export = IoLightbulb;
diff --git a/types/react-icons/lib/io/link.d.ts b/types/react-icons/lib/io/link.d.ts
index c0c376d736..fddbe7cb56 100644
--- a/types/react-icons/lib/io/link.d.ts
+++ b/types/react-icons/lib/io/link.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLink extends React.Component<IconBaseProps> { }
+declare class IoLink extends React.Component<IconBaseProps> { }
+export = IoLink;
diff --git a/types/react-icons/lib/io/load-a.d.ts b/types/react-icons/lib/io/load-a.d.ts
index bf0b3ec100..f82360e687 100644
--- a/types/react-icons/lib/io/load-a.d.ts
+++ b/types/react-icons/lib/io/load-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadA extends React.Component<IconBaseProps> { }
+declare class IoLoadA extends React.Component<IconBaseProps> { }
+export = IoLoadA;
diff --git a/types/react-icons/lib/io/load-b.d.ts b/types/react-icons/lib/io/load-b.d.ts
index 85dcae989a..65baa4d442 100644
--- a/types/react-icons/lib/io/load-b.d.ts
+++ b/types/react-icons/lib/io/load-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadB extends React.Component<IconBaseProps> { }
+declare class IoLoadB extends React.Component<IconBaseProps> { }
+export = IoLoadB;
diff --git a/types/react-icons/lib/io/load-c.d.ts b/types/react-icons/lib/io/load-c.d.ts
index 733dff4bfa..7c74e2c274 100644
--- a/types/react-icons/lib/io/load-c.d.ts
+++ b/types/react-icons/lib/io/load-c.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadC extends React.Component<IconBaseProps> { }
+declare class IoLoadC extends React.Component<IconBaseProps> { }
+export = IoLoadC;
diff --git a/types/react-icons/lib/io/load-d.d.ts b/types/react-icons/lib/io/load-d.d.ts
index 160d71b383..36c6555c24 100644
--- a/types/react-icons/lib/io/load-d.d.ts
+++ b/types/react-icons/lib/io/load-d.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadD extends React.Component<IconBaseProps> { }
+declare class IoLoadD extends React.Component<IconBaseProps> { }
+export = IoLoadD;
diff --git a/types/react-icons/lib/io/location.d.ts b/types/react-icons/lib/io/location.d.ts
index 04e657adc4..8726374947 100644
--- a/types/react-icons/lib/io/location.d.ts
+++ b/types/react-icons/lib/io/location.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLocation extends React.Component<IconBaseProps> { }
+declare class IoLocation extends React.Component<IconBaseProps> { }
+export = IoLocation;
diff --git a/types/react-icons/lib/io/lock-combination.d.ts b/types/react-icons/lib/io/lock-combination.d.ts
index d25e21ded1..b3f04cc24f 100644
--- a/types/react-icons/lib/io/lock-combination.d.ts
+++ b/types/react-icons/lib/io/lock-combination.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLockCombination extends React.Component<IconBaseProps> { }
+declare class IoLockCombination extends React.Component<IconBaseProps> { }
+export = IoLockCombination;
diff --git a/types/react-icons/lib/io/locked.d.ts b/types/react-icons/lib/io/locked.d.ts
index db82275a8e..b3a945c76d 100644
--- a/types/react-icons/lib/io/locked.d.ts
+++ b/types/react-icons/lib/io/locked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLocked extends React.Component<IconBaseProps> { }
+declare class IoLocked extends React.Component<IconBaseProps> { }
+export = IoLocked;
diff --git a/types/react-icons/lib/io/log-in.d.ts b/types/react-icons/lib/io/log-in.d.ts
index bb045baf8e..895a82e0c5 100644
--- a/types/react-icons/lib/io/log-in.d.ts
+++ b/types/react-icons/lib/io/log-in.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLogIn extends React.Component<IconBaseProps> { }
+declare class IoLogIn extends React.Component<IconBaseProps> { }
+export = IoLogIn;
diff --git a/types/react-icons/lib/io/log-out.d.ts b/types/react-icons/lib/io/log-out.d.ts
index 0374ff539d..70c0aa1a31 100644
--- a/types/react-icons/lib/io/log-out.d.ts
+++ b/types/react-icons/lib/io/log-out.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLogOut extends React.Component<IconBaseProps> { }
+declare class IoLogOut extends React.Component<IconBaseProps> { }
+export = IoLogOut;
diff --git a/types/react-icons/lib/io/loop.d.ts b/types/react-icons/lib/io/loop.d.ts
index 2f5d563c07..39d3bb6092 100644
--- a/types/react-icons/lib/io/loop.d.ts
+++ b/types/react-icons/lib/io/loop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoop extends React.Component<IconBaseProps> { }
+declare class IoLoop extends React.Component<IconBaseProps> { }
+export = IoLoop;
diff --git a/types/react-icons/lib/io/magnet.d.ts b/types/react-icons/lib/io/magnet.d.ts
index b8625a2ccf..8730d8a15e 100644
--- a/types/react-icons/lib/io/magnet.d.ts
+++ b/types/react-icons/lib/io/magnet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMagnet extends React.Component<IconBaseProps> { }
+declare class IoMagnet extends React.Component<IconBaseProps> { }
+export = IoMagnet;
diff --git a/types/react-icons/lib/io/male.d.ts b/types/react-icons/lib/io/male.d.ts
index 62bfbd5067..641a13b861 100644
--- a/types/react-icons/lib/io/male.d.ts
+++ b/types/react-icons/lib/io/male.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMale extends React.Component<IconBaseProps> { }
+declare class IoMale extends React.Component<IconBaseProps> { }
+export = IoMale;
diff --git a/types/react-icons/lib/io/man.d.ts b/types/react-icons/lib/io/man.d.ts
index 2770ac14e2..5c2f70ac23 100644
--- a/types/react-icons/lib/io/man.d.ts
+++ b/types/react-icons/lib/io/man.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMan extends React.Component<IconBaseProps> { }
+declare class IoMan extends React.Component<IconBaseProps> { }
+export = IoMan;
diff --git a/types/react-icons/lib/io/map.d.ts b/types/react-icons/lib/io/map.d.ts
index 4c48512de6..f00ba0c8a7 100644
--- a/types/react-icons/lib/io/map.d.ts
+++ b/types/react-icons/lib/io/map.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMap extends React.Component<IconBaseProps> { }
+declare class IoMap extends React.Component<IconBaseProps> { }
+export = IoMap;
diff --git a/types/react-icons/lib/io/medkit.d.ts b/types/react-icons/lib/io/medkit.d.ts
index e15728387c..eadeea513f 100644
--- a/types/react-icons/lib/io/medkit.d.ts
+++ b/types/react-icons/lib/io/medkit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMedkit extends React.Component<IconBaseProps> { }
+declare class IoMedkit extends React.Component<IconBaseProps> { }
+export = IoMedkit;
diff --git a/types/react-icons/lib/io/merge.d.ts b/types/react-icons/lib/io/merge.d.ts
index 6a41308d9b..60cc718787 100644
--- a/types/react-icons/lib/io/merge.d.ts
+++ b/types/react-icons/lib/io/merge.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMerge extends React.Component<IconBaseProps> { }
+declare class IoMerge extends React.Component<IconBaseProps> { }
+export = IoMerge;
diff --git a/types/react-icons/lib/io/mic-a.d.ts b/types/react-icons/lib/io/mic-a.d.ts
index c5cf11831d..ca862a054e 100644
--- a/types/react-icons/lib/io/mic-a.d.ts
+++ b/types/react-icons/lib/io/mic-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMicA extends React.Component<IconBaseProps> { }
+declare class IoMicA extends React.Component<IconBaseProps> { }
+export = IoMicA;
diff --git a/types/react-icons/lib/io/mic-b.d.ts b/types/react-icons/lib/io/mic-b.d.ts
index 68a0acf707..8c195c04c6 100644
--- a/types/react-icons/lib/io/mic-b.d.ts
+++ b/types/react-icons/lib/io/mic-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMicB extends React.Component<IconBaseProps> { }
+declare class IoMicB extends React.Component<IconBaseProps> { }
+export = IoMicB;
diff --git a/types/react-icons/lib/io/mic-c.d.ts b/types/react-icons/lib/io/mic-c.d.ts
index 2d8ddc3be6..0f490c8680 100644
--- a/types/react-icons/lib/io/mic-c.d.ts
+++ b/types/react-icons/lib/io/mic-c.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMicC extends React.Component<IconBaseProps> { }
+declare class IoMicC extends React.Component<IconBaseProps> { }
+export = IoMicC;
diff --git a/types/react-icons/lib/io/minus-circled.d.ts b/types/react-icons/lib/io/minus-circled.d.ts
index 1b5edd59e7..2e20d731a1 100644
--- a/types/react-icons/lib/io/minus-circled.d.ts
+++ b/types/react-icons/lib/io/minus-circled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMinusCircled extends React.Component<IconBaseProps> { }
+declare class IoMinusCircled extends React.Component<IconBaseProps> { }
+export = IoMinusCircled;
diff --git a/types/react-icons/lib/io/minus-round.d.ts b/types/react-icons/lib/io/minus-round.d.ts
index 1a75a9c5d4..e6363e0ab7 100644
--- a/types/react-icons/lib/io/minus-round.d.ts
+++ b/types/react-icons/lib/io/minus-round.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMinusRound extends React.Component<IconBaseProps> { }
+declare class IoMinusRound extends React.Component<IconBaseProps> { }
+export = IoMinusRound;
diff --git a/types/react-icons/lib/io/minus.d.ts b/types/react-icons/lib/io/minus.d.ts
index ee58f016db..5b0202abd2 100644
--- a/types/react-icons/lib/io/minus.d.ts
+++ b/types/react-icons/lib/io/minus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMinus extends React.Component<IconBaseProps> { }
+declare class IoMinus extends React.Component<IconBaseProps> { }
+export = IoMinus;
diff --git a/types/react-icons/lib/io/model-s.d.ts b/types/react-icons/lib/io/model-s.d.ts
index 567219cde6..7d9e3b5c77 100644
--- a/types/react-icons/lib/io/model-s.d.ts
+++ b/types/react-icons/lib/io/model-s.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoModelS extends React.Component<IconBaseProps> { }
+declare class IoModelS extends React.Component<IconBaseProps> { }
+export = IoModelS;
diff --git a/types/react-icons/lib/io/monitor.d.ts b/types/react-icons/lib/io/monitor.d.ts
index 3454bea09f..6c639ee9fe 100644
--- a/types/react-icons/lib/io/monitor.d.ts
+++ b/types/react-icons/lib/io/monitor.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMonitor extends React.Component<IconBaseProps> { }
+declare class IoMonitor extends React.Component<IconBaseProps> { }
+export = IoMonitor;
diff --git a/types/react-icons/lib/io/more.d.ts b/types/react-icons/lib/io/more.d.ts
index 2c528b5bae..b13a7f1141 100644
--- a/types/react-icons/lib/io/more.d.ts
+++ b/types/react-icons/lib/io/more.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMore extends React.Component<IconBaseProps> { }
+declare class IoMore extends React.Component<IconBaseProps> { }
+export = IoMore;
diff --git a/types/react-icons/lib/io/mouse.d.ts b/types/react-icons/lib/io/mouse.d.ts
index af862564ba..077fe8ddaf 100644
--- a/types/react-icons/lib/io/mouse.d.ts
+++ b/types/react-icons/lib/io/mouse.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMouse extends React.Component<IconBaseProps> { }
+declare class IoMouse extends React.Component<IconBaseProps> { }
+export = IoMouse;
diff --git a/types/react-icons/lib/io/music-note.d.ts b/types/react-icons/lib/io/music-note.d.ts
index 92875eb08a..eacac097b2 100644
--- a/types/react-icons/lib/io/music-note.d.ts
+++ b/types/react-icons/lib/io/music-note.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMusicNote extends React.Component<IconBaseProps> { }
+declare class IoMusicNote extends React.Component<IconBaseProps> { }
+export = IoMusicNote;
diff --git a/types/react-icons/lib/io/navicon-round.d.ts b/types/react-icons/lib/io/navicon-round.d.ts
index 5d1bc53526..6cc6ec5847 100644
--- a/types/react-icons/lib/io/navicon-round.d.ts
+++ b/types/react-icons/lib/io/navicon-round.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNaviconRound extends React.Component<IconBaseProps> { }
+declare class IoNaviconRound extends React.Component<IconBaseProps> { }
+export = IoNaviconRound;
diff --git a/types/react-icons/lib/io/navicon.d.ts b/types/react-icons/lib/io/navicon.d.ts
index cdae5d7238..5da09863ba 100644
--- a/types/react-icons/lib/io/navicon.d.ts
+++ b/types/react-icons/lib/io/navicon.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNavicon extends React.Component<IconBaseProps> { }
+declare class IoNavicon extends React.Component<IconBaseProps> { }
+export = IoNavicon;
diff --git a/types/react-icons/lib/io/navigate.d.ts b/types/react-icons/lib/io/navigate.d.ts
index 2fe67c17b2..aef1fb00a3 100644
--- a/types/react-icons/lib/io/navigate.d.ts
+++ b/types/react-icons/lib/io/navigate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNavigate extends React.Component<IconBaseProps> { }
+declare class IoNavigate extends React.Component<IconBaseProps> { }
+export = IoNavigate;
diff --git a/types/react-icons/lib/io/network.d.ts b/types/react-icons/lib/io/network.d.ts
index 359c0abbd2..f2d137e6d2 100644
--- a/types/react-icons/lib/io/network.d.ts
+++ b/types/react-icons/lib/io/network.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNetwork extends React.Component<IconBaseProps> { }
+declare class IoNetwork extends React.Component<IconBaseProps> { }
+export = IoNetwork;
diff --git a/types/react-icons/lib/io/no-smoking.d.ts b/types/react-icons/lib/io/no-smoking.d.ts
index 074789127a..eca13e875a 100644
--- a/types/react-icons/lib/io/no-smoking.d.ts
+++ b/types/react-icons/lib/io/no-smoking.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNoSmoking extends React.Component<IconBaseProps> { }
+declare class IoNoSmoking extends React.Component<IconBaseProps> { }
+export = IoNoSmoking;
diff --git a/types/react-icons/lib/io/nuclear.d.ts b/types/react-icons/lib/io/nuclear.d.ts
index 559674f85e..f220fd75a6 100644
--- a/types/react-icons/lib/io/nuclear.d.ts
+++ b/types/react-icons/lib/io/nuclear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNuclear extends React.Component<IconBaseProps> { }
+declare class IoNuclear extends React.Component<IconBaseProps> { }
+export = IoNuclear;
diff --git a/types/react-icons/lib/io/outlet.d.ts b/types/react-icons/lib/io/outlet.d.ts
index f68de98cb1..10b9c1c53b 100644
--- a/types/react-icons/lib/io/outlet.d.ts
+++ b/types/react-icons/lib/io/outlet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoOutlet extends React.Component<IconBaseProps> { }
+declare class IoOutlet extends React.Component<IconBaseProps> { }
+export = IoOutlet;
diff --git a/types/react-icons/lib/io/paintbrush.d.ts b/types/react-icons/lib/io/paintbrush.d.ts
index 1cc12bebca..798d4ec723 100644
--- a/types/react-icons/lib/io/paintbrush.d.ts
+++ b/types/react-icons/lib/io/paintbrush.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaintbrush extends React.Component<IconBaseProps> { }
+declare class IoPaintbrush extends React.Component<IconBaseProps> { }
+export = IoPaintbrush;
diff --git a/types/react-icons/lib/io/paintbucket.d.ts b/types/react-icons/lib/io/paintbucket.d.ts
index 0e6dce8aa7..cae729d92e 100644
--- a/types/react-icons/lib/io/paintbucket.d.ts
+++ b/types/react-icons/lib/io/paintbucket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaintbucket extends React.Component<IconBaseProps> { }
+declare class IoPaintbucket extends React.Component<IconBaseProps> { }
+export = IoPaintbucket;
diff --git a/types/react-icons/lib/io/paper-airplane.d.ts b/types/react-icons/lib/io/paper-airplane.d.ts
index e5c2d64cb8..0cc9963b1e 100644
--- a/types/react-icons/lib/io/paper-airplane.d.ts
+++ b/types/react-icons/lib/io/paper-airplane.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaperAirplane extends React.Component<IconBaseProps> { }
+declare class IoPaperAirplane extends React.Component<IconBaseProps> { }
+export = IoPaperAirplane;
diff --git a/types/react-icons/lib/io/paperclip.d.ts b/types/react-icons/lib/io/paperclip.d.ts
index cb9463bdf1..fb887470b8 100644
--- a/types/react-icons/lib/io/paperclip.d.ts
+++ b/types/react-icons/lib/io/paperclip.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaperclip extends React.Component<IconBaseProps> { }
+declare class IoPaperclip extends React.Component<IconBaseProps> { }
+export = IoPaperclip;
diff --git a/types/react-icons/lib/io/pause.d.ts b/types/react-icons/lib/io/pause.d.ts
index 2680c5b1b4..1c0f437dab 100644
--- a/types/react-icons/lib/io/pause.d.ts
+++ b/types/react-icons/lib/io/pause.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPause extends React.Component<IconBaseProps> { }
+declare class IoPause extends React.Component<IconBaseProps> { }
+export = IoPause;
diff --git a/types/react-icons/lib/io/person-add.d.ts b/types/react-icons/lib/io/person-add.d.ts
index 43a66e58c0..53ce9e2e41 100644
--- a/types/react-icons/lib/io/person-add.d.ts
+++ b/types/react-icons/lib/io/person-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPersonAdd extends React.Component<IconBaseProps> { }
+declare class IoPersonAdd extends React.Component<IconBaseProps> { }
+export = IoPersonAdd;
diff --git a/types/react-icons/lib/io/person-stalker.d.ts b/types/react-icons/lib/io/person-stalker.d.ts
index 59ed89e000..161429c61a 100644
--- a/types/react-icons/lib/io/person-stalker.d.ts
+++ b/types/react-icons/lib/io/person-stalker.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPersonStalker extends React.Component<IconBaseProps> { }
+declare class IoPersonStalker extends React.Component<IconBaseProps> { }
+export = IoPersonStalker;
diff --git a/types/react-icons/lib/io/person.d.ts b/types/react-icons/lib/io/person.d.ts
index 0970df9ab0..838d276698 100644
--- a/types/react-icons/lib/io/person.d.ts
+++ b/types/react-icons/lib/io/person.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPerson extends React.Component<IconBaseProps> { }
+declare class IoPerson extends React.Component<IconBaseProps> { }
+export = IoPerson;
diff --git a/types/react-icons/lib/io/pie-graph.d.ts b/types/react-icons/lib/io/pie-graph.d.ts
index 4171c0ee1d..b34d737547 100644
--- a/types/react-icons/lib/io/pie-graph.d.ts
+++ b/types/react-icons/lib/io/pie-graph.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPieGraph extends React.Component<IconBaseProps> { }
+declare class IoPieGraph extends React.Component<IconBaseProps> { }
+export = IoPieGraph;
diff --git a/types/react-icons/lib/io/pin.d.ts b/types/react-icons/lib/io/pin.d.ts
index 7e1d58f30e..8acc70bbe7 100644
--- a/types/react-icons/lib/io/pin.d.ts
+++ b/types/react-icons/lib/io/pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPin extends React.Component<IconBaseProps> { }
+declare class IoPin extends React.Component<IconBaseProps> { }
+export = IoPin;
diff --git a/types/react-icons/lib/io/pinpoint.d.ts b/types/react-icons/lib/io/pinpoint.d.ts
index 8ecf88a45b..633ebe5f6c 100644
--- a/types/react-icons/lib/io/pinpoint.d.ts
+++ b/types/react-icons/lib/io/pinpoint.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPinpoint extends React.Component<IconBaseProps> { }
+declare class IoPinpoint extends React.Component<IconBaseProps> { }
+export = IoPinpoint;
diff --git a/types/react-icons/lib/io/pizza.d.ts b/types/react-icons/lib/io/pizza.d.ts
index ef5ce7525b..22b59ea468 100644
--- a/types/react-icons/lib/io/pizza.d.ts
+++ b/types/react-icons/lib/io/pizza.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPizza extends React.Component<IconBaseProps> { }
+declare class IoPizza extends React.Component<IconBaseProps> { }
+export = IoPizza;
diff --git a/types/react-icons/lib/io/plane.d.ts b/types/react-icons/lib/io/plane.d.ts
index 9f0b2eaff2..db6117b622 100644
--- a/types/react-icons/lib/io/plane.d.ts
+++ b/types/react-icons/lib/io/plane.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlane extends React.Component<IconBaseProps> { }
+declare class IoPlane extends React.Component<IconBaseProps> { }
+export = IoPlane;
diff --git a/types/react-icons/lib/io/planet.d.ts b/types/react-icons/lib/io/planet.d.ts
index b91ae2a503..b831ee0adf 100644
--- a/types/react-icons/lib/io/planet.d.ts
+++ b/types/react-icons/lib/io/planet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlanet extends React.Component<IconBaseProps> { }
+declare class IoPlanet extends React.Component<IconBaseProps> { }
+export = IoPlanet;
diff --git a/types/react-icons/lib/io/play.d.ts b/types/react-icons/lib/io/play.d.ts
index 8a66797eb2..1b4959e9c6 100644
--- a/types/react-icons/lib/io/play.d.ts
+++ b/types/react-icons/lib/io/play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlay extends React.Component<IconBaseProps> { }
+declare class IoPlay extends React.Component<IconBaseProps> { }
+export = IoPlay;
diff --git a/types/react-icons/lib/io/playstation.d.ts b/types/react-icons/lib/io/playstation.d.ts
index 315eecce09..d10a3ca0ee 100644
--- a/types/react-icons/lib/io/playstation.d.ts
+++ b/types/react-icons/lib/io/playstation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlaystation extends React.Component<IconBaseProps> { }
+declare class IoPlaystation extends React.Component<IconBaseProps> { }
+export = IoPlaystation;
diff --git a/types/react-icons/lib/io/plus-circled.d.ts b/types/react-icons/lib/io/plus-circled.d.ts
index a74703c85d..eb6e1f8d93 100644
--- a/types/react-icons/lib/io/plus-circled.d.ts
+++ b/types/react-icons/lib/io/plus-circled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlusCircled extends React.Component<IconBaseProps> { }
+declare class IoPlusCircled extends React.Component<IconBaseProps> { }
+export = IoPlusCircled;
diff --git a/types/react-icons/lib/io/plus-round.d.ts b/types/react-icons/lib/io/plus-round.d.ts
index 3e7ba67f3a..ebd92519bf 100644
--- a/types/react-icons/lib/io/plus-round.d.ts
+++ b/types/react-icons/lib/io/plus-round.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlusRound extends React.Component<IconBaseProps> { }
+declare class IoPlusRound extends React.Component<IconBaseProps> { }
+export = IoPlusRound;
diff --git a/types/react-icons/lib/io/plus.d.ts b/types/react-icons/lib/io/plus.d.ts
index f61bf82a1a..1626a1cf05 100644
--- a/types/react-icons/lib/io/plus.d.ts
+++ b/types/react-icons/lib/io/plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlus extends React.Component<IconBaseProps> { }
+declare class IoPlus extends React.Component<IconBaseProps> { }
+export = IoPlus;
diff --git a/types/react-icons/lib/io/podium.d.ts b/types/react-icons/lib/io/podium.d.ts
index af2e204331..a70d220a19 100644
--- a/types/react-icons/lib/io/podium.d.ts
+++ b/types/react-icons/lib/io/podium.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPodium extends React.Component<IconBaseProps> { }
+declare class IoPodium extends React.Component<IconBaseProps> { }
+export = IoPodium;
diff --git a/types/react-icons/lib/io/pound.d.ts b/types/react-icons/lib/io/pound.d.ts
index b7b2e28b9e..ba114f6220 100644
--- a/types/react-icons/lib/io/pound.d.ts
+++ b/types/react-icons/lib/io/pound.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPound extends React.Component<IconBaseProps> { }
+declare class IoPound extends React.Component<IconBaseProps> { }
+export = IoPound;
diff --git a/types/react-icons/lib/io/power.d.ts b/types/react-icons/lib/io/power.d.ts
index f41d3d5e00..72880af810 100644
--- a/types/react-icons/lib/io/power.d.ts
+++ b/types/react-icons/lib/io/power.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPower extends React.Component<IconBaseProps> { }
+declare class IoPower extends React.Component<IconBaseProps> { }
+export = IoPower;
diff --git a/types/react-icons/lib/io/pricetag.d.ts b/types/react-icons/lib/io/pricetag.d.ts
index b8f2d47c03..c299d0f349 100644
--- a/types/react-icons/lib/io/pricetag.d.ts
+++ b/types/react-icons/lib/io/pricetag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPricetag extends React.Component<IconBaseProps> { }
+declare class IoPricetag extends React.Component<IconBaseProps> { }
+export = IoPricetag;
diff --git a/types/react-icons/lib/io/pricetags.d.ts b/types/react-icons/lib/io/pricetags.d.ts
index cca52cc061..5e778059b6 100644
--- a/types/react-icons/lib/io/pricetags.d.ts
+++ b/types/react-icons/lib/io/pricetags.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPricetags extends React.Component<IconBaseProps> { }
+declare class IoPricetags extends React.Component<IconBaseProps> { }
+export = IoPricetags;
diff --git a/types/react-icons/lib/io/printer.d.ts b/types/react-icons/lib/io/printer.d.ts
index 33bc74b2c2..66de49844e 100644
--- a/types/react-icons/lib/io/printer.d.ts
+++ b/types/react-icons/lib/io/printer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPrinter extends React.Component<IconBaseProps> { }
+declare class IoPrinter extends React.Component<IconBaseProps> { }
+export = IoPrinter;
diff --git a/types/react-icons/lib/io/pull-request.d.ts b/types/react-icons/lib/io/pull-request.d.ts
index b788efefdc..2bda8d4ff5 100644
--- a/types/react-icons/lib/io/pull-request.d.ts
+++ b/types/react-icons/lib/io/pull-request.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPullRequest extends React.Component<IconBaseProps> { }
+declare class IoPullRequest extends React.Component<IconBaseProps> { }
+export = IoPullRequest;
diff --git a/types/react-icons/lib/io/qr-scanner.d.ts b/types/react-icons/lib/io/qr-scanner.d.ts
index 77b1ca1dcf..1734d537a7 100644
--- a/types/react-icons/lib/io/qr-scanner.d.ts
+++ b/types/react-icons/lib/io/qr-scanner.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoQrScanner extends React.Component<IconBaseProps> { }
+declare class IoQrScanner extends React.Component<IconBaseProps> { }
+export = IoQrScanner;
diff --git a/types/react-icons/lib/io/quote.d.ts b/types/react-icons/lib/io/quote.d.ts
index ac7f5d32ef..36bb47931e 100644
--- a/types/react-icons/lib/io/quote.d.ts
+++ b/types/react-icons/lib/io/quote.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoQuote extends React.Component<IconBaseProps> { }
+declare class IoQuote extends React.Component<IconBaseProps> { }
+export = IoQuote;
diff --git a/types/react-icons/lib/io/radio-waves.d.ts b/types/react-icons/lib/io/radio-waves.d.ts
index 0b67b79379..a09c89c0bb 100644
--- a/types/react-icons/lib/io/radio-waves.d.ts
+++ b/types/react-icons/lib/io/radio-waves.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRadioWaves extends React.Component<IconBaseProps> { }
+declare class IoRadioWaves extends React.Component<IconBaseProps> { }
+export = IoRadioWaves;
diff --git a/types/react-icons/lib/io/record.d.ts b/types/react-icons/lib/io/record.d.ts
index dd7cd7a65f..9ed9157ee8 100644
--- a/types/react-icons/lib/io/record.d.ts
+++ b/types/react-icons/lib/io/record.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRecord extends React.Component<IconBaseProps> { }
+declare class IoRecord extends React.Component<IconBaseProps> { }
+export = IoRecord;
diff --git a/types/react-icons/lib/io/refresh.d.ts b/types/react-icons/lib/io/refresh.d.ts
index 8712271741..5a3668089b 100644
--- a/types/react-icons/lib/io/refresh.d.ts
+++ b/types/react-icons/lib/io/refresh.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRefresh extends React.Component<IconBaseProps> { }
+declare class IoRefresh extends React.Component<IconBaseProps> { }
+export = IoRefresh;
diff --git a/types/react-icons/lib/io/reply-all.d.ts b/types/react-icons/lib/io/reply-all.d.ts
index 568a1f8dd4..2028b2e6cb 100644
--- a/types/react-icons/lib/io/reply-all.d.ts
+++ b/types/react-icons/lib/io/reply-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoReplyAll extends React.Component<IconBaseProps> { }
+declare class IoReplyAll extends React.Component<IconBaseProps> { }
+export = IoReplyAll;
diff --git a/types/react-icons/lib/io/reply.d.ts b/types/react-icons/lib/io/reply.d.ts
index 628b3c6ade..d17492f2d7 100644
--- a/types/react-icons/lib/io/reply.d.ts
+++ b/types/react-icons/lib/io/reply.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoReply extends React.Component<IconBaseProps> { }
+declare class IoReply extends React.Component<IconBaseProps> { }
+export = IoReply;
diff --git a/types/react-icons/lib/io/ribbon-a.d.ts b/types/react-icons/lib/io/ribbon-a.d.ts
index 38d15e1fd1..16d6520b4a 100644
--- a/types/react-icons/lib/io/ribbon-a.d.ts
+++ b/types/react-icons/lib/io/ribbon-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRibbonA extends React.Component<IconBaseProps> { }
+declare class IoRibbonA extends React.Component<IconBaseProps> { }
+export = IoRibbonA;
diff --git a/types/react-icons/lib/io/ribbon-b.d.ts b/types/react-icons/lib/io/ribbon-b.d.ts
index 8e2ba836cc..1bdaef9e6d 100644
--- a/types/react-icons/lib/io/ribbon-b.d.ts
+++ b/types/react-icons/lib/io/ribbon-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRibbonB extends React.Component<IconBaseProps> { }
+declare class IoRibbonB extends React.Component<IconBaseProps> { }
+export = IoRibbonB;
diff --git a/types/react-icons/lib/io/sad-outline.d.ts b/types/react-icons/lib/io/sad-outline.d.ts
index 07ef27ecfb..edc818e119 100644
--- a/types/react-icons/lib/io/sad-outline.d.ts
+++ b/types/react-icons/lib/io/sad-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSadOutline extends React.Component<IconBaseProps> { }
+declare class IoSadOutline extends React.Component<IconBaseProps> { }
+export = IoSadOutline;
diff --git a/types/react-icons/lib/io/sad.d.ts b/types/react-icons/lib/io/sad.d.ts
index de6e0e3b98..4faba53e28 100644
--- a/types/react-icons/lib/io/sad.d.ts
+++ b/types/react-icons/lib/io/sad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSad extends React.Component<IconBaseProps> { }
+declare class IoSad extends React.Component<IconBaseProps> { }
+export = IoSad;
diff --git a/types/react-icons/lib/io/scissors.d.ts b/types/react-icons/lib/io/scissors.d.ts
index 18b40acd88..65b7062b84 100644
--- a/types/react-icons/lib/io/scissors.d.ts
+++ b/types/react-icons/lib/io/scissors.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoScissors extends React.Component<IconBaseProps> { }
+declare class IoScissors extends React.Component<IconBaseProps> { }
+export = IoScissors;
diff --git a/types/react-icons/lib/io/search.d.ts b/types/react-icons/lib/io/search.d.ts
index 00175f972b..0d4e410433 100644
--- a/types/react-icons/lib/io/search.d.ts
+++ b/types/react-icons/lib/io/search.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSearch extends React.Component<IconBaseProps> { }
+declare class IoSearch extends React.Component<IconBaseProps> { }
+export = IoSearch;
diff --git a/types/react-icons/lib/io/settings.d.ts b/types/react-icons/lib/io/settings.d.ts
index b5793e8679..3c592c9f8c 100644
--- a/types/react-icons/lib/io/settings.d.ts
+++ b/types/react-icons/lib/io/settings.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSettings extends React.Component<IconBaseProps> { }
+declare class IoSettings extends React.Component<IconBaseProps> { }
+export = IoSettings;
diff --git a/types/react-icons/lib/io/share.d.ts b/types/react-icons/lib/io/share.d.ts
index ba6d9a210a..24f6f37d6c 100644
--- a/types/react-icons/lib/io/share.d.ts
+++ b/types/react-icons/lib/io/share.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoShare extends React.Component<IconBaseProps> { }
+declare class IoShare extends React.Component<IconBaseProps> { }
+export = IoShare;
diff --git a/types/react-icons/lib/io/shuffle.d.ts b/types/react-icons/lib/io/shuffle.d.ts
index fb4bf71aad..736f886ae6 100644
--- a/types/react-icons/lib/io/shuffle.d.ts
+++ b/types/react-icons/lib/io/shuffle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoShuffle extends React.Component<IconBaseProps> { }
+declare class IoShuffle extends React.Component<IconBaseProps> { }
+export = IoShuffle;
diff --git a/types/react-icons/lib/io/skip-backward.d.ts b/types/react-icons/lib/io/skip-backward.d.ts
index 94bf5675c3..b7c8e6a960 100644
--- a/types/react-icons/lib/io/skip-backward.d.ts
+++ b/types/react-icons/lib/io/skip-backward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSkipBackward extends React.Component<IconBaseProps> { }
+declare class IoSkipBackward extends React.Component<IconBaseProps> { }
+export = IoSkipBackward;
diff --git a/types/react-icons/lib/io/skip-forward.d.ts b/types/react-icons/lib/io/skip-forward.d.ts
index 7912bd2dfa..0c8929e560 100644
--- a/types/react-icons/lib/io/skip-forward.d.ts
+++ b/types/react-icons/lib/io/skip-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSkipForward extends React.Component<IconBaseProps> { }
+declare class IoSkipForward extends React.Component<IconBaseProps> { }
+export = IoSkipForward;
diff --git a/types/react-icons/lib/io/social-android-outline.d.ts b/types/react-icons/lib/io/social-android-outline.d.ts
index 3b306ef4a2..b770166e4a 100644
--- a/types/react-icons/lib/io/social-android-outline.d.ts
+++ b/types/react-icons/lib/io/social-android-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAndroidOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialAndroidOutline extends React.Component<IconBaseProps> { }
+export = IoSocialAndroidOutline;
diff --git a/types/react-icons/lib/io/social-android.d.ts b/types/react-icons/lib/io/social-android.d.ts
index 362c2af2c5..6b03edee68 100644
--- a/types/react-icons/lib/io/social-android.d.ts
+++ b/types/react-icons/lib/io/social-android.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAndroid extends React.Component<IconBaseProps> { }
+declare class IoSocialAndroid extends React.Component<IconBaseProps> { }
+export = IoSocialAndroid;
diff --git a/types/react-icons/lib/io/social-angular-outline.d.ts b/types/react-icons/lib/io/social-angular-outline.d.ts
index be0ad623a7..92bbacb5e4 100644
--- a/types/react-icons/lib/io/social-angular-outline.d.ts
+++ b/types/react-icons/lib/io/social-angular-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAngularOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialAngularOutline extends React.Component<IconBaseProps> { }
+export = IoSocialAngularOutline;
diff --git a/types/react-icons/lib/io/social-angular.d.ts b/types/react-icons/lib/io/social-angular.d.ts
index 0286fd5c24..75eaa9c70b 100644
--- a/types/react-icons/lib/io/social-angular.d.ts
+++ b/types/react-icons/lib/io/social-angular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAngular extends React.Component<IconBaseProps> { }
+declare class IoSocialAngular extends React.Component<IconBaseProps> { }
+export = IoSocialAngular;
diff --git a/types/react-icons/lib/io/social-apple-outline.d.ts b/types/react-icons/lib/io/social-apple-outline.d.ts
index 13ef33d192..d639a99fcf 100644
--- a/types/react-icons/lib/io/social-apple-outline.d.ts
+++ b/types/react-icons/lib/io/social-apple-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAppleOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialAppleOutline extends React.Component<IconBaseProps> { }
+export = IoSocialAppleOutline;
diff --git a/types/react-icons/lib/io/social-apple.d.ts b/types/react-icons/lib/io/social-apple.d.ts
index bece372480..b10067260f 100644
--- a/types/react-icons/lib/io/social-apple.d.ts
+++ b/types/react-icons/lib/io/social-apple.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialApple extends React.Component<IconBaseProps> { }
+declare class IoSocialApple extends React.Component<IconBaseProps> { }
+export = IoSocialApple;
diff --git a/types/react-icons/lib/io/social-bitcoin-outline.d.ts b/types/react-icons/lib/io/social-bitcoin-outline.d.ts
index 9044d3dc51..de7c72ef7c 100644
--- a/types/react-icons/lib/io/social-bitcoin-outline.d.ts
+++ b/types/react-icons/lib/io/social-bitcoin-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBitcoinOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialBitcoinOutline extends React.Component<IconBaseProps> { }
+export = IoSocialBitcoinOutline;
diff --git a/types/react-icons/lib/io/social-bitcoin.d.ts b/types/react-icons/lib/io/social-bitcoin.d.ts
index f13a9ca0e2..3e606a8d6a 100644
--- a/types/react-icons/lib/io/social-bitcoin.d.ts
+++ b/types/react-icons/lib/io/social-bitcoin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBitcoin extends React.Component<IconBaseProps> { }
+declare class IoSocialBitcoin extends React.Component<IconBaseProps> { }
+export = IoSocialBitcoin;
diff --git a/types/react-icons/lib/io/social-buffer-outline.d.ts b/types/react-icons/lib/io/social-buffer-outline.d.ts
index 073a4d3256..7bdcf075eb 100644
--- a/types/react-icons/lib/io/social-buffer-outline.d.ts
+++ b/types/react-icons/lib/io/social-buffer-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBufferOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialBufferOutline extends React.Component<IconBaseProps> { }
+export = IoSocialBufferOutline;
diff --git a/types/react-icons/lib/io/social-buffer.d.ts b/types/react-icons/lib/io/social-buffer.d.ts
index 8f103cbc23..93858b6544 100644
--- a/types/react-icons/lib/io/social-buffer.d.ts
+++ b/types/react-icons/lib/io/social-buffer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBuffer extends React.Component<IconBaseProps> { }
+declare class IoSocialBuffer extends React.Component<IconBaseProps> { }
+export = IoSocialBuffer;
diff --git a/types/react-icons/lib/io/social-chrome-outline.d.ts b/types/react-icons/lib/io/social-chrome-outline.d.ts
index e0b96d90a9..3f36d316e1 100644
--- a/types/react-icons/lib/io/social-chrome-outline.d.ts
+++ b/types/react-icons/lib/io/social-chrome-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialChromeOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialChromeOutline extends React.Component<IconBaseProps> { }
+export = IoSocialChromeOutline;
diff --git a/types/react-icons/lib/io/social-chrome.d.ts b/types/react-icons/lib/io/social-chrome.d.ts
index a98ec53c7b..bad155a65a 100644
--- a/types/react-icons/lib/io/social-chrome.d.ts
+++ b/types/react-icons/lib/io/social-chrome.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialChrome extends React.Component<IconBaseProps> { }
+declare class IoSocialChrome extends React.Component<IconBaseProps> { }
+export = IoSocialChrome;
diff --git a/types/react-icons/lib/io/social-codepen-outline.d.ts b/types/react-icons/lib/io/social-codepen-outline.d.ts
index 86affb85f1..a4e6ef6f98 100644
--- a/types/react-icons/lib/io/social-codepen-outline.d.ts
+++ b/types/react-icons/lib/io/social-codepen-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCodepenOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialCodepenOutline extends React.Component<IconBaseProps> { }
+export = IoSocialCodepenOutline;
diff --git a/types/react-icons/lib/io/social-codepen.d.ts b/types/react-icons/lib/io/social-codepen.d.ts
index bd6d0fe2ff..ce7a689c2a 100644
--- a/types/react-icons/lib/io/social-codepen.d.ts
+++ b/types/react-icons/lib/io/social-codepen.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCodepen extends React.Component<IconBaseProps> { }
+declare class IoSocialCodepen extends React.Component<IconBaseProps> { }
+export = IoSocialCodepen;
diff --git a/types/react-icons/lib/io/social-css3-outline.d.ts b/types/react-icons/lib/io/social-css3-outline.d.ts
index 0d792c0e6a..3a981b6d4c 100644
--- a/types/react-icons/lib/io/social-css3-outline.d.ts
+++ b/types/react-icons/lib/io/social-css3-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCss3Outline extends React.Component<IconBaseProps> { }
+declare class IoSocialCss3Outline extends React.Component<IconBaseProps> { }
+export = IoSocialCss3Outline;
diff --git a/types/react-icons/lib/io/social-css3.d.ts b/types/react-icons/lib/io/social-css3.d.ts
index f8ef55d480..df43ca86cf 100644
--- a/types/react-icons/lib/io/social-css3.d.ts
+++ b/types/react-icons/lib/io/social-css3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCss3 extends React.Component<IconBaseProps> { }
+declare class IoSocialCss3 extends React.Component<IconBaseProps> { }
+export = IoSocialCss3;
diff --git a/types/react-icons/lib/io/social-designernews-outline.d.ts b/types/react-icons/lib/io/social-designernews-outline.d.ts
index 9a84d73221..d791b282e2 100644
--- a/types/react-icons/lib/io/social-designernews-outline.d.ts
+++ b/types/react-icons/lib/io/social-designernews-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDesignernewsOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialDesignernewsOutline extends React.Component<IconBaseProps> { }
+export = IoSocialDesignernewsOutline;
diff --git a/types/react-icons/lib/io/social-designernews.d.ts b/types/react-icons/lib/io/social-designernews.d.ts
index b7f5b92381..0e462c6530 100644
--- a/types/react-icons/lib/io/social-designernews.d.ts
+++ b/types/react-icons/lib/io/social-designernews.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDesignernews extends React.Component<IconBaseProps> { }
+declare class IoSocialDesignernews extends React.Component<IconBaseProps> { }
+export = IoSocialDesignernews;
diff --git a/types/react-icons/lib/io/social-dribbble-outline.d.ts b/types/react-icons/lib/io/social-dribbble-outline.d.ts
index ba7a99e3ab..fd75f5a0c3 100644
--- a/types/react-icons/lib/io/social-dribbble-outline.d.ts
+++ b/types/react-icons/lib/io/social-dribbble-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDribbbleOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialDribbbleOutline extends React.Component<IconBaseProps> { }
+export = IoSocialDribbbleOutline;
diff --git a/types/react-icons/lib/io/social-dribbble.d.ts b/types/react-icons/lib/io/social-dribbble.d.ts
index ef43f8d862..d239900650 100644
--- a/types/react-icons/lib/io/social-dribbble.d.ts
+++ b/types/react-icons/lib/io/social-dribbble.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDribbble extends React.Component<IconBaseProps> { }
+declare class IoSocialDribbble extends React.Component<IconBaseProps> { }
+export = IoSocialDribbble;
diff --git a/types/react-icons/lib/io/social-dropbox-outline.d.ts b/types/react-icons/lib/io/social-dropbox-outline.d.ts
index 71959da367..d57fc423a5 100644
--- a/types/react-icons/lib/io/social-dropbox-outline.d.ts
+++ b/types/react-icons/lib/io/social-dropbox-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDropboxOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialDropboxOutline extends React.Component<IconBaseProps> { }
+export = IoSocialDropboxOutline;
diff --git a/types/react-icons/lib/io/social-dropbox.d.ts b/types/react-icons/lib/io/social-dropbox.d.ts
index e0f243a8fa..d689170efd 100644
--- a/types/react-icons/lib/io/social-dropbox.d.ts
+++ b/types/react-icons/lib/io/social-dropbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDropbox extends React.Component<IconBaseProps> { }
+declare class IoSocialDropbox extends React.Component<IconBaseProps> { }
+export = IoSocialDropbox;
diff --git a/types/react-icons/lib/io/social-euro-outline.d.ts b/types/react-icons/lib/io/social-euro-outline.d.ts
index ec55bb73a5..6fefc18caa 100644
--- a/types/react-icons/lib/io/social-euro-outline.d.ts
+++ b/types/react-icons/lib/io/social-euro-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialEuroOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialEuroOutline extends React.Component<IconBaseProps> { }
+export = IoSocialEuroOutline;
diff --git a/types/react-icons/lib/io/social-euro.d.ts b/types/react-icons/lib/io/social-euro.d.ts
index b0b70b5796..36ae7c5e8b 100644
--- a/types/react-icons/lib/io/social-euro.d.ts
+++ b/types/react-icons/lib/io/social-euro.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialEuro extends React.Component<IconBaseProps> { }
+declare class IoSocialEuro extends React.Component<IconBaseProps> { }
+export = IoSocialEuro;
diff --git a/types/react-icons/lib/io/social-facebook-outline.d.ts b/types/react-icons/lib/io/social-facebook-outline.d.ts
index fce2eda2b9..69cd8a1a00 100644
--- a/types/react-icons/lib/io/social-facebook-outline.d.ts
+++ b/types/react-icons/lib/io/social-facebook-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFacebookOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialFacebookOutline extends React.Component<IconBaseProps> { }
+export = IoSocialFacebookOutline;
diff --git a/types/react-icons/lib/io/social-facebook.d.ts b/types/react-icons/lib/io/social-facebook.d.ts
index 696c8f5401..1b2caa8312 100644
--- a/types/react-icons/lib/io/social-facebook.d.ts
+++ b/types/react-icons/lib/io/social-facebook.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFacebook extends React.Component<IconBaseProps> { }
+declare class IoSocialFacebook extends React.Component<IconBaseProps> { }
+export = IoSocialFacebook;
diff --git a/types/react-icons/lib/io/social-foursquare-outline.d.ts b/types/react-icons/lib/io/social-foursquare-outline.d.ts
index aa643db79c..536f829ff0 100644
--- a/types/react-icons/lib/io/social-foursquare-outline.d.ts
+++ b/types/react-icons/lib/io/social-foursquare-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFoursquareOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialFoursquareOutline extends React.Component<IconBaseProps> { }
+export = IoSocialFoursquareOutline;
diff --git a/types/react-icons/lib/io/social-foursquare.d.ts b/types/react-icons/lib/io/social-foursquare.d.ts
index d4555bfc41..c83428b66d 100644
--- a/types/react-icons/lib/io/social-foursquare.d.ts
+++ b/types/react-icons/lib/io/social-foursquare.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFoursquare extends React.Component<IconBaseProps> { }
+declare class IoSocialFoursquare extends React.Component<IconBaseProps> { }
+export = IoSocialFoursquare;
diff --git a/types/react-icons/lib/io/social-freebsd-devil.d.ts b/types/react-icons/lib/io/social-freebsd-devil.d.ts
index 17715e0a06..4f614b2950 100644
--- a/types/react-icons/lib/io/social-freebsd-devil.d.ts
+++ b/types/react-icons/lib/io/social-freebsd-devil.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFreebsdDevil extends React.Component<IconBaseProps> { }
+declare class IoSocialFreebsdDevil extends React.Component<IconBaseProps> { }
+export = IoSocialFreebsdDevil;
diff --git a/types/react-icons/lib/io/social-github-outline.d.ts b/types/react-icons/lib/io/social-github-outline.d.ts
index ad810dd9f5..23f4729b8b 100644
--- a/types/react-icons/lib/io/social-github-outline.d.ts
+++ b/types/react-icons/lib/io/social-github-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGithubOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialGithubOutline extends React.Component<IconBaseProps> { }
+export = IoSocialGithubOutline;
diff --git a/types/react-icons/lib/io/social-github.d.ts b/types/react-icons/lib/io/social-github.d.ts
index dabc247815..037f125cdd 100644
--- a/types/react-icons/lib/io/social-github.d.ts
+++ b/types/react-icons/lib/io/social-github.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGithub extends React.Component<IconBaseProps> { }
+declare class IoSocialGithub extends React.Component<IconBaseProps> { }
+export = IoSocialGithub;
diff --git a/types/react-icons/lib/io/social-google-outline.d.ts b/types/react-icons/lib/io/social-google-outline.d.ts
index 76fa21d665..42dc6df13b 100644
--- a/types/react-icons/lib/io/social-google-outline.d.ts
+++ b/types/react-icons/lib/io/social-google-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialGoogleOutline extends React.Component<IconBaseProps> { }
+export = IoSocialGoogleOutline;
diff --git a/types/react-icons/lib/io/social-google.d.ts b/types/react-icons/lib/io/social-google.d.ts
index c31283ade3..c6468168bc 100644
--- a/types/react-icons/lib/io/social-google.d.ts
+++ b/types/react-icons/lib/io/social-google.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogle extends React.Component<IconBaseProps> { }
+declare class IoSocialGoogle extends React.Component<IconBaseProps> { }
+export = IoSocialGoogle;
diff --git a/types/react-icons/lib/io/social-googleplus-outline.d.ts b/types/react-icons/lib/io/social-googleplus-outline.d.ts
index fe28dee981..7aed37c1c7 100644
--- a/types/react-icons/lib/io/social-googleplus-outline.d.ts
+++ b/types/react-icons/lib/io/social-googleplus-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleplusOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialGoogleplusOutline extends React.Component<IconBaseProps> { }
+export = IoSocialGoogleplusOutline;
diff --git a/types/react-icons/lib/io/social-googleplus.d.ts b/types/react-icons/lib/io/social-googleplus.d.ts
index 3fe4052899..563d63e295 100644
--- a/types/react-icons/lib/io/social-googleplus.d.ts
+++ b/types/react-icons/lib/io/social-googleplus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleplus extends React.Component<IconBaseProps> { }
+declare class IoSocialGoogleplus extends React.Component<IconBaseProps> { }
+export = IoSocialGoogleplus;
diff --git a/types/react-icons/lib/io/social-hackernews-outline.d.ts b/types/react-icons/lib/io/social-hackernews-outline.d.ts
index c71910be26..5e39b1b57c 100644
--- a/types/react-icons/lib/io/social-hackernews-outline.d.ts
+++ b/types/react-icons/lib/io/social-hackernews-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHackernewsOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialHackernewsOutline extends React.Component<IconBaseProps> { }
+export = IoSocialHackernewsOutline;
diff --git a/types/react-icons/lib/io/social-hackernews.d.ts b/types/react-icons/lib/io/social-hackernews.d.ts
index 69f8ffd48e..af96aadf02 100644
--- a/types/react-icons/lib/io/social-hackernews.d.ts
+++ b/types/react-icons/lib/io/social-hackernews.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHackernews extends React.Component<IconBaseProps> { }
+declare class IoSocialHackernews extends React.Component<IconBaseProps> { }
+export = IoSocialHackernews;
diff --git a/types/react-icons/lib/io/social-html5-outline.d.ts b/types/react-icons/lib/io/social-html5-outline.d.ts
index 3c8d43114f..c6155c0329 100644
--- a/types/react-icons/lib/io/social-html5-outline.d.ts
+++ b/types/react-icons/lib/io/social-html5-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHtml5Outline extends React.Component<IconBaseProps> { }
+declare class IoSocialHtml5Outline extends React.Component<IconBaseProps> { }
+export = IoSocialHtml5Outline;
diff --git a/types/react-icons/lib/io/social-html5.d.ts b/types/react-icons/lib/io/social-html5.d.ts
index 9916b17e2c..1a464134d6 100644
--- a/types/react-icons/lib/io/social-html5.d.ts
+++ b/types/react-icons/lib/io/social-html5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHtml5 extends React.Component<IconBaseProps> { }
+declare class IoSocialHtml5 extends React.Component<IconBaseProps> { }
+export = IoSocialHtml5;
diff --git a/types/react-icons/lib/io/social-instagram-outline.d.ts b/types/react-icons/lib/io/social-instagram-outline.d.ts
index ffc74066b7..74d5470441 100644
--- a/types/react-icons/lib/io/social-instagram-outline.d.ts
+++ b/types/react-icons/lib/io/social-instagram-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialInstagramOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialInstagramOutline extends React.Component<IconBaseProps> { }
+export = IoSocialInstagramOutline;
diff --git a/types/react-icons/lib/io/social-instagram.d.ts b/types/react-icons/lib/io/social-instagram.d.ts
index 7c06ae1833..5bc5559afa 100644
--- a/types/react-icons/lib/io/social-instagram.d.ts
+++ b/types/react-icons/lib/io/social-instagram.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialInstagram extends React.Component<IconBaseProps> { }
+declare class IoSocialInstagram extends React.Component<IconBaseProps> { }
+export = IoSocialInstagram;
diff --git a/types/react-icons/lib/io/social-javascript-outline.d.ts b/types/react-icons/lib/io/social-javascript-outline.d.ts
index 0f21ff7483..82e903167b 100644
--- a/types/react-icons/lib/io/social-javascript-outline.d.ts
+++ b/types/react-icons/lib/io/social-javascript-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialJavascriptOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialJavascriptOutline extends React.Component<IconBaseProps> { }
+export = IoSocialJavascriptOutline;
diff --git a/types/react-icons/lib/io/social-javascript.d.ts b/types/react-icons/lib/io/social-javascript.d.ts
index 99905575bf..ee2c338e4d 100644
--- a/types/react-icons/lib/io/social-javascript.d.ts
+++ b/types/react-icons/lib/io/social-javascript.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialJavascript extends React.Component<IconBaseProps> { }
+declare class IoSocialJavascript extends React.Component<IconBaseProps> { }
+export = IoSocialJavascript;
diff --git a/types/react-icons/lib/io/social-linkedin-outline.d.ts b/types/react-icons/lib/io/social-linkedin-outline.d.ts
index 3ddee8261a..546fd5fb48 100644
--- a/types/react-icons/lib/io/social-linkedin-outline.d.ts
+++ b/types/react-icons/lib/io/social-linkedin-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialLinkedinOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialLinkedinOutline extends React.Component<IconBaseProps> { }
+export = IoSocialLinkedinOutline;
diff --git a/types/react-icons/lib/io/social-linkedin.d.ts b/types/react-icons/lib/io/social-linkedin.d.ts
index 0266663678..495cdcb265 100644
--- a/types/react-icons/lib/io/social-linkedin.d.ts
+++ b/types/react-icons/lib/io/social-linkedin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialLinkedin extends React.Component<IconBaseProps> { }
+declare class IoSocialLinkedin extends React.Component<IconBaseProps> { }
+export = IoSocialLinkedin;
diff --git a/types/react-icons/lib/io/social-markdown.d.ts b/types/react-icons/lib/io/social-markdown.d.ts
index 963119614d..0a24e7e4f2 100644
--- a/types/react-icons/lib/io/social-markdown.d.ts
+++ b/types/react-icons/lib/io/social-markdown.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialMarkdown extends React.Component<IconBaseProps> { }
+declare class IoSocialMarkdown extends React.Component<IconBaseProps> { }
+export = IoSocialMarkdown;
diff --git a/types/react-icons/lib/io/social-nodejs.d.ts b/types/react-icons/lib/io/social-nodejs.d.ts
index 642390dc4a..f49182ef27 100644
--- a/types/react-icons/lib/io/social-nodejs.d.ts
+++ b/types/react-icons/lib/io/social-nodejs.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialNodejs extends React.Component<IconBaseProps> { }
+declare class IoSocialNodejs extends React.Component<IconBaseProps> { }
+export = IoSocialNodejs;
diff --git a/types/react-icons/lib/io/social-octocat.d.ts b/types/react-icons/lib/io/social-octocat.d.ts
index 0003cb487c..dbba07c262 100644
--- a/types/react-icons/lib/io/social-octocat.d.ts
+++ b/types/react-icons/lib/io/social-octocat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialOctocat extends React.Component<IconBaseProps> { }
+declare class IoSocialOctocat extends React.Component<IconBaseProps> { }
+export = IoSocialOctocat;
diff --git a/types/react-icons/lib/io/social-pinterest-outline.d.ts b/types/react-icons/lib/io/social-pinterest-outline.d.ts
index 4ed2d123ac..8890d054cd 100644
--- a/types/react-icons/lib/io/social-pinterest-outline.d.ts
+++ b/types/react-icons/lib/io/social-pinterest-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPinterestOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialPinterestOutline extends React.Component<IconBaseProps> { }
+export = IoSocialPinterestOutline;
diff --git a/types/react-icons/lib/io/social-pinterest.d.ts b/types/react-icons/lib/io/social-pinterest.d.ts
index f2ee95376f..4d678c979e 100644
--- a/types/react-icons/lib/io/social-pinterest.d.ts
+++ b/types/react-icons/lib/io/social-pinterest.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPinterest extends React.Component<IconBaseProps> { }
+declare class IoSocialPinterest extends React.Component<IconBaseProps> { }
+export = IoSocialPinterest;
diff --git a/types/react-icons/lib/io/social-python.d.ts b/types/react-icons/lib/io/social-python.d.ts
index 78a6e50954..ad63062786 100644
--- a/types/react-icons/lib/io/social-python.d.ts
+++ b/types/react-icons/lib/io/social-python.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPython extends React.Component<IconBaseProps> { }
+declare class IoSocialPython extends React.Component<IconBaseProps> { }
+export = IoSocialPython;
diff --git a/types/react-icons/lib/io/social-reddit-outline.d.ts b/types/react-icons/lib/io/social-reddit-outline.d.ts
index 9dd5355bdc..a02958937d 100644
--- a/types/react-icons/lib/io/social-reddit-outline.d.ts
+++ b/types/react-icons/lib/io/social-reddit-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRedditOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialRedditOutline extends React.Component<IconBaseProps> { }
+export = IoSocialRedditOutline;
diff --git a/types/react-icons/lib/io/social-reddit.d.ts b/types/react-icons/lib/io/social-reddit.d.ts
index e103be80d3..f52f5669fb 100644
--- a/types/react-icons/lib/io/social-reddit.d.ts
+++ b/types/react-icons/lib/io/social-reddit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialReddit extends React.Component<IconBaseProps> { }
+declare class IoSocialReddit extends React.Component<IconBaseProps> { }
+export = IoSocialReddit;
diff --git a/types/react-icons/lib/io/social-rss-outline.d.ts b/types/react-icons/lib/io/social-rss-outline.d.ts
index 4baab1f80b..f6a65f1868 100644
--- a/types/react-icons/lib/io/social-rss-outline.d.ts
+++ b/types/react-icons/lib/io/social-rss-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRssOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialRssOutline extends React.Component<IconBaseProps> { }
+export = IoSocialRssOutline;
diff --git a/types/react-icons/lib/io/social-rss.d.ts b/types/react-icons/lib/io/social-rss.d.ts
index 2c749b4af9..b605db06e4 100644
--- a/types/react-icons/lib/io/social-rss.d.ts
+++ b/types/react-icons/lib/io/social-rss.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRss extends React.Component<IconBaseProps> { }
+declare class IoSocialRss extends React.Component<IconBaseProps> { }
+export = IoSocialRss;
diff --git a/types/react-icons/lib/io/social-sass.d.ts b/types/react-icons/lib/io/social-sass.d.ts
index 6ba05bc9ae..3c5e724877 100644
--- a/types/react-icons/lib/io/social-sass.d.ts
+++ b/types/react-icons/lib/io/social-sass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSass extends React.Component<IconBaseProps> { }
+declare class IoSocialSass extends React.Component<IconBaseProps> { }
+export = IoSocialSass;
diff --git a/types/react-icons/lib/io/social-skype-outline.d.ts b/types/react-icons/lib/io/social-skype-outline.d.ts
index cefebe89c9..8a3f01062b 100644
--- a/types/react-icons/lib/io/social-skype-outline.d.ts
+++ b/types/react-icons/lib/io/social-skype-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSkypeOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialSkypeOutline extends React.Component<IconBaseProps> { }
+export = IoSocialSkypeOutline;
diff --git a/types/react-icons/lib/io/social-skype.d.ts b/types/react-icons/lib/io/social-skype.d.ts
index a49a35ce62..3c865dfde7 100644
--- a/types/react-icons/lib/io/social-skype.d.ts
+++ b/types/react-icons/lib/io/social-skype.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSkype extends React.Component<IconBaseProps> { }
+declare class IoSocialSkype extends React.Component<IconBaseProps> { }
+export = IoSocialSkype;
diff --git a/types/react-icons/lib/io/social-snapchat-outline.d.ts b/types/react-icons/lib/io/social-snapchat-outline.d.ts
index 5fe324cb94..7a9e2ded8f 100644
--- a/types/react-icons/lib/io/social-snapchat-outline.d.ts
+++ b/types/react-icons/lib/io/social-snapchat-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSnapchatOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialSnapchatOutline extends React.Component<IconBaseProps> { }
+export = IoSocialSnapchatOutline;
diff --git a/types/react-icons/lib/io/social-snapchat.d.ts b/types/react-icons/lib/io/social-snapchat.d.ts
index ba87070d61..a4485fde56 100644
--- a/types/react-icons/lib/io/social-snapchat.d.ts
+++ b/types/react-icons/lib/io/social-snapchat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSnapchat extends React.Component<IconBaseProps> { }
+declare class IoSocialSnapchat extends React.Component<IconBaseProps> { }
+export = IoSocialSnapchat;
diff --git a/types/react-icons/lib/io/social-tumblr-outline.d.ts b/types/react-icons/lib/io/social-tumblr-outline.d.ts
index dbf70d2b60..6d7e99cd46 100644
--- a/types/react-icons/lib/io/social-tumblr-outline.d.ts
+++ b/types/react-icons/lib/io/social-tumblr-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTumblrOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialTumblrOutline extends React.Component<IconBaseProps> { }
+export = IoSocialTumblrOutline;
diff --git a/types/react-icons/lib/io/social-tumblr.d.ts b/types/react-icons/lib/io/social-tumblr.d.ts
index ce5c8b4170..16485cdbf6 100644
--- a/types/react-icons/lib/io/social-tumblr.d.ts
+++ b/types/react-icons/lib/io/social-tumblr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTumblr extends React.Component<IconBaseProps> { }
+declare class IoSocialTumblr extends React.Component<IconBaseProps> { }
+export = IoSocialTumblr;
diff --git a/types/react-icons/lib/io/social-tux.d.ts b/types/react-icons/lib/io/social-tux.d.ts
index 411ff72010..68d6a6787e 100644
--- a/types/react-icons/lib/io/social-tux.d.ts
+++ b/types/react-icons/lib/io/social-tux.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTux extends React.Component<IconBaseProps> { }
+declare class IoSocialTux extends React.Component<IconBaseProps> { }
+export = IoSocialTux;
diff --git a/types/react-icons/lib/io/social-twitch-outline.d.ts b/types/react-icons/lib/io/social-twitch-outline.d.ts
index 5875914d98..0639dc5552 100644
--- a/types/react-icons/lib/io/social-twitch-outline.d.ts
+++ b/types/react-icons/lib/io/social-twitch-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitchOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialTwitchOutline extends React.Component<IconBaseProps> { }
+export = IoSocialTwitchOutline;
diff --git a/types/react-icons/lib/io/social-twitch.d.ts b/types/react-icons/lib/io/social-twitch.d.ts
index 109993f553..e62fbcda60 100644
--- a/types/react-icons/lib/io/social-twitch.d.ts
+++ b/types/react-icons/lib/io/social-twitch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitch extends React.Component<IconBaseProps> { }
+declare class IoSocialTwitch extends React.Component<IconBaseProps> { }
+export = IoSocialTwitch;
diff --git a/types/react-icons/lib/io/social-twitter-outline.d.ts b/types/react-icons/lib/io/social-twitter-outline.d.ts
index 2ecfe578dd..cc296a9604 100644
--- a/types/react-icons/lib/io/social-twitter-outline.d.ts
+++ b/types/react-icons/lib/io/social-twitter-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitterOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialTwitterOutline extends React.Component<IconBaseProps> { }
+export = IoSocialTwitterOutline;
diff --git a/types/react-icons/lib/io/social-twitter.d.ts b/types/react-icons/lib/io/social-twitter.d.ts
index 81b8c0817a..9a6316e86e 100644
--- a/types/react-icons/lib/io/social-twitter.d.ts
+++ b/types/react-icons/lib/io/social-twitter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitter extends React.Component<IconBaseProps> { }
+declare class IoSocialTwitter extends React.Component<IconBaseProps> { }
+export = IoSocialTwitter;
diff --git a/types/react-icons/lib/io/social-usd-outline.d.ts b/types/react-icons/lib/io/social-usd-outline.d.ts
index 8c12d195f5..94a304538b 100644
--- a/types/react-icons/lib/io/social-usd-outline.d.ts
+++ b/types/react-icons/lib/io/social-usd-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialUsdOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialUsdOutline extends React.Component<IconBaseProps> { }
+export = IoSocialUsdOutline;
diff --git a/types/react-icons/lib/io/social-usd.d.ts b/types/react-icons/lib/io/social-usd.d.ts
index a6814ba496..31bff60cbf 100644
--- a/types/react-icons/lib/io/social-usd.d.ts
+++ b/types/react-icons/lib/io/social-usd.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialUsd extends React.Component<IconBaseProps> { }
+declare class IoSocialUsd extends React.Component<IconBaseProps> { }
+export = IoSocialUsd;
diff --git a/types/react-icons/lib/io/social-vimeo-outline.d.ts b/types/react-icons/lib/io/social-vimeo-outline.d.ts
index bcac0c4f79..3881531895 100644
--- a/types/react-icons/lib/io/social-vimeo-outline.d.ts
+++ b/types/react-icons/lib/io/social-vimeo-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialVimeoOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialVimeoOutline extends React.Component<IconBaseProps> { }
+export = IoSocialVimeoOutline;
diff --git a/types/react-icons/lib/io/social-vimeo.d.ts b/types/react-icons/lib/io/social-vimeo.d.ts
index 5e0e068a51..2c6f6f91ef 100644
--- a/types/react-icons/lib/io/social-vimeo.d.ts
+++ b/types/react-icons/lib/io/social-vimeo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialVimeo extends React.Component<IconBaseProps> { }
+declare class IoSocialVimeo extends React.Component<IconBaseProps> { }
+export = IoSocialVimeo;
diff --git a/types/react-icons/lib/io/social-whatsapp-outline.d.ts b/types/react-icons/lib/io/social-whatsapp-outline.d.ts
index d3945dd43a..c6f93dbc26 100644
--- a/types/react-icons/lib/io/social-whatsapp-outline.d.ts
+++ b/types/react-icons/lib/io/social-whatsapp-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWhatsappOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialWhatsappOutline extends React.Component<IconBaseProps> { }
+export = IoSocialWhatsappOutline;
diff --git a/types/react-icons/lib/io/social-whatsapp.d.ts b/types/react-icons/lib/io/social-whatsapp.d.ts
index 3f767a557e..a89d97fb8a 100644
--- a/types/react-icons/lib/io/social-whatsapp.d.ts
+++ b/types/react-icons/lib/io/social-whatsapp.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWhatsapp extends React.Component<IconBaseProps> { }
+declare class IoSocialWhatsapp extends React.Component<IconBaseProps> { }
+export = IoSocialWhatsapp;
diff --git a/types/react-icons/lib/io/social-windows-outline.d.ts b/types/react-icons/lib/io/social-windows-outline.d.ts
index 204f5cc4ef..59e54299d1 100644
--- a/types/react-icons/lib/io/social-windows-outline.d.ts
+++ b/types/react-icons/lib/io/social-windows-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWindowsOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialWindowsOutline extends React.Component<IconBaseProps> { }
+export = IoSocialWindowsOutline;
diff --git a/types/react-icons/lib/io/social-windows.d.ts b/types/react-icons/lib/io/social-windows.d.ts
index 4a5a4854bd..3ee6ad9bd1 100644
--- a/types/react-icons/lib/io/social-windows.d.ts
+++ b/types/react-icons/lib/io/social-windows.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWindows extends React.Component<IconBaseProps> { }
+declare class IoSocialWindows extends React.Component<IconBaseProps> { }
+export = IoSocialWindows;
diff --git a/types/react-icons/lib/io/social-wordpress-outline.d.ts b/types/react-icons/lib/io/social-wordpress-outline.d.ts
index 15e7a115dd..87bb1b446d 100644
--- a/types/react-icons/lib/io/social-wordpress-outline.d.ts
+++ b/types/react-icons/lib/io/social-wordpress-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWordpressOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialWordpressOutline extends React.Component<IconBaseProps> { }
+export = IoSocialWordpressOutline;
diff --git a/types/react-icons/lib/io/social-wordpress.d.ts b/types/react-icons/lib/io/social-wordpress.d.ts
index 4d6e02a859..5b0f9037b6 100644
--- a/types/react-icons/lib/io/social-wordpress.d.ts
+++ b/types/react-icons/lib/io/social-wordpress.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWordpress extends React.Component<IconBaseProps> { }
+declare class IoSocialWordpress extends React.Component<IconBaseProps> { }
+export = IoSocialWordpress;
diff --git a/types/react-icons/lib/io/social-yahoo-outline.d.ts b/types/react-icons/lib/io/social-yahoo-outline.d.ts
index 5dcc671758..97fd9f19bd 100644
--- a/types/react-icons/lib/io/social-yahoo-outline.d.ts
+++ b/types/react-icons/lib/io/social-yahoo-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYahooOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialYahooOutline extends React.Component<IconBaseProps> { }
+export = IoSocialYahooOutline;
diff --git a/types/react-icons/lib/io/social-yahoo.d.ts b/types/react-icons/lib/io/social-yahoo.d.ts
index b5e6c878d6..5af9daf8ae 100644
--- a/types/react-icons/lib/io/social-yahoo.d.ts
+++ b/types/react-icons/lib/io/social-yahoo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYahoo extends React.Component<IconBaseProps> { }
+declare class IoSocialYahoo extends React.Component<IconBaseProps> { }
+export = IoSocialYahoo;
diff --git a/types/react-icons/lib/io/social-yen-outline.d.ts b/types/react-icons/lib/io/social-yen-outline.d.ts
index 889d6655a6..7b4afff62d 100644
--- a/types/react-icons/lib/io/social-yen-outline.d.ts
+++ b/types/react-icons/lib/io/social-yen-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYenOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialYenOutline extends React.Component<IconBaseProps> { }
+export = IoSocialYenOutline;
diff --git a/types/react-icons/lib/io/social-yen.d.ts b/types/react-icons/lib/io/social-yen.d.ts
index 59d9b2b28b..97909d13f6 100644
--- a/types/react-icons/lib/io/social-yen.d.ts
+++ b/types/react-icons/lib/io/social-yen.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYen extends React.Component<IconBaseProps> { }
+declare class IoSocialYen extends React.Component<IconBaseProps> { }
+export = IoSocialYen;
diff --git a/types/react-icons/lib/io/social-youtube-outline.d.ts b/types/react-icons/lib/io/social-youtube-outline.d.ts
index 09812d8e86..6395697460 100644
--- a/types/react-icons/lib/io/social-youtube-outline.d.ts
+++ b/types/react-icons/lib/io/social-youtube-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYoutubeOutline extends React.Component<IconBaseProps> { }
+declare class IoSocialYoutubeOutline extends React.Component<IconBaseProps> { }
+export = IoSocialYoutubeOutline;
diff --git a/types/react-icons/lib/io/social-youtube.d.ts b/types/react-icons/lib/io/social-youtube.d.ts
index 881e782d72..18df52b892 100644
--- a/types/react-icons/lib/io/social-youtube.d.ts
+++ b/types/react-icons/lib/io/social-youtube.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYoutube extends React.Component<IconBaseProps> { }
+declare class IoSocialYoutube extends React.Component<IconBaseProps> { }
+export = IoSocialYoutube;
diff --git a/types/react-icons/lib/io/soup-can-outline.d.ts b/types/react-icons/lib/io/soup-can-outline.d.ts
index e1fe063808..3f06093398 100644
--- a/types/react-icons/lib/io/soup-can-outline.d.ts
+++ b/types/react-icons/lib/io/soup-can-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSoupCanOutline extends React.Component<IconBaseProps> { }
+declare class IoSoupCanOutline extends React.Component<IconBaseProps> { }
+export = IoSoupCanOutline;
diff --git a/types/react-icons/lib/io/soup-can.d.ts b/types/react-icons/lib/io/soup-can.d.ts
index 50b4167624..c2bf15731b 100644
--- a/types/react-icons/lib/io/soup-can.d.ts
+++ b/types/react-icons/lib/io/soup-can.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSoupCan extends React.Component<IconBaseProps> { }
+declare class IoSoupCan extends React.Component<IconBaseProps> { }
+export = IoSoupCan;
diff --git a/types/react-icons/lib/io/speakerphone.d.ts b/types/react-icons/lib/io/speakerphone.d.ts
index af9117f78e..780c4002fd 100644
--- a/types/react-icons/lib/io/speakerphone.d.ts
+++ b/types/react-icons/lib/io/speakerphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSpeakerphone extends React.Component<IconBaseProps> { }
+declare class IoSpeakerphone extends React.Component<IconBaseProps> { }
+export = IoSpeakerphone;
diff --git a/types/react-icons/lib/io/speedometer.d.ts b/types/react-icons/lib/io/speedometer.d.ts
index 50d69af596..cfa16db12d 100644
--- a/types/react-icons/lib/io/speedometer.d.ts
+++ b/types/react-icons/lib/io/speedometer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSpeedometer extends React.Component<IconBaseProps> { }
+declare class IoSpeedometer extends React.Component<IconBaseProps> { }
+export = IoSpeedometer;
diff --git a/types/react-icons/lib/io/spoon.d.ts b/types/react-icons/lib/io/spoon.d.ts
index 107a88c9a6..d3ab8e61d0 100644
--- a/types/react-icons/lib/io/spoon.d.ts
+++ b/types/react-icons/lib/io/spoon.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSpoon extends React.Component<IconBaseProps> { }
+declare class IoSpoon extends React.Component<IconBaseProps> { }
+export = IoSpoon;
diff --git a/types/react-icons/lib/io/star.d.ts b/types/react-icons/lib/io/star.d.ts
index f4c1953512..8db2437a5e 100644
--- a/types/react-icons/lib/io/star.d.ts
+++ b/types/react-icons/lib/io/star.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoStar extends React.Component<IconBaseProps> { }
+declare class IoStar extends React.Component<IconBaseProps> { }
+export = IoStar;
diff --git a/types/react-icons/lib/io/stats-bars.d.ts b/types/react-icons/lib/io/stats-bars.d.ts
index 2d5e5024cb..0a94f74c65 100644
--- a/types/react-icons/lib/io/stats-bars.d.ts
+++ b/types/react-icons/lib/io/stats-bars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoStatsBars extends React.Component<IconBaseProps> { }
+declare class IoStatsBars extends React.Component<IconBaseProps> { }
+export = IoStatsBars;
diff --git a/types/react-icons/lib/io/steam.d.ts b/types/react-icons/lib/io/steam.d.ts
index 097461e15c..be700cdf00 100644
--- a/types/react-icons/lib/io/steam.d.ts
+++ b/types/react-icons/lib/io/steam.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSteam extends React.Component<IconBaseProps> { }
+declare class IoSteam extends React.Component<IconBaseProps> { }
+export = IoSteam;
diff --git a/types/react-icons/lib/io/stop.d.ts b/types/react-icons/lib/io/stop.d.ts
index 5fed81dabb..c2910f1023 100644
--- a/types/react-icons/lib/io/stop.d.ts
+++ b/types/react-icons/lib/io/stop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoStop extends React.Component<IconBaseProps> { }
+declare class IoStop extends React.Component<IconBaseProps> { }
+export = IoStop;
diff --git a/types/react-icons/lib/io/thermometer.d.ts b/types/react-icons/lib/io/thermometer.d.ts
index f76efa25ac..978014255d 100644
--- a/types/react-icons/lib/io/thermometer.d.ts
+++ b/types/react-icons/lib/io/thermometer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoThermometer extends React.Component<IconBaseProps> { }
+declare class IoThermometer extends React.Component<IconBaseProps> { }
+export = IoThermometer;
diff --git a/types/react-icons/lib/io/thumbsdown.d.ts b/types/react-icons/lib/io/thumbsdown.d.ts
index ebbbe6a64e..c1106f88bc 100644
--- a/types/react-icons/lib/io/thumbsdown.d.ts
+++ b/types/react-icons/lib/io/thumbsdown.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoThumbsdown extends React.Component<IconBaseProps> { }
+declare class IoThumbsdown extends React.Component<IconBaseProps> { }
+export = IoThumbsdown;
diff --git a/types/react-icons/lib/io/thumbsup.d.ts b/types/react-icons/lib/io/thumbsup.d.ts
index 285d40f186..a295066207 100644
--- a/types/react-icons/lib/io/thumbsup.d.ts
+++ b/types/react-icons/lib/io/thumbsup.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoThumbsup extends React.Component<IconBaseProps> { }
+declare class IoThumbsup extends React.Component<IconBaseProps> { }
+export = IoThumbsup;
diff --git a/types/react-icons/lib/io/toggle-filled.d.ts b/types/react-icons/lib/io/toggle-filled.d.ts
index 93cba93938..8a97c60a00 100644
--- a/types/react-icons/lib/io/toggle-filled.d.ts
+++ b/types/react-icons/lib/io/toggle-filled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoToggleFilled extends React.Component<IconBaseProps> { }
+declare class IoToggleFilled extends React.Component<IconBaseProps> { }
+export = IoToggleFilled;
diff --git a/types/react-icons/lib/io/toggle.d.ts b/types/react-icons/lib/io/toggle.d.ts
index 1af341ce4f..b8c2fdb3ff 100644
--- a/types/react-icons/lib/io/toggle.d.ts
+++ b/types/react-icons/lib/io/toggle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoToggle extends React.Component<IconBaseProps> { }
+declare class IoToggle extends React.Component<IconBaseProps> { }
+export = IoToggle;
diff --git a/types/react-icons/lib/io/transgender.d.ts b/types/react-icons/lib/io/transgender.d.ts
index 254ada7d1a..c1a45e1897 100644
--- a/types/react-icons/lib/io/transgender.d.ts
+++ b/types/react-icons/lib/io/transgender.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTransgender extends React.Component<IconBaseProps> { }
+declare class IoTransgender extends React.Component<IconBaseProps> { }
+export = IoTransgender;
diff --git a/types/react-icons/lib/io/trash-a.d.ts b/types/react-icons/lib/io/trash-a.d.ts
index bfd8815599..34ab344936 100644
--- a/types/react-icons/lib/io/trash-a.d.ts
+++ b/types/react-icons/lib/io/trash-a.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTrashA extends React.Component<IconBaseProps> { }
+declare class IoTrashA extends React.Component<IconBaseProps> { }
+export = IoTrashA;
diff --git a/types/react-icons/lib/io/trash-b.d.ts b/types/react-icons/lib/io/trash-b.d.ts
index c7c0cde13a..c05cf3253c 100644
--- a/types/react-icons/lib/io/trash-b.d.ts
+++ b/types/react-icons/lib/io/trash-b.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTrashB extends React.Component<IconBaseProps> { }
+declare class IoTrashB extends React.Component<IconBaseProps> { }
+export = IoTrashB;
diff --git a/types/react-icons/lib/io/trophy.d.ts b/types/react-icons/lib/io/trophy.d.ts
index f5f159c2e2..6dd8ed7039 100644
--- a/types/react-icons/lib/io/trophy.d.ts
+++ b/types/react-icons/lib/io/trophy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTrophy extends React.Component<IconBaseProps> { }
+declare class IoTrophy extends React.Component<IconBaseProps> { }
+export = IoTrophy;
diff --git a/types/react-icons/lib/io/tshirt-outline.d.ts b/types/react-icons/lib/io/tshirt-outline.d.ts
index b530f97107..859fc600ab 100644
--- a/types/react-icons/lib/io/tshirt-outline.d.ts
+++ b/types/react-icons/lib/io/tshirt-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTshirtOutline extends React.Component<IconBaseProps> { }
+declare class IoTshirtOutline extends React.Component<IconBaseProps> { }
+export = IoTshirtOutline;
diff --git a/types/react-icons/lib/io/tshirt.d.ts b/types/react-icons/lib/io/tshirt.d.ts
index b0072273b9..5c889dabfa 100644
--- a/types/react-icons/lib/io/tshirt.d.ts
+++ b/types/react-icons/lib/io/tshirt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTshirt extends React.Component<IconBaseProps> { }
+declare class IoTshirt extends React.Component<IconBaseProps> { }
+export = IoTshirt;
diff --git a/types/react-icons/lib/io/umbrella.d.ts b/types/react-icons/lib/io/umbrella.d.ts
index b85cf5b8c9..b9311248eb 100644
--- a/types/react-icons/lib/io/umbrella.d.ts
+++ b/types/react-icons/lib/io/umbrella.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUmbrella extends React.Component<IconBaseProps> { }
+declare class IoUmbrella extends React.Component<IconBaseProps> { }
+export = IoUmbrella;
diff --git a/types/react-icons/lib/io/university.d.ts b/types/react-icons/lib/io/university.d.ts
index 5947ae4172..7f070ad2a9 100644
--- a/types/react-icons/lib/io/university.d.ts
+++ b/types/react-icons/lib/io/university.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUniversity extends React.Component<IconBaseProps> { }
+declare class IoUniversity extends React.Component<IconBaseProps> { }
+export = IoUniversity;
diff --git a/types/react-icons/lib/io/unlocked.d.ts b/types/react-icons/lib/io/unlocked.d.ts
index 741c5ea952..d1863717f1 100644
--- a/types/react-icons/lib/io/unlocked.d.ts
+++ b/types/react-icons/lib/io/unlocked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUnlocked extends React.Component<IconBaseProps> { }
+declare class IoUnlocked extends React.Component<IconBaseProps> { }
+export = IoUnlocked;
diff --git a/types/react-icons/lib/io/upload.d.ts b/types/react-icons/lib/io/upload.d.ts
index 1ffb5c4aaf..2e5dfaf390 100644
--- a/types/react-icons/lib/io/upload.d.ts
+++ b/types/react-icons/lib/io/upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUpload extends React.Component<IconBaseProps> { }
+declare class IoUpload extends React.Component<IconBaseProps> { }
+export = IoUpload;
diff --git a/types/react-icons/lib/io/usb.d.ts b/types/react-icons/lib/io/usb.d.ts
index e53180c80e..7e15ce6b91 100644
--- a/types/react-icons/lib/io/usb.d.ts
+++ b/types/react-icons/lib/io/usb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUsb extends React.Component<IconBaseProps> { }
+declare class IoUsb extends React.Component<IconBaseProps> { }
+export = IoUsb;
diff --git a/types/react-icons/lib/io/videocamera.d.ts b/types/react-icons/lib/io/videocamera.d.ts
index 43148acede..b87a08d27e 100644
--- a/types/react-icons/lib/io/videocamera.d.ts
+++ b/types/react-icons/lib/io/videocamera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVideocamera extends React.Component<IconBaseProps> { }
+declare class IoVideocamera extends React.Component<IconBaseProps> { }
+export = IoVideocamera;
diff --git a/types/react-icons/lib/io/volume-high.d.ts b/types/react-icons/lib/io/volume-high.d.ts
index fdb362c990..3778a4f81a 100644
--- a/types/react-icons/lib/io/volume-high.d.ts
+++ b/types/react-icons/lib/io/volume-high.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeHigh extends React.Component<IconBaseProps> { }
+declare class IoVolumeHigh extends React.Component<IconBaseProps> { }
+export = IoVolumeHigh;
diff --git a/types/react-icons/lib/io/volume-low.d.ts b/types/react-icons/lib/io/volume-low.d.ts
index 1ac513c891..0850e7f04b 100644
--- a/types/react-icons/lib/io/volume-low.d.ts
+++ b/types/react-icons/lib/io/volume-low.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeLow extends React.Component<IconBaseProps> { }
+declare class IoVolumeLow extends React.Component<IconBaseProps> { }
+export = IoVolumeLow;
diff --git a/types/react-icons/lib/io/volume-medium.d.ts b/types/react-icons/lib/io/volume-medium.d.ts
index 7607d22632..dd63b5957c 100644
--- a/types/react-icons/lib/io/volume-medium.d.ts
+++ b/types/react-icons/lib/io/volume-medium.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeMedium extends React.Component<IconBaseProps> { }
+declare class IoVolumeMedium extends React.Component<IconBaseProps> { }
+export = IoVolumeMedium;
diff --git a/types/react-icons/lib/io/volume-mute.d.ts b/types/react-icons/lib/io/volume-mute.d.ts
index ff7330e544..4d515705cd 100644
--- a/types/react-icons/lib/io/volume-mute.d.ts
+++ b/types/react-icons/lib/io/volume-mute.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeMute extends React.Component<IconBaseProps> { }
+declare class IoVolumeMute extends React.Component<IconBaseProps> { }
+export = IoVolumeMute;
diff --git a/types/react-icons/lib/io/wand.d.ts b/types/react-icons/lib/io/wand.d.ts
index e1e22869ee..29428f8a3d 100644
--- a/types/react-icons/lib/io/wand.d.ts
+++ b/types/react-icons/lib/io/wand.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWand extends React.Component<IconBaseProps> { }
+declare class IoWand extends React.Component<IconBaseProps> { }
+export = IoWand;
diff --git a/types/react-icons/lib/io/waterdrop.d.ts b/types/react-icons/lib/io/waterdrop.d.ts
index a674835d55..503b4fd799 100644
--- a/types/react-icons/lib/io/waterdrop.d.ts
+++ b/types/react-icons/lib/io/waterdrop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWaterdrop extends React.Component<IconBaseProps> { }
+declare class IoWaterdrop extends React.Component<IconBaseProps> { }
+export = IoWaterdrop;
diff --git a/types/react-icons/lib/io/wifi.d.ts b/types/react-icons/lib/io/wifi.d.ts
index 3bec1b2449..9c8322487a 100644
--- a/types/react-icons/lib/io/wifi.d.ts
+++ b/types/react-icons/lib/io/wifi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWifi extends React.Component<IconBaseProps> { }
+declare class IoWifi extends React.Component<IconBaseProps> { }
+export = IoWifi;
diff --git a/types/react-icons/lib/io/wineglass.d.ts b/types/react-icons/lib/io/wineglass.d.ts
index 33b7d9843e..a7fb1c5520 100644
--- a/types/react-icons/lib/io/wineglass.d.ts
+++ b/types/react-icons/lib/io/wineglass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWineglass extends React.Component<IconBaseProps> { }
+declare class IoWineglass extends React.Component<IconBaseProps> { }
+export = IoWineglass;
diff --git a/types/react-icons/lib/io/woman.d.ts b/types/react-icons/lib/io/woman.d.ts
index b3cbbd6294..4d3651cc4c 100644
--- a/types/react-icons/lib/io/woman.d.ts
+++ b/types/react-icons/lib/io/woman.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWoman extends React.Component<IconBaseProps> { }
+declare class IoWoman extends React.Component<IconBaseProps> { }
+export = IoWoman;
diff --git a/types/react-icons/lib/io/wrench.d.ts b/types/react-icons/lib/io/wrench.d.ts
index 6f53a0a8cd..74c56ffaa3 100644
--- a/types/react-icons/lib/io/wrench.d.ts
+++ b/types/react-icons/lib/io/wrench.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWrench extends React.Component<IconBaseProps> { }
+declare class IoWrench extends React.Component<IconBaseProps> { }
+export = IoWrench;
diff --git a/types/react-icons/lib/io/xbox.d.ts b/types/react-icons/lib/io/xbox.d.ts
index 2d3db0cbbc..857e10a0e4 100644
--- a/types/react-icons/lib/io/xbox.d.ts
+++ b/types/react-icons/lib/io/xbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoXbox extends React.Component<IconBaseProps> { }
+declare class IoXbox extends React.Component<IconBaseProps> { }
+export = IoXbox;
diff --git a/types/react-icons/lib/md/3d-rotation.d.ts b/types/react-icons/lib/md/3d-rotation.d.ts
index 39d7887e16..cd124ed1dd 100644
--- a/types/react-icons/lib/md/3d-rotation.d.ts
+++ b/types/react-icons/lib/md/3d-rotation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class Md3dRotation extends React.Component<IconBaseProps> { }
+declare class Md3dRotation extends React.Component<IconBaseProps> { }
+export = Md3dRotation;
diff --git a/types/react-icons/lib/md/ac-unit.d.ts b/types/react-icons/lib/md/ac-unit.d.ts
index 19f6257f61..e5da2947aa 100644
--- a/types/react-icons/lib/md/ac-unit.d.ts
+++ b/types/react-icons/lib/md/ac-unit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAcUnit extends React.Component<IconBaseProps> { }
+declare class MdAcUnit extends React.Component<IconBaseProps> { }
+export = MdAcUnit;
diff --git a/types/react-icons/lib/md/access-alarm.d.ts b/types/react-icons/lib/md/access-alarm.d.ts
index 8bfb8edd91..7161430611 100644
--- a/types/react-icons/lib/md/access-alarm.d.ts
+++ b/types/react-icons/lib/md/access-alarm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessAlarm extends React.Component<IconBaseProps> { }
+declare class MdAccessAlarm extends React.Component<IconBaseProps> { }
+export = MdAccessAlarm;
diff --git a/types/react-icons/lib/md/access-alarms.d.ts b/types/react-icons/lib/md/access-alarms.d.ts
index 0d5b3fa4db..b984a238a4 100644
--- a/types/react-icons/lib/md/access-alarms.d.ts
+++ b/types/react-icons/lib/md/access-alarms.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessAlarms extends React.Component<IconBaseProps> { }
+declare class MdAccessAlarms extends React.Component<IconBaseProps> { }
+export = MdAccessAlarms;
diff --git a/types/react-icons/lib/md/access-time.d.ts b/types/react-icons/lib/md/access-time.d.ts
index 552cf439f3..bc39504143 100644
--- a/types/react-icons/lib/md/access-time.d.ts
+++ b/types/react-icons/lib/md/access-time.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessTime extends React.Component<IconBaseProps> { }
+declare class MdAccessTime extends React.Component<IconBaseProps> { }
+export = MdAccessTime;
diff --git a/types/react-icons/lib/md/accessibility.d.ts b/types/react-icons/lib/md/accessibility.d.ts
index 4160aa2c69..5ba4fd7f45 100644
--- a/types/react-icons/lib/md/accessibility.d.ts
+++ b/types/react-icons/lib/md/accessibility.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessibility extends React.Component<IconBaseProps> { }
+declare class MdAccessibility extends React.Component<IconBaseProps> { }
+export = MdAccessibility;
diff --git a/types/react-icons/lib/md/accessible.d.ts b/types/react-icons/lib/md/accessible.d.ts
index 180d7b0bc5..8ed1603dcb 100644
--- a/types/react-icons/lib/md/accessible.d.ts
+++ b/types/react-icons/lib/md/accessible.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessible extends React.Component<IconBaseProps> { }
+declare class MdAccessible extends React.Component<IconBaseProps> { }
+export = MdAccessible;
diff --git a/types/react-icons/lib/md/account-balance-wallet.d.ts b/types/react-icons/lib/md/account-balance-wallet.d.ts
index 469c3e9876..a6b7794282 100644
--- a/types/react-icons/lib/md/account-balance-wallet.d.ts
+++ b/types/react-icons/lib/md/account-balance-wallet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBalanceWallet extends React.Component<IconBaseProps> { }
+declare class MdAccountBalanceWallet extends React.Component<IconBaseProps> { }
+export = MdAccountBalanceWallet;
diff --git a/types/react-icons/lib/md/account-balance.d.ts b/types/react-icons/lib/md/account-balance.d.ts
index 22edcbea9a..e3677c0060 100644
--- a/types/react-icons/lib/md/account-balance.d.ts
+++ b/types/react-icons/lib/md/account-balance.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBalance extends React.Component<IconBaseProps> { }
+declare class MdAccountBalance extends React.Component<IconBaseProps> { }
+export = MdAccountBalance;
diff --git a/types/react-icons/lib/md/account-box.d.ts b/types/react-icons/lib/md/account-box.d.ts
index c49ee5214e..4bda5e52b3 100644
--- a/types/react-icons/lib/md/account-box.d.ts
+++ b/types/react-icons/lib/md/account-box.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBox extends React.Component<IconBaseProps> { }
+declare class MdAccountBox extends React.Component<IconBaseProps> { }
+export = MdAccountBox;
diff --git a/types/react-icons/lib/md/account-circle.d.ts b/types/react-icons/lib/md/account-circle.d.ts
index 6c9eab8aaf..fa6f5bba0b 100644
--- a/types/react-icons/lib/md/account-circle.d.ts
+++ b/types/react-icons/lib/md/account-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountCircle extends React.Component<IconBaseProps> { }
+declare class MdAccountCircle extends React.Component<IconBaseProps> { }
+export = MdAccountCircle;
diff --git a/types/react-icons/lib/md/adb.d.ts b/types/react-icons/lib/md/adb.d.ts
index f056821ad5..b7d64c1770 100644
--- a/types/react-icons/lib/md/adb.d.ts
+++ b/types/react-icons/lib/md/adb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAdb extends React.Component<IconBaseProps> { }
+declare class MdAdb extends React.Component<IconBaseProps> { }
+export = MdAdb;
diff --git a/types/react-icons/lib/md/add-a-photo.d.ts b/types/react-icons/lib/md/add-a-photo.d.ts
index 570d26f3da..6cb5e6913e 100644
--- a/types/react-icons/lib/md/add-a-photo.d.ts
+++ b/types/react-icons/lib/md/add-a-photo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAPhoto extends React.Component<IconBaseProps> { }
+declare class MdAddAPhoto extends React.Component<IconBaseProps> { }
+export = MdAddAPhoto;
diff --git a/types/react-icons/lib/md/add-alarm.d.ts b/types/react-icons/lib/md/add-alarm.d.ts
index 6b6f78f4b9..9c06d74684 100644
--- a/types/react-icons/lib/md/add-alarm.d.ts
+++ b/types/react-icons/lib/md/add-alarm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAlarm extends React.Component<IconBaseProps> { }
+declare class MdAddAlarm extends React.Component<IconBaseProps> { }
+export = MdAddAlarm;
diff --git a/types/react-icons/lib/md/add-alert.d.ts b/types/react-icons/lib/md/add-alert.d.ts
index b422649d52..cbc7689625 100644
--- a/types/react-icons/lib/md/add-alert.d.ts
+++ b/types/react-icons/lib/md/add-alert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAlert extends React.Component<IconBaseProps> { }
+declare class MdAddAlert extends React.Component<IconBaseProps> { }
+export = MdAddAlert;
diff --git a/types/react-icons/lib/md/add-box.d.ts b/types/react-icons/lib/md/add-box.d.ts
index 51e1f765c0..4993ca9c42 100644
--- a/types/react-icons/lib/md/add-box.d.ts
+++ b/types/react-icons/lib/md/add-box.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddBox extends React.Component<IconBaseProps> { }
+declare class MdAddBox extends React.Component<IconBaseProps> { }
+export = MdAddBox;
diff --git a/types/react-icons/lib/md/add-circle-outline.d.ts b/types/react-icons/lib/md/add-circle-outline.d.ts
index 981d8bb9ce..18e3b93a51 100644
--- a/types/react-icons/lib/md/add-circle-outline.d.ts
+++ b/types/react-icons/lib/md/add-circle-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddCircleOutline extends React.Component<IconBaseProps> { }
+declare class MdAddCircleOutline extends React.Component<IconBaseProps> { }
+export = MdAddCircleOutline;
diff --git a/types/react-icons/lib/md/add-circle.d.ts b/types/react-icons/lib/md/add-circle.d.ts
index a0a0991c0c..ab9788a759 100644
--- a/types/react-icons/lib/md/add-circle.d.ts
+++ b/types/react-icons/lib/md/add-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddCircle extends React.Component<IconBaseProps> { }
+declare class MdAddCircle extends React.Component<IconBaseProps> { }
+export = MdAddCircle;
diff --git a/types/react-icons/lib/md/add-location.d.ts b/types/react-icons/lib/md/add-location.d.ts
index 98b0f328a3..c9daea88b7 100644
--- a/types/react-icons/lib/md/add-location.d.ts
+++ b/types/react-icons/lib/md/add-location.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddLocation extends React.Component<IconBaseProps> { }
+declare class MdAddLocation extends React.Component<IconBaseProps> { }
+export = MdAddLocation;
diff --git a/types/react-icons/lib/md/add-shopping-cart.d.ts b/types/react-icons/lib/md/add-shopping-cart.d.ts
index 52ad95dd6f..bdaf9c181a 100644
--- a/types/react-icons/lib/md/add-shopping-cart.d.ts
+++ b/types/react-icons/lib/md/add-shopping-cart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddShoppingCart extends React.Component<IconBaseProps> { }
+declare class MdAddShoppingCart extends React.Component<IconBaseProps> { }
+export = MdAddShoppingCart;
diff --git a/types/react-icons/lib/md/add-to-photos.d.ts b/types/react-icons/lib/md/add-to-photos.d.ts
index 0eac8c47b2..6d4c39746b 100644
--- a/types/react-icons/lib/md/add-to-photos.d.ts
+++ b/types/react-icons/lib/md/add-to-photos.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddToPhotos extends React.Component<IconBaseProps> { }
+declare class MdAddToPhotos extends React.Component<IconBaseProps> { }
+export = MdAddToPhotos;
diff --git a/types/react-icons/lib/md/add-to-queue.d.ts b/types/react-icons/lib/md/add-to-queue.d.ts
index 2bf4474037..fda144a00f 100644
--- a/types/react-icons/lib/md/add-to-queue.d.ts
+++ b/types/react-icons/lib/md/add-to-queue.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddToQueue extends React.Component<IconBaseProps> { }
+declare class MdAddToQueue extends React.Component<IconBaseProps> { }
+export = MdAddToQueue;
diff --git a/types/react-icons/lib/md/add.d.ts b/types/react-icons/lib/md/add.d.ts
index 1b7fb63078..1d69eb0d75 100644
--- a/types/react-icons/lib/md/add.d.ts
+++ b/types/react-icons/lib/md/add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAdd extends React.Component<IconBaseProps> { }
+declare class MdAdd extends React.Component<IconBaseProps> { }
+export = MdAdd;
diff --git a/types/react-icons/lib/md/adjust.d.ts b/types/react-icons/lib/md/adjust.d.ts
index c511d98a86..3c49edc056 100644
--- a/types/react-icons/lib/md/adjust.d.ts
+++ b/types/react-icons/lib/md/adjust.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAdjust extends React.Component<IconBaseProps> { }
+declare class MdAdjust extends React.Component<IconBaseProps> { }
+export = MdAdjust;
diff --git a/types/react-icons/lib/md/airline-seat-flat-angled.d.ts b/types/react-icons/lib/md/airline-seat-flat-angled.d.ts
index 27306970ac..4437e4979f 100644
--- a/types/react-icons/lib/md/airline-seat-flat-angled.d.ts
+++ b/types/react-icons/lib/md/airline-seat-flat-angled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatFlatAngled extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatFlatAngled extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatFlatAngled;
diff --git a/types/react-icons/lib/md/airline-seat-flat.d.ts b/types/react-icons/lib/md/airline-seat-flat.d.ts
index 2708f28c19..6b0d949980 100644
--- a/types/react-icons/lib/md/airline-seat-flat.d.ts
+++ b/types/react-icons/lib/md/airline-seat-flat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatFlat extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatFlat extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatFlat;
diff --git a/types/react-icons/lib/md/airline-seat-individual-suite.d.ts b/types/react-icons/lib/md/airline-seat-individual-suite.d.ts
index 1231fdffbc..08ca9b6c60 100644
--- a/types/react-icons/lib/md/airline-seat-individual-suite.d.ts
+++ b/types/react-icons/lib/md/airline-seat-individual-suite.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatIndividualSuite extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatIndividualSuite extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatIndividualSuite;
diff --git a/types/react-icons/lib/md/airline-seat-legroom-extra.d.ts b/types/react-icons/lib/md/airline-seat-legroom-extra.d.ts
index 8e48abc5df..3fa5d3da1d 100644
--- a/types/react-icons/lib/md/airline-seat-legroom-extra.d.ts
+++ b/types/react-icons/lib/md/airline-seat-legroom-extra.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomExtra extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatLegroomExtra extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatLegroomExtra;
diff --git a/types/react-icons/lib/md/airline-seat-legroom-normal.d.ts b/types/react-icons/lib/md/airline-seat-legroom-normal.d.ts
index 09cdf92d8a..e164c9cc85 100644
--- a/types/react-icons/lib/md/airline-seat-legroom-normal.d.ts
+++ b/types/react-icons/lib/md/airline-seat-legroom-normal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomNormal extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatLegroomNormal extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatLegroomNormal;
diff --git a/types/react-icons/lib/md/airline-seat-legroom-reduced.d.ts b/types/react-icons/lib/md/airline-seat-legroom-reduced.d.ts
index e969b216a4..49c72be865 100644
--- a/types/react-icons/lib/md/airline-seat-legroom-reduced.d.ts
+++ b/types/react-icons/lib/md/airline-seat-legroom-reduced.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomReduced extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatLegroomReduced extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatLegroomReduced;
diff --git a/types/react-icons/lib/md/airline-seat-recline-extra.d.ts b/types/react-icons/lib/md/airline-seat-recline-extra.d.ts
index f675688c5c..62a9044496 100644
--- a/types/react-icons/lib/md/airline-seat-recline-extra.d.ts
+++ b/types/react-icons/lib/md/airline-seat-recline-extra.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatReclineExtra extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatReclineExtra extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatReclineExtra;
diff --git a/types/react-icons/lib/md/airline-seat-recline-normal.d.ts b/types/react-icons/lib/md/airline-seat-recline-normal.d.ts
index 2d7aeacd54..785727e347 100644
--- a/types/react-icons/lib/md/airline-seat-recline-normal.d.ts
+++ b/types/react-icons/lib/md/airline-seat-recline-normal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatReclineNormal extends React.Component<IconBaseProps> { }
+declare class MdAirlineSeatReclineNormal extends React.Component<IconBaseProps> { }
+export = MdAirlineSeatReclineNormal;
diff --git a/types/react-icons/lib/md/airplanemode-active.d.ts b/types/react-icons/lib/md/airplanemode-active.d.ts
index 64924f7457..e7b6ab9c76 100644
--- a/types/react-icons/lib/md/airplanemode-active.d.ts
+++ b/types/react-icons/lib/md/airplanemode-active.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplanemodeActive extends React.Component<IconBaseProps> { }
+declare class MdAirplanemodeActive extends React.Component<IconBaseProps> { }
+export = MdAirplanemodeActive;
diff --git a/types/react-icons/lib/md/airplanemode-inactive.d.ts b/types/react-icons/lib/md/airplanemode-inactive.d.ts
index bea28feef8..cbcde22bfe 100644
--- a/types/react-icons/lib/md/airplanemode-inactive.d.ts
+++ b/types/react-icons/lib/md/airplanemode-inactive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplanemodeInactive extends React.Component<IconBaseProps> { }
+declare class MdAirplanemodeInactive extends React.Component<IconBaseProps> { }
+export = MdAirplanemodeInactive;
diff --git a/types/react-icons/lib/md/airplay.d.ts b/types/react-icons/lib/md/airplay.d.ts
index 0b7d8346dc..3b840e58a8 100644
--- a/types/react-icons/lib/md/airplay.d.ts
+++ b/types/react-icons/lib/md/airplay.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplay extends React.Component<IconBaseProps> { }
+declare class MdAirplay extends React.Component<IconBaseProps> { }
+export = MdAirplay;
diff --git a/types/react-icons/lib/md/airport-shuttle.d.ts b/types/react-icons/lib/md/airport-shuttle.d.ts
index 4d81dcca74..834d5e6b78 100644
--- a/types/react-icons/lib/md/airport-shuttle.d.ts
+++ b/types/react-icons/lib/md/airport-shuttle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirportShuttle extends React.Component<IconBaseProps> { }
+declare class MdAirportShuttle extends React.Component<IconBaseProps> { }
+export = MdAirportShuttle;
diff --git a/types/react-icons/lib/md/alarm-add.d.ts b/types/react-icons/lib/md/alarm-add.d.ts
index d54261c71e..2a27963c11 100644
--- a/types/react-icons/lib/md/alarm-add.d.ts
+++ b/types/react-icons/lib/md/alarm-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmAdd extends React.Component<IconBaseProps> { }
+declare class MdAlarmAdd extends React.Component<IconBaseProps> { }
+export = MdAlarmAdd;
diff --git a/types/react-icons/lib/md/alarm-off.d.ts b/types/react-icons/lib/md/alarm-off.d.ts
index 637956f31a..c00b155183 100644
--- a/types/react-icons/lib/md/alarm-off.d.ts
+++ b/types/react-icons/lib/md/alarm-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmOff extends React.Component<IconBaseProps> { }
+declare class MdAlarmOff extends React.Component<IconBaseProps> { }
+export = MdAlarmOff;
diff --git a/types/react-icons/lib/md/alarm-on.d.ts b/types/react-icons/lib/md/alarm-on.d.ts
index 8ced06b55a..4c80b52859 100644
--- a/types/react-icons/lib/md/alarm-on.d.ts
+++ b/types/react-icons/lib/md/alarm-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmOn extends React.Component<IconBaseProps> { }
+declare class MdAlarmOn extends React.Component<IconBaseProps> { }
+export = MdAlarmOn;
diff --git a/types/react-icons/lib/md/alarm.d.ts b/types/react-icons/lib/md/alarm.d.ts
index 784b55604a..42fca7a006 100644
--- a/types/react-icons/lib/md/alarm.d.ts
+++ b/types/react-icons/lib/md/alarm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarm extends React.Component<IconBaseProps> { }
+declare class MdAlarm extends React.Component<IconBaseProps> { }
+export = MdAlarm;
diff --git a/types/react-icons/lib/md/album.d.ts b/types/react-icons/lib/md/album.d.ts
index b7c2dedcad..09c212215c 100644
--- a/types/react-icons/lib/md/album.d.ts
+++ b/types/react-icons/lib/md/album.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlbum extends React.Component<IconBaseProps> { }
+declare class MdAlbum extends React.Component<IconBaseProps> { }
+export = MdAlbum;
diff --git a/types/react-icons/lib/md/all-inclusive.d.ts b/types/react-icons/lib/md/all-inclusive.d.ts
index 121315d268..42e5cf6007 100644
--- a/types/react-icons/lib/md/all-inclusive.d.ts
+++ b/types/react-icons/lib/md/all-inclusive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAllInclusive extends React.Component<IconBaseProps> { }
+declare class MdAllInclusive extends React.Component<IconBaseProps> { }
+export = MdAllInclusive;
diff --git a/types/react-icons/lib/md/all-out.d.ts b/types/react-icons/lib/md/all-out.d.ts
index feba801059..2c4a26c76f 100644
--- a/types/react-icons/lib/md/all-out.d.ts
+++ b/types/react-icons/lib/md/all-out.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAllOut extends React.Component<IconBaseProps> { }
+declare class MdAllOut extends React.Component<IconBaseProps> { }
+export = MdAllOut;
diff --git a/types/react-icons/lib/md/android.d.ts b/types/react-icons/lib/md/android.d.ts
index d5821263bd..adf4741a7c 100644
--- a/types/react-icons/lib/md/android.d.ts
+++ b/types/react-icons/lib/md/android.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAndroid extends React.Component<IconBaseProps> { }
+declare class MdAndroid extends React.Component<IconBaseProps> { }
+export = MdAndroid;
diff --git a/types/react-icons/lib/md/announcement.d.ts b/types/react-icons/lib/md/announcement.d.ts
index 05af68d6c9..21f51fadcb 100644
--- a/types/react-icons/lib/md/announcement.d.ts
+++ b/types/react-icons/lib/md/announcement.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAnnouncement extends React.Component<IconBaseProps> { }
+declare class MdAnnouncement extends React.Component<IconBaseProps> { }
+export = MdAnnouncement;
diff --git a/types/react-icons/lib/md/apps.d.ts b/types/react-icons/lib/md/apps.d.ts
index 605c867e9d..be159c2793 100644
--- a/types/react-icons/lib/md/apps.d.ts
+++ b/types/react-icons/lib/md/apps.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdApps extends React.Component<IconBaseProps> { }
+declare class MdApps extends React.Component<IconBaseProps> { }
+export = MdApps;
diff --git a/types/react-icons/lib/md/archive.d.ts b/types/react-icons/lib/md/archive.d.ts
index 00cc76de31..2738255b53 100644
--- a/types/react-icons/lib/md/archive.d.ts
+++ b/types/react-icons/lib/md/archive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArchive extends React.Component<IconBaseProps> { }
+declare class MdArchive extends React.Component<IconBaseProps> { }
+export = MdArchive;
diff --git a/types/react-icons/lib/md/arrow-back.d.ts b/types/react-icons/lib/md/arrow-back.d.ts
index d140fa63a4..0d37103473 100644
--- a/types/react-icons/lib/md/arrow-back.d.ts
+++ b/types/react-icons/lib/md/arrow-back.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowBack extends React.Component<IconBaseProps> { }
+declare class MdArrowBack extends React.Component<IconBaseProps> { }
+export = MdArrowBack;
diff --git a/types/react-icons/lib/md/arrow-downward.d.ts b/types/react-icons/lib/md/arrow-downward.d.ts
index 2d764aa5a0..e634a027a4 100644
--- a/types/react-icons/lib/md/arrow-downward.d.ts
+++ b/types/react-icons/lib/md/arrow-downward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDownward extends React.Component<IconBaseProps> { }
+declare class MdArrowDownward extends React.Component<IconBaseProps> { }
+export = MdArrowDownward;
diff --git a/types/react-icons/lib/md/arrow-drop-down-circle.d.ts b/types/react-icons/lib/md/arrow-drop-down-circle.d.ts
index 4a2bae7ded..1705ff9b19 100644
--- a/types/react-icons/lib/md/arrow-drop-down-circle.d.ts
+++ b/types/react-icons/lib/md/arrow-drop-down-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropDownCircle extends React.Component<IconBaseProps> { }
+declare class MdArrowDropDownCircle extends React.Component<IconBaseProps> { }
+export = MdArrowDropDownCircle;
diff --git a/types/react-icons/lib/md/arrow-drop-down.d.ts b/types/react-icons/lib/md/arrow-drop-down.d.ts
index 0e99216f42..333105147d 100644
--- a/types/react-icons/lib/md/arrow-drop-down.d.ts
+++ b/types/react-icons/lib/md/arrow-drop-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropDown extends React.Component<IconBaseProps> { }
+declare class MdArrowDropDown extends React.Component<IconBaseProps> { }
+export = MdArrowDropDown;
diff --git a/types/react-icons/lib/md/arrow-drop-up.d.ts b/types/react-icons/lib/md/arrow-drop-up.d.ts
index efa55f2df4..87d3f77f8d 100644
--- a/types/react-icons/lib/md/arrow-drop-up.d.ts
+++ b/types/react-icons/lib/md/arrow-drop-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropUp extends React.Component<IconBaseProps> { }
+declare class MdArrowDropUp extends React.Component<IconBaseProps> { }
+export = MdArrowDropUp;
diff --git a/types/react-icons/lib/md/arrow-forward.d.ts b/types/react-icons/lib/md/arrow-forward.d.ts
index 1d3771ddd7..1d25c6bafb 100644
--- a/types/react-icons/lib/md/arrow-forward.d.ts
+++ b/types/react-icons/lib/md/arrow-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowForward extends React.Component<IconBaseProps> { }
+declare class MdArrowForward extends React.Component<IconBaseProps> { }
+export = MdArrowForward;
diff --git a/types/react-icons/lib/md/arrow-upward.d.ts b/types/react-icons/lib/md/arrow-upward.d.ts
index cd8f601ed9..a734eaeaa0 100644
--- a/types/react-icons/lib/md/arrow-upward.d.ts
+++ b/types/react-icons/lib/md/arrow-upward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowUpward extends React.Component<IconBaseProps> { }
+declare class MdArrowUpward extends React.Component<IconBaseProps> { }
+export = MdArrowUpward;
diff --git a/types/react-icons/lib/md/art-track.d.ts b/types/react-icons/lib/md/art-track.d.ts
index 9893405dfd..e9015ed4f1 100644
--- a/types/react-icons/lib/md/art-track.d.ts
+++ b/types/react-icons/lib/md/art-track.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArtTrack extends React.Component<IconBaseProps> { }
+declare class MdArtTrack extends React.Component<IconBaseProps> { }
+export = MdArtTrack;
diff --git a/types/react-icons/lib/md/aspect-ratio.d.ts b/types/react-icons/lib/md/aspect-ratio.d.ts
index b0d6311f3e..8a645fba11 100644
--- a/types/react-icons/lib/md/aspect-ratio.d.ts
+++ b/types/react-icons/lib/md/aspect-ratio.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAspectRatio extends React.Component<IconBaseProps> { }
+declare class MdAspectRatio extends React.Component<IconBaseProps> { }
+export = MdAspectRatio;
diff --git a/types/react-icons/lib/md/assessment.d.ts b/types/react-icons/lib/md/assessment.d.ts
index 1c4979bd1f..af6f64a977 100644
--- a/types/react-icons/lib/md/assessment.d.ts
+++ b/types/react-icons/lib/md/assessment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssessment extends React.Component<IconBaseProps> { }
+declare class MdAssessment extends React.Component<IconBaseProps> { }
+export = MdAssessment;
diff --git a/types/react-icons/lib/md/assignment-ind.d.ts b/types/react-icons/lib/md/assignment-ind.d.ts
index 6a0c5f2107..8518cf2402 100644
--- a/types/react-icons/lib/md/assignment-ind.d.ts
+++ b/types/react-icons/lib/md/assignment-ind.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentInd extends React.Component<IconBaseProps> { }
+declare class MdAssignmentInd extends React.Component<IconBaseProps> { }
+export = MdAssignmentInd;
diff --git a/types/react-icons/lib/md/assignment-late.d.ts b/types/react-icons/lib/md/assignment-late.d.ts
index 5aa4d5dcdd..c62da79ac3 100644
--- a/types/react-icons/lib/md/assignment-late.d.ts
+++ b/types/react-icons/lib/md/assignment-late.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentLate extends React.Component<IconBaseProps> { }
+declare class MdAssignmentLate extends React.Component<IconBaseProps> { }
+export = MdAssignmentLate;
diff --git a/types/react-icons/lib/md/assignment-return.d.ts b/types/react-icons/lib/md/assignment-return.d.ts
index e34eea0e8d..3f565dafab 100644
--- a/types/react-icons/lib/md/assignment-return.d.ts
+++ b/types/react-icons/lib/md/assignment-return.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentReturn extends React.Component<IconBaseProps> { }
+declare class MdAssignmentReturn extends React.Component<IconBaseProps> { }
+export = MdAssignmentReturn;
diff --git a/types/react-icons/lib/md/assignment-returned.d.ts b/types/react-icons/lib/md/assignment-returned.d.ts
index 5f3c6039ee..ec35682fdc 100644
--- a/types/react-icons/lib/md/assignment-returned.d.ts
+++ b/types/react-icons/lib/md/assignment-returned.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentReturned extends React.Component<IconBaseProps> { }
+declare class MdAssignmentReturned extends React.Component<IconBaseProps> { }
+export = MdAssignmentReturned;
diff --git a/types/react-icons/lib/md/assignment-turned-in.d.ts b/types/react-icons/lib/md/assignment-turned-in.d.ts
index c055e90d7f..013d97808d 100644
--- a/types/react-icons/lib/md/assignment-turned-in.d.ts
+++ b/types/react-icons/lib/md/assignment-turned-in.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentTurnedIn extends React.Component<IconBaseProps> { }
+declare class MdAssignmentTurnedIn extends React.Component<IconBaseProps> { }
+export = MdAssignmentTurnedIn;
diff --git a/types/react-icons/lib/md/assignment.d.ts b/types/react-icons/lib/md/assignment.d.ts
index dc96f96868..daf2f8974c 100644
--- a/types/react-icons/lib/md/assignment.d.ts
+++ b/types/react-icons/lib/md/assignment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignment extends React.Component<IconBaseProps> { }
+declare class MdAssignment extends React.Component<IconBaseProps> { }
+export = MdAssignment;
diff --git a/types/react-icons/lib/md/assistant-photo.d.ts b/types/react-icons/lib/md/assistant-photo.d.ts
index 2bf4459503..0e25dc2286 100644
--- a/types/react-icons/lib/md/assistant-photo.d.ts
+++ b/types/react-icons/lib/md/assistant-photo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssistantPhoto extends React.Component<IconBaseProps> { }
+declare class MdAssistantPhoto extends React.Component<IconBaseProps> { }
+export = MdAssistantPhoto;
diff --git a/types/react-icons/lib/md/assistant.d.ts b/types/react-icons/lib/md/assistant.d.ts
index 06007d112b..79968f7c35 100644
--- a/types/react-icons/lib/md/assistant.d.ts
+++ b/types/react-icons/lib/md/assistant.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssistant extends React.Component<IconBaseProps> { }
+declare class MdAssistant extends React.Component<IconBaseProps> { }
+export = MdAssistant;
diff --git a/types/react-icons/lib/md/attach-file.d.ts b/types/react-icons/lib/md/attach-file.d.ts
index 62aba0f830..250c8ef7dd 100644
--- a/types/react-icons/lib/md/attach-file.d.ts
+++ b/types/react-icons/lib/md/attach-file.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachFile extends React.Component<IconBaseProps> { }
+declare class MdAttachFile extends React.Component<IconBaseProps> { }
+export = MdAttachFile;
diff --git a/types/react-icons/lib/md/attach-money.d.ts b/types/react-icons/lib/md/attach-money.d.ts
index 23dfd03a14..5257e2a068 100644
--- a/types/react-icons/lib/md/attach-money.d.ts
+++ b/types/react-icons/lib/md/attach-money.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachMoney extends React.Component<IconBaseProps> { }
+declare class MdAttachMoney extends React.Component<IconBaseProps> { }
+export = MdAttachMoney;
diff --git a/types/react-icons/lib/md/attachment.d.ts b/types/react-icons/lib/md/attachment.d.ts
index 66a076a0df..b9ee26291e 100644
--- a/types/react-icons/lib/md/attachment.d.ts
+++ b/types/react-icons/lib/md/attachment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachment extends React.Component<IconBaseProps> { }
+declare class MdAttachment extends React.Component<IconBaseProps> { }
+export = MdAttachment;
diff --git a/types/react-icons/lib/md/audiotrack.d.ts b/types/react-icons/lib/md/audiotrack.d.ts
index 0fb3a781aa..b36fbee5b7 100644
--- a/types/react-icons/lib/md/audiotrack.d.ts
+++ b/types/react-icons/lib/md/audiotrack.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAudiotrack extends React.Component<IconBaseProps> { }
+declare class MdAudiotrack extends React.Component<IconBaseProps> { }
+export = MdAudiotrack;
diff --git a/types/react-icons/lib/md/autorenew.d.ts b/types/react-icons/lib/md/autorenew.d.ts
index 3dc1215c35..1d1347e4f4 100644
--- a/types/react-icons/lib/md/autorenew.d.ts
+++ b/types/react-icons/lib/md/autorenew.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAutorenew extends React.Component<IconBaseProps> { }
+declare class MdAutorenew extends React.Component<IconBaseProps> { }
+export = MdAutorenew;
diff --git a/types/react-icons/lib/md/av-timer.d.ts b/types/react-icons/lib/md/av-timer.d.ts
index d050eb13b6..2e7d9ff423 100644
--- a/types/react-icons/lib/md/av-timer.d.ts
+++ b/types/react-icons/lib/md/av-timer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAvTimer extends React.Component<IconBaseProps> { }
+declare class MdAvTimer extends React.Component<IconBaseProps> { }
+export = MdAvTimer;
diff --git a/types/react-icons/lib/md/backspace.d.ts b/types/react-icons/lib/md/backspace.d.ts
index c462bc8c5c..2b5144cf4d 100644
--- a/types/react-icons/lib/md/backspace.d.ts
+++ b/types/react-icons/lib/md/backspace.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBackspace extends React.Component<IconBaseProps> { }
+declare class MdBackspace extends React.Component<IconBaseProps> { }
+export = MdBackspace;
diff --git a/types/react-icons/lib/md/backup.d.ts b/types/react-icons/lib/md/backup.d.ts
index ab43c6934f..cb95ac3dfd 100644
--- a/types/react-icons/lib/md/backup.d.ts
+++ b/types/react-icons/lib/md/backup.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBackup extends React.Component<IconBaseProps> { }
+declare class MdBackup extends React.Component<IconBaseProps> { }
+export = MdBackup;
diff --git a/types/react-icons/lib/md/battery-alert.d.ts b/types/react-icons/lib/md/battery-alert.d.ts
index c19ea98a0b..727e2b83f6 100644
--- a/types/react-icons/lib/md/battery-alert.d.ts
+++ b/types/react-icons/lib/md/battery-alert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryAlert extends React.Component<IconBaseProps> { }
+declare class MdBatteryAlert extends React.Component<IconBaseProps> { }
+export = MdBatteryAlert;
diff --git a/types/react-icons/lib/md/battery-charging-full.d.ts b/types/react-icons/lib/md/battery-charging-full.d.ts
index c85f75a71a..e38bce2394 100644
--- a/types/react-icons/lib/md/battery-charging-full.d.ts
+++ b/types/react-icons/lib/md/battery-charging-full.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryChargingFull extends React.Component<IconBaseProps> { }
+declare class MdBatteryChargingFull extends React.Component<IconBaseProps> { }
+export = MdBatteryChargingFull;
diff --git a/types/react-icons/lib/md/battery-full.d.ts b/types/react-icons/lib/md/battery-full.d.ts
index 0aca5efc47..f4670ad1f7 100644
--- a/types/react-icons/lib/md/battery-full.d.ts
+++ b/types/react-icons/lib/md/battery-full.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryFull extends React.Component<IconBaseProps> { }
+declare class MdBatteryFull extends React.Component<IconBaseProps> { }
+export = MdBatteryFull;
diff --git a/types/react-icons/lib/md/battery-std.d.ts b/types/react-icons/lib/md/battery-std.d.ts
index 3db6971900..0886063916 100644
--- a/types/react-icons/lib/md/battery-std.d.ts
+++ b/types/react-icons/lib/md/battery-std.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryStd extends React.Component<IconBaseProps> { }
+declare class MdBatteryStd extends React.Component<IconBaseProps> { }
+export = MdBatteryStd;
diff --git a/types/react-icons/lib/md/battery-unknown.d.ts b/types/react-icons/lib/md/battery-unknown.d.ts
index 85dc874ccb..44bae4c72d 100644
--- a/types/react-icons/lib/md/battery-unknown.d.ts
+++ b/types/react-icons/lib/md/battery-unknown.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryUnknown extends React.Component<IconBaseProps> { }
+declare class MdBatteryUnknown extends React.Component<IconBaseProps> { }
+export = MdBatteryUnknown;
diff --git a/types/react-icons/lib/md/beach-access.d.ts b/types/react-icons/lib/md/beach-access.d.ts
index bb0f5e8d09..df62947d77 100644
--- a/types/react-icons/lib/md/beach-access.d.ts
+++ b/types/react-icons/lib/md/beach-access.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBeachAccess extends React.Component<IconBaseProps> { }
+declare class MdBeachAccess extends React.Component<IconBaseProps> { }
+export = MdBeachAccess;
diff --git a/types/react-icons/lib/md/beenhere.d.ts b/types/react-icons/lib/md/beenhere.d.ts
index a428d7199e..203c154745 100644
--- a/types/react-icons/lib/md/beenhere.d.ts
+++ b/types/react-icons/lib/md/beenhere.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBeenhere extends React.Component<IconBaseProps> { }
+declare class MdBeenhere extends React.Component<IconBaseProps> { }
+export = MdBeenhere;
diff --git a/types/react-icons/lib/md/block.d.ts b/types/react-icons/lib/md/block.d.ts
index f5496f14bb..df16af7f26 100644
--- a/types/react-icons/lib/md/block.d.ts
+++ b/types/react-icons/lib/md/block.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlock extends React.Component<IconBaseProps> { }
+declare class MdBlock extends React.Component<IconBaseProps> { }
+export = MdBlock;
diff --git a/types/react-icons/lib/md/bluetooth-audio.d.ts b/types/react-icons/lib/md/bluetooth-audio.d.ts
index 29629f8a81..37d19037e0 100644
--- a/types/react-icons/lib/md/bluetooth-audio.d.ts
+++ b/types/react-icons/lib/md/bluetooth-audio.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothAudio extends React.Component<IconBaseProps> { }
+declare class MdBluetoothAudio extends React.Component<IconBaseProps> { }
+export = MdBluetoothAudio;
diff --git a/types/react-icons/lib/md/bluetooth-connected.d.ts b/types/react-icons/lib/md/bluetooth-connected.d.ts
index 7ea9477b1b..c43382457d 100644
--- a/types/react-icons/lib/md/bluetooth-connected.d.ts
+++ b/types/react-icons/lib/md/bluetooth-connected.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothConnected extends React.Component<IconBaseProps> { }
+declare class MdBluetoothConnected extends React.Component<IconBaseProps> { }
+export = MdBluetoothConnected;
diff --git a/types/react-icons/lib/md/bluetooth-disabled.d.ts b/types/react-icons/lib/md/bluetooth-disabled.d.ts
index 685074c6eb..22dedb5b6f 100644
--- a/types/react-icons/lib/md/bluetooth-disabled.d.ts
+++ b/types/react-icons/lib/md/bluetooth-disabled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothDisabled extends React.Component<IconBaseProps> { }
+declare class MdBluetoothDisabled extends React.Component<IconBaseProps> { }
+export = MdBluetoothDisabled;
diff --git a/types/react-icons/lib/md/bluetooth-searching.d.ts b/types/react-icons/lib/md/bluetooth-searching.d.ts
index d258e69bd7..1096cc5867 100644
--- a/types/react-icons/lib/md/bluetooth-searching.d.ts
+++ b/types/react-icons/lib/md/bluetooth-searching.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothSearching extends React.Component<IconBaseProps> { }
+declare class MdBluetoothSearching extends React.Component<IconBaseProps> { }
+export = MdBluetoothSearching;
diff --git a/types/react-icons/lib/md/bluetooth.d.ts b/types/react-icons/lib/md/bluetooth.d.ts
index 9343fadbf2..26e9b31401 100644
--- a/types/react-icons/lib/md/bluetooth.d.ts
+++ b/types/react-icons/lib/md/bluetooth.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetooth extends React.Component<IconBaseProps> { }
+declare class MdBluetooth extends React.Component<IconBaseProps> { }
+export = MdBluetooth;
diff --git a/types/react-icons/lib/md/blur-circular.d.ts b/types/react-icons/lib/md/blur-circular.d.ts
index 27b3bb0ae2..e391be6aac 100644
--- a/types/react-icons/lib/md/blur-circular.d.ts
+++ b/types/react-icons/lib/md/blur-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurCircular extends React.Component<IconBaseProps> { }
+declare class MdBlurCircular extends React.Component<IconBaseProps> { }
+export = MdBlurCircular;
diff --git a/types/react-icons/lib/md/blur-linear.d.ts b/types/react-icons/lib/md/blur-linear.d.ts
index e077a469b1..c7e2ed71b0 100644
--- a/types/react-icons/lib/md/blur-linear.d.ts
+++ b/types/react-icons/lib/md/blur-linear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurLinear extends React.Component<IconBaseProps> { }
+declare class MdBlurLinear extends React.Component<IconBaseProps> { }
+export = MdBlurLinear;
diff --git a/types/react-icons/lib/md/blur-off.d.ts b/types/react-icons/lib/md/blur-off.d.ts
index df3c89e207..34bf839572 100644
--- a/types/react-icons/lib/md/blur-off.d.ts
+++ b/types/react-icons/lib/md/blur-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurOff extends React.Component<IconBaseProps> { }
+declare class MdBlurOff extends React.Component<IconBaseProps> { }
+export = MdBlurOff;
diff --git a/types/react-icons/lib/md/blur-on.d.ts b/types/react-icons/lib/md/blur-on.d.ts
index ade64f3147..eb427415a6 100644
--- a/types/react-icons/lib/md/blur-on.d.ts
+++ b/types/react-icons/lib/md/blur-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurOn extends React.Component<IconBaseProps> { }
+declare class MdBlurOn extends React.Component<IconBaseProps> { }
+export = MdBlurOn;
diff --git a/types/react-icons/lib/md/book.d.ts b/types/react-icons/lib/md/book.d.ts
index 593fefe912..4f026cc906 100644
--- a/types/react-icons/lib/md/book.d.ts
+++ b/types/react-icons/lib/md/book.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBook extends React.Component<IconBaseProps> { }
+declare class MdBook extends React.Component<IconBaseProps> { }
+export = MdBook;
diff --git a/types/react-icons/lib/md/bookmark-outline.d.ts b/types/react-icons/lib/md/bookmark-outline.d.ts
index 630c78b12b..49d5711340 100644
--- a/types/react-icons/lib/md/bookmark-outline.d.ts
+++ b/types/react-icons/lib/md/bookmark-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBookmarkOutline extends React.Component<IconBaseProps> { }
+declare class MdBookmarkOutline extends React.Component<IconBaseProps> { }
+export = MdBookmarkOutline;
diff --git a/types/react-icons/lib/md/bookmark.d.ts b/types/react-icons/lib/md/bookmark.d.ts
index b180f81ce4..1ea3fdef2f 100644
--- a/types/react-icons/lib/md/bookmark.d.ts
+++ b/types/react-icons/lib/md/bookmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBookmark extends React.Component<IconBaseProps> { }
+declare class MdBookmark extends React.Component<IconBaseProps> { }
+export = MdBookmark;
diff --git a/types/react-icons/lib/md/border-all.d.ts b/types/react-icons/lib/md/border-all.d.ts
index 111f24de6b..321dc40acf 100644
--- a/types/react-icons/lib/md/border-all.d.ts
+++ b/types/react-icons/lib/md/border-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderAll extends React.Component<IconBaseProps> { }
+declare class MdBorderAll extends React.Component<IconBaseProps> { }
+export = MdBorderAll;
diff --git a/types/react-icons/lib/md/border-bottom.d.ts b/types/react-icons/lib/md/border-bottom.d.ts
index 979bd252bb..4af9bc2a3e 100644
--- a/types/react-icons/lib/md/border-bottom.d.ts
+++ b/types/react-icons/lib/md/border-bottom.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderBottom extends React.Component<IconBaseProps> { }
+declare class MdBorderBottom extends React.Component<IconBaseProps> { }
+export = MdBorderBottom;
diff --git a/types/react-icons/lib/md/border-clear.d.ts b/types/react-icons/lib/md/border-clear.d.ts
index 2d76f24b12..babade9381 100644
--- a/types/react-icons/lib/md/border-clear.d.ts
+++ b/types/react-icons/lib/md/border-clear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderClear extends React.Component<IconBaseProps> { }
+declare class MdBorderClear extends React.Component<IconBaseProps> { }
+export = MdBorderClear;
diff --git a/types/react-icons/lib/md/border-color.d.ts b/types/react-icons/lib/md/border-color.d.ts
index b9ddd9918c..3eb6611e0a 100644
--- a/types/react-icons/lib/md/border-color.d.ts
+++ b/types/react-icons/lib/md/border-color.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderColor extends React.Component<IconBaseProps> { }
+declare class MdBorderColor extends React.Component<IconBaseProps> { }
+export = MdBorderColor;
diff --git a/types/react-icons/lib/md/border-horizontal.d.ts b/types/react-icons/lib/md/border-horizontal.d.ts
index 7f1e473277..642f6f9b14 100644
--- a/types/react-icons/lib/md/border-horizontal.d.ts
+++ b/types/react-icons/lib/md/border-horizontal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderHorizontal extends React.Component<IconBaseProps> { }
+declare class MdBorderHorizontal extends React.Component<IconBaseProps> { }
+export = MdBorderHorizontal;
diff --git a/types/react-icons/lib/md/border-inner.d.ts b/types/react-icons/lib/md/border-inner.d.ts
index 2a807b9ce2..318ee29d9c 100644
--- a/types/react-icons/lib/md/border-inner.d.ts
+++ b/types/react-icons/lib/md/border-inner.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderInner extends React.Component<IconBaseProps> { }
+declare class MdBorderInner extends React.Component<IconBaseProps> { }
+export = MdBorderInner;
diff --git a/types/react-icons/lib/md/border-left.d.ts b/types/react-icons/lib/md/border-left.d.ts
index 062bf7af75..3d710840c8 100644
--- a/types/react-icons/lib/md/border-left.d.ts
+++ b/types/react-icons/lib/md/border-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderLeft extends React.Component<IconBaseProps> { }
+declare class MdBorderLeft extends React.Component<IconBaseProps> { }
+export = MdBorderLeft;
diff --git a/types/react-icons/lib/md/border-outer.d.ts b/types/react-icons/lib/md/border-outer.d.ts
index 60e13b29ad..ab7a282419 100644
--- a/types/react-icons/lib/md/border-outer.d.ts
+++ b/types/react-icons/lib/md/border-outer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderOuter extends React.Component<IconBaseProps> { }
+declare class MdBorderOuter extends React.Component<IconBaseProps> { }
+export = MdBorderOuter;
diff --git a/types/react-icons/lib/md/border-right.d.ts b/types/react-icons/lib/md/border-right.d.ts
index 8bb225c8d9..1a7799213a 100644
--- a/types/react-icons/lib/md/border-right.d.ts
+++ b/types/react-icons/lib/md/border-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderRight extends React.Component<IconBaseProps> { }
+declare class MdBorderRight extends React.Component<IconBaseProps> { }
+export = MdBorderRight;
diff --git a/types/react-icons/lib/md/border-style.d.ts b/types/react-icons/lib/md/border-style.d.ts
index 92da93bb6d..04a39727ca 100644
--- a/types/react-icons/lib/md/border-style.d.ts
+++ b/types/react-icons/lib/md/border-style.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderStyle extends React.Component<IconBaseProps> { }
+declare class MdBorderStyle extends React.Component<IconBaseProps> { }
+export = MdBorderStyle;
diff --git a/types/react-icons/lib/md/border-top.d.ts b/types/react-icons/lib/md/border-top.d.ts
index 32a4a828a8..d667315e57 100644
--- a/types/react-icons/lib/md/border-top.d.ts
+++ b/types/react-icons/lib/md/border-top.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderTop extends React.Component<IconBaseProps> { }
+declare class MdBorderTop extends React.Component<IconBaseProps> { }
+export = MdBorderTop;
diff --git a/types/react-icons/lib/md/border-vertical.d.ts b/types/react-icons/lib/md/border-vertical.d.ts
index dce912d6de..741ac16627 100644
--- a/types/react-icons/lib/md/border-vertical.d.ts
+++ b/types/react-icons/lib/md/border-vertical.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderVertical extends React.Component<IconBaseProps> { }
+declare class MdBorderVertical extends React.Component<IconBaseProps> { }
+export = MdBorderVertical;
diff --git a/types/react-icons/lib/md/branding-watermark.d.ts b/types/react-icons/lib/md/branding-watermark.d.ts
index 92ae821285..b23afbd356 100644
--- a/types/react-icons/lib/md/branding-watermark.d.ts
+++ b/types/react-icons/lib/md/branding-watermark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrandingWatermark extends React.Component<IconBaseProps> { }
+declare class MdBrandingWatermark extends React.Component<IconBaseProps> { }
+export = MdBrandingWatermark;
diff --git a/types/react-icons/lib/md/brightness-1.d.ts b/types/react-icons/lib/md/brightness-1.d.ts
index 2ac3e1dd25..e2ca8dc427 100644
--- a/types/react-icons/lib/md/brightness-1.d.ts
+++ b/types/react-icons/lib/md/brightness-1.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness1 extends React.Component<IconBaseProps> { }
+declare class MdBrightness1 extends React.Component<IconBaseProps> { }
+export = MdBrightness1;
diff --git a/types/react-icons/lib/md/brightness-2.d.ts b/types/react-icons/lib/md/brightness-2.d.ts
index ad9eae9cb1..c47e7defba 100644
--- a/types/react-icons/lib/md/brightness-2.d.ts
+++ b/types/react-icons/lib/md/brightness-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness2 extends React.Component<IconBaseProps> { }
+declare class MdBrightness2 extends React.Component<IconBaseProps> { }
+export = MdBrightness2;
diff --git a/types/react-icons/lib/md/brightness-3.d.ts b/types/react-icons/lib/md/brightness-3.d.ts
index 929e3196af..9f835bb24e 100644
--- a/types/react-icons/lib/md/brightness-3.d.ts
+++ b/types/react-icons/lib/md/brightness-3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness3 extends React.Component<IconBaseProps> { }
+declare class MdBrightness3 extends React.Component<IconBaseProps> { }
+export = MdBrightness3;
diff --git a/types/react-icons/lib/md/brightness-4.d.ts b/types/react-icons/lib/md/brightness-4.d.ts
index eeac7b21a5..9e12c4f48b 100644
--- a/types/react-icons/lib/md/brightness-4.d.ts
+++ b/types/react-icons/lib/md/brightness-4.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness4 extends React.Component<IconBaseProps> { }
+declare class MdBrightness4 extends React.Component<IconBaseProps> { }
+export = MdBrightness4;
diff --git a/types/react-icons/lib/md/brightness-5.d.ts b/types/react-icons/lib/md/brightness-5.d.ts
index 26dc5fc08c..ee98d6a917 100644
--- a/types/react-icons/lib/md/brightness-5.d.ts
+++ b/types/react-icons/lib/md/brightness-5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness5 extends React.Component<IconBaseProps> { }
+declare class MdBrightness5 extends React.Component<IconBaseProps> { }
+export = MdBrightness5;
diff --git a/types/react-icons/lib/md/brightness-6.d.ts b/types/react-icons/lib/md/brightness-6.d.ts
index c59e6345b0..0266ba547c 100644
--- a/types/react-icons/lib/md/brightness-6.d.ts
+++ b/types/react-icons/lib/md/brightness-6.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness6 extends React.Component<IconBaseProps> { }
+declare class MdBrightness6 extends React.Component<IconBaseProps> { }
+export = MdBrightness6;
diff --git a/types/react-icons/lib/md/brightness-7.d.ts b/types/react-icons/lib/md/brightness-7.d.ts
index 00510b48a7..9cf6e0e624 100644
--- a/types/react-icons/lib/md/brightness-7.d.ts
+++ b/types/react-icons/lib/md/brightness-7.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness7 extends React.Component<IconBaseProps> { }
+declare class MdBrightness7 extends React.Component<IconBaseProps> { }
+export = MdBrightness7;
diff --git a/types/react-icons/lib/md/brightness-auto.d.ts b/types/react-icons/lib/md/brightness-auto.d.ts
index 7fd30ba582..b9d280fb13 100644
--- a/types/react-icons/lib/md/brightness-auto.d.ts
+++ b/types/react-icons/lib/md/brightness-auto.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessAuto extends React.Component<IconBaseProps> { }
+declare class MdBrightnessAuto extends React.Component<IconBaseProps> { }
+export = MdBrightnessAuto;
diff --git a/types/react-icons/lib/md/brightness-high.d.ts b/types/react-icons/lib/md/brightness-high.d.ts
index 65eb9716e2..cd1fec1341 100644
--- a/types/react-icons/lib/md/brightness-high.d.ts
+++ b/types/react-icons/lib/md/brightness-high.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessHigh extends React.Component<IconBaseProps> { }
+declare class MdBrightnessHigh extends React.Component<IconBaseProps> { }
+export = MdBrightnessHigh;
diff --git a/types/react-icons/lib/md/brightness-low.d.ts b/types/react-icons/lib/md/brightness-low.d.ts
index 7a4220918a..fa786e9ec9 100644
--- a/types/react-icons/lib/md/brightness-low.d.ts
+++ b/types/react-icons/lib/md/brightness-low.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessLow extends React.Component<IconBaseProps> { }
+declare class MdBrightnessLow extends React.Component<IconBaseProps> { }
+export = MdBrightnessLow;
diff --git a/types/react-icons/lib/md/brightness-medium.d.ts b/types/react-icons/lib/md/brightness-medium.d.ts
index bcae811361..0dc43fcd6d 100644
--- a/types/react-icons/lib/md/brightness-medium.d.ts
+++ b/types/react-icons/lib/md/brightness-medium.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessMedium extends React.Component<IconBaseProps> { }
+declare class MdBrightnessMedium extends React.Component<IconBaseProps> { }
+export = MdBrightnessMedium;
diff --git a/types/react-icons/lib/md/broken-image.d.ts b/types/react-icons/lib/md/broken-image.d.ts
index 26a5256e01..e516114b45 100644
--- a/types/react-icons/lib/md/broken-image.d.ts
+++ b/types/react-icons/lib/md/broken-image.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrokenImage extends React.Component<IconBaseProps> { }
+declare class MdBrokenImage extends React.Component<IconBaseProps> { }
+export = MdBrokenImage;
diff --git a/types/react-icons/lib/md/brush.d.ts b/types/react-icons/lib/md/brush.d.ts
index 71e04689f2..757f204994 100644
--- a/types/react-icons/lib/md/brush.d.ts
+++ b/types/react-icons/lib/md/brush.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrush extends React.Component<IconBaseProps> { }
+declare class MdBrush extends React.Component<IconBaseProps> { }
+export = MdBrush;
diff --git a/types/react-icons/lib/md/bubble-chart.d.ts b/types/react-icons/lib/md/bubble-chart.d.ts
index d893d4d2a1..2bb2a4998e 100644
--- a/types/react-icons/lib/md/bubble-chart.d.ts
+++ b/types/react-icons/lib/md/bubble-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBubbleChart extends React.Component<IconBaseProps> { }
+declare class MdBubbleChart extends React.Component<IconBaseProps> { }
+export = MdBubbleChart;
diff --git a/types/react-icons/lib/md/bug-report.d.ts b/types/react-icons/lib/md/bug-report.d.ts
index 8d5b5f78ef..dd0aa9b931 100644
--- a/types/react-icons/lib/md/bug-report.d.ts
+++ b/types/react-icons/lib/md/bug-report.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBugReport extends React.Component<IconBaseProps> { }
+declare class MdBugReport extends React.Component<IconBaseProps> { }
+export = MdBugReport;
diff --git a/types/react-icons/lib/md/build.d.ts b/types/react-icons/lib/md/build.d.ts
index 3969a9d67d..a0ad5b0c31 100644
--- a/types/react-icons/lib/md/build.d.ts
+++ b/types/react-icons/lib/md/build.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBuild extends React.Component<IconBaseProps> { }
+declare class MdBuild extends React.Component<IconBaseProps> { }
+export = MdBuild;
diff --git a/types/react-icons/lib/md/burst-mode.d.ts b/types/react-icons/lib/md/burst-mode.d.ts
index 2db0673b64..4af3aab231 100644
--- a/types/react-icons/lib/md/burst-mode.d.ts
+++ b/types/react-icons/lib/md/burst-mode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBurstMode extends React.Component<IconBaseProps> { }
+declare class MdBurstMode extends React.Component<IconBaseProps> { }
+export = MdBurstMode;
diff --git a/types/react-icons/lib/md/business-center.d.ts b/types/react-icons/lib/md/business-center.d.ts
index 019568bc79..c767118157 100644
--- a/types/react-icons/lib/md/business-center.d.ts
+++ b/types/react-icons/lib/md/business-center.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBusinessCenter extends React.Component<IconBaseProps> { }
+declare class MdBusinessCenter extends React.Component<IconBaseProps> { }
+export = MdBusinessCenter;
diff --git a/types/react-icons/lib/md/business.d.ts b/types/react-icons/lib/md/business.d.ts
index aee4700728..d6ecbe11c2 100644
--- a/types/react-icons/lib/md/business.d.ts
+++ b/types/react-icons/lib/md/business.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBusiness extends React.Component<IconBaseProps> { }
+declare class MdBusiness extends React.Component<IconBaseProps> { }
+export = MdBusiness;
diff --git a/types/react-icons/lib/md/cached.d.ts b/types/react-icons/lib/md/cached.d.ts
index e26b176124..a7ee38490e 100644
--- a/types/react-icons/lib/md/cached.d.ts
+++ b/types/react-icons/lib/md/cached.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCached extends React.Component<IconBaseProps> { }
+declare class MdCached extends React.Component<IconBaseProps> { }
+export = MdCached;
diff --git a/types/react-icons/lib/md/cake.d.ts b/types/react-icons/lib/md/cake.d.ts
index 757d94fa73..300197de73 100644
--- a/types/react-icons/lib/md/cake.d.ts
+++ b/types/react-icons/lib/md/cake.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCake extends React.Component<IconBaseProps> { }
+declare class MdCake extends React.Component<IconBaseProps> { }
+export = MdCake;
diff --git a/types/react-icons/lib/md/call-end.d.ts b/types/react-icons/lib/md/call-end.d.ts
index fcb323974c..7a5b08dc29 100644
--- a/types/react-icons/lib/md/call-end.d.ts
+++ b/types/react-icons/lib/md/call-end.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallEnd extends React.Component<IconBaseProps> { }
+declare class MdCallEnd extends React.Component<IconBaseProps> { }
+export = MdCallEnd;
diff --git a/types/react-icons/lib/md/call-made.d.ts b/types/react-icons/lib/md/call-made.d.ts
index d7523be94c..e91641574b 100644
--- a/types/react-icons/lib/md/call-made.d.ts
+++ b/types/react-icons/lib/md/call-made.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMade extends React.Component<IconBaseProps> { }
+declare class MdCallMade extends React.Component<IconBaseProps> { }
+export = MdCallMade;
diff --git a/types/react-icons/lib/md/call-merge.d.ts b/types/react-icons/lib/md/call-merge.d.ts
index 9c7369c900..b5b3fa9314 100644
--- a/types/react-icons/lib/md/call-merge.d.ts
+++ b/types/react-icons/lib/md/call-merge.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMerge extends React.Component<IconBaseProps> { }
+declare class MdCallMerge extends React.Component<IconBaseProps> { }
+export = MdCallMerge;
diff --git a/types/react-icons/lib/md/call-missed-outgoing.d.ts b/types/react-icons/lib/md/call-missed-outgoing.d.ts
index f03613faad..553318d2b2 100644
--- a/types/react-icons/lib/md/call-missed-outgoing.d.ts
+++ b/types/react-icons/lib/md/call-missed-outgoing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMissedOutgoing extends React.Component<IconBaseProps> { }
+declare class MdCallMissedOutgoing extends React.Component<IconBaseProps> { }
+export = MdCallMissedOutgoing;
diff --git a/types/react-icons/lib/md/call-missed.d.ts b/types/react-icons/lib/md/call-missed.d.ts
index c999bb5cab..6bd2884ffe 100644
--- a/types/react-icons/lib/md/call-missed.d.ts
+++ b/types/react-icons/lib/md/call-missed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMissed extends React.Component<IconBaseProps> { }
+declare class MdCallMissed extends React.Component<IconBaseProps> { }
+export = MdCallMissed;
diff --git a/types/react-icons/lib/md/call-received.d.ts b/types/react-icons/lib/md/call-received.d.ts
index 29f503af3f..fcc1b3f845 100644
--- a/types/react-icons/lib/md/call-received.d.ts
+++ b/types/react-icons/lib/md/call-received.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallReceived extends React.Component<IconBaseProps> { }
+declare class MdCallReceived extends React.Component<IconBaseProps> { }
+export = MdCallReceived;
diff --git a/types/react-icons/lib/md/call-split.d.ts b/types/react-icons/lib/md/call-split.d.ts
index 56330a07e8..1f8eefacb2 100644
--- a/types/react-icons/lib/md/call-split.d.ts
+++ b/types/react-icons/lib/md/call-split.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallSplit extends React.Component<IconBaseProps> { }
+declare class MdCallSplit extends React.Component<IconBaseProps> { }
+export = MdCallSplit;
diff --git a/types/react-icons/lib/md/call-to-action.d.ts b/types/react-icons/lib/md/call-to-action.d.ts
index f1f8d89d80..a653748703 100644
--- a/types/react-icons/lib/md/call-to-action.d.ts
+++ b/types/react-icons/lib/md/call-to-action.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallToAction extends React.Component<IconBaseProps> { }
+declare class MdCallToAction extends React.Component<IconBaseProps> { }
+export = MdCallToAction;
diff --git a/types/react-icons/lib/md/call.d.ts b/types/react-icons/lib/md/call.d.ts
index 2bfec93bfc..4b817c331b 100644
--- a/types/react-icons/lib/md/call.d.ts
+++ b/types/react-icons/lib/md/call.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCall extends React.Component<IconBaseProps> { }
+declare class MdCall extends React.Component<IconBaseProps> { }
+export = MdCall;
diff --git a/types/react-icons/lib/md/camera-alt.d.ts b/types/react-icons/lib/md/camera-alt.d.ts
index 4951b47b34..f620a9390e 100644
--- a/types/react-icons/lib/md/camera-alt.d.ts
+++ b/types/react-icons/lib/md/camera-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraAlt extends React.Component<IconBaseProps> { }
+declare class MdCameraAlt extends React.Component<IconBaseProps> { }
+export = MdCameraAlt;
diff --git a/types/react-icons/lib/md/camera-enhance.d.ts b/types/react-icons/lib/md/camera-enhance.d.ts
index 957b0b30e4..82a1dbcc79 100644
--- a/types/react-icons/lib/md/camera-enhance.d.ts
+++ b/types/react-icons/lib/md/camera-enhance.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraEnhance extends React.Component<IconBaseProps> { }
+declare class MdCameraEnhance extends React.Component<IconBaseProps> { }
+export = MdCameraEnhance;
diff --git a/types/react-icons/lib/md/camera-front.d.ts b/types/react-icons/lib/md/camera-front.d.ts
index c6f2760218..e8569e18e1 100644
--- a/types/react-icons/lib/md/camera-front.d.ts
+++ b/types/react-icons/lib/md/camera-front.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraFront extends React.Component<IconBaseProps> { }
+declare class MdCameraFront extends React.Component<IconBaseProps> { }
+export = MdCameraFront;
diff --git a/types/react-icons/lib/md/camera-rear.d.ts b/types/react-icons/lib/md/camera-rear.d.ts
index b524f4456c..2cd439976a 100644
--- a/types/react-icons/lib/md/camera-rear.d.ts
+++ b/types/react-icons/lib/md/camera-rear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraRear extends React.Component<IconBaseProps> { }
+declare class MdCameraRear extends React.Component<IconBaseProps> { }
+export = MdCameraRear;
diff --git a/types/react-icons/lib/md/camera-roll.d.ts b/types/react-icons/lib/md/camera-roll.d.ts
index b7c7b207e2..8d9a659a45 100644
--- a/types/react-icons/lib/md/camera-roll.d.ts
+++ b/types/react-icons/lib/md/camera-roll.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraRoll extends React.Component<IconBaseProps> { }
+declare class MdCameraRoll extends React.Component<IconBaseProps> { }
+export = MdCameraRoll;
diff --git a/types/react-icons/lib/md/camera.d.ts b/types/react-icons/lib/md/camera.d.ts
index ca2fbf55e3..e743236ad7 100644
--- a/types/react-icons/lib/md/camera.d.ts
+++ b/types/react-icons/lib/md/camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCamera extends React.Component<IconBaseProps> { }
+declare class MdCamera extends React.Component<IconBaseProps> { }
+export = MdCamera;
diff --git a/types/react-icons/lib/md/cancel.d.ts b/types/react-icons/lib/md/cancel.d.ts
index 28248ed4f6..89e7137dd0 100644
--- a/types/react-icons/lib/md/cancel.d.ts
+++ b/types/react-icons/lib/md/cancel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCancel extends React.Component<IconBaseProps> { }
+declare class MdCancel extends React.Component<IconBaseProps> { }
+export = MdCancel;
diff --git a/types/react-icons/lib/md/card-giftcard.d.ts b/types/react-icons/lib/md/card-giftcard.d.ts
index 67eb5002e6..dcfd110e31 100644
--- a/types/react-icons/lib/md/card-giftcard.d.ts
+++ b/types/react-icons/lib/md/card-giftcard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCardGiftcard extends React.Component<IconBaseProps> { }
+declare class MdCardGiftcard extends React.Component<IconBaseProps> { }
+export = MdCardGiftcard;
diff --git a/types/react-icons/lib/md/card-membership.d.ts b/types/react-icons/lib/md/card-membership.d.ts
index 5cb91c641d..56d04b7d7f 100644
--- a/types/react-icons/lib/md/card-membership.d.ts
+++ b/types/react-icons/lib/md/card-membership.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCardMembership extends React.Component<IconBaseProps> { }
+declare class MdCardMembership extends React.Component<IconBaseProps> { }
+export = MdCardMembership;
diff --git a/types/react-icons/lib/md/card-travel.d.ts b/types/react-icons/lib/md/card-travel.d.ts
index a54e339c09..2a024573ff 100644
--- a/types/react-icons/lib/md/card-travel.d.ts
+++ b/types/react-icons/lib/md/card-travel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCardTravel extends React.Component<IconBaseProps> { }
+declare class MdCardTravel extends React.Component<IconBaseProps> { }
+export = MdCardTravel;
diff --git a/types/react-icons/lib/md/casino.d.ts b/types/react-icons/lib/md/casino.d.ts
index ceb6c0cf04..d99aafd815 100644
--- a/types/react-icons/lib/md/casino.d.ts
+++ b/types/react-icons/lib/md/casino.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCasino extends React.Component<IconBaseProps> { }
+declare class MdCasino extends React.Component<IconBaseProps> { }
+export = MdCasino;
diff --git a/types/react-icons/lib/md/cast-connected.d.ts b/types/react-icons/lib/md/cast-connected.d.ts
index d4d60dcf60..7b3337dec8 100644
--- a/types/react-icons/lib/md/cast-connected.d.ts
+++ b/types/react-icons/lib/md/cast-connected.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCastConnected extends React.Component<IconBaseProps> { }
+declare class MdCastConnected extends React.Component<IconBaseProps> { }
+export = MdCastConnected;
diff --git a/types/react-icons/lib/md/cast.d.ts b/types/react-icons/lib/md/cast.d.ts
index b014c40b07..cc471c69f0 100644
--- a/types/react-icons/lib/md/cast.d.ts
+++ b/types/react-icons/lib/md/cast.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCast extends React.Component<IconBaseProps> { }
+declare class MdCast extends React.Component<IconBaseProps> { }
+export = MdCast;
diff --git a/types/react-icons/lib/md/center-focus-strong.d.ts b/types/react-icons/lib/md/center-focus-strong.d.ts
index 6d72ae6a11..609be9f3ca 100644
--- a/types/react-icons/lib/md/center-focus-strong.d.ts
+++ b/types/react-icons/lib/md/center-focus-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCenterFocusStrong extends React.Component<IconBaseProps> { }
+declare class MdCenterFocusStrong extends React.Component<IconBaseProps> { }
+export = MdCenterFocusStrong;
diff --git a/types/react-icons/lib/md/center-focus-weak.d.ts b/types/react-icons/lib/md/center-focus-weak.d.ts
index 5565dd7b63..5923a863c7 100644
--- a/types/react-icons/lib/md/center-focus-weak.d.ts
+++ b/types/react-icons/lib/md/center-focus-weak.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCenterFocusWeak extends React.Component<IconBaseProps> { }
+declare class MdCenterFocusWeak extends React.Component<IconBaseProps> { }
+export = MdCenterFocusWeak;
diff --git a/types/react-icons/lib/md/change-history.d.ts b/types/react-icons/lib/md/change-history.d.ts
index ed3344df50..da490c335a 100644
--- a/types/react-icons/lib/md/change-history.d.ts
+++ b/types/react-icons/lib/md/change-history.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChangeHistory extends React.Component<IconBaseProps> { }
+declare class MdChangeHistory extends React.Component<IconBaseProps> { }
+export = MdChangeHistory;
diff --git a/types/react-icons/lib/md/chat-bubble-outline.d.ts b/types/react-icons/lib/md/chat-bubble-outline.d.ts
index ad12c21318..4bbbe1a012 100644
--- a/types/react-icons/lib/md/chat-bubble-outline.d.ts
+++ b/types/react-icons/lib/md/chat-bubble-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChatBubbleOutline extends React.Component<IconBaseProps> { }
+declare class MdChatBubbleOutline extends React.Component<IconBaseProps> { }
+export = MdChatBubbleOutline;
diff --git a/types/react-icons/lib/md/chat-bubble.d.ts b/types/react-icons/lib/md/chat-bubble.d.ts
index 6322767617..7f1bd144b8 100644
--- a/types/react-icons/lib/md/chat-bubble.d.ts
+++ b/types/react-icons/lib/md/chat-bubble.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChatBubble extends React.Component<IconBaseProps> { }
+declare class MdChatBubble extends React.Component<IconBaseProps> { }
+export = MdChatBubble;
diff --git a/types/react-icons/lib/md/chat.d.ts b/types/react-icons/lib/md/chat.d.ts
index 7fecfed168..c8b48dded0 100644
--- a/types/react-icons/lib/md/chat.d.ts
+++ b/types/react-icons/lib/md/chat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChat extends React.Component<IconBaseProps> { }
+declare class MdChat extends React.Component<IconBaseProps> { }
+export = MdChat;
diff --git a/types/react-icons/lib/md/check-box-outline-blank.d.ts b/types/react-icons/lib/md/check-box-outline-blank.d.ts
index 984ee8c5b0..9159ef053b 100644
--- a/types/react-icons/lib/md/check-box-outline-blank.d.ts
+++ b/types/react-icons/lib/md/check-box-outline-blank.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckBoxOutlineBlank extends React.Component<IconBaseProps> { }
+declare class MdCheckBoxOutlineBlank extends React.Component<IconBaseProps> { }
+export = MdCheckBoxOutlineBlank;
diff --git a/types/react-icons/lib/md/check-box.d.ts b/types/react-icons/lib/md/check-box.d.ts
index 0d131960ee..9b0c678b29 100644
--- a/types/react-icons/lib/md/check-box.d.ts
+++ b/types/react-icons/lib/md/check-box.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckBox extends React.Component<IconBaseProps> { }
+declare class MdCheckBox extends React.Component<IconBaseProps> { }
+export = MdCheckBox;
diff --git a/types/react-icons/lib/md/check-circle.d.ts b/types/react-icons/lib/md/check-circle.d.ts
index 350ec8918d..ffc011234d 100644
--- a/types/react-icons/lib/md/check-circle.d.ts
+++ b/types/react-icons/lib/md/check-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckCircle extends React.Component<IconBaseProps> { }
+declare class MdCheckCircle extends React.Component<IconBaseProps> { }
+export = MdCheckCircle;
diff --git a/types/react-icons/lib/md/check.d.ts b/types/react-icons/lib/md/check.d.ts
index df809198db..94b93a031b 100644
--- a/types/react-icons/lib/md/check.d.ts
+++ b/types/react-icons/lib/md/check.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheck extends React.Component<IconBaseProps> { }
+declare class MdCheck extends React.Component<IconBaseProps> { }
+export = MdCheck;
diff --git a/types/react-icons/lib/md/chevron-left.d.ts b/types/react-icons/lib/md/chevron-left.d.ts
index fd0b4bff5a..3fea15ec21 100644
--- a/types/react-icons/lib/md/chevron-left.d.ts
+++ b/types/react-icons/lib/md/chevron-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChevronLeft extends React.Component<IconBaseProps> { }
+declare class MdChevronLeft extends React.Component<IconBaseProps> { }
+export = MdChevronLeft;
diff --git a/types/react-icons/lib/md/chevron-right.d.ts b/types/react-icons/lib/md/chevron-right.d.ts
index fd902a1348..befb8cea98 100644
--- a/types/react-icons/lib/md/chevron-right.d.ts
+++ b/types/react-icons/lib/md/chevron-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChevronRight extends React.Component<IconBaseProps> { }
+declare class MdChevronRight extends React.Component<IconBaseProps> { }
+export = MdChevronRight;
diff --git a/types/react-icons/lib/md/child-care.d.ts b/types/react-icons/lib/md/child-care.d.ts
index 133bf02e0e..ed581fa911 100644
--- a/types/react-icons/lib/md/child-care.d.ts
+++ b/types/react-icons/lib/md/child-care.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChildCare extends React.Component<IconBaseProps> { }
+declare class MdChildCare extends React.Component<IconBaseProps> { }
+export = MdChildCare;
diff --git a/types/react-icons/lib/md/child-friendly.d.ts b/types/react-icons/lib/md/child-friendly.d.ts
index 87f9bc1b8e..c5f658131d 100644
--- a/types/react-icons/lib/md/child-friendly.d.ts
+++ b/types/react-icons/lib/md/child-friendly.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChildFriendly extends React.Component<IconBaseProps> { }
+declare class MdChildFriendly extends React.Component<IconBaseProps> { }
+export = MdChildFriendly;
diff --git a/types/react-icons/lib/md/chrome-reader-mode.d.ts b/types/react-icons/lib/md/chrome-reader-mode.d.ts
index c545db8e9b..3737f028fb 100644
--- a/types/react-icons/lib/md/chrome-reader-mode.d.ts
+++ b/types/react-icons/lib/md/chrome-reader-mode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChromeReaderMode extends React.Component<IconBaseProps> { }
+declare class MdChromeReaderMode extends React.Component<IconBaseProps> { }
+export = MdChromeReaderMode;
diff --git a/types/react-icons/lib/md/class.d.ts b/types/react-icons/lib/md/class.d.ts
index e0e0e88367..74a101b1f3 100644
--- a/types/react-icons/lib/md/class.d.ts
+++ b/types/react-icons/lib/md/class.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClass extends React.Component<IconBaseProps> { }
+declare class MdClass extends React.Component<IconBaseProps> { }
+export = MdClass;
diff --git a/types/react-icons/lib/md/clear-all.d.ts b/types/react-icons/lib/md/clear-all.d.ts
index b73150c14e..079c95bc0b 100644
--- a/types/react-icons/lib/md/clear-all.d.ts
+++ b/types/react-icons/lib/md/clear-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClearAll extends React.Component<IconBaseProps> { }
+declare class MdClearAll extends React.Component<IconBaseProps> { }
+export = MdClearAll;
diff --git a/types/react-icons/lib/md/clear.d.ts b/types/react-icons/lib/md/clear.d.ts
index 4da44db5b5..a30ef11252 100644
--- a/types/react-icons/lib/md/clear.d.ts
+++ b/types/react-icons/lib/md/clear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClear extends React.Component<IconBaseProps> { }
+declare class MdClear extends React.Component<IconBaseProps> { }
+export = MdClear;
diff --git a/types/react-icons/lib/md/close.d.ts b/types/react-icons/lib/md/close.d.ts
index 3f693c1eec..8164e66b7a 100644
--- a/types/react-icons/lib/md/close.d.ts
+++ b/types/react-icons/lib/md/close.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClose extends React.Component<IconBaseProps> { }
+declare class MdClose extends React.Component<IconBaseProps> { }
+export = MdClose;
diff --git a/types/react-icons/lib/md/closed-caption.d.ts b/types/react-icons/lib/md/closed-caption.d.ts
index 5adaf8fc91..5807eff5b1 100644
--- a/types/react-icons/lib/md/closed-caption.d.ts
+++ b/types/react-icons/lib/md/closed-caption.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClosedCaption extends React.Component<IconBaseProps> { }
+declare class MdClosedCaption extends React.Component<IconBaseProps> { }
+export = MdClosedCaption;
diff --git a/types/react-icons/lib/md/cloud-circle.d.ts b/types/react-icons/lib/md/cloud-circle.d.ts
index 55a5be23c2..dab82258ba 100644
--- a/types/react-icons/lib/md/cloud-circle.d.ts
+++ b/types/react-icons/lib/md/cloud-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudCircle extends React.Component<IconBaseProps> { }
+declare class MdCloudCircle extends React.Component<IconBaseProps> { }
+export = MdCloudCircle;
diff --git a/types/react-icons/lib/md/cloud-done.d.ts b/types/react-icons/lib/md/cloud-done.d.ts
index 49f115ae3d..004c6b7f2e 100644
--- a/types/react-icons/lib/md/cloud-done.d.ts
+++ b/types/react-icons/lib/md/cloud-done.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudDone extends React.Component<IconBaseProps> { }
+declare class MdCloudDone extends React.Component<IconBaseProps> { }
+export = MdCloudDone;
diff --git a/types/react-icons/lib/md/cloud-download.d.ts b/types/react-icons/lib/md/cloud-download.d.ts
index c7b6f482bb..861d299855 100644
--- a/types/react-icons/lib/md/cloud-download.d.ts
+++ b/types/react-icons/lib/md/cloud-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudDownload extends React.Component<IconBaseProps> { }
+declare class MdCloudDownload extends React.Component<IconBaseProps> { }
+export = MdCloudDownload;
diff --git a/types/react-icons/lib/md/cloud-off.d.ts b/types/react-icons/lib/md/cloud-off.d.ts
index 2ebe85de9a..11923adffc 100644
--- a/types/react-icons/lib/md/cloud-off.d.ts
+++ b/types/react-icons/lib/md/cloud-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudOff extends React.Component<IconBaseProps> { }
+declare class MdCloudOff extends React.Component<IconBaseProps> { }
+export = MdCloudOff;
diff --git a/types/react-icons/lib/md/cloud-queue.d.ts b/types/react-icons/lib/md/cloud-queue.d.ts
index 3e7912edb7..8057c4f888 100644
--- a/types/react-icons/lib/md/cloud-queue.d.ts
+++ b/types/react-icons/lib/md/cloud-queue.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudQueue extends React.Component<IconBaseProps> { }
+declare class MdCloudQueue extends React.Component<IconBaseProps> { }
+export = MdCloudQueue;
diff --git a/types/react-icons/lib/md/cloud-upload.d.ts b/types/react-icons/lib/md/cloud-upload.d.ts
index 3813bf345b..3ff02a9a0e 100644
--- a/types/react-icons/lib/md/cloud-upload.d.ts
+++ b/types/react-icons/lib/md/cloud-upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudUpload extends React.Component<IconBaseProps> { }
+declare class MdCloudUpload extends React.Component<IconBaseProps> { }
+export = MdCloudUpload;
diff --git a/types/react-icons/lib/md/cloud.d.ts b/types/react-icons/lib/md/cloud.d.ts
index 774dd53424..0c904ab956 100644
--- a/types/react-icons/lib/md/cloud.d.ts
+++ b/types/react-icons/lib/md/cloud.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloud extends React.Component<IconBaseProps> { }
+declare class MdCloud extends React.Component<IconBaseProps> { }
+export = MdCloud;
diff --git a/types/react-icons/lib/md/code.d.ts b/types/react-icons/lib/md/code.d.ts
index 54f942afd1..ec06a5251e 100644
--- a/types/react-icons/lib/md/code.d.ts
+++ b/types/react-icons/lib/md/code.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCode extends React.Component<IconBaseProps> { }
+declare class MdCode extends React.Component<IconBaseProps> { }
+export = MdCode;
diff --git a/types/react-icons/lib/md/collections-bookmark.d.ts b/types/react-icons/lib/md/collections-bookmark.d.ts
index 98d8755848..8f21854011 100644
--- a/types/react-icons/lib/md/collections-bookmark.d.ts
+++ b/types/react-icons/lib/md/collections-bookmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCollectionsBookmark extends React.Component<IconBaseProps> { }
+declare class MdCollectionsBookmark extends React.Component<IconBaseProps> { }
+export = MdCollectionsBookmark;
diff --git a/types/react-icons/lib/md/collections.d.ts b/types/react-icons/lib/md/collections.d.ts
index 7d5cf7fa68..670a27794a 100644
--- a/types/react-icons/lib/md/collections.d.ts
+++ b/types/react-icons/lib/md/collections.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCollections extends React.Component<IconBaseProps> { }
+declare class MdCollections extends React.Component<IconBaseProps> { }
+export = MdCollections;
diff --git a/types/react-icons/lib/md/color-lens.d.ts b/types/react-icons/lib/md/color-lens.d.ts
index 71a56bc853..93794aafd7 100644
--- a/types/react-icons/lib/md/color-lens.d.ts
+++ b/types/react-icons/lib/md/color-lens.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdColorLens extends React.Component<IconBaseProps> { }
+declare class MdColorLens extends React.Component<IconBaseProps> { }
+export = MdColorLens;
diff --git a/types/react-icons/lib/md/colorize.d.ts b/types/react-icons/lib/md/colorize.d.ts
index f345627803..7d9c059323 100644
--- a/types/react-icons/lib/md/colorize.d.ts
+++ b/types/react-icons/lib/md/colorize.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdColorize extends React.Component<IconBaseProps> { }
+declare class MdColorize extends React.Component<IconBaseProps> { }
+export = MdColorize;
diff --git a/types/react-icons/lib/md/comment.d.ts b/types/react-icons/lib/md/comment.d.ts
index c81ab4762a..388e899032 100644
--- a/types/react-icons/lib/md/comment.d.ts
+++ b/types/react-icons/lib/md/comment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdComment extends React.Component<IconBaseProps> { }
+declare class MdComment extends React.Component<IconBaseProps> { }
+export = MdComment;
diff --git a/types/react-icons/lib/md/compare-arrows.d.ts b/types/react-icons/lib/md/compare-arrows.d.ts
index 727031b8a7..094d5f9ffb 100644
--- a/types/react-icons/lib/md/compare-arrows.d.ts
+++ b/types/react-icons/lib/md/compare-arrows.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCompareArrows extends React.Component<IconBaseProps> { }
+declare class MdCompareArrows extends React.Component<IconBaseProps> { }
+export = MdCompareArrows;
diff --git a/types/react-icons/lib/md/compare.d.ts b/types/react-icons/lib/md/compare.d.ts
index 59338cf7c9..a980ef66c5 100644
--- a/types/react-icons/lib/md/compare.d.ts
+++ b/types/react-icons/lib/md/compare.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCompare extends React.Component<IconBaseProps> { }
+declare class MdCompare extends React.Component<IconBaseProps> { }
+export = MdCompare;
diff --git a/types/react-icons/lib/md/computer.d.ts b/types/react-icons/lib/md/computer.d.ts
index ef16df598d..9aa010e9f0 100644
--- a/types/react-icons/lib/md/computer.d.ts
+++ b/types/react-icons/lib/md/computer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdComputer extends React.Component<IconBaseProps> { }
+declare class MdComputer extends React.Component<IconBaseProps> { }
+export = MdComputer;
diff --git a/types/react-icons/lib/md/confirmation-number.d.ts b/types/react-icons/lib/md/confirmation-number.d.ts
index 8a3b8fcb8f..6d21269176 100644
--- a/types/react-icons/lib/md/confirmation-number.d.ts
+++ b/types/react-icons/lib/md/confirmation-number.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdConfirmationNumber extends React.Component<IconBaseProps> { }
+declare class MdConfirmationNumber extends React.Component<IconBaseProps> { }
+export = MdConfirmationNumber;
diff --git a/types/react-icons/lib/md/contact-mail.d.ts b/types/react-icons/lib/md/contact-mail.d.ts
index b5027ce2da..7097c62e6b 100644
--- a/types/react-icons/lib/md/contact-mail.d.ts
+++ b/types/react-icons/lib/md/contact-mail.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContactMail extends React.Component<IconBaseProps> { }
+declare class MdContactMail extends React.Component<IconBaseProps> { }
+export = MdContactMail;
diff --git a/types/react-icons/lib/md/contact-phone.d.ts b/types/react-icons/lib/md/contact-phone.d.ts
index df4405a4da..46a15ce303 100644
--- a/types/react-icons/lib/md/contact-phone.d.ts
+++ b/types/react-icons/lib/md/contact-phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContactPhone extends React.Component<IconBaseProps> { }
+declare class MdContactPhone extends React.Component<IconBaseProps> { }
+export = MdContactPhone;
diff --git a/types/react-icons/lib/md/contacts.d.ts b/types/react-icons/lib/md/contacts.d.ts
index e4df5f1c11..356af4ee87 100644
--- a/types/react-icons/lib/md/contacts.d.ts
+++ b/types/react-icons/lib/md/contacts.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContacts extends React.Component<IconBaseProps> { }
+declare class MdContacts extends React.Component<IconBaseProps> { }
+export = MdContacts;
diff --git a/types/react-icons/lib/md/content-copy.d.ts b/types/react-icons/lib/md/content-copy.d.ts
index e069254814..a0be0e9f4f 100644
--- a/types/react-icons/lib/md/content-copy.d.ts
+++ b/types/react-icons/lib/md/content-copy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContentCopy extends React.Component<IconBaseProps> { }
+declare class MdContentCopy extends React.Component<IconBaseProps> { }
+export = MdContentCopy;
diff --git a/types/react-icons/lib/md/content-cut.d.ts b/types/react-icons/lib/md/content-cut.d.ts
index 84d7b36ea0..2523e9545f 100644
--- a/types/react-icons/lib/md/content-cut.d.ts
+++ b/types/react-icons/lib/md/content-cut.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContentCut extends React.Component<IconBaseProps> { }
+declare class MdContentCut extends React.Component<IconBaseProps> { }
+export = MdContentCut;
diff --git a/types/react-icons/lib/md/content-paste.d.ts b/types/react-icons/lib/md/content-paste.d.ts
index d3825ed71f..d4eb4155b0 100644
--- a/types/react-icons/lib/md/content-paste.d.ts
+++ b/types/react-icons/lib/md/content-paste.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContentPaste extends React.Component<IconBaseProps> { }
+declare class MdContentPaste extends React.Component<IconBaseProps> { }
+export = MdContentPaste;
diff --git a/types/react-icons/lib/md/control-point-duplicate.d.ts b/types/react-icons/lib/md/control-point-duplicate.d.ts
index 8ba468f7bc..12be0cb5b2 100644
--- a/types/react-icons/lib/md/control-point-duplicate.d.ts
+++ b/types/react-icons/lib/md/control-point-duplicate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdControlPointDuplicate extends React.Component<IconBaseProps> { }
+declare class MdControlPointDuplicate extends React.Component<IconBaseProps> { }
+export = MdControlPointDuplicate;
diff --git a/types/react-icons/lib/md/control-point.d.ts b/types/react-icons/lib/md/control-point.d.ts
index aa32c1b7f4..9ed8996573 100644
--- a/types/react-icons/lib/md/control-point.d.ts
+++ b/types/react-icons/lib/md/control-point.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdControlPoint extends React.Component<IconBaseProps> { }
+declare class MdControlPoint extends React.Component<IconBaseProps> { }
+export = MdControlPoint;
diff --git a/types/react-icons/lib/md/copyright.d.ts b/types/react-icons/lib/md/copyright.d.ts
index d786505dc9..6aedb414ac 100644
--- a/types/react-icons/lib/md/copyright.d.ts
+++ b/types/react-icons/lib/md/copyright.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCopyright extends React.Component<IconBaseProps> { }
+declare class MdCopyright extends React.Component<IconBaseProps> { }
+export = MdCopyright;
diff --git a/types/react-icons/lib/md/create-new-folder.d.ts b/types/react-icons/lib/md/create-new-folder.d.ts
index 5f81f01bff..d94d8a1ccb 100644
--- a/types/react-icons/lib/md/create-new-folder.d.ts
+++ b/types/react-icons/lib/md/create-new-folder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCreateNewFolder extends React.Component<IconBaseProps> { }
+declare class MdCreateNewFolder extends React.Component<IconBaseProps> { }
+export = MdCreateNewFolder;
diff --git a/types/react-icons/lib/md/create.d.ts b/types/react-icons/lib/md/create.d.ts
index 75c2871644..2101f81ca0 100644
--- a/types/react-icons/lib/md/create.d.ts
+++ b/types/react-icons/lib/md/create.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCreate extends React.Component<IconBaseProps> { }
+declare class MdCreate extends React.Component<IconBaseProps> { }
+export = MdCreate;
diff --git a/types/react-icons/lib/md/credit-card.d.ts b/types/react-icons/lib/md/credit-card.d.ts
index 9515c900d0..7b830a5dec 100644
--- a/types/react-icons/lib/md/credit-card.d.ts
+++ b/types/react-icons/lib/md/credit-card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCreditCard extends React.Component<IconBaseProps> { }
+declare class MdCreditCard extends React.Component<IconBaseProps> { }
+export = MdCreditCard;
diff --git a/types/react-icons/lib/md/crop-16-9.d.ts b/types/react-icons/lib/md/crop-16-9.d.ts
index d507bc9db9..70fe5e4df2 100644
--- a/types/react-icons/lib/md/crop-16-9.d.ts
+++ b/types/react-icons/lib/md/crop-16-9.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop169 extends React.Component<IconBaseProps> { }
+declare class MdCrop169 extends React.Component<IconBaseProps> { }
+export = MdCrop169;
diff --git a/types/react-icons/lib/md/crop-3-2.d.ts b/types/react-icons/lib/md/crop-3-2.d.ts
index 461cf07b2d..e3b49cac55 100644
--- a/types/react-icons/lib/md/crop-3-2.d.ts
+++ b/types/react-icons/lib/md/crop-3-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop32 extends React.Component<IconBaseProps> { }
+declare class MdCrop32 extends React.Component<IconBaseProps> { }
+export = MdCrop32;
diff --git a/types/react-icons/lib/md/crop-5-4.d.ts b/types/react-icons/lib/md/crop-5-4.d.ts
index 4b0cb6c7fb..f44ec1dc15 100644
--- a/types/react-icons/lib/md/crop-5-4.d.ts
+++ b/types/react-icons/lib/md/crop-5-4.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop54 extends React.Component<IconBaseProps> { }
+declare class MdCrop54 extends React.Component<IconBaseProps> { }
+export = MdCrop54;
diff --git a/types/react-icons/lib/md/crop-7-5.d.ts b/types/react-icons/lib/md/crop-7-5.d.ts
index 9063520b57..b283e385e4 100644
--- a/types/react-icons/lib/md/crop-7-5.d.ts
+++ b/types/react-icons/lib/md/crop-7-5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop75 extends React.Component<IconBaseProps> { }
+declare class MdCrop75 extends React.Component<IconBaseProps> { }
+export = MdCrop75;
diff --git a/types/react-icons/lib/md/crop-din.d.ts b/types/react-icons/lib/md/crop-din.d.ts
index 115106ef50..f6c27311d5 100644
--- a/types/react-icons/lib/md/crop-din.d.ts
+++ b/types/react-icons/lib/md/crop-din.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropDin extends React.Component<IconBaseProps> { }
+declare class MdCropDin extends React.Component<IconBaseProps> { }
+export = MdCropDin;
diff --git a/types/react-icons/lib/md/crop-free.d.ts b/types/react-icons/lib/md/crop-free.d.ts
index e68c930ff9..a526edc6ed 100644
--- a/types/react-icons/lib/md/crop-free.d.ts
+++ b/types/react-icons/lib/md/crop-free.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropFree extends React.Component<IconBaseProps> { }
+declare class MdCropFree extends React.Component<IconBaseProps> { }
+export = MdCropFree;
diff --git a/types/react-icons/lib/md/crop-landscape.d.ts b/types/react-icons/lib/md/crop-landscape.d.ts
index 5ef2f2e4dd..7c224aff4c 100644
--- a/types/react-icons/lib/md/crop-landscape.d.ts
+++ b/types/react-icons/lib/md/crop-landscape.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropLandscape extends React.Component<IconBaseProps> { }
+declare class MdCropLandscape extends React.Component<IconBaseProps> { }
+export = MdCropLandscape;
diff --git a/types/react-icons/lib/md/crop-original.d.ts b/types/react-icons/lib/md/crop-original.d.ts
index 26733dc24e..24310372ec 100644
--- a/types/react-icons/lib/md/crop-original.d.ts
+++ b/types/react-icons/lib/md/crop-original.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropOriginal extends React.Component<IconBaseProps> { }
+declare class MdCropOriginal extends React.Component<IconBaseProps> { }
+export = MdCropOriginal;
diff --git a/types/react-icons/lib/md/crop-portrait.d.ts b/types/react-icons/lib/md/crop-portrait.d.ts
index 9a43790ec0..a9bf07301e 100644
--- a/types/react-icons/lib/md/crop-portrait.d.ts
+++ b/types/react-icons/lib/md/crop-portrait.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropPortrait extends React.Component<IconBaseProps> { }
+declare class MdCropPortrait extends React.Component<IconBaseProps> { }
+export = MdCropPortrait;
diff --git a/types/react-icons/lib/md/crop-rotate.d.ts b/types/react-icons/lib/md/crop-rotate.d.ts
index 7106d1b55b..a7363f7798 100644
--- a/types/react-icons/lib/md/crop-rotate.d.ts
+++ b/types/react-icons/lib/md/crop-rotate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropRotate extends React.Component<IconBaseProps> { }
+declare class MdCropRotate extends React.Component<IconBaseProps> { }
+export = MdCropRotate;
diff --git a/types/react-icons/lib/md/crop-square.d.ts b/types/react-icons/lib/md/crop-square.d.ts
index 62ba826cfc..a33bba56d2 100644
--- a/types/react-icons/lib/md/crop-square.d.ts
+++ b/types/react-icons/lib/md/crop-square.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropSquare extends React.Component<IconBaseProps> { }
+declare class MdCropSquare extends React.Component<IconBaseProps> { }
+export = MdCropSquare;
diff --git a/types/react-icons/lib/md/crop.d.ts b/types/react-icons/lib/md/crop.d.ts
index dfd01a2ad8..0375235973 100644
--- a/types/react-icons/lib/md/crop.d.ts
+++ b/types/react-icons/lib/md/crop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop extends React.Component<IconBaseProps> { }
+declare class MdCrop extends React.Component<IconBaseProps> { }
+export = MdCrop;
diff --git a/types/react-icons/lib/md/dashboard.d.ts b/types/react-icons/lib/md/dashboard.d.ts
index 47f85672c9..741cb37968 100644
--- a/types/react-icons/lib/md/dashboard.d.ts
+++ b/types/react-icons/lib/md/dashboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDashboard extends React.Component<IconBaseProps> { }
+declare class MdDashboard extends React.Component<IconBaseProps> { }
+export = MdDashboard;
diff --git a/types/react-icons/lib/md/data-usage.d.ts b/types/react-icons/lib/md/data-usage.d.ts
index 013f33ad67..c51830af57 100644
--- a/types/react-icons/lib/md/data-usage.d.ts
+++ b/types/react-icons/lib/md/data-usage.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDataUsage extends React.Component<IconBaseProps> { }
+declare class MdDataUsage extends React.Component<IconBaseProps> { }
+export = MdDataUsage;
diff --git a/types/react-icons/lib/md/date-range.d.ts b/types/react-icons/lib/md/date-range.d.ts
index a9fc01751f..90a920e81e 100644
--- a/types/react-icons/lib/md/date-range.d.ts
+++ b/types/react-icons/lib/md/date-range.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDateRange extends React.Component<IconBaseProps> { }
+declare class MdDateRange extends React.Component<IconBaseProps> { }
+export = MdDateRange;
diff --git a/types/react-icons/lib/md/dehaze.d.ts b/types/react-icons/lib/md/dehaze.d.ts
index 9144d9822f..0c1700f065 100644
--- a/types/react-icons/lib/md/dehaze.d.ts
+++ b/types/react-icons/lib/md/dehaze.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDehaze extends React.Component<IconBaseProps> { }
+declare class MdDehaze extends React.Component<IconBaseProps> { }
+export = MdDehaze;
diff --git a/types/react-icons/lib/md/delete-forever.d.ts b/types/react-icons/lib/md/delete-forever.d.ts
index 9820c93b1a..e2d8ce1c53 100644
--- a/types/react-icons/lib/md/delete-forever.d.ts
+++ b/types/react-icons/lib/md/delete-forever.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeleteForever extends React.Component<IconBaseProps> { }
+declare class MdDeleteForever extends React.Component<IconBaseProps> { }
+export = MdDeleteForever;
diff --git a/types/react-icons/lib/md/delete-sweep.d.ts b/types/react-icons/lib/md/delete-sweep.d.ts
index 965ce9c746..857d38f6af 100644
--- a/types/react-icons/lib/md/delete-sweep.d.ts
+++ b/types/react-icons/lib/md/delete-sweep.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeleteSweep extends React.Component<IconBaseProps> { }
+declare class MdDeleteSweep extends React.Component<IconBaseProps> { }
+export = MdDeleteSweep;
diff --git a/types/react-icons/lib/md/delete.d.ts b/types/react-icons/lib/md/delete.d.ts
index f47a4b0a59..761f230dd9 100644
--- a/types/react-icons/lib/md/delete.d.ts
+++ b/types/react-icons/lib/md/delete.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDelete extends React.Component<IconBaseProps> { }
+declare class MdDelete extends React.Component<IconBaseProps> { }
+export = MdDelete;
diff --git a/types/react-icons/lib/md/description.d.ts b/types/react-icons/lib/md/description.d.ts
index 76bc0bbf1c..da148361f0 100644
--- a/types/react-icons/lib/md/description.d.ts
+++ b/types/react-icons/lib/md/description.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDescription extends React.Component<IconBaseProps> { }
+declare class MdDescription extends React.Component<IconBaseProps> { }
+export = MdDescription;
diff --git a/types/react-icons/lib/md/desktop-mac.d.ts b/types/react-icons/lib/md/desktop-mac.d.ts
index 007f0a5ae1..8bdd624240 100644
--- a/types/react-icons/lib/md/desktop-mac.d.ts
+++ b/types/react-icons/lib/md/desktop-mac.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDesktopMac extends React.Component<IconBaseProps> { }
+declare class MdDesktopMac extends React.Component<IconBaseProps> { }
+export = MdDesktopMac;
diff --git a/types/react-icons/lib/md/desktop-windows.d.ts b/types/react-icons/lib/md/desktop-windows.d.ts
index e735a11f72..8912843f33 100644
--- a/types/react-icons/lib/md/desktop-windows.d.ts
+++ b/types/react-icons/lib/md/desktop-windows.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDesktopWindows extends React.Component<IconBaseProps> { }
+declare class MdDesktopWindows extends React.Component<IconBaseProps> { }
+export = MdDesktopWindows;
diff --git a/types/react-icons/lib/md/details.d.ts b/types/react-icons/lib/md/details.d.ts
index 86ec926d65..ea077267ba 100644
--- a/types/react-icons/lib/md/details.d.ts
+++ b/types/react-icons/lib/md/details.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDetails extends React.Component<IconBaseProps> { }
+declare class MdDetails extends React.Component<IconBaseProps> { }
+export = MdDetails;
diff --git a/types/react-icons/lib/md/developer-board.d.ts b/types/react-icons/lib/md/developer-board.d.ts
index a3ad5d5b89..a95b8e752d 100644
--- a/types/react-icons/lib/md/developer-board.d.ts
+++ b/types/react-icons/lib/md/developer-board.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeveloperBoard extends React.Component<IconBaseProps> { }
+declare class MdDeveloperBoard extends React.Component<IconBaseProps> { }
+export = MdDeveloperBoard;
diff --git a/types/react-icons/lib/md/developer-mode.d.ts b/types/react-icons/lib/md/developer-mode.d.ts
index f2032d8e74..ef6734a5c2 100644
--- a/types/react-icons/lib/md/developer-mode.d.ts
+++ b/types/react-icons/lib/md/developer-mode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeveloperMode extends React.Component<IconBaseProps> { }
+declare class MdDeveloperMode extends React.Component<IconBaseProps> { }
+export = MdDeveloperMode;
diff --git a/types/react-icons/lib/md/device-hub.d.ts b/types/react-icons/lib/md/device-hub.d.ts
index 38815bce4d..015a1b17d9 100644
--- a/types/react-icons/lib/md/device-hub.d.ts
+++ b/types/react-icons/lib/md/device-hub.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeviceHub extends React.Component<IconBaseProps> { }
+declare class MdDeviceHub extends React.Component<IconBaseProps> { }
+export = MdDeviceHub;
diff --git a/types/react-icons/lib/md/devices-other.d.ts b/types/react-icons/lib/md/devices-other.d.ts
index 69ed6d847d..4eb8c7937d 100644
--- a/types/react-icons/lib/md/devices-other.d.ts
+++ b/types/react-icons/lib/md/devices-other.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDevicesOther extends React.Component<IconBaseProps> { }
+declare class MdDevicesOther extends React.Component<IconBaseProps> { }
+export = MdDevicesOther;
diff --git a/types/react-icons/lib/md/devices.d.ts b/types/react-icons/lib/md/devices.d.ts
index 00163cbb71..fc1d0d3521 100644
--- a/types/react-icons/lib/md/devices.d.ts
+++ b/types/react-icons/lib/md/devices.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDevices extends React.Component<IconBaseProps> { }
+declare class MdDevices extends React.Component<IconBaseProps> { }
+export = MdDevices;
diff --git a/types/react-icons/lib/md/dialer-sip.d.ts b/types/react-icons/lib/md/dialer-sip.d.ts
index ba4ade0a30..5e0eec11d8 100644
--- a/types/react-icons/lib/md/dialer-sip.d.ts
+++ b/types/react-icons/lib/md/dialer-sip.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDialerSip extends React.Component<IconBaseProps> { }
+declare class MdDialerSip extends React.Component<IconBaseProps> { }
+export = MdDialerSip;
diff --git a/types/react-icons/lib/md/dialpad.d.ts b/types/react-icons/lib/md/dialpad.d.ts
index 3d74b7ce08..cdcd0bfe91 100644
--- a/types/react-icons/lib/md/dialpad.d.ts
+++ b/types/react-icons/lib/md/dialpad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDialpad extends React.Component<IconBaseProps> { }
+declare class MdDialpad extends React.Component<IconBaseProps> { }
+export = MdDialpad;
diff --git a/types/react-icons/lib/md/directions-bike.d.ts b/types/react-icons/lib/md/directions-bike.d.ts
index 3ff5b576f2..4b214023fe 100644
--- a/types/react-icons/lib/md/directions-bike.d.ts
+++ b/types/react-icons/lib/md/directions-bike.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBike extends React.Component<IconBaseProps> { }
+declare class MdDirectionsBike extends React.Component<IconBaseProps> { }
+export = MdDirectionsBike;
diff --git a/types/react-icons/lib/md/directions-boat.d.ts b/types/react-icons/lib/md/directions-boat.d.ts
index 29cb6f9727..d0729a199e 100644
--- a/types/react-icons/lib/md/directions-boat.d.ts
+++ b/types/react-icons/lib/md/directions-boat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBoat extends React.Component<IconBaseProps> { }
+declare class MdDirectionsBoat extends React.Component<IconBaseProps> { }
+export = MdDirectionsBoat;
diff --git a/types/react-icons/lib/md/directions-bus.d.ts b/types/react-icons/lib/md/directions-bus.d.ts
index 12964dd1bf..12b9b704d6 100644
--- a/types/react-icons/lib/md/directions-bus.d.ts
+++ b/types/react-icons/lib/md/directions-bus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBus extends React.Component<IconBaseProps> { }
+declare class MdDirectionsBus extends React.Component<IconBaseProps> { }
+export = MdDirectionsBus;
diff --git a/types/react-icons/lib/md/directions-car.d.ts b/types/react-icons/lib/md/directions-car.d.ts
index 0055e4a7e9..3e2313c242 100644
--- a/types/react-icons/lib/md/directions-car.d.ts
+++ b/types/react-icons/lib/md/directions-car.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsCar extends React.Component<IconBaseProps> { }
+declare class MdDirectionsCar extends React.Component<IconBaseProps> { }
+export = MdDirectionsCar;
diff --git a/types/react-icons/lib/md/directions-ferry.d.ts b/types/react-icons/lib/md/directions-ferry.d.ts
index fa5f376ab4..c797e3804d 100644
--- a/types/react-icons/lib/md/directions-ferry.d.ts
+++ b/types/react-icons/lib/md/directions-ferry.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsFerry extends React.Component<IconBaseProps> { }
+declare class MdDirectionsFerry extends React.Component<IconBaseProps> { }
+export = MdDirectionsFerry;
diff --git a/types/react-icons/lib/md/directions-railway.d.ts b/types/react-icons/lib/md/directions-railway.d.ts
index ee241e2f78..b5895757b9 100644
--- a/types/react-icons/lib/md/directions-railway.d.ts
+++ b/types/react-icons/lib/md/directions-railway.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsRailway extends React.Component<IconBaseProps> { }
+declare class MdDirectionsRailway extends React.Component<IconBaseProps> { }
+export = MdDirectionsRailway;
diff --git a/types/react-icons/lib/md/directions-run.d.ts b/types/react-icons/lib/md/directions-run.d.ts
index 65fabf028c..2c48d943a7 100644
--- a/types/react-icons/lib/md/directions-run.d.ts
+++ b/types/react-icons/lib/md/directions-run.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsRun extends React.Component<IconBaseProps> { }
+declare class MdDirectionsRun extends React.Component<IconBaseProps> { }
+export = MdDirectionsRun;
diff --git a/types/react-icons/lib/md/directions-subway.d.ts b/types/react-icons/lib/md/directions-subway.d.ts
index d97b4fd1e2..cc4bf86ea1 100644
--- a/types/react-icons/lib/md/directions-subway.d.ts
+++ b/types/react-icons/lib/md/directions-subway.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsSubway extends React.Component<IconBaseProps> { }
+declare class MdDirectionsSubway extends React.Component<IconBaseProps> { }
+export = MdDirectionsSubway;
diff --git a/types/react-icons/lib/md/directions-transit.d.ts b/types/react-icons/lib/md/directions-transit.d.ts
index 0016d21dd1..a1cab5be50 100644
--- a/types/react-icons/lib/md/directions-transit.d.ts
+++ b/types/react-icons/lib/md/directions-transit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsTransit extends React.Component<IconBaseProps> { }
+declare class MdDirectionsTransit extends React.Component<IconBaseProps> { }
+export = MdDirectionsTransit;
diff --git a/types/react-icons/lib/md/directions-walk.d.ts b/types/react-icons/lib/md/directions-walk.d.ts
index 5f02d00296..8dd9735db6 100644
--- a/types/react-icons/lib/md/directions-walk.d.ts
+++ b/types/react-icons/lib/md/directions-walk.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsWalk extends React.Component<IconBaseProps> { }
+declare class MdDirectionsWalk extends React.Component<IconBaseProps> { }
+export = MdDirectionsWalk;
diff --git a/types/react-icons/lib/md/directions.d.ts b/types/react-icons/lib/md/directions.d.ts
index 14a1dded8e..01ea70a407 100644
--- a/types/react-icons/lib/md/directions.d.ts
+++ b/types/react-icons/lib/md/directions.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirections extends React.Component<IconBaseProps> { }
+declare class MdDirections extends React.Component<IconBaseProps> { }
+export = MdDirections;
diff --git a/types/react-icons/lib/md/disc-full.d.ts b/types/react-icons/lib/md/disc-full.d.ts
index f23e47b0bd..0f99403824 100644
--- a/types/react-icons/lib/md/disc-full.d.ts
+++ b/types/react-icons/lib/md/disc-full.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDiscFull extends React.Component<IconBaseProps> { }
+declare class MdDiscFull extends React.Component<IconBaseProps> { }
+export = MdDiscFull;
diff --git a/types/react-icons/lib/md/dns.d.ts b/types/react-icons/lib/md/dns.d.ts
index 42a3e45b84..ac4074dd65 100644
--- a/types/react-icons/lib/md/dns.d.ts
+++ b/types/react-icons/lib/md/dns.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDns extends React.Component<IconBaseProps> { }
+declare class MdDns extends React.Component<IconBaseProps> { }
+export = MdDns;
diff --git a/types/react-icons/lib/md/do-not-disturb-alt.d.ts b/types/react-icons/lib/md/do-not-disturb-alt.d.ts
index 6bad8e0875..968790ef49 100644
--- a/types/react-icons/lib/md/do-not-disturb-alt.d.ts
+++ b/types/react-icons/lib/md/do-not-disturb-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturbAlt extends React.Component<IconBaseProps> { }
+declare class MdDoNotDisturbAlt extends React.Component<IconBaseProps> { }
+export = MdDoNotDisturbAlt;
diff --git a/types/react-icons/lib/md/do-not-disturb-off.d.ts b/types/react-icons/lib/md/do-not-disturb-off.d.ts
index bcbe409363..191fdbd021 100644
--- a/types/react-icons/lib/md/do-not-disturb-off.d.ts
+++ b/types/react-icons/lib/md/do-not-disturb-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturbOff extends React.Component<IconBaseProps> { }
+declare class MdDoNotDisturbOff extends React.Component<IconBaseProps> { }
+export = MdDoNotDisturbOff;
diff --git a/types/react-icons/lib/md/do-not-disturb.d.ts b/types/react-icons/lib/md/do-not-disturb.d.ts
index bb19ff2e39..bbf62abfa8 100644
--- a/types/react-icons/lib/md/do-not-disturb.d.ts
+++ b/types/react-icons/lib/md/do-not-disturb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturb extends React.Component<IconBaseProps> { }
+declare class MdDoNotDisturb extends React.Component<IconBaseProps> { }
+export = MdDoNotDisturb;
diff --git a/types/react-icons/lib/md/dock.d.ts b/types/react-icons/lib/md/dock.d.ts
index 3de11f01a5..a4a7aede1d 100644
--- a/types/react-icons/lib/md/dock.d.ts
+++ b/types/react-icons/lib/md/dock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDock extends React.Component<IconBaseProps> { }
+declare class MdDock extends React.Component<IconBaseProps> { }
+export = MdDock;
diff --git a/types/react-icons/lib/md/domain.d.ts b/types/react-icons/lib/md/domain.d.ts
index c9586ff2b5..742cce594e 100644
--- a/types/react-icons/lib/md/domain.d.ts
+++ b/types/react-icons/lib/md/domain.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDomain extends React.Component<IconBaseProps> { }
+declare class MdDomain extends React.Component<IconBaseProps> { }
+export = MdDomain;
diff --git a/types/react-icons/lib/md/done-all.d.ts b/types/react-icons/lib/md/done-all.d.ts
index 41e8241fcc..83da2f1ed2 100644
--- a/types/react-icons/lib/md/done-all.d.ts
+++ b/types/react-icons/lib/md/done-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoneAll extends React.Component<IconBaseProps> { }
+declare class MdDoneAll extends React.Component<IconBaseProps> { }
+export = MdDoneAll;
diff --git a/types/react-icons/lib/md/done.d.ts b/types/react-icons/lib/md/done.d.ts
index 977bc177a5..d310efc5fb 100644
--- a/types/react-icons/lib/md/done.d.ts
+++ b/types/react-icons/lib/md/done.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDone extends React.Component<IconBaseProps> { }
+declare class MdDone extends React.Component<IconBaseProps> { }
+export = MdDone;
diff --git a/types/react-icons/lib/md/donut-large.d.ts b/types/react-icons/lib/md/donut-large.d.ts
index 01422e1fa5..19aae88f9a 100644
--- a/types/react-icons/lib/md/donut-large.d.ts
+++ b/types/react-icons/lib/md/donut-large.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDonutLarge extends React.Component<IconBaseProps> { }
+declare class MdDonutLarge extends React.Component<IconBaseProps> { }
+export = MdDonutLarge;
diff --git a/types/react-icons/lib/md/donut-small.d.ts b/types/react-icons/lib/md/donut-small.d.ts
index 7475720575..4006487408 100644
--- a/types/react-icons/lib/md/donut-small.d.ts
+++ b/types/react-icons/lib/md/donut-small.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDonutSmall extends React.Component<IconBaseProps> { }
+declare class MdDonutSmall extends React.Component<IconBaseProps> { }
+export = MdDonutSmall;
diff --git a/types/react-icons/lib/md/drafts.d.ts b/types/react-icons/lib/md/drafts.d.ts
index 3a3af21927..47ced0caf3 100644
--- a/types/react-icons/lib/md/drafts.d.ts
+++ b/types/react-icons/lib/md/drafts.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDrafts extends React.Component<IconBaseProps> { }
+declare class MdDrafts extends React.Component<IconBaseProps> { }
+export = MdDrafts;
diff --git a/types/react-icons/lib/md/drag-handle.d.ts b/types/react-icons/lib/md/drag-handle.d.ts
index 80ae3229cd..7a5507a43d 100644
--- a/types/react-icons/lib/md/drag-handle.d.ts
+++ b/types/react-icons/lib/md/drag-handle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDragHandle extends React.Component<IconBaseProps> { }
+declare class MdDragHandle extends React.Component<IconBaseProps> { }
+export = MdDragHandle;
diff --git a/types/react-icons/lib/md/drive-eta.d.ts b/types/react-icons/lib/md/drive-eta.d.ts
index 6cecfe8799..bbfc19b784 100644
--- a/types/react-icons/lib/md/drive-eta.d.ts
+++ b/types/react-icons/lib/md/drive-eta.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDriveEta extends React.Component<IconBaseProps> { }
+declare class MdDriveEta extends React.Component<IconBaseProps> { }
+export = MdDriveEta;
diff --git a/types/react-icons/lib/md/dvr.d.ts b/types/react-icons/lib/md/dvr.d.ts
index c9d3aa8ce5..fe06a5720f 100644
--- a/types/react-icons/lib/md/dvr.d.ts
+++ b/types/react-icons/lib/md/dvr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDvr extends React.Component<IconBaseProps> { }
+declare class MdDvr extends React.Component<IconBaseProps> { }
+export = MdDvr;
diff --git a/types/react-icons/lib/md/edit-location.d.ts b/types/react-icons/lib/md/edit-location.d.ts
index d6e3e2bfb7..b7b5b079c6 100644
--- a/types/react-icons/lib/md/edit-location.d.ts
+++ b/types/react-icons/lib/md/edit-location.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEditLocation extends React.Component<IconBaseProps> { }
+declare class MdEditLocation extends React.Component<IconBaseProps> { }
+export = MdEditLocation;
diff --git a/types/react-icons/lib/md/edit.d.ts b/types/react-icons/lib/md/edit.d.ts
index aaa97a382a..d93921ebed 100644
--- a/types/react-icons/lib/md/edit.d.ts
+++ b/types/react-icons/lib/md/edit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEdit extends React.Component<IconBaseProps> { }
+declare class MdEdit extends React.Component<IconBaseProps> { }
+export = MdEdit;
diff --git a/types/react-icons/lib/md/eject.d.ts b/types/react-icons/lib/md/eject.d.ts
index 87c366fef5..b0f783c078 100644
--- a/types/react-icons/lib/md/eject.d.ts
+++ b/types/react-icons/lib/md/eject.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEject extends React.Component<IconBaseProps> { }
+declare class MdEject extends React.Component<IconBaseProps> { }
+export = MdEject;
diff --git a/types/react-icons/lib/md/email.d.ts b/types/react-icons/lib/md/email.d.ts
index 1c8b5247ee..3c6e12207f 100644
--- a/types/react-icons/lib/md/email.d.ts
+++ b/types/react-icons/lib/md/email.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEmail extends React.Component<IconBaseProps> { }
+declare class MdEmail extends React.Component<IconBaseProps> { }
+export = MdEmail;
diff --git a/types/react-icons/lib/md/enhanced-encryption.d.ts b/types/react-icons/lib/md/enhanced-encryption.d.ts
index be651f5c94..349a860441 100644
--- a/types/react-icons/lib/md/enhanced-encryption.d.ts
+++ b/types/react-icons/lib/md/enhanced-encryption.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEnhancedEncryption extends React.Component<IconBaseProps> { }
+declare class MdEnhancedEncryption extends React.Component<IconBaseProps> { }
+export = MdEnhancedEncryption;
diff --git a/types/react-icons/lib/md/equalizer.d.ts b/types/react-icons/lib/md/equalizer.d.ts
index ab7a2f20f9..7530cf7695 100644
--- a/types/react-icons/lib/md/equalizer.d.ts
+++ b/types/react-icons/lib/md/equalizer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEqualizer extends React.Component<IconBaseProps> { }
+declare class MdEqualizer extends React.Component<IconBaseProps> { }
+export = MdEqualizer;
diff --git a/types/react-icons/lib/md/error-outline.d.ts b/types/react-icons/lib/md/error-outline.d.ts
index 0d8a6051a9..4e6e732a4c 100644
--- a/types/react-icons/lib/md/error-outline.d.ts
+++ b/types/react-icons/lib/md/error-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdErrorOutline extends React.Component<IconBaseProps> { }
+declare class MdErrorOutline extends React.Component<IconBaseProps> { }
+export = MdErrorOutline;
diff --git a/types/react-icons/lib/md/error.d.ts b/types/react-icons/lib/md/error.d.ts
index c5b9fc8e71..5b2809e65d 100644
--- a/types/react-icons/lib/md/error.d.ts
+++ b/types/react-icons/lib/md/error.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdError extends React.Component<IconBaseProps> { }
+declare class MdError extends React.Component<IconBaseProps> { }
+export = MdError;
diff --git a/types/react-icons/lib/md/euro-symbol.d.ts b/types/react-icons/lib/md/euro-symbol.d.ts
index 1e5b262514..9ae12d17be 100644
--- a/types/react-icons/lib/md/euro-symbol.d.ts
+++ b/types/react-icons/lib/md/euro-symbol.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEuroSymbol extends React.Component<IconBaseProps> { }
+declare class MdEuroSymbol extends React.Component<IconBaseProps> { }
+export = MdEuroSymbol;
diff --git a/types/react-icons/lib/md/ev-station.d.ts b/types/react-icons/lib/md/ev-station.d.ts
index 4254fe1ebf..b9620cae5e 100644
--- a/types/react-icons/lib/md/ev-station.d.ts
+++ b/types/react-icons/lib/md/ev-station.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEvStation extends React.Component<IconBaseProps> { }
+declare class MdEvStation extends React.Component<IconBaseProps> { }
+export = MdEvStation;
diff --git a/types/react-icons/lib/md/event-available.d.ts b/types/react-icons/lib/md/event-available.d.ts
index 30722d5a81..b347743558 100644
--- a/types/react-icons/lib/md/event-available.d.ts
+++ b/types/react-icons/lib/md/event-available.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventAvailable extends React.Component<IconBaseProps> { }
+declare class MdEventAvailable extends React.Component<IconBaseProps> { }
+export = MdEventAvailable;
diff --git a/types/react-icons/lib/md/event-busy.d.ts b/types/react-icons/lib/md/event-busy.d.ts
index 6659755bbf..3fc3be1c59 100644
--- a/types/react-icons/lib/md/event-busy.d.ts
+++ b/types/react-icons/lib/md/event-busy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventBusy extends React.Component<IconBaseProps> { }
+declare class MdEventBusy extends React.Component<IconBaseProps> { }
+export = MdEventBusy;
diff --git a/types/react-icons/lib/md/event-note.d.ts b/types/react-icons/lib/md/event-note.d.ts
index fb3c3b0279..34a6684ae4 100644
--- a/types/react-icons/lib/md/event-note.d.ts
+++ b/types/react-icons/lib/md/event-note.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventNote extends React.Component<IconBaseProps> { }
+declare class MdEventNote extends React.Component<IconBaseProps> { }
+export = MdEventNote;
diff --git a/types/react-icons/lib/md/event-seat.d.ts b/types/react-icons/lib/md/event-seat.d.ts
index 53c6fd7c85..f45d48eb2e 100644
--- a/types/react-icons/lib/md/event-seat.d.ts
+++ b/types/react-icons/lib/md/event-seat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventSeat extends React.Component<IconBaseProps> { }
+declare class MdEventSeat extends React.Component<IconBaseProps> { }
+export = MdEventSeat;
diff --git a/types/react-icons/lib/md/event.d.ts b/types/react-icons/lib/md/event.d.ts
index a5bba2458a..1237aeb777 100644
--- a/types/react-icons/lib/md/event.d.ts
+++ b/types/react-icons/lib/md/event.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEvent extends React.Component<IconBaseProps> { }
+declare class MdEvent extends React.Component<IconBaseProps> { }
+export = MdEvent;
diff --git a/types/react-icons/lib/md/exit-to-app.d.ts b/types/react-icons/lib/md/exit-to-app.d.ts
index 1c12dfc4b7..f8de476ba4 100644
--- a/types/react-icons/lib/md/exit-to-app.d.ts
+++ b/types/react-icons/lib/md/exit-to-app.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExitToApp extends React.Component<IconBaseProps> { }
+declare class MdExitToApp extends React.Component<IconBaseProps> { }
+export = MdExitToApp;
diff --git a/types/react-icons/lib/md/expand-less.d.ts b/types/react-icons/lib/md/expand-less.d.ts
index 766bf8886e..5706e4bf36 100644
--- a/types/react-icons/lib/md/expand-less.d.ts
+++ b/types/react-icons/lib/md/expand-less.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExpandLess extends React.Component<IconBaseProps> { }
+declare class MdExpandLess extends React.Component<IconBaseProps> { }
+export = MdExpandLess;
diff --git a/types/react-icons/lib/md/expand-more.d.ts b/types/react-icons/lib/md/expand-more.d.ts
index bef62424b7..e42c0fcebb 100644
--- a/types/react-icons/lib/md/expand-more.d.ts
+++ b/types/react-icons/lib/md/expand-more.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExpandMore extends React.Component<IconBaseProps> { }
+declare class MdExpandMore extends React.Component<IconBaseProps> { }
+export = MdExpandMore;
diff --git a/types/react-icons/lib/md/explicit.d.ts b/types/react-icons/lib/md/explicit.d.ts
index b10026c0af..673add9aad 100644
--- a/types/react-icons/lib/md/explicit.d.ts
+++ b/types/react-icons/lib/md/explicit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExplicit extends React.Component<IconBaseProps> { }
+declare class MdExplicit extends React.Component<IconBaseProps> { }
+export = MdExplicit;
diff --git a/types/react-icons/lib/md/explore.d.ts b/types/react-icons/lib/md/explore.d.ts
index 79180f608d..c4a3f09e3f 100644
--- a/types/react-icons/lib/md/explore.d.ts
+++ b/types/react-icons/lib/md/explore.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExplore extends React.Component<IconBaseProps> { }
+declare class MdExplore extends React.Component<IconBaseProps> { }
+export = MdExplore;
diff --git a/types/react-icons/lib/md/exposure-minus-1.d.ts b/types/react-icons/lib/md/exposure-minus-1.d.ts
index f0c9222b4e..9446fd9e77 100644
--- a/types/react-icons/lib/md/exposure-minus-1.d.ts
+++ b/types/react-icons/lib/md/exposure-minus-1.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureMinus1 extends React.Component<IconBaseProps> { }
+declare class MdExposureMinus1 extends React.Component<IconBaseProps> { }
+export = MdExposureMinus1;
diff --git a/types/react-icons/lib/md/exposure-minus-2.d.ts b/types/react-icons/lib/md/exposure-minus-2.d.ts
index 7b70926bf1..f63ea681dc 100644
--- a/types/react-icons/lib/md/exposure-minus-2.d.ts
+++ b/types/react-icons/lib/md/exposure-minus-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureMinus2 extends React.Component<IconBaseProps> { }
+declare class MdExposureMinus2 extends React.Component<IconBaseProps> { }
+export = MdExposureMinus2;
diff --git a/types/react-icons/lib/md/exposure-neg-1.d.ts b/types/react-icons/lib/md/exposure-neg-1.d.ts
index 136e8abf0e..9adf29cb8e 100644
--- a/types/react-icons/lib/md/exposure-neg-1.d.ts
+++ b/types/react-icons/lib/md/exposure-neg-1.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureNeg1 extends React.Component<IconBaseProps> { }
+declare class MdExposureNeg1 extends React.Component<IconBaseProps> { }
+export = MdExposureNeg1;
diff --git a/types/react-icons/lib/md/exposure-neg-2.d.ts b/types/react-icons/lib/md/exposure-neg-2.d.ts
index ceec854625..e196f110b8 100644
--- a/types/react-icons/lib/md/exposure-neg-2.d.ts
+++ b/types/react-icons/lib/md/exposure-neg-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureNeg2 extends React.Component<IconBaseProps> { }
+declare class MdExposureNeg2 extends React.Component<IconBaseProps> { }
+export = MdExposureNeg2;
diff --git a/types/react-icons/lib/md/exposure-plus-1.d.ts b/types/react-icons/lib/md/exposure-plus-1.d.ts
index fbb81879c2..2a6be5aa46 100644
--- a/types/react-icons/lib/md/exposure-plus-1.d.ts
+++ b/types/react-icons/lib/md/exposure-plus-1.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposurePlus1 extends React.Component<IconBaseProps> { }
+declare class MdExposurePlus1 extends React.Component<IconBaseProps> { }
+export = MdExposurePlus1;
diff --git a/types/react-icons/lib/md/exposure-plus-2.d.ts b/types/react-icons/lib/md/exposure-plus-2.d.ts
index d22a7d3123..699dc5c403 100644
--- a/types/react-icons/lib/md/exposure-plus-2.d.ts
+++ b/types/react-icons/lib/md/exposure-plus-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposurePlus2 extends React.Component<IconBaseProps> { }
+declare class MdExposurePlus2 extends React.Component<IconBaseProps> { }
+export = MdExposurePlus2;
diff --git a/types/react-icons/lib/md/exposure-zero.d.ts b/types/react-icons/lib/md/exposure-zero.d.ts
index 27125daa24..a0309b8c9b 100644
--- a/types/react-icons/lib/md/exposure-zero.d.ts
+++ b/types/react-icons/lib/md/exposure-zero.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureZero extends React.Component<IconBaseProps> { }
+declare class MdExposureZero extends React.Component<IconBaseProps> { }
+export = MdExposureZero;
diff --git a/types/react-icons/lib/md/exposure.d.ts b/types/react-icons/lib/md/exposure.d.ts
index 1d04f364e0..308824d04c 100644
--- a/types/react-icons/lib/md/exposure.d.ts
+++ b/types/react-icons/lib/md/exposure.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposure extends React.Component<IconBaseProps> { }
+declare class MdExposure extends React.Component<IconBaseProps> { }
+export = MdExposure;
diff --git a/types/react-icons/lib/md/extension.d.ts b/types/react-icons/lib/md/extension.d.ts
index bfb10535b0..b472fcea5a 100644
--- a/types/react-icons/lib/md/extension.d.ts
+++ b/types/react-icons/lib/md/extension.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExtension extends React.Component<IconBaseProps> { }
+declare class MdExtension extends React.Component<IconBaseProps> { }
+export = MdExtension;
diff --git a/types/react-icons/lib/md/face.d.ts b/types/react-icons/lib/md/face.d.ts
index e8042f0b48..bfecdf3a2d 100644
--- a/types/react-icons/lib/md/face.d.ts
+++ b/types/react-icons/lib/md/face.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFace extends React.Component<IconBaseProps> { }
+declare class MdFace extends React.Component<IconBaseProps> { }
+export = MdFace;
diff --git a/types/react-icons/lib/md/fast-forward.d.ts b/types/react-icons/lib/md/fast-forward.d.ts
index 3daeacb97a..e0364752a4 100644
--- a/types/react-icons/lib/md/fast-forward.d.ts
+++ b/types/react-icons/lib/md/fast-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFastForward extends React.Component<IconBaseProps> { }
+declare class MdFastForward extends React.Component<IconBaseProps> { }
+export = MdFastForward;
diff --git a/types/react-icons/lib/md/fast-rewind.d.ts b/types/react-icons/lib/md/fast-rewind.d.ts
index 5b34d9c3a6..8151f3649f 100644
--- a/types/react-icons/lib/md/fast-rewind.d.ts
+++ b/types/react-icons/lib/md/fast-rewind.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFastRewind extends React.Component<IconBaseProps> { }
+declare class MdFastRewind extends React.Component<IconBaseProps> { }
+export = MdFastRewind;
diff --git a/types/react-icons/lib/md/favorite-border.d.ts b/types/react-icons/lib/md/favorite-border.d.ts
index cd66fdc7e2..d9a6771181 100644
--- a/types/react-icons/lib/md/favorite-border.d.ts
+++ b/types/react-icons/lib/md/favorite-border.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFavoriteBorder extends React.Component<IconBaseProps> { }
+declare class MdFavoriteBorder extends React.Component<IconBaseProps> { }
+export = MdFavoriteBorder;
diff --git a/types/react-icons/lib/md/favorite-outline.d.ts b/types/react-icons/lib/md/favorite-outline.d.ts
index 7b1df113ba..8eccdcbdf7 100644
--- a/types/react-icons/lib/md/favorite-outline.d.ts
+++ b/types/react-icons/lib/md/favorite-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFavoriteOutline extends React.Component<IconBaseProps> { }
+declare class MdFavoriteOutline extends React.Component<IconBaseProps> { }
+export = MdFavoriteOutline;
diff --git a/types/react-icons/lib/md/favorite.d.ts b/types/react-icons/lib/md/favorite.d.ts
index 84959194f9..3bd251bff4 100644
--- a/types/react-icons/lib/md/favorite.d.ts
+++ b/types/react-icons/lib/md/favorite.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFavorite extends React.Component<IconBaseProps> { }
+declare class MdFavorite extends React.Component<IconBaseProps> { }
+export = MdFavorite;
diff --git a/types/react-icons/lib/md/featured-play-list.d.ts b/types/react-icons/lib/md/featured-play-list.d.ts
index b8a4685778..29e8772a70 100644
--- a/types/react-icons/lib/md/featured-play-list.d.ts
+++ b/types/react-icons/lib/md/featured-play-list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFeaturedPlayList extends React.Component<IconBaseProps> { }
+declare class MdFeaturedPlayList extends React.Component<IconBaseProps> { }
+export = MdFeaturedPlayList;
diff --git a/types/react-icons/lib/md/featured-video.d.ts b/types/react-icons/lib/md/featured-video.d.ts
index 67aa6eb9c5..17db25abb9 100644
--- a/types/react-icons/lib/md/featured-video.d.ts
+++ b/types/react-icons/lib/md/featured-video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFeaturedVideo extends React.Component<IconBaseProps> { }
+declare class MdFeaturedVideo extends React.Component<IconBaseProps> { }
+export = MdFeaturedVideo;
diff --git a/types/react-icons/lib/md/feedback.d.ts b/types/react-icons/lib/md/feedback.d.ts
index b69aff1e22..cee4f3b289 100644
--- a/types/react-icons/lib/md/feedback.d.ts
+++ b/types/react-icons/lib/md/feedback.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFeedback extends React.Component<IconBaseProps> { }
+declare class MdFeedback extends React.Component<IconBaseProps> { }
+export = MdFeedback;
diff --git a/types/react-icons/lib/md/fiber-dvr.d.ts b/types/react-icons/lib/md/fiber-dvr.d.ts
index f8c841d7b0..f9a674481a 100644
--- a/types/react-icons/lib/md/fiber-dvr.d.ts
+++ b/types/react-icons/lib/md/fiber-dvr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberDvr extends React.Component<IconBaseProps> { }
+declare class MdFiberDvr extends React.Component<IconBaseProps> { }
+export = MdFiberDvr;
diff --git a/types/react-icons/lib/md/fiber-manual-record.d.ts b/types/react-icons/lib/md/fiber-manual-record.d.ts
index 886e58432d..d89a416618 100644
--- a/types/react-icons/lib/md/fiber-manual-record.d.ts
+++ b/types/react-icons/lib/md/fiber-manual-record.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberManualRecord extends React.Component<IconBaseProps> { }
+declare class MdFiberManualRecord extends React.Component<IconBaseProps> { }
+export = MdFiberManualRecord;
diff --git a/types/react-icons/lib/md/fiber-new.d.ts b/types/react-icons/lib/md/fiber-new.d.ts
index 239b7541af..52ce6bee05 100644
--- a/types/react-icons/lib/md/fiber-new.d.ts
+++ b/types/react-icons/lib/md/fiber-new.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberNew extends React.Component<IconBaseProps> { }
+declare class MdFiberNew extends React.Component<IconBaseProps> { }
+export = MdFiberNew;
diff --git a/types/react-icons/lib/md/fiber-pin.d.ts b/types/react-icons/lib/md/fiber-pin.d.ts
index 327b456570..c5de78c3f6 100644
--- a/types/react-icons/lib/md/fiber-pin.d.ts
+++ b/types/react-icons/lib/md/fiber-pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberPin extends React.Component<IconBaseProps> { }
+declare class MdFiberPin extends React.Component<IconBaseProps> { }
+export = MdFiberPin;
diff --git a/types/react-icons/lib/md/fiber-smart-record.d.ts b/types/react-icons/lib/md/fiber-smart-record.d.ts
index 0054c9fff7..52ddb3eba4 100644
--- a/types/react-icons/lib/md/fiber-smart-record.d.ts
+++ b/types/react-icons/lib/md/fiber-smart-record.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberSmartRecord extends React.Component<IconBaseProps> { }
+declare class MdFiberSmartRecord extends React.Component<IconBaseProps> { }
+export = MdFiberSmartRecord;
diff --git a/types/react-icons/lib/md/file-download.d.ts b/types/react-icons/lib/md/file-download.d.ts
index 7874143a50..0b820a99c7 100644
--- a/types/react-icons/lib/md/file-download.d.ts
+++ b/types/react-icons/lib/md/file-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFileDownload extends React.Component<IconBaseProps> { }
+declare class MdFileDownload extends React.Component<IconBaseProps> { }
+export = MdFileDownload;
diff --git a/types/react-icons/lib/md/file-upload.d.ts b/types/react-icons/lib/md/file-upload.d.ts
index 96d2742e3c..ce06531303 100644
--- a/types/react-icons/lib/md/file-upload.d.ts
+++ b/types/react-icons/lib/md/file-upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFileUpload extends React.Component<IconBaseProps> { }
+declare class MdFileUpload extends React.Component<IconBaseProps> { }
+export = MdFileUpload;
diff --git a/types/react-icons/lib/md/filter-1.d.ts b/types/react-icons/lib/md/filter-1.d.ts
index 0eab79f7ff..bed4c717c7 100644
--- a/types/react-icons/lib/md/filter-1.d.ts
+++ b/types/react-icons/lib/md/filter-1.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter1 extends React.Component<IconBaseProps> { }
+declare class MdFilter1 extends React.Component<IconBaseProps> { }
+export = MdFilter1;
diff --git a/types/react-icons/lib/md/filter-2.d.ts b/types/react-icons/lib/md/filter-2.d.ts
index 7c2ee2aa23..bc9d9054c4 100644
--- a/types/react-icons/lib/md/filter-2.d.ts
+++ b/types/react-icons/lib/md/filter-2.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter2 extends React.Component<IconBaseProps> { }
+declare class MdFilter2 extends React.Component<IconBaseProps> { }
+export = MdFilter2;
diff --git a/types/react-icons/lib/md/filter-3.d.ts b/types/react-icons/lib/md/filter-3.d.ts
index 3378d361ba..5841f94ce8 100644
--- a/types/react-icons/lib/md/filter-3.d.ts
+++ b/types/react-icons/lib/md/filter-3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter3 extends React.Component<IconBaseProps> { }
+declare class MdFilter3 extends React.Component<IconBaseProps> { }
+export = MdFilter3;
diff --git a/types/react-icons/lib/md/filter-4.d.ts b/types/react-icons/lib/md/filter-4.d.ts
index 9c781a3957..c0e7416e01 100644
--- a/types/react-icons/lib/md/filter-4.d.ts
+++ b/types/react-icons/lib/md/filter-4.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter4 extends React.Component<IconBaseProps> { }
+declare class MdFilter4 extends React.Component<IconBaseProps> { }
+export = MdFilter4;
diff --git a/types/react-icons/lib/md/filter-5.d.ts b/types/react-icons/lib/md/filter-5.d.ts
index 0231749f2e..2ff87b69ac 100644
--- a/types/react-icons/lib/md/filter-5.d.ts
+++ b/types/react-icons/lib/md/filter-5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter5 extends React.Component<IconBaseProps> { }
+declare class MdFilter5 extends React.Component<IconBaseProps> { }
+export = MdFilter5;
diff --git a/types/react-icons/lib/md/filter-6.d.ts b/types/react-icons/lib/md/filter-6.d.ts
index 2aa32d48cd..8c2e132205 100644
--- a/types/react-icons/lib/md/filter-6.d.ts
+++ b/types/react-icons/lib/md/filter-6.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter6 extends React.Component<IconBaseProps> { }
+declare class MdFilter6 extends React.Component<IconBaseProps> { }
+export = MdFilter6;
diff --git a/types/react-icons/lib/md/filter-7.d.ts b/types/react-icons/lib/md/filter-7.d.ts
index 3a130313a7..1876e10141 100644
--- a/types/react-icons/lib/md/filter-7.d.ts
+++ b/types/react-icons/lib/md/filter-7.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter7 extends React.Component<IconBaseProps> { }
+declare class MdFilter7 extends React.Component<IconBaseProps> { }
+export = MdFilter7;
diff --git a/types/react-icons/lib/md/filter-8.d.ts b/types/react-icons/lib/md/filter-8.d.ts
index bd2690c793..3b8a1ef16b 100644
--- a/types/react-icons/lib/md/filter-8.d.ts
+++ b/types/react-icons/lib/md/filter-8.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter8 extends React.Component<IconBaseProps> { }
+declare class MdFilter8 extends React.Component<IconBaseProps> { }
+export = MdFilter8;
diff --git a/types/react-icons/lib/md/filter-9-plus.d.ts b/types/react-icons/lib/md/filter-9-plus.d.ts
index 6e11758f2e..cefab42b95 100644
--- a/types/react-icons/lib/md/filter-9-plus.d.ts
+++ b/types/react-icons/lib/md/filter-9-plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter9Plus extends React.Component<IconBaseProps> { }
+declare class MdFilter9Plus extends React.Component<IconBaseProps> { }
+export = MdFilter9Plus;
diff --git a/types/react-icons/lib/md/filter-9.d.ts b/types/react-icons/lib/md/filter-9.d.ts
index b4971c93f9..41f677c0a4 100644
--- a/types/react-icons/lib/md/filter-9.d.ts
+++ b/types/react-icons/lib/md/filter-9.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter9 extends React.Component<IconBaseProps> { }
+declare class MdFilter9 extends React.Component<IconBaseProps> { }
+export = MdFilter9;
diff --git a/types/react-icons/lib/md/filter-b-and-w.d.ts b/types/react-icons/lib/md/filter-b-and-w.d.ts
index 327d166bae..925b5ebe0b 100644
--- a/types/react-icons/lib/md/filter-b-and-w.d.ts
+++ b/types/react-icons/lib/md/filter-b-and-w.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterBAndW extends React.Component<IconBaseProps> { }
+declare class MdFilterBAndW extends React.Component<IconBaseProps> { }
+export = MdFilterBAndW;
diff --git a/types/react-icons/lib/md/filter-center-focus.d.ts b/types/react-icons/lib/md/filter-center-focus.d.ts
index 6001fc45a8..72de58ce3f 100644
--- a/types/react-icons/lib/md/filter-center-focus.d.ts
+++ b/types/react-icons/lib/md/filter-center-focus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterCenterFocus extends React.Component<IconBaseProps> { }
+declare class MdFilterCenterFocus extends React.Component<IconBaseProps> { }
+export = MdFilterCenterFocus;
diff --git a/types/react-icons/lib/md/filter-drama.d.ts b/types/react-icons/lib/md/filter-drama.d.ts
index 982c0518d9..76c44d8431 100644
--- a/types/react-icons/lib/md/filter-drama.d.ts
+++ b/types/react-icons/lib/md/filter-drama.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterDrama extends React.Component<IconBaseProps> { }
+declare class MdFilterDrama extends React.Component<IconBaseProps> { }
+export = MdFilterDrama;
diff --git a/types/react-icons/lib/md/filter-frames.d.ts b/types/react-icons/lib/md/filter-frames.d.ts
index daef1b137f..7484e92211 100644
--- a/types/react-icons/lib/md/filter-frames.d.ts
+++ b/types/react-icons/lib/md/filter-frames.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterFrames extends React.Component<IconBaseProps> { }
+declare class MdFilterFrames extends React.Component<IconBaseProps> { }
+export = MdFilterFrames;
diff --git a/types/react-icons/lib/md/filter-hdr.d.ts b/types/react-icons/lib/md/filter-hdr.d.ts
index 997614833c..c503b594d5 100644
--- a/types/react-icons/lib/md/filter-hdr.d.ts
+++ b/types/react-icons/lib/md/filter-hdr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterHdr extends React.Component<IconBaseProps> { }
+declare class MdFilterHdr extends React.Component<IconBaseProps> { }
+export = MdFilterHdr;
diff --git a/types/react-icons/lib/md/filter-list.d.ts b/types/react-icons/lib/md/filter-list.d.ts
index 546734dff6..bf51b71bb3 100644
--- a/types/react-icons/lib/md/filter-list.d.ts
+++ b/types/react-icons/lib/md/filter-list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterList extends React.Component<IconBaseProps> { }
+declare class MdFilterList extends React.Component<IconBaseProps> { }
+export = MdFilterList;
diff --git a/types/react-icons/lib/md/filter-none.d.ts b/types/react-icons/lib/md/filter-none.d.ts
index 2e160324d8..53592bc2ba 100644
--- a/types/react-icons/lib/md/filter-none.d.ts
+++ b/types/react-icons/lib/md/filter-none.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterNone extends React.Component<IconBaseProps> { }
+declare class MdFilterNone extends React.Component<IconBaseProps> { }
+export = MdFilterNone;
diff --git a/types/react-icons/lib/md/filter-tilt-shift.d.ts b/types/react-icons/lib/md/filter-tilt-shift.d.ts
index 0e68c95a0a..05bd62ae1d 100644
--- a/types/react-icons/lib/md/filter-tilt-shift.d.ts
+++ b/types/react-icons/lib/md/filter-tilt-shift.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterTiltShift extends React.Component<IconBaseProps> { }
+declare class MdFilterTiltShift extends React.Component<IconBaseProps> { }
+export = MdFilterTiltShift;
diff --git a/types/react-icons/lib/md/filter-vintage.d.ts b/types/react-icons/lib/md/filter-vintage.d.ts
index af1243b86d..bbec939c8d 100644
--- a/types/react-icons/lib/md/filter-vintage.d.ts
+++ b/types/react-icons/lib/md/filter-vintage.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterVintage extends React.Component<IconBaseProps> { }
+declare class MdFilterVintage extends React.Component<IconBaseProps> { }
+export = MdFilterVintage;
diff --git a/types/react-icons/lib/md/filter.d.ts b/types/react-icons/lib/md/filter.d.ts
index 30fd120a11..b00d2e5cfc 100644
--- a/types/react-icons/lib/md/filter.d.ts
+++ b/types/react-icons/lib/md/filter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter extends React.Component<IconBaseProps> { }
+declare class MdFilter extends React.Component<IconBaseProps> { }
+export = MdFilter;
diff --git a/types/react-icons/lib/md/find-in-page.d.ts b/types/react-icons/lib/md/find-in-page.d.ts
index 3dbb98ad7d..379e65cfcb 100644
--- a/types/react-icons/lib/md/find-in-page.d.ts
+++ b/types/react-icons/lib/md/find-in-page.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFindInPage extends React.Component<IconBaseProps> { }
+declare class MdFindInPage extends React.Component<IconBaseProps> { }
+export = MdFindInPage;
diff --git a/types/react-icons/lib/md/find-replace.d.ts b/types/react-icons/lib/md/find-replace.d.ts
index 0a066acf85..f709db2fbf 100644
--- a/types/react-icons/lib/md/find-replace.d.ts
+++ b/types/react-icons/lib/md/find-replace.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFindReplace extends React.Component<IconBaseProps> { }
+declare class MdFindReplace extends React.Component<IconBaseProps> { }
+export = MdFindReplace;
diff --git a/types/react-icons/lib/md/fingerprint.d.ts b/types/react-icons/lib/md/fingerprint.d.ts
index 1db6d8d427..ef44e19c98 100644
--- a/types/react-icons/lib/md/fingerprint.d.ts
+++ b/types/react-icons/lib/md/fingerprint.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFingerprint extends React.Component<IconBaseProps> { }
+declare class MdFingerprint extends React.Component<IconBaseProps> { }
+export = MdFingerprint;
diff --git a/types/react-icons/lib/md/first-page.d.ts b/types/react-icons/lib/md/first-page.d.ts
index 95576cd1a2..cd1d3680e0 100644
--- a/types/react-icons/lib/md/first-page.d.ts
+++ b/types/react-icons/lib/md/first-page.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFirstPage extends React.Component<IconBaseProps> { }
+declare class MdFirstPage extends React.Component<IconBaseProps> { }
+export = MdFirstPage;
diff --git a/types/react-icons/lib/md/fitness-center.d.ts b/types/react-icons/lib/md/fitness-center.d.ts
index 5874b3c1b7..bfcd0ed64c 100644
--- a/types/react-icons/lib/md/fitness-center.d.ts
+++ b/types/react-icons/lib/md/fitness-center.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFitnessCenter extends React.Component<IconBaseProps> { }
+declare class MdFitnessCenter extends React.Component<IconBaseProps> { }
+export = MdFitnessCenter;
diff --git a/types/react-icons/lib/md/flag.d.ts b/types/react-icons/lib/md/flag.d.ts
index 5767d894db..35aec0014c 100644
--- a/types/react-icons/lib/md/flag.d.ts
+++ b/types/react-icons/lib/md/flag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlag extends React.Component<IconBaseProps> { }
+declare class MdFlag extends React.Component<IconBaseProps> { }
+export = MdFlag;
diff --git a/types/react-icons/lib/md/flare.d.ts b/types/react-icons/lib/md/flare.d.ts
index 68715b9a9d..89a3e86038 100644
--- a/types/react-icons/lib/md/flare.d.ts
+++ b/types/react-icons/lib/md/flare.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlare extends React.Component<IconBaseProps> { }
+declare class MdFlare extends React.Component<IconBaseProps> { }
+export = MdFlare;
diff --git a/types/react-icons/lib/md/flash-auto.d.ts b/types/react-icons/lib/md/flash-auto.d.ts
index e119dc247b..3fdf942da2 100644
--- a/types/react-icons/lib/md/flash-auto.d.ts
+++ b/types/react-icons/lib/md/flash-auto.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashAuto extends React.Component<IconBaseProps> { }
+declare class MdFlashAuto extends React.Component<IconBaseProps> { }
+export = MdFlashAuto;
diff --git a/types/react-icons/lib/md/flash-off.d.ts b/types/react-icons/lib/md/flash-off.d.ts
index fceeadc93a..2338eeaae1 100644
--- a/types/react-icons/lib/md/flash-off.d.ts
+++ b/types/react-icons/lib/md/flash-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashOff extends React.Component<IconBaseProps> { }
+declare class MdFlashOff extends React.Component<IconBaseProps> { }
+export = MdFlashOff;
diff --git a/types/react-icons/lib/md/flash-on.d.ts b/types/react-icons/lib/md/flash-on.d.ts
index 8fcec401bc..209f551a6c 100644
--- a/types/react-icons/lib/md/flash-on.d.ts
+++ b/types/react-icons/lib/md/flash-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashOn extends React.Component<IconBaseProps> { }
+declare class MdFlashOn extends React.Component<IconBaseProps> { }
+export = MdFlashOn;
diff --git a/types/react-icons/lib/md/flight-land.d.ts b/types/react-icons/lib/md/flight-land.d.ts
index f0571c691c..546ab05d11 100644
--- a/types/react-icons/lib/md/flight-land.d.ts
+++ b/types/react-icons/lib/md/flight-land.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlightLand extends React.Component<IconBaseProps> { }
+declare class MdFlightLand extends React.Component<IconBaseProps> { }
+export = MdFlightLand;
diff --git a/types/react-icons/lib/md/flight-takeoff.d.ts b/types/react-icons/lib/md/flight-takeoff.d.ts
index c22f43d504..50f669a9ec 100644
--- a/types/react-icons/lib/md/flight-takeoff.d.ts
+++ b/types/react-icons/lib/md/flight-takeoff.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlightTakeoff extends React.Component<IconBaseProps> { }
+declare class MdFlightTakeoff extends React.Component<IconBaseProps> { }
+export = MdFlightTakeoff;
diff --git a/types/react-icons/lib/md/flight.d.ts b/types/react-icons/lib/md/flight.d.ts
index da17781711..0850e1e1b3 100644
--- a/types/react-icons/lib/md/flight.d.ts
+++ b/types/react-icons/lib/md/flight.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlight extends React.Component<IconBaseProps> { }
+declare class MdFlight extends React.Component<IconBaseProps> { }
+export = MdFlight;
diff --git a/types/react-icons/lib/md/flip-to-back.d.ts b/types/react-icons/lib/md/flip-to-back.d.ts
index a5d426d353..77c6c084e6 100644
--- a/types/react-icons/lib/md/flip-to-back.d.ts
+++ b/types/react-icons/lib/md/flip-to-back.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlipToBack extends React.Component<IconBaseProps> { }
+declare class MdFlipToBack extends React.Component<IconBaseProps> { }
+export = MdFlipToBack;
diff --git a/types/react-icons/lib/md/flip-to-front.d.ts b/types/react-icons/lib/md/flip-to-front.d.ts
index 480c1d3466..4f553e292e 100644
--- a/types/react-icons/lib/md/flip-to-front.d.ts
+++ b/types/react-icons/lib/md/flip-to-front.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlipToFront extends React.Component<IconBaseProps> { }
+declare class MdFlipToFront extends React.Component<IconBaseProps> { }
+export = MdFlipToFront;
diff --git a/types/react-icons/lib/md/flip.d.ts b/types/react-icons/lib/md/flip.d.ts
index 990872e643..a2919757e4 100644
--- a/types/react-icons/lib/md/flip.d.ts
+++ b/types/react-icons/lib/md/flip.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlip extends React.Component<IconBaseProps> { }
+declare class MdFlip extends React.Component<IconBaseProps> { }
+export = MdFlip;
diff --git a/types/react-icons/lib/md/folder-open.d.ts b/types/react-icons/lib/md/folder-open.d.ts
index 813a57abba..7bdee8f257 100644
--- a/types/react-icons/lib/md/folder-open.d.ts
+++ b/types/react-icons/lib/md/folder-open.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderOpen extends React.Component<IconBaseProps> { }
+declare class MdFolderOpen extends React.Component<IconBaseProps> { }
+export = MdFolderOpen;
diff --git a/types/react-icons/lib/md/folder-shared.d.ts b/types/react-icons/lib/md/folder-shared.d.ts
index a1734b4440..26fe5047a6 100644
--- a/types/react-icons/lib/md/folder-shared.d.ts
+++ b/types/react-icons/lib/md/folder-shared.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderShared extends React.Component<IconBaseProps> { }
+declare class MdFolderShared extends React.Component<IconBaseProps> { }
+export = MdFolderShared;
diff --git a/types/react-icons/lib/md/folder-special.d.ts b/types/react-icons/lib/md/folder-special.d.ts
index ee62be51ce..6315da8a67 100644
--- a/types/react-icons/lib/md/folder-special.d.ts
+++ b/types/react-icons/lib/md/folder-special.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderSpecial extends React.Component<IconBaseProps> { }
+declare class MdFolderSpecial extends React.Component<IconBaseProps> { }
+export = MdFolderSpecial;
diff --git a/types/react-icons/lib/md/folder.d.ts b/types/react-icons/lib/md/folder.d.ts
index efde8117c4..274d156256 100644
--- a/types/react-icons/lib/md/folder.d.ts
+++ b/types/react-icons/lib/md/folder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolder extends React.Component<IconBaseProps> { }
+declare class MdFolder extends React.Component<IconBaseProps> { }
+export = MdFolder;
diff --git a/types/react-icons/lib/md/font-download.d.ts b/types/react-icons/lib/md/font-download.d.ts
index 61c3368b45..baaadab4bf 100644
--- a/types/react-icons/lib/md/font-download.d.ts
+++ b/types/react-icons/lib/md/font-download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFontDownload extends React.Component<IconBaseProps> { }
+declare class MdFontDownload extends React.Component<IconBaseProps> { }
+export = MdFontDownload;
diff --git a/types/react-icons/lib/md/format-align-center.d.ts b/types/react-icons/lib/md/format-align-center.d.ts
index e601b4115d..6678781fab 100644
--- a/types/react-icons/lib/md/format-align-center.d.ts
+++ b/types/react-icons/lib/md/format-align-center.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignCenter extends React.Component<IconBaseProps> { }
+declare class MdFormatAlignCenter extends React.Component<IconBaseProps> { }
+export = MdFormatAlignCenter;
diff --git a/types/react-icons/lib/md/format-align-justify.d.ts b/types/react-icons/lib/md/format-align-justify.d.ts
index a35ccd43cf..c169d7d4cf 100644
--- a/types/react-icons/lib/md/format-align-justify.d.ts
+++ b/types/react-icons/lib/md/format-align-justify.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignJustify extends React.Component<IconBaseProps> { }
+declare class MdFormatAlignJustify extends React.Component<IconBaseProps> { }
+export = MdFormatAlignJustify;
diff --git a/types/react-icons/lib/md/format-align-left.d.ts b/types/react-icons/lib/md/format-align-left.d.ts
index 45443b3013..11fb721bb6 100644
--- a/types/react-icons/lib/md/format-align-left.d.ts
+++ b/types/react-icons/lib/md/format-align-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignLeft extends React.Component<IconBaseProps> { }
+declare class MdFormatAlignLeft extends React.Component<IconBaseProps> { }
+export = MdFormatAlignLeft;
diff --git a/types/react-icons/lib/md/format-align-right.d.ts b/types/react-icons/lib/md/format-align-right.d.ts
index 4c965ed516..ef9444429f 100644
--- a/types/react-icons/lib/md/format-align-right.d.ts
+++ b/types/react-icons/lib/md/format-align-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignRight extends React.Component<IconBaseProps> { }
+declare class MdFormatAlignRight extends React.Component<IconBaseProps> { }
+export = MdFormatAlignRight;
diff --git a/types/react-icons/lib/md/format-bold.d.ts b/types/react-icons/lib/md/format-bold.d.ts
index 45c6764995..ebd0027ba8 100644
--- a/types/react-icons/lib/md/format-bold.d.ts
+++ b/types/react-icons/lib/md/format-bold.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatBold extends React.Component<IconBaseProps> { }
+declare class MdFormatBold extends React.Component<IconBaseProps> { }
+export = MdFormatBold;
diff --git a/types/react-icons/lib/md/format-clear.d.ts b/types/react-icons/lib/md/format-clear.d.ts
index b60b1f0d1c..d8350f1916 100644
--- a/types/react-icons/lib/md/format-clear.d.ts
+++ b/types/react-icons/lib/md/format-clear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatClear extends React.Component<IconBaseProps> { }
+declare class MdFormatClear extends React.Component<IconBaseProps> { }
+export = MdFormatClear;
diff --git a/types/react-icons/lib/md/format-color-fill.d.ts b/types/react-icons/lib/md/format-color-fill.d.ts
index c3a17b53ff..dac025da7d 100644
--- a/types/react-icons/lib/md/format-color-fill.d.ts
+++ b/types/react-icons/lib/md/format-color-fill.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorFill extends React.Component<IconBaseProps> { }
+declare class MdFormatColorFill extends React.Component<IconBaseProps> { }
+export = MdFormatColorFill;
diff --git a/types/react-icons/lib/md/format-color-reset.d.ts b/types/react-icons/lib/md/format-color-reset.d.ts
index 399c41d77e..9de4f919d4 100644
--- a/types/react-icons/lib/md/format-color-reset.d.ts
+++ b/types/react-icons/lib/md/format-color-reset.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorReset extends React.Component<IconBaseProps> { }
+declare class MdFormatColorReset extends React.Component<IconBaseProps> { }
+export = MdFormatColorReset;
diff --git a/types/react-icons/lib/md/format-color-text.d.ts b/types/react-icons/lib/md/format-color-text.d.ts
index 1a332ab22a..54d5d3c4fb 100644
--- a/types/react-icons/lib/md/format-color-text.d.ts
+++ b/types/react-icons/lib/md/format-color-text.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorText extends React.Component<IconBaseProps> { }
+declare class MdFormatColorText extends React.Component<IconBaseProps> { }
+export = MdFormatColorText;
diff --git a/types/react-icons/lib/md/format-indent-decrease.d.ts b/types/react-icons/lib/md/format-indent-decrease.d.ts
index a89c15275d..4eaf1d9537 100644
--- a/types/react-icons/lib/md/format-indent-decrease.d.ts
+++ b/types/react-icons/lib/md/format-indent-decrease.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatIndentDecrease extends React.Component<IconBaseProps> { }
+declare class MdFormatIndentDecrease extends React.Component<IconBaseProps> { }
+export = MdFormatIndentDecrease;
diff --git a/types/react-icons/lib/md/format-indent-increase.d.ts b/types/react-icons/lib/md/format-indent-increase.d.ts
index 8b2d098b69..f5e0f6008b 100644
--- a/types/react-icons/lib/md/format-indent-increase.d.ts
+++ b/types/react-icons/lib/md/format-indent-increase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatIndentIncrease extends React.Component<IconBaseProps> { }
+declare class MdFormatIndentIncrease extends React.Component<IconBaseProps> { }
+export = MdFormatIndentIncrease;
diff --git a/types/react-icons/lib/md/format-italic.d.ts b/types/react-icons/lib/md/format-italic.d.ts
index bbc7df9a3f..c512f7deec 100644
--- a/types/react-icons/lib/md/format-italic.d.ts
+++ b/types/react-icons/lib/md/format-italic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatItalic extends React.Component<IconBaseProps> { }
+declare class MdFormatItalic extends React.Component<IconBaseProps> { }
+export = MdFormatItalic;
diff --git a/types/react-icons/lib/md/format-line-spacing.d.ts b/types/react-icons/lib/md/format-line-spacing.d.ts
index 3731147921..8f8317af6a 100644
--- a/types/react-icons/lib/md/format-line-spacing.d.ts
+++ b/types/react-icons/lib/md/format-line-spacing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatLineSpacing extends React.Component<IconBaseProps> { }
+declare class MdFormatLineSpacing extends React.Component<IconBaseProps> { }
+export = MdFormatLineSpacing;
diff --git a/types/react-icons/lib/md/format-list-bulleted.d.ts b/types/react-icons/lib/md/format-list-bulleted.d.ts
index 6813d2e4a4..f658fcb4d3 100644
--- a/types/react-icons/lib/md/format-list-bulleted.d.ts
+++ b/types/react-icons/lib/md/format-list-bulleted.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatListBulleted extends React.Component<IconBaseProps> { }
+declare class MdFormatListBulleted extends React.Component<IconBaseProps> { }
+export = MdFormatListBulleted;
diff --git a/types/react-icons/lib/md/format-list-numbered.d.ts b/types/react-icons/lib/md/format-list-numbered.d.ts
index 8c241c413f..3117ab5d31 100644
--- a/types/react-icons/lib/md/format-list-numbered.d.ts
+++ b/types/react-icons/lib/md/format-list-numbered.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatListNumbered extends React.Component<IconBaseProps> { }
+declare class MdFormatListNumbered extends React.Component<IconBaseProps> { }
+export = MdFormatListNumbered;
diff --git a/types/react-icons/lib/md/format-paint.d.ts b/types/react-icons/lib/md/format-paint.d.ts
index ebbc520c32..19111de135 100644
--- a/types/react-icons/lib/md/format-paint.d.ts
+++ b/types/react-icons/lib/md/format-paint.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatPaint extends React.Component<IconBaseProps> { }
+declare class MdFormatPaint extends React.Component<IconBaseProps> { }
+export = MdFormatPaint;
diff --git a/types/react-icons/lib/md/format-quote.d.ts b/types/react-icons/lib/md/format-quote.d.ts
index bd1037ab81..921ac98059 100644
--- a/types/react-icons/lib/md/format-quote.d.ts
+++ b/types/react-icons/lib/md/format-quote.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatQuote extends React.Component<IconBaseProps> { }
+declare class MdFormatQuote extends React.Component<IconBaseProps> { }
+export = MdFormatQuote;
diff --git a/types/react-icons/lib/md/format-shapes.d.ts b/types/react-icons/lib/md/format-shapes.d.ts
index c40f7411dd..6b60899f89 100644
--- a/types/react-icons/lib/md/format-shapes.d.ts
+++ b/types/react-icons/lib/md/format-shapes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatShapes extends React.Component<IconBaseProps> { }
+declare class MdFormatShapes extends React.Component<IconBaseProps> { }
+export = MdFormatShapes;
diff --git a/types/react-icons/lib/md/format-size.d.ts b/types/react-icons/lib/md/format-size.d.ts
index 2a9e345a3e..05c91f8cde 100644
--- a/types/react-icons/lib/md/format-size.d.ts
+++ b/types/react-icons/lib/md/format-size.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatSize extends React.Component<IconBaseProps> { }
+declare class MdFormatSize extends React.Component<IconBaseProps> { }
+export = MdFormatSize;
diff --git a/types/react-icons/lib/md/format-strikethrough.d.ts b/types/react-icons/lib/md/format-strikethrough.d.ts
index fe36f12771..6253769c69 100644
--- a/types/react-icons/lib/md/format-strikethrough.d.ts
+++ b/types/react-icons/lib/md/format-strikethrough.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatStrikethrough extends React.Component<IconBaseProps> { }
+declare class MdFormatStrikethrough extends React.Component<IconBaseProps> { }
+export = MdFormatStrikethrough;
diff --git a/types/react-icons/lib/md/format-textdirection-l-to-r.d.ts b/types/react-icons/lib/md/format-textdirection-l-to-r.d.ts
index 71b083148c..6f33ceb20b 100644
--- a/types/react-icons/lib/md/format-textdirection-l-to-r.d.ts
+++ b/types/react-icons/lib/md/format-textdirection-l-to-r.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatTextdirectionLToR extends React.Component<IconBaseProps> { }
+declare class MdFormatTextdirectionLToR extends React.Component<IconBaseProps> { }
+export = MdFormatTextdirectionLToR;
diff --git a/types/react-icons/lib/md/format-textdirection-r-to-l.d.ts b/types/react-icons/lib/md/format-textdirection-r-to-l.d.ts
index 58086109e0..2c8c4372f1 100644
--- a/types/react-icons/lib/md/format-textdirection-r-to-l.d.ts
+++ b/types/react-icons/lib/md/format-textdirection-r-to-l.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatTextdirectionRToL extends React.Component<IconBaseProps> { }
+declare class MdFormatTextdirectionRToL extends React.Component<IconBaseProps> { }
+export = MdFormatTextdirectionRToL;
diff --git a/types/react-icons/lib/md/format-underlined.d.ts b/types/react-icons/lib/md/format-underlined.d.ts
index 126df5e540..c721474493 100644
--- a/types/react-icons/lib/md/format-underlined.d.ts
+++ b/types/react-icons/lib/md/format-underlined.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatUnderlined extends React.Component<IconBaseProps> { }
+declare class MdFormatUnderlined extends React.Component<IconBaseProps> { }
+export = MdFormatUnderlined;
diff --git a/types/react-icons/lib/md/forum.d.ts b/types/react-icons/lib/md/forum.d.ts
index b7bdc2c096..16570dcd85 100644
--- a/types/react-icons/lib/md/forum.d.ts
+++ b/types/react-icons/lib/md/forum.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForum extends React.Component<IconBaseProps> { }
+declare class MdForum extends React.Component<IconBaseProps> { }
+export = MdForum;
diff --git a/types/react-icons/lib/md/forward-10.d.ts b/types/react-icons/lib/md/forward-10.d.ts
index 295d4e89f1..97dba92f08 100644
--- a/types/react-icons/lib/md/forward-10.d.ts
+++ b/types/react-icons/lib/md/forward-10.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward10 extends React.Component<IconBaseProps> { }
+declare class MdForward10 extends React.Component<IconBaseProps> { }
+export = MdForward10;
diff --git a/types/react-icons/lib/md/forward-30.d.ts b/types/react-icons/lib/md/forward-30.d.ts
index 060517c358..b23eddab5e 100644
--- a/types/react-icons/lib/md/forward-30.d.ts
+++ b/types/react-icons/lib/md/forward-30.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward30 extends React.Component<IconBaseProps> { }
+declare class MdForward30 extends React.Component<IconBaseProps> { }
+export = MdForward30;
diff --git a/types/react-icons/lib/md/forward-5.d.ts b/types/react-icons/lib/md/forward-5.d.ts
index bab1bcea70..79b4fbd1a3 100644
--- a/types/react-icons/lib/md/forward-5.d.ts
+++ b/types/react-icons/lib/md/forward-5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward5 extends React.Component<IconBaseProps> { }
+declare class MdForward5 extends React.Component<IconBaseProps> { }
+export = MdForward5;
diff --git a/types/react-icons/lib/md/forward.d.ts b/types/react-icons/lib/md/forward.d.ts
index 5a3c89125d..caa23aeb8c 100644
--- a/types/react-icons/lib/md/forward.d.ts
+++ b/types/react-icons/lib/md/forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward extends React.Component<IconBaseProps> { }
+declare class MdForward extends React.Component<IconBaseProps> { }
+export = MdForward;
diff --git a/types/react-icons/lib/md/free-breakfast.d.ts b/types/react-icons/lib/md/free-breakfast.d.ts
index 362b7036e4..ee43389bf5 100644
--- a/types/react-icons/lib/md/free-breakfast.d.ts
+++ b/types/react-icons/lib/md/free-breakfast.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFreeBreakfast extends React.Component<IconBaseProps> { }
+declare class MdFreeBreakfast extends React.Component<IconBaseProps> { }
+export = MdFreeBreakfast;
diff --git a/types/react-icons/lib/md/fullscreen-exit.d.ts b/types/react-icons/lib/md/fullscreen-exit.d.ts
index 0a1e720dc6..92bb42ec08 100644
--- a/types/react-icons/lib/md/fullscreen-exit.d.ts
+++ b/types/react-icons/lib/md/fullscreen-exit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFullscreenExit extends React.Component<IconBaseProps> { }
+declare class MdFullscreenExit extends React.Component<IconBaseProps> { }
+export = MdFullscreenExit;
diff --git a/types/react-icons/lib/md/fullscreen.d.ts b/types/react-icons/lib/md/fullscreen.d.ts
index a31a4e460b..cf8c2bb4d3 100644
--- a/types/react-icons/lib/md/fullscreen.d.ts
+++ b/types/react-icons/lib/md/fullscreen.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFullscreen extends React.Component<IconBaseProps> { }
+declare class MdFullscreen extends React.Component<IconBaseProps> { }
+export = MdFullscreen;
diff --git a/types/react-icons/lib/md/functions.d.ts b/types/react-icons/lib/md/functions.d.ts
index c6b5e4e36f..1c966bb2c8 100644
--- a/types/react-icons/lib/md/functions.d.ts
+++ b/types/react-icons/lib/md/functions.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFunctions extends React.Component<IconBaseProps> { }
+declare class MdFunctions extends React.Component<IconBaseProps> { }
+export = MdFunctions;
diff --git a/types/react-icons/lib/md/g-translate.d.ts b/types/react-icons/lib/md/g-translate.d.ts
index 46b09234a0..f64d1592ba 100644
--- a/types/react-icons/lib/md/g-translate.d.ts
+++ b/types/react-icons/lib/md/g-translate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGTranslate extends React.Component<IconBaseProps> { }
+declare class MdGTranslate extends React.Component<IconBaseProps> { }
+export = MdGTranslate;
diff --git a/types/react-icons/lib/md/gamepad.d.ts b/types/react-icons/lib/md/gamepad.d.ts
index 8596cbd26d..f568ac2428 100644
--- a/types/react-icons/lib/md/gamepad.d.ts
+++ b/types/react-icons/lib/md/gamepad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGamepad extends React.Component<IconBaseProps> { }
+declare class MdGamepad extends React.Component<IconBaseProps> { }
+export = MdGamepad;
diff --git a/types/react-icons/lib/md/games.d.ts b/types/react-icons/lib/md/games.d.ts
index 3a64f429b9..207af92742 100644
--- a/types/react-icons/lib/md/games.d.ts
+++ b/types/react-icons/lib/md/games.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGames extends React.Component<IconBaseProps> { }
+declare class MdGames extends React.Component<IconBaseProps> { }
+export = MdGames;
diff --git a/types/react-icons/lib/md/gavel.d.ts b/types/react-icons/lib/md/gavel.d.ts
index 55fd1390e9..fe9199cd4c 100644
--- a/types/react-icons/lib/md/gavel.d.ts
+++ b/types/react-icons/lib/md/gavel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGavel extends React.Component<IconBaseProps> { }
+declare class MdGavel extends React.Component<IconBaseProps> { }
+export = MdGavel;
diff --git a/types/react-icons/lib/md/gesture.d.ts b/types/react-icons/lib/md/gesture.d.ts
index a382f009b4..9457643edc 100644
--- a/types/react-icons/lib/md/gesture.d.ts
+++ b/types/react-icons/lib/md/gesture.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGesture extends React.Component<IconBaseProps> { }
+declare class MdGesture extends React.Component<IconBaseProps> { }
+export = MdGesture;
diff --git a/types/react-icons/lib/md/get-app.d.ts b/types/react-icons/lib/md/get-app.d.ts
index 9fe4a2a003..7695a14938 100644
--- a/types/react-icons/lib/md/get-app.d.ts
+++ b/types/react-icons/lib/md/get-app.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGetApp extends React.Component<IconBaseProps> { }
+declare class MdGetApp extends React.Component<IconBaseProps> { }
+export = MdGetApp;
diff --git a/types/react-icons/lib/md/gif.d.ts b/types/react-icons/lib/md/gif.d.ts
index 60d7666674..3c5642675a 100644
--- a/types/react-icons/lib/md/gif.d.ts
+++ b/types/react-icons/lib/md/gif.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGif extends React.Component<IconBaseProps> { }
+declare class MdGif extends React.Component<IconBaseProps> { }
+export = MdGif;
diff --git a/types/react-icons/lib/md/goat.d.ts b/types/react-icons/lib/md/goat.d.ts
index 43610ba2e6..bc65467fa7 100644
--- a/types/react-icons/lib/md/goat.d.ts
+++ b/types/react-icons/lib/md/goat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGoat extends React.Component<IconBaseProps> { }
+declare class MdGoat extends React.Component<IconBaseProps> { }
+export = MdGoat;
diff --git a/types/react-icons/lib/md/golf-course.d.ts b/types/react-icons/lib/md/golf-course.d.ts
index 301ee1b707..ae70d0da1f 100644
--- a/types/react-icons/lib/md/golf-course.d.ts
+++ b/types/react-icons/lib/md/golf-course.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGolfCourse extends React.Component<IconBaseProps> { }
+declare class MdGolfCourse extends React.Component<IconBaseProps> { }
+export = MdGolfCourse;
diff --git a/types/react-icons/lib/md/gps-fixed.d.ts b/types/react-icons/lib/md/gps-fixed.d.ts
index 12443403df..bb5e80d727 100644
--- a/types/react-icons/lib/md/gps-fixed.d.ts
+++ b/types/react-icons/lib/md/gps-fixed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsFixed extends React.Component<IconBaseProps> { }
+declare class MdGpsFixed extends React.Component<IconBaseProps> { }
+export = MdGpsFixed;
diff --git a/types/react-icons/lib/md/gps-not-fixed.d.ts b/types/react-icons/lib/md/gps-not-fixed.d.ts
index 8af1c95e23..2818183742 100644
--- a/types/react-icons/lib/md/gps-not-fixed.d.ts
+++ b/types/react-icons/lib/md/gps-not-fixed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsNotFixed extends React.Component<IconBaseProps> { }
+declare class MdGpsNotFixed extends React.Component<IconBaseProps> { }
+export = MdGpsNotFixed;
diff --git a/types/react-icons/lib/md/gps-off.d.ts b/types/react-icons/lib/md/gps-off.d.ts
index c02322b7a4..b6ed83e20a 100644
--- a/types/react-icons/lib/md/gps-off.d.ts
+++ b/types/react-icons/lib/md/gps-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsOff extends React.Component<IconBaseProps> { }
+declare class MdGpsOff extends React.Component<IconBaseProps> { }
+export = MdGpsOff;
diff --git a/types/react-icons/lib/md/grade.d.ts b/types/react-icons/lib/md/grade.d.ts
index cebbc96aa6..6a15e0b7b3 100644
--- a/types/react-icons/lib/md/grade.d.ts
+++ b/types/react-icons/lib/md/grade.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGrade extends React.Component<IconBaseProps> { }
+declare class MdGrade extends React.Component<IconBaseProps> { }
+export = MdGrade;
diff --git a/types/react-icons/lib/md/gradient.d.ts b/types/react-icons/lib/md/gradient.d.ts
index 32e62169a4..b83474defd 100644
--- a/types/react-icons/lib/md/gradient.d.ts
+++ b/types/react-icons/lib/md/gradient.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGradient extends React.Component<IconBaseProps> { }
+declare class MdGradient extends React.Component<IconBaseProps> { }
+export = MdGradient;
diff --git a/types/react-icons/lib/md/grain.d.ts b/types/react-icons/lib/md/grain.d.ts
index 79a8b9a14d..77edc78659 100644
--- a/types/react-icons/lib/md/grain.d.ts
+++ b/types/react-icons/lib/md/grain.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGrain extends React.Component<IconBaseProps> { }
+declare class MdGrain extends React.Component<IconBaseProps> { }
+export = MdGrain;
diff --git a/types/react-icons/lib/md/graphic-eq.d.ts b/types/react-icons/lib/md/graphic-eq.d.ts
index 7f59fa3728..29d4259b98 100644
--- a/types/react-icons/lib/md/graphic-eq.d.ts
+++ b/types/react-icons/lib/md/graphic-eq.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGraphicEq extends React.Component<IconBaseProps> { }
+declare class MdGraphicEq extends React.Component<IconBaseProps> { }
+export = MdGraphicEq;
diff --git a/types/react-icons/lib/md/grid-off.d.ts b/types/react-icons/lib/md/grid-off.d.ts
index 8b5cf60336..9e9a2ff95e 100644
--- a/types/react-icons/lib/md/grid-off.d.ts
+++ b/types/react-icons/lib/md/grid-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGridOff extends React.Component<IconBaseProps> { }
+declare class MdGridOff extends React.Component<IconBaseProps> { }
+export = MdGridOff;
diff --git a/types/react-icons/lib/md/grid-on.d.ts b/types/react-icons/lib/md/grid-on.d.ts
index 4978f9912e..a96a53f50d 100644
--- a/types/react-icons/lib/md/grid-on.d.ts
+++ b/types/react-icons/lib/md/grid-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGridOn extends React.Component<IconBaseProps> { }
+declare class MdGridOn extends React.Component<IconBaseProps> { }
+export = MdGridOn;
diff --git a/types/react-icons/lib/md/group-add.d.ts b/types/react-icons/lib/md/group-add.d.ts
index bacc3ed6cf..f463e09def 100644
--- a/types/react-icons/lib/md/group-add.d.ts
+++ b/types/react-icons/lib/md/group-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGroupAdd extends React.Component<IconBaseProps> { }
+declare class MdGroupAdd extends React.Component<IconBaseProps> { }
+export = MdGroupAdd;
diff --git a/types/react-icons/lib/md/group-work.d.ts b/types/react-icons/lib/md/group-work.d.ts
index 997b1738f2..13b822ce96 100644
--- a/types/react-icons/lib/md/group-work.d.ts
+++ b/types/react-icons/lib/md/group-work.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGroupWork extends React.Component<IconBaseProps> { }
+declare class MdGroupWork extends React.Component<IconBaseProps> { }
+export = MdGroupWork;
diff --git a/types/react-icons/lib/md/group.d.ts b/types/react-icons/lib/md/group.d.ts
index af48b3dd81..b382d9d7f1 100644
--- a/types/react-icons/lib/md/group.d.ts
+++ b/types/react-icons/lib/md/group.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGroup extends React.Component<IconBaseProps> { }
+declare class MdGroup extends React.Component<IconBaseProps> { }
+export = MdGroup;
diff --git a/types/react-icons/lib/md/hd.d.ts b/types/react-icons/lib/md/hd.d.ts
index 1698da3a4d..bcc5b9fa09 100644
--- a/types/react-icons/lib/md/hd.d.ts
+++ b/types/react-icons/lib/md/hd.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHd extends React.Component<IconBaseProps> { }
+declare class MdHd extends React.Component<IconBaseProps> { }
+export = MdHd;
diff --git a/types/react-icons/lib/md/hdr-off.d.ts b/types/react-icons/lib/md/hdr-off.d.ts
index 4a343d8a9b..f9376a4371 100644
--- a/types/react-icons/lib/md/hdr-off.d.ts
+++ b/types/react-icons/lib/md/hdr-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrOff extends React.Component<IconBaseProps> { }
+declare class MdHdrOff extends React.Component<IconBaseProps> { }
+export = MdHdrOff;
diff --git a/types/react-icons/lib/md/hdr-on.d.ts b/types/react-icons/lib/md/hdr-on.d.ts
index 129aa05032..20004d19ee 100644
--- a/types/react-icons/lib/md/hdr-on.d.ts
+++ b/types/react-icons/lib/md/hdr-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrOn extends React.Component<IconBaseProps> { }
+declare class MdHdrOn extends React.Component<IconBaseProps> { }
+export = MdHdrOn;
diff --git a/types/react-icons/lib/md/hdr-strong.d.ts b/types/react-icons/lib/md/hdr-strong.d.ts
index f1eb6a8c80..a57a064665 100644
--- a/types/react-icons/lib/md/hdr-strong.d.ts
+++ b/types/react-icons/lib/md/hdr-strong.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrStrong extends React.Component<IconBaseProps> { }
+declare class MdHdrStrong extends React.Component<IconBaseProps> { }
+export = MdHdrStrong;
diff --git a/types/react-icons/lib/md/hdr-weak.d.ts b/types/react-icons/lib/md/hdr-weak.d.ts
index 43be31c24d..82694c3075 100644
--- a/types/react-icons/lib/md/hdr-weak.d.ts
+++ b/types/react-icons/lib/md/hdr-weak.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrWeak extends React.Component<IconBaseProps> { }
+declare class MdHdrWeak extends React.Component<IconBaseProps> { }
+export = MdHdrWeak;
diff --git a/types/react-icons/lib/md/headset-mic.d.ts b/types/react-icons/lib/md/headset-mic.d.ts
index 83c8c0547e..e168e766a8 100644
--- a/types/react-icons/lib/md/headset-mic.d.ts
+++ b/types/react-icons/lib/md/headset-mic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHeadsetMic extends React.Component<IconBaseProps> { }
+declare class MdHeadsetMic extends React.Component<IconBaseProps> { }
+export = MdHeadsetMic;
diff --git a/types/react-icons/lib/md/headset.d.ts b/types/react-icons/lib/md/headset.d.ts
index 988ed4b38d..a0342ce8b0 100644
--- a/types/react-icons/lib/md/headset.d.ts
+++ b/types/react-icons/lib/md/headset.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHeadset extends React.Component<IconBaseProps> { }
+declare class MdHeadset extends React.Component<IconBaseProps> { }
+export = MdHeadset;
diff --git a/types/react-icons/lib/md/healing.d.ts b/types/react-icons/lib/md/healing.d.ts
index fc914063c2..a8c5255d6b 100644
--- a/types/react-icons/lib/md/healing.d.ts
+++ b/types/react-icons/lib/md/healing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHealing extends React.Component<IconBaseProps> { }
+declare class MdHealing extends React.Component<IconBaseProps> { }
+export = MdHealing;
diff --git a/types/react-icons/lib/md/hearing.d.ts b/types/react-icons/lib/md/hearing.d.ts
index 134c7f1863..d2c41b7011 100644
--- a/types/react-icons/lib/md/hearing.d.ts
+++ b/types/react-icons/lib/md/hearing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHearing extends React.Component<IconBaseProps> { }
+declare class MdHearing extends React.Component<IconBaseProps> { }
+export = MdHearing;
diff --git a/types/react-icons/lib/md/help-outline.d.ts b/types/react-icons/lib/md/help-outline.d.ts
index 2734400cb9..1a3ffc41f4 100644
--- a/types/react-icons/lib/md/help-outline.d.ts
+++ b/types/react-icons/lib/md/help-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHelpOutline extends React.Component<IconBaseProps> { }
+declare class MdHelpOutline extends React.Component<IconBaseProps> { }
+export = MdHelpOutline;
diff --git a/types/react-icons/lib/md/help.d.ts b/types/react-icons/lib/md/help.d.ts
index cce20cffd6..8aa5586697 100644
--- a/types/react-icons/lib/md/help.d.ts
+++ b/types/react-icons/lib/md/help.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHelp extends React.Component<IconBaseProps> { }
+declare class MdHelp extends React.Component<IconBaseProps> { }
+export = MdHelp;
diff --git a/types/react-icons/lib/md/high-quality.d.ts b/types/react-icons/lib/md/high-quality.d.ts
index 5676b35cbd..abf338bc2d 100644
--- a/types/react-icons/lib/md/high-quality.d.ts
+++ b/types/react-icons/lib/md/high-quality.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighQuality extends React.Component<IconBaseProps> { }
+declare class MdHighQuality extends React.Component<IconBaseProps> { }
+export = MdHighQuality;
diff --git a/types/react-icons/lib/md/highlight-off.d.ts b/types/react-icons/lib/md/highlight-off.d.ts
index f188f1f9bd..5876802841 100644
--- a/types/react-icons/lib/md/highlight-off.d.ts
+++ b/types/react-icons/lib/md/highlight-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlightOff extends React.Component<IconBaseProps> { }
+declare class MdHighlightOff extends React.Component<IconBaseProps> { }
+export = MdHighlightOff;
diff --git a/types/react-icons/lib/md/highlight-remove.d.ts b/types/react-icons/lib/md/highlight-remove.d.ts
index 7a28a3b5ae..893ac99c5f 100644
--- a/types/react-icons/lib/md/highlight-remove.d.ts
+++ b/types/react-icons/lib/md/highlight-remove.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlightRemove extends React.Component<IconBaseProps> { }
+declare class MdHighlightRemove extends React.Component<IconBaseProps> { }
+export = MdHighlightRemove;
diff --git a/types/react-icons/lib/md/highlight.d.ts b/types/react-icons/lib/md/highlight.d.ts
index 0730ad41da..4930407946 100644
--- a/types/react-icons/lib/md/highlight.d.ts
+++ b/types/react-icons/lib/md/highlight.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlight extends React.Component<IconBaseProps> { }
+declare class MdHighlight extends React.Component<IconBaseProps> { }
+export = MdHighlight;
diff --git a/types/react-icons/lib/md/history.d.ts b/types/react-icons/lib/md/history.d.ts
index d97bca17d4..7f2609892d 100644
--- a/types/react-icons/lib/md/history.d.ts
+++ b/types/react-icons/lib/md/history.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHistory extends React.Component<IconBaseProps> { }
+declare class MdHistory extends React.Component<IconBaseProps> { }
+export = MdHistory;
diff --git a/types/react-icons/lib/md/home.d.ts b/types/react-icons/lib/md/home.d.ts
index 6defd6933f..137d98d6c1 100644
--- a/types/react-icons/lib/md/home.d.ts
+++ b/types/react-icons/lib/md/home.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHome extends React.Component<IconBaseProps> { }
+declare class MdHome extends React.Component<IconBaseProps> { }
+export = MdHome;
diff --git a/types/react-icons/lib/md/hot-tub.d.ts b/types/react-icons/lib/md/hot-tub.d.ts
index 89cf2e0591..84abc90459 100644
--- a/types/react-icons/lib/md/hot-tub.d.ts
+++ b/types/react-icons/lib/md/hot-tub.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHotTub extends React.Component<IconBaseProps> { }
+declare class MdHotTub extends React.Component<IconBaseProps> { }
+export = MdHotTub;
diff --git a/types/react-icons/lib/md/hotel.d.ts b/types/react-icons/lib/md/hotel.d.ts
index 198fb2b211..86643009a3 100644
--- a/types/react-icons/lib/md/hotel.d.ts
+++ b/types/react-icons/lib/md/hotel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHotel extends React.Component<IconBaseProps> { }
+declare class MdHotel extends React.Component<IconBaseProps> { }
+export = MdHotel;
diff --git a/types/react-icons/lib/md/hourglass-empty.d.ts b/types/react-icons/lib/md/hourglass-empty.d.ts
index a7e4e25915..3598c1045c 100644
--- a/types/react-icons/lib/md/hourglass-empty.d.ts
+++ b/types/react-icons/lib/md/hourglass-empty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHourglassEmpty extends React.Component<IconBaseProps> { }
+declare class MdHourglassEmpty extends React.Component<IconBaseProps> { }
+export = MdHourglassEmpty;
diff --git a/types/react-icons/lib/md/hourglass-full.d.ts b/types/react-icons/lib/md/hourglass-full.d.ts
index 2a3e1507a3..316d99a7d9 100644
--- a/types/react-icons/lib/md/hourglass-full.d.ts
+++ b/types/react-icons/lib/md/hourglass-full.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHourglassFull extends React.Component<IconBaseProps> { }
+declare class MdHourglassFull extends React.Component<IconBaseProps> { }
+export = MdHourglassFull;
diff --git a/types/react-icons/lib/md/http.d.ts b/types/react-icons/lib/md/http.d.ts
index def5a14ec5..0bb5db017a 100644
--- a/types/react-icons/lib/md/http.d.ts
+++ b/types/react-icons/lib/md/http.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHttp extends React.Component<IconBaseProps> { }
+declare class MdHttp extends React.Component<IconBaseProps> { }
+export = MdHttp;
diff --git a/types/react-icons/lib/md/https.d.ts b/types/react-icons/lib/md/https.d.ts
index 991ad252b9..b696b59968 100644
--- a/types/react-icons/lib/md/https.d.ts
+++ b/types/react-icons/lib/md/https.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHttps extends React.Component<IconBaseProps> { }
+declare class MdHttps extends React.Component<IconBaseProps> { }
+export = MdHttps;
diff --git a/types/react-icons/lib/md/image-aspect-ratio.d.ts b/types/react-icons/lib/md/image-aspect-ratio.d.ts
index 2cff8927ea..67cc6951bd 100644
--- a/types/react-icons/lib/md/image-aspect-ratio.d.ts
+++ b/types/react-icons/lib/md/image-aspect-ratio.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImageAspectRatio extends React.Component<IconBaseProps> { }
+declare class MdImageAspectRatio extends React.Component<IconBaseProps> { }
+export = MdImageAspectRatio;
diff --git a/types/react-icons/lib/md/image.d.ts b/types/react-icons/lib/md/image.d.ts
index f4246f01ed..3fe545db51 100644
--- a/types/react-icons/lib/md/image.d.ts
+++ b/types/react-icons/lib/md/image.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImage extends React.Component<IconBaseProps> { }
+declare class MdImage extends React.Component<IconBaseProps> { }
+export = MdImage;
diff --git a/types/react-icons/lib/md/import-contacts.d.ts b/types/react-icons/lib/md/import-contacts.d.ts
index 4012627098..790267421e 100644
--- a/types/react-icons/lib/md/import-contacts.d.ts
+++ b/types/react-icons/lib/md/import-contacts.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImportContacts extends React.Component<IconBaseProps> { }
+declare class MdImportContacts extends React.Component<IconBaseProps> { }
+export = MdImportContacts;
diff --git a/types/react-icons/lib/md/import-export.d.ts b/types/react-icons/lib/md/import-export.d.ts
index 9c66e17352..c15ca8f709 100644
--- a/types/react-icons/lib/md/import-export.d.ts
+++ b/types/react-icons/lib/md/import-export.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImportExport extends React.Component<IconBaseProps> { }
+declare class MdImportExport extends React.Component<IconBaseProps> { }
+export = MdImportExport;
diff --git a/types/react-icons/lib/md/important-devices.d.ts b/types/react-icons/lib/md/important-devices.d.ts
index 8795301e43..b5ff654e98 100644
--- a/types/react-icons/lib/md/important-devices.d.ts
+++ b/types/react-icons/lib/md/important-devices.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImportantDevices extends React.Component<IconBaseProps> { }
+declare class MdImportantDevices extends React.Component<IconBaseProps> { }
+export = MdImportantDevices;
diff --git a/types/react-icons/lib/md/inbox.d.ts b/types/react-icons/lib/md/inbox.d.ts
index 13d401760f..bd4f22bc83 100644
--- a/types/react-icons/lib/md/inbox.d.ts
+++ b/types/react-icons/lib/md/inbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInbox extends React.Component<IconBaseProps> { }
+declare class MdInbox extends React.Component<IconBaseProps> { }
+export = MdInbox;
diff --git a/types/react-icons/lib/md/indeterminate-check-box.d.ts b/types/react-icons/lib/md/indeterminate-check-box.d.ts
index 01b0c58730..bb3fd56252 100644
--- a/types/react-icons/lib/md/indeterminate-check-box.d.ts
+++ b/types/react-icons/lib/md/indeterminate-check-box.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdIndeterminateCheckBox extends React.Component<IconBaseProps> { }
+declare class MdIndeterminateCheckBox extends React.Component<IconBaseProps> { }
+export = MdIndeterminateCheckBox;
diff --git a/types/react-icons/lib/md/index.d.ts b/types/react-icons/lib/md/index.d.ts
index a3e2e3e929..f850df8f58 100644
--- a/types/react-icons/lib/md/index.d.ts
+++ b/types/react-icons/lib/md/index.d.ts
@@ -1,946 +1,946 @@
-export { default as Md3dRotation } from "./3d-rotation";
-export { default as MdAcUnit } from "./ac-unit";
-export { default as MdAccessAlarm } from "./access-alarm";
-export { default as MdAccessAlarms } from "./access-alarms";
-export { default as MdAccessTime } from "./access-time";
-export { default as MdAccessibility } from "./accessibility";
-export { default as MdAccessible } from "./accessible";
-export { default as MdAccountBalanceWallet } from "./account-balance-wallet";
-export { default as MdAccountBalance } from "./account-balance";
-export { default as MdAccountBox } from "./account-box";
-export { default as MdAccountCircle } from "./account-circle";
-export { default as MdAdb } from "./adb";
-export { default as MdAddAPhoto } from "./add-a-photo";
-export { default as MdAddAlarm } from "./add-alarm";
-export { default as MdAddAlert } from "./add-alert";
-export { default as MdAddBox } from "./add-box";
-export { default as MdAddCircleOutline } from "./add-circle-outline";
-export { default as MdAddCircle } from "./add-circle";
-export { default as MdAddLocation } from "./add-location";
-export { default as MdAddShoppingCart } from "./add-shopping-cart";
-export { default as MdAddToPhotos } from "./add-to-photos";
-export { default as MdAddToQueue } from "./add-to-queue";
-export { default as MdAdd } from "./add";
-export { default as MdAdjust } from "./adjust";
-export { default as MdAirlineSeatFlatAngled } from "./airline-seat-flat-angled";
-export { default as MdAirlineSeatFlat } from "./airline-seat-flat";
-export { default as MdAirlineSeatIndividualSuite } from "./airline-seat-individual-suite";
-export { default as MdAirlineSeatLegroomExtra } from "./airline-seat-legroom-extra";
-export { default as MdAirlineSeatLegroomNormal } from "./airline-seat-legroom-normal";
-export { default as MdAirlineSeatLegroomReduced } from "./airline-seat-legroom-reduced";
-export { default as MdAirlineSeatReclineExtra } from "./airline-seat-recline-extra";
-export { default as MdAirlineSeatReclineNormal } from "./airline-seat-recline-normal";
-export { default as MdAirplanemodeActive } from "./airplanemode-active";
-export { default as MdAirplanemodeInactive } from "./airplanemode-inactive";
-export { default as MdAirplay } from "./airplay";
-export { default as MdAirportShuttle } from "./airport-shuttle";
-export { default as MdAlarmAdd } from "./alarm-add";
-export { default as MdAlarmOff } from "./alarm-off";
-export { default as MdAlarmOn } from "./alarm-on";
-export { default as MdAlarm } from "./alarm";
-export { default as MdAlbum } from "./album";
-export { default as MdAllInclusive } from "./all-inclusive";
-export { default as MdAllOut } from "./all-out";
-export { default as MdAndroid } from "./android";
-export { default as MdAnnouncement } from "./announcement";
-export { default as MdApps } from "./apps";
-export { default as MdArchive } from "./archive";
-export { default as MdArrowBack } from "./arrow-back";
-export { default as MdArrowDownward } from "./arrow-downward";
-export { default as MdArrowDropDownCircle } from "./arrow-drop-down-circle";
-export { default as MdArrowDropDown } from "./arrow-drop-down";
-export { default as MdArrowDropUp } from "./arrow-drop-up";
-export { default as MdArrowForward } from "./arrow-forward";
-export { default as MdArrowUpward } from "./arrow-upward";
-export { default as MdArtTrack } from "./art-track";
-export { default as MdAspectRatio } from "./aspect-ratio";
-export { default as MdAssessment } from "./assessment";
-export { default as MdAssignmentInd } from "./assignment-ind";
-export { default as MdAssignmentLate } from "./assignment-late";
-export { default as MdAssignmentReturn } from "./assignment-return";
-export { default as MdAssignmentReturned } from "./assignment-returned";
-export { default as MdAssignmentTurnedIn } from "./assignment-turned-in";
-export { default as MdAssignment } from "./assignment";
-export { default as MdAssistantPhoto } from "./assistant-photo";
-export { default as MdAssistant } from "./assistant";
-export { default as MdAttachFile } from "./attach-file";
-export { default as MdAttachMoney } from "./attach-money";
-export { default as MdAttachment } from "./attachment";
-export { default as MdAudiotrack } from "./audiotrack";
-export { default as MdAutorenew } from "./autorenew";
-export { default as MdAvTimer } from "./av-timer";
-export { default as MdBackspace } from "./backspace";
-export { default as MdBackup } from "./backup";
-export { default as MdBatteryAlert } from "./battery-alert";
-export { default as MdBatteryChargingFull } from "./battery-charging-full";
-export { default as MdBatteryFull } from "./battery-full";
-export { default as MdBatteryStd } from "./battery-std";
-export { default as MdBatteryUnknown } from "./battery-unknown";
-export { default as MdBeachAccess } from "./beach-access";
-export { default as MdBeenhere } from "./beenhere";
-export { default as MdBlock } from "./block";
-export { default as MdBluetoothAudio } from "./bluetooth-audio";
-export { default as MdBluetoothConnected } from "./bluetooth-connected";
-export { default as MdBluetoothDisabled } from "./bluetooth-disabled";
-export { default as MdBluetoothSearching } from "./bluetooth-searching";
-export { default as MdBluetooth } from "./bluetooth";
-export { default as MdBlurCircular } from "./blur-circular";
-export { default as MdBlurLinear } from "./blur-linear";
-export { default as MdBlurOff } from "./blur-off";
-export { default as MdBlurOn } from "./blur-on";
-export { default as MdBook } from "./book";
-export { default as MdBookmarkOutline } from "./bookmark-outline";
-export { default as MdBookmark } from "./bookmark";
-export { default as MdBorderAll } from "./border-all";
-export { default as MdBorderBottom } from "./border-bottom";
-export { default as MdBorderClear } from "./border-clear";
-export { default as MdBorderColor } from "./border-color";
-export { default as MdBorderHorizontal } from "./border-horizontal";
-export { default as MdBorderInner } from "./border-inner";
-export { default as MdBorderLeft } from "./border-left";
-export { default as MdBorderOuter } from "./border-outer";
-export { default as MdBorderRight } from "./border-right";
-export { default as MdBorderStyle } from "./border-style";
-export { default as MdBorderTop } from "./border-top";
-export { default as MdBorderVertical } from "./border-vertical";
-export { default as MdBrandingWatermark } from "./branding-watermark";
-export { default as MdBrightness1 } from "./brightness-1";
-export { default as MdBrightness2 } from "./brightness-2";
-export { default as MdBrightness3 } from "./brightness-3";
-export { default as MdBrightness4 } from "./brightness-4";
-export { default as MdBrightness5 } from "./brightness-5";
-export { default as MdBrightness6 } from "./brightness-6";
-export { default as MdBrightness7 } from "./brightness-7";
-export { default as MdBrightnessAuto } from "./brightness-auto";
-export { default as MdBrightnessHigh } from "./brightness-high";
-export { default as MdBrightnessLow } from "./brightness-low";
-export { default as MdBrightnessMedium } from "./brightness-medium";
-export { default as MdBrokenImage } from "./broken-image";
-export { default as MdBrush } from "./brush";
-export { default as MdBubbleChart } from "./bubble-chart";
-export { default as MdBugReport } from "./bug-report";
-export { default as MdBuild } from "./build";
-export { default as MdBurstMode } from "./burst-mode";
-export { default as MdBusinessCenter } from "./business-center";
-export { default as MdBusiness } from "./business";
-export { default as MdCached } from "./cached";
-export { default as MdCake } from "./cake";
-export { default as MdCallEnd } from "./call-end";
-export { default as MdCallMade } from "./call-made";
-export { default as MdCallMerge } from "./call-merge";
-export { default as MdCallMissedOutgoing } from "./call-missed-outgoing";
-export { default as MdCallMissed } from "./call-missed";
-export { default as MdCallReceived } from "./call-received";
-export { default as MdCallSplit } from "./call-split";
-export { default as MdCallToAction } from "./call-to-action";
-export { default as MdCall } from "./call";
-export { default as MdCameraAlt } from "./camera-alt";
-export { default as MdCameraEnhance } from "./camera-enhance";
-export { default as MdCameraFront } from "./camera-front";
-export { default as MdCameraRear } from "./camera-rear";
-export { default as MdCameraRoll } from "./camera-roll";
-export { default as MdCamera } from "./camera";
-export { default as MdCancel } from "./cancel";
-export { default as MdCardGiftcard } from "./card-giftcard";
-export { default as MdCardMembership } from "./card-membership";
-export { default as MdCardTravel } from "./card-travel";
-export { default as MdCasino } from "./casino";
-export { default as MdCastConnected } from "./cast-connected";
-export { default as MdCast } from "./cast";
-export { default as MdCenterFocusStrong } from "./center-focus-strong";
-export { default as MdCenterFocusWeak } from "./center-focus-weak";
-export { default as MdChangeHistory } from "./change-history";
-export { default as MdChatBubbleOutline } from "./chat-bubble-outline";
-export { default as MdChatBubble } from "./chat-bubble";
-export { default as MdChat } from "./chat";
-export { default as MdCheckBoxOutlineBlank } from "./check-box-outline-blank";
-export { default as MdCheckBox } from "./check-box";
-export { default as MdCheckCircle } from "./check-circle";
-export { default as MdCheck } from "./check";
-export { default as MdChevronLeft } from "./chevron-left";
-export { default as MdChevronRight } from "./chevron-right";
-export { default as MdChildCare } from "./child-care";
-export { default as MdChildFriendly } from "./child-friendly";
-export { default as MdChromeReaderMode } from "./chrome-reader-mode";
-export { default as MdClass } from "./class";
-export { default as MdClearAll } from "./clear-all";
-export { default as MdClear } from "./clear";
-export { default as MdClose } from "./close";
-export { default as MdClosedCaption } from "./closed-caption";
-export { default as MdCloudCircle } from "./cloud-circle";
-export { default as MdCloudDone } from "./cloud-done";
-export { default as MdCloudDownload } from "./cloud-download";
-export { default as MdCloudOff } from "./cloud-off";
-export { default as MdCloudQueue } from "./cloud-queue";
-export { default as MdCloudUpload } from "./cloud-upload";
-export { default as MdCloud } from "./cloud";
-export { default as MdCode } from "./code";
-export { default as MdCollectionsBookmark } from "./collections-bookmark";
-export { default as MdCollections } from "./collections";
-export { default as MdColorLens } from "./color-lens";
-export { default as MdColorize } from "./colorize";
-export { default as MdComment } from "./comment";
-export { default as MdCompareArrows } from "./compare-arrows";
-export { default as MdCompare } from "./compare";
-export { default as MdComputer } from "./computer";
-export { default as MdConfirmationNumber } from "./confirmation-number";
-export { default as MdContactMail } from "./contact-mail";
-export { default as MdContactPhone } from "./contact-phone";
-export { default as MdContacts } from "./contacts";
-export { default as MdContentCopy } from "./content-copy";
-export { default as MdContentCut } from "./content-cut";
-export { default as MdContentPaste } from "./content-paste";
-export { default as MdControlPointDuplicate } from "./control-point-duplicate";
-export { default as MdControlPoint } from "./control-point";
-export { default as MdCopyright } from "./copyright";
-export { default as MdCreateNewFolder } from "./create-new-folder";
-export { default as MdCreate } from "./create";
-export { default as MdCreditCard } from "./credit-card";
-export { default as MdCrop169 } from "./crop-16-9";
-export { default as MdCrop32 } from "./crop-3-2";
-export { default as MdCrop54 } from "./crop-5-4";
-export { default as MdCrop75 } from "./crop-7-5";
-export { default as MdCropDin } from "./crop-din";
-export { default as MdCropFree } from "./crop-free";
-export { default as MdCropLandscape } from "./crop-landscape";
-export { default as MdCropOriginal } from "./crop-original";
-export { default as MdCropPortrait } from "./crop-portrait";
-export { default as MdCropRotate } from "./crop-rotate";
-export { default as MdCropSquare } from "./crop-square";
-export { default as MdCrop } from "./crop";
-export { default as MdDashboard } from "./dashboard";
-export { default as MdDataUsage } from "./data-usage";
-export { default as MdDateRange } from "./date-range";
-export { default as MdDehaze } from "./dehaze";
-export { default as MdDeleteForever } from "./delete-forever";
-export { default as MdDeleteSweep } from "./delete-sweep";
-export { default as MdDelete } from "./delete";
-export { default as MdDescription } from "./description";
-export { default as MdDesktopMac } from "./desktop-mac";
-export { default as MdDesktopWindows } from "./desktop-windows";
-export { default as MdDetails } from "./details";
-export { default as MdDeveloperBoard } from "./developer-board";
-export { default as MdDeveloperMode } from "./developer-mode";
-export { default as MdDeviceHub } from "./device-hub";
-export { default as MdDevicesOther } from "./devices-other";
-export { default as MdDevices } from "./devices";
-export { default as MdDialerSip } from "./dialer-sip";
-export { default as MdDialpad } from "./dialpad";
-export { default as MdDirectionsBike } from "./directions-bike";
-export { default as MdDirectionsBoat } from "./directions-boat";
-export { default as MdDirectionsBus } from "./directions-bus";
-export { default as MdDirectionsCar } from "./directions-car";
-export { default as MdDirectionsFerry } from "./directions-ferry";
-export { default as MdDirectionsRailway } from "./directions-railway";
-export { default as MdDirectionsRun } from "./directions-run";
-export { default as MdDirectionsSubway } from "./directions-subway";
-export { default as MdDirectionsTransit } from "./directions-transit";
-export { default as MdDirectionsWalk } from "./directions-walk";
-export { default as MdDirections } from "./directions";
-export { default as MdDiscFull } from "./disc-full";
-export { default as MdDns } from "./dns";
-export { default as MdDoNotDisturbAlt } from "./do-not-disturb-alt";
-export { default as MdDoNotDisturbOff } from "./do-not-disturb-off";
-export { default as MdDoNotDisturb } from "./do-not-disturb";
-export { default as MdDock } from "./dock";
-export { default as MdDomain } from "./domain";
-export { default as MdDoneAll } from "./done-all";
-export { default as MdDone } from "./done";
-export { default as MdDonutLarge } from "./donut-large";
-export { default as MdDonutSmall } from "./donut-small";
-export { default as MdDrafts } from "./drafts";
-export { default as MdDragHandle } from "./drag-handle";
-export { default as MdDriveEta } from "./drive-eta";
-export { default as MdDvr } from "./dvr";
-export { default as MdEditLocation } from "./edit-location";
-export { default as MdEdit } from "./edit";
-export { default as MdEject } from "./eject";
-export { default as MdEmail } from "./email";
-export { default as MdEnhancedEncryption } from "./enhanced-encryption";
-export { default as MdEqualizer } from "./equalizer";
-export { default as MdErrorOutline } from "./error-outline";
-export { default as MdError } from "./error";
-export { default as MdEuroSymbol } from "./euro-symbol";
-export { default as MdEvStation } from "./ev-station";
-export { default as MdEventAvailable } from "./event-available";
-export { default as MdEventBusy } from "./event-busy";
-export { default as MdEventNote } from "./event-note";
-export { default as MdEventSeat } from "./event-seat";
-export { default as MdEvent } from "./event";
-export { default as MdExitToApp } from "./exit-to-app";
-export { default as MdExpandLess } from "./expand-less";
-export { default as MdExpandMore } from "./expand-more";
-export { default as MdExplicit } from "./explicit";
-export { default as MdExplore } from "./explore";
-export { default as MdExposureMinus1 } from "./exposure-minus-1";
-export { default as MdExposureMinus2 } from "./exposure-minus-2";
-export { default as MdExposureNeg1 } from "./exposure-neg-1";
-export { default as MdExposureNeg2 } from "./exposure-neg-2";
-export { default as MdExposurePlus1 } from "./exposure-plus-1";
-export { default as MdExposurePlus2 } from "./exposure-plus-2";
-export { default as MdExposureZero } from "./exposure-zero";
-export { default as MdExposure } from "./exposure";
-export { default as MdExtension } from "./extension";
-export { default as MdFace } from "./face";
-export { default as MdFastForward } from "./fast-forward";
-export { default as MdFastRewind } from "./fast-rewind";
-export { default as MdFavoriteBorder } from "./favorite-border";
-export { default as MdFavoriteOutline } from "./favorite-outline";
-export { default as MdFavorite } from "./favorite";
-export { default as MdFeaturedPlayList } from "./featured-play-list";
-export { default as MdFeaturedVideo } from "./featured-video";
-export { default as MdFeedback } from "./feedback";
-export { default as MdFiberDvr } from "./fiber-dvr";
-export { default as MdFiberManualRecord } from "./fiber-manual-record";
-export { default as MdFiberNew } from "./fiber-new";
-export { default as MdFiberPin } from "./fiber-pin";
-export { default as MdFiberSmartRecord } from "./fiber-smart-record";
-export { default as MdFileDownload } from "./file-download";
-export { default as MdFileUpload } from "./file-upload";
-export { default as MdFilter1 } from "./filter-1";
-export { default as MdFilter2 } from "./filter-2";
-export { default as MdFilter3 } from "./filter-3";
-export { default as MdFilter4 } from "./filter-4";
-export { default as MdFilter5 } from "./filter-5";
-export { default as MdFilter6 } from "./filter-6";
-export { default as MdFilter7 } from "./filter-7";
-export { default as MdFilter8 } from "./filter-8";
-export { default as MdFilter9Plus } from "./filter-9-plus";
-export { default as MdFilter9 } from "./filter-9";
-export { default as MdFilterBAndW } from "./filter-b-and-w";
-export { default as MdFilterCenterFocus } from "./filter-center-focus";
-export { default as MdFilterDrama } from "./filter-drama";
-export { default as MdFilterFrames } from "./filter-frames";
-export { default as MdFilterHdr } from "./filter-hdr";
-export { default as MdFilterList } from "./filter-list";
-export { default as MdFilterNone } from "./filter-none";
-export { default as MdFilterTiltShift } from "./filter-tilt-shift";
-export { default as MdFilterVintage } from "./filter-vintage";
-export { default as MdFilter } from "./filter";
-export { default as MdFindInPage } from "./find-in-page";
-export { default as MdFindReplace } from "./find-replace";
-export { default as MdFingerprint } from "./fingerprint";
-export { default as MdFirstPage } from "./first-page";
-export { default as MdFitnessCenter } from "./fitness-center";
-export { default as MdFlag } from "./flag";
-export { default as MdFlare } from "./flare";
-export { default as MdFlashAuto } from "./flash-auto";
-export { default as MdFlashOff } from "./flash-off";
-export { default as MdFlashOn } from "./flash-on";
-export { default as MdFlightLand } from "./flight-land";
-export { default as MdFlightTakeoff } from "./flight-takeoff";
-export { default as MdFlight } from "./flight";
-export { default as MdFlipToBack } from "./flip-to-back";
-export { default as MdFlipToFront } from "./flip-to-front";
-export { default as MdFlip } from "./flip";
-export { default as MdFolderOpen } from "./folder-open";
-export { default as MdFolderShared } from "./folder-shared";
-export { default as MdFolderSpecial } from "./folder-special";
-export { default as MdFolder } from "./folder";
-export { default as MdFontDownload } from "./font-download";
-export { default as MdFormatAlignCenter } from "./format-align-center";
-export { default as MdFormatAlignJustify } from "./format-align-justify";
-export { default as MdFormatAlignLeft } from "./format-align-left";
-export { default as MdFormatAlignRight } from "./format-align-right";
-export { default as MdFormatBold } from "./format-bold";
-export { default as MdFormatClear } from "./format-clear";
-export { default as MdFormatColorFill } from "./format-color-fill";
-export { default as MdFormatColorReset } from "./format-color-reset";
-export { default as MdFormatColorText } from "./format-color-text";
-export { default as MdFormatIndentDecrease } from "./format-indent-decrease";
-export { default as MdFormatIndentIncrease } from "./format-indent-increase";
-export { default as MdFormatItalic } from "./format-italic";
-export { default as MdFormatLineSpacing } from "./format-line-spacing";
-export { default as MdFormatListBulleted } from "./format-list-bulleted";
-export { default as MdFormatListNumbered } from "./format-list-numbered";
-export { default as MdFormatPaint } from "./format-paint";
-export { default as MdFormatQuote } from "./format-quote";
-export { default as MdFormatShapes } from "./format-shapes";
-export { default as MdFormatSize } from "./format-size";
-export { default as MdFormatStrikethrough } from "./format-strikethrough";
-export { default as MdFormatTextdirectionLToR } from "./format-textdirection-l-to-r";
-export { default as MdFormatTextdirectionRToL } from "./format-textdirection-r-to-l";
-export { default as MdFormatUnderlined } from "./format-underlined";
-export { default as MdForum } from "./forum";
-export { default as MdForward10 } from "./forward-10";
-export { default as MdForward30 } from "./forward-30";
-export { default as MdForward5 } from "./forward-5";
-export { default as MdForward } from "./forward";
-export { default as MdFreeBreakfast } from "./free-breakfast";
-export { default as MdFullscreenExit } from "./fullscreen-exit";
-export { default as MdFullscreen } from "./fullscreen";
-export { default as MdFunctions } from "./functions";
-export { default as MdGTranslate } from "./g-translate";
-export { default as MdGamepad } from "./gamepad";
-export { default as MdGames } from "./games";
-export { default as MdGavel } from "./gavel";
-export { default as MdGesture } from "./gesture";
-export { default as MdGetApp } from "./get-app";
-export { default as MdGif } from "./gif";
-export { default as MdGoat } from "./goat";
-export { default as MdGolfCourse } from "./golf-course";
-export { default as MdGpsFixed } from "./gps-fixed";
-export { default as MdGpsNotFixed } from "./gps-not-fixed";
-export { default as MdGpsOff } from "./gps-off";
-export { default as MdGrade } from "./grade";
-export { default as MdGradient } from "./gradient";
-export { default as MdGrain } from "./grain";
-export { default as MdGraphicEq } from "./graphic-eq";
-export { default as MdGridOff } from "./grid-off";
-export { default as MdGridOn } from "./grid-on";
-export { default as MdGroupAdd } from "./group-add";
-export { default as MdGroupWork } from "./group-work";
-export { default as MdGroup } from "./group";
-export { default as MdHd } from "./hd";
-export { default as MdHdrOff } from "./hdr-off";
-export { default as MdHdrOn } from "./hdr-on";
-export { default as MdHdrStrong } from "./hdr-strong";
-export { default as MdHdrWeak } from "./hdr-weak";
-export { default as MdHeadsetMic } from "./headset-mic";
-export { default as MdHeadset } from "./headset";
-export { default as MdHealing } from "./healing";
-export { default as MdHearing } from "./hearing";
-export { default as MdHelpOutline } from "./help-outline";
-export { default as MdHelp } from "./help";
-export { default as MdHighQuality } from "./high-quality";
-export { default as MdHighlightOff } from "./highlight-off";
-export { default as MdHighlightRemove } from "./highlight-remove";
-export { default as MdHighlight } from "./highlight";
-export { default as MdHistory } from "./history";
-export { default as MdHome } from "./home";
-export { default as MdHotTub } from "./hot-tub";
-export { default as MdHotel } from "./hotel";
-export { default as MdHourglassEmpty } from "./hourglass-empty";
-export { default as MdHourglassFull } from "./hourglass-full";
-export { default as MdHttp } from "./http";
-export { default as MdHttps } from "./https";
-export { default as MdImageAspectRatio } from "./image-aspect-ratio";
-export { default as MdImage } from "./image";
-export { default as MdImportContacts } from "./import-contacts";
-export { default as MdImportExport } from "./import-export";
-export { default as MdImportantDevices } from "./important-devices";
-export { default as MdInbox } from "./inbox";
-export { default as MdIndeterminateCheckBox } from "./indeterminate-check-box";
-export { default as MdInfoOutline } from "./info-outline";
-export { default as MdInfo } from "./info";
-export { default as MdInput } from "./input";
-export { default as MdInsertChart } from "./insert-chart";
-export { default as MdInsertComment } from "./insert-comment";
-export { default as MdInsertDriveFile } from "./insert-drive-file";
-export { default as MdInsertEmoticon } from "./insert-emoticon";
-export { default as MdInsertInvitation } from "./insert-invitation";
-export { default as MdInsertLink } from "./insert-link";
-export { default as MdInsertPhoto } from "./insert-photo";
-export { default as MdInvertColorsOff } from "./invert-colors-off";
-export { default as MdInvertColorsOn } from "./invert-colors-on";
-export { default as MdInvertColors } from "./invert-colors";
-export { default as MdIso } from "./iso";
-export { default as MdKeyboardArrowDown } from "./keyboard-arrow-down";
-export { default as MdKeyboardArrowLeft } from "./keyboard-arrow-left";
-export { default as MdKeyboardArrowRight } from "./keyboard-arrow-right";
-export { default as MdKeyboardArrowUp } from "./keyboard-arrow-up";
-export { default as MdKeyboardBackspace } from "./keyboard-backspace";
-export { default as MdKeyboardCapslock } from "./keyboard-capslock";
-export { default as MdKeyboardControl } from "./keyboard-control";
-export { default as MdKeyboardHide } from "./keyboard-hide";
-export { default as MdKeyboardReturn } from "./keyboard-return";
-export { default as MdKeyboardTab } from "./keyboard-tab";
-export { default as MdKeyboardVoice } from "./keyboard-voice";
-export { default as MdKeyboard } from "./keyboard";
-export { default as MdKitchen } from "./kitchen";
-export { default as MdLabelOutline } from "./label-outline";
-export { default as MdLabel } from "./label";
-export { default as MdLandscape } from "./landscape";
-export { default as MdLanguage } from "./language";
-export { default as MdLaptopChromebook } from "./laptop-chromebook";
-export { default as MdLaptopMac } from "./laptop-mac";
-export { default as MdLaptopWindows } from "./laptop-windows";
-export { default as MdLaptop } from "./laptop";
-export { default as MdLastPage } from "./last-page";
-export { default as MdLaunch } from "./launch";
-export { default as MdLayersClear } from "./layers-clear";
-export { default as MdLayers } from "./layers";
-export { default as MdLeakAdd } from "./leak-add";
-export { default as MdLeakRemove } from "./leak-remove";
-export { default as MdLens } from "./lens";
-export { default as MdLibraryAdd } from "./library-add";
-export { default as MdLibraryBooks } from "./library-books";
-export { default as MdLibraryMusic } from "./library-music";
-export { default as MdLightbulbOutline } from "./lightbulb-outline";
-export { default as MdLineStyle } from "./line-style";
-export { default as MdLineWeight } from "./line-weight";
-export { default as MdLinearScale } from "./linear-scale";
-export { default as MdLink } from "./link";
-export { default as MdLinkedCamera } from "./linked-camera";
-export { default as MdList } from "./list";
-export { default as MdLiveHelp } from "./live-help";
-export { default as MdLiveTv } from "./live-tv";
-export { default as MdLocalAirport } from "./local-airport";
-export { default as MdLocalAtm } from "./local-atm";
-export { default as MdLocalAttraction } from "./local-attraction";
-export { default as MdLocalBar } from "./local-bar";
-export { default as MdLocalCafe } from "./local-cafe";
-export { default as MdLocalCarWash } from "./local-car-wash";
-export { default as MdLocalConvenienceStore } from "./local-convenience-store";
-export { default as MdLocalDrink } from "./local-drink";
-export { default as MdLocalFlorist } from "./local-florist";
-export { default as MdLocalGasStation } from "./local-gas-station";
-export { default as MdLocalGroceryStore } from "./local-grocery-store";
-export { default as MdLocalHospital } from "./local-hospital";
-export { default as MdLocalHotel } from "./local-hotel";
-export { default as MdLocalLaundryService } from "./local-laundry-service";
-export { default as MdLocalLibrary } from "./local-library";
-export { default as MdLocalMall } from "./local-mall";
-export { default as MdLocalMovies } from "./local-movies";
-export { default as MdLocalOffer } from "./local-offer";
-export { default as MdLocalParking } from "./local-parking";
-export { default as MdLocalPharmacy } from "./local-pharmacy";
-export { default as MdLocalPhone } from "./local-phone";
-export { default as MdLocalPizza } from "./local-pizza";
-export { default as MdLocalPlay } from "./local-play";
-export { default as MdLocalPostOffice } from "./local-post-office";
-export { default as MdLocalPrintShop } from "./local-print-shop";
-export { default as MdLocalRestaurant } from "./local-restaurant";
-export { default as MdLocalSee } from "./local-see";
-export { default as MdLocalShipping } from "./local-shipping";
-export { default as MdLocalTaxi } from "./local-taxi";
-export { default as MdLocationCity } from "./location-city";
-export { default as MdLocationDisabled } from "./location-disabled";
-export { default as MdLocationHistory } from "./location-history";
-export { default as MdLocationOff } from "./location-off";
-export { default as MdLocationOn } from "./location-on";
-export { default as MdLocationSearching } from "./location-searching";
-export { default as MdLockOpen } from "./lock-open";
-export { default as MdLockOutline } from "./lock-outline";
-export { default as MdLock } from "./lock";
-export { default as MdLooks3 } from "./looks-3";
-export { default as MdLooks4 } from "./looks-4";
-export { default as MdLooks5 } from "./looks-5";
-export { default as MdLooks6 } from "./looks-6";
-export { default as MdLooksOne } from "./looks-one";
-export { default as MdLooksTwo } from "./looks-two";
-export { default as MdLooks } from "./looks";
-export { default as MdLoop } from "./loop";
-export { default as MdLoupe } from "./loupe";
-export { default as MdLowPriority } from "./low-priority";
-export { default as MdLoyalty } from "./loyalty";
-export { default as MdMailOutline } from "./mail-outline";
-export { default as MdMail } from "./mail";
-export { default as MdMap } from "./map";
-export { default as MdMarkunreadMailbox } from "./markunread-mailbox";
-export { default as MdMarkunread } from "./markunread";
-export { default as MdMemory } from "./memory";
-export { default as MdMenu } from "./menu";
-export { default as MdMergeType } from "./merge-type";
-export { default as MdMessage } from "./message";
-export { default as MdMicNone } from "./mic-none";
-export { default as MdMicOff } from "./mic-off";
-export { default as MdMic } from "./mic";
-export { default as MdMms } from "./mms";
-export { default as MdModeComment } from "./mode-comment";
-export { default as MdModeEdit } from "./mode-edit";
-export { default as MdMonetizationOn } from "./monetization-on";
-export { default as MdMoneyOff } from "./money-off";
-export { default as MdMonochromePhotos } from "./monochrome-photos";
-export { default as MdMoodBad } from "./mood-bad";
-export { default as MdMood } from "./mood";
-export { default as MdMoreHoriz } from "./more-horiz";
-export { default as MdMoreVert } from "./more-vert";
-export { default as MdMore } from "./more";
-export { default as MdMotorcycle } from "./motorcycle";
-export { default as MdMouse } from "./mouse";
-export { default as MdMoveToInbox } from "./move-to-inbox";
-export { default as MdMovieCreation } from "./movie-creation";
-export { default as MdMovieFilter } from "./movie-filter";
-export { default as MdMovie } from "./movie";
-export { default as MdMultilineChart } from "./multiline-chart";
-export { default as MdMusicNote } from "./music-note";
-export { default as MdMusicVideo } from "./music-video";
-export { default as MdMyLocation } from "./my-location";
-export { default as MdNaturePeople } from "./nature-people";
-export { default as MdNature } from "./nature";
-export { default as MdNavigateBefore } from "./navigate-before";
-export { default as MdNavigateNext } from "./navigate-next";
-export { default as MdNavigation } from "./navigation";
-export { default as MdNearMe } from "./near-me";
-export { default as MdNetworkCell } from "./network-cell";
-export { default as MdNetworkCheck } from "./network-check";
-export { default as MdNetworkLocked } from "./network-locked";
-export { default as MdNetworkWifi } from "./network-wifi";
-export { default as MdNewReleases } from "./new-releases";
-export { default as MdNextWeek } from "./next-week";
-export { default as MdNfc } from "./nfc";
-export { default as MdNoEncryption } from "./no-encryption";
-export { default as MdNoSim } from "./no-sim";
-export { default as MdNotInterested } from "./not-interested";
-export { default as MdNoteAdd } from "./note-add";
-export { default as MdNote } from "./note";
-export { default as MdNotificationsActive } from "./notifications-active";
-export { default as MdNotificationsNone } from "./notifications-none";
-export { default as MdNotificationsOff } from "./notifications-off";
-export { default as MdNotificationsPaused } from "./notifications-paused";
-export { default as MdNotifications } from "./notifications";
-export { default as MdNowWallpaper } from "./now-wallpaper";
-export { default as MdNowWidgets } from "./now-widgets";
-export { default as MdOfflinePin } from "./offline-pin";
-export { default as MdOndemandVideo } from "./ondemand-video";
-export { default as MdOpacity } from "./opacity";
-export { default as MdOpenInBrowser } from "./open-in-browser";
-export { default as MdOpenInNew } from "./open-in-new";
-export { default as MdOpenWith } from "./open-with";
-export { default as MdPages } from "./pages";
-export { default as MdPageview } from "./pageview";
-export { default as MdPalette } from "./palette";
-export { default as MdPanTool } from "./pan-tool";
-export { default as MdPanoramaFishEye } from "./panorama-fish-eye";
-export { default as MdPanoramaHorizontal } from "./panorama-horizontal";
-export { default as MdPanoramaVertical } from "./panorama-vertical";
-export { default as MdPanoramaWideAngle } from "./panorama-wide-angle";
-export { default as MdPanorama } from "./panorama";
-export { default as MdPartyMode } from "./party-mode";
-export { default as MdPauseCircleFilled } from "./pause-circle-filled";
-export { default as MdPauseCircleOutline } from "./pause-circle-outline";
-export { default as MdPause } from "./pause";
-export { default as MdPayment } from "./payment";
-export { default as MdPeopleOutline } from "./people-outline";
-export { default as MdPeople } from "./people";
-export { default as MdPermCameraMic } from "./perm-camera-mic";
-export { default as MdPermContactCalendar } from "./perm-contact-calendar";
-export { default as MdPermDataSetting } from "./perm-data-setting";
-export { default as MdPermDeviceInformation } from "./perm-device-information";
-export { default as MdPermIdentity } from "./perm-identity";
-export { default as MdPermMedia } from "./perm-media";
-export { default as MdPermPhoneMsg } from "./perm-phone-msg";
-export { default as MdPermScanWifi } from "./perm-scan-wifi";
-export { default as MdPersonAdd } from "./person-add";
-export { default as MdPersonOutline } from "./person-outline";
-export { default as MdPersonPinCircle } from "./person-pin-circle";
-export { default as MdPersonPin } from "./person-pin";
-export { default as MdPerson } from "./person";
-export { default as MdPersonalVideo } from "./personal-video";
-export { default as MdPets } from "./pets";
-export { default as MdPhoneAndroid } from "./phone-android";
-export { default as MdPhoneBluetoothSpeaker } from "./phone-bluetooth-speaker";
-export { default as MdPhoneForwarded } from "./phone-forwarded";
-export { default as MdPhoneInTalk } from "./phone-in-talk";
-export { default as MdPhoneIphone } from "./phone-iphone";
-export { default as MdPhoneLocked } from "./phone-locked";
-export { default as MdPhoneMissed } from "./phone-missed";
-export { default as MdPhonePaused } from "./phone-paused";
-export { default as MdPhone } from "./phone";
-export { default as MdPhonelinkErase } from "./phonelink-erase";
-export { default as MdPhonelinkLock } from "./phonelink-lock";
-export { default as MdPhonelinkOff } from "./phonelink-off";
-export { default as MdPhonelinkRing } from "./phonelink-ring";
-export { default as MdPhonelinkSetup } from "./phonelink-setup";
-export { default as MdPhonelink } from "./phonelink";
-export { default as MdPhotoAlbum } from "./photo-album";
-export { default as MdPhotoCamera } from "./photo-camera";
-export { default as MdPhotoFilter } from "./photo-filter";
-export { default as MdPhotoLibrary } from "./photo-library";
-export { default as MdPhotoSizeSelectActual } from "./photo-size-select-actual";
-export { default as MdPhotoSizeSelectLarge } from "./photo-size-select-large";
-export { default as MdPhotoSizeSelectSmall } from "./photo-size-select-small";
-export { default as MdPhoto } from "./photo";
-export { default as MdPictureAsPdf } from "./picture-as-pdf";
-export { default as MdPictureInPictureAlt } from "./picture-in-picture-alt";
-export { default as MdPictureInPicture } from "./picture-in-picture";
-export { default as MdPieChartOutlined } from "./pie-chart-outlined";
-export { default as MdPieChart } from "./pie-chart";
-export { default as MdPinDrop } from "./pin-drop";
-export { default as MdPlace } from "./place";
-export { default as MdPlayArrow } from "./play-arrow";
-export { default as MdPlayCircleFilled } from "./play-circle-filled";
-export { default as MdPlayCircleOutline } from "./play-circle-outline";
-export { default as MdPlayForWork } from "./play-for-work";
-export { default as MdPlaylistAddCheck } from "./playlist-add-check";
-export { default as MdPlaylistAdd } from "./playlist-add";
-export { default as MdPlaylistPlay } from "./playlist-play";
-export { default as MdPlusOne } from "./plus-one";
-export { default as MdPoll } from "./poll";
-export { default as MdPolymer } from "./polymer";
-export { default as MdPool } from "./pool";
-export { default as MdPortableWifiOff } from "./portable-wifi-off";
-export { default as MdPortrait } from "./portrait";
-export { default as MdPowerInput } from "./power-input";
-export { default as MdPowerSettingsNew } from "./power-settings-new";
-export { default as MdPower } from "./power";
-export { default as MdPregnantWoman } from "./pregnant-woman";
-export { default as MdPresentToAll } from "./present-to-all";
-export { default as MdPrint } from "./print";
-export { default as MdPriorityHigh } from "./priority-high";
-export { default as MdPublic } from "./public";
-export { default as MdPublish } from "./publish";
-export { default as MdQueryBuilder } from "./query-builder";
-export { default as MdQuestionAnswer } from "./question-answer";
-export { default as MdQueueMusic } from "./queue-music";
-export { default as MdQueuePlayNext } from "./queue-play-next";
-export { default as MdQueue } from "./queue";
-export { default as MdRadioButtonChecked } from "./radio-button-checked";
-export { default as MdRadioButtonUnchecked } from "./radio-button-unchecked";
-export { default as MdRadio } from "./radio";
-export { default as MdRateReview } from "./rate-review";
-export { default as MdReceipt } from "./receipt";
-export { default as MdRecentActors } from "./recent-actors";
-export { default as MdRecordVoiceOver } from "./record-voice-over";
-export { default as MdRedeem } from "./redeem";
-export { default as MdRedo } from "./redo";
-export { default as MdRefresh } from "./refresh";
-export { default as MdRemoveCircleOutline } from "./remove-circle-outline";
-export { default as MdRemoveCircle } from "./remove-circle";
-export { default as MdRemoveFromQueue } from "./remove-from-queue";
-export { default as MdRemoveRedEye } from "./remove-red-eye";
-export { default as MdRemoveShoppingCart } from "./remove-shopping-cart";
-export { default as MdRemove } from "./remove";
-export { default as MdReorder } from "./reorder";
-export { default as MdRepeatOne } from "./repeat-one";
-export { default as MdRepeat } from "./repeat";
-export { default as MdReplay10 } from "./replay-10";
-export { default as MdReplay30 } from "./replay-30";
-export { default as MdReplay5 } from "./replay-5";
-export { default as MdReplay } from "./replay";
-export { default as MdReplyAll } from "./reply-all";
-export { default as MdReply } from "./reply";
-export { default as MdReportProblem } from "./report-problem";
-export { default as MdReport } from "./report";
-export { default as MdRestaurantMenu } from "./restaurant-menu";
-export { default as MdRestaurant } from "./restaurant";
-export { default as MdRestorePage } from "./restore-page";
-export { default as MdRestore } from "./restore";
-export { default as MdRingVolume } from "./ring-volume";
-export { default as MdRoomService } from "./room-service";
-export { default as MdRoom } from "./room";
-export { default as MdRotate90DegreesCcw } from "./rotate-90-degrees-ccw";
-export { default as MdRotateLeft } from "./rotate-left";
-export { default as MdRotateRight } from "./rotate-right";
-export { default as MdRoundedCorner } from "./rounded-corner";
-export { default as MdRouter } from "./router";
-export { default as MdRowing } from "./rowing";
-export { default as MdRssFeed } from "./rss-feed";
-export { default as MdRvHookup } from "./rv-hookup";
-export { default as MdSatellite } from "./satellite";
-export { default as MdSave } from "./save";
-export { default as MdScanner } from "./scanner";
-export { default as MdSchedule } from "./schedule";
-export { default as MdSchool } from "./school";
-export { default as MdScreenLockLandscape } from "./screen-lock-landscape";
-export { default as MdScreenLockPortrait } from "./screen-lock-portrait";
-export { default as MdScreenLockRotation } from "./screen-lock-rotation";
-export { default as MdScreenRotation } from "./screen-rotation";
-export { default as MdScreenShare } from "./screen-share";
-export { default as MdSdCard } from "./sd-card";
-export { default as MdSdStorage } from "./sd-storage";
-export { default as MdSearch } from "./search";
-export { default as MdSecurity } from "./security";
-export { default as MdSelectAll } from "./select-all";
-export { default as MdSend } from "./send";
-export { default as MdSentimentDissatisfied } from "./sentiment-dissatisfied";
-export { default as MdSentimentNeutral } from "./sentiment-neutral";
-export { default as MdSentimentSatisfied } from "./sentiment-satisfied";
-export { default as MdSentimentVeryDissatisfied } from "./sentiment-very-dissatisfied";
-export { default as MdSentimentVerySatisfied } from "./sentiment-very-satisfied";
-export { default as MdSettingsApplications } from "./settings-applications";
-export { default as MdSettingsBackupRestore } from "./settings-backup-restore";
-export { default as MdSettingsBluetooth } from "./settings-bluetooth";
-export { default as MdSettingsBrightness } from "./settings-brightness";
-export { default as MdSettingsCell } from "./settings-cell";
-export { default as MdSettingsEthernet } from "./settings-ethernet";
-export { default as MdSettingsInputAntenna } from "./settings-input-antenna";
-export { default as MdSettingsInputComponent } from "./settings-input-component";
-export { default as MdSettingsInputComposite } from "./settings-input-composite";
-export { default as MdSettingsInputHdmi } from "./settings-input-hdmi";
-export { default as MdSettingsInputSvideo } from "./settings-input-svideo";
-export { default as MdSettingsOverscan } from "./settings-overscan";
-export { default as MdSettingsPhone } from "./settings-phone";
-export { default as MdSettingsPower } from "./settings-power";
-export { default as MdSettingsRemote } from "./settings-remote";
-export { default as MdSettingsSystemDaydream } from "./settings-system-daydream";
-export { default as MdSettingsVoice } from "./settings-voice";
-export { default as MdSettings } from "./settings";
-export { default as MdShare } from "./share";
-export { default as MdShopTwo } from "./shop-two";
-export { default as MdShop } from "./shop";
-export { default as MdShoppingBasket } from "./shopping-basket";
-export { default as MdShoppingCart } from "./shopping-cart";
-export { default as MdShortText } from "./short-text";
-export { default as MdShowChart } from "./show-chart";
-export { default as MdShuffle } from "./shuffle";
-export { default as MdSignalCellular4Bar } from "./signal-cellular-4-bar";
-export { default as MdSignalCellularConnectedNoInternet4Bar } from "./signal-cellular-connected-no-internet-4-bar";
-export { default as MdSignalCellularNoSim } from "./signal-cellular-no-sim";
-export { default as MdSignalCellularNull } from "./signal-cellular-null";
-export { default as MdSignalCellularOff } from "./signal-cellular-off";
-export { default as MdSignalWifi4BarLock } from "./signal-wifi-4-bar-lock";
-export { default as MdSignalWifi4Bar } from "./signal-wifi-4-bar";
-export { default as MdSignalWifiOff } from "./signal-wifi-off";
-export { default as MdSimCardAlert } from "./sim-card-alert";
-export { default as MdSimCard } from "./sim-card";
-export { default as MdSkipNext } from "./skip-next";
-export { default as MdSkipPrevious } from "./skip-previous";
-export { default as MdSlideshow } from "./slideshow";
-export { default as MdSlowMotionVideo } from "./slow-motion-video";
-export { default as MdSmartphone } from "./smartphone";
-export { default as MdSmokeFree } from "./smoke-free";
-export { default as MdSmokingRooms } from "./smoking-rooms";
-export { default as MdSmsFailed } from "./sms-failed";
-export { default as MdSms } from "./sms";
-export { default as MdSnooze } from "./snooze";
-export { default as MdSortByAlpha } from "./sort-by-alpha";
-export { default as MdSort } from "./sort";
-export { default as MdSpa } from "./spa";
-export { default as MdSpaceBar } from "./space-bar";
-export { default as MdSpeakerGroup } from "./speaker-group";
-export { default as MdSpeakerNotesOff } from "./speaker-notes-off";
-export { default as MdSpeakerNotes } from "./speaker-notes";
-export { default as MdSpeakerPhone } from "./speaker-phone";
-export { default as MdSpeaker } from "./speaker";
-export { default as MdSpellcheck } from "./spellcheck";
-export { default as MdStarBorder } from "./star-border";
-export { default as MdStarHalf } from "./star-half";
-export { default as MdStarOutline } from "./star-outline";
-export { default as MdStar } from "./star";
-export { default as MdStars } from "./stars";
-export { default as MdStayCurrentLandscape } from "./stay-current-landscape";
-export { default as MdStayCurrentPortrait } from "./stay-current-portrait";
-export { default as MdStayPrimaryLandscape } from "./stay-primary-landscape";
-export { default as MdStayPrimaryPortrait } from "./stay-primary-portrait";
-export { default as MdStopScreenShare } from "./stop-screen-share";
-export { default as MdStop } from "./stop";
-export { default as MdStorage } from "./storage";
-export { default as MdStoreMallDirectory } from "./store-mall-directory";
-export { default as MdStore } from "./store";
-export { default as MdStraighten } from "./straighten";
-export { default as MdStreetview } from "./streetview";
-export { default as MdStrikethroughS } from "./strikethrough-s";
-export { default as MdStyle } from "./style";
-export { default as MdSubdirectoryArrowLeft } from "./subdirectory-arrow-left";
-export { default as MdSubdirectoryArrowRight } from "./subdirectory-arrow-right";
-export { default as MdSubject } from "./subject";
-export { default as MdSubscriptions } from "./subscriptions";
-export { default as MdSubtitles } from "./subtitles";
-export { default as MdSubway } from "./subway";
-export { default as MdSupervisorAccount } from "./supervisor-account";
-export { default as MdSurroundSound } from "./surround-sound";
-export { default as MdSwapCalls } from "./swap-calls";
-export { default as MdSwapHoriz } from "./swap-horiz";
-export { default as MdSwapVert } from "./swap-vert";
-export { default as MdSwapVerticalCircle } from "./swap-vertical-circle";
-export { default as MdSwitchCamera } from "./switch-camera";
-export { default as MdSwitchVideo } from "./switch-video";
-export { default as MdSyncDisabled } from "./sync-disabled";
-export { default as MdSyncProblem } from "./sync-problem";
-export { default as MdSync } from "./sync";
-export { default as MdSystemUpdateAlt } from "./system-update-alt";
-export { default as MdSystemUpdate } from "./system-update";
-export { default as MdTabUnselected } from "./tab-unselected";
-export { default as MdTab } from "./tab";
-export { default as MdTabletAndroid } from "./tablet-android";
-export { default as MdTabletMac } from "./tablet-mac";
-export { default as MdTablet } from "./tablet";
-export { default as MdTagFaces } from "./tag-faces";
-export { default as MdTapAndPlay } from "./tap-and-play";
-export { default as MdTerrain } from "./terrain";
-export { default as MdTextFields } from "./text-fields";
-export { default as MdTextFormat } from "./text-format";
-export { default as MdTextsms } from "./textsms";
-export { default as MdTexture } from "./texture";
-export { default as MdTheaters } from "./theaters";
-export { default as MdThumbDown } from "./thumb-down";
-export { default as MdThumbUp } from "./thumb-up";
-export { default as MdThumbsUpDown } from "./thumbs-up-down";
-export { default as MdTimeToLeave } from "./time-to-leave";
-export { default as MdTimelapse } from "./timelapse";
-export { default as MdTimeline } from "./timeline";
-export { default as MdTimer10 } from "./timer-10";
-export { default as MdTimer3 } from "./timer-3";
-export { default as MdTimerOff } from "./timer-off";
-export { default as MdTimer } from "./timer";
-export { default as MdTitle } from "./title";
-export { default as MdToc } from "./toc";
-export { default as MdToday } from "./today";
-export { default as MdToll } from "./toll";
-export { default as MdTonality } from "./tonality";
-export { default as MdTouchApp } from "./touch-app";
-export { default as MdToys } from "./toys";
-export { default as MdTrackChanges } from "./track-changes";
-export { default as MdTraffic } from "./traffic";
-export { default as MdTrain } from "./train";
-export { default as MdTram } from "./tram";
-export { default as MdTransferWithinAStation } from "./transfer-within-a-station";
-export { default as MdTransform } from "./transform";
-export { default as MdTranslate } from "./translate";
-export { default as MdTrendingDown } from "./trending-down";
-export { default as MdTrendingFlat } from "./trending-flat";
-export { default as MdTrendingNeutral } from "./trending-neutral";
-export { default as MdTrendingUp } from "./trending-up";
-export { default as MdTune } from "./tune";
-export { default as MdTurnedInNot } from "./turned-in-not";
-export { default as MdTurnedIn } from "./turned-in";
-export { default as MdTv } from "./tv";
-export { default as MdUnarchive } from "./unarchive";
-export { default as MdUndo } from "./undo";
-export { default as MdUnfoldLess } from "./unfold-less";
-export { default as MdUnfoldMore } from "./unfold-more";
-export { default as MdUpdate } from "./update";
-export { default as MdUsb } from "./usb";
-export { default as MdVerifiedUser } from "./verified-user";
-export { default as MdVerticalAlignBottom } from "./vertical-align-bottom";
-export { default as MdVerticalAlignCenter } from "./vertical-align-center";
-export { default as MdVerticalAlignTop } from "./vertical-align-top";
-export { default as MdVibration } from "./vibration";
-export { default as MdVideoCall } from "./video-call";
-export { default as MdVideoCollection } from "./video-collection";
-export { default as MdVideoLabel } from "./video-label";
-export { default as MdVideoLibrary } from "./video-library";
-export { default as MdVideocamOff } from "./videocam-off";
-export { default as MdVideocam } from "./videocam";
-export { default as MdVideogameAsset } from "./videogame-asset";
-export { default as MdViewAgenda } from "./view-agenda";
-export { default as MdViewArray } from "./view-array";
-export { default as MdViewCarousel } from "./view-carousel";
-export { default as MdViewColumn } from "./view-column";
-export { default as MdViewComfortable } from "./view-comfortable";
-export { default as MdViewComfy } from "./view-comfy";
-export { default as MdViewCompact } from "./view-compact";
-export { default as MdViewDay } from "./view-day";
-export { default as MdViewHeadline } from "./view-headline";
-export { default as MdViewList } from "./view-list";
-export { default as MdViewModule } from "./view-module";
-export { default as MdViewQuilt } from "./view-quilt";
-export { default as MdViewStream } from "./view-stream";
-export { default as MdViewWeek } from "./view-week";
-export { default as MdVignette } from "./vignette";
-export { default as MdVisibilityOff } from "./visibility-off";
-export { default as MdVisibility } from "./visibility";
-export { default as MdVoiceChat } from "./voice-chat";
-export { default as MdVoicemail } from "./voicemail";
-export { default as MdVolumeDown } from "./volume-down";
-export { default as MdVolumeMute } from "./volume-mute";
-export { default as MdVolumeOff } from "./volume-off";
-export { default as MdVolumeUp } from "./volume-up";
-export { default as MdVpnKey } from "./vpn-key";
-export { default as MdVpnLock } from "./vpn-lock";
-export { default as MdWallpaper } from "./wallpaper";
-export { default as MdWarning } from "./warning";
-export { default as MdWatchLater } from "./watch-later";
-export { default as MdWatch } from "./watch";
-export { default as MdWbAuto } from "./wb-auto";
-export { default as MdWbCloudy } from "./wb-cloudy";
-export { default as MdWbIncandescent } from "./wb-incandescent";
-export { default as MdWbIridescent } from "./wb-iridescent";
-export { default as MdWbSunny } from "./wb-sunny";
-export { default as MdWc } from "./wc";
-export { default as MdWebAsset } from "./web-asset";
-export { default as MdWeb } from "./web";
-export { default as MdWeekend } from "./weekend";
-export { default as MdWhatshot } from "./whatshot";
-export { default as MdWidgets } from "./widgets";
-export { default as MdWifiLock } from "./wifi-lock";
-export { default as MdWifiTethering } from "./wifi-tethering";
-export { default as MdWifi } from "./wifi";
-export { default as MdWork } from "./work";
-export { default as MdWrapText } from "./wrap-text";
-export { default as MdYoutubeSearchedFor } from "./youtube-searched-for";
-export { default as MdZoomIn } from "./zoom-in";
-export { default as MdZoomOutMap } from "./zoom-out-map";
-export { default as MdZoomOut } from "./zoom-out";
+export { default as Md3dRotation } from "../../md/3d-rotation";
+export { default as MdAcUnit } from "../../md/ac-unit";
+export { default as MdAccessAlarm } from "../../md/access-alarm";
+export { default as MdAccessAlarms } from "../../md/access-alarms";
+export { default as MdAccessTime } from "../../md/access-time";
+export { default as MdAccessibility } from "../../md/accessibility";
+export { default as MdAccessible } from "../../md/accessible";
+export { default as MdAccountBalanceWallet } from "../../md/account-balance-wallet";
+export { default as MdAccountBalance } from "../../md/account-balance";
+export { default as MdAccountBox } from "../../md/account-box";
+export { default as MdAccountCircle } from "../../md/account-circle";
+export { default as MdAdb } from "../../md/adb";
+export { default as MdAddAPhoto } from "../../md/add-a-photo";
+export { default as MdAddAlarm } from "../../md/add-alarm";
+export { default as MdAddAlert } from "../../md/add-alert";
+export { default as MdAddBox } from "../../md/add-box";
+export { default as MdAddCircleOutline } from "../../md/add-circle-outline";
+export { default as MdAddCircle } from "../../md/add-circle";
+export { default as MdAddLocation } from "../../md/add-location";
+export { default as MdAddShoppingCart } from "../../md/add-shopping-cart";
+export { default as MdAddToPhotos } from "../../md/add-to-photos";
+export { default as MdAddToQueue } from "../../md/add-to-queue";
+export { default as MdAdd } from "../../md/add";
+export { default as MdAdjust } from "../../md/adjust";
+export { default as MdAirlineSeatFlatAngled } from "../../md/airline-seat-flat-angled";
+export { default as MdAirlineSeatFlat } from "../../md/airline-seat-flat";
+export { default as MdAirlineSeatIndividualSuite } from "../../md/airline-seat-individual-suite";
+export { default as MdAirlineSeatLegroomExtra } from "../../md/airline-seat-legroom-extra";
+export { default as MdAirlineSeatLegroomNormal } from "../../md/airline-seat-legroom-normal";
+export { default as MdAirlineSeatLegroomReduced } from "../../md/airline-seat-legroom-reduced";
+export { default as MdAirlineSeatReclineExtra } from "../../md/airline-seat-recline-extra";
+export { default as MdAirlineSeatReclineNormal } from "../../md/airline-seat-recline-normal";
+export { default as MdAirplanemodeActive } from "../../md/airplanemode-active";
+export { default as MdAirplanemodeInactive } from "../../md/airplanemode-inactive";
+export { default as MdAirplay } from "../../md/airplay";
+export { default as MdAirportShuttle } from "../../md/airport-shuttle";
+export { default as MdAlarmAdd } from "../../md/alarm-add";
+export { default as MdAlarmOff } from "../../md/alarm-off";
+export { default as MdAlarmOn } from "../../md/alarm-on";
+export { default as MdAlarm } from "../../md/alarm";
+export { default as MdAlbum } from "../../md/album";
+export { default as MdAllInclusive } from "../../md/all-inclusive";
+export { default as MdAllOut } from "../../md/all-out";
+export { default as MdAndroid } from "../../md/android";
+export { default as MdAnnouncement } from "../../md/announcement";
+export { default as MdApps } from "../../md/apps";
+export { default as MdArchive } from "../../md/archive";
+export { default as MdArrowBack } from "../../md/arrow-back";
+export { default as MdArrowDownward } from "../../md/arrow-downward";
+export { default as MdArrowDropDownCircle } from "../../md/arrow-drop-down-circle";
+export { default as MdArrowDropDown } from "../../md/arrow-drop-down";
+export { default as MdArrowDropUp } from "../../md/arrow-drop-up";
+export { default as MdArrowForward } from "../../md/arrow-forward";
+export { default as MdArrowUpward } from "../../md/arrow-upward";
+export { default as MdArtTrack } from "../../md/art-track";
+export { default as MdAspectRatio } from "../../md/aspect-ratio";
+export { default as MdAssessment } from "../../md/assessment";
+export { default as MdAssignmentInd } from "../../md/assignment-ind";
+export { default as MdAssignmentLate } from "../../md/assignment-late";
+export { default as MdAssignmentReturn } from "../../md/assignment-return";
+export { default as MdAssignmentReturned } from "../../md/assignment-returned";
+export { default as MdAssignmentTurnedIn } from "../../md/assignment-turned-in";
+export { default as MdAssignment } from "../../md/assignment";
+export { default as MdAssistantPhoto } from "../../md/assistant-photo";
+export { default as MdAssistant } from "../../md/assistant";
+export { default as MdAttachFile } from "../../md/attach-file";
+export { default as MdAttachMoney } from "../../md/attach-money";
+export { default as MdAttachment } from "../../md/attachment";
+export { default as MdAudiotrack } from "../../md/audiotrack";
+export { default as MdAutorenew } from "../../md/autorenew";
+export { default as MdAvTimer } from "../../md/av-timer";
+export { default as MdBackspace } from "../../md/backspace";
+export { default as MdBackup } from "../../md/backup";
+export { default as MdBatteryAlert } from "../../md/battery-alert";
+export { default as MdBatteryChargingFull } from "../../md/battery-charging-full";
+export { default as MdBatteryFull } from "../../md/battery-full";
+export { default as MdBatteryStd } from "../../md/battery-std";
+export { default as MdBatteryUnknown } from "../../md/battery-unknown";
+export { default as MdBeachAccess } from "../../md/beach-access";
+export { default as MdBeenhere } from "../../md/beenhere";
+export { default as MdBlock } from "../../md/block";
+export { default as MdBluetoothAudio } from "../../md/bluetooth-audio";
+export { default as MdBluetoothConnected } from "../../md/bluetooth-connected";
+export { default as MdBluetoothDisabled } from "../../md/bluetooth-disabled";
+export { default as MdBluetoothSearching } from "../../md/bluetooth-searching";
+export { default as MdBluetooth } from "../../md/bluetooth";
+export { default as MdBlurCircular } from "../../md/blur-circular";
+export { default as MdBlurLinear } from "../../md/blur-linear";
+export { default as MdBlurOff } from "../../md/blur-off";
+export { default as MdBlurOn } from "../../md/blur-on";
+export { default as MdBook } from "../../md/book";
+export { default as MdBookmarkOutline } from "../../md/bookmark-outline";
+export { default as MdBookmark } from "../../md/bookmark";
+export { default as MdBorderAll } from "../../md/border-all";
+export { default as MdBorderBottom } from "../../md/border-bottom";
+export { default as MdBorderClear } from "../../md/border-clear";
+export { default as MdBorderColor } from "../../md/border-color";
+export { default as MdBorderHorizontal } from "../../md/border-horizontal";
+export { default as MdBorderInner } from "../../md/border-inner";
+export { default as MdBorderLeft } from "../../md/border-left";
+export { default as MdBorderOuter } from "../../md/border-outer";
+export { default as MdBorderRight } from "../../md/border-right";
+export { default as MdBorderStyle } from "../../md/border-style";
+export { default as MdBorderTop } from "../../md/border-top";
+export { default as MdBorderVertical } from "../../md/border-vertical";
+export { default as MdBrandingWatermark } from "../../md/branding-watermark";
+export { default as MdBrightness1 } from "../../md/brightness-1";
+export { default as MdBrightness2 } from "../../md/brightness-2";
+export { default as MdBrightness3 } from "../../md/brightness-3";
+export { default as MdBrightness4 } from "../../md/brightness-4";
+export { default as MdBrightness5 } from "../../md/brightness-5";
+export { default as MdBrightness6 } from "../../md/brightness-6";
+export { default as MdBrightness7 } from "../../md/brightness-7";
+export { default as MdBrightnessAuto } from "../../md/brightness-auto";
+export { default as MdBrightnessHigh } from "../../md/brightness-high";
+export { default as MdBrightnessLow } from "../../md/brightness-low";
+export { default as MdBrightnessMedium } from "../../md/brightness-medium";
+export { default as MdBrokenImage } from "../../md/broken-image";
+export { default as MdBrush } from "../../md/brush";
+export { default as MdBubbleChart } from "../../md/bubble-chart";
+export { default as MdBugReport } from "../../md/bug-report";
+export { default as MdBuild } from "../../md/build";
+export { default as MdBurstMode } from "../../md/burst-mode";
+export { default as MdBusinessCenter } from "../../md/business-center";
+export { default as MdBusiness } from "../../md/business";
+export { default as MdCached } from "../../md/cached";
+export { default as MdCake } from "../../md/cake";
+export { default as MdCallEnd } from "../../md/call-end";
+export { default as MdCallMade } from "../../md/call-made";
+export { default as MdCallMerge } from "../../md/call-merge";
+export { default as MdCallMissedOutgoing } from "../../md/call-missed-outgoing";
+export { default as MdCallMissed } from "../../md/call-missed";
+export { default as MdCallReceived } from "../../md/call-received";
+export { default as MdCallSplit } from "../../md/call-split";
+export { default as MdCallToAction } from "../../md/call-to-action";
+export { default as MdCall } from "../../md/call";
+export { default as MdCameraAlt } from "../../md/camera-alt";
+export { default as MdCameraEnhance } from "../../md/camera-enhance";
+export { default as MdCameraFront } from "../../md/camera-front";
+export { default as MdCameraRear } from "../../md/camera-rear";
+export { default as MdCameraRoll } from "../../md/camera-roll";
+export { default as MdCamera } from "../../md/camera";
+export { default as MdCancel } from "../../md/cancel";
+export { default as MdCardGiftcard } from "../../md/card-giftcard";
+export { default as MdCardMembership } from "../../md/card-membership";
+export { default as MdCardTravel } from "../../md/card-travel";
+export { default as MdCasino } from "../../md/casino";
+export { default as MdCastConnected } from "../../md/cast-connected";
+export { default as MdCast } from "../../md/cast";
+export { default as MdCenterFocusStrong } from "../../md/center-focus-strong";
+export { default as MdCenterFocusWeak } from "../../md/center-focus-weak";
+export { default as MdChangeHistory } from "../../md/change-history";
+export { default as MdChatBubbleOutline } from "../../md/chat-bubble-outline";
+export { default as MdChatBubble } from "../../md/chat-bubble";
+export { default as MdChat } from "../../md/chat";
+export { default as MdCheckBoxOutlineBlank } from "../../md/check-box-outline-blank";
+export { default as MdCheckBox } from "../../md/check-box";
+export { default as MdCheckCircle } from "../../md/check-circle";
+export { default as MdCheck } from "../../md/check";
+export { default as MdChevronLeft } from "../../md/chevron-left";
+export { default as MdChevronRight } from "../../md/chevron-right";
+export { default as MdChildCare } from "../../md/child-care";
+export { default as MdChildFriendly } from "../../md/child-friendly";
+export { default as MdChromeReaderMode } from "../../md/chrome-reader-mode";
+export { default as MdClass } from "../../md/class";
+export { default as MdClearAll } from "../../md/clear-all";
+export { default as MdClear } from "../../md/clear";
+export { default as MdClose } from "../../md/close";
+export { default as MdClosedCaption } from "../../md/closed-caption";
+export { default as MdCloudCircle } from "../../md/cloud-circle";
+export { default as MdCloudDone } from "../../md/cloud-done";
+export { default as MdCloudDownload } from "../../md/cloud-download";
+export { default as MdCloudOff } from "../../md/cloud-off";
+export { default as MdCloudQueue } from "../../md/cloud-queue";
+export { default as MdCloudUpload } from "../../md/cloud-upload";
+export { default as MdCloud } from "../../md/cloud";
+export { default as MdCode } from "../../md/code";
+export { default as MdCollectionsBookmark } from "../../md/collections-bookmark";
+export { default as MdCollections } from "../../md/collections";
+export { default as MdColorLens } from "../../md/color-lens";
+export { default as MdColorize } from "../../md/colorize";
+export { default as MdComment } from "../../md/comment";
+export { default as MdCompareArrows } from "../../md/compare-arrows";
+export { default as MdCompare } from "../../md/compare";
+export { default as MdComputer } from "../../md/computer";
+export { default as MdConfirmationNumber } from "../../md/confirmation-number";
+export { default as MdContactMail } from "../../md/contact-mail";
+export { default as MdContactPhone } from "../../md/contact-phone";
+export { default as MdContacts } from "../../md/contacts";
+export { default as MdContentCopy } from "../../md/content-copy";
+export { default as MdContentCut } from "../../md/content-cut";
+export { default as MdContentPaste } from "../../md/content-paste";
+export { default as MdControlPointDuplicate } from "../../md/control-point-duplicate";
+export { default as MdControlPoint } from "../../md/control-point";
+export { default as MdCopyright } from "../../md/copyright";
+export { default as MdCreateNewFolder } from "../../md/create-new-folder";
+export { default as MdCreate } from "../../md/create";
+export { default as MdCreditCard } from "../../md/credit-card";
+export { default as MdCrop169 } from "../../md/crop-16-9";
+export { default as MdCrop32 } from "../../md/crop-3-2";
+export { default as MdCrop54 } from "../../md/crop-5-4";
+export { default as MdCrop75 } from "../../md/crop-7-5";
+export { default as MdCropDin } from "../../md/crop-din";
+export { default as MdCropFree } from "../../md/crop-free";
+export { default as MdCropLandscape } from "../../md/crop-landscape";
+export { default as MdCropOriginal } from "../../md/crop-original";
+export { default as MdCropPortrait } from "../../md/crop-portrait";
+export { default as MdCropRotate } from "../../md/crop-rotate";
+export { default as MdCropSquare } from "../../md/crop-square";
+export { default as MdCrop } from "../../md/crop";
+export { default as MdDashboard } from "../../md/dashboard";
+export { default as MdDataUsage } from "../../md/data-usage";
+export { default as MdDateRange } from "../../md/date-range";
+export { default as MdDehaze } from "../../md/dehaze";
+export { default as MdDeleteForever } from "../../md/delete-forever";
+export { default as MdDeleteSweep } from "../../md/delete-sweep";
+export { default as MdDelete } from "../../md/delete";
+export { default as MdDescription } from "../../md/description";
+export { default as MdDesktopMac } from "../../md/desktop-mac";
+export { default as MdDesktopWindows } from "../../md/desktop-windows";
+export { default as MdDetails } from "../../md/details";
+export { default as MdDeveloperBoard } from "../../md/developer-board";
+export { default as MdDeveloperMode } from "../../md/developer-mode";
+export { default as MdDeviceHub } from "../../md/device-hub";
+export { default as MdDevicesOther } from "../../md/devices-other";
+export { default as MdDevices } from "../../md/devices";
+export { default as MdDialerSip } from "../../md/dialer-sip";
+export { default as MdDialpad } from "../../md/dialpad";
+export { default as MdDirectionsBike } from "../../md/directions-bike";
+export { default as MdDirectionsBoat } from "../../md/directions-boat";
+export { default as MdDirectionsBus } from "../../md/directions-bus";
+export { default as MdDirectionsCar } from "../../md/directions-car";
+export { default as MdDirectionsFerry } from "../../md/directions-ferry";
+export { default as MdDirectionsRailway } from "../../md/directions-railway";
+export { default as MdDirectionsRun } from "../../md/directions-run";
+export { default as MdDirectionsSubway } from "../../md/directions-subway";
+export { default as MdDirectionsTransit } from "../../md/directions-transit";
+export { default as MdDirectionsWalk } from "../../md/directions-walk";
+export { default as MdDirections } from "../../md/directions";
+export { default as MdDiscFull } from "../../md/disc-full";
+export { default as MdDns } from "../../md/dns";
+export { default as MdDoNotDisturbAlt } from "../../md/do-not-disturb-alt";
+export { default as MdDoNotDisturbOff } from "../../md/do-not-disturb-off";
+export { default as MdDoNotDisturb } from "../../md/do-not-disturb";
+export { default as MdDock } from "../../md/dock";
+export { default as MdDomain } from "../../md/domain";
+export { default as MdDoneAll } from "../../md/done-all";
+export { default as MdDone } from "../../md/done";
+export { default as MdDonutLarge } from "../../md/donut-large";
+export { default as MdDonutSmall } from "../../md/donut-small";
+export { default as MdDrafts } from "../../md/drafts";
+export { default as MdDragHandle } from "../../md/drag-handle";
+export { default as MdDriveEta } from "../../md/drive-eta";
+export { default as MdDvr } from "../../md/dvr";
+export { default as MdEditLocation } from "../../md/edit-location";
+export { default as MdEdit } from "../../md/edit";
+export { default as MdEject } from "../../md/eject";
+export { default as MdEmail } from "../../md/email";
+export { default as MdEnhancedEncryption } from "../../md/enhanced-encryption";
+export { default as MdEqualizer } from "../../md/equalizer";
+export { default as MdErrorOutline } from "../../md/error-outline";
+export { default as MdError } from "../../md/error";
+export { default as MdEuroSymbol } from "../../md/euro-symbol";
+export { default as MdEvStation } from "../../md/ev-station";
+export { default as MdEventAvailable } from "../../md/event-available";
+export { default as MdEventBusy } from "../../md/event-busy";
+export { default as MdEventNote } from "../../md/event-note";
+export { default as MdEventSeat } from "../../md/event-seat";
+export { default as MdEvent } from "../../md/event";
+export { default as MdExitToApp } from "../../md/exit-to-app";
+export { default as MdExpandLess } from "../../md/expand-less";
+export { default as MdExpandMore } from "../../md/expand-more";
+export { default as MdExplicit } from "../../md/explicit";
+export { default as MdExplore } from "../../md/explore";
+export { default as MdExposureMinus1 } from "../../md/exposure-minus-1";
+export { default as MdExposureMinus2 } from "../../md/exposure-minus-2";
+export { default as MdExposureNeg1 } from "../../md/exposure-neg-1";
+export { default as MdExposureNeg2 } from "../../md/exposure-neg-2";
+export { default as MdExposurePlus1 } from "../../md/exposure-plus-1";
+export { default as MdExposurePlus2 } from "../../md/exposure-plus-2";
+export { default as MdExposureZero } from "../../md/exposure-zero";
+export { default as MdExposure } from "../../md/exposure";
+export { default as MdExtension } from "../../md/extension";
+export { default as MdFace } from "../../md/face";
+export { default as MdFastForward } from "../../md/fast-forward";
+export { default as MdFastRewind } from "../../md/fast-rewind";
+export { default as MdFavoriteBorder } from "../../md/favorite-border";
+export { default as MdFavoriteOutline } from "../../md/favorite-outline";
+export { default as MdFavorite } from "../../md/favorite";
+export { default as MdFeaturedPlayList } from "../../md/featured-play-list";
+export { default as MdFeaturedVideo } from "../../md/featured-video";
+export { default as MdFeedback } from "../../md/feedback";
+export { default as MdFiberDvr } from "../../md/fiber-dvr";
+export { default as MdFiberManualRecord } from "../../md/fiber-manual-record";
+export { default as MdFiberNew } from "../../md/fiber-new";
+export { default as MdFiberPin } from "../../md/fiber-pin";
+export { default as MdFiberSmartRecord } from "../../md/fiber-smart-record";
+export { default as MdFileDownload } from "../../md/file-download";
+export { default as MdFileUpload } from "../../md/file-upload";
+export { default as MdFilter1 } from "../../md/filter-1";
+export { default as MdFilter2 } from "../../md/filter-2";
+export { default as MdFilter3 } from "../../md/filter-3";
+export { default as MdFilter4 } from "../../md/filter-4";
+export { default as MdFilter5 } from "../../md/filter-5";
+export { default as MdFilter6 } from "../../md/filter-6";
+export { default as MdFilter7 } from "../../md/filter-7";
+export { default as MdFilter8 } from "../../md/filter-8";
+export { default as MdFilter9Plus } from "../../md/filter-9-plus";
+export { default as MdFilter9 } from "../../md/filter-9";
+export { default as MdFilterBAndW } from "../../md/filter-b-and-w";
+export { default as MdFilterCenterFocus } from "../../md/filter-center-focus";
+export { default as MdFilterDrama } from "../../md/filter-drama";
+export { default as MdFilterFrames } from "../../md/filter-frames";
+export { default as MdFilterHdr } from "../../md/filter-hdr";
+export { default as MdFilterList } from "../../md/filter-list";
+export { default as MdFilterNone } from "../../md/filter-none";
+export { default as MdFilterTiltShift } from "../../md/filter-tilt-shift";
+export { default as MdFilterVintage } from "../../md/filter-vintage";
+export { default as MdFilter } from "../../md/filter";
+export { default as MdFindInPage } from "../../md/find-in-page";
+export { default as MdFindReplace } from "../../md/find-replace";
+export { default as MdFingerprint } from "../../md/fingerprint";
+export { default as MdFirstPage } from "../../md/first-page";
+export { default as MdFitnessCenter } from "../../md/fitness-center";
+export { default as MdFlag } from "../../md/flag";
+export { default as MdFlare } from "../../md/flare";
+export { default as MdFlashAuto } from "../../md/flash-auto";
+export { default as MdFlashOff } from "../../md/flash-off";
+export { default as MdFlashOn } from "../../md/flash-on";
+export { default as MdFlightLand } from "../../md/flight-land";
+export { default as MdFlightTakeoff } from "../../md/flight-takeoff";
+export { default as MdFlight } from "../../md/flight";
+export { default as MdFlipToBack } from "../../md/flip-to-back";
+export { default as MdFlipToFront } from "../../md/flip-to-front";
+export { default as MdFlip } from "../../md/flip";
+export { default as MdFolderOpen } from "../../md/folder-open";
+export { default as MdFolderShared } from "../../md/folder-shared";
+export { default as MdFolderSpecial } from "../../md/folder-special";
+export { default as MdFolder } from "../../md/folder";
+export { default as MdFontDownload } from "../../md/font-download";
+export { default as MdFormatAlignCenter } from "../../md/format-align-center";
+export { default as MdFormatAlignJustify } from "../../md/format-align-justify";
+export { default as MdFormatAlignLeft } from "../../md/format-align-left";
+export { default as MdFormatAlignRight } from "../../md/format-align-right";
+export { default as MdFormatBold } from "../../md/format-bold";
+export { default as MdFormatClear } from "../../md/format-clear";
+export { default as MdFormatColorFill } from "../../md/format-color-fill";
+export { default as MdFormatColorReset } from "../../md/format-color-reset";
+export { default as MdFormatColorText } from "../../md/format-color-text";
+export { default as MdFormatIndentDecrease } from "../../md/format-indent-decrease";
+export { default as MdFormatIndentIncrease } from "../../md/format-indent-increase";
+export { default as MdFormatItalic } from "../../md/format-italic";
+export { default as MdFormatLineSpacing } from "../../md/format-line-spacing";
+export { default as MdFormatListBulleted } from "../../md/format-list-bulleted";
+export { default as MdFormatListNumbered } from "../../md/format-list-numbered";
+export { default as MdFormatPaint } from "../../md/format-paint";
+export { default as MdFormatQuote } from "../../md/format-quote";
+export { default as MdFormatShapes } from "../../md/format-shapes";
+export { default as MdFormatSize } from "../../md/format-size";
+export { default as MdFormatStrikethrough } from "../../md/format-strikethrough";
+export { default as MdFormatTextdirectionLToR } from "../../md/format-textdirection-l-to-r";
+export { default as MdFormatTextdirectionRToL } from "../../md/format-textdirection-r-to-l";
+export { default as MdFormatUnderlined } from "../../md/format-underlined";
+export { default as MdForum } from "../../md/forum";
+export { default as MdForward10 } from "../../md/forward-10";
+export { default as MdForward30 } from "../../md/forward-30";
+export { default as MdForward5 } from "../../md/forward-5";
+export { default as MdForward } from "../../md/forward";
+export { default as MdFreeBreakfast } from "../../md/free-breakfast";
+export { default as MdFullscreenExit } from "../../md/fullscreen-exit";
+export { default as MdFullscreen } from "../../md/fullscreen";
+export { default as MdFunctions } from "../../md/functions";
+export { default as MdGTranslate } from "../../md/g-translate";
+export { default as MdGamepad } from "../../md/gamepad";
+export { default as MdGames } from "../../md/games";
+export { default as MdGavel } from "../../md/gavel";
+export { default as MdGesture } from "../../md/gesture";
+export { default as MdGetApp } from "../../md/get-app";
+export { default as MdGif } from "../../md/gif";
+export { default as MdGoat } from "../../md/goat";
+export { default as MdGolfCourse } from "../../md/golf-course";
+export { default as MdGpsFixed } from "../../md/gps-fixed";
+export { default as MdGpsNotFixed } from "../../md/gps-not-fixed";
+export { default as MdGpsOff } from "../../md/gps-off";
+export { default as MdGrade } from "../../md/grade";
+export { default as MdGradient } from "../../md/gradient";
+export { default as MdGrain } from "../../md/grain";
+export { default as MdGraphicEq } from "../../md/graphic-eq";
+export { default as MdGridOff } from "../../md/grid-off";
+export { default as MdGridOn } from "../../md/grid-on";
+export { default as MdGroupAdd } from "../../md/group-add";
+export { default as MdGroupWork } from "../../md/group-work";
+export { default as MdGroup } from "../../md/group";
+export { default as MdHd } from "../../md/hd";
+export { default as MdHdrOff } from "../../md/hdr-off";
+export { default as MdHdrOn } from "../../md/hdr-on";
+export { default as MdHdrStrong } from "../../md/hdr-strong";
+export { default as MdHdrWeak } from "../../md/hdr-weak";
+export { default as MdHeadsetMic } from "../../md/headset-mic";
+export { default as MdHeadset } from "../../md/headset";
+export { default as MdHealing } from "../../md/healing";
+export { default as MdHearing } from "../../md/hearing";
+export { default as MdHelpOutline } from "../../md/help-outline";
+export { default as MdHelp } from "../../md/help";
+export { default as MdHighQuality } from "../../md/high-quality";
+export { default as MdHighlightOff } from "../../md/highlight-off";
+export { default as MdHighlightRemove } from "../../md/highlight-remove";
+export { default as MdHighlight } from "../../md/highlight";
+export { default as MdHistory } from "../../md/history";
+export { default as MdHome } from "../../md/home";
+export { default as MdHotTub } from "../../md/hot-tub";
+export { default as MdHotel } from "../../md/hotel";
+export { default as MdHourglassEmpty } from "../../md/hourglass-empty";
+export { default as MdHourglassFull } from "../../md/hourglass-full";
+export { default as MdHttp } from "../../md/http";
+export { default as MdHttps } from "../../md/https";
+export { default as MdImageAspectRatio } from "../../md/image-aspect-ratio";
+export { default as MdImage } from "../../md/image";
+export { default as MdImportContacts } from "../../md/import-contacts";
+export { default as MdImportExport } from "../../md/import-export";
+export { default as MdImportantDevices } from "../../md/important-devices";
+export { default as MdInbox } from "../../md/inbox";
+export { default as MdIndeterminateCheckBox } from "../../md/indeterminate-check-box";
+export { default as MdInfoOutline } from "../../md/info-outline";
+export { default as MdInfo } from "../../md/info";
+export { default as MdInput } from "../../md/input";
+export { default as MdInsertChart } from "../../md/insert-chart";
+export { default as MdInsertComment } from "../../md/insert-comment";
+export { default as MdInsertDriveFile } from "../../md/insert-drive-file";
+export { default as MdInsertEmoticon } from "../../md/insert-emoticon";
+export { default as MdInsertInvitation } from "../../md/insert-invitation";
+export { default as MdInsertLink } from "../../md/insert-link";
+export { default as MdInsertPhoto } from "../../md/insert-photo";
+export { default as MdInvertColorsOff } from "../../md/invert-colors-off";
+export { default as MdInvertColorsOn } from "../../md/invert-colors-on";
+export { default as MdInvertColors } from "../../md/invert-colors";
+export { default as MdIso } from "../../md/iso";
+export { default as MdKeyboardArrowDown } from "../../md/keyboard-arrow-down";
+export { default as MdKeyboardArrowLeft } from "../../md/keyboard-arrow-left";
+export { default as MdKeyboardArrowRight } from "../../md/keyboard-arrow-right";
+export { default as MdKeyboardArrowUp } from "../../md/keyboard-arrow-up";
+export { default as MdKeyboardBackspace } from "../../md/keyboard-backspace";
+export { default as MdKeyboardCapslock } from "../../md/keyboard-capslock";
+export { default as MdKeyboardControl } from "../../md/keyboard-control";
+export { default as MdKeyboardHide } from "../../md/keyboard-hide";
+export { default as MdKeyboardReturn } from "../../md/keyboard-return";
+export { default as MdKeyboardTab } from "../../md/keyboard-tab";
+export { default as MdKeyboardVoice } from "../../md/keyboard-voice";
+export { default as MdKeyboard } from "../../md/keyboard";
+export { default as MdKitchen } from "../../md/kitchen";
+export { default as MdLabelOutline } from "../../md/label-outline";
+export { default as MdLabel } from "../../md/label";
+export { default as MdLandscape } from "../../md/landscape";
+export { default as MdLanguage } from "../../md/language";
+export { default as MdLaptopChromebook } from "../../md/laptop-chromebook";
+export { default as MdLaptopMac } from "../../md/laptop-mac";
+export { default as MdLaptopWindows } from "../../md/laptop-windows";
+export { default as MdLaptop } from "../../md/laptop";
+export { default as MdLastPage } from "../../md/last-page";
+export { default as MdLaunch } from "../../md/launch";
+export { default as MdLayersClear } from "../../md/layers-clear";
+export { default as MdLayers } from "../../md/layers";
+export { default as MdLeakAdd } from "../../md/leak-add";
+export { default as MdLeakRemove } from "../../md/leak-remove";
+export { default as MdLens } from "../../md/lens";
+export { default as MdLibraryAdd } from "../../md/library-add";
+export { default as MdLibraryBooks } from "../../md/library-books";
+export { default as MdLibraryMusic } from "../../md/library-music";
+export { default as MdLightbulbOutline } from "../../md/lightbulb-outline";
+export { default as MdLineStyle } from "../../md/line-style";
+export { default as MdLineWeight } from "../../md/line-weight";
+export { default as MdLinearScale } from "../../md/linear-scale";
+export { default as MdLink } from "../../md/link";
+export { default as MdLinkedCamera } from "../../md/linked-camera";
+export { default as MdList } from "../../md/list";
+export { default as MdLiveHelp } from "../../md/live-help";
+export { default as MdLiveTv } from "../../md/live-tv";
+export { default as MdLocalAirport } from "../../md/local-airport";
+export { default as MdLocalAtm } from "../../md/local-atm";
+export { default as MdLocalAttraction } from "../../md/local-attraction";
+export { default as MdLocalBar } from "../../md/local-bar";
+export { default as MdLocalCafe } from "../../md/local-cafe";
+export { default as MdLocalCarWash } from "../../md/local-car-wash";
+export { default as MdLocalConvenienceStore } from "../../md/local-convenience-store";
+export { default as MdLocalDrink } from "../../md/local-drink";
+export { default as MdLocalFlorist } from "../../md/local-florist";
+export { default as MdLocalGasStation } from "../../md/local-gas-station";
+export { default as MdLocalGroceryStore } from "../../md/local-grocery-store";
+export { default as MdLocalHospital } from "../../md/local-hospital";
+export { default as MdLocalHotel } from "../../md/local-hotel";
+export { default as MdLocalLaundryService } from "../../md/local-laundry-service";
+export { default as MdLocalLibrary } from "../../md/local-library";
+export { default as MdLocalMall } from "../../md/local-mall";
+export { default as MdLocalMovies } from "../../md/local-movies";
+export { default as MdLocalOffer } from "../../md/local-offer";
+export { default as MdLocalParking } from "../../md/local-parking";
+export { default as MdLocalPharmacy } from "../../md/local-pharmacy";
+export { default as MdLocalPhone } from "../../md/local-phone";
+export { default as MdLocalPizza } from "../../md/local-pizza";
+export { default as MdLocalPlay } from "../../md/local-play";
+export { default as MdLocalPostOffice } from "../../md/local-post-office";
+export { default as MdLocalPrintShop } from "../../md/local-print-shop";
+export { default as MdLocalRestaurant } from "../../md/local-restaurant";
+export { default as MdLocalSee } from "../../md/local-see";
+export { default as MdLocalShipping } from "../../md/local-shipping";
+export { default as MdLocalTaxi } from "../../md/local-taxi";
+export { default as MdLocationCity } from "../../md/location-city";
+export { default as MdLocationDisabled } from "../../md/location-disabled";
+export { default as MdLocationHistory } from "../../md/location-history";
+export { default as MdLocationOff } from "../../md/location-off";
+export { default as MdLocationOn } from "../../md/location-on";
+export { default as MdLocationSearching } from "../../md/location-searching";
+export { default as MdLockOpen } from "../../md/lock-open";
+export { default as MdLockOutline } from "../../md/lock-outline";
+export { default as MdLock } from "../../md/lock";
+export { default as MdLooks3 } from "../../md/looks-3";
+export { default as MdLooks4 } from "../../md/looks-4";
+export { default as MdLooks5 } from "../../md/looks-5";
+export { default as MdLooks6 } from "../../md/looks-6";
+export { default as MdLooksOne } from "../../md/looks-one";
+export { default as MdLooksTwo } from "../../md/looks-two";
+export { default as MdLooks } from "../../md/looks";
+export { default as MdLoop } from "../../md/loop";
+export { default as MdLoupe } from "../../md/loupe";
+export { default as MdLowPriority } from "../../md/low-priority";
+export { default as MdLoyalty } from "../../md/loyalty";
+export { default as MdMailOutline } from "../../md/mail-outline";
+export { default as MdMail } from "../../md/mail";
+export { default as MdMap } from "../../md/map";
+export { default as MdMarkunreadMailbox } from "../../md/markunread-mailbox";
+export { default as MdMarkunread } from "../../md/markunread";
+export { default as MdMemory } from "../../md/memory";
+export { default as MdMenu } from "../../md/menu";
+export { default as MdMergeType } from "../../md/merge-type";
+export { default as MdMessage } from "../../md/message";
+export { default as MdMicNone } from "../../md/mic-none";
+export { default as MdMicOff } from "../../md/mic-off";
+export { default as MdMic } from "../../md/mic";
+export { default as MdMms } from "../../md/mms";
+export { default as MdModeComment } from "../../md/mode-comment";
+export { default as MdModeEdit } from "../../md/mode-edit";
+export { default as MdMonetizationOn } from "../../md/monetization-on";
+export { default as MdMoneyOff } from "../../md/money-off";
+export { default as MdMonochromePhotos } from "../../md/monochrome-photos";
+export { default as MdMoodBad } from "../../md/mood-bad";
+export { default as MdMood } from "../../md/mood";
+export { default as MdMoreHoriz } from "../../md/more-horiz";
+export { default as MdMoreVert } from "../../md/more-vert";
+export { default as MdMore } from "../../md/more";
+export { default as MdMotorcycle } from "../../md/motorcycle";
+export { default as MdMouse } from "../../md/mouse";
+export { default as MdMoveToInbox } from "../../md/move-to-inbox";
+export { default as MdMovieCreation } from "../../md/movie-creation";
+export { default as MdMovieFilter } from "../../md/movie-filter";
+export { default as MdMovie } from "../../md/movie";
+export { default as MdMultilineChart } from "../../md/multiline-chart";
+export { default as MdMusicNote } from "../../md/music-note";
+export { default as MdMusicVideo } from "../../md/music-video";
+export { default as MdMyLocation } from "../../md/my-location";
+export { default as MdNaturePeople } from "../../md/nature-people";
+export { default as MdNature } from "../../md/nature";
+export { default as MdNavigateBefore } from "../../md/navigate-before";
+export { default as MdNavigateNext } from "../../md/navigate-next";
+export { default as MdNavigation } from "../../md/navigation";
+export { default as MdNearMe } from "../../md/near-me";
+export { default as MdNetworkCell } from "../../md/network-cell";
+export { default as MdNetworkCheck } from "../../md/network-check";
+export { default as MdNetworkLocked } from "../../md/network-locked";
+export { default as MdNetworkWifi } from "../../md/network-wifi";
+export { default as MdNewReleases } from "../../md/new-releases";
+export { default as MdNextWeek } from "../../md/next-week";
+export { default as MdNfc } from "../../md/nfc";
+export { default as MdNoEncryption } from "../../md/no-encryption";
+export { default as MdNoSim } from "../../md/no-sim";
+export { default as MdNotInterested } from "../../md/not-interested";
+export { default as MdNoteAdd } from "../../md/note-add";
+export { default as MdNote } from "../../md/note";
+export { default as MdNotificationsActive } from "../../md/notifications-active";
+export { default as MdNotificationsNone } from "../../md/notifications-none";
+export { default as MdNotificationsOff } from "../../md/notifications-off";
+export { default as MdNotificationsPaused } from "../../md/notifications-paused";
+export { default as MdNotifications } from "../../md/notifications";
+export { default as MdNowWallpaper } from "../../md/now-wallpaper";
+export { default as MdNowWidgets } from "../../md/now-widgets";
+export { default as MdOfflinePin } from "../../md/offline-pin";
+export { default as MdOndemandVideo } from "../../md/ondemand-video";
+export { default as MdOpacity } from "../../md/opacity";
+export { default as MdOpenInBrowser } from "../../md/open-in-browser";
+export { default as MdOpenInNew } from "../../md/open-in-new";
+export { default as MdOpenWith } from "../../md/open-with";
+export { default as MdPages } from "../../md/pages";
+export { default as MdPageview } from "../../md/pageview";
+export { default as MdPalette } from "../../md/palette";
+export { default as MdPanTool } from "../../md/pan-tool";
+export { default as MdPanoramaFishEye } from "../../md/panorama-fish-eye";
+export { default as MdPanoramaHorizontal } from "../../md/panorama-horizontal";
+export { default as MdPanoramaVertical } from "../../md/panorama-vertical";
+export { default as MdPanoramaWideAngle } from "../../md/panorama-wide-angle";
+export { default as MdPanorama } from "../../md/panorama";
+export { default as MdPartyMode } from "../../md/party-mode";
+export { default as MdPauseCircleFilled } from "../../md/pause-circle-filled";
+export { default as MdPauseCircleOutline } from "../../md/pause-circle-outline";
+export { default as MdPause } from "../../md/pause";
+export { default as MdPayment } from "../../md/payment";
+export { default as MdPeopleOutline } from "../../md/people-outline";
+export { default as MdPeople } from "../../md/people";
+export { default as MdPermCameraMic } from "../../md/perm-camera-mic";
+export { default as MdPermContactCalendar } from "../../md/perm-contact-calendar";
+export { default as MdPermDataSetting } from "../../md/perm-data-setting";
+export { default as MdPermDeviceInformation } from "../../md/perm-device-information";
+export { default as MdPermIdentity } from "../../md/perm-identity";
+export { default as MdPermMedia } from "../../md/perm-media";
+export { default as MdPermPhoneMsg } from "../../md/perm-phone-msg";
+export { default as MdPermScanWifi } from "../../md/perm-scan-wifi";
+export { default as MdPersonAdd } from "../../md/person-add";
+export { default as MdPersonOutline } from "../../md/person-outline";
+export { default as MdPersonPinCircle } from "../../md/person-pin-circle";
+export { default as MdPersonPin } from "../../md/person-pin";
+export { default as MdPerson } from "../../md/person";
+export { default as MdPersonalVideo } from "../../md/personal-video";
+export { default as MdPets } from "../../md/pets";
+export { default as MdPhoneAndroid } from "../../md/phone-android";
+export { default as MdPhoneBluetoothSpeaker } from "../../md/phone-bluetooth-speaker";
+export { default as MdPhoneForwarded } from "../../md/phone-forwarded";
+export { default as MdPhoneInTalk } from "../../md/phone-in-talk";
+export { default as MdPhoneIphone } from "../../md/phone-iphone";
+export { default as MdPhoneLocked } from "../../md/phone-locked";
+export { default as MdPhoneMissed } from "../../md/phone-missed";
+export { default as MdPhonePaused } from "../../md/phone-paused";
+export { default as MdPhone } from "../../md/phone";
+export { default as MdPhonelinkErase } from "../../md/phonelink-erase";
+export { default as MdPhonelinkLock } from "../../md/phonelink-lock";
+export { default as MdPhonelinkOff } from "../../md/phonelink-off";
+export { default as MdPhonelinkRing } from "../../md/phonelink-ring";
+export { default as MdPhonelinkSetup } from "../../md/phonelink-setup";
+export { default as MdPhonelink } from "../../md/phonelink";
+export { default as MdPhotoAlbum } from "../../md/photo-album";
+export { default as MdPhotoCamera } from "../../md/photo-camera";
+export { default as MdPhotoFilter } from "../../md/photo-filter";
+export { default as MdPhotoLibrary } from "../../md/photo-library";
+export { default as MdPhotoSizeSelectActual } from "../../md/photo-size-select-actual";
+export { default as MdPhotoSizeSelectLarge } from "../../md/photo-size-select-large";
+export { default as MdPhotoSizeSelectSmall } from "../../md/photo-size-select-small";
+export { default as MdPhoto } from "../../md/photo";
+export { default as MdPictureAsPdf } from "../../md/picture-as-pdf";
+export { default as MdPictureInPictureAlt } from "../../md/picture-in-picture-alt";
+export { default as MdPictureInPicture } from "../../md/picture-in-picture";
+export { default as MdPieChartOutlined } from "../../md/pie-chart-outlined";
+export { default as MdPieChart } from "../../md/pie-chart";
+export { default as MdPinDrop } from "../../md/pin-drop";
+export { default as MdPlace } from "../../md/place";
+export { default as MdPlayArrow } from "../../md/play-arrow";
+export { default as MdPlayCircleFilled } from "../../md/play-circle-filled";
+export { default as MdPlayCircleOutline } from "../../md/play-circle-outline";
+export { default as MdPlayForWork } from "../../md/play-for-work";
+export { default as MdPlaylistAddCheck } from "../../md/playlist-add-check";
+export { default as MdPlaylistAdd } from "../../md/playlist-add";
+export { default as MdPlaylistPlay } from "../../md/playlist-play";
+export { default as MdPlusOne } from "../../md/plus-one";
+export { default as MdPoll } from "../../md/poll";
+export { default as MdPolymer } from "../../md/polymer";
+export { default as MdPool } from "../../md/pool";
+export { default as MdPortableWifiOff } from "../../md/portable-wifi-off";
+export { default as MdPortrait } from "../../md/portrait";
+export { default as MdPowerInput } from "../../md/power-input";
+export { default as MdPowerSettingsNew } from "../../md/power-settings-new";
+export { default as MdPower } from "../../md/power";
+export { default as MdPregnantWoman } from "../../md/pregnant-woman";
+export { default as MdPresentToAll } from "../../md/present-to-all";
+export { default as MdPrint } from "../../md/print";
+export { default as MdPriorityHigh } from "../../md/priority-high";
+export { default as MdPublic } from "../../md/public";
+export { default as MdPublish } from "../../md/publish";
+export { default as MdQueryBuilder } from "../../md/query-builder";
+export { default as MdQuestionAnswer } from "../../md/question-answer";
+export { default as MdQueueMusic } from "../../md/queue-music";
+export { default as MdQueuePlayNext } from "../../md/queue-play-next";
+export { default as MdQueue } from "../../md/queue";
+export { default as MdRadioButtonChecked } from "../../md/radio-button-checked";
+export { default as MdRadioButtonUnchecked } from "../../md/radio-button-unchecked";
+export { default as MdRadio } from "../../md/radio";
+export { default as MdRateReview } from "../../md/rate-review";
+export { default as MdReceipt } from "../../md/receipt";
+export { default as MdRecentActors } from "../../md/recent-actors";
+export { default as MdRecordVoiceOver } from "../../md/record-voice-over";
+export { default as MdRedeem } from "../../md/redeem";
+export { default as MdRedo } from "../../md/redo";
+export { default as MdRefresh } from "../../md/refresh";
+export { default as MdRemoveCircleOutline } from "../../md/remove-circle-outline";
+export { default as MdRemoveCircle } from "../../md/remove-circle";
+export { default as MdRemoveFromQueue } from "../../md/remove-from-queue";
+export { default as MdRemoveRedEye } from "../../md/remove-red-eye";
+export { default as MdRemoveShoppingCart } from "../../md/remove-shopping-cart";
+export { default as MdRemove } from "../../md/remove";
+export { default as MdReorder } from "../../md/reorder";
+export { default as MdRepeatOne } from "../../md/repeat-one";
+export { default as MdRepeat } from "../../md/repeat";
+export { default as MdReplay10 } from "../../md/replay-10";
+export { default as MdReplay30 } from "../../md/replay-30";
+export { default as MdReplay5 } from "../../md/replay-5";
+export { default as MdReplay } from "../../md/replay";
+export { default as MdReplyAll } from "../../md/reply-all";
+export { default as MdReply } from "../../md/reply";
+export { default as MdReportProblem } from "../../md/report-problem";
+export { default as MdReport } from "../../md/report";
+export { default as MdRestaurantMenu } from "../../md/restaurant-menu";
+export { default as MdRestaurant } from "../../md/restaurant";
+export { default as MdRestorePage } from "../../md/restore-page";
+export { default as MdRestore } from "../../md/restore";
+export { default as MdRingVolume } from "../../md/ring-volume";
+export { default as MdRoomService } from "../../md/room-service";
+export { default as MdRoom } from "../../md/room";
+export { default as MdRotate90DegreesCcw } from "../../md/rotate-90-degrees-ccw";
+export { default as MdRotateLeft } from "../../md/rotate-left";
+export { default as MdRotateRight } from "../../md/rotate-right";
+export { default as MdRoundedCorner } from "../../md/rounded-corner";
+export { default as MdRouter } from "../../md/router";
+export { default as MdRowing } from "../../md/rowing";
+export { default as MdRssFeed } from "../../md/rss-feed";
+export { default as MdRvHookup } from "../../md/rv-hookup";
+export { default as MdSatellite } from "../../md/satellite";
+export { default as MdSave } from "../../md/save";
+export { default as MdScanner } from "../../md/scanner";
+export { default as MdSchedule } from "../../md/schedule";
+export { default as MdSchool } from "../../md/school";
+export { default as MdScreenLockLandscape } from "../../md/screen-lock-landscape";
+export { default as MdScreenLockPortrait } from "../../md/screen-lock-portrait";
+export { default as MdScreenLockRotation } from "../../md/screen-lock-rotation";
+export { default as MdScreenRotation } from "../../md/screen-rotation";
+export { default as MdScreenShare } from "../../md/screen-share";
+export { default as MdSdCard } from "../../md/sd-card";
+export { default as MdSdStorage } from "../../md/sd-storage";
+export { default as MdSearch } from "../../md/search";
+export { default as MdSecurity } from "../../md/security";
+export { default as MdSelectAll } from "../../md/select-all";
+export { default as MdSend } from "../../md/send";
+export { default as MdSentimentDissatisfied } from "../../md/sentiment-dissatisfied";
+export { default as MdSentimentNeutral } from "../../md/sentiment-neutral";
+export { default as MdSentimentSatisfied } from "../../md/sentiment-satisfied";
+export { default as MdSentimentVeryDissatisfied } from "../../md/sentiment-very-dissatisfied";
+export { default as MdSentimentVerySatisfied } from "../../md/sentiment-very-satisfied";
+export { default as MdSettingsApplications } from "../../md/settings-applications";
+export { default as MdSettingsBackupRestore } from "../../md/settings-backup-restore";
+export { default as MdSettingsBluetooth } from "../../md/settings-bluetooth";
+export { default as MdSettingsBrightness } from "../../md/settings-brightness";
+export { default as MdSettingsCell } from "../../md/settings-cell";
+export { default as MdSettingsEthernet } from "../../md/settings-ethernet";
+export { default as MdSettingsInputAntenna } from "../../md/settings-input-antenna";
+export { default as MdSettingsInputComponent } from "../../md/settings-input-component";
+export { default as MdSettingsInputComposite } from "../../md/settings-input-composite";
+export { default as MdSettingsInputHdmi } from "../../md/settings-input-hdmi";
+export { default as MdSettingsInputSvideo } from "../../md/settings-input-svideo";
+export { default as MdSettingsOverscan } from "../../md/settings-overscan";
+export { default as MdSettingsPhone } from "../../md/settings-phone";
+export { default as MdSettingsPower } from "../../md/settings-power";
+export { default as MdSettingsRemote } from "../../md/settings-remote";
+export { default as MdSettingsSystemDaydream } from "../../md/settings-system-daydream";
+export { default as MdSettingsVoice } from "../../md/settings-voice";
+export { default as MdSettings } from "../../md/settings";
+export { default as MdShare } from "../../md/share";
+export { default as MdShopTwo } from "../../md/shop-two";
+export { default as MdShop } from "../../md/shop";
+export { default as MdShoppingBasket } from "../../md/shopping-basket";
+export { default as MdShoppingCart } from "../../md/shopping-cart";
+export { default as MdShortText } from "../../md/short-text";
+export { default as MdShowChart } from "../../md/show-chart";
+export { default as MdShuffle } from "../../md/shuffle";
+export { default as MdSignalCellular4Bar } from "../../md/signal-cellular-4-bar";
+export { default as MdSignalCellularConnectedNoInternet4Bar } from "../../md/signal-cellular-connected-no-internet-4-bar";
+export { default as MdSignalCellularNoSim } from "../../md/signal-cellular-no-sim";
+export { default as MdSignalCellularNull } from "../../md/signal-cellular-null";
+export { default as MdSignalCellularOff } from "../../md/signal-cellular-off";
+export { default as MdSignalWifi4BarLock } from "../../md/signal-wifi-4-bar-lock";
+export { default as MdSignalWifi4Bar } from "../../md/signal-wifi-4-bar";
+export { default as MdSignalWifiOff } from "../../md/signal-wifi-off";
+export { default as MdSimCardAlert } from "../../md/sim-card-alert";
+export { default as MdSimCard } from "../../md/sim-card";
+export { default as MdSkipNext } from "../../md/skip-next";
+export { default as MdSkipPrevious } from "../../md/skip-previous";
+export { default as MdSlideshow } from "../../md/slideshow";
+export { default as MdSlowMotionVideo } from "../../md/slow-motion-video";
+export { default as MdSmartphone } from "../../md/smartphone";
+export { default as MdSmokeFree } from "../../md/smoke-free";
+export { default as MdSmokingRooms } from "../../md/smoking-rooms";
+export { default as MdSmsFailed } from "../../md/sms-failed";
+export { default as MdSms } from "../../md/sms";
+export { default as MdSnooze } from "../../md/snooze";
+export { default as MdSortByAlpha } from "../../md/sort-by-alpha";
+export { default as MdSort } from "../../md/sort";
+export { default as MdSpa } from "../../md/spa";
+export { default as MdSpaceBar } from "../../md/space-bar";
+export { default as MdSpeakerGroup } from "../../md/speaker-group";
+export { default as MdSpeakerNotesOff } from "../../md/speaker-notes-off";
+export { default as MdSpeakerNotes } from "../../md/speaker-notes";
+export { default as MdSpeakerPhone } from "../../md/speaker-phone";
+export { default as MdSpeaker } from "../../md/speaker";
+export { default as MdSpellcheck } from "../../md/spellcheck";
+export { default as MdStarBorder } from "../../md/star-border";
+export { default as MdStarHalf } from "../../md/star-half";
+export { default as MdStarOutline } from "../../md/star-outline";
+export { default as MdStar } from "../../md/star";
+export { default as MdStars } from "../../md/stars";
+export { default as MdStayCurrentLandscape } from "../../md/stay-current-landscape";
+export { default as MdStayCurrentPortrait } from "../../md/stay-current-portrait";
+export { default as MdStayPrimaryLandscape } from "../../md/stay-primary-landscape";
+export { default as MdStayPrimaryPortrait } from "../../md/stay-primary-portrait";
+export { default as MdStopScreenShare } from "../../md/stop-screen-share";
+export { default as MdStop } from "../../md/stop";
+export { default as MdStorage } from "../../md/storage";
+export { default as MdStoreMallDirectory } from "../../md/store-mall-directory";
+export { default as MdStore } from "../../md/store";
+export { default as MdStraighten } from "../../md/straighten";
+export { default as MdStreetview } from "../../md/streetview";
+export { default as MdStrikethroughS } from "../../md/strikethrough-s";
+export { default as MdStyle } from "../../md/style";
+export { default as MdSubdirectoryArrowLeft } from "../../md/subdirectory-arrow-left";
+export { default as MdSubdirectoryArrowRight } from "../../md/subdirectory-arrow-right";
+export { default as MdSubject } from "../../md/subject";
+export { default as MdSubscriptions } from "../../md/subscriptions";
+export { default as MdSubtitles } from "../../md/subtitles";
+export { default as MdSubway } from "../../md/subway";
+export { default as MdSupervisorAccount } from "../../md/supervisor-account";
+export { default as MdSurroundSound } from "../../md/surround-sound";
+export { default as MdSwapCalls } from "../../md/swap-calls";
+export { default as MdSwapHoriz } from "../../md/swap-horiz";
+export { default as MdSwapVert } from "../../md/swap-vert";
+export { default as MdSwapVerticalCircle } from "../../md/swap-vertical-circle";
+export { default as MdSwitchCamera } from "../../md/switch-camera";
+export { default as MdSwitchVideo } from "../../md/switch-video";
+export { default as MdSyncDisabled } from "../../md/sync-disabled";
+export { default as MdSyncProblem } from "../../md/sync-problem";
+export { default as MdSync } from "../../md/sync";
+export { default as MdSystemUpdateAlt } from "../../md/system-update-alt";
+export { default as MdSystemUpdate } from "../../md/system-update";
+export { default as MdTabUnselected } from "../../md/tab-unselected";
+export { default as MdTab } from "../../md/tab";
+export { default as MdTabletAndroid } from "../../md/tablet-android";
+export { default as MdTabletMac } from "../../md/tablet-mac";
+export { default as MdTablet } from "../../md/tablet";
+export { default as MdTagFaces } from "../../md/tag-faces";
+export { default as MdTapAndPlay } from "../../md/tap-and-play";
+export { default as MdTerrain } from "../../md/terrain";
+export { default as MdTextFields } from "../../md/text-fields";
+export { default as MdTextFormat } from "../../md/text-format";
+export { default as MdTextsms } from "../../md/textsms";
+export { default as MdTexture } from "../../md/texture";
+export { default as MdTheaters } from "../../md/theaters";
+export { default as MdThumbDown } from "../../md/thumb-down";
+export { default as MdThumbUp } from "../../md/thumb-up";
+export { default as MdThumbsUpDown } from "../../md/thumbs-up-down";
+export { default as MdTimeToLeave } from "../../md/time-to-leave";
+export { default as MdTimelapse } from "../../md/timelapse";
+export { default as MdTimeline } from "../../md/timeline";
+export { default as MdTimer10 } from "../../md/timer-10";
+export { default as MdTimer3 } from "../../md/timer-3";
+export { default as MdTimerOff } from "../../md/timer-off";
+export { default as MdTimer } from "../../md/timer";
+export { default as MdTitle } from "../../md/title";
+export { default as MdToc } from "../../md/toc";
+export { default as MdToday } from "../../md/today";
+export { default as MdToll } from "../../md/toll";
+export { default as MdTonality } from "../../md/tonality";
+export { default as MdTouchApp } from "../../md/touch-app";
+export { default as MdToys } from "../../md/toys";
+export { default as MdTrackChanges } from "../../md/track-changes";
+export { default as MdTraffic } from "../../md/traffic";
+export { default as MdTrain } from "../../md/train";
+export { default as MdTram } from "../../md/tram";
+export { default as MdTransferWithinAStation } from "../../md/transfer-within-a-station";
+export { default as MdTransform } from "../../md/transform";
+export { default as MdTranslate } from "../../md/translate";
+export { default as MdTrendingDown } from "../../md/trending-down";
+export { default as MdTrendingFlat } from "../../md/trending-flat";
+export { default as MdTrendingNeutral } from "../../md/trending-neutral";
+export { default as MdTrendingUp } from "../../md/trending-up";
+export { default as MdTune } from "../../md/tune";
+export { default as MdTurnedInNot } from "../../md/turned-in-not";
+export { default as MdTurnedIn } from "../../md/turned-in";
+export { default as MdTv } from "../../md/tv";
+export { default as MdUnarchive } from "../../md/unarchive";
+export { default as MdUndo } from "../../md/undo";
+export { default as MdUnfoldLess } from "../../md/unfold-less";
+export { default as MdUnfoldMore } from "../../md/unfold-more";
+export { default as MdUpdate } from "../../md/update";
+export { default as MdUsb } from "../../md/usb";
+export { default as MdVerifiedUser } from "../../md/verified-user";
+export { default as MdVerticalAlignBottom } from "../../md/vertical-align-bottom";
+export { default as MdVerticalAlignCenter } from "../../md/vertical-align-center";
+export { default as MdVerticalAlignTop } from "../../md/vertical-align-top";
+export { default as MdVibration } from "../../md/vibration";
+export { default as MdVideoCall } from "../../md/video-call";
+export { default as MdVideoCollection } from "../../md/video-collection";
+export { default as MdVideoLabel } from "../../md/video-label";
+export { default as MdVideoLibrary } from "../../md/video-library";
+export { default as MdVideocamOff } from "../../md/videocam-off";
+export { default as MdVideocam } from "../../md/videocam";
+export { default as MdVideogameAsset } from "../../md/videogame-asset";
+export { default as MdViewAgenda } from "../../md/view-agenda";
+export { default as MdViewArray } from "../../md/view-array";
+export { default as MdViewCarousel } from "../../md/view-carousel";
+export { default as MdViewColumn } from "../../md/view-column";
+export { default as MdViewComfortable } from "../../md/view-comfortable";
+export { default as MdViewComfy } from "../../md/view-comfy";
+export { default as MdViewCompact } from "../../md/view-compact";
+export { default as MdViewDay } from "../../md/view-day";
+export { default as MdViewHeadline } from "../../md/view-headline";
+export { default as MdViewList } from "../../md/view-list";
+export { default as MdViewModule } from "../../md/view-module";
+export { default as MdViewQuilt } from "../../md/view-quilt";
+export { default as MdViewStream } from "../../md/view-stream";
+export { default as MdViewWeek } from "../../md/view-week";
+export { default as MdVignette } from "../../md/vignette";
+export { default as MdVisibilityOff } from "../../md/visibility-off";
+export { default as MdVisibility } from "../../md/visibility";
+export { default as MdVoiceChat } from "../../md/voice-chat";
+export { default as MdVoicemail } from "../../md/voicemail";
+export { default as MdVolumeDown } from "../../md/volume-down";
+export { default as MdVolumeMute } from "../../md/volume-mute";
+export { default as MdVolumeOff } from "../../md/volume-off";
+export { default as MdVolumeUp } from "../../md/volume-up";
+export { default as MdVpnKey } from "../../md/vpn-key";
+export { default as MdVpnLock } from "../../md/vpn-lock";
+export { default as MdWallpaper } from "../../md/wallpaper";
+export { default as MdWarning } from "../../md/warning";
+export { default as MdWatchLater } from "../../md/watch-later";
+export { default as MdWatch } from "../../md/watch";
+export { default as MdWbAuto } from "../../md/wb-auto";
+export { default as MdWbCloudy } from "../../md/wb-cloudy";
+export { default as MdWbIncandescent } from "../../md/wb-incandescent";
+export { default as MdWbIridescent } from "../../md/wb-iridescent";
+export { default as MdWbSunny } from "../../md/wb-sunny";
+export { default as MdWc } from "../../md/wc";
+export { default as MdWebAsset } from "../../md/web-asset";
+export { default as MdWeb } from "../../md/web";
+export { default as MdWeekend } from "../../md/weekend";
+export { default as MdWhatshot } from "../../md/whatshot";
+export { default as MdWidgets } from "../../md/widgets";
+export { default as MdWifiLock } from "../../md/wifi-lock";
+export { default as MdWifiTethering } from "../../md/wifi-tethering";
+export { default as MdWifi } from "../../md/wifi";
+export { default as MdWork } from "../../md/work";
+export { default as MdWrapText } from "../../md/wrap-text";
+export { default as MdYoutubeSearchedFor } from "../../md/youtube-searched-for";
+export { default as MdZoomIn } from "../../md/zoom-in";
+export { default as MdZoomOutMap } from "../../md/zoom-out-map";
+export { default as MdZoomOut } from "../../md/zoom-out";
diff --git a/types/react-icons/lib/md/info-outline.d.ts b/types/react-icons/lib/md/info-outline.d.ts
index 6ac0500f92..5637358a59 100644
--- a/types/react-icons/lib/md/info-outline.d.ts
+++ b/types/react-icons/lib/md/info-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInfoOutline extends React.Component<IconBaseProps> { }
+declare class MdInfoOutline extends React.Component<IconBaseProps> { }
+export = MdInfoOutline;
diff --git a/types/react-icons/lib/md/info.d.ts b/types/react-icons/lib/md/info.d.ts
index c16ac1add7..4ab7948826 100644
--- a/types/react-icons/lib/md/info.d.ts
+++ b/types/react-icons/lib/md/info.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInfo extends React.Component<IconBaseProps> { }
+declare class MdInfo extends React.Component<IconBaseProps> { }
+export = MdInfo;
diff --git a/types/react-icons/lib/md/input.d.ts b/types/react-icons/lib/md/input.d.ts
index 1d620b29c8..8b3f4b415a 100644
--- a/types/react-icons/lib/md/input.d.ts
+++ b/types/react-icons/lib/md/input.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInput extends React.Component<IconBaseProps> { }
+declare class MdInput extends React.Component<IconBaseProps> { }
+export = MdInput;
diff --git a/types/react-icons/lib/md/insert-chart.d.ts b/types/react-icons/lib/md/insert-chart.d.ts
index c3f11f837a..3b8d6c13e2 100644
--- a/types/react-icons/lib/md/insert-chart.d.ts
+++ b/types/react-icons/lib/md/insert-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertChart extends React.Component<IconBaseProps> { }
+declare class MdInsertChart extends React.Component<IconBaseProps> { }
+export = MdInsertChart;
diff --git a/types/react-icons/lib/md/insert-comment.d.ts b/types/react-icons/lib/md/insert-comment.d.ts
index 4e9435029c..1d2ad77e16 100644
--- a/types/react-icons/lib/md/insert-comment.d.ts
+++ b/types/react-icons/lib/md/insert-comment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertComment extends React.Component<IconBaseProps> { }
+declare class MdInsertComment extends React.Component<IconBaseProps> { }
+export = MdInsertComment;
diff --git a/types/react-icons/lib/md/insert-drive-file.d.ts b/types/react-icons/lib/md/insert-drive-file.d.ts
index cbef175f50..7e20744ad2 100644
--- a/types/react-icons/lib/md/insert-drive-file.d.ts
+++ b/types/react-icons/lib/md/insert-drive-file.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertDriveFile extends React.Component<IconBaseProps> { }
+declare class MdInsertDriveFile extends React.Component<IconBaseProps> { }
+export = MdInsertDriveFile;
diff --git a/types/react-icons/lib/md/insert-emoticon.d.ts b/types/react-icons/lib/md/insert-emoticon.d.ts
index 5cce434cd9..c535f13a36 100644
--- a/types/react-icons/lib/md/insert-emoticon.d.ts
+++ b/types/react-icons/lib/md/insert-emoticon.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertEmoticon extends React.Component<IconBaseProps> { }
+declare class MdInsertEmoticon extends React.Component<IconBaseProps> { }
+export = MdInsertEmoticon;
diff --git a/types/react-icons/lib/md/insert-invitation.d.ts b/types/react-icons/lib/md/insert-invitation.d.ts
index 827e395a8d..04c3e098c6 100644
--- a/types/react-icons/lib/md/insert-invitation.d.ts
+++ b/types/react-icons/lib/md/insert-invitation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertInvitation extends React.Component<IconBaseProps> { }
+declare class MdInsertInvitation extends React.Component<IconBaseProps> { }
+export = MdInsertInvitation;
diff --git a/types/react-icons/lib/md/insert-link.d.ts b/types/react-icons/lib/md/insert-link.d.ts
index 31aa91358d..83e4e38712 100644
--- a/types/react-icons/lib/md/insert-link.d.ts
+++ b/types/react-icons/lib/md/insert-link.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertLink extends React.Component<IconBaseProps> { }
+declare class MdInsertLink extends React.Component<IconBaseProps> { }
+export = MdInsertLink;
diff --git a/types/react-icons/lib/md/insert-photo.d.ts b/types/react-icons/lib/md/insert-photo.d.ts
index 7b023ca75f..ad583ecebc 100644
--- a/types/react-icons/lib/md/insert-photo.d.ts
+++ b/types/react-icons/lib/md/insert-photo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertPhoto extends React.Component<IconBaseProps> { }
+declare class MdInsertPhoto extends React.Component<IconBaseProps> { }
+export = MdInsertPhoto;
diff --git a/types/react-icons/lib/md/invert-colors-off.d.ts b/types/react-icons/lib/md/invert-colors-off.d.ts
index bf08ac105a..0e0ae7da7f 100644
--- a/types/react-icons/lib/md/invert-colors-off.d.ts
+++ b/types/react-icons/lib/md/invert-colors-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColorsOff extends React.Component<IconBaseProps> { }
+declare class MdInvertColorsOff extends React.Component<IconBaseProps> { }
+export = MdInvertColorsOff;
diff --git a/types/react-icons/lib/md/invert-colors-on.d.ts b/types/react-icons/lib/md/invert-colors-on.d.ts
index 41d3a30370..318cbdd0b3 100644
--- a/types/react-icons/lib/md/invert-colors-on.d.ts
+++ b/types/react-icons/lib/md/invert-colors-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColorsOn extends React.Component<IconBaseProps> { }
+declare class MdInvertColorsOn extends React.Component<IconBaseProps> { }
+export = MdInvertColorsOn;
diff --git a/types/react-icons/lib/md/invert-colors.d.ts b/types/react-icons/lib/md/invert-colors.d.ts
index 6700ad9028..b07fef302d 100644
--- a/types/react-icons/lib/md/invert-colors.d.ts
+++ b/types/react-icons/lib/md/invert-colors.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColors extends React.Component<IconBaseProps> { }
+declare class MdInvertColors extends React.Component<IconBaseProps> { }
+export = MdInvertColors;
diff --git a/types/react-icons/lib/md/iso.d.ts b/types/react-icons/lib/md/iso.d.ts
index 13e1d8da6c..e0dc190337 100644
--- a/types/react-icons/lib/md/iso.d.ts
+++ b/types/react-icons/lib/md/iso.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdIso extends React.Component<IconBaseProps> { }
+declare class MdIso extends React.Component<IconBaseProps> { }
+export = MdIso;
diff --git a/types/react-icons/lib/md/keyboard-arrow-down.d.ts b/types/react-icons/lib/md/keyboard-arrow-down.d.ts
index 2aa3a06de4..e1ada8591b 100644
--- a/types/react-icons/lib/md/keyboard-arrow-down.d.ts
+++ b/types/react-icons/lib/md/keyboard-arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowDown extends React.Component<IconBaseProps> { }
+declare class MdKeyboardArrowDown extends React.Component<IconBaseProps> { }
+export = MdKeyboardArrowDown;
diff --git a/types/react-icons/lib/md/keyboard-arrow-left.d.ts b/types/react-icons/lib/md/keyboard-arrow-left.d.ts
index 6ab86f3bdc..9a617de836 100644
--- a/types/react-icons/lib/md/keyboard-arrow-left.d.ts
+++ b/types/react-icons/lib/md/keyboard-arrow-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowLeft extends React.Component<IconBaseProps> { }
+declare class MdKeyboardArrowLeft extends React.Component<IconBaseProps> { }
+export = MdKeyboardArrowLeft;
diff --git a/types/react-icons/lib/md/keyboard-arrow-right.d.ts b/types/react-icons/lib/md/keyboard-arrow-right.d.ts
index 157f9cd453..e6e5f92245 100644
--- a/types/react-icons/lib/md/keyboard-arrow-right.d.ts
+++ b/types/react-icons/lib/md/keyboard-arrow-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowRight extends React.Component<IconBaseProps> { }
+declare class MdKeyboardArrowRight extends React.Component<IconBaseProps> { }
+export = MdKeyboardArrowRight;
diff --git a/types/react-icons/lib/md/keyboard-arrow-up.d.ts b/types/react-icons/lib/md/keyboard-arrow-up.d.ts
index be668094a8..55dc2486e3 100644
--- a/types/react-icons/lib/md/keyboard-arrow-up.d.ts
+++ b/types/react-icons/lib/md/keyboard-arrow-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowUp extends React.Component<IconBaseProps> { }
+declare class MdKeyboardArrowUp extends React.Component<IconBaseProps> { }
+export = MdKeyboardArrowUp;
diff --git a/types/react-icons/lib/md/keyboard-backspace.d.ts b/types/react-icons/lib/md/keyboard-backspace.d.ts
index 361b3eacb6..5d04cd78c9 100644
--- a/types/react-icons/lib/md/keyboard-backspace.d.ts
+++ b/types/react-icons/lib/md/keyboard-backspace.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardBackspace extends React.Component<IconBaseProps> { }
+declare class MdKeyboardBackspace extends React.Component<IconBaseProps> { }
+export = MdKeyboardBackspace;
diff --git a/types/react-icons/lib/md/keyboard-capslock.d.ts b/types/react-icons/lib/md/keyboard-capslock.d.ts
index e68fb04dd4..f4894cc8f5 100644
--- a/types/react-icons/lib/md/keyboard-capslock.d.ts
+++ b/types/react-icons/lib/md/keyboard-capslock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardCapslock extends React.Component<IconBaseProps> { }
+declare class MdKeyboardCapslock extends React.Component<IconBaseProps> { }
+export = MdKeyboardCapslock;
diff --git a/types/react-icons/lib/md/keyboard-control.d.ts b/types/react-icons/lib/md/keyboard-control.d.ts
index 26a47f7942..83404a2333 100644
--- a/types/react-icons/lib/md/keyboard-control.d.ts
+++ b/types/react-icons/lib/md/keyboard-control.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardControl extends React.Component<IconBaseProps> { }
+declare class MdKeyboardControl extends React.Component<IconBaseProps> { }
+export = MdKeyboardControl;
diff --git a/types/react-icons/lib/md/keyboard-hide.d.ts b/types/react-icons/lib/md/keyboard-hide.d.ts
index 2bd9815962..99b49d804c 100644
--- a/types/react-icons/lib/md/keyboard-hide.d.ts
+++ b/types/react-icons/lib/md/keyboard-hide.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardHide extends React.Component<IconBaseProps> { }
+declare class MdKeyboardHide extends React.Component<IconBaseProps> { }
+export = MdKeyboardHide;
diff --git a/types/react-icons/lib/md/keyboard-return.d.ts b/types/react-icons/lib/md/keyboard-return.d.ts
index dcc67124f3..af2ed0a05f 100644
--- a/types/react-icons/lib/md/keyboard-return.d.ts
+++ b/types/react-icons/lib/md/keyboard-return.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardReturn extends React.Component<IconBaseProps> { }
+declare class MdKeyboardReturn extends React.Component<IconBaseProps> { }
+export = MdKeyboardReturn;
diff --git a/types/react-icons/lib/md/keyboard-tab.d.ts b/types/react-icons/lib/md/keyboard-tab.d.ts
index fc60cb1e9d..b28759381a 100644
--- a/types/react-icons/lib/md/keyboard-tab.d.ts
+++ b/types/react-icons/lib/md/keyboard-tab.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardTab extends React.Component<IconBaseProps> { }
+declare class MdKeyboardTab extends React.Component<IconBaseProps> { }
+export = MdKeyboardTab;
diff --git a/types/react-icons/lib/md/keyboard-voice.d.ts b/types/react-icons/lib/md/keyboard-voice.d.ts
index b0e8b84cef..6ffefcc90e 100644
--- a/types/react-icons/lib/md/keyboard-voice.d.ts
+++ b/types/react-icons/lib/md/keyboard-voice.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardVoice extends React.Component<IconBaseProps> { }
+declare class MdKeyboardVoice extends React.Component<IconBaseProps> { }
+export = MdKeyboardVoice;
diff --git a/types/react-icons/lib/md/keyboard.d.ts b/types/react-icons/lib/md/keyboard.d.ts
index c48881b8b4..cc3ea90276 100644
--- a/types/react-icons/lib/md/keyboard.d.ts
+++ b/types/react-icons/lib/md/keyboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboard extends React.Component<IconBaseProps> { }
+declare class MdKeyboard extends React.Component<IconBaseProps> { }
+export = MdKeyboard;
diff --git a/types/react-icons/lib/md/kitchen.d.ts b/types/react-icons/lib/md/kitchen.d.ts
index 9da8c6f762..79d8c0fce3 100644
--- a/types/react-icons/lib/md/kitchen.d.ts
+++ b/types/react-icons/lib/md/kitchen.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKitchen extends React.Component<IconBaseProps> { }
+declare class MdKitchen extends React.Component<IconBaseProps> { }
+export = MdKitchen;
diff --git a/types/react-icons/lib/md/label-outline.d.ts b/types/react-icons/lib/md/label-outline.d.ts
index f8565aaac8..01ae937f15 100644
--- a/types/react-icons/lib/md/label-outline.d.ts
+++ b/types/react-icons/lib/md/label-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLabelOutline extends React.Component<IconBaseProps> { }
+declare class MdLabelOutline extends React.Component<IconBaseProps> { }
+export = MdLabelOutline;
diff --git a/types/react-icons/lib/md/label.d.ts b/types/react-icons/lib/md/label.d.ts
index 679636e231..774401589e 100644
--- a/types/react-icons/lib/md/label.d.ts
+++ b/types/react-icons/lib/md/label.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLabel extends React.Component<IconBaseProps> { }
+declare class MdLabel extends React.Component<IconBaseProps> { }
+export = MdLabel;
diff --git a/types/react-icons/lib/md/landscape.d.ts b/types/react-icons/lib/md/landscape.d.ts
index fb4502522b..6682f2674a 100644
--- a/types/react-icons/lib/md/landscape.d.ts
+++ b/types/react-icons/lib/md/landscape.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLandscape extends React.Component<IconBaseProps> { }
+declare class MdLandscape extends React.Component<IconBaseProps> { }
+export = MdLandscape;
diff --git a/types/react-icons/lib/md/language.d.ts b/types/react-icons/lib/md/language.d.ts
index a47388c654..e44dd9b1db 100644
--- a/types/react-icons/lib/md/language.d.ts
+++ b/types/react-icons/lib/md/language.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLanguage extends React.Component<IconBaseProps> { }
+declare class MdLanguage extends React.Component<IconBaseProps> { }
+export = MdLanguage;
diff --git a/types/react-icons/lib/md/laptop-chromebook.d.ts b/types/react-icons/lib/md/laptop-chromebook.d.ts
index d1f25cdc3b..b61654b7a0 100644
--- a/types/react-icons/lib/md/laptop-chromebook.d.ts
+++ b/types/react-icons/lib/md/laptop-chromebook.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopChromebook extends React.Component<IconBaseProps> { }
+declare class MdLaptopChromebook extends React.Component<IconBaseProps> { }
+export = MdLaptopChromebook;
diff --git a/types/react-icons/lib/md/laptop-mac.d.ts b/types/react-icons/lib/md/laptop-mac.d.ts
index 25afe25920..47f2ea0bc7 100644
--- a/types/react-icons/lib/md/laptop-mac.d.ts
+++ b/types/react-icons/lib/md/laptop-mac.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopMac extends React.Component<IconBaseProps> { }
+declare class MdLaptopMac extends React.Component<IconBaseProps> { }
+export = MdLaptopMac;
diff --git a/types/react-icons/lib/md/laptop-windows.d.ts b/types/react-icons/lib/md/laptop-windows.d.ts
index bd7441fea1..5b4fd277aa 100644
--- a/types/react-icons/lib/md/laptop-windows.d.ts
+++ b/types/react-icons/lib/md/laptop-windows.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopWindows extends React.Component<IconBaseProps> { }
+declare class MdLaptopWindows extends React.Component<IconBaseProps> { }
+export = MdLaptopWindows;
diff --git a/types/react-icons/lib/md/laptop.d.ts b/types/react-icons/lib/md/laptop.d.ts
index 2510020e0c..adf918c456 100644
--- a/types/react-icons/lib/md/laptop.d.ts
+++ b/types/react-icons/lib/md/laptop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptop extends React.Component<IconBaseProps> { }
+declare class MdLaptop extends React.Component<IconBaseProps> { }
+export = MdLaptop;
diff --git a/types/react-icons/lib/md/last-page.d.ts b/types/react-icons/lib/md/last-page.d.ts
index 162f94c0de..1b89fbe0b8 100644
--- a/types/react-icons/lib/md/last-page.d.ts
+++ b/types/react-icons/lib/md/last-page.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLastPage extends React.Component<IconBaseProps> { }
+declare class MdLastPage extends React.Component<IconBaseProps> { }
+export = MdLastPage;
diff --git a/types/react-icons/lib/md/launch.d.ts b/types/react-icons/lib/md/launch.d.ts
index 6bd2552cb3..20e5423921 100644
--- a/types/react-icons/lib/md/launch.d.ts
+++ b/types/react-icons/lib/md/launch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaunch extends React.Component<IconBaseProps> { }
+declare class MdLaunch extends React.Component<IconBaseProps> { }
+export = MdLaunch;
diff --git a/types/react-icons/lib/md/layers-clear.d.ts b/types/react-icons/lib/md/layers-clear.d.ts
index 136d4ab797..1d9e3d1a79 100644
--- a/types/react-icons/lib/md/layers-clear.d.ts
+++ b/types/react-icons/lib/md/layers-clear.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLayersClear extends React.Component<IconBaseProps> { }
+declare class MdLayersClear extends React.Component<IconBaseProps> { }
+export = MdLayersClear;
diff --git a/types/react-icons/lib/md/layers.d.ts b/types/react-icons/lib/md/layers.d.ts
index d0f2ce7f78..0afbb40d68 100644
--- a/types/react-icons/lib/md/layers.d.ts
+++ b/types/react-icons/lib/md/layers.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLayers extends React.Component<IconBaseProps> { }
+declare class MdLayers extends React.Component<IconBaseProps> { }
+export = MdLayers;
diff --git a/types/react-icons/lib/md/leak-add.d.ts b/types/react-icons/lib/md/leak-add.d.ts
index 95235a4a7d..5a2c27ded3 100644
--- a/types/react-icons/lib/md/leak-add.d.ts
+++ b/types/react-icons/lib/md/leak-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLeakAdd extends React.Component<IconBaseProps> { }
+declare class MdLeakAdd extends React.Component<IconBaseProps> { }
+export = MdLeakAdd;
diff --git a/types/react-icons/lib/md/leak-remove.d.ts b/types/react-icons/lib/md/leak-remove.d.ts
index 024072b36a..bb39e31d50 100644
--- a/types/react-icons/lib/md/leak-remove.d.ts
+++ b/types/react-icons/lib/md/leak-remove.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLeakRemove extends React.Component<IconBaseProps> { }
+declare class MdLeakRemove extends React.Component<IconBaseProps> { }
+export = MdLeakRemove;
diff --git a/types/react-icons/lib/md/lens.d.ts b/types/react-icons/lib/md/lens.d.ts
index c5d535560e..489ca62554 100644
--- a/types/react-icons/lib/md/lens.d.ts
+++ b/types/react-icons/lib/md/lens.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLens extends React.Component<IconBaseProps> { }
+declare class MdLens extends React.Component<IconBaseProps> { }
+export = MdLens;
diff --git a/types/react-icons/lib/md/library-add.d.ts b/types/react-icons/lib/md/library-add.d.ts
index 0d1e45a2d1..9e1e8b2501 100644
--- a/types/react-icons/lib/md/library-add.d.ts
+++ b/types/react-icons/lib/md/library-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryAdd extends React.Component<IconBaseProps> { }
+declare class MdLibraryAdd extends React.Component<IconBaseProps> { }
+export = MdLibraryAdd;
diff --git a/types/react-icons/lib/md/library-books.d.ts b/types/react-icons/lib/md/library-books.d.ts
index 4cd9469a0f..bacbf10d03 100644
--- a/types/react-icons/lib/md/library-books.d.ts
+++ b/types/react-icons/lib/md/library-books.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryBooks extends React.Component<IconBaseProps> { }
+declare class MdLibraryBooks extends React.Component<IconBaseProps> { }
+export = MdLibraryBooks;
diff --git a/types/react-icons/lib/md/library-music.d.ts b/types/react-icons/lib/md/library-music.d.ts
index 7f25717011..11c6c8bf2b 100644
--- a/types/react-icons/lib/md/library-music.d.ts
+++ b/types/react-icons/lib/md/library-music.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryMusic extends React.Component<IconBaseProps> { }
+declare class MdLibraryMusic extends React.Component<IconBaseProps> { }
+export = MdLibraryMusic;
diff --git a/types/react-icons/lib/md/lightbulb-outline.d.ts b/types/react-icons/lib/md/lightbulb-outline.d.ts
index 013344155b..8a8548dc97 100644
--- a/types/react-icons/lib/md/lightbulb-outline.d.ts
+++ b/types/react-icons/lib/md/lightbulb-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLightbulbOutline extends React.Component<IconBaseProps> { }
+declare class MdLightbulbOutline extends React.Component<IconBaseProps> { }
+export = MdLightbulbOutline;
diff --git a/types/react-icons/lib/md/line-style.d.ts b/types/react-icons/lib/md/line-style.d.ts
index 01562f8705..41264e8a88 100644
--- a/types/react-icons/lib/md/line-style.d.ts
+++ b/types/react-icons/lib/md/line-style.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLineStyle extends React.Component<IconBaseProps> { }
+declare class MdLineStyle extends React.Component<IconBaseProps> { }
+export = MdLineStyle;
diff --git a/types/react-icons/lib/md/line-weight.d.ts b/types/react-icons/lib/md/line-weight.d.ts
index 2eaa15b7df..b46fd1b8d2 100644
--- a/types/react-icons/lib/md/line-weight.d.ts
+++ b/types/react-icons/lib/md/line-weight.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLineWeight extends React.Component<IconBaseProps> { }
+declare class MdLineWeight extends React.Component<IconBaseProps> { }
+export = MdLineWeight;
diff --git a/types/react-icons/lib/md/linear-scale.d.ts b/types/react-icons/lib/md/linear-scale.d.ts
index e4f2196d46..98fc794688 100644
--- a/types/react-icons/lib/md/linear-scale.d.ts
+++ b/types/react-icons/lib/md/linear-scale.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLinearScale extends React.Component<IconBaseProps> { }
+declare class MdLinearScale extends React.Component<IconBaseProps> { }
+export = MdLinearScale;
diff --git a/types/react-icons/lib/md/link.d.ts b/types/react-icons/lib/md/link.d.ts
index 229a79db5d..1611d9af64 100644
--- a/types/react-icons/lib/md/link.d.ts
+++ b/types/react-icons/lib/md/link.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLink extends React.Component<IconBaseProps> { }
+declare class MdLink extends React.Component<IconBaseProps> { }
+export = MdLink;
diff --git a/types/react-icons/lib/md/linked-camera.d.ts b/types/react-icons/lib/md/linked-camera.d.ts
index 04f1059032..3bd2a1c26d 100644
--- a/types/react-icons/lib/md/linked-camera.d.ts
+++ b/types/react-icons/lib/md/linked-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLinkedCamera extends React.Component<IconBaseProps> { }
+declare class MdLinkedCamera extends React.Component<IconBaseProps> { }
+export = MdLinkedCamera;
diff --git a/types/react-icons/lib/md/list.d.ts b/types/react-icons/lib/md/list.d.ts
index ee687771dd..2403875d33 100644
--- a/types/react-icons/lib/md/list.d.ts
+++ b/types/react-icons/lib/md/list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdList extends React.Component<IconBaseProps> { }
+declare class MdList extends React.Component<IconBaseProps> { }
+export = MdList;
diff --git a/types/react-icons/lib/md/live-help.d.ts b/types/react-icons/lib/md/live-help.d.ts
index baa4ecfcea..9b174fe970 100644
--- a/types/react-icons/lib/md/live-help.d.ts
+++ b/types/react-icons/lib/md/live-help.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLiveHelp extends React.Component<IconBaseProps> { }
+declare class MdLiveHelp extends React.Component<IconBaseProps> { }
+export = MdLiveHelp;
diff --git a/types/react-icons/lib/md/live-tv.d.ts b/types/react-icons/lib/md/live-tv.d.ts
index 4b6700c6d7..86557bb3ce 100644
--- a/types/react-icons/lib/md/live-tv.d.ts
+++ b/types/react-icons/lib/md/live-tv.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLiveTv extends React.Component<IconBaseProps> { }
+declare class MdLiveTv extends React.Component<IconBaseProps> { }
+export = MdLiveTv;
diff --git a/types/react-icons/lib/md/local-airport.d.ts b/types/react-icons/lib/md/local-airport.d.ts
index c5cbc96784..1f5d71515e 100644
--- a/types/react-icons/lib/md/local-airport.d.ts
+++ b/types/react-icons/lib/md/local-airport.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAirport extends React.Component<IconBaseProps> { }
+declare class MdLocalAirport extends React.Component<IconBaseProps> { }
+export = MdLocalAirport;
diff --git a/types/react-icons/lib/md/local-atm.d.ts b/types/react-icons/lib/md/local-atm.d.ts
index c3aebab325..b9396fbddc 100644
--- a/types/react-icons/lib/md/local-atm.d.ts
+++ b/types/react-icons/lib/md/local-atm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAtm extends React.Component<IconBaseProps> { }
+declare class MdLocalAtm extends React.Component<IconBaseProps> { }
+export = MdLocalAtm;
diff --git a/types/react-icons/lib/md/local-attraction.d.ts b/types/react-icons/lib/md/local-attraction.d.ts
index 4cb4733fc6..3c6ba7842b 100644
--- a/types/react-icons/lib/md/local-attraction.d.ts
+++ b/types/react-icons/lib/md/local-attraction.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAttraction extends React.Component<IconBaseProps> { }
+declare class MdLocalAttraction extends React.Component<IconBaseProps> { }
+export = MdLocalAttraction;
diff --git a/types/react-icons/lib/md/local-bar.d.ts b/types/react-icons/lib/md/local-bar.d.ts
index 384cf80708..63886e78cb 100644
--- a/types/react-icons/lib/md/local-bar.d.ts
+++ b/types/react-icons/lib/md/local-bar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalBar extends React.Component<IconBaseProps> { }
+declare class MdLocalBar extends React.Component<IconBaseProps> { }
+export = MdLocalBar;
diff --git a/types/react-icons/lib/md/local-cafe.d.ts b/types/react-icons/lib/md/local-cafe.d.ts
index 1edc27271a..eb9e80ad77 100644
--- a/types/react-icons/lib/md/local-cafe.d.ts
+++ b/types/react-icons/lib/md/local-cafe.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalCafe extends React.Component<IconBaseProps> { }
+declare class MdLocalCafe extends React.Component<IconBaseProps> { }
+export = MdLocalCafe;
diff --git a/types/react-icons/lib/md/local-car-wash.d.ts b/types/react-icons/lib/md/local-car-wash.d.ts
index 2f8e3424d0..fb4b04b228 100644
--- a/types/react-icons/lib/md/local-car-wash.d.ts
+++ b/types/react-icons/lib/md/local-car-wash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalCarWash extends React.Component<IconBaseProps> { }
+declare class MdLocalCarWash extends React.Component<IconBaseProps> { }
+export = MdLocalCarWash;
diff --git a/types/react-icons/lib/md/local-convenience-store.d.ts b/types/react-icons/lib/md/local-convenience-store.d.ts
index 60ba5980c5..926d257832 100644
--- a/types/react-icons/lib/md/local-convenience-store.d.ts
+++ b/types/react-icons/lib/md/local-convenience-store.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalConvenienceStore extends React.Component<IconBaseProps> { }
+declare class MdLocalConvenienceStore extends React.Component<IconBaseProps> { }
+export = MdLocalConvenienceStore;
diff --git a/types/react-icons/lib/md/local-drink.d.ts b/types/react-icons/lib/md/local-drink.d.ts
index dd0cf01d42..d175a7f0cf 100644
--- a/types/react-icons/lib/md/local-drink.d.ts
+++ b/types/react-icons/lib/md/local-drink.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalDrink extends React.Component<IconBaseProps> { }
+declare class MdLocalDrink extends React.Component<IconBaseProps> { }
+export = MdLocalDrink;
diff --git a/types/react-icons/lib/md/local-florist.d.ts b/types/react-icons/lib/md/local-florist.d.ts
index 6744bc8c3a..217b879173 100644
--- a/types/react-icons/lib/md/local-florist.d.ts
+++ b/types/react-icons/lib/md/local-florist.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalFlorist extends React.Component<IconBaseProps> { }
+declare class MdLocalFlorist extends React.Component<IconBaseProps> { }
+export = MdLocalFlorist;
diff --git a/types/react-icons/lib/md/local-gas-station.d.ts b/types/react-icons/lib/md/local-gas-station.d.ts
index 6c6b7df0a9..21a7d020cb 100644
--- a/types/react-icons/lib/md/local-gas-station.d.ts
+++ b/types/react-icons/lib/md/local-gas-station.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalGasStation extends React.Component<IconBaseProps> { }
+declare class MdLocalGasStation extends React.Component<IconBaseProps> { }
+export = MdLocalGasStation;
diff --git a/types/react-icons/lib/md/local-grocery-store.d.ts b/types/react-icons/lib/md/local-grocery-store.d.ts
index 74be93825c..ee055fbc1b 100644
--- a/types/react-icons/lib/md/local-grocery-store.d.ts
+++ b/types/react-icons/lib/md/local-grocery-store.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalGroceryStore extends React.Component<IconBaseProps> { }
+declare class MdLocalGroceryStore extends React.Component<IconBaseProps> { }
+export = MdLocalGroceryStore;
diff --git a/types/react-icons/lib/md/local-hospital.d.ts b/types/react-icons/lib/md/local-hospital.d.ts
index 3f3d22c1f1..acce7088cd 100644
--- a/types/react-icons/lib/md/local-hospital.d.ts
+++ b/types/react-icons/lib/md/local-hospital.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalHospital extends React.Component<IconBaseProps> { }
+declare class MdLocalHospital extends React.Component<IconBaseProps> { }
+export = MdLocalHospital;
diff --git a/types/react-icons/lib/md/local-hotel.d.ts b/types/react-icons/lib/md/local-hotel.d.ts
index 72aa8116e3..378a7557ee 100644
--- a/types/react-icons/lib/md/local-hotel.d.ts
+++ b/types/react-icons/lib/md/local-hotel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalHotel extends React.Component<IconBaseProps> { }
+declare class MdLocalHotel extends React.Component<IconBaseProps> { }
+export = MdLocalHotel;
diff --git a/types/react-icons/lib/md/local-laundry-service.d.ts b/types/react-icons/lib/md/local-laundry-service.d.ts
index bcddaa57b7..9353692a5c 100644
--- a/types/react-icons/lib/md/local-laundry-service.d.ts
+++ b/types/react-icons/lib/md/local-laundry-service.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalLaundryService extends React.Component<IconBaseProps> { }
+declare class MdLocalLaundryService extends React.Component<IconBaseProps> { }
+export = MdLocalLaundryService;
diff --git a/types/react-icons/lib/md/local-library.d.ts b/types/react-icons/lib/md/local-library.d.ts
index 66345dec71..1d455aa856 100644
--- a/types/react-icons/lib/md/local-library.d.ts
+++ b/types/react-icons/lib/md/local-library.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalLibrary extends React.Component<IconBaseProps> { }
+declare class MdLocalLibrary extends React.Component<IconBaseProps> { }
+export = MdLocalLibrary;
diff --git a/types/react-icons/lib/md/local-mall.d.ts b/types/react-icons/lib/md/local-mall.d.ts
index 4bc0bd9a6c..46dbdcb894 100644
--- a/types/react-icons/lib/md/local-mall.d.ts
+++ b/types/react-icons/lib/md/local-mall.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalMall extends React.Component<IconBaseProps> { }
+declare class MdLocalMall extends React.Component<IconBaseProps> { }
+export = MdLocalMall;
diff --git a/types/react-icons/lib/md/local-movies.d.ts b/types/react-icons/lib/md/local-movies.d.ts
index fd585253f4..58d62b2909 100644
--- a/types/react-icons/lib/md/local-movies.d.ts
+++ b/types/react-icons/lib/md/local-movies.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalMovies extends React.Component<IconBaseProps> { }
+declare class MdLocalMovies extends React.Component<IconBaseProps> { }
+export = MdLocalMovies;
diff --git a/types/react-icons/lib/md/local-offer.d.ts b/types/react-icons/lib/md/local-offer.d.ts
index d68ec81829..f137a10bb1 100644
--- a/types/react-icons/lib/md/local-offer.d.ts
+++ b/types/react-icons/lib/md/local-offer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalOffer extends React.Component<IconBaseProps> { }
+declare class MdLocalOffer extends React.Component<IconBaseProps> { }
+export = MdLocalOffer;
diff --git a/types/react-icons/lib/md/local-parking.d.ts b/types/react-icons/lib/md/local-parking.d.ts
index 962af582ac..01d4ff13cf 100644
--- a/types/react-icons/lib/md/local-parking.d.ts
+++ b/types/react-icons/lib/md/local-parking.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalParking extends React.Component<IconBaseProps> { }
+declare class MdLocalParking extends React.Component<IconBaseProps> { }
+export = MdLocalParking;
diff --git a/types/react-icons/lib/md/local-pharmacy.d.ts b/types/react-icons/lib/md/local-pharmacy.d.ts
index 4f6253241e..ce2b6d192a 100644
--- a/types/react-icons/lib/md/local-pharmacy.d.ts
+++ b/types/react-icons/lib/md/local-pharmacy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPharmacy extends React.Component<IconBaseProps> { }
+declare class MdLocalPharmacy extends React.Component<IconBaseProps> { }
+export = MdLocalPharmacy;
diff --git a/types/react-icons/lib/md/local-phone.d.ts b/types/react-icons/lib/md/local-phone.d.ts
index 295b71d056..bd34f480b6 100644
--- a/types/react-icons/lib/md/local-phone.d.ts
+++ b/types/react-icons/lib/md/local-phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPhone extends React.Component<IconBaseProps> { }
+declare class MdLocalPhone extends React.Component<IconBaseProps> { }
+export = MdLocalPhone;
diff --git a/types/react-icons/lib/md/local-pizza.d.ts b/types/react-icons/lib/md/local-pizza.d.ts
index fd8f1e9b3f..d6faf8bcb3 100644
--- a/types/react-icons/lib/md/local-pizza.d.ts
+++ b/types/react-icons/lib/md/local-pizza.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPizza extends React.Component<IconBaseProps> { }
+declare class MdLocalPizza extends React.Component<IconBaseProps> { }
+export = MdLocalPizza;
diff --git a/types/react-icons/lib/md/local-play.d.ts b/types/react-icons/lib/md/local-play.d.ts
index 2323020f1f..3efcc87e1b 100644
--- a/types/react-icons/lib/md/local-play.d.ts
+++ b/types/react-icons/lib/md/local-play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPlay extends React.Component<IconBaseProps> { }
+declare class MdLocalPlay extends React.Component<IconBaseProps> { }
+export = MdLocalPlay;
diff --git a/types/react-icons/lib/md/local-post-office.d.ts b/types/react-icons/lib/md/local-post-office.d.ts
index d753132d88..a5f4a8f938 100644
--- a/types/react-icons/lib/md/local-post-office.d.ts
+++ b/types/react-icons/lib/md/local-post-office.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPostOffice extends React.Component<IconBaseProps> { }
+declare class MdLocalPostOffice extends React.Component<IconBaseProps> { }
+export = MdLocalPostOffice;
diff --git a/types/react-icons/lib/md/local-print-shop.d.ts b/types/react-icons/lib/md/local-print-shop.d.ts
index f5f2318b18..3644eaa9cf 100644
--- a/types/react-icons/lib/md/local-print-shop.d.ts
+++ b/types/react-icons/lib/md/local-print-shop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPrintShop extends React.Component<IconBaseProps> { }
+declare class MdLocalPrintShop extends React.Component<IconBaseProps> { }
+export = MdLocalPrintShop;
diff --git a/types/react-icons/lib/md/local-restaurant.d.ts b/types/react-icons/lib/md/local-restaurant.d.ts
index 631a9bcdba..714a1c2a0e 100644
--- a/types/react-icons/lib/md/local-restaurant.d.ts
+++ b/types/react-icons/lib/md/local-restaurant.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalRestaurant extends React.Component<IconBaseProps> { }
+declare class MdLocalRestaurant extends React.Component<IconBaseProps> { }
+export = MdLocalRestaurant;
diff --git a/types/react-icons/lib/md/local-see.d.ts b/types/react-icons/lib/md/local-see.d.ts
index 6c345a7bdd..a5b631777d 100644
--- a/types/react-icons/lib/md/local-see.d.ts
+++ b/types/react-icons/lib/md/local-see.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalSee extends React.Component<IconBaseProps> { }
+declare class MdLocalSee extends React.Component<IconBaseProps> { }
+export = MdLocalSee;
diff --git a/types/react-icons/lib/md/local-shipping.d.ts b/types/react-icons/lib/md/local-shipping.d.ts
index 8862dc1e3f..f08d34f0ef 100644
--- a/types/react-icons/lib/md/local-shipping.d.ts
+++ b/types/react-icons/lib/md/local-shipping.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalShipping extends React.Component<IconBaseProps> { }
+declare class MdLocalShipping extends React.Component<IconBaseProps> { }
+export = MdLocalShipping;
diff --git a/types/react-icons/lib/md/local-taxi.d.ts b/types/react-icons/lib/md/local-taxi.d.ts
index ffee12d51a..d4a9cfe09b 100644
--- a/types/react-icons/lib/md/local-taxi.d.ts
+++ b/types/react-icons/lib/md/local-taxi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalTaxi extends React.Component<IconBaseProps> { }
+declare class MdLocalTaxi extends React.Component<IconBaseProps> { }
+export = MdLocalTaxi;
diff --git a/types/react-icons/lib/md/location-city.d.ts b/types/react-icons/lib/md/location-city.d.ts
index d4154e0b4d..53c2f14810 100644
--- a/types/react-icons/lib/md/location-city.d.ts
+++ b/types/react-icons/lib/md/location-city.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationCity extends React.Component<IconBaseProps> { }
+declare class MdLocationCity extends React.Component<IconBaseProps> { }
+export = MdLocationCity;
diff --git a/types/react-icons/lib/md/location-disabled.d.ts b/types/react-icons/lib/md/location-disabled.d.ts
index f890985e4c..f4af27f5f3 100644
--- a/types/react-icons/lib/md/location-disabled.d.ts
+++ b/types/react-icons/lib/md/location-disabled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationDisabled extends React.Component<IconBaseProps> { }
+declare class MdLocationDisabled extends React.Component<IconBaseProps> { }
+export = MdLocationDisabled;
diff --git a/types/react-icons/lib/md/location-history.d.ts b/types/react-icons/lib/md/location-history.d.ts
index 6d7ae193ef..555813d873 100644
--- a/types/react-icons/lib/md/location-history.d.ts
+++ b/types/react-icons/lib/md/location-history.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationHistory extends React.Component<IconBaseProps> { }
+declare class MdLocationHistory extends React.Component<IconBaseProps> { }
+export = MdLocationHistory;
diff --git a/types/react-icons/lib/md/location-off.d.ts b/types/react-icons/lib/md/location-off.d.ts
index ae7c278991..193e2a8cf6 100644
--- a/types/react-icons/lib/md/location-off.d.ts
+++ b/types/react-icons/lib/md/location-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationOff extends React.Component<IconBaseProps> { }
+declare class MdLocationOff extends React.Component<IconBaseProps> { }
+export = MdLocationOff;
diff --git a/types/react-icons/lib/md/location-on.d.ts b/types/react-icons/lib/md/location-on.d.ts
index 9a606064c1..77094905da 100644
--- a/types/react-icons/lib/md/location-on.d.ts
+++ b/types/react-icons/lib/md/location-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationOn extends React.Component<IconBaseProps> { }
+declare class MdLocationOn extends React.Component<IconBaseProps> { }
+export = MdLocationOn;
diff --git a/types/react-icons/lib/md/location-searching.d.ts b/types/react-icons/lib/md/location-searching.d.ts
index 89860efc3f..de07a33e91 100644
--- a/types/react-icons/lib/md/location-searching.d.ts
+++ b/types/react-icons/lib/md/location-searching.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationSearching extends React.Component<IconBaseProps> { }
+declare class MdLocationSearching extends React.Component<IconBaseProps> { }
+export = MdLocationSearching;
diff --git a/types/react-icons/lib/md/lock-open.d.ts b/types/react-icons/lib/md/lock-open.d.ts
index c61129c43a..38cc201800 100644
--- a/types/react-icons/lib/md/lock-open.d.ts
+++ b/types/react-icons/lib/md/lock-open.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLockOpen extends React.Component<IconBaseProps> { }
+declare class MdLockOpen extends React.Component<IconBaseProps> { }
+export = MdLockOpen;
diff --git a/types/react-icons/lib/md/lock-outline.d.ts b/types/react-icons/lib/md/lock-outline.d.ts
index 8d8c854627..201dab5ca3 100644
--- a/types/react-icons/lib/md/lock-outline.d.ts
+++ b/types/react-icons/lib/md/lock-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLockOutline extends React.Component<IconBaseProps> { }
+declare class MdLockOutline extends React.Component<IconBaseProps> { }
+export = MdLockOutline;
diff --git a/types/react-icons/lib/md/lock.d.ts b/types/react-icons/lib/md/lock.d.ts
index 08c9bebbec..415ddfc886 100644
--- a/types/react-icons/lib/md/lock.d.ts
+++ b/types/react-icons/lib/md/lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLock extends React.Component<IconBaseProps> { }
+declare class MdLock extends React.Component<IconBaseProps> { }
+export = MdLock;
diff --git a/types/react-icons/lib/md/looks-3.d.ts b/types/react-icons/lib/md/looks-3.d.ts
index 91ec18b0fa..9bf0f8b3d0 100644
--- a/types/react-icons/lib/md/looks-3.d.ts
+++ b/types/react-icons/lib/md/looks-3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks3 extends React.Component<IconBaseProps> { }
+declare class MdLooks3 extends React.Component<IconBaseProps> { }
+export = MdLooks3;
diff --git a/types/react-icons/lib/md/looks-4.d.ts b/types/react-icons/lib/md/looks-4.d.ts
index 2005a3ef6c..030bd6c730 100644
--- a/types/react-icons/lib/md/looks-4.d.ts
+++ b/types/react-icons/lib/md/looks-4.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks4 extends React.Component<IconBaseProps> { }
+declare class MdLooks4 extends React.Component<IconBaseProps> { }
+export = MdLooks4;
diff --git a/types/react-icons/lib/md/looks-5.d.ts b/types/react-icons/lib/md/looks-5.d.ts
index 0e4c8830df..02d6aaaab3 100644
--- a/types/react-icons/lib/md/looks-5.d.ts
+++ b/types/react-icons/lib/md/looks-5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks5 extends React.Component<IconBaseProps> { }
+declare class MdLooks5 extends React.Component<IconBaseProps> { }
+export = MdLooks5;
diff --git a/types/react-icons/lib/md/looks-6.d.ts b/types/react-icons/lib/md/looks-6.d.ts
index b00d207ffc..4c35ffd3f5 100644
--- a/types/react-icons/lib/md/looks-6.d.ts
+++ b/types/react-icons/lib/md/looks-6.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks6 extends React.Component<IconBaseProps> { }
+declare class MdLooks6 extends React.Component<IconBaseProps> { }
+export = MdLooks6;
diff --git a/types/react-icons/lib/md/looks-one.d.ts b/types/react-icons/lib/md/looks-one.d.ts
index 129ebbc28b..fd6b6cb6aa 100644
--- a/types/react-icons/lib/md/looks-one.d.ts
+++ b/types/react-icons/lib/md/looks-one.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooksOne extends React.Component<IconBaseProps> { }
+declare class MdLooksOne extends React.Component<IconBaseProps> { }
+export = MdLooksOne;
diff --git a/types/react-icons/lib/md/looks-two.d.ts b/types/react-icons/lib/md/looks-two.d.ts
index 5f62cb2173..8d4dfb2d89 100644
--- a/types/react-icons/lib/md/looks-two.d.ts
+++ b/types/react-icons/lib/md/looks-two.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooksTwo extends React.Component<IconBaseProps> { }
+declare class MdLooksTwo extends React.Component<IconBaseProps> { }
+export = MdLooksTwo;
diff --git a/types/react-icons/lib/md/looks.d.ts b/types/react-icons/lib/md/looks.d.ts
index 5db0141f58..41a1db63fc 100644
--- a/types/react-icons/lib/md/looks.d.ts
+++ b/types/react-icons/lib/md/looks.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks extends React.Component<IconBaseProps> { }
+declare class MdLooks extends React.Component<IconBaseProps> { }
+export = MdLooks;
diff --git a/types/react-icons/lib/md/loop.d.ts b/types/react-icons/lib/md/loop.d.ts
index 8e7f90aad0..25cff2c482 100644
--- a/types/react-icons/lib/md/loop.d.ts
+++ b/types/react-icons/lib/md/loop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLoop extends React.Component<IconBaseProps> { }
+declare class MdLoop extends React.Component<IconBaseProps> { }
+export = MdLoop;
diff --git a/types/react-icons/lib/md/loupe.d.ts b/types/react-icons/lib/md/loupe.d.ts
index 8b7e0a54f1..dcae9325dd 100644
--- a/types/react-icons/lib/md/loupe.d.ts
+++ b/types/react-icons/lib/md/loupe.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLoupe extends React.Component<IconBaseProps> { }
+declare class MdLoupe extends React.Component<IconBaseProps> { }
+export = MdLoupe;
diff --git a/types/react-icons/lib/md/low-priority.d.ts b/types/react-icons/lib/md/low-priority.d.ts
index 61f7f79811..4b0e96dc96 100644
--- a/types/react-icons/lib/md/low-priority.d.ts
+++ b/types/react-icons/lib/md/low-priority.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLowPriority extends React.Component<IconBaseProps> { }
+declare class MdLowPriority extends React.Component<IconBaseProps> { }
+export = MdLowPriority;
diff --git a/types/react-icons/lib/md/loyalty.d.ts b/types/react-icons/lib/md/loyalty.d.ts
index de4ad7303f..86d7de9ec8 100644
--- a/types/react-icons/lib/md/loyalty.d.ts
+++ b/types/react-icons/lib/md/loyalty.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLoyalty extends React.Component<IconBaseProps> { }
+declare class MdLoyalty extends React.Component<IconBaseProps> { }
+export = MdLoyalty;
diff --git a/types/react-icons/lib/md/mail-outline.d.ts b/types/react-icons/lib/md/mail-outline.d.ts
index e2ea724b8c..7cc3fd16e0 100644
--- a/types/react-icons/lib/md/mail-outline.d.ts
+++ b/types/react-icons/lib/md/mail-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMailOutline extends React.Component<IconBaseProps> { }
+declare class MdMailOutline extends React.Component<IconBaseProps> { }
+export = MdMailOutline;
diff --git a/types/react-icons/lib/md/mail.d.ts b/types/react-icons/lib/md/mail.d.ts
index 4d6ae8563e..ffe42b4573 100644
--- a/types/react-icons/lib/md/mail.d.ts
+++ b/types/react-icons/lib/md/mail.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMail extends React.Component<IconBaseProps> { }
+declare class MdMail extends React.Component<IconBaseProps> { }
+export = MdMail;
diff --git a/types/react-icons/lib/md/map.d.ts b/types/react-icons/lib/md/map.d.ts
index e5199af23c..bf274d2db6 100644
--- a/types/react-icons/lib/md/map.d.ts
+++ b/types/react-icons/lib/md/map.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMap extends React.Component<IconBaseProps> { }
+declare class MdMap extends React.Component<IconBaseProps> { }
+export = MdMap;
diff --git a/types/react-icons/lib/md/markunread-mailbox.d.ts b/types/react-icons/lib/md/markunread-mailbox.d.ts
index ba5d9a5982..859f06a03b 100644
--- a/types/react-icons/lib/md/markunread-mailbox.d.ts
+++ b/types/react-icons/lib/md/markunread-mailbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMarkunreadMailbox extends React.Component<IconBaseProps> { }
+declare class MdMarkunreadMailbox extends React.Component<IconBaseProps> { }
+export = MdMarkunreadMailbox;
diff --git a/types/react-icons/lib/md/markunread.d.ts b/types/react-icons/lib/md/markunread.d.ts
index bcf1ac3569..f5783e684c 100644
--- a/types/react-icons/lib/md/markunread.d.ts
+++ b/types/react-icons/lib/md/markunread.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMarkunread extends React.Component<IconBaseProps> { }
+declare class MdMarkunread extends React.Component<IconBaseProps> { }
+export = MdMarkunread;
diff --git a/types/react-icons/lib/md/memory.d.ts b/types/react-icons/lib/md/memory.d.ts
index 507da2a21c..524f5bee0e 100644
--- a/types/react-icons/lib/md/memory.d.ts
+++ b/types/react-icons/lib/md/memory.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMemory extends React.Component<IconBaseProps> { }
+declare class MdMemory extends React.Component<IconBaseProps> { }
+export = MdMemory;
diff --git a/types/react-icons/lib/md/menu.d.ts b/types/react-icons/lib/md/menu.d.ts
index 8d71a1981f..dbd92ed628 100644
--- a/types/react-icons/lib/md/menu.d.ts
+++ b/types/react-icons/lib/md/menu.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMenu extends React.Component<IconBaseProps> { }
+declare class MdMenu extends React.Component<IconBaseProps> { }
+export = MdMenu;
diff --git a/types/react-icons/lib/md/merge-type.d.ts b/types/react-icons/lib/md/merge-type.d.ts
index 40e48a7b93..06a5eef508 100644
--- a/types/react-icons/lib/md/merge-type.d.ts
+++ b/types/react-icons/lib/md/merge-type.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMergeType extends React.Component<IconBaseProps> { }
+declare class MdMergeType extends React.Component<IconBaseProps> { }
+export = MdMergeType;
diff --git a/types/react-icons/lib/md/message.d.ts b/types/react-icons/lib/md/message.d.ts
index 64488ed66b..9eabdb10f3 100644
--- a/types/react-icons/lib/md/message.d.ts
+++ b/types/react-icons/lib/md/message.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMessage extends React.Component<IconBaseProps> { }
+declare class MdMessage extends React.Component<IconBaseProps> { }
+export = MdMessage;
diff --git a/types/react-icons/lib/md/mic-none.d.ts b/types/react-icons/lib/md/mic-none.d.ts
index 5b71761c02..1bab143d2d 100644
--- a/types/react-icons/lib/md/mic-none.d.ts
+++ b/types/react-icons/lib/md/mic-none.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMicNone extends React.Component<IconBaseProps> { }
+declare class MdMicNone extends React.Component<IconBaseProps> { }
+export = MdMicNone;
diff --git a/types/react-icons/lib/md/mic-off.d.ts b/types/react-icons/lib/md/mic-off.d.ts
index ce68ec3b85..edbe89b489 100644
--- a/types/react-icons/lib/md/mic-off.d.ts
+++ b/types/react-icons/lib/md/mic-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMicOff extends React.Component<IconBaseProps> { }
+declare class MdMicOff extends React.Component<IconBaseProps> { }
+export = MdMicOff;
diff --git a/types/react-icons/lib/md/mic.d.ts b/types/react-icons/lib/md/mic.d.ts
index e827c93aee..45380e54f7 100644
--- a/types/react-icons/lib/md/mic.d.ts
+++ b/types/react-icons/lib/md/mic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMic extends React.Component<IconBaseProps> { }
+declare class MdMic extends React.Component<IconBaseProps> { }
+export = MdMic;
diff --git a/types/react-icons/lib/md/mms.d.ts b/types/react-icons/lib/md/mms.d.ts
index dd4635435c..19571556ed 100644
--- a/types/react-icons/lib/md/mms.d.ts
+++ b/types/react-icons/lib/md/mms.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMms extends React.Component<IconBaseProps> { }
+declare class MdMms extends React.Component<IconBaseProps> { }
+export = MdMms;
diff --git a/types/react-icons/lib/md/mode-comment.d.ts b/types/react-icons/lib/md/mode-comment.d.ts
index 4e70e6a57e..31aa14d8af 100644
--- a/types/react-icons/lib/md/mode-comment.d.ts
+++ b/types/react-icons/lib/md/mode-comment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdModeComment extends React.Component<IconBaseProps> { }
+declare class MdModeComment extends React.Component<IconBaseProps> { }
+export = MdModeComment;
diff --git a/types/react-icons/lib/md/mode-edit.d.ts b/types/react-icons/lib/md/mode-edit.d.ts
index 8ba0f1809c..d5e2848413 100644
--- a/types/react-icons/lib/md/mode-edit.d.ts
+++ b/types/react-icons/lib/md/mode-edit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdModeEdit extends React.Component<IconBaseProps> { }
+declare class MdModeEdit extends React.Component<IconBaseProps> { }
+export = MdModeEdit;
diff --git a/types/react-icons/lib/md/monetization-on.d.ts b/types/react-icons/lib/md/monetization-on.d.ts
index 5fbac94cd6..2ee7832cb5 100644
--- a/types/react-icons/lib/md/monetization-on.d.ts
+++ b/types/react-icons/lib/md/monetization-on.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMonetizationOn extends React.Component<IconBaseProps> { }
+declare class MdMonetizationOn extends React.Component<IconBaseProps> { }
+export = MdMonetizationOn;
diff --git a/types/react-icons/lib/md/money-off.d.ts b/types/react-icons/lib/md/money-off.d.ts
index 682df0c9e9..545019237c 100644
--- a/types/react-icons/lib/md/money-off.d.ts
+++ b/types/react-icons/lib/md/money-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoneyOff extends React.Component<IconBaseProps> { }
+declare class MdMoneyOff extends React.Component<IconBaseProps> { }
+export = MdMoneyOff;
diff --git a/types/react-icons/lib/md/monochrome-photos.d.ts b/types/react-icons/lib/md/monochrome-photos.d.ts
index 57d0224d92..8e1ebae6c7 100644
--- a/types/react-icons/lib/md/monochrome-photos.d.ts
+++ b/types/react-icons/lib/md/monochrome-photos.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMonochromePhotos extends React.Component<IconBaseProps> { }
+declare class MdMonochromePhotos extends React.Component<IconBaseProps> { }
+export = MdMonochromePhotos;
diff --git a/types/react-icons/lib/md/mood-bad.d.ts b/types/react-icons/lib/md/mood-bad.d.ts
index 6cb4070c36..cd4dfc9cbb 100644
--- a/types/react-icons/lib/md/mood-bad.d.ts
+++ b/types/react-icons/lib/md/mood-bad.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoodBad extends React.Component<IconBaseProps> { }
+declare class MdMoodBad extends React.Component<IconBaseProps> { }
+export = MdMoodBad;
diff --git a/types/react-icons/lib/md/mood.d.ts b/types/react-icons/lib/md/mood.d.ts
index fd15fc4d9d..e2829392f6 100644
--- a/types/react-icons/lib/md/mood.d.ts
+++ b/types/react-icons/lib/md/mood.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMood extends React.Component<IconBaseProps> { }
+declare class MdMood extends React.Component<IconBaseProps> { }
+export = MdMood;
diff --git a/types/react-icons/lib/md/more-horiz.d.ts b/types/react-icons/lib/md/more-horiz.d.ts
index dd46d5526c..624b97c48d 100644
--- a/types/react-icons/lib/md/more-horiz.d.ts
+++ b/types/react-icons/lib/md/more-horiz.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoreHoriz extends React.Component<IconBaseProps> { }
+declare class MdMoreHoriz extends React.Component<IconBaseProps> { }
+export = MdMoreHoriz;
diff --git a/types/react-icons/lib/md/more-vert.d.ts b/types/react-icons/lib/md/more-vert.d.ts
index 9c1080b74a..4a77a45a48 100644
--- a/types/react-icons/lib/md/more-vert.d.ts
+++ b/types/react-icons/lib/md/more-vert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoreVert extends React.Component<IconBaseProps> { }
+declare class MdMoreVert extends React.Component<IconBaseProps> { }
+export = MdMoreVert;
diff --git a/types/react-icons/lib/md/more.d.ts b/types/react-icons/lib/md/more.d.ts
index 395fe8b215..c7f3e9c9b1 100644
--- a/types/react-icons/lib/md/more.d.ts
+++ b/types/react-icons/lib/md/more.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMore extends React.Component<IconBaseProps> { }
+declare class MdMore extends React.Component<IconBaseProps> { }
+export = MdMore;
diff --git a/types/react-icons/lib/md/motorcycle.d.ts b/types/react-icons/lib/md/motorcycle.d.ts
index b06e285368..e776752db9 100644
--- a/types/react-icons/lib/md/motorcycle.d.ts
+++ b/types/react-icons/lib/md/motorcycle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMotorcycle extends React.Component<IconBaseProps> { }
+declare class MdMotorcycle extends React.Component<IconBaseProps> { }
+export = MdMotorcycle;
diff --git a/types/react-icons/lib/md/mouse.d.ts b/types/react-icons/lib/md/mouse.d.ts
index 6b48389af1..e363947b09 100644
--- a/types/react-icons/lib/md/mouse.d.ts
+++ b/types/react-icons/lib/md/mouse.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMouse extends React.Component<IconBaseProps> { }
+declare class MdMouse extends React.Component<IconBaseProps> { }
+export = MdMouse;
diff --git a/types/react-icons/lib/md/move-to-inbox.d.ts b/types/react-icons/lib/md/move-to-inbox.d.ts
index 2723e6516e..12769c55d2 100644
--- a/types/react-icons/lib/md/move-to-inbox.d.ts
+++ b/types/react-icons/lib/md/move-to-inbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoveToInbox extends React.Component<IconBaseProps> { }
+declare class MdMoveToInbox extends React.Component<IconBaseProps> { }
+export = MdMoveToInbox;
diff --git a/types/react-icons/lib/md/movie-creation.d.ts b/types/react-icons/lib/md/movie-creation.d.ts
index 1e795092d6..75340b3585 100644
--- a/types/react-icons/lib/md/movie-creation.d.ts
+++ b/types/react-icons/lib/md/movie-creation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMovieCreation extends React.Component<IconBaseProps> { }
+declare class MdMovieCreation extends React.Component<IconBaseProps> { }
+export = MdMovieCreation;
diff --git a/types/react-icons/lib/md/movie-filter.d.ts b/types/react-icons/lib/md/movie-filter.d.ts
index 22da6198e8..3d66ee011e 100644
--- a/types/react-icons/lib/md/movie-filter.d.ts
+++ b/types/react-icons/lib/md/movie-filter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMovieFilter extends React.Component<IconBaseProps> { }
+declare class MdMovieFilter extends React.Component<IconBaseProps> { }
+export = MdMovieFilter;
diff --git a/types/react-icons/lib/md/movie.d.ts b/types/react-icons/lib/md/movie.d.ts
index 7982199452..d0f2567961 100644
--- a/types/react-icons/lib/md/movie.d.ts
+++ b/types/react-icons/lib/md/movie.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMovie extends React.Component<IconBaseProps> { }
+declare class MdMovie extends React.Component<IconBaseProps> { }
+export = MdMovie;
diff --git a/types/react-icons/lib/md/multiline-chart.d.ts b/types/react-icons/lib/md/multiline-chart.d.ts
index 03aba87bc1..9e1010373d 100644
--- a/types/react-icons/lib/md/multiline-chart.d.ts
+++ b/types/react-icons/lib/md/multiline-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMultilineChart extends React.Component<IconBaseProps> { }
+declare class MdMultilineChart extends React.Component<IconBaseProps> { }
+export = MdMultilineChart;
diff --git a/types/react-icons/lib/md/music-note.d.ts b/types/react-icons/lib/md/music-note.d.ts
index b3c161252e..0851c2f214 100644
--- a/types/react-icons/lib/md/music-note.d.ts
+++ b/types/react-icons/lib/md/music-note.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMusicNote extends React.Component<IconBaseProps> { }
+declare class MdMusicNote extends React.Component<IconBaseProps> { }
+export = MdMusicNote;
diff --git a/types/react-icons/lib/md/music-video.d.ts b/types/react-icons/lib/md/music-video.d.ts
index e7c4890596..45b5660c4a 100644
--- a/types/react-icons/lib/md/music-video.d.ts
+++ b/types/react-icons/lib/md/music-video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMusicVideo extends React.Component<IconBaseProps> { }
+declare class MdMusicVideo extends React.Component<IconBaseProps> { }
+export = MdMusicVideo;
diff --git a/types/react-icons/lib/md/my-location.d.ts b/types/react-icons/lib/md/my-location.d.ts
index e9e49e3638..1860b6ad49 100644
--- a/types/react-icons/lib/md/my-location.d.ts
+++ b/types/react-icons/lib/md/my-location.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMyLocation extends React.Component<IconBaseProps> { }
+declare class MdMyLocation extends React.Component<IconBaseProps> { }
+export = MdMyLocation;
diff --git a/types/react-icons/lib/md/nature-people.d.ts b/types/react-icons/lib/md/nature-people.d.ts
index 123a578eff..45f5c8625b 100644
--- a/types/react-icons/lib/md/nature-people.d.ts
+++ b/types/react-icons/lib/md/nature-people.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNaturePeople extends React.Component<IconBaseProps> { }
+declare class MdNaturePeople extends React.Component<IconBaseProps> { }
+export = MdNaturePeople;
diff --git a/types/react-icons/lib/md/nature.d.ts b/types/react-icons/lib/md/nature.d.ts
index 14b871e450..8391fd3e82 100644
--- a/types/react-icons/lib/md/nature.d.ts
+++ b/types/react-icons/lib/md/nature.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNature extends React.Component<IconBaseProps> { }
+declare class MdNature extends React.Component<IconBaseProps> { }
+export = MdNature;
diff --git a/types/react-icons/lib/md/navigate-before.d.ts b/types/react-icons/lib/md/navigate-before.d.ts
index e66fdc2c7b..d771c271f1 100644
--- a/types/react-icons/lib/md/navigate-before.d.ts
+++ b/types/react-icons/lib/md/navigate-before.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigateBefore extends React.Component<IconBaseProps> { }
+declare class MdNavigateBefore extends React.Component<IconBaseProps> { }
+export = MdNavigateBefore;
diff --git a/types/react-icons/lib/md/navigate-next.d.ts b/types/react-icons/lib/md/navigate-next.d.ts
index f39bad2270..96b04c5c81 100644
--- a/types/react-icons/lib/md/navigate-next.d.ts
+++ b/types/react-icons/lib/md/navigate-next.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigateNext extends React.Component<IconBaseProps> { }
+declare class MdNavigateNext extends React.Component<IconBaseProps> { }
+export = MdNavigateNext;
diff --git a/types/react-icons/lib/md/navigation.d.ts b/types/react-icons/lib/md/navigation.d.ts
index be44444790..b051ca0962 100644
--- a/types/react-icons/lib/md/navigation.d.ts
+++ b/types/react-icons/lib/md/navigation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigation extends React.Component<IconBaseProps> { }
+declare class MdNavigation extends React.Component<IconBaseProps> { }
+export = MdNavigation;
diff --git a/types/react-icons/lib/md/near-me.d.ts b/types/react-icons/lib/md/near-me.d.ts
index a1fe717c03..51fd95dad4 100644
--- a/types/react-icons/lib/md/near-me.d.ts
+++ b/types/react-icons/lib/md/near-me.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNearMe extends React.Component<IconBaseProps> { }
+declare class MdNearMe extends React.Component<IconBaseProps> { }
+export = MdNearMe;
diff --git a/types/react-icons/lib/md/network-cell.d.ts b/types/react-icons/lib/md/network-cell.d.ts
index 9dc116de65..6c87d7551b 100644
--- a/types/react-icons/lib/md/network-cell.d.ts
+++ b/types/react-icons/lib/md/network-cell.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkCell extends React.Component<IconBaseProps> { }
+declare class MdNetworkCell extends React.Component<IconBaseProps> { }
+export = MdNetworkCell;
diff --git a/types/react-icons/lib/md/network-check.d.ts b/types/react-icons/lib/md/network-check.d.ts
index 3497ab3224..5b50373fa4 100644
--- a/types/react-icons/lib/md/network-check.d.ts
+++ b/types/react-icons/lib/md/network-check.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkCheck extends React.Component<IconBaseProps> { }
+declare class MdNetworkCheck extends React.Component<IconBaseProps> { }
+export = MdNetworkCheck;
diff --git a/types/react-icons/lib/md/network-locked.d.ts b/types/react-icons/lib/md/network-locked.d.ts
index e7e66850e4..3cf0e3f075 100644
--- a/types/react-icons/lib/md/network-locked.d.ts
+++ b/types/react-icons/lib/md/network-locked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkLocked extends React.Component<IconBaseProps> { }
+declare class MdNetworkLocked extends React.Component<IconBaseProps> { }
+export = MdNetworkLocked;
diff --git a/types/react-icons/lib/md/network-wifi.d.ts b/types/react-icons/lib/md/network-wifi.d.ts
index 2c9097fc57..c4214d04eb 100644
--- a/types/react-icons/lib/md/network-wifi.d.ts
+++ b/types/react-icons/lib/md/network-wifi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkWifi extends React.Component<IconBaseProps> { }
+declare class MdNetworkWifi extends React.Component<IconBaseProps> { }
+export = MdNetworkWifi;
diff --git a/types/react-icons/lib/md/new-releases.d.ts b/types/react-icons/lib/md/new-releases.d.ts
index 4ff4c3e21f..2330eee139 100644
--- a/types/react-icons/lib/md/new-releases.d.ts
+++ b/types/react-icons/lib/md/new-releases.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNewReleases extends React.Component<IconBaseProps> { }
+declare class MdNewReleases extends React.Component<IconBaseProps> { }
+export = MdNewReleases;
diff --git a/types/react-icons/lib/md/next-week.d.ts b/types/react-icons/lib/md/next-week.d.ts
index 4754bfc5c5..7f9635e279 100644
--- a/types/react-icons/lib/md/next-week.d.ts
+++ b/types/react-icons/lib/md/next-week.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNextWeek extends React.Component<IconBaseProps> { }
+declare class MdNextWeek extends React.Component<IconBaseProps> { }
+export = MdNextWeek;
diff --git a/types/react-icons/lib/md/nfc.d.ts b/types/react-icons/lib/md/nfc.d.ts
index 521ad7fe89..646eab86f4 100644
--- a/types/react-icons/lib/md/nfc.d.ts
+++ b/types/react-icons/lib/md/nfc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNfc extends React.Component<IconBaseProps> { }
+declare class MdNfc extends React.Component<IconBaseProps> { }
+export = MdNfc;
diff --git a/types/react-icons/lib/md/no-encryption.d.ts b/types/react-icons/lib/md/no-encryption.d.ts
index 038f3eef3f..87ecaca4b9 100644
--- a/types/react-icons/lib/md/no-encryption.d.ts
+++ b/types/react-icons/lib/md/no-encryption.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNoEncryption extends React.Component<IconBaseProps> { }
+declare class MdNoEncryption extends React.Component<IconBaseProps> { }
+export = MdNoEncryption;
diff --git a/types/react-icons/lib/md/no-sim.d.ts b/types/react-icons/lib/md/no-sim.d.ts
index 09e6165201..5a0843d187 100644
--- a/types/react-icons/lib/md/no-sim.d.ts
+++ b/types/react-icons/lib/md/no-sim.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNoSim extends React.Component<IconBaseProps> { }
+declare class MdNoSim extends React.Component<IconBaseProps> { }
+export = MdNoSim;
diff --git a/types/react-icons/lib/md/not-interested.d.ts b/types/react-icons/lib/md/not-interested.d.ts
index a21c3ca574..4250465b0e 100644
--- a/types/react-icons/lib/md/not-interested.d.ts
+++ b/types/react-icons/lib/md/not-interested.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotInterested extends React.Component<IconBaseProps> { }
+declare class MdNotInterested extends React.Component<IconBaseProps> { }
+export = MdNotInterested;
diff --git a/types/react-icons/lib/md/note-add.d.ts b/types/react-icons/lib/md/note-add.d.ts
index 7673a94b3c..81ee86856d 100644
--- a/types/react-icons/lib/md/note-add.d.ts
+++ b/types/react-icons/lib/md/note-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNoteAdd extends React.Component<IconBaseProps> { }
+declare class MdNoteAdd extends React.Component<IconBaseProps> { }
+export = MdNoteAdd;
diff --git a/types/react-icons/lib/md/note.d.ts b/types/react-icons/lib/md/note.d.ts
index 757dfc63fc..59819344cf 100644
--- a/types/react-icons/lib/md/note.d.ts
+++ b/types/react-icons/lib/md/note.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNote extends React.Component<IconBaseProps> { }
+declare class MdNote extends React.Component<IconBaseProps> { }
+export = MdNote;
diff --git a/types/react-icons/lib/md/notifications-active.d.ts b/types/react-icons/lib/md/notifications-active.d.ts
index afb7f84483..1fe1c7709a 100644
--- a/types/react-icons/lib/md/notifications-active.d.ts
+++ b/types/react-icons/lib/md/notifications-active.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsActive extends React.Component<IconBaseProps> { }
+declare class MdNotificationsActive extends React.Component<IconBaseProps> { }
+export = MdNotificationsActive;
diff --git a/types/react-icons/lib/md/notifications-none.d.ts b/types/react-icons/lib/md/notifications-none.d.ts
index d1667a5307..734c103da7 100644
--- a/types/react-icons/lib/md/notifications-none.d.ts
+++ b/types/react-icons/lib/md/notifications-none.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsNone extends React.Component<IconBaseProps> { }
+declare class MdNotificationsNone extends React.Component<IconBaseProps> { }
+export = MdNotificationsNone;
diff --git a/types/react-icons/lib/md/notifications-off.d.ts b/types/react-icons/lib/md/notifications-off.d.ts
index ea413b9d5c..59946687a9 100644
--- a/types/react-icons/lib/md/notifications-off.d.ts
+++ b/types/react-icons/lib/md/notifications-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsOff extends React.Component<IconBaseProps> { }
+declare class MdNotificationsOff extends React.Component<IconBaseProps> { }
+export = MdNotificationsOff;
diff --git a/types/react-icons/lib/md/notifications-paused.d.ts b/types/react-icons/lib/md/notifications-paused.d.ts
index 7181f702a7..0eccf9bc7b 100644
--- a/types/react-icons/lib/md/notifications-paused.d.ts
+++ b/types/react-icons/lib/md/notifications-paused.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsPaused extends React.Component<IconBaseProps> { }
+declare class MdNotificationsPaused extends React.Component<IconBaseProps> { }
+export = MdNotificationsPaused;
diff --git a/types/react-icons/lib/md/notifications.d.ts b/types/react-icons/lib/md/notifications.d.ts
index 14de6c4b4e..2865d4e06a 100644
--- a/types/react-icons/lib/md/notifications.d.ts
+++ b/types/react-icons/lib/md/notifications.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotifications extends React.Component<IconBaseProps> { }
+declare class MdNotifications extends React.Component<IconBaseProps> { }
+export = MdNotifications;
diff --git a/types/react-icons/lib/md/now-wallpaper.d.ts b/types/react-icons/lib/md/now-wallpaper.d.ts
index 076ec5c4bf..ad64b79218 100644
--- a/types/react-icons/lib/md/now-wallpaper.d.ts
+++ b/types/react-icons/lib/md/now-wallpaper.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNowWallpaper extends React.Component<IconBaseProps> { }
+declare class MdNowWallpaper extends React.Component<IconBaseProps> { }
+export = MdNowWallpaper;
diff --git a/types/react-icons/lib/md/now-widgets.d.ts b/types/react-icons/lib/md/now-widgets.d.ts
index 0242391941..18e3df156c 100644
--- a/types/react-icons/lib/md/now-widgets.d.ts
+++ b/types/react-icons/lib/md/now-widgets.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNowWidgets extends React.Component<IconBaseProps> { }
+declare class MdNowWidgets extends React.Component<IconBaseProps> { }
+export = MdNowWidgets;
diff --git a/types/react-icons/lib/md/offline-pin.d.ts b/types/react-icons/lib/md/offline-pin.d.ts
index 0c691eb46c..46cd8199f9 100644
--- a/types/react-icons/lib/md/offline-pin.d.ts
+++ b/types/react-icons/lib/md/offline-pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOfflinePin extends React.Component<IconBaseProps> { }
+declare class MdOfflinePin extends React.Component<IconBaseProps> { }
+export = MdOfflinePin;
diff --git a/types/react-icons/lib/md/ondemand-video.d.ts b/types/react-icons/lib/md/ondemand-video.d.ts
index 2abd212bc0..dbf5b14687 100644
--- a/types/react-icons/lib/md/ondemand-video.d.ts
+++ b/types/react-icons/lib/md/ondemand-video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOndemandVideo extends React.Component<IconBaseProps> { }
+declare class MdOndemandVideo extends React.Component<IconBaseProps> { }
+export = MdOndemandVideo;
diff --git a/types/react-icons/lib/md/opacity.d.ts b/types/react-icons/lib/md/opacity.d.ts
index abf5830ea6..17bad8db6d 100644
--- a/types/react-icons/lib/md/opacity.d.ts
+++ b/types/react-icons/lib/md/opacity.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpacity extends React.Component<IconBaseProps> { }
+declare class MdOpacity extends React.Component<IconBaseProps> { }
+export = MdOpacity;
diff --git a/types/react-icons/lib/md/open-in-browser.d.ts b/types/react-icons/lib/md/open-in-browser.d.ts
index 52bb107a78..4e9b90b4da 100644
--- a/types/react-icons/lib/md/open-in-browser.d.ts
+++ b/types/react-icons/lib/md/open-in-browser.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenInBrowser extends React.Component<IconBaseProps> { }
+declare class MdOpenInBrowser extends React.Component<IconBaseProps> { }
+export = MdOpenInBrowser;
diff --git a/types/react-icons/lib/md/open-in-new.d.ts b/types/react-icons/lib/md/open-in-new.d.ts
index c9cdd9711c..0a82b41b5a 100644
--- a/types/react-icons/lib/md/open-in-new.d.ts
+++ b/types/react-icons/lib/md/open-in-new.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenInNew extends React.Component<IconBaseProps> { }
+declare class MdOpenInNew extends React.Component<IconBaseProps> { }
+export = MdOpenInNew;
diff --git a/types/react-icons/lib/md/open-with.d.ts b/types/react-icons/lib/md/open-with.d.ts
index 400d1e0deb..fbb6f98852 100644
--- a/types/react-icons/lib/md/open-with.d.ts
+++ b/types/react-icons/lib/md/open-with.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenWith extends React.Component<IconBaseProps> { }
+declare class MdOpenWith extends React.Component<IconBaseProps> { }
+export = MdOpenWith;
diff --git a/types/react-icons/lib/md/pages.d.ts b/types/react-icons/lib/md/pages.d.ts
index 6a156250cc..c26e324fb2 100644
--- a/types/react-icons/lib/md/pages.d.ts
+++ b/types/react-icons/lib/md/pages.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPages extends React.Component<IconBaseProps> { }
+declare class MdPages extends React.Component<IconBaseProps> { }
+export = MdPages;
diff --git a/types/react-icons/lib/md/pageview.d.ts b/types/react-icons/lib/md/pageview.d.ts
index f69c0ee9f2..3db2826beb 100644
--- a/types/react-icons/lib/md/pageview.d.ts
+++ b/types/react-icons/lib/md/pageview.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPageview extends React.Component<IconBaseProps> { }
+declare class MdPageview extends React.Component<IconBaseProps> { }
+export = MdPageview;
diff --git a/types/react-icons/lib/md/palette.d.ts b/types/react-icons/lib/md/palette.d.ts
index 823c529566..eddc488804 100644
--- a/types/react-icons/lib/md/palette.d.ts
+++ b/types/react-icons/lib/md/palette.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPalette extends React.Component<IconBaseProps> { }
+declare class MdPalette extends React.Component<IconBaseProps> { }
+export = MdPalette;
diff --git a/types/react-icons/lib/md/pan-tool.d.ts b/types/react-icons/lib/md/pan-tool.d.ts
index b208116369..cd89c9e107 100644
--- a/types/react-icons/lib/md/pan-tool.d.ts
+++ b/types/react-icons/lib/md/pan-tool.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanTool extends React.Component<IconBaseProps> { }
+declare class MdPanTool extends React.Component<IconBaseProps> { }
+export = MdPanTool;
diff --git a/types/react-icons/lib/md/panorama-fish-eye.d.ts b/types/react-icons/lib/md/panorama-fish-eye.d.ts
index 29420599ae..845e5ec82c 100644
--- a/types/react-icons/lib/md/panorama-fish-eye.d.ts
+++ b/types/react-icons/lib/md/panorama-fish-eye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaFishEye extends React.Component<IconBaseProps> { }
+declare class MdPanoramaFishEye extends React.Component<IconBaseProps> { }
+export = MdPanoramaFishEye;
diff --git a/types/react-icons/lib/md/panorama-horizontal.d.ts b/types/react-icons/lib/md/panorama-horizontal.d.ts
index 201fb72074..c042c5465f 100644
--- a/types/react-icons/lib/md/panorama-horizontal.d.ts
+++ b/types/react-icons/lib/md/panorama-horizontal.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaHorizontal extends React.Component<IconBaseProps> { }
+declare class MdPanoramaHorizontal extends React.Component<IconBaseProps> { }
+export = MdPanoramaHorizontal;
diff --git a/types/react-icons/lib/md/panorama-vertical.d.ts b/types/react-icons/lib/md/panorama-vertical.d.ts
index 460041e27d..23e9930176 100644
--- a/types/react-icons/lib/md/panorama-vertical.d.ts
+++ b/types/react-icons/lib/md/panorama-vertical.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaVertical extends React.Component<IconBaseProps> { }
+declare class MdPanoramaVertical extends React.Component<IconBaseProps> { }
+export = MdPanoramaVertical;
diff --git a/types/react-icons/lib/md/panorama-wide-angle.d.ts b/types/react-icons/lib/md/panorama-wide-angle.d.ts
index 58bf2f6a41..4a203d1626 100644
--- a/types/react-icons/lib/md/panorama-wide-angle.d.ts
+++ b/types/react-icons/lib/md/panorama-wide-angle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaWideAngle extends React.Component<IconBaseProps> { }
+declare class MdPanoramaWideAngle extends React.Component<IconBaseProps> { }
+export = MdPanoramaWideAngle;
diff --git a/types/react-icons/lib/md/panorama.d.ts b/types/react-icons/lib/md/panorama.d.ts
index ce2631733d..bd3a7cbd25 100644
--- a/types/react-icons/lib/md/panorama.d.ts
+++ b/types/react-icons/lib/md/panorama.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanorama extends React.Component<IconBaseProps> { }
+declare class MdPanorama extends React.Component<IconBaseProps> { }
+export = MdPanorama;
diff --git a/types/react-icons/lib/md/party-mode.d.ts b/types/react-icons/lib/md/party-mode.d.ts
index 61270bf1f0..83b53cea69 100644
--- a/types/react-icons/lib/md/party-mode.d.ts
+++ b/types/react-icons/lib/md/party-mode.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPartyMode extends React.Component<IconBaseProps> { }
+declare class MdPartyMode extends React.Component<IconBaseProps> { }
+export = MdPartyMode;
diff --git a/types/react-icons/lib/md/pause-circle-filled.d.ts b/types/react-icons/lib/md/pause-circle-filled.d.ts
index 8dcc944037..80d0552c2a 100644
--- a/types/react-icons/lib/md/pause-circle-filled.d.ts
+++ b/types/react-icons/lib/md/pause-circle-filled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPauseCircleFilled extends React.Component<IconBaseProps> { }
+declare class MdPauseCircleFilled extends React.Component<IconBaseProps> { }
+export = MdPauseCircleFilled;
diff --git a/types/react-icons/lib/md/pause-circle-outline.d.ts b/types/react-icons/lib/md/pause-circle-outline.d.ts
index c694731521..a7b9df4756 100644
--- a/types/react-icons/lib/md/pause-circle-outline.d.ts
+++ b/types/react-icons/lib/md/pause-circle-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPauseCircleOutline extends React.Component<IconBaseProps> { }
+declare class MdPauseCircleOutline extends React.Component<IconBaseProps> { }
+export = MdPauseCircleOutline;
diff --git a/types/react-icons/lib/md/pause.d.ts b/types/react-icons/lib/md/pause.d.ts
index 29d68353f7..07da37dbc0 100644
--- a/types/react-icons/lib/md/pause.d.ts
+++ b/types/react-icons/lib/md/pause.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPause extends React.Component<IconBaseProps> { }
+declare class MdPause extends React.Component<IconBaseProps> { }
+export = MdPause;
diff --git a/types/react-icons/lib/md/payment.d.ts b/types/react-icons/lib/md/payment.d.ts
index bd2439d38c..62761620a7 100644
--- a/types/react-icons/lib/md/payment.d.ts
+++ b/types/react-icons/lib/md/payment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPayment extends React.Component<IconBaseProps> { }
+declare class MdPayment extends React.Component<IconBaseProps> { }
+export = MdPayment;
diff --git a/types/react-icons/lib/md/people-outline.d.ts b/types/react-icons/lib/md/people-outline.d.ts
index 88a012742e..9285016a5f 100644
--- a/types/react-icons/lib/md/people-outline.d.ts
+++ b/types/react-icons/lib/md/people-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPeopleOutline extends React.Component<IconBaseProps> { }
+declare class MdPeopleOutline extends React.Component<IconBaseProps> { }
+export = MdPeopleOutline;
diff --git a/types/react-icons/lib/md/people.d.ts b/types/react-icons/lib/md/people.d.ts
index 75f9cbfe7e..5e256d4d2c 100644
--- a/types/react-icons/lib/md/people.d.ts
+++ b/types/react-icons/lib/md/people.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPeople extends React.Component<IconBaseProps> { }
+declare class MdPeople extends React.Component<IconBaseProps> { }
+export = MdPeople;
diff --git a/types/react-icons/lib/md/perm-camera-mic.d.ts b/types/react-icons/lib/md/perm-camera-mic.d.ts
index a17acb8788..fc2b9d15bc 100644
--- a/types/react-icons/lib/md/perm-camera-mic.d.ts
+++ b/types/react-icons/lib/md/perm-camera-mic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermCameraMic extends React.Component<IconBaseProps> { }
+declare class MdPermCameraMic extends React.Component<IconBaseProps> { }
+export = MdPermCameraMic;
diff --git a/types/react-icons/lib/md/perm-contact-calendar.d.ts b/types/react-icons/lib/md/perm-contact-calendar.d.ts
index 3b2105a7cf..f107c8a8b9 100644
--- a/types/react-icons/lib/md/perm-contact-calendar.d.ts
+++ b/types/react-icons/lib/md/perm-contact-calendar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermContactCalendar extends React.Component<IconBaseProps> { }
+declare class MdPermContactCalendar extends React.Component<IconBaseProps> { }
+export = MdPermContactCalendar;
diff --git a/types/react-icons/lib/md/perm-data-setting.d.ts b/types/react-icons/lib/md/perm-data-setting.d.ts
index 18d108d14f..eb93566fad 100644
--- a/types/react-icons/lib/md/perm-data-setting.d.ts
+++ b/types/react-icons/lib/md/perm-data-setting.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermDataSetting extends React.Component<IconBaseProps> { }
+declare class MdPermDataSetting extends React.Component<IconBaseProps> { }
+export = MdPermDataSetting;
diff --git a/types/react-icons/lib/md/perm-device-information.d.ts b/types/react-icons/lib/md/perm-device-information.d.ts
index db2dfcc07b..8b12c216aa 100644
--- a/types/react-icons/lib/md/perm-device-information.d.ts
+++ b/types/react-icons/lib/md/perm-device-information.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermDeviceInformation extends React.Component<IconBaseProps> { }
+declare class MdPermDeviceInformation extends React.Component<IconBaseProps> { }
+export = MdPermDeviceInformation;
diff --git a/types/react-icons/lib/md/perm-identity.d.ts b/types/react-icons/lib/md/perm-identity.d.ts
index d56d0b3c37..c3df601924 100644
--- a/types/react-icons/lib/md/perm-identity.d.ts
+++ b/types/react-icons/lib/md/perm-identity.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermIdentity extends React.Component<IconBaseProps> { }
+declare class MdPermIdentity extends React.Component<IconBaseProps> { }
+export = MdPermIdentity;
diff --git a/types/react-icons/lib/md/perm-media.d.ts b/types/react-icons/lib/md/perm-media.d.ts
index 36f4bee6a7..cfe25c2672 100644
--- a/types/react-icons/lib/md/perm-media.d.ts
+++ b/types/react-icons/lib/md/perm-media.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermMedia extends React.Component<IconBaseProps> { }
+declare class MdPermMedia extends React.Component<IconBaseProps> { }
+export = MdPermMedia;
diff --git a/types/react-icons/lib/md/perm-phone-msg.d.ts b/types/react-icons/lib/md/perm-phone-msg.d.ts
index 6352e415a6..fca1fb5d82 100644
--- a/types/react-icons/lib/md/perm-phone-msg.d.ts
+++ b/types/react-icons/lib/md/perm-phone-msg.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermPhoneMsg extends React.Component<IconBaseProps> { }
+declare class MdPermPhoneMsg extends React.Component<IconBaseProps> { }
+export = MdPermPhoneMsg;
diff --git a/types/react-icons/lib/md/perm-scan-wifi.d.ts b/types/react-icons/lib/md/perm-scan-wifi.d.ts
index 20bb1186e4..dd857bfc75 100644
--- a/types/react-icons/lib/md/perm-scan-wifi.d.ts
+++ b/types/react-icons/lib/md/perm-scan-wifi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermScanWifi extends React.Component<IconBaseProps> { }
+declare class MdPermScanWifi extends React.Component<IconBaseProps> { }
+export = MdPermScanWifi;
diff --git a/types/react-icons/lib/md/person-add.d.ts b/types/react-icons/lib/md/person-add.d.ts
index 12887556b7..05c41837f4 100644
--- a/types/react-icons/lib/md/person-add.d.ts
+++ b/types/react-icons/lib/md/person-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonAdd extends React.Component<IconBaseProps> { }
+declare class MdPersonAdd extends React.Component<IconBaseProps> { }
+export = MdPersonAdd;
diff --git a/types/react-icons/lib/md/person-outline.d.ts b/types/react-icons/lib/md/person-outline.d.ts
index fe49015f3f..4b0e0859c8 100644
--- a/types/react-icons/lib/md/person-outline.d.ts
+++ b/types/react-icons/lib/md/person-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonOutline extends React.Component<IconBaseProps> { }
+declare class MdPersonOutline extends React.Component<IconBaseProps> { }
+export = MdPersonOutline;
diff --git a/types/react-icons/lib/md/person-pin-circle.d.ts b/types/react-icons/lib/md/person-pin-circle.d.ts
index a26c822211..7e463591c4 100644
--- a/types/react-icons/lib/md/person-pin-circle.d.ts
+++ b/types/react-icons/lib/md/person-pin-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonPinCircle extends React.Component<IconBaseProps> { }
+declare class MdPersonPinCircle extends React.Component<IconBaseProps> { }
+export = MdPersonPinCircle;
diff --git a/types/react-icons/lib/md/person-pin.d.ts b/types/react-icons/lib/md/person-pin.d.ts
index ab1aa735eb..5731a64ba2 100644
--- a/types/react-icons/lib/md/person-pin.d.ts
+++ b/types/react-icons/lib/md/person-pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonPin extends React.Component<IconBaseProps> { }
+declare class MdPersonPin extends React.Component<IconBaseProps> { }
+export = MdPersonPin;
diff --git a/types/react-icons/lib/md/person.d.ts b/types/react-icons/lib/md/person.d.ts
index bcae2bbac8..bbaaad66da 100644
--- a/types/react-icons/lib/md/person.d.ts
+++ b/types/react-icons/lib/md/person.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPerson extends React.Component<IconBaseProps> { }
+declare class MdPerson extends React.Component<IconBaseProps> { }
+export = MdPerson;
diff --git a/types/react-icons/lib/md/personal-video.d.ts b/types/react-icons/lib/md/personal-video.d.ts
index 0fece81d04..f49fb640d1 100644
--- a/types/react-icons/lib/md/personal-video.d.ts
+++ b/types/react-icons/lib/md/personal-video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonalVideo extends React.Component<IconBaseProps> { }
+declare class MdPersonalVideo extends React.Component<IconBaseProps> { }
+export = MdPersonalVideo;
diff --git a/types/react-icons/lib/md/pets.d.ts b/types/react-icons/lib/md/pets.d.ts
index 94bc0005e8..4c9793a129 100644
--- a/types/react-icons/lib/md/pets.d.ts
+++ b/types/react-icons/lib/md/pets.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPets extends React.Component<IconBaseProps> { }
+declare class MdPets extends React.Component<IconBaseProps> { }
+export = MdPets;
diff --git a/types/react-icons/lib/md/phone-android.d.ts b/types/react-icons/lib/md/phone-android.d.ts
index aa43921b51..30c4db75e6 100644
--- a/types/react-icons/lib/md/phone-android.d.ts
+++ b/types/react-icons/lib/md/phone-android.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneAndroid extends React.Component<IconBaseProps> { }
+declare class MdPhoneAndroid extends React.Component<IconBaseProps> { }
+export = MdPhoneAndroid;
diff --git a/types/react-icons/lib/md/phone-bluetooth-speaker.d.ts b/types/react-icons/lib/md/phone-bluetooth-speaker.d.ts
index 08e2cd6791..be75f447df 100644
--- a/types/react-icons/lib/md/phone-bluetooth-speaker.d.ts
+++ b/types/react-icons/lib/md/phone-bluetooth-speaker.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneBluetoothSpeaker extends React.Component<IconBaseProps> { }
+declare class MdPhoneBluetoothSpeaker extends React.Component<IconBaseProps> { }
+export = MdPhoneBluetoothSpeaker;
diff --git a/types/react-icons/lib/md/phone-forwarded.d.ts b/types/react-icons/lib/md/phone-forwarded.d.ts
index 8363d7e3ec..caeb337723 100644
--- a/types/react-icons/lib/md/phone-forwarded.d.ts
+++ b/types/react-icons/lib/md/phone-forwarded.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneForwarded extends React.Component<IconBaseProps> { }
+declare class MdPhoneForwarded extends React.Component<IconBaseProps> { }
+export = MdPhoneForwarded;
diff --git a/types/react-icons/lib/md/phone-in-talk.d.ts b/types/react-icons/lib/md/phone-in-talk.d.ts
index 430f87b4e4..439fe99a45 100644
--- a/types/react-icons/lib/md/phone-in-talk.d.ts
+++ b/types/react-icons/lib/md/phone-in-talk.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneInTalk extends React.Component<IconBaseProps> { }
+declare class MdPhoneInTalk extends React.Component<IconBaseProps> { }
+export = MdPhoneInTalk;
diff --git a/types/react-icons/lib/md/phone-iphone.d.ts b/types/react-icons/lib/md/phone-iphone.d.ts
index 8704ae8ad4..5a42b35412 100644
--- a/types/react-icons/lib/md/phone-iphone.d.ts
+++ b/types/react-icons/lib/md/phone-iphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneIphone extends React.Component<IconBaseProps> { }
+declare class MdPhoneIphone extends React.Component<IconBaseProps> { }
+export = MdPhoneIphone;
diff --git a/types/react-icons/lib/md/phone-locked.d.ts b/types/react-icons/lib/md/phone-locked.d.ts
index 68ca6e9376..df4bdb68e0 100644
--- a/types/react-icons/lib/md/phone-locked.d.ts
+++ b/types/react-icons/lib/md/phone-locked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneLocked extends React.Component<IconBaseProps> { }
+declare class MdPhoneLocked extends React.Component<IconBaseProps> { }
+export = MdPhoneLocked;
diff --git a/types/react-icons/lib/md/phone-missed.d.ts b/types/react-icons/lib/md/phone-missed.d.ts
index 91b97ca8e9..57f48c1817 100644
--- a/types/react-icons/lib/md/phone-missed.d.ts
+++ b/types/react-icons/lib/md/phone-missed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneMissed extends React.Component<IconBaseProps> { }
+declare class MdPhoneMissed extends React.Component<IconBaseProps> { }
+export = MdPhoneMissed;
diff --git a/types/react-icons/lib/md/phone-paused.d.ts b/types/react-icons/lib/md/phone-paused.d.ts
index ba3f998fd8..fded3f9a42 100644
--- a/types/react-icons/lib/md/phone-paused.d.ts
+++ b/types/react-icons/lib/md/phone-paused.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonePaused extends React.Component<IconBaseProps> { }
+declare class MdPhonePaused extends React.Component<IconBaseProps> { }
+export = MdPhonePaused;
diff --git a/types/react-icons/lib/md/phone.d.ts b/types/react-icons/lib/md/phone.d.ts
index 6318cdc39d..e5634b5d20 100644
--- a/types/react-icons/lib/md/phone.d.ts
+++ b/types/react-icons/lib/md/phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhone extends React.Component<IconBaseProps> { }
+declare class MdPhone extends React.Component<IconBaseProps> { }
+export = MdPhone;
diff --git a/types/react-icons/lib/md/phonelink-erase.d.ts b/types/react-icons/lib/md/phonelink-erase.d.ts
index b0cbec1c39..33787bbd4b 100644
--- a/types/react-icons/lib/md/phonelink-erase.d.ts
+++ b/types/react-icons/lib/md/phonelink-erase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkErase extends React.Component<IconBaseProps> { }
+declare class MdPhonelinkErase extends React.Component<IconBaseProps> { }
+export = MdPhonelinkErase;
diff --git a/types/react-icons/lib/md/phonelink-lock.d.ts b/types/react-icons/lib/md/phonelink-lock.d.ts
index 5bb479ddc0..81d84f10ee 100644
--- a/types/react-icons/lib/md/phonelink-lock.d.ts
+++ b/types/react-icons/lib/md/phonelink-lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkLock extends React.Component<IconBaseProps> { }
+declare class MdPhonelinkLock extends React.Component<IconBaseProps> { }
+export = MdPhonelinkLock;
diff --git a/types/react-icons/lib/md/phonelink-off.d.ts b/types/react-icons/lib/md/phonelink-off.d.ts
index ec245ecd6f..eb8044dcca 100644
--- a/types/react-icons/lib/md/phonelink-off.d.ts
+++ b/types/react-icons/lib/md/phonelink-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkOff extends React.Component<IconBaseProps> { }
+declare class MdPhonelinkOff extends React.Component<IconBaseProps> { }
+export = MdPhonelinkOff;
diff --git a/types/react-icons/lib/md/phonelink-ring.d.ts b/types/react-icons/lib/md/phonelink-ring.d.ts
index f14d93a479..fb4829eef1 100644
--- a/types/react-icons/lib/md/phonelink-ring.d.ts
+++ b/types/react-icons/lib/md/phonelink-ring.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkRing extends React.Component<IconBaseProps> { }
+declare class MdPhonelinkRing extends React.Component<IconBaseProps> { }
+export = MdPhonelinkRing;
diff --git a/types/react-icons/lib/md/phonelink-setup.d.ts b/types/react-icons/lib/md/phonelink-setup.d.ts
index dd21188bb5..0546b0f910 100644
--- a/types/react-icons/lib/md/phonelink-setup.d.ts
+++ b/types/react-icons/lib/md/phonelink-setup.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkSetup extends React.Component<IconBaseProps> { }
+declare class MdPhonelinkSetup extends React.Component<IconBaseProps> { }
+export = MdPhonelinkSetup;
diff --git a/types/react-icons/lib/md/phonelink.d.ts b/types/react-icons/lib/md/phonelink.d.ts
index 6aa5af39d7..16653325b1 100644
--- a/types/react-icons/lib/md/phonelink.d.ts
+++ b/types/react-icons/lib/md/phonelink.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelink extends React.Component<IconBaseProps> { }
+declare class MdPhonelink extends React.Component<IconBaseProps> { }
+export = MdPhonelink;
diff --git a/types/react-icons/lib/md/photo-album.d.ts b/types/react-icons/lib/md/photo-album.d.ts
index 116f8b1ff6..dc21ce961f 100644
--- a/types/react-icons/lib/md/photo-album.d.ts
+++ b/types/react-icons/lib/md/photo-album.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoAlbum extends React.Component<IconBaseProps> { }
+declare class MdPhotoAlbum extends React.Component<IconBaseProps> { }
+export = MdPhotoAlbum;
diff --git a/types/react-icons/lib/md/photo-camera.d.ts b/types/react-icons/lib/md/photo-camera.d.ts
index 9ca8814377..01afdf9bc8 100644
--- a/types/react-icons/lib/md/photo-camera.d.ts
+++ b/types/react-icons/lib/md/photo-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoCamera extends React.Component<IconBaseProps> { }
+declare class MdPhotoCamera extends React.Component<IconBaseProps> { }
+export = MdPhotoCamera;
diff --git a/types/react-icons/lib/md/photo-filter.d.ts b/types/react-icons/lib/md/photo-filter.d.ts
index e2b37a4b91..994d10d5e5 100644
--- a/types/react-icons/lib/md/photo-filter.d.ts
+++ b/types/react-icons/lib/md/photo-filter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoFilter extends React.Component<IconBaseProps> { }
+declare class MdPhotoFilter extends React.Component<IconBaseProps> { }
+export = MdPhotoFilter;
diff --git a/types/react-icons/lib/md/photo-library.d.ts b/types/react-icons/lib/md/photo-library.d.ts
index 3ec4c29cac..18f6c5a756 100644
--- a/types/react-icons/lib/md/photo-library.d.ts
+++ b/types/react-icons/lib/md/photo-library.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoLibrary extends React.Component<IconBaseProps> { }
+declare class MdPhotoLibrary extends React.Component<IconBaseProps> { }
+export = MdPhotoLibrary;
diff --git a/types/react-icons/lib/md/photo-size-select-actual.d.ts b/types/react-icons/lib/md/photo-size-select-actual.d.ts
index 15e1777cf0..d2c24264f7 100644
--- a/types/react-icons/lib/md/photo-size-select-actual.d.ts
+++ b/types/react-icons/lib/md/photo-size-select-actual.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectActual extends React.Component<IconBaseProps> { }
+declare class MdPhotoSizeSelectActual extends React.Component<IconBaseProps> { }
+export = MdPhotoSizeSelectActual;
diff --git a/types/react-icons/lib/md/photo-size-select-large.d.ts b/types/react-icons/lib/md/photo-size-select-large.d.ts
index 56025586af..d468535f85 100644
--- a/types/react-icons/lib/md/photo-size-select-large.d.ts
+++ b/types/react-icons/lib/md/photo-size-select-large.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectLarge extends React.Component<IconBaseProps> { }
+declare class MdPhotoSizeSelectLarge extends React.Component<IconBaseProps> { }
+export = MdPhotoSizeSelectLarge;
diff --git a/types/react-icons/lib/md/photo-size-select-small.d.ts b/types/react-icons/lib/md/photo-size-select-small.d.ts
index f1a2547ff6..88d3b699eb 100644
--- a/types/react-icons/lib/md/photo-size-select-small.d.ts
+++ b/types/react-icons/lib/md/photo-size-select-small.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectSmall extends React.Component<IconBaseProps> { }
+declare class MdPhotoSizeSelectSmall extends React.Component<IconBaseProps> { }
+export = MdPhotoSizeSelectSmall;
diff --git a/types/react-icons/lib/md/photo.d.ts b/types/react-icons/lib/md/photo.d.ts
index 3af5e8d6b9..7b6a50c063 100644
--- a/types/react-icons/lib/md/photo.d.ts
+++ b/types/react-icons/lib/md/photo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoto extends React.Component<IconBaseProps> { }
+declare class MdPhoto extends React.Component<IconBaseProps> { }
+export = MdPhoto;
diff --git a/types/react-icons/lib/md/picture-as-pdf.d.ts b/types/react-icons/lib/md/picture-as-pdf.d.ts
index 06fd1dfb31..f771b781f3 100644
--- a/types/react-icons/lib/md/picture-as-pdf.d.ts
+++ b/types/react-icons/lib/md/picture-as-pdf.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureAsPdf extends React.Component<IconBaseProps> { }
+declare class MdPictureAsPdf extends React.Component<IconBaseProps> { }
+export = MdPictureAsPdf;
diff --git a/types/react-icons/lib/md/picture-in-picture-alt.d.ts b/types/react-icons/lib/md/picture-in-picture-alt.d.ts
index 41a6b03404..706766c7ee 100644
--- a/types/react-icons/lib/md/picture-in-picture-alt.d.ts
+++ b/types/react-icons/lib/md/picture-in-picture-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureInPictureAlt extends React.Component<IconBaseProps> { }
+declare class MdPictureInPictureAlt extends React.Component<IconBaseProps> { }
+export = MdPictureInPictureAlt;
diff --git a/types/react-icons/lib/md/picture-in-picture.d.ts b/types/react-icons/lib/md/picture-in-picture.d.ts
index e174bddfd7..fd928d0435 100644
--- a/types/react-icons/lib/md/picture-in-picture.d.ts
+++ b/types/react-icons/lib/md/picture-in-picture.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureInPicture extends React.Component<IconBaseProps> { }
+declare class MdPictureInPicture extends React.Component<IconBaseProps> { }
+export = MdPictureInPicture;
diff --git a/types/react-icons/lib/md/pie-chart-outlined.d.ts b/types/react-icons/lib/md/pie-chart-outlined.d.ts
index 8fdaa68aee..d6124faded 100644
--- a/types/react-icons/lib/md/pie-chart-outlined.d.ts
+++ b/types/react-icons/lib/md/pie-chart-outlined.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPieChartOutlined extends React.Component<IconBaseProps> { }
+declare class MdPieChartOutlined extends React.Component<IconBaseProps> { }
+export = MdPieChartOutlined;
diff --git a/types/react-icons/lib/md/pie-chart.d.ts b/types/react-icons/lib/md/pie-chart.d.ts
index bf0203c4d9..8f7d291715 100644
--- a/types/react-icons/lib/md/pie-chart.d.ts
+++ b/types/react-icons/lib/md/pie-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPieChart extends React.Component<IconBaseProps> { }
+declare class MdPieChart extends React.Component<IconBaseProps> { }
+export = MdPieChart;
diff --git a/types/react-icons/lib/md/pin-drop.d.ts b/types/react-icons/lib/md/pin-drop.d.ts
index b1511912aa..8f05678916 100644
--- a/types/react-icons/lib/md/pin-drop.d.ts
+++ b/types/react-icons/lib/md/pin-drop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPinDrop extends React.Component<IconBaseProps> { }
+declare class MdPinDrop extends React.Component<IconBaseProps> { }
+export = MdPinDrop;
diff --git a/types/react-icons/lib/md/place.d.ts b/types/react-icons/lib/md/place.d.ts
index 6e7bc9f83d..dd5c14c216 100644
--- a/types/react-icons/lib/md/place.d.ts
+++ b/types/react-icons/lib/md/place.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlace extends React.Component<IconBaseProps> { }
+declare class MdPlace extends React.Component<IconBaseProps> { }
+export = MdPlace;
diff --git a/types/react-icons/lib/md/play-arrow.d.ts b/types/react-icons/lib/md/play-arrow.d.ts
index 34eeedbfc9..7327a2b319 100644
--- a/types/react-icons/lib/md/play-arrow.d.ts
+++ b/types/react-icons/lib/md/play-arrow.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayArrow extends React.Component<IconBaseProps> { }
+declare class MdPlayArrow extends React.Component<IconBaseProps> { }
+export = MdPlayArrow;
diff --git a/types/react-icons/lib/md/play-circle-filled.d.ts b/types/react-icons/lib/md/play-circle-filled.d.ts
index a952747a1f..6a7ba9bf9c 100644
--- a/types/react-icons/lib/md/play-circle-filled.d.ts
+++ b/types/react-icons/lib/md/play-circle-filled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayCircleFilled extends React.Component<IconBaseProps> { }
+declare class MdPlayCircleFilled extends React.Component<IconBaseProps> { }
+export = MdPlayCircleFilled;
diff --git a/types/react-icons/lib/md/play-circle-outline.d.ts b/types/react-icons/lib/md/play-circle-outline.d.ts
index e75083c2f3..6ebd23b062 100644
--- a/types/react-icons/lib/md/play-circle-outline.d.ts
+++ b/types/react-icons/lib/md/play-circle-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayCircleOutline extends React.Component<IconBaseProps> { }
+declare class MdPlayCircleOutline extends React.Component<IconBaseProps> { }
+export = MdPlayCircleOutline;
diff --git a/types/react-icons/lib/md/play-for-work.d.ts b/types/react-icons/lib/md/play-for-work.d.ts
index 4bb94a94b0..f0873e86fa 100644
--- a/types/react-icons/lib/md/play-for-work.d.ts
+++ b/types/react-icons/lib/md/play-for-work.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayForWork extends React.Component<IconBaseProps> { }
+declare class MdPlayForWork extends React.Component<IconBaseProps> { }
+export = MdPlayForWork;
diff --git a/types/react-icons/lib/md/playlist-add-check.d.ts b/types/react-icons/lib/md/playlist-add-check.d.ts
index 6b71a3b8c0..c22eb478a0 100644
--- a/types/react-icons/lib/md/playlist-add-check.d.ts
+++ b/types/react-icons/lib/md/playlist-add-check.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistAddCheck extends React.Component<IconBaseProps> { }
+declare class MdPlaylistAddCheck extends React.Component<IconBaseProps> { }
+export = MdPlaylistAddCheck;
diff --git a/types/react-icons/lib/md/playlist-add.d.ts b/types/react-icons/lib/md/playlist-add.d.ts
index 6cd4bf46e6..78bd803be2 100644
--- a/types/react-icons/lib/md/playlist-add.d.ts
+++ b/types/react-icons/lib/md/playlist-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistAdd extends React.Component<IconBaseProps> { }
+declare class MdPlaylistAdd extends React.Component<IconBaseProps> { }
+export = MdPlaylistAdd;
diff --git a/types/react-icons/lib/md/playlist-play.d.ts b/types/react-icons/lib/md/playlist-play.d.ts
index 1bbf520f44..06dea405bc 100644
--- a/types/react-icons/lib/md/playlist-play.d.ts
+++ b/types/react-icons/lib/md/playlist-play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistPlay extends React.Component<IconBaseProps> { }
+declare class MdPlaylistPlay extends React.Component<IconBaseProps> { }
+export = MdPlaylistPlay;
diff --git a/types/react-icons/lib/md/plus-one.d.ts b/types/react-icons/lib/md/plus-one.d.ts
index 1237985ba5..be10a4d3a3 100644
--- a/types/react-icons/lib/md/plus-one.d.ts
+++ b/types/react-icons/lib/md/plus-one.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlusOne extends React.Component<IconBaseProps> { }
+declare class MdPlusOne extends React.Component<IconBaseProps> { }
+export = MdPlusOne;
diff --git a/types/react-icons/lib/md/poll.d.ts b/types/react-icons/lib/md/poll.d.ts
index e0d456a28a..40fa12d1c2 100644
--- a/types/react-icons/lib/md/poll.d.ts
+++ b/types/react-icons/lib/md/poll.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPoll extends React.Component<IconBaseProps> { }
+declare class MdPoll extends React.Component<IconBaseProps> { }
+export = MdPoll;
diff --git a/types/react-icons/lib/md/polymer.d.ts b/types/react-icons/lib/md/polymer.d.ts
index 6ff9e004b4..7fc5f98fae 100644
--- a/types/react-icons/lib/md/polymer.d.ts
+++ b/types/react-icons/lib/md/polymer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPolymer extends React.Component<IconBaseProps> { }
+declare class MdPolymer extends React.Component<IconBaseProps> { }
+export = MdPolymer;
diff --git a/types/react-icons/lib/md/pool.d.ts b/types/react-icons/lib/md/pool.d.ts
index 933c4f1448..6483e03363 100644
--- a/types/react-icons/lib/md/pool.d.ts
+++ b/types/react-icons/lib/md/pool.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPool extends React.Component<IconBaseProps> { }
+declare class MdPool extends React.Component<IconBaseProps> { }
+export = MdPool;
diff --git a/types/react-icons/lib/md/portable-wifi-off.d.ts b/types/react-icons/lib/md/portable-wifi-off.d.ts
index b3bdd30ff8..4fc9ef507c 100644
--- a/types/react-icons/lib/md/portable-wifi-off.d.ts
+++ b/types/react-icons/lib/md/portable-wifi-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPortableWifiOff extends React.Component<IconBaseProps> { }
+declare class MdPortableWifiOff extends React.Component<IconBaseProps> { }
+export = MdPortableWifiOff;
diff --git a/types/react-icons/lib/md/portrait.d.ts b/types/react-icons/lib/md/portrait.d.ts
index 1e9b2f717e..a587b96bfc 100644
--- a/types/react-icons/lib/md/portrait.d.ts
+++ b/types/react-icons/lib/md/portrait.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPortrait extends React.Component<IconBaseProps> { }
+declare class MdPortrait extends React.Component<IconBaseProps> { }
+export = MdPortrait;
diff --git a/types/react-icons/lib/md/power-input.d.ts b/types/react-icons/lib/md/power-input.d.ts
index 71f89e9e40..34a90c855f 100644
--- a/types/react-icons/lib/md/power-input.d.ts
+++ b/types/react-icons/lib/md/power-input.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPowerInput extends React.Component<IconBaseProps> { }
+declare class MdPowerInput extends React.Component<IconBaseProps> { }
+export = MdPowerInput;
diff --git a/types/react-icons/lib/md/power-settings-new.d.ts b/types/react-icons/lib/md/power-settings-new.d.ts
index 69221c9111..1d76b0c67e 100644
--- a/types/react-icons/lib/md/power-settings-new.d.ts
+++ b/types/react-icons/lib/md/power-settings-new.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPowerSettingsNew extends React.Component<IconBaseProps> { }
+declare class MdPowerSettingsNew extends React.Component<IconBaseProps> { }
+export = MdPowerSettingsNew;
diff --git a/types/react-icons/lib/md/power.d.ts b/types/react-icons/lib/md/power.d.ts
index 106471c2a5..8839984678 100644
--- a/types/react-icons/lib/md/power.d.ts
+++ b/types/react-icons/lib/md/power.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPower extends React.Component<IconBaseProps> { }
+declare class MdPower extends React.Component<IconBaseProps> { }
+export = MdPower;
diff --git a/types/react-icons/lib/md/pregnant-woman.d.ts b/types/react-icons/lib/md/pregnant-woman.d.ts
index 9e88eab156..7278b215e3 100644
--- a/types/react-icons/lib/md/pregnant-woman.d.ts
+++ b/types/react-icons/lib/md/pregnant-woman.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPregnantWoman extends React.Component<IconBaseProps> { }
+declare class MdPregnantWoman extends React.Component<IconBaseProps> { }
+export = MdPregnantWoman;
diff --git a/types/react-icons/lib/md/present-to-all.d.ts b/types/react-icons/lib/md/present-to-all.d.ts
index b88c9a45d2..93d710de16 100644
--- a/types/react-icons/lib/md/present-to-all.d.ts
+++ b/types/react-icons/lib/md/present-to-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPresentToAll extends React.Component<IconBaseProps> { }
+declare class MdPresentToAll extends React.Component<IconBaseProps> { }
+export = MdPresentToAll;
diff --git a/types/react-icons/lib/md/print.d.ts b/types/react-icons/lib/md/print.d.ts
index 74d6db2f37..62b476b9c7 100644
--- a/types/react-icons/lib/md/print.d.ts
+++ b/types/react-icons/lib/md/print.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPrint extends React.Component<IconBaseProps> { }
+declare class MdPrint extends React.Component<IconBaseProps> { }
+export = MdPrint;
diff --git a/types/react-icons/lib/md/priority-high.d.ts b/types/react-icons/lib/md/priority-high.d.ts
index 56c1354dae..840ab9c68a 100644
--- a/types/react-icons/lib/md/priority-high.d.ts
+++ b/types/react-icons/lib/md/priority-high.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPriorityHigh extends React.Component<IconBaseProps> { }
+declare class MdPriorityHigh extends React.Component<IconBaseProps> { }
+export = MdPriorityHigh;
diff --git a/types/react-icons/lib/md/public.d.ts b/types/react-icons/lib/md/public.d.ts
index 1615661bab..91706fbb9e 100644
--- a/types/react-icons/lib/md/public.d.ts
+++ b/types/react-icons/lib/md/public.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPublic extends React.Component<IconBaseProps> { }
+declare class MdPublic extends React.Component<IconBaseProps> { }
+export = MdPublic;
diff --git a/types/react-icons/lib/md/publish.d.ts b/types/react-icons/lib/md/publish.d.ts
index 76aae7f48b..db437f53be 100644
--- a/types/react-icons/lib/md/publish.d.ts
+++ b/types/react-icons/lib/md/publish.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPublish extends React.Component<IconBaseProps> { }
+declare class MdPublish extends React.Component<IconBaseProps> { }
+export = MdPublish;
diff --git a/types/react-icons/lib/md/query-builder.d.ts b/types/react-icons/lib/md/query-builder.d.ts
index 3607cbf408..8dff3909b5 100644
--- a/types/react-icons/lib/md/query-builder.d.ts
+++ b/types/react-icons/lib/md/query-builder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueryBuilder extends React.Component<IconBaseProps> { }
+declare class MdQueryBuilder extends React.Component<IconBaseProps> { }
+export = MdQueryBuilder;
diff --git a/types/react-icons/lib/md/question-answer.d.ts b/types/react-icons/lib/md/question-answer.d.ts
index b88cd376d0..76423a5ea1 100644
--- a/types/react-icons/lib/md/question-answer.d.ts
+++ b/types/react-icons/lib/md/question-answer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQuestionAnswer extends React.Component<IconBaseProps> { }
+declare class MdQuestionAnswer extends React.Component<IconBaseProps> { }
+export = MdQuestionAnswer;
diff --git a/types/react-icons/lib/md/queue-music.d.ts b/types/react-icons/lib/md/queue-music.d.ts
index 0a9a451291..0186613977 100644
--- a/types/react-icons/lib/md/queue-music.d.ts
+++ b/types/react-icons/lib/md/queue-music.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueueMusic extends React.Component<IconBaseProps> { }
+declare class MdQueueMusic extends React.Component<IconBaseProps> { }
+export = MdQueueMusic;
diff --git a/types/react-icons/lib/md/queue-play-next.d.ts b/types/react-icons/lib/md/queue-play-next.d.ts
index 4540a71df0..c62528bd30 100644
--- a/types/react-icons/lib/md/queue-play-next.d.ts
+++ b/types/react-icons/lib/md/queue-play-next.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueuePlayNext extends React.Component<IconBaseProps> { }
+declare class MdQueuePlayNext extends React.Component<IconBaseProps> { }
+export = MdQueuePlayNext;
diff --git a/types/react-icons/lib/md/queue.d.ts b/types/react-icons/lib/md/queue.d.ts
index 80b27a7f8a..0f2250095b 100644
--- a/types/react-icons/lib/md/queue.d.ts
+++ b/types/react-icons/lib/md/queue.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueue extends React.Component<IconBaseProps> { }
+declare class MdQueue extends React.Component<IconBaseProps> { }
+export = MdQueue;
diff --git a/types/react-icons/lib/md/radio-button-checked.d.ts b/types/react-icons/lib/md/radio-button-checked.d.ts
index dfa06080e6..f8e479ee43 100644
--- a/types/react-icons/lib/md/radio-button-checked.d.ts
+++ b/types/react-icons/lib/md/radio-button-checked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRadioButtonChecked extends React.Component<IconBaseProps> { }
+declare class MdRadioButtonChecked extends React.Component<IconBaseProps> { }
+export = MdRadioButtonChecked;
diff --git a/types/react-icons/lib/md/radio-button-unchecked.d.ts b/types/react-icons/lib/md/radio-button-unchecked.d.ts
index b154b71305..60564b7e28 100644
--- a/types/react-icons/lib/md/radio-button-unchecked.d.ts
+++ b/types/react-icons/lib/md/radio-button-unchecked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRadioButtonUnchecked extends React.Component<IconBaseProps> { }
+declare class MdRadioButtonUnchecked extends React.Component<IconBaseProps> { }
+export = MdRadioButtonUnchecked;
diff --git a/types/react-icons/lib/md/radio.d.ts b/types/react-icons/lib/md/radio.d.ts
index bd53fd4f03..af41f21e68 100644
--- a/types/react-icons/lib/md/radio.d.ts
+++ b/types/react-icons/lib/md/radio.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRadio extends React.Component<IconBaseProps> { }
+declare class MdRadio extends React.Component<IconBaseProps> { }
+export = MdRadio;
diff --git a/types/react-icons/lib/md/rate-review.d.ts b/types/react-icons/lib/md/rate-review.d.ts
index 6de3f28785..5f1ef5658a 100644
--- a/types/react-icons/lib/md/rate-review.d.ts
+++ b/types/react-icons/lib/md/rate-review.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRateReview extends React.Component<IconBaseProps> { }
+declare class MdRateReview extends React.Component<IconBaseProps> { }
+export = MdRateReview;
diff --git a/types/react-icons/lib/md/receipt.d.ts b/types/react-icons/lib/md/receipt.d.ts
index 1b781c04c7..ae345fa152 100644
--- a/types/react-icons/lib/md/receipt.d.ts
+++ b/types/react-icons/lib/md/receipt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReceipt extends React.Component<IconBaseProps> { }
+declare class MdReceipt extends React.Component<IconBaseProps> { }
+export = MdReceipt;
diff --git a/types/react-icons/lib/md/recent-actors.d.ts b/types/react-icons/lib/md/recent-actors.d.ts
index cfcf0432b5..d347341dc6 100644
--- a/types/react-icons/lib/md/recent-actors.d.ts
+++ b/types/react-icons/lib/md/recent-actors.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRecentActors extends React.Component<IconBaseProps> { }
+declare class MdRecentActors extends React.Component<IconBaseProps> { }
+export = MdRecentActors;
diff --git a/types/react-icons/lib/md/record-voice-over.d.ts b/types/react-icons/lib/md/record-voice-over.d.ts
index ab9b2189b8..89c019ede6 100644
--- a/types/react-icons/lib/md/record-voice-over.d.ts
+++ b/types/react-icons/lib/md/record-voice-over.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRecordVoiceOver extends React.Component<IconBaseProps> { }
+declare class MdRecordVoiceOver extends React.Component<IconBaseProps> { }
+export = MdRecordVoiceOver;
diff --git a/types/react-icons/lib/md/redeem.d.ts b/types/react-icons/lib/md/redeem.d.ts
index 7690d10236..05195322b9 100644
--- a/types/react-icons/lib/md/redeem.d.ts
+++ b/types/react-icons/lib/md/redeem.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRedeem extends React.Component<IconBaseProps> { }
+declare class MdRedeem extends React.Component<IconBaseProps> { }
+export = MdRedeem;
diff --git a/types/react-icons/lib/md/redo.d.ts b/types/react-icons/lib/md/redo.d.ts
index 3e0e1fac51..355d6a28e4 100644
--- a/types/react-icons/lib/md/redo.d.ts
+++ b/types/react-icons/lib/md/redo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRedo extends React.Component<IconBaseProps> { }
+declare class MdRedo extends React.Component<IconBaseProps> { }
+export = MdRedo;
diff --git a/types/react-icons/lib/md/refresh.d.ts b/types/react-icons/lib/md/refresh.d.ts
index f037c2a972..40213a11ed 100644
--- a/types/react-icons/lib/md/refresh.d.ts
+++ b/types/react-icons/lib/md/refresh.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRefresh extends React.Component<IconBaseProps> { }
+declare class MdRefresh extends React.Component<IconBaseProps> { }
+export = MdRefresh;
diff --git a/types/react-icons/lib/md/remove-circle-outline.d.ts b/types/react-icons/lib/md/remove-circle-outline.d.ts
index 3488b16e2a..5a06426edf 100644
--- a/types/react-icons/lib/md/remove-circle-outline.d.ts
+++ b/types/react-icons/lib/md/remove-circle-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveCircleOutline extends React.Component<IconBaseProps> { }
+declare class MdRemoveCircleOutline extends React.Component<IconBaseProps> { }
+export = MdRemoveCircleOutline;
diff --git a/types/react-icons/lib/md/remove-circle.d.ts b/types/react-icons/lib/md/remove-circle.d.ts
index 77d8b1db6c..a79189430d 100644
--- a/types/react-icons/lib/md/remove-circle.d.ts
+++ b/types/react-icons/lib/md/remove-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveCircle extends React.Component<IconBaseProps> { }
+declare class MdRemoveCircle extends React.Component<IconBaseProps> { }
+export = MdRemoveCircle;
diff --git a/types/react-icons/lib/md/remove-from-queue.d.ts b/types/react-icons/lib/md/remove-from-queue.d.ts
index 05299a588f..bc4a8b2a60 100644
--- a/types/react-icons/lib/md/remove-from-queue.d.ts
+++ b/types/react-icons/lib/md/remove-from-queue.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveFromQueue extends React.Component<IconBaseProps> { }
+declare class MdRemoveFromQueue extends React.Component<IconBaseProps> { }
+export = MdRemoveFromQueue;
diff --git a/types/react-icons/lib/md/remove-red-eye.d.ts b/types/react-icons/lib/md/remove-red-eye.d.ts
index 8f839358ba..08e340824f 100644
--- a/types/react-icons/lib/md/remove-red-eye.d.ts
+++ b/types/react-icons/lib/md/remove-red-eye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveRedEye extends React.Component<IconBaseProps> { }
+declare class MdRemoveRedEye extends React.Component<IconBaseProps> { }
+export = MdRemoveRedEye;
diff --git a/types/react-icons/lib/md/remove-shopping-cart.d.ts b/types/react-icons/lib/md/remove-shopping-cart.d.ts
index 2715486aea..d0d1a3a063 100644
--- a/types/react-icons/lib/md/remove-shopping-cart.d.ts
+++ b/types/react-icons/lib/md/remove-shopping-cart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveShoppingCart extends React.Component<IconBaseProps> { }
+declare class MdRemoveShoppingCart extends React.Component<IconBaseProps> { }
+export = MdRemoveShoppingCart;
diff --git a/types/react-icons/lib/md/remove.d.ts b/types/react-icons/lib/md/remove.d.ts
index 9522f25fe9..cc473fea9f 100644
--- a/types/react-icons/lib/md/remove.d.ts
+++ b/types/react-icons/lib/md/remove.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemove extends React.Component<IconBaseProps> { }
+declare class MdRemove extends React.Component<IconBaseProps> { }
+export = MdRemove;
diff --git a/types/react-icons/lib/md/reorder.d.ts b/types/react-icons/lib/md/reorder.d.ts
index 9f24bc5ed5..e9550c664b 100644
--- a/types/react-icons/lib/md/reorder.d.ts
+++ b/types/react-icons/lib/md/reorder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReorder extends React.Component<IconBaseProps> { }
+declare class MdReorder extends React.Component<IconBaseProps> { }
+export = MdReorder;
diff --git a/types/react-icons/lib/md/repeat-one.d.ts b/types/react-icons/lib/md/repeat-one.d.ts
index 74a3642bf5..cb17395670 100644
--- a/types/react-icons/lib/md/repeat-one.d.ts
+++ b/types/react-icons/lib/md/repeat-one.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRepeatOne extends React.Component<IconBaseProps> { }
+declare class MdRepeatOne extends React.Component<IconBaseProps> { }
+export = MdRepeatOne;
diff --git a/types/react-icons/lib/md/repeat.d.ts b/types/react-icons/lib/md/repeat.d.ts
index e1d7352ab9..9de29f628a 100644
--- a/types/react-icons/lib/md/repeat.d.ts
+++ b/types/react-icons/lib/md/repeat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRepeat extends React.Component<IconBaseProps> { }
+declare class MdRepeat extends React.Component<IconBaseProps> { }
+export = MdRepeat;
diff --git a/types/react-icons/lib/md/replay-10.d.ts b/types/react-icons/lib/md/replay-10.d.ts
index 3d9f3ef0c4..d4a6163e66 100644
--- a/types/react-icons/lib/md/replay-10.d.ts
+++ b/types/react-icons/lib/md/replay-10.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay10 extends React.Component<IconBaseProps> { }
+declare class MdReplay10 extends React.Component<IconBaseProps> { }
+export = MdReplay10;
diff --git a/types/react-icons/lib/md/replay-30.d.ts b/types/react-icons/lib/md/replay-30.d.ts
index 402af551ba..2f7775f226 100644
--- a/types/react-icons/lib/md/replay-30.d.ts
+++ b/types/react-icons/lib/md/replay-30.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay30 extends React.Component<IconBaseProps> { }
+declare class MdReplay30 extends React.Component<IconBaseProps> { }
+export = MdReplay30;
diff --git a/types/react-icons/lib/md/replay-5.d.ts b/types/react-icons/lib/md/replay-5.d.ts
index 78905ba50c..51ee68a11f 100644
--- a/types/react-icons/lib/md/replay-5.d.ts
+++ b/types/react-icons/lib/md/replay-5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay5 extends React.Component<IconBaseProps> { }
+declare class MdReplay5 extends React.Component<IconBaseProps> { }
+export = MdReplay5;
diff --git a/types/react-icons/lib/md/replay.d.ts b/types/react-icons/lib/md/replay.d.ts
index 47d8592a3d..4245bb86b3 100644
--- a/types/react-icons/lib/md/replay.d.ts
+++ b/types/react-icons/lib/md/replay.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay extends React.Component<IconBaseProps> { }
+declare class MdReplay extends React.Component<IconBaseProps> { }
+export = MdReplay;
diff --git a/types/react-icons/lib/md/reply-all.d.ts b/types/react-icons/lib/md/reply-all.d.ts
index 07aa5f01f2..4e7fda0551 100644
--- a/types/react-icons/lib/md/reply-all.d.ts
+++ b/types/react-icons/lib/md/reply-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplyAll extends React.Component<IconBaseProps> { }
+declare class MdReplyAll extends React.Component<IconBaseProps> { }
+export = MdReplyAll;
diff --git a/types/react-icons/lib/md/reply.d.ts b/types/react-icons/lib/md/reply.d.ts
index 648de11ef1..e83df14565 100644
--- a/types/react-icons/lib/md/reply.d.ts
+++ b/types/react-icons/lib/md/reply.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReply extends React.Component<IconBaseProps> { }
+declare class MdReply extends React.Component<IconBaseProps> { }
+export = MdReply;
diff --git a/types/react-icons/lib/md/report-problem.d.ts b/types/react-icons/lib/md/report-problem.d.ts
index c3dbf0101a..d994bf6a19 100644
--- a/types/react-icons/lib/md/report-problem.d.ts
+++ b/types/react-icons/lib/md/report-problem.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReportProblem extends React.Component<IconBaseProps> { }
+declare class MdReportProblem extends React.Component<IconBaseProps> { }
+export = MdReportProblem;
diff --git a/types/react-icons/lib/md/report.d.ts b/types/react-icons/lib/md/report.d.ts
index af51419c00..2b90b6889c 100644
--- a/types/react-icons/lib/md/report.d.ts
+++ b/types/react-icons/lib/md/report.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReport extends React.Component<IconBaseProps> { }
+declare class MdReport extends React.Component<IconBaseProps> { }
+export = MdReport;
diff --git a/types/react-icons/lib/md/restaurant-menu.d.ts b/types/react-icons/lib/md/restaurant-menu.d.ts
index 306891c857..ba1f140c85 100644
--- a/types/react-icons/lib/md/restaurant-menu.d.ts
+++ b/types/react-icons/lib/md/restaurant-menu.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestaurantMenu extends React.Component<IconBaseProps> { }
+declare class MdRestaurantMenu extends React.Component<IconBaseProps> { }
+export = MdRestaurantMenu;
diff --git a/types/react-icons/lib/md/restaurant.d.ts b/types/react-icons/lib/md/restaurant.d.ts
index 5adc8e8712..c73547557c 100644
--- a/types/react-icons/lib/md/restaurant.d.ts
+++ b/types/react-icons/lib/md/restaurant.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestaurant extends React.Component<IconBaseProps> { }
+declare class MdRestaurant extends React.Component<IconBaseProps> { }
+export = MdRestaurant;
diff --git a/types/react-icons/lib/md/restore-page.d.ts b/types/react-icons/lib/md/restore-page.d.ts
index d836b1f669..5f8df2e582 100644
--- a/types/react-icons/lib/md/restore-page.d.ts
+++ b/types/react-icons/lib/md/restore-page.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestorePage extends React.Component<IconBaseProps> { }
+declare class MdRestorePage extends React.Component<IconBaseProps> { }
+export = MdRestorePage;
diff --git a/types/react-icons/lib/md/restore.d.ts b/types/react-icons/lib/md/restore.d.ts
index aaadca1e08..1e4e89e80e 100644
--- a/types/react-icons/lib/md/restore.d.ts
+++ b/types/react-icons/lib/md/restore.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestore extends React.Component<IconBaseProps> { }
+declare class MdRestore extends React.Component<IconBaseProps> { }
+export = MdRestore;
diff --git a/types/react-icons/lib/md/ring-volume.d.ts b/types/react-icons/lib/md/ring-volume.d.ts
index 41843c29bd..ad9af1db0f 100644
--- a/types/react-icons/lib/md/ring-volume.d.ts
+++ b/types/react-icons/lib/md/ring-volume.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRingVolume extends React.Component<IconBaseProps> { }
+declare class MdRingVolume extends React.Component<IconBaseProps> { }
+export = MdRingVolume;
diff --git a/types/react-icons/lib/md/room-service.d.ts b/types/react-icons/lib/md/room-service.d.ts
index 4b69032332..3dfd465e03 100644
--- a/types/react-icons/lib/md/room-service.d.ts
+++ b/types/react-icons/lib/md/room-service.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRoomService extends React.Component<IconBaseProps> { }
+declare class MdRoomService extends React.Component<IconBaseProps> { }
+export = MdRoomService;
diff --git a/types/react-icons/lib/md/room.d.ts b/types/react-icons/lib/md/room.d.ts
index 49ab4cae8d..4b6d53a92f 100644
--- a/types/react-icons/lib/md/room.d.ts
+++ b/types/react-icons/lib/md/room.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRoom extends React.Component<IconBaseProps> { }
+declare class MdRoom extends React.Component<IconBaseProps> { }
+export = MdRoom;
diff --git a/types/react-icons/lib/md/rotate-90-degrees-ccw.d.ts b/types/react-icons/lib/md/rotate-90-degrees-ccw.d.ts
index ba2f85b1e2..8e5da4d975 100644
--- a/types/react-icons/lib/md/rotate-90-degrees-ccw.d.ts
+++ b/types/react-icons/lib/md/rotate-90-degrees-ccw.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRotate90DegreesCcw extends React.Component<IconBaseProps> { }
+declare class MdRotate90DegreesCcw extends React.Component<IconBaseProps> { }
+export = MdRotate90DegreesCcw;
diff --git a/types/react-icons/lib/md/rotate-left.d.ts b/types/react-icons/lib/md/rotate-left.d.ts
index 493c21cd47..2bae5dd27a 100644
--- a/types/react-icons/lib/md/rotate-left.d.ts
+++ b/types/react-icons/lib/md/rotate-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRotateLeft extends React.Component<IconBaseProps> { }
+declare class MdRotateLeft extends React.Component<IconBaseProps> { }
+export = MdRotateLeft;
diff --git a/types/react-icons/lib/md/rotate-right.d.ts b/types/react-icons/lib/md/rotate-right.d.ts
index 936625527b..383af61134 100644
--- a/types/react-icons/lib/md/rotate-right.d.ts
+++ b/types/react-icons/lib/md/rotate-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRotateRight extends React.Component<IconBaseProps> { }
+declare class MdRotateRight extends React.Component<IconBaseProps> { }
+export = MdRotateRight;
diff --git a/types/react-icons/lib/md/rounded-corner.d.ts b/types/react-icons/lib/md/rounded-corner.d.ts
index 592818db46..e596f50c2d 100644
--- a/types/react-icons/lib/md/rounded-corner.d.ts
+++ b/types/react-icons/lib/md/rounded-corner.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRoundedCorner extends React.Component<IconBaseProps> { }
+declare class MdRoundedCorner extends React.Component<IconBaseProps> { }
+export = MdRoundedCorner;
diff --git a/types/react-icons/lib/md/router.d.ts b/types/react-icons/lib/md/router.d.ts
index 71effffe25..43947a6a1a 100644
--- a/types/react-icons/lib/md/router.d.ts
+++ b/types/react-icons/lib/md/router.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRouter extends React.Component<IconBaseProps> { }
+declare class MdRouter extends React.Component<IconBaseProps> { }
+export = MdRouter;
diff --git a/types/react-icons/lib/md/rowing.d.ts b/types/react-icons/lib/md/rowing.d.ts
index 66d50957df..bc40733522 100644
--- a/types/react-icons/lib/md/rowing.d.ts
+++ b/types/react-icons/lib/md/rowing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRowing extends React.Component<IconBaseProps> { }
+declare class MdRowing extends React.Component<IconBaseProps> { }
+export = MdRowing;
diff --git a/types/react-icons/lib/md/rss-feed.d.ts b/types/react-icons/lib/md/rss-feed.d.ts
index 857453af7d..a2d809e6a5 100644
--- a/types/react-icons/lib/md/rss-feed.d.ts
+++ b/types/react-icons/lib/md/rss-feed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRssFeed extends React.Component<IconBaseProps> { }
+declare class MdRssFeed extends React.Component<IconBaseProps> { }
+export = MdRssFeed;
diff --git a/types/react-icons/lib/md/rv-hookup.d.ts b/types/react-icons/lib/md/rv-hookup.d.ts
index 6b3f6b3a67..5db1b8b217 100644
--- a/types/react-icons/lib/md/rv-hookup.d.ts
+++ b/types/react-icons/lib/md/rv-hookup.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRvHookup extends React.Component<IconBaseProps> { }
+declare class MdRvHookup extends React.Component<IconBaseProps> { }
+export = MdRvHookup;
diff --git a/types/react-icons/lib/md/satellite.d.ts b/types/react-icons/lib/md/satellite.d.ts
index 1371e50a1d..c75656781c 100644
--- a/types/react-icons/lib/md/satellite.d.ts
+++ b/types/react-icons/lib/md/satellite.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSatellite extends React.Component<IconBaseProps> { }
+declare class MdSatellite extends React.Component<IconBaseProps> { }
+export = MdSatellite;
diff --git a/types/react-icons/lib/md/save.d.ts b/types/react-icons/lib/md/save.d.ts
index f3aa747a5a..52f76c62fa 100644
--- a/types/react-icons/lib/md/save.d.ts
+++ b/types/react-icons/lib/md/save.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSave extends React.Component<IconBaseProps> { }
+declare class MdSave extends React.Component<IconBaseProps> { }
+export = MdSave;
diff --git a/types/react-icons/lib/md/scanner.d.ts b/types/react-icons/lib/md/scanner.d.ts
index db18a8c57b..a948265dae 100644
--- a/types/react-icons/lib/md/scanner.d.ts
+++ b/types/react-icons/lib/md/scanner.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScanner extends React.Component<IconBaseProps> { }
+declare class MdScanner extends React.Component<IconBaseProps> { }
+export = MdScanner;
diff --git a/types/react-icons/lib/md/schedule.d.ts b/types/react-icons/lib/md/schedule.d.ts
index e85dac4d66..ea91abb209 100644
--- a/types/react-icons/lib/md/schedule.d.ts
+++ b/types/react-icons/lib/md/schedule.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSchedule extends React.Component<IconBaseProps> { }
+declare class MdSchedule extends React.Component<IconBaseProps> { }
+export = MdSchedule;
diff --git a/types/react-icons/lib/md/school.d.ts b/types/react-icons/lib/md/school.d.ts
index ec9ad586c7..8e6db36a55 100644
--- a/types/react-icons/lib/md/school.d.ts
+++ b/types/react-icons/lib/md/school.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSchool extends React.Component<IconBaseProps> { }
+declare class MdSchool extends React.Component<IconBaseProps> { }
+export = MdSchool;
diff --git a/types/react-icons/lib/md/screen-lock-landscape.d.ts b/types/react-icons/lib/md/screen-lock-landscape.d.ts
index 8bd82ab85e..83936e6cf5 100644
--- a/types/react-icons/lib/md/screen-lock-landscape.d.ts
+++ b/types/react-icons/lib/md/screen-lock-landscape.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockLandscape extends React.Component<IconBaseProps> { }
+declare class MdScreenLockLandscape extends React.Component<IconBaseProps> { }
+export = MdScreenLockLandscape;
diff --git a/types/react-icons/lib/md/screen-lock-portrait.d.ts b/types/react-icons/lib/md/screen-lock-portrait.d.ts
index 4439deda82..acb9616bf3 100644
--- a/types/react-icons/lib/md/screen-lock-portrait.d.ts
+++ b/types/react-icons/lib/md/screen-lock-portrait.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockPortrait extends React.Component<IconBaseProps> { }
+declare class MdScreenLockPortrait extends React.Component<IconBaseProps> { }
+export = MdScreenLockPortrait;
diff --git a/types/react-icons/lib/md/screen-lock-rotation.d.ts b/types/react-icons/lib/md/screen-lock-rotation.d.ts
index 7edd36c10d..3b14fad7c3 100644
--- a/types/react-icons/lib/md/screen-lock-rotation.d.ts
+++ b/types/react-icons/lib/md/screen-lock-rotation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockRotation extends React.Component<IconBaseProps> { }
+declare class MdScreenLockRotation extends React.Component<IconBaseProps> { }
+export = MdScreenLockRotation;
diff --git a/types/react-icons/lib/md/screen-rotation.d.ts b/types/react-icons/lib/md/screen-rotation.d.ts
index ac2cd107e2..9fdb432b74 100644
--- a/types/react-icons/lib/md/screen-rotation.d.ts
+++ b/types/react-icons/lib/md/screen-rotation.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenRotation extends React.Component<IconBaseProps> { }
+declare class MdScreenRotation extends React.Component<IconBaseProps> { }
+export = MdScreenRotation;
diff --git a/types/react-icons/lib/md/screen-share.d.ts b/types/react-icons/lib/md/screen-share.d.ts
index 1c6e5f8f3f..38f9b890db 100644
--- a/types/react-icons/lib/md/screen-share.d.ts
+++ b/types/react-icons/lib/md/screen-share.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenShare extends React.Component<IconBaseProps> { }
+declare class MdScreenShare extends React.Component<IconBaseProps> { }
+export = MdScreenShare;
diff --git a/types/react-icons/lib/md/sd-card.d.ts b/types/react-icons/lib/md/sd-card.d.ts
index fbf66bc8ae..894db93bf7 100644
--- a/types/react-icons/lib/md/sd-card.d.ts
+++ b/types/react-icons/lib/md/sd-card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSdCard extends React.Component<IconBaseProps> { }
+declare class MdSdCard extends React.Component<IconBaseProps> { }
+export = MdSdCard;
diff --git a/types/react-icons/lib/md/sd-storage.d.ts b/types/react-icons/lib/md/sd-storage.d.ts
index 645f26b009..5954597cad 100644
--- a/types/react-icons/lib/md/sd-storage.d.ts
+++ b/types/react-icons/lib/md/sd-storage.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSdStorage extends React.Component<IconBaseProps> { }
+declare class MdSdStorage extends React.Component<IconBaseProps> { }
+export = MdSdStorage;
diff --git a/types/react-icons/lib/md/search.d.ts b/types/react-icons/lib/md/search.d.ts
index 4c4f7aafeb..10abf14f31 100644
--- a/types/react-icons/lib/md/search.d.ts
+++ b/types/react-icons/lib/md/search.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSearch extends React.Component<IconBaseProps> { }
+declare class MdSearch extends React.Component<IconBaseProps> { }
+export = MdSearch;
diff --git a/types/react-icons/lib/md/security.d.ts b/types/react-icons/lib/md/security.d.ts
index ffeffbbfeb..2c3381cf2e 100644
--- a/types/react-icons/lib/md/security.d.ts
+++ b/types/react-icons/lib/md/security.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSecurity extends React.Component<IconBaseProps> { }
+declare class MdSecurity extends React.Component<IconBaseProps> { }
+export = MdSecurity;
diff --git a/types/react-icons/lib/md/select-all.d.ts b/types/react-icons/lib/md/select-all.d.ts
index e8d8ba116a..aacf948922 100644
--- a/types/react-icons/lib/md/select-all.d.ts
+++ b/types/react-icons/lib/md/select-all.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSelectAll extends React.Component<IconBaseProps> { }
+declare class MdSelectAll extends React.Component<IconBaseProps> { }
+export = MdSelectAll;
diff --git a/types/react-icons/lib/md/send.d.ts b/types/react-icons/lib/md/send.d.ts
index a643cfddfa..162137fb99 100644
--- a/types/react-icons/lib/md/send.d.ts
+++ b/types/react-icons/lib/md/send.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSend extends React.Component<IconBaseProps> { }
+declare class MdSend extends React.Component<IconBaseProps> { }
+export = MdSend;
diff --git a/types/react-icons/lib/md/sentiment-dissatisfied.d.ts b/types/react-icons/lib/md/sentiment-dissatisfied.d.ts
index e5e989d5ad..a62acf6df6 100644
--- a/types/react-icons/lib/md/sentiment-dissatisfied.d.ts
+++ b/types/react-icons/lib/md/sentiment-dissatisfied.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentDissatisfied extends React.Component<IconBaseProps> { }
+declare class MdSentimentDissatisfied extends React.Component<IconBaseProps> { }
+export = MdSentimentDissatisfied;
diff --git a/types/react-icons/lib/md/sentiment-neutral.d.ts b/types/react-icons/lib/md/sentiment-neutral.d.ts
index ea95a02aea..d8091cbc2c 100644
--- a/types/react-icons/lib/md/sentiment-neutral.d.ts
+++ b/types/react-icons/lib/md/sentiment-neutral.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentNeutral extends React.Component<IconBaseProps> { }
+declare class MdSentimentNeutral extends React.Component<IconBaseProps> { }
+export = MdSentimentNeutral;
diff --git a/types/react-icons/lib/md/sentiment-satisfied.d.ts b/types/react-icons/lib/md/sentiment-satisfied.d.ts
index ff9ba41c7e..cbe5553524 100644
--- a/types/react-icons/lib/md/sentiment-satisfied.d.ts
+++ b/types/react-icons/lib/md/sentiment-satisfied.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentSatisfied extends React.Component<IconBaseProps> { }
+declare class MdSentimentSatisfied extends React.Component<IconBaseProps> { }
+export = MdSentimentSatisfied;
diff --git a/types/react-icons/lib/md/sentiment-very-dissatisfied.d.ts b/types/react-icons/lib/md/sentiment-very-dissatisfied.d.ts
index 9e26b053fc..1ac9808f2f 100644
--- a/types/react-icons/lib/md/sentiment-very-dissatisfied.d.ts
+++ b/types/react-icons/lib/md/sentiment-very-dissatisfied.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentVeryDissatisfied extends React.Component<IconBaseProps> { }
+declare class MdSentimentVeryDissatisfied extends React.Component<IconBaseProps> { }
+export = MdSentimentVeryDissatisfied;
diff --git a/types/react-icons/lib/md/sentiment-very-satisfied.d.ts b/types/react-icons/lib/md/sentiment-very-satisfied.d.ts
index 570e358c3a..ef2aee237a 100644
--- a/types/react-icons/lib/md/sentiment-very-satisfied.d.ts
+++ b/types/react-icons/lib/md/sentiment-very-satisfied.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentVerySatisfied extends React.Component<IconBaseProps> { }
+declare class MdSentimentVerySatisfied extends React.Component<IconBaseProps> { }
+export = MdSentimentVerySatisfied;
diff --git a/types/react-icons/lib/md/settings-applications.d.ts b/types/react-icons/lib/md/settings-applications.d.ts
index 75223b6af8..d2472f774b 100644
--- a/types/react-icons/lib/md/settings-applications.d.ts
+++ b/types/react-icons/lib/md/settings-applications.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsApplications extends React.Component<IconBaseProps> { }
+declare class MdSettingsApplications extends React.Component<IconBaseProps> { }
+export = MdSettingsApplications;
diff --git a/types/react-icons/lib/md/settings-backup-restore.d.ts b/types/react-icons/lib/md/settings-backup-restore.d.ts
index beeec5199f..ad56096928 100644
--- a/types/react-icons/lib/md/settings-backup-restore.d.ts
+++ b/types/react-icons/lib/md/settings-backup-restore.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBackupRestore extends React.Component<IconBaseProps> { }
+declare class MdSettingsBackupRestore extends React.Component<IconBaseProps> { }
+export = MdSettingsBackupRestore;
diff --git a/types/react-icons/lib/md/settings-bluetooth.d.ts b/types/react-icons/lib/md/settings-bluetooth.d.ts
index 0f295f3c78..0951501e98 100644
--- a/types/react-icons/lib/md/settings-bluetooth.d.ts
+++ b/types/react-icons/lib/md/settings-bluetooth.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBluetooth extends React.Component<IconBaseProps> { }
+declare class MdSettingsBluetooth extends React.Component<IconBaseProps> { }
+export = MdSettingsBluetooth;
diff --git a/types/react-icons/lib/md/settings-brightness.d.ts b/types/react-icons/lib/md/settings-brightness.d.ts
index 41c1e8360f..78854eb65f 100644
--- a/types/react-icons/lib/md/settings-brightness.d.ts
+++ b/types/react-icons/lib/md/settings-brightness.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBrightness extends React.Component<IconBaseProps> { }
+declare class MdSettingsBrightness extends React.Component<IconBaseProps> { }
+export = MdSettingsBrightness;
diff --git a/types/react-icons/lib/md/settings-cell.d.ts b/types/react-icons/lib/md/settings-cell.d.ts
index 620d7e1fe5..a60a8cf1ac 100644
--- a/types/react-icons/lib/md/settings-cell.d.ts
+++ b/types/react-icons/lib/md/settings-cell.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsCell extends React.Component<IconBaseProps> { }
+declare class MdSettingsCell extends React.Component<IconBaseProps> { }
+export = MdSettingsCell;
diff --git a/types/react-icons/lib/md/settings-ethernet.d.ts b/types/react-icons/lib/md/settings-ethernet.d.ts
index c610f8ec24..b6b30b29de 100644
--- a/types/react-icons/lib/md/settings-ethernet.d.ts
+++ b/types/react-icons/lib/md/settings-ethernet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsEthernet extends React.Component<IconBaseProps> { }
+declare class MdSettingsEthernet extends React.Component<IconBaseProps> { }
+export = MdSettingsEthernet;
diff --git a/types/react-icons/lib/md/settings-input-antenna.d.ts b/types/react-icons/lib/md/settings-input-antenna.d.ts
index f19536a4cb..7099f8a3f2 100644
--- a/types/react-icons/lib/md/settings-input-antenna.d.ts
+++ b/types/react-icons/lib/md/settings-input-antenna.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputAntenna extends React.Component<IconBaseProps> { }
+declare class MdSettingsInputAntenna extends React.Component<IconBaseProps> { }
+export = MdSettingsInputAntenna;
diff --git a/types/react-icons/lib/md/settings-input-component.d.ts b/types/react-icons/lib/md/settings-input-component.d.ts
index e1fe37ccdf..4348ba310e 100644
--- a/types/react-icons/lib/md/settings-input-component.d.ts
+++ b/types/react-icons/lib/md/settings-input-component.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputComponent extends React.Component<IconBaseProps> { }
+declare class MdSettingsInputComponent extends React.Component<IconBaseProps> { }
+export = MdSettingsInputComponent;
diff --git a/types/react-icons/lib/md/settings-input-composite.d.ts b/types/react-icons/lib/md/settings-input-composite.d.ts
index 266f9969fb..5ceda7379f 100644
--- a/types/react-icons/lib/md/settings-input-composite.d.ts
+++ b/types/react-icons/lib/md/settings-input-composite.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputComposite extends React.Component<IconBaseProps> { }
+declare class MdSettingsInputComposite extends React.Component<IconBaseProps> { }
+export = MdSettingsInputComposite;
diff --git a/types/react-icons/lib/md/settings-input-hdmi.d.ts b/types/react-icons/lib/md/settings-input-hdmi.d.ts
index be910d9b17..ceaf5bae19 100644
--- a/types/react-icons/lib/md/settings-input-hdmi.d.ts
+++ b/types/react-icons/lib/md/settings-input-hdmi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputHdmi extends React.Component<IconBaseProps> { }
+declare class MdSettingsInputHdmi extends React.Component<IconBaseProps> { }
+export = MdSettingsInputHdmi;
diff --git a/types/react-icons/lib/md/settings-input-svideo.d.ts b/types/react-icons/lib/md/settings-input-svideo.d.ts
index d9254b4996..38aee4cc5b 100644
--- a/types/react-icons/lib/md/settings-input-svideo.d.ts
+++ b/types/react-icons/lib/md/settings-input-svideo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputSvideo extends React.Component<IconBaseProps> { }
+declare class MdSettingsInputSvideo extends React.Component<IconBaseProps> { }
+export = MdSettingsInputSvideo;
diff --git a/types/react-icons/lib/md/settings-overscan.d.ts b/types/react-icons/lib/md/settings-overscan.d.ts
index c74ed6c60b..c2932f567c 100644
--- a/types/react-icons/lib/md/settings-overscan.d.ts
+++ b/types/react-icons/lib/md/settings-overscan.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsOverscan extends React.Component<IconBaseProps> { }
+declare class MdSettingsOverscan extends React.Component<IconBaseProps> { }
+export = MdSettingsOverscan;
diff --git a/types/react-icons/lib/md/settings-phone.d.ts b/types/react-icons/lib/md/settings-phone.d.ts
index a24ed75c1a..fe28d9b8df 100644
--- a/types/react-icons/lib/md/settings-phone.d.ts
+++ b/types/react-icons/lib/md/settings-phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsPhone extends React.Component<IconBaseProps> { }
+declare class MdSettingsPhone extends React.Component<IconBaseProps> { }
+export = MdSettingsPhone;
diff --git a/types/react-icons/lib/md/settings-power.d.ts b/types/react-icons/lib/md/settings-power.d.ts
index f93530a007..f36622e144 100644
--- a/types/react-icons/lib/md/settings-power.d.ts
+++ b/types/react-icons/lib/md/settings-power.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsPower extends React.Component<IconBaseProps> { }
+declare class MdSettingsPower extends React.Component<IconBaseProps> { }
+export = MdSettingsPower;
diff --git a/types/react-icons/lib/md/settings-remote.d.ts b/types/react-icons/lib/md/settings-remote.d.ts
index 19720afb98..ed8987736c 100644
--- a/types/react-icons/lib/md/settings-remote.d.ts
+++ b/types/react-icons/lib/md/settings-remote.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsRemote extends React.Component<IconBaseProps> { }
+declare class MdSettingsRemote extends React.Component<IconBaseProps> { }
+export = MdSettingsRemote;
diff --git a/types/react-icons/lib/md/settings-system-daydream.d.ts b/types/react-icons/lib/md/settings-system-daydream.d.ts
index 654c1666d7..0ea373ba0d 100644
--- a/types/react-icons/lib/md/settings-system-daydream.d.ts
+++ b/types/react-icons/lib/md/settings-system-daydream.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsSystemDaydream extends React.Component<IconBaseProps> { }
+declare class MdSettingsSystemDaydream extends React.Component<IconBaseProps> { }
+export = MdSettingsSystemDaydream;
diff --git a/types/react-icons/lib/md/settings-voice.d.ts b/types/react-icons/lib/md/settings-voice.d.ts
index 2ca59f4b0b..5a7d8c78b3 100644
--- a/types/react-icons/lib/md/settings-voice.d.ts
+++ b/types/react-icons/lib/md/settings-voice.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsVoice extends React.Component<IconBaseProps> { }
+declare class MdSettingsVoice extends React.Component<IconBaseProps> { }
+export = MdSettingsVoice;
diff --git a/types/react-icons/lib/md/settings.d.ts b/types/react-icons/lib/md/settings.d.ts
index 2117b4be55..e2b820fa0e 100644
--- a/types/react-icons/lib/md/settings.d.ts
+++ b/types/react-icons/lib/md/settings.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettings extends React.Component<IconBaseProps> { }
+declare class MdSettings extends React.Component<IconBaseProps> { }
+export = MdSettings;
diff --git a/types/react-icons/lib/md/share.d.ts b/types/react-icons/lib/md/share.d.ts
index 5a6639be86..db916b39a9 100644
--- a/types/react-icons/lib/md/share.d.ts
+++ b/types/react-icons/lib/md/share.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShare extends React.Component<IconBaseProps> { }
+declare class MdShare extends React.Component<IconBaseProps> { }
+export = MdShare;
diff --git a/types/react-icons/lib/md/shop-two.d.ts b/types/react-icons/lib/md/shop-two.d.ts
index ffd2e40d8a..3b2a284a5c 100644
--- a/types/react-icons/lib/md/shop-two.d.ts
+++ b/types/react-icons/lib/md/shop-two.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShopTwo extends React.Component<IconBaseProps> { }
+declare class MdShopTwo extends React.Component<IconBaseProps> { }
+export = MdShopTwo;
diff --git a/types/react-icons/lib/md/shop.d.ts b/types/react-icons/lib/md/shop.d.ts
index 0247f8919e..ecc1e9ffb9 100644
--- a/types/react-icons/lib/md/shop.d.ts
+++ b/types/react-icons/lib/md/shop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShop extends React.Component<IconBaseProps> { }
+declare class MdShop extends React.Component<IconBaseProps> { }
+export = MdShop;
diff --git a/types/react-icons/lib/md/shopping-basket.d.ts b/types/react-icons/lib/md/shopping-basket.d.ts
index ce58316185..f71c3ff451 100644
--- a/types/react-icons/lib/md/shopping-basket.d.ts
+++ b/types/react-icons/lib/md/shopping-basket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShoppingBasket extends React.Component<IconBaseProps> { }
+declare class MdShoppingBasket extends React.Component<IconBaseProps> { }
+export = MdShoppingBasket;
diff --git a/types/react-icons/lib/md/shopping-cart.d.ts b/types/react-icons/lib/md/shopping-cart.d.ts
index 2980434fd6..b73baac4e1 100644
--- a/types/react-icons/lib/md/shopping-cart.d.ts
+++ b/types/react-icons/lib/md/shopping-cart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShoppingCart extends React.Component<IconBaseProps> { }
+declare class MdShoppingCart extends React.Component<IconBaseProps> { }
+export = MdShoppingCart;
diff --git a/types/react-icons/lib/md/short-text.d.ts b/types/react-icons/lib/md/short-text.d.ts
index 66c49133ba..f3195b2464 100644
--- a/types/react-icons/lib/md/short-text.d.ts
+++ b/types/react-icons/lib/md/short-text.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShortText extends React.Component<IconBaseProps> { }
+declare class MdShortText extends React.Component<IconBaseProps> { }
+export = MdShortText;
diff --git a/types/react-icons/lib/md/show-chart.d.ts b/types/react-icons/lib/md/show-chart.d.ts
index 4fc9b77c9e..f3f418e848 100644
--- a/types/react-icons/lib/md/show-chart.d.ts
+++ b/types/react-icons/lib/md/show-chart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShowChart extends React.Component<IconBaseProps> { }
+declare class MdShowChart extends React.Component<IconBaseProps> { }
+export = MdShowChart;
diff --git a/types/react-icons/lib/md/shuffle.d.ts b/types/react-icons/lib/md/shuffle.d.ts
index b20fd0302e..f6410aa683 100644
--- a/types/react-icons/lib/md/shuffle.d.ts
+++ b/types/react-icons/lib/md/shuffle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShuffle extends React.Component<IconBaseProps> { }
+declare class MdShuffle extends React.Component<IconBaseProps> { }
+export = MdShuffle;
diff --git a/types/react-icons/lib/md/signal-cellular-4-bar.d.ts b/types/react-icons/lib/md/signal-cellular-4-bar.d.ts
index 9961d076e8..6059ded2d6 100644
--- a/types/react-icons/lib/md/signal-cellular-4-bar.d.ts
+++ b/types/react-icons/lib/md/signal-cellular-4-bar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellular4Bar extends React.Component<IconBaseProps> { }
+declare class MdSignalCellular4Bar extends React.Component<IconBaseProps> { }
+export = MdSignalCellular4Bar;
diff --git a/types/react-icons/lib/md/signal-cellular-connected-no-internet-4-bar.d.ts b/types/react-icons/lib/md/signal-cellular-connected-no-internet-4-bar.d.ts
index 35546b90db..f8f1431efa 100644
--- a/types/react-icons/lib/md/signal-cellular-connected-no-internet-4-bar.d.ts
+++ b/types/react-icons/lib/md/signal-cellular-connected-no-internet-4-bar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularConnectedNoInternet4Bar extends React.Component<IconBaseProps> { }
+declare class MdSignalCellularConnectedNoInternet4Bar extends React.Component<IconBaseProps> { }
+export = MdSignalCellularConnectedNoInternet4Bar;
diff --git a/types/react-icons/lib/md/signal-cellular-no-sim.d.ts b/types/react-icons/lib/md/signal-cellular-no-sim.d.ts
index 37c952ef33..6892f5cf7d 100644
--- a/types/react-icons/lib/md/signal-cellular-no-sim.d.ts
+++ b/types/react-icons/lib/md/signal-cellular-no-sim.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularNoSim extends React.Component<IconBaseProps> { }
+declare class MdSignalCellularNoSim extends React.Component<IconBaseProps> { }
+export = MdSignalCellularNoSim;
diff --git a/types/react-icons/lib/md/signal-cellular-null.d.ts b/types/react-icons/lib/md/signal-cellular-null.d.ts
index 81c4801bac..681570828b 100644
--- a/types/react-icons/lib/md/signal-cellular-null.d.ts
+++ b/types/react-icons/lib/md/signal-cellular-null.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularNull extends React.Component<IconBaseProps> { }
+declare class MdSignalCellularNull extends React.Component<IconBaseProps> { }
+export = MdSignalCellularNull;
diff --git a/types/react-icons/lib/md/signal-cellular-off.d.ts b/types/react-icons/lib/md/signal-cellular-off.d.ts
index 71b723a036..09192b3ad7 100644
--- a/types/react-icons/lib/md/signal-cellular-off.d.ts
+++ b/types/react-icons/lib/md/signal-cellular-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularOff extends React.Component<IconBaseProps> { }
+declare class MdSignalCellularOff extends React.Component<IconBaseProps> { }
+export = MdSignalCellularOff;
diff --git a/types/react-icons/lib/md/signal-wifi-4-bar-lock.d.ts b/types/react-icons/lib/md/signal-wifi-4-bar-lock.d.ts
index 45689253f7..d927b58603 100644
--- a/types/react-icons/lib/md/signal-wifi-4-bar-lock.d.ts
+++ b/types/react-icons/lib/md/signal-wifi-4-bar-lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifi4BarLock extends React.Component<IconBaseProps> { }
+declare class MdSignalWifi4BarLock extends React.Component<IconBaseProps> { }
+export = MdSignalWifi4BarLock;
diff --git a/types/react-icons/lib/md/signal-wifi-4-bar.d.ts b/types/react-icons/lib/md/signal-wifi-4-bar.d.ts
index 9b90b1dc00..884c211a81 100644
--- a/types/react-icons/lib/md/signal-wifi-4-bar.d.ts
+++ b/types/react-icons/lib/md/signal-wifi-4-bar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifi4Bar extends React.Component<IconBaseProps> { }
+declare class MdSignalWifi4Bar extends React.Component<IconBaseProps> { }
+export = MdSignalWifi4Bar;
diff --git a/types/react-icons/lib/md/signal-wifi-off.d.ts b/types/react-icons/lib/md/signal-wifi-off.d.ts
index 62c5ceee3c..cbda299e8b 100644
--- a/types/react-icons/lib/md/signal-wifi-off.d.ts
+++ b/types/react-icons/lib/md/signal-wifi-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifiOff extends React.Component<IconBaseProps> { }
+declare class MdSignalWifiOff extends React.Component<IconBaseProps> { }
+export = MdSignalWifiOff;
diff --git a/types/react-icons/lib/md/sim-card-alert.d.ts b/types/react-icons/lib/md/sim-card-alert.d.ts
index 4060c4594e..be845d108d 100644
--- a/types/react-icons/lib/md/sim-card-alert.d.ts
+++ b/types/react-icons/lib/md/sim-card-alert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSimCardAlert extends React.Component<IconBaseProps> { }
+declare class MdSimCardAlert extends React.Component<IconBaseProps> { }
+export = MdSimCardAlert;
diff --git a/types/react-icons/lib/md/sim-card.d.ts b/types/react-icons/lib/md/sim-card.d.ts
index da691e53ad..1b3b765dc7 100644
--- a/types/react-icons/lib/md/sim-card.d.ts
+++ b/types/react-icons/lib/md/sim-card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSimCard extends React.Component<IconBaseProps> { }
+declare class MdSimCard extends React.Component<IconBaseProps> { }
+export = MdSimCard;
diff --git a/types/react-icons/lib/md/skip-next.d.ts b/types/react-icons/lib/md/skip-next.d.ts
index ecf5c1dc78..19737d3978 100644
--- a/types/react-icons/lib/md/skip-next.d.ts
+++ b/types/react-icons/lib/md/skip-next.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSkipNext extends React.Component<IconBaseProps> { }
+declare class MdSkipNext extends React.Component<IconBaseProps> { }
+export = MdSkipNext;
diff --git a/types/react-icons/lib/md/skip-previous.d.ts b/types/react-icons/lib/md/skip-previous.d.ts
index 93b71643d7..ae5c25aed6 100644
--- a/types/react-icons/lib/md/skip-previous.d.ts
+++ b/types/react-icons/lib/md/skip-previous.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSkipPrevious extends React.Component<IconBaseProps> { }
+declare class MdSkipPrevious extends React.Component<IconBaseProps> { }
+export = MdSkipPrevious;
diff --git a/types/react-icons/lib/md/slideshow.d.ts b/types/react-icons/lib/md/slideshow.d.ts
index 3604117de4..26cbf1a3c9 100644
--- a/types/react-icons/lib/md/slideshow.d.ts
+++ b/types/react-icons/lib/md/slideshow.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSlideshow extends React.Component<IconBaseProps> { }
+declare class MdSlideshow extends React.Component<IconBaseProps> { }
+export = MdSlideshow;
diff --git a/types/react-icons/lib/md/slow-motion-video.d.ts b/types/react-icons/lib/md/slow-motion-video.d.ts
index b1613e9196..03f4d610cb 100644
--- a/types/react-icons/lib/md/slow-motion-video.d.ts
+++ b/types/react-icons/lib/md/slow-motion-video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSlowMotionVideo extends React.Component<IconBaseProps> { }
+declare class MdSlowMotionVideo extends React.Component<IconBaseProps> { }
+export = MdSlowMotionVideo;
diff --git a/types/react-icons/lib/md/smartphone.d.ts b/types/react-icons/lib/md/smartphone.d.ts
index 48e919a7f2..697de1117a 100644
--- a/types/react-icons/lib/md/smartphone.d.ts
+++ b/types/react-icons/lib/md/smartphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmartphone extends React.Component<IconBaseProps> { }
+declare class MdSmartphone extends React.Component<IconBaseProps> { }
+export = MdSmartphone;
diff --git a/types/react-icons/lib/md/smoke-free.d.ts b/types/react-icons/lib/md/smoke-free.d.ts
index 494a9ffbed..bd0eed47da 100644
--- a/types/react-icons/lib/md/smoke-free.d.ts
+++ b/types/react-icons/lib/md/smoke-free.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmokeFree extends React.Component<IconBaseProps> { }
+declare class MdSmokeFree extends React.Component<IconBaseProps> { }
+export = MdSmokeFree;
diff --git a/types/react-icons/lib/md/smoking-rooms.d.ts b/types/react-icons/lib/md/smoking-rooms.d.ts
index 9793808427..f42b48f9b6 100644
--- a/types/react-icons/lib/md/smoking-rooms.d.ts
+++ b/types/react-icons/lib/md/smoking-rooms.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmokingRooms extends React.Component<IconBaseProps> { }
+declare class MdSmokingRooms extends React.Component<IconBaseProps> { }
+export = MdSmokingRooms;
diff --git a/types/react-icons/lib/md/sms-failed.d.ts b/types/react-icons/lib/md/sms-failed.d.ts
index ed04e950bd..c242d6783f 100644
--- a/types/react-icons/lib/md/sms-failed.d.ts
+++ b/types/react-icons/lib/md/sms-failed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmsFailed extends React.Component<IconBaseProps> { }
+declare class MdSmsFailed extends React.Component<IconBaseProps> { }
+export = MdSmsFailed;
diff --git a/types/react-icons/lib/md/sms.d.ts b/types/react-icons/lib/md/sms.d.ts
index bcdc21c622..4d1b01eba0 100644
--- a/types/react-icons/lib/md/sms.d.ts
+++ b/types/react-icons/lib/md/sms.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSms extends React.Component<IconBaseProps> { }
+declare class MdSms extends React.Component<IconBaseProps> { }
+export = MdSms;
diff --git a/types/react-icons/lib/md/snooze.d.ts b/types/react-icons/lib/md/snooze.d.ts
index 39ef1f6213..a3e93311de 100644
--- a/types/react-icons/lib/md/snooze.d.ts
+++ b/types/react-icons/lib/md/snooze.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSnooze extends React.Component<IconBaseProps> { }
+declare class MdSnooze extends React.Component<IconBaseProps> { }
+export = MdSnooze;
diff --git a/types/react-icons/lib/md/sort-by-alpha.d.ts b/types/react-icons/lib/md/sort-by-alpha.d.ts
index 1d823eec21..665ed0e19d 100644
--- a/types/react-icons/lib/md/sort-by-alpha.d.ts
+++ b/types/react-icons/lib/md/sort-by-alpha.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSortByAlpha extends React.Component<IconBaseProps> { }
+declare class MdSortByAlpha extends React.Component<IconBaseProps> { }
+export = MdSortByAlpha;
diff --git a/types/react-icons/lib/md/sort.d.ts b/types/react-icons/lib/md/sort.d.ts
index 4ae7f76a01..a0ca8a2d38 100644
--- a/types/react-icons/lib/md/sort.d.ts
+++ b/types/react-icons/lib/md/sort.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSort extends React.Component<IconBaseProps> { }
+declare class MdSort extends React.Component<IconBaseProps> { }
+export = MdSort;
diff --git a/types/react-icons/lib/md/spa.d.ts b/types/react-icons/lib/md/spa.d.ts
index 328203f62f..3b521477c1 100644
--- a/types/react-icons/lib/md/spa.d.ts
+++ b/types/react-icons/lib/md/spa.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpa extends React.Component<IconBaseProps> { }
+declare class MdSpa extends React.Component<IconBaseProps> { }
+export = MdSpa;
diff --git a/types/react-icons/lib/md/space-bar.d.ts b/types/react-icons/lib/md/space-bar.d.ts
index 861c34892a..4f0aee2b42 100644
--- a/types/react-icons/lib/md/space-bar.d.ts
+++ b/types/react-icons/lib/md/space-bar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpaceBar extends React.Component<IconBaseProps> { }
+declare class MdSpaceBar extends React.Component<IconBaseProps> { }
+export = MdSpaceBar;
diff --git a/types/react-icons/lib/md/speaker-group.d.ts b/types/react-icons/lib/md/speaker-group.d.ts
index 81915fc511..75ce013743 100644
--- a/types/react-icons/lib/md/speaker-group.d.ts
+++ b/types/react-icons/lib/md/speaker-group.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerGroup extends React.Component<IconBaseProps> { }
+declare class MdSpeakerGroup extends React.Component<IconBaseProps> { }
+export = MdSpeakerGroup;
diff --git a/types/react-icons/lib/md/speaker-notes-off.d.ts b/types/react-icons/lib/md/speaker-notes-off.d.ts
index bc5b008527..2ebed4d42f 100644
--- a/types/react-icons/lib/md/speaker-notes-off.d.ts
+++ b/types/react-icons/lib/md/speaker-notes-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerNotesOff extends React.Component<IconBaseProps> { }
+declare class MdSpeakerNotesOff extends React.Component<IconBaseProps> { }
+export = MdSpeakerNotesOff;
diff --git a/types/react-icons/lib/md/speaker-notes.d.ts b/types/react-icons/lib/md/speaker-notes.d.ts
index 1c3c0e4ddc..61dd9e47c9 100644
--- a/types/react-icons/lib/md/speaker-notes.d.ts
+++ b/types/react-icons/lib/md/speaker-notes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerNotes extends React.Component<IconBaseProps> { }
+declare class MdSpeakerNotes extends React.Component<IconBaseProps> { }
+export = MdSpeakerNotes;
diff --git a/types/react-icons/lib/md/speaker-phone.d.ts b/types/react-icons/lib/md/speaker-phone.d.ts
index b459a0c395..3a4a35bdd5 100644
--- a/types/react-icons/lib/md/speaker-phone.d.ts
+++ b/types/react-icons/lib/md/speaker-phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerPhone extends React.Component<IconBaseProps> { }
+declare class MdSpeakerPhone extends React.Component<IconBaseProps> { }
+export = MdSpeakerPhone;
diff --git a/types/react-icons/lib/md/speaker.d.ts b/types/react-icons/lib/md/speaker.d.ts
index 1f28f03e88..3028b1613f 100644
--- a/types/react-icons/lib/md/speaker.d.ts
+++ b/types/react-icons/lib/md/speaker.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeaker extends React.Component<IconBaseProps> { }
+declare class MdSpeaker extends React.Component<IconBaseProps> { }
+export = MdSpeaker;
diff --git a/types/react-icons/lib/md/spellcheck.d.ts b/types/react-icons/lib/md/spellcheck.d.ts
index 6b74288ebf..b537efca19 100644
--- a/types/react-icons/lib/md/spellcheck.d.ts
+++ b/types/react-icons/lib/md/spellcheck.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpellcheck extends React.Component<IconBaseProps> { }
+declare class MdSpellcheck extends React.Component<IconBaseProps> { }
+export = MdSpellcheck;
diff --git a/types/react-icons/lib/md/star-border.d.ts b/types/react-icons/lib/md/star-border.d.ts
index 2dda5ebb35..26a466ca5e 100644
--- a/types/react-icons/lib/md/star-border.d.ts
+++ b/types/react-icons/lib/md/star-border.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStarBorder extends React.Component<IconBaseProps> { }
+declare class MdStarBorder extends React.Component<IconBaseProps> { }
+export = MdStarBorder;
diff --git a/types/react-icons/lib/md/star-half.d.ts b/types/react-icons/lib/md/star-half.d.ts
index d6684bbfe0..d1e27756c1 100644
--- a/types/react-icons/lib/md/star-half.d.ts
+++ b/types/react-icons/lib/md/star-half.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStarHalf extends React.Component<IconBaseProps> { }
+declare class MdStarHalf extends React.Component<IconBaseProps> { }
+export = MdStarHalf;
diff --git a/types/react-icons/lib/md/star-outline.d.ts b/types/react-icons/lib/md/star-outline.d.ts
index 2b9f3546a3..1dcecb15ef 100644
--- a/types/react-icons/lib/md/star-outline.d.ts
+++ b/types/react-icons/lib/md/star-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStarOutline extends React.Component<IconBaseProps> { }
+declare class MdStarOutline extends React.Component<IconBaseProps> { }
+export = MdStarOutline;
diff --git a/types/react-icons/lib/md/star.d.ts b/types/react-icons/lib/md/star.d.ts
index f10524254e..292edc345b 100644
--- a/types/react-icons/lib/md/star.d.ts
+++ b/types/react-icons/lib/md/star.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStar extends React.Component<IconBaseProps> { }
+declare class MdStar extends React.Component<IconBaseProps> { }
+export = MdStar;
diff --git a/types/react-icons/lib/md/stars.d.ts b/types/react-icons/lib/md/stars.d.ts
index b92a32acd6..3d30f577df 100644
--- a/types/react-icons/lib/md/stars.d.ts
+++ b/types/react-icons/lib/md/stars.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStars extends React.Component<IconBaseProps> { }
+declare class MdStars extends React.Component<IconBaseProps> { }
+export = MdStars;
diff --git a/types/react-icons/lib/md/stay-current-landscape.d.ts b/types/react-icons/lib/md/stay-current-landscape.d.ts
index c2edfbaa27..8f141071de 100644
--- a/types/react-icons/lib/md/stay-current-landscape.d.ts
+++ b/types/react-icons/lib/md/stay-current-landscape.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayCurrentLandscape extends React.Component<IconBaseProps> { }
+declare class MdStayCurrentLandscape extends React.Component<IconBaseProps> { }
+export = MdStayCurrentLandscape;
diff --git a/types/react-icons/lib/md/stay-current-portrait.d.ts b/types/react-icons/lib/md/stay-current-portrait.d.ts
index 9f523f0514..d54460b6b1 100644
--- a/types/react-icons/lib/md/stay-current-portrait.d.ts
+++ b/types/react-icons/lib/md/stay-current-portrait.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayCurrentPortrait extends React.Component<IconBaseProps> { }
+declare class MdStayCurrentPortrait extends React.Component<IconBaseProps> { }
+export = MdStayCurrentPortrait;
diff --git a/types/react-icons/lib/md/stay-primary-landscape.d.ts b/types/react-icons/lib/md/stay-primary-landscape.d.ts
index 4cf222880a..c2259234a3 100644
--- a/types/react-icons/lib/md/stay-primary-landscape.d.ts
+++ b/types/react-icons/lib/md/stay-primary-landscape.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayPrimaryLandscape extends React.Component<IconBaseProps> { }
+declare class MdStayPrimaryLandscape extends React.Component<IconBaseProps> { }
+export = MdStayPrimaryLandscape;
diff --git a/types/react-icons/lib/md/stay-primary-portrait.d.ts b/types/react-icons/lib/md/stay-primary-portrait.d.ts
index e4371a0ff9..be1a0d3817 100644
--- a/types/react-icons/lib/md/stay-primary-portrait.d.ts
+++ b/types/react-icons/lib/md/stay-primary-portrait.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayPrimaryPortrait extends React.Component<IconBaseProps> { }
+declare class MdStayPrimaryPortrait extends React.Component<IconBaseProps> { }
+export = MdStayPrimaryPortrait;
diff --git a/types/react-icons/lib/md/stop-screen-share.d.ts b/types/react-icons/lib/md/stop-screen-share.d.ts
index aa6a7b1f11..0c86617ea9 100644
--- a/types/react-icons/lib/md/stop-screen-share.d.ts
+++ b/types/react-icons/lib/md/stop-screen-share.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStopScreenShare extends React.Component<IconBaseProps> { }
+declare class MdStopScreenShare extends React.Component<IconBaseProps> { }
+export = MdStopScreenShare;
diff --git a/types/react-icons/lib/md/stop.d.ts b/types/react-icons/lib/md/stop.d.ts
index 23972ad40d..ea68d49805 100644
--- a/types/react-icons/lib/md/stop.d.ts
+++ b/types/react-icons/lib/md/stop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStop extends React.Component<IconBaseProps> { }
+declare class MdStop extends React.Component<IconBaseProps> { }
+export = MdStop;
diff --git a/types/react-icons/lib/md/storage.d.ts b/types/react-icons/lib/md/storage.d.ts
index 76cdb38312..0f4792b3d4 100644
--- a/types/react-icons/lib/md/storage.d.ts
+++ b/types/react-icons/lib/md/storage.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStorage extends React.Component<IconBaseProps> { }
+declare class MdStorage extends React.Component<IconBaseProps> { }
+export = MdStorage;
diff --git a/types/react-icons/lib/md/store-mall-directory.d.ts b/types/react-icons/lib/md/store-mall-directory.d.ts
index 68d4294ade..2dc34f1f35 100644
--- a/types/react-icons/lib/md/store-mall-directory.d.ts
+++ b/types/react-icons/lib/md/store-mall-directory.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStoreMallDirectory extends React.Component<IconBaseProps> { }
+declare class MdStoreMallDirectory extends React.Component<IconBaseProps> { }
+export = MdStoreMallDirectory;
diff --git a/types/react-icons/lib/md/store.d.ts b/types/react-icons/lib/md/store.d.ts
index c64ab33e61..1d95da2946 100644
--- a/types/react-icons/lib/md/store.d.ts
+++ b/types/react-icons/lib/md/store.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStore extends React.Component<IconBaseProps> { }
+declare class MdStore extends React.Component<IconBaseProps> { }
+export = MdStore;
diff --git a/types/react-icons/lib/md/straighten.d.ts b/types/react-icons/lib/md/straighten.d.ts
index fa68ffb61f..2e5a378337 100644
--- a/types/react-icons/lib/md/straighten.d.ts
+++ b/types/react-icons/lib/md/straighten.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStraighten extends React.Component<IconBaseProps> { }
+declare class MdStraighten extends React.Component<IconBaseProps> { }
+export = MdStraighten;
diff --git a/types/react-icons/lib/md/streetview.d.ts b/types/react-icons/lib/md/streetview.d.ts
index b786fc4504..1a7a3b45d0 100644
--- a/types/react-icons/lib/md/streetview.d.ts
+++ b/types/react-icons/lib/md/streetview.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStreetview extends React.Component<IconBaseProps> { }
+declare class MdStreetview extends React.Component<IconBaseProps> { }
+export = MdStreetview;
diff --git a/types/react-icons/lib/md/strikethrough-s.d.ts b/types/react-icons/lib/md/strikethrough-s.d.ts
index 8ccb18a292..87f8a8f0ab 100644
--- a/types/react-icons/lib/md/strikethrough-s.d.ts
+++ b/types/react-icons/lib/md/strikethrough-s.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStrikethroughS extends React.Component<IconBaseProps> { }
+declare class MdStrikethroughS extends React.Component<IconBaseProps> { }
+export = MdStrikethroughS;
diff --git a/types/react-icons/lib/md/style.d.ts b/types/react-icons/lib/md/style.d.ts
index 6826a067a7..88ee608309 100644
--- a/types/react-icons/lib/md/style.d.ts
+++ b/types/react-icons/lib/md/style.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStyle extends React.Component<IconBaseProps> { }
+declare class MdStyle extends React.Component<IconBaseProps> { }
+export = MdStyle;
diff --git a/types/react-icons/lib/md/subdirectory-arrow-left.d.ts b/types/react-icons/lib/md/subdirectory-arrow-left.d.ts
index ebfbf45689..a286039679 100644
--- a/types/react-icons/lib/md/subdirectory-arrow-left.d.ts
+++ b/types/react-icons/lib/md/subdirectory-arrow-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubdirectoryArrowLeft extends React.Component<IconBaseProps> { }
+declare class MdSubdirectoryArrowLeft extends React.Component<IconBaseProps> { }
+export = MdSubdirectoryArrowLeft;
diff --git a/types/react-icons/lib/md/subdirectory-arrow-right.d.ts b/types/react-icons/lib/md/subdirectory-arrow-right.d.ts
index 435777e018..ffcfa27371 100644
--- a/types/react-icons/lib/md/subdirectory-arrow-right.d.ts
+++ b/types/react-icons/lib/md/subdirectory-arrow-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubdirectoryArrowRight extends React.Component<IconBaseProps> { }
+declare class MdSubdirectoryArrowRight extends React.Component<IconBaseProps> { }
+export = MdSubdirectoryArrowRight;
diff --git a/types/react-icons/lib/md/subject.d.ts b/types/react-icons/lib/md/subject.d.ts
index b187b836f2..4afd51814a 100644
--- a/types/react-icons/lib/md/subject.d.ts
+++ b/types/react-icons/lib/md/subject.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubject extends React.Component<IconBaseProps> { }
+declare class MdSubject extends React.Component<IconBaseProps> { }
+export = MdSubject;
diff --git a/types/react-icons/lib/md/subscriptions.d.ts b/types/react-icons/lib/md/subscriptions.d.ts
index 0baf020371..9859c711e1 100644
--- a/types/react-icons/lib/md/subscriptions.d.ts
+++ b/types/react-icons/lib/md/subscriptions.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubscriptions extends React.Component<IconBaseProps> { }
+declare class MdSubscriptions extends React.Component<IconBaseProps> { }
+export = MdSubscriptions;
diff --git a/types/react-icons/lib/md/subtitles.d.ts b/types/react-icons/lib/md/subtitles.d.ts
index 2cacca492e..ffb83e2279 100644
--- a/types/react-icons/lib/md/subtitles.d.ts
+++ b/types/react-icons/lib/md/subtitles.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubtitles extends React.Component<IconBaseProps> { }
+declare class MdSubtitles extends React.Component<IconBaseProps> { }
+export = MdSubtitles;
diff --git a/types/react-icons/lib/md/subway.d.ts b/types/react-icons/lib/md/subway.d.ts
index c5496480da..5e42542c3a 100644
--- a/types/react-icons/lib/md/subway.d.ts
+++ b/types/react-icons/lib/md/subway.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubway extends React.Component<IconBaseProps> { }
+declare class MdSubway extends React.Component<IconBaseProps> { }
+export = MdSubway;
diff --git a/types/react-icons/lib/md/supervisor-account.d.ts b/types/react-icons/lib/md/supervisor-account.d.ts
index 4c9b87c063..5782506380 100644
--- a/types/react-icons/lib/md/supervisor-account.d.ts
+++ b/types/react-icons/lib/md/supervisor-account.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSupervisorAccount extends React.Component<IconBaseProps> { }
+declare class MdSupervisorAccount extends React.Component<IconBaseProps> { }
+export = MdSupervisorAccount;
diff --git a/types/react-icons/lib/md/surround-sound.d.ts b/types/react-icons/lib/md/surround-sound.d.ts
index 673f1fdb7e..657ebe3879 100644
--- a/types/react-icons/lib/md/surround-sound.d.ts
+++ b/types/react-icons/lib/md/surround-sound.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSurroundSound extends React.Component<IconBaseProps> { }
+declare class MdSurroundSound extends React.Component<IconBaseProps> { }
+export = MdSurroundSound;
diff --git a/types/react-icons/lib/md/swap-calls.d.ts b/types/react-icons/lib/md/swap-calls.d.ts
index 5b6c5eb55b..881b0c264a 100644
--- a/types/react-icons/lib/md/swap-calls.d.ts
+++ b/types/react-icons/lib/md/swap-calls.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapCalls extends React.Component<IconBaseProps> { }
+declare class MdSwapCalls extends React.Component<IconBaseProps> { }
+export = MdSwapCalls;
diff --git a/types/react-icons/lib/md/swap-horiz.d.ts b/types/react-icons/lib/md/swap-horiz.d.ts
index da47fa6f40..e4a1771fd4 100644
--- a/types/react-icons/lib/md/swap-horiz.d.ts
+++ b/types/react-icons/lib/md/swap-horiz.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapHoriz extends React.Component<IconBaseProps> { }
+declare class MdSwapHoriz extends React.Component<IconBaseProps> { }
+export = MdSwapHoriz;
diff --git a/types/react-icons/lib/md/swap-vert.d.ts b/types/react-icons/lib/md/swap-vert.d.ts
index d034eaf517..d9b0f456d9 100644
--- a/types/react-icons/lib/md/swap-vert.d.ts
+++ b/types/react-icons/lib/md/swap-vert.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapVert extends React.Component<IconBaseProps> { }
+declare class MdSwapVert extends React.Component<IconBaseProps> { }
+export = MdSwapVert;
diff --git a/types/react-icons/lib/md/swap-vertical-circle.d.ts b/types/react-icons/lib/md/swap-vertical-circle.d.ts
index 617a1f6d9a..4503920d5c 100644
--- a/types/react-icons/lib/md/swap-vertical-circle.d.ts
+++ b/types/react-icons/lib/md/swap-vertical-circle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapVerticalCircle extends React.Component<IconBaseProps> { }
+declare class MdSwapVerticalCircle extends React.Component<IconBaseProps> { }
+export = MdSwapVerticalCircle;
diff --git a/types/react-icons/lib/md/switch-camera.d.ts b/types/react-icons/lib/md/switch-camera.d.ts
index c18ad57764..cb90ed5e99 100644
--- a/types/react-icons/lib/md/switch-camera.d.ts
+++ b/types/react-icons/lib/md/switch-camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwitchCamera extends React.Component<IconBaseProps> { }
+declare class MdSwitchCamera extends React.Component<IconBaseProps> { }
+export = MdSwitchCamera;
diff --git a/types/react-icons/lib/md/switch-video.d.ts b/types/react-icons/lib/md/switch-video.d.ts
index 0c95857fed..cdd65bb1cc 100644
--- a/types/react-icons/lib/md/switch-video.d.ts
+++ b/types/react-icons/lib/md/switch-video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwitchVideo extends React.Component<IconBaseProps> { }
+declare class MdSwitchVideo extends React.Component<IconBaseProps> { }
+export = MdSwitchVideo;
diff --git a/types/react-icons/lib/md/sync-disabled.d.ts b/types/react-icons/lib/md/sync-disabled.d.ts
index 99fa13f705..dbf6969ad0 100644
--- a/types/react-icons/lib/md/sync-disabled.d.ts
+++ b/types/react-icons/lib/md/sync-disabled.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSyncDisabled extends React.Component<IconBaseProps> { }
+declare class MdSyncDisabled extends React.Component<IconBaseProps> { }
+export = MdSyncDisabled;
diff --git a/types/react-icons/lib/md/sync-problem.d.ts b/types/react-icons/lib/md/sync-problem.d.ts
index 4ef37a1cbb..59f319beba 100644
--- a/types/react-icons/lib/md/sync-problem.d.ts
+++ b/types/react-icons/lib/md/sync-problem.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSyncProblem extends React.Component<IconBaseProps> { }
+declare class MdSyncProblem extends React.Component<IconBaseProps> { }
+export = MdSyncProblem;
diff --git a/types/react-icons/lib/md/sync.d.ts b/types/react-icons/lib/md/sync.d.ts
index fefdf38258..a5c49d0df3 100644
--- a/types/react-icons/lib/md/sync.d.ts
+++ b/types/react-icons/lib/md/sync.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSync extends React.Component<IconBaseProps> { }
+declare class MdSync extends React.Component<IconBaseProps> { }
+export = MdSync;
diff --git a/types/react-icons/lib/md/system-update-alt.d.ts b/types/react-icons/lib/md/system-update-alt.d.ts
index 2725f7b77c..18b532e6c3 100644
--- a/types/react-icons/lib/md/system-update-alt.d.ts
+++ b/types/react-icons/lib/md/system-update-alt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSystemUpdateAlt extends React.Component<IconBaseProps> { }
+declare class MdSystemUpdateAlt extends React.Component<IconBaseProps> { }
+export = MdSystemUpdateAlt;
diff --git a/types/react-icons/lib/md/system-update.d.ts b/types/react-icons/lib/md/system-update.d.ts
index 24ebe7c98c..f969e6836b 100644
--- a/types/react-icons/lib/md/system-update.d.ts
+++ b/types/react-icons/lib/md/system-update.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSystemUpdate extends React.Component<IconBaseProps> { }
+declare class MdSystemUpdate extends React.Component<IconBaseProps> { }
+export = MdSystemUpdate;
diff --git a/types/react-icons/lib/md/tab-unselected.d.ts b/types/react-icons/lib/md/tab-unselected.d.ts
index bac83b73ed..0b05c2debc 100644
--- a/types/react-icons/lib/md/tab-unselected.d.ts
+++ b/types/react-icons/lib/md/tab-unselected.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTabUnselected extends React.Component<IconBaseProps> { }
+declare class MdTabUnselected extends React.Component<IconBaseProps> { }
+export = MdTabUnselected;
diff --git a/types/react-icons/lib/md/tab.d.ts b/types/react-icons/lib/md/tab.d.ts
index 5fa18473c7..789ea85b5a 100644
--- a/types/react-icons/lib/md/tab.d.ts
+++ b/types/react-icons/lib/md/tab.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTab extends React.Component<IconBaseProps> { }
+declare class MdTab extends React.Component<IconBaseProps> { }
+export = MdTab;
diff --git a/types/react-icons/lib/md/tablet-android.d.ts b/types/react-icons/lib/md/tablet-android.d.ts
index 2f30739971..d7bf0e19e6 100644
--- a/types/react-icons/lib/md/tablet-android.d.ts
+++ b/types/react-icons/lib/md/tablet-android.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTabletAndroid extends React.Component<IconBaseProps> { }
+declare class MdTabletAndroid extends React.Component<IconBaseProps> { }
+export = MdTabletAndroid;
diff --git a/types/react-icons/lib/md/tablet-mac.d.ts b/types/react-icons/lib/md/tablet-mac.d.ts
index cad896f80b..e9cb6dd950 100644
--- a/types/react-icons/lib/md/tablet-mac.d.ts
+++ b/types/react-icons/lib/md/tablet-mac.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTabletMac extends React.Component<IconBaseProps> { }
+declare class MdTabletMac extends React.Component<IconBaseProps> { }
+export = MdTabletMac;
diff --git a/types/react-icons/lib/md/tablet.d.ts b/types/react-icons/lib/md/tablet.d.ts
index 839c55d2a9..b9cac8c14e 100644
--- a/types/react-icons/lib/md/tablet.d.ts
+++ b/types/react-icons/lib/md/tablet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTablet extends React.Component<IconBaseProps> { }
+declare class MdTablet extends React.Component<IconBaseProps> { }
+export = MdTablet;
diff --git a/types/react-icons/lib/md/tag-faces.d.ts b/types/react-icons/lib/md/tag-faces.d.ts
index 36fe31f9f7..657eda9788 100644
--- a/types/react-icons/lib/md/tag-faces.d.ts
+++ b/types/react-icons/lib/md/tag-faces.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTagFaces extends React.Component<IconBaseProps> { }
+declare class MdTagFaces extends React.Component<IconBaseProps> { }
+export = MdTagFaces;
diff --git a/types/react-icons/lib/md/tap-and-play.d.ts b/types/react-icons/lib/md/tap-and-play.d.ts
index 50203118f9..547c5676fd 100644
--- a/types/react-icons/lib/md/tap-and-play.d.ts
+++ b/types/react-icons/lib/md/tap-and-play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTapAndPlay extends React.Component<IconBaseProps> { }
+declare class MdTapAndPlay extends React.Component<IconBaseProps> { }
+export = MdTapAndPlay;
diff --git a/types/react-icons/lib/md/terrain.d.ts b/types/react-icons/lib/md/terrain.d.ts
index 89ddcb3ab1..faebcb3c1d 100644
--- a/types/react-icons/lib/md/terrain.d.ts
+++ b/types/react-icons/lib/md/terrain.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTerrain extends React.Component<IconBaseProps> { }
+declare class MdTerrain extends React.Component<IconBaseProps> { }
+export = MdTerrain;
diff --git a/types/react-icons/lib/md/text-fields.d.ts b/types/react-icons/lib/md/text-fields.d.ts
index 51d63798ed..e2f9f057b1 100644
--- a/types/react-icons/lib/md/text-fields.d.ts
+++ b/types/react-icons/lib/md/text-fields.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTextFields extends React.Component<IconBaseProps> { }
+declare class MdTextFields extends React.Component<IconBaseProps> { }
+export = MdTextFields;
diff --git a/types/react-icons/lib/md/text-format.d.ts b/types/react-icons/lib/md/text-format.d.ts
index ca4ef5d0b6..47ed038438 100644
--- a/types/react-icons/lib/md/text-format.d.ts
+++ b/types/react-icons/lib/md/text-format.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTextFormat extends React.Component<IconBaseProps> { }
+declare class MdTextFormat extends React.Component<IconBaseProps> { }
+export = MdTextFormat;
diff --git a/types/react-icons/lib/md/textsms.d.ts b/types/react-icons/lib/md/textsms.d.ts
index c8f57f986a..98e6a9b769 100644
--- a/types/react-icons/lib/md/textsms.d.ts
+++ b/types/react-icons/lib/md/textsms.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTextsms extends React.Component<IconBaseProps> { }
+declare class MdTextsms extends React.Component<IconBaseProps> { }
+export = MdTextsms;
diff --git a/types/react-icons/lib/md/texture.d.ts b/types/react-icons/lib/md/texture.d.ts
index 48805b49d0..c15e591c84 100644
--- a/types/react-icons/lib/md/texture.d.ts
+++ b/types/react-icons/lib/md/texture.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTexture extends React.Component<IconBaseProps> { }
+declare class MdTexture extends React.Component<IconBaseProps> { }
+export = MdTexture;
diff --git a/types/react-icons/lib/md/theaters.d.ts b/types/react-icons/lib/md/theaters.d.ts
index eeecdd668f..c604995528 100644
--- a/types/react-icons/lib/md/theaters.d.ts
+++ b/types/react-icons/lib/md/theaters.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTheaters extends React.Component<IconBaseProps> { }
+declare class MdTheaters extends React.Component<IconBaseProps> { }
+export = MdTheaters;
diff --git a/types/react-icons/lib/md/thumb-down.d.ts b/types/react-icons/lib/md/thumb-down.d.ts
index 412517a68f..fc08d83539 100644
--- a/types/react-icons/lib/md/thumb-down.d.ts
+++ b/types/react-icons/lib/md/thumb-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbDown extends React.Component<IconBaseProps> { }
+declare class MdThumbDown extends React.Component<IconBaseProps> { }
+export = MdThumbDown;
diff --git a/types/react-icons/lib/md/thumb-up.d.ts b/types/react-icons/lib/md/thumb-up.d.ts
index 4aedde1b4d..5057fd1814 100644
--- a/types/react-icons/lib/md/thumb-up.d.ts
+++ b/types/react-icons/lib/md/thumb-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbUp extends React.Component<IconBaseProps> { }
+declare class MdThumbUp extends React.Component<IconBaseProps> { }
+export = MdThumbUp;
diff --git a/types/react-icons/lib/md/thumbs-up-down.d.ts b/types/react-icons/lib/md/thumbs-up-down.d.ts
index f191397ff2..a445f15a80 100644
--- a/types/react-icons/lib/md/thumbs-up-down.d.ts
+++ b/types/react-icons/lib/md/thumbs-up-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbsUpDown extends React.Component<IconBaseProps> { }
+declare class MdThumbsUpDown extends React.Component<IconBaseProps> { }
+export = MdThumbsUpDown;
diff --git a/types/react-icons/lib/md/time-to-leave.d.ts b/types/react-icons/lib/md/time-to-leave.d.ts
index 6da47c86df..50743c05d3 100644
--- a/types/react-icons/lib/md/time-to-leave.d.ts
+++ b/types/react-icons/lib/md/time-to-leave.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimeToLeave extends React.Component<IconBaseProps> { }
+declare class MdTimeToLeave extends React.Component<IconBaseProps> { }
+export = MdTimeToLeave;
diff --git a/types/react-icons/lib/md/timelapse.d.ts b/types/react-icons/lib/md/timelapse.d.ts
index 57ac9ba997..e9b0763ffd 100644
--- a/types/react-icons/lib/md/timelapse.d.ts
+++ b/types/react-icons/lib/md/timelapse.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimelapse extends React.Component<IconBaseProps> { }
+declare class MdTimelapse extends React.Component<IconBaseProps> { }
+export = MdTimelapse;
diff --git a/types/react-icons/lib/md/timeline.d.ts b/types/react-icons/lib/md/timeline.d.ts
index e3c47270ce..ee9e8b0166 100644
--- a/types/react-icons/lib/md/timeline.d.ts
+++ b/types/react-icons/lib/md/timeline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimeline extends React.Component<IconBaseProps> { }
+declare class MdTimeline extends React.Component<IconBaseProps> { }
+export = MdTimeline;
diff --git a/types/react-icons/lib/md/timer-10.d.ts b/types/react-icons/lib/md/timer-10.d.ts
index 309eb0d095..2e31fb395a 100644
--- a/types/react-icons/lib/md/timer-10.d.ts
+++ b/types/react-icons/lib/md/timer-10.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer10 extends React.Component<IconBaseProps> { }
+declare class MdTimer10 extends React.Component<IconBaseProps> { }
+export = MdTimer10;
diff --git a/types/react-icons/lib/md/timer-3.d.ts b/types/react-icons/lib/md/timer-3.d.ts
index 16ffff55b0..8c51e54da2 100644
--- a/types/react-icons/lib/md/timer-3.d.ts
+++ b/types/react-icons/lib/md/timer-3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer3 extends React.Component<IconBaseProps> { }
+declare class MdTimer3 extends React.Component<IconBaseProps> { }
+export = MdTimer3;
diff --git a/types/react-icons/lib/md/timer-off.d.ts b/types/react-icons/lib/md/timer-off.d.ts
index 60b525d44f..1a42f31d52 100644
--- a/types/react-icons/lib/md/timer-off.d.ts
+++ b/types/react-icons/lib/md/timer-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimerOff extends React.Component<IconBaseProps> { }
+declare class MdTimerOff extends React.Component<IconBaseProps> { }
+export = MdTimerOff;
diff --git a/types/react-icons/lib/md/timer.d.ts b/types/react-icons/lib/md/timer.d.ts
index aefa851f3e..d3afd39d90 100644
--- a/types/react-icons/lib/md/timer.d.ts
+++ b/types/react-icons/lib/md/timer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer extends React.Component<IconBaseProps> { }
+declare class MdTimer extends React.Component<IconBaseProps> { }
+export = MdTimer;
diff --git a/types/react-icons/lib/md/title.d.ts b/types/react-icons/lib/md/title.d.ts
index 9585257382..16992b0ee7 100644
--- a/types/react-icons/lib/md/title.d.ts
+++ b/types/react-icons/lib/md/title.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTitle extends React.Component<IconBaseProps> { }
+declare class MdTitle extends React.Component<IconBaseProps> { }
+export = MdTitle;
diff --git a/types/react-icons/lib/md/toc.d.ts b/types/react-icons/lib/md/toc.d.ts
index cdd1be99e6..1e1f96bd5d 100644
--- a/types/react-icons/lib/md/toc.d.ts
+++ b/types/react-icons/lib/md/toc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToc extends React.Component<IconBaseProps> { }
+declare class MdToc extends React.Component<IconBaseProps> { }
+export = MdToc;
diff --git a/types/react-icons/lib/md/today.d.ts b/types/react-icons/lib/md/today.d.ts
index c21725c6bb..8f96a6812c 100644
--- a/types/react-icons/lib/md/today.d.ts
+++ b/types/react-icons/lib/md/today.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToday extends React.Component<IconBaseProps> { }
+declare class MdToday extends React.Component<IconBaseProps> { }
+export = MdToday;
diff --git a/types/react-icons/lib/md/toll.d.ts b/types/react-icons/lib/md/toll.d.ts
index a95cb48e8e..a37073a21e 100644
--- a/types/react-icons/lib/md/toll.d.ts
+++ b/types/react-icons/lib/md/toll.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToll extends React.Component<IconBaseProps> { }
+declare class MdToll extends React.Component<IconBaseProps> { }
+export = MdToll;
diff --git a/types/react-icons/lib/md/tonality.d.ts b/types/react-icons/lib/md/tonality.d.ts
index 21595adc48..e685396c61 100644
--- a/types/react-icons/lib/md/tonality.d.ts
+++ b/types/react-icons/lib/md/tonality.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTonality extends React.Component<IconBaseProps> { }
+declare class MdTonality extends React.Component<IconBaseProps> { }
+export = MdTonality;
diff --git a/types/react-icons/lib/md/touch-app.d.ts b/types/react-icons/lib/md/touch-app.d.ts
index f5052a4d41..76f018ca9a 100644
--- a/types/react-icons/lib/md/touch-app.d.ts
+++ b/types/react-icons/lib/md/touch-app.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTouchApp extends React.Component<IconBaseProps> { }
+declare class MdTouchApp extends React.Component<IconBaseProps> { }
+export = MdTouchApp;
diff --git a/types/react-icons/lib/md/toys.d.ts b/types/react-icons/lib/md/toys.d.ts
index 07ecd03fbd..504755d0a8 100644
--- a/types/react-icons/lib/md/toys.d.ts
+++ b/types/react-icons/lib/md/toys.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToys extends React.Component<IconBaseProps> { }
+declare class MdToys extends React.Component<IconBaseProps> { }
+export = MdToys;
diff --git a/types/react-icons/lib/md/track-changes.d.ts b/types/react-icons/lib/md/track-changes.d.ts
index a729929069..a7c1b75a20 100644
--- a/types/react-icons/lib/md/track-changes.d.ts
+++ b/types/react-icons/lib/md/track-changes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrackChanges extends React.Component<IconBaseProps> { }
+declare class MdTrackChanges extends React.Component<IconBaseProps> { }
+export = MdTrackChanges;
diff --git a/types/react-icons/lib/md/traffic.d.ts b/types/react-icons/lib/md/traffic.d.ts
index 41cb955abb..b3a0a6a3a5 100644
--- a/types/react-icons/lib/md/traffic.d.ts
+++ b/types/react-icons/lib/md/traffic.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTraffic extends React.Component<IconBaseProps> { }
+declare class MdTraffic extends React.Component<IconBaseProps> { }
+export = MdTraffic;
diff --git a/types/react-icons/lib/md/train.d.ts b/types/react-icons/lib/md/train.d.ts
index 88b32243ca..d96eb39965 100644
--- a/types/react-icons/lib/md/train.d.ts
+++ b/types/react-icons/lib/md/train.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrain extends React.Component<IconBaseProps> { }
+declare class MdTrain extends React.Component<IconBaseProps> { }
+export = MdTrain;
diff --git a/types/react-icons/lib/md/tram.d.ts b/types/react-icons/lib/md/tram.d.ts
index ac0677ac2f..c3a2eec3c2 100644
--- a/types/react-icons/lib/md/tram.d.ts
+++ b/types/react-icons/lib/md/tram.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTram extends React.Component<IconBaseProps> { }
+declare class MdTram extends React.Component<IconBaseProps> { }
+export = MdTram;
diff --git a/types/react-icons/lib/md/transfer-within-a-station.d.ts b/types/react-icons/lib/md/transfer-within-a-station.d.ts
index c8ab351a40..2519aeafbc 100644
--- a/types/react-icons/lib/md/transfer-within-a-station.d.ts
+++ b/types/react-icons/lib/md/transfer-within-a-station.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTransferWithinAStation extends React.Component<IconBaseProps> { }
+declare class MdTransferWithinAStation extends React.Component<IconBaseProps> { }
+export = MdTransferWithinAStation;
diff --git a/types/react-icons/lib/md/transform.d.ts b/types/react-icons/lib/md/transform.d.ts
index 3898a71c86..9f9278064e 100644
--- a/types/react-icons/lib/md/transform.d.ts
+++ b/types/react-icons/lib/md/transform.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTransform extends React.Component<IconBaseProps> { }
+declare class MdTransform extends React.Component<IconBaseProps> { }
+export = MdTransform;
diff --git a/types/react-icons/lib/md/translate.d.ts b/types/react-icons/lib/md/translate.d.ts
index f8d624afc1..cc70c04db5 100644
--- a/types/react-icons/lib/md/translate.d.ts
+++ b/types/react-icons/lib/md/translate.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTranslate extends React.Component<IconBaseProps> { }
+declare class MdTranslate extends React.Component<IconBaseProps> { }
+export = MdTranslate;
diff --git a/types/react-icons/lib/md/trending-down.d.ts b/types/react-icons/lib/md/trending-down.d.ts
index 00698234f5..a431260c06 100644
--- a/types/react-icons/lib/md/trending-down.d.ts
+++ b/types/react-icons/lib/md/trending-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingDown extends React.Component<IconBaseProps> { }
+declare class MdTrendingDown extends React.Component<IconBaseProps> { }
+export = MdTrendingDown;
diff --git a/types/react-icons/lib/md/trending-flat.d.ts b/types/react-icons/lib/md/trending-flat.d.ts
index b511527a55..f7539405ae 100644
--- a/types/react-icons/lib/md/trending-flat.d.ts
+++ b/types/react-icons/lib/md/trending-flat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingFlat extends React.Component<IconBaseProps> { }
+declare class MdTrendingFlat extends React.Component<IconBaseProps> { }
+export = MdTrendingFlat;
diff --git a/types/react-icons/lib/md/trending-neutral.d.ts b/types/react-icons/lib/md/trending-neutral.d.ts
index 0c3d3d1fc1..ca17f924e5 100644
--- a/types/react-icons/lib/md/trending-neutral.d.ts
+++ b/types/react-icons/lib/md/trending-neutral.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingNeutral extends React.Component<IconBaseProps> { }
+declare class MdTrendingNeutral extends React.Component<IconBaseProps> { }
+export = MdTrendingNeutral;
diff --git a/types/react-icons/lib/md/trending-up.d.ts b/types/react-icons/lib/md/trending-up.d.ts
index 4468236a4e..18ea6f8fdd 100644
--- a/types/react-icons/lib/md/trending-up.d.ts
+++ b/types/react-icons/lib/md/trending-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingUp extends React.Component<IconBaseProps> { }
+declare class MdTrendingUp extends React.Component<IconBaseProps> { }
+export = MdTrendingUp;
diff --git a/types/react-icons/lib/md/tune.d.ts b/types/react-icons/lib/md/tune.d.ts
index 76c17a1112..ab850a0554 100644
--- a/types/react-icons/lib/md/tune.d.ts
+++ b/types/react-icons/lib/md/tune.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTune extends React.Component<IconBaseProps> { }
+declare class MdTune extends React.Component<IconBaseProps> { }
+export = MdTune;
diff --git a/types/react-icons/lib/md/turned-in-not.d.ts b/types/react-icons/lib/md/turned-in-not.d.ts
index a2120936f2..6a9f029393 100644
--- a/types/react-icons/lib/md/turned-in-not.d.ts
+++ b/types/react-icons/lib/md/turned-in-not.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTurnedInNot extends React.Component<IconBaseProps> { }
+declare class MdTurnedInNot extends React.Component<IconBaseProps> { }
+export = MdTurnedInNot;
diff --git a/types/react-icons/lib/md/turned-in.d.ts b/types/react-icons/lib/md/turned-in.d.ts
index 685e4225f4..7e1f6ff237 100644
--- a/types/react-icons/lib/md/turned-in.d.ts
+++ b/types/react-icons/lib/md/turned-in.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTurnedIn extends React.Component<IconBaseProps> { }
+declare class MdTurnedIn extends React.Component<IconBaseProps> { }
+export = MdTurnedIn;
diff --git a/types/react-icons/lib/md/tv.d.ts b/types/react-icons/lib/md/tv.d.ts
index 4d184b9d39..6f6e2adebf 100644
--- a/types/react-icons/lib/md/tv.d.ts
+++ b/types/react-icons/lib/md/tv.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTv extends React.Component<IconBaseProps> { }
+declare class MdTv extends React.Component<IconBaseProps> { }
+export = MdTv;
diff --git a/types/react-icons/lib/md/unarchive.d.ts b/types/react-icons/lib/md/unarchive.d.ts
index 5fb2297759..f165b61f65 100644
--- a/types/react-icons/lib/md/unarchive.d.ts
+++ b/types/react-icons/lib/md/unarchive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUnarchive extends React.Component<IconBaseProps> { }
+declare class MdUnarchive extends React.Component<IconBaseProps> { }
+export = MdUnarchive;
diff --git a/types/react-icons/lib/md/undo.d.ts b/types/react-icons/lib/md/undo.d.ts
index 16cec6f9f2..a72def4605 100644
--- a/types/react-icons/lib/md/undo.d.ts
+++ b/types/react-icons/lib/md/undo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUndo extends React.Component<IconBaseProps> { }
+declare class MdUndo extends React.Component<IconBaseProps> { }
+export = MdUndo;
diff --git a/types/react-icons/lib/md/unfold-less.d.ts b/types/react-icons/lib/md/unfold-less.d.ts
index c13b17448f..4c2ab8a745 100644
--- a/types/react-icons/lib/md/unfold-less.d.ts
+++ b/types/react-icons/lib/md/unfold-less.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUnfoldLess extends React.Component<IconBaseProps> { }
+declare class MdUnfoldLess extends React.Component<IconBaseProps> { }
+export = MdUnfoldLess;
diff --git a/types/react-icons/lib/md/unfold-more.d.ts b/types/react-icons/lib/md/unfold-more.d.ts
index c87c91e57d..b776d661f4 100644
--- a/types/react-icons/lib/md/unfold-more.d.ts
+++ b/types/react-icons/lib/md/unfold-more.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUnfoldMore extends React.Component<IconBaseProps> { }
+declare class MdUnfoldMore extends React.Component<IconBaseProps> { }
+export = MdUnfoldMore;
diff --git a/types/react-icons/lib/md/update.d.ts b/types/react-icons/lib/md/update.d.ts
index bfc17eb008..1a2aa86383 100644
--- a/types/react-icons/lib/md/update.d.ts
+++ b/types/react-icons/lib/md/update.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUpdate extends React.Component<IconBaseProps> { }
+declare class MdUpdate extends React.Component<IconBaseProps> { }
+export = MdUpdate;
diff --git a/types/react-icons/lib/md/usb.d.ts b/types/react-icons/lib/md/usb.d.ts
index 66f7b5444e..0fd6160e84 100644
--- a/types/react-icons/lib/md/usb.d.ts
+++ b/types/react-icons/lib/md/usb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUsb extends React.Component<IconBaseProps> { }
+declare class MdUsb extends React.Component<IconBaseProps> { }
+export = MdUsb;
diff --git a/types/react-icons/lib/md/verified-user.d.ts b/types/react-icons/lib/md/verified-user.d.ts
index 680ba2575f..59252e57a8 100644
--- a/types/react-icons/lib/md/verified-user.d.ts
+++ b/types/react-icons/lib/md/verified-user.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerifiedUser extends React.Component<IconBaseProps> { }
+declare class MdVerifiedUser extends React.Component<IconBaseProps> { }
+export = MdVerifiedUser;
diff --git a/types/react-icons/lib/md/vertical-align-bottom.d.ts b/types/react-icons/lib/md/vertical-align-bottom.d.ts
index e172ed18d3..12c3ec8578 100644
--- a/types/react-icons/lib/md/vertical-align-bottom.d.ts
+++ b/types/react-icons/lib/md/vertical-align-bottom.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignBottom extends React.Component<IconBaseProps> { }
+declare class MdVerticalAlignBottom extends React.Component<IconBaseProps> { }
+export = MdVerticalAlignBottom;
diff --git a/types/react-icons/lib/md/vertical-align-center.d.ts b/types/react-icons/lib/md/vertical-align-center.d.ts
index f672e556c6..82a699826e 100644
--- a/types/react-icons/lib/md/vertical-align-center.d.ts
+++ b/types/react-icons/lib/md/vertical-align-center.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignCenter extends React.Component<IconBaseProps> { }
+declare class MdVerticalAlignCenter extends React.Component<IconBaseProps> { }
+export = MdVerticalAlignCenter;
diff --git a/types/react-icons/lib/md/vertical-align-top.d.ts b/types/react-icons/lib/md/vertical-align-top.d.ts
index 712e86f0e3..db6f9b91a0 100644
--- a/types/react-icons/lib/md/vertical-align-top.d.ts
+++ b/types/react-icons/lib/md/vertical-align-top.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignTop extends React.Component<IconBaseProps> { }
+declare class MdVerticalAlignTop extends React.Component<IconBaseProps> { }
+export = MdVerticalAlignTop;
diff --git a/types/react-icons/lib/md/vibration.d.ts b/types/react-icons/lib/md/vibration.d.ts
index 6f9b90222f..f2894c8316 100644
--- a/types/react-icons/lib/md/vibration.d.ts
+++ b/types/react-icons/lib/md/vibration.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVibration extends React.Component<IconBaseProps> { }
+declare class MdVibration extends React.Component<IconBaseProps> { }
+export = MdVibration;
diff --git a/types/react-icons/lib/md/video-call.d.ts b/types/react-icons/lib/md/video-call.d.ts
index b22ae1fcee..5db72a0980 100644
--- a/types/react-icons/lib/md/video-call.d.ts
+++ b/types/react-icons/lib/md/video-call.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoCall extends React.Component<IconBaseProps> { }
+declare class MdVideoCall extends React.Component<IconBaseProps> { }
+export = MdVideoCall;
diff --git a/types/react-icons/lib/md/video-collection.d.ts b/types/react-icons/lib/md/video-collection.d.ts
index 037903682d..0606a4604a 100644
--- a/types/react-icons/lib/md/video-collection.d.ts
+++ b/types/react-icons/lib/md/video-collection.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoCollection extends React.Component<IconBaseProps> { }
+declare class MdVideoCollection extends React.Component<IconBaseProps> { }
+export = MdVideoCollection;
diff --git a/types/react-icons/lib/md/video-label.d.ts b/types/react-icons/lib/md/video-label.d.ts
index b2dc4eb7d1..0a2cad4961 100644
--- a/types/react-icons/lib/md/video-label.d.ts
+++ b/types/react-icons/lib/md/video-label.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoLabel extends React.Component<IconBaseProps> { }
+declare class MdVideoLabel extends React.Component<IconBaseProps> { }
+export = MdVideoLabel;
diff --git a/types/react-icons/lib/md/video-library.d.ts b/types/react-icons/lib/md/video-library.d.ts
index 75bfe2a8aa..f862e3efb5 100644
--- a/types/react-icons/lib/md/video-library.d.ts
+++ b/types/react-icons/lib/md/video-library.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoLibrary extends React.Component<IconBaseProps> { }
+declare class MdVideoLibrary extends React.Component<IconBaseProps> { }
+export = MdVideoLibrary;
diff --git a/types/react-icons/lib/md/videocam-off.d.ts b/types/react-icons/lib/md/videocam-off.d.ts
index fd9d514107..fe0fb34a6c 100644
--- a/types/react-icons/lib/md/videocam-off.d.ts
+++ b/types/react-icons/lib/md/videocam-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideocamOff extends React.Component<IconBaseProps> { }
+declare class MdVideocamOff extends React.Component<IconBaseProps> { }
+export = MdVideocamOff;
diff --git a/types/react-icons/lib/md/videocam.d.ts b/types/react-icons/lib/md/videocam.d.ts
index 7dc49c3be4..01a77ed2cf 100644
--- a/types/react-icons/lib/md/videocam.d.ts
+++ b/types/react-icons/lib/md/videocam.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideocam extends React.Component<IconBaseProps> { }
+declare class MdVideocam extends React.Component<IconBaseProps> { }
+export = MdVideocam;
diff --git a/types/react-icons/lib/md/videogame-asset.d.ts b/types/react-icons/lib/md/videogame-asset.d.ts
index 7e49edf4f8..e548061de8 100644
--- a/types/react-icons/lib/md/videogame-asset.d.ts
+++ b/types/react-icons/lib/md/videogame-asset.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideogameAsset extends React.Component<IconBaseProps> { }
+declare class MdVideogameAsset extends React.Component<IconBaseProps> { }
+export = MdVideogameAsset;
diff --git a/types/react-icons/lib/md/view-agenda.d.ts b/types/react-icons/lib/md/view-agenda.d.ts
index 04beb28dd3..53fac822a9 100644
--- a/types/react-icons/lib/md/view-agenda.d.ts
+++ b/types/react-icons/lib/md/view-agenda.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewAgenda extends React.Component<IconBaseProps> { }
+declare class MdViewAgenda extends React.Component<IconBaseProps> { }
+export = MdViewAgenda;
diff --git a/types/react-icons/lib/md/view-array.d.ts b/types/react-icons/lib/md/view-array.d.ts
index 6b125ee5b6..61b4beecbf 100644
--- a/types/react-icons/lib/md/view-array.d.ts
+++ b/types/react-icons/lib/md/view-array.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewArray extends React.Component<IconBaseProps> { }
+declare class MdViewArray extends React.Component<IconBaseProps> { }
+export = MdViewArray;
diff --git a/types/react-icons/lib/md/view-carousel.d.ts b/types/react-icons/lib/md/view-carousel.d.ts
index da381e92f6..20a02bbfb8 100644
--- a/types/react-icons/lib/md/view-carousel.d.ts
+++ b/types/react-icons/lib/md/view-carousel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewCarousel extends React.Component<IconBaseProps> { }
+declare class MdViewCarousel extends React.Component<IconBaseProps> { }
+export = MdViewCarousel;
diff --git a/types/react-icons/lib/md/view-column.d.ts b/types/react-icons/lib/md/view-column.d.ts
index c5aaaea343..fbaa21ebf0 100644
--- a/types/react-icons/lib/md/view-column.d.ts
+++ b/types/react-icons/lib/md/view-column.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewColumn extends React.Component<IconBaseProps> { }
+declare class MdViewColumn extends React.Component<IconBaseProps> { }
+export = MdViewColumn;
diff --git a/types/react-icons/lib/md/view-comfortable.d.ts b/types/react-icons/lib/md/view-comfortable.d.ts
index 4a8277c807..8181bba3c7 100644
--- a/types/react-icons/lib/md/view-comfortable.d.ts
+++ b/types/react-icons/lib/md/view-comfortable.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewComfortable extends React.Component<IconBaseProps> { }
+declare class MdViewComfortable extends React.Component<IconBaseProps> { }
+export = MdViewComfortable;
diff --git a/types/react-icons/lib/md/view-comfy.d.ts b/types/react-icons/lib/md/view-comfy.d.ts
index a7004f4eee..4157bc557e 100644
--- a/types/react-icons/lib/md/view-comfy.d.ts
+++ b/types/react-icons/lib/md/view-comfy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewComfy extends React.Component<IconBaseProps> { }
+declare class MdViewComfy extends React.Component<IconBaseProps> { }
+export = MdViewComfy;
diff --git a/types/react-icons/lib/md/view-compact.d.ts b/types/react-icons/lib/md/view-compact.d.ts
index fefa73473f..6f4e159c9d 100644
--- a/types/react-icons/lib/md/view-compact.d.ts
+++ b/types/react-icons/lib/md/view-compact.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewCompact extends React.Component<IconBaseProps> { }
+declare class MdViewCompact extends React.Component<IconBaseProps> { }
+export = MdViewCompact;
diff --git a/types/react-icons/lib/md/view-day.d.ts b/types/react-icons/lib/md/view-day.d.ts
index 2013b75c21..934a0b4e69 100644
--- a/types/react-icons/lib/md/view-day.d.ts
+++ b/types/react-icons/lib/md/view-day.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewDay extends React.Component<IconBaseProps> { }
+declare class MdViewDay extends React.Component<IconBaseProps> { }
+export = MdViewDay;
diff --git a/types/react-icons/lib/md/view-headline.d.ts b/types/react-icons/lib/md/view-headline.d.ts
index b82272bf35..a06b4281ac 100644
--- a/types/react-icons/lib/md/view-headline.d.ts
+++ b/types/react-icons/lib/md/view-headline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewHeadline extends React.Component<IconBaseProps> { }
+declare class MdViewHeadline extends React.Component<IconBaseProps> { }
+export = MdViewHeadline;
diff --git a/types/react-icons/lib/md/view-list.d.ts b/types/react-icons/lib/md/view-list.d.ts
index e4cafe07c0..e082fed3a3 100644
--- a/types/react-icons/lib/md/view-list.d.ts
+++ b/types/react-icons/lib/md/view-list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewList extends React.Component<IconBaseProps> { }
+declare class MdViewList extends React.Component<IconBaseProps> { }
+export = MdViewList;
diff --git a/types/react-icons/lib/md/view-module.d.ts b/types/react-icons/lib/md/view-module.d.ts
index 745cf535be..c506509ece 100644
--- a/types/react-icons/lib/md/view-module.d.ts
+++ b/types/react-icons/lib/md/view-module.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewModule extends React.Component<IconBaseProps> { }
+declare class MdViewModule extends React.Component<IconBaseProps> { }
+export = MdViewModule;
diff --git a/types/react-icons/lib/md/view-quilt.d.ts b/types/react-icons/lib/md/view-quilt.d.ts
index f0e1e3694f..164d09766c 100644
--- a/types/react-icons/lib/md/view-quilt.d.ts
+++ b/types/react-icons/lib/md/view-quilt.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewQuilt extends React.Component<IconBaseProps> { }
+declare class MdViewQuilt extends React.Component<IconBaseProps> { }
+export = MdViewQuilt;
diff --git a/types/react-icons/lib/md/view-stream.d.ts b/types/react-icons/lib/md/view-stream.d.ts
index af7906aa62..8475058133 100644
--- a/types/react-icons/lib/md/view-stream.d.ts
+++ b/types/react-icons/lib/md/view-stream.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewStream extends React.Component<IconBaseProps> { }
+declare class MdViewStream extends React.Component<IconBaseProps> { }
+export = MdViewStream;
diff --git a/types/react-icons/lib/md/view-week.d.ts b/types/react-icons/lib/md/view-week.d.ts
index f40184d700..5841c02b24 100644
--- a/types/react-icons/lib/md/view-week.d.ts
+++ b/types/react-icons/lib/md/view-week.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewWeek extends React.Component<IconBaseProps> { }
+declare class MdViewWeek extends React.Component<IconBaseProps> { }
+export = MdViewWeek;
diff --git a/types/react-icons/lib/md/vignette.d.ts b/types/react-icons/lib/md/vignette.d.ts
index 0f34dde7dd..68828b9c4a 100644
--- a/types/react-icons/lib/md/vignette.d.ts
+++ b/types/react-icons/lib/md/vignette.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVignette extends React.Component<IconBaseProps> { }
+declare class MdVignette extends React.Component<IconBaseProps> { }
+export = MdVignette;
diff --git a/types/react-icons/lib/md/visibility-off.d.ts b/types/react-icons/lib/md/visibility-off.d.ts
index 679a746bd7..264ae51949 100644
--- a/types/react-icons/lib/md/visibility-off.d.ts
+++ b/types/react-icons/lib/md/visibility-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVisibilityOff extends React.Component<IconBaseProps> { }
+declare class MdVisibilityOff extends React.Component<IconBaseProps> { }
+export = MdVisibilityOff;
diff --git a/types/react-icons/lib/md/visibility.d.ts b/types/react-icons/lib/md/visibility.d.ts
index 59c3bb1f38..b264e21de9 100644
--- a/types/react-icons/lib/md/visibility.d.ts
+++ b/types/react-icons/lib/md/visibility.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVisibility extends React.Component<IconBaseProps> { }
+declare class MdVisibility extends React.Component<IconBaseProps> { }
+export = MdVisibility;
diff --git a/types/react-icons/lib/md/voice-chat.d.ts b/types/react-icons/lib/md/voice-chat.d.ts
index a64ac1bee4..5a734456a1 100644
--- a/types/react-icons/lib/md/voice-chat.d.ts
+++ b/types/react-icons/lib/md/voice-chat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVoiceChat extends React.Component<IconBaseProps> { }
+declare class MdVoiceChat extends React.Component<IconBaseProps> { }
+export = MdVoiceChat;
diff --git a/types/react-icons/lib/md/voicemail.d.ts b/types/react-icons/lib/md/voicemail.d.ts
index bf922ef49e..b91bb52445 100644
--- a/types/react-icons/lib/md/voicemail.d.ts
+++ b/types/react-icons/lib/md/voicemail.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVoicemail extends React.Component<IconBaseProps> { }
+declare class MdVoicemail extends React.Component<IconBaseProps> { }
+export = MdVoicemail;
diff --git a/types/react-icons/lib/md/volume-down.d.ts b/types/react-icons/lib/md/volume-down.d.ts
index f7a335c1c7..e0acee5522 100644
--- a/types/react-icons/lib/md/volume-down.d.ts
+++ b/types/react-icons/lib/md/volume-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeDown extends React.Component<IconBaseProps> { }
+declare class MdVolumeDown extends React.Component<IconBaseProps> { }
+export = MdVolumeDown;
diff --git a/types/react-icons/lib/md/volume-mute.d.ts b/types/react-icons/lib/md/volume-mute.d.ts
index 566bbe0003..9baa94e9d3 100644
--- a/types/react-icons/lib/md/volume-mute.d.ts
+++ b/types/react-icons/lib/md/volume-mute.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeMute extends React.Component<IconBaseProps> { }
+declare class MdVolumeMute extends React.Component<IconBaseProps> { }
+export = MdVolumeMute;
diff --git a/types/react-icons/lib/md/volume-off.d.ts b/types/react-icons/lib/md/volume-off.d.ts
index 74acca188c..91482e854b 100644
--- a/types/react-icons/lib/md/volume-off.d.ts
+++ b/types/react-icons/lib/md/volume-off.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeOff extends React.Component<IconBaseProps> { }
+declare class MdVolumeOff extends React.Component<IconBaseProps> { }
+export = MdVolumeOff;
diff --git a/types/react-icons/lib/md/volume-up.d.ts b/types/react-icons/lib/md/volume-up.d.ts
index 28387e23f0..fae49fd042 100644
--- a/types/react-icons/lib/md/volume-up.d.ts
+++ b/types/react-icons/lib/md/volume-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeUp extends React.Component<IconBaseProps> { }
+declare class MdVolumeUp extends React.Component<IconBaseProps> { }
+export = MdVolumeUp;
diff --git a/types/react-icons/lib/md/vpn-key.d.ts b/types/react-icons/lib/md/vpn-key.d.ts
index e2325babe7..aafd41a6b4 100644
--- a/types/react-icons/lib/md/vpn-key.d.ts
+++ b/types/react-icons/lib/md/vpn-key.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVpnKey extends React.Component<IconBaseProps> { }
+declare class MdVpnKey extends React.Component<IconBaseProps> { }
+export = MdVpnKey;
diff --git a/types/react-icons/lib/md/vpn-lock.d.ts b/types/react-icons/lib/md/vpn-lock.d.ts
index b83205b117..5495b04cd7 100644
--- a/types/react-icons/lib/md/vpn-lock.d.ts
+++ b/types/react-icons/lib/md/vpn-lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVpnLock extends React.Component<IconBaseProps> { }
+declare class MdVpnLock extends React.Component<IconBaseProps> { }
+export = MdVpnLock;
diff --git a/types/react-icons/lib/md/wallpaper.d.ts b/types/react-icons/lib/md/wallpaper.d.ts
index ea0485412f..66d579f3ee 100644
--- a/types/react-icons/lib/md/wallpaper.d.ts
+++ b/types/react-icons/lib/md/wallpaper.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWallpaper extends React.Component<IconBaseProps> { }
+declare class MdWallpaper extends React.Component<IconBaseProps> { }
+export = MdWallpaper;
diff --git a/types/react-icons/lib/md/warning.d.ts b/types/react-icons/lib/md/warning.d.ts
index 74ec79fe30..a8b475203d 100644
--- a/types/react-icons/lib/md/warning.d.ts
+++ b/types/react-icons/lib/md/warning.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWarning extends React.Component<IconBaseProps> { }
+declare class MdWarning extends React.Component<IconBaseProps> { }
+export = MdWarning;
diff --git a/types/react-icons/lib/md/watch-later.d.ts b/types/react-icons/lib/md/watch-later.d.ts
index c4dc2a3b49..21a18dda02 100644
--- a/types/react-icons/lib/md/watch-later.d.ts
+++ b/types/react-icons/lib/md/watch-later.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWatchLater extends React.Component<IconBaseProps> { }
+declare class MdWatchLater extends React.Component<IconBaseProps> { }
+export = MdWatchLater;
diff --git a/types/react-icons/lib/md/watch.d.ts b/types/react-icons/lib/md/watch.d.ts
index ae09dcd597..291523e27c 100644
--- a/types/react-icons/lib/md/watch.d.ts
+++ b/types/react-icons/lib/md/watch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWatch extends React.Component<IconBaseProps> { }
+declare class MdWatch extends React.Component<IconBaseProps> { }
+export = MdWatch;
diff --git a/types/react-icons/lib/md/wb-auto.d.ts b/types/react-icons/lib/md/wb-auto.d.ts
index 216d3b41dc..6a04f806fa 100644
--- a/types/react-icons/lib/md/wb-auto.d.ts
+++ b/types/react-icons/lib/md/wb-auto.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbAuto extends React.Component<IconBaseProps> { }
+declare class MdWbAuto extends React.Component<IconBaseProps> { }
+export = MdWbAuto;
diff --git a/types/react-icons/lib/md/wb-cloudy.d.ts b/types/react-icons/lib/md/wb-cloudy.d.ts
index 2ad62d4341..864fc65090 100644
--- a/types/react-icons/lib/md/wb-cloudy.d.ts
+++ b/types/react-icons/lib/md/wb-cloudy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbCloudy extends React.Component<IconBaseProps> { }
+declare class MdWbCloudy extends React.Component<IconBaseProps> { }
+export = MdWbCloudy;
diff --git a/types/react-icons/lib/md/wb-incandescent.d.ts b/types/react-icons/lib/md/wb-incandescent.d.ts
index 52b597fc99..05fbebfcbb 100644
--- a/types/react-icons/lib/md/wb-incandescent.d.ts
+++ b/types/react-icons/lib/md/wb-incandescent.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbIncandescent extends React.Component<IconBaseProps> { }
+declare class MdWbIncandescent extends React.Component<IconBaseProps> { }
+export = MdWbIncandescent;
diff --git a/types/react-icons/lib/md/wb-iridescent.d.ts b/types/react-icons/lib/md/wb-iridescent.d.ts
index 6d16c62bba..ec599b0fc4 100644
--- a/types/react-icons/lib/md/wb-iridescent.d.ts
+++ b/types/react-icons/lib/md/wb-iridescent.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbIridescent extends React.Component<IconBaseProps> { }
+declare class MdWbIridescent extends React.Component<IconBaseProps> { }
+export = MdWbIridescent;
diff --git a/types/react-icons/lib/md/wb-sunny.d.ts b/types/react-icons/lib/md/wb-sunny.d.ts
index e8bd77c743..14d7d0c115 100644
--- a/types/react-icons/lib/md/wb-sunny.d.ts
+++ b/types/react-icons/lib/md/wb-sunny.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbSunny extends React.Component<IconBaseProps> { }
+declare class MdWbSunny extends React.Component<IconBaseProps> { }
+export = MdWbSunny;
diff --git a/types/react-icons/lib/md/wc.d.ts b/types/react-icons/lib/md/wc.d.ts
index 9e9cde374f..acc9160928 100644
--- a/types/react-icons/lib/md/wc.d.ts
+++ b/types/react-icons/lib/md/wc.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWc extends React.Component<IconBaseProps> { }
+declare class MdWc extends React.Component<IconBaseProps> { }
+export = MdWc;
diff --git a/types/react-icons/lib/md/web-asset.d.ts b/types/react-icons/lib/md/web-asset.d.ts
index 1871d94e5f..3296ddb2f3 100644
--- a/types/react-icons/lib/md/web-asset.d.ts
+++ b/types/react-icons/lib/md/web-asset.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWebAsset extends React.Component<IconBaseProps> { }
+declare class MdWebAsset extends React.Component<IconBaseProps> { }
+export = MdWebAsset;
diff --git a/types/react-icons/lib/md/web.d.ts b/types/react-icons/lib/md/web.d.ts
index 0a6c41e697..93fc4bf2af 100644
--- a/types/react-icons/lib/md/web.d.ts
+++ b/types/react-icons/lib/md/web.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWeb extends React.Component<IconBaseProps> { }
+declare class MdWeb extends React.Component<IconBaseProps> { }
+export = MdWeb;
diff --git a/types/react-icons/lib/md/weekend.d.ts b/types/react-icons/lib/md/weekend.d.ts
index 4a7c411c87..1e93ea3441 100644
--- a/types/react-icons/lib/md/weekend.d.ts
+++ b/types/react-icons/lib/md/weekend.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWeekend extends React.Component<IconBaseProps> { }
+declare class MdWeekend extends React.Component<IconBaseProps> { }
+export = MdWeekend;
diff --git a/types/react-icons/lib/md/whatshot.d.ts b/types/react-icons/lib/md/whatshot.d.ts
index cf16b36c37..8e520abd52 100644
--- a/types/react-icons/lib/md/whatshot.d.ts
+++ b/types/react-icons/lib/md/whatshot.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWhatshot extends React.Component<IconBaseProps> { }
+declare class MdWhatshot extends React.Component<IconBaseProps> { }
+export = MdWhatshot;
diff --git a/types/react-icons/lib/md/widgets.d.ts b/types/react-icons/lib/md/widgets.d.ts
index ea00e70e7b..b45a27f5ba 100644
--- a/types/react-icons/lib/md/widgets.d.ts
+++ b/types/react-icons/lib/md/widgets.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWidgets extends React.Component<IconBaseProps> { }
+declare class MdWidgets extends React.Component<IconBaseProps> { }
+export = MdWidgets;
diff --git a/types/react-icons/lib/md/wifi-lock.d.ts b/types/react-icons/lib/md/wifi-lock.d.ts
index 58c31bb22c..ed1338f365 100644
--- a/types/react-icons/lib/md/wifi-lock.d.ts
+++ b/types/react-icons/lib/md/wifi-lock.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWifiLock extends React.Component<IconBaseProps> { }
+declare class MdWifiLock extends React.Component<IconBaseProps> { }
+export = MdWifiLock;
diff --git a/types/react-icons/lib/md/wifi-tethering.d.ts b/types/react-icons/lib/md/wifi-tethering.d.ts
index 580c2fe273..8757a657b7 100644
--- a/types/react-icons/lib/md/wifi-tethering.d.ts
+++ b/types/react-icons/lib/md/wifi-tethering.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWifiTethering extends React.Component<IconBaseProps> { }
+declare class MdWifiTethering extends React.Component<IconBaseProps> { }
+export = MdWifiTethering;
diff --git a/types/react-icons/lib/md/wifi.d.ts b/types/react-icons/lib/md/wifi.d.ts
index ee81b9f84c..2e5f681b39 100644
--- a/types/react-icons/lib/md/wifi.d.ts
+++ b/types/react-icons/lib/md/wifi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWifi extends React.Component<IconBaseProps> { }
+declare class MdWifi extends React.Component<IconBaseProps> { }
+export = MdWifi;
diff --git a/types/react-icons/lib/md/work.d.ts b/types/react-icons/lib/md/work.d.ts
index 8b1f10367f..af2a4e42e5 100644
--- a/types/react-icons/lib/md/work.d.ts
+++ b/types/react-icons/lib/md/work.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWork extends React.Component<IconBaseProps> { }
+declare class MdWork extends React.Component<IconBaseProps> { }
+export = MdWork;
diff --git a/types/react-icons/lib/md/wrap-text.d.ts b/types/react-icons/lib/md/wrap-text.d.ts
index 4e90b8190a..bc2554bf0e 100644
--- a/types/react-icons/lib/md/wrap-text.d.ts
+++ b/types/react-icons/lib/md/wrap-text.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWrapText extends React.Component<IconBaseProps> { }
+declare class MdWrapText extends React.Component<IconBaseProps> { }
+export = MdWrapText;
diff --git a/types/react-icons/lib/md/youtube-searched-for.d.ts b/types/react-icons/lib/md/youtube-searched-for.d.ts
index 0267e151dc..05c2c2c706 100644
--- a/types/react-icons/lib/md/youtube-searched-for.d.ts
+++ b/types/react-icons/lib/md/youtube-searched-for.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdYoutubeSearchedFor extends React.Component<IconBaseProps> { }
+declare class MdYoutubeSearchedFor extends React.Component<IconBaseProps> { }
+export = MdYoutubeSearchedFor;
diff --git a/types/react-icons/lib/md/zoom-in.d.ts b/types/react-icons/lib/md/zoom-in.d.ts
index 068a0d9bd7..2bba2417c0 100644
--- a/types/react-icons/lib/md/zoom-in.d.ts
+++ b/types/react-icons/lib/md/zoom-in.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomIn extends React.Component<IconBaseProps> { }
+declare class MdZoomIn extends React.Component<IconBaseProps> { }
+export = MdZoomIn;
diff --git a/types/react-icons/lib/md/zoom-out-map.d.ts b/types/react-icons/lib/md/zoom-out-map.d.ts
index 4d526d0095..4b79de0d14 100644
--- a/types/react-icons/lib/md/zoom-out-map.d.ts
+++ b/types/react-icons/lib/md/zoom-out-map.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomOutMap extends React.Component<IconBaseProps> { }
+declare class MdZoomOutMap extends React.Component<IconBaseProps> { }
+export = MdZoomOutMap;
diff --git a/types/react-icons/lib/md/zoom-out.d.ts b/types/react-icons/lib/md/zoom-out.d.ts
index 54862f1b45..630db0d75c 100644
--- a/types/react-icons/lib/md/zoom-out.d.ts
+++ b/types/react-icons/lib/md/zoom-out.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomOut extends React.Component<IconBaseProps> { }
+declare class MdZoomOut extends React.Component<IconBaseProps> { }
+export = MdZoomOut;
diff --git a/types/react-icons/lib/ti/adjust-brightness.d.ts b/types/react-icons/lib/ti/adjust-brightness.d.ts
index 5beec88e6a..4f581f784b 100644
--- a/types/react-icons/lib/ti/adjust-brightness.d.ts
+++ b/types/react-icons/lib/ti/adjust-brightness.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAdjustBrightness extends React.Component<IconBaseProps> { }
+declare class TiAdjustBrightness extends React.Component<IconBaseProps> { }
+export = TiAdjustBrightness;
diff --git a/types/react-icons/lib/ti/adjust-contrast.d.ts b/types/react-icons/lib/ti/adjust-contrast.d.ts
index 2d49b0ce59..e85f43a11f 100644
--- a/types/react-icons/lib/ti/adjust-contrast.d.ts
+++ b/types/react-icons/lib/ti/adjust-contrast.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAdjustContrast extends React.Component<IconBaseProps> { }
+declare class TiAdjustContrast extends React.Component<IconBaseProps> { }
+export = TiAdjustContrast;
diff --git a/types/react-icons/lib/ti/anchor-outline.d.ts b/types/react-icons/lib/ti/anchor-outline.d.ts
index 7a9bc3ab6e..fb0b412883 100644
--- a/types/react-icons/lib/ti/anchor-outline.d.ts
+++ b/types/react-icons/lib/ti/anchor-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAnchorOutline extends React.Component<IconBaseProps> { }
+declare class TiAnchorOutline extends React.Component<IconBaseProps> { }
+export = TiAnchorOutline;
diff --git a/types/react-icons/lib/ti/anchor.d.ts b/types/react-icons/lib/ti/anchor.d.ts
index 3c90ca1623..ac2d26168c 100644
--- a/types/react-icons/lib/ti/anchor.d.ts
+++ b/types/react-icons/lib/ti/anchor.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAnchor extends React.Component<IconBaseProps> { }
+declare class TiAnchor extends React.Component<IconBaseProps> { }
+export = TiAnchor;
diff --git a/types/react-icons/lib/ti/archive.d.ts b/types/react-icons/lib/ti/archive.d.ts
index 22c92eab3d..1019b6d92a 100644
--- a/types/react-icons/lib/ti/archive.d.ts
+++ b/types/react-icons/lib/ti/archive.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArchive extends React.Component<IconBaseProps> { }
+declare class TiArchive extends React.Component<IconBaseProps> { }
+export = TiArchive;
diff --git a/types/react-icons/lib/ti/arrow-back-outline.d.ts b/types/react-icons/lib/ti/arrow-back-outline.d.ts
index c168ae0809..6f675bcea3 100644
--- a/types/react-icons/lib/ti/arrow-back-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-back-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowBackOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowBackOutline extends React.Component<IconBaseProps> { }
+export = TiArrowBackOutline;
diff --git a/types/react-icons/lib/ti/arrow-back.d.ts b/types/react-icons/lib/ti/arrow-back.d.ts
index 5eb11665a2..8611134a00 100644
--- a/types/react-icons/lib/ti/arrow-back.d.ts
+++ b/types/react-icons/lib/ti/arrow-back.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowBack extends React.Component<IconBaseProps> { }
+declare class TiArrowBack extends React.Component<IconBaseProps> { }
+export = TiArrowBack;
diff --git a/types/react-icons/lib/ti/arrow-down-outline.d.ts b/types/react-icons/lib/ti/arrow-down-outline.d.ts
index 17ff0d0547..a86d68da84 100644
--- a/types/react-icons/lib/ti/arrow-down-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-down-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDownOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowDownOutline extends React.Component<IconBaseProps> { }
+export = TiArrowDownOutline;
diff --git a/types/react-icons/lib/ti/arrow-down-thick.d.ts b/types/react-icons/lib/ti/arrow-down-thick.d.ts
index 450cbe6467..e7a17aafb5 100644
--- a/types/react-icons/lib/ti/arrow-down-thick.d.ts
+++ b/types/react-icons/lib/ti/arrow-down-thick.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDownThick extends React.Component<IconBaseProps> { }
+declare class TiArrowDownThick extends React.Component<IconBaseProps> { }
+export = TiArrowDownThick;
diff --git a/types/react-icons/lib/ti/arrow-down.d.ts b/types/react-icons/lib/ti/arrow-down.d.ts
index fcb3596caf..58a7f75bc3 100644
--- a/types/react-icons/lib/ti/arrow-down.d.ts
+++ b/types/react-icons/lib/ti/arrow-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDown extends React.Component<IconBaseProps> { }
+declare class TiArrowDown extends React.Component<IconBaseProps> { }
+export = TiArrowDown;
diff --git a/types/react-icons/lib/ti/arrow-forward-outline.d.ts b/types/react-icons/lib/ti/arrow-forward-outline.d.ts
index 610881bf2d..6075344eba 100644
--- a/types/react-icons/lib/ti/arrow-forward-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-forward-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowForwardOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowForwardOutline extends React.Component<IconBaseProps> { }
+export = TiArrowForwardOutline;
diff --git a/types/react-icons/lib/ti/arrow-forward.d.ts b/types/react-icons/lib/ti/arrow-forward.d.ts
index a4291100ca..f2729f5d2c 100644
--- a/types/react-icons/lib/ti/arrow-forward.d.ts
+++ b/types/react-icons/lib/ti/arrow-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowForward extends React.Component<IconBaseProps> { }
+declare class TiArrowForward extends React.Component<IconBaseProps> { }
+export = TiArrowForward;
diff --git a/types/react-icons/lib/ti/arrow-left-outline.d.ts b/types/react-icons/lib/ti/arrow-left-outline.d.ts
index fb50e3e8ae..033e464649 100644
--- a/types/react-icons/lib/ti/arrow-left-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-left-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeftOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowLeftOutline extends React.Component<IconBaseProps> { }
+export = TiArrowLeftOutline;
diff --git a/types/react-icons/lib/ti/arrow-left-thick.d.ts b/types/react-icons/lib/ti/arrow-left-thick.d.ts
index 4c5bf0e54e..e3a016cb1f 100644
--- a/types/react-icons/lib/ti/arrow-left-thick.d.ts
+++ b/types/react-icons/lib/ti/arrow-left-thick.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeftThick extends React.Component<IconBaseProps> { }
+declare class TiArrowLeftThick extends React.Component<IconBaseProps> { }
+export = TiArrowLeftThick;
diff --git a/types/react-icons/lib/ti/arrow-left.d.ts b/types/react-icons/lib/ti/arrow-left.d.ts
index f4ae370d36..0555a99412 100644
--- a/types/react-icons/lib/ti/arrow-left.d.ts
+++ b/types/react-icons/lib/ti/arrow-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeft extends React.Component<IconBaseProps> { }
+declare class TiArrowLeft extends React.Component<IconBaseProps> { }
+export = TiArrowLeft;
diff --git a/types/react-icons/lib/ti/arrow-loop-outline.d.ts b/types/react-icons/lib/ti/arrow-loop-outline.d.ts
index 40da459c5f..fdbbb8fa42 100644
--- a/types/react-icons/lib/ti/arrow-loop-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-loop-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLoopOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowLoopOutline extends React.Component<IconBaseProps> { }
+export = TiArrowLoopOutline;
diff --git a/types/react-icons/lib/ti/arrow-loop.d.ts b/types/react-icons/lib/ti/arrow-loop.d.ts
index e4d207fe46..40fee9ff24 100644
--- a/types/react-icons/lib/ti/arrow-loop.d.ts
+++ b/types/react-icons/lib/ti/arrow-loop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLoop extends React.Component<IconBaseProps> { }
+declare class TiArrowLoop extends React.Component<IconBaseProps> { }
+export = TiArrowLoop;
diff --git a/types/react-icons/lib/ti/arrow-maximise-outline.d.ts b/types/react-icons/lib/ti/arrow-maximise-outline.d.ts
index e6900ecdb4..431e6599f7 100644
--- a/types/react-icons/lib/ti/arrow-maximise-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-maximise-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMaximiseOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowMaximiseOutline extends React.Component<IconBaseProps> { }
+export = TiArrowMaximiseOutline;
diff --git a/types/react-icons/lib/ti/arrow-maximise.d.ts b/types/react-icons/lib/ti/arrow-maximise.d.ts
index 14797e2179..f3521df247 100644
--- a/types/react-icons/lib/ti/arrow-maximise.d.ts
+++ b/types/react-icons/lib/ti/arrow-maximise.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMaximise extends React.Component<IconBaseProps> { }
+declare class TiArrowMaximise extends React.Component<IconBaseProps> { }
+export = TiArrowMaximise;
diff --git a/types/react-icons/lib/ti/arrow-minimise-outline.d.ts b/types/react-icons/lib/ti/arrow-minimise-outline.d.ts
index 16e1c2c67d..93cfee26c2 100644
--- a/types/react-icons/lib/ti/arrow-minimise-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-minimise-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMinimiseOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowMinimiseOutline extends React.Component<IconBaseProps> { }
+export = TiArrowMinimiseOutline;
diff --git a/types/react-icons/lib/ti/arrow-minimise.d.ts b/types/react-icons/lib/ti/arrow-minimise.d.ts
index 557625ec1a..531d6414e7 100644
--- a/types/react-icons/lib/ti/arrow-minimise.d.ts
+++ b/types/react-icons/lib/ti/arrow-minimise.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMinimise extends React.Component<IconBaseProps> { }
+declare class TiArrowMinimise extends React.Component<IconBaseProps> { }
+export = TiArrowMinimise;
diff --git a/types/react-icons/lib/ti/arrow-move-outline.d.ts b/types/react-icons/lib/ti/arrow-move-outline.d.ts
index 0035cbddca..510ae78ebe 100644
--- a/types/react-icons/lib/ti/arrow-move-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-move-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMoveOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowMoveOutline extends React.Component<IconBaseProps> { }
+export = TiArrowMoveOutline;
diff --git a/types/react-icons/lib/ti/arrow-move.d.ts b/types/react-icons/lib/ti/arrow-move.d.ts
index 974082e4ed..ee02e3d91d 100644
--- a/types/react-icons/lib/ti/arrow-move.d.ts
+++ b/types/react-icons/lib/ti/arrow-move.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMove extends React.Component<IconBaseProps> { }
+declare class TiArrowMove extends React.Component<IconBaseProps> { }
+export = TiArrowMove;
diff --git a/types/react-icons/lib/ti/arrow-repeat-outline.d.ts b/types/react-icons/lib/ti/arrow-repeat-outline.d.ts
index 7b4e2b2c06..94eebe9c04 100644
--- a/types/react-icons/lib/ti/arrow-repeat-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-repeat-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRepeatOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowRepeatOutline extends React.Component<IconBaseProps> { }
+export = TiArrowRepeatOutline;
diff --git a/types/react-icons/lib/ti/arrow-repeat.d.ts b/types/react-icons/lib/ti/arrow-repeat.d.ts
index 00445af479..0010ebcab4 100644
--- a/types/react-icons/lib/ti/arrow-repeat.d.ts
+++ b/types/react-icons/lib/ti/arrow-repeat.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRepeat extends React.Component<IconBaseProps> { }
+declare class TiArrowRepeat extends React.Component<IconBaseProps> { }
+export = TiArrowRepeat;
diff --git a/types/react-icons/lib/ti/arrow-right-outline.d.ts b/types/react-icons/lib/ti/arrow-right-outline.d.ts
index 7f7319172c..04269a4ea9 100644
--- a/types/react-icons/lib/ti/arrow-right-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-right-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRightOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowRightOutline extends React.Component<IconBaseProps> { }
+export = TiArrowRightOutline;
diff --git a/types/react-icons/lib/ti/arrow-right-thick.d.ts b/types/react-icons/lib/ti/arrow-right-thick.d.ts
index cc72754ddf..322875500b 100644
--- a/types/react-icons/lib/ti/arrow-right-thick.d.ts
+++ b/types/react-icons/lib/ti/arrow-right-thick.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRightThick extends React.Component<IconBaseProps> { }
+declare class TiArrowRightThick extends React.Component<IconBaseProps> { }
+export = TiArrowRightThick;
diff --git a/types/react-icons/lib/ti/arrow-right.d.ts b/types/react-icons/lib/ti/arrow-right.d.ts
index 0761bfd383..ae7fd5ad05 100644
--- a/types/react-icons/lib/ti/arrow-right.d.ts
+++ b/types/react-icons/lib/ti/arrow-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRight extends React.Component<IconBaseProps> { }
+declare class TiArrowRight extends React.Component<IconBaseProps> { }
+export = TiArrowRight;
diff --git a/types/react-icons/lib/ti/arrow-shuffle.d.ts b/types/react-icons/lib/ti/arrow-shuffle.d.ts
index c0cb7629b3..506b10aa81 100644
--- a/types/react-icons/lib/ti/arrow-shuffle.d.ts
+++ b/types/react-icons/lib/ti/arrow-shuffle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowShuffle extends React.Component<IconBaseProps> { }
+declare class TiArrowShuffle extends React.Component<IconBaseProps> { }
+export = TiArrowShuffle;
diff --git a/types/react-icons/lib/ti/arrow-sorted-down.d.ts b/types/react-icons/lib/ti/arrow-sorted-down.d.ts
index b7b8a436dd..a9f86a80af 100644
--- a/types/react-icons/lib/ti/arrow-sorted-down.d.ts
+++ b/types/react-icons/lib/ti/arrow-sorted-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSortedDown extends React.Component<IconBaseProps> { }
+declare class TiArrowSortedDown extends React.Component<IconBaseProps> { }
+export = TiArrowSortedDown;
diff --git a/types/react-icons/lib/ti/arrow-sorted-up.d.ts b/types/react-icons/lib/ti/arrow-sorted-up.d.ts
index 66f3ef408a..849fe84ff4 100644
--- a/types/react-icons/lib/ti/arrow-sorted-up.d.ts
+++ b/types/react-icons/lib/ti/arrow-sorted-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSortedUp extends React.Component<IconBaseProps> { }
+declare class TiArrowSortedUp extends React.Component<IconBaseProps> { }
+export = TiArrowSortedUp;
diff --git a/types/react-icons/lib/ti/arrow-sync-outline.d.ts b/types/react-icons/lib/ti/arrow-sync-outline.d.ts
index 91b296966b..b2577282e7 100644
--- a/types/react-icons/lib/ti/arrow-sync-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-sync-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSyncOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowSyncOutline extends React.Component<IconBaseProps> { }
+export = TiArrowSyncOutline;
diff --git a/types/react-icons/lib/ti/arrow-sync.d.ts b/types/react-icons/lib/ti/arrow-sync.d.ts
index 4a863fe22c..35b9b2e05a 100644
--- a/types/react-icons/lib/ti/arrow-sync.d.ts
+++ b/types/react-icons/lib/ti/arrow-sync.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSync extends React.Component<IconBaseProps> { }
+declare class TiArrowSync extends React.Component<IconBaseProps> { }
+export = TiArrowSync;
diff --git a/types/react-icons/lib/ti/arrow-unsorted.d.ts b/types/react-icons/lib/ti/arrow-unsorted.d.ts
index 1fbd71c7fa..4c453df45a 100644
--- a/types/react-icons/lib/ti/arrow-unsorted.d.ts
+++ b/types/react-icons/lib/ti/arrow-unsorted.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUnsorted extends React.Component<IconBaseProps> { }
+declare class TiArrowUnsorted extends React.Component<IconBaseProps> { }
+export = TiArrowUnsorted;
diff --git a/types/react-icons/lib/ti/arrow-up-outline.d.ts b/types/react-icons/lib/ti/arrow-up-outline.d.ts
index 5f7d9b2baa..b25077cee2 100644
--- a/types/react-icons/lib/ti/arrow-up-outline.d.ts
+++ b/types/react-icons/lib/ti/arrow-up-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUpOutline extends React.Component<IconBaseProps> { }
+declare class TiArrowUpOutline extends React.Component<IconBaseProps> { }
+export = TiArrowUpOutline;
diff --git a/types/react-icons/lib/ti/arrow-up-thick.d.ts b/types/react-icons/lib/ti/arrow-up-thick.d.ts
index 965192a20a..6a5c487bbb 100644
--- a/types/react-icons/lib/ti/arrow-up-thick.d.ts
+++ b/types/react-icons/lib/ti/arrow-up-thick.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUpThick extends React.Component<IconBaseProps> { }
+declare class TiArrowUpThick extends React.Component<IconBaseProps> { }
+export = TiArrowUpThick;
diff --git a/types/react-icons/lib/ti/arrow-up.d.ts b/types/react-icons/lib/ti/arrow-up.d.ts
index d8930645ae..c20aa6fab9 100644
--- a/types/react-icons/lib/ti/arrow-up.d.ts
+++ b/types/react-icons/lib/ti/arrow-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUp extends React.Component<IconBaseProps> { }
+declare class TiArrowUp extends React.Component<IconBaseProps> { }
+export = TiArrowUp;
diff --git a/types/react-icons/lib/ti/at.d.ts b/types/react-icons/lib/ti/at.d.ts
index 7eaadbcb42..a22becc6cc 100644
--- a/types/react-icons/lib/ti/at.d.ts
+++ b/types/react-icons/lib/ti/at.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAt extends React.Component<IconBaseProps> { }
+declare class TiAt extends React.Component<IconBaseProps> { }
+export = TiAt;
diff --git a/types/react-icons/lib/ti/attachment-outline.d.ts b/types/react-icons/lib/ti/attachment-outline.d.ts
index 2f3c1c54ea..af0ea4f5fb 100644
--- a/types/react-icons/lib/ti/attachment-outline.d.ts
+++ b/types/react-icons/lib/ti/attachment-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAttachmentOutline extends React.Component<IconBaseProps> { }
+declare class TiAttachmentOutline extends React.Component<IconBaseProps> { }
+export = TiAttachmentOutline;
diff --git a/types/react-icons/lib/ti/attachment.d.ts b/types/react-icons/lib/ti/attachment.d.ts
index ae09ff061c..089f1b1817 100644
--- a/types/react-icons/lib/ti/attachment.d.ts
+++ b/types/react-icons/lib/ti/attachment.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAttachment extends React.Component<IconBaseProps> { }
+declare class TiAttachment extends React.Component<IconBaseProps> { }
+export = TiAttachment;
diff --git a/types/react-icons/lib/ti/backspace-outline.d.ts b/types/react-icons/lib/ti/backspace-outline.d.ts
index a7047f88fc..fa59aa01cd 100644
--- a/types/react-icons/lib/ti/backspace-outline.d.ts
+++ b/types/react-icons/lib/ti/backspace-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBackspaceOutline extends React.Component<IconBaseProps> { }
+declare class TiBackspaceOutline extends React.Component<IconBaseProps> { }
+export = TiBackspaceOutline;
diff --git a/types/react-icons/lib/ti/backspace.d.ts b/types/react-icons/lib/ti/backspace.d.ts
index fcd1490219..062be7f345 100644
--- a/types/react-icons/lib/ti/backspace.d.ts
+++ b/types/react-icons/lib/ti/backspace.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBackspace extends React.Component<IconBaseProps> { }
+declare class TiBackspace extends React.Component<IconBaseProps> { }
+export = TiBackspace;
diff --git a/types/react-icons/lib/ti/battery-charge.d.ts b/types/react-icons/lib/ti/battery-charge.d.ts
index 6b1af42674..b81192220a 100644
--- a/types/react-icons/lib/ti/battery-charge.d.ts
+++ b/types/react-icons/lib/ti/battery-charge.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryCharge extends React.Component<IconBaseProps> { }
+declare class TiBatteryCharge extends React.Component<IconBaseProps> { }
+export = TiBatteryCharge;
diff --git a/types/react-icons/lib/ti/battery-full.d.ts b/types/react-icons/lib/ti/battery-full.d.ts
index 6e75957baf..85b775dee9 100644
--- a/types/react-icons/lib/ti/battery-full.d.ts
+++ b/types/react-icons/lib/ti/battery-full.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryFull extends React.Component<IconBaseProps> { }
+declare class TiBatteryFull extends React.Component<IconBaseProps> { }
+export = TiBatteryFull;
diff --git a/types/react-icons/lib/ti/battery-high.d.ts b/types/react-icons/lib/ti/battery-high.d.ts
index 951e63a507..05af45979f 100644
--- a/types/react-icons/lib/ti/battery-high.d.ts
+++ b/types/react-icons/lib/ti/battery-high.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryHigh extends React.Component<IconBaseProps> { }
+declare class TiBatteryHigh extends React.Component<IconBaseProps> { }
+export = TiBatteryHigh;
diff --git a/types/react-icons/lib/ti/battery-low.d.ts b/types/react-icons/lib/ti/battery-low.d.ts
index 9c0f370293..fbbc4afcfe 100644
--- a/types/react-icons/lib/ti/battery-low.d.ts
+++ b/types/react-icons/lib/ti/battery-low.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryLow extends React.Component<IconBaseProps> { }
+declare class TiBatteryLow extends React.Component<IconBaseProps> { }
+export = TiBatteryLow;
diff --git a/types/react-icons/lib/ti/battery-mid.d.ts b/types/react-icons/lib/ti/battery-mid.d.ts
index 6625efa374..a4b1bac2a4 100644
--- a/types/react-icons/lib/ti/battery-mid.d.ts
+++ b/types/react-icons/lib/ti/battery-mid.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryMid extends React.Component<IconBaseProps> { }
+declare class TiBatteryMid extends React.Component<IconBaseProps> { }
+export = TiBatteryMid;
diff --git a/types/react-icons/lib/ti/beaker.d.ts b/types/react-icons/lib/ti/beaker.d.ts
index 0cdfe9fc68..088105c80e 100644
--- a/types/react-icons/lib/ti/beaker.d.ts
+++ b/types/react-icons/lib/ti/beaker.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBeaker extends React.Component<IconBaseProps> { }
+declare class TiBeaker extends React.Component<IconBaseProps> { }
+export = TiBeaker;
diff --git a/types/react-icons/lib/ti/beer.d.ts b/types/react-icons/lib/ti/beer.d.ts
index a76c8d06f6..6525266217 100644
--- a/types/react-icons/lib/ti/beer.d.ts
+++ b/types/react-icons/lib/ti/beer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBeer extends React.Component<IconBaseProps> { }
+declare class TiBeer extends React.Component<IconBaseProps> { }
+export = TiBeer;
diff --git a/types/react-icons/lib/ti/bell.d.ts b/types/react-icons/lib/ti/bell.d.ts
index d3dd3950ed..15728d828f 100644
--- a/types/react-icons/lib/ti/bell.d.ts
+++ b/types/react-icons/lib/ti/bell.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBell extends React.Component<IconBaseProps> { }
+declare class TiBell extends React.Component<IconBaseProps> { }
+export = TiBell;
diff --git a/types/react-icons/lib/ti/book.d.ts b/types/react-icons/lib/ti/book.d.ts
index e2a2e7d952..be301cf8bd 100644
--- a/types/react-icons/lib/ti/book.d.ts
+++ b/types/react-icons/lib/ti/book.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBook extends React.Component<IconBaseProps> { }
+declare class TiBook extends React.Component<IconBaseProps> { }
+export = TiBook;
diff --git a/types/react-icons/lib/ti/bookmark.d.ts b/types/react-icons/lib/ti/bookmark.d.ts
index 47dc6a5e5f..a5b1244aee 100644
--- a/types/react-icons/lib/ti/bookmark.d.ts
+++ b/types/react-icons/lib/ti/bookmark.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBookmark extends React.Component<IconBaseProps> { }
+declare class TiBookmark extends React.Component<IconBaseProps> { }
+export = TiBookmark;
diff --git a/types/react-icons/lib/ti/briefcase.d.ts b/types/react-icons/lib/ti/briefcase.d.ts
index c830dab76b..76635d9763 100644
--- a/types/react-icons/lib/ti/briefcase.d.ts
+++ b/types/react-icons/lib/ti/briefcase.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBriefcase extends React.Component<IconBaseProps> { }
+declare class TiBriefcase extends React.Component<IconBaseProps> { }
+export = TiBriefcase;
diff --git a/types/react-icons/lib/ti/brush.d.ts b/types/react-icons/lib/ti/brush.d.ts
index d8a1b5a5d8..596b8c1778 100644
--- a/types/react-icons/lib/ti/brush.d.ts
+++ b/types/react-icons/lib/ti/brush.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBrush extends React.Component<IconBaseProps> { }
+declare class TiBrush extends React.Component<IconBaseProps> { }
+export = TiBrush;
diff --git a/types/react-icons/lib/ti/business-card.d.ts b/types/react-icons/lib/ti/business-card.d.ts
index 1ecf3f6621..9e5b6a6657 100644
--- a/types/react-icons/lib/ti/business-card.d.ts
+++ b/types/react-icons/lib/ti/business-card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBusinessCard extends React.Component<IconBaseProps> { }
+declare class TiBusinessCard extends React.Component<IconBaseProps> { }
+export = TiBusinessCard;
diff --git a/types/react-icons/lib/ti/calculator.d.ts b/types/react-icons/lib/ti/calculator.d.ts
index 403ce8c3e6..159507d0f5 100644
--- a/types/react-icons/lib/ti/calculator.d.ts
+++ b/types/react-icons/lib/ti/calculator.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalculator extends React.Component<IconBaseProps> { }
+declare class TiCalculator extends React.Component<IconBaseProps> { }
+export = TiCalculator;
diff --git a/types/react-icons/lib/ti/calendar-outline.d.ts b/types/react-icons/lib/ti/calendar-outline.d.ts
index bd3dd9e9d3..feb064e20a 100644
--- a/types/react-icons/lib/ti/calendar-outline.d.ts
+++ b/types/react-icons/lib/ti/calendar-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalendarOutline extends React.Component<IconBaseProps> { }
+declare class TiCalendarOutline extends React.Component<IconBaseProps> { }
+export = TiCalendarOutline;
diff --git a/types/react-icons/lib/ti/calendar.d.ts b/types/react-icons/lib/ti/calendar.d.ts
index 9b0ba315d5..85814900ba 100644
--- a/types/react-icons/lib/ti/calendar.d.ts
+++ b/types/react-icons/lib/ti/calendar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalendar extends React.Component<IconBaseProps> { }
+declare class TiCalendar extends React.Component<IconBaseProps> { }
+export = TiCalendar;
diff --git a/types/react-icons/lib/ti/calender-outline.d.ts b/types/react-icons/lib/ti/calender-outline.d.ts
index 8afcb4ef62..677982952a 100644
--- a/types/react-icons/lib/ti/calender-outline.d.ts
+++ b/types/react-icons/lib/ti/calender-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalenderOutline extends React.Component<IconBaseProps> { }
+declare class TiCalenderOutline extends React.Component<IconBaseProps> { }
+export = TiCalenderOutline;
diff --git a/types/react-icons/lib/ti/calender.d.ts b/types/react-icons/lib/ti/calender.d.ts
index 0393fece08..17361d332e 100644
--- a/types/react-icons/lib/ti/calender.d.ts
+++ b/types/react-icons/lib/ti/calender.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalender extends React.Component<IconBaseProps> { }
+declare class TiCalender extends React.Component<IconBaseProps> { }
+export = TiCalender;
diff --git a/types/react-icons/lib/ti/camera-outline.d.ts b/types/react-icons/lib/ti/camera-outline.d.ts
index 940ba3bd58..9b7f91566e 100644
--- a/types/react-icons/lib/ti/camera-outline.d.ts
+++ b/types/react-icons/lib/ti/camera-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCameraOutline extends React.Component<IconBaseProps> { }
+declare class TiCameraOutline extends React.Component<IconBaseProps> { }
+export = TiCameraOutline;
diff --git a/types/react-icons/lib/ti/camera.d.ts b/types/react-icons/lib/ti/camera.d.ts
index 8291efbd7d..ce19562cd3 100644
--- a/types/react-icons/lib/ti/camera.d.ts
+++ b/types/react-icons/lib/ti/camera.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCamera extends React.Component<IconBaseProps> { }
+declare class TiCamera extends React.Component<IconBaseProps> { }
+export = TiCamera;
diff --git a/types/react-icons/lib/ti/cancel-outline.d.ts b/types/react-icons/lib/ti/cancel-outline.d.ts
index 233d7b4b9b..3348e9084f 100644
--- a/types/react-icons/lib/ti/cancel-outline.d.ts
+++ b/types/react-icons/lib/ti/cancel-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCancelOutline extends React.Component<IconBaseProps> { }
+declare class TiCancelOutline extends React.Component<IconBaseProps> { }
+export = TiCancelOutline;
diff --git a/types/react-icons/lib/ti/cancel.d.ts b/types/react-icons/lib/ti/cancel.d.ts
index 882317d054..b03938e450 100644
--- a/types/react-icons/lib/ti/cancel.d.ts
+++ b/types/react-icons/lib/ti/cancel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCancel extends React.Component<IconBaseProps> { }
+declare class TiCancel extends React.Component<IconBaseProps> { }
+export = TiCancel;
diff --git a/types/react-icons/lib/ti/chart-area-outline.d.ts b/types/react-icons/lib/ti/chart-area-outline.d.ts
index fa40a08cde..ce75645beb 100644
--- a/types/react-icons/lib/ti/chart-area-outline.d.ts
+++ b/types/react-icons/lib/ti/chart-area-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartAreaOutline extends React.Component<IconBaseProps> { }
+declare class TiChartAreaOutline extends React.Component<IconBaseProps> { }
+export = TiChartAreaOutline;
diff --git a/types/react-icons/lib/ti/chart-area.d.ts b/types/react-icons/lib/ti/chart-area.d.ts
index 80806cbd7c..027f2c9c82 100644
--- a/types/react-icons/lib/ti/chart-area.d.ts
+++ b/types/react-icons/lib/ti/chart-area.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartArea extends React.Component<IconBaseProps> { }
+declare class TiChartArea extends React.Component<IconBaseProps> { }
+export = TiChartArea;
diff --git a/types/react-icons/lib/ti/chart-bar-outline.d.ts b/types/react-icons/lib/ti/chart-bar-outline.d.ts
index 9ec3c4ca70..393e0e0423 100644
--- a/types/react-icons/lib/ti/chart-bar-outline.d.ts
+++ b/types/react-icons/lib/ti/chart-bar-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartBarOutline extends React.Component<IconBaseProps> { }
+declare class TiChartBarOutline extends React.Component<IconBaseProps> { }
+export = TiChartBarOutline;
diff --git a/types/react-icons/lib/ti/chart-bar.d.ts b/types/react-icons/lib/ti/chart-bar.d.ts
index a98da7fe10..7fa03c097e 100644
--- a/types/react-icons/lib/ti/chart-bar.d.ts
+++ b/types/react-icons/lib/ti/chart-bar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartBar extends React.Component<IconBaseProps> { }
+declare class TiChartBar extends React.Component<IconBaseProps> { }
+export = TiChartBar;
diff --git a/types/react-icons/lib/ti/chart-line-outline.d.ts b/types/react-icons/lib/ti/chart-line-outline.d.ts
index f5a982d0f1..6b8b6bc7b6 100644
--- a/types/react-icons/lib/ti/chart-line-outline.d.ts
+++ b/types/react-icons/lib/ti/chart-line-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartLineOutline extends React.Component<IconBaseProps> { }
+declare class TiChartLineOutline extends React.Component<IconBaseProps> { }
+export = TiChartLineOutline;
diff --git a/types/react-icons/lib/ti/chart-line.d.ts b/types/react-icons/lib/ti/chart-line.d.ts
index be581f2b53..15f6f776e9 100644
--- a/types/react-icons/lib/ti/chart-line.d.ts
+++ b/types/react-icons/lib/ti/chart-line.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartLine extends React.Component<IconBaseProps> { }
+declare class TiChartLine extends React.Component<IconBaseProps> { }
+export = TiChartLine;
diff --git a/types/react-icons/lib/ti/chart-pie-outline.d.ts b/types/react-icons/lib/ti/chart-pie-outline.d.ts
index 449d799a79..556c2055ff 100644
--- a/types/react-icons/lib/ti/chart-pie-outline.d.ts
+++ b/types/react-icons/lib/ti/chart-pie-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartPieOutline extends React.Component<IconBaseProps> { }
+declare class TiChartPieOutline extends React.Component<IconBaseProps> { }
+export = TiChartPieOutline;
diff --git a/types/react-icons/lib/ti/chart-pie.d.ts b/types/react-icons/lib/ti/chart-pie.d.ts
index 5a641290fb..98481fb073 100644
--- a/types/react-icons/lib/ti/chart-pie.d.ts
+++ b/types/react-icons/lib/ti/chart-pie.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartPie extends React.Component<IconBaseProps> { }
+declare class TiChartPie extends React.Component<IconBaseProps> { }
+export = TiChartPie;
diff --git a/types/react-icons/lib/ti/chevron-left-outline.d.ts b/types/react-icons/lib/ti/chevron-left-outline.d.ts
index 38ad9ab531..186347dc7c 100644
--- a/types/react-icons/lib/ti/chevron-left-outline.d.ts
+++ b/types/react-icons/lib/ti/chevron-left-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronLeftOutline extends React.Component<IconBaseProps> { }
+declare class TiChevronLeftOutline extends React.Component<IconBaseProps> { }
+export = TiChevronLeftOutline;
diff --git a/types/react-icons/lib/ti/chevron-left.d.ts b/types/react-icons/lib/ti/chevron-left.d.ts
index d6a3e7286c..ed66b40517 100644
--- a/types/react-icons/lib/ti/chevron-left.d.ts
+++ b/types/react-icons/lib/ti/chevron-left.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronLeft extends React.Component<IconBaseProps> { }
+declare class TiChevronLeft extends React.Component<IconBaseProps> { }
+export = TiChevronLeft;
diff --git a/types/react-icons/lib/ti/chevron-right-outline.d.ts b/types/react-icons/lib/ti/chevron-right-outline.d.ts
index 09cc6370fd..f07fdf42a0 100644
--- a/types/react-icons/lib/ti/chevron-right-outline.d.ts
+++ b/types/react-icons/lib/ti/chevron-right-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronRightOutline extends React.Component<IconBaseProps> { }
+declare class TiChevronRightOutline extends React.Component<IconBaseProps> { }
+export = TiChevronRightOutline;
diff --git a/types/react-icons/lib/ti/chevron-right.d.ts b/types/react-icons/lib/ti/chevron-right.d.ts
index 311697c66a..7241aad18d 100644
--- a/types/react-icons/lib/ti/chevron-right.d.ts
+++ b/types/react-icons/lib/ti/chevron-right.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronRight extends React.Component<IconBaseProps> { }
+declare class TiChevronRight extends React.Component<IconBaseProps> { }
+export = TiChevronRight;
diff --git a/types/react-icons/lib/ti/clipboard.d.ts b/types/react-icons/lib/ti/clipboard.d.ts
index cce73b1bc7..62288a86d3 100644
--- a/types/react-icons/lib/ti/clipboard.d.ts
+++ b/types/react-icons/lib/ti/clipboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiClipboard extends React.Component<IconBaseProps> { }
+declare class TiClipboard extends React.Component<IconBaseProps> { }
+export = TiClipboard;
diff --git a/types/react-icons/lib/ti/cloud-storage-outline.d.ts b/types/react-icons/lib/ti/cloud-storage-outline.d.ts
index d36a07cdb6..64b3ac5957 100644
--- a/types/react-icons/lib/ti/cloud-storage-outline.d.ts
+++ b/types/react-icons/lib/ti/cloud-storage-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCloudStorageOutline extends React.Component<IconBaseProps> { }
+declare class TiCloudStorageOutline extends React.Component<IconBaseProps> { }
+export = TiCloudStorageOutline;
diff --git a/types/react-icons/lib/ti/cloud-storage.d.ts b/types/react-icons/lib/ti/cloud-storage.d.ts
index 45142999f9..0d31048b85 100644
--- a/types/react-icons/lib/ti/cloud-storage.d.ts
+++ b/types/react-icons/lib/ti/cloud-storage.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCloudStorage extends React.Component<IconBaseProps> { }
+declare class TiCloudStorage extends React.Component<IconBaseProps> { }
+export = TiCloudStorage;
diff --git a/types/react-icons/lib/ti/code-outline.d.ts b/types/react-icons/lib/ti/code-outline.d.ts
index f7c2eec174..21dbe7a108 100644
--- a/types/react-icons/lib/ti/code-outline.d.ts
+++ b/types/react-icons/lib/ti/code-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCodeOutline extends React.Component<IconBaseProps> { }
+declare class TiCodeOutline extends React.Component<IconBaseProps> { }
+export = TiCodeOutline;
diff --git a/types/react-icons/lib/ti/code.d.ts b/types/react-icons/lib/ti/code.d.ts
index e6bf302269..4c23671d20 100644
--- a/types/react-icons/lib/ti/code.d.ts
+++ b/types/react-icons/lib/ti/code.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCode extends React.Component<IconBaseProps> { }
+declare class TiCode extends React.Component<IconBaseProps> { }
+export = TiCode;
diff --git a/types/react-icons/lib/ti/coffee.d.ts b/types/react-icons/lib/ti/coffee.d.ts
index df3aa18694..af57c5d5ee 100644
--- a/types/react-icons/lib/ti/coffee.d.ts
+++ b/types/react-icons/lib/ti/coffee.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCoffee extends React.Component<IconBaseProps> { }
+declare class TiCoffee extends React.Component<IconBaseProps> { }
+export = TiCoffee;
diff --git a/types/react-icons/lib/ti/cog-outline.d.ts b/types/react-icons/lib/ti/cog-outline.d.ts
index 40c76991c5..9d528d69a6 100644
--- a/types/react-icons/lib/ti/cog-outline.d.ts
+++ b/types/react-icons/lib/ti/cog-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCogOutline extends React.Component<IconBaseProps> { }
+declare class TiCogOutline extends React.Component<IconBaseProps> { }
+export = TiCogOutline;
diff --git a/types/react-icons/lib/ti/cog.d.ts b/types/react-icons/lib/ti/cog.d.ts
index 24573b9291..5f93130bf6 100644
--- a/types/react-icons/lib/ti/cog.d.ts
+++ b/types/react-icons/lib/ti/cog.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCog extends React.Component<IconBaseProps> { }
+declare class TiCog extends React.Component<IconBaseProps> { }
+export = TiCog;
diff --git a/types/react-icons/lib/ti/compass.d.ts b/types/react-icons/lib/ti/compass.d.ts
index 54c70bee8b..82578c6f74 100644
--- a/types/react-icons/lib/ti/compass.d.ts
+++ b/types/react-icons/lib/ti/compass.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCompass extends React.Component<IconBaseProps> { }
+declare class TiCompass extends React.Component<IconBaseProps> { }
+export = TiCompass;
diff --git a/types/react-icons/lib/ti/contacts.d.ts b/types/react-icons/lib/ti/contacts.d.ts
index f780e8ca9c..0637be6296 100644
--- a/types/react-icons/lib/ti/contacts.d.ts
+++ b/types/react-icons/lib/ti/contacts.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiContacts extends React.Component<IconBaseProps> { }
+declare class TiContacts extends React.Component<IconBaseProps> { }
+export = TiContacts;
diff --git a/types/react-icons/lib/ti/credit-card.d.ts b/types/react-icons/lib/ti/credit-card.d.ts
index 2f05b56233..42f823b564 100644
--- a/types/react-icons/lib/ti/credit-card.d.ts
+++ b/types/react-icons/lib/ti/credit-card.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCreditCard extends React.Component<IconBaseProps> { }
+declare class TiCreditCard extends React.Component<IconBaseProps> { }
+export = TiCreditCard;
diff --git a/types/react-icons/lib/ti/cross.d.ts b/types/react-icons/lib/ti/cross.d.ts
index 5af003cf93..4243dc886f 100644
--- a/types/react-icons/lib/ti/cross.d.ts
+++ b/types/react-icons/lib/ti/cross.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCross extends React.Component<IconBaseProps> { }
+declare class TiCross extends React.Component<IconBaseProps> { }
+export = TiCross;
diff --git a/types/react-icons/lib/ti/css3.d.ts b/types/react-icons/lib/ti/css3.d.ts
index 00e79bcbce..32febf6f6b 100644
--- a/types/react-icons/lib/ti/css3.d.ts
+++ b/types/react-icons/lib/ti/css3.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCss3 extends React.Component<IconBaseProps> { }
+declare class TiCss3 extends React.Component<IconBaseProps> { }
+export = TiCss3;
diff --git a/types/react-icons/lib/ti/database.d.ts b/types/react-icons/lib/ti/database.d.ts
index 65dccc441f..68373db2cf 100644
--- a/types/react-icons/lib/ti/database.d.ts
+++ b/types/react-icons/lib/ti/database.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDatabase extends React.Component<IconBaseProps> { }
+declare class TiDatabase extends React.Component<IconBaseProps> { }
+export = TiDatabase;
diff --git a/types/react-icons/lib/ti/delete-outline.d.ts b/types/react-icons/lib/ti/delete-outline.d.ts
index bf27aa49f9..04cd5ed456 100644
--- a/types/react-icons/lib/ti/delete-outline.d.ts
+++ b/types/react-icons/lib/ti/delete-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeleteOutline extends React.Component<IconBaseProps> { }
+declare class TiDeleteOutline extends React.Component<IconBaseProps> { }
+export = TiDeleteOutline;
diff --git a/types/react-icons/lib/ti/delete.d.ts b/types/react-icons/lib/ti/delete.d.ts
index 57791a71ab..8979d845c3 100644
--- a/types/react-icons/lib/ti/delete.d.ts
+++ b/types/react-icons/lib/ti/delete.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDelete extends React.Component<IconBaseProps> { }
+declare class TiDelete extends React.Component<IconBaseProps> { }
+export = TiDelete;
diff --git a/types/react-icons/lib/ti/device-desktop.d.ts b/types/react-icons/lib/ti/device-desktop.d.ts
index d405810142..e4243a2c7e 100644
--- a/types/react-icons/lib/ti/device-desktop.d.ts
+++ b/types/react-icons/lib/ti/device-desktop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceDesktop extends React.Component<IconBaseProps> { }
+declare class TiDeviceDesktop extends React.Component<IconBaseProps> { }
+export = TiDeviceDesktop;
diff --git a/types/react-icons/lib/ti/device-laptop.d.ts b/types/react-icons/lib/ti/device-laptop.d.ts
index dada29c74f..09b5e11260 100644
--- a/types/react-icons/lib/ti/device-laptop.d.ts
+++ b/types/react-icons/lib/ti/device-laptop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceLaptop extends React.Component<IconBaseProps> { }
+declare class TiDeviceLaptop extends React.Component<IconBaseProps> { }
+export = TiDeviceLaptop;
diff --git a/types/react-icons/lib/ti/device-phone.d.ts b/types/react-icons/lib/ti/device-phone.d.ts
index 977cf3f0f1..4f926184c3 100644
--- a/types/react-icons/lib/ti/device-phone.d.ts
+++ b/types/react-icons/lib/ti/device-phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDevicePhone extends React.Component<IconBaseProps> { }
+declare class TiDevicePhone extends React.Component<IconBaseProps> { }
+export = TiDevicePhone;
diff --git a/types/react-icons/lib/ti/device-tablet.d.ts b/types/react-icons/lib/ti/device-tablet.d.ts
index 06a9e07cca..6a3a636ca0 100644
--- a/types/react-icons/lib/ti/device-tablet.d.ts
+++ b/types/react-icons/lib/ti/device-tablet.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceTablet extends React.Component<IconBaseProps> { }
+declare class TiDeviceTablet extends React.Component<IconBaseProps> { }
+export = TiDeviceTablet;
diff --git a/types/react-icons/lib/ti/directions.d.ts b/types/react-icons/lib/ti/directions.d.ts
index 3be0928f95..f7cc86becb 100644
--- a/types/react-icons/lib/ti/directions.d.ts
+++ b/types/react-icons/lib/ti/directions.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDirections extends React.Component<IconBaseProps> { }
+declare class TiDirections extends React.Component<IconBaseProps> { }
+export = TiDirections;
diff --git a/types/react-icons/lib/ti/divide-outline.d.ts b/types/react-icons/lib/ti/divide-outline.d.ts
index 9b30f64d2d..e19ab3654b 100644
--- a/types/react-icons/lib/ti/divide-outline.d.ts
+++ b/types/react-icons/lib/ti/divide-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDivideOutline extends React.Component<IconBaseProps> { }
+declare class TiDivideOutline extends React.Component<IconBaseProps> { }
+export = TiDivideOutline;
diff --git a/types/react-icons/lib/ti/divide.d.ts b/types/react-icons/lib/ti/divide.d.ts
index 375a79b628..c82f0439fe 100644
--- a/types/react-icons/lib/ti/divide.d.ts
+++ b/types/react-icons/lib/ti/divide.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDivide extends React.Component<IconBaseProps> { }
+declare class TiDivide extends React.Component<IconBaseProps> { }
+export = TiDivide;
diff --git a/types/react-icons/lib/ti/document-add.d.ts b/types/react-icons/lib/ti/document-add.d.ts
index 0b2ed20d5c..68bc331e15 100644
--- a/types/react-icons/lib/ti/document-add.d.ts
+++ b/types/react-icons/lib/ti/document-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentAdd extends React.Component<IconBaseProps> { }
+declare class TiDocumentAdd extends React.Component<IconBaseProps> { }
+export = TiDocumentAdd;
diff --git a/types/react-icons/lib/ti/document-delete.d.ts b/types/react-icons/lib/ti/document-delete.d.ts
index 916608ade9..a3d444052e 100644
--- a/types/react-icons/lib/ti/document-delete.d.ts
+++ b/types/react-icons/lib/ti/document-delete.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentDelete extends React.Component<IconBaseProps> { }
+declare class TiDocumentDelete extends React.Component<IconBaseProps> { }
+export = TiDocumentDelete;
diff --git a/types/react-icons/lib/ti/document-text.d.ts b/types/react-icons/lib/ti/document-text.d.ts
index c3af80ad89..3cad0fe733 100644
--- a/types/react-icons/lib/ti/document-text.d.ts
+++ b/types/react-icons/lib/ti/document-text.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentText extends React.Component<IconBaseProps> { }
+declare class TiDocumentText extends React.Component<IconBaseProps> { }
+export = TiDocumentText;
diff --git a/types/react-icons/lib/ti/document.d.ts b/types/react-icons/lib/ti/document.d.ts
index 60ace2ba35..749a51cde8 100644
--- a/types/react-icons/lib/ti/document.d.ts
+++ b/types/react-icons/lib/ti/document.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocument extends React.Component<IconBaseProps> { }
+declare class TiDocument extends React.Component<IconBaseProps> { }
+export = TiDocument;
diff --git a/types/react-icons/lib/ti/download-outline.d.ts b/types/react-icons/lib/ti/download-outline.d.ts
index b405ad061c..cc0849bce2 100644
--- a/types/react-icons/lib/ti/download-outline.d.ts
+++ b/types/react-icons/lib/ti/download-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDownloadOutline extends React.Component<IconBaseProps> { }
+declare class TiDownloadOutline extends React.Component<IconBaseProps> { }
+export = TiDownloadOutline;
diff --git a/types/react-icons/lib/ti/download.d.ts b/types/react-icons/lib/ti/download.d.ts
index 6cf13f385b..6563ae7a26 100644
--- a/types/react-icons/lib/ti/download.d.ts
+++ b/types/react-icons/lib/ti/download.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDownload extends React.Component<IconBaseProps> { }
+declare class TiDownload extends React.Component<IconBaseProps> { }
+export = TiDownload;
diff --git a/types/react-icons/lib/ti/dropbox.d.ts b/types/react-icons/lib/ti/dropbox.d.ts
index 000560becf..8850b30638 100644
--- a/types/react-icons/lib/ti/dropbox.d.ts
+++ b/types/react-icons/lib/ti/dropbox.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDropbox extends React.Component<IconBaseProps> { }
+declare class TiDropbox extends React.Component<IconBaseProps> { }
+export = TiDropbox;
diff --git a/types/react-icons/lib/ti/edit.d.ts b/types/react-icons/lib/ti/edit.d.ts
index 7a937ccd2a..cb3548a8d7 100644
--- a/types/react-icons/lib/ti/edit.d.ts
+++ b/types/react-icons/lib/ti/edit.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEdit extends React.Component<IconBaseProps> { }
+declare class TiEdit extends React.Component<IconBaseProps> { }
+export = TiEdit;
diff --git a/types/react-icons/lib/ti/eject-outline.d.ts b/types/react-icons/lib/ti/eject-outline.d.ts
index be15038312..995b0223ed 100644
--- a/types/react-icons/lib/ti/eject-outline.d.ts
+++ b/types/react-icons/lib/ti/eject-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEjectOutline extends React.Component<IconBaseProps> { }
+declare class TiEjectOutline extends React.Component<IconBaseProps> { }
+export = TiEjectOutline;
diff --git a/types/react-icons/lib/ti/eject.d.ts b/types/react-icons/lib/ti/eject.d.ts
index 3ad5cda1c4..ce559832ff 100644
--- a/types/react-icons/lib/ti/eject.d.ts
+++ b/types/react-icons/lib/ti/eject.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEject extends React.Component<IconBaseProps> { }
+declare class TiEject extends React.Component<IconBaseProps> { }
+export = TiEject;
diff --git a/types/react-icons/lib/ti/equals-outline.d.ts b/types/react-icons/lib/ti/equals-outline.d.ts
index 04e77346cc..838e47165e 100644
--- a/types/react-icons/lib/ti/equals-outline.d.ts
+++ b/types/react-icons/lib/ti/equals-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEqualsOutline extends React.Component<IconBaseProps> { }
+declare class TiEqualsOutline extends React.Component<IconBaseProps> { }
+export = TiEqualsOutline;
diff --git a/types/react-icons/lib/ti/equals.d.ts b/types/react-icons/lib/ti/equals.d.ts
index 231585549c..9b4f2fabeb 100644
--- a/types/react-icons/lib/ti/equals.d.ts
+++ b/types/react-icons/lib/ti/equals.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEquals extends React.Component<IconBaseProps> { }
+declare class TiEquals extends React.Component<IconBaseProps> { }
+export = TiEquals;
diff --git a/types/react-icons/lib/ti/export-outline.d.ts b/types/react-icons/lib/ti/export-outline.d.ts
index 4d51c29d1a..ba24ea3d30 100644
--- a/types/react-icons/lib/ti/export-outline.d.ts
+++ b/types/react-icons/lib/ti/export-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiExportOutline extends React.Component<IconBaseProps> { }
+declare class TiExportOutline extends React.Component<IconBaseProps> { }
+export = TiExportOutline;
diff --git a/types/react-icons/lib/ti/export.d.ts b/types/react-icons/lib/ti/export.d.ts
index fe71d72677..62d2335260 100644
--- a/types/react-icons/lib/ti/export.d.ts
+++ b/types/react-icons/lib/ti/export.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiExport extends React.Component<IconBaseProps> { }
+declare class TiExport extends React.Component<IconBaseProps> { }
+export = TiExport;
diff --git a/types/react-icons/lib/ti/eye-outline.d.ts b/types/react-icons/lib/ti/eye-outline.d.ts
index 1956f13f4d..201e798391 100644
--- a/types/react-icons/lib/ti/eye-outline.d.ts
+++ b/types/react-icons/lib/ti/eye-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEyeOutline extends React.Component<IconBaseProps> { }
+declare class TiEyeOutline extends React.Component<IconBaseProps> { }
+export = TiEyeOutline;
diff --git a/types/react-icons/lib/ti/eye.d.ts b/types/react-icons/lib/ti/eye.d.ts
index 810fdf7009..0c6a684b88 100644
--- a/types/react-icons/lib/ti/eye.d.ts
+++ b/types/react-icons/lib/ti/eye.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEye extends React.Component<IconBaseProps> { }
+declare class TiEye extends React.Component<IconBaseProps> { }
+export = TiEye;
diff --git a/types/react-icons/lib/ti/feather.d.ts b/types/react-icons/lib/ti/feather.d.ts
index b4a99ba3ec..4e6c4e1080 100644
--- a/types/react-icons/lib/ti/feather.d.ts
+++ b/types/react-icons/lib/ti/feather.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFeather extends React.Component<IconBaseProps> { }
+declare class TiFeather extends React.Component<IconBaseProps> { }
+export = TiFeather;
diff --git a/types/react-icons/lib/ti/film.d.ts b/types/react-icons/lib/ti/film.d.ts
index a035c6378d..f039b84056 100644
--- a/types/react-icons/lib/ti/film.d.ts
+++ b/types/react-icons/lib/ti/film.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFilm extends React.Component<IconBaseProps> { }
+declare class TiFilm extends React.Component<IconBaseProps> { }
+export = TiFilm;
diff --git a/types/react-icons/lib/ti/filter.d.ts b/types/react-icons/lib/ti/filter.d.ts
index f806a9034b..9e42eece1f 100644
--- a/types/react-icons/lib/ti/filter.d.ts
+++ b/types/react-icons/lib/ti/filter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFilter extends React.Component<IconBaseProps> { }
+declare class TiFilter extends React.Component<IconBaseProps> { }
+export = TiFilter;
diff --git a/types/react-icons/lib/ti/flag-outline.d.ts b/types/react-icons/lib/ti/flag-outline.d.ts
index 164b221757..64a4c81bdd 100644
--- a/types/react-icons/lib/ti/flag-outline.d.ts
+++ b/types/react-icons/lib/ti/flag-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlagOutline extends React.Component<IconBaseProps> { }
+declare class TiFlagOutline extends React.Component<IconBaseProps> { }
+export = TiFlagOutline;
diff --git a/types/react-icons/lib/ti/flag.d.ts b/types/react-icons/lib/ti/flag.d.ts
index 4aa2838c02..dab92b561d 100644
--- a/types/react-icons/lib/ti/flag.d.ts
+++ b/types/react-icons/lib/ti/flag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlag extends React.Component<IconBaseProps> { }
+declare class TiFlag extends React.Component<IconBaseProps> { }
+export = TiFlag;
diff --git a/types/react-icons/lib/ti/flash-outline.d.ts b/types/react-icons/lib/ti/flash-outline.d.ts
index 5acea29381..8889cf52ba 100644
--- a/types/react-icons/lib/ti/flash-outline.d.ts
+++ b/types/react-icons/lib/ti/flash-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlashOutline extends React.Component<IconBaseProps> { }
+declare class TiFlashOutline extends React.Component<IconBaseProps> { }
+export = TiFlashOutline;
diff --git a/types/react-icons/lib/ti/flash.d.ts b/types/react-icons/lib/ti/flash.d.ts
index 27bbe63a9d..15a2371754 100644
--- a/types/react-icons/lib/ti/flash.d.ts
+++ b/types/react-icons/lib/ti/flash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlash extends React.Component<IconBaseProps> { }
+declare class TiFlash extends React.Component<IconBaseProps> { }
+export = TiFlash;
diff --git a/types/react-icons/lib/ti/flow-children.d.ts b/types/react-icons/lib/ti/flow-children.d.ts
index 8e3a8a9246..f46b1c165a 100644
--- a/types/react-icons/lib/ti/flow-children.d.ts
+++ b/types/react-icons/lib/ti/flow-children.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowChildren extends React.Component<IconBaseProps> { }
+declare class TiFlowChildren extends React.Component<IconBaseProps> { }
+export = TiFlowChildren;
diff --git a/types/react-icons/lib/ti/flow-merge.d.ts b/types/react-icons/lib/ti/flow-merge.d.ts
index c479b08b53..05a81557f6 100644
--- a/types/react-icons/lib/ti/flow-merge.d.ts
+++ b/types/react-icons/lib/ti/flow-merge.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowMerge extends React.Component<IconBaseProps> { }
+declare class TiFlowMerge extends React.Component<IconBaseProps> { }
+export = TiFlowMerge;
diff --git a/types/react-icons/lib/ti/flow-parallel.d.ts b/types/react-icons/lib/ti/flow-parallel.d.ts
index 4ed94844fc..fa1cd1c5e7 100644
--- a/types/react-icons/lib/ti/flow-parallel.d.ts
+++ b/types/react-icons/lib/ti/flow-parallel.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowParallel extends React.Component<IconBaseProps> { }
+declare class TiFlowParallel extends React.Component<IconBaseProps> { }
+export = TiFlowParallel;
diff --git a/types/react-icons/lib/ti/flow-switch.d.ts b/types/react-icons/lib/ti/flow-switch.d.ts
index 8a68f856fa..a8930e363e 100644
--- a/types/react-icons/lib/ti/flow-switch.d.ts
+++ b/types/react-icons/lib/ti/flow-switch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowSwitch extends React.Component<IconBaseProps> { }
+declare class TiFlowSwitch extends React.Component<IconBaseProps> { }
+export = TiFlowSwitch;
diff --git a/types/react-icons/lib/ti/folder-add.d.ts b/types/react-icons/lib/ti/folder-add.d.ts
index 83a709521a..82ec1b52ef 100644
--- a/types/react-icons/lib/ti/folder-add.d.ts
+++ b/types/react-icons/lib/ti/folder-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderAdd extends React.Component<IconBaseProps> { }
+declare class TiFolderAdd extends React.Component<IconBaseProps> { }
+export = TiFolderAdd;
diff --git a/types/react-icons/lib/ti/folder-delete.d.ts b/types/react-icons/lib/ti/folder-delete.d.ts
index bf96e60c12..5792a710ef 100644
--- a/types/react-icons/lib/ti/folder-delete.d.ts
+++ b/types/react-icons/lib/ti/folder-delete.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderDelete extends React.Component<IconBaseProps> { }
+declare class TiFolderDelete extends React.Component<IconBaseProps> { }
+export = TiFolderDelete;
diff --git a/types/react-icons/lib/ti/folder-open.d.ts b/types/react-icons/lib/ti/folder-open.d.ts
index 3c0f2ab47f..3cc472d927 100644
--- a/types/react-icons/lib/ti/folder-open.d.ts
+++ b/types/react-icons/lib/ti/folder-open.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderOpen extends React.Component<IconBaseProps> { }
+declare class TiFolderOpen extends React.Component<IconBaseProps> { }
+export = TiFolderOpen;
diff --git a/types/react-icons/lib/ti/folder.d.ts b/types/react-icons/lib/ti/folder.d.ts
index b12e97b6c3..2adf29f6cb 100644
--- a/types/react-icons/lib/ti/folder.d.ts
+++ b/types/react-icons/lib/ti/folder.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolder extends React.Component<IconBaseProps> { }
+declare class TiFolder extends React.Component<IconBaseProps> { }
+export = TiFolder;
diff --git a/types/react-icons/lib/ti/gift.d.ts b/types/react-icons/lib/ti/gift.d.ts
index 25e13a5038..adf2047b6e 100644
--- a/types/react-icons/lib/ti/gift.d.ts
+++ b/types/react-icons/lib/ti/gift.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGift extends React.Component<IconBaseProps> { }
+declare class TiGift extends React.Component<IconBaseProps> { }
+export = TiGift;
diff --git a/types/react-icons/lib/ti/globe-outline.d.ts b/types/react-icons/lib/ti/globe-outline.d.ts
index ee4d8cbb6b..9fbd792aa0 100644
--- a/types/react-icons/lib/ti/globe-outline.d.ts
+++ b/types/react-icons/lib/ti/globe-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGlobeOutline extends React.Component<IconBaseProps> { }
+declare class TiGlobeOutline extends React.Component<IconBaseProps> { }
+export = TiGlobeOutline;
diff --git a/types/react-icons/lib/ti/globe.d.ts b/types/react-icons/lib/ti/globe.d.ts
index 30912a9f17..65fcd995e4 100644
--- a/types/react-icons/lib/ti/globe.d.ts
+++ b/types/react-icons/lib/ti/globe.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGlobe extends React.Component<IconBaseProps> { }
+declare class TiGlobe extends React.Component<IconBaseProps> { }
+export = TiGlobe;
diff --git a/types/react-icons/lib/ti/group-outline.d.ts b/types/react-icons/lib/ti/group-outline.d.ts
index 621001d90e..ca11421d20 100644
--- a/types/react-icons/lib/ti/group-outline.d.ts
+++ b/types/react-icons/lib/ti/group-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGroupOutline extends React.Component<IconBaseProps> { }
+declare class TiGroupOutline extends React.Component<IconBaseProps> { }
+export = TiGroupOutline;
diff --git a/types/react-icons/lib/ti/group.d.ts b/types/react-icons/lib/ti/group.d.ts
index bb5fcf8559..ee7b592305 100644
--- a/types/react-icons/lib/ti/group.d.ts
+++ b/types/react-icons/lib/ti/group.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGroup extends React.Component<IconBaseProps> { }
+declare class TiGroup extends React.Component<IconBaseProps> { }
+export = TiGroup;
diff --git a/types/react-icons/lib/ti/headphones.d.ts b/types/react-icons/lib/ti/headphones.d.ts
index 90fb1a083f..372afd24ba 100644
--- a/types/react-icons/lib/ti/headphones.d.ts
+++ b/types/react-icons/lib/ti/headphones.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeadphones extends React.Component<IconBaseProps> { }
+declare class TiHeadphones extends React.Component<IconBaseProps> { }
+export = TiHeadphones;
diff --git a/types/react-icons/lib/ti/heart-full-outline.d.ts b/types/react-icons/lib/ti/heart-full-outline.d.ts
index 8153a02133..959500f330 100644
--- a/types/react-icons/lib/ti/heart-full-outline.d.ts
+++ b/types/react-icons/lib/ti/heart-full-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartFullOutline extends React.Component<IconBaseProps> { }
+declare class TiHeartFullOutline extends React.Component<IconBaseProps> { }
+export = TiHeartFullOutline;
diff --git a/types/react-icons/lib/ti/heart-half-outline.d.ts b/types/react-icons/lib/ti/heart-half-outline.d.ts
index 9d7482079f..d071493105 100644
--- a/types/react-icons/lib/ti/heart-half-outline.d.ts
+++ b/types/react-icons/lib/ti/heart-half-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartHalfOutline extends React.Component<IconBaseProps> { }
+declare class TiHeartHalfOutline extends React.Component<IconBaseProps> { }
+export = TiHeartHalfOutline;
diff --git a/types/react-icons/lib/ti/heart-outline.d.ts b/types/react-icons/lib/ti/heart-outline.d.ts
index 77ebb5ba4d..dc19876c98 100644
--- a/types/react-icons/lib/ti/heart-outline.d.ts
+++ b/types/react-icons/lib/ti/heart-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartOutline extends React.Component<IconBaseProps> { }
+declare class TiHeartOutline extends React.Component<IconBaseProps> { }
+export = TiHeartOutline;
diff --git a/types/react-icons/lib/ti/heart.d.ts b/types/react-icons/lib/ti/heart.d.ts
index edf26ea22d..1c16a9e4d7 100644
--- a/types/react-icons/lib/ti/heart.d.ts
+++ b/types/react-icons/lib/ti/heart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeart extends React.Component<IconBaseProps> { }
+declare class TiHeart extends React.Component<IconBaseProps> { }
+export = TiHeart;
diff --git a/types/react-icons/lib/ti/home-outline.d.ts b/types/react-icons/lib/ti/home-outline.d.ts
index aba8177146..c8caac4085 100644
--- a/types/react-icons/lib/ti/home-outline.d.ts
+++ b/types/react-icons/lib/ti/home-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHomeOutline extends React.Component<IconBaseProps> { }
+declare class TiHomeOutline extends React.Component<IconBaseProps> { }
+export = TiHomeOutline;
diff --git a/types/react-icons/lib/ti/home.d.ts b/types/react-icons/lib/ti/home.d.ts
index ffd2e0a744..0f26a83396 100644
--- a/types/react-icons/lib/ti/home.d.ts
+++ b/types/react-icons/lib/ti/home.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHome extends React.Component<IconBaseProps> { }
+declare class TiHome extends React.Component<IconBaseProps> { }
+export = TiHome;
diff --git a/types/react-icons/lib/ti/html5.d.ts b/types/react-icons/lib/ti/html5.d.ts
index 7850028128..9e3002c65e 100644
--- a/types/react-icons/lib/ti/html5.d.ts
+++ b/types/react-icons/lib/ti/html5.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHtml5 extends React.Component<IconBaseProps> { }
+declare class TiHtml5 extends React.Component<IconBaseProps> { }
+export = TiHtml5;
diff --git a/types/react-icons/lib/ti/image-outline.d.ts b/types/react-icons/lib/ti/image-outline.d.ts
index e8dabff924..478d9a15e4 100644
--- a/types/react-icons/lib/ti/image-outline.d.ts
+++ b/types/react-icons/lib/ti/image-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiImageOutline extends React.Component<IconBaseProps> { }
+declare class TiImageOutline extends React.Component<IconBaseProps> { }
+export = TiImageOutline;
diff --git a/types/react-icons/lib/ti/image.d.ts b/types/react-icons/lib/ti/image.d.ts
index f33b613d66..abe02ba9d1 100644
--- a/types/react-icons/lib/ti/image.d.ts
+++ b/types/react-icons/lib/ti/image.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiImage extends React.Component<IconBaseProps> { }
+declare class TiImage extends React.Component<IconBaseProps> { }
+export = TiImage;
diff --git a/types/react-icons/lib/ti/index.d.ts b/types/react-icons/lib/ti/index.d.ts
index bbe2809f2e..42e1bff681 100644
--- a/types/react-icons/lib/ti/index.d.ts
+++ b/types/react-icons/lib/ti/index.d.ts
@@ -1,339 +1,339 @@
-export { default as TiAdjustBrightness } from "./adjust-brightness";
-export { default as TiAdjustContrast } from "./adjust-contrast";
-export { default as TiAnchorOutline } from "./anchor-outline";
-export { default as TiAnchor } from "./anchor";
-export { default as TiArchive } from "./archive";
-export { default as TiArrowBackOutline } from "./arrow-back-outline";
-export { default as TiArrowBack } from "./arrow-back";
-export { default as TiArrowDownOutline } from "./arrow-down-outline";
-export { default as TiArrowDownThick } from "./arrow-down-thick";
-export { default as TiArrowDown } from "./arrow-down";
-export { default as TiArrowForwardOutline } from "./arrow-forward-outline";
-export { default as TiArrowForward } from "./arrow-forward";
-export { default as TiArrowLeftOutline } from "./arrow-left-outline";
-export { default as TiArrowLeftThick } from "./arrow-left-thick";
-export { default as TiArrowLeft } from "./arrow-left";
-export { default as TiArrowLoopOutline } from "./arrow-loop-outline";
-export { default as TiArrowLoop } from "./arrow-loop";
-export { default as TiArrowMaximiseOutline } from "./arrow-maximise-outline";
-export { default as TiArrowMaximise } from "./arrow-maximise";
-export { default as TiArrowMinimiseOutline } from "./arrow-minimise-outline";
-export { default as TiArrowMinimise } from "./arrow-minimise";
-export { default as TiArrowMoveOutline } from "./arrow-move-outline";
-export { default as TiArrowMove } from "./arrow-move";
-export { default as TiArrowRepeatOutline } from "./arrow-repeat-outline";
-export { default as TiArrowRepeat } from "./arrow-repeat";
-export { default as TiArrowRightOutline } from "./arrow-right-outline";
-export { default as TiArrowRightThick } from "./arrow-right-thick";
-export { default as TiArrowRight } from "./arrow-right";
-export { default as TiArrowShuffle } from "./arrow-shuffle";
-export { default as TiArrowSortedDown } from "./arrow-sorted-down";
-export { default as TiArrowSortedUp } from "./arrow-sorted-up";
-export { default as TiArrowSyncOutline } from "./arrow-sync-outline";
-export { default as TiArrowSync } from "./arrow-sync";
-export { default as TiArrowUnsorted } from "./arrow-unsorted";
-export { default as TiArrowUpOutline } from "./arrow-up-outline";
-export { default as TiArrowUpThick } from "./arrow-up-thick";
-export { default as TiArrowUp } from "./arrow-up";
-export { default as TiAt } from "./at";
-export { default as TiAttachmentOutline } from "./attachment-outline";
-export { default as TiAttachment } from "./attachment";
-export { default as TiBackspaceOutline } from "./backspace-outline";
-export { default as TiBackspace } from "./backspace";
-export { default as TiBatteryCharge } from "./battery-charge";
-export { default as TiBatteryFull } from "./battery-full";
-export { default as TiBatteryHigh } from "./battery-high";
-export { default as TiBatteryLow } from "./battery-low";
-export { default as TiBatteryMid } from "./battery-mid";
-export { default as TiBeaker } from "./beaker";
-export { default as TiBeer } from "./beer";
-export { default as TiBell } from "./bell";
-export { default as TiBook } from "./book";
-export { default as TiBookmark } from "./bookmark";
-export { default as TiBriefcase } from "./briefcase";
-export { default as TiBrush } from "./brush";
-export { default as TiBusinessCard } from "./business-card";
-export { default as TiCalculator } from "./calculator";
-export { default as TiCalendarOutline } from "./calendar-outline";
-export { default as TiCalendar } from "./calendar";
-export { default as TiCalenderOutline } from "./calender-outline";
-export { default as TiCalender } from "./calender";
-export { default as TiCameraOutline } from "./camera-outline";
-export { default as TiCamera } from "./camera";
-export { default as TiCancelOutline } from "./cancel-outline";
-export { default as TiCancel } from "./cancel";
-export { default as TiChartAreaOutline } from "./chart-area-outline";
-export { default as TiChartArea } from "./chart-area";
-export { default as TiChartBarOutline } from "./chart-bar-outline";
-export { default as TiChartBar } from "./chart-bar";
-export { default as TiChartLineOutline } from "./chart-line-outline";
-export { default as TiChartLine } from "./chart-line";
-export { default as TiChartPieOutline } from "./chart-pie-outline";
-export { default as TiChartPie } from "./chart-pie";
-export { default as TiChevronLeftOutline } from "./chevron-left-outline";
-export { default as TiChevronLeft } from "./chevron-left";
-export { default as TiChevronRightOutline } from "./chevron-right-outline";
-export { default as TiChevronRight } from "./chevron-right";
-export { default as TiClipboard } from "./clipboard";
-export { default as TiCloudStorageOutline } from "./cloud-storage-outline";
-export { default as TiCloudStorage } from "./cloud-storage";
-export { default as TiCodeOutline } from "./code-outline";
-export { default as TiCode } from "./code";
-export { default as TiCoffee } from "./coffee";
-export { default as TiCogOutline } from "./cog-outline";
-export { default as TiCog } from "./cog";
-export { default as TiCompass } from "./compass";
-export { default as TiContacts } from "./contacts";
-export { default as TiCreditCard } from "./credit-card";
-export { default as TiCross } from "./cross";
-export { default as TiCss3 } from "./css3";
-export { default as TiDatabase } from "./database";
-export { default as TiDeleteOutline } from "./delete-outline";
-export { default as TiDelete } from "./delete";
-export { default as TiDeviceDesktop } from "./device-desktop";
-export { default as TiDeviceLaptop } from "./device-laptop";
-export { default as TiDevicePhone } from "./device-phone";
-export { default as TiDeviceTablet } from "./device-tablet";
-export { default as TiDirections } from "./directions";
-export { default as TiDivideOutline } from "./divide-outline";
-export { default as TiDivide } from "./divide";
-export { default as TiDocumentAdd } from "./document-add";
-export { default as TiDocumentDelete } from "./document-delete";
-export { default as TiDocumentText } from "./document-text";
-export { default as TiDocument } from "./document";
-export { default as TiDownloadOutline } from "./download-outline";
-export { default as TiDownload } from "./download";
-export { default as TiDropbox } from "./dropbox";
-export { default as TiEdit } from "./edit";
-export { default as TiEjectOutline } from "./eject-outline";
-export { default as TiEject } from "./eject";
-export { default as TiEqualsOutline } from "./equals-outline";
-export { default as TiEquals } from "./equals";
-export { default as TiExportOutline } from "./export-outline";
-export { default as TiExport } from "./export";
-export { default as TiEyeOutline } from "./eye-outline";
-export { default as TiEye } from "./eye";
-export { default as TiFeather } from "./feather";
-export { default as TiFilm } from "./film";
-export { default as TiFilter } from "./filter";
-export { default as TiFlagOutline } from "./flag-outline";
-export { default as TiFlag } from "./flag";
-export { default as TiFlashOutline } from "./flash-outline";
-export { default as TiFlash } from "./flash";
-export { default as TiFlowChildren } from "./flow-children";
-export { default as TiFlowMerge } from "./flow-merge";
-export { default as TiFlowParallel } from "./flow-parallel";
-export { default as TiFlowSwitch } from "./flow-switch";
-export { default as TiFolderAdd } from "./folder-add";
-export { default as TiFolderDelete } from "./folder-delete";
-export { default as TiFolderOpen } from "./folder-open";
-export { default as TiFolder } from "./folder";
-export { default as TiGift } from "./gift";
-export { default as TiGlobeOutline } from "./globe-outline";
-export { default as TiGlobe } from "./globe";
-export { default as TiGroupOutline } from "./group-outline";
-export { default as TiGroup } from "./group";
-export { default as TiHeadphones } from "./headphones";
-export { default as TiHeartFullOutline } from "./heart-full-outline";
-export { default as TiHeartHalfOutline } from "./heart-half-outline";
-export { default as TiHeartOutline } from "./heart-outline";
-export { default as TiHeart } from "./heart";
-export { default as TiHomeOutline } from "./home-outline";
-export { default as TiHome } from "./home";
-export { default as TiHtml5 } from "./html5";
-export { default as TiImageOutline } from "./image-outline";
-export { default as TiImage } from "./image";
-export { default as TiInfinityOutline } from "./infinity-outline";
-export { default as TiInfinity } from "./infinity";
-export { default as TiInfoLargeOutline } from "./info-large-outline";
-export { default as TiInfoLarge } from "./info-large";
-export { default as TiInfoOutline } from "./info-outline";
-export { default as TiInfo } from "./info";
-export { default as TiInputCheckedOutline } from "./input-checked-outline";
-export { default as TiInputChecked } from "./input-checked";
-export { default as TiKeyOutline } from "./key-outline";
-export { default as TiKey } from "./key";
-export { default as TiKeyboard } from "./keyboard";
-export { default as TiLeaf } from "./leaf";
-export { default as TiLightbulb } from "./lightbulb";
-export { default as TiLinkOutline } from "./link-outline";
-export { default as TiLink } from "./link";
-export { default as TiLocationArrowOutline } from "./location-arrow-outline";
-export { default as TiLocationArrow } from "./location-arrow";
-export { default as TiLocationOutline } from "./location-outline";
-export { default as TiLocation } from "./location";
-export { default as TiLockClosedOutline } from "./lock-closed-outline";
-export { default as TiLockClosed } from "./lock-closed";
-export { default as TiLockOpenOutline } from "./lock-open-outline";
-export { default as TiLockOpen } from "./lock-open";
-export { default as TiMail } from "./mail";
-export { default as TiMap } from "./map";
-export { default as TiMediaEjectOutline } from "./media-eject-outline";
-export { default as TiMediaEject } from "./media-eject";
-export { default as TiMediaFastForwardOutline } from "./media-fast-forward-outline";
-export { default as TiMediaFastForward } from "./media-fast-forward";
-export { default as TiMediaPauseOutline } from "./media-pause-outline";
-export { default as TiMediaPause } from "./media-pause";
-export { default as TiMediaPlayOutline } from "./media-play-outline";
-export { default as TiMediaPlayReverseOutline } from "./media-play-reverse-outline";
-export { default as TiMediaPlayReverse } from "./media-play-reverse";
-export { default as TiMediaPlay } from "./media-play";
-export { default as TiMediaRecordOutline } from "./media-record-outline";
-export { default as TiMediaRecord } from "./media-record";
-export { default as TiMediaRewindOutline } from "./media-rewind-outline";
-export { default as TiMediaRewind } from "./media-rewind";
-export { default as TiMediaStopOutline } from "./media-stop-outline";
-export { default as TiMediaStop } from "./media-stop";
-export { default as TiMessageTyping } from "./message-typing";
-export { default as TiMessage } from "./message";
-export { default as TiMessages } from "./messages";
-export { default as TiMicrophoneOutline } from "./microphone-outline";
-export { default as TiMicrophone } from "./microphone";
-export { default as TiMinusOutline } from "./minus-outline";
-export { default as TiMinus } from "./minus";
-export { default as TiMortarBoard } from "./mortar-board";
-export { default as TiNews } from "./news";
-export { default as TiNotesOutline } from "./notes-outline";
-export { default as TiNotes } from "./notes";
-export { default as TiPen } from "./pen";
-export { default as TiPencil } from "./pencil";
-export { default as TiPhoneOutline } from "./phone-outline";
-export { default as TiPhone } from "./phone";
-export { default as TiPiOutline } from "./pi-outline";
-export { default as TiPi } from "./pi";
-export { default as TiPinOutline } from "./pin-outline";
-export { default as TiPin } from "./pin";
-export { default as TiPipette } from "./pipette";
-export { default as TiPlaneOutline } from "./plane-outline";
-export { default as TiPlane } from "./plane";
-export { default as TiPlug } from "./plug";
-export { default as TiPlusOutline } from "./plus-outline";
-export { default as TiPlus } from "./plus";
-export { default as TiPointOfInterestOutline } from "./point-of-interest-outline";
-export { default as TiPointOfInterest } from "./point-of-interest";
-export { default as TiPowerOutline } from "./power-outline";
-export { default as TiPower } from "./power";
-export { default as TiPrinter } from "./printer";
-export { default as TiPuzzleOutline } from "./puzzle-outline";
-export { default as TiPuzzle } from "./puzzle";
-export { default as TiRadarOutline } from "./radar-outline";
-export { default as TiRadar } from "./radar";
-export { default as TiRefreshOutline } from "./refresh-outline";
-export { default as TiRefresh } from "./refresh";
-export { default as TiRssOutline } from "./rss-outline";
-export { default as TiRss } from "./rss";
-export { default as TiScissorsOutline } from "./scissors-outline";
-export { default as TiScissors } from "./scissors";
-export { default as TiShoppingBag } from "./shopping-bag";
-export { default as TiShoppingCart } from "./shopping-cart";
-export { default as TiSocialAtCircular } from "./social-at-circular";
-export { default as TiSocialDribbbleCircular } from "./social-dribbble-circular";
-export { default as TiSocialDribbble } from "./social-dribbble";
-export { default as TiSocialFacebookCircular } from "./social-facebook-circular";
-export { default as TiSocialFacebook } from "./social-facebook";
-export { default as TiSocialFlickrCircular } from "./social-flickr-circular";
-export { default as TiSocialFlickr } from "./social-flickr";
-export { default as TiSocialGithubCircular } from "./social-github-circular";
-export { default as TiSocialGithub } from "./social-github";
-export { default as TiSocialGooglePlusCircular } from "./social-google-plus-circular";
-export { default as TiSocialGooglePlus } from "./social-google-plus";
-export { default as TiSocialInstagramCircular } from "./social-instagram-circular";
-export { default as TiSocialInstagram } from "./social-instagram";
-export { default as TiSocialLastFmCircular } from "./social-last-fm-circular";
-export { default as TiSocialLastFm } from "./social-last-fm";
-export { default as TiSocialLinkedinCircular } from "./social-linkedin-circular";
-export { default as TiSocialLinkedin } from "./social-linkedin";
-export { default as TiSocialPinterestCircular } from "./social-pinterest-circular";
-export { default as TiSocialPinterest } from "./social-pinterest";
-export { default as TiSocialSkypeOutline } from "./social-skype-outline";
-export { default as TiSocialSkype } from "./social-skype";
-export { default as TiSocialTumblerCircular } from "./social-tumbler-circular";
-export { default as TiSocialTumbler } from "./social-tumbler";
-export { default as TiSocialTwitterCircular } from "./social-twitter-circular";
-export { default as TiSocialTwitter } from "./social-twitter";
-export { default as TiSocialVimeoCircular } from "./social-vimeo-circular";
-export { default as TiSocialVimeo } from "./social-vimeo";
-export { default as TiSocialYoutubeCircular } from "./social-youtube-circular";
-export { default as TiSocialYoutube } from "./social-youtube";
-export { default as TiSortAlphabeticallyOutline } from "./sort-alphabetically-outline";
-export { default as TiSortAlphabetically } from "./sort-alphabetically";
-export { default as TiSortNumericallyOutline } from "./sort-numerically-outline";
-export { default as TiSortNumerically } from "./sort-numerically";
-export { default as TiSpannerOutline } from "./spanner-outline";
-export { default as TiSpanner } from "./spanner";
-export { default as TiSpiral } from "./spiral";
-export { default as TiStarFullOutline } from "./star-full-outline";
-export { default as TiStarHalfOutline } from "./star-half-outline";
-export { default as TiStarHalf } from "./star-half";
-export { default as TiStarOutline } from "./star-outline";
-export { default as TiStar } from "./star";
-export { default as TiStarburstOutline } from "./starburst-outline";
-export { default as TiStarburst } from "./starburst";
-export { default as TiStopwatch } from "./stopwatch";
-export { default as TiSupport } from "./support";
-export { default as TiTabsOutline } from "./tabs-outline";
-export { default as TiTag } from "./tag";
-export { default as TiTags } from "./tags";
-export { default as TiThLargeOutline } from "./th-large-outline";
-export { default as TiThLarge } from "./th-large";
-export { default as TiThListOutline } from "./th-list-outline";
-export { default as TiThList } from "./th-list";
-export { default as TiThMenuOutline } from "./th-menu-outline";
-export { default as TiThMenu } from "./th-menu";
-export { default as TiThSmallOutline } from "./th-small-outline";
-export { default as TiThSmall } from "./th-small";
-export { default as TiThermometer } from "./thermometer";
-export { default as TiThumbsDown } from "./thumbs-down";
-export { default as TiThumbsOk } from "./thumbs-ok";
-export { default as TiThumbsUp } from "./thumbs-up";
-export { default as TiTickOutline } from "./tick-outline";
-export { default as TiTick } from "./tick";
-export { default as TiTicket } from "./ticket";
-export { default as TiTime } from "./time";
-export { default as TiTimesOutline } from "./times-outline";
-export { default as TiTimes } from "./times";
-export { default as TiTrash } from "./trash";
-export { default as TiTree } from "./tree";
-export { default as TiUploadOutline } from "./upload-outline";
-export { default as TiUpload } from "./upload";
-export { default as TiUserAddOutline } from "./user-add-outline";
-export { default as TiUserAdd } from "./user-add";
-export { default as TiUserDeleteOutline } from "./user-delete-outline";
-export { default as TiUserDelete } from "./user-delete";
-export { default as TiUserOutline } from "./user-outline";
-export { default as TiUser } from "./user";
-export { default as TiVendorAndroid } from "./vendor-android";
-export { default as TiVendorApple } from "./vendor-apple";
-export { default as TiVendorMicrosoft } from "./vendor-microsoft";
-export { default as TiVideoOutline } from "./video-outline";
-export { default as TiVideo } from "./video";
-export { default as TiVolumeDown } from "./volume-down";
-export { default as TiVolumeMute } from "./volume-mute";
-export { default as TiVolumeUp } from "./volume-up";
-export { default as TiVolume } from "./volume";
-export { default as TiWarningOutline } from "./warning-outline";
-export { default as TiWarning } from "./warning";
-export { default as TiWatch } from "./watch";
-export { default as TiWavesOutline } from "./waves-outline";
-export { default as TiWaves } from "./waves";
-export { default as TiWeatherCloudy } from "./weather-cloudy";
-export { default as TiWeatherDownpour } from "./weather-downpour";
-export { default as TiWeatherNight } from "./weather-night";
-export { default as TiWeatherPartlySunny } from "./weather-partly-sunny";
-export { default as TiWeatherShower } from "./weather-shower";
-export { default as TiWeatherSnow } from "./weather-snow";
-export { default as TiWeatherStormy } from "./weather-stormy";
-export { default as TiWeatherSunny } from "./weather-sunny";
-export { default as TiWeatherWindyCloudy } from "./weather-windy-cloudy";
-export { default as TiWeatherWindy } from "./weather-windy";
-export { default as TiWiFiOutline } from "./wi-fi-outline";
-export { default as TiWiFi } from "./wi-fi";
-export { default as TiWine } from "./wine";
-export { default as TiWorldOutline } from "./world-outline";
-export { default as TiWorld } from "./world";
-export { default as TiZoomInOutline } from "./zoom-in-outline";
-export { default as TiZoomIn } from "./zoom-in";
-export { default as TiZoomOutOutline } from "./zoom-out-outline";
-export { default as TiZoomOut } from "./zoom-out";
-export { default as TiZoomOutline } from "./zoom-outline";
-export { default as TiZoom } from "./zoom";
+export { default as TiAdjustBrightness } from "../../ti/adjust-brightness";
+export { default as TiAdjustContrast } from "../../ti/adjust-contrast";
+export { default as TiAnchorOutline } from "../../ti/anchor-outline";
+export { default as TiAnchor } from "../../ti/anchor";
+export { default as TiArchive } from "../../ti/archive";
+export { default as TiArrowBackOutline } from "../../ti/arrow-back-outline";
+export { default as TiArrowBack } from "../../ti/arrow-back";
+export { default as TiArrowDownOutline } from "../../ti/arrow-down-outline";
+export { default as TiArrowDownThick } from "../../ti/arrow-down-thick";
+export { default as TiArrowDown } from "../../ti/arrow-down";
+export { default as TiArrowForwardOutline } from "../../ti/arrow-forward-outline";
+export { default as TiArrowForward } from "../../ti/arrow-forward";
+export { default as TiArrowLeftOutline } from "../../ti/arrow-left-outline";
+export { default as TiArrowLeftThick } from "../../ti/arrow-left-thick";
+export { default as TiArrowLeft } from "../../ti/arrow-left";
+export { default as TiArrowLoopOutline } from "../../ti/arrow-loop-outline";
+export { default as TiArrowLoop } from "../../ti/arrow-loop";
+export { default as TiArrowMaximiseOutline } from "../../ti/arrow-maximise-outline";
+export { default as TiArrowMaximise } from "../../ti/arrow-maximise";
+export { default as TiArrowMinimiseOutline } from "../../ti/arrow-minimise-outline";
+export { default as TiArrowMinimise } from "../../ti/arrow-minimise";
+export { default as TiArrowMoveOutline } from "../../ti/arrow-move-outline";
+export { default as TiArrowMove } from "../../ti/arrow-move";
+export { default as TiArrowRepeatOutline } from "../../ti/arrow-repeat-outline";
+export { default as TiArrowRepeat } from "../../ti/arrow-repeat";
+export { default as TiArrowRightOutline } from "../../ti/arrow-right-outline";
+export { default as TiArrowRightThick } from "../../ti/arrow-right-thick";
+export { default as TiArrowRight } from "../../ti/arrow-right";
+export { default as TiArrowShuffle } from "../../ti/arrow-shuffle";
+export { default as TiArrowSortedDown } from "../../ti/arrow-sorted-down";
+export { default as TiArrowSortedUp } from "../../ti/arrow-sorted-up";
+export { default as TiArrowSyncOutline } from "../../ti/arrow-sync-outline";
+export { default as TiArrowSync } from "../../ti/arrow-sync";
+export { default as TiArrowUnsorted } from "../../ti/arrow-unsorted";
+export { default as TiArrowUpOutline } from "../../ti/arrow-up-outline";
+export { default as TiArrowUpThick } from "../../ti/arrow-up-thick";
+export { default as TiArrowUp } from "../../ti/arrow-up";
+export { default as TiAt } from "../../ti/at";
+export { default as TiAttachmentOutline } from "../../ti/attachment-outline";
+export { default as TiAttachment } from "../../ti/attachment";
+export { default as TiBackspaceOutline } from "../../ti/backspace-outline";
+export { default as TiBackspace } from "../../ti/backspace";
+export { default as TiBatteryCharge } from "../../ti/battery-charge";
+export { default as TiBatteryFull } from "../../ti/battery-full";
+export { default as TiBatteryHigh } from "../../ti/battery-high";
+export { default as TiBatteryLow } from "../../ti/battery-low";
+export { default as TiBatteryMid } from "../../ti/battery-mid";
+export { default as TiBeaker } from "../../ti/beaker";
+export { default as TiBeer } from "../../ti/beer";
+export { default as TiBell } from "../../ti/bell";
+export { default as TiBook } from "../../ti/book";
+export { default as TiBookmark } from "../../ti/bookmark";
+export { default as TiBriefcase } from "../../ti/briefcase";
+export { default as TiBrush } from "../../ti/brush";
+export { default as TiBusinessCard } from "../../ti/business-card";
+export { default as TiCalculator } from "../../ti/calculator";
+export { default as TiCalendarOutline } from "../../ti/calendar-outline";
+export { default as TiCalendar } from "../../ti/calendar";
+export { default as TiCalenderOutline } from "../../ti/calender-outline";
+export { default as TiCalender } from "../../ti/calender";
+export { default as TiCameraOutline } from "../../ti/camera-outline";
+export { default as TiCamera } from "../../ti/camera";
+export { default as TiCancelOutline } from "../../ti/cancel-outline";
+export { default as TiCancel } from "../../ti/cancel";
+export { default as TiChartAreaOutline } from "../../ti/chart-area-outline";
+export { default as TiChartArea } from "../../ti/chart-area";
+export { default as TiChartBarOutline } from "../../ti/chart-bar-outline";
+export { default as TiChartBar } from "../../ti/chart-bar";
+export { default as TiChartLineOutline } from "../../ti/chart-line-outline";
+export { default as TiChartLine } from "../../ti/chart-line";
+export { default as TiChartPieOutline } from "../../ti/chart-pie-outline";
+export { default as TiChartPie } from "../../ti/chart-pie";
+export { default as TiChevronLeftOutline } from "../../ti/chevron-left-outline";
+export { default as TiChevronLeft } from "../../ti/chevron-left";
+export { default as TiChevronRightOutline } from "../../ti/chevron-right-outline";
+export { default as TiChevronRight } from "../../ti/chevron-right";
+export { default as TiClipboard } from "../../ti/clipboard";
+export { default as TiCloudStorageOutline } from "../../ti/cloud-storage-outline";
+export { default as TiCloudStorage } from "../../ti/cloud-storage";
+export { default as TiCodeOutline } from "../../ti/code-outline";
+export { default as TiCode } from "../../ti/code";
+export { default as TiCoffee } from "../../ti/coffee";
+export { default as TiCogOutline } from "../../ti/cog-outline";
+export { default as TiCog } from "../../ti/cog";
+export { default as TiCompass } from "../../ti/compass";
+export { default as TiContacts } from "../../ti/contacts";
+export { default as TiCreditCard } from "../../ti/credit-card";
+export { default as TiCross } from "../../ti/cross";
+export { default as TiCss3 } from "../../ti/css3";
+export { default as TiDatabase } from "../../ti/database";
+export { default as TiDeleteOutline } from "../../ti/delete-outline";
+export { default as TiDelete } from "../../ti/delete";
+export { default as TiDeviceDesktop } from "../../ti/device-desktop";
+export { default as TiDeviceLaptop } from "../../ti/device-laptop";
+export { default as TiDevicePhone } from "../../ti/device-phone";
+export { default as TiDeviceTablet } from "../../ti/device-tablet";
+export { default as TiDirections } from "../../ti/directions";
+export { default as TiDivideOutline } from "../../ti/divide-outline";
+export { default as TiDivide } from "../../ti/divide";
+export { default as TiDocumentAdd } from "../../ti/document-add";
+export { default as TiDocumentDelete } from "../../ti/document-delete";
+export { default as TiDocumentText } from "../../ti/document-text";
+export { default as TiDocument } from "../../ti/document";
+export { default as TiDownloadOutline } from "../../ti/download-outline";
+export { default as TiDownload } from "../../ti/download";
+export { default as TiDropbox } from "../../ti/dropbox";
+export { default as TiEdit } from "../../ti/edit";
+export { default as TiEjectOutline } from "../../ti/eject-outline";
+export { default as TiEject } from "../../ti/eject";
+export { default as TiEqualsOutline } from "../../ti/equals-outline";
+export { default as TiEquals } from "../../ti/equals";
+export { default as TiExportOutline } from "../../ti/export-outline";
+export { default as TiExport } from "../../ti/export";
+export { default as TiEyeOutline } from "../../ti/eye-outline";
+export { default as TiEye } from "../../ti/eye";
+export { default as TiFeather } from "../../ti/feather";
+export { default as TiFilm } from "../../ti/film";
+export { default as TiFilter } from "../../ti/filter";
+export { default as TiFlagOutline } from "../../ti/flag-outline";
+export { default as TiFlag } from "../../ti/flag";
+export { default as TiFlashOutline } from "../../ti/flash-outline";
+export { default as TiFlash } from "../../ti/flash";
+export { default as TiFlowChildren } from "../../ti/flow-children";
+export { default as TiFlowMerge } from "../../ti/flow-merge";
+export { default as TiFlowParallel } from "../../ti/flow-parallel";
+export { default as TiFlowSwitch } from "../../ti/flow-switch";
+export { default as TiFolderAdd } from "../../ti/folder-add";
+export { default as TiFolderDelete } from "../../ti/folder-delete";
+export { default as TiFolderOpen } from "../../ti/folder-open";
+export { default as TiFolder } from "../../ti/folder";
+export { default as TiGift } from "../../ti/gift";
+export { default as TiGlobeOutline } from "../../ti/globe-outline";
+export { default as TiGlobe } from "../../ti/globe";
+export { default as TiGroupOutline } from "../../ti/group-outline";
+export { default as TiGroup } from "../../ti/group";
+export { default as TiHeadphones } from "../../ti/headphones";
+export { default as TiHeartFullOutline } from "../../ti/heart-full-outline";
+export { default as TiHeartHalfOutline } from "../../ti/heart-half-outline";
+export { default as TiHeartOutline } from "../../ti/heart-outline";
+export { default as TiHeart } from "../../ti/heart";
+export { default as TiHomeOutline } from "../../ti/home-outline";
+export { default as TiHome } from "../../ti/home";
+export { default as TiHtml5 } from "../../ti/html5";
+export { default as TiImageOutline } from "../../ti/image-outline";
+export { default as TiImage } from "../../ti/image";
+export { default as TiInfinityOutline } from "../../ti/infinity-outline";
+export { default as TiInfinity } from "../../ti/infinity";
+export { default as TiInfoLargeOutline } from "../../ti/info-large-outline";
+export { default as TiInfoLarge } from "../../ti/info-large";
+export { default as TiInfoOutline } from "../../ti/info-outline";
+export { default as TiInfo } from "../../ti/info";
+export { default as TiInputCheckedOutline } from "../../ti/input-checked-outline";
+export { default as TiInputChecked } from "../../ti/input-checked";
+export { default as TiKeyOutline } from "../../ti/key-outline";
+export { default as TiKey } from "../../ti/key";
+export { default as TiKeyboard } from "../../ti/keyboard";
+export { default as TiLeaf } from "../../ti/leaf";
+export { default as TiLightbulb } from "../../ti/lightbulb";
+export { default as TiLinkOutline } from "../../ti/link-outline";
+export { default as TiLink } from "../../ti/link";
+export { default as TiLocationArrowOutline } from "../../ti/location-arrow-outline";
+export { default as TiLocationArrow } from "../../ti/location-arrow";
+export { default as TiLocationOutline } from "../../ti/location-outline";
+export { default as TiLocation } from "../../ti/location";
+export { default as TiLockClosedOutline } from "../../ti/lock-closed-outline";
+export { default as TiLockClosed } from "../../ti/lock-closed";
+export { default as TiLockOpenOutline } from "../../ti/lock-open-outline";
+export { default as TiLockOpen } from "../../ti/lock-open";
+export { default as TiMail } from "../../ti/mail";
+export { default as TiMap } from "../../ti/map";
+export { default as TiMediaEjectOutline } from "../../ti/media-eject-outline";
+export { default as TiMediaEject } from "../../ti/media-eject";
+export { default as TiMediaFastForwardOutline } from "../../ti/media-fast-forward-outline";
+export { default as TiMediaFastForward } from "../../ti/media-fast-forward";
+export { default as TiMediaPauseOutline } from "../../ti/media-pause-outline";
+export { default as TiMediaPause } from "../../ti/media-pause";
+export { default as TiMediaPlayOutline } from "../../ti/media-play-outline";
+export { default as TiMediaPlayReverseOutline } from "../../ti/media-play-reverse-outline";
+export { default as TiMediaPlayReverse } from "../../ti/media-play-reverse";
+export { default as TiMediaPlay } from "../../ti/media-play";
+export { default as TiMediaRecordOutline } from "../../ti/media-record-outline";
+export { default as TiMediaRecord } from "../../ti/media-record";
+export { default as TiMediaRewindOutline } from "../../ti/media-rewind-outline";
+export { default as TiMediaRewind } from "../../ti/media-rewind";
+export { default as TiMediaStopOutline } from "../../ti/media-stop-outline";
+export { default as TiMediaStop } from "../../ti/media-stop";
+export { default as TiMessageTyping } from "../../ti/message-typing";
+export { default as TiMessage } from "../../ti/message";
+export { default as TiMessages } from "../../ti/messages";
+export { default as TiMicrophoneOutline } from "../../ti/microphone-outline";
+export { default as TiMicrophone } from "../../ti/microphone";
+export { default as TiMinusOutline } from "../../ti/minus-outline";
+export { default as TiMinus } from "../../ti/minus";
+export { default as TiMortarBoard } from "../../ti/mortar-board";
+export { default as TiNews } from "../../ti/news";
+export { default as TiNotesOutline } from "../../ti/notes-outline";
+export { default as TiNotes } from "../../ti/notes";
+export { default as TiPen } from "../../ti/pen";
+export { default as TiPencil } from "../../ti/pencil";
+export { default as TiPhoneOutline } from "../../ti/phone-outline";
+export { default as TiPhone } from "../../ti/phone";
+export { default as TiPiOutline } from "../../ti/pi-outline";
+export { default as TiPi } from "../../ti/pi";
+export { default as TiPinOutline } from "../../ti/pin-outline";
+export { default as TiPin } from "../../ti/pin";
+export { default as TiPipette } from "../../ti/pipette";
+export { default as TiPlaneOutline } from "../../ti/plane-outline";
+export { default as TiPlane } from "../../ti/plane";
+export { default as TiPlug } from "../../ti/plug";
+export { default as TiPlusOutline } from "../../ti/plus-outline";
+export { default as TiPlus } from "../../ti/plus";
+export { default as TiPointOfInterestOutline } from "../../ti/point-of-interest-outline";
+export { default as TiPointOfInterest } from "../../ti/point-of-interest";
+export { default as TiPowerOutline } from "../../ti/power-outline";
+export { default as TiPower } from "../../ti/power";
+export { default as TiPrinter } from "../../ti/printer";
+export { default as TiPuzzleOutline } from "../../ti/puzzle-outline";
+export { default as TiPuzzle } from "../../ti/puzzle";
+export { default as TiRadarOutline } from "../../ti/radar-outline";
+export { default as TiRadar } from "../../ti/radar";
+export { default as TiRefreshOutline } from "../../ti/refresh-outline";
+export { default as TiRefresh } from "../../ti/refresh";
+export { default as TiRssOutline } from "../../ti/rss-outline";
+export { default as TiRss } from "../../ti/rss";
+export { default as TiScissorsOutline } from "../../ti/scissors-outline";
+export { default as TiScissors } from "../../ti/scissors";
+export { default as TiShoppingBag } from "../../ti/shopping-bag";
+export { default as TiShoppingCart } from "../../ti/shopping-cart";
+export { default as TiSocialAtCircular } from "../../ti/social-at-circular";
+export { default as TiSocialDribbbleCircular } from "../../ti/social-dribbble-circular";
+export { default as TiSocialDribbble } from "../../ti/social-dribbble";
+export { default as TiSocialFacebookCircular } from "../../ti/social-facebook-circular";
+export { default as TiSocialFacebook } from "../../ti/social-facebook";
+export { default as TiSocialFlickrCircular } from "../../ti/social-flickr-circular";
+export { default as TiSocialFlickr } from "../../ti/social-flickr";
+export { default as TiSocialGithubCircular } from "../../ti/social-github-circular";
+export { default as TiSocialGithub } from "../../ti/social-github";
+export { default as TiSocialGooglePlusCircular } from "../../ti/social-google-plus-circular";
+export { default as TiSocialGooglePlus } from "../../ti/social-google-plus";
+export { default as TiSocialInstagramCircular } from "../../ti/social-instagram-circular";
+export { default as TiSocialInstagram } from "../../ti/social-instagram";
+export { default as TiSocialLastFmCircular } from "../../ti/social-last-fm-circular";
+export { default as TiSocialLastFm } from "../../ti/social-last-fm";
+export { default as TiSocialLinkedinCircular } from "../../ti/social-linkedin-circular";
+export { default as TiSocialLinkedin } from "../../ti/social-linkedin";
+export { default as TiSocialPinterestCircular } from "../../ti/social-pinterest-circular";
+export { default as TiSocialPinterest } from "../../ti/social-pinterest";
+export { default as TiSocialSkypeOutline } from "../../ti/social-skype-outline";
+export { default as TiSocialSkype } from "../../ti/social-skype";
+export { default as TiSocialTumblerCircular } from "../../ti/social-tumbler-circular";
+export { default as TiSocialTumbler } from "../../ti/social-tumbler";
+export { default as TiSocialTwitterCircular } from "../../ti/social-twitter-circular";
+export { default as TiSocialTwitter } from "../../ti/social-twitter";
+export { default as TiSocialVimeoCircular } from "../../ti/social-vimeo-circular";
+export { default as TiSocialVimeo } from "../../ti/social-vimeo";
+export { default as TiSocialYoutubeCircular } from "../../ti/social-youtube-circular";
+export { default as TiSocialYoutube } from "../../ti/social-youtube";
+export { default as TiSortAlphabeticallyOutline } from "../../ti/sort-alphabetically-outline";
+export { default as TiSortAlphabetically } from "../../ti/sort-alphabetically";
+export { default as TiSortNumericallyOutline } from "../../ti/sort-numerically-outline";
+export { default as TiSortNumerically } from "../../ti/sort-numerically";
+export { default as TiSpannerOutline } from "../../ti/spanner-outline";
+export { default as TiSpanner } from "../../ti/spanner";
+export { default as TiSpiral } from "../../ti/spiral";
+export { default as TiStarFullOutline } from "../../ti/star-full-outline";
+export { default as TiStarHalfOutline } from "../../ti/star-half-outline";
+export { default as TiStarHalf } from "../../ti/star-half";
+export { default as TiStarOutline } from "../../ti/star-outline";
+export { default as TiStar } from "../../ti/star";
+export { default as TiStarburstOutline } from "../../ti/starburst-outline";
+export { default as TiStarburst } from "../../ti/starburst";
+export { default as TiStopwatch } from "../../ti/stopwatch";
+export { default as TiSupport } from "../../ti/support";
+export { default as TiTabsOutline } from "../../ti/tabs-outline";
+export { default as TiTag } from "../../ti/tag";
+export { default as TiTags } from "../../ti/tags";
+export { default as TiThLargeOutline } from "../../ti/th-large-outline";
+export { default as TiThLarge } from "../../ti/th-large";
+export { default as TiThListOutline } from "../../ti/th-list-outline";
+export { default as TiThList } from "../../ti/th-list";
+export { default as TiThMenuOutline } from "../../ti/th-menu-outline";
+export { default as TiThMenu } from "../../ti/th-menu";
+export { default as TiThSmallOutline } from "../../ti/th-small-outline";
+export { default as TiThSmall } from "../../ti/th-small";
+export { default as TiThermometer } from "../../ti/thermometer";
+export { default as TiThumbsDown } from "../../ti/thumbs-down";
+export { default as TiThumbsOk } from "../../ti/thumbs-ok";
+export { default as TiThumbsUp } from "../../ti/thumbs-up";
+export { default as TiTickOutline } from "../../ti/tick-outline";
+export { default as TiTick } from "../../ti/tick";
+export { default as TiTicket } from "../../ti/ticket";
+export { default as TiTime } from "../../ti/time";
+export { default as TiTimesOutline } from "../../ti/times-outline";
+export { default as TiTimes } from "../../ti/times";
+export { default as TiTrash } from "../../ti/trash";
+export { default as TiTree } from "../../ti/tree";
+export { default as TiUploadOutline } from "../../ti/upload-outline";
+export { default as TiUpload } from "../../ti/upload";
+export { default as TiUserAddOutline } from "../../ti/user-add-outline";
+export { default as TiUserAdd } from "../../ti/user-add";
+export { default as TiUserDeleteOutline } from "../../ti/user-delete-outline";
+export { default as TiUserDelete } from "../../ti/user-delete";
+export { default as TiUserOutline } from "../../ti/user-outline";
+export { default as TiUser } from "../../ti/user";
+export { default as TiVendorAndroid } from "../../ti/vendor-android";
+export { default as TiVendorApple } from "../../ti/vendor-apple";
+export { default as TiVendorMicrosoft } from "../../ti/vendor-microsoft";
+export { default as TiVideoOutline } from "../../ti/video-outline";
+export { default as TiVideo } from "../../ti/video";
+export { default as TiVolumeDown } from "../../ti/volume-down";
+export { default as TiVolumeMute } from "../../ti/volume-mute";
+export { default as TiVolumeUp } from "../../ti/volume-up";
+export { default as TiVolume } from "../../ti/volume";
+export { default as TiWarningOutline } from "../../ti/warning-outline";
+export { default as TiWarning } from "../../ti/warning";
+export { default as TiWatch } from "../../ti/watch";
+export { default as TiWavesOutline } from "../../ti/waves-outline";
+export { default as TiWaves } from "../../ti/waves";
+export { default as TiWeatherCloudy } from "../../ti/weather-cloudy";
+export { default as TiWeatherDownpour } from "../../ti/weather-downpour";
+export { default as TiWeatherNight } from "../../ti/weather-night";
+export { default as TiWeatherPartlySunny } from "../../ti/weather-partly-sunny";
+export { default as TiWeatherShower } from "../../ti/weather-shower";
+export { default as TiWeatherSnow } from "../../ti/weather-snow";
+export { default as TiWeatherStormy } from "../../ti/weather-stormy";
+export { default as TiWeatherSunny } from "../../ti/weather-sunny";
+export { default as TiWeatherWindyCloudy } from "../../ti/weather-windy-cloudy";
+export { default as TiWeatherWindy } from "../../ti/weather-windy";
+export { default as TiWiFiOutline } from "../../ti/wi-fi-outline";
+export { default as TiWiFi } from "../../ti/wi-fi";
+export { default as TiWine } from "../../ti/wine";
+export { default as TiWorldOutline } from "../../ti/world-outline";
+export { default as TiWorld } from "../../ti/world";
+export { default as TiZoomInOutline } from "../../ti/zoom-in-outline";
+export { default as TiZoomIn } from "../../ti/zoom-in";
+export { default as TiZoomOutOutline } from "../../ti/zoom-out-outline";
+export { default as TiZoomOut } from "../../ti/zoom-out";
+export { default as TiZoomOutline } from "../../ti/zoom-outline";
+export { default as TiZoom } from "../../ti/zoom";
diff --git a/types/react-icons/lib/ti/infinity-outline.d.ts b/types/react-icons/lib/ti/infinity-outline.d.ts
index 396db6cef4..acf82acb79 100644
--- a/types/react-icons/lib/ti/infinity-outline.d.ts
+++ b/types/react-icons/lib/ti/infinity-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfinityOutline extends React.Component<IconBaseProps> { }
+declare class TiInfinityOutline extends React.Component<IconBaseProps> { }
+export = TiInfinityOutline;
diff --git a/types/react-icons/lib/ti/infinity.d.ts b/types/react-icons/lib/ti/infinity.d.ts
index e2e330678f..2a770bd4ae 100644
--- a/types/react-icons/lib/ti/infinity.d.ts
+++ b/types/react-icons/lib/ti/infinity.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfinity extends React.Component<IconBaseProps> { }
+declare class TiInfinity extends React.Component<IconBaseProps> { }
+export = TiInfinity;
diff --git a/types/react-icons/lib/ti/info-large-outline.d.ts b/types/react-icons/lib/ti/info-large-outline.d.ts
index 3ff6a8be6c..95a74ab971 100644
--- a/types/react-icons/lib/ti/info-large-outline.d.ts
+++ b/types/react-icons/lib/ti/info-large-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoLargeOutline extends React.Component<IconBaseProps> { }
+declare class TiInfoLargeOutline extends React.Component<IconBaseProps> { }
+export = TiInfoLargeOutline;
diff --git a/types/react-icons/lib/ti/info-large.d.ts b/types/react-icons/lib/ti/info-large.d.ts
index 0ad4eb3b6a..ab649a9807 100644
--- a/types/react-icons/lib/ti/info-large.d.ts
+++ b/types/react-icons/lib/ti/info-large.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoLarge extends React.Component<IconBaseProps> { }
+declare class TiInfoLarge extends React.Component<IconBaseProps> { }
+export = TiInfoLarge;
diff --git a/types/react-icons/lib/ti/info-outline.d.ts b/types/react-icons/lib/ti/info-outline.d.ts
index b80e266196..1dbe44f7e2 100644
--- a/types/react-icons/lib/ti/info-outline.d.ts
+++ b/types/react-icons/lib/ti/info-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoOutline extends React.Component<IconBaseProps> { }
+declare class TiInfoOutline extends React.Component<IconBaseProps> { }
+export = TiInfoOutline;
diff --git a/types/react-icons/lib/ti/info.d.ts b/types/react-icons/lib/ti/info.d.ts
index ec2cd25bdf..b536268bc5 100644
--- a/types/react-icons/lib/ti/info.d.ts
+++ b/types/react-icons/lib/ti/info.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfo extends React.Component<IconBaseProps> { }
+declare class TiInfo extends React.Component<IconBaseProps> { }
+export = TiInfo;
diff --git a/types/react-icons/lib/ti/input-checked-outline.d.ts b/types/react-icons/lib/ti/input-checked-outline.d.ts
index 91f4f396a0..09598d7f9c 100644
--- a/types/react-icons/lib/ti/input-checked-outline.d.ts
+++ b/types/react-icons/lib/ti/input-checked-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInputCheckedOutline extends React.Component<IconBaseProps> { }
+declare class TiInputCheckedOutline extends React.Component<IconBaseProps> { }
+export = TiInputCheckedOutline;
diff --git a/types/react-icons/lib/ti/input-checked.d.ts b/types/react-icons/lib/ti/input-checked.d.ts
index beb1227d76..4a0d3f49e1 100644
--- a/types/react-icons/lib/ti/input-checked.d.ts
+++ b/types/react-icons/lib/ti/input-checked.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInputChecked extends React.Component<IconBaseProps> { }
+declare class TiInputChecked extends React.Component<IconBaseProps> { }
+export = TiInputChecked;
diff --git a/types/react-icons/lib/ti/key-outline.d.ts b/types/react-icons/lib/ti/key-outline.d.ts
index 0a2cac24a7..3915d81fdc 100644
--- a/types/react-icons/lib/ti/key-outline.d.ts
+++ b/types/react-icons/lib/ti/key-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiKeyOutline extends React.Component<IconBaseProps> { }
+declare class TiKeyOutline extends React.Component<IconBaseProps> { }
+export = TiKeyOutline;
diff --git a/types/react-icons/lib/ti/key.d.ts b/types/react-icons/lib/ti/key.d.ts
index c167c86f85..1e5229dd96 100644
--- a/types/react-icons/lib/ti/key.d.ts
+++ b/types/react-icons/lib/ti/key.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiKey extends React.Component<IconBaseProps> { }
+declare class TiKey extends React.Component<IconBaseProps> { }
+export = TiKey;
diff --git a/types/react-icons/lib/ti/keyboard.d.ts b/types/react-icons/lib/ti/keyboard.d.ts
index c936d0245d..dbd41ee813 100644
--- a/types/react-icons/lib/ti/keyboard.d.ts
+++ b/types/react-icons/lib/ti/keyboard.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiKeyboard extends React.Component<IconBaseProps> { }
+declare class TiKeyboard extends React.Component<IconBaseProps> { }
+export = TiKeyboard;
diff --git a/types/react-icons/lib/ti/leaf.d.ts b/types/react-icons/lib/ti/leaf.d.ts
index 7b34567dde..3548464823 100644
--- a/types/react-icons/lib/ti/leaf.d.ts
+++ b/types/react-icons/lib/ti/leaf.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLeaf extends React.Component<IconBaseProps> { }
+declare class TiLeaf extends React.Component<IconBaseProps> { }
+export = TiLeaf;
diff --git a/types/react-icons/lib/ti/lightbulb.d.ts b/types/react-icons/lib/ti/lightbulb.d.ts
index 389a15ff3e..7a77c36eb3 100644
--- a/types/react-icons/lib/ti/lightbulb.d.ts
+++ b/types/react-icons/lib/ti/lightbulb.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLightbulb extends React.Component<IconBaseProps> { }
+declare class TiLightbulb extends React.Component<IconBaseProps> { }
+export = TiLightbulb;
diff --git a/types/react-icons/lib/ti/link-outline.d.ts b/types/react-icons/lib/ti/link-outline.d.ts
index 8aec8924d9..2de0ad9ea8 100644
--- a/types/react-icons/lib/ti/link-outline.d.ts
+++ b/types/react-icons/lib/ti/link-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLinkOutline extends React.Component<IconBaseProps> { }
+declare class TiLinkOutline extends React.Component<IconBaseProps> { }
+export = TiLinkOutline;
diff --git a/types/react-icons/lib/ti/link.d.ts b/types/react-icons/lib/ti/link.d.ts
index 7de0129e97..f018f05df1 100644
--- a/types/react-icons/lib/ti/link.d.ts
+++ b/types/react-icons/lib/ti/link.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLink extends React.Component<IconBaseProps> { }
+declare class TiLink extends React.Component<IconBaseProps> { }
+export = TiLink;
diff --git a/types/react-icons/lib/ti/location-arrow-outline.d.ts b/types/react-icons/lib/ti/location-arrow-outline.d.ts
index be73bc68bb..fa052ba27e 100644
--- a/types/react-icons/lib/ti/location-arrow-outline.d.ts
+++ b/types/react-icons/lib/ti/location-arrow-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationArrowOutline extends React.Component<IconBaseProps> { }
+declare class TiLocationArrowOutline extends React.Component<IconBaseProps> { }
+export = TiLocationArrowOutline;
diff --git a/types/react-icons/lib/ti/location-arrow.d.ts b/types/react-icons/lib/ti/location-arrow.d.ts
index c9fca74a46..17b35056fc 100644
--- a/types/react-icons/lib/ti/location-arrow.d.ts
+++ b/types/react-icons/lib/ti/location-arrow.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationArrow extends React.Component<IconBaseProps> { }
+declare class TiLocationArrow extends React.Component<IconBaseProps> { }
+export = TiLocationArrow;
diff --git a/types/react-icons/lib/ti/location-outline.d.ts b/types/react-icons/lib/ti/location-outline.d.ts
index 5e33402d00..7d31d353d6 100644
--- a/types/react-icons/lib/ti/location-outline.d.ts
+++ b/types/react-icons/lib/ti/location-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationOutline extends React.Component<IconBaseProps> { }
+declare class TiLocationOutline extends React.Component<IconBaseProps> { }
+export = TiLocationOutline;
diff --git a/types/react-icons/lib/ti/location.d.ts b/types/react-icons/lib/ti/location.d.ts
index 4b2ad147b6..159dadd5cb 100644
--- a/types/react-icons/lib/ti/location.d.ts
+++ b/types/react-icons/lib/ti/location.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocation extends React.Component<IconBaseProps> { }
+declare class TiLocation extends React.Component<IconBaseProps> { }
+export = TiLocation;
diff --git a/types/react-icons/lib/ti/lock-closed-outline.d.ts b/types/react-icons/lib/ti/lock-closed-outline.d.ts
index df9d6ffaad..1c40232eb1 100644
--- a/types/react-icons/lib/ti/lock-closed-outline.d.ts
+++ b/types/react-icons/lib/ti/lock-closed-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockClosedOutline extends React.Component<IconBaseProps> { }
+declare class TiLockClosedOutline extends React.Component<IconBaseProps> { }
+export = TiLockClosedOutline;
diff --git a/types/react-icons/lib/ti/lock-closed.d.ts b/types/react-icons/lib/ti/lock-closed.d.ts
index 234cc40580..0d45e2e4f5 100644
--- a/types/react-icons/lib/ti/lock-closed.d.ts
+++ b/types/react-icons/lib/ti/lock-closed.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockClosed extends React.Component<IconBaseProps> { }
+declare class TiLockClosed extends React.Component<IconBaseProps> { }
+export = TiLockClosed;
diff --git a/types/react-icons/lib/ti/lock-open-outline.d.ts b/types/react-icons/lib/ti/lock-open-outline.d.ts
index 380878a869..f2d018becf 100644
--- a/types/react-icons/lib/ti/lock-open-outline.d.ts
+++ b/types/react-icons/lib/ti/lock-open-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockOpenOutline extends React.Component<IconBaseProps> { }
+declare class TiLockOpenOutline extends React.Component<IconBaseProps> { }
+export = TiLockOpenOutline;
diff --git a/types/react-icons/lib/ti/lock-open.d.ts b/types/react-icons/lib/ti/lock-open.d.ts
index c4b51c68ee..710cdb44d8 100644
--- a/types/react-icons/lib/ti/lock-open.d.ts
+++ b/types/react-icons/lib/ti/lock-open.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockOpen extends React.Component<IconBaseProps> { }
+declare class TiLockOpen extends React.Component<IconBaseProps> { }
+export = TiLockOpen;
diff --git a/types/react-icons/lib/ti/mail.d.ts b/types/react-icons/lib/ti/mail.d.ts
index 34979f6b13..9ee04f24e0 100644
--- a/types/react-icons/lib/ti/mail.d.ts
+++ b/types/react-icons/lib/ti/mail.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMail extends React.Component<IconBaseProps> { }
+declare class TiMail extends React.Component<IconBaseProps> { }
+export = TiMail;
diff --git a/types/react-icons/lib/ti/map.d.ts b/types/react-icons/lib/ti/map.d.ts
index 8b8092f4e7..7fe15fa575 100644
--- a/types/react-icons/lib/ti/map.d.ts
+++ b/types/react-icons/lib/ti/map.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMap extends React.Component<IconBaseProps> { }
+declare class TiMap extends React.Component<IconBaseProps> { }
+export = TiMap;
diff --git a/types/react-icons/lib/ti/media-eject-outline.d.ts b/types/react-icons/lib/ti/media-eject-outline.d.ts
index d58fadb21b..9351fc551b 100644
--- a/types/react-icons/lib/ti/media-eject-outline.d.ts
+++ b/types/react-icons/lib/ti/media-eject-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaEjectOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaEjectOutline extends React.Component<IconBaseProps> { }
+export = TiMediaEjectOutline;
diff --git a/types/react-icons/lib/ti/media-eject.d.ts b/types/react-icons/lib/ti/media-eject.d.ts
index 41a9baaea8..98aa88f232 100644
--- a/types/react-icons/lib/ti/media-eject.d.ts
+++ b/types/react-icons/lib/ti/media-eject.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaEject extends React.Component<IconBaseProps> { }
+declare class TiMediaEject extends React.Component<IconBaseProps> { }
+export = TiMediaEject;
diff --git a/types/react-icons/lib/ti/media-fast-forward-outline.d.ts b/types/react-icons/lib/ti/media-fast-forward-outline.d.ts
index 8923d0fa44..42bf3e8957 100644
--- a/types/react-icons/lib/ti/media-fast-forward-outline.d.ts
+++ b/types/react-icons/lib/ti/media-fast-forward-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaFastForwardOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaFastForwardOutline extends React.Component<IconBaseProps> { }
+export = TiMediaFastForwardOutline;
diff --git a/types/react-icons/lib/ti/media-fast-forward.d.ts b/types/react-icons/lib/ti/media-fast-forward.d.ts
index e53638bf62..8793b9f4ef 100644
--- a/types/react-icons/lib/ti/media-fast-forward.d.ts
+++ b/types/react-icons/lib/ti/media-fast-forward.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaFastForward extends React.Component<IconBaseProps> { }
+declare class TiMediaFastForward extends React.Component<IconBaseProps> { }
+export = TiMediaFastForward;
diff --git a/types/react-icons/lib/ti/media-pause-outline.d.ts b/types/react-icons/lib/ti/media-pause-outline.d.ts
index e792f0c894..9773cb8afe 100644
--- a/types/react-icons/lib/ti/media-pause-outline.d.ts
+++ b/types/react-icons/lib/ti/media-pause-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPauseOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaPauseOutline extends React.Component<IconBaseProps> { }
+export = TiMediaPauseOutline;
diff --git a/types/react-icons/lib/ti/media-pause.d.ts b/types/react-icons/lib/ti/media-pause.d.ts
index b24950b19c..4a81a0a0e5 100644
--- a/types/react-icons/lib/ti/media-pause.d.ts
+++ b/types/react-icons/lib/ti/media-pause.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPause extends React.Component<IconBaseProps> { }
+declare class TiMediaPause extends React.Component<IconBaseProps> { }
+export = TiMediaPause;
diff --git a/types/react-icons/lib/ti/media-play-outline.d.ts b/types/react-icons/lib/ti/media-play-outline.d.ts
index 8e024e323f..4b615f35f1 100644
--- a/types/react-icons/lib/ti/media-play-outline.d.ts
+++ b/types/react-icons/lib/ti/media-play-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaPlayOutline extends React.Component<IconBaseProps> { }
+export = TiMediaPlayOutline;
diff --git a/types/react-icons/lib/ti/media-play-reverse-outline.d.ts b/types/react-icons/lib/ti/media-play-reverse-outline.d.ts
index 5594d646d8..2d7a77bb40 100644
--- a/types/react-icons/lib/ti/media-play-reverse-outline.d.ts
+++ b/types/react-icons/lib/ti/media-play-reverse-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayReverseOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaPlayReverseOutline extends React.Component<IconBaseProps> { }
+export = TiMediaPlayReverseOutline;
diff --git a/types/react-icons/lib/ti/media-play-reverse.d.ts b/types/react-icons/lib/ti/media-play-reverse.d.ts
index 26e71c1733..d7d528e46a 100644
--- a/types/react-icons/lib/ti/media-play-reverse.d.ts
+++ b/types/react-icons/lib/ti/media-play-reverse.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayReverse extends React.Component<IconBaseProps> { }
+declare class TiMediaPlayReverse extends React.Component<IconBaseProps> { }
+export = TiMediaPlayReverse;
diff --git a/types/react-icons/lib/ti/media-play.d.ts b/types/react-icons/lib/ti/media-play.d.ts
index defa546ee7..8dd20765e2 100644
--- a/types/react-icons/lib/ti/media-play.d.ts
+++ b/types/react-icons/lib/ti/media-play.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlay extends React.Component<IconBaseProps> { }
+declare class TiMediaPlay extends React.Component<IconBaseProps> { }
+export = TiMediaPlay;
diff --git a/types/react-icons/lib/ti/media-record-outline.d.ts b/types/react-icons/lib/ti/media-record-outline.d.ts
index 0761437451..f59288ac3c 100644
--- a/types/react-icons/lib/ti/media-record-outline.d.ts
+++ b/types/react-icons/lib/ti/media-record-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRecordOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaRecordOutline extends React.Component<IconBaseProps> { }
+export = TiMediaRecordOutline;
diff --git a/types/react-icons/lib/ti/media-record.d.ts b/types/react-icons/lib/ti/media-record.d.ts
index d924b105b6..36c9fc9dde 100644
--- a/types/react-icons/lib/ti/media-record.d.ts
+++ b/types/react-icons/lib/ti/media-record.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRecord extends React.Component<IconBaseProps> { }
+declare class TiMediaRecord extends React.Component<IconBaseProps> { }
+export = TiMediaRecord;
diff --git a/types/react-icons/lib/ti/media-rewind-outline.d.ts b/types/react-icons/lib/ti/media-rewind-outline.d.ts
index 11de328095..8a27d06c5e 100644
--- a/types/react-icons/lib/ti/media-rewind-outline.d.ts
+++ b/types/react-icons/lib/ti/media-rewind-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRewindOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaRewindOutline extends React.Component<IconBaseProps> { }
+export = TiMediaRewindOutline;
diff --git a/types/react-icons/lib/ti/media-rewind.d.ts b/types/react-icons/lib/ti/media-rewind.d.ts
index f0e7151590..48aff4f77f 100644
--- a/types/react-icons/lib/ti/media-rewind.d.ts
+++ b/types/react-icons/lib/ti/media-rewind.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRewind extends React.Component<IconBaseProps> { }
+declare class TiMediaRewind extends React.Component<IconBaseProps> { }
+export = TiMediaRewind;
diff --git a/types/react-icons/lib/ti/media-stop-outline.d.ts b/types/react-icons/lib/ti/media-stop-outline.d.ts
index e8728ac857..75aefbad11 100644
--- a/types/react-icons/lib/ti/media-stop-outline.d.ts
+++ b/types/react-icons/lib/ti/media-stop-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaStopOutline extends React.Component<IconBaseProps> { }
+declare class TiMediaStopOutline extends React.Component<IconBaseProps> { }
+export = TiMediaStopOutline;
diff --git a/types/react-icons/lib/ti/media-stop.d.ts b/types/react-icons/lib/ti/media-stop.d.ts
index d38b31aa5a..abd4b9476a 100644
--- a/types/react-icons/lib/ti/media-stop.d.ts
+++ b/types/react-icons/lib/ti/media-stop.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaStop extends React.Component<IconBaseProps> { }
+declare class TiMediaStop extends React.Component<IconBaseProps> { }
+export = TiMediaStop;
diff --git a/types/react-icons/lib/ti/message-typing.d.ts b/types/react-icons/lib/ti/message-typing.d.ts
index 2cb5497a4e..56bad96be8 100644
--- a/types/react-icons/lib/ti/message-typing.d.ts
+++ b/types/react-icons/lib/ti/message-typing.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMessageTyping extends React.Component<IconBaseProps> { }
+declare class TiMessageTyping extends React.Component<IconBaseProps> { }
+export = TiMessageTyping;
diff --git a/types/react-icons/lib/ti/message.d.ts b/types/react-icons/lib/ti/message.d.ts
index 9edcc4226a..35cf9dd7fc 100644
--- a/types/react-icons/lib/ti/message.d.ts
+++ b/types/react-icons/lib/ti/message.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMessage extends React.Component<IconBaseProps> { }
+declare class TiMessage extends React.Component<IconBaseProps> { }
+export = TiMessage;
diff --git a/types/react-icons/lib/ti/messages.d.ts b/types/react-icons/lib/ti/messages.d.ts
index e21fdac0a4..8c3df81714 100644
--- a/types/react-icons/lib/ti/messages.d.ts
+++ b/types/react-icons/lib/ti/messages.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMessages extends React.Component<IconBaseProps> { }
+declare class TiMessages extends React.Component<IconBaseProps> { }
+export = TiMessages;
diff --git a/types/react-icons/lib/ti/microphone-outline.d.ts b/types/react-icons/lib/ti/microphone-outline.d.ts
index 27e430bd72..09a858951f 100644
--- a/types/react-icons/lib/ti/microphone-outline.d.ts
+++ b/types/react-icons/lib/ti/microphone-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMicrophoneOutline extends React.Component<IconBaseProps> { }
+declare class TiMicrophoneOutline extends React.Component<IconBaseProps> { }
+export = TiMicrophoneOutline;
diff --git a/types/react-icons/lib/ti/microphone.d.ts b/types/react-icons/lib/ti/microphone.d.ts
index 543db1b50a..5cf090cf45 100644
--- a/types/react-icons/lib/ti/microphone.d.ts
+++ b/types/react-icons/lib/ti/microphone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMicrophone extends React.Component<IconBaseProps> { }
+declare class TiMicrophone extends React.Component<IconBaseProps> { }
+export = TiMicrophone;
diff --git a/types/react-icons/lib/ti/minus-outline.d.ts b/types/react-icons/lib/ti/minus-outline.d.ts
index 99bb9fa7df..0400f00b05 100644
--- a/types/react-icons/lib/ti/minus-outline.d.ts
+++ b/types/react-icons/lib/ti/minus-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMinusOutline extends React.Component<IconBaseProps> { }
+declare class TiMinusOutline extends React.Component<IconBaseProps> { }
+export = TiMinusOutline;
diff --git a/types/react-icons/lib/ti/minus.d.ts b/types/react-icons/lib/ti/minus.d.ts
index 6239684cfa..756e8e77fa 100644
--- a/types/react-icons/lib/ti/minus.d.ts
+++ b/types/react-icons/lib/ti/minus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMinus extends React.Component<IconBaseProps> { }
+declare class TiMinus extends React.Component<IconBaseProps> { }
+export = TiMinus;
diff --git a/types/react-icons/lib/ti/mortar-board.d.ts b/types/react-icons/lib/ti/mortar-board.d.ts
index 84d29d2b24..b6a130c61a 100644
--- a/types/react-icons/lib/ti/mortar-board.d.ts
+++ b/types/react-icons/lib/ti/mortar-board.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMortarBoard extends React.Component<IconBaseProps> { }
+declare class TiMortarBoard extends React.Component<IconBaseProps> { }
+export = TiMortarBoard;
diff --git a/types/react-icons/lib/ti/news.d.ts b/types/react-icons/lib/ti/news.d.ts
index 31c3f66c1e..299b87df70 100644
--- a/types/react-icons/lib/ti/news.d.ts
+++ b/types/react-icons/lib/ti/news.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiNews extends React.Component<IconBaseProps> { }
+declare class TiNews extends React.Component<IconBaseProps> { }
+export = TiNews;
diff --git a/types/react-icons/lib/ti/notes-outline.d.ts b/types/react-icons/lib/ti/notes-outline.d.ts
index 4613ba38af..4c88666fd1 100644
--- a/types/react-icons/lib/ti/notes-outline.d.ts
+++ b/types/react-icons/lib/ti/notes-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiNotesOutline extends React.Component<IconBaseProps> { }
+declare class TiNotesOutline extends React.Component<IconBaseProps> { }
+export = TiNotesOutline;
diff --git a/types/react-icons/lib/ti/notes.d.ts b/types/react-icons/lib/ti/notes.d.ts
index 5d2b4160f1..cc14b2a42c 100644
--- a/types/react-icons/lib/ti/notes.d.ts
+++ b/types/react-icons/lib/ti/notes.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiNotes extends React.Component<IconBaseProps> { }
+declare class TiNotes extends React.Component<IconBaseProps> { }
+export = TiNotes;
diff --git a/types/react-icons/lib/ti/pen.d.ts b/types/react-icons/lib/ti/pen.d.ts
index 79b4e72f1a..dca4bfb317 100644
--- a/types/react-icons/lib/ti/pen.d.ts
+++ b/types/react-icons/lib/ti/pen.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPen extends React.Component<IconBaseProps> { }
+declare class TiPen extends React.Component<IconBaseProps> { }
+export = TiPen;
diff --git a/types/react-icons/lib/ti/pencil.d.ts b/types/react-icons/lib/ti/pencil.d.ts
index b8726f9010..eec2177732 100644
--- a/types/react-icons/lib/ti/pencil.d.ts
+++ b/types/react-icons/lib/ti/pencil.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPencil extends React.Component<IconBaseProps> { }
+declare class TiPencil extends React.Component<IconBaseProps> { }
+export = TiPencil;
diff --git a/types/react-icons/lib/ti/phone-outline.d.ts b/types/react-icons/lib/ti/phone-outline.d.ts
index d84b152351..c4e2f27934 100644
--- a/types/react-icons/lib/ti/phone-outline.d.ts
+++ b/types/react-icons/lib/ti/phone-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPhoneOutline extends React.Component<IconBaseProps> { }
+declare class TiPhoneOutline extends React.Component<IconBaseProps> { }
+export = TiPhoneOutline;
diff --git a/types/react-icons/lib/ti/phone.d.ts b/types/react-icons/lib/ti/phone.d.ts
index af3eb027a1..b2b26a0ab6 100644
--- a/types/react-icons/lib/ti/phone.d.ts
+++ b/types/react-icons/lib/ti/phone.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPhone extends React.Component<IconBaseProps> { }
+declare class TiPhone extends React.Component<IconBaseProps> { }
+export = TiPhone;
diff --git a/types/react-icons/lib/ti/pi-outline.d.ts b/types/react-icons/lib/ti/pi-outline.d.ts
index 4327e47c3d..ea31a037be 100644
--- a/types/react-icons/lib/ti/pi-outline.d.ts
+++ b/types/react-icons/lib/ti/pi-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPiOutline extends React.Component<IconBaseProps> { }
+declare class TiPiOutline extends React.Component<IconBaseProps> { }
+export = TiPiOutline;
diff --git a/types/react-icons/lib/ti/pi.d.ts b/types/react-icons/lib/ti/pi.d.ts
index d68aefa610..f1636e20cb 100644
--- a/types/react-icons/lib/ti/pi.d.ts
+++ b/types/react-icons/lib/ti/pi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPi extends React.Component<IconBaseProps> { }
+declare class TiPi extends React.Component<IconBaseProps> { }
+export = TiPi;
diff --git a/types/react-icons/lib/ti/pin-outline.d.ts b/types/react-icons/lib/ti/pin-outline.d.ts
index 5a8943532e..9cdc09aecc 100644
--- a/types/react-icons/lib/ti/pin-outline.d.ts
+++ b/types/react-icons/lib/ti/pin-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPinOutline extends React.Component<IconBaseProps> { }
+declare class TiPinOutline extends React.Component<IconBaseProps> { }
+export = TiPinOutline;
diff --git a/types/react-icons/lib/ti/pin.d.ts b/types/react-icons/lib/ti/pin.d.ts
index 8d887edc98..f1f8a47e48 100644
--- a/types/react-icons/lib/ti/pin.d.ts
+++ b/types/react-icons/lib/ti/pin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPin extends React.Component<IconBaseProps> { }
+declare class TiPin extends React.Component<IconBaseProps> { }
+export = TiPin;
diff --git a/types/react-icons/lib/ti/pipette.d.ts b/types/react-icons/lib/ti/pipette.d.ts
index 4f48d8afd3..4c64322983 100644
--- a/types/react-icons/lib/ti/pipette.d.ts
+++ b/types/react-icons/lib/ti/pipette.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPipette extends React.Component<IconBaseProps> { }
+declare class TiPipette extends React.Component<IconBaseProps> { }
+export = TiPipette;
diff --git a/types/react-icons/lib/ti/plane-outline.d.ts b/types/react-icons/lib/ti/plane-outline.d.ts
index ea4ac38deb..5cb48aff97 100644
--- a/types/react-icons/lib/ti/plane-outline.d.ts
+++ b/types/react-icons/lib/ti/plane-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlaneOutline extends React.Component<IconBaseProps> { }
+declare class TiPlaneOutline extends React.Component<IconBaseProps> { }
+export = TiPlaneOutline;
diff --git a/types/react-icons/lib/ti/plane.d.ts b/types/react-icons/lib/ti/plane.d.ts
index 13e32cab40..e1e7a0b826 100644
--- a/types/react-icons/lib/ti/plane.d.ts
+++ b/types/react-icons/lib/ti/plane.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlane extends React.Component<IconBaseProps> { }
+declare class TiPlane extends React.Component<IconBaseProps> { }
+export = TiPlane;
diff --git a/types/react-icons/lib/ti/plug.d.ts b/types/react-icons/lib/ti/plug.d.ts
index 019e4adc15..bda51c16e7 100644
--- a/types/react-icons/lib/ti/plug.d.ts
+++ b/types/react-icons/lib/ti/plug.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlug extends React.Component<IconBaseProps> { }
+declare class TiPlug extends React.Component<IconBaseProps> { }
+export = TiPlug;
diff --git a/types/react-icons/lib/ti/plus-outline.d.ts b/types/react-icons/lib/ti/plus-outline.d.ts
index 22ec83aedd..cbda5e05ae 100644
--- a/types/react-icons/lib/ti/plus-outline.d.ts
+++ b/types/react-icons/lib/ti/plus-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlusOutline extends React.Component<IconBaseProps> { }
+declare class TiPlusOutline extends React.Component<IconBaseProps> { }
+export = TiPlusOutline;
diff --git a/types/react-icons/lib/ti/plus.d.ts b/types/react-icons/lib/ti/plus.d.ts
index 247f279571..ebe8bd4f33 100644
--- a/types/react-icons/lib/ti/plus.d.ts
+++ b/types/react-icons/lib/ti/plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlus extends React.Component<IconBaseProps> { }
+declare class TiPlus extends React.Component<IconBaseProps> { }
+export = TiPlus;
diff --git a/types/react-icons/lib/ti/point-of-interest-outline.d.ts b/types/react-icons/lib/ti/point-of-interest-outline.d.ts
index 63cfa579e5..e74bd4f576 100644
--- a/types/react-icons/lib/ti/point-of-interest-outline.d.ts
+++ b/types/react-icons/lib/ti/point-of-interest-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPointOfInterestOutline extends React.Component<IconBaseProps> { }
+declare class TiPointOfInterestOutline extends React.Component<IconBaseProps> { }
+export = TiPointOfInterestOutline;
diff --git a/types/react-icons/lib/ti/point-of-interest.d.ts b/types/react-icons/lib/ti/point-of-interest.d.ts
index a5d480400c..eb92fad9cb 100644
--- a/types/react-icons/lib/ti/point-of-interest.d.ts
+++ b/types/react-icons/lib/ti/point-of-interest.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPointOfInterest extends React.Component<IconBaseProps> { }
+declare class TiPointOfInterest extends React.Component<IconBaseProps> { }
+export = TiPointOfInterest;
diff --git a/types/react-icons/lib/ti/power-outline.d.ts b/types/react-icons/lib/ti/power-outline.d.ts
index 52f6a2262c..36327686e5 100644
--- a/types/react-icons/lib/ti/power-outline.d.ts
+++ b/types/react-icons/lib/ti/power-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPowerOutline extends React.Component<IconBaseProps> { }
+declare class TiPowerOutline extends React.Component<IconBaseProps> { }
+export = TiPowerOutline;
diff --git a/types/react-icons/lib/ti/power.d.ts b/types/react-icons/lib/ti/power.d.ts
index 64dfece1af..6ad63f6bb4 100644
--- a/types/react-icons/lib/ti/power.d.ts
+++ b/types/react-icons/lib/ti/power.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPower extends React.Component<IconBaseProps> { }
+declare class TiPower extends React.Component<IconBaseProps> { }
+export = TiPower;
diff --git a/types/react-icons/lib/ti/printer.d.ts b/types/react-icons/lib/ti/printer.d.ts
index 556a9f07db..7acd512291 100644
--- a/types/react-icons/lib/ti/printer.d.ts
+++ b/types/react-icons/lib/ti/printer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPrinter extends React.Component<IconBaseProps> { }
+declare class TiPrinter extends React.Component<IconBaseProps> { }
+export = TiPrinter;
diff --git a/types/react-icons/lib/ti/puzzle-outline.d.ts b/types/react-icons/lib/ti/puzzle-outline.d.ts
index 4a7341192a..24c8a7c3de 100644
--- a/types/react-icons/lib/ti/puzzle-outline.d.ts
+++ b/types/react-icons/lib/ti/puzzle-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPuzzleOutline extends React.Component<IconBaseProps> { }
+declare class TiPuzzleOutline extends React.Component<IconBaseProps> { }
+export = TiPuzzleOutline;
diff --git a/types/react-icons/lib/ti/puzzle.d.ts b/types/react-icons/lib/ti/puzzle.d.ts
index a0c57f6b0e..7a70e99f24 100644
--- a/types/react-icons/lib/ti/puzzle.d.ts
+++ b/types/react-icons/lib/ti/puzzle.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPuzzle extends React.Component<IconBaseProps> { }
+declare class TiPuzzle extends React.Component<IconBaseProps> { }
+export = TiPuzzle;
diff --git a/types/react-icons/lib/ti/radar-outline.d.ts b/types/react-icons/lib/ti/radar-outline.d.ts
index aad8289852..2721968675 100644
--- a/types/react-icons/lib/ti/radar-outline.d.ts
+++ b/types/react-icons/lib/ti/radar-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRadarOutline extends React.Component<IconBaseProps> { }
+declare class TiRadarOutline extends React.Component<IconBaseProps> { }
+export = TiRadarOutline;
diff --git a/types/react-icons/lib/ti/radar.d.ts b/types/react-icons/lib/ti/radar.d.ts
index b98c278714..eecdf8ed65 100644
--- a/types/react-icons/lib/ti/radar.d.ts
+++ b/types/react-icons/lib/ti/radar.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRadar extends React.Component<IconBaseProps> { }
+declare class TiRadar extends React.Component<IconBaseProps> { }
+export = TiRadar;
diff --git a/types/react-icons/lib/ti/refresh-outline.d.ts b/types/react-icons/lib/ti/refresh-outline.d.ts
index 38d77c5598..3f63f94c3b 100644
--- a/types/react-icons/lib/ti/refresh-outline.d.ts
+++ b/types/react-icons/lib/ti/refresh-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRefreshOutline extends React.Component<IconBaseProps> { }
+declare class TiRefreshOutline extends React.Component<IconBaseProps> { }
+export = TiRefreshOutline;
diff --git a/types/react-icons/lib/ti/refresh.d.ts b/types/react-icons/lib/ti/refresh.d.ts
index 6aeba2082a..52fd0e1a43 100644
--- a/types/react-icons/lib/ti/refresh.d.ts
+++ b/types/react-icons/lib/ti/refresh.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRefresh extends React.Component<IconBaseProps> { }
+declare class TiRefresh extends React.Component<IconBaseProps> { }
+export = TiRefresh;
diff --git a/types/react-icons/lib/ti/rss-outline.d.ts b/types/react-icons/lib/ti/rss-outline.d.ts
index 0b31e05198..005c3db586 100644
--- a/types/react-icons/lib/ti/rss-outline.d.ts
+++ b/types/react-icons/lib/ti/rss-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRssOutline extends React.Component<IconBaseProps> { }
+declare class TiRssOutline extends React.Component<IconBaseProps> { }
+export = TiRssOutline;
diff --git a/types/react-icons/lib/ti/rss.d.ts b/types/react-icons/lib/ti/rss.d.ts
index 13f61bf841..bd0b7a7202 100644
--- a/types/react-icons/lib/ti/rss.d.ts
+++ b/types/react-icons/lib/ti/rss.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRss extends React.Component<IconBaseProps> { }
+declare class TiRss extends React.Component<IconBaseProps> { }
+export = TiRss;
diff --git a/types/react-icons/lib/ti/scissors-outline.d.ts b/types/react-icons/lib/ti/scissors-outline.d.ts
index 82b195b7bd..7a51af29a1 100644
--- a/types/react-icons/lib/ti/scissors-outline.d.ts
+++ b/types/react-icons/lib/ti/scissors-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiScissorsOutline extends React.Component<IconBaseProps> { }
+declare class TiScissorsOutline extends React.Component<IconBaseProps> { }
+export = TiScissorsOutline;
diff --git a/types/react-icons/lib/ti/scissors.d.ts b/types/react-icons/lib/ti/scissors.d.ts
index da6f78e767..546ec0f5e6 100644
--- a/types/react-icons/lib/ti/scissors.d.ts
+++ b/types/react-icons/lib/ti/scissors.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiScissors extends React.Component<IconBaseProps> { }
+declare class TiScissors extends React.Component<IconBaseProps> { }
+export = TiScissors;
diff --git a/types/react-icons/lib/ti/shopping-bag.d.ts b/types/react-icons/lib/ti/shopping-bag.d.ts
index 6de75d8f81..4510fcf68f 100644
--- a/types/react-icons/lib/ti/shopping-bag.d.ts
+++ b/types/react-icons/lib/ti/shopping-bag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiShoppingBag extends React.Component<IconBaseProps> { }
+declare class TiShoppingBag extends React.Component<IconBaseProps> { }
+export = TiShoppingBag;
diff --git a/types/react-icons/lib/ti/shopping-cart.d.ts b/types/react-icons/lib/ti/shopping-cart.d.ts
index 2364dc03ba..29887be2dc 100644
--- a/types/react-icons/lib/ti/shopping-cart.d.ts
+++ b/types/react-icons/lib/ti/shopping-cart.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiShoppingCart extends React.Component<IconBaseProps> { }
+declare class TiShoppingCart extends React.Component<IconBaseProps> { }
+export = TiShoppingCart;
diff --git a/types/react-icons/lib/ti/social-at-circular.d.ts b/types/react-icons/lib/ti/social-at-circular.d.ts
index 2c2fcee614..d361885a4e 100644
--- a/types/react-icons/lib/ti/social-at-circular.d.ts
+++ b/types/react-icons/lib/ti/social-at-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialAtCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialAtCircular extends React.Component<IconBaseProps> { }
+export = TiSocialAtCircular;
diff --git a/types/react-icons/lib/ti/social-dribbble-circular.d.ts b/types/react-icons/lib/ti/social-dribbble-circular.d.ts
index 7e7ddc450a..cfc66cd9cb 100644
--- a/types/react-icons/lib/ti/social-dribbble-circular.d.ts
+++ b/types/react-icons/lib/ti/social-dribbble-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialDribbbleCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialDribbbleCircular extends React.Component<IconBaseProps> { }
+export = TiSocialDribbbleCircular;
diff --git a/types/react-icons/lib/ti/social-dribbble.d.ts b/types/react-icons/lib/ti/social-dribbble.d.ts
index b47018320f..4c7f64be5b 100644
--- a/types/react-icons/lib/ti/social-dribbble.d.ts
+++ b/types/react-icons/lib/ti/social-dribbble.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialDribbble extends React.Component<IconBaseProps> { }
+declare class TiSocialDribbble extends React.Component<IconBaseProps> { }
+export = TiSocialDribbble;
diff --git a/types/react-icons/lib/ti/social-facebook-circular.d.ts b/types/react-icons/lib/ti/social-facebook-circular.d.ts
index e9863905d3..056fdc5d33 100644
--- a/types/react-icons/lib/ti/social-facebook-circular.d.ts
+++ b/types/react-icons/lib/ti/social-facebook-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFacebookCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialFacebookCircular extends React.Component<IconBaseProps> { }
+export = TiSocialFacebookCircular;
diff --git a/types/react-icons/lib/ti/social-facebook.d.ts b/types/react-icons/lib/ti/social-facebook.d.ts
index 982ae3d78c..79f2801b96 100644
--- a/types/react-icons/lib/ti/social-facebook.d.ts
+++ b/types/react-icons/lib/ti/social-facebook.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFacebook extends React.Component<IconBaseProps> { }
+declare class TiSocialFacebook extends React.Component<IconBaseProps> { }
+export = TiSocialFacebook;
diff --git a/types/react-icons/lib/ti/social-flickr-circular.d.ts b/types/react-icons/lib/ti/social-flickr-circular.d.ts
index 4c7b97dce4..40e5ff2f28 100644
--- a/types/react-icons/lib/ti/social-flickr-circular.d.ts
+++ b/types/react-icons/lib/ti/social-flickr-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFlickrCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialFlickrCircular extends React.Component<IconBaseProps> { }
+export = TiSocialFlickrCircular;
diff --git a/types/react-icons/lib/ti/social-flickr.d.ts b/types/react-icons/lib/ti/social-flickr.d.ts
index ab945e0965..a48b8940ee 100644
--- a/types/react-icons/lib/ti/social-flickr.d.ts
+++ b/types/react-icons/lib/ti/social-flickr.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFlickr extends React.Component<IconBaseProps> { }
+declare class TiSocialFlickr extends React.Component<IconBaseProps> { }
+export = TiSocialFlickr;
diff --git a/types/react-icons/lib/ti/social-github-circular.d.ts b/types/react-icons/lib/ti/social-github-circular.d.ts
index 1db20eba35..8649071280 100644
--- a/types/react-icons/lib/ti/social-github-circular.d.ts
+++ b/types/react-icons/lib/ti/social-github-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGithubCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialGithubCircular extends React.Component<IconBaseProps> { }
+export = TiSocialGithubCircular;
diff --git a/types/react-icons/lib/ti/social-github.d.ts b/types/react-icons/lib/ti/social-github.d.ts
index d2f3b8f628..a8506883c5 100644
--- a/types/react-icons/lib/ti/social-github.d.ts
+++ b/types/react-icons/lib/ti/social-github.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGithub extends React.Component<IconBaseProps> { }
+declare class TiSocialGithub extends React.Component<IconBaseProps> { }
+export = TiSocialGithub;
diff --git a/types/react-icons/lib/ti/social-google-plus-circular.d.ts b/types/react-icons/lib/ti/social-google-plus-circular.d.ts
index 7fd96cf1b4..0cf3b77126 100644
--- a/types/react-icons/lib/ti/social-google-plus-circular.d.ts
+++ b/types/react-icons/lib/ti/social-google-plus-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGooglePlusCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialGooglePlusCircular extends React.Component<IconBaseProps> { }
+export = TiSocialGooglePlusCircular;
diff --git a/types/react-icons/lib/ti/social-google-plus.d.ts b/types/react-icons/lib/ti/social-google-plus.d.ts
index 977e3bb738..6c23799c8b 100644
--- a/types/react-icons/lib/ti/social-google-plus.d.ts
+++ b/types/react-icons/lib/ti/social-google-plus.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGooglePlus extends React.Component<IconBaseProps> { }
+declare class TiSocialGooglePlus extends React.Component<IconBaseProps> { }
+export = TiSocialGooglePlus;
diff --git a/types/react-icons/lib/ti/social-instagram-circular.d.ts b/types/react-icons/lib/ti/social-instagram-circular.d.ts
index ef7e9ea9f1..842e587a5f 100644
--- a/types/react-icons/lib/ti/social-instagram-circular.d.ts
+++ b/types/react-icons/lib/ti/social-instagram-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialInstagramCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialInstagramCircular extends React.Component<IconBaseProps> { }
+export = TiSocialInstagramCircular;
diff --git a/types/react-icons/lib/ti/social-instagram.d.ts b/types/react-icons/lib/ti/social-instagram.d.ts
index ff4d5d3346..316e5f3eca 100644
--- a/types/react-icons/lib/ti/social-instagram.d.ts
+++ b/types/react-icons/lib/ti/social-instagram.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialInstagram extends React.Component<IconBaseProps> { }
+declare class TiSocialInstagram extends React.Component<IconBaseProps> { }
+export = TiSocialInstagram;
diff --git a/types/react-icons/lib/ti/social-last-fm-circular.d.ts b/types/react-icons/lib/ti/social-last-fm-circular.d.ts
index 38e8fc08be..55c95c368f 100644
--- a/types/react-icons/lib/ti/social-last-fm-circular.d.ts
+++ b/types/react-icons/lib/ti/social-last-fm-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLastFmCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialLastFmCircular extends React.Component<IconBaseProps> { }
+export = TiSocialLastFmCircular;
diff --git a/types/react-icons/lib/ti/social-last-fm.d.ts b/types/react-icons/lib/ti/social-last-fm.d.ts
index fde2b626cc..9a5a0cb6b6 100644
--- a/types/react-icons/lib/ti/social-last-fm.d.ts
+++ b/types/react-icons/lib/ti/social-last-fm.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLastFm extends React.Component<IconBaseProps> { }
+declare class TiSocialLastFm extends React.Component<IconBaseProps> { }
+export = TiSocialLastFm;
diff --git a/types/react-icons/lib/ti/social-linkedin-circular.d.ts b/types/react-icons/lib/ti/social-linkedin-circular.d.ts
index 32b5ba1add..9bddd861a6 100644
--- a/types/react-icons/lib/ti/social-linkedin-circular.d.ts
+++ b/types/react-icons/lib/ti/social-linkedin-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLinkedinCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialLinkedinCircular extends React.Component<IconBaseProps> { }
+export = TiSocialLinkedinCircular;
diff --git a/types/react-icons/lib/ti/social-linkedin.d.ts b/types/react-icons/lib/ti/social-linkedin.d.ts
index 6a4f1b264b..70b5faa800 100644
--- a/types/react-icons/lib/ti/social-linkedin.d.ts
+++ b/types/react-icons/lib/ti/social-linkedin.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLinkedin extends React.Component<IconBaseProps> { }
+declare class TiSocialLinkedin extends React.Component<IconBaseProps> { }
+export = TiSocialLinkedin;
diff --git a/types/react-icons/lib/ti/social-pinterest-circular.d.ts b/types/react-icons/lib/ti/social-pinterest-circular.d.ts
index 4278c08e25..114f038f36 100644
--- a/types/react-icons/lib/ti/social-pinterest-circular.d.ts
+++ b/types/react-icons/lib/ti/social-pinterest-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialPinterestCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialPinterestCircular extends React.Component<IconBaseProps> { }
+export = TiSocialPinterestCircular;
diff --git a/types/react-icons/lib/ti/social-pinterest.d.ts b/types/react-icons/lib/ti/social-pinterest.d.ts
index 1544d9d0ff..0d887417e1 100644
--- a/types/react-icons/lib/ti/social-pinterest.d.ts
+++ b/types/react-icons/lib/ti/social-pinterest.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialPinterest extends React.Component<IconBaseProps> { }
+declare class TiSocialPinterest extends React.Component<IconBaseProps> { }
+export = TiSocialPinterest;
diff --git a/types/react-icons/lib/ti/social-skype-outline.d.ts b/types/react-icons/lib/ti/social-skype-outline.d.ts
index 7bc87167e4..33c5d07b8a 100644
--- a/types/react-icons/lib/ti/social-skype-outline.d.ts
+++ b/types/react-icons/lib/ti/social-skype-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialSkypeOutline extends React.Component<IconBaseProps> { }
+declare class TiSocialSkypeOutline extends React.Component<IconBaseProps> { }
+export = TiSocialSkypeOutline;
diff --git a/types/react-icons/lib/ti/social-skype.d.ts b/types/react-icons/lib/ti/social-skype.d.ts
index 1c62817e98..43e9185d3a 100644
--- a/types/react-icons/lib/ti/social-skype.d.ts
+++ b/types/react-icons/lib/ti/social-skype.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialSkype extends React.Component<IconBaseProps> { }
+declare class TiSocialSkype extends React.Component<IconBaseProps> { }
+export = TiSocialSkype;
diff --git a/types/react-icons/lib/ti/social-tumbler-circular.d.ts b/types/react-icons/lib/ti/social-tumbler-circular.d.ts
index 1d5823a418..5dbf8a7f14 100644
--- a/types/react-icons/lib/ti/social-tumbler-circular.d.ts
+++ b/types/react-icons/lib/ti/social-tumbler-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTumblerCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialTumblerCircular extends React.Component<IconBaseProps> { }
+export = TiSocialTumblerCircular;
diff --git a/types/react-icons/lib/ti/social-tumbler.d.ts b/types/react-icons/lib/ti/social-tumbler.d.ts
index 25826e8f98..151a8b0edd 100644
--- a/types/react-icons/lib/ti/social-tumbler.d.ts
+++ b/types/react-icons/lib/ti/social-tumbler.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTumbler extends React.Component<IconBaseProps> { }
+declare class TiSocialTumbler extends React.Component<IconBaseProps> { }
+export = TiSocialTumbler;
diff --git a/types/react-icons/lib/ti/social-twitter-circular.d.ts b/types/react-icons/lib/ti/social-twitter-circular.d.ts
index 951a8a90ac..3ba0fd3df3 100644
--- a/types/react-icons/lib/ti/social-twitter-circular.d.ts
+++ b/types/react-icons/lib/ti/social-twitter-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTwitterCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialTwitterCircular extends React.Component<IconBaseProps> { }
+export = TiSocialTwitterCircular;
diff --git a/types/react-icons/lib/ti/social-twitter.d.ts b/types/react-icons/lib/ti/social-twitter.d.ts
index 2f5d6e6fe2..27e930ba85 100644
--- a/types/react-icons/lib/ti/social-twitter.d.ts
+++ b/types/react-icons/lib/ti/social-twitter.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTwitter extends React.Component<IconBaseProps> { }
+declare class TiSocialTwitter extends React.Component<IconBaseProps> { }
+export = TiSocialTwitter;
diff --git a/types/react-icons/lib/ti/social-vimeo-circular.d.ts b/types/react-icons/lib/ti/social-vimeo-circular.d.ts
index a161f647e2..bb11c7ae22 100644
--- a/types/react-icons/lib/ti/social-vimeo-circular.d.ts
+++ b/types/react-icons/lib/ti/social-vimeo-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialVimeoCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialVimeoCircular extends React.Component<IconBaseProps> { }
+export = TiSocialVimeoCircular;
diff --git a/types/react-icons/lib/ti/social-vimeo.d.ts b/types/react-icons/lib/ti/social-vimeo.d.ts
index 20a6fe4e96..2ac061e928 100644
--- a/types/react-icons/lib/ti/social-vimeo.d.ts
+++ b/types/react-icons/lib/ti/social-vimeo.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialVimeo extends React.Component<IconBaseProps> { }
+declare class TiSocialVimeo extends React.Component<IconBaseProps> { }
+export = TiSocialVimeo;
diff --git a/types/react-icons/lib/ti/social-youtube-circular.d.ts b/types/react-icons/lib/ti/social-youtube-circular.d.ts
index 5373438d05..c89a5225c9 100644
--- a/types/react-icons/lib/ti/social-youtube-circular.d.ts
+++ b/types/react-icons/lib/ti/social-youtube-circular.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialYoutubeCircular extends React.Component<IconBaseProps> { }
+declare class TiSocialYoutubeCircular extends React.Component<IconBaseProps> { }
+export = TiSocialYoutubeCircular;
diff --git a/types/react-icons/lib/ti/social-youtube.d.ts b/types/react-icons/lib/ti/social-youtube.d.ts
index 6040ccbd2e..e8316ce870 100644
--- a/types/react-icons/lib/ti/social-youtube.d.ts
+++ b/types/react-icons/lib/ti/social-youtube.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialYoutube extends React.Component<IconBaseProps> { }
+declare class TiSocialYoutube extends React.Component<IconBaseProps> { }
+export = TiSocialYoutube;
diff --git a/types/react-icons/lib/ti/sort-alphabetically-outline.d.ts b/types/react-icons/lib/ti/sort-alphabetically-outline.d.ts
index b822906e2c..65a5887ff5 100644
--- a/types/react-icons/lib/ti/sort-alphabetically-outline.d.ts
+++ b/types/react-icons/lib/ti/sort-alphabetically-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortAlphabeticallyOutline extends React.Component<IconBaseProps> { }
+declare class TiSortAlphabeticallyOutline extends React.Component<IconBaseProps> { }
+export = TiSortAlphabeticallyOutline;
diff --git a/types/react-icons/lib/ti/sort-alphabetically.d.ts b/types/react-icons/lib/ti/sort-alphabetically.d.ts
index 75a9622393..0ffb8c6a56 100644
--- a/types/react-icons/lib/ti/sort-alphabetically.d.ts
+++ b/types/react-icons/lib/ti/sort-alphabetically.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortAlphabetically extends React.Component<IconBaseProps> { }
+declare class TiSortAlphabetically extends React.Component<IconBaseProps> { }
+export = TiSortAlphabetically;
diff --git a/types/react-icons/lib/ti/sort-numerically-outline.d.ts b/types/react-icons/lib/ti/sort-numerically-outline.d.ts
index e279726f0c..d6de6bd6b3 100644
--- a/types/react-icons/lib/ti/sort-numerically-outline.d.ts
+++ b/types/react-icons/lib/ti/sort-numerically-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortNumericallyOutline extends React.Component<IconBaseProps> { }
+declare class TiSortNumericallyOutline extends React.Component<IconBaseProps> { }
+export = TiSortNumericallyOutline;
diff --git a/types/react-icons/lib/ti/sort-numerically.d.ts b/types/react-icons/lib/ti/sort-numerically.d.ts
index d514d789f3..25f11dd093 100644
--- a/types/react-icons/lib/ti/sort-numerically.d.ts
+++ b/types/react-icons/lib/ti/sort-numerically.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortNumerically extends React.Component<IconBaseProps> { }
+declare class TiSortNumerically extends React.Component<IconBaseProps> { }
+export = TiSortNumerically;
diff --git a/types/react-icons/lib/ti/spanner-outline.d.ts b/types/react-icons/lib/ti/spanner-outline.d.ts
index 424e07581a..eb560945b1 100644
--- a/types/react-icons/lib/ti/spanner-outline.d.ts
+++ b/types/react-icons/lib/ti/spanner-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSpannerOutline extends React.Component<IconBaseProps> { }
+declare class TiSpannerOutline extends React.Component<IconBaseProps> { }
+export = TiSpannerOutline;
diff --git a/types/react-icons/lib/ti/spanner.d.ts b/types/react-icons/lib/ti/spanner.d.ts
index bcfc2421d2..7603d7dae8 100644
--- a/types/react-icons/lib/ti/spanner.d.ts
+++ b/types/react-icons/lib/ti/spanner.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSpanner extends React.Component<IconBaseProps> { }
+declare class TiSpanner extends React.Component<IconBaseProps> { }
+export = TiSpanner;
diff --git a/types/react-icons/lib/ti/spiral.d.ts b/types/react-icons/lib/ti/spiral.d.ts
index f35df30ad0..c3c9eb04d0 100644
--- a/types/react-icons/lib/ti/spiral.d.ts
+++ b/types/react-icons/lib/ti/spiral.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSpiral extends React.Component<IconBaseProps> { }
+declare class TiSpiral extends React.Component<IconBaseProps> { }
+export = TiSpiral;
diff --git a/types/react-icons/lib/ti/star-full-outline.d.ts b/types/react-icons/lib/ti/star-full-outline.d.ts
index f1c40795ae..9e67992135 100644
--- a/types/react-icons/lib/ti/star-full-outline.d.ts
+++ b/types/react-icons/lib/ti/star-full-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarFullOutline extends React.Component<IconBaseProps> { }
+declare class TiStarFullOutline extends React.Component<IconBaseProps> { }
+export = TiStarFullOutline;
diff --git a/types/react-icons/lib/ti/star-half-outline.d.ts b/types/react-icons/lib/ti/star-half-outline.d.ts
index 4e93ae767e..4e0da3b6b2 100644
--- a/types/react-icons/lib/ti/star-half-outline.d.ts
+++ b/types/react-icons/lib/ti/star-half-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarHalfOutline extends React.Component<IconBaseProps> { }
+declare class TiStarHalfOutline extends React.Component<IconBaseProps> { }
+export = TiStarHalfOutline;
diff --git a/types/react-icons/lib/ti/star-half.d.ts b/types/react-icons/lib/ti/star-half.d.ts
index b9409290f7..cd469744f6 100644
--- a/types/react-icons/lib/ti/star-half.d.ts
+++ b/types/react-icons/lib/ti/star-half.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarHalf extends React.Component<IconBaseProps> { }
+declare class TiStarHalf extends React.Component<IconBaseProps> { }
+export = TiStarHalf;
diff --git a/types/react-icons/lib/ti/star-outline.d.ts b/types/react-icons/lib/ti/star-outline.d.ts
index c5c504aec6..1478f12335 100644
--- a/types/react-icons/lib/ti/star-outline.d.ts
+++ b/types/react-icons/lib/ti/star-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarOutline extends React.Component<IconBaseProps> { }
+declare class TiStarOutline extends React.Component<IconBaseProps> { }
+export = TiStarOutline;
diff --git a/types/react-icons/lib/ti/star.d.ts b/types/react-icons/lib/ti/star.d.ts
index 6c7cfe125b..c0002aca9e 100644
--- a/types/react-icons/lib/ti/star.d.ts
+++ b/types/react-icons/lib/ti/star.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStar extends React.Component<IconBaseProps> { }
+declare class TiStar extends React.Component<IconBaseProps> { }
+export = TiStar;
diff --git a/types/react-icons/lib/ti/starburst-outline.d.ts b/types/react-icons/lib/ti/starburst-outline.d.ts
index 621a50c206..1291dfdfaf 100644
--- a/types/react-icons/lib/ti/starburst-outline.d.ts
+++ b/types/react-icons/lib/ti/starburst-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarburstOutline extends React.Component<IconBaseProps> { }
+declare class TiStarburstOutline extends React.Component<IconBaseProps> { }
+export = TiStarburstOutline;
diff --git a/types/react-icons/lib/ti/starburst.d.ts b/types/react-icons/lib/ti/starburst.d.ts
index 5deb65f908..84ddfdcda0 100644
--- a/types/react-icons/lib/ti/starburst.d.ts
+++ b/types/react-icons/lib/ti/starburst.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarburst extends React.Component<IconBaseProps> { }
+declare class TiStarburst extends React.Component<IconBaseProps> { }
+export = TiStarburst;
diff --git a/types/react-icons/lib/ti/stopwatch.d.ts b/types/react-icons/lib/ti/stopwatch.d.ts
index 2433dc6b21..06dea660b4 100644
--- a/types/react-icons/lib/ti/stopwatch.d.ts
+++ b/types/react-icons/lib/ti/stopwatch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStopwatch extends React.Component<IconBaseProps> { }
+declare class TiStopwatch extends React.Component<IconBaseProps> { }
+export = TiStopwatch;
diff --git a/types/react-icons/lib/ti/support.d.ts b/types/react-icons/lib/ti/support.d.ts
index 629e7c1596..e5721d0795 100644
--- a/types/react-icons/lib/ti/support.d.ts
+++ b/types/react-icons/lib/ti/support.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSupport extends React.Component<IconBaseProps> { }
+declare class TiSupport extends React.Component<IconBaseProps> { }
+export = TiSupport;
diff --git a/types/react-icons/lib/ti/tabs-outline.d.ts b/types/react-icons/lib/ti/tabs-outline.d.ts
index a3debbbc0a..c9a1fb6f1c 100644
--- a/types/react-icons/lib/ti/tabs-outline.d.ts
+++ b/types/react-icons/lib/ti/tabs-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTabsOutline extends React.Component<IconBaseProps> { }
+declare class TiTabsOutline extends React.Component<IconBaseProps> { }
+export = TiTabsOutline;
diff --git a/types/react-icons/lib/ti/tag.d.ts b/types/react-icons/lib/ti/tag.d.ts
index ec88c4ff81..98fd85c456 100644
--- a/types/react-icons/lib/ti/tag.d.ts
+++ b/types/react-icons/lib/ti/tag.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTag extends React.Component<IconBaseProps> { }
+declare class TiTag extends React.Component<IconBaseProps> { }
+export = TiTag;
diff --git a/types/react-icons/lib/ti/tags.d.ts b/types/react-icons/lib/ti/tags.d.ts
index a0e4a1a154..dd7602c55b 100644
--- a/types/react-icons/lib/ti/tags.d.ts
+++ b/types/react-icons/lib/ti/tags.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTags extends React.Component<IconBaseProps> { }
+declare class TiTags extends React.Component<IconBaseProps> { }
+export = TiTags;
diff --git a/types/react-icons/lib/ti/th-large-outline.d.ts b/types/react-icons/lib/ti/th-large-outline.d.ts
index 652b61667c..4d35e315af 100644
--- a/types/react-icons/lib/ti/th-large-outline.d.ts
+++ b/types/react-icons/lib/ti/th-large-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThLargeOutline extends React.Component<IconBaseProps> { }
+declare class TiThLargeOutline extends React.Component<IconBaseProps> { }
+export = TiThLargeOutline;
diff --git a/types/react-icons/lib/ti/th-large.d.ts b/types/react-icons/lib/ti/th-large.d.ts
index bde15e269a..140da5c2e8 100644
--- a/types/react-icons/lib/ti/th-large.d.ts
+++ b/types/react-icons/lib/ti/th-large.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThLarge extends React.Component<IconBaseProps> { }
+declare class TiThLarge extends React.Component<IconBaseProps> { }
+export = TiThLarge;
diff --git a/types/react-icons/lib/ti/th-list-outline.d.ts b/types/react-icons/lib/ti/th-list-outline.d.ts
index a906b52c05..7b7b0b60cd 100644
--- a/types/react-icons/lib/ti/th-list-outline.d.ts
+++ b/types/react-icons/lib/ti/th-list-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThListOutline extends React.Component<IconBaseProps> { }
+declare class TiThListOutline extends React.Component<IconBaseProps> { }
+export = TiThListOutline;
diff --git a/types/react-icons/lib/ti/th-list.d.ts b/types/react-icons/lib/ti/th-list.d.ts
index ebb6163713..115fba8852 100644
--- a/types/react-icons/lib/ti/th-list.d.ts
+++ b/types/react-icons/lib/ti/th-list.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThList extends React.Component<IconBaseProps> { }
+declare class TiThList extends React.Component<IconBaseProps> { }
+export = TiThList;
diff --git a/types/react-icons/lib/ti/th-menu-outline.d.ts b/types/react-icons/lib/ti/th-menu-outline.d.ts
index df09e4456f..95133b9279 100644
--- a/types/react-icons/lib/ti/th-menu-outline.d.ts
+++ b/types/react-icons/lib/ti/th-menu-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThMenuOutline extends React.Component<IconBaseProps> { }
+declare class TiThMenuOutline extends React.Component<IconBaseProps> { }
+export = TiThMenuOutline;
diff --git a/types/react-icons/lib/ti/th-menu.d.ts b/types/react-icons/lib/ti/th-menu.d.ts
index e03eadc959..86cdbe68a6 100644
--- a/types/react-icons/lib/ti/th-menu.d.ts
+++ b/types/react-icons/lib/ti/th-menu.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThMenu extends React.Component<IconBaseProps> { }
+declare class TiThMenu extends React.Component<IconBaseProps> { }
+export = TiThMenu;
diff --git a/types/react-icons/lib/ti/th-small-outline.d.ts b/types/react-icons/lib/ti/th-small-outline.d.ts
index 995c8c1f88..5698e7d2da 100644
--- a/types/react-icons/lib/ti/th-small-outline.d.ts
+++ b/types/react-icons/lib/ti/th-small-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThSmallOutline extends React.Component<IconBaseProps> { }
+declare class TiThSmallOutline extends React.Component<IconBaseProps> { }
+export = TiThSmallOutline;
diff --git a/types/react-icons/lib/ti/th-small.d.ts b/types/react-icons/lib/ti/th-small.d.ts
index 332f49b3f1..a62a010fb5 100644
--- a/types/react-icons/lib/ti/th-small.d.ts
+++ b/types/react-icons/lib/ti/th-small.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThSmall extends React.Component<IconBaseProps> { }
+declare class TiThSmall extends React.Component<IconBaseProps> { }
+export = TiThSmall;
diff --git a/types/react-icons/lib/ti/thermometer.d.ts b/types/react-icons/lib/ti/thermometer.d.ts
index 771653ad7b..215ed0b25f 100644
--- a/types/react-icons/lib/ti/thermometer.d.ts
+++ b/types/react-icons/lib/ti/thermometer.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThermometer extends React.Component<IconBaseProps> { }
+declare class TiThermometer extends React.Component<IconBaseProps> { }
+export = TiThermometer;
diff --git a/types/react-icons/lib/ti/thumbs-down.d.ts b/types/react-icons/lib/ti/thumbs-down.d.ts
index bb60d7aaa9..4c9dfec4db 100644
--- a/types/react-icons/lib/ti/thumbs-down.d.ts
+++ b/types/react-icons/lib/ti/thumbs-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsDown extends React.Component<IconBaseProps> { }
+declare class TiThumbsDown extends React.Component<IconBaseProps> { }
+export = TiThumbsDown;
diff --git a/types/react-icons/lib/ti/thumbs-ok.d.ts b/types/react-icons/lib/ti/thumbs-ok.d.ts
index 610f5a2633..fa1dc24674 100644
--- a/types/react-icons/lib/ti/thumbs-ok.d.ts
+++ b/types/react-icons/lib/ti/thumbs-ok.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsOk extends React.Component<IconBaseProps> { }
+declare class TiThumbsOk extends React.Component<IconBaseProps> { }
+export = TiThumbsOk;
diff --git a/types/react-icons/lib/ti/thumbs-up.d.ts b/types/react-icons/lib/ti/thumbs-up.d.ts
index 01747a7a8b..30f7d307c9 100644
--- a/types/react-icons/lib/ti/thumbs-up.d.ts
+++ b/types/react-icons/lib/ti/thumbs-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsUp extends React.Component<IconBaseProps> { }
+declare class TiThumbsUp extends React.Component<IconBaseProps> { }
+export = TiThumbsUp;
diff --git a/types/react-icons/lib/ti/tick-outline.d.ts b/types/react-icons/lib/ti/tick-outline.d.ts
index 8c8fd0025c..a5e042c11f 100644
--- a/types/react-icons/lib/ti/tick-outline.d.ts
+++ b/types/react-icons/lib/ti/tick-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTickOutline extends React.Component<IconBaseProps> { }
+declare class TiTickOutline extends React.Component<IconBaseProps> { }
+export = TiTickOutline;
diff --git a/types/react-icons/lib/ti/tick.d.ts b/types/react-icons/lib/ti/tick.d.ts
index fc06a6fe51..3d87851d21 100644
--- a/types/react-icons/lib/ti/tick.d.ts
+++ b/types/react-icons/lib/ti/tick.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTick extends React.Component<IconBaseProps> { }
+declare class TiTick extends React.Component<IconBaseProps> { }
+export = TiTick;
diff --git a/types/react-icons/lib/ti/ticket.d.ts b/types/react-icons/lib/ti/ticket.d.ts
index 3248f1018c..3dae38b765 100644
--- a/types/react-icons/lib/ti/ticket.d.ts
+++ b/types/react-icons/lib/ti/ticket.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTicket extends React.Component<IconBaseProps> { }
+declare class TiTicket extends React.Component<IconBaseProps> { }
+export = TiTicket;
diff --git a/types/react-icons/lib/ti/time.d.ts b/types/react-icons/lib/ti/time.d.ts
index fd09903b66..8fa833fac0 100644
--- a/types/react-icons/lib/ti/time.d.ts
+++ b/types/react-icons/lib/ti/time.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTime extends React.Component<IconBaseProps> { }
+declare class TiTime extends React.Component<IconBaseProps> { }
+export = TiTime;
diff --git a/types/react-icons/lib/ti/times-outline.d.ts b/types/react-icons/lib/ti/times-outline.d.ts
index 52fd65e3ba..e5f1c26992 100644
--- a/types/react-icons/lib/ti/times-outline.d.ts
+++ b/types/react-icons/lib/ti/times-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTimesOutline extends React.Component<IconBaseProps> { }
+declare class TiTimesOutline extends React.Component<IconBaseProps> { }
+export = TiTimesOutline;
diff --git a/types/react-icons/lib/ti/times.d.ts b/types/react-icons/lib/ti/times.d.ts
index 1b60d77610..b919d26cd6 100644
--- a/types/react-icons/lib/ti/times.d.ts
+++ b/types/react-icons/lib/ti/times.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTimes extends React.Component<IconBaseProps> { }
+declare class TiTimes extends React.Component<IconBaseProps> { }
+export = TiTimes;
diff --git a/types/react-icons/lib/ti/trash.d.ts b/types/react-icons/lib/ti/trash.d.ts
index 2772532c76..fead6b7a52 100644
--- a/types/react-icons/lib/ti/trash.d.ts
+++ b/types/react-icons/lib/ti/trash.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTrash extends React.Component<IconBaseProps> { }
+declare class TiTrash extends React.Component<IconBaseProps> { }
+export = TiTrash;
diff --git a/types/react-icons/lib/ti/tree.d.ts b/types/react-icons/lib/ti/tree.d.ts
index a0f46de32e..7e65d3b2b3 100644
--- a/types/react-icons/lib/ti/tree.d.ts
+++ b/types/react-icons/lib/ti/tree.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTree extends React.Component<IconBaseProps> { }
+declare class TiTree extends React.Component<IconBaseProps> { }
+export = TiTree;
diff --git a/types/react-icons/lib/ti/upload-outline.d.ts b/types/react-icons/lib/ti/upload-outline.d.ts
index 541435783e..6231ad1817 100644
--- a/types/react-icons/lib/ti/upload-outline.d.ts
+++ b/types/react-icons/lib/ti/upload-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUploadOutline extends React.Component<IconBaseProps> { }
+declare class TiUploadOutline extends React.Component<IconBaseProps> { }
+export = TiUploadOutline;
diff --git a/types/react-icons/lib/ti/upload.d.ts b/types/react-icons/lib/ti/upload.d.ts
index 5875c4576b..9e8cef54e6 100644
--- a/types/react-icons/lib/ti/upload.d.ts
+++ b/types/react-icons/lib/ti/upload.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUpload extends React.Component<IconBaseProps> { }
+declare class TiUpload extends React.Component<IconBaseProps> { }
+export = TiUpload;
diff --git a/types/react-icons/lib/ti/user-add-outline.d.ts b/types/react-icons/lib/ti/user-add-outline.d.ts
index 80590bcdaa..a645e140a5 100644
--- a/types/react-icons/lib/ti/user-add-outline.d.ts
+++ b/types/react-icons/lib/ti/user-add-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserAddOutline extends React.Component<IconBaseProps> { }
+declare class TiUserAddOutline extends React.Component<IconBaseProps> { }
+export = TiUserAddOutline;
diff --git a/types/react-icons/lib/ti/user-add.d.ts b/types/react-icons/lib/ti/user-add.d.ts
index 18d297cb33..86c405e8ca 100644
--- a/types/react-icons/lib/ti/user-add.d.ts
+++ b/types/react-icons/lib/ti/user-add.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserAdd extends React.Component<IconBaseProps> { }
+declare class TiUserAdd extends React.Component<IconBaseProps> { }
+export = TiUserAdd;
diff --git a/types/react-icons/lib/ti/user-delete-outline.d.ts b/types/react-icons/lib/ti/user-delete-outline.d.ts
index 19f98f8eed..4410e4f2b4 100644
--- a/types/react-icons/lib/ti/user-delete-outline.d.ts
+++ b/types/react-icons/lib/ti/user-delete-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserDeleteOutline extends React.Component<IconBaseProps> { }
+declare class TiUserDeleteOutline extends React.Component<IconBaseProps> { }
+export = TiUserDeleteOutline;
diff --git a/types/react-icons/lib/ti/user-delete.d.ts b/types/react-icons/lib/ti/user-delete.d.ts
index 2c12847a35..19908d00c4 100644
--- a/types/react-icons/lib/ti/user-delete.d.ts
+++ b/types/react-icons/lib/ti/user-delete.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserDelete extends React.Component<IconBaseProps> { }
+declare class TiUserDelete extends React.Component<IconBaseProps> { }
+export = TiUserDelete;
diff --git a/types/react-icons/lib/ti/user-outline.d.ts b/types/react-icons/lib/ti/user-outline.d.ts
index 64e4678e0c..39ec3a974c 100644
--- a/types/react-icons/lib/ti/user-outline.d.ts
+++ b/types/react-icons/lib/ti/user-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserOutline extends React.Component<IconBaseProps> { }
+declare class TiUserOutline extends React.Component<IconBaseProps> { }
+export = TiUserOutline;
diff --git a/types/react-icons/lib/ti/user.d.ts b/types/react-icons/lib/ti/user.d.ts
index a333a43892..ce655bf6a2 100644
--- a/types/react-icons/lib/ti/user.d.ts
+++ b/types/react-icons/lib/ti/user.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUser extends React.Component<IconBaseProps> { }
+declare class TiUser extends React.Component<IconBaseProps> { }
+export = TiUser;
diff --git a/types/react-icons/lib/ti/vendor-android.d.ts b/types/react-icons/lib/ti/vendor-android.d.ts
index 8075011cff..19874afcdf 100644
--- a/types/react-icons/lib/ti/vendor-android.d.ts
+++ b/types/react-icons/lib/ti/vendor-android.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorAndroid extends React.Component<IconBaseProps> { }
+declare class TiVendorAndroid extends React.Component<IconBaseProps> { }
+export = TiVendorAndroid;
diff --git a/types/react-icons/lib/ti/vendor-apple.d.ts b/types/react-icons/lib/ti/vendor-apple.d.ts
index d100e9de7f..bdd568dfd7 100644
--- a/types/react-icons/lib/ti/vendor-apple.d.ts
+++ b/types/react-icons/lib/ti/vendor-apple.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorApple extends React.Component<IconBaseProps> { }
+declare class TiVendorApple extends React.Component<IconBaseProps> { }
+export = TiVendorApple;
diff --git a/types/react-icons/lib/ti/vendor-microsoft.d.ts b/types/react-icons/lib/ti/vendor-microsoft.d.ts
index fc2393f6c8..864b8573b3 100644
--- a/types/react-icons/lib/ti/vendor-microsoft.d.ts
+++ b/types/react-icons/lib/ti/vendor-microsoft.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorMicrosoft extends React.Component<IconBaseProps> { }
+declare class TiVendorMicrosoft extends React.Component<IconBaseProps> { }
+export = TiVendorMicrosoft;
diff --git a/types/react-icons/lib/ti/video-outline.d.ts b/types/react-icons/lib/ti/video-outline.d.ts
index ff4ded254c..128e6dc56a 100644
--- a/types/react-icons/lib/ti/video-outline.d.ts
+++ b/types/react-icons/lib/ti/video-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVideoOutline extends React.Component<IconBaseProps> { }
+declare class TiVideoOutline extends React.Component<IconBaseProps> { }
+export = TiVideoOutline;
diff --git a/types/react-icons/lib/ti/video.d.ts b/types/react-icons/lib/ti/video.d.ts
index 59503c717e..8ade0ec0f8 100644
--- a/types/react-icons/lib/ti/video.d.ts
+++ b/types/react-icons/lib/ti/video.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVideo extends React.Component<IconBaseProps> { }
+declare class TiVideo extends React.Component<IconBaseProps> { }
+export = TiVideo;
diff --git a/types/react-icons/lib/ti/volume-down.d.ts b/types/react-icons/lib/ti/volume-down.d.ts
index cd012e5287..1b6bcb569d 100644
--- a/types/react-icons/lib/ti/volume-down.d.ts
+++ b/types/react-icons/lib/ti/volume-down.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeDown extends React.Component<IconBaseProps> { }
+declare class TiVolumeDown extends React.Component<IconBaseProps> { }
+export = TiVolumeDown;
diff --git a/types/react-icons/lib/ti/volume-mute.d.ts b/types/react-icons/lib/ti/volume-mute.d.ts
index df323c2347..8d3c6884c0 100644
--- a/types/react-icons/lib/ti/volume-mute.d.ts
+++ b/types/react-icons/lib/ti/volume-mute.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeMute extends React.Component<IconBaseProps> { }
+declare class TiVolumeMute extends React.Component<IconBaseProps> { }
+export = TiVolumeMute;
diff --git a/types/react-icons/lib/ti/volume-up.d.ts b/types/react-icons/lib/ti/volume-up.d.ts
index 443c4bb060..47aaba1cb8 100644
--- a/types/react-icons/lib/ti/volume-up.d.ts
+++ b/types/react-icons/lib/ti/volume-up.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeUp extends React.Component<IconBaseProps> { }
+declare class TiVolumeUp extends React.Component<IconBaseProps> { }
+export = TiVolumeUp;
diff --git a/types/react-icons/lib/ti/volume.d.ts b/types/react-icons/lib/ti/volume.d.ts
index ebbe9bac7a..51aaf0b33b 100644
--- a/types/react-icons/lib/ti/volume.d.ts
+++ b/types/react-icons/lib/ti/volume.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolume extends React.Component<IconBaseProps> { }
+declare class TiVolume extends React.Component<IconBaseProps> { }
+export = TiVolume;
diff --git a/types/react-icons/lib/ti/warning-outline.d.ts b/types/react-icons/lib/ti/warning-outline.d.ts
index 66d630a33d..5e5ebbaa1e 100644
--- a/types/react-icons/lib/ti/warning-outline.d.ts
+++ b/types/react-icons/lib/ti/warning-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWarningOutline extends React.Component<IconBaseProps> { }
+declare class TiWarningOutline extends React.Component<IconBaseProps> { }
+export = TiWarningOutline;
diff --git a/types/react-icons/lib/ti/warning.d.ts b/types/react-icons/lib/ti/warning.d.ts
index 394d46e315..2aeb57fdda 100644
--- a/types/react-icons/lib/ti/warning.d.ts
+++ b/types/react-icons/lib/ti/warning.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWarning extends React.Component<IconBaseProps> { }
+declare class TiWarning extends React.Component<IconBaseProps> { }
+export = TiWarning;
diff --git a/types/react-icons/lib/ti/watch.d.ts b/types/react-icons/lib/ti/watch.d.ts
index 191379a23f..4734c5b196 100644
--- a/types/react-icons/lib/ti/watch.d.ts
+++ b/types/react-icons/lib/ti/watch.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWatch extends React.Component<IconBaseProps> { }
+declare class TiWatch extends React.Component<IconBaseProps> { }
+export = TiWatch;
diff --git a/types/react-icons/lib/ti/waves-outline.d.ts b/types/react-icons/lib/ti/waves-outline.d.ts
index 814f0bb4bd..1557bbc07b 100644
--- a/types/react-icons/lib/ti/waves-outline.d.ts
+++ b/types/react-icons/lib/ti/waves-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWavesOutline extends React.Component<IconBaseProps> { }
+declare class TiWavesOutline extends React.Component<IconBaseProps> { }
+export = TiWavesOutline;
diff --git a/types/react-icons/lib/ti/waves.d.ts b/types/react-icons/lib/ti/waves.d.ts
index 10d88f9f9c..5a2862cc02 100644
--- a/types/react-icons/lib/ti/waves.d.ts
+++ b/types/react-icons/lib/ti/waves.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWaves extends React.Component<IconBaseProps> { }
+declare class TiWaves extends React.Component<IconBaseProps> { }
+export = TiWaves;
diff --git a/types/react-icons/lib/ti/weather-cloudy.d.ts b/types/react-icons/lib/ti/weather-cloudy.d.ts
index f0a7569133..198d322ec7 100644
--- a/types/react-icons/lib/ti/weather-cloudy.d.ts
+++ b/types/react-icons/lib/ti/weather-cloudy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherCloudy extends React.Component<IconBaseProps> { }
+declare class TiWeatherCloudy extends React.Component<IconBaseProps> { }
+export = TiWeatherCloudy;
diff --git a/types/react-icons/lib/ti/weather-downpour.d.ts b/types/react-icons/lib/ti/weather-downpour.d.ts
index 945dd0b196..b7b9b61962 100644
--- a/types/react-icons/lib/ti/weather-downpour.d.ts
+++ b/types/react-icons/lib/ti/weather-downpour.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherDownpour extends React.Component<IconBaseProps> { }
+declare class TiWeatherDownpour extends React.Component<IconBaseProps> { }
+export = TiWeatherDownpour;
diff --git a/types/react-icons/lib/ti/weather-night.d.ts b/types/react-icons/lib/ti/weather-night.d.ts
index 72b8e61ebd..afad50979f 100644
--- a/types/react-icons/lib/ti/weather-night.d.ts
+++ b/types/react-icons/lib/ti/weather-night.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherNight extends React.Component<IconBaseProps> { }
+declare class TiWeatherNight extends React.Component<IconBaseProps> { }
+export = TiWeatherNight;
diff --git a/types/react-icons/lib/ti/weather-partly-sunny.d.ts b/types/react-icons/lib/ti/weather-partly-sunny.d.ts
index 9acece9fcf..cb328b5118 100644
--- a/types/react-icons/lib/ti/weather-partly-sunny.d.ts
+++ b/types/react-icons/lib/ti/weather-partly-sunny.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherPartlySunny extends React.Component<IconBaseProps> { }
+declare class TiWeatherPartlySunny extends React.Component<IconBaseProps> { }
+export = TiWeatherPartlySunny;
diff --git a/types/react-icons/lib/ti/weather-shower.d.ts b/types/react-icons/lib/ti/weather-shower.d.ts
index d96b321350..3ec7cc4daf 100644
--- a/types/react-icons/lib/ti/weather-shower.d.ts
+++ b/types/react-icons/lib/ti/weather-shower.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherShower extends React.Component<IconBaseProps> { }
+declare class TiWeatherShower extends React.Component<IconBaseProps> { }
+export = TiWeatherShower;
diff --git a/types/react-icons/lib/ti/weather-snow.d.ts b/types/react-icons/lib/ti/weather-snow.d.ts
index 8e274c5f85..e859e5994c 100644
--- a/types/react-icons/lib/ti/weather-snow.d.ts
+++ b/types/react-icons/lib/ti/weather-snow.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherSnow extends React.Component<IconBaseProps> { }
+declare class TiWeatherSnow extends React.Component<IconBaseProps> { }
+export = TiWeatherSnow;
diff --git a/types/react-icons/lib/ti/weather-stormy.d.ts b/types/react-icons/lib/ti/weather-stormy.d.ts
index 0fe69851dc..bd7a8efe19 100644
--- a/types/react-icons/lib/ti/weather-stormy.d.ts
+++ b/types/react-icons/lib/ti/weather-stormy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherStormy extends React.Component<IconBaseProps> { }
+declare class TiWeatherStormy extends React.Component<IconBaseProps> { }
+export = TiWeatherStormy;
diff --git a/types/react-icons/lib/ti/weather-sunny.d.ts b/types/react-icons/lib/ti/weather-sunny.d.ts
index 96bb430093..ce0d40f2a0 100644
--- a/types/react-icons/lib/ti/weather-sunny.d.ts
+++ b/types/react-icons/lib/ti/weather-sunny.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherSunny extends React.Component<IconBaseProps> { }
+declare class TiWeatherSunny extends React.Component<IconBaseProps> { }
+export = TiWeatherSunny;
diff --git a/types/react-icons/lib/ti/weather-windy-cloudy.d.ts b/types/react-icons/lib/ti/weather-windy-cloudy.d.ts
index d28624e436..c13e223667 100644
--- a/types/react-icons/lib/ti/weather-windy-cloudy.d.ts
+++ b/types/react-icons/lib/ti/weather-windy-cloudy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherWindyCloudy extends React.Component<IconBaseProps> { }
+declare class TiWeatherWindyCloudy extends React.Component<IconBaseProps> { }
+export = TiWeatherWindyCloudy;
diff --git a/types/react-icons/lib/ti/weather-windy.d.ts b/types/react-icons/lib/ti/weather-windy.d.ts
index e5808895f1..ca7cad2b89 100644
--- a/types/react-icons/lib/ti/weather-windy.d.ts
+++ b/types/react-icons/lib/ti/weather-windy.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherWindy extends React.Component<IconBaseProps> { }
+declare class TiWeatherWindy extends React.Component<IconBaseProps> { }
+export = TiWeatherWindy;
diff --git a/types/react-icons/lib/ti/wi-fi-outline.d.ts b/types/react-icons/lib/ti/wi-fi-outline.d.ts
index 54c27adcb2..4095d20411 100644
--- a/types/react-icons/lib/ti/wi-fi-outline.d.ts
+++ b/types/react-icons/lib/ti/wi-fi-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWiFiOutline extends React.Component<IconBaseProps> { }
+declare class TiWiFiOutline extends React.Component<IconBaseProps> { }
+export = TiWiFiOutline;
diff --git a/types/react-icons/lib/ti/wi-fi.d.ts b/types/react-icons/lib/ti/wi-fi.d.ts
index 46cc54f2f5..cb4b4e788e 100644
--- a/types/react-icons/lib/ti/wi-fi.d.ts
+++ b/types/react-icons/lib/ti/wi-fi.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWiFi extends React.Component<IconBaseProps> { }
+declare class TiWiFi extends React.Component<IconBaseProps> { }
+export = TiWiFi;
diff --git a/types/react-icons/lib/ti/wine.d.ts b/types/react-icons/lib/ti/wine.d.ts
index aab4d0d43e..fadc412a6b 100644
--- a/types/react-icons/lib/ti/wine.d.ts
+++ b/types/react-icons/lib/ti/wine.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWine extends React.Component<IconBaseProps> { }
+declare class TiWine extends React.Component<IconBaseProps> { }
+export = TiWine;
diff --git a/types/react-icons/lib/ti/world-outline.d.ts b/types/react-icons/lib/ti/world-outline.d.ts
index deb94cd766..e7b86d925a 100644
--- a/types/react-icons/lib/ti/world-outline.d.ts
+++ b/types/react-icons/lib/ti/world-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWorldOutline extends React.Component<IconBaseProps> { }
+declare class TiWorldOutline extends React.Component<IconBaseProps> { }
+export = TiWorldOutline;
diff --git a/types/react-icons/lib/ti/world.d.ts b/types/react-icons/lib/ti/world.d.ts
index 54d7682959..259dbe97a1 100644
--- a/types/react-icons/lib/ti/world.d.ts
+++ b/types/react-icons/lib/ti/world.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWorld extends React.Component<IconBaseProps> { }
+declare class TiWorld extends React.Component<IconBaseProps> { }
+export = TiWorld;
diff --git a/types/react-icons/lib/ti/zoom-in-outline.d.ts b/types/react-icons/lib/ti/zoom-in-outline.d.ts
index 9f0c9c98a7..b53327ba70 100644
--- a/types/react-icons/lib/ti/zoom-in-outline.d.ts
+++ b/types/react-icons/lib/ti/zoom-in-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomInOutline extends React.Component<IconBaseProps> { }
+declare class TiZoomInOutline extends React.Component<IconBaseProps> { }
+export = TiZoomInOutline;
diff --git a/types/react-icons/lib/ti/zoom-in.d.ts b/types/react-icons/lib/ti/zoom-in.d.ts
index 4b9716467b..47645f8cee 100644
--- a/types/react-icons/lib/ti/zoom-in.d.ts
+++ b/types/react-icons/lib/ti/zoom-in.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomIn extends React.Component<IconBaseProps> { }
+declare class TiZoomIn extends React.Component<IconBaseProps> { }
+export = TiZoomIn;
diff --git a/types/react-icons/lib/ti/zoom-out-outline.d.ts b/types/react-icons/lib/ti/zoom-out-outline.d.ts
index bdb15bbf3f..c5db3791a2 100644
--- a/types/react-icons/lib/ti/zoom-out-outline.d.ts
+++ b/types/react-icons/lib/ti/zoom-out-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOutOutline extends React.Component<IconBaseProps> { }
+declare class TiZoomOutOutline extends React.Component<IconBaseProps> { }
+export = TiZoomOutOutline;
diff --git a/types/react-icons/lib/ti/zoom-out.d.ts b/types/react-icons/lib/ti/zoom-out.d.ts
index e6b1bb1bd3..50b5101667 100644
--- a/types/react-icons/lib/ti/zoom-out.d.ts
+++ b/types/react-icons/lib/ti/zoom-out.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOut extends React.Component<IconBaseProps> { }
+declare class TiZoomOut extends React.Component<IconBaseProps> { }
+export = TiZoomOut;
diff --git a/types/react-icons/lib/ti/zoom-outline.d.ts b/types/react-icons/lib/ti/zoom-outline.d.ts
index 066a240186..b1e979f087 100644
--- a/types/react-icons/lib/ti/zoom-outline.d.ts
+++ b/types/react-icons/lib/ti/zoom-outline.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOutline extends React.Component<IconBaseProps> { }
+declare class TiZoomOutline extends React.Component<IconBaseProps> { }
+export = TiZoomOutline;
diff --git a/types/react-icons/lib/ti/zoom.d.ts b/types/react-icons/lib/ti/zoom.d.ts
index 74bda099c6..55283917ac 100644
--- a/types/react-icons/lib/ti/zoom.d.ts
+++ b/types/react-icons/lib/ti/zoom.d.ts
@@ -1,3 +1,4 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoom extends React.Component<IconBaseProps> { }
+declare class TiZoom extends React.Component<IconBaseProps> { }
+export = TiZoom;
diff --git a/types/react-icons/react-icons-tests.tsx b/types/react-icons/react-icons-tests.tsx
index f6a0414dba..8cfacdbf4e 100644
--- a/types/react-icons/react-icons-tests.tsx
+++ b/types/react-icons/react-icons-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import FaBeer from 'react-icons/fa/beer';
 import { FaExclamation } from 'react-icons/fa';
-import FaCog from 'react-icons/lib/fa/cog';
+import FaCog = require('react-icons/lib/fa/cog');
 import { FaPowerOff } from 'react-icons/lib/fa';
 
 class Question extends React.Component {
diff --git a/types/react-icons/scripts/generate.ts b/types/react-icons/scripts/generate.ts
index 604de34842..035516e57e 100644
--- a/types/react-icons/scripts/generate.ts
+++ b/types/react-icons/scripts/generate.ts
@@ -24,10 +24,10 @@ for (const { group } of allModules) {
 for (const { group, ids } of allModules) {
     for (const id of ids) {
         writeFileSync(getOutFile(group, `${id}.d.ts`), iconFile(getModuleName(group, id)), 'utf-8');
-        writeFileSync(getOutLibFile(group, `${id}.d.ts`), iconFile(getModuleName(group, id)), 'utf-8');
+        writeFileSync(getOutLibFile(group, `${id}.d.ts`), iconFile(getModuleName(group, id), true), 'utf-8');
     }
     writeFileSync(getOutFile(group, 'index.d.ts'), indexFile(group, ids), 'utf-8');
-    writeFileSync(getOutLibFile(group, 'index.d.ts'), indexFile(group, ids), 'utf-8');
+    writeFileSync(getOutLibFile(group, 'index.d.ts'), indexFile(group, ids, true), 'utf-8');
 }
 
 function getOutDir(group: string): string {
@@ -46,15 +46,23 @@ function getOutLibFile(folder: string, fileName: string): string {
     return joinPaths(getOutLibDir(folder), fileName);
 }
 
-function iconFile(name: string): string {
+function iconFile(name: string, lib: boolean = false): string {
+    if (lib) {
+        return `import * as React from 'react';
+import { IconBaseProps } from 'react-icon-base';
+declare class ${name} extends React.Component<IconBaseProps> { }
+export = ${name};
+`;
+    }
+
     return `import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
 export default class ${name} extends React.Component<IconBaseProps> { }
 `;
 }
 
-function indexFile(folder: string, ids: string[]): string {
-    const reExports = ids.map(id => `export { default as ${getModuleName(folder, id)} } from "./${id}";`);
+function indexFile(folder: string, ids: string[], lib: boolean = false): string {
+    const reExports = ids.map(id => `export { default as ${getModuleName(folder, id)} } from "${lib ? `../../${folder}` : "."}/${id}";`);
     return reExports.join("\n") + "\n";
 }
 
diff --git a/types/react-image-gallery/index.d.ts b/types/react-image-gallery/index.d.ts
new file mode 100644
index 0000000000..479b743e21
--- /dev/null
+++ b/types/react-image-gallery/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for react-image-gallery 0.8
+// Project: https://github.com/xiaolin/react-image-gallery
+// Definitions by: Adam Webb <https://github.com/adamwpc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export interface ReactImageGalleryItem {
+    original?: string;
+    thumbnail?: string;
+    originalClass?: string;
+    thumbnailClass?: string;
+    renderItem?(item?: ReactImageGalleryItem): React.ReactNode;
+    renderThumbInner?(item?: ReactImageGalleryItem): React.ReactNode;
+    originalAlt?: string;
+    thumbnailAlt?: string;
+    originalTitle?: string;
+    thumbnailTitle?: string;
+    thumbnailLabel?: string;
+    description?: string;
+    srcSet?: string;
+    sizes?: string;
+}
+
+export interface ReactImageGalleryProps {
+    items: ReactImageGalleryItem[];
+    infinite?: boolean;
+    lazyLoad?: boolean;
+    showNav?: boolean;
+    showThumbnails?: boolean;
+    thumbnailPosition?: 'top' | 'right' | 'bottom' | 'left';
+    showFullscreenButton?: boolean;
+    useBrowserFullscreen?: boolean;
+    showPlayButton?: boolean;
+    showBullets?: boolean;
+    showIndex?: boolean;
+    autoPlay?: boolean;
+    disableThumbnailScroll?: boolean;
+    slideOnThumbnailHover?: boolean;
+    disableArrowKeys?: boolean;
+    disableSwipe?: boolean;
+    defaultImage?: string;
+    indexSeparator?: string;
+    slideDuration?: number;
+    swipingTransitionDuration?: number;
+    slideInterval?: number;
+    flickThreshold?: number;
+    swipeThreshold?: number;
+    stopPropagation?: boolean;
+    preventDefaultTouchmoveEvent?: boolean;
+    startIndex?: number;
+    onImageError?: (event: React.ReactEventHandler<HTMLImageElement>) => void;
+    onThumbnailError?: (event: React.ReactEventHandler<HTMLImageElement>) => void;
+    onThumbnailClick?: (event: React.MouseEventHandler<HTMLAnchorElement>, index: number) => void;
+    onImageLoad?: (event: React.ReactEventHandler<HTMLImageElement>) => void;
+    onSlide?: (currentIndex: number) => void;
+    onScreenChange?: (fullScreenElement: Element) => void;
+    onPause?: (currentIndex: number) => void;
+    onPlay?: (currentIndex: number) => void;
+    onClick?: (event: React.MouseEventHandler<HTMLDivElement>) => void;
+    onTouchMove?: (event: React.TouchEventHandler<HTMLDivElement>) => void;
+    onTouchEnd?: (event: React.TouchEventHandler<HTMLDivElement>) => void;
+    onTouchStart?: (event: React.TouchEventHandler<HTMLDivElement>) => void;
+    onMouseOver?: (event: React.MouseEventHandler<HTMLDivElement>) => void;
+    onMouseLeave?: (event: React.MouseEventHandler<HTMLDivElement>) => void;
+    renderCustomControls?: () => React.ReactNode;
+    renderItem?: (item: ReactImageGalleryItem) => React.ReactNode;
+    renderThumbInner?: (item: ReactImageGalleryItem) => React.ReactNode;
+    renderLeftNav?: (onClick: React.MouseEventHandler<HTMLElement>, isDisabled: boolean) => React.ReactNode;
+    renderRightNav?: (onClick: React.MouseEventHandler<HTMLElement>, isDisabled: boolean) => React.ReactNode;
+    renderPlayPauseButton?: (onClick: React.MouseEventHandler<HTMLElement>, isPlaying: boolean) => React.ReactNode;
+    renderFullscreenButton?: (onClick: React.MouseEventHandler<HTMLElement>, isFullscreen: boolean) => React.ReactNode;
+}
+
+declare class ReactImageGallery extends React.Component<ReactImageGalleryProps> {
+    play: (callback?: boolean) => void;
+    pause: (callback?: boolean) => void;
+    fullScreen: () => void;
+    exitFullScreen: () => void;
+    slideToIndex: (index: number) => void;
+    getCurrentIndex: () => void;
+}
+
+export default ReactImageGallery;
diff --git a/types/react-image-gallery/react-image-gallery-tests.tsx b/types/react-image-gallery/react-image-gallery-tests.tsx
new file mode 100644
index 0000000000..65fedd7828
--- /dev/null
+++ b/types/react-image-gallery/react-image-gallery-tests.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import ReactImageGallery, { ReactImageGalleryItem, ReactImageGalleryProps } from 'react-image-gallery';
+
+class ImageGallery extends React.Component {
+    render() {
+        const galleryItem: ReactImageGalleryItem = {
+            original: 'http://localhost/logo.jpg',
+            originalTitle: 'My Logo'
+        };
+
+        const props: ReactImageGalleryProps = {
+            items: [galleryItem],
+            autoPlay: false,
+            showFullscreenButton: false
+        };
+
+        return <ReactImageGallery {...props} />;
+    }
+}
diff --git a/types/react-image-gallery/tsconfig.json b/types/react-image-gallery/tsconfig.json
new file mode 100644
index 0000000000..9970170355
--- /dev/null
+++ b/types/react-image-gallery/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-image-gallery-tests.tsx"
+    ]
+}
diff --git a/types/react-image-gallery/tslint.json b/types/react-image-gallery/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-image-gallery/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-imageloader/tslint.json b/types/react-imageloader/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-imageloader/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index 58591839b9..a136ececa7 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -63,6 +63,7 @@ declare namespace InfiniteScroll {
         loader?: React.ReactElement<any>;
     }
     class InfiniteScroll extends React.Component<InfiniteScrollProps> { }
+    namespace InfiniteScroll {}
 }
 
 export = InfiniteScroll.InfiniteScroll;
diff --git a/types/react-infinite/react-infinite-tests.tsx b/types/react-infinite/react-infinite-tests.tsx
index 9736f979a0..2aa7a23192 100644
--- a/types/react-infinite/react-infinite-tests.tsx
+++ b/types/react-infinite/react-infinite-tests.tsx
@@ -51,31 +51,32 @@ class Test4 extends React.Component {
     }
 }
 
-var ListItem = React.createClass<{key: number; num: number;}, {}>({
-    render: function() {
+class ListItem extends React.Component<{key: number; num: number}, {}> {
+    render() {
         return <div className="infinite-list-item">
         List Item {this.props.num}
         </div>;
     }
-});
+}
 
-var InfiniteList = React.createClass({
-    getInitialState: function() {
-        return {
+class InfiniteList extends React.Component<{}, {elements: React.ReactElement<any>[], isInfiniteLoading: boolean}> {
+    constructor(props?: {}, context?: any) {
+        super(props, context);
+        this.state = {
             elements: this.buildElements(0, 20),
             isInfiniteLoading: false
-        }
-    },
+        };
+    }
 
-    buildElements: function(start: number, end: number) {
+    buildElements(start: number, end: number) {
         var elements = [] as React.ReactElement<any>[];
         for (var i = start; i < end; i++) {
             elements.push(<ListItem key={i} num={i}/>)
         }
         return elements;
-    },
+    }
 
-    handleInfiniteLoad: function() {
+    handleInfiniteLoad() {
         var that = this;
         this.setState({
             isInfiniteLoading: true
@@ -88,15 +89,15 @@ var InfiniteList = React.createClass({
                 elements: that.state.elements.concat(newElements)
             });
         }, 2500);
-    },
+    }
 
-    elementInfiniteLoad: function() {
+    elementInfiniteLoad() {
         return <div className="infinite-list-item">
             Loading...
         </div>;
-    },
+    }
 
-    render: function() {
+    render() {
         return <Infinite elementHeight={40}
                          containerHeight={250}
                          infiniteLoadBeginEdgeOffset={200}
@@ -107,4 +108,4 @@ var InfiniteList = React.createClass({
             {this.state.elements}
         </Infinite>;
     }
-});
+}
diff --git a/types/react-infinite/tslint.json b/types/react-infinite/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/react-infinite/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-input-calendar/tslint.json b/types/react-input-calendar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-input-calendar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-intl-redux/index.d.ts b/types/react-intl-redux/index.d.ts
index bd5069d8f1..e47a48110c 100644
--- a/types/react-intl-redux/index.d.ts
+++ b/types/react-intl-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ratson/react-intl-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import { Action } from "redux"
 import { Provider as ReduxProvider } from "react-redux"
diff --git a/types/react-intl-redux/package.json b/types/react-intl-redux/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/react-intl-redux/package.json
+++ b/types/react-intl-redux/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-intl-redux/tslint.json b/types/react-intl-redux/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-intl-redux/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 8557f22cb0..7fc19e41ab 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -12,6 +12,7 @@
 
 declare namespace ReactIntl {
     type DateSource = Date | string | number;
+    type MessageValue = string | number | boolean | Date | null | undefined;
 
     interface Locale {
         locale: string;
@@ -69,8 +70,8 @@ declare namespace ReactIntl {
         formatRelative(value: DateSource, options?: FormattedRelative.PropsBase & { now?: any }): string;
         formatNumber(value: number, options?: FormattedNumber.PropsBase): string;
         formatPlural(value: number, options?: FormattedPlural.Base): keyof FormattedPlural.PropsBase;
-        formatMessage(messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: string | number | boolean | Date}): string;
-        formatHTMLMessage(messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: string | number | boolean | Date}): string;
+        formatMessage(messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: MessageValue}): string;
+        formatHTMLMessage(messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: MessageValue}): string;
         locale: string;
         formats: any;
         messages: { [id: string]: string };
@@ -138,7 +139,7 @@ declare namespace ReactIntl {
         }
 
         interface Props extends MessageDescriptor {
-            values?: {[key: string]: string | number | boolean | Date | JSX.Element};
+            values?: {[key: string]: MessageValue | JSX.Element};
             tagName?: string;
         }
     }
diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index 25f1016026..726802a8bb 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -50,12 +50,12 @@ const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps>
     const formattedRelative = formatRelative(new Date().getTime(), { format: "short" });
     const formattedNumber = formatNumber(123, { format: "short" });
     const formattedPlural = formatPlural(1, { style: "ordinal" });
-    const formattedMessage = formatMessage({ id: "hello", defaultMessage: "Hello {name}!" }, { name: "Roger" });
+    const formattedMessage = formatMessage({ id: "hello", defaultMessage: "Hello {name}!" }, { name: "Roger", nullAllowed: null, undefinedAllowed: undefined });
     const formattedMessagePlurals = formatMessage({
         id: "hello",
-        defaultMessage: "Hello {name} you have {unreadCount, number} {unreadCount, plural, one {message} other {messages}}!" },
-        { name: "Roger", unreadCount: 123 });
-    const formattedHTMLMessage = formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{name}</strong>!" }, { name: "Roger" });
+        defaultMessage: "Hello {name} you have {unreadCount, number} {unreadCount, plural, one {message} other {messages}}!"
+    }, { name: "Roger", unreadCount: 123 });
+    const formattedHTMLMessage = formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{name}</strong>!" }, { name: "Roger", nullAllowed: null, undefinedAllowed: undefined });
     return (
         <div className={className}>
         </div>
@@ -136,6 +136,13 @@ class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlPro
                 values={{ valueOne: 1, valueTen: 10 }}
                 tagName="div" />
 
+            <FormattedMessage
+                id="test"
+                description="Test"
+                defaultMessage="Hi {blank} and {empty}!"
+                values={{ blank: null, empty: undefined }}
+                tagName="div" />
+
             <FormattedHTMLMessage
                 id="test"
                 description="Test"
diff --git a/types/react-intl/tsconfig.json b/types/react-intl/tsconfig.json
index 4d542aee88..d44df31af7 100644
--- a/types/react-intl/tsconfig.json
+++ b/types/react-intl/tsconfig.json
@@ -11,7 +11,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",
@@ -22,4 +22,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-intl/v1/react-intl-tests.tsx b/types/react-intl/v1/react-intl-tests.tsx
index 298f05f6ed..a75b95c202 100644
--- a/types/react-intl/v1/react-intl-tests.tsx
+++ b/types/react-intl/v1/react-intl-tests.tsx
@@ -33,7 +33,7 @@ namespace I18nDirect {
 
 class I18nDirect extends React.Component<I18nDirect.Props> {
 
-    private _currentLocale: string
+    private readonly _currentLocale: string
     private _messages: {[key: string]: string}
 
     constructor( props: I18nDirect.Props ) {
@@ -69,7 +69,7 @@ class I18nDirect extends React.Component<I18nDirect.Props> {
     }
 
 
-    private compileMessages = (props: I18nDirect.Props): void => {
+    private readonly compileMessages = (props: I18nDirect.Props): void => {
 
         let locale: string = ( props.locales && props.locales[ 0 ] ) || 'en-US'
 
@@ -104,7 +104,7 @@ namespace I18nMixin {
 @reactMixin.decorate( IntlMixin )
 class I18nMixin extends React.Component<I18nMixin.Props> implements IntlComponent {
 
-    private _currentLocale: string
+    private readonly _currentLocale: string
 
     constructor( props: I18nMixin.Props ) {
         super( props )
diff --git a/types/react-intl/v1/tslint.json b/types/react-intl/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-intl/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-is-deprecated/react-is-deprecated-tests.ts b/types/react-is-deprecated/react-is-deprecated-tests.ts
index 2f01286189..a60364efdd 100644
--- a/types/react-is-deprecated/react-is-deprecated-tests.ts
+++ b/types/react-is-deprecated/react-is-deprecated-tests.ts
@@ -1,4 +1,4 @@
-import { PropTypes } from 'react';
+import * as PropTypes from 'prop-types';
 import { deprecate, addIsDeprecated } from 'react-is-deprecated';
 
 // test: one-off deprecation
diff --git a/types/react-is-deprecated/tslint.json b/types/react-is-deprecated/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-is-deprecated/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-json-tree/tslint.json b/types/react-json-tree/tslint.json
new file mode 100644
index 0000000000..e3610fefae
--- /dev/null
+++ b/types/react-json-tree/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index e4120ecf59..e6ad7c52ab 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -1,18 +1,23 @@
-// Type definitions for react-jsonschema-form 0.43.0
+// Type definitions for react-jsonschema-form 1.0.0
 // Project: https://github.com/mozilla-services/react-jsonschema-form
-// Definitions by: Dan Fox <https://github.com/iamdanfox>, Jon Surrell <https://github.com/sirreal>
+// Definitions by: Dan Fox <https://github.com/iamdanfox>
+//                 Jon Surrell <https://github.com/sirreal>
+//                 Ivan Jiang <https://github.com/iplus26>
+//                 Kurt Preston <https://github.com/KurtPreston>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 declare module "react-jsonschema-form" {
     import * as React from "react";
+    import { JSONSchema4 } from "json-schema";
 
     export interface FormProps {
-        schema: {};
-        uiSchema?: {};
+        schema: JSONSchema4;
+        uiSchema?: UiSchema;
         formData?: any;
-        widgets?: {};
-        fields?: {};
+        formContext?: any;
+        widgets?: {[name: string]: Widget};
+        fields?: {[name: string]: Field};
         noValidate?: boolean;
         noHtml5Validate?: boolean;
         showErrorList?: boolean;
@@ -21,8 +26,146 @@ declare module "react-jsonschema-form" {
         onError?: (e: any) => any;
         onSubmit?: (e: any) => any;
         liveValidate?: boolean;
+        FieldTemplate?: React.StatelessComponent<FieldTemplateProps>;
+        ArrayFieldTemplate?: React.StatelessComponent<ArrayFieldTemplateProps>;
+        ObjectFieldTemplate?: React.StatelessComponent<ObjectFieldTemplateProps>;
         safeRenderCompletion?: boolean;
-        FieldTemplate?: any;
+        transformErrors?: (errors: any) => any;
+
+        // HTML Attributes
+        id?: string;
+        className?: string;
+        name?: string;
+        method?: string;
+        target?: string;
+        action?: string;
+        autocomplete?: string;
+        enctype?: string;
+        acceptcharset?: string;
+    }
+
+    export default class Form extends React.Component<FormProps> { }
+
+    export type UiSchema = {
+        'ui:field'?: Field | string;
+        'ui:widget'?: Widget | string;
+        'ui:options'?: object;
+        'ui:order'?: string[];
+        [name: string]: any;
+    };
+
+    export type IdSchema = {
+        $id: string;
+    };
+
+    export interface WidgetProps extends React.HTMLAttributes<HTMLElement> {
+        id: string;
+        schema: JSONSchema4;
+        value: any;
+        required: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        autofocus: boolean;
+        onChange: (value: any) => void;
+        options: object;
+        formContext: any;
+    }
+
+    export type Widget = React.StatelessComponent<WidgetProps> | React.ComponentClass<WidgetProps>;
+
+    export interface FieldProps extends React.HTMLAttributes<HTMLElement> {
+        schema: JSONSchema4;
+        uiSchema: UiSchema;
+        idSchema: IdSchema;
+        formData: any;
+        errorSchema: object;
+        onChange: (value: any) => void;
+        registry: {
+            fields: {[name: string]: Field};
+            widgets: {[name: string]: Widget};
+            definitions: object;
+            formContext: any;
+        };
+        formContext: any;
+        autofocus: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        required: boolean;
+        name: string;
+        [prop: string]: any;
+    }
+
+    export type Field = React.StatelessComponent<FieldProps> | React.ComponentClass<FieldProps>;
+
+    export type FieldTemplateProps = {
+        id: string;
+        classNames: string;
+        label: string;
+        description: React.ReactElement<any>;
+        rawDescription: string;
+        children: React.ReactElement<any>;
+        errors: React.ReactElement<any>;
+        rawErrors: string[];
+        help: React.ReactElement<any>;
+        rawHelp: string;
+        hidden: boolean;
+        required: boolean;
+        readonly: boolean;
+        disabled: boolean;
+        displayLabel: boolean;
+        fields: Field[];
+        schema: JSONSchema4;
+        uiSchema: UiSchema;
+        formContext: any;
+    }
+
+    export type ArrayFieldTemplateProps = {
+        DescriptionField: object;
+        TitleField: object;
+        candAdd: boolean;
+        className: string;
+        disabled: boolean;
+        idSchema: IdSchema;
+        items: {
+            children: React.ReactElement<any>,
+            className: string;
+            disabled: boolean;
+            hasMoveDown: boolean;
+            hasMoveUp: boolean;
+            hasRemove: boolean;
+            hasToolbar: boolean;
+            index: number;
+            onDropIndexClick: (index: number) => (event: any) => void;
+            onReorderClick: (index: number, newIndex: number) => (event: any) => void;
+            readonly: boolean;
+        }[];
+        onAddClick: (event: any) => (event: any) => void;
+        readonly: boolean;
+        required: boolean;
+        schema: JSONSchema4;
+        uiSchema: UiSchema;
+        title: string;
+        formContext: any;
+        formData: any;
+    }
+
+    export type ObjectFieldTemplateProps = {
+        DescriptionField: object;
+        TitleField: object;
+        title: string;
+        description: string;
+        properties: {
+            content: React.ReactElement<any>,
+            name: string;
+            disabled: boolean;
+            readonly: boolean;
+        }[],
+        required: boolean;
+        schema: JSONSchema4;
+        uiSchema: UiSchema;
+        idSchema: IdSchema;
+        formData: any;
+        formContext: any;
     }
 
     export interface IChangeEvent {
@@ -30,9 +173,7 @@ declare module "react-jsonschema-form" {
         formData: any;
         errors: any[];
         errorSchema: any;
-        idSchema: any;
+        idSchema: IdSchema;
         status: string;
     }
-
-    export default class Form extends React.Component<FormProps> {}
 }
diff --git a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
index c8d49a7628..2b4a7e0d67 100644
--- a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
+++ b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
@@ -1,10 +1,11 @@
 import * as React from "react";
-import Form from "react-jsonschema-form";
+import Form, { UiSchema } from "react-jsonschema-form";
+import { JSONSchema4 } from "json-schema";
 
 // example taken from the react-jsonschema-form playground:
 // https://github.com/mozilla-services/react-jsonschema-form/blob/fedd830294417969d88e38fb9f6b3a85e6ad105e/playground/samples/simple.js
 
-const schema =  {
+const schema: JSONSchema4 =  {
     "title": "A registration form",
     "type": "object",
     "required": [
@@ -36,7 +37,7 @@ const schema =  {
     }
 };
 
-const uiSchema = {
+const uiSchema: UiSchema = {
     age: {
         "ui:widget": "updown"
     },
diff --git a/types/react-jsonschema-form/tslint.json b/types/react-jsonschema-form/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-jsonschema-form/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-lazyload/react-lazyload-tests.tsx b/types/react-lazyload/react-lazyload-tests.tsx
index e6f0f9bc81..f673652ef5 100644
--- a/types/react-lazyload/react-lazyload-tests.tsx
+++ b/types/react-lazyload/react-lazyload-tests.tsx
@@ -7,7 +7,7 @@ interface State {
 
 class Normal extends React.Component<{}, State> {
     constructor() {
-        super();
+        super({});
         const arr: string[] = [];
         for (let i = 0; i < 200; i++) {
             arr.push(`${i}`);
diff --git a/types/react-leaflet/react-leaflet-tests.tsx b/types/react-leaflet/react-leaflet-tests.tsx
index c12b7d6617..fe9825c465 100644
--- a/types/react-leaflet/react-leaflet-tests.tsx
+++ b/types/react-leaflet/react-leaflet-tests.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
+import * as PropTypes from 'prop-types';
 import * as L from 'leaflet';
-import { Component, PropTypes } from 'react';
+import { Component } from 'react';
 import {
     Children,
     Circle,
diff --git a/types/react-list/index.d.ts b/types/react-list/index.d.ts
index 9760419fff..30371fc35b 100644
--- a/types/react-list/index.d.ts
+++ b/types/react-list/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-list 0.8
 // Project: https://github.com/orgsync/react-list
-// Definitions by: Yifei Yan <https://github.com/buptyyf>
+// Definitions by: Yifei Yan <https://github.com/buptyyf>, Tom Shen <https://github.com/tomshen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -8,22 +8,14 @@ import {
     Component,
     Props
 } from "react";
-export as namespace ReactList;
 
-/*~ If this module has methods, declare them as functions like so.
- */
-export function scrollTo(index: number): void;
-export function scrollAround(index: number): void;
-export function getVisibleRange(): number[];
+type ItemRenderer = (index: number, key: number | string) => JSX.Element;
+type ItemsRenderer = (items: JSX.Element[], ref: string) => JSX.Element;
+type ItemSizeEstimator = (index: number, cache: {}) => number;
+type ItemSizeGetter = (index: number) => number;
+type ScrollParentGetter = () => JSX.Element;
 
-/*~ You can declare types that are available via importing the module */
-export type ItemRenderer = (index: number, key: number | string) => JSX.Element;
-export type ItemsRenderer = (items: JSX.Element[], ref: string) => JSX.Element;
-export type ItemSizeEstimator = (index: number, cache: {}) => number;
-export type ItemSizeGetter = (index: number) => number;
-export type ScrollParentGetter = () => JSX.Element;
-
-export interface ReactListProps extends Props<ReactList> {
+interface ReactListProps extends Props<ReactList> {
     axis?: 'x' | 'y';
     initialIndex?: number;
     itemRenderer?: ItemRenderer;
@@ -40,4 +32,10 @@ export interface ReactListProps extends Props<ReactList> {
     useTranslate3d?: boolean;
 }
 
-export default class ReactList extends Component<ReactListProps> {}
+declare class ReactList extends Component<ReactListProps> {
+    scrollTo(index: number): void;
+    scrollAround(index: number): void;
+    getVisibleRange(): number[];
+}
+declare namespace ReactList { }
+export = ReactList;
diff --git a/types/react-list/react-list-tests.tsx b/types/react-list/react-list-tests.tsx
index 26d2781b02..f02b1643a5 100644
--- a/types/react-list/react-list-tests.tsx
+++ b/types/react-list/react-list-tests.tsx
@@ -1,6 +1,5 @@
 import * as React from "react";
-// import * as ReactDOM from "react-dom";
-import ReactList from "react-list";
+import * as ReactList from "react-list";
 
 const renderItem = (index: number, key: number) =>
     <div key={key} className={'item' + (index % 2 ? '' : ' even')}>
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index 480ca7765f..8b591d3f3a 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -1,121 +1,190 @@
-// Type definitions for react-loadable 4.0
+// Type definitions for react-loadable 5.3
 // Project: https://github.com/thejameskyle/react-loadable#readme
-// Definitions by: Diogo Franco <https://github.com/Kovensky>, Oden S. <https://github.com/odensc>
+// Definitions by: Diogo Franco <https://github.com/Kovensky>, Oden S. <https://github.com/odensc>, Ian Ker-Seymer <https://github.com/ianks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import * as React from 'react';
+/// <reference types="react" />
 
-export interface LoadingComponentProps {
-    isLoading: boolean;
-    pastDelay: boolean;
-    timedOut: boolean;
-    error: any;
+declare namespace Loadable {
+    interface LoadingComponentProps {
+        isLoading: boolean;
+        pastDelay: boolean;
+        timedOut: boolean;
+        error: any;
+    }
+
+    type Options<Props, Exports extends object> = OptionsWithoutRender<Props> | OptionsWithRender<Props, Exports>;
+
+    interface CommonOptions {
+        /**
+         * React component displayed after delay until loader() succeeds. Also responsible for displaying errors.
+         *
+         * If you don't want to render anything you can pass a function that returns null
+         * (this is considered a valid React component).
+         */
+        // NOTE: () => null is only needed until React.SFC supports components returning null
+        loading: React.ComponentType<LoadingComponentProps> | (() => null);
+        /**
+         * Defaults to 200, in milliseconds.
+         *
+         * Only show the loading component if the loader() has taken this long to succeed or error.
+         */
+        delay?: number | false | null;
+        /**
+         * Disabled by default.
+         *
+         * After the specified time in milliseconds passes, the component's `timedOut` prop will be set to true.
+         */
+        timeout?: number | false | null;
+
+        /**
+         * Optional array of module paths that `Loadable.Capture`'s `report` function will be applied on during
+         * server-side rendering. This helps the server know which modules were imported/used during SSR.
+         * ```ts
+         * Loadable({
+         *   loader: () => import('./my-component'),
+         *   modules: ['./my-component'],
+         * });
+         * ```
+         */
+        modules?: string[];
+
+        /**
+         * An optional function which returns an array of Webpack module ids which you can get
+         * with require.resolveWeak. This is used by the client (inside `Loadable.preloadReady`) to
+         * guarantee each webpack module is preloaded before the first client render.
+         * ```ts
+         * Loadable({
+         *  loader: () => import('./Foo'),
+         *  webpack: () => [require.resolveWeak('./Foo')],
+         * });
+         * ```
+         */
+        webpack?: () => number[];
+    }
+
+    interface OptionsWithoutRender<Props> extends CommonOptions {
+        /**
+         * Function returning a promise which returns a React component displayed on success.
+         *
+         * Resulting React component receives all the props passed to the generated component.
+         */
+        loader(): Promise<React.ComponentType<Props> | { default: React.ComponentType<Props> }>;
+    }
+
+    interface OptionsWithRender<Props, Exports extends object> extends CommonOptions {
+        /**
+         * Function returning a promise which returns an object to be passed to `render` on success.
+         */
+        loader(): Promise<Exports>;
+        /**
+         * If you want to customize what gets rendered from your loader you can also pass `render`.
+         *
+         * Note: If you want to load multiple resources at once, you can also use `Loadable.Map`.
+         *
+         * ```ts
+         * Loadable({
+         *     // ...
+         *     render(loaded, props) {
+         *         const Component = loaded.default;
+         *         return <Component {...props} />
+         *     }
+         * });
+         * ```
+         */
+        render(loaded: Exports, props: Props): React.ReactNode;
+
+        // NOTE: render is not optional if the loader return type is not compatible with the type
+        // expected in `OptionsWithoutRender`. If you do not want to provide a render function, ensure that your
+        // function is returning a promise for a React.ComponentType or is the result of import()ing a module
+        // that has a component as its `default` export.
+    }
+
+    interface OptionsWithMap<Props, Exports extends { [key: string]: any }> extends CommonOptions {
+        /**
+         * An object containing functions which return promises, which resolve to an object to be passed to `render` on success.
+         */
+        loader: {
+            [P in keyof Exports]: () => Promise<Exports[P]>
+        };
+        /**
+         * If you want to customize what gets rendered from your loader you can also pass `render`.
+         *
+         * Note: If you want to load multiple resources at once, you can also use `Loadable.Map`.
+         *
+         * ```ts
+         * Loadable({
+         *     // ...
+         *     render(loaded, props) {
+         *         const Component = loaded.default;
+         *         return <Component {...props} />
+         *     }
+         * });
+         * ```
+         */
+        render(loaded: Exports, props: Props): React.ReactNode;
+    }
+
+    interface LoadableComponent {
+        /**
+         * The generated component has a static method preload() for calling the loader function ahead of time.
+         * This is useful for scenarios where you think the user might do something next and want to load the
+         * next component eagerly.
+         *
+         * Note: preload() intentionally does not return a promise. You should not be depending on the timing of
+         * preload(). It's meant as a performance optimization, not for creating UI logic.
+         */
+        preload(): void;
+    }
+
+    interface LoadableCaptureProps {
+        /**
+         * Function called for every moduleName that is rendered via React Loadable.
+         */
+        report: (moduleName: string) => void;
+    }
+
+    interface Loadable {
+        <Props, Exports extends object>(options: Options<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
+        Map<Props, Exports extends { [key: string]: any }>(options: OptionsWithMap<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
+
+        /**
+         * This will call all of the LoadableComponent.preload methods recursively until they are all
+         * resolved. Allowing you to preload all of your dynamic modules in environments like the server.
+         * ```ts
+         * Loadable.preloadAll().then(() => {
+         *   app.listen(3000, () => {
+         *     console.log('Running on http://localhost:3000/');
+         *   });
+         * });
+         * ```
+         */
+        preloadAll(): Promise<void>;
+
+        /**
+         * Check for modules that are already loaded in the browser and call the matching
+         * `LoadableComponent.preload` methods.
+         * ```ts
+         * window.main = () => {
+         *   Loadable.preloadReady().then(() => {
+         *     ReactDOM.hydrate(
+         *       <App/>,
+         *       document.getElementById('app'),
+         *     );
+         *   });
+         * };
+         * ```
+         */
+        preloadReady(): Promise<void>;
+
+        Capture: React.ComponentType<LoadableCaptureProps>;
+    }
 }
 
-export type Options<Props, Exports extends object> = OptionsWithoutRender<Props> | OptionsWithRender<Props, Exports>;
+declare const LoadableExport: Loadable.Loadable;
 
-export interface CommonOptions {
-    /**
-     * React component displayed after delay until loader() succeeds. Also responsible for displaying errors.
-     *
-     * If you don't want to render anything you can pass a function that returns null
-     * (this is considered a valid React component).
-     */
-    // NOTE: () => null is only needed until React.SFC supports components returning null
-    loading: React.ComponentType<LoadingComponentProps> | (() => null);
-    /**
-     * Defaults to 200, in milliseconds.
-     *
-     * Only show the loading component if the loader() has taken this long to succeed or error.
-     */
-    delay?: number | false | null;
-    /**
-     * Disabled by default.
-     *
-     * After the specified time in milliseconds passes, the component's `timedOut` prop will be set to true.
-     */
-    timeout?: number | false | null;
+/* tslint:disable-next-line */
+declare module "react-loadable" {
+    export = LoadableExport;
 }
-
-export interface OptionsWithoutRender<Props> extends CommonOptions {
-    /**
-     * Function returning a promise which returns a React component displayed on success.
-     *
-     * Resulting React component receives all the props passed to the generated component.
-     */
-    loader(): Promise<React.ComponentType<Props> | { default: React.ComponentType<Props> }>;
-}
-
-export interface OptionsWithRender<Props, Exports extends object> extends CommonOptions {
-    /**
-     * Function returning a promise which returns an object to be passed to `render` on success.
-     */
-    loader(): Promise<Exports>;
-    /**
-     * If you want to customize what gets rendered from your loader you can also pass `render`.
-     *
-     * Note: If you want to load multiple resources at once, you can also use `Loadable.Map`.
-     *
-     * ```ts
-     * Loadable({
-     *     // ...
-     *     render(loaded, props) {
-     *         const Component = loaded.default;
-     *         return <Component {...props} />
-     *     }
-     * });
-     * ```
-     */
-    render(loaded: Exports, props: Props): React.ReactNode;
-
-    // NOTE: render is not optional if the loader return type is not compatible with the type
-    // expected in `OptionsWithoutRender`. If you do not want to provide a render function, ensure that your
-    // function is returning a promise for a React.ComponentType or is the result of import()ing a module
-    // that has a component as its `default` export.
-}
-
-export interface OptionsWithMap<Props, Exports extends { [key: string]: any }> extends CommonOptions {
-    /**
-     * An object containing functions which return promises, which resolve to an object to be passed to `render` on success.
-     */
-    loader: {
-        [P in keyof Exports]: () => Promise<Exports[P]>
-    };
-    /**
-     * If you want to customize what gets rendered from your loader you can also pass `render`.
-     *
-     * Note: If you want to load multiple resources at once, you can also use `Loadable.Map`.
-     *
-     * ```ts
-     * Loadable({
-     *     // ...
-     *     render(loaded, props) {
-     *         const Component = loaded.default;
-     *         return <Component {...props} />
-     *     }
-     * });
-     * ```
-     */
-    render(loaded: Exports, props: Props): React.ReactNode;
-}
-
-export interface LoadableComponent {
-    /**
-     * The generated component has a static method preload() for calling the loader function ahead of time.
-     * This is useful for scenarios where you think the user might do something next and want to load the
-     * next component eagerly.
-     *
-     * Note: preload() intentionally does not return a promise. You should not be depending on the timing of
-     * preload(). It's meant as a performance optimization, not for creating UI logic.
-     */
-    preload(): void;
-}
-
-export interface Loadable {
-    <Props, Exports extends object>(options: Options<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
-    Map<Props, Exports extends { [key: string]: any }>(options: OptionsWithMap<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
-}
-
-declare const LoadableExport: Loadable;
-export default LoadableExport;
diff --git a/types/react-loadable/test/index.tsx b/types/react-loadable/test/index.tsx
index ee5ec82119..5045fdf125 100644
--- a/types/react-loadable/test/index.tsx
+++ b/types/react-loadable/test/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import Loadable, { LoadingComponentProps } from 'react-loadable';
+import Loadable = require('react-loadable');
 
-class LoadingComponent extends React.Component<LoadingComponentProps> {
+class LoadingComponent extends React.Component<Loadable.LoadingComponentProps> {
   render() {
     return (
       <div>
diff --git a/types/react-mdl/index.d.ts b/types/react-mdl/index.d.ts
index ff48de32c2..8e70852190 100644
--- a/types/react-mdl/index.d.ts
+++ b/types/react-mdl/index.d.ts
@@ -418,7 +418,7 @@ declare namespace __ReactMDL {
         hideSpacer?: boolean;
     }
     interface HeaderRowProps extends __MDLOtherProps {
-        title?: string;
+        title?: any; // string | JSX.Element
         hideSpacer?: boolean;
     }
     interface HeaderTabsProps extends __MDLOtherProps, RippleComponent {
@@ -584,7 +584,7 @@ declare namespace __ReactMDL {
     class Tabs extends __MDLComponent<TabsProps> { }
 
 
-    interface TextfieldProps extends MDLHTMLAttributes, React.DOMAttributes<Textfield> {
+    interface TextfieldProps extends MDLHTMLAttributes, React.DOMAttributes<HTMLInputElement> {
         label: string;
         disabled?: boolean;
         error?: React.ReactNode;
@@ -594,7 +594,7 @@ declare namespace __ReactMDL {
         id?: string;
         inputClassName?: string;
         maxRows?: number;
-        onChange?: React.FormEventHandler<Textfield>;
+        onChange?: React.FormEventHandler<HTMLInputElement>;
         pattern?: string;
         required?: boolean;
         rows?: number;
@@ -603,7 +603,9 @@ declare namespace __ReactMDL {
         name?: string;
         title?: string;
     }
-    class Textfield extends __MDLComponent<TextfieldProps> { }
+    class Textfield extends __MDLComponent<TextfieldProps> {
+        inputRef?: HTMLInputElement;
+    }
 
 
     interface TooltipProps extends MDLHTMLAttributes, React.DOMAttributes<Tooltip> {
diff --git a/types/react-mdl/react-mdl-tests.tsx b/types/react-mdl/react-mdl-tests.tsx
index e9405820fe..2feffaa8e0 100644
--- a/types/react-mdl/react-mdl-tests.tsx
+++ b/types/react-mdl/react-mdl-tests.tsx
@@ -28,8 +28,8 @@ import { Chip, ChipContact,
 // all tests are from the examples provided here: https://tleunen.github.io/react-mdl/
 
 // Badge tests
-React.createClass({
-    render: function() {
+class BadgeTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Number badge on icon */}
@@ -41,7 +41,7 @@ React.createClass({
                 <Badge text="♥" overlap>
                     <Icon name="account_box" />
                 </Badge>
-                
+
                 {/* Number badge on text */}
                 <Badge text="4">Inbox</Badge>
 
@@ -50,11 +50,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Chip tests
-React.createClass({
-    render: function() {
+class ChipTests extends React.Component {
+    render() {
         return (
             <div>
                 <Chip>Basic chip</Chip>
@@ -77,12 +77,12 @@ React.createClass({
                 </Chip>
             </div>
         );
-    } 
-});
+    }
+}
 
 // Button tests
-React.createClass({
-    render: function() {
+class ButtonTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Colored FAB button */}
@@ -161,11 +161,11 @@ React.createClass({
             </div>
         );
     }
-})
+}
 
 // Card tests
-React.createClass({
-    render: function() {
+class CardTests extends React.Component {
+    render() {
         return (
             <div>
                 <Card shadow={0} style={{width: '512px', margin: 'auto'}}>
@@ -181,7 +181,7 @@ React.createClass({
                         <IconButton name="share" />
                     </CardMenu>
                 </Card>
-                
+
                 <Card shadow={0} style={{width: '320px', height: '320px', margin: 'auto'}}>
                     <CardTitle expand style={{color: '#fff', background: 'url(http://www.getmdl.io/assets/demos/dog.png) bottom right 15% no-repeat #46B6AC'}}>Update</CardTitle>
                     <CardText>
@@ -192,7 +192,7 @@ React.createClass({
                         <Button colored>View Updates</Button>
                     </CardActions>
                 </Card>
-                
+
                 <Card shadow={0} style={{width: '256px', height: '256px', background: 'url(http://www.getmdl.io/assets/demos/image_card.jpg) center / cover', margin: 'auto'}}>
                     <CardTitle expand />
                     <CardActions style={{height: '52px', padding: '16px', background: 'rgba(0,0,0,0.2)'}}>
@@ -201,7 +201,7 @@ React.createClass({
                         </span>
                     </CardActions>
                 </Card>
-                
+
                 <Card shadow={0} style={{width: '256px', height: '256px', background: '#3E4EB8'}}>
                     <CardTitle expand style={{alignItems: 'flex-start', color: '#fff'}}>
                         <h4 style={{marginTop: '0'}}>
@@ -219,11 +219,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Checkbox tests
-React.createClass({
-    render: function() {
+class CheckboxTests extends React.Component {
+    render() {
         return (
             <div>
                 <Checkbox label="With ripple" ripple defaultChecked />
@@ -232,11 +232,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // DataTable tests
-React.createClass({
-    render: function() {
+class DataTableTests extends React.Component {
+    render() {
         return (
             <div>
                 <DataTable
@@ -304,11 +304,14 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Dialog tests
-React.createClass({
-    render: function() {
+class DialogTests extends React.Component<{}, {openDialog: boolean}> {
+    handleOpenDialog() { }
+    handleCloseDialog() { }
+
+    render() {
         return (
             <div>
                 <div>
@@ -324,7 +327,7 @@ React.createClass({
                     </DialogActions>
                     </Dialog>
                 </div>
-                
+
                 <div>
                     <Button colored onClick={this.handleOpenDialog} raised ripple>Show Modal</Button>
                     <Dialog open={this.state.openDialog}>
@@ -338,7 +341,7 @@ React.createClass({
                     </DialogActions>
                     </Dialog>
                 </div>
-                
+
                 <div>
                     <Button colored onClick={this.handleOpenDialog} onAbort={this.handleCloseDialog} raised ripple>Show Dialog</Button>
                     <Dialog open={this.state.openDialog} onAbort={this.handleCloseDialog}>
@@ -355,11 +358,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Grid tests
-React.createClass({
-    render: function() {
+class GridTests extends React.Component {
+    render() {
         return (
             <div>
                 <div style={{width: '80%', margin: 'auto'}}>
@@ -396,11 +399,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // IconToggle tests
-React.createClass({
-    render: function() {
+class IconToggleTests extends React.Component {
+    render() {
         return (
             <div>
                 <IconToggle ripple id="bold" name="format_bold" defaultChecked />
@@ -409,11 +412,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Layout tests
-React.createClass({
-    render: function() {
+class LayoutTests extends React.Component<{}, {activeTab: number}> {
+    render() {
         return (
             <div>
                 {/* Uses a transparent header that draws on top of the layout's background */}
@@ -602,7 +605,7 @@ React.createClass({
                     <Layout fixedHeader>
                         <Header>
                             <HeaderRow title="Title" />
-                            <HeaderTabs activeTab={this.state.activeTab} onChange={(tabId) => this.setState({ activeTab: tabId })}>
+                            <HeaderTabs activeTab={this.state.activeTab} onChange={(tabId) => {}}>
                                 <Tab>Tab1</Tab>
                                 <Tab>Tab2</Tab>
                                 <Tab>Tab3</Tab>
@@ -689,11 +692,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // List tests
-React.createClass({
-    render: function() {
+class ListTests extends React.Component {
+    render() {
         return (
             <div>
                 <List>
@@ -800,11 +803,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Menu tests
-React.createClass({
-    render: function() {
+class MenuTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Lower left */}
@@ -853,11 +856,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // ProgressBar tests
-React.createClass({
-    render: function() {
+class ProgressBarTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Simple Progress Bar */}
@@ -871,11 +874,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Radio tests
-React.createClass({
-    render: function() {
+class RadioTests extends React.Component {
+    render() {
         return (
             <div>
                 <RadioGroup name="demo" value="opt1">
@@ -890,11 +893,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Slider tests
-React.createClass({
-    render: function() {
+class SliderTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Default slider */}
@@ -905,11 +908,15 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Snackbar tests
-React.createClass({
-    render: function() {
+class SnackbarTests extends React.Component {
+    handleClickActionSnackbar() {}
+    handleShowSnackbar() {}
+    handleTimeoutSnackbar() {}
+
+    render() {
         return (
             <div>
                 <div>
@@ -920,7 +927,7 @@ React.createClass({
                         onTimeout={this.handleTimeoutSnackbar}
                         action="Undo">Button color changed.</Snackbar>
                 </div>
-                
+
                 <div>
                     <Button raised onClick={this.handleShowSnackbar}>Show a Toast</Button>
                     <Snackbar
@@ -932,11 +939,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Spinner tests
-React.createClass({
-    render: function() {
+class SpinnerTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Simple spinner */}
@@ -947,11 +954,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Switch tests
-React.createClass({
-    render: function() {
+class SwitchTest extends React.Component {
+    render() {
         return (
             <div>
                 <Switch ripple id="switch1" defaultChecked>Ripple switch</Switch>
@@ -960,11 +967,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Tab tests
-React.createClass({
-    render: function() {
+class TabTests extends React.Component<{}, {activeTab: number}> {
+    render() {
         return (
             <div>
                 <div className="demo-tabs">
@@ -976,15 +983,15 @@ React.createClass({
                     <section>
                         <div className="content">Content for the tab: {this.state.activeTab}</div>
                     </section>
-                </div> 
+                </div>
             </div>
         );
     }
-});
+}
 
 // Textfield tests
-React.createClass({
-    render: function() {
+class TextfieldTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Simple textfield */}
@@ -1022,11 +1029,11 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // Tooltip tests
-React.createClass({
-    render: function() {
+class TooltipTests extends React.Component {
+    render() {
         return (
             <div>
                 {/* Simple tooltip */}
@@ -1071,15 +1078,15 @@ React.createClass({
             </div>
         );
     }
-});
+}
 
 // MDLComponent tests
-React.createClass({
-    render: function() {
+class MDLComponentTests extends React.Component {
+    render() {
         return (
             <MDLComponent recursive={false}>
                 <div />
             </MDLComponent>
         )
     }
-});
+}
diff --git a/types/react-mdl/tslint.json b/types/react-mdl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-mdl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-measure/index.d.ts b/types/react-measure/index.d.ts
index 6a06a04d37..945a49213a 100644
--- a/types/react-measure/index.d.ts
+++ b/types/react-measure/index.d.ts
@@ -6,7 +6,7 @@
 
 import * as React from "react";
 
-type MeasurementType = "client" | "offset" | "scroll" | "bounds" | "margin";
+export type MeasurementType = "client" | "offset" | "scroll" | "bounds" | "margin";
 
 interface TopLeft {
     readonly top: number;
@@ -38,12 +38,14 @@ export interface ContentRect {
     entry?: any;
 }
 
-export interface ChildrenOpts {
+export interface MeasuredComponentProps {
     measureRef(ref: Element | null): void;
     measure(): void;
     contentRect: ContentRect;
 }
 
+type MeasuredComponent<T> = React.ComponentType<T & MeasuredComponentProps>;
+
 export interface MeasureProps<T> {
     client?: boolean;
     offset?: boolean;
@@ -52,9 +54,11 @@ export interface MeasureProps<T> {
     margin?: boolean;
     innerRef?(ref: Element | null): void;
     onResize?(contentRect: ContentRect): void;
-    children?(arg: ChildrenOpts): React.ReactElement<T>;
+    children?: React.SFC<MeasuredComponentProps>;
 }
 
-export declare function withContentRect(types: MeasurementType | MeasurementType[]): <T>(fn: (arg: ChildrenOpts) => React.ReactElement<T>) => React.ComponentClass<T>;
+export declare function withContentRect(types: ReadonlyArray<MeasurementType> | MeasurementType):
+    <T extends {}>(fn: MeasuredComponent<T>) => React.ComponentType<T>;
+
 declare class Measure<T> extends React.Component<MeasureProps<T>> {}
 export default Measure;
diff --git a/types/react-measure/react-measure-tests.tsx b/types/react-measure/react-measure-tests.tsx
index b467fd8caa..1e58ecbbbe 100644
--- a/types/react-measure/react-measure-tests.tsx
+++ b/types/react-measure/react-measure-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import Measure, { ContentRect, withContentRect } from "react-measure";
+import Measure, { ContentRect, withContentRect, MeasuredComponentProps, MeasurementType } from "react-measure";
 
 class Test extends React.Component {
     render() {
@@ -63,7 +63,26 @@ class Test2 extends React.Component {
     }
 }
 
-function testHocComponent<T>(): React.ComponentClass<T> {
+interface Props {
+    a: string;
+}
+
+const TestFunctionalComponentWithProps: React.SFC<Props & MeasuredComponentProps> = ({a, contentRect, measureRef}) => {
+    return (
+        <div ref={measureRef}>{a}</div>
+    );
+};
+
+class TestClassComponentWithProps extends React.Component<Props & MeasuredComponentProps> {
+    render() {
+        const {a, contentRect, measureRef} = this.props;
+        return (
+            <div ref={measureRef}>{a}</div>
+        );
+    }
+}
+
+function testHocComponent() {
     return withContentRect('bounds')(({measureRef, measure, contentRect}) => (
         <div ref={measureRef}>
             Some content here
@@ -74,11 +93,17 @@ function testHocComponent<T>(): React.ComponentClass<T> {
     ));
 }
 
-function testHocComponent2<T>(): React.ComponentClass<T> {
-    return withContentRect(['scroll', 'margin'])(({measureRef}) => (
+function testHocComponent2<T>() {
+    return withContentRect(['scroll', 'margin'] as ReadonlyArray<MeasurementType>)(({measureRef}) => (
         <div ref={measureRef}>Some content here</div>
     ));
 }
 
 const HocComponent = testHocComponent();
-const el = <HocComponent/>;
+const el = <HocComponent />;
+
+const MeasuredFunctionalComponent = withContentRect('bounds')<Props>(TestFunctionalComponentWithProps);
+const funcEl = <MeasuredFunctionalComponent a="test" />;
+
+const MeasuredClassComponent = withContentRect('bounds')<Props>(TestClassComponentWithProps);
+const classEl = <MeasuredClassComponent a="test" />;
diff --git a/types/react-mixin/tslint.json b/types/react-mixin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-mixin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-modal/index.d.ts b/types/react-modal/index.d.ts
index d20d83fcea..16ee347cfd 100644
--- a/types/react-modal/index.d.ts
+++ b/types/react-modal/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for react-modal 2.2
+// Type definitions for react-modal 3.1
 // Project: https://github.com/reactjs/react-modal
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>,
 //                 Drew Noakes <https://github.com/drewnoakes>,
 //                 Thomas B Homburg <https://github.com/homburg>,
 //                 Tatu Tamminen <https://github.com/ttamminen>,
-//                 Uwe Wiemer <https://github.com/hallowatcher>
+//                 Uwe Wiemer <https://github.com/hallowatcher>,
+//                 Peter Blazejewicz <https://github.com/peterblazejewicz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -24,9 +25,9 @@ declare namespace ReactModal {
     }
 
     interface Classes {
-        base?: string;
-        afterOpen?: string;
-        beforeClose?: string;
+        base: string;
+        afterOpen: string;
+        beforeClose: string;
     }
 
     interface Aria {
@@ -68,9 +69,18 @@ declare namespace ReactModal {
         /* Boolean indicating if the appElement should be hidden. Defaults to true. */
         ariaHideApp?: boolean;
 
+        /* Boolean indicating if the modal should be focused after render */
+        shouldFocusAfterRender?: boolean;
+
         /* Boolean indicating if the overlay should close the modal. Defaults to true. */
         shouldCloseOnOverlayClick?: boolean;
 
+        /* Boolean indicating if pressing the esc key should close the modal */
+        shouldCloseOnEsc?: boolean;
+
+        /* Boolean indicating if the modal should restore focus to the element that had focus prior to its display. */
+        shouldReturnFocusAfterClose?: boolean;
+
         /* Function that will be called to get the parent element that the modal will be attached to. */
         parentSelector?(): HTMLElement;
 
@@ -81,13 +91,16 @@ declare namespace ReactModal {
         role?: string;
 
         /* String indicating how the content container should be announced to screenreaders. */
-        contentLabel: string;
+        contentLabel?: string;
     }
 }
 
 declare class ReactModal extends React.Component<ReactModal.Props> {
     /* Override base styles for all instances of this component. */
     static defaultStyles: ReactModal.Styles;
-    /* Call this to properly hide your application from assistive screenreaders and other assistive technologies while the modal is open. */
-    static setAppElement(appElement: HTMLElement): void;
+    /**
+     * Call this to properly hide your application from assistive screenreaders
+     * and other assistive technologies while the modal is open.
+     */
+    static setAppElement(appElement: string | HTMLElement): void;
 }
diff --git a/types/react-modal/react-modal-tests.tsx b/types/react-modal/react-modal-tests.tsx
index 8ce91bf15f..76958adbb3 100644
--- a/types/react-modal/react-modal-tests.tsx
+++ b/types/react-modal/react-modal-tests.tsx
@@ -1,6 +1,12 @@
 import * as React from "react";
 import ReactModal = require('react-modal');
 
+// tests for static method
+// string
+ReactModal.setAppElement("#main");
+// HTMLElement
+ReactModal.setAppElement(document.getElementById("#main"));
+
 class ExampleOfUsingReactModal extends React.Component {
   render() {
     const onAfterOpenFn = () => { };
diff --git a/types/react-monaco-editor/index.d.ts b/types/react-monaco-editor/index.d.ts
index 85bb06a0f2..a493f3e194 100644
--- a/types/react-monaco-editor/index.d.ts
+++ b/types/react-monaco-editor/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-monaco-editor 0.8
+// Type definitions for react-monaco-editor 0.10
 // Project: https://github.com/superRaytin/react-monaco-editor
 // Definitions by: Joshua Netterfield <https://github.com/jnetterf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -31,7 +31,7 @@ export interface ReactMonacoEditorProps {
     defaultValue?: string;
 
     /**
-     * The initial language of the auto created model in the editor.
+     * The initial language of the auto created model in the editor. Defaults to 'javascript'.
      */
     language?: string;
 
@@ -60,7 +60,7 @@ export interface ReactMonacoEditorProps {
     /**
      * An event emitted when the content of the current model has changed.
      */
-    onChange?(val: string, ev: monaco.editor.IModelContentChangedEvent2): void;
+    onChange?(val: string, ev: monaco.editor.IModelContentChangedEvent): void;
 
     /**
      * Optional, allow to config loader url and relative path of module, refer to require.config.
diff --git a/types/react-monaco-editor/package.json b/types/react-monaco-editor/package.json
index d6c58f873f..c30b05905b 100644
--- a/types/react-monaco-editor/package.json
+++ b/types/react-monaco-editor/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "monaco-editor": "0.8.3"
+        "monaco-editor": "^0.10.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-monaco-editor/react-monaco-editor-tests.tsx b/types/react-monaco-editor/react-monaco-editor-tests.tsx
index 3c9d3c359b..0c46e4cfd8 100644
--- a/types/react-monaco-editor/react-monaco-editor-tests.tsx
+++ b/types/react-monaco-editor/react-monaco-editor-tests.tsx
@@ -21,7 +21,7 @@ class CodeEditor extends React.Component<object, CodeEditorState> {
         console.log('editorDidMount', editor, editor.getValue(), editor.getModel());
         this.editor = editor;
     }
-    onChange = (newValue: string, e: monaco.editor.IModelContentChangedEvent2) => {
+    onChange = (newValue: string, e: monaco.editor.IModelContentChangedEvent) => {
         console.log('onChange', newValue, e);
         this.setState({
             code: newValue,
diff --git a/types/react-motion-slider/tslint.json b/types/react-motion-slider/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-motion-slider/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-motion/tslint.json b/types/react-motion/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-motion/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-native-communications/index.d.ts b/types/react-native-communications/index.d.ts
index d50ce419a0..4f8d28564e 100644
--- a/types/react-native-communications/index.d.ts
+++ b/types/react-native-communications/index.d.ts
@@ -1,11 +1,13 @@
 // Type definitions for react-native-communications 2.2
 // Project: https://github.com/anarchicknight/react-native-communications
 // Definitions by: HuHuanming <https://github.com/huhuanming>
+//                 Paito <https://github.com/PaitoAnderson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 export function phonecall(phoneNumber: string, isPrompt: boolean): void;
-export function email(to: string, cc: string, bcc: string, subject: string, body: string): void;
+export function email(): void;
+export function email(to: string[] | null, cc: string[]| null, bcc: string[] | null, subject: string | null, body: string | null): void;
 export function text(phoneNumber?: string | null, body?: string | null): void;
 export function textWithoutEncoding(phoneNumber?: string | null, body?: string | null): void;
 export function web(address?: string | null): void;
diff --git a/types/react-native-communications/react-native-communications-tests.ts b/types/react-native-communications/react-native-communications-tests.ts
index 754f8a5a0c..136dadd77f 100644
--- a/types/react-native-communications/react-native-communications-tests.ts
+++ b/types/react-native-communications/react-native-communications-tests.ts
@@ -2,7 +2,8 @@ import { phonecall, email, text, textWithoutEncoding, web } from 'react-native-c
 
 phonecall('123456789', true);
 
-email('a@example.com', 'a@example.com', 'a@example.com', 'subject', 'body');
+email();
+email(['a@example.com'], null, ['a@example.com'], 'subject', null);
 
 text();
 text('123456789');
diff --git a/types/react-native-datepicker/index.d.ts b/types/react-native-datepicker/index.d.ts
index 4d8293362c..548de52db4 100644
--- a/types/react-native-datepicker/index.d.ts
+++ b/types/react-native-datepicker/index.d.ts
@@ -1,15 +1,20 @@
-// Type definitions for react-native-datepicker 1.4
+// Type definitions for react-native-datepicker 1.6
 // Project: https://github.com/xgfe/react-native-datepicker
 // Definitions by: Jacob Baskin <https://github.com/jacobbaskin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
+import { ImageURISource } from 'react-native';
 
-interface DatePickerProps {
+export interface DatePickerProps {
     mode?: 'date' | 'datetime' | 'time';
+    androidMode?: 'default' | 'calendar' | 'spinner';
     date?: string | Date;
     format?: string;
+    iconSource?: ImageURISource;
+    iconComponent?: JSX.Element;
+    hideText?: boolean;
     minDate?: string | Date;
     maxDate?: string | Date;
     height?: number;
@@ -19,12 +24,16 @@ interface DatePickerProps {
     showIcon?: boolean;
     disabled?: boolean;
     onDateChange?(dateStr: string, date: Date): void;
+    onOpenModal?: () => void;
+    onCloseModal?: () => void;
+    onPressMask?: () => void;
     placeholder?: string;
     modalOnResponderTerminationRequest?(e: any): boolean;
     is24Hour?: boolean;
     style?: any;
     customStyles?: any;
     minuteInterval?: number;
+    TouchableComponent?: React.Component;
 }
 
 declare class DatePicker extends React.Component<DatePickerProps> {
diff --git a/types/react-native-datepicker/react-native-datepicker-tests.tsx b/types/react-native-datepicker/react-native-datepicker-tests.tsx
index cce86882f8..f21a1bc874 100644
--- a/types/react-native-datepicker/react-native-datepicker-tests.tsx
+++ b/types/react-native-datepicker/react-native-datepicker-tests.tsx
@@ -17,6 +17,7 @@ export default class MyDatePicker extends React.Component<{}, MyDatePickerState>
                 style={{width: 200}}
                 date={this.state.date}
                 mode="date"
+                androidMode="calendar"
                 placeholder="select date"
                 format="YYYY-MM-DD"
                 minDate="2016-05-01"
diff --git a/types/react-native-doc-viewer/react-native-doc-viewer-tests.tsx b/types/react-native-doc-viewer/react-native-doc-viewer-tests.tsx
index 630b78a75d..cdc7e3980e 100644
--- a/types/react-native-doc-viewer/react-native-doc-viewer-tests.tsx
+++ b/types/react-native-doc-viewer/react-native-doc-viewer-tests.tsx
@@ -70,9 +70,7 @@ export default class DocViewerExample extends React.Component {
     OpenFile.openDocb64(
       [
         {
-          // tslint:disable-next-line:max-line-length
-          base64:
-            'iVBORw0KGgoAAAANSUhEUgAAAj4AAABrCAYAAAB37ojBAAAKq2lDQ1BJQ0MgUHJvZmlsZQAASImVlgdUU2kWx7/30hstIdIJvXfp0mvo0sFGSCCEEkIgoNiRwREYUVREUBlRqQqOBZBRRCxYGAQs2AdkEFDWwYKoqOwDlrCze3b37D/n5v7Ozffuu+/L+875A0B+yBIIkmEpAFL4GcJgL1dGZFQ0AzcIIEABEoAIJFjsdIFLUJAfQLSQ/6qPD5DViO4azfb699//q6Q5celsAKAghGM56ewUhM8i0cYWCDMAQCEBNLIyBLNcijBNiAyI8IlZ5s5z+yzHzvO9uTWhwW4IjwKAJ7NYQi4ApA9InZHJ5iJ9yDSETfkcHh9hd4Qd2QksDsK5CBumpKTO8imEdWP/qQ/3Lz1jxT1ZLK6Y559lTnh3XrogmbXu/9yO/62UZNHCPdSRICcIvYORTEf2rCYp1VfM/NiAwAXmcebWz3GCyDtsgdnpbtELzGG5+y6wKCnMZYFZwsVreRnM0AUWpgaL+/OTA/zE/eOYYo5L9whZ4HieJ3OBsxNCIxY4kxcesMDpSSG+i2vcxHWhKFg8c7zQU/yMKemLs7FZi/fKSAj1XpwhUjwPJ87dQ1znh4nXCzJcxT0FyUGL8yd7ievpmSHiazOQF2yBE1k+QYt9gsT7A9yBB/BDPgwQBsyBNTADlgCZKiNu7ew7DdxSBeuEPG5CBsMFOTVxDCafbWzIMDc1swZg9gzO/8XvH86dLYiOX6yl9gBgXYtA9WKNFQNAC7IbshqLNa3jAEj+AcBFNlskzJyvoWe/MMi5lgQ0IA9UgAbQBUbIfFbAHjgjE/uAQBAKosBqwAYJIAUIQRbYALaCPFAAdoF9oAxUgKOgBpwEp0EzuAAug+vgNugB98ETMACGwWswAT6CaQiCcBAFokLykCqkBRlA5pAN5Ah5QH5QMBQFxUBciA+JoA3QNqgAKobKoCNQLfQLdB66DN2EeqFH0CA0Br2DvsAomAzTYGVYGzaBbWAX2BcOhVfBXDgNzoZz4Z1wKVwJn4Cb4Mvwbfg+PAC/hidRAEVC0VFqKCOUDcoNFYiKRsWjhKhNqHxUCaoS1YBqRXWi7qIGUOOoz2gsmopmoI3Q9mhvdBiajU5Db0IXosvQNegm9FX0XfQgegL9HUPBKGEMMHYYJiYSw8VkYfIwJZgqzDnMNcx9zDDmIxaLpWN1sNZYb2wUNhG7HluIPYRtxLZje7FD2EkcDiePM8A54AJxLFwGLg93AHcCdwnXhxvGfcKT8Kp4c7wnPhrPx+fgS/B1+DZ8H34EP02QImgR7AiBBA5hHaGIcIzQSrhDGCZME6WJOkQHYigxkbiVWEpsIF4jPiW+J5FI6iRb0nISj7SFVEo6RbpBGiR9JsuQ9clu5JVkEXknuZrcTn5Efk+hULQpzpRoSgZlJ6WWcoXynPJJgiphLMGU4EhsliiXaJLok3gjSZDUknSRXC2ZLVkieUbyjuS4FEFKW8pNiiW1Sapc6rxUv9SkNFXaTDpQOkW6ULpO+qb0qAxORlvGQ4YjkytzVOaKzBAVRdWgulHZ1G3UY9Rr1GEalqZDY9ISaQW0k7Ru2oSsjOxS2XDZtbLlshdlB+goujadSU+mF9FP0x/QvyxRXuKyJG7JjiUNS/qWTMkpyjnLxcnlyzXK3Zf7Is+Q95BPkt8t3yz/TAGtoK+wXCFL4bDCNYVxRZqivSJbMV/xtOJjJVhJXylYab3SUaUupUllFWUvZYHyAeUryuMqdBVnlUSVvSptKmOqVFVHVZ7qXtVLqq8YsgwXRjKjlHGVMaGmpOatJlI7otatNq2uox6mnqPeqP5Mg6hhoxGvsVejQ2NCU1XTX3ODZr3mYy2Clo1WgtZ+rU6tKW0d7Qjt7drN2qM6cjpMnWydep2nuhRdJ9003Urde3pYPRu9JL1Dej36sL6lfoJ+uf4dA9jAyoBncMig1xBjaGvIN6w07DciG7kYZRrVGw0a0439jHOMm43fmGiaRJvsNuk0+W5qaZpsesz0iZmMmY9Zjlmr2TtzfXO2ebn5PQuKhafFZosWi7dLDZbGLT289KEl1dLfcrtlh+U3K2sroVWD1Zi1pnWM9UHrfhuaTZBNoc0NW4ytq+1m2wu2n+2s7DLsTtv9aW9kn2RfZz+6TGdZ3LJjy4Yc1B1YDkccBhwZjjGOPzsOOKk5sZwqnV44azhznKucR1z0XBJdTri8cTV1Fbqec51ys3Pb6NbujnL3cs937/aQ8QjzKPN47qnuyfWs95zwsvRa79XujfH29d7t3c9UZrKZtcwJH2ufjT5Xfcm+Ib5lvi/89P2Efq3+sL+P/x7/pwFaAfyA5kAQyAzcE/gsSCcoLejX5djlQcvLl78MNgveENwZQg1ZE1IX8jHUNbQo9EmYbpgorCNcMnxleG34VIR7RHHEQKRJ5MbI21EKUbyolmhcdHh0VfTkCo8V+1YMr7RcmbfywSqdVWtX3VytsDp59cU1kmtYa87EYGIiYupivrICWZWsyVhm7MHYCbYbez/7NceZs5czFucQVxw3Eu8QXxw/ynXg7uGOJTgllCSM89x4Zby3id6JFYlTSYFJ1UkzyRHJjSn4lJiU83wZfhL/aqpK6trUXoGBIE8wkGaXti9tQugrrEqH0lelt2TQELPTJdIV/SAazHTMLM/8lBWedWat9Fr+2q51+ut2rBvJ9sw+vh69nr2+Y4Pahq0bBje6bDyyCdoUu6ljs8bm3M3DW7y21Gwlbk3a+luOaU5xzodtEdtac5Vzt+QO/eD1Q32eRJ4wr3+7/faKH9E/8n7s3mGx48CO7/mc/FsFpgUlBV8L2YW3fjL7qfSnmZ3xO7uLrIoO78Lu4u96sNtpd02xdHF28dAe/z1Nexl78/d+2Ldm382SpSUV+4n7RfsHSv1KWw5oHth14GtZQtn9ctfyxoNKB3ccnDrEOdR32PlwQ4VyRUHFl595Pz884nWkqVK7suQo9mjm0ZfHwo91Hrc5XlulUFVQ9a2aXz1QE1xztda6trZOqa6oHq4X1Y+dWHmi56T7yZYGo4YjjfTGglPglOjUq19ifnlw2vd0xxmbMw1ntc4ePEc9l98ENa1rmmhOaB5oiWrpPe9zvqPVvvXcr8a/Vl9Qu1B+UfZiURuxLbdt5lL2pcl2Qfv4Ze7loY41HU+uRF65d3X51e5rvtduXPe8fqXTpfPSDYcbF27a3Tx/y+ZW822r201dll3nfrP87Vy3VXfTHes7LT22Pa29y3rb+pz6Lt91v3v9HvPe7fsB93sfhD142L+yf+Ah5+Hoo+RHbx9nPp5+suUp5mn+M6lnJc+Vnlf+rvd744DVwMVB98GuFyEvngyxh17/kf7H1+Hcl5SXJSOqI7Wj5qMXxjzHel6teDX8WvB6ejzvb9J/O/hG983ZP53/7JqInBh+K3w7867wvfz76g9LP3RMBk0+/5jycXoq/5P8p5rPNp87v0R8GZnO+or7WvpN71vrd9/vT2dSZmYELCFrzgqgkIDj4wF4Vw0AJQoAKuIriBLzHnlO0LyvnyPwn3jeR8/JCoBaZwBmrZo/kg8hWRvJkkgEIRHqDGALC3H8Q+nxFubzvUjNiDUpmZl5j3hDnB4A3/pnZqabZ2a+VSHDPgag/eO8N5+VFOL/e+JMw0ND7g5bg3/V3wFT+wWAtrxRzQAAAZ1pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iPgogICAgICAgICA8ZXhpZjpQaXhlbFhEaW1lbnNpb24+NTc0PC9leGlmOlBpeGVsWERpbWVuc2lvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjEwNzwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgoROXGMAABAAElEQVR4Ae29AXAc13km+EMEREJewCF1ZFySc1RCOyu6rOGtGJ+oVOTs0KkteXfjYSVxdssaucxKDPq8FxusulgLVyRvQXd2gfadBcblAlXlBcsWtKtATgmsdeB1DMkLxndgecHEgz2BZQ9Xo/IO1x7FoD1z5kAaUO/+/71+3T3d/f7uacwMMcBrCeye/t//v/9973+vX3e/fl/fc889JwC3P/zDP6Rd7LaxXoNaHWBw7xDsCaTmZIGkzs8aPH96GD74VA5mFp6A+++6AxowAO+891DIdpT+eu06NAaGYGhPf0i8jn7W0c8h9DMk3ViH67UGDA4Owp4I3ZCxBCc4XxKot5ykVqsByLKHVddR1hgYjMQlnLrDZ7Aertc3MF72JqpT5c0GrK9vQKPRgKGhodYclPkZ6r01S05qxheMoxoGGZYO9g4FWwOfWdr4pDirD+yF/tI5GD78OlTFJ6BFhHjHAlLOz9bbe8C47+e1Fz8Nd79vEMricbjLd95/GJnf+mU4PjgOX6i/AO9qXKeOCZI06ST5wcZVOD3wDri3UIVT94VRrl3H/Ib2wlCgg4n00ykIh2eUrFf89NdTmmOu/4zCxc2jnX15glhifXGdCh/w/bX5Oha2ZM+0A4E+gVs7DG3GxtVLz8NX/u1fw49u/ATK5XfB5F99Fu5r7TqymeytrkWg5xCoXX4Sho/uhjXxKdjbc9630eHaJegbPgaLVQEPhccm6TJaX4FTgxl4WmqPQbHxWTgUGNykM9xmrV7xs83F7pi5TsRSx5y1hjeDwJYY+GymAFbXIrATEdioXYNiZQDuPbR/JxbfV+Z1ePXqT2DfoYNtfPJFNsv4JK8fDhxEu1tx0CMR6BU/fdW1pQ87EUtbusA71jk78NmxVW8LbhGwCFgELAIWgZ2HwG07r8i2xBYBi4BFwCJgEbAI7FQEWh/40OTR6zXAuad228II0MTLWm19C3u4TVzrlfbA+cnJtkk1tb0YWwmzreRL24HeegaNfSvWw2uvXcdXpHbb6gg0DXxqK+egr+8ErDjXy9rKWeg7chbw+yHcNuDS+dPQNzgM+/YNw+BAH5x+/qoqH06ye7SvD3V9f6iH3zxAbeV80/njp87BVWVQ6fb6v6Gyn4BnL11zcLkMJ/yY4PGRM5ekTGGt8ToOZy6sJGowG9evwPknPw1nzr8o8Q3BV7sCZ070wfC+fTA8PAh9p54FWZ2Mn3y9h3JwT5h9qcH5R7Fsx8/Ca6q0+PsIxsEpFVshXzCtjJcYPTfn7hx88zT69eRFL7ONKzLOz16myGbaA06SPB6od2obZy93JvD5Nsb4yZXBK3XgqAZnj+i4bd4fP3eJkf1neP4Upj99wYvzmmofZy6qKAlktEV/mvDkcFlxy3L53KPYDo7AhVf15TGZnmug6aDdvnD99Wb8bHI64Y+Y/PALrOi+NaYPMfY9Cdwy9a2oeu0iXivx2njgwD4Y6DsNsovAK6e5H+Rkni+heEH/T1HfcvwMOFcZvMbSdftR2bemva54Oe6QI/qqS2/VwhR+4ZUVS1V1plqYxN+TQv4sz9PXX2JqsSTq9aooLs2IydlVlbC+LHIoG51dFuVSSRSLRVEsVUQDpcrGmCiUK6K0PCfymA5G5qRM59vTe7fsBVEpr4qZsQzilBeFOpWqLsrlsijMjeG5MbGM2JQrUuDislopi6WZcYntyGwxBoq6mM6ByE1Mi8k87qcKgfR1MYNyyIyLwlpdVCsFMT05J9akK7qOwn6y9R7IwfvJ+VIV01n0A+t6toQa1UV5TLgsUzC5mAXjJUbPy7wrR5UFVW9lJ7e6bB85Vbdce8B6L1EbwL9ypSRmRgiLEVFw2lW7nWfbGOcnJ2OcrJSofXtxXcBjKm+52hCcTDj5Ta+qNrA4jrhkp1T/wuS3pUQMZmzZZSEqYiKj2kV+2uk78Xy8ngGBDvjCxVJqPw3ux53m8zP1rTF9iLHvifMmvm8dmS6IRqMkJqjvG51Hg5wvnEz7EhEv1WV1DcW+dXyhIhP6+29df61dV3R+O2cP/qJqAOXFCQUKRDXwqS5PYOc9JvRFwK9HF7IsVsSUuto3iaSNzCReCtRWnM6hnQl1MW5K2aM/nLJP6qtafUlkEIsZp3OnUtX9A0inmH5s6VRhCnFBnOQgxUkT3q2JCbQ9j2DWF0YFjC+rJDgQXcOLTqM8JwcYc2UacgY2xk+u3gNWfD85X66LKRyAZbADyGNnUJxDX9FvgJw78ImOlyqv58u9K4dVVZezJYXn8mRWQH5WxjLbHnzONUqqTiaX+Zr1qbR8yLUxzk9OlsSJqLjWeiaZxDA7IyqVBRkTGlutt9X3STAzlb1RmsUy58XsDA2ow32gSc+ESSd84WJJ+9Gqn1ov7Z7LLyyL6UOYaxXnH9e3qr7cuSFCI8qnvFjFftncD3Iy5UlkvKD/9JABaACNN7g09FE3ZFnZt6a7rnAl356ypldd3EOuoV99ELLwObj7yKP4muV5uHRFP2hTWnfj7mOZQThy5Aj+4SsdfMXiPtgv/Bh+eO01ePXKRXj2q3NYX7+xrdYeGcay//xnVNoaXP7Lfw8FjMpDv+wtRNRQELH/vvM33w9QeAFecUGLSr4XPjA3Do89cAQeeN+LMPYr/w2ePXMajuAj1i99twz1H5dQKQdvN3x/G+dnVI7mc5wvGBuvADzyqVm444t5+L3HX4GpWRyyQdU1Z4yXGD3XQDcOht4Fp3GENve9VzG3GvzNV16C0UfeIxdijGsPyr1r8Ll7cpCZWIRP3N/h1XYMbYzzk5MlgZeLa5Ps/o9/GUZeegRfCbwPsuOL8AcHt+y34pEQJMHMVPbVbz6DzTMH//x3MSbgMbh0Tb/uUlmZ9CIdwZMd88UQS9qPVv3Uemn3XH6Rspg+5G50xHitMjjJ9a0bN3AyQeY43ON0+bjuKm5l+DntOV84Gaqa4oV60amnl2Cs8ARMXapB/wCeMGzJrisG5W18OvHAB/Y+BN9aK8L8Y78F/33hy3Ds8N1w/MkX3ff1dL3GV10wP38BLlwowoXPvN9ZV2M3Sj4H+fzvwD2H3wtPvDQCFx4/vq0gpXXTnnjv3fiedRiOPvJ9mJz/S3gg5XUusiH70LrnoQ/B448cw8EVwMtffRwe+SbAk4U1ePzhg7iSM2HtDS58avKwnX6SQbMvvwKvo/yt9/wm/LNMAX09AQ+/+4D0Qf9jipc4Pa3fnf0QPPTHeXjmmb/FlaRfhq8UMvC7DyDOtMW0B0py6WwenoBxmP/UQ/SzgxvTxjg/OVmnvO2/Fz6zMIbW8zD5p53GpQOFSI3ZdZj/2Bzk//DdsGfo1+ARdG3mOzSg3sTWEV+YWNqEq91UjetDTH0P6yPTt9Z/8TNUJdzUttFQk2RpPML5wskAZ3Cy8fLWI3B6fgSeGJmGVxte3tqH4D7uuhJMv91/Rwx88LmAM4IcCIwk+/cegoc/dAq++LUXobo8CS898RwUnZsWutz+6j98J9x110E4ePAQHLxLX/mxejOTcOnF74NoFGEM10P95PmVbYUrNaSJpTV6bYh/L8InHj7UVL4AjE0y/WOtfAUPs/Ar7Oqz6/CtL30Jrt17Cqr1C/CbcCeMf/gIvJTZB2cuvQYDsnH+FH7WfCOps5BP4Mx+muvdNdB0wPny9zLlz28MwQf+ryKsfjsPvyy7AM+AOV7w6Rmj51noztGhf/xBfOTz1/Ctb30LCpk/gvfosMbsufawfuU8HPvkSzBXGjNSMLSvBHwb4/zkZO3zr9nSvv1vwz7hPe4dcrN06/9Khdm1SzCDRXvmkcN4g3QAn/fg8V9823sqnrLY7feFj6WUbnZMzdS3cn0I1/eYHOX61iGK58JlqDj97uBbm2/yOF+Msph4ef1GA/Y//GkYLXwS/s2/W0C36Xl+eEt2XQnrbfczTQOfwTvoqjsHhZfpK4t1+L8vvIAdlBpNrr/6Ipy/cBmuy+/Y1+GHhe9hmjth2HlSTbD/uFwB4ly5jp9S0yfv7vW3AIC0WXilOAR/ujQBcyc/CR36wIVy6fpGDWlPZAvcwE/Ka/CT136OKX4Oa3hcq7mo4Ll1WFvH1UIvPw/59z8FuakTMRfJPfCBx78In/jA/fg07cfwzZfeCR/+yEfgFM54nvlPP4I99+ZgEp+wvO9fPwuvUTbrr+GA87L6qgt/mvzk6h3VDBvnS9nRQSf2H4J79/cj75Y6pe882HihyDHoGZzp3Om7HoSJzNP4huIJyD/2T9zVgdn2gBxPY4dPQhZfcWV/ue60B1xewF/17fbY0MY4PzlZu93z25MxgP724pYWs6vfmcEnnxOAczLkDVK9iMOguS/D9zbxQVvHfDHE0taqr7i+1dyH8H1PdCm5vnXo7f8IX10+DV9fpOkfNfgP507iK80/hne5N7FmX+jr0Ki+Lj5eqDM5CH86PwbPfA5foTZtrV5XmpR3xo/mqUsNsTStJ6Kqyahzq+pTlHpxTk5gRlSE+suK6SU1qxxnV7kzzT25msiqJ8t5H7RUxCROzMqGvkhq9qRnfmHZabLZlJ7c7HdcT0RzMcNyT6gJyWpCscYyI8bxizg9AdxvwnzcEMu6rjL41ZwGeK0gxpwvqmRd5KbVVzOcn/iNnanezfn7JUFfcOIe1vGkniWPSeur0xg3GBNUSGO8xOj5s+zi8fJUHn3PiDlnkjNlzbWH5rrVdQxiokMTnLk2xvnJyZLAG87X00or8yxszaMkmIXLrr7gaf4KsyzGsV8YnS+5BQ3ruaLIg074EvYh3F+H00S617aTkfkZ+9aYPsTY9yRw19S3ompxnj7+0W19RCyvyW+amX6Q85OJl7lvyuuN97FESYzTRGf6Yhb71ua+J811JQEO2yBJNGWFZJ1GomNknA5OPUzLTotBYbcuIkBPmgaQob0l9nmm3rvoek9l1SvtgfOTk/VUZXTR2a2E2VbypYtVcMuyMvWtG7iAYQ1fbQztHQpdN2+ZszbjSASiBz6RSe1Ji4BFwCJgEbAIWAQsAr2NQNMcn94uivXeImARsAhYBCwCFgGLAI+AHfjw+FipRcAiYBGwCFgELALbCAE78NlGlWmLYhGwCFgELAIWAYsAj4Ad+PD49KaUJinj5Gb64LGlLa0el0lam2n1OF+6LFvHOqBlHbq10eRKWkpCLZ/WSq4bUq8ml6poQQ/rKF1+LeSxVZNuc0b0bscuW81p+wJOj5OxzkQJa7ByeQWusx3uBly7sgLXOrqmBfmWxJetUIYNeHXlMlzlQYtytC3nujTwWYcXzz4JF7YVLfvm8a9duwznTp/ABc364NxKey6Q11eehSP4Ndfw8DAMnDgDLgl0jLtp9TizaW2m1eN8SSK7eJbq4oS3xpRmQvYxrfsZ1k31t3HtRcniPoh1sG/fMPSdeBKutKF6TflJpvhzp2AAqUv27dsHg1iGC1e94Y9ZDzWvXUS25wGpNzw4kJBBfgMunj0FfRhnXn5tKGCSSrrlaUyM6LfIsdolOO6Lz/Ob7EfY2I1pD51AIG1fwOlxsqRluHL+UWzX59VNRu1lyBzNwH+Ri9WZLNTgK4cz8Pm/S9dOmvIzZUHnE/kSYSCRXjvLUIfnMkfh2R+kwyOiBK2d6s4n+XUxiWscTMhFXLqT45bPxSHAhPxIYF2GzXheEqOIc25ySdSran2hLB7Hb2n1OMtpbabV43yJl6l1hmg9DIdIlVQkoWFGzBZKolwqIdt6SSDpvdqY+qsWZsTI+IxYLa+JanlJjGCdZCYdQllHveUdk58mCZ5YoDVh1sTsKJYjP6PWheL0kOKQSG9hZFqUqnVRWV0Wy2VdQM7DqpgZGxPzxYpoVEtiEteNykwkiTPOZo/IGEb0W1OCuihhXJYKs5Ic2VvfJZ03bOxy7SFddjFaafsCTo+Txbijxc6aaC7WEpesKERwQ2sV2q+VS6KSpHn5leg4mF9Q7v/t+LIc44tfRR53vQxqHaNOrW0WKl/gBK0i2rwhyKPZvBif0AsZYsfvMI2Xl6a9RQxzE8JZ21Dqm2TUkDLUudJfJiuyuNjSCDJ27/itsSYKBeK6b4hpxKQdAVBfnUGckaUXg74hFwxEzLNTagFDBvC0eoxJXLBw6/jC+alkJTGG8Tm5MIcLcWbFkl4M0ukMFspVUa3qk461FuqvQKzuOWcgEu9MdAouPzm4yYglp1NdncL8YBKHQLgxevWiWlSyUG2I+lpF4C7FVhezeRr4bHJglyLnW6ESx4je1A9iLM0W01zpUpQsdHGsi/nxnOp3qe/NjYuCDAi0XV/FRU5zYmyMFuakvjmPg9hAfDsuNMUu1x5SuBynEt+H1MXcWE5ksriAqw9mTo+Txfmj5asziGvGaV90EnGhRWxzeY33iFgse42pin1hFq99udwIXkt9OCesh1B+mKUxzhxfRkbj61aXR+67XoaqXMh4wlnkdmlqBK9VE0KtEcvELjnLjFGaysT8iBj4OLT3dBe4VsU7iUV1F7i2KAcwEwtF0ahXxMwINpj8LF62ceNkjTpeNIpyldJx1K1X18Rauh6WKUYvi3QA6F4pfVmQPw07sTFRrqu7mtFxDCbs1PydQpT1tHpRtvS5tDbT6ul80+yXaWAyMo+qBRzY+wY+OKBAcnbn4kD7UbFU8To0lVdM/WHnlkcbI3PeCr1pfPR0ovLDjmJMXcAmJsakv1OhVaLDes2rvKpyTi87q7F7GTJH+HSJ+gHExV05nEm9LUTY18mYyOTFxPSsWFqlmxe9IcZY13o15kpxWRQSPUHT+pvYy0EJrZau+5G6KCwuiTI+ycMrhYoP7K/l+MC5yCGliqjjwFjW4XjEE7tg7CZqD5soQ0A1vi9QMU2rqrs3K2iD0+NkgeyjfzZUe0bOQ0/u4rmA+FbFIvUn/oERXQPX1DWw6QbX1WPqISo/zMMYZ9rmJGPT89w70noTXSyDXN2/JBbG6UbNxz6AKBpjlzx2fJVPqv1jFK80sUeRA59sIJDIihswjsn66pTs8Kg752QquX6s5RvtOnbsLnxBSouJWtp9XExTIGFHVi3SHb3vQm4wnFbPYE6eTmszrR7nCyerF2cRI4dKo7EsBz7eG1l8/VNxOrhGWUzjk43wkxuu/spigpaTH5mNferG+dgsi8ivXhQT9LppZFLMzk7JgVZ+akndlLjKYT098Jl2HgUUZ2mgPJnYV9Xu88J5IOzmtN0PGngRm5+ZEqN56rCRhmZ8wcEaqQZyWN/uoKiVQeQmUXMuBt7AR4jS0iz6mBPZXE7kiMZGP/3FtNTHLzihXVnAwXJ2OlDvUbGbpD1sshw+9SR9QbVSFuVyRQ3oHF1Oj5P5sjYeFmfpScqEepqqU0k8Qcw71d0oUZ8S7Hf1NbB5wBRXD5H5YU0Z4yxR3WrHfftbVQZ5Y+nFovbIGLuUwCmjf7Cr9ZLuDZOb7zRMFBrUxO2O/AZsuDPZORlIbu5oIk9DVjvotKKBDZKDpAEALRWegJNPHIPy4w/A4A2iJX0Yft0ly0NCVPyyYOXK1QArdJxer/ti9v/lrz+Jwjk4+cARnKx7FF7C/44OPupMcN4D+/fvVcr9d8Gx38J7/bm/V4S7PpPR9fcqnDlyNzx2bBaq5/7AJTf1qaU+DOZXe/nr8NhLozB/7hPwB39wCqZXp+CZj30Jit78ZplXUE85kIOjh1UZD777QTz1Avww4XzDgTuG8Rr//p5lWU9bAWZG9CH4yAtVKHzpEXh79btw7PABOPXslbTZtKinWJJ3D6h+ZP3qebjn2JPwnv/1/4Svf+1r8MSH8bnjT5F53d3uhLc4Xc4eYhd/qer7CtQUu8nag5vFpg/i+6XBoX0wtG8I9jTlxelxsiYjET+uwpkPPgPjiyfB6RV8aTIunjBwu+983CFXD6b84uKMs8n5080y4JgAL0+5iVmYHkFi7ZPn4LrjWnzsUkLTGIUrnyczDHy8BPpo8G2/jodPwDdWyD1ibv8yDmofhLux8XAypT8Ad+FEnxdeehk1N3yDJW19Z+438HPnWm0NedsBflap4DGhk34bOvzbgN0bzmv9MLK8X4evPP5JfIL4G14jrX0fTuKXBZnDvwcv+y5usXopXIq12UVfOPcz/8t3oILYf/vbuC/OI8tyBuaKZyGDg8WN167ApZVrsI6j+/XrV+Fbz72EeL7bxdNYf+vYYR25Bx67cxJKX/jngN98w3Ws281upvwG7jiApp+C/yy/mtyAwtLf4O//AQadq4FJb+idvwk5HPS99P8QqzSOmZcW8N8T8KvuQFmeNv5Tu/EP4I/ef8go344CnhF9Ha6uVOCehx6GD33i8zCHs9qf/m/UujuzXblwDp6/9KrsM66XVrAmM/A/3aMqr/HzCmb6z+AfP3AI9g7W4HsvPIPXCjX0NXkjx0FM7Ma1B5PdtOdj+xC8ffvKP8UvWAf/KVxK2J/F2zR7++qFM8jBPg4fe2h/KNEwFODpuRV5fvU7s7jPwq/pdiSfDqzLm//XG9TD8728rAdMZc6v9TjTNqWDhn+6WwYc+PwU4Pj7T8BHzhVhdO5j8PtnLknP0sSuoUjm06FHQ/IxEk6QjXgrtTqr5g+gNXyUl2+awMXJKI+Kb2J0brNfuISc7s0Ty5N6MhzhSX/OK5dNFKeyRK8gHXvI2u6fS+exoiOTb6B+Wb2U/rA2cYIaDtJkHHXDl0RF0LHvTJSsF+hVoa4b3OOEfneCKBo01V912VcHWl+/ZkjkSHQiU370JdecfyIrvsaYWvTmnpj1cJLkIs0L02XEybirvkfx0W64ZwvOJOpAKLny7XjAM6I7ryBcPGmSqxNMHQCjND/uqzsQeZzX4c5Aa6jXn7puc/kMxq/zoYMT5/pVgXr9o2Rc7Ma1hw4UEa8bvrYU7M/olQ+9fsZrUSt9CG/TVAo1b3JswWtXbkq3L9PtiD4I0q0iGBMqzRRNimPqAV9Uyi90I/PTr7qi4oy16XocPrgFZZjyfdTTKM3JWJ5YxPeFXOyS57qf1hCHSxN7pmWSUs1AO4gMtM2PF3Ec67DTRsmwAdqtWwjQ4mppWILT6nHlSmszrR7nSxoZLXRWr+M92iDsHQpGfBqDndOh9ldvAAwMhdsmm6vEGku4d2+oTbN6O1jIMaJzsvZDtoFPimkBmUEYGgrf19NCphgQ0LbQvRXtIW1fwOlxsohKuvbip+Hu9w1CWTyOT9PNWw2f7iI9O0RUhVkpQpIkv07FWTfLEFF091TbY9e1DNDywMenaw8tAhYBi4BFwCJgEbAI9BQCief49FSprLMWAYuARcAiYBGwCFgEIhCwA58IUOwpi4BFwCJgEbAIWAS2JwJ24LM969WWyiJgEbAIWAQsAhaBCATswCcClLaf4piAOVnbHeENpmVkTqvHe9N+Ke+nmaGc12u/n/S5K7Get8yWzriyUcNP6tEm/yEtYyBCxLPBM2VIG/Oot2XY4Gly7PUaLnXgBwYZpy9fhIsXL8Kly1fbirU/l24cdz/mzaVKG7tbqQzm0qWRJGFg7wQbvGJUf7XjDPNpMGlNp0sDn+3Nzs6xX3NMwJystWr0UnO+eKmaj1hG5uakTb+S6oVYz5ushH+kKQNZMenF+WliKI/T056HysewWNcun0UG+L7mv+Pe4l0mX3RecfuQL3j5vUjM7cP7JJP6wPEzoInb43zReUXZvMSwwXNlSBfzW4kNnmNn34Dvf+MZ+Mx73wvHjn4jsEioRrPN+23Azm5qt3QDYIpdDsW4dmvOj7PaLEvMlt6slvpXU35dZ1LXbtfgq8io/lRKhnltZUvsYz94b0uCbczOzrJfq7UYotnSOVlK0FlfzDZZRmazmkiiF8l6ztgUKcvA6fF+mhnKeT1ViMjyyXUmcC2PKFZ35LkrFouS6b1cLkgOO4/Z3OwLB5mWRfnSkJQcIKaWcH0M5HCT1BaaSZ31Ja58SKwbxQbPMr6njfktxAafgJ29Iel8klN/6PpLt+9xdnamvbOxy4DFtlsmP8ZkswjXvMnhGjp+epDmBG3+FczPWcfmVrDBV8tlsda5panaDJzZXARXl2VnN8MVIeHYrxmG8nawBIe8YXwJpWVONDEyM+mCorCegfU8qOj/nbYMLej5/WyFodyvp1w2lM/pmCJZ3f1ldch9ZxUlsWjFF78ZzhfFp+VdhEtzyMflJ1DUhgK+cDbVIDOaDZ4rQ3ti/taywcexsxNuQcw1xB3dBy+OyF7VE+zsTLsN4hiO3Wh29iDOTe2WyS+oZ/odYktHMtfRLBL16oVPsd/PIT+fHh8YmdQpA6y30WxejE+MOotR0uKHWlN5EM6v+2zwqzPoHzLMZ9FXb3FGWQBjnNECm1kfDkRmns+MOITGTHyqYnf034iBj2VnT4d4BAkkw5auGnXrTOrJfAv7kkwPUwUZmZMqRugZWc8T2Uxbhhi9gJ+aqBMfv7qr4EYylAf0qAjG8uFdZTyrO3LBT+HK3b4VnRP7EoGfyRcVZ6O4DqzaVqdptfAJfC7TvAV9IanJJgaJkQ2eK8PmY95hEr+VbPAsO7vCVK6E3ALZa3NNpPwlB9v+pxAMwzWmpScWW4udPdxu42NX6QTZ2ZsQjGi3Ti2JSd/KwU063I8otnTEE6luXIZ45fekQ2SKPiLWo/OqBVaKy6LgX83bqQsj07ghP1V/3WJSx8WU61VRreITYyxLE8M89gVGJvXKguxTNXmr7HtcMlxGj8O/TbLIgY9lZ0+DbkTDLSAdQCaaLX2zLMG8h2Ff+PRaGsXIrGXcPqzHs55ztrQsbRk4vbCf+kLNM5SH9fjyJWGxLoaWpE/mi8bH27O+NNRTKcA70olxYl+nAd6YcB4yOUbCvrA2GTZ4rgybjXl1Qbn1bPBmdnYFpyqn95TNq6kOHjkXUP/rFyPDNaaNYwVHMhMxgQMDwDt2jxkgSVynLWNEu00Qu1Hs7J4HUWXQ0oj8tIjZR7KlSzw9NvY69fvuwJdhUqd8nLrQ9CHBrM35dZMNXnsVwTCPImOc4aBoNocD7KlVTFURY9j3jBElhbOZ9XSK8L4wrfsw70aV+rSpIGdJWLXpjGHg41WiTq06nXH3TrEu32OPiCKSw3Aypa+CbJL4SbbtpoPCK6O+CNCFhhheGrJBTMg7AU62eYjCviibOB9gtSAKq0VfZ6Zzw9F8qKPTMm4frbc8gdxAGJCZjNqrC66fU4fzhfIzlYHzhdOL9lPVQ07o9+WNVeLn8nPVRevFl8/zc9XhtPKzYK0tEs8SXsRdciUscYF4iThfPJv+o1hf8PH+0sKcmFssiNUFzBdfdXlRikxfEb5wNtXrnlEZ0+SHmtOiBiRcGTYb8zSHKZOfcV8h+DG4Vceq7xsJ1CNd+Ly+siu+Oa+6JAcUZqheOWbEzFJRrFWrYnk679V74EKtn1B58Rkd88FyRMV1ME3y34b2HhO7jXpdVPEvvMWVwZBf2JDvTFEg76wY9128pdDBc9lxozRHr4X8bayKT0Xmxcykep01MkMDAWcL1IU+rfZcfhmx6FRYo0w8V8Frti6fV6ua40oPssL1bsjPdSo8WGTjDPXWlqifmxCrctqH19/F6blZBg4a1Yoo4zyj4F+r844SD3wazqQ+dWdcFwt0YcPHVlTXnEz5rd7LZyeXMH1DNHydfaBcPfmzgR2LfAyIA4exeRxUVKmUuDmPKfMy0NfEFI5+YWxBlZGTbQIFoy9k030F4z2WlVnRHTwNerKTooS+V9fWsLOM6kwCjjF6jeqaQNZz/MN9cV4+Cp4rrnkkiiZfMAu2DAEX/D+Neoyf9I5dTlR0SD3lBQLv1mR3wehx5WtUVsVSoSzqGOj1taKYzPrqXTqs7gK9Sc1OKThf/AUNHHO+IJqiXCypwUJ1Vd51ZacKPgvRvnA29STquSINnxrqooqvn+TDfK4Mm4z5yvKsmJyhPuTWbfXSgpieW8YJntTC607Z1Y2N65UzgXYGCV/pwtypbXVuSswulWSbWpMXFq9dN81FapRV36NfqwYutvoCKAfDXMzHxnW6khrbbYLYnaK2FbzoM2UgD8358f7LOUZRA1ok1Rx1B0RrYmaE+lKHEBZjpFjQN5oNMUcy/XEBZReoC78HxvxQh/qs/LRqx4UZHNT6/ZIX2Ip8lTdOHzXICAnn1VTvKDbm5zoVHviwcUZ6DjZ045v1lTtWz82zMwfGgU/UkyOOgZ2TkevbmZ2dY7/mmIA5Wdrq5nwxsbNzjMycH4n1nMat74ikTbxAmtjZ2TIwDpn04vw0MZTH6bmuBMoXx2Kt7tBAzDW/b5LmTL64ecUdBHyRT87kxYEuEPgEbmzWmXugDHG+uFmFbPJs8FwZNhPzW4ENnmdn14jVxeKUfiSfc+d+aGm79tuFnd3UbuNil+RR7Oxx7dacH1cz6ovEaLb0hlicpMGHamP5fFZAbtp5quq86nJkACNiMTDHJ9v0hFn7wOTn9p0qP5rj5E04Duan0myODV77FPEUKY5JHVUV3pnm/i6Bns61E/uWSUo5BnZOhkGxczeOCZiT7VzEul9yWQ9tZCinRfrSsrq32xdcD2UdGbzrMNBWhnmWDZ4rwzaI+U4xY7ce+Nudnb0zsdsqzonY0nGR0MbAEAzt6Q+ZbzVekuRHmXSVSX3jKpweeAfcW6jCqfuGmsqYlkk9rV5T5il+tDzwSZGHVbEIWAQsAhYBi4BFoBcRoAVZBzPwtPR9DIqNz8Kh8Niup0pmBz49VV3WWYuARcAiYBGwCHQTgXV49WoZnxv3w4GDB2Goxwc9hJwd+HQzfmxeFgGLgEXAImARsAjcUgS6xNV1S8toM7cIWAQsAhYBi4BFwCIgEbADnzYFQlomYJ7hOqVzm2C/pslmTYTTKV1w1baSL65T4QOOAZqThS15Z9LGhGchfMTZ5GKJk8Em6mjLsKWHoersGZqgHWJn72yW3bTOxVk3/ZB5bSI+jf1ZyzaTMKK3ikwnbLbqw85M36WBz/ZlZ2eZgBmWbmIe5hiu04ZjOvZrgLR6nJ9pbabV43wxMzJzDNCMjKlbNiY4JzkZ5vcosroPDg8jy/ow9B1/ElZqWoGLJU6Wtt63Elu6xqBbe46dvVs++PLZBuzsvtKEDtP2BZweJws5oE8kYkTXiRPuO2EzYdY7PlknvpEP29y+7OwsE7Bc/8TE0k3LxoOB4TqMYLIzadmv0+pxXqW1mVaP8cVZUA7yIyFWZY4BmpPppeajGNjZmGDcZEX1sliYXxSlNVwss1KQCxFmJpeViowzQyxxMlxykBZey9HColW1kCMtMhq/bSG29Hhn25siATs7n2FdrGEdtm/rcXZ2Foi08cnpcTLGGWctK73CO5MyucixubzNFvRNDsCtSxmxgKGZLbaJZTaHy1D72q9JRheBjF68idhdcYXgEWfFyVtX7M7l3MQE7AR2JEu3vBjjSqvOwq7tWP49Lft1Wj0OxbQ20+pxvgiGkVlRDnjLy/sZoDmZXnE1sm4DzjTFRECW9qeklBh3BilcLDGy9mB9a9nS0+KXVq9pxdkII039IC5MN1sMrNyM9cGSakbYTHRKr5i9rCkKGPZrJO4cy+bE2JhedC8v5uUq3OGcmmKX68/Cqps+Ex+f0ezsnB4nYx3GstNqybk8kfzSooC0EKEesTBYo1FjTDg2R0bj64H1zQpbRiBi4GPZ2VtGUSsEmYCxkzOzdJsZrrW5VvfqQt0643taPc6/tDbT6nG+eLKoJdeJVymavVz5Ei3z6D/06qmjYqmiO0Ivx9Rs9z4T7iGSNk6NjYrRvOI/81Zr5WLJLNs81luALd0Fp0sHLDs7xhdeFI1M3OSiHDx41BJt81ra7WV29jAS8fGp2nNwIMnpcbKwB74zziAlOxHFiM4xjTMxoW1OLiK9jdOW9M2ML2t72H4EIgc+lp09DdBRTMAMmzHxySCVQGZkUszOTkn6hvzUkmZVSeMAklziRdzABs8ZTKvXCZud8MXzMzzwERwDNCdDDh7iIZMbciHJpfNzQQLNqJjwvGn9aE0sLyyIudlJ+RR1bG5VmeBiiZFtFmt1Ebn1bOmt47g5DTM7u0MXkMmLielZsbTqMVEXpvVdvR4oq72fTX1TXjkXUb89I/u1HCRlxIITvpWFMcm76HuAj65ExW6SmN9UKZqUk8RnFDs7p8fJmjIP/pCYmRnRjVgTrQZxNEbEhB4E8/UQdMT+bgcChoFPkOkVWVGWmxmHLTu7H/44JmCV1v86Sz0yj2a49ltu5Tie/TqaET1erxUvVNp4m93zxfNec800d/H0KszIXs7JPMPCX7fqdLKY8Jlo6bCyQEzPE5J3i4slVibZ4OkCrEg2GzRwdmwmcWYrsqUn8budaVS/6Gdnj2bibtSrcm7PGpKcZpBbaR4Je4kMuBrxkDCVf86rrt5lZw+XOr4PQQ7MCHZ2To+ThT3wnXEGi1GM6PFM49ExoV+Xm9nSffnbw7YikHjgwzGwczLl7TZmZ2eYgDmWbpbhOm0Vx7Ffu6/eAo/a4/TS+BNns5u+oP9mRmaOvdws4+pWMDGRBkrSqeOE5sXlEl4oG9jZl8XsKA5YstOSqZyLJU4m4uooxtmtwJYe42LbxTw7ewwTN3lTpzk+0Bbi0u3Czm6spNj4xBuZKHZ2To+TGR2hejMzojfN+8Knv1P0hCcJO7scTHkPGeTTKPDmG3LuWNnmEDAOfCw7ezJgOSZgnqWbZ7hOlns4Fct+7bL65kWwflm9cDaJzrA2u+yLmZFZd5705CPIXm6WcXXLxUQi4CIS6QGMmlhJvo6IhZKeOMvFEicTgq2jCD/8p7YCW7rfn24c8+zsQWbsABM3OdioitVCUQ5YN+vvdmFn53Dg4xPxzlNbaK0/420avHH7K9VPNDGis0zjTExEDXwyUw6ru8EPe7otCLRMWUELoSHRMwzuHYI92Av7N07mT7ejjmmhLIalmzCrNwAGhsJ4psYpLft1Wj3O0bQ20+pxvhhlHAM0I4upW2N2qQXoy/oGNBoNGMJ4CW5cLHEypG6H69imh7BNbwManiAsHfnNsW1zsvY7s93Z2RGxtPHJ6XGymEoyMaJzTOPdjYmYAlix5eqyMWARsAhYBCwCFgGLwM5BoEsrN+8cQG1JLQIWAYuARcAiYBHYugjYgc/WrRvrmUXAImARsAhYBCwCbUbADnzaDKg1ZxGwCFgELAIWAYvA1kXADnzaVDc0eTQNU3VHWJBbZh52QEirx2GY1mZaPc4XRsYxsHMyxiTOyVQM3lyaVmWcTS4GOb1WfXDTYx2liXlXv5cPZHuvAc41t1unEUjbF3B6nCyyPJ1gUu+EzUjn7ckAAl0a+PQ+OzvH7p2EZf3i2RPQ13cCLmtGbZZtO1BLLfxMxTyM9tPqca6ltZlWj/OFq7+L507BwPA+ZD3fBwPHz8DVdW2p99nZkzLFh+JTQxC5t+zsfYPDGC/DMDjQB6efvxqJUjdOmuPay721uuX1kuTnWdj8Udq+gNPjZEaPO8Gk3gmbxgJYQRMCbfkoPtZIj7Oz42J7kmg1gt1brb5pYMZ2cPHWYMl56+dwbNuxeJoSpGQeTs3SbfKDzm8hX5j64xjYOZlebn6rs7MnYYqPjE+uanGlkZmxMVx9uILL0pTEJFGvTCRhdWeN9oZw0+zsbSwmE9c6l9brVmlG6iXIT+fbnn0n+pCUNp01dyw7e3tq9lZbiVjA0LKzhyqFYfcmskpagt7Msl4SY7gw3uTCHPJxeat0BvNoYtsOChP+Tss8nFaPcyutzbR6nC87mp09AEwT27aUJYvPgBnfT8vO7gPDzMTtT9SuY65fknlwdRvNbK5cM+jF5teugik78X1BdBk4PU7Geu+s3GzZ2VmUekYYMfCx7Ozm2osgucQ1WOfH1OqhExNI9oeDnKllh/0PDS1PZgWMzONRAZnaAwMfI9u22QNOkpZ5OK1er/ji+RmuP1X2aAZ2TtY77Oxe6aOY4tn49KlGH1p29qXVsg8ahonbl6r9h+G4pjz4ulU6QWbzeD1KEZ0fSdq5xfdL0WXg9DgZ67sz8LHs7CxKPSOMnONThQwsfeEjcBBXcj1430Nw/117oPbK30IBxiB//BD079kPv3d6CuCZ70IZr/ScDBPjKrMH4AC+K9r9Swdgz9Be2Du0jdaHXS9DYQm7j5H3wK/92kHIIx5/870fAM15XL/6PBz95DAsTz4MsIHLM+M2MCB36p/+YXjP7/wuZHN/hIgDXP4BobmJjWxnBuFbnz8JT40vwfiHHsQTZbihsjYbTqtntogF3UK+MH4OZXIY1U/BPcdPw5knT8Hhk3OY+mdwAyuQk8HQEXiuskY3DiAaZZjOPwXHPvoX4E4PknlegzMPHIZnRmbhCx84yHiRUGSKFyYGPcthX2Lj01OOPKpd/hp88Ok8rNa/CPeFF5KO1On5k3sfgm+tFWH+sd+C/77wZTh2+G44/uSLsr1T2YZzAE899mdw5vzz8F8bvwL3Yd95K7b4uh2Ck98uQ7n8bTjiq7t4vS6WJrYPiS4D2/fE2jSXr4qiT508jowFQ/Bg7uMAhRfgB3LO5h4Yvv1H8PmP/0s4fuJfwhReD6D8U9DdLhcTdK39s0cfgj39e+G3/wW+G3hpFfQ0ULMnVrJpBEJDtAB/iJarkfK4qDgndiY7e5jdm2O/lq+viP8pk5FPgrCyInllCFI/27bGvNV9PPNw9xjRt5IvHo7h+pMyjoGdk3mGtyw7u3Ixmim+lfj0FdU9pHkgmfxMW3inXKM9dqD6xXh29s4WKxzXSeo2itk8iR498ZnK4LzGIOFfmwsZ34dYdvY2Q75jzEW+6gq9kkE4OAZ2TqaQ7H12dhO7t54EOFesEkpieTqPgxv16qRRXROVSgX/cF+cl3OB5oprmIpn21aYpfg3jnkY5yNl5eDLsrNXq3VZD1Rn5WJJXbyrq3I+Vnaq4IBvlvUKOzvHFM/FZ5Los+zsdae9jwn1wisBO3sSYFtIY+qX4usWBy8RzOZxeqb8WnA5edK4/owGYBFlEJweJ+M8c1515adV31CYoX5ePQiw7OwccFtTZhz4RA3mV2fVHBb95GKxTJdwtXEySlFZmnYuuiByk8uOVu/szOzePPu1W0LnSdqyQ6itB0wKS3oS5GfbdrVaPmCZh12G4dbYjFt2wlHYSr6Y6093nop1OTM2K7wZWmZZr7CzJ2aKD8Rnkjq37OwUM1kxvaSfgzNM3EkATZHGHNc+Y5F1a2Y2dzUj9BLl5xrY/AHbh+DAx7Kzbx7jnWjBsrNv+mWhMsCyXxvz4Nm2jWpxgrTMw2n1OH/S2kyrx/lilDEM7Dh7Y71WhzpOHNg7FJivQYug1euYYjAsM+a1GQEfL+licDP+7Fxdjm2bk+1cxDZR8rR9AafHyWJctezsMQD1gLjlgU8PlMm6aBGwCFgELAIWAYuARSASgcivuiJT2pMWAYuARcAiYBGwCFgEehwBO/Dp8Qq07lsELAIWAYuARcAikBwBO/BJjpVNaRGwCFgELAIWAYtAjyNgBz5tqkCOGZvLIi3zN2cTWmYedqyl1eOcSWszrR7jC89QviGZxmtRdNuML1y9czLGTVbEl4FRTVkGxiIuyrmD2dlZYKywrQgwscvmw+lxMtaoFW4HBLo08Nmh7OzIwH6qrw9Z2b2/sy49O8P8vYnISsU8jPml1eNcTWszrZ7RF6yHR7EOBocVo3bf8Sdhxbc86sa1i1hPA5KdfXhwALw64nDZgEvE6i5ZuvfBYN8JuODSunMyo5e8IKYMWjmKiduMZ1o/dy47e23lfFN7Pn7qHFz1xZKuh27tk7ClR8VEEv+i9JLkl8R20jTm2OUtcHqcjLdqpdsGge58w79D2dnlOhgZEcXgzTJ/p66UlMzDqZnUOUe3kC/1sliYXxSltaqoVgpykcKMu5ZURUzQoo4j06KEixpWVpfFctlZbInDRdYtrl67UEIQkLNqFG3oVYw5GQcZJ2PLoBS9taFywluHi6mH1H7uXHb2amES1+4ZE4VyRZSWiXiYYmfOWQxTV2BdrGGsdXxLwJYeHRPxnkXqJcgv3nIrKZjYZc1wepyMNWqF2wiBiAUMLTt7qH45VmKOnV1eWLJioYwX3GpzR6iWup/EJbjUVpobEZCZ9C2eF/Ii9kRa5uG0epxDaW2m1eN8CcrksvzjS/J0vTiNF7KcKFQbor5WEbhzN9YXrt45mWt9cwf+MihL0YzaqcuQ2L0dxs5OAx9sp3poXJzOYfxMNLdbrP8o8s/EkCZNyPVL0kZ0TCjz0czmSmbQi80vqePJ0rGxK01El4HT42SsV3Vc1T2bFfk81TcOdjOjYqnidRZl3wK9tKjlbFFHCGcVCa7HHXtkMzcuCnr1VMxvNDsqCu6CtzMiNzIr465enEUWgBGx5KQtzY8LyI6LkucOl6mVIQIRAx/Lzm6OjChWYoadHTtARRGBQU2BjVQWurGogU80K7g5f16ibOLy+XV1VzM6joMpyLuNx6SdVs9kj86ntZlWj/NFyholMTU2KkbzijdtdlUNOT0+IF1HIKaX1Uq8vC9MvWP3ND9G9vJiYkKtdj61rHu0WE/NCQxlIAUTE3f6Mpjd8CQ7j5296YnP6qIYR8qEzPiCBwkdyRueAC1Mc4o2/4rql8wxoTKPZjYnmSmWPKej8/Pk7TniY5fyiC4Dp8fJWK+xTpF/Vmh29oWJLA42ppwbV/QDZaPz9PQXWQqKy/hEMNnAp7C4JMr4pBmDRvUZeTW4oRjKgBdDym/vxniJ8scBeKEwI68tM05/Jh2w/8QiEDnHx7Kzt/Amk2PGZhi8WebvFrJvSpqWeTitXlPmgR9pbabVC2Qf+mliNncSThcU03pxdgROHv13iiGZ84Wrd04WcqyFE4YysIzaacuQwK0dyc4OuxGZz0E+/ztwz+H3whMvjcCFx49LtFbOP6rm/wwehZegAMeG1dy+s5evJ0CzvUnYmJBZRTObx+u110/WGhe7TBk6x86OTOofVezs7/39P0Ym9efgZWd+F8fAbi4jz+p+J9zpqg4QFrj1qx088Km/gtljn4RM5hEYXyjDh+4dciR2lwiB0NDIeT2zpN/BOAnUiNOyswdZiTl29iC2q1M4Sgdv1C4SMn8H7Zh+e08vFGliQ85H8D+G3+ns7Aq5ysIo1oPCRWGGr7qcx8QNZBynR9U0R4bDk6t3Tmaqu1bP+8vAMWqnLUMSf2geyE5jZ5dPfPSrrkZRzhfLOcSVjXpVzu1ZKy3Iu/V5JCSuruFfx19BIKdcgC2diwldt5adHSmKQ32kRiewd57iLToPbhtFetKSFd51sioKi/NiZpL6FhAjM6sBA+Gf6jV7RswsFcUaToWQBNcYW/LS61yHNbdjaQ7tapk0VRFTOfWUemQ2Pq9w7jv7TOSrLsvOHg4KEyuxngQYyc5eWRVLhbKoN2j+SFFMEpPwmH4sbmb+Duee8Ewc87D76s17hCotx+klzL4pWZzNLvpSxwnNi8slvAA1RAMnCcuJyNlpNU8DiVvpEfbkouLXlp2PHpwyZeDqnZM1YdTCD64MLKN2yjIkcW0nsrOrV13ezcva0oQ7UHYxq9McH/BdFF1J2w9M/RIbE9ILTcDrv3jjQKC6JiqVCv7hvjgvB3BzOIDTYzdTfm0vGBlkYlflF10GVi/WpqEkOBChfqKZnV3fVNZFsVB0Xns1xNwI9vMTag6hwZo8zbK646B6FPMbX6TX7mtihmy6r9YwD/qYIjctyqV5GWuTesIPl6GVuQgYBz7eVyFuWsExsHMysrAT2dk5Bm96Pz1FAyEMbvprZgX3MG/1iGUz3qHs7HogorEGnBi4UPLewZcX6UsdXRc4MXHVm49jxnNNzPknJuL7+Cln8EQdlVnWao2q9HFlcK0G7hTpfLoyuBaNBzuRnV0/8fEeiFfEJD5tyU4VPJwaVbGKF0IvwjxRu48SsaVHxAT1PyZmc9fHCL1E+bkGNn9gjl2ybS4Dp8fJjB47Ax9/P6Fudh0/nKcvSj4iFpPM8cHBzYTvGpCj+Yc5PW+oIRYn826/lM/j2wIc6FDcyac/2IcVnCAsL6rB96JvsrWxHFYgEWiZpJQWZUOyahjcOwQBrmpcz8wsw4DY1huVvd4AGBgK4EILZRkZvBnm782glZZ5OK0e52tam2n1jL7wzOZIwQ7X68izvndvKK6VDGAIY16/Y9fZGOsdE3Ayrd/aPqYMnDEGz/b7yTliZRaBFhFgYpe1xOlxsiij65fh+OA4fKH+AryrgXO2BrGfCHQG62gTu/rIfiLKpD5Xq+FEoYEhGApeUDHBeu06NKQskJlWtvtUCLQ88EmVi1WyCFgELAIWAYtAryJQuwR9w8dgsSrgITuPuFdr0fXbDiNdKOyBRcAiYBGwCFgEIhDAL3RLxRLss4OeCHB675R94tN7dWY9tghYBCwCFoE2I/Dnf/7nRot/8id/YpRZQe8hELmOT+8Vw3psEbAIWAQsAhYBi4BFIB6Bnhj4rL92FS5fugSXV67BRnyZOpqiNV824NXLF+HixYtw6fLVgO+crD1FWL92BVautrJ42gZcu7IC12rtRJlhPWeK2QkWciY7VpTaF9bq1hK2Ftec752Pay739sqwLCuX4dWm9lCDlcsrcL2dTWTTTveKnzhZdwv15ZuG3RroWQS6NPDh2dlrr67ANy9cgG9eXFEr5vrg3Hj1AgweeAccHRmB/+1L3wGcNH/LttZ92YDvf+MZ+Mx73wvHjn4jUDZO1p4ivvzMYcg8+4MWjNXgK4cz8Pm/c5YjbUEzKinHeh6VXp5LyEIepZ+WddnIOM35grJTyPje5/vzs7pH+Xerz0WxbZNPrcc1V5L2xPUVWgX5xHlY57JKJOP7Hm0iOr8afDVzFJ7yt4fay5A5moH/cos6ol7xU+Pq37c3zvyWo49rK+fh0Scv4pdRl+DUo+cD/W+0jj27QxDozmf9Znb2wgzxSQESsI3KBaIg00y2Vpcra3qkgN3xNzqXtL40VqewjB4hqd86J/OnS3NMK0VnJpZbUl0rl0SlLQuQcKznjEsJWMijtVOyLuNCihlawyc/ohYy9HNqcb7INU4yYrZQwkXESqJYLIm1tuAWXbrNnvXWAfIztyuraeOa82lTca0XlfTXBZcZKzP3Pa4ak1+1XG6uV2dtG73St2ujGwe94qcBi07EmSErebowkRG5WVy4dAlJPEfmuaRSdvbsWWH6i1W2CXoKgYgFDLvHzq5oMHIuy6xo4DLcuKDTJK2eiI18NJMRGVwcjAZGGToemZELOAmGuZbQ55hy11bnRF4vVocMu4kWmtqEL+SPJphz1puiU+7GydxETQdIZudfOM/P6IvpivO0mBVhpsg4s5Nq4FOcU2SZJMuPjiry1PykKDtLslZXZ0Q2kxW53Agu4OfzVLIS58TYmF5MKy/miz55k2/eD4713EsVfxRmIY/WSc263ALjdJMvzgVwoVwVVVxuvpUtbXySnhyk4VL5o2MjIj82l3CRPAPbNhfXWCDOzyZZbkL4Q4awMMd1NKO2H7/VGWSsxuX5vWUkA77482NYs6tI4KjwwvaAsZ3FvmTEoZeIy291higCUCebD7QHtYJvTrN040Jyi7oRoVEOlyZZgMGbk2lfo3DZin5qf909F2cd6MtVX6b6P13v1O9lx2bV9cN1rPnANOih83bbXghEDHy6xc5eF9M4yJnAQY57N+oMcuTABxdJpwtKaRFH6zAuini8JllssQLwomNmrmWYctcWZUc4sVCStaieNk0IxcXNVWxaX5RNvcx91OWRk0V7VEdOmGhG30Z5Tg56ppBdvLFWkDxCeuAjGZeRLqMkl9gfEatI4zCCnS+uS6G2Rh15hYpiHDuICf+dNmJNS7VnJxaResNh4x5PsBx7gZ5yqUGr3mvW8+hy+c4yLOS+VE2H6kLbOjO9El7FKQAADTFJREFUZ8TAOG3yxaXc0GUcFUuJVk5NGZ9r6skUxW6j6qz4ikvY+wcHXlmaj8xs20xc4yXCyDjttqMiUoBU1HL6yCqtaQ0od3NcK5xpYO7xHPn8dSgFJvxL8HP5ufG5gIPAqmhizaaYRqwopscXcCVlpGNYCxJnReWH7hDvVrVaEhPG9qDyW5xULNmyHjg/OTxZmYNNr/jpq0rvkImzTvTluHJ2aZk49/Jisbgkb3RnkLKGaDi4zQ58OHS2lyxyjk932NnrUIU8/E5mAP79x08CcpKA+H4D5kYysN6gmYP9MISrIO/7pbfi8VvhAB7v9S1tyTHXmphya6/8LXImA3zz7J/BiRMn4MxfLOGvGbiCU1pWzp9qmq+h526cu0zzXdL7gspqw1tP4xaQ8b6YGX3rP76CWUzCh+7fD/1774MP4+Ozn/omSWTedhfc/ba34zXnfnjH/sNwf3bYc6l/D644egAOBHyhBBQPf/bRh3Cl0r3w2/9iDFmJV+X7ct5PZTqK9TxWz8BCzuoxTM6snodA9JHBF8B1PZ6rrNGNA4hGGabzT8Gxj/6FnJMSl1+a+Ky9cgljdwzyxw9C/9Ah+P0/xueWP31driTN5cezbfNxzftJvhyC/j374fdOTwE8810oBxGMiCVc1xZOfrsM5fK34UjEmihXX/g/4BmYgI8+sNe1ptqtOT8VnxGs2RTTQyqmd//SAdgztBf7kOaly6Lyo4z79+BKukP74K0RZaii/FMnVX4P5j4OUHgBfoDdRJyfJjwpP05G8q3uJxeDm+k/TbiY+3Jc3RwG4Y5f/Agg9364d/A6xtMI3P+ug7B/vxdThKnddi4Czb2Ai8Od7lHzwSDQ9cXbbsAGjVHkZpA5ObyOafY0K0utAWjA6z8FOPQ/7pe/f/ntd8L35VH8PwOOvZ+88gpezH/VURiCj7xQhaMXvwsrf/sf4djhDwIy5cK5D92LchoFjMP010bhjnU67oezX6POHw9//3+H8j/5DB40b4MJV6yK9sVnq/BzmXtEX48dZ7PsMOPL+tXzcM+xL8LM0l/CE+86AK98/eMw90VCN7whg0bztt6A/oP3Qg7+Br8w24BorWYV9etOeItTj3v2vw0HPlX5hRrnJ/yQNHNw9LDqbA6++0H8/VX4Ye0TkGHKp/LbC/cfPw73w3F4cOEVOPC+C/Cn4l7g89uNOD4BJwtjUBYPwODKJTT1MPw6Aj4Um5/KFS1gHQWbRLQvRGyxf7+zxnz/XXDst7IAH/t7Ofme9RPzSBOfdRk9Xhvrv/0O5TT+y+X38tknMUUBTj5wBAoFGvYDHB18FJarX4P7I4NRJsF/uHZEaTxflIbTF/jhC8S1SoeaOKCgLbxC/1U488Fn5E1Q+BJlyM8xGtG1OBKQcR7V9+BwgslPqUe3kYzbHmDgdjcfdWDws5/Dk5OR1a3vJxeDAYAif0b3nxwuhr58oAD/auAoPE254DyJA3ermD88eCNBzEe6Zk9uRwRCD7Dw0WN32NnVI++ZUkOUZmmCM85bGMV3+/RY2veYO/KROctca2bKbZQVky29CqKNHtMvL60mnCdheHzP+uKg60ygnUHyy0Y9MAOWkznq/h3H6NsozUr85oqUR1mywftfdWUmClhofHWF8yfq+N9kNud71UUvKhTh4vgS4eO8uAjEQ2R9+B3Ux/hen16RRbKe6zQRe46FPCK5dyot6zJaMDFOc740KqtiqVDG138NUcdXhJNENoivEuO3lPHpxO6MnExTDbA1m3ONY9smzeg6jfcTn+ahdh1fL+F8Cs12r10xxrUm521mBSe10hz1A+OhV8+63Ubm57zqimbNJqt1MZvHV7WTS3jUEFhd7mbKz01Ar6Dw9XvUq9/m/JTPrJ+Yu5nBm5OZcdlqfnr+RB9Fxhnbf5px0VhH9+UV+Zp/vlIV81j3Y4v8Ky7trX3VpZHY/vvIOT408OkGO7vqeNQcm3p5VRRW6T1sWVR87+FlY8loxlpdIWbmWuzGxTTDlFtqYuLGi5WeMK1NM/vWfdHG6mJxSn29hk9BAnMbOJnW9+1ZRl8hltx81NyT3JSa3FyYyonMpDPwyQYHPkHMlO4U0f9GDXxC9eHzz3fIsZ77kjUduvO9cNBEg+Agk3pT4sCPVKzLaMPEOM35Ui/QHALtI+5xwq0cBwR8Cv8MYt3M5MzFp/4CkvKVk/5xjo+eohXOJ+KMU5fLwbE3fTkZqlPez9VZb7K8nEvhm+CrcjbFNdrFixHpNPcx6qu8sYVyhONCGPNzBj5eXWSFx5qtTFVwUjg+j5P1lXMm++NwQoziOVN+ShMHaaGBT8H7OELaxC/7fDO7jX6y/RKHda/4GVltTSdb7z85XLAGTX15ZR7ncuJgtF7EuvLNY2zyJvzDDnzCmGzXMy1TVhCTc/vY2Wvw/Olh+OBTOZhZeALuv+sOfPE1AO+891DEY3Ds2gIbx1zLMuUiY/r1WgMGBwdhT5BiN5BH0p+cL0lttJKOZ/StIaPvILL9+t87tGK9jWklC7KB9dyYTWdYyI3ZsQLGF4yjGtIxY+ma5p+x5hxh2vikOKsP7IX+0jkYPvw6VMUn8KVU5zbOT64vaNWjay9+Gu5+3yC+pnwc7jIoR+a3Hs+aHWUuSX6wcRVOD7wD7i1U4dR9YZRr13FxUJw3FJg2BJF+Ok5weEbJesXPKIxbOcf1n1G4uLbb2JdbygoX1W1/0PLApxOIXL30PHzl3/41/OjGT3DS47tg8q8+C/eFJwB0Imtr0yLQkwjULj8Jw0d3w5r4FITnw/RkkdI53QnWbFqccjCj5onghPJi47NwaAvcQ4QA6hU/Q45vzRN24LM166UTXm2JgU8nCmZtWgS2MwIbtWtQrAzAvYfURwHbuax82dbh1as/gX2HDrbxyRfZLOOTvH44cBDtbsVBjwSlV/zka3CrSO3AZ6vUROf9sAOfzmNsc7AIWAQsAhYBi4BFYIsgELmOzxbxzbphEbAIWAQsAhYBi4BFoK0I2IFPW+G0xiwCFgGLgEXAImAR2MoI2IHPVq4d65tFwCJgEbAIWAQsAm1FYNfRo//o39x2223wlrfcAf393Pqnbc3XGrMIWAQsAhYBi4BFwCLQdQT6iz/8Afy/K38H66+/ATc3bkIDOShu3rwJb775pvzDBYykU2/iuQ3nj9Jt3HxTpiNOK+gTcBv0yRXCdvXh0S58kCT64Bc36lD7RR1u3FiH199owE20uQsHWXtuvx1u390Pu3b1Qf9tu3DV912wG88N9O+SchqIAf69eROJFTbQD5nvBjSQw4t86yMbe/bA7ajz5psC3njjDfj/MJ/111/H9DfR3z64Dd1qyPJov5FTCYsiy0V79Fa8qVY1kwINPZXH2WTR0JYuH5WrH/92oc+7+vtgd38/+t2PfmOZ0eWbDiYbEkPMBFV39WFa1BkYUJ+GNBo34XX0U4ibeL4fy4B/aOeOQcSE0lB29B9mvnv3bonPm+hoo9GQdURlpDLLWqEsMB3hQXryPJaJzu3atQtuI1/x7zZ0jjRukh6VHfeEA9UHnVP1TVjgeUwgcdH1jj8wGeoJlRdiQ7hQ/rTXvso8EfTbpD9YfSTDv9sHdsFbBnfDW+7YI+uM6lzqoQFBacm3N7GOJD8bGkXFNxG/XYiJlOEpgQ5Q+W/U1+Xf+hs30Z83MW9VLvJCxqn0h3xVedNeFQNrWx0oAYHlbNIX+k0HWKp+jMHduH7+AOZPcUjlIVzof4kN5ku2BOJGcSHzkEJlUOA5sqRw8fJ/E2OD6pGSyqyc/CmfAbzh6Me6p/oiObVBiiH88gBj4Hb8QzmmefPmGxjrDfQJ4+n2AekfYUM+kG+3IXYNbC/1G7i+zy9+Aeu4xtANombBttiPZaK47adYJQewbHegjcHdu+R6VhQvfejfG9jmxE20hb7sGbxD1gOV/01sSxSzt1Hsoy3aOyVWGBAu6AvZljLc03+qH9lQ8SbLhf0A2qL42DP4Fui/nYhCKCbRPupTeqpbwvcmniM8qFzUVigm+okiAnU3NhoyTig9bTJWCAjcqH6UHSdmpU8UI30y5inebqIvtPVTPVNbkW2ayoQxhflTG0En4I0N7BcxNsk3nT+lpXLSH/lNeWG1Yx3gH/VZeE7GANaTrFP1S/olDzEh+ajrQTpC/zj61CY3bjYkBnSa8iM/ZXr8TXUt85TGUE5tyvmP0lN9yRiltJQX+kdYEjzU/5It70/d7FJ61W8RLlQ26Q6ZU347NknQhzhSBWp/KE3wWOVPfmKmlLH8H//Bjf6V5cc9YU959WE/STYIN2WejtQm1Skm6ED6QTuvjG5K0idj7kbp9W88Vurwpq4slKJVdV4KpVnlj6Mn44isOLab9jofmQXlrfSlQW1Wp3H22htKLH2VZSI9co721Ec4fQ76RGlUP0R9HZWGLCCumN615UgU5tII/qNsKrMKO1kXGAtkh/7VMCg9D09q63Stp+uDlEnsnT4W9ZRNlZ7yob756G/8z3TYM9v/D5w9Lgrk0fZJAAAAAElFTkSuQmCC',
+          base64: '<<a long base64 string>',
           fileName: 'sample.png',
           fileType: 'png',
         },
diff --git a/types/react-native-document-picker/index.d.ts b/types/react-native-document-picker/index.d.ts
new file mode 100644
index 0000000000..986da6e611
--- /dev/null
+++ b/types/react-native-document-picker/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for react-native-document-picker 2.0
+// Project: https://github.com/Elyx0/react-native-document-picker
+// Definitions by: Jacob Baskin <https://github.com/plantain-00>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const DocumentPicker: {
+    show(options: Options, callback: (error: Error, result: Result) => void): void;
+};
+
+export const DocumentPickerUtil: {
+    allFiles(): string;
+    pdf(): string;
+    audio(): string;
+    plainText(): string;
+};
+
+export interface Options {
+    top?: number;
+    left?: number;
+    filetype: string[];
+}
+
+export interface Result {
+    uri: string;
+    type: string;
+    fileName: string;
+    fileSize: number;
+}
diff --git a/types/react-native-document-picker/react-native-document-picker-tests.tsx b/types/react-native-document-picker/react-native-document-picker-tests.tsx
new file mode 100644
index 0000000000..a293a20c37
--- /dev/null
+++ b/types/react-native-document-picker/react-native-document-picker-tests.tsx
@@ -0,0 +1,7 @@
+import { DocumentPicker, DocumentPickerUtil } from "react-native-document-picker";
+
+DocumentPicker.show({
+    filetype: [DocumentPickerUtil.allFiles()],
+}, (error, res) => {
+    // do nothing
+});
diff --git a/types/react-native-document-picker/tsconfig.json b/types/react-native-document-picker/tsconfig.json
new file mode 100644
index 0000000000..25f0fcb7b7
--- /dev/null
+++ b/types/react-native-document-picker/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-document-picker-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-document-picker/tslint.json b/types/react-native-document-picker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-document-picker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx b/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx
index d1a8c31168..c194756333 100644
--- a/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx
+++ b/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx
@@ -11,11 +11,11 @@ class DrawerTest extends React.Component<{}, DrawerTestState> {
       open: false
     };
 
-    private onOpen = () => this.setState({ open: true });
+    private readonly onOpen = () => this.setState({ open: true });
 
-    private onClose = () => this.setState({ open: false });
+    private readonly onClose = () => this.setState({ open: false });
 
-    private renderNavigationView = () => (
+    private readonly renderNavigationView = () => (
       <View>
         <Text>Drawer content</Text>
       </View>
diff --git a/types/react-native-drawer/react-native-drawer-tests.tsx b/types/react-native-drawer/react-native-drawer-tests.tsx
index dbc1d06b0e..10aa1991bd 100644
--- a/types/react-native-drawer/react-native-drawer-tests.tsx
+++ b/types/react-native-drawer/react-native-drawer-tests.tsx
@@ -30,11 +30,11 @@ class DrawerTest extends React.Component<{}, {open: boolean}> {
         );
     }
 
-    private onOpen = () => {
+    private readonly onOpen = () => {
       this.setState({open: true});
     }
 
-    private onClose = () => {
+    private readonly onClose = () => {
       this.setState({open: false});
     }
 }
diff --git a/types/react-native-elements/README.md b/types/react-native-elements/README.md
deleted file mode 100644
index 9e3975ecdf..0000000000
--- a/types/react-native-elements/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# [React Native Elements](https://github.com/react-native-training/react-native-elements)
-
-### Component Checklist
-
-- [x] Buttons
-- [x] Badge
-- [x] Social Icons / Social Icon Buttons
-- [x] Icons
-- [x] Side Menu
-- [x] Form Elements
-- [x] SearchBar
-- [x] ButtonGroup
-- [x] CheckBoxes
-- [x] List Element
-- [x] Tab Bar Component
-- [x] HTML style headings
-- [x] Card component
-- [x] Pricing Component
-- [x] Grid Component
-- [x] Slider Component
-- [x] Tile Component
-- [x] Avatar Component
-- [x] Rating Component
-- [x] SwipeDeck Component
-- [x] Header Component
-- [x] Divider
diff --git a/types/react-native-elements/index.d.ts b/types/react-native-elements/index.d.ts
deleted file mode 100644
index d8d6c9d68b..0000000000
--- a/types/react-native-elements/index.d.ts
+++ /dev/null
@@ -1,2248 +0,0 @@
-// Type definitions for react-native-elements 0.16
-// Project: https://github.com/react-native-training/react-native-elements#readme
-// Definitions by: Kyle Roach <https://github.com/iRoachie>
-//                 Ifiok Jr. <https://github.com/ifiokjr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import * as React from 'react';
-import {
-    ViewStyle,
-    TextStyle,
-    Image,
-    ImageStyle,
-    ImageURISource,
-    TouchableWithoutFeedbackProps,
-    TouchableHighlightProperties,
-    TouchableOpacityProperties,
-    ViewProperties,
-    TextInputProperties,
-    TextInput,
-    StatusBarProperties,
-    KeyboardType,
-    KeyboardTypeIOS,
-    StyleProp,
-    GestureResponderEvent,
-    Animated,
-    TransformsStyle
-} from 'react-native';
-import TabNavigator from 'react-native-tab-navigator';
-
-/**
- * Supports auto complete for most used types as well as any other string type.
- */
-export type IconType =
-    | 'material'
-    | 'material-community'
-    | 'simple-line-icon'
-    | 'zocial'
-    | 'font-awesome'
-    | 'octicon'
-    | 'ionicon'
-    | 'foundation'
-    | 'evilicon'
-    | 'entypo'
-    | string;
-
-export interface IconObject {
-    name?: string;
-    color?: string;
-    size?: number;
-    type?: IconType;
-    style?: StyleProp<ViewStyle>;
-}
-
-export interface AvatarIcon extends IconObject {
-    iconStyle?: StyleProp<TextStyle>;
-}
-
-export interface TextProps {
-    /**
-     * font size 40
-     */
-    h1?: boolean;
-
-    /**
-     * font size 34
-     */
-    h2?: boolean;
-
-    /**
-     * font size 28
-     */
-    h3?: boolean;
-
-    /**
-     * font size 22
-     */
-    h4?: boolean;
-
-    /**
-     * font family name
-     */
-    fontFamily?: string;
-
-    /**
-     * Additional styling for Text
-     */
-    style?: StyleProp<TextStyle>;
-}
-
-/**
- * HTML Style Headings
- *
- * @see https://react-native-training.github.io/react-native-elements/API/HTML_style_headings/
- */
-export class Text extends React.Component<TextProps, any> {}
-
-export interface AvatarProps {
-    /**
-     * Component for enclosing element (eg: TouchableHighlight, View, etc)
-     *
-     * @default TouchableOpacity
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * Width for the Avatar
-     *
-     * @default 34
-     */
-    width?: number;
-
-    /**
-     * Height for the Avatar
-     *
-     * @default 34
-     */
-    height?: number;
-
-    /**
-     * Callback function when pressing component
-     */
-    onPress?(): void;
-
-    /**
-     * Callback function when long pressing component
-     */
-    onLongPress?(): void;
-
-    /**
-     * Styling for outer container
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Image source
-     */
-    source?: ImageURISource;
-
-    /**
-     * Style for avatar image
-     */
-    avatarStyle?: ImageStyle;
-
-    /**
-     * Determines the shape of avatar
-     *
-     * @default false
-     */
-    rounded?: boolean;
-
-    /**
-     * Renders title in the avatar
-     */
-    title?: string;
-
-    /**
-     * Style for the title
-     */
-    titleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Style for the view outside image or icon
-     */
-    overlayContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Opacity when pressed
-     *
-     * @default 0.2
-     */
-    activeOpacity?: number;
-
-    /**
-     * Icon for the avatar
-     */
-    icon?: AvatarIcon;
-
-    /**
-     * extra styling for icon component
-     */
-    iconStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Small sized icon
-     */
-    small?: boolean;
-
-    /**
-     * Medium sized icon
-     */
-    medium?: boolean;
-
-    /**
-     * Large sized icon
-     */
-    large?: boolean;
-
-    /**
-     * Extra-large sized icon
-     */
-    xlarge?: boolean;
-}
-
-/**
- * Avatar Component
- *
- * @see https://react-native-training.github.io/react-native-elements/API/avatar/
- */
-export class Avatar extends React.Component<AvatarProps, any> {}
-
-export interface ButtonIcon extends IconObject {
-    buttonStyle?: StyleProp<TextStyle>;
-}
-
-export interface ButtonProps extends TouchableWithoutFeedbackProps {
-    /**
-     * Specify other component such as TouchableOpacity or other
-     *
-     * @default TouchableHighlight (iOS), TouchableNativeFeedback (android)
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * Additional styling for button component
-     *
-     * @default null
-     */
-    buttonStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Button title
-     */
-    title: string;
-
-    /**
-     * Makes button large
-     *
-     * @default false
-     */
-    large?: boolean;
-
-    /**
-     * Specify different font family
-     *
-     * @default System font (iOS), Sans Serif (android)
-     */
-    fontFamily?: string;
-
-    /**
-     * Specify font weight for title
-     *
-     * @default null
-     */
-    fontWeight?: string;
-
-    /**
-     * Moves icon to right of title
-     *
-     * @default false
-     */
-    iconRight?: boolean;
-
-    /**
-     * onPress method
-     */
-    onPress(): void;
-
-    /**
-     * onLongPress method
-     */
-    onLongPress?(): void;
-
-    /**
-     * Icon configuration
-     */
-    icon?: ButtonIcon;
-
-    /**
-     * Specify other icon component instead of default. The component will have all values from the icon prop
-     *
-     * @default MaterialIcon
-     * @see https://github.com/oblador/react-native-vector-icons#icon-component
-     */
-    iconComponent?: JSX.Element;
-
-    /**
-     * Background color of button
-     *
-     * @default #397af8
-     */
-    backgroundColor?: string;
-
-    /**
-     * Adds border radius to button
-     *  (Note: if you set this, don't forget to also set borderRadius to containerViewStyle prop, otherwise unexpected behaviour might occur)
-     *
-     * @default 0
-     */
-    borderRadius?: number;
-
-    /**
-     * Font color
-     *
-     * @default #fff
-     */
-    color?: string;
-
-    /**
-     * Text styling
-     *
-     * @default null
-     */
-    textStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Font size
-     *
-     * @default 18
-     */
-    fontSize?: number;
-
-    /**
-     * Underlay color for button press
-     *
-     * @default transparent
-     */
-    underlayColor?: string;
-
-    /**
-     * Flag to add raised button styling
-     *
-     * @default false
-     */
-    raised?: boolean;
-
-    /**
-     * Indicates button is disabled
-     *
-     * @default false
-     */
-    disabled?: boolean;
-
-    /**
-     * Disabled button styling
-     *
-     * @default null
-     */
-    disabledStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Styling for Component container
-     *
-     * @default null
-     */
-    containerViewStyle?: StyleProp<ViewStyle>;
-}
-
-/**
- * Button component
- *
- * @see https://react-native-training.github.io/react-native-elements/API/buttons/
- */
-export class Button extends React.Component<ButtonProps, any> {}
-
-export interface BadgeProps {
-    /**
-     * Text value to be displayed by badge
-     *
-     * @default null
-     */
-    value?: string | number;
-
-    /**
-     * Style for the outer badge component
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Style for the outer-most badge component
-     */
-    wrapperStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Style for the text in the badge
-     */
-    textStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Override the default badge contents, mutually exclusive with 'value' property
-     */
-    children?: JSX.Element;
-
-    /**
-     * Custom component to replace the badge outer component
-     *
-     * @default View (if onPress then TouchableOpacity)
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * Function called when pressed on the badge
-     */
-    onPress?(): void;
-}
-
-/**
- * Badge component
- *
- * @see https://react-native-training.github.io/react-native-elements/API/badge/
- */
-export class Badge extends React.Component<BadgeProps, any> {}
-
-export interface CardProps {
-    /**
-     * Flex direction (row or column)
-     *
-     * @default 'column'
-     */
-    flexDirection?: 'column' | 'row';
-
-    /**
-     * Outer container style
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Inner container style
-     */
-    wrapperStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Card title
-     */
-    title?: string;
-
-    /**
-     * Additional title styling (if title provided)
-     */
-    titleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Title rendered over the image
-     * (only works if image prop is present)
-     */
-    featuredTitle?: string;
-
-    /**
-     * Styling for featured title
-     */
-    featuredTitleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Subtitle rendered over the image
-     * (only works if image prop is present)
-     */
-    featuredSubtitle?: string;
-
-    /**
-     * Styling for featured subtitle
-     */
-    featuredSubtitleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Additional divider styling
-     * (if title provided)
-     */
-    dividerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Specify different font family
-     *
-     * @default System font bold (iOS), Sans Serif Bold (android)
-     */
-    fontFamily?: string;
-
-    /**
-     * Specify image styling if image is provided
-     */
-    imageStyle?: ImageStyle;
-
-    /**
-     * Specify styling for view surrounding image
-     */
-    imageWrapperStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Add an image as the heading with the image prop
-     */
-    image?: ImageURISource;
-}
-
-/**
- * Card component
- *
- * @see https://react-native-training.github.io/react-native-elements/API/card/
- */
-export class Card extends React.Component<CardProps, any> {}
-
-/**
- * Set the buttons within a Group.
- */
-export interface ElementObject {
-    element: JSX.Element | React.ReactType;
-}
-
-/**
- * Set the border styles for a component.
- */
-export interface InnerBorderStyleProperty {
-    color?: string;
-    width?: number;
-}
-
-export interface ButtonGroupProps {
-    /**
-     * Current selected index of array of buttons
-     */
-    selectedIndex: number;
-
-    /**
-     * Method to update Button Group Index
-     */
-    onPress(selectedIndex: number): void;
-
-    /**
-     * Array of buttons for component, if returning a component, must be an object with { element: componentName }
-     */
-    buttons: string[] | ElementObject[];
-
-    /**
-     * Choose other button component such as TouchableOpacity
-     *
-     * @default TouchableHighlight
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * Specify styling for main button container
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * inherited styling	specify styling for button
-     */
-    buttonStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Specify color for selected state of button
-     *
-     * @default 'white'
-     */
-    selectedBackgroundColor?: string;
-
-    /**
-     * Specify specific styling for text
-     */
-    textStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Specify specific styling for text in the selected state
-     */
-    selectedTextStyle?: StyleProp<TextStyle>;
-
-    /**
-     * inherited styling	object { width, color }	update the styling of the interior border of the list of buttons
-     */
-    innerBorderStyle?: InnerBorderStyleProperty;
-
-    /**
-     * Specify underlayColor for TouchableHighlight
-     *
-     * @default 'white'
-     */
-    underlayColor?: string;
-
-    /**
-     * Disables the currently selected button if true
-     *
-     * @default false
-     */
-    disableSelected?: boolean;
-
-    /**
-     * Determines what the opacity of the wrapped view should be when touch is active.
-     */
-    activeOpacity?: number;
-
-    /**
-     * Border radius for the container
-     */
-    containerBorderRadius?: number;
-
-    /**
-     * Styling for the final border edge
-     */
-    lastBorderStyle?: StyleProp<TextStyle | ViewStyle>;
-
-    /**
-     *
-     * Called immediately after the underlay is hidden
-     */
-    onHideUnderlay?(): void;
-
-    /**
-     * Called immediately after the underlay is shown
-     */
-    onShowUnderlay?(): void;
-
-    /**
-     * Animate the touchable to a new opacity.
-     */
-    setOpacityTo?(value: number): void;
-}
-
-export class ButtonGroup extends React.Component<ButtonGroupProps, any> {}
-
-export interface CheckBoxProps {
-    /**
-     * Icon family, can be one of the following
-     * (required only if specifying an icon that is not from font-awesome)
-     */
-    iconType?: IconType;
-
-    /**
-     *  Specify React Native component for main button
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * Flag for checking the icon
-     *
-     * @default false
-     */
-    checked: boolean;
-
-    /**
-     * Moves icon to right of text.
-     *
-     * @default false
-     */
-    iconRight?: boolean;
-
-    /**
-     * Aligns checkbox to right
-     *
-     * @default false
-     */
-    right?: boolean;
-
-    /**
-     * Aligns checkbox to center
-     *
-     *  @default false
-     */
-    center?: boolean;
-
-    /**
-     * Title of checkbox
-     */
-    title?: string | JSX.Element;
-
-    /**
-     * Style of main container
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * style of text
-     */
-    textStyle?: StyleProp<TextStyle>;
-
-    /**
-     * onLongPress function for checkbox
-     */
-    onLongPress?(): void;
-
-    /**
-     * onLongPress function for checkbox
-     */
-    onLongIconPress?(): void;
-
-    /**
-     * onPress function for container
-     */
-    onPress?(): void;
-
-    /**
-     * onPress function for checkbox
-     */
-    onIconPress?(): void;
-
-    /**
-     * Default checked icon (Font Awesome Icon)
-     *
-     * @default 'check-square-o'
-     */
-    checkedIcon?: string;
-
-    /**
-     * Default checked icon (Font Awesome Icon)
-     *
-     * @default 'square-o'
-     */
-    uncheckedIcon?: string;
-
-    /**
-     * Default checked color
-     *
-     * @default 'green'
-     */
-    checkedColor?: string;
-
-    /**
-     * Default unchecked color
-     * @default '#bfbfbf'
-     */
-    uncheckedColor?: string;
-
-    /**
-     * Specify a custom checked message
-     */
-    checkedTitle?: string;
-
-    /**
-     * Specify different font family
-     * @default 'System font bold (iOS)'
-     * @default 'Sans Serif Bold (android)'
-     */
-    fontFamily?: string;
-}
-export class CheckBox extends React.Component<CheckBoxProps, any> {}
-
-export interface DividerProps {
-    /**
-     * Style the divider
-     *
-     * @default {height: 1, backgroundColor: #e1e8ee}
-     */
-    style?: StyleProp<ViewStyle>;
-}
-
-export class Divider extends React.Component<DividerProps, any> {}
-
-export interface FormValidationMessageProps extends ViewProperties {
-    /**
-     * Style of the container
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Style of the text within the label message
-     */
-    labelStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Font family for the message
-     */
-    fontFamily?: string;
-}
-export class FormValidationMessage extends React.Component<
-    FormValidationMessageProps,
-    any
-> {}
-
-export interface FormInputProps extends TextInputProperties {
-    /**
-     * TextInput container styling
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * TextInput styling
-     */
-    inputStyle?: StyleProp<TextStyle>;
-
-    /**
-     * @deprecated
-     * Get ref of TextInput
-     */
-    textInputRef?(ref: TextInput): void;
-
-    /**
-     * @deprecated
-     * Get ref of TextInput container
-     */
-    containerRef?(ref: any): void;
-
-    /**
-     * Shake the TextInput if not a falsy value and different from the previous value
-     */
-    shake?: any;
-}
-
-export class FormInput extends React.Component<FormInputProps, any> {
-    /**
-     * Holds reference to the stored input.
-     */
-    input: TextInput;
-
-    /**
-     * Shake the TextInput
-     *
-     * eg `this.formInputRef.shake()`
-     */
-    shake(): void;
-
-    /**
-     * Call focus on the TextInput
-     */
-    focus(): void;
-
-    /**
-     * Call blur on the TextInput
-     */
-    blur(): void;
-
-    /**
-     * Call clear on the TextInput
-     */
-    clearText(): void;
-}
-
-export interface FormLabelProps extends ViewProperties {
-    /**
-     * Additional label container style
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Additional label styling
-     */
-    labelStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Specify different font family
-     *
-     * @default System font bold (iOS), Sans Serif Bold (android)
-     */
-    fontFamily?: string;
-}
-
-export class FormLabel extends React.Component<FormLabelProps, any> {}
-
-export interface GridProps extends ViewProperties {
-    /**
-     * Outer grid styling
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Opacity on pressing
-     *
-     * @type {number}
-     * @memberof GridProps
-     */
-    activeOpacity?: number;
-
-    /**
-     * onPress method
-     */
-    onPress?(): void;
-
-    children: React.ReactNode;
-}
-
-/**
- * @deprecated
- * Warning: Grid has been deprecated and will be removed in a future version of React Native Elements
- *
- * @see https://react-native-training.github.io/react-native-elements/API/grid
- */
-export class Grid extends React.Component<GridProps, any> {}
-
-export interface SubGridProps extends ViewProperties {
-    /**
-     * Size for column or row
-     */
-    size?: number;
-
-    /**
-     * Opacity on pressing
-     *
-     * @default 1
-     */
-    activeOpacity?: number;
-
-    /**
-     * Styling for the outer column or row
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * onPress method
-     */
-    onPress?(): void;
-}
-
-/**
- * @deprecated
- * Warning: Row has been deprecated and will be removed in a future version of React Native Elements
- * @see https://react-native-training.github.io/react-native-elements/API/grid/#row
- */
-export class Row extends React.Component<SubGridProps, any> {}
-
-/**
- * @deprecated
- * Warning: Col has been deprecated and will be removed in a future version of React Native Elements
- *
- * @see https://react-native-training.github.io/react-native-elements/API/grid/#column
- *
- */
-export class Col extends React.Component<SubGridProps, any> {}
-
-export interface HeaderIcon extends IconObject {
-    icon?: string;
-}
-
-/**
- * Defines the types that can be used in a header sub component
- */
-export type HeaderSubComponent = JSX.Element | TextProps | HeaderIcon;
-
-export interface HeaderProps extends ViewProperties {
-    /**
-     * Accepts all props for StatusBar
-     */
-    statusBarProps?: StatusBarProperties;
-
-    /**
-     * Configuration object for default component (icon: string, ...props for React Native Elements Icon) or a valid React Element	define your left component here
-     */
-    leftComponent?: HeaderSubComponent;
-
-    /**
-     * Configuration object for default component (text: string, ...props for React Native Text component) valid React Element	define your center component here
-     */
-    centerComponent?: HeaderSubComponent;
-
-    /**
-     * Configuration object for default component (icon: string, ...props for React Native Elements Icon component) or a valid React Element	define your right component here
-     */
-    rightComponent?: HeaderSubComponent;
-
-    /**
-     * Sets backgroundColor of the parent component
-     */
-    backgroundColor?: string;
-
-    /**
-     * Styling for outer container
-     */
-    outerContainerStyles?: StyleProp<ViewStyle>;
-
-    /**
-     * Styling for inner container
-     */
-    innerContainerStyles?: StyleProp<ViewStyle>;
-}
-
-/**
- * Header component
- * @see https://react-native-training.github.io/react-native-elements/API/header/
- */
-export class Header extends React.Component<HeaderProps, any> {}
-
-export interface IconProps {
-    /**
-     * Name of icon
-     */
-    name: string;
-
-    /**
-     * Type (defaults to material, options are material-community, zocial, font-awesome, octicon, ionicon, foundation, evilicon, simple-line-icon, or entypo)
-     * @default 'material'
-     */
-    type?: IconType;
-
-    /**
-     * Size of icon
-     * @default 26
-     */
-    size?: number;
-
-    /**
-     * Color of icon
-     *
-     * @default 'black'
-     */
-    color?: string;
-
-    /**
-     * Additional styling to icon
-     */
-    iconStyle?: StyleProp<TextStyle | ViewStyle>;
-
-    /**
-     * View if no onPress method is defined, TouchableHighlight if onPress method is defined	React Native component	update React Native Component
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * onPress method for button
-     */
-    onPress?(): void;
-
-    /**
-     * onLongPress method for button
-     */
-    onLongPress?(): void;
-
-    /**
-     * UnderlayColor for press event
-     */
-    underlayColor?: string;
-
-    /**
-     * Reverses color scheme
-     *
-     * @default false
-     */
-    reverse?: boolean;
-
-    /**
-     * Adds box shadow to button
-     *
-     * @default false
-     */
-    raised?: boolean;
-
-    /**
-     * Add styling to container holding icon
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Specify reverse icon color
-     *
-     * @default 'white'
-     */
-    reverseColor?: string;
-}
-
-/**
- * Icon component
- * @see https://react-native-training.github.io/react-native-elements/API/icons/
- */
-export class Icon extends React.Component<IconProps, any> {}
-
-export interface ListProps extends ViewProperties {
-    /**
-     * Style the list container
-     * @default '{marginTop: 20, borderTopWidth: 1, borderBottomWidth: 1, borderBottomColor: #cbd2d9}'
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-}
-
-/**
- * List component
- * @see https://react-native-training.github.io/react-native-elements/API/lists/
- */
-export class List extends React.Component<ListProps, any> {}
-
-export interface ListItemProps {
-    /**
-     * Left avatar. This is the React Native Image source prop. Avatar can be used in parallel to leftIcon if needed.
-     */
-    avatar?: string | ImageURISource;
-
-    /**
-     * Avatar styling. This is the React Native Image style prop
-     */
-    avatarStyle?: ImageStyle;
-
-    /**
-     * Avatar outer container styling
-     */
-    avatarContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Avatar overlay container styling
-     */
-    avatarOverlayContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Set chevron color
-     *
-     * @default '#bdc6cf'
-     */
-    chevronColor?: string;
-
-    /**
-     * View or TouchableHighlight if onPress method is added as prop
-     * Replace element with custom element
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * Additional main container styling
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Additional wrapper styling
-     */
-    wrapperStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Define underlay color for TouchableHighlight
-     *
-     * @default 'white'
-     */
-    underlayColor?: string;
-
-    /**
-     * Specify different font family
-     *
-     * @default 'HelevticaNeue' (iOS)
-     * @default 'Sans Serif' (android)
-     */
-    fontFamily?: string;
-
-    /**
-     * Set if you do not want a chevron
-     *
-     * @default false
-     */
-    hideChevron?: boolean;
-
-    /**
-     * onPress method for link
-     */
-    onPress?(): void;
-
-    /**
-     * onLongPress method for link
-     */
-    onLongPress?(): void;
-
-    /**
-     * Make left avatar round
-     *
-     * @default false
-     */
-    roundAvatar?: boolean;
-
-    /**
-     * Main title for list item, can be text or custom view
-     */
-    title?: string;
-
-    /**
-     * Number of lines for title
-     *
-     * @default 1
-     */
-    titleNumberOfLines?: number;
-
-    /**
-     * Additional title styling
-     */
-    titleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Provide styling for title container
-     */
-    titleContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Subtitle text or custom view
-     */
-    subtitle?: string | JSX.Element;
-
-    /**
-     * Number of lines for Subtitle
-     *
-     * @default	1
-     */
-    subtitleNumberOfLines?: number;
-
-    /**
-     * Provide styling for subtitle container
-     */
-    subtitleContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Additional subtitle styling
-     */
-    subtitleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Provide a rightTitle to have a title show up on the right side of the button
-     */
-    rightTitle?: string;
-
-    /**
-     * Number of lines for Right Title
-     *
-     * @default 1
-     */
-    rightTitleNumberOfLines?: number;
-
-    /**
-     * Style the outer container of the rightTitle text
-     *
-     * @default "{flex: 1, alignItems: 'flex-end', justifyContent: 'center'}""
-     */
-    rightTitleContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Style the text of the rightTitle text
-     *
-     * @default "{marginRight: 5, color: '#bdc6cf'}"
-     */
-    rightTitleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Add a label with your own styling by providing a label={} prop to ListItem
-     */
-    label?: JSX.Element;
-
-    /**
-     * Icon configuration for left icon, either a name from the icon library (like material) or a React Native element like Image.
-     * leftIcon can be used in parallel to avatar if needed.
-     * {name, color, style, type}
-     * (type defaults to material icons) OR React Native element
-     */
-    leftIcon?: IconObject | JSX.Element;
-
-    /**
-     * Attaches an onPress on left Icon
-     */
-    leftIconOnPress?(): void;
-
-    /**
-     * Attaches an onLongPress on left Icon
-     */
-    leftIconOnLongPress?(): void;
-
-    /**
-     * Underlay color for left Icon
-     *
-     * @default	'white'
-     */
-    leftIconUnderlayColor?: string;
-
-    /**
-     * {name: 'chevron-right'}	object {name, color, style, type} (type defaults to material icons) OR
-     * React Native element	icon configuration for right icon, either a name from the icon library (like material) or a React Native element like Image.
-     * Shows up unless hideChevron is set
-     */
-    rightIcon?: IconObject | JSX.Element;
-
-    /**
-     * Attaches an onPress on right Icon
-     */
-    onPressRightIcon?(): void;
-
-    /**
-     * Add a switch to the right side of your component
-     *
-     * @default false
-     */
-    switchButton?: boolean;
-
-    /**
-     * Add a callback function when the switch is toggled
-     */
-    onSwitch?(value: boolean): void;
-
-    /**
-     * If true the user won't be able to toggle the switch. Default value is false.
-     * @default false
-     */
-    switchDisabled?: boolean;
-
-    /**
-     * Background color when the switch is turned on.
-     */
-    switchOnTintColor?: string;
-
-    /**
-     * Color of the foreground switch grip.
-     */
-    switchThumbTintColor?: string;
-
-    /**
-     * Border color on iOS and background color on Android when the switch is turned off.
-     */
-    switchTintColor?: string;
-
-    /**
-     * The value of the switch. If true the switch will be turned on. Default value is false.
-     *
-     * @default false
-     */
-    switched?: boolean;
-
-    /**
-     * Whether to have the right title area be an input text component.
-     *
-     * @default false
-     */
-    textInput?: boolean;
-
-    /**
-     * Can tell TextInput to automatically capitalize certain characters.
-     */
-    textInputAutoCapitalize?: boolean;
-
-    /**
-     * Can tell TextInput to automatically capitalize certain characters.
-     */
-    textInputAutoCorrect?: boolean;
-
-    /**
-     * If true, focuses the input on componentDidMount. The default value is false.
-     */
-    textInputAutoFocus?: boolean;
-
-    /**
-     * If false, text is not editable. The default value is true.
-     */
-    textInputEditable?: boolean;
-
-    /**
-     * 	Can be one of the following:
-     * 'default', 'email-address', 'numeric', 'phone-pad', 'ascii-capable', 'numbers-and-punctuation', 'url', 'number-pad', 'name-phone-pad', 'decimal-pad', 'twitter', 'web-search'
-     */
-    textInputKeyboardType?: KeyboardType | KeyboardTypeIOS;
-
-    /**
-     * Limits the maximum number of characters that can be entered.
-     */
-    textInputMaxLength?: number;
-
-    /**
-     * If true, the text input can be multiple lines. The default value is false.
-     */
-    textInputMultiline?: boolean;
-
-    /**
-     * 	Callback that is called when the text input's text changes. Changed text is passed as an argument to the callback handler.
-     */
-    textInputOnChangeText?(text: string): void;
-
-    /**
-     * 	Callback that is called when the text input is focused.
-     */
-    textInputOnFocus?(): void;
-
-    /**
-     * Manually set value of the input
-     */
-    textInputValue?: string;
-
-    /**
-     * If true, obscures the text entered so that sensitive text like passwords stay secure.
-     */
-    textInputSecure?: boolean;
-
-    /**
-     * 	Style for the input text
-     */
-    textInputStyle?: StyleProp<TextStyle>;
-
-    /**
-     * 	Style for the container surrounding the input text
-     */
-    textInputContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Placeholder for the text input
-     */
-    textInputPlaceholder?: string;
-
-    /**
-     * 	Callback that is called when the text input is blurred.
-     */
-    textInputOnBlur?(): void;
-
-    /**
-     * If true, all text will automatically be selected on focus.
-     */
-    textInputSelectTextOnFocus?: boolean;
-
-    /**
-     * Determines how the return key should look. For more info see the React Native docs
-     */
-    textInputReturnKeyType?: string;
-
-    /**
-     * Add a badge to the ListItem by using this prop
-     *
-     */
-    badge?: BadgeProps | ElementObject;
-}
-
-/**
- * ListItem component
- * @see https://react-native-training.github.io/react-native-elements/API/lists/
- */
-export class ListItem extends React.Component<ListItemProps, any> {}
-
-export interface ButtonInformation {
-    title: string;
-    icon: string;
-    buttonStyle?: StyleProp<ViewStyle>;
-}
-
-export interface PricingCardProps {
-    /**
-     * Title
-     */
-    title?: string;
-
-    /**
-     * Price
-     */
-    price: string;
-
-    /**
-     * Color scheme for button & title
-     */
-    color: string;
-
-    /**
-     * Pricing information
-     */
-    info?: string[];
-
-    /**
-     * {title, icon, buttonStyle}
-     * Button information
-     */
-    button: ButtonInformation;
-
-    /**
-     * Function to be run when button is pressed
-     */
-    onButtonPress?(): void;
-
-    /**
-     * Outer component styling
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Inner wrapper component styling
-     */
-    wrapperStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Specify title font family
-     *
-     * System font (font weight 800) (iOS)
-     * Sans Serif Black (android)
-     */
-    titleFont?: string;
-
-    /**
-     * Specify pricing font family
-     *
-     * System font (font weight 700) (iOS)
-     * Sans Serif Bold (android)
-     */
-    pricingFont?: string;
-
-    /**
-     * Specify pricing information font family
-     *
-     * System font bold (iOS)
-     * Sans Serif Bold (android)
-     */
-    infoFont?: string;
-
-    /**
-     * Specify button font family
-     *
-     * System font (iOS)
-     * Sans Serif (android)
-     */
-    buttonFont?: string;
-}
-
-/**
- * PricingCard component
- * @see https://react-native-training.github.io/react-native-elements/API/pricing/
- */
-export class PricingCard extends React.Component<PricingCardProps, any> {}
-
-export interface RatingProps {
-    /**
-     * Callback method when the user finishes rating. Gives you the final rating value as a whole number
-     */
-    onFinishRating(rating: number): void;
-
-    /**
-     * Choose one of the built-in types: star, rocket, bell, heart or use type custom to render a custom image
-     */
-    type?: 'star' | 'rocket' | 'bell' | 'heart' | 'custom';
-
-    /**
-     * Pass in a custom image source; use this along with type='custom' prop above
-     */
-    ratingImage?: ImageURISource | string | number;
-
-    /**
-     * Pass in a custom fill-color for the rating icon; use this along with type='custom' prop above
-     *
-     * @default '#f1c40f'
-     */
-    ratingColor?: string;
-
-    /**
-     * Pass in a custom background-fill-color for the rating icon; use this along with type='custom' prop above
-     *
-     * @default 'white'
-     */
-    ratingBackgroundColor?: string;
-
-    /**
-     * Number of rating images to display
-     *
-     * @default 5
-     */
-    ratingCount?: number;
-
-    /**
-     * The size of each rating image
-     *
-     * @default 50
-     */
-    imageSize?: number;
-
-    /**
-     * Displays the Built-in Rating UI to show the rating value in real-time
-     */
-    showRating?: boolean;
-
-    /**
-     * Whether the rating can be modiefied by the user
-     *
-     * @default false
-     */
-    readonly?: boolean;
-
-    /**
-     * The initial rating to render
-     *
-     * @default ratingCount/2
-     */
-    startingValue?: number;
-
-    /**
-     * The number of decimal places for the rating value; must be between 0 and 20
-     *
-     * @default undefined
-     */
-    fractions?: number;
-
-    /**
-     * Exposes style prop to add additonal styling to the container view
-     */
-    style?: StyleProp<ViewStyle>;
-}
-
-/**
- * Rating component
- * @see https://react-native-training.github.io/react-native-elements/API/rating/
- */
-export class Rating extends React.Component<RatingProps, any> {}
-
-export interface SearchBarProps extends TextInputProperties {
-    /**
-     * TextInput container styling
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * TextInput styling
-     */
-    inputStyle?: StyleProp<TextStyle>;
-
-    /**
-     * @deprecated
-     * Get ref of TextInput
-     */
-    textInputRef?(ref: TextInput): void;
-
-    /**
-     * @deprecated
-     * Get ref of TextInput container
-     */
-    containerRef?(ref: any): void;
-
-    /**
-     * Specify color, styling, or another Material Icon Name
-     */
-    icon?: IconObject;
-
-    /**
-     * Remove icon from textinput
-     *
-     * @default false
-     */
-    noIcon?: boolean;
-
-    /**
-     * @default false		change theme to light theme
-     */
-    lightTheme?: boolean;
-
-    /**
-     * Change TextInput styling to rounded corners
-     *
-     * @default false
-     */
-    round?: boolean;
-
-    /**
-     * Specify other than the default transparent underline color
-     *
-     * @default 'transparent'
-     */
-    underlineColorAndroid?: string;
-
-    /**
-     * Specify color, styling of the loading ActivityIndicator effect
-     *
-     * @default "{ color: '#86939e' }"
-     */
-    loadingIcon?: IconObject;
-
-    /**
-     * Show the loading ActivityIndicator effect
-     *
-     * @default false
-     */
-    showLoadingIcon?: boolean;
-
-    /**
-     * Set the placeholder text
-     *
-     * @default ''
-     */
-    placeholder?: string;
-
-    /**
-     * Set the color of the placeholder text
-     *
-     * @default '#86939e'
-     */
-    placeholderTextColor?: string;
-
-    /**
-     * Method to fire when text is changed
-     */
-    onChangeText?(text: string): void;
-
-    /**
-     * Specify color, styling, or another Material Icon Name
-     * (Note: pressing on this icon clears text inside the searchbar)
-     *
-     * @default "{ color: '#86939e', name: 'search' }"
-     */
-    clearIcon?: IconObject;
-}
-
-/**
- * SearchBar component
- * @see https://react-native-training.github.io/react-native-elements/API/searchbar/
- */
-export class SearchBar extends React.Component<SearchBarProps, any> {
-    /**
-     * Holds reference to the stored input.
-     */
-    input: TextInput;
-
-    /**
-     * Call focus on the TextInput
-     */
-    focus(): void;
-
-    /**
-     * Call blur on the TextInput
-     */
-    blur(): void;
-
-    /**
-     * Call clear on the TextInput
-     */
-    clearText(): void;
-}
-
-export interface SideMenuProps {
-    /**
-     * Menu component
-     */
-    menu: JSX.Element;
-
-    /**
-     * Props driven control over menu open state
-     *
-     * @default false
-     */
-    isOpen?: boolean;
-
-    /**
-     * Content view left margin if menu is opened
-     *
-     * @default â…” of device screen width
-     */
-    openMenuOffset?: number;
-
-    /**
-     * Content view left margin if menu is hidden
-     */
-    hiddenMenuOffset?: number;
-
-    /**
-     * Edge distance on content view to open side menu
-     *
-     * @default 60
-     */
-    edgeHitWidth?: number;
-
-    /**
-     * X axis tolerance
-     */
-    toleranceX?: number;
-
-    /**
-     * Y axis tolerance
-     */
-    toleranceY?: number;
-
-    /**
-     * Disable whether the menu can be opened with gestures or not
-     *
-     * @default false
-     */
-    disableGestures?: boolean;
-
-    /**
-     * Function that accepts event as an argument and specify if side-menu should react on the touch or not.
-     * Check https://facebook.github.io/react-native/docs/gesture-responder-system.html for more details
-     */
-    onStartShouldSetResponderCapture?(event: GestureResponderEvent): boolean;
-
-    /**
-     * Callback on menu open/close. Is passed isOpen as an argument.
-     */
-    onChange?(isOpen: boolean): void;
-
-    /**
-     * Callback on menu move. Is passed left as an argument
-     */
-    onMove?(left: number): void;
-
-    /**
-     * Either 'left' or 'right'.
-     *
-     * @default 'left'
-     */
-    menuPosition?: string;
-
-    /**
-     * Function that accept 2 arguments (prop, value) and return an object:
-     * - animation you should use at the place you specify parameter to animate
-     * - newOffset you should use to specify the final value of prop
-     */
-    animationFunction?(
-        animation: Animated.Value,
-        newOffset: number
-    ): Animated.CompositeAnimation;
-
-    /**
-     * Function that accept 1 argument (value) and return an object
-     * - leftOffset you should use at the place you need current value of animated parameter (left offset of content view)
-     */
-    animationStyle?(leftOffset: number): StyleProp<TransformsStyle>;
-
-    /**
-     * When true, content view will bounce back to openMenuOffset when dragged further
-     *
-     * @default true
-     */
-    bounceBackOnOverdraw?: boolean;
-}
-
-/**
- * @deprecated
- * Warning: SideMenu has been deprecated and will be removed in a future version of React Native Elements. For a complete navigation solution that includes SideMenu(Drawer) as well as many other
- * features, be sure to check out react-navigation (https://reactnavigation.org) and it's DrawerNavigator.
- *
- * SideMenu component
- * @see https://react-native-training.github.io/react-native-elements/API/side_menu/
- */
-export class SideMenu extends React.Component<SideMenuProps, any> {}
-
-export interface SliderProps {
-    /**
-     * Initial value of the slider
-     *
-     * @default 0
-     */
-    value?: number;
-
-    /**
-     * If true the user won't be able to move the slider
-     *
-     * @default false
-     */
-    disabled?: boolean;
-
-    /**
-     * Initial minimum value of the slider
-     *
-     * @default	0
-     */
-    minimumValue?: number;
-
-    /**
-     * Initial maximum value of the slider
-     *
-     * @default 1
-     */
-    maximumValue?: number;
-
-    /**
-     * Step value of the slider. The value should be between 0 and maximumValue - minimumValue)
-     *
-     * @default 0
-     */
-    step?: number;
-
-    /**
-     * The color used for the track to the left of the button
-     *
-     * @default '#3f3f3f'
-     */
-    minimumTrackTintColor?: string;
-
-    /**
-     * The color used for the track to the right of the button
-     *
-     * @default '#b3b3b3'
-     */
-    maximumTrackTintColor?: string;
-
-    /**
-     * The color used for the thumb
-     *
-     * @default '#343434'
-     */
-    thumbTintColor?: string;
-
-    /**
-     * The size of the touch area that allows moving the thumb. The touch area has the same center as the visible thumb.
-     * This allows to have a visually small thumb while still allowing the user to move it easily.
-     *
-     * @default "{width: 40, height: 40}"
-     */
-    thumbTouchSize?: {
-        width?: number;
-        height?: number;
-    };
-
-    /**
-     * Callback continuously called while the user is dragging the slider
-     */
-    onValueChange?(value: number): void;
-
-    /**
-     * Callback called when the user starts changing the value (e.g. when the slider is pressed)
-     */
-    onSlidingStart?(value: number): void;
-
-    /**
-     * Callback called when the user finishes changing the value (e.g. when the slider is released)
-     */
-    onSlidingComplete?(value: number): void;
-
-    /**
-     * The style applied to the slider container
-     */
-    style?: StyleProp<ViewStyle>;
-
-    /**
-     * The style applied to the track
-     */
-    trackStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * The style applied to the thumb
-     */
-    thumbStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Set this to true to visually see the thumb touch rect in green.
-     *
-     * @default false
-     */
-    debugTouchArea?: boolean;
-
-    /**
-     * Set to true if you want to use the default 'spring' animation
-     *
-     * @default false
-     */
-    animateTransitions?: boolean;
-
-    /**
-     * Set to 'spring' or 'timing' to use one of those two types of animations with the default animation properties.
-     *
-     * @default 'timing'
-     */
-    animationType?: 'spring' | 'timing';
-
-    /**
-     * Used to configure the animation parameters. These are the same parameters in the Animated library.
-     *
-     * @default undefined
-     */
-    animationConfig?:
-        | Animated.TimingAnimationConfig
-        | Animated.SpringAnimationConfig;
-}
-
-/**
- * Slider component
- * @see https://react-native-training.github.io/react-native-elements/API/slider/
- */
-export class Slider extends React.Component<SliderProps, any> {}
-
-export type SocialMediaType =
-    | 'facebook'
-    | 'twitter'
-    | 'google-plus-official'
-    | 'pinterest'
-    | 'linkedin'
-    | 'youtube'
-    | 'vimeo'
-    | 'tumblr'
-    | 'instagram'
-    | 'quora'
-    | 'foursquare'
-    | 'wordpress'
-    | 'stumbleupon'
-    | 'github'
-    | 'github-alt'
-    | 'twitch'
-    | 'medium'
-    | 'soundcloud'
-    | 'gitlab'
-    | 'angellist'
-    | 'codepen';
-
-export interface SocialIconProps {
-    /**
-     * Title if made into a button
-     */
-    title?: string;
-
-    /**
-     * Social media type
-     */
-    type: SocialMediaType;
-
-    /**
-     * Adds a drop shadow, set to false to remove
-     *
-     * @default true
-     */
-    raised?: boolean;
-
-    /**
-     * Creates button
-     *
-     * @default false
-     */
-    button?: boolean;
-
-    /**
-     * onPress method
-     */
-    onPress?(): void;
-
-    /**
-     * @default none	function	onLongPress method
-     */
-    onLongPress?(): void;
-
-    /**
-     * Reverses icon color scheme, setting background to white and icon to primary color
-     *
-     * @default false
-     */
-    light?: boolean;
-
-    /**
-     * Extra styling for icon component
-     */
-    iconStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Button styling
-     */
-    style?: StyleProp<ViewStyle>;
-
-    /**
-     * Icon color
-     */
-    iconColor?: string;
-
-    /**
-     * Icon size
-     *
-     * @default 24
-     */
-    iconSize?: number;
-
-    /**
-     * Component Type of button
-     *
-     * @default TouchableHighlight
-     */
-    component?: React.ComponentClass;
-
-    /**
-     * Specify different font family
-     *
-     * @default System font bold (iOS), Sans Serif Black (android)
-     */
-    fontFamily?: string;
-
-    /**
-     * Specify font weight of title if set as a button with a title
-     *
-     * @default bold (ios), black(android)
-     */
-    fontWeight?: string;
-
-    /**
-     * Specify text styling
-     */
-    fontStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Disable button
-     *
-     * @default false
-     */
-    disabled?: boolean;
-
-    /**
-     * Shows loading indicator
-     *
-     * @default false
-     */
-    loading?: boolean;
-}
-
-/**
- * SocialIcon component
- * @see https://react-native-training.github.io/react-native-elements/API/social_icons/
- */
-export class SocialIcon extends React.Component<SocialIconProps, any> {}
-
-export interface SwipeDeckProps<D> {
-    /**
-     * An array of data object which contains each card details.
-     */
-    data: ReadonlyArray<D>;
-
-    /**
-     * A function that takes a card as a prop and renders it with custom UI
-     */
-    renderCard(card: D): JSX.Element;
-
-    /**
-     * A function that renders custom UI when no more cards are present
-     */
-    renderNoMoreCards?(): JSX.Element;
-
-    /**
-     * function	function	A callback function that takes a card as a prop and take the approriate action when the user swipes the card right
-     */
-    onSwipeRight?(card: D): void;
-
-    /**
-     * function	function	A callback function that takes a card as a prop and take the approriate action when the user swipes the card left
-     */
-    onSwipeLeft?(card: D): void;
-}
-
-/**
- * SwipeDeck component
- * @see https://react-native-training.github.io/react-native-elements/API/swipedeck/
- */
-export class SwipeDeck<D = any> extends React.Component<
-    SwipeDeckProps<D>,
-    any
-> {}
-
-/**
- * @deprecated
- * Warning: Tabs has been deprecated and will be removed in a future version of React Native Elements.
- * For a complete navigation solution that includes Tabs as well as many other features, be sure to check out react-navigation (https://reactnavigation.org) and it's TabRouter.
- */
-export class Tabs extends TabNavigator {}
-
-/**
- * @deprecated
- * Warning: Tab has been deprecated and will be removed in a future version of React Native Elements.
- * For a complete navigation solution that includes Tabs as well as many other features, be sure to check out react-navigation (https://reactnavigation.org) and it's TabRouter.
- */
-export class Tab extends TabNavigator.Item {}
-
-export interface TileProps {
-    /**
-     * Icon Component Props
-     */
-    icon?: IconObject;
-
-    /**
-     * Styling for the outer icon container
-     */
-    iconContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Text inside the tile
-     */
-    title?: string;
-
-    /**
-     * Styling for the title
-     */
-    titleStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Text inside the tile when tile is featured
-     */
-    caption?: string;
-
-    /**
-     * Styling for the caption
-     */
-    captionStyle?: StyleProp<TextStyle>;
-
-    /**
-     * Changes the look of the tile
-     */
-    featured?: boolean;
-
-    /**
-     * @default none	object (style)	Styling for the outer tile container
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Source for the image
-     */
-    imageSrc: ImageURISource | string | number;
-
-    /**
-     * Styling for the image
-     */
-    imageContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * @default none	function (event)	Function to call when tile is pressed
-     */
-    onPress?(): void;
-
-    /**
-     * Number passed to control opacity on press
-     *
-     * @default 0.2
-     */
-    activeOpacity?: number;
-
-    /**
-     * Styling for bottom container when not featured tile
-     */
-    contentContainerStyle?: StyleProp<ViewStyle>;
-
-    /**
-     * Width for the tile
-     *
-     * @default Device Width
-     */
-    width?: number;
-
-    /**
-     * Height for the tile
-     *
-     * @default Device Width * 0.8
-     */
-    height?: number;
-}
-
-/**
- * Tile component
- * @see https://react-native-training.github.io/react-native-elements/API/tile/
- */
-export class Tile extends React.Component<TileProps, any> {}
-
-/**
- * Colors
- */
-
-export interface Colors {
-    readonly primary: string;
-    readonly primary1: string;
-    readonly primary2: string;
-    readonly secondary: string;
-    readonly secondary2: string;
-    readonly secondary3: string;
-    readonly grey0: string;
-    readonly grey1: string;
-    readonly grey2: string;
-    readonly grey3: string;
-    readonly grey4: string;
-    readonly grey5: string;
-    readonly dkGreyBg: string;
-    readonly greyOutline: string;
-    readonly searchBg: string;
-    readonly disabled: string;
-    readonly white: string;
-    readonly error: string;
-    readonly [key: string]: string;
-}
-
-export const colors: Colors;
-
-/* Utility Functions */
-
-/**
- * TODO make the Icon Type an export of the react-native-vector-icons type definitions.
- */
-export function getIconType(type: IconType): any;
-
-/**
- * Method to normalize size of fonts across devices
- */
-export function normalize(size: number): number;
diff --git a/types/react-native-elements/react-native-elements-tests.tsx b/types/react-native-elements/react-native-elements-tests.tsx
deleted file mode 100644
index b6a8ba8c83..0000000000
--- a/types/react-native-elements/react-native-elements-tests.tsx
+++ /dev/null
@@ -1,976 +0,0 @@
-import * as React from 'react';
-import {
-    ListView,
-    View,
-    StyleSheet,
-    TouchableNativeFeedback,
-    Image,
-    TextInput,
-    Animated,
-    Dimensions
-} from 'react-native';
-import {
-    Button,
-    Text,
-    Badge,
-    Avatar,
-    Card,
-    ButtonGroup,
-    CheckBox,
-    Divider,
-    FormInput,
-    FormValidationMessage,
-    FormLabel,
-    Header,
-    Icon,
-    List,
-    ListItem,
-    PricingCard,
-    Rating,
-    SearchBar,
-    SideMenu,
-    Slider,
-    SocialIcon,
-    SwipeDeck,
-    Tabs,
-    Tab,
-    Tile,
-    colors,
-    getIconType,
-    normalize
-} from 'react-native-elements';
-
-const { width, height } = Dimensions.get('window');
-
-class TextTest extends React.Component<any, any> {
-    render() {
-        return (
-            <View>
-                <Text h1>Heading 1</Text>
-                <Text h2>Heading 2</Text>
-                <Text h3>Heading 3</Text>
-                <Text h4>Heading 4</Text>
-            </View>
-        );
-    }
-}
-
-class AvatarTest extends React.Component<any, any> {
-    render() {
-        return (
-            <View>
-                <View>
-                    <Text style={AvatarStyles.title}>Avatars</Text>
-                    <Avatar
-                        small
-                        rounded
-                        source={{
-                            uri:
-                                'https://s3.amazonaws.com/uifaces/faces/twitter/ladylexy/128.jpg'
-                        }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                    <Avatar
-                        medium
-                        source={{
-                            uri:
-                                'https://s3.amazonaws.com/uifaces/faces/twitter/kfriedson/128.jpg'
-                        }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                    <Avatar
-                        large
-                        source={{
-                            uri:
-                                'https://s3.amazonaws.com/uifaces/faces/twitter/brynn/128.jpg'
-                        }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                    <Avatar
-                        xlarge
-                        rounded
-                        source={{
-                            uri:
-                                'https://s3.amazonaws.com/uifaces/faces/twitter/adhamdannaway/128.jpg'
-                        }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                </View>
-
-                <View>
-                    <Text style={AvatarStyles.title}>Avatar with initials</Text>
-                    <Avatar
-                        small
-                        rounded
-                        title="MT"
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                    <Avatar
-                        medium
-                        title="BP"
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                    <Avatar
-                        large
-                        title="LW"
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                    <Avatar
-                        xlarge
-                        rounded
-                        title="CR"
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                    />
-                </View>
-
-                <View>
-                    <Text style={AvatarStyles.title}>Avatar with icons</Text>
-                    <Avatar
-                        small
-                        rounded
-                        icon={{ name: 'user' }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                        containerStyle={{
-                            flex: 2,
-                            marginLeft: 20,
-                            marginTop: 115
-                        }}
-                    />
-                    <Avatar
-                        medium
-                        overlayContainerStyle={{ backgroundColor: 'blue' }}
-                        icon={{ name: 'meetup', color: 'red' }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                        containerStyle={{ flex: 3, marginTop: 100 }}
-                    />
-                    <Avatar
-                        large
-                        icon={{ name: 'rocket', color: 'orange' }}
-                        overlayContainerStyle={{ backgroundColor: 'white' }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                        containerStyle={{ flex: 4, marginTop: 75 }}
-                    />
-                    <Avatar
-                        xlarge
-                        rounded
-                        icon={{ name: 'home' }}
-                        onPress={() => console.log('Works!')}
-                        activeOpacity={0.7}
-                        containerStyle={{ flex: 5, marginRight: 60 }}
-                    />
-                </View>
-            </View>
-        );
-    }
-}
-
-const AvatarStyles = StyleSheet.create({
-    title: {
-        fontSize: 30,
-        marginBottom: 10
-    }
-});
-
-class BadgeTest extends React.Component<any, any> {
-    render() {
-        return (
-            <View>
-                <Badge value={3} textStyle={{ color: 'orange' }} />
-
-                <Badge containerStyle={{ backgroundColor: 'violet' }}>
-                    <Text>User 1</Text>
-                </Badge>
-
-                <Badge onPress={() => console.log('pressed')} value="5" />
-
-                <Badge component={TouchableNativeFeedback} value={10} />
-            </View>
-        );
-    }
-}
-
-class ButtonTest extends React.Component<any, any> {
-    handleButtonPress() {
-        console.log('I got pressed');
-    }
-
-    render() {
-        return (
-            <View>
-                <Button
-                    title="BUTTON"
-                    onPress={() => this.handleButtonPress()}
-                />
-
-                <Button
-                    raised
-                    icon={{ name: 'cached' }}
-                    title="BUTTON WITH ICON"
-                    onPress={() => this.handleButtonPress()}
-                />
-
-                <Button
-                    large
-                    iconRight
-                    icon={{ name: 'code' }}
-                    title="LARGE WITH RIGHT ICON"
-                    onPress={() => this.handleButtonPress()}
-                />
-
-                <Button
-                    large
-                    icon={{ name: 'envira', type: 'font-awesome' }}
-                    title="LARGE WITH RIGHT ICON"
-                    onPress={() => this.handleButtonPress()}
-                />
-
-                <Button
-                    large
-                    icon={{
-                        name: 'squirrel',
-                        type: 'octicon',
-                        buttonStyle: ButtonStyles.someButtonStyle
-                    }}
-                    title="OCTICON"
-                    onPress={() => this.handleButtonPress()}
-                />
-            </View>
-        );
-    }
-}
-
-const ButtonStyles = StyleSheet.create({
-    someButtonStyle: {
-        color: 'pink'
-    }
-});
-
-class CardTest extends React.Component<any, any> {
-    render() {
-        const users = [
-            {
-                name: 'brynn',
-                avatar:
-                    'https://s3.amazonaws.com/uifaces/faces/twitter/brynn/128.jpg'
-            }
-        ];
-
-        return (
-            <View>
-                {/* implemented without image with header */}
-                <Card title="CARD WITH DIVIDER">
-                    {users.map((u, i) => {
-                        return (
-                            <View key={i}>
-                                <Image
-                                    resizeMode="cover"
-                                    source={{ uri: u.avatar }}
-                                />
-                                <Text>{u.name}</Text>
-                            </View>
-                        );
-                    })}
-                </Card>
-
-                {/* implemented with Text and Button as children */}
-                <Card title="HELLO WORLD" image={require('../images/pic2.jpg')}>
-                    <Text style={{ marginBottom: 10 }}>
-                        The idea with React Native Elements is more about
-                        component structure than actual design.
-                    </Text>
-                    <Button
-                        onPress={() => {}}
-                        icon={{ name: 'code' }}
-                        backgroundColor="#03A9F4"
-                        fontFamily="Lato"
-                        buttonStyle={{
-                            borderRadius: 0,
-                            marginLeft: 0,
-                            marginRight: 0,
-                            marginBottom: 0
-                        }}
-                        title="VIEW NOW"
-                    />
-                </Card>
-            </View>
-        );
-    }
-}
-
-const component1 = () => <Text>Hello</Text>;
-const component2 = () => <Text>World</Text>;
-const component3 = () => <Text>ButtonGroup</Text>;
-
-class ButtonGroupTest extends React.Component<any, any> {
-    state = {
-        selectedIndexStrings: 2,
-        selectedIndexObjects: 2
-    };
-
-    updateIndexStrings = (selectedIndexStrings: number) => {
-        this.setState({ selectedIndexStrings });
-    }
-
-    updateIndexObjects = (selectedIndexObjects: number) => {
-        this.setState({ selectedIndexObjects });
-    }
-
-    render() {
-        const buttonStrings = ['Hello', 'World', 'Buttons'];
-        const buttonObjects = [
-            { element: component1 },
-            { element: component2 },
-            { element: component3 }
-        ];
-
-        const { selectedIndexStrings, selectedIndexObjects } = this.state;
-        return (
-            <View>
-                <ButtonGroup
-                    onPress={this.updateIndexStrings}
-                    selectedIndex={selectedIndexStrings}
-                    buttons={buttonStrings}
-                    containerStyle={{ height: 100 }}
-                />
-                <ButtonGroup
-                    onPress={this.updateIndexObjects}
-                    selectedIndex={selectedIndexObjects}
-                    buttons={buttonObjects}
-                    containerStyle={{ height: 100 }}
-                    component={TouchableNativeFeedback}
-                />
-            </View>
-        );
-    }
-}
-
-interface CheckBoxTestState {
-    checked: boolean;
-}
-class CheckBoxTest extends React.Component<any, CheckBoxTestState> {
-    state = {
-        checked: false
-    };
-    render() {
-        return (
-            <View>
-                <CheckBox title="Click Here" checked={this.state.checked} />
-
-                <CheckBox
-                    center
-                    title="Click Here"
-                    checked={this.state.checked}
-                />
-
-                <CheckBox
-                    center
-                    title="Click Here"
-                    checkedIcon="dot-circle-o"
-                    uncheckedIcon="circle-o"
-                    checked={this.state.checked}
-                />
-
-                <CheckBox
-                    center
-                    title="Click Here to Remove This Item"
-                    iconRight
-                    iconType="material"
-                    checkedIcon="clear"
-                    uncheckedIcon="add"
-                    checkedColor="red"
-                    checked={this.state.checked}
-                />
-            </View>
-        );
-    }
-}
-
-class DividerTest extends React.Component {
-    render() {
-        return <Divider style={{ backgroundColor: 'blue' }} />;
-    }
-}
-
-class FormTest extends React.Component<any, any> {
-    input: FormInput;
-    onChangeText(text: string) {
-        console.log('changed text', text);
-    }
-
-    storeFormInput = (input: any) => {
-        this.input = input;
-    }
-
-    focus() {
-        this.input.focus();
-    }
-
-    render() {
-        return (
-            <View>
-                <FormLabel>Name</FormLabel>
-                <FormInput
-                    ref={this.storeFormInput}
-                    onChangeText={this.onChangeText}
-                />
-                <FormValidationMessage>Error message</FormValidationMessage>
-            </View>
-        );
-    }
-}
-
-class HeaderTest extends React.Component<any, any> {
-    render() {
-        return (
-            <View>
-                <Header
-                    leftComponent={<View />}
-                    rightComponent={{ icon: 'home', style: { color: '#fff' } }}
-                />
-                <Header>
-                    <View />
-                    <View />
-                    <View />
-                </Header>
-            </View>
-        );
-    }
-}
-
-class IconTest extends React.Component<any, any> {
-    render() {
-        return (
-            <View>
-                <Icon name="rowing" />
-                <Icon name="g-translate" color="#00aced" />
-                <Icon name="sc-telegram" type="evilicon" color="#517fa4" />
-                <Icon
-                    reverse
-                    name="ios-american-football"
-                    type="ionicon"
-                    color="#517fa4"
-                />
-                <Icon
-                    raised
-                    name="heartbeat"
-                    type="font-awesome"
-                    color="#f50"
-                    onPress={() => console.log('hello')}
-                />
-            </View>
-        );
-    }
-}
-
-class ListTest extends React.Component<any, any> {
-    list = [
-        {
-            title: 'Appointments',
-            icon: 'av-timer'
-        },
-        {
-            title: 'Trips',
-            icon: 'flight-takeoff'
-        }
-    ];
-
-    render() {
-        return (
-            <List>
-                {this.list.map((item, i) => (
-                    <ListItem
-                        key={i}
-                        title={item.title}
-                        leftIcon={{ name: item.icon }}
-                    />
-                ))}
-            </List>
-        );
-    }
-}
-
-class PricingCardTest extends React.Component<any, any> {
-    render() {
-        return (
-            <PricingCard
-                color="#4f9deb"
-                title="Free"
-                price="$0"
-                info={['1 User', 'Basic Support', 'All Core Features']}
-                button={{ title: 'GET STARTED', icon: 'flight-takeoff' }}
-            />
-        );
-    }
-}
-
-class RatingTest extends React.Component {
-    ratingCompleted(rating: number) {
-        console.log('Rating is: ' + rating);
-    }
-
-    render() {
-        return (
-            <View>
-                <Rating
-                    showRating
-                    onFinishRating={this.ratingCompleted}
-                    style={{ paddingVertical: 10 }}
-                />
-
-                <Rating
-                    showRating
-                    type="star"
-                    fractions={1}
-                    startingValue={3.6}
-                    readonly
-                    imageSize={40}
-                    onFinishRating={this.ratingCompleted}
-                    style={{ paddingVertical: 10 }}
-                />
-
-                <Rating
-                    type="heart"
-                    ratingCount={3}
-                    fractions={2}
-                    startingValue={1.57}
-                    imageSize={40}
-                    onFinishRating={this.ratingCompleted}
-                    showRating
-                    style={[{ paddingVertical: 10 }]}
-                />
-            </View>
-        );
-    }
-}
-
-class SearchBarTest extends React.Component<any, any> {
-    searchBar: SearchBar;
-    input: TextInput;
-
-    componentDidMount() {
-        this.searchBar.focus();
-    }
-
-    onChangeText = (text: string) => {
-        console.log('text has changed');
-    }
-
-    onChangeTextAction = (text: string) => {
-        if (text === 'awesome') {
-            this.searchBar.blur();
-        }
-        if (text === 'this is fun') {
-            this.searchBar.clearText();
-        }
-    }
-
-    storeRef(ref: SearchBar) {
-        this.searchBar = ref;
-        this.input = this.searchBar.input;
-    }
-
-    render() {
-        return (
-            <View>
-                <SearchBar
-                    onChangeText={this.onChangeTextAction}
-                    placeholder="Type Here..."
-                    ref={this.storeRef}
-                />
-
-                <SearchBar
-                    noIcon
-                    onChangeText={this.onChangeText}
-                    placeholder="Type Here..."
-                />
-
-                <SearchBar
-                    round
-                    onChangeText={this.onChangeText}
-                    placeholder="Type Here..."
-                />
-
-                <SearchBar
-                    lightTheme
-                    onChangeText={this.onChangeText}
-                    placeholder="Type Here..."
-                />
-            </View>
-        );
-    }
-}
-
-interface SideMenuTestListItem {
-    avatarURL: string;
-    name: string;
-    subtitle: string;
-}
-
-interface SideMenuTestState {
-    list: SideMenuTestListItem[];
-    isOpen: boolean;
-}
-class SideMenuTest extends React.Component<any, SideMenuTestState> {
-    state = {
-        list: [
-            {
-                avatarURL: 'https://amy.com/img.jpg',
-                name: 'Amy',
-                subtitle: 'Coding Geek'
-            },
-            {
-                avatarURL: 'https://john.com/img.jpg',
-                name: 'John',
-                subtitle: 'Love cooking'
-            }
-        ],
-        isOpen: false
-    };
-    onSideMenuChange(isOpen: boolean) {
-        this.setState({
-            isOpen
-        });
-    }
-
-    toggleSideMenu = () => {
-        this.setState({
-            isOpen: !this.state.isOpen
-        });
-    }
-
-    animationStyle = (value: number) => ({
-        transform: [
-            {
-                translateX: value
-            }
-        ]
-    })
-
-    animationFunction = (prop: Animated.Value, value: number) =>
-        Animated.spring(prop, {
-            toValue: value,
-            friction: 8
-        })
-
-    render() {
-        const MenuComponent = (
-            <View
-                style={{ flex: 1, backgroundColor: '#ededed', paddingTop: 50 }}
-            >
-                <List containerStyle={{ marginBottom: 20 }}>
-                    {this.state.list.map((l, i) => (
-                        <ListItem
-                            roundAvatar
-                            onPress={() => console.log('Pressed')}
-                            avatar={l.avatarURL}
-                            key={i}
-                            title={l.name}
-                            subtitle={l.subtitle}
-                        />
-                    ))}
-                </List>
-            </View>
-        );
-
-        return (
-            <SideMenu
-                isOpen={this.state.isOpen}
-                onChange={this.onSideMenuChange}
-                menu={MenuComponent}
-                animationStyle={this.animationStyle}
-                animationFunction={this.animationFunction}
-            >
-                <View
-                    style={{
-                        flex: 1,
-                        alignItems: 'center',
-                        justifyContent: 'center',
-                        backgroundColor: 'blue'
-                    }}
-                >
-                    <Button
-                        title="test button"
-                        onPress={this.toggleSideMenu.bind(this)}
-                    />
-                </View>
-            </SideMenu>
-        );
-    }
-}
-
-interface SliderTestState {
-    value: number;
-}
-class SliderTest extends React.Component<any, SliderTestState> {
-    state = {
-        value: 0.2
-    };
-
-    onValueChange = (value: number) => {
-        this.setState({ value });
-    }
-
-    render() {
-        return (
-            <View
-                style={{
-                    flex: 1,
-                    alignItems: 'stretch',
-                    justifyContent: 'center'
-                }}
-            >
-                <Slider
-                    value={this.state.value}
-                    onValueChange={this.onValueChange}
-                />
-                <Text>Value: {this.state.value}</Text>
-            </View>
-        );
-    }
-}
-
-const SocialIconTest: React.StatelessComponent = () => {
-    return (
-        <View>
-            <SocialIcon type="twitter" />
-            <SocialIcon raised={false} type="gitlab" />
-            <SocialIcon light type="medium" />
-            <SocialIcon light raised={false} type="medium" />
-            <SocialIcon title="Sign In With Facebook" button type="facebook" />
-            <SocialIcon title="Some Twitter Message" button type="twitter" />
-            <SocialIcon button type="medium" />
-            <SocialIcon button light type="instagram" />
-        </View>
-    );
-};
-
-const DATA = [
-    {
-        id: 1,
-        text: 'Amanda',
-        age: 28,
-        uri:
-            'http://f9view.com/wp-content/uploads/2013/10/American-Beautiful-Girls-Wallpapers-Hollywood-Celebs-1920x1200px.jpg'
-    },
-    { id: 2, text: 'Emma', age: 29, uri: 'https://i.imgur.com/FHxVpN4.jpg' },
-    {
-        id: 3,
-        text: 'Scarlett',
-        age: 25,
-        uri: 'https://i.ytimg.com/vi/GOJZ5TIlc3M/maxresdefault.jpg'
-    },
-    {
-        id: 4,
-        text: 'Keira',
-        age: 27,
-        uri:
-            'http://www.bdprimeit.com/wp-content/uploads/Keira-Knightley-Most-beautiful-Hollywood-actress.jpg'
-    },
-    {
-        id: 5,
-        text: 'Ashley',
-        age: 30,
-        uri:
-            'https://s-media-cache-ak0.pinimg.com/736x/4c/89/67/4c8967fac1822eeddf09670565430fd5.jpg'
-    },
-    {
-        id: 6,
-        text: 'Jennifer',
-        age: 24,
-        uri:
-            'https://2.bp.blogspot.com/-Vy0NVWhQfKo/Ubma2Mx2YTI/AAAAAAAAH3s/LC_u8LRfm8o/s1600/aimee-teegarden-04.jpg'
-    },
-    {
-        id: 7,
-        text: 'Sarah',
-        age: 28,
-        uri:
-            'https://s-media-cache-ak0.pinimg.com/736x/41/75/26/4175268906d97492e4a3175eab95c0f5.jpg'
-    }
-];
-
-class SwipeDeckTest extends React.Component {
-    renderCard(card: any) {
-        return (
-            <Card
-                key={card.id}
-                containerStyle={{
-                    borderRadius: 10,
-                    width: width * 0.92,
-                    height: height - 165
-                }}
-                featuredTitle={`${card.text}, ${card.age}`}
-                featuredTitleStyle={{
-                    position: 'absolute',
-                    left: 15,
-                    bottom: 10,
-                    fontSize: 30
-                }}
-                image={{ uri: card.uri }}
-                imageStyle={{
-                    borderRadius: 10,
-                    width: width * 0.915,
-                    height: height - 165
-                }}
-            />
-        );
-    }
-
-    onSwipeRight(card: any) {
-        console.log('Card liked: ' + card.text);
-    }
-
-    onSwipeLeft(card: any) {
-        console.log('Card disliked: ' + card.text);
-    }
-
-    renderNoMoreCards() {
-        return (
-            <Card
-                containerStyle={{
-                    borderRadius: 10,
-                    width: width * 0.92,
-                    height: height - 165
-                }}
-                featuredTitle="No more cards"
-                featuredTitleStyle={{ fontSize: 25 }}
-                image={{ uri: 'https://i.imgflip.com/1j2oed.jpg' }}
-                imageStyle={{
-                    borderRadius: 10,
-                    width: width * 0.915,
-                    height: height - 165
-                }}
-            />
-        );
-    }
-    render() {
-        return (
-            <SwipeDeck
-                data={DATA}
-                renderCard={this.renderCard}
-                renderNoMoreCards={this.renderNoMoreCards}
-                onSwipeRight={this.onSwipeRight}
-                onSwipeLeft={this.onSwipeLeft}
-            />
-        );
-    }
-}
-
-interface TabTestState {
-    selectedTab: string;
-}
-
-class TabsTest extends React.Component<{}, TabTestState> {
-    state = {
-        selectedTab: 'profile'
-    };
-
-    changeTab = (selectedTab: string) => {
-        this.setState({ selectedTab });
-    }
-
-    render() {
-        const { selectedTab } = this.state;
-        return (
-            <Tabs>
-                <Tab
-                    titleStyle={{ fontWeight: 'bold', fontSize: 10 }}
-                    selectedTitleStyle={{ marginTop: -1, marginBottom: 6 }}
-                    selected={selectedTab === 'feed'}
-                    title={selectedTab === 'feed' ? 'FEED' : undefined}
-                    renderIcon={() => (
-                        <Icon
-                            containerStyle={{
-                                justifyContent: 'center',
-                                alignItems: 'center',
-                                marginTop: 12
-                            }}
-                            color={'#5e6977'}
-                            name="whatshot"
-                            size={33}
-                        />
-                    )}
-                    renderSelectedIcon={() => (
-                        <Icon color={'#6296f9'} name="whatshot" size={30} />
-                    )}
-                    onPress={() => this.changeTab('feed')}
-                >
-                    <View />
-                </Tab>
-                <Tab
-                    titleStyle={{ fontWeight: 'bold', fontSize: 10 }}
-                    selectedTitleStyle={{ marginTop: -1, marginBottom: 6 }}
-                    selected={selectedTab === 'profile'}
-                    title={selectedTab === 'profile' ? 'PROFILE' : undefined}
-                    renderIcon={() => (
-                        <Icon
-                            containerStyle={{
-                                justifyContent: 'center',
-                                alignItems: 'center',
-                                marginTop: 12
-                            }}
-                            color={'#5e6977'}
-                            name="person"
-                            size={33}
-                        />
-                    )}
-                    renderSelectedIcon={() => (
-                        <Icon color={'#6296f9'} name="person" size={30} />
-                    )}
-                    onPress={() => this.changeTab('profile')}
-                >
-                    <View />
-                </Tab>
-            </Tabs>
-        );
-    }
-}
-
-const TileTest: React.StatelessComponent = () => (
-    <View>
-        <Tile
-            imageSrc="image/path/awesome.jpeg"
-            title="Lorem ipsum dolor sit amet, consectetur"
-            icon={{ name: 'play-circle', type: 'font-awesome' }} // optional
-            contentContainerStyle={{ height: 70 }}
-        >
-            <View
-                style={{
-                    flex: 1,
-                    flexDirection: 'row',
-                    justifyContent: 'space-between'
-                }}
-            >
-                <Text>Caption</Text>
-                <Text>Caption</Text>
-            </View>
-        </Tile>
-        <Tile
-            imageSrc="image/path/awesome.jpeg"
-            icon={{ name: 'play-circle', type: 'font-awesome' }}
-            featured
-        />
-
-        <Tile
-            imageSrc="image/path/awesome.jpeg"
-            title="Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolores dolore exercitationem"
-            featured
-            caption="Some Caption Text"
-        />
-    </View>
-);
-
-const CustomIcon = getIconType('material');
-const fontSize = normalize(20);
-const white = colors.white;
diff --git a/types/react-native-elements/tsconfig.json b/types/react-native-elements/tsconfig.json
deleted file mode 100644
index fd476e679d..0000000000
--- a/types/react-native-elements/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
-    },
-    "files": [
-        "index.d.ts",
-        "react-native-elements-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-native-fabric/index.d.ts b/types/react-native-fabric/index.d.ts
new file mode 100644
index 0000000000..46f859bc17
--- /dev/null
+++ b/types/react-native-fabric/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for react-native-fabric 0.5
+// Project: https://github.com/corymsmith/react-native-fabric
+// Definitions by: Joseph Roque <https://github.com/josephroque>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface CustomAttributes {
+    [key: string]: any;
+}
+
+export namespace Answers {
+    function logCustom(eventName: string, customAttributes?: CustomAttributes): void;
+    function logInvite(method: string, customAttributes?: CustomAttributes): void;
+    function logLevelStart(levelName: string, customAttributes?: CustomAttributes): void;
+    function logLevelEnd(levelName: string, customAttributes?: CustomAttributes): void;
+    function logLogin(method: string, success: boolean, customAttributes?: CustomAttributes): void;
+    function logSearch(query: string, customAttributes?: CustomAttributes): void;
+    function logSignUp(method: string, success: boolean, customAttributes?: CustomAttributes): void;
+    function logShare(
+        method: string,
+        contentName: string,
+        contentType: string,
+        contentId: string,
+        customAttributes?: CustomAttributes): void;
+    function logStartCheckout(
+        totalPrice: number,
+        count: number,
+        currency: string,
+        customAttributes?: CustomAttributes): void;
+    function logAddToCart(
+        itemPrice: number,
+        currency: string,
+        itemName: string,
+        itemType: string,
+        itemId: string,
+        customAttributes?: CustomAttributes): void;
+    function logPurchase(
+        itemPrice: number,
+        currency: string,
+        success: boolean,
+        itemName: string,
+        itemType: string,
+        itemId: string,
+        customAttributes?: CustomAttributes): void;
+    function logContentView(
+        contentName: string,
+        contentType: string,
+        contentId: string,
+        customAttributes?: CustomAttributes): void;
+    function logRating(
+        rating: number,
+        contentId: string,
+        contentType: string,
+        contentName: string,
+        customAttributes?: CustomAttributes): void;
+}
+
+export namespace Crashlytics {
+    function crash(): void;
+    function throwException(): void;
+    function recordError(error: any): void;
+    function logException(value: string): void;
+    function log(message: string): void;
+    function setUserEmail(email: string): void;
+    function setUserIdentifier(id: string): void;
+    function setUserName(userName: string): void;
+    function setBool(key: string, value: boolean): void;
+    function setNumber(key: string, value: number): void;
+    function setString(key: string, value: string): void;
+    function recordCustomExceptionName(name: string, reason: string, stack?: any[]): void;
+}
diff --git a/types/react-native-fabric/react-native-fabric-tests.ts b/types/react-native-fabric/react-native-fabric-tests.ts
new file mode 100644
index 0000000000..1f7d2c7b2a
--- /dev/null
+++ b/types/react-native-fabric/react-native-fabric-tests.ts
@@ -0,0 +1,7 @@
+import { Answers, Crashlytics } from 'react-native-fabric';
+
+Answers.logSearch('query');
+Answers.logCustom('event', { customKey: 0 });
+
+Crashlytics.crash();
+Crashlytics.setUserName('name');
diff --git a/types/react-native-fabric/tsconfig.json b/types/react-native-fabric/tsconfig.json
new file mode 100644
index 0000000000..90e24b408e
--- /dev/null
+++ b/types/react-native-fabric/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "noUnusedParameters": true,
+        "noUnusedLocals": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-fabric-tests.ts"
+    ]
+}
diff --git a/types/react-native-fabric/tslint.json b/types/react-native-fabric/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-fabric/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-fetch-blob/index.d.ts b/types/react-native-fetch-blob/index.d.ts
index cb9af73ef8..910fa4dba9 100644
--- a/types/react-native-fetch-blob/index.d.ts
+++ b/types/react-native-fetch-blob/index.d.ts
@@ -66,34 +66,33 @@ export interface FetchBlobResponse {
     taskId: string;
     /**
      * get path of response temp file
-     * @return {string} File path of temp file.
+     * @return File path of temp file.
      */
     path(): string;
     type: "base64" | "path" | "utf8";
     data: any;
     /**
      * Convert result to javascript RNFetchBlob object.
-     * @return {Promise<Blob>} Return a promise resolves Blob object.
+     * @return Return a promise resolves Blob object.
      */
     blob(contentType: string, sliceSize: number): Promise<PolyfillBlob>;
     /**
      * Convert result to text.
-     * @return {string} Decoded base64 string.
+     * @return Decoded base64 string.
      */
     text(): string | Promise<any>;
     /**
      * Convert result to JSON object.
-     * @return {object} Parsed javascript object.
+     * @return Parsed javascript object.
      */
     json(): any;
     /**
      * Return BASE64 string directly.
-     * @return {string} BASE64 string of response body.
+     * @return BASE64 string of response body.
      */
     base64(): any;
     /**
      * Remove cahced file
-     * @return {Promise}
      */
     flush(): void;
     respInfo: RNFetchBlobResponseInfo;
@@ -101,12 +100,12 @@ export interface FetchBlobResponse {
     /**
      * Read file content with given encoding, if the response does not contains
      * a file path, show warning message
-     * @param  {String} encode Encode type, should be one of `base64`, `ascrii`, `utf8`.
+     * @param  encode Encode type, should be one of `base64`, `ascrii`, `utf8`.
      */
     readFile(encode: Encoding): Promise<any> | null;
     /**
      * Start read stream from cached file
-     * @param  {String} encode Encode type, should be one of `base64`, `ascrii`, `utf8`.
+     * @param  encode Encode type, should be one of `base64`, `ascrii`, `utf8`.
      */
     readStream(encode: Encoding): RNFetchBlobStream | null;
 }
@@ -154,15 +153,15 @@ export declare class PolyfillBlob extends EventTarget {
      *
      * @param data Content of Blob object
      * @param cType Content type settings of Blob object, `text/plain` by default
-     * @param {boolean} defer When this argument set to `true`, blob constructor will not invoke blob created event automatically.
+     * @param defer When this argument set to `true`, blob constructor will not invoke blob created event automatically.
      */
     constructor(data: any, cType: any, defer: boolean);
 
     /**
      * Since Blob content will asynchronously write to a file during creation,
      * use this method to register an event handler for Blob initialized event.
-     * @param  {(b:Blob) => void} fn An event handler invoked when Blob created
-     * @return {Blob} The Blob object instance itself
+     * @param  fn An event handler invoked when Blob created
+     * @return The Blob object instance itself
      */
     onCreated(fn: () => void): PolyfillBlob;
 
@@ -170,30 +169,27 @@ export declare class PolyfillBlob extends EventTarget {
 
     /**
      * Get file reference of the Blob object.
-     * @return {string} Blob file reference which can be consumed by RNFetchBlob fs
+     * @return Blob file reference which can be consumed by RNFetchBlob fs
      */
     getRNFetchBlobRef(): string;
 
     /**
      * Create a Blob object which is sliced from current object
-     * @param  {number} start    Start byte number
-     * @param  {number} end      End byte number
-     * @param  {string} contentType Optional, content type of new Blob object
-     * @return {Blob}
+     * @param  start    Start byte number
+     * @param  end      End byte number
+     * @param  contentType Optional, content type of new Blob object
      */
     slice(start?: number, end?: number, contentType?: string): PolyfillBlob;
 
     /**
      * Read data of the Blob object, this is not standard method.
-     * @param  {string} encoding Read data with encoding
-     * @return {Promise}
+     * @param  encoding Read data with encoding
      */
     readBlob(encoding: string): Promise<any>;
 
     /**
      * Release the resource of the Blob object.
      * @nonstandard
-     * @return {Promise}
      */
     close(): Promise<void>;
 }
@@ -220,9 +216,9 @@ export interface PolyfillXMLHttpRequest extends PolyfillXMLHttpRequestEventTarge
     /**
      * XMLHttpRequest.open, always async, user and password not supported. When
      * this method invoked, headers should becomes empty again.
-     * @param  {string} method Request method
-     * @param  {string} url Request URL
-     * @param  {boolean} async Always async
+     * @param  method Request method
+     * @param  url Request URL
+     * @param  async Always async
      * @param  user NOT SUPPORTED
      * @param  password NOT SUPPORTED
      */
@@ -284,16 +280,15 @@ export interface PolyfillXMLHttpRequestEventTarget extends EventTarget {
 export interface Net {
     /**
      * Get cookie according to the given url.
-     * @param  {string} domain Domain of the cookies to be removed, remove all
-     * @return {Promise<Array<String>>}     Cookies of a specific domain.
+     * @param  domain Domain of the cookies to be removed, remove all
+     * @return     Cookies of a specific domain.
      */
     getCookies(domain: string): Promise<string[]>;
 
     /**
      * Remove cookies for a specific domain
-     * @param  {?string} domain Domain of the cookies to be removed, remove all
+     * @param  domain Domain of the cookies to be removed, remove all
      * cookies when this is null.
-     * @return {Promise<null>}
      */
     removeCookies(domain?: string): Promise<null>;
 }
@@ -303,22 +298,19 @@ export interface FS {
 
     /**
      * Remove file at path.
-     * @param  {string}   path:string Path of target file.
-     * @return {Promise}
+     * @param    path:string Path of target file.
      */
     unlink(path: string): Promise<void>;
 
     /**
      * Create a directory.
-     * @param  {string} path Path of directory to be created
-     * @return {Promise}
+     * @param  path Path of directory to be created
      */
     mkdir(path: string): Promise<void>;
 
     /**
      * Get a file cache session
-     * @param  {string} name Stream ID
-     * @return {RNFetchBlobSession}
+     * @param  name Stream ID
      */
     session(name: string): RNFetchBlobSession;
 
@@ -326,10 +318,10 @@ export interface FS {
 
     /**
      * Create file stream from file at `path`.
-     * @param  {string} path   The file path.
-     * @param  {string} encoding Data encoding, should be one of `base64`, `utf8`, `ascii`
-     * @param  {boolean} bufferSize Size of stream buffer.
-     * @return {RNFetchBlobStream} RNFetchBlobStream stream instance.
+     * @param  path   The file path.
+     * @param  encoding Data encoding, should be one of `base64`, `utf8`, `ascii`
+     * @param  bufferSize Size of stream buffer.
+     * @return RNFetchBlobStream stream instance.
      */
     readStream(path: string, encoding: Encoding, bufferSize?: number, tick?: number): Promise<RNFetchBlobReadStream>;
 
@@ -339,19 +331,18 @@ export interface FS {
 
     /**
      * Create write stream to a file.
-     * @param  {string} path Target path of file stream.
-     * @param  {string} encoding Encoding of input data.
-     * @param  {boolean} append  A flag represent if data append to existing ones.
-     * @return {Promise<{}>} A promise resolves a `WriteStream` object.
+     * @param  path Target path of file stream.
+     * @param  encoding Encoding of input data.
+     * @param  append  A flag represent if data append to existing ones.
+     * @return A promise resolves a `WriteStream` object.
      */
     writeStream(path: string, encoding: Encoding, append?: boolean): Promise<RNFetchBlobWriteStream>;
 
     /**
      * Write data to file.
-     * @param  {string} path  Path of the file.
-     * @param  {string | number[]} data Data to write to the file.
-     * @param  {string} encoding Encoding of data (Optional).
-     * @return {Promise}
+     * @param  path  Path of the file.
+     * @param  data Data to write to the file.
+     * @param  encoding Encoding of data (Optional).
      */
     writeFile(path: string, data: string | number[], encoding?: Encoding): Promise<void>;
 
@@ -359,15 +350,13 @@ export interface FS {
 
     /**
      * Wrapper method of readStream.
-     * @param  {string} path Path of the file.
-     * @param  {'base64' | 'utf8' | 'ascii'} encoding Encoding of read stream.
-     * @return {Promise<Array<number> | string>}
+     * @param  path Path of the file.
+     * @param  encoding Encoding of read stream.
      */
     readFile(path: string, encoding: Encoding, bufferSize?: number): Promise<any>;
     /**
      * Check if file exists and if it is a folder.
-     * @param  {string} path Path to check
-     * @return {Promise<boolean>}
+     * @param  path Path to check
      */
     exists(path: string): Promise<boolean>;
 
@@ -377,8 +366,7 @@ export interface FS {
 
     /**
      * Show statistic data of a path.
-     * @param  {string} path Target path
-     * @return {RNFetchBlobStat}
+     * @param  path Target path
      */
     stat(path: string): Promise<RNFetchBlobStat>;
 
@@ -386,8 +374,7 @@ export interface FS {
 
     /**
      * Android only method, request media scanner to scan the file.
-     * @param  {Array<Object<string, string>>} pairs Array contains Key value pairs with key `path` and `mime`.
-     * @return {Promise}
+     * @param  pairs Array contains Key value pairs with key `path` and `mime`.
      */
     scanFile(pairs: Array<{ [key: string]: string }>): Promise<void>;
 
diff --git a/types/react-native-fs/index.d.ts b/types/react-native-fs/index.d.ts
index b9ad43eec3..0e6fc8a3bf 100644
--- a/types/react-native-fs/index.d.ts
+++ b/types/react-native-fs/index.d.ts
@@ -1,12 +1,17 @@
-// Type definitions for react-native-fs 2.0
+// Type definitions for react-native-fs 2.8
 // Project: https://github.com/johanneslumpe/react-native-fs
 // Definitions by: Paulo Cesar <https://github.com/pocesar>
+//                 Joseph Roque <https://github.com/josephroque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react-native" />
 
 export interface ReadDirItem {
+  // The creation date of the file (iOS only)
+  ctime: Date | undefined;
+  // The last modified date of the file
+  mtime: Date | undefined;
   // The name of the item
   name: string;
   // The absolute path to the item
@@ -28,6 +33,10 @@ export interface StatResult {
   size: string;
   // UNIX file mode
   mode: number;
+  // Created date
+  ctime: number;
+  // Updated date
+  mtime: number;
   // Is the file just a file?
   isFile(): boolean;
   // Is the file a directory?
@@ -63,8 +72,11 @@ export interface DownloadFileOptions {
   toFile: string;
   // An object of headers to be passed to the server
   headers?: Headers;
+  // iOS only
   background?: boolean;
   progressDivider?: number;
+  readTimeout?: number;
+  connectionTimeout?: number;
   begin?: DownloadCallbackBegin;
   progress?: DownloadCallbackProgress;
 }
@@ -155,6 +167,29 @@ export interface JobReturnValue<Result> {
   promise: Promise<Result>;
 }
 
+// Can be one of utf8 (default), ascii, base64. Use base64 for reading binary files
+export type Encoding =
+  | 'utf8'
+  | 'ascii'
+  | 'base64'
+  ;
+
+// Optional object wrapper for encoding options
+export type EncodingOrOptions =
+  | Encoding
+  | { encoding?: Encoding }
+  ;
+
+// Available hashing algorithms
+export type HashAlgorithm =
+  | "md5"
+  | "sha1"
+  | "sha224"
+  | "sha256"
+  | "sha384"
+  | "sha512"
+  ;
+
 //  The absolute path to the main bundle directory
 export const MainBundlePath: string;
 // The absolute path to the caches directory
@@ -167,21 +202,38 @@ export const TemporaryDirectoryPath: string;
 export const ExternalDirectoryPath: string;
 // The absolute path to the external storage, shared directory (android only)
 export const ExternalStorageDirectoryPath: string;
+// The absolute path to the NSLibraryDirectory (iOS only)
+export const LibraryDirectoryPath: string;
+// The absolute path to the pictures directory (android only)
+export const PicturesDirectoryPath: string;
 
 export function readDir(path: string): Promise<ReadDirItem[]>;
+export function readDirAssets(dirpath: string): Promise<ReadDirItem[]>;
 export function readdir(path: string): Promise<string[]>;
 export function stat(filepath: string): Promise<StatResult>;
-export function readFile(filepath: string, encoding?: string): Promise<string>;
+export function read(filepath: string, length?: number, position?: number, encodingOrOptions?: EncodingOrOptions): Promise<string>;
+export function readFile(filepath: string, encodingOrOptions?: EncodingOrOptions): Promise<string>;
+export function readFileAssets(filepath: string, encodingOrOptions?: EncodingOrOptions): Promise<string>;
+export function existsAssets(filepath: string): Promise<boolean>;
 export function unlink(filepath: string): Promise<void>;
-export function writeFile(filepath: string, contents: string, encoding?: string): Promise<void>;
-export function appendFile(filepath: string, contents: string, encoding?: string): Promise<void>;
+export function write(filepath: string, contents: string, position?: number, encodingOrOptions?: EncodingOrOptions): Promise<void>;
+export function writeFile(filepath: string, contents: string, encodingOrOptions?: EncodingOrOptions): Promise<void>;
+export function appendFile(filepath: string, contents: string, encodingOrOptions?: EncodingOrOptions): Promise<void>;
 export function moveFile(filepath: string, destPath: string): Promise<void>;
 export function copyFile(filepath: string, destPath: string): Promise<void>;
+export function copyFileAssets(filepath: string, destPath: string): Promise<void>;
+export function copyAssetsFileIOS(imageUri: string, destPath: string, width: number, height: number,
+  scale?: number, compression?: number, resizeMode?: string): Promise<string>;
+export function copyAssetsVideoIOS(imageUri: string, destPath: string): Promise<string>;
 export function exists(filepath: string): Promise<boolean>;
-export function hash(filepath: string, algorithm: string): Promise<string>;
+export function hash(filepath: string, algorithm: HashAlgorithm): Promise<string>;
 export function mkdir(filepath: string, options?: MkdirOptions): Promise<void>;
+export function touch(filepath: string, mtime?: Date, ctime?: Date): Promise<void>;
 export function downloadFile(options: DownloadFileOptions): JobReturnValue<DownloadResult>;
-export function stopDownload(jobId: number): Promise<void>;
+export function stopDownload(jobId: number): void;
 export function uploadFiles(options: UploadFileOptions): JobReturnValue<UploadResult>;
-export function stopUpload(jobId: number): Promise<void>;
+export function stopUpload(jobId: number): void;
+export function pathForBundle(bundleNamed: string): Promise<string>;
+export function pathForGroup(groupName: string): Promise<string>;
+export function setReadable(filepath: string, readable: boolean, ownerOnly: boolean): Promise<boolean>;
 export function getFSInfo(): Promise<FSInfoResult>;
diff --git a/types/react-native-goby/index.d.ts b/types/react-native-goby/index.d.ts
deleted file mode 100644
index 08a9b7e3f3..0000000000
--- a/types/react-native-goby/index.d.ts
+++ /dev/null
@@ -1,410 +0,0 @@
-// Type definitions for react-native-goby 0.04
-// Project: https://gitlab.com/MessageDream/react-native-goby
-// Definitions by: jaydenzhao <https://github.com/MessageDream>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export type DownloadProgressCallback = (progress: DownloadProgress) => void;
-export type SyncStatusChangedCallback = (status: Goby.SyncStatus) => void;
-
-export interface GobyOptions extends SyncOptions {
-    /**
-     * Specifies when you would like to synchronize updates with the Goby server.
-     * Defaults to goby.CheckFrequency.ON_APP_START.
-     */
-    checkFrequency: Goby.CheckFrequency;
-}
-
-export interface DownloadProgress {
-    /**
-     * The total number of bytes expected to be received for this update.
-     */
-    totalBytes: number;
-
-    /**
-     * The number of bytes downloaded thus far.
-     */
-    receivedBytes: number;
-}
-
-export interface LocalPackage extends Package {
-    /**
-     * Installs the update by saving it to the location on disk where the runtime expects to find the latest version of the app.
-     *
-     * @param installMode Indicates when you would like the update changes to take affect for the end-user.
-     * @param minimumBackgroundDuration For resume-based installs, this specifies the number of seconds the app needs to be in the background before forcing a restart. Defaults to 0 if unspecified.
-     */
-    install(installMode: Goby.InstallMode, minimumBackgroundDuration?: number): Promise<void>;
-}
-
-export interface Package {
-    /**
-     * The app binary version that this update is dependent on. This is the value that was
-     * specified via the appStoreVersion parameter when calling the CLI's release command.
-     */
-    appVersion: string;
-
-    /**
-     * The deployment key that was used to originally download this update.
-     */
-    deploymentKey: string;
-
-    /**
-     * The description of the update. This is the same value that you specified in the CLI when you released the update.
-     */
-    description: string;
-
-    /**
-     * Indicates whether this update has been previously installed but was rolled back.
-     */
-    failedInstall: boolean;
-
-    /**
-     * Indicates whether this is the first time the update has been run after being installed.
-     */
-    isFirstRun: boolean;
-
-    /**
-     * Indicates whether the update is considered mandatory. This is the value that was specified in the CLI when the update was released.
-     */
-    isMandatory: boolean;
-
-    /**
-     * Indicates whether this update is in a "pending" state. When true, that means the update has been downloaded and installed, but the app restart
-     * needed to apply it hasn't occurred yet, and therefore, its changes aren't currently visible to the end-user.
-     */
-    isPending: boolean;
-
-    /**
-     * The internal label automatically given to the update by the Goby server. This value uniquely identifies the update within its deployment.
-     */
-    label: string;
-
-    /**
-     * The SHA hash value of the update.
-     */
-    packageHash: string;
-
-    /**
-     * The size of the code contained within the update, in bytes.
-     */
-    packageSize: number;
-}
-
-export interface RemotePackage extends Package {
-    /**
-     * Downloads the available update from the Goby service.
-     *
-     * @param downloadProgressCallback An optional callback that allows tracking the progress of the update while it is being downloaded.
-     */
-    download(downloadProgressCallback?: DownloadProgressCallback): Promise<LocalPackage>;
-
-    /**
-     * The URL at which the package is available for download.
-     */
-    downloadUrl: string;
-}
-
-export interface SyncOptions {
-    /**
-     * Specifies the deployment key you want to query for an update against. By default, this value is derived from the Info.plist
-     * file (iOS) and MainActivity.java file (Android), but this option allows you to override it from the script-side if you need to
-     * dynamically use a different deployment for a specific call to sync.
-     */
-    deploymentKey?: string;
-
-    /**
-     * Specifies when you would like to install optional updates (i.e. those that aren't marked as mandatory).
-     * Defaults to goby.InstallMode.ON_NEXT_RESTART.
-     */
-    installMode?: Goby.InstallMode;
-
-    /**
-     * Specifies when you would like to install updates which are marked as mandatory.
-     * Defaults to goby.InstallMode.IMMEDIATE.
-     */
-    mandatoryInstallMode?: Goby.InstallMode;
-
-    /**
-     * Specifies the minimum number of seconds that the app needs to have been in the background before restarting the app. This property
-     * only applies to updates which are installed using `InstallMode.ON_NEXT_RESUME`, and can be useful for getting your update in front
-     * of end users sooner, without being too obtrusive. Defaults to `0`, which has the effect of applying the update immediately after a
-     * resume, regardless how long it was in the background.
-     */
-    minimumBackgroundDuration?: number;
-
-    /**
-     * An "options" object used to determine whether a confirmation dialog should be displayed to the end user when an update is available,
-     * and if so, what strings to use. Defaults to null, which has the effect of disabling the dialog completely. Setting this to any truthy
-     * value will enable the dialog with the default strings, and passing an object to this parameter allows enabling the dialog as well as
-     * overriding one or more of the default strings.
-     */
-    updateDialog?: boolean | UpdateDialog;
-}
-
-export interface UpdateDialog {
-    /**
-     * Indicates whether you would like to append the description of an available release to the
-     * notification message which is displayed to the end user. Defaults to false.
-     */
-    appendReleaseDescription?: boolean;
-
-    /**
-     * Indicates the string you would like to prefix the release description with, if any, when
-     * displaying the update notification to the end user. Defaults to " Description: "
-     */
-    descriptionPrefix?: string;
-
-    /**
-     * The text to use for the button the end user must press in order to install a mandatory update. Defaults to "Continue".
-     */
-    mandatoryContinueButtonLabel?: string;
-
-    /**
-     * The text used as the body of an update notification, when the update is specified as mandatory.
-     * Defaults to "An update is available that must be installed.".
-     */
-    mandatoryUpdateMessage?: string;
-
-    /**
-     * The text to use for the button the end user can press in order to ignore an optional update that is available. Defaults to "Ignore".
-     */
-    optionalIgnoreButtonLabel?: string;
-
-    /**
-     * The text to use for the button the end user can press in order to install an optional update. Defaults to "Install".
-     */
-    optionalInstallButtonLabel?: string;
-
-    /**
-     * The text used as the body of an update notification, when the update is optional. Defaults to "An update is available. Would you like to install it?".
-     */
-    optionalUpdateMessage?: string;
-
-    /**
-     * The text used as the header of an update notification that is displayed to the end user. Defaults to "Update available".
-     */
-    title?: string;
-}
-
-export interface StatusReport {
-    /**
-     * Whether the deployment succeeded or failed.
-     */
-    status: Goby.DeploymentStatus;
-
-    /**
-     * The version of the app that was deployed (for a native app upgrade).
-     */
-    appVersion?: string;
-
-    /**
-     * Details of the package that was deployed (or attempted to).
-     */
-    package?: Package;
-
-    /**
-     * Deployment key used when deploying the previous package.
-     */
-    previousDeploymentKey?: string;
-
-    /**
-     * The label (v#) of the package that was upgraded from.
-     */
-    previousLabelOrAppVersion?: string;
-}
-
-/**
- * Decorates a React Component configuring it to sync for updates with the Goby server.
- *
- * @param options Options used to configure the end-user sync and update experience (e.g. when to check for updates?, show an prompt?, install the update immediately?).
- */
-declare function Goby(options?: GobyOptions): Function;
-
-declare namespace Goby {
-    /**
-     * Represents the default settings that will be used by the sync method if
-     * an update dialog is configured to be displayed.
-     */
-    const DEFAULT_UPDATE_DIALOG: UpdateDialog;
-
-    /**
-     * Asks the Goby service whether the configured app deployment has an update available.
-     *
-     * @param deploymentKey The deployment key to use to query the Goby server for an update.
-     */
-    function checkForUpdate(deploymentKey?: string): Promise<RemotePackage>;
-
-    /**
-     * Retrieves the metadata for an installed update (e.g. description, mandatory).
-     *
-     * @param updateState The state of the update you want to retrieve the metadata for. Defaults to UpdateState.RUNNING.
-     */
-    function getUpdateMetadata(updateState?: UpdateState): Promise<LocalPackage>;
-
-    /**
-     * Notifies the Goby runtime that an installed update is considered successful.
-     */
-    function notifyAppReady(): Promise<StatusReport>;
-
-    /**
-     * Allow Goby to restart the app.
-     */
-    function allowRestart(): void;
-
-    /**
-     * Forbid Goby to restart the app.
-     */
-    function disallowRestart(): void;
-
-    /**
-     * Immediately restarts the app.
-     *
-     * @param onlyIfUpdateIsPending Indicates whether you want the restart to no-op if there isn't currently a pending update.
-     */
-    function restartApp(onlyIfUpdateIsPending?: boolean): void;
-
-    /**
-     * Allows checking for an update, downloading it and installing it, all with a single call.
-     *
-     * @param options Options used to configure the end-user update experience (e.g. show an prompt?, install the update immediately?).
-     * @param syncStatusChangedCallback An optional callback that allows tracking the status of the sync operation, as opposed to simply checking the resolved state via the returned Promise.
-     * @param downloadProgressCallback An optional callback that allows tracking the progress of an update while it is being downloaded.
-     */
-    function sync(options?: SyncOptions, syncStatusChangedCallback?: SyncStatusChangedCallback, downloadProgressCallback?: DownloadProgressCallback): Promise<SyncStatus>;
-
-    /**
-     * Indicates when you would like an installed update to actually be applied.
-     */
-    enum InstallMode {
-        /**
-         * Indicates that you want to install the update and restart the app immediately.
-         */
-        IMMEDIATE,
-
-        /**
-         * Indicates that you want to install the update, but not forcibly restart the app.
-         */
-        ON_NEXT_RESTART,
-
-        /**
-         * Indicates that you want to install the update, but don't want to restart the
-         * app until the next time the end user resumes it from the background.
-         */
-        ON_NEXT_RESUME
-    }
-
-    /**
-     * Indicates the current status of a sync operation.
-     */
-    enum SyncStatus {
-        /**
-         * The Goby server is being queried for an update.
-         */
-        CHECKING_FOR_UPDATE,
-
-        /**
-         * An update is available, and a confirmation dialog was shown
-         * to the end user. (This is only applicable when the updateDialog is used)
-         */
-        AWAITING_USER_ACTION,
-
-        /**
-         * An available update is being downloaded from the Goby server.
-         */
-        DOWNLOADING_PACKAGE,
-
-        /**
-         * An available update was downloaded and is about to be installed.
-         */
-        INSTALLING_UPDATE,
-
-        /**
-         * The app is up-to-date with the Goby server.
-         */
-        UP_TO_DATE,
-
-        /**
-         * The app had an optional update which the end user chose to ignore.
-         * (This is only applicable when the updateDialog is used)
-         */
-        UPDATE_IGNORED,
-
-        /**
-         * An available update has been installed and will be run either immediately after the
-         * syncStatusChangedCallback function returns or the next time the app resumes/restarts,
-         * depending on the InstallMode specified in SyncOptions
-         */
-        UPDATE_INSTALLED,
-
-        /**
-         * There is an ongoing sync operation running which prevents the current call from being executed.
-         */
-        SYNC_IN_PROGRESS,
-
-        /**
-         * The sync operation encountered an unknown error.
-         */
-        UNKNOWN_ERROR
-    }
-
-    /**
-     * Indicates the state that an update is currently in.
-     */
-    enum UpdateState {
-        /**
-         * Indicates that an update represents the
-         * version of the app that is currently running.
-         */
-        RUNNING,
-
-        /**
-         * Indicates than an update has been installed, but the
-         * app hasn't been restarted yet in order to apply it.
-         */
-        PENDING,
-
-        /**
-         * Indicates than an update represents the latest available
-         * release, and can be either currently running or pending.
-         */
-        LATEST
-    }
-
-    /**
-     * Indicates the status of a deployment (after installing and restarting).
-     */
-    enum DeploymentStatus {
-        /**
-         * The deployment failed (and was rolled back).
-         */
-        FAILED,
-
-        /**
-         * The deployment succeeded.
-         */
-        SUCCEEDED
-    }
-
-    /**
-     * Indicates when you would like to check for (and install) updates from the Goby server.
-     */
-    enum CheckFrequency {
-        /**
-         * When the app is fully initialized (or more specifically, when the root component is mounted).
-         */
-        ON_APP_START,
-
-        /**
-         * When the app re-enters the foreground.
-         */
-        ON_APP_RESUME,
-
-        /**
-         * Don't automatically check for updates, but only do it when goby.sync() is manully called inside app code.
-         */
-        MANUAL
-    }
-}
-
-export default Goby;
diff --git a/types/react-native-goby/react-native-goby-tests.tsx b/types/react-native-goby/react-native-goby-tests.tsx
deleted file mode 100644
index a72cf0ecf7..0000000000
--- a/types/react-native-goby/react-native-goby-tests.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from 'react';
-
-import {
-    View,
-    AppRegistry
-} from 'react-native';
-
-import Goby from "react-native-goby";
-
-class Home extends React.Component {
-    render() {
-        return (
-            <View></View>
-        );
-    }
-}
-
-
-AppRegistry.registerComponent('home', () => Goby({
-    updateDialog: false,
-    checkFrequency: Goby.CheckFrequency.ON_APP_RESUME,
-    installMode: Goby.InstallMode.IMMEDIATE
-})(Home));
diff --git a/types/react-native-goby/tsconfig.json b/types/react-native-goby/tsconfig.json
deleted file mode 100644
index 0c0b3ab77c..0000000000
--- a/types/react-native-goby/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "jsx": "react",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "react-native-goby-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-native-goby/tslint.json b/types/react-native-goby/tslint.json
deleted file mode 100644
index d774391cd1..0000000000
--- a/types/react-native-goby/tslint.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // Lowercase `object` is available in TypeScript 2.2 only.
-        "ban-types": false,
-        // Below are all TODO
-        "align": false,
-        "array-type": false,
-        "comment-format": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "no-misused-new": false,
-        "no-consecutive-blank-lines": false,
-        "no-empty-interface": false,
-        "no-padding": false,
-        "no-var": false,
-        "prefer-declare-function": false,
-        "prefer-method-signature": false,
-        "semicolon": false,
-        "strict-export-declare-modifiers": false
-    }
-}
diff --git a/types/react-native-google-analytics-bridge/index.d.ts b/types/react-native-google-analytics-bridge/index.d.ts
deleted file mode 100644
index a30f49cb2a..0000000000
--- a/types/react-native-google-analytics-bridge/index.d.ts
+++ /dev/null
@@ -1,293 +0,0 @@
-// Type definitions for react-native-google-analytics-bridge 5.2
-// Project: https://github.com/idehub/react-native-google-analytics-bridge
-// Definitions by: Huhuanming <https://github.com/huhuanming>,
-//                 Nathan Brooker Perry <https://github.com/nbperry>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export interface TimeTrackingOptionalValues {
-    name: string;
-    label?: string;
-}
-
-export interface EventOptionalValues {
-    label?: string;
-    value?: number;
-}
-
-export interface EventPurchaseProduct {
-    id: string;
-    name: string;
-    category?: string;
-    brand?: string;
-    variant?: string;
-    price?: number;
-    quantity?: number;
-    couponCode?: string;
-}
-export interface EventPurchaseTransaction {
-    id: string;
-    /**
-     * an entity with which the transaction should be affiliated (e.g. a particular store)
-     */
-    affiliation: string;
-    revenue?: number;
-    tax?: number;
-    shipping?: number;
-    couponCode?: string;
-}
-
-export class GoogleAnalyticsTracker {
-    /**
-     * Save all tracker related data that is needed to call native methods with proper data.
-     * @param trackerId {String}
-     * @param customDimensionsFieldsIndexMap {{fieldName: fieldIndex}} Custom dimensions field/index pairs
-     */
-    constructor(trackerId: string, customDimensionsFieldsIndexMap?: { [s: string]: number })
-
-    /**
-     * If Tracker has customDimensionsFieldsIndexMap, it will transform
-     * customDimensions map pairs {field: value} to {fieldIndex: value}.
-     * Otherwise customDimensions are passed trough untouched.
-     * Underlay native methods will transform provided customDimensions map to expected format.
-     * Google analytics expect dimensions to be tracker with 'dimension{index}' keys,
-     * not dimension field names.
-     * @param customDimensions {Object}
-     * @returns {Object}
-     */
-    transformCustomDimensionsFieldsToIndexes(customDimensions: {}): void;
-
-    /**
-     * Track the current screen/view Important: Calling this will also set the "current view" for
-     * other calls. So events tracked will be tagged as having occured on the current view.
-     * @param  {String} screenName The name of the current screen
-     */
-    trackScreenView(screenName: string): void;
-
-    /**
-     * Track an event that has occured
-     * @param  {String} category       The event category
-     * @param  {String} action         The event action
-     * @param  {EventOptionalValues} optionalValues An object containing optional label and value
-     */
-    trackEvent(category: string, action: string, optionalValues?: EventOptionalValues): void;
-
-    /**
-     * Track the current screen/view with custom dimension values
-     * @param  {String} screenName The name of the current screen
-     * @param  {Object} customDimensionValues An object containing custom dimension key/value pairs
-     */
-    trackScreenViewWithCustomDimensionValues(screenName: string, customDimensionValues: {}): void;
-
-    /**
-     * Track an event that has occured with custom dimension values
-     * @param  {String} category       The event category
-     * @param  {String} action         The event action
-     * @param  {EventOptionalValues} optionalValues An object containing optional label and value
-     * @param  {Object} customDimensionValues An object containing custom dimension key/value pairs
-     */
-    trackEventWithCustomDimensionValues(
-      category: string,
-      action: string,
-      optionalValues: EventOptionalValues,
-      customDimensionValues: {},
-    ): void;
-
-    /**
-     * Track an event that has occured
-     * @param  {String} category       The event category
-     * @param  {Number} value         	The timing measurement in milliseconds
-     * @param  {TimeTrackingOptionalValues} optionalValues An object containing optional name and label
-     */
-    trackTiming(category: string, value: number, optionalValues?: TimeTrackingOptionalValues): void;
-
-    /**
-     * Track a purchase event. This uses the Enhanced Ecommerce GA feature.
-     * @param  {EventPurchaseProduct} product       An object with product values
-     * @param  {EventPurchaseTransaction} transaction   An object with transaction values
-     * @param  {String} eventCategory The event category, defaults to Ecommerce
-     * @param  {String} eventAction   The event action, defaults to Purchase
-     */
-    trackPurchaseEvent(
-      product: EventPurchaseProduct,
-      transaction: EventPurchaseTransaction,
-      eventCategory?: string,
-      eventAction?: string,
-    ): void;
-
-    /**
-     * Track a purchase event. This uses the Enhanced Ecommerce GA feature.
-     * @param  {EventPurchaseProduct[]} products       An array with products
-     * @param  {EventPurchaseTransaction} transaction   An object with transaction values
-     * @param  {String} eventCategory The event category, defaults to Ecommerce
-     * @param  {String} eventAction   The event action, defaults to Purchase
-     */
-    trackMultiProductsPurchaseEvent(
-      products: EventPurchaseProduct[],
-      transaction: EventPurchaseTransaction,
-      eventCategory?: string,
-      eventAction?: string
-    ): void;
-
-    /**
-     * Track a purchase event with custom dimensions. This uses the Enhanced Ecommerce GA feature.
-     * @param  {EventPurchaseProduct[]} products       An array with products
-     * @param  {EventPurchaseTransaction} transaction   An object with transaction values
-     * @param  {String} eventCategory The event category, defaults to Ecommerce
-     * @param  {String} eventAction   The event action, defaults to Purchase
-     * @param  {Object} customDimensionValues An object containing custom dimension key/value pairs
-     */
-    trackMultiProductsPurchaseEventWithCustomDimensionValues(
-      products: EventPurchaseProduct[],
-      transaction: EventPurchaseTransaction,
-      eventCategory?: string,
-      eventAction?: string,
-      customDimensions?: {},
-    ): void;
-
-    /**
-     * Track an exception
-     * @param  {String} error The description of the error
-     * @param  {Boolean} fatal A value indiciating if the error was fatal, defaults to false
-     */
-    trackException(error: string, fatal?: boolean): void;
-
-    /**
-     * Sets the Google Analytics User-ID for the current user for tracking.
-     * The userId should be an anonymous identifier that complies with Google Analytic's User-ID policy.
-     * @param {String} userId The current userId,
-     */
-    setUser(userId: string): void;
-
-    /**
-     * Sets if IDFA (identifier for advertisers) collection should be enabled.
-     *
-     * Enabled by default.
-     *
-     * Important: For iOS you can only use this method if you have done the optional step 6 from the installation
-     * guide. Only enable this (and link the appropriate libraries) if you plan to use advertising features
-     * in your app, or else your app may get rejected from the AppStore.
-     * @param  {Boolean} enabled Defaults to true
-     */
-    allowIDFA(enabled?: boolean): void;
-
-    /**
-     * Track a social interaction, Facebook, Twitter, etc.
-     * @param  {String} network
-     * @param  {String} action
-     * @param  {String} targetUrl
-     */
-    trackSocialInteraction(network: string, action: string, targetUrl: string): void;
-
-    /**
-     * Sets if uncaught exceptions should be tracked
-     * @param {Boolean} enabled
-     */
-    setTrackUncaughtExceptions(enabled: boolean): void;
-
-    /**
-     * Sets the trackers appName
-     * The Bundle name is used by default
-     * @param {String} appName
-     */
-    setAppName(appName: string): void;
-
-    /**
-     * Sets the trackers appVersion
-     * @param {String} appVersion
-     */
-    setAppVersion(appVersion: string): void;
-
-    /**
-     * Sets if AnonymizeIp is enabled
-     * If enabled the last octet of the IP address will be removed
-     * @param {Boolean} enabled disabled by default
-     */
-    setAnonymizeIp(enabled: string): void;
-
-    /**
-     * Sets the tracker currency property. See accepted currency codes here
-     * https://developers.google.com/analytics/devguides/platform/features/currencies
-     * @param {string} currencyCode  ISO 4217 currency code
-     */
-    setCurrency(currencyCode: string): void;
-
-    /**
-     * Sets tracker sampling rate.
-     * @param {Float} sampleRatio Percentage 0 - 100
-     */
-    setSamplingRate(sampleRatio: number): void;
-}
-
-export interface GAEvent<T> {
-    event: string;
-    payload: T;
-}
-
-export class GoogleTagManager {
-    /**
-     * Call once to open the container for all subsequent static calls.
-     * @param {String} containerId
-     */
-    static openContainerWithId(containerId: string): Promise<void>;
-
-    /**
-     * Retrieves a boolean value with the given key from the opened container.
-     * @param {String} key
-     */
-    static boolForKey(key: string): Promise<boolean>;
-
-    /**
-     * Retrieves a string with the given key from the opened container.
-     * @param {String} key
-     */
-    static stringForKey(key: string): Promise<string>;
-
-    /**
-     * Retrieves a number with the given key from the opened container.
-     * @param {String} key
-     */
-    static doubleForKey(key: string): Promise<number>;
-
-    /**
-     * push a datalayer event for Google Analytics through Google Tag Manager.
-     * @param {Object} dictionary An Map<String, Object> containing key and value pairs.
-     * it must have at least one key "event" with event name
-     *         example: {event: "eventName", pageId: "/home"}
-     */
-    static pushDataLayerEvent<E>(dictionary: GAEvent<E>): Promise<boolean>;
-}
-
-export class GoogleAnalyticsSettings {
-    /**
-     * Sets if OptOut is active and disables Google Analytics
-     * This has to be set each time the App starts
-     *
-     * Disabled by default.
-     * @param {Boolean} enabled
-     */
-    static setOptOut(enabled: boolean): void;
-
-    /**
-     * Sets the trackers dispatch interval
-     * This will influence how often batches of events, screen views, etc
-     * are sent to your tracker.
-     *
-     * Events, screen views, etc, are sent in batches to the tracker. This function allows you to configure
-     * how often (in seconds) the batches are sent to your tracker. Recommended to keep this around
-     * 20-120 seconds to preserve battery and network traffic.
-     *
-     * This is set to 20 seconds by default.
-     *
-     * @param {Number} intervalInSeconds
-     */
-    static setDispatchInterval(intervalInSeconds: number): void;
-
-    /**
-     * When enabled the native library prevents any data from being sent to Google Analytics.
-     * This allows you to test or debug the implementation, without your test data appearing in
-     * your Google Analytics reports.
-     *
-     * @param {Boolean} enabled
-     */
-    static setDryRun(enabled: boolean): void;
-}
diff --git a/types/react-native-google-analytics-bridge/react-native-google-analytics-bridge-tests.ts b/types/react-native-google-analytics-bridge/react-native-google-analytics-bridge-tests.ts
deleted file mode 100644
index 7493bfbd03..0000000000
--- a/types/react-native-google-analytics-bridge/react-native-google-analytics-bridge-tests.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import {
-    GoogleAnalyticsTracker,
-    GoogleTagManager,
-    GoogleAnalyticsSettings,
-} from 'react-native-google-analytics-bridge';
-
-const tracker = new GoogleAnalyticsTracker('GA_UA');
-
-tracker.allowIDFA();
-tracker.allowIDFA(true);
-
-tracker.setAnonymizeIp('1.1.1.1');
-
-tracker.setAppName('name');
-
-// Used for Google Analytics User-ID
-tracker.setUser('unique_username');
-
-tracker.trackScreenView('Video');
-
-// Tracking pagination of a video list
-tracker.trackEvent('Videos', 'Page2');
-
-// The Video 'Awesome Video Title' has started playing
-tracker.trackEvent('Video', 'play', { label: 'Awesome Video Title'});
-
-// The video 'Awesome Video Title' has stopped playing 1234 ms into the video
-tracker.trackEvent('Video', 'stop', { label: 'Awesome Video Title', value: 1234});
-
-// Tracking the time it took to encode a video
-tracker.trackTiming('Video', 15000, { name: 'VideoEncoded' });
-
-tracker.trackException('Exception Message');
-
-// Tracking an ecommerce purchase event happening for a single product
-tracker.trackPurchaseEvent({
-  id: 'P12345',
-  name: 'Android Warhol T-Shirt',
-  category: 'Apparel/T-Shirts',
-  brand: 'Google',
-  variant: 'Black',
-  price: 29.20,
-  quantity: 1,
-  couponCode: 'APPARELSALE'
-}, {
-  id: 'T12345',
-  affiliation: 'Google Store - Online',
-  revenue: 37.39,
-  tax: 2.85,
-  shipping: 5.34,
-  couponCode: 'SUMMER2013'
-}, 'Ecommerce', 'Purchase');
-
-// Tracking an ecommerce purchase event happening for mutliple products
-tracker.trackMultiProductsPurchaseEvent([{
-  id: 'P12345',
-  name: 'Android Warhol T-Shirt',
-  category: 'Apparel/T-Shirts',
-  brand: 'Google',
-  variant: 'Black',
-  price: 29.20,
-  quantity: 1,
-  couponCode: 'APPARELSALE'
-},
-{
-  id: 'P67890',
-  name: 'iOS Warhol T-Shirt',
-  category: 'Apparel/T-Shirts',
-  brand: 'Apple',
-  variant: 'Black',
-  price: 29.20,
-  quantity: 1,
-  couponCode: 'TECHSALE20'
-}
-], {
-  id: 'T12345',
-  affiliation: 'Google Store - Online',
-  revenue: 37.39,
-  tax: 2.85,
-  shipping: 5.34,
-  couponCode: 'SUMMER2013'
-}, 'Ecommerce', 'Purchase');
-
-// Usage of custom dimensions
-const tracker2 = new GoogleAnalyticsTracker('GA_UA-2', { test: 1, OtherCustomDimension: 2});
-
-tracker2.trackScreenViewWithCustomDimensionValues('Home', { test: 'Beta' });
-
-tracker2.trackEventWithCustomDimensionValues('Video', 'play', {}, { test: 'data', OtherCustomDimension: 'OtherStuff'});
-
-// Google Tag Manager tests
-GoogleTagManager.openContainerWithId('123');
-
-GoogleTagManager.boolForKey('key').then((value: boolean) => {
-        console.log('Do something with the boolean for the key "key"');
-    });
-
-GoogleTagManager.stringForKey('key').then((value: string) => {
-        console.log('Do something with the string for the key "key"');
-    });
-
-GoogleTagManager.doubleForKey('key').then((value: number) => {
-        console.log('Do something with the number for the key "key"');
-    });
-
-GoogleTagManager.pushDataLayerEvent<string>({
-        event: 'event',
-        payload: 'payload',
-    }).then((success: boolean) => {
-        console.log(success ? 'Successfully got pushed the DataLayerEvent' : 'Failed to push the DataLayerEvent');
-    });
-
-// Google Analytic Settings
-
-GoogleAnalyticsSettings.setOptOut(true);
-GoogleAnalyticsSettings.setDispatchInterval(1000);
-GoogleAnalyticsSettings.setDryRun(true);
diff --git a/types/react-native-google-analytics-bridge/tsconfig.json b/types/react-native-google-analytics-bridge/tsconfig.json
deleted file mode 100644
index 91e51ff21b..0000000000
--- a/types/react-native-google-analytics-bridge/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "react-native-google-analytics-bridge-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-native-google-analytics-bridge/tslint.json b/types/react-native-google-analytics-bridge/tslint.json
deleted file mode 100644
index 71ee04c4e1..0000000000
--- a/types/react-native-google-analytics-bridge/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-generics": false
-    }
-}
diff --git a/types/react-native-material-kit/index.d.ts b/types/react-native-material-kit/index.d.ts
index d9564be179..5dc9b63aff 100644
--- a/types/react-native-material-kit/index.d.ts
+++ b/types/react-native-material-kit/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for react-native-material-kit 0.4
+// Type definitions for react-native-material-kit 0.5
 // Project: https://github.com/xinthink/react-native-material-kit
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
+//                 Tim Wang <https://github.com/timwangdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -186,6 +187,10 @@ export interface TickProperties extends ViewProperties {
 // COMPONENTS
 ///////////////////////////////
 
+export class MKComponent<P, S> extends React.Component<P, S> {
+    static Builder: any;
+}
+
 export interface MKColorStatic {
     Amber: string;
     Blue: string;
@@ -374,32 +379,29 @@ export const MKColor: MKColorStatic;
 export function setTheme(theme: ThemeStatic): void;
 export function getTheme(): ThemeStatic;
 
-export class MKButton extends React.Component<MKButtonProperties, any> {}
+export class MKButton extends MKComponent<MKButtonProperties, any> {}
 
-export class MKTextField extends React.Component<MKTextFieldProperties, any> {}
+export class MKTextField extends MKComponent<MKTextFieldProperties, any> {}
 
-export class MKSwitch extends React.Component<MKSwitchProperties, any> {}
+export class MKSwitch extends MKComponent<MKSwitchProperties, any> {}
 
-export class MKIconToggle extends
-    React.Component<MKIconToggleProperties, any> {}
+export class MKIconToggle extends MKComponent<MKIconToggleProperties, any> {}
 
-export class MKRipple extends React.Component<MKRippleProperties, any> {}
+export class MKRipple extends MKComponent<MKRippleProperties, any> {}
 
-export class MKProgress extends React.Component<MKProgressProperties, any> {}
+export class MKProgress extends MKComponent<MKProgressProperties, any> {}
 
 export namespace MKProgress {
     class Indeterminate extends React.Component<IndeterminateProgressProperties> {}
 }
 
-export class MKSlider extends React.Component<MKSliderProperties, any> {}
+export class MKSlider extends MKComponent<MKSliderProperties, any> {}
 
-export class MKRangeSlider extends
-    React.Component<MKRangeSliderProperties, any> {}
+export class MKRangeSlider extends MKComponent<MKRangeSliderProperties, any> {}
 
-export class MKSpinner extends React.Component<MKSpinnerProperties, any> {}
+export class MKSpinner extends MKComponent<MKSpinnerProperties, any> {}
 
-export class MKRadioButton extends
-React.Component<MKRadioButtonProperties, any> {}
+export class MKRadioButton extends MKComponent<MKRadioButtonProperties, any> {}
 
 export namespace MKRadioButton {
     class MKRadioButton {}
@@ -416,4 +418,4 @@ export namespace MKRadioButton {
     }
 }
 
-export class MKCheckbox extends React.Component<MKCheckboxProperties, any> {}
+export class MKCheckbox extends MKComponent<MKCheckboxProperties, any> {}
diff --git a/types/react-native-material-kit/react-native-material-kit-tests.tsx b/types/react-native-material-kit/react-native-material-kit-tests.tsx
index 4cb415d791..5971d397eb 100644
--- a/types/react-native-material-kit/react-native-material-kit-tests.tsx
+++ b/types/react-native-material-kit/react-native-material-kit-tests.tsx
@@ -27,6 +27,10 @@ const ButtonTest = () =>
         </Text>
     </MKButton>;
 
+const ButtonBuilderTest = new MKButton.Builder()
+  .withBackgroundColor(MKColor.Teal)
+  .build();
+
 //// TEXT FIELD
 
 interface MKTextFieldTestState {
@@ -141,7 +145,7 @@ class MKRadioButtonTest extends React.Component<null, null> {
     radioGroup: MKRadioButton.Group;
 
     constructor() {
-        super();
+        super(null);
         this.radioGroup = new MKRadioButton.Group();
 
         setTheme({radioStyle: {
@@ -165,7 +169,7 @@ class MKRadioButtonTest extends React.Component<null, null> {
 /// Checkbox
 class MKCheckboxTest extends React.Component<null, null> {
     constructor() {
-        super();
+        super(null);
 
         setTheme({checkboxStyle: {
             fillColor: MKColor.Teal,
diff --git a/types/react-native-material-ui/index.d.ts b/types/react-native-material-ui/index.d.ts
index 8b24722662..0168f557bc 100644
--- a/types/react-native-material-ui/index.d.ts
+++ b/types/react-native-material-ui/index.d.ts
@@ -25,11 +25,6 @@ export interface ActionButtonProps {
 }
 
 /**
- * Action Button
- *
- * @export
- * @class ActionButton
- * @extends {Component<ActionButtonProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/ActionButton/ActionButton.react.js
  */
 export class ActionButton extends Component<ActionButtonProps, any> {}
@@ -48,11 +43,6 @@ export interface AvatarProps {
 }
 
 /**
- * Avatar
- *
- * @export
- * @class Avatar
- * @extends {Component<AvatarProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Avatar/Avatar.react.js
  */
 export class Avatar extends Component<AvatarProps, any> {}
@@ -72,11 +62,6 @@ export interface BadgeProps {
 }
 
 /**
- * Badge
- *
- * @export
- * @class Badge
- * @extends {Component<BadgeProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Badge/Badge.react.js
  */
 export class Badge extends Component<BadgeProps, any> {}
@@ -91,11 +76,6 @@ export interface BottomNavigationProps {
 }
 
 /**
- * Bottom Navigation
- *
- * @export
- * @class BottomNavigation
- * @extends {Component<BottomNavigationProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/BottomNavigation/BottomNavigation.react.js
  */
 export class BottomNavigation extends Component<BottomNavigationProps, any> {}
@@ -135,11 +115,6 @@ export interface ButtonProps {
 }
 
 /**
- * Button
- *
- * @export
- * @class Button
- * @extends {Component<ButtonProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Button/Button.react.js
  */
 export class Button extends Component<ButtonProps, any> {}
@@ -153,11 +128,6 @@ export interface CardProps {
 }
 
 /**
- * Card
- *
- * @export
- * @class Card
- * @extends {Component<CardProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Card/Card.react.js
  */
 export class Card extends Component<CardProps, any> {}
@@ -178,11 +148,6 @@ export interface CheckBoxProps {
 }
 
 /**
- * Checkbox
- *
- * @export
- * @class Checkbox
- * @extends {Component<CheckBoxProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Checkbox/Checkbox.react.js
  */
 export class Checkbox extends Component<CheckBoxProps, any> {}
@@ -197,10 +162,6 @@ export interface DialogProps {
 
 /**
  * Dialog
- *
- * @export
- * @class Dialog
- * @extends {Component<DialogProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Dialog/Dialog.react.js
  */
 export class Dialog extends Component<DialogProps, any> {}
@@ -242,11 +203,6 @@ export interface DialogDefaultActionsProps {
 }
 
 /**
- * Dialog Default Actions
- *
- * @export
- * @class DialogDefaultActions
- * @extends {Component<DialogDefaultActionsProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Dialog/DialogDefaultActions.react.js
  */
 export class DialogDefaultActions extends Component<DialogDefaultActionsProps, any> {}
@@ -260,11 +216,6 @@ export interface DialogStackedActionsProps {
 }
 
 /**
- * Dialog Stacked Actions
- *
- * @export
- * @class DialogStackedActions
- * @extends {Component<DialogStackedActionsProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Dialog/DialogStackedActions.react.js
  */
 export class DialogStackedActions extends Component<DialogStackedActionsProps, any> {}
@@ -277,11 +228,6 @@ export interface DividerProps {
 }
 
 /**
- * Divider;
- *
- * @export
- * @class Divider
- * @extends {Component<DividerProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Divider/Divider.react.js
  */
 export class Divider extends Component<DividerProps, any> {}
@@ -345,11 +291,6 @@ export interface DrawerHeaderAccountProps {
 }
 
 /**
- * Drawer
- *
- * @export
- * @class Drawer
- * @extends {Component<DrawerProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Drawer/Drawer.react.js
  */
 export class Drawer extends Component<DrawerProps, any> {}
@@ -370,10 +311,6 @@ export interface IconProps {
 
 /**
  * Icon
- *
- * @export
- * @class Icon
- * @extends {Component<IconProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Icon/index.js
  */
 export class Icon extends Component<IconProps, any> {}
@@ -395,11 +332,6 @@ export interface IconToggleProps {
 }
 
 /**
- * Icon Toggle
- *
- * @export
- * @class IconToggle
- * @extends {Component<IconToggleProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/IconToggle/IconToggle.react.js
  */
 export class IconToggle extends Component<IconToggleProps, any> {}
@@ -441,11 +373,6 @@ export interface ListItemProps {
 }
 
 /**
- * List Item
- *
- * @export
- * @class ListItem
- * @extends {Component<ListItemProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/ListItem/ListItem.react.js
  */
 export class ListItem extends Component<ListItemProps, any> {}
@@ -460,11 +387,6 @@ export interface RadioButtonProps {
 }
 
 /**
- * Radio Button
- *
- * @export
- * @class RadioButton
- * @extends {Component<RadioButtonProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/RadioButton/RadioButton.react.js
  */
 export class RadioButton extends Component<RadioButtonProps, any> {}
@@ -480,11 +402,6 @@ export interface SubheaderProps {
 }
 
 /**
- * Subheader
- *
- * @export
- * @class Subheader
- * @extends {Component<SubheaderProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Subheader/Subheader.react.js
  */
 export class Subheader extends Component<SubheaderProps, any> {}
@@ -530,11 +447,6 @@ export interface ToolbarProps {
 }
 
 /**
- * Toolbar
- *
- * @export
- * @class Toolbar
- * @extends {Component<ToolbarProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Toolbar/Toolbar.react.js
  */
 export class Toolbar extends Component<ToolbarProps, any> {}
@@ -555,11 +467,6 @@ export interface SnackbarProps {
 }
 
 /**
- * Snackbar
- *
- * @export
- * @class Snackbar
- * @extends {Component<SnackbarProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/Snackbar/Snackbar.react.js
  */
 export class Snackbar extends Component<SnackbarProps, any> {}
@@ -571,11 +478,6 @@ export interface RippleFeedbackProps {
 }
 
 /**
- * Ripple Feedback
- *
- * @export
- * @class RippleFeedback
- * @extends {Component<IRippleFeedback, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/RippleFeedback/RippleFeedback.react.js
  */
 export class RippleFeedback extends Component<RippleFeedbackProps, any> {}
@@ -586,11 +488,6 @@ export interface ThemeProviderProps {
 }
 
 /**
- * ThemeProvider
- *
- * @export
- * @class ThemeProvider
- * @extends {Component<ThemeProviderProps, any>}
  * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/styles/ThemeProvider.react.js
  */
 export class ThemeProvider extends Component<ThemeProviderProps, any> {}
diff --git a/types/react-native-material-ui/react-native-material-ui-tests.tsx b/types/react-native-material-ui/react-native-material-ui-tests.tsx
index 4f875c59a3..4acb9db12e 100644
--- a/types/react-native-material-ui/react-native-material-ui-tests.tsx
+++ b/types/react-native-material-ui/react-native-material-ui-tests.tsx
@@ -68,7 +68,7 @@ const DialogExample = () =>
 
 class BottomNavigationExample extends React.Component<null, {active: string}> {
     constructor() {
-        super();
+        super(null);
 
         this.state = {
             active: 'today'
diff --git a/types/react-native-mixpanel/index.d.ts b/types/react-native-mixpanel/index.d.ts
new file mode 100644
index 0000000000..aba789ded6
--- /dev/null
+++ b/types/react-native-mixpanel/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for react-native-mixpanel 0.1
+// Project: https://github.com/davodesign84/react-native-mixpanel#readme
+// Definitions by: Andrew Makarov <https://github.com/r3nya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export function sharedInstanceWithToken(token: string): void;
+export function track(event: string): void;
+export function trackWithProperties(event: string, property: object): void;
+export function createAlias(id: string): void;
+export function identify(id: string): void;
+export function set(property: object): void;
+export function setOnce(property: object): void;
+export function timeEvent(event: string): void;
+export function registerSuperProperties(property: object): void;
+export function registerSuperPropertiesOnce(property: object): void;
+export function trackCharge(id: number): void;
+export function trackChargeWithProperties(id: number, property: object): void;
+export function increment(property: string, value: number): void;
+export function setPushRegistrationId(token: string): void;
+export function initPushHandling(token: string): void;
+export function clearPushRegistrationId(): void;
+export function addPushDeviceToken(token: string): void;
+export function reset(): void;
+export function getDistinctId(handler: (id: string) => void): void;
diff --git a/types/react-native-mixpanel/react-native-mixpanel-tests.ts b/types/react-native-mixpanel/react-native-mixpanel-tests.ts
new file mode 100644
index 0000000000..ca3ffffe41
--- /dev/null
+++ b/types/react-native-mixpanel/react-native-mixpanel-tests.ts
@@ -0,0 +1,22 @@
+import * as Mixpanel from 'react-native-mixpanel';
+
+Mixpanel.sharedInstanceWithToken('1234567890');
+Mixpanel.track('Event name');
+Mixpanel.trackWithProperties('Click Button', { button_type: 'yellow button', button_text: 'magic button' });
+Mixpanel.createAlias('123456');
+Mixpanel.identify('123456');
+Mixpanel.set({ $email: 'elvis@email.com' });
+Mixpanel.setOnce({ $email: 'elvis@email.com', Created: new Date().toISOString() });
+Mixpanel.timeEvent('Image Upload');
+Mixpanel.track('Image Upload');
+Mixpanel.registerSuperProperties({ 'Account type': 'Free', 'User Type': 'Vendor' });
+Mixpanel.registerSuperPropertiesOnce({ Gender: 'Female' });
+Mixpanel.trackCharge(399);
+Mixpanel.trackChargeWithProperties(399, { product: 'ACME Wearable tech' });
+Mixpanel.increment("Login Count", 1);
+Mixpanel.setPushRegistrationId('1234567890abc');
+Mixpanel.initPushHandling('123456666');
+Mixpanel.clearPushRegistrationId();
+Mixpanel.addPushDeviceToken('1234567890abc');
+Mixpanel.reset();
+Mixpanel.getDistinctId((id) => (id));
diff --git a/types/react-native-mixpanel/tsconfig.json b/types/react-native-mixpanel/tsconfig.json
new file mode 100644
index 0000000000..489842ded8
--- /dev/null
+++ b/types/react-native-mixpanel/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-mixpanel-tests.ts"
+    ]
+}
diff --git a/types/react-native-mixpanel/tslint.json b/types/react-native-mixpanel/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-mixpanel/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-modal/index.d.ts b/types/react-native-modal/index.d.ts
deleted file mode 100644
index c01c636dae..0000000000
--- a/types/react-native-modal/index.d.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-// Type definitions for react-native-modal 3.1
-// Project: https://github.com/react-native-community/react-native-modal
-// Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import { ComponentClass, ReactNode } from 'react';
-import { ViewStyle } from 'react-native';
-export interface ReactNativeModalProps {
-    /**
-     * Modal show animation
-     *
-     * @default 'slideInUp'
-     * @type {(SlidingEntrances | string)}
-     * @memberof ReactNativeModalProps
-     */
-    animationIn?: SlidingEntrances | string;
-
-    /**
-     * Timing for the modal show animation (in ms)
-     *
-     * @default 300
-     * @type {number}
-     * @memberof ReactNativeModalProps
-     */
-    animationInTiming?: number;
-
-    /**
-     * Modal hide animation
-     *
-     * @default 'slideOutDown'
-     * @type {(SlidingExits | string)}
-     * @memberof ReactNativeModalProps
-     */
-    animationOut?: SlidingExits | string;
-
-    /**
-     * Timing for the modal hide animation (in ms)
-     *
-     * @default 300
-     * @type {number}
-     * @memberof ReactNativeModalProps
-     */
-    animationOutTiming?: number;
-
-    /**
-     * Move the modal up if the keyboard is open
-     *
-     * @default false
-     * @type {boolean}
-     * @memberof ReactNativeModalProps
-     */
-    avoidKeyboard?: boolean;
-
-    /**
-     * The backdrop background color
-     *
-     * @default 'black'
-     * @type {string}
-     * @memberof ReactNativeModalProps
-     */
-    backdropColor?: string;
-
-    /**
-     * The backdrop opacity when the modal is visible
-     *
-     * @default 0.70
-     * @type {number}
-     * @memberof ReactNativeModalProps
-     */
-    backdropOpacity?: number;
-
-    /**
-     * The backdrop show timing (in ms)
-     *
-     * @default 300
-     * @type {number}
-     * @memberof ReactNativeModalProps
-     */
-    backdropTransitionInTiming?: number;
-
-    /**
-     * The backdrop hide timing (in ms)
-     *
-     * @default 300
-     * @type {number}
-     * @memberof ReactNativeModalProps
-     */
-    backdropTransitionOutTiming?: number;
-
-    /**
-     * The modal content
-     *
-     * @type {(ReactNode[] | ReactNode)}
-     * @memberof ReactNativeModalProps
-     */
-    children: ReactNode[] | ReactNode;
-
-    /**
-     * Show the modal?
-     *
-     * @default false
-     * @type {boolean}
-     * @memberof ReactNativeModalProps
-     */
-    isVisible: boolean;
-
-    /**
-     * Style applied to the modal
-     *
-     * @default null
-     * @memberof ReactNativeModalProps
-     */
-    style?: ViewStyle[] | ViewStyle;
-
-    /**
-     * Called when the modal is completely visible
-     *
-     * @default () => {}
-     * @memberof ReactNativeModalProps
-     */
-    onModalShow?(): void;
-
-    /**
-     * Called when the modal is completely hidden
-     *
-     * @default () => {}
-     * @memberof ReactNativeModalProps
-     */
-    onModalHide?(): void;
-
-    /**
-     * Called when the Android back button is pressed
-     *
-     * @default () => {}
-     * @memberof ReactNativeModalProps
-     */
-    onBackButtonPress?(): void;
-
-    /**
-     * Called when the backdrop is pressed
-     *
-     * @default () => {}
-     * @memberof ReactNativeModalProps
-     */
-    onBackdropPress?(): void;
-}
-
-export interface ReactNativeModal
-    extends ComponentClass<ReactNativeModalProps> {
-    _close(): void;
-}
-
-declare const ReactNativeModal: ReactNativeModal;
-
-export default ReactNativeModal;
-
-type AttentionSeekers =
-    | 'bounce'
-    | 'flash'
-    | 'jello'
-    | 'pulse'
-    | 'rotate'
-    | 'shake'
-    | 'swing'
-    | 'rubberBand'
-    | 'tada'
-    | 'wobble';
-type BouncingEntrances =
-    | 'bounceIn'
-    | 'bounceInUp'
-    | 'bounceInDown'
-    | 'bounceInRight'
-    | 'bounceInLeft';
-type BouncingExits =
-    | 'bounceOut'
-    | 'bounceOutUp'
-    | 'bounceOutDown'
-    | 'bounceOutRight'
-    | 'bounceOutLeft';
-type FadingEntrances =
-    | 'fadeIn'
-    | 'fadeInDown'
-    | 'fadeInUp'
-    | 'fadeInLeft'
-    | 'fadeInRight'
-    | 'fadeInDownBig'
-    | 'fadeInUpBig'
-    | 'fadeInLeftBig'
-    | 'fadeInRightBig';
-type FadingExits =
-    | 'fadeOut'
-    | 'fadeOutDown'
-    | 'fadeOutUp'
-    | 'fadeOutLeft'
-    | 'fadeOutRight'
-    | 'fadeOutDownBig'
-    | 'fadeOutUpBig'
-    | 'fadeOutLeftBig'
-    | 'fadeOutRightBig';
-type Flippers = 'flipInX' | 'flipInY' | 'flipOutX' | 'flipOutY';
-type LightSpeed = 'lightSpeedIn' | 'lightSpeedOut';
-export type SlidingEntrances =
-    | 'slideInDown'
-    | 'slideInUp'
-    | 'slideInLeft'
-    | 'slideInRight';
-export type SlidingExits =
-    | 'slideOutDown'
-    | 'slideOutUp'
-    | 'slideOutLeft'
-    | 'slideOutRight';
-type ZoomingEntrances =
-    | 'zoomIn'
-    | 'zoomInDown'
-    | 'zoomInUp'
-    | 'zoomInLeft'
-    | 'zoomInRight';
-type ZoomingExits =
-    | 'zoomOut'
-    | 'zoomOutDown'
-    | 'zoomOutUp'
-    | 'zoomOutLeft'
-    | 'zoomOutRight';
-
-export type EntranceDefinitions =
-    | BouncingEntrances
-    | FadingEntrances
-    | SlidingEntrances
-    | ZoomingEntrances;
-export type ExitDefinitions =
-    | BouncingExits
-    | FadingExits
-    | SlidingExits
-    | ZoomingExits;
-
-export type AnimationDefinitions =
-    | AttentionSeekers
-    | BouncingEntrances
-    | BouncingExits
-    | FadingEntrances
-    | FadingExits
-    | Flippers
-    | LightSpeed
-    | SlidingEntrances
-    | SlidingExits
-    | ZoomingEntrances
-    | ZoomingExits;
diff --git a/types/react-native-modal/react-native-modal-tests.tsx b/types/react-native-modal/react-native-modal-tests.tsx
deleted file mode 100644
index 787740c19d..0000000000
--- a/types/react-native-modal/react-native-modal-tests.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import * as React from 'react';
-import { Text, TouchableOpacity, View } from 'react-native';
-import Modal, { ReactNativeModal } from 'react-native-modal';
-
-interface State {
-    isModalVisible: boolean;
-}
-class ModalTester extends React.Component<{}, State> {
-    modal: ReactNativeModal;
-    state = {
-        isModalVisible: false,
-    };
-
-    private showModal = () => this.setState({ isModalVisible: true });
-
-    private hideModal = () => this.setState({ isModalVisible: false });
-
-    close = () => {
-        this.modal._close();
-    }
-
-    storeRef: React.Ref<any> = ref => {
-        this.modal = ref;
-    }
-
-    render() {
-        return (
-            <View style={{ flex: 1 }}>
-                <TouchableOpacity onPress={this.showModal}>
-                    <Text>Show Modal</Text>
-                </TouchableOpacity>
-                <Modal
-                    ref={this.storeRef}
-                    isVisible={this.state.isModalVisible}
-                >
-                    <View style={{ flex: 1 }}>
-                        <Text>Hello!</Text>
-                    </View>
-                </Modal>
-            </View>
-        );
-    }
-}
diff --git a/types/react-native-modal/tsconfig.json b/types/react-native-modal/tsconfig.json
deleted file mode 100644
index d496497592..0000000000
--- a/types/react-native-modal/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react-native"
-    },
-    "files": [
-        "index.d.ts",
-        "react-native-modal-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-native-modalbox/index.d.ts b/types/react-native-modalbox/index.d.ts
index 04dea6fdaf..457872889b 100644
--- a/types/react-native-modalbox/index.d.ts
+++ b/types/react-native-modalbox/index.d.ts
@@ -13,8 +13,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is false
    *
-   * @type {boolean}
-   * @memberof ModalProps
    */
   isOpen?: boolean;
 
@@ -23,8 +21,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is false
    *
-   * @type {boolean}
-   * @memberof ModalProps
    */
   isDisabled?: boolean;
 
@@ -33,8 +29,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is true
    *
-   * @type {boolean}
-   * @memberof ModalProps
    */
   backdropPressToClose?: boolean;
 
@@ -43,8 +37,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is true
    *
-   * @type {boolean}
-   * @memberof ModalProps
    */
   swipeToClose?: boolean;
 
@@ -53,8 +45,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is 50
    *
-   * @type {number}
-   * @memberof ModalProps
    */
   swipeThreshold?: number;
 
@@ -63,8 +53,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is the Window Height
    *
-   * @type {number}
-   * @memberof ModalProps
    */
   swipeArea?: number;
 
@@ -74,8 +62,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is center
    *
-   * @type {string}
-   * @memberof ModalProps
    */
   position?: 'top' | 'center' | 'bottom' | string;
 
@@ -84,8 +70,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is bottom
    *
-   * @type {('top' | 'bottom' | string)}
-   * @memberof ModalProps
    */
   entry?: 'top' | 'bottom' | string;
 
@@ -94,8 +78,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is true
    *
-   * @type {boolean}
-   * @memberof ModalProps
    */
   backdrop?: boolean;
 
@@ -104,8 +86,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is 0.5
    *
-   * @type {number}
-   * @memberof ModalProps
    */
   backdropOpacity?: number;
 
@@ -114,8 +94,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is black
    *
-   * @type {string}
-   * @memberof ModalProps
    */
   backdropColor?: string;
 
@@ -124,8 +102,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is null
    *
-   * @type {JSX.Element}
-   * @memberof ModalProps
    */
   backdropContent?: React.ReactNode;
 
@@ -134,8 +110,6 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is 400ms
    *
-   * @type {number}
-   * @memberof ModalProps
    */
   animationDuration?: number;
 
@@ -144,16 +118,12 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is false
    *
-   * @type {boolean}
-   * @memberof ModalProps
    */
   backButtonClose?: boolean;
 
   /**
    *
    * Default is false
-   * @type {boolean}
-   * @memberof ModalProps
    */
   coverScreen?: boolean;
 
@@ -162,22 +132,25 @@ export interface ModalProps extends ViewProperties {
    *
    * Default is false
    *
-   * @type {boolean}
-   * @memberof ModalProps
    */
   startOpen?: boolean;
 
+  /**
+   * This property prevent the modal to cover the ios status bar when the modal is scrolling up because the keyboard is opening
+   *
+   * Default is ios:22, android:0
+   */
+  keyboardTopOffset?: number;
+
   /**
    * Event fired when the modal is closed and the animation is complete
    *
-   * @memberof ModalProps
    */
   onClosed?(): void;
 
   /**
    * Event fired when the modal is opened and the animation is complete
    *
-   * @memberof ModalProps
    */
   onOpened?(): void;
 
@@ -185,9 +158,7 @@ export interface ModalProps extends ViewProperties {
    * When the state of the swipe to close feature has changed
    * (useful to change the content of the modal, display a message for example)
    *
-   * @param {boolean} state
    *
-   * @memberof ModalProps
    */
   onClosingState?(state: boolean): void;
 }
@@ -196,18 +167,14 @@ export default class Modal extends React.Component<ModalProps> {
   /**
    * Open the modal
    *
-   * @static
    *
-   * @memberof Modal
    */
   open(): void;
 
   /**
    * Close the modal
    *
-   * @static
    *
-   * @memberof Modal
    */
   close(): void;
 }
diff --git a/types/react-native-modalbox/react-native-modalbox-tests.tsx b/types/react-native-modalbox/react-native-modalbox-tests.tsx
index c8ae1785e7..6a167791f4 100644
--- a/types/react-native-modalbox/react-native-modalbox-tests.tsx
+++ b/types/react-native-modalbox/react-native-modalbox-tests.tsx
@@ -24,7 +24,7 @@ class Example extends React.Component<{}, State> {
   modal6: Modal;
 
   constructor() {
-    super();
+    super({});
 
     this.state = {
       isOpen: false,
diff --git a/types/react-native-orientation/tslint.json b/types/react-native-orientation/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-native-orientation/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-native-popup-dialog/index.d.ts b/types/react-native-popup-dialog/index.d.ts
new file mode 100644
index 0000000000..73466d1b9d
--- /dev/null
+++ b/types/react-native-popup-dialog/index.d.ts
@@ -0,0 +1,86 @@
+// Type definitions for react-native-popup-dialog 0.9
+// Project: https://github.com/jacklam718/react-native-popup-dialog/blob/master/README.md
+// Definitions by: Paito Anderson <https://github.com/PaitoAnderson>
+//                 connectdotz <https://github.com/connectdotz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+import { GestureResponderEvent, StyleProp, ViewStyle, TextStyle } from 'react-native';
+
+export type AlignTypes = 'left' | 'right' | 'center';
+export type OverlayPointerEventTypes = 'auto' | 'none';
+export type SlideFromTypes = 'top' | 'bottom' | 'left' | 'right';
+
+export interface DialogButtonProps {
+    text: string;
+    align?: AlignTypes;
+    onPress?: (event: GestureResponderEvent) => void;
+    buttonStyle?: StyleProp<ViewStyle>;
+    textStyle?: StyleProp<TextStyle>;
+    textContainerStyle?: StyleProp<ViewStyle>;
+    disabled?: boolean;
+    activeOpacity?: number;
+}
+
+export interface DialogTitleProps {
+    title: string;
+    titleStyle?: StyleProp<ViewStyle>;
+    titleTextStyle?: StyleProp<ViewStyle>;
+    titleAlign?: AlignTypes;
+    haveTitleBar?: boolean;
+}
+
+export interface OverlayProps {
+    onPress: (event: GestureResponderEvent) => void;
+    backgroundColor?: string;
+    opacity?: number;
+    animationDuration?: number;
+    showOverlay?: boolean;
+    pointerEvents?: string;
+}
+
+export interface PopupDialogProps {
+    dialogTitle?: any;
+    width?: number;
+    height?: number;
+    dialogAnimation?: FadeAnimation | ScaleAnimation | SlideAnimation;
+    dialogStyle?: StyleProp<ViewStyle>;
+    containerStyle?: StyleProp<ViewStyle>;
+    animationDuration?: number;
+    overlayPointerEvents?: OverlayPointerEventTypes;
+    overlayBackgroundColor?: string;
+    overlayOpacity?: number;
+    dismissOnTouchOutside?: boolean;
+    dismissOnHardwareBackPress?: boolean;
+    haveOverlay?: boolean;
+    show?: boolean;
+    onShown?: () => void;
+    onDismissed?: () => void;
+    actions?: any[];
+}
+
+export class FadeAnimation {
+    constructor(toValue?: number);
+    constructor(params: { toValue?: number, animationDuration?: number });
+    toValue(toValue: number): void;
+    createAnimations(): object;
+}
+
+export class ScaleAnimation {
+    constructor(toValue?: number);
+    toValue(toValue: number): void;
+    createAnimations(): object;
+}
+
+export class SlideAnimation {
+    constructor(toValue?: number);
+    constructor(params: { toValue?: number, slideFrom?: SlideFromTypes });
+    toValue(toValue: number): void;
+    createAnimations(): object;
+}
+
+export class DialogButton extends React.Component<DialogButtonProps, any> { }
+export class DialogTitle extends React.Component<DialogTitleProps, any> { }
+export class Overlay extends React.Component<OverlayProps, any> { }
+export default class PopupDialog extends React.Component<PopupDialogProps, any> { }
diff --git a/types/react-native-popup-dialog/react-native-popup-dialog-tests.tsx b/types/react-native-popup-dialog/react-native-popup-dialog-tests.tsx
new file mode 100644
index 0000000000..fdc53cfb88
--- /dev/null
+++ b/types/react-native-popup-dialog/react-native-popup-dialog-tests.tsx
@@ -0,0 +1,61 @@
+import * as React from 'react';
+import { StyleSheet, View } from 'react-native';
+import PopupDialog, {
+    DialogTitle,
+    DialogButton,
+    SlideAnimation,
+    ScaleAnimation,
+    FadeAnimation,
+} from 'react-native-popup-dialog';
+
+const slideAnimation = new SlideAnimation({ slideFrom: 'bottom' });
+const scaleAnimation = new ScaleAnimation();
+const fadeAnimation = new FadeAnimation({ animationDuration: 150 });
+
+class Test extends React.Component<any> {
+    render() {
+        return (
+            <View>
+                <PopupDialog
+                    dialogTitle={<DialogTitle title="Popup Dialog - Fade Animation" />}
+                    dialogAnimation={fadeAnimation}
+                />
+                <PopupDialog
+                    dialogTitle={<DialogTitle title="Popup Dialog - Scale Animation" />}
+                    dialogAnimation={scaleAnimation}
+                    actions={[
+                        <DialogButton
+                            text="CLOSE"
+                            onPress={(event) => { }}
+                            textStyle={{ color: "red" }}
+                            key="button-1"
+                        />,
+                    ]}
+                />
+                <PopupDialog
+                    dialogTitle={<DialogTitle title="Popup Dialog - Slide Animation" />}
+                    width={300}
+                    height={300}
+                    dialogAnimation={slideAnimation}
+                    containerStyle={styles.testStyle}
+                    dialogStyle={styles.testStyle}
+                    animationDuration={150}
+                    overlayPointerEvents='auto'
+                    overlayBackgroundColor='white'
+                    overlayOpacity={0.5}
+                    dismissOnTouchOutside={false}
+                    dismissOnHardwareBackPress={false}
+                    haveOverlay={true}
+                    show={true}
+                    onShown={() => { console.log('onShown'); }}
+                    onDismissed={() => { console.log('onDismissed'); }}
+                />
+            </View>);
+    }
+}
+
+const styles = StyleSheet.create({
+    testStyle: {
+        paddingTop: 10,
+    }
+});
diff --git a/types/react-native-popup-dialog/tsconfig.json b/types/react-native-popup-dialog/tsconfig.json
new file mode 100644
index 0000000000..ee710ade52
--- /dev/null
+++ b/types/react-native-popup-dialog/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-popup-dialog-tests.tsx"
+    ]
+}
diff --git a/types/react-native-popup-dialog/tslint.json b/types/react-native-popup-dialog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-popup-dialog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-push-notification/index.d.ts b/types/react-native-push-notification/index.d.ts
new file mode 100644
index 0000000000..1f8c89b512
--- /dev/null
+++ b/types/react-native-push-notification/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for react-native-push-notification 3.0
+// Project: https://github.com/zo0r/react-native-push-notification#readme
+// Definitions by: Paito Anderson <https://github.com/PaitoAnderson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export interface PushNotificationPermissions {
+    alert?: boolean;
+    badge?: boolean;
+    sound?: boolean;
+}
+
+export interface PushNotification {
+    foreground: boolean;
+    userInteraction: boolean;
+    message: string|object;
+    data: object;
+    badge: number;
+    alert: object;
+    sound: string;
+}
+
+export class PushNotificationOptions {
+    onRegister?: (token: { os: string, token: string }) => void;
+    onNotification?: (notification: PushNotification) => void;
+    senderID?: string;
+    popInitialNotification?: boolean;
+    requestPermissions?: boolean;
+}
+
+export type RepeatType = 'week' | 'day' | 'hour' | 'minute' | 'time';
+
+export class PushNotificationObject {
+    /* Android only properties */
+    id?: string;
+    ticker?: string;
+    autoCancel?: boolean;
+    largeIcon?: string;
+    smallIcon?: string;
+    bigText?: string;
+    subText?: string;
+    color?: string;
+    vibrate?: boolean;
+    vibration?: number;
+    tag?: string;
+    group?: string;
+    ongoing?: boolean;
+
+    /* iOS only properties */
+    alertAction?: any;
+    category?: any;
+    userInfo?: any;
+
+    /* iOS and Android properties */
+    title?: string;
+    message: string;
+    playSound?: boolean;
+    soundName?: string;
+    number?: string;
+    repeatType?: RepeatType;
+    actions?: string;
+}
+
+export class PushNotificationScheduleObject extends PushNotificationObject {
+    date: Date;
+}
+
+export interface PushNotification {
+    configure(options: PushNotificationOptions): void;
+    unregister(): void;
+    localNotification(details: PushNotificationObject): void;
+    localNotificationSchedule(details: PushNotificationScheduleObject): void;
+    requestPermissions(): void;
+    presentLocalNotification(details: PushNotificationObject): void;
+    scheduleLocalNotification(details: PushNotificationScheduleObject): void;
+    cancelLocalNotifications(details: object): void;
+    cancelAllLocalNotifications(): void;
+    setApplicationIconBadgeNumber(badgeCount: number): void;
+    getApplicationIconBadgeNumber(callback: (badgeCount: number) => void): void;
+    popInitialNotification(): Promise<PushNotification>;
+    abandonPermissions(): void;
+    checkPermissions(callback: (permissions: PushNotificationPermissions) => void): void;
+    registerNotificationActions(actions: string[]): void;
+    clearAllNotifications(): void;
+}
+
+declare const PushNotification: PushNotification;
+
+export default PushNotification;
diff --git a/types/react-native-push-notification/react-native-push-notification-tests.ts b/types/react-native-push-notification/react-native-push-notification-tests.ts
new file mode 100644
index 0000000000..f23ab07ef1
--- /dev/null
+++ b/types/react-native-push-notification/react-native-push-notification-tests.ts
@@ -0,0 +1,25 @@
+import PushNotification from 'react-native-push-notification';
+
+PushNotification.configure({
+    onNotification: (notification) => {},
+    onRegister: (token) => {},
+    senderID: 'XXX',
+    popInitialNotification: false,
+    requestPermissions: true,
+});
+
+PushNotification.unregister();
+PushNotification.localNotification = (details) => {};
+PushNotification.localNotificationSchedule = (details) => {};
+PushNotification.requestPermissions();
+PushNotification.presentLocalNotification = (details) => {};
+PushNotification.scheduleLocalNotification = (details) => {};
+PushNotification.cancelLocalNotifications = (details) => {};
+PushNotification.cancelAllLocalNotifications();
+PushNotification.setApplicationIconBadgeNumber(1);
+PushNotification.getApplicationIconBadgeNumber((badgeCount) => {});
+PushNotification.popInitialNotification();
+PushNotification.checkPermissions((checkPermissions) => {});
+PushNotification.abandonPermissions();
+PushNotification.registerNotificationActions(['Accept', 'Reject', 'Yes', 'No']);
+PushNotification.clearAllNotifications();
diff --git a/types/react-native-push-notification/tsconfig.json b/types/react-native-push-notification/tsconfig.json
new file mode 100644
index 0000000000..a030044ab2
--- /dev/null
+++ b/types/react-native-push-notification/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-push-notification-tests.ts"
+    ]
+}
diff --git a/types/react-native-push-notification/tslint.json b/types/react-native-push-notification/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-push-notification/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-qrcode/index.d.ts b/types/react-native-qrcode/index.d.ts
new file mode 100644
index 0000000000..11b54f3a95
--- /dev/null
+++ b/types/react-native-qrcode/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for react-native-qrcode 0.2
+// Project: https://github.com/cssivision/react-native-qrcode
+// Definitions by: York Yao <https://github.com/plantain-00>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export default class QRCode extends React.Component<QRCodeProperties> { }
+
+export interface QRCodeProperties {
+  value?: string;
+  size?: number;
+  bgColor?: string;
+  fgColor?: string;
+}
diff --git a/types/react-native-qrcode/react-native-qrcode-tests.tsx b/types/react-native-qrcode/react-native-qrcode-tests.tsx
new file mode 100644
index 0000000000..2fd4b22750
--- /dev/null
+++ b/types/react-native-qrcode/react-native-qrcode-tests.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react';
+import QRCode from 'react-native-qrcode';
+
+import {
+  AppRegistry,
+  StyleSheet,
+  View,
+  TextInput
+} from 'react-native';
+
+class HelloWorld extends React.Component {
+  state = {
+    text: 'http://facebook.github.io/react-native/',
+  };
+
+  render() {
+    return (
+      <View style={styles.container}>
+        <TextInput
+          style={styles.input}
+          onChangeText={(text) => this.setState({ text })}
+          value={this.state.text}
+        />
+        <QRCode
+          value={this.state.text}
+          size={200}
+          bgColor='purple'
+          fgColor='white' />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: 'white',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+
+  input: {
+    height: 40,
+    borderColor: 'gray',
+    borderWidth: 1,
+    margin: 10,
+    borderRadius: 5,
+    padding: 5,
+  }
+});
diff --git a/types/react-native-qrcode/tsconfig.json b/types/react-native-qrcode/tsconfig.json
new file mode 100644
index 0000000000..b21253194b
--- /dev/null
+++ b/types/react-native-qrcode/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-qrcode-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-qrcode/tslint.json b/types/react-native-qrcode/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-qrcode/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-safari-view/index.d.ts b/types/react-native-safari-view/index.d.ts
index 6370d4c1ab..9a398fde28 100644
--- a/types/react-native-safari-view/index.d.ts
+++ b/types/react-native-safari-view/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/naoufal/react-native-safari-view
 // Definitions by: Michael Randolph <https://github.com/mrand01>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { EmitterSubscription } from 'react-native';
 
@@ -9,71 +10,53 @@ export interface SafariViewOptions {
     /**
      * A String containing the url you want to load in the Safari View
      *
-     * @type {string}
-     * @memberof SafariViewOptions
      */
     url: string;
 
     /**
      * A Boolean indicating to use Safari's Reader Mode if available
      *
-     * @type {boolean}
-     * @memberof SafariViewOptions
      */
     readerMode?: boolean;
 
     /**
      * A String containing a hex or rgba color to use for the browser controls
      *
-     * @type {string}
-     * @memberof SafariViewOptions
      */
     tintColor?: string;
 
     /**
      * A String containing a hex or rgba color to use for the background of the browser controls (only available on iOS 10 and higher)
      *
-     * @type {string}
-     * @memberof SafariViewOptions
      */
     barTintColor?: string;
 
     /**
      * A Boolean indicating to open the Safari View from the bottom
      *
-     * @type {boolean}
-     * @memberof SafariViewOptions
      */
     fromBottom?: boolean;
 }
 
-export default class SafariView {
+declare namespace SafariView {
     /**
      * Displays a Safari View with the provided URL
      *
-     * @param {SafariViewOptions} options
      */
-    static show(options: SafariViewOptions): Promise<boolean>;
+    function show(options: SafariViewOptions): Promise<boolean>;
 
     /**
      * Dismisses the currently active Safari View
      */
-    static dismiss(): void;
+    function dismiss(): void;
 
     /**
      * Checks if Safari View is available on the device
      */
-    static isAvailable(): Promise<boolean>;
+    function isAvailable(): Promise<boolean>;
 
-    /**
-     * @param {string} event
-     * @param {function} listener
-     */
-    static addEventListener(event: string, listener: () => void): EmitterSubscription;
+    function addEventListener(event: string, listener: () => void): EmitterSubscription;
 
-    /**
-     * @param {string} event
-     * @param {function} listener
-     */
-    static removeEventListener(event: string, listener: () => void): void;
+    function removeEventListener(event: string, listener: () => void): void;
 }
+export default SafariView;
diff --git a/types/react-native-sensor-manager/index.d.ts b/types/react-native-sensor-manager/index.d.ts
index 248fb84e09..85e5870f0a 100644
--- a/types/react-native-sensor-manager/index.d.ts
+++ b/types/react-native-sensor-manager/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kprimice/react-native-sensor-manager
 // Definitions by: Sahin Vardar <https://github.com/SahinVardar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="react-native" />
 
diff --git a/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx b/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx
index b89129fd93..5edbd84389 100644
--- a/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx
+++ b/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx
@@ -46,15 +46,15 @@ class SnapCarouselTest extends React.Component {
         );
     }
 
-    private onSnapToItem = (index: number) => {
+    private readonly onSnapToItem = (index: number) => {
         console.log("Snapped to: ", index);
     }
 
-    private onScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+    private readonly onScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
         console.log("Scrolled: ", event);
     }
 
-    private onLayout = (event: LayoutChangeEvent) => {
+    private readonly onLayout = (event: LayoutChangeEvent) => {
         console.log("Layout: ", event);
     }
 }
diff --git a/types/react-native-sortable-grid/index.d.ts b/types/react-native-sortable-grid/index.d.ts
new file mode 100644
index 0000000000..bc4826dd05
--- /dev/null
+++ b/types/react-native-sortable-grid/index.d.ts
@@ -0,0 +1,137 @@
+// Type definitions for react-native-sortable-grid 2.0
+// Project: https://github.com/ollija/react-native-sortable-grid#readme
+// Definitions by: Jacob Froman <https://github.com/j-fro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+import { StyleProp, ViewStyle, Animated } from 'react-native';
+
+interface SortableGridItemProps {
+    key: string;
+
+    /**
+     * Function that is executed when the block is tapped once, but not pressed
+     *  for long enough to activate the drag.
+     */
+    onTap?(): void;
+
+    /**
+     * Function that is executed when the block is double tapped within a
+     * timeframe of doubleTapTreshold (default 150ms). Assigning this will
+     * delay the execution of onTap. Omitting this will cause all taps to be
+     * handled as single taps, regardless of their frequency.
+     */
+    onDoubleTap?(): void;
+
+    /**
+     * Flag to mark a child node as being inactive. If set, no touch events
+     * will be fired when users interact with the node.
+     */
+    inactive?: boolean;
+}
+
+type SortableGridItem = React.ReactElement<SortableGridItemProps>;
+
+interface OrderedItem {
+    key: string;
+    ref: SortableGridItem | null;
+    order: number;
+}
+
+export interface ItemOrder {
+    itemOrder: ReadonlyArray<OrderedItem>;
+}
+
+interface SortableGridProps {
+    /**
+     * Custom styles to override or complement the sortableGrid native style.
+     */
+    style?: StyleProp<ViewStyle>;
+
+    /**
+     * How long should the transition of a passive block take when the active
+     * block takes its place (milliseconds)
+     */
+    blockTransitionDuration?: number;
+
+    /**
+     * How long should it take for the block that is being dragged to seek its
+     * place after it's released (milliseconds)
+     */
+    activeBlockCenteringDuration?: number;
+
+    /**
+     * How many items should be placed on one row
+     */
+    itemsPerRow?: number;
+
+    /**
+     * If set, itemsPerRow will be calculated to fit items of this size
+     */
+    itemWidth?: number;
+
+    /**
+     * When used together with itemsPerRow, sets the size of a block to
+     * something other than the default square
+     */
+    itemHeight?: number;
+
+    /**
+     * How long must the user hold the press on the block until it becomes
+     * active and can be dragged (milliseconds)
+     */
+    dragActivationThreshold?: number;
+
+    /**
+     * How long will the execution wait for the second tap before deciding it
+     * was a single tap (milliseconds). Will be omitted if no
+     * onDoubleTap-property is given to the item being tapped - In which case
+     * single-tap callback will be executed instantly
+     */
+    doubleTapTreshold?: number;
+
+    /**
+     * Function that is called when the dragging starts. This can be used to
+     * lock other touch responders from listening to the touch such as
+     * ScrollViews and Swipers.
+     */
+    onDragStart?(item: OrderedItem): void;
+
+    /**
+     * Function that is executed after the drag is released. Will return the
+     * new item order.
+     */
+    onDragRelease?(itemOrder: ItemOrder): void;
+
+    /**
+     * Function that is executed item is deleted. Will return the properties
+     * of the deleted item.
+     */
+    onDeleteItem?(deletedItem: OrderedItem): void;
+
+    /**
+     * Custom animation to override the default wiggle. Must be an object
+     * containing a key transform, which is an array of transformations.
+     */
+    dragStartAnimation?: {
+        transform: ReadonlyArray<{ [type: string]: Animated.AnimatedInterpolation }>;
+    };
+
+    /**
+     * Items to be rendered in the SortableGrid
+     */
+    children?: ReadonlyArray<SortableGridItem>;
+}
+
+interface SortableGridStatic extends React.ClassicComponentClass<SortableGridProps> {
+    /**
+     * Calling this will toggle item deletion mode on/off.
+     */
+    toggleDeleteMode(): { deleteModeOn: boolean };
+}
+
+declare var SortableGrid: SortableGridStatic;
+type SortableGrid = SortableGridStatic;
+
+export default SortableGrid;
diff --git a/types/react-native-sortable-grid/react-native-sortable-grid-tests.tsx b/types/react-native-sortable-grid/react-native-sortable-grid-tests.tsx
new file mode 100644
index 0000000000..78bc226316
--- /dev/null
+++ b/types/react-native-sortable-grid/react-native-sortable-grid-tests.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import SortableGrid from 'react-native-sortable-grid';
+import { View, Text } from 'react-native';
+
+export default class SortableGridExample extends React.Component {
+    render() {
+        const items = ['A', 'B', 'C', 'D'];
+
+        return (
+            <SortableGrid
+                blockTransitionDuration={400}
+                itemsPerRow={4}
+                onDragRelease={order => console.log(order)}
+            >
+                {items.map((letter, index) => (
+                    <View key={index}>
+                        <Text>{letter}</Text>
+                    </View>
+                ))}
+            </SortableGrid>
+        );
+    }
+}
diff --git a/types/react-native-sortable-grid/tsconfig.json b/types/react-native-sortable-grid/tsconfig.json
new file mode 100644
index 0000000000..d4391d4624
--- /dev/null
+++ b/types/react-native-sortable-grid/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react-native",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-sortable-grid-tests.tsx"
+    ]
+}
diff --git a/types/react-native-sortable-grid/tslint.json b/types/react-native-sortable-grid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-sortable-grid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-sortable-list/tslint.json b/types/react-native-sortable-list/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-native-sortable-list/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-native-tab-navigator/react-native-tab-navigator-tests.tsx b/types/react-native-tab-navigator/react-native-tab-navigator-tests.tsx
index d343a7b84e..18a6ae62ba 100644
--- a/types/react-native-tab-navigator/react-native-tab-navigator-tests.tsx
+++ b/types/react-native-tab-navigator/react-native-tab-navigator-tests.tsx
@@ -10,7 +10,7 @@ const tabBarImage = 'https://assets-cdn.github.com/images/modules/logos_page/Git
 
 class TabTest extends React.Component<any, TabTestState> {
     constructor() {
-        super();
+        super({});
 
         this.state = {
             selectedTab: 'home'
diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
new file mode 100644
index 0000000000..492287a754
--- /dev/null
+++ b/types/react-native-tab-view/index.d.ts
@@ -0,0 +1,237 @@
+// Type definitions for react-native-tab-view 0.0
+// Project: https://github.com/react-native-community/react-native-tab-view
+// Definitions by: Kalle Ott <https://github.com/kaoDev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { PureComponent, ReactNode } from 'react'
+import {
+  Animated,
+  StyleProp,
+  ViewStyle,
+  EasingFunction
+} from 'react-native'
+
+export type Key = { key: string }
+export type RouteBase = Key & { testID?: string }
+
+export type Route<T extends RouteBase = RouteBase> = T
+
+export type NavigationState<T extends Key> = {
+  index: number
+  routes: T[]
+}
+
+export type Scene<T> = {
+  route: T
+  focused: boolean
+  index: number
+}
+
+export type Layout = {
+  height: number
+  width: number
+}
+
+export type SceneRendererProps<T extends RouteBase = RouteBase> = {
+  layout: Layout & {
+    measured: boolean
+  }
+  navigationState: NavigationState<T>
+  position: Animated.Value
+  jumpToIndex: (index: number) => void
+  getLastPosition: () => number
+  subscribe: (
+    event: SubscriptionName,
+    callback: () => void
+  ) => { remove: () => void }
+}
+
+export type SubscriptionName = 'reset' | 'position'
+
+export type TransitionProps = {
+  progress: number
+}
+
+export type NavigationTransitionSpec = {
+  duration?: number,
+  // An easing function from `Easing`.
+  easing?: EasingFunction,
+  // A timing function such as `Animated.timing`.
+  timing?: (value: Animated.Value, config: any) => any,
+}
+
+export type TransitionConfigurator = (
+  currentTransitionProps: TransitionProps,
+  nextTransitionProps: TransitionProps
+) => NavigationTransitionSpec
+
+export type PagerProps = {
+  configureTransition?: TransitionConfigurator
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  swipeDistanceThreshold?: number
+  swipeVelocityThreshold?: number
+  children?: ReactNode
+}
+
+export type TabViewAnimatedProps<
+  T extends RouteBase = RouteBase
+> = PagerProps & {
+  navigationState: NavigationState<T>
+  onIndexChange: (index: number) => void
+  onPositionChange?: (props: { value: number }) => void
+  initialLayout?: Layout
+  canJumpToTab?: (route: T) => boolean
+  renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode
+  renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode
+  renderHeader?: (props: SceneRendererProps<T>) => ReactNode
+  renderFooter?: (props: SceneRendererProps<T>) => ReactNode
+  lazy?: boolean
+  style?: StyleProp<ViewStyle>
+}
+
+export class TabViewAnimated<T extends Route = Route> extends PureComponent<
+  TabViewAnimatedProps<T>,
+  any
+> {}
+
+export type GestureEvent = {
+  nativeEvent: {
+    changedTouches: any[]
+    identifier: number
+    locationX: number
+    locationY: number
+    pageX: number
+    pageY: number
+    target: number
+    timestamp: number
+    touches: any[]
+  }
+}
+
+export type GestureState = {
+  stateID: number
+  moveX: number
+  moveY: number
+  x0: number
+  y0: number
+  dx: number
+  dy: number
+  vx: number
+  vy: number
+  numberActiveTouches: number
+}
+
+export type GestureHandler = (event: GestureEvent, state: GestureState) => void
+
+export type TabViewPagerPanProps<
+  T extends RouteBase = RouteBase
+> = SceneRendererProps<T> & {
+  configureTransition?: TransitionConfigurator
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  swipeDistanceThreshold?: number
+  swipeVelocityThreshold?: number
+  onSwipeStart?: GestureHandler
+  onSwipeEnd?: GestureHandler
+  children?: ReactNode
+}
+
+export type DefaultTransitionSpec = {
+  timing: typeof Animated.spring
+  tension: 300
+  friction: 35
+}
+
+export class TabViewPagerPan<T extends Route = Route> extends PureComponent<
+  TabViewPagerPanProps<T>,
+  void
+> {
+  static defaultProps: {
+    configureTransition: () => DefaultTransitionSpec
+    initialLayout: {
+      height: 0
+      width: 0
+    }
+    swipeDistanceThreshold: 120
+    swipeVelocityThreshold: 0.25
+  }
+}
+
+export type ScrollEvent = {
+  nativeEvent: {
+    contentOffset: {
+      x: number
+      y: number
+    }
+  }
+}
+
+export type TabViewPagerScrollProps<
+  T extends RouteBase = RouteBase
+> = SceneRendererProps<T> & {
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  children?: ReactNode
+}
+
+export class TabViewPagerScroll<T extends Route = Route> extends PureComponent<
+  TabViewPagerScrollProps<T>,
+  any
+> {}
+
+export type PageScrollEvent = {
+  nativeEvent: {
+    position: number
+    offset: number
+  }
+}
+
+export type PageScrollState = 'dragging' | 'settling' | 'idle'
+
+export type TabViewPagerAndroidProps<
+  T extends RouteBase = RouteBase
+> = SceneRendererProps<T> & {
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  children?: ReactNode
+}
+
+export class TabViewPagerAndroid<T extends Route = Route> extends PureComponent<
+  TabViewPagerAndroidProps<T>,
+  void
+> {}
+
+export type IndicatorProps<
+  T extends RouteBase = RouteBase
+> = SceneRendererProps<T> & {
+  width: Animated.Value
+}
+
+export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
+  T
+> & {
+  scrollEnabled?: boolean
+  pressColor?: string
+  pressOpacity?: number
+  getLabelText?: (scene: Scene<T>) => string | undefined | null
+  renderLabel?: (scene: Scene<T>) => ReactNode
+  renderIcon?: (scene: Scene<T>) => ReactNode
+  renderBadge?: (scene: Scene<T>) => ReactNode
+  renderIndicator?: (props: IndicatorProps<T>) => ReactNode
+  onTabPress?: (scene: Scene<T>) => void
+  tabStyle?: StyleProp<ViewStyle>
+  indicatorStyle?: StyleProp<ViewStyle>
+  labelStyle?: StyleProp<ViewStyle>
+  style?: StyleProp<ViewStyle>
+}
+
+export class TabBar<T extends Route = Route> extends PureComponent<
+  TabBarProps<T>,
+  any
+> {}
+
+export function SceneMap(scenes: {
+  [key: string]: (props: any) => ReactNode
+}): (props: { route: Route }) => ReactNode
diff --git a/types/react-native-tab-view/react-native-tab-view-tests.tsx b/types/react-native-tab-view/react-native-tab-view-tests.tsx
new file mode 100644
index 0000000000..f57952cbc4
--- /dev/null
+++ b/types/react-native-tab-view/react-native-tab-view-tests.tsx
@@ -0,0 +1,53 @@
+import { PureComponent } from 'react'
+import { View, StyleSheet } from 'react-native'
+import {
+  TabViewAnimated,
+  TabBar,
+  SceneMap,
+  TabBarProps,
+  RouteBase,
+} from 'react-native-tab-view'
+
+const FirstRoute = () => (
+  <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
+)
+const SecondRoute = () => (
+  <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
+)
+
+class TabViewExample extends PureComponent {
+  state: { index: number; routes: Array<RouteBase & { title: string }> } = {
+    index: 0,
+    routes: [
+      { key: 'first', title: 'First' },
+      { key: 'second', title: 'Second' },
+    ],
+  }
+
+  _handleIndexChange = (index: number) => this.setState({ index })
+
+  _renderHeader = (props: TabBarProps) => <TabBar {...props} />
+
+  _renderScene = SceneMap({
+    first: FirstRoute,
+    second: SecondRoute,
+  })
+
+  render() {
+    return (
+      <TabViewAnimated
+        style={styles.container}
+        navigationState={this.state}
+        renderScene={this._renderScene}
+        renderHeader={this._renderHeader}
+        onIndexChange={this._handleIndexChange}
+      />
+    )
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+})
diff --git a/types/react-native-tab-view/tsconfig.json b/types/react-native-tab-view/tsconfig.json
new file mode 100644
index 0000000000..7449ff01dd
--- /dev/null
+++ b/types/react-native-tab-view/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "jsx": "preserve",
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "strictFunctionTypes": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": ["index.d.ts", "react-native-tab-view-tests.tsx"]
+}
diff --git a/types/react-native-tab-view/tslint.json b/types/react-native-tab-view/tslint.json
new file mode 100644
index 0000000000..80ebdb1ea5
--- /dev/null
+++ b/types/react-native-tab-view/tslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "semicolon": false,
+    "interface-over-type-literal": false,
+    "prefer-method-signature": false
+  }
+}
diff --git a/types/react-native-touch-id/tslint.json b/types/react-native-touch-id/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-native-touch-id/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-native-vector-icons/Icon.d.ts b/types/react-native-vector-icons/Icon.d.ts
index 07fd38f91b..98bda708b3 100644
--- a/types/react-native-vector-icons/Icon.d.ts
+++ b/types/react-native-vector-icons/Icon.d.ts
@@ -14,8 +14,6 @@ export interface IconProps extends TextProperties {
    * Size of the icon, can also be passed as fontSize in the style object.
    *
    * @default 12
-   * @type {string}
-   * @memberof IconProps
    */
   size?: number;
 
@@ -24,16 +22,12 @@ export interface IconProps extends TextProperties {
    *
    * See Icon Explorer app
    * {@link https://github.com/oblador/react-native-vector-icons/tree/master/Examples/IconExplorer}
-   * @type {string}
-   * @memberof IconProps
    */
   name: string;
 
   /**
    * Color of the icon
    *
-   * @type {string}
-   * @memberof IconProps
    */
   color?: string;
 }
@@ -44,8 +38,6 @@ export interface IconButtonProps extends IconProps, TouchableHighlightProperties
    * Use iconStyle or nest a Text component if you need different colors.
    *
    * @default 'white'
-   * @type {string}
-   * @memberof IconButtonProps
    */
   color?: string;
 
@@ -54,8 +46,6 @@ export interface IconButtonProps extends IconProps, TouchableHighlightProperties
    * Set to 0 to disable.
    *
    * @default 5
-   * @type {number}
-   * @memberof IconButtonProps
    */
   borderRadius?: number;
 
@@ -64,8 +54,6 @@ export interface IconButtonProps extends IconProps, TouchableHighlightProperties
    * Good for setting margins or a different color.
    *
    * @default {marginRight: 10}
-   * @type {ViewStyle}
-   * @memberof IconButtonProps
    */
   iconStyle?: ViewStyle;
 
@@ -73,8 +61,6 @@ export interface IconButtonProps extends IconProps, TouchableHighlightProperties
    * Style prop inherited from TextProperties and TouchableWithoutFeedbackProperties
    * Only exist here so we can have ViewStyle or TextStyle
    *
-   * @type {(ViewStyle | TextStyle)}
-   * @memberof IconButtonProps
    */
   style?: ViewStyle | TextStyle;
 
@@ -82,8 +68,6 @@ export interface IconButtonProps extends IconProps, TouchableHighlightProperties
    * Background color of the button
    *
    * @default '#007AFF'
-   * @type {string}
-   * @memberof IconButtonProps
    */
   backgroundColor?: string;
 }
@@ -95,8 +79,6 @@ export interface ToolbarAndroidProps extends ToolbarAndroidProperties {
    * Name of the navigation logo icon
    * (similar to ToolbarAndroid logo)
    *
-   * @type {string}
-   * @memberof ToolbarAndroidProps
    */
   logoName: string;
 
@@ -104,8 +86,6 @@ export interface ToolbarAndroidProps extends ToolbarAndroidProperties {
    * Name of the navigation icon
    * (similar to ToolbarAndroid navIcon)
    *
-   * @type {string}
-   * @memberof ToolbarAndroidProps
    */
   navIconName: string;
 
@@ -113,8 +93,6 @@ export interface ToolbarAndroidProps extends ToolbarAndroidProperties {
    * Name of the overflow icon
    * (similar to ToolbarAndroid overflowIcon)
    *
-   * @type {string}
-   * @memberof ToolbarAndroidProps
    */
   overflowIconName: string;
 
@@ -122,8 +100,6 @@ export interface ToolbarAndroidProps extends ToolbarAndroidProperties {
    * Size of the icons
    *
    * @default 24
-   * @type {number}
-   * @memberof ToolbarAndroidProps
    */
   iconSize: number;
 
@@ -131,8 +107,6 @@ export interface ToolbarAndroidProps extends ToolbarAndroidProperties {
    * Color of the icons
    *
    * @default 'black'
-   * @type {string}
-   * @memberof ToolbarAndroidProps
    */
   iconColor: string;
 }
@@ -141,8 +115,6 @@ export interface TabBarItemIOSProps extends TabBarItemProperties {
   /**
    * Name of the default icon (similar to TabBarIOS.Item icon)
    *
-   * @type {string}
-   * @memberof TabBarIOSItemProps
    */
   iconName: string;
 
@@ -151,8 +123,6 @@ export interface TabBarItemIOSProps extends TabBarItemProperties {
    *
    * Defaults to iconName
    *
-   * @type {string}
-   * @memberof TabBarIOSItemProps
    */
   selectedIconName?: string;
 
@@ -160,16 +130,12 @@ export interface TabBarItemIOSProps extends TabBarItemProperties {
    * Size of the icon
    *
    * @default 30
-   * @type {number}
-   * @memberof TabBarIOSItemProps
    */
   iconSize?: number;
 
   /**
    * Color of the icon
    *
-   * @type {string}
-   * @memberof TabBarIOSItemProps
    */
   iconColor?: string;
 
@@ -178,8 +144,6 @@ export interface TabBarItemIOSProps extends TabBarItemProperties {
    *
    * Defaults to iconColor
    *
-   * @type {string}
-   * @memberof TabBarIOSItemProps
    */
   selectedIconColor?: string;
 }
@@ -187,8 +151,8 @@ export interface TabBarItemIOSProps extends TabBarItemProperties {
 export class Icon extends React.Component<IconProps, any> {
   static getImageSource(
     name: string,
-    color: string,
-    size?: number
+    size?: number,
+    color?: string,
   ): Promise<ImageSource>;
   static loadFont(
     file?: string
diff --git a/types/react-native-vector-icons/index.d.ts b/types/react-native-vector-icons/index.d.ts
index 9569cd3866..39bb2a6640 100644
--- a/types/react-native-vector-icons/index.d.ts
+++ b/types/react-native-vector-icons/index.d.ts
@@ -16,9 +16,6 @@ import { TextProperties } from 'react-native';
  * Optionally pass the third fontFile argument for android support, it should be a path
  * to the font file in you asset folder.
  *
- * @param glyphMap
- * @param fontFamily
- * @param fontFile
  */
 export function createIconSet(
   glyphMap: {},
@@ -37,9 +34,6 @@ export function createIconSet(
  * const Icon = createIconSetFromFontello(fontelloConfig);
  *
  * @see http://fontello.com
- * @export
- * @param {{}} config
- * @returns {Icon}
  */
 export function createIconSetFromFontello(config: {}): typeof Icon;
 
@@ -55,8 +49,5 @@ export function createIconSetFromFontello(config: {}): typeof Icon;
  * const Icon = createIconSetFromIcoMoon(icoMoonConfig);
  *
  * @see https://icomoon.io/app
- * @export
- * @param {{}} config
- * @returns {Icon}
  */
 export function createIconSetFromIcoMoon(config: {}): typeof Icon;
diff --git a/types/react-native-vector-icons/react-native-vector-icons-tests.tsx b/types/react-native-vector-icons/react-native-vector-icons-tests.tsx
index b6adf8d8c6..4e1fe13e8a 100644
--- a/types/react-native-vector-icons/react-native-vector-icons-tests.tsx
+++ b/types/react-native-vector-icons/react-native-vector-icons-tests.tsx
@@ -43,9 +43,9 @@ class Example extends React.Component {
   }
 }
 
-class TabTest extends React.Component<any, { selectedTab: string }> {
+class TabTest extends React.Component<{}, { selectedTab: string }> {
   constructor() {
-    super();
+    super({});
 
     this.state = {
       selectedTab: 'tab1'
@@ -85,7 +85,7 @@ class TabTest extends React.Component<any, { selectedTab: string }> {
 
 class TestCustomIcon extends React.Component {
   constructor() {
-    super();
+    super({});
   }
 
   handleButton() {
diff --git a/types/react-native/globals.d.ts b/types/react-native/globals.d.ts
index 4753591ff6..b222b50ca4 100644
--- a/types/react-native/globals.d.ts
+++ b/types/react-native/globals.d.ts
@@ -19,4 +19,6 @@ declare function setImmediate(handler: (...args: any[]) => void): number;
 declare function cancelAnimationFrame(handle: number): void;
 declare function requestAnimationFrame(callback: (time: number) => void): number;
 
+declare function fetchBundle(bundleId: number, callback: (error?: Error | null) => void): void;
+
 declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 3f02a5f6c5..7368241a9e 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for react-native 0.49
+// Type definitions for react-native 0.52
 // Project: https://github.com/facebook/react-native
 // Definitions by: Eloy Durán <https://github.com/alloy>
 //                 HuHuanming <https://github.com/huhuanming>
 //                 Kyle Roach <https://github.com/iRoachie>
 //                 Tim Wang <https://github.com/timwangdev>
 //                 Kamal Mahyuddin <https://github.com/kamal>
+//                 Naoufal El Yousfi <https://github.com/nelyousfi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -25,48 +26,37 @@
 /// <reference path="globals.d.ts" />
 
 export type MeasureOnSuccessCallback = (
-        x: number,
-        y: number,
-        width: number,
-        height: number,
-        pageX: number,
-        pageY: number
-    ) => void
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+    pageX: number,
+    pageY: number
+) => void;
 
-export type MeasureInWindowOnSuccessCallback = (
-        x: number,
-        y: number,
-        width: number,
-        height: number
-    ) => void
+export type MeasureInWindowOnSuccessCallback = (x: number, y: number, width: number, height: number) => void;
 
-export type MeasureLayoutOnSuccessCallback = (
-        left: number,
-        top: number,
-        width: number,
-        height: number
-    ) => void
+export type MeasureLayoutOnSuccessCallback = (left: number, top: number, width: number, height: number) => void;
 
 /**
  * EventSubscription represents a subscription to a particular event. It can
  * remove its own subscription.
  */
 interface EventSubscription {
-
     eventType: string;
     key: number;
     subscriber: EventSubscriptionVendor;
 
     /**
-     * @param {EventSubscriptionVendor} subscriber the subscriber that controls
+     * @param subscriber the subscriber that controls
      *   this subscription.
      */
-    new(subscriber: EventSubscriptionVendor): EventSubscription
+    new (subscriber: EventSubscriptionVendor): EventSubscription;
 
     /**
      * Removes this subscription from the subscriber that controls it.
      */
-    remove(): void
+    remove(): void;
 }
 
 /**
@@ -74,32 +64,28 @@ interface EventSubscription {
  * subscribed to a particular event type.
  */
 interface EventSubscriptionVendor {
-
-    constructor(): EventSubscriptionVendor
+    constructor(): EventSubscriptionVendor;
 
     /**
      * Adds a subscription keyed by an event type.
      *
-     * @param {string} eventType
-     * @param {EventSubscription} subscription
      */
-    addSubscription(eventType: string, subscription: EventSubscription): EventSubscription
+    addSubscription(eventType: string, subscription: EventSubscription): EventSubscription;
 
     /**
      * Removes a bulk set of the subscriptions.
      *
-     * @param {?string} eventType - Optional name of the event type whose
+     * @param eventType - Optional name of the event type whose
      *   registered supscriptions to remove, if null remove all subscriptions.
      */
-    removeAllSubscriptions(eventType?: string): void
+    removeAllSubscriptions(eventType?: string): void;
 
     /**
      * Removes a specific subscription. Instead of calling this function, call
      * `subscription.remove()` directly.
      *
-     * @param {object} subscription
      */
-    removeSubscription(subscription: any): void
+    removeSubscription(subscription: any): void;
 
     /**
      * Returns the array of subscriptions that are currently registered for the
@@ -108,31 +94,34 @@ interface EventSubscriptionVendor {
      * Note: This array can be potentially sparse as subscriptions are deleted
      * from it when they are removed.
      *
-     * @param {string} eventType
-     * @returns {?array}
      */
-    getSubscriptionsForType(eventType: string): EventSubscription[]
+    getSubscriptionsForType(eventType: string): EventSubscription[];
 }
 
 /**
  * EmitterSubscription represents a subscription with listener and context data.
  */
 interface EmitterSubscription extends EventSubscription {
-    emitter: EventEmitter
-    listener: () => any
-    context: any
+    emitter: EventEmitter;
+    listener: () => any;
+    context: any;
 
     /**
-     * @param {EventEmitter} emitter - The event emitter that registered this
+     * @param emitter - The event emitter that registered this
      *   subscription
-     * @param {EventSubscriptionVendor} subscriber - The subscriber that controls
+     * @param subscriber - The subscriber that controls
      *   this subscription
-     * @param {function} listener - Function to invoke when the specified event is
+     * @param listener - Function to invoke when the specified event is
      *   emitted
-     * @param {*} context - Optional context object to use when invoking the
+     * @param context - Optional context object to use when invoking the
      *   listener
      */
-    new(emitter: EventEmitter, subscriber: EventSubscriptionVendor, listener: () => any, context: any): EmitterSubscription
+    new (
+        emitter: EventEmitter,
+        subscriber: EventSubscriptionVendor,
+        listener: () => any,
+        context: any
+    ): EmitterSubscription;
 
     /**
      * Removes this subscription from the emitter that registered it.
@@ -140,7 +129,7 @@ interface EmitterSubscription extends EventSubscription {
      * but deliberately not calling `super.remove()` as the responsibility
      * for removing the subscription lies with the EventEmitter.
      */
-    remove(): void
+    remove(): void;
 }
 
 interface EventEmitterListener {
@@ -149,44 +138,43 @@ interface EventEmitterListener {
      * emitted. An optional calling context may be provided. The data arguments
      * emitted will be passed to the listener function.
      *
-     * @param {string} eventType - Name of the event to listen to
-     * @param {function} listener - Function to invoke when the specified event is
+     * @param eventType - Name of the event to listen to
+     * @param listener - Function to invoke when the specified event is
      *   emitted
-     * @param {*} context - Optional context object to use when invoking the
+     * @param context - Optional context object to use when invoking the
      *   listener
      */
-    addListener(eventType: string, listener: (...args: any[]) => any, context?: any): EmitterSubscription
+    addListener(eventType: string, listener: (...args: any[]) => any, context?: any): EmitterSubscription;
 }
 
 interface EventEmitter extends EventEmitterListener {
     /**
-     * @constructor
      *
-     * @param {EventSubscriptionVendor} subscriber - Optional subscriber instance
+     * @param subscriber - Optional subscriber instance
      *   to use. If omitted, a new subscriber will be created for the emitter.
      */
-    new(subscriber?: EventSubscriptionVendor): EventEmitter
+    new (subscriber?: EventSubscriptionVendor): EventEmitter;
 
     /**
      * Similar to addListener, except that the listener is removed after it is
      * invoked once.
      *
-     * @param {string} eventType - Name of the event to listen to
-     * @param {function} listener - Function to invoke only once when the
+     * @param eventType - Name of the event to listen to
+     * @param listener - Function to invoke only once when the
      *   specified event is emitted
-     * @param {*} context - Optional context object to use when invoking the
+     * @param context - Optional context object to use when invoking the
      *   listener
      */
-    once(eventType: string, listener: (...args: any[]) => any, context: any): EmitterSubscription
+    once(eventType: string, listener: (...args: any[]) => any, context: any): EmitterSubscription;
 
     /**
      * Removes all of the registered listeners, including those registered as
      * listener maps.
      *
-     * @param {?string} eventType - Optional name of the event whose registered
+     * @param eventType - Optional name of the event whose registered
      *   listeners to remove
      */
-    removeAllListeners(eventType?: string): void
+    removeAllListeners(eventType?: string): void;
 
     /**
      * Provides an API that can be called during an eventing cycle to remove the
@@ -209,29 +197,28 @@ interface EventEmitter extends EventEmitterListener {
      *   emitter.emit('someEvent', 'abc'); // logs 'abc'
      *   emitter.emit('someEvent', 'def'); // does not log anything
      */
-    removeCurrentListener(): void
+    removeCurrentListener(): void;
 
     /**
      * Removes a specific subscription. Called by the `remove()` method of the
      * subscription itself to ensure any necessary cleanup is performed.
      */
-    removeSubscription(subscription: EmitterSubscription): void
+    removeSubscription(subscription: EmitterSubscription): void;
 
     /**
      * Returns an array of listeners that are currently registered for the given
      * event.
      *
-     * @param {string} eventType - Name of the event to query
-     * @returns {array}
+     * @param eventType - Name of the event to query
      */
-    listeners(eventType: string): EmitterSubscription[]
+    listeners(eventType: string): EmitterSubscription[];
 
     /**
      * Emits an event of the given type with the given data. All handlers of that
      * particular type will be notified.
      *
-     * @param {string} eventType - Name of the event to emit
-     * @param {...*} Arbitrary arguments to be passed to each registered listener
+     * @param eventType - Name of the event to emit
+     * @param Arbitrary arguments to be passed to each registered listener
      *
      * @example
      *   emitter.addListener('someEvent', function(message) {
@@ -240,13 +227,13 @@ interface EventEmitter extends EventEmitterListener {
      *
      *   emitter.emit('someEvent', 'abc'); // logs 'abc'
      */
-    emit(eventType: string, ...params: any[]): void
+    emit(eventType: string, ...params: any[]): void;
 
     /**
      * Removes the given listener for event of specific type.
      *
-     * @param {string} eventType - Name of the event to emit
-     * @param {function} listener - Function to invoke when the specified event is
+     * @param eventType - Name of the event to emit
+     * @param listener - Function to invoke when the specified event is
      *   emitted
      *
      * @example
@@ -255,7 +242,7 @@ interface EventEmitter extends EventEmitterListener {
      *   }); // removes the listener if already registered
      *
      */
-    removeListener(eventType: string, listener: (...args: any[]) => any): void
+    removeListener(eventType: string, listener: (...args: any[]) => any): void;
 }
 
 /** NativeMethodsMixin provides methods to access the underlying native component directly.
@@ -314,7 +301,7 @@ export interface NativeMethodsMixinStatic {
      */
     measureLayout(
         relativeToNativeNode: number,
-    onSuccess: MeasureLayoutOnSuccessCallback,
+        onSuccess: MeasureLayoutOnSuccessCallback,
         onFail: () => void /* currently unused */
     ): void;
 
@@ -338,7 +325,7 @@ export interface NativeMethodsMixinStatic {
     blur(): void;
 
     refs: {
-        [key: string]: React.Component<any, any>
+        [key: string]: React.Component<any, any>;
     };
 }
 
@@ -346,8 +333,8 @@ export interface NativeMethodsMixinStatic {
 export function createElement<P>(
     type: React.ReactType,
     props?: P,
-    ...children: React.ReactNode[]): React.ReactElement<P>;
-
+    ...children: React.ReactNode[]
+): React.ReactElement<P>;
 
 export type Runnable = (appParameters: any) => void;
 
@@ -355,81 +342,79 @@ type NodeHandle = number;
 
 // Similar to React.SyntheticEvent except for nativeEvent
 interface NativeSyntheticEvent<T> {
-    bubbles: boolean
-    cancelable: boolean
-    currentTarget: NodeHandle
-    defaultPrevented: boolean
-    eventPhase: number
-    isTrusted: boolean
-    nativeEvent: T
-    preventDefault(): void
-    stopPropagation(): void
-    target: NodeHandle
-    timeStamp: number
-    type: string
+    bubbles: boolean;
+    cancelable: boolean;
+    currentTarget: NodeHandle;
+    defaultPrevented: boolean;
+    eventPhase: number;
+    isTrusted: boolean;
+    nativeEvent: T;
+    preventDefault(): void;
+    stopPropagation(): void;
+    target: NodeHandle;
+    timeStamp: number;
+    type: string;
 }
 
 export interface NativeTouchEvent {
     /**
      * Array of all touch events that have changed since the last event
      */
-    changedTouches: NativeTouchEvent[]
+    changedTouches: NativeTouchEvent[];
 
     /**
      * The ID of the touch
      */
-    identifier: string
+    identifier: string;
 
     /**
      * The X position of the touch, relative to the element
      */
-    locationX: number
+    locationX: number;
 
     /**
      * The Y position of the touch, relative to the element
      */
-    locationY: number
+    locationY: number;
 
     /**
      * The X position of the touch, relative to the screen
      */
-    pageX: number
+    pageX: number;
 
     /**
      * The Y position of the touch, relative to the screen
      */
-    pageY: number
+    pageY: number;
 
     /**
      * The node id of the element receiving the touch event
      */
-    target: string
+    target: string;
 
     /**
      * A time identifier for the touch, useful for velocity calculation
      */
-    timestamp: number
+    timestamp: number;
 
     /**
      * Array of all current touches on the screen
      */
-    touches: NativeTouchEvent[]
-}
-
-export interface GestureResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {
+    touches: NativeTouchEvent[];
 }
 
+export interface GestureResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {}
 
 export interface PointProperties {
-    x: number
-    y: number
+    x: number;
+    y: number;
 }
 
 export interface Insets {
-    top?: number
-    left?: number
-    bottom?: number
-    right?: number
+    top?: number;
+    left?: number;
+    bottom?: number;
+    right?: number;
 }
 
 /**
@@ -437,20 +422,20 @@ export interface Insets {
  * @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
+    onTouchStart?: (event: GestureResponderEvent) => void;
+    onTouchMove?: (event: GestureResponderEvent) => void;
+    onTouchEnd?: (event: GestureResponderEvent) => void;
+    onTouchCancel?: (event: GestureResponderEvent) => void;
+    onTouchEndCapture?: (event: GestureResponderEvent) => void;
 }
 
-export type ComponentProvider = () => React.ComponentType<any>
+export type ComponentProvider = () => React.ComponentType<any>;
 
 export type AppConfig = {
     appKey: string;
-    component?: ComponentProvider
+    component?: ComponentProvider;
     run?: Runnable;
-}
+};
 
 // https://github.com/facebook/react-native/blob/master/Libraries/AppRegistry/AppRegistry.js
 /**
@@ -468,47 +453,47 @@ export type AppConfig = {
  * sure the JS execution environment is setup before other modules are
  * `require`d.
  */
-export class AppRegistry {
-    static registerConfig(config: AppConfig[]): void;
+export namespace AppRegistry {
+    function registerConfig(config: AppConfig[]): void;
 
-    static registerComponent( appKey: string, getComponentFunc: ComponentProvider ): string;
+    function registerComponent(appKey: string, getComponentFunc: ComponentProvider): string;
 
-    static registerRunnable(appKey: string, func: Runnable): string;
+    function registerRunnable(appKey: string, func: Runnable): string;
 
-    static getAppKeys(): string[];
+    function getAppKeys(): string[];
 
-    static unmountApplicationComponentAtRootTag(rootTag: number): void;
+    function unmountApplicationComponentAtRootTag(rootTag: number): void;
 
-    static runApplication(appKey: string, appParameters: any): void;
+    function runApplication(appKey: string, appParameters: any): void;
 }
 
 export interface LayoutAnimationTypes {
-    spring: string
-    linear: string
-    easeInEaseOut: string
-    easeIn: string
-    easeOut: string
+    spring: string;
+    linear: string;
+    easeInEaseOut: string;
+    easeIn: string;
+    easeOut: string;
 }
 
 export interface LayoutAnimationProperties {
-    opacity: string
-    scaleXY: string
+    opacity: string;
+    scaleXY: string;
 }
 
 export interface LayoutAnimationAnim {
-    duration?: number
-    delay?: number
-    springDamping?: number
-    initialVelocity?: number
-    type?: string //LayoutAnimationTypes
-    property?: string //LayoutAnimationProperties
+    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
+    duration: number;
+    create?: LayoutAnimationAnim;
+    update?: LayoutAnimationAnim;
+    delete?: LayoutAnimationAnim;
 }
 
 /** Automatically animates views to their new positions when the next layout happens.
@@ -522,20 +507,20 @@ export interface LayoutAnimationStatic {
      * `update`, config for animating views that have been updated (see Anim type)
      * @param onAnimationDidEnd Called when the animation finished. Only supported on iOS.
      */
-    configureNext: ( config: LayoutAnimationConfig, onAnimationDidEnd?: () => void ) => void
+    configureNext: (config: LayoutAnimationConfig, onAnimationDidEnd?: () => void) => void;
     /** Helper for creating a config for configureNext. */
-    create: (duration: number, type?: string, creationProp?: string) => LayoutAnimationConfig
-    Types: LayoutAnimationTypes
-    Properties: LayoutAnimationProperties
-    configChecker: (shapeTypes: {[key: string]: any}) => any
+    create: (duration: number, type?: string, creationProp?: string) => LayoutAnimationConfig;
+    Types: LayoutAnimationTypes;
+    Properties: LayoutAnimationProperties;
+    configChecker: (shapeTypes: { [key: string]: any }) => any;
     Presets: {
-        easeInEaseOut: LayoutAnimationConfig
-        linear: LayoutAnimationConfig
-        spring: LayoutAnimationConfig
-    }
-    easeInEaseOut: (onAnimationDidEnd?: () => void) => void
-    linear: (onAnimationDidEnd?: () => void) => void
-    spring: (onAnimationDidEnd?: () => void) => void
+        easeInEaseOut: LayoutAnimationConfig;
+        linear: LayoutAnimationConfig;
+        spring: LayoutAnimationConfig;
+    };
+    easeInEaseOut: (onAnimationDidEnd?: () => void) => void;
+    linear: (onAnimationDidEnd?: () => void) => void;
+    spring: (onAnimationDidEnd?: () => void) => void;
 }
 
 type FlexAlignType = "flex-start" | "flex-end" | "center" | "stretch" | "baseline";
@@ -546,54 +531,54 @@ type FlexAlignType = "flex-start" | "flex-end" | "center" | "stretch" | "baselin
  * @see LayoutPropTypes.js
  */
 export interface FlexStyle {
-    alignContent?: "flex-start" | "flex-end" | "center" | "stretch" | "space-between" | "space-around"
-    alignItems?: FlexAlignType
-    alignSelf?: "auto" | FlexAlignType
-    aspectRatio?: number
-    borderBottomWidth?: number
-    borderLeftWidth?: number
-    borderRightWidth?: number
-    borderTopWidth?: number
-    borderWidth?: number
-    bottom?: number | string
-    flex?: number
-    flexBasis?: number | string
-    flexDirection?: "row" | "column" | "row-reverse" | "column-reverse"
-    flexGrow?: number
-    flexShrink?: number
-    flexWrap?: "wrap" | "nowrap"
-    height?: number | string
-    justifyContent?: "flex-start" | "flex-end" | "center" | "space-between" | "space-around"
-    left?: number | string
-    margin?: number | string
-    marginBottom?: number | string
-    marginHorizontal?: number | string
-    marginLeft?: number | string
-    marginRight?: number | string
-    marginTop?: number | string
-    marginVertical?: number | string
-    maxHeight?: number | string
-    maxWidth?: number | string
-    minHeight?: number | string
-    minWidth?: number | string
-    overflow?: "visible" | "hidden" | "scroll"
-    padding?: number | string
-    paddingBottom?: number | string
-    paddingHorizontal?: number | string
-    paddingLeft?: number | string
-    paddingRight?: number | string
-    paddingTop?: number | string
-    paddingVertical?: number | string
-    position?: "absolute" | "relative"
-    right?: number | string
-    top?: number | string
-    width?: number | string
-    zIndex?: number
+    alignContent?: "flex-start" | "flex-end" | "center" | "stretch" | "space-between" | "space-around";
+    alignItems?: FlexAlignType;
+    alignSelf?: "auto" | FlexAlignType;
+    aspectRatio?: number;
+    borderBottomWidth?: number;
+    borderLeftWidth?: number;
+    borderRightWidth?: number;
+    borderTopWidth?: number;
+    borderWidth?: number;
+    bottom?: number | string;
+    flex?: number;
+    flexBasis?: number | string;
+    flexDirection?: "row" | "column" | "row-reverse" | "column-reverse";
+    flexGrow?: number;
+    flexShrink?: number;
+    flexWrap?: "wrap" | "nowrap";
+    height?: number | string;
+    justifyContent?: "flex-start" | "flex-end" | "center" | "space-between" | "space-around";
+    left?: number | string;
+    margin?: number | string;
+    marginBottom?: number | string;
+    marginHorizontal?: number | string;
+    marginLeft?: number | string;
+    marginRight?: number | string;
+    marginTop?: number | string;
+    marginVertical?: number | string;
+    maxHeight?: number | string;
+    maxWidth?: number | string;
+    minHeight?: number | string;
+    minWidth?: number | string;
+    overflow?: "visible" | "hidden" | "scroll";
+    padding?: number | string;
+    paddingBottom?: number | string;
+    paddingHorizontal?: number | string;
+    paddingLeft?: number | string;
+    paddingRight?: number | string;
+    paddingTop?: number | string;
+    paddingVertical?: number | string;
+    position?: "absolute" | "relative";
+    right?: number | string;
+    top?: number | string;
+    width?: number | string;
+    zIndex?: number;
 
     /**
      * @platform ios
      */
-    direction?: 'inherit' | 'ltr' | 'rtl'
+    direction?: "inherit" | "ltr" | "rtl";
 }
 
 /**
@@ -604,47 +589,51 @@ export interface ShadowPropTypesIOSStatic {
      * Sets the drop shadow color
      * @platform ios
      */
-    shadowColor: string
+    shadowColor: string;
 
     /**
      * Sets the drop shadow offset
      * @platform ios
      */
-    shadowOffset: { width: number, height: number }
+    shadowOffset: { width: number; height: number };
 
     /**
      * Sets the drop shadow opacity (multiplied by the color's alpha component)
      * @platform ios
      */
-    shadowOpacity: number
+    shadowOpacity: number;
 
     /**
      * Sets the drop shadow blur radius
      * @platform ios
      */
-    shadowRadius: number
+    shadowRadius: number;
 }
 
+type GeoConfiguration = {
+    skipPermissionRequests: boolean;
+};
+
 type GeoOptions = {
-    timeout?: number,
-    maximumAge?: number,
-    enableHighAccuracy?: boolean,
-    distanceFilter?: number,
-    useSignificantChanges?: boolean,
-}
+    timeout?: number;
+    maximumAge?: number;
+    enableHighAccuracy?: boolean;
+    distanceFilter?: number;
+    useSignificantChanges?: boolean;
+};
 
 type GeolocationReturnType = {
     coords: {
-        latitude: number
-        longitude: number
-        altitude: number | null
-        accuracy: number
-        altitudeAccuracy: number | null
-        heading: number | null
-        speed: number | null
-    }
-    timestamp: number
-}
+        latitude: number;
+        longitude: number;
+        altitude: number | null;
+        accuracy: number;
+        altitudeAccuracy: number | null;
+        heading: number | null;
+        speed: number | null;
+    };
+    timestamp: number;
+};
 
 type GeolocationError = {
     code: number;
@@ -652,7 +641,7 @@ type GeolocationError = {
     PERMISSION_DENIED: number;
     POSITION_UNAVAILABLE: number;
     TIMEOUT: number;
-}
+};
 
 interface PerpectiveTransform {
     perspective: number;
@@ -704,31 +693,29 @@ interface SkewYTransform {
 
 export interface TransformsStyle {
     transform?: (
-        PerpectiveTransform |
-        RotateTransform |
-        RotateXTransform |
-        RotateYTransform |
-        RotateZTransform |
-        ScaleTransform |
-        ScaleXTransform |
-        ScaleYTransform |
-        TranslateXTransform |
-        TranslateYTransform |
-        SkewXTransform |
-        SkewYTransform
-    )[]
-    transformMatrix?: Array<number>
-    rotation?: number
-    scaleX?: number
-    scaleY?: number
-    translateX?: number
-    translateY?: number
+        | PerpectiveTransform
+        | RotateTransform
+        | RotateXTransform
+        | RotateYTransform
+        | RotateZTransform
+        | ScaleTransform
+        | ScaleXTransform
+        | ScaleYTransform
+        | TranslateXTransform
+        | TranslateYTransform
+        | SkewXTransform
+        | SkewYTransform)[];
+    transformMatrix?: Array<number>;
+    rotation?: number;
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
 }
 
-
 export interface StyleSheetProperties {
-    hairlineWidth: number
-    flatten<T extends string>(style: T): T
+    hairlineWidth: number;
+    flatten<T extends string>(style: T): T;
 }
 
 export interface LayoutRectangle {
@@ -741,48 +728,48 @@ export interface LayoutRectangle {
 // @see TextProperties.onLayout
 export interface LayoutChangeEvent {
     nativeEvent: {
-        layout: LayoutRectangle
-    }
+        layout: LayoutRectangle;
+    };
 }
 
 export interface TextStyleIOS extends ViewStyle {
-    letterSpacing?: number
-    textDecorationColor?: string
-    textDecorationStyle?: "solid" | "double" | "dotted" | "dashed"
-    writingDirection?: "auto" | "ltr" | "rtl"
+    letterSpacing?: number;
+    textDecorationColor?: string;
+    textDecorationStyle?: "solid" | "double" | "dotted" | "dashed";
+    writingDirection?: "auto" | "ltr" | "rtl";
 }
 
 export interface TextStyleAndroid extends ViewStyle {
-    textAlignVertical?: "auto" | "top" | "bottom" | "center"
-    includeFontPadding?: boolean
+    textAlignVertical?: "auto" | "top" | "bottom" | "center";
+    includeFontPadding?: boolean;
 }
 
 // @see https://facebook.github.io/react-native/docs/text.html#style
 export interface TextStyle extends TextStyleIOS, TextStyleAndroid, ViewStyle {
-    color?: string
-    fontFamily?: string
-    fontSize?: number
-    fontStyle?: "normal" | "italic"
+    color?: string;
+    fontFamily?: string;
+    fontSize?: number;
+    fontStyle?: "normal" | "italic";
     /**
      * Specifies font weight. The values 'normal' and 'bold' are supported
      * for most fonts. Not all fonts have a variant for each of the numeric
      * values, in that case the closest one is chosen.
      */
-    fontWeight?: "normal" | "bold" | "100" | "200" | "300" | "400" | "500" | "600" | "700" | "800" | "900"
-    letterSpacing?: number
-    lineHeight?: number
+    fontWeight?: "normal" | "bold" | "100" | "200" | "300" | "400" | "500" | "600" | "700" | "800" | "900";
+    letterSpacing?: number;
+    lineHeight?: number;
     /**
      * Specifies text alignment.
      * The value 'justify' is only supported on iOS.
      */
-    textAlign?: "auto" | "left" | "right" | "center"
-    textDecorationLine?: "none" | "underline" | "line-through" | "underline line-through"
-    textDecorationStyle?: "solid" | "double" | "dotted" | "dashed"
-    textDecorationColor?: string
-    textShadowColor?: string
-    textShadowOffset?: { width: number, height: number }
-    textShadowRadius?: number
-    testID?: string
+    textAlign?: "auto" | "left" | "right" | "center";
+    textDecorationLine?: "none" | "underline" | "line-through" | "underline line-through";
+    textDecorationStyle?: "solid" | "double" | "dotted" | "dashed";
+    textDecorationColor?: string;
+    textShadowColor?: string;
+    textShadowOffset?: { width: number; height: number };
+    textShadowRadius?: number;
+    testID?: string;
 }
 
 export interface TextPropertiesIOS {
@@ -790,56 +777,45 @@ export interface TextPropertiesIOS {
      * Specifies whether fonts should scale to respect Text Size accessibility setting on iOS. The
      * default is `true`.
      */
-    allowFontScaling?: boolean
+    allowFontScaling?: boolean;
 
     /**
      * Specifies whether font should be scaled down automatically to fit given style constraints.
      */
-    adjustsFontSizeToFit?: boolean
+    adjustsFontSizeToFit?: boolean;
 
     /**
      * Specifies smallest possible scale a font can reach when adjustsFontSizeToFit is enabled. (values 0.01-1.0).
      */
-    minimumFontScale?: number
+    minimumFontScale?: number;
 
     /**
      * 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
+    suppressHighlighting?: boolean;
 }
 
 export interface TextPropertiesAndroid {
     /**
      * Lets the user select text, to use the native copy and paste functionality.
      */
-    selectable?: boolean
+    selectable?: boolean;
 
     /**
      * The highlight color of the text.
      */
-    selectionColor?: string
+    selectionColor?: string;
 
     /**
      * Set text break strategy on Android API Level 23+
      * default is `highQuality`.
      */
-    textBreakStrategy?: "simple" | "highQuality" | "balanced"
+    textBreakStrategy?: "simple" | "highQuality" | "balanced";
 }
 
 // https://facebook.github.io/react-native/docs/text.html#props
-export interface TextProperties extends TextPropertiesIOS, TextPropertiesAndroid {
-
-    /**
-     * When set to `true`, indicates that the view is an accessibility element. The default value
-     * for a `Text` element is `true`.
-     *
-     * See the
-     * [Accessibility guide](/react-native/docs/accessibility.html#accessible-ios-android)
-     * for more information.
-     */
-    accessible?: boolean
-
+export interface TextProperties extends TextPropertiesIOS, TextPropertiesAndroid, AccessibilityProperties {
     /**
      * This can be one of the following values:
      *
@@ -857,13 +833,13 @@ export interface TextProperties extends TextPropertiesIOS, TextPropertiesAndroid
      *
      * > `clip` is working only for iOS
      */
-    ellipsizeMode?: 'head' | 'middle' | 'tail' | 'clip'
+    ellipsizeMode?: "head" | "middle" | "tail" | "clip";
 
     /**
      * Line Break mode. Works only with numberOfLines.
      * clip is working only for iOS
      */
-    lineBreakMode?: 'head' | 'middle' | 'tail' | 'clip'
+    lineBreakMode?: "head" | "middle" | "tail" | "clip";
 
     /**
      * Used to truncate the text with an ellipsis after computing the text
@@ -872,46 +848,44 @@ export interface TextProperties extends TextPropertiesIOS, TextPropertiesAndroid
      *
      * This prop is commonly used with `ellipsizeMode`.
      */
-    numberOfLines?: number
+    numberOfLines?: number;
 
     /**
      * Invoked on mount and layout changes with
      *
      * {nativeEvent: { layout: {x, y, width, height}}}.
      */
-    onLayout?: (event: LayoutChangeEvent) => void
+    onLayout?: (event: LayoutChangeEvent) => void;
 
     /**
      * This function is called on press.
      * Text intrinsically supports press handling with a default highlight state (which can be disabled with suppressHighlighting).
      */
-    onPress?: (event: GestureResponderEvent) => void
+    onPress?: (event: GestureResponderEvent) => void;
 
     /**
      * This function is called on long press.
      * e.g., `onLongPress={this.increaseSize}>``
      */
-    onLongPress?: (event: GestureResponderEvent) => void
+    onLongPress?: (event: GestureResponderEvent) => void;
 
     /**
      * @see https://facebook.github.io/react-native/docs/text.html#style
      */
-    style?: StyleProp<TextStyle>
+    style?: StyleProp<TextStyle>;
 
     /**
      * Used to locate this view in end-to-end tests.
      */
-    testID?: string
+    testID?: string;
 }
 
 /**
  * A React component for displaying text which supports nesting, styling, and touch handling.
  */
-export interface TextStatic extends NativeMethodsMixin, React.ClassicComponentClass<TextProperties> {
+export interface TextStatic extends NativeMethodsMixin, React.ClassicComponentClass<TextProperties> {}
 
-}
-
-type DataDetectorTypes = 'phoneNumber' | 'link' | 'address' | 'calendarEvent' | 'none' | 'all';
+type DataDetectorTypes = "phoneNumber" | "link" | "address" | "calendarEvent" | "none" | "all";
 
 /**
  * DocumentSelectionState is responsible for maintaining selection information
@@ -923,55 +897,50 @@ type DataDetectorTypes = 'phoneNumber' | 'link' | 'address' | 'calendarEvent' |
  * components re-render.
  */
 export interface DocumentSelectionState extends EventEmitter {
-    new(anchor: number, focus: number): DocumentSelectionState
+    new (anchor: number, focus: number): DocumentSelectionState;
 
     /**
      * Apply an update to the state. If either offset value has changed,
      * set the values and emit the `change` event. Otherwise no-op.
      *
-     * @param {number} anchor
-     * @param {number} focus
      */
-    update(anchor: number, focus: number): void
+    update(anchor: number, focus: number): void;
 
     /**
      * Given a max text length, constrain our selection offsets to ensure
      * that the selection remains strictly within the text range.
      *
-     * @param {number} maxLength
      */
-    constrainLength(maxLength: number): void
+    constrainLength(maxLength: number): void;
 
-    focus(): void
-    blur(): void
-    hasFocus(): boolean
-    isCollapsed(): boolean
-    isBackward(): boolean
+    focus(): void;
+    blur(): void;
+    hasFocus(): boolean;
+    isCollapsed(): boolean;
+    isBackward(): boolean;
 
-    getAnchorOffset(): number
-    getFocusOffset(): number
-    getStartOffset(): number
-    getEndOffset(): number
-    overlaps(start: number, end: number): boolean
+    getAnchorOffset(): number;
+    getFocusOffset(): number;
+    getStartOffset(): number;
+    getEndOffset(): number;
+    overlaps(start: number, end: number): boolean;
 }
 
-
 /**
  * IOS Specific properties for TextInput
  * @see https://facebook.github.io/react-native/docs/textinput.html#props
  */
 export interface TextInputIOSProperties {
-
     /**
      * enum('never', 'while-editing', 'unless-editing', 'always')
      * When the clear button should appear on the right side of the text view
      */
-    clearButtonMode?: 'never' | 'while-editing' | 'unless-editing' | 'always'
+    clearButtonMode?: "never" | "while-editing" | "unless-editing" | "always";
 
     /**
      * If true, clears the text field automatically when editing begins
      */
-    clearTextOnFocus?: boolean
+    clearTextOnFocus?: boolean;
 
     /**
      * Determines the types of data converted to clickable URLs in the text input.
@@ -989,35 +958,35 @@ export interface TextInputIOSProperties {
      * - `'none'`
      * - `'all'`
      */
-    dataDetectorTypes?: DataDetectorTypes | DataDetectorTypes[]
+    dataDetectorTypes?: DataDetectorTypes | DataDetectorTypes[];
 
     /**
      * 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
+    enablesReturnKeyAutomatically?: boolean;
 
     /**
      * Determines the color of the keyboard.
      */
-    keyboardAppearance?: 'default' | 'light' | 'dark'
+    keyboardAppearance?: "default" | "light" | "dark";
 
     /**
      * 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?: (key: string) => void
+    onKeyPress?: (key: string) => void;
 
     /**
      * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
      */
-    selectionState?: DocumentSelectionState
+    selectionState?: DocumentSelectionState;
 
     /**
      * If false, disables spell-check style (i.e. red underlines). The default value is inherited from autoCorrect
      */
-    spellCheck?: boolean
+    spellCheck?: boolean;
 }
 
 /**
@@ -1025,61 +994,69 @@ export interface TextInputIOSProperties {
  * @see https://facebook.github.io/react-native/docs/textinput.html#props
  */
 export interface TextInputAndroidProperties {
-
     /**
      * When false, if there is a small amount of space available around a text input (e.g. landscape orientation on a phone),
      *   the OS may choose to have the user edit the text inside of a full screen text input mode.
      * When true, this feature is disabled and users will always edit the text directly inside of the text input.
      * Defaults to false.
      */
-    disableFullscreenUI?: boolean
+    disableFullscreenUI?: boolean;
 
     /**
      * If defined, the provided image resource will be rendered on the left.
      */
-    inlineImageLeft?: string
+    inlineImageLeft?: string;
 
     /**
      * Padding between the inline image, if any, and the text input itself.
      */
-    inlineImagePadding?: number
+    inlineImagePadding?: number;
 
     /**
      * Sets the number of lines for a TextInput.
      * Use it with multiline set to true to be able to fill the lines.
      */
-    numberOfLines?: number
+    numberOfLines?: number;
 
     /**
      * Sets the return key to the label. Use it instead of `returnKeyType`.
      * @platform android
      */
-    returnKeyLabel?: string
+    returnKeyLabel?: string;
 
     /**
      * Set text break strategy on Android API Level 23+, possible values are simple, highQuality, balanced
      * The default value is simple.
      */
-    textBreakStrategy?: "simple" | "highQuality" | "balanced"
+    textBreakStrategy?: "simple" | "highQuality" | "balanced";
 
     /**
      * The color of the textInput underline.
      */
-    underlineColorAndroid?: string
+    underlineColorAndroid?: string;
 }
 
-export type KeyboardType = "default" | "email-address" | "numeric" | "phone-pad"
-export type KeyboardTypeIOS = "ascii-capable" | "numbers-and-punctuation" | "url" | "number-pad" | "name-phone-pad" | "decimal-pad" | "twitter" | "web-search"
+export type KeyboardType = "default" | "email-address" | "numeric" | "phone-pad";
+export type KeyboardTypeIOS =
+    | "ascii-capable"
+    | "numbers-and-punctuation"
+    | "url"
+    | "number-pad"
+    | "name-phone-pad"
+    | "decimal-pad"
+    | "twitter"
+    | "web-search";
+export type KeyboardTypeAndroid = "visible-password";
 
-export type ReturnKeyType = "done" | "go" | "next" | "search" | "send"
-export type ReturnKeyTypeAndroid = "none" | "previous"
-export type ReturnKeyTypeIOS = "default" | "google" | "join" | "route" | "yahoo" | "emergency-call"
+export type ReturnKeyType = "done" | "go" | "next" | "search" | "send";
+export type ReturnKeyTypeAndroid = "none" | "previous";
+export type ReturnKeyTypeIOS = "default" | "google" | "join" | "route" | "yahoo" | "emergency-call";
 
 /**
  * @see https://facebook.github.io/react-native/docs/textinput.html#props
  */
-export interface TextInputProperties extends ViewProperties, TextInputIOSProperties, TextInputAndroidProperties {
-
+export interface TextInputProperties
+    extends ViewProperties, TextInputIOSProperties, TextInputAndroidProperties, AccessibilityProperties {
     /**
      * Can tell TextInput to automatically capitalize certain characters.
      *      characters: all characters,
@@ -1089,71 +1066,83 @@ export interface TextInputProperties extends ViewProperties, TextInputIOSPropert
      *
      * https://facebook.github.io/react-native/docs/textinput.html#autocapitalize
      */
-    autoCapitalize?: "none" | "sentences" | "words" | "characters"
+    autoCapitalize?: "none" | "sentences" | "words" | "characters";
 
     /**
      * If false, disables auto-correct.
      * The default value is true.
      */
-    autoCorrect?: boolean
+    autoCorrect?: boolean;
 
     /**
      * If true, focuses the input on componentDidMount.
      * The default value is false.
      */
-    autoFocus?: boolean
+    autoFocus?: boolean;
 
     /**
      * If true, the text field will blur when submitted.
      * The default value is true.
      */
-    blurOnSubmit?: boolean
+    blurOnSubmit?: 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
+    defaultValue?: string;
 
     /**
      * If false, text is not editable. The default value is true.
      */
-    editable?: boolean
+    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')
+     * enum("default", 'numeric', 'email-address', "ascii-capable", 'numbers-and-punctuation', 'url', 'number-pad', 'phone-pad', 'name-phone-pad',
+     * 'decimal-pad', 'twitter', 'web-search', 'visible-password')
      * Determines which keyboard to open, e.g.numeric.
      * The following values work across platforms: - default - numeric - email-address - phone-pad
+     * The following values work on iOS: - ascii-capable - numbers-and-punctuation - url - number-pad - name-phone-pad - decimal-pad - twitter - web-search
+     * The following values work on Android: - visible-password
      */
-    keyboardType?: KeyboardType | KeyboardTypeIOS
+    keyboardType?: KeyboardType | KeyboardTypeIOS | KeyboardTypeAndroid;
 
     /**
      * Limits the maximum number of characters that can be entered.
      * Use this instead of implementing the logic in JS to avoid flicker.
      */
-    maxLength?: number
+    maxLength?: number;
 
     /**
      * If true, the text input can be multiple lines. The default value is false.
      */
-    multiline?: boolean
+    multiline?: boolean;
 
     /**
      * Callback that is called when the text input is blurred
      */
-    onBlur?: () => void
+    onBlur?: () => void;
 
     /**
      * Callback that is called when the text input's text changes.
      */
-    onChange?: (event: { nativeEvent: { text: string, contentSize: { width: number, height: number }, target: number, eventCount: number } }) => void
+    onChange?: (
+        event: {
+            nativeEvent: {
+                text: string;
+                contentSize: { width: number; height: number };
+                target: number;
+                eventCount: number;
+            };
+        }
+    ) => 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
+    onChangeText?: (text: string) => void;
 
     /**
      * Callback that is called when the text input's content size changes.
@@ -1162,75 +1151,75 @@ export interface TextInputProperties extends ViewProperties, TextInputIOSPropert
      *
      * Only called for multiline text inputs.
      */
-    onContentSizeChange?: ( event: {nativeEvent: {contentSize: { width: number, height: number}}} ) => void
+    onContentSizeChange?: (event: { nativeEvent: { contentSize: { width: number; height: number } } }) => void;
 
     /**
      * 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
      */
-    onFocus?: () => void
+    onFocus?: () => void;
 
     /**
      * Callback that is called when the text input selection is changed.
      */
-    onSelectionChange?: (event: { nativeEvent: { selection: { start: number, end: number }, target: number } }) => void
+    onSelectionChange?: (event: { nativeEvent: { selection: { start: number; end: number }; target: 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;
 
     /**
      * The string that will be rendered before text input has been entered
      */
-    placeholder?: string
+    placeholder?: string;
 
     /**
      * The text color of the placeholder string
      */
-    placeholderTextColor?: string
+    placeholderTextColor?: string;
 
     /**
      * enum('default', 'go', 'google', 'join', 'next', 'route', 'search', 'send', 'yahoo', 'done', 'emergency-call')
      * Determines how the return key should look.
      */
-    returnKeyType?: ReturnKeyType | ReturnKeyTypeAndroid | ReturnKeyTypeIOS
+    returnKeyType?: ReturnKeyType | ReturnKeyTypeAndroid | ReturnKeyTypeIOS;
 
     /**
      * If true, the text input obscures the text entered so that sensitive text like passwords stay secure.
      * The default value is false.
      */
-    secureTextEntry?: boolean
+    secureTextEntry?: boolean;
 
     /**
      * If true, all text will automatically be selected on focus
      */
-    selectTextOnFocus?: boolean
+    selectTextOnFocus?: boolean;
 
     /**
      * The start and end of the text input's selection. Set start and end to
      * the same value to position the cursor.
      */
-    selection?: { start: number, end?: number }
+    selection?: { start: number; end?: number };
 
     /**
      * The highlight (and cursor on ios) color of the text input
      */
-    selectionColor?: string
+    selectionColor?: string;
 
     /**
      * Styles
      */
-    style?: StyleProp<TextStyle>
+    style?: StyleProp<TextStyle>;
 
     /**
      * Used to locate this view in end-to-end tests
      */
-    testID?: string
+    testID?: string;
 
     /**
      * The value to show for the text input. TextInput is a controlled component,
@@ -1239,7 +1228,7 @@ export interface TextInputProperties extends ViewProperties, TextInputIOSPropert
      * In addition to simply setting the same value, either set editable={false},
      * or set/update maxLength to prevent unwanted edits without flicker.
      */
-    value?: string
+    value?: string;
 }
 
 /**
@@ -1252,64 +1241,63 @@ interface TextInputState {
      * Returns the ID of the currently focused text field, if one exists
      * If no text field is focused it returns null
      */
-    currentlyFocusedField(): number
+    currentlyFocusedField(): number;
 
     /**
-     * @param {number} TextInputID id of the text field to focus
+     * @param TextInputID id of the text field to focus
      * Focuses the specified text field
      * noop if the text field was already focused
      */
-    focusTextInput(textFieldID?: number): void
+    focusTextInput(textFieldID?: number): void;
 
     /**
-     * @param {number} textFieldID id of the text field to focus
+     * @param textFieldID id of the text field to focus
      * Unfocuses the specified text field
      * noop if it wasn't focused
      */
-    blurTextInput(textFieldID?: number): void
+    blurTextInput(textFieldID?: number): void;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/textinput.html#methods
  */
 export interface TextInputStatic extends NativeMethodsMixin, TimerMixin, React.ComponentClass<TextInputProperties> {
-    State: TextInputState
+    State: TextInputState;
 
     /**
      * Returns if the input is currently focused.
      */
-    isFocused: () => boolean
+    isFocused: () => boolean;
 
     /**
      * Removes all text from the input.
      */
-    clear: () => void
+    clear: () => void;
 }
 
 export type ToolbarAndroidAction = {
     /**
      *  title: required, the title of this action
      */
-    title: string
+    title: string;
 
     /**
      * icon: the icon for this action, e.g. require('./some_icon.png')
      */
-    icon?: ImageURISource
+    icon?: ImageURISource;
 
     /**
      * show: when to show this action as an icon or hide it in the overflow menu: always, ifRoom or never
      */
-    show?: "always" | "ifRoom" | "never"
+    show?: "always" | "ifRoom" | "never";
 
     /**
      * showWithText: boolean, whether to show text alongside the icon or not
      */
-    showWithText?: boolean
-}
+    showWithText?: boolean;
+};
 
 export interface ToolbarAndroidProperties extends ViewProperties {
-
     /**
      * Sets possible actions on the toolbar as part of the action menu. These are displayed as icons
      * or text on the right side of the widget. If they don't fit they are placed in an 'overflow'
@@ -1323,7 +1311,7 @@ export interface ToolbarAndroidProperties extends ViewProperties {
      * `ifRoom` or `never`
      * * `showWithText`: boolean, whether to show text alongside the icon or not
      */
-    actions?: ToolbarAndroidAction[]
+    actions?: ToolbarAndroidAction[];
 
     /**
      * Sets the content inset for the toolbar ending edge.
@@ -1332,7 +1320,7 @@ export interface ToolbarAndroidProperties extends ViewProperties {
      * margin for these components and can be used to effectively align
      * Toolbar content along well-known gridlines.
      */
-    contentInsetEnd?: number
+    contentInsetEnd?: number;
 
     /**
      * Sets the content inset for the toolbar starting edge.
@@ -1341,34 +1329,34 @@ export interface ToolbarAndroidProperties extends ViewProperties {
      * minimum margin for these components and can be used to effectively
      * align Toolbar content along well-known gridlines.
      */
-    contentInsetStart?: number
+    contentInsetStart?: number;
 
     /**
      * Sets the toolbar logo.
      */
-    logo?: ImageURISource
+    logo?: ImageURISource;
 
     /**
      * Sets the navigation icon.
      */
-    navIcon?: ImageURISource
+    navIcon?: ImageURISource;
 
     /**
      * Callback that is called when an action is selected. The only
      * argument that is passed to the callback is the position of the
      * action in the actions array.
      */
-    onActionSelected?: (position: number) => void
+    onActionSelected?: (position: number) => void;
 
     /**
      * Callback called when the icon is selected.
      */
-    onIconClicked?: () => void
+    onIconClicked?: () => void;
 
     /**
      * Sets the overflow icon.
      */
-    overflowIcon?: ImageURISource
+    overflowIcon?: ImageURISource;
 
     /**
      * Used to set the toolbar direction to RTL.
@@ -1378,32 +1366,32 @@ export interface ToolbarAndroidProperties extends ViewProperties {
      * setLayoutDirection(LayoutDirection.RTL) in your MainActivity
      * onCreate method.
      */
-    rtl?: boolean
+    rtl?: boolean;
 
     /**
      * Sets the toolbar subtitle.
      */
-    subtitle?: string
+    subtitle?: string;
 
     /**
      * Sets the toolbar subtitle color.
      */
-    subtitleColor?: string
+    subtitleColor?: string;
 
     /**
      * Used to locate this view in end-to-end tests.
      */
-    testID?: string
+    testID?: string;
 
     /**
      * Sets the toolbar title.
      */
-    title?: string
+    title?: string;
 
     /**
      * Sets the toolbar title color.
      */
-    titleColor?: string
+    titleColor?: string;
 }
 
 /**
@@ -1422,10 +1410,7 @@ export interface ToolbarAndroidProperties extends ViewProperties {
  *
  * [0]: https://developer.android.com/reference/android/support/v7/widget/Toolbar.html
  */
-export interface ToolbarAndroidStatic extends NativeMethodsMixin, React.ComponentClass<ToolbarAndroidProperties> {
-
-}
-
+export interface ToolbarAndroidStatic extends NativeMethodsMixin, React.ComponentClass<ToolbarAndroidProperties> {}
 
 /**
  * Gesture recognition on mobile devices is much more complicated than web.
@@ -1453,7 +1438,6 @@ export interface ToolbarAndroidStatic extends NativeMethodsMixin, React.Componen
  * 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:
@@ -1462,29 +1446,29 @@ export interface GestureResponderHandlers {
     /**
      * Does this view want to become responder on the start of a touch?
      */
-    onStartShouldSetResponder?: (event: GestureResponderEvent) => boolean
+    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
+    onMoveShouldSetResponder?: (event: GestureResponderEvent) => boolean;
 
     /**
      * If the View returns true and attempts to become the responder, one of the following will happen:
      */
 
-    onResponderEnd?: ( event: GestureResponderEvent ) => void
+    onResponderEnd?: (event: GestureResponderEvent) => void;
 
     /**
      * 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
+    onResponderGrant?: (event: GestureResponderEvent) => void;
 
     /**
      * Something else is the responder right now and will not release it
      */
-    onResponderReject?: (event: GestureResponderEvent) => void
+    onResponderReject?: (event: GestureResponderEvent) => void;
 
     /**
      * If the view is responding, the following handlers can be called:
@@ -1493,27 +1477,27 @@ export interface GestureResponderHandlers {
     /**
      * The user is moving their finger
      */
-    onResponderMove?: (event: GestureResponderEvent) => void
+    onResponderMove?: (event: GestureResponderEvent) => void;
 
     /**
      * Fired at the end of the touch, ie "touchUp"
      */
-    onResponderRelease?: (event: GestureResponderEvent) => void
+    onResponderRelease?: (event: GestureResponderEvent) => void;
 
-    onResponderStart?: ( event: GestureResponderEvent ) => void
+    onResponderStart?: (event: GestureResponderEvent) => void;
 
     /**
      *  Something else wants to become responder.
      *  Should this view release the responder? Returning true allows release
      */
-    onResponderTerminationRequest?: (event: GestureResponderEvent) => boolean
+    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
+    onResponderTerminate?: (event: GestureResponderEvent) => void;
 
     /**
      * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
@@ -1528,7 +1512,7 @@ export interface GestureResponderHandlers {
      * 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
+    onStartShouldSetResponderCapture?: (event: GestureResponderEvent) => boolean;
 
     /**
      * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
@@ -1544,12 +1528,11 @@ export interface GestureResponderHandlers {
      * it should have a onStartShouldSetResponderCapture handler which returns true.
      */
     onMoveShouldSetResponderCapture?: () => void;
-
 }
 
 // @see https://facebook.github.io/react-native/docs/view.html#style
 export interface ViewStyle extends FlexStyle, TransformsStyle {
-    backfaceVisibility?: "visible" | "hidden"
+    backfaceVisibility?: "visible" | "hidden";
     backgroundColor?: string;
     borderBottomColor?: string;
     borderBottomLeftRadius?: number;
@@ -1560,30 +1543,41 @@ export interface ViewStyle extends FlexStyle, TransformsStyle {
     borderRadius?: number;
     borderRightColor?: string;
     borderRightWidth?: number;
-    borderStyle?: "solid" | "dotted" | "dashed"
+    borderStyle?: "solid" | "dotted" | "dashed";
     borderTopColor?: string;
     borderTopLeftRadius?: number;
     borderTopRightRadius?: number;
     borderTopWidth?: number;
     display?: "none" | "flex";
     opacity?: number;
-    overflow?: "visible" | "hidden"
+    overflow?: "visible" | "hidden";
     shadowColor?: string;
-    shadowOffset?: { width: number, height: number };
+    shadowOffset?: { width: number; height: number };
     shadowOpacity?: number;
     shadowRadius?: number;
     elevation?: number;
     testID?: string;
 }
 
-
 export interface ViewPropertiesIOS {
+    /**
+     * A Boolean value indicating whether VoiceOver should ignore the elements within views that are siblings of the receiver.
+     * @platform ios
+     */
+    accessibilityViewIsModal?: boolean;
 
     /**
-     * Provides additional traits to screen reader.
-     * By default no traits are provided unless specified otherwise in element
+     * Provides an array of custom actions available for accessibility.
+     * @platform ios
      */
-    accessibilityTraits?: ViewAccessibilityTraits | ViewAccessibilityTraits[];
+    accessibilityActions?: Array<string>;
+
+    /**
+     * When `accessible` is true, the system will try to invoke this function
+     * when the user performs an accessibility custom action.
+     * @platform ios
+     */
+    onAccessibilityAction?: () => void;
 
     /**
      * Whether this view should be rendered as a bitmap before compositing.
@@ -1595,46 +1589,16 @@ export interface ViewPropertiesIOS {
      * Rasterization incurs an off-screen drawing pass and the bitmap consumes memory.
      * Test and measure when using this property.
      */
-    shouldRasterizeIOS?: boolean
+    shouldRasterizeIOS?: boolean;
 }
 
 export interface ViewPropertiesAndroid {
-
-    /**
-     * Indicates to accessibility services to treat UI component like a native one.
-     * Works for Android only.
-     */
-    accessibilityComponentType?: 'none' | 'button' | 'radiobutton_checked' | 'radiobutton_unchecked'
-
-
-    /**
-     * 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.
-     */
-    accessibilityLiveRegion?: 'none' | 'polite' | 'assertive'
-
     /**
      * 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.
      */
-    collapsable?: boolean
-
-
-    /**
-     * 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.
-     *
-     * 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?: 'auto' | 'yes' | 'no' | 'no-hide-descendants'
-
+    collapsable?: boolean;
 
     /**
      * Whether this view needs to rendered offscreen and composited with an alpha in order to preserve 100% correct colors and blending behavior.
@@ -1650,8 +1614,7 @@ export interface ViewPropertiesAndroid {
      * 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.
      */
-    needsOffscreenAlphaCompositing?: boolean
-
+    needsOffscreenAlphaCompositing?: boolean;
 
     /**
      * Whether this view should render itself (and all of its children) into a single hardware texture on the GPU.
@@ -1661,26 +1624,18 @@ export interface ViewPropertiesAndroid {
      * 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;
-
 }
 
-type Falsy = undefined | null | false
+type Falsy = undefined | null | false;
 interface RecursiveArray<T> extends Array<T | RecursiveArray<T>> {}
 /** Keep a brand of 'T' so that calls to `StyleSheet.flatten` can take `RegisteredStyle<T>` and return `T`. */
 type RegisteredStyle<T> = number & { __registeredStyleBrand: T };
-export type StyleProp<T> = T | RegisteredStyle<T> | RecursiveArray<T | RegisteredStyle<T> | Falsy> | Falsy
+export type StyleProp<T> = T | RegisteredStyle<T> | RecursiveArray<T | RegisteredStyle<T> | Falsy> | Falsy;
 
 /**
- * @see https://facebook.github.io/react-native/docs/view.html#props
+ * @see https://facebook.github.io/react-native/docs/accessibility.html#accessibility-properties
  */
-export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS, GestureResponderHandlers, Touchable {
-
-    /**
-     * 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;
-
+export interface AccessibilityProperties extends AccessibilityPropertiesAndroid, AccessibilityPropertiesIOS {
     /**
      * When true, indicates that the view is an accessibility element.
      * By default, all the touchable elements are accessible.
@@ -1688,22 +1643,101 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS
     accessible?: boolean;
 
     /**
-    * This defines how far a touch event can start away from the view.
-    * Typical interface guidelines recommend touch targets that are at least
-    * 30 - 40 points/density-independent pixels. If a Touchable view has
-    * a height of 20 the touchable height can be extended to 40 with
-    * hitSlop={{top: 10, bottom: 10, left: 0, right: 0}}
-    * NOTE The touch area never extends past the parent view bounds and
-    * the Z-index of sibling views always takes precedence if a touch
-    * hits two overlapping views.
-    */
-    hitSlop?: Insets
+     * 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;
+}
+
+export interface AccessibilityPropertiesAndroid {
+    /**
+     * In some cases, we also want to alert the end user of the type of selected component (i.e., that it is a “button�).
+     * If we were using native buttons, this would work automatically. Since we are using javascript, we need to
+     * provide a bit more context for TalkBack. To do so, you must specify the ‘accessibilityComponentType’ property
+     * for any UI component. For instances, we support ‘button’, ‘radiobutton_checked’ and ‘radiobutton_unchecked’ and so on.
+     * @platform android
+     */
+    accessibilityComponentType?: "none" | "button" | "radiobutton_checked" | "radiobutton_unchecked";
+
+    /**
+     * 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.
+     * @platform android
+     */
+    accessibilityLiveRegion?: "none" | "polite" | "assertive";
+
+    /**
+     * 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.
+     *
+     * 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?: "auto" | "yes" | "no" | "no-hide-descendants";
+}
+
+export interface AccessibilityPropertiesIOS {
+    /**
+     * Accessibility traits tell a person using VoiceOver what kind of element they have selected.
+     * Is this element a label? A button? A header? These questions are answered by accessibilityTraits.
+     * @platform ios
+     */
+    accessibilityTraits?: AccessibilityTraits | AccessibilityTraits[];
 
     /**
      * When `accessible` is true, the system will try to invoke this function when the user performs accessibility tap gesture.
+     * @platform ios
      */
     onAcccessibilityTap?: () => void;
 
+    /**
+     * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
+     * @platform ios
+     */
+    onMagicTap?: () => void;
+}
+
+type AccessibilityTraits =
+    | "none"
+    | "button"
+    | "link"
+    | "header"
+    | "search"
+    | "image"
+    | "selected"
+    | "plays"
+    | "key"
+    | "text"
+    | "summary"
+    | "disabled"
+    | "frequentUpdates"
+    | "startsMedia"
+    | "adjustable"
+    | "allowsDirectInteraction"
+    | "pageTurn";
+
+/**
+ * @see https://facebook.github.io/react-native/docs/view.html#props
+ */
+export interface ViewProperties
+    extends ViewPropertiesAndroid, ViewPropertiesIOS, GestureResponderHandlers, Touchable, AccessibilityProperties {
+    /**
+     * This defines how far a touch event can start away from the view.
+     * Typical interface guidelines recommend touch targets that are at least
+     * 30 - 40 points/density-independent pixels. If a Touchable view has
+     * a height of 20 the touchable height can be extended to 40 with
+     * hitSlop={{top: 10, bottom: 10, left: 0, right: 0}}
+     * NOTE The touch area never extends past the parent view bounds and
+     * the Z-index of sibling views always takes precedence if a touch
+     * hits two overlapping views.
+     */
+    hitSlop?: Insets;
+
     /**
      * Invoked on mount and layout changes with
      *
@@ -1711,11 +1745,6 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS
      */
     onLayout?: (event: LayoutChangeEvent) => void;
 
-    /**
-     * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
-     */
-    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:
@@ -1739,7 +1768,7 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS
      * 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?: "box-none" | "none" | "box-only" | "auto"
+    pointerEvents?: "box-none" | "none" | "box-only" | "auto";
 
     /**
      *
@@ -1747,9 +1776,9 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS
      * 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
+    removeClippedSubviews?: boolean;
 
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     /**
      * Used to locate this view in end-to-end tests.
@@ -1764,45 +1793,17 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS
  * whether that is a UIView, <div>, android.view, etc.
  */
 export interface ViewStatic extends NativeMethodsMixin, React.ClassicComponentClass<ViewProperties> {
-    AccessibilityTraits: [
-        'none',
-        'button',
-        'link',
-        'header',
-        'search',
-        'image',
-        'selected',
-        'plays',
-        'key',
-        'text',
-        'summary',
-        'disabled',
-        'frequentUpdates',
-        'startsMedia',
-        'adjustable',
-        'allowsDirectInteraction',
-        'pageTurn'
-    ]
-
-    AccessibilityComponentType: [
-        'none',
-        'button',
-        'radiobutton_checked',
-        'radiobutton_unchecked'
-    ],
-
     /**
      * Is 3D Touch / Force Touch available (i.e. will touch events include `force`)
      * @platform ios
      */
-    forceTouchAvailable: boolean,
+    forceTouchAvailable: boolean;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/viewpagerandroid.html#props
  */
 
-
 export interface ViewPagerAndroidOnPageScrollEventData {
     position: number;
     offset: number;
@@ -1852,20 +1853,20 @@ export interface ViewPagerAndroidProperties extends ViewProperties {
      * - settling, meaning that there was an interaction with the page scroller, and the
      *   page scroller is now finishing it's closing or opening animation
      */
-    onPageScrollStateChanged?: (state: "Idle" | "Dragging" | "Settling") => void
+    onPageScrollStateChanged?: (state: "Idle" | "Dragging" | "Settling") => void;
 
     /**
      * Determines whether the keyboard gets dismissed in response to a drag.
      *   - 'none' (the default), drags do not dismiss the keyboard.
      *   - 'on-drag', the keyboard is dismissed when a drag begins.
      */
-    keyboardDismissMode?: "none" | "on-drag"
+    keyboardDismissMode?: "none" | "on-drag";
 
     /**
      * Blank space to show between pages. This is only visible while scrolling, pages are still
      * edge-to-edge.
      */
-    pageMargin?: number
+    pageMargin?: number;
 }
 
 export interface ViewPagerAndroidStatic extends NativeMethodsMixin, React.ComponentClass<ViewPagerAndroidProperties> {
@@ -1873,95 +1874,91 @@ export interface ViewPagerAndroidStatic extends NativeMethodsMixin, React.Compon
      * A helper function to scroll to a specific page in the ViewPager.
      * The transition between pages will be animated.
      */
-    setPage(selectedPage: number): void
+    setPage(selectedPage: number): void;
 
     /**
      * A helper function to scroll to a specific page in the ViewPager.
      * The transition between pages will *not* be animated.
      */
-    setPageWithoutAnimation(selectedPage: number): void
+    setPageWithoutAnimation(selectedPage: number): void;
 }
 
 /**
  * It is a component to solve the common problem of views that need to move out of the way of the virtual keyboard.
  * It can automatically adjust either its position or bottom padding based on the position of the keyboard.
  */
-export interface KeyboardAvoidingViewStatic extends TimerMixin, React.ClassicComponentClass<KeyboardAvoidingViewProps> {
-
-}
+export interface KeyboardAvoidingViewStatic
+    extends TimerMixin,
+        React.ClassicComponentClass<KeyboardAvoidingViewProps> {}
 
 export interface KeyboardAvoidingViewProps extends ViewProperties {
-
-    behavior?: 'height' | 'position' | 'padding'
+    behavior?: "height" | "position" | "padding";
 
     /**
      * The style of the content container(View) when behavior is 'position'.
      */
-    contentContainerStyle?: StyleProp<ViewStyle>
+    contentContainerStyle?: StyleProp<ViewStyle>;
 
     /**
      * This is the distance between the top of the user screen and the react native view,
      * may be non-zero in some use cases.
      */
-    keyboardVerticalOffset?: number
+    keyboardVerticalOffset?: number;
 }
 
 /**
  * //FIXME: No documentation extracted from code comment on WebView.ios.js
  */
 export interface NavState {
-
-    url?: string
-    title?: string
-    loading?: boolean
-    canGoBack?: boolean
+    url?: string;
+    title?: string;
+    loading?: boolean;
+    canGoBack?: boolean;
     canGoForward?: boolean;
 
-    [key: string]: any
+    [key: string]: any;
 }
 
 /**
  * Passed data from WebView via window.postMessage.
  */
 export interface WebViewMessageEventData {
-/**
- * The data sent from a WebView; can only be a string.
- */
-data: string
+    /**
+     * The data sent from a WebView; can only be a string.
+     */
+    data: string;
 }
 
 export interface WebViewPropertiesAndroid {
-
     /**
      * Used for android only, JS is enabled by default for WebView on iOS
      */
-    javaScriptEnabled?: boolean
+    javaScriptEnabled?: boolean;
 
     /**
      * Used on Android only, controls whether DOM Storage is enabled
      * or not android
      */
-    domStorageEnabled?: boolean,
+    domStorageEnabled?: boolean;
 
     /**
      * Sets the user-agent for the WebView.
      */
-    userAgent?: string
+    userAgent?: string;
 }
 
 export interface WebViewIOSLoadRequestEvent {
-    target: number
-    canGoBack: boolean
-    lockIdentifier: number
-    loading: boolean
-    title: string
-    canGoForward: boolean
-    navigationType: 'other' | 'click'
-    url: string
+    target: number;
+    canGoBack: boolean;
+    lockIdentifier: number;
+    loading: boolean;
+    title: string;
+    canGoForward: boolean;
+    navigationType: "other" | "click";
+    url: string;
 }
 
 export interface WebViewPropertiesIOS {
-
     /**
      * Determines whether HTML5 videos play inline or use the native
      * full-screen controller. default value false
@@ -1970,14 +1967,14 @@ export interface WebViewPropertiesIOS {
      * in the HTML document must also include the webkit-playsinline
      * attribute."
      */
-    allowsInlineMediaPlayback?: boolean
+    allowsInlineMediaPlayback?: boolean;
 
     /**
      * Boolean value that determines whether the web view bounces
      * when it reaches the edge of the content. The default value is `true`.
      * @platform ios
      */
-    bounces?: boolean
+    bounces?: boolean;
 
     /**
      * Determines the types of data converted to clickable URLs in
@@ -1994,7 +1991,7 @@ export interface WebViewPropertiesIOS {
      * - `'none'`
      * - `'all'`
      */
-    dataDetectorTypes?: DataDetectorTypes | DataDetectorTypes[]
+    dataDetectorTypes?: DataDetectorTypes | DataDetectorTypes[];
 
     /**
      * A floating-point number that determines how quickly the scroll
@@ -2004,24 +2001,23 @@ export interface WebViewPropertiesIOS {
      * and UIScrollViewDecelerationRateFast respectively.
      * - normal: 0.998 - fast: 0.99 (the default for iOS WebView)
      */
-    decelerationRate?: "normal" | "fast" | number
+    decelerationRate?: "normal" | "fast" | number;
 
     /**
      * Allows custom handling of any webview requests by a JS handler.
      * Return true or false from this method to continue loading the
      * request.
      */
-    onShouldStartLoadWithRequest?: (event: WebViewIOSLoadRequestEvent) => boolean
+    onShouldStartLoadWithRequest?: (event: WebViewIOSLoadRequestEvent) => boolean;
 
     /**
      * Boolean value that determines whether scrolling is enabled in the
      * `WebView`. The default value is `true`.
      */
-    scrollEnabled?: boolean
+    scrollEnabled?: boolean;
 }
 
 export interface WebViewUriSource {
-
     /*
         * The URI to load in the WebView. Can be a local or remote file.
         */
@@ -2049,7 +2045,6 @@ export interface WebViewUriSource {
 }
 
 export interface WebViewHtmlSource {
-
     /*
         * A static HTML page to display in the WebView.
         */
@@ -2065,183 +2060,184 @@ export interface WebViewHtmlSource {
  * @see https://facebook.github.io/react-native/docs/webview.html#props
  */
 export interface WebViewProperties extends ViewProperties, WebViewPropertiesAndroid, WebViewPropertiesIOS {
-
     /**
      * Controls whether to adjust the content inset for web views that are
      * placed behind a navigation bar, tab bar, or toolbar. The default value
      * is `true`.
      */
-    automaticallyAdjustContentInsets?: boolean
+    automaticallyAdjustContentInsets?: boolean;
 
     /**
      * The amount by which the web view content is inset from the edges of
      * the scroll view. Defaults to {top: 0, left: 0, bottom: 0, right: 0}.
      */
-    contentInset?: Insets
+    contentInset?: Insets;
 
     /**
      * @deprecated
      */
-    html?: string
+    html?: string;
 
     /**
      * Set this to provide JavaScript that will be injected into the web page
      * when the view loads.
      */
-    injectedJavaScript?: string
+    injectedJavaScript?: string;
 
     /**
      * Invoked when load fails
      */
-    onError?: (event: NavState) => void
+    onError?: (event: NavState) => void;
 
     /**
      * Invoked when load finish
      */
-    onLoad?: (event: NavState) => void
+    onLoad?: (event: NavState) => void;
 
     /**
      * Invoked when load either succeeds or fails
      */
-    onLoadEnd?: (event: NavState) => void
+    onLoadEnd?: (event: NavState) => void;
 
     /**
      * Invoked on load start
      */
-    onLoadStart?: (event: NavState) => void
+    onLoadStart?: (event: NavState) => void;
 
     /**
      * Invoked when window.postMessage is called from WebView.
      */
-    onMessage?: ( event: NativeSyntheticEvent<WebViewMessageEventData> ) => void
+    onMessage?: (event: NativeSyntheticEvent<WebViewMessageEventData>) => void;
 
     /**
      * Function that is invoked when the `WebView` loading starts or ends.
      */
-    onNavigationStateChange?: ( event: NavState ) => void
+    onNavigationStateChange?: (event: NavState) => void;
 
     /**
      * Function that returns a view to show if there's an error.
      */
-    renderError?: () => React.ReactElement<ViewProperties>
+    renderError?: () => React.ReactElement<ViewProperties>;
 
     /**
      * Function that returns a loading indicator.
      */
-    renderLoading?: () => React.ReactElement<ViewProperties>
+    renderLoading?: () => React.ReactElement<ViewProperties>;
 
     /**
      * Boolean value that forces the `WebView` to show the loading view
      * on the first load.
      */
-    startInLoadingState?: boolean
+    startInLoadingState?: boolean;
 
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     // Deprecated: Use the `source` prop instead.
-    url?: string
+    url?: string;
 
-    source?: WebViewUriSource | WebViewHtmlSource | number
+    source?: WebViewUriSource | WebViewHtmlSource | number;
 
     /**
      * Determines whether HTML5 audio & videos require the user to tap
      * before they can start playing. The default value is false.
      */
-    mediaPlaybackRequiresUserAction?: boolean
+    mediaPlaybackRequiresUserAction?: boolean;
 
     /**
      * sets whether the webpage scales to fit the view and the user can change the scale
      */
-    scalesPageToFit?: boolean
+    scalesPageToFit?: boolean;
 }
 
-
 export interface WebViewStatic extends React.ClassicComponentClass<WebViewProperties> {
-
     /**
      * Go back one page in the webview's history.
      */
-    goBack: () => void
+    goBack: () => void;
 
     /**
      * Go forward one page in the webview's history.
      */
-    goForward: () => void
+    goForward: () => void;
 
-/**
- * Post a message to the WebView in the form of a string.
- */
-postMessage: (message: string) => void
+    /**
+     * Post a message to the WebView in the form of a string.
+     */
+    postMessage: (message: string) => void;
 
     /**
      * Reloads the current page.
      */
-    reload: () => void
+    reload: () => void;
 
     /**
      * Stop loading the current page.
      */
-    stopLoading(): void
+    stopLoading(): void;
 
     /**
-         * Returns the native webview node.
+     * Returns the native webview node.
      */
-    getWebViewHandle: () => any
+    getWebViewHandle: () => any;
 }
 
-
 /**
  * @see https://facebook.github.io/react-native/docs/segmentedcontrolios.html
  * @see SegmentedControlIOS.ios.js
  */
 export interface NativeSegmentedControlIOSChangeEvent {
-    value: string
-    selectedSegmentIndex: number
-    target: number
+    value: string;
+    selectedSegmentIndex: number;
+    target: number;
 }
 
 export interface SegmentedControlIOSProperties extends ViewProperties {
-
     /**
      * If false the user won't be able to interact with the control. Default value is true.
      */
-    enabled?: boolean
+    enabled?: boolean;
 
     /**
      * If true, then selecting a segment won't persist visually.
      * The onValueChange callback will still work as expected.
      */
-    momentary?: boolean
+    momentary?: boolean;
 
     /**
      * Callback that is called when the user taps a segment;
      * passes the event as an argument
-     * @param event
      */
-    onChange?: (event: NativeSyntheticEvent<NativeSegmentedControlIOSChangeEvent>) => void
+    onChange?: (event: NativeSyntheticEvent<NativeSegmentedControlIOSChangeEvent>) => void;
 
     /**
      * Callback that is called when the user taps a segment; passes the segment's value as an argument
-     * @param value
      */
-    onValueChange?: (value: string) => void
+    onValueChange?: (value: string) => void;
 
     /**
      * The index in props.values of the segment to be (pre)selected.
      */
-    selectedIndex?: number
+    selectedIndex?: number;
 
     /**
      * Accent color of the control.
      */
-    tintColor?: string
+    tintColor?: string;
 
     /**
      * The labels for the control's segment buttons, in order.
      */
-    values?: string[]
+    values?: string[];
 }
 
+/**
+ * Renders nested content and automatically applies paddings reflect the portion of the view
+ * that is not covered by navigation bars, tab bars, toolbars, and other ancestor views.
+ * Moreover, and most importantly, Safe Area's paddings feflect physical limitation of the screen,
+ * such as rounded corners or camera notches (aka sensor housing area on iPhone X).
+ */
+export interface SafeAreaViewStatic extends NativeMethodsMixin, React.ClassicComponentClass<ViewProperties> {}
+
 /**
  * Use `SegmentedControlIOS` to render a UISegmentedControl iOS.
  *
@@ -2262,28 +2258,27 @@ export interface SegmentedControlIOSProperties extends ViewProperties {
  * />
  * ````
  */
-export interface SegmentedControlIOSStatic extends NativeMethodsMixin, React.ClassicComponentClass<SegmentedControlIOSProperties> {
-
-}
-
+export interface SegmentedControlIOSStatic
+    extends NativeMethodsMixin,
+        React.ClassicComponentClass<SegmentedControlIOSProperties> {}
 
 export interface NavigatorIOSProperties {
     /**
      * The default background color of the navigation bar.
      */
-    barTintColor?: string
+    barTintColor?: string;
 
     /**
      * 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
+    initialRoute: Route;
 
     /**
      * The default wrapper style for components in the navigator.
      * A common use case is to set the backgroundColor for every page
      */
-    itemWrapperStyle?: StyleProp<ViewStyle>
+    itemWrapperStyle?: StyleProp<ViewStyle>;
 
     /**
      * Boolean value that indicates whether the interactive pop gesture is
@@ -2296,37 +2291,37 @@ export interface NavigatorIOSProperties {
      * `interactivePopGestureEnabled` prop, you can never restore the default
      * behavior.
      */
-    interactivePopGestureEnabled?: boolean
+    interactivePopGestureEnabled?: boolean;
 
     /**
      * A Boolean value that indicates whether the navigation bar is hidden
      */
-    navigationBarHidden?: boolean
+    navigationBarHidden?: boolean;
 
     /**
      * A Boolean value that indicates whether to hide the 1px hairline shadow
      */
-    shadowHidden?: boolean
+    shadowHidden?: boolean;
 
     /**
      * The color used for buttons in the navigation bar
      */
-    tintColor?: string
+    tintColor?: string;
 
     /**
      * The text color of the navigation bar title
      */
-    titleTextColor?: string
+    titleTextColor?: string;
 
     /**
      * A Boolean value that indicates whether the navigation bar is translucent
      */
-    translucent?: boolean
+    translucent?: boolean;
 
     /**
      * NOT IN THE DOC BUT IN THE EXAMPLES
      */
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 }
 
 /**
@@ -2341,72 +2336,69 @@ export interface NavigationIOS {
     /**
      * Navigate forward to a new route
      */
-    push: (route: Route) => void
+    push: (route: Route) => void;
 
     /**
      * Go back one page
      */
-    pop: () => void
+    pop: () => void;
 
     /**
      * Go back N pages at once. When N=1, behavior matches pop()
      */
-    popN: (n: number) => void
+    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: (route: Route) => void;
 
     /**
      * Replace the route/view for the previous page
      */
-    replacePrevious: (route: Route) => void
+    replacePrevious: (route: Route) => void;
 
     /**
      * Replaces the previous route/view and transitions back to it
      */
-    replacePreviousAndPop: (route: Route) => void
+    replacePreviousAndPop: (route: Route) => void;
 
     /**
      * Replaces the top item and popToTop
      */
-    resetTo: (route: Route) => void
+    resetTo: (route: Route) => void;
 
     /**
      * Go back to the item for a particular route object
      */
-    popToRoute(route: Route): void
+    popToRoute(route: Route): void;
 
     /**
      * Go back to the top item
      */
-    popToTop(): void
-}
-
-export interface NavigatorIOSStatic extends NavigationIOS, React.ComponentClass<NavigatorIOSProperties> {
+    popToTop(): void;
 }
 
+export interface NavigatorIOSStatic extends NavigationIOS, React.ComponentClass<NavigatorIOSProperties> {}
 
 /**
  * @see https://facebook.github.io/react-native/docs/activityindicator.html#props
  */
 export interface ActivityIndicatorProperties extends ViewProperties {
-
     /**
      * Whether to show the indicator (true, the default) or hide it (false).
      */
-    animating?: boolean
+    animating?: boolean;
 
     /**
      * The foreground color of the spinner (default is gray).
      */
-    color?: string
+    color?: string;
 
     /**
      * Whether the indicator should hide when not animating (true by default).
      */
-    hidesWhenStopped?: boolean
+    hidesWhenStopped?: boolean;
 
     /**
      * Size of the indicator.
@@ -2414,39 +2406,38 @@ export interface ActivityIndicatorProperties extends ViewProperties {
      *
      * enum('small', 'large')
      */
-    size?: number | 'small' | 'large'
+    size?: number | "small" | "large";
 
-    style?: StyleProp<ViewStyle>
-}
-
-export interface ActivityIndicatorStatic extends NativeMethodsMixin, React.ClassicComponentClass<ActivityIndicatorProperties> {
+    style?: StyleProp<ViewStyle>;
 }
 
+export interface ActivityIndicatorStatic
+    extends NativeMethodsMixin,
+        React.ClassicComponentClass<ActivityIndicatorProperties> {}
 
 /**
  * @see https://facebook.github.io/react-native/docs/activityindicatorios.html#props
  */
 export interface ActivityIndicatorIOSProperties extends ViewProperties {
-
     /**
      * Whether to show the indicator (true, the default) or hide it (false).
      */
-    animating?: boolean
+    animating?: boolean;
 
     /**
      * The foreground color of the spinner (default is gray).
      */
-    color?: string
+    color?: string;
 
     /**
      * Whether the indicator should hide when not animating (true by default).
      */
-    hidesWhenStopped?: boolean
+    hidesWhenStopped?: boolean;
 
     /**
      * Invoked on mount and layout changes with
      */
-    onLayout?: (event: { nativeEvent: { layout: { x: number, y: number, width: number, height: number } } }) => void
+    onLayout?: (event: { nativeEvent: { layout: { x: number; y: number; width: number; height: number } } }) => void;
 
     /**
      * Size of the indicator.
@@ -2454,76 +2445,69 @@ export interface ActivityIndicatorIOSProperties extends ViewProperties {
      *
      * enum('small', 'large')
      */
-    size?: 'small' | 'large'
+    size?: "small" | "large";
 
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 }
 
 /**
  * @Deprecated since version 0.28.0
  */
-export interface ActivityIndicatorIOSStatic extends React.ComponentClass<ActivityIndicatorIOSProperties> {
-}
-
+export interface ActivityIndicatorIOSStatic extends React.ComponentClass<ActivityIndicatorIOSProperties> {}
 
 export interface DatePickerIOSProperties extends ViewProperties {
-
     /**
      * The currently selected date.
      */
-    date: Date
-
+    date: Date;
 
     /**
      * Maximum date.
      * Restricts the range of possible date/time values.
      */
-    maximumDate?: Date
+    maximumDate?: Date;
 
     /**
      * Maximum date.
      * Restricts the range of possible date/time values.
      */
-    minimumDate?: Date
+    minimumDate?: Date;
 
     /**
      *  enum(1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30)
      *  The interval at which minutes can be selected.
      */
-    minuteInterval?: number
+    minuteInterval?: number;
 
     /**
      *  enum('date', 'time', 'datetime')
      *  The date picker mode.
      */
-    mode?: "date" | "time" | "datetime"
+    mode?: "date" | "time" | "datetime";
 
     /**
      * 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
+    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
+    timeZoneOffsetInMinutes?: number;
 }
 
-export interface DatePickerIOSStatic extends NativeMethodsMixin, React.ComponentClass<DatePickerIOSProperties> {
-}
+export interface DatePickerIOSStatic extends NativeMethodsMixin, React.ComponentClass<DatePickerIOSProperties> {}
 
-export interface DrawerSlideEvent extends NativeSyntheticEvent<NativeTouchEvent> {
-}
+export interface DrawerSlideEvent extends NativeSyntheticEvent<NativeTouchEvent> {}
 
 /**
  * @see DrawerLayoutAndroid.android.js
  */
 export interface DrawerLayoutAndroidProperties extends ViewProperties {
-
     /**
      * Specifies the background color of the drawer. The default value
      * is white. If you want to set the opacity of the drawer, use rgba.
@@ -2568,23 +2552,22 @@ export interface DrawerLayoutAndroidProperties extends ViewProperties {
      * - 'none' (the default), drags do not dismiss the keyboard.
      * - 'on-drag', the keyboard is dismissed when a drag begins.
      */
-    keyboardDismissMode?: "none" | "on-drag"
+    keyboardDismissMode?: "none" | "on-drag";
 
     /**
      * Function called whenever the navigation view has been closed.
      */
-    onDrawerClose?: () => void
+    onDrawerClose?: () => void;
 
     /**
      * Function called whenever the navigation view has been opened.
      */
-    onDrawerOpen?: () => void
+    onDrawerOpen?: () => void;
 
     /**
      * Function called whenever there is an interaction with the navigation view.
-     * @param event
      */
-    onDrawerSlide?: (event: DrawerSlideEvent) => void
+    onDrawerSlide?: (event: DrawerSlideEvent) => void;
 
     /**
      * Function called when the drawer state has changed.
@@ -2596,91 +2579,87 @@ export interface DrawerLayoutAndroidProperties extends ViewProperties {
      * - settling, meaning that there was an interaction with the
      *   navigation view, and the navigation view is now finishing
      *   it's closing or opening animation
-     * @param event
      */
-    onDrawerStateChanged?: (event: "Idle" | "Dragging" | "Settling") => void
+    onDrawerStateChanged?: (event: "Idle" | "Dragging" | "Settling") => void;
 
     /**
      * The navigation view that will be rendered to the side of the
      * screen and can be pulled in.
      */
-    renderNavigationView: () => JSX.Element
+    renderNavigationView: () => JSX.Element;
 
     /**
      * Make the drawer take the entire screen and draw the background of
      * the status bar to allow it to open over the status bar. It will
      * only have an effect on API 21+.
      */
-    statusBarBackgroundColor?: string
+    statusBarBackgroundColor?: string;
 }
 
 interface DrawerPosition {
-    Left: number
-    Right: number
+    Left: number;
+    Right: number;
 }
 
-export interface DrawerLayoutAndroidStatic extends NativeMethodsMixin, React.ClassicComponentClass<DrawerLayoutAndroidProperties> {
-
+export interface DrawerLayoutAndroidStatic
+    extends NativeMethodsMixin,
+        React.ClassicComponentClass<DrawerLayoutAndroidProperties> {
     /**
      * drawer's positions.
      */
-    positions: DrawerPosition
+    positions: DrawerPosition;
 
     /**
      * Opens the drawer.
      */
-    openDrawer(): void
+    openDrawer(): void;
 
     /**
      * Closes the drawer.
      */
-    closeDrawer(): void
+    closeDrawer(): void;
 }
 
 /**
  * @see PickerIOS.ios.js
  */
 export interface PickerIOSItemProperties {
-    value?: string | number
-    label?: string
+    value?: string | number;
+    label?: string;
 }
 
 /**
  * @see PickerIOS.ios.js
  */
-export interface PickerIOSItemStatic extends React.ComponentClass<PickerIOSItemProperties> {
-}
+export interface PickerIOSItemStatic extends React.ComponentClass<PickerIOSItemProperties> {}
 
 /**
  * @see Picker.js
  */
 export interface PickerItemProperties {
-    testID?: string
-    color?: string
-    label: string
-    value?: any
+    testID?: string;
+    color?: string;
+    label: string;
+    value?: any;
 }
 
-export interface PickerItem extends React.ComponentClass<PickerItemProperties> {
-}
+export interface PickerItem extends React.ComponentClass<PickerItemProperties> {}
 
 export interface PickerPropertiesIOS extends ViewProperties {
-
     /**
      * Style to apply to each of the item labels.
      * @platform ios
      */
-    itemStyle?: StyleProp<ViewStyle>,
+    itemStyle?: StyleProp<ViewStyle>;
 }
 
 export interface PickerPropertiesAndroid extends ViewProperties {
-
     /**
      * If set to false, the picker will be disabled, i.e. the user will not be able to make a
      * selection.
      * @platform android
      */
-    enabled?: boolean
+    enabled?: boolean;
 
     /**
      * On Android, specifies how to display the selection items when the user taps on the picker:
@@ -2690,13 +2669,13 @@ export interface PickerPropertiesAndroid extends ViewProperties {
      *
      * @platform android
      */
-    mode?: "dialog" | "dropdown"
+    mode?: "dialog" | "dropdown";
 
     /**
      * Prompt string for this picker, used on Android in dialog mode as the title of the dialog.
      * @platform android
      */
-    prompt?: string
+    prompt?: string;
 }
 
 /**
@@ -2704,29 +2683,26 @@ export interface PickerPropertiesAndroid extends ViewProperties {
  * @see Picker.js
  */
 export interface PickerProperties extends PickerPropertiesIOS, PickerPropertiesAndroid {
-
     /**
      * Callback for when an item is selected. This is called with the
      * following parameters:
      * - itemValue: the value prop of the item that was selected
      * - itemPosition: the index of the selected item in this picker
-     * @param itemValue
-     * @param itemPosition
      */
-    onValueChange?: (itemValue: any, itemPosition: number) => void
+    onValueChange?: (itemValue: any, itemPosition: number) => void;
 
     /**
      * Value matching value of one of the items.
      * Can be a string or an integer.
      */
-    selectedValue?: any
+    selectedValue?: any;
 
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     /**
      * Used to locate this view in end-to-end tests.
      */
-    testId?: string
+    testId?: string;
 }
 
 /**
@@ -2734,17 +2710,16 @@ export interface PickerProperties extends PickerPropertiesIOS, PickerPropertiesA
  * @see Picker.js
  */
 export interface PickerStatic extends React.ComponentClass<PickerProperties> {
-
     /**
      * On Android, display the options in a dialog.
      */
-    MODE_DIALOG: string
+    MODE_DIALOG: string;
     /**
      * On Android, display the options in a dropdown (this is the default).
      */
-    MODE_DROPDOWN: string
+    MODE_DROPDOWN: string;
 
-    Item: PickerItem
+    Item: PickerItem;
 }
 
 /**
@@ -2752,10 +2727,9 @@ export interface PickerStatic extends React.ComponentClass<PickerProperties> {
  * @see PickerIOS.ios.js
  */
 export interface PickerIOSProperties extends ViewProperties {
-
-    itemStyle?: StyleProp<TextStyle>
-    onValueChange?: ( value: string | number ) => void
-    selectedValue?: string | number
+    itemStyle?: StyleProp<TextStyle>;
+    onValueChange?: (value: string | number) => void;
+    selectedValue?: string | number;
 }
 
 /**
@@ -2763,8 +2737,7 @@ export interface PickerIOSProperties extends ViewProperties {
  * @see PickerIOS.ios.js
  */
 export interface PickerIOSStatic extends NativeMethodsMixin, React.ClassicComponentClass<PickerIOSProperties> {
-
-    Item: PickerIOSItemStatic
+    Item: PickerIOSItemStatic;
 }
 
 /**
@@ -2772,7 +2745,6 @@ export interface PickerIOSStatic extends NativeMethodsMixin, React.ClassicCompon
  * @see ProgressBarAndroid.android.js
  */
 export interface ProgressBarAndroidProperties extends ViewProperties {
-
     /**
      * Style of the ProgressBar. One of:
          Horizontal
@@ -2783,133 +2755,131 @@ export interface ProgressBarAndroidProperties extends ViewProperties {
          SmallInverse
          LargeInverse
      */
-    styleAttr?: "Horizontal" | "Normal" | "Small" | "Large" | "Inverse" | "SmallInverse" | "LargeInverse"
+    styleAttr?: "Horizontal" | "Normal" | "Small" | "Large" | "Inverse" | "SmallInverse" | "LargeInverse";
 
     /**
      * If the progress bar will show indeterminate progress.
      * Note that this can only be false if styleAttr is Horizontal.
      */
-    indeterminate?: boolean
+    indeterminate?: boolean;
 
     /**
      * The progress value (between 0 and 1).
      */
-    progress?: number
+    progress?: number;
 
     /**
      * Color of the progress bar.
      */
-    color?: string
+    color?: string;
 
     /**
      * Used to locate this view in end-to-end tests.
      */
-    testID?: string
+    testID?: string;
 }
 /**
  * React component that wraps the Android-only `ProgressBar`. This component is used to indicate
  * that the app is loading or there is some activity in the app.
-*/
-export interface ProgressBarAndroidStatic extends NativeMethodsMixin, React.ClassicComponentClass<ProgressBarAndroidProperties> {
-}
+ */
+export interface ProgressBarAndroidStatic
+    extends NativeMethodsMixin,
+        React.ClassicComponentClass<ProgressBarAndroidProperties> {}
 
 /**
  * @see https://facebook.github.io/react-native/docs/progressviewios.html
  * @see ProgressViewIOS.ios.js
  */
 export interface ProgressViewIOSProperties extends ViewProperties {
-
     /**
      * The progress bar style.
      */
-    progressViewStyle?: "default" | "bar"
+    progressViewStyle?: "default" | "bar";
 
     /**
      * The progress value (between 0 and 1).
      */
-    progress?: number
+    progress?: number;
 
     /**
      * The tint color of the progress bar itself.
      */
-    progressTintColor?: string
+    progressTintColor?: string;
 
     /**
      * The tint color of the progress bar track.
      */
-    trackTintColor?: string
+    trackTintColor?: string;
 
     /**
      * A stretchable image to display as the progress bar.
      */
-    progressImage?: ImageURISource | ImageURISource[]
+    progressImage?: ImageURISource | ImageURISource[];
 
     /**
      * A stretchable image to display behind the progress bar.
      */
-    trackImage?: ImageURISource | ImageURISource[]
-}
-export interface ProgressViewIOSStatic extends NativeMethodsMixin, React.ClassicComponentClass<ProgressViewIOSProperties> {
+    trackImage?: ImageURISource | ImageURISource[];
 }
+export interface ProgressViewIOSStatic
+    extends NativeMethodsMixin,
+        React.ClassicComponentClass<ProgressViewIOSProperties> {}
 
 export interface RefreshControlPropertiesIOS extends ViewProperties {
-
     /**
      * The color of the refresh indicator.
      */
-    tintColor?: string
+    tintColor?: string;
 
     /**
      * The title displayed under the refresh indicator.
      */
-    title?: string
+    title?: string;
 
     /**
      * Title color.
      */
-    titleColor?: string
+    titleColor?: string;
 }
 
 export interface RefreshControlPropertiesAndroid extends ViewProperties {
-
     /**
      * The colors (at least one) that will be used to draw the refresh indicator.
      */
-    colors?: string[]
+    colors?: string[];
 
     /**
      * Whether the pull to refresh functionality is enabled.
      */
-    enabled?: boolean
+    enabled?: boolean;
 
     /**
      * The background color of the refresh indicator.
      */
-    progressBackgroundColor?: string
+    progressBackgroundColor?: string;
 
     /**
      * Size of the refresh indicator, see RefreshControl.SIZE.
      */
-    size?: number
+    size?: number;
 
     /**
      * Progress view top offset
      * @platform android
      */
-    progressViewOffset?: number
+    progressViewOffset?: number;
 }
 
 export interface RefreshControlProperties extends RefreshControlPropertiesIOS, RefreshControlPropertiesAndroid {
-
     /**
      * Called when the view starts refreshing.
      */
-    onRefresh?: () => void
+    onRefresh?: () => void;
 
     /**
      * Whether the view should be indicating an active refresh.
      */
-    refreshing: boolean
+    refreshing: boolean;
 }
 
 /**
@@ -2920,12 +2890,13 @@ export interface RefreshControlProperties extends RefreshControlPropertiesIOS, R
  * __Note:__ `refreshing` is a controlled prop, this is why it needs to be set to true
  * in the `onRefresh` function otherwise the refresh indicator will stop immediately.
  */
-export interface RefreshControlStatic extends NativeMethodsMixin, React.ClassicComponentClass<RefreshControlProperties> {
-    SIZE: Object // Undocumented
+export interface RefreshControlStatic
+    extends NativeMethodsMixin,
+        React.ClassicComponentClass<RefreshControlProperties> {
+    SIZE: Object; // Undocumented
 }
 
-export interface RecyclerViewBackedScrollViewProperties extends ScrollViewProperties {
-}
+export interface RecyclerViewBackedScrollViewProperties extends ScrollViewProperties {}
 
 /**
  * Wrapper around android native recycler view.
@@ -2941,8 +2912,9 @@ export interface RecyclerViewBackedScrollViewProperties extends ScrollViewProper
  * use it pass this component as `renderScrollComponent` to the list view. For
  * now only horizontal scrolling is supported.
  */
-export interface RecyclerViewBackedScrollViewStatic extends ScrollResponderMixin, React.ClassicComponentClass<RecyclerViewBackedScrollViewProperties> {
-
+export interface RecyclerViewBackedScrollViewStatic
+    extends ScrollResponderMixin,
+        React.ClassicComponentClass<RecyclerViewBackedScrollViewProperties> {
     /**
      * A helper function to scroll to a specific point  in the scrollview.
      * This is currently used to help focus on child textviews, but can also
@@ -2954,11 +2926,7 @@ export interface RecyclerViewBackedScrollViewStatic extends ScrollResponderMixin
      * the function also accepts separate arguments as as alternative to the options object.
      * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
      */
-    scrollTo(
-        y?: number | { x?: number, y?: number, animated?: boolean },
-        x?: number,
-        animated?: boolean
-    ): void;
+    scrollTo(y?: number | { x?: number; y?: number; animated?: boolean }, x?: number, animated?: boolean): void;
 
     /**
      * Returns a reference to the underlying scroll responder, which supports
@@ -2973,92 +2941,88 @@ export interface SliderPropertiesAndroid extends ViewProperties {
     /**
      * Color of the foreground switch grip.
      */
-    thumbTintColor?: string,
+    thumbTintColor?: string;
 }
 
 export interface SliderPropertiesIOS extends ViewProperties {
-
     /**
      * Assigns a maximum track image. Only static images are supported.
      * The leftmost pixel of the image will be stretched to fill the track.
      */
-    maximumTrackImage?: ImageURISource
+    maximumTrackImage?: ImageURISource;
 
     /**
      * Assigns a minimum track image. Only static images are supported.
      * The rightmost pixel of the image will be stretched to fill the track.
      */
-    minimumTrackImage?: ImageURISource
+    minimumTrackImage?: ImageURISource;
 
     /**
      * Sets an image for the thumb. Only static images are supported.
      */
-    thumbImage?: ImageURISource
+    thumbImage?: ImageURISource;
 
     /**
      * Assigns a single image for the track. Only static images
      * are supported. The center pixel of the image will be stretched
      * to fill the track.
      */
-    trackImage?: ImageURISource
+    trackImage?: ImageURISource;
 }
 
 export interface SliderProperties extends SliderPropertiesIOS, SliderPropertiesAndroid {
-
     /**
      * If true the user won't be able to move the slider.
      * Default value is false.
      */
-    disabled?: boolean
+    disabled?: boolean;
 
     /**
      * The color used for the track to the right of the button.
      * Overrides the default blue gradient image.
      */
-    maximumTrackTintColor?: string
+    maximumTrackTintColor?: string;
 
     /**
      * Initial maximum value of the slider. Default value is 1.
      */
-    maximumValue?: number
+    maximumValue?: number;
 
     /**
      * The color used for the track to the left of the button.
      * Overrides the default blue gradient image.
      */
-    minimumTrackTintColor?: string
+    minimumTrackTintColor?: string;
 
     /**
      * Initial minimum value of the slider. Default value is 0.
      */
-    minimumValue?: number
+    minimumValue?: number;
 
     /**
      * Callback called when the user finishes changing the value (e.g. when the slider is released).
-     * @param value
      */
-    onSlidingComplete?: (value: number) => void
+    onSlidingComplete?: (value: number) => void;
 
     /**
      * Callback continuously called while the user is dragging the slider.
-     * @param value
      */
-    onValueChange?: (value: number) => void
+    onValueChange?: (value: number) => void;
 
     /**
      * Step value of the slider. The value should be between 0 and (maximumValue - minimumValue). Default value is 0.
      */
-    step?: number
+    step?: number;
 
     /**
      * Used to style and layout the Slider. See StyleSheet.js and ViewStylePropTypes.js for more info.
      */
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     /**
      * Used to locate this view in UI automation tests.
      */
-    testID?: string
+    testID?: string;
 
     /**
      * Initial value of the slider. The value should be between minimumValue
@@ -3067,50 +3031,47 @@ export interface SliderProperties extends SliderPropertiesIOS, SliderPropertiesA
      * This is not a controlled component, you don't need to update
      * the value during dragging.
      */
-    value?: number
+    value?: number;
 }
 
 /**
  * A component used to select a single value from a range of values.
  */
-export interface SliderStatic extends NativeMethodsMixin, React.ClassicComponentClass<SliderProperties> {
-
-}
+export interface SliderStatic extends NativeMethodsMixin, React.ClassicComponentClass<SliderProperties> {}
 
 /**
  * https://facebook.github.io/react-native/docs/switchios.html#props
  */
 export interface SwitchIOSProperties extends ViewProperties {
-
     /**
      * If true the user won't be able to toggle the switch. Default value is false.
      */
-    disabled?: boolean
+    disabled?: boolean;
 
     /**
      * Background color when the switch is turned on.
      */
-    onTintColor?: string
+    onTintColor?: string;
 
     /**
      * Callback that is called when the user toggles the switch.
      */
-    onValueChange?: (value: boolean) => void
+    onValueChange?: (value: boolean) => void;
 
     /**
      * Background color for the switch round button.
      */
-    thumbTintColor?: string
+    thumbTintColor?: string;
 
     /**
      * Background color when the switch is turned off.
      */
-    tintColor?: string
+    tintColor?: string;
 
     /**
      * The value of the switch, if true the switch will be turned on. Default value is false.
      */
-    value?: boolean
+    value?: boolean;
 }
 
 /**
@@ -3122,11 +3083,9 @@ export interface SwitchIOSProperties extends ViewProperties {
  *
  * @see https://facebook.github.io/react-native/docs/switchios.html
  */
-export interface SwitchIOSStatic extends React.ComponentClass<SwitchIOSProperties> {
+export interface SwitchIOSStatic extends React.ComponentClass<SwitchIOSProperties> {}
 
-}
-
-export type ImageResizeMode =  "contain" | "cover" | "stretch" | "center" | "repeat"
+export type ImageResizeMode = "contain" | "cover" | "stretch" | "center" | "repeat";
 
 /**
  * @see ImageResizeMode.js
@@ -3136,37 +3095,37 @@ export interface ImageResizeModeStatic {
      * contain - The image will be resized such that it will be completely
      * visible, contained within the frame of the View.
      */
-    contain: ImageResizeMode
+    contain: ImageResizeMode;
     /**
      * cover - The image will be resized such that the entire area of the view
      * is covered by the image, potentially clipping parts of the image.
      */
-    cover: ImageResizeMode
+    cover: ImageResizeMode;
     /**
      * stretch - The image will be stretched to fill the entire frame of the
      * view without clipping.  This may change the aspect ratio of the image,
      * distoring it.  Only supported on iOS.
      */
-    stretch: ImageResizeMode
+    stretch: ImageResizeMode;
     /**
      * center - The image will be scaled down such that it is completely visible,
      * if bigger than the area of the view.
      * The image will not be scaled up.
      */
-    center: ImageResizeMode,
+    center: ImageResizeMode;
 
     /**
      * repeat - The image will be repeated to cover the frame of the View. The
      * image will keep it's size and aspect ratio.
      */
-    repeat: ImageResizeMode,
+    repeat: ImageResizeMode;
 }
 
 export interface ShadowStyleIOS {
-    shadowColor?: string
-    shadowOffset?: {width: number, height: number}
-    shadowOpacity?: number
-    shadowRadius?: number
+    shadowColor?: string;
+    shadowOffset?: { width: number; height: number };
+    shadowOpacity?: number;
+    shadowRadius?: number;
 }
 
 /**
@@ -3174,20 +3133,20 @@ export interface ShadowStyleIOS {
  * @see https://facebook.github.io/react-native/docs/image.html#style
  */
 export interface ImageStyle extends FlexStyle, TransformsStyle, ShadowStyleIOS {
-    resizeMode?: ImageResizeMode
-    backfaceVisibility?: "visible" | "hidden"
-    borderBottomLeftRadius?: number
-    borderBottomRightRadius?: number
-    backgroundColor?: string
-    borderColor?: string
-    borderWidth?: number
-    borderRadius?: number
-    borderTopLeftRadius?: number
-    borderTopRightRadius?: number
-    overflow?: "visible" | "hidden"
-    overlayColor?: string
-    tintColor?: string
-    opacity?: number
+    resizeMode?: ImageResizeMode;
+    backfaceVisibility?: "visible" | "hidden";
+    borderBottomLeftRadius?: number;
+    borderBottomRightRadius?: number;
+    backgroundColor?: string;
+    borderColor?: string;
+    borderWidth?: number;
+    borderRadius?: number;
+    borderTopLeftRadius?: number;
+    borderTopRightRadius?: number;
+    overflow?: "visible" | "hidden";
+    overlayColor?: string;
+    tintColor?: string;
+    opacity?: number;
 }
 
 /*
@@ -3200,22 +3159,22 @@ export interface ImageURISource {
      * resource (which should be wrapped in the `require('./path/to/image.png')`
      * function).
      */
-    uri?: string,
+    uri?: string;
     /**
      * `bundle` is the iOS asset bundle which the image is included in. This
      * will default to [NSBundle mainBundle] if not set.
      * @platform ios
      */
-    bundle?: string,
+    bundle?: string;
     /**
      * `method` is the HTTP Method to use. Defaults to GET if not specified.
      */
-    method?: string,
+    method?: string;
     /**
      * `headers` is an object representing the HTTP headers to send along with the
      * request for a remote image.
      */
-    headers?: {[key: string]: string},
+    headers?: { [key: string]: string };
     /**
      * `cache` determines how the requests handles potentially cached
      * responses.
@@ -3236,44 +3195,34 @@ export interface ImageURISource {
      *
      * @platform ios
      */
-    cache?: 'default' | 'reload' | 'force-cache' | 'only-if-cached',
+    cache?: "default" | "reload" | "force-cache" | "only-if-cached";
     /**
      * `body` is the HTTP body to send with the request. This must be a valid
      * UTF-8 string, and will be sent exactly as specified, with no
      * additional encoding (e.g. URL-escaping or base64) applied.
      */
-    body?: string,
+    body?: string;
     /**
      * `width` and `height` can be specified if known at build time, in which case
      * these will be used to set the default `<Image/>` component dimensions.
      */
-    width?: number,
-    height?: number,
+    width?: number;
+    height?: number;
     /**
      * `scale` is used to indicate the scale factor of the image. Defaults to 1.0 if
      * unspecified, meaning that one image pixel equates to one display point / DIP.
      */
-    scale?: number,
+    scale?: number;
 }
 
 export type ImageRequireSource = number;
 
 export interface ImagePropertiesIOS {
     /**
-     * The text that's read by the screen reader when the user interacts with the image.
+     * blurRadius: the blur radius of the blur filter added to the image
+     * @platform ios
      */
-    accessibilityLabel?: string;
-
-    /**
-     * When true, indicates the image is an accessibility element.
-     */
-    accessible?: boolean;
-
-    /**
-    * blurRadius: the blur radius of the blur filter added to the image
-    * @platform ios
-    */
-    blurRadius?: number,
+    blurRadius?: number;
 
     /**
      * When the image is resized, the corners of the size specified by capInsets will stay a fixed size,
@@ -3281,17 +3230,17 @@ export interface ImagePropertiesIOS {
      * This is useful for creating resizable rounded buttons, shadows, and other resizable assets.
      * More info on Apple documentation
      */
-    capInsets?: Insets
+    capInsets?: Insets;
 
     /**
      * A static image to display while downloading the final image off the network.
      */
-    defaultSource?: ImageURISource | number
+    defaultSource?: ImageURISource | number;
 
     /**
      * Invoked on download progress with {nativeEvent: {loaded, total}}
      */
-    onProgress?: (event: { nativeEvent: { loaded: number, total: number }}) => void
+    onProgress?: (event: { nativeEvent: { loaded: number; total: number } }) => void;
 
     /**
      * Invoked when a partial load of the image is complete. The definition of
@@ -3299,7 +3248,7 @@ export interface ImagePropertiesIOS {
      * for progressive JPEG loads.
      * @platform ios
      */
-    onPartialLoad?: () => void,
+    onPartialLoad?: () => void;
 }
 
 interface ImagePropertiesAndroid {
@@ -3316,13 +3265,18 @@ interface ImagePropertiesAndroid {
      * and produces higher quality images. This should be used if the image is smaller than the view.
      * It should also be used if the image is slightly bigger than the view.
      */
-    resizeMethod?: 'auto' | 'resize' | 'scale'
+    resizeMethod?: "auto" | "resize" | "scale";
+
+    /**
+     * Duration of fade in animation.
+     */
+    fadeDuration?: number;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/image.html
  */
-export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndroid {
+export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndroid, AccessibilityProperties {
     /**
      * onLayout function
      *
@@ -3335,24 +3289,34 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr
     /**
      * Invoked on load error with {nativeEvent: {error}}
      */
-    onError?: (error: { nativeEvent: any }) => void
+    onError?: (error: { nativeEvent: any }) => void;
 
     /**
      * Invoked when load completes successfully
      */
-    onLoad?: () => void
+    onLoad?: () => void;
 
     /**
      * Invoked when load either succeeds or fails
      */
-    onLoadEnd?: () => void
+    onLoadEnd?: () => void;
 
     /**
      * Invoked on load start
      */
-    onLoadStart?: () => void
+    onLoadStart?: () => void;
 
-    progressiveRenderingEnabled?: boolean
+    progressiveRenderingEnabled?: boolean;
+
+    borderRadius?: number;
+
+    borderTopLeftRadius?: number;
+
+    borderTopRightRadius?: number;
+
+    borderBottomLeftRadius?: number;
+
+    borderBottomRightRadius?: number;
 
     /**
      * Determines how to resize the image when the frame doesn't match the raw
@@ -3376,7 +3340,7 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr
      * if bigger than the area of the view.
      * The image will not be scaled up.
      */
-    resizeMode?: 'cover' | 'contain' | 'stretch' | 'repeat' | 'center'
+    resizeMode?: "cover" | "contain" | "stretch" | "repeat" | "center";
 
     /**
      * The mechanism that should be used to resize the image when the image's dimensions
@@ -3397,7 +3361,7 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr
      *
      * @platform android
      */
-    resizeMethod?: 'auto' | 'resize' | 'scale'
+    resizeMethod?: "auto" | "resize" | "scale";
 
     /**
      * `uri` is a string representing the resource identifier for the image, which
@@ -3407,7 +3371,7 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr
      * their width and height. The native side will then choose the best `uri` to display
      * based on the measured size of the image container.
      */
-    source: ImageURISource | ImageURISource[] | ImageRequireSource
+    source: ImageURISource | ImageURISource[] | ImageRequireSource;
 
     /**
      * similarly to `source`, this property represents the resource used to render
@@ -3426,32 +3390,27 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr
      * A unique identifier for this element to be used in UI Automation testing scripts.
      */
     testID?: string;
-
 }
 
 export interface ImageStatic extends NativeMethodsMixin, React.ComponentClass<ImageProperties> {
-    resizeMode: ImageResizeMode
-    getSize(uri: string, success: (width: number, height: number) => void, failure: (error: any) => void): any
-    prefetch(url: string): any
-    abortPrefetch?(requestId: number): void
-    queryCache?(urls: string[]): Promise<Map<string, 'memory' | 'disk'>>
+    resizeMode: ImageResizeMode;
+    getSize(uri: string, success: (width: number, height: number) => void, failure: (error: any) => void): any;
+    prefetch(url: string): any;
+    abortPrefetch?(requestId: number): void;
+    queryCache?(urls: string[]): Promise<Map<string, "memory" | "disk">>;
 }
 
 export interface ImageBackgroundProperties extends ImageProperties {
-    style?: StyleProp<ViewStyle>
-    imageStyle?: StyleProp<ImageStyle>
+    style?: StyleProp<ViewStyle>;
+    imageStyle?: StyleProp<ImageStyle>;
 }
 
 export interface ImageBackgroundStatic extends NativeMethodsMixin, React.ComponentClass<ImageBackgroundProperties> {
-    resizeMode: ImageResizeMode
-    getSize(
-      uri: string,
-      success: (width: number, height: number) => void,
-      failure: (error: any) => void
-    ): any
-    prefetch(url: string): any
-    abortPrefetch?(requestId: number): void
-    queryCache?(urls: string[]): Promise<Map<string, 'memory' | 'disk'>>
+    resizeMode: ImageResizeMode;
+    getSize(uri: string, success: (width: number, height: number) => void, failure: (error: any) => void): any;
+    prefetch(url: string): any;
+    abortPrefetch?(requestId: number): void;
+    queryCache?(urls: string[]): Promise<Map<string, "memory" | "disk">>;
 }
 
 export interface ViewToken {
@@ -3496,46 +3455,44 @@ export interface ViewabilityConfig {
  */
 
 interface ListRenderItemInfo<ItemT> {
+    item: ItemT;
 
-    item: ItemT
-
-    index: number
+    index: number;
 
     separators: {
-        highlight: () => void,
-        unhighlight: () => void,
-        updateProps: (select: 'leading' | 'trailing', newProps: any) => void,
-    },
+        highlight: () => void;
+        unhighlight: () => void;
+        updateProps: (select: "leading" | "trailing", newProps: any) => void;
+    };
 }
 
-type ListRenderItem<ItemT> = (info: ListRenderItemInfo<ItemT>) => React.ReactElement<any> | null
+type ListRenderItem<ItemT> = (info: ListRenderItemInfo<ItemT>) => React.ReactElement<any> | null;
 
 export interface FlatListProperties<ItemT> extends VirtualizedListProperties<ItemT> {
-
     /**
      * Rendered in between each item, but not at the top or bottom
      */
-    ItemSeparatorComponent?: React.ComponentType<any> | null
+    ItemSeparatorComponent?: React.ComponentType<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered when the list is empty.
      */
-    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
+    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered at the very end of the list.
      */
-    ListFooterComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
+    ListFooterComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered at the very beginning of the list.
      */
-    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
+    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Optional custom style for multi-item rows generated when numColumns > 1
      */
-    columnWrapperStyle?: StyleProp<ViewStyle>
+    columnWrapperStyle?: StyleProp<ViewStyle>;
 
     /**
      * When false tapping outside of the focused text input when the keyboard
@@ -3543,7 +3500,7 @@ export interface FlatListProperties<ItemT> extends VirtualizedListProperties<Ite
      * taps and the keyboard will not dismiss automatically. The default value
      * is false.
      */
-    keyboardShouldPersistTaps?: boolean | 'always' | 'never' | 'handled'
+    keyboardShouldPersistTaps?: boolean | "always" | "never" | "handled";
 
     /**
      * For simplicity, data is just a plain array. If you want to use something else,
@@ -3556,7 +3513,7 @@ export interface FlatListProperties<ItemT> extends VirtualizedListProperties<Ite
      * If any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the `data` prop,
      * stick it here and treat it immutably.
      */
-    extraData?: any
+    extraData?: any;
 
     /**
      * `getItemLayout` is an optional optimization that lets us skip measurement of dynamic
@@ -3570,42 +3527,42 @@ export interface FlatListProperties<ItemT> extends VirtualizedListProperties<Ite
      * Remember to include separator length (height or width) in your offset calculation if you specify
      * `ItemSeparatorComponent`.
      */
-    getItemLayout?: (data: Array<ItemT> | null, index: number) => {length: number, offset: number, index: number}
+    getItemLayout?: (data: Array<ItemT> | null, index: number) => { length: number; offset: number; index: number };
 
     /**
      * If true, renders items next to each other horizontally instead of stacked vertically.
      */
-    horizontal?: boolean
+    horizontal?: boolean;
 
     /**
      * How many items to render in the initial batch
      */
-    initialNumToRender?: number
+    initialNumToRender?: number;
 
     /**
      * Instead of starting at the top with the first item, start at initialScrollIndex
      */
-    initialScrollIndex?: number
+    initialScrollIndex?: number;
 
     /**
      * Used to extract a unique key for a given item at the specified index. Key is used for caching
      * and as the react key to track item re-ordering. The default extractor checks `item.key`, then
      * falls back to using the index, like React does.
      */
-    keyExtractor?: (item: ItemT, index: number) => string
+    keyExtractor?: (item: ItemT, index: number) => string;
 
-    legacyImplementation?: boolean
+    legacyImplementation?: boolean;
 
     /**
      * Multiple columns can only be rendered with `horizontal={false}` and will zig-zag like a `flexWrap` layout.
      * Items should all be the same height - masonry layouts are not supported.
      */
-    numColumns?: number
+    numColumns?: number;
 
     /**
      * Called once when the scroll position gets within onEndReachedThreshold of the rendered content.
      */
-    onEndReached?: ((info: {distanceFromEnd: number}) => void) | null
+    onEndReached?: ((info: { distanceFromEnd: number }) => void) | null;
 
     /**
      * How far from the end (in units of visible length of the list) the bottom edge of the
@@ -3613,23 +3570,23 @@ export interface FlatListProperties<ItemT> extends VirtualizedListProperties<Ite
      * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
      * within half the visible length of the list.
      */
-    onEndReachedThreshold?: number | null
+    onEndReachedThreshold?: number | null;
 
     /**
      * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality.
      * Make sure to also set the refreshing prop correctly.
      */
-    onRefresh?: (() => void) | null
+    onRefresh?: (() => void) | null;
 
     /**
      * Called when the viewability of rows changes, as defined by the `viewablePercentThreshold` prop.
      */
-    onViewableItemsChanged?: ((info: {viewableItems: Array<ViewToken>, changed: Array<ViewToken>}) => void) | null
+    onViewableItemsChanged?: ((info: { viewableItems: Array<ViewToken>; changed: Array<ViewToken> }) => void) | null;
 
     /**
      * Set this true while waiting for new data from a refresh.
      */
-    refreshing?: boolean | null
+    refreshing?: boolean | null;
 
     /**
      * Takes an item from data and renders it into the list. Typical usage:
@@ -3644,257 +3601,269 @@ export interface FlatListProperties<ItemT> extends VirtualizedListProperties<Ite
      * ```
      * Provides additional metadata like `index` if you need it.
      */
-    renderItem: ListRenderItem<ItemT>
+    renderItem: ListRenderItem<ItemT>;
 
     /**
      * See `ViewabilityHelper` for flow type and further documentation.
      */
-    viewabilityConfig?: any
+    viewabilityConfig?: any;
 
     /**
      * Note: may have bugs (missing content) in some circumstances - use at your own risk.
      *
      * This may improve scroll performance for large lists.
      */
-    removeClippedSubviews?: boolean
+    removeClippedSubviews?: boolean;
 }
 
 export interface FlatListStatic<ItemT> extends React.ComponentClass<FlatListProperties<ItemT>> {
-
     /**
      * Exports some data, e.g. for perf investigations or analytics.
      */
     getMetrics: () => {
-        contentLength: number,
-        totalRows: number,
-        renderedRows: number,
-        visibleRows: number,
-    }
+        contentLength: number;
+        totalRows: number;
+        renderedRows: number;
+        visibleRows: number;
+    };
 
     /**
      * Scrolls to the end of the content. May be janky without `getItemLayout` prop.
      */
-    scrollToEnd: (params?: {animated?: boolean}) => void
+    scrollToEnd: (params?: { animated?: boolean }) => void;
 
     /**
      * Scrolls to the item at a the specified index such that it is positioned in the viewable area
      * such that `viewPosition` 0 places it at the top, 1 at the bottom, and 0.5 centered in the middle.
      * May be janky without `getItemLayout` prop.
      */
-    scrollToIndex: (params: {animated?: boolean, index: number, viewPosition?: number}) => void
+    scrollToIndex: (params: { animated?: boolean; index: number; viewPosition?: number }) => void;
 
     /**
      * Requires linear scan through data - use `scrollToIndex` instead if possible.
      * May be janky without `getItemLayout` prop.
      */
-    scrollToItem: (params: {animated?: boolean, index: number, viewPosition?: number}) => void
+    scrollToItem: (params: { animated?: boolean; item: ItemT; viewPosition?: number }) => void;
 
     /**
      * Scroll to a specific content pixel offset, like a normal `ScrollView`.
      */
-    scrollToOffset: (params: {animated?: boolean, offset: number}) => void
+    scrollToOffset: (params: { animated?: boolean; offset: number }) => void;
 
     /**
      * Tells the list an interaction has occured, which should trigger viewability calculations,
      * e.g. if waitForInteractions is true and the user has not scrolled. This is typically called
      * by taps on items or by navigation actions.
      */
-    recordInteraction: () => void
+    recordInteraction: () => void;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/sectionlist.html
  */
 export interface SectionBase<ItemT> {
+    data: ItemT[];
 
-    data: ItemT[]
+    key?: string;
 
-    key?: string
+    renderItem?: ListRenderItem<ItemT>;
 
-    renderItem?: ListRenderItem<ItemT>
+    ItemSeparatorComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null;
 
-    ItemSeparatorComponent?: React.ComponentClass<any> | null
-
-    keyExtractor?: (item: ItemT, index: number) => string
+    keyExtractor?: (item: ItemT, index: number) => string;
 }
 
 export interface SectionListData<ItemT> extends SectionBase<ItemT> {
     [key: string]: any;
 }
 
-export interface SectionListProperties<ItemT> extends ScrollViewProperties {
-
+export interface SectionListProperties<ItemT> extends VirtualizedListProperties<ItemT> {
     /**
      * Rendered in between adjacent Items within each section.
      */
-    ItemSeparatorComponent?: React.ComponentClass<any> | null
+    ItemSeparatorComponent?: React.ComponentType<any> | null;
 
     /**
      * Rendered when the list is empty.
      */
-    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
+    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered at the very end of the list.
      */
-    ListFooterComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null
+    ListFooterComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered at the very beginning of the list.
      */
-    ListHeaderComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null
+    ListHeaderComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered in between each section.
      */
-    SectionSeparatorComponent?: React.ComponentClass<any> | null
+    SectionSeparatorComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * A marker property for telling the list to re-render (since it implements PureComponent).
      * If any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the `data` prop,
      * stick it here and treat it immutably.
      */
-    extraData?: any
+    extraData?: any;
+
+    /**
+     * `getItemLayout` is an optional optimization that lets us skip measurement of dynamic
+     * content if you know the height of items a priori. getItemLayout is the most efficient,
+     * and is easy to use if you have fixed height items, for example:
+     * ```
+     * getItemLayout={(data, index) => (
+     *   {length: ITEM_HEIGHT, offset: ITEM_HEIGHT * index, index}
+     * )}
+     * ```
+     */
+    getItemLayout?: (
+        data: SectionListData<ItemT>[] | null,
+        index: number
+    ) => { length: number; offset: number; index: number };
 
     /**
      * How many items to render in the initial batch
      */
-    initialNumToRender?: number
+    initialNumToRender?: number;
 
     /**
      * Used to extract a unique key for a given item at the specified index. Key is used for caching
      * and as the react key to track item re-ordering. The default extractor checks `item.key`, then
      * falls back to using the index, like React does.
      */
-    keyExtractor?: (item: ItemT, index: number) => string
+    keyExtractor?: (item: ItemT, index: number) => string;
 
     /**
      * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality.
      * Make sure to also set the refreshing prop correctly.
      */
-    onRefresh?: (() => void) | null
+    onRefresh?: (() => void) | null;
 
     /**
      * Set this true while waiting for new data from a refresh.
      */
-    refreshing?: boolean | null
+    refreshing?: boolean | null;
 
     /**
      * Default renderer for every item in every section. Can be over-ridden on a per-section basis.
      */
-    renderItem?: ListRenderItem<ItemT>
+    renderItem: ListRenderItem<ItemT>;
 
     /**
      * Rendered at the top of each section. Sticky headers are not yet supported.
      */
-    renderSectionHeader?: (info: {section: SectionListData<ItemT>}) => React.ReactElement<any> | null
+    renderSectionHeader?: (info: { section: SectionListData<ItemT> }) => React.ReactElement<any> | null;
 
     /**
      * Rendered at the bottom of each section.
      */
-    renderSectionFooter?: (info: {section: SectionListData<ItemT>}) => React.ReactElement<any> | null
+    renderSectionFooter?: (info: { section: SectionListData<ItemT> }) => React.ReactElement<any> | null;
 
     /**
      * An array of objects with data for each section.
      */
-    sections: SectionListData<ItemT>[]
+    sections: SectionListData<ItemT>[];
 
     /**
      * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
      */
-    renderScrollComponent?: (props: ScrollViewProperties) => React.ReactElement<ScrollViewProperties>
+    renderScrollComponent?: (props: ScrollViewProperties) => React.ReactElement<ScrollViewProperties>;
 
     /**
      * Note: may have bugs (missing content) in some circumstances - use at your own risk.
      *
      * This may improve scroll performance for large lists.
-    */
-    removeClippedSubviews?: boolean
+     */
+    removeClippedSubviews?: boolean;
 
     /**
      * Makes section headers stick to the top of the screen until the next one pushes it off.
      * Only enabled by default on iOS because that is the platform standard there.
      */
-    stickySectionHeadersEnabled?: boolean
+    stickySectionHeadersEnabled?: boolean;
 }
 
-export interface SectionListStatic<SectionT> extends React.ComponentClass<SectionListProperties<SectionT>> {
-
-}
+export interface SectionListStatic<SectionT> extends React.ComponentClass<SectionListProperties<SectionT>> {}
 
 /**
  * @see https://facebook.github.io/react-native/docs/virtualizedlist.html#props
  */
 export interface VirtualizedListProperties<ItemT> extends ScrollViewProperties {
-
     /**
      * Rendered when the list is empty. Can be a React Component Class, a render function, or
      * a rendered element.
      */
-    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
+    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered at the bottom of all the items. Can be a React Component Class, a render function, or
      * a rendered element.
      */
-    ListFooterComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
+    ListFooterComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered at the top of all the items. Can be a React Component Class, a render function, or
      * a rendered element.
      */
-    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
+    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * The default accessor functions assume this is an Array<{key: string}> but you can override
      * getItem, getItemCount, and keyExtractor to handle any type of index-based data.
      */
-    data?: any
+    data?: any;
 
     /**
      * `debug` will turn on extra logging and visual overlays to aid with debugging both usage and
      * implementation, but with a significant perf hit.
      */
-    debug?: boolean
+    debug?: boolean;
 
     /**
      * DEPRECATED: Virtualization provides significant performance and memory optimizations, but fully
      * unmounts react instances that are outside of the render window. You should only need to disable
      * this for debugging purposes.
      */
-    disableVirtualization?: boolean
+    disableVirtualization?: boolean;
 
     /**
      * A marker property for telling the list to re-render (since it implements `PureComponent`). If
      * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
      * `data` prop, stick it here and treat it immutably.
      */
-    extraData?: any
+    extraData?: any;
 
     /**
      * A generic accessor for extracting an item from any sort of data blob.
      */
-    getItem?: (data: any, index: number) => ItemT
+    getItem?: (data: any, index: number) => ItemT;
 
     /**
      * Determines how many items are in the data blob.
      */
-    getItemCount?: (data: any) => number
+    getItemCount?: (data: any) => number;
 
-    getItemLayout?: (data: any, index: number) => {
-        length: number,
-        offset: number,
+    getItemLayout?: (
+        data: any,
         index: number
-    }
+    ) => {
+        length: number;
+        offset: number;
+        index: number;
+    };
 
-    horizontal?: boolean
+    horizontal?: boolean;
 
     /**
      * How many items to render in the initial batch. This should be enough to fill the screen but not
      * much more. Note these items will never be unmounted as part of the windowed rendering in order
      * to improve perceived performance of scroll-to-top actions.
      */
-    initialNumToRender?: number
+    initialNumToRender?: number;
 
     /**
      * Instead of starting at the top with the first item, start at `initialScrollIndex`. This
@@ -3902,25 +3871,25 @@ export interface VirtualizedListProperties<ItemT> extends ScrollViewProperties {
      * always rendered and immediately renders the items starting at this initial index. Requires
      * `getItemLayout` to be implemented.
      */
-    initialScrollIndex?: number
+    initialScrollIndex?: number;
 
     /**
      * Reverses the direction of scroll. Uses scale transforms of -1.
      */
-    inverted?: boolean
+    inverted?: boolean;
 
-    keyExtractor?: (item: ItemT, index: number) => string
+    keyExtractor?: (item: ItemT, index: number) => string;
 
     /**
      * The maximum number of items to render in each incremental render batch. The more rendered at
      * once, the better the fill rate, but responsiveness my suffer because rendering content may
      * interfere with responding to button taps or other interactions.
      */
-    maxToRenderPerBatch?: number
+    maxToRenderPerBatch?: number;
 
-    onEndReached?: ((info: {distanceFromEnd: number}) => void) | null
+    onEndReached?: ((info: { distanceFromEnd: number }) => void) | null;
 
-    onEndReachedThreshold?: number | null
+    onEndReachedThreshold?: number | null;
 
     onLayout?: (event: LayoutChangeEvent) => void;
 
@@ -3928,46 +3897,46 @@ export interface VirtualizedListProperties<ItemT> extends ScrollViewProperties {
      * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality. Make
      * sure to also set the `refreshing` prop correctly.
      */
-    onRefresh?: (() => void) | null
+    onRefresh?: (() => void) | null;
 
     /**
      * Called when the viewability of rows changes, as defined by the
      * `viewabilityConfig` prop.
      */
-    onViewableItemsChanged?: ((info: {viewableItems: Array<ViewToken>, changed: Array<ViewToken>}) => void) | null
+    onViewableItemsChanged?: ((info: { viewableItems: Array<ViewToken>; changed: Array<ViewToken> }) => void) | null;
 
     /**
      * Set this when offset is needed for the loading indicator to show correctly.
      * @platform android
      */
-    progressViewOffset?: number
+    progressViewOffset?: number;
 
     /**
      * Set this true while waiting for new data from a refresh.
      */
-    refreshing?: boolean | null
+    refreshing?: boolean | null;
 
     /**
      * Note: may have bugs (missing content) in some circumstances - use at your own risk.
      *
      * This may improve scroll performance for large lists.
      */
-    removeClippedSubviews?: boolean
+    removeClippedSubviews?: boolean;
 
-    renderItem: ListRenderItem<ItemT>
+    renderItem: ListRenderItem<ItemT>;
 
     /**
      * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
      */
-    renderScrollComponent?: (props: ScrollViewProperties) => React.ReactElement<ScrollViewProperties>
+    renderScrollComponent?: (props: ScrollViewProperties) => React.ReactElement<ScrollViewProperties>;
 
     /**
      * Amount of time between low-pri item render batches, e.g. for rendering items quite a ways off
      * screen. Similar fill rate/responsiveness tradeoff as `maxToRenderPerBatch`.
      */
-    updateCellsBatchingPeriod?: number
+    updateCellsBatchingPeriod?: number;
 
-    viewabilityConfig?: ViewabilityConfig
+    viewabilityConfig?: ViewabilityConfig;
 
     /**
      * Determines the maximum number of items rendered outside of the visible area, in units of
@@ -3976,18 +3945,17 @@ export interface VirtualizedListProperties<ItemT> extends ScrollViewProperties {
      * this number will reduce memory consumption and may improve performance, but will increase the
      * chance that fast scrolling may reveal momentary blank areas of unrendered content.
      */
-    windowSize?: number
+    windowSize?: number;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/listview.html#props
  */
 export interface ListViewProperties extends ScrollViewProperties {
-
     /**
      * An instance of [ListView.DataSource](docs/listviewdatasource.html) to use
      */
-    dataSource: ListViewDataSource
+    dataSource: ListViewDataSource;
 
     /**
      * Flag indicating whether empty section headers should be rendered.
@@ -3996,14 +3964,14 @@ export interface ListViewProperties extends ScrollViewProperties {
      * desired to be rendered their indices should be excluded from
      * sectionID object.
      */
-    enableEmptySections?: boolean
+    enableEmptySections?: boolean;
 
     /**
      * 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
+    initialListSize?: number;
 
     /**
      * (visibleRows, changedRows) => void
@@ -4014,31 +3982,34 @@ export interface ListViewProperties extends ScrollViewProperties {
      * 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
+    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
+    onEndReached?: () => void;
 
     /**
      * Threshold in pixels for onEndReached.
      */
-    onEndReachedThreshold?: number
+    onEndReachedThreshold?: number;
 
     /**
      * Number of rows to render per event loop.
      */
-    pageSize?: number
+    pageSize?: number;
 
     /**
      * A 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
+    removeClippedSubviews?: boolean;
 
     /**
      * () => renderable
@@ -4048,7 +4019,7 @@ export interface ListViewProperties extends ScrollViewProperties {
      * 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>
+    renderFooter?: () => React.ReactElement<any>;
 
     /**
      * () => renderable
@@ -4058,7 +4029,7 @@ export interface ListViewProperties extends ScrollViewProperties {
      * 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>
+    renderHeader?: () => React.ReactElement<any>;
 
     /**
      * (rowData, sectionID, rowID) => renderable
@@ -4067,14 +4038,18 @@ export interface ListViewProperties extends ScrollViewProperties {
      * is exactly what was put into the data source, but it's also possible to
      * provide custom extractors.
      */
-    renderRow: ( rowData: any, sectionID: string | number, rowID: string | number, highlightRow?: boolean ) => React.ReactElement<any>
-
+    renderRow: (
+        rowData: any,
+        sectionID: string | number,
+        rowID: string | number,
+        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>
+    renderScrollComponent?: (props: ScrollViewProperties) => React.ReactElement<ScrollViewProperties>;
 
     /**
      * (sectionData, sectionID) => renderable
@@ -4085,8 +4060,7 @@ export interface ListViewProperties extends ScrollViewProperties {
      * stick to the top until it is pushed off the screen by the next section
      * header.
      */
-    renderSectionHeader?: (sectionData: any, sectionId: string | number) => React.ReactElement<any>
-
+    renderSectionHeader?: (sectionData: any, sectionId: string | number) => React.ReactElement<any>;
 
     /**
      * (sectionID, rowID, adjacentRowHighlighted) => renderable
@@ -4094,13 +4068,17 @@ export interface ListViewProperties extends ScrollViewProperties {
      * 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 | number, rowID: string | number, 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
      * pixels.
      */
-    scrollRenderAheadDistance?: number
+    scrollRenderAheadDistance?: number;
 
     /**
      * An array of child indices determining which children get docked to the
@@ -4110,7 +4088,7 @@ export interface ListViewProperties extends ScrollViewProperties {
      * with `horizontal={true}`.
      * @platform ios
      */
-    stickyHeaderIndices?: number[]
+    stickyHeaderIndices?: number[];
 
     /**
      * Makes the sections headers sticky. The sticky behavior means that it will scroll with the
@@ -4119,19 +4097,18 @@ export interface ListViewProperties extends ScrollViewProperties {
      * property is not supported in conjunction with `horizontal={true}`. Only enabled by default
      * on iOS because of typical platform standards.
      */
-    stickySectionHeadersEnabled?: boolean
+    stickySectionHeadersEnabled?: boolean;
 }
 
-
 interface TimerMixin {
-    setTimeout: typeof setTimeout,
-    clearTimeout: typeof clearTimeout,
-    setInterval: typeof setInterval,
-    clearInterval: typeof clearInterval,
-    setImmediate: typeof setImmediate,
-    clearImmediate: typeof clearImmediate,
-    requestAnimationFrame: typeof requestAnimationFrame,
-    cancelAnimationFrame: typeof cancelAnimationFrame,
+    setTimeout: typeof setTimeout;
+    clearTimeout: typeof clearTimeout;
+    setInterval: typeof setInterval;
+    clearInterval: typeof clearInterval;
+    setImmediate: typeof setImmediate;
+    clearImmediate: typeof clearImmediate;
+    requestAnimationFrame: typeof requestAnimationFrame;
+    cancelAnimationFrame: typeof cancelAnimationFrame;
 }
 
 export interface ListViewStatic extends ScrollResponderMixin, TimerMixin, React.ComponentClass<ListViewProperties> {
@@ -4141,88 +4118,86 @@ export interface ListViewStatic extends ScrollResponderMixin, TimerMixin, React.
      * Exports some data, e.g. for perf investigations or analytics.
      */
     getMetrics: () => {
-        contentLength: number,
-        totalRows: number,
-        renderedRows: number,
-        visibleRows: number,
-    }
+        contentLength: number;
+        totalRows: number;
+        renderedRows: number;
+        visibleRows: number;
+    };
 
     /**
      * Provides a handle to the underlying scroll responder.
      */
-    getScrollResponder: () => any,
+    getScrollResponder: () => any;
 
     /**
      * Scrolls to a given x, y offset, either immediately or with a smooth animation.
      *
      * See `ScrollView#scrollTo`.
      */
-    scrollTo: ( y?: number | { x?: number, y?: number, animated?: boolean } , x?: number, animated?: boolean ) => void,
+    scrollTo: (y?: number | { x?: number; y?: number; animated?: boolean }, x?: number, animated?: boolean) => void;
 }
 
-
 export interface MapViewAnnotation {
-    latitude: number
-    longitude: number
-    animateDrop?: boolean
-    draggable?: boolean
-    onDragStateChange?: () => any,
-    onFocus?: () => any,
-    onBlur?: () => any,
-    title?: string
-    subtitle?: string
-    leftCalloutView?: React.ReactElement<any>
-    rightCalloutView?: React.ReactElement<any>
-    detailCalloutView?: React.ReactElement<any>
-    tintColor?: string
-    image?: ImageURISource
-    view?: React.ReactElement<any>
-    hasLeftCallout?: boolean
-    hasRightCallout?: boolean
-    onLeftCalloutPress?: () => void
-    onRightCalloutPress?: () => void
-    id?: string
+    latitude: number;
+    longitude: number;
+    animateDrop?: boolean;
+    draggable?: boolean;
+    onDragStateChange?: () => any;
+    onFocus?: () => any;
+    onBlur?: () => any;
+    title?: string;
+    subtitle?: string;
+    leftCalloutView?: React.ReactElement<any>;
+    rightCalloutView?: React.ReactElement<any>;
+    detailCalloutView?: React.ReactElement<any>;
+    tintColor?: string;
+    image?: ImageURISource;
+    view?: React.ReactElement<any>;
+    hasLeftCallout?: boolean;
+    hasRightCallout?: boolean;
+    onLeftCalloutPress?: () => void;
+    onRightCalloutPress?: () => void;
+    id?: string;
 }
 
 export interface MapViewRegion {
-    latitude: number
-    longitude: number
-    latitudeDelta?: number
-    longitudeDelta?: number
+    latitude: number;
+    longitude: number;
+    latitudeDelta?: number;
+    longitudeDelta?: number;
 }
 
 export interface MapViewOverlay {
-    coordinates: ({ latitude: number, longitude: number })[]
-    lineWidth?: number
-    strokeColor?: string
-    fillColor?: string
-    id?: string
+    coordinates: ({ latitude: number; longitude: number })[];
+    lineWidth?: number;
+    strokeColor?: string;
+    fillColor?: string;
+    id?: string;
 }
 
 export interface MapViewProperties extends ViewProperties {
-
     /**
      * If false points of interest won't be displayed on the map.
      * Default value is true.
      */
-    showsPointsOfInterest?: boolean
+    showsPointsOfInterest?: boolean;
 
     /**
      * Map annotations with title/subtitle.
      */
-    annotations?: MapViewAnnotation[]
+    annotations?: MapViewAnnotation[];
 
     /**
      * If true the map will follow the user's location whenever it changes.
      * Note that this has no effect unless showsUserLocation is enabled.
      * Default value is true.
      */
-    followUserLocation?: boolean
+    followUserLocation?: boolean;
 
     /**
      * Insets for the map's legal label, originally at bottom left of the map. See EdgeInsetsPropType.js for more information.
      */
-    legalLabelInsets?: Insets
+    legalLabelInsets?: Insets;
 
     /**
      * The map type to be displayed.
@@ -4232,43 +4207,43 @@ export interface MapViewProperties extends ViewProperties {
      *
      * enum('standard', 'satellite', 'hybrid')
      */
-    mapType?: 'standard' |'satellite' |'hybrid'
+    mapType?: "standard" | "satellite" | "hybrid";
 
     /**
      * Maximum size of area that can be displayed.
      */
-    maxDelta?: number
+    maxDelta?: number;
 
     /**
      * Minimum size of area that can be displayed.
      */
-    minDelta?: number
+    minDelta?: number;
 
     /**
      * Map overlays
      */
-    overlays?: MapViewOverlay[]
+    overlays?: MapViewOverlay[];
 
     /**
      * If false compass won't be displayed on the map.
      * Default value is true.
      */
-    showsCompass?: boolean
+    showsCompass?: boolean;
 
     /**
      * Callback that is called once, when the user taps an annotation.
      */
-    onAnnotationPress?: () => void
+    onAnnotationPress?: () => void;
 
     /**
      * Callback that is called continuously when the user is dragging the map.
      */
-    onRegionChange?: (region: MapViewRegion) => void
+    onRegionChange?: (region: MapViewRegion) => void;
 
     /**
      * Callback that is called once, when the user is done moving the map.
      */
-    onRegionChangeComplete?: (region: MapViewRegion) => void
+    onRegionChangeComplete?: (region: MapViewRegion) => void;
 
     /**
      * When this property is set to true and a valid camera is associated with the map,
@@ -4277,13 +4252,13 @@ export interface MapViewProperties extends ViewProperties {
      * 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
+    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
+    region?: MapViewRegion;
 
     /**
      * When this property is set to true and a valid camera is associated with the map,
@@ -4292,13 +4267,13 @@ export interface MapViewProperties extends ViewProperties {
      * 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
+    rotateEnabled?: boolean;
 
     /**
      * If false the user won't be able to change the map region being displayed.
      * Default value is true.
      */
-    scrollEnabled?: boolean
+    scrollEnabled?: boolean;
 
     /**
      * If true the app will ask for the user's location and focus on it.
@@ -4307,19 +4282,19 @@ export interface MapViewProperties extends ViewProperties {
      * NOTE: You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation,
      * otherwise it is going to fail silently!
      */
-    showsUserLocation?: boolean
+    showsUserLocation?: boolean;
 
     /**
      * Used to style and layout the MapView.
      * See StyleSheet.js and ViewStylePropTypes.js for more info.
      */
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     /**
      * If false the user won't be able to pinch/zoom the map.
      * Default value is true.
      */
-    zoomEnabled?: boolean
+    zoomEnabled?: boolean;
 }
 
 /**
@@ -4327,27 +4302,25 @@ export interface MapViewProperties extends ViewProperties {
  */
 export interface MapViewStatic extends NativeMethodsMixin, React.ComponentClass<MapViewProperties> {
     PinColors: {
-        RED: string,
-        GREEN: string,
-        PURPLE: string
-    }
+        RED: string;
+        GREEN: string;
+        PURPLE: string;
+    };
 }
 
 interface MaskedViewProperties extends ViewProperties {
-    maskElement: React.ReactElement<any>,
+    maskElement: React.ReactElement<any>;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/maskedviewios.html
  */
-export interface MaskedViewStatic extends NativeMethodsMixin, React.ComponentClass<MaskedViewProperties> {
-}
+export interface MaskedViewStatic extends NativeMethodsMixin, React.ComponentClass<MaskedViewProperties> {}
 
 export interface ModalProperties {
-
     // Only `animated` is documented. The JS code says `animated` is
     // deprecated and `animationType` is preferred.
-    animated?: boolean
+    animated?: boolean;
     /**
      * The `animationType` prop controls how the modal animates.
      *
@@ -4355,54 +4328,61 @@ export interface ModalProperties {
      * - `fade` fades into view
      * - `none` appears without an animation
      */
-    animationType?: "none" | "slide" | "fade"
+    animationType?: "none" | "slide" | "fade";
     /**
      * The `transparent` prop determines whether your modal will fill the entire view.
      * Setting this to `true` will render the modal over a transparent background.
      */
-    transparent?: boolean
+    transparent?: boolean;
     /**
      * The `visible` prop determines whether your modal is visible.
      */
-    visible?: boolean
+    visible?: boolean;
     /**
      * The `onRequestClose` prop allows passing a function that will be called once the modal has been dismissed.
      * _On the Android platform, this is a required function._
      */
-    onRequestClose?: () => void
+    onRequestClose?: () => void;
     /**
      * The `onShow` prop allows passing a function that will be called once the modal has been shown.
      */
-    onShow?: (event: NativeSyntheticEvent<any>) => void
+    onShow?: (event: NativeSyntheticEvent<any>) => void;
     /**
      * The `supportedOrientations` prop allows the modal to be rotated to any of the specified orientations.
      * On iOS, the modal is still restricted by what's specified in your app's Info.plist's UISupportedInterfaceOrientations field.
      * @platform ios
      */
-    supportedOrientations?: ('portrait' | 'portrait-upside-down' | 'landscape' | 'landscape-left' | 'landscape-right')[]
+    supportedOrientations?: (
+        | "portrait"
+        | "portrait-upside-down"
+        | "landscape"
+        | "landscape-left"
+        | "landscape-right")[];
     /**
      * The `onOrientationChange` callback is called when the orientation changes while the modal is being displayed.
      * The orientation provided is only 'portrait' or 'landscape'. This callback is also called on initial render, regardless of the current orientation.
      * @platform ios
      */
-    onOrientationChange?: () => void
+    onOrientationChange?: () => void;
+     /**
+     * The `onDismiss` prop allows passing a function that will be called once the modal has been dismissed.
+     * @platform ios
+     */
+    onDismiss?: () => void;
 }
 
-export interface ModalStatic extends React.ComponentClass<ModalProperties> {
-
-}
+export interface ModalStatic extends React.ComponentClass<ModalProperties> {}
 
 /**
  * @see https://github.com/facebook/react-native/blob/0.34-stable\Libraries\Components\Touchable\Touchable.js
  */
 interface TouchableMixin {
-
     /**
      * Invoked when the item should be highlighted. Mixers should implement this
      * to visually distinguish the `VisualRect` so that the user knows that
      * releasing a touch will result in a "selection" (analog to click).
      */
-    touchableHandleActivePressIn(e: GestureResponderEvent): void
+    touchableHandleActivePressIn(e: GestureResponderEvent): void;
 
     /**
      * Invoked when the item is "active" (in that it is still eligible to become
@@ -4413,14 +4393,14 @@ interface TouchableMixin {
      * event will not fire on an `touchEnd/mouseUp` event, only move events while
      * the user is depressing the mouse/touch.
      */
-    touchableHandleActivePressOut(e: GestureResponderEvent): void
+    touchableHandleActivePressOut(e: GestureResponderEvent): void;
 
     /**
      * Invoked when the item is "selected" - meaning the interaction ended by
      * letting up while the item was either in the state
      * `RESPONDER_ACTIVE_PRESS_IN` or `RESPONDER_INACTIVE_PRESS_IN`.
      */
-    touchableHandlePress(e: GestureResponderEvent): void
+    touchableHandlePress(e: GestureResponderEvent): void;
 
     /**
      * Invoked when the item is long pressed - meaning the interaction ended by
@@ -4432,82 +4412,29 @@ interface TouchableMixin {
      * to return false. As a result, `touchableHandlePress` will be called when
      * lifting up, even if `touchableHandleLongPress` has also been called.
      */
-    touchableHandleLongPress(e: GestureResponderEvent): void
+    touchableHandleLongPress(e: GestureResponderEvent): void;
 
     /**
      * Returns the amount to extend the `HitRect` into the `PressRect`. Positive
      * numbers mean the size expands outwards.
      */
-    touchableGetPressRectOffset(): Insets
+    touchableGetPressRectOffset(): Insets;
 
     /**
      * Returns the number of millis to wait before triggering a highlight.
      */
-    touchableGetHighlightDelayMS(): number
+    touchableGetHighlightDelayMS(): number;
 
     // These methods are undocumented but still being used by TouchableMixin internals
-    touchableGetLongPressDelayMS(): number
-    touchableGetPressOutDelayMS(): number
-    touchableGetHitSlop(): Insets
-}
-
-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?: 'none' | 'button' | 'radiobutton_checked' | 'radiobutton_unchecked'
-}
-
-type ViewAccessibilityTraits =
-    'none' |
-    'button' |
-    'link' |
-    'header' |
-    'search' |
-    'image' |
-    'selected' |
-    'plays' |
-    'key' |
-    'text' |
-    'summary' |
-    'disabled' |
-    'frequentUpdates' |
-    'startsMedia' |
-    'adjustable' |
-    'allowsDirectInteraction' |
-    'pageTurn'
-
-export interface TouchableWithoutFeedbackIOSProperties {
-
-    /**
-     * Provides additional traits to screen reader.
-     * By default no traits are provided unless specified otherwise in element
-     */
-    accessibilityTraits?: ViewAccessibilityTraits | ViewAccessibilityTraits[]
-
+    touchableGetLongPressDelayMS(): number;
+    touchableGetPressOutDelayMS(): number;
+    touchableGetHitSlop(): Insets;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html#props
  */
-export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeedbackAndroidProperties, TouchableWithoutFeedbackIOSProperties {
-
-    /**
-     * 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;
-
-    /**
-     * When true, indicates that the view is an accessibility element.
-     * By default, all the touchable elements are accessible.
-     */
-    accessible?: boolean;
-
+export interface TouchableWithoutFeedbackProperties extends AccessibilityProperties {
     /**
      * Delay in ms, from onPressIn, before onLongPress is called.
      */
@@ -4526,7 +4453,7 @@ export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeed
     /**
      * If true, disable all interactions for this component.
      */
-    disabled?: boolean
+    disabled?: boolean;
 
     /**
      * This defines how far your touch can start away from the button.
@@ -4535,13 +4462,13 @@ export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeed
      * the Z-index of sibling views always takes precedence if a touch hits
      * two overlapping views.
      */
-    hitSlop?: Insets
+    hitSlop?: Insets;
 
     /**
      * Invoked on mount and layout changes with
      * {nativeEvent: {layout: {x, y, width, height}}}
      */
-    onLayout?: (event: LayoutChangeEvent) => void
+    onLayout?: (event: LayoutChangeEvent) => void;
 
     onLongPress?: (event: GestureResponderEvent) => void;
 
@@ -4558,7 +4485,7 @@ export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeed
     /**
      * //FIXME: not in doc but available in examples
      */
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     /**
      * When the scroll view is disabled, this defines how far your
@@ -4568,18 +4495,15 @@ export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeed
      * while the scroll view is disabled. Ensure you pass in a constant
      * to reduce memory allocations.
      */
-    pressRetentionOffset?: Insets
+    pressRetentionOffset?: Insets;
 
     /**
      * Used to locate this view in end-to-end tests.
      */
-    testID?: string
+    testID?: string;
 }
 
-
-export interface TouchableWithoutFeedbackProps extends TouchableWithoutFeedbackProperties {
-
-}
+export interface TouchableWithoutFeedbackProps extends TouchableWithoutFeedbackProperties {}
 
 /**
  * Do not use unless you have a very good reason.
@@ -4588,40 +4512,40 @@ export interface TouchableWithoutFeedbackProps extends TouchableWithoutFeedbackP
  *
  * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html
  */
-export interface TouchableWithoutFeedbackStatic extends TimerMixin, TouchableMixin, React.ClassicComponentClass<TouchableWithoutFeedbackProps> {
-
-}
+export interface TouchableWithoutFeedbackStatic
+    extends TimerMixin,
+        TouchableMixin,
+        React.ClassicComponentClass<TouchableWithoutFeedbackProps> {}
 
 /**
  * @see https://facebook.github.io/react-native/docs/touchablehighlight.html#props
  */
 export interface TouchableHighlightProperties extends TouchableWithoutFeedbackProperties {
-
     /**
      * Determines what the opacity of the wrapped view should be when touch is active.
      */
-    activeOpacity?: number
+    activeOpacity?: number;
 
     /**
      *
      * Called immediately after the underlay is hidden
      */
-    onHideUnderlay?: () => void
+    onHideUnderlay?: () => void;
 
     /**
      * Called immediately after the underlay is shown
      */
-    onShowUnderlay?: () => void
+    onShowUnderlay?: () => void;
 
     /**
      * @see https://facebook.github.io/react-native/docs/view.html#style
      */
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     /**
      * The color of the underlay that will show through when the touch is active.
      */
-    underlayColor?: string
+    underlayColor?: string;
 }
 
 /**
@@ -4637,9 +4561,11 @@ export interface TouchableHighlightProperties extends TouchableWithoutFeedbackPr
  *
  * @see https://facebook.github.io/react-native/docs/touchablehighlight.html
  */
-export interface TouchableHighlightStatic extends NativeMethodsMixin, TimerMixin, TouchableMixin, React.ClassicComponentClass<TouchableHighlightProperties> {
-}
-
+export interface TouchableHighlightStatic
+    extends NativeMethodsMixin,
+        TimerMixin,
+        TouchableMixin,
+        React.ClassicComponentClass<TouchableHighlightProperties> {}
 
 /**
  * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
@@ -4649,7 +4575,7 @@ export interface TouchableOpacityProperties extends TouchableWithoutFeedbackProp
      * Determines what the opacity of the wrapped view should be when touch is active.
      * Defaults to 0.2
      */
-    activeOpacity?: number
+    activeOpacity?: number;
 }
 
 /**
@@ -4660,29 +4586,33 @@ export interface TouchableOpacityProperties extends TouchableWithoutFeedbackProp
  *
  * @see https://facebook.github.io/react-native/docs/touchableopacity.html
  */
-export interface TouchableOpacityStatic extends TimerMixin, TouchableMixin, NativeMethodsMixin, React.ClassicComponentClass<TouchableOpacityProperties> {
+export interface TouchableOpacityStatic
+    extends TimerMixin,
+        TouchableMixin,
+        NativeMethodsMixin,
+        React.ClassicComponentClass<TouchableOpacityProperties> {
     /**
      * Animate the touchable to a new opacity.
      */
-    setOpacityTo: (value: number) => void
+    setOpacityTo: (value: number) => void;
 }
 
 interface BaseBackgroundPropType {
-    type: string
+    type: string;
 }
 
 interface RippleBackgroundPropType extends BaseBackgroundPropType {
-    type: 'RippleAndroid'
-    color?: number,
-    borderless?: boolean
+    type: "RippleAndroid";
+    color?: number;
+    borderless?: boolean;
 }
 
 interface ThemeAttributeBackgroundPropType extends BaseBackgroundPropType {
-    type: 'ThemeAttrAndroid'
-    attribute: string
+    type: "ThemeAttrAndroid";
+    attribute: string;
 }
 
-type BackgroundPropType = RippleBackgroundPropType | ThemeAttributeBackgroundPropType
+type BackgroundPropType = RippleBackgroundPropType | ThemeAttributeBackgroundPropType;
 
 /**
  * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
@@ -4702,8 +4632,8 @@ export interface TouchableNativeFeedbackProperties extends TouchableWithoutFeedb
      *         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?: BackgroundPropType
-    useForeground?: boolean
+    background?: BackgroundPropType;
+    useForeground?: boolean;
 }
 
 /**
@@ -4716,20 +4646,21 @@ export interface TouchableNativeFeedbackProperties extends TouchableWithoutFeedb
  *
  * @see https://facebook.github.io/react-native/docs/touchablenativefeedback.html#content
  */
-export interface TouchableNativeFeedbackStatic extends TouchableMixin, React.ClassicComponentClass<TouchableNativeFeedbackProperties> {
-
+export interface TouchableNativeFeedbackStatic
+    extends TouchableMixin,
+        React.ClassicComponentClass<TouchableNativeFeedbackProperties> {
     /**
      * Creates an object that represents android theme's default background for
      * selectable elements (?android:attr/selectableItemBackground).
      */
-    SelectableBackground(): ThemeAttributeBackgroundPropType
+    SelectableBackground(): ThemeAttributeBackgroundPropType;
 
     /**
      * Creates an object that represent android theme's default background for borderless
      * selectable elements (?android:attr/selectableItemBackgroundBorderless).
      * Available on android API level 21+.
      */
-    SelectableBackgroundBorderless(): ThemeAttributeBackgroundPropType
+    SelectableBackgroundBorderless(): ThemeAttributeBackgroundPropType;
 
     /**
      * Creates an object that represents ripple drawable with specified color (as a
@@ -4741,186 +4672,36 @@ export interface TouchableNativeFeedbackStatic extends TouchableMixin, React.Cla
      * @param color The ripple color
      * @param borderless If the ripple can render outside it's bounds
      */
-    Ripple( color: string, borderless?: boolean ): RippleBackgroundPropType
-}
-
-
-export interface LeftToRightGesture {
-    // If the gesture can end and restart during one continuous touch
-    isDetachable: boolean;
-    // How far the swipe must drag to start transitioning
-    gestureDetectMovement: number;
-    // Amplitude of release velocity that is considered still
-    notMoving: number;
-    // Fraction of directional move required.
-    directionRatio: number;
-    // Velocity to transition with when the gesture release was "not moving"
-    snapVelocity: number;
-    // Region that can trigger swipe. iOS default is 30px from the left edge
-    edgeHitWidth: number;
-    // Ratio of gesture completion when non-velocity release will cause action
-    stillCompletionRatio: number;
-    fullDistance: any;
-    direction: string;
-}
-
-export interface JumpGesture extends LeftToRightGesture {
-    overswipe: {
-        frictionConstant: number
-        frictionByDistance: number
-    }
-}
-
-// 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: () => boolean,
-        out: () => boolean
-    };
-}
-
-export interface JumpSceneConfig extends SceneConfig {
-    gestures: {
-        pop?: LeftToRightGesture
-        jumpBack: JumpGesture
-        jumpForward: JumpGesture
-    }
-}
-
-// see /NavigatorSceneConfigs.js
-export interface SceneConfigs {
-    PushFromRight: SceneConfig;
-    PushFromLeft: SceneConfig;
-    FloatFromRight: SceneConfig;
-    FloatFromLeft: SceneConfig;
-    FloatFromBottom: SceneConfig;
-    FloatFromBottomAndroid: SceneConfig;
-    FadeAndroid: SceneConfig;
-    HorizontalSwipeJump: SceneConfig;
-    HorizontalSwipeJumpFromRight: SceneConfig;
-    VerticalUpSwipeJump: SceneConfig;
-    VerticalDownSwipeJump: SceneConfig;
+    Ripple(color: string, borderless?: boolean): RippleBackgroundPropType;
 }
 
 export interface Route {
-    component?: React.ComponentType<any>
-    id?: string
-    title?: string
+    component?: React.ComponentType<any>;
+    id?: string;
+    title?: string;
     passProps?: Object;
 
     //anything else
-    [key: string]: any
+    [key: string]: any;
 
     //Commonly found properties
-    backButtonTitle?: string
-    content?: string
+    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 {
-    /**
-     * Optional function that allows configuration about scene animations and gestures.
-     * Will be invoked with `route` and `routeStack` parameters, where `route`
-     * corresponds to the current scene being rendered by the `Navigator` and
-     * `routeStack` is the set of currently mounted routes that the navigator
-     *  could transition to. The function should return a scene configuration object.
-     * @param route
-     * @param routeStack
-     */
-    configureScene?: (route: Route, routeStack: 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?: () => any
-
-    /**
-     * @deprecated Use navigationContext.addListener('willfocus', callback) instead.
-     */
-    onWillFocus?: () => any
-
-    /**
-     * 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?: StyleProp<ViewStyle>
-
-}
-
-/**
- * Class that contains the info and methods for app navigation.
- */
-export interface NavigationContext {
-    parent: NavigationContext;
-    top: NavigationContext;
-    currentRoute: any;
-    appendChild(childContext: NavigationContext): void;
-    addListener(eventType: string, listener: () => void, useCapture?: boolean): NativeEventSubscription;
-    emit(eventType: string, data: any, didEmitCallback?: () => void): void;
-    dispose(): void;
+    index?: number;
+    onRightButtonPress?: () => void;
+    rightButtonTitle?: string;
+    wrapperStyle?: any;
 }
 
 interface InteractionMixin {
-    createInteractionHandle(): number
-    clearInteractionHandle(clearHandle: number): void
+    createInteractionHandle(): number;
+    clearInteractionHandle(clearHandle: number): void;
     /**
      * Schedule work for after all interactions have completed.
      *
-     * @param {function} callback
      */
-    runAfterInteractions(callback: () => any): void
+    runAfterInteractions(callback: () => any): void;
 }
 
 interface SubscribableMixin {
@@ -4932,230 +4713,22 @@ interface SubscribableMixin {
      * the subscription and therefore can guarantee it is retained in a way that
      * will be cleaned up.
      *
-     * @param {EventEmitter} eventEmitter emitter to subscribe to.
-     * @param {string} eventType Type of event to listen to.
-     * @param {function} listener Function to invoke when event occurs.
-     * @param {object} context Object to use as listener context.
+     * @param eventEmitter emitter to subscribe to.
+     * @param eventType Type of event to listen to.
+     * @param listener Function to invoke when event occurs.
+     * @param context Object to use as listener context.
      */
-    addListenerOn( eventEmitter: any, eventType: string, listener: () => any, context: any ): void
-}
-
-/**
- * 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 TimerMixin, InteractionMixin, SubscribableMixin, React.ComponentClass<NavigatorProperties> {
-    SceneConfigs: SceneConfigs;
-    NavigationBar: NavigatorStatic.NavigationBarStatic;
-    BreadcrumbNavigationBar: NavigatorStatic.BreadcrumbNavigationBarStatic;
-
-    navigationContext: NavigationContext;
-
-    /**
-     * 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;
-
-    /**
-     * Go back N scenes at once. When N=1, behavior matches `pop()`.
-     * When N is invalid(negative or bigger than current routes count), do nothing.
-     * @param {number} n The number of scenes to pop. Should be an integer.
-     */
-    popN(n: number): 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;
-
-    /**
-     *  Replace the previous scene and pop to it.
-     */
-    replacePreviousAndPop( route: Route ): void;
-
-    /**
-     * Navigate to a new scene and reset route stack.
-     */
-    resetTo( route: Route ): void;
-
-}
-
-export namespace NavigatorStatic {
-
-
-    export interface NavState {
-        routeStack: Route[]
-        presentedIndex: number
-    }
-
-    // @see NavigationBarStyle.ios.js
-    export interface NavigationBarStyle {
-        General: {
-            NavBarHeight: number
-            StatusBarHeight: number
-            TotalNavHeight: number
-        },
-        Interpolators: {
-            // Animating *into* the center stage from the right
-            RightToCenter: () => boolean
-            // Animating out of the center stage, to the left
-            CenterToLeft: () => boolean
-            // Both stages (animating *past* the center stage)
-            RightToLeft: () => boolean
-        },
-        Stages: {
-            Left: {
-                Title: FlexStyle
-                LeftButton: FlexStyle
-                RightButton: FlexStyle
-            },
-            Center: {
-                Title: FlexStyle
-                LeftButton: FlexStyle
-                RightButton: FlexStyle
-            },
-            Right: {
-                Title: FlexStyle
-                LeftButton: FlexStyle
-                RightButton: FlexStyle
-            },
-        }
-    }
-
-
-    export interface NavigationBarRouteMapper {
-        Title: (route: Route, nav: Navigator, index: number, navState: NavState) => JSX.Element | null;
-        LeftButton: (route: Route, nav: Navigator, index: number, navState: NavState) => JSX.Element | null;
-        RightButton: (route: Route, nav: Navigator, index: number, navState: NavState) => JSX.Element | null;
-    }
-
-    /**
-     * @see NavigatorNavigationBar.js
-     */
-    export interface NavigationBarProperties {
-        navigator?: Navigator
-        routeMapper?: NavigationBarRouteMapper
-        navState?: NavState
-        navigationStyles?: NavigationBarStyle
-        style?: StyleProp<ViewStyle>
-    }
-
-    export interface NavigationBarStatic extends React.ComponentClass<NavigationBarProperties> {
-        Styles: NavigationBarStyle
-        StylesAndroid: NavigationBarStyle;
-        StylesIOS: NavigationBarStyle;
-
-        /**
-         * Stop transtion, immediately resets the cached state and re-render the
-         * whole view.
-         */
-        immediatelyRefresh(): void;
-    }
-
-    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 {
-        navigator?: Navigator
-        routeMapper?: BreadcrumbNavigationBarRouteMapper
-        navState?: NavState
-        style?: StyleProp<ViewStyle>
-    }
-
-    export interface BreadcrumbNavigationBarStatic extends React.ComponentClass<BreadcrumbNavigationBarProperties> {
-        Styles: BreadcrumbNavigationBarStyle
-
-        immediatelyRefresh(): void
-    }
-
-    export type BreadcrumbNavigationBar = BreadcrumbNavigationBarStatic
-    var BreadcrumbNavigationBar: BreadcrumbNavigationBarStatic
-
+    addListenerOn(eventEmitter: any, eventType: string, listener: () => any, context: any): void;
 }
 
 // @see https://github.com/facebook/react-native/blob/0.34-stable\Libraries\StyleSheet\StyleSheetTypes.js
 export namespace StyleSheet {
-    type NamedStyles<T> = {
-        [P in keyof T]: ViewStyle | TextStyle | ImageStyle;
-    }
+    type NamedStyles<T> = { [P in keyof T]: ViewStyle | TextStyle | ImageStyle };
 
     /**
      * Creates a StyleSheet style reference from the given object.
      */
-    export function create<T extends NamedStyles<T>>( styles: T ): {
-        [P in keyof T]: RegisteredStyle<T[P]>;
-    };
+    export function create<T extends NamedStyles<T>>(styles: T): { [P in keyof T]: RegisteredStyle<T[P]> };
 
     /**
      * Flattens an array of style objects, into one aggregated style object.
@@ -5196,10 +4769,10 @@ export namespace StyleSheet {
      * their respective objects, merged as one and then returned. This also explains
      * the alternative use.
      */
-    export function flatten<T>(style?: RegisteredStyle<T>): T
-    export function flatten(style?: StyleProp<ViewStyle>): ViewStyle
-    export function flatten(style?: StyleProp<TextStyle>): TextStyle
-    export function flatten(style?: StyleProp<ImageStyle>): ImageStyle
+    export function flatten<T>(style?: RegisteredStyle<T>): T;
+    export function flatten(style?: StyleProp<ViewStyle>): ViewStyle;
+    export function flatten(style?: StyleProp<TextStyle>): TextStyle;
+    export function flatten(style?: StyleProp<ImageStyle>): ImageStyle;
 
     /**
      * This is defined as the width of a thin line on the platform. It can be
@@ -5218,14 +4791,14 @@ export namespace StyleSheet {
      * constant size, because on different platforms and screen densities its
      * value may be calculated differently.
      */
-    export var hairlineWidth: number
+    export var hairlineWidth: number;
 
     interface AbsoluteFillStyle {
-        position: "absolute"
-        left: 0
-        right: 0
-        top: 0
-        bottom: 0
+        position: "absolute";
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
     }
 
     /**
@@ -5240,90 +4813,79 @@ export namespace StyleSheet {
      *     },
      *   });
      */
-    export var absoluteFillObject: AbsoluteFillStyle
+    export var absoluteFillObject: AbsoluteFillStyle;
 
     /**
      * A very common pattern is to create overlays with position absolute and zero positioning,
      * so `absoluteFill` can be used for convenience and to reduce duplication of these repeated
      * styles.
      */
-    export var absoluteFill: RegisteredStyle<AbsoluteFillStyle>
+    export var absoluteFill: RegisteredStyle<AbsoluteFillStyle>;
 }
 
 export interface RelayProfiler {
-    attachProfileHandler(
-        name: string,
-        handler: (name: string, state?: any) => () => void
-    ): void,
+    attachProfileHandler(name: string, handler: (name: string, state?: any) => () => void): void;
 
-    attachAggregateHandler(
-        name: string,
-        handler: (name: string, callback: () => void) => void
-    ): void,
+    attachAggregateHandler(name: string, handler: (name: string, callback: () => void) => void): void;
 }
 
 export interface SystraceStatic {
-    setEnabled(enabled: boolean): void
+    setEnabled(enabled: boolean): void;
 
     /**
      * beginEvent/endEvent for starting and then ending a profile within the same call stack frame
      **/
-    beginEvent(profileName?: any, args?: any): void
-    endEvent(): void
+    beginEvent(profileName?: any, args?: any): void;
+    endEvent(): void;
 
     /**
      * beginAsyncEvent/endAsyncEvent for starting and then ending a profile where the end can either
      * occur on another thread or out of the current stack frame, eg await
      * the returned cookie variable should be used as input into the endAsyncEvent call to end the profile
      **/
-    beginAsyncEvent(profileName?: any): any
-    endAsyncEvent(profileName?: any, cookie?: any): void
+    beginAsyncEvent(profileName?: any): any;
+    endAsyncEvent(profileName?: any, cookie?: any): void;
 
     /**
      * counterEvent registers the value to the profileName on the systrace timeline
      **/
-    counterEvent(profileName?: any, value?: any): void
+    counterEvent(profileName?: any, value?: any): void;
 
     /**
      * Relay profiles use await calls, so likely occur out of current stack frame
      * therefore async variant of profiling is used
      **/
-    attachToRelayProfiler(relayProfiler: RelayProfiler): void
+    attachToRelayProfiler(relayProfiler: RelayProfiler): void;
 
     /* This is not called by default due to perf overhead but it's useful
         if you want to find traces which spend too much time in JSON. */
-    swizzleJSON(): void
+    swizzleJSON(): void;
 
     /**
      * Measures multiple methods of a class. For example, you can do:
      * Systrace.measureMethods(JSON, 'JSON', ['parse', 'stringify']);
      *
-     * @param object
-     * @param objectName
      * @param methodNames Map from method names to method display names.
      */
-    measureMethods(object: any, objectName: string, methodNames: Array<string>): void
+    measureMethods(object: any, objectName: string, methodNames: Array<string>): void;
 
     /**
      * Returns an profiled version of the input function. For example, you can:
      * JSON.parse = Systrace.measure('JSON', 'parse', JSON.parse);
      *
-     * @param objName
-     * @param fnName
-     * @param {function} func
-     * @return {function} replacement function
+     * @return replacement function
      */
-    measure<T extends Function>(objName: string, fnName: string, func: T): T
+    measure<T extends Function>(objName: string, fnName: string, func: 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?: (dataBlob: any, sectionID: number | string, rowID: number | string) => any
-    getSectionHeaderData?: (dataBlob: any, sectionID: number | string) => any
+    rowHasChanged?: (r1: any, r2: any) => boolean;
+    sectionHeaderHasChanged?: (h1: any, h2: any) => boolean;
+    getRowData?: (dataBlob: any, sectionID: number | string, rowID: number | string) => any;
+    getSectionHeaderData?: (dataBlob: any, sectionID: number | string) => any;
 }
 
 /**
@@ -5383,7 +4945,10 @@ export interface ListViewDataSource {
      * handle merging of old and new data separately and then pass that into
      * this function as the `dataBlob`.
      */
-    cloneWithRows(dataBlob: Array<any> | { [key: string]: any }, rowIdentities?: Array<string | number>): ListViewDataSource
+    cloneWithRows(
+        dataBlob: Array<any> | { [key: string]: any },
+        rowIdentities?: Array<string | number>
+    ): ListViewDataSource;
 
     /**
      * This performs the same function as the `cloneWithRows` function but here
@@ -5396,97 +4961,99 @@ export interface ListViewDataSource {
      *
      * Note: this returns a new object!
      */
-    cloneWithRowsAndSections(dataBlob: Array<any> | { [key: string]: any }, sectionIdentities?: Array<string | number>, rowIdentities?: Array<Array<string | number>>): ListViewDataSource
+    cloneWithRowsAndSections(
+        dataBlob: Array<any> | { [key: string]: any },
+        sectionIdentities?: Array<string | number>,
+        rowIdentities?: Array<Array<string | number>>
+    ): ListViewDataSource;
 
-    getRowCount(): number
-    getRowAndSectionCount(): number
+    getRowCount(): number;
+    getRowAndSectionCount(): number;
 
     /**
      * Returns if the row is dirtied and needs to be rerendered
      */
-    rowShouldUpdate(sectionIndex: number, rowIndex: number): boolean
+    rowShouldUpdate(sectionIndex: number, rowIndex: number): boolean;
 
     /**
      * Gets the data required to render the row.
      */
-    getRowData(sectionIndex: number, rowIndex: number): any
+    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
+    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
+    getSectionIDForFlatIndex(index: number): string;
 
     /**
      * Returns an array containing the number of rows in each section
      */
-    getSectionLengths(): Array<number>
+    getSectionLengths(): Array<number>;
 
     /**
      * Returns if the section header is dirtied and needs to be rerendered
      */
-    sectionHeaderShouldUpdate(sectionIndex: number): boolean
+    sectionHeaderShouldUpdate(sectionIndex: number): boolean;
 
     /**
      * Gets the data required to render the section header
      */
-    getSectionHeaderData(sectionIndex: number): any
+    getSectionHeaderData(sectionIndex: number): any;
 }
 
-
 /**
  * @see https://facebook.github.io/react-native/docs/tabbarios-item.html#props
  */
 export interface TabBarItemProperties extends ViewProperties {
-
     /**
      * Little red bubble that sits at the top right of the icon.
      */
-    badge?: string | number
+    badge?: string | number;
 
     /**
      * Background color for the badge. Available since iOS 10.
      */
-    badgeColor?: string
+    badgeColor?: string;
 
     /**
      * A custom icon for the tab. It is ignored when a system icon is defined.
      */
-    icon?: ImageURISource
+    icon?: ImageURISource;
 
     /**
      * Callback when this tab is being selected,
      * you should change the state of your component to set selected={true}.
      */
-    onPress?: () => void
+    onPress?: () => void;
 
     /**
      * If set to true it renders the image as original,
      * it defaults to being displayed as a template
      */
-    renderAsOriginal?: boolean
+    renderAsOriginal?: boolean;
 
     /**
      * 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
+    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?: ImageURISource
+    selectedIcon?: ImageURISource;
 
     /**
      * React style object.
      */
-    style?: StyleProp<ViewStyle>
+    style?: StyleProp<ViewStyle>;
 
     /**
      * Items comes with a few predefined system icons.
@@ -5494,26 +5061,36 @@ export interface TabBarItemProperties extends ViewProperties {
      *
      *  enum('bookmarks', 'contacts', 'downloads', 'favorites', 'featured', 'history', 'more', 'most-recent', 'most-viewed', 'recents', 'search', 'top-rated')
      */
-    systemIcon?: "bookmarks" | "contacts" | "downloads" | "favorites" | "featured" | "history" | "more" | "most-recent" | "most-viewed" | "recents" | "search" | "top-rated"
+    systemIcon?:
+        | "bookmarks"
+        | "contacts"
+        | "downloads"
+        | "favorites"
+        | "featured"
+        | "history"
+        | "more"
+        | "most-recent"
+        | "most-viewed"
+        | "recents"
+        | "search"
+        | "top-rated";
 
     /**
      * Text that appears under the icon. It is ignored when a system icon is defined.
      */
-    title?: string
+    title?: string;
 }
 
-export interface TabBarItemStatic extends React.ComponentClass<TabBarItemProperties> {
-}
+export interface TabBarItemStatic extends React.ComponentClass<TabBarItemProperties> {}
 
 /**
  * @see https://facebook.github.io/react-native/docs/tabbarios.html#props
  */
 export interface TabBarIOSProperties extends ViewProperties {
-
     /**
      * Background color of the tab bar
      */
-    barTintColor?: string
+    barTintColor?: string;
 
     /**
      * Specifies tab bar item positioning. Available values are:
@@ -5524,36 +5101,34 @@ export interface TabBarIOSProperties extends ViewProperties {
      * this value defaults to `fill`, in a horizontally regular one (e.g. iPad)
      * it defaults to center.
      */
-    itemPositioning?: 'fill' | 'center' | 'auto'
+    itemPositioning?: "fill" | "center" | "auto";
 
     /**
      * Color of the currently selected tab icon
      */
-    tintColor?: string
+    tintColor?: string;
 
     /**
      * A Boolean value that indicates whether the tab bar is translucent
      */
-    translucent?: boolean
+    translucent?: boolean;
 
     /**
      * Color of text on unselected tabs
      */
-    unselectedTintColor?: string
+    unselectedTintColor?: string;
 
     /**
      * Color of unselected tab icons. Available since iOS 10.
      */
-    unselectedItemTintColor?: string
+    unselectedItemTintColor?: string;
 }
 
 export interface TabBarIOSStatic extends React.ComponentClass<TabBarIOSProperties> {
     Item: TabBarItemStatic;
 }
 
-
 export interface PixelRatioStatic {
-
     /*
         Returns the device pixel density. Some examples:
             PixelRatio.get() === 1
@@ -5584,14 +5159,13 @@ export interface PixelRatioStatic {
         preference set in Settings > Display > Font size,
         on iOS it will always return the default pixel ratio.
         */
-    getFontScale(): number
+    getFontScale(): number;
 
     /**
      * Converts a layout size (dp) to pixel size (px).
      * Guaranteed to return an integer number.
-     * @param layoutSize
      */
-    getPixelSizeForLayoutSize(layoutSize: number): number
+    getPixelSizeForLayoutSize(layoutSize: number): number;
 
     /**
      * Rounds a layout size (dp) to the nearest layout size that
@@ -5599,34 +5173,33 @@ export interface PixelRatioStatic {
      * on a device with a PixelRatio of 3,
      * PixelRatio.roundToNearestPixel(8.4) = 8.33,
      * which corresponds to exactly (8.33 * 3) = 25 pixels.
-     * @param layoutSize
      */
-    roundToNearestPixel(layoutSize: number): number
+    roundToNearestPixel(layoutSize: number): number;
 
     /**
      * No-op for iOS, but used on the web. Should not be documented. [sic]
      */
-    startDetecting(): void
+    startDetecting(): void;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/platform-specific-code.html#content
  */
-export type PlatformOSType = 'ios' | 'android' | 'macos' | 'windows' | 'web'
+export type PlatformOSType = "ios" | "android" | "macos" | "windows" | "web";
 
 interface PlatformStatic {
-    OS: PlatformOSType
-    Version: number
+    OS: PlatformOSType;
+    Version: number;
 
     /**
      * @see https://facebook.github.io/react-native/docs/platform-specific-code.html#content
      */
-    select<T>( specifics: { [platform in PlatformOSType]?: T; } ): T;
+    select<T>(specifics: { [platform in PlatformOSType | 'default']?: T }): T;
 }
 
 interface PlatformIOSStatic extends PlatformStatic {
-    isPad: boolean
-    isTVOS: boolean
+    isPad: boolean;
+    isTVOS: boolean;
 }
 
 /**
@@ -5634,9 +5207,9 @@ interface PlatformIOSStatic extends PlatformStatic {
  * adding all event listeners directly to RCTDeviceEventEmitter.
  */
 interface DeviceEventEmitterStatic extends EventEmitter {
-    sharedSubscriber: EventSubscriptionVendor
-    new(): DeviceEventEmitterStatic;
-    addListener( type: string, listener: ( data: any ) => void, context?: any ): EmitterSubscription;
+    sharedSubscriber: EventSubscriptionVendor;
+    new (): DeviceEventEmitterStatic;
+    addListener(type: string, listener: (data: any) => void, context?: any): EmitterSubscription;
 }
 
 // Used by Dimensions below
@@ -5659,8 +5232,8 @@ export interface ScaledSize {
  *
  * Example: `var {height, width} = Dimensions.get('window');`
  *
- * @param {string} dim Name of dimension as defined when calling `set`.
- * @returns {Object?} Value for the dimension.
+ * @param dim Name of dimension as defined when calling `set`.
+ * @returns Value for the dimension.
  * @see https://facebook.github.io/react-native/docs/dimensions.html#content
  */
 export interface Dimensions {
@@ -5675,119 +5248,116 @@ export interface Dimensions {
      * example, using inline styles rather than setting a value in a
      * StyleSheet).
      * Example: var {height, width} = Dimensions.get('window');
-     @param {string} dim Name of dimension as defined when calling set.
-     @returns {Object?} Value for the dimension.
+     @param dim Name of dimension as defined when calling set.
+     @returns Value for the dimension.
      */
     get(dim: "window" | "screen"): ScaledSize;
 
     /**
      * This should only be called from native code by sending the didUpdateDimensions event.
-     * @param {object} dims Simple string-keyed object of dimensions to set
+     * @param dims Simple string-keyed object of dimensions to set
      */
-    set( dims: {[key: string]: any} ): void;
+    set(dims: { [key: string]: any }): void;
 
     /**
      * Add an event listener for dimension changes
      *
-     * @param {string} type the type of event to listen to
-     * @param {function} handler the event handler
+     * @param type the type of event to listen to
+     * @param handler the event handler
      */
-    addEventListener(type: "change", handler: () => void): void;
+    addEventListener(type: "change", handler: ({ window, screen }: { window: ScaledSize, screen: ScaledSize }) => void): void;
 
     /**
      * Remove an event listener
      *
-     * @param {string} type the type of event
-     * @param {function} handler the event handler
+     * @param type the type of event
+     * @param handler the event handler
      */
-    removeEventListener(type: "change", handler: () => void): void;
+    removeEventListener(type: "change", handler: ({ window, screen }: { window: ScaledSize, screen: ScaledSize }) => void): void;
 }
 
 export type SimpleTask = {
-    name: string
-    gen: () => void
-}
+    name: string;
+    gen: () => void;
+};
 export type PromiseTask = {
-    name: string
-    gen: () => Promise<any>
-}
+    name: string;
+    gen: () => Promise<any>;
+};
 
-export type Handle = number
+export type Handle = number;
 
 export interface InteractionManagerStatic extends EventEmitterListener {
     Events: {
-        interactionStart: string
-        interactionComplete: string
-    }
+        interactionStart: string;
+        interactionComplete: string;
+    };
 
     /**
      * Schedule a function to run after all interactions have completed.
      * Returns a cancellable
-     * @param fn
      */
-    runAfterInteractions(task?: (() => any) | SimpleTask | PromiseTask): {
-        then: (onfulfilled?: () => any, onrejected?: () => any) => Promise<any>,
-        done: (...args: any[]) => any,
-        cancel: () => void,
-    }
+    runAfterInteractions(
+        task?: (() => any) | SimpleTask | PromiseTask
+    ): {
+        then: (onfulfilled?: () => any, onrejected?: () => any) => Promise<any>;
+        done: (...args: any[]) => any;
+        cancel: () => void;
+    };
 
     /**
      * Notify manager that an interaction has started.
      */
-    createInteractionHandle(): Handle
+    createInteractionHandle(): Handle;
 
     /**
      * Notify manager that an interaction has completed.
      */
-    clearInteractionHandle(handle: Handle): void
+    clearInteractionHandle(handle: Handle): void;
 
     /**
      * A positive number will use setTimeout to schedule any tasks after
      * the eventLoopRunningTime hits the deadline value, otherwise all
      * tasks will be executed in one setImmediate batch (default).
      */
-    setDeadline(deadline: number): void
+    setDeadline(deadline: number): void;
 }
 
-
 export interface ScrollViewStyle extends FlexStyle, TransformsStyle {
-
-    backfaceVisibility?: "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?: "solid" | "dotted" | "dashed"
-    borderWidth?: number
-    borderTopWidth?: number
-    borderRightWidth?: number
-    borderBottomWidth?: number
-    borderLeftWidth?: number
-    opacity?: number
-    overflow?: "visible" | "hidden"
-    shadowColor?: string
-    shadowOffset?: { width: number; height: number }
-    shadowOpacity?: number
-    shadowRadius?: number
-    elevation?: number
-}
-
-export interface ScrollResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {
+    backfaceVisibility?: "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?: "solid" | "dotted" | "dashed";
+    borderWidth?: number;
+    borderTopWidth?: number;
+    borderRightWidth?: number;
+    borderBottomWidth?: number;
+    borderLeftWidth?: number;
+    opacity?: number;
+    overflow?: "visible" | "hidden";
+    shadowColor?: string;
+    shadowOffset?: { width: number; height: number };
+    shadowOpacity?: number;
+    shadowRadius?: number;
+    elevation?: number;
 }
 
+export interface ScrollResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {}
 
 interface ScrollResponderMixin extends SubscribableMixin {
     /**
      * Invoke this from an `onScroll` event.
      */
-    scrollResponderHandleScrollShouldSetResponder(): boolean
+    scrollResponderHandleScrollShouldSetResponder(): boolean;
 
     /**
      * Merely touch starting is not sufficient for a scroll view to become the
@@ -5814,7 +5384,7 @@ interface ScrollResponderMixin extends SubscribableMixin {
      *   true.
      *
      */
-    scrollResponderHandleStartShouldSetResponder(): boolean
+    scrollResponderHandleStartShouldSetResponder(): boolean;
 
     /**
      * There are times when the scroll view wants to become the responder
@@ -5827,7 +5397,7 @@ interface ScrollResponderMixin extends SubscribableMixin {
      *
      * Invoke this from an `onStartShouldSetResponderCapture` event.
      */
-    scrollResponderHandleStartShouldSetResponderCapture(e: ScrollResponderEvent): boolean
+    scrollResponderHandleStartShouldSetResponderCapture(e: ScrollResponderEvent): boolean;
 
     /**
      * Invoke this from an `onResponderReject` event.
@@ -5839,7 +5409,7 @@ interface ScrollResponderMixin extends SubscribableMixin {
      * altogether. To improve this, find a way to disable the `UIScrollView` after
      * a touch has already started.
      */
-    scrollResponderHandleResponderReject(): any
+    scrollResponderHandleResponderReject(): any;
 
     /**
      * We will allow the scroll view to give up its lock iff it acquired the lock
@@ -5856,26 +5426,26 @@ interface ScrollResponderMixin extends SubscribableMixin {
      *   navigation of a swipe gesture higher in the view hierarchy, should be
      *   rejected.
      */
-    scrollResponderHandleTerminationRequest(): boolean
+    scrollResponderHandleTerminationRequest(): boolean;
 
     /**
      * Invoke this from an `onTouchEnd` event.
      *
-     * @param {SyntheticEvent} e Event.
+     * @param e Event.
      */
-    scrollResponderHandleTouchEnd(e: ScrollResponderEvent): void
+    scrollResponderHandleTouchEnd(e: ScrollResponderEvent): void;
 
     /**
      * Invoke this from an `onResponderRelease` event.
      */
-    scrollResponderHandleResponderRelease(e: ScrollResponderEvent): void
+    scrollResponderHandleResponderRelease(e: ScrollResponderEvent): void;
 
-    scrollResponderHandleScroll(e: ScrollResponderEvent): void
+    scrollResponderHandleScroll(e: ScrollResponderEvent): void;
 
     /**
      * Invoke this from an `onResponderGrant` event.
      */
-    scrollResponderHandleResponderGrant(e: ScrollResponderEvent): void
+    scrollResponderHandleResponderGrant(e: ScrollResponderEvent): void;
 
     /**
      * Unfortunately, `onScrollBeginDrag` also fires when *stopping* the scroll
@@ -5884,22 +5454,22 @@ interface ScrollResponderMixin extends SubscribableMixin {
      *
      * Invoke this from an `onScrollBeginDrag` event.
      */
-    scrollResponderHandleScrollBeginDrag(e: ScrollResponderEvent): void
+    scrollResponderHandleScrollBeginDrag(e: ScrollResponderEvent): void;
 
     /**
      * Invoke this from an `onScrollEndDrag` event.
      */
-    scrollResponderHandleScrollEndDrag(e: ScrollResponderEvent): void
+    scrollResponderHandleScrollEndDrag(e: ScrollResponderEvent): void;
 
     /**
      * Invoke this from an `onMomentumScrollBegin` event.
      */
-    scrollResponderHandleMomentumScrollBegin(e: ScrollResponderEvent): void
+    scrollResponderHandleMomentumScrollBegin(e: ScrollResponderEvent): void;
 
     /**
      * Invoke this from an `onMomentumScrollEnd` event.
      */
-    scrollResponderHandleMomentumScrollEnd(e: ScrollResponderEvent): void
+    scrollResponderHandleMomentumScrollEnd(e: ScrollResponderEvent): void;
 
     /**
      * Invoke this from an `onTouchStart` event.
@@ -5910,9 +5480,9 @@ interface ScrollResponderMixin extends SubscribableMixin {
      * responder). The `onResponderReject` won't fire in that case - it only
      * fires when a *current* responder rejects our request.
      *
-     * @param {SyntheticEvent} e Touch Start event.
+     * @param e Touch Start event.
      */
-    scrollResponderHandleTouchStart(e: ScrollResponderEvent): void
+    scrollResponderHandleTouchStart(e: ScrollResponderEvent): void;
 
     /**
      * Invoke this from an `onTouchMove` event.
@@ -5923,23 +5493,23 @@ interface ScrollResponderMixin extends SubscribableMixin {
      * responder). The `onResponderReject` won't fire in that case - it only
      * fires when a *current* responder rejects our request.
      *
-     * @param {SyntheticEvent} e Touch Start event.
+     * @param e Touch Start event.
      */
-    scrollResponderHandleTouchMove(e: ScrollResponderEvent): void
+    scrollResponderHandleTouchMove(e: ScrollResponderEvent): void;
 
     /**
      * A helper function for this class that lets us quickly determine if the
      * view is currently animating. This is particularly useful to know when
      * a touch has just started or ended.
      */
-    scrollResponderIsAnimating(): boolean
+    scrollResponderIsAnimating(): boolean;
 
     /**
      * Returns the node that represents native view that can be scrolled.
      * Components can pass what node to use by defining a `getScrollableNode`
      * function otherwise `this` is used.
      */
-    scrollResponderGetScrollableNode(): any
+    scrollResponderGetScrollableNode(): any;
 
     /**
      * A helper function to scroll to a specific point  in the scrollview.
@@ -5952,7 +5522,11 @@ interface ScrollResponderMixin extends SubscribableMixin {
      * the function also accepts separate arguments as as alternative to the options object.
      * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
      */
-    scrollResponderScrollTo( x?: number | { x?: number, y?: number, animated?: boolean }, y?: number, animated?: boolean ): void,
+    scrollResponderScrollTo(
+        x?: number | { x?: number; y?: number; animated?: boolean },
+        y?: number,
+        animated?: boolean
+    ): void;
 
     /**
      * A helper function to zoom to a specific rect in the scrollview. The argument has the shape
@@ -5961,35 +5535,39 @@ interface ScrollResponderMixin extends SubscribableMixin {
      * @platform ios
      */
     scrollResponderZoomTo(
-        rect: { x: number, y: number, width: number, height: number, animated?: boolean },
+        rect: { x: number; y: number; width: number; height: number; animated?: boolean },
         animated?: boolean // deprecated, put this inside the rect argument instead
-    ): void
+    ): void;
 
     /**
      * This method should be used as the callback to onFocus in a TextInputs'
      * parent view. Note that any module using this mixin needs to return
      * the parent view's ref in getScrollViewRef() in order to use this method.
-     * @param {any} nodeHandle The TextInput node handle
-     * @param {number} additionalOffset The scroll view's top "contentInset".
+     * @param nodeHandle The TextInput node handle
+     * @param additionalOffset The scroll view's top "contentInset".
      *        Default is 0.
-     * @param {bool} preventNegativeScrolling Whether to allow pulling the content
+     * @param preventNegativeScrolling Whether to allow pulling the content
      *        down to make it meet the keyboard's top. Default is false.
      */
-    scrollResponderScrollNativeHandleToKeyboard(nodeHandle: any, additionalOffset?: number, preventNegativeScrollOffset?: boolean): void
+    scrollResponderScrollNativeHandleToKeyboard(
+        nodeHandle: any,
+        additionalOffset?: number,
+        preventNegativeScrollOffset?: boolean
+    ): void;
 
     /**
      * The calculations performed here assume the scroll view takes up the entire
      * screen - even if has some content inset. We then measure the offsets of the
      * keyboard, and compensate both for the scroll view's "contentInset".
      *
-     * @param {number} left Position of input w.r.t. table view.
-     * @param {number} top Position of input w.r.t. table view.
-     * @param {number} width Width of the text input.
-     * @param {number} height Height of the text input.
+     * @param left Position of input w.r.t. table view.
+     * @param top Position of input w.r.t. table view.
+     * @param width Width of the text input.
+     * @param height Height of the text input.
      */
-    scrollResponderInputMeasureAndScrollToKeyboard(left: number, top: number, width: number, height: number): void
+    scrollResponderInputMeasureAndScrollToKeyboard(left: number, top: number, width: number, height: number): void;
 
-    scrollResponderTextInputFocusError(e: ScrollResponderEvent): void
+    scrollResponderTextInputFocusError(e: ScrollResponderEvent): void;
 
     /**
      * `componentWillMount` is the closest thing to a  standard "constructor" for
@@ -5997,7 +5575,7 @@ interface ScrollResponderMixin extends SubscribableMixin {
      *
      * The `keyboardWillShow` is called before input focus.
      */
-    componentWillMount(): void
+    componentWillMount(): void;
 
     /**
      * Warning, this may be called several times for a single keyboard opening.
@@ -6027,35 +5605,34 @@ interface ScrollResponderMixin extends SubscribableMixin {
      * relevant to you. (For example, only if you receive these callbacks after
      * you had explicitly focused a node etc).
      */
-    scrollResponderKeyboardWillShow(e: ScrollResponderEvent): void
+    scrollResponderKeyboardWillShow(e: ScrollResponderEvent): void;
 
-    scrollResponderKeyboardWillHide(e: ScrollResponderEvent): void
+    scrollResponderKeyboardWillHide(e: ScrollResponderEvent): void;
 
-    scrollResponderKeyboardDidShow(e: ScrollResponderEvent): void
+    scrollResponderKeyboardDidShow(e: ScrollResponderEvent): void;
 
-    scrollResponderKeyboardDidHide(e: ScrollResponderEvent): void
+    scrollResponderKeyboardDidHide(e: ScrollResponderEvent): void;
 }
 
 export interface ScrollViewPropertiesIOS {
-
     /**
      * 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
+    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
+    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
+    automaticallyAdjustContentInsets?: boolean; // true
 
     /**
      * When true the scroll view bounces when it reaches the end of the
@@ -6063,19 +5640,19 @@ export interface ScrollViewPropertiesIOS {
      * the scroll direction. When false it disables all bouncing even if
      * the `alwaysBounce*` props are true. The default value is true.
      */
-    bounces?: boolean
+    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
+    bouncesZoom?: boolean;
 
     /**
      * When false once tracking starts won't try to drag if the touch moves.
      * The default value is true.
      */
-    canCancelContentTouches?: boolean
+    canCancelContentTouches?: boolean;
 
     /**
      * When true the scroll view automatically centers the content when the
@@ -6083,19 +5660,25 @@ export interface ScrollViewPropertiesIOS {
      * larger than the scroll view this property has no effect. The default
      * value is false.
      */
-    centerContent?: boolean
+    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?: Insets // zeros
+    contentInset?: Insets; // zeros
 
     /**
      * Used to manually set the starting scroll offset.
      * The default value is {x: 0, y: 0}
      */
-    contentOffset?: PointProperties // zeros
+    contentOffset?: PointProperties; // zeros
+
+    /**
+     * This property specifies how the safe area insets are used to modify the content area of the scroll view.
+     * The default value of this property must be 'automatic'. But the default value is 'never' until RN@0.51.
+     */
+    contentInsetAdjustmentBehavior?: "automatic" | "scrollableAxes" | "never" | "always";
 
     /**
      * A floating-point number that determines how quickly the scroll view
@@ -6103,13 +5686,13 @@ export interface ScrollViewPropertiesIOS {
      *   - Normal: 0.998 (the default)
      *   - Fast: 0.9
      */
-    decelerationRate?: "fast" | "normal" | number
+    decelerationRate?: "fast" | "normal" | number;
 
     /**
      * When true the ScrollView will try to lock to only vertical or horizontal
      * scrolling while dragging.  The default value is false.
      */
-    directionalLockEnabled?: boolean
+    directionalLockEnabled?: boolean;
 
     /**
      * The style of the scroll indicators.
@@ -6119,28 +5702,28 @@ export interface ScrollViewPropertiesIOS {
      * - white, scroll indicator is white. This style is good against
      *   a black content background.
      */
-    indicatorStyle?: "default" | "black" | "white"
+    indicatorStyle?: "default" | "black" | "white";
 
     /**
      * The maximum allowed zoom scale. The default value is 1.0.
      */
-    maximumZoomScale?: number
+    maximumZoomScale?: number;
 
     /**
      * The minimum allowed zoom scale. The default value is 1.0.
      */
-    minimumZoomScale?: number
+    minimumZoomScale?: number;
 
     /**
      * Called when a scrolling animation ends.
      */
-    onScrollAnimationEnd?: () => void
+    onScrollAnimationEnd?: () => void;
 
     /**
      * When true, ScrollView allows use of pinch gestures to zoom in and out.
      * The default value is true.
      */
-    pinchGestureEnabled?: boolean
+    pinchGestureEnabled?: boolean;
 
     /**
      * This controls how often the scroll event will be fired while scrolling (in events per seconds).
@@ -6148,20 +5731,20 @@ export interface ScrollViewPropertiesIOS {
      * 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
+    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?: Insets //zeroes
+    scrollIndicatorInsets?: Insets; //zeroes
 
     /**
      * When true the scroll view scrolls to top when the status bar is tapped.
      * The default value is true.
      */
-    scrollsToTop?: boolean
+    scrollsToTop?: boolean;
 
     /**
      * When snapToInterval is set, snapToAlignment will define the relationship of the the snapping to the scroll view.
@@ -6169,14 +5752,14 @@ export interface ScrollViewPropertiesIOS {
      *      - center will align the snap in the center
      *      - end will align the snap at the right (horizontal) or bottom (vertical)
      */
-    snapToAlignment?: "start" | "center" | "end"
+    snapToAlignment?: "start" | "center" | "end";
 
     /**
      * 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
+    snapToInterval?: number;
 
     /**
      * An array of child indices determining which children get docked to the
@@ -6185,16 +5768,15 @@ export interface ScrollViewPropertiesIOS {
      * top of the scroll view. This property is not supported in conjunction
      * with `horizontal={true}`.
      */
-    stickyHeaderIndices?: number[]
+    stickyHeaderIndices?: number[];
 
     /**
      * The current scale of the scroll view content. The default value is 1.0.
      */
-    zoomScale?: number
+    zoomScale?: number;
 }
 
 export interface ScrollViewPropertiesAndroid {
-
     /**
      * Sometimes a scrollview takes up more space than its content fills.
      * When this is the case, this prop will fill the rest of the
@@ -6202,7 +5784,7 @@ export interface ScrollViewPropertiesAndroid {
      * unnecessary overdraw. This is an advanced optimization that is not
      * needed in the general case.
      */
-    endFillColor?: string
+    endFillColor?: string;
 
     /**
      * Tag used to log scroll performance on this scroll view. Will force
@@ -6211,7 +5793,7 @@ export interface ScrollViewPropertiesAndroid {
      * FpsListener for it to be useful.
      * @platform android
      */
-    scrollPerfTag?: string
+    scrollPerfTag?: string;
 
     /**
      * Used to override default value of overScroll mode.
@@ -6221,11 +5803,14 @@ export interface ScrollViewPropertiesAndroid {
         *   - 'always' - Always allow a user to over-scroll this view.
         *   - 'never' - Never allow a user to over-scroll this view.
         */
-    overScrollMode?: 'auto' | 'always' | 'never'
+    overScrollMode?: "auto" | "always" | "never";
 }
 
-export interface ScrollViewProperties extends ViewProperties, ScrollViewPropertiesIOS, ScrollViewPropertiesAndroid, Touchable {
-
+export interface ScrollViewProperties
+    extends ViewProperties,
+        ScrollViewPropertiesIOS,
+        ScrollViewPropertiesAndroid,
+        Touchable {
     /**
      * These styles will be applied to the scroll view content container which
      * wraps all of the child views. Example:
@@ -6241,13 +5826,13 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti
      *     }
      *   });
      */
-    contentContainerStyle?: StyleProp<ViewStyle>
+    contentContainerStyle?: StyleProp<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
+    horizontal?: boolean;
 
     /**
      * Determines whether the keyboard gets dismissed in response to a drag.
@@ -6257,7 +5842,7 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti
      *     and moves in synchrony with the touch; dragging upwards cancels the
      *     dismissal.
      */
-    keyboardDismissMode?: 'none' | 'interactive' | 'on-drag'
+    keyboardDismissMode?: "none" | "interactive" | "on-drag";
 
     /**
      * When false tapping outside of the focused text input when the keyboard
@@ -6265,7 +5850,7 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti
      * taps and the keyboard will not dismiss automatically. The default value
      * is false.
      */
-    keyboardShouldPersistTaps?: boolean | 'always' | 'never' | 'handled'
+    keyboardShouldPersistTaps?: boolean | "always" | "never" | "handled";
 
     /**
      * Called when scrollable content view of the ScrollView changes.
@@ -6273,45 +5858,45 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti
      * It's implemented using onLayout handler attached to the content container which this ScrollView renders.
      *
      */
-    onContentSizeChange?: (w: number, h: number) => void
+    onContentSizeChange?: (w: number, h: number) => void;
 
     /**
      * Fires at most once per frame during scrolling.
      * The frequency of the events can be contolled using the scrollEventThrottle prop.
      */
-    onScroll?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
+    onScroll?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void;
 
     /**
      * Fires if a user initiates a scroll gesture.
      */
-    onScrollBeginDrag?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
+    onScrollBeginDrag?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void;
 
     /**
      * Fires when a user has finished scrolling.
      */
-    onScrollEndDrag?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
+    onScrollEndDrag?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void;
 
     /**
      * Fires when scroll view has finished moving
      */
-    onMomentumScrollEnd?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
+    onMomentumScrollEnd?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void;
 
     /**
      * Fires when scroll view has begun moving
      */
-    onMomentumScrollBegin?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
+    onMomentumScrollBegin?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => 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
+    pagingEnabled?: boolean;
 
     /**
      * When false, the content does not scroll. The default value is true
      */
-    scrollEnabled?: boolean // true
+    scrollEnabled?: boolean; // true
 
     /**
      * Experimental: When true offscreen child views (whose `overflow` value is
@@ -6319,35 +5904,33 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti
      * This canimprove scrolling performance on long lists. The default value is
      * false.
      */
-    removeClippedSubviews?: boolean
+    removeClippedSubviews?: boolean;
 
     /**
      * When true, shows a horizontal scroll indicator.
      */
-    showsHorizontalScrollIndicator?: boolean
+    showsHorizontalScrollIndicator?: boolean;
 
     /**
      * When true, shows a vertical scroll indicator.
      */
-    showsVerticalScrollIndicator?: boolean
+    showsVerticalScrollIndicator?: boolean;
 
     /**
      * Style
      */
-    style?: StyleProp<ScrollViewStyle>
+    style?: StyleProp<ScrollViewStyle>;
 
     /**
      * A RefreshControl component, used to provide pull-to-refresh
      * functionality for the ScrollView.
      */
-    refreshControl?: React.ReactElement<RefreshControlProperties>
+    refreshControl?: React.ReactElement<RefreshControlProperties>;
 }
 
-export interface ScrollViewProps extends ScrollViewProperties {
-}
+export interface ScrollViewProps extends ScrollViewProperties {}
 
 interface ScrollViewStatic extends ScrollResponderMixin, React.ComponentClass<ScrollViewProps> {
-
     /**
      * Scrolls to a given x, y offset, either immediately or with a smooth animation.
      * Syntax:
@@ -6358,11 +5941,7 @@ interface ScrollViewStatic extends ScrollResponderMixin, React.ComponentClass<Sc
      * the function also accepts separate arguments as as alternative to the options object.
      * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
      */
-    scrollTo(
-        y?: number | { x?: number, y?: number, animated?: boolean },
-        x?: number,
-        animated?: boolean
-    ): void;
+    scrollTo(y?: number | { x?: number; y?: number; animated?: boolean }, x?: number, animated?: boolean): void;
 
     /**
      * A helper function that scrolls to the end of the scrollview;
@@ -6372,7 +5951,7 @@ interface ScrollViewStatic extends ScrollResponderMixin, React.ComponentClass<Sc
      * The options object has an animated prop, that enables the scrolling animation or not.
      * The animated prop defaults to true
      */
-    scrollToEnd(options?: {animated: boolean}): void;
+    scrollToEnd(options?: { animated: boolean }): void;
 
     /**
      * Returns a reference to the underlying scroll responder, which supports
@@ -6388,10 +5967,9 @@ interface ScrollViewStatic extends ScrollResponderMixin, React.ComponentClass<Sc
     getInnerViewNode(): any;
 
     // Deprecated, do not use.
-    scrollWithoutAnimationTo?: (y: number, x: number) => void
+    scrollWithoutAnimationTo?: (y: number, x: number) => void;
 }
 
-
 export interface NativeScrollRectangle {
     left: number;
     top: number;
@@ -6424,12 +6002,11 @@ export interface NativeScrollEvent {
 }
 
 export interface SnapshotViewIOSProperties extends ViewProperties {
-
     // A callback when the Snapshot view is ready to be compared
-    onSnapshotReady(): any,
+    onSnapshotReady(): any;
 
     // A name to identify the individual instance to the SnapshotView
-    testIdentifier: string,
+    testIdentifier: string;
 }
 
 export interface SnapshotViewIOSStatic extends NativeMethodsMixin, React.ComponentClass<SnapshotViewIOSProperties> {}
@@ -6446,37 +6023,43 @@ export interface SnapshotViewIOSStatic extends NativeMethodsMixin, React.Compone
  * ListViewDataSource is not subclassed.
  */
 export interface SwipeableListViewDataSource {
-    cloneWithRowsAndSections(dataBlob: any,
-                                sectionIdentities?: Array<string>,
-                                rowIdentities?: Array<Array<string>>): SwipeableListViewDataSource
-    getDataSource(): ListViewDataSource
-    getOpenRowID(): string
-    getFirstRowID(): string
-    setOpenRowID(rowID: string): SwipeableListViewDataSource
+    cloneWithRowsAndSections(
+        dataBlob: any,
+        sectionIdentities?: Array<string>,
+        rowIdentities?: Array<Array<string>>
+    ): SwipeableListViewDataSource;
+    getDataSource(): ListViewDataSource;
+    getOpenRowID(): string;
+    getFirstRowID(): string;
+    setOpenRowID(rowID: string): SwipeableListViewDataSource;
 }
 
 export interface SwipeableListViewProps {
-
     /**
      * To alert the user that swiping is possible, the first row can bounce
      * on component mount.
      */
-    bounceFirstRowOnMount: boolean
+    bounceFirstRowOnMount: boolean;
 
     /**
      * Use `SwipeableListView.getNewDataSource()` to get a data source to use,
      * then use it just like you would a normal ListView data source
      */
-    dataSource: SwipeableListViewDataSource
+    dataSource: SwipeableListViewDataSource;
 
     // Maximum distance to open to after a swipe
-    maxSwipeDistance: number
+    maxSwipeDistance: number;
 
     // Callback method to render the swipeable view
-    renderRow: (rowData: any, sectionID: string | number, rowID: string | number, highlightRow?: boolean) => React.ReactElement<any>
+    renderRow: (
+        rowData: any,
+        sectionID: string | number,
+        rowID: string | number,
+        highlightRow?: boolean
+    ) => React.ReactElement<any>;
 
     // Callback method to render the view that will be unveiled on swipe
-    renderQuickActions(rowData: any, sectionID: string | number, rowID: string | number): React.ReactElement<any>
+    renderQuickActions(rowData: any, sectionID: string | number, rowID: string | number): React.ReactElement<any>;
 }
 
 /**
@@ -6498,10 +6081,9 @@ export interface SwipeableListViewProps {
  * - More to come
  */
 export interface SwipeableListViewStatic extends React.ComponentClass<SwipeableListViewProps> {
-    getNewDataSource(): SwipeableListViewDataSource
+    getNewDataSource(): SwipeableListViewDataSource;
 }
 
-
 //////////////////////////////////////////////////////////////////////////
 //
 // A P I s
@@ -6512,21 +6094,21 @@ export interface SwipeableListViewStatic extends React.ComponentClass<SwipeableL
  * @see: http://facebook.github.io/react-native/docs/actionsheetios.html#content
  */
 export interface ActionSheetIOSOptions {
-    title?: string
-    options: string[]
-    cancelButtonIndex?: number
-    destructiveButtonIndex?: number
-    message?: string
+    title?: string;
+    options: string[];
+    cancelButtonIndex?: number;
+    destructiveButtonIndex?: number;
+    message?: string;
 }
 
 export interface ShareActionSheetIOSOptions {
-    message?: string
-    url?: string
-    subject?: string
+    message?: string;
+    url?: string;
+    subject?: string;
     /** The activities to exclude from the ActionSheet.
      * For example: ['com.apple.UIKit.activity.PostToTwitter']
      */
-    excludedActivityTypes?: string[]
+    excludedActivityTypes?: string[];
 }
 
 /**
@@ -6542,7 +6124,7 @@ export interface ActionSheetIOSStatic {
      * - `title` (string) - a title to show above the action sheet
      * - `message` (string) - a message to show below the title
      */
-    showActionSheetWithOptions: (options: ActionSheetIOSOptions, callback: (buttonIndex: number) => void) => void
+    showActionSheetWithOptions: (options: ActionSheetIOSOptions, callback: (buttonIndex: number) => void) => void;
 
     /**
      * Display the iOS share sheet. The `options` object should contain
@@ -6558,22 +6140,28 @@ export interface ActionSheetIOSStatic {
      * uri, the file it points to will be loaded and shared directly.
      * In this way, you can share images, videos, PDF files, etc.
      */
-    showShareActionSheetWithOptions: (options: ShareActionSheetIOSOptions, failureCallback: (error: Error) => void, successCallback: (success: boolean, method: string) => void) => void
+    showShareActionSheetWithOptions: (
+        options: ShareActionSheetIOSOptions,
+        failureCallback: (error: Error) => void,
+        successCallback: (success: boolean, method: string) => void
+    ) => void;
 }
 
-export type ShareContent = {
-    title?: string
-    message: string
-} | {
-    title?: string
-    url: string
-}
+export type ShareContent =
+    | {
+          title?: string;
+          message: string;
+      }
+    | {
+          title?: string;
+          url: string;
+      };
 
 export type ShareOptions = {
-    dialogTitle?: string
-    excludedActivityTypes?: Array<string>
-    tintColor?: string
-}
+    dialogTitle?: string;
+    excludedActivityTypes?: Array<string>;
+    tintColor?: string;
+};
 
 export interface ShareStatic {
     /**
@@ -6608,18 +6196,63 @@ export interface ShareStatic {
      * - `dialogTitle`
      *
      */
-    share(content: ShareContent, options?: ShareOptions): Promise<Object>
-    sharedAction: string
-    dismissedAction: string
+    share(content: ShareContent, options?: ShareOptions): Promise<Object>;
+    sharedAction: string;
+    dismissedAction: string;
+}
+
+type AccessibilityChangeEventName = "change" | "announcementFinished";
+
+/**
+ * @see https://facebook.github.io/react-native/docs/accessibilityinfo.html
+ */
+export interface AccessibilityInfoStatic {
+    /**
+     * Query whether a screen reader is currently enabled.
+     * Returns a promise which resolves to a boolean. The result is true when a screen reader is enabled and false otherwise.
+     */
+    fetch: () => Promise<boolean>;
+
+    /**
+     * Add an event handler. Supported events:
+     *  - change: Fires when the state of the screen reader changes.
+     *            The argument to the event handler is a boolean.
+     *            The boolean is true when a screen reader is enabled and false otherwise.
+     *
+     * - announcementFinished: iOS-only event. Fires when the screen reader has finished making an announcement.
+     *                         The argument to the event handler is a dictionary with these keys:
+     *                          - announcement: The string announced by the screen reader.
+     *                          - success: A boolean indicating whether the announcement was successfully made.
+     */
+    addEventListener: (eventName: AccessibilityChangeEventName, handler: () => void) => void;
+
+    /**
+     * Remove an event handler.
+     */
+    removeEventListener: (eventName: AccessibilityChangeEventName, handler: () => void) => void;
+
+    /**
+     * Set acessibility focus to a react component.
+     *
+     * @platform ios
+     */
+    setAccessibilityFocus: (reactTag: number) => void;
+
+    /**
+     * Post a string to be announced by the screen reader.
+     *
+     * @platform ios
+     */
+    announceForAccessibility: (announcement: string) => void;
 }
 
 /**
  * @see https://facebook.github.io/react-native/docs/alert.html#content
  */
 export interface AlertButton {
-    text?: string
-    onPress?: () => void
-    style?: "default" | "cancel" | "destructive"
+    text?: string;
+    onPress?: () => void;
+    style?: "default" | "cancel" | "destructive";
 }
 
 interface AlertOptions {
@@ -6668,31 +6301,31 @@ interface AlertOptions {
  * ```
  */
 export interface AlertStatic {
-    alert: (title: string, message?: string, buttons?: AlertButton[], options?: AlertOptions, type?: string) => void
+    alert: (title: string, message?: string, buttons?: AlertButton[], options?: AlertOptions, type?: string) => void;
 }
 
 /**
  * Wrapper around the Android native module.
  */
 export interface AlertAndroidStatic {
-    alert: (title: string, message?: string, buttons?: AlertButton[], options?: AlertOptions) => void
+    alert: (title: string, message?: string, buttons?: AlertButton[], options?: AlertOptions) => 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
+    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?: (message?: string) => void
-    style?: "default" | "cancel" | "destructive"
+    text: string;
+    onPress?: (message?: string) => void;
+    style?: "default" | "cancel" | "destructive";
 }
 
-export type AlertType = "default" | "plain-text" | "secure-text" | "login-password"
+export type AlertType = "default" | "plain-text" | "secure-text" | "login-password";
 
 /**
  * @description
@@ -6705,11 +6338,8 @@ export type AlertType = "default" | "plain-text" | "secure-text" | "login-passwo
  * @see https://facebook.github.io/react-native/docs/alertios.html#content
  */
 export interface AlertIOSStatic {
-
     /**
      * Create and display a popup alert.
-     * @static
-     * @method alert
      * @param title The dialog's title.
      * @param message An optional message that appears below
      *     the dialog's title.
@@ -6722,12 +6352,15 @@ export interface AlertIOSStatic {
      *    should be one of 'default', 'cancel' or 'destructive'.
      * @param type Deprecated, do not use.
      */
-    alert: ( title: string, message?: string, callbackOrButtons?: (() => void) | Array<AlertIOSButton>, type?: AlertType ) => void
+    alert: (
+        title: string,
+        message?: string,
+        callbackOrButtons?: (() => void) | Array<AlertIOSButton>,
+        type?: AlertType
+    ) => void;
 
     /**
      * Create and display a prompt to enter some text.
-     * @static
-     * @method prompt
      * @param title The dialog's title.
      * @param message An optional message that appears above the text
      *    input.
@@ -6743,7 +6376,13 @@ export interface AlertIOSStatic {
      *    'secure-text' or 'login-password'.
      * @param defaultValue The default text in text input.
      */
-    prompt: ( title: string, message?: string, callbackOrButtons?: ((value: string) => void) | Array<AlertIOSButton>, type?: AlertType, defaultValue?: string ) => void
+    prompt: (
+        title: string,
+        message?: string,
+        callbackOrButtons?: ((value: string) => void) | Array<AlertIOSButton>,
+        type?: AlertType,
+        defaultValue?: string
+    ) => void;
 }
 
 /**
@@ -6762,23 +6401,22 @@ export interface AlertIOSStatic {
  *
  * @see https://facebook.github.io/react-native/docs/appstateios.html#content
  */
-export type AppStateEvent = "change" | "memoryWarning"
-export type AppStateStatus = "active" | "background" | "inactive"
+export type AppStateEvent = "change" | "memoryWarning";
+export type AppStateStatus = "active" | "background" | "inactive";
 
 export interface AppStateStatic {
-
-    currentState: string
+    currentState: AppStateStatus;
 
     /**
      * Add a handler to AppState changes by listening to the change event
      * type and providing the handler
      */
-    addEventListener(type: AppStateEvent, listener: (state: AppStateStatus) => void): void
+    addEventListener(type: AppStateEvent, listener: (state: AppStateStatus) => void): void;
 
     /**
      * Remove a handler by passing the change event type and the handler
      */
-    removeEventListener(type: AppStateEvent, listener: (state: AppStateStatus) => void): void
+    removeEventListener(type: AppStateEvent, listener: (state: AppStateStatus) => void): void;
 }
 
 /**
@@ -6797,52 +6435,54 @@ export interface AppStateStatic {
  * @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>
+    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<void>
+    setItem(key: string, value: string, callback?: (error?: Error) => void): Promise<void>;
 
-    removeItem(key: string, callback?: (error?: Error) => void): Promise<void>
+    removeItem(key: string, callback?: (error?: Error) => void): Promise<void>;
 
     /**
      * 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<void>
+    mergeItem(key: string, value: string, callback?: (error?: Error) => void): Promise<void>;
 
     /**
      * 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<void>
+    clear(callback?: (error?: Error) => void): Promise<void>;
 
     /**
      * Gets all keys known to the app, for all callers, libraries, etc
      */
-    getAllKeys(callback?: (error?: Error, keys?: string[]) => void): Promise<string[]>
+    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, string][]) => void): Promise<[string, string][]>
+    multiGet(
+        keys: string[],
+        callback?: (errors?: Error[], result?: [string, string][]) => void
+    ): Promise<[string, 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<void>
+    multiSet(keyValuePairs: string[][], callback?: (errors?: Error[]) => void): Promise<void>;
 
     /**
      * Delete all the keys in the keys array.
      */
-    multiRemove(keys: string[], callback?: (errors?: Error[]) => void): Promise<void>
+    multiRemove(keys: string[], callback?: (errors?: Error[]) => void): Promise<void>;
 
     /**
      * Merges existing values with input values, assuming they are stringified json.
@@ -6850,10 +6490,10 @@ export interface AsyncStorageStatic {
      *
      * Not supported by all native implementations.
      */
-    multiMerge(keyValuePairs: string[][], callback?: (errors?: Error[]) => void): Promise<void>
+    multiMerge(keyValuePairs: string[][], callback?: (errors?: Error[]) => void): Promise<void>;
 }
 
-export type BackPressEventName = "hardwareBackPress"
+export type BackPressEventName = "hardwareBackPress";
 
 /**
  * Detect hardware back button presses, and programmatically invoke the
@@ -6885,10 +6525,14 @@ export interface ButtonProperties {
     color?: string;
     accessibilityLabel?: string;
     disabled?: boolean;
+
+    /**
+     * Used to locate this button in end-to-end tests.
+     */
+    testID?: string;
 }
 
-export interface ButtonStatic extends React.ComponentClass<ButtonProperties> {
-}
+export interface ButtonStatic extends React.ComponentClass<ButtonProperties> {}
 
 export type CameraRollGroupType = "Album" | "All" | "Event" | "Faces" | "Library" | "PhotoStream" | "SavedPhotos";
 export type CameraRollAssetType = "All" | "Videos" | "Photos";
@@ -6896,9 +6540,9 @@ export type CameraRollAssetType = "All" | "Videos" | "Photos";
 export interface CameraRollFetchParams {
     first: number;
     after?: string;
-    groupTypes?: CameraRollGroupType
-    groupName?: string
-    assetType?: CameraRollAssetType
+    groupTypes?: CameraRollGroupType;
+    groupName?: string;
+    assetType?: CameraRollAssetType;
 }
 
 export interface CameraRollNodeInfo {
@@ -6921,41 +6565,41 @@ export interface CameraRollAssetInfo {
 }
 
 export interface GetPhotosParamType {
-    first: number
-    after?: string
-    groupTypes?: CameraRollGroupType
-    groupName?: string
-    assetType?: CameraRollAssetType
-    mimeTypes?: string[]
+    first: number;
+    after?: string;
+    groupTypes?: CameraRollGroupType;
+    groupName?: string;
+    assetType?: CameraRollAssetType;
+    mimeTypes?: string[];
 }
 
 export interface GetPhotosReturnType {
     edges: {
         node: {
-            type: string
-            group_name: string
+            type: string;
+            group_name: string;
             image: {
-                uri: string
-                height: number
-                width: number
-                isStored?: boolean
-            }
-            timestamp: number
+                uri: string;
+                height: number;
+                width: number;
+                isStored?: boolean;
+            };
+            timestamp: number;
             location: {
-            latitude: number
-            longitude: number
-            altitude: number
-            heading: number
-            speed: number
-            }
-        }
-    }[]
+                latitude: number;
+                longitude: number;
+                altitude: number;
+                heading: number;
+                speed: number;
+            };
+        };
+    }[];
 
     page_info: {
-        has_next_page: boolean
-        start_cursor?: string
-        end_cursor?: string
-    }
+        has_next_page: boolean;
+        start_cursor?: string;
+        end_cursor?: string;
+    };
 }
 
 /**
@@ -6964,9 +6608,8 @@ export interface GetPhotosReturnType {
  * You can refer to (Linking)[https://facebook.github.io/react-native/docs/linking-libraries-ios.html] for help.
  */
 export interface CameraRollStatic {
-
-    GroupTypesOptions: CameraRollGroupType[] //'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
-    AssetTypeOptions: CameraRollAssetType[] // "All", "Videos", "Photos"
+    GroupTypesOptions: CameraRollGroupType[]; //'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
+    AssetTypeOptions: CameraRollAssetType[]; // "All", "Videos", "Photos"
 
     /**
      * Saves the image to the camera roll / gallery.
@@ -6979,7 +6622,7 @@ export interface CameraRollStatic {
      *
      * @deprecated use saveToCameraRoll instead
      */
-    saveImageWithTag(tag: string): Promise<string>
+    saveImageWithTag(tag: string): Promise<string>;
 
     /**
      * Saves the photo or video to the camera roll / gallery.
@@ -6995,7 +6638,7 @@ export interface CameraRollStatic {
      *
      * Returns a Promise which will resolve with the new URI.
      */
-    saveToCameraRoll(tag: string, type?: 'photo' | 'video'): Promise<string>
+    saveToCameraRoll(tag: string, type?: "photo" | "video"): Promise<string>;
 
     /**
      * Saves the photo or video to the camera roll / gallery.
@@ -7011,12 +6654,12 @@ export interface CameraRollStatic {
      *
      * Returns a Promise which will resolve with the new URI.
      */
-    saveToCameraRoll(tag: string, type?: 'photo' | 'video'): Promise<string>
+    saveToCameraRoll(tag: string, type?: "photo" | "video"): Promise<string>;
 
     /**
      * 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 params See getPhotosParamChecker.
      */
     getPhotos(params: GetPhotosParamType): Promise<GetPhotosReturnType>;
 }
@@ -7028,18 +6671,18 @@ export interface ClipboardStatic {
 }
 
 export interface DatePickerAndroidOpenOption {
-    date?: Date | number
-    minDate?: Date | number
-    maxDate?: Date | number
-    mode?: 'calendar' | 'spinner' | 'default'
+    date?: Date | number;
+    minDate?: Date | number;
+    maxDate?: Date | number;
+    mode?: "calendar" | "spinner" | "default";
 }
 
 // Deduced from DatePickerAndroid.android.js
 export interface DatePickerAndroidOpenReturn {
-    action: string // "dateSetAction" | "dismissedAction"
-    year?: number
-    month?: number
-    day?: number
+    action: string; // "dateSetAction" | "dismissedAction"
+    year?: number;
+    month?: number;
+    day?: number;
 }
 
 export interface DatePickerAndroidStatic {
@@ -7058,33 +6701,17 @@ export interface DatePickerAndroidStatic {
 
         Note the native date picker dialog has some UI glitches on Android 4 and lower when using the minDate and maxDate options.
         */
-    open(options?: DatePickerAndroidOpenOption): Promise<DatePickerAndroidOpenReturn>
+    open(options?: DatePickerAndroidOpenOption): Promise<DatePickerAndroidOpenReturn>;
 
     /**
      * A date has been selected.
      */
-    dateSetAction: string
+    dateSetAction: string;
 
     /**
      * The dialog has been dismissed.
      */
-    dismissedAction: string
-}
-
-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
+    dismissedAction: string;
 }
 
 export interface IntentAndroidStatic {
@@ -7101,7 +6728,7 @@ export interface IntentAndroidStatic {
 
         @deprecated
         */
-    openURL(url: string): void
+    openURL(url: string): void;
 
     /**
      * Determine whether or not an installed app can handle a given URL.
@@ -7114,7 +6741,7 @@ export interface IntentAndroidStatic {
 
         @deprecated
         */
-    canOpenURL(url: string, callback: (supported: boolean) => void): void
+    canOpenURL(url: string, callback: (supported: boolean) => void): void;
 
     /**
      * If the app launch was triggered by an app link with {@code Intent.ACTION_VIEW}, it will give the link url, otherwise it will give null
@@ -7123,7 +6750,7 @@ export interface IntentAndroidStatic {
 
         @deprecated
         */
-    getInitialURL(callback: (url: string) => void): void
+    getInitialURL(callback: (url: string) => void): void;
 }
 
 export interface LinkingStatic extends NativeEventEmitter {
@@ -7131,12 +6758,12 @@ export interface LinkingStatic extends NativeEventEmitter {
      * Add a handler to Linking changes by listening to the `url` event type
      * and providing the handler
      */
-    addEventListener(type: string, handler: (event: { url: string }) => void): void
+    addEventListener(type: string, handler: (event: { url: string }) => void): void;
 
     /**
      * Remove a handler by passing the `url` event type and the handler
      */
-    removeEventListener(type: string, handler: (event: { url: string }) => void): void
+    removeEventListener(type: string, handler: (event: { url: string }) => void): void;
 
     /**
      * Try to open the given url with any of the installed apps.
@@ -7144,7 +6771,7 @@ export interface LinkingStatic extends NativeEventEmitter {
      * NOTE: This method will fail if the system doesn't know how to open the specified URL. If you're passing in a non-http(s) URL, it's best to check {@code canOpenURL} first.
      * NOTE: For web URLs, the protocol ("http://", "https://") must be set accordingly!
      */
-    openURL(url: string): Promise<any>
+    openURL(url: string): Promise<any>;
 
     /**
      * Determine whether or not an installed app can handle a given URL.
@@ -7152,13 +6779,13 @@ export interface LinkingStatic extends NativeEventEmitter {
      * NOTE: As of iOS 9, your app needs to provide the LSApplicationQueriesSchemes key inside Info.plist.
      * @param URL the URL to open
      */
-    canOpenURL(url: string): Promise<boolean>
+    canOpenURL(url: string): Promise<boolean>;
 
     /**
      * If the app launch was triggered by an app link with, it will give the link url, otherwise it will give null
      * NOTE: To support deep linking on Android, refer http://developer.android.com/training/app-indexing/deep-linking.html#handling-intents
      */
-    getInitialURL(): Promise<string>
+    getInitialURL(): Promise<string>;
 }
 
 export interface LinkingIOSStatic {
@@ -7166,26 +6793,26 @@ export interface LinkingIOSStatic {
      * Add a handler to LinkingIOS changes by listening to the url event type and providing the handler
      @deprecated
      */
-    addEventListener(type: string, handler: (event: { url: string }) => void): void
+    addEventListener(type: string, handler: (event: { url: string }) => void): void;
 
     /**
      * Remove a handler by passing the url event type and the handler
      @deprecated
      */
-    removeEventListener(type: string, handler: (event: { url: string }) => void): void
+    removeEventListener(type: string, handler: (event: { url: string }) => void): void;
 
     /**
      * Try to open the given url with any of the installed apps.
      @deprecated
      */
-    openURL(url: string): void
+    openURL(url: string): void;
 
     /**
      * Determine whether or not an installed app can handle a given URL. The callback function will be called with bool supported as the only argument
      NOTE: As of iOS 9, your app needs to provide the LSApplicationQueriesSchemes key inside Info.plist.
      @deprecated
      */
-    canOpenURL(url: string, callback: (supported: boolean) => void): void
+    canOpenURL(url: string, callback: (supported: boolean) => void): void;
 
     /**
      * If the app launch was triggered by an app link, it will pop the link url, otherwise it will return null
@@ -7194,125 +6821,183 @@ export interface LinkingIOSStatic {
     popInitialURL(): string;
 }
 
-
 /**
  * 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
  */
 
-// This is from code, a few items more than documentation@0.25
-export type NetInfoReturnType = "none" | "wifi" | "cell" | "unknown" |
-    "NONE" | "MOBILE" | "WIFI" | "MOBILE_MMS" | "MOBILE_SUPL" | "MOBILE_DUN" |
-    "MOBILE_HIPRI" | "WIMAX" | "BLUETOOTH" | "DUMMY" | "ETHERNET" | "MOBILE_FOTA" |
-    "MOBILE_IMS" | "MOBILE_CBS" | "WIFI_P2P" | "MOBILE_IA" | "MOBILE_EMERGENCY" |
-    "PROXY" | "VPN" | "UNKNOWN"
+// @Deprecated ConnectionType
+export type ConnectionType =
+    | "none"
+    | "wifi"
+    | "cell"
+    | "unknown"
+    | "NONE"
+    | "MOBILE"
+    | "WIFI"
+    | "MOBILE_MMS"
+    | "MOBILE_SUPL"
+    | "MOBILE_DUN"
+    | "MOBILE_HIPRI"
+    | "WIMAX"
+    | "BLUETOOTH"
+    | "DUMMY"
+    | "ETHERNET"
+    | "MOBILE_FOTA"
+    | "MOBILE_IMS"
+    | "MOBILE_CBS"
+    | "WIFI_P2P"
+    | "MOBILE_IA"
+    | "MOBILE_EMERGENCY"
+    | "PROXY"
+    | "VPN"
+    | "UNKNOWN";
 
-export interface NetInfoStatic extends FetchableListenable<NetInfoReturnType> {
+export type EffectiveConnectionType = "2g" | "3g" | "4g" | "unknown";
 
+export interface ConnectionInfo {
+    type: ConnectionType;
+    effectiveType: EffectiveConnectionType;
+}
+
+export interface NetInfoStatic {
     /**
-     *
-     * Available on all platforms.
-     * Asynchronously fetch a boolean to determine internet connectivity.
+     * This function is deprecated. Use `getConnectionInfo` instead. Returns a promise that
+     * resolves with one of the deprecated connectivity types listed above.
      */
-    isConnected: FetchableListenable<boolean>
+    fetch: () => Promise<ConnectionType>;
 
     /**
-     * Available on Android. Detect if the current active connection is
+     * Adds an event handler. Supported events:
+     *
+     * - `connectionChange`: Fires when the network status changes. The argument to the event
+     *   handler is an object with keys:
+     *   - `type`: A `DeprecatedConnectionType` (listed above)
+     *   - `effectiveType`: An `EffectiveConnectionType` (listed above)
+     * - `change`: This event is deprecated. Listen to `connectionChange` instead. Fires when
+     *   the network status changes. The argument to the event handler is one of the deprecated
+     *   connectivity types listed above.
+     */
+    addEventListener: (eventName: string, listener: (result: ConnectionInfo | ConnectionType) => void) => void;
+
+    /**
+     * Removes the listener for network status changes.
+     */
+    removeEventListener: (eventName: string, listener: (result: ConnectionInfo | ConnectionType) => void) => void;
+
+    /**
+     * Returns a promise that resolves to an object with `type` and `effectiveType` keys
+     * whose values are a `ConnectionType` and an `EffectiveConnectionType`, (described above),
+     * respectively.
+     */
+    getConnectionInfo: () => Promise<ConnectionInfo>;
+
+    /**
+     * An object with the same methods as above but the listener receives a
+     * boolean which represents the internet connectivity.
+     * Use this if you are only interested with whether the device has internet
+     * connectivity.
+     */
+    isConnected: {
+        fetch: () => Promise<boolean>;
+
+        /**
+         * eventName is expected to be `change`(deprecated) or `connectionChange`
+         */
+        addEventListener: (eventName: string, listener: (result: boolean) => void) => void;
+
+        /**
+         * eventName is expected to be `change`(deprecated) or `connectionChange`
+         */
+        removeEventListener: (eventName: string, listener: (result: boolean) => void) => void;
+    };
+
+    /**
+     * Detect if the current active connection is
      * metered or not. A network is classified as metered when the user is
      * sensitive to heavy data usage on that connection due to monetary
      * costs, data limitations or battery/performance issues.
      */
-    isConnectionExpensive: Promise<boolean>
+    isConnectionExpensive: Promise<boolean>;
 }
 
-
 export interface PanResponderGestureState {
-
     /**
      *  ID of the gestureState- persisted as long as there at least one touch on
      */
-    stateID: number
+    stateID: number;
 
     /**
      *  the latest screen coordinates of the recently-moved touch
      */
-    moveX: number
+    moveX: number;
 
     /**
      *  the latest screen coordinates of the recently-moved touch
      */
-    moveY: number
+    moveY: number;
 
     /**
      * the screen coordinates of the responder grant
      */
-    x0: number
+    x0: number;
 
     /**
      * the screen coordinates of the responder grant
      */
-    y0: number
+    y0: number;
 
     /**
      * accumulated distance of the gesture since the touch started
      */
-    dx: number
+    dx: number;
 
     /**
      * accumulated distance of the gesture since the touch started
      */
-    dy: number
+    dy: number;
 
     /**
      * current velocity of the gesture
      */
-    vx: number
+    vx: number;
 
     /**
      * current velocity of the gesture
      */
-    vy: number
+    vy: number;
 
     /**
      * Number of touches currently on screen
      */
-    numberActiveTouches: number
-
+    numberActiveTouches: number;
 
     // All `gestureState` accounts for timeStamps up until:
-    _accountsForMovesUpTo: number
+    _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
+    onMoveShouldSetPanResponder?: (e: GestureResponderEvent, gestureState: PanResponderGestureState) => boolean;
+    onStartShouldSetPanResponder?: (e: GestureResponderEvent, gestureState: PanResponderGestureState) => boolean;
+    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
-    onShouldBlockNativeResponder?: (e: GestureResponderEvent, gestureState: PanResponderGestureState) => boolean
+    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;
+    onShouldBlockNativeResponder?: (e: GestureResponderEvent, gestureState: PanResponderGestureState) => boolean;
 }
 
 export interface PanResponderInstance {
-    panHandlers: GestureResponderHandlers
+    panHandlers: GestureResponderHandlers;
 }
 
 /**
@@ -7325,7 +7010,7 @@ export interface PanResponderInstance {
  */
 export interface PanResponderStatic {
     /**
-     * @param {PanResponderCallbacks} config Enhanced versions of all of the responder callbacks
+     * @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
@@ -7356,65 +7041,65 @@ export interface PanResponderStatic {
      *  accordingly. (numberActiveTouches) may not be totally accurate unless you
      *  are the responder.
      */
-    create(config: PanResponderCallbacks): PanResponderInstance
+    create(config: PanResponderCallbacks): PanResponderInstance;
 }
 
 export interface Rationale {
-    title: string
-    message: string
+    title: string;
+    message: string;
 }
 
 export type Permission =
-    "android.permission.READ_CALENDAR" |
-    "android.permission.WRITE_CALENDAR" |
-    "android.permission.CAMERA" |
-    "android.permission.READ_CONTACTS" |
-    "android.permission.WRITE_CONTACTS" |
-    "android.permission.GET_ACCOUNTS" |
-    "android.permission.ACCESS_FINE_LOCATION" |
-    "android.permission.ACCESS_COARSE_LOCATION" |
-    "android.permission.RECORD_AUDIO" |
-    "android.permission.READ_PHONE_STATE" |
-    "android.permission.CALL_PHONE" |
-    "android.permission.READ_CALL_LOG" |
-    "android.permission.WRITE_CALL_LOG" |
-    "com.android.voicemail.permission.ADD_VOICEMAIL" |
-    "android.permission.USE_SIP" |
-    "android.permission.PROCESS_OUTGOING_CALLS" |
-    "android.permission.BODY_SENSORS" |
-    "android.permission.SEND_SMS" |
-    "android.permission.RECEIVE_SMS" |
-    "android.permission.READ_SMS" |
-    "android.permission.RECEIVE_WAP_PUSH" |
-    "android.permission.RECEIVE_MMS" |
-    "android.permission.READ_EXTERNAL_STORAGE" |
-    "android.permission.WRITE_EXTERNAL_STORAGE"
+    | "android.permission.READ_CALENDAR"
+    | "android.permission.WRITE_CALENDAR"
+    | "android.permission.CAMERA"
+    | "android.permission.READ_CONTACTS"
+    | "android.permission.WRITE_CONTACTS"
+    | "android.permission.GET_ACCOUNTS"
+    | "android.permission.ACCESS_FINE_LOCATION"
+    | "android.permission.ACCESS_COARSE_LOCATION"
+    | "android.permission.RECORD_AUDIO"
+    | "android.permission.READ_PHONE_STATE"
+    | "android.permission.CALL_PHONE"
+    | "android.permission.READ_CALL_LOG"
+    | "android.permission.WRITE_CALL_LOG"
+    | "com.android.voicemail.permission.ADD_VOICEMAIL"
+    | "android.permission.USE_SIP"
+    | "android.permission.PROCESS_OUTGOING_CALLS"
+    | "android.permission.BODY_SENSORS"
+    | "android.permission.SEND_SMS"
+    | "android.permission.RECEIVE_SMS"
+    | "android.permission.READ_SMS"
+    | "android.permission.RECEIVE_WAP_PUSH"
+    | "android.permission.RECEIVE_MMS"
+    | "android.permission.READ_EXTERNAL_STORAGE"
+    | "android.permission.WRITE_EXTERNAL_STORAGE";
 
-export type PermissionStatus = "granted" | "denied" | "never_ask_again"
+export type PermissionStatus = "granted" | "denied" | "never_ask_again";
 
 export interface PermissionsAndroidStatic {
     /**
      * A list of permission results that are returned
      */
-    RESULTS: {[key: string]: PermissionStatus}
+    RESULTS: { [key: string]: PermissionStatus };
     /**
      * A list of specified "dangerous" permissions that require prompting the user
      */
-    PERMISSIONS: {[key: string]: Permission}
-    new(): PermissionsAndroidStatic
+    PERMISSIONS: { [key: string]: Permission };
+    new (): PermissionsAndroidStatic;
     /**
      * Deprecated
      */
-    checkPermission(permission: Permission): Promise<boolean>
+    checkPermission(permission: Permission): Promise<boolean>;
     /**
      * Returns a promise resolving to a boolean value as to whether the specified
      * permissions has been granted
      */
-    check(permission: Permission): Promise<boolean>
+    check(permission: Permission): Promise<boolean>;
     /**
      * Deprecated
      */
-    requestPermission(permission: Permission, rationale?: Rationale): Promise<boolean>
+    requestPermission(permission: Permission, rationale?: Rationale): Promise<boolean>;
     /**
      * Prompts the user to enable a permission and returns a promise resolving to a
      * string value indicating whether the user allowed or denied the request
@@ -7425,72 +7110,80 @@ export interface PermissionsAndroidStatic {
      * (https://developer.android.com/training/permissions/requesting.html#explain)
      * and then shows the system permission dialog
      */
-    request(permission: Permission, rationale?: Rationale): Promise<string>
+    request(permission: Permission, rationale?: Rationale): Promise<string>;
     /**
      * Prompts the user to enable multiple permissions in the same dialog and
      * returns an object with the permissions as keys and strings as values
      * indicating whether the user allowed or denied the request
      */
-    requestMultiple(permissions: Array<string>): Promise<{[permission: string]: PermissionStatus}>
+    requestMultiple(permissions: Array<string>): Promise<{ [permission: string]: PermissionStatus }>;
 }
 
 export interface PushNotificationPermissions {
-    alert?: boolean
-    badge?: boolean
-    sound?: boolean
+    alert?: boolean;
+    badge?: boolean;
+    sound?: boolean;
 }
 
 export interface PushNotification {
-
-
     /**
      * An alias for `getAlert` to get the notification's main message string
      */
-    getMessage(): string | Object
+    getMessage(): string | Object;
 
     /**
      * Gets the sound string from the `aps` object
      */
-    getSound(): string
+    getSound(): string;
 
     /**
      * Gets the notification's main message from the `aps` object
      */
-    getAlert(): string | Object
+    getAlert(): string | Object;
 
     /**
      * Gets the badge count number from the `aps` object
      */
-    getBadgeCount(): number
+    getBadgeCount(): number;
 
     /**
      * Gets the data object on the notif
      */
-    getData(): Object
+    getData(): Object;
 
+    /**
+     * iOS Only
+     * Signifies remote notification handling is complete
+     */
+    finish(result: string): void;
 }
 
-
 type PresentLocalNotificationDetails = {
-    alertBody: string
-    alertAction: string
-    soundName?: string
-    category?: string
-    userInfo?: Object
-    applicationIconBadgeNumber?: number
-}
+    alertBody: string;
+    alertAction: string;
+    soundName?: string;
+    category?: string;
+    userInfo?: Object;
+    applicationIconBadgeNumber?: number;
+};
 
 type ScheduleLocalNotificationDetails = {
-    fireDate: Date
-    alertBody: string
-    alertAction: string
-    soundName?: string
-    category?: string
-    userInfo?: Object
-    applicationIconBadgeNumber?: number
-}
+    fireDate: Date;
+    alertBody: string;
+    alertAction: string;
+    soundName?: string;
+    category?: string;
+    userInfo?: Object;
+    applicationIconBadgeNumber?: number;
+};
 
-export type PushNotificationEventName = "notification" | "localNotification" | "register" | "registrationError"
+export type PushNotificationEventName = "notification" | "localNotification" | "register" | "registrationError";
+
+type FetchResult = {
+    NewData: "UIBackgroundFetchResultNewData",
+    NoData: "UIBackgroundFetchResultNoData",
+    ResultFailed: "UIBackgroundFetchResultFailed"
+};
 
 /**
  * Handle push notifications for your app, including permission handling and icon badge number.
@@ -7499,7 +7192,6 @@ export type PushNotificationEventName = "notification" | "localNotification" | "
  * //FIXME: BGR: The documentation seems completely off compared to the actual js implementation. I could never get the example to run
  */
 export interface PushNotificationIOSStatic {
-
     /**
      * Schedules the localNotification for immediate presentation.
      * details is an object containing:
@@ -7510,7 +7202,7 @@ export interface PushNotificationIOSStatic {
      * userInfo : An optional object containing additional notification data.
      * applicationIconBadgeNumber (optional) : The number to display as the app's icon badge. The default value of this property is 0, which means that no badge is displayed.
      */
-    presentLocalNotification(details: PresentLocalNotificationDetails): void
+    presentLocalNotification(details: PresentLocalNotificationDetails): void;
 
     /**
      * Schedules the localNotification for future presentation.
@@ -7523,33 +7215,33 @@ export interface PushNotificationIOSStatic {
      * userInfo : An optional object containing additional notification data.
      * applicationIconBadgeNumber (optional) : The number to display as the app's icon badge. Setting the number to 0 removes the icon badge.
      */
-    scheduleLocalNotification(details: ScheduleLocalNotificationDetails): void
+    scheduleLocalNotification(details: ScheduleLocalNotificationDetails): void;
 
     /**
      * Cancels all scheduled localNotifications
      */
-    cancelAllLocalNotifications(): void
+    cancelAllLocalNotifications(): void;
 
     /**
      * Cancel local notifications.
      * Optionally restricts the set of canceled notifications to those notifications whose userInfo fields match the corresponding fields in the userInfo argument.
      */
-    cancelLocalNotifications(userInfo: Object): void
+    cancelLocalNotifications(userInfo: Object): void;
 
     /**
      * Sets the badge number for the app icon on the home screen
      */
-    setApplicationIconBadgeNumber(number: number): void
+    setApplicationIconBadgeNumber(number: number): void;
 
     /**
      * Gets the current badge number for the app icon on the home screen
      */
-    getApplicationIconBadgeNumber(callback: (badge: number) => void): void
+    getApplicationIconBadgeNumber(callback: (badge: number) => void): void;
 
     /**
      * Gets the local notifications that are currently scheduled.
      */
-    getScheduledLocalNotifications(callback: (notifications: ScheduleLocalNotificationDetails[]) => void): void
+    getScheduledLocalNotifications(callback: (notifications: ScheduleLocalNotificationDetails[]) => void): void;
 
     /**
      * Attaches a listener to remote notifications while the app is running in the
@@ -7559,25 +7251,25 @@ export interface PushNotificationIOSStatic {
      *
      * The type MUST be 'notification'
      */
-    addEventListener(type: PushNotificationEventName, handler: (notification: PushNotification) => void): void
+    addEventListener(type: PushNotificationEventName, handler: (notification: PushNotification) => void): void;
 
     /**
      * Removes the event listener. Do this in `componentWillUnmount` to prevent
      * memory leaks
      */
-    removeEventListener(type: PushNotificationEventName, handler: (notification: PushNotification) => void): void
+    removeEventListener(type: PushNotificationEventName, handler: (notification: PushNotification) => void): void;
 
     /**
      * Requests all notification permissions from iOS, prompting the user's
      * dialog box.
      */
-    requestPermissions(permissions?: PushNotificationPermissions[]): void
+    requestPermissions(permissions?: PushNotificationPermissions[]): void;
 
     /**
      * Requests all notification permissions from iOS, prompting the user's
      * dialog box.
      */
-    requestPermissions(permissions?: PushNotificationPermissions): Promise<PushNotificationPermissions>
+    requestPermissions(permissions?: PushNotificationPermissions): Promise<PushNotificationPermissions>;
 
     /**
      * Unregister for all remote notifications received via Apple Push
@@ -7589,7 +7281,7 @@ export interface PushNotificationIOSStatic {
      * Settings app. Apps unregistered through this method can always
      * re-register.
      */
-    abandonPermissions(): void
+    abandonPermissions(): void;
 
     /**
      * See what push permissions are currently enabled. `callback` will be
@@ -7599,86 +7291,83 @@ export interface PushNotificationIOSStatic {
      *  - `badge` :boolean
      *  - `sound` :boolean
      */
-    checkPermissions(callback: (permissions: PushNotificationPermissions) => void): void
+    checkPermissions(callback: (permissions: PushNotificationPermissions) => void): void;
 
     /**
      * This method returns a promise that resolves to either the notification
      * object if the app was launched by a push notification, or `null` otherwise.
      */
-    getInitialNotification(): Promise<PushNotification>
+    getInitialNotification(): Promise<PushNotification>;
+
+    /**
+     * iOS fetch results that best describe the result of a finished remote notification handler.
+     * For a list of possible values, see `PushNotificationIOS.FetchResult`.
+     */
+    FetchResult: FetchResult;
 }
 
 export interface SettingsStatic {
-    get(key: string): any
-    set(settings: Object): void
-    watchKeys(keys: string | Array<string>, callback: (() => void)): number
-    clearWatch(watchId: number): void
+    get(key: string): any;
+    set(settings: Object): void;
+    watchKeys(keys: string | Array<string>, callback: (() => void)): number;
+    clearWatch(watchId: number): void;
 }
 
+export type StatusBarStyle = "default" | "light-content" | "dark-content";
 
-/**
- * @enum('default', 'light-content', 'dark-content')
- */
-export type StatusBarStyle = "default" | "light-content" | "dark-content"
-
-/**
- * @enum('fade', 'slide')
- */
-export type StatusBarAnimation = "none" | "fade" | "slide"
+export type StatusBarAnimation = "none" | "fade" | "slide";
 
 export interface StatusBarPropertiesIOS {
     /**
      * Sets the color of the status bar text.
      */
-    barStyle?: StatusBarStyle
+    barStyle?: StatusBarStyle;
 
     /**
      * If the network activity indicator should be visible.
      */
-    networkActivityIndicatorVisible?: boolean
+    networkActivityIndicatorVisible?: boolean;
 
     /**
      * The transition effect when showing and hiding the status bar using
      * the hidden prop. Defaults to 'fade'.
      */
-    showHideTransition?: "fade" | "slide"
+    showHideTransition?: "fade" | "slide";
 }
 
 export interface StatusBarPropertiesAndroid {
     /**
      * The background color of the status bar.
      */
-    backgroundColor?: string
+    backgroundColor?: string;
 
     /**
      * If the status bar is translucent. When translucent is set to true,
      * the app will draw under the status bar. This is useful when using a
      * semi transparent status bar color.
      */
-    translucent?: boolean
+    translucent?: boolean;
 }
 
 export interface StatusBarProperties extends StatusBarPropertiesIOS, StatusBarPropertiesAndroid {
-
     /**
      * If the transition between status bar property changes should be
      * animated. Supported for backgroundColor, barStyle and hidden.
      */
-    animated?: boolean
+    animated?: boolean;
 
     /**
      * If the status bar is hidden.
      */
-    hidden?: boolean
+    hidden?: boolean;
 }
 
 export interface StatusBarStatic extends React.ComponentClass<StatusBarProperties> {
-
     /**
      * The current height of the status bar on the device.
      * @platform android
      */
-    currentHeight?: number
+    currentHeight?: number;
 
     /**
      * Show or hide the status bar
@@ -7686,47 +7375,46 @@ export interface StatusBarStatic extends React.ComponentClass<StatusBarPropertie
      * @param animation Optional animation when
      *    changing the status bar hidden property.
      */
-    setHidden: (hidden: boolean, animation?: StatusBarAnimation) => void
+    setHidden: (hidden: boolean, animation?: StatusBarAnimation) => void;
 
     /**
      * Set the status bar style
      * @param style Status bar style to set
      * @param animated Animate the style change.
      */
-    setBarStyle: (style: StatusBarStyle, animated?: boolean) => void
+    setBarStyle: (style: StatusBarStyle, animated?: boolean) => void;
 
     /**
      * Control the visibility of the network activity indicator
      * @param visible Show the indicator.
      */
-    setNetworkActivityIndicatorVisible: (visible: boolean) => void
+    setNetworkActivityIndicatorVisible: (visible: boolean) => void;
 
     /**
      * Set the background color for the status bar
      * @param color Background color.
      * @param animated Animate the style change.
      */
-    setBackgroundColor: (color: string, animated?: boolean) => void
+    setBackgroundColor: (color: string, animated?: boolean) => void;
 
     /**
      * Control the translucency of the status bar
      * @param translucent Set as translucent.
      */
-    setTranslucent: (translucent: boolean) => void
+    setTranslucent: (translucent: boolean) => void;
 }
 
 /**
  * StatusBarIOS is deprecated.
  * Use `StatusBar` for mutating the status bar.
  */
-export interface StatusBarIOSStatic extends NativeEventEmitter {
-}
+export interface StatusBarIOSStatic extends NativeEventEmitter {}
 
 type TimePickerAndroidOpenOptions = {
-    hour?: number
-    minute?: number
-    is24Hour?: boolean
-}
+    hour?: number;
+    minute?: number;
+    is24Hour?: boolean;
+};
 
 /**
  * Opens the standard Android time picker dialog.
@@ -7749,7 +7437,6 @@ type TimePickerAndroidOpenOptions = {
  * ```
  */
 export interface TimePickerAndroidStatic {
-
     /**
      * Opens the standard Android time picker dialog.
      *
@@ -7765,17 +7452,17 @@ export interface TimePickerAndroidStatic {
      * still be resolved with action being `TimePickerAndroid.dismissedAction` and all the other keys
      * being undefined. **Always** check whether the `action` before reading the values.
      */
-    open(options: TimePickerAndroidOpenOptions): Promise<{ action: string, hour: number, minute: number }>
+    open(options: TimePickerAndroidOpenOptions): Promise<{ action: string; hour: number; minute: number }>;
 
     /**
      * A time has been selected.
      */
-    timeSetAction: string
+    timeSetAction: string;
 
     /**
      * The dialog has been dismissed.
      */
-    dismissedAction: string
+    dismissedAction: string;
 }
 
 /**
@@ -7794,20 +7481,16 @@ export interface ToastAndroidStatic {
      * int duration: The duration of the toast.
      * May be ToastAndroid.SHORT or ToastAndroid.LONG
      */
-    show(message: string, duration: number): void
+    show(message: string, duration: number): void;
     /** `gravity` may be ToastAndroid.TOP, ToastAndroid.BOTTOM, ToastAndroid.CENTER */
-    showWithGravity(
-        message: string,
-        duration: number,
-        gravity: number
-    ): void
+    showWithGravity(message: string, duration: number, gravity: number): void;
     // Toast duration constants
-    SHORT: number
-    LONG: number
+    SHORT: number;
+    LONG: number;
     // Toast gravity constants
-    TOP: number
-    BOTTOM: number
-    CENTER: number
+    TOP: number;
+    BOTTOM: number;
+    CENTER: number;
 }
 
 export interface UIManagerStatic {
@@ -7829,14 +7512,14 @@ export interface UIManagerStatic {
      * @platform ios
      */
     takeSnapshot: (
-        view ?: 'window' | React.ReactElement<any> | number,
-        options ?: {
-            width ?: number,
-            height ?: number,
-            format ?: 'png' | 'jpeg',
-            quality ?: number,
+        view?: "window" | React.ReactElement<any> | number,
+        options?: {
+            width?: number;
+            height?: number;
+            format?: "png" | "jpeg";
+            quality?: number;
         }
-    ) => Promise<string>
+    ) => Promise<string>;
 
     /**
      * Determines the location on screen, width, and height of the given view and
@@ -7885,7 +7568,7 @@ export interface UIManagerStatic {
     measureLayout(
         node: number,
         relativeToNativeNode: number,
-        onFail: () => void, /* currently unused */
+        onFail: () => void /* currently unused */,
         onSuccess: MeasureLayoutOnSuccessCallback
     ): void;
 
@@ -7903,47 +7586,45 @@ export interface UIManagerStatic {
 }
 
 export interface SwitchPropertiesIOS extends ViewProperties {
-
     /**
      * Background color when the switch is turned on.
      */
-    onTintColor?: string
+    onTintColor?: string;
 
     /**
      * Color of the foreground switch grip.
      */
-    thumbTintColor?: string
+    thumbTintColor?: string;
 
     /**
      * Background color when the switch is turned off.
      */
-    tintColor?: string
+    tintColor?: string;
 }
 
 export interface SwitchProperties extends SwitchPropertiesIOS {
-
     /**
      * If true the user won't be able to toggle the switch.
      * Default value is false.
      */
-    disabled?: boolean
+    disabled?: boolean;
 
     /**
      * Invoked with the new value when the value changes.
      */
-    onValueChange?: (value: boolean) => void
+    onValueChange?: (value: boolean) => void;
 
     /**
      * Used to locate this view in end-to-end tests.
      */
-    testID?: string
+    testID?: string;
 
     /**
      * The value of the switch. If true the switch will be turned on.
      * Default value is false.
      */
-    value?: boolean
-    style?: StyleProp<ViewStyle>
+    value?: boolean;
+    style?: StyleProp<ViewStyle>;
 }
 
 /**
@@ -7954,9 +7635,7 @@ export interface SwitchProperties extends SwitchPropertiesIOS {
  * If the `value` prop is not updated, the component will continue to render
  * the supplied `value` prop instead of the expected result of any user actions.
  */
-export interface SwitchStatic extends NativeMethodsMixin, React.ClassicComponentClass<SwitchProperties> {
-
-}
+export interface SwitchStatic extends NativeMethodsMixin, React.ClassicComponentClass<SwitchProperties> {}
 
 /**
  * NOTE: `VibrationIOS` is being deprecated. Use `Vibration` instead.
@@ -7975,7 +7654,7 @@ export interface VibrationIOSStatic {
     /**
      * @deprecated
      */
-    vibrate(): void
+    vibrate(): void;
 }
 
 /**
@@ -8002,12 +7681,12 @@ export interface VibrationIOSStatic {
  * V(fixed) --wait(1s)--> V(fixed) --wait(2s)--> V(fixed) --wait(3s)--> V(fixed)
  */
 export interface VibrationStatic {
-    vibrate(pattern: number | number[], repeat: boolean): void
+    vibrate(pattern: number | number[], repeat: boolean): void;
 
     /**
      * Stop vibration
      */
-    cancel(): void
+    cancel(): void;
 }
 
 /**
@@ -8030,10 +7709,7 @@ export interface EasingStatic {
     elastic(bounciness: number): EasingFunction;
     back(s: number): EasingFunction;
     bounce: EasingFunction;
-    bezier(x1: number,
-        y1: number,
-        x2: number,
-        y2: number): EasingFunction;
+    bezier(x1: number, y1: number, x2: number, y2: number): EasingFunction;
     in(easing: EasingFunction): EasingFunction;
     out(easing: EasingFunction): EasingFunction;
     inOut(easing: EasingFunction): EasingFunction;
@@ -8058,11 +7734,11 @@ export namespace Animated {
         interpolate(config: InterpolationConfigType): AnimatedInterpolation;
     }
 
-    type ExtrapolateType = 'extend' | 'identity' | 'clamp';
+    type ExtrapolateType = "extend" | "identity" | "clamp";
 
     type InterpolationConfigType = {
         inputRange: number[];
-        outputRange: (number[] | string[]);
+        outputRange: number[] | string[];
         easing?: ((input: number) => number);
         extrapolate?: ExtrapolateType;
         extrapolateLeft?: ExtrapolateType;
@@ -8080,10 +7756,10 @@ export namespace Animated {
     export class Value extends AnimatedWithChildren {
         constructor(value: number);
 
-    /**
-     * Directly set the value.  This will stop any animations running on the value
-     * and update all the bound properties.
-     */
+        /**
+         * Directly set the value.  This will stop any animations running on the value
+         * and update all the bound properties.
+         */
         setValue(value: number): void;
 
         /**
@@ -8151,7 +7827,7 @@ export namespace Animated {
 
         extractOffset(): void;
 
-        stopAnimation(callback?: (value: {x: number, y: number}) => void): void;
+        stopAnimation(callback?: (value: { x: number; y: number }) => void): void;
 
         addListener(callback: ValueXYListenerCallback): string;
 
@@ -8176,7 +7852,6 @@ export namespace Animated {
          *```
          */
         getTranslateTransform(): { [key: string]: AnimatedValue }[];
-
     }
 
     type EndResult = { finished: boolean };
@@ -8196,13 +7871,10 @@ export namespace Animated {
      * Animates a value from an initial velocity to zero based on a decay
      * coefficient.
      */
-    export function decay(
-        value: AnimatedValue | AnimatedValueXY,
-        config: DecayAnimationConfig
-    ): CompositeAnimation;
+    export function decay(value: AnimatedValue | AnimatedValueXY, config: DecayAnimationConfig): CompositeAnimation;
 
     interface DecayAnimationConfig extends AnimationConfig {
-        velocity: number | { x: number, y: number };
+        velocity: number | { x: number; y: number };
         deceleration?: number;
     }
 
@@ -8210,24 +7882,21 @@ export namespace Animated {
      * Animates a value along a timed easing curve.  The `Easing` module has tons
      * of pre-defined curves, or you can use your own function.
      */
-    export var timing: (
-        value: AnimatedValue | AnimatedValueXY,
-        config: TimingAnimationConfig
-    ) => CompositeAnimation;
+    export var timing: (value: AnimatedValue | AnimatedValueXY, config: TimingAnimationConfig) => CompositeAnimation;
 
     interface TimingAnimationConfig extends AnimationConfig {
-        toValue: number | AnimatedValue | { x: number, y: number } | AnimatedValueXY;
+        toValue: number | AnimatedValue | { x: number; y: number } | AnimatedValueXY;
         easing?: (value: number) => number;
         duration?: number;
         delay?: number;
     }
 
     interface SpringAnimationConfig extends AnimationConfig {
-        toValue: number | AnimatedValue | { x: number, y: number } | AnimatedValueXY;
+        toValue: number | AnimatedValue | { x: number; y: number } | AnimatedValueXY;
         overshootClamping?: boolean;
         restDisplacementThreshold?: number;
         restSpeedThreshold?: number;
-        velocity?: number | { x: number, y: number };
+        velocity?: number | { x: number; y: number };
         bounciness?: number;
         speed?: number;
         tension?: number;
@@ -8242,45 +7911,33 @@ export namespace Animated {
      * Creates a new Animated value composed from two Animated values added
      * together.
      */
-    export function add(
-        a: Animated,
-        b: Animated
-    ): AnimatedAddition;
+    export function add(a: Animated, b: Animated): AnimatedAddition;
 
-    class AnimatedAddition extends AnimatedInterpolation { }
+    class AnimatedAddition extends AnimatedInterpolation {}
 
     /**
      * Creates a new Animated value composed by dividing the first Animated
      * value by the second Animated value.
      */
-    export function divide(
-        a: Animated,
-        b: Animated
-    ): AnimatedDivision;
+    export function divide(a: Animated, b: Animated): AnimatedDivision;
 
-    class AnimatedDivision extends AnimatedInterpolation { }
+    class AnimatedDivision extends AnimatedInterpolation {}
 
     /**
      * Creates a new Animated value composed from two Animated values multiplied
      * together.
      */
-    export function multiply(
-        a: Animated,
-        b: Animated
-    ): AnimatedMultiplication;
+    export function multiply(a: Animated, b: Animated): AnimatedMultiplication;
 
-    class AnimatedMultiplication extends AnimatedInterpolation { }
+    class AnimatedMultiplication extends AnimatedInterpolation {}
 
     /**
      * Creates a new Animated value that is the (non-negative) modulo of the
      * provided Animated value
      */
-    export function modulo(
-        a: Animated,
-        modulus: number
-    ): AnimatedModulo;
+    export function modulo(a: Animated, modulus: number): AnimatedModulo;
 
-    class AnimatedModulo extends AnimatedInterpolation { }
+    class AnimatedModulo extends AnimatedInterpolation {}
 
     /**
      * Create a new Animated value that is limited between 2 values. It uses the
@@ -8305,19 +7962,14 @@ export namespace Animated {
      * before starting the next.  If the current running animation is stopped, no
      * following animations will be started.
      */
-    export function sequence(
-        animations: Array<CompositeAnimation>
-    ): CompositeAnimation;
+    export function sequence(animations: Array<CompositeAnimation>): CompositeAnimation;
 
     /**
      * Array of animations may run in parallel (overlap), but are started in
      * sequence with successive delays.  Nice for doing trailing effects.
      */
 
-    export function stagger(
-        time: number,
-        animations: Array<CompositeAnimation>
-    ): CompositeAnimation
+    export function stagger(time: number, animations: Array<CompositeAnimation>): CompositeAnimation;
 
     /**
      * Loops a given animation continuously, so that each time it reaches the end,
@@ -8326,33 +7978,24 @@ export namespace Animated {
      * the UI thread if the child animation is set to 'useNativeDriver'.
      */
 
-    export function loop(
-        animation: CompositeAnimation,
-        config?: LoopAnimationConfig,
-    ): CompositeAnimation
+    export function loop(animation: CompositeAnimation, config?: LoopAnimationConfig): CompositeAnimation;
 
     /**
      * Spring animation based on Rebound and Origami.  Tracks velocity state to
      * create fluid motions as the `toValue` updates, and can be chained together.
      */
-    export function spring(
-        value: AnimatedValue | AnimatedValueXY,
-        config: SpringAnimationConfig
-    ): CompositeAnimation;
+    export function spring(value: AnimatedValue | AnimatedValueXY, config: SpringAnimationConfig): CompositeAnimation;
 
     type ParallelConfig = {
         stopTogether?: boolean; // If one is stopped, stop all.  default: true
-    }
+    };
 
     /**
      * Starts an array of animations all at the same time.  By default, if one
      * of the animations is stopped, they will all be stopped.  You can override
      * this with the `stopTogether` flag.
      */
-    export function parallel(
-        animations: Array<CompositeAnimation>,
-        config?: ParallelConfig
-    ): CompositeAnimation;
+    export function parallel(animations: Array<CompositeAnimation>, config?: ParallelConfig): CompositeAnimation;
 
     type Mapping = { [key: string]: Mapping } | AnimatedValue;
     interface EventConfig {
@@ -8376,10 +8019,7 @@ export namespace Animated {
      *  ]),
      *```
      */
-    export function event(
-        argMapping: Mapping[],
-        config?: EventConfig
-    ): (...args: any[]) => void;
+    export function event(argMapping: Array<Mapping | null>, config?: EventConfig): (...args: any[]) => void;
 
     /**
      * Make any React component Animatable.  Used to create `Animated.View`, etc.
@@ -8398,9 +8038,9 @@ export namespace Animated {
 
 // tslint:disable-next-line:interface-name
 export interface I18nManagerStatic {
-    isRTL: boolean
-    allowRTL: (allowRTL: boolean) => {}
-    forceRTL: (forceRTL: boolean) => {}
+    isRTL: boolean;
+    allowRTL: (allowRTL: boolean) => {};
+    forceRTL: (forceRTL: boolean) => {};
 }
 
 export interface GeolocationStatic {
@@ -8410,387 +8050,103 @@ export interface GeolocationStatic {
      * On Android, this can return almost immediately if the location is cached or
      * request an update, which might take a while.
      */
-    getCurrentPosition(geo_success: (position: GeolocationReturnType) => void, geo_error?: (error: GeolocationError) => void, geo_options?: GeoOptions): void
+    getCurrentPosition(
+        geo_success: (position: GeolocationReturnType) => void,
+        geo_error?: (error: GeolocationError) => void,
+        geo_options?: GeoOptions
+    ): void;
 
     /**
      * Invokes the success callback whenever the location changes.  Supported
      * options: timeout (ms), maximumAge (ms), enableHighAccuracy (bool), distanceFilter(m)
      */
-    watchPosition(success: (position: GeolocationReturnType) => void, error?: (error: GeolocationError) => void, options?: GeoOptions): number
+    watchPosition(
+        success: (position: GeolocationReturnType) => void,
+        error?: (error: GeolocationError) => void,
+        options?: GeoOptions
+    ): number;
 
-    clearWatch(watchID: number): void
+    clearWatch(watchID: number): void;
 
-    stopObserving(): void
+    stopObserving(): void;
 
     requestAuthorization(): void;
+
+    setRNConfiguration(config: GeoConfiguration): void;
 }
 
 export interface OpenCameraDialogOptions {
     /** Defaults to false */
-    videoMode?: boolean
+    videoMode?: boolean;
 }
 
 export interface OpenSelectDialogOptions {
     /** Defaults to true */
-    showImages?: boolean
+    showImages?: boolean;
     /** Defaults to false */
-    showVideos?: boolean
+    showVideos?: boolean;
 }
 
 /** [imageURL|tempImageTag, height, width] */
-export type ImagePickerResult = [string, number, number]
+export type ImagePickerResult = [string, number, number];
 
 export interface ImagePickerIOSStatic {
-    canRecordVideos(callback: (value: boolean) => void): void
-    canUseCamera(callback: (value: boolean) => void): void
-    openCameraDialog(config: OpenCameraDialogOptions, successCallback: (args: ImagePickerResult) => void, cancelCallback: (args: any[]) => void): void
-    openSelectDialog(config: OpenSelectDialogOptions, successCallback: (args: ImagePickerResult) => void, cancelCallback: (args: any[]) => void): void
+    canRecordVideos(callback: (value: boolean) => void): void;
+    canUseCamera(callback: (value: boolean) => void): void;
+    openCameraDialog(
+        config: OpenCameraDialogOptions,
+        successCallback: (args: ImagePickerResult) => void,
+        cancelCallback: (args: any[]) => void
+    ): void;
+    openSelectDialog(
+        config: OpenSelectDialogOptions,
+        successCallback: (args: ImagePickerResult) => void,
+        cancelCallback: (args: any[]) => void
+    ): void;
 }
 
 export interface ImageStoreStatic {
-        /**
-         * Check if the ImageStore contains image data for the specified URI.
-         * @platform ios
-         */
-        hasImageForTag(uri: string, callback: (hasImage: boolean) => void): void
-        /**
-         * Delete an image from the ImageStore. Images are stored in memory and
-         * must be manually removed when you are finished with them, otherwise they
-         * will continue to use up RAM until the app is terminated. It is safe to
-         * call `removeImageForTag()` without first calling `hasImageForTag()`, it
-         * will simply fail silently.
-         * @platform ios
-         */
-        removeImageForTag(uri: string): void
-        /**
-         * Stores a base64-encoded image in the ImageStore, and returns a URI that
-         * can be used to access or display the image later. Images are stored in
-         * memory only, and must be manually deleted when you are finished with
-         * them by calling `removeImageForTag()`.
-         *
-         * Note that it is very inefficient to transfer large quantities of binary
-         * data between JS and native code, so you should avoid calling this more
-         * than necessary.
-         * @platform ios
-         */
-        addImageFromBase64(
-            base64ImageData: string,
-            success: (uri: string) => void,
-            failure: (error: any) => void
-        ): void
-        /**
-         * Retrieves the base64-encoded data for an image in the ImageStore. If the
-         * specified URI does not match an image in the store, the failure callback
-         * will be called.
-         *
-         * Note that it is very inefficient to transfer large quantities of binary
-         * data between JS and native code, so you should avoid calling this more
-         * than necessary. To display an image in the ImageStore, you can just pass
-         * the URI to an `<Image/>` component; there is no need to retrieve the
-         * base64 data.
-         */
-        getBase64ForTag(
-            uri: string,
-            success: (base64ImageData: string) => void,
-            failure: (error: any) => void
-        ): void
-}
-
-export interface TabsReducerStatic {
-    JumpToAction(index: number): any;
-}
-
-export type TabsReducerFunction = (params: any) => any;
-
-export interface NavigationTab {
-    key: string;
-}
-
-export interface NavigationAction {
-    type: string;
-}
-
-export interface NavigationRoute {
-    key: string;
-    title?: string;
-}
-
-export interface NavigationState extends NavigationRoute {
-    index: number;
-    routes: NavigationRoute[];
-}
-
-export type NavigationRenderer = (
-    route: NavigationState,
-    onNavigate: (action: NavigationAction) => boolean
-) => JSX.Element;
-
-interface SubViewProps extends NavigationSceneRendererProps {
-    onNavigateBack?(): void;
-}
-
-type SubViewRenderer = (subViewProps: SubViewProps) => JSX.Element | null;
-
-export interface NavigationHeaderProps extends NavigationSceneRendererProps {
-    onNavigateBack?(): void,
-    renderLeftComponent?: SubViewRenderer,
-    renderRightComponent?: SubViewRenderer,
-    renderTitleComponent?: SubViewRenderer,
-    style?: StyleProp<ViewStyle>,
-    viewProps?: any,
-    statusBarHeight?: number | NavigationAnimatedValue
-}
-
-export interface NavigationHeaderStatic extends React.ComponentClass<NavigationHeaderProps> {
-    Title: NavigationHeaderTitleStatic
-    HEIGHT: number
-}
-
-export interface NavigationHeaderTitleProps {
-    children?: JSX.Element,
-    style?: StyleProp<ViewStyle>,
-    textStyle?: StyleProp<TextStyle>,
-    viewProps?: any
-}
-
-export interface NavigationHeaderTitleStatic extends React.ComponentClass<NavigationHeaderTitleProps> {
-}
-
-export interface NavigationCardStackProps {
     /**
-     * Custom style applied to the card.
+     * Check if the ImageStore contains image data for the specified URI.
+     * @platform ios
      */
-    cardStyle?: StyleProp<ViewStyle>
+    hasImageForTag(uri: string, callback: (hasImage: boolean) => void): void;
+
     /**
-     * Custom style interpolator for the card.
+     * Delete an image from the ImageStore. Images are stored in memory and
+     * must be manually removed when you are finished with them, otherwise they
+     * will continue to use up RAM until the app is terminated. It is safe to
+     * call `removeImageForTag()` without first calling `hasImageForTag()`, it
+     * will simply fail silently.
+     * @platform ios
      */
-    cardStyleInterpolator?: (props: NavigationSceneRendererProps) => StyleProp<ViewStyle>
+    removeImageForTag(uri: string): void;
+
     /**
-     * Direction of the cards movement. Value could be `horizontal` or
-     * `vertical`. Default value is `horizontal`.
-     */
-    direction?: 'horizontal' | 'vertical'
-    /**
-     * The distance from the edge of the card which gesture response can start
-     * for. Defaults value is `30`.
-     */
-    gestureResponseDistance?: number
-    /**
-     * Enable gestures. Default value is true
-     */
-    enableGestures?: boolean,
-    /**
-     * The controlled navigation state. Typically, the navigation state
-     * look like this:
+     * Stores a base64-encoded image in the ImageStore, and returns a URI that
+     * can be used to access or display the image later. Images are stored in
+     * memory only, and must be manually deleted when you are finished with
+     * them by calling `removeImageForTag()`.
      *
-     * ```js
-     * const navigationState = {
-     *   index: 0, // the index of the selected route.
-     *   routes: [ // A list of routes.
-     *     {key: 'page 1'}, // The 1st route.
-     *     {key: 'page 2'}, // The second route.
-     *   ],
-     * };
-     * ```
+     * Note that it is very inefficient to transfer large quantities of binary
+     * data between JS and native code, so you should avoid calling this more
+     * than necessary.
+     * @platform ios
      */
-    navigationState: NavigationState,
+    addImageFromBase64(base64ImageData: string, success: (uri: string) => void, failure: (error: any) => void): void;
+
     /**
-     * Callback that is called when the "back" action is performed.
-     * This happens when the back button is pressed or the back gesture is
-     * performed.
+     * Retrieves the base64-encoded data for an image in the ImageStore. If the
+     * specified URI does not match an image in the store, the failure callback
+     * will be called.
+     *
+     * Note that it is very inefficient to transfer large quantities of binary
+     * data between JS and native code, so you should avoid calling this more
+     * than necessary. To display an image in the ImageStore, you can just pass
+     * the URI to an `<Image/>` component; there is no need to retrieve the
+     * base64 data.
      */
-    onNavigateBack?: () => any,
-    /**
-     * Function that renders the header.
-     */
-    renderHeader?: NavigationSceneRenderer,
-    /**
-     * Function that renders the a scene for a route.
-     */
-    renderScene: NavigationSceneRenderer,
-    /**
-     * Custom style applied to the cards stack.
-     */
-    style?: StyleProp<ViewStyle>,
-}
-
-// Object Instances
-
-export type NavigationAnimatedValue = Animated.Value;
-
-// Value  & Structs.
-
-export type NavigationGestureDirection = 'horizontal' | 'vertical';
-
-export type NavigationLayout = {
-    height: NavigationAnimatedValue,
-    initHeight: number,
-    initWidth: number,
-    isMeasured: boolean,
-    width: NavigationAnimatedValue,
-};
-
-export type NavigationScene = {
-    index: number,
-    isActive: boolean,
-    isStale: boolean,
-    key: string,
-    route: NavigationRoute,
-};
-
-// Similar to `NavigationTransitionProps`, except that the prop `scene`
-// represents the scene for the renderer to render.
-export interface NavigationSceneRendererProps {
-    layout: NavigationLayout,
-    navigationState: NavigationState,
-    position: NavigationAnimatedValue,
-    progress: NavigationAnimatedValue,
-    scenes: Array<NavigationScene>,
-    scene: NavigationScene,
-    gestureResponseDistance?: number,
-}
-
-export interface NavigationSceneRenderer extends React.StatelessComponent<NavigationSceneRendererProps> {
-}
-
-export interface NavigationPropTypes {
-    // helpers
-    extractSceneRendererProps(props: NavigationSceneRendererProps): NavigationSceneRendererProps
-
-    // Bundled propTypes.
-    SceneRendererProps: {
-        layout: string,
-        navigationState: string,
-        position: string,
-        progress: string,
-        scene: string,
-        scenes: NavigationScene[],
-    }
-
-    // propTypes
-    SceneRenderer: any, // TODO: fix this
-    action: NavigationAction,
-    navigationState: NavigationState,
-    navigationRoute: NavigationRoute,
-    panHandlers: GestureResponderHandlers,
-}
-
-export interface NavigationCardProps extends React.ComponentClass<NavigationSceneRendererProps> {
-    onComponentRef: (ref: any) => void,
-    onNavigateBack?: () => any,
-    panHandlers?: GestureResponderHandlers,
-    pointerEvents: string,
-    renderScene: NavigationSceneRenderer,
-    style?: StyleProp<ViewStyle>,
-}
-
-export interface NavigationCardStackStatic extends React.ComponentClass<NavigationCardStackProps> {
-}
-
-export interface NavigationCardStatic extends React.ComponentClass<NavigationCardProps> {
-}
-
-/**
- * Utilities to perform atomic operation with navigate state and routes.
- *
- * ```javascript
- * const state1 = {key: 'page 1'};
- * const state2 = NavigationStateUtils.push(state1, {key: 'page 2'});
- * ```
- */
-export interface NavigationStateUtils {
-    get(state: NavigationState, key: string): NavigationRoute
-    indexOf(state: NavigationState, key: string): number
-    has(state: NavigationState, key: string): boolean
-    push(state: NavigationState, route: NavigationRoute): NavigationState
-    pop(state: NavigationState): NavigationState
-    jumpToIndex(state: NavigationState, index: number): NavigationState
-    jumpTo(state: NavigationState, key: string): NavigationState
-    back(state: NavigationState): NavigationState
-    forward(state: NavigationState): NavigationState
-    replaceAt(
-        state: NavigationState,
-        key: string,
-        route: NavigationRoute
-    ): NavigationState
-    replaceAtIndex(
-        state: NavigationState,
-        index: number,
-        route: NavigationRoute
-    ): NavigationState
-    reset(
-        state: NavigationState,
-        routes: Array<NavigationRoute>,
-        index?: number
-    ): NavigationState
-}
-
-export type NavigationTransitionProps = {
-    // The layout of the transitioner of the scenes.
-    layout: NavigationLayout,
-
-    // The navigation state of the transitioner.
-    navigationState: NavigationState,
-
-    // The progressive index of the transitioner's navigation state.
-    position: NavigationAnimatedValue,
-
-    // The value that represents the progress of the transition when navigation
-    // state changes from one to another. Its numberic value will range from 0
-    // to 1.
-    //  progress.__getAnimatedValue() < 1 : transtion is happening.
-    //  progress.__getAnimatedValue() == 1 : transtion completes.
-    progress: NavigationAnimatedValue,
-
-    // All the scenes of the transitioner.
-    scenes: Array<NavigationScene>,
-
-    // The active scene, corresponding to the route at
-    // `navigationState.routes[navigationState.index]`.
-    scene: NavigationScene,
-
-    // The gesture distance for `horizontal` and `vertical` transitions
-    gestureResponseDistance?: number,
-}
-export type NavigationTransitionSpec = {
-    duration?: number,
-    // An easing function from `Easing`.
-    easing?: EasingFunction,
-    // A timing function such as `Animated.timing`.
-    timing?: (value: NavigationAnimatedValue, config: any) => any,
-}
-export interface NavigationTransitionerProps {
-    configureTransition?: (
-        a: NavigationTransitionProps,
-        b?: NavigationTransitionProps
-    ) => NavigationTransitionSpec,
-    navigationState: NavigationState,
-    onTransitionEnd?: () => void,
-    onTransitionStart?: () => void,
-    render: (a: NavigationTransitionProps, b?: NavigationTransitionProps) => any,
-    style: any,
-}
-
-export interface NavigationTransitioner extends React.ComponentClass<NavigationTransitionerProps> {
-}
-
-export interface NavigationCard extends React.ComponentClass<NavigationCardProps> {
-}
-
-export interface NavigationExperimentalStatic {
-    // Core
-    StateUtils: NavigationStateUtils
-
-    // Views
-    Transitioner: NavigationTransitioner,
-
-    //AnimatedView: NavigationAnimatedViewStatic;
-    // CustomComponents:
-    Card: NavigationCard,
-    CardStack: NavigationCardStackStatic;
-    Header: NavigationHeaderStatic;
-
-    PropTypes: NavigationPropTypes,
+    getBase64ForTag(uri: string, success: (base64ImageData: string) => void, failure: (error: any) => void): void;
 }
 
 //
@@ -8812,7 +8168,7 @@ export interface NativeEventSubscription {
  * @see https://github.com/facebook/react-native/blob/0.34-stable\Libraries\EventEmitter\RCTNativeAppEventEmitter.js
  * @see https://facebook.github.io/react-native/docs/native-modules-ios.html#sending-events-to-javascript
  */
-type RCTNativeAppEventEmitter = DeviceEventEmitterStatic
+type RCTNativeAppEventEmitter = DeviceEventEmitterStatic;
 
 interface ImageCropData {
     /**
@@ -8822,7 +8178,7 @@ interface ImageCropData {
     offset: {
         x: number;
         y: number;
-    }
+    };
 
     /**
      * The size (dimensions) of the cropped image, specified in the original
@@ -8831,18 +8187,18 @@ interface ImageCropData {
     size: {
         width: number;
         height: number;
-    }
+    };
 
     /**
      * (Optional) size to scale the cropped image to.
      */
-    displaySize?: { width: number, height: number }
+    displaySize?: { width: number; height: number };
 
     /**
      * (Optional) the resizing mode to use when scaling the image. If the
      * `displaySize` param is not specified, this has no effect.
      */
-    resizeMode?: 'contain' | 'cover' | 'stretch'
+    resizeMode?: "contain" | "cover" | "stretch";
 }
 
 interface ImageEditorStatic {
@@ -8856,35 +8212,38 @@ interface ImageEditorStatic {
      * callback will point to the image in the store. Remember to delete the
      * cropped image from the ImageStore when you are done with it.
      */
-    cropImage( uri: string, cropData: ImageCropData, success: (uri: string) => void, failure: (error: Object) => void ): void
+    cropImage(
+        uri: string,
+        cropData: ImageCropData,
+        success: (uri: string) => void,
+        failure: (error: Object) => void
+    ): void;
 }
 
 export interface ARTShapeProps {
-    d: string,
-    strokeWidth: number,
-    strokeDash?: number[],
-    stroke: string
+    d: string;
+    strokeWidth: number;
+    strokeDash?: number[];
+    stroke: string;
 }
 
 export interface ARTSurfaceProps {
-    style: StyleProp<ViewStyle>,
-    width: number,
-    height: number
+    style: StyleProp<ViewStyle>;
+    width: number;
+    height: number;
 }
 
-export interface ShapeStatic extends React.ComponentClass<ARTShapeProps> {
-}
+export interface ShapeStatic extends React.ComponentClass<ARTShapeProps> {}
 
-export interface SurfaceStatic extends React.ComponentClass<ARTSurfaceProps> {
-}
+export interface SurfaceStatic extends React.ComponentClass<ARTSurfaceProps> {}
 
 export interface ARTStatic {
-    Shape: ShapeStatic,
-    Surface: SurfaceStatic
+    Shape: ShapeStatic;
+    Surface: SurfaceStatic;
 }
 
 export interface KeyboardStatic extends NativeEventEmitter {
-    dismiss: () => void
+    dismiss: () => void;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -8895,276 +8254,275 @@ export interface KeyboardStatic extends NativeEventEmitter {
 
 // TODO: The following components need to be added
 // - [ ] ART
-export var ART: ARTStatic
-export type ART = ARTStatic
+export var ART: ARTStatic;
+export type ART = ARTStatic;
 
-export var ActivityIndicator: ActivityIndicatorStatic
-export type ActivityIndicator = ActivityIndicatorStatic
+export var ActivityIndicator: ActivityIndicatorStatic;
+export type ActivityIndicator = ActivityIndicatorStatic;
 
-export var ActivityIndicatorIOS: ActivityIndicatorIOSStatic
-export type ActivityIndicatorIOS = ActivityIndicatorIOSStatic
+export var ActivityIndicatorIOS: ActivityIndicatorIOSStatic;
+export type ActivityIndicatorIOS = ActivityIndicatorIOSStatic;
 
-export var DatePickerIOS: DatePickerIOSStatic
-export type DatePickerIOS = DatePickerIOSStatic
+export var DatePickerIOS: DatePickerIOSStatic;
+export type DatePickerIOS = DatePickerIOSStatic;
 
-export var DrawerLayoutAndroid: DrawerLayoutAndroidStatic
-export type DrawerLayoutAndroid = DrawerLayoutAndroidStatic
+export var DrawerLayoutAndroid: DrawerLayoutAndroidStatic;
+export type DrawerLayoutAndroid = DrawerLayoutAndroidStatic;
 
-export var Image: ImageStatic
-export type Image = ImageStatic
+export var Image: ImageStatic;
+export type Image = ImageStatic;
 
-export var ImageBackground: ImageBackgroundStatic
-export type ImageBackground = ImageBackgroundStatic
+export var ImageBackground: ImageBackgroundStatic;
+export type ImageBackground = ImageBackgroundStatic;
 
-export var ImagePickerIOS: ImagePickerIOSStatic
-export type ImagePickerIOS = ImagePickerIOSStatic
+export var ImagePickerIOS: ImagePickerIOSStatic;
+export type ImagePickerIOS = ImagePickerIOSStatic;
 
-export var FlatList: FlatListStatic<any>
-export type FlatList<ItemT> = FlatListStatic<ItemT>
+export var FlatList: FlatListStatic<any>;
+export type FlatList<ItemT> = FlatListStatic<ItemT>;
 
-export var LayoutAnimation: LayoutAnimationStatic
-export type LayoutAnimation = LayoutAnimationStatic
+export var LayoutAnimation: LayoutAnimationStatic;
+export type LayoutAnimation = LayoutAnimationStatic;
 
-export var ListView: ListViewStatic
-export type ListView = ListViewStatic
+export var ListView: ListViewStatic;
+export type ListView = ListViewStatic;
 
-export var MapView: MapViewStatic
-export type MapView = MapViewStatic
+export var MapView: MapViewStatic;
+export type MapView = MapViewStatic;
 
-export var MaskedView: MaskedViewStatic
-export type MaskedView = MaskedViewStatic
+export var MaskedView: MaskedViewStatic;
+export type MaskedView = MaskedViewStatic;
 
-export var Modal: ModalStatic
-export type Modal = ModalStatic
+export var Modal: ModalStatic;
+export type Modal = ModalStatic;
 
-export var Navigator: NavigatorStatic
-export type Navigator = NavigatorStatic
+export var NavigatorIOS: NavigatorIOSStatic;
+export type NavigatorIOS = NavigatorIOSStatic;
 
-export var NavigatorIOS: NavigatorIOSStatic
-export type NavigatorIOS = NavigatorIOSStatic
+export var Picker: PickerStatic;
+export type Picker = PickerStatic;
 
-export var Picker: PickerStatic
-export type Picker = PickerStatic
+export var PickerIOS: PickerIOSStatic;
+export type PickerIOS = PickerIOSStatic;
 
-export var PickerIOS: PickerIOSStatic
-export type PickerIOS = PickerIOSStatic
+export var ProgressBarAndroid: ProgressBarAndroidStatic;
+export type ProgressBarAndroid = ProgressBarAndroidStatic;
 
-export var ProgressBarAndroid: ProgressBarAndroidStatic
-export type ProgressBarAndroid = ProgressBarAndroidStatic
+export var ProgressViewIOS: ProgressViewIOSStatic;
+export type ProgressViewIOS = ProgressViewIOSStatic;
 
-export var ProgressViewIOS: ProgressViewIOSStatic
-export type ProgressViewIOS = ProgressViewIOSStatic
+export var RefreshControl: RefreshControlStatic;
+export type RefreshControl = RefreshControlStatic;
 
-export var RefreshControl: RefreshControlStatic
-export type RefreshControl = RefreshControlStatic
+export var RecyclerViewBackedScrollView: RecyclerViewBackedScrollViewStatic;
+export type RecyclerViewBackedScrollView = RecyclerViewBackedScrollViewStatic;
 
-export var RecyclerViewBackedScrollView: RecyclerViewBackedScrollViewStatic
-export type RecyclerViewBackedScrollView = RecyclerViewBackedScrollViewStatic
+export var SafeAreaView: SafeAreaViewStatic;
+export type SafeAreaView = SafeAreaViewStatic;
 
-export var SegmentedControlIOS: SegmentedControlIOSStatic
-export type SegmentedControlIOS = SegmentedControlIOSStatic
+export var SegmentedControlIOS: SegmentedControlIOSStatic;
+export type SegmentedControlIOS = SegmentedControlIOSStatic;
 
-export var Slider: SliderStatic
-export type Slider = SliderStatic
+export var Slider: SliderStatic;
+export type Slider = SliderStatic;
 
-export var SliderIOS: SliderStatic
-export type SliderIOS = SliderStatic
+export var SliderIOS: SliderStatic;
+export type SliderIOS = SliderStatic;
 
-export var StatusBar: StatusBarStatic
-export type StatusBar = StatusBarStatic
+export var StatusBar: StatusBarStatic;
+export type StatusBar = StatusBarStatic;
 
-export var ScrollView: ScrollViewStatic
-export type ScrollView = ScrollViewStatic
+export var ScrollView: ScrollViewStatic;
+export type ScrollView = ScrollViewStatic;
 
-export var SectionList: SectionListStatic<any>
-export type SectionList<ItemT> = SectionListStatic<ItemT>
+export var SectionList: SectionListStatic<any>;
+export type SectionList<ItemT> = SectionListStatic<ItemT>;
 
-export var SnapshotViewIOS: SnapshotViewIOSStatic
-export type SnapshotViewIOS = SnapshotViewIOSStatic
+export var SnapshotViewIOS: SnapshotViewIOSStatic;
+export type SnapshotViewIOS = SnapshotViewIOSStatic;
 
-export var Systrace: SystraceStatic
-export type Systrace = SystraceStatic
+export var Systrace: SystraceStatic;
+export type Systrace = SystraceStatic;
 
-export var SwipeableListView: SwipeableListViewStatic
-export type SwipeableListView = SwipeableListViewStatic
+export var SwipeableListView: SwipeableListViewStatic;
+export type SwipeableListView = SwipeableListViewStatic;
 
-export var Switch: SwitchStatic
-export type Switch = SwitchStatic
+export var Switch: SwitchStatic;
+export type Switch = SwitchStatic;
 
-export var SwitchIOS: SwitchIOSStatic
-export type SwitchIOS = SwitchIOSStatic
+export var SwitchIOS: SwitchIOSStatic;
+export type SwitchIOS = SwitchIOSStatic;
 
-export var TabBarIOS: TabBarIOSStatic
-export type TabBarIOS = TabBarIOSStatic
+export var TabBarIOS: TabBarIOSStatic;
+export type TabBarIOS = TabBarIOSStatic;
 
-export var Text: TextStatic
-export type Text = TextStatic
+export var Text: TextStatic;
+export type Text = TextStatic;
 
-export var TextInput: TextInputStatic
-export type TextInput = TextInputStatic
+export var TextInput: TextInputStatic;
+export type TextInput = TextInputStatic;
 
-export var ToolbarAndroid: ToolbarAndroidStatic
-export type ToolbarAndroid = ToolbarAndroidStatic
+export var ToolbarAndroid: ToolbarAndroidStatic;
+export type ToolbarAndroid = ToolbarAndroidStatic;
 
-export var TouchableHighlight: TouchableHighlightStatic
-export type TouchableHighlight = TouchableHighlightStatic
+export var TouchableHighlight: TouchableHighlightStatic;
+export type TouchableHighlight = TouchableHighlightStatic;
 
-export var TouchableNativeFeedback: TouchableNativeFeedbackStatic
-export type TouchableNativeFeedback = TouchableNativeFeedbackStatic
+export var TouchableNativeFeedback: TouchableNativeFeedbackStatic;
+export type TouchableNativeFeedback = TouchableNativeFeedbackStatic;
 
-export var TouchableOpacity: TouchableOpacityStatic
-export type TouchableOpacity = TouchableOpacityStatic
+export var TouchableOpacity: TouchableOpacityStatic;
+export type TouchableOpacity = TouchableOpacityStatic;
 
-export var TouchableWithoutFeedback: TouchableWithoutFeedbackStatic
-export type TouchableWithoutFeedback = TouchableWithoutFeedbackStatic
+export var TouchableWithoutFeedback: TouchableWithoutFeedbackStatic;
+export type TouchableWithoutFeedback = TouchableWithoutFeedbackStatic;
 
-export var View: ViewStatic
-export type View = ViewStatic
+export var View: ViewStatic;
+export type View = ViewStatic;
 
-export var ViewPagerAndroid: ViewPagerAndroidStatic
-export type ViewPagerAndroid = ViewPagerAndroidStatic
-
-export var WebView: WebViewStatic
-export type WebView = WebViewStatic
+export var ViewPagerAndroid: ViewPagerAndroidStatic;
+export type ViewPagerAndroid = ViewPagerAndroidStatic;
 
+export var WebView: WebViewStatic;
+export type WebView = WebViewStatic;
 
 //////////// APIS //////////////
-export var ActionSheetIOS: ActionSheetIOSStatic
-export type ActionSheetIOS = ActionSheetIOSStatic
+export var ActionSheetIOS: ActionSheetIOSStatic;
+export type ActionSheetIOS = ActionSheetIOSStatic;
 
-export var Share: ShareStatic
-export type Share = ShareStatic
+export var Share: ShareStatic;
+export type Share = ShareStatic;
 
-export var AdSupportIOS: AdSupportIOSStatic
-export type AdSupportIOS = AdSupportIOSStatic
+export var AdSupportIOS: AdSupportIOSStatic;
+export type AdSupportIOS = AdSupportIOSStatic;
 
-export var Alert: AlertStatic
-export type Alert = AlertStatic
+export var AccessibilityInfo: AccessibilityInfoStatic;
+export type AccessibilityInfo = AccessibilityInfoStatic;
 
-export var AlertAndroid: AlertAndroidStatic
-export type AlertAndroid = AlertAndroidStatic
+export var Alert: AlertStatic;
+export type Alert = AlertStatic;
 
-export var AlertIOS: AlertIOSStatic
-export type AlertIOS = AlertIOSStatic
+export var AlertAndroid: AlertAndroidStatic;
+export type AlertAndroid = AlertAndroidStatic;
+
+export var AlertIOS: AlertIOSStatic;
+export type AlertIOS = AlertIOSStatic;
 
 export var AppState: AppStateStatic;
 export type AppState = AppStateStatic;
 
-export var AppStateIOS: AppStateStatic
-export type AppStateIOS = AppStateStatic
+export var AppStateIOS: AppStateStatic;
+export type AppStateIOS = AppStateStatic;
 
-export var AsyncStorage: AsyncStorageStatic
-export type AsyncStorage = AsyncStorageStatic
+export var AsyncStorage: AsyncStorageStatic;
+export type AsyncStorage = AsyncStorageStatic;
 
-export var BackAndroid: BackAndroidStatic
-export type BackAndroid = BackAndroidStatic
+export var BackAndroid: BackAndroidStatic;
+export type BackAndroid = BackAndroidStatic;
 
-export var BackHandler: BackHandlerStatic
-export type BackHandler = BackHandlerStatic
+export var BackHandler: BackHandlerStatic;
+export type BackHandler = BackHandlerStatic;
 
-export var Button: ButtonStatic
-export type Button = ButtonStatic
+export var Button: ButtonStatic;
+export type Button = ButtonStatic;
 
-export var CameraRoll: CameraRollStatic
-export type CameraRoll = CameraRollStatic
+export var CameraRoll: CameraRollStatic;
+export type CameraRoll = CameraRollStatic;
 
-export var Clipboard: ClipboardStatic
-export type Clipboard = ClipboardStatic
+export var Clipboard: ClipboardStatic;
+export type Clipboard = ClipboardStatic;
 
-export var DatePickerAndroid: DatePickerAndroidStatic
-export type DatePickerAndroid = DatePickerAndroidStatic
+export var DatePickerAndroid: DatePickerAndroidStatic;
+export type DatePickerAndroid = DatePickerAndroidStatic;
 
-export var Geolocation: GeolocationStatic
-export type Geolocation = GeolocationStatic
+export var Geolocation: GeolocationStatic;
+export type Geolocation = GeolocationStatic;
 
 /** http://facebook.github.io/react-native/blog/2016/08/19/right-to-left-support-for-react-native-apps.html */
-export var I18nManager: I18nManagerStatic
-export type I18nManager = I18nManagerStatic
+export var I18nManager: I18nManagerStatic;
+export type I18nManager = I18nManagerStatic;
 
-export var ImageEditor: ImageEditorStatic
-export type ImageEditor = ImageEditorStatic
+export var ImageEditor: ImageEditorStatic;
+export type ImageEditor = ImageEditorStatic;
 
-export var ImageStore: ImageStoreStatic
-export type ImageStore = ImageStoreStatic
+export var ImageStore: ImageStoreStatic;
+export type ImageStore = ImageStoreStatic;
 
-export var InteractionManager: InteractionManagerStatic
+export var InteractionManager: InteractionManagerStatic;
 
-export var IntentAndroid: IntentAndroidStatic
-export type IntentAndroid = IntentAndroidStatic
+export var IntentAndroid: IntentAndroidStatic;
+export type IntentAndroid = IntentAndroidStatic;
 
-export var Keyboard: KeyboardStatic
+export var Keyboard: KeyboardStatic;
 
-export var KeyboardAvoidingView: KeyboardAvoidingViewStatic
-export type KeyboardAvoidingView = KeyboardAvoidingViewStatic
+export var KeyboardAvoidingView: KeyboardAvoidingViewStatic;
+export type KeyboardAvoidingView = KeyboardAvoidingViewStatic;
 
-export var Linking: LinkingStatic
-export type Linking = LinkingStatic
+export var Linking: LinkingStatic;
+export type Linking = LinkingStatic;
 
-export var LinkingIOS: LinkingIOSStatic
-export type LinkingIOS = LinkingIOSStatic
+export var LinkingIOS: LinkingIOSStatic;
+export type LinkingIOS = LinkingIOSStatic;
 
-export var NativeMethodsMixin: NativeMethodsMixinStatic
-export type NativeMethodsMixin = NativeMethodsMixinStatic
+export var NativeMethodsMixin: NativeMethodsMixinStatic;
+export type NativeMethodsMixin = NativeMethodsMixinStatic;
 
-export var NativeComponent: NativeMethodsMixinStatic
-export type NativeComponent = NativeMethodsMixinStatic
+export var NativeComponent: NativeMethodsMixinStatic;
+export type NativeComponent = NativeMethodsMixinStatic;
 
-export var NetInfo: NetInfoStatic
-export type NetInfo = NetInfoStatic
+export var NetInfo: NetInfoStatic;
+export type NetInfo = NetInfoStatic;
 
-export var PanResponder: PanResponderStatic
-export type PanResponder = PanResponderStatic
+export var PanResponder: PanResponderStatic;
+export type PanResponder = PanResponderStatic;
 
-export var PermissionsAndroid: PermissionsAndroidStatic
-export type PermissionsAndroid = PermissionsAndroidStatic
+export var PermissionsAndroid: PermissionsAndroidStatic;
+export type PermissionsAndroid = PermissionsAndroidStatic;
 
-export var PushNotificationIOS: PushNotificationIOSStatic
-export type PushNotificationIOS = PushNotificationIOSStatic
+export var PushNotificationIOS: PushNotificationIOSStatic;
+export type PushNotificationIOS = PushNotificationIOSStatic;
 
-export var Settings: SettingsStatic
-export type Settings = SettingsStatic
+export var Settings: SettingsStatic;
+export type Settings = SettingsStatic;
 
-export var StatusBarIOS: StatusBarIOSStatic
-export type StatusBarIOS = StatusBarIOSStatic
+export var StatusBarIOS: StatusBarIOSStatic;
+export type StatusBarIOS = StatusBarIOSStatic;
 
-export var TimePickerAndroid: TimePickerAndroidStatic
-export type TimePickerAndroid = TimePickerAndroidStatic
+export var TimePickerAndroid: TimePickerAndroidStatic;
+export type TimePickerAndroid = TimePickerAndroidStatic;
 
-export var ToastAndroid: ToastAndroidStatic
-export type ToastAndroid = ToastAndroidStatic
+export var ToastAndroid: ToastAndroidStatic;
+export type ToastAndroid = ToastAndroidStatic;
 
-export var UIManager: UIManagerStatic
-export type UIManager = UIManagerStatic
+export var UIManager: UIManagerStatic;
+export type UIManager = UIManagerStatic;
 
-export var VibrationIOS: VibrationIOSStatic
-export type VibrationIOS = VibrationIOSStatic
+export var VibrationIOS: VibrationIOSStatic;
+export type VibrationIOS = VibrationIOSStatic;
 
-export var Vibration: VibrationStatic
-export type Vibration = VibrationStatic
+export var Vibration: VibrationStatic;
+export type Vibration = VibrationStatic;
 
 export var Dimensions: Dimensions;
 export var ShadowPropTypesIOS: ShadowPropTypesIOSStatic;
 
-export type NavigationExperimental = NavigationExperimentalStatic;
-export var NavigationExperimental: NavigationExperimentalStatic;
-
 export type Easing = EasingStatic;
 export var Easing: EasingStatic;
 
 //////////// Plugins //////////////
 
-export var DeviceEventEmitter: DeviceEventEmitterStatic
+export var DeviceEventEmitter: DeviceEventEmitterStatic;
 /**
  * Abstract base class for implementing event-emitting modules. This implements
  * a subset of the standard EventEmitter node module API.
  */
 export interface NativeEventEmitter extends EventEmitter {}
-export var NativeEventEmitter: NativeEventEmitter
+export var NativeEventEmitter: NativeEventEmitter;
 /**
  * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
  * adding all event listeners directly to RCTNativeAppEventEmitter.
  */
-export var NativeAppEventEmitter: RCTNativeAppEventEmitter
+export var NativeAppEventEmitter: RCTNativeAppEventEmitter;
 
 /**
  * Interface for NativeModules which allows to augment NativeModules with type informations.
@@ -9181,15 +8539,15 @@ interface NativeModulesStatic {
  * Use:
  * <code>const MyModule = NativeModules.ModuleName</code>
  */
-export var NativeModules: NativeModulesStatic
-export var Platform: PlatformStatic
-export var PlatformIOS: PlatformIOSStatic
-export var PixelRatio: PixelRatioStatic
+export var NativeModules: NativeModulesStatic;
+export var Platform: PlatformStatic;
+export var PlatformIOS: PlatformIOSStatic;
+export var PixelRatio: PixelRatioStatic;
 
 export interface ComponentInterface<P> {
     name?: string;
     displayName?: string;
-    propTypes: P
+    propTypes: P;
 }
 
 /**
@@ -9210,10 +8568,12 @@ export interface ComponentInterface<P> {
 export function requireNativeComponent<P>(
     viewName: string,
     componentInterface?: ComponentInterface<P>,
-    extraConfig?: {nativeOnly?: any}
+    extraConfig?: { nativeOnly?: any }
 ): React.ComponentClass<P>;
 
-export function findNodeHandle(componentOrHandle: null | number | React.Component<any, any> | React.ComponentClass<any>): null | number;
+export function findNodeHandle(
+    componentOrHandle: null | number | React.Component<any, any> | React.ComponentClass<any>
+): null | number;
 
 export function processColor(color: any): number;
 
@@ -9236,25 +8596,23 @@ export interface ErrorUtils {
 // Add-Ons
 //
 export namespace addons {
-
     //FIXME: Documentation ?
     export interface TestModuleStatic {
-
-        verifySnapshot: (done: (indicator?: any) => void) => void
-        markTestPassed: (indicator: any) => void
-        markTestCompleted: () => void
+        verifySnapshot: (done: (indicator?: any) => void) => void;
+        markTestPassed: (indicator: any) => void;
+        markTestCompleted: () => void;
     }
 
-    export var TestModule: TestModuleStatic
-    export type TestModule = TestModuleStatic
+    export var TestModule: TestModuleStatic;
+    export type TestModule = TestModuleStatic;
 }
 
 //
 // Prop Types
 //
-export var ColorPropType: React.Requireable<any>
-export var EdgeInsetsPropType: React.Requireable<any>
-export var PointPropType: React.Requireable<any>
+export var ColorPropType: React.Requireable<any>;
+export var EdgeInsetsPropType: React.Requireable<any>;
+export var PointPropType: React.Requireable<any>;
 
 declare global {
     function require(name: string): any;
@@ -9264,18 +8622,18 @@ declare global {
      * @see https://facebook.github.io/react-native/docs/javascript-environment.html#polyfills
      */
     interface Console {
-        error(message?: any, ...optionalParams: any[]): void
-        info(message?: any, ...optionalParams: any[]): void
-        log(message?: any, ...optionalParams: any[]): void
-        warn(message?: any, ...optionalParams: any[]): void
-        trace(message?: any, ...optionalParams: any[]): void
-        debug(message?: any, ...optionalParams: any[]): void
+        error(message?: any, ...optionalParams: any[]): void;
+        info(message?: any, ...optionalParams: any[]): void;
+        log(message?: any, ...optionalParams: any[]): void;
+        warn(message?: any, ...optionalParams: any[]): void;
+        trace(message?: any, ...optionalParams: any[]): void;
+        debug(message?: any, ...optionalParams: any[]): void;
         table(...data: any[]): void;
         disableYellowBox: boolean;
         ignoredYellowBox: string[];
     }
 
-    var console: Console
+    var console: Console;
 
     /**
      * Navigator object for accessing location API
@@ -9306,5 +8664,5 @@ declare global {
      * Typical usage:
      * <code> if (__DEV__) console.log('Running in dev mode')</code>
      */
-    var __DEV__: boolean
+    var __DEV__: boolean;
 }
diff --git a/types/react-native/test/animated.tsx b/types/react-native/test/animated.tsx
index a1065e71a9..c27af04bb9 100644
--- a/types/react-native/test/animated.tsx
+++ b/types/react-native/test/animated.tsx
@@ -1,94 +1,80 @@
-import * as React from 'react-native'
+import * as React from "react-native";
 
-import {
-  Animated,
-  View,
-} from 'react-native';
+import { Animated, View } from "react-native";
 
 function TestAnimatedAPI() {
-  // Value
-  const v1 = new Animated.Value(0);
-  const v2 = new Animated.Value(0);
+    // Value
+    const v1 = new Animated.Value(0);
+    const v2 = new Animated.Value(0);
 
-  v1.setValue(0.1);
+    v1.setValue(0.1);
 
-  v1.addListener(e => {
-    const n: number = e.value;
-  });
+    v1.addListener(e => {
+        const n: number = e.value;
+    });
 
-  const v200 = v1.interpolate({
-    inputRange: [0, 1],
-    outputRange: [0, 200],
-  });
+    const v200 = v1.interpolate({
+        inputRange: [0, 1],
+        outputRange: [0, 200],
+    });
 
-  // ValueXY
-  const position = new Animated.ValueXY({ x: 0, y: 0 });
+    // ValueXY
+    const position = new Animated.ValueXY({ x: 0, y: 0 });
 
-  // Animation functions
-  const spring1 = Animated.spring(v1, {
-    toValue: 0.5,
-    tension: 10,
-  });
+    // Animation functions
+    const spring1 = Animated.spring(v1, {
+        toValue: 0.5,
+        tension: 10,
+    });
 
-  const springXY =  Animated.spring(position, {
-    toValue: {
-      x: 1,
-      y: 2,
-    }
-  });
+    const springXY = Animated.spring(position, {
+        toValue: {
+            x: 1,
+            y: 2,
+        },
+    });
 
-  spring1.start();
-  spring1.stop();
+    spring1.start();
+    spring1.stop();
 
-  Animated.parallel([
-    Animated.spring(v1, { toValue: 1 }),
-    Animated.spring(v2, { toValue: 1 }),
-  ], {
-    stopTogether: true,
-  });
+    Animated.parallel([Animated.spring(v1, { toValue: 1 }), Animated.spring(v2, { toValue: 1 })], {
+        stopTogether: true,
+    });
 
-  Animated.decay(v1, {
-    velocity: 2,
-  });
+    Animated.decay(v1, {
+        velocity: 2,
+    });
 
-  Animated.timing(v1, {
-    toValue: 1,
-    duration: 100,
-    delay: 100,
-    easing: v => v,
-  });
+    Animated.timing(v1, {
+        toValue: 1,
+        duration: 100,
+        delay: 100,
+        easing: v => v,
+    });
 
-  Animated.add(v1, v2);
-  Animated.divide(v1, v2);
-  Animated.multiply(v1, v2);
-  Animated.modulo(v1, 2);
+    Animated.add(v1, v2);
+    Animated.divide(v1, v2);
+    Animated.multiply(v1, v2);
+    Animated.modulo(v1, 2);
 
-  Animated.delay(100);
+    Animated.delay(100);
 
-  Animated.sequence([
-    spring1,
-    springXY,
-  ]);
+    Animated.sequence([spring1, springXY]);
 
-  Animated.stagger(100, [
-    spring1,
-    springXY,
-  ]);
+    Animated.stagger(100, [spring1, springXY]);
 
-  return (
-    <View>
-      <Animated.View
-        style={[
-          position.getLayout(),
-          {
-            opacity: v1,
-          }]}>
-      </Animated.View>
+    return (
+        <View>
+            <Animated.View
+                style={[
+                    position.getLayout(),
+                    {
+                        opacity: v1,
+                    },
+                ]}
+            />
 
-      <Animated.Image
-        style={position.getTranslateTransform()}
-        >
-      </Animated.Image>
-    </View>
-  );
+            <Animated.Image style={position.getTranslateTransform()} />
+        </View>
+    );
 }
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 85c798bee6..666ad12aca 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -11,7 +11,7 @@ The content of index.io.js could be something like
 For a list of complete Typescript examples: check https://github.com/bgrieder/RNTSExplorer
 */
 
-import * as React from 'react'
+import * as React from "react";
 import {
     Alert,
     AppState,
@@ -34,6 +34,7 @@ import {
     ViewPagerAndroid,
     FlatList,
     FlatListProperties,
+    ScaledSize,
     SectionList,
     SectionListProperties,
     findNodeHandle,
@@ -43,15 +44,15 @@ import {
     TabBarIOS,
     NativeModules,
     MaskedView,
-} from 'react-native';
+} from "react-native";
 
-declare module 'react-native' {
+declare module "react-native" {
     interface NativeTypedModule {
         someFunction(): void;
         someProperty: string;
     }
     interface NativeModulesStatic {
-        NativeTypedModule: NativeTypedModule
+        NativeTypedModule: NativeTypedModule;
     }
 }
 
@@ -60,17 +61,19 @@ NativeModules.NativeUntypedModule;
 NativeModules.NativeTypedModule.someFunction();
 NativeModules.NativeTypedModule.someProperty = "";
 
-function testDimensions() {
-  const {
-    width,
-    height,
-    scale,
-    fontScale,
-  } = Dimensions.get(1 === 1 ? "window" : "screen");
+function dimensionsListener(dimensions: { window: ScaledSize, screen: ScaledSize }) {
+    console.log("window dimensions: ", dimensions.window);
+    console.log("screen dimensions: ", dimensions.screen);
 }
 
-BackAndroid.addEventListener("hardwareBackPress", () => {
-});
+function testDimensions() {
+    const { width, height, scale, fontScale } = Dimensions.get(1 === 1 ? "window" : "screen");
+
+    Dimensions.addEventListener('change', dimensionsListener);
+    Dimensions.removeEventListener('change', dimensionsListener);
+}
+
+BackAndroid.addEventListener("hardwareBackPress", () => {});
 
 interface LocalStyles {
     container: ViewStyle;
@@ -78,80 +81,69 @@ interface LocalStyles {
     instructions: TextStyle;
 }
 
-const styles = StyleSheet.create<LocalStyles>(
-    {
-        container:    {
-            flex:            1,
-            justifyContent:  'center',
-            alignItems:      'center',
-            backgroundColor: '#F5FCFF',
-        },
-        welcome:   {
-            fontSize:  20,
-            textAlign: 'center',
-            margin:    10,
-        },
-        instructions: {
-            textAlign:    'center',
-            color:        '#333333',
-            marginBottom: 5,
-        },
-    }
-)
+const styles = StyleSheet.create<LocalStyles>({
+    container: {
+        flex: 1,
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: "#F5FCFF",
+    },
+    welcome: {
+        fontSize: 20,
+        textAlign: "center",
+        margin: 10,
+    },
+    instructions: {
+        textAlign: "center",
+        color: "#333333",
+        marginBottom: 5,
+    },
+});
 
 //alternative declaration of styles (inline typings)
-const stylesAlt = StyleSheet.create(
-    {
-        container: {
-            flex: 1,
-            justifyContent: 'center',
-            alignItems: 'center',
-            backgroundColor: '#F5FCFF',
-        },
-        welcome: {
-            fontSize: 20,
-            textAlign: 'center',
-            margin: 10,
-        },
-        instructions: {
-            textAlign: 'center',
-            color: '#333333',
-            marginBottom: 5,
-        }
-    }
-);
+const stylesAlt = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: "#F5FCFF",
+    },
+    welcome: {
+        fontSize: 20,
+        textAlign: "center",
+        margin: 10,
+    },
+    instructions: {
+        textAlign: "center",
+        color: "#333333",
+        marginBottom: 5,
+    },
+});
 
-const welcomeFontSize = StyleSheet.flatten(styles.welcome).fontSize
+const welcomeFontSize = StyleSheet.flatten(styles.welcome).fontSize;
 
 class CustomView extends React.Component {
-
     render() {
-        return (
-            <Text style={[StyleSheet.absoluteFill, {...StyleSheet.absoluteFillObject}]}>Custom View</Text>
-        );
+        return <Text style={[StyleSheet.absoluteFill, { ...StyleSheet.absoluteFillObject }]}>Custom View</Text>;
     }
-
 }
 
 class Welcome extends React.Component {
     refs: {
-        [key: string]: any
-        rootView: View
-        customView: CustomView
-    }
+        [key: string]: any;
+        rootView: View;
+        customView: CustomView;
+    };
 
     testNativeMethods() {
         // this.setNativeProps({});
 
         const { rootView } = this.refs;
 
-        rootView.measure((x: number, y: number, width: number, height: number) => {
-        });
-
+        rootView.measure((x: number, y: number, width: number, height: number) => {});
     }
 
     testFindNodeHandle() {
-
         const { rootView, customView } = this.refs;
 
         const nativeComponentHandle = findNodeHandle(rootView);
@@ -159,25 +151,20 @@ class Welcome extends React.Component {
         const customComponentHandle = findNodeHandle(customView);
 
         const fromHandle = findNodeHandle(customComponentHandle);
-
     }
 
     render() {
         return (
             <View ref="rootView" style={[[styles.container], undefined, null, false]}>
-                <Text style={styles.welcome}>
-                    Welcome to React Native
-                </Text>
+                <Text style={styles.welcome}>Welcome to React Native</Text>
+                <Text style={styles.instructions}>To get started, edit index.ios.js</Text>
                 <Text style={styles.instructions}>
-                    To get started, edit index.ios.js
-                </Text>
-                <Text style={styles.instructions}>
-                    Press Cmd+R to reload,{'\n'}
+                    Press Cmd+R to reload,{"\n"}
                     Cmd+D or shake for dev menu
                 </Text>
                 <CustomView ref="customView" />
             </View>
-        )
+        );
     }
 }
 
@@ -186,17 +173,17 @@ export default Welcome;
 // App State
 
 function appStateListener(state: string) {
-    console.log('New state: ' + state);
+    console.log("New state: " + state);
 }
 
 function appStateTest() {
-    console.log('Current state: ' + AppState.currentState);
-    AppState.addEventListener('change', appStateListener);
+    console.log("Current state: " + AppState.currentState);
+    AppState.addEventListener("change", appStateListener);
 }
 
 function appStateIOSTest() {
-    console.log('Current state: ' + AppStateIOS.currentState);
-    AppStateIOS.addEventListener('change', appStateListener);
+    console.log("Current state: " + AppStateIOS.currentState);
+    AppStateIOS.addEventListener("change", appStateListener);
 }
 
 // ViewPagerAndroid
@@ -204,27 +191,28 @@ function appStateIOSTest() {
 export class ViewPagerAndroidTest {
     render() {
         return (
-            <ViewPagerAndroid style={{height: 56}}
+            <ViewPagerAndroid
+                style={{ height: 56 }}
                 initialPage={0}
-                keyboardDismissMode={'on-drag'}
-                onPageScroll={(e) => {
+                keyboardDismissMode={"on-drag"}
+                onPageScroll={e => {
                     console.log(`position: ${e.nativeEvent.position}`);
                     console.log(`offset: ${e.nativeEvent.offset}`);
                 }}
-                onPageSelected={(e) => {
-                    console.log(`position: ${e.nativeEvent.position}`)
+                onPageSelected={e => {
+                    console.log(`position: ${e.nativeEvent.position}`);
                 }}
-                />
+            />
         );
     }
 }
 
-const profiledJSONParse = Systrace.measure('JSON', 'parse', JSON.parse)
-profiledJSONParse('[]')
+const profiledJSONParse = Systrace.measure("JSON", "parse", JSON.parse);
+profiledJSONParse("[]");
 
 InteractionManager.runAfterInteractions(() => {
     // ...
-}).then(() => 'done')
+}).then(() => "done");
 
 export class FlatListTest extends React.Component<FlatListProperties<number>, {}> {
     _renderItem = (rowData: any) => {
@@ -233,9 +221,9 @@ export class FlatListTest extends React.Component<FlatListProperties<number>, {}
                 <Text> {rowData.item} </Text>
             </View>
         );
-      }
+    };
 
-    _renderSeparator= () => <View style={{height: 1, width: '100%', backgroundColor: 'gray'}} />
+    _renderSeparator = () => <View style={{ height: 1, width: "100%", backgroundColor: "gray" }} />;
 
     render() {
         return (
@@ -250,20 +238,35 @@ export class FlatListTest extends React.Component<FlatListProperties<number>, {}
 
 export class SectionListTest extends React.Component<SectionListProperties<string>, {}> {
     render() {
-        const sections = [{
-            title: 'Section 1',
-            data: ['A', 'B', 'C', 'D', 'E'],
-        }, {
-            title: 'Section 2',
-            data: ['A2', 'B2', 'C2', 'D2', 'E2'],
-            renderItem: (info: { item: string }) => <View><Text>{info.item}</Text></View>
-        }];
+        const sections = [
+            {
+                title: "Section 1",
+                data: ["A", "B", "C", "D", "E"],
+            },
+            {
+                title: "Section 2",
+                data: ["A2", "B2", "C2", "D2", "E2"],
+                renderItem: (info: { item: string }) => (
+                    <View>
+                        <Text>{info.item}</Text>
+                    </View>
+                ),
+            },
+        ];
 
         return (
             <SectionList
                 sections={sections}
-                renderSectionHeader={({section}) => <View><Text>{section.title}</Text></View>}
-                renderItem={(info: { item: string }) => <View><Text>{info.item}</Text></View>}
+                renderSectionHeader={({ section }) => (
+                    <View>
+                        <Text>{section.title}</Text>
+                    </View>
+                )}
+                renderItem={(info: { item: string }) => (
+                    <View>
+                        <Text>{info.item}</Text>
+                    </View>
+                )}
             />
         );
     }
@@ -271,43 +274,39 @@ export class SectionListTest extends React.Component<SectionListProperties<strin
 
 export class CapsLockComponent extends React.Component<TextProperties> {
     render() {
-        const content = (this.props.children || "") as string
-        return (
-            <Text {...this.props} >
-                {content.toUpperCase()}
-            </Text>
-        )
+        const content = (this.props.children || "") as string;
+        return <Text {...this.props}>{content.toUpperCase()}</Text>;
     }
 }
 
-class ScrollerListComponentTest extends React.Component<{}, { dataSource: ListViewDataSource}> {
+class ScrollerListComponentTest extends React.Component<{}, { dataSource: ListViewDataSource }> {
     render() {
         const scrollViewStyle1 = StyleSheet.create({
             scrollView: {
-                backgroundColor: 'red',
+                backgroundColor: "red",
             },
         });
         const scrollViewStyle2 = {
-            flex: 1
+            flex: 1,
         };
         return (
-            <ListView dataSource={this.state.dataSource}
-                renderScrollComponent={(props) => {
+            <ListView
+                dataSource={this.state.dataSource}
+                renderScrollComponent={props => {
                     if (props.scrollEnabled) {
-                        throw new Error("Expected scroll to be enabled.")
+                        throw new Error("Expected scroll to be enabled.");
                     }
 
-                    return <ScrollView {...props} style={[scrollViewStyle1.scrollView, scrollViewStyle2]}/>
+                    return <ScrollView {...props} style={[scrollViewStyle1.scrollView, scrollViewStyle2]} />;
                 }}
                 renderRow={({ type, data }, _, row) => {
-                    return <Text>Filler</Text>
-                }
-            } />
-        )
+                    return <Text>Filler</Text>;
+                }}
+            />
+        );
     }
 }
 
-
 class TabBarTest extends React.Component {
     render() {
         return (
@@ -315,20 +314,21 @@ class TabBarTest extends React.Component {
                 barTintColor="darkslateblue"
                 itemPositioning="center"
                 tintColor="white"
-                translucent={ true }
+                translucent={true}
                 unselectedTintColor="black"
-                unselectedItemTintColor="red">
+                unselectedItemTintColor="red"
+            >
                 <TabBarIOS.Item
-                    badge={ 0 }
+                    badge={0}
                     badgeColor="red"
-                    icon={{uri: undefined}}
-                    selected={ true }
+                    icon={{ uri: undefined }}
+                    selected={true}
                     onPress={() => {}}
-                    renderAsOriginal={ true }
-                    selectedIcon={ undefined }
+                    renderAsOriginal={true}
+                    selectedIcon={undefined}
                     systemIcon="history"
-                    title="Item 1">
-                </TabBarIOS.Item>
+                    title="Item 1"
+                />
             </TabBarIOS>
         );
     }
@@ -337,38 +337,32 @@ class TabBarTest extends React.Component {
 class AlertTest extends React.Component {
     showAlert() {
         Alert.alert(
-            'Title',
-            'Message',
+            "Title",
+            "Message",
             [
-                { text: 'First button', onPress: () => {} },
-                { text: 'Second button', onPress: () => {} },
-                { text: 'Third button', onPress: () => {} }
+                { text: "First button", onPress: () => {} },
+                { text: "Second button", onPress: () => {} },
+                { text: "Third button", onPress: () => {} },
             ],
             {
                 cancelable: false,
-                onDismiss: () => {}
+                onDismiss: () => {},
             }
-        )
+        );
     }
 
     render() {
-        return (
-            <Button title='Press me' onPress={this.showAlert}/>
-        );
+        return <Button title="Press me" onPress={this.showAlert} />;
     }
 }
 
 class MaskedViewTest extends React.Component {
     render() {
         return (
-            <MaskedView
-                maskElement={
-                    <View />
-                }
-            >
+            <MaskedView maskElement={<View />}>
                 <View />
             </MaskedView>
-        )
+        );
     }
 }
 
@@ -378,11 +372,11 @@ const dataSourceAssetCallback1: DataSourceAssetCallback = {
     sectionHeaderHasChanged: (h1, h2) => true,
     getRowData: (dataBlob, sectionID, rowID) => (sectionID as number) + (rowID as number),
     getSectionHeaderData: (dataBlob, sectionID) => sectionID as string,
-}
+};
 
-const dataSourceAssetCallback2: DataSourceAssetCallback = {}
+const dataSourceAssetCallback2: DataSourceAssetCallback = {};
 
 // DeviceEventEmitterStatic
 const deviceEventEmitterStatic: DeviceEventEmitterStatic = null;
-deviceEventEmitterStatic.addListener('keyboardWillShow', (data) => true);
-deviceEventEmitterStatic.addListener('keyboardWillShow', (data) => true, {});
+deviceEventEmitterStatic.addListener("keyboardWillShow", data => true);
+deviceEventEmitterStatic.addListener("keyboardWillShow", data => true, {});
diff --git a/types/react-native/test/init-example.tsx b/types/react-native/test/init-example.tsx
index bada7e9c05..fc0d66e3fb 100644
--- a/types/react-native/test/init-example.tsx
+++ b/types/react-native/test/init-example.tsx
@@ -1,45 +1,36 @@
-import * as React from 'react';
-import {
-  AppRegistry,
-  StyleSheet,
-  Text,
-  View
-} from 'react-native';
+import * as React from "react";
+import { AppRegistry, StyleSheet, Text, View } from "react-native";
 
 export default class AwesomeProject extends React.Component {
-  render() {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.welcome}>
-          Welcome to React Native!
-        </Text>
-        <Text style={styles.instructions}>
-          To get started, edit index.ios.js
-        </Text>
-        <Text style={styles.instructions}>
-          Press Cmd+R to reload,{'\n'}
-          Cmd+D or shake for dev menu
-        </Text>
-      </View>
-    );
-  }
+    render() {
+        return (
+            <View style={styles.container}>
+                <Text style={styles.welcome}>Welcome to React Native!</Text>
+                <Text style={styles.instructions}>To get started, edit index.ios.js</Text>
+                <Text style={styles.instructions}>
+                    Press Cmd+R to reload,{"\n"}
+                    Cmd+D or shake for dev menu
+                </Text>
+            </View>
+        );
+    }
 }
 
 const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
+    container: {
+        flex: 1,
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: "#F5FCFF",
+    },
+    welcome: {
+        fontSize: 20,
+        textAlign: "center",
+        margin: 10,
+    },
+    instructions: {
+        textAlign: "center",
+        color: "#333333",
+        marginBottom: 5,
+    },
 });
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 43e8c6054d..3418004b60 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -9,6 +9,8 @@
 //                 phanalpha <https://github.com/phanalpha>
 //                 charlesfamu <https://github.com/charlesfamu>
 //                 Tim Wang <https://github.com/timwangdev>
+//                 Qibang Sun <https://github.com/bang88>
+//                 Sergei Butko: <https://github.com/svbutko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -32,7 +34,7 @@ import {
 
 // @todo when we split types into common, native and web,
 // we can properly change Animated.Value to its real value
-type AnimatedValue = any;
+export type AnimatedValue = any;
 
 export type HeaderMode = 'float' | 'screen' | 'none';
 
@@ -67,7 +69,7 @@ export interface NavigationState {
    * Index refers to the active child route in the routes array.
    */
   index: number;
-  routes: Array<any>;
+  routes: any[];
 }
 
 export type NavigationRoute<Params> = NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
@@ -157,7 +159,7 @@ export interface NavigationScreenDetails<T> {
 }
 
 export interface NavigationScreenOptions {
-  title?: string,
+  title?: string;
 }
 
 export interface NavigationScreenConfigProps {
@@ -189,7 +191,7 @@ export interface NavigationNavigator<T, State, Action, Options> extends React.Co
 }
 
 export interface NavigationParams {
-  [key: string]: any,
+  [key: string]: any;
 }
 
 export interface NavigationNavigateActionPayload {
@@ -235,7 +237,7 @@ export interface NavigationInitAction extends NavigationInitActionPayload {
 export interface NavigationResetActionPayload {
   index: number;
   key?: string | null;
-  actions: Array<NavigationNavigateAction>;
+  actions: NavigationNavigateAction[];
 }
 
 export interface NavigationResetAction extends NavigationResetActionPayload {
@@ -272,6 +274,7 @@ export type NavigationStackScreenOptions = NavigationScreenOptions & {
   headerRight?: React.ReactElement<any>;
   headerStyle?: StyleProp<ViewStyle>;
   gesturesEnabled?: boolean;
+  gestureResponseDistance?: { vertical?: number; horizontal?: number };
 };
 
 export interface NavigationStackRouterConfig {
@@ -319,7 +322,7 @@ export interface NavigationTabRouterConfig {
   initialRouteName?: string;
   paths?: NavigationPathsConfig;
   navigationOptions?: NavigationScreenConfig<NavigationTabScreenOptions>;
-  order?: Array<string>; // todo: type these as the real route names rather than 'string'
+  order?: string[]; // todo: type these as the real route names rather than 'string'
 
   // Does the back button cause the router to switch to the initial tab
   backBehavior?: 'none' | 'initialRoute'; // defaults `initialRoute`
@@ -347,7 +350,8 @@ export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
       any
     > | null));
   drawerLabel?:
-    React.ReactElement<any>
+    string
+    | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
       any
     > | null));
@@ -422,7 +426,7 @@ export interface NavigationTransitionProps {
   progress: AnimatedValue;
 
   // All the scenes of the transitioner.
-  scenes: Array<NavigationScene>;
+  scenes: NavigationScene[];
 
   // The active scene, corresponding to the route at
   // `navigation.state.routes[navigation.state.index]`. When rendering
@@ -486,12 +490,10 @@ export interface LayoutEvent {
  * END FLOW TYPEDEFINITION.JS PORT
  */
 
-
 /**
  * BEGIN MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
  */
 
-
 // From navigators/NavigatorTypes.js
 export type NavigatorType =
 | 'react-navigation/STACK'
@@ -502,7 +504,7 @@ export type NavigatorType =
 export function addNavigationHelpers<S>(navigation: NavigationProp<S, NavigationAction>): NavigationScreenProp<S, NavigationAction>;
 
 // From createNavigationContainer.js
-interface NavigationContainerProps {
+export interface NavigationContainerProps {
   uriPrefix?: string | RegExp;
   onNavigationStateChange?: (
     prevNavigationState: NavigationState,
@@ -522,11 +524,11 @@ export interface NavigationContainer extends React.ComponentClass<
 }
 
 export interface StackNavigatorConfig extends NavigationStackViewConfig, NavigationStackRouterConfig {
-  containerOptions?: any,
+  containerOptions?: any;
 }
 
 // Return createNavigationContainer
-export function StackNavigator<T>(
+export function StackNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   stackConfig?: StackNavigatorConfig,
 ): NavigationContainer;
@@ -534,7 +536,6 @@ export function StackNavigator<T>(
 // DrawerItems
 export const DrawerItems: React.ComponentClass<any>;
 
-
 /**
  * Drawer Navigator
  */
@@ -557,7 +558,7 @@ export interface DrawerNavigatorConfig extends NavigationTabRouterConfig, Drawer
   };
 }
 
-export function DrawerNavigator<T>(
+export function DrawerNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   drawerConfig?: DrawerNavigatorConfig,
 ): NavigationContainer;
@@ -572,6 +573,7 @@ export interface TabViewConfig {
   tabBarPosition?: 'top' | 'bottom';
   tabBarOptions?: {
     activeTintColor?: string,
+    allowFontScaling?: boolean,
     activeBackgroundColor?: string,
     inactiveTintColor?: string,
     inactiveBackgroundColor?: string,
@@ -594,10 +596,12 @@ export interface TabViewConfig {
 }
 
 // From navigators/TabNavigator.js
-export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig { }
+export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig {
+  initialLayout?: { height: number, width: number };
+}
 
 // From navigators/TabNavigator.js
-export function TabNavigator<T>(
+export function TabNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   drawConfig?: TabNavigatorConfig,
 ): NavigationContainer;
@@ -609,18 +613,18 @@ export const TabBarBottom: React.ComponentClass<any>;
  * NavigationActions
  */
 export namespace NavigationActions {
-  export function init(options?: NavigationInitActionPayload): NavigationInitAction;
-  export function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
-  export function reset(options: NavigationResetActionPayload): NavigationResetAction;
-  export function back(options?: NavigationBackActionPayload): NavigationBackAction;
-  export function setParams(options: NavigationSetParamsActionPayload): NavigationSetParamsAction;
+  function init(options?: NavigationInitActionPayload): NavigationInitAction;
+  function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
+  function reset(options: NavigationResetActionPayload): NavigationResetAction;
+  function back(options?: NavigationBackActionPayload): NavigationBackAction;
+  function setParams(options: NavigationSetParamsActionPayload): NavigationSetParamsAction;
 }
 
 /**
  * Transitioner
  * @desc From react-navigation/src/views/Transitioner.js
  */
-interface TransitionerProps {
+export interface TransitionerProps {
   configureTransition: (
     transitionProps: NavigationTransitionProps,
     prevTransitionProps?: NavigationTransitionProps
@@ -635,11 +639,11 @@ interface TransitionerProps {
   style?: StyleProp<ViewStyle>;
 }
 
-interface TransitionerState {
+export interface TransitionerState {
   layout: NavigationLayout;
   position: Animated.Value;
   progress: Animated.Value;
-  scenes: Array<NavigationScene>;
+  scenes: NavigationScene[];
 }
 
 export class Transitioner extends React.Component<
@@ -647,42 +651,37 @@ export class Transitioner extends React.Component<
   TransitionerState
 > { }
 
-
 /**
  * Tab Router
  *
  * @desc from react-navigation/src/routers/TabRouter.js
- * @param routeConfigs
- * @param config
  */
 export function TabRouter(
   routeConfigs: NavigationRouteConfigMap,
   config: NavigationTabRouterConfig
-): NavigationRouter<any, any, any>
+): NavigationRouter<any, any, any>;
 
 /**
  * Stack Router
  *
  * @desc from react-navigation/src/routers/StackRouter.js
- * @param routeConfigs
- * @param config
  */
 export function StackRouter(
   routeConfigs: NavigationRouteConfigMap,
   config: NavigationTabRouterConfig
-): NavigationRouter<any, any, any>
+): NavigationRouter<any, any, any>;
 
 /**
  * Create Navigator
  *
  * @see https://github.com/react-community/react-navigation/blob/master/src/navigators/createNavigator.js
  */
-export function createNavigator<C, S, A, NavigatorConfig, Options>(
+export function createNavigator<C, S, A, Options>(
   router: NavigationRouter<S, A, Options>,
   routeConfigs?: NavigationRouteConfigMap,
-  navigatorConfig?: NavigatorConfig,
+  navigatorConfig?: {} | null,
   navigatorType?: NavigatorType
-): (NavigationView: React.ComponentClass<C>) => NavigationNavigator<C, S, A, Options>
+): (NavigationView: React.ComponentClass<C>) => NavigationNavigator<C, S, A, Options>;
 
 /**
  * Create an HOC that injects the navigation and manages the navigation state
@@ -692,14 +691,13 @@ export function createNavigator<C, S, A, NavigatorConfig, Options>(
  *
  * @see https://github.com/react-community/react-navigation/blob/master/src/createNavigationContainer.js
  */
-export function createNavigationContainer<S, O>(
-  Component: NavigationNavigator<any, S, any, O>
-): React.Component<any, any>
+export function createNavigationContainer(
+  Component: NavigationNavigator<any, any, any, any>
+): React.Component<any, any>;
 /**
  * END MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
  */
 
-
 /**
  * BEGIN CUSTOM CONVENIENCE INTERFACES
  */
@@ -714,7 +712,6 @@ export interface NavigationScreenProps<Params> {
  * END CUSTOM CONVENIENCE INTERFACES
  */
 
-
 /*
  * Header
  */
@@ -732,3 +729,7 @@ export interface HeaderBackButtonProps {
 }
 
 export const HeaderBackButton: React.ComponentClass<HeaderBackButtonProps>;
+/**
+ * Header Component
+ */
+export const Header: React.ComponentClass<HeaderProps>;
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index ef29bac820..aca3f1bcf6 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -28,6 +28,7 @@ import {
     Transitioner,
     addNavigationHelpers,
     HeaderBackButton,
+    Header,
 } from 'react-navigation';
 
 // Constants
@@ -38,20 +39,17 @@ const viewStyle: ViewStyle = {
     backgroundColor: "white",
 };
 
+const ROUTE_NAME_START_SCREEN = "StartScreen";
+interface StartScreenNavigationParams {
+    id: number;
+    s: string;
+}
 
 /**
- * @class StartScreen @extends React.Component
  * @desc Simple screen component class with typed component props that should
  *     receive the navigation prop from the AppNavigator.
  */
-const ROUTE_NAME_START_SCREEN = "StartScreen";
-interface StartScreenNavigationParams {
-    id: number,
-    s: string,
-}
-
-interface StartScreenProps extends NavigationScreenProps<StartScreenNavigationParams> { }
-class StartScreen extends React.Component<StartScreenProps> {
+class StartScreen extends React.Component<NavigationScreenProps<StartScreenNavigationParams>> {
     render() {
         // Implicit type checks.
         const navigationStateParams: StartScreenNavigationParams = this.props.navigation.state.params;
@@ -64,28 +62,21 @@ class StartScreen extends React.Component<StartScreenProps> {
             </View>
         );
     }
-    private navigateToNextScreen = (): void => {
-        this.props.navigation.navigate(
-            ROUTE_NAME_NEXT_SCREEN,
-            {
-                id: this.props.navigation.state.params.id,
-                name: this.props.navigation.state.params.s,
-            } as NextScreenNavigationParams,
-        );
-
+    private readonly navigateToNextScreen = (): void => {
+        const params: NextScreenNavigationParams = {
+            id: this.props.navigation.state.params.id,
+            name: this.props.navigation.state.params.s,
+        };
+        this.props.navigation.navigate(ROUTE_NAME_NEXT_SCREEN, params);
     }
 }
 
-/**
- * @class NextScreen @extends React.Component
- */
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";
 interface NextScreenNavigationParams {
-    id: number,
-    name: string,
+    id: number;
+    name: string;
 }
-interface NextScreenProps extends NavigationScreenProps<NextScreenNavigationParams> { }
-class NextScreen extends React.Component<NextScreenProps> {
+class NextScreen extends React.Component<NavigationScreenProps<NextScreenNavigationParams>> {
     render() {
         // Implicit type checks.
         const navigationStateParams: NextScreenNavigationParams = this.props.navigation.state.params;
@@ -138,7 +129,6 @@ const Router = (props: any) => (
     />
 );
 
-
 /**
  * Tab navigator.
  */
@@ -156,6 +146,11 @@ const tabNavigatorConfig: TabNavigatorConfig = {
     tabBarOptions: { activeBackgroundColor: "blue" },
 };
 
+const tabNavigatorConfigWithInitialLayout: TabNavigatorConfig = {
+  ...tabNavigatorConfig,
+  initialLayout: { height: 0, width: 100 },
+};
+
 const BasicTabNavigator = TabNavigator(
     routeConfigMap,
     tabNavigatorConfig,
@@ -170,7 +165,6 @@ function renderBasicTabNavigator(): JSX.Element {
     );
 }
 
-
 /**
  * Stack navigator.
  */
@@ -199,14 +193,12 @@ function renderBasicStackNavigator(): JSX.Element {
     );
 }
 
-
+interface CustomTransitionerProps {
+    navigation: NavigationScreenProp<any, NavigationAction>;
+}
 /**
- * @class CustomTransitioner @extends React.Component
  * @desc Custom transitioner component. Follows react-navigation/src/views/CardStackTransitioner.js.
  */
-interface CustomTransitionerProps {
-    navigation: NavigationScreenProp<any, NavigationAction>
-}
 class CustomTransitioner extends React.Component<CustomTransitionerProps, null> {
     render() {
         return (
@@ -228,7 +220,7 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
         _transitionProps: NavigationTransitionProps,
         _prevTransitionProps: NavigationTransitionProps
     ) => {
-        return {}
+        return {};
     }
 }
 
@@ -257,12 +249,11 @@ function renderHeaderBackButton(schema: string): JSX.Element {
     }
 }
 
-
 const initAction: NavigationInitAction = NavigationActions.init({
     params: {
         foo: "bar"
     }
-})
+});
 
 const navigateAction: NavigationNavigateAction = NavigationActions.navigate({
     routeName: "FooScreen",
@@ -270,7 +261,7 @@ const navigateAction: NavigationNavigateAction = NavigationActions.navigate({
         foo: "bar"
     },
     action: NavigationActions.navigate({ routeName: "BarScreen" })
-})
+});
 
 const resetAction: NavigationResetAction = NavigationActions.reset({
     index: 0,
@@ -278,15 +269,15 @@ const resetAction: NavigationResetAction = NavigationActions.reset({
     actions: [
         NavigationActions.navigate({ routeName: "FooScreen" })
     ]
-})
+});
 
 const backAction: NavigationBackAction = NavigationActions.back({
     key: "foo"
-})
+});
 
 const setParamsAction: NavigationSetParamsAction = NavigationActions.setParams({
     key: "foo",
     params: {
         foo: "bar"
     }
-})
+});
diff --git a/types/react-navigation/tslint.json b/types/react-navigation/tslint.json
index bb8ee9cb60..3db14f85ea 100644
--- a/types/react-navigation/tslint.json
+++ b/types/react-navigation/tslint.json
@@ -1,23 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // Lowercase `object` is available in TypeScript 2.2 only.
-        "ban-types": false,
-        // Below are all TODO
-        "align": false,
-        "array-type": false,
-        "comment-format": false,
-        "jsdoc-format": false,
-        "no-misused-new": false,
-        "no-consecutive-blank-lines": false,
-        "no-empty-interface": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-var": false,
-        "prefer-declare-function": false,
-        "prefer-method-signature": false,
-        "semicolon": false,
-        "strict-export-declare-modifiers": false,
-        "no-unnecessary-generics": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-notification-system-redux/package.json b/types/react-notification-system-redux/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/react-notification-system-redux/package.json
+++ b/types/react-notification-system-redux/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-notification-system/tslint.json b/types/react-notification-system/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-notification-system/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-numeric-input/index.d.ts b/types/react-numeric-input/index.d.ts
new file mode 100644
index 0000000000..e6121f45e7
--- /dev/null
+++ b/types/react-numeric-input/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for react-numeric-input 2.2
+// Project: https://github.com/vlad-ignatov/react-numeric-input#readme
+// Definitions by: Heather Booker <https://github.com/heatherbooker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export = NumericInput;
+
+declare namespace NumericInput {
+    interface NumericInputProps extends React.Props<NumericInput> {
+        addLabelText?: string;
+        className?: string;
+        defaultValue?: number | string;
+        disabled?: boolean;
+        format?: ((s: string) => string);
+        max?: number | ((v: number) => number);
+        maxLength?: number;
+        min?: number | ((v: number) => number);
+        mobile?: boolean | 'auto' | ((this: NumericInput) => any); // TODO: fix `any`
+        noValidate?: boolean| string;
+        onBlur?: React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
+        onChange?: ((v: number, s: string, i: JSX.Element) => void);
+        onFocus?: React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
+        onInput?: ((...args: any[]) => void);
+        onInvalid?: ((err: string, v: number, s: string) => void);
+        onKeyDown?: React.KeyboardEventHandler<HTMLDivElement | HTMLInputElement>;
+        onSelect?: ((...args: any[]) => void);
+        onValid?: ((v: number, s: string) => void);
+        parse?: ((s: string) => number | string);
+        pattern?: string;
+        precision?: number | ((this: NumericInput) => void);
+        readOnly?: boolean;
+        required?: boolean;
+        size?: number | string;
+        snap?: boolean;
+        step?: number | object; // TODO: should be `number | <some function>`
+        strict?: boolean;
+        style?: { [key: string]: { [key: string]: string } } | boolean;
+        type?: string;
+        value?: number | string;
+    }
+}
+
+declare class NumericInput extends React.Component<NumericInput.NumericInputProps> {}
diff --git a/types/react-numeric-input/react-numeric-input-tests.tsx b/types/react-numeric-input/react-numeric-input-tests.tsx
new file mode 100644
index 0000000000..b3921c5e21
--- /dev/null
+++ b/types/react-numeric-input/react-numeric-input-tests.tsx
@@ -0,0 +1,8 @@
+import { Component } from 'react';
+import * as NumericInput from 'react-numeric-input';
+
+export class NumericInputTest extends Component {
+  render() {
+    return(<NumericInput />);
+  }
+}
diff --git a/types/react-numeric-input/tsconfig.json b/types/react-numeric-input/tsconfig.json
new file mode 100644
index 0000000000..65c483475e
--- /dev/null
+++ b/types/react-numeric-input/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "preserve",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-numeric-input-tests.tsx"
+    ]
+}
diff --git a/types/react-numeric-input/tslint.json b/types/react-numeric-input/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-numeric-input/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-onclickoutside/index.d.ts b/types/react-onclickoutside/index.d.ts
index b342e98529..ad61a418a0 100644
--- a/types/react-onclickoutside/index.d.ts
+++ b/types/react-onclickoutside/index.d.ts
@@ -26,7 +26,7 @@ export interface OnClickOutProps {
 export type ComponentConstructor<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
 
 export interface ClickOutComponentClass<P extends InjectedOnClickOutProps> extends React.ComponentClass<P> {
-    new (props?: P, context?: any): React.Component<P, React.ComponentState> & HandleClickOutside<any>;
+    new (props: P, context?: any): React.Component<P, React.ComponentState> & HandleClickOutside<any>;
 }
 
 export default function OnClickOut<P>(
diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index b6a6dbcbdb..431e336233 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for React OnSenui (react-onsenui) 2.1
+// Type definitions for React Onsen UI (react-onsenui) 2.8
 // Project: https://onsen.io/v2/docs/guide/react/
-// Definitions by: Ozytis <https://ozytis.fr>
+// Definitions by: Ozytis <https://ozytis.fr>, Salim <https://github.com/salim7>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -23,6 +23,25 @@ export interface AnimationOptions {
     timing?: string;
 }
 
+export interface PullHookChangeEvent {
+    state: "initial" | "preaction" | "action";
+}
+
+export type NavigatorAnimationTypes = "slide" | "lift" | "fade" | "none" | string;
+
+export interface PageTransitionOptions {
+    animation?: NavigatorAnimationTypes;
+    animationOptions?: AnimationOptions;
+    callback?: () => void;
+    data?: any;
+}
+
+export interface SwitchChangeEvent extends Event {
+    switch: HTMLElement;
+    value: boolean;
+    isInteractive: boolean;
+}
+
 /*** splitter ***/
 export class SplitterSide extends Component<{
     side?: "left" | "right",
@@ -33,13 +52,14 @@ export class SplitterSide extends Component<{
     onPreClose?(e?: Event): void,
     onModeChange?(e?: Event): void,
     onClose?(e?: Event): void,
-    isSwipeable?: boolean,
+    swipeable?: boolean,
     swipeTargetWidth?: number,
     width?: number,
     animation?: "overlay" | "default"
     animationOptions?: AnimationOptions,
     openThreshold?: number,
-    mode?: "collapse" | "split"
+    mode?: "collapse" | "split",
+    className?: string
 }, any> { }
 
 export class SplitterContent extends Component { }
@@ -48,7 +68,9 @@ export class Splitter extends Component { }
 
 /*** toolbar ***/
 
-export class Toolbar extends Component {}
+export class Toolbar extends Component<{
+    modifier?: string
+}, any> {}
 
 export class BottomToolbar extends Component<{
     modifier?: string
@@ -57,7 +79,7 @@ export class BottomToolbar extends Component<{
 export class ToolbarButton extends Component<{
     modifier?: string,
     disabled?: boolean,
-    onClick?(e?: Event): void
+    onClick?(e?: React.MouseEvent<HTMLElement>): void
 }, any> {}
 
 /*** icon ***/
@@ -71,7 +93,6 @@ export class Icon extends Component<{
 }, any> {}
 
 /*** page ***/
-
 export class Page extends Component<{
     contentStyle?: any,
     modifier?: string,
@@ -87,11 +108,15 @@ export class Page extends Component<{
 /*** Grid ***/
 export class Col extends Component<{
     verticalAlign?: "top" | "bottom" | "center",
-    width?: string
+    width?: string,
+    className?: string,
+    style?: React.CSSProperties,
 }, any> {}
 
 export class Row extends Component<{
     verticalAlign?: "top" | "bottom" | "center",
+    className?: string,
+    style?: React.CSSProperties,
 }, any> {}
 
 /*** Navigation ***/
@@ -101,20 +126,22 @@ export class BackButton extends Component<{
 }, any> {}
 
 export class Navigator extends Component<{
-    renderPage(route: any, navigator: Navigator): JSX.Element,
+    renderPage(route: any, navigator?: Navigator): JSX.Element,
     initialRouteStack?: string[],
     initialRoute?: any,
     onPrePush?(): void,
     onPostPush?(): void,
     onPrePop?(): void,
     onPostPop?(): void,
-    animation?: "slide" | "lift" | "fade" | "none" | string,
-    animationOptions?: AnimationOptions
+    animation?: NavigatorAnimationTypes,
+    animationOptions?: AnimationOptions,
 }, any> {
-    resetPage(route: any, options?: any): void;
-    resetPageStack(route: any, options?: any): void;
-    pushPage(route: any, options?: any): void;
-    popPage(options?: any): void;
+    pages: any[];
+    routes: any[];
+    resetPage(route: any, options?: PageTransitionOptions): Promise<HTMLElement>;
+    resetPageStack(route: any, options?: PageTransitionOptions): Promise<HTMLElement>;
+    pushPage(route: any, options?: PageTransitionOptions): Promise<HTMLElement>;
+    popPage(options?: PageTransitionOptions): Promise<HTMLElement>;
 }
 
 /*** Carousel ***/
@@ -196,6 +223,29 @@ export class Popover extends Component<{
     onPostHide?(): void,
 }, any> {}
 
+export class ActionSheet extends Component<{
+    onCancel?(): void,
+    isOpen?: boolean,
+    isCancelable?: boolean,
+    isDisabled?: boolean,
+    animation?: string,
+    modifier?: string
+    maskColor?: string,
+    animationOptions?: {},
+    title?: string
+    onPreShow?(): void,
+    onPostShow?(): void,
+    onPreHide?(): void,
+    onPostHide?(): void,
+    onDeviceBackButton?(): void
+}, any> {}
+
+export class ActionSheetButton extends Component<{
+    modifier?: string,
+    icon?: string,
+    onClick?(e?: React.MouseEvent<HTMLElement>): void
+}, any> {}
+
 export class ProgressBar extends Component<{
     modifier?: string,
     value?: number,
@@ -207,7 +257,7 @@ export class ProgressCircular extends Component<{
     modifier?: string,
     value?: number,
     secondaryValue?: boolean,
-    intermediate?: boolean,
+    indeterminate?: boolean,
 }, any> {}
 
 export class Ripple extends Component<{
@@ -222,20 +272,21 @@ export class Fab extends Component<{
     ripple?: boolean,
     position?: string,
     disabled?: boolean,
-    onClick?(): void,
+    onClick?(e?: React.MouseEvent<HTMLElement>): void,
 }, any> {}
 
 export class Button extends Component<{
     modifier?: string,
     disabled?: boolean,
     ripple?: boolean,
-    onClick?(e?: Event): void
+    className?: string,
+    onClick?(e?: React.MouseEvent<HTMLElement>): void
 }, any> {}
 
 export class Input extends Component<{
     modifier?: string,
     disabled?: boolean,
-    onChange?: React.ChangeEvent<any>,
+    onChange?: (e: React.ChangeEvent<any>) => void,
     value?: string,
     checked?: boolean,
     placeholder?: string,
@@ -243,6 +294,25 @@ export class Input extends Component<{
     inputId?: string,
     float?: boolean,
     name?: string,
+    className?: string
+}, any> {}
+
+export class Radio extends Component<{
+    modifier?: string,
+    disabled?: boolean,
+    onChange?(e: Event): void,
+    value?: string,
+    checked?: boolean,
+    inputId?: string
+}, any> {}
+
+export class Checkbox extends Component<{
+    modifier?: string,
+    disabled?: boolean,
+    onChange?(e: Event): void,
+    value?: string,
+    checked?: boolean,
+    inputId?: string
 }, any> {}
 
 export class Range extends Component<{
@@ -253,10 +323,11 @@ export class Range extends Component<{
 }, any> {}
 
 export class Switch extends Component<{
-    onChange?(e: Event): void,
+    onChange?(e: SwitchChangeEvent): void,
     checked?: boolean,
     disabled?: boolean,
-    inputId?: string
+    inputId?: string,
+    className?: string
 }, any> {}
 
 /**
@@ -297,10 +368,14 @@ export class List extends Component<{
     renderRow?(row: any, index?: number): JSX.Element | undefined,
     renderFooter?(): JSX.Element | undefined,
     renderHeader?(): JSX.Element | undefined,
+    className?: string,
+    style?: React.CSSProperties,
 }, any> {}
 
 export class ListHeader extends Component<{
     modifier?: string,
+    className?: string,
+    style?: React.CSSProperties,
 }, any> {}
 
 export class ListItem extends Component<{
@@ -309,6 +384,21 @@ export class ListItem extends Component<{
     tapBackgroundColor?: string,
     lockOnDrag?: boolean,
     onClick?: React.MouseEventHandler<any>,
+    className?: string,
+    style?: React.CSSProperties,
 }, any> {}
 
-export class Card extends Component { }
+export class Card extends Component<{
+    modifier?: string,
+}, any> {}
+
+/** Pull-to-refresh hook. */
+export class PullHook extends Component<{
+    onChange?(e: PullHookChangeEvent): void,
+    onLoad?(done: () => void): void,
+    onPull?(): void,
+    disabled?: boolean,
+    height?: number,
+    thresholdHeight?: number,
+    fixedContent?: boolean,
+}, any> {}
diff --git a/types/react-onsenui/react-onsenui-tests.tsx b/types/react-onsenui/react-onsenui-tests.tsx
index 33c3e7943c..9286469e2c 100644
--- a/types/react-onsenui/react-onsenui-tests.tsx
+++ b/types/react-onsenui/react-onsenui-tests.tsx
@@ -1,6 +1,9 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import { SplitterSide, Splitter, SplitterContent, Page } from "react-onsenui";
+import {
+    SplitterSide, Splitter, SplitterContent,
+    Page, Input, Button,
+} from "react-onsenui";
 
 class AppState {
     isOpen = false;
@@ -9,7 +12,7 @@ class AppState {
 interface AppProps {} // tslint:disable-line no-empty-interface
 
 export class App extends React.Component<AppProps, AppState> {
-    constructor(props?: AppProps) {
+    constructor(props: AppProps) {
         super(props);
         this.state = new AppState();
     }
@@ -18,22 +21,28 @@ export class App extends React.Component<AppProps, AppState> {
         this.setState({ isOpen: false });
     }
 
+    onChange(event: React.ChangeEvent<HTMLInputElement>) {}
+    onClick(event: React.MouseEvent<HTMLButtonElement>) {}
+
     render() {
         return (
             <Splitter>
                 <SplitterSide
+                    className='left'
                     side='left'
                     collapse={true}
                     isOpen={this.state.isOpen}
                     onClose={() => this.hide()}
-                    isSwipeable={true}>
+                    swipeable>
                     <Page>
                         Menu content
-					</Page>
+                    </Page>
                 </SplitterSide>
                 <SplitterContent>
                     <Page>
                         Test page
+                        <Input name='test' type='text' value='test' onChange={this.onChange} />
+                        <Button onClick={this.onClick} />
 					</Page>
                 </SplitterContent>
             </Splitter>
diff --git a/types/react-pointable/index.d.ts b/types/react-pointable/index.d.ts
index e2db8d2fb4..ac6eb2f2a2 100644
--- a/types/react-pointable/index.d.ts
+++ b/types/react-pointable/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-pointable 1.1
 // Project: https://github.com/MilllerTime/react-pointable
 // Definitions by: Stefan Fochler <https://github.com/istefo>
+//                 Dibyo Majumdar <https://github.com/mdibyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -8,10 +9,10 @@ import * as React from 'react';
 
 export type TouchAction = 'auto' | 'none' | 'pan-x' | 'pan-y' | 'manipulation';
 
-export interface PointableProps extends React.HTMLAttributes<HTMLElement> {
-    tagName?: keyof HTMLElementTagNameMap;
+export interface PointableProps extends React.HTMLAttributes<Element>, React.SVGAttributes<Element> {
+    tagName?: keyof ElementTagNameMap;
     touchAction?: TouchAction;
-    elementRef?(el: HTMLElement): void;
+    elementRef?(el: HTMLElement|SVGElement): void;
     onPointerMove?(evt: PointerEvent): void;
     onPointerDown?(evt: PointerEvent): void;
     onPointerUp?(evt: PointerEvent): void;
diff --git a/types/react-props-decorators/react-props-decorators-tests.ts b/types/react-props-decorators/react-props-decorators-tests.ts
index 0bc81826fd..ab6e970362 100644
--- a/types/react-props-decorators/react-props-decorators-tests.ts
+++ b/types/react-props-decorators/react-props-decorators-tests.ts
@@ -1,9 +1,10 @@
 import * as React from 'react';
+import * as PropTypes from 'prop-types';
 import { propTypes, defaultProps } from 'react-props-decorators';
 
 @propTypes({
-    foo: React.PropTypes.string,
-    bar: React.PropTypes.number
+    foo: PropTypes.string,
+    bar: PropTypes.number
 })
 @defaultProps({
     foo: "defaultString",
diff --git a/types/react-props-decorators/tslint.json b/types/react-props-decorators/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-props-decorators/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-recaptcha/index.d.ts b/types/react-recaptcha/index.d.ts
index e902c11040..59d974a5cf 100644
--- a/types/react-recaptcha/index.d.ts
+++ b/types/react-recaptcha/index.d.ts
@@ -1,30 +1,37 @@
-// Type definitions for react-recaptcha 2.2
+// Type definitions for react-recaptcha 2.3
 // Project: https://github.com/appleboy/react-recaptcha
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
+//                 Zach <https://github.com/zzanol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import { Component } from "react";
+
 export = Recaptcha;
 
-interface RecaptchaProps {
-    className?: string;
-    elementID?: string;
-    expiredCallback?(): any;
-    expiredCallbackName?: string;
-    onloadCallback?(): any;
-    onloadCallbackName?: string;
-    render?: string;
-    size?: string;
-    tabindex?: string;
-    theme?: "dark" | "light";
-    type?: string;
-    verifyCallback?(response: string): any;
-    verifyCallbackName?: string;
-    sitekey?: string;
+declare namespace Recaptcha {
+    interface RecaptchaProps {
+        className?: string;
+        elementID?: string;
+        expiredCallback?(): any;
+        expiredCallbackName?: string;
+        onloadCallback?(): any;
+        onloadCallbackName?: string;
+        render?: "onload" | "explicit";
+        size?: "normal" | "compact" | "invisible";
+        tabindex?: number | string;
+        theme?: "dark" | "light";
+        type?: "audio" | "image";
+        verifyCallback?(response: string): any;
+        verifyCallbackName?: string;
+        sitekey?: string;
+        badge?: "bottomright" | "bottomleft" | "inline";
+        hl?: string; // https://developers.google.com/recaptcha/docs/language
+    }
 }
 
-declare class Recaptcha extends Component<RecaptchaProps> {
+declare class Recaptcha extends Component<Recaptcha.RecaptchaProps> {
     static propTypes: any;
-    static defaultProps: RecaptchaProps;
+    static defaultProps: Recaptcha.RecaptchaProps;
+    reset(): void;
 }
diff --git a/types/react-recaptcha/react-recaptcha-tests.tsx b/types/react-recaptcha/react-recaptcha-tests.tsx
index 98f3972c00..f049fe6698 100644
--- a/types/react-recaptcha/react-recaptcha-tests.tsx
+++ b/types/react-recaptcha/react-recaptcha-tests.tsx
@@ -1,4 +1,4 @@
-import Recaptcha = require('react-recaptcha');
+import * as Recaptcha from "react-recaptcha";
 import * as ReactDOM from "react-dom";
 import * as React from "react";
 
diff --git a/types/react-redux-i18n/package.json b/types/react-redux-i18n/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/react-redux-i18n/package.json
+++ b/types/react-redux-i18n/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-redux-i18n/tslint.json b/types/react-redux-i18n/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-redux-i18n/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index 0f5b66903f..57378823b9 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -4,13 +4,13 @@
 //                 Artyom Stukans <https://github.com/artyomsv>
 //                 Mika Kuitunen <https://github.com/kulmajaba>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import { Component } from 'react';
 import { Action, ActionCreator, Reducer } from 'redux';
 
 export type iconType = 'success' | 'info' | 'warning' | 'error';
-export type positionType = 'top-left' | 'top-center' | 'top-right' | 'bottom-left' | 'bottom-ceter' | 'bottom-right';
+export type positionType = 'top-left' | 'top-center' | 'top-right' | 'bottom-left' | 'bottom-center' | 'bottom-right';
 export type toastType = 'success' | 'info' | 'warning' | 'light' | 'error' | 'confirm' | 'message';
 export type transitionInType = 'bounceIn' | 'bounceInDown' | 'fadeIn';
 export type transitionOutType = 'bounceOut' | 'bounceOutUp' | 'fadeOut';
@@ -19,7 +19,7 @@ interface BasicToastrOptions {
     attention?: boolean;
     className?: string;
     component?: Component;
-    icon?: Component;
+    icon?: JSX.Element;
     onCloseButtonClick?: () => void;
     onHideComplete?: () => void;
     onShowComplete?: () => void;
@@ -34,8 +34,8 @@ interface BasicToastrOptions {
 interface LightToastrOptions {
     attention?: boolean;
     className?: string;
-    component?: Component;
-    icon?: iconType | Component;
+    component?: JSX.Element;
+    icon?: iconType | JSX.Element;
     onCloseButtonClick?: () => void;
     onHideComplete?: () => void;
     onShowComplete?: () => void;
@@ -55,7 +55,7 @@ interface ConfirmToastrOptions {
 }
 
 interface ConfirmToastrCustomOptions {
-    component: Component;
+    component: JSX.Element;
 }
 
 export interface Toastr {
diff --git a/types/react-redux-toastr/package.json b/types/react-redux-toastr/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/react-redux-toastr/package.json
+++ b/types/react-redux-toastr/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-redux-toastr/react-redux-toastr-tests.ts b/types/react-redux-toastr/react-redux-toastr-tests.ts
index f675bf5c78..ac49d2dcdd 100644
--- a/types/react-redux-toastr/react-redux-toastr-tests.ts
+++ b/types/react-redux-toastr/react-redux-toastr-tests.ts
@@ -18,7 +18,7 @@ function test() {
     toastr.confirm("Test", { onOk: callback, onCancel: callback });
     toastr.error("Error", "Error message");
     toastr.info("Info", "Info test", { timeOut: 1000, removeOnHover: true, onShowComplete: callback });
-    toastr.success("Test", "Test message", { component: new React.Component() });
+    toastr.success("Test", "Test message", { component: new React.Component({}) });
 }
 
 test();
diff --git a/types/react-redux-toastr/tslint.json b/types/react-redux-toastr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-redux-toastr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 203ce7f791..2a015389da 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -7,9 +7,17 @@
 //                 Frank Tan <https://github.com/tansongyang>
 //                 Nicholas Boll <https://github.com/nicholasboll>
 //                 Dibyo Majumdar <https://github.com/mdibyo>
+//                 Prashant Deva <https://github.com/pdeva>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
-
+    
+// Known Issue:
+// There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes 
+// they are decorating. Due to this, if you are using @connect() decorator in your code,
+// you will see a bunch of errors from TypeScript. The current workaround is to use connect() as a function call on
+// a separate line instead of as a decorator. Discussed in this github issue:
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20796
+    
 import * as React from 'react';
 import * as Redux from 'redux';
 
@@ -70,8 +78,8 @@ export type InferableComponentEnhancer<TInjectedProps> =
 export interface Connect {
     (): InferableComponentEnhancer<DispatchProp<any>>;
 
-    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>
+    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>
     ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp<any>, TOwnProps>;
 
     <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
@@ -79,13 +87,13 @@ export interface Connect {
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
 
-    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
 
-    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
+    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: null | undefined,
         mergeProps: MergeProps<TStateProps, undefined, TOwnProps, TMergedProps>,
     ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
@@ -102,38 +110,38 @@ export interface Connect {
         mergeProps: MergeProps<undefined, undefined, TOwnProps, TMergedProps>,
     ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
 
-    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
     ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
 
-    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
+    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: null | undefined,
         mergeProps: null | undefined,
-        options: Options<TStateProps, TOwnProps>
+        options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<DispatchProp<any> & TStateProps, TOwnProps>;
 
-    <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
-        options: Options<no_state, TOwnProps>
+        options: Options<{}, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
 
-    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
-        options: Options<TStateProps, TOwnProps>
+        options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
 
-    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-        options: Options<TStateProps, TOwnProps, TMergedProps>
+        options: Options<State, TStateProps, TOwnProps, TMergedProps>
     ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
 }
 
@@ -142,15 +150,15 @@ export interface Connect {
  */
 export declare const connect: Connect;
 
-interface MapStateToProps<TStateProps, TOwnProps> {
-    (state: any, ownProps: TOwnProps): TStateProps;
+interface MapStateToProps<TStateProps, TOwnProps, State> {
+    (state: State, ownProps: TOwnProps): TStateProps;
 }
 
-interface MapStateToPropsFactory<TStateProps, TOwnProps> {
-    (initialState: any, ownProps: TOwnProps): MapStateToProps<TStateProps, TOwnProps>;
+interface MapStateToPropsFactory<TStateProps, TOwnProps, State> {
+    (initialState: State, ownProps: TOwnProps): MapStateToProps<TStateProps, TOwnProps, State>;
 }
 
-type MapStateToPropsParam<TStateProps, TOwnProps> = MapStateToPropsFactory<TStateProps, TOwnProps> | MapStateToProps<TStateProps, TOwnProps> | null | undefined;
+type MapStateToPropsParam<TStateProps, TOwnProps, State> = MapStateToPropsFactory<TStateProps, TOwnProps, State> | MapStateToProps<TStateProps, TOwnProps, State> | null | undefined;
 
 interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
     (dispatch: Dispatch<any>, ownProps: TOwnProps): TDispatchProps;
@@ -169,7 +177,7 @@ interface MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> {
     (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TMergedProps;
 }
 
-interface Options<TStateProps = {}, TOwnProps = {}, TMergedProps = {}> extends ConnectOptions {
+interface Options<State = {}, TStateProps = {}, TOwnProps = {}, TMergedProps = {}> extends ConnectOptions {
     /**
      * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
      * preventing unnecessary updates, assuming that the component is a “pure� component
@@ -183,7 +191,7 @@ interface Options<TStateProps = {}, TOwnProps = {}, TMergedProps = {}> extends C
      * When pure, compares incoming store state to its previous value.
      * @default strictEqual
      */
-    areStatesEqual?: (nextState: any, prevState: any) => boolean;
+    areStatesEqual?: (nextState: State, prevState: State) => boolean;
 
     /**
      * When pure, compares incoming props to its previous value.
diff --git a/types/react-redux/package.json b/types/react-redux/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/react-redux/package.json
+++ b/types/react-redux/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index e726bf104f..393c4d09da 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -247,22 +247,26 @@ namespace MapStateAndDispatchAndMerge {
 }
 
 namespace MapStateAndOptions {
+    interface State { state: string; }
     interface OwnProps { foo: string }
     interface StateProps { bar: number }
     interface DispatchProps { dispatch: Dispatch<any> }
 
     class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
 
-    const mapStateToProps = () => ({
+    const mapStateToProps = (state: State) => ({
         bar: 1
     })
 
-    const Test = connect(
+    const areStatePropsEqual = (next: StateProps, current: StateProps) => true;
+
+    const Test = connect<StateProps, DispatchProps, OwnProps, State>(
         mapStateToProps,
         null,
         null,
         {
-            pure: true
+            pure: true,
+            areStatePropsEqual,
         }
     )(TestComponent)
 
@@ -316,26 +320,26 @@ interface ICounterDispatchProps {
     onIncrement: () => void
 }
 // with higher order functions
-connect<ICounterStateProps, ICounterDispatchProps>(
+connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
     () => mapStateToProps,
     () => mapDispatchToProps
 )(Counter);
 // with higher order functions using parameters
-connect<ICounterStateProps, ICounterDispatchProps, {}>(
+connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
     (initialState: CounterState, ownProps) => mapStateToProps,
     (dispatch: Dispatch<CounterState>, ownProps) => mapDispatchToProps
 )(Counter);
 // only first argument
-connect<ICounterStateProps>(
+connect<ICounterStateProps, {}, {}, CounterState>(
     () => mapStateToProps
 )(Counter);
 // wrap only one argument
-connect<ICounterStateProps, ICounterDispatchProps>(
+connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
     mapStateToProps,
     () => mapDispatchToProps
 )(Counter);
 // with extra arguments
-connect<ICounterStateProps, ICounterDispatchProps, {}, ICounterStateProps & ICounterDispatchProps>(
+connect<ICounterStateProps, ICounterDispatchProps, {}, ICounterStateProps & ICounterDispatchProps, CounterState>(
     () => mapStateToProps,
     () => mapDispatchToProps,
     (s: ICounterStateProps, d: ICounterDispatchProps) =>
@@ -652,7 +656,7 @@ namespace TestTOwnPropsInference {
     type PickedOwnProps = Pick<AllProps, "own">
     type PickedStateProps = Pick<AllProps, "state">
 
-    const mapStateToPropsForPicked: MapStateToProps<PickedStateProps, PickedOwnProps> = (state: any): PickedStateProps => {
+    const mapStateToPropsForPicked: MapStateToProps<PickedStateProps, PickedOwnProps, {}> = (state: any): PickedStateProps => {
         return { state: "string" }
     }
     const ConnectedWithPickedOwnProps = connect(mapStateToPropsForPicked)(AllPropsComponent);
@@ -878,8 +882,8 @@ namespace TestCreateProvider {
 
     interface AProps { a: number };
     const A = (props: AProps) => (<h1>A is {props.a}</h1>);
-    const A1 = connect<AProps>(state => state)(A);
-    const A2 = myStoreConnect<AProps>(state => state)(A);
+    const A1 = connect<AProps, {}, {}, State>(state => state)(A);
+    const A2 = myStoreConnect<AProps, {}, {}, State>(state => state)(A);
 
     const Combined = () => (
         <Provider store={store}>
diff --git a/types/react-redux/tslint.json b/types/react-redux/tslint.json
new file mode 100644
index 0000000000..5a8bb3dd4d
--- /dev/null
+++ b/types/react-redux/tslint.json
@@ -0,0 +1,81 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-object-spread": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-relay/classic.d.ts b/types/react-relay/classic.d.ts
new file mode 100644
index 0000000000..0db5308975
--- /dev/null
+++ b/types/react-relay/classic.d.ts
@@ -0,0 +1,221 @@
+import * as React from "react";
+import * as RelayRuntimeTypes from "relay-runtime";
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Maybe Fix
+// ~~~~~~~~~~~~~~~~~~~~~
+export type StoreReaderData = any;
+export type StoreReaderOptions = any;
+export type RelayStoreData = any;
+export interface RelayQuery {
+    Fragment: any;
+    Node: any;
+    Root: any;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Environment
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface FragmentResolver {
+    dispose(): void;
+    resolve(
+        fragment: RelayQuery["Fragment"],
+        dataIDs: RelayRuntimeTypes.DataID | RelayRuntimeTypes.DataID[]
+    ): StoreReaderData | StoreReaderData[] | undefined | null;
+}
+
+export interface RelayEnvironmentInterface {
+    forceFetch(
+        querySet: RelayRuntimeTypes.RelayQuerySet,
+        onReadyStateChange: RelayRuntimeTypes.ReadyStateChangeCallback
+    ): RelayRuntimeTypes.Abortable;
+    getFragmentResolver(fragment: RelayQuery["Fragment"], onNext: () => void): FragmentResolver;
+    getStoreData(): RelayStoreData;
+    primeCache(
+        querySet: RelayRuntimeTypes.RelayQuerySet,
+        onReadyStateChange: RelayRuntimeTypes.ReadyStateChangeCallback
+    ): RelayRuntimeTypes.Abortable;
+    read(
+        node: RelayQuery["Node"],
+        dataID: RelayRuntimeTypes.DataID,
+        options?: StoreReaderOptions
+    ): StoreReaderData | void;
+    readQuery(root: RelayQuery["Root"], options?: StoreReaderOptions): StoreReaderData[] | void;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// the rest is to match pre-existing types from before v1
+// ~~~~~~~~~~~~~~~~~~~~~
+export type ClientMutationID = string;
+
+/** Fragments are a hash of functions */
+export interface Fragments {
+    [query: string]: ((variables?: RelayVariables) => string);
+}
+
+export interface CreateContainerOpts {
+    initialVariables?: any;
+    fragments: Fragments;
+    prepareVariables?(prevVariables: RelayVariables): RelayVariables;
+}
+
+export interface RelayVariables {
+    [name: string]: any;
+}
+
+/** add static getFragment method to the component constructor */
+export interface RelayContainerClass<T> extends React.ComponentClass<T> {
+    getFragment: ((q: string, v?: RelayVariables) => string);
+}
+
+export interface RelayQueryRequestResolve {
+    response: any;
+}
+
+export type RelayMutationStatus =
+    | "UNCOMMITTED" // Transaction hasn't yet been sent to the server. Transaction can be committed or rolled back.
+    | "COMMIT_QUEUED" // Transaction was committed but another transaction with the same collision key is pending, so the transaction has been queued to send to the server.
+    | "COLLISION_COMMIT_FAILED" // Transaction was queued for commit but another transaction with the same collision key failed. All transactions in the collision queue,
+    // including this one, have been failed. Transaction can be recommitted or rolled back.
+    | "COMMITTING" // Transaction is waiting for the server to respond.
+    | "COMMIT_FAILED";
+
+export class RelayMutationTransaction {
+    applyOptimistic(): RelayMutationTransaction;
+    commit(): RelayMutationTransaction | null;
+    recommit(): void;
+    rollback(): void;
+    getError(): Error;
+    getStatus(): RelayMutationStatus;
+    getHash(): string;
+    getID(): ClientMutationID;
+}
+
+export interface RelayMutationRequest {
+    getQueryString(): string;
+    getVariables(): RelayVariables;
+    resolve(result: RelayQueryRequestResolve): any;
+    reject(errors: any): any;
+}
+
+export interface RelayQueryRequest {
+    resolve(result: RelayQueryRequestResolve): any;
+    reject(errors: any): any;
+    getQueryString(): string;
+    getVariables(): RelayVariables;
+    getID(): string;
+    getDebugName(): string;
+}
+
+export interface RelayNetworkLayer {
+    supports(...options: string[]): boolean;
+}
+
+export class DefaultNetworkLayer implements RelayNetworkLayer {
+    constructor(host: string, options?: any);
+    supports(...options: string[]): boolean;
+}
+
+export function createContainer<T>(
+    component: React.ComponentClass<T> | React.StatelessComponent<T>,
+    params?: CreateContainerOpts
+): RelayContainerClass<T>;
+export function injectNetworkLayer(networkLayer: RelayNetworkLayer): any;
+export function isContainer(component: React.ComponentClass<any>): boolean;
+export function QL(...args: any[]): string;
+
+export class Route {
+    constructor(params?: RelayVariables);
+}
+
+/**
+ * Relay Mutation class, where T are the props it takes and S is the returned payload from Relay.Store.update.
+ * S is typically dynamic as it depends on the data the app is currently using, but it's possible to always
+ * return some data in the payload using REQUIRED_CHILDREN which is where specifying S is the most useful.
+ */
+export class Mutation<T, S> {
+    props: T;
+
+    constructor(props: T);
+    static getFragment(q: string): string;
+}
+
+export interface Transaction {
+    getError(): Error;
+    Status(): number;
+}
+
+export interface StoreUpdateCallbacks<T> {
+    onFailure?(transaction: Transaction): any;
+    onSuccess?(response: T): any;
+}
+
+export interface Store {
+    commitUpdate(mutation: Mutation<any, any>, callbacks?: StoreUpdateCallbacks<any>): any;
+}
+
+export const Store: Store;
+
+export class RootContainer extends React.Component<RootContainerProps, any> {}
+
+export interface RootContainerProps extends React.Props<RootContainer> {
+    Component: RelayContainerClass<any>;
+    route: Route;
+    renderLoading?(): JSX.Element;
+    renderFetched?(data: any): JSX.Element;
+    renderFailure?(error: Error, retry: (...args: any[]) => any): JSX.Element;
+}
+
+export class Renderer extends React.Component<RendererProps, any> {}
+
+export interface RendererProps {
+    Container: RelayContainerClass<any>; // Relay container that defines fragments and the view to render.
+    forceFetch?: boolean; // Whether to send a server request regardless of data available on the client.
+    queryConfig: Route; // `QueryConfig` or `Relay.Route` that defines the query roots.
+    environment: Store; // An instance of `Relay.Environment` or any object that implements the `RelayEnvironment` interface.
+    render?: RenderCallback; //  Called to render when data requirements are being fulfilled.
+    onReadyStateChange?: OnReadyStateChange;
+}
+
+export interface RenderStateConfig {
+    props?: { [propName: string]: any };
+    done: boolean;
+    error?: Error;
+    retry?(): void;
+    stale: boolean;
+}
+export type RenderCallback = (renderState: RenderStateConfig) => any;
+
+export type ReadyStateEvent =
+    | "ABORT"
+    | "CACHE_RESTORED_REQUIRED"
+    | "CACHE_RESTORE_FAILED"
+    | "CACHE_RESTORE_START"
+    | "NETWORK_QUERY_ERROR"
+    | "NETWORK_QUERY_RECEIVED_ALL"
+    | "NETWORK_QUERY_RECEIVED_REQUIRED"
+    | "NETWORK_QUERY_START"
+    | "STORE_FOUND_ALL"
+    | "STORE_FOUND_REQUIRED";
+
+export type OnReadyStateChange = (
+    readyState: {
+        ready: boolean;
+        done: boolean;
+        stale: boolean;
+        error?: Error;
+        events: ReadyStateEvent[];
+        aborted: boolean;
+    }
+) => void;
+
+export interface RelayProp {
+    readonly route: { name: string }; // incomplete, also has params and queries
+    readonly variables: any;
+    readonly pendingVariables?: any;
+    setVariables(variables: any, onReadyStateChange?: OnReadyStateChange): void;
+    forceFetch(variables: any, onReadyStateChange?: OnReadyStateChange): void;
+    hasOptimisticUpdate(record: any): boolean;
+    getPendingTransactions(record: any): RelayMutationTransaction[];
+    commitUpdate(mutation: Mutation<any, any>, callbacks?: StoreUpdateCallbacks<any>): any;
+}
diff --git a/types/react-relay/compat.d.ts b/types/react-relay/compat.d.ts
new file mode 100644
index 0000000000..22585d03d0
--- /dev/null
+++ b/types/react-relay/compat.d.ts
@@ -0,0 +1,91 @@
+export {
+    QueryRenderer,
+    fetchQuery,
+    graphql,
+} from "./index";
+import {
+    ConnectionConfig,
+    RelayPaginationProp as RelayModernPaginationProp,
+    RelayRefetchProp as RelayModernRefetchProp
+} from "./index";
+import * as RelayRuntimeTypes from "relay-runtime";
+import { RelayEnvironmentInterface } from "./classic";
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Maybe Fix
+// ~~~~~~~~~~~~~~~~~~~~~
+export type ConcreteFragment = any;
+export type ConcreteBatch = any;
+export type ConcreteFragmentDefinition = object;
+export type ConcreteOperationDefinition = object;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Util
+// ~~~~~~~~~~~~~~~~~~~~~
+export function getFragment(q: string, v?: RelayRuntimeTypes.Variables): string;
+export interface ComponentWithFragment<T> extends React.ComponentClass<T> {
+    getFragment: typeof getFragment;
+}
+export interface StatelessWithFragment<T> extends React.StatelessComponent<T> {
+    getFragment: typeof getFragment;
+}
+export type ReactFragmentComponent<T> = ComponentWithFragment<T> | StatelessWithFragment<T>;
+export type ReactBaseComponent<T> = React.ComponentClass<T> | React.StatelessComponent<T>;
+export type RelayClassicEnvironment = RelayEnvironmentInterface;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayCompatTypes
+// ~~~~~~~~~~~~~~~~~~~~~
+export type CompatEnvironment = RelayRuntimeTypes.Environment | RelayClassicEnvironment;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayProps
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface RelayProp {
+    environment: CompatEnvironment;
+}
+
+export type RelayPaginationProp = RelayModernPaginationProp & RelayProp;
+export type RelayRefetchProp = RelayModernRefetchProp & RelayProp;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayCompatMutations
+// ~~~~~~~~~~~~~~~~~~~~~
+export function commitMutation(
+    environment: CompatEnvironment,
+    config: RelayRuntimeTypes.MutationConfig<any>
+): RelayRuntimeTypes.Disposable;
+export function applyOptimisticMutation(
+    environment: CompatEnvironment,
+    config: RelayRuntimeTypes.OptimisticMutationConfig
+): RelayRuntimeTypes.Disposable;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayCompatContainers
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface GeneratedNodeMap {
+    [key: string]: RelayRuntimeTypes.GraphQLTaggedNode;
+}
+
+export function createFragmentContainer<T>(
+    Component: ReactBaseComponent<T>,
+    fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap
+): ReactFragmentComponent<T>;
+
+export function createRefetchContainer<T>(
+    Component: ReactBaseComponent<T>,
+    fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
+    taggedNode: RelayRuntimeTypes.GraphQLTaggedNode
+): ReactFragmentComponent<T>;
+
+export function createPaginationContainer<T>(
+    Component: ReactBaseComponent<T>,
+    fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
+    connectionConfig: ConnectionConfig<T>
+): ReactFragmentComponent<T>;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// injectDefaultVariablesProvider
+// ~~~~~~~~~~~~~~~~~~~~~
+export type VariablesProvider = () => RelayRuntimeTypes.Variables;
+export function injectDefaultVariablesProvider(variablesProvider: VariablesProvider): void;
diff --git a/types/react-relay/index.d.ts b/types/react-relay/index.d.ts
index 4f9f49e5e7..04c173e9e2 100644
--- a/types/react-relay/index.d.ts
+++ b/types/react-relay/index.d.ts
@@ -1,160 +1,162 @@
-// Type definitions for react-relay 0.9.2
+// Type definitions for react-relay 1.3
 // Project: https://github.com/facebook/relay
 // Definitions by: Johannes Schickling <https://github.com/graphcool>
+//                 Matt Martin <https://github.com/voxmatt>
+//                 Eloy Durán <https://github.com/alloy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
-declare module "react-relay" {
-    import * as React from "react";
+export {
+    commitLocalUpdate,
+    commitRelayModernMutation as commitMutation,
+    fetchRelayModernQuery as fetchQuery,
+    requestRelaySubscription as requestSubscription,
+} from "relay-runtime";
 
-    type ClientMutationID = string;
+import * as React from "react";
+import * as RelayRuntimeTypes from "relay-runtime";
 
-    /** Fragments are a hash of functions */
-    interface Fragments {
-        [query: string]: ((variables?: RelayVariables) => string)
-    }
+// ~~~~~~~~~~~~~~~~~~~~~
+// Maybe Fix
+// ~~~~~~~~~~~~~~~~~~~~~
+export type ConcreteFragment = any;
+export type ConcreteBatch = any;
+export type ConcreteFragmentDefinition = object;
+export type ConcreteOperationDefinition = object;
+export type ReactBaseComponent<T> = React.ComponentClass<T> | React.StatelessComponent<T>;
 
-    interface CreateContainerOpts {
-        initialVariables?: any
-        fragments: Fragments
-        prepareVariables?(prevVariables: RelayVariables): RelayVariables
-    }
-
-    interface RelayVariables {
-        [name: string]: any
-    }
-
-    /** add static getFragment method to the component constructor */
-    interface RelayContainerClass<T> extends React.ComponentClass<T> {
-        getFragment: ((q: string, v?: RelayVariables) => string)
-    }
-
-    interface RelayQueryRequestResolve {
-        response: any
-    }
-
-    type RelayMutationStatus =
-      'UNCOMMITTED' | // Transaction hasn't yet been sent to the server. Transaction can be committed or rolled back.
-      'COMMIT_QUEUED' | // Transaction was committed but another transaction with the same collision key is pending, so the transaction has been queued to send to the server.
-      'COLLISION_COMMIT_FAILED' | //Transaction was queued for commit but another transaction with the same collision key failed. All transactions in the collision queue, including this one, have been failed. Transaction can be recommitted or rolled back.
-      'COMMITTING' | // Transaction is waiting for the server to respond.
-      'COMMIT_FAILED';
-
-    class RelayMutationTransaction {
-      applyOptimistic(): RelayMutationTransaction;
-      commit(): RelayMutationTransaction | null;
-      recommit(): void;
-      rollback(): void;
-      getError(): Error;
-      getStatus(): RelayMutationStatus;
-      getHash(): string;
-      getID(): ClientMutationID;
-    }
-
-    interface RelayMutationRequest {
-        getQueryString(): string
-        getVariables(): RelayVariables
-        resolve(result: RelayQueryRequestResolve): any
-        reject(errors: any): any
-    }
-
-    interface RelayQueryRequest {
-        resolve(result: RelayQueryRequestResolve): any
-        reject(errors: any): any
-
-        getQueryString(): string
-        getVariables(): RelayVariables
-        getID(): string
-        getDebugName(): string
-    }
-
-    interface RelayNetworkLayer {
-        supports(...options: string[]): boolean
-    }
-
-    class DefaultNetworkLayer implements RelayNetworkLayer {
-        constructor(host: string, options?: any)
-        supports(...options: string[]): boolean
-    }
-
-    function createContainer<T>(component: React.ComponentClass<T> | React.StatelessComponent<T>, params?: CreateContainerOpts): RelayContainerClass<T>
-    function injectNetworkLayer(networkLayer: RelayNetworkLayer): any
-    function isContainer(component: React.ComponentClass<any>): boolean
-    function QL(...args: any[]): string
-
-    class Route {
-        constructor(params?: RelayVariables)
-    }
-
-    /**
-     * Relay Mutation class, where T are the props it takes and S is the returned payload from Relay.Store.update.
-     * S is typically dynamic as it depends on the data the app is currently using, but it's possible to always
-     * return some data in the payload using REQUIRED_CHILDREN which is where specifying S is the most useful.
-     */
-    class Mutation<T,S> {
-        props: T
-
-        constructor(props: T)
-        static getFragment(q: string): string
-    }
-
-    interface Transaction {
-        getError(): Error
-        Status(): number
-    }
-
-    interface StoreUpdateCallbacks<T> {
-        onFailure?(transaction: Transaction): any
-        onSuccess?(response: T): any
-    }
-
-    interface Store {
-        commitUpdate(mutation: Mutation<any,any>, callbacks?: StoreUpdateCallbacks<any>): any
-    }
-
-    var Store: Store
-
-    class RootContainer extends React.Component<RootContainerProps,any> {}
-
-    interface RootContainerProps extends React.Props<RootContainer>{
-        Component: RelayContainerClass<any>
-        route: Route
-        renderLoading?(): JSX.Element
-        renderFetched?(data: any): JSX.Element
-        renderFailure?(error: Error, retry: Function): JSX.Element
-    }
-
-    type ReadyStateEvent =
-        'ABORT' |
-        'CACHE_RESTORED_REQUIRED' |
-        'CACHE_RESTORE_FAILED' |
-        'CACHE_RESTORE_START' |
-        'NETWORK_QUERY_ERROR' |
-        'NETWORK_QUERY_RECEIVED_ALL' |
-        'NETWORK_QUERY_RECEIVED_REQUIRED' |
-        'NETWORK_QUERY_START' |
-        'STORE_FOUND_ALL' |
-        'STORE_FOUND_REQUIRED';
-
-    interface OnReadyStateChange {
-        (readyState: {
-              ready: boolean,
-              done: boolean,
-              stale: boolean,
-              error?: Error,
-              events: Array<ReadyStateEvent>,
-              aborted: boolean
-        }): void
-    }
-
-    interface RelayProp {
-        readonly route: { name: string; }; // incomplete, also has params and queries
-        readonly variables: any;
-        readonly pendingVariables?: any | null;
-        setVariables(variables: any, onReadyStateChange?: OnReadyStateChange): void;
-        forceFetch(variables: any, onReadyStateChange?: OnReadyStateChange): void;
-        hasOptimisticUpdate(record: any): boolean;
-        getPendingTransactions(record: any): RelayMutationTransaction[];
-        commitUpdate: (mutation: Mutation<any,any>, callbacks?: StoreUpdateCallbacks<any>) => any;
-    }
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayProp
+// ~~~~~~~~~~~~~~~~~~~~~
+// note: refetch and pagination containers augment this
+export interface RelayProp {
+    environment: RelayRuntimeTypes.Environment;
 }
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayQL
+// ~~~~~~~~~~~~~~~~~~~~~
+export function RelayQL(strings: string[], ...substitutions: any[]): RelayRuntimeTypes.RelayConcreteNode;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayModernGraphQLTag
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface GeneratedNodeMap {
+    [key: string]: GraphQLTaggedNode;
+}
+export type GraphQLTaggedNode =
+    | (() => ConcreteFragment | ConcreteBatch)
+    | {
+          modern(): ConcreteFragment | ConcreteBatch;
+          classic(relayQL: typeof RelayQL): ConcreteFragmentDefinition | ConcreteOperationDefinition;
+      };
+/**
+ * Runtime function to correspond to the `graphql` tagged template function.
+ * All calls to this function should be transformed by the plugin.
+ */
+export interface GraphqlInterface {
+    (strings: string[] | TemplateStringsArray): GraphQLTaggedNode;
+    experimental(strings: string[] | TemplateStringsArray): GraphQLTaggedNode;
+}
+export const graphql: GraphqlInterface;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// ReactRelayQueryRenderer
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface QueryRendererProps {
+    cacheConfig?: RelayRuntimeTypes.CacheConfig;
+    environment: RelayRuntimeTypes.Environment;
+    query: GraphQLTaggedNode;
+    render(readyState: ReadyState): React.ReactElement<any> | undefined | null;
+    variables: RelayRuntimeTypes.Variables;
+    rerunParamExperimental?: RelayRuntimeTypes.RerunParam;
+}
+export interface ReadyState {
+    error: Error | undefined | null;
+    props: { [propName: string]: any } | undefined | null;
+    retry?(): void;
+}
+export interface QueryRendererState {
+    readyState: ReadyState;
+}
+export class ReactRelayQueryRenderer extends React.Component<QueryRendererProps, QueryRendererState> {}
+export class QueryRenderer extends ReactRelayQueryRenderer {}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// createFragmentContainer
+// ~~~~~~~~~~~~~~~~~~~~~
+export function createFragmentContainer<T>(
+    Component: ReactBaseComponent<T>,
+    fragmentSpec: GraphQLTaggedNode | GeneratedNodeMap
+): ReactBaseComponent<T>;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// createPaginationContainer
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface PageInfo {
+    endCursor: string | undefined | null;
+    hasNextPage: boolean;
+    hasPreviousPage: boolean;
+    startCursor: string | undefined | null;
+}
+export interface ConnectionData {
+    edges?: any[];
+    pageInfo?: PageInfo;
+}
+export type RelayPaginationProp = RelayProp & {
+    hasMore(): boolean;
+    isLoading(): boolean;
+    loadMore(
+        pageSize: number,
+        callback: (error?: Error) => void,
+        options?: RefetchOptions
+    ): RelayRuntimeTypes.Disposable | undefined | null;
+    refetchConnection(
+        totalCount: number,
+        callback: (error?: Error) => void,
+        refetchVariables?: RelayRuntimeTypes.Variables
+    ): RelayRuntimeTypes.Disposable | undefined | null;
+};
+export function FragmentVariablesGetter(
+    prevVars: RelayRuntimeTypes.Variables,
+    totalCount: number
+): RelayRuntimeTypes.Variables;
+export interface ConnectionConfig<T> {
+    direction?: "backward" | "forward";
+    getConnectionFromProps?(props: T): ConnectionData | undefined | null;
+    getFragmentVariables?: typeof FragmentVariablesGetter;
+    getVariables(
+        props: { [propName: string]: any },
+        paginationInfo: { count: number; cursor?: string },
+        fragmentVariables: RelayRuntimeTypes.Variables
+    ): RelayRuntimeTypes.Variables;
+    query: GraphQLTaggedNode;
+}
+export function createPaginationContainer<T>(
+    Component: ReactBaseComponent<T>,
+    fragmentSpec: GraphQLTaggedNode | GeneratedNodeMap,
+    connectionConfig: ConnectionConfig<T>
+): ReactBaseComponent<T>;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// createFragmentContainer
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface RefetchOptions {
+    force?: boolean;
+    rerunParamExperimental?: RelayRuntimeTypes.RerunParam;
+}
+export type RelayRefetchProp = RelayProp & {
+    refetch(
+        refetchVariables:
+            | RelayRuntimeTypes.Variables
+            | ((fragmentVariables: RelayRuntimeTypes.Variables) => RelayRuntimeTypes.Variables),
+        renderVariables?: RelayRuntimeTypes.Variables,
+        callback?: (error?: Error) => void,
+        options?: RefetchOptions
+    ): RelayRuntimeTypes.Disposable;
+};
+export function createRefetchContainer<T>(
+    Component: ReactBaseComponent<T>,
+    fragmentSpec: GraphQLTaggedNode | GeneratedNodeMap,
+    taggedNode: GraphQLTaggedNode
+): ReactBaseComponent<T>;
diff --git a/types/react-relay/react-relay-tests.tsx b/types/react-relay/react-relay-tests.tsx
deleted file mode 100644
index 90425156cc..0000000000
--- a/types/react-relay/react-relay-tests.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import * as React from "react"
-import * as Relay from "react-relay"
-
-interface Props {
-    text: string
-    userId: string
-}
-
-interface Response {
-}
-
-export default class AddTweetMutation extends Relay.Mutation<Props, Response> {
-
-    getMutation () {
-        return Relay.QL`mutation{addTweet}`
-    }
-
-    getFatQuery () {
-        return Relay.QL`
-            fragment on AddTweetPayload {
-                tweetEdge
-                user
-            }
-        `
-    }
-
-    getConfigs () {
-        return [{
-            type: "RANGE_ADD",
-            parentName: "user",
-            parentID: this.props.userId,
-            connectionName: "tweets",
-            edgeName: "tweetEdge",
-            rangeBehaviors: {
-                "": "append",
-            },
-        }]
-    }
-
-    getVariables () {
-        return this.props
-    }
-}
-
-interface ArtworkProps {
-    artwork: {
-        title: string
-    },
-    relay: Relay.RelayProp,
-}
-
-class Artwork extends React.Component<ArtworkProps> {
-    render() {
-        return (
-            <a href={`/artworks/${this.props.relay.variables.artworkID}`}>
-                {this.props.artwork.title}
-            </a>
-        )
-    }
-}
-
-const ArtworkContainer = Relay.createContainer(Artwork, {
-    fragments: {
-        artwork: () => Relay.QL`
-            fragment on Artwork {
-                title
-            }
-        `
-    }
-})
-
-class StubbedArtwork extends React.Component {
-    render() {
-        const props = {
-            artwork: { title: "CHAMPAGNE FORMICA FLAG" },
-            relay: {
-                route: {
-                    name: "champagne"
-                },
-                variables: {
-                    artworkID: "champagne-formica-flag",
-                },
-                setVariables: () => {},
-                forceFetch: () => {},
-                hasOptimisticUpdate: () => false,
-                getPendingTransactions: (): Relay.RelayMutationTransaction[] => undefined,
-                commitUpdate: () => {},
-            }
-        }
-        return <ArtworkContainer {...props} />
-    }
-}
diff --git a/types/react-relay/test/react-relay-classic-tests.tsx b/types/react-relay/test/react-relay-classic-tests.tsx
new file mode 100644
index 0000000000..7aae267dfc
--- /dev/null
+++ b/types/react-relay/test/react-relay-classic-tests.tsx
@@ -0,0 +1,89 @@
+import * as React from "react";
+import * as Relay from "react-relay/classic";
+
+interface Props {
+    text: string;
+    userId: string;
+}
+
+// tslint:disable-next-line no-empty-interface
+interface Response {}
+
+export default class AddTweetMutation extends Relay.Mutation<Props, Response> {
+    getMutation() {
+        return Relay.QL`mutation{addTweet}`;
+    }
+
+    getFatQuery() {
+        return Relay.QL`
+            fragment on AddTweetPayload {
+                tweetEdge
+                user
+            }
+        `;
+    }
+
+    getConfigs() {
+        return [
+            {
+                type: "RANGE_ADD",
+                parentName: "user",
+                parentID: this.props.userId,
+                connectionName: "tweets",
+                edgeName: "tweetEdge",
+                rangeBehaviors: {
+                    "": "append",
+                },
+            },
+        ];
+    }
+
+    getVariables() {
+        return this.props;
+    }
+}
+
+interface ArtworkProps {
+    artwork: {
+        title: string;
+    };
+    relay: Relay.RelayProp;
+}
+
+class Artwork extends React.Component<ArtworkProps> {
+    render() {
+        return <a href={`/artworks/${this.props.relay.variables.artworkID}`}>{this.props.artwork.title}</a>;
+    }
+}
+
+const ArtworkContainer = Relay.createContainer(Artwork, {
+    fragments: {
+        artwork: () => Relay.QL`
+            fragment on Artwork {
+                title
+            }
+        `,
+    },
+});
+
+class StubbedArtwork extends React.Component {
+    render() {
+        const props = {
+            artwork: { title: "CHAMPAGNE FORMICA FLAG" },
+            relay: {
+                route: {
+                    name: "champagne",
+                },
+                variables: {
+                    artworkID: "champagne-formica-flag",
+                },
+                setVariables: () => {},
+                forceFetch: () => {},
+                hasOptimisticUpdate: () => false,
+                getPendingTransactions: (): Relay.RelayMutationTransaction[] => [],
+                commitUpdate: () => {},
+            },
+        };
+        return <ArtworkContainer {...props} />;
+    }
+}
diff --git a/types/react-relay/test/react-relay-tests.tsx b/types/react-relay/test/react-relay-tests.tsx
new file mode 100644
index 0000000000..f73b7c00c7
--- /dev/null
+++ b/types/react-relay/test/react-relay-tests.tsx
@@ -0,0 +1,471 @@
+import * as React from "react";
+import { Environment, Network, RecordSource, Store, ConnectionHandler } from "relay-runtime";
+
+////////////////////////////
+//  RELAY MODERN TESTS
+///////////////////////////
+import {
+    graphql,
+    commitMutation,
+    createFragmentContainer,
+    createPaginationContainer,
+    createRefetchContainer,
+    requestSubscription,
+    QueryRenderer,
+    RelayRefetchProp,
+    RelayPaginationProp
+} from "react-relay";
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern Environment
+// ~~~~~~~~~~~~~~~~~~~~~
+function fetchQuery(operation: any, variables: any, cacheConfig: {}) {
+    return fetch("/graphql");
+}
+const network = Network.create(fetchQuery);
+const source = new RecordSource();
+const store = new Store(source);
+const modernEnvironment = new Environment({ network, store });
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern QueryRenderer
+// ~~~~~~~~~~~~~~~~~~~~~
+const MyQueryRenderer = (props: { name: string }) => (
+    <QueryRenderer
+        environment={modernEnvironment}
+        query={graphql`
+            query ExampleQuery($pageID: ID!) {
+                page(id: $pageID) {
+                    name
+                }
+            }
+        `}
+        variables={{
+            pageID: "110798995619330",
+        }}
+        render={({ error, props }) => {
+            if (error) {
+                return <div>{error.message}</div>;
+            } else if (props) {
+                return <div>{props.name} is great!</div>;
+            }
+            return <div>Loading</div>;
+        }}
+    />
+);
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern FragmentContainer
+// ~~~~~~~~~~~~~~~~~~~~~
+const MyFragmentContainer = createFragmentContainer(
+    class TodoListView extends React.Component {
+        render() {
+            return <div />;
+        }
+    },
+    {
+        item: graphql`
+            fragment TodoItem_item on Todo {
+                text
+                isComplete
+            }
+        `,
+    }
+);
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern RefetchContainer
+// ~~~~~~~~~~~~~~~~~~~~~
+interface StoryInterface {
+    id: string;
+}
+interface FeedStoriesProps {
+    relay: RelayRefetchProp;
+    feed: {
+        stories: { edges: Array<{ node: StoryInterface }> };
+    };
+}
+class Story extends React.Component<{ story: StoryInterface }> {}
+class FeedStories extends React.Component<FeedStoriesProps> {
+    render() {
+        return (
+            <div>
+                {this.props.feed.stories.edges.map(edge => <Story story={edge.node} key={edge.node.id} />)}
+                <button onClick={() => this._loadMore} title="Load More" />
+            </div>
+        );
+    }
+
+    _loadMore() {
+        // Increments the number of stories being rendered by 10.
+        const refetchVariables = (fragmentVariables: { count: number }) => ({
+            count: fragmentVariables.count + 10,
+        });
+        this.props.relay.refetch(refetchVariables);
+    }
+}
+
+const FeedRefetchContainer = createRefetchContainer(
+    FeedStories,
+    {
+        feed: graphql.experimental`
+            fragment FeedStories_feed on Feed @argumentDefinitions(count: { type: "Int", defaultValue: 10 }) {
+                stories(first: $count) {
+                    edges {
+                        node {
+                            id
+                            ...Story_story
+                        }
+                    }
+                }
+            }
+        `,
+    },
+    graphql.experimental`
+        query FeedStoriesRefetchQuery($count: Int) {
+            feed {
+                ...FeedStories_feed @arguments(count: $count)
+            }
+        }
+    `
+);
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern PaginationContainer
+// ~~~~~~~~~~~~~~~~~~~~~
+interface FeedProps {
+    user: { feed: { edges: Array<{ node: StoryInterface }> } };
+    relay: RelayPaginationProp;
+}
+class Feed extends React.Component<FeedProps> {
+    render() {
+        return (
+            <div>
+                {this.props.user.feed.edges.map(edge => <Story story={edge.node} key={edge.node.id} />)}
+                <button onClick={() => this._loadMore()} title="Load More" />
+            </div>
+        );
+    }
+
+    _loadMore() {
+        if (!this.props.relay.hasMore() || this.props.relay.isLoading()) {
+            return;
+        }
+
+        this.props.relay.loadMore(
+            10, // Fetch the next 10 feed items
+            e => {
+                console.log(e);
+            }
+        );
+    }
+}
+
+const FeedPaginationContainer = createPaginationContainer(
+    Feed,
+    {
+        user: graphql`
+            fragment Feed_user on User {
+                feed(
+                    first: $count
+                    after: $cursor
+                    orderby: $orderBy # other variables
+                ) @connection(key: "Feed_feed") {
+                    edges {
+                        node {
+                            id
+                            ...Story_story
+                        }
+                    }
+                }
+            }
+        `,
+    },
+    {
+        direction: "forward",
+        getConnectionFromProps(props) {
+            return props.user && props.user.feed;
+        },
+        getFragmentVariables(prevVars, totalCount) {
+            return {
+                ...prevVars,
+                count: totalCount,
+            };
+        },
+        getVariables(props, { count, cursor }, fragmentVariables) {
+            return {
+                count,
+                cursor,
+                // in most cases, for variables other than connection filters like
+                // `first`, `after`, etc. you may want to use the previous values.
+                orderBy: fragmentVariables.orderBy,
+            };
+        },
+        query: graphql`
+            query FeedPaginationQuery($count: Int!, $cursor: String, $orderby: String!) {
+                user {
+                    # You could reference the fragment defined previously.
+                    ...Feed_user
+                }
+            }
+        `,
+    }
+);
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern Mutations
+// ~~~~~~~~~~~~~~~~~~~~~
+const mutation = graphql`
+    mutation MarkReadNotificationMutation($input: MarkReadNotificationData!) {
+        markReadNotification(data: $input) {
+            notification {
+                seenState
+            }
+        }
+    }
+`;
+
+const optimisticResponse = {
+    markReadNotification: {
+        notification: {
+            seenState: "SEEN",
+        },
+    },
+};
+
+const configs = [
+    {
+        type: "NODE_DELETE" as "NODE_DELETE",
+        deletedIDFieldName: "destroyedShipId",
+    },
+    {
+        type: "RANGE_ADD" as "RANGE_ADD",
+        parentID: "shipId",
+        connectionInfo: [
+            {
+                key: "AddShip_ships",
+                rangeBehavior: "append",
+            },
+        ],
+        edgeName: "newShipEdge",
+    },
+    {
+        type: "RANGE_DELETE" as "RANGE_DELETE",
+        parentID: "todoId",
+        connectionKeys: [
+            {
+                key: "RemoveTags_tags",
+                rangeBehavior: "append",
+            },
+        ],
+        pathToConnection: ["todo", "tags"],
+        deletedIDFieldName: "removedTagId",
+    },
+];
+
+function markNotificationAsRead(source: string, storyID: string) {
+    const variables = {
+        input: {
+            source,
+            storyID,
+        },
+    };
+
+    commitMutation(modernEnvironment, {
+        configs,
+        mutation,
+        optimisticResponse,
+        variables,
+        onCompleted: (response, errors) => {
+            console.log("Response received from server.");
+        },
+        onError: err => console.error(err),
+        updater: (store, data) => {
+            const field = store.get(storyID);
+            if (field) {
+                field.setValue(data.story, "story");
+            }
+        }
+    });
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern Subscriptions
+// ~~~~~~~~~~~~~~~~~~~~~
+const subscription = graphql`
+    subscription MarkReadNotificationSubscription($storyID: ID!) {
+        markReadNotification(storyID: $storyID) {
+            notification {
+                seenState
+            }
+        }
+    }
+`;
+const variables = {
+    storyID: "123",
+};
+requestSubscription(
+    modernEnvironment, // see Environment docs
+    {
+        subscription,
+        variables,
+        // optional but recommended:
+        onCompleted: () => {},
+        onError: error => console.error(error),
+        // example of a custom updater
+        updater: store => {
+            // Get the notification
+            const rootField = store.getRootField("markReadNotification");
+            const notification = !!rootField && rootField.getLinkedRecord("notification");
+            // Add it to a connection
+            const viewer = store.getRoot().getLinkedRecord("viewer");
+            const notifications = ConnectionHandler.getConnection(viewer, "notifications");
+            const edge = ConnectionHandler.createEdge(store, notifications, notification, "<TypeOfNotificationsEdge>");
+            ConnectionHandler.insertEdgeAfter(notifications, edge);
+        },
+    }
+);
+
+////////////////////////////
+//  RELAY COMPAT TESTS
+///////////////////////////
+import {
+    QueryRenderer as CompatQueryRenderer,
+    createFragmentContainer as createFragmentContainerCompat,
+    commitMutation as commitMutationCompat,
+    CompatEnvironment,
+    RelayPaginationProp as RelayPaginationPropCompat,
+} from "react-relay/compat";
+
+// testting compat mutation with classic environment
+function markNotificationAsReadCompat(environment: CompatEnvironment, source: string, storyID: string) {
+    const variables = {
+        input: {
+            source,
+            storyID,
+        },
+    };
+
+    commitMutationCompat(environment, {
+        configs,
+        mutation,
+        optimisticResponse,
+        variables,
+        onCompleted: (response, errors) => {
+            console.log("Response received from server.");
+        },
+        onError: err => console.error(err),
+        updater: (store, data) => {
+            const field = store.get(storyID);
+            if (field) {
+                field.setValue(data.story, "story");
+            }
+        }
+    });
+}
+
+interface CompatProps {
+    relay: RelayPaginationPropCompat;
+}
+
+export class CompatComponent extends React.Component<CompatProps> {
+    markNotificationAsRead(source: string, storyID: string) {
+        markNotificationAsReadCompat(this.props.relay.environment, source, storyID);
+    }
+
+    render() {
+        return (<div/>);
+    }
+}
+
+const CompatContainer = createFragmentContainerCompat(CompatComponent, {});
+
+////////////////////////////
+//  RELAY-CLASSIC TESTS
+///////////////////////////
+import * as Relay from "react-relay/classic";
+
+interface Props {
+    text: string;
+    userId: string;
+}
+
+export default class AddTweetMutation extends Relay.Mutation<Props, {}> {
+    getMutation() {
+        return Relay.QL`mutation{addTweet}`;
+    }
+
+    getFatQuery() {
+        return Relay.QL`
+            fragment on AddTweetPayload {
+                tweetEdge
+                user
+            }
+        `;
+    }
+
+    getConfigs() {
+        return [
+            {
+                type: "RANGE_ADD",
+                parentName: "user",
+                parentID: this.props.userId,
+                connectionName: "tweets",
+                edgeName: "tweetEdge",
+                rangeBehaviors: {
+                    "": "append",
+                },
+            },
+        ];
+    }
+
+    getVariables() {
+        return this.props;
+    }
+}
+
+interface ArtworkProps {
+    artwork: {
+        title: string;
+    };
+    relay: Relay.RelayProp;
+}
+
+class Artwork extends React.Component<ArtworkProps> {
+    render() {
+        return <a href={`/artworks/${this.props.relay.variables.artworkID}`}>{this.props.artwork.title}</a>;
+    }
+}
+
+const ArtworkContainer = Relay.createContainer(Artwork, {
+    fragments: {
+        artwork: () => Relay.QL`
+            fragment on Artwork {
+                title
+                ${ CompatContainer.getFragment('whatever') }
+            }
+        `,
+    },
+});
+
+class StubbedArtwork extends React.Component {
+    render() {
+        const props = {
+            artwork: { title: "CHAMPAGNE FORMICA FLAG" },
+            relay: {
+                route: {
+                    name: "champagne",
+                },
+                variables: {
+                    artworkID: "champagne-formica-flag",
+                },
+                setVariables: () => {},
+                forceFetch: () => {},
+                hasOptimisticUpdate: () => false,
+                getPendingTransactions: (): any => undefined,
+                commitUpdate: () => {},
+            },
+        };
+        return <ArtworkContainer {...props} />;
+    }
+}
diff --git a/types/react-relay/tsconfig.json b/types/react-relay/tsconfig.json
index 8a1407df3a..3e471b36ad 100644
--- a/types/react-relay/tsconfig.json
+++ b/types/react-relay/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,6 +20,9 @@
     },
     "files": [
         "index.d.ts",
-        "react-relay-tests.tsx"
+        "classic.d.ts",
+        "compat.d.ts",
+        "test/react-relay-tests.tsx",
+        "test/react-relay-classic-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-relay/tslint.json b/types/react-relay/tslint.json
new file mode 100644
index 0000000000..6a82dd0467
--- /dev/null
+++ b/types/react-relay/tslint.json
@@ -0,0 +1,7 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODO
+		"no-unnecessary-class": false
+	}
+}
diff --git a/types/react-resolver/index.d.ts b/types/react-resolver/index.d.ts
new file mode 100644
index 0000000000..2b27d26d6a
--- /dev/null
+++ b/types/react-resolver/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for react-resolver 3.1
+// Project: https://github.com/ericclemmons/react-resolver
+// Definitions by: forabi <https://github.com/forabi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ComponentType, StatelessComponent, Factory } from 'react';
+
+export interface Resolver {
+  resolve<P>(
+    factory: Factory<P>,
+  ): Promise<{
+    data: any;
+    Resolved: StatelessComponent<P>;
+  }>;
+
+  render(factory: Factory<any>, root: Node | null): void;
+}
+
+export const Resolver: Resolver;
+
+export type ResolveFn<Props, V> = (props: Props) => Promise<V>;
+
+/** Use this for gaining access to a context as a prop without the boilerplate of setting `contextTypes`. */
+export function context<K extends string>(
+  prop: K,
+): <OwnProps>(
+  component: ComponentType<OwnProps>,
+) => StatelessComponent<OwnProps & Record<K, any>>;
+
+/**
+ * Use `@client(LoaderComponent)` (or `client(LoaderComponent)(YourComponent)`)
+ * for when you want to skip server-side rendering of part of your view and
+ * perform it only on the client.
+ */
+export function client(
+  loadingComponent: ComponentType<any>,
+): <OwnProps>(
+  component: ComponentType<OwnProps>,
+) => StatelessComponent<OwnProps>;
+
+export function resolve<
+  OwnProps,
+  K extends string,
+  V,
+  MoreProps = { [x: string]: any }
+>(
+  prop: K,
+  resolveFn: ResolveFn<OwnProps & MoreProps, V>,
+): (
+  component: ComponentType<OwnProps & { [C in K]: V }>,
+) => StatelessComponent<OwnProps & MoreProps>;
+
+export function resolve<
+  OwnProps,
+  ResolvableProps = { [x: string]: any },
+  MoreProps = { [x: string]: any }
+>(
+  resolversMap: {
+    [K in keyof ResolvableProps]: ResolveFn<
+      OwnProps & MoreProps,
+      ResolvableProps[K]
+    >
+  },
+): (
+  component: ComponentType<
+    OwnProps & { [K in keyof ResolvableProps]?: ResolvableProps[K] }
+  >,
+) => StatelessComponent<OwnProps & MoreProps>;
diff --git a/types/react-resolver/react-resolver-tests.tsx b/types/react-resolver/react-resolver-tests.tsx
new file mode 100644
index 0000000000..ce41e6db4c
--- /dev/null
+++ b/types/react-resolver/react-resolver-tests.tsx
@@ -0,0 +1,44 @@
+import * as React from 'react';
+import { Resolver, resolve, context } from 'react-resolver';
+import * as expect from 'expect';
+
+interface OwnProps {
+  thing: number;
+}
+
+interface ResolvedProps {
+  data: string;
+}
+
+class Page extends React.Component<OwnProps & ResolvedProps> {
+  render() {
+    return <div>Hello, {this.props.data}!</div>;
+  }
+}
+
+const ResolvedPageWithSingleProp = resolve('data', async () => {
+  return new Promise<string>(resolve => {
+    setTimeout(() => resolve('World'), 500);
+  });
+})(Page);
+
+const ResolvedPageWithPropMap = resolve({
+  data: async () => {
+    return new Promise<string>(resolve => {
+      setTimeout(() => resolve('World'), 500);
+    });
+  },
+})(Page);
+
+const PageWithContext = context('history')(Page);
+
+expect(<ResolvedPageWithSingleProp />).toExist();
+expect(<ResolvedPageWithPropMap />).toExist();
+
+// Resolver.render(() => <ResolvedPageWithPropMap />, document.getElementById('app'));
+
+Resolver.resolve(() => {
+  return <ResolvedPageWithPropMap />;
+}).then(({ data, Resolved }) => {
+  expect(data).toBe('World');
+});
diff --git a/types/react-resolver/tsconfig.json b/types/react-resolver/tsconfig.json
new file mode 100644
index 0000000000..94a604e352
--- /dev/null
+++ b/types/react-resolver/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-resolver-tests.tsx"
+    ]
+}
diff --git a/types/react-resolver/tslint.json b/types/react-resolver/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-resolver/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-responsive/index.d.ts b/types/react-responsive/index.d.ts
index 2b9a37839f..dde02d8dae 100644
--- a/types/react-responsive/index.d.ts
+++ b/types/react-responsive/index.d.ts
@@ -1,65 +1,90 @@
-// Type definitions for react-responsive 1.1.3
+// Type definitions for react-responsive 3.0
 // Project: https://github.com/contra/react-responsive
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
+//                 Alec Hill <https://github.com/alechill>
+//                 Javier Gonzalez <https://github.com/xaviergonz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
-declare module "react-responsive" {
-    import * as React from "react";
-
-    namespace MediaQuery {
-        export interface MediaQueryProps {
-            query?: string;
-            // matchers
-            orientation?: "portrait" | "landscape";
-            scan?: "progressive" | "interlace";
-            aspectRatio?: string;
-            deviceAspectRatio?: string;
-            height?: number | string;
-            deviceHeight?: number | string;
-            width?: number | string;
-            deviceWidth?: number | string;
-            color?: boolean;
-            colorIndex?: boolean;
-            monochrome?: boolean;
-            resolution?: number | string;
-            // types
-            minAspectRatio?: string;
-            maxAspectRatio?: string;
-            minDeviceAspectRatio?: string;
-            maxDeviceAspectRatio?: string;
-            minHeight?: number | string;
-            maxHeight?: number | string;
-            minDeviceHeight?: number | string;
-            maxDeviceHeight?: number | string;
-            minDeviceWidth?: number | string;
-            maxDeviceWidth?: number | string;
-            minWidth?: number | string;
-            maxWidth?: number | string;
-            minColor?: number;
-            maxColor?: number;
-            minColorIndex?: number;
-            maxColorIndex?: number;
-            minMonochrome?: number;
-            maxMonochrome?: number;
-            minResolution?: number | string;
-            maxResolution?: number | string;
-            // types
-            all?: boolean;
-            grid?: boolean;
-            aural?: boolean;
-            braille?: boolean;
-            handheld?: boolean;
-            print?: boolean;
-            projection?: boolean;
-            screen?: boolean;
-            tty?: boolean;
-            tv?: boolean;
-            embossed?: boolean;
-        }
-    }
-
-    class MediaQuery extends React.Component<MediaQuery.MediaQueryProps, any> { }
-    export = MediaQuery;
+import * as React from "react";
 
+export interface MediaQueryTypes {
+    all?: boolean;
+    grid?: boolean;
+    aural?: boolean;
+    braille?: boolean;
+    handheld?: boolean;
+    print?: boolean;
+    projection?: boolean;
+    screen?: boolean;
+    tty?: boolean;
+    tv?: boolean;
+    embossed?: boolean;
 }
+
+export type MediaQueryType = keyof MediaQueryTypes;
+
+export interface MediaQueryMatchers {
+    aspectRatio?: string;
+    deviceAspectRatio?: string;
+    height?: number | string;
+    deviceHeight?: number | string;
+    width?: number | string;
+    deviceWidth?: number | string;
+    color?: boolean;
+    colorIndex?: boolean;
+    monochrome?: boolean;
+    resolution?: number | string;
+    orientation?: 'portrait' | 'landscape';
+    scan?: 'progressive' | 'interlace';
+    type?: MediaQueryType;
+}
+
+export interface MediaQueryFeatures extends MediaQueryMatchers {
+    minAspectRatio?: string;
+    maxAspectRatio?: string;
+
+    minDeviceAspectRatio?: string;
+    maxDeviceAspectRatio?: string;
+
+    minHeight?: number | string;
+    maxHeight?: number | string;
+
+    minDeviceHeight?: number | string;
+    maxDeviceHeight?: number | string;
+
+    minWidth?: number | string;
+    maxWidth?: number | string;
+
+    minDeviceWidth?: number | string;
+    maxDeviceWidth?: number | string;
+
+    minColor?: number;
+    maxColor?: number;
+
+    minColorIndex?: number;
+    maxColorIndex?: number;
+
+    minMonochrome?: number;
+    maxMonochrome?: number;
+
+    minResolution?: number | string;
+    maxResolution?: number | string;
+}
+
+export interface MediaQueryAllQueryable extends MediaQueryFeatures, MediaQueryTypes {}
+
+export interface MediaQueryProps extends MediaQueryAllQueryable {
+    component?: string | React.SFC<any> | React.ClassType<any, any, any> | React.ComponentClass<any>;
+    query?: string;
+    style?: React.CSSProperties;
+    className?: string;
+    children?: React.ReactNode | ((matches: boolean) => React.ReactNode);
+    values?: Partial<MediaQueryMatchers>;
+    onBeforeChange?: (matches: boolean) => void;
+    onChange?: (matches: boolean) => void;
+}
+
+declare class MediaQuery extends React.Component<MediaQueryProps> { }
+export function toQuery(matchers: Partial<MediaQueryAllQueryable>): string;
+export default MediaQuery;
diff --git a/types/react-responsive/react-responsive-tests.tsx b/types/react-responsive/react-responsive-tests.tsx
index 28f8f39c30..3445a8d1cf 100644
--- a/types/react-responsive/react-responsive-tests.tsx
+++ b/types/react-responsive/react-responsive-tests.tsx
@@ -1,7 +1,9 @@
 import * as React from "react";
-import * as MediaQuery from "react-responsive";
+import MediaQuery, {
+    toQuery
+} from "react-responsive";
 
-class Test extends React.Component {
+class QueryTests extends React.Component {
     render() {
         return (
             <div>
@@ -37,6 +39,99 @@ class Test extends React.Component {
                     </MediaQuery>
                 </MediaQuery>
             </div>
-        )
+        );
     }
 }
+
+const ChildrenPropTest: React.SFC = ({ children }) => <MediaQuery minWidth={992} children={children} />;
+
+class PropsTests extends React.Component {
+    render() {
+        return (
+            <div>
+                <MediaQuery minDeviceWidth={700} component="ul">
+                    <li>Item 1</li>
+                    <li>Item 2</li>
+                </MediaQuery>
+                <MediaQuery minDeviceWidth={700} component={ChildrenPropTest}>
+                    <li>Item 1</li>
+                    <li>Item 2</li>
+                </MediaQuery>
+                <MediaQuery minDeviceWidth={700} component={QueryTests}>
+                    <li>Item 1</li>
+                    <li>Item 2</li>
+                </MediaQuery>
+                <MediaQuery minDeviceWidth={1200} className="some-class">
+                    <div>Wrapped</div>
+                    <div>Content</div>
+                </MediaQuery>
+                <MediaQuery style={{textTransform: 'uppercase'}} all={true}>
+                    uppercase me!
+                </MediaQuery>
+                <MediaQuery minDeviceWidth={1224}
+                            values={{ aspectRatio: '4/3',
+                                      deviceAspectRatio: '4/3',
+                                      height: '1600px',
+                                      deviceHeight: 1600,
+                                      width: 1600,
+                                      deviceWidth: '1600px',
+                                      color: true,
+                                      colorIndex: true,
+                                      monochrome: false,
+                                      resolution: 1,
+                                      orientation: 'portrait',
+                                      scan: 'progressive',
+                                      type: 'print'
+                                    }}>
+                    Values supplied for SSR
+                </MediaQuery>
+            </div>
+        );
+    }
+}
+
+class FunctionChildrenTest extends React.Component {
+    render() {
+        return (
+            <MediaQuery minDeviceWidth={700}>
+                {(matches: boolean) => {
+                    if (matches) {
+                        return <div>Media query matches!</div>;
+                    } else {
+                        return <div>Media query does not match!</div>;
+                    }
+                }}
+            </MediaQuery>
+        );
+    }
+}
+
+class CallbackTest extends React.Component {
+    onBeforeChange = (matches: boolean): void => {
+        if (matches) {
+            // do something
+        }
+    }
+
+    onChange = (matches: boolean): void => {
+        if (matches) {
+            // do something else
+        }
+    }
+
+    render() {
+        return (
+            <MediaQuery minDeviceWidth={700}
+                        onBeforeChange={this.onBeforeChange}
+                        onChange={this.onChange}>
+                Media query matches!
+            </MediaQuery>
+        );
+    }
+}
+
+const queryStrTest: string = toQuery({
+    type: 'print',
+    screen: true,
+    minHeight: 666
+});
diff --git a/types/react-responsive/tsconfig.json b/types/react-responsive/tsconfig.json
index 61a49072b7..294f0c8cde 100644
--- a/types/react-responsive/tsconfig.json
+++ b/types/react-responsive/tsconfig.json
@@ -2,12 +2,11 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -22,4 +21,4 @@
         "index.d.ts",
         "react-responsive-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-responsive/tslint.json b/types/react-responsive/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-responsive/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-responsive/v1/index.d.ts b/types/react-responsive/v1/index.d.ts
new file mode 100644
index 0000000000..ea0b07aa30
--- /dev/null
+++ b/types/react-responsive/v1/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for react-responsive 1.1
+// Project: https://github.com/contra/react-responsive
+// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+declare namespace MediaQuery {
+    interface MediaQueryProps {
+        query?: string;
+        // matchers
+        orientation?: "portrait" | "landscape";
+        scan?: "progressive" | "interlace";
+        aspectRatio?: string;
+        deviceAspectRatio?: string;
+        height?: number | string;
+        deviceHeight?: number | string;
+        width?: number | string;
+        deviceWidth?: number | string;
+        color?: boolean;
+        colorIndex?: boolean;
+        monochrome?: boolean;
+        resolution?: number | string;
+        // types
+        minAspectRatio?: string;
+        maxAspectRatio?: string;
+        minDeviceAspectRatio?: string;
+        maxDeviceAspectRatio?: string;
+        minHeight?: number | string;
+        maxHeight?: number | string;
+        minDeviceHeight?: number | string;
+        maxDeviceHeight?: number | string;
+        minDeviceWidth?: number | string;
+        maxDeviceWidth?: number | string;
+        minWidth?: number | string;
+        maxWidth?: number | string;
+        minColor?: number;
+        maxColor?: number;
+        minColorIndex?: number;
+        maxColorIndex?: number;
+        minMonochrome?: number;
+        maxMonochrome?: number;
+        minResolution?: number | string;
+        maxResolution?: number | string;
+        // types
+        all?: boolean;
+        grid?: boolean;
+        aural?: boolean;
+        braille?: boolean;
+        handheld?: boolean;
+        print?: boolean;
+        projection?: boolean;
+        screen?: boolean;
+        tty?: boolean;
+        tv?: boolean;
+        embossed?: boolean;
+    }
+}
+
+declare class MediaQuery extends React.Component<MediaQuery.MediaQueryProps, any> { }
+export = MediaQuery;
diff --git a/types/react-responsive/v1/react-responsive-tests.tsx b/types/react-responsive/v1/react-responsive-tests.tsx
new file mode 100644
index 0000000000..e3644771c4
--- /dev/null
+++ b/types/react-responsive/v1/react-responsive-tests.tsx
@@ -0,0 +1,42 @@
+import * as React from "react";
+import * as MediaQuery from "react-responsive";
+
+class Test extends React.Component {
+    render() {
+        return (
+            <div>
+                <div>Device Test!</div>
+                <MediaQuery minDeviceWidth={1224}>
+                    <div>You are a desktop or laptop</div>
+                    <MediaQuery minDeviceWidth={1824}>
+                        <div>You also have a huge screen</div>
+                    </MediaQuery>
+                    <MediaQuery maxWidth={1224}>
+                        <div>You are sized like a tablet or mobile phone though</div>
+                    </MediaQuery>
+                </MediaQuery>
+                <MediaQuery maxDeviceWidth={1224}>
+                    <div>You are a tablet or mobile phone</div>
+                </MediaQuery>
+                <MediaQuery orientation="portrait">
+                    <div>You are portrait</div>
+                </MediaQuery>
+                <MediaQuery orientation="landscape">
+                    <div>You are landscape</div>
+                </MediaQuery>
+                <MediaQuery minResolution="2dppx">
+                    <div>You are retina</div>
+                </MediaQuery>
+                <MediaQuery query="(min-device-width: 1224px)">
+                    <div>You are a desktop or laptop</div>
+                    <MediaQuery query="(min-device-width: 1824px)">
+                        <div>You also have a huge screen</div>
+                    </MediaQuery>
+                    <MediaQuery query="(max-width: 1224px)">
+                        <div>You are sized like a tablet or mobile phone though</div>
+                    </MediaQuery>
+                </MediaQuery>
+            </div>
+        );
+    }
+}
diff --git a/types/react-responsive/v1/tsconfig.json b/types/react-responsive/v1/tsconfig.json
new file mode 100644
index 0000000000..774fd47a00
--- /dev/null
+++ b/types/react-responsive/v1/tsconfig.json
@@ -0,0 +1,33 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "react-responsive": [
+                "react-responsive/v1"
+            ],
+            "react-responsive/*": [
+                "react-responsive/v1/*"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-responsive-tests.tsx"
+    ]
+}
diff --git a/types/react-responsive/v1/tslint.json b/types/react-responsive/v1/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-responsive/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/react-router-bootstrap/index.d.ts b/types/react-router-bootstrap/index.d.ts
index c09a82d770..19e1940836 100644
--- a/types/react-router-bootstrap/index.d.ts
+++ b/types/react-router-bootstrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-bootstrap/react-router-bootstrap
 // Definitions by: Vincent Lesierse <https://github.com/vlesierse>, Karol Janyst <https://github.com/LKay>, Olmo del Corral <https://github.com/olmobrutall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 export { default as LinkContainer } from "react-router-bootstrap/lib/LinkContainer"
 export { default as IndexLinkContainer } from "react-router-bootstrap/lib/IndexLinkContainer"
diff --git a/types/react-router-bootstrap/tslint.json b/types/react-router-bootstrap/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-router-bootstrap/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 54b48089fa..d33e385a53 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from "react";
 import { RouteComponentProps, match } from "react-router";
diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index c9555834a9..88119a4858 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for React Router 4.0
+// Type definitions for React Router 4.2
 // Project: https://github.com/ReactTraining/react-router
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import { match } from "react-router";
 import * as React from 'react';
@@ -27,24 +27,24 @@ export {
 
 export interface BrowserRouterProps {
     basename?: string;
-    getUserConfirmation?(): void;
+    getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
     forceRefresh?: boolean;
     keyLength?: number;
 }
-export class BrowserRouter extends React.Component<BrowserRouterProps> {}
+export class BrowserRouter extends React.Component<BrowserRouterProps, any> {}
 
 export interface HashRouterProps {
     basename?: string;
-    getUserConfirmation?(): void;
+    getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
     hashType?: 'slash' | 'noslash' | 'hashbang';
 }
-export class HashRouter extends React.Component<HashRouterProps> {}
+export class HashRouter extends React.Component<HashRouterProps, any> {}
 
 export interface LinkProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
     to: H.LocationDescriptor;
     replace?: boolean;
 }
-export class Link extends React.Component<LinkProps> {}
+export class Link extends React.Component<LinkProps, any> {}
 
 export interface NavLinkProps extends LinkProps {
     activeClassName?: string;
@@ -52,5 +52,6 @@ export interface NavLinkProps extends LinkProps {
     exact?: boolean;
     strict?: boolean;
     isActive?<P>(match: match<P>, location: H.Location): boolean;
+    location?: H.Location;
 }
-export class NavLink extends React.Component<NavLinkProps> {}
+export class NavLink extends React.Component<NavLinkProps, any> {}
diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index f2ab1c72b1..88c0108212 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router-native
 // Definitions by: Eduard Zintz <https://github.com/ezintz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 export {
   match,
diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index eafca8f5cc..5f5d9b31ea 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 //                 Shoya Tanaka <https://github.com/8398a7>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import {
     Store,
@@ -22,7 +22,7 @@ import * as React from 'react';
 
 export interface ConnectedRouterProps<State> {
     store?: Store<State>;
-    history?: History;
+    history: History;
 }
 export class ConnectedRouter<State> extends React.Component<ConnectedRouterProps<State>> {}
 
diff --git a/types/react-router-redux/package.json b/types/react-router-redux/package.json
index c4cb1bf094..b5b3eb5dd8 100644
--- a/types/react-router-redux/package.json
+++ b/types/react-router-redux/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.7.2"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-router-redux/v3/package.json b/types/react-router-redux/v3/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/react-router-redux/v3/package.json
+++ b/types/react-router-redux/v3/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-router-redux/v4/package.json b/types/react-router-redux/v4/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/react-router-redux/v4/package.json
+++ b/types/react-router-redux/v4/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index bfb5f16e7b..cf5efbbb36 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -15,7 +15,7 @@
 //                 Daniel Roth <https://github.com/DaIgeb>
 //                 Egor Shulga <https://github.com/egorshulga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from 'react';
 import * as H from 'history';
@@ -34,17 +34,17 @@ export interface RouterChildContext<P> {
 export interface MemoryRouterProps {
   initialEntries?: H.LocationDescriptor[];
   initialIndex?: number;
-  getUserConfirmation?: (() => void);
+  getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
   keyLength?: number;
 }
 
-export class MemoryRouter extends React.Component<MemoryRouterProps> { }
+export class MemoryRouter extends React.Component<MemoryRouterProps, any> { }
 
 export interface PromptProps {
-  message: string | ((location: H.Location) => void);
+  message: string | ((location: H.Location) => string | boolean);
   when?: boolean;
 }
-export class Prompt extends React.Component<PromptProps> { }
+export class Prompt extends React.Component<PromptProps, any> { }
 
 export interface RedirectProps {
   to: H.LocationDescriptor;
@@ -54,7 +54,7 @@ export interface RedirectProps {
   exact?: boolean;
   strict?: boolean;
 }
-export class Redirect extends React.Component<RedirectProps> { }
+export class Redirect extends React.Component<RedirectProps, any> { }
 
 export interface RouteComponentProps<P> {
   match: match<P>;
@@ -65,19 +65,19 @@ export interface RouteComponentProps<P> {
 
 export interface RouteProps {
   location?: H.Location;
-  component?: React.ComponentType<RouteComponentProps<any> | {}>;
+  component?: React.ComponentType<RouteComponentProps<any>> | React.ComponentType<any>;
   render?: ((props: RouteComponentProps<any>) => React.ReactNode);
   children?: ((props: RouteComponentProps<any>) => React.ReactNode) | React.ReactNode;
   path?: string;
   exact?: boolean;
   strict?: boolean;
 }
-export class Route<T extends RouteProps = RouteProps> extends React.Component<T> { }
+export class Route<T extends RouteProps = RouteProps> extends React.Component<T, any> { }
 
 export interface RouterProps {
   history: any;
 }
-export class Router extends React.Component<RouterProps> { }
+export class Router extends React.Component<RouterProps, any> { }
 
 export interface StaticRouterProps {
   basename?: string;
@@ -85,12 +85,12 @@ export interface StaticRouterProps {
   context?: object;
 }
 
-export class StaticRouter extends React.Component<StaticRouterProps> { }
+export class StaticRouter extends React.Component<StaticRouterProps, any> { }
 export interface SwitchProps {
   children?: React.ReactNode;
   location?: H.Location;
 }
-export class Switch extends React.Component<SwitchProps> { }
+export class Switch extends React.Component<SwitchProps, any> { }
 
 export interface match<P> {
   params: P;
@@ -99,7 +99,14 @@ export interface match<P> {
   url: string;
 }
 
+// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
+export type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
 export function matchPath<P>(pathname: string, props: RouteProps): match<P> | null;
-export function withRouter<P>(component: React.ComponentType<RouteComponentProps<any> & P>): React.ComponentClass<P>;
-// decorator signature
-export function withRouter<P, TFunction extends React.ComponentClass<P>>(target: TFunction): TFunction;
+
+// There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes
+// they are decorating. Due to this, if you are using @withRouter decorator in your code,
+// you will see a bunch of errors from TypeScript. The current workaround is to use withRouter() as a function call
+// on a separate line instead of as a decorator.
+export function withRouter<P extends RouteComponentProps<any>>(component: React.ComponentType<P>): React.ComponentClass<Omit<P, keyof RouteComponentProps<any>>>;
diff --git a/types/react-router/test/MemoryRouter.tsx b/types/react-router/test/MemoryRouter.tsx
index 99aa385bd5..bd42d69407 100644
--- a/types/react-router/test/MemoryRouter.tsx
+++ b/types/react-router/test/MemoryRouter.tsx
@@ -12,8 +12,13 @@ const initialRouterEntries = [
   }
 ];
 
+const getConfirmation = (message: string, callback: (ok: boolean) => void): void => {
+  const allowTransition = window.confirm(message);
+  callback(allowTransition);
+};
+
 const MemoryRouterExample = () => (
-  <MemoryRouter initialEntries={initialRouterEntries} initialIndex={1}>
+  <MemoryRouter initialEntries={initialRouterEntries} initialIndex={1} getUserConfirmation={getConfirmation}>
     <div>
       <ul>
         <li><Link to="/">Home</Link></li>
diff --git a/types/react-router/test/NavigateWithContext.tsx b/types/react-router/test/NavigateWithContext.tsx
index 7a58090462..7ab89b2e0d 100644
--- a/types/react-router/test/NavigateWithContext.tsx
+++ b/types/react-router/test/NavigateWithContext.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import * as PropTypes from 'prop-types';
 import {
   RouterChildContext,
   RouteComponentProps
@@ -15,10 +16,10 @@ type Props = RouteComponentProps<Params>;
 
 class ComponentThatUsesContext extends React.Component<Props> {
   static contextTypes = {
-    router: React.PropTypes.object.isRequired
+    router: PropTypes.object.isRequired
   };
   context: RouterChildContext<Params>;
-  private onClick = () => {
+  private readonly onClick = () => {
     const {
       history,
       route: {
diff --git a/types/react-router/test/WithRouter.tsx b/types/react-router/test/WithRouter.tsx
index 72035ed92f..d22225deae 100644
--- a/types/react-router/test/WithRouter.tsx
+++ b/types/react-router/test/WithRouter.tsx
@@ -1,14 +1,24 @@
 import * as React from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 
-interface TOwnProps {
-  username: string;
+interface TOwnProps extends RouteComponentProps<{}> {
+    username: string;
 }
 
-const Component = (props: TOwnProps & RouteComponentProps<{}>) => <h2>Welcome {props.username}</h2>;
+const ComponentFunction = (props: TOwnProps) => (
+    <h2>Welcome {props.username}</h2>
+);
 
-const WithRouterComponent = withRouter<TOwnProps>(Component);
+class ComponentClass extends React.Component<TOwnProps> {
+    render() {
+        return <h2>Welcome {this.props.username}</h2>;
+    }
+}
 
-const WithRouterTest = () => (<WithRouterComponent username="John" />);
+const WithRouterComponentFunction = withRouter(ComponentFunction);
+const WithRouterComponentClass = withRouter(ComponentClass);
 
-export default WithRouterTest;
+const WithRouterTestFunction = () => (
+    <WithRouterComponentFunction username="John" />
+);
+const WithRouterTestClass = () => <WithRouterComponentClass username="John" />;
diff --git a/types/react-router/test/WithRouterDecorator.tsx b/types/react-router/test/WithRouterDecorator.tsx
deleted file mode 100644
index aa907d1a7a..0000000000
--- a/types/react-router/test/WithRouterDecorator.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from 'react';
-import { withRouter, RouteComponentProps } from 'react-router-dom';
-
-interface TOwnProps {
-  username: string;
-}
-
-// $ExpectType Component
-@withRouter
-class Component extends React.Component<TOwnProps> {
-	render() {
-		return (
-			<h2>Welcome {this.props.username}</h2>
-		);
-	}
-}
-
-const WithRouterTest = () => (<Component username="John" />);
-
-// $ExpectType Element
-WithRouterTest();
-
-export default WithRouterTest;
diff --git a/types/react-router/test/examples-from-react-router-website/Auth.tsx b/types/react-router/test/examples-from-react-router-website/Auth.tsx
index c57251f9ef..6c8d70a791 100644
--- a/types/react-router/test/examples-from-react-router-website/Auth.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Auth.tsx
@@ -65,10 +65,10 @@ const PrivateRoute: React.SFC<RouteProps> = ({ component, ...rest }) => (
   )}/>
 );
 
-const Public: React.SFC<RouteComponentProps<void>> = () => <h3>Public</h3>;
-const Protected: React.SFC<RouteComponentProps<void>> = () => <h3>Protected</h3>;
+const Public: React.SFC<RouteComponentProps<{}>> = () => <h3>Public</h3>;
+const Protected: React.SFC<RouteComponentProps<{}>> = () => <h3>Protected</h3>;
 
-class Login extends React.Component<RouteComponentProps<void>, {redirectToReferrer: boolean}> {
+class Login extends React.Component<RouteComponentProps<{}>, {redirectToReferrer: boolean}> {
   state = {
     redirectToReferrer: false
   };
diff --git a/types/react-router/test/examples-from-react-router-website/Basic.tsx b/types/react-router/test/examples-from-react-router-website/Basic.tsx
index c2b6c58405..5ed1350d83 100644
--- a/types/react-router/test/examples-from-react-router-website/Basic.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Basic.tsx
@@ -36,7 +36,7 @@ const About = () => (
   </div>
 );
 
-const Topics: React.SFC<RouteComponentProps<void>> = ({ match }) => (
+const Topics: React.SFC<RouteComponentProps<{}>> = ({ match }) => (
   <div>
     <h2>Topics</h2>
     <ul>
diff --git a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
index 211e62aa49..c9632c311c 100644
--- a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
+++ b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
@@ -16,7 +16,7 @@ import {
 // are the same as before but now we see them inside a modal
 // on top of the old screen.
 
-class ModalSwitch extends React.Component<RouteComponentProps<void>> {
+class ModalSwitch extends React.Component<RouteComponentProps<{}>> {
   // We can pass a location to <Switch/> that will tell it to
   // ignore the router's current location and use the location
   // prop instead.
@@ -31,7 +31,7 @@ class ModalSwitch extends React.Component<RouteComponentProps<void>> {
   // is still `/` even though its `/images/2`.
   previousLocation = this.props.location;
 
-  componentWillUpdate(nextProps: RouteComponentProps<void>) {
+  componentWillUpdate(nextProps: RouteComponentProps<{}>) {
     const { location } = this.props;
     // set previousLocation if props.location is not modal
     if (
diff --git a/types/react-router/test/examples-from-react-router-website/NoMatch.tsx b/types/react-router/test/examples-from-react-router-website/NoMatch.tsx
index 83c359d33e..887efca027 100644
--- a/types/react-router/test/examples-from-react-router-website/NoMatch.tsx
+++ b/types/react-router/test/examples-from-react-router-website/NoMatch.tsx
@@ -39,7 +39,7 @@ const Home = () => (
 
 const WillMatch = () => <h3>Matched!</h3>;
 
-const NoMatch: React.SFC<RouteComponentProps<void>> = ({ location }) => (
+const NoMatch: React.SFC<RouteComponentProps<{}>> = ({ location }) => (
   <div>
     <h3>No match for <code>{location.pathname}</code></h3>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx b/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
index b723821080..10f3f46bd1 100644
--- a/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
+++ b/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
@@ -17,7 +17,7 @@ const Main = () => <h2>Main</h2>;
 
 const Sandwiches = () => <h2>Sandwiches</h2>;
 
-interface PropsWithRoutes extends RouteComponentProps<void> {
+interface PropsWithRoutes extends RouteComponentProps<{}> {
   routes: MyRouteProps[];
 }
 
diff --git a/types/react-router/tsconfig.json b/types/react-router/tsconfig.json
index a9342966b5..95e3846a8c 100644
--- a/types/react-router/tsconfig.json
+++ b/types/react-router/tsconfig.json
@@ -39,7 +39,6 @@
         "test/MemoryRouter.tsx",
         "test/Switch.tsx",
         "test/InheritingRoute.tsx",
-        "test/WithRouter.tsx",
-        "test/WithRouterDecorator.tsx"
+        "test/WithRouter.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-router/v2/lib/Link.d.ts b/types/react-router/v2/lib/Link.d.ts
index d90578b9f9..e86fcf2091 100644
--- a/types/react-router/v2/lib/Link.d.ts
+++ b/types/react-router/v2/lib/Link.d.ts
@@ -7,7 +7,7 @@ type Link = Link.Link;
 export default Link;
 
 declare namespace Link {
-    interface LinkProps extends React.HTMLAttributes<Link> {
+    interface LinkProps extends React.LinkHTMLAttributes<Link> {
         activeStyle?: React.CSSProperties;
         activeClassName?: string;
         onlyActiveOnIndex?: boolean;
diff --git a/types/react-router/v2/lib/Router.d.ts b/types/react-router/v2/lib/Router.d.ts
index a7dff58369..6611fa55a9 100644
--- a/types/react-router/v2/lib/Router.d.ts
+++ b/types/react-router/v2/lib/Router.d.ts
@@ -83,8 +83,8 @@ declare namespace Router {
 
     interface RouteComponentProps<P, R> {
         history?: History;
-        location?: Location;
-        params?: P;
+        location: Location;
+        params: P;
         route?: PlainRoute;
         routeParams?: R;
         routes?: PlainRoute[];
diff --git a/types/react-s-alert/index.d.ts b/types/react-s-alert/index.d.ts
new file mode 100644
index 0000000000..42a0557162
--- /dev/null
+++ b/types/react-s-alert/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for react-s-alert 1.3
+// Project: https://github.com/juliancwirko/react-s-alert
+// Definitions by: mitsuruog <https://github.com/mitsuruog>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+declare class SAlert extends React.Component<SAlert.SAlertProps> {}
+
+declare namespace SAlert {
+  interface SAlertConfigProps {
+    position?: string;
+    offset?: number;
+    stack?: boolean | SAlertStackProps;
+    effect?: string;
+    beep?: string | boolean | SAlertBeepProps;
+    timeout?: string | number;
+    html?: boolean;
+    onClose?: () => void;
+    onShow?: () => void;
+    customFields?: object;
+    contentTemplate?: (...args: any[]) => any;
+  }
+
+  interface SAlertProps extends SAlertConfigProps {
+    message?: string;
+  }
+
+  interface SAlertStackProps {
+    limit?: number;
+    spacing?: number;
+  }
+
+  interface SAlertBeepProps {
+    info?: string;
+    error?: string;
+    warning?: string;
+    success?: string;
+  }
+
+  function info(msg?: string, data?: SAlertConfigProps): number;
+
+  function error(msg?: string, data?: SAlertConfigProps): number;
+
+  function warning(msg?: string, data?: SAlertConfigProps): number;
+
+  function success(msg?: string, data?: SAlertConfigProps): number;
+
+  function close(id: number): void;
+
+  function closeAll(): void;
+}
+
+export default SAlert;
diff --git a/types/react-s-alert/react-s-alert-tests.tsx b/types/react-s-alert/react-s-alert-tests.tsx
new file mode 100644
index 0000000000..5c8af89a96
--- /dev/null
+++ b/types/react-s-alert/react-s-alert-tests.tsx
@@ -0,0 +1,46 @@
+import * as React from "react";
+import Alert from "react-s-alert";
+
+const config = {
+    position: "top",
+    offset: 100,
+    stack: {
+        limit: 3,
+        spacing: 50,
+    },
+    effect: "genie",
+    beep: {
+        info: "beep.mp3",
+        error: "beep.mp3",
+        warning: "beep.mp3",
+        success: "beep.mp3",
+    },
+    timeout: 1000,
+    html: true,
+    onClose: () => {},
+    onShow: () => {},
+    customFields: {},
+};
+
+class Test extends React.Component {
+    render() {
+        return (
+          <div>
+              <Alert />
+              <Alert
+                  {...config}
+              />
+          </div>
+        );
+    }
+}
+
+Alert.info("I am a info message.", config);
+Alert.error("I am an error message.", config);
+Alert.warning("I am a warning message.", config);
+Alert.success("I am a success message", config);
+
+const index = Alert.info("Hello");
+Alert.close(index);
+
+Alert.closeAll();
diff --git a/types/react-s-alert/tsconfig.json b/types/react-s-alert/tsconfig.json
new file mode 100644
index 0000000000..c029ed03aa
--- /dev/null
+++ b/types/react-s-alert/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-s-alert-tests.tsx"
+    ]
+}
diff --git a/types/react-s-alert/tslint.json b/types/react-s-alert/tslint.json
new file mode 100644
index 0000000000..593f1d33c8
--- /dev/null
+++ b/types/react-s-alert/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+ }
diff --git a/types/react-scroll/modules/components/Link.d.ts b/types/react-scroll/modules/components/Link.d.ts
index d15d460605..887cf1ddc7 100644
--- a/types/react-scroll/modules/components/Link.d.ts
+++ b/types/react-scroll/modules/components/Link.d.ts
@@ -5,6 +5,7 @@ export interface ReactScrollLinkProps {
     containerId?: string;
     activeClass?: string;
     spy?: boolean;
+    hashSpy?: boolean;
     smooth?: boolean | string;
     offset?: number;
     delay?: number;
diff --git a/types/react-scrollbar/tslint.json b/types/react-scrollbar/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-scrollbar/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index 7ee2bbd810..f4a0db94dc 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-select 1.0
+// Type definitions for react-select 1.1
 // Project: https://github.com/JedWatson/react-select
 // Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet>
 //                 Gilad Gray <https://github.com/giladgray>
@@ -153,9 +153,15 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
     autoBlur?: boolean;
     /**
      * autofocus the component on mount
+     * @deprecated. Use autoFocus instead
      * @default false
      */
     autofocus?: boolean;
+    /**
+     * autofocus the component on mount
+     * @default false
+     */
+    autoFocus?: boolean;
     /**
      *  If enabled, the input will expand as the length of its value increases
      */
@@ -358,7 +364,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
     /**
      * option component to render in dropdown
      */
-    optionComponent?: React.ComponentType;
+    optionComponent?: React.ComponentType<TValue>;
     /**
      * function which returns a custom way to render the options in the menu
      */
@@ -423,7 +429,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
     /**
      *  value component to render
      */
-    valueComponent?: React.ComponentType;
+    valueComponent?: React.ComponentType<TValue>;
 
     /**
      *  optional style to apply to the component wrapper
diff --git a/types/react-select/react-select-tests.tsx b/types/react-select/react-select-tests.tsx
index 000042c1d0..f53f905c9b 100644
--- a/types/react-select/react-select-tests.tsx
+++ b/types/react-select/react-select-tests.tsx
@@ -114,7 +114,7 @@ describe("react-select", () => {
 
     it("Focus method", () => {
         class Component extends React.PureComponent {
-            private selectRef = (component: ReactSelect) => {
+            private readonly selectRef = (component: ReactSelect) => {
                 component.focus();
             }
 
@@ -171,7 +171,7 @@ describe("Focus events", () => {
 describe("Examples", () => {
     it("Simple example", () => {
         class Component extends React.Component {
-            private onSelectChange: ReactSelectModule.OnChangeSingleHandler<string> = (option) => {
+            private readonly onSelectChange: ReactSelectModule.OnChangeSingleHandler<string> = (option) => {
                 const optionValue: string = option.value;
             }
 
@@ -187,7 +187,7 @@ describe("Examples", () => {
 
     it("onValueClick", () => {
         class Component extends React.Component {
-            private onValueClick: ReactSelectModule.OnValueClickHandler<number> = (option) => {
+            private readonly onValueClick: ReactSelectModule.OnValueClickHandler<number> = (option) => {
                 const optionValue: number = option.value;
             }
 
@@ -208,7 +208,7 @@ describe("Examples", () => {
 
     it("Custom value onValueClick", () => {
         class Component extends React.Component {
-            private onValueClick: ReactSelectModule.OnValueClickHandler<CustomValueType> = (option) => {
+            private readonly onValueClick: ReactSelectModule.OnValueClickHandler<CustomValueType> = (option) => {
                 const optionValue: CustomValueType = option.value;
             }
 
@@ -224,7 +224,7 @@ describe("Examples", () => {
 
     it("Custom value onChange", () => {
         class Component extends React.Component {
-            private onSelectChange: ReactSelectModule.OnChangeSingleHandler<CustomValueType> = (option) => {
+            private readonly onSelectChange: ReactSelectModule.OnChangeSingleHandler<CustomValueType> = (option) => {
                 const optionValue: CustomValueType = option.value;
             }
 
@@ -240,11 +240,11 @@ describe("Examples", () => {
 
     it("Menu renderer example", () => {
         class Component extends React.Component {
-            private onSelectChange: ReactSelectModule.OnChangeSingleHandler<string> = option => {
+            private readonly onSelectChange: ReactSelectModule.OnChangeSingleHandler<string> = option => {
                 const optionValue: string = option.value;
             }
 
-            private menuRenderer: ReactSelectModule.MenuRendererHandler = props => {
+            private readonly menuRenderer: ReactSelectModule.MenuRendererHandler = props => {
                 const options = props.options.map(option => {
                     return <div className="option">{option.label}</div>;
                 });
@@ -265,7 +265,7 @@ describe("Examples", () => {
 
     it("Menu renderer with custom value type example", () => {
         class Component extends React.Component {
-            private menuRenderer: ReactSelectModule.MenuRendererHandler<CustomValueType> = props => {
+            private readonly menuRenderer: ReactSelectModule.MenuRendererHandler<CustomValueType> = props => {
                 const options = props.options.map(option => {
                     return (
                         <div className="option" data-value1={option.value.prop1}
@@ -291,11 +291,11 @@ describe("Examples", () => {
 
     it("Input render example", () => {
         class Component extends React.Component {
-            private onSelectChange: ReactSelectModule.OnChangeSingleHandler<string> = option => {
+            private readonly onSelectChange: ReactSelectModule.OnChangeSingleHandler<string> = option => {
                 const optionValue: string = option.value;
             }
 
-            private inputRenderer: ReactSelectModule.InputRendererHandler = props => {
+            private readonly inputRenderer: ReactSelectModule.InputRendererHandler = props => {
                 return <input {...props} />;
             }
 
diff --git a/types/react-side-effect/tslint.json b/types/react-side-effect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-side-effect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-sketchapp/index.d.ts b/types/react-sketchapp/index.d.ts
new file mode 100644
index 0000000000..fafa693207
--- /dev/null
+++ b/types/react-sketchapp/index.d.ts
@@ -0,0 +1,284 @@
+// Type definitions for react-sketchapp 0.12
+// Project: https://github.com/airbnb/react-sketchapp
+// Definitions by: Rico Kahler <https://github.com/ricokahler>
+//                 DomiR <https://github.com/DomiR>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+declare global {
+    const context: SketchContext;
+}
+
+// sketch interfaces taken from
+// https://github.com/airbnb/react-sketchapp/blob/v0.12.1/src/types.js
+export interface SketchPage { name: () => any; }
+export interface SketchAssetCollection {
+    colors: () => any[];
+    gradients: () => any[];
+}
+export interface SketchSharedStyleContainer {
+    setObjects: (objects: any[]) => void;
+    addSharedStyleWithName_firstInstance: (name: string, ins: any) => void;
+}
+export interface SketchDocumentData {
+    layerStyles: () => void;
+    layerTextStyles: () => SketchSharedStyleContainer;
+    layerSymbols: () => void;
+    assets: () => SketchAssetCollection;
+}
+export interface SketchDocument {
+    documentData: () => SketchDocumentData;
+    pages: () => SketchPage[];
+    addBlankPage: () => SketchPage;
+    currentPage: () => SketchPage;
+}
+export interface SketchContext { document: SketchDocument; }
+
+/**
+ * Returns the top-level rendered Sketch object or an array of Sketch objects if you use
+ * components.
+ * @param element Top-level React component that defines your Sketch document.
+ * @param container The element to render into - will be replaced. Should either be a Sketch Group
+ * or Page Object.
+ * @return The top-most rendered native Sketch layer.
+ */
+export function render(element: JSX.Element, container?: any): any;
+
+/**
+ * Returns a Sketch JSON object for further consumption - doesn't add to the page.
+ * @return The top-most Sketch layer as JSON.
+ */
+export function renderToJSON(element: JSX.Element): any;
+
+// https://github.com/airbnb/react-sketchapp/blob/v0.12.1/src/types.js#L59
+export type Color = string | number;
+
+/**
+ * The [`StyleSheet` api uses numbers as IDs][0] to pull registered styles. The component props
+ * can actually take either a `Style` or a `StyleReference` (where the `StyleReference` is given
+ * by a `StyleSheet` obj created with `StyleSheet.create`)
+ * [0]: https://github.com/airbnb/react-sketchapp/blob/v0.12.1/src/stylesheet/index.js#L34
+ */
+export type StyleReference = number;
+
+/**
+ * Represents the base styles that can be applied to a component.
+ */
+export interface Style {
+    shadowColor?: Color;
+    shadowOffset?: { width?: number, height?: number };
+    shadowOpacity?: number;
+    shadowRadius?: number;
+    width?: number;
+    height?: number;
+    top?: number;
+    left?: number;
+    right?: number;
+    bottom?: number;
+    minWidth?: number;
+    maxWidth?: number;
+    minHeight?: number;
+    maxHeight?: number;
+    margin?: number;
+    marginVertical?: number;
+    marginHorizontal?: number;
+    marginTop?: number;
+    marginBottom?: number;
+    marginLeft?: number;
+    marginRight?: number;
+    padding?: number;
+    paddingVertical?: number;
+    paddingHorizontal?: number;
+    paddingTop?: number;
+    paddingBottom?: number;
+    paddingLeft?: number;
+    paddingRight?: number;
+    borderWidth?: number;
+    borderTopWidth?: number;
+    borderRightWidth?: number;
+    borderBottomWidth?: number;
+    borderLeftWidth?: number;
+    position?: 'absolute' | 'relative';
+    flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse';
+    flexWrap?: 'wrap' | 'nowrap';
+    justifyContent?: 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around';
+    alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch';
+    alignSelf?: 'auto' | 'flex-start' | 'flex-end' | 'center' | 'stretch';
+    overflow?: 'visible' | 'hidden' | 'scroll';
+    flex?: number;
+    flexGrow?: number;
+    flexShrink?: number;
+    flexBasis?: number;
+    aspectRatio?: number;
+    zIndex?: number;
+    backfaceVisibility?: 'visible' | 'hidden';
+    backgroundColor?: Color;
+    borderColor?: Color;
+    borderTopColor?: Color;
+    borderRightColor?: Color;
+    borderBottomColor?: Color;
+    borderLeftColor?: Color;
+    borderRadius?: number;
+    borderTopLeftRadius?: number;
+    borderTopRightRadius?: number;
+    borderBottomLeftRadius?: number;
+    borderBottomRightRadius?: number;
+    borderStyle?: 'solid' | 'dotted' | 'dashed';
+    opacity?: number;
+}
+
+/**
+ * Represents all the Styles that can be applied to a `<Text/>` component. The this interface
+ * extends the `Style` interface
+ */
+export interface TextStyle extends Style {
+    color?: Color;
+    fontFamily?: string;
+    fontSize?: number;
+    fontStyle?: 'normal' | 'italic';
+    fontWeight?: string;
+    textDecorationLine?: 'none' | 'underline' | 'double' | 'line-through';
+    textShadowOffset?: { width: number, height: number };
+    textShadowRadius?: number;
+    textShadowColor?: Color;
+    letterSpacing?: number;
+    lineHeight?: number;
+    textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify';
+    writingDirection?: 'auto' | 'ltr' | 'rtl';
+}
+
+// wanted to type these as classes because they are implemented as classes and typing them this
+// way gives you typings like `Artboard.prototype`
+
+// Artboard
+export interface ArtboardProps {
+    /**
+     * The name to be displayed in the Sketch Layer List
+     */
+    name?: string;
+    children?: any;
+    style?: Style | StyleReference;
+}
+/**
+ * Wrapper for Sketch's Artboards.
+ */
+export class Artboard extends React.Component<ArtboardProps, any> { }
+
+// Image
+export type ImageSource = string | { src: string };
+export type ResizeMode = 'contain' | 'cover' | 'stretch' | 'center' | 'repeat' | 'none';
+export interface ImageProps {
+    children?: any;
+    source?: ImageSource;
+    style?: Style | StyleReference;
+    resizeMode: ResizeMode;
+}
+export class Image extends React.Component<ImageProps, any> { }
+
+// RedBox
+export interface RedBoxProps {
+    /** A JavaScript Error object */
+    error: Error;
+}
+/**
+ * A red box / 'red screen of death' error handler. Thanks to
+ * [commissure/redbox-react.](https://github.com/commissure/redbox-react)
+ */
+export class RedBox extends React.Component<RedBoxProps, any> { }
+
+// Text
+export interface TextProps {
+    name?: string;
+    children?: string;
+    style?: TextStyle | StyleReference;
+}
+/** Text primitives */
+export class Text extends React.Component<TextProps, any> { }
+
+// View
+export interface ViewProps {
+    name?: string;
+    children?: any;
+    style?: Style | StyleReference;
+}
+/** View primitives */
+export class View extends React.Component<ViewProps, any> { }
+
+export const StyleSheet: {
+    hairlineWidth: 1;
+    absoluteFill: StyleReference;
+    /**
+     * Create an optimized `StyleSheet` reference from a style object.
+     */
+    create: <T extends { [key: string]: Style | TextStyle }>(t: T) => {
+        [P in keyof T]: StyleReference
+    };
+    /**
+     * Flatten an array of style objects into one aggregated object, or look up the definition for a
+     * registered stylesheet.
+     */
+    flatten: (
+        input: Array<Style | TextStyle | StyleReference> | StyleReference | undefined | Style
+    ) => Style | TextStyle, // returns the expanded style or expanded style reference which conforms
+    // to the `Style | TextStyle` interface
+    /**
+     * resolve one style
+     */
+    resolve: (style: Style | TextStyle) => { style: Style | TextStyle }
+};
+
+/**
+ * An interface to Sketch's shared text styles. Create styles with or without rendering them to
+ * the document canvas.
+ */
+export const TextStyles: {
+    /**
+     * The primary interface to TextStyles. Call this before rendering.
+     */
+    create: (
+        options: { context: SketchContext, clearExistingStyles?: boolean },
+        styles: { [key: string]: TextStyle },
+    ) => any,
+    /**
+     * Find a stored native Sketch style object for a given JavaScript style object. You probably
+     * don't need to use this.
+     */
+    resolve: (style: TextStyle) => any,
+    /**
+     * Find a stored style by name.
+     */
+    get: (name: string) => TextStyle | undefined,
+    /**
+     * Find all of the registered styles. You probably don't need to use this.
+     */
+    styles: { [key: string]: TextStyle | undefined },
+    /**
+     * Reset the registered styles.
+     */
+    clear: () => void,
+};
+
+// Symbols
+/**
+ * Returns a Sketch symbol given a node and an optional name.
+ * @param node The node object that will be rendered as a symbol
+ * @param name Optional name for the symbol, string can include backslashes to organize these
+ * symbols with Sketch. For example squares/blue
+ */
+export function makeSymbol<P>(
+    node: React.ComponentClass<P> | ((props: P) => JSX.Element),
+    name?: string
+): React.ComponentClass<P & { overrides?: { [key: string]: any } }>;
+
+/**
+ * Injects the symbols into Sketch's symbol page. **Call this before rendering.**
+ */
+export function injectSymbols(context: SketchContext): void;
+
+export const Platform: {
+    OS: 'sketch',
+    Version: 1,
+    select: (obj: any) => any
+};
diff --git a/types/react-sketchapp/react-sketchapp-tests.tsx b/types/react-sketchapp/react-sketchapp-tests.tsx
new file mode 100644
index 0000000000..a3e339c625
--- /dev/null
+++ b/types/react-sketchapp/react-sketchapp-tests.tsx
@@ -0,0 +1,45 @@
+import {
+    Artboard, View, Text, StyleSheet, TextStyles, render, renderToJSON, Platform
+} from 'react-sketchapp';
+
+// the styles object should be a mapped typed mapping the keys of the object literal to numbers
+const styles = StyleSheet.create({
+    red: {
+        backgroundColor: '#FF00000'
+    },
+    flexRow: {
+        flexDirection: 'row'
+    }
+});
+
+// style references are numbers
+const styleReference = styles.red;
+
+const Document = () => <Artboard name="some artboard name" style={{ backgroundColor: '#FF0000' }} >
+    <View name="some view name" style={{ backgroundColor: '#FF0000' }} >
+        <Text name="some text name">text must be a string</Text>
+    </View>
+    <View style={styles.red}>
+    </View>
+</Artboard>;
+
+render(<Document />);
+renderToJSON(<Document />);
+
+// Artboard is typed with a class so the prototype should be typed too (not very useful though)
+Artboard.prototype.componentDidMount;
+
+// TODO: currently this interface returns any but it looks like this method produces a side-effect
+// and the return type isn't used anyway
+TextStyles.create(context as any, {
+    normal: {
+        fontSize: 16,
+    },
+    heading: {
+        fontSize: 16 * 1.618,
+        fontWeight: 'bold',
+    }
+});
+
+const shouldBeSketch = Platform.OS;
+const shouldBe1 = Platform.Version;
diff --git a/types/react-sketchapp/tsconfig.json b/types/react-sketchapp/tsconfig.json
new file mode 100644
index 0000000000..6dc8b9460a
--- /dev/null
+++ b/types/react-sketchapp/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "target": "es2017",
+        "module": "commonjs",
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "baseUrl": "../",
+        "jsx": "preserve",
+        "typeRoots": [
+            "../"
+        ],
+        "lib": [
+            "es2015"
+        ],
+        "types": [],
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-sketchapp-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-sketchapp/tslint.json b/types/react-sketchapp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-sketchapp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-slick/index.d.ts b/types/react-slick/index.d.ts
index ab010943e5..4447e9d50f 100644
--- a/types/react-slick/index.d.ts
+++ b/types/react-slick/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for react-slick 0.14
+// Type definitions for react-slick 0.15
 // Project: https://github.com/akiran/react-slick
-// Definitions by: Andrey Balokha <https://github.com/andrewBalekha>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+// Definitions by: Andrey Balokha <https://github.com/andrewBalekha>
+//                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -12,6 +14,8 @@ export interface CustomArrowProps {
   className?: string;
   style?: React.CSSProperties;
   onClick?: React.MouseEventHandler<any>;
+  currentSlide?: number;
+  slideCount?: number;
 }
 
 export interface ResponsiveObject {
diff --git a/types/react-slick/react-slick-tests.tsx b/types/react-slick/react-slick-tests.tsx
index 4ed6dbb901..18a104049f 100644
--- a/types/react-slick/react-slick-tests.tsx
+++ b/types/react-slick/react-slick-tests.tsx
@@ -9,11 +9,13 @@ class LeftNavArrow extends React.Component<CustomArrowProps> {
 
 function RightNavArrow(props: CustomArrowProps): JSX.Element {
   const { className, style, onClick } = props;
-  return <div
-    className={className}
-    style={{ ...style, display: 'block', background: 'green' }}
-    onClick={onClick}
-  ></div>;
+  return (
+    <div
+      className={className}
+      style={{ ...style, display: 'block', background: 'green' }}
+      onClick={onClick}
+    />
+  );
 }
 
 const defaultSettings: Settings = {
diff --git a/types/react-smooth-scrollbar/index.d.ts b/types/react-smooth-scrollbar/index.d.ts
index 666863ed05..b8e4e7d149 100644
--- a/types/react-smooth-scrollbar/index.d.ts
+++ b/types/react-smooth-scrollbar/index.d.ts
@@ -1,18 +1,19 @@
-// Type definitions for react-smooth-scrollbar 7.2
+// Type definitions for react-smooth-scrollbar 8.0
 // Project: https://github.com/idiotWu/react-smooth-scrollbar
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from "react";
-import SmoothScrollbar, { ScrollbarOptions, ScrollStatusObject } from "smooth-scrollbar";
+import SmoothScrollbar from "smooth-scrollbar";
+import { ScrollbarOptions, ScrollStatus } from "smooth-scrollbar/interfaces";
 
 declare namespace Scrollbar {
-    interface ScrollbarProps extends ScrollbarOptions {
+    interface ScrollbarProps extends Partial<ScrollbarOptions> {
         /**
          * Pipe to scrollbar.addListener()
          */
-        onScroll?(status: ScrollStatusObject, scrollbarInstance: SmoothScrollbar): void;
+        onScroll?(status: ScrollStatus, scrollbarInstance: SmoothScrollbar): void;
         /**
          * Keep scrollbar tracks visible whether it's scrolling or not
          * @default false
diff --git a/types/react-smooth-scrollbar/package.json b/types/react-smooth-scrollbar/package.json
new file mode 100644
index 0000000000..7ac9adfbff
--- /dev/null
+++ b/types/react-smooth-scrollbar/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "smooth-scrollbar": "^8.2.5"
+    }
+}
diff --git a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
index ac9c2a31da..b976624a4e 100644
--- a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
+++ b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
@@ -1,8 +1,14 @@
 import * as React from "react";
-import * as SmoothScrollbar from "react-smooth-scrollbar";
+import * as SmoothScrollbar from 'react-smooth-scrollbar';
 
 <SmoothScrollbar className="test" alwaysShowTracks onScroll={(status, instance) => { } } />;
-<SmoothScrollbar speed={10} overscrollEffect="bounce" />;
+// <SmoothScrollbar speed={10} overscrollEffect="bounce" />; TODO: These options don't seem to be documented
+
+declare const number: number;
+declare const boolean: boolean;
+declare const element: EventTarget;
+declare const object: object;
+declare const func: () => void;
 
 class Test extends React.Component {
     ref: SmoothScrollbar | null;
@@ -19,3 +25,23 @@ class Test extends React.Component {
         );
     }
 }
+
+class App extends React.Component {
+    render() {
+        return (
+            <SmoothScrollbar
+                damping={number}
+                thumbMinSize={number}
+                // syncCallbacks={boolean} This is in the example, but isn't documented in "Available options"
+                renderByPixels={boolean}
+                alwaysShowTracks={boolean}
+                continuousScrolling={boolean}
+                wheelEventTarget={element}
+                plugins={object}
+                onScroll={func}
+            >
+                your contents here...
+            </SmoothScrollbar>
+        );
+    }
+}
diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 767cf1405c..199156100e 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -1,83 +1,81 @@
-// Type definitions for nes 0.6.3
+// Type definitions for react-sortable-hoc 0.6
 // Project: https://github.com/clauderic/react-sortable-hoc
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>, Charles Rey <https://github.com/charlesrey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-declare module 'react-sortable-hoc' {
-    import * as React from 'react';
+import * as React from 'react';
 
-    export type Axis = 'x' | 'y' | 'xy';
+export type Axis = 'x' | 'y' | 'xy';
 
-    export type Offset = number | string;
+export type Offset = number | string;
 
-    export interface SortStart {
-        node: Element;
-        index: number;
-        collection: Offset;
-    }
-
-    export type SortEvent = React.MouseEvent<any> | React.TouchEvent<any>;
-
-    export type SortStartHandler = (sort: SortStart, event: SortEvent) => void;
-
-    export type SortMoveHandler = (event: SortEvent) => void;
-
-    export interface SortEnd {
-        oldIndex: number;
-        newIndex: number;
-        collection: Offset;
-    }
-
-    export type SortEndHandler = (sort: SortEnd, event: SortEvent) => void;
-
-    export type ContainerGetter = (element: React.ReactElement<any>) => HTMLElement;
-
-    export interface Dimensions {
-        width: number;
-        height: number;
-    }
-
-    export interface SortableContainerProps {
-        axis?: Axis;
-        lockAxis?: Axis;
-        helperClass?: string;
-        transitionDuration?: number;
-        pressDelay?: number;
-        pressThreshold?: number;
-        distance?: number;
-        shouldCancelStart?: (event: SortEvent) => boolean;
-        onSortStart?: SortStartHandler;
-        onSortMove?: SortMoveHandler;
-        onSortEnd?: SortEndHandler;
-        useDragHandle?: boolean;
-        useWindowAsScrollContainer?: boolean;
-        hideSortableGhost?: boolean;
-        lockToContainerEdges?: boolean;
-        lockOffset?: Offset | [Offset, Offset];
-        getContainer?: ContainerGetter;
-        getHelperDimensions?: (sort: SortStart) => Dimensions;
-    }
-
-    export interface SortableElementProps {
-        index: number;
-        collection?: Offset;
-        disabled?: boolean;
-    }
-
-    export interface Config {
-        withRef: boolean;
-    }
-
-    export type WrappedComponentFactory<P> = (props: P) => JSX.Element;
-
-    export type WrappedComponent<P> = React.ComponentClass<P> | WrappedComponentFactory<P>;
-
-    export function SortableContainer<P>(wrappedComponent: WrappedComponent<P>, config?: Config): React.ComponentClass<P & SortableContainerProps>;
-
-    export function SortableElement<P>(wrappedComponent: WrappedComponent<P>, config?: Config): React.ComponentClass<P & SortableElementProps>;
-
-    export function SortableHandle<P>(wrappedComponent: WrappedComponent<P>, config?: Config): React.ComponentClass<P>;
-
-    export function arrayMove<T>(collection: Array<T>, previousIndex: number, newIndex: number): Array<T>;
+export interface SortStart {
+    node: Element;
+    index: number;
+    collection: Offset;
 }
+
+export type SortEvent = React.MouseEvent<any> | React.TouchEvent<any>;
+
+export type SortStartHandler = (sort: SortStart, event: SortEvent) => void;
+
+export type SortMoveHandler = (event: SortEvent) => void;
+
+export interface SortEnd {
+    oldIndex: number;
+    newIndex: number;
+    collection: Offset;
+}
+
+export type SortEndHandler = (sort: SortEnd, event: SortEvent) => void;
+
+export type ContainerGetter = (element: React.ReactElement<any>) => HTMLElement;
+
+export interface Dimensions {
+    width: number;
+    height: number;
+}
+
+export interface SortableContainerProps {
+    axis?: Axis;
+    lockAxis?: Axis;
+    helperClass?: string;
+    transitionDuration?: number;
+    pressDelay?: number;
+    pressThreshold?: number;
+    distance?: number;
+    shouldCancelStart?: (event: SortEvent) => boolean;
+    onSortStart?: SortStartHandler;
+    onSortMove?: SortMoveHandler;
+    onSortEnd?: SortEndHandler;
+    useDragHandle?: boolean;
+    useWindowAsScrollContainer?: boolean;
+    hideSortableGhost?: boolean;
+    lockToContainerEdges?: boolean;
+    lockOffset?: Offset | [Offset, Offset];
+    getContainer?: ContainerGetter;
+    getHelperDimensions?: (sort: SortStart) => Dimensions;
+}
+
+export interface SortableElementProps {
+    index: number;
+    collection?: Offset;
+    disabled?: boolean;
+}
+
+export interface Config {
+    withRef: boolean;
+}
+
+export type WrappedComponentFactory<P> = (props: P) => JSX.Element;
+
+export type WrappedComponent<P> = React.ComponentClass<P> | WrappedComponentFactory<P>;
+
+export function SortableContainer<P>(wrappedComponent: WrappedComponent<P>, config?: Config): React.ComponentClass<P & SortableContainerProps>;
+
+export function SortableElement<P>(wrappedComponent: WrappedComponent<P>, config?: Config): React.ComponentClass<P & SortableElementProps>;
+
+export function SortableHandle<P>(wrappedComponent: WrappedComponent<P>, config?: Config): React.ComponentClass<P>;
+
+export function arrayMove<T>(collection: T[], previousIndex: number, newIndex: number): T[];
diff --git a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
index af742734bf..236f39b77a 100644
--- a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
+++ b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
@@ -7,18 +7,18 @@ interface SortableItemProps {
 }
 
 interface SortableListProps {
-    items: Array<string>;
-    axis: 'x' | 'y' | 'xy'
+    items: string[];
+    axis: 'x' | 'y' | 'xy';
 }
 
 type SortableComponentState = SortableListProps;
 
 class Item extends React.Component<SortableItemProps> {
-    public constructor(props: SortableItemProps) {
+    constructor(props: SortableItemProps) {
         super(props);
     }
 
-    public render(): JSX.Element {
+    render(): JSX.Element {
         return <li>{this.props.value}</li>;
     }
 }
@@ -26,14 +26,14 @@ class Item extends React.Component<SortableItemProps> {
 const SortableItem = ReactSortableHOC.SortableElement(Item);
 
 const SortableList = ReactSortableHOC.SortableContainer((props: SortableListProps): JSX.Element => {
-    const items: Array<JSX.Element> = props.items.map((value: string, index: number): JSX.Element => {
+    const items: JSX.Element[] = props.items.map((value: string, index: number): JSX.Element => {
         return <SortableItem key={`item-${index}`} index={index} value={value} />;
     });
     return <ul>{items}</ul>;
 });
 
 class SortableComponent extends React.Component<{}, SortableComponentState> {
-    private _onSortEnd: ReactSortableHOC.SortEndHandler;
+    private readonly _onSortEnd: ReactSortableHOC.SortEndHandler;
 
     private _handleSortEnd(sort: ReactSortableHOC.SortEnd, event: ReactSortableHOC.SortEvent): void {
         this.setState({items: ReactSortableHOC.arrayMove(this.state.items, sort.oldIndex, sort.newIndex)});
@@ -49,8 +49,8 @@ class SortableComponent extends React.Component<{}, SortableComponentState> {
         return {width: 0, height: 0};
     }
 
-    public constructor() {
-        super();
+    constructor() {
+        super({});
         this.state = {
             items: ['Item 1', 'Item 2', 'Item 3', 'Item 4', 'Item 5', 'Item 6'],
             axis: 'x'
@@ -58,7 +58,7 @@ class SortableComponent extends React.Component<{}, SortableComponentState> {
         this._onSortEnd = this._handleSortEnd.bind(this);
     }
 
-    public render(): JSX.Element {
+    render(): JSX.Element {
         return <SortableList
             items={this.state.items}
             axis={this.state.axis}
@@ -70,6 +70,6 @@ class SortableComponent extends React.Component<{}, SortableComponentState> {
     }
 }
 
-let bootstrapNode: HTMLDivElement = document.createElement('div');
+const bootstrapNode: HTMLDivElement = document.createElement('div');
 ReactDOM.render(<SortableComponent />, bootstrapNode);
 document.body.appendChild(bootstrapNode);
diff --git a/types/react-sortable-hoc/tslint.json b/types/react-sortable-hoc/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-sortable-hoc/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-sortable-pane/index.d.ts b/types/react-sortable-pane/index.d.ts
new file mode 100644
index 0000000000..97b35f04bd
--- /dev/null
+++ b/types/react-sortable-pane/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for react-sortable-pane 0.6
+// Project: https://github.com/bokuweb/react-sortable-pane
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export type PaneId = string | number;
+
+export interface PaneSize {
+    width: number;
+    height: number;
+}
+
+export interface PaneProperty {
+    id: PaneId;
+    width: number | string;
+    height: number | string;
+    order: number;
+}
+
+export interface PaneResizeData {
+    pane: PaneProperty;
+    direction: 'x' | 'y' | 'xy';
+    delta: PaneSize;
+}
+
+export interface SortablePaneProps {
+    className?: string;
+    style?: React.HTMLAttributes<HTMLElement>;
+    direction?: 'horizontal' | 'vertical';
+    margin?: number;
+    zIndex?: number;
+    grid?: [number, number];
+    isSortable?: boolean;
+    disableEffect?: boolean;
+    dragHandleClassName?: string;
+    onOrderChange?: (oldPanes: PaneProperty[], newPanes: PaneProperty[]) => void;
+    onResizeStart?: (
+        e: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>,
+        id: PaneId,
+        panes: PaneProperty[],
+    ) => void;
+    onResize?: (
+        e: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>,
+        id: PaneId,
+        panes: PaneProperty[],
+        data: PaneResizeData,
+    ) => void;
+    onResizeStop?: (
+        e: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>,
+        id: PaneId,
+        panes: PaneProperty[],
+        data: PaneResizeData,
+    ) => void;
+    onDragStart?: (
+        e: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>,
+        id: PaneId,
+        panes: PaneProperty[],
+    ) => void;
+    onDragStop?: (
+        e: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>,
+        id: PaneId,
+        panes: PaneProperty[],
+    ) => void;
+}
+
+export class SortablePane extends React.Component<SortablePaneProps> {
+    render(): JSX.Element;
+}
+
+export interface PaneProps {
+    id: PaneId;
+    width: string | number;
+    height: string | number;
+    minWidth?: string | number;
+    minHeight?: string | number;
+    maxWidth?: string | number;
+    maxHeight?: string | number;
+    className?: string;
+    style?: React.HTMLAttributes<HTMLElement>;
+    isResizable?: { x?: boolean; y?: boolean; xy?: boolean };
+}
+
+export class Pane extends React.Component<PaneProps> {
+    render(): JSX.Element;
+}
diff --git a/types/react-sortable-pane/react-sortable-pane-tests.tsx b/types/react-sortable-pane/react-sortable-pane-tests.tsx
new file mode 100644
index 0000000000..78f3907f18
--- /dev/null
+++ b/types/react-sortable-pane/react-sortable-pane-tests.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { SortablePane, Pane } from 'react-sortable-pane';
+
+export default () => {
+    return (
+        <div>
+            <SortablePane direction="horizontal" margin={20}>
+                <Pane id={0} key={0} width={120} height="100%">
+                    <p>0</p>
+                </Pane>
+                <Pane id={1} key={1} width={120} height="100%">
+                    <p>1</p>
+                </Pane>
+            </SortablePane>
+        </div>
+    );
+};
diff --git a/types/react-sortable-pane/tsconfig.json b/types/react-sortable-pane/tsconfig.json
new file mode 100644
index 0000000000..2c919006c5
--- /dev/null
+++ b/types/react-sortable-pane/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-sortable-pane-tests.tsx"
+    ]
+}
diff --git a/types/react-sortable-pane/tslint.json b/types/react-sortable-pane/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-sortable-pane/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-spinkit/tslint.json b/types/react-spinkit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-spinkit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-spinkit/v1/tslint.json b/types/react-spinkit/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-spinkit/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-split-pane/index.d.ts b/types/react-split-pane/index.d.ts
deleted file mode 100644
index db5f27010e..0000000000
--- a/types/react-split-pane/index.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for react-split-pane v0.1.64
-// Project: https://github.com/tomkp/react-split-pane
-// Definitions by: Roger Chen <https://github.com/rcchen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="react"/>
-
-declare namespace ReactSplitPane {
-    interface ReactSplitPaneProps {
-        allowResize?: boolean;
-        className?: string;
-        /**
-         * Either a number (in pixels) or string (percentage)
-         */
-        defaultSize?: number | string;
-        /**
-         * Either a number (in pixels) or string (percentage)
-         */
-        maxSize?: number | string;
-        /**
-         * Either a number (in pixels) or string (percentage)
-         */
-        minSize?: number | string;
-        onChange?: Function;
-        onDragFinished?: Function;
-        onDragStarted?: Function;
-        primary?: string;
-        onResizerClick?: Function;
-        onResizerDoubleClick?: Function;
-        
-        /**
-         * Either a number (in pixels) or string (percentage)
-         */
-        size?: number | string;
-        split?: string;
-        step?: number;
-        /* Styling to be applied to both panes */
-        paneStyle?: React.CSSProperties;
-        /* Styling to be applied to the first pane, with precedence over paneStyle */
-        pane1Style?: React.CSSProperties;
-        /* Styling to be applied to the second pane, with precedence over paneStyle */
-        pane2Style?: React.CSSProperties;
-        /* Class name to be applied to resizer bar */
-        resizerClassName?: string;
-        /* Styling to be applied to the resizer bar */
-        resizerStyle?: React.CSSProperties;
-    }
-
-    interface ReactSplitPaneClass extends React.ComponentClass<ReactSplitPaneProps> { }
-}
-
-declare module "react-split-pane" {
-    var split: ReactSplitPane.ReactSplitPaneClass;
-    export = split;
-}
diff --git a/types/react-split-pane/react-split-pane-tests.tsx b/types/react-split-pane/react-split-pane-tests.tsx
deleted file mode 100644
index 91efe8d23f..0000000000
--- a/types/react-split-pane/react-split-pane-tests.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from "react";
-import * as SplitPane from "react-split-pane";
-
-class SplitPaneTest extends React.Component<React.Props<{}>> {
-
-    render() {
-        return (
-            <SplitPane
-                allowResize={true}
-                className="pane"
-                defaultSize={30}
-                maxSize={50}
-                minSize={20}
-                split="vertical"
-            >
-                <div />
-                <div />
-            </SplitPane>
-        );
-    }
-}
diff --git a/types/react-split-pane/tsconfig.json b/types/react-split-pane/tsconfig.json
deleted file mode 100644
index 4c7d16ba33..0000000000
--- a/types/react-split-pane/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "jsx": "react",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "react-split-pane-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 4322dfab89..72dea90475 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for react-stripe-elements 1.0
 // Project: https://github.com/stripe/react-stripe-elements#readme
 // Definitions by: dan-j <https://github.com/dan-j>
+//                 Santiago Doldan <https://github.com/santiagodoldan>
+//                 sonnysangha <https://github.com/sonnysangha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -37,12 +39,14 @@ export namespace ReactStripeElements {
 	}
 
 	interface InjectedStripeProps {
-		stripe: StripeProps;
+		stripe?: StripeProps;
 	}
 
 	interface ElementProps extends ElementsOptions {
 		className?: string;
 
+		paymentRequest?: object;
+
 		elementRef?(): void;
 
 		onChange?(event: ElementChangeResponse): void;
@@ -58,7 +62,7 @@ export namespace ReactStripeElements {
 export class StripeProvider extends React.Component<ReactStripeElements.StripeProviderProps> {
 }
 
-export class Elements extends React.Component {
+export class Elements extends React.Component<stripe.elements.ElementsCreateOptions> {
 }
 
 export function injectStripe<P extends object>(
@@ -79,3 +83,6 @@ export class CardCVCElement extends React.Component<ReactStripeElements.ElementP
 
 export class PostalCodeElement extends React.Component<ReactStripeElements.ElementProps> {
 }
+
+export class PaymentRequestButtonElement extends React.Component<ReactStripeElements.ElementProps> {
+}
diff --git a/types/react-stripe-elements/react-stripe-elements-tests.tsx b/types/react-stripe-elements/react-stripe-elements-tests.tsx
index 715f3c1f83..e737914e31 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -14,6 +14,7 @@ import InjectedStripeProps = ReactStripeElements.InjectedStripeProps;
 
 import ElementChangeResponse = stripe.elements.ElementChangeResponse;
 import ElementsOptions = stripe.elements.ElementsOptions;
+import ElementsCreateOptions = stripe.elements.ElementsCreateOptions;
 import PatchedTokenResponse = ReactStripeElements.PatchedTokenResponse;
 
 const cardElementProps: ElementsOptions = {
@@ -46,6 +47,22 @@ const cardElementProps: ElementsOptions = {
     hideIcon: true,
 };
 
+const fontElementsProps: ElementsCreateOptions = {
+  fonts: [
+    {
+      cssSrc: "https://fonts.googleapis.com/css?family=Dosis"
+    },
+    {
+      family: "Dosis, sanz",
+      src: "url(https://somewebsite.com/path/to/font.woff)",
+      style: "normal",
+      weight: "bold",
+      unicodeRange: "U+26"
+    }
+  ],
+  locale: "es"
+};
+
 const ElementsWithPropsTest: React.SFC = () => (
     <div>
         <CardElement
@@ -92,7 +109,7 @@ interface ComponentProps {
 
 class WrappedComponent extends React.Component<ComponentProps & InjectedStripeProps> {
     onSubmit = () => {
-        this.props.stripe.createToken({
+        this.props.stripe!.createToken({
             name: '',
             address_line1: '',
             address_line2: '',
@@ -133,7 +150,7 @@ class TestHOCs extends React.Component {
     render() {
         return (
             <StripeProvider apiKey="">
-                <Elements>
+                <Elements {...fontElementsProps}>
                     <MainComponent />
                 </Elements>
             </StripeProvider>
@@ -143,7 +160,6 @@ class TestHOCs extends React.Component {
 
 /**
  * Just an extra test to check default props
- * @constructor
  */
 const ElementsDefaultPropsTest: React.SFC = () => (
     <div>
diff --git a/types/react-swf/react-swf-tests.ts b/types/react-swf/react-swf-tests.ts
index 11c79c9940..ff42eed6f0 100644
--- a/types/react-swf/react-swf-tests.ts
+++ b/types/react-swf/react-swf-tests.ts
@@ -1,6 +1,8 @@
 var version = ReactSWF.getFPVersion();
 var isFPVersionSupported = ReactSWF.isFPVersionSupported('5');
-var reactSWF = new ReactSWF();
-reactSWF.props = {
-  src:'',pluginspage:'',width:20,height:20
-}
+var reactSWF = new ReactSWF({
+  src:'',
+  pluginspage:'',
+  width:20,
+  height:20,
+});
diff --git a/types/react-swf/tslint.json b/types/react-swf/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-swf/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-swipe/react-swipe-tests.tsx b/types/react-swipe/react-swipe-tests.tsx
index c8873c8aa6..2a2f0ffc90 100644
--- a/types/react-swipe/react-swipe-tests.tsx
+++ b/types/react-swipe/react-swipe-tests.tsx
@@ -4,26 +4,26 @@ import * as ReactSwipe from "react-swipe";
 class ReactSwipeTest extends React.PureComponent {
     private swipeComponent: ReactSwipe | null = null;
 
-    private onPrev: React.MouseEventHandler<HTMLButtonElement> = () => {
+    private readonly onPrev: React.MouseEventHandler<HTMLButtonElement> = () => {
         if (this.swipeComponent != null) {
             this.swipeComponent.prev();
         }
     }
 
-    private onNext: React.MouseEventHandler<HTMLButtonElement> = () => {
+    private readonly onNext: React.MouseEventHandler<HTMLButtonElement> = () => {
         if (this.swipeComponent != null) {
             this.swipeComponent.next();
         }
     }
 
-    private onSlideToStart: React.MouseEventHandler<HTMLButtonElement> = () => {
+    private readonly onSlideToStart: React.MouseEventHandler<HTMLButtonElement> = () => {
         if (this.swipeComponent != null) {
             const lastSlide = this.swipeComponent.getNumSlides() - 1;
             this.swipeComponent.slide(lastSlide, 1000);
         }
     }
 
-    private onGetCurrentPosition: React.MouseEventHandler<HTMLButtonElement> = () => {
+    private readonly onGetCurrentPosition: React.MouseEventHandler<HTMLButtonElement> = () => {
         const currentPosition = this.swipeComponent != null ? this.swipeComponent.getPos() : 0;
         alert(currentPosition);
     }
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index b0036ae119..1608258c64 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -1,39 +1,42 @@
-// Type definitions for react-swipeable 4.0
+// Type definitions for react-swipeable 4.2
 // Project: https://www.npmjs.com/package/react-swipeable
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Konstantin Vasilev <https://github.com/mctep>
+//                 Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
 
-declare class ReactSwipeable extends React.Component<ReactSwipeable.SwipeableProps> {}
+declare class ReactSwipeable<T extends Element = HTMLElement> extends React.Component<ReactSwipeable.SwipeableProps<T>> {}
 
 declare namespace ReactSwipeable {
-    type OnSwipingCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
-    type OnSwipedCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number) => void;
-    type OnSwipedDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number, isFlick: boolean) => void;
-    type OnSwipingDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number) => void;
-    type OnTapCallback = (event: React.TouchEvent<HTMLElement>) => void;
+    type OnSwipingCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
+    type OnSwipedCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number) => void;
+    type OnSwipedDirectionCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, delta: number, isFlick: boolean) => void;
+    type OnSwipingDirectionCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, delta: number) => void;
+    type OnTapCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>) => void;
 
-    interface SwipeableProps extends React.ClassAttributes<ReactSwipeable>, React.HTMLAttributes<HTMLElement> {
-        onSwiped?: OnSwipedCallback;
-        onSwiping?: OnSwipingCallback;
-        onSwipingUp?: OnSwipingDirectionCallback;
-        onSwipingRight?: OnSwipingDirectionCallback;
-        onSwipingDown?: OnSwipingDirectionCallback;
-        onSwipingLeft?: OnSwipingDirectionCallback;
-        onSwipedUp?: OnSwipedDirectionCallback;
-        onSwipedRight?: OnSwipedDirectionCallback;
-        onSwipedDown?: OnSwipedDirectionCallback;
-        onSwipedLeft?: OnSwipedDirectionCallback;
-        onTap?: OnTapCallback;
+    interface SwipeableProps<T extends Element = HTMLElement> extends React.ClassAttributes<ReactSwipeable<T>>, React.HTMLAttributes<T> {
+        onSwiped?: OnSwipedCallback<T>;
+        onSwiping?: OnSwipingCallback<T>;
+        onSwipingUp?: OnSwipingDirectionCallback<T>;
+        onSwipingRight?: OnSwipingDirectionCallback<T>;
+        onSwipingDown?: OnSwipingDirectionCallback<T>;
+        onSwipingLeft?: OnSwipingDirectionCallback<T>;
+        onSwipedUp?: OnSwipedDirectionCallback<T>;
+        onSwipedRight?: OnSwipedDirectionCallback<T>;
+        onSwipedDown?: OnSwipedDirectionCallback<T>;
+        onSwipedLeft?: OnSwipedDirectionCallback<T>;
+        onTap?: OnTapCallback<T>;
         flickThreshold?: number;
         delta?: number;
         preventDefaultTouchmoveEvent?: boolean;
         stopPropagation?: boolean;
         nodeName?: string;
         trackMouse?: boolean;
+        disabled?: boolean;
+        innerRef?: React.Ref<T>;
         children?: React.ReactNode;
     }
 }
diff --git a/types/react-swipeable/react-swipeable-tests.tsx b/types/react-swipeable/react-swipeable-tests.tsx
index 61093a203e..b31011d63d 100644
--- a/types/react-swipeable/react-swipeable-tests.tsx
+++ b/types/react-swipeable/react-swipeable-tests.tsx
@@ -2,18 +2,18 @@ import * as React from 'react';
 import * as Swipeable from 'react-swipeable';
 
 class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
-  private handleSwiped: Swipeable.OnSwipedCallback = () => {};
-  private handleSwiping: Swipeable.OnSwipingCallback = () => {};
-  private handleSwipingUp: Swipeable.OnSwipingDirectionCallback = () => {};
-  private handleSwipingRight: Swipeable.OnSwipingDirectionCallback = () => {};
-  private handleSwipingDown: Swipeable.OnSwipingDirectionCallback = () => {};
-  private handleSwipingLeft: Swipeable.OnSwipingDirectionCallback = () => {};
-  private handleSwipedUp: Swipeable.OnSwipedDirectionCallback = () => {};
-  private handleSwipedRight: Swipeable.OnSwipedDirectionCallback = () => {};
-  private handleSwipedDown: Swipeable.OnSwipedDirectionCallback = () => {};
-  private handleSwipedLeft: Swipeable.OnSwipedDirectionCallback = () => {};
-  private handleTap: Swipeable.OnTapCallback = () => {};
-  private handleClick = () => {};
+  private readonly handleSwiped: Swipeable.OnSwipedCallback = () => {};
+  private readonly handleSwiping: Swipeable.OnSwipingCallback = () => {};
+  private readonly handleSwipingUp: Swipeable.OnSwipingDirectionCallback = () => {};
+  private readonly handleSwipingRight: Swipeable.OnSwipingDirectionCallback = () => {};
+  private readonly handleSwipingDown: Swipeable.OnSwipingDirectionCallback = () => {};
+  private readonly handleSwipingLeft: Swipeable.OnSwipingDirectionCallback = () => {};
+  private readonly handleSwipedUp: Swipeable.OnSwipedDirectionCallback = () => {};
+  private readonly handleSwipedRight: Swipeable.OnSwipedDirectionCallback = () => {};
+  private readonly handleSwipedDown: Swipeable.OnSwipedDirectionCallback = () => {};
+  private readonly handleSwipedLeft: Swipeable.OnSwipedDirectionCallback = () => {};
+  private readonly handleTap: Swipeable.OnTapCallback = () => {};
+  private readonly handleClick = () => {};
 
   render() {
     return (
@@ -35,6 +35,8 @@ class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
         stopPropagation
         nodeName="swipe"
         trackMouse
+        disabled
+        innerRef="swipe-ref"
         onClick={this.handleClick}
       >
         <div>
@@ -44,3 +46,16 @@ class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
     );
   }
 }
+
+class DivSwipeable extends Swipeable<HTMLDivElement> {}
+const TestComponent: React.StatelessComponent = (_) => {
+    const handleSwiped = (event: React.TouchEvent<HTMLDivElement>) => {};
+    return (
+        <DivSwipeable
+            nodeName="div"
+            onSwiped={handleSwiped}
+        >
+            <div>this is sample code.</div>
+        </DivSwipeable>
+    );
+};
diff --git a/types/react-swipeable/tsconfig.json b/types/react-swipeable/tsconfig.json
index 0d676ade9b..a720949edf 100644
--- a/types/react-swipeable/tsconfig.json
+++ b/types/react-swipeable/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-swipeable-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-syntax-highlighter/tslint.json b/types/react-syntax-highlighter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-syntax-highlighter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 30479e6149..8e347c04c4 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for react-table 6.6
+// Type definitions for react-table 6.7
 // Project: https://github.com/react-tools/react-table
-// Definitions by: Roy Xue <https://github.com/royxue>, Pavel Sakalo <https://github.com/psakalo>
+// Definitions by: Roy Xue <https://github.com/royxue>, Pavel Sakalo <https://github.com/psakalo>, Krzysztof Porębski <https://github.com/Havret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 import * as React from 'react';
@@ -11,19 +11,23 @@ export type Accessor = string | string[] | object | AccessorFunction;
 export type Aggregator = (values: any, rows: any) => any;
 export type TableCellRenderer = ((data: any, column: any) => React.ReactNode) | React.ReactNode;
 export type FilterRender = (params: { column: Column, filter: any, onFilterChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
+export type PivotRenderer = ((cellInfo: any) => React.ReactNode) | (() => any) | string | React.ReactNode;
 
 export type ComponentPropsGetter0 = (finalState: any, rowInfo: undefined, column: undefined, instance?: any) => object | undefined;
 export type ComponentPropsGetterR = (finalState: any, rowInfo?: RowInfo, column?: undefined, instance?: any) => object | undefined;
 export type ComponentPropsGetterC = (finalState: any, rowInfo?: undefined, column?: Column, instance?: any) => object | undefined;
 export type ComponentPropsGetterRC = (finalState: any, rowInfo?: RowInfo, column?: Column, instance?: any) => object | undefined;
 
-export type FilterFunction = (filter: any, row: any, column: any) => boolean;
+export type DefaultFilterFunction = (filter: any, row: any, column: any) => boolean;
+export type FilterFunction = (filter: any, rows: any[], column: any) => boolean;
 export type SubComponentFunction = (rowInfo: RowInfo) => React.ReactNode;
 export type PageChangeFunction = (page: number) => void;
 export type PageSizeChangeFunction = (newPageSize: number, newPage: number) => void;
 export type SortedChangeFunction = (column: any, additive: boolean) => void;
 export type FilteredChangeFunction = (column: any, value: any, pivotColumn: any) => void;
 export type ExpandedChangeFunction = (column: any, event: any, isTouch: boolean) => void;
+export type ResizedChangeFunction = (newResized: any, event: any) => void;
+export type SortFunction = (a: any, b: any, desc: any) => -1 | 0 | 1;
 
 /** NOTE: to many configuration ways (only true values are confusing) */
 export interface SortingRule {
@@ -46,13 +50,22 @@ export interface TableProps extends
     /** Default: false */
     loading: boolean;
 
-    /** Default: false */
+    /** Default: true */
     showPagination: boolean;
 
+    /** Default: false */
+    showPaginationTop: boolean;
+
+    /** Default: true  */
+    showPaginationBottom: boolean;
+
     /** Default: false */
     manual: boolean;
 
-    /** Default: false */
+    /** Default: true */
+    multiSort: boolean;
+
+    /** Default: true */
     showPageSizeOptions: boolean;
 
     /** Default: [5, 10, 20, 25, 50, 100] */
@@ -66,11 +79,14 @@ export interface TableProps extends
      * Otherwise take value from 'pageSize' if defined
      * @TODO: add minRows to react-table defaultProps even if undefined
      */
-    minRows: number;
+    minRows: number | undefined;
 
     /** Default: true */
     showPageJump: boolean;
 
+    /** Default: true */
+    sortable: boolean;
+
     /** Default: true */
     collapseOnSortingChange: boolean;
 
@@ -93,7 +109,10 @@ export interface TableProps extends
     defaultFiltering: any[];
 
     /** Default: ... */
-    defaultFilterMethod: FilterFunction;
+    defaultFilterMethod: DefaultFilterFunction;
+
+    /** Default: ... */
+    defaultSortMethod: SortFunction;
 
     /** Default: true */
     resizable: boolean;
@@ -104,6 +123,21 @@ export interface TableProps extends
     /** Default: [] */
     defaultResizing: any[];
 
+    /** Default: false */
+    defaultSortDesc: boolean;
+
+    /** Default: [] */
+    defaultSorted: any[];
+
+    /** Default: [] */
+    defaultFiltered: any[];
+
+    /** Default: [] */
+    defaultResized: any[];
+
+    /** Default: {} */
+    defaultExpanded: {};
+
     /** On change. */
     onChange: ReactTableFunction;
 
@@ -128,18 +162,36 @@ export interface TableProps extends
 
     /** Privot defaults. */
     pivotDefaults: Partial<PivotDefaults>;
+
+    /** The content rendered inside of a padding row */
+    PadRowComponent: () => React.ReactNode;
+
+    /** Server-side callbacks */
+    onFetchData: () => void;
 }
 
 export interface ControlledStateOverrideProps {
     /** Default: undefined */
-    page: number;
+    page: number | undefined;
 
     /** Default: undefined */
-    pageSize: number;
+    pageSize: number | undefined;
 
     /** Default: undefined */
     sorting: number;
 
+    /** Default: [] */
+    sorted: any[];
+
+    /** Default: [] */
+    filtered: any[];
+
+    /** Default: [] */
+    resized: any[];
+
+    /** Default: {} */
+    expanded: {};
+
     /** Sub component */
     SubComponent: SubComponentFunction;
 }
@@ -160,6 +212,21 @@ export interface PivotingProps {
     /** Default: _subRows */
     subRowsKey: string;
 
+    /** Default: _aggregated */
+    aggregatedKey: string;
+
+    /** Default: _nestingLevel */
+    nestingLevelKey: string;
+
+    /** Default: _original */
+    originalKey: string;
+
+    /** Default: _index */
+    indexKey: string;
+
+    /** Default: _groupedByPivot */
+    groupedByPivotKey: string;
+
     /**
      * Default: {} - Pivoting State Overrides (see Fully Controlled Component section)
      * @example { 4: true }
@@ -176,11 +243,32 @@ export interface ExpandedRows {
 }
 
 export interface ControlledStateCallbackProps {
+    /** Called when the page index is changed by the user */
     onPageChange: PageChangeFunction;
+
+    /**
+     * Called when the pageSize is changed by the user. The resolve page is also sent
+     *  to maintain approximate position in the data
+     */
     onPageSizeChange: PageSizeChangeFunction;
+
+    /**
+     * Called when a sortable column header is clicked with the column itself and if
+     * the shiftkey was held. If the column is a pivoted column, `column` will be an array of columns
+     */
     onSortedChange: SortedChangeFunction;
+
+    /**
+     * Called when a user enters a value into a filter input field or the value passed
+     * to the onFiltersChange handler by the Filter option.
+     */
     onFilteredChange: FilteredChangeFunction;
+
+    /** Called when an expander is clicked. Use this to manage `expanded` */
     onExpandedChange: ExpandedChangeFunction;
+
+    /** Called when a user clicks on a resizing component (the right edge of a column header) */
+    onResizedChange: ResizedChangeFunction;
 }
 
 export interface ComponentDecoratorProps {
@@ -269,14 +357,38 @@ export interface GlobalColumn extends
 export namespace Column {
     /** Basic column props */
     interface Basics {
-        /** Default: true */
-        sortable: boolean;
+        /** Default: undefined, use table default */
+        sortable: boolean | undefined;
 
         /** Default: true */
         show: boolean;
 
         /** Default: 100 */
         minWidth: number;
+
+        /** Default: undefined, use table default */
+        resizable: boolean | undefined;
+
+        /** Default: undefined, use table default */
+        filterable: boolean | undefined;
+
+        /** Default: ... */
+        sortMethod: SortFunction | undefined;
+
+        /** Default: false */
+        defaultSortDesc: boolean | undefined;
+
+        /** Used to render aggregated cells. Defaults to a comma separated list of values. */
+        Aggregated: TableCellRenderer;
+
+        /** Used to render a pivoted cell  */
+        Pivot: PivotRenderer;
+
+        /**  Used to render the value inside of a Pivot cell */
+        PivotValue: TableCellRenderer;
+
+        /** Used to render the expander in both Pivot and Expander cells */
+        Expander: TableCellRenderer;
     }
 
     /** Configuration of a columns cell section */
@@ -288,7 +400,7 @@ export namespace Column {
          * @example 'Cell Value'
          * @example ({data, column}) => <div>Cell Value</div>,
          */
-        render: TableCellRenderer;
+        Cell: TableCellRenderer;
 
         /**
          * Set the classname of the `td` element of the column
@@ -317,7 +429,7 @@ export namespace Column {
          * @example 'Header Name'
          * @example ({data, column}) => <div>Header Name</div>,
          */
-        header: TableCellRenderer;
+        Header: TableCellRenderer;
 
         /**
          * Set the classname of the `th` element of the column
@@ -347,7 +459,7 @@ export namespace Column {
          * @example 'Footer Name'
          * @example ({data, column}) => <div>Footer Name</div>,
          */
-        footer: TableCellRenderer;
+        Footer: TableCellRenderer;
 
         /**
          * Default: string
@@ -370,14 +482,23 @@ export namespace Column {
 
     /** Filtering related column props */
     interface FilterProps {
-        /** Default: undefined */
-        filterMethod: ReactTableFunction;
+        /** Default: false */
+        filterAll: boolean;
+
+        /**
+         * A function returning a boolean that specifies the filtering logic for the column
+         * 'filter' == an object specifying which filter is being applied. Format: {id: [the filter column's id], value: [the value the user typed in the filter field],
+         * pivotId: [if filtering on a pivot column, the pivotId will be set to the pivot column's id and the `id` field will be set to the top level pivoting column]}
+         * 'row' || 'rows' == the row (or rows, if filterAll is set to true) of data supplied to the table
+         * 'column' == the column that the filter is on
+         */
+        filterMethod: FilterFunction | DefaultFilterFunction;
 
         /** Default: false */
         hideFilter: boolean;
 
         /** Default: ... */
-        filterRender: FilterRender;
+        Filter: FilterRender;
     }
 }
 
@@ -385,14 +506,14 @@ export interface ExpanderDefaults {
     /** Default: false */
     sortable: boolean;
 
+    /** Default: false */
+    resizable: boolean;
+
+    /** Default: false */
+    filterable: boolean;
+
     /** Default: 35 */
     width: number;
-
-    /** Default: true */
-    hideFilter: boolean;
-
-    /** Will be overriden in methods.js to display ExpanderComponent */
-    render: TableCellRenderer;
 }
 
 export interface PivotDefaults {
@@ -451,6 +572,13 @@ export interface Column extends
 
     /** Header Groups only */
     columns?: any[];
+
+    /**
+     * Turns this column into a special column for specifying pivot position in your column definitions.
+     * The `pivotDefaults` options will be applied on top of this column's options.
+     * It will also let you specify rendering of the header (and header group if this special column is placed in the `columns` option of another column)
+     */
+    pivot?: boolean;
 }
 
 export interface ColumnRenderProps {
@@ -506,4 +634,4 @@ export interface FinalState extends TableProps {
     rowMinWidth: number;
 }
 
-export default class ReactTable extends React.Component<Partial<TableProps>> {}
+export default class ReactTable extends React.Component<Partial<TableProps>> { }
diff --git a/types/react-table/react-table-tests.tsx b/types/react-table/react-table-tests.tsx
index cc69a39114..a5609394ce 100644
--- a/types/react-table/react-table-tests.tsx
+++ b/types/react-table/react-table-tests.tsx
@@ -2,52 +2,152 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
 // Import React Table
-import ReactTable from "react-table";
+import ReactTable, { Column } from "react-table";
 import "react-table/react-table.css";
 
-const columns = [
+const columns: Column[] = [
   {
     Header: "Name",
     columns: [
-      {Header: "First Name", accessor: "firstName"},
-      {Header: "Last Name", id: "lastName"}
+      { Header: "First Name", accessor: "firstName" },
+      { Header: "Last Name", id: "lastName" }
     ]
   },
   {
     Header: "Info",
     columns: [
-      {Header: "Age", accessor: "age"},
-      {Header: "Status", accessor: "status"}
+      { Header: "Age", accessor: "age" },
+      { Header: "Status", accessor: "status" }
     ]
   },
   {
     Header: 'Stats',
     columns: [
-      {Header: "Visits", accessor: "visits"}
+      { Header: "Visits", accessor: "visits" }
     ]
   }
 ];
 
 const Component = (props: {}) => {
   const data = [
-    {firstName: "plastic", lastName: "leather", age: 1, visits: 87, progress: 53},
-    {firstName: "eggs", lastName: "quartz", age: 13, visits: 78, progress: 82},
-    {firstName: "wash", lastName: "wrench", age: 29, visits: 75, progress: 49},
-    {firstName: "introduction", lastName: "impression", age: 2, visits: 35, progress: 51},
-    {firstName: "steel", lastName: "difference", age: 9, visits: 64, progress: 94},
-    {firstName: "snakes", lastName: "corn", age: 17, visits: 55, progress: 47},
-    {firstName: "ocean", lastName: "definition", age: 26, visits: 17, progress: 22},
-    {firstName: "drawing", lastName: "fifth", age: 15, visits: 84, progress: 12},
-    {firstName: "silver", lastName: "riddle", age: 15, visits: 59, progress: 24},
-    {firstName: "surprise", lastName: "zinc", age: 23, visits: 7, progress: 48},
-    {firstName: "riddle", lastName: "information", age: 2, visits: 63, progress: 3}
+    { firstName: "plastic", lastName: "leather", age: 1, visits: 87, progress: 53 },
+    { firstName: "eggs", lastName: "quartz", age: 13, visits: 78, progress: 82 },
+    { firstName: "wash", lastName: "wrench", age: 29, visits: 75, progress: 49 },
+    { firstName: "introduction", lastName: "impression", age: 2, visits: 35, progress: 51 },
+    { firstName: "steel", lastName: "difference", age: 9, visits: 64, progress: 94 },
+    { firstName: "snakes", lastName: "corn", age: 17, visits: 55, progress: 47 },
+    { firstName: "ocean", lastName: "definition", age: 26, visits: 17, progress: 22 },
+    { firstName: "drawing", lastName: "fifth", age: 15, visits: 84, progress: 12 },
+    { firstName: "silver", lastName: "riddle", age: 15, visits: 59, progress: 24 },
+    { firstName: "surprise", lastName: "zinc", age: 23, visits: 7, progress: 48 },
+    { firstName: "riddle", lastName: "information", age: 2, visits: 63, progress: 3 }
   ];
   return (
     <div>
       <ReactTable
         data={data}
+        loading={false}
+        showPagination={true}
+        showPaginationTop={true}
+        showPaginationBottom={true}
+        showPageSizeOptions={true}
+        pageSizeOptions={[5, 10, 20, 25, 50, 100]}
+        defaultPageSize={20}
+        minRows={undefined}
+        showPageJump={true}
+        collapseOnSortingChange={true}
+        collapseOnPageChange={true}
+        collapseOnDataChange={true}
+        freezeWhenExpanded={false}
+        sortable={true}
+        multiSort={true}
+        resizable={true}
+        filterable={false}
+        defaultSortDesc={false}
+        defaultSorted={[]}
+        defaultFiltered={[]}
+        defaultResized={[]}
+        defaultExpanded={{}}
+        defaultFilterMethod={(filter, row, column) => {
+          const id = filter.pivotId || filter.id;
+          return row[id] !== undefined ? String(row[id]).startsWith(filter.value) : true;
+        }}
         columns={columns}
-        defaultPageSize={10}
+        defaultSortMethod={(a, b, desc) => {
+          // force null and undefined to the bottom
+          a = (a === null || a === undefined) ? -Infinity : a;
+          b = (b === null || b === undefined) ? -Infinity : b;
+          // force any string values to lowercase
+          a = a === 'string' ? a.toLowerCase() : a;
+          b = b === 'string' ? b.toLowerCase() : b;
+          // Return either 1 or -1 to indicate a sort priority
+          if (a > b) {
+            return 1;
+          }
+          if (a < b) {
+            return -1;
+          }
+          // returning 0, undefined or any falsey value will use subsequent sorts or the index as a tiebreaker
+          return 0;
+        }}
+        PadRowComponent={() => <span>&nbsp;</span>}
+        page={undefined}
+        pageSize={undefined}
+        sorted={[]}
+        filtered={[]}
+        resized={[]}
+        expanded={{}}
+        pivotValKey='_pivotVal'
+        pivotIDKey='_pivotID'
+        subRowsKey='_subRows'
+        aggregatedKey='_aggregated'
+        nestingLevelKey='_nestingLevel'
+        originalKey='_original'
+        indexKey='_index'
+        groupedByPivotKey='_groupedByPivot'
+        className=''
+        onFetchData={() => null}
+        style={{}}
+        column={{
+          Cell: undefined,
+          Header: undefined,
+          Footer: undefined,
+          Aggregated: undefined,
+          Pivot: undefined,
+          PivotValue: undefined,
+          Expander: undefined,
+          sortable: undefined,
+          resizable: undefined,
+          filterable: undefined,
+          show: true,
+          minWidth: 100,
+          className: '',
+          style: {},
+          getProps: () => { },
+          headerClassName: '',
+          headerStyle: {},
+          getHeaderProps: () => { },
+          footerClassName: '',
+          footerStyle: {},
+          getFooterProps: () => { },
+          filterAll: false,
+          filterMethod: undefined,
+          sortMethod: undefined,
+          defaultSortDesc: undefined,
+        }}
+        expanderDefaults={{
+          sortable: false,
+          resizable: false,
+          filterable: false,
+        }}
+        pivotDefaults={{}}
+        previousText='Previous'
+        nextText='Next'
+        loadingText='Loading...'
+        noDataText='No rows found'
+        pageText='Page'
+        ofText='of'
+        rowsText='rows'
       />
       <br />
     </div>
diff --git a/types/react-tabs/index.d.ts b/types/react-tabs/index.d.ts
index 02344cf8b1..a4a528046a 100644
--- a/types/react-tabs/index.d.ts
+++ b/types/react-tabs/index.d.ts
@@ -6,59 +6,38 @@
 
 import * as React from 'react';
 
-export as namespace ReactTabs;
-
-declare namespace ReactTabs {
-
-    interface TabsProps {
-        className?: string | Array<string> | { [name: string]: boolean; };
-        defaultFocus?: boolean;
-        defaultIndex?: number;
-        disabledTabClassName?: string;
-        forceRenderTabPanel?: boolean;
-        onSelect?: (index: number, last: number, event: Event) => boolean | void;
-        selectedIndex?: number;
-        selectedTabClassName?: string;
-        selectedTabPanelClassName?: string;
-    }
-
-    interface Tabs extends React.ComponentClass<TabsProps> {}
-
-    interface TabListProps {
-        className?: string | Array<string> | { [name: string]: boolean; };
-    }
-
-    interface TabList extends React.ComponentClass<TabListProps> {}
-
-    interface TabProps {
-        className?: string | Array<string> | { [name: string]: boolean; };
-        disabled?: boolean;
-        disabledClassName?: string;
-        selectedClassName?: string;
-    }
-
-    interface Tab extends React.ComponentClass<TabProps> {}
-
-    interface TabPanelProps {
-        className?: string | Array<string> | { [name: string]: boolean; };
-        forceRender?: boolean;
-        selectedClassName?: string;
-    }
-
-    interface TabPanel extends React.ComponentClass<TabPanelProps> {}
+export interface TabsProps {
+    className?: string | Array<string> | { [name: string]: boolean; };
+    defaultFocus?: boolean;
+    defaultIndex?: number;
+    disabledTabClassName?: string;
+    forceRenderTabPanel?: boolean;
+    onSelect?: (index: number, last: number, event: Event) => boolean | void;
+    selectedIndex?: number;
+    selectedTabClassName?: string;
+    selectedTabPanelClassName?: string;
 }
 
-declare const Tabs: ReactTabs.Tabs;
-declare const TabList: ReactTabs.TabList;
-declare const Tab: ReactTabs.Tab;
-declare const TabPanel: ReactTabs.TabPanel;
+export interface TabListProps {
+    className?: string | Array<string> | { [name: string]: boolean; };
+}
 
-declare function resetIdCounter(): void;
+export interface TabProps {
+    className?: string | Array<string> | { [name: string]: boolean; };
+    disabled?: boolean;
+    disabledClassName?: string;
+    selectedClassName?: string;
+}
 
-export {
-    Tabs,
-    TabList,
-    Tab,
-    TabPanel,
-    resetIdCounter
-};
+export interface TabPanelProps {
+    className?: string | Array<string> | { [name: string]: boolean; };
+    forceRender?: boolean;
+    selectedClassName?: string;
+}
+
+export declare class Tabs extends React.Component<TabsProps> {}
+export declare class TabList extends React.Component<TabListProps> {}
+export declare class Tab extends React.Component<TabProps> {}
+export declare class TabPanel extends React.Component<TabPanelProps> {}
+
+export declare function resetIdCounter(): void;
diff --git a/types/react-tabs/react-tabs-tests.ts b/types/react-tabs/react-tabs-tests.ts
index f726780dcb..a7b86de6e0 100644
--- a/types/react-tabs/react-tabs-tests.ts
+++ b/types/react-tabs/react-tabs-tests.ts
@@ -1,9 +1,23 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import { Tabs, TabList, Tab, TabPanel, resetIdCounter } from "react-tabs";
+import {
+    Tabs,
+    TabsProps,
+    TabList,
+    TabListProps,
+    Tab,
+    TabProps,
+    TabPanel,
+    TabPanelProps,
+    resetIdCounter } from "react-tabs";
 
 resetIdCounter();
 
+interface TestTabProps extends TabProps {}
+interface TestTabListProps extends TabListProps {}
+interface TestTabPanelProps extends TabPanelProps {}
+interface TestTabsProps extends TabsProps {}
+
 class TestApp extends React.Component {
     onSelect = (index: number, last: number, event: Event) => {
         console.log("selected tab: " + index.toString());
diff --git a/types/react-tabs/tslint.json b/types/react-tabs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-tabs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-tagcloud/tslint.json b/types/react-tagcloud/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-tagcloud/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-tagsinput/index.d.ts b/types/react-tagsinput/index.d.ts
new file mode 100644
index 0000000000..6b4d92b3b7
--- /dev/null
+++ b/types/react-tagsinput/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for react-tagsinput 3.19
+// Project: https://github.com/olahol/react-tagsinput
+// Definitions by: Michael Macnair <https://github.com/mykter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export as namespace ReactTagsInput;
+export = TagsInput;
+
+type Tag = any;
+
+declare class TagsInput extends React.Component<TagsInput.ReactTagsInputProps> {
+    accept(): any;
+    addTag(tag: Tag): any;
+    blur(): void;
+    clearInput(): void;
+    focus(): void;
+}
+
+declare namespace TagsInput {
+    interface InputProps {
+      readonly [prop: string]: any;
+    }
+
+    interface RenderInputProps extends InputProps {
+        readonly addTag: (tag: Tag) => void;
+        readonly onChange: (e: React.ChangeEvent<{ readonly value: string }>) => void;
+        readonly ref: (r: any) => void; // parameter is either a DOM element or a mounted React component
+        readonly value: Tag;
+    }
+
+    interface TagProps {
+        readonly [prop: string]: any;
+    }
+
+    interface RenderTagProps extends TagProps {
+        readonly disabled: boolean;
+        readonly getTagDisplayValue: (tag: Tag) => string;
+        readonly onRemove: (tagIndex: number) => void;
+        readonly tag: Tag;
+    }
+
+    interface ReactTagsInputProps extends React.Props<TagsInput> {
+        value: Tag[];
+        onChange: (tags: Tag[], changed: Tag[], changedIndexes: number[]) => void;
+        onChangeInput?: (value: string) => void;
+        addKeys?: number[];
+        currentValue?: string;
+        inputValue?: string;
+        onlyUnique?: boolean;
+        validationRegex?: RegExp;
+        onValidationReject?: (tags: string[]) => void;
+        disabled?: boolean;
+        maxTags?: number;
+        addOnBlur?: boolean;
+        addOnPaste?: boolean;
+        pasteSplit?: (data: string) => string[];
+        removeKeys?: number[];
+        className?: string;
+        focusedClassName?: string;
+        tagProps?: TagProps;
+        inputProps?: InputProps;
+        tagDisplayProp?: string | null;
+        renderTag?: (props: RenderTagProps) => React.ReactNode;
+        renderInput?: (props: RenderInputProps) => React.ReactNode;
+        renderLayout?: (tagComponents: React.Component[], inputComponent: React.Component) => React.ReactChild;
+        preventSubmit?: boolean;
+    }
+}
diff --git a/types/react-tagsinput/react-tagsinput-tests.tsx b/types/react-tagsinput/react-tagsinput-tests.tsx
new file mode 100644
index 0000000000..8a3a113227
--- /dev/null
+++ b/types/react-tagsinput/react-tagsinput-tests.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import * as TagsInput from 'react-tagsinput';
+
+interface StateI {
+    tags: string[];
+}
+
+class Example extends React.Component<{}, StateI> {
+    constructor(props: {}) {
+        super(props);
+        this.state = {tags: []};
+    }
+
+    handleChange(tags: string[]) {
+        this.setState({tags});
+    }
+
+    render() {
+        return (
+            <TagsInput value={this.state.tags} onChange={this.handleChange} />
+        );
+    }
+}
diff --git a/types/react-tagsinput/tsconfig.json b/types/react-tagsinput/tsconfig.json
new file mode 100644
index 0000000000..1e9342e032
--- /dev/null
+++ b/types/react-tagsinput/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-tagsinput-tests.tsx"
+    ]
+}
diff --git a/types/react-tagsinput/tslint.json b/types/react-tagsinput/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-tagsinput/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-tap-event-plugin/tslint.json b/types/react-tap-event-plugin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-tap-event-plugin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-textarea-autosize/tslint.json b/types/react-textarea-autosize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-textarea-autosize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-toastr/index.d.ts b/types/react-toastr/index.d.ts
new file mode 100644
index 0000000000..2de77a6d7e
--- /dev/null
+++ b/types/react-toastr/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for react-toastr 3.0
+// Project: https://github.com/tomchentw/react-toastr
+// Definitions by: Josh Holmer <https://github.com/shssoichiro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Component, ReactHTML } from 'react';
+
+export class ToastContainer extends Component<{
+    toastMessageFactory: any;
+    className?: string;
+}> {
+    error: (message: string, title: string, optionsOverride?: {}) => void;
+    info: (message: string, title: string, optionsOverride?: {}) => void;
+    success: (message: string, title: string, optionsOverride?: {}) => void;
+    warning: (message: string, title: string, optionsOverride?: {}) => void;
+    clear: () => void;
+}
+export const ToastMessageAnimated: keyof ReactHTML;
+export const ToastMessagejQuery: keyof ReactHTML;
diff --git a/types/react-toastr/react-toastr-tests.tsx b/types/react-toastr/react-toastr-tests.tsx
new file mode 100644
index 0000000000..75d6527730
--- /dev/null
+++ b/types/react-toastr/react-toastr-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { ToastContainer, ToastMessageAnimated } from 'react-toastr';
+
+const toastMessageFactory = React.createFactory(ToastMessageAnimated);
+
+class Test extends React.Component {
+    ref: ToastContainer;
+
+    toastRef = (ref: ToastContainer) => {
+        this.ref = ref;
+    }
+
+    render() {
+        return (
+            <ToastContainer
+                ref={this.toastRef}
+                toastMessageFactory={toastMessageFactory}
+                className="toast-top-right"
+            />
+        );
+    }
+}
diff --git a/types/react-toastr/tsconfig.json b/types/react-toastr/tsconfig.json
new file mode 100644
index 0000000000..1fbbfde4af
--- /dev/null
+++ b/types/react-toastr/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-toastr-tests.tsx"
+    ]
+}
diff --git a/types/react-toastr/tslint.json b/types/react-toastr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-toastr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-tooltip/index.d.ts b/types/react-tooltip/index.d.ts
index c8a19073b1..093c08ebf1 100644
--- a/types/react-tooltip/index.d.ts
+++ b/types/react-tooltip/index.d.ts
@@ -11,7 +11,6 @@ declare class ReactTooltip extends React.Component<ReactTooltip.Props> { }
 declare namespace ReactTooltip {
     /**
      * Hide the tooltip manually, the target is optional, if no target passed in, all existing tooltips will be hidden
-     * @param {Element} target
      */
     function hide(target?: Element): void;
 
diff --git a/types/react-touch/react-touch-tests.tsx b/types/react-touch/react-touch-tests.tsx
index 4ba1f3e1ef..3a0703bb7c 100644
--- a/types/react-touch/react-touch-tests.tsx
+++ b/types/react-touch/react-touch-tests.tsx
@@ -25,7 +25,7 @@ export class DraggableTest extends React.PureComponent {
         return <Draggable style={style} children={this.callback} />;
     }
 
-    private callback = (argument: DraggableCallbackArgument): JSX.Element => {
+    private readonly callback = (argument: DraggableCallbackArgument): JSX.Element => {
         return <div />;
     }
 }
@@ -44,19 +44,19 @@ export class SwipeableTest extends React.PureComponent {
         </Swipeable>;
     }
 
-    private swipeHandler = () => {
+    private readonly swipeHandler = () => {
         return;
     }
 }
 
 export class CustomGestureTest extends React.PureComponent {
-    private move: moves[] = [moves.UPLEFT, moves.RIGHT, moves.DOWNRIGHT];
+    private readonly move: moves[] = [moves.UPLEFT, moves.RIGHT, moves.DOWNRIGHT];
 
     render() {
         return <CustomGesture config={this.move} onGesture={this.handler} />;
     }
 
-    private handler = () => {
+    private readonly handler = () => {
         return;
     }
 }
diff --git a/types/react-user-tour/tslint.json b/types/react-user-tour/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-user-tour/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts b/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
index 6bc853361b..17844914af 100644
--- a/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
+++ b/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
@@ -1,4 +1,5 @@
-import { PropTypes, PureComponent, Validator, Requireable } from 'react'
+import { PureComponent, Validator, Requireable } from 'react'
+import * as PropTypes from 'prop-types'
 
 export type OnSectionRenderedParams = {
     columnStartIndex: number,
diff --git a/types/react-virtualized/dist/es/AutoSizer.d.ts b/types/react-virtualized/dist/es/AutoSizer.d.ts
index 35a9081095..b54fce89e1 100644
--- a/types/react-virtualized/dist/es/AutoSizer.d.ts
+++ b/types/react-virtualized/dist/es/AutoSizer.d.ts
@@ -1,4 +1,5 @@
-import { PropTypes, PureComponent, Validator, Requireable } from 'react'
+import { PureComponent, Validator, Requireable } from 'react'
+import * as PropTypes from 'prop-types'
 
 export type Dimensions = {
     height: number,
diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index cc4cbaa9ac..9a6492f368 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -126,7 +126,14 @@ export type GridCellRangeProps = {
     rowStartIndex: number,
     rowStopIndex: number,
     scrollLeft: number,
-    scrollTop: number
+    scrollTop: number,
+    deferredMeasurementCache: CellMeasurerCache,
+    horizontalOffsetAdjustment: number,
+    parent: Grid | List | Table,
+    styleCache: Map<React.CSSProperties>,
+    verticalOffsetAdjustment: number,
+    visibleColumnIndices: VisibleCellRange,
+    visibleRowIndices: VisibleCellRange
 }
 export type GridCellRangeRenderer = (params: GridCellRangeProps) => React.ReactNode[];
 
@@ -375,7 +382,7 @@ export class Grid extends PureComponent<GridProps, GridState> {
         onScroll: () => null,
         onSectionRendered: () => null,
         overscanColumnCount: 0,
-        overscanIndicesGetter: OverscanIndicesGetterParams,
+        overscanIndicesGetter: OverscanIndicesGetter,
         overscanRowCount: 10,
         role: 'grid',
         scrollingResetTimeInterval: typeof DEFAULT_SCROLLING_RESET_TIME_INTERVAL,
diff --git a/types/react-virtualized/dist/es/InfiniteLoader.d.ts b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
index 746ddc71f0..c247ad3c0e 100644
--- a/types/react-virtualized/dist/es/InfiniteLoader.d.ts
+++ b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
@@ -77,7 +77,7 @@ export class InfiniteLoader extends PureComponent<InfiniteLoaderProps> {
 
     constructor(props: InfiniteLoaderProps, context: any);
 
-    resetLoadMoreRowsCache(): void;
+    resetLoadMoreRowsCache(autoReload?: boolean): void;
 
     render(): JSX.Element;
 }
diff --git a/types/react-virtualized/dist/es/MultiGrid.d.ts b/types/react-virtualized/dist/es/MultiGrid.d.ts
index 1bb8b7dfac..96c33e3bed 100644
--- a/types/react-virtualized/dist/es/MultiGrid.d.ts
+++ b/types/react-virtualized/dist/es/MultiGrid.d.ts
@@ -2,13 +2,19 @@ import { PureComponent, Validator, Requireable } from 'react'
 import { GridProps } from './Grid'
 
 export type MultiGridProps = {
-    fixedColumnCount: number;
-    fixedRowCount: number;
-    style: React.CSSProperties;
-    styleBottomLeftGrid: React.CSSProperties;
-    styleBottomRightGrid: React.CSSProperties;
-    styleTopLeftGrid: React.CSSProperties;
-    styleTopRightGrid: React.CSSProperties;
+    classNameBottomLeftGrid?: string;
+    classNameBottomRightGrid?: string;
+    classNameTopLeftGrid?: string;
+    classNameTopRightGrid?: string;
+    enableFixedColumnScroll?: boolean;
+    enableFixedRowScroll?: boolean;
+    fixedColumnCount?: number;
+    fixedRowCount?: number;
+    style?: React.CSSProperties;
+    styleBottomLeftGrid?: React.CSSProperties;
+    styleBottomRightGrid?: React.CSSProperties;
+    styleTopLeftGrid?: React.CSSProperties;
+    styleTopRightGrid?: React.CSSProperties;
 } & GridProps;
 
 export type MultiGridState = {
@@ -25,6 +31,12 @@ export type MultiGridState = {
  */
 export class MultiGrid extends PureComponent<MultiGridProps, MultiGridState> {
     static propTypes: {
+        classNameBottomLeftGrid: Validator<string>,
+        classNameBottomRightGrid: Validator<string>,
+        classNameTopLeftGrid: Validator<string>,
+        classNameTopRightGrid: Validator<string>,
+        enableFixedColumnScroll: Validator<boolean>,
+        enableFixedRowScroll: Validator<boolean>,
         fixedColumnCount: Validator<number>,
         fixedRowCount: Validator<number>,
         style: Validator<React.CSSProperties>,
@@ -35,6 +47,12 @@ export class MultiGrid extends PureComponent<MultiGridProps, MultiGridState> {
     };
 
     static defaultProps: {
+        classNameBottomLeftGrid: '',
+        classNameBottomRightGrid: '',
+        classNameTopLeftGrid: '',
+        classNameTopRightGrid: '',
+        enableFixedColumnScroll: false,
+        enableFixedRowScroll: false,
         fixedColumnCount: 0,
         fixedRowCount: 0,
         style: {},
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index c1216f12b1..97fe20b657 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -43,6 +43,7 @@ export type TableRowProps = {
     onRowDoubleClick?: (params: RowMouseEventHandlerParams) => void,
     onRowMouseOver?: (params: RowMouseEventHandlerParams) => void,
     onRowMouseOut?: (params: RowMouseEventHandlerParams) => void,
+    onRowRightClick?: (params: RowMouseEventHandlerParams) => void,
     rowData: any,
     style: any
 };
@@ -96,6 +97,8 @@ export type ColumnProps = {
     style?: React.CSSProperties;
     /** Flex basis (width) for this column; This value can grow or shrink based on :flexGrow and :flexShrink properties. */
     width: number;
+    /** Optional id to set on the column header; used for aria-describedby */
+    id?: string;
 }
 export class Column extends Component<ColumnProps> {
     static propTypes: {
@@ -114,7 +117,8 @@ export class Column extends Component<ColumnProps> {
         maxWidth: Requireable<number>,
         minWidth: Requireable<number>,
         style: Requireable<React.CSSProperties>,
-        width: Validator<number>
+        width: Validator<number>,
+        id: Requireable<string>
     };
 
     static defaultProps: {
@@ -288,11 +292,11 @@ export type TableProps = GridCoreProps & {
     width?: number;
 }
 
-export const defaultTableCellDataGetter: TableCellDataGetter;
-export const defaultTableCellRenderer: TableCellRenderer;
-export const defaultTableHeaderRenderer: () => React.ReactElement<TableHeaderProps>[];
-export const defaultTableHeaderRowRenderer: TableHeaderRowRenderer;
-export const defaultTableRowRenderer: TableRowRenderer;
+export const defaultCellDataGetter: TableCellDataGetter;
+export const defaultCellRenderer: TableCellRenderer;
+export const defaultHeaderRenderer: () => React.ReactElement<TableHeaderProps>[];
+export const defaultHeaderRowRenderer: TableHeaderRowRenderer;
+export const defaultRowRenderer: TableRowRenderer;
 
 export type SortDirectionStatic = {
     /**
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 8bd32e7b26..01292a0519 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 //                 John Gunther <https://github.com/guntherjh>
 //                 Konstantin Nesterov <https://github.com/wasd171>
+//                 Szőke Szabolcs <https://github.com/szabolcsx>
+//                 Kræn Hansen <https://github.com/kraenhansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -97,11 +99,11 @@ export {
     ScrollSyncState
 } from './dist/es/ScrollSync'
 export {
-    defaultTableCellDataGetter,
-    defaultTableCellRenderer,
-    defaultTableHeaderRenderer,
-    defaultTableHeaderRowRenderer,
-    defaultTableRowRenderer,
+    defaultCellDataGetter as defaultTableCellDataGetter,
+    defaultCellRenderer as defaultTableCellRenderer,
+    defaultHeaderRenderer as defaultTableHeaderRenderer,
+    defaultHeaderRowRenderer as defaultTableHeaderRowRenderer,
+    defaultRowRenderer as defaultTableRowRenderer,
     Table,
     Column,
     SortDirection,
diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index e0bd1d50ed..c5958ab96c 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -654,13 +654,11 @@ const STATUS_LOADING = 1
 const STATUS_LOADED = 2
 
 export class InfiniteLoaderExample extends PureComponent<any, any> {
-    _timeoutIdMap: any;
+    _timeoutIds = new Set<number>();
 
     constructor(props) {
         super(props)
 
-        this._timeoutIdMap = {}
-
         this._clearData = this._clearData.bind(this)
         this._isRowLoaded = this._isRowLoaded.bind(this)
         this._loadMoreRows = this._loadMoreRows.bind(this)
@@ -668,9 +666,7 @@ export class InfiniteLoaderExample extends PureComponent<any, any> {
     }
 
     componentWillUnmount() {
-        Object.keys(this._timeoutIdMap).forEach(timeoutId => {
-            clearTimeout(timeoutId as any)
-        })
+        this._timeoutIds.forEach(clearTimeout);
     }
 
     render() {
@@ -731,7 +727,7 @@ export class InfiniteLoaderExample extends PureComponent<any, any> {
         const timeoutId = setTimeout(() => {
             const { loadedRowCount, loadingRowCount } = this.state
 
-            delete this._timeoutIdMap[timeoutId]
+            this._timeoutIds.delete(timeoutId);
 
             for (let i = startIndex; i <= stopIndex; i++) {
                 loadedRowsMap[i] = STATUS_LOADED
@@ -745,7 +741,7 @@ export class InfiniteLoaderExample extends PureComponent<any, any> {
             promiseResolver()
         }, 1000 + Math.round(Math.random() * 2000))
 
-        this._timeoutIdMap[timeoutId] = true
+        this._timeoutIds.add(timeoutId);
 
         let promiseResolver
 
diff --git a/types/react-virtualized/tslint.json b/types/react-virtualized/tslint.json
index 815be0b5f3..e0ac4d06fb 100644
--- a/types/react-virtualized/tslint.json
+++ b/types/react-virtualized/tslint.json
@@ -10,6 +10,7 @@
         "prefer-method-signature": false,
         "prefer-declare-function": false,
         "no-padding": false,
+        "no-redundant-jsdoc-2": false,
         "array-type": [true, "array"]
     }
 }
diff --git a/types/react-widgets-moment/index.d.ts b/types/react-widgets-moment/index.d.ts
new file mode 100644
index 0000000000..bbed278799
--- /dev/null
+++ b/types/react-widgets-moment/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for react-widgets-moment 4.0
+// Project: https://github.com/jquense/react-widgets#readme
+// Definitions by: Janeene Beeforth <https://github.com/dawnmist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default function momentLocalizer(): void;
diff --git a/types/react-widgets-moment/package.json b/types/react-widgets-moment/package.json
new file mode 100644
index 0000000000..ac2bb42bad
--- /dev/null
+++ b/types/react-widgets-moment/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "moment": "^2.18.1"
+    }
+}
diff --git a/types/react-widgets-moment/react-widgets-moment-tests.ts b/types/react-widgets-moment/react-widgets-moment-tests.ts
new file mode 100644
index 0000000000..ba69f32862
--- /dev/null
+++ b/types/react-widgets-moment/react-widgets-moment-tests.ts
@@ -0,0 +1,6 @@
+import * as moment from 'moment';
+import momentLocalizer from 'react-widgets-moment';
+
+// Usage example from http://jquense.github.io/react-widgets/localization/
+moment.locale('en');
+momentLocalizer();
diff --git a/types/react-widgets-moment/tsconfig.json b/types/react-widgets-moment/tsconfig.json
new file mode 100644
index 0000000000..332d436d22
--- /dev/null
+++ b/types/react-widgets-moment/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-widgets-moment-tests.ts"
+    ]
+}
diff --git a/types/react-widgets-moment/tslint.json b/types/react-widgets-moment/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-widgets-moment/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-widgets/lib/DateTimePicker.d.ts b/types/react-widgets/lib/DateTimePicker.d.ts
index 2f2f520cf2..3596f6063a 100644
--- a/types/react-widgets/lib/DateTimePicker.d.ts
+++ b/types/react-widgets/lib/DateTimePicker.d.ts
@@ -122,6 +122,10 @@ interface DateTimePickerProps extends ReactWidgetsCommonDropdownProps<DateTimePi
      * object to localize widget text and increase accessibility.
      */
     messages?: DateTimePickerMessages;
+    /**
+    * Text to display in the input when the value is empty.
+    */
+    placeholder?: string;
 }
 
 interface DateTimePickerMessages {
diff --git a/types/react/global.d.ts b/types/react/global.d.ts
index 8ebeb64bad..23af6dc7a3 100644
--- a/types/react/global.d.ts
+++ b/types/react/global.d.ts
@@ -119,6 +119,7 @@ interface HTMLTableRowElement extends HTMLElement { }
 interface HTMLTrackElement extends HTMLElement { }
 interface HTMLUListElement extends HTMLElement { }
 interface HTMLVideoElement extends HTMLElement { }
+interface HTMLWebViewElement extends HTMLElement { }
 
 interface SVGElement extends Element { }
 interface SVGSVGElement extends SVGElement { }
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index e22b8e2890..42abd8d45c 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -13,6 +13,7 @@
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Stéphane Goetz <https://github.com/onigoetz>
 //                 Rich Seviora <https://github.com/richseviora>
+//                 Josh Rutherford <https://github.com/theruther4d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -32,7 +33,7 @@ And since any object is assignable to {}, we would lose the type safety of the P
 Therefore, the type of props is left as Q, which should work for most cases.
 If you need to call cloneElement with key or ref, you'll need a type cast:
 interface ButtonProps {
-    label: string,
+    label: string;
     isDisabled?: boolean;
 }
 var element: React.CElement<ButtonProps, Button>;
@@ -70,7 +71,7 @@ declare namespace React {
     // React Elements
     // ----------------------------------------------------------------------
 
-    type ReactType = string | ComponentType<any>;
+    type ReactType<P = any> = string | ComponentType<P>;
     type ComponentType<P = {}> = ComponentClass<P> | StatelessComponent<P>;
 
     type Key = string | number;
@@ -123,6 +124,11 @@ declare namespace React {
         type: keyof ReactSVG;
     }
 
+    interface ReactPortal {
+        key: Key | null;
+        children: ReactNode;
+    }
+
     //
     // Factories
     // ----------------------------------------------------------------------
@@ -161,14 +167,12 @@ declare namespace React {
 
     // Should be Array<ReactNode> but type aliases cannot be recursive
     type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
-    type ReactNode = ReactChild | ReactFragment | boolean | null | undefined;
+    type ReactNode = ReactChild | ReactFragment | ReactPortal | string | number | boolean | null | undefined;
 
     //
     // Top Level API
     // ----------------------------------------------------------------------
 
-    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
-
     // DOM Elements
     function createFactory<T extends HTMLElement>(
         type: keyof ReactHTML): HTMLFactory<T>;
@@ -258,11 +262,10 @@ declare namespace React {
         props?: Q, // should be Q & Attributes
         ...children: ReactNode[]): ReactElement<P>;
 
-    function isValidElement<P>(object: {}): object is ReactElement<P>;
+    function isValidElement<P>(object: {} | null | undefined): object is ReactElement<P>;
 
-    const DOM: ReactDOM;
-    const PropTypes: ReactPropTypes;
     const Children: ReactChildren;
+    const Fragment: ComponentType;
     const version: string;
 
     //
@@ -275,16 +278,18 @@ declare namespace React {
     // tslint:disable-next-line:no-empty-interface
     interface Component<P = {}, S = {}> extends ComponentLifecycle<P, S> { }
     class Component<P, S> {
-        constructor(props?: P, context?: any);
+        constructor(props: P, context?: any);
 
-        // Disabling unified-signatures to have separate overloads. It's easier to understand this way.
-        // tslint:disable:unified-signatures
-        setState<K extends keyof S>(f: (prevState: S, props: P) => Pick<S, K>, callback?: () => any): void;
-        setState<K extends keyof S>(state: Pick<S, K>, callback?: () => any): void;
-        // tslint:enable:unified-signatures
+        // We MUST keep setState() as a unified signature because it allows proper checking of the method return type.
+        // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18365#issuecomment-351013257
+        // Also, the ` | S` allows intellisense to not be dumbisense
+        setState<K extends keyof S>(
+            state: ((prevState: Readonly<S>, props: P) => (Pick<S, K> | S)) | (Pick<S, K> | S),
+            callback?: () => void
+        ): void;
 
-        forceUpdate(callBack?: () => any): void;
-        render(): JSX.Element | JSX.Element[] | string | number | null | false;
+        forceUpdate(callBack?: () => void): void;
+        render(): ReactNode;
 
         // React.Props<T> is now deprecated, which means that the `children`
         // property is not available on `P` by default, even though you can
@@ -302,7 +307,7 @@ declare namespace React {
     class PureComponent<P = {}, S = {}> extends Component<P, S> { }
 
     interface ClassicComponent<P = {}, S = {}> extends Component<P, S> {
-        replaceState(nextState: S, callback?: () => any): void;
+        replaceState(nextState: S, callback?: () => void): void;
         isMounted(): boolean;
         getInitialState?(): S;
     }
@@ -325,7 +330,7 @@ declare namespace React {
     }
 
     interface ComponentClass<P = {}> {
-        new (props?: P, context?: any): Component<P, ComponentState>;
+        new (props: P, context?: any): Component<P, ComponentState>;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         childContextTypes?: ValidationMap<any>;
@@ -334,7 +339,7 @@ declare namespace React {
     }
 
     interface ClassicComponentClass<P = {}> extends ComponentClass<P> {
-        new (props?: P, context?: any): ClassicComponent<P, ComponentState>;
+        new (props: P, context?: any): ClassicComponent<P, ComponentState>;
         getDefaultProps?(): P;
     }
 
@@ -345,8 +350,8 @@ declare namespace React {
      */
     type ClassType<P, T extends Component<P, ComponentState>, C extends ComponentClass<P>> =
         C &
-        (new (props?: P, context?: any) => T) &
-        (new (props?: P, context?: any) => { props: P });
+        (new (props: P, context?: any) => T) &
+        (new (props: P, context?: any) => { props: P });
 
     //
     // Component Specs and Lifecycle
@@ -419,7 +424,7 @@ declare namespace React {
     }
 
     interface ComponentSpec<P, S> extends Mixin<P, S> {
-        render(): ReactElement<any> | Array<ReactElement<any>> | string | number | null;
+        render(): ReactNode;
 
         [propertyName: string]: any;
     }
@@ -430,6 +435,9 @@ declare namespace React {
 
     interface SyntheticEvent<T> {
         bubbles: boolean;
+        /**
+         * A reference to the element on which the event listener is registered.
+         */
         currentTarget: EventTarget & T;
         cancelable: boolean;
         defaultPrevented: boolean;
@@ -442,6 +450,12 @@ declare namespace React {
         isPropagationStopped(): boolean;
         persist(): void;
         // If you thought this should be `EventTarget & T`, see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/12239
+        /**
+         * A reference to the element from which the event was originally dispatched.
+         * This might be a child element to the element on which the event listener is registered.
+         *
+         * @see currentTarget
+         */
         target: EventTarget;
         timeStamp: number;
         type: string;
@@ -483,7 +497,13 @@ declare namespace React {
         altKey: boolean;
         charCode: number;
         ctrlKey: boolean;
+        /**
+         * See [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#keys-modifier). for a list of valid (case-sensitive) arguments to this method.
+         */
         getModifierState(key: string): boolean;
+        /**
+         * See the [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#named-key-attribute-values). for possible values
+         */
         key: string;
         keyCode: number;
         locale: string;
@@ -502,6 +522,9 @@ declare namespace React {
         clientX: number;
         clientY: number;
         ctrlKey: boolean;
+        /**
+         * See [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#keys-modifier). for a list of valid (case-sensitive) arguments to this method.
+         */
         getModifierState(key: string): boolean;
         metaKey: boolean;
         nativeEvent: NativeMouseEvent;
@@ -517,6 +540,9 @@ declare namespace React {
         altKey: boolean;
         changedTouches: TouchList;
         ctrlKey: boolean;
+        /**
+         * See [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#keys-modifier). for a list of valid (case-sensitive) arguments to this method.
+         */
         getModifierState(key: string): boolean;
         metaKey: boolean;
         nativeEvent: NativeTouchEvent;
@@ -903,6 +929,11 @@ declare namespace React {
          */
         backgroundRepeat?: CSSWideKeyword | any;
 
+        /**
+         * Defines the size of the background images
+         */
+        backgroundSize?: CSSWideKeyword | any;
+
         /**
          * Obsolete - spec retired, not implemented.
          */
@@ -933,12 +964,12 @@ declare namespace React {
         /**
          * Defines the shape of the border of the bottom-left corner.
          */
-        borderBottomLeftRadius?: CSSWideKeyword | any;
+        borderBottomLeftRadius?: CSSWideKeyword | CSSLength;
 
         /**
          * Defines the shape of the border of the bottom-right corner.
          */
-        borderBottomRightRadius?: CSSWideKeyword | any;
+        borderBottomRightRadius?: CSSWideKeyword | CSSLength;
 
         /**
          * Sets the line style of the bottom border of a box.
@@ -1016,6 +1047,11 @@ declare namespace React {
          */
         borderLeftWidth?: CSSWideKeyword | any;
 
+        /**
+         * Shorthand property that sets the rounding of all four corners.
+         */
+        borderRadius?: CSSWideKeyword | CSSLength;
+
         /**
          * 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
@@ -1076,12 +1112,12 @@ declare namespace React {
         /**
          * Sets the rounding of the top-left corner of the element.
          */
-        borderTopLeftRadius?: CSSWideKeyword | any;
+        borderTopLeftRadius?: CSSWideKeyword | CSSLength;
 
         /**
          * Sets the rounding of the top-right corner of the element.
          */
-        borderTopRightRadius?: CSSWideKeyword | any;
+        borderTopRightRadius?: CSSWideKeyword | CSSLength;
 
         /**
          * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style.
@@ -1571,7 +1607,7 @@ declare namespace React {
          * along the main-axis of their container.
          * See CSS justify-content property https://www.w3.org/TR/css-flexbox-1/#justify-content-property
          */
-        justifyContent?: CSSWideKeyword | "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "space-evenly";
+        justifyContent?: CSSWideKeyword | "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "space-evenly" | "stretch";
 
         layoutGrid?: CSSWideKeyword | any;
 
@@ -2470,6 +2506,7 @@ declare namespace React {
         allowFullScreen?: boolean;
         allowTransparency?: boolean;
         alt?: string;
+        as?: string;
         async?: boolean;
         autoComplete?: string;
         autoFocus?: boolean;
@@ -2578,6 +2615,8 @@ declare namespace React {
         media?: string;
         rel?: string;
         target?: string;
+        type?: string;
+        as?: string;
     }
 
     // tslint:disable-next-line:no-empty-interface
@@ -2625,6 +2664,7 @@ declare namespace React {
 
     interface ColHTMLAttributes<T> extends HTMLAttributes<T> {
         span?: number;
+        width?: number | string;
     }
 
     interface ColgroupHTMLAttributes<T> extends HTMLAttributes<T> {
@@ -2756,6 +2796,8 @@ declare namespace React {
     }
 
     interface LinkHTMLAttributes<T> extends HTMLAttributes<T> {
+        as?: string;
+        crossOrigin?: string;
         href?: string;
         hrefLang?: string;
         integrity?: string;
@@ -2776,6 +2818,7 @@ declare namespace React {
     interface MediaHTMLAttributes<T> extends HTMLAttributes<T> {
         autoPlay?: boolean;
         controls?: boolean;
+        controlsList?: string;
         crossOrigin?: string;
         loop?: boolean;
         mediaGroup?: string;
@@ -3158,7 +3201,7 @@ declare namespace React {
         strokeDashoffset?: string | number;
         strokeLinecap?: "butt" | "round" | "square" | "inherit";
         strokeLinejoin?: "miter" | "round" | "bevel" | "inherit";
-        strokeMiterlimit?: string;
+        strokeMiterlimit?: number | string;
         strokeOpacity?: number | string;
         strokeWidth?: number | string;
         surfaceScale?: number | string;
@@ -3221,6 +3264,26 @@ declare namespace React {
         zoomAndPan?: string;
     }
 
+    interface WebViewHTMLAttributes<T> extends HTMLAttributes<T> {
+        allowFullScreen?: boolean;
+        allowpopups?: boolean;
+        autoFocus?: boolean;
+        autosize?: boolean;
+        blinkfeatures?: string;
+        disableblinkfeatures?: string;
+        disableguestresize?: boolean;
+        disablewebsecurity?: boolean;
+        guestinstance?: string;
+        httpreferrer?: string;
+        nodeintegration?: boolean;
+        partition?: string;
+        plugins?: boolean;
+        preload?: string;
+        src?: string;
+        useragent?: string;
+        webpreferences?: string;
+    }
+
     //
     // React.DOM
     // ----------------------------------------------------------------------
@@ -3339,19 +3402,50 @@ declare namespace React {
         "var": DetailedHTMLFactory<HTMLAttributes<HTMLElement>, HTMLElement>;
         video: DetailedHTMLFactory<VideoHTMLAttributes<HTMLVideoElement>, HTMLVideoElement>;
         wbr: DetailedHTMLFactory<HTMLAttributes<HTMLElement>, HTMLElement>;
+        webview: DetailedHTMLFactory<WebViewHTMLAttributes<HTMLWebViewElement>, HTMLWebViewElement>;
     }
 
     interface ReactSVG {
-        svg: SVGFactory;
         animate: SVGFactory;
         circle: SVGFactory;
+        clipPath: SVGFactory;
         defs: SVGFactory;
+        desc: SVGFactory;
         ellipse: SVGFactory;
+        feBlend: SVGFactory;
+        feColorMatrix: SVGFactory;
+        feComponentTransfer: SVGFactory;
+        feComposite: SVGFactory;
+        feConvolveMatrix: SVGFactory;
+        feDiffuseLighting: SVGFactory;
+        feDisplacementMap: SVGFactory;
+        feDistantLight: SVGFactory;
+        feDropShadow: SVGFactory;
+        feFlood: SVGFactory;
+        feFuncA: SVGFactory;
+        feFuncB: SVGFactory;
+        feFuncG: SVGFactory;
+        feFuncR: SVGFactory;
+        feGaussianBlur: SVGFactory;
+        feImage: SVGFactory;
+        feMerge: SVGFactory;
+        feMergeNode: SVGFactory;
+        feMorphology: SVGFactory;
+        feOffset: SVGFactory;
+        fePointLight: SVGFactory;
+        feSpecularLighting: SVGFactory;
+        feSpotLight: SVGFactory;
+        feTile: SVGFactory;
+        feTurbulence: SVGFactory;
+        filter: SVGFactory;
+        foreignObject: SVGFactory;
         g: SVGFactory;
         image: SVGFactory;
         line: SVGFactory;
         linearGradient: SVGFactory;
+        marker: SVGFactory;
         mask: SVGFactory;
+        metadata: SVGFactory;
         path: SVGFactory;
         pattern: SVGFactory;
         polygon: SVGFactory;
@@ -3359,10 +3453,14 @@ declare namespace React {
         radialGradient: SVGFactory;
         rect: SVGFactory;
         stop: SVGFactory;
+        svg: SVGFactory;
+        switch: SVGFactory;
         symbol: SVGFactory;
         text: SVGFactory;
+        textPath: SVGFactory;
         tspan: SVGFactory;
         use: SVGFactory;
+        view: SVGFactory;
     }
 
     interface ReactDOM extends ReactHTML, ReactSVG { }
@@ -3403,7 +3501,7 @@ declare namespace React {
 
     interface ReactChildren {
         map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): T[];
-        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
+        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => void): void;
         count(children: ReactNode): number;
         only(children: ReactNode): ReactElement<any>;
         toArray(children: ReactNode): ReactChild[];
@@ -3450,17 +3548,18 @@ declare namespace React {
 
 declare global {
     namespace JSX {
-        // tslint:disable:no-empty-interface
+        // tslint:disable-next-line:no-empty-interface
         interface Element extends React.ReactElement<any> { }
         interface ElementClass extends React.Component<any> {
-            render(): Element | Element[] | string | number | null | false;
+            render(): React.ReactNode;
         }
         interface ElementAttributesProperty { props: {}; }
         interface ElementChildrenAttribute { children: {}; }
 
+        // tslint:disable-next-line:no-empty-interface
         interface IntrinsicAttributes extends React.Attributes { }
+        // tslint:disable-next-line:no-empty-interface
         interface IntrinsicClassAttributes<T> extends React.ClassAttributes<T> { }
-        // tslint:enable:no-empty-interface
 
         interface IntrinsicElements {
             // HTML
@@ -3578,6 +3677,7 @@ declare global {
             "var": React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
             video: React.DetailedHTMLProps<React.VideoHTMLAttributes<HTMLVideoElement>, HTMLVideoElement>;
             wbr: React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
+            webview: React.DetailedHTMLProps<React.WebViewHTMLAttributes<HTMLWebViewElement>, HTMLWebViewElement>;
 
             // SVG
             svg: React.SVGProps<SVGSVGElement>;
diff --git a/types/react/test/cssProperties.tsx b/types/react/test/cssProperties.tsx
index 7447d1eb52..4ef8ab792a 100644
--- a/types/react/test/cssProperties.tsx
+++ b/types/react/test/cssProperties.tsx
@@ -3,6 +3,9 @@ import * as React from 'react';
 const initialStyle: React.CSSProperties = { fontWeight: 'initial' };
 const initialStyleTest = <div style={initialStyle} />;
 
+const borderRadiusStyle: React.CSSProperties = { borderRadius: 5, borderTopRightRadius: '20%' };
+const borderRadiusStyleTest = <div style={borderRadiusStyle} />;
+
 const backgroundAttachmentStyle: React.CSSProperties = { backgroundAttachment: 'fixed' };
 const backgroundAttachmentStyleTest = <div style={backgroundAttachmentStyle} />;
 
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 543063041b..16141fabb4 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -10,6 +10,9 @@ import * as shallowCompare from "react-addons-shallow-compare";
 import * as TestUtils from "react-addons-test-utils";
 import * as TransitionGroup from "react-addons-transition-group";
 import update = require("react-addons-update");
+import * as createReactClass from "create-react-class";
+import * as PropTypes from "prop-types";
+import * as DOM from "react-dom-factories";
 
 interface Props extends React.Attributes {
     hello: string;
@@ -47,46 +50,18 @@ const container: Element = document.createElement("div");
 // Top-Level API
 // --------------------------------------------------------------------------
 
-const ClassicComponent: React.ClassicComponentClass<Props> =
-    React.createClass<Props, State>({
-        displayName: "ClassicComponent",
-        getDefaultProps() {
-            return {
-                hello: "hello",
-                world: "peace",
-                foo: 0,
-            };
-        },
-        getInitialState() {
-            return {
-                inputValue: this.context.someValue,
-                seconds: this.props.foo
-            };
-        },
-        reset() {
-            this.replaceState(this.getInitialState());
-        },
-        render() {
-            return React.DOM.div(null,
-                React.DOM.input({
-                    ref: input => this._input = input,
-                    value: this.state.inputValue
-                }));
-        }
-    });
-
 class ModernComponent extends React.Component<Props, State>
     implements MyComponent, React.ChildContextProvider<ChildContext> {
     static propTypes: React.ValidationMap<Props> = {
-        foo: React.PropTypes.number
+        foo: PropTypes.number
     };
 
     static contextTypes: React.ValidationMap<Context> = {
-        someValue: React.PropTypes.string
+        someValue: PropTypes.string
     };
 
     static childContextTypes: React.ValidationMap<ChildContext> = {
-        someOtherValue: React.PropTypes.string
+        someOtherValue: PropTypes.string
     };
 
     context: Context;
@@ -110,16 +85,16 @@ class ModernComponent extends React.Component<Props, State>
         });
     }
 
-    private _myComponent: MyComponent;
+    private readonly _myComponent: MyComponent;
     private _input: HTMLInputElement | null;
 
     render() {
-        return React.DOM.div(null,
-            React.DOM.input({
+        return DOM.div(null,
+            DOM.input({
                 ref: input => this._input = input,
                 value: this.state.inputValue
             }),
-            React.DOM.input({
+            DOM.input({
                 onChange: event => console.log(event.target)
             }));
     }
@@ -131,8 +106,8 @@ class ModernComponent extends React.Component<Props, State>
 
 class ModernComponentArrayRender extends React.Component<Props> {
     render() {
-        return [React.DOM.h1({ key: "1" }, "1"),
-                React.DOM.h1({ key: "2" }, "2")];
+        return [DOM.h1({ key: "1" }, "1"),
+                DOM.h1({ key: "2" }, "2")];
     }
 }
 
@@ -144,7 +119,7 @@ interface SCProps {
 }
 
 function StatelessComponent(props: SCProps) {
-    return props.foo ? React.DOM.div(null, props.foo) : null;
+    return props.foo ? DOM.div(null, props.foo) : null;
 }
 
 // tslint:disable-next-line:no-namespace
@@ -155,7 +130,7 @@ namespace StatelessComponent {
 
 const StatelessComponent2: React.SFC<SCProps> =
     // props is contextually typed
-    props => React.DOM.div(null, props.foo);
+    props => DOM.div(null, props.foo);
 StatelessComponent2.displayName = "StatelessComponent2";
 StatelessComponent2.defaultProps = {
     foo: 42
@@ -164,7 +139,7 @@ StatelessComponent2.defaultProps = {
 const StatelessComponent3: React.SFC<SCProps> =
     // allows usage of props.children
     // allows null return
-    props => props.foo ? React.DOM.div(null, props.foo, props.children) : null;
+    props => props.foo ? DOM.div(null, props.foo, props.children) : null;
 
 // React.createFactory
 const factory: React.CFactory<Props, ModernComponent> =
@@ -177,11 +152,6 @@ const statelessFactory: React.SFCFactory<SCProps> =
 const statelessFactoryElement: React.SFCElement<SCProps> =
     statelessFactory(props);
 
-const classicFactory: React.ClassicFactory<Props> =
-    React.createFactory(ClassicComponent);
-const classicFactoryElement: React.ClassicElement<Props> =
-    classicFactory(props);
-
 const domFactory: React.DOMFactory<React.DOMAttributes<{}>, Element> =
     React.createFactory("div");
 const domFactoryElement: React.DOMElement<React.DOMAttributes<{}>, Element> =
@@ -191,10 +161,10 @@ const domFactoryElement: React.DOMElement<React.DOMAttributes<{}>, Element> =
 const element: React.CElement<Props, ModernComponent> = React.createElement(ModernComponent, props);
 const elementNoState: React.CElement<Props, ModernComponentNoState> = React.createElement(ModernComponentNoState, props);
 const statelessElement: React.SFCElement<SCProps> = React.createElement(StatelessComponent, props);
-const classicElement: React.ClassicElement<Props> = React.createElement(ClassicComponent, props);
 const domElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> = React.createElement("div");
 const htmlElement = React.createElement("input", { type: "text" });
 const svgElement = React.createElement("svg", { accentHeight: 12 });
+const fragmentElement: React.ReactElement<{}> = React.createElement(React.Fragment, {}, [React.createElement("div"), React.createElement("div")]);
 
 const customProps: React.HTMLProps<HTMLElement> = props;
 const customDomElement = "my-element";
@@ -226,8 +196,6 @@ const clonedStatelessElement: React.SFCElement<SCProps> =
     // known problem: cloning with optional props don't work properly
     // workaround: cast to actual props type
     React.cloneElement(statelessElement, { foo: 44 } as SCProps);
-const clonedClassicElement: React.ClassicElement<Props> =
-    React.cloneElement(classicElement, props);
 // Clone base DOMElement
 const clonedDOMElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> =
     React.cloneElement(domElement, {
@@ -251,7 +219,6 @@ const componentNullContainer: ModernComponent = ReactDOM.render(element, null);
 const componentElementOrNull: ModernComponent = ReactDOM.render(element, document.getElementById("anelement"));
 const componentNoState: ModernComponentNoState = ReactDOM.render(elementNoState, container);
 const componentNoStateElementOrNull: ModernComponentNoState = ReactDOM.render(elementNoState, document.getElementById("anelement"));
-const classicComponent: React.ClassicComponent<Props> = ReactDOM.render(classicElement, container);
 const domComponent: Element = ReactDOM.render(domElement, container);
 
 // Other Top-Level API
@@ -262,6 +229,7 @@ const notValid: boolean = React.isValidElement(props); // false
 const isValid = React.isValidElement(element); // true
 let domNode: Element = ReactDOM.findDOMNode(component);
 domNode = ReactDOM.findDOMNode(domNode);
+const fragmentType: React.ComponentType = React.Fragment;
 
 //
 // React Elements
@@ -271,14 +239,6 @@ const type: React.ComponentClass<Props> = element.type;
 const elementProps: Props = element.props;
 const key = element.key;
 
-//
-// React Components
-// --------------------------------------------------------------------------
-
-const displayName: string | undefined = ClassicComponent.displayName;
-const defaultProps: Props = ClassicComponent.getDefaultProps ? ClassicComponent.getDefaultProps() : {} as Props;
-const propTypes: React.ValidationMap<Props> | undefined = ClassicComponent.propTypes;
-
 //
 // Component API
 // --------------------------------------------------------------------------
@@ -288,10 +248,6 @@ const componentState: State = component.state;
 component.setState({ inputValue: "!!!" });
 component.forceUpdate();
 
-// classic
-const isMounted: boolean = classicComponent.isMounted();
-classicComponent.replaceState({ inputValue: "???", seconds: 60 });
-
 const myComponent = component as MyComponent;
 myComponent.reset();
 
@@ -299,7 +255,7 @@ myComponent.reset();
 // Refs
 // --------------------------------------------------------------------------
 
-// tslint:disable:no-empty-interface
+// tslint:disable-next-line:no-empty-interface
 interface RCProps { }
 
 class RefComponent extends React.Component<RCProps> {
@@ -308,25 +264,25 @@ class RefComponent extends React.Component<RCProps> {
     }
 }
 
-let componentRef: RefComponent | null = new RefComponent();
+let componentRef: RefComponent | null = new RefComponent({});
 RefComponent.create({ ref: "componentRef" });
 // type of c should be inferred
 RefComponent.create({ ref: c => componentRef = c });
 componentRef.refMethod();
 
 let domNodeRef: Element | null;
-React.DOM.div({ ref: "domRef" });
+DOM.div({ ref: "domRef" });
 // type of node should be inferred
-React.DOM.div({ ref: node => domNodeRef = node });
+DOM.div({ ref: node => domNodeRef = node });
 
 let inputNodeRef: HTMLInputElement | null;
-React.DOM.input({ ref: node => inputNodeRef = node as HTMLInputElement });
+DOM.input({ ref: node => inputNodeRef = node as HTMLInputElement });
 
 //
 // Attributes
 // --------------------------------------------------------------------------
 
-const children: any[] = ["Hello world", [null], React.DOM.span(null)];
+const children: any[] = ["Hello world", [null], DOM.span(null)];
 const divStyle: React.CSSProperties = { // CSSProperties
     flex: "1 1 main-size",
     backgroundImage: "url('hello.png')"
@@ -353,15 +309,15 @@ const htmlAttr: React.HTMLProps<HTMLElement> = {
         __html: "<strong>STRONG</strong>"
     }
 };
-React.DOM.div(htmlAttr);
-React.DOM.span(htmlAttr);
-React.DOM.input(htmlAttr);
+DOM.div(htmlAttr);
+DOM.span(htmlAttr);
+DOM.input(htmlAttr);
 
-React.DOM.svg({
+DOM.svg({
     viewBox: "0 0 48 48",
     xmlns: "http://www.w3.org/2000/svg"
 },
-    React.DOM.rect({
+    DOM.rect({
         className: 'foobar',
         id: 'foo',
         color: 'black',
@@ -372,7 +328,7 @@ React.DOM.svg({
         strokeDasharray: '30%',
         strokeDashoffset: '20%'
     }),
-    React.DOM.rect({
+    DOM.rect({
         x: 10,
         y: 22,
         width: 28,
@@ -380,7 +336,7 @@ React.DOM.svg({
         strokeDasharray: 30,
         strokeDashoffset: 20
     }),
-    React.DOM.path({
+    DOM.path({
         d: "M0,0V3H3V0ZM1,1V2H2V1Z",
         fill: "#999999",
         fillRule: "evenodd"
@@ -388,34 +344,34 @@ React.DOM.svg({
 );
 
 //
-// React.PropTypes
+// PropTypes
 // --------------------------------------------------------------------------
 
 const PropTypesSpecification: React.ComponentSpec<any, any> = {
     propTypes: {
-        optionalArray: React.PropTypes.array,
-        optionalBool: React.PropTypes.bool,
-        optionalFunc: React.PropTypes.func,
-        optionalNumber: React.PropTypes.number,
-        optionalObject: React.PropTypes.object,
-        optionalString: React.PropTypes.string,
-        optionalNode: React.PropTypes.node,
-        optionalElement: React.PropTypes.element,
-        optionalMessage: React.PropTypes.instanceOf(Date),
-        optionalEnum: React.PropTypes.oneOf(["News", "Photos"]),
-        optionalUnion: React.PropTypes.oneOfType([
-            React.PropTypes.string,
-            React.PropTypes.number,
-            React.PropTypes.instanceOf(Date)
+        optionalArray: PropTypes.array,
+        optionalBool: PropTypes.bool,
+        optionalFunc: PropTypes.func,
+        optionalNumber: PropTypes.number,
+        optionalObject: PropTypes.object,
+        optionalString: PropTypes.string,
+        optionalNode: PropTypes.node,
+        optionalElement: PropTypes.element,
+        optionalMessage: PropTypes.instanceOf(Date),
+        optionalEnum: PropTypes.oneOf(["News", "Photos"]),
+        optionalUnion: PropTypes.oneOfType([
+            PropTypes.string,
+            PropTypes.number,
+            PropTypes.instanceOf(Date)
         ]),
-        optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
-        optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
-        optionalObjectWithShape: React.PropTypes.shape({
-            color: React.PropTypes.string,
-            fontSize: React.PropTypes.number
+        optionalArrayOf: PropTypes.arrayOf(PropTypes.number),
+        optionalObjectOf: PropTypes.objectOf(PropTypes.number),
+        optionalObjectWithShape: PropTypes.shape({
+            color: PropTypes.string,
+            fontSize: PropTypes.number
         }),
-        requiredFunc: React.PropTypes.func.isRequired,
-        requiredAny: React.PropTypes.any.isRequired,
+        requiredFunc: PropTypes.func.isRequired,
+        requiredAny: PropTypes.any.isRequired,
         customProp(props: any, propName: string, componentName: string): Error | null {
             if (!/matchme/.test(props[propName])) {
                 return new Error("Validation failed!");
@@ -424,7 +380,7 @@ const PropTypesSpecification: React.ComponentSpec<any, any> = {
         },
         // https://facebook.github.io/react/warnings/dont-call-proptypes.html#fixing-the-false-positive-in-third-party-proptypes
         percentage: (object: any, key: string, componentName: string, ...rest: any[]): Error | null => {
-            const error = React.PropTypes.number(object, key, componentName, ...rest);
+            const error = PropTypes.number(object, key, componentName, ...rest);
             if (error) {
                 return error;
             }
@@ -445,29 +401,29 @@ const PropTypesSpecification: React.ComponentSpec<any, any> = {
 
 const ContextTypesSpecification: React.ComponentSpec<any, any> = {
     contextTypes: {
-        optionalArray: React.PropTypes.array,
-        optionalBool: React.PropTypes.bool,
-        optionalFunc: React.PropTypes.func,
-        optionalNumber: React.PropTypes.number,
-        optionalObject: React.PropTypes.object,
-        optionalString: React.PropTypes.string,
-        optionalNode: React.PropTypes.node,
-        optionalElement: React.PropTypes.element,
-        optionalMessage: React.PropTypes.instanceOf(Date),
-        optionalEnum: React.PropTypes.oneOf(["News", "Photos"]),
-        optionalUnion: React.PropTypes.oneOfType([
-            React.PropTypes.string,
-            React.PropTypes.number,
-            React.PropTypes.instanceOf(Date)
+        optionalArray: PropTypes.array,
+        optionalBool: PropTypes.bool,
+        optionalFunc: PropTypes.func,
+        optionalNumber: PropTypes.number,
+        optionalObject: PropTypes.object,
+        optionalString: PropTypes.string,
+        optionalNode: PropTypes.node,
+        optionalElement: PropTypes.element,
+        optionalMessage: PropTypes.instanceOf(Date),
+        optionalEnum: PropTypes.oneOf(["News", "Photos"]),
+        optionalUnion: PropTypes.oneOfType([
+            PropTypes.string,
+            PropTypes.number,
+            PropTypes.instanceOf(Date)
         ]),
-        optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
-        optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
-        optionalObjectWithShape: React.PropTypes.shape({
-            color: React.PropTypes.string,
-            fontSize: React.PropTypes.number
+        optionalArrayOf: PropTypes.arrayOf(PropTypes.number),
+        optionalObjectOf: PropTypes.objectOf(PropTypes.number),
+        optionalObjectWithShape: PropTypes.shape({
+            color: PropTypes.string,
+            fontSize: PropTypes.number
         }),
-        requiredFunc: React.PropTypes.func.isRequired,
-        requiredAny: React.PropTypes.any.isRequired,
+        requiredFunc: PropTypes.func.isRequired,
+        requiredAny: PropTypes.any.isRequired,
         customProp(props: any, propName: string, componentName: string): Error | null {
             if (!/matchme/.test(props[propName])) {
                 return new Error("Validation failed!");
@@ -488,7 +444,7 @@ const mappedChildrenArray: number[] =
     React.Children.map<number>(children, (child) => 42);
 React.Children.forEach(children, (child) => { });
 const nChildren: number = React.Children.count(children);
-let onlyChild: React.ReactElement<any> = React.Children.only(React.DOM.div()); // ok
+let onlyChild: React.ReactElement<any> = React.Children.only(DOM.div()); // ok
 onlyChild = React.Children.only([null, [[["Hallo"], true]], false]); // error
 const childrenToArray: React.ReactChild[] = React.Children.toArray(children);
 
@@ -516,7 +472,7 @@ class Timer extends React.Component<{}, TimerState> {
         clearInterval(this._interval);
     }
     render() {
-        return React.DOM.div(
+        return DOM.div(
             null,
             "Seconds Elapsed: ",
             this.state.secondsElapsed
@@ -529,7 +485,7 @@ ReactDOM.render(React.createElement(Timer), container);
 // createFragment addon
 // --------------------------------------------------------------------------
 createFragment({
-    a: React.DOM.div(),
+    a: DOM.div(),
     b: ["a", false, React.createElement("span")]
 });
 
@@ -537,7 +493,7 @@ createFragment({
 // CSSTransitionGroup addon
 // --------------------------------------------------------------------------
 React.createFactory(CSSTransitionGroup)({
-    component: React.createClass({
+    component: createReactClass({
         render: (): null => null
     }),
     childFactory: (c) => c,
@@ -563,7 +519,7 @@ React.createFactory(CSSTransitionGroup)({
 //
 // LinkedStateMixin addon
 // --------------------------------------------------------------------------
-React.createClass({
+createReactClass({
     mixins: [LinkedStateMixin],
     getInitialState() {
         return {
@@ -572,12 +528,12 @@ React.createClass({
         };
     },
     render() {
-        return React.DOM.div(null,
-            React.DOM.input({
+        return DOM.div(null,
+            DOM.input({
                 type: "checkbox",
                 checkedLink: this.linkState("isChecked")
             }),
-            React.DOM.input({
+            DOM.input({
                 type: "text",
                 valueLink: this.linkState("message")
             })
@@ -616,9 +572,9 @@ Perf.printDOM();
 //
 // PureRenderMixin addon
 // --------------------------------------------------------------------------
-React.createClass({
+createReactClass({
     mixins: [PureRenderMixin],
-    render() { return React.DOM.div(null); }
+    render() { return DOM.div(null); }
 });
 
 //
@@ -626,7 +582,7 @@ React.createClass({
 // --------------------------------------------------------------------------
 
 const inst: ModernComponent = TestUtils.renderIntoDocument<ModernComponent>(element);
-const node: Element = TestUtils.renderIntoDocument(React.DOM.div());
+const node: Element = TestUtils.renderIntoDocument(DOM.div());
 
 TestUtils.Simulate.click(node);
 TestUtils.Simulate.change(node);
@@ -655,8 +611,8 @@ if (TestUtils.isElementOfType(emptyElement2, StatelessComponent)) {
 
 if (TestUtils.isDOMComponent(container)) {
     container.getAttribute("className");
-} else if (TestUtils.isCompositeComponent(new ModernComponent())) {
-    new ModernComponent().props;
+} else if (TestUtils.isCompositeComponent(new ModernComponent({ hello: 'hi', foo: 3 }))) {
+    new ModernComponent({ hello: 'hi', foo: 3 }).props;
 }
 
 //
@@ -698,14 +654,14 @@ class SyntheticEventTargetValue extends React.Component<{}, { value: string }> {
         this.state = { value: 'a' };
     }
     render() {
-        return React.DOM.textarea({
+        return DOM.textarea({
             value: this.state.value,
             onChange: e => this.setState({ value: e.target.value })
         });
     }
 }
 
-React.DOM.input({
+DOM.input({
     onChange: event => {
         // `event.target` is guaranteed to be HTMLInputElement
         event.target.value;
@@ -744,3 +700,11 @@ declare var x: React.DOMElement<{
         transition: string;
     };
 }, Element>;
+
+// React 16 should be able to render its children directly
+class RenderChildren extends React.Component {
+    render() {
+        const { children } = this.props;
+        return children !== undefined ? children : null;
+    }
+}
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index dd91b5a0bd..38d902c387 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -63,3 +63,49 @@ const StatelessComponentWithoutProps: React.SFC = (props) => {
     return <div />;
 };
 <StatelessComponentWithoutProps />;
+
+// Fragments
+<div>
+    <React.Fragment>
+        <React.Fragment key="foo">
+            <span>Child 1</span>
+            <span>Child 2</span>
+        </React.Fragment>
+        <React.Fragment key="bar">
+            <span>Child 3</span>
+            <span>Child 4</span>
+        </React.Fragment>
+    </React.Fragment>
+</div>;
+
+// Below tests that setState() works properly for both regular and callback modes
+class SetStateTest extends React.Component<{}, { foo: boolean, bar: boolean }> {
+    handleSomething = () => {
+      this.setState({ foo: '' }); // $ExpectError
+      this.setState({ foo: true });
+      this.setState({ foo: true, bar: true });
+      this.setState({});
+      this.setState({ foo: true, foo2: true }); // $ExpectError
+      this.setState(() => ({ foo: '' })); // $ExpectError
+      this.setState(() => ({ foo: true }));
+      this.setState(() => ({ foo: true, bar: true }));
+      this.setState(() => ({ foo: true, foo2: true })); // $ExpectError
+      this.setState(() => ({ foo: '', foo2: true })); // $ExpectError
+      this.setState(() => ({ })); // ok!
+      this.setState({ foo: true, bar: undefined}); // $ExpectError
+    }
+}
+
+// Below tests that extended types for state work
+export abstract class SetStateTestForExtendsState<P, S extends { baseProp: string }> extends React.Component<P, S> {
+	foo() {
+		this.setState({ baseProp: 'foobar' });
+	}
+}
+
+// Below tests that & generic still works
+export abstract class SetStateTestForAndedState<P, S> extends React.Component<P, S & { baseProp: string }> {
+	foo() {
+		this.setState({ baseProp: 'foobar' });
+	}
+}
diff --git a/types/react/tslint.json b/types/react/tslint.json
index c09aa3940e..6a9d91ddbd 100644
--- a/types/react/tslint.json
+++ b/types/react/tslint.json
@@ -6,6 +6,8 @@
 		"no-any-union": false,
 		"no-object-literal-type-assertion": false,
 		"no-unnecessary-generics": false,
-		"no-void-expression": false
+		"no-void-expression": false,
+		"strict-export-declare-modifiers": false,
+		"void-return": false
 	}
 }
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 6be40c0f6b..753ae4550e 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -35,7 +35,7 @@ Therefore, the type of props is left as Q, which should work for most cases.
 If you need to call cloneElement with key or ref, you'll need a type cast:
 
 interface ButtonProps {
-    label: string,
+    label: string;
     isDisabled?: boolean;
 }
 var element: React.CElement<ButtonProps, Button>;
@@ -78,7 +78,7 @@ declare namespace React {
     type ComponentType<P = {}> = ComponentClass<P> | StatelessComponent<P>;
 
     type Key = string | number;
-    type Ref<T> = string | ((instance: T | null) => any);
+    type Ref<T> = string | { bivarianceHack(instance: T | null): any }["bivarianceHack"];
 
     // tslint:disable-next-line:interface-over-type-literal
     type ComponentState = {};
@@ -127,6 +127,26 @@ declare namespace React {
         type: keyof ReactSVG;
     }
 
+    interface WebViewHTMLAttributes<T> extends HTMLAttributes<T> {
+        allowFullScreen?: boolean;
+        allowpopups?: boolean;
+        autoFocus?: boolean;
+        autosize?: boolean;
+        blinkfeatures?: string;
+        disableblinkfeatures?: string;
+        disableguestresize?: boolean;
+        disablewebsecurity?: boolean;
+        guestinstance?: string;
+        httpreferrer?: string;
+        nodeintegration?: boolean;
+        partition?: string;
+        plugins?: boolean;
+        preload?: string;
+        src?: string;
+        useragent?: string;
+        webpreferences?: string;
+    }
+
     //
     // Factories
     // ----------------------------------------------------------------------
@@ -282,11 +302,13 @@ declare namespace React {
     class Component<P, S> {
         constructor(props?: P, context?: any);
 
-        // Disabling unified-signatures to have separate overloads. It's easier to understand this way.
-        // tslint:disable:unified-signatures
-        setState<K extends keyof S>(f: (prevState: S, props: P) => Pick<S, K>, callback?: () => any): void;
-        setState<K extends keyof S>(state: Pick<S, K>, callback?: () => any): void;
-        // tslint:enable:unified-signatures
+        // We MUST keep setState() as a unified signature because it allows proper checking of the method return type.
+        // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18365#issuecomment-351013257
+        // Also, the ` | S` allows intellisense to not be dumbisense
+        setState<K extends keyof S>(
+            state: ((prevState: Readonly<S>, props: P) => (Pick<S, K> | S)) | (Pick<S, K> | S),
+            callback?: () => any
+        ): void;
 
         forceUpdate(callBack?: () => any): void;
         render(): JSX.Element | null | false;
@@ -521,7 +543,7 @@ declare namespace React {
     // Event Handler Types
     // ----------------------------------------------------------------------
 
-    type EventHandler<E extends SyntheticEvent<any>> = (event: E) => void;
+    type EventHandler<E extends SyntheticEvent<any>> = { bivarianceHack(event: E): void }["bivarianceHack"];
 
     type ReactEventHandler<T> = EventHandler<SyntheticEvent<T>>;
 
@@ -2434,6 +2456,7 @@ declare namespace React {
         allowFullScreen?: boolean;
         allowTransparency?: boolean;
         alt?: string;
+        as?: string;
         async?: boolean;
         autoComplete?: string;
         autoFocus?: boolean;
@@ -2720,6 +2743,8 @@ declare namespace React {
     }
 
     interface LinkHTMLAttributes<T> extends HTMLAttributes<T> {
+        as?: string;
+        crossOrigin?: string;
         href?: string;
         hrefLang?: string;
         integrity?: string;
@@ -3121,7 +3146,7 @@ declare namespace React {
         strokeDashoffset?: string | number;
         strokeLinecap?: "butt" | "round" | "square" | "inherit";
         strokeLinejoin?: "miter" | "round" | "bevel" | "inherit";
-        strokeMiterlimit?: string;
+        strokeMiterlimit?: number | string;
         strokeOpacity?: number | string;
         strokeWidth?: number | string;
         surfaceScale?: number | string;
@@ -3302,6 +3327,7 @@ declare namespace React {
         "var": DetailedHTMLFactory<HTMLAttributes<HTMLElement>, HTMLElement>;
         video: DetailedHTMLFactory<VideoHTMLAttributes<HTMLVideoElement>, HTMLVideoElement>;
         wbr: DetailedHTMLFactory<HTMLAttributes<HTMLElement>, HTMLElement>;
+        webview: DetailedHTMLFactory<WebViewHTMLAttributes<HTMLElement>, HTMLElement>;
     }
 
     interface ReactSVG {
@@ -3334,7 +3360,7 @@ declare namespace React {
     // React.PropTypes
     // ----------------------------------------------------------------------
 
-    type Validator<T> = (object: T, key: string, componentName: string, ...rest: any[]) => Error | null;
+    type Validator<T> = { bivarianceHack(object: T, key: string, componentName: string, ...rest: any[]): Error | null }["bivarianceHack"];
 
     interface Requireable<T> extends Validator<T> {
         isRequired: Validator<T>;
@@ -3403,7 +3429,7 @@ declare namespace React {
 
 declare global {
     namespace JSX {
-        // tslint:disable:no-empty-interface
+        // tslint:disable-next-line:no-empty-interface
         interface Element extends React.ReactElement<any> { }
         interface ElementClass extends React.Component<any> {
             render(): JSX.Element | null | false;
@@ -3411,9 +3437,10 @@ declare global {
         interface ElementAttributesProperty { props: {}; }
         interface ElementChildrenAttribute { children: {}; }
 
+        // tslint:disable-next-line:no-empty-interface
         interface IntrinsicAttributes extends React.Attributes { }
+        // tslint:disable-next-line:no-empty-interface
         interface IntrinsicClassAttributes<T> extends React.ClassAttributes<T> { }
-        // tslint:enable:no-empty-interface
 
         interface IntrinsicElements {
             // HTML
@@ -3531,6 +3558,7 @@ declare global {
             "var": React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
             video: React.DetailedHTMLProps<React.VideoHTMLAttributes<HTMLVideoElement>, HTMLVideoElement>;
             wbr: React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
+            webview: React.DetailedHTMLProps<React.WebViewHTMLAttributes<HTMLElement>, HTMLElement>;
 
             // SVG
             svg: React.SVGProps<SVGSVGElement>;
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index a7a4c97ba4..be6d27b659 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -110,7 +110,7 @@ class ModernComponent extends React.Component<Props, State>
         });
     }
 
-    private _myComponent: MyComponent;
+    private readonly _myComponent: MyComponent;
     private _input: HTMLInputElement | null;
 
     render() {
@@ -294,7 +294,7 @@ myComponent.reset();
 // Refs
 // --------------------------------------------------------------------------
 
-// tslint:disable:no-empty-interface
+// tslint:disable-next-line:no-empty-interface
 interface RCProps { }
 
 class RefComponent extends React.Component<RCProps> {
diff --git a/types/react/v15/test/tsx.tsx b/types/react/v15/test/tsx.tsx
index dd91b5a0bd..8afb75d9a8 100644
--- a/types/react/v15/test/tsx.tsx
+++ b/types/react/v15/test/tsx.tsx
@@ -63,3 +63,35 @@ const StatelessComponentWithoutProps: React.SFC = (props) => {
     return <div />;
 };
 <StatelessComponentWithoutProps />;
+
+// Below tests that setState() works properly for both regular and callback modes
+class SetStateTest extends React.Component<{}, { foo: boolean, bar: boolean }> {
+    handleSomething = () => {
+      this.setState({ foo: '' }); // $ExpectError
+      this.setState({ foo: true });
+      this.setState({ foo: true, bar: true });
+      this.setState({});
+      this.setState({ foo: true, foo2: true }); // $ExpectError
+      this.setState(() => ({ foo: '' })); // $ExpectError
+      this.setState(() => ({ foo: true }));
+      this.setState(() => ({ foo: true, bar: true }));
+      this.setState(() => ({ foo: true, foo2: true })); // $ExpectError
+      this.setState(() => ({ foo: '', foo2: true })); // $ExpectError
+      this.setState(() => ({ })); // ok!
+      this.setState({ foo: true, bar: undefined}); // $ExpectError
+    }
+}
+
+// Below tests that extended types for state work
+export abstract class SetStateTestForExtendsState<P, S extends { baseProp: string }> extends React.Component<P, S> {
+	foo() {
+		this.setState({ baseProp: 'foobar' });
+	}
+}
+
+// Below tests that & generic still works
+export abstract class SetStateTestForAndedState<P, S> extends React.Component<P, S & { baseProp: string }> {
+	foo() {
+		this.setState({ baseProp: 'foobar' });
+	}
+}
diff --git a/types/reactcss/tslint.json b/types/reactcss/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/reactcss/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 81d4cec5bd..59bca2df3d 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -1,6 +1,11 @@
-// Type definitions for reactstrap 4.6
+// Type definitions for reactstrap 5.0
 // Project: https://github.com/reactstrap/reactstrap#readme
-// Definitions by: Ali Hammad Baig <https://github.com/alihammad>, Marco Falkenberg <https://github.com/mfal>, Danilo Barros <https://github.com/danilobjr>, Fábio Paiva <https://github.com/fabiopaiva>
+// Definitions by: Ali Hammad Baig <https://github.com/alihammad>
+//                 Marco Falkenberg <https://github.com/mfal>
+//                 Danilo Barros <https://github.com/danilobjr>
+//                 Fábio Paiva <https://github.com/fabiopaiva>
+//                 FaithForHumans <https://github.com/FaithForHumans>
+//                 Kurt Preston <https://github.com/KurtPreston>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -8,80 +13,82 @@ export interface CSSModule {
   [className: string]: string;
 }
 
-export { default as Alert } from './lib/Alert';
-export { default as Badge } from './lib/Badge';
-export { default as Breadcrumb } from './lib/Breadcrumb';
-export { default as BreadcrumbItem } from './lib/BreadcrumbItem';
-export { default as Button } from './lib/Button';
-export { default as ButtonDropdown } from './lib/ButtonDropdown';
-export { default as ButtonGroup } from './lib/ButtonGroup';
-export { default as ButtonToolbar } from './lib/ButtonToolbar';
-export { default as Card } from './lib/Card';
-export { default as CardBody } from './lib/CardBody';
-export { default as CardBlock } from './lib/CardBlock';
-export { default as CardColumns } from './lib/CardColumns';
-export { default as CardDeck } from './lib/CardDeck';
-export { default as CardFooter } from './lib/CardFooter';
-export { default as CardGroup } from './lib/CardGroup';
-export { default as CardHeader } from './lib/CardHeader';
-export { default as CardImg } from './lib/CardImg';
-export { default as CardImgOverlay } from './lib/CardImgOverlay';
-export { default as CardLink } from './lib/CardLink';
-export { default as CardSubtitle } from './lib/CardSubtitle';
-export { default as CardText } from './lib/CardText';
-export { default as CardTitle } from './lib/CardTitle';
-export { default as Col } from './lib/Col';
-export { default as Collapse } from './lib/Collapse';
-export { default as Container } from './lib/Container';
-export { default as Dropdown } from './lib/Dropdown';
-export { default as DropdownItem } from './lib/DropdownItem';
-export { default as DropdownMenu } from './lib/DropdownMenu';
-export { default as DropdownToggle } from './lib/DropdownToggle';
-export { default as Fade } from './lib/Fade';
-export { default as Form } from './lib/Form';
-export { default as FormFeedback } from './lib/FormFeedback';
-export { default as FormGroup } from './lib/FormGroup';
-export { default as FormText } from './lib/FormText';
-export { default as Input } from './lib/Input';
-export { default as InputGroup } from './lib/InputGroup';
-export { default as InputGroupAddon } from './lib/InputGroupAddon';
-export { default as InputGroupButton } from './lib/InputGroupButton';
-export { default as Jumbotron } from './lib/Jumbotron';
-export { default as Label } from './lib/Label';
-export { default as ListGroup } from './lib/ListGroup';
-export { default as ListGroupItem } from './lib/ListGroupItem';
-export { default as ListGroupItemHeading } from './lib/ListGroupItemHeading';
-export { default as ListGroupItemText } from './lib/ListGroupItemText';
-export { default as Media } from './lib/Media';
-export { default as Modal } from './lib/Modal';
-export { default as ModalBody } from './lib/ModalBody';
-export { default as ModalFooter } from './lib/ModalFooter';
-export { default as ModalHeader } from './lib/ModalHeader';
-export { default as Nav } from './lib/Nav';
-export { default as Navbar } from './lib/Navbar';
-export { default as NavbarBrand } from './lib/NavbarBrand';
-export { default as NavbarToggler } from './lib/NavbarToggler';
-export { default as NavDropdown } from './lib/NavDropdown';
-export { default as NavItem } from './lib/NavItem';
-export { default as NavLink } from './lib/NavLink';
-export { default as Pagination } from './lib/Pagination';
-export { default as PaginationItem } from './lib/PaginationItem';
-export { default as PaginationLink } from './lib/PaginationLink';
-export { default as Popover } from './lib/Popover';
-export { default as PopoverContent } from './lib/PopoverContent';
-export { default as PopoverTitle } from './lib/PopoverTitle';
-export { default as Progress } from './lib/Progress';
-export { default as Row } from './lib/Row';
-export { default as TabContent } from './lib/TabContent';
-export { default as Table } from './lib/Table';
-export { default as TabPane } from './lib/TabPane';
-export { default as Tag } from './lib/Tag';
-export { default as TetherContent } from './lib/TetherContent';
-export { default as Tooltip } from './lib/Tooltip';
-export {
-  UncontrolledAlert,
-  UncontrolledButtonDropdown,
-  UncontrolledDropdown,
-  UncontrolledNavDropdown,
-  UncontrolledTooltip
-} from './lib/Uncontrolled';
+export { default as Alert,                AlertProps                      } from './lib/Alert';
+export { default as Badge,                BadgeProps                      } from './lib/Badge';
+export { default as Breadcrumb,           BreadcrumbProps                 } from './lib/Breadcrumb';
+export { default as BreadcrumbItem,       BreadcrumbItemProps             } from './lib/BreadcrumbItem';
+export { default as Button,               ButtonProps                     } from './lib/Button';
+export { default as ButtonDropdown,       ButtonDropdownProps             } from './lib/ButtonDropdown';
+export { default as ButtonGroup,          ButtonGroupProps                } from './lib/ButtonGroup';
+export { default as ButtonToolbar,        ButtonToolbarProps              } from './lib/ButtonToolbar';
+export { default as Card,                 CardProps                       } from './lib/Card';
+export { default as CardBody,             CardBodyProps                   } from './lib/CardBody';
+export { default as CardBlock,            CardBlockProps                  } from './lib/CardBlock';
+export { default as CardColumns,          CardColumnsProps                } from './lib/CardColumns';
+export { default as CardDeck,             CardDeckProps                   } from './lib/CardDeck';
+export { default as CardFooter,           CardFooterProps                 } from './lib/CardFooter';
+export { default as CardGroup,            CardGroupProps                  } from './lib/CardGroup';
+export { default as CardHeader,           CardHeaderProps                 } from './lib/CardHeader';
+export { default as CardImg,              CardImgProps                    } from './lib/CardImg';
+export { default as CardImgOverlay,       CardImgOverlayProps             } from './lib/CardImgOverlay';
+export { default as CardLink,             CardLinkProps                   } from './lib/CardLink';
+export { default as CardSubtitle,         CardSubtitleProps               } from './lib/CardSubtitle';
+export { default as CardText,             CardTextProps                   } from './lib/CardText';
+export { default as CardTitle,            CardTitleProps                  } from './lib/CardTitle';
+export { default as Carousel,             CarouselProps                   } from './lib/Carousel';
+export { default as CarouselItem,         CarouselItemProps               } from './lib/CarouselItem';
+export { default as CarouselControl,      CarouselControlProps            } from './lib/CarouselControl';
+export { default as CarouselIndicators,   CarouselIndicatorsProps         } from './lib/CarouselIndicators';
+export { default as CarouselCaption,      CarouselCaptionProps            } from './lib/CarouselCaption';
+export { default as Col,                  ColProps                        } from './lib/Col';
+export { default as Collapse,             CollapseProps                   } from './lib/Collapse';
+export { default as Container,            ContainerProps                  } from './lib/Container';
+export { default as Dropdown,             DropdownProps                   } from './lib/Dropdown';
+export { default as DropdownItem,         DropdownItemProps               } from './lib/DropdownItem';
+export { default as DropdownMenu,         DropdownMenuProps               } from './lib/DropdownMenu';
+export { default as DropdownToggle,       DropdownToggleProps             } from './lib/DropdownToggle';
+export { default as Fade,                 FadeProps                       } from './lib/Fade';
+export { default as Form,                 FormProps                       } from './lib/Form';
+export { default as FormFeedback,         FormFeedbackProps               } from './lib/FormFeedback';
+export { default as FormGroup,            FormGroupProps                  } from './lib/FormGroup';
+export { default as FormText,             FormTextProps                   } from './lib/FormText';
+export { default as Input,                InputProps                      } from './lib/Input';
+export { default as InputGroup,           InputGroupProps                 } from './lib/InputGroup';
+export { default as InputGroupAddon,      InputGroupAddonProps            } from './lib/InputGroupAddon';
+export { default as InputGroupButton,     InputGroupButtonProps           } from './lib/InputGroupButton';
+export { default as Jumbotron,            JumbotronProps                  } from './lib/Jumbotron';
+export { default as Label,                LabelProps                      } from './lib/Label';
+export { default as ListGroup,            ListGroupProps                  } from './lib/ListGroup';
+export { default as ListGroupItem,        ListGroupItemProps              } from './lib/ListGroupItem';
+export { default as ListGroupItemHeading, ListGroupItemHeadingProps       } from './lib/ListGroupItemHeading';
+export { default as ListGroupItemText,    ListGroupItemTextProps          } from './lib/ListGroupItemText';
+export { default as Media,                MediaProps                      } from './lib/Media';
+export { default as Modal,                ModalProps                      } from './lib/Modal';
+export { default as ModalBody,            ModalBodyProps                  } from './lib/ModalBody';
+export { default as ModalFooter,          ModalFooterProps                } from './lib/ModalFooter';
+export { default as ModalHeader,          ModalHeaderProps                } from './lib/ModalHeader';
+export { default as Nav,                  NavProps                        } from './lib/Nav';
+export { default as Navbar,               NavbarProps                     } from './lib/Navbar';
+export { default as NavbarBrand,          NavbarBrandProps                } from './lib/NavbarBrand';
+export { default as NavbarToggler,        NavbarTogglerProps              } from './lib/NavbarToggler';
+export { default as NavDropdown,          NavDropdownProps                } from './lib/NavDropdown';
+export { default as NavItem,              NavItemProps                    } from './lib/NavItem';
+export { default as NavLink,              NavLinkProps                    } from './lib/NavLink';
+export { default as Pagination,           PaginationProps                 } from './lib/Pagination';
+export { default as PaginationItem,       PaginationItemProps             } from './lib/PaginationItem';
+export { default as PaginationLink,       PaginationLinkProps             } from './lib/PaginationLink';
+export { default as Popover,              PopoverProps                    } from './lib/Popover';
+export { default as PopoverBody,          PopoverBodyProps                } from './lib/PopoverBody';
+export { default as PopoverHeader,        PopoverHeaderProps              } from './lib/PopoverHeader';
+export { default as Progress,             ProgressProps                   } from './lib/Progress';
+export { default as Row,                  RowProps                        } from './lib/Row';
+export { default as TabContent,           TabContentProps                 } from './lib/TabContent';
+export { default as Table,                TableProps                      } from './lib/Table';
+export { default as TabPane,              TabPaneProps                    } from './lib/TabPane';
+export { default as Tag,                  TagProps                        } from './lib/Tag';
+export { default as Tooltip,              TooltipProps                    } from './lib/Tooltip';
+export { UncontrolledAlert,               UncontrolledAlertProps          } from './lib/Uncontrolled';
+export { UncontrolledButtonDropdown,      UncontrolledButtonDropdownProps } from './lib/Uncontrolled';
+export { UncontrolledDropdown,            UncontrolledDropdownProps       } from './lib/Uncontrolled';
+export { UncontrolledNavDropdown,         UncontrolledNavDropdownProps    } from './lib/Uncontrolled';
+export { UncontrolledTooltip,             UncontrolledTooltipProps        } from './lib/Uncontrolled';
diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index e29d62cb0d..c52ff2c35b 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -9,11 +9,14 @@ export interface UncontrolledProps {
   transitionEnterTimeout?: number;
   transitionLeaveTimeout?: number;
 }
+export interface UncontrolledAlertProps extends UncontrolledProps {
+  /* intentionally blank */
+}
 
-interface Props extends UncontrolledProps {
+export interface AlertProps extends UncontrolledAlertProps {
   isOpen?: boolean;
   toggle?: () => void;
 }
 
-declare var Alert: React.StatelessComponent<Props>;
+declare const Alert: React.StatelessComponent<AlertProps>;
 export default Alert;
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index 51f72e39d3..b58faeed8c 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface BadgeProps {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
@@ -8,5 +8,5 @@ interface Props {
   cssModule?: CSSModule;
 }
 
-declare var Badge: React.StatelessComponent<Props>;
+declare const Badge: React.StatelessComponent<BadgeProps>;
 export default Badge;
diff --git a/types/reactstrap/lib/Breadcrumb.d.ts b/types/reactstrap/lib/Breadcrumb.d.ts
index 54f581288c..4b5e2b85da 100644
--- a/types/reactstrap/lib/Breadcrumb.d.ts
+++ b/types/reactstrap/lib/Breadcrumb.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface BreadcrumbProps {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var Breadcrumb: React.StatelessComponent<Props>;
+declare const Breadcrumb: React.StatelessComponent<BreadcrumbProps>;
 export default Breadcrumb;
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index 0277305b21..4cb8d77c75 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface BreadcrumbItemProps {
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
@@ -10,6 +10,5 @@ interface Props {
   [others: string]: any;
 }
 
-declare var BreadcrumbItem: React.StatelessComponent<Props>;
+declare const BreadcrumbItem: React.StatelessComponent<BreadcrumbItemProps>;
 export default BreadcrumbItem;
-
diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index e6ec222c14..50f69b1fb1 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -1,13 +1,13 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLButtonElement> {
+export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
   outline?: boolean;
   active?: boolean;
   block?: boolean;
   color?: string;
   disabled?: boolean;
   tag?: React.ReactType;
-  getRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: string | ((instance: HTMLButtonElement) => any);
 
   onClick?: React.MouseEventHandler<any>;
   size?: any;
@@ -17,5 +17,5 @@ interface Props extends React.HTMLProps<HTMLButtonElement> {
   cssModule?: CSSModule;
 }
 
-declare var Button: React.StatelessComponent<Props>;
+declare const Button: React.StatelessComponent<ButtonProps>;
 export default Button;
diff --git a/types/reactstrap/lib/ButtonDropdown.d.ts b/types/reactstrap/lib/ButtonDropdown.d.ts
index 9ab54c7502..fd09d6da8f 100644
--- a/types/reactstrap/lib/ButtonDropdown.d.ts
+++ b/types/reactstrap/lib/ButtonDropdown.d.ts
@@ -1,12 +1,15 @@
-import {
-  UncontrolledProps as DropdownUncontrolledProps,
-  Props as DropdownProps
-} from './Dropdown';
+import { UncontrolledDropdownProps, DropdownProps } from './Dropdown';
 
-// tslint:disable-next-line
-export interface UncontrolledProps extends DropdownUncontrolledProps { }
-// tslint:disable-next-line
-interface Props extends DropdownProps { }
+export interface UncontrolledProps extends UncontrolledDropdownProps {
+  /* intentionally blank */
+}
+export interface UncontrolledButtonDropdownProps extends UncontrolledProps {
+  /* intentionally blank */
+}
 
-declare var ButtonDropdown: React.StatelessComponent<Props>;
-export default ButtonDropdown;
\ No newline at end of file
+export interface ButtonDropdownProps extends DropdownProps {
+  /* intentionally blank */
+}
+
+declare const ButtonDropdown: React.StatelessComponent<ButtonDropdownProps>;
+export default ButtonDropdown;
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index d807ea33cf..29bbaac38b 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ButtonGroupProps {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
@@ -10,5 +10,5 @@ interface Props {
   vertical?: boolean;
 }
 
-declare var ButtonGroup: React.StatelessComponent<Props>;
+declare const ButtonGroup: React.StatelessComponent<ButtonGroupProps>;
 export default ButtonGroup;
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index fea31dd5d5..1c782c5745 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ButtonToolbarProps {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
@@ -8,5 +8,5 @@ interface Props {
   role?: string;
 }
 
-declare var ButtonToolbar: React.StatelessComponent<Props>;
+declare const ButtonToolbar: React.StatelessComponent<ButtonToolbarProps>;
 export default ButtonToolbar;
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index 0dbde7f879..97aafdc3e3 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardProps {
   tag?: React.ReactType;
   inverse?: boolean;
   color?: string;
@@ -11,6 +11,5 @@ interface Props {
   style?: React.CSSProperties;
 }
 
-declare var Card: React.StatelessComponent<Props>;
+declare const Card: React.StatelessComponent<CardProps>;
 export default Card;
-
diff --git a/types/reactstrap/lib/CardBlock.d.ts b/types/reactstrap/lib/CardBlock.d.ts
index 0aa31a63a7..9830e15e6a 100644
--- a/types/reactstrap/lib/CardBlock.d.ts
+++ b/types/reactstrap/lib/CardBlock.d.ts
@@ -1,11 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardBlockProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardBlock: React.StatelessComponent<Props>;
+declare const CardBlock: React.StatelessComponent<CardBlockProps>;
 export default CardBlock;
-
diff --git a/types/reactstrap/lib/CardBody.d.ts b/types/reactstrap/lib/CardBody.d.ts
index 2b94e52ea8..433a6a6ac0 100644
--- a/types/reactstrap/lib/CardBody.d.ts
+++ b/types/reactstrap/lib/CardBody.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardBodyProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardBody: React.StatelessComponent<Props>;
+declare const CardBody: React.StatelessComponent<CardBodyProps>;
 export default CardBody;
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index 0cc1a80a1a..92eb2019ec 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardColumnsProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardColumns: React.StatelessComponent<Props>;
+declare const CardColumns: React.StatelessComponent<CardColumnsProps>;
 export default CardColumns;
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index 1a5882aa54..c14324df37 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardDeckProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardDeck: React.StatelessComponent<Props>;
+declare const CardDeck: React.StatelessComponent<CardDeckProps>;
 export default CardDeck;
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index 0956cb06c9..6dba776a38 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardFooterProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardFooter: React.StatelessComponent<Props>;
+declare const CardFooter: React.StatelessComponent<CardFooterProps>;
 export default CardFooter;
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index 5c0a0a1ab1..695747eef4 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardGroupProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardGroup: React.StatelessComponent<Props>;
+declare const CardGroup: React.StatelessComponent<CardGroupProps>;
 export default CardGroup;
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index f063057c92..306ff445e3 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardHeaderProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardHeader: React.StatelessComponent<Props>;
+declare const CardHeader: React.StatelessComponent<CardHeaderProps>;
 export default CardHeader;
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index 1c3fee274b..e65cba66e2 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardImgProps {
   tag?: React.ReactType;
   top?: boolean;
   bottom?: boolean;
@@ -12,5 +12,5 @@ interface Props {
   alt?: string;
 }
 
-declare var CardImg: React.StatelessComponent<Props>;
+declare const CardImg: React.StatelessComponent<CardImgProps>;
 export default CardImg;
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index 05519847b2..d31e96d76f 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardImgOverlayProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardImgOverlay: React.StatelessComponent<Props>;
+declare const CardImgOverlay: React.StatelessComponent<CardImgOverlayProps>;
 export default CardImgOverlay;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 3edf6b24f8..22c9d614b3 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -1,12 +1,12 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardLinkProps {
   tag?: React.ReactType;
-  getRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: string | ((instance: HTMLButtonElement) => any);
   className?: string;
   cssModule?: CSSModule;
   href?: string;
 }
 
-declare var CardLink: React.StatelessComponent<Props>;
+declare const CardLink: React.StatelessComponent<CardLinkProps>;
 export default CardLink;
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index bfacd4e794..915c69c93f 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardSubtitleProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardSubtitle: React.StatelessComponent<Props>;
+declare const CardSubtitle: React.StatelessComponent<CardSubtitleProps>;
 export default CardSubtitle;
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index 13177fba67..3782e962be 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardTextProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardText: React.StatelessComponent<Props>;
+declare const CardText: React.StatelessComponent<CardTextProps>;
 export default CardText;
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index 2843800a4e..f551d860ab 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface CardTitleProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var CardTitle: React.StatelessComponent<Props>;
+declare const CardTitle: React.StatelessComponent<CardTitleProps>;
 export default CardTitle;
diff --git a/types/reactstrap/lib/Carousel.d.ts b/types/reactstrap/lib/Carousel.d.ts
new file mode 100644
index 0000000000..1fc992ada2
--- /dev/null
+++ b/types/reactstrap/lib/Carousel.d.ts
@@ -0,0 +1,18 @@
+import { CSSModule } from '../index';
+
+export interface CarouselProps extends React.HTMLProps<HTMLElement> {
+    activeIndex?: number;
+    next: () => void;
+    previous: () => void;
+    keyboard?: boolean;
+    pause?: 'hover' | false;
+    ride?: 'carousel';
+    interval?: number | string | boolean;
+    mouseEnter?: () => void;
+    mouseExit?: () => void;
+    slide?: boolean;
+    cssModule?: CSSModule
+}
+
+declare const Carousel: React.StatelessComponent<CarouselProps>;
+export default Carousel;
diff --git a/types/reactstrap/lib/CarouselCaption.d.ts b/types/reactstrap/lib/CarouselCaption.d.ts
new file mode 100644
index 0000000000..58be0e29b3
--- /dev/null
+++ b/types/reactstrap/lib/CarouselCaption.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+export interface CarouselCaptionProps extends React.HTMLProps<HTMLElement> {
+    captionHeader?: string;
+    captionText: string;
+    cssModule?: CSSModule;
+}
+
+declare const CarouselCaption: React.StatelessComponent<CarouselCaptionProps>;
+export default CarouselCaption;
diff --git a/types/reactstrap/lib/CarouselControl.d.ts b/types/reactstrap/lib/CarouselControl.d.ts
new file mode 100644
index 0000000000..0e94fd5c70
--- /dev/null
+++ b/types/reactstrap/lib/CarouselControl.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+export interface CarouselControlProps extends React.HTMLProps<HTMLElement> {
+    direction: 'prev' | 'next';
+    onClickHandler: () => void;
+    cssModule?: CSSModule;
+    directionText: string;
+}
+
+declare const CarouselControl: React.StatelessComponent<CarouselControlProps>;
+export default CarouselControl;
diff --git a/types/reactstrap/lib/CarouselIndicators.d.ts b/types/reactstrap/lib/CarouselIndicators.d.ts
new file mode 100644
index 0000000000..8a8ead6c06
--- /dev/null
+++ b/types/reactstrap/lib/CarouselIndicators.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+export interface CarouselIndicatorsProps extends React.HTMLProps<HTMLElement> {
+    items: object[];
+    activeIndex: number;
+    cssModule?: CSSModule;
+    onClickHandler: (idx: number) => void;
+}
+
+declare const CarouselIndicators: React.StatelessComponent<CarouselIndicatorsProps>;
+export default CarouselIndicators;
diff --git a/types/reactstrap/lib/CarouselItem.d.ts b/types/reactstrap/lib/CarouselItem.d.ts
new file mode 100644
index 0000000000..6be3c28d5e
--- /dev/null
+++ b/types/reactstrap/lib/CarouselItem.d.ts
@@ -0,0 +1,20 @@
+import { CSSModule } from '../index';
+
+export interface Transition {
+    onEnter?: () => void;
+    onEntering?: () => void;
+    onEntered?: () => void;
+    onExit?: () => void;
+    onExiting?: () => void;
+    onExited?: () => void;
+}
+
+export interface CarouselItemProps extends React.HTMLProps<HTMLElement>, Transition {
+    tag?: React.ReactType;
+    in?: boolean;
+    cssModule?: CSSModule;
+    slide?: boolean;
+}
+
+declare const CarouselItem: React.StatelessComponent<CarouselItemProps>;
+export default CarouselItem;
diff --git a/types/reactstrap/lib/Col.d.ts b/types/reactstrap/lib/Col.d.ts
index a2ea76d607..fb3fee9c8e 100644
--- a/types/reactstrap/lib/Col.d.ts
+++ b/types/reactstrap/lib/Col.d.ts
@@ -9,7 +9,8 @@ export type ColumnProps
     offset?: string | number
   };
 
-interface Props extends React.HTMLProps<HTMLDivElement> {
+export interface ColProps extends React.HTMLProps<HTMLDivElement> {
+  tag?: React.ReactType;
   xs?: ColumnProps;
   sm?: ColumnProps;
   md?: ColumnProps;
@@ -20,5 +21,5 @@ interface Props extends React.HTMLProps<HTMLDivElement> {
   widths?: string[];
 }
 
-declare var Col: React.StatelessComponent<Props>;
+declare const Col: React.StatelessComponent<ColProps>;
 export default Col;
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index 50160bbcf6..9fa6ebd4ad 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLElement> {
+export interface CollapseProps extends React.HTMLProps<HTMLElement> {
   isOpen?: boolean;
   classNames?: string;
   cssModule?: CSSModule;
@@ -12,7 +12,12 @@ interface Props extends React.HTMLProps<HTMLElement> {
   };
   onOpened?: () => void;
   onClosed?: () => void;
+  onEntering?: () => void;
+  onEntered?: () => void;
+  onExit?: () => void;
+  onExiting?: () => void;
+  onExited?: () => void;
 }
 
-declare var Collapse: React.StatelessComponent<Props>;
+declare const Collapse: React.StatelessComponent<CollapseProps>;
 export default Collapse;
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index f49951ba26..4721cf68c1 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -1,11 +1,11 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ContainerProps {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var Container: React.StatelessComponent<Props>;
+declare const Container: React.StatelessComponent<ContainerProps>;
 export default Container;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 19d1500cbe..9754af4fe2 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -1,5 +1,3 @@
-/// <reference types='tether' />
-
 import { CSSModule } from '../index';
 
 export interface UncontrolledProps {
@@ -7,6 +5,11 @@ export interface UncontrolledProps {
   toggle?: () => void;
   className?: string;
   cssModule?: CSSModule;
+  nav?: boolean;
+  inNavbar?: boolean;
+}
+export interface UncontrolledDropdownProps extends UncontrolledProps {
+  /* intentionally blank */
 }
 
 export interface Props extends UncontrolledProps {
@@ -15,8 +18,10 @@ export interface Props extends UncontrolledProps {
   group?: boolean;
   size?: string;
   tag?: React.ReactType;
-  tether?: boolean | Tether.ITetherOptions;
+}
+export interface DropdownProps extends Props {
+  /* intentionally blank */
 }
 
-declare var Dropdown: React.StatelessComponent<Props>;
+declare const Dropdown: React.StatelessComponent<DropdownProps>;
 export default Dropdown;
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index 6fae837041..ce11638b83 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface DropdownItemProps {
   disabled?: boolean;
   divider?: boolean;
   tag?: React.ReactType;
@@ -9,7 +9,9 @@ interface Props {
   className?: string;
   cssModule?: CSSModule;
   href?: string;
+  toggle?: boolean;
+  active?: boolean;
 }
 
-declare var DropdownItem: React.StatelessComponent<Props>;
+declare const DropdownItem: React.StatelessComponent<DropdownItemProps>;
 export default DropdownItem;
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index 7fae41b04b..1fcbab6c2b 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -1,11 +1,12 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface DropdownMenuProps {
   tag?: React.ReactType;
   right?: boolean;
   className?: string;
   cssModule?: CSSModule;
+  flip?: boolean;
 }
 
-declare var DropdownMenu: React.StatelessComponent<Props>;
+declare const DropdownMenu: React.StatelessComponent<DropdownMenuProps>;
 export default DropdownMenu;
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index 5ef49db71f..51028815d4 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface DropdownToggleProps {
   caret?: boolean;
   className?: string;
   cssModule?: CSSModule;
@@ -15,5 +15,5 @@ interface Props {
   size?: string;
 }
 
-declare var DropdownToggle: React.StatelessComponent<Props>;
+declare const DropdownToggle: React.StatelessComponent<DropdownToggleProps>;
 export default DropdownToggle;
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 30862d2e17..6d67195821 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -1,6 +1,7 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface FadeProps {
+  in?: boolean;
   baseClass?: string;
   baseClassIn?: string;
   tag?: React.ReactType;
@@ -16,5 +17,5 @@ interface Props {
   onEnter?: () => void;
 }
 
-declare var Fade: React.StatelessComponent<Props>;
+declare const Fade: React.StatelessComponent<FadeProps>;
 export default Fade;
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index dd06a2f855..997f4c4e5c 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -1,12 +1,12 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLFormElement> {
+export interface FormProps extends React.HTMLProps<HTMLFormElement> {
   inline?: boolean;
   tag?: React.ReactType;
-  getRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: string | ((instance: HTMLButtonElement) => any);
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var Form: React.StatelessComponent<Props>;
+declare const Form: React.StatelessComponent<FormProps>;
 export default Form;
diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index 7fde21b062..20e9b27745 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface FormFeedbackProps {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var FormFeedback: React.StatelessComponent<Props>;
+declare const FormFeedback: React.StatelessComponent<FormFeedbackProps>;
 export default FormFeedback;
diff --git a/types/reactstrap/lib/FormGroup.d.ts b/types/reactstrap/lib/FormGroup.d.ts
index 6031ff2f75..5827f2c17b 100644
--- a/types/reactstrap/lib/FormGroup.d.ts
+++ b/types/reactstrap/lib/FormGroup.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLDivElement> {
+export interface FormGroupProps extends React.HTMLProps<HTMLDivElement> {
   row?: boolean;
   check?: boolean;
   disabled?: boolean;
@@ -10,5 +10,5 @@ interface Props extends React.HTMLProps<HTMLDivElement> {
   cssModule?: CSSModule;
 }
 
-declare var FormGroup: React.StatelessComponent<Props>;
+declare const FormGroup: React.StatelessComponent<FormGroupProps>;
 export default FormGroup;
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index 3cfab3511e..a749d6fc30 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface FormTextProps {
   inline?: boolean;
   tag?: React.ReactType;
   color?: string;
@@ -8,5 +8,5 @@ interface Props {
   cssModule?: CSSModule;
 }
 
-declare var FormText: React.StatelessComponent<Props>;
+declare const FormText: React.StatelessComponent<FormTextProps>;
 export default FormText;
diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 541016ca02..f5c5ac1d02 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -33,20 +33,18 @@ interface Intermediate extends React.InputHTMLAttributes<HTMLInputElement> {
   size?: any;
 }
 
-interface InputProps extends Intermediate {
+export interface InputProps extends Intermediate {
   type?: InputType;
   size?: string;
   state?: string;
   valid?: boolean;
   tag?: React.ReactType;
-  getRef?: string | ((instance: HTMLInputElement) => any);
-  static?: boolean;
+  innerRef?: string | ((instance: HTMLInputElement) => any);
+  plaintext?: boolean;
   addon?: boolean;
   className?: string;
   cssModule?: CSSModule;
-  // We don't have the property 'static' here because 'static' is a reserved keyword in TypeScript
-  // Maybe reactstrap will support an 'isStatic' alias in the future
 }
 
-declare var Input: React.StatelessComponent<InputProps>;
+declare const Input: React.StatelessComponent<InputProps>;
 export default Input;
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index 2de95edc94..22f3ba027c 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -1,11 +1,11 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface InputGroupProps {
   tag?: React.ReactType;
   size?: string;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var InputGroup: React.StatelessComponent<Props>;
+declare const InputGroup: React.StatelessComponent<InputGroupProps>;
 export default InputGroup;
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index a98eb5d821..31f5af505d 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface InputGroupAddonProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var InputGroupAddon: React.StatelessComponent<Props>;
+declare const InputGroupAddon: React.StatelessComponent<InputGroupAddonProps>;
 export default InputGroupAddon;
diff --git a/types/reactstrap/lib/InputGroupButton.d.ts b/types/reactstrap/lib/InputGroupButton.d.ts
index fa7cb1995a..0d77701932 100644
--- a/types/reactstrap/lib/InputGroupButton.d.ts
+++ b/types/reactstrap/lib/InputGroupButton.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface InputGroupButtonProps {
   tag?: React.ReactType;
   groupClassName?: string;
   groupAttributes?: any;
@@ -9,5 +9,5 @@ interface Props {
   color?: string;
 }
 
-declare var InputGroupButton: React.StatelessComponent<Props>;
+declare const InputGroupButton: React.StatelessComponent<InputGroupButtonProps>;
 export default InputGroupButton;
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index cc1f65c956..6cb94c04c1 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -1,11 +1,11 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface JumbotronProps {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var Jumbotron: React.StatelessComponent<Props>;
+declare const Jumbotron: React.StatelessComponent<JumbotronProps>;
 export default Jumbotron;
diff --git a/types/reactstrap/lib/Label.d.ts b/types/reactstrap/lib/Label.d.ts
index eb496d90a3..ae73e100f4 100644
--- a/types/reactstrap/lib/Label.d.ts
+++ b/types/reactstrap/lib/Label.d.ts
@@ -5,7 +5,7 @@ interface Intermediate extends React.LabelHTMLAttributes<HTMLLabelElement> {
   size?: any;
 }
 
-interface Props extends Intermediate {
+export interface LabelProps extends Intermediate {
   hidden?: boolean;
   check?: boolean;
   inline?: boolean;
@@ -22,5 +22,5 @@ interface Props extends Intermediate {
   xl?: ColumnProps;
 }
 
-declare var Label: React.StatelessComponent<Props>;
+declare const Label: React.StatelessComponent<LabelProps>;
 export default Label;
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index 861c7a1d06..a2a088935b 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -1,11 +1,11 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ListGroupProps {
   tag?: React.ReactType;
   flush?: boolean;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var ListGroup: React.StatelessComponent<Props>;
+declare const ListGroup: React.StatelessComponent<ListGroupProps>;
 export default ListGroup;
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index b2241998dc..d2cb1a9e67 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ListGroupItemProps {
   tag?: React.ReactType;
   active?: boolean;
   disabled?: boolean;
@@ -9,9 +9,9 @@ interface Props {
   className?: string;
   cssModule?: CSSModule;
   href?: string;
-    
+
   onClick?: React.MouseEventHandler<any>;
 }
 
-declare var ListGroupItem: React.StatelessComponent<Props>;
+declare const ListGroupItem: React.StatelessComponent<ListGroupItemProps>;
 export default ListGroupItem;
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index 869a6b2708..0f5bdfb457 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ListGroupItemHeadingProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var ListGroupItemHeading: React.StatelessComponent<Props>;
+declare const ListGroupItemHeading: React.StatelessComponent<ListGroupItemHeadingProps>;
 export default ListGroupItemHeading;
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index df263f30d8..7010eb1289 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ListGroupItemTextProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var ListGroupItemText: React.StatelessComponent<Props>;
+declare const ListGroupItemText: React.StatelessComponent<ListGroupItemTextProps>;
 export default ListGroupItemText;
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index c5408d85d7..daf4fadcc8 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface MediaProps {
   body?: boolean;
   bottom?: boolean;
   className?: string;
@@ -17,5 +17,5 @@ interface Props {
   alt?: string;
 }
 
-declare var Media: React.StatelessComponent<Props>;
+declare const Media: React.StatelessComponent<MediaProps>;
 export default Media;
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index 1e239fbe12..5fc1ffc734 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ModalProps {
   isOpen?: boolean;
   autoFocus?: boolean;
   size?: string;
@@ -19,5 +19,5 @@ interface Props {
   fade?: boolean;
 }
 
-declare var Modal: React.StatelessComponent<Props>;
+declare const Modal: React.StatelessComponent<ModalProps>;
 export default Modal;
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index 98933b2fc2..1467b5883a 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ModalBodyProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var ModalBody: React.StatelessComponent<Props>;
+declare const ModalBody: React.StatelessComponent<ModalBodyProps>;
 export default ModalBody;
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index 84b3da7ec8..ae511eb7cc 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ModalFooterProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var ModalFooter: React.StatelessComponent<Props>;
+declare const ModalFooter: React.StatelessComponent<ModalFooterProps>;
 export default ModalFooter;
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index 494c9685a3..47632f59e3 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ModalHeaderProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
@@ -8,5 +8,5 @@ interface Props {
   toggle?: () => void;
 }
 
-declare var ModalHeader: React.StatelessComponent<Props>;
+declare const ModalHeader: React.StatelessComponent<ModalHeaderProps>;
 export default ModalHeader;
diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index c646e94304..c29c9a6460 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLUListElement> {
+export interface NavProps extends React.HTMLProps<HTMLUListElement> {
   inline?: boolean;
   disabled?: boolean;
   tabs?: boolean;
@@ -13,5 +13,5 @@ interface Props extends React.HTMLProps<HTMLUListElement> {
   vertical?: boolean;
 }
 
-declare var Nav: React.StatelessComponent<Props>;
+declare const Nav: React.StatelessComponent<NavProps>;
 export default Nav;
diff --git a/types/reactstrap/lib/NavDropdown.d.ts b/types/reactstrap/lib/NavDropdown.d.ts
index 6b480d495a..e40e60601c 100644
--- a/types/reactstrap/lib/NavDropdown.d.ts
+++ b/types/reactstrap/lib/NavDropdown.d.ts
@@ -1,12 +1,15 @@
-import {
-  UncontrolledProps as DropdownUncontrolledProps,
-  Props as DropdownProps
-} from './Dropdown';
+import { UncontrolledDropdownProps, DropdownProps } from './Dropdown';
 
-// tslint:disable-next-line
-export interface UncontrolledProps extends DropdownUncontrolledProps { }
-// tslint:disable-next-line
-interface Props extends DropdownProps { }
+export interface UncontrolledProps extends UncontrolledDropdownProps {
+  /* intentionally blank */
+}
+export interface UncontrolledNavDropdownProps extends UncontrolledProps {
+  /* intentionally blank */
+}
 
-declare var NavDropdown: React.StatelessComponent<Props>;
-export default NavDropdown;
\ No newline at end of file
+export interface NavDropdownProps extends DropdownProps {
+  /* intentionally blank */
+}
+
+declare const NavDropdown: React.StatelessComponent<NavDropdownProps>;
+export default NavDropdown;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index db19f92c56..0769347298 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface NavItemProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var NavItem: React.StatelessComponent<Props>;
+declare const NavItem: React.StatelessComponent<NavItemProps>;
 export default NavItem;
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index 2871fad72e..53640c65e1 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -1,8 +1,8 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLAnchorElement> {
+export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
   tag?: React.ReactType;
-  getRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: string | ((instance: HTMLButtonElement) => any);
   disabled?: boolean;
   active?: boolean;
   className?: string;
@@ -11,5 +11,5 @@ interface Props extends React.HTMLProps<HTMLAnchorElement> {
   href?: string;
 }
 
-declare var NavLink: React.StatelessComponent<Props>;
+declare const NavLink: React.StatelessComponent<NavLinkProps>;
 export default NavLink;
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index 58f9235140..ed3f28a02c 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface NavbarProps {
   light?: boolean;
   dark?: boolean;
   inverse?: boolean;
@@ -16,5 +16,5 @@ interface Props {
   expand?: boolean | string;
 }
 
-declare var Navbar: React.StatelessComponent<Props>;
+declare const Navbar: React.StatelessComponent<NavbarProps>;
 export default Navbar;
diff --git a/types/reactstrap/lib/NavbarBrand.d.ts b/types/reactstrap/lib/NavbarBrand.d.ts
index 3748a2903f..83ac8367b5 100644
--- a/types/reactstrap/lib/NavbarBrand.d.ts
+++ b/types/reactstrap/lib/NavbarBrand.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLAnchorElement> {
+export interface NavbarBrandProps extends React.HTMLProps<HTMLAnchorElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var NavbarBrand: React.StatelessComponent<Props>;
+declare const NavbarBrand: React.StatelessComponent<NavbarBrandProps>;
 export default NavbarBrand;
diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index 282eeaa672..1eea9880a5 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLAnchorElement> {
+export interface NavbarTogglerProps extends React.HTMLProps<HTMLAnchorElement> {
   tag?: React.ReactType;
   type?: string;
   className?: string;
@@ -9,5 +9,5 @@ interface Props extends React.HTMLProps<HTMLAnchorElement> {
   left?: boolean;
 }
 
-declare var NavbarToggler: React.StatelessComponent<Props>;
+declare const NavbarToggler: React.StatelessComponent<NavbarTogglerProps>;
 export default NavbarToggler;
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index a34401be35..7657d90206 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -1,10 +1,10 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface PaginationProps {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
 }
 
-declare var Pagination: React.StatelessComponent<Props>;
+declare const Pagination: React.StatelessComponent<PaginationProps>;
 export default Pagination;
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index 183a7e9d84..c2eadfab97 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface PaginationItemProps {
   className?: string;
   cssModule?: CSSModule;
   active?: boolean;
@@ -8,5 +8,5 @@ interface Props {
   tag?: React.ReactType;
 }
 
-declare var PaginationItem: React.StatelessComponent<Props>;
+declare const PaginationItem: React.StatelessComponent<PaginationItemProps>;
 export default PaginationItem;
diff --git a/types/reactstrap/lib/PaginationLink.d.ts b/types/reactstrap/lib/PaginationLink.d.ts
index 16e194578d..52fbc6353a 100644
--- a/types/reactstrap/lib/PaginationLink.d.ts
+++ b/types/reactstrap/lib/PaginationLink.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps<HTMLAnchorElement> {
+export interface PaginationLinkProps extends React.HTMLProps<HTMLAnchorElement> {
   'aria-label'?: string;
   className?: string;
   cssModule?: CSSModule;
@@ -9,5 +9,5 @@ interface Props extends React.HTMLProps<HTMLAnchorElement> {
   tag?: React.ReactType;
 }
 
-declare var PaginationLink: React.StatelessComponent<Props>;
+declare const PaginationLink: React.StatelessComponent<PaginationLinkProps>;
 export default PaginationLink;
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index b779a33ede..07634cd787 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -1,34 +1,22 @@
-/// <reference types='tether' />
+/// <reference types='react' />
 
 import { CSSModule } from '../index';
+import {Popper} from './Popper';
 
-type Placement
-  = 'top'
-  | 'bottom'
-  | 'left'
-  | 'right'
-  | 'top left'
-  | 'top center'
-  | 'top right'
-  | 'right top'
-  | 'right middle'
-  | 'right bottom'
-  | 'bottom right'
-  | 'bottom center'
-  | 'bottom left'
-  | 'left top'
-  | 'left middle'
-  | 'left bottom';
-
-interface Props {
-  placement?: Placement;
-  target: string;
+export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
   isOpen?: boolean;
-  tether?: Tether.ITetherOptions;
-  className?: string;
-  cssModule?: CSSModule;
   toggle?: () => void;
+  target: string | HTMLElement;
+  container?: string | HTMLElement;
+  className?: string;
+  placement?: Popper.Placement;
+  innerClassName?: string;
+  disabled?: boolean;
+  placementPrefix?: string;
+  delay?: number | {show: number, hide: number};
+  modifiers?: Popper.Modifiers;
+  cssModule?: CSSModule;
 }
 
-declare var Popover: React.StatelessComponent<Props>;
+declare const Popover: React.StatelessComponent<PopoverProps>;
 export default Popover;
diff --git a/types/reactstrap/lib/PopoverBody.d.ts b/types/reactstrap/lib/PopoverBody.d.ts
new file mode 100644
index 0000000000..93512cacb1
--- /dev/null
+++ b/types/reactstrap/lib/PopoverBody.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+export interface PopoverBodyProps {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare const PopoverBody: React.StatelessComponent<PopoverBodyProps>;
+export default PopoverBody;
diff --git a/types/reactstrap/lib/PopoverHeader.d.ts b/types/reactstrap/lib/PopoverHeader.d.ts
new file mode 100644
index 0000000000..2ad69c636c
--- /dev/null
+++ b/types/reactstrap/lib/PopoverHeader.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+export interface PopoverHeaderProps {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare const PopoverHeader: React.StatelessComponent<PopoverHeaderProps>;
+export default PopoverHeader;
diff --git a/types/reactstrap/lib/Popper.d.ts b/types/reactstrap/lib/Popper.d.ts
new file mode 100644
index 0000000000..b28c61bd30
--- /dev/null
+++ b/types/reactstrap/lib/Popper.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for popper.js 1.10
+// Project: https://github.com/FezVrasta/popper.js/
+// Definitions by: edcarroll <https://github.com/edcarroll>, ggray <https://github.com/giladgray>, rhysd <https://rhysd.github.io>, joscha <https://github.com/joscha>, seckardt <https://github.com/seckardt>, marcfallows <https://github.com/marcfallows>
+
+// This file only declares the public portions of the API.
+// It should not define internal pieces such as utils or modifier details.
+// It has been copied from: https://raw.githubusercontent.com/FezVrasta/popper.js/master/packages/popper/index.d.ts
+
+export as namespace Popper;
+
+export type Position = "top" | "right" | "bottom" | "left";
+
+export type Placement =
+    | "auto-start"
+    | "auto"
+    | "auto-end"
+    | "top-start"
+    | "top"
+    | "top-end"
+    | "right-start"
+    | "right"
+    | "right-end"
+    | "bottom-end"
+    | "bottom"
+    | "bottom-start"
+    | "left-end"
+    | "left"
+    | "left-start";
+
+export type Boundary = "scrollParent" | "viewport" | "window";
+
+export type ModifierFn = (data: Data, options: Object) => Data;
+
+export interface BaseModifier {
+    order?: number;
+    enabled?: boolean;
+    fn?: ModifierFn;
+}
+
+export interface Modifiers {
+    shift?: BaseModifier;
+    offset?: BaseModifier & {
+        offset?: number | string;
+    };
+    preventOverflow?: BaseModifier & {
+        priority?: Position[];
+        padding?: number;
+        boundariesElement?: Boundary | Element;
+        escapeWithReference?: boolean;
+    };
+    keepTogether?: BaseModifier;
+    arrow?: BaseModifier & {
+        element?: string | Element;
+    };
+    flip?: BaseModifier & {
+        behavior?: "flip" | "clockwise" | "counterclockwise" | Position[];
+        padding?: number;
+        boundariesElement?: Boundary | Element;
+    };
+    inner?: BaseModifier;
+    hide?: BaseModifier;
+    applyStyle?: BaseModifier & {
+        onLoad?: Function;
+        gpuAcceleration?: boolean;
+    };
+    computeStyle?: BaseModifier & {
+        gpuAcceleration?: boolean;
+        x?: "bottom" | "top";
+        y?: "left" | "right";
+    };
+    [name: string]: (BaseModifier & Record<string, any>) | undefined;
+}
+
+export interface Offset {
+    top: number;
+    left: number;
+    width: number;
+    height: number;
+}
+
+export interface Data {
+    instance: Popper;
+    placement: Placement;
+    originalPlacement: Placement;
+    flipped: boolean;
+    hide: boolean;
+    arrowElement: Element;
+    styles: CSSStyleDeclaration;
+    boundaries: Object;
+    offsets: {
+        popper: Offset;
+        reference: Offset;
+        arrow: {
+            top: number;
+            left: number;
+        };
+    };
+}
+
+export interface PopperOptions {
+    placement?: Placement;
+    positionFixed: boolean;
+    eventsEnabled?: boolean;
+    modifiers?: Modifiers;
+    removeOnDestroy?: boolean;
+    onCreate?(data: Data): void;
+    onUpdate?(data: Data): void;
+}
+
+export interface ReferenceObject {
+    clientHeight: number;
+    clientWidth: number;
+    getBoundingClientRect(): ClientRect;
+}
+
+export class Popper {
+    static modifiers: (Popper.BaseModifier & { name: string })[];
+    static placements: Popper.Placement[];
+    static Defaults: Popper.PopperOptions;
+
+    options: Popper.PopperOptions;
+
+    constructor(
+        reference: Element | Popper.ReferenceObject,
+        popper: Element,
+        options?: Popper.PopperOptions
+    );
+
+    destroy(): void;
+    update(): void;
+    scheduleUpdate(): void;
+    enableEventListeners(): void;
+    disableEventListeners(): void;
+}
diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index 09c4304373..89e9df4be9 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface ProgressProps {
   bar?: boolean;
   multi?: boolean;
   tag?: string;
@@ -14,5 +14,5 @@ interface Props {
   barClassName?: string;
 }
 
-declare var Progress: React.StatelessComponent<Props>;
+declare const Progress: React.StatelessComponent<ProgressProps>;
 export default Progress;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index 1ffbb9f7e6..e5553ff81f 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -1,11 +1,11 @@
 import { CSSModule } from '../index';
 
-interface Props extends React.HTMLProps< HTMLElement> {
+export interface RowProps extends React.HTMLProps< HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   tag?: React.ReactType;
   noGutters?: boolean;
 }
 
-declare var Row: React.StatelessComponent<Props>;
+declare const Row: React.StatelessComponent<RowProps>;
 export default Row;
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index af6feec078..2581ea7a93 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -1,11 +1,11 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface TabContentProps {
   tag?: React.ReactType;
   activeTab?: number | string;
   className?: string;
   cssModule?: CSSModule;
 }
 
-declare var TabContent: React.StatelessComponent<Props>;
+declare const TabContent: React.StatelessComponent<TabContentProps>;
 export default TabContent;
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index 9eead420be..a39398d59b 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -1,11 +1,11 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface TabPaneProps {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   tabId?: number | string;
 }
 
-declare var TabPane: React.StatelessComponent<Props>;
+declare const TabPane: React.StatelessComponent<TabPaneProps>;
 export default TabPane;
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index ec8bfc43fd..c2d31d71e2 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface TableProps {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
@@ -14,5 +14,5 @@ interface Props {
   responsiveTag?: React.ReactType;
 }
 
-declare var Table: React.StatelessComponent<Props>;
+declare const Table: React.StatelessComponent<TableProps>;
 export default Table;
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index 7dce8876f2..153ff61177 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-interface Props {
+export interface TagProps {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
@@ -8,5 +8,5 @@ interface Props {
   cssModule?: CSSModule;
 }
 
-declare var Tag: React.StatelessComponent<Props>;
+declare const Tag: React.StatelessComponent<TagProps>;
 export default Tag;
diff --git a/types/reactstrap/lib/Tooltip.d.ts b/types/reactstrap/lib/Tooltip.d.ts
index 9dba615084..bf472477c6 100644
--- a/types/reactstrap/lib/Tooltip.d.ts
+++ b/types/reactstrap/lib/Tooltip.d.ts
@@ -1,43 +1,27 @@
-/// <reference types='tether' />
+/// <reference types='react' />
 
 import { CSSModule } from '../index';
+import {Popper} from './Popper';
 
-type Placement
-  = 'top'
-  | 'bottom'
-  | 'left'
-  | 'right'
-  | 'top left'
-  | 'top center'
-  | 'top right'
-  | 'right top'
-  | 'right middle'
-  | 'right bottom'
-  | 'bottom right'
-  | 'bottom center'
-  | 'bottom left'
-  | 'left top'
-  | 'left middle'
-  | 'left bottom';
-
-export interface UncontrolledProps {
-  placement?: Placement;
-  target: string;
-  disabled?: boolean;
-  tether?: Tether.ITetherOptions;
-  tetherRef?: (tether: Tether) => void;
+export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
+  target: string | HTMLElement;
+  container?: string | HTMLElement;
+  delay?: number | {show: number, hide: number};
   className?: string;
-  cssModule?: CSSModule;
+  innerClassName?: string;
   autohide?: boolean;
-  delay?: number | { show: number, hide: number };
+  placement?: Popper.Placement;
+  modifiers?: Popper.Modifiers;
+  cssModule?: CSSModule;
+}
+export interface UncontrolledTooltipProps extends UncontrolledProps {
+  /* intentionally blank */
 }
 
-interface Props extends UncontrolledProps {
+export interface TooltipProps extends UncontrolledTooltipProps {
   toggle?: () => void;
   isOpen?: boolean;
 }
 
-
-
-declare var Tooltip: React.StatelessComponent<Props>;
+declare const Tooltip: React.StatelessComponent<TooltipProps>;
 export default Tooltip;
diff --git a/types/reactstrap/lib/Uncontrolled.d.ts b/types/reactstrap/lib/Uncontrolled.d.ts
index 151ee012d3..b3b292dd6b 100644
--- a/types/reactstrap/lib/Uncontrolled.d.ts
+++ b/types/reactstrap/lib/Uncontrolled.d.ts
@@ -1,29 +1,17 @@
-import {
-  UncontrolledProps as AlertUncontrolledProps
-} from './Alert';
-import {
-  UncontrolledProps as ButtonDropdownUncontrolledProps
-} from './ButtonDropdown';
-import {
-  UncontrolledProps as DropdownUncontrolledProps
-} from './Dropdown';
-import {
-  UncontrolledProps as NavDropdownUncontrolledProps
-} from './NavDropdown';
-import {
-  UncontrolledProps as TooltipUncontrolledProps
-} from './Tooltip';
+import { UncontrolledAlertProps          } from './Alert';
+import { UncontrolledButtonDropdownProps } from './ButtonDropdown';
+import { UncontrolledDropdownProps       } from './Dropdown';
+import { UncontrolledNavDropdownProps    } from './NavDropdown';
+import { UncontrolledTooltipProps        } from './Tooltip';
 
-declare var UncontrolledAlert: React.StatelessComponent<AlertUncontrolledProps>;
-declare var UncontrolledButtonDropdown: React.StatelessComponent<ButtonDropdownUncontrolledProps>;
-declare var UncontrolledDropdown: React.StatelessComponent<DropdownUncontrolledProps>;
-declare var UncontrolledNavDropdown: React.StatelessComponent<NavDropdownUncontrolledProps>;
-declare var UncontrolledTooltip: React.StatelessComponent<TooltipUncontrolledProps>;
+export const UncontrolledAlert: React.StatelessComponent<UncontrolledAlertProps>;
+export const UncontrolledButtonDropdown: React.StatelessComponent<UncontrolledButtonDropdownProps>;
+export const UncontrolledDropdown: React.StatelessComponent<UncontrolledDropdownProps>;
+export const UncontrolledNavDropdown: React.StatelessComponent<UncontrolledNavDropdownProps>;
+export const UncontrolledTooltip: React.StatelessComponent<UncontrolledTooltipProps>;
 
-export {
-  UncontrolledAlert,
-  UncontrolledButtonDropdown,
-  UncontrolledDropdown,
-  UncontrolledNavDropdown,
-  UncontrolledTooltip
-}
\ No newline at end of file
+export { UncontrolledAlertProps          } from './Alert';
+export { UncontrolledButtonDropdownProps } from './ButtonDropdown';
+export { UncontrolledDropdownProps       } from './Dropdown';
+export { UncontrolledNavDropdownProps    } from './NavDropdown';
+export { UncontrolledTooltipProps        } from './Tooltip';
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index b094d4d019..2a67844f9f 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -27,6 +27,11 @@ import {
   CardSubtitle,
   CardText,
   CardTitle,
+  Carousel,
+  CarouselCaption,
+  CarouselControl,
+  CarouselItem,
+  CarouselIndicators,
   Row,
   Col,
   Container,
@@ -62,8 +67,8 @@ import {
   PaginationItem,
   PaginationLink,
   Popover,
-  PopoverContent,
-  PopoverTitle,
+  PopoverBody,
+  PopoverHeader,
   Progress,
   TabPane,
   UncontrolledButtonDropdown,
@@ -73,7 +78,6 @@ import {
   TabContent,
   Table,
   Tag,
-  TetherContent,
   Tooltip
 } from 'reactstrap';
 
@@ -2479,9 +2483,9 @@ class Example85 extends React.Component<any, any> {
         <Button id="Popover1" onClick={this.toggle}>
           Launch Popover
         </Button>
-        <Popover placement="bottom" isOpen={this.state.popoverOpen} target="Popover1" toggle={this.toggle}>
-          <PopoverTitle>Popover Title</PopoverTitle>
-          <PopoverContent>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverContent>
+        <Popover placement="bottom" isOpen={this.state.popoverOpen} target="Popover1" toggle={this.toggle} onClick={() => {}}>
+          <PopoverHeader>Popover Title</PopoverHeader>
+          <PopoverBody>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverBody>
         </Popover>
       </div>
     );
@@ -2511,8 +2515,8 @@ class PopoverItem extends React.Component<any, any> {
           {this.props.item.text}
         </Button>
         <Popover placement={this.props.item.placement} isOpen={this.state.popoverOpen} target={'Popover-' + this.props.id} toggle={this.toggle}>
-          <PopoverTitle>Popover Title</PopoverTitle>
-          <PopoverContent>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverContent>
+          <PopoverHeader>Popover Title</PopoverHeader>
+          <PopoverBody>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverBody>
         </Popover>
       </span>
     );
@@ -3302,7 +3306,7 @@ class Example107 extends React.Component {
   private input: HTMLInputElement;
 
   render() {
-    return <Input type="file" getRef={(input) => { this.input = input; }} />;
+    return <Input type="file" innerRef={(input) => { this.input = input; }} />;
   }
 }
 
@@ -3500,3 +3504,113 @@ const Example113 = (props: any) => {
       </div>
     );
   };
+
+class Example114 extends React.Component<any, any> {
+private element: HTMLElement;
+
+refFn(r: HTMLElement | null) {
+    if (r) {
+        this.element = r;
+    }
+}
+
+render() {
+    return (
+    <div>
+        <p>Somewhere in here is a <a href="#" ref={this.refFn}>tooltip</a>.</p>
+        <Tooltip placement="bottom-start" isOpen={this.state.tooltipOpen} target={this.element}>
+        Hello world!
+        </Tooltip>
+    </div>
+    );
+}
+}
+
+class Example115 extends React.Component<any, any> {
+    // https://reactstrap.github.io/components/carousel/
+
+    private readonly items = [
+        {
+          src: 'data:image/svg+xml...',
+          altText: 'Slide 1',
+          caption: 'Slide 1'
+        },
+        {
+          src: 'data:image/svg+xml...',
+          altText: 'Slide 2',
+          caption: 'Slide 2'
+        },
+        {
+          src: 'data:image/svg+xml...',
+          altText: 'Slide 3',
+          caption: 'Slide 3'
+        }
+      ];
+
+    private animating: boolean;
+
+    constructor(props: any) {
+      super(props);
+      this.state = { activeIndex: 0 };
+      this.next = this.next.bind(this);
+      this.previous = this.previous.bind(this);
+      this.goToIndex = this.goToIndex.bind(this);
+      this.onExiting = this.onExiting.bind(this);
+      this.onExited = this.onExited.bind(this);
+    }
+
+    onExiting() {
+      this.animating = true;
+    }
+
+    onExited() {
+      this.animating = false;
+    }
+
+    next() {
+      if (this.animating) return;
+      const nextIndex = this.state.activeIndex === this.items.length - 1 ? 0 : this.state.activeIndex + 1;
+      this.setState({ activeIndex: nextIndex });
+    }
+
+    previous() {
+      if (this.animating) return;
+      const nextIndex = this.state.activeIndex === 0 ? this.items.length - 1 : this.state.activeIndex - 1;
+      this.setState({ activeIndex: nextIndex });
+    }
+
+    goToIndex(newIndex: number) {
+      if (this.animating) return;
+      this.setState({ activeIndex: newIndex });
+    }
+
+    render() {
+      const { activeIndex } = this.state;
+
+      const slides = this.items.map((item) => {
+        return (
+          <CarouselItem
+            onExiting={this.onExiting}
+            onExited={this.onExited}
+            key={item.src}
+          >
+            <img src={item.src} alt={item.altText} />
+            <CarouselCaption captionText={item.caption} captionHeader={item.caption} />
+          </CarouselItem>
+        );
+      });
+
+      return (
+        <Carousel
+          activeIndex={activeIndex}
+          next={this.next}
+          previous={this.previous}
+        >
+          <CarouselIndicators items={this.items} activeIndex={activeIndex} onClickHandler={this.goToIndex} />
+          {slides}
+          <CarouselControl direction="prev" directionText="Previous" onClickHandler={this.previous} />
+          <CarouselControl direction="next" directionText="Next" onClickHandler={this.next} />
+        </Carousel>
+      );
+    }
+  }
diff --git a/types/reactstrap/v4/index.d.ts b/types/reactstrap/v4/index.d.ts
new file mode 100644
index 0000000000..81d4cec5bd
--- /dev/null
+++ b/types/reactstrap/v4/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for reactstrap 4.6
+// Project: https://github.com/reactstrap/reactstrap#readme
+// Definitions by: Ali Hammad Baig <https://github.com/alihammad>, Marco Falkenberg <https://github.com/mfal>, Danilo Barros <https://github.com/danilobjr>, Fábio Paiva <https://github.com/fabiopaiva>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export interface CSSModule {
+  [className: string]: string;
+}
+
+export { default as Alert } from './lib/Alert';
+export { default as Badge } from './lib/Badge';
+export { default as Breadcrumb } from './lib/Breadcrumb';
+export { default as BreadcrumbItem } from './lib/BreadcrumbItem';
+export { default as Button } from './lib/Button';
+export { default as ButtonDropdown } from './lib/ButtonDropdown';
+export { default as ButtonGroup } from './lib/ButtonGroup';
+export { default as ButtonToolbar } from './lib/ButtonToolbar';
+export { default as Card } from './lib/Card';
+export { default as CardBody } from './lib/CardBody';
+export { default as CardBlock } from './lib/CardBlock';
+export { default as CardColumns } from './lib/CardColumns';
+export { default as CardDeck } from './lib/CardDeck';
+export { default as CardFooter } from './lib/CardFooter';
+export { default as CardGroup } from './lib/CardGroup';
+export { default as CardHeader } from './lib/CardHeader';
+export { default as CardImg } from './lib/CardImg';
+export { default as CardImgOverlay } from './lib/CardImgOverlay';
+export { default as CardLink } from './lib/CardLink';
+export { default as CardSubtitle } from './lib/CardSubtitle';
+export { default as CardText } from './lib/CardText';
+export { default as CardTitle } from './lib/CardTitle';
+export { default as Col } from './lib/Col';
+export { default as Collapse } from './lib/Collapse';
+export { default as Container } from './lib/Container';
+export { default as Dropdown } from './lib/Dropdown';
+export { default as DropdownItem } from './lib/DropdownItem';
+export { default as DropdownMenu } from './lib/DropdownMenu';
+export { default as DropdownToggle } from './lib/DropdownToggle';
+export { default as Fade } from './lib/Fade';
+export { default as Form } from './lib/Form';
+export { default as FormFeedback } from './lib/FormFeedback';
+export { default as FormGroup } from './lib/FormGroup';
+export { default as FormText } from './lib/FormText';
+export { default as Input } from './lib/Input';
+export { default as InputGroup } from './lib/InputGroup';
+export { default as InputGroupAddon } from './lib/InputGroupAddon';
+export { default as InputGroupButton } from './lib/InputGroupButton';
+export { default as Jumbotron } from './lib/Jumbotron';
+export { default as Label } from './lib/Label';
+export { default as ListGroup } from './lib/ListGroup';
+export { default as ListGroupItem } from './lib/ListGroupItem';
+export { default as ListGroupItemHeading } from './lib/ListGroupItemHeading';
+export { default as ListGroupItemText } from './lib/ListGroupItemText';
+export { default as Media } from './lib/Media';
+export { default as Modal } from './lib/Modal';
+export { default as ModalBody } from './lib/ModalBody';
+export { default as ModalFooter } from './lib/ModalFooter';
+export { default as ModalHeader } from './lib/ModalHeader';
+export { default as Nav } from './lib/Nav';
+export { default as Navbar } from './lib/Navbar';
+export { default as NavbarBrand } from './lib/NavbarBrand';
+export { default as NavbarToggler } from './lib/NavbarToggler';
+export { default as NavDropdown } from './lib/NavDropdown';
+export { default as NavItem } from './lib/NavItem';
+export { default as NavLink } from './lib/NavLink';
+export { default as Pagination } from './lib/Pagination';
+export { default as PaginationItem } from './lib/PaginationItem';
+export { default as PaginationLink } from './lib/PaginationLink';
+export { default as Popover } from './lib/Popover';
+export { default as PopoverContent } from './lib/PopoverContent';
+export { default as PopoverTitle } from './lib/PopoverTitle';
+export { default as Progress } from './lib/Progress';
+export { default as Row } from './lib/Row';
+export { default as TabContent } from './lib/TabContent';
+export { default as Table } from './lib/Table';
+export { default as TabPane } from './lib/TabPane';
+export { default as Tag } from './lib/Tag';
+export { default as TetherContent } from './lib/TetherContent';
+export { default as Tooltip } from './lib/Tooltip';
+export {
+  UncontrolledAlert,
+  UncontrolledButtonDropdown,
+  UncontrolledDropdown,
+  UncontrolledNavDropdown,
+  UncontrolledTooltip
+} from './lib/Uncontrolled';
diff --git a/types/reactstrap/v4/lib/Alert.d.ts b/types/reactstrap/v4/lib/Alert.d.ts
new file mode 100644
index 0000000000..e29d62cb0d
--- /dev/null
+++ b/types/reactstrap/v4/lib/Alert.d.ts
@@ -0,0 +1,19 @@
+import { CSSModule } from '../index';
+
+export interface UncontrolledProps {
+  className?: string;
+  cssModule?: CSSModule;
+  color?: string;
+  tag?: React.ReactType;
+  transitionAppearTimeout?: number;
+  transitionEnterTimeout?: number;
+  transitionLeaveTimeout?: number;
+}
+
+interface Props extends UncontrolledProps {
+  isOpen?: boolean;
+  toggle?: () => void;
+}
+
+declare var Alert: React.StatelessComponent<Props>;
+export default Alert;
diff --git a/types/reactstrap/v4/lib/Badge.d.ts b/types/reactstrap/v4/lib/Badge.d.ts
new file mode 100644
index 0000000000..51f72e39d3
--- /dev/null
+++ b/types/reactstrap/v4/lib/Badge.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  color?: string;
+  pill?: boolean;
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var Badge: React.StatelessComponent<Props>;
+export default Badge;
diff --git a/types/reactstrap/v4/lib/Breadcrumb.d.ts b/types/reactstrap/v4/lib/Breadcrumb.d.ts
new file mode 100644
index 0000000000..54f581288c
--- /dev/null
+++ b/types/reactstrap/v4/lib/Breadcrumb.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: string;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var Breadcrumb: React.StatelessComponent<Props>;
+export default Breadcrumb;
diff --git a/types/reactstrap/v4/lib/BreadcrumbItem.d.ts b/types/reactstrap/v4/lib/BreadcrumbItem.d.ts
new file mode 100644
index 0000000000..0277305b21
--- /dev/null
+++ b/types/reactstrap/v4/lib/BreadcrumbItem.d.ts
@@ -0,0 +1,15 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  active?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  // if a is passed as a string
+  // this could be href
+  [others: string]: any;
+}
+
+declare var BreadcrumbItem: React.StatelessComponent<Props>;
+export default BreadcrumbItem;
+
diff --git a/types/reactstrap/v4/lib/Button.d.ts b/types/reactstrap/v4/lib/Button.d.ts
new file mode 100644
index 0000000000..e6ec222c14
--- /dev/null
+++ b/types/reactstrap/v4/lib/Button.d.ts
@@ -0,0 +1,21 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLButtonElement> {
+  outline?: boolean;
+  active?: boolean;
+  block?: boolean;
+  color?: string;
+  disabled?: boolean;
+  tag?: React.ReactType;
+  getRef?: string | ((instance: HTMLButtonElement) => any);
+
+  onClick?: React.MouseEventHandler<any>;
+  size?: any;
+  id?: string;
+  style?: React.CSSProperties;
+
+  cssModule?: CSSModule;
+}
+
+declare var Button: React.StatelessComponent<Props>;
+export default Button;
diff --git a/types/reactstrap/v4/lib/ButtonDropdown.d.ts b/types/reactstrap/v4/lib/ButtonDropdown.d.ts
new file mode 100644
index 0000000000..9ab54c7502
--- /dev/null
+++ b/types/reactstrap/v4/lib/ButtonDropdown.d.ts
@@ -0,0 +1,12 @@
+import {
+  UncontrolledProps as DropdownUncontrolledProps,
+  Props as DropdownProps
+} from './Dropdown';
+
+// tslint:disable-next-line
+export interface UncontrolledProps extends DropdownUncontrolledProps { }
+// tslint:disable-next-line
+interface Props extends DropdownProps { }
+
+declare var ButtonDropdown: React.StatelessComponent<Props>;
+export default ButtonDropdown;
\ No newline at end of file
diff --git a/types/reactstrap/v4/lib/ButtonGroup.d.ts b/types/reactstrap/v4/lib/ButtonGroup.d.ts
new file mode 100644
index 0000000000..d807ea33cf
--- /dev/null
+++ b/types/reactstrap/v4/lib/ButtonGroup.d.ts
@@ -0,0 +1,14 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  'aria-label'?: string;
+  className?: string;
+  cssModule?: CSSModule;
+  role?: string;
+  size?: string;
+  vertical?: boolean;
+}
+
+declare var ButtonGroup: React.StatelessComponent<Props>;
+export default ButtonGroup;
diff --git a/types/reactstrap/v4/lib/ButtonToolbar.d.ts b/types/reactstrap/v4/lib/ButtonToolbar.d.ts
new file mode 100644
index 0000000000..fea31dd5d5
--- /dev/null
+++ b/types/reactstrap/v4/lib/ButtonToolbar.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  'aria-label'?: string;
+  className?: string;
+  cssModule?: CSSModule;
+  role?: string;
+}
+
+declare var ButtonToolbar: React.StatelessComponent<Props>;
+export default ButtonToolbar;
diff --git a/types/reactstrap/v4/lib/Card.d.ts b/types/reactstrap/v4/lib/Card.d.ts
new file mode 100644
index 0000000000..0dbde7f879
--- /dev/null
+++ b/types/reactstrap/v4/lib/Card.d.ts
@@ -0,0 +1,16 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  inverse?: boolean;
+  color?: string;
+  block?: boolean;
+  outline?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  style?: React.CSSProperties;
+}
+
+declare var Card: React.StatelessComponent<Props>;
+export default Card;
+
diff --git a/types/reactstrap/v4/lib/CardBlock.d.ts b/types/reactstrap/v4/lib/CardBlock.d.ts
new file mode 100644
index 0000000000..0aa31a63a7
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardBlock.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardBlock: React.StatelessComponent<Props>;
+export default CardBlock;
+
diff --git a/types/reactstrap/v4/lib/CardBody.d.ts b/types/reactstrap/v4/lib/CardBody.d.ts
new file mode 100644
index 0000000000..2b94e52ea8
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardBody.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardBody: React.StatelessComponent<Props>;
+export default CardBody;
diff --git a/types/reactstrap/v4/lib/CardColumns.d.ts b/types/reactstrap/v4/lib/CardColumns.d.ts
new file mode 100644
index 0000000000..0cc1a80a1a
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardColumns.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardColumns: React.StatelessComponent<Props>;
+export default CardColumns;
diff --git a/types/reactstrap/v4/lib/CardDeck.d.ts b/types/reactstrap/v4/lib/CardDeck.d.ts
new file mode 100644
index 0000000000..1a5882aa54
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardDeck.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardDeck: React.StatelessComponent<Props>;
+export default CardDeck;
diff --git a/types/reactstrap/v4/lib/CardFooter.d.ts b/types/reactstrap/v4/lib/CardFooter.d.ts
new file mode 100644
index 0000000000..0956cb06c9
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardFooter.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardFooter: React.StatelessComponent<Props>;
+export default CardFooter;
diff --git a/types/reactstrap/v4/lib/CardGroup.d.ts b/types/reactstrap/v4/lib/CardGroup.d.ts
new file mode 100644
index 0000000000..5c0a0a1ab1
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardGroup.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardGroup: React.StatelessComponent<Props>;
+export default CardGroup;
diff --git a/types/reactstrap/v4/lib/CardHeader.d.ts b/types/reactstrap/v4/lib/CardHeader.d.ts
new file mode 100644
index 0000000000..f063057c92
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardHeader.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardHeader: React.StatelessComponent<Props>;
+export default CardHeader;
diff --git a/types/reactstrap/v4/lib/CardImg.d.ts b/types/reactstrap/v4/lib/CardImg.d.ts
new file mode 100644
index 0000000000..1c3fee274b
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardImg.d.ts
@@ -0,0 +1,16 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  top?: boolean;
+  bottom?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  src?: string;
+  width?: string;
+  height?: string;
+  alt?: string;
+}
+
+declare var CardImg: React.StatelessComponent<Props>;
+export default CardImg;
diff --git a/types/reactstrap/v4/lib/CardImgOverlay.d.ts b/types/reactstrap/v4/lib/CardImgOverlay.d.ts
new file mode 100644
index 0000000000..05519847b2
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardImgOverlay.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardImgOverlay: React.StatelessComponent<Props>;
+export default CardImgOverlay;
diff --git a/types/reactstrap/v4/lib/CardLink.d.ts b/types/reactstrap/v4/lib/CardLink.d.ts
new file mode 100644
index 0000000000..3edf6b24f8
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardLink.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  getRef?: string | ((instance: HTMLButtonElement) => any);
+  className?: string;
+  cssModule?: CSSModule;
+  href?: string;
+}
+
+declare var CardLink: React.StatelessComponent<Props>;
+export default CardLink;
diff --git a/types/reactstrap/v4/lib/CardSubtitle.d.ts b/types/reactstrap/v4/lib/CardSubtitle.d.ts
new file mode 100644
index 0000000000..bfacd4e794
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardSubtitle.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardSubtitle: React.StatelessComponent<Props>;
+export default CardSubtitle;
diff --git a/types/reactstrap/v4/lib/CardText.d.ts b/types/reactstrap/v4/lib/CardText.d.ts
new file mode 100644
index 0000000000..13177fba67
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardText.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardText: React.StatelessComponent<Props>;
+export default CardText;
diff --git a/types/reactstrap/v4/lib/CardTitle.d.ts b/types/reactstrap/v4/lib/CardTitle.d.ts
new file mode 100644
index 0000000000..2843800a4e
--- /dev/null
+++ b/types/reactstrap/v4/lib/CardTitle.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var CardTitle: React.StatelessComponent<Props>;
+export default CardTitle;
diff --git a/types/reactstrap/v4/lib/Col.d.ts b/types/reactstrap/v4/lib/Col.d.ts
new file mode 100644
index 0000000000..a2ea76d607
--- /dev/null
+++ b/types/reactstrap/v4/lib/Col.d.ts
@@ -0,0 +1,24 @@
+export type ColumnProps
+  = string
+  | boolean
+  | number
+  | {
+    size?: boolean | number | string
+    push?: string | number
+    pull?: string | number
+    offset?: string | number
+  };
+
+interface Props extends React.HTMLProps<HTMLDivElement> {
+  xs?: ColumnProps;
+  sm?: ColumnProps;
+  md?: ColumnProps;
+  lg?: ColumnProps;
+  xl?: ColumnProps;
+
+  //custom widths
+  widths?: string[];
+}
+
+declare var Col: React.StatelessComponent<Props>;
+export default Col;
diff --git a/types/reactstrap/v4/lib/Collapse.d.ts b/types/reactstrap/v4/lib/Collapse.d.ts
new file mode 100644
index 0000000000..50160bbcf6
--- /dev/null
+++ b/types/reactstrap/v4/lib/Collapse.d.ts
@@ -0,0 +1,18 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLElement> {
+  isOpen?: boolean;
+  classNames?: string;
+  cssModule?: CSSModule;
+  tag?: React.ReactType;
+  navbar?: boolean;
+  delay?: {
+    show: number
+    hide: number
+  };
+  onOpened?: () => void;
+  onClosed?: () => void;
+}
+
+declare var Collapse: React.StatelessComponent<Props>;
+export default Collapse;
diff --git a/types/reactstrap/v4/lib/Container.d.ts b/types/reactstrap/v4/lib/Container.d.ts
new file mode 100644
index 0000000000..f49951ba26
--- /dev/null
+++ b/types/reactstrap/v4/lib/Container.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  fluid?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var Container: React.StatelessComponent<Props>;
+export default Container;
diff --git a/types/reactstrap/v4/lib/Dropdown.d.ts b/types/reactstrap/v4/lib/Dropdown.d.ts
new file mode 100644
index 0000000000..19d1500cbe
--- /dev/null
+++ b/types/reactstrap/v4/lib/Dropdown.d.ts
@@ -0,0 +1,22 @@
+/// <reference types='tether' />
+
+import { CSSModule } from '../index';
+
+export interface UncontrolledProps {
+  isOpen?: boolean;
+  toggle?: () => void;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+export interface Props extends UncontrolledProps {
+  disabled?: boolean;
+  dropup?: boolean;
+  group?: boolean;
+  size?: string;
+  tag?: React.ReactType;
+  tether?: boolean | Tether.ITetherOptions;
+}
+
+declare var Dropdown: React.StatelessComponent<Props>;
+export default Dropdown;
diff --git a/types/reactstrap/v4/lib/DropdownItem.d.ts b/types/reactstrap/v4/lib/DropdownItem.d.ts
new file mode 100644
index 0000000000..6fae837041
--- /dev/null
+++ b/types/reactstrap/v4/lib/DropdownItem.d.ts
@@ -0,0 +1,15 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  disabled?: boolean;
+  divider?: boolean;
+  tag?: React.ReactType;
+  header?: boolean;
+  onClick?: (event: React.MouseEvent<any>) => void;
+  className?: string;
+  cssModule?: CSSModule;
+  href?: string;
+}
+
+declare var DropdownItem: React.StatelessComponent<Props>;
+export default DropdownItem;
diff --git a/types/reactstrap/v4/lib/DropdownMenu.d.ts b/types/reactstrap/v4/lib/DropdownMenu.d.ts
new file mode 100644
index 0000000000..7fae41b04b
--- /dev/null
+++ b/types/reactstrap/v4/lib/DropdownMenu.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  right?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var DropdownMenu: React.StatelessComponent<Props>;
+export default DropdownMenu;
diff --git a/types/reactstrap/v4/lib/DropdownToggle.d.ts b/types/reactstrap/v4/lib/DropdownToggle.d.ts
new file mode 100644
index 0000000000..5ef49db71f
--- /dev/null
+++ b/types/reactstrap/v4/lib/DropdownToggle.d.ts
@@ -0,0 +1,19 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  caret?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  disabled?: boolean;
+  onClick?: React.MouseEventHandler<any>;
+  'data-toggle'?: string;
+  'aria-haspopup'?: boolean;
+  split?: boolean;
+  tag?: React.ReactType;
+  nav?: boolean;
+  color?: string;
+  size?: string;
+}
+
+declare var DropdownToggle: React.StatelessComponent<Props>;
+export default DropdownToggle;
diff --git a/types/reactstrap/v4/lib/Fade.d.ts b/types/reactstrap/v4/lib/Fade.d.ts
new file mode 100644
index 0000000000..30862d2e17
--- /dev/null
+++ b/types/reactstrap/v4/lib/Fade.d.ts
@@ -0,0 +1,20 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  baseClass?: string;
+  baseClassIn?: string;
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+  transitionAppearTimeout?: number;
+  transitionEnterTimeout?: number;
+  transitionLeaveTimeout?: number;
+  transitionAppear?: boolean;
+  transitionEnter?: boolean;
+  transitionLeave?: boolean;
+  onLeave?: () => void;
+  onEnter?: () => void;
+}
+
+declare var Fade: React.StatelessComponent<Props>;
+export default Fade;
diff --git a/types/reactstrap/v4/lib/Form.d.ts b/types/reactstrap/v4/lib/Form.d.ts
new file mode 100644
index 0000000000..dd06a2f855
--- /dev/null
+++ b/types/reactstrap/v4/lib/Form.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLFormElement> {
+  inline?: boolean;
+  tag?: React.ReactType;
+  getRef?: string | ((instance: HTMLButtonElement) => any);
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var Form: React.StatelessComponent<Props>;
+export default Form;
diff --git a/types/reactstrap/v4/lib/FormFeedback.d.ts b/types/reactstrap/v4/lib/FormFeedback.d.ts
new file mode 100644
index 0000000000..7fde21b062
--- /dev/null
+++ b/types/reactstrap/v4/lib/FormFeedback.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: string;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var FormFeedback: React.StatelessComponent<Props>;
+export default FormFeedback;
diff --git a/types/reactstrap/v4/lib/FormGroup.d.ts b/types/reactstrap/v4/lib/FormGroup.d.ts
new file mode 100644
index 0000000000..6031ff2f75
--- /dev/null
+++ b/types/reactstrap/v4/lib/FormGroup.d.ts
@@ -0,0 +1,14 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLDivElement> {
+  row?: boolean;
+  check?: boolean;
+  disabled?: boolean;
+  tag?: React.ReactType;
+  color?: string;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var FormGroup: React.StatelessComponent<Props>;
+export default FormGroup;
diff --git a/types/reactstrap/v4/lib/FormText.d.ts b/types/reactstrap/v4/lib/FormText.d.ts
new file mode 100644
index 0000000000..3cfab3511e
--- /dev/null
+++ b/types/reactstrap/v4/lib/FormText.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  inline?: boolean;
+  tag?: React.ReactType;
+  color?: string;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var FormText: React.StatelessComponent<Props>;
+export default FormText;
diff --git a/types/reactstrap/v4/lib/Input.d.ts b/types/reactstrap/v4/lib/Input.d.ts
new file mode 100644
index 0000000000..541016ca02
--- /dev/null
+++ b/types/reactstrap/v4/lib/Input.d.ts
@@ -0,0 +1,52 @@
+import { CSSModule } from '../index';
+
+type InputType =
+  | 'text'
+  | 'email'
+  | 'select'
+  | 'file'
+  | 'radio'
+  | 'checkbox'
+  | 'textarea'
+  | 'button'
+  | 'reset'
+  | 'submit'
+  | 'date'
+  | 'datetime-local'
+  | 'hidden'
+  | 'image'
+  | 'month'
+  | 'number'
+  | 'range'
+  | 'search'
+  | 'tel'
+  | 'url'
+  | 'week'
+  | 'password'
+  | 'datetime'
+  | 'time'
+  | 'color';
+
+// Intermediate interface to "redefine" the type of size to string
+// size:number => size:any => size:string
+interface Intermediate extends React.InputHTMLAttributes<HTMLInputElement> {
+  size?: any;
+}
+
+interface InputProps extends Intermediate {
+  type?: InputType;
+  size?: string;
+  state?: string;
+  valid?: boolean;
+  tag?: React.ReactType;
+  getRef?: string | ((instance: HTMLInputElement) => any);
+  static?: boolean;
+  addon?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  // We don't have the property 'static' here because 'static' is a reserved keyword in TypeScript
+  // Maybe reactstrap will support an 'isStatic' alias in the future
+}
+
+declare var Input: React.StatelessComponent<InputProps>;
+export default Input;
diff --git a/types/reactstrap/v4/lib/InputGroup.d.ts b/types/reactstrap/v4/lib/InputGroup.d.ts
new file mode 100644
index 0000000000..2de95edc94
--- /dev/null
+++ b/types/reactstrap/v4/lib/InputGroup.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  size?: string;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var InputGroup: React.StatelessComponent<Props>;
+export default InputGroup;
diff --git a/types/reactstrap/v4/lib/InputGroupAddon.d.ts b/types/reactstrap/v4/lib/InputGroupAddon.d.ts
new file mode 100644
index 0000000000..a98eb5d821
--- /dev/null
+++ b/types/reactstrap/v4/lib/InputGroupAddon.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var InputGroupAddon: React.StatelessComponent<Props>;
+export default InputGroupAddon;
diff --git a/types/reactstrap/v4/lib/InputGroupButton.d.ts b/types/reactstrap/v4/lib/InputGroupButton.d.ts
new file mode 100644
index 0000000000..fa7cb1995a
--- /dev/null
+++ b/types/reactstrap/v4/lib/InputGroupButton.d.ts
@@ -0,0 +1,13 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  groupClassName?: string;
+  groupAttributes?: any;
+  className?: string;
+  cssModule?: CSSModule;
+  color?: string;
+}
+
+declare var InputGroupButton: React.StatelessComponent<Props>;
+export default InputGroupButton;
diff --git a/types/reactstrap/v4/lib/Jumbotron.d.ts b/types/reactstrap/v4/lib/Jumbotron.d.ts
new file mode 100644
index 0000000000..cc1f65c956
--- /dev/null
+++ b/types/reactstrap/v4/lib/Jumbotron.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  fluid?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var Jumbotron: React.StatelessComponent<Props>;
+export default Jumbotron;
diff --git a/types/reactstrap/v4/lib/Label.d.ts b/types/reactstrap/v4/lib/Label.d.ts
new file mode 100644
index 0000000000..eb496d90a3
--- /dev/null
+++ b/types/reactstrap/v4/lib/Label.d.ts
@@ -0,0 +1,26 @@
+import { CSSModule } from '../index';
+import { ColumnProps } from './Col';
+
+interface Intermediate extends React.LabelHTMLAttributes<HTMLLabelElement> {
+  size?: any;
+}
+
+interface Props extends Intermediate {
+  hidden?: boolean;
+  check?: boolean;
+  inline?: boolean;
+  disabled?: boolean;
+  size?: string;
+  for?: string;
+  tag?: string;
+  className?: string;
+  cssModule?: CSSModule;
+  xs?: ColumnProps;
+  sm?: ColumnProps;
+  md?: ColumnProps;
+  lg?: ColumnProps;
+  xl?: ColumnProps;
+}
+
+declare var Label: React.StatelessComponent<Props>;
+export default Label;
diff --git a/types/reactstrap/v4/lib/ListGroup.d.ts b/types/reactstrap/v4/lib/ListGroup.d.ts
new file mode 100644
index 0000000000..861c7a1d06
--- /dev/null
+++ b/types/reactstrap/v4/lib/ListGroup.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  flush?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var ListGroup: React.StatelessComponent<Props>;
+export default ListGroup;
diff --git a/types/reactstrap/v4/lib/ListGroupItem.d.ts b/types/reactstrap/v4/lib/ListGroupItem.d.ts
new file mode 100644
index 0000000000..b2241998dc
--- /dev/null
+++ b/types/reactstrap/v4/lib/ListGroupItem.d.ts
@@ -0,0 +1,17 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  active?: boolean;
+  disabled?: boolean;
+  color?: string;
+  action?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  href?: string;
+    
+  onClick?: React.MouseEventHandler<any>;
+}
+
+declare var ListGroupItem: React.StatelessComponent<Props>;
+export default ListGroupItem;
diff --git a/types/reactstrap/v4/lib/ListGroupItemHeading.d.ts b/types/reactstrap/v4/lib/ListGroupItemHeading.d.ts
new file mode 100644
index 0000000000..869a6b2708
--- /dev/null
+++ b/types/reactstrap/v4/lib/ListGroupItemHeading.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var ListGroupItemHeading: React.StatelessComponent<Props>;
+export default ListGroupItemHeading;
diff --git a/types/reactstrap/v4/lib/ListGroupItemText.d.ts b/types/reactstrap/v4/lib/ListGroupItemText.d.ts
new file mode 100644
index 0000000000..df263f30d8
--- /dev/null
+++ b/types/reactstrap/v4/lib/ListGroupItemText.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var ListGroupItemText: React.StatelessComponent<Props>;
+export default ListGroupItemText;
diff --git a/types/reactstrap/v4/lib/Media.d.ts b/types/reactstrap/v4/lib/Media.d.ts
new file mode 100644
index 0000000000..c5408d85d7
--- /dev/null
+++ b/types/reactstrap/v4/lib/Media.d.ts
@@ -0,0 +1,21 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  body?: boolean;
+  bottom?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  heading?: boolean;
+  left?: boolean;
+  list?: boolean;
+  middle?: boolean;
+  object?: boolean;
+  right?: boolean;
+  tag?: React.ReactType;
+  top?: boolean;
+  href?: string;
+  alt?: string;
+}
+
+declare var Media: React.StatelessComponent<Props>;
+export default Media;
diff --git a/types/reactstrap/v4/lib/Modal.d.ts b/types/reactstrap/v4/lib/Modal.d.ts
new file mode 100644
index 0000000000..1e239fbe12
--- /dev/null
+++ b/types/reactstrap/v4/lib/Modal.d.ts
@@ -0,0 +1,23 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  isOpen?: boolean;
+  autoFocus?: boolean;
+  size?: string;
+  toggle?: () => void;
+  keyboard?: boolean;
+  backdrop?: boolean | 'static';
+  onEnter?: () => void;
+  onExit?: () => void;
+  className?: string;
+  cssModule?: CSSModule;
+  wrapClassName?: string;
+  modalClassName?: string;
+  backdropClassName?: string;
+  contentClassName?: string;
+  zIndex?: number | string;
+  fade?: boolean;
+}
+
+declare var Modal: React.StatelessComponent<Props>;
+export default Modal;
diff --git a/types/reactstrap/v4/lib/ModalBody.d.ts b/types/reactstrap/v4/lib/ModalBody.d.ts
new file mode 100644
index 0000000000..98933b2fc2
--- /dev/null
+++ b/types/reactstrap/v4/lib/ModalBody.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var ModalBody: React.StatelessComponent<Props>;
+export default ModalBody;
diff --git a/types/reactstrap/v4/lib/ModalFooter.d.ts b/types/reactstrap/v4/lib/ModalFooter.d.ts
new file mode 100644
index 0000000000..84b3da7ec8
--- /dev/null
+++ b/types/reactstrap/v4/lib/ModalFooter.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var ModalFooter: React.StatelessComponent<Props>;
+export default ModalFooter;
diff --git a/types/reactstrap/v4/lib/ModalHeader.d.ts b/types/reactstrap/v4/lib/ModalHeader.d.ts
new file mode 100644
index 0000000000..494c9685a3
--- /dev/null
+++ b/types/reactstrap/v4/lib/ModalHeader.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+  wrapTag?: React.ReactType;
+  toggle?: () => void;
+}
+
+declare var ModalHeader: React.StatelessComponent<Props>;
+export default ModalHeader;
diff --git a/types/reactstrap/v4/lib/Nav.d.ts b/types/reactstrap/v4/lib/Nav.d.ts
new file mode 100644
index 0000000000..c646e94304
--- /dev/null
+++ b/types/reactstrap/v4/lib/Nav.d.ts
@@ -0,0 +1,17 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLUListElement> {
+  inline?: boolean;
+  disabled?: boolean;
+  tabs?: boolean;
+  pills?: boolean;
+  stacked?: boolean;
+  navbar?: boolean;
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+  vertical?: boolean;
+}
+
+declare var Nav: React.StatelessComponent<Props>;
+export default Nav;
diff --git a/types/reactstrap/v4/lib/NavDropdown.d.ts b/types/reactstrap/v4/lib/NavDropdown.d.ts
new file mode 100644
index 0000000000..6b480d495a
--- /dev/null
+++ b/types/reactstrap/v4/lib/NavDropdown.d.ts
@@ -0,0 +1,12 @@
+import {
+  UncontrolledProps as DropdownUncontrolledProps,
+  Props as DropdownProps
+} from './Dropdown';
+
+// tslint:disable-next-line
+export interface UncontrolledProps extends DropdownUncontrolledProps { }
+// tslint:disable-next-line
+interface Props extends DropdownProps { }
+
+declare var NavDropdown: React.StatelessComponent<Props>;
+export default NavDropdown;
\ No newline at end of file
diff --git a/types/reactstrap/v4/lib/NavItem.d.ts b/types/reactstrap/v4/lib/NavItem.d.ts
new file mode 100644
index 0000000000..db19f92c56
--- /dev/null
+++ b/types/reactstrap/v4/lib/NavItem.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var NavItem: React.StatelessComponent<Props>;
+export default NavItem;
diff --git a/types/reactstrap/v4/lib/NavLink.d.ts b/types/reactstrap/v4/lib/NavLink.d.ts
new file mode 100644
index 0000000000..2871fad72e
--- /dev/null
+++ b/types/reactstrap/v4/lib/NavLink.d.ts
@@ -0,0 +1,15 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLAnchorElement> {
+  tag?: React.ReactType;
+  getRef?: string | ((instance: HTMLButtonElement) => any);
+  disabled?: boolean;
+  active?: boolean;
+  className?: string;
+  cssModule?: CSSModule;
+  onClick?: React.MouseEventHandler<any>;
+  href?: string;
+}
+
+declare var NavLink: React.StatelessComponent<Props>;
+export default NavLink;
diff --git a/types/reactstrap/v4/lib/Navbar.d.ts b/types/reactstrap/v4/lib/Navbar.d.ts
new file mode 100644
index 0000000000..58f9235140
--- /dev/null
+++ b/types/reactstrap/v4/lib/Navbar.d.ts
@@ -0,0 +1,20 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  light?: boolean;
+  dark?: boolean;
+  inverse?: boolean;
+  full?: boolean;
+  fixed?: string;
+  sticky?: string;
+  color?: string;
+  role?: string;
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+  toggleable?: boolean | string;
+  expand?: boolean | string;
+}
+
+declare var Navbar: React.StatelessComponent<Props>;
+export default Navbar;
diff --git a/types/reactstrap/v4/lib/NavbarBrand.d.ts b/types/reactstrap/v4/lib/NavbarBrand.d.ts
new file mode 100644
index 0000000000..3748a2903f
--- /dev/null
+++ b/types/reactstrap/v4/lib/NavbarBrand.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLAnchorElement> {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var NavbarBrand: React.StatelessComponent<Props>;
+export default NavbarBrand;
diff --git a/types/reactstrap/v4/lib/NavbarToggler.d.ts b/types/reactstrap/v4/lib/NavbarToggler.d.ts
new file mode 100644
index 0000000000..282eeaa672
--- /dev/null
+++ b/types/reactstrap/v4/lib/NavbarToggler.d.ts
@@ -0,0 +1,13 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLAnchorElement> {
+  tag?: React.ReactType;
+  type?: string;
+  className?: string;
+  cssModule?: CSSModule;
+  right?: boolean;
+  left?: boolean;
+}
+
+declare var NavbarToggler: React.StatelessComponent<Props>;
+export default NavbarToggler;
diff --git a/types/reactstrap/v4/lib/Pagination.d.ts b/types/reactstrap/v4/lib/Pagination.d.ts
new file mode 100644
index 0000000000..a34401be35
--- /dev/null
+++ b/types/reactstrap/v4/lib/Pagination.d.ts
@@ -0,0 +1,10 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  className?: string;
+  cssModule?: CSSModule;
+  size?: string;
+}
+
+declare var Pagination: React.StatelessComponent<Props>;
+export default Pagination;
diff --git a/types/reactstrap/v4/lib/PaginationItem.d.ts b/types/reactstrap/v4/lib/PaginationItem.d.ts
new file mode 100644
index 0000000000..183a7e9d84
--- /dev/null
+++ b/types/reactstrap/v4/lib/PaginationItem.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  className?: string;
+  cssModule?: CSSModule;
+  active?: boolean;
+  disabled?: boolean;
+  tag?: React.ReactType;
+}
+
+declare var PaginationItem: React.StatelessComponent<Props>;
+export default PaginationItem;
diff --git a/types/reactstrap/v4/lib/PaginationLink.d.ts b/types/reactstrap/v4/lib/PaginationLink.d.ts
new file mode 100644
index 0000000000..16e194578d
--- /dev/null
+++ b/types/reactstrap/v4/lib/PaginationLink.d.ts
@@ -0,0 +1,13 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps<HTMLAnchorElement> {
+  'aria-label'?: string;
+  className?: string;
+  cssModule?: CSSModule;
+  next?: boolean;
+  previous?: boolean;
+  tag?: React.ReactType;
+}
+
+declare var PaginationLink: React.StatelessComponent<Props>;
+export default PaginationLink;
diff --git a/types/reactstrap/v4/lib/Popover.d.ts b/types/reactstrap/v4/lib/Popover.d.ts
new file mode 100644
index 0000000000..b779a33ede
--- /dev/null
+++ b/types/reactstrap/v4/lib/Popover.d.ts
@@ -0,0 +1,34 @@
+/// <reference types='tether' />
+
+import { CSSModule } from '../index';
+
+type Placement
+  = 'top'
+  | 'bottom'
+  | 'left'
+  | 'right'
+  | 'top left'
+  | 'top center'
+  | 'top right'
+  | 'right top'
+  | 'right middle'
+  | 'right bottom'
+  | 'bottom right'
+  | 'bottom center'
+  | 'bottom left'
+  | 'left top'
+  | 'left middle'
+  | 'left bottom';
+
+interface Props {
+  placement?: Placement;
+  target: string;
+  isOpen?: boolean;
+  tether?: Tether.ITetherOptions;
+  className?: string;
+  cssModule?: CSSModule;
+  toggle?: () => void;
+}
+
+declare var Popover: React.StatelessComponent<Props>;
+export default Popover;
diff --git a/types/reactstrap/lib/PopoverContent.d.ts b/types/reactstrap/v4/lib/PopoverContent.d.ts
similarity index 100%
rename from types/reactstrap/lib/PopoverContent.d.ts
rename to types/reactstrap/v4/lib/PopoverContent.d.ts
diff --git a/types/reactstrap/lib/PopoverTitle.d.ts b/types/reactstrap/v4/lib/PopoverTitle.d.ts
similarity index 100%
rename from types/reactstrap/lib/PopoverTitle.d.ts
rename to types/reactstrap/v4/lib/PopoverTitle.d.ts
diff --git a/types/reactstrap/v4/lib/Progress.d.ts b/types/reactstrap/v4/lib/Progress.d.ts
new file mode 100644
index 0000000000..09c4304373
--- /dev/null
+++ b/types/reactstrap/v4/lib/Progress.d.ts
@@ -0,0 +1,18 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  bar?: boolean;
+  multi?: boolean;
+  tag?: string;
+  value?: string | number;
+  max?: string | number;
+  animated?: boolean;
+  striped?: boolean;
+  color?: string;
+  className?: string;
+  cssModule?: CSSModule;
+  barClassName?: string;
+}
+
+declare var Progress: React.StatelessComponent<Props>;
+export default Progress;
diff --git a/types/reactstrap/v4/lib/Row.d.ts b/types/reactstrap/v4/lib/Row.d.ts
new file mode 100644
index 0000000000..1ffbb9f7e6
--- /dev/null
+++ b/types/reactstrap/v4/lib/Row.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props extends React.HTMLProps< HTMLElement> {
+  className?: string;
+  cssModule?: CSSModule;
+  tag?: React.ReactType;
+  noGutters?: boolean;
+}
+
+declare var Row: React.StatelessComponent<Props>;
+export default Row;
diff --git a/types/reactstrap/v4/lib/TabContent.d.ts b/types/reactstrap/v4/lib/TabContent.d.ts
new file mode 100644
index 0000000000..af6feec078
--- /dev/null
+++ b/types/reactstrap/v4/lib/TabContent.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  activeTab?: number | string;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var TabContent: React.StatelessComponent<Props>;
+export default TabContent;
diff --git a/types/reactstrap/v4/lib/TabPane.d.ts b/types/reactstrap/v4/lib/TabPane.d.ts
new file mode 100644
index 0000000000..9eead420be
--- /dev/null
+++ b/types/reactstrap/v4/lib/TabPane.d.ts
@@ -0,0 +1,11 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+  tabId?: number | string;
+}
+
+declare var TabPane: React.StatelessComponent<Props>;
+export default TabPane;
diff --git a/types/reactstrap/v4/lib/Table.d.ts b/types/reactstrap/v4/lib/Table.d.ts
new file mode 100644
index 0000000000..ec8bfc43fd
--- /dev/null
+++ b/types/reactstrap/v4/lib/Table.d.ts
@@ -0,0 +1,18 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  className?: string;
+  cssModule?: CSSModule;
+  size?: string;
+  bordered?: boolean;
+  striped?: boolean;
+  inverse?: boolean;
+  hover?: boolean;
+  reflow?: boolean;
+  responsive?: boolean;
+  tag?: React.ReactType;
+  responsiveTag?: React.ReactType;
+}
+
+declare var Table: React.StatelessComponent<Props>;
+export default Table;
diff --git a/types/reactstrap/v4/lib/Tag.d.ts b/types/reactstrap/v4/lib/Tag.d.ts
new file mode 100644
index 0000000000..7dce8876f2
--- /dev/null
+++ b/types/reactstrap/v4/lib/Tag.d.ts
@@ -0,0 +1,12 @@
+import { CSSModule } from '../index';
+
+interface Props {
+  color?: string;
+  pill?: boolean;
+  tag?: React.ReactType;
+  className?: string;
+  cssModule?: CSSModule;
+}
+
+declare var Tag: React.StatelessComponent<Props>;
+export default Tag;
diff --git a/types/reactstrap/lib/TetherContent.d.ts b/types/reactstrap/v4/lib/TetherContent.d.ts
similarity index 100%
rename from types/reactstrap/lib/TetherContent.d.ts
rename to types/reactstrap/v4/lib/TetherContent.d.ts
diff --git a/types/reactstrap/v4/lib/Tooltip.d.ts b/types/reactstrap/v4/lib/Tooltip.d.ts
new file mode 100644
index 0000000000..9dba615084
--- /dev/null
+++ b/types/reactstrap/v4/lib/Tooltip.d.ts
@@ -0,0 +1,43 @@
+/// <reference types='tether' />
+
+import { CSSModule } from '../index';
+
+type Placement
+  = 'top'
+  | 'bottom'
+  | 'left'
+  | 'right'
+  | 'top left'
+  | 'top center'
+  | 'top right'
+  | 'right top'
+  | 'right middle'
+  | 'right bottom'
+  | 'bottom right'
+  | 'bottom center'
+  | 'bottom left'
+  | 'left top'
+  | 'left middle'
+  | 'left bottom';
+
+export interface UncontrolledProps {
+  placement?: Placement;
+  target: string;
+  disabled?: boolean;
+  tether?: Tether.ITetherOptions;
+  tetherRef?: (tether: Tether) => void;
+  className?: string;
+  cssModule?: CSSModule;
+  autohide?: boolean;
+  delay?: number | { show: number, hide: number };
+}
+
+interface Props extends UncontrolledProps {
+  toggle?: () => void;
+  isOpen?: boolean;
+}
+
+
+
+declare var Tooltip: React.StatelessComponent<Props>;
+export default Tooltip;
diff --git a/types/reactstrap/v4/lib/Uncontrolled.d.ts b/types/reactstrap/v4/lib/Uncontrolled.d.ts
new file mode 100644
index 0000000000..151ee012d3
--- /dev/null
+++ b/types/reactstrap/v4/lib/Uncontrolled.d.ts
@@ -0,0 +1,29 @@
+import {
+  UncontrolledProps as AlertUncontrolledProps
+} from './Alert';
+import {
+  UncontrolledProps as ButtonDropdownUncontrolledProps
+} from './ButtonDropdown';
+import {
+  UncontrolledProps as DropdownUncontrolledProps
+} from './Dropdown';
+import {
+  UncontrolledProps as NavDropdownUncontrolledProps
+} from './NavDropdown';
+import {
+  UncontrolledProps as TooltipUncontrolledProps
+} from './Tooltip';
+
+declare var UncontrolledAlert: React.StatelessComponent<AlertUncontrolledProps>;
+declare var UncontrolledButtonDropdown: React.StatelessComponent<ButtonDropdownUncontrolledProps>;
+declare var UncontrolledDropdown: React.StatelessComponent<DropdownUncontrolledProps>;
+declare var UncontrolledNavDropdown: React.StatelessComponent<NavDropdownUncontrolledProps>;
+declare var UncontrolledTooltip: React.StatelessComponent<TooltipUncontrolledProps>;
+
+export {
+  UncontrolledAlert,
+  UncontrolledButtonDropdown,
+  UncontrolledDropdown,
+  UncontrolledNavDropdown,
+  UncontrolledTooltip
+}
\ No newline at end of file
diff --git a/types/reactstrap/v4/reactstrap-tests.tsx b/types/reactstrap/v4/reactstrap-tests.tsx
new file mode 100644
index 0000000000..b094d4d019
--- /dev/null
+++ b/types/reactstrap/v4/reactstrap-tests.tsx
@@ -0,0 +1,3502 @@
+import * as React from 'react';
+import {
+  Alert,
+  UncontrolledAlert,
+  Badge,
+  Breadcrumb,
+  BreadcrumbItem,
+  Button,
+  ButtonDropdown,
+  ButtonGroup,
+  ButtonToolbar,
+  Dropdown,
+  DropdownItem,
+  DropdownMenu,
+  DropdownToggle,
+  Card,
+  CardBody,
+  CardBlock,
+  CardColumns,
+  CardDeck,
+  CardFooter,
+  CardGroup,
+  CardHeader,
+  CardImg,
+  CardImgOverlay,
+  CardLink,
+  CardSubtitle,
+  CardText,
+  CardTitle,
+  Row,
+  Col,
+  Container,
+  Collapse,
+  Fade,
+  Form,
+  FormFeedback,
+  FormGroup,
+  FormText,
+  Input,
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  Pagination,
+  Label,
+  ListGroup,
+  ListGroupItem,
+  ListGroupItemHeading,
+  ListGroupItemText,
+  ModalFooter,
+  Modal,
+  ModalBody,
+  ModalHeader,
+  Jumbotron,
+  Media,
+  Nav,
+  Navbar,
+  NavbarBrand,
+  NavbarToggler,
+  NavDropdown,
+  NavItem,
+  NavLink,
+  PaginationItem,
+  PaginationLink,
+  Popover,
+  PopoverContent,
+  PopoverTitle,
+  Progress,
+  TabPane,
+  UncontrolledButtonDropdown,
+  UncontrolledDropdown,
+  UncontrolledNavDropdown,
+  UncontrolledTooltip,
+  TabContent,
+  Table,
+  Tag,
+  TetherContent,
+  Tooltip
+} from 'reactstrap';
+
+// --------------- Alert
+const Examplea = (props: any) => {
+  return (
+    <div>
+      <Alert color="success">
+        <strong>Well done!</strong> You successfully read this important alert message.
+      </Alert>
+      <Alert color="info">
+        <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
+      </Alert>
+      <Alert color="warning">
+        <strong>Warning!</strong> Better check yourself, you're not looking too good.
+      </Alert>
+      <Alert color="danger">
+        <strong>Oh snap!</strong> Change a few things up and try submitting again.
+      </Alert>
+    </div>
+  );
+};
+
+class AlertExample extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.state = {
+      visible: true
+    };
+  }
+
+  onDismiss = () => {
+    this.setState({ visible: false });
+  }
+
+  render() {
+    return (
+      <Alert color="info" isOpen={this.state.visible} toggle={this.onDismiss}>
+        I am an alert and I can be dismissed!
+      </Alert>
+    );
+  }
+}
+
+function AlertExample1() {
+  return (
+    <UncontrolledAlert color="info">
+      I am an alert and I can be dismissed!
+    </UncontrolledAlert>
+  );
+}
+
+// --------------- Badge
+class Example2 extends React.Component {
+  render() {
+    return (
+      <div>
+        <h1>Heading <Badge>New</Badge></h1>
+        <h2>Heading <Badge>New</Badge></h2>
+        <h3>Heading <Badge>New</Badge></h3>
+        <h4>Heading <Badge>New</Badge></h4>
+        <h5>Heading <Badge>New</Badge></h5>
+        <h6>Heading <Badge>New</Badge></h6>
+      </div>
+    );
+  }
+}
+
+export class Example3 extends React.Component {
+  render() {
+    return (
+      <div>
+        <Badge>default</Badge>
+        <Badge color="primary">primary</Badge>
+        <Badge color="success">success</Badge>
+        <Badge color="info">info</Badge>
+        <Badge color="warning">warning</Badge>
+        <Badge color="danger">danger</Badge>
+      </div>
+    );
+  }
+}
+
+class Example4 extends React.Component {
+  render() {
+    return (
+      <div>
+        <Badge color="default" pill>default</Badge>{' '}
+        <Badge color="primary" pill>primary</Badge>{' '}
+        <Badge color="success" pill>success</Badge>{' '}
+        <Badge color="info" pill>info</Badge>{' '}
+        <Badge color="warning" pill>warning</Badge>{' '}
+        <Badge color="danger" pill>danger</Badge>
+      </div>
+    );
+  }
+}
+
+// ------------- Breadcrumbs
+const Example5 = (props: any) => {
+  return (
+    <div>
+      <Breadcrumb>
+        <BreadcrumbItem active>Home</BreadcrumbItem>
+      </Breadcrumb>
+      <Breadcrumb>
+        <BreadcrumbItem><a href="#">Home</a></BreadcrumbItem>
+        <BreadcrumbItem active>Library</BreadcrumbItem>
+      </Breadcrumb>
+      <Breadcrumb>
+        <BreadcrumbItem><a href="#">Home</a></BreadcrumbItem>
+        <BreadcrumbItem><a href="#">Library</a></BreadcrumbItem>
+        <BreadcrumbItem active>Data</BreadcrumbItem>
+      </Breadcrumb>
+    </div>
+  );
+};
+
+const Example6 = (props: any) => {
+  return (
+    <div>
+      <Breadcrumb tag="nav">
+        <BreadcrumbItem tag="a" href="#">Home</BreadcrumbItem>
+        <BreadcrumbItem tag="a" href="#">Library</BreadcrumbItem>
+        <BreadcrumbItem tag="a" href="#">Data</BreadcrumbItem>
+        <BreadcrumbItem active tag="span">Bootstrap</BreadcrumbItem>
+      </Breadcrumb>
+    </div>
+  );
+};
+
+// ------------- Buttons
+class Example7 extends React.Component {
+  render() {
+    return (
+      <div>
+        <Button color="primary">primary</Button>{' '}
+        <Button color="secondary">secondary</Button>{' '}
+        <Button color="success">success</Button>{' '}
+        <Button color="info">info</Button>{' '}
+        <Button color="warning">warning</Button>{' '}
+        <Button color="danger">danger</Button>{' '}
+        <Button color="link">link</Button>
+      </div>
+    );
+  }
+}
+
+class Example8 extends React.Component {
+  render() {
+    return (
+      <div>
+        <Button outline color="primary">primary</Button>{' '}
+        <Button outline color="secondary">secondary</Button>{' '}
+        <Button outline color="success">success</Button>{' '}
+        <Button outline color="info">info</Button>{' '}
+        <Button outline color="warning">warning</Button>{' '}
+        <Button outline color="danger">danger</Button>
+      </div>
+    );
+  }
+}
+
+const Example9 = (
+  <div>
+    <Button color="primary" size="lg">Large Button</Button>{' '}
+    <Button color="secondary" size="lg">Large Button</Button>
+  </div>
+);
+
+const Example10 = (
+  <div>
+    <Button color="primary" size="sm">Small Button</Button>{' '}
+    <Button color="secondary" size="sm">Small Button</Button>
+  </div>
+);
+
+const Example11 = (
+  <div>
+    <Button color="primary" size="lg" block>Block level button</Button>
+    <Button color="secondary" size="lg" block>Block level button</Button>
+  </div>
+);
+
+const Example12 = (
+  <div>
+    <Button color="primary" size="lg" active>Primary link</Button>{' '}
+    <Button color="secondary" size="lg" active>Link</Button>
+  </div>
+);
+
+const Example13 = (
+  <div>
+    <Button color="primary" size="lg" disabled>Primary button</Button>{' '}
+    <Button color="secondary" size="lg" disabled>Button</Button>
+  </div>
+);
+
+class Example14 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.state = { cSelected: [] };
+
+    this.onRadioBtnClick = this.onRadioBtnClick.bind(this);
+    this.onCheckboxBtnClick = this.onCheckboxBtnClick.bind(this);
+  }
+
+  onRadioBtnClick(rSelected: number) {
+    this.setState({ rSelected });
+  }
+
+  onCheckboxBtnClick(selected: number) {
+    const index = this.state.cSelected.indexOf(selected);
+    if (index < 0) {
+      this.state.cSelected.push(selected);
+    } else {
+      this.state.cSelected.splice(index, 1);
+    }
+    this.setState({ cSelected: [...this.state.cSelected] });
+  }
+
+  render() {
+    return (
+      <div>
+        <h5>Radio Buttons</h5>
+        <ButtonGroup>
+          <Button color="primary" onClick={() => this.onRadioBtnClick(1)} active={this.state.rSelected === 1}>One</Button>
+          <Button color="primary" onClick={() => this.onRadioBtnClick(2)} active={this.state.rSelected === 2}>Two</Button>
+          <Button color="primary" onClick={() => this.onRadioBtnClick(3)} active={this.state.rSelected === 3}>Three</Button>
+        </ButtonGroup>
+        <p>Selected: {this.state.rSelected}</p>
+
+        <h5>Checkbox Buttons</h5>
+        <ButtonGroup>
+          <Button color="primary" onClick={() => this.onCheckboxBtnClick(1)} active={this.state.cSelected.includes(1)}>One</Button>
+          <Button color="primary" onClick={() => this.onCheckboxBtnClick(2)} active={this.state.cSelected.includes(2)}>Two</Button>
+          <Button color="primary" onClick={() => this.onCheckboxBtnClick(3)} active={this.state.cSelected.includes(3)}>Three</Button>
+        </ButtonGroup>
+        <p>Selected: {JSON.stringify(this.state.cSelected)}</p>
+      </div>
+    );
+  }
+}
+
+// ------------- Button Dropdown
+class Example15 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      dropdownOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      dropdownOpen: !this.state.dropdownOpen
+    });
+  }
+
+  render() {
+    return (
+      <ButtonDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
+        <DropdownToggle caret>
+          Button Dropdown
+        </DropdownToggle>
+        <DropdownMenu>
+          <DropdownItem header>Header</DropdownItem>
+          <DropdownItem disabled>Action</DropdownItem>
+          <DropdownItem>Another Action</DropdownItem>
+          <DropdownItem divider />
+          <DropdownItem onClick={event => {
+            // something happens here
+          }}>Another Action</DropdownItem>
+        </DropdownMenu>
+      </ButtonDropdown>
+    );
+  }
+}
+
+const Example16 = (
+  <ButtonDropdown isOpen={true} toggle={() => true}>
+    <DropdownToggle caret color="primary">
+      Text
+  </DropdownToggle>
+    <DropdownMenu>
+      <DropdownItem header>Header</DropdownItem>
+      <DropdownItem disabled>Action</DropdownItem>
+      <DropdownItem>Another Action</DropdownItem>
+      <DropdownItem divider />
+      <DropdownItem>Another Action</DropdownItem>
+    </DropdownMenu>
+  </ButtonDropdown>
+);
+
+const Example17 = (props: any) => (
+  <ButtonDropdown isOpen={true} toggle={() => true}>
+    <Button id="caret" color="primary">{props.text}</Button>
+    <DropdownToggle caret color="primary" />
+    <DropdownMenu>
+      <DropdownItem header>Header</DropdownItem>
+      <DropdownItem disabled>Action</DropdownItem>
+      <DropdownItem>Another Action</DropdownItem>
+      <DropdownItem divider />
+      <DropdownItem>Another Action</DropdownItem>
+    </DropdownMenu>
+  </ButtonDropdown>
+);
+
+const Example18 = (
+  <div>
+    <ButtonDropdown isOpen={true} toggle={() => true}>
+      <DropdownToggle caret size="lg">
+        Large Button
+    </DropdownToggle>
+      <DropdownMenu>
+        <DropdownItem>Another Action</DropdownItem>
+        <DropdownItem>Another Action</DropdownItem>
+      </DropdownMenu>
+    </ButtonDropdown>
+
+    <ButtonDropdown isOpen={true} toggle={() => true}>
+      <DropdownToggle caret size="sm">
+        Small Button
+    </DropdownToggle>
+      <DropdownMenu>
+        <DropdownItem>Another Action</DropdownItem>
+        <DropdownItem>Another Action</DropdownItem>
+      </DropdownMenu>
+    </ButtonDropdown>
+  </div>
+);
+
+const Example19 = (
+  <ButtonDropdown isOpen={true} toggle={() => true} dropup>
+    <DropdownToggle caret size="lg">
+      Dropup
+    </DropdownToggle>
+    <DropdownMenu>
+      <DropdownItem>Another Action</DropdownItem>
+      <DropdownItem>Another Action</DropdownItem>
+    </DropdownMenu>
+  </ButtonDropdown>
+);
+
+// --------------- ButtonGroup
+class Example20 extends React.Component {
+  render() {
+    return (
+      <ButtonGroup>
+        <Button>Left</Button>{' '}
+        <Button>Middle</Button>{' '}
+        <Button>Right</Button>
+      </ButtonGroup>
+    );
+  }
+}
+
+class Example21 extends React.Component {
+  render() {
+    return (
+      <ButtonToolbar>
+        <ButtonGroup>
+          <Button>1</Button>
+          <Button>2</Button>
+          <Button>3</Button>
+          <Button>4</Button>
+        </ButtonGroup>
+        <ButtonGroup>
+          <Button>5</Button>
+          <Button>6</Button>
+          <Button>7</Button>
+        </ButtonGroup>
+        <ButtonGroup>
+          <Button>8</Button>
+        </ButtonGroup>
+      </ButtonToolbar>
+    );
+  }
+}
+
+const Example22 = (props: any) => (
+  <div>
+    <ButtonGroup size="lg">
+      <Button>Left</Button>
+      <Button>Middle</Button>
+      <Button>Right</Button>
+    </ButtonGroup>
+
+    <ButtonGroup>
+      <Button>Left</Button>
+      <Button>Middle</Button>
+      <Button>Right</Button>
+    </ButtonGroup>
+
+    <ButtonGroup size="sm">
+      <Button>Left</Button>
+      <Button>Middle</Button>
+      <Button>Right</Button>
+    </ButtonGroup>
+  </div>
+);
+
+const Example23 = (props: any) => (
+  <ButtonGroup>
+    <Button>1</Button>
+    <Button>2</Button>
+    <ButtonDropdown isOpen={true} toggle={() => true}>
+      <DropdownToggle caret>
+        Dropdown
+    </DropdownToggle>
+      <DropdownMenu>
+        <DropdownItem>Dropdown Link</DropdownItem>
+        <DropdownItem>Dropdown Link</DropdownItem>
+      </DropdownMenu>
+    </ButtonDropdown>
+  </ButtonGroup>
+);
+
+const Example24 = (props: any) => (
+  <ButtonGroup vertical>
+    <Button>1</Button>
+    <Button>2</Button>
+    <ButtonDropdown isOpen={props.dropdownOpen} toggle={() => true}>
+      <DropdownToggle caret>
+        Dropdown
+    </DropdownToggle>
+      <DropdownMenu>
+        <DropdownItem>Dropdown Link</DropdownItem>
+        <DropdownItem>Dropdown Link</DropdownItem>
+      </DropdownMenu>
+    </ButtonDropdown>
+  </ButtonGroup>
+);
+
+// ------------------ Cards
+const Example25 = (props: any) => {
+  return (
+    <div>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>Some quick example text to build on the card title and make up the bulk of the card's content.</CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+    </div>
+  );
+};
+
+const Example26 = (props: any) => {
+  return (
+    <div>
+      <Card>
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+        </CardBlock>
+        <img width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardText>Some quick example text to build on the card title and make up the bulk of the card's content.</CardText>
+          <CardLink href="#">Card Link</CardLink>
+          <CardLink href="#">Another Link</CardLink>
+        </CardBlock>
+      </Card>
+    </div>
+  );
+};
+
+const Example27 = (props: any) => {
+  return (
+    <Row noGutters>
+      <Col sm="6">
+        <Card block>
+          <CardTitle>Special Title Treatment</CardTitle>
+          <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+          <Button>Go somewhere</Button>
+        </Card>
+      </Col>
+      <Col sm="6">
+        <Card block>
+          <CardTitle>Special Title Treatment</CardTitle>
+          <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+          <Button>Go somewhere</Button>
+        </Card>
+      </Col>
+    </Row>
+  );
+};
+
+const Example28 = (props: any) => {
+  return (
+    <div>
+      <Card block>
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button>Go somewhere</Button>
+      </Card>
+      <Card block className="text-center">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button>Go somewhere</Button>
+      </Card>
+      <Card block className="text-right">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button>Go somewhere</Button>
+      </Card>
+    </div>
+  );
+};
+
+const Example29 = (props: any) => {
+  return (
+    <div>
+      <Card>
+        <CardHeader>Header</CardHeader>
+        <CardBlock>
+          <CardTitle>Special Title Treatment</CardTitle>
+          <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+          <Button>Go somewhere</Button>
+        </CardBlock>
+        <CardFooter>Footer</CardFooter>
+      </Card>
+
+      <Card>
+        <CardHeader tag="h3">Featured</CardHeader>
+        <CardBlock>
+          <CardTitle>Special Title Treatment</CardTitle>
+          <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+          <Button>Go somewhere</Button>
+        </CardBlock>
+        <CardFooter className="text-muted">Footer</CardFooter>
+      </Card>
+    </div>
+  );
+};
+
+const Example30 = (props: any) => {
+  return (
+    <div>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card Title</CardTitle>
+          <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
+          <CardText>
+            <small className="text-muted">Last updated 3 mins ago</small>
+          </CardText>
+        </CardBlock>
+      </Card>
+      <Card>
+        <CardBlock>
+          <CardTitle>Card Title</CardTitle>
+          <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
+          <CardText>
+            <small className="text-muted">Last updated 3 mins ago</small>
+          </CardText>
+        </CardBlock>
+        <CardImg bottom width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
+      </Card>
+    </div>
+  );
+};
+
+const Example31 = (props: any) => {
+  return (
+    <div>
+      <Card inverse>
+        <CardImg width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97270&w=318&h=270&bg=333333&txtclr=666666" alt="Card image cap" />
+        <CardImgOverlay>
+          <CardTitle>Card Title</CardTitle>
+          <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
+          <CardText>
+            <small className="text-muted">Last updated 3 mins ago</small>
+          </CardText>
+        </CardImgOverlay>
+      </Card>
+    </div>
+  );
+};
+
+const Example32 = (props: any) => {
+  return (
+    <div>
+      <Card block inverse style={{ backgroundColor: '#333', borderColor: '#333' }}>
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button>Button</Button>
+      </Card>
+      <Card block inverse color="primary">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block inverse color="success">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block inverse color="info">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block inverse color="warning">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block inverse color="danger">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+    </div>
+  );
+};
+
+const Example33 = (props: any) => {
+  return (
+    <div>
+      <Card block outline color="secondary">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button>Button</Button>
+      </Card>
+      <Card block outline color="primary">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block outline color="success">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block outline color="info">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block outline color="warning">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+      <Card block outline color="danger">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+    </div>
+  );
+};
+
+const Example34 = (props: any) => {
+  return (
+    <CardGroup>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>This card has supporting text below as a natural lead-in to additional content.</CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>
+            This is a wider card with supporting text below as a natural lead-in to additional content. This
+            card has even longer content than the first to show that equal height action.
+          </CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+    </CardGroup>
+  );
+};
+
+const Example35 = (props: any) => {
+  return (
+    <CardDeck>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>This card has supporting text below as a natural lead-in to additional content.</CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>
+              This is a wider card with supporting text below as a natural lead-in to additional content. This card has
+              even longer content than the first to show that equal height action.
+          </CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+    </CardDeck>
+  );
+};
+
+const Example36 = (props: any) => {
+  return (
+    <CardColumns>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+      <Card>
+        <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
+      </Card>
+      <Card>
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>This card has supporting text below as a natural lead-in to additional content.</CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+      <Card block inverse style={{ backgroundColor: '#333', borderColor: '#333' }}>
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button>Button</Button>
+      </Card>
+      <Card>
+        <CardImg top width="100%"
+                 src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180"
+                 alt="Card image cap" />
+        <CardBlock>
+          <CardTitle>Card title</CardTitle>
+          <CardSubtitle>Card subtitle</CardSubtitle>
+          <CardText>
+              This is a wider card with supporting text below as a natural lead-in to additional content. This card
+              has even longer content than the first to show that equal height action.
+          </CardText>
+          <Button>Button</Button>
+        </CardBlock>
+      </Card>
+      <Card block inverse color="primary">
+        <CardTitle>Special Title Treatment</CardTitle>
+        <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+        <Button color="secondary">Button</Button>
+      </Card>
+    </CardColumns>
+  );
+};
+
+// ------------------ Collapse
+
+class Example37 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+    this.toggle = this.toggle.bind(this);
+    this.state = { collapse: false };
+  }
+
+  toggle() {
+    this.setState({ collapse: !this.state.collapse });
+  }
+
+  render() {
+    return (
+      <div>
+        <Button color="primary" onClick={this.toggle} style={{ marginBottom: '1rem' }}>Toggle</Button>
+        <Collapse isOpen={this.state.collapse}>
+          <Card>
+            <CardBlock>
+              Anim pariatur cliche reprehenderit,
+             enim eiusmod high life accusamus terry richardson ad squid. Nihil
+             anim keffiyeh helvetica, craft beer labore wes anderson cred
+             nesciunt sapiente ea proident.
+            </CardBlock>
+          </Card>
+        </Collapse>
+      </div>
+    );
+  }
+}
+
+class Example38 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+    this.onOpened = this.onOpened.bind(this);
+    this.onClosed = this.onClosed.bind(this);
+    this.toggle = this.toggle.bind(this);
+    this.state = { collapse: false, status: 'Closed' };
+  }
+
+  onOpened() {
+    this.setState({ ...this.state, status: 'Opened' });
+  }
+
+  onClosed() {
+    this.setState({ ...this.state, status: 'Closed' });
+  }
+
+  toggle() {
+    const status = !this.state.collapse ? 'Opening...' : 'Closing...';
+    this.setState({ collapse: !this.state.collapse, status });
+  }
+
+  render() {
+    return (
+      <div>
+        <Button color="primary" onClick={this.toggle} style={{ marginBottom: '1rem' }}>Toggle</Button>
+        <h5>Current state: {this.state.status}</h5>
+        <Collapse isOpen={this.state.collapse} onOpened={this.onOpened} onClosed={this.onClosed}>
+          <Card>
+            <CardBlock>
+              Anim pariatur cliche reprehenderit,
+             enim eiusmod high life accusamus terry richardson ad squid. Nihil
+             anim keffiyeh helvetica, craft beer labore wes anderson cred
+             nesciunt sapiente ea proident.
+            </CardBlock>
+          </Card>
+        </Collapse>
+      </div>
+    );
+  }
+}
+
+// ------- Dropdown
+
+class Example39 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      dropdownOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      dropdownOpen: !this.state.dropdownOpen
+    });
+  }
+
+  render() {
+    return (
+      <Dropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
+        <DropdownToggle caret>
+          Dropdown
+        </DropdownToggle>
+        <DropdownMenu>
+          <DropdownItem header>Header</DropdownItem>
+          <DropdownItem disabled>Action</DropdownItem>
+          <DropdownItem>Another Action</DropdownItem>
+          <DropdownItem divider />
+          <DropdownItem>Another Action</DropdownItem>
+        </DropdownMenu>
+      </Dropdown>
+    );
+  }
+}
+
+const Example40 = (props: any) => (
+  <Dropdown isOpen={false} toggle={() => false}>
+    <DropdownToggle caret>
+      Dropdown
+  </DropdownToggle>
+    <DropdownMenu right>
+      <DropdownItem header>Header</DropdownItem>
+      <DropdownItem disabled>Action</DropdownItem>
+      <DropdownItem>Another Action</DropdownItem>
+      <DropdownItem divider />
+      <DropdownItem>Another Action</DropdownItem>
+    </DropdownMenu>
+  </Dropdown>
+);
+
+const Example41 = (props: any) => (
+  <DropdownItem header>Header</DropdownItem>
+);
+
+const Example42 = (props: any) => (
+  <div>
+    <DropdownItem divider />
+    <DropdownItem>Action</DropdownItem>
+    <DropdownItem disabled>Action</DropdownItem>
+    <Dropdown group isOpen={true} size="lg" toggle={() => true}>
+      <DropdownToggle caret>asdfasd</DropdownToggle>
+      <DropdownMenu>sadfas</DropdownMenu>
+    </Dropdown>
+
+    <Dropdown isOpen={true} toggle={() => true}>
+      <DropdownToggle caret>sadfasd</DropdownToggle>
+      <DropdownMenu>sadf</DropdownMenu>
+    </Dropdown>
+
+    <Dropdown group isOpen={true} size="sm" toggle={() => true}>
+      <DropdownToggle caret>asdf</DropdownToggle>
+      <DropdownMenu>sasdfsdf</DropdownMenu>
+    </Dropdown>
+
+  </div>
+);
+
+class Example43 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      dropdownOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      dropdownOpen: !this.state.dropdownOpen
+    });
+  }
+
+  render() {
+    return (
+      <Dropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
+        <span
+          onClick={this.toggle}
+          data-toggle="dropdown"
+          aria-haspopup="true"
+          aria-expanded={this.state.dropdownOpen}
+        >
+          Custom Dropdown Content
+        </span>
+        <DropdownMenu>
+          <div onClick={this.toggle}>Custom dropdown item</div>
+          <div onClick={this.toggle}>Custom dropdown item</div>
+          <div onClick={this.toggle}>Custom dropdown item</div>
+          <div onClick={this.toggle}>Custom dropdown item</div>
+        </DropdownMenu>
+      </Dropdown>
+    );
+  }
+}
+
+function Example44() {
+  return (
+    <UncontrolledDropdown className="some-class">
+      <DropdownToggle caret>
+        Dropdown
+      </DropdownToggle>
+      <DropdownMenu>
+        <DropdownItem header>Header</DropdownItem>
+        <DropdownItem disabled>Action</DropdownItem>
+        <DropdownItem>Another Action</DropdownItem>
+        <DropdownItem divider />
+        <DropdownItem>Another Action</DropdownItem>
+      </DropdownMenu>
+    </UncontrolledDropdown>
+  );
+}
+
+// ------------------ Form
+class Example45 extends React.Component {
+  render() {
+    return (
+      <Form>
+        <FormGroup>
+          <Label for="exampleEmail">Email</Label>
+          <Input type="email" name="email" id="exampleEmail" placeholder="with a placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="examplePassword">Password</Label>
+          <Input type="password" name="password" id="examplePassword" placeholder="password placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleSelect">Select</Label>
+          <Input type="select" name="select" id="exampleSelect">
+            <option>1</option>
+            <option>2</option>
+            <option>3</option>
+            <option>4</option>
+            <option>5</option>
+          </Input>
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleSelectMulti">Select Multiple</Label>
+          <Input type="select" name="selectMulti" id="exampleSelectMulti" multiple>
+            <option>1</option>
+            <option>2</option>
+            <option>3</option>
+            <option>4</option>
+            <option>5</option>
+          </Input>
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleText">Text Area</Label>
+          <Input type="textarea" name="text" id="exampleText" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleFile">File</Label>
+          <Input type="file" name="file" id="exampleFile" />
+          <FormText color="muted">
+            This is some placeholder block-level help text for the above input.
+            It's a bit lighter and easily wraps to a new line.
+          </FormText>
+        </FormGroup>
+        <FormGroup tag="fieldset">
+          <legend>Radio Buttons</legend>
+          <FormGroup check>
+            <Label check>
+              <Input type="radio" name="radio1" />{' '}
+              Option one is this and that—be sure to include why it's great
+            </Label>
+          </FormGroup>
+          <FormGroup check>
+            <Label check>
+              <Input type="radio" name="radio1" />{' '}
+              Option two can be something else and selecting it will deselect option one
+            </Label>
+          </FormGroup>
+          <FormGroup check disabled>
+            <Label check>
+              <Input type="radio" name="radio1" disabled />{' '}
+              Option three is disabled
+            </Label>
+          </FormGroup>
+        </FormGroup>
+        <FormGroup check>
+          <Label check>
+            <Input type="checkbox" />{' '}
+            Check me out
+          </Label>
+        </FormGroup>
+        <Button>Submit</Button>
+      </Form>
+    );
+  }
+}
+
+class Example46 extends React.Component {
+  render() {
+    return (
+      <Form>
+        <FormGroup row>
+          <Label for="exampleEmail" sm={2}>Email</Label>
+          <Col sm={10}>
+            <Input type="email" name="email" id="exampleEmail" placeholder="with a placeholder" />
+          </Col>
+        </FormGroup>
+        <FormGroup row>
+          <Label for="examplePassword" sm={2}>Password</Label>
+          <Col sm={10}>
+            <Input type="password" name="password" id="examplePassword" placeholder="password placeholder" />
+          </Col>
+        </FormGroup>
+        <FormGroup row>
+          <Label for="exampleSelect" sm={2}>Select</Label>
+          <Col sm={10}>
+            <Input type="select" name="select" id="exampleSelect" />
+          </Col>
+        </FormGroup>
+        <FormGroup row>
+          <Label for="exampleSelectMulti" sm={2}>Select Multiple</Label>
+          <Col sm={10}>
+            <Input type="select" name="selectMulti" id="exampleSelectMulti" multiple />
+          </Col>
+        </FormGroup>
+        <FormGroup row>
+          <Label for="exampleText" sm={2}>Text Area</Label>
+          <Col sm={10}>
+            <Input type="textarea" name="text" id="exampleText" />
+          </Col>
+        </FormGroup>
+        <FormGroup row>
+          <Label for="exampleFile" sm={2}>File</Label>
+          <Col sm={10}>
+            <Input type="file" name="file" id="exampleFile" />
+            <FormText color="muted">
+              This is some placeholder block-level help text for the above input.
+              It's a bit lighter and easily wraps to a new line.
+            </FormText>
+          </Col>
+        </FormGroup>
+        <FormGroup tag="fieldset" row>
+          <legend className="col-form-legend col-sm-2">Radio Buttons</legend>
+          <Col sm={10}>
+            <FormGroup check>
+              <Label check>
+                <Input type="radio" name="radio2" />{' '}
+                Option one is this and that—be sure to include why it's great
+              </Label>
+            </FormGroup>
+            <FormGroup check>
+              <Label check>
+                <Input type="radio" name="radio2" />{' '}
+                Option two can be something else and selecting it will deselect option one
+              </Label>
+            </FormGroup>
+            <FormGroup check disabled>
+              <Label check>
+                <Input type="radio" name="radio2" disabled />{' '}
+                Option three is disabled
+              </Label>
+            </FormGroup>
+          </Col>
+        </FormGroup>
+        <FormGroup row>
+          <Label for="checkbox2" sm={2}>Checkbox</Label>
+          <Col sm={{ size: 10 }}>
+            <FormGroup check>
+              <Label check>
+                <Input type="checkbox" id="checkbox2" />{' '}
+                Check me out
+              </Label>
+            </FormGroup>
+          </Col>
+        </FormGroup>
+        <FormGroup check row>
+          <Col sm={{ size: 10, offset: 2 }}>
+            <Button>Submit</Button>
+          </Col>
+        </FormGroup>
+      </Form>
+    );
+  }
+}
+
+class Example47 extends React.Component {
+  render() {
+    return (
+      <Form inline>
+        <FormGroup>
+          <Label for="exampleEmail">Email</Label>{' '}
+          <Input type="email" name="email" id="exampleEmail" placeholder="something@idk.cool" />
+        </FormGroup>
+        {' '}
+        <FormGroup>
+          <Label for="examplePassword">Password</Label>{' '}
+          <Input type="password" name="password" id="examplePassword" placeholder="don't tell!" />
+        </FormGroup>
+        {' '}
+        <Button>Submit</Button>
+      </Form>
+    );
+  }
+}
+
+class Example48 extends React.Component {
+  render() {
+    return (
+      <Form>
+        <FormGroup color="success">
+          <Label for="exampleEmail">Input with success</Label>
+          <Input state="success" />
+          <FormFeedback>Success! You did it!</FormFeedback>
+          <FormText color="muted">Example help text that remains unchanged.</FormText>
+        </FormGroup>
+        <FormGroup color="warning">
+          <Label for="examplePassword">Input with warning</Label>
+          <Input state="warning" />
+          <FormFeedback>Whoops, check your formatting and try again.</FormFeedback>
+          <FormText color="muted">Example help text that remains unchanged.</FormText>
+        </FormGroup>
+        <FormGroup color="danger">
+          <Label for="examplePassword">Input with danger</Label>
+          <Input state="danger" />
+          <FormFeedback>Oh noes! that name is already taken</FormFeedback>
+          <FormText color="muted">Example help text that remains unchanged.</FormText>
+        </FormGroup>
+      </Form>
+    );
+  }
+}
+
+class Example49 extends React.Component {
+  render() {
+    return (
+      <Form>
+        <FormGroup>
+          <Label for="exampleEmail">Static</Label>
+          <Input>Some static value</Input>
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleEmail">Email</Label>
+          <Input type="email" name="email" id="exampleEmail" placeholder="with a placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="examplePassword">Password</Label>
+          <Input type="password" name="password" id="examplePassword" placeholder="password placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleUrl">Url</Label>
+          <Input type="url" name="url" id="exampleUrl" placeholder="url placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleNumber">Number</Label>
+          <Input type="number" name="number" id="exampleNumber" placeholder="number placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleDatetime">Datetime</Label>
+          <Input type="datetime" name="datetime" id="exampleDatetime" placeholder="datetime placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleDate">Date</Label>
+          <Input type="date" name="date" id="exampleDate" placeholder="date placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleTime">Time</Label>
+          <Input type="time" name="time" id="exampleTime" placeholder="time placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleColor">Color</Label>
+          <Input type="color" name="color" id="exampleColor" placeholder="color placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleSearch">Search</Label>
+          <Input type="search" name="search" id="exampleSearch" placeholder="search placeholder" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleSelect">Select</Label>
+          <Input type="select" name="select" id="exampleSelect">
+            <option>1</option>
+            <option>2</option>
+            <option>3</option>
+            <option>4</option>
+            <option>5</option>
+          </Input>
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleSelectMulti">Select Multiple</Label>
+          <Input type="select" name="selectMulti" id="exampleSelectMulti" multiple>
+            <option>1</option>
+            <option>2</option>
+            <option>3</option>
+            <option>4</option>
+            <option>5</option>
+          </Input>
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleText">Text Area</Label>
+          <Input type="textarea" name="text" id="exampleText" />
+        </FormGroup>
+        <FormGroup>
+          <Label for="exampleFile">File</Label>
+          <Input type="file" name="file" id="exampleFile" />
+          <FormText color="muted">
+            This is some placeholder block-level help text for the above input.
+            It's a bit lighter and easily wraps to a new line.
+          </FormText>
+        </FormGroup>
+        <FormGroup check>
+          <Label check>
+            <Input type="radio" />{' '}
+            Option one is this and that—be sure to include why it's great
+          </Label>
+        </FormGroup>
+        <FormGroup check>
+          <Label check>
+            <Input type="checkbox" />{' '}
+            Check me out
+          </Label>
+        </FormGroup>
+      </Form>
+    );
+  }
+}
+
+class Example50 extends React.Component {
+  render() {
+    return (
+      <Form>
+        <Input placeholder="lg" size="lg" />
+        <Input placeholder="default" />
+        <Input placeholder="sm" size="sm" />
+        <Input type="select" size="lg">
+          <option>Large Select</option>
+        </Input>
+        <Input type="select">
+          <option>Default Select</option>
+        </Input>
+        <Input type="select" size="sm">
+          <option>Small Select</option>
+        </Input>
+      </Form>
+    );
+  }
+}
+
+class Example51 extends React.Component {
+  render() {
+    return (
+      <Form inline>
+        <FormGroup>
+          <Label for="exampleEmail" hidden>Email</Label>
+          <Input type="email" name="email" id="exampleEmail" placeholder="Email" />
+        </FormGroup>
+        {' '}
+        <FormGroup>
+          <Label for="examplePassword" hidden>Password</Label>
+          <Input type="password" name="password" id="examplePassword" placeholder="Password" />
+        </FormGroup>
+        {' '}
+        <Button>Submit</Button>
+      </Form>
+    );
+  }
+}
+
+const Example52 = (props: any) => {
+  return (
+    <div>
+      <InputGroup>
+        <InputGroupAddon>@</InputGroupAddon>
+        <Input placeholder="username" />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupAddon>
+          <Input addon type="checkbox" aria-label="Checkbox for following text input" />
+        </InputGroupAddon>
+        <Input placeholder="Check it out" />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <Input placeholder="username" />
+        <InputGroupAddon>@example.com</InputGroupAddon>
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupAddon>$</InputGroupAddon>
+        <InputGroupAddon>$</InputGroupAddon>
+        <Input placeholder="Dolla dolla billz yo!" />
+        <InputGroupAddon>$</InputGroupAddon>
+        <InputGroupAddon>$</InputGroupAddon>
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupAddon>$</InputGroupAddon>
+        <Input placeholder="Amount" type="number" step="1" />
+        <InputGroupAddon>.00</InputGroupAddon>
+      </InputGroup>
+    </div>
+  );
+};
+
+const Example53 = (props: any) => {
+  return (
+    <div>
+      <InputGroup>
+        <InputGroupAddon>To the Left!</InputGroupAddon>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <Input />
+        <InputGroupAddon>To the Right!</InputGroupAddon>
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupAddon>To the Left!</InputGroupAddon>
+        <Input placeholder="and..." />
+        <InputGroupAddon>To the Right!</InputGroupAddon>
+      </InputGroup>
+    </div>
+  );
+};
+
+const Example54 = (props: any) => {
+  return (
+    <div>
+      <InputGroup size="lg">
+        <InputGroupAddon>@lg</InputGroupAddon>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupAddon>@normal</InputGroupAddon>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup size="sm">
+        <InputGroupAddon>@sm</InputGroupAddon>
+        <Input />
+      </InputGroup>
+    </div>
+  );
+};
+
+const Example55 = (props: any) => {
+  return (
+    <div>
+      <InputGroup>
+        <InputGroupButton><Button>I'm a button</Button></InputGroupButton>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <Input />
+        <InputGroupButton></InputGroupButton>
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupButton></InputGroupButton>
+        <Input placeholder="and..." />
+        <InputGroupButton><Button color="secondary">I'm a button</Button></InputGroupButton>
+      </InputGroup>
+    </div>
+  );
+};
+
+const Example56 = (props: any) => {
+  return (
+    <div>
+      <InputGroup size="lg">
+        <InputGroupAddon>@lg</InputGroupAddon>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupAddon>@normal</InputGroupAddon>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup size="sm">
+        <InputGroupAddon>@sm</InputGroupAddon>
+        <Input />
+      </InputGroup>
+    </div>
+  );
+};
+
+const Example57 = (props: any) => {
+  return (
+    <div>
+      <InputGroup>
+        <InputGroupButton><Button>I'm a button</Button></InputGroupButton>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <Input />
+        <InputGroupButton></InputGroupButton>
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupButton></InputGroupButton>
+        <Input placeholder="and..." />
+        <InputGroupButton><Button color="secondary">I'm a button</Button></InputGroupButton>
+      </InputGroup>
+    </div>
+  );
+};
+
+const Example58 = (props: any) => {
+  return (
+    <div>
+      <InputGroup>
+        <InputGroupButton>To the Left!</InputGroupButton>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <Input />
+        <InputGroupButton color="secondary">To the Right!</InputGroupButton>
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupButton color="danger">To the Left!</InputGroupButton>
+        <Input placeholder="and..." />
+        <InputGroupButton color="success">To the Right!</InputGroupButton>
+      </InputGroup>
+    </div>
+  );
+};
+
+const Example59 = (props: any) => {
+  return (
+    <div>
+      <Jumbotron>
+        <h1 className="display-3">Hello, world!</h1>
+        <p className="lead">This is a simple hero unit, a simple Jumbotron-style component for calling extra attention to featured content or information.</p>
+        <hr className="my-2" />
+        <p>It uses utility classes for typgraphy and spacing to space content out within the larger container.</p>
+        <p className="lead">
+          <Button color="primary">Learn More</Button>
+        </p>
+      </Jumbotron>
+    </div>
+  );
+};
+
+const Example60 = (props: any) => {
+  return (
+    <div>
+      <Jumbotron fluid>
+        <Container fluid>
+          <h1 className="display-3">Fluid jumbotron</h1>
+          <p className="lead">This is a modified jumbotron that occupies the entire horizontal space of its parent.</p>
+        </Container>
+      </Jumbotron>
+    </div>
+  );
+};
+
+class Example61 extends React.Component {
+  render() {
+    return (
+      <Container>
+        <Row>
+          <Col>.col</Col>
+        </Row>
+        <Row>
+          <Col>.col</Col>
+          <Col>.col</Col>
+          <Col>.col</Col>
+          <Col>.col</Col>
+        </Row>
+        <Row>
+          <Col xs="3">.col-3</Col>
+          <Col xs="auto">.col-auto - variable width content</Col>
+          <Col xs="3">.col-3</Col>
+        </Row>
+        <Row>
+          <Col xs="6">.col-6</Col>
+          <Col xs="6">.col-6</Col>
+        </Row>
+        <Row>
+          <Col xs="6" sm="4">.col-6 .col-sm-4</Col>
+          <Col xs="6" sm="4">.col-6 .col-sm-4</Col>
+          <Col sm="4">.col .col-sm-4</Col>
+        </Row>
+        <Row>
+          <Col sm={{ size: 6, push: 2, pull: 2, offset: 1 }}>.col .col-sm-6 .col-sm-push-2 .col-sm-pull-2 .col-sm-offset-2</Col>
+        </Row>
+        <Row>
+          <Col sm="12" md={{ size: 8, offset: 2 }}>.col .col-sm-12 .col-md-6 .col-md-offset-3</Col>
+        </Row>
+        <Row>
+          <Col sm={{ size: 'auto', offset: 1 }}>.col .col-sm .col-sm-offset-1</Col>
+          <Col sm={{ size: 'auto', offset: 1 }}>.col .col-sm .col-sm-offset-1</Col>
+        </Row>
+      </Container>
+    );
+  }
+}
+
+class Example62 extends React.Component {
+  render() {
+    return (
+      <ListGroup>
+        <ListGroupItem>Cras justo odio</ListGroupItem>
+        <ListGroupItem>Dapibus ac facilisis in</ListGroupItem>
+        <ListGroupItem>Morbi leo risus</ListGroupItem>
+        <ListGroupItem>Porta ac consectetur ac</ListGroupItem>
+        <ListGroupItem>Vestibulum at eros</ListGroupItem>
+      </ListGroup>
+    );
+  }
+}
+
+class Example63 extends React.Component {
+  render() {
+    return (
+      <ListGroup>
+        <ListGroupItem className="justify-content-between">Cras justo odio <Badge pill>14</Badge></ListGroupItem>
+        <ListGroupItem className="justify-content-between">Dapibus ac facilisis in <Badge pill>2</Badge></ListGroupItem>
+        <ListGroupItem className="justify-content-between">Morbi leo risus <Badge pill>1</Badge></ListGroupItem>
+      </ListGroup>
+    );
+  }
+}
+
+class Example64 extends React.Component {
+  render() {
+    return (
+      <ListGroup>
+        <ListGroupItem disabled tag="a" href="#">Cras justo odio</ListGroupItem>
+        <ListGroupItem tag="a" href="#">Dapibus ac facilisis in</ListGroupItem>
+        <ListGroupItem tag="a" href="#">Morbi leo risus</ListGroupItem>
+        <ListGroupItem tag="a" href="#">Porta ac consectetur ac</ListGroupItem>
+        <ListGroupItem tag="a" href="#">Vestibulum at eros</ListGroupItem>
+      </ListGroup>
+    );
+  }
+}
+
+class Example65 extends React.Component {
+  render() {
+    return (
+      <div>
+        <h3>Anchors </h3>
+        <p>Be sure to <strong>not use the standard <code>.btn</code> classes here</strong>.</p>
+        <ListGroup>
+          <ListGroupItem active tag="a" href="#" action>Cras justo odio</ListGroupItem>
+          <ListGroupItem tag="a" href="#" action>Dapibus ac facilisis in</ListGroupItem>
+          <ListGroupItem tag="a" href="#" action>Morbi leo risus</ListGroupItem>
+          <ListGroupItem tag="a" href="#" action>Porta ac consectetur ac</ListGroupItem>
+          <ListGroupItem disabled tag="a" href="#" action>Vestibulum at eros</ListGroupItem>
+        </ListGroup>
+        <p />
+        <h3>Buttons </h3>
+        <ListGroup>
+          <ListGroupItem active tag="button" action>Cras justo odio</ListGroupItem>
+          <ListGroupItem tag="button" action>Dapibus ac facilisis in</ListGroupItem>
+          <ListGroupItem tag="button" action>Morbi leo risus</ListGroupItem>
+          <ListGroupItem tag="button" action>Porta ac consectetur ac</ListGroupItem>
+          <ListGroupItem disabled tag="button" action>Vestibulum at eros</ListGroupItem>
+        </ListGroup>
+      </div>
+    );
+  }
+}
+
+class Example66 extends React.Component {
+  render() {
+    return (
+      <ListGroup>
+        <ListGroupItem color="success">Cras justo odio</ListGroupItem>
+        <ListGroupItem color="info">Dapibus ac facilisis in</ListGroupItem>
+        <ListGroupItem color="warning">Morbi leo risus</ListGroupItem>
+        <ListGroupItem color="danger">Porta ac consectetur ac</ListGroupItem>
+      </ListGroup>
+    );
+  }
+}
+
+class Example67 extends React.Component {
+  render() {
+    return (
+      <ListGroup>
+        <ListGroupItem active>
+          <ListGroupItemHeading>List group item heading</ListGroupItemHeading>
+          <ListGroupItemText>
+            Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
+          </ListGroupItemText>
+        </ListGroupItem>
+        <ListGroupItem>
+          <ListGroupItemHeading>List group item heading</ListGroupItemHeading>
+          <ListGroupItemText>
+            Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
+          </ListGroupItemText>
+        </ListGroupItem>
+        <ListGroupItem>
+          <ListGroupItemHeading>List group item heading</ListGroupItemHeading>
+          <ListGroupItemText>
+            Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
+          </ListGroupItemText>
+        </ListGroupItem>
+      </ListGroup>
+    );
+  }
+}
+
+// ------------- Media
+const Example68 = () => {
+  return (
+    <Media>
+      <Media left href="#">
+        <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+      </Media>
+      <Media body>
+        <Media heading>
+          Media heading
+        </Media>
+        Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus
+        odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla.
+        Donec lacinia congue felis in faucibus.
+      </Media>
+    </Media>
+  );
+};
+
+const Example69 = () => {
+  return (
+    <Media>
+      <Media left href="#">
+        <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+      </Media>
+      <Media body>
+        <Media heading>
+          Media heading
+        </Media>
+        Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus
+        odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla.
+        Donec lacinia congue felis in faucibus.
+        <Media>
+          <Media left href="#">
+            <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+          </Media>
+          <Media body>
+            <Media heading>
+              Nested media heading
+            </Media>
+            Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras
+            purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate
+            fringilla. Donec lacinia congue felis in faucibus.
+          </Media>
+        </Media>
+      </Media>
+    </Media>
+  );
+};
+
+const Example70 = () => {
+  return (
+    <div>
+      <Media>
+        <Media left top href="#">
+          <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+        </Media>
+        <Media body>
+          <Media heading>
+            Top aligned media
+          </Media>
+          Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras
+          purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate
+          fringilla. Donec lacinia congue felis in faucibus.
+        </Media>
+      </Media>
+      <Media className="mt-1">
+        <Media left middle href="#">
+          <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+        </Media>
+        <Media body>
+          <Media heading>
+            Middle aligned media
+          </Media>
+          Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras
+          purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate
+          fringilla. Donec lacinia congue felis in faucibus.
+        </Media>
+      </Media>
+      <Media className="mt-1">
+        <Media left bottom href="#">
+          <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+        </Media>
+        <Media body>
+          <Media heading>
+            Bottom aligned media
+          </Media>
+          Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras
+          purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate
+          fringilla. Donec lacinia congue felis in faucibus.
+        </Media>
+      </Media>
+    </div>
+  );
+};
+
+const Example71 = () => {
+  return (
+    <Media list>
+      <Media tag="li">
+        <Media left href="#">
+          <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+        </Media>
+        <Media body>
+          <Media heading>
+            Media heading
+          </Media>
+          Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras
+          purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate
+          fringilla. Donec lacinia congue felis in faucibus.
+          <Media>
+            <Media left href="#">
+              <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+            </Media>
+            <Media body>
+              <Media heading>
+                Nested media heading
+              </Media>
+              Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo.
+              Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi
+              vulputate fringilla. Donec lacinia congue felis in faucibus.
+              <Media>
+                <Media left href="#">
+                  <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+                </Media>
+                <Media body>
+                  <Media heading>
+                    Nested media heading
+                  </Media>
+                  Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo.
+                  Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi
+                  vulputate fringilla. Donec lacinia congue felis in faucibus.
+                </Media>
+              </Media>
+            </Media>
+          </Media>
+          <Media>
+            <Media left href="#">
+              <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+            </Media>
+            <Media body>
+              <Media heading>
+                Nested media heading
+              </Media>
+              Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras
+              purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate
+              fringilla. Donec lacinia congue felis in faucibus.
+            </Media>
+          </Media>
+        </Media>
+      </Media>
+      <Media tag="li">
+        <Media body>
+          <Media heading>
+            Media heading
+          </Media>
+          Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras
+          purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate
+          fringilla. Donec lacinia congue felis in faucibus.
+        </Media>
+        <Media right href="#">
+          <Media object data-src="holder.js/64x64" alt="Generic placeholder image" />
+        </Media>
+      </Media>
+    </Media>
+  );
+};
+
+// --------------- Modal
+class ModalExample72 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+    this.state = {
+      modal: false
+    };
+
+    this.toggle = this.toggle.bind(this);
+  }
+
+  toggle() {
+    this.setState({
+      modal: !this.state.modal
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <Button color="danger" onClick={this.toggle}>{this.props.buttonLabel}</Button>
+        <Modal isOpen={this.state.modal} toggle={this.toggle} className={this.props.className}>
+          <ModalHeader toggle={this.toggle}>Modal title</ModalHeader>
+          <ModalBody>
+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex
+            ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat
+            nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
+            anim id est laborum.
+          </ModalBody>
+          <ModalFooter>
+            <Button color="primary" onClick={this.toggle}>Do Something</Button>{' '}
+            <Button color="secondary" onClick={this.toggle}>Cancel</Button>
+          </ModalFooter>
+        </Modal>
+      </div>
+    );
+  }
+}
+
+class ModalExample73 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+    this.state = {
+      modal: false,
+      backdrop: true
+    };
+
+    this.toggle = this.toggle.bind(this);
+    this.changeBackdrop = this.changeBackdrop.bind(this);
+  }
+
+  toggle() {
+    this.setState({
+      modal: !this.state.modal
+    });
+  }
+
+  changeBackdrop(e: React.ChangeEvent<HTMLInputElement>) {
+    let value = e.target.value;
+    if (value !== 'static') {
+      value = JSON.parse(value);
+    }
+    this.setState({ backdrop: value });
+  }
+
+  render() {
+    return (
+      <div>
+        <Form inline onSubmit={(e) => e.preventDefault()}>
+          <FormGroup>
+            <Label for="backdrop">Backdrop value</Label>{' '}
+            <Input type="select" name="backdrop" id="backdrop" onChange={this.changeBackdrop}>
+              <option value="true">true</option>
+              <option value="false">false</option>
+              <option value="static">"static"</option>
+            </Input>
+          </FormGroup>
+          {' '}
+          <Button color="danger" onClick={this.toggle}>{this.props.buttonLabel}</Button>
+        </Form>
+        <Modal isOpen={this.state.modal} toggle={this.toggle} className={this.props.className} backdrop={this.state.backdrop}>
+          <ModalHeader toggle={this.toggle}>Modal title</ModalHeader>
+          <ModalBody>
+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+          </ModalBody>
+          <ModalFooter>
+            <Button color="primary" onClick={this.toggle}>Do Something</Button>{' '}
+            <Button color="secondary" onClick={this.toggle}>Cancel</Button>
+          </ModalFooter>
+        </Modal>
+      </div>
+    );
+  }
+}
+
+class ModalExample74 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+    this.state = {
+      modal: false,
+      nestedModal: false,
+    };
+
+    this.toggle = this.toggle.bind(this);
+    this.toggleNested = this.toggleNested.bind(this);
+  }
+
+  toggle() {
+    this.setState({
+      modal: !this.state.modal
+    });
+  }
+
+  toggleNested() {
+    this.setState({
+      nestedModal: !this.state.nestedModal
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <Button color="danger" onClick={this.toggle}>{this.props.buttonLabel}</Button>
+        <Modal isOpen={this.state.modal} toggle={this.toggle} className={this.props.className}>
+          <ModalHeader toggle={this.toggle}>Modal title</ModalHeader>
+          <ModalBody>
+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex
+            ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            <br />
+            <Button color="success" onClick={this.toggleNested}>Show Nested Model</Button>
+            <Modal isOpen={this.state.nestedModal} toggle={this.toggleNested}>
+              <ModalHeader>Nested Modal title</ModalHeader>
+              <ModalBody>Stuff and things</ModalBody>
+              <ModalFooter>
+                <Button color="primary" onClick={this.toggleNested}>Done</Button>{' '}
+                <Button color="secondary" onClick={this.toggle}>All Done</Button>
+              </ModalFooter>
+            </Modal>
+          </ModalBody>
+          <ModalFooter>
+            <Button color="primary" onClick={this.toggle}>Do Something</Button>{' '}
+            <Button color="secondary" onClick={this.toggle}>Cancel</Button>
+          </ModalFooter>
+        </Modal>
+      </div>
+    );
+  }
+}
+
+class Example75 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+  toggle() {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+  render() {
+    return (
+      <div>
+        <Navbar color="faded" light toggleable>
+          <NavbarToggler right onClick={this.toggle} />
+          <NavbarBrand href="/">reactstrap</NavbarBrand>
+          <Collapse isOpen={this.state.isOpen} navbar>
+            <Nav className="ml-auto" navbar>
+              <NavItem>
+                <NavLink href="/components/">Components</NavLink>
+              </NavItem>
+              <NavItem>
+                <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
+              </NavItem>
+            </Nav>
+          </Collapse>
+        </Navbar>
+      </div>
+    );
+  }
+}
+
+class Example76 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggleNavbar = this.toggleNavbar.bind(this);
+    this.state = {
+      collapsed: true
+    };
+  }
+
+  toggleNavbar() {
+    this.setState({
+      collapsed: !this.state.collapsed
+    });
+  }
+  render() {
+    return (
+      <div>
+        <Navbar color="faded" light>
+          <NavbarToggler onClick={this.toggleNavbar} />
+          <Collapse className="navbar-toggleable-md" isOpen={!this.state.collapsed}>
+            <NavbarBrand href="/">reactstrap</NavbarBrand>
+            <Nav navbar>
+              <NavItem>
+                <NavLink href="/components/">Components</NavLink>
+              </NavItem>
+              <NavItem>
+                <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
+              </NavItem>
+            </Nav>
+          </Collapse>
+        </Navbar>
+      </div>
+    );
+  }
+}
+
+class Example77 extends React.Component {
+  render() {
+    return (
+      <div>
+        <p>List Based</p>
+        <Nav>
+          <NavItem>
+            <NavLink href="#">Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink href="#">Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink href="#">Another Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink disabled href="#">Disabled Link</NavLink>
+          </NavItem>
+        </Nav>
+        <hr />
+        <p>Link Based</p>
+        <Nav>
+          <NavLink href="#">Link</NavLink> <NavLink href="#">Link</NavLink> <NavLink href="#">Another Link</NavLink> <NavLink disabled href="#">Disabled Link</NavLink>
+        </Nav>
+      </div>
+    );
+  }
+}
+
+class Example78 extends React.Component<any, any> {
+  render() {
+    return (
+      <div>
+        <p>List Based</p>
+        <Nav inline>
+          <NavItem>
+            <NavLink href="#">Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink href="#">Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink href="#">Another Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink disabled href="#">Disabled Link</NavLink>
+          </NavItem>
+        </Nav>
+        <hr />
+        <p>Link based</p>
+        <Nav inline>
+          <NavLink href="#">Link</NavLink> <NavLink href="#">Link</NavLink> <NavLink href="#">Another Link</NavLink> <NavLink disabled href="#">Disabled Link</NavLink>
+        </Nav>
+      </div>
+    );
+  }
+}
+
+class Example79 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      dropdownOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      dropdownOpen: !this.state.dropdownOpen
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <Nav tabs>
+          <NavItem>
+            <NavLink href="#" active>Link</NavLink>
+          </NavItem>
+          <NavDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
+            <DropdownToggle nav caret>
+              Dropdown
+            </DropdownToggle>
+            <DropdownMenu>
+              <DropdownItem header>Header</DropdownItem>
+              <DropdownItem disabled>Action</DropdownItem>
+              <DropdownItem>Another Action</DropdownItem>
+              <DropdownItem divider />
+              <DropdownItem>Another Action</DropdownItem>
+            </DropdownMenu>
+          </NavDropdown>
+          <NavItem>
+            <NavLink href="#">Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink href="#">Another Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink disabled href="#">Disabled Link</NavLink>
+          </NavItem>
+        </Nav>
+      </div>
+    );
+  }
+}
+
+class Example80 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      dropdownOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      dropdownOpen: !this.state.dropdownOpen
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <Nav pills>
+          <NavItem>
+            <NavLink href="#" active>Link</NavLink>
+          </NavItem>
+          <NavDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
+            <DropdownToggle nav caret>
+              Dropdown
+            </DropdownToggle>
+            <DropdownMenu>
+              <DropdownItem header>Header</DropdownItem>
+              <DropdownItem disabled>Action</DropdownItem>
+              <DropdownItem>Another Action</DropdownItem>
+              <DropdownItem divider />
+              <DropdownItem>Another Action</DropdownItem>
+            </DropdownMenu>
+          </NavDropdown>
+          <NavItem>
+            <NavLink href="#">Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink href="#">Another Link</NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink disabled href="#">Disabled Link</NavLink>
+          </NavItem>
+        </Nav>
+      </div>
+    );
+  }
+}
+
+// ----------- Pagination
+class Example81 extends React.Component {
+  render() {
+    return (
+      <Pagination>
+        <PaginationItem>
+          <PaginationLink previous href="#" />
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            1
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            2
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            3
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            4
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            5
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink next href="#" />
+        </PaginationItem>
+      </Pagination>
+    );
+  }
+}
+
+class Example82 extends React.Component {
+  render() {
+    return (
+      <Pagination>
+        <PaginationItem disabled>
+          <PaginationLink previous href="#" />
+        </PaginationItem>
+        <PaginationItem active>
+          <PaginationLink href="#">
+            1
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            2
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            3
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            4
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            5
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink next href="#" />
+        </PaginationItem>
+      </Pagination>
+    );
+  }
+}
+
+class Example83 extends React.Component {
+  render() {
+    return (
+      <Pagination size="lg">
+        <PaginationItem>
+          <PaginationLink previous href="#" />
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            1
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            2
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            3
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink next href="#" />
+        </PaginationItem>
+      </Pagination>
+    );
+  }
+}
+
+class Example84 extends React.Component {
+  render() {
+    return (
+      <Pagination size="sm">
+        <PaginationItem>
+          <PaginationLink previous href="#" />
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            1
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            2
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink href="#">
+            3
+          </PaginationLink>
+        </PaginationItem>
+        <PaginationItem>
+          <PaginationLink next href="#" />
+        </PaginationItem>
+      </Pagination>
+    );
+  }
+}
+
+// ------------------------- Popover
+class Example85 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      popoverOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      popoverOpen: !this.state.popoverOpen
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <Button id="Popover1" onClick={this.toggle}>
+          Launch Popover
+        </Button>
+        <Popover placement="bottom" isOpen={this.state.popoverOpen} target="Popover1" toggle={this.toggle}>
+          <PopoverTitle>Popover Title</PopoverTitle>
+          <PopoverContent>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverContent>
+        </Popover>
+      </div>
+    );
+  }
+}
+
+class PopoverItem extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      popoverOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      popoverOpen: !this.state.popoverOpen
+    });
+  }
+
+  render() {
+    return (
+      <span>
+        <Button className="mr-1" color="secondary" id={'Popover-' + this.props.id} onClick={this.toggle}>
+          {this.props.item.text}
+        </Button>
+        <Popover placement={this.props.item.placement} isOpen={this.state.popoverOpen} target={'Popover-' + this.props.id} toggle={this.toggle}>
+          <PopoverTitle>Popover Title</PopoverTitle>
+          <PopoverContent>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverContent>
+        </Popover>
+      </span>
+    );
+  }
+}
+
+class PopoverExampleMulti extends React.Component<any, {popovers: Array<{placement: string; text: string; }>}> {
+  constructor(props: any) {
+    super(props);
+
+    this.state = {
+      popovers: [
+        {
+          placement: 'top',
+          text: 'Top'
+        },
+        {
+          placement: 'bottom',
+          text: 'Bottom'
+        },
+        {
+          placement: 'left',
+          text: 'Left'
+        },
+        {
+          placement: 'right',
+          text: 'Right'
+        }
+      ]
+    };
+  }
+
+  render() {
+    return (
+      <div>
+        {this.state.popovers.map((popover, i) => {
+          return <PopoverItem key={i} item={popover} id={i} />;
+        })}
+      </div>
+    );
+  }
+}
+
+// ------------------------- Progress
+
+const Example86 = (props: any) => {
+  return (
+    <div>
+      <div className="text-center">0%</div>
+      <Progress />
+      <div className="text-center">25%</div>
+      <Progress value="25" />
+      <div className="text-center">50%</div>
+      <Progress value={50} />
+      <div className="text-center">75%</div>
+      <Progress value={75} />
+      <div className="text-center">100%</div>
+      <Progress value="100" />
+      <div className="text-center">Multiple bars</div>
+      <Progress multi>
+        <Progress bar value="15" />
+        <Progress bar color="success" value="30" />
+        <Progress bar color="info" value="25" />
+        <Progress bar color="warning" value="20" />
+        <Progress bar color="danger" value="5" />
+      </Progress>
+    </div>
+  );
+};
+
+const Example87 = (props: any) => {
+  return (
+    <div>
+      <Progress value={2 * 5} />
+      <Progress color="success" value="25" />
+      <Progress color="info" value={50} />
+      <Progress color="warning" value={75} />
+      <Progress color="danger" value="100" />
+    </div>
+  );
+};
+
+const Example88 = (props: any) => {
+  return (
+    <div>
+      <Progress value="25">25%</Progress>
+      <Progress value={50}>1/2</Progress>
+      <Progress value={75}>You're almost there!</Progress>
+      <Progress color="success" value="100">You did it!</Progress>
+      <Progress multi>
+        <Progress bar value="15">Meh</Progress>
+        <Progress bar color="success" value="30">Wow!</Progress>
+        <Progress bar color="info" value="25">Cool</Progress>
+        <Progress bar color="warning" value="20">20%</Progress>
+        <Progress bar color="danger" value="5">!!</Progress>
+      </Progress>
+    </div>
+  );
+};
+
+const Example89 = (props: any) => {
+  return (
+    <div>
+      <Progress striped value={2 * 5} />
+      <Progress striped color="success" value="25" />
+      <Progress striped color="info" value={50} />
+      <Progress striped color="warning" value={75} />
+      <Progress striped color="danger" value="100" />
+      <Progress multi>
+        <Progress striped bar value="10" />
+        <Progress striped bar color="success" value="30" />
+        <Progress striped bar color="warning" value="20" />
+        <Progress striped bar color="danger" value="20" />
+      </Progress>
+    </div>
+  );
+};
+
+const Example90 = (props: any) => {
+  return (
+    <div>
+      <Progress animated value={2 * 5} />
+      <Progress animated color="success" value="25" />
+      <Progress animated color="info" value={50} />
+      <Progress animated color="warning" value={75} />
+      <Progress animated color="danger" value="100" />
+      <Progress multi>
+        <Progress animated bar value="10" />
+        <Progress animated bar color="success" value="30" />
+        <Progress animated bar color="warning" value="20" />
+        <Progress animated bar color="danger" value="20" />
+      </Progress>
+    </div>
+  );
+};
+
+const Example91 = (props: any) => {
+  return (
+    <div>
+      <div className="text-center">Plain</div>
+      <Progress multi>
+        <Progress bar value="15" />
+        <Progress bar color="success" value="20" />
+        <Progress bar color="info" value="25" />
+        <Progress bar color="warning" value="20" />
+        <Progress bar color="danger" value="15" />
+      </Progress>
+      <div className="text-center">With Labels</div>
+      <Progress multi>
+        <Progress bar value="15">Meh</Progress>
+        <Progress bar color="success" value="35">Wow!</Progress>
+        <Progress bar color="warning" value="25">25%</Progress>
+        <Progress bar color="danger" value="25">LOOK OUT!!</Progress>
+      </Progress>
+      <div className="text-center">Stripes and Animations</div>
+      <Progress multi>
+        <Progress bar striped value="15">Stripes</Progress>
+        <Progress bar animated color="success" value="30">Animated Stripes</Progress>
+        <Progress bar color="info" value="25">Plain</Progress>
+      </Progress>
+    </div>
+  );
+};
+
+const Example92 = (props: any) => {
+  return (
+    <div>
+      <div className="text-center">1 of 5</div>
+      <Progress value="1" max="5" />
+      <div className="text-center">50 of 135</div>
+      <Progress value={50} max="135" />
+      <div className="text-center">75 of 111</div>
+      <Progress value={75} max={111} />
+      <div className="text-center">463 of 500</div>
+      <Progress value="463" max={500} />
+
+      <div className="text-center">Various (40) of 55</div>
+      <Progress multi>
+        <Progress bar value="5" max={55}>5</Progress>
+        <Progress bar color="success" value="15" max={55}>15</Progress>
+        <Progress bar color="warning" value="10" max={55}>10</Progress>
+        <Progress bar color="danger" value="10" max={55}>10</Progress>
+      </Progress>
+    </div>
+  );
+};
+
+// --------------- Table
+class Example93 extends React.Component {
+  render() {
+    return (
+      <Table>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Username</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>@mdo</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Jacob</td>
+            <td>Thornton</td>
+            <td>@fat</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Larry</td>
+            <td>the Bird</td>
+            <td>@twitter</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example94 extends React.Component {
+  render() {
+    return (
+      <Table inverse>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Username</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>@mdo</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Jacob</td>
+            <td>Thornton</td>
+            <td>@fat</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Larry</td>
+            <td>the Bird</td>
+            <td>@twitter</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example95 extends React.Component {
+  render() {
+    return (
+      <Table striped>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Username</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>@mdo</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Jacob</td>
+            <td>Thornton</td>
+            <td>@fat</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Larry</td>
+            <td>the Bird</td>
+            <td>@twitter</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example96 extends React.Component {
+  render() {
+    return (
+      <Table bordered>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Username</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>@mdo</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Jacob</td>
+            <td>Thornton</td>
+            <td>@fat</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Larry</td>
+            <td>the Bird</td>
+            <td>@twitter</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example97 extends React.Component {
+  render() {
+    return (
+      <Table hover>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Username</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>@mdo</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Jacob</td>
+            <td>Thornton</td>
+            <td>@fat</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Larry</td>
+            <td>the Bird</td>
+            <td>@twitter</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example98 extends React.Component {
+  render() {
+    return (
+      <Table size="sm">
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Username</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>@mdo</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Jacob</td>
+            <td>Thornton</td>
+            <td>@fat</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Larry</td>
+            <td>the Bird</td>
+            <td>@twitter</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example99 extends React.Component {
+  render() {
+    return (
+      <Table responsive>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example100 extends React.Component {
+  render() {
+    return (
+      <Table responsive>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+            <th>Table heading</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th scope="row">1</th>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+          </tr>
+          <tr>
+            <th scope="row">2</th>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+          </tr>
+          <tr>
+            <th scope="row">3</th>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+            <td>Table cell</td>
+          </tr>
+        </tbody>
+      </Table>
+    );
+  }
+}
+
+class Example101 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      activeTab: '1'
+    };
+  }
+
+  toggle(tab: string) {
+    if (this.state.activeTab !== tab) {
+      this.setState({
+        activeTab: tab
+      });
+    }
+  }
+  render() {
+    return (
+      <div>
+        <Nav tabs>
+          <NavItem>
+            <NavLink
+              className=""
+              onClick={() => { this.toggle('1'); }}
+            >
+              Tab1
+            </NavLink>
+          </NavItem>
+          <NavItem>
+            <NavLink
+              className=""
+              onClick={() => { this.toggle('2'); }}
+            >
+              Moar Tabs
+            </NavLink>
+          </NavItem>
+        </Nav>
+        <TabContent activeTab={this.state.activeTab}>
+          <TabPane tabId="1">
+            <Row>
+              <Col sm="12">
+                <h4>Tab 1 Contents</h4>
+              </Col>
+            </Row>
+          </TabPane>
+          <TabPane tabId="2">
+            <Row>
+              <Col sm="6">
+                <Card block>
+                  <CardTitle>Special Title Treatment</CardTitle>
+                  <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+                  <Button>Go somewhere</Button>
+                </Card>
+              </Col>
+              <Col sm="6">
+                <Card block>
+                  <CardTitle>Special Title Treatment</CardTitle>
+                  <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
+                  <Button>Go somewhere</Button>
+                </Card>
+              </Col>
+            </Row>
+          </TabPane>
+        </TabContent>
+      </div>
+    );
+  }
+}
+
+class Example102 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      tooltipOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      tooltipOpen: !this.state.tooltipOpen
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <p>Somewhere in here is a <a href="#" id="TooltipExample">tooltip</a>.</p>
+        <Tooltip placement="right" isOpen={this.state.tooltipOpen} target="TooltipExample" toggle={this.toggle}>
+          Hello world!
+        </Tooltip>
+      </div>
+    );
+  }
+}
+
+class Example103 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      tooltipOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      tooltipOpen: !this.state.tooltipOpen
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <p>Sometimes you need to allow users to select text within a <a href="#" id="DisabledAutoHideExample">tooltip</a>.</p>
+        <Tooltip placement="top" isOpen={this.state.tooltipOpen} autohide={false} target="DisabledAutoHideExample" toggle={this.toggle}>
+          Try to select this text!
+        </Tooltip>
+      </div>
+    );
+  }
+}
+
+class TooltipItem extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      tooltipOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      tooltipOpen: !this.state.tooltipOpen
+    });
+  }
+
+  render() {
+    return (
+      <span>
+        <Button className="mr-1" color="secondary" id={'Tooltip-' + this.props.id}>
+          {this.props.item.text}
+        </Button>
+        <Tooltip placement={this.props.item.placement} isOpen={this.state.tooltipOpen} target={'Tooltip-' + this.props.id} toggle={this.toggle}>
+          Tooltip Content!
+        </Tooltip>
+      </span>
+    );
+  }
+}
+
+class TooltipExampleMulti extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.state = {
+      tooltips: [
+        {
+          placement: 'top',
+          text: 'Top'
+        },
+        {
+          placement: 'bottom',
+          text: 'Bottom'
+        },
+        {
+          placement: 'left',
+          text: 'Left'
+        },
+        {
+          placement: 'right',
+          text: 'Right'
+        }
+      ]
+    };
+  }
+
+  render() {
+    return (
+      <div>
+        {this.state.tooltips.map((tooltip: {placement: string; text: string; }, i: number) => {
+          return <TooltipItem key={i} item={tooltip} id={i} />;
+        })}
+      </div>
+    );
+  }
+}
+
+function Example() {
+  return (
+    <div>
+      <p>Somewhere in here is a <a href="#" id="UncontrolledTooltipExample">tooltip</a>.</p>
+      <UncontrolledTooltip placement="right" target="UncontrolledTooltipExample">
+        Hello world!
+      </UncontrolledTooltip>
+    </div>
+  );
+}
+
+function Example104() {
+  const props = {
+    className: 'my-input',
+    style: {
+      borderColor: 'black',
+    }
+  };
+
+  return (
+    <FormGroup
+      className="some-class"
+      aria-labelledby="label"
+    >
+      <Label sm={3} id="label">
+        Label
+      </Label>
+
+      <Col className="col-12" sm={9}>
+        <Input type="text" size="lg" {...props} />
+      </Col>
+    </FormGroup>
+  );
+}
+
+function Example105() {
+  return (
+    <Dropdown
+      className="main-nav-avatar"
+      isOpen={true}
+      aria-labelledby="menu"
+    >
+      <a
+        href="javascript:void(0)"
+        id="menu"
+        data-toggle="dropdown"
+        aria-haspopup="true"
+        aria-expanded="false"
+      >
+        Toggle
+      </a>
+
+      <DropdownMenu right className="asdf">
+        <div className="d-block">
+          Item
+        </div>
+      </DropdownMenu>
+    </Dropdown>
+  );
+}
+
+function Example106() {
+  return (
+    <Nav vertical>
+      <NavLink
+        className="toggle-drawer"
+        href="#"
+      >
+        Details
+      </NavLink>
+    </Nav>
+  );
+}
+
+const CSSModuleExample = (props: any) => {
+  const cssModule = {
+    btn: 'hash'
+  };
+
+  return (
+    <Button color="secondary" cssModule={cssModule}>Button</Button>
+  );
+};
+
+class Example107 extends React.Component {
+  private input: HTMLInputElement;
+
+  render() {
+    return <Input type="file" getRef={(input) => { this.input = input; }} />;
+  }
+}
+
+class Example108 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+  toggle() {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+  render() {
+    return (
+      <div>
+        <Navbar color="faded" dark toggleable>
+          <NavbarToggler right onClick={this.toggle} />
+          <NavbarBrand href="/">reactstrap</NavbarBrand>
+          <Collapse isOpen={this.state.isOpen} navbar>
+            <Nav className="ml-auto" navbar>
+              <NavItem>
+                <NavLink href="/components/">Components</NavLink>
+              </NavItem>
+              <NavItem>
+                <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
+              </NavItem>
+            </Nav>
+          </Collapse>
+        </Navbar>
+      </div>
+    );
+  }
+}
+
+class Example109 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+  toggle() {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+  render() {
+    return (
+      <div>
+        <Navbar color="faded" light expand>
+          <NavbarToggler right onClick={this.toggle} />
+          <NavbarBrand href="/">reactstrap</NavbarBrand>
+          <Collapse isOpen={this.state.isOpen} navbar>
+            <Nav className="ml-auto" navbar>
+              <NavItem>
+                <NavLink href="/components/">Components</NavLink>
+              </NavItem>
+              <NavItem>
+                <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
+              </NavItem>
+            </Nav>
+          </Collapse>
+        </Navbar>
+      </div>
+    );
+  }
+}
+
+class Example110 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+  toggle() {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+  render() {
+    return (
+      <div>
+        <Navbar color="faded" light expand="md">
+          <NavbarToggler right onClick={this.toggle} />
+          <NavbarBrand href="/">reactstrap</NavbarBrand>
+          <Collapse isOpen={this.state.isOpen} navbar>
+            <Nav className="ml-auto" navbar>
+              <NavItem>
+                <NavLink href="/components/">Components</NavLink>
+              </NavItem>
+              <NavItem>
+                <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
+              </NavItem>
+            </Nav>
+          </Collapse>
+        </Navbar>
+      </div>
+    );
+  }
+}
+
+class Example111 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+  toggle() {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+  render() {
+    return (
+      <div>
+        <Navbar color="faded" light expand="md">
+          <NavbarToggler right onClick={this.toggle} />
+          <NavbarBrand tag="a" href="/">reactstrap</NavbarBrand>
+          <Collapse isOpen={this.state.isOpen} navbar>
+            <Nav className="ml-auto" navbar>
+              <NavItem>
+                <NavLink href="/components/">Components</NavLink>
+              </NavItem>
+              <NavItem>
+                <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
+              </NavItem>
+            </Nav>
+          </Collapse>
+        </Navbar>
+      </div>
+    );
+  }
+}
+
+class Example112 extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+
+    this.toggle = this.toggle.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+  toggle() {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+  render() {
+    return (
+      <div>
+        <Navbar color="faded" light expand="md">
+          <NavbarToggler right onClick={this.toggle} />
+          <NavbarBrand className="logo" href="/">reactstrap</NavbarBrand>
+          <Collapse isOpen={this.state.isOpen} navbar>
+            <Nav className="ml-auto" navbar>
+              <NavItem>
+                <NavLink href="/components/">Components</NavLink>
+              </NavItem>
+              <NavItem>
+                <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
+              </NavItem>
+            </Nav>
+          </Collapse>
+        </Navbar>
+      </div>
+    );
+  }
+}
+
+const Example113 = (props: any) => {
+    return (
+      <div>
+        <Card>
+          <CardBody>
+            Anim pariatur cliche reprehenderit,
+            enim eiusmod high life accusamus terry richardson ad squid. Nihil
+            anim keffiyeh helvetica, craft beer labore wes anderson cred
+            nesciunt sapiente ea proident.
+          </CardBody>
+        </Card>
+      </div>
+    );
+  };
diff --git a/types/reactstrap/v4/tsconfig.json b/types/reactstrap/v4/tsconfig.json
new file mode 100644
index 0000000000..73578a9178
--- /dev/null
+++ b/types/reactstrap/v4/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "reactstrap": ["reactstrap/v4"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "reactstrap-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/reactstrap/v4/tslint.json b/types/reactstrap/v4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/reactstrap/v4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/read-chunk/tslint.json b/types/read-chunk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/read-chunk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/read-pkg-up/index.d.ts b/types/read-pkg-up/index.d.ts
index 974a9fa0cd..bdfd304827 100644
--- a/types/read-pkg-up/index.d.ts
+++ b/types/read-pkg-up/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for read-pkg-up 2.0
+// Type definitions for read-pkg-up 3.0
 // Project: https://github.com/sindresorhus/read-pkg-up
 // Definitions by: Louis Orleans <https://github.com/dudeofawesome>
+//                 Jeff Dickey <https://github.com/jdxcode>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import normalize = require('normalize-package-data');
+
 declare namespace ReadPkgUp {
-    function sync(options?: Options): Package;
+    function sync(options: Options & {normalize: false}): {[k: string]: any};
+    function sync(options?: Options): normalize.Package;
 
     interface Options {
         /**
@@ -21,11 +25,10 @@ declare namespace ReadPkgUp {
         normalize?: boolean;
     }
 
-    interface Package {
-        [key: string]: any;
-    }
+    type Package = normalize.Package;
 }
 
-declare function ReadPkgUp(options?: ReadPkgUp.Options): Promise<ReadPkgUp.Package>;
+declare function ReadPkgUp(options: ReadPkgUp.Options & {normalize: false}): Promise<{[k: string]: any}>;
+declare function ReadPkgUp(options?: ReadPkgUp.Options): Promise<normalize.Package>;
 
 export = ReadPkgUp;
diff --git a/types/read-pkg-up/read-pkg-up-tests.ts b/types/read-pkg-up/read-pkg-up-tests.ts
index f536f275d2..32943d57bb 100644
--- a/types/read-pkg-up/read-pkg-up-tests.ts
+++ b/types/read-pkg-up/read-pkg-up-tests.ts
@@ -1,6 +1,8 @@
 import ReadPkgUp = require('read-pkg-up');
 
-ReadPkgUp().then(pkg => typeof pkg === 'object');
-ReadPkgUp({cwd: '.', normalize: false}).then(pkg => typeof pkg === 'object');
-typeof ReadPkgUp.sync() === 'object';
-typeof ReadPkgUp.sync({cwd: '.', normalize: false}) === 'object';
+ReadPkgUp().then(pkg => pkg.name); // $ExpectType Promise<string>
+ReadPkgUp({cwd: '.', normalize: true}).then(pkg => pkg.name); // $ExpectType Promise<string>
+ReadPkgUp({cwd: '.', normalize: false}).then(pkg => pkg['name']); // $ExpectType Promise<any>
+ReadPkgUp.sync().name; // $ExpectType string
+ReadPkgUp.sync({cwd: '.', normalize: true}).name; // $ExpectType string
+ReadPkgUp.sync({cwd: '.', normalize: false})['name']; // $ExpectType any
diff --git a/types/read-pkg/index.d.ts b/types/read-pkg/index.d.ts
new file mode 100644
index 0000000000..5e5b57c445
--- /dev/null
+++ b/types/read-pkg/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for read-pkg 3.0
+// Project: https://github.com/sindresorhus/read-pkg
+// Definitions by: Jeff Dickey <https://github.com/jdxcode>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import normalize = require('normalize-package-data');
+
+declare namespace ReadPkg {
+    function sync(path: string, options: Options & {normalize: false}): {[k: string]: any};
+    function sync(options: Options & {normalize: false}): {[k: string]: any};
+    function sync(options?: Options): normalize.Package;
+    function sync(path?: string, options?: Options): normalize.Package;
+
+    interface Options {
+        /**
+         * [Normalize](https://github.com/npm/normalize-package-data#what-normalization-currently-entails) the package data.
+         *
+         * @default true
+         */
+        normalize?: boolean;
+    }
+
+    type Package = normalize.Package;
+}
+
+declare function ReadPkg(path: string, options: ReadPkg.Options & {normalize: false}): Promise<{[k: string]: any}>;
+declare function ReadPkg(options: ReadPkg.Options & {normalize: false}): Promise<{[k: string]: any}>;
+declare function ReadPkg(options?: ReadPkg.Options): Promise<normalize.Package>;
+declare function ReadPkg(path?: string, options?: ReadPkg.Options): Promise<normalize.Package>;
+
+export = ReadPkg;
diff --git a/types/read-pkg/read-pkg-tests.ts b/types/read-pkg/read-pkg-tests.ts
new file mode 100644
index 0000000000..a82f953eab
--- /dev/null
+++ b/types/read-pkg/read-pkg-tests.ts
@@ -0,0 +1,9 @@
+import ReadPkg = require('read-pkg');
+
+ReadPkg().then(pkg => pkg.name); // $ExpectType Promise<string>
+ReadPkg({normalize: true}).then(pkg => pkg.name); // $ExpectType Promise<string>
+ReadPkg({normalize: false}).then(pkg => pkg['name']); // $ExpectType Promise<any>
+ReadPkg.sync().name; // $ExpectType string
+ReadPkg.sync({normalize: true}).name; // $ExpectType string
+ReadPkg.sync({normalize: false})['name']; // $ExpectType any
+ReadPkg.sync('package.json', {normalize: false})['name']; // $ExpectType any
diff --git a/types/read-pkg/tsconfig.json b/types/read-pkg/tsconfig.json
new file mode 100644
index 0000000000..95c3962946
--- /dev/null
+++ b/types/read-pkg/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "read-pkg-tests.ts"
+    ]
+}
diff --git a/types/read-pkg/tslint.json b/types/read-pkg/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/read-pkg/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/read/tslint.json b/types/read/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/read/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/readdir-stream/tslint.json b/types/readdir-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/readdir-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/realm/index.d.ts b/types/realm/index.d.ts
deleted file mode 100644
index 993f0bcc0f..0000000000
--- a/types/realm/index.d.ts
+++ /dev/null
@@ -1,456 +0,0 @@
-// Type definitions for realm-js 1.0
-// Project: https://github.com/realm/realm-js
-// Definitions by: Akim <https://github.com/Akim95>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-declare namespace Realm {
-    /**
-     * PropertyType
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.html#~PropertyType }
-     */
-    type PropertyType = string | 'bool' | 'int' | 'float' | 'double' | 'string' | 'data' | 'date' | 'list';
-
-    /**
-     * ObjectSchemaProperty
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.html#~ObjectSchemaProperty }
-     */
-    interface ObjectSchemaProperty {
-        type: PropertyType;
-        objectType?: string;
-        default?: any;
-        optional?: boolean;
-        indexed?: boolean;
-    }
-
-    // properties types
-    interface PropertiesTypes {
-        [keys: string]: PropertyType | ObjectSchemaProperty;
-    }
-
-    /**
-     * ObjectSchema
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.html#~ObjectSchema }
-     */
-    interface ObjectSchema {
-        name: string;
-        primaryKey?: string;
-        properties: PropertiesTypes;
-    }
-
-    /**
-     * ObjectClass
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.html#~ObjectClass }
-     */
-    interface ObjectClass {
-        schema: ObjectSchema;
-    }
-
-    /**
-     * ObjectType
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.html#~ObjectType }
-     */
-    interface ObjectType {
-        type: ObjectClass;
-    }
-
-    interface SyncConfiguration {
-        user: User;
-        url: string;
-    }
-
-    /**
-     * realm configuration
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.html#~Configuration }
-     */
-    interface Configuration {
-        encryptionKey?: any;
-        migration?: any;
-        path?: string;
-        readOnly?: boolean;
-        schema?: ObjectClass[] | ObjectSchema[];
-        schemaVersion?: number;
-        sync?: SyncConfiguration;
-    }
-
-    // object props type
-    interface ObjectPropsType {
-        [keys: string]: any;
-    }
-
-    /**
-     * SortDescriptor
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Collection.html#~SortDescriptor }
-     */
-    type SortDescriptor = string | [string, boolean] | any[];
-
-    /**
-     * Iterator
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Collection.html#~Iterator }
-     */
-    interface IteratorResult<T> {
-        done: boolean;
-        value?: T;
-    }
-
-    interface Iterator<T> {
-        next(done: boolean, value?: any): IteratorResult<T>;
-        [Symbol.iterator](): any;
-    }
-
-    /**
-     * Collection
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Collection.html }
-     */
-    interface Collection<T> {
-        readonly length: number;
-
-        /**
-         * @returns boolean
-         */
-        isValid(): boolean;
-
-        /**
-         * @param  {string} query
-         * @param  {any[]} ...arg
-         * @returns Results
-         */
-        filtered(query: string, ...arg: any[]): Results<T>;
-
-        /**
-         * @param  {string|SortDescriptor} descriptor
-         * @param  {boolean} reverse?
-         * @returns Results
-         */
-        sorted(descriptor: string | SortDescriptor, reverse?: boolean): Results<T>;
-
-        /**
-         * @returns Iterator
-         */
-        [Symbol.iterator](): Iterator<T>;
-
-        /**
-         * @returns Results
-         */
-        snapshot(): Results<T>;
-
-        /**
-         * @returns Iterator<any>
-         */
-        entries(): Iterator<any>;
-
-        /**
-         * @returns Iterator<any>
-         */
-        keys(): Iterator<any>;
-
-        /**
-         * @returns Iterator<any>
-         */
-        values(): Iterator<any>;
-
-        /**
-         * @param  {string[]} separator?
-         * @returns string
-         */
-        join(separator?: string[]): string;
-
-        /**
-         * @param  {number} start?
-         * @param  {number} end?
-         * @returns T
-         */
-        slice(start?: number, end?: number): T[];
-
-        /**
-         * @param  {(object:any,index?:any,collection?:any)=>void} callback
-         * @param  {any} thisArg?
-         * @returns T
-         */
-        find(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): T | null | undefined;
-
-        /**
-         * @param  {(object:any,index?:number,collection?:any)=>void} callback
-         * @param  {any} thisArg?
-         * @returns number
-         */
-        findIndex(callback: (object: any, index?: number, collection?: any) => void, thisArg?: any): number;
-
-        /**
-         * @param  {(object:T,index?:number,collection?:any)=>void} callback
-         * @param  {any} thisArg?
-         * @returns void
-         */
-        forEach(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): void;
-
-        /**
-         * @param  {(object:T,index?:number,collection?:any)=>void} callback
-         * @param  {any} thisArg?
-         * @returns boolean
-         */
-        every(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): boolean;
-
-        /**
-         * @param  {(object:T,index?:number,collection?:any)=>void} callback
-         * @param  {any} thisArg?
-         * @returns boolean
-         */
-        some(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): boolean;
-
-        /**
-         * @param  {(object:T,index?:number,collection?:any)=>void} callback
-         * @param  {any} thisArg?
-         * @returns any
-         */
-        map(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): any[];
-
-        /**
-         * @param  {(previousValue:T,object?:T,index?:number,collection?:any)=>void} callback
-         * @param  {any} initialValue?
-         * @returns any
-         */
-        reduce(callback: (previousValue: T, object?: T, index?: number, collection?: any) => void, initialValue?: any): any;
-
-        /**
-         * @param  {(previousValue:T,object?:T,index?:any,collection?:any)=>void} callback
-         * @param  {any} initialValue?
-         * @returns any
-         */
-        reduceRight(callback: (previousValue: T, object?: T, index?: any, collection?: any) => void, initialValue?: any): any;
-
-        /**
-         * @param  {(collection:any,changes:any)=>void} callback
-         * @returns void
-         */
-        addListener(callback: (collection: any, changes: any) => void): void;
-
-        /**
-         * @returns void
-         */
-        removeAllListeners(): void;
-
-        /**
-         * @param  {()=>void} callback
-         * @returns void
-         */
-        removeListener(callback: () => void): void;
-    }
-
-    /**
-     * Object
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Object.html }
-     */
-    interface Object {
-        /**
-         * @returns boolean
-         */
-        isValid(): boolean;
-    }
-
-    /**
-     * List
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.List.html }
-     */
-    interface List<T> extends Collection<T> {
-        /**
-         * @returns T
-         */
-        pop(): T | null | undefined;
-
-        /**
-         * @param  {T} object
-         * @returns number
-         */
-        push(object: T): number;
-
-        /**
-         * @returns T
-         */
-        shift(): T | null | undefined;
-
-        /**
-         * @param  {number} index
-         * @param  {number} count?
-         * @param  {any} object?
-         * @returns T
-         */
-        splice(index: number, count?: number, object?: any): T[];
-
-        /**
-         * @param  {T} object
-         * @returns number
-         */
-        unshift(object: T): number;
-    }
-
-    /**
-     * Results
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Results.html }
-     */
-    type Results<T> = Collection<T>;
-
-    /**
-     * User
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Sync.User.html }
-     */
-    interface User {
-        all: any;
-        current: User;
-        readonly identity: string;
-        readonly isAdmin: boolean;
-        readonly server: string;
-        readonly token: string;
-        adminUser(adminToken: string): User;
-        login(server: string, username: string, password: string, callback: (error: any, user: any) => void): void;
-        loginWithProvider(server: string, provider: string, providerToken: string, callback: (error: any, user: any) => void): void;
-        register(server: string, username: string, password: string, callback: (error: any, user: any) => void): void;
-        registerWithProvider(server: string, provider: string, providerToken: string, callback: (error: any, user: any) => void): void;
-        logout(): void;
-        openManagementRealm(): Realm;
-    }
-
-    /**
-     * Session
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Sync.Session.html }
-     */
-    interface Session {
-        readonly config: any;
-        readonly state: string;
-        readonly url: string;
-        readonly user: User;
-    }
-
-    /**
-     * AuthError
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Sync.AuthError.html }
-     */
-    interface AuthError {
-        readonly code: number;
-        readonly type: string;
-    }
-
-    /**
-     * ChangeEvent
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Sync.ChangeEvent.html }
-     */
-    interface ChangeEvent {
-        readonly changes: any;
-        readonly oldRealm: Realm;
-        readonly path: string;
-        readonly realm: Realm;
-    }
-
-    /**
-     * LogLevel
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Sync.html#~LogLevel }
-     */
-    type LogLevelType = string | 'error' | 'info' | 'defug';
-
-    /**
-     * Sync
-     * @see { @link https://realm.io/docs/javascript/latest/api/Realm.Sync.html }
-     */
-    interface Sync {
-        User: User;
-        Session: Session;
-        AuthError: AuthError;
-        ChangeEvent: ChangeEvent;
-        addListener(serverURL: string, adminUser: User, regex: string, name: string, changeCallback: () => void): void;
-        removeAllListeners(name?: string[]): void;
-        removeListener(regex: string, name: string, changeCallback: () => void): void;
-        setLogLevel(logLevel: LogLevelType): void;
-    }
-}
-
-declare class Realm {
-    static defaultPath: string;
-
-    readonly path: string;
-
-    readonly readOnly: boolean;
-
-    readonly schema: Realm.ObjectSchema[];
-
-    readonly schemaVersion: number;
-
-    static Sync: Realm.Sync;
-
-    syncSession: Realm.Session;
-
-    /**
-     * @param  {string} path
-     * @param  {any} encryptionKey?
-     * @returns number
-     */
-    static schemaVersion(path: string, encryptionKey?: any): number;
-
-    /**
-     * @param  {Realm.Configuration} config?
-     */
-    constructor(config?: Realm.Configuration);
-
-    /**
-     * @returns void
-     */
-    close(): void;
-
-    /**
-     * @param  {string|Realm.ObjectType} type
-     * @param  {T&Realm.ObjectPropsType} properties
-     * @param  {boolean} update?
-     * @returns T
-     */
-    create<T>(type: string | Realm.ObjectType, properties: T & Realm.ObjectPropsType, update?: boolean): T;
-
-    /**
-     * @param  {Realm.Object|Realm.Object[]|Realm.List<any>|Realm.Results<any>|any} object
-     * @returns void
-     */
-    delete(object: Realm.Object | Realm.Object[] | Realm.List<any> | Realm.Results<any> | any): void;
-
-    /**
-     * @returns void
-     */
-    deleteAll(): void;
-
-    /**
-     * @param  {string|Realm.ObjectType} type
-     * @param  {number|string} key
-     * @returns T
-     */
-    objectForPrimaryKey<T>(type: string | Realm.ObjectType, key: number | string): T | void;
-
-    /**
-     * @param  {string|Realm.ObjectType} type
-     * @returns Realm
-     */
-    objects<T>(type: string | Realm.ObjectType): Realm.ObjectType & Realm.Results<T>;
-
-    /**
-     * @param  {string} name
-     * @param  {()=>void} callback
-     * @returns void
-     */
-    addListener(name: string, callback: () => void): void;
-
-    /**
-     * @param  {string} name
-     * @param  {()=>void} callback
-     * @returns void
-     */
-    removeListener(name: string, callback: () => void): void;
-
-    /**
-     * @param  {string[]} name?
-     * @returns void
-     */
-    removeAllListeners(name?: string[]): void;
-
-    /**
-     * @param  {()=>void} callback
-     * @returns void
-     */
-    write(callback: () => void): void;
-}
-
-export = Realm;
diff --git a/types/realm/realm-tests.ts b/types/realm/realm-tests.ts
deleted file mode 100644
index 5f171a3287..0000000000
--- a/types/realm/realm-tests.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import * as Realm from 'realm';
-
-// schema test
-const personSchema = {
-    name: 'Person',
-    primaryKey: 'id',
-    properties: {
-        id: 'int',
-        name: { type: 'string', default: 'anonymous', indexed: true },
-        profilePic: { type: 'string', optional: true }
-    }
-};
-
-// encryptionKey
-const key = new Int8Array(64);
-
-// constructor test
-const realm = new Realm({
-    schema: [personSchema],
-    encryptionKey: key
-});
-
-realm.write(() => {
-    // create test
-    realm.create('Person', {
-        id: 1,
-        name: 'Tony'
-    });
-
-    // update test
-    realm.create('Person', {
-        id: 1,
-        name: 'Jack'
-    }, true);
-});
-
-// delete all person test
-const allPerson = realm.objects('Person');
-realm.delete(allPerson);
-
-// filtered test
-const allJack = allPerson.filtered('name = "Jack"');
-
-// sorted test
-allJack.sorted('id');
-allJack.sorted('id', true);
-
-// limiting results test
-allJack.slice(0, 2);
-
-// change events test
-realm.addListener('change', () => {
-    return 'updated';
-});
-
-// remove all events
-realm.removeAllListeners();
-
-allPerson.find((person: any) => {
-    return person.name === 'Jack';
-});
-
-const currentVersion = Realm.schemaVersion(Realm.defaultPath);
-
-// username/password authentication
-Realm.Sync.User.register('http://localhost:9080', 'username@example.com', 'p@s$w0rd', (error, user) => { /* ... */ });
-
-Realm.Sync.User.login('http://localhost.com:9080', 'username@example.com', 'p@s$w0rd', (error, user) => {
-    const todoSchema = {
-        name: 'Todo',
-        primaryKey: 'id',
-        properties: {
-            id: 'int',
-            task: 'string',
-        }
-    };
-
-    // sync test
-    const realm = new Realm({
-        schema: [todoSchema],
-        sync: { user, url: 'realm://localhost:9080/~/todos' }
-    });
-
-    // session test
-    const session = realm.syncSession;
-    const sessionUrl = session.config.url;
-});
-
-// facebook authentication
-const fbAccessToken = 'acc3ssT0ken...';
-Realm.Sync.User.registerWithProvider('http://localhost:9080', 'facebook', fbAccessToken, (error, user) => { /* ... */ });
-
-// user test
-const user = Realm.Sync.User.current;
-const users = Realm.Sync.User.all;
-
-// access control test
-const managementRealm = user.openManagementRealm();
diff --git a/types/realm/tsconfig.json b/types/realm/tsconfig.json
deleted file mode 100644
index 877376802c..0000000000
--- a/types/realm/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "realm-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/realm/tslint.json b/types/realm/tslint.json
deleted file mode 100644
index e6dc9b7f2f..0000000000
--- a/types/realm/tslint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODO
-        "no-any-union": false,
-        "no-unnecessary-generics": false
-    }
-}
diff --git a/types/reapop/package.json b/types/reapop/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/reapop/package.json
+++ b/types/reapop/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/rebass/tslint.json b/types/rebass/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rebass/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/recaptcha/tsconfig.json b/types/recaptcha/tsconfig.json
deleted file mode 100644
index 3fb78fba81..0000000000
--- a/types/recaptcha/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "recaptcha-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 95656a7247..c3932a09a2 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -3,842 +3,950 @@
 // Definitions by: Maarten Mulders <https://github.com/mthmulders>
 //                 Raphael Mueller <https://github.com/rapmue>
 //                 Roy Xue <https://github.com/royxue>
+//                 Zheyang Song <https://github.com/ZheyangSong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
+import { CurveFactory } from 'd3-shape';
 
 export type Percentage = string;
 export type RechartsFunction = () => void;
 export type TickFormatterFunction = (value: any) => any;
+export type TickGeneratorFunction = (noTicksProps: object) => any[];
 export type LabelFormatter = (label: string | number) => React.ReactNode;
 export type TooltipFormatter = (value: string | number | Array<string | number>, name: string,
                                 entry: TooltipPayload, index: number) => React.ReactNode;
 export type ItemSorter<T> = (a: T, b: T) => number;
 export type ContentRenderer<P> = (props: P) => React.ReactNode;
+export type DataKey = string | number | ((dataObject: any) => number | [number, number]);
 
-export type LegendType = 'line' | 'square' | 'rect' | 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | 'none';
+export type IconType = 'plainline' | 'line' | 'square' | 'rect' | 'circle' | 'cross' | 'diamond' | 'star' | 'triangle' | 'wye' | 'plainline';
+export type LegendType = IconType | 'none';
 export type LayoutType = 'horizontal' | 'vertical';
 export type AnimationEasingType = 'ease' | 'ease-in' | 'ease-out' | 'ease-in-out' | 'linear';
-export type ScaleType = 'auto' | 'linear' | 'pow' | 'sqrt' | 'log' | 'identity' | 'time' | 'band' | 'point' | 'ordinal' | 'quantile' | 'quantize' | 'utcTime' | 'sequential' | 'threshold';
-export type PositionType = 'top' | 'left' | 'right' | 'bottom' | 'inside' | 'outside'| 'insideLeft' | 'insideRight' |
-	'insideTop' | 'insideBottom' | 'insideTopLeft' | 'insideBottomLeft' | 'insideTopRight' | 'insideBottomRight' | 'insideStart' | 'insideEnd' | 'end' | 'center';
+export type ScaleType =
+    'auto' | 'linear' | 'pow' | 'sqrt' | 'log' | 'identity' | 'time' | 'band' | 'point' |
+    'ordinal' | 'quantile' | 'quantize' | 'utcTime' | 'sequential' | 'threshold';
+export type PositionType =
+    'top' | 'left' | 'right' | 'bottom' | 'inside' | 'outside'| 'insideLeft' | 'insideRight' |
+    'insideTop' | 'insideBottom' | 'insideTopLeft' | 'insideBottomLeft' | 'insideTopRight' |
+    'insideBottomRight' | 'insideStart' | 'insideEnd' | 'end' | 'center';
+export type StackOffsetType = 'sign' | 'expand' | 'none' | 'wiggle' | 'silhouette';
+export type LineType =
+    'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' |
+    'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | CurveFactory;
+export type AxisInterval = number | 'preserveStart' | 'preserveEnd' | 'preserveStartEnd';
 
-export type PartialAndNumber<T> = {
-   [P in keyof T]?: number | T[P];
-};
+export type PickedCSSStyleDeclarationKeys =
+    'alignmentBaseline' | 'baselineShift' | 'clip' | 'clipPath' | 'clipRule' | 'color' |
+    'colorInterpolationFilters' | 'cursor' | 'direction' | 'display' | 'dominantBaseline' |
+    'enableBackground' | 'fill' | 'fillRule' | 'filter' | 'floodColor' |
+    'floodOpacity' | 'font' | 'fontFamily' | 'fontStretch' | 'fontStyle' | 'fontVariant' |
+    'glyphOrientationHorizontal' | 'glyphOrientationVertical' | 'letterSpacing' | 'lightingColor' |
+    'markerEnd' | 'markerMid' | 'markerStart' | 'mask' | 'overflow' | 'pointerEvents' |
+    'stopColor' | 'strokeDasharray' | 'strokeLinecap' | 'strokeLinejoin' | 'textAnchor' |
+    'textDecoration' | 'unicodeBidi' | 'visibility' | 'writingMode' | 'transform';
 
-export interface Margin {
-	top: number;
-	right: number;
-	bottom: number;
-	left: number;
+export interface Point {
+    x: number;
+    y: number;
+    value: number | any[];
 }
 
-export interface AreaProps extends Partial<CSSStyleDeclaration> {
-	type?: 'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | RechartsFunction;
-	dataKey?: string | number;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	legendType?: LegendType;
-	dot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	activeDot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	stroke?: string;
-	layout?: LayoutType;
-	baseLine?: number | any[];
-	points?: any[];
-	stackId?: string | number;
-	connectNulls?: boolean;
-	unit?: string | number;
-	name?: string | number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface Margin {
+    top: number;
+    right: number;
+    bottom: number;
+    left: number;
+}
+
+export interface Animatable {
+    onAnimationStart?: RechartsFunction;
+    onAnimationEnd?: RechartsFunction;
+    animationId?: number;
+    isAnimationActive?: boolean;
+    isUpdateAnimationActive?: boolean;
+    animationBegin?: number;
+    animationDuration?: number;
+    animationEasing?: AnimationEasingType;
+}
+
+export interface CategoricalChartWrapper<L = LayoutType> {
+    syncId?: string | number;
+    compact?: boolean;
+    width?: number;
+    height?: number;
+    data?: object[];
+    layout?: L;
+    stackOffset?: StackOffsetType;
+    throttleDelay?: number;
+    margin?: Partial<Margin>;
+    barCategoryGap?: number | string;
+    barGap?: number | string;
+    barSize?: number | string;
+    maxBarSize?: number;
+    style?: object;
+    className?: string;
+    children?: React.ReactNode | React.ReactNode[];
+    onClick?: RechartsFunction;
+    onMouseLeave?: RechartsFunction;
+    onMouseEnter?: RechartsFunction;
+    onMouseMove?: RechartsFunction;
+    onMouseDown?: RechartsFunction;
+    onMouseUp?: RechartsFunction;
+    reverseStackOrder?: boolean;
+}
+
+export interface EventAttributes {
+    onClick?: RechartsFunction;
+    onMouseDown?: RechartsFunction;
+    onMouseUp?: RechartsFunction;
+    onMouseOver?: RechartsFunction;
+    onMouseMove?: RechartsFunction;
+    onMouseOut?: RechartsFunction;
+    onMouseEnter?: RechartsFunction;
+    onMouseLeave?: RechartsFunction;
+    onTouchEnd?: RechartsFunction;
+    onTouchMove?: RechartsFunction;
+    onTouchStart?: RechartsFunction;
+    onTouchCancel?: RechartsFunction;
+}
+
+export interface PresentationAttributes<X = number, Y = number> extends Pick<CSSStyleDeclaration, PickedCSSStyleDeclarationKeys> {
+    angle: number;
+    colorInterpolation: string;
+    colorProfile: string;
+    colorRendering: string;
+    fillOpacity: number | string;
+    fontSize: number | string;
+    fontSizeAdjust: number | string;
+    fontWeight: 'normal' | 'bold' | 'bolder' | 'lighter' |
+        100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 'inherit';
+    imageRendering: 'auto' | 'optimizeSpeed' | 'optimizeQuality' | 'inherit';
+    kerning: number | string;
+    opacity: number | string;
+    shapeRendering: 'auto' | 'optimizeSpeed' | 'crispEdges' | 'geometricPrecision' | 'inherit';
+    stopOpacity: number | string;
+    stroke: number | string;
+    strokeDashoffset: number | string;
+    strokeMiterlimit: number | string;
+    strokeOpacity: number | string;
+    strokeWidth: number | string;
+    textRendering: 'auto' | 'optimizeSpeed' | 'optimizeLegibility' | 'geometricPrecision' | 'inherit';
+    wordSpacing: number | string;
+    style: object;
+    width: number;
+    height: number;
+    dx: number;
+    dy: number;
+    x: X;
+    y: Y;
+    r: number;
+}
+
+export interface AreaProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    className?: string;
+    type?: LineType;
+    unit?: string | number;
+    name?: string | number;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    xAxis?: object;
+    yAxis?: object;
+    stackId?: string | number;
+    legendType?: LegendType;
+    connectNulls?: boolean;
+    activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
+    label?: boolean | object | React.ReactElement<any> | Label['content'];
+    hide?: boolean;
+    layout?: LayoutType;
+    baseLine?: number | any[];
+    isRange?: boolean;
+    points?: Point[];
 }
 
 export class Area extends React.Component<AreaProps> { }
 
-export interface AreaChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width: number;
-	height: number;
-	data: any[];
-	margin?: Margin;
-	stackOffset?: 'expand' | 'none' | 'wiggle' | 'silhouette';
-	baseValue?: number | 'dataMin' | 'dataMax' | 'auto';
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type AreaChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class AreaChart extends React.Component<AreaChartProps> { }
 
-export interface BarProps extends Partial<CSSStyleDeclaration> {
-	layout?: LayoutType;
-	dataKey?: string | number;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	legendType?: LegendType;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	data?: any[];
-	barSize?: number;
-	maxBarSize?: number;
-	minPointSize?: number;
-	shape?: React.ReactElement<any> | RechartsFunction;
-	stackId?: string | number;
-	unit?: string | number;
-	name?: string | number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface BarData {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    radius: number | any[];
+    value: number | string | any[];
+}
+
+export interface BarProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    className?: string;
+    layout?: LayoutType;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    yAxis?: object;
+    xAxis?: object;
+    stackId?: string | number;
+    barSize?: number;
+    unit?: string | number;
+    name?: string | number;
+    legendType?: LegendType;
+    minPointSize?: number;
+    maxBarSize?: number;
+    hide?: boolean;
+    shape?: React.ReactElement<any> | ContentRenderer<RectangleProps>;
+    data?: BarData[];
+    // see label section at http://recharts.org/#/en-US/api/Bar
+    label?: boolean | Label | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<Label>;
 }
 
 export class Bar extends React.Component<BarProps> { }
 
-export interface BarChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	barCategoryGap?: Percentage | number;
-	barGap?: Percentage | number;
-	barSize?: number;
-	maxBarSize?: number;
-	stackOffset?: 'expand' | 'none' | 'wiggle' | 'silhouette' | 'sign';
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type BarChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class BarChart extends React.Component<BarChartProps> { }
 
 export interface BrushProps {
-	dataKey: number | string;
-	x?: number;
-	y?: number;
-	width?: number;
-	height?: number;
-	data: any[];
-	travellerWidth?: number;
-	startIndex?: number;
-	endIndex?: number;
-	tickFormatter?: TickFormatterFunction;
-	onChange?: RechartsFunction;
+    className?: string;
+    fill?: string;
+    stroke?: string;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    travellerWidth?: number;
+    padding?: Partial<Margin>;
+    dataKey?: DataKey;
+    data?: any[];
+    startIndex?: number;
+    endIndex?: number;
+    tickFormatter?: TickFormatterFunction;
+    children?: React.ReactNode;
+    onChange?: (newIndex: {
+        startIndex: number;
+        endIndex: number;
+    }) => void;
+    updateId?: string | number;
 }
 
 export class Brush extends React.Component<BrushProps> { }
 
-export interface CartesianAxisProps {
-	x?: number;
-	y?: number;
-	width?: number;
-	height?: number;
-	orientation?: 'top' | 'bottom' | 'left' | 'right';
-	viewBox?: ViewBox;
-	axisLine?: boolean | any;
-	tickLine?: boolean | any;
-	minTickGap?: number;
-	tickSize?: number;
-	interval?: "preserveStart" | "preserveEnd" | "preserveStartEnd" | number;
-	tick?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<CartesianAxisProps>;
-	mirror?: boolean;
+export interface CartesianAxisProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    orientation?: 'top' | 'bottom' | 'left' | 'right';
+    viewBox?: ViewBox;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    axisLine?: boolean | object;
+    tickLine?: boolean | object;
+    mirror?: boolean;
+    minTickGap?: number;
+    ticks?: any[];
+    tickSize?: number;
+    stroke?: string;
+    tickFormatter?: TickFormatterFunction;
+    ticksGenerator?: TickGeneratorFunction;
+    interval?: AxisInterval;
 }
 
 export class CartesianAxis extends React.Component<CartesianAxisProps> { }
 
-export interface CartesianGridProps extends Partial<CSSStyleDeclaration> {
-	x?: number;
-	y?: number;
-	horizontal?: boolean;
-	vertical?: boolean;
-	horizontalPoints?: any[];
-	verticalPoints?: any[];
+export interface CartesianGridProps extends Partial<PresentationAttributes> {
+    y?: number;
+    width?: number;
+    height?: number;
+    horizontal?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    vertical?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    horizontalPoints?: number[];
+    verticalPoints?: number[];
+    horizontalCoordinatesGenerator?: (arg: {
+        yAxis: CartesianGridProps['yAxis'];
+        width: CartesianGridProps['chartWidth'];
+        height: CartesianGridProps['chartHeight'];
+        offset: CartesianGridProps['offset'];
+    }) => number[];
+    verticalCoordinatesGenerator?: (arg: {
+        yAxis: CartesianGridProps['xAxis'];
+        width: CartesianGridProps['chartWidth'];
+        height: CartesianGridProps['chartHeight'];
+        offset: CartesianGridProps['offset'];
+    }) => number[];
+    xAxis?: object;
+    yAxis?: object;
+    offset?: object;
+    chartWidth?: number;
+    chartHeight?: number;
 }
 
 export class CartesianGrid extends React.Component<CartesianGridProps> { }
 
-export interface CellProps {
-	fill?: string;
-	stroke?: string;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type CellProps = Partial<PresentationAttributes>;
 
 export class Cell extends React.Component<CellProps> { }
 
-export interface ComposedChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	barCategoryGap?: Percentage | number;
-	barGap?: number;
-	barSize?: number;
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type ComposedChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class ComposedChart extends React.Component<ComposedChartProps> { }
 
-export interface CrossProps {
-	x?: number;
-	y?: number;
-	top?: number;
-	left?: number;
-	width?: number;
-	height?: number;
+export interface CrossProps extends Partial<PresentationAttributes> {
+    className?: string;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    top?: number;
+    left?: number;
 }
 
 export class Cross extends React.Component<CrossProps> { }
 
-export interface CurveProps extends Partial<CSSStyleDeclaration> {
-	type?: 'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | RechartsFunction;
-	points: any[];
-	layout?: LayoutType;
-	baseLine?: number | any[];
-	connectNulls?: boolean;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface CurveProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    type?: LineType;
+    layout?: LayoutType;
+    baseLine?: number | any[];
+    points?: object[];
+    connectNulls?: boolean;
+    path?: string;
+    pathRef?: React.Ref<any>;
 }
 
 export class Curve extends React.Component<CurveProps> { }
 
-export interface DotProps {
-	cx: number;
-	cy: number;
-	r: number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface DotProps extends EventAttributes {
+    className?: string;
+    cx?: number;
+    cy?: number;
+    r?: number;
 }
 
 export class Dot extends React.Component<DotProps> { }
 
-export interface ErrorBarProps extends Partial<CSSStyleDeclaration> {
-	dataKey?: string | number;
-	strokeWidth?: string;
-	stroke?: string;
-	direction?: string;
+export interface ErrorBarProps {
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    data?: any[];
+    xAxis?: object;
+    yAxis?: object;
+    layout?: string;
+    dataPointFormatter?: (entry: any, dataKey: DataKey) => { x: number; y: number, value: any; errorVal: any; };
+    stroke?: string;
+    strokeWidth?: number;
+    width?: number;
+    offset?: number;
 }
 
 export class ErrorBar extends React.Component<ErrorBarProps> { }
 
+export interface LegendPayload {
+    value: any;
+    id: any;
+    type: LegendType;
+}
+
 export interface LegendProps {
-	width?: number;
-	height?: number;
-	layout?: LayoutType;
-	align?: 'left' | 'center' | 'right';
-	verticalAlign?: 'top' | 'middle' | 'bottom';
-	iconSize?: number;
-	iconType?: 'line' | 'square' | 'rect' | 'circle' | 'cross' | 'diamond' | 'star' | 'triangle' | 'wye';
-	payload?: any[];
-	chartWidth?: number;
-	chartHeight?: number;
-	margin?: Margin;
-	content?: React.ReactElement<any> | ContentRenderer<LegendProps>;
-	wrapperStyle?: any;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+    content?: React.ReactElement<any> | ContentRenderer<LegendProps>;
+    wrapperStyle?: object;
+    chartWidth?: number;
+    chartHeight?: number;
+    width?: number;
+    height?: number;
+    iconSize?: number;
+    iconType?: IconType;
+    layout?: LayoutType;
+    align?: 'left' | 'center' | 'right';
+    verticalAlign?: 'top' | 'middle' | 'bottom';
+    margin?: Partial<Margin>;
+    payload?: LegendPayload[];
+    formatter?: RechartsFunction;
+    onClick?: RechartsFunction;
+    onMouseEnter?: RechartsFunction;
+    onMouseLeave?: RechartsFunction;
+    onBBoxUpdate?: (box: { width: number; height: number; }) => void;
 }
 
 export class Legend extends React.Component<LegendProps> { }
 
-export interface LineProps extends Partial<CSSStyleDeclaration> {
-	type?: 'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | RechartsFunction;
-	dataKey: string | number;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	legendType?: LegendType;
-	dot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	activeDot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	points?: any[]; // made this points property partial, since in every example they don't use this property. But their definition says not optional.
-	layout?: LayoutType;
-	connectNulls?: boolean;
-	unit?: string | number;
-	name?: string | number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface LineProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    type?: LineType;
+    unit?: string | number;
+    name?: string | number;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    yAxis?: object;
+    xAxis?: object;
+    legendType?: LegendType;
+    layout?: LayoutType;
+    connectNulls?: boolean;
+    hide?: boolean;
+    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
+    top?: number;
+    left?: number;
+    width?: number;
+    height?: number;
+    dataKey: string | number; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    label?: boolean | object | React.ReactElement<any> | Label['content'];
+    points?: Point[];
 }
 
 export class Line extends React.Component<LineProps> { }
 
-export interface LineChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type LineChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class LineChart extends React.Component<LineChartProps> { }
 
-export interface PieProps extends Partial<CSSStyleDeclaration> {
-	cx?: Percentage | number;
-	cy?: Percentage | number;
-	innerRadius?: Percentage | number;
-	outerRadius?: Percentage | number;
-	startAngle?: number;
-	endAngle?: number;
-	minAngle?: number;
-	paddingAngle?: number;
-	nameKey?: string;
-	dataKey?: string;
-	valueKey?: string;
-	legendType?: LegendType;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	labelLine?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	data: any[];
-	activeIndex: any[];
-	activeShape: any | React.ReactElement<any> | RechartsFunction;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType | RechartsFunction;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PieProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    cx?: number | string;
+    cy?: number | string;
+    startAngle?: number;
+    endAngle?: number;
+    paddingAngle?: number;
+    innerRadius?: number | string;
+    outerRadius?: number | string;
+    cornerRadius?: number | string;
+    nameKey?: string | number | ((dataObject: any) => number);
+    valueKey?: string | number | ((dataObject: any) => number);
+    data?: object[];
+    minAngle?: number;
+    legendType?: LegendType;
+    maxRadius?: number;
+    sectors?: object[];
+    hide?: boolean;
+    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
+    label?: {
+        offsetRadius: number;
+    } | Label['content'] | React.ReactElement<any> | boolean;
+    activeShape?: object |ContentRenderer<any> | React.ReactElement<any>;
+    activeIndex?: number | number[];
 }
 
 export class Pie extends React.Component<PieProps> { }
 
-export interface PieChartProps {
-	width: number;
-	height: number;
-	margin?: Margin;
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface PieChartProps extends EventAttributes, CategoricalChartWrapper<'centric'> {
+    startAngle?: number;
+    endAngle?: number;
+    cx?: number | string;
+    cy?: number | string;
+    innerRadius?: number | string;
+    outerRadius?: number | string;
 }
 
 export class PieChart extends React.Component<PieChartProps> { }
 
-export interface PolarAngleAxisProps {
-	dataKey: string | number;
-	cx: number;
-	cy: number;
-	radius: Percentage | number;
-	axisLine?: boolean | any;
-	axisLineType?: string;
-	tickLine?: boolean | any;
-	tick?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	ticks: any[];
-	orient?: string;
-	tickFormatter: TickFormatterFunction;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PolarAngleAxisTick {
+    value: any;
+    coordinate: number;
+}
+
+export interface PolarAngleAxisProps extends EventAttributes, Partial<PresentationAttributes> {
+    type?: 'number' | 'category';
+    angleAxisId?: string | number;
+    dataKey?: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    cx?: number;
+    cy?: number;
+    radius?: Percentage | number;
+    hide?: boolean;
+    scale?: ScaleType | RechartsFunction; // this seems not being used by the lib.
+    axisLine?: boolean | object;
+    axisLineType?: 'polygon' | 'circle';
+    tickLine?: boolean | object;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    ticks?: PolarAngleAxisTick[];
+    stroke?: string;
+    orientation?: 'inner' | 'outer';
+    tickFormatter: TickFormatterFunction;
 }
 
 export class PolarAngleAxis extends React.Component<PolarAngleAxisProps> { }
 
-export interface PolarGridProps extends Partial<CSSStyleDeclaration> {
-	cx: number;
-	cy: number;
-	innerRadius: number;
-	outerRadius: number;
-	polarAngles: any[];
-	polarRadius: any[];
-	gridType?: 'polygon' | 'circle';
+export interface PolarGridProps extends Partial<PresentationAttributes> {
+    cx?: number;
+    cy?: number;
+    innerRadius?: number;
+    outerRadius?: number;
+    polarAngles?: number[];
+    polarRadius?: number[];
+    gridType?: 'polygon' | 'circle';
 }
 
 export class PolarGrid extends React.Component<PolarGridProps> { }
 
-export interface PolarRadiusAxisProps {
-	angle?: number;
-	cx: number;
-	cy: number;
-	domain?: any[];
-	label?: string | number | React.ReactElement<any> | RechartsFunction;
-	orientation?: "left" | "right" | "middle";
-	axisLine?: boolean | any;
-	tick?: boolean | any | Element | RechartsFunction;
-	tickFormatter: TickFormatterFunction;
-	tickCount?: number;
-	scale?: ScaleType | RechartsFunction;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PolarRadiusAxisTick {
+    value: any;
+    coordinate: number;
+}
+
+export type PolarRadiusAxisDomain = number | 'auto' | 'dataMin' | 'dataMax';
+
+export interface PolarRadiusAxisProps extends EventAttributes, Partial<PresentationAttributes> {
+    type?: 'number' | 'category';
+    cx?: number;
+    cy?: number;
+    hide?: boolean;
+    radiusAxisId?: string | number;
+    angle?: number;
+    tickCount?: number;
+    ticks?: PolarRadiusAxisTick[];
+    orientation?: "left" | "right" | "middle";
+    axisLine?: boolean | object;
+    tick?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    stroke?: string;
+    tickFormatter: TickFormatterFunction;
+    domain?: PolarRadiusAxisDomain[];
+    scale?: ScaleType | RechartsFunction;
+    allowDataOverflow?: boolean;
 }
 
 export class PolarRadiusAxis extends React.Component<PolarRadiusAxisProps> { }
 
-export interface PolygonProps {
-	points: any[];
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PolygonPoint {
+    x: number;
+    y: number;
+}
+
+export interface PolygonProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    points?: PolygonPoint[];
 }
 
 export class Polygon extends React.Component<PolygonProps> { }
 
-export interface RadarProps extends Partial<CSSStyleDeclaration> {
-	dataKey: string | number;
-	points: any[];
-	shape: Element | RechartsFunction;
-	dot?: boolean | any | Element | RechartsFunction;
-	legendType?: LegendType;
-	label?: boolean | any | Element | RechartsFunction;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
+export interface RadarPoint {
+    x: number;
+    y: number;
+    cx: number;
+    cy: number;
+    angle: number;
+    radius: number;
+    value: number;
+    payload: object;
+}
+
+export interface RadarProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    points?: RadarPoint[];
+    shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
+    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
+    label?: object | React.ReactElement<any> | Label['content'] | boolean;
+    legendType?: LegendType;
+    hide?: boolean;
 }
 
 export class Radar extends React.Component<RadarProps> { }
 
-export interface RadarChartProps {
-	width: number;
-	height: number;
-	cx?: Percentage | number;
-	cy?: Percentage | number;
-	startAngle?: number;
-	innerRadius?: Percentage | number;
-	outerRadius?: Percentage | number;
-	margin?: Margin;
-	clockWise?: boolean;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-	onClick?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface RadarChartProps extends EventAttributes, CategoricalChartWrapper<'centric'> {
+    startAngle?: number;
+    endAngle?: number;
+    cx?: number | string;
+    cy?: number | string;
+    innerRadius?: number | string;
+    outerRadius?: number | string;
 }
 
 export class RadarChart extends React.Component<RadarChartProps> { }
 
-export interface RadialBarProps extends Partial<CSSStyleDeclaration> {
-	cx?: number;
-	cy?: number;
-	startAngle?: number;
-	endAngle?: number;
-	maxAngle?: number;
-	minAngle?: number;
-	legendType?: LegendType;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	background?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	data: any[];
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface RadialBarData {
+    cx: number;
+    cy: number;
+    innerRadius: number;
+    outerRadius: number;
+    value: any;
+}
+
+export interface RadialBarProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    angleAxisId?: string | number;
+    radiusAxisId?: string | number;
+    shape?: ContentRenderer<any> | React.ReactElement<any>;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
+    cornerRadius?: number | string;
+    minPointSize?: number;
+    maxBarSize?: number;
+    data?: RadialBarData[];
+    legendType?: LegendType;
+    label?: boolean | React.ReactElement<any> | Label['content'] | object;
+    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
+    hide?: boolean;
 }
 
 export class RadialBar extends React.Component<RadialBarProps> { }
 
-export interface RadialBarChartProps {
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	barCategoryGap?: Percentage | number;
-	barGap?: number;
-	cx?: Percentage | number;
-	cy?: Percentage | number;
-	innerRadius?: Percentage | number;
-	outerRadius?: Percentage | number;
-	barSize?: number;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-	onClick?: RechartsFunction;
+export interface RadialBarChartProps extends CategoricalChartWrapper<'radial'> {
+    startAngle?: number;
+    endAngle?: number;
+    cx?: string | number;
+    cy?: string | number;
+    innerRadius?: string | number;
+    outerRadius?: string | number;
 }
 
 export class RadialBarChart extends React.Component<RadialBarChartProps> { }
 
-export interface RectangleProps extends Partial<CSSStyleDeclaration> {
-	x?: number;
-	y?: number;
-	radius?: number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface RectangleProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    radius?: number | any[];
 }
 
 export class Rectangle extends React.Component<RectangleProps> { }
 
-export interface ReferenceAreaProps extends PartialAndNumber<CSSStyleDeclaration> {
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	x1?: number | string;
-	x2?: number | string;
-	y1?: number | string;
-	y2?: number | string;
-	alwaysShow?: boolean;
-	viewBox?: ViewBox;
-	xAxis?: any;
-	yAxis?: any;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<ReferenceAreaProps>;
-	isFront?: boolean;
+export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
+    className?: number | string;
+    viewBox?: ViewBox;
+    xAxis?: object;
+    yAxis?: object;
+    isFront?: boolean;
+    alwaysShow?: boolean;
+    x1?: number | string;
+    x2?: number | string;
+    y1?: number | string;
+    y2?: number | string;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement<any>;
 }
 
 export class ReferenceArea extends React.Component<ReferenceAreaProps> { }
 
-export interface ReferenceDotProps {
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	x: number | string;
-	y: number | string;
-	r: number;
-	alwaysShow?: boolean;
-	xAxis: any;
-	yAxis: any;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<ReferenceDotProps>;
-	isFront?: boolean;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface ReferenceDotProps extends EventAttributes, Partial<PresentationAttributes<number | string, number | string>> {
+    className?: number | string;
+    r?: number;
+    xAxis?: { scale: (x: ReferenceDotProps['x']) => number };
+    yAxis?: { scale: (y: ReferenceDotProps['y']) => number };
+    isFront?: boolean;
+    alwaysShow?: boolean;
+    x?: number | string;
+    y?: number | string;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    shape?: ContentRenderer<
+        EventAttributes
+        & Partial<PresentationAttributes<number | string, number | string>>
+        & { cx: number; cy: number; }
+    > | React.ReactElement<any>;
 }
 
 export class ReferenceDot extends React.Component<ReferenceDotProps> { }
 
-export interface ReferenceLineProps extends PartialAndNumber<CSSStyleDeclaration> {
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	x?: number | string;
-	y?: number | string;
-	alwaysShow?: boolean;
-	viewBox?: ViewBox;
-	xAxis?: any;
-	yAxis?: any;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<ReferenceLineProps>;
-	isFront?: boolean;
+export interface ReferenceLineProps extends Partial<PresentationAttributes<number | string, number | string>> {
+    className?: number | string;
+    viewBox?: ViewBox;
+    xAxis?: object;
+    yAxis?: object;
+    isFront?: boolean;
+    alwaysShow?: boolean;
+    x?: number | string;
+    y?: number | string;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    shape?: ContentRenderer<
+        EventAttributes
+        & Partial<PresentationAttributes<number | string, number | string>>
+        & { x1: number; y1: number; x2: number; y2: number; }
+    > | React.ReactElement<any>;
 }
 
 export class ReferenceLine extends React.Component<ReferenceLineProps> { }
 
 export interface ResponsiveContainerProps {
-	aspect?: number;
-	width?: Percentage | number;
-	height?: Percentage | number;
-	minWidth?: number;
-	minHeight?: number;
-    maxHeight?: Percentage | number;
-	debounce?: number;
+    aspect?: number;
+    width?: string | number;
+    height?: string | number;
+    minHeight?: string | number;
+    minWidth?: string | number;
+    maxHeight?: string | number;
+    children: React.ReactNode;
+    debounce?: number;
+    id?: string | number;
+    className?: string | number;
 }
 
 export class ResponsiveContainer extends React.Component<ResponsiveContainerProps> { }
 
-export interface ScatterProps extends Partial<CSSStyleDeclaration> {
-	legendType?: LegendType;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	zAxisId?: string | number;
-	line?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | RechartsFunction;
-	lineType?: 'joint' | 'fitting';
-	points: any[];
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface ScatterPoint {
+    cx?: number;
+    cy?: number;
+    size?: number;
+    node?: {
+        x?: number | string;
+        y?: number | string;
+        z?: number | string;
+    };
+    payload?: any;
+}
+
+export interface ScatterProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    zAxisId?: string | number;
+    line?: boolean | object | RechartsFunction | React.ReactElement<any>;
+    lineType?: 'joint' | 'fitting';
+    lineJointType?: LineType;
+    legendType?: LegendType;
+    activeIndex?: number;
+    activeShape?: object | RechartsFunction | React.ReactElement<any>;
+    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | ContentRenderer<any>;
+    points?: ScatterPoint[];
+    hide?: boolean;
 }
 
 export class Scatter extends React.Component<ScatterProps> { }
 
-export interface ScatterChartProps {
-	width: number;
-	height: number;
-	margin?: Margin;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type ScatterChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class ScatterChart extends React.Component<ScatterChartProps> { }
 
-export interface SectorProps {
-	cx?: number;
-	cy?: number;
-	innerRadius?: number;
-	outerRadius?: number;
-	startAngle?: number;
-	endAngle?: number;
-	cornerRadius?: number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface SectorProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    cx?: number;
+    cy?: number;
+    innerRadius?: number;
+    outerRadius?: number;
+    startAngle?: number;
+    endAngle?: number;
+    cornerRadius?: number | string;
 }
 
 export class Sector extends React.Component<SectorProps> { }
 
-export interface TextProps extends Partial<CSSStyleDeclaration> {
-	scaleToFit?: boolean;
-	angle?: number;
-	textAnchor?: 'start' | 'middle' | 'end' | 'inherit';
-	verticalAnchor?: 'start' | 'middle' | 'end';
+export interface TextProps extends Partial<PresentationAttributes> {
+    scaleToFit?: boolean;
+    angle?: number;
+    textAnchor?: 'start' | 'middle' | 'end' | 'inherit';
+    verticalAnchor?: 'start' | 'middle' | 'end';
+    style?: object;
 }
 
 export class Text extends React.Component<TextProps> { }
 
 export interface ViewBox {
-	x?: number;
-	y?: number;
-	width?: number;
-	height?: number;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
 }
+
 export interface PolarViewBox {
-	cx?: number;
-	cy?: number;
-	innerRadius?: number;
-	outerRadius?: number;
-	startAngle?: number;
-	endAngle?: number;
+    cx?: number;
+    cy?: number;
+    innerRadius?: number;
+    outerRadius?: number;
+    startAngle?: number;
+    endAngle?: number;
 }
+
 export interface Coordinate {
-	x: number;
-	y: number;
+    x: number;
+    y: number;
 }
+
 export interface TooltipPayload {
-	name: string;
-	value: string | number | Array<string | number>;
-	unit: string;
+    name: string;
+    value: string | number | Array<string | number>;
+    unit: string;
 }
-export interface TooltipProps {
-	separator?: string;
-	offset?: number;
-	itemStyle?: any;
-	wrapperStyle?: any;
-	labelStyle?: any;
-	cursor?: boolean | any | React.ReactElement<any> | React.StatelessComponent<any>;
-	viewBox?: ViewBox;
-	active?: boolean;
-	coordinate?: Coordinate;
-	payload?: TooltipPayload[];
-	label?: string | number;
-	content?: React.ReactElement<any> | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
-	formatter?: TooltipFormatter;
-	labelFormatter?: LabelFormatter;
-	itemSorter?: ItemSorter<TooltipPayload>;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	filterNull?: boolean;
+
+export interface TooltipProps extends Animatable {
+    content?: React.ReactElement<any> | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
+    viewBox?: ViewBox;
+    active?: boolean;
+    separator?: string;
+    formatter?: TooltipFormatter;
+    offset?: number;
+    itemStyle?: object;
+    labelStyle?: object;
+    wrapperStyle?: object;
+    cursor?: boolean | object | React.ReactElement<any> | React.StatelessComponent<any>;
+    coordinate?: Coordinate;
+    position?: Coordinate;
+    label?: string | number;
+	  labelFormatter?: LabelFormatter;
+    payload?: TooltipPayload[];
+    itemSorter?: ItemSorter<TooltipPayload>;
+    filterNull?: boolean;
 }
 
 export class Tooltip extends React.Component<TooltipProps> { }
 
-export interface TreemapProps {
-	data: any[];
-	width?: number;
-	height?: number;
-	dataKey?: string;
-	aspectRatio: number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-}
-
-export interface Label {
-	viewBox?: ViewBox | PolarViewBox;
-	formatter?: LabelFormatter;
-	value: string | number;
-	position?: PositionType;
-	offset?: number;
-	content?: React.ReactElement<any> | ContentRenderer<Label>;
-	children?: any;
+export interface TreemapProps extends EventAttributes, Animatable {
+    width?: number;
+    height?: number;
+    data?: any[];
+    style?: object;
+    aspectRatio?: number;
+    content?: React.ReactElement<any> | ContentRenderer<any>;
+    fill?: string;
+    stroke?: string;
+    className?: string;
+    nameKey?: string | number | RechartsFunction;
+    dataKey?: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    children?: React.ReactNode[] | React.ReactNode;
 }
 
 export class Treemap extends React.Component<TreemapProps> { }
 
-export interface XPadding {
-	left: number;
-	right: number;
+export interface Label {
+    className?: string;
+    viewBox?: ViewBox | PolarViewBox;
+    formatter?: LabelFormatter;
+    value: string | number;
+    offset?: number;
+    position?: PositionType;
+    children?: React.ReactNode[] | React.ReactNode;
+    content?: React.ReactElement<any> | ContentRenderer<Label>;
 }
 
-export interface XAxisProps {
-	hide?: boolean;
-	dataKey?: string | number;
-	xAxisId?: string | number;
-	width?: number;
-	height?: number;
-	orientation?: 'bottom' | 'top';
-	type?: 'number' | 'category';
-	allowDecimals?: boolean;
-	allowDataOverflow?: boolean;
-	tickCount?: number;
-	domain?: any[];
-	interval?: "preserveStart" | "preserveEnd" | "preserveStartEnd" | number;
-	padding?: XPadding;
-	minTickGap?: number;
-	axisLine?: boolean | any;
-	tickLine?: boolean | any;
-	tickSize?: number;
-	tickFormatter?: TickFormatterFunction;
-	ticks?: any[];
-	tick?: boolean | any | React.ReactElement<any>;
-	mirror?: boolean;
-	reversed?: boolean;
-	label?: string | number | React.ReactElement<any> | Label;
-	scale?: ScaleType | RechartsFunction;
-	unit?: string | number;
-	name?: string | number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface LabelProps extends ViewBox {
+    index: number;
+    value: string | number;
+    offset?: number;
+    viewBox: ViewBox;
+    content?: React.ReactElement<any> | ContentRenderer<Label>;
+}
+
+export type AxisDomain = string | number | ContentRenderer<any> | 'auto' | 'dataMin' | 'dataMax';
+
+export interface XPadding {
+    left: number;
+    right: number;
+}
+
+/**
+ * In the current lib, there is not actual implementation for XAxis.
+ */
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface XAxisProps extends EventAttributes {
+    allowDecimals?: boolean;
+    hide?: boolean;
+    // The name of data displayed in the axis
+    name?: string | number;
+    // The unit of data displayed in the axis
+    unit?: string | number;
+    // The unique id of x-axis
+    xAxisId?: string | number;
+    domain?: AxisDomain[];
+    // The key of data displayed in the axis
+    dataKey?: DataKey;
+    // The width of axis which is usually calculated internally
+    width?: number;
+    // The height of axis, which need to be set by user
+    height?: number;
+    mirror?: boolean;
+    // The orientation of axis
+    orientation?: 'top' | 'bottom';
+    type?: 'number' | 'category';
+    // Ticks can be any type when the axis is the type of category
+    // Ticks must be numbers when the axis is the type of number
+    ticks?: any[];
+    // The count of ticks
+    tickCount?: number;
+    // The formatter function of tick
+    tickFormatter?: TickFormatterFunction;
+    padding?: XPadding;
+    allowDataOverflow?: boolean;
+    scale?: ScaleType | RechartsFunction;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    axisLine?: boolean | object;
+    tickLine?: boolean | object;
+    minTickGap?: number;
+    tickSize?: number;
+    interval?: AxisInterval;
+    reversed?: boolean;
+    // see label section at http://recharts.org/#/en-US/api/XAxis
+    label?: string | number | Label;
 }
 
 export class XAxis extends React.Component<XAxisProps> { }
 
 export interface YPadding {
-	top: number;
-	bottom: number;
+    top: number;
+    bottom: number;
 }
-export interface YAxisProps {
-	hide?: boolean;
-	dataKey?: string | number;
-	yAxisId?: string | number;
-	width?: number;
-	height?: number;
-	orientation?: 'left' | 'right';
-	type?: 'number' | 'category';
-	domain?: any[];
-	interval?: "preserveStart" | "preserveEnd" | "preserveStartEnd" | number;
-	padding?: YPadding;
-	minTickGap?: number;
-	allowDecimals?: boolean;
-	allowDataOverflow?: boolean;
-	axisLine?: boolean | any;
-	tickCount?: number;
-	tickLine?: boolean | any;
-	tickSize?: number;
-	tickFormatter?: TickFormatterFunction;
-	ticks?: any[];
-	tick?: boolean | any | React.ReactElement<any>;
-	mirror?: boolean;
-	reversed?: boolean;
-	label?: string | number | React.ReactElement<any> | Label;
-	scale?: ScaleType | RechartsFunction;
-	unit?: string | number;
-	name?: string | number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface YAxisProps extends EventAttributes {
+    allowDecimals?: boolean;
+    hide?: boolean;
+    // The name of data displayed in the axis
+    name?: string | number;
+    // The unit of data displayed in the axis
+    unit?: string | number;
+    // The unique id of y-axis
+    yAxisId?: string | number;
+    domain?: AxisDomain[];
+    // The key of data displayed in the axis
+    dataKey?: DataKey;
+    // Ticks can be any type when the axis is the type of category
+    // Ticks must be numbers when the axis is the type of number
+    ticks?: any[];
+    // The count of ticks
+    tickCount?: number;
+    // The formatter function of tick
+    tickFormatter?: TickFormatterFunction;
+    // The width of axis, which need to be set by user
+    width?: number;
+    // The height of axis which is usually calculated in Chart
+    height?: number;
+    mirror?: boolean;
+    // The orientation of axis
+    orientation?: 'left' | 'right';
+    type?: 'number' | 'category';
+    padding?: YPadding;
+    allowDataOverflow?: boolean;
+    scale?: ScaleType | RechartsFunction;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    axisLine?: boolean | object;
+    tickLine?: boolean | object;
+    minTickGap?: number;
+    tickSize?: number;
+    interval?: AxisInterval;
+    reversed?: boolean;
+    // see label section at http://recharts.org/#/en-US/api/YAxis
+    label?: string | number | Label;
 }
 
 export class YAxis extends React.Component<YAxisProps> { }
 
 export interface ZAxisProps {
-	dataKey: string | number;
-	zAxisId?: string | number;
-	range?: any[];
-	unit?: string | number;
-	name?: string | number;
-	scale?: ScaleType | RechartsFunction;
+    type?: 'number' | 'category';
+    // The name of data displayed in the axis
+    name?: string | number;
+    // The unit of data displayed in the axis
+    unit?: string | number;
+    // The unique id of z-axis
+    zAxisId?: string | number;
+    // The key of data displayed in the axis
+    dataKey?: DataKey;
+    // The range of axis
+    range?: number[];
+    scale?: ScaleType | RechartsFunction;
 }
 
 export class ZAxis extends React.Component<ZAxisProps> { }
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 9951fc775b..8ca211113d 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -1,37 +1,116 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
-import { CartesianGrid, Line, LineChart, XAxis, YAxis, Tooltip, ReferenceLine, ReferenceArea } from 'recharts';
+import { CartesianGrid, Line, LineChart, PieChart, Pie, Sector, XAxis, YAxis, Tooltip, ReferenceLine, ReferenceArea, ResponsiveContainer } from 'recharts';
 
-const Component = (props: {}) => {
-    const data = [
-        {name: 'Page A', uv: 4000, pv: 2400, amt: 2400},
-        {name: 'Page B', uv: 3000, pv: 1398, amt: 2210},
-        {name: 'Page C', uv: 2000, pv: 9800, amt: 2290},
-        {name: 'Page D', uv: 2780, pv: 3908, amt: 2000},
-        {name: 'Page E', uv: 1890, pv: 4800, amt: 2181},
-        {name: 'Page F', uv: 2390, pv: 3800, amt: 2500},
-        {name: 'Page G', uv: 3490, pv: 4300, amt: 2100},
-    ];
+interface ComponentState {
+    activeIndex: number;
+}
 
-    return (
-        <LineChart width={500} height={300} data={data}>
-            <XAxis dataKey="name"/>
-            <YAxis/>
-            <CartesianGrid stroke="#eee" strokeDasharray="5 5"/>
-            <Line type="monotone" dataKey="uv" stroke="#8884d8" />
-            <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
-            <Tooltip />
-            <ReferenceLine />
-            <ReferenceArea
-                stroke="red"
-                fill="red"
-                y2={1}
-                strokeOpacity={0.2}
-                fillOpacity={0.1}
-            />
-        </LineChart>
-    );
-};
+class Component extends React.Component<{}, ComponentState> {
+    constructor(props: any) {
+        super(props);
+        this.state = {
+            activeIndex: 0
+        };
+    }
 
-ReactDOM.render(<Component />, document.getElementById('app'));
+    render() {
+        const data = [
+            { name: 'Page A', uv: 4000, pv: 2400, amt: 2400 },
+            { name: 'Page B', uv: 3000, pv: 1398, amt: 2210 },
+            { name: 'Page C', uv: 2000, pv: 9800, amt: 2290 },
+            { name: 'Page D', uv: 2780, pv: 3908, amt: 2000 },
+            { name: 'Page E', uv: 1890, pv: 4800, amt: 2181 },
+            { name: 'Page F', uv: 2390, pv: 3800, amt: 2500 },
+            { name: 'Page G', uv: 3490, pv: 4300, amt: 2100 },
+        ];
+
+        const data2 = [
+            { name: 'Group A', value: 400 },
+            { name: 'Group B', value: 300 },
+            { name: 'Group C', value: 300 },
+            { name: 'Group D', value: 200 }
+        ];
+
+        const renderActiveShape = (props: any) => {
+            const RADIAN = Math.PI / 180;
+            const { cx, cy, midAngle, innerRadius, outerRadius, startAngle, endAngle,
+                fill, payload, percent, value } = props;
+            const sin = Math.sin(-RADIAN * midAngle);
+            const cos = Math.cos(-RADIAN * midAngle);
+            const sx = cx + (outerRadius + 10) * cos;
+            const sy = cy + (outerRadius + 10) * sin;
+            const mx = cx + (outerRadius + 30) * cos;
+            const my = cy + (outerRadius + 30) * sin;
+            const ex = mx + (cos >= 0 ? 1 : -1) * 22;
+            const ey = my;
+            const textAnchor = cos >= 0 ? 'start' : 'end';
+
+            return (
+                <g>
+                    <text x={cx} y={cy} dy={8} textAnchor="middle" fill={fill}>{payload.name}</text>
+                    <Sector
+                        cx={cx}
+                        cy={cy}
+                        innerRadius={innerRadius}
+                        outerRadius={outerRadius}
+                        startAngle={startAngle}
+                        endAngle={endAngle}
+                        fill={fill}
+                    />
+                    <Sector
+                        cx={cx}
+                        cy={cy}
+                        startAngle={startAngle}
+                        endAngle={endAngle}
+                        innerRadius={outerRadius + 6}
+                        outerRadius={outerRadius + 10}
+                        fill={fill}
+                    />
+                    <path d={`M${sx},${sy}L${mx},${my}L${ex},${ey}`} stroke={fill} fill="none" />
+                    <circle cx={ex} cy={ey} r={2} fill={fill} stroke="none" />
+                    <text x={ex + (cos >= 0 ? 1 : -1) * 12} y={ey} textAnchor={textAnchor} fill="#333">{`PV ${value}`}</text>
+                    <text x={ex + (cos >= 0 ? 1 : -1) * 12} y={ey} dy={18} textAnchor={textAnchor} fill="#999">
+                        {`(Rate ${(percent * 100).toFixed(2)}%)`}
+                    </text>
+                </g>
+            );
+        };
+        return (
+            <ResponsiveContainer>
+                <LineChart width={500} height={300} data={data}>
+                    <XAxis dataKey="name" />
+                    <YAxis />
+                    <CartesianGrid stroke="#eee" strokeDasharray="5 5" />
+                    <Line type="monotone" dataKey="uv" stroke="#8884d8" />
+                    <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
+                    <Tooltip />
+                    <ReferenceLine />
+                    <ReferenceArea
+                        stroke="red"
+                        fill="red"
+                        y2={1}
+                        strokeOpacity={0.2}
+                        fillOpacity={0.1}
+                    />
+                </LineChart>
+                <PieChart width={800} height={400}>
+                    <Pie
+                        dataKey="value"
+                        activeIndex={this.state.activeIndex}
+                        activeShape={renderActiveShape}
+                        data={data}
+                        cx={300}
+                        cy={200}
+                        innerRadius={60}
+                        outerRadius={80}
+                        fill="#8884d8"
+                    />
+                </PieChart>
+            </ResponsiveContainer>
+        );
+    }
+}
+
+ReactDOM.render(<Component/>, document.getElementById('app'));
diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index 36621f3376..a9d807360b 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -78,13 +78,13 @@ declare module 'recompose' {
 
     // withHandlers: https://github.com/acdlite/recompose/blob/master/docs/API.md#withhandlers
     type EventHandler = Function;
-    type HandleCreators<TOutter> = {
-        [handlerName: string]: mapper<TOutter, EventHandler>;
+    type HandleCreators<TOutter, THandlers> = {
+        [handlerName in keyof THandlers]: mapper<TOutter, EventHandler>;
     };
-    type HandleCreatorsFactory<TOutter, THandlers> = (initialProps: TOutter) => HandleCreators<TOutter>;
+    type HandleCreatorsFactory<TOutter, THandlers> = (initialProps: TOutter) => HandleCreators<TOutter, THandlers>;
     export function withHandlers<TOutter, THandlers>(
-        handlerCreators: HandleCreators<TOutter> | HandleCreatorsFactory<TOutter, THandlers>
-    ): InferableComponentEnhancerWithProps<THandlers, TOutter>;
+        handlerCreators: HandleCreators<TOutter, THandlers> | HandleCreatorsFactory<TOutter, THandlers>
+    ): InferableComponentEnhancerWithProps<TOutter & THandlers, TOutter>;
 
     // defaultProps: https://github.com/acdlite/recompose/blob/master/docs/API.md#defaultprops
     export function defaultProps<T = {}>(
@@ -134,13 +134,16 @@ declare module 'recompose' {
 
     // withStateHandlers: https://github.com/acdlite/recompose/blob/master/docs/API.md#withstatehandlers
     type StateHandler<TState> = (...payload: any[]) => TState | undefined;
-    type StateUpdaters<TOutter, TState> = {
-      [updaterName: string]: (state: TState, props: TOutter) => StateHandler<TState>;
+    type StateHandlerMap<TState> = {
+      [updaterName: string]: StateHandler<TState>;
     };
-    export function withStateHandlers<TState, TUpdaters, TOutter>(
+    type StateUpdaters<TOutter, TState, TUpdaters> = {
+      [updaterName in keyof TUpdaters]: (state: TState, props: TOutter) => StateHandler<TState>;
+    };
+    export function withStateHandlers<TState, TUpdaters extends StateHandlerMap<TState>, TOutter = {}>(
       createProps: TState | mapper<TOutter, TState>,
-      stateUpdaters: StateUpdaters<TOutter, TState>,
-    ): InferableComponentEnhancerWithProps<TUpdaters & TState, TOutter>;
+      stateUpdaters: StateUpdaters<TOutter, TState, TUpdaters>,
+    ): InferableComponentEnhancerWithProps<TOutter & TState & TUpdaters, TOutter>;
 
     // withReducer: https://github.com/acdlite/recompose/blob/master/docs/API.md#withReducer
     type reducer<TState, TAction> = (s: TState, a: TAction) => TState;
@@ -216,7 +219,7 @@ declare module 'recompose' {
         contextTypes: ValidationMap<TContext>
     ) : InferableComponentEnhancer<TContext>;
 
-    interface ReactLifeCycleFunctionsThisArguments<TProps, TState> {
+    interface _ReactLifeCycleFunctionsThisArguments<TProps, TState> {
         props: TProps,
         state: TState,
         setState<TKeyOfState extends keyof TState>(f: (prevState: TState, props: TProps) => Pick<TState, TKeyOfState>, callback?: () => any): void;
@@ -228,20 +231,22 @@ declare module 'recompose' {
             [key: string]: React.ReactInstance
         };
     }
+    type ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance = {}> =
+        _ReactLifeCycleFunctionsThisArguments<TProps, TState> & TInstance
 
     // lifecycle: https://github.com/acdlite/recompose/blob/master/docs/API.md#lifecycle
-    interface ReactLifeCycleFunctions<TProps, TState> {
-        componentWillMount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>) => void;
-        componentDidMount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>) => void;
-        componentWillReceiveProps?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, nextProps: TProps) => void;
-        shouldComponentUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, nextProps: TProps, nextState: TState) => boolean;
-        componentWillUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, nextProps: TProps, nextState: TState) => void;
-        componentDidUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, prevProps: TProps, prevState: TState) => void;
-        componentWillUnmount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>) => void;
+    interface ReactLifeCycleFunctions<TProps, TState, TInstance = {}> {
+        componentWillMount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance>) => void;
+        componentDidMount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance>) => void;
+        componentWillReceiveProps?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance>, nextProps: TProps) => void;
+        shouldComponentUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance>, nextProps: TProps, nextState: TState) => boolean;
+        componentWillUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance>, nextProps: TProps, nextState: TState) => void;
+        componentDidUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance>, prevProps: TProps, prevState: TState) => void;
+        componentWillUnmount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState, TInstance>) => void;
     }
 
-    export function lifecycle<TProps, TState>(
-        spec: ReactLifeCycleFunctions<TProps, TState>
+    export function lifecycle<TProps, TState, TInstance = {}>(
+        spec: ReactLifeCycleFunctions<TProps, TState, TInstance> & TInstance
     ): InferableComponentEnhancer<{}>;
 
     // toClass: https://github.com/acdlite/recompose/blob/master/docs/API.md#toClass
@@ -365,7 +370,7 @@ declare module 'recompose' {
     export function createEventHandler<T, TSubs extends Subscribable<T>>(): EventHandlerOf<T, TSubs>;
 
     // createEventHandlerWithConfig: https://github.com/acdlite/recompose/blob/master/docs/API.md#createEventHandlerWithConfig
-    export function createEventHandlerWithConfig(config: ObservableConfig): 
+    export function createEventHandlerWithConfig(config: ObservableConfig):
         <T, TSubs extends Subscribable<T>>() => EventHandlerOf<T, TSubs>;
 
     // setObservableConfig: https://github.com/acdlite/recompose/blob/master/docs/API.md#setObservableConfig
diff --git a/types/recompose/recompose-tests.tsx b/types/recompose/recompose-tests.tsx
index 1ed22fac20..1504ab563a 100644
--- a/types/recompose/recompose-tests.tsx
+++ b/types/recompose/recompose-tests.tsx
@@ -18,6 +18,8 @@ import {
     createEventHandlerWithConfig,
     componentFromStreamWithConfig, mapPropsStreamWithConfig,
     setObservableConfig,
+    StateHandler,
+    StateHandlerMap,
 } from "recompose";
 import rxjsconfig from "recompose/rxjsObservableConfig";
 import rxjs4config from "recompose/rxjs4ObservableConfig";
@@ -81,20 +83,20 @@ function testWithPropsOnChange() {
 }
 
 function testWithHandlers() {
+    interface OutterProps {
+        out: number;
+    }
     interface InnerProps {
-        onSubmit: React.MouseEventHandler<HTMLDivElement>;
-        onChange: Function;
         foo: string;
     }
     interface HandlerProps {
         onSubmit: React.MouseEventHandler<HTMLDivElement>;
         onChange: Function;
     }
-    interface OutterProps { out: number; }
-    const InnerComponent: React.StatelessComponent<InnerProps> = ({onChange, onSubmit}) =>
-      <div onClick={onSubmit}></div>;
+    const InnerComponent: React.StatelessComponent<InnerProps & HandlerProps> = ({onChange, onSubmit, foo}) =>
+      <div onClick={onSubmit}>{foo}</div>;
 
-    const enhancer = withHandlers<OutterProps, HandlerProps>({
+    const enhancer = withHandlers<OutterProps & InnerProps, HandlerProps>({
       onChange: (props) => (e: any) => {},
       onSubmit: (props) => (e: React.MouseEvent<any>) => {},
     });
@@ -106,7 +108,7 @@ function testWithHandlers() {
         />
     )
 
-    const enhancer2 = withHandlers<OutterProps, HandlerProps>((props) => ({
+    const enhancer2 = withHandlers<OutterProps & InnerProps, HandlerProps>((props) => ({
       onChange: (props) => (e: any) => {},
       onSubmit: (props) => (e: React.MouseEvent<any>) => {},
     }));
@@ -117,6 +119,11 @@ function testWithHandlers() {
             out={42}
         />
     )
+
+    const handlerNameTypecheckProof = withHandlers<OutterProps, HandlerProps>({
+      onChange: () => () => {},
+      notAKeyOnHandlerProps: () => () => {},  // $ExpectError
+    });
 }
 
 function testDefaultProps() {
@@ -186,11 +193,14 @@ function testWithState() {
 
 function testWithStateHandlers() {
     interface State { counter: number; }
-    interface Updaters { add: (n: number) => State; }
-    type InnerProps = State & Updaters;
+    interface Updaters extends StateHandlerMap<State> {
+      add: StateHandler<State>;
+    }
     interface OutterProps { initialCounter: number, power: number }
+    type InnerProps = State & Updaters & OutterProps;
     const InnerComponent: React.StatelessComponent<InnerProps> = (props) =>
         <div>
+            <div>{`Initial counter: ${props.initialCounter}`}</div>
             <div>{`Counter: ${props.counter}`}</div>
             <div onClick={() => props.add(2)}></div>
         </div>;
@@ -205,7 +215,12 @@ function testWithStateHandlers() {
     const rendered = (
         <Enhanced initialCounter={4} power={2} />
     );
-}
+
+    const updateNameTypecheckProof = withStateHandlers<State, Updaters, OutterProps>(
+        (props: OutterProps) => ({ counter: props.initialCounter }),
+        { notAKeyOfUpdaters: (state, props) => n => ({ ...state, counter: state.counter + n ** props.power }), }, // $ExpectError
+    );
+  }
 
 function testWithReducer() {
     interface State { count: number }
@@ -289,3 +304,21 @@ function testOnlyUpdateForKeys() {
     // This should be a compile error
     // onlyUpdateForKeys<Props>(['fo'])(component)
 }
+
+function testLifecycle() {
+    interface Props {
+        foo: number;
+        bar: string;
+    }
+    interface State {}
+    interface Instance {
+        instanceValue: number
+    }
+    const component: React.StatelessComponent<Props> = (props) => <div>{props.foo} {props.bar}</div>
+    lifecycle<Props, State, Instance>({
+        instanceValue: 1,
+        componentDidMount() {
+            this.instanceValue = 2
+        }
+    })(component)
+}
diff --git a/types/recompose/tsconfig.json b/types/recompose/tsconfig.json
index 4c56e4b125..4aae173e9b 100644
--- a/types/recompose/tsconfig.json
+++ b/types/recompose/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "recompose-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/recompose/tslint.json b/types/recompose/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/recompose/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/recursive-readdir/v1/tslint.json b/types/recursive-readdir/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/recursive-readdir/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redis-errors/index.d.ts b/types/redis-errors/index.d.ts
new file mode 100644
index 0000000000..663a367d9a
--- /dev/null
+++ b/types/redis-errors/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for redis-errors 1.2
+// Project: https://github.com/NodeRedis/redis-errors#readme
+// Definitions by: James Garbutt <https://github.com/43081j>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class RedisError extends Error {
+}
+
+export class ParserError extends RedisError {
+    buffer: string;
+    offset: number;
+
+    constructor(message: string, buffer: string, offset: number);
+}
+
+export class ReplyError extends RedisError {
+    command?: string;
+    args?: any[];
+    code?: string;
+
+    constructor(message: string);
+}
+
+export class AbortError extends RedisError {
+    command?: string;
+    args?: any[];
+}
+
+export class InterruptError extends RedisError {
+    command?: string;
+    args?: any[];
+    origin: Error;
+}
diff --git a/types/redis-errors/redis-errors-tests.ts b/types/redis-errors/redis-errors-tests.ts
new file mode 100644
index 0000000000..f9d464e5b5
--- /dev/null
+++ b/types/redis-errors/redis-errors-tests.ts
@@ -0,0 +1,27 @@
+import {
+    RedisError,
+    ReplyError,
+    ParserError,
+    AbortError,
+    InterruptError
+} from 'redis-errors';
+
+const err = new RedisError('some error');
+
+const reply = new ReplyError('some error');
+const replyArgs: any[] | undefined = reply.args;
+const replyCommand: string | undefined = reply.command;
+const replyCode: string | undefined = reply.code;
+
+const parser = new ParserError('some error', 'a buffer', 4);
+const parserBuffer: string = parser.buffer;
+const parserOffset: number = parser.offset;
+
+const abort = new AbortError('some error');
+const abortArgs: any[] | undefined = abort.args;
+const abortCommand: string | undefined = abort.command;
+
+const interrupt = new InterruptError('some error');
+const interruptArgs: any[] | undefined = interrupt.args;
+const interruptCommand: string | undefined = interrupt.command;
+const interruptOrigin: Error | undefined = interrupt.origin;
diff --git a/types/redis-errors/tsconfig.json b/types/redis-errors/tsconfig.json
new file mode 100644
index 0000000000..cc922f5c1a
--- /dev/null
+++ b/types/redis-errors/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redis-errors-tests.ts"
+    ]
+}
diff --git a/types/redis-errors/tslint.json b/types/redis-errors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redis-errors/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redis-rate-limiter/index.d.ts b/types/redis-rate-limiter/index.d.ts
index f8482f77cb..6e36f60f3e 100644
--- a/types/redis-rate-limiter/index.d.ts
+++ b/types/redis-rate-limiter/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/TabDigital/redis-rate-limiter
 // Definitions by: Seth Westphal <https://github.com/westy92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as express from 'express';
 import * as redis from 'redis';
diff --git a/types/redis-rate-limiter/tslint.json b/types/redis-rate-limiter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redis-rate-limiter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redis-scripto/tslint.json b/types/redis-scripto/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redis-scripto/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redis/index.d.ts b/types/redis/index.d.ts
index 8ce138cd95..db0dd122ba 100644
--- a/types/redis/index.d.ts
+++ b/types/redis/index.d.ts
@@ -1,6 +1,11 @@
-// Type definitions for redis 2.6.0
+// Type definitions for redis 2.8
 // Project: https://github.com/mranney/node_redis
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Peter Harris <https://github.com/CodeAnimal>, TANAKA Koichi <https://github.com/MugeSo>
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+//                 Peter Harris <https://github.com/CodeAnimal>
+//                 TANAKA Koichi <https://github.com/MugeSo>
+//                 Stuart Schechter <https://github.com/UppaJung>
+//                 Junyoung Choi <https://github.com/Rokt33r>
+//                 James Garbutt <https://github.com/43081j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Imported from: https://github.com/types/npm-redis
@@ -11,15 +16,13 @@ import { EventEmitter } from 'events';
 import { Duplex } from 'stream';
 
 export interface RetryStrategyOptions {
-    error: Error;
+    error: NodeJS.ErrnoException;
     total_retry_time: number;
     times_connected: number;
     attempt: number;
 }
 
-export interface RetryStrategy {
-    (options: RetryStrategyOptions): number | Error;
-}
+export type RetryStrategy = (options: RetryStrategyOptions) => number | Error;
 
 export interface ClientOpts {
     host?: string;
@@ -39,17 +42,15 @@ export interface ClientOpts {
     retry_unfulfilled_commands?: boolean;
     auth_pass?: string;
     password?: string;
-    db?: string;
+    db?: string | number;
     family?: string;
-    rename_commands?: { [command: string]: string };
+    rename_commands?: { [command: string]: string } | null;
     tls?: any;
     prefix?: string;
     retry_strategy?: RetryStrategy;
 }
 
-export interface Callback<T> {
-    (err: Error | null, reply: T): void;
-}
+export type Callback<T> = (err: Error | null, reply: T) => void;
 
 export interface ServerInfo {
     redis_version: string;
@@ -57,65 +58,54 @@ export interface ServerInfo {
 }
 
 export interface OverloadedCommand<T, U, R> {
-    (args: T[], cb?: Callback<U>): R;
-    (arg: T, args: T[], cb?: Callback<U>): R;
-
     (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
     (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
     (arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
     (arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
-    (arg1: T, arg2: T, cb?: Callback<U>): R;
-    (arg1: T, cb?: Callback<U>): R;
-    (...args: (T | Callback<U>)[]): R;
+    (arg1: T, arg2: T | T[], cb?: Callback<U>): R;
+    (arg1: T | T[], cb?: Callback<U>): R;
+    (...args: Array<T | Callback<U>>): R;
 }
 
 export interface OverloadedKeyCommand<T, U, R> {
-    (key: string, args: T[], cb?: Callback<U>): R;
-
     (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, cb?: Callback<U>): R;
-    (key: string, arg1: T, cb?: Callback<U>): R;
-    (key: string, ...args: (T | Callback<U>)[]): R;
-    (...args: (string | T | Callback<U>)[]): R;
+    (key: string, arg1: T| T[], cb?: Callback<U>): R;
+    (key: string, ...args: Array<T | Callback<U>>): R;
+    (...args: Array<string | T | Callback<U>>): R;
 }
 
 export interface OverloadedListCommand<T, U, R> {
-    (args: T[], cb?: Callback<U>): R;
-
     (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
     (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
     (arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
     (arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
     (arg1: T, arg2: T, cb?: Callback<U>): R;
-    (arg1: T, cb?: Callback<U>): R;
-    (...args: (T | Callback<U>)[]): R;
+    (arg1: T | T[], cb?: Callback<U>): R;
+    (...args: Array<T | Callback<U>>): R;
 }
 
 export interface OverloadedSetCommand<T, U, R> {
-    (key: string, args: { [key: string]: T } | T[], cb?: Callback<U>): R;
-
     (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
     (key: string, arg1: T, arg2: T, cb?: Callback<U>): R;
-    (key: string, arg1: T, cb?: Callback<U>): R;
-    (key: string, ...args: (T | Callback<U>)[]): R;
+    (key: string, arg1: T | { [key: string]: T } | T[], cb?: Callback<U>): R;
+    (key: string, ...args: Array<T | Callback<U>>): R;
 }
 
 export interface OverloadedLastCommand<T1, T2, U, R> {
-    (args: (T1 | T2)[], cb?: Callback<U>): R;
-    (arg: T1, args: (T1 | T2)[], cb?: Callback<U>): R;
-
     (arg1: T1, arg2: T1, arg3: T1, arg4: T1, arg5: T1, arg6: T2, cb?: Callback<U>): R;
     (arg1: T1, arg2: T1, arg3: T1, arg4: T1, arg5: T2, cb?: Callback<U>): R;
     (arg1: T1, arg2: T1, arg3: T1, arg4: T2, cb?: Callback<U>): R;
     (arg1: T1, arg2: T1, arg3: T2, cb?: Callback<U>): R;
-    (arg1: T1, arg2: T2, cb?: Callback<U>): R;
-    (...args: (T1 | T2 | Callback<U>)[]): R;
+    (arg1: T1, arg2: T2 | Array<T1 | T2>, cb?: Callback<U>): R;
+    (args: Array<T1 | T2>, cb?: Callback<U>): R;
+    (...args: Array<T1 | T2 | Callback<U>>): R;
 }
 
 export interface Commands<R> {
@@ -229,11 +219,11 @@ export interface Commands<R> {
     bitop(operation: string, destkey: string, key1: string, key2: string, key3: string, cb?: Callback<number>): R;
     bitop(operation: string, destkey: string, key1: string, key2: string, cb?: Callback<number>): R;
     bitop(operation: string, destkey: string, key: string, cb?: Callback<number>): R;
-    bitop(operation: string, destkey: string, ...args: (string | Callback<number>)[]): R;
+    bitop(operation: string, destkey: string, ...args: Array<string | Callback<number>>): R;
     BITOP(operation: string, destkey: string, key1: string, key2: string, key3: string, cb?: Callback<number>): R;
     BITOP(operation: string, destkey: string, key1: string, key2: string, cb?: Callback<number>): R;
     BITOP(operation: string, destkey: string, key: string, cb?: Callback<number>): R;
-    BITOP(operation: string, destkey: string, ...args: (string | Callback<number>)[]): R;
+    BITOP(operation: string, destkey: string, ...args: Array<string | Callback<number>>): R;
 
     /**
      * Find first bit set or clear in a string.
@@ -260,8 +250,8 @@ export interface Commands<R> {
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
      */
-    brpoplpush(source: string, destination: string, timeout: number, cb?: Callback<[string, string]>): R;
-    BRPOPLPUSH(source: string, destination: string, timeout: number, cb?: Callback<[string, string]>): R;
+    brpoplpush(source: string, destination: string, timeout: number, cb?: Callback<string|null>): R;
+    BRPOPLPUSH(source: string, destination: string, timeout: number, cb?: Callback<string|null>): R;
 
     /**
      * ADDSLOTS - Assign new hash slots to receiving node.
@@ -482,8 +472,8 @@ export interface Commands<R> {
     /**
      * Get all fields and values in a hash.
      */
-    hgetall(key: string, cb: Callback<{ [key: string]: string }>): R;
-    HGETALL(key: string, cb: Callback<{ [key: string]: string }>): R;
+    hgetall(key: string, cb?: Callback<{ [key: string]: string }>): R;
+    HGETALL(key: string, cb?: Callback<{ [key: string]: string }>): R;
 
     /**
      * Increment the integer value of a hash field by the given number.
@@ -542,20 +532,20 @@ export interface Commands<R> {
     /**
      * Increment the integer value of a key by one.
      */
-    incr(key: string, cb?: Callback<string[]>): R;
-    INCR(key: string, cb?: Callback<string[]>): R;
+    incr(key: string, cb?: Callback<number>): R;
+    INCR(key: string, cb?: Callback<number>): R;
 
     /**
      * Increment the integer value of a key by the given amount.
      */
-    incrby(key: string, increment: number, cb?: Callback<string[]>): R;
-    INCRBY(key: string, increment: number, cb?: Callback<string[]>): R;
+    incrby(key: string, increment: number, cb?: Callback<number>): R;
+    INCRBY(key: string, increment: number, cb?: Callback<number>): R;
 
     /**
      * Increment the float value of a key by the given amount.
      */
-    incrbyfloat(key: string, increment: number, cb?: Callback<string[]>): R;
-    INCRBYFLOAT(key: string, increment: number, cb?: Callback<string[]>): R;
+    incrbyfloat(key: string, increment: number, cb?: Callback<number>): R;
+    INCRBYFLOAT(key: string, increment: number, cb?: Callback<number>): R;
 
     /**
      * Find all keys matching the given pattern.
@@ -1084,8 +1074,8 @@ export interface Commands<R> {
     /**
      * Determine the index of a member in a sorted set.
      */
-    zrank(key: string, member: string, cb?: Callback<number | void>): R;
-    ZRANK(key: string, member: string, cb?: Callback<number | void>): R;
+    zrank(key: string, member: string, cb?: Callback<number | undefined>): R;
+    ZRANK(key: string, member: string, cb?: Callback<number | undefined>): R;
 
     /**
      * Remove one or more members from a sorted set.
@@ -1134,8 +1124,8 @@ export interface Commands<R> {
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
      */
-    zrevrank(key: string, member: string, cb?: Callback<number | void>): R;
-    ZREVRANK(key: string, member: string, cb?: Callback<number | void>): R;
+    zrevrank(key: string, member: string, cb?: Callback<number | undefined>): R;
+    ZREVRANK(key: string, member: string, cb?: Callback<number | undefined>): R;
 
     /**
      * Get the score associated with the given member in a sorted set.
@@ -1190,14 +1180,10 @@ export interface RedisClient extends Commands<boolean>, EventEmitter {
     server_info: ServerInfo;
     stream: Duplex;
 
-    on(event: 'message', listener: (channel: string, message: string) => void): this;
-    on(event: 'pmessage', listener: (pattern: string, channel: string, message: string) => void): this;
-    on(event: 'message_buffer', listener: (channel: string, message: string) => void): this;
-    on(event: 'pmessage_buffer', listener: (pattern: string, channel: string, message: string) => void): this;
-    on(event: 'subscribe', listener: (channel: string, count: number) => void): this;
-    on(event: 'psubscribe', listener: (pattern: string, count: number) => void): this;
-    on(event: 'unsubscribe', listener: (channel: string, count: number) => void): this;
-    on(event: 'punsubscribe', listener: (pattern: string, count: number) => void): this;
+    on(event: 'message' | 'message_buffer', listener: (channel: string, message: string) => void): this;
+    on(event: 'pmessage' | 'pmessage_buffer', listener: (pattern: string, channel: string, message: string) => void): this;
+    on(event: 'subscribe' | 'unsubscribe', listener: (channel: string, count: number) => void): this;
+    on(event: 'psubscribe' | 'punsubscribe', listener: (pattern: string, count: number) => void): this;
     on(event: string, listener: (...args: any[]) => void): this;
 
     /**
@@ -1217,6 +1203,9 @@ export interface RedisClient extends Commands<boolean>, EventEmitter {
     send_command(command: string, cb?: Callback<any>): boolean;
     send_command(command: string, args?: any[], cb?: Callback<any>): boolean;
 
+    addCommand(command: string): void;
+    add_command(command: string): void;
+
     /**
      * Mark the start of a transaction block.
      */
@@ -1246,4 +1235,4 @@ export function createClient(unix_socket: string, options?: ClientOpts): RedisCl
 export function createClient(redis_url: string, options?: ClientOpts): RedisClient;
 export function createClient(options?: ClientOpts): RedisClient;
 
-export function print(err: Error | void, reply: any): void;
+export function print(err: Error | undefined, reply: any): void;
diff --git a/types/redis/redis-tests.ts b/types/redis/redis-tests.ts
index ae389d9a06..4c38b9046e 100644
--- a/types/redis/redis-tests.ts
+++ b/types/redis/redis-tests.ts
@@ -1,40 +1,38 @@
-
 import redis = require('redis');
 
-var value: any;
-var valueArr: any[];
-var commandArr: any[][];
-var num: number;
-var str: string;
-var bool: boolean;
-var err: Error;
-var args: any[];
-var options: redis.ClientOpts;
-var client: redis.RedisClient;
-var info: redis.ServerInfo;
-var resCallback: (err: Error, res: any) => void;
-var numCallback: (err: Error, res: number) => void;
-var strCallback: (err: Error, res: string) => void;
-var messageHandler: (channel: string, message: any) => void;
+const value: any = 'any value';
+const commandArr: any[][] = [];
+const num = 0;
+const str = 'any string';
+const err: Error = new Error();
+const args: any[] = [];
+const resCallback: (err: Error | null, res: any) => void = () => {};
+const numCallback: (err: Error | null, res: number) => void = () => {};
+const strCallback: (err: Error | null, res: string) => void = () => {};
+const messageHandler: (channel: string, message: any) => void = () => {};
 
 // ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
 
-bool = redis.debug_mode;
+const debug_mode: boolean = redis.debug_mode;
 redis.print(err, value);
 
 // ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
 
-client = redis.createClient(num, str, options);
+const options: redis.ClientOpts = {
+    host: "localhost",
+    port: 6379,
+};
+let client: redis.RedisClient = redis.createClient(num, str, options);
 
 // Test the `retry_strategy` property
 // ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
 function retryStrategyNumber(options: redis.RetryStrategyOptions): number {
   // Ensure that the properties of RetryStrategyOptions are resilient to breaking change.
   // If the properties of the interface changes, the variables below will also need to be adapted.
-  var error: Error = options.error;
-  var total_retry_time: number = options.total_retry_time;
-  var times_connected: number = options.times_connected;
-  var attempt: number = options.attempt;
+  const error: Error = options.error;
+  const total_retry_time: number = options.total_retry_time;
+  const times_connected: number = options.times_connected;
+  const attempt: number = options.attempt;
   return 5000;
 }
 function retryStrategyError(options: redis.RetryStrategyOptions): Error {
@@ -48,12 +46,12 @@ client = redis.createClient({
 });
 // ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
 
-bool = client.connected;
-num = client.retry_delay;
-num = client.retry_backoff;
-valueArr = client.command_queue;
-valueArr = client.offline_queue;
-info = client.server_info;
+const connected: boolean = client.connected;
+const retry_delay: number = client.retry_delay;
+const retry_backoff: number = client.retry_backoff;
+const command_queue: any[] = client.command_queue;
+const offline_queue: any[] = client.offline_queue;
+const info: redis.ServerInfo = client.server_info;
 
 // ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
 
@@ -119,3 +117,7 @@ client.cork();
 client.set("abc", "fff", strCallback);
 client.get("abc", resCallback);
 client.uncork();
+
+// Add command
+client.add_command('my command');
+client.addCommand('my other command');
diff --git a/types/redis/tsconfig.json b/types/redis/tsconfig.json
index e79b038103..b99c599145 100644
--- a/types/redis/tsconfig.json
+++ b/types/redis/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "redis-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/redis/tslint.json b/types/redis/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redis/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/reduce-reducers/package.json b/types/reduce-reducers/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/reduce-reducers/package.json
+++ b/types/reduce-reducers/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-action-utils/package.json b/types/redux-action-utils/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-action-utils/package.json
+++ b/types/redux-action-utils/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-action-utils/tslint.json b/types/redux-action-utils/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-action-utils/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-action/package.json b/types/redux-action/package.json
index 2208c6bd2c..0a14f5edc6 100644
--- a/types/redux-action/package.json
+++ b/types/redux-action/package.json
@@ -4,4 +4,4 @@
         "redux": "^3.6.0",
         "redux-thunk": "^2.2.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 45ecf21933..6051ab7afe 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -22,8 +22,10 @@ export interface ActionMeta<Payload, Meta> extends Action<Payload> {
     meta: Meta;
 }
 
+export type ReducerMapValue<State, Payload> = Reducer<State, Payload> | ReducerNextThrow<State, Payload> | ReducerMap<State, Payload>;
+
 export interface ReducerMap<State, Payload> {
-    [actionType: string]: Reducer<State, Payload> | ReducerNextThrow<State, Payload>;
+    [actionType: string]: ReducerMapValue<State, Payload>;
 }
 
 export interface ReducerMapMeta<State, Payload, Meta> {
diff --git a/types/redux-actions/redux-actions-tests.ts b/types/redux-actions/redux-actions-tests.ts
index b7eeb2e62f..7fa5744f22 100644
--- a/types/redux-actions/redux-actions-tests.ts
+++ b/types/redux-actions/redux-actions-tests.ts
@@ -51,6 +51,15 @@ const actionsHandlerWithInitialState = ReduxActions.handleActions({
 
 state = actionsHandlerWithInitialState(0, { type: 'INCREMENT' });
 
+const actionsHandlerWithRecursiveReducerMap = ReduxActions.handleActions<number, number>({
+    ADJUST: {
+        UP: (state: number, action: ReduxActions.Action<number>) => state + action.payload,
+        DOWN: (state: number, action: ReduxActions.Action<number>) => state - action.payload,
+    }
+}, 0);
+
+state = actionsHandlerWithRecursiveReducerMap(0, { type: 'ADJUST/UP', payload: 1 });
+
 // ----------------------------------------------------------------------------------------------------
 
 interface TypedState {
diff --git a/types/redux-auth-wrapper/index.d.ts b/types/redux-auth-wrapper/index.d.ts
index 52bea44218..8734efeb75 100644
--- a/types/redux-auth-wrapper/index.d.ts
+++ b/types/redux-auth-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mjrussell/redux-auth-wrapper
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import { ComponentClass, StatelessComponent, ComponentType, ReactType } from "react";
 
diff --git a/types/redux-auth-wrapper/package.json b/types/redux-auth-wrapper/package.json
index c4cb1bf094..b5b3eb5dd8 100644
--- a/types/redux-auth-wrapper/package.json
+++ b/types/redux-auth-wrapper/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.7.2"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-batched-subscribe/package.json b/types/redux-batched-subscribe/package.json
index f41ebdda0a..7c90ffe09e 100644
--- a/types/redux-batched-subscribe/package.json
+++ b/types/redux-batched-subscribe/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": ">=1.0.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-bootstrap/index.d.ts b/types/redux-bootstrap/index.d.ts
deleted file mode 100644
index 8a5d8b2152..0000000000
--- a/types/redux-bootstrap/index.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for react-bootstrap 1.0
-// Project: https://github.com/remojansen/redux-bootstrap
-// Definitions by: Remo H. Jansen <https://github.com/remojansen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import * as React from "react";
-import { Middleware, Reducer, Store } from "redux";
-import { History } from "history";
-
-export interface BootstrapOptions {
-    routes: JSX.Element;
-    reducers: ReducersOption;
-    middlewares?: Middleware[];
-    initialState?: any;
-    container?: string;
-}
-
-export interface BootstrapResult {
-    store: Store<any>;
-    history: History;
-    root: JSX.Element;
-}
-
-export interface ReducersOption {
-    [index: string]: Reducer<any>;
-}
-
-export default function bootstrap(options: BootstrapOptions): BootstrapResult;
-
diff --git a/types/redux-bootstrap/package.json b/types/redux-bootstrap/package.json
deleted file mode 100644
index 4bcc170ca3..0000000000
--- a/types/redux-bootstrap/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "redux": "^3.6.0"
-    }
-}
\ No newline at end of file
diff --git a/types/redux-bootstrap/redux-bootstrap-tests.tsx b/types/redux-bootstrap/redux-bootstrap-tests.tsx
deleted file mode 100644
index 1630e759a5..0000000000
--- a/types/redux-bootstrap/redux-bootstrap-tests.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import bootstrap from "redux-bootstrap";
-
-let routes: JSX.Element = null;
-
-let result = bootstrap({
-    container: "root",
-    initialState: {},
-    middlewares: [],
-    reducers: {
-        reposReducer: (previousState: any, action: any): any => { return null; },
-        usersReducer: (previousState: any, action: any): any => { return null; }
-    },
-    routes: routes
-});
-
-console.log(result.store);
-console.log(result.history);
-console.log(result.root);
diff --git a/types/redux-bootstrap/tsconfig.json b/types/redux-bootstrap/tsconfig.json
deleted file mode 100644
index d9dc59cfdd..0000000000
--- a/types/redux-bootstrap/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
-    },
-    "files": [
-        "index.d.ts",
-        "redux-bootstrap-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/redux-debounced/package.json b/types/redux-debounced/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-debounced/package.json
+++ b/types/redux-debounced/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-debounced/tslint.json b/types/redux-debounced/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-debounced/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-devtools-dock-monitor/tslint.json b/types/redux-devtools-dock-monitor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-devtools-dock-monitor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-devtools-log-monitor/tslint.json b/types/redux-devtools-log-monitor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-devtools-log-monitor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-devtools/index.d.ts b/types/redux-devtools/index.d.ts
index 6e51b2bf6d..ceb8abc246 100644
--- a/types/redux-devtools/index.d.ts
+++ b/types/redux-devtools/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from 'react';
 import { GenericStoreEnhancer } from 'redux';
diff --git a/types/redux-devtools/package.json b/types/redux-devtools/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-devtools/package.json
+++ b/types/redux-devtools/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-devtools/tslint.json b/types/redux-devtools/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-devtools/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-doghouse/package.json b/types/redux-doghouse/package.json
index a7d9b97a6d..f689e96c60 100644
--- a/types/redux-doghouse/package.json
+++ b/types/redux-doghouse/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.7.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-first-router-link/index.d.ts b/types/redux-first-router-link/index.d.ts
index d7b2e7a079..c74bdd530b 100644
--- a/types/redux-first-router-link/index.d.ts
+++ b/types/redux-first-router-link/index.d.ts
@@ -9,7 +9,7 @@ import { Location } from 'redux-first-router';
 
 export type To = string | string[] | object;
 
-export type OnClick = false | ((e: React.SyntheticEvent<HTMLElement>) => boolean | undefined);
+export type OnClick = false | ((e: React.MouseEvent<HTMLElement>) => void);
 
 export interface Match<P> {
     params: P;
diff --git a/types/redux-first-router/index.d.ts b/types/redux-first-router/index.d.ts
index 5acbe08493..22dce972c4 100644
--- a/types/redux-first-router/index.d.ts
+++ b/types/redux-first-router/index.d.ts
@@ -1,9 +1,11 @@
-// Type definitions for redux-first-router 1.9
+// Type definitions for redux-first-router 1.10
 // Project: https://github.com/faceyspacey/redux-first-router#readme
 // Definitions by: Valbrand <https://github.com/Valbrand>
 //                 viggyfresh <https://github.com/viggyfresh>
+//                 janb87 <https://github.com/janb87>
+//                 corydeppen <https://github.com/corydeppen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.4
 
 import {
     Dispatch,
@@ -20,21 +22,24 @@ export type StateGetter = () => object;
 
 export type RouteString = string;
 
-export type RouteThunk = <S>(dispatch: Dispatch<S>, getState: StateGetter) => any | Promise<any>;
+export type RouteThunk = (
+    dispatch: Dispatch<any>,
+    getState: StateGetter
+) => any | Promise<any>;
 
-export interface RouteObject {
-    path: string;
+export type RouteObject<TKeys> = TKeys & {
     capitalizedWords?: boolean;
-    toPath?(param: string, key?: string): string;
-    fromPath?(path: string, key?: string): string;
-    thunk?: RouteThunk;
     navKey?: string;
-}
+    path: string;
+    thunk?: RouteThunk;
+    fromPath?(path: string, key?: string): string;
+    toPath?(param: string, key?: string): string;
+};
 
-export type Route = RouteString | RouteObject;
+export type Route<TKeys = {}> = RouteString | RouteObject<TKeys>;
 
-export interface RoutesMap {
-    [key: string]: Route;
+export interface RoutesMap<TKeys = {}> {
+    [key: string]: Route<TKeys>;
 }
 
 export interface ReceivedAction {
@@ -113,8 +118,8 @@ export interface Meta {
 
 export interface Action {
     type: string;
-    payload: Payload;
-    meta: Meta;
+    payload?: Payload;
+    meta?: Meta;
     query?: object;
     navKey?: Nullable<string>;
 }
@@ -126,14 +131,25 @@ export interface HistoryLocation {
 
 export type HistoryAction = string;
 
-export type Listener = (location: HistoryLocation, action: HistoryAction) => void;
+export type Listener = (
+    location: HistoryLocation,
+    action: HistoryAction
+) => void;
 
 export type ScrollBehavior = object;
 
 export interface Router {
-    getStateForActionOriginal(action: object, state: Nullable<object>): Nullable<object>;
-    getStateForAction(action: object, state: Nullable<object>): Nullable<object>;
-    getPathAndParamsForState(state: object): { path: Nullable<string>, params: Nullable<Params> };
+    getStateForActionOriginal(
+        action: object,
+        state: Nullable<object>
+    ): Nullable<object>;
+    getStateForAction(
+        action: object,
+        state: Nullable<object>
+    ): Nullable<object>;
+    getPathAndParamsForState(
+        state: object
+    ): { path: Nullable<string>; params: Nullable<Params> };
     getActionForPathAndParams(path: string): Nullable<object>;
 }
 
@@ -163,14 +179,14 @@ export interface NavigatorsConfig {
         navigationAction: Nullable<NavigationAction>,
         route: Nullable<Route>
     ): object;
-    navigationToAction<S>(
+    navigationToAction(
         navigators: Navigators,
-        store: Store<S>,
+        store: Store<any>,
         routesMap: RoutesMap,
         action: object
     ): {
-        action: object,
-        navigationAction: Nullable<NavigationAction>
+        action: object;
+        navigationAction: Nullable<NavigationAction>;
     };
 }
 
@@ -179,9 +195,9 @@ export interface Options {
     location?: string | SelectLocationState;
     notFoundPath?: string;
     scrollTop?: boolean;
-    onBeforeChange?<S>(dispatch: Dispatch<S>, getState: StateGetter): void;
-    onAfterChange?<S>(dispatch: Dispatch<S>, getState: StateGetter): void;
-    onBackNext?<S>(dispatch: Dispatch<S>, getState: StateGetter): void;
+    onBeforeChange?(dispatch: Dispatch<any>, getState: StateGetter): void;
+    onAfterChange?(dispatch: Dispatch<any>, getState: StateGetter): void;
+    onBackNext?(dispatch: Dispatch<any>, getState: StateGetter): void;
     restoreScroll?(history: History): ScrollBehavior;
     initialDispatch?: boolean;
     querySerializer?: QuerySerializer;
@@ -193,9 +209,13 @@ export type Payload = object;
 
 export type ScrollUpdater = (performedByUser: boolean) => void;
 
-export const NOT_FOUND: string;
+export const NOT_FOUND: '@@redux-first-router/NOT_FOUND';
 
-export function actionToPath(action: ReceivedAction, routesMap: RoutesMap): string;
+export function actionToPath(
+    action: ReceivedAction,
+    routesMap: RoutesMap,
+    querySerializer?: QuerySerializer
+): string;
 
 export function back(): void;
 
@@ -205,12 +225,16 @@ export function canGoBack(): boolean;
 
 export function canGoForward(): boolean;
 
-export function connectRoutes(history: History, routesMap: RoutesMap, options?: Options): {
-    reducer: Reducer<LocationState>,
-    middleware: Middleware,
-    thunk<S>(store: Store<S>): Promise<Nullable<RouteThunk>>,
-    enhancer: GenericStoreEnhancer,
-    initialDispatch?(): void
+export function connectRoutes(
+    history: History,
+    routesMap: RoutesMap,
+    options?: Options
+): {
+    reducer: Reducer<LocationState>;
+    middleware: Middleware;
+    thunk(store: Store<any>): Promise<Nullable<RouteThunk>>;
+    enhancer: GenericStoreEnhancer;
+    initialDispatch?(): void;
 };
 
 export function go(n: number): void;
@@ -223,7 +247,10 @@ export function next(): void;
 
 export function nextPath(): string | void;
 
-export function pathToAction(pathname: string, routesMap: RoutesMap): ReceivedAction;
+export function pathToAction(
+    pathname: string,
+    routesMap: RoutesMap
+): ReceivedAction;
 
 export function prevPath(): string | void;
 
diff --git a/types/redux-first-router/package.json b/types/redux-first-router/package.json
index 06689a4cc1..cc21197405 100644
--- a/types/redux-first-router/package.json
+++ b/types/redux-first-router/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.7.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-first-router/redux-first-router-tests.ts b/types/redux-first-router/redux-first-router-tests.ts
index fc913aebcf..3c9e69a82e 100644
--- a/types/redux-first-router/redux-first-router-tests.ts
+++ b/types/redux-first-router/redux-first-router-tests.ts
@@ -1,15 +1,24 @@
-import { connectRoutes, LocationState, RoutesMap } from 'redux-first-router';
 import {
-  createStore,
-  applyMiddleware,
-  Middleware,
-  MiddlewareAPI,
-  Store,
-  Dispatch,
-  compose,
-  Action,
-  GenericStoreEnhancer,
-  StoreEnhancerStoreCreator
+    connectRoutes,
+    LocationState,
+    RoutesMap,
+    actionToPath,
+    ReceivedAction,
+    redirect,
+    Action as ReduxFirstRouterAction,
+    QuerySerializer
+} from 'redux-first-router';
+import {
+    createStore,
+    applyMiddleware,
+    Middleware,
+    MiddlewareAPI,
+    Store,
+    Dispatch,
+    compose,
+    Action,
+    GenericStoreEnhancer,
+    StoreEnhancerStoreCreator
 } from 'redux';
 import { History } from 'history';
 
@@ -19,28 +28,50 @@ declare var history: History;
 type State = LocationState;
 type StoreCreator = StoreEnhancerStoreCreator<State>;
 
-const routesMap = {
-  HOME: '/'
+const routesMap: RoutesMap<{ role: string }> = {
+    HOME: '/',
+    ADMIN: {
+        path: '/admin',
+        role: 'admin'
+    }
 };
 
 const {
-  reducer,
-  middleware,
-  enhancer,
-  initialDispatch
+    reducer,
+    middleware,
+    enhancer,
+    initialDispatch
 } = connectRoutes(history, routesMap, {
-  initialDispatch: false
+    initialDispatch: false
 });
 
-const dumbMiddleware: Middleware = (store: MiddlewareAPI<LocationState>) => (next: Dispatch<LocationState>) => (action: Action) => {
-  next(action);
-};
+const dumbMiddleware: Middleware = store => next => action => next(action);
 
 const composedMiddleware = applyMiddleware(middleware, dumbMiddleware);
 
-const storeEnhancer = compose<StoreCreator, StoreCreator, StoreCreator>(enhancer, composedMiddleware);
+const storeEnhancer = compose<StoreCreator, StoreCreator, StoreCreator>(
+    enhancer,
+    composedMiddleware
+);
 
 const store = createStore(reducer, storeEnhancer);
 
+const receivedAction: ReceivedAction = {
+    type: 'HOME',
+    payload: {}
+};
+actionToPath(receivedAction, routesMap); // $ExpectType string
+
+const querySerializer: QuerySerializer = {
+    stringify: (params) => '',
+    parse: (queryString) => ({})
+};
+actionToPath(receivedAction, routesMap, querySerializer); // $ExpectType string
+
+const action: ReduxFirstRouterAction = {
+    type: 'HOME'
+};
+redirect(action); // $ExpectType Action
+
 // $ExpectType Store<LocationState>
 store;
diff --git a/types/redux-first-router/tsconfig.json b/types/redux-first-router/tsconfig.json
index 98d9d3cb7c..774422aa4e 100644
--- a/types/redux-first-router/tsconfig.json
+++ b/types/redux-first-router/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/redux-first-router/tslint.json b/types/redux-first-router/tslint.json
index b1439230db..6bcb676ca2 100644
--- a/types/redux-first-router/tslint.json
+++ b/types/redux-first-router/tslint.json
@@ -2,6 +2,8 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // TODO
-        "no-any-union": false
+        "no-any-union": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-generics": false
     }
 }
diff --git a/types/redux-form/immutable/index.d.ts b/types/redux-form/immutable/index.d.ts
index fe5cc6904d..6e7d9f54e6 100644
--- a/types/redux-form/immutable/index.d.ts
+++ b/types/redux-form/immutable/index.d.ts
@@ -21,4 +21,4 @@ export {
     isSubmitting,
     isValid,
     SubmissionError
-} from "redux-form";
+} from "../";
diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 963ebb16b5..72352731fc 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -1,6 +1,11 @@
 // Type definitions for redux-form 7.0
 // Project: https://github.com/erikras/redux-form
-// Definitions by: Carson Full <https://github.com/carsonf>, Daniel Lytkin <https://github.com/aikoven>, Karol Janyst <https://github.com/LKay>, Luka Zakrajsek <https://github.com/bancek>, Alex Young <https://github.com/alsiola>
+// Definitions by: Carson Full <https://github.com/carsonf>
+//                 Daniel Lytkin <https://github.com/aikoven>
+//                 Karol Janyst <https://github.com/LKay>
+//                 Luka Zakrajsek <https://github.com/bancek>
+//                 Alex Young <https://github.com/alsiola>
+//                 Anton Novik <https://github.com/tehbi4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -33,20 +38,19 @@ export interface RegisteredFieldState {
     type: FieldType;
 }
 
-
 export type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
 export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
 
-export * from "redux-form/lib/reduxForm";
-export * from "redux-form/lib/Field";
-export * from "redux-form/lib/Fields";
-export * from "redux-form/lib/FieldArray";
-export * from "redux-form/lib/Form";
-export * from "redux-form/lib/FormSection";
-export * from "redux-form/lib/formValues";
-export * from "redux-form/lib/formValueSelector";
-export * from "redux-form/lib/reducer";
-export * from "redux-form/lib/SubmissionError";
-export * from "redux-form/lib/actions";
-export * from "redux-form/lib/actionTypes";
-export * from "redux-form/lib/selectors";
+export * from "./lib/reduxForm";
+export * from "./lib/Field";
+export * from "./lib/Fields";
+export * from "./lib/FieldArray";
+export * from "./lib/Form";
+export * from "./lib/FormSection";
+export * from "./lib/formValues";
+export * from "./lib/formValueSelector";
+export * from "./lib/reducer";
+export * from "./lib/SubmissionError";
+export * from "./lib/actions";
+export * from "./lib/actionTypes";
+export * from "./lib/selectors";
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 8020763db4..54b0ec2f45 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -16,15 +16,13 @@ export type Formatter = (value: any, name: string) => any;
 export type Parser = (value: any, name: string) => any;
 export type Validator = (value: any, allValues?: any, props?: any) => any;
 
-interface EventHandler<Event> {
-    (event: Event): void;
-}
+export type EventHandler<Event> = (event: Event) => void;
 
-interface EventOrValueHandler<Event> extends EventHandler<Event> {
+export interface EventOrValueHandler<Event> extends EventHandler<Event> {
     (value: any): void;
 }
 
-interface CommonFieldProps {
+export interface CommonFieldProps {
     name: string;
     onBlur: EventOrValueHandler<FocusEvent<any>>;
     onChange: EventOrValueHandler<ChangeEvent<any>>;
@@ -33,9 +31,10 @@ interface CommonFieldProps {
     onFocus: EventHandler<FocusEvent<any>>;
 }
 
-interface BaseFieldProps<P = {}> extends Partial<CommonFieldProps> {
+export interface BaseFieldProps<P = {}> extends Partial<CommonFieldProps> {
     name: string;
-    component?: ComponentType<P> | "input" | "select" | "textarea",
+    label?: string;
+    component?: ComponentType<WrappedFieldProps & P> | "input" | "select" | "textarea";
     format?: Formatter | null;
     normalize?: Normalizer;
     props?: P;
@@ -53,7 +52,10 @@ export interface GenericField<P> extends Component<BaseFieldProps<P> & P> {
     getRenderedComponent(): Component<WrappedFieldProps & P>;
 }
 
-type GenericFieldHTMLAttributes = InputHTMLAttributes<HTMLInputElement> | SelectHTMLAttributes<HTMLSelectElement> | TextareaHTMLAttributes<HTMLTextAreaElement>;
+export type GenericFieldHTMLAttributes =
+    InputHTMLAttributes<HTMLInputElement> |
+    SelectHTMLAttributes<HTMLSelectElement> |
+    TextareaHTMLAttributes<HTMLTextAreaElement>;
 
 export class Field<P = GenericFieldHTMLAttributes> extends Component<BaseFieldProps<P> & P> implements GenericField<P> {
     dirty: boolean;
diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index 724f1f19c6..7dd9564472 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -1,9 +1,9 @@
 import { Component, ComponentType } from "react";
-import { Validator } from "redux-form";
+import { Validator } from "../index";
 
 interface BaseFieldArrayProps<P = {}> {
     name: string;
-    component: ComponentType<P>,
+    component: ComponentType<P>;
     validate?: Validator | Validator[];
     warn?: Validator | Validator[];
     withRef?: boolean;
diff --git a/types/redux-form/lib/Fields.d.ts b/types/redux-form/lib/Fields.d.ts
index d3a29dcb13..f5ec106852 100644
--- a/types/redux-form/lib/Fields.d.ts
+++ b/types/redux-form/lib/Fields.d.ts
@@ -1,5 +1,5 @@
 import { Component, ComponentType } from "react";
-import { Formatter, Parser, WrappedFieldProps } from "redux-form";
+import { Formatter, Parser, WrappedFieldProps } from "../index";
 
 interface BaseFieldsProps<P = {}> {
     names: string[];
@@ -27,5 +27,5 @@ export class Fields<P = {}> extends Component<BaseFieldsProps<P> & P> implements
 }
 
 interface WrappedFieldsProps {
-    [name: string]: WrappedFieldsProps & WrappedFieldProps
+    [name: string]: WrappedFieldsProps & WrappedFieldProps;
 }
diff --git a/types/redux-form/lib/Form.d.ts b/types/redux-form/lib/Form.d.ts
index fd8321836d..11ba0e2734 100644
--- a/types/redux-form/lib/Form.d.ts
+++ b/types/redux-form/lib/Form.d.ts
@@ -1,11 +1,13 @@
 import { Component, FormHTMLAttributes, FormEvent, FormEventHandler } from "react";
 import { Dispatch } from "redux";
-import { FormProps, FormErrors, FormSubmitHandler, Omit } from "redux-form";
+import { FormProps, FormErrors, FormSubmitHandler, Omit } from "../index";
 
-interface FormSubmitProp {
-    onSubmit?: FormSubmitHandler;
+interface FormSubmitProp<FormData = {}, P = {}> {
+    onSubmit?: FormSubmitHandler<FormData, P>;
 }
 
-export type FormProps = Omit<FormHTMLAttributes<HTMLFormElement>, "onSubmit"> & FormSubmitProp;
+export type FormProps<FormData, P> = Omit<FormHTMLAttributes<HTMLFormElement>, "onSubmit"> & FormSubmitProp<FormData, P>;
 
-declare class Form extends Component<FormProps> {}
+export class GenericForm<FormData, P> extends Component<FormProps<FormData, P>> {}
+
+export class Form<FormData = {}, P = {}> extends Component<FormProps<FormData, P>> implements GenericForm<FormData, P> {}
diff --git a/types/redux-form/lib/SubmissionError.d.ts b/types/redux-form/lib/SubmissionError.d.ts
index 790cb8e697..d2ec536a58 100644
--- a/types/redux-form/lib/SubmissionError.d.ts
+++ b/types/redux-form/lib/SubmissionError.d.ts
@@ -1,7 +1,9 @@
-import { FormErrors } from "redux-form";
+import { FormErrors } from "../index";
 
 export interface SubmissionErrorConstructor<T> {
     new (errors?: FormErrors<T>): Error;
 }
 
-declare const SubmissionError: SubmissionErrorConstructor<any>;
+export const SubmissionError: SubmissionErrorConstructor<any>;
+
+export default SubmissionError;
diff --git a/types/redux-form/lib/actions.d.ts b/types/redux-form/lib/actions.d.ts
index d54f1a2316..7918b94350 100644
--- a/types/redux-form/lib/actions.d.ts
+++ b/types/redux-form/lib/actions.d.ts
@@ -1,10 +1,10 @@
 import { Action } from "redux";
-import { FormErrors, FormWarnings, FieldType } from "redux-form";
+import { FormErrors, FormWarnings, FieldType } from "../index";
 
 export interface FormAction extends Action {
-    meta: {
-        form: string;
-    };
+    meta?: any;
+    payload?: any;
+    error?: any;
 }
 
 export declare function arrayInsert(form: string, field: string, index: number, value: any): FormAction;
@@ -24,7 +24,7 @@ export declare function destroy(...form: string[]): FormAction;
 export declare function focus(form: string, field: string): FormAction;
 
 export interface InitializeOptions {
-    keepDirty : boolean;
+    keepDirty: boolean;
     keepSubmitSucceeded: boolean;
 }
 
diff --git a/types/redux-form/lib/formValueSelector.d.ts b/types/redux-form/lib/formValueSelector.d.ts
index b85e3deadc..e13ffd3c5d 100644
--- a/types/redux-form/lib/formValueSelector.d.ts
+++ b/types/redux-form/lib/formValueSelector.d.ts
@@ -1,6 +1,6 @@
-import { FormStateMap } from "redux-form";
+import { FormStateMap } from "../index";
 
-export declare function formValueSelector<State = {}>(
+export function formValueSelector<State = {}>(
     form: string,
     getFormState?: (state: State) => FormStateMap
 ): (state: State, ...field: string[]) => any;
diff --git a/types/redux-form/lib/formValues.d.ts b/types/redux-form/lib/formValues.d.ts
index fe389e1dff..1052f8533e 100644
--- a/types/redux-form/lib/formValues.d.ts
+++ b/types/redux-form/lib/formValues.d.ts
@@ -1,12 +1,12 @@
 import { ComponentClass, ComponentType } from "react";
-import { InjectedFormProps } from "redux-form";
+import { InjectedFormProps } from "../index";
 
-declare function formValues<
+export function formValues<
     Values,
     P = {}
 >(obj: Values): (component: ComponentType<P & { [K in keyof Values]: any }>) => ComponentClass<P & { [K in keyof Values]: any }>;
 
-declare function formValues<
+export function formValues<
     FormData = {},
     K extends keyof FormData = keyof FormData,
     P = {}
diff --git a/types/redux-form/lib/reduxForm.d.ts b/types/redux-form/lib/reduxForm.d.ts
index 4b4e522d86..1ce91e6f02 100644
--- a/types/redux-form/lib/reduxForm.d.ts
+++ b/types/redux-form/lib/reduxForm.d.ts
@@ -15,15 +15,18 @@ import {
     WarningOther,
     RegisteredFieldState,
     FormStateMap
-} from "redux-form";
+} from "../index";
 
 export type FormSubmitHandler<FormData = {}, P = {}> =
     (values: Partial<FormData>, dispatch: Dispatch<any>, props: P) => void | FormErrors<FormData> | Promise<any>;
 
-export interface SubmitHandler<FormData = {}, P = {}> {
-    (handler: FormSubmitHandler<FormData, P>): FormEventHandler<any>;
-    (event: SyntheticEvent<any>): void;
-}
+export type SubmitHandler<FormData = {}, P = {}> = (
+    submit: FormSubmitHandler<FormData, P>,
+    props?: InjectedFormProps<FormData, P>,
+    valid?: boolean,
+    asyncValidate?: any,
+    fields?: string[]
+) => any;
 
 export interface ValidateCallback<FormData, P> {
     values: FormData;
@@ -64,7 +67,7 @@ export interface RegisteredField {
 export interface InjectedFormProps<FormData = {}, P = {}> {
     anyTouched: boolean;
     array: InjectedArrayProps;
-    asyncValidate: () => void;
+    asyncValidate(): void;
     asyncValidating: string | boolean;
     autofill(field: string, value: any): void;
     blur(field: string, value: any): void;
@@ -88,12 +91,13 @@ export interface InjectedFormProps<FormData = {}, P = {}> {
     untouch(...field: string[]): void;
     valid: boolean;
     warning: any;
-    registeredFields: { [name: string]: RegisteredField }
+    registeredFields: { [name: string]: RegisteredField };
 }
 
 export interface ConfigProps<FormData = {}, P = {}> {
     form: string;
     asyncBlurFields?: string[];
+    asyncChangeFields?: string[];
     asyncValidate?(values: FormData, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P>, blurredField: string): Promise<any>;
     destroyOnUnmount?: boolean;
     enableReinitialize?: boolean;
@@ -102,7 +106,7 @@ export interface ConfigProps<FormData = {}, P = {}> {
     immutableProps?: string[];
     initialValues?: Partial<FormData>;
     keepDirtyOnReinitialize?: boolean;
-    onChange?: (values: Partial<FormData>, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P>) => void;
+    onChange?(values: Partial<FormData>, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P>): void;
     onSubmit?: FormSubmitHandler<FormData, P & InjectedFormProps<FormData, P>>;
     onSubmitFail?(errors: FormErrors<FormData>, dispatch: Dispatch<any>, submitError: any, props: P & InjectedFormProps<FormData, P>): void;
     onSubmitSuccess?(result: any, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P>): void;
diff --git a/types/redux-form/lib/selectors.d.ts b/types/redux-form/lib/selectors.d.ts
index fd352361cd..ee79f4b137 100644
--- a/types/redux-form/lib/selectors.d.ts
+++ b/types/redux-form/lib/selectors.d.ts
@@ -1,21 +1,21 @@
-import { FormErrors } from "redux-form";
+import { FormErrors } from "../index";
 
 export type DataSelector<FormData = {}, State = {}> = (formName: string) => (state: State) => FormData;
 export type ErrorSelector<FormData = {}, State = {}> = (formName: string) => (state: State) => FormErrors<FormData>;
 export type BooleanSelector<State = {}> = (formName: string) => (state: State) => boolean;
 
-declare const getFormValues: DataSelector;
-declare const getFormInitialValues: DataSelector;
-declare const getFormSyncErrors: ErrorSelector;
-declare const getFormMeta: DataSelector;
-declare const getFormAsyncErrors: ErrorSelector;
-declare const getFormSyncWarnings: ErrorSelector;
-declare const getFormSubmitErrors: ErrorSelector;
-declare function getFormNames<State>(state: State): string[];
-declare const isDirty: BooleanSelector;
-declare const isPristine: BooleanSelector;
-declare const isValid: BooleanSelector;
-declare const isInvalid: BooleanSelector;
-declare const isSubmitting: BooleanSelector;
-declare const hasSubmitSucceeded: BooleanSelector;
-declare const hasSubmitFailed: BooleanSelector;
+export const getFormValues: DataSelector;
+export const getFormInitialValues: DataSelector;
+export const getFormSyncErrors: ErrorSelector;
+export const getFormMeta: DataSelector;
+export const getFormAsyncErrors: ErrorSelector;
+export const getFormSyncWarnings: ErrorSelector;
+export const getFormSubmitErrors: ErrorSelector;
+export function getFormNames(state: any): string[];
+export const isDirty: BooleanSelector;
+export const isPristine: BooleanSelector;
+export const isValid: BooleanSelector;
+export const isInvalid: BooleanSelector;
+export const isSubmitting: BooleanSelector;
+export const hasSubmitSucceeded: BooleanSelector;
+export const hasSubmitFailed: BooleanSelector;
diff --git a/types/redux-form/package.json b/types/redux-form/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-form/package.json
+++ b/types/redux-form/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 3648e9b452..10fee2f1d0 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -1,10 +1,10 @@
-import * as React from "react";
-import { Component, StatelessComponent } from "react";
+import * as React from 'react';
 import { Action, Dispatch } from "redux";
 import {
     reduxForm,
     InjectedFormProps,
     Form,
+    GenericForm,
     FormSection,
     GenericFormSection,
     formValues,
@@ -18,10 +18,12 @@ import {
     FieldArray,
     GenericFieldArray,
     WrappedFieldArrayProps,
+    BaseFieldProps,
     reducer,
     FormAction,
     actionTypes,
-    submit
+    submit,
+    SubmissionError
 } from "redux-form";
 import {
     Field as ImmutableField,
@@ -36,6 +38,7 @@ import LibFormSection from "redux-form/lib/FormSection";
 import libFormValueSelector from "redux-form/lib/formValueSelector";
 import libReduxForm from "redux-form/lib/reduxForm";
 import libActions from "redux-form/lib/actions";
+import LibSubmissionError from "redux-form/lib/SubmissionError";
 
 /* Decorated components */
 interface TestFormData {
@@ -44,18 +47,18 @@ interface TestFormData {
 
 /* Some tests only make sense with multiple values */
 interface MultivalueFormData {
-    foo: string
-    bar?: string
-    fizz: string
+    foo: string;
+    bar?: string;
+    fizz: string;
 }
 
 interface TestFormComponentProps {
-    foo: string;
+    baz: string;
 }
 
 type InjectedProps = InjectedFormProps<TestFormData, TestFormComponentProps>;
 
-class TestFormComponent extends Component<TestFormComponentProps & InjectedProps> {
+class TestFormComponent extends React.Component<TestFormComponentProps & InjectedProps> {
     render() {
         const { form, initialValues } = this.props;
         const foo = initialValues.foo;
@@ -63,18 +66,18 @@ class TestFormComponent extends Component<TestFormComponentProps & InjectedProps
     }
 }
 
-const TestFormRequired = reduxForm<TestFormData>({})(TestFormComponent);
-const TestForm = reduxForm<TestFormData>({ form : "test" })(TestFormComponent);
-const TestFormImmRequired = immutableReduxForm<TestFormData>({})(TestFormComponent);
-const TestFormImm = immutableReduxForm<TestFormData>({ form : "test" })(TestFormComponent);
+const TestFormRequired = reduxForm<TestFormData, TestFormComponentProps>({})(TestFormComponent);
+const TestForm = reduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormComponent);
+const TestFormImmRequired = immutableReduxForm<TestFormData, TestFormComponentProps>({})(TestFormComponent);
+const TestFormImm = immutableReduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormComponent);
 
-const TestFormStatelessComponent: StatelessComponent<TestFormComponentProps & InjectedProps> = ({ form, initialValues }) => {
+const TestFormStatelessComponent: React.StatelessComponent<TestFormComponentProps & InjectedProps> = ({ form, initialValues }) => {
     const foo = initialValues.foo;
     return null;
-}
+};
 
-const TestFormStatelessRequired = reduxForm<TestFormData>({})(TestFormStatelessComponent);
-const TestFormStateless = reduxForm<TestFormData>({ form : "test" })(TestFormStatelessComponent);
+const TestFormStatelessRequired = reduxForm<TestFormData, TestFormComponentProps>({})(TestFormStatelessComponent);
+const TestFormStateless = reduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormStatelessComponent);
 
 /* formValues decorator */
 
@@ -91,10 +94,11 @@ const ItemListObj = formValues({ fooBar : "foo" })(
 );
 
 /* Custom FormSection */
+
 interface MyFormSectionProps {
     foo: string;
 }
-const MyFormSection: StatelessComponent<MyFormSectionProps> = ({ children }) => null;
+const MyFormSection: React.StatelessComponent<MyFormSectionProps> = ({ children }) => null;
 const FormSectionCustom = FormSection as new () => GenericFormSection<MyFormSectionProps>;
 
 /* Custom Field */
@@ -103,10 +107,11 @@ interface MyFieldCustomProps {
     foo: string;
 }
 type MyFieldProps = MyFieldCustomProps & WrappedFieldProps;
-const MyField: StatelessComponent<MyFieldProps> = ({
+const MyField: React.StatelessComponent<MyFieldProps> = ({
     children,
     input,
-    meta
+    meta,
+    foo
 }) => {
     input.onBlur("value");
     input.onBlur({} as React.SyntheticEvent<HTMLDivElement>);
@@ -123,10 +128,16 @@ const MyField: StatelessComponent<MyFieldProps> = ({
 };
 const FieldCustom = Field as new () => GenericField<MyFieldCustomProps>;
 
-const MyFieldImm: StatelessComponent<MyFieldProps> = ({
+type FieldProps = BaseFieldProps<MyFieldCustomProps> & MyFieldCustomProps;
+const FieldCustomComp: React.StatelessComponent<FieldProps> = props => (
+    <FieldCustom {...props} component={MyField} />
+);
+
+const MyFieldImm: React.StatelessComponent<MyFieldProps> = ({
     children,
     input,
-    meta
+    meta,
+    foo
 }) => null;
 const FieldImmutableCustom = ImmutableField as new () => GenericField<MyFieldCustomProps>;
 
@@ -136,11 +147,18 @@ interface MyFieldsCustomProps {
     foo: string;
 }
 type MyFieldsProps = MyFieldsCustomProps & WrappedFieldsProps;
-const MyFields: StatelessComponent<MyFieldsProps> = ({
-    children
+const MyFields: React.StatelessComponent<MyFieldsCustomProps> = ({
+    children,
+    foo
 }) => null;
 const FieldsCustom = Fields as new () => GenericFields<MyFieldsCustomProps>;
 
+/* FieldArray */
+
+const MyArrayField: React.StatelessComponent = ({
+    children
+}) => null;
+
 /* Custom FieldArray */
 
 interface MyFieldValue {
@@ -149,32 +167,34 @@ interface MyFieldValue {
 interface MyFieldArrayCustomProps {
     foo: string;
 }
+
+const MyCustomArrayField: React.StatelessComponent<MyFieldArrayCustomProps> = ({
+    children,
+    foo
+}) => null;
+
 type MyFieldArrayProps = MyFieldArrayCustomProps & WrappedFieldArrayProps<MyFieldValue>;
-const MyFieldArray: StatelessComponent<MyFieldArrayProps> = ({
+const MyFieldArray: React.StatelessComponent<MyFieldArrayProps> = ({
     children,
     fields
 }) => null;
 const FieldArrayCustom = FieldArray as new () => GenericFieldArray<MyFieldValue, MyFieldArrayCustomProps>;
 
 /* Tests */
-const TestForms: StatelessComponent = () => {
+const TestForms: React.StatelessComponent = () => {
     return (
         <div>
-            <TestFormRequired form="test" />
-            <TestForm
-                initialValues={ { foo : "test" } }
-            />
+            <TestFormRequired form="test" baz='baz' />
+            <TestForm initialValues={ { foo : "test" } } baz='baz' />
 
-            <TestFormImmRequired form="test" />
-            <TestFormImm
-                initialValues={ { foo : "test" } }
-            />
+            <TestFormImmRequired form="test" baz='baz' />
+            <TestFormImm initialValues={ { foo : "test" } } baz='baz' />
 
-            <TestFormStatelessRequired form="test" />
-            <TestFormStateless />
+            <TestFormStatelessRequired form="test" baz='baz' />
+            <TestFormStateless baz='baz' />
         </div>
-    )
-}
+    );
+};
 
 // Specifying form data type is not required here, but is recommended to avoid confusion
 const testFormWithValidationDecorator = reduxForm<MultivalueFormData>({
@@ -182,9 +202,9 @@ const testFormWithValidationDecorator = reduxForm<MultivalueFormData>({
     validate: (values, props) => {
         return {
             foo: "Bad foo"
-        }
+        };
     }
-})
+});
 
 // Specifying form data type is not required here, but is recommended to avoid confusion
 const testFormWithInitialValuesDecorator = reduxForm<MultivalueFormData>({
@@ -192,7 +212,7 @@ const testFormWithInitialValuesDecorator = reduxForm<MultivalueFormData>({
     initialValues: {
         foo: "A Foo is here"
     }
-})
+});
 
 // Specifying form data type *is* required here, because type inference will guess the type of
 // the form data type parameter to be {foo: string}. The result of validate does not contain "foo"
@@ -204,28 +224,24 @@ const testFormWithInitialValuesAndValidationDecorator = reduxForm<MultivalueForm
     validate: (values, props) => {
         return {
             bar: "Bad foo"
-        }
+        };
     }
-})
+});
 
 type TestProps = {} & InjectedFormProps<TestFormData>;
-const Test = reduxForm({
+const Test = reduxForm<TestFormData>({
     form : "test"
 })(
-    class Test extends Component<TestProps> {
-
-        handleSubmitForm = (values: Partial<TestFormData>, dispatch: Dispatch<any>, props: TestProps) => {};
-
-        handleSubmitFormAny = (event: any) => {};
+    class Test extends React.Component<TestProps> {
+        handleSubmitForm = (values: Partial<TestFormData>, dispatch: Dispatch<any>, props: {}) => {};
 
         render() {
             const { handleSubmit } = this.props;
+            const FormCustom = Form as new () => GenericForm<TestFormData, {}>;
 
             return (
                 <div>
-                    <Form
-                        onSubmit={ handleSubmit(this.handleSubmitFormAny) }
-                    >
+                    <FormCustom onSubmit={ handleSubmit(this.handleSubmitForm) }>
                         <FormSectionCustom
                             name="test1"
                             component={ MyFormSection }
@@ -260,6 +276,11 @@ const Test = reduxForm({
                                 foo="bar"
                             />
 
+                            <FieldCustomComp
+                                name="field_4_comp"
+                                foo="bar"
+                            />
+
                             <FieldImmutableCustom
                                 name="field4"
                                 component={ MyField }
@@ -279,18 +300,18 @@ const Test = reduxForm({
 
                             <FieldArray
                                 name="field9"
-                                component={ Field }
+                                component={ MyArrayField }
                             />
 
                             <FieldArrayCustom
                                 name="field10"
-                                component={ Field }
+                                component={ MyCustomArrayField }
                                 foo="bar"
                             />
                         </FormSection>
-                    </Form>
+                    </FormCustom>
                 </div>
-            )
+            );
         }
     }
 );
@@ -315,6 +336,14 @@ reducer.plugin({
     }
 });
 
+try {
+    throw new SubmissionError({_error: "Submission failed."});
+} catch (error) {
+    if (!(error instanceof SubmissionError)) {
+        throw new Error("SubmissionError not imported correctly");
+    }
+}
+
 /* Test using versions imported directly/as defaults from lib */
 const DefaultField = (
     <LibField
@@ -334,8 +363,16 @@ const DefaultFormSection = (
     />
 );
 
-const TestLibFormRequired = libReduxForm<TestFormData>({})(TestFormComponent);
-const TestLibForm = libReduxForm<TestFormData>({ form : "test" })(TestFormComponent);
+const TestLibFormRequired = libReduxForm<TestFormData, TestFormComponentProps>({})(TestFormComponent);
+const TestLibForm = libReduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormComponent);
 
 const testSubmit = submit("test");
 const testLibSubmit = libActions.submit("test");
+
+try {
+    throw new LibSubmissionError({_error: "Submission failed."});
+} catch (error) {
+    if (!(error instanceof LibSubmissionError)) {
+        throw new Error("SubmissionError from lib not imported correctly");
+    }
+}
diff --git a/types/redux-form/tsconfig.json b/types/redux-form/tsconfig.json
index ea57d2a38a..f106f20d16 100644
--- a/types/redux-form/tsconfig.json
+++ b/types/redux-form/tsconfig.json
@@ -37,4 +37,4 @@
         "lib/selectors.d.ts",
         "lib/SubmissionError.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/redux-form/tslint.json b/types/redux-form/tslint.json
new file mode 100644
index 0000000000..f3568a0139
--- /dev/null
+++ b/types/redux-form/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-object-literal-type-assertion": false,
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/redux-form/v4/index.d.ts b/types/redux-form/v4/index.d.ts
index 7fecf00579..35444b198d 100644
--- a/types/redux-form/v4/index.d.ts
+++ b/types/redux-form/v4/index.d.ts
@@ -1,18 +1,19 @@
-// Type definitions for redux-form v4.0.3
+// Type definitions for redux-form 4.0
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Daniel Lytkin <https://github.com/aikoven>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
-import { Component, SyntheticEvent, FormEventHandler } from 'react';
 import { Dispatch, ActionCreator, Reducer } from 'redux';
 
-export const actionTypes: {[actionName:string]: string};
+export const actionTypes: {[actionName: string]: string};
 
 export type FieldValue = any;
 
-export type FormData = { [fieldName: string]: FieldValue };
+export interface FormData {
+    [fieldName: string]: FieldValue;
+}
 
 export interface FieldProp<T> {
     /**
@@ -63,14 +64,14 @@ export interface FieldProp<T> {
      * either receive the React SyntheticEvent or the current value of the
      * field.
      */
-    onBlur(eventOrValue: SyntheticEvent<T> | FieldValue): void;
+    onBlur(eventOrValue: React.SyntheticEvent<T> | FieldValue): void;
 
     /**
      * A function to call when the form field is changed. It expects to either
      * receive the React SyntheticEvent or the new value of the field.
      * @param eventOrValue
      */
-    onChange(eventOrValue: SyntheticEvent<T> | FieldValue): void;
+    onChange(eventOrValue: React.SyntheticEvent<T> | FieldValue): void;
 
     /**
      * A function to call when the form field receives a 'dragStart' event.
@@ -137,7 +138,7 @@ export interface ReduxFormProps<T> {
      * A function that may be called to initiate asynchronous validation if
      * asynchronous validation is enabled.
      */
-    asyncValidate?: Function;
+    asyncValidate?(): void;
 
     /**
      * true if the asynchronous validation function has been called but has not
@@ -189,9 +190,9 @@ export interface ReduxFormProps<T> {
      * that as if it were the error for a field called _error, and it will be
      * given as the error prop.
      */
-    handleSubmit?(event: SyntheticEvent<T>): void;
+    handleSubmit?(event: React.SyntheticEvent<T>): void;
     handleSubmit?(event: React.MouseEvent<HTMLButtonElement>): void;
-    handleSubmit?(submit: (data: FormData, dispatch?: Dispatch<any>) => Promise<any> | void): FormEventHandler<T>;
+    handleSubmit?(submit: (data: FormData, dispatch?: Dispatch<any>) => Promise<any> | void): React.FormEventHandler<T>;
 
     /**
      * Initializes the form data to the given values. All dirty and pristine
@@ -272,7 +273,7 @@ export interface ReduxFormProps<T> {
     values?: FormData;
 }
 
-declare class ElementClass extends Component<any> {
+declare class ElementClass extends React.Component<any> {
 }
 interface ClassDecorator {
     <T extends (typeof ElementClass)>(component: T): T;
@@ -335,7 +336,7 @@ export interface ReduxFormConfig {
      *
      * See Asynchronous Blur Validation Example for more details.
      */
-    asyncValidate?(values: FormData, dispatch: Dispatch<any>, props: Object): Promise<any>;
+    asyncValidate?(values: FormData, dispatch: Dispatch<any>, props: {}): Promise<any>;
 
     /**
      * Whether or not to automatically destroy your form's state in the Redux
@@ -434,7 +435,7 @@ export interface ReduxFormConfig {
      * { field1: <String>, field2: <String> }.
      * Defaults to (values, props) => ({}).
      */
-    validate?(values: FormData, props: { [fieldName: string]: FieldProp<any> }): Object;
+    validate?(values: FormData, props: { [fieldName: string]: FieldProp<any> }): {};
 }
 
 /**
@@ -473,5 +474,4 @@ export declare const reducer: {
      * form.
      */
     plugin(reducers: { [formName: string]: Reducer<any> }): Reducer<any>;
-}
-
+};
diff --git a/types/redux-form/v4/redux-form-tests.tsx b/types/redux-form/v4/redux-form-tests.tsx
index 424c87c609..58bd3ceeb8 100644
--- a/types/redux-form/v4/redux-form-tests.tsx
+++ b/types/redux-form/v4/redux-form-tests.tsx
@@ -1,14 +1,12 @@
-
 import * as React from 'react';
-import { Component, PropTypes } from 'react';
-import {createStore, combineReducers} from 'redux';
-import {reduxForm, reducer as reduxFormReducer, ReduxFormProps} from 'redux-form';
-
+import * as PropTypes from 'prop-types';
+import { createStore, combineReducers } from 'redux';
+import { reduxForm, reducer as reduxFormReducer, ReduxFormProps } from 'redux-form';
 
 namespace SimpleForm {
   export const fields = ['firstName', 'lastName', 'email', 'sex', 'favoriteColor', 'employed', 'notes'];
 
-  class SimpleForm extends Component<ReduxFormProps<SimpleForm & HTMLFormElement>> {
+  class SimpleForm extends React.Component<ReduxFormProps<SimpleForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -97,12 +95,11 @@ namespace SimpleForm {
   })(SimpleForm);
 }
 
-
 namespace SynchronousValidation {
   export const fields = ['username', 'email', 'age'];
 
-  const validate = (values:any) => {
-    const errors:any = {};
+  const validate = (values: any) => {
+    const errors: any = {};
     if (!values.username) {
       errors.username = 'Required';
     } else if (values.username.length > 15) {
@@ -123,7 +120,7 @@ namespace SynchronousValidation {
     return errors;
   };
 
-  class SynchronousValidationForm extends Component<ReduxFormProps<SynchronousValidationForm & HTMLFormElement>> {
+  class SynchronousValidationForm extends React.Component<ReduxFormProps<SynchronousValidationForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -175,11 +172,10 @@ namespace SynchronousValidation {
   })(SynchronousValidationForm);
 }
 
-
 namespace SumbitValidation {
   export const fields = ['username', 'password'];
 
-  const submit = (values:any, dispatch:any) => {
+  const submit = (values: any, dispatch: any) => {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
         if (['john', 'paul', 'george', 'ringo'].indexOf(values.username) === -1) {
@@ -193,7 +189,7 @@ namespace SumbitValidation {
     });
   };
 
-  class SubmitValidationForm extends Component<ReduxFormProps<SubmitValidationForm>> {
+  class SubmitValidationForm extends React.Component<ReduxFormProps<SubmitValidationForm>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -239,10 +235,9 @@ namespace SumbitValidation {
   })(SubmitValidationForm);
 }
 
-
 namespace InitializingFromState {
   const LOAD = 'redux-form-examples/account/LOAD';
-  const loadAccount = (data:any) => ({type: LOAD, data});
+  const loadAccount = (data: any) => ({type: LOAD, data});
   export const fields = ['firstName', 'lastName', 'age', 'bio'];
   const data = {  // used to populate "account" reducer when "Load" is clicked
     firstName: 'John',
@@ -252,10 +247,10 @@ namespace InitializingFromState {
   };
 
   interface Props<T> extends ReduxFormProps<T> {
-    load: Function;
+    load(data: any): void;
   }
 
-  class InitializingFromStateForm extends Component<Props<InitializingFromStateForm & HTMLFormElement>> {
+  class InitializingFromStateForm extends React.Component<Props<InitializingFromStateForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -310,14 +305,13 @@ namespace InitializingFromState {
       form: 'initializing',
       fields
     },
-    (state:any) => ({ // mapStateToProps
+    (state: any) => ({ // mapStateToProps
       initialValues: state.account.data // will pull state into form's initialValues
     }),
     {load: loadAccount}      // mapDispatchToProps (will bind action creator to dispatch)
   )(InitializingFromStateForm);
 }
 
-
 namespace NormalizingFormData {
   const reducer = combineReducers({
     // other reducers
diff --git a/types/redux-form/v4/tslint.json b/types/redux-form/v4/tslint.json
new file mode 100644
index 0000000000..fe5adda0aa
--- /dev/null
+++ b/types/redux-form/v4/tslint.json
@@ -0,0 +1,11 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "callable-types": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/redux-form/v6/index.d.ts b/types/redux-form/v6/index.d.ts
index e73b4d550d..4e8e57b3b3 100644
--- a/types/redux-form/v6/index.d.ts
+++ b/types/redux-form/v6/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Carson Full <https://github.com/carsonf>, Daniel Lytkin <https://github.com/aikoven>, Karol Janyst <https://github.com/LKay>, Luka Zakrajsek <https://github.com/bancek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import {
   ComponentClass,
@@ -12,16 +12,17 @@ import {
 
 export type FieldValue = any;
 
-export type FieldState = {
+export interface FieldState {
     active?: boolean;
     touched?: boolean;
     visited?: boolean;
+    error?: any;
 }
 
 export type FieldType = "Field" | "FieldArray";
 
 export interface DataShape {
-    [fieldName: string]: FieldValue
+    [fieldName: string]: FieldValue;
 }
 
 export type FormErrors<FormData extends DataShape> = {
@@ -34,7 +35,7 @@ export type FormWarnings<FormData extends DataShape> = {
 
 export type FormMeta<FormData extends DataShape> = {
     [P in keyof FormData]?: FieldState;
-}
+};
 
 /**
  * A component class or stateless function component.
diff --git a/types/redux-form/v6/lib/Field.d.ts b/types/redux-form/v6/lib/Field.d.ts
index ecef15b4c7..3e984d6219 100644
--- a/types/redux-form/v6/lib/Field.d.ts
+++ b/types/redux-form/v6/lib/Field.d.ts
@@ -28,7 +28,7 @@ interface BaseFieldProps {
      *
      * Required but made optional so interface can be used on decorated components.
      */
-    component?: ComponentConstructor<any> | "input" | "select" | "textarea",
+    component?: ComponentConstructor<any> | "input" | "select" | "textarea";
 
     /**
      * Formats the value from the Redux store to be displayed in the field input.
@@ -243,7 +243,6 @@ interface WrappedFieldInputProps {
  * These props are metadata about the state of this field that redux-form is tracking for you.
  */
 interface WrappedFieldMetaProps<S> {
-
     /**
      * true if this field currently has focus. It will only work if you are
      * passing onFocus to your input element.
diff --git a/types/redux-form/v6/lib/FieldArray.d.ts b/types/redux-form/v6/lib/FieldArray.d.ts
index 9629eecb27..5bc5fcc713 100644
--- a/types/redux-form/v6/lib/FieldArray.d.ts
+++ b/types/redux-form/v6/lib/FieldArray.d.ts
@@ -20,7 +20,7 @@ interface BaseFieldArrayProps {
      *
      * Required but made optional so interface can be used on decorated components.
      */
-    component?: ComponentConstructor<any>,
+    component?: ComponentConstructor<any>;
 
     /**
      * Allows you to to provide a field-level validation rule. The function will be given the
@@ -52,7 +52,6 @@ interface BaseFieldArrayProps {
  * Declare FieldArray as this interface to specify the generics.
  */
 export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFieldArrayProps & FieldCustomProps> {
-
     /**
      * The name prop that you passed in.
      */
@@ -75,7 +74,6 @@ export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFi
  * The FieldArray Instance API.
  */
 export class FieldArray extends Component<any> implements GenericFieldArray<any, any> {
-
     /**
      * The name prop that you passed in.
      */
@@ -103,6 +101,10 @@ interface WrappedFieldArrayProps<T> {
 }
 
 interface FieldsProps<T> {
+    /**
+     * true if field is field array
+     */
+    _isFieldArray: boolean
     /**
      * A method to iterate over each value of the array.
      */
@@ -134,6 +136,15 @@ interface FieldsProps<T> {
      */
     map(callback: (name: string, index: number, fields: FieldsProps<T>) => any): any;
 
+    /**
+     * A method to move value in array on on different index in the field array
+     */
+    move(from: number, to: number): void;
+
+    /**
+     * Name of field array
+     */
+    name: string;
     /**
      * Removes an item from the end of the array. Returns the item removed.
      */
@@ -144,16 +155,32 @@ interface FieldsProps<T> {
      */
     push(value: T): void;
 
+    /**
+     * TODO: Need to figure out what does this do, its taken
+     * directly form redux-form repo and flow types
+     */
+    reduce(callback: Function): any
+
     /**
      * Removes an item from the array at an arbitrary index.
      */
     remove(index: number): void;
 
+    /**
+     * It will remove all fields in field array
+     */
+    removeAll(): void
+
     /**
      * Removes an item from beginning of the array. Returns the item removed.
      */
     shift(): T;
 
+    /**
+     * TODO: Need to figure out what does this do, its taken
+     * directly form redux-form repo and flow types
+     */
+    some(callback: Function): void
     /**
      * Swaps two items in the array at the given indexes.
      */
@@ -197,6 +224,15 @@ interface FieldArrayMetaProps {
      */
     pristine: boolean;
 
+    /**
+     * true if field array is being submitted
+     */
+    submitting: boolean;
+
+    /**
+     * true if some field value in the field array fails validation on submit
+    */
+    submitFailed: boolean;
     /**
      * true if any of the fields have been touched.
      */
diff --git a/types/redux-form/v6/lib/Fields.d.ts b/types/redux-form/v6/lib/Fields.d.ts
index b2c210ba8c..102dd52692 100644
--- a/types/redux-form/v6/lib/Fields.d.ts
+++ b/types/redux-form/v6/lib/Fields.d.ts
@@ -112,5 +112,5 @@ export class Fields extends Component<any> implements GenericFields<any, any> {
 }
 
 interface WrappedFieldsProps<S> {
-    [name: string]: WrappedFieldsProps<S> & WrappedFieldProps<S>
+    [name: string]: WrappedFieldsProps<S> & WrappedFieldProps<S>;
 }
diff --git a/types/redux-form/v6/lib/Form.d.ts b/types/redux-form/v6/lib/Form.d.ts
index 9339348393..a4b45d94f4 100644
--- a/types/redux-form/v6/lib/Form.d.ts
+++ b/types/redux-form/v6/lib/Form.d.ts
@@ -1,10 +1,9 @@
 import { Component, HTMLProps, FormEvent } from "react";
 import { Dispatch } from "redux";
-import { SubmitHandler, FormProps, FormErrors } from "../index"
+import { SubmitHandler, FormProps, FormErrors } from "../index";
 
 interface FormSubmitHandler {
     (values: any, dispatch?: Dispatch<any>, props?: FormProps<any, any, any> & { [prop: string]: any }): void | FormErrors<any> | Promise<any>;
-    //(e: FormEvent<HTMLFormElement>): void;
 }
 
 export interface FormComponentProps extends HTMLProps<HTMLFormElement> {
diff --git a/types/redux-form/v6/lib/actions.d.ts b/types/redux-form/v6/lib/actions.d.ts
index b126549f68..7e7ea5762a 100644
--- a/types/redux-form/v6/lib/actions.d.ts
+++ b/types/redux-form/v6/lib/actions.d.ts
@@ -2,9 +2,9 @@ import { Action } from "redux";
 import { FormErrors, FormWarnings, FieldType } from "../index";
 
 export interface FormAction extends Action {
-    meta: {
-        form: string;
-    };
+    meta?: any;
+    payload?: any;
+    error?: any;
 }
 
 /**
@@ -90,7 +90,7 @@ export function focus(form: string, field: string): FormAction;
  * user edits.
  */
 interface InitializeOptions {
-    keepDirty : boolean;
+    keepDirty: boolean;
     keepSubmitSucceeded: boolean;
 }
 
diff --git a/types/redux-form/v6/lib/reduxForm.d.ts b/types/redux-form/v6/lib/reduxForm.d.ts
index f1eac8d928..53ad871c0c 100644
--- a/types/redux-form/v6/lib/reduxForm.d.ts
+++ b/types/redux-form/v6/lib/reduxForm.d.ts
@@ -102,7 +102,7 @@ export interface Config<FormData extends DataShape, P, S> {
      * A callback function that will be called with all the form values any time
      * any of the form values change.
      */
-    onChange?: (values: any) => void;
+    onChange?(values: any): void;
 
     /**
      * The function to call with the form data when the handleSubmit() is fired
@@ -334,7 +334,7 @@ export interface FormComponent<FormData extends DataShape, P, S> extends Compone
      * A reference to the instance of the component you decorated with reduxForm().
      * Mainly useful for testing.
      */
-    wrappedInstance: ReactElement<P & FormProps<FormData, P, S>>
+    wrappedInstance: ReactElement<P & FormProps<FormData, P, S>>;
 }
 
 /**
@@ -402,13 +402,13 @@ export interface StrictFormProps<FormData extends DataShape, P, S> {
          * Unshifts the given value into the beginning of the given array field in your form.
          */
         unshift(field: string, value: FieldValue): void;
-    }
+    };
 
     /**
      * A function that may be called to initiate asynchronous validation if
      * asynchronous validation is enabled.
      */
-    asyncValidate: () => void;
+    asyncValidate(): void;
 
     /**
      * This value will be either:
@@ -566,6 +566,4 @@ export interface StrictFormProps<FormData extends DataShape, P, S> {
  * These are the props that will be passed to your form component.
  * Your form component's props can extend this interface.
  */
-export interface FormProps<FormData extends DataShape, P, S> extends Partial<StrictFormProps<FormData, P, S>> {
-
-}
+export interface FormProps<FormData extends DataShape, P, S> extends Partial<StrictFormProps<FormData, P, S>> {}
diff --git a/types/redux-form/v6/lib/selectors.d.ts b/types/redux-form/v6/lib/selectors.d.ts
index 3c0c4b550f..20185fb330 100644
--- a/types/redux-form/v6/lib/selectors.d.ts
+++ b/types/redux-form/v6/lib/selectors.d.ts
@@ -86,7 +86,7 @@ export const getFormSubmitErrors: ErrorSelector;
  *
  * If you are using ImmutableJS, it will return a List.
  */
-export const getFormNames: <State>(state: State) => string[];
+export function getFormNames<State>(state: State): string[];
 
 /**
  * Returns true if the form is dirty, i.e. the values have been altered
diff --git a/types/redux-form/v6/package.json b/types/redux-form/v6/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-form/v6/package.json
+++ b/types/redux-form/v6/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-form/v6/redux-form-tests.tsx b/types/redux-form/v6/redux-form-tests.tsx
index 086e03f319..6865051e0d 100644
--- a/types/redux-form/v6/redux-form-tests.tsx
+++ b/types/redux-form/v6/redux-form-tests.tsx
@@ -1,19 +1,20 @@
 import * as React from 'react';
-import { Component } from 'react';
 import { Action } from 'redux';
 import { Field, GenericField, reduxForm, WrappedFieldProps, BaseFieldProps, FormProps, FormAction, actionTypes, reducer } from "redux-form";
 
+ // TODO: tests fail in TypeScript@next when strictFunctionTypes=true
+
 interface CustomComponentProps {
     customProp: string;
 }
 
-class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponentProps> {
+class CustomComponent extends React.Component<WrappedFieldProps<any> & CustomComponentProps> {
     render() {
         const {
             input,
             meta : { touched },
             customProp
-        } = this.props
+        } = this.props;
 
         return (
             <div>
@@ -25,7 +26,7 @@ class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponent
     }
 }
 
-class CustomField extends Component<BaseFieldProps & CustomComponentProps> {
+class CustomField extends React.Component<BaseFieldProps & CustomComponentProps> {
     render() {
         const F = Field as new () => GenericField<CustomComponentProps, any>;
         return <F component={CustomComponent} {...this.props} />;
@@ -40,7 +41,7 @@ interface FormData {
 @reduxForm<FormData, any, any>({
     form: 'myForm'
 })
-class MyForm extends Component {
+class MyForm extends React.Component {
     render() {
         return (
             <div>
@@ -64,7 +65,7 @@ reduxForm({
     form: 'mySFCForm'
 })(MyStatelessFunctionalComponent);
 
-class MyReusableForm extends Component<void, undefined> {
+class MyReusableForm extends React.Component<void, undefined> {
     render() {
         return (
             <div>
@@ -85,8 +86,8 @@ reduxForm({
 
 // adapted from: http://redux-form.com/6.0.0-alpha.4/examples/initializeFromState/
 
-import { connect, DispatchProp } from 'react-redux'
-const { DOM: { input } } = React
+import { connect, DispatchProp } from 'react-redux';
+import { input } from 'react-dom-factories';
 
 interface DataShape {
     firstName: string;
@@ -94,7 +95,7 @@ interface DataShape {
 
 interface Props extends FormProps<DataShape, {}, {}> {}
 
-let InitializeFromStateFormFunction = (props: Props) => {
+const InitializeFromStateFormFunction = (props: Props) => {
     const { handleSubmit, pristine, reset, submitting } = props;
     return (
         <form onSubmit={handleSubmit}>
@@ -110,16 +111,16 @@ let InitializeFromStateFormFunction = (props: Props) => {
         </div>
         </form>
     );
-}
+};
 
 // Decorate with reduxForm(). It will read the initialValues prop provided by connect()
-const DecoratedInitializeFromStateFormFunction = reduxForm({
+const DecoratedInitializeFromStateFormFunction = reduxForm<{}, Props & DispatchProp<any>>({
   form: 'initializeFromState'  // a unique identifier for this form
-})(InitializeFromStateFormFunction)
+})(InitializeFromStateFormFunction);
 
 // You have to connect() to any reducers that you wish to connect to yourself
 const ConnectedDecoratedInitializeFromStateFormFunction = connect(
-    state => ({
+    (state: any) => ({
         initialValues: state.account.data // pull initial values from account reducer
     }),
 )(DecoratedInitializeFromStateFormFunction);
diff --git a/types/redux-form/v6/tsconfig.json b/types/redux-form/v6/tsconfig.json
index c4c9025157..f6f22a352c 100644
--- a/types/redux-form/v6/tsconfig.json
+++ b/types/redux-form/v6/tsconfig.json
@@ -31,4 +31,4 @@
         "index.d.ts",
         "redux-form-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/redux-form/v6/tslint.json b/types/redux-form/v6/tslint.json
new file mode 100644
index 0000000000..054167e539
--- /dev/null
+++ b/types/redux-form/v6/tslint.json
@@ -0,0 +1,11 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "callable-types": false,
+        "no-empty-interface": false,
+        "no-object-literal-type-assertion": false,
+        "no-unnecessary-generics": false,
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/redux-immutable-state-invariant/index.d.ts b/types/redux-immutable-state-invariant/index.d.ts
index b81b6cc47f..6ad2a0e588 100644
--- a/types/redux-immutable-state-invariant/index.d.ts
+++ b/types/redux-immutable-state-invariant/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>, Ben Rogers <https://github.com/highflying>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="redux" />
-
 import * as Redux from "redux";
 
 type isImmutableDefault = (value: any) => boolean;
diff --git a/types/redux-immutable-state-invariant/package.json b/types/redux-immutable-state-invariant/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-immutable-state-invariant/package.json
+++ b/types/redux-immutable-state-invariant/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-immutable-state-invariant/tslint.json b/types/redux-immutable-state-invariant/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-immutable-state-invariant/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-immutable/package.json b/types/redux-immutable/package.json
index f445ddce8e..c5591e5012 100644
--- a/types/redux-immutable/package.json
+++ b/types/redux-immutable/package.json
@@ -4,4 +4,4 @@
         "redux": "^3.6.0",
         "immutable": "^3.8.1"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-immutable/tslint.json b/types/redux-immutable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-immutable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-injectable-store/index.d.ts b/types/redux-injectable-store/index.d.ts
new file mode 100644
index 0000000000..14c5ac3062
--- /dev/null
+++ b/types/redux-injectable-store/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for redux-injectable-store 1.0
+// Project: https://github.com/lelandrichardson/redux-injectable-store#readme
+// Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Reducer, Store, StoreEnhancer } from "redux";
+
+export interface InjectableStore<S> extends Store<S> {
+    inject(namespace: string, reducer: Reducer<any>): void;
+    injectAll(reducers: { [key: string]: Reducer<any> }): void;
+    clearReducers(): void;
+}
+
+export type WrapReducer<S> = (reducer: Reducer<S>) => Reducer<S>;
+
+export interface InjectableStoreCreator {
+    <S>(
+        enhancer?: StoreEnhancer<S>,
+        wrapReducer?: WrapReducer<S>
+    ): InjectableStore<S>;
+    <S>(
+        preloadedState: S,
+        enhancer?: StoreEnhancer<S>,
+        wrapReducer?: WrapReducer<S>
+    ): InjectableStore<S>;
+}
+
+export const createInjectableStore: InjectableStoreCreator;
diff --git a/types/redux-injectable-store/package.json b/types/redux-injectable-store/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-injectable-store/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-injectable-store/redux-injectable-store-tests.ts b/types/redux-injectable-store/redux-injectable-store-tests.ts
new file mode 100644
index 0000000000..35e01684f1
--- /dev/null
+++ b/types/redux-injectable-store/redux-injectable-store-tests.ts
@@ -0,0 +1,24 @@
+import { createInjectableStore } from "redux-injectable-store";
+import { applyMiddleware, compose, AnyAction, Middleware } from "redux";
+
+interface State {
+    foo: string;
+    bar?: string;
+    baz?: string;
+}
+
+const initialState: State = { foo: "bar" };
+
+const middleware: Middleware[] = [];
+const enhancer = applyMiddleware(...middleware);
+const store = createInjectableStore<State>(initialState, enhancer);
+const anotherStore = createInjectableStore<State>(initialState, enhancer, reducer => reducer);
+
+const dummyReducer = (state: string) => state;
+
+store.inject("foo", dummyReducer);
+
+anotherStore.injectAll({
+    bar: dummyReducer,
+    baz: dummyReducer
+});
diff --git a/types/redux-injectable-store/tsconfig.json b/types/redux-injectable-store/tsconfig.json
new file mode 100644
index 0000000000..1fcc143ead
--- /dev/null
+++ b/types/redux-injectable-store/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-injectable-store-tests.ts"
+    ]
+}
diff --git a/types/redux-injectable-store/tslint.json b/types/redux-injectable-store/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-injectable-store/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redux-localstorage-debounce/package.json b/types/redux-localstorage-debounce/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-localstorage-debounce/package.json
+++ b/types/redux-localstorage-debounce/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-localstorage-filter/package.json b/types/redux-localstorage-filter/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-localstorage-filter/package.json
+++ b/types/redux-localstorage-filter/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-localstorage/index.d.ts b/types/redux-localstorage/index.d.ts
index b4af824d9b..b788fcd963 100644
--- a/types/redux-localstorage/index.d.ts
+++ b/types/redux-localstorage/index.d.ts
@@ -26,4 +26,6 @@ export function mergePersistedState(merge?: <A1, A2>(initialState: A1, persisten
 
 export default function persistState<A>(storage?: StorageAdapter<A>, key?: string, callback?: Function): Redux.GenericStoreEnhancer;
 
+export function transformState<A1, A2>(down: ((state: A1) => A2) | Array<(state: any) => any>, up: ((state: A2) => A1) | Array<(state: any) => any>): (storage: StorageAdapter<A1>) => A2;
+
 export const actionTypes: ActionTypes;
diff --git a/types/redux-localstorage/package.json b/types/redux-localstorage/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-localstorage/package.json
+++ b/types/redux-localstorage/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-localstorage/redux-localstorage-tests.ts b/types/redux-localstorage/redux-localstorage-tests.ts
index 49bf442fcf..17f453423a 100644
--- a/types/redux-localstorage/redux-localstorage-tests.ts
+++ b/types/redux-localstorage/redux-localstorage-tests.ts
@@ -2,6 +2,7 @@ import { Reducer, compose, combineReducers, createStore } from "redux";
 import {
     default as persistState,
     mergePersistedState,
+    transformState,
     actionTypes
 } from "redux-localstorage";
 import * as adapterAsyncStorage from "redux-localstorage/lib/adapters/AsyncStorage";
@@ -31,3 +32,7 @@ const createStoreLocalStorage = compose(
 const createStoreSessionStorage = compose(
     persistState(storageSessionStorage, "foo")
 )(createStore)(reducer);
+
+const storage = compose(
+    transformState([JSON.stringify, btoa], [atob, JSON.parse])
+)(storageLocalStorage);
diff --git a/types/redux-logger/index.d.ts b/types/redux-logger/index.d.ts
index d60d3ad218..c8ca66eda0 100644
--- a/types/redux-logger/index.d.ts
+++ b/types/redux-logger/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for redux-logger v3.0.0
+// Type definitions for redux-logger 3.0
 // Project: https://github.com/fcomb/redux-logger
 // Definitions by: Alexander Rusakov <https://github.com/arusakov>
 //                 Kevin Groat <https://github.com/kgroat>
@@ -6,45 +6,59 @@
 
 export as namespace ReduxLogger;
 
-import * as Redux from "redux";
+import * as Redux from 'redux';
 
 export const logger: Redux.Middleware;
 
-export type LoggerPredicate = (getState: () => any, action: any) => boolean;
+export type LoggerPredicate = (
+    getState: () => any,
+    action: any,
+    logEntry?: LogEntryObject
+) => boolean;
 
 export type StateToString = (state: any) => string;
 export type ActionToString = (action: any) => string;
 export type ErrorToString = (error: any, prevState: any) => string;
 
 export interface ColorsObject {
-  title?: boolean | ActionToString;
-  prevState?: boolean | StateToString;
-  action?: boolean | ActionToString;
-  nextState?: boolean | StateToString;
-  error?: boolean | ErrorToString;
+    title?: boolean | ActionToString;
+    prevState?: boolean | StateToString;
+    action?: boolean | ActionToString;
+    nextState?: boolean | StateToString;
+    error?: boolean | ErrorToString;
 }
 
 export interface LevelObject {
-  prevState?: string | boolean | StateToString;
-  action?: string | boolean | ActionToString;
-  nextState?: string | boolean | StateToString;
-  error?: string | boolean | ErrorToString;
+    prevState?: string | boolean | StateToString;
+    action?: string | boolean | ActionToString;
+    nextState?: string | boolean | StateToString;
+    error?: string | boolean | ErrorToString;
+}
+
+export interface LogEntryObject {
+    action?: string | boolean | ActionToString;
+    started?: number;
+    startedTime?: Date;
+    took?: number;
+    error?(error: any): any;
+    nextState?(state: any): any;
+    prevState?(state: any): any;
 }
 
 export interface ReduxLoggerOptions {
-  level?: string | ActionToString | LevelObject;
-  duration?: boolean;
-  timestamp?: boolean;
-  colors?: ColorsObject | false;
-  logger?: any;
-  logErrors?: boolean;
-  collapsed?: boolean | LoggerPredicate;
-  predicate?: LoggerPredicate;
-  stateTransformer?: (state: any) => any;
-  actionTransformer?: (action: any) => any;
-  errorTransformer?: (error: any) => any;
-  diff?: boolean;
-  diffPredicate?: LoggerPredicate;
+    level?: string | ActionToString | LevelObject;
+    duration?: boolean;
+    timestamp?: boolean;
+    colors?: ColorsObject | false;
+    logger?: any;
+    logErrors?: boolean;
+    collapsed?: boolean | LoggerPredicate;
+    predicate?: LoggerPredicate;
+    diff?: boolean;
+    diffPredicate?: LoggerPredicate;
+    stateTransformer?(state: any): any;
+    actionTransformer?(action: any): any;
+    errorTransformer?(error: any): any;
 }
 
 export function createLogger(options?: ReduxLoggerOptions): Redux.Middleware;
diff --git a/types/redux-logger/package.json b/types/redux-logger/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-logger/package.json
+++ b/types/redux-logger/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-logger/redux-logger-tests.ts b/types/redux-logger/redux-logger-tests.ts
index 7349e556c4..a3b77debd8 100644
--- a/types/redux-logger/redux-logger-tests.ts
+++ b/types/redux-logger/redux-logger-tests.ts
@@ -1,100 +1,104 @@
-
-import { createLogger } from 'redux-logger';
-import logger from 'redux-logger';
+import logger, { createLogger } from 'redux-logger';
 import { applyMiddleware, createStore } from 'redux';
 
-let loggerSimple = createLogger();
+const loggerSimple = createLogger();
 
-let loggerSimpleOpts = createLogger({
-  duration: true,
-  timestamp: true,
-  logger: console,
-  logErrors: true,
-  predicate: (getState, action) => true,
-  stateTransformer: (state) => state,
-  actionTransformer: (action) => action,
-  errorTransformer: (error) => error,
-  diff: true,
-  diffPredicate: (getState, action) => true,
+const loggerSimpleOpts = createLogger({
+    duration: true,
+    timestamp: true,
+    logger: console,
+    logErrors: true,
+    predicate: (getState, action) => true,
+    stateTransformer: state => state,
+    actionTransformer: action => action,
+    errorTransformer: error => error,
+    diff: true,
+    diffPredicate: (getState, action) => true
 });
 
-let loggerCollapsedBool = createLogger({
-  collapsed: true
+const loggerCollapsedBool = createLogger({
+    collapsed: true
 });
 
-let loggerCollapsedPredicate = createLogger({
-  collapsed: (getAction, action) => true
+const loggerCollapsedPredicate = createLogger({
+    collapsed: (getAction, action) => true
 });
 
-let loggerColorsOverallBoolean = createLogger({
-  colors: false
+const loggerCollapsedLogEntryPredicate = createLogger({
+    collapsed: (getAction, action, logEntry) =>
+        logEntry !== undefined && !logEntry.error
 });
 
-let loggerColorsBoolean = createLogger({
-  colors: {
-    title: false,
-    prevState: false,
-    action: false,
-    nextState: false,
-    error: false
-  }
+const loggerColorsOverallBoolean = createLogger({
+    colors: false
 });
 
-let loggerColorsFunction = createLogger({
-  colors: {
-    title: (action) => '#000',
-    prevState: (state) => '#000',
-    action: (action) => '#000',
-    nextState: (state) => '#000',
-    error: (error, prevState) => '#000'
-  }
+const loggerColorsBoolean = createLogger({
+    colors: {
+        title: false,
+        prevState: false,
+        action: false,
+        nextState: false,
+        error: false
+    }
 });
 
-let loggerLevelString = createLogger({
-  level: 'log'
+const loggerColorsFunction = createLogger({
+    colors: {
+        title: action => '#000',
+        prevState: state => '#000',
+        action: action => '#000',
+        nextState: state => '#000',
+        error: (error, prevState) => '#000'
+    }
 });
 
-let loggerLevelFunction = createLogger({
-  level: (action) => 'log'
+const loggerLevelString = createLogger({
+    level: 'log'
 });
 
-let loggerLevelObjectFunction = createLogger({
-  level: {
-    prevState: (state) => 'log',
-    action: (action) => 'log',
-    nextState: (state) => 'log',
-    error: (error, prevState) => 'log'
-  }
+const loggerLevelFunction = createLogger({
+    level: action => 'log'
 });
 
-let loggerLevelObjectBoolean = createLogger({
-  level: {
-    prevState: false,
-    action: false,
-    nextState: false,
-    error: false
-  }
+const loggerLevelObjectFunction = createLogger({
+    level: {
+        prevState: state => 'log',
+        action: action => 'log',
+        nextState: state => 'log',
+        error: (error, prevState) => 'log'
+    }
 });
 
-let loggerLevelObjectString = createLogger({
-  level: {
-    prevState: 'log',
-    action: 'log',
-    nextState: 'log',
-    error: 'log'
-  }
+const loggerLevelObjectBoolean = createLogger({
+    level: {
+        prevState: false,
+        action: false,
+        nextState: false,
+        error: false
+    }
 });
 
-let createStoreWithMiddleware = applyMiddleware(
-  logger,
-  loggerSimpleOpts,
-  loggerCollapsedBool,
-  loggerCollapsedPredicate,
-  loggerColorsBoolean,
-  loggerColorsFunction,
-  loggerLevelString,
-  loggerLevelFunction,
-  loggerLevelObjectFunction,
-  loggerLevelObjectBoolean,
-  loggerLevelObjectString
+const loggerLevelObjectString = createLogger({
+    level: {
+        prevState: 'log',
+        action: 'log',
+        nextState: 'log',
+        error: 'log'
+    }
+});
+
+const createStoreWithMiddleware = applyMiddleware(
+    logger,
+    loggerSimpleOpts,
+    loggerCollapsedBool,
+    loggerCollapsedPredicate,
+    loggerCollapsedLogEntryPredicate,
+    loggerColorsBoolean,
+    loggerColorsFunction,
+    loggerLevelString,
+    loggerLevelFunction,
+    loggerLevelObjectFunction,
+    loggerLevelObjectBoolean,
+    loggerLevelObjectString
 )(createStore);
diff --git a/types/redux-logger/tsconfig.json b/types/redux-logger/tsconfig.json
index 7441f646d7..1789641398 100644
--- a/types/redux-logger/tsconfig.json
+++ b/types/redux-logger/tsconfig.json
@@ -1,24 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
+        "lib": ["es6", "dom"],
         "noImplicitAny": true,
         "noImplicitThis": false,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "redux-logger-tests.ts"
-    ]
-}
\ No newline at end of file
+    "files": ["index.d.ts", "redux-logger-tests.ts"]
+}
diff --git a/types/redux-logger/tslint.json b/types/redux-logger/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/redux-logger/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/redux-mock-store/index.d.ts b/types/redux-mock-store/index.d.ts
index 20a94b33f5..4f8114731a 100644
--- a/types/redux-mock-store/index.d.ts
+++ b/types/redux-mock-store/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Redux Mock Store 0.0
+// Type definitions for Redux Mock Store 0.0.1
 // Project: https://github.com/arnaudbenard/redux-mock-store
 // Definitions by: Marian Palkus <https://github.com/MarianPalkus>, Cap3 <http://www.cap3.de>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Redux from 'redux';
 
@@ -10,7 +11,7 @@ export interface MockStore<T> extends Redux.Store<T> {
     clearActions(): void;
 }
 
-export type MockStoreCreator<T> = (state?: T) => MockStore<T>;
+export type MockStoreCreator<T = {}> = (state?: T) => MockStore<T>;
 
 declare function createMockStore<T>(middlewares?: Redux.Middleware[]): MockStoreCreator<T>;
 
diff --git a/types/redux-mock-store/package.json b/types/redux-mock-store/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-mock-store/package.json
+++ b/types/redux-mock-store/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-mock-store/redux-mock-store-tests.ts b/types/redux-mock-store/redux-mock-store-tests.ts
index ca46364ca3..daa801b960 100644
--- a/types/redux-mock-store/redux-mock-store-tests.ts
+++ b/types/redux-mock-store/redux-mock-store-tests.ts
@@ -20,7 +20,7 @@ function counter(state: any, action: any) {
 function loggingMiddleware() {
     return (next: Redux.Dispatch<any>) => (action: any) => {
         console.log(action.type);
-        next(action);
+        return next(action);
     };
 }
 
diff --git a/types/redux-mock-store/tslint.json b/types/redux-mock-store/tslint.json
index 849acb7fd0..3337f86cdc 100644
--- a/types/redux-mock-store/tslint.json
+++ b/types/redux-mock-store/tslint.json
@@ -2,6 +2,7 @@
 	"extends": "dtslint/dt.json",
 	"rules": {
 		// TODO
-		"dt-header": false
+		"dt-header": false,
+		"no-unnecessary-generics": false
 	}
 }
\ No newline at end of file
diff --git a/types/redux-optimistic-ui/package.json b/types/redux-optimistic-ui/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-optimistic-ui/package.json
+++ b/types/redux-optimistic-ui/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-optimistic-ui/tslint.json b/types/redux-optimistic-ui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-optimistic-ui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-pack/index.d.ts b/types/redux-pack/index.d.ts
index 72e2d79d10..2bffdf8117 100644
--- a/types/redux-pack/index.d.ts
+++ b/types/redux-pack/index.d.ts
@@ -45,8 +45,8 @@ export interface Action<TState = {}, TSuccessPayload = {}, TErrorPayload = {}, T
     payload?: TSuccessPayload | TErrorPayload | TStartPayload;
     meta?: ActionMeta<TState, TSuccessPayload, TErrorPayload, TStartPayload>;
 }
-export function handle<TState, TSuccessPayload, TErrorPayload, TStartPayload>(
+export function handle<TState>(
     state: TState,
-    action: Action<TState, TSuccessPayload, TErrorPayload, TStartPayload>,
+    action: Action<TState, any, any, any>,
     handlers: Handlers<TState>)
     : TState;
diff --git a/types/redux-pack/package.json b/types/redux-pack/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-pack/package.json
+++ b/types/redux-pack/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-persist-transform-encrypt/package.json b/types/redux-persist-transform-encrypt/package.json
index 47098e2ea0..4824af3448 100644
--- a/types/redux-persist-transform-encrypt/package.json
+++ b/types/redux-persist-transform-encrypt/package.json
@@ -4,4 +4,4 @@
         "redux": "^3.6.0",
         "redux-persist": "^4.5.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-persist-transform-filter/package.json b/types/redux-persist-transform-filter/package.json
index 47098e2ea0..4824af3448 100644
--- a/types/redux-persist-transform-filter/package.json
+++ b/types/redux-persist-transform-filter/package.json
@@ -4,4 +4,4 @@
         "redux": "^3.6.0",
         "redux-persist": "^4.5.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-promise-middleware/package.json b/types/redux-promise-middleware/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-promise-middleware/package.json
+++ b/types/redux-promise-middleware/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-promise-middleware/tslint.json b/types/redux-promise-middleware/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-promise-middleware/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-promise/package.json b/types/redux-promise/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-promise/package.json
+++ b/types/redux-promise/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-promise/tslint.json b/types/redux-promise/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-promise/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-recycle/package.json b/types/redux-recycle/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-recycle/package.json
+++ b/types/redux-recycle/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-recycle/tslint.json b/types/redux-recycle/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-recycle/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-router/package.json b/types/redux-router/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-router/package.json
+++ b/types/redux-router/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/redux-router/tslint.json b/types/redux-router/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-router/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-saga-routines/index.d.ts b/types/redux-saga-routines/index.d.ts
deleted file mode 100644
index d01e5edddf..0000000000
--- a/types/redux-saga-routines/index.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for redux-saga-routines 2.0
-// Project: https://github.com/afitiskin/redux-saga-routines#readme
-// Definitions by: Karol Janyst <https://github.com/LKay>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-
-import { Action } from "redux";
-import { FormSubmitHandler } from "redux-form";
-
-export const ROUTINE_PROMISE_ACTION: string;
-
-export interface RoutineAction<T> extends Action {
-    payload: T;
-}
-
-export type RoutineActionCreator<T> = (payload: T) => RoutineAction<T>;
-
-export interface ReduxRoutine {
-    TRIGGER: string;
-    REQUEST: string;
-    SUCCESS: string;
-    FAILURE: string;
-    FULFILL: string;
-    trigger: RoutineActionCreator<any>;
-    request: RoutineActionCreator<any>;
-    success: RoutineActionCreator<any>;
-    failure: RoutineActionCreator<any>;
-    fulfill: RoutineActionCreator<any>;
-}
-
-export function createRoutine(prefix: string): ReduxRoutine;
-
-export function routinePromiseWatcherSaga(): Iterator<any>;
-
-export function bindRoutineToReduxForm(routine: ReduxRoutine): FormSubmitHandler;
diff --git a/types/redux-saga-routines/package.json b/types/redux-saga-routines/package.json
deleted file mode 100644
index ce10629c07..0000000000
--- a/types/redux-saga-routines/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "redux": "^3.7.2",
-        "redux-saga": "^0.15.6"
-    }
-}
diff --git a/types/redux-saga-routines/redux-saga-routines-tests.tsx b/types/redux-saga-routines/redux-saga-routines-tests.tsx
deleted file mode 100644
index 4cf2a62c4a..0000000000
--- a/types/redux-saga-routines/redux-saga-routines-tests.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as React from "react";
-import { reduxForm } from "redux-form";
-import createSagaMiddleware from "redux-saga";
-import {
-    bindRoutineToReduxForm,
-    createRoutine,
-    routinePromiseWatcherSaga,
-    ROUTINE_PROMISE_ACTION
-} from "redux-saga-routines";
-
-const sagaMiddleware = createSagaMiddleware();
-
-sagaMiddleware.run(routinePromiseWatcherSaga);
-
-const submitFormRoutine = createRoutine("SUBMIT_MY_FORM");
-const submitFormHandler = bindRoutineToReduxForm(submitFormRoutine);
-
-const Test = reduxForm({
-    form : "test"
-})(
-    ({ handleSubmit }) => {
-        return (
-            <form onSubmit={ handleSubmit(submitFormHandler) }>
-                <input type="hidden" name="test" />
-            </form>
-        );
-    }
-);
diff --git a/types/redux-saga-routines/tsconfig.json b/types/redux-saga-routines/tsconfig.json
deleted file mode 100644
index 32f2937910..0000000000
--- a/types/redux-saga-routines/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "jsx": "react",
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "redux-saga-routines-tests.tsx"
-    ]
-}
diff --git a/types/redux-socket.io/index.d.ts b/types/redux-socket.io/index.d.ts
new file mode 100644
index 0000000000..dfd608868b
--- /dev/null
+++ b/types/redux-socket.io/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for redux-socket.io 1.4
+// Project: https://github.com/itaylor/redux-socket.io#readme
+// Definitions by: Igor Voropaev <https://github.com/snakeego>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="socket.io-client" />
+
+import { Middleware, Action, Dispatch } from 'redux';
+
+export interface MiddlewareOptions {
+    eventName?: string;
+    execute?: <S>(action: Action, emitBound: SocketIOClient.Socket, next: Dispatch<S>, dispatch: Dispatch<S>) => any;
+}
+
+export default function createSocketIoMiddleware(
+    socket: SocketIOClient.Socket,
+    criteria: (string | ReadonlyArray<string> | ((type: string, action: Action) => boolean)),
+    options?: MiddlewareOptions
+): Middleware;
diff --git a/types/redux-socket.io/package.json b/types/redux-socket.io/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-socket.io/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-socket.io/redux-socket.io-tests.ts b/types/redux-socket.io/redux-socket.io-tests.ts
new file mode 100644
index 0000000000..f67a86393a
--- /dev/null
+++ b/types/redux-socket.io/redux-socket.io-tests.ts
@@ -0,0 +1,10 @@
+import * as ioclient from 'socket.io-client';
+import createSocketIoMiddleware from 'redux-socket.io';
+import { Action } from 'redux';
+
+const socketio = ioclient("test");
+
+const SocketIOMiddleware1 = createSocketIoMiddleware(socketio, "test");
+const SocketIOMiddleware2 = createSocketIoMiddleware(socketio, ["test1", "test2"]);
+const SocketIOMiddleware3 = createSocketIoMiddleware(socketio, (type: string, action: Action) => (type === 'test'));
+const SocketIOMiddleware4 = createSocketIoMiddleware(socketio, "", { eventName: "test" });
diff --git a/types/redux-socket.io/tsconfig.json b/types/redux-socket.io/tsconfig.json
new file mode 100644
index 0000000000..8636bd654d
--- /dev/null
+++ b/types/redux-socket.io/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-socket.io-tests.ts"
+    ]
+}
diff --git a/types/redux-socket.io/tslint.json b/types/redux-socket.io/tslint.json
new file mode 100644
index 0000000000..6746359dda
--- /dev/null
+++ b/types/redux-socket.io/tslint.json
@@ -0,0 +1,3 @@
+{ 
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/redux-storage-engine-localstorage/index.d.ts b/types/redux-storage-engine-localstorage/index.d.ts
new file mode 100644
index 0000000000..51f6d266df
--- /dev/null
+++ b/types/redux-storage-engine-localstorage/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for redux-storage-engine-localstorage 1.1
+// Project: https://github.com/react-stack/redux-storage-engine-localstorage
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { StorageEngine } from "redux-storage";
+
+export type Replacer = (key: string, value: any) => any;
+
+export type Reviver = Replacer;
+
+export default function createEngine(key: string, replacer?: Replacer, reviver?: Reviver): StorageEngine;
diff --git a/types/redux-storage-engine-localstorage/redux-storage-engine-localstorage-tests.ts b/types/redux-storage-engine-localstorage/redux-storage-engine-localstorage-tests.ts
new file mode 100644
index 0000000000..a141c4f2c4
--- /dev/null
+++ b/types/redux-storage-engine-localstorage/redux-storage-engine-localstorage-tests.ts
@@ -0,0 +1,20 @@
+import { createLoader } from "redux-storage";
+import createEngine from "redux-storage-engine-localstorage";
+
+let engine = createEngine('test-key');
+
+createLoader(engine);
+
+engine = createEngine('test-key', (key, value) => {
+    if (typeof value === 'string') {
+        return 'foo';
+    }
+    return value;
+}, (key, value) => {
+    if (key === 'foo') {
+        return 'bar';
+    }
+    return value;
+});
+
+createLoader(engine);
diff --git a/types/redux-storage-engine-localstorage/tsconfig.json b/types/redux-storage-engine-localstorage/tsconfig.json
new file mode 100644
index 0000000000..671323d17f
--- /dev/null
+++ b/types/redux-storage-engine-localstorage/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+          "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+      "index.d.ts",
+      "redux-storage-engine-localstorage-tests.ts"
+  ]
+}
diff --git a/types/redux-storage-engine-localstorage/tslint.json b/types/redux-storage-engine-localstorage/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-storage-engine-localstorage/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redux-storage/index.d.ts b/types/redux-storage/index.d.ts
index f04ee2b522..28a9dfaa2f 100644
--- a/types/redux-storage/index.d.ts
+++ b/types/redux-storage/index.d.ts
@@ -89,18 +89,6 @@ declare module "redux-storage-decorator-filter" {
     export default function (engine: StorageEngine, whitelist?: FilterList, blacklist?: FilterList): StorageEngine;
 }
 
-declare module "redux-storage-engine-localstorage" {
-    import { StorageEngine } from "redux-storage";
-
-    export interface LocalStorageEngine extends StorageEngine { }
-
-    /**
-     * Create local storage
-     * @param key localstorage key
-     */
-    export default function createEngine(key: string): LocalStorageEngine;
-}
-
 declare module "redux-storage-engine-reactnativeasyncstorage" {
     import { StorageEngine } from "redux-storage";
 
diff --git a/types/redux-storage/redux-storage-tests.ts b/types/redux-storage/redux-storage-tests.ts
index 4e84468a64..b8d9ccdbb0 100644
--- a/types/redux-storage/redux-storage-tests.ts
+++ b/types/redux-storage/redux-storage-tests.ts
@@ -23,7 +23,7 @@ const initialStateLoader = createLoader(storageEngine);
 
 const storageMiddleware = createMiddleware(storageEngine, [], []);
 
-const store = applyMiddleware(storageMiddleware)(createStore)(enhancedReducer);
+const store = applyMiddleware(storageMiddleware)<TestState>(createStore)(enhancedReducer);
 
 initialStateLoader(store).then(() => {
     // render app
@@ -33,7 +33,7 @@ initialStateLoader(store).then(() => {
 // Test for React Native Async Storage engine
 const storageEngineReactNative = createReactNativeAsyncStorageEngine("test");
 const storageMiddlewareReactNative = createMiddleware(storageEngine);
-const storeReactNative = applyMiddleware(storageMiddlewareReactNative)(createStore)(enhancedReducer);
+const storeReactNative = applyMiddleware(storageMiddlewareReactNative)<TestState>(createStore)(enhancedReducer);
 initialStateLoader(storeReactNative).then(() => {
     // render app
 })
diff --git a/types/redux-storage/tslint.json b/types/redux-storage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/redux-storage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/redux-ui/package.json b/types/redux-ui/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/redux-ui/package.json
+++ b/types/redux-ui/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/ref-array/tslint.json b/types/ref-array/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ref-array/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ref-struct/index.d.ts b/types/ref-struct/index.d.ts
index e0b47b288e..b45012d53e 100644
--- a/types/ref-struct/index.d.ts
+++ b/types/ref-struct/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/TooTallNate/ref-struct
 // Definitions by: Paul Loyd <https://github.com/loyd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import ref = require('ref');
 
@@ -50,9 +51,9 @@ interface StructType extends ref.Type {
 
 /** The struct type meta-constructor. */
 declare var StructType: {
-    new (fields?: {}): StructType;
+    new (fields?: object, opt?: object): StructType;
     new (fields?: any[]): StructType;
-    (fields?: {}): StructType;
+    (fields?: object, opt?: object): StructType;
     (fields?: any[]): StructType;
 }
 
diff --git a/types/ref-struct/ref-struct-tests.ts b/types/ref-struct/ref-struct-tests.ts
new file mode 100644
index 0000000000..194c9c7997
--- /dev/null
+++ b/types/ref-struct/ref-struct-tests.ts
@@ -0,0 +1,12 @@
+import ref = require("ref");
+import StructType = require("ref-struct");
+
+const normalStruct = StructType({
+  t: ref.types.uint8,
+  v: ref.types.long,
+});
+
+const packedStruct = StructType({
+  t: ref.types.uint8,
+  v: ref.types.long,
+}, {packed: true});
diff --git a/types/ref-struct/tsconfig.json b/types/ref-struct/tsconfig.json
index 02963e3afd..5ebe7efa5f 100644
--- a/types/ref-struct/tsconfig.json
+++ b/types/ref-struct/tsconfig.json
@@ -17,6 +17,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "ref-struct-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/ref-struct/tslint.json b/types/ref-struct/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ref-struct/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ref-union/tslint.json b/types/ref-union/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ref-union/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ref/tslint.json b/types/ref/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ref/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/reflect-metadata/index.d.ts b/types/reflect-metadata/index.d.ts
deleted file mode 100644
index 92ffd951a4..0000000000
--- a/types/reflect-metadata/index.d.ts
+++ /dev/null
@@ -1,480 +0,0 @@
-// Type definitions for reflect-metadata
-// Project: https://github.com/rbuckton/ReflectDecorators
-// Definitions by: Ron Buckton <https://github.com/rbuckton>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "reflect-metadata" {
-    // The "reflect-metadata" module has no imports or exports, but can be used by modules to load the polyfill.
-}
-
-declare namespace Reflect {
-    /**
-      * Applies a set of decorators to a target object.
-      * @param decorators An array of decorators.
-      * @param target The target object.
-      * @returns The result of applying the provided decorators.
-      * @remarks Decorators are applied in reverse order of their positions in the array.
-      * @example
-      *
-      *     class C { }
-      *
-      *     // constructor
-      *     C = Reflect.decorate(decoratorsArray, C);
-      *
-      */
-    function decorate(decorators: ClassDecorator[], target: Function): Function;
-    /**
-      * Applies a set of decorators to a property of a target object.
-      * @param decorators An array of decorators.
-      * @param target The target object.
-      * @param targetKey The property key to decorate.
-      * @param descriptor A property descriptor
-      * @remarks Decorators are applied in reverse order.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod() { }
-      *         method() { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     Reflect.decorate(decoratorsArray, C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     Reflect.decorate(decoratorsArray, C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     Object.defineProperty(C, "staticMethod",
-      *         Reflect.decorate(decoratorsArray, C, "staticMethod",
-      *             Object.getOwnPropertyDescriptor(C, "staticMethod")));
-      *
-      *     // method (on prototype)
-      *     Object.defineProperty(C.prototype, "method",
-      *         Reflect.decorate(decoratorsArray, C.prototype, "method",
-      *             Object.getOwnPropertyDescriptor(C.prototype, "method")));
-      *
-      */
-    function decorate(decorators: (PropertyDecorator | MethodDecorator)[], target: Object, targetKey: string | symbol, descriptor?: PropertyDescriptor): PropertyDescriptor;
-    /**
-      * A default metadata decorator factory that can be used on a class, class member, or parameter.
-      * @param metadataKey The key for the metadata entry.
-      * @param metadataValue The value for the metadata entry.
-      * @returns A decorator function.
-      * @remarks
-      * If `metadataKey` is already defined for the target and target key, the
-      * metadataValue for that key will be overwritten.
-      * @example
-      *
-      *     // constructor
-      *     @Reflect.metadata(key, value)
-      *     class C {
-      *     }
-      *
-      *     // property (on constructor, TypeScript only)
-      *     class C {
-      *         @Reflect.metadata(key, value)
-      *         static staticProperty;
-      *     }
-      *
-      *     // property (on prototype, TypeScript only)
-      *     class C {
-      *         @Reflect.metadata(key, value)
-      *         property;
-      *     }
-      *
-      *     // method (on constructor)
-      *     class C {
-      *         @Reflect.metadata(key, value)
-      *         static staticMethod() { }
-      *     }
-      *
-      *     // method (on prototype)
-      *     class C {
-      *         @Reflect.metadata(key, value)
-      *         method() { }
-      *     }
-      *
-      */
-    function metadata(metadataKey: any, metadataValue: any): {
-        (target: Function): void;
-        (target: Object, propertyKey: string | symbol): void;
-    };
-    /**
-      * Define a unique metadata entry on the target.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param metadataValue A value that contains attached metadata.
-      * @param target The target object on which to define metadata.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     Reflect.defineMetadata("custom:annotation", options, C);
-      *
-      *     // decorator factory as metadata-producing annotation.
-      *     function MyAnnotation(options): ClassDecorator {
-      *         return target => Reflect.defineMetadata("custom:annotation", options, target);
-      *     }
-      *
-      */
-    function defineMetadata(metadataKey: any, metadataValue: any, target: Object): void;
-    /**
-      * Define a unique metadata entry on the target.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param metadataValue A value that contains attached metadata.
-      * @param target The target object on which to define metadata.
-      * @param targetKey The property key for the target.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     Reflect.defineMetadata("custom:annotation", Number, C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     Reflect.defineMetadata("custom:annotation", Number, C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     Reflect.defineMetadata("custom:annotation", Number, C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     Reflect.defineMetadata("custom:annotation", Number, C.prototype, "method");
-      *
-      *     // decorator factory as metadata-producing annotation.
-      *     function MyAnnotation(options): PropertyDecorator {
-      *         return (target, key) => Reflect.defineMetadata("custom:annotation", options, target, key);
-      *     }
-      *
-      */
-    function defineMetadata(metadataKey: any, metadataValue: any, target: Object, targetKey: string | symbol): void;
-    /**
-      * Gets a value indicating whether the target object or its prototype chain has the provided metadata key defined.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @returns `true` if the metadata key was defined on the target object or its prototype chain; otherwise, `false`.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     result = Reflect.hasMetadata("custom:annotation", C);
-      *
-      */
-    function hasMetadata(metadataKey: any, target: Object): boolean;
-    /**
-      * Gets a value indicating whether the target object or its prototype chain has the provided metadata key defined.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @param targetKey The property key for the target.
-      * @returns `true` if the metadata key was defined on the target object or its prototype chain; otherwise, `false`.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     result = Reflect.hasMetadata("custom:annotation", C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     result = Reflect.hasMetadata("custom:annotation", C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     result = Reflect.hasMetadata("custom:annotation", C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     result = Reflect.hasMetadata("custom:annotation", C.prototype, "method");
-      *
-      */
-    function hasMetadata(metadataKey: any, target: Object, targetKey: string | symbol): boolean;
-    /**
-      * Gets a value indicating whether the target object has the provided metadata key defined.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @returns `true` if the metadata key was defined on the target object; otherwise, `false`.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     result = Reflect.hasOwnMetadata("custom:annotation", C);
-      *
-      */
-    function hasOwnMetadata(metadataKey: any, target: Object): boolean;
-    /**
-      * Gets a value indicating whether the target object has the provided metadata key defined.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @param targetKey The property key for the target.
-      * @returns `true` if the metadata key was defined on the target object; otherwise, `false`.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     result = Reflect.hasOwnMetadata("custom:annotation", C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     result = Reflect.hasOwnMetadata("custom:annotation", C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     result = Reflect.hasOwnMetadata("custom:annotation", C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     result = Reflect.hasOwnMetadata("custom:annotation", C.prototype, "method");
-      *
-      */
-    function hasOwnMetadata(metadataKey: any, target: Object, targetKey: string | symbol): boolean;
-    /**
-      * Gets the metadata value for the provided metadata key on the target object or its prototype chain.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @returns The metadata value for the metadata key if found; otherwise, `undefined`.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     result = Reflect.getMetadata("custom:annotation", C);
-      *
-      */
-    function getMetadata(metadataKey: any, target: Object): any;
-    /**
-      * Gets the metadata value for the provided metadata key on the target object or its prototype chain.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @param targetKey The property key for the target.
-      * @returns The metadata value for the metadata key if found; otherwise, `undefined`.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     result = Reflect.getMetadata("custom:annotation", C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     result = Reflect.getMetadata("custom:annotation", C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     result = Reflect.getMetadata("custom:annotation", C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     result = Reflect.getMetadata("custom:annotation", C.prototype, "method");
-      *
-      */
-    function getMetadata(metadataKey: any, target: Object, targetKey: string | symbol): any;
-    /**
-      * Gets the metadata value for the provided metadata key on the target object.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @returns The metadata value for the metadata key if found; otherwise, `undefined`.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     result = Reflect.getOwnMetadata("custom:annotation", C);
-      *
-      */
-    function getOwnMetadata(metadataKey: any, target: Object): any;
-    /**
-      * Gets the metadata value for the provided metadata key on the target object.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @param targetKey The property key for the target.
-      * @returns The metadata value for the metadata key if found; otherwise, `undefined`.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     result = Reflect.getOwnMetadata("custom:annotation", C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     result = Reflect.getOwnMetadata("custom:annotation", C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     result = Reflect.getOwnMetadata("custom:annotation", C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     result = Reflect.getOwnMetadata("custom:annotation", C.prototype, "method");
-      *
-      */
-    function getOwnMetadata(metadataKey: any, target: Object, targetKey: string | symbol): any;
-    /**
-      * Gets the metadata keys defined on the target object or its prototype chain.
-      * @param target The target object on which the metadata is defined.
-      * @returns An array of unique metadata keys.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     result = Reflect.getMetadataKeys(C);
-      *
-      */
-    function getMetadataKeys(target: Object): any[];
-    /**
-      * Gets the metadata keys defined on the target object or its prototype chain.
-      * @param target The target object on which the metadata is defined.
-      * @param targetKey The property key for the target.
-      * @returns An array of unique metadata keys.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     result = Reflect.getMetadataKeys(C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     result = Reflect.getMetadataKeys(C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     result = Reflect.getMetadataKeys(C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     result = Reflect.getMetadataKeys(C.prototype, "method");
-      *
-      */
-    function getMetadataKeys(target: Object, targetKey: string | symbol): any[];
-    /**
-      * Gets the unique metadata keys defined on the target object.
-      * @param target The target object on which the metadata is defined.
-      * @returns An array of unique metadata keys.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     result = Reflect.getOwnMetadataKeys(C);
-      *
-      */
-    function getOwnMetadataKeys(target: Object): any[];
-    /**
-      * Gets the unique metadata keys defined on the target object.
-      * @param target The target object on which the metadata is defined.
-      * @param targetKey The property key for the target.
-      * @returns An array of unique metadata keys.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     result = Reflect.getOwnMetadataKeys(C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     result = Reflect.getOwnMetadataKeys(C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     result = Reflect.getOwnMetadataKeys(C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     result = Reflect.getOwnMetadataKeys(C.prototype, "method");
-      *
-      */
-    function getOwnMetadataKeys(target: Object, targetKey: string | symbol): any[];
-    /**
-      * Deletes the metadata entry from the target object with the provided key.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @returns `true` if the metadata entry was found and deleted; otherwise, false.
-      * @example
-      *
-      *     class C {
-      *     }
-      *
-      *     // constructor
-      *     result = Reflect.deleteMetadata("custom:annotation", C);
-      *
-      */
-    function deleteMetadata(metadataKey: any, target: Object): boolean;
-    /**
-      * Deletes the metadata entry from the target object with the provided key.
-      * @param metadataKey A key used to store and retrieve metadata.
-      * @param target The target object on which the metadata is defined.
-      * @param targetKey The property key for the target.
-      * @returns `true` if the metadata entry was found and deleted; otherwise, false.
-      * @example
-      *
-      *     class C {
-      *         // property declarations are not part of ES6, though they are valid in TypeScript:
-      *         // static staticProperty;
-      *         // property;
-      *
-      *         static staticMethod(p) { }
-      *         method(p) { }
-      *     }
-      *
-      *     // property (on constructor)
-      *     result = Reflect.deleteMetadata("custom:annotation", C, "staticProperty");
-      *
-      *     // property (on prototype)
-      *     result = Reflect.deleteMetadata("custom:annotation", C.prototype, "property");
-      *
-      *     // method (on constructor)
-      *     result = Reflect.deleteMetadata("custom:annotation", C, "staticMethod");
-      *
-      *     // method (on prototype)
-      *     result = Reflect.deleteMetadata("custom:annotation", C.prototype, "method");
-      *
-      */
-    function deleteMetadata(metadataKey: any, target: Object, targetKey: string | symbol): boolean;
-}
diff --git a/types/reflect-metadata/reflect-metadata-tests.ts b/types/reflect-metadata/reflect-metadata-tests.ts
deleted file mode 100644
index a0f6638ba4..0000000000
--- a/types/reflect-metadata/reflect-metadata-tests.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-let target = {
- some_property: {
-
- }
-}
-
-let metadataKey = "key";
-let metadataValue = "val";
-let propertyKey = "some_property";
-
-// define metadata on an object or property
-Reflect.defineMetadata(metadataKey, metadataValue, target);
-Reflect.defineMetadata(metadataKey, metadataValue, target, propertyKey);
-
-// check for presence of a metadata key on the prototype chain of an object or property
-let result1 = Reflect.hasMetadata(metadataKey, target);
-let result2 = Reflect.hasMetadata(metadataKey, target, propertyKey);
-
-// check for presence of an own metadata key of an object or property
-let result3 = Reflect.hasOwnMetadata(metadataKey, target);
-let result4 = Reflect.hasOwnMetadata(metadataKey, target, propertyKey);
-
-// get metadata value of a metadata key on the prototype chain of an object or property
-let result5 = Reflect.getMetadata(metadataKey, target);
-let result6 = Reflect.getMetadata(metadataKey, target, propertyKey);
-
-// get metadata value of an own metadata key of an object or property
-let result7 = Reflect.getOwnMetadata(metadataKey, target);
-let result8 = Reflect.getOwnMetadata(metadataKey, target, propertyKey);
-
-// get all metadata keys on the prototype chain of an object or property
-let result9 = Reflect.getMetadataKeys(target);
-let result10 = Reflect.getMetadataKeys(target, propertyKey);
-
-// get all own metadata keys of an object or property
-let result11 = Reflect.getOwnMetadataKeys(target);
-let result12 = Reflect.getOwnMetadataKeys(target, propertyKey);
-
-// delete metadata from an object or property
-let result13 = Reflect.deleteMetadata(metadataKey, target);
-let result14 = Reflect.deleteMetadata(metadataKey, target, propertyKey);
-
-// apply metadata via a decorator to a constructor
-@Reflect.metadata(metadataKey, metadataValue)
-class C {
-  // apply metadata via a decorator to a method (property)
-  @Reflect.metadata(metadataKey, metadataValue)
-  method() {
-  }
-}
diff --git a/types/reflect-metadata/tsconfig.json b/types/reflect-metadata/tsconfig.json
deleted file mode 100644
index 6fa34eba8e..0000000000
--- a/types/reflect-metadata/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "experimentalDecorators": true
-    },
-    "files": [
-        "index.d.ts",
-        "reflect-metadata-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/relateurl/tslint.json b/types/relateurl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/relateurl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/relay-runtime/index.d.ts b/types/relay-runtime/index.d.ts
new file mode 100644
index 0000000000..74b24ca1b8
--- /dev/null
+++ b/types/relay-runtime/index.d.ts
@@ -0,0 +1,1051 @@
+// Type definitions for relay-runtime 1.3
+// Project: https://github.com/facebook/relay
+// Definitions by: Matt Martin <https://github.com/voxmatt>
+//                 Eloy Durán <https://github.com/alloy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/**
+ * SOURCE:
+ * Relay 1.3.0
+ * https://github.com/facebook/relay/blob/b85a1d69bb72be4ace67179f55c2a54a8d761c8b/packages/react-relay/classic/environment/RelayCombinedEnvironmentTypes.js
+ */
+// ~~~~~~~~~~~~~~~~~~~~~
+// Maybe Fix
+// ~~~~~~~~~~~~~~~~~~~~~
+export type RelayConcreteNode = any;
+export type RelayMutationTransaction = any;
+export type RelayMutationRequest = any;
+export type RelayQueryRequest = any;
+export type ConcreteFragment = any;
+export type ConcreteBatch = any;
+export type ConcreteFragmentDefinition = object;
+export type ConcreteOperationDefinition = object;
+
+/**
+ * FIXME: RelayContainer used to be typed with ReactClass<any>, but
+ * ReactClass is broken and allows for access to any property. For example
+ * ReactClass<any>.getFragment('foo') is valid even though ReactClass has no
+ * such getFragment() type definition. When ReactClass is fixed this causes a
+ * lot of errors in Relay code since methods like getFragment() are used often
+ * but have no definition in Relay's types. Suppressing for now.
+ */
+export type RelayContainer = any;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayQL
+// ~~~~~~~~~~~~~~~~~~~~~
+export type RelayQL = (strings: string[], ...substitutions: any[]) => RelayConcreteNode;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayModernGraphQLTag
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface GeneratedNodeMap {
+    [key: string]: GraphQLTaggedNode;
+}
+export type GraphQLTaggedNode =
+    | (() => ConcreteFragment | ConcreteBatch)
+    | {
+          modern(): ConcreteFragment | ConcreteBatch;
+          classic(relayQL: RelayQL): ConcreteFragmentDefinition | ConcreteOperationDefinition;
+      };
+// ~~~~~~~~~~~~~~~~~~~~~
+// General Usage
+// ~~~~~~~~~~~~~~~~~~~~~
+export type DataID = string;
+export interface Variables {
+    [name: string]: any;
+}
+export type Uploadable = File | Blob;
+export interface UploadableMap {
+    [key: string]: Uploadable;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayNetworkTypes
+// Version: Relay 1.3.0
+// File: https://github.com/facebook/relay/blob/master/packages/relay-runtime/network/RelayNetworkTypes.js
+// ~~~~~~~~~~~~~~~~~~~~~
+
+export interface LegacyObserver<T> {
+    onCompleted?(): void;
+    onError?(error: Error): void;
+    onNext?(data: T): void;
+}
+export interface PayloadError {
+    message: string;
+    locations?: Array<{
+        line: number;
+        column: number;
+    }>;
+}
+/**
+ * A function that executes a GraphQL operation with request/response semantics.
+ *
+ * May return an Observable or Promise of a raw server response.
+ */
+export function FetchFunction(
+    operation: ConcreteBatch,
+    variables: Variables,
+    cacheConfig: CacheConfig,
+    uploadables?: UploadableMap
+): ObservableFromValue<QueryPayload>;
+
+/**
+ * A function that executes a GraphQL subscription operation, returning one or
+ * more raw server responses over time.
+ *
+ * May return an Observable, otherwise must call the callbacks found in the
+ * fourth parameter.
+ */
+export type SubscribeFunction = (
+    operation: ConcreteBatch,
+    variables: Variables,
+    cacheConfig: CacheConfig,
+    observer: LegacyObserver<QueryPayload>
+) => RelayObservable<QueryPayload> | Disposable;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayStoreTypes
+// Version: Relay 1.3.0
+// File: https://github.com/facebook/relay/blob/master/packages/relay-runtime/store/RelayStoreTypes.js
+// ~~~~~~~~~~~~~~~~~~~~~
+/**
+ * A function that receives a proxy over the store and may trigger side-effects
+ * (indirectly) by calling `set*` methods on the store or its record proxies.
+ */
+export type StoreUpdater = (store: RecordSourceProxy) => void;
+
+/**
+ * Similar to StoreUpdater, but accepts a proxy tied to a specific selector in
+ * order to easily access the root fields of a query/mutation as well as a
+ * second argument of the response object of the mutation.
+ */
+export type SelectorStoreUpdater = (
+    store: RecordSourceSelectorProxy,
+    // Actually RelayCombinedEnvironmentTypes#SelectorData, but mixed is
+    // inconvenient to access deeply in product code.
+    data: any // FLOW FIXME
+) => void;
+
+/**
+ * Extends the RecordSourceProxy interface with methods for accessing the root
+ * fields of a Selector.
+ */
+export interface RecordSourceSelectorProxy {
+    create(dataID: DataID, typeName: string): RecordProxy;
+    delete(dataID: DataID): void;
+    get(dataID: DataID): RecordProxy | null;
+    getRoot(): RecordProxy;
+    getRootField(fieldName: string): RecordProxy | null;
+    getPluralRootField(fieldName: string): RecordProxy[] | null;
+}
+
+export interface RecordProxy {
+    copyFieldsFrom(source: RecordProxy): void;
+    getDataID(): DataID;
+    getLinkedRecord(name: string, args?: Variables): RecordProxy | null;
+    getLinkedRecords(name: string, args?: Variables): ReadonlyArray<RecordProxy | null> | null;
+    getOrCreateLinkedRecord(name: string, typeName: string, args?: Variables): RecordProxy;
+    getType(): string;
+    getValue(name: string, args?: Variables): any;
+    setLinkedRecord(record: RecordProxy, name: string, args?: Variables): RecordProxy;
+    setLinkedRecords(
+        records: Array<RecordProxy | null> | undefined | null,
+        name: string,
+        args?: Variables
+    ): RecordProxy;
+    setValue(value: any, name: string, args?: Variables): RecordProxy;
+}
+
+export interface RecordSourceProxy {
+    create(dataID: DataID, typeName: string): RecordProxy;
+    delete(dataID: DataID): void;
+    get(dataID: DataID): Array<RecordProxy | null> | null;
+    getRoot(): RecordProxy;
+}
+
+export interface HandleFieldPayload {
+    // The arguments that were fetched.
+    args: Variables;
+    // The __id of the record containing the source/handle field.
+    dataID: DataID;
+    // The (storage) key at which the original server data was written.
+    fieldKey: string;
+    // The name of the handle
+    handle: string;
+    // The (storage) key at which the handle's data should be written by the
+    // handler
+    handleKey: string;
+}
+export interface HandlerInterface {
+    update(store: RecordSourceProxy, fieldPayload: HandleFieldPayload): void;
+    [functionName: string]: (...args: any[]) => any;
+}
+export const ConnectionHandler: HandlerInterface;
+export const ViewerHandler: HandlerInterface;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayCombinedEnvironmentTypes
+// Version: Relay 1.3.0
+// File: https://github.com/facebook/relay/blob/b85a1d69bb72be4ace67179f55c2a54a8d761c8b/packages/react-relay/classic/environment/RelayCombinedEnvironmentTypes.js
+// ~~~~~~~~~~~~~~~~~~~~~
+/**
+ * Settings for how a query response may be cached.
+ *
+ * - `force`: causes a query to be issued unconditionally, irrespective of the
+ *   state of any configured response cache.
+ * - `poll`: causes a query to live update by polling at the specified interval
+ *   in milliseconds. (This value will be passed to setTimeout.)
+ */
+export interface CacheConfig {
+    force?: boolean;
+    poll?: number;
+}
+
+/**
+ * Represents any resource that must be explicitly disposed of. The most common
+ * use-case is as a return value for subscriptions, where calling `dispose()`
+ * would cancel the subscription.
+ */
+export interface Disposable {
+    dispose(): void;
+}
+
+/**
+ * Arbitrary data e.g. received by a container as props.
+ */
+export interface Props {
+    [key: string]: any;
+}
+
+/**
+ * A selector defines the starting point for a traversal into the graph for the
+ * purposes of targeting a subgraph.
+ */
+export interface CSelector<TNode> {
+    dataID: DataID;
+    node: TNode;
+    variables: Variables;
+}
+
+/**
+ * A representation of a selector and its results at a particular point in time.
+ */
+export type CSnapshot<TNode> = CSelector<TNode> & {
+    data: SelectorData | null | undefined;
+    seenRecords: RecordMap;
+};
+
+/**
+ * The results of a selector given a store/RecordSource.
+ */
+export interface SelectorData {
+    [key: string]: any;
+}
+
+/**
+ * The results of reading the results of a FragmentMap given some input
+ * `Props`.
+ */
+export interface FragmentSpecResults {
+    [key: string]: any;
+}
+
+/**
+ * A utility for resolving and subscribing to the results of a fragment spec
+ * (key -> fragment mapping) given some "props" that determine the root ID
+ * and variables to use when reading each fragment. When props are changed via
+ * `setProps()`, the resolver will update its results and subscriptions
+ * accordingly. Internally, the resolver:
+ * - Converts the fragment map & props map into a map of `Selector`s.
+ * - Removes any resolvers for any props that became null.
+ * - Creates resolvers for any props that became non-null.
+ * - Updates resolvers with the latest props.
+ */
+export interface FragmentSpecResolver {
+    /**
+     * Stop watching for changes to the results of the fragments.
+     */
+    dispose(): void;
+
+    /**
+     * Get the current results.
+     */
+    resolve(): FragmentSpecResults;
+
+    /**
+     * Update the resolver with new inputs. Call `resolve()` to get the updated
+     * results.
+     */
+    setProps(props: Props): void;
+
+    /**
+     * Override the variables used to read the results of the fragments. Call
+     * `resolve()` to get the updated results.
+     */
+    setVariables(variables: Variables): void;
+}
+
+export interface CFragmentMap<TFragment> {
+    [key: string]: TFragment;
+}
+
+/**
+ * An operation selector describes a specific instance of a GraphQL operation
+ * with variables applied.
+ *
+ * - `root`: a selector intended for processing server results or retaining
+ *   response data in the store.
+ * - `fragment`: a selector intended for use in reading or subscribing to
+ *   the results of the the operation.
+ */
+export interface COperationSelector<TNode, TOperation> {
+    fragment: CSelector<TNode>;
+    node: TOperation;
+    root: CSelector<TNode>;
+    variables: Variables;
+}
+
+/**
+ * The public API of Relay core. Represents an encapsulated environment with its
+ * own in-memory cache.
+ */
+export interface CEnvironment<TEnvironment, TFragment, TGraphQLTaggedNode, TNode, TOperation, TPayload> {
+    /**
+     * Read the results of a selector from in-memory records in the store.
+     */
+    lookup(selector: CSelector<TNode>): CSnapshot<TNode>;
+
+    /**
+     * Subscribe to changes to the results of a selector. The callback is called
+     * when data has been committed to the store that would cause the results of
+     * the snapshot's selector to change.
+     */
+    subscribe(snapshot: CSnapshot<TNode>, callback: (snapshot: CSnapshot<TNode>) => void): Disposable;
+
+    /**
+     * Ensure that all the records necessary to fulfill the given selector are
+     * retained in-memory. The records will not be eligible for garbage collection
+     * until the returned reference is disposed.
+     *
+     * Note: This is a no-op in the classic core.
+     */
+    retain(selector: CSelector<TNode>): Disposable;
+
+    /**
+     * Send a query to the server with request/response semantics: the query will
+     * either complete successfully (calling `onNext` and `onCompleted`) or fail
+     * (calling `onError`).
+     *
+     * Note: Most applications should use `streamQuery` in order to
+     * optionally receive updated information over time, should that feature be
+     * supported by the network/server. A good rule of thumb is to use this method
+     * if you would otherwise immediately dispose the `streamQuery()`
+     * after receving the first `onNext` result.
+     */
+    sendQuery(config: {
+        cacheConfig?: CacheConfig;
+        onCompleted?(): void;
+        onError?(error: Error): void;
+        onNext?(payload: TPayload): void;
+        operation: COperationSelector<TNode, TOperation>;
+    }): Disposable;
+
+    /**
+     * Send a query to the server with request/subscription semantics: one or more
+     * responses may be returned (via `onNext`) over time followed by either
+     * the request completing (`onCompleted`) or an error (`onError`).
+     *
+     * Networks/servers that support subscriptions may choose to hold the
+     * subscription open indefinitely such that `onCompleted` is not called.
+     */
+    streamQuery(config: {
+        cacheConfig?: CacheConfig;
+        onCompleted?(): void;
+        onError?(error: Error): void;
+        onNext?(payload: TPayload): void;
+        operation: COperationSelector<TNode, TOperation>;
+    }): Disposable;
+
+    unstable_internal: CUnstableEnvironmentCore<TEnvironment, TFragment, TGraphQLTaggedNode, TNode, TOperation>;
+}
+
+export interface CUnstableEnvironmentCore<TEnvironment, TFragment, TGraphQLTaggedNode, TNode, TOperation> {
+    /**
+     * Create an instance of a FragmentSpecResolver.
+     *
+     * TODO: The FragmentSpecResolver *can* be implemented via the other methods
+     * defined here, so this could be moved out of core. It's convenient to have
+     * separate implementations until the experimental core is in OSS.
+     */
+    createFragmentSpecResolver(
+        context: CRelayContext<TEnvironment>,
+        containerName: string,
+        fragments: CFragmentMap<TFragment>,
+        props: Props,
+        callback: () => void
+    ): FragmentSpecResolver;
+
+    /**
+     * Creates an instance of an OperationSelector given an operation definition
+     * (see `getOperation`) and the variables to apply. The input variables are
+     * filtered to exclude variables that do not matche defined arguments on the
+     * operation, and default values are populated for null values.
+     */
+    createOperationSelector(operation: TOperation, variables: Variables): COperationSelector<TNode, TOperation>;
+
+    /**
+     * Given a graphql`...` tagged template, extract a fragment definition usable
+     * by this version of Relay core. Throws if the value is not a fragment.
+     */
+    getFragment(node: TGraphQLTaggedNode): TFragment;
+
+    /**
+     * Given a graphql`...` tagged template, extract an operation definition
+     * usable by this version of Relay core. Throws if the value is not an
+     * operation.
+     */
+    getOperation(node: TGraphQLTaggedNode): TOperation;
+
+    /**
+     * Determine if two selectors are equal (represent the same selection). Note
+     * that this function returns `false` when the two queries/fragments are
+     * different objects, even if they select the same fields.
+     */
+    areEqualSelectors(a: CSelector<TNode>, b: CSelector<TNode>): boolean;
+
+    /**
+     * Given the result `item` from a parent that fetched `fragment`, creates a
+     * selector that can be used to read the results of that fragment for that item.
+     *
+     * Example:
+     *
+     * Given two fragments as follows:
+     *
+     * ```
+     * fragment Parent on User {
+     *   id
+     *   ...Child
+     * }
+     * fragment Child on User {
+     *   name
+     * }
+     * ```
+     *
+     * And given some object `parent` that is the results of `Parent` for id "4",
+     * the results of `Child` can be accessed by first getting a selector and then
+     * using that selector to `lookup()` the results against the environment:
+     *
+     * ```
+     * const childSelector = getSelector(queryVariables, Child, parent);
+     * const childData = environment.lookup(childSelector).data;
+     * ```
+     */
+    getSelector(operationVariables: Variables, fragment: TFragment, prop: any): CSelector<TNode> | null;
+
+    /**
+     * Given the result `items` from a parent that fetched `fragment`, creates a
+     * selector that can be used to read the results of that fragment on those
+     * items. This is similar to `getSelector` but for "plural" fragments that
+     * expect an array of results and therefore return an array of selectors.
+     */
+    getSelectorList(operationVariables: Variables, fragment: TFragment, props: any[]): Array<CSelector<TNode>> | null;
+
+    /**
+     * Given a mapping of keys -> results and a mapping of keys -> fragments,
+     * extracts the selectors for those fragments from the results.
+     *
+     * The canonical use-case for this function are Relay Containers, which
+     * use this function to convert (props, fragments) into selectors so that they
+     * can read the results to pass to the inner component.
+     */
+    getSelectorsFromObject(
+        operationVariables: Variables,
+        fragments: CFragmentMap<TFragment>,
+        props: Props
+    ): { [key: string]: CSelector<TNode> | Array<CSelector<TNode>> | null | undefined };
+
+    /**
+     * Given a mapping of keys -> results and a mapping of keys -> fragments,
+     * extracts a mapping of keys -> id(s) of the results.
+     *
+     * Similar to `getSelectorsFromObject()`, this function can be useful in
+     * determining the "identity" of the props passed to a component.
+     */
+    getDataIDsFromObject(
+        fragments: CFragmentMap<TFragment>,
+        props: Props
+    ): { [key: string]: DataID | DataID[] | null | undefined };
+
+    /**
+     * Given a mapping of keys -> results and a mapping of keys -> fragments,
+     * extracts the merged variables that would be in scope for those
+     * fragments/results.
+     *
+     * This can be useful in determing what varaibles were used to fetch the data
+     * for a Relay container, for example.
+     */
+    getVariablesFromObject(operationVariables: Variables, fragments: CFragmentMap<TFragment>, props: Props): Variables;
+}
+
+/**
+ * The type of the `relay` property set on React context by the React/Relay
+ * integration layer (e.g. QueryRenderer, FragmentContainer, etc).
+ */
+export interface CRelayContext<TEnvironment> {
+    environment: TEnvironment;
+    variables: Variables;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayTypes
+/**
+ * Version: Relay 1.3.0
+ * File:
+ * https://github.com/facebook/relay/blob/fa9f48ea209ee2402d433b59a84d1cbc046574e2/packages/react-relay/classic/tools/RelayTypes.js
+ */
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface RerunParam {
+    param: string;
+    import: string;
+    max_runs: number;
+}
+export interface FIELDS_CHANGE {
+    type: "FIELDS_CHANGE";
+    fieldIDs: { [fieldName: string]: DataID | DataID[] };
+}
+export interface RANGE_ADD {
+    type: "RANGE_ADD";
+    parentName?: string;
+    parentID?: string;
+    connectionInfo?: Array<{
+        key: string;
+        filters?: Variables;
+        rangeBehavior: string;
+    }>;
+    connectionName?: string;
+    edgeName: string;
+    rangeBehaviors?: RangeBehaviors;
+}
+export interface NODE_DELETE {
+    type: "NODE_DELETE";
+    parentName?: string;
+    parentID?: string;
+    connectionName?: string;
+    deletedIDFieldName: string;
+}
+export interface RANGE_DELETE {
+    type: "RANGE_DELETE";
+    parentName?: string;
+    parentID?: string;
+    connectionKeys?: Array<{
+        key: string;
+        filters?: Variables;
+    }>;
+    connectionName?: string;
+    deletedIDFieldName: string | string[];
+    pathToConnection: string[];
+}
+export interface REQUIRED_CHILDREN {
+    type: "REQUIRED_CHILDREN";
+    children: RelayConcreteNode[];
+}
+export type RelayMutationConfig = FIELDS_CHANGE | RANGE_ADD | NODE_DELETE | RANGE_DELETE | REQUIRED_CHILDREN;
+
+export interface RelayMutationTransactionCommitCallbacks {
+    onFailure?: RelayMutationTransactionCommitFailureCallback;
+    onSuccess?: RelayMutationTransactionCommitSuccessCallback;
+}
+export type RelayMutationTransactionCommitFailureCallback = (
+    transaction: RelayMutationTransaction,
+    preventAutoRollback: () => void
+) => void;
+export type RelayMutationTransactionCommitSuccessCallback = (
+    response: {
+        [key: string]: any;
+    }
+) => void;
+export interface NetworkLayer {
+    sendMutation(request: RelayMutationRequest): Promise<any> | null;
+    sendQueries(requests: RelayQueryRequest[]): Promise<any> | null;
+    supports(...options: string[]): boolean;
+}
+export interface QueryResult {
+    error?: Error;
+    ref_params?: { [name: string]: any };
+    response: QueryPayload;
+}
+export interface ReadyState {
+    aborted: boolean;
+    done: boolean;
+    error: Error | null;
+    events: ReadyStateEvent[];
+    ready: boolean;
+    stale: boolean;
+}
+export type RelayContainerErrorEventType = "CACHE_RESTORE_FAILED" | "NETWORK_QUERY_ERROR";
+export type RelayContainerLoadingEventType =
+    | "ABORT"
+    | "CACHE_RESTORED_REQUIRED"
+    | "CACHE_RESTORE_START"
+    | "NETWORK_QUERY_RECEIVED_ALL"
+    | "NETWORK_QUERY_RECEIVED_REQUIRED"
+    | "NETWORK_QUERY_START"
+    | "STORE_FOUND_ALL"
+    | "STORE_FOUND_REQUIRED";
+export type ReadyStateChangeCallback = (readyState: ReadyState) => void;
+export interface ReadyStateEvent {
+    type: RelayContainerLoadingEventType | RelayContainerErrorEventType;
+    error?: Error;
+}
+export interface Abortable {
+    abort(): void;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayInternalTypes
+/**
+ * Version: Relay 1.3.0
+ * File:
+ * https://github.com/facebook/relay/blob/master/packages/react-relay/classic/tools/RelayInternalTypes.js
+ */
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface QueryPayload {
+    [key: string]: any;
+}
+export interface RelayQuerySet {
+    [queryName: string]: any;
+}
+export type RangeBehaviorsFunction = (
+    connectionArgs: {
+        [argName: string]: any;
+    }
+) => "APPEND" | "IGNORE" | "PREPEND" | "REFETCH" | "REMOVE";
+export interface RangeBehaviorsObject {
+    [key: string]: "APPEND" | "IGNORE" | "PREPEND" | "REFETCH" | "REMOVE";
+}
+export type RangeBehaviors = RangeBehaviorsFunction | RangeBehaviorsObject;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Maybe Fix
+// ~~~~~~~~~~~~~~~~~~~~~
+export type RelayDebugger = any;
+export type OptimisticUpdate = any;
+export type OperationSelector = COperationSelector<any, any>;
+export type Selector = CSelector<any>;
+export type PayloadData = any;
+export type Snapshot = CSnapshot<any>;
+export type RelayResponsePayload = any;
+export type MutableRecordSource = RecordSource;
+
+/**
+ * A function that returns an Observable representing the response of executing
+ * a GraphQL operation.
+ */
+export type ExecuteFunction = (
+    operation: object,
+    variables: Variables,
+    cacheConfig: CacheConfig,
+    uploadables?: UploadableMap
+) => Promise<any>;
+export interface RelayNetwork {
+    execute: ExecuteFunction;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayDefaultHandlerProvider
+// ~~~~~~~~~~~~~~~~~~~~~
+export function HandlerProvider(name: string): HandlerInterface | null;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayModernEnvironment
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface EnvironmentConfig {
+    configName?: string;
+    handlerProvider?: typeof HandlerProvider;
+    network: Network;
+    store: Store;
+}
+export class Environment {
+    constructor(config: EnvironmentConfig);
+    getStore(): Store;
+    getDebugger(): RelayDebugger;
+    applyUpdate(optimisticUpdate: OptimisticUpdate): Disposable;
+    revertUpdate(update: OptimisticUpdate): void;
+    replaceUpdate(update: OptimisticUpdate, newUpdate: OptimisticUpdate): void;
+    applyMutation(config: {
+        operation: OperationSelector;
+        optimisticUpdater?: SelectorStoreUpdater;
+        optimisticResponse?: object;
+    }): Disposable;
+    check(readSelector: Selector): boolean;
+    commitPayload(operationSelector: OperationSelector, payload: PayloadData): void;
+    commitUpdate(updater: StoreUpdater): void;
+    lookup(readSelector: Selector): Snapshot;
+    subscribe(snapshot: Snapshot, callback: (snapshot: Snapshot) => void): Disposable;
+    retain(selector: Selector): Disposable;
+    execute(config: {
+        operation: OperationSelector;
+        cacheConfig?: CacheConfig;
+        updater?: SelectorStoreUpdater;
+    }): RelayObservable<RelayResponsePayload>;
+    executeMutation(config: {
+        operation: OperationSelector;
+        optimisticUpdater?: SelectorStoreUpdater;
+        optimisticResponse?: object;
+        updater?: SelectorStoreUpdater;
+        uploadables?: UploadableMap;
+    }): RelayObservable<RelayResponsePayload>;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayInMemoryRecordSource
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface RelayInMemoryRecordSource {
+    [key: string]: any;
+}
+export interface RecordMap {
+    [dataID: string]: RelayInMemoryRecordSource | null | undefined;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Network
+// ~~~~~~~~~~~~~~~~~~~~~
+export class Network {
+    /**
+     * Creates an implementation of the `Network` interface defined in
+     * `RelayNetworkTypes` given `fetch` and `subscribe` functions.
+     */
+    static create(fetchFn: typeof FetchFunction, subscribeFn?: SubscribeFunction): RelayNetwork;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Network
+// ~~~~~~~~~~~~~~~~~~~~~
+export class RecordSource {
+    constructor(records?: RecordMap);
+    clear(): void;
+    delete(dataID: DataID): void;
+    get(dataID: DataID): RelayInMemoryRecordSource | null;
+    getRecordIDs(): DataID[];
+    getStatus(dataID: DataID): "EXISTENT" | "NONEXISTENT" | "UNKNOWN";
+    has(dataID: DataID): boolean;
+    load(dataID: DataID, callback: (error: Error | null, record: RelayInMemoryRecordSource | null) => void): void;
+    remove(dataID: DataID): void;
+    set(dataID: DataID, record: RelayInMemoryRecordSource): void;
+    size(): number;
+    toJSON(): RecordMap;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// ModernStore
+// ~~~~~~~~~~~~~~~~~~~~~
+export class Store {
+    constructor(source: RecordSource);
+    getSource(): MutableRecordSource;
+    check(selector: Selector): boolean;
+    retain(selector: Selector): Disposable;
+    lookup(selector: Selector): Snapshot;
+    notify(): void;
+    publish(source: RecordSource): void;
+    subscribe(snapshot: Snapshot, callback: (snapshot: Snapshot) => void): Disposable;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayRecordSourceInspector
+// ~~~~~~~~~~~~~~~~~~~~~
+/**
+ * An internal class to provide a console-friendly string representation of a
+ * RelayInMemoryRecordSource.
+ */
+export class RecordSummary {
+    id: DataID;
+    type: string | null | undefined;
+    static createFromRecord(id: DataID, record: any): RecordSummary;
+    constructor(id: DataID, type: string | null | undefined);
+    toString(): string;
+}
+/**
+ * Internal class for inspecting a single RelayInMemoryRecordSource.
+ */
+export class RecordInspector {
+    constructor(sourceInspector: RelayRecordSourceInspector, record: RelayInMemoryRecordSource);
+    /**
+     * Get the cache id of the given record. For types that implement the `Node`
+     * interface (or that have an `id`) this will be `id`, for other types it will be
+     * a synthesized identifier based on the field path from the nearest ancestor
+     * record that does have an `id`.
+     */
+    getDataID(): DataID;
+
+    /**
+     * Returns a list of the fields that have been fetched on the current record.
+     */
+    getFields(): string[];
+
+    /**
+     * Returns the type of the record.
+     */
+    getType(): string;
+
+    /**
+     * Returns a copy of the internal representation of the record.
+     */
+    inspect(): any;
+
+    /**
+     * Returns the value of a scalar field. May throw if the given field is
+     * present but not actually scalar.
+     */
+    getValue(name: string, args?: Variables): any;
+
+    /**
+     * Returns an inspector for the given scalar "linked" field (a field whose
+     * value is another RelayInMemoryRecordSource instead of a scalar). May throw if the field is
+     * present but not a scalar linked record.
+     */
+    getLinkedRecord(name: string, args?: Variables): RecordInspector | null;
+
+    /**
+     * Returns an array of inspectors for the given plural "linked" field (a field
+     * whose value is an array of Records instead of a scalar). May throw if the
+     * field is  present but not a plural linked record.
+     */
+    getLinkedRecords(name: string, args?: Variables): RecordInspector[] | null;
+}
+
+export class RelayRecordSourceInspector {
+    constructor(source: RecordSource);
+    static getForEnvironment(environment: Environment): RelayRecordSourceInspector;
+    /**
+     * Returns an inspector for the record with the given id, or null/undefined if
+     * that record is deleted/unfetched.
+     */
+    get(dataID: DataID): RecordInspector | null;
+    /**
+     * Returns a list of "<id>: <type>" for each record in the store that has an
+     * `id`.
+     */
+    getNodes(): RecordSummary[];
+    /**
+     * Returns a list of "<id>: <type>" for all records in the store including
+     * those that do not have an `id`.
+     */
+    getRecords(): RecordSummary[];
+
+    /**
+     * Returns an inspector for the synthesized "root" object, allowing access to
+     * e.g. the `viewer` object or the results of other fields on the "Query"
+     * type.
+     */
+    getRoot(): RecordInspector;
+}
+
+// note RecordSourceInspector is only available in dev environment
+export class RecordSourceInspector extends RelayRecordSourceInspector {}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// RelayObservable
+// ~~~~~~~~~~~~~~~~~~~~~
+export interface Subscription {
+    unsubscribe(): void;
+    readonly closed: boolean;
+}
+export interface Observer<T> {
+    start?(subscription: Subscription): any;
+    next?(nextThing: T): any;
+    error?(error: Error): any;
+    complete?(): any;
+    unsubscribe?(subscription: Subscription): any;
+}
+export type Source<T> = <T>() => any; // tslint:disable-line:no-unnecessary-generics
+export interface Subscribable<T> {
+    subscribe(observer: Observer<T>): Subscription;
+}
+export type ObservableFromValue<T> = RelayObservable<T> | Promise<T> | T;
+export class RelayObservable<T> implements Subscribable<T> {
+    _source: Source<T>;
+
+    constructor(source: Source<T>);
+
+    /**
+     * When an unhandled error is detected, it is reported to the host environment
+     * (the ESObservable spec refers to this method as "HostReportErrors()").
+     *
+     * The default implementation in development builds re-throws errors in a
+     * separate frame, and from production builds does nothing (swallowing
+     * uncaught errors).
+     *
+     * Called during application initialization, this method allows
+     * application-specific handling of uncaught errors. Allowing, for example,
+     * integration with error logging or developer tools.
+     */
+    static onUnhandledError(callback: (error: Error) => any): void;
+
+    /**
+     * Accepts various kinds of data sources, and always returns a RelayObservable
+     * useful for accepting the result of a user-provided FetchFunction.
+     */
+    static from<V>(obj: ObservableFromValue<V>): RelayObservable<V>;
+
+    /**
+     * Creates a RelayObservable, given a function which expects a legacy
+     * Relay Observer as the last argument and which returns a Disposable.
+     *
+     * To support migration to Observable, the function may ignore the
+     * legacy Relay observer and directly return an Observable instead.
+     */
+    static fromLegacy<V>(
+        callback: (legacyObserver: LegacyObserver<V>) => Disposable | RelayObservable<V>
+    ): RelayObservable<V>;
+
+    /**
+     * Returns a new Observable which returns the same values as this one, but
+     * modified so that the provided Observer is called to perform a side-effects
+     * for all events emitted by the source.
+     *
+     * Any errors that are thrown in the side-effect Observer are unhandled, and
+     * do not affect the source Observable or its Observer.
+     *
+     * This is useful for when debugging your Observables or performing other
+     * side-effects such as logging or performance monitoring.
+     */
+    do(observer: Observer<T>): RelayObservable<T>;
+
+    /**
+     * Returns a new Observable which returns the same values as this one, but
+     * modified so that the finally callback is performed after completion,
+     * whether normal or due to error or unsubscription.
+     *
+     * This is useful for cleanup such as resource finalization.
+     */
+    finally(fn: () => any): RelayObservable<T>;
+
+    /**
+     * Returns a new Observable which is identical to this one, unless this
+     * Observable completes before yielding any values, in which case the new
+     * Observable will yield the values from the alternate Observable.
+     *
+     * If this Observable does yield values, the alternate is never subscribed to.
+     *
+     * This is useful for scenarios where values may come from multiple sources
+     * which should be tried in order, i.e. from a cache before a network.
+     */
+    ifEmpty<U>(alternate: RelayObservable<U>): RelayObservable<T | U>;
+
+    /**
+     * Observable's primary API: returns an unsubscribable Subscription to the
+     * source of this Observable.
+     */
+    subscribe(observer: Observer<T>): Subscription;
+
+    /**
+     * Supports subscription of a legacy Relay Observer, returning a Disposable.
+     */
+    subscribeLegacy(legacyObserver: LegacyObserver<T>): Disposable;
+
+    /**
+     * Returns a new Observerable where each value has been transformed by
+     * the mapping function.
+     */
+    map<U>(fn: (thing: T) => U): RelayObservable<U>;
+
+    /**
+     * Returns a new Observable where each value is replaced with a new Observable
+     * by the mapping function, the results of which returned as a single
+     * concattenated Observable.
+     */
+    concatMap<U>(fn: (thing: T) => ObservableFromValue<U>): RelayObservable<U>;
+
+    /**
+     * Returns a new Observable which first mirrors this Observable, then when it
+     * completes, waits for `pollInterval` milliseconds before re-subscribing to
+     * this Observable again, looping in this manner until unsubscribed.
+     *
+     * The returned Observable never completes.
+     */
+    poll(pollInterval: number): RelayObservable<T>;
+
+    /**
+     * Returns a Promise which resolves when this Observable yields a first value
+     * or when it completes with no value.
+     */
+    toPromise(): Promise<T | null | undefined>;
+}
+
+export type Observable<T> = RelayObservable<T>;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// commitLocalUpdate
+// ~~~~~~~~~~~~~~~~~~~~~
+// exposed through RelayModern, not Runtime directly
+export type commitLocalUpdate = (environment: Environment, updater: StoreUpdater) => void;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// commitRelayModernMutation
+// ~~~~~~~~~~~~~~~~~~~~~
+// exposed through RelayModern, not Runtime directly
+export interface MutationConfig<T> {
+    configs?: RelayMutationConfig[];
+    mutation: GraphQLTaggedNode;
+    variables: Variables;
+    uploadables?: UploadableMap;
+    onCompleted?(response: T, errors: PayloadError[] | null | undefined): void;
+    onError?(error?: Error): void;
+    optimisticUpdater?: SelectorStoreUpdater;
+    optimisticResponse?: object;
+    updater?: SelectorStoreUpdater;
+}
+export function commitRelayModernMutation(environment: Environment, config: MutationConfig<any>): Disposable;
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// applyRelayModernOptimisticMutation
+// ~~~~~~~~~~~~~~~~~~~~~
+// exposed through RelayModern, not Runtime directly
+export interface OptimisticMutationConfig {
+    configs?: RelayMutationConfig[];
+    mutation: GraphQLTaggedNode;
+    variables: Variables;
+    optimisticUpdater?: SelectorStoreUpdater;
+    optimisticResponse?: object;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// fetchRelayModernQuery
+// ~~~~~~~~~~~~~~~~~~~~~
+// exposed through RelayModern, not Runtime directly
+/**
+ * A helper function to fetch the results of a query. Note that results for
+ * fragment spreads are masked: fields must be explicitly listed in the query in
+ * order to be accessible in the result object.
+ *
+ * NOTE: This module is primarily intended for integrating with classic APIs.
+ * Most product code should use a Renderer or Container.
+ *
+ * TODO(t16875667): The return type should be `Promise<?SelectorData>`, but
+ * that's not really helpful as `SelectorData` is essentially just `mixed`. We
+ * can probably leverage generated flow types here to return the real expected
+ * shape.
+ */
+export function fetchRelayModernQuery(
+    environment: any, // FIXME - $FlowFixMe in facebook source code
+    taggedNode: GraphQLTaggedNode,
+    variables: Variables,
+    cacheConfig?: CacheConfig
+): Promise<any>; // FIXME - $FlowFixMe in facebook source code
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// requestRelaySubscription
+// ~~~~~~~~~~~~~~~~~~~~~
+// exposed through RelayModern, not Runtime directly
+export interface GraphQLSubscriptionConfig {
+    configs?: RelayMutationConfig[];
+    subscription: GraphQLTaggedNode;
+    variables: Variables;
+    onCompleted?(): void;
+    onError?(error: Error): void;
+    onNext?(response: object | null | undefined): void;
+    updater?(store: RecordSourceSelectorProxy): void;
+}
+export function requestRelaySubscription(environment: Environment, config: GraphQLSubscriptionConfig): Disposable;
diff --git a/types/relay-runtime/relay-runtime-tests.tsx b/types/relay-runtime/relay-runtime-tests.tsx
new file mode 100644
index 0000000000..b39a117e61
--- /dev/null
+++ b/types/relay-runtime/relay-runtime-tests.tsx
@@ -0,0 +1,54 @@
+import { Environment, Network, RecordSource, Store, ConnectionHandler, ViewerHandler, RecordSourceInspector } from "relay-runtime";
+
+const source = new RecordSource();
+const store = new Store(source);
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Network Layer
+// ~~~~~~~~~~~~~~~~~~~~~
+// Define a function that fetches the results of an operation (query/mutation/etc)
+// and returns its results as a Promise:
+function fetchQuery(operation: any, variables: { [key: string]: string }, cacheConfig: {}) {
+    return fetch("/graphql", {
+        method: "POST",
+        body: JSON.stringify({
+            query: operation.text, // GraphQL text from input
+            variables,
+        }),
+    }).then((response: any) => {
+        return response.json();
+    });
+}
+
+// Create a network layer from the fetch function
+const network = Network.create(fetchQuery);
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Environment
+// ~~~~~~~~~~~~~~~~~~~~~
+const environment = new Environment({
+    handlerProvider, // Can omit.
+    network,
+    store,
+});
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Handler Provider
+// ~~~~~~~~~~~~~~~~~~~~~
+
+function handlerProvider(handle: any) {
+    switch (handle) {
+        // Augment (or remove from) this list:
+        case "connection":
+            return ConnectionHandler;
+        case "viewer":
+            return ViewerHandler;
+    }
+    throw new Error(`handlerProvider: No handler provided for ${handle}`);
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Source
+// ~~~~~~~~~~~~~~~~~~~~~
+
+const inspector = new RecordSourceInspector(source);
diff --git a/types/relay-runtime/tsconfig.json b/types/relay-runtime/tsconfig.json
new file mode 100644
index 0000000000..8aed884320
--- /dev/null
+++ b/types/relay-runtime/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "relay-runtime-tests.tsx"
+    ]
+}
diff --git a/types/relay-runtime/tslint.json b/types/relay-runtime/tslint.json
new file mode 100644
index 0000000000..f0f7a6f17a
--- /dev/null
+++ b/types/relay-runtime/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "no-unnecessary-class": false
+    }
+}
diff --git a/types/remote-redux-devtools/package.json b/types/remote-redux-devtools/package.json
index 4bcc170ca3..6d68bf2f9b 100644
--- a/types/remote-redux-devtools/package.json
+++ b/types/remote-redux-devtools/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "redux": "^3.6.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/remove-markdown/index.d.ts b/types/remove-markdown/index.d.ts
index 6268109366..57e1bdea8c 100644
--- a/types/remove-markdown/index.d.ts
+++ b/types/remove-markdown/index.d.ts
@@ -8,7 +8,6 @@ export = RemoveMarkdown;
 /**
  * Strip Markdown formatting from text
  * @param markdown Markdown text
- * @param options
  */
 declare function RemoveMarkdown(markdown: string, options?: {
     stripListLeaders?: boolean
diff --git a/types/replace-ext/tslint.json b/types/replace-ext/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/replace-ext/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/request-ip/index.d.ts b/types/request-ip/index.d.ts
index 1812260111..bba30c4d35 100644
--- a/types/request-ip/index.d.ts
+++ b/types/request-ip/index.d.ts
@@ -2,17 +2,24 @@
 // Project: https://github.com/pbojinov/request-ip
 // Definitions by: Adam Babcock <https://github.com/mrhen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import * as http from 'http';
+
+interface RequestHeaders extends http.IncomingHttpHeaders {
+    'x-client-ip'?: string;
+    'x-forwarded-for'?: string;
+    'x-real-ip'?: string;
+    'x-cluster-client-ip'?: string;
+    'x-forwarded'?: string;
+    'forwarded-for'?: string;
+    'forwarded'?: string;
+}
 
 interface Request {
-    headers: {
-        'x-client-ip'?: string;
-        'x-forwarded-for'?: string;
-        'x-real-ip'?: string;
-        'x-cluster-client-ip'?: string;
-        'x-forwarded'?: string;
-        'forwarded-for'?: string;
-        'forwarded'?: string;
-    };
+    headers: RequestHeaders;
     connection: {
         remoteAddress?: string;
         socket?: {
diff --git a/types/request-ip/tslint.json b/types/request-ip/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/request-ip/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/request-promise-native/index.d.ts b/types/request-promise-native/index.d.ts
index 69b51d0480..29e0e0f72c 100644
--- a/types/request-promise-native/index.d.ts
+++ b/types/request-promise-native/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/request/request-promise-native
 // Definitions by: Gustavo Henke <https://github.com/gustavohenke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import request = require('request');
 import http = require('http');
diff --git a/types/request-promise-native/request-promise-native-tests.ts b/types/request-promise-native/request-promise-native-tests.ts
index 7f26f5c690..469b901143 100644
--- a/types/request-promise-native/request-promise-native-tests.ts
+++ b/types/request-promise-native/request-promise-native-tests.ts
@@ -282,7 +282,7 @@ rpn.post({ url, oauth }, (e, r, body) => {
     consumer_key: CONSUMER_KEY,
     consumer_secret: CONSUMER_SECRET,
     token: auth_data.oauth_token,
-    token_secret: req_data.oauth_token_secret,
+    token_secret: req_data.oauth_token_secret as string,
     verifier: auth_data.oauth_verifier,
   };
   url = 'https://api.twitter.com/oauth/access_token';
diff --git a/types/request-promise/request-promise-tests.ts b/types/request-promise/request-promise-tests.ts
index 97f84a7678..e23a94dd2a 100644
--- a/types/request-promise/request-promise-tests.ts
+++ b/types/request-promise/request-promise-tests.ts
@@ -304,7 +304,7 @@ request.post({ url, oauth }, (e, r, body) => {
     consumer_key: CONSUMER_KEY,
     consumer_secret: CONSUMER_SECRET,
     token: auth_data.oauth_token,
-    token_secret: req_data.oauth_token_secret,
+    token_secret: req_data.oauth_token_secret as string,
     verifier: auth_data.oauth_verifier,
   };
   const url = 'https://api.twitter.com/oauth/access_token';
diff --git a/types/request/index.d.ts b/types/request/index.d.ts
index 10197579ac..a21d0c7f46 100644
--- a/types/request/index.d.ts
+++ b/types/request/index.d.ts
@@ -1,8 +1,14 @@
 // Type definitions for request 2.0
 // Project: https://github.com/request/request
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, bonnici <https://github.com/bonnici>, Bart van der Schoor <https://github.com/Bartvds>, Joe Skeen <https://github.com/joeskeen>, Christopher Currens <https://github.com/ccurrens>, Jon Stevens <https://github.com/lookfirst>
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>,
+//                 bonnici <https://github.com/bonnici>,
+//                 Bart van der Schoor <https://github.com/Bartvds>,
+//                 Joe Skeen <https://github.com/joeskeen>,
+//                 Christopher Currens <https://github.com/ccurrens>,
+//                 Jon Stevens <https://github.com/lookfirst>,
+//                 Matt R. Wilson <https://github.com/mastermatt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript version: 2.3
+// TypeScript Version: 2.3
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/d.ts
 
@@ -11,16 +17,13 @@
 import stream = require('stream');
 import http = require('http');
 import https = require('https');
-import url = require('url');
 import fs = require('fs');
 import FormData = require('form-data');
+import tough = require('tough-cookie');
 import { Url } from 'url';
 
 declare namespace request {
-    export interface RequestAPI<TRequest extends Request,
-        TOptions extends CoreOptions,
-        TUriUrlOptions> {
-
+    interface RequestAPI<TRequest extends Request, TOptions extends CoreOptions, TUriUrlOptions> {
         defaults(options: TOptions): RequestAPI<TRequest, TOptions, RequiredUriUrl>;
         defaults(options: RequiredUriUrl & TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
 
@@ -56,18 +59,20 @@ declare namespace request {
         delete(uri: string, callback?: RequestCallback): TRequest;
         delete(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
+        initParams(uri: string, options?: TOptions, callback?: RequestCallback): RequiredUriUrl & TOptions;
+        initParams(uri: string, callback?: RequestCallback): RequiredUriUrl & TOptions;
+        initParams(options: RequiredUriUrl & TOptions, callback?: RequestCallback): RequiredUriUrl & TOptions;
+
         forever(agentOptions: any, optionsArg: any): TRequest;
         jar(store?: any): CookieJar;
-        cookie(str: string): Cookie;
+        cookie(str: string): Cookie | undefined;
 
-        initParams: any;
         debug: boolean;
     }
 
     interface DefaultUriUrlRequestApi<TRequest extends Request,
-        TOptions extends CoreOptions,
-        TUriUrlOptions> extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
-
+            TOptions extends CoreOptions,
+            TUriUrlOptions> extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
         defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
         (callback?: RequestCallback): TRequest;
 
@@ -165,20 +170,22 @@ declare namespace request {
     interface UrlOptions {
         url: string | Url;
     }
-    export type RequiredUriUrl = UriOptions | UrlOptions;
+    type RequiredUriUrl = UriOptions | UrlOptions;
 
-    export type OptionalUriUrl = RequiredUriUrl | {};
+    type OptionalUriUrl = RequiredUriUrl | {};
 
-    export type OptionsWithUri = UriOptions & CoreOptions;
-    export type OptionsWithUrl = UrlOptions & CoreOptions;
-    export type Options = OptionsWithUri | OptionsWithUrl;
+    type OptionsWithUri = UriOptions & CoreOptions;
+    type OptionsWithUrl = UrlOptions & CoreOptions;
+    type Options = OptionsWithUri | OptionsWithUrl;
 
-    export interface RequestCallback {
-        (error: any, response: RequestResponse, body: any): void;
-    }
+    type RequestCallback = (error: any, response: RequestResponse, body: any) => void;
 
-	export interface RequestResponse extends http.IncomingMessage {
-		request: Options;
+    type ResponseRequest = CoreOptions & {
+      uri: Url;
+    };
+
+	interface RequestResponse extends http.IncomingMessage {
+		request: ResponseRequest;
 		body: any;
 		timingStart?: number;
 		timings?: {
@@ -198,41 +205,41 @@ declare namespace request {
 		};
 	}
 
-    export interface HttpArchiveRequest {
+    interface HttpArchiveRequest {
         url?: string;
         method?: string;
         headers?: NameValuePair[];
         postData?: {
             mimeType?: string;
             params?: NameValuePair[];
-        }
+        };
     }
 
-    export interface NameValuePair {
+    interface NameValuePair {
         name: string;
         value: string;
     }
 
-    export interface Multipart {
+    interface Multipart {
         chunked?: boolean;
-        data?: {
+        data?: Array<{
             'content-type'?: string,
             body: string
-        }[];
+        }>;
     }
 
-    export interface RequestPart {
+    interface RequestPart {
         headers?: Headers;
         body: any;
     }
 
-    export interface Request extends stream.Stream {
+    interface Request extends stream.Stream {
         readable: boolean;
         writable: boolean;
 
         getAgent(): http.Agent;
-        //start(): void;
-        //abort(): void;
+        // start(): void;
+        // abort(): void;
         pipeDest(dest: any): void;
         setHeader(name: string, value: string, clobber?: boolean): Request;
         setHeaders(headers: Headers): Request;
@@ -246,21 +253,19 @@ declare namespace request {
         oauth(oauth: OAuthOptions): Request;
         jar(jar: CookieJar): Request;
 
-        on(event: string, listener: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
         on(event: 'request', listener: (req: http.ClientRequest) => void): this;
         on(event: 'response', listener: (resp: http.IncomingMessage) => void): this;
         on(event: 'data', listener: (data: Buffer | string) => void): this;
         on(event: 'error', listener: (e: Error) => void): this;
         on(event: 'complete', listener: (resp: http.IncomingMessage, body?: string | Buffer) => void): this;
 
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, fd?: string): boolean;
-        end(): void;
-        end(chunk: Buffer, cb?: Function): void;
-        end(chunk: string, cb?: Function): void;
-        end(chunk: string, encoding: string, cb?: Function): void;
+        write(buffer: Buffer | string, cb?: (err?: Error) => void): boolean;
+        write(str: string, encoding?: string, cb?: (err?: Error) => void): boolean;
+        end(cb?: () => void): void;
+        end(chunk: string | Buffer, cb?: () => void): void;
+        end(str: string, encoding?: string, cb?: () => void): void;
+
         pause(): void;
         resume(): void;
         abort(): void;
@@ -268,11 +273,11 @@ declare namespace request {
         toJSON(): object;
     }
 
-    export interface Headers {
+    interface Headers {
         [key: string]: any;
     }
 
-    export interface AuthOptions {
+    interface AuthOptions {
         user?: string;
         username?: string;
         pass?: string;
@@ -281,7 +286,7 @@ declare namespace request {
         bearer?: string | (() => string);
     }
 
-    export interface OAuthOptions {
+    interface OAuthOptions {
         callback?: string;
         consumer_key?: string;
         consumer_secret?: string;
@@ -289,36 +294,24 @@ declare namespace request {
         token_secret?: string;
         transport_method?: 'body' | 'header' | 'query';
         verifier?: string;
-        body_hash?: true | string
+        body_hash?: true | string;
     }
 
-    export interface HawkOptions {
+    interface HawkOptions {
         credentials: any;
     }
 
-    export interface AWSOptions {
+    interface AWSOptions {
         secret: string;
         bucket?: string;
     }
 
-    export interface CookieJar {
-        setCookie(cookie: Cookie, uri: string | url.Url, options?: any): void
-        getCookieString(uri: string | url.Url): string
-        getCookies(uri: string | url.Url): Cookie[]
-    }
+    type Cookie = tough.Cookie;
 
-    export interface CookieValue {
-        name: string;
-        value: any;
-        httpOnly: boolean;
-    }
-
-    export interface Cookie extends Array<CookieValue> {
-        constructor(name: string, req: Request): void;
-        str: string;
-        expires: Date;
-        path: string;
-        toString(): string;
+    interface CookieJar {
+        setCookie(cookieOrStr: Cookie | string, uri: string | Url, options?: tough.CookieJar.SetCookieOptions): void;
+        getCookieString(uri: string | Url): string;
+        getCookies(uri: string | Url): Cookie[];
     }
 }
 declare var request: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
diff --git a/types/request/request-tests.ts b/types/request/request-tests.ts
index 2bfe7d33b0..102e4001b5 100644
--- a/types/request/request-tests.ts
+++ b/types/request/request-tests.ts
@@ -1,31 +1,32 @@
-
-import request = require('request');
+import FormData = require('form-data');
+import fs = require('fs');
 import http = require('http');
+import path = require('path');
+import qs = require('querystring');
+import request = require('request');
 import stream = require('stream');
 import urlModule = require('url');
-import fs = require('fs');
-import FormData = require('form-data');
 
-var value: any;
-var str: string;
-var strOrUndef: string | undefined;
-var strOrTrueOrUndef: string | true | undefined;
-var buffer: NodeBuffer = new Buffer('foo');
-var num: number = 0;
-var bool: boolean;
-var date: Date;
-var obj: object;
-var dest: string = 'foo';
+let value: any;
+let str: string;
+let strOrUndef: string | undefined;
+let strOrTrueOrUndef: string | true | undefined;
+const buffer: NodeBuffer = new Buffer('foo');
+const num = 0;
+let bool: boolean;
+let date: Date;
+let obj: object;
+const dest = 'foo';
 
-var uri: string = 'foo-bar';
-var headers: {[key: string]: string} = {};
+const uri = 'foo-bar';
+const headers: request.Headers = {};
 
-var agent: http.Agent;
-var write: stream.Writable = new stream.Writable();
-var req: request.Request = request(uri, function callback() {});
-var form1: FormData;
+let agent: http.Agent;
+let write: stream.Writable = new stream.Writable();
+let req: request.Request = request(uri, function callback() {});
+let form: FormData;
 
-var bodyArr: request.RequestPart[] = [{
+const bodyArr: request.RequestPart[] = [{
 	body: value
 }, {
 	body: value
@@ -33,12 +34,12 @@ var bodyArr: request.RequestPart[] = [{
 	body: value
 }];
 
-//Defaults tests
+// 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)
+  // defaultJarRequest(); //this line doesn't compile (and shouldn't)
   const defaultUrlRequest = request.defaults({ url: githubUrl });
   defaultUrlRequest();
   defaultUrlRequest.get();
@@ -48,36 +49,28 @@ var bodyArr: request.RequestPart[] = [{
   defaultBodyRequest.put();
 })();
 
-
 // --- --- --- --- --- --- --- --- --- --- --- ---
 
 obj = req.toJSON();
 
-var cookieValue: request.CookieValue = {
-  name: 'foo',
-  value: 'bar',
-  httpOnly: true
-};
-str = cookieValue.name;
-value = cookieValue.value;
-bool = cookieValue.httpOnly;
-
-var cookie: request.Cookie = request.cookie('foo');
-str = cookie.str;
+let cookie: request.Cookie = request.cookie('foo')!;
+str = cookie.key;
+str = cookie.value;
 date = cookie.expires;
 str = cookie.path;
 str = cookie.toString();
+bool = cookie.httpOnly;
 
-var jar: request.CookieJar = request.jar();
+let jar: request.CookieJar = request.jar();
 jar.setCookie(cookie, uri);
 str = jar.getCookieString(uri);
-var cookies: request.Cookie[] = jar.getCookies(uri);
+const cookies: request.Cookie[] = jar.getCookies(uri);
 
-var aws: request.AWSOptions = { secret: 'foo' };
+const aws: request.AWSOptions = { secret: 'foo' };
 str = aws.secret;
 strOrUndef = aws.bucket;
 
-var oauth: request.OAuthOptions = { body_hash: 'foo' };
+let oauth: request.OAuthOptions = { body_hash: 'foo' };
 strOrUndef = oauth.callback;
 strOrUndef = oauth.consumer_key;
 strOrUndef = oauth.consumer_secret;
@@ -87,24 +80,18 @@ strOrUndef = oauth.transport_method;
 strOrUndef = oauth.verifier;
 strOrTrueOrUndef = oauth.body_hash;
 
-var options: request.Options = {
+let options: request.Options = {
 	url: str,
 	uri: str,
-	callback: (error: any, response: any, body: any) => {
-
-	},
+	callback: (error: any, response: any, body: any) => {},
 	jar: value,
 	form: obj,
 	oauth: value,
-	aws: aws,
+	aws,
 	qs: obj,
 	json: value,
-	jsonReviver: (key: string, value: any) => {
-
-	},
-	jsonReplacer: (key: string, value: any) => {
-
-	},
+	jsonReviver: (key: string, value: any) => {},
+	jsonReplacer: (key: string, value: any) => {},
 	multipart: value,
 	agent: new http.Agent(),
 	agentOptions: value,
@@ -139,8 +126,8 @@ opt.uri = str;
 // --- --- --- --- --- --- --- --- --- --- --- ---
 
 agent = req.getAgent();
-//req.start();
-//req.abort();
+// req.start();
+// req.abort();
 req.pipeDest(dest);
 req = req.setHeader(str, str);
 req = req.setHeader(str, str, bool);
@@ -168,8 +155,6 @@ req.destroy();
 
 // --- --- --- --- --- --- --- --- --- --- --- ---
 
-value = request.initParams;
-
 req = request(uri);
 req = request(uri, options);
 req = request(uri, options, callback);
@@ -228,9 +213,8 @@ req = request.delete(options, callback);
 
 req = request.forever(value, value);
 jar = request.jar();
-cookie = request.cookie(str);
 
-var r = request.defaults(options);
+const r = request.defaults(options);
 r(str);
 r.get(str);
 r.post(str);
@@ -241,14 +225,14 @@ r.post(options);
 
 request
 .get('http://example.com/example.png')
-.on('response', function(response: any) {
+.on('response', (response: any) => {
 	// check response
 })
 .pipe(request.put('http://another.com/another.png'));
 
-//The following examples from https://github.com/request/request
-request('http://www.google.com', function (error, response, body) {
-  if (!error && response.statusCode == 200) {
+// The following examples from https://github.com/request/request
+request('http://www.google.com', (error, response, body) => {
+  if (!error && response.statusCode === 200) {
     console.log(body); // Show the HTML for the Google homepage.
   }
 });
@@ -261,7 +245,7 @@ request.get('http://google.com/img.png').pipe(request.put('http://mysite.com/img
 
 request
   .get('http://google.com/img.png')
-  .on('response', function(response: any) {
+  .on('response', (response: any) => {
     console.log(response.statusCode); // 200
     console.log(response.headers['content-type']); // 'image/png'
   })
@@ -269,46 +253,49 @@ request
 
 request
   .get('http://mysite.com/doodle.png')
-  .on('error', function(err: any) {
+  .on('error', (err: any) => {
     console.log(err);
   })
   .pipe(fs.createWriteStream('doodle.png'));
 
-http.createServer(function (req, resp) {
+http.createServer((req, resp) => {
   if (req.url === '/doodle.png') {
-    if (req.method === 'PUT') {
-      req.pipe(request.put('http://mysite.com/doodle.png'));
-    } else if (req.method === 'GET' || req.method === 'HEAD') {
-      request.get('http://mysite.com/doodle.png').pipe(resp);
+    switch (req.method) {
+    case 'PUT':
+        req.pipe(request.put('http://mysite.com/doodle.png'));
+        break;
+    case 'GET':
+    case 'HEAD':
+        request.get('http://mysite.com/doodle.png').pipe(resp);
     }
   }
 });
 
-http.createServer(function (req, resp) {
+http.createServer((req, resp) => {
   if (req.url === '/doodle.png') {
-    var x = request('http://mysite.com/doodle.png');
+    const x = request('http://mysite.com/doodle.png');
     req.pipe(x);
     x.pipe(resp);
   }
 });
 
-http.createServer(function (req, resp) {
+http.createServer((req, resp) => {
   req.pipe(request('http://mysite.com/doodle.png')).pipe(resp);
 });
 
-http.createServer(function (req, resp) {
+http.createServer((req, resp) => {
   if (req.url === '/doodle.png') {
     r.get('http://google.com/doodle.png').pipe(resp);
   }
 });
 
-request.post('http://service.com/upload', {form:{key:'value'}});
+request.post('http://service.com/upload', {form: {key: 'value'}});
 // or
-request.post('http://service.com/upload').form({key:'value'});
+request.post('http://service.com/upload').form({key: 'value'});
 // or
-request.post({url:'http://service.com/upload', form: {key:'value'}}, function(err,httpResponse,body){ /* ... */ });
+request.post({url: 'http://service.com/upload', form: {key: 'value'}}, (err, httpResponse, body) => { /* ... */ });
 
-var data = {
+const data = {
   // Pass a simple key-value pair
   my_field: 'my_value',
   // Pass data via Buffers
@@ -331,15 +318,16 @@ var data = {
     }
   }
 };
-request.post({url:'http://service.com/upload', formData: data}, function optionalCallback(err, httpResponse, body) {
+request.post({url: 'http://service.com/upload', formData: data}, function optionalCallback(err, httpResponse, body) {
   if (err) {
-    return console.error('upload failed:', err);
+    console.error('upload failed:', err);
+    return;
   }
   console.log('Upload successful!  Server responded with:', body);
 });
 
-var requestMultipart = request.post('http://service.com/upload', function optionalCallback(err, httpResponse, body) {});
-var form = requestMultipart.form();
+const requestMultipart = request.post('http://service.com/upload', function optionalCallback(err, httpResponse, body) {});
+form = requestMultipart.form();
 form.append('my_field', 'my_value');
 form.append('my_buffer', new Buffer([1, 2, 3]));
 form.append('custom_file', fs.createReadStream(__dirname + '/unicycle.jpg'), {filename: 'unicycle.jpg'});
@@ -354,15 +342,16 @@ request({
       data: [
         {
           'content-type': 'application/json',
-          body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
+          body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, content_type: 'text/plain' }}})
         },
         { body: 'I am an attachment' }
       ]
     }
   },
-  function (error, response, body) {
+  (error, response, body) => {
     if (error) {
-      return console.error('upload failed:', error);
+      console.error('upload failed:', error);
+      return;
     }
     console.log('Upload successful!  Server responded with:', body);
   });
@@ -374,15 +363,16 @@ request({
     multipart: [
       {
         headers: { 'content-type': 'application/json' },
-        body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
+        body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, content_type: 'text/plain' }}})
       },
       { body: 'I am an attachment' },
       { body: fs.createReadStream('image.png') }
     ]
   },
-  function (error, response, body) {
+  (error, response, body) => {
     if (error) {
-      return console.error('upload failed:', error);
+      console.error('upload failed:', error);
+      return;
     }
     console.log('Upload successful!  Server responded with:', body);
   });
@@ -390,32 +380,32 @@ request({
 request.get('http://some.server.com/').auth('username', 'password', false);
 // or
 request.get('http://some.server.com/', {
-  'auth': {
-    'user': 'username',
-    'pass': 'password',
-    'sendImmediately': false
+  auth: {
+    user: 'username',
+    pass: 'password',
+    sendImmediately: false
   }
 });
 // or
 request.get('http://some.server.com/').auth('foo', 'bar', true, 'bearerToken');
 // or
 request.get('http://some.server.com/', {
-  'auth': {
-    'bearer': 'bearerToken'
+  auth: {
+    bearer: 'bearerToken'
   }
 });
 // or
 request.get('http://some.server.com/', {
-  'auth': {
-    'bearer': () => 'bearerToken'
+  auth: {
+    bearer: () => 'bearerToken'
   }
 });
 
-var username = 'username',
-    password = 'password',
-    url = 'http://' + username + ':' + password + '@some.server.com';
+const username = 'username';
+const password = 'password';
+let url = `http://'${username}:${password}'@some.server.com`;
 
-request({url: url}, function (error, response, body) {
+request({url}, (error, response, body) => {
    // Do more stuff with 'body' here
 });
 
@@ -427,8 +417,8 @@ options = {
 };
 
 function callback(error: any, response: http.IncomingMessage, body: string) {
-  if (!error && response.statusCode == 200) {
-    var info = JSON.parse(body);
+  if (!error && response.statusCode === 200) {
+    const info = JSON.parse(body);
     console.log(info.stargazers_count + " Stars");
     console.log(info.forks_count + " Forks");
   }
@@ -438,65 +428,62 @@ request(options, callback);
 
 // OAuth1.0 - 3-legged server side flow (Twitter example)
 // step 1
-import qs = require('querystring');
 const CONSUMER_KEY = 'key';
 const CONSUMER_SECRET = 'secret';
-oauth =
-    { callback: 'http://mysite.com/callback/'
-    , consumer_key: CONSUMER_KEY
-    , consumer_secret: CONSUMER_SECRET
-    , transport_method: 'header'
-    }
-  , url = 'https://api.twitter.com/oauth/request_token'
-  ;
-request.post({url:url, oauth:oauth}, function (e, r, body) {
+oauth = {
+      callback: 'http://mysite.com/callback/',
+      consumer_key: CONSUMER_KEY,
+      consumer_secret: CONSUMER_SECRET,
+      transport_method: 'header'
+};
+url = 'https://api.twitter.com/oauth/request_token';
+
+request.post({url, oauth}, (e, r, body) => {
   // Ideally, you would take the body in the response
   // and construct a URL that a user clicks on (like a sign in button).
   // The verifier is only available in the response after a user has
   // verified with twitter that they are authorizing your app.
 
   // step 2
-  var req_data = qs.parse(body);
-  var uri = 'https://api.twitter.com/oauth/authenticate'
-    + '?' + qs.stringify({oauth_token: req_data.oauth_token});
+  const req_data = qs.parse(body);
+  const uri = `https://api.twitter.com/oauth/authenticate?${qs.stringify({oauth_token: req_data.oauth_token})}`;
   // redirect the user to the authorize uri
 
   // step 3
   // after the user is redirected back to your server
-  var auth_data: any = qs.parse(body)
-    , oauth =
-      { consumer_key: CONSUMER_KEY
-      , consumer_secret: CONSUMER_SECRET
-      , token: auth_data.oauth_token
-      , token_secret: req_data.oauth_token_secret
-      , verifier: auth_data.oauth_verifier
-      }
-    , url = 'https://api.twitter.com/oauth/access_token'
-    ;
-  request.post({url:url, oauth:oauth}, function (e, r, body) {
+  const auth_data: any = qs.parse(body);
+  const oauth = {
+        consumer_key: CONSUMER_KEY,
+        consumer_secret: CONSUMER_SECRET,
+        token: auth_data.oauth_token,
+        token_secret: req_data.oauth_token_secret as string,
+        verifier: auth_data.oauth_verifier
+    };
+  const url = 'https://api.twitter.com/oauth/access_token';
+
+  request.post({url, oauth}, (e, r, body) => {
     // ready to make signed requests on behalf of the user
-    var perm_data: any = qs.parse(body);
-    var oauth =
-        { consumer_key: CONSUMER_KEY
-        , consumer_secret: CONSUMER_SECRET
-        , token: perm_data.oauth_token
-        , token_secret: perm_data.oauth_token_secret
-        };
-    var url = 'https://api.twitter.com/1.1/users/show.json';
-    var query = {
+    const perm_data: any = qs.parse(body);
+    const oauth = {
+        consumer_key: CONSUMER_KEY,
+        consumer_secret: CONSUMER_SECRET,
+        token: perm_data.oauth_token,
+        token_secret: perm_data.oauth_token_secret
+      };
+    const url = 'https://api.twitter.com/1.1/users/show.json';
+    const query = {
       screen_name: perm_data.screen_name,
       user_id: perm_data.user_id
     };
-    request.get({url:url, oauth:oauth, qs:query, json:true}, function (e, r, user) {
+    request.get({url, oauth, qs: query, json: true}, (e, r, user) => {
       console.log(user);
     });
   });
 });
 
-var path = require('path')
-    , certFile = path.resolve(__dirname, 'ssl/client.crt')
-    , keyFile = path.resolve(__dirname, 'ssl/client.key')
-    , caFile = path.resolve(__dirname, 'ssl/ca.cert.pem');
+const certFile = path.resolve(__dirname, 'ssl/client.crt');
+const keyFile = path.resolve(__dirname, 'ssl/client.key');
+const caFile = path.resolve(__dirname, 'ssl/ca.cert.pem');
 
 options = {
     url: 'https://api.some-server.com/',
@@ -508,10 +495,6 @@ options = {
 
 request.get(options);
 
-var path = require('path')
-    , certFile = path.resolve(__dirname, 'ssl/client.crt')
-    , keyFile = path.resolve(__dirname, 'ssl/client.key');
-
 options = {
     url: 'https://api.some-server.com/',
     agentOptions: {
@@ -540,7 +523,6 @@ request.get({
     }
 });
 
-
 request({
     // will be ignored
     method: 'GET',
@@ -572,19 +554,19 @@ request({
     }
   });
 
-//requests using baseRequest() will set the 'x-token' header
-var baseRequest = request.defaults({
+// requests using baseRequest() will set the 'x-token' header
+const baseRequest = request.defaults({
   headers: {'x-token': 'my-token'}
 });
 
-//requests using specialRequest() will include the 'x-token' header set in
-//baseRequest and will also include the 'special' header
-var specialRequest = baseRequest.defaults({
+// requests using specialRequest() will include the 'x-token' header set in
+// baseRequest and will also include the 'special' header
+const specialRequest = baseRequest.defaults({
   headers: {special: 'special value'}
 });
 
 const urlRequest = specialRequest.defaults({url: 'https://github.com'});
-urlRequest({}, function(error, response, body) {console.log(body);});
+urlRequest({}, (error, response, body) => { console.log(body); });
 
 request.put(url);
 request.patch(url);
@@ -597,7 +579,7 @@ request.cookie('key1=value1');
 request.jar();
 request.debug = true;
 
-request.get('http://10.255.255.1', {timeout: 1500}, function(err) {
+request.get('http://10.255.255.1', {timeout: 1500}, (err) => {
     console.log(err.code === 'ETIMEDOUT');
     // Set to `true` if the timeout was a connection timeout, `false` or
     // `undefined` otherwise.
@@ -605,23 +587,23 @@ request.get('http://10.255.255.1', {timeout: 1500}, function(err) {
     process.exit(0);
 });
 
-var rand = Math.floor(Math.random()*100000000).toString();
+const rand = Math.floor(Math.random() * 100000000).toString();
   request(
     { method: 'PUT'
     , uri: 'http://mikeal.iriscouch.com/testjs/' + rand
     , multipart:
       [ { headers: { 'content-type': 'application/json' }
-        , body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
+        , body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, content_type: 'text/plain' }}})
         }
       , { body: 'I am an attachment' }
       ]
     }
-  , function (error, response, body) {
-      if(response.statusCode == 201){
-        console.log('document saved as: http://mikeal.iriscouch.com/testjs/'+ rand)
+  , (error, response, body) => {
+      if (response.statusCode === 201) {
+        console.log('document saved as: http://mikeal.iriscouch.com/testjs/' + rand);
       } else {
-        console.log('error: '+ response.statusCode)
-        console.log(body)
+        console.log('error: ' + response.statusCode);
+        console.log(body);
       }
     }
   );
@@ -631,55 +613,55 @@ request(
     , uri: 'http://www.google.com'
     , gzip: true
     }
-  , function (error, response, body) {
+  , (error, response, body) => {
       // body is the decompressed response body
-      console.log('server encoded the data as: ' + (response.headers['content-encoding'] || 'identity'))
-      console.log('the decoded data is: ' + body)
+      console.log('server encoded the data as: ' + (response.headers['content-encoding'] || 'identity'));
+      console.log('the decoded data is: ' + body);
     }
-  ).on('data', function(data: any) {
+  ).on('data', (data: any) => {
     // decompressed data as it is received
-    console.log('decoded chunk: ' + data)
+    console.log('decoded chunk: ' + data);
   })
-  .on('response', function(response: http.IncomingMessage) {
+  .on('response', (response: http.IncomingMessage) => {
     // unmodified http.IncomingMessage object
-    response.on('data', function(data: any[]) {
+    response.on('data', (data: any[]) => {
       // compressed data as it is received
-      console.log('received ' + data.length + ' bytes of compressed data')
-    })
+      console.log(`received ${data.length} bytes of compressed data`);
+    });
   });
 
-var requestWithJar = request.defaults({jar: true})
-requestWithJar('http://www.google.com', function () {
+let requestWithJar = request.defaults({jar: true});
+requestWithJar('http://www.google.com', () => {
   requestWithJar('http://images.google.com');
 });
 
-var j = request.jar()
-requestWithJar = request.defaults({jar:j})
-requestWithJar('http://www.google.com', function () {
+jar = request.jar();
+requestWithJar = request.defaults({jar});
+requestWithJar('http://www.google.com', () => {
   requestWithJar('http://images.google.com');
 });
 
-var j = request.jar();
-cookie = request.cookie('key1=value1');
-var url = 'http://www.google.com';
-j.setCookie(cookie, url);
-request({url: url, jar: j}, function () {
+jar = request.jar();
+cookie = request.cookie('key1=value1')!;
+url = 'http://www.google.com';
+jar.setCookie(cookie, url);
+request({url, jar}, () => {
   request('http://images.google.com');
 });
 
-//TODO: add definitions for tough-cookie-filestore
-//var FileCookieStore = require('tough-cookie-filestore');
+// TODO: add definitions for tough-cookie-filestore
+// var FileCookieStore = require('tough-cookie-filestore');
 // NOTE - currently the 'cookies.json' file must already exist!
-//var j = request.jar(new FileCookieStore('cookies.json'));
-requestWithJar = request.defaults({ jar : j })
-request('http://www.google.com', function() {
+// var j = request.jar(new FileCookieStore('cookies.json'));
+requestWithJar = request.defaults({ jar });
+request('http://www.google.com', () => {
   request('http://images.google.com');
 });
 
-var j = request.jar()
-request({url: 'http://www.google.com', jar: j}, function () {
-  var cookie_string = j.getCookieString(url); // "key1=value1; key2=value2; ..."
-  var cookies = j.getCookies(url);
+jar = request.jar();
+request({url: 'http://www.google.com', jar}, () => {
+  const cookie_string = jar.getCookieString(url); // "key1=value1; key2=value2; ..."
+  const cookies = jar.getCookies(url);
   // [{key: 'key1', value: 'value1', domain: "www.google.com", ...}, ...]
 });
 
@@ -689,11 +671,11 @@ request(
     , gzip: true
     }
   )
-  .on('request', function(req: http.ClientRequest) { })
-  .on('response', function(resp: http.IncomingMessage) { })
-  .on('data', function(data: Buffer | string) { })
-  .on('error', function(e: Error) { })
-  .on('complete', function(resp: http.IncomingMessage, body?: string | Buffer) { });
+  .on('request', (req: http.ClientRequest) => { })
+  .on('response', (resp: http.IncomingMessage) => { })
+  .on('data', (data: Buffer | string) => { })
+  .on('error', (e: Error) => { })
+  .on('complete', (resp: http.IncomingMessage, body?: string | Buffer) => { });
 
 // options.url / options.uri can be the Url object
 request.get({
@@ -704,7 +686,7 @@ request.get({
   uri: urlModule.parse('http://example.com')
 });
 
-var requestWithOptionalUri = request.defaults({ uri: 'http://example.com' });
+const requestWithOptionalUri = request.defaults({ uri: 'http://example.com' });
 
 requestWithOptionalUri();
 
@@ -720,11 +702,11 @@ requestWithOptionalUri({ url: urlModule.parse('http://example.com') });
 
 requestWithOptionalUri('http://example.com');
 
-requestWithOptionalUri(function() {});
+requestWithOptionalUri(() => {});
 
 requestWithOptionalUri.get();
 
-requestWithOptionalUri.get(function() {});
+requestWithOptionalUri.get(() => {});
 
 requestWithOptionalUri.get('http://example.com');
 
@@ -745,3 +727,24 @@ requestWithOptionalUri.get({
 requestWithOptionalUri.get({
   uri: urlModule.parse('http://example.com')
 });
+
+//// initParams
+const optionsWithoutUriUrl: request.CoreOptions = {};
+let optionsWithUriUrl: request.RequiredUriUrl = {
+  uri: 'http://example.com',
+};
+
+optionsWithUriUrl = request.initParams(uri);
+optionsWithUriUrl = request.initParams(uri, optionsWithoutUriUrl);
+optionsWithUriUrl = request.initParams(uri, optionsWithoutUriUrl, callback);
+optionsWithUriUrl = request.initParams(uri, callback);
+optionsWithUriUrl = request.initParams(optionsWithUriUrl);
+optionsWithUriUrl = request.initParams(optionsWithUriUrl, callback);
+
+const defaultsForInitParams = request.defaults({});
+options = defaultsForInitParams.initParams(uri);
+options = defaultsForInitParams.initParams(uri, optionsWithoutUriUrl);
+options = defaultsForInitParams.initParams(uri, optionsWithoutUriUrl, callback);
+options = defaultsForInitParams.initParams(uri, callback);
+options = defaultsForInitParams.initParams(optionsWithUriUrl);
+options = defaultsForInitParams.initParams(optionsWithUriUrl, callback);
diff --git a/types/request/tslint.json b/types/request/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/request/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/requestretry/index.d.ts b/types/requestretry/index.d.ts
index 73078ad71e..3963ce2c17 100644
--- a/types/requestretry/index.d.ts
+++ b/types/requestretry/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Eric Byers <https://github.com/EricByers>
 // 				   Andrew Throener <https://github.com/trainerbill>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/requirejs-domready/tslint.json b/types/requirejs-domready/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/requirejs-domready/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/requirejs/tslint.json b/types/requirejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/requirejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/resemblejs/tslint.json b/types/resemblejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/resemblejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/resolve-from/tslint.json b/types/resolve-from/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/resolve-from/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/resolve/index.d.ts b/types/resolve/index.d.ts
index ed047af9c6..fd3bf8272b 100644
--- a/types/resolve/index.d.ts
+++ b/types/resolve/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for resolve
 // Project: https://github.com/substack/node-resolve
 // Definitions by: Mario Nebl <https://github.com/marionebl>
+//                 Klaus Meinhardt <https://github.com/ajafff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -88,7 +89,7 @@ declare namespace resolve {
 
   export interface SyncOpts extends Opts {
     // how to read files synchronously (defaults to fs.readFileSync)
-    readFileSync?: (file: string) => Buffer;
+    readFileSync?: (file: string, charset: string) => string | Buffer;
     // function to synchronously test whether a file exists
     isFile?: (file: string) => boolean;
   }
diff --git a/types/resolve/resolve-tests.ts b/types/resolve/resolve-tests.ts
index 1f9f50b5ee..c4b89feb46 100644
--- a/types/resolve/resolve-tests.ts
+++ b/types/resolve/resolve-tests.ts
@@ -73,6 +73,11 @@ function test_options_sync() {
     }
   });
   console.log(resolved);
+  resolved = resolve.sync('typescript', {
+      readFileSync(file, charset) {
+          return fs.readFileSync(file, charset);
+      }
+  });
 }
 
 function test_is_core() {
diff --git a/types/resolve/tslint.json b/types/resolve/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/resolve/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/resourcejs/index.d.ts b/types/resourcejs/index.d.ts
new file mode 100644
index 0000000000..ec5e938745
--- /dev/null
+++ b/types/resourcejs/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for resourcejs 1.9
+// Project: https://github.com/travist/resourcejs
+// Definitions by: Shaun Luttin <https://github.com/shaunluttin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import express = require("express");
+import mongoose = require("mongoose");
+
+export = resourcejs;
+
+declare function resourcejs(
+    app: express.Application,
+    route: string,
+    modelName: string,
+    model: mongoose.Model<mongoose.Document>): resourcejs.ResourceEndpoint;
+
+declare namespace resourcejs {
+    type HttpHandler = (req: Request, res: Response, next: express.NextFunction) => void;
+
+    type MethodBuild<T> = (options?: T) => ResourceEndpoint;
+
+    interface RestOptions extends HttpMethodOptions {
+        beforePut?: HttpHandler;
+        beforePatch?: HttpHandler;
+        beforePost?: HttpHandler;
+        beforeIndex?: HttpHandler;
+        beforeGet?: HttpHandler;
+        afterPut?: HttpHandler;
+        afterPatch?: HttpHandler;
+        afterPost?: HttpHandler;
+        afterIndex?: HttpHandler;
+        afterGet?: HttpHandler;
+    }
+
+    interface VirtualOptions extends HttpMethodOptions {
+        path?: string;
+    }
+
+    interface HttpMethodOptions {
+        before?: HttpHandler;
+        after?: HttpHandler;
+    }
+
+    /**
+     * We manually generated this interface by looking an resource like this:
+     * const resource = Resource(app, route, name, model);
+     * console.log(resource);
+     */
+    interface ResourceEndpoint {
+        model: mongoose.Model<mongoose.Document>;
+        modelName: string;
+        name: string;
+        route: string;
+        methods: string[];
+        __swagger: any;
+        register: (
+            app: express.Application,
+            method: string,
+            path: string,
+            callback: (...args: any[]) => any,
+            last: (...args: any[]) => any,
+            options: object) => any;
+
+        respond: HttpHandler;
+        setResponse: HttpHandler;
+        getMethodOptions: (method: string, options: object) => object;
+        rest: MethodBuild<RestOptions>;
+        getParamQuery: (req: Request, name: string) => any;
+        getFindQuery: (req: Request) => object;
+        index: MethodBuild<HttpMethodOptions>;
+        get: MethodBuild<HttpMethodOptions>;
+        virtual: MethodBuild<VirtualOptions>;
+        post: MethodBuild<HttpMethodOptions>;
+        put: MethodBuild<HttpMethodOptions>;
+        patch: MethodBuild<HttpMethodOptions>;
+        delete: MethodBuild<HttpMethodOptions>;
+        swagger: MethodBuild<HttpMethodOptions>;
+    }
+
+    interface Request extends express.Request {
+        skipResource: boolean;
+        noResponse: boolean;
+        query: any;
+        countQuery: any;
+        modelQuery: any;
+        skipDelete: boolean;
+    }
+
+    interface Response extends express.Response {
+        resource: Resource;
+    }
+
+    interface Resource {
+        status: number;
+        error: Error;
+        item: any;
+    }
+
+    interface Error {
+        message: string;
+        path: string;
+        name: string;
+        errors: Error[];
+    }
+}
diff --git a/types/resourcejs/resourcejs-tests.ts b/types/resourcejs/resourcejs-tests.ts
new file mode 100644
index 0000000000..603d31c255
--- /dev/null
+++ b/types/resourcejs/resourcejs-tests.ts
@@ -0,0 +1,29 @@
+import express = require("express");
+import resourcejs = require("resourcejs");
+import mongoose = require("mongoose");
+
+const app = express();
+const route = "the-route";
+const resourceName = "the-resource-name";
+
+const schema = new mongoose.Schema({});
+const model = mongoose.model(resourceName, schema);
+
+resourcejs(app, route, resourceName, model)
+    .get()
+    .post({
+        after(req: resourcejs.Request, res: resourcejs.Response, next: express.NextFunction) {
+            res.resource.item = {
+                foo: "foo",
+                bar: "bar",
+                baz: "baz",
+            };
+
+            next();
+        },
+    })
+    .delete()
+    .put()
+    .patch()
+    .index()
+    .rest();
diff --git a/types/resourcejs/tsconfig.json b/types/resourcejs/tsconfig.json
new file mode 100644
index 0000000000..ca71c00a1a
--- /dev/null
+++ b/types/resourcejs/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [                         
+        "index.d.ts",                  
+        "resourcejs-tests.ts"
+    ]                           
+}
diff --git a/types/resourcejs/tslint.json b/types/resourcejs/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/resourcejs/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/response-time/index.d.ts b/types/response-time/index.d.ts
index 2dd6533403..8a06ba04fd 100644
--- a/types/response-time/index.d.ts
+++ b/types/response-time/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/expressjs/response-time
 // Definitions by: Uros Smolnik <https://github.com/urossmolnik>, TonyYang <https://github.com/TonyPythoneer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 /* =================== USAGE ===================
diff --git a/types/response-time/tslint.json b/types/response-time/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/response-time/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rest/tslint.json b/types/rest/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rest/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/restangular/tslint.json b/types/restangular/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/restangular/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/restful.js/tslint.json b/types/restful.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/restful.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/restify-cookies/index.d.ts b/types/restify-cookies/index.d.ts
index 842e6c425e..a4ab9f5f47 100644
--- a/types/restify-cookies/index.d.ts
+++ b/types/restify-cookies/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nathschmidt/restify-cookies
 // Definitions by: weekens <https://github.com/weekens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as restify from 'restify';
 
@@ -11,9 +12,14 @@ declare module 'restify' {
     maxAge?: number;
     domain?: string;
     path?: string;
-    expires?: string;
+    expires?: Date;
     httpOnly?: boolean;
     secure?: boolean;
+    sameSite?: boolean|'lax'|'strict';
+  }
+
+  interface Request {
+    cookies: any;
   }
 
   interface Response {
diff --git a/types/restify-cookies/restify-cookies-tests.ts b/types/restify-cookies/restify-cookies-tests.ts
index e6a68e5689..6ca7d9965c 100644
--- a/types/restify-cookies/restify-cookies-tests.ts
+++ b/types/restify-cookies/restify-cookies-tests.ts
@@ -3,6 +3,6 @@ import 'restify-cookies';
 
 function test(server: Server) {
   server.get('/api/test', (req: Request, res: Response) => {
-    res.setCookie('myCookie', 'test', { path: '/' });
+    res.setCookie('myCookie', 'test' + req.cookies.foo, { path: '/' });
   });
 }
diff --git a/types/restify-cors-middleware/index.d.ts b/types/restify-cors-middleware/index.d.ts
index d7b92d25a9..09588d1da9 100644
--- a/types/restify-cors-middleware/index.d.ts
+++ b/types/restify-cors-middleware/index.d.ts
@@ -10,11 +10,20 @@ import { RequestHandler } from 'restify';
 
 declare namespace corsMiddleware {
   interface Options {
-    origins: string[];
+    /**
+     * an array of whitelisted origins
+     * can be both strings and regular expressions
+     */
+    origins: Array<string | RegExp>;
+    /** user defined headers to allow */
     allowHeaders: string[];
+    /** user defined headers to expose */
     exposeHeaders: string[];
+    /** if true, uses creds */
     credentials?: boolean;
+    /** ms to cache preflight requests */
     preflightMaxAge?: number;
+    /** customize preflight request handling */
     preflightStrategy?: any;
   }
 
@@ -24,19 +33,5 @@ declare namespace corsMiddleware {
   }
 }
 
-/**
- * @public
- * @param    {Object} options an options object
- * @param    {Array} [options.origins] an array of whitelisted origins, can be
- * both strings and regular expressions
- * @param    {Boolean} [options.credentials] if true, uses creds
- * @param    {Array} [options.allowHeaders] user defined headers to allow
- * @param    {Array} [options.exposeHeaders] user defined headers to expose
- * @param    {Number} [options.preflightMaxAge] ms to cache preflight requests
- * @param    {Object | Function} [options.preflightStrategy]
- * customize preflight request handling
- * @returns  {Object} returns an object with actual and preflight handlers
- */
 declare function corsMiddleware(options: corsMiddleware.Options): corsMiddleware.CorsMiddleware;
-
 export = corsMiddleware;
diff --git a/types/restify-plugins/index.d.ts b/types/restify-plugins/index.d.ts
index fd9688c937..4f495ce593 100644
--- a/types/restify-plugins/index.d.ts
+++ b/types/restify-plugins/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/restify/plugins
 // Definitions by: Ко�т� Трет�к <https://github.com/KostyaTretyak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { RequestHandler, Server, Request, Response, Route } from 'restify';
 import Logger = require('bunyan');
@@ -14,9 +15,6 @@ export namespace pre {
    */
   function context(): RequestHandler;
 
-  /**
-   *
-   */
   function dedupeSlashes(): RequestHandler;
 
   /**
@@ -73,9 +71,6 @@ export interface AuditLoggerOptions {
    */
   printLog?: boolean;
 
-  /**
-   *
-   */
   body?: boolean;
 }
 
@@ -165,14 +160,8 @@ export interface BodyParserOptions {
    */
   rejectUnknown?: boolean;
 
-  /**
-   *
-   */
   reviver?: any;
 
-  /**
-   *
-   */
   maxFieldsSize?: number;
 }
 
@@ -309,7 +298,7 @@ export function dateParser(delta?: number): RequestHandler;
 export function gzipResponse(options?: any): RequestHandler;
 
 export interface ServeStatic {
-  appendRequestPath?: boolean | undefined;
+  appendRequestPath?: boolean;
   directory?: string;
   maxAge?: number;
   match?: any;
@@ -342,9 +331,6 @@ export interface MetricsCallback {
    */
   err: Error;
 
-  /**
-   *
-   */
   metrics: MetricsCallbackOptions;
 
   req: Request;
diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 8cc5fa6635..b5f6dd6fe5 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -64,9 +64,6 @@ export interface AddressInterface {
 export interface Server extends http.Server {
     /**
      * Returns the server address. Wraps node's address().
-     * @public
-     * @function address
-     * @returns  {String}
      */
     address(): AddressInterface;
 
@@ -78,106 +75,83 @@ export interface Server extends http.Server {
      *  server.listen(80, '127.0.0.1')
      *  server.listen('/tmp/server.sock')
      *
-     * @public
-     * @function listen
      * @throws   {TypeError}
-     * @param    {Function}  callback optionally get notified when listening.
-     * @returns  {undefined}
+     * @param     callback optionally get notified when listening.
      */
     listen(...args: any[]): any;
 
     /**
      * Shuts down this server, and invokes callback (optionally) when done.
      * Wraps node's close().
-     * @public
-     * @function close
-     * @param    {Function}  callback optional callback to invoke when done.
-     * @returns  {undefined}
+     * @param     callback optional callback to invoke when done.
      */
     close(...args: any[]): any;
 
     /**
      * Returns the number of currently inflight requests.
-     * @public
-     * @function inflightRequests
-     * @returns  {Number}
      */
     inflightRequests(): number;
 
     /**
      * Mounts a chain on the given path against this HTTP verb
      *
-     * @public
-     * @function del
-     * @param   {String | Object} opts if string, the URL to handle.
+     * @param   opts if string, the URL to handle.
      *                                 if options, the URL to handle, at minimum.
-     * @returns {Route}                the newly created route.
+     * @returns                the newly created route.
      */
     del(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
 
     /**
      * Mounts a chain on the given path against this HTTP verb
      *
-     * @public
-     * @function get
-     * @param   {String | Object} opts if string, the URL to handle.
+     * @param   opts if string, the URL to handle.
      *                                 if options, the URL to handle, at minimum.
-     * @returns {Route}                the newly created route.
+     * @returns                the newly created route.
      */
     get(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
 
     /**
      * Mounts a chain on the given path against this HTTP verb
      *
-     * @public
-     * @function head
-     * @param   {String | Object} opts if string, the URL to handle.
+     * @param   opts if string, the URL to handle.
      *                                 if options, the URL to handle, at minimum.
-     * @returns {Route}                the newly created route.
+     * @returns                the newly created route.
      */
     head(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
 
     /**
      * Mounts a chain on the given path against this HTTP verb
      *
-     * @public
-     * @function opts
-     * @param   {String | Object} opts if string, the URL to handle.
+     * @param   opts if string, the URL to handle.
      *                                 if options, the URL to handle, at minimum.
-     * @returns {Route}                the newly created route.
+     * @returns                the newly created route.
      */
     opts(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
 
     /**
      * Mounts a chain on the given path against this HTTP verb
      *
-     * @public
-     * @function post
-     * @param   {String | Object} opts if string, the URL to handle.
+     * @param   opts if string, the URL to handle.
      *                                 if options, the URL to handle, at minimum.
-     * @returns {Route}                the newly created route.
+     * @returns                the newly created route.
      */
     post(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
 
     /**
      * Mounts a chain on the given path against this HTTP verb
      *
-     * @public
-     * @function put
-     * @param   {String | Object} opts if string, the URL to handle.
+     * @param   opts if string, the URL to handle.
      *                                 if options, the URL to handle, at minimum.
-     * @returns {Route}                the newly created route.
+     * @returns                the newly created route.
      */
     put(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
 
     /**
      * Mounts a chain on the given path against this HTTP verb
      *
-     * @public
-     * @function patch
-     * @param   {String | Object} opts if string, the URL to handle.
+     * @param   opts if string, the URL to handle.
      *                                 if options, the URL to handle, at minimum.
-     * @returns {Route}                the newly created route.
+     * @returns                the newly created route.
      */
     patch(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
 
@@ -195,11 +169,9 @@ export interface Server extends http.Server {
      *     // load the user's information here, always making sure to call next()
      *   });
      *
-     * @public
-     * @function param
-     * @param    {String}   name The name of the URL param to respond to
-     * @param    {Function} fn   The middleware function to execute
-     * @returns  {Object}        returns self
+     * @param      name The name of the URL param to respond to
+     * @param    fn   The middleware function to execute
+     * @returns         returns self
      */
     param(name: string, fn: RequestHandler): Server;
 
@@ -216,24 +188,19 @@ export interface Server extends http.Server {
      *     // do stuff that only applies to routes of this API version
      *   });
      *
-     * @public
-     * @function versionedUse
-     * @param    {String|Array} versions the version(s) the URL to respond to
-     * @param    {Function}     fn       the middleware function to execute, the
+     * @param    versions the version(s) the URL to respond to
+     * @param        fn       the middleware function to execute, the
      *                                   fourth parameter will be the selected
      *                                   version
-     * @returns  {undefined}
      */
     versionedUse(versions: string | string[], fn: RequestHandler): Server;
 
     /**
      * Removes a route from the server.
      * You pass in the route 'blob' you got from a mount call.
-     * @public
-     * @function rm
      * @throws   {TypeError} on bad input.
-     * @param    {String}    route the route name.
-     * @returns  {Boolean}         true if route was removed, false if not.
+     * @param       route the route name.
+     * @returns          true if route was removed, false if not.
      */
     rm(route: string): boolean;
 
@@ -242,9 +209,7 @@ export interface Server extends http.Server {
      * routes.
      *
      * You can pass in any combination of functions or array of functions.
-     * @public
-     * @function use
-     * @returns {Object} returns self
+     * @returns returns self
      */
     use(...handlers: RequestHandlerType[]): Server;
 
@@ -252,25 +217,17 @@ export interface Server extends http.Server {
      * Gives you hooks to run _before_ any routes are located.  This gives you
      * a chance to intercept the request and change headers, etc., that routing
      * depends on.  Note that req.params will _not_ be set yet.
-     * @public
-     * @function pre
-     * @returns {Object} returns self
+     * @returns returns self
      */
     pre(...pre: RequestHandlerType[]): Server;
 
     /**
      * toString() the server for easy reading/output.
-     * @public
-     * @function toString
-     * @returns  {String}
      */
     toString(): string;
 
     /**
      * Return debug information about the server.
-     * @public
-     * @method getDebugInfo
-     * @returns {Object}
      */
     getDebugInfo(): any;
 
@@ -311,52 +268,39 @@ export interface RouterOptions {
 export interface Router {
     /**
      * takes an object of route params and query params, and 'renders' a URL.
-     * @public
-     * @function render
-     * @param    {String} routeName the route name
-     * @param    {Object} params    an object of route params
-     * @param    {Object} query     an object of query params
-     * @returns  {String}
+     * @param    routeName the route name
+     * @param    params    an object of route params
+     * @param    query     an object of query params
      */
     render(routeName: string, params: any, query?: any): string;
 
     /**
      * adds a route.
-     * @public
-     * @function mount
-     * @param    {Object} options an options object
-     * @returns  {String} returns the route name if creation is successful.
+     * @param    options an options object
+     * @returns  returns the route name if creation is successful.
      */
     mount(options: RouteOptions): string | boolean;
 
     /**
      * unmounts a route.
-     * @public
-     * @function unmount
-     * @param    {String} name the route name
-     * @returns  {String}      the name of the deleted route.
+     * @param    name the route name
+     * @returns       the name of the deleted route.
      */
     unmount(name: string): string;
 
     /**
      * get a route from the router.
-     * @public
-     * @function get
-     * @param    {String}    name the name of the route to retrieve
-     * @param    {Object}    req  the request object
-     * @param    {Function}  cb   callback function
-     * @returns  {undefined}
+     * @param       name the name of the route to retrieve
+     * @param       req  the request object
+     * @param     cb   callback function
      */
     get(name: string, req: Request, cb: FindRouteCallback): void;
 
     /**
      * find a route from inside the router, handles versioned routes.
-     * @public
-     * @function find
-     * @param    {Object}   req      the request object
-     * @param    {Object}   res      the response object
-     * @param    {Function} callback callback function
-     * @returns  {undefined}
+     * @param      req      the request object
+     * @param      res      the response object
+     * @param    callback callback function
      */
     find(req: Request, res: Response, callback: FindRouteCallback): void;
 
@@ -364,26 +308,20 @@ export interface Router {
      * Find a route by path. Scans the route list for a route with the same RegEx.
      * i.e. /foo/:param1/:param2 would match an existing route with different
      * parameter names /foo/:id/:name since the compiled RegExs match.
-     * @public
-     * @function findByPath
-     * @param    {String | RegExp}    path      a path to find a route for.
-     * @param    {Object}             options   an options object
-     * @returns  {Object}             returns the route if a match is found
+     * @param       path      a path to find a route for.
+     * @param                options   an options object
+     * @returns              returns the route if a match is found
      */
     findByPath(path: string | RegExp): Route;
 
     /**
      * toString() serialization.
-     * @public
-     * @function toString
-     * @returns  {String}
      */
     toString(): string;
 
     /**
      * Return information about the routes registered in the router.
-     * @public
-     * @returns {object} The routes in the router.
+     * @returns The routes in the router.
      */
     getDebugInfo(): any;
 
@@ -426,108 +364,69 @@ export interface Request extends http.IncomingMessage {
     /**
      * checks if the accept header is present and has the value requested.
      * e.g., req.accepts('html');
-     * @public
-     * @function accepts
-     * @param    {String | Array} types an array of accept type headers
-     * @returns  {Boolean}
+     * @param    types an array of accept type headers
      */
     accepts(types: string | string[]): boolean;
 
     /**
      * checks if the request accepts the encoding types.
-     * @public
-     * @function acceptsEncoding
-     * @param    {String | Array} types an array of accept type headers
-     * @returns  {Boolean}
+     * @param    types an array of accept type headers
      */
     acceptsEncoding(types: string | string[]): boolean;
 
     /**
      * gets the content-length header off the request.
-     * @public
-     * @function getContentLength
-     * @returns {Number}
      */
     getContentLength(): number;
 
     /**
      * pass through to getContentLength.
-     * @public
-     * @function contentLength
-     * @returns {Number}
      */
     contentLength(): number;
 
     /**
      * gets the content-type header.
-     * @public
-     * @function getContentType
-     * @returns {String}
      */
     getContentType(): string;
 
     /**
      * pass through to getContentType.
-     * @public
-     * @function contentType
-     * @returns {Number}
      */
     contentType(): string;
 
     /**
      * retrieves the complete URI requested by the client.
-     * @public
-     * @function getHref
-     * @returns {String}
      */
     getHref(): string;
 
     /**
      * pass through to getHref.
-     * @public
-     * @function href
-     * @returns {String}
      */
     href(): string;
 
     /**
      * retrieves the request uuid. was created when the request was setup.
-     * @public
-     * @function getId
-     * @returns  {String}
      */
     getId(): string;
 
     /**
      * pass through to getId.
-     * @public
-     * @function id
-     * @returns {String}
      */
     id(): string;
 
     /**
      * retrieves the cleaned up url path.
      * e.g., /foo?a=1  =>  /foo
-     * @public
-     * @function getPath
-     * @returns  {String}
      */
     getPath(): string;
 
     /**
      * pass through to getPath.
-     * @public
-     * @function path
-     * @returns {String}
      */
     path(): string;
 
     /**
      * returns the raw query string
-     * @public
-     * @function getQuery
-     * @returns  {String}
      */
     getQuery(): string;
 
@@ -541,129 +440,84 @@ export interface Request extends http.IncomingMessage {
 
     /**
      * returns ms since epoch when request was setup.
-     * @public
-     * @function time
-     * @returns  {Number}
      */
     time(): number;
 
     /**
      * returns a parsed URL object.
-     * @public
-     * @function getUrl
-     * @returns  {Object}
      */
     getUrl(): url.Url;
 
     /**
      * returns the accept-version header.
-     * @public
-     * @function getVersion
-     * @returns  {String}
      */
     getVersion(): string;
 
     /**
      * pass through to getVersion.
-     * @public
-     * @function version
-     * @returns {String}
      */
     version(): string;
 
     /**
      * returns the version of the route that matched.
-     * @public
-     * @function matchedVersion
-     * @returns {String}
      */
     matchedVersion(): string;
 
     /**
      * returns any header off the request. also, 'correct' any
      * correctly spelled 'referrer' header to the actual spelling used.
-     * @public
-     * @function header
-     * @param    {String} name  the name of the header
-     * @param    {String} value default value if header isn't found on the req
-     * @returns  {String}
+     * @param    name  the name of the header
+     * @param    value default value if header isn't found on the req
      */
     header(name: string, value?: string): string;
 
     /**
      * returns any trailer header off the request. also, 'correct' any
      * correctly spelled 'referrer' header to the actual spelling used.
-     * @public
-     * @function trailer
-     * @param    {String} name  the name of the header
-     * @param    {String} value default value if header isn't found on the req
-     * @returns  {String}
+     * @param    name  the name of the header
+     * @param    value default value if header isn't found on the req
      */
     trailer(name: string, value?: string): string;
 
     /**
      * Check if the incoming request contains the Content-Type header field, and
      * if it contains the given mime type.
-     * @public
-     * @function is
-     * @param    {String} type  a content-type header value
-     * @returns  {Boolean}
+     * @param    type  a content-type header value
      */
     is(type: string): boolean;
 
     /**
      * Check if the incoming request is chunked.
-     * @public
-     * @function isChunked
-     * @returns  {Boolean}
      */
     isChunked(): boolean;
 
     /**
      * Check if the incoming request is kept alive.
-     * @public
-     * @function isKeepAlive
-     * @returns  {Boolean}
      */
     isKeepAlive(): boolean;
 
     /**
      * Check if the incoming request is encrypted.
-     * @public
-     * @function isSecure
-     * @returns  {Boolean}
      */
     isSecure(): boolean;
 
     /**
      * Check if the incoming request has been upgraded.
-     * @public
-     * @function isUpgradeRequest
-     * @returns  {Boolean}
      */
     isUpgradeRequest(): boolean;
 
     /**
      * Check if the incoming request is an upload verb.
-     * @public
-     * @function isUpload
-     * @returns  {Boolean}
      */
     isUpload(): boolean;
 
     /**
      * toString serialization
-     * @public
-     * @function toString
-     * @returns  {String}
      */
     toString(): string;
 
     /**
      * retrieves the user-agent header.
-     * @public
-     * @function userAgent
-     * @returns  {String}
      */
     userAgent(): string;
 
@@ -671,28 +525,19 @@ export interface Request extends http.IncomingMessage {
      * Start the timer for a request handler function. You must explicitly invoke
      * endHandlerTimer() after invoking this function. Otherwise timing information
      * will be inaccurate.
-     * @public
-     * @function startHandlerTimer
-     * @param    {String}    handlerName The name of the handler.
-     * @returns  {undefined}
+     * @param       handlerName The name of the handler.
      */
     startHandlerTimer(handlerName: string): void;
 
     /**
      * Stop the timer for a request handler function.
-     * @public
-     * @function endHandlerTimer
-     * @param    {String}    handlerName The name of the handler.
-     * @returns  {undefined}
+     * @param       handlerName The name of the handler.
      */
     endHandlerTimer(handlerName: string): void;
 
     /**
      * returns the connection state of the request. current valid values are
      * 'close' and 'aborted'.
-     * @public
-     * @function connectionState
-     * @returns {String}
      */
     connectionState(): string;
 
@@ -705,9 +550,6 @@ export interface Request extends http.IncomingMessage {
      *  versions: [],
      *  name: 'getpingname'
      * }
-     * @public
-     * @function getRoute
-     * @returns {Object}
      */
     getRoute(): RouteSpec;
 
@@ -741,74 +583,54 @@ export interface Response extends http.ServerResponse {
     /**
      * sets the cache-control header. `type` defaults to _public_,
      * and options currently only takes maxAge.
-     * @public
-     * @function cache
-     * @param    {String} type    value of the header
-     * @param    {Object} [options] an options object
-     * @returns  {String}         the value set to the header
+     * @param    type    value of the header
+     * @param    [options] an options object
+     * @returns          the value set to the header
      */
     cache(type: string, options?: CacheOptions): string;
 
     /**
      * sets the cache-control header. `type` defaults to _public_,
      * and options currently only takes maxAge.
-     * @public
-     * @function cache
-     * @param    {Object} [options] an options object
-     * @returns  {String}         the value set to the header
+     * @param    [options] an options object
+     * @returns          the value set to the header
      */
     cache(options?: CacheOptions): string;
 
     /**
      * turns off all cache related headers.
-     * @public
-     * @function noCache
-     * @returns  {Object} self, the response object
+     * @returns  self, the response object
      */
     noCache(): Response;
 
     /**
      * Appends the provided character set to the response's Content-Type.
      * e.g., res.charSet('utf-8');
-     * @public
-     * @function charSet
-     * @param    {String} type char-set value
-     * @returns  {Object} self, the response object
+     * @param    type char-set value
+     * @returns  self, the response object
      */
     charSet(type: string): Response;
 
     /**
      * retrieves a header off the response.
-     * @public
-     * @function get
-     * @param    {Object} name the header name
-     * @returns  {String}
+     * @param    name the header name
      */
     get(name: string): string;
 
     /**
      * retrieves all headers off the response.
-     * @public
-     * @function getHeaders
-     * @returns  {Object}
      */
     getHeaders(): any;
 
     /**
      * pass through to getHeaders.
-     * @public
-     * @function headers
-     * @returns  {Object}
      */
     headers(): any;
 
     /**
      * sets headers on the response.
-     * @public
-     * @function header
-     * @param    {String} name  the name of the header
-     * @param    {String} value the value of the header
-     * @returns  {Object}
+     * @param    name  the name of the header
+     * @param    value the value of the header
      */
     header(name: string, value?: any): any;
 
@@ -816,12 +638,9 @@ export interface Response extends http.ServerResponse {
      * short hand method for:
      *     res.contentType = 'json';
      *     res.send({hello: 'world'});
-     * @public
-     * @function json
-     * @param    {Number} code    http status code
-     * @param    {Object} object    value to json.stringify
-     * @param    {Object} [headers] headers to set on the response
-     * @returns  {Object}
+     * @param    code    http status code
+     * @param    object    value to json.stringify
+     * @param    [headers] headers to set on the response
      */
     json(code: number, object: any, headers?: { [header: string]: string }): any;
 
@@ -829,97 +648,77 @@ export interface Response extends http.ServerResponse {
      * short hand method for:
      *     res.contentType = 'json';
      *     res.send({hello: 'world'});
-     * @public
-     * @function json
-     * @param    {Object} object    value to json.stringify
-     * @param    {Object} [headers] headers to set on the response
-     * @returns  {Object}
+     * @param    object    value to json.stringify
+     * @param    [headers] headers to set on the response
      */
     json(object: any, headers?: { [header: string]: string }): any;
 
     /**
      * sets the link heaader.
-     * @public
-     * @function link
-     * @param    {String} l   the link key
-     * @param    {String} rel the link value
-     * @returns  {String}     the header value set to res
+     * @param    l   the link key
+     * @param    rel the link value
+     * @returns      the header value set to res
      */
     link(l: string, rel: string): string;
 
     /**
      * sends the response object. pass through to internal __send that uses a
      * formatter based on the content-type header.
-     * @public
-     * @function send
-     * @param    {Number} [code] http status code
-     * @param    {Object | Buffer | Error} [body] the content to send
-     * @param    {Object} [headers]  any add'l headers to set
-     * @returns  {Object} the response object
+     * @param    [code] http status code
+     * @param    [body] the content to send
+     * @param    [headers]  any add'l headers to set
+     * @returns  the response object
      */
     send(code?: any, body?: any, headers?: { [header: string]: string }): any;
 
     /**
      * sends the response object. pass through to internal __send that skips
      * formatters entirely and sends the content as is.
-     * @public
-     * @function sendRaw
-     * @param    {Number} [code] http status code
-     * @param    {Object | Buffer | Error} [body] the content to send
-     * @param    {Object} [headers]  any add'l headers to set
-     * @returns  {Object} the response object
+     * @param    [code] http status code
+     * @param    [body] the content to send
+     * @param    [headers]  any add'l headers to set
+     * @returns  the response object
      */
     sendRaw(code?: any, body?: any, headers?: { [header: string]: string }): any;
 
     /**
      * sets a header on the response.
-     * @public
-     * @function set
-     * @param    {String} name name of the header
-     * @param    {String} val  value of the header
-     * @returns  {Object}      self, the response object
+     * @param    name name of the header
+     * @param    val  value of the header
+     * @returns       self, the response object
      */
     set(name: string, val: string): Response;
 
     /**
      * sets the http status code on the response.
-     * @public
-     * @function status
-     * @param    {Number} code http status code
-     * @returns  {Number}     the status code passed in
+     * @param    code http status code
+     * @returns      the status code passed in
      */
     status(code: number): number;
 
     /**
      * toString() serialization.
-     * @public
-     * @function toString
-     * @returns  {String}
      */
     toString(): string;
 
-    /** redirect is sugar method for redirecting.
+    /**
+     * redirect is sugar method for redirecting.
      * res.redirect(301, 'www.foo.com', next);
      * `next` is mandatory, to complete the response and trigger audit logger.
-     * @public
-     * @param    {Number}   code the status code
-     * @param    {String}   url to redirect to
-     * @param    {Function} next fn
+     * @param      code the status code
+     * @param      url to redirect to
+     * @param    next fn
      * @emits    redirect
-     * @function redirect
-     * @return   {undefined}
      */
     redirect(code: number, url: string, next: Next): void;
 
-    /** redirect is sugar method for redirecting.
+    /**
+     * redirect is sugar method for redirecting.
      * res.redirect({...}, next);
      * `next` is mandatory, to complete the response and trigger audit logger.
-     * @public
-     * @param    {Object | String}   options the options or url to redirect to
-     * @param    {Function} next fn
+     * @param      options the options or url to redirect to
+     * @param    next fn
      * @emits    redirect
-     * @function redirect
-     * @return   {undefined}
      */
     redirect(options: object | string, next: Next): void;
 
@@ -932,9 +731,6 @@ export interface Response extends http.ServerResponse {
     /** short hand for the header content-type. */
     contentType: string;
 
-    /** response headers. */
-    headers: any;
-
     /** A unique request id (x-request-id). */
     id: string;
 }
@@ -1076,9 +872,6 @@ export namespace plugins {
          */
         function context(): RequestHandler;
 
-        /**
-         *
-         */
         function dedupeSlashes(): RequestHandler;
 
         /**
@@ -1140,9 +933,6 @@ export namespace plugins {
          */
         printLog?: boolean;
 
-        /**
-         *
-         */
         body?: boolean;
     }
 
@@ -1232,14 +1022,8 @@ export namespace plugins {
          */
         rejectUnknown?: boolean;
 
-        /**
-         *
-         */
         reviver?: any;
 
-        /**
-         *
-         */
         maxFieldsSize?: number;
     }
 
@@ -1376,7 +1160,7 @@ export namespace plugins {
     function gzipResponse(options?: any): RequestHandler;
 
     interface ServeStatic {
-        appendRequestPath?: boolean | undefined;
+        appendRequestPath?: boolean;
         directory?: string;
         maxAge?: number;
         match?: any;
@@ -1409,9 +1193,6 @@ export namespace plugins {
          */
         err: Error;
 
-        /**
-         *
-         */
         metrics: MetricsCallbackOptions;
 
         req: Request;
@@ -1522,9 +1303,6 @@ export namespace pre {
      */
     function context(): RequestHandler;
 
-    /**
-     *
-     */
     function dedupeSlashes(): RequestHandler;
 
     /**
diff --git a/types/restify/tslint.json b/types/restify/tslint.json
index f93cf8562a..f0f7a6f17a 100644
--- a/types/restify/tslint.json
+++ b/types/restify/tslint.json
@@ -1,3 +1,7 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "no-unnecessary-class": false
+    }
 }
diff --git a/types/restify/v4/index.d.ts b/types/restify/v4/index.d.ts
index 37c2b11487..877300c23a 100644
--- a/types/restify/v4/index.d.ts
+++ b/types/restify/v4/index.d.ts
@@ -36,101 +36,68 @@ export interface requestAuthorization {
 export interface Request extends http.IncomingMessage {
     /**
      * builds an absolute URI for the request.
-     * @private
-     * @function absoluteUri
-     * @param    {String} path a url path
-     * @returns  {String}
+     * @param    path a url path
      */
     absoluteUri(path: string): string;
 
     /**
      * returns any header off the request. also, 'correct' any
      * correctly spelled 'referrer' header to the actual spelling used.
-     * @public
-     * @function header
-     * @param    {String} name  the name of the header
-     * @param    {String} value default value if header isn't found on the req
-     * @returns  {String}
+     * @param    name  the name of the header
+     * @param    value default value if header isn't found on the req
      */
     header(name: string, value?: string): string;
 
     /**
      * returns any trailer header off the request. also, 'correct' any
      * correctly spelled 'referrer' header to the actual spelling used.
-     * @public
-     * @function trailer
-     * @param    {String} name  the name of the header
-     * @param    {String} value default value if header isn't found on the req
-     * @returns  {String}
+     * @param    name  the name of the header
+     * @param    value default value if header isn't found on the req
      */
     trailer(name: string, value?: string): string;
 
     /**
      * checks if the accept header is present and has the value requested.
      * e.g., req.accepts('html');
-     * @public
-     * @function accepts
-     * @param    {String | Array} types an array of accept type headers
-     * @returns  {Boolean}
+     * @param    types an array of accept type headers
      */
     accepts(types: string | string[]): boolean;
 
     /**
      * checks if the request accepts the encoding types.
-     * @public
-     * @function acceptsEncoding
-     * @param    {String | Array} types an array of accept type headers
-     * @returns  {Boolean}
+     * @param    types an array of accept type headers
      */
     acceptsEncoding(types: string | string[]): boolean;
 
     /**
      * Check if the incoming request contains the Content-Type header field, and
      * if it contains the given mime type.
-     * @public
-     * @function is
-     * @param    {String} type  a content-type header value
-     * @returns  {Boolean}
+     * @param    type  a content-type header value
      */
     is(type: string): boolean;
 
     /**
      * Check if the incoming request is chunked.
-     * @public
-     * @function isChunked
-     * @returns  {Boolean}
      */
     isChunked(): boolean;
 
     /**
      * Check if the incoming request is kept alive.
-     * @public
-     * @function isKeepAlive
-     * @returns  {Boolean}
      */
     isKeepAlive(): boolean;
 
     /**
      * Check if the incoming request has been upgraded.
-     * @public
-     * @function isUpgradeRequest
-     * @returns  {Boolean}
      */
     isUpgradeRequest(): boolean;
 
     /**
      * Check if the incoming request is an upload verb.
-     * @public
-     * @function isUpload
-     * @returns  {Boolean}
      */
     isUpload(): boolean;
 
     /**
      * retrieves the user-agent header.
-     * @public
-     * @function userAgent
-     * @returns  {String}
      */
     userAgent(): string;
 
@@ -138,19 +105,13 @@ export interface Request extends http.IncomingMessage {
      * Start the timer for a request handler function. You must explicitly invoke
      * endHandlerTimer() after invoking this function. Otherwise timing information
      * will be inaccurate.
-     * @public
-     * @function startHandlerTimer
-     * @param    {String}    handlerName The name of the handler.
-     * @returns  {undefined}
+     * @param       handlerName The name of the handler.
      */
     startHandlerTimer(handlerName: string): void;
 
     /**
      * Stop the timer for a request handler function.
-     * @public
-     * @function endHandlerTimer
-     * @param    {String}    handlerName The name of the handler.
-     * @returns  {undefined}
+     * @param       handlerName The name of the handler.
      */
     endHandlerTimer(handlerName: string): void;
 
@@ -158,23 +119,16 @@ export interface Request extends http.IncomingMessage {
 
     /**
      * gets the content-length header off the request.
-     * @public
-     * @function getContentLength
-     * @returns {Number}
      */
     getContentLength(): number;
 
     /**
      * @see getContentLength
-     * @function contentLength
      */
     contentLength(): number;
 
     /**
      * gets the content-type header.
-     * @public
-     * @function getContentType
-     * @returns {String}
      */
     getContentType(): string;
 
@@ -185,9 +139,6 @@ export interface Request extends http.IncomingMessage {
 
     /**
      * retrieves the complete URI requested by the client.
-     * @public
-     * @function getHref
-     * @returns {String}
      */
     getHref(): string;
 
@@ -199,9 +150,6 @@ export interface Request extends http.IncomingMessage {
     log: Logger;
     /**
      * retrieves the request uuid. was created when the request was setup.
-     * @public
-     * @function getId
-     * @returns  {String}
      */
     getId(): string;
 
@@ -213,9 +161,6 @@ export interface Request extends http.IncomingMessage {
     /**
      * retrieves the cleaned up url path.
      * e.g., /foo?a=1  =>  /foo
-     * @public
-     * @function getPath
-     * @returns  {String}
      */
     getPath(): string;
 
@@ -226,9 +171,6 @@ export interface Request extends http.IncomingMessage {
 
     /**
      * returns the raw query string
-     * @public
-     * @function getQuery
-     * @returns  {String}
      */
     getQuery(): string;
 
@@ -241,25 +183,16 @@ export interface Request extends http.IncomingMessage {
 
     /**
      * returns ms since epoch when request was setup.
-     * @public
-     * @function time
-     * @returns  {Number}
      */
     time(): number;
 
     /**
      * returns a parsed URL object.
-     * @public
-     * @function getUrl
-     * @returns  {Object}
      */
     getUrl(): url.Url;
 
     /**
      * returns the accept-version header.
-     * @public
-     * @function getVersion
-     * @returns  {String}
      */
     getVersion(): string;
 
@@ -272,9 +205,6 @@ export interface Request extends http.IncomingMessage {
 
     /**
      * Check if the incoming request is encrypted.
-     * @public
-     * @function isSecure
-     * @returns  {Boolean}
      */
     isSecure(): boolean;
     /** available when bodyParser plugin is used */
@@ -290,8 +220,6 @@ export interface Request extends http.IncomingMessage {
 /**
  * Timer object used to identify how long a specific handler took to run
  *
- * @property {String} name The name of the handler.
- * @property {Array} time A tuple of [seconds, nanoseconds], how long the handler took.
  */
 export interface HandlerTiming {
     name: string;
@@ -362,33 +290,31 @@ export interface Router {
 
     /**
      * Takes an object of route params and query params, and 'renders' a URL
-     * @param    {String} routeName the route name
-     * @param    {Object} params    an object of route params
-     * @param    {Object} query     an object of query params
-     * @returns  {String}
+     * @param    routeName the route name
+     * @param    params    an object of route params
+     * @param    query     an object of query params
      */
     render(routeName: string, params: any, query?: any): string;
 
     /**
      * adds a route.
-     * @param    {Object} options an options object
-     * @returns  {String}         returns the route name if creation is successful.
+     * @param    options an options object
+     * @returns          returns the route name if creation is successful.
      */
     mount(options: any): string | boolean;
 
     /**
      * unmounts a route.
-     * @param    {String} name the route name
-     * @returns  {String}      the name of the deleted route (or false if it was not matched)
+     * @param    name the route name
+     * @returns       the name of the deleted route (or false if it was not matched)
      */
     unmount(name: string): string | boolean;
 
     /**
      * finds the route for a given request and response.
-     * @param    {Request}  req      the request object
-     * @param    {Response} res      the response object
-     * @param    {Function} callback operation callback
-     * @returns  {undefined}
+     * @param     req      the request object
+     * @param    res      the response object
+     * @param    callback operation callback
      */
     find(req: Request, res: Response, callback: (err: Error, route: Route) => void): void;
 }
diff --git a/types/restify/v4/tslint.json b/types/restify/v4/tslint.json
index ef6af29df5..6f99b78fae 100644
--- a/types/restify/v4/tslint.json
+++ b/types/restify/v4/tslint.json
@@ -2,6 +2,7 @@
 	"extends": "dtslint/dt.json",
 	"rules": {
 		// TODO
+		"no-unnecessary-class": false,
 		"no-var-keyword": false
 	}
 }
diff --git a/types/restler/tslint.json b/types/restler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/restler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/restling/index.d.ts b/types/restling/index.d.ts
index 02a083078a..79bc2d8c2c 100644
--- a/types/restling/index.d.ts
+++ b/types/restling/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/lucasfeliciano/restling
 // Definitions by: Alessandro vergani <https://github.com/loghorn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Promise from "bluebird";
 import * as Restler from "restler";
@@ -9,105 +10,104 @@ import { ServerResponse } from "http";
 
 /**
  * Create a DELETE request.
- * @param {string}          url     A url address.
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param  options Options.
+ * @return  Result.
  */
 export function del(url: string, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Create a GET request.
- * @param {string}          url     A url address.
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param  options Options.
+ * @return  Result.
  */
 export function get(url: string, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Create a HEAD request.
- * @param {string}          url     A url address.
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param  options Options.
+ * @return  Result.
  */
 export function head(url: string, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Send json data via GET method.
- * @param {string}          url     A url address.
- * @param {any}             data    JSON body
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param             data    JSON body
+ * @param  options Options.
+ * @return  Result.
  */
 export function json(url: string, data?: any, options?: RestlingOptions, method?: string): Promise<RestlingResult>;
 
 /**
  * Create a PATCH request.
- * @param {string}          url     A url address.
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param  options Options.
+ * @return  Result.
  */
 export function patch(url: string, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Send json  data  via PATCH method.
- * @param {string}          url     A url address.
- * @param {any}             data    JSON body
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param             data    JSON body
+ * @param  options Options.
+ * @return  Result.
  */
 export function patchJson(url: string, data?: any, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Create a POST request.
- * @param {string}          url     A url address.
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param  options Options.
+ * @return  Result.
  */
 export function post(url: string, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Send json data via POST method.
- * @param {string}          url     A url address.
- * @param {any}             data    JSON body
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param             data    JSON body
+ * @param  options Options.
+ * @return  Result.
  */
 export function postJson(url: string, data?: any, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Create a PUT request.
- * @param {string}          url     A url address.
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param  options Options.
+ * @return  Result.
  */
 export function put(url: string, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Send json data via PUT method.
- * @param {string}          url     A url address.
- * @param {any}             data    JSON body
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param             data    JSON body
+ * @param  options Options.
+ * @return  Result.
  */
 export function putJson(url: string, data?: any, options?: RestlingOptions): Promise<RestlingResult>;
 
 /**
  * Create a request.
- * @param {string}          url     A url address.
- * @param {RestlingOptions}  options Options.
- * @return {Promise<RestlingResult>}  Result.
+ * @param          url     A url address.
+ * @param  options Options.
+ * @return  Result.
  */
 export function request(url: string, options?: RestlingOptions): Promise<RestlingResult>;
 
-export function settleAsync(requests: [{ url: string, options?: RestlingOptions }]): Promise<[RestlingResult]>;
+export function settleAsync(requests: Array<{ url: string, options?: RestlingOptions }>): Promise<[RestlingResult]>;
 export function settleAsync(requests: { [key: string]: { url: string, options?: RestlingOptions } }): Promise<{ [key: string]: RestlingResult }>;
 
-export function allAsync(requests: [{ url: string, options?: RestlingOptions }]): Promise<[RestlingResult]>;
+export function allAsync(requests: Array<{ url: string, options?: RestlingOptions }>): Promise<[RestlingResult]>;
 export function allAsync(requests: { [key: string]: { url: string, options?: RestlingOptions } }): Promise<{ [key: string]: RestlingResult }>;
 
 /**
  * Interface for the result.
- * @interface
  */
 export interface RestlingResult {
     data?: any;
@@ -116,7 +116,6 @@ export interface RestlingResult {
 
 /**
  * Interface for the header.
- * @interface
  */
 export interface RestlerOptionsHeader {
     [headerName: string]: string;
@@ -124,109 +123,91 @@ export interface RestlerOptionsHeader {
 
 /**
  * Interface for restler options.
- * @interface
  */
 export interface RestlingOptions {
     /**
      * OAuth Bearer Token.
-     * @type {string}
      */
     accessToken?: string;
 
     /**
      *  HTTP Agent instance to use. If not defined globalAgent will be used. If false opts out of connection pooling with an Agent, defaults request to Connection: close.
-     * @type {any}
      */
     agent?: any;
 
     /**
      * A http.Client instance if you want to reuse or implement some kind of connection pooling.
-     * @type {any}
      */
     client?: any;
 
     /**
      * Data to be added to the body of the request.
-     * @type {any}
      */
     data?: any;
 
     /**
      * Encoding of the response body
-     * @type {string}
      */
     decoding?: string;
 
     /**
      * Encoding of the request body.
-     * @type {string}
      */
     encoding?: string;
 
     /**
      * If set will recursively follow redirects.
-     * @type {boolean}
      */
     followRedirects?: boolean;
 
     /**
      * A hash of HTTP headers to be sent.
-     * @type {RestlerOptionsHeader}
      */
     headers?: RestlerOptionsHeader;
 
     /**
      * Request method
-     * @type {string}
      */
     method?: string;
 
     /**
      * If set the data passed will be formatted as <code>multipart/form-encoded</code>.
-     * @type {boolean}
      */
     multipart?: boolean;
 
     /**
      * A function that will be called on the returned data. Use any of predefined <code>restler.parsers</code>.
-     * @type {any}
      */
     parser?: any;
 
     /**
      * Basic auth password.
-     * @type {string}
      */
     password?: string;
 
     /**
      * Query string variables as a javascript object, will override the querystring in the URL.
-     * @type {any}
      */
     query?: any;
 
     /**
      * If true, the server certificate is verified against the list of supplied CAs.
      * An 'error' event is emitted if verification fails. Verification happens at the connection level, before the HTTP request is sent.
-     * @type {boolean}
      */
     rejectUnauthorized?: boolean;
 
     /**
      * Emit the timeout event when the response does not return within the said value (in ms).
-     * @type {number}
      */
     timeout?: number;
 
     /**
      * Basic auth username.
-     * @type {string}
      */
     username?: string;
 
     /**
      * Options for xml2js.
-     * @type {any}
      */
     xml2js?: any;
 }
diff --git a/types/resumablejs/tslint.json b/types/resumablejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/resumablejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index f27b91b775..4ef00ecb09 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -2,7 +2,8 @@
 // Project: http://rethinkdb.com/
 // Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
+// TypeScript Version: 2.3
+
 // Reference: https://rethinkdb.com/api/javascript/
 //
 // Notes:
@@ -238,11 +239,12 @@ declare module "rethinkdb" {
         indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;
         indexDrop(name: string): Operation<DropResult>;
         indexList(): Operation<string[]>;
+        indexWait(name?: string): Operation<Array<{ index: string, ready: true, function: number, multi: boolean, geo: boolean, outdated: boolean }>>;
 
         insert(obj: any[], options?: InsertOptions): Operation<WriteResult>;
         insert(obj: any, options?: InsertOptions): Operation<WriteResult>;
 
-        get(key: string): Sequence; // primary key
+        get<TObjectType extends object>(key: string): Operation<TObjectType | null> & Writeable;
         getAll(key: string, index?: Index): Sequence; // without index defaults to primary key
         getAll(...keys: string[]): Sequence;
         wait(WaitOptions?: WaitOptions): WaitResult;
diff --git a/types/rethinkdb/tslint.json b/types/rethinkdb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rethinkdb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/retry/index.d.ts b/types/retry/index.d.ts
index cc5e8b57ee..97729cec2d 100644
--- a/types/retry/index.d.ts
+++ b/types/retry/index.d.ts
@@ -8,12 +8,11 @@ export interface RetryOperation {
   /**
    * Defines the function that is to be retried and executes it for the first time right away.
    *
-   * @param {function} callback The function that is to be retried
-   * @param {number} callback.current Number of attempts callback has been executed so far.
-   * @param {number} [options.timeout] A timeout in milliseconds.
-   * @param {function} [options.callback] Callback to execute when the operation takes longer than the timeout.
+   * @param callback The function that is to be retried
+   * @param callback.current Number of attempts callback has been executed so far.
+   * @param [options.timeout] A timeout in milliseconds.
+   * @param [options.callback] Callback to execute when the operation takes longer than the timeout.
    *
-   * @return {void}
    */
   attempt(callback: (current: number) => void, options?: AttemptOptions): void;
 
@@ -21,16 +20,13 @@ export interface RetryOperation {
    * Returns false when no error value is given, or the maximum amount of retries has been reached.
    * Otherwise it returns true, and retries the operation after the timeout for the current attempt number.
    *
-   * @param {Error} [err]
    *
-   * @return {boolean}
    */
   retry(err?: Error): boolean;
 
   /**
    * The number of attempts it took to call the retrying function before it was successful.
    *
-   * @return {number}
    */
   attempts(): number;
 
@@ -38,14 +34,13 @@ export interface RetryOperation {
    * A reference to the error object that occured most frequently.
    * Errors are compared using the error.message property.
    *
-   * @return {(Error|null)} If no errors occured so far the value will be null.
+   * @return If no errors occured so far the value will be null.
    */
   mainError(): Error | null;
 
   /**
    * Returns an array of all errors that have been passed to RetryOperation.retry() so far.
    *
-   * @return {Error[]}
    */
   errors(): Error[];
 
@@ -63,39 +58,48 @@ export interface AttemptOptions {
 /**
  * Create a new RetryOperation object.
  *
- * @param {number} [options.retries=10] The maximum amount of times to retry the operation.
- * @param {number} [options.factor=2] The exponential factor to use.
- * @param {number} [options.minTimeout=1000] The number of milliseconds before starting the first retry.
- * @param {number} [options.maxTimeout=Infinity] The maximum number of milliseconds between two retries.
- * @param {boolean} [options.randomize=false] Randomizes the timeouts by multiplying a factor between 1-2.
- * @param {boolean} [options.forever=false] Wether to retry forever.
- * @param {boolean} [options.unref=false] Wether to unref the setTimeout's.
+ * @param [options.retries=10] The maximum amount of times to retry the operation.
+ * @param [options.factor=2] The exponential factor to use.
+ * @param [options.minTimeout=1000] The number of milliseconds before starting the first retry.
+ * @param [options.maxTimeout=Infinity] The maximum number of milliseconds between two retries.
+ * @param [options.randomize=false] Randomizes the timeouts by multiplying a factor between 1-2.
+ * @param [options.forever=false] Wether to retry forever.
+ * @param [options.unref=false] Wether to unref the setTimeout's.
  *
- * @return {RetryOperation}
  */
 export function operation(options?: OperationOptions): RetryOperation;
 
 export interface OperationOptions {
+    /**
+     * The maximum amount of times to retry the operation.
+     * @default 10
+     */
     retries?: number;
+    /**
+     * The exponential factor to use.
+     * @default 2
+     */
     factor?: number;
+    /**
+     * The number of milliseconds before starting the first retry.
+     * @default 1000
+     */
     minTimeout?: number;
+    /**
+     * The maximum number of milliseconds between two retries.
+     * @default Infinity
+     */
     maxTimeout?: number;
+    /**
+     * Randomizes the timeouts by multiplying a factor between 1-2.
+     * @default false
+     */
     randomize?: boolean;
     forever?: boolean;
     unref?: boolean;
 }
 
-/**
- * Get an array with timeouts and their return values in milliseconds.
- *
- * @param {number} [options.retries=10] The maximum amount of times to retry the operation.
- * @param {number} [options.factor=2] The exponential factor to use.
- * @param {number} [options.minTimeout=1000] The number of milliseconds before starting the first retry.
- * @param {number} [options.maxTimeout=Infinity] The maximum number of milliseconds between two retries.
- * @param {boolean} [options.randomize=false] Randomizes the timeouts by multiplying a factor between 1-2.
- *
- * @return {number[]}
- */
+/** Get an array with timeouts and their return values in milliseconds. */
 export function timeouts(options?: TimeoutsOptions): number[];
 
 export interface TimeoutsOptions {
@@ -109,46 +113,77 @@ export interface TimeoutsOptions {
 /**
  * Create a new timeout (in milliseconds) based on the given parameters.
  *
- * @param {number} attempt  Representing for which retry the timeout should be calculated.
- * @param {number} [options.factor=2] The exponential factor to use.
- * @param {number} [options.minTimeout=1000] The number of milliseconds before starting the first retry.
- * @param {number} [options.maxTimeout=Infinity] The maximum number of milliseconds between two retries.
- * @param {boolean} [options.randomize=false] Randomizes the timeouts by multiplying a factor between 1-2.
- *
- * @return {number} timeout
+ * @param attempt  Representing for which retry the timeout should be calculated.
+ * @return timeout
  */
 export function createTimeout(attempt: number, options?: CreateTimeoutOptions): number;
 
 export interface CreateTimeoutOptions {
+    /**
+     * The exponential factor to use.
+     * @default 2
+     */
     factor?: number;
+    /**
+     * The number of milliseconds before starting the first retry.
+     * @default 1000
+     */
     minTimeout?: number;
+    /**
+     * The maximum number of milliseconds between two retries.
+     * @default Infinity
+     */
     maxTimeout?: number;
+    /**
+     * Randomizes the timeouts by multiplying a factor between 1-2.
+     * @default false
+     */
     randomize?: boolean;
 }
 
 /**
  * Wrap all functions of the object with retry.
  *
- * @param {object} object The object to be wrapped
- * @param {number} [options.retries=10] The maximum amount of times to retry the operation.
- * @param {number} [options.factor=2] The exponential factor to use.
- * @param {number} [options.minTimeout=1000] The number of milliseconds before starting the first retry.
- * @param {number} [options.maxTimeout=Infinity] The maximum number of milliseconds between two retries.
- * @param {boolean} [options.randomize=false] Randomizes the timeouts by multiplying a factor between 1-2.
- * @param {boolean} [options.forever=false] Wether to retry forever.
- * @param {boolean} [options.unref=false] Wether to unref the setTimeout's.
- * @param {string[]} [methods] Methods which need to be wrapped
+ * @param object The object to be wrapped
+ * @param methods Methods which need to be wrapped
  *
- * @return {void}
  */
 export function wrap(object: object, options?: WrapOptions, methods?: string[]): void;
 
 export interface WrapOptions {
+    /**
+     * The maximum amount of times to retry the operation.
+     * @default 10
+     */
     retries?: number;
+    /**
+     * The exponential factor to use.
+     * @default 2
+     */
     factor?: number;
+    /**
+     * The number of milliseconds before starting the first retry.
+     * @default 1000
+     */
     minTimeout?: number;
+    /**
+     * The maximum number of milliseconds between two retries.
+     * @default Infinity
+     */
     maxTimeout?: number;
+    /**
+     * Randomizes the timeouts by multiplying a factor between 1-2.
+     * @default false
+     */
     randomize?: boolean;
+    /**
+     * Whether to retry forever.
+     * @default false
+     */
     forever?: boolean;
+    /**
+     * Whether to unref the setTimeout's.
+     * @default false
+     */
     unref?: boolean;
 }
diff --git a/types/revalidator/tslint.json b/types/revalidator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/revalidator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/reveal/tslint.json b/types/reveal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/reveal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rfc2047/index.d.ts b/types/rfc2047/index.d.ts
index 224ec8bbd0..a7b05e08fc 100644
--- a/types/rfc2047/index.d.ts
+++ b/types/rfc2047/index.d.ts
@@ -5,14 +5,14 @@
 
 /**
  * Decode
- * @param  {string} encodedText Encoded Text
- * @return {string} Decoded Text
+ * @param encodedText Encoded Text
+ * @return Decoded Text
  */
 export function decode(encodedText: string): string;
 
 /**
  * Encode
- * @param  {string} decodedText Decoded Text
- * @return {string} Encoded Text
+ * @param decodedText Decoded Text
+ * @return Encoded Text
  */
 export function encode(decodedText: string): string;
diff --git a/types/rickshaw/tslint.json b/types/rickshaw/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rickshaw/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/riot-api-nodejs/tslint.json b/types/riot-api-nodejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/riot-api-nodejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/riot-games-api/tslint.json b/types/riot-games-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/riot-games-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/riot/index.d.ts b/types/riot/index.d.ts
index 079132db72..2a7a22b596 100644
--- a/types/riot/index.d.ts
+++ b/types/riot/index.d.ts
@@ -66,8 +66,8 @@ export interface StyleManager {
 
     /**
      * Save a tag style to be later injected into DOM
-     * @param {string} css - css string
-     * @param {string} name - if it's passed the css will be mapped to a tagname
+     * @param css - css string
+     * @param name - if it's passed the css will be mapped to a tagname
      */
     add(css: string, name?: string): void;
 
@@ -109,7 +109,7 @@ export interface DOMUtil {
     /**
      * Check if a DOM node is an svg element
      * @param element - node to check
-     * @returns { boolean } True if element is an svg element
+     * @returns True if element is an svg element
      */
     isSvg(element: Element): element is SVGElement;
 
@@ -715,7 +715,7 @@ export function compile(callback: () => void): void;
  * Compiles the given tag but doesn't execute it, if `skipExecution` parameter is `true`
  * @param tag Tag definition
  * @param skipExecution If `true` tag is not executed after compilation
- * @return {string} Compiled JavaScript as string
+ * @return Compiled JavaScript as string
  */
 export function compile(tag: string, skipExecution?: boolean): string;
 
diff --git a/types/riotcontrol/tslint.json b/types/riotcontrol/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/riotcontrol/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/riotjs/tslint.json b/types/riotjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/riotjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rison/tslint.json b/types/rison/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rison/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rollup-plugin-json/index.d.ts b/types/rollup-plugin-json/index.d.ts
new file mode 100644
index 0000000000..150da4f1d3
--- /dev/null
+++ b/types/rollup-plugin-json/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for rollup-plugin-json 2.3
+// Project: https://github.com/rollup/rollup-plugin-json#readme
+// Definitions by: Andy Mockler <https://github.com/asmockler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'rollup';
+
+export interface Options {
+    include?: string | string[];
+    exclude?: string | string[];
+    preferConst?: boolean;
+    indent?: string;
+}
+
+export default function json(options?: Options): Plugin;
diff --git a/types/rollup-plugin-json/rollup-plugin-json-tests.ts b/types/rollup-plugin-json/rollup-plugin-json-tests.ts
new file mode 100644
index 0000000000..50baf7f03f
--- /dev/null
+++ b/types/rollup-plugin-json/rollup-plugin-json-tests.ts
@@ -0,0 +1,3 @@
+import json from 'rollup-plugin-json';
+
+json(); // $ExpectType Plugin
diff --git a/types/rollup-plugin-json/tsconfig.json b/types/rollup-plugin-json/tsconfig.json
new file mode 100644
index 0000000000..92ef3a1a1f
--- /dev/null
+++ b/types/rollup-plugin-json/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rollup-plugin-json-tests.ts"
+    ]
+}
diff --git a/types/rollup-plugin-json/tslint.json b/types/rollup-plugin-json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rollup-plugin-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rollup/index.d.ts b/types/rollup/index.d.ts
index 0f7a3e2163..fcd5f799c3 100644
--- a/types/rollup/index.d.ts
+++ b/types/rollup/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for rollup 0.41
+// Type definitions for rollup 0.51
 // Project: https://github.com/rollup/rollup
-// Definitions by: Philipp A. <https://github.com/flying-sheep>
+// Definitions by: Philipp A. <https://github.com/flying-sheep>, Christian Svensson <https://github.com/csvn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { RawSourceMap } from 'source-map'
 import * as acorn from 'acorn'
 
 export type Format = 'amd' | 'cjs' | 'es' | 'iife' | 'umd'
+export const VERSION: string
 
 export interface SourceMap extends RawSourceMap {
 	toString(): string
@@ -23,15 +24,20 @@ export interface Warning {
 
 export interface BundleOptions {
 	/** The format of the generated bundle. */
-	format?: Format
+	format: Format
 	/** What export mode to use. Defaults to auto, which guesses your intentions based on what the `entry` module exports. */
 	exports?: 'auto' | 'default' | 'named' | 'none'
 	/** An ID to use for AMD/UMD bundles. */
 	moduleId?: string
 	/** The name to use for the module for UMD/IIFE bundles (required for bundles with exports). */
-	moduleName?: string
+	name?: string
 	/** Mapping of IDs → global variable names. Used for UMD/IIFE bundles. */
-	globals?: { [id: string]: string }
+	globals?: ((id: string) => string) | { [id: string]: string }
+	/**
+	 * Function that takes an ID and returns a path, or Object of id: path pairs.
+	 * Where supplied, these paths will be used in the generated bundle instead of the module ID, allowing you to (for example) load dependencies from a CDN.
+	 */
+	paths?: ((id: string) => string) | { [id: string]: string }
 	/**
 	 * The indent string to use, for formats that require code to be indented (AMD, IIFE, UMD).
 	 * Can also be false (no indent), or true (the default – auto-indent)
@@ -55,38 +61,38 @@ export interface BundleOptions {
 	 * Whether to include the 'use strict' pragma at the top of generated non-ES6 bundles.
 	 * Strictly-speaking (geddit?), ES6 modules are always in strict mode, so you shouldn't disable this without good reason.
 	 */
-	useStrict?: boolean
+	strict?: boolean
 }
 
 export interface GenerateOptions extends BundleOptions {
 	/** Whether to generate a sourcemap. If true, the return value from `bundle.generate(...)` will include a map property */
-	sourceMap?: boolean
+	sourcemap?: boolean
 	/**
 	 * The location of the generated bundle. If this is an absolute path, all the sources paths in the sourcemap will be relative to it.
-	 * The map.file property is the basename of sourceMapFile, as the location of the sourcemap is assumed to be adjacent to the bundle.
+	 * The map.file property is the basename of sourcemapFile, as the location of the sourcemap is assumed to be adjacent to the bundle.
 	 */
-	sourceMapFile?: string
+	sourcemapFile?: string
 }
 
 export interface WriteOptions extends BundleOptions {
-	/** The file to write to. If `options.sourceMap === true`, two files will be created – `dest` and `dest + '.map`. */
-	dest: string
-	/** If `true`, a separate sourcemap file will be created. If `'inline'`, the sourcemap will be appended to the resulting dest file as a data URI. */
-	sourceMap?: boolean | 'inline'
-	/** This option is unnecessary, as it defaults to the value of dest. */
-	sourceMapFile?: string
+	/** The file to write to. If `options.sourcemap === true`, two files will be created – `file` and `file + '.map`. */
+	file: string
+	/** If `true`, a separate sourcemap file will be created. If `'inline'`, the sourcemap will be appended to the resulting file as a data URI. */
+	sourcemap?: boolean | 'inline'
+	/** This option is unnecessary, as it defaults to the value of file. */
+	sourcemapFile?: string
 }
 
 export interface Bundle {
 	/** Generate bundled code as an object */
-	generate(options: GenerateOptions): { code: string, map: SourceMap }
+	generate(options: GenerateOptions): Promise<{ code: string, map: SourceMap | null }>
 	/** writes the file (and accompanying sourcemap file, if appropriate) to the file system. */
 	write(options: WriteOptions): Promise<void>
 }
 
 export interface Options {
 	/** The bundle's entry point (e.g. your `main.js` or `app.js` or `index.js`) */
-	entry: string | string[]
+	input: string
 	/** A previous bundle. Use it to speed up subsequent bundles :) */
 	cache?: Bundle
 	/**
@@ -94,11 +100,6 @@ export interface Options {
 	 * The IDs should be either the name of an external dependency or a resolved ID (like an absolute path to a file)
 	 */
 	external?: ((id: string) => boolean) | string[]
-	/**
-	 * Function that takes an ID and returns a path, or Object of id: path pairs.
-	 * Where supplied, these paths will be used in the generated bundle instead of the module ID, allowing you to (for example) load dependencies from a CDN.
-	 */
-	paths?: ((id: string) => string) | { [id: string]: string }
 	/** Function that will intercept warning messages. If not supplied, warnings will be deduplicated and printed to the console. */
 	onwarn?(warning: Warning): void
 	/** Array of plugin objects or a single plugin object */
@@ -118,6 +119,10 @@ export interface Options {
 	legacy?: boolean
 }
 
+export interface ConfigFileOptions extends Options {
+	output: WriteOptions | WriteOptions[]
+}
+
 // https://github.com/rollup/rollup/wiki/Plugins#creating-plugins
 export interface Plugin {
 	/** The name of the plugin, for use in error messages and warnings */
@@ -131,11 +136,11 @@ export interface Plugin {
 	 * Returning null or undefined defers to other resolveId functions (and eventually the default resolution behavior);
 	 * returning any other falsy value signals that importee should be treated as an external module and not included in the bundle.
 	 */
-	resolveId?(importee: string, importer: string): string | null | undefined | false | 0 | ''
+	resolveId?(importee: string, importer: string | undefined): string | null | undefined | false | 0 | ''
 	/** A module transformer function */
-	transform?(source: string, id: string): string | { code: string, map: SourceMap }
+	transform?(this: TransformContext, source: string, id: string): TransformResult | Promise<TransformResult>
 	/** A bundle transformer function */
-	transformBundle?(source: string, options: { format: Format }): string | { code: string, map: SourceMap }
+	transformBundle?(source: string, options: { format: Format }): TransformResult | Promise<TransformResult>
 	/** Function hook called when bundle.generate() is being executed. */
 	ongenerate?(options: GenerateOptions, bundle: Bundle): void
 	/** Function hook called when bundle.write() is being executed, after the file has been written to disk. */
@@ -150,5 +155,66 @@ export interface Plugin {
 	footer?: string | (() => string)
 }
 
+// See https://github.com/rollup/rollup/wiki/Plugins#warnings-and-errors
+export interface TransformContext {
+	/** Emit warnings to Rollup which will be logged during bundling */
+	warn(message: string | { message: string }, pos?: number | { line: number, column: number }): void
+	/** Emit an error, which will abort the bundling process */
+	error(message: string | { message: string }, pos?: number | { line: number, column: number }): void
+}
+
+export type TransformResult = string | null | undefined | { code: string, map: SourceMap }
+
 /** Returns a Promise that resolves with a bundle */
 export function rollup(options: Options): Promise<Bundle>
+
+export interface WatchOptions extends ConfigFileOptions {
+	watch?: {
+		/**
+		 * If set to true, will use chokidar for file watching (requires installation).
+		 * If set to object, the settings are passed on to chokidar
+		 */
+		chokidar?: boolean | { [key: string]: any };
+		/** Limit the file-watching to certain files, e.g. 'src/**' */
+		include?: string;
+		/** Prevent files from being watched, e.g. 'node_modules/**' */
+		exclude?: string;
+	}
+}
+
+export interface StartEvent {
+	code: 'START'
+}
+export interface EndEvent {
+	code: 'END'
+}
+export interface ErrorEvent {
+	code: 'ERROR'
+	error: Error
+}
+export interface FatalEvent {
+	code: 'FATAL'
+	error: Error
+}
+export interface BundleStartEvent {
+	code: 'BUNDLE_START'
+	input: string
+	output: string[]
+}
+export interface BundleEndEvent {
+	code: 'BUNDLE_END'
+	input: string
+	output: string[]
+	duration: number
+}
+export type WatchEvent = StartEvent | EndEvent | ErrorEvent | FatalEvent | BundleStartEvent | BundleEndEvent
+
+export class Watcher {
+	/** Listen to the events that are emitted by rollup during watching */
+	on(type: 'event', callback: (e: WatchEvent) => void): void
+	/** Stop watching for file changes */
+	close(): void
+}
+
+/** Starts rollup in watch mode. Returns a watcher instance for closing or listening to events */
+export function watch(options: WatchOptions): Watcher
diff --git a/types/rollup/package.json b/types/rollup/package.json
new file mode 100644
index 0000000000..100334a89f
--- /dev/null
+++ b/types/rollup/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.1"
+    }
+}
diff --git a/types/rollup/rollup-tests.ts b/types/rollup/rollup-tests.ts
index b600fe25ee..e2b18d6109 100644
--- a/types/rollup/rollup-tests.ts
+++ b/types/rollup/rollup-tests.ts
@@ -1,23 +1,174 @@
-import { rollup, Bundle } from 'rollup'
+import { rollup, watch, Bundle, Plugin, ConfigFileOptions } from 'rollup'
+
+declare const console: { log(...messages: any[]): void, warn(message: string): void }
 
 let cache: Bundle | undefined
+const plugin: Plugin = {
+    name: 'test-plugin',
+    resolveId(importee, importer) {
+        if (importer === undefined) {
+            return 'custom/entry/point.js'
+        }
+        return importer.trim()
+    },
+    transform(source, id) {
+        if (id === 'rxjs') {
+            this.error(new Error(`Don't import this directly`))
+            return null
+        }
+        const indexOfQuote = source.indexOf('"')
+        if (indexOfQuote >= 0) {
+            this.warn(`Prefer ' over " for strings`, indexOfQuote)
+            return undefined
+        }
+        if (id === 'foo') {
+            return Promise.resolve(source)
+        }
+        return source
+    },
+    transformBundle(source, options) {
+        if (options.format === 'iife') {
+            return `window.nonModule = true\n${source}`
+        } else if (options.format === 'cjs') {
+            return null
+        }
+        if (options.format !== 'es') {
+            return Promise.resolve(source)
+        }
+        return undefined
+    }
+}
 
 async function main() {
     const bundle = await rollup({
-        entry: 'main.js',
+        input: 'main.js',
+        external: ['external-module'],
+        plugins: [plugin],
+        onwarn: ({ code, frame, loc, message }) => {
+            if (loc) {
+                const { file, line, column } = loc
+                console.log(`[${code}] - ${file}(${line},${column}): ${message}`)
+            } else {
+                console.log(`[${code}] - ${message}`)
+            }
+
+            if (frame) console.warn(frame)
+        },
         cache,
     })
 
-    const result = bundle.generate({
-        format: 'cjs',
+    const bundle2 = await rollup({
+        input: 'main.js',
+        external: id => /^rxjs/.test(id),
+        plugins: plugin
     })
 
+    const { code, map } = await bundle.generate({
+        format: 'cjs',
+        indent: false,
+        sourcemap: true,
+    })
+
+    console.log(code, map)
+
     cache = bundle
 
     await bundle.write({
         format: 'cjs',
-        dest: 'bundle.js',
+        file: 'bundle.js',
+        name: 'myLib',
+        interop: false,
+        globals: {
+            jquery: '$',
+            lodash: '_',
+        },
+        banner: '/* Banner */',
+        footer: '/* Footer */',
+        intro: 'var ENV = "production";',
+        outro: 'var VERSION = "1.0.0";',
+        indent: '  ',
+        sourcemap: 'inline',
+        sourcemapFile: 'bundle.js.map',
+        strict: true,
     })
+
+    await bundle.write({
+        format: 'cjs',
+        file: 'bundle.js',
+        name: 'myLib',
+        interop: false,
+        globals: (x: string) => x.replace("", "/"),
+        banner: '/* Banner */',
+        footer: '/* Footer */',
+        intro: 'var ENV = "production";',
+        outro: 'var VERSION = "1.0.0";',
+        indent: '  ',
+        sourcemap: 'inline',
+        sourcemapFile: 'bundle.js.map',
+        strict: true,
+    })
+
+    const watcher = watch({
+        input: 'main.js',
+        output: {
+            file: 'bundle.js',
+            format: 'es'
+        },
+        watch: {
+            chokidar: true
+        }
+    })
+
+    watcher.on('event', e => {
+        switch (e.code) {
+            case 'START':
+                console.log(`We're rolling!`)
+                return
+            case 'END':
+                console.log(`We're all rolled up!`)
+                return
+            case 'ERROR':
+            case 'FATAL':
+                console.log(e.error.message)
+                return
+            case 'BUNDLE_START':
+                console.log(`Bundling: ${e.input}`)
+                return
+            case 'BUNDLE_END':
+                console.log(`Bundling: ${e.input}`)
+                return
+        }
+
+        assertNever(e)
+    })
+
+    watcher.close()
 }
 
 main()
+
+export const defaultConfig: ConfigFileOptions = {
+    input: 'main.js',
+    output: {
+        file: 'bundle.js',
+        format: 'iife',
+    }
+}
+
+export const multiConfig: ConfigFileOptions = {
+    input: 'main.js',
+    output: [
+        {
+            file: 'bundle.esm.js',
+            format: 'es',
+        },
+        {
+            file: 'bundle.cjs.js',
+            format: 'cjs',
+        }
+    ]
+}
+
+function assertNever(nope: never) {
+    throw new Error('Oh no!')
+}
diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index d8cb96a231..51728127ea 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -14,7 +14,7 @@ declare namespace rosie {
      * @param {function(object): *=} constructor
      * @return {Factory}
      */
-    define<T = any>(name: string, constructor?: (opts?: any) => any): IFactory<T>;
+    define<T = any>(name: string, constructor?: ((...opts: any[]) => any) | (new<T>(...opts: any[]) => any)): IFactory<T>;
 
     /**
      * Locates a factory by name and calls #build on it.
diff --git a/types/rosie/rosie-tests.ts b/types/rosie/rosie-tests.ts
index e44b05b255..8d7c6d83b8 100644
--- a/types/rosie/rosie-tests.ts
+++ b/types/rosie/rosie-tests.ts
@@ -62,8 +62,35 @@ personFactory.attr('secretCode', ['firstName', 'lastName', 'age', 'age', 'firstN
 // You can go past five dependencies, but you need to specify types
 personFactory.attr('secretCode', ['firstName', 'lastName', 'age', 'age', 'firstName', 'firstName'], (firstName: string, lastName: string, age1: number, age2: number, firstNameAgain: string, firstNameThisIsTooMuch: string) => ({ name: firstNameAgain, value: age1 + age2 }));
 
-const personObj = Factory.build<Person>('Person');
-if (personObj.firstName !== 'John') { throw new Error('incorrect Person build'); }
+// Having defined 'Person', `build` will return an object of type Person, using the generic type.
+const person = Factory.build<Person>('Person');
+let aString = '';
+aString = person.firstName;
+
+class CustomClass {
+  type: string;
+
+  constructor(props: { type: string }) {
+    this.type = props.type;
+  }
+}
+
+Factory.define<CustomClass>('CustomClass', CustomClass);
+
+class CustomClass2 {
+  constructor(prop1: string, prop2: string, prop3: string) {
+  }
+}
+
+Factory.define<CustomClass2>('CustomClass2', CustomClass2);
+
+class CustomClassWithoutConstructor {
+  constructor() {
+    // set some state
+  }
+}
+
+Factory.define<CustomClassWithoutConstructor>('CustomClassWithoutConstructor', CustomClassWithoutConstructor);
 
 import rosie = require('rosie');
 
diff --git a/types/rosie/tslint.json b/types/rosie/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rosie/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/roslib/index.d.ts b/types/roslib/index.d.ts
index 5ba27f27b2..fb5e886c66 100644
--- a/types/roslib/index.d.ts
+++ b/types/roslib/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for roslib.js 0.18.0
+// Type definitions for roslib.js 0.18.2
 // Project: http://wiki.ros.org/roslibjs
 // Definitions by: Stefan Profanter <https://github.com/Pro>, Cooper Benson <https://github.com/skycoop>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -58,7 +58,7 @@ declare namespace ROSLIB {
 		 * @param level - User level as a string given by the client.
 		 * @param end - End time of the client's session.
 		 */
-		authenticate(mac:string, client:string, dest:string, rand:string, t:number, level:string, end:string):void;
+		authenticate(mac:string, client:string, dest:string, rand:string, t:number, level:string, end:number):void;
 
 
 		/**
@@ -417,6 +417,14 @@ declare namespace ROSLIB {
 			goalMessage: any
 		});
 
+		/**
+		 * Connect callback functions to goal based events
+		 * 
+		 * @param eventName Name of event ('timeout', 'status', 'feedback', 'result')
+		 * @param callback Callback function executed on connected event
+		 */
+		on(eventName:string, callback:(event:any) => void):void;
+		
 		/**
 		 * Send the goal to the action server.
 		 *
diff --git a/types/roslib/tslint.json b/types/roslib/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/roslib/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rot-js/rot-js-tests.ts b/types/rot-js/rot-js-tests.ts
index 9a07511dce..50ec56b947 100644
--- a/types/rot-js/rot-js-tests.ts
+++ b/types/rot-js/rot-js-tests.ts
@@ -59,7 +59,7 @@ SHOW("%f".format(myObj));
 // ----
 
 class Item {
-    constructor(private name: string) { }
+    constructor(private readonly name: string) { }
 
     a() {
         const first = self.name.charAt(0);
@@ -83,7 +83,7 @@ SHOW(template.format(banana, banana));
 // ----
 
 class Animal {
-    constructor(private name: string) { }
+    constructor(private readonly name: string) { }
     adjective(x: string) {
         return `${x} ${this.name}`;
     }
diff --git a/types/routie/tslint.json b/types/routie/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/routie/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/royalslider/tslint.json b/types/royalslider/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/royalslider/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rpio/tslint.json b/types/rpio/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rpio/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index f4ef84e568..24b20a6376 100644
--- a/types/rrc/index.d.ts
+++ b/types/rrc/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pshrmn/rrc#readme
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from "react";
 import * as H from "history";
diff --git a/types/rrc/rrc-tests.tsx b/types/rrc/rrc-tests.tsx
index 5356cb21a6..74f15045f4 100644
--- a/types/rrc/rrc-tests.tsx
+++ b/types/rrc/rrc-tests.tsx
@@ -30,7 +30,7 @@ class RouteOne extends React.Component<RouteComponentProps<{}>> {
 }
 
 class RouteTwo extends React.Component<RouteComponentProps<{}>> {
-    private onUpdate: OnUpdateCall = (location) => { console.log("update"); };
+    private readonly onUpdate: OnUpdateCall = (location) => { console.log("update"); };
 
     render() {
         return <div>
@@ -65,11 +65,11 @@ interface Params {
 }
 
 class RouteFour extends React.Component<RouteComponentProps<{}>> {
-    private routes: RouteConfiguration[] = [
+    private readonly routes: RouteConfiguration[] = [
         { path: "/four/something/:page", component: RouteTwo }
     ];
 
-    private getKey: GetKeyFunction<Params> = (match, route, location) => {
+    private readonly getKey: GetKeyFunction<Params> = (match, route, location) => {
         return "my-key-" + match.url;
     }
 
diff --git a/types/rrule/index.d.ts b/types/rrule/index.d.ts
index 3915865392..f13aefb9c9 100644
--- a/types/rrule/index.d.ts
+++ b/types/rrule/index.d.ts
@@ -55,9 +55,8 @@ declare namespace RRule {
 
 declare class RRule {
     /**
-     * @param {Object?} options - see <http://labix.org/python-dateutil/#head-cf004ee9a75592797e076752b2a889c10f445418>
+     * @param options - see <http://labix.org/python-dateutil/#head-cf004ee9a75592797e076752b2a889c10f445418>
      *        The only required option is `freq`, one of RRule.YEARLY, RRule.MONTHLY, ...
-     * @constructor
      */
     constructor(options: RRule.Options, noCache?: boolean);
 
@@ -74,7 +73,7 @@ declare class RRule {
     after(dt: Date, inc?: boolean): Date;
 
     /**
-     * @param {Function} iterator - optional function that will be called
+     * @param iterator - optional function that will be called
      *                   on each date that is added. It can return false
      *                   to stop the iteration.
      * @return Array containing all recurrences.
@@ -165,9 +164,7 @@ declare namespace RRule {
 
     class RRuleSet extends RRule {
       /**
-       * @param {Boolean?} noCache
-       *  The same stratagy as RRule on cache, default to false
-       * @constructor
+       * @param noCache  The same stratagy as RRule on cache, default to false
        */
       constructor(noCache?: boolean);
       rrule(rrule: RRule): void;
diff --git a/types/rsmq-worker/tslint.json b/types/rsmq-worker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rsmq-worker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rsmq/tslint.json b/types/rsmq/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rsmq/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rss/tslint.json b/types/rss/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rss/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rsvp/index.d.ts b/types/rsvp/index.d.ts
old mode 100644
new mode 100755
index 7ea82988f4..e32ad96363
--- a/types/rsvp/index.d.ts
+++ b/types/rsvp/index.d.ts
@@ -1,382 +1,631 @@
-// Type definitions for RSVP 3.3.3
+// Type definitions for RSVP 4.0
 // Project: https://github.com/tildeio/rsvp.js
-// Definitions by: Taylor Brown <https://github.com/Taytay>
-//                 Mikael Kohlmyr <https://github.com/mkohlmyr>
-//                 Theron Cross <https://github.com/theroncross>
-//                 Chris Krycho <https://github.com/chriskrycho>
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-// Some of this file was taken from the type definitions for es6-promise https://github.com/borisyankov/DefinitelyTyped/blob/master/es6-promise/es6-promise.d.ts
-// Credit for that file goes to: François de Campredon <https://github.com/fdecampredon>
+// These types are derived in large part from the Microsoft-supplied types for
+// ES2015 Promises. They have been tweaked to support RSVP's extensions to the
+// Promises A+ spec and the additional helper functions it supplies.
 
-// Some of this file was taken from the type definitions for Q : https://github.com/borisyankov/DefinitelyTyped/blob/master/q/Q.d.ts
-// Credit for that file goes to: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar>, John Reilly <https://github.com/johnnyreilly>
+declare module 'rsvp' {
+    namespace RSVP {
+        // All the Promise methods essentially flatten existing promises, so that
+        // you don't end up with `Promise<Promise<Promise<string>>>` if you happen
+        // to return another `Promise` from a `.then()` invocation, etc. So all of
+        // them can take a type or a promise-like/then-able type.
+        type Arg<T> = T | PromiseLike<T>;
 
-declare namespace RSVP {
-    type Resolution<T, U, C> = (value: T) => U | Thenable<U, C>;
-    type Rejection<T, C, D> = (error: C) => D | Thenable<T, D>;
+        // RSVP supplies status for promises in certain places.
+        enum State {
+            fulfilled = 'fulfilled',
+            rejected = 'rejected',
+            pending = 'pending',
+        }
 
-    interface Thenable<T, C> {
-        then(label?: string): Thenable<T, C>;
-        then<U>(onFulfillment: Resolution<T, U, C>, label?: string): Thenable<U, C>;
-        then<U, D>(
-            onFulfillment: Resolution<T, U, C>,
-            onRejected: Rejection<T, C, D>,
-            label?: string
-        ): Thenable<U, D>;
-    }
+        type Resolved<T> = {
+            state: State.fulfilled;
+            value: T;
+        };
 
-    interface Catchable<C> {
-        catch(label?: string): Catchable<C>;
-        catch<D>(onRejection: (error: C) => D, label?: string): Catchable<D>;
-    }
+        type Rejected<T = any> = {
+            state: State.rejected;
+            reason: T;
+        };
 
-    interface Deferred<T, C> {
-        promise: Promise<T, C>;
-        resolve(value: T): void;
-        reject(reason: C): void;
-    }
+        type Pending = {
+            state: State.pending;
+        };
 
-    type PromiseStates = 'fulfilled' | 'rejected' | 'pending';
-    interface IPromiseState<T, C> {
-        state: PromiseStates;
-        value: T;
-        reason: C;
-    }
+        type PromiseState<T> = Resolved<T> | Rejected | Pending;
 
-    class Resolved<T, C> implements IPromiseState<T, C> {
-        state: 'fulfilled';
-        value: T;
-        reason: never;
-    }
+        type Deferred<T> = {
+            promise: Promise<T>;
+            resolve: (value?: RSVP.Arg<T>) => void;
+            reject: (reason?: any) => void;
+        };
 
-    class Rejected<T, C> implements IPromiseState<T, C> {
-        state: 'rejected';
-        value: never;
-        reason: C;
-    }
+        interface InstrumentEvent {
+            guid: string; // guid of promise. Must be globally unique, not just within the implementation
+            childGuid: string; // child of child promise (for chained via `then`)
+            eventName: string; // one of ['created', 'chained', 'fulfilled', 'rejected']
+            detail: any; // fulfillment value or rejection reason, if applicable
+            label: string; // label passed to promise's constructor
+            timeStamp: number; // milliseconds elapsed since 1 January 1970 00:00:00 UTC up until now
+        }
 
-    class Pending<T, C> implements IPromiseState<T, C> {
-        state: 'pending';
-        value: never;
-        reason: never;
-    }
+        interface ObjectWithEventMixins {
+            on(
+                eventName: 'created' | 'chained' | 'fulfilled' | 'rejected',
+                listener: (event: InstrumentEvent) => void
+            ): void;
+            on(eventName: 'error', errorHandler: (reason: any) => void): void;
+            on(eventName: string, callback: (value: any) => void): void;
+            off(eventName: string, callback?: (value: any) => void): void;
+            trigger(eventName: string, options?: any, label?: string): void;
+        }
 
-    type PromiseState<T, C> = Resolved<T, C> | Rejected<C, C> | Pending<T, C>;
+        class EventTarget {
+            /** `RSVP.EventTarget.mixin` extends an object with EventTarget methods. */
+            static mixin(object: object): ObjectWithEventMixins;
 
-    type PromiseHash<T, C> = { [P in keyof T]: Thenable<T[P], C> | T[P] };
+            /** Registers a callback to be executed when `eventName` is triggered */
+            static on(
+                eventName: 'created' | 'chained' | 'fulfilled' | 'rejected',
+                listener: (event: InstrumentEvent) => void
+            ): void;
+            static on(eventName: 'error', errorHandler: (reason: any) => void): void;
+            static on(eventName: string, callback: (value: any) => void): void;
 
-    type SettledHash<T, C> = { [P in keyof T]: PromiseState<T[P], C> };
-
-    interface InstrumentEvent {
-        guid: string; // guid of promise. Must be globally unique, not just within the implementation
-        childGuid: string; // child of child promise (for chained via `then`)
-        eventName: string; // one of ['created', 'chained', 'fulfilled', 'rejected']
-        detail: any; // fulfillment value or rejection reason, if applicable
-        label: string; // label passed to promise's constructor
-        timeStamp: number; // milliseconds elapsed since 1 January 1970 00:00:00 UTC up until now
-    }
-
-    interface ObjectWithEventMixins {
-        on(
-            eventName: 'created' | 'chained' | 'fulfilled' | 'rejected',
-            listener: (event: InstrumentEvent) => void
-        ): void;
-        on(eventName: 'error', errorHandler: (reason: any) => void): void;
-        on(eventName: string, callback: (value: any) => void): void;
-        off(eventName: string, callback?: (value: any) => void): void;
-        trigger(eventName: string, options?: any, label?: string): void;
-    }
-
-    class Promise<T, C> implements Thenable<T, C>, Catchable<C> {
-        /**
-          * 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 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().
-          */
-        constructor(
-            callback: (
-                resolve: (result?: T | Thenable<T, never>) => void,
-                reject: (error: C | Thenable<never, C>) => void
-            ) => void,
-            label?: string
-        );
-
-        /**
-          * onFulfillment is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
-          * Both are optional, if either/both are omitted the next onFulfillment/onRejected in the chain is called.
-          * Both callbacks have a single parameter , the fulfillment value or rejection reason.
-          * "then" returns a new promise equivalent to the value you return from onFulfillment/onRejected after being passed through Promise.resolve.
-          * If an error is thrown in the callback, the returned promise rejects with that error.
-          *
-          * @param onFulfillment called when/if "promise" resolves
-          * @param onRejected called when/if "promise" rejects
-          * @param label useful for tooling
-          */
-        then<U, D>(
-            onFulfillment: Resolution<T, U, C>,
-            onRejected: Rejection<T, C, D>,
-            label?: string
-        ): Promise<U, D>;
-        then<U>(onFulfillment: Resolution<T, U, C>, label?: string): Promise<U, C>;
-        then(label?: string): Promise<T, C>;
-
-        /**
-          * Sugar for promise.then(undefined, onRejected)
-          */
-        catch(label?: string): Promise<T, C>;
-        catch<D>(onRejection: Rejection<T, C, D>, label?: string): Promise<T, D>;
-
-        finally(finallyCallback: Function): Promise<T, C>;
-
-        /**
-             * `RSVP.Promise.all` accepts an array of promises, and returns a new promise which
-             * is fulfilled with an array of fulfillment values for the passed promises, or
-             * rejected with the reason of the first passed promise to be rejected. It casts all
-             * elements of the passed iterable to promises as it runs this algorithm.
+            /**
+             * You can use `off` to stop firing a particular callback for an event.
+             *
+             * If you don't pass a `callback` argument to `off`, ALL callbacks for the
+             * event will not be executed when the event fires.
              */
-        static all<T, C>(promises: Thenable<T, C>[], label?: string): Promise<T[], C>;
+            static off(eventName: string, callback?: (value: any) => void): void;
 
-        /**
-          * `RSVP.Promise.race` returns a new promise which is settled in the same way as the
-          * first passed promise to settle.
-          *
-          * `RSVP.Promise.race` is deterministic in that only the state of the first
-          * settled promise matters. For example, even if other promises given to the
-          * `promises` array argument are resolved, but the first settled promise has
-          * become rejected before the other promises became fulfilled, the returned
-          * promise will become rejected.
-          */
-        static race<T, C>(promises: Promise<T, C>[]): Promise<T, C>;
+            /**
+             * Use `trigger` to fire custom events.
+             *
+             * You can also pass a value as a second argument to `trigger` that will be
+             * passed as an argument to all event listeners for the event
+             */
+            static trigger(eventName: string, options?: any, label?: string): void;
+        }
 
-        /**
-          * Returns a promise that will become resolved with the passed `value`
-          */
-        static resolve<T>(value: T, label?: string): Promise<T, never>;
+        class Promise<T> implements PromiseLike<T> {
+            constructor(
+                executor: (
+                    resolve: (value?: RSVP.Arg<T>) => void,
+                    reject: (reason?: any) => void
+                ) => void
+            );
 
-        /**
-          * Deprecated in favor of resolve
-          */
-        static cast<T>(value: T, label?: string): Promise<T, never>;
+            new<T>(
+                executor: (
+                    resolve: (value?: RSVP.Arg<T>) => void,
+                    reject: (reason?: any) => void
+                ) => void
+            ): RSVP.Promise<T>;
 
-        /**
-          * Returns a promise rejected with the passed `reason`.
-          */
-        static reject<C>(reason: C): Promise<never, C>;
+            then<TResult1 = T, TResult2 = never>(
+                onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+                onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+                label?: string
+            ): RSVP.Promise<TResult1 | TResult2>;
+
+            catch<TResult = never>(
+                onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
+                label?: string
+            ): RSVP.Promise<T | TResult>;
+
+            finally<U>(onFinally?: U | PromiseLike<U>): RSVP.Promise<T>;
+
+            readonly [Symbol.toStringTag]: "Promise";
+
+            static all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+                values: [
+                    Arg<T1>,
+                    Arg<T2>,
+                    Arg<T3>,
+                    Arg<T4>,
+                    Arg<T5>,
+                    Arg<T6>,
+                    Arg<T7>,
+                    Arg<T8>,
+                    Arg<T9>,
+                    Arg<T10>
+                ],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+            static all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+                values: [
+                    Arg<T1>,
+                    Arg<T2>,
+                    Arg<T3>,
+                    Arg<T4>,
+                    Arg<T5>,
+                    Arg<T6>,
+                    Arg<T7>,
+                    Arg<T8>,
+                    Arg<T9>
+                ],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+            static all<T1, T2, T3, T4, T5, T6, T7, T8>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>, Arg<T8>],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+            static all<T1, T2, T3, T4, T5, T6, T7>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3, T4, T5, T6, T7]>;
+            static all<T1, T2, T3, T4, T5, T6>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3, T4, T5, T6]>;
+            static all<T1, T2, T3, T4, T5>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3, T4, T5]>;
+            static all<T1, T2, T3, T4>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3, T4]>;
+            static all<T1, T2, T3>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>],
+                label?: string
+            ): RSVP.Promise<[T1, T2, T3]>;
+            static all<T1, T2>(values: [Arg<T1>, Arg<T2>], label?: string): Promise<[T1, T2]>;
+            static all<T>(values: (Arg<T>)[], label?: string): RSVP.Promise<T[]>;
+
+            static race<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+                values: [
+                    Arg<T1>,
+                    Arg<T2>,
+                    Arg<T3>,
+                    Arg<T4>,
+                    Arg<T5>,
+                    Arg<T6>,
+                    Arg<T7>,
+                    Arg<T8>,
+                    Arg<T9>,
+                    T10 | PromiseLike<T10>
+                ],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10>;
+            static race<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+                values: [
+                    Arg<T1>,
+                    Arg<T2>,
+                    Arg<T3>,
+                    Arg<T4>,
+                    Arg<T5>,
+                    Arg<T6>,
+                    Arg<T7>,
+                    Arg<T8>,
+                    Arg<T9>
+                ],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>;
+            static race<T1, T2, T3, T4, T5, T6, T7, T8>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>, Arg<T8>],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>;
+            static race<T1, T2, T3, T4, T5, T6, T7>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7>;
+            static race<T1, T2, T3, T4, T5, T6>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3 | T4 | T5 | T6>;
+            static race<T1, T2, T3, T4, T5>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3 | T4 | T5>;
+            static race<T1, T2, T3, T4>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3 | T4>;
+            static race<T1, T2, T3>(
+                values: [Arg<T1>, Arg<T2>, Arg<T3>],
+                label?: string
+            ): RSVP.Promise<T1 | T2 | T3>;
+            static race<T1, T2>(values: [Arg<T1>, Arg<T2>], label?: string): RSVP.Promise<T1 | T2>;
+            static race<T>(values: (Arg<T>)[], label?: string): RSVP.Promise<T>;
+
+            static reject(reason?: any, label?: string): RSVP.Promise<never>;
+
+            static resolve<T>(value?: Arg<T>, label?: string): RSVP.Promise<T>;
+            static resolve(): RSVP.Promise<void>;
+
+            /**
+             * @deprecated
+             */
+            static cast: typeof RSVP.Promise.resolve;
+        }
+
+        const all: typeof Promise.all;
+        const race: typeof Promise.race;
+        const reject: typeof Promise.reject;
+        const resolve: typeof Promise.resolve;
+        function rethrow(reason: any): void;
+
+        const cast: typeof Promise.cast;
+
+        const on: typeof EventTarget.on;
+        const off: typeof EventTarget.off;
+
+        // ----- denodeify ----- //
+        // Here be absurd things because we don't have variadic types. All of
+        // this will go away if we can ever write this:
+        //
+        //     denodeify<...T, ...A>(
+        //         nodeFunc: (...args: ...A, callback: (err: any, ...cbArgs: ...T) => any) => void,
+        //         options?: false
+        //     ): (...args: ...A) => RSVP.Promise<...T>
+        //
+        // That day, however, may never come. So, in the meantime, we do this.
+
+        function denodeify<T1, T2, T3, A>(
+            nodeFunc: (
+                arg1: A,
+                callback: (err: any, data1: T1, data2: T2, data3: T3) => void
+            ) => void,
+            options?: false
+        ): (arg1: A) => RSVP.Promise<T1>;
+
+        function denodeify<T1, T2, A>(
+            nodeFunc: (arg1: A, callback: (err: any, data1: T1, data2: T2) => void) => void,
+            options?: false
+        ): (arg1: A) => RSVP.Promise<T1>;
+
+        function denodeify<T, A>(
+            nodeFunc: (arg1: A, callback: (err: any, data: T) => void) => void,
+            options?: false
+        ): (arg1: A) => RSVP.Promise<T>;
+
+        function denodeify<T1, T2, T3, A>(
+            nodeFunc: (
+                arg1: A,
+                callback: (err: any, data1: T1, data2: T2, data3: T3) => void
+            ) => void,
+            options: true
+        ): (arg1: A) => RSVP.Promise<[T1, T2, T3]>;
+
+        function denodeify<T1, T2, A>(
+            nodeFunc: (arg1: A, callback: (err: any, data1: T1, data2: T2) => void) => void,
+            options: true
+        ): (arg1: A) => RSVP.Promise<[T1, T2]>;
+
+        function denodeify<T, A>(
+            nodeFunc: (arg1: A, callback: (err: any, data: T) => void) => void,
+            options: true
+        ): (arg1: A) => RSVP.Promise<[T]>;
+
+        function denodeify<T1, T2, T3, A, K1 extends string, K2 extends string, K3 extends string>(
+            nodeFunc: (
+                arg1: A,
+                callback: (err: any, data1: T1, data2: T2, data3: T3) => void
+            ) => void,
+            options: [K1, K2, K3]
+        ): (arg1: A) => RSVP.Promise<{ [K in K1]: T1 } & { [K in K2]: T2 } & { [K in K3]: T3 }>;
+
+        function denodeify<T1, T2, A, K1 extends string, K2 extends string>(
+            nodeFunc: (arg1: A, callback: (err: any, data1: T1, data2: T2) => void) => void,
+            options: [K1, K2]
+        ): (arg1: A) => RSVP.Promise<{ [K in K1]: T1 } & { [K in K2]: T2 }>;
+
+        function denodeify<T, A, K1 extends string>(
+            nodeFunc: (arg1: A, callback: (err: any, data: T) => void) => void,
+            options: [K1]
+        ): (arg1: A) => RSVP.Promise<{ [K in K1]: T }>;
+
+        // ----- hash and hashSettled ----- //
+        function hash<T>(object: { [P in keyof T]: Arg<T[P]> }, label?: string): RSVP.Promise<T>;
+        function hashSettled<T>(
+            object: { [P in keyof T]: Arg<T[P]> },
+            label?: string
+        ): RSVP.Promise<{ [P in keyof T]: PromiseState<T[P]> }>;
+
+        function allSettled<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+            entries: [
+                Arg<T1>,
+                Arg<T2>,
+                Arg<T3>,
+                Arg<T4>,
+                Arg<T5>,
+                Arg<T6>,
+                Arg<T7>,
+                Arg<T8>,
+                Arg<T9>,
+                Arg<T10>
+            ],
+            label?: string
+        ): RSVP.Promise<
+            [
+                PromiseState<T1>,
+                PromiseState<T2>,
+                PromiseState<T3>,
+                PromiseState<T4>,
+                PromiseState<T5>,
+                PromiseState<T6>,
+                PromiseState<T7>,
+                PromiseState<T8>,
+                PromiseState<T9>
+            ]
+        >;
+        function allSettled<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+            entries: [
+                Arg<T1>,
+                Arg<T2>,
+                Arg<T3>,
+                Arg<T4>,
+                Arg<T5>,
+                Arg<T6>,
+                Arg<T7>,
+                Arg<T8>,
+                Arg<T9>
+            ],
+            label?: string
+        ): RSVP.Promise<
+            [
+                PromiseState<T1>,
+                PromiseState<T2>,
+                PromiseState<T3>,
+                PromiseState<T4>,
+                PromiseState<T5>,
+                PromiseState<T6>,
+                PromiseState<T7>,
+                PromiseState<T8>,
+                PromiseState<T9>
+            ]
+        >;
+        function allSettled<T1, T2, T3, T4, T5, T6, T7, T8>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>, Arg<T8>],
+            label?: string
+        ): RSVP.Promise<
+            [
+                PromiseState<T1>,
+                PromiseState<T2>,
+                PromiseState<T3>,
+                PromiseState<T4>,
+                PromiseState<T5>,
+                PromiseState<T6>,
+                PromiseState<T7>,
+                PromiseState<T8>
+            ]
+        >;
+        function allSettled<T1, T2, T3, T4, T5, T6, T7>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>],
+            label?: string
+        ): RSVP.Promise<
+            [
+                PromiseState<T1>,
+                PromiseState<T2>,
+                PromiseState<T3>,
+                PromiseState<T4>,
+                PromiseState<T5>,
+                PromiseState<T6>,
+                PromiseState<T7>
+            ]
+        >;
+        function allSettled<T1, T2, T3, T4, T5, T6>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>],
+            label?: string
+        ): RSVP.Promise<
+            [
+                PromiseState<T1>,
+                PromiseState<T2>,
+                PromiseState<T3>,
+                PromiseState<T4>,
+                PromiseState<T5>,
+                PromiseState<T6>
+            ]
+        >;
+        function allSettled<T1, T2, T3, T4, T5>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>],
+            label?: string
+        ): RSVP.Promise<
+            [
+                PromiseState<T1>,
+                PromiseState<T2>,
+                PromiseState<T3>,
+                PromiseState<T4>,
+                PromiseState<T5>
+            ]
+        >;
+        function allSettled<T1, T2, T3, T4>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>],
+            label?: string
+        ): RSVP.Promise<[PromiseState<T1>, PromiseState<T2>, PromiseState<T3>, PromiseState<T4>]>;
+        function allSettled<T1, T2, T3>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>],
+            label?: string
+        ): RSVP.Promise<[PromiseState<T1>, PromiseState<T2>, PromiseState<T3>]>;
+        function allSettled<T1, T2>(
+            entries: [Arg<T1>, Arg<T2>],
+            label?: string
+        ): RSVP.Promise<[PromiseState<T1>, PromiseState<T2>]>;
+        function allSettled<T>(entries: Arg<T>[], label?: string): RSVP.Promise<[PromiseState<T>]>;
+
+        function map<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, U>(
+            entries: [
+                Arg<T1>,
+                Arg<T2>,
+                Arg<T3>,
+                Arg<T4>,
+                Arg<T5>,
+                Arg<T6>,
+                Arg<T7>,
+                Arg<T8>,
+                Arg<T9>,
+                Arg<T10>
+            ],
+            mapFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 10 }>;
+
+        function map<T1, T2, T3, T4, T5, T6, T7, T8, T9, U>(
+            entries: [
+                Arg<T1>,
+                Arg<T2>,
+                Arg<T3>,
+                Arg<T4>,
+                Arg<T5>,
+                Arg<T6>,
+                Arg<T7>,
+                Arg<T8>,
+                Arg<T9>
+            ],
+            mapFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 9 }>;
+        function map<T1, T2, T3, T4, T5, T6, T7, T8, U>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>, Arg<T8>],
+            mapFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 8 }>;
+        function map<T1, T2, T3, T4, T5, T6, T7, U>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>],
+            mapFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 7 }>;
+        function map<T1, T2, T3, T4, T5, T6, U>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>],
+            mapFn: (item: T1 | T2 | T3 | T4 | T5 | T6) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 6 }>;
+        function map<T1, T2, T3, T4, T5, U>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>],
+            mapFn: (item: T1 | T2 | T3 | T4 | T5) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 5 }>;
+        function map<T1, T2, T3, T4, U>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>],
+            mapFn: (item: T1 | T2 | T3 | T4) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 4 }>;
+        function map<T1, T2, T3, U>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>],
+            mapFn: (item: T1 | T2 | T3) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 3 }>;
+        function map<T1, T2, U>(
+            entries: [Arg<T1>, Arg<T2>],
+            mapFn: (item: T1 | T2) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 2 }>;
+        function map<T, U>(
+            entries: Arg<T>[],
+            mapFn: (item: T) => U,
+            label?: string
+        ): RSVP.Promise<Array<U> & { length: 1 }>;
+
+        function filter<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+            entries: [
+                Arg<T1>,
+                Arg<T2>,
+                Arg<T3>,
+                Arg<T4>,
+                Arg<T5>,
+                Arg<T6>,
+                Arg<T7>,
+                Arg<T8>,
+                Arg<T9>,
+                Arg<T10>
+            ],
+            filterFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10>>;
+        function filter<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+            entries: [
+                Arg<T1>,
+                Arg<T2>,
+                Arg<T3>,
+                Arg<T4>,
+                Arg<T5>,
+                Arg<T6>,
+                Arg<T7>,
+                Arg<T8>,
+                Arg<T9>
+            ],
+            filterFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>>;
+        function filter<T1, T2, T3, T4, T5, T6, T7, T8>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>, Arg<T8>],
+            filterFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>>;
+        function filter<T1, T2, T3, T4, T5, T6, T7>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>, Arg<T7>],
+            filterFn: (item: T1 | T2 | T3 | T4 | T5 | T6 | T7) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3 | T4 | T5 | T6 | T7>>;
+        function filter<T1, T2, T3, T4, T5, T6>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>, Arg<T6>],
+            filterFn: (item: T1 | T2 | T3 | T4 | T5 | T6) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3 | T4 | T5 | T6> & { length: 6 }>;
+        function filter<T1, T2, T3, T4, T5>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>, Arg<T5>],
+            filterFn: (item: T1 | T2 | T3 | T4 | T5) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3 | T4 | T5>>;
+        function filter<T1, T2, T3, T4>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>, Arg<T4>],
+            filterFn: (item: T1 | T2 | T3 | T4) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3 | T4>>;
+        function filter<T1, T2, T3>(
+            entries: [Arg<T1>, Arg<T2>, Arg<T3>],
+            filterFn: (item: T1 | T2 | T3) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2 | T3>>;
+        function filter<T1, T2>(
+            entries: [Arg<T1>, Arg<T2>],
+            filterFn: (item: T1 | T2) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T1 | T2>>;
+        function filter<T>(
+            entries: Arg<T>[],
+            filterFn: (item: T) => boolean,
+            label?: string
+        ): RSVP.Promise<Array<T>>;
+
+        function defer<T>(label?: string): Deferred<T>;
+
+        function configure<T>(name: string): T;
+        function configure<T>(name: string, value: T): void;
+
+        function asap<T, U>(callback: (callbackArg: T) => U, arg: T): void;
+
+        const async: typeof asap;
     }
 
-    export namespace EventTarget {
-        /** `RSVP.EventTarget.mixin` extends an object with EventTarget methods. */
-        function mixin(object: object): ObjectWithEventMixins;
+    export default RSVP;
 
-        /** Registers a callback to be executed when `eventName` is triggered */
-        function on(
-            eventName: 'created' | 'chained' | 'fulfilled' | 'rejected',
-            listener: (event: InstrumentEvent) => void
-        ): void;
-        function on(eventName: 'error', errorHandler: (reason: any) => void): void;
-        function on(eventName: string, callback: (value: any) => void): void;
-
-        /**
-         * You can use `off` to stop firing a particular callback for an event.
-         *
-         * If you don't pass a `callback` argument to `off`, ALL callbacks for the
-         * event will not be executed when the event fires.
-         */
-        function off(eventName: string, callback?: (value: any) => void): void;
-
-        /**
-         * Use `trigger` to fire custom events.
-         *
-         * You can also pass a value as a second argument to `trigger` that will be
-         * passed as an argument to all event listeners for the event
-         */
-        function trigger(eventName: string, options?: any, label?: string): void;
-    }
-
-    export function configure(
-        configName: 'instrument' | 'instrument-with-stack',
-        shouldInstrument: boolean
-    ): void;
-    export function configure(configName: string, value: any): void;
-
-    /**
-     * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
-     * the array passed to all can be a mixture of promise-like objects and other objects.
-     * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
-     */
-    export function all<T, C>(promises: Thenable<T, C>[]): Promise<T[], C>;
-
-    /**
-     *  `RSVP.hash` is similar to `RSVP.all`, but takes an object instead of an array
-     *  for its `promises` argument.
-     *
-     *  Returns a promise that is fulfilled when all the given promises have been
-     *  fulfilled, or rejected if any of them become rejected. The returned promise
-     *  is fulfilled with a hash that has the same key names as the `promises` object
-     *  argument. If any of the values in the object are not promises, they will
-     *  simply be copied over to the fulfilled object.
-     *
-     *  If any of the `promises` given to `RSVP.hash` are rejected, the first promise
-     *  that is rejected will be given as the reason to the rejection handler.
-     */
-    export function hash<T, C>(promises: PromiseHash<T, C>): Promise<T, C>;
-
-    /**
-     * `RSVP.map` is similar to JavaScript's native `map` method. `mapFn` is eagerly called
-     * meaning that as soon as any promise resolves its value will be passed to `mapFn`.
-     * `RSVP.map` returns a promise that will become fulfilled with the result of running
-     * `mapFn` on the values the promises become fulfilled with.
-     *
-     * If any of the `promises` given to `RSVP.map` are rejected, the first promise
-     * that is rejected will be given as an argument to the returned promise's
-     * rejection handler.
-     */
-    export function map<T, U, C>(
-        promises: Thenable<T, C>[],
-        mapFn: (item: T) => U,
-        label?: string
-    ): Promise<U[], C>;
-
-    /**
-     * `RSVP.allSettled` is similar to `RSVP.all`, but instead of implementing
-     * a fail-fast method, it waits until all the promises have returned and
-     * shows you all the results. This is useful if you want to handle multiple
-     * promises' failure states together as a set.
-     */
-    export function allSettled<T, C>(promises: Thenable<T, C>[]): Promise<PromiseState<T, C>[], C>;
-
-    /**
-     * `RSVP.hashSettled` is similar to `RSVP.allSettled`, but takes an object
-     * instead of an array for its `promises` argument.
-     *
-     * Unlike `RSVP.all` or `RSVP.hash`, which implement a fail-fast method,
-     * but like `RSVP.allSettled`, `hashSettled` waits until all the
-     * constituent promises have returned and then shows you all the results
-     * with their states and values/reasons. This is useful if you want to
-     * handle multiple promises' failure states together as a set.
-     */
-    export function hashSettled<T, C>(promises: PromiseHash<T, C>): Promise<SettledHash<T, C>, C>;
-
-    /**
-     * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
-     */
-    function race<T, C>(promises: Promise<T, C>[]): Promise<T, C>;
-
-    /**
-    * `RSVP.denodeify` takes a "node-style" function and returns a function that
-    *  will return an `RSVP.Promise`. You can use `denodeify` in Node.js or the
-    *  browser when you'd prefer to use promises over using callbacks. For example,
-    * `denodeify` transforms the following:
-    *
-    * ```
-    * let fs = require('fs');
-    *
-    * fs.readFile('myfile.txt', function(err, data){
-    *   if (err) return handleError(err);
-    *   handleData(data);
-    * });
-    * ```
-    *
-    * into:
-    *
-    * ```
-    * let fs = require('fs');
-    * let readFile = RSVP.denodeify(fs.readFile);
-    *
-    * readFile('myfile.txt').then(handleData, handleError);
-    * ```
-    *
-    * If the node function has multiple success parameters, then denodeify just
-    * returns the first one:
-    *
-    * ```
-    * let request = RSVP.denodeify(require('request'));
-    *
-    * request('http://example.com').then(function(res) {
-    *   // ...
-    * });
-    * ```
-    *
-    * However, if you need all success parameters, setting denodeify's second
-    * parameter to true causes it to return all success parameters as an array:
-    *
-    * ```
-    * let request = RSVP.denodeify(require('request'), true);
-    *
-    * request('http://example.com').then(function(result) {
-    *   // result[0] -> res
-    *   // result[1] -> body
-    * });
-    * ```
-    *
-    * Or if you pass it an array with names it returns the parameters as a hash:
-    *
-    * ```
-    * let request = RSVP.denodeify(require('request'), ['res', 'body']);
-    *
-    * request('http://example.com').then(function(result) {
-    *   // result.res
-    *   // result.body
-    * });
-    * ```
-    */
-    export function denodeify<A, T, C>(
-        nodeFunction: Function,
-        options: boolean | string[]
-    ): (...args: A[]) => Promise<T, C>;
-
-    /**
-     * `RSVP.defer` returns an object similar to jQuery's `$.Deferred`.
-     * `RSVP.defer` should be used when porting over code reliant on `$.Deferred`'s
-     * interface. New code should use the `RSVP.Promise` constructor instead.
-     *
-     * The object returned from `RSVP.defer` is a plain object with three properties:
-     * * promise - an `RSVP.Promise`.
-     * * reject - a function that causes the `promise` property on this object to become rejected
-     * * resolve - a function that causes the `promise` property on this object to become fulfilled.
-     */
-    export function defer<T, C>(label?: string): Deferred<T, C>;
-
-    /**
-     * `RSVP.Promise.reject` returns a promise rejected with the passed `reason`.
-     */
-    export function reject<C>(reason: C): Promise<never, C>;
-
-    /**
-     * `RSVP.Promise.resolve` returns a promise that will become resolved with the
-     * passed `value`.
-     */
-    export function resolve<T>(value: T): Promise<T, never>;
-
-    /**
-     * `RSVP.filter` is similar to JavaScript's native `filter` method, except that it
-     * waits for all promises to become fulfilled before running the `filterFn` on
-     * each item in given to `promises`. `RSVP.filter` returns a promise that will
-     * become fulfilled with the result of running `filterFn` on the values the
-     * promises become fulfilled with.
-     */
-    export function filter<T, C>(
-        promises: Thenable<T, C>[],
-        filterFn: (value: T) => boolean | Promise<any, any>
-    ): Promise<T[], C>;
-
-    /**
-     * `RSVP.rethrow` will rethrow an error on the next turn of the JavaScript event
-     * loop in order to aid debugging.
-     *
-     * Promises A+ specifies that any exceptions that occur with a promise must be
-     * caught by the promises implementation and bubbled to the last handler. For
-     * this reason, it is recommended that you always specify a second rejection
-     * handler function to `then`. However, `RSVP.rethrow` will throw the exception
-     * outside of the promise, so it bubbles up to your console if in the browser,
-     * or domain/cause uncaught exception in Node. `rethrow` will also throw the
-     * error again so the error can be handled by the promise per the spec.
-     */
-    export function rethrow<C>(reason: C): void;
+    export const asap: typeof RSVP.asap;
+    export const cast: typeof RSVP.cast;
+    export const Promise: typeof RSVP.Promise;
+    export const EventTarget: typeof RSVP.EventTarget;
+    export const all: typeof RSVP.all;
+    export const allSettled: typeof RSVP.allSettled;
+    export const race: typeof RSVP.race;
+    export const hash: typeof RSVP.hash;
+    export const hashSettled: typeof RSVP.hashSettled;
+    export const rethrow: typeof RSVP.rethrow;
+    export const defer: typeof RSVP.defer;
+    export const denodeify: typeof RSVP.denodeify;
+    export const configure: typeof RSVP.configure;
+    export const on: typeof RSVP.on;
+    export const off: typeof RSVP.off;
+    export const resolve: typeof RSVP.resolve;
+    export const reject: typeof RSVP.reject;
+    export const map: typeof RSVP.map;
+    export const async: typeof RSVP.async;
+    export const filter: typeof RSVP.filter;
 }
-
-export = RSVP;
diff --git a/types/rsvp/rsvp-tests.ts b/types/rsvp/rsvp-tests.ts
old mode 100644
new mode 100755
index aec0acfede..1f14a3318b
--- a/types/rsvp/rsvp-tests.ts
+++ b/types/rsvp/rsvp-tests.ts
@@ -1,83 +1,330 @@
-import RSVP = require('rsvp');
+import RSVP from 'rsvp';
+import { all, race, resolve } from 'rsvp';
 
-let promise1: RSVP.Promise<number, Error> = RSVP.Promise.resolve(1);
-let promise1a: RSVP.Promise<number, Error> = RSVP.resolve(1);
+/** Static assertion that `value` has type `T` */
+// Disable tslint here b/c the generic is used to let us do a type coercion and
+// validate that coercion works for the type value "passed into" the function.
+// tslint:disable-next-line:no-unnecessary-generics
+declare function assertType<T>(value: T): void;
 
-let promise2: RSVP.Promise<number, Error> = RSVP.Promise.resolve(2);
+async function testAsyncAwait() {
+    const awaitedNothing = await RSVP.resolve();
+    const awaitedValue = await RSVP.resolve('just a value');
 
-let promise3: RSVP.Promise<number, Error> = RSVP.Promise.reject(new Error('3'));
-let promise3a: RSVP.Promise<number, Error> = RSVP.reject(new Error('3'));
+    async function returnsAPromise(): RSVP.Promise<string> {
+        return RSVP.resolve('look, a string');
+    }
 
-let promiseArray = [promise1, promise2, promise3];
-
-let promiseHash = {
-    promiseA: promise1,
-    promiseB: promise2,
-    promiseC: promise3,
-    notAPromise: 4,
-};
-
-RSVP.Promise.all(promiseArray).then(arr => {}, err => {});
-RSVP.all(promiseArray).then(arr => {}, err => {});
-
-RSVP.Promise.race(promiseArray).then(arr => {}, err => {});
-RSVP.race(promiseArray).then(arr => {}, err => {});
-
-RSVP.allSettled(promiseArray).then(arr => {}, err => {});
-
-let deferred = RSVP.defer();
-deferred.resolve('Success');
-deferred.promise.then(value => {});
-
-let filterFn = (item: number) => {
-    return item > 1;
-};
-RSVP.filter(promiseArray, filterFn).then(result => {});
-
-RSVP.hashSettled(promiseHash).then(hash => {
-    return (
-        hash.promiseA.state === 'fulfilled' &&
-        hash.promiseB.value === 2 &&
-        hash.promiseC.reason === '3' &&
-        hash.notAPromise.state === 'fulfilled'
-    );
-});
-
-RSVP.hash(promiseHash).then(
-    values => {
-        return (
-            values.promiseA < 0 &&
-            values.promiseB === 4 &&
-            values.promiseC === 12 &&
-            values.notAPromise > 0
-        );
-    },
-    err => {}
-);
-
-let mapFn = function(item: number) {
-    return item + 1;
-};
-RSVP.map(promiseArray, mapFn).then(function(result) {});
-
-let promise = new Promise(function(resolve, reject) {
-    resolve();
-    reject();
-});
-promise.then(value => {}, reason => {});
-
-function throws() {
-    throw new Error('Whoops!');
+    assertType<RSVP.Promise<string>>(returnsAPromise());
+    assertType<string>(await returnsAPromise());
 }
-let throwingPromise = new RSVP.Promise(function(resolve, reject) {
-    throws();
-});
-throwingPromise.catch(RSVP.rethrow).then(value => {}, reason => {});
 
-let someObject = {};
-RSVP.EventTarget.mixin(someObject);
-RSVP.EventTarget.on('fulfilled', someString => {
-    return someString;
-});
-RSVP.EventTarget.trigger('fulfilled', 'woohoo');
-RSVP.EventTarget.off('fulfilled');
+function testCast() {
+    RSVP.Promise.cast('foo').then(value => {
+        assertType<string>(value);
+    });
+
+    RSVP.cast(42).then(value => {
+        assertType<number>(value);
+    });
+}
+
+function testConfigure() {
+    assertType<void>(RSVP.configure('name', { with: 'some value' }));
+    assertType<{}>(RSVP.configure('name'));
+}
+
+function testAsap() {
+    const result = RSVP.asap(something => {
+        console.log(something);
+    }, 'srsly');
+
+    assertType<void>(result);
+}
+
+function testAsync() {
+    const result = RSVP.async(something => {
+        console.log(something);
+    }, 'rly srsly');
+
+    assertType<void>(result);
+}
+
+function testPromise() {
+    const promiseOfString = new RSVP.Promise((resolve: any, reject: any) => resolve('some string'));
+    assertType<RSVP.Promise<number>>(promiseOfString.then((s: string) => s.length));
+}
+
+function testAll() {
+    const imported = all([]);
+    const empty = RSVP.Promise.all([]);
+
+    const everyPromise = RSVP.all([
+        'string',
+        RSVP.resolve(42),
+        RSVP.resolve({ hash: 'with values' }),
+    ]);
+
+    assertType<RSVP.Promise<[string, number, { hash: string }]>>(everyPromise);
+
+    const anyFailure = RSVP.all([12, 'strings', RSVP.reject('anywhere')]);
+    assertType<RSVP.Promise<{}>>(anyFailure);
+
+    let promise1 = RSVP.resolve(1);
+    let promise2 = RSVP.resolve('2');
+    let promise3 = RSVP.resolve({ key: 13 });
+    RSVP.Promise.all([promise1, promise2, promise3], 'my label').then(function(array) {
+        assertType<number>(array[0]);
+        assertType<string>(array[1]);
+        assertType<{ key: number }>(array[2]);
+    });
+}
+
+function testAllSettled() {
+    const resolved1 = RSVP.resolve(1);
+    const resolved2 = RSVP.resolve('wat');
+    const rejected = RSVP.reject(new Error('oh teh noes'));
+    const pending = new RSVP.Promise<{ neato: string }>((resolve, reject) => {
+        if ('something') {
+            resolve({ neato: 'yay' });
+        } else {
+            reject('nay');
+        }
+    });
+
+    // Types flow into resolution properly
+    RSVP.allSettled([resolved1, resolved2, rejected, pending]).then(states => {
+        assertType<RSVP.PromiseState<number>>(states[0]);
+        assertType<RSVP.PromiseState<string>>(states[1]);
+        assertType<RSVP.PromiseState<never>>(states[2]);
+        assertType<RSVP.PromiseState<{ neato: string }>>(states[3]);
+    });
+
+    // Switching on state gives the correctly available items.
+    RSVP.allSettled([resolved1, resolved2, rejected, pending]).then(states => {
+        states.forEach(element => {
+            switch (element.state) {
+                case RSVP.State.fulfilled:
+                    assertType<RSVP.Resolved<typeof element.value>>(element);
+                    break;
+
+                case RSVP.State.rejected:
+                    assertType<RSVP.Rejected<typeof element.reason>>(element);
+                    break;
+
+                case RSVP.State.pending:
+                    assertType<RSVP.Pending>(element);
+                    break;
+
+                default:
+                    // Someday maybe TS will have exhaustiveness checks.
+                    break;
+            }
+        });
+    });
+}
+
+function testDefer() {
+    let deferred = RSVP.defer<string>();
+    deferred.resolve('Success!');
+    deferred.promise.then(function(value) {
+        assertType<string>(value);
+    });
+}
+
+// Using this to differentiate the types cleanly
+type A1 = Array<{ arg: boolean }>;
+type D1 = number;
+type D2 = string;
+type D3 = { some: boolean };
+
+declare const nodeFn1Arg1CbParam: (arg1: A1, callback: (err: any, data: D1) => void) => void;
+declare const nodeFn1Arg2CbParam: (
+    arg1: A1,
+    callback: (err: any, data1: D1, data2: D2) => void
+) => void;
+declare const nodeFn1Arg3CbParam: (
+    arg1: A1,
+    callback: (err: any, data1: D1, data2: D2, data3: D3) => void
+) => void;
+
+function testDenodeify() {
+    // version with no `options` or `options: false`, and single T
+    assertType<(value: A1) => RSVP.Promise<D1>>(RSVP.denodeify(nodeFn1Arg1CbParam));
+    assertType<(value: A1) => RSVP.Promise<D1>>(RSVP.denodeify(nodeFn1Arg1CbParam, false));
+
+    // version with no `options` or `options: false`, and multiple T
+    assertType<(value: A1) => RSVP.Promise<D1>>(RSVP.denodeify(nodeFn1Arg2CbParam));
+    assertType<(value: A1) => RSVP.Promise<D1>>(RSVP.denodeify(nodeFn1Arg3CbParam));
+    assertType<(value: A1) => RSVP.Promise<D1>>(RSVP.denodeify(nodeFn1Arg2CbParam, false));
+    assertType<(value: A1) => RSVP.Promise<D1>>(RSVP.denodeify(nodeFn1Arg3CbParam, false));
+
+    // version with `options: true` and single or multiple T
+    assertType<(value: A1) => RSVP.Promise<[D1]>>(RSVP.denodeify(nodeFn1Arg1CbParam, true));
+    assertType<(value: A1) => RSVP.Promise<[D1, D2]>>(RSVP.denodeify(nodeFn1Arg2CbParam, true));
+    assertType<(value: A1) => RSVP.Promise<[D1, D2, D3]>>(RSVP.denodeify(nodeFn1Arg3CbParam, true));
+
+    // We can't actually map the key names here, because we would need full-on
+    // dependent typing to use the *values of an array* as the keys of the
+    // resulting object.
+    assertType<(value: A1) => RSVP.Promise<{ first: D1 }>>(
+        RSVP.denodeify(nodeFn1Arg1CbParam, ['first'])
+    );
+    assertType<(value: A1) => RSVP.Promise<{ first: D1; second: D2 }>>(
+        RSVP.denodeify(nodeFn1Arg2CbParam, ['first', 'second'])
+    );
+    assertType<(value: A1) => RSVP.Promise<{ first: D1; second: D2; third: D3 }>>(
+        RSVP.denodeify(nodeFn1Arg3CbParam, ['first', 'second', 'third'])
+    );
+
+    const foo = RSVP.denodeify(nodeFn1Arg2CbParam, ['quux', 'baz']);
+    foo([{ arg: true }]).then(value => {
+        console.log(value.quux + 1);
+        console.log(value.baz.length);
+    });
+}
+
+function testFilter() {
+    RSVP.filter([RSVP.resolve(1), RSVP.resolve(2)], item => item > 1, 'over one').then(results => {
+        assertType<number[]>(results);
+    });
+
+    RSVP.filter(
+        [RSVP.resolve('a string'), RSVP.resolve(112233)],
+        item => String(item).length < 10,
+        'short string'
+    ).then(results => {
+        assertType<Array<string | number>>(results);
+    });
+
+    // This is the best we can do: we can't actually write the full type here,
+    // which would be `assertType<never>(results)`, but TS can't infer that.
+    const isString = (item: any): item is string => typeof item === 'string';
+    RSVP.filter([RSVP.reject('for any reason')], isString).then(results => {
+        assertType<{}>(results);
+    });
+}
+
+function testHash() {
+    let promises = {
+        myPromise: RSVP.resolve(1),
+        yourPromise: RSVP.resolve('2'),
+        theirPromise: RSVP.resolve({ key: 3 }),
+        notAPromise: 4,
+    };
+    RSVP.hash(promises, 'my label').then(function(hash) {
+        assertType<number>(hash.myPromise);
+        assertType<string>(hash.yourPromise);
+        assertType<{ key: number }>(hash.theirPromise);
+        assertType<number>(hash.notAPromise);
+    });
+}
+
+function testHashSettled() {
+    function isFulfilled<T>(state: RSVP.PromiseState<T>): state is RSVP.Resolved<T> {
+        return state.state === RSVP.State.fulfilled;
+    }
+    let promises = {
+        myPromise: RSVP.Promise.resolve(1),
+        yourPromise: RSVP.Promise.resolve('2'),
+        theirPromise: RSVP.Promise.resolve({ key: 3 }),
+        notAPromise: 4,
+    };
+    RSVP.hashSettled(promises).then(function(hash) {
+        if (isFulfilled(hash.myPromise)) {
+            assertType<number>(hash.myPromise.value);
+        }
+        if (isFulfilled(hash.yourPromise)) {
+            assertType<string>(hash.yourPromise.value);
+        }
+        if (isFulfilled(hash.theirPromise)) {
+            assertType<{ key: number }>(hash.theirPromise.value);
+        }
+        if (isFulfilled(hash.notAPromise)) {
+            assertType<number>(hash.notAPromise.value);
+        }
+    });
+}
+
+function testMap() {
+    RSVP.map([RSVP.resolve(1), RSVP.resolve(2)], item => item + 1, 'add one').then(results => {
+        assertType<number[]>(results);
+        assertType<{ length: 2 }>(results);
+    });
+
+    RSVP.map([RSVP.resolve('a string'), RSVP.resolve(112233)], String).then(results => {
+        assertType<string[]>(results);
+        assertType<{ length: 2 }>(results);
+    });
+
+    // This is the best we can do: we can't actually write the full type here,
+    // which would be `assertType<never>(results)`, but TS can't infer that.
+    RSVP.map([RSVP.reject('for any reason')], String).then(results => {
+        assertType<{}>(results);
+    });
+}
+
+function testRace() {
+    const imported = race([]);
+    const firstPromise = RSVP.race([{ notAPromise: true }, RSVP.resolve({ some: 'value' })]);
+    assertType<RSVP.Promise<{ notAPromise: boolean } | { some: string }>>(firstPromise);
+
+    let promise1 = RSVP.resolve(1);
+    let promise2 = RSVP.resolve('2');
+    RSVP.Promise.race([promise1, promise2], 'my label').then(function(result) {
+        assertType<string | number>(result);
+    });
+}
+
+function testReject() {
+    assertType<RSVP.Promise<never>>(RSVP.reject());
+    assertType<RSVP.Promise<never>>(RSVP.reject('this is a string'));
+
+    RSVP.reject({ ok: false }).catch(reason => {
+        console.log(`${reason} could be anything`);
+    });
+    RSVP.reject({ ok: false }, 'some label').catch((reason: any) => reason.ok);
+
+    let promise = RSVP.Promise.reject(new Error('WHOOPS'));
+}
+
+function testResolve() {
+    assertType<RSVP.Promise<void>>(RSVP.resolve());
+    assertType<RSVP.Promise<string>>(RSVP.resolve('this is a string'));
+    assertType<RSVP.Promise<string>>(RSVP.resolve(RSVP.resolve('nested')));
+    assertType<RSVP.Promise<string>>(RSVP.resolve(Promise.resolve('nested')));
+
+    let promise = RSVP.Promise.resolve(1);
+    let imported = resolve(1);
+}
+
+function testRethrow() {
+    RSVP.reject(new Error('all the badness'))
+        .catch(RSVP.rethrow)
+        .then(value => {
+            assertType<void>(value);
+        })
+        .catch(reason => {
+            if (reason instanceof Error) {
+                console.log(reason);
+            }
+        });
+}
+
+function testOnAndOff() {
+    RSVP.on('error', (reason: Error) => {
+        console.log(`it was an error: ${reason}`);
+    });
+
+    RSVP.off('whatever', (value: any) => {
+        console.log(
+            `any old value will do: ${value !== undefined && value !== null
+                ? value.toString()
+                : 'even undefined'}`
+        );
+    });
+}
+
+function testAssignableToPromise() {
+    const promise: Promise<number> = RSVP.resolve(0);
+}
diff --git a/types/rsvp/tsconfig.json b/types/rsvp/tsconfig.json
old mode 100644
new mode 100755
index 09238278c1..ebfd4bc00d
--- a/types/rsvp/tsconfig.json
+++ b/types/rsvp/tsconfig.json
@@ -1,23 +1,17 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "target": "es5",
+        "lib": ["es6", "dom"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": true,
+        "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "rsvp-tests.ts"
-    ]
-}
\ No newline at end of file
+    "files": ["index.d.ts", "rsvp-tests.ts"]
+}
diff --git a/types/rsvp/tslint.json b/types/rsvp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rsvp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rsync/tslint.json b/types/rsync/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rsync/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rtree/tslint.json b/types/rtree/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rtree/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/run-sequence/tsconfig.json b/types/run-sequence/tsconfig.json
index 33e3e06aff..412efd6845 100644
--- a/types/run-sequence/tsconfig.json
+++ b/types/run-sequence/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/run-sequence/tslint.json b/types/run-sequence/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/run-sequence/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rvo2/index.d.ts b/types/rvo2/index.d.ts
deleted file mode 100644
index 88ee40cd96..0000000000
--- a/types/rvo2/index.d.ts
+++ /dev/null
@@ -1,581 +0,0 @@
-// Type definitions for rvo2
-// Project: https://github.com/TNOCS/rvo2
-// Definitions by: Erik Vullings <https://github.com/erikvullings>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace rvo2 {
-
-	class Line {
-		/**
-		 * A point on the directed line.
-		 */
-		point: Vector2;
-
-		/**
-		 * The direction of the directed line.
-		 */
-		direction: Vector2;
-	}
-
-  /**
-   * The Agent class has no public members or methods.
-   *
-   * @class Agent
-   */
-	class Agent { }
-
-  /**
-   * The KdTree class has no public members or methods.
-   *
-   * @class KdTree
-   */
-	class KdTree { }
-
-  /**
-   * The Obstacle class has no public members or methods.
-   *
-   * @class Obstacle
-   */
-	class Obstacle { }
-
-  /**
-   * A simple two dimensional vector with an x and y position.
-   *
-   * @class Vector2
-   */
-	class Vector2 {
-    /**
-     * Creates an instance of Vector2.
-     *
-     * @param {number} x
-     * @param {number} y
-     *
-     * @memberOf Vector2
-     */
-		constructor(x: number, y: number);
-
-    /**
-     * Returns the x position.
-     *
-     * @returns {number}
-     *
-     * @memberOf Vector2
-     */
-		x(): number;
-    /**
-     * Returns the y position.
-     *
-     * @returns {number}
-     *
-     * @memberOf Vector2
-     */
-		y(): number;
-    /**
-     * Add two vectors.
-     *
-     * @param {Vector2} v
-     * @returns {Vector2}
-     *
-     * @memberOf Vector2
-     */
-		add(v: Vector2): Vector2;
-    /**
-     * Subtract two vectors.
-     *
-     * @param {Vector2} v
-     * @returns {Vector2}
-     *
-     * @memberOf Vector2
-     */
-		sub(v: Vector2): Vector2;
-    /**
-     * Multiplies the vector by a scalar.
-     *
-     * @param {number} s
-     * @returns {Vector2}
-     *
-     * @memberOf Vector2
-     */
-		mul(s: number): Vector2;
-	}
-
-  /**
-   * An array of Vector2 vectors.
-   *
-   * @class vectorvector
-   */
-	class vectorvector {
-		constructor(size?: number);
-
-		[index: number]: Vector2;
-	}
-
-  /**
-   * Simulation engine.
-   *
-   * @class sim
-   */
-	class RVOSimulator {
-		constructor();
-
-		/**
-		 * Constructs a simulator instance and sets the default
-		 * properties for any new agent that is added.
-     *
-		 * @param {number} timeStep    The time step of the simulation.
-		 *                             Must be positive.
-		 * @param {number} neighborDist    The default maximum distance (center point
-		 *                             to center point) to other agents a new agent
-		 *                             takes into account in the navigation. The
-		 *                             larger this number, the longer he running
-		 *                             time of the simulation. If the number is too
-		 *                             low, the simulation will not be safe. Must be
-		 *                             non-negative.
-		 * @param {number} maxNeighbors    The default maximum number of other agents a
-		 *                             new agent takes into account in the
-		 *                             navigation. The larger this number, the
-		 *                             longer the running time of the simulation.
-		 *                             If the number is too low, the simulation
-		 *                             will not be safe.
-		 * @param {number} timeHorizon The default minimal amount of time for which
-		 *                             a new agent's velocities that are computed
-		 *                             by the simulation are safe with respect to
-		 *                             other agents. The larger this number, the
-		 *                             sooner an agent will respond to the presence
-		 *                             of other agents, but the less freedom the
-		 *                             agent has in choosing its velocities.
-		 *                             Must be positive.
-		 * @param {number} timeHorizonObst The default minimal amount of time for which
-		 *                             a new agent's velocities that are computed
-		 *                             by the simulation are safe with respect to
-		 *                             obstacles. The larger this number, the
-		 *                             sooner an agent will respond to the presence
-		 *                             of obstacles, but the less freedom the agent
-		 *                             has in choosing its velocities.
-		 *                             Must be positive.
-		 * @param {number} radius      The default radius of a new agent.
-		 *                             Must be non-negative.
-		 * @param {number} maxSpeed    The default maximum speed of a new agent.
-		 *                             Must be non-negative.
-		 * @param {Vector2} velocity   The default initial two-dimensional linear
-		 *                             velocity of a new agent (optional).
-		 */
-		constructor(timeStep: number, neighborDist: number, maxNeighbors: number,
-			timeHorizon: number, timeHorizonObst: number, radius: number,
-			maxSpeed: number, velocity?: Vector2);
-
-    /**
-     * Sets the time step of the simulation.
-     *
-     * @param {number} timeStep    The time step of the simulation.
-		 *                             Must be positive.
-     *
-     * @memberOf sim
-     */
-		setTimeStep(timeStep: number): void;
-
-    /**
-     * Lets the simulator perform a simulation step and updates the
-		 * two-dimensional position and two-dimensional velocity of each agent.
-     *
-     * @memberOf RVOSimulator
-     */
-		doStep(): void;
-
-		/**
-		 * Sets the default properties for any new agent that is added.
-		 * @param {number} neighborDist   The default maximum distance (center point
-		 *                             to center point) to other agents a new agent
-		 *                             takes into account in the navigation. The
-		 *                             larger this number, the longer he running
-		 *                             time of the simulation. If the number is too
-		 *                             low, the simulation will not be safe.
-		 *                             Must be non-negative.
-		 * @param {number} maxNeighbors    The default maximum number of other agents a
-		 *                             new agent takes into account in the
-		 *                             navigation. The larger this number, the
-		 *                             longer the running time of the simulation.
-		 *                             If the number is too low, the simulation
-		 *                             will not be safe.
-		 * @param {number} timeHorizon     The default minimal amount of time for which
-		 *                             a new agent's velocities that are computed
-		 *                             by the simulation are safe with respect to
-		 *                             other agents. The larger this number, the
-		 *                             sooner an agent will respond to the presence
-		 *                             of other agents, but the less freedom the
-		 *                             agent has in choosing its velocities.
-		 *                             Must be positive.
-		 * @param {number} timeHorizonObst The default minimal amount of time for which
-		 *                             a new agent's velocities that are computed
-		 *                             by the simulation are safe with respect to
-		 *                             obstacles. The larger this number, the
-		 *                             sooner an agent will respond to the presence
-		 *                             of obstacles, but the less freedom the agent
-		 *                             has in choosing its velocities.
-		 *                             Must be positive.
-		 * @param {number} radius      The default radius of a new agent.
-		 *                             Must be non-negative.
-		 * @param {number} maxSpeed    The default maximum speed of a new agent.
-		 *                             Must be non-negative.
-		 * @param {Vector2} velocity   The default initial two-dimensional linear
-		 *                             velocity of a new agent (optional).
-		 */
-		setAgentDefaults(neighborDist: number, maxNeighbors: number, timeHorizon: number, timeHorizonObst: number, radius: number, maxSpeed: number, velocity?: Vector2): void;
-    /**
-     * Adds a new agent with default properties to the simulation.
-     *
-     * @param {Vector2} position  The two-dimensional starting position of this agent.
-
-     * @returns {number}     The number of the agent, or RVO::RVO_ERROR when the  *                            agent defaults have not been set.
-     *
-     * @membeim
-     */
-		addAgent(position: Vector2): number;
-
-		/**
-		 * Adds a new agent to the simulation.
-     *
-		 * @param {Vector2} position   The two-dimensional starting position of
-		 *                             this agent.
-		 * @param {number} neighborDist    The maximum distance (center point to
-		 *                             center point) to other agents this agent
-		 *                             takes into account in the navigation. The
-		 *                             larger this number, the longer the running
-		 *                             of the simulation. If the number is too
-		 *                             low, the simulation will not be safe.
-		 *                             Must be non-negative.
-		 * @param {number} maxNeighbors    The maximum number of other agents this
-		 *                             agent takes into account in the navigation.
-		 *                             The larger this number, the longer the
-		 *                             running time of the simulation. If the
-		 *                             number is too low, the simulation will not
-		 *                             safe.
-		 * @param {number} timeHorizon     The minimal amount of time for which this
-		 *                             agent's velocities that are computed by the
-		 *                             simulation are safe with respect to other
-		 *                             agents. The larger this number, the sooner
-		 *                             this agent will respond to the presence of
-		 *                             other agents, but the less freedom this
-		 *                             agent has in choosing its velocities.
-		 *                             be positive.
-		 * @param {number} timeHorizonObst The minimal amount of time for which this
-		 *                             agevelocities that are computed by the
-		 *                             simulation are safe with respect to
-		 *                             obst. The larger this number, the
-		 *                             sooner this agent will respond to the
-		 *                             presence of obstacles, but the less freedom
-		 *                             this agent has in choosing its velocities.
-		 *                             Must be positive.
-		 * @param {number} radius      The radius of this agent.
-		 *                             Must be non-negative.
-		 * @param {number} maxSpeed    The maximum speed of this agent.
-		 *                             Must be non-negative.
-		 * @param {number} velocity    The initial two-dimensional linear velocity
-		 *                             of this agent (optional).
-		 * @returns {number} The number of the agent.
-		 */
-		addAgent(position: Vector2, neighborDist: number, maxNeighbors: number,
-			timeHorizon: number, timeHorizonObst: number, radius: number,
-			maxSpeed: number, velocity: Vector2): number;
-
-		/**
-		 * Adds a new obstacle to the simulation.
-     *
-		 * To add a "negative" obstacle, e.g. a bounding polygon around
-		 * the environment, the vertices should be listed in clockwise order.
-     *
-		 * @param {vectorvector} vertices List of the vertices of the polygonal
-		 *             obstacle in counterclockwise order.
-		 * @returns {number} The number of the first vertex of the obstacle,
-		 *             or RVO::RVO_ERROR when the number of vertices is less than two.
-		 */
-		addObstacle(vertices: vectorvector): number;
-
-    /**
-     * Returns the position of agent at the specified index.
-     *
-     * @param {number} index      Index of the agent. Must be >= 0.
-     * @returns {Vector2}    Position of the agent.
-     *
-     * @memberOf sim
-     */
-		getAgentPosition(index: number): Vector2;
-
-		/**
-		 * Sets the two-dimensional preferred velocity of a specified agent.
-		 * @param {number} agentNo     The number of the agent whose two-dimensional
-     *                             preferred velocity is to be modified.
-		 * @param {Vector2} prefVelocity    The replacement of the two-dimensional
-		 *                             preferred velocity.
-		 */
-		setAgentPrefVelocity(agentNo: number, prefVelocity: Vector2): void;
-
-		/**
-		 * Returns the specified agent neighbor of the specified agent.
-     *
-		 * @param {number} agentNo     The number of the agent whose agent
-		 *                             neighbor is to be retrieved.
-		 * @param {number} neighborNo  The number of the agent neighbor to be
-		 *                             retrieved.
-		 * @returns The number of the neighboring agent.
-		 */
-		getAgentAgentNeighbor(agentNo: number, neighborNo: number): number;
-
-		/**
-		 * Returns the maximum neighbor count of a specified agent.
-     *
-		 * @param {number} agentNo The number of the agent whose maximum neighbor count is
-     *                         to be retrieved.
-		 * @return {number} The present maximum neighbor count of the agent.
-		 */
-		getAgentMaxNeighbors(agentNo: number): number;
-
-		/**
-		 * Returns the maximum speed of a specified agent.
-		 *
-     * @param {number} agentNo The number of the agent whose maximum speed is to be retrieved.
-		 * @return {number} The present maximum speed of the agent.
-		 */
-		getAgentMaxSpeed(agentNo: number): number;
-
-		/**
-		 * Returns the maximum neighbor distance of a specified agent.
-		 * @param {number} agentNo The number of the agent whose maximum
-		 *                         neighbor distance is to be retrieved.
-		 * @return The present maximum neighbor distance of the agent.
-		 */
-		getAgentNeighborDist(agentNo: number): number;
-
-		/**
-		 * Returns the count of agent neighbors taken into account to
-		 * compute the current velocity for the specified agent.
-     *
-		 * @param {number} agentNo The number of the agent whose count of agent
-		 *                         neighbors is to be retrieved.
-		 * @return {number} The count of agent neighbors taken into account to compute
-		 *             the current velocity for the specified agent.
-		 */
-		getAgentNumAgentNeighbors(agentNo: number): number;
-
-		/**
-		 * Returns the count of obstacle neighbors taken into account
-		 * to compute the current velocity for the specified agent.
-     *
-		 * @param {number} agentNo The number of the agent whose count of
-		 *                         obstacle neighbors is to be retrieved.
-		 * @return {number} The count of obstacle neighbors taken into account to
-		 *             compute the current velocity for the specified agent.
-		 */
-		getAgentNumObstacleNeighbors(agentNo: number): number;
-
-
-		/**
-		 * Returns the count of ORCAconstraints used to compute
-     *
-		 * the current velocity for the specified agent.
-     *
-		 * @param {number} agentNo The number of the agent whose count of ORCA
-		 *                        constraints is to be retrieved.
-     *
-		 * @return {number} The count of ORCAconstraints used to compute the current
-     *
-		 *             velocity for the specified agent.
-		 */
-		getAgentNumORCALines(agentNo: number): number;
-
-		/**
-		 * Returns the specified obstacle neighbor of the specified agent.
-     *
-		 * @param {number} agentNo The number of the agent whose obstacle
-		 *                         neighbor is to be retrieved.
-		 * @param {number} neighborNo The number of the obstacle neighbor to be
-		 *                            retrieved.
-		 * @return {number} The number of the first vertex of the neighboring obstacle edge.
-		 */
-		getAgentObstacleNeighbor(agentNo: number, neighborNo: number): number;
-
-		/**
-		 * Returns the specified ORCA constraint of the specified agent.
-     *
-		 * The halfplane to the left of the line is the region of
-		 * permissible velocities with respect to the specified
-		 * ORCAconstraint.
-     *
-		 * @param {number} agentNo The number of the agent whose ORCA constraint is to be retrieved.
-     *
-		 * @param {number} lineNo The number of the ORCAconstraint to be retrieved.
-		 * @return {number} A line representing the specified ORCAconstraint.
-     *
-     *
-		 */
-		getAgentORCALine(agentNo: number, lineNo: number): Line;
-
-		/**
-		 * Returns the two-dimensional position of a specified
-		 *             agent.
-		 * @param {number} agentNo The number of the agent whose two-dimensional position
-     *                         is to be retrieved.
-		 * @return {number} The present two-dimensional position of the (center of the) agent.
-		 */
-		getAgentPosition(agentNo: number): Vector2;
-
-		/**
-		 * Returns the two-dimensional preferred velocity of a
-		 *             specified agent.
-		 * @param {number} agentNo  The number of the agent whose two-dimensional
-     *             preferred velocity is to be retrieved.
-		 * @return {number} The present two-dimensional preferred velocity of the agent.
-		 */
-		getAgentPrefVelocity(agentNo: number): Vector2;
-
-		/**
-		 * Returns the radius of a specified agent.
-		 * @param {number} agentNo The number of the agent whose radius is to be retrieved.
-		 * @return {number} The present radius of the agent.
-		 */
-		getAgentRadius(agentNo: number): number;
-
-		/**
-		 * Returns the time horizon of a specified agent.
-		 * @param {number} agentNo The number of the agent whose time horizon is to be retrieved.
-		 * @return {number} The present time horizon of the agent.
-		 */
-		getAgentTimeHorizon(agentNo: number): number;
-
-		/**
-		 * Returns the time horizon with respect to obstacles of a specified agent.
-     *
-		 * @param {number} agentNo The number of the agent whose time horizon
-		 *                         with respect to obstacles is to be retrieved.
-		 * @return {number} The present time horizon with respect to obstacles of the
-		 *             agent.
-		 */
-		getAgentTimeHorizonObst(agentNo: number): number;
-
-		/**
-		 * Returns the two-dimensional linear velocity of a
-		 *             specified agent.
-		 * @param {number} agentNo The number of the agent whose two-dimensional linear
-     *                         velocity is to be retrieved.
-		 * @return {Vector2} The present two-dimensional linear velocity of the agent.
-		 */
-		getAgentVelocity(agentNo: number): Vector2;
-
-		/**
-		 * Returns the global time of the simulation.
-     *
-		 * @return {number} The present global time of the simulation (zero initially).
-		 */
-		getGlobalTime(): number;
-
-		/**
-		 * Returns the count of agents in the simulation.
-     *
-		 * @return {number} The count of agents in the simulation.
-		 */
-		getNumAgents(): number;
-
-		/**
-		 * Returns the count of obstacle vertices in the simulation.
-     *
-		 * @return {number} The count of obstacle vertices in the simulation.
-		 */
-		getNumObstacleVertices(): number;
-
-		/**
-		 * Returns the two-dimensional position of a specified obstacle vertex.
-		 * @param {number} vertexNo The number of the obstacle vertex to be retrieved.
-		 * @return {Vector2} The two-dimensional position of the specified obstacle vertex.
-		 */
-		getObstacleVertex(vertexNo: number): Vector2;
-
-		/**
-		 * Returns the number of the obstacle vertex succeeding the specified obstacle vertex in its polygon.
-     *
-		 * @param {number} vertexNo The number of the obstacle vertex whose
-		 *                          successor is to be retrieved.
-		 * @return {number} The number of the obstacle vertex succeeding the specified
-		 *             obstacle vertex in its polygon.
-		 */
-		getNextObstacleVertexNo(vertexNo: number): number;
-
-		/**
-		 * Returns the number of the obstacle vertex preceding the specified obstacle
-     * vertex in its polygon.
-     *
-		 * @param {number} vertexNo The number of the obstacle vertex whose
-		 *                          predecessor is to be retrieved.
-		 * @return {number} The number of the obstacle vertex preceding the specified
-		 *             obstacle vertex in its polygon.
-		 */
-		getPrevObstacleVertexNo(vertexNo: number): number;
-
-		/**
-		 * Returns the time step of the simulation.
-     *
-		 * @return {number} The present time step of the simulation.
-		 */
-		getTimeStep(): number;
-
-		/**
-		 * Processes the obstacles that have been added so that they are accounted for in
-     * the simulation.
-     *
-		 * Obstacles added to the simulation after this function has
-		 * been called are not accounted for in the simulation.
-		 */
-		processObstacles(): void;
-
-		/**
-		 * Performs a visibility query between the two specified points with respect to
-     * the obstacles
-     *
-		 * @param {number} point1 The first point of the query.
-		 * @param {number} point2 The second point of the query.
-		 * @param {number} radius The minimal distance between the line
-		 *                        connecting the two points and the obstacles
-		 *                        in order for the points to be mutually
-		 *                        visible (optional). Must be non-negative.
-		 * @return {number} A boolean specifying whether the two points are mutually
-		 * visible. Returns true when the obstacles have not been processed.
-		 */
-		queryVisibility(point1: Vector2, point2: Vector2, radius?: number): number;
-	}
-
-  /**
-   * Computes the length of a specified two-dimensional vector.
-   *
-   * @param {Vector2} v   The two-dimensional vector whose length is to be computed.
-   * @returns {number}    The length of the two-dimensional vector.
-   *
-   * @memberOf sim
-   */
-	function abs(v: Vector2): number;
-
-	/**
-	 * Computes the squared length of a specified two-dimensional vector.
-	 * @param {Vector2} v The two-dimensional vector whose squared length is to be computed.
-	 * @returns {number}  The squared length of the two-dimensional vector.
-	 */
-	function absSq(v: Vector2): number;
-
-	/**
-	 * Computes the determinant of a two-dimensional square matrix with
-	 * rows consisting of the specified two-dimensional vectors.
-	 * @param {Vector2} v1 The top row of the two-dimensional square matrix.
-	 * @param {Vector2} v2 The bottom row of the two-dimensional square matrix.
-	 * @returns {number} The determinant of the two-dimensional square matrix.
-	 */
-	function det(v1: Vector2, v2: Vector2): number;
-
-	/**
- * Computes the normalization of the specified two-dimensional vector.
- * @param {Vector2} vector  The two-dimensional vector whose normalization
- *                          is to be computed.
- * returns {Vector2}   The normalization of the two-dimensional vector.
- */
-	function normalize(vector: Vector2): Vector2
-
-}
-
-export = rvo2;
\ No newline at end of file
diff --git a/types/rvo2/rvo2-tests.ts b/types/rvo2/rvo2-tests.ts
deleted file mode 100644
index 80906011e9..0000000000
--- a/types/rvo2/rvo2-tests.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { Vector2, vectorvector, RVOSimulator, absSq, normalize } from './index';
-
-// Some examples of vector functions.
-const v1 = new Vector2(-1, 2);
-const v2 = new Vector2(1, 2);
-const v3 = v1.mul(3);  // -3, 6
-const v4 = v1.sub(v2); // -2, 0
-const v5 = v1.add(v2); //  0, 4
-
-function setupScenario(sim: RVOSimulator, goals: vectorvector) {
-  sim.setTimeStep(0.25);
- 	/* Specify the default parameters for agents that are subsequently added. */
-  sim.setAgentDefaults(15, 10, 5, 5, 2, 2);
-
-	/*
-	 * Add agents, specifying their start position, and store their goals on the
-	 * opposite side of the environment.
-	 */
-	for (var i = 0; i < 5; ++i) {
-		for (var j = 0; j < 5; ++j) {
-			var index = sim.addAgent(new Vector2(55 + i * 10,  55 + j * 10));
-			goals[index] = new Vector2(-75, -75);
-
-			index = sim.addAgent(new Vector2(-55 - i * 10,  55 + j * 10));
-			goals[index] = new Vector2(75, -75);
-
-			index = sim.addAgent(new Vector2(55 + i * 10, -55 - j * 10));
-			goals[index] = new Vector2(-75, 75);
-
-			index = sim.addAgent(new Vector2(-55 - i * 10, -55 - j * 10));
-			goals[index] = new Vector2(75, 75);
-		}
-	}
-
-	/*
-	 * Add (polygonal) obstacles, specifying their vertices in counterclockwise
-	 * order.
-	 */
-	const obstacle1 = new vectorvector(4)
-    , obstacle2 = new vectorvector(4)
-    , obstacle3 = new vectorvector(4)
-    , obstacle4 = new vectorvector(4);
-
-	obstacle1[0] = new Vector2(-10, 40);
-	obstacle1[1] = new Vector2(-40, 40);
-	obstacle1[2] = new Vector2(-40, 10);
-	obstacle1[3] = new Vector2(-10, 10);
-
-	obstacle2[0] = new Vector2(10, 40);
-	obstacle2[1] = new Vector2(10, 10);
-	obstacle2[2] = new Vector2(40, 10);
-	obstacle2[3] = new Vector2(40, 40);
-
-	obstacle3[0] = new Vector2(10, -40);
-	obstacle3[1] = new Vector2(40, -40);
-	obstacle3[2] = new Vector2(40, -10);
-	obstacle3[3] = new Vector2(10, -10);
-
-	obstacle4[0] = new Vector2(-10, -40);
-	obstacle4[1] = new Vector2(-10, -10);
-	obstacle4[2] = new Vector2(-40, -10);
-	obstacle4[3] = new Vector2(-40, -40);
-
-	sim.addObstacle(obstacle1);
-	sim.addObstacle(obstacle2);
-	sim.addObstacle(obstacle3);
-	sim.addObstacle(obstacle4);
-
-	/* Process the obstacles so that they are accounted for in the simulation. */
-	sim.processObstacles();
-}
-
-function updateVisualization(sim: RVOSimulator)
-{
-	/* Output the current global time. */
-	const time = sim.getGlobalTime();
-  // console.log(`Time: ${time}`);
-	/* Output the current position of all the agents. */
-	for (let i = 0; i < sim.getNumAgents(); ++i) {
-    const p = sim.getAgentPosition(i);
-    // console.log(`#${i}) x: ${p.x()}, y: ${p.y()}`);
-  }
-}
-
-function setPreferredVelocity(sim: RVOSimulator, goals: vectorvector) {
-  for (var i = 0; i < sim.getNumAgents(); i++) {
-    const delta = goals[i].sub(sim.getAgentPosition(i));
-
-		/*
-		 * Perturb a little to avoid deadlocks due to perfect symmetry.
-		 */
-		const angle = Math.random() * 2.0 * Math.PI;
-		const dist = Math.random() * 0.0001;
-
-    var goalVector = new Vector2(delta.x() + dist * Math.cos(angle), delta.y() + dist * Math.sin(angle));
-
-    if (absSq(goalVector) > 1.0) {
-      goalVector = normalize(goalVector);
-    }
-
-    sim.setAgentPrefVelocity(i, goalVector);
-  }
-}
-
-function reachedGoal(sim: RVOSimulator, goals: vectorvector) {
-  /* Check if all agents have reached their goals. */
-  for (var i = 0; i < sim.getNumAgents(); ++i) {
-    const dist = sim.getAgentPosition(i).sub(goals[i]);
-    if (absSq(dist) > 400) { // 400 <= 20 x 20
-      return false;
-    }
-  }
-  return true;
-}
-
-function main(debug = false) {
-  const nbrAgents = 100;
-  const sim = new RVOSimulator();
-  const goals = new vectorvector(nbrAgents);
-
-  setupScenario(sim, goals);
-
-  // sim.addObstacle(vv);
-  var i = 0;
-  do {
-    if (++i % 10 === 0) {
-      // console.log('TIME: ' + i);
-    }
-    setPreferredVelocity(sim, goals);
-    if (debug) { updateVisualization(sim); }
-    sim.doStep();
-  } while (!reachedGoal(sim, goals));
-
-  // console.log('Done');
-}
-
-main();
diff --git a/types/rvo2/tsconfig.json b/types/rvo2/tsconfig.json
deleted file mode 100644
index 5c3ed8e702..0000000000
--- a/types/rvo2/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "rvo2-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/rx-angular/tslint.json b/types/rx-angular/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rx-angular/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rx-jquery/tslint.json b/types/rx-jquery/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rx-jquery/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rx-lite/index.d.ts b/types/rx-lite/index.d.ts
index 331145e0dd..16646b0473 100644
--- a/types/rx-lite/index.d.ts
+++ b/types/rx-lite/index.d.ts
@@ -327,21 +327,21 @@ declare namespace Rx {
 
         /**
          * Projects each notification of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
-         * @param {Function} onNext A transform function to apply to each element; the second parameter of the function represents the index of the source element.
-         * @param {Function} onError A transform function to apply when an error occurs in the source sequence.
-         * @param {Function} onCompleted A transform function to apply when the end of the source sequence is reached.
-         * @param {Any} [thisArg] An optional "this" to use to invoke each transform.
-         * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function corresponding to each notification in the input sequence.
+         * @param onNext A transform function to apply to each element; the second parameter of the function represents the index of the source element.
+         * @param onError A transform function to apply when an error occurs in the source sequence.
+         * @param onCompleted A transform function to apply when the end of the source sequence is reached.
+         * @param [thisArg] An optional "this" to use to invoke each transform.
+         * @returns An observable sequence whose elements are the result of invoking the one-to-many transform function corresponding to each notification in the input sequence.
          */
         selectManyObserver<T2, T3, T4>(onNext: (value: T, index: number) => Observable<T2>, onError: (exception: any) => Observable<T3>, onCompleted: () => Observable<T4>, thisArg?: any): Observable<T2 | T3 | T4>;
 
         /**
          * Projects each notification of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
-         * @param {Function} onNext A transform function to apply to each element; the second parameter of the function represents the index of the source element.
-         * @param {Function} onError A transform function to apply when an error occurs in the source sequence.
-         * @param {Function} onCompleted A transform function to apply when the end of the source sequence is reached.
-         * @param {Any} [thisArg] An optional "this" to use to invoke each transform.
-         * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function corresponding to each notification in the input sequence.
+         * @param onNext A transform function to apply to each element; the second parameter of the function represents the index of the source element.
+         * @param onError A transform function to apply when an error occurs in the source sequence.
+         * @param onCompleted A transform function to apply when the end of the source sequence is reached.
+         * @param [thisArg] An optional "this" to use to invoke each transform.
+         * @returns An observable sequence whose elements are the result of invoking the one-to-many transform function corresponding to each notification in the input sequence.
          */
         flatMapObserver<T2, T3, T4>(onNext: (value: T, index: number) => Observable<T2>, onError: (exception: any) => Observable<T3>, onCompleted: () => Observable<T4>, thisArg?: any): Observable<T2 | T3 | T4>;
 
@@ -426,7 +426,7 @@ declare namespace Rx {
          * @since 2.2.28
          * @param selector Selector to invoke for every item in the current subscription.
          * @param [thisArg] An optional context to invoke with the selector parameter.
-         * @returns {An exclusive observable with only the results that happen when subscribed.
+         * @returns An exclusive observable with only the results that happen when subscribed.
          */
         exclusiveMap<I, R>(selector: (value: I, index: number, source: Observable<I>) => R, thisArg?: any): Observable<R>;
 
diff --git a/types/rx-node/tslint.json b/types/rx-node/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rx-node/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/rx.wamp/tslint.json b/types/rx.wamp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/rx.wamp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/s3-upload-stream/package.json b/types/s3-upload-stream/package.json
index 6a583a47b0..3711406140 100644
--- a/types/s3-upload-stream/package.json
+++ b/types/s3-upload-stream/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "aws-sdk": "^2.37.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/s3-uploader/tslint.json b/types/s3-uploader/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/s3-uploader/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/s3rver/tslint.json b/types/s3rver/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/s3rver/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/safari-extension-content/tslint.json b/types/safari-extension-content/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/safari-extension-content/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/safari-extension/tslint.json b/types/safari-extension/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/safari-extension/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/safe-compare/index.d.ts b/types/safe-compare/index.d.ts
new file mode 100644
index 0000000000..91b2b9f0ff
--- /dev/null
+++ b/types/safe-compare/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for safe-compare 1.1
+// Project: https://github.com/Bruce17/safe-compare#readme
+// Definitions by: Vadim Belorussov <https://github.com/bevalorous>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = safeCompare;
+
+/**
+ * Do a constant time string comparison. Always compare the complete strings
+ * against each other to get a constant time. This method does not short-cut
+ * if the two string's length differs.
+ */
+declare function safeCompare(a: string, b: string): boolean;
diff --git a/types/safe-compare/safe-compare-tests.ts b/types/safe-compare/safe-compare-tests.ts
new file mode 100644
index 0000000000..55fa43bb89
--- /dev/null
+++ b/types/safe-compare/safe-compare-tests.ts
@@ -0,0 +1,34 @@
+import safeCompare = require("safe-compare");
+
+safeCompare('foo', 'foo'); // $ExpectType boolean
+safeCompare('hello world', 'hello world'); // $ExpectType boolean
+safeCompare('你好，世界', '你好，世界'); // $ExpectType boolean
+safeCompare('สวัสดีชาวโล�', 'สวัสดีชาวโล�'); // $ExpectType boolean
+// => true
+
+safeCompare('foo', 'bar'); // $ExpectType boolean
+safeCompare('你好，世界', '您好'); // $ExpectType boolean
+safeCompare('สวัสดีชาวโล�', 'สวัสดี'); // $ExpectType boolean
+// => false
+
+safeCompare(undefined, ''); // $ExpectError
+safeCompare(void 0, ''); // $ExpectError
+safeCompare(null, ''); // $ExpectError
+safeCompare(true, ''); // $ExpectError
+safeCompare(false, ''); // $ExpectError
+safeCompare({}, ''); // $ExpectError
+safeCompare([], ''); // $ExpectError
+safeCompare(42, ''); // $ExpectError
+safeCompare(NaN, ''); // $ExpectError
+// => error
+
+safeCompare('', undefined); // $ExpectError
+safeCompare('', void 0); // $ExpectError
+safeCompare('', null); // $ExpectError
+safeCompare('', true); // $ExpectError
+safeCompare('', false); // $ExpectError
+safeCompare('', {}); // $ExpectError
+safeCompare('', []); // $ExpectError
+safeCompare('', 42); // $ExpectError
+safeCompare('', NaN); // $ExpectError
+// => error
diff --git a/types/safe-compare/tsconfig.json b/types/safe-compare/tsconfig.json
new file mode 100644
index 0000000000..0aade26241
--- /dev/null
+++ b/types/safe-compare/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "safe-compare-tests.ts"
+    ]
+}
diff --git a/types/safe-compare/tslint.json b/types/safe-compare/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/safe-compare/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/safe-regex/index.d.ts b/types/safe-regex/index.d.ts
index 582f8fa443..41aca4c6b3 100644
--- a/types/safe-regex/index.d.ts
+++ b/types/safe-regex/index.d.ts
@@ -4,4 +4,4 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = safe_regex;
-declare function safe_regex(re: string | RegExp, opts?: { limit?: number | undefined }): boolean;
+declare function safe_regex(re: string | RegExp, opts?: { limit?: number }): boolean;
diff --git a/types/sails.io.js/tslint.json b/types/sails.io.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sails.io.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/saml2-js/index.d.ts b/types/saml2-js/index.d.ts
index 5ea6fcea07..d0a66d0246 100644
--- a/types/saml2-js/index.d.ts
+++ b/types/saml2-js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Clever/saml2
 // Definitions by: horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare module "saml2-js" {
 
diff --git a/types/saml2-js/tslint.json b/types/saml2-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/saml2-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/samlp/index.d.ts b/types/samlp/index.d.ts
index da7d143c75..8e082cedc5 100644
--- a/types/samlp/index.d.ts
+++ b/types/samlp/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/auth0/node-samlp
 // Definitions by: horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express" />
 /// <reference types="passport" />
diff --git a/types/samlp/tslint.json b/types/samlp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/samlp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sammy/tslint.json b/types/sammy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sammy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sanctuary/index.d.ts b/types/sanctuary/index.d.ts
new file mode 100644
index 0000000000..78ec3bfd71
--- /dev/null
+++ b/types/sanctuary/index.d.ts
@@ -0,0 +1,452 @@
+// Type definitions for sanctuary 0.14
+// Project: https://github.com/sanctuary-js/sanctuary#readme
+// Definitions by: David Chambers <https://github.com/davidchambers>
+//                 Juan J. Jimenez-Anca <https://github.com/cortopy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type Nullable<A> = A | null;
+
+export type Pair<A, B> = [A, B];
+
+export type Thunk<A> = () => A;
+
+export type Fn<A, B>                = (a: A) => B;
+export type Fn2<A, B, C>            = (a: A) => (b: B) => C;
+export type Fn3<A, B, C, D>         = (a: A) => (b: B) => (c: C) => D;
+export type Fn4<A, B, C, D, E>      = (a: A) => (b: B) => (c: C) => (d: D) => E;
+export type Fn5<A, B, C, D, E, F>   = (a: A) => (b: B) => (c: C) => (d: D) => (e: E) => F;
+export type Fn2_<A, B, C>           = (a: A, b: B) => C;
+export type Fn3_<A, B, C, D>        = (a: A, b: B, c: C) => D;
+export type Fn4_<A, B, C, D, E>     = (a: A, b: B, c: C, d: D) => E;
+export type Fn5_<A, B, C, D, E, F>  = (a: A, b: B, c: C, d: D, e: E) => F;
+
+export type Predicate<A> = (a: A) => boolean;
+
+export interface StrMap<A> { [k: string]: A; }
+
+export interface Maybe<A> {
+  constructor: {
+    '@@type': 'sanctuary/Maybe';
+  };
+}
+
+export interface Either<A, B> {
+  constructor: {
+    '@@type': 'sanctuary/Either';
+  };
+}
+
+export type ValidNumber            = number;
+export type FiniteNumber           = number;
+export type NonZeroFiniteNumber    = number;
+export type Integer                = number;
+export type NonNegativeInteger     = number;
+
+export interface TypeRep {}
+
+export interface Setoid<A> {}
+export interface Ord<A> extends Setoid<A> {}
+export interface Semigroupoid<A, B> {}
+export interface Category<A> extends Semigroupoid<A, A> {}
+export interface Semigroup<A> {}
+export interface Monoid<A> extends Semigroup<A> {}
+export interface Functor<A> {}
+export interface Bifunctor<A, C> extends Functor<C> {}
+export interface Profunctor<B, C> extends Functor<C> {}
+export interface Apply<A> extends Functor<A> {}
+export interface Applicative<A> extends Apply<A> {}
+export interface Chain<A> extends Apply<A> {}
+export interface ChainRec<A> extends Chain<A> {}
+export interface Monad<A> extends Applicative<A>, Chain<A> {}
+export interface Alt<A> extends Functor<A> {}
+export interface Plus<A> extends Alt<A> {}
+export interface Alternative<A> extends Applicative<A>, Plus<A> {}
+export interface Foldable<A> {}
+export interface Traversable<A> extends Functor<A>, Foldable<A> {}
+export interface Extend<A> extends Functor<A> {}
+export interface Comonad<A> extends Extend<A> {}
+export interface Contravariant<A> {}
+
+export const Maybe: TypeRep;
+export const Nothing: Maybe<any>;
+export function Just<A>(x: A): Maybe<A>;
+
+export const Either: TypeRep;
+export function Left<A>(x: A): Either<A, any>;
+export function Right<A>(x: A): Either<any, A>;
+
+//  TODO: Specify return type
+export function create(opts: {checkTypes: boolean, env: any[]}): {};
+
+export const env: any[];
+
+//  Classify
+export function type(x: any): {
+  namespace: Maybe<string>
+  name: string
+  version: NonNegativeInteger
+};
+
+export function is(typeRep: TypeRep): (x: any) => boolean;
+
+//  Showable
+export function toString(x: any): string;
+
+//  Fantasy Land
+export function equals<A>(x: Setoid<A>): (y: Setoid<A>) => boolean;
+
+export function lt <A>(x: Ord<A>): (y: Ord<A>) => boolean;
+export function lte<A>(x: Ord<A>): (y: Ord<A>) => boolean;
+export function gt <A>(x: Ord<A>): (y: Ord<A>) => boolean;
+export function gte<A>(x: Ord<A>): (y: Ord<A>) => boolean;
+
+export function min<A>(x: Ord<A>): (y: Ord<A>) => A;
+export function max<A>(x: Ord<A>): (y: Ord<A>) => A;
+
+export function id<A>(p: TypeRep): Fn<A, A> | Category<any>;
+
+export function concat<A>(x: Semigroup<A>): (y: Semigroup<A>) => Semigroup<A>;
+export function concat<A>(x: A[]): (y: A[]) => A[];
+export function concat<A>(x: StrMap<A>): (y: StrMap<A>) => StrMap<A>;
+export function concat(x: string): (y: string) => string;
+
+export function empty(p: TypeRep): Monoid<any>;
+
+export function map<A, B>(p: Fn<A, B>): {
+  <C>(q: Fn<C, A>): Fn<C, B>;
+     (q: A[]): B[];
+     (q: StrMap<A>): StrMap<B>;
+     (q: Functor<A>): Functor<B>;
+};
+
+export function bimap<A, B>(p: Fn<A, B>): <C, D>(q: Fn<C, D>) => (r: Bifunctor<A, C>) => Bifunctor<B, D>;
+
+export function promap<A, B>(p: Fn<A, B>): <C, D>(q: Fn<C, D>) => {
+  (r: Fn<B, C>): Fn<A, D>;
+  (r: Profunctor<B, C>): Profunctor<A, D>;
+};
+
+export function alt<A>(x: Alt<A>): (y: Alt<A>) => Alt<A>;
+
+export function zero(p: TypeRep): Plus<any>;
+
+export function reduce<A, B>(p: Fn2<B, A, B>): (q: B) => (r: A[] | StrMap<A> | Maybe<A> | Either<any, A> | Foldable<A>) => B;
+
+export function traverse(typeRep: TypeRep): <A, B>(f: Fn<A, Applicative<B>>) => (traversable: Traversable<A>) => Applicative<Traversable<B>>;
+
+export function sequence(typeRep: TypeRep): <A>(traversable: Traversable<Applicative<A>>) => Applicative<Traversable<A>>;
+
+export function ap<A, B>(p: Apply<Fn<A, B>>): (q: Apply<A>) => Apply<B>;
+
+export function lift2<A, B, C>(f: Fn2<A, B, C>): {
+  <X>(x: Fn<X, A>): (y: Fn<X, B>) => Fn<X, C>;
+     (x: Apply<A>): (y: Apply<B>) => Apply<C>;
+};
+
+export function lift3<A, B, C, D>(f: Fn3<A, B, C, D>): {
+  <X>(x: Fn<X, A>): (y: Fn<X, B>) => (z: Fn<X, C>) => Fn<X, D>;
+     (x: Apply<A>): (y: Apply<B>) => (z: Apply<C>) => Apply<D>;
+};
+
+export function apFirst <A>(x: Apply<A>): (y: Apply<any>) => Apply<A>;
+export function apSecond(x: Apply<any>): <B>(y: Apply<B>) => Apply<B>;
+
+export function of<A>(typeRep: TypeRep): (x: A) =>     Fn<any, A>;
+export function of<A>(typeRep: TypeRep): (x: A) => Applicative<A>;
+
+export function chain<A, B, X>(f: Fn2<A, X, B>): (chain_: Fn<X, A>) => Fn<X, B>;
+export function chain<A, B>(f: Fn <A,  Chain<B>>): (chain_: Chain<A>) => Chain<B>;
+
+export function join<A, B>(chain_: Fn2<B, B, A>): Fn<B, A>;
+export function join<A>(chain_: A[][]): A[];
+export function join<A>(chain_: Maybe<Maybe<A>>): Maybe<A>;
+export function join<A>(chain_: Chain<Chain<A>>): Chain<A>;
+
+export function chainRec(typeRep: TypeRep): {
+  <A, B, X>(f: Fn2<A, X, Either<A, B>>): (x: A)        => Fn<X, B>;
+  <A, B>   (f: Fn <A, ChainRec<Either<A, B>>>): (x: A) => ChainRec<B>;
+};
+
+export function extend<A, B>(f: Fn<Extend<A>, B>): (extend_: Extend<A>) => Extend<B>;
+
+export function extract<A>(comonad: Comonad<A>): A;
+
+export function contramap<A, B>(f: Fn<B, A>): {
+  <X>(contravariant: Fn<A, X>): Fn<B, X>;
+     (contravariant: Contravariant<A>): Contravariant<B>;
+};
+
+export function filter <A>(pred: Predicate<A>): {
+  (m: A[]): A[];
+  (m: Foldable<A>): Foldable<A>;
+};
+
+export function filterM<A>(pred: Predicate<A>): {
+  (m: A[]): A[];
+  (m: Foldable<A>): Foldable<A>;
+};
+
+export function takeWhile<A>(pred: Predicate<A>): (foldable: Foldable<A>) => Foldable<A>;
+export function dropWhile<A>(pred: Predicate<A>): (foldable: Foldable<A>) => Foldable<A>;
+
+//  Combinator
+export function I<A>(x: A): A;
+
+export function K<A>(x: A): (y: any) => A;
+
+export function T<A>(x: A): <B>(f: Fn<A, B>) => B;
+
+//  Function
+export function curry2<A, B, C>(f: Fn2_<A, B, C>): Fn2<A, B, C>;
+
+export function curry3<A, B, C, D>(f: Fn3_<A, B, C, D>): Fn3<A, B, C, D>;
+
+export function curry4<A, B, C, D, E>(f: Fn4_<A, B, C, D, E>): Fn4<A, B, C, D, E>;
+
+export function curry5<A, B, C, D, E, F>(f: Fn5_<A, B, C, D, E, F>): Fn5<A, B, C, D, E, F>;
+
+export function flip<A, B, C>(f: Fn2<A, B, C>): Fn2<B, A, C>;
+
+//  Composition
+export function compose<B, C>(f: Fn<B, C>): <A>(g: Fn<A, B>) => Fn<A, C>;
+export function compose<B, C>(x: Semigroupoid<B, C>): <A>(y: Semigroupoid<A, B>) => Semigroupoid<A, C>;
+
+export function pipe<A, B>(fs: [Fn<A, B>]): (x: A) => B;
+export function pipe<A, B, C>(fs: [Fn<A, B>, Fn<B, C>]): (x: A) => C;
+export function pipe<A, B, C, D>(fs: [Fn<A, B>, Fn<B, C>, Fn<C, D>]): (x: A) => D;
+export function pipe<A, B, C, D, E>(fs: [Fn<A, B>, Fn<B, C>, Fn<C, D>, Fn<D, E>]): (x: A) => E;
+export function pipe<A, B, C, D, E, F>(fs: [Fn<A, B>, Fn<B, C>, Fn<C, D>, Fn<D, E>, Fn<E, F>]): (x: A) => F;
+export function pipe(fs: Array<Fn<any, any>>): (x: any) => any;
+
+export function on<A, B, C>(p: Fn2<B, B, C>): (q: Fn<A, B>) => (r: A) => Fn<A, C>;
+
+//  TODO: Maybe
+export function isNothing(p: Maybe<any>): boolean;
+
+export function isJust(p: Maybe<any>): boolean;
+
+export function fromMaybe<A>(p: A): (q: Maybe<A>) => A;
+
+export function fromMaybe_<A>(p: Thunk<A>): (q: Maybe<A>) => A;
+
+export function maybeToNullable<A>(p: Maybe<A>): Nullable<A>;
+
+export function toMaybe<A>(p: A | null | undefined): Maybe<A>;
+
+export function maybe<B>(p: B): <A>(q: Fn<A, B>) => (r: Maybe<A>) => B;
+
+export function maybe_<B>(p: Thunk<B>): <A>(q: Fn<A, B>) => (r: Maybe<A>) => B;
+
+export function justs<A>(p: Array<Maybe<A>>): A[];
+
+export function mapMaybe<A>(p: Fn<A, Maybe<any>>): (q: A[]) => A[];
+
+export function encase<A, B>(p: Fn<A, B>): Fn<A, Maybe<B>>;
+
+export function encase2<A, B, C>(p: Fn2<A, B, C>): Fn2<A, B, Maybe<C>>;
+
+export function encase3<A, B, C, D>(p: Fn3<A, B, C, D>): Fn3<A, B, C, Maybe<D>>;
+
+export function maybeToEither<A>(p: A): <B>(q: Maybe<B>) => Either<A, B>;
+
+//  TODO: Either
+export function isLeft(p: Either<any, any>): boolean;
+
+export function isRight(p: Either<any, any>): boolean;
+
+export function fromEither<B>(p: B): (q: Either<any, B>) => B;
+
+export function toEither<A>(p: A): <B>(q: B | null | undefined) => Either<A, B>;
+
+export function either<A, C>(p: Fn<A, C>): <B>(q: Fn<B, C>) => (r: Either<A, B>) => C;
+
+export function lefts<A>(p: Array<Either<A, any>>): A[];
+
+export function rights<B>(p: Array<Either<any, B>>): B[];
+
+export function tagBy<A>(p: Predicate<A>): (q: A) => Either<A, A>;
+
+export function encaseEither<L>(p: Fn<Error, L>): <A, R>(q: Fn<A, R>) => Fn<A, Either<L, R>>;
+
+export function encaseEither2<L>(p: Fn<Error, L>): <A, B, R>(q: Fn2<A, B, R>) => Fn2<A, B, Either<L, R>>;
+
+export function encaseEither3<L>(p: Fn<Error, L>): <A, B, C, R>(q: Fn3<A, B, C, R>) => Fn3<A, B, C, Either<L, R>>;
+
+export function eitherToMaybe<B>(p: Either<any, B>): Maybe<B>;
+
+//  Logic
+export function and(p: boolean): (q: boolean) => boolean;
+
+export function or(p: boolean): (q: boolean) => boolean;
+
+export function not(p: boolean): boolean;
+
+export function complement<A>(p: Predicate<A>): Predicate<A>;
+
+export function ifElse<A, B>(p: Predicate<A>): (q: Fn<A, B>) => (r: Fn<A, B>) => Fn<A, B>;
+
+export function when<A>(p: Predicate<A>): (q: Fn<A, A>) => Fn<A, A>;
+
+export function unless<A>(p: Predicate<A>): (q: Fn<A, A>) => Fn<A, A>;
+
+export function allPass<A>(p: Array<Predicate<A>>): Predicate<A>;
+
+export function anyPass<A>(p: Array<Predicate<A>>): Predicate<A>;
+
+//  List
+export interface ListToMaybeList {
+  (xs: string): Maybe<string>;
+  <A>(xs: A[]): Maybe<A[]>;
+}
+
+export function slice(p: Integer): (q: Integer) => ListToMaybeList;
+
+export function at(p: Integer): {
+  (q: string): Maybe<string>;
+  <A>(q: A[]): Maybe<A>;
+};
+
+export function head(xs: string): Maybe<string>;
+export function head<A>(xs: A[]): Maybe<A>;
+
+export function last(xs: string): Maybe<string>;
+export function last<A>(xs: A[]): Maybe<A>;
+
+export function tail(xs: string): Maybe<string>;
+export function tail<A>(xs: A[]): Maybe<A[]>;
+
+export function init(xs: string): Maybe<string>;
+export function init<A>(xs: A[]): Maybe<A[]>;
+
+export function take(n: Integer): ListToMaybeList;
+
+export function takeLast(n: Integer): ListToMaybeList;
+
+export function drop(n: Integer): ListToMaybeList;
+
+export function dropLast(n: Integer): ListToMaybeList;
+
+//  Array
+//  TODO: Fantasyland overloads, non-curried versions
+export function append<A>(x: A): {
+  (xs: A[]): A[];
+  (xs: Applicative<A>): Applicative<A>;
+};
+
+export function prepend<A>(x: A): {
+  (xs: A[]): A[];
+  (xs: Applicative<A>): Applicative<A>;
+};
+
+export function joinWith(p: string): (q: string[]) => string;
+
+export function elem<A>(p: A): (q: Foldable<A> | StrMap<A> | A[]) => boolean;
+
+export function find<A>(p: Predicate<A>): (q: A[] | StrMap<A> | Foldable<A>) => Maybe<A>;
+
+export function pluck(key: string): (xs: Functor<any>) => Functor<any>;
+
+export function unfoldr<A, B>(f: Fn<B, Maybe<Pair<A, B>>>): (x: B) => A[];
+
+export function range(from: Integer): (to: Integer) => Integer[];
+
+export function groupBy<A>(f: Fn2<A, A, boolean>): (xs: A[]) => A[][];
+
+export function reverse<A>(foldable: A[]): A[];
+export function reverse<A>(foldable: Foldable<A>): Foldable<A>;
+
+export function sort<A>(foldable: A[]): A[];
+export function sort<A>(foldable: Foldable<A>): Foldable<A>;
+
+export function sortBy<A>(f: Fn<A, Ord<any>>): {
+  (foldable: A[]): A[];
+  (foldable: Foldable<A>): Foldable<A>;
+};
+
+//  Object
+export function prop(p: string): (q: any) => any;
+
+export function props(p: string[]): (q: any) => any;
+
+export function get(p: Predicate<any>): (q: string) => (r: any) => Maybe<any>;
+
+export function gets(p: Predicate<any>): (q: string[]) => (r: any) => Maybe<any>;
+
+//  StrMap
+export function keys(p: StrMap<any>): string[];
+
+export function values<A>(p: StrMap<A>): A[];
+
+export function pairs<A>(p: StrMap<A>): Array<Pair<string, A>>;
+
+//  Number
+export function negate(n: ValidNumber): ValidNumber;
+
+export function add(p: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
+
+export function sum(p: Foldable<FiniteNumber> | FiniteNumber[]): FiniteNumber;
+
+export function sub(p: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
+
+export function mult(x: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
+
+export function product(p: Foldable<FiniteNumber> | FiniteNumber[]): FiniteNumber;
+
+export function div(p: NonZeroFiniteNumber): (q: FiniteNumber) => FiniteNumber;
+
+export function pow(p: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
+
+export function mean(p: Foldable<FiniteNumber> | FiniteNumber[]): Maybe<FiniteNumber>;
+
+//  Integer
+export function even(n: Integer): boolean;
+
+export function odd(n: Integer): boolean;
+
+//  Parse
+export function parseDate(s: string): Maybe<Date>;
+
+export function parseFloat(s: string): Maybe<number>;
+
+export function parseInt(p: Integer): (q: string) => Maybe<Integer>;
+
+export function parseJson(p: Predicate<any>): (q: string) => Maybe<any>;
+
+//  RegExp
+export function regex(p: string): (q: string) => RegExp;
+
+export function regexEscape(s: string): string;
+
+export function test(pattern: RegExp): Predicate<string>;
+
+export interface MatchObj {
+  match: string;
+  groups: Array<Maybe<string>>;
+}
+
+export function match(pattern: RegExp): (q: string) => Array<Maybe<MatchObj>>;
+
+export function matchAll(pattern: RegExp): (q: string) => MatchObj[];
+
+//  String
+export function toUpper(s: string): string;
+
+export function toLower(s: string): string;
+
+export function trim(s: string): string;
+
+export function stripPrefix(prefix: string): (q: string) => Maybe<string>;
+
+export function stripSuffix(suffix: string): (q: string) => Maybe<string>;
+
+export function words(s: string): string[];
+
+export function unwords(xs: string[]): string;
+
+export function lines(s: string): string[];
+
+export function unlines(xs: string[]): string;
+
+export function splitOn(separator: string): (q: string) => string[];
+
+export function splitOnRegex(pattern: RegExp): (q: string) => string[];
diff --git a/types/sanctuary/sanctuary-tests.ts b/types/sanctuary/sanctuary-tests.ts
new file mode 100644
index 0000000000..76c5bb9c7e
--- /dev/null
+++ b/types/sanctuary/sanctuary-tests.ts
@@ -0,0 +1,7 @@
+/// <reference types="node"/>;
+import * as S from "sanctuary";
+import * as assert from "assert";
+
+assert.equal(S.map(S.concat('@'))(['foo', 'bar', 'baz']), ["@foo", "@bar", "@baz"]);
+assert.equal(S.reduce(S.add)(0)([1, 2, 3, 4, 5]), 15);
+assert.equal(S.flip(S.concat)('foo')('bar'), "barfoo");
diff --git a/types/sanctuary/tsconfig.json b/types/sanctuary/tsconfig.json
new file mode 100644
index 0000000000..653d340820
--- /dev/null
+++ b/types/sanctuary/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sanctuary-tests.ts"
+    ]
+}
diff --git a/types/sanctuary/tslint.json b/types/sanctuary/tslint.json
new file mode 100644
index 0000000000..4547f250b4
--- /dev/null
+++ b/types/sanctuary/tslint.json
@@ -0,0 +1,6 @@
+{ 
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "no-empty-interface": false
+  }
+}
diff --git a/types/sandboxed-module/tslint.json b/types/sandboxed-module/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sandboxed-module/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sanitize-filename/tslint.json b/types/sanitize-filename/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sanitize-filename/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sanitize-html/tslint.json b/types/sanitize-html/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sanitize-html/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sanitizer/tslint.json b/types/sanitizer/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sanitizer/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sap__xsenv/index.d.ts b/types/sap__xsenv/index.d.ts
index 3858f77feb..6f1b895a33 100644
--- a/types/sap__xsenv/index.d.ts
+++ b/types/sap__xsenv/index.d.ts
@@ -21,7 +21,7 @@ export function cfServiceCredentials(filter: ServiceFilter): any;
 /**
  * Returns an array of Cloud Foundry services matching the given filter.
  *
- * @param filter {(string|Object|function)}
+ * @param filter
  *  - if string, returns the service with the same service instance name (name property)
  *  - if Object, should have some of these properties [name, label, tag, plan] and returns all services
  *    where all of the given properties match. Given tag matches if it is present in the tags array.
@@ -35,12 +35,12 @@ export function filterCFServices(filter: ServiceFilter): any;
  *
  * If a service is not found in VCAP_SERVICES, returns default service configuration loaded from a JSON file.
  *
- * @param query {object} describes requested Cloud Foundry services, each property value is a filter
+ * @param query describes requested Cloud Foundry services, each property value is a filter
  *  as described in filterCFServices.
- * @param servicesFile {string} path to JSON file to load default service configuration (default is default-services.json).
+ * @param servicesFile path to JSON file to load default service configuration (default is default-services.json).
  *  If null, do not load default service configuration.
  *
- * @returns {object} with the same properties as in query argument where the value of each
+ * @returns with the same properties as in query argument where the value of each
  *  property is the respective service credentials object.
  * @throws Error, if for some of the requested services no or multiple instances are found; Error, if query parameter is not provided
  */
diff --git a/types/sass-graph/tslint.json b/types/sass-graph/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sass-graph/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sat/index.d.ts b/types/sat/index.d.ts
index 008f65d7b5..538228049c 100644
--- a/types/sat/index.d.ts
+++ b/types/sat/index.d.ts
@@ -14,7 +14,7 @@ declare namespace SAT {
 		 * @param {number} x The x-coordinate of the Vector.
 		 * @param {number} y The y-coordinate of the Vector.
 		 */
-		constructor(x: number, y: number);
+		constructor(x?: number, y?: number);
 
 		x: number;
 		y: number;
@@ -27,7 +27,7 @@ declare namespace SAT {
 		normalize(): Vector;
 		add(other: Vector): Vector;
 		sub(other: Vector): Vector;
-		scale(x: number, y: number): Vector;
+		scale(x: number, y?: number): Vector;
 		project(other: Vector): Vector;
 		projectN(other: Vector): Vector;
 		reflect(axis: Vector): Vector;
@@ -40,13 +40,13 @@ declare namespace SAT {
 	 * This is simple circle with a center {pos} position and radius {r}.
 	 */
 	export class Circle {
-		constructor(pos: Vector, r: number);
+		constructor(pos?: Vector, r?: number);
 
 		pos: Vector;
 		r: number;
 	}
 	export class Polygon {
-		constructor(pos: Vector, points: Vector[]);
+		constructor(pos?: Vector, points?: Vector[]);
 
 		pos: Vector;
 		points: Vector[];
@@ -66,7 +66,7 @@ declare namespace SAT {
 
 	}
 	export class Box {
-		constructor(pos: Vector, width: number, height: number);
+		constructor(pos?: Vector, width?: number, height?: number);
 
 		pos: Vector;
 		w: number;
diff --git a/types/sat/tsconfig.json b/types/sat/tsconfig.json
index f9b3aa2f9c..75c7dbc256 100644
--- a/types/sat/tsconfig.json
+++ b/types/sat/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "sat-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/sat/tslint.json b/types/sat/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sat/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/satnav/tslint.json b/types/satnav/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/satnav/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sax/tslint.json b/types/sax/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sax/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/scalike/tslint.json b/types/scalike/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/scalike/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/screenfull/tslint.json b/types/screenfull/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/screenfull/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/screeps-profiler/index.d.ts b/types/screeps-profiler/index.d.ts
index 6ce153c7de..d874e4685f 100644
--- a/types/screeps-profiler/index.d.ts
+++ b/types/screeps-profiler/index.d.ts
@@ -21,8 +21,8 @@ interface ScreepsGameProfiler {
     /**
      * Will run for the given number of ticks then will output the gathered information to the console.
      *
-     * @param {number} ticks - controls how long the profiler should run before stopping
-     * @param {string} [functionFilter] - parameter will limit the scope of the profiler to a specific function name
+     * @param ticks - controls how long the profiler should run before stopping
+     * @param [functionFilter] - parameter will limit the scope of the profiler to a specific function name
      */
     profile(ticks: number, functionFilter?: string): void;
 
@@ -30,8 +30,8 @@ interface ScreepsGameProfiler {
      * Will run for the given number of ticks, and will output the gathered information each tick to
      * the console. The can sometimes be useful for seeing spikes in performance.
      *
-     * @param {number} ticks - controls how long the profiler should run before stopping
-     * @param {string} [functionFilter] - parameter will limit the scope of the profiler to a specific function name
+     * @param ticks - controls how long the profiler should run before stopping
+     * @param [functionFilter] - parameter will limit the scope of the profiler to a specific function name
      */
     stream(ticks: number, functionFilter?: string): void;
 
@@ -39,8 +39,8 @@ interface ScreepsGameProfiler {
      * This will run for the given number of ticks, and will email the output to your registered
      * Screeps email address. Very useful for long running profiles.
      *
-     * @param {number} ticks - controls how long the profiler should run before stopping
-     * @param {string} [functionFilter] - parameter will limit the scope of the profiler to a specific function name
+     * @param ticks - controls how long the profiler should run before stopping
+     * @param [functionFilter] - parameter will limit the scope of the profiler to a specific function name
      */
     email(ticks: number, functionFilter?: string): void;
 
@@ -48,7 +48,7 @@ interface ScreepsGameProfiler {
      * This will run indefinitely, and will only output data when the output console command is run.
      * Very useful for long running profiles with lots of function calls.
      *
-     * @param {string} [functionFilter] - parameter will limit the scope of the profiler to a specific function name
+     * @param [functionFilter] - parameter will limit the scope of the profiler to a specific function name
      */
     background(functionFilter?: string): void;
 
@@ -56,7 +56,7 @@ interface ScreepsGameProfiler {
      * Print a report based on the current tick. The profiler will continue to operate normally.
      * This is currently the only way to get data from the background profile.
      *
-     * @param {number} [lineCount=20] the number of lines to output
+     * @param [lineCount=20] the number of lines to output
      */
     output(lineCount?: number): void;
 
@@ -80,7 +80,7 @@ interface ScreepsProfilerStatic {
     /**
      * Wrap your main loop with this function.
      *
-     * @param {function} callback - your main loop function
+     * @param callback - your main loop function
      */
     // tslint:disable-next-line ban-types
     wrap(callback: Function): Function;
@@ -88,16 +88,15 @@ interface ScreepsProfilerStatic {
     /**
      * Register a class to be profiled. Each of the functions on this class will be replaced with
      * a profiler wrapper
-     * @param  {Object} clazz constructor
-     * @param {string} className - The name of the class, a label used in output
+     * @param  clazz constructor
+     * @param className - The name of the class, a label used in output
      */
     // tslint:disable-next-line ban-types
     registerClass(constructor: Function, className: string): void;
 
     /**
      * Each of the functions on this object will be replaced with a profiler wrapper.
-     * @param {Object} object
-     * @param {string} objectName - Name of the object, a label used in output
+     * @param objectName - Name of the object, a label used in output
      */
     registerObject(object: any, objectName: string): void;
 
@@ -109,8 +108,8 @@ interface ScreepsProfilerStatic {
      * The second param is optional if you pass a named function function x() {}, but required if
      * you pass an anonymous function var x = function(){}.
      *
-     * @param {string} [fnName] - Name of the function, used as a label in output
-     * @return {function} the original function wrapped for profiling
+     * @param [fnName] - Name of the function, used as a label in output
+     * @return the original function wrapped for profiling
      */
     // tslint:disable-next-line ban-types
     registerFN(fn: Function, fnName?: string): Function;
diff --git a/types/screeps-profiler/screeps-profiler-tests.ts b/types/screeps-profiler/screeps-profiler-tests.ts
index 009f36f256..aab28c7ad9 100644
--- a/types/screeps-profiler/screeps-profiler-tests.ts
+++ b/types/screeps-profiler/screeps-profiler-tests.ts
@@ -4,7 +4,7 @@ function testFunction() {
 }
 
 class TestClass {
-    private dummy: string;
+    private readonly dummy: string;
 }
 
 const testObj = {
diff --git a/types/screeps/index.d.ts b/types/screeps/index.d.ts
new file mode 100644
index 0000000000..145c240b39
--- /dev/null
+++ b/types/screeps/index.d.ts
@@ -0,0 +1,3799 @@
+// Type definitions for Screeps 2.1
+// Project: https://github.com/screeps/screeps
+// Definitions by: Marko Sulamägi <https://github.com/MarkoSulamagi>
+//                 Nhan Ho <https://github.com/NhanHo>
+//                 Bryan <https://github.com/bryanbecker>
+//                 Resi Respati <https://github.com/resir014>
+//                 Adam Laycock <https://github.com/Arcath>
+//                 Dominic Marcuse <https://github.com/apemanzilla>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+// Game Constants
+
+declare const OK: 0;
+declare const ERR_NOT_OWNER: -1;
+declare const ERR_NO_PATH: -2;
+declare const ERR_NAME_EXISTS: -3;
+declare const ERR_BUSY: -4;
+declare const ERR_NOT_FOUND: -5;
+declare const ERR_NOT_ENOUGH_RESOURCES: -6;
+declare const ERR_NOT_ENOUGH_ENERGY: -6;
+declare const ERR_INVALID_TARGET: -7;
+declare const ERR_FULL: -8;
+declare const ERR_NOT_IN_RANGE: -9;
+declare const ERR_INVALID_ARGS: -10;
+declare const ERR_TIRED: -11;
+declare const ERR_NO_BODYPART: -12;
+declare const ERR_NOT_ENOUGH_EXTENSIONS: -6;
+declare const ERR_RCL_NOT_ENOUGH: -14;
+declare const ERR_GCL_NOT_ENOUGH: -15;
+
+declare const FIND_EXIT_TOP: 1;
+declare const FIND_EXIT_RIGHT: 3;
+declare const FIND_EXIT_BOTTOM: 5;
+declare const FIND_EXIT_LEFT: 7;
+declare const FIND_EXIT: 10;
+declare const FIND_CREEPS: 101;
+declare const FIND_MY_CREEPS: 102;
+declare const FIND_HOSTILE_CREEPS: 103;
+declare const FIND_SOURCES_ACTIVE: 104;
+declare const FIND_SOURCES: 105;
+declare const FIND_DROPPED_ENERGY: -106;
+declare const FIND_DROPPED_RESOURCES: 106;
+declare const FIND_STRUCTURES: 107;
+declare const FIND_MY_STRUCTURES: 108;
+declare const FIND_HOSTILE_STRUCTURES: 109;
+declare const FIND_FLAGS: 110;
+declare const FIND_CONSTRUCTION_SITES: 111;
+declare const FIND_MY_SPAWNS: 112;
+declare const FIND_HOSTILE_SPAWNS: 113;
+declare const FIND_MY_CONSTRUCTION_SITES: 114;
+declare const FIND_HOSTILE_CONSTRUCTION_SITES: 115;
+declare const FIND_MINERALS: 116;
+declare const FIND_NUKES: 117;
+
+declare const TOP: 1;
+declare const TOP_RIGHT: 2;
+declare const RIGHT: 3;
+declare const BOTTOM_RIGHT: 4;
+declare const BOTTOM: 5;
+declare const BOTTOM_LEFT: 6;
+declare const LEFT: 7;
+declare const TOP_LEFT: 8;
+
+declare const COLOR_RED: 1;
+declare const COLOR_PURPLE: 2;
+declare const COLOR_BLUE: 3;
+declare const COLOR_CYAN: 4;
+declare const COLOR_GREEN: 5;
+declare const COLOR_YELLOW: 6;
+declare const COLOR_ORANGE: 7;
+declare const COLOR_BROWN: 8;
+declare const COLOR_GREY: 9;
+declare const COLOR_WHITE: 10;
+declare const COLORS_ALL: ColorConstant[];
+
+declare const CREEP_SPAWN_TIME: 3;
+declare const CREEP_LIFE_TIME: 1500;
+declare const CREEP_CLAIM_LIFE_TIME: 500;
+declare const CREEP_CORPSE_RATE: 0.2;
+
+declare const OBSTACLE_OBJECT_TYPES: [
+  "spawn",
+  "creep",
+  "wall",
+  "source",
+  "constructedWall",
+  "extension",
+  "link",
+  "storage",
+  "tower",
+  "observer",
+  "powerSpawn",
+  "powerBank",
+  "lab",
+  "terminal",
+  "nuker"
+];
+
+declare const ENERGY_REGEN_TIME: 300;
+declare const ENERGY_DECAY: 1000;
+
+declare const REPAIR_COST: 0.01;
+
+declare const RAMPART_DECAY_AMOUNT: 300;
+declare const RAMPART_DECAY_TIME: 100;
+declare const RAMPART_HITS: 1;
+declare const RAMPART_HITS_MAX: {
+    2: 300000,
+    3: 1000000,
+    4: 3000000,
+    5: 10000000,
+    6: 30000000,
+    7: 100000000,
+    8: 300000000
+};
+
+declare const SPAWN_HITS: 5000;
+declare const SPAWN_ENERGY_START: 300;
+declare const SPAWN_ENERGY_CAPACITY: 300;
+
+declare const SOURCE_ENERGY_CAPACITY: 3000;
+declare const SOURCE_ENERGY_NEUTRAL_CAPACITY: 1500;
+declare const SOURCE_ENERGY_KEEPER_CAPACITY: 4000;
+
+declare const WALL_HITS: 1;
+declare const WALL_HITS_MAX: 300000000;
+
+declare const EXTENSION_HITS: 1000;
+declare const EXTENSION_ENERGY_CAPACITY: {
+    0: 50,
+    1: 50,
+    2: 50,
+    3: 50,
+    4: 50,
+    5: 50,
+    6: 50,
+    7: 100,
+    8: 200
+};
+
+declare const ROAD_HITS: 5000;
+declare const ROAD_WEAROUT: 1;
+declare const ROAD_DECAY_AMOUNT: 100;
+declare const ROAD_DECAY_TIME: 1000;
+
+declare const LINK_HITS: 1000;
+declare const LINK_HITS_MAX: 1000;
+declare const LINK_CAPACITY: 800;
+declare const LINK_COOLDOWN: 1;
+declare const LINK_LOSS_RATIO: 0.03;
+
+declare const STORAGE_CAPACITY: 1000000;
+declare const STORAGE_HITS: 10000;
+
+declare const BODYPART_COST: Record<BodyPartConstant, number>;
+
+declare const BODYPARTS_ALL: BodyPartConstant[];
+
+declare const CARRY_CAPACITY: 50;
+declare const HARVEST_POWER: 2;
+declare const HARVEST_MINERAL_POWER: 1;
+declare const REPAIR_POWER: 100;
+declare const DISMANTLE_POWER: 50;
+declare const BUILD_POWER: 5;
+declare const ATTACK_POWER: 30;
+declare const UPGRADE_CONTROLLER_POWER: 1;
+declare const RANGED_ATTACK_POWER: 10;
+declare const HEAL_POWER: 12;
+declare const RANGED_HEAL_POWER: 4;
+declare const DISMANTLE_COST: 0.005;
+
+declare const MOVE: "move";
+declare const WORK: "work";
+declare const CARRY: "carry";
+declare const ATTACK: "attack";
+declare const RANGED_ATTACK: "ranged_attack";
+declare const TOUGH: "tough";
+declare const HEAL: "heal";
+declare const CLAIM: "claim";
+
+declare const CONSTRUCTION_COST: Record<BuildableStructureConstant, number>;
+
+declare const CONSTRUCTION_COST_ROAD_SWAMP_RATIO: 5;
+
+declare const STRUCTURE_EXTENSION: "extension";
+declare const STRUCTURE_RAMPART: "rampart";
+declare const STRUCTURE_ROAD: "road";
+declare const STRUCTURE_SPAWN: "spawn";
+declare const STRUCTURE_LINK: "link";
+declare const STRUCTURE_WALL: "constructedWall";
+declare const STRUCTURE_KEEPER_LAIR: "keeperLair";
+declare const STRUCTURE_CONTROLLER: "controller";
+declare const STRUCTURE_STORAGE: "storage";
+declare const STRUCTURE_TOWER: "tower";
+declare const STRUCTURE_OBSERVER: "observer";
+declare const STRUCTURE_POWER_BANK: "powerBank";
+declare const STRUCTURE_POWER_SPAWN: "powerSpawn";
+declare const STRUCTURE_EXTRACTOR: "extractor";
+declare const STRUCTURE_LAB: "lab";
+declare const STRUCTURE_TERMINAL: "terminal";
+declare const STRUCTURE_CONTAINER: "container";
+declare const STRUCTURE_NUKER: "nuker";
+declare const STRUCTURE_PORTAL: "portal";
+
+declare const RESOURCE_ENERGY: "energy";
+declare const RESOURCE_POWER: "power";
+declare const RESOURCE_UTRIUM: "U";
+declare const RESOURCE_LEMERGIUM: "L";
+declare const RESOURCE_KEANIUM: "K";
+declare const RESOURCE_GHODIUM: "G";
+declare const RESOURCE_ZYNTHIUM: "Z";
+declare const RESOURCE_OXYGEN: "O";
+declare const RESOURCE_HYDROGEN: "H";
+declare const RESOURCE_CATALYST: "X";
+declare const RESOURCE_HYDROXIDE: "OH";
+declare const RESOURCE_ZYNTHIUM_KEANITE: "ZK";
+declare const RESOURCE_UTRIUM_LEMERGITE: "UL";
+declare const RESOURCE_UTRIUM_HYDRIDE: "UH";
+declare const RESOURCE_UTRIUM_OXIDE: "UO";
+declare const RESOURCE_KEANIUM_HYDRIDE: "KH";
+declare const RESOURCE_KEANIUM_OXIDE: "KO";
+declare const RESOURCE_LEMERGIUM_HYDRIDE: "LH";
+declare const RESOURCE_LEMERGIUM_OXIDE: "LO";
+declare const RESOURCE_ZYNTHIUM_HYDRIDE: "ZH";
+declare const RESOURCE_ZYNTHIUM_OXIDE: "ZO";
+declare const RESOURCE_GHODIUM_HYDRIDE: "GH";
+declare const RESOURCE_GHODIUM_OXIDE: "GO";
+declare const RESOURCE_UTRIUM_ACID: "UH2O";
+declare const RESOURCE_UTRIUM_ALKALIDE: "UHO2";
+declare const RESOURCE_KEANIUM_ACID: "KH2O";
+declare const RESOURCE_KEANIUM_ALKALIDE: "KHO2";
+declare const RESOURCE_LEMERGIUM_ACID: "LH2O";
+declare const RESOURCE_LEMERGIUM_ALKALIDE: "LHO2";
+declare const RESOURCE_ZYNTHIUM_ACID: "ZH2O";
+declare const RESOURCE_ZYNTHIUM_ALKALIDE: "ZHO2";
+declare const RESOURCE_GHODIUM_ACID: "GH2O";
+declare const RESOURCE_GHODIUM_ALKALIDE: "GHO2";
+declare const RESOURCE_CATALYZED_UTRIUM_ACID: "XUH2O";
+declare const RESOURCE_CATALYZED_UTRIUM_ALKALIDE: "XUHO2";
+declare const RESOURCE_CATALYZED_KEANIUM_ACID: "XKH2O";
+declare const RESOURCE_CATALYZED_KEANIUM_ALKALIDE: "XKHO2";
+declare const RESOURCE_CATALYZED_LEMERGIUM_ACID: "XLH2O";
+declare const RESOURCE_CATALYZED_LEMERGIUM_ALKALIDE: "XLHO2";
+declare const RESOURCE_CATALYZED_ZYNTHIUM_ACID: "XZH2O";
+declare const RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE: "ZXHO2";
+declare const RESOURCE_CATALYZED_GHODIUM_ACID: "XGH2O";
+declare const RESOURCE_CATALYZED_GHODIUM_ALKALIDE: "XGHO2";
+declare const RESOURCES_ALL: ResourceConstant[];
+
+declare const SUBSCRIPTION_TOKEN: string;
+
+declare const CONTROLLER_LEVELS: {[level: number]: number};
+declare const CONTROLLER_STRUCTURES: Record<BuildableStructureConstant, {[level: number]: number}>;
+
+declare const CONTROLLER_DOWNGRADE: {[level: number]: number};
+declare const CONTROLLER_CLAIM_DOWNGRADE: number;
+declare const CONTROLLER_RESERVE: number;
+declare const CONTROLLER_RESERVE_MAX: number;
+declare const CONTROLLER_MAX_UPGRADE_PER_TICK: number;
+declare const CONTROLLER_ATTACK_BLOCKED_UPGRADE: number;
+
+declare const TOWER_HITS: number;
+declare const TOWER_CAPACITY: number;
+declare const TOWER_ENERGY_COST: number;
+declare const TOWER_POWER_ATTACK: number;
+declare const TOWER_POWER_HEAL: number;
+declare const TOWER_POWER_REPAIR: number;
+declare const TOWER_OPTIMAL_RANGE: number;
+declare const TOWER_FALLOFF_RANGE: number;
+declare const TOWER_FALLOFF: number;
+
+declare const OBSERVER_HITS: number;
+declare const OBSERVER_RANGE: number;
+
+declare const POWER_BANK_HITS: number;
+declare const POWER_BANK_CAPACITY_MAX: number;
+declare const POWER_BANK_CAPACITY_MIN: number;
+declare const POWER_BANK_CAPACITY_CRIT: number;
+declare const POWER_BANK_DECAY: number;
+declare const POWER_BANK_HIT_BACK: number;
+
+declare const POWER_SPAWN_HITS: number;
+declare const POWER_SPAWN_ENERGY_CAPACITY: number;
+declare const POWER_SPAWN_POWER_CAPACITY: number;
+declare const POWER_SPAWN_ENERGY_RATIO: number;
+
+declare const EXTRACTOR_HITS: number;
+
+declare const LAB_HITS: number;
+declare const LAB_MINERAL_CAPACITY: number;
+declare const LAB_ENERGY_CAPACITY: number;
+declare const LAB_BOOST_ENERGY: number;
+declare const LAB_BOOST_MINERAL: number;
+declare const LAB_COOLDOWN: number;
+declare const LAB_REACTION_AMOUNT: number;
+
+declare const GCL_POW: number;
+declare const GCL_MULTIPLY: number;
+declare const GCL_NOVICE: number;
+
+declare const MODE_SIMULATION: string;
+declare const MODE_SURVIVAL: string;
+declare const MODE_WORLD: string;
+declare const MODE_ARENA: string;
+
+declare const TERRAIN_MASK_WALL: number;
+declare const TERRAIN_MASK_SWAMP: number;
+declare const TERRAIN_MASK_LAVA: number;
+
+declare const MAX_CONSTRUCTION_SITES: number;
+declare const MAX_CREEP_SIZE: number;
+
+declare const MINERAL_REGEN_TIME: number;
+declare const MINERAL_MIN_AMOUNT: Record<MineralConstant, number>;
+declare const MINERAL_RANDOM_FACTOR: number;
+
+declare const MINERAL_DENSITY: {
+        1: number,
+        2: number,
+        3: number,
+        4: number
+};
+
+declare const MINERAL_DENSITY_PROBABILITY: {
+        1: number,
+        2: number,
+        3: number,
+        4: number
+};
+
+declare const MINERAL_DENSITY_CHANGE: number;
+
+declare const DENSITY_LOW: number;
+declare const DENSITY_MODERATE: number;
+declare const DENSITY_HIGH: number;
+declare const DENSITY_ULTRA: number;
+
+declare const TERMINAL_CAPACITY: number;
+declare const TERMINAL_HITS: number;
+declare const TERMINAL_SEND_COST: number;
+declare const TERMINAL_MIN_SEND: number;
+
+declare const CONTAINER_HITS: number;
+declare const CONTAINER_CAPACITY: number;
+declare const CONTAINER_DECAY: number;
+declare const CONTAINER_DECAY_TIME: number;
+declare const CONTAINER_DECAY_TIME_OWNED: number;
+
+declare const NUKER_HITS: number;
+declare const NUKER_COOLDOWN: number;
+declare const NUKER_ENERGY_CAPACITY: number;
+declare const NUKER_GHODIUM_CAPACITY: number;
+declare const NUKE_LAND_TIME: number;
+declare const NUKE_RANGE: number;
+declare const NUKE_DAMAGE: {
+    0: number,
+    1: number,
+    4: number
+};
+
+declare const REACTIONS: {
+  H: {
+      O: "OH",
+      L: "LH",
+      K: "KH",
+      U: "UH",
+      Z: "ZH",
+      G: "GH"
+  },
+  O: {
+      H: "OH",
+      L: "LO",
+      K: "KO",
+      U: "UO",
+      Z: "ZO",
+      G: "GO"
+  },
+  Z: {
+      K: "ZK",
+      H: "ZH",
+      O: "ZO"
+  },
+  L: {
+      U: "UL",
+      H: "LH",
+      O: "LO"
+  },
+  K: {
+      Z: "ZK",
+      H: "KH",
+      O: "KO"
+  },
+  G: {
+      H: "GH",
+      O: "GO"
+  },
+  U: {
+      L: "UL",
+      H: "UH",
+      O: "UO"
+  },
+  OH: {
+      UH: "UH2O",
+      UO: "UHO2",
+      ZH: "ZH2O",
+      ZO: "ZHO2",
+      KH: "KH2O",
+      KO: "KHO2",
+      LH: "LH2O",
+      LO: "LHO2",
+      GH: "GH2O",
+      GO: "GHO2"
+  },
+  X: {
+      UH2O: "XUH2O",
+      UHO2: "XUHO2",
+      LH2O: "XLH2O",
+      LHO2: "XLHO2",
+      KH2O: "XKH2O",
+      KHO2: "XKHO2",
+      ZH2O: "XZH2O",
+      ZHO2: "XZHO2",
+      GH2O: "XGH2O",
+      GHO2: "XGHO2"
+  },
+  ZK: {
+      UL: "G"
+  },
+  UL: {
+      ZK: "G"
+  },
+  LH: {
+      OH: "LH2O"
+  },
+  ZH: {
+      OH: "ZH2O"
+  },
+  GH: {
+      OH: "GH2O"
+  },
+  KH: {
+      OH: "KH2O"
+  },
+  UH: {
+      OH: "UH2O"
+  },
+  LO: {
+      OH: "LHO2"
+  },
+  ZO: {
+      OH: "ZHO2"
+  },
+  KO: {
+      OH: "KHO2"
+  },
+  UO: {
+      OH: "UHO2"
+  },
+  GO: {
+      OH: "GHO2"
+  },
+  LH2O: {
+      X: "XLH2O"
+  },
+  KH2O: {
+      X: "XKH2O"
+  },
+  ZH2O: {
+      X: "XZH2O"
+  },
+  UH2O: {
+      X: "XUH2O"
+  },
+  GH2O: {
+      X: "XGH2O"
+  },
+  LHO2: {
+      X: "XLHO2"
+  },
+  UHO2: {
+      X: "XUHO2"
+  },
+  KHO2: {
+      X: "XKHO2"
+  },
+  ZHO2: {
+      X: "XZHO2"
+  },
+  GHO2: {
+      X: "XGHO2"
+  }
+};
+
+declare const BOOSTS: {
+  work: {
+      UO: {
+          harvest: 3
+      },
+      UHO2: {
+          harvest: 5
+      },
+      XUHO2: {
+          harvest: 7
+      },
+      LH: {
+          build: 1.5,
+          repair: 1.5
+      },
+      LH2O: {
+          build: 1.8,
+          repair: 1.8
+      },
+      XLH2O: {
+          build: 2,
+          repair: 2
+      },
+      ZH: {
+          dismantle: 2
+      },
+      ZH2O: {
+          dismantle: 3
+      },
+      XZH2O: {
+          dismantle: 4
+      },
+      GH: {
+          upgradeController: 1.5
+      },
+      GH2O: {
+          upgradeController: 1.8
+      },
+      XGH2O: {
+          upgradeController: 2
+      }
+  },
+  attack: {
+      UH: {
+          attack: 2
+      },
+      UH2O: {
+          attack: 3
+      },
+      XUH2O: {
+          attack: 4
+      }
+  },
+  ranged_attack: {
+      KO: {
+          rangedAttack: 2,
+          rangedMassAttack: 2
+      },
+      KHO2: {
+          rangedAttack: 3,
+          rangedMassAttack: 3
+      },
+      XKHO2: {
+          rangedAttack: 4,
+          rangedMassAttack: 4
+      }
+  },
+  heal: {
+      LO: {
+          heal: 2,
+          rangedHeal: 2
+      },
+      LHO2: {
+          heal: 3,
+          rangedHeal: 3
+      },
+      XLHO2: {
+          heal: 4,
+          rangedHeal: 4
+      }
+  },
+  carry: {
+      KH: {
+          capacity: 2
+      },
+      KH2O: {
+          capacity: 3
+      },
+      XKH2O: {
+          capacity: 4
+      }
+  },
+  move: {
+      ZO: {
+          fatigue: 2
+      },
+      ZHO2: {
+          fatigue: 3
+      },
+      XZHO2: {
+          fatigue: 4
+      }
+  },
+  tough: {
+      GO: {
+          damage: .7
+      },
+      GHO2: {
+          damage: .5
+      },
+      XGHO2: {
+          damage: .3
+      }
+  }
+};
+
+declare const LOOK_CREEPS: "creep";
+declare const LOOK_ENERGY: "energy";
+declare const LOOK_RESOURCES: "resource";
+declare const LOOK_SOURCES: "source";
+declare const LOOK_MINERALS: "mineral";
+declare const LOOK_STRUCTURES: "structure";
+declare const LOOK_FLAGS: "flag";
+declare const LOOK_CONSTRUCTION_SITES: "constructionSite";
+declare const LOOK_NUKES: "nuke";
+declare const LOOK_TERRAIN: "terrain";
+
+declare const ORDER_SELL: "sell";
+declare const ORDER_BUY: "buy";
+/**
+ * A site of a structure which is currently under construction.
+ */
+interface ConstructionSite<T extends BuildableStructureConstant = BuildableStructureConstant> extends RoomObject {
+    readonly prototype: ConstructionSite;
+    /**
+     * A unique object identifier. You can use `Game.getObjectById` method to retrieve an object instance by its `id`.
+     */
+    id: string;
+    /**
+     * Whether this is your own construction site.
+     */
+    my: boolean;
+    /**
+     * An object with the structure’s owner info.
+     */
+    owner: Owner;
+    /**
+     * The current construction progress.
+     */
+    progress: number;
+    /**
+     * The total construction progress needed for the structure to be built.
+     */
+    progressTotal: number;
+    /**
+     * One of the `STRUCTURE_*` constants.
+     */
+    structureType: T;
+    /**
+     * Remove the construction site.
+     * @returns Result Code: OK, ERR_NOT_OWNER
+     */
+    remove(): number;
+}
+
+interface ConstructionSiteConstructor extends _Constructor<ConstructionSite>, _ConstructorById<ConstructionSite> {
+}
+
+declare const ConstructionSite: ConstructionSiteConstructor;
+/**
+ * Creeps are your units.
+ * Creeps can move, harvest energy, construct structures, attack another creeps, and perform other actions.
+ * Each creep consists of up to 50 body parts with the following possible types:
+ */
+interface Creep extends RoomObject {
+    readonly prototype: Creep;
+
+    /**
+     * An array describing the creep's body.
+     */
+    body: BodyPartDefinition[];
+    /**
+     * An object with the creep's cargo contents.
+     */
+    carry: StoreDefinition;
+    /**
+     * The total amount of resources the creep can carry.
+     */
+    carryCapacity: number;
+    /**
+     * The movement fatigue indicator. If it is greater than zero, the creep cannot move.
+     */
+    fatigue: number;
+    /**
+     * The current amount of hit points of the creep.
+     */
+    hits: number;
+    /**
+     * The maximum amount of hit points of the creep.
+     */
+    hitsMax: number;
+    /**
+     * A unique object identifier. You can use `Game.getObjectById` method to retrieve an object instance by its `id`.
+     */
+    id: string;
+    /**
+     * A shorthand to `Memory.creeps[creep.name]`. You can use it for quick access the creep’s specific memory data object.
+     */
+    memory: CreepMemory;
+    /**
+     * Whether it is your creep or foe.
+     */
+    my: boolean;
+    /**
+     * Creep’s name. You can choose the name while creating a new creep, and it cannot be changed later. This name is a hash key to access the creep via the `Game.creeps` object.
+     */
+    name: string;
+    /**
+     * An object with the creep’s owner info.
+     */
+    owner: Owner;
+    /**
+     * The link to the Room object. Always defined because creeps give visibility into the room they're in.
+     */
+    room: Room;
+    /**
+     * Whether this creep is still being spawned.
+     */
+    spawning: boolean;
+    /**
+     * The text message that the creep was saying at the last tick.
+     */
+    saying: string;
+    /**
+     * The remaining amount of game ticks after which the creep will die.
+     */
+    ticksToLive: number;
+    /**
+     * Attack another creep or structure in a short-ranged attack. Needs the
+     * ATTACK body part. If the target is inside a rampart, then the rampart is
+     * attacked instead.
+     *
+     * The target has to be at adjacent square to the creep. If the target is a
+     * creep with ATTACK body parts and is not inside a rampart, it will
+     * automatically hit back at the attacker.
+     *
+     * @returns Result Code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_INVALID_TARGET, ERR_NOT_IN_RANGE, ERR_NO_BODYPART
+     */
+    attack(target: Creep|Structure): CreepActionReturnCode;
+    /**
+     * Decreases the controller's downgrade or reservation timer for 1 tick per
+     * every 5 `CLAIM` body parts (so the creep must have at least 5x`CLAIM`).
+     *
+     * The controller under attack cannot be upgraded for the next 1,000 ticks.
+     * The target has to be at adjacent square to the creep.
+     *
+     * @returns Result Code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_INVALID_TARGET, ERR_NOT_IN_RANGE, ERR_NO_BODYPART
+     */
+    attackController(target: StructureController): CreepActionReturnCode;
+    /**
+     * Build a structure at the target construction site using carried energy.
+     * Needs WORK and CARRY body parts.
+     *
+     * The target has to be within 3 squares range of the creep.
+     *
+     * @param target The target object to be attacked.
+     * @returns Result Code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_NOT_ENOUGH_RESOURCES, ERR_INVALID_TARGET, ERR_NOT_IN_RANGE, ERR_NO_BODYPART, ERR_RCL_NOT_ENOUGH
+     */
+    build(target: ConstructionSite): CreepActionReturnCode | ERR_RCL_NOT_ENOUGH;
+    /**
+     * Cancel the order given during the current game tick.
+     * @param methodName The name of a creep's method to be cancelled.
+     * @returns Result Code: OK, ERR_NOT_FOUND
+     */
+    cancelOrder(methodName: string): OK | ERR_NOT_FOUND;
+    /**
+     * Requires the CLAIM body part.
+     *
+     * If applied to a neutral controller, claims it under your control.
+     * If applied to a hostile controller, decreases its downgrade or reservation timer depending on the CLAIM body parts count.
+     *
+     * The target has to be at adjacent square to the creep.
+     * @param target The target controller object.
+     * @returns Result Code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_INVALID_TARGET, ERR_FULL, ERR_NOT_IN_RANGE, ERR_NO_BODYPART, ERR_GCL_NOT_ENOUGH
+     */
+    claimController(target: StructureController): CreepActionReturnCode | ERR_FULL | ERR_RCL_NOT_ENOUGH;
+    /**
+     * Dismantles any (even hostile) structure returning 50% of the energy spent on its repair.
+     *
+     * Requires the WORK body part. If the creep has an empty CARRY body part, the energy is put into it; otherwise it is dropped on the ground.
+     *
+     * The target has to be at adjacent square to the creep.
+     * @param target The target structure.
+     */
+    dismantle(target: Structure): CreepActionReturnCode;
+    /**
+     * Drop this resource on the ground.
+     * @param resourceType One of the RESOURCE_* constants.
+     * @param amount The amount of resource units to be dropped. If omitted, all the available carried amount is used.
+     */
+    drop(resourceType: ResourceConstant, amount?: number): OK | ERR_NOT_OWNER | ERR_BUSY | ERR_NOT_ENOUGH_RESOURCES;
+    /**
+     * Add one more available safe mode activation to a room controller. The creep has to be at adjacent square to the target room controller and have 1000 ghodium resource.
+     * @param target The target room controller.
+     * @returns Result Code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_NOT_ENOUGH_RESOURCES, ERR_INVALID_TARGET, ERR_NOT_IN_RANGE
+     */
+    generateSafeMode(target: StructureController): CreepActionReturnCode;
+    /**
+     * Get the quantity of live body parts of the given type. Fully damaged parts do not count.
+     * @param type A body part type, one of the following body part constants: MOVE, WORK, CARRY, ATTACK, RANGED_ATTACK, HEAL, TOUGH, CLAIM
+     */
+    getActiveBodyparts(type: BodyPartConstant): number;
+    /**
+     * Harvest energy from the source.
+     *
+     * Needs the WORK body part.
+     *
+     * If the creep has an empty CARRY body part, the harvested energy is put into it; otherwise it is dropped on the ground.
+     *
+     * The target has to be at an adjacent square to the creep.
+     * @param target The source object to be harvested.
+     */
+    harvest(target: Source | Mineral): CreepActionReturnCode | ERR_NOT_FOUND | ERR_NOT_ENOUGH_RESOURCES;
+    /**
+     * Heal self or another creep. It will restore the target creep’s damaged body parts function and increase the hits counter.
+     *
+     * Needs the HEAL body part.
+     *
+     * The target has to be at adjacent square to the creep.
+     * @param target The target creep object.
+     */
+    heal(target: Creep): CreepActionReturnCode;
+    /**
+     * Move the creep one square in the specified direction. Needs the MOVE body part.
+     * @param direction
+     */
+    move(direction: DirectionConstant): CreepMoveReturnCode;
+    /**
+     * Move the creep using the specified predefined path. Needs the MOVE body part.
+     * @param path A path value as returned from Room.findPath or RoomPosition.findPathTo methods. Both array form and serialized string form are accepted.
+     */
+    moveByPath(path: PathStep[] | RoomPosition[] | string): CreepMoveReturnCode | ERR_NOT_FOUND | ERR_INVALID_ARGS;
+    /**
+     * Find the optimal path to the target within the same room and move to it.
+     * A shorthand to consequent calls of pos.findPathTo() and move() methods.
+     * If the target is in another room, then the corresponding exit will be used as a target.
+     *
+     * Needs the MOVE body part.
+     * @param x X position of the target in the room.
+     * @param y Y position of the target in the room.
+     * @param opts An object containing pathfinding options flags (see Room.findPath for more info) or one of the following: reusePath, serializeMemory, noPathFinding
+     */
+    moveTo(x: number, y: number, opts?: MoveToOpts): CreepMoveReturnCode | ERR_NO_PATH | ERR_INVALID_TARGET;
+    /**
+     * Find the optimal path to the target within the same room and move to it.
+     * A shorthand to consequent calls of pos.findPathTo() and move() methods.
+     * If the target is in another room, then the corresponding exit will be used as a target.
+     *
+     * Needs the MOVE body part.
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     * @param opts An object containing pathfinding options flags (see Room.findPath for more info) or one of the following: reusePath, serializeMemory, noPathFinding
+     */
+    moveTo(target: RoomPosition|{pos: RoomPosition}, opts?: MoveToOpts): CreepMoveReturnCode | ERR_NO_PATH | ERR_INVALID_TARGET | ERR_NOT_FOUND;
+    /**
+     * Toggle auto notification when the creep is under attack. The notification will be sent to your account email. Turned on by default.
+     * @param enabled Whether to enable notification or disable.
+     */
+    notifyWhenAttacked(enabled: boolean): OK | ERR_NOT_OWNER | ERR_BUSY | ERR_INVALID_ARGS;
+    /**
+     * Pick up an item (a dropped piece of energy). Needs the CARRY body part. The target has to be at adjacent square to the creep or at the same square.
+     * @param target The target object to be picked up.
+     */
+    pickup(target: Resource): CreepActionReturnCode | ERR_FULL;
+    /**
+     * A ranged attack against another creep or structure.
+     *
+     * Needs the RANGED_ATTACK body part. If the target is inside a rampart, the rampart is attacked instead.
+     *
+     * The target has to be within 3 squares range of the creep.
+     * @param target The target object to be attacked.
+     */
+    rangedAttack(target: Creep|Structure): CreepActionReturnCode;
+    /**
+     * Heal another creep at a distance.
+     *
+     * It will restore the target creep’s damaged body parts function and increase the hits counter.
+     *
+     * Needs the HEAL body part. The target has to be within 3 squares range of the creep.
+     * @param target The target creep object.
+     */
+    rangedHeal(target: Creep): CreepActionReturnCode;
+    /**
+     * A ranged attack against all hostile creeps or structures within 3 squares range.
+     *
+     * Needs the RANGED_ATTACK body part.
+     *
+     * The attack power depends on the range to each target. Friendly units are not affected.
+     */
+    rangedMassAttack(): OK | ERR_NOT_OWNER | ERR_BUSY | ERR_NO_BODYPART;
+    /**
+     * Repair a damaged structure using carried energy. Needs the WORK and CARRY body parts. The target has to be within 3 squares range of the creep.
+     * @param target he target structure to be repaired.
+     */
+    repair(target: Structure): CreepActionReturnCode | ERR_NOT_ENOUGH_RESOURCES;
+    /**
+     * Temporarily block a neutral controller from claiming by other players.
+     *
+     * Each tick, this command increases the counter of the period during which the controller is unavailable by 1 tick per each CLAIM body part.
+     *
+     * The maximum reservation period to maintain is 5,000 ticks.
+     *
+     * The target has to be at adjacent square to the creep....
+     * @param target The target controller object to be reserved.
+     * @return Result code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_INVALID_TARGET, ERR_NOT_IN_RANGE, ERR_NO_BODYPART
+     */
+    reserveController(target: StructureController): CreepActionReturnCode;
+    /**
+     * Display a visual speech balloon above the creep with the specified message.
+     *
+     * The message will disappear after a few seconds. Useful for debugging purposes.
+     *
+     * Only the creep's owner can see the speech message unless toPublic is true.
+     * @param message The message to be displayed. Maximum length is 10 characters.
+     * @param set to 'true' to allow other players to see this message. Default is 'false'.
+     */
+    say(message: string, toPublic?: boolean): OK | ERR_NOT_OWNER | ERR_BUSY;
+    /**
+     * Sign a controller with a random text visible to all players. This text will appear in the room UI, in the world map, and can be accessed via the API.
+     * You can sign unowned and hostile controllers. The target has to be at adjacent square to the creep. Pass an empty string to remove the sign.
+     * @param target The target controller object to be signed.
+     * @param text The sign text. The maximum text length is 100 characters.
+     * @returns Result Code: OK, ERR_BUSY, ERR_INVALID_TARGET, ERR_NOT_IN_RANGE
+     */
+    signController(target: StructureController, text: string): OK | ERR_BUSY | ERR_INVALID_TARGET | ERR_NOT_IN_RANGE;
+    /**
+     * Kill the creep immediately.
+     */
+    suicide(): OK | ERR_NOT_OWNER | ERR_BUSY;
+    /**
+     * Transfer resource from the creep to another object. The target has to be at adjacent square to the creep.
+     * @param target The target object.
+     * @param resourceType One of the RESOURCE_* constants
+     * @param amount The amount of resources to be transferred. If omitted, all the available carried amount is used.
+     */
+    transfer(target: Creep|Structure, resourceType: ResourceConstant, amount?: number): ScreepsReturnCode;
+    /**
+     * Upgrade your controller to the next level using carried energy.
+     *
+     * Upgrading controllers raises your Global Control Level in parallel.
+     *
+     * Needs WORK and CARRY body parts.
+     *
+     * The target has to be at adjacent square to the creep.
+     *
+     * A fully upgraded level 8 controller can't be upgraded with the power over 15 energy units per tick regardless of creeps power.
+     *
+     * The cumulative effect of all the creeps performing upgradeController in the current tick is taken into account.
+     * @param target The target controller object to be upgraded.
+     */
+    upgradeController(target: StructureController): ScreepsReturnCode;
+    /**
+     * Withdraw resources from a structure.
+     *
+     * The target has to be at adjacent square to the creep.
+     *
+     * Multiple creeps can withdraw from the same structure in the same tick.
+     *
+     * Your creeps can withdraw resources from hostile structures as well, in case if there is no hostile rampart on top of it.
+     * @param target The target object.
+     * @param resourceType The target One of the RESOURCE_* constants..
+     * @param amount The amount of resources to be transferred. If omitted, all the available amount is used.
+     */
+    withdraw(target: Structure, resourceType: ResourceConstant, amount?: number): ScreepsReturnCode;
+}
+
+interface CreepConstructor extends _Constructor<Creep>, _ConstructorById<Creep> {
+}
+
+declare const Creep: CreepConstructor;
+/**
+ * A flag. Flags can be used to mark particular spots in a room. Flags are visible to their owners only.
+ */
+interface Flag extends RoomObject {
+    readonly prototype: Flag;
+
+    /**
+     * Flag color. One of the `COLOR_*` constants.
+     */
+    color: ColorConstant;
+    /**
+     * A shorthand to Memory.flags[flag.name]. You can use it for quick access the flag's specific memory data object.
+     */
+    memory: FlagMemory;
+    /**
+     * Flag’s name.
+     *
+     * You can choose the name while creating a new flag, and it cannot be changed later.
+     *
+     * This name is a hash key to access the spawn via the `Game.flags` object. The maximum name length is 60 characters.
+     */
+    name: string;
+    /**
+     * Flag secondary color. One of the `COLOR_*` constants.
+     */
+    secondaryColor: ColorConstant;
+    /**
+     * Remove the flag.
+     * @returns Result Code: OK
+     */
+    remove(): OK;
+    /**
+     * Set new color of the flag.
+     * @param color One of the following constants: COLOR_WHITE, COLOR_GREY, COLOR_RED, COLOR_PURPLE, COLOR_BLUE, COLOR_CYAN, COLOR_GREEN, COLOR_YELLOW, COLOR_ORANGE, COLOR_BROWN
+     * @parma secondaryColor Secondary color of the flag. One of the COLOR_* constants.
+     * @returns Result Code: OK, ERR_INVALID_ARGS
+     */
+    setColor(color: ColorConstant, secondaryColor?: ColorConstant): OK | ERR_INVALID_ARGS;
+    /**
+     * Set new position of the flag.
+     * @param x The X position in the room.
+     * @param y The Y position in the room.
+     * @returns Result Code: OK, ERR_INVALID_TARGET
+     */
+    setPosition(x: number, y: number): OK | ERR_INVALID_ARGS;
+    /**
+     * Set new position of the flag.
+     * @param pos Can be a RoomPosition object or any object containing RoomPosition.
+     * @returns Result Code: OK, ERR_INVALID_TARGET
+     */
+    setPosition(pos: RoomPosition|{pos: RoomPosition}): OK | ERR_INVALID_ARGS;
+}
+
+interface FlagConstructor extends _Constructor<Flag> {
+    new (name: string, color: ColorConstant, secondaryColor: ColorConstant, roomName: string, x: number, y: number): Flag;
+    (name: string, color: ColorConstant, secondaryColor: ColorConstant, roomName: string, x: number, y: number): Flag;
+}
+
+declare const Flag: FlagConstructor;
+/**
+ * The main global game object containing all the gameplay information.
+ */
+interface Game {
+    /**
+     * An object containing information about your CPU usage.
+     */
+    cpu: CPU;
+    /**
+     * A hash containing all your creeps with creep names as hash keys.
+     */
+    creeps: {[creepName: string]: Creep};
+    /**
+     * A hash containing all your flags with flag names as hash keys.
+     */
+    flags: {[flagName: string]: Flag};
+    /**
+     * Your Global Control Level.
+     */
+    gcl: GlobalControlLevel;
+    /**
+     * A global object representing world GameMap.
+     */
+    map: GameMap;
+    /**
+     * A global object representing the in-game market.
+     */
+    market: Market;
+    /**
+     * An object with your global resources that are bound to the account, like subscription tokens. Each object key is a resource constant, values are resources amounts.
+     */
+    resources: {[key: string]: any};
+    /**
+     * A hash containing all the rooms available to you with room names as hash keys.
+     * A room is visible if you have a creep or an owned structure in it.
+     */
+    rooms: {[roomName: string]: Room};
+    /**
+     * A hash containing all your spawns with spawn names as hash keys.
+     */
+    spawns: {[spawnName: string]: StructureSpawn};
+    /**
+     * A hash containing all your structures with structure id as hash keys.
+     */
+    structures: {[structureId: string]: Structure};
+
+    /**
+     * A hash containing all your construction sites with their id as hash keys.
+     */
+    constructionSites: {[constructionSiteId: string]: ConstructionSite};
+
+    /**
+     * An object describing the world shard where your script is currently being executed in.
+     */
+    shard: Shard;
+
+    /**
+     * System game tick counter. It is automatically incremented on every tick.
+     */
+    time: number;
+
+    /**
+     * Get an object with the specified unique ID. It may be a game object of any type. Only objects from the rooms which are visible to you can be accessed.
+     * @param id The unique identifier.
+     * @returns an object instance or null if it cannot be found.
+     */
+    getObjectById<T>(id: string | undefined): T | null;
+    /**
+     * Send a custom message at your profile email.
+     *
+     * This way, you can set up notifications to yourself on any occasion within the game.
+     *
+     * You can schedule up to 20 notifications during one game tick. Not available in the Simulation Room.
+     * @param message Custom text which will be sent in the message. Maximum length is 1000 characters.
+     * @param groupInterval If set to 0 (default), the notification will be scheduled immediately.
+     * Otherwise, it will be grouped with other notifications and mailed out later using the specified time in minutes.
+     */
+    notify(message: string, groupInterval?: number): undefined;
+}
+
+declare let Game: Game;
+interface _HasRoomPosition {
+    pos: RoomPosition;
+}
+
+interface GlobalControlLevel {
+    /**
+     * The current level.
+     */
+    level: number;
+    /**
+     * The current progress to the next level.
+     */
+    progress: number;
+    /**
+     * The progress required to reach the next level.
+     */
+    progressTotal: number;
+}
+
+interface Shard {
+    /**
+     * The name of the shard.
+     */
+    name: string;
+    /**
+     * Currently always equals to normal.
+     */
+    type: "normal";
+    /**
+     * Whether this shard belongs to the PTR.
+     */
+    ptr: boolean;
+}
+
+interface CPU {
+    /**
+     * Your assigned CPU limit for the current shard.
+     */
+    limit: number;
+    /**
+     * An amount of available CPU time at the current game tick. Usually it is higher than `Game.cpu.limit`.
+     */
+    tickLimit: number;
+    /**
+     * An amount of unused CPU accumulated in your bucket.
+     * @see http://docs.screeps.com/cpu-limit.html#Bucket
+     */
+    bucket: number;
+    /**
+     * An object with limits for each shard with shard names as keys. You can use `setShardLimits` method to re-assign them.
+     */
+    shardLimits: CPUShardLimits;
+
+    /**
+     * Get amount of CPU time used from the beginning of the current game tick. Always returns 0 in the Simulation mode.
+     */
+    getUsed(): number;
+    /**
+     * Allocate CPU limits to different shards. Total amount of CPU should remain equal to `Game.cpu.shardLimits`.
+     * This method can be used only once per 12 hours.
+     *
+     * @param {CPUShardLimits} limits An object with CPU values for each shard in the same format as `Game.cpu.shardLimits`.
+     * @returns {(OK | ERR_BUSY | ERR_INVALID_ARGS)} One of the following codes: `OK | ERR_BUSY | ERR_INVALID_ARGS`
+     * @memberof CPU
+     */
+    setShardLimits(limits: CPUShardLimits): OK | ERR_BUSY | ERR_INVALID_ARGS;
+}
+
+/**
+ * An array describing the creep’s body. Each element contains the following properties:
+ */
+interface BodyPartDefinition {
+    /**
+     * One of the `RESOURCE_*` constants.
+     *
+     * If the body part is boosted, this property specifies the mineral type which is used for boosting.
+     */
+    boost?: ResourceConstant;
+    /**
+     * One of the body part types constants.
+     */
+    type: BodyPartConstant;
+    /**
+     * The remaining amount of hit points of this body part.
+     */
+    hits: number;
+}
+interface Owner {
+    /**
+     * The name of the owner user.
+     */
+    username: string;
+}
+interface ReservationDefinition {
+    username: string;
+    ticksToEnd: number;
+}
+interface SignDefinition {
+    username: string;
+    text: string;
+    time: number;
+    datetime: Date;
+}
+
+interface CPUShardLimits {
+    [shard: string]: number;
+}
+
+type StoreDefinition = Partial<Record<_ResourceConstantSansEnergy, number>> & { energy: number };
+// type SD<K extends ResourceConstant> = {
+//   [P in K]: number;
+//   energy: number;
+// }
+
+interface LookAtTypes {
+    constructionSite?: ConstructionSite;
+    creep?: Creep;
+    energy?: Resource<RESOURCE_ENERGY>;
+    exit?: any;  // TODO what type is this?
+    flag?: Flag;
+    mineral?: Mineral;
+    nuke?: Nuke;
+    resource?: Resource;
+    source?: Source;
+    structure?: Structure;
+    terrain?: Terrain;
+}
+
+type LookAtResult<K extends LookConstant = LookConstant> = Pick<LookAtTypes, K> & { type: K };
+
+type LookAtResultWithPos<K extends LookConstant = LookConstant> = LookAtResult<K> & {
+  x: number,
+  y: number,
+};
+
+interface LookAtResultMatrix<K extends LookConstant = LookConstant> {
+    [coord: number]: LookAtResultMatrix<K> | Array<LookAtResult<K>>;
+}
+
+interface LookForAtAreaResultMatrix<T, K extends keyof LookAtTypes = keyof LookAtTypes> {
+  [x: number]: {
+    [y: number]: Array<LookForAtAreaResult<T, K>>;
+  };
+}
+
+type LookForAtAreaResult<T, K extends keyof LookAtTypes = keyof LookAtTypes> = {type: K} & {
+  [P in K]: T;
+};
+
+type LookForAtAreaResultWithPos<T, K extends keyof LookAtTypes = keyof LookAtTypes> = LookForAtAreaResult<T, K> & {x: number, y: number};
+
+type LookForAtAreaResultArray<T, K extends keyof LookAtTypes = keyof LookAtTypes> = Array<LookForAtAreaResultWithPos<T, K>>;
+
+interface FindTypes {
+  [key: number]: RoomPosition | Creep | Source | Resource | Structure | Flag | ConstructionSite | Mineral | Nuke;
+  1: RoomPosition; // FIND_EXIT_TOP
+  3: RoomPosition; // FIND_EXIT_RIGHT
+  5: RoomPosition; // FIND_EXIT_BOTTOM
+  7: RoomPosition; // FIND_EXIT_LEFT
+  10: RoomPosition; // FIND_EXIT
+  101: Creep; // FIND_CREEPS
+  102: Creep; // FIND_MY_CREEPS
+  103: Creep; // FIND_HOSTILE_CREEPS
+  104: Source; // FIND_SOURCES_ACTIVE
+  105: Source; // FIND_SOURCES
+  "-106": Resource<RESOURCE_ENERGY>; // FIND_DROPPED_ENERGY
+  106: Resource; // FIND_DROPPED_RESOURCES
+  107: AnyStructure; // FIND_STRUCTURES
+  108: AnyOwnedStructure; // FIND_MY_STRUCTURES
+  109: AnyOwnedStructure; // FIND_HOSTILE_STRUCTURES
+  110: Flag; // FIND_FLAGS
+  111: ConstructionSite; // FIND_CONSTRUCTION_SITES
+  112: StructureSpawn; // FIND_MY_SPAWNS
+  113: StructureSpawn; // FIND_HOSTILE_SPAWNS
+  114: ConstructionSite; // FIND_MY_CONSTRUCTION_SITES
+  115: ConstructionSite; // FIND_HOSTILE_CONSTRUCTION_SITES
+  116: Mineral; // FIND_MINERALS
+  117: Nuke; // FIND_NUKES
+}
+
+interface FindPathOpts {
+    /**
+     * Treat squares with creeps as walkable. Can be useful with too many moving creeps around or in some other cases. The default
+     * value is false.
+     */
+    ignoreCreeps?: boolean;
+
+    /**
+     * Treat squares with destructible structures (constructed walls, ramparts, spawns, extensions) as walkable. Use this flag when
+     * you need to move through a territory blocked by hostile structures. If a creep with an ATTACK body part steps on such a square,
+     * it automatically attacks the structure. The default value is false.
+     */
+    ignoreDestructibleStructures?: boolean;
+
+    /**
+     * Ignore road structures. Enabling this option can speed up the search. The default value is false. This is only used when the
+     * new PathFinder is enabled.
+     */
+    ignoreRoads?: boolean;
+
+    /**
+     * You can use this callback to modify a CostMatrix for any room during the search. The callback accepts two arguments, roomName
+     * and costMatrix. Use the costMatrix instance to make changes to the positions costs. If you return a new matrix from this callback,
+     * it will be used instead of the built-in cached one. This option is only used when the new PathFinder is enabled.
+     *
+     * @param roomName The name of the room.
+     * @param costMatrix The current CostMatrix
+     * @returns The new CostMatrix to use
+     */
+    costCallback?(roomName: string, costMatrix: CostMatrix): boolean | CostMatrix;
+
+    /**
+     * An array of the room's objects or RoomPosition objects which should be treated as walkable tiles during the search. This option
+     * cannot be used when the new PathFinder is enabled (use costCallback option instead).
+     */
+    ignore?: any[] | RoomPosition[];
+
+    /**
+     * An array of the room's objects or RoomPosition objects which should be treated as obstacles during the search. This option cannot
+     * be used when the new PathFinder is enabled (use costCallback option instead).
+     */
+    avoid?: any[] | RoomPosition[];
+
+    /**
+     * The maximum limit of possible pathfinding operations. You can limit CPU time used for the search based on ratio 1 op ~ 0.001 CPU.
+     * The default value is 2000.
+     */
+    maxOps?: number;
+
+    /**
+     * Weight to apply to the heuristic in the A* formula F = G + weight * H. Use this option only if you understand the underlying
+     * A* algorithm mechanics! The default value is 1.2.
+     */
+    heuristicWeight?: number;
+
+    /**
+     * If true, the result path will be serialized using Room.serializePath. The default is false.
+     */
+    serialize?: boolean;
+
+    /**
+     * The maximum allowed rooms to search. The default (and maximum) is 16. This is only used when the new PathFinder is enabled.
+     */
+    maxRooms?: number;
+
+    /**
+     * Path to within (range) tiles of target tile. The default is to path to the tile that the target is on (0).
+     */
+    range?: number;
+}
+
+interface MoveToOpts extends FindPathOpts {
+    /**
+     * This option enables reusing the path found along multiple game ticks. It allows to save CPU time, but can result in a slightly
+     * slower creep reaction behavior. The path is stored into the creep's memory to the `_move` property. The `reusePath` value defines
+     * the amount of ticks which the path should be reused for. The default value is 5. Increase the amount to save more CPU, decrease
+     * to make the movement more consistent. Set to 0 if you want to disable path reusing.
+     */
+    reusePath?: number;
+
+    /**
+     * If `reusePath` is enabled and this option is set to true, the path will be stored in memory in the short serialized form using
+     * `Room.serializePath`. The default value is true.
+     */
+    serializeMemory?: boolean;
+
+    /**
+     * If this option is set to true, `moveTo` method will return `ERR_NOT_FOUND` if there is no memorized path to reuse. This can
+     * significantly save CPU time in some cases. The default value is false.
+     */
+    noPathFinding?: boolean;
+
+    /**
+     * Draw a line along the creep’s path using `RoomVisual.poly`. You can provide either an empty object or custom style parameters.
+     */
+    visualizePathStyle?: PolyStyle;
+}
+
+interface PathStep {
+    x: number;
+    dx: number;
+    y: number;
+    dy: number;
+    direction: DirectionConstant;
+}
+
+/**
+ * An object with survival game info
+ */
+interface SurvivalGameInfo {
+    /**
+     * Current score.
+     */
+    score: number;
+    /**
+     * Time to the next wave of invaders.
+     */
+    timeToWave: number;
+    /**
+     * The number of the next wave.
+     */
+    wave: number;
+}
+
+interface _Constructor<T> {
+    readonly prototype: T;
+}
+
+interface _ConstructorById<T> extends _Constructor<T> {
+    new (id: string): T;
+    (id: string): T;
+}
+/*
+ * This file creates literal versions of many of the constants
+ * It should be kept in sync with constants.ts
+ */
+
+// Extras
+
+type Terrain = "plain" | "swamp" | "wall";
+
+// Return Codes
+
+type ScreepsReturnCode =
+  OK |
+  ERR_NOT_OWNER |
+  ERR_NO_PATH |
+  ERR_BUSY |
+  ERR_NOT_FOUND |
+  ERR_NOT_ENOUGH_RESOURCES |
+  ERR_NOT_ENOUGH_ENERGY |
+  ERR_INVALID_TARGET |
+  ERR_FULL |
+  ERR_NOT_IN_RANGE |
+  ERR_INVALID_ARGS |
+  ERR_TIRED |
+  ERR_NO_BODYPART |
+  ERR_NOT_ENOUGH_EXTENSIONS |
+  ERR_RCL_NOT_ENOUGH |
+  ERR_GCL_NOT_ENOUGH;
+
+type OK = 0;
+type ERR_NOT_OWNER = -1;
+type ERR_NO_PATH = -2;
+type ERR_NAME_EXISTS = -3;
+type ERR_BUSY = -4;
+type ERR_NOT_FOUND = -5;
+type ERR_NOT_ENOUGH_RESOURCES = -6;
+type ERR_NOT_ENOUGH_ENERGY = -6;
+type ERR_INVALID_TARGET = -7;
+type ERR_FULL = -8;
+type ERR_NOT_IN_RANGE = -9;
+type ERR_INVALID_ARGS = -10;
+type ERR_TIRED = -11;
+type ERR_NO_BODYPART = -12;
+type ERR_NOT_ENOUGH_EXTENSIONS = -6;
+type ERR_RCL_NOT_ENOUGH = -14;
+type ERR_GCL_NOT_ENOUGH = -15;
+
+type CreepActionReturnCode =
+  OK |
+  ERR_NOT_OWNER |
+  ERR_BUSY |
+  ERR_INVALID_TARGET |
+  ERR_NOT_IN_RANGE |
+  ERR_NO_BODYPART;
+
+type CreepMoveReturnCode =
+  OK |
+  ERR_NOT_OWNER |
+  ERR_BUSY |
+  ERR_TIRED |
+  ERR_NO_BODYPART;
+
+// Find Constants
+
+type ExitConstant =
+  FIND_EXIT_TOP |
+  FIND_EXIT_RIGHT |
+  FIND_EXIT_BOTTOM |
+  FIND_EXIT_LEFT;
+
+type FindConstant =
+  FIND_EXIT_TOP |
+  FIND_EXIT_RIGHT |
+  FIND_EXIT_BOTTOM |
+  FIND_EXIT_LEFT |
+  FIND_EXIT |
+  FIND_CREEPS |
+  FIND_MY_CREEPS |
+  FIND_HOSTILE_CREEPS |
+  FIND_SOURCES_ACTIVE |
+  FIND_SOURCES |
+  FIND_DROPPED_ENERGY |
+  FIND_DROPPED_RESOURCES |
+  FIND_STRUCTURES |
+  FIND_MY_STRUCTURES |
+  FIND_HOSTILE_STRUCTURES |
+  FIND_FLAGS |
+  FIND_CONSTRUCTION_SITES |
+  FIND_MY_SPAWNS |
+  FIND_HOSTILE_SPAWNS |
+  FIND_MY_CONSTRUCTION_SITES |
+  FIND_HOSTILE_CONSTRUCTION_SITES |
+  FIND_MINERALS |
+  FIND_NUKES;
+
+type FIND_EXIT_TOP = 1;
+type FIND_EXIT_RIGHT = 3;
+type FIND_EXIT_BOTTOM = 5;
+type FIND_EXIT_LEFT = 7;
+type FIND_EXIT = 10;
+type FIND_CREEPS = 101;
+type FIND_MY_CREEPS = 102;
+type FIND_HOSTILE_CREEPS = 103;
+type FIND_SOURCES_ACTIVE = 104;
+type FIND_SOURCES = 105;
+type FIND_DROPPED_ENERGY = -106;
+type FIND_DROPPED_RESOURCES = 106;
+type FIND_STRUCTURES = 107;
+type FIND_MY_STRUCTURES = 108;
+type FIND_HOSTILE_STRUCTURES = 109;
+type FIND_FLAGS = 110;
+type FIND_CONSTRUCTION_SITES = 111;
+type FIND_MY_SPAWNS = 112;
+type FIND_HOSTILE_SPAWNS = 113;
+type FIND_MY_CONSTRUCTION_SITES = 114;
+type FIND_HOSTILE_CONSTRUCTION_SITES = 115;
+type FIND_MINERALS = 116;
+type FIND_NUKES = 117;
+
+type FilterOptions<T extends FindConstant> = string | FilterFunction<T> | { filter: FilterFunction<T> };
+
+type FilterFunction<T extends FindConstant> = (object: FindTypes[T]) => boolean;
+
+// Body Part Constants
+
+type BodyPartConstant =
+  MOVE |
+  WORK |
+  CARRY |
+  ATTACK |
+  RANGED_ATTACK |
+  TOUGH |
+  HEAL |
+  CLAIM;
+
+type MOVE = "move";
+type WORK = "work";
+type CARRY = "carry";
+type ATTACK = "attack";
+type RANGED_ATTACK = "ranged_attack";
+type TOUGH = "tough";
+type HEAL = "heal";
+type CLAIM = "claim";
+
+// Look Constants
+
+type LookConstant =
+  LOOK_CREEPS |
+  LOOK_ENERGY |
+  LOOK_RESOURCES |
+  LOOK_SOURCES |
+  LOOK_MINERALS |
+  LOOK_STRUCTURES |
+  LOOK_FLAGS |
+  LOOK_CONSTRUCTION_SITES |
+  LOOK_NUKES |
+  LOOK_TERRAIN;
+
+type LOOK_CONSTRUCTION_SITES = "constructionSite";
+type LOOK_CREEPS = "creep";
+type LOOK_ENERGY = "energy";
+type LOOK_FLAGS = "flag";
+type LOOK_MINERALS = "mineral";
+type LOOK_NUKES = "nuke";
+type LOOK_RESOURCES = "resource";
+type LOOK_SOURCES = "source";
+type LOOK_STRUCTURES = "structure";
+type LOOK_TERRAIN = "terrain";
+
+// Direction Constants
+
+type DirectionConstant =
+  TOP |
+  TOP_RIGHT |
+  RIGHT |
+  BOTTOM_RIGHT |
+  BOTTOM |
+  BOTTOM_LEFT |
+  LEFT |
+  TOP_LEFT;
+
+type TOP = 1;
+type TOP_RIGHT = 2;
+type RIGHT = 3;
+type BOTTOM_RIGHT = 4;
+type BOTTOM = 5;
+type BOTTOM_LEFT = 6;
+type LEFT = 7;
+type TOP_LEFT = 8;
+
+// Color Constants
+
+type ColorConstant =
+  COLOR_RED |
+  COLOR_PURPLE |
+  COLOR_BLUE |
+  COLOR_CYAN |
+  COLOR_GREEN |
+  COLOR_YELLOW |
+  COLOR_ORANGE |
+  COLOR_BROWN |
+  COLOR_GREY |
+  COLOR_WHITE;
+
+type COLOR_RED = 1;
+type COLOR_PURPLE = 2;
+type COLOR_BLUE = 3;
+type COLOR_CYAN = 4;
+type COLOR_GREEN = 5;
+type COLOR_YELLOW = 6;
+type COLOR_ORANGE = 7;
+type COLOR_BROWN = 8;
+type COLOR_GREY = 9;
+type COLOR_WHITE = 10;
+
+// Structure Constants
+
+type BuildableStructureConstant =
+  STRUCTURE_EXTENSION |
+  STRUCTURE_RAMPART |
+  STRUCTURE_ROAD |
+  STRUCTURE_SPAWN |
+  STRUCTURE_LINK |
+  STRUCTURE_WALL |
+  STRUCTURE_STORAGE |
+  STRUCTURE_TOWER |
+  STRUCTURE_OBSERVER |
+  STRUCTURE_POWER_SPAWN |
+  STRUCTURE_EXTRACTOR |
+  STRUCTURE_LAB |
+  STRUCTURE_TERMINAL |
+  STRUCTURE_CONTAINER |
+  STRUCTURE_NUKER;
+
+type StructureConstant =
+  BuildableStructureConstant |
+  STRUCTURE_KEEPER_LAIR |
+  STRUCTURE_CONTROLLER |
+  STRUCTURE_POWER_BANK |
+  STRUCTURE_PORTAL;
+
+type STRUCTURE_EXTENSION = "extension";
+type STRUCTURE_RAMPART = "rampart";
+type STRUCTURE_ROAD = "road";
+type STRUCTURE_SPAWN = "spawn";
+type STRUCTURE_LINK = "link";
+type STRUCTURE_WALL = "constructedWall";
+type STRUCTURE_KEEPER_LAIR = "keeperLair";
+type STRUCTURE_CONTROLLER = "controller";
+type STRUCTURE_STORAGE = "storage";
+type STRUCTURE_TOWER = "tower";
+type STRUCTURE_OBSERVER = "observer";
+type STRUCTURE_POWER_BANK = "powerBank";
+type STRUCTURE_POWER_SPAWN = "powerSpawn";
+type STRUCTURE_EXTRACTOR = "extractor";
+type STRUCTURE_LAB = "lab";
+type STRUCTURE_TERMINAL = "terminal";
+type STRUCTURE_CONTAINER = "container";
+type STRUCTURE_NUKER = "nuker";
+type STRUCTURE_PORTAL = "portal";
+
+// Resource Constants
+
+type ResourceConstant =
+  RESOURCE_ENERGY |
+  RESOURCE_POWER |
+  RESOURCE_UTRIUM |
+  RESOURCE_LEMERGIUM |
+  RESOURCE_KEANIUM |
+  RESOURCE_GHODIUM |
+  RESOURCE_ZYNTHIUM |
+  RESOURCE_OXYGEN |
+  RESOURCE_HYDROGEN |
+  RESOURCE_CATALYST |
+  RESOURCE_HYDROXIDE |
+  RESOURCE_ZYNTHIUM_KEANITE |
+  RESOURCE_UTRIUM_LEMERGITE |
+  RESOURCE_UTRIUM_HYDRIDE |
+  RESOURCE_UTRIUM_OXIDE |
+  RESOURCE_KEANIUM_HYDRIDE |
+  RESOURCE_KEANIUM_OXIDE |
+  RESOURCE_LEMERGIUM_HYDRIDE |
+  RESOURCE_LEMERGIUM_OXIDE |
+  RESOURCE_ZYNTHIUM_HYDRIDE |
+  RESOURCE_ZYNTHIUM_OXIDE |
+  RESOURCE_GHODIUM_HYDRIDE |
+  RESOURCE_GHODIUM_OXIDE |
+  RESOURCE_UTRIUM_ACID |
+  RESOURCE_UTRIUM_ALKALIDE |
+  RESOURCE_KEANIUM_ACID |
+  RESOURCE_KEANIUM_ALKALIDE |
+  RESOURCE_LEMERGIUM_ACID |
+  RESOURCE_LEMERGIUM_ALKALIDE |
+  RESOURCE_ZYNTHIUM_ACID |
+  RESOURCE_ZYNTHIUM_ALKALIDE |
+  RESOURCE_GHODIUM_ACID |
+  RESOURCE_GHODIUM_ALKALIDE |
+  RESOURCE_CATALYZED_UTRIUM_ACID |
+  RESOURCE_CATALYZED_UTRIUM_ALKALIDE |
+  RESOURCE_CATALYZED_KEANIUM_ACID |
+  RESOURCE_CATALYZED_KEANIUM_ALKALIDE |
+  RESOURCE_CATALYZED_LEMERGIUM_ACID |
+  RESOURCE_CATALYZED_LEMERGIUM_ALKALIDE |
+  RESOURCE_CATALYZED_ZYNTHIUM_ACID |
+  RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE |
+  RESOURCE_CATALYZED_GHODIUM_ACID |
+  RESOURCE_CATALYZED_GHODIUM_ALKALIDE;
+
+type _ResourceConstantSansEnergy =
+  RESOURCE_POWER |
+  RESOURCE_UTRIUM |
+  RESOURCE_LEMERGIUM |
+  RESOURCE_KEANIUM |
+  RESOURCE_GHODIUM |
+  RESOURCE_ZYNTHIUM |
+  RESOURCE_OXYGEN |
+  RESOURCE_HYDROGEN |
+  RESOURCE_CATALYST |
+  RESOURCE_HYDROXIDE |
+  RESOURCE_ZYNTHIUM_KEANITE |
+  RESOURCE_UTRIUM_LEMERGITE |
+  RESOURCE_UTRIUM_HYDRIDE |
+  RESOURCE_UTRIUM_OXIDE |
+  RESOURCE_KEANIUM_HYDRIDE |
+  RESOURCE_KEANIUM_OXIDE |
+  RESOURCE_LEMERGIUM_HYDRIDE |
+  RESOURCE_LEMERGIUM_OXIDE |
+  RESOURCE_ZYNTHIUM_HYDRIDE |
+  RESOURCE_ZYNTHIUM_OXIDE |
+  RESOURCE_GHODIUM_HYDRIDE |
+  RESOURCE_GHODIUM_OXIDE |
+  RESOURCE_UTRIUM_ACID |
+  RESOURCE_UTRIUM_ALKALIDE |
+  RESOURCE_KEANIUM_ACID |
+  RESOURCE_KEANIUM_ALKALIDE |
+  RESOURCE_LEMERGIUM_ACID |
+  RESOURCE_LEMERGIUM_ALKALIDE |
+  RESOURCE_ZYNTHIUM_ACID |
+  RESOURCE_ZYNTHIUM_ALKALIDE |
+  RESOURCE_GHODIUM_ACID |
+  RESOURCE_GHODIUM_ALKALIDE |
+  RESOURCE_CATALYZED_UTRIUM_ACID |
+  RESOURCE_CATALYZED_UTRIUM_ALKALIDE |
+  RESOURCE_CATALYZED_KEANIUM_ACID |
+  RESOURCE_CATALYZED_KEANIUM_ALKALIDE |
+  RESOURCE_CATALYZED_LEMERGIUM_ACID |
+  RESOURCE_CATALYZED_LEMERGIUM_ALKALIDE |
+  RESOURCE_CATALYZED_ZYNTHIUM_ACID |
+  RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE |
+  RESOURCE_CATALYZED_GHODIUM_ACID |
+  RESOURCE_CATALYZED_GHODIUM_ALKALIDE;
+
+type MineralConstant =
+  RESOURCE_UTRIUM |
+  RESOURCE_LEMERGIUM |
+  RESOURCE_KEANIUM |
+  RESOURCE_GHODIUM |
+  RESOURCE_ZYNTHIUM |
+  RESOURCE_OXYGEN |
+  RESOURCE_HYDROGEN |
+  RESOURCE_CATALYST;
+
+type RESOURCE_ENERGY = "energy";
+type RESOURCE_POWER = "power";
+
+type RESOURCE_UTRIUM = "U";
+type RESOURCE_LEMERGIUM = "L";
+type RESOURCE_KEANIUM = "K";
+type RESOURCE_GHODIUM = "G";
+type RESOURCE_ZYNTHIUM = "Z";
+type RESOURCE_OXYGEN = "O";
+type RESOURCE_HYDROGEN = "H";
+type RESOURCE_CATALYST = "X";
+
+type RESOURCE_HYDROXIDE = "OH";
+type RESOURCE_ZYNTHIUM_KEANITE = "ZK";
+type RESOURCE_UTRIUM_LEMERGITE = "UL";
+type RESOURCE_UTRIUM_HYDRIDE = "UH";
+type RESOURCE_UTRIUM_OXIDE = "UO";
+type RESOURCE_KEANIUM_HYDRIDE = "KH";
+type RESOURCE_KEANIUM_OXIDE = "KO";
+type RESOURCE_LEMERGIUM_HYDRIDE = "LH";
+type RESOURCE_LEMERGIUM_OXIDE = "LO";
+type RESOURCE_ZYNTHIUM_HYDRIDE = "ZH";
+type RESOURCE_ZYNTHIUM_OXIDE = "ZO";
+type RESOURCE_GHODIUM_HYDRIDE = "GH";
+type RESOURCE_GHODIUM_OXIDE = "GO";
+
+type RESOURCE_UTRIUM_ACID = "UH2O";
+type RESOURCE_UTRIUM_ALKALIDE = "UHO2";
+type RESOURCE_KEANIUM_ACID = "KH2O";
+type RESOURCE_KEANIUM_ALKALIDE = "KHO2";
+type RESOURCE_LEMERGIUM_ACID = "LH2O";
+type RESOURCE_LEMERGIUM_ALKALIDE = "LHO2";
+type RESOURCE_ZYNTHIUM_ACID = "ZH2O";
+type RESOURCE_ZYNTHIUM_ALKALIDE = "ZHO2";
+type RESOURCE_GHODIUM_ACID = "GH2O";
+type RESOURCE_GHODIUM_ALKALIDE = "GHO2";
+
+type RESOURCE_CATALYZED_UTRIUM_ACID = "XUH2O";
+type RESOURCE_CATALYZED_UTRIUM_ALKALIDE = "XUHO2";
+type RESOURCE_CATALYZED_KEANIUM_ACID = "XKH2O";
+type RESOURCE_CATALYZED_KEANIUM_ALKALIDE = "XKHO2";
+type RESOURCE_CATALYZED_LEMERGIUM_ACID = "XLH2O";
+type RESOURCE_CATALYZED_LEMERGIUM_ALKALIDE = "XLHO2";
+type RESOURCE_CATALYZED_ZYNTHIUM_ACID = "XZH2O";
+type RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE = "ZXHO2";
+type RESOURCE_CATALYZED_GHODIUM_ACID = "XGH2O";
+type RESOURCE_CATALYZED_GHODIUM_ALKALIDE = "XGHO2";
+/**
+ * The options that can be accepted by `findRoute()` and friends.
+ */
+interface RouteOptions {
+    routeCallback: (roomName: string, fromRoomName: string) => any;
+}
+
+/**
+ * A global object representing world map. Use it to navigate between rooms. The object is accessible via Game.map property.
+ */
+interface GameMap {
+    /**
+     * List all exits available from the room with the given name.
+     * @param roomName The room name.
+     * @returns The exits information or null if the room not found.
+     */
+    describeExits(roomName: string): {"1"?: string, "3"?: string, "5"?: string, "7"?: string};
+    /**
+     * Find the exit direction from the given room en route to another room.
+     * @param fromRoom Start room name or room object.
+     * @param toRoom Finish room name or room object.
+     * @param opts (optional) An object with the pathfinding options.
+     * @returns The room direction constant, one of the following:
+     * FIND_EXIT_TOP, FIND_EXIT_RIGHT, FIND_EXIT_BOTTOM, FIND_EXIT_LEFT
+     * Or one of the following Result codes:
+     * ERR_NO_PATH, ERR_INVALID_ARGS
+     */
+    findExit(fromRoom: string|Room, toRoom: string|Room, opts?: RouteOptions): ScreepsReturnCode;
+    /**
+     * Find route from the given room to another room.
+     * @param fromRoom Start room name or room object.
+     * @param toRoom Finish room name or room object.
+     * @param opts (optional) An object with the pathfinding options.
+     * @returns the route array or ERR_NO_PATH code
+     */
+    findRoute(fromRoom: string | Room, toRoom: string | Room, opts?: RouteOptions): Array<{
+        exit: ExitConstant;
+        room: string;
+    }> | ERR_NO_PATH;
+    /**
+     * Get the linear distance (in rooms) between two rooms. You can use this function to estimate the energy cost of
+     * sending resources through terminals, or using observers and nukes.
+     * @param roomName1 The name of the first room.
+     * @param roomName2 The name of the second room.
+     * @param continuous Whether to treat the world map continuous on borders. Set to true if you
+     *                   want to calculate the trade or terminal send cost. Default is false.
+     */
+    getRoomLinearDistance(roomName1: string, roomName2: string, continuous?: boolean): number;
+    /**
+     * Get terrain type at the specified room position. This method works for any room in the world even if you have no access to it.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     * @param roomName The room name.
+     */
+    getTerrainAt(x: number, y: number, roomName: string): Terrain;
+    /**
+     * Get terrain type at the specified room position. This method works for any room in the world even if you have no access to it.
+     * @param pos The position object.
+     */
+    getTerrainAt(pos: RoomPosition): Terrain;
+
+    /**
+     * Returns the world size as a number of rooms between world corners. For example, for a world with rooms from W50N50 to E50S50 this method will return 102.
+     */
+    getWorldSize(): number;
+
+    /**
+     * Check if the room is available to move into.
+     * @param roomName The room name.
+     * @returns A boolean value.
+     */
+    isRoomAvailable(roomName: string): boolean;
+}
+
+// No static is available
+/**
+ * A global object representing the in-game market. You can use this object to track resource transactions to/from your
+ * terminals, and your buy/sell orders. The object is accessible via the singleton Game.market property.
+ */
+interface Market {
+    /**
+     * Your current credits balance.
+     */
+    credits: number;
+    /**
+     * An array of the last 100 incoming transactions to your terminals
+     */
+    incomingTransactions: Transaction[];
+    /**
+     * An object with your active and inactive buy/sell orders on the market.
+     */
+    orders: { [key: string]: Order };
+    /**
+     * An array of the last 100 outgoing transactions from your terminals
+     */
+    outgoingTransactions: Transaction[];
+    /**
+     * Estimate the energy transaction cost of StructureTerminal.send and Market.deal methods. The formula:
+     *
+     * ```
+     * Math.ceil( amount * (Math.log(0.1*linearDistanceBetweenRooms + 0.9) + 0.1) )
+     * ```
+     *
+     * @param amount Amount of resources to be sent.
+     * @param roomName1 The name of the first room.
+     * @param roomName2 The name of the second room.
+     * @returns The amount of energy required to perform the transaction.
+     */
+    calcTransactionCost(amount: number, roomName1: string, roomName2: string): number;
+    /**
+     * Cancel a previously created order. The 5% fee is not returned.
+     * @param orderId The order ID as provided in Game.market.orders
+     * @returns Result Code: OK, ERR_INVALID_ARGS
+     */
+    cancelOrder(orderId: string): ScreepsReturnCode;
+    /**
+     * Change the price of an existing order. If `newPrice` is greater than old price, you will be charged `(newPrice-oldPrice)*remainingAmount*0.05` credits.
+     * @param orderId The order ID as provided in Game.market.orders
+     * @param newPrice The new order price.
+     * @returns Result Code: OK, ERR_NOT_OWNER, ERR_NOT_ENOUGH_RESOURCES, ERR_INVALID_ARGS
+     */
+    changeOrderPrice(orderId: string, newPrice: number): ScreepsReturnCode;
+    /**
+     * Create a market order in your terminal. You will be charged `price*amount*0.05` credits when the order is placed.
+     *
+     * The maximum orders count is 50 per player. You can create an order at any time with any amount,
+     * it will be automatically activated and deactivated depending on the resource/credits availability.
+     */
+    createOrder(type: string, resourceType: ResourceConstant, price: number, totalAmount: number, roomName?: string): ScreepsReturnCode;
+    /**
+     * Execute a trade deal from your Terminal to another player's Terminal using the specified buy/sell order.
+     *
+     * Your Terminal will be charged energy units of transfer cost regardless of the order resource type.
+     * You can use Game.market.calcTransactionCost method to estimate it.
+     *
+     * When multiple players try to execute the same deal, the one with the shortest distance takes precedence.
+     */
+    deal(orderId: string, amount: number, targetRoomName?: string): ScreepsReturnCode;
+    /**
+     * Add more capacity to an existing order. It will affect `remainingAmount` and `totalAmount` properties. You will be charged `price*addAmount*0.05` credits.
+     * @param orderId The order ID as provided in Game.market.orders
+     * @param addAmount How much capacity to add. Cannot be a negative value.
+     * @returns One of the following codes: `OK`, `ERR_NOT_ENOUGH_RESOURCES`, `ERR_INVALID_ARGS`
+     */
+    extendOrder(orderId: string, addAmount: number): ScreepsReturnCode;
+    /**
+     * Get other players' orders currently active on the market.
+     * @param filter (optional) An object or function that will filter the resulting list using the lodash.filter method.
+     * @returns An array of objects containing order information.
+     */
+    getAllOrders(filter?: OrderFilter | ((o: Order) => boolean)): Order[];
+    /**
+     * Retrieve info for specific market order.
+     * @param orderId The order ID.
+     * @returns An object with the order info. See `getAllOrders` for properties explanation.
+     */
+    getOrderById(id: string): Order | null;
+}
+
+// No static is available
+
+interface Transaction {
+    transactionId: string;
+    time: number;
+    sender?: { username: string };
+    recipient?: { username: string };
+    resourceType: ResourceConstant;
+    amount: number;
+    from: string;
+    to: string;
+    description: string;
+    order?: TransactionOrder;
+}
+
+interface Order {
+    id: string;
+    created: number;
+    active?: boolean;
+    type: string;
+    resourceType: ResourceConstant;
+    roomName?: string;
+    amount: number;
+    remainingAmount: number;
+    totalAmount?: number;
+    price: number;
+}
+
+interface TransactionOrder {
+    id: string;
+    type: string;
+    price: number;
+}
+
+interface OrderFilter {
+    id?: string;
+    created?: number;
+    type?: string;
+    resourceType?: ResourceConstant;
+    roomName?: string;
+    amount?: number;
+    remainingAmount?: number;
+    price?: number;
+}
+interface Memory {
+    [name: string]: any;
+    creeps: {[name: string]: CreepMemory};
+    flags: {[name: string]: FlagMemory};
+    rooms: {[name: string]: RoomMemory};
+    spawns: {[name: string]: SpawnMemory};
+}
+
+interface CreepMemory {}
+interface FlagMemory {}
+interface RoomMemory {}
+interface SpawnMemory {}
+
+declare const Memory: Memory;
+/**
+ * A mineral deposit object. Can be harvested by creeps with a WORK body part using the extractor structure.
+ * @see http://docs.screeps.com/api/#Mineral
+ */
+interface Mineral<T extends MineralConstant = MineralConstant> extends RoomObject {
+    /**
+     * The prototype is stored in the Mineral.prototype global object. You can use it to extend game objects behaviour globally.
+     */
+    readonly prototype: Mineral;
+    /**
+     * The density of this mineral deposit, one of the `DENSITY_*` constants.
+     */
+    density: number;
+    /**
+     * The remaining amount of resources.
+     */
+    mineralAmount: number;
+    /**
+     * The resource type, one of the `RESOURCE_*` constants.
+     */
+    mineralType: T;
+    /**
+     * A unique object identifier. You can use `Game.getObjectById` method to retrieve an object instance by its `id`.
+     */
+    id: string;
+    /**
+     * The remaining time after which the deposit will be refilled.
+     */
+    ticksToRegeneration: number;
+}
+
+interface MineralConstructor extends _Constructor<Mineral>, _ConstructorById<Mineral> {
+}
+
+declare const Mineral: MineralConstructor;
+/**
+ * A nuke landing position. This object cannot be removed or modified. You can find incoming nukes in the room using the FIND_NUKES constant.
+ */
+interface Nuke extends RoomObject {
+    readonly prototype: Nuke;
+
+    /**
+     * A unique object identifier. You can use Game.getObjectById method to retrieve an object instance by its id.
+     */
+    id: string;
+    /**
+     * The name of the room where this nuke has been launched from.
+     */
+    launchRoomName: string;
+    /**
+     * The remaining landing time.
+     */
+    timeToLand: number;
+}
+
+interface NukeConstructor {
+    new (id: string): Nuke;
+}
+
+declare const Nuke: NukeConstructor;
+/**
+ * Contains powerful methods for pathfinding in the game world. Support exists for custom navigation costs and paths which span multiple rooms.
+ * Additionally PathFinder can search for paths through rooms you can't see, although you won't be able to detect any dynamic obstacles like creeps or buildings.
+ */
+interface PathFinder {
+    /**
+     * Container for custom navigation cost data.
+     */
+    CostMatrix: CostMatrix;
+
+    /**
+     * Find an optimal path between origin and goal.
+     *
+     * @param origin The start position.
+     * @param goal goal A RoomPosition, an object containing a RoomPosition and range or an array of either.
+     * @param opts An object containing additional pathfinding flags.
+     */
+    search(origin: RoomPosition, goal: RoomPosition | { pos: RoomPosition, range: number } | RoomPosition[] | Array<{ pos: RoomPosition, range: number }>, opts?: PathFinderOpts): PathFinderPath;
+    /**
+     * Specify whether to use this new experimental pathfinder in game objects methods.
+     * This method should be invoked every tick. It affects the following methods behavior:
+     * * `Room.findPath`
+     * * `RoomPosition.findPathTo`
+     * * `RoomPosition.findClosestByPath`
+     * * `Creep.moveTo`
+     *
+     * @deprecated This method is deprecated and will be removed soon.
+     * @param isEnabled Whether to activate the new pathfinder or deactivate.
+     */
+    use(isEnabled: boolean): undefined;
+}
+
+/**
+ * An object containing:
+ * path - An array of RoomPosition objects.
+ * ops - Total number of operations performed before this path was calculated.
+ * cost - The total cost of the path as derived from `plainCost`, `swampCost` and any given CostMatrix instances.
+ * incomplete - If the pathfinder fails to find a complete path, this will be true.
+ *   Note that `path` will still be populated with a partial path which represents the closest path it could find given the search parameters.
+ */
+interface PathFinderPath {
+    /**
+     * An array of RoomPosition objects.
+     */
+    path: RoomPosition[];
+    /**
+     * Total number of operations performed before this path was calculated.
+     */
+    ops: number;
+    /**
+     * The total cost of the path as derived from `plainCost`, `swampCost` and any given CostMatrix instances.
+     */
+    cost: number;
+    /**
+     * If the pathfinder fails to find a complete path, this will be true.
+     *
+     * Note that `path` will still be populated with a partial path which represents the closest path it could find given the search parameters.
+     */
+    incomplete: boolean;
+}
+
+/**
+ * An object containing additional pathfinding flags.
+ */
+interface PathFinderOpts {
+    /**
+     * Cost for walking on plain positions. The default is 1.
+     */
+    plainCost?: number;
+    /**
+     * Cost for walking on swamp positions. The default is 5.
+     */
+    swampCost?: number;
+    /**
+     * Instead of searching for a path to the goals this will search for a path away from the goals.
+     * The cheapest path that is out of range of every goal will be returned. The default is false.
+     */
+    flee?: boolean;
+    /**
+     * The maximum allowed pathfinding operations. You can limit CPU time used for the search based on ratio 1 op ~ 0.001 CPU. The default value is 2000.
+     */
+    maxOps?: number;
+    /**
+     * The maximum allowed rooms to search. The default (and maximum) is 16.
+     */
+    maxRooms?: number;
+    /**
+     * The maximum allowed cost of the path returned. If at any point the pathfinder detects that it is impossible to find
+     * a path with a cost less than or equal to maxCost it will immediately halt the search. The default is Infinity.
+     */
+    maxCost?: number;
+    /**
+     * Weight to apply to the heuristic in the A* formula F = G + weight * H. Use this option only if you understand
+     * the underlying A* algorithm mechanics! The default value is 1.
+     */
+    heuristicWeight?: number;
+
+    /**
+     * Request from the pathfinder to generate a CostMatrix for a certain room. The callback accepts one argument, roomName.
+     * This callback will only be called once per room per search. If you are running multiple pathfinding operations in a
+     * single room and in a single tick you may consider caching your CostMatrix to speed up your code. Please read the
+     * CostMatrix documentation below for more information on CostMatrix.
+     *
+     * @param roomName
+     */
+    roomCallback?(roomName: string): boolean | CostMatrix;
+}
+
+/**
+ * Container for custom navigation cost data.
+ */
+interface CostMatrix {
+    /**
+     * Creates a new CostMatrix containing 0's for all positions.
+     * @constructor
+     */
+    new(): CostMatrix;
+    /**
+     * Set the cost of a position in this CostMatrix.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     * @param cost Cost of this position. Must be a whole number. A cost of 0 will use the terrain cost for that tile. A cost greater than or equal to 255 will be treated as unwalkable.
+     */
+    set(x: number, y: number, cost: number): undefined;
+    /**
+     * Get the cost of a position in this CostMatrix.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     */
+    get(x: number, y: number): number;
+    /**
+     * Copy this CostMatrix into a new CostMatrix with the same data.
+     */
+    clone(): CostMatrix;
+    /**
+     * Returns a compact representation of this CostMatrix which can be stored via JSON.stringify.
+     */
+    serialize(): number[];
+    /**
+     * Static method which deserializes a new CostMatrix using the return value of serialize.
+     * @param val Whatever serialize returned
+     */
+    deserialize(val: number[]): CostMatrix;
+}
+
+declare const PathFinder: PathFinder;
+/**
+ * RawMemory object allows to implement your own memory stringifier instead of built-in serializer based on JSON.stringify.
+ */
+interface RawMemory {
+  /**
+   * An object with asynchronous memory segments available on this tick. Each object key is the segment ID with data in string values.
+   * Use RawMemory.setActiveSegments to fetch segments on the next tick. Segments data is saved automatically in the end of the tick.
+   */
+  segments: string[];
+
+  /**
+   * An object with a memory segment of another player available on this tick. Use `setActiveForeignSegment` to fetch segments on the next tick.
+   */
+  foreignSegment: {
+    username: string,
+    id: number,
+    data: string,
+  };
+
+  /**
+   * A string with a shared memory segment available on every world shard. Maximum string length is 100 KB.
+   *
+   * **Warning:** this segment is not safe for concurrent usage! All shards have shared access to the same instance of
+   * data. When the segment contents is changed by two shards simultaneously, you may lose some data, since the segment
+   * string value is written all at once atomically. You must implement your own system to determine when each shard is
+   * allowed to rewrite the inter-shard memory, e.g. based on mutual exclusions.
+   */
+  interShardSegment: string;
+
+  /**
+   * Get a raw string representation of the Memory object.
+   */
+  get(): string;
+  /**
+   * Set new memory value.
+   * @param value New memory value as a string.
+   */
+  set(value: string): undefined;
+  /**
+   * Request memory segments using the list of their IDs. Memory segments will become available on the next tick in RawMemory.segments object.
+   * @param ids An array of segment IDs. Each ID should be a number from 0 to 99. Maximum 10 segments can be active at the same time. Subsequent calls of setActiveSegments override previous ones.
+   */
+  setActiveSegments(ids: number[]): undefined;
+  /**
+   * Request a memory segment of another user.
+   *
+   * The segment should be marked by its owner as public using `setPublicSegments`.
+   *
+   * The segment data will become available on the next tick in `foreignSegment` object.
+   *
+   * You can only have access to one foreign segment at the same time.
+   *
+   * @param username The name of another user. Pass `null` to clear the foreign segment.
+   * @param id The ID of the requested segment from 0 to 99. If undefined, the user's default public segment is requested as set by `setDefaultPublicSegment`.
+   */
+  setActiveForeignSegment(username: string | null, id?: number): undefined;
+  /**
+   * Set the specified segment as your default public segment. It will be returned if no id parameter is passed to `setActiveForeignSegment` by another user.
+   *
+   * @param id The ID of the requested segment from 0 to 99. Pass `null` to clear the foreign segment.
+   */
+  setDefaultPublicSegment(id: number | null): undefined;
+  /**
+   * Set specified segments as public. Other users will be able to request access to them using `setActiveForeignSegment`.
+   *
+   * @param ids An array of segment IDs. Each ID should be a number from 0 to 99. Subsequent calls of `setPublicSegments` override previous ones.
+   */
+  setPublicSegments(ids: number[]): undefined;
+}
+
+declare const RawMemory: RawMemory;
+/**
+ * A dropped piece of resource. It will decay after a while if not picked up. Dropped resource pile decays for ceil(amount/1000) units per tick.
+ */
+
+interface Resource<T extends ResourceConstant = ResourceConstant> extends RoomObject {
+    readonly prototype: Resource;
+
+    /**
+     * The amount of resource units containing.
+     */
+    amount: number;
+    /**
+     * A unique object identifier. You can use `Game.getObjectById` method to retrieve an object instance by its `id`.
+     */
+    id: string;
+    /**
+     * One of the `RESOURCE_*` constants.
+     */
+    resourceType: T;
+}
+
+interface ResourceConstructor {
+    new (id: string): Resource;
+}
+
+declare const Resource: ResourceConstructor;
+/**
+ * Any object with a position in a room. Almost all game objects prototypes
+ * are derived from RoomObject.
+ */
+
+interface RoomObject {
+    readonly prototype: RoomObject;
+    /**
+     * An object representing the position of this object in the room.
+     */
+    pos: RoomPosition;
+    /**
+     * The link to the Room object. May be undefined in case if an object is a
+     * flag or a construction site and is placed in a room that is not visible
+     * to you.
+     */
+    room: Room | undefined;
+}
+
+interface RoomObjectConstructor extends _Constructor<RoomObject> {
+    new (x: number, y: number, roomName: string): RoomObject;
+    (x: number, y: number, roomName: string): RoomObject;
+}
+
+declare const RoomObject: RoomObjectConstructor;
+/**
+ * An object representing the specified position in the room.
+ *
+ * Every object in the room contains RoomPosition as the pos property.
+ *
+ * The position object of a custom location can be obtained using the Room.getPositionAt() method or using the constructor.
+ */
+interface RoomPosition {
+    readonly prototype: RoomPosition;
+
+    /**
+     * The name of the room.
+     */
+    roomName: string;
+    /**
+     * X position in the room.
+     */
+    x: number;
+    /**
+     * Y position in the room.
+     */
+    y: number;
+    /**
+     * Create new ConstructionSite at the specified location.
+     * @param structureType One of the following constants:
+     *  * STRUCTURE_EXTENSION
+     *  * STRUCTURE_RAMPART
+     *  * STRUCTURE_ROAD
+     *  * STRUCTURE_SPAWN
+     *  * STRUCTURE_WALL
+     *  * STRUCTURE_LINK
+     */
+    createConstructionSite(structureType: BuildableStructureConstant): ScreepsReturnCode;
+    /**
+     * Create new Flag at the specified location.
+     * @param name The name of a new flag.
+     * It should be unique, i.e. the Game.flags object should not contain another flag with the same name (hash key).
+     * If not defined, a random name will be generated.
+     * @param color The color of a new flag. Should be one of the COLOR_* constants
+     * @param secondaryColor The secondary color of a new flag. Should be one of the COLOR_* constants. The default value is equal to color.
+     */
+    createFlag(name?: string, color?: ColorConstant, secondaryColor?: ColorConstant): ScreepsReturnCode;
+    /**
+     * Find the object with the shortest path from the given position. Uses A* search algorithm and Dijkstra's algorithm.
+     * @param type Any of the FIND_* constants.
+     * @param opts An object containing pathfinding options (see Room.findPath), or one of the following: filter, algorithm
+     * @returns An instance of a RoomObject.
+     */
+    findClosestByPath<K extends FindConstant>(type: K, opts?: FindPathOpts & { filter?: FilterFunction<K>, algorithm?: string }): FindTypes[K];
+    findClosestByPath<T extends Structure>(
+        type: FIND_STRUCTURES | FIND_MY_STRUCTURES | FIND_HOSTILE_STRUCTURES,
+        opts?: FindPathOpts & { filter?: FilterFunction<FIND_STRUCTURES>, algorithm?: string}
+    ): T;
+    /**
+     * Find the object with the shortest path from the given position. Uses A* search algorithm and Dijkstra's algorithm.
+     * @param objects An array of RoomPositions or objects with a RoomPosition
+     * @param opts An object containing pathfinding options (see Room.findPath), or one of the following: filter, algorithm
+     * @returns One of the supplied objects
+     */
+    findClosestByPath<T extends _HasRoomPosition | RoomPosition>(objects: T[], opts?: FindPathOpts & {filter?: any | string, algorithm?: string}): T;
+    /**
+     * Find the object with the shortest linear distance from the given position.
+     * @param type Any of the FIND_* constants.
+     * @param opts An object containing pathfinding options (see Room.findPath), or one of the following: filter, algorithm
+     */
+    findClosestByRange<K extends FindConstant>(type: K, opts?: {filter: FilterFunction<K>}): FindTypes[K];
+    findClosestByRange<T extends Structure>(type: FIND_STRUCTURES | FIND_MY_STRUCTURES | FIND_HOSTILE_STRUCTURES, opts?: {filter: FilterFunction<FIND_STRUCTURES>}): T;
+    /**
+     * Find the object with the shortest linear distance from the given position.
+     * @param objects An array of RoomPositions or objects with a RoomPosition.
+     * @param opts An object containing pathfinding options (see Room.findPath), or one of the following: filter, algorithm
+     */
+    findClosestByRange<T extends _HasRoomPosition | RoomPosition>(objects: T[], opts?: {filter: any | string}): T;
+    /**
+     * Find all objects in the specified linear range.
+     * @param type Any of the FIND_* constants.
+     * @param range The range distance.
+     * @param opts See Room.find.
+     */
+    findInRange<K extends FindConstant>(type: K, range: number, opts?: {filter: any| string}): Array<FindTypes[K]>;
+    findInRange<T extends Structure>(type: FIND_STRUCTURES | FIND_MY_STRUCTURES | FIND_HOSTILE_STRUCTURES, range: number, opts?: {filter: FilterFunction<FIND_STRUCTURES>}): T[];
+    /**
+     * Find all objects in the specified linear range.
+     * @param objects An array of room's objects or RoomPosition objects that the search should be executed against.
+     * @param range The range distance.
+     * @param opts See Room.find.
+     */
+    findInRange<T extends _HasRoomPosition | RoomPosition>(objects: T[], range: number, opts?: { filter?: any | string }): T[];
+    /**
+     * Find an optimal path to the specified position using A* search algorithm.
+     *
+     * This method is a shorthand for Room.findPath. If the target is in another room, then the corresponding exit will be used as a target.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     * @param opts An object containing pathfinding options flags (see Room.findPath for more details).
+     */
+    findPathTo(x: number, y: number, opts?: FindPathOpts): PathStep[];
+    /**
+     * Find an optimal path to the specified position using A* search algorithm.
+     *
+     * This method is a shorthand for Room.findPath. If the target is in another room, then the corresponding exit will be used as a target.
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     * @param opts An object containing pathfinding options flags (see Room.findPath for more details).
+     */
+    findPathTo(target: RoomPosition | _HasRoomPosition, opts?: FindPathOpts): PathStep[];
+    /**
+     * Get linear direction to the specified position.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     */
+    getDirectionTo(x: number, y: number): DirectionConstant;
+    /**
+     * Get linear direction to the specified position.
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     */
+    getDirectionTo(target: RoomPosition | _HasRoomPosition): DirectionConstant;
+    /**
+     * Get linear range to the specified position.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     */
+    getRangeTo(x: number, y: number): number;
+    /**
+     * Get linear range to the specified position.
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     */
+    getRangeTo(target: RoomPosition | { pos: RoomPosition }): number;
+    /**
+     * Check whether this position is in the given range of another position.
+     * @param toPos The target position.
+     * @param range The range distance.
+     */
+    inRangeTo(target: RoomPosition|{pos: RoomPosition}, range: number): boolean;
+    /**
+     * Check whether this position is the same as the specified position.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     */
+    isEqualTo(x: number, y: number): boolean;
+    /**
+     * Check whether this position is the same as the specified position.
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     */
+    isEqualTo(target: RoomPosition | { pos: RoomPosition }): boolean;
+    /**
+     * Check whether this position is on the adjacent square to the specified position. The same as inRangeTo(target, 1).
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     */
+    isNearTo(x: number, y: number): boolean;
+    /**
+     * Check whether this position is on the adjacent square to the specified position. The same as inRangeTo(target, 1).
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     */
+    isNearTo(target: RoomPosition | { pos: RoomPosition }): boolean;
+    /**
+     * Get the list of objects at the specified room position.
+     */
+    look(): LookAtResult[];
+    /**
+     * Get an object with the given type at the specified room position.
+     * @param type One of the following string constants: constructionSite, creep, exit, flag, resource, source, structure, terrain
+     */
+    lookFor<T extends keyof LookAtTypes>(type: T): Array<LookAtTypes[T]>;
+}
+
+interface RoomPositionConstructor extends _Constructor<RoomPosition> {
+    /**
+     * You can create new RoomPosition object using its constructor.
+     * @param x X position in the room.
+     * @param y Y position in the room.
+     * @param roomName The room name.
+     */
+    new (x: number, y: number, roomName: string): RoomPosition;
+    (x: number, y: number, roomName: string): RoomPosition;
+}
+
+declare const RoomPosition: RoomPositionConstructor;
+declare class RoomVisual {
+    /**
+     * You can create new RoomVisual object using its constructor.
+     * @param roomName The room name. If undefined, visuals will be posted to all rooms simultaneously.
+     */
+    constructor(roomName?: string);
+
+    /**
+     * The name of the room.
+     */
+    roomName: string;
+
+    /**
+     * Draw a line.
+     * @param x1 The start X coordinate.
+     * @param y1 The start Y coordinate.
+     * @param x2 The finish X coordinate.
+     * @param y2 The finish Y coordinate.
+     * @param style The (optional) style.
+     * @returns The RoomVisual object, for chaining.
+     */
+    line(x1: number, y1: number, x2: number, y2: number, style?: LineStyle): RoomVisual;
+
+    /**
+     * Draw a line.
+     * @param pos1 The start position object.
+     * @param pos2 The finish position object.
+     * @param style The (optional) style.
+     * @returns The RoomVisual object, for chaining.
+     */
+    line(pos1: RoomPosition, pos2: RoomPosition, style?: LineStyle): RoomVisual;
+
+    /**
+     * Draw a circle.
+     * @param x The X coordinate of the center.
+     * @param y The Y coordinate of the center.
+     * @param style The (optional) style.
+     * @returns The RoomVisual object, for chaining.
+     */
+    circle(x: number, y: number, style?: CircleStyle): RoomVisual;
+
+    /**
+     * Draw a circle.
+     * @param pos The position object of the center.
+     * @param style An object describing the style.
+     * @returns The RoomVisual object itself, so that you can chain calls.
+     */
+    circle(pos: RoomPosition, style?: CircleStyle): RoomVisual;
+
+    /**
+     * Draw a rectangle.
+     * @param x The X coordinate of the top-left corner.
+     * @param y The Y coordinate of the top-left corner.
+     * @param w The width of the rectangle.
+     * @param h The height of the rectangle.
+     * @param style The (optional) style.
+     * @returns The RoomVisual object, for chaining.
+     */
+    rect(x: number, y: number, w: number, h: number, style?: PolyStyle): RoomVisual;
+
+    /**
+     * Draw a line.
+     * @param topLeftPos The position object of the top-left corner.
+     * @param width The width of the rectangle.
+     * @param height The height of the rectangle.
+     * @param style An object describing the style.
+     * @returns The RoomVisual object itself, so that you can chain calls.
+     */
+    rect(topLeftPos: RoomPosition, width: number, height: number, style?: PolyStyle): RoomVisual;
+    /**
+     * Draw a polygon.
+     * @param points An array of points. Every array item should be either an array with 2 numbers (i.e. [10,15]), or a RoomPosition object.
+     * @param style The (optional) style.
+     * @returns The RoomVisual object, for chaining.
+     */
+    poly(points: Array<[number, number] | RoomPosition>, style?: PolyStyle): RoomVisual;
+
+    /**
+     * Draw a text label.
+     * @param text The text message.
+     * @param x The X coordinate of the label baseline center point.
+     * @param y The Y coordinate of the label baseline center point.
+     * @param style The (optional) text style.
+     * @returns The RoomVisual object, for chaining.
+     */
+    text(text: string, x: number, y: number, style?: TextStyle): RoomVisual;
+
+    /**
+     * Draw a text label. You can use any valid Unicode characters, including emoji.
+     * @param text The text message.
+     * @param pos The position object of the center.
+     * @param style An object describing the style.
+     * @returns The RoomVisual object itself, so that you can chain calls.
+     */
+    text(text: string, pos: RoomPosition, style?: TextStyle): RoomVisual;
+
+    /**
+     * Remove all visuals from the room.
+     * @returns The RoomVisual object, for chaining.
+     */
+    clear(): RoomVisual;
+
+    /**
+     * Get the stored size of all visuals added in the room in the current tick.
+     * It must not exceed 512,000 (500 KB).
+     * @returns The size of the visuals in bytes.
+     */
+    getSize(): number;
+}
+
+interface LineStyle {
+    /**
+     * Line width, default is 0.1.
+     */
+    width?: number;
+    /**
+     * Line color in any web format, default is #ffffff(white).
+     */
+    color?: string;
+    /**
+     * Opacity value, default is 0.5.
+     */
+    opacity?: number;
+    /**
+     * Either undefined (solid line), dashed, or dotted.Default is undefined.
+     */
+    lineStyle?: "dashed" | "dotted";
+}
+
+interface PolyStyle {
+    /**
+     * Fill color in any web format, default is #ffffff(white).
+     */
+    fill?: string;
+    /**
+     * Opacity value, default is 0.5.
+     */
+    opacity?: number;
+    /**
+     * Stroke color in any web format, default is undefined (no stroke).
+     */
+    stroke?: string | undefined;
+    /**
+     * Stroke line width, default is 0.1.
+     */
+    strokeWidth?: number;
+    /**
+     * Either undefined (solid line), dashed, or dotted.Default is undefined.
+     */
+    lineStyle?: "dashed" | "dotted";
+}
+
+interface CircleStyle extends PolyStyle {
+    /**
+     * Circle radius, default is 0.15.
+     */
+    radius?: number;
+}
+
+interface TextStyle {
+    /**
+     * Font color in any web format, default is #ffffff(white).
+     */
+    color?: string;
+    /**
+     * Either a number or a string in one of the following forms:
+     * 0.7 - relative size in game coordinates
+     * 20px - absolute size in pixels
+     * 0.7 serif
+     * bold italic 1.5 Times New Roman
+     */
+    font?: number | string;
+    /**
+     * Stroke color in any web format, default is undefined (no stroke).
+     */
+    stroke?: string;
+    /**
+     * Stroke width, default is 0.15.
+     */
+    strokeWidth?: number;
+    /**
+     * Background color in any web format, default is undefined (no background).When background is enabled, text vertical align is set to middle (default is baseline).
+     */
+    backgroundColor?: string;
+
+    /**
+     * Background rectangle padding, default is 0.3.
+     */
+    backgroundPadding?: number;
+    align?: "center" | "left" | "right";
+    /**
+     * Opacity value, default is 1.0.
+     */
+    opacity?: number;
+}
+/**
+ * An object representing the room in which your units and structures are in.
+ *
+ * It can be used to look around, find paths, etc.
+ *
+ * Every object in the room contains its linked Room instance in the room property.
+ */
+interface Room {
+    readonly prototype: Room;
+
+    /**
+     * The Controller structure of this room, if present, otherwise undefined.
+     */
+    controller?: StructureController;
+    /**
+     * Total amount of energy available in all spawns and extensions in the room.
+     */
+    energyAvailable: number;
+    /**
+     * Total amount of energyCapacity of all spawns and extensions in the room.
+     */
+    energyCapacityAvailable: number;
+    /**
+     * A shorthand to `Memory.rooms[room.name]`. You can use it for quick access the room’s specific memory data object.
+     */
+    memory: RoomMemory;
+    /**
+     * One of the `MODE_*` constants.
+     */
+    mode: string;
+    /**
+     * The name of the room.
+     */
+    name: string;
+    /**
+     * The Storage structure of this room, if present, otherwise undefined.
+     */
+    storage?: StructureStorage;
+    /**
+     * The Terminal structure of this room, if present, otherwise undefined.
+     */
+    terminal?: StructureTerminal;
+    /**
+     * A RoomVisual object for this room. You can use this object to draw simple shapes (lines, circles, text labels) in the room.
+     */
+    visual: RoomVisual;
+    /**
+     * Create new ConstructionSite at the specified location.
+     * @param x The X position.
+     * @param y The Y position.
+     * @param structureType One of the following constants: STRUCTURE_EXTENSION, STRUCTURE_RAMPART, STRUCTURE_ROAD, STRUCTURE_SPAWN, STRUCTURE_WALL, STRUCTURE_LINK
+     * @returns Result Code: OK, ERR_INVALID_TARGET, ERR_INVALID_ARGS, ERR_RCL_NOT_ENOUGH
+     */
+    createConstructionSite(x: number, y: number, structureType: BuildableStructureConstant): ScreepsReturnCode;
+    /**
+     * Create new ConstructionSite at the specified location.
+     * @param pos Can be a RoomPosition object or any object containing RoomPosition.
+     * @param structureType One of the following constants: STRUCTURE_EXTENSION, STRUCTURE_RAMPART, STRUCTURE_ROAD, STRUCTURE_SPAWN, STRUCTURE_WALL, STRUCTURE_LINK
+     * @returns Result Code: OK, ERR_INVALID_TARGET, ERR_INVALID_ARGS, ERR_RCL_NOT_ENOUGH
+     */
+    createConstructionSite(pos: RoomPosition | _HasRoomPosition, structureType: StructureConstant): ScreepsReturnCode;
+    /**
+     * Create new Flag at the specified location.
+     * @param x The X position.
+     * @param y The Y position.
+     * @param name (optional) The name of a new flag.
+     *
+     * It should be unique, i.e. the Game.flags object should not contain another flag with the same name (hash key).
+     *
+     * If not defined, a random name will be generated.
+     * @param color The color of a new flag. Should be one of the COLOR_* constants. The default value is COLOR_WHITE.
+     * @param secondaryColor The secondary color of a new flag. Should be one of the COLOR_* constants. The default value is equal to color.
+     */
+    createFlag(x: number, y: number, name?: string, color?: ColorConstant, secondaryColor?: ColorConstant): ScreepsReturnCode;
+    /**
+     * Create new Flag at the specified location.
+     * @param pos Can be a RoomPosition object or any object containing RoomPosition.
+     * @param name (optional) The name of a new flag.
+     *
+     * It should be unique, i.e. the Game.flags object should not contain another flag with the same name (hash key).
+     *
+     * If not defined, a random name will be generated.
+     * @param color The color of a new flag. Should be one of the COLOR_* constants. The default value is COLOR_WHITE.
+     * @param secondaryColor The secondary color of a new flag. Should be one of the COLOR_* constants. The default value is equal to color.
+     */
+    createFlag(pos: RoomPosition | { pos: RoomPosition }, name?: string, color?: ColorConstant, secondaryColor?: ColorConstant): ScreepsReturnCode;
+    /**
+     * Find all objects of the specified type in the room.
+     * @param type One of the following constants:
+     *  * FIND_CREEPS
+     *  * FIND_MY_CREEPS
+     *  * FIND_HOSTILE_CREEPS
+     *  * FIND_MY_SPAWNS
+     *  * FIND_HOSTILE_SPAWNS
+     *  * FIND_SOURCES
+     *  * FIND_SOURCES_ACTIVE
+     *  * FIND_DROPPED_RESOURCES
+     *  * FIND_DROPPED_ENERGY
+     *  * FIND_STRUCTURES
+     *  * FIND_MY_STRUCTURES
+     *  * FIND_HOSTILE_STRUCTURES
+     *  * FIND_FLAGS
+     *  * FIND_CONSTRUCTION_SITES
+     *  * FIND_EXIT_TOP
+     *  * FIND_EXIT_RIGHT
+     *  * FIND_EXIT_BOTTOM
+     *  * FIND_EXIT_LEFT
+     *  * FIND_EXIT
+     * @param opts An object with additional options
+     * @returns An array with the objects found.
+     */
+    find<K extends FindConstant>(type: K, opts?: FilterOptions<K>): Array<FindTypes[K]>;
+    find<T extends Structure>(type: FIND_STRUCTURES | FIND_MY_STRUCTURES | FIND_HOSTILE_STRUCTURES, opts?: FilterOptions<FIND_STRUCTURES>): T[];
+    /**
+     * Find the exit direction en route to another room.
+     * @param room Another room name or room object.
+     * @returns The room direction constant, one of the following: FIND_EXIT_TOP, FIND_EXIT_RIGHT, FIND_EXIT_BOTTOM, FIND_EXIT_LEFT
+     * Or one of the following error codes: ERR_NO_PATH, ERR_INVALID_ARGS
+     */
+    findExitTo(room: string | Room): ScreepsReturnCode | FIND_EXIT_TOP | FIND_EXIT_RIGHT | FIND_EXIT_BOTTOM | FIND_EXIT_LEFT;
+    /**
+     * Find an optimal path inside the room between fromPos and toPos using A* search algorithm.
+     * @param fromPos The start position.
+     * @param toPos The end position.
+     * @param opts (optional) An object containing additonal pathfinding flags
+     * @returns An array with path steps
+     */
+    findPath(fromPos: RoomPosition, toPos: RoomPosition, opts?: FindPathOpts): PathStep[];
+    /**
+     * Creates a RoomPosition object at the specified location.
+     * @param x The X position.
+     * @param y The Y position.
+     * @returns A RoomPosition object or null if it cannot be obtained.
+     */
+    getPositionAt(x: number, y: number): RoomPosition | null;
+    /**
+     * Get the list of objects at the specified room position.
+     * @param x The X position.
+     * @param y The Y position.
+     * @returns An array with objects at the specified position
+     */
+    lookAt(x: number, y: number): LookAtResult[];
+    /**
+     * Get the list of objects at the specified room position.
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     * @returns An array with objects at the specified position
+     */
+    lookAt(target: RoomPosition | { pos: RoomPosition }): LookAtResult[];
+    /**
+     * Get the list of objects at the specified room area. This method is more CPU efficient in comparison to multiple lookAt calls.
+     * @param top The top Y boundary of the area.
+     * @param left The left X boundary of the area.
+     * @param bottom The bottom Y boundary of the area.
+     * @param right The right X boundary of the area.
+     * @param asArray Set to true if you want to get the result as a plain array.
+     * @returns An object with all the objects in the specified area
+     */
+    lookAtArea(top: number, left: number, bottom: number, right: number, asArray?: boolean): LookAtResultMatrix | LookAtResultWithPos[];
+    /**
+     * Get the objects at the given position.
+     * @param type One of the LOOK_* constants.
+     * @param x The X position.
+     * @param y The Y position.
+     * @returns An array of Creep at the given position.
+     */
+    lookForAt<T extends keyof LookAtTypes>(type: T, x: number, y: number): Array<LookAtTypes[T]>;
+    /**
+     * Get the objects at the given RoomPosition.
+     * @param type One of the LOOK_* constants.
+     * @param target Can be a RoomPosition object or any object containing RoomPosition.
+     * @returns An array of Creeps at the specified position if found.
+     */
+    lookForAt<T extends keyof LookAtTypes>(type: T, target: RoomPosition | _HasRoomPosition): Array<LookAtTypes[T]>;
+    /**
+     * Get the given objets in the supplied area.
+     * @param type One of the LOOK_* constants
+     * @param top The top (Y) boundry of the area.
+     * @param left The left (X) boundry of the area.
+     * @param bottom The bottom (Y) boundry of the area.
+     * @param right The right(X) boundry of the area.
+     * @param asArray Flatten the results into an array?
+     * @returns An object with the sstructure object[X coord][y coord] as an array of found objects.
+     */
+    lookForAtArea<T extends keyof LookAtTypes>(
+      type: T,
+      top: number,
+      left: number,
+      bottom: number,
+      right: number,
+      asArray?: false
+    ): LookForAtAreaResultMatrix<LookAtTypes[T], T>;
+    /**
+     * Get the given objets in the supplied area.
+     * @param type One of the LOOK_* constants
+     * @param top The top (Y) boundry of the area.
+     * @param left The left (X) boundry of the area.
+     * @param bottom The bottom (Y) boundry of the area.
+     * @param right The right(X) boundry of the area.
+     * @param asArray Flatten the results into an array?
+     * @returns An array of found objects with an x & y property for their position
+     */
+    lookForAtArea<T extends keyof LookAtTypes>(
+      type: T,
+      top: number,
+      left: number,
+      bottom: number,
+      right: number,
+      asArray: true
+    ): LookForAtAreaResultArray<LookAtTypes[T], T>;
+
+    /**
+     * Serialize a path array into a short string representation, which is suitable to store in memory.
+     * @param path A path array retrieved from Room.findPath.
+     * @returns A serialized string form of the given path.
+     */
+
+    /**
+     * Deserialize a short string path representation into an array form.
+     * @param path A serialized path string.
+     * @returns A path array.
+     */
+}
+
+interface RoomConstructor {
+    new (id: string): Room;
+    /**
+     * Serialize a path array into a short string representation, which is suitable to store in memory.
+     * @param path A path array retrieved from `Room.findPath`.
+     * @returns A serialized string form of the given path.
+     */
+    serializePath(path: PathStep[]): string;
+    /**
+     * Deserialize a short string path representation into an array form.
+     * @param path A serialized path string.
+     * @returns A path array.
+     */
+    deserializePath(path: string): PathStep[];
+}
+
+declare const Room: RoomConstructor;
+/**
+ * An energy source object. Can be harvested by creeps with a WORK body part.
+ */
+interface Source extends RoomObject {
+    /**
+     * The prototype is stored in the Source.prototype global object. You can use it to extend game objects behaviour globally:
+     */
+    readonly prototype: Source;
+    /**
+     * The remaining amount of energy.
+     */
+    energy: number;
+    /**
+     * The total amount of energy in the source. Equals to 3000 in most cases.
+     */
+    energyCapacity: number;
+    /**
+     * A unique object identifier. You can use Game.getObjectById method to retrieve an object instance by its id.
+     */
+    id: string;
+    /**
+     * If you can get an instance of Source, you can see it.
+     * If you can see a Source, you can see the room it's in.
+     */
+    room: Room;
+    /**
+     * The remaining time after which the source will be refilled.
+     */
+    ticksToRegeneration: number;
+}
+
+interface SourceConstructor extends _Constructor<Source>, _ConstructorById<Source> {
+}
+
+declare const Source: SourceConstructor;
+/**
+ * Spawns are your colony centers. This structure can create, renew, and recycle
+ * creeps. All your spawns are accessible through `Game.spawns` hash list.
+ * Spawns auto-regenerate a little amount of energy each tick, so that you can
+ * easily recover even if all your creeps died.
+ */
+interface StructureSpawn extends OwnedStructure<STRUCTURE_SPAWN> {
+    readonly prototype: StructureSpawn;
+    /**
+     * The amount of energy containing in the spawn.
+     */
+    energy: number;
+    /**
+     * The total amount of energy the spawn can contain
+     */
+    energyCapacity: number;
+    /**
+     * A shorthand to `Memory.spawns[spawn.name]`. You can use it for quick access
+     * the spawn’s specific memory data object.
+     *
+     * @see http://docs.screeps.com/global-objects.html#Memory-object
+     */
+    memory: SpawnMemory;
+    /**
+     * Spawn's name. You choose the name upon creating a new spawn, and it cannot
+     * be changed later. This name is a hash key to access the spawn via the
+     * `Game.spawns` object.
+     */
+    name: string;
+    /**
+     * If the spawn is in process of spawning a new creep, this object will contain the new creep’s information, or null otherwise.
+     * @param name The name of a new creep.
+     * @param needTime Time needed in total to complete the spawning.
+     * @param remainingTime Remaining time to go.
+     */
+    spawning: { name: string, needTime: number, remainingTime: number };
+
+    /**
+     * Check if a creep can be created.
+     *
+     * @deprecated This method is deprecated and will be removed soon. Please use `StructureSpawn.spawnCreep` with `dryRun` flag instead.
+     * @param body An array describing the new creep’s body. Should contain 1 to 50 elements with one of these constants: WORK, MOVE, CARRY, ATTACK, RANGED_ATTACK, HEAL, TOUGH, CLAIM
+     * @param name The name of a new creep.
+     *
+     * It should be unique creep name, i.e. the Game.creeps object should not contain another creep with the same name (hash key).
+     *
+     * If not defined, a random name will be generated.
+     */
+    canCreateCreep(body: BodyPartConstant[], name?: string): ScreepsReturnCode;
+    /**
+     * Start the creep spawning process.
+     *
+     * @deprecated This method is deprecated and will be removed soon. Please use `StructureSpawn.spawnCreep` instead.
+     * @param body An array describing the new creep’s body. Should contain 1 to 50 elements with one of these constants: WORK, MOVE, CARRY, ATTACK, RANGED_ATTACK, HEAL, TOUGH, CLAIM
+     * @param name The name of a new creep.
+     *
+     * It should be unique creep name, i.e. the Game.creeps object should not contain another creep with the same name (hash key).
+     *
+     * If not defined, a random name will be generated.
+     * @param memory The memory of a new creep. If provided, it will be immediately stored into Memory.creeps[name].
+     * @returns The name of a new creep or one of these error codes:
+     * ```
+     * ERR_NOT_OWNER            -1  You are not the owner of this spawn.
+     * ERR_NAME_EXISTS          -3  There is a creep with the same name already.
+     * ERR_BUSY                 -4  The spawn is already in process of spawning another creep.
+     * ERR_NOT_ENOUGH_ENERGY    -6  The spawn and its extensions contain not enough energy to create a creep with the given body.
+     * ERR_INVALID_ARGS         -10 Body is not properly described.
+     * ERR_RCL_NOT_ENOUGH       -14 Your Room Controller level is not enough to use this spawn.
+     * ```
+     */
+    createCreep(body: BodyPartConstant[], name?: string, memory?: CreepMemory): ScreepsReturnCode | string;
+
+    /**
+     * Start the creep spawning process. The required energy amount can be withdrawn from all spawns and extensions in the room.
+     *
+     * @param {BodyPartConstant[]} body An array describing the new creep’s body. Should contain 1 to 50 elements with one of these constants:
+     *  * WORK
+     *  * MOVE
+     *  * CARRY
+     *  * ATTACK
+     *  * RANGED_ATTACK
+     *  * HEAL
+     *  * TOUGH
+     *  * CLAIM
+     * @param {string} name The name of a new creep. It must be a unique creep name, i.e. the Game.creeps object should not contain another creep with the same name (hash key).
+     * @param {{memory?: CreepMemory; energyStructures?: (StructureSpawn | StructureExtension)[]; dryRun?: boolean}} opts An object with additional options for the spawning process.
+     * @returns {ScreepsReturnCode} One of the following codes:
+     * ```
+     * OK                       0   The operation has been scheduled successfully.
+     * ERR_NOT_OWNER            -1  You are not the owner of this spawn.
+     * ERR_NAME_EXISTS          -3  There is a creep with the same name already.
+     * ERR_BUSY                 -4  The spawn is already in process of spawning another creep.
+     * ERR_NOT_ENOUGH_ENERGY    -6  The spawn and its extensions contain not enough energy to create a creep with the given body.
+     * ERR_INVALID_ARGS         -10 Body is not properly described or name was not provided.
+     * ERR_RCL_NOT_ENOUGH       -14 Your Room Controller level is insufficient to use this spawn.
+     * ```
+     */
+    spawnCreep(body: BodyPartConstant[], name: string, opts?: { memory?: CreepMemory, energyStructures?: Array<(StructureSpawn | StructureExtension)>, dryRun?: boolean }): ScreepsReturnCode;
+
+    /**
+     * Destroy this spawn immediately.
+     */
+    destroy(): ScreepsReturnCode;
+    /**
+     * Check whether this structure can be used. If the room controller level is not enough, then this method will return false, and the structure will be highlighted with red in the game.
+     */
+    isActive(): boolean;
+    /**
+     * Toggle auto notification when the spawn is under attack. The notification will be sent to your account email. Turned on by default.
+     * @param enabled Whether to enable notification or disable.
+     */
+    notifyWhenAttacked(enabled: boolean): ScreepsReturnCode;
+    /**
+     * Increase the remaining time to live of the target creep.
+     *
+     * The target should be at adjacent square.
+     *
+     * The spawn should not be busy with the spawning process.
+     *
+     * Each execution increases the creep's timer by amount of ticks according to this formula: floor(500/body_size).
+     *
+     * Energy required for each execution is determined using this formula: ceil(creep_cost/3/body_size).
+     * @param target The target creep object.
+     */
+    renewCreep(target: Creep): ScreepsReturnCode;
+    /**
+     * Kill the creep and drop up to 100% of resources spent on its spawning and boosting depending on remaining life time. The target should be at adjacent square.
+     * @param target The target creep object.
+     */
+    recycleCreep(target: Creep): ScreepsReturnCode;
+}
+
+interface StructureSpawnConstructor extends _Constructor<StructureSpawn>, _ConstructorById<StructureSpawn> {
+}
+
+declare const StructureSpawn: StructureSpawnConstructor;
+declare const Spawn: StructureSpawnConstructor; // legacy alias
+// declare type Spawn = StructureSpawn;
+/**
+ * Parent object for structure classes
+ */
+interface Structure<T extends StructureConstant = StructureConstant> extends RoomObject {
+    readonly prototype: Structure;
+
+    /**
+     * The current amount of hit points of the structure.
+     */
+    hits: number;
+    /**
+     * The total amount of hit points of the structure.
+     */
+    hitsMax: number;
+    /**
+     * A unique object identifier. You can use Game.getObjectById method to retrieve an object instance by its id.
+     */
+    id: string;
+    /**
+     * If you can get an instance of a Structure, you can see it.
+     * If you can see the Structure, you can see the room it's in.
+     */
+    room: Room;
+    /**
+     * One of the STRUCTURE_* constants.
+     */
+    structureType: T;
+    /**
+     * Destroy this structure immediately.
+     */
+    destroy(): ScreepsReturnCode;
+    /**
+     * Check whether this structure can be used. If the room controller level is not enough, then this method will return false, and the structure will be highlighted with red in the game.
+     */
+    isActive(): boolean;
+    /**
+     * Toggle auto notification when the structure is under attack. The notification will be sent to your account email. Turned on by default.
+     * @param enabled Whether to enable notification or disable.
+     */
+    notifyWhenAttacked(enabled: boolean): ScreepsReturnCode;
+}
+
+interface StructureConstructor extends _Constructor<Structure>, _ConstructorById<Structure> {
+}
+
+declare const Structure: StructureConstructor;
+
+/**
+ * The base prototype for a structure that has an owner. Such structures can be
+ * found using `FIND_MY_STRUCTURES` and `FIND_HOSTILE_STRUCTURES` constants.
+ */
+interface OwnedStructure<T extends StructureConstant = StructureConstant> extends Structure<T> {
+    readonly prototype: OwnedStructure;
+
+    /**
+     * Whether this is your own structure. Walls and roads don't have this property as they are considered neutral structures.
+     */
+    my: boolean;
+    /**
+     * An object with the structure’s owner info (if present) containing the following properties: username
+     */
+    owner: Owner;
+    /**
+     * The link to the Room object. Is always present because owned structures give visibility.
+     */
+    room: Room;
+}
+
+interface OwnedStructureConstructor extends _Constructor<OwnedStructure>, _ConstructorById<OwnedStructure> {
+}
+
+declare const OwnedStructure: OwnedStructureConstructor;
+
+/**
+ * Claim this structure to take control over the room. The controller structure
+ * cannot be damaged or destroyed. It can be addressed by `Room.controller`
+ * property.
+ */
+interface StructureController extends OwnedStructure<STRUCTURE_CONTROLLER> {
+    readonly prototype: StructureController;
+
+    /**
+     * Current controller level, from 0 to 8.
+     */
+    level: number;
+    /**
+     * The current progress of upgrading the controller to the next level.
+     */
+    progress: number;
+    /**
+     * The progress needed to reach the next level.
+     */
+    progressTotal: number;
+    /**
+     * An object with the controller reservation info if present: username, ticksToEnd
+     */
+    reservation: ReservationDefinition | undefined;
+    /**
+     * How many ticks of safe mode are remaining, or undefined.
+     */
+    safeMode?: number;
+    /**
+     * Safe mode activations available to use.
+     */
+    safeModeAvailable: number;
+    /**
+     * During this period in ticks new safe mode activations will be blocked, undefined if cooldown is inactive.
+     */
+    safeModeCooldown?: number;
+    /**
+     * An object with the controller sign info if present
+     */
+    sign: SignDefinition | undefined;
+    /**
+     * The amount of game ticks when this controller will lose one level. This timer can be reset by using Creep.upgradeController.
+     */
+    ticksToDowngrade: number;
+    /**
+     * The amount of game ticks while this controller cannot be upgraded due to attack.
+     */
+    upgradeBlocked: number;
+    /**
+     * Activate safe mode if available.
+     * @returns Result Code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_NOT_ENOUGH_RESOURCES, ERR_TIRED
+     */
+    activateSafeMode(): ScreepsReturnCode;
+    /**
+     * Make your claimed controller neutral again.
+     */
+    unclaim(): ScreepsReturnCode;
+}
+
+interface StructureControllerConstructor extends _Constructor<StructureController>, _ConstructorById<StructureController> {
+}
+
+declare const StructureController: StructureControllerConstructor;
+
+/**
+ * Contains energy which can be spent on spawning bigger creeps. Extensions can
+ * be placed anywhere in the room, any spawns will be able to use them regardless
+ * of distance.
+ */
+interface StructureExtension extends OwnedStructure<STRUCTURE_EXTENSION> {
+    readonly prototype: StructureExtension;
+
+    /**
+     * The amount of energy containing in the extension.
+     */
+    energy: number;
+    /**
+     * The total amount of energy the extension can contain.
+     */
+    energyCapacity: number;
+}
+
+interface StructureExtensionConstructor extends _Constructor<StructureExtension>, _ConstructorById<StructureExtension> {
+}
+
+declare const StructureExtension: StructureExtensionConstructor;
+
+/**
+ * Remotely transfers energy to another Link in the same room.
+ */
+interface StructureLink extends OwnedStructure<STRUCTURE_LINK> {
+    readonly prototype: StructureLink;
+
+    /**
+     * The amount of game ticks the link has to wait until the next transfer is possible.
+     */
+    cooldown: number;
+    /**
+     * The amount of energy containing in the link.
+     */
+    energy: number;
+    /**
+     * The total amount of energy the link can contain.
+     */
+    energyCapacity: number;
+    /**
+     * Transfer energy from the link to another link or a creep.
+     *
+     * If the target is a creep, it has to be at adjacent square to the link.
+     *
+     * If the target is a link, it can be at any location in the same room.
+     *
+     * Remote transfer process implies 3% energy loss and cooldown delay depending on the distance.
+     * @param target The target object.
+     * @param amount The amount of energy to be transferred. If omitted, all the available energy is used.
+     */
+    transferEnergy(target: Creep | StructureLink, amount?: number): ScreepsReturnCode;
+}
+
+interface StructureLinkConstructor extends _Constructor<StructureLink>, _ConstructorById<StructureLink> {
+}
+
+declare const StructureLink: StructureLinkConstructor;
+
+/**
+ * Non-player structure. Spawns NPC Source Keepers that guards energy sources
+ * and minerals in some rooms. This structure cannot be destroyed.
+ */
+interface StructureKeeperLair extends OwnedStructure<STRUCTURE_KEEPER_LAIR> {
+    readonly prototype: StructureKeeperLair;
+
+    /**
+     * Time to spawning of the next Source Keeper.
+     */
+    ticksToSpawn?: number;
+}
+
+interface StructureKeeperLairConstructor extends _Constructor<StructureKeeperLair>, _ConstructorById<StructureKeeperLair> {
+}
+
+declare const StructureKeeperLair: StructureKeeperLairConstructor;
+
+/**
+ * Provides visibility into a distant room from your script.
+ */
+interface StructureObserver extends OwnedStructure<STRUCTURE_OBSERVER> {
+    readonly prototype: StructureObserver;
+
+    /**
+     * Provide visibility into a distant room from your script. The target room object will be available on the next tick. The maximum range is 5 rooms.
+     * @param roomName
+     */
+    observeRoom(roomName: string): ScreepsReturnCode;
+}
+
+interface StructureObserverConstructor extends _Constructor<StructureObserver>, _ConstructorById<StructureObserver> {
+}
+
+declare const StructureObserver: StructureObserverConstructor;
+
+/**
+ * Non-player structure. Contains power resource which can be obtained by destroying the structure. Hits the attacker creep back on each attack.
+ */
+interface StructurePowerBank extends OwnedStructure<STRUCTURE_POWER_BANK> {
+    readonly prototype: StructurePowerBank;
+
+    /**
+     * The amount of power containing.
+     */
+    power: number;
+    /**
+     * The amount of game ticks when this structure will disappear.
+     */
+    ticksToDecay: number;
+}
+
+interface StructurePowerBankConstructor extends _Constructor<StructurePowerBank>, _ConstructorById<StructurePowerBank> {
+}
+
+declare const StructurePowerBank: StructurePowerBankConstructor;
+
+/**
+ * Non-player structure. Contains power resource which can be obtained by
+ * destroying the structure. Hits the attacker creep back on each attack.
+ */
+interface StructurePowerSpawn extends OwnedStructure<STRUCTURE_POWER_SPAWN> {
+    readonly prototype: StructurePowerSpawn;
+    /**
+     * The amount of energy containing in this structure.
+     */
+    energy: number;
+    /**
+     * The total amount of energy this structure can contain.
+     */
+    energyCapacity: number;
+    /**
+     * The amount of power containing in this structure.
+     */
+    power: number;
+    /**
+     * The total amount of power this structure can contain.
+     */
+    powerCapacity: number;
+
+    /**
+     * Create a power creep. Currently in development
+     * @param name The name of the power creep.
+     */
+    createPowerCreep(name: string): ScreepsReturnCode;
+    /**
+     * Register power resource units into your account. Registered power allows to develop power creeps skills. Consumes 1 power resource unit and 50 energy resource units.
+     */
+    processPower(): ScreepsReturnCode;
+}
+
+interface StructurePowerSpawnConstructor extends _Constructor<StructurePowerSpawn>, _ConstructorById<StructurePowerSpawn> {
+}
+
+declare const StructurePowerSpawn: StructurePowerSpawnConstructor;
+
+/**
+ * Blocks movement of hostile creeps, and defends your creeps and structures on
+ * the same tile. Can be used as a controllable gate.
+ */
+interface StructureRampart extends OwnedStructure<STRUCTURE_RAMPART> {
+    readonly prototype: StructureRampart;
+
+    /**
+     * The amount of game ticks when this rampart will lose some hit points.
+     */
+    ticksToDecay: number;
+
+    /**
+     * If false (default), only your creeps can step on the same square. If true, any hostile creeps can pass through.
+     */
+    isPublic: boolean;
+
+    /**
+     * Make this rampart public to allow other players' creeps to pass through.
+     * @param isPublic Whether this rampart should be public or non-public
+     */
+    setPublic(isPublic: boolean): undefined;
+}
+
+interface StructureRampartConstructor extends _Constructor<StructureRampart>, _ConstructorById<StructureRampart> {
+}
+
+declare const StructureRampart: StructureRampartConstructor;
+
+/**
+ * Decreases movement cost to 1. Using roads allows creating creeps with less
+ * `MOVE` body parts.
+ */
+interface StructureRoad extends Structure<STRUCTURE_ROAD> {
+    readonly prototype: StructureRoad;
+
+    /**
+     * The amount of game ticks when this road will lose some hit points.
+     */
+    ticksToDecay: number;
+}
+
+interface StructureRoadConstructor extends _Constructor<StructureRoad>, _ConstructorById<StructureRoad> {
+}
+
+declare const StructureRoad: StructureRoadConstructor;
+
+/**
+ * A structure that can store huge amount of resource units. Only one structure
+ * per room is allowed that can be addressed by `Room.storage` property.
+ */
+interface StructureStorage extends OwnedStructure<STRUCTURE_STORAGE> {
+    readonly prototype: StructureStorage;
+
+    /**
+     * An object with the storage contents.
+     */
+    store: StoreDefinition;
+    /**
+     * The total amount of resources the storage can contain.
+     */
+    storeCapacity: number;
+}
+
+interface StructureStorageConstructor extends _Constructor<StructureStorage>, _ConstructorById<StructureStorage> {
+}
+
+declare const StructureStorage: StructureStorageConstructor;
+
+/**
+ * Remotely attacks or heals creeps, or repairs structures. Can be targeted to
+ * any object in the room. However, its effectiveness highly depends on the
+ * distance. Each action consumes energy.
+ */
+interface StructureTower extends OwnedStructure<STRUCTURE_TOWER> {
+    readonly prototype: StructureTower;
+
+    /**
+     * The amount of energy containing in this structure.
+     */
+    energy: number;
+    /**
+     * The total amount of energy this structure can contain.
+     */
+    energyCapacity: number;
+
+    /**
+     * Remotely attack any creep in the room. Consumes 10 energy units per tick. Attack power depends on the distance to the target: from 600 hits at range 10 to 300 hits at range 40.
+     * @param target The target creep.
+     */
+    attack(target: Creep): ScreepsReturnCode;
+    /**
+     * Remotely heal any creep in the room. Consumes 10 energy units per tick. Heal power depends on the distance to the target: from 400 hits at range 10 to 200 hits at range 40.
+     * @param target The target creep.
+     */
+    heal(target: Creep): ScreepsReturnCode;
+    /**
+     * Remotely repair any structure in the room. Consumes 10 energy units per tick. Repair power depends on the distance to the target: from 600 hits at range 10 to 300 hits at range 40.
+     * @param target The target structure.
+     */
+    repair(target: Structure): ScreepsReturnCode;
+}
+
+interface StructureTowerConstructor extends _Constructor<StructureTower>, _ConstructorById<StructureTower> {
+}
+
+declare const StructureTower: StructureTowerConstructor;
+
+/**
+ * Blocks movement of all creeps.
+ */
+interface StructureWall extends Structure<STRUCTURE_WALL> {
+    readonly prototype: StructureWall;
+    /**
+     * The amount of game ticks when the wall will disappear (only for automatically placed border walls at the start of the game).
+     */
+    ticksToLive: number;
+}
+
+interface StructureWallConstructor extends _Constructor<StructureWall>, _ConstructorById<StructureWall> {
+}
+
+declare const StructureWall: StructureWallConstructor;
+
+/**
+ * Allows to harvest mineral deposits.
+ */
+interface StructureExtractor extends OwnedStructure<STRUCTURE_EXTRACTOR> {
+    readonly prototype: StructureExtractor;
+    /**
+     * The amount of game ticks until the next harvest action is possible.
+     */
+    cooldown: number;
+}
+
+interface StructureExtractorConstructor extends _Constructor<StructureExtractor>, _ConstructorById<StructureExtractor> {
+}
+
+declare const StructureExtractor: StructureExtractorConstructor;
+
+/**
+ * Produces mineral compounds from base minerals and boosts creeps.
+ */
+interface StructureLab extends OwnedStructure<STRUCTURE_LAB> {
+    readonly prototype: StructureLab;
+    /**
+     * The amount of game ticks the lab has to wait until the next reaction is possible.
+     */
+    cooldown: number;
+    /**
+     * The amount of energy containing in the lab. Energy is used for boosting creeps.
+     */
+    energy: number;
+    /**
+     * The total amount of energy the lab can contain.
+     */
+    energyCapacity: number;
+    /**
+     * The amount of mineral resources containing in the lab.
+     */
+    mineralAmount: number;
+    /**
+     * The type of minerals containing in the lab. Labs can contain only one mineral type at the same time.
+     */
+    mineralType: MineralConstant;
+    /**
+     * The total amount of minerals the lab can contain.
+     */
+    mineralCapacity: number;
+    /**
+     * Boosts creep body part using the containing mineral compound. The creep has to be at adjacent square to the lab. Boosting one body part consumes 30 mineral units and 20 energy units.
+     * @param creep The target creep.
+     * @param bodyPartsCount The number of body parts of the corresponding type to be boosted.
+     *
+     * Body parts are always counted left-to-right for TOUGH, and right-to-left for other types.
+     *
+     * If undefined, all the eligible body parts are boosted.
+     */
+    boostCreep(creep: Creep, bodyPartsCount?: number): ScreepsReturnCode;
+    /**
+     * Produce mineral compounds using reagents from two another labs. Each lab has to be within 2 squares range. The same input labs can be used by many output labs
+     * @param lab1 The first source lab.
+     * @param lab2 The second source lab.
+     */
+    runReaction(lab1: StructureLab, lab2: StructureLab): ScreepsReturnCode;
+}
+
+interface StructureLabConstructor extends _Constructor<StructureLab>, _ConstructorById<StructureLab> {
+}
+
+declare const StructureLab: StructureLabConstructor;
+
+/**
+ * Sends any resources to a Terminal in another room.
+ */
+interface StructureTerminal extends OwnedStructure<STRUCTURE_TERMINAL> {
+    readonly prototype: StructureTerminal;
+    /**
+     * The remaining amount of ticks while this terminal cannot be used to make StructureTerminal.send or Game.market.deal calls.
+     */
+    cooldown: number;
+    /**
+     * An object with the storage contents. Each object key is one of the RESOURCE_* constants, values are resources amounts.
+     */
+    store: StoreDefinition;
+    /**
+     * The total amount of resources the storage can contain.
+     */
+    storeCapacity: number;
+    /**
+     * Sends resource to a Terminal in another room with the specified name.
+     * @param resourceType One of the RESOURCE_* constants.
+     * @param amount The amount of resources to be sent. The minimum amount is 100.
+     * @param destination The name of the target room. You don't have to gain visibility in this room.
+     * @param description The description of the transaction. It is visible to the recipient. The maximum length is 100 characters.
+     */
+    send(resourceType: ResourceConstant, amount: number, destination: string, description?: string): ScreepsReturnCode;
+}
+
+interface StructureTerminalConstructor extends _Constructor<StructureTerminal>, _ConstructorById<StructureTerminal> {
+}
+
+declare const StructureTerminal: StructureTerminalConstructor;
+
+/**
+ * Contains up to 2,000 resource units. Can be constructed in neutral rooms. Decays for 5,000 hits per 100 ticks.
+ */
+interface StructureContainer extends Structure<STRUCTURE_CONTAINER> {
+    readonly prototype: StructureContainer;
+    /**
+     * An object with the structure contents. Each object key is one of the RESOURCE_* constants, values are resources
+     * amounts. Use _.sum(structure.store) to get the total amount of contents
+     */
+    store: StoreDefinition;
+    /**
+     * The total amount of resources the structure can contain.
+     */
+    storeCapacity: number;
+    /**
+     * The amount of game ticks when this container will lose some hit points.
+     */
+    ticksToDecay: number;
+}
+
+interface StructureContainerConstructor extends _Constructor<StructureContainer>, _ConstructorById<StructureContainer> {
+}
+
+declare const StructureContainer: StructureContainerConstructor;
+
+/**
+ * Launches a nuke to another room dealing huge damage to the landing area.
+ * Each launch has a cooldown and requires energy and ghodium resources. Launching
+ * creates a Nuke object at the target room position which is visible to any player
+ * until it is landed. Incoming nuke cannot be moved or cancelled. Nukes cannot
+ * be launched from or to novice rooms.
+ */
+interface StructureNuker extends OwnedStructure<STRUCTURE_NUKER> {
+    readonly prototype: StructureNuker;
+    /**
+     * The amount of energy contained in this structure.
+     */
+    energy: number;
+    /**
+     * The total amount of energy this structure can contain.
+     */
+    energyCapacity: number;
+    /**
+     * The amount of energy contained in this structure.
+     */
+    ghodium: number;
+    /**
+     * The total amount of energy this structure can contain.
+     */
+    ghodiumCapacity: number;
+    /**
+     * The amount of game ticks the link has to wait until the next transfer is possible.
+     */
+    cooldown: number;
+    /**
+     * Launch a nuke to the specified position.
+     * @param pos The target room position.
+     */
+    launchNuke(pos: RoomPosition): ScreepsReturnCode;
+}
+
+interface StructureNukerConstructor extends _Constructor<StructureNuker>, _ConstructorById<StructureNuker> {
+}
+
+declare const StructureNuker: StructureNukerConstructor;
+
+/**
+ * A non-player structure.
+ * Instantly teleports your creeps to a distant room acting as a room exit tile.
+ * Portals appear randomly in the central room of each sector.
+ */
+interface StructurePortal extends Structure<STRUCTURE_PORTAL> {
+    readonly prototype: StructurePortal;
+    /**
+     * The position object in the destination room.
+     */
+    destination: RoomPosition;
+    /**
+     * The amount of game ticks when the portal disappears, or undefined when the portal is stable.
+     */
+    ticksToDecay: number;
+}
+
+interface StructurePortalConstructor extends _Constructor<StructurePortal>, _ConstructorById<StructurePortal> {
+}
+
+declare const StructurePortal: StructurePortalConstructor;
+
+/**
+ * A discriminated union on Structure.type of all owned structure types
+ */
+type AnyOwnedStructure =
+    StructureController |
+    StructureExtension |
+    StructureExtractor |
+    StructureKeeperLair |
+    StructureLab |
+    StructureLink |
+    StructureNuker |
+    StructureObserver |
+    StructurePowerSpawn |
+    StructureRampart |
+    StructureSpawn |
+    StructureStorage |
+    StructureTerminal |
+    StructureTower;
+
+/**
+ * A discriminated union on Structure.type of all structure types
+ */
+type AnyStructure =
+    AnyOwnedStructure |
+    StructureContainer |
+    StructurePortal |
+    StructurePowerBank |
+    StructureRoad |
+    StructureWall;
diff --git a/types/screeps/screeps-tests.ts b/types/screeps/screeps-tests.ts
new file mode 100644
index 0000000000..5b518c8336
--- /dev/null
+++ b/types/screeps/screeps-tests.ts
@@ -0,0 +1,511 @@
+// This file exists solely to test whether or not the typings actually work.
+// After working on your changes, make sure to run `npm run compile` to build
+// the declarations before opening this file.
+//
+// If you open this file and see no red squiggly lines, then you're good!
+// Feel free to add more test cases in the form of a sample code.
+
+// TODO: add more test cases.
+
+// Sample inputs
+
+const creep: Creep = Game.creeps.sampleCreep;
+const room: Room = Game.rooms.W10S10;
+const flag: Flag = Game.flags.Flag1;
+const spawn: StructureSpawn = Game.spawns.Spawn1;
+const body: BodyPartConstant[] = [WORK, WORK, CARRY, MOVE];
+
+// Sample inputs for Game.map.findRoute testing
+const anotherRoomName: Room = Game.rooms.W10S11;
+
+// Sample memory extensions
+interface CreepMemory {
+    sourceId: string;
+    lastHits: number;
+}
+
+// Game.creeps
+
+{
+    for (const i in Game.creeps) {
+        Game.creeps[i].moveTo(flag);
+    }
+}
+
+// Game.flags
+
+{
+    creep.moveTo(Game.flags.Flag1);
+}
+
+// Game.spawns
+
+{
+    for (const i in Game.spawns) {
+        Game.spawns[i].createCreep(body);
+    }
+}
+
+// Game.time
+
+{
+    let time = Game.time;
+    time += 1;
+}
+
+// Game.cpu.getUsed()
+
+{
+    if (Game.cpu.getUsed() > Game.cpu.tickLimit / 2) {
+        // Half CPU Usged
+    }
+}
+
+{
+    for (const name in Game.creeps) {
+        const startCpu = Game.cpu.getUsed();
+
+        // creep logic goes here
+
+        const elapsed = Game.cpu.getUsed() - startCpu;
+    }
+}
+
+// Game.cpu.setShardLimits()
+
+{
+    Game.cpu.setShardLimits({ shard0: 20, shard1: 10 });
+}
+
+// Game.getObjectById(id)
+
+{
+    creep.memory.sourceId = creep.pos.findClosestByRange(FIND_SOURCES).id;
+    const source = Game.getObjectById<Source>(creep.memory.sourceId);
+}
+
+// Game.notify(message, [groupInterval])
+
+{
+    if (creep.hits < creep.memory.lastHits) {
+        Game.notify(`Creep ${creep} has been attacked at ${creep.pos}!`);
+    }
+    creep.memory.lastHits = creep.hits;
+}
+
+{
+    if (Game.spawns["Spawn1"].energy === 0) {
+        Game.notify(
+            "Spawn1 is out of energy",
+            180  // group these notifications for 3 hours
+        );
+    }
+}
+
+// Game.map.describeExits()
+
+{
+    const exits = Game.map.describeExits("W8N3");
+}
+
+// Game.map.findExit()
+
+{
+    if (creep.room !== anotherRoomName) {
+        const exitDir = Game.map.findExit(creep.room, anotherRoomName);
+        const exit = creep.pos.findClosestByRange(exitDir as FindConstant);
+        creep.moveTo(exit);
+    } else {
+        // go to some place in another room
+    }
+}
+
+{
+    creep.moveTo(new RoomPosition(25, 25, anotherRoomName.name));
+}
+
+// Game.map.findRoute()
+
+{
+    const route = Game.map.findRoute(creep.room, anotherRoomName);
+
+    if (route !== ERR_NO_PATH && route.length > 0) {
+        const exit = creep.pos.findClosestByRange(route[0].exit);
+        creep.moveTo(exit);
+    }
+}
+
+{
+    const route = Game.map.findRoute(creep.room, anotherRoomName, {
+        routeCallback(roomName, fromRoomName) {
+            if (roomName === "W10S10") {
+                // avoid this room
+                return Infinity;
+            }
+            return 1;
+        }
+    });
+}
+
+{
+    const from = new RoomPosition(25, 25, "E1N1");
+    const to = new RoomPosition(25, 25, "E4N1");
+
+    // Use `findRoute` to calculate a high-level plan for this path,
+    // prioritizing highways and owned rooms
+    const allowedRooms = { [from.roomName]: true };
+    const route = Game.map.findRoute(from.roomName, to.roomName, {
+        routeCallback(roomName) {
+            const parsed = /^[WE]([0-9]+)[NS]([0-9]+)$/.exec(roomName);
+            if (parsed !== null) {
+                const isHighway = (parseInt(parsed[1], 10) % 10 === 0) ||
+                (parseInt(parsed[2], 10) % 10 === 0);
+                const isMyRoom = Game.rooms[roomName] &&
+                Game.rooms[roomName].controller &&
+                Game.rooms[roomName].controller!.my;
+                if (isHighway || isMyRoom) {
+                    return 1;
+                } else {
+                    return 2.5;
+                }
+            } else {
+                return 2.5;
+            }
+        }
+    });
+
+    if (route !== ERR_NO_PATH) {
+        route.forEach((info) => {
+            allowedRooms[info.room] = true;
+        });
+    }
+
+    // Invoke PathFinder, allowing access only to rooms from `findRoute`
+    const ret = PathFinder.search(from, [to], {
+        roomCallback: (roomName) => {
+            if (allowedRooms[roomName] === undefined) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+    });
+}
+
+// Game.map.getRoomLinearDistance(roomName1, roomName2, [continuous])
+
+{
+    Game.map.getRoomLinearDistance("W1N1", "W4N2"); // 3
+    Game.map.getRoomLinearDistance("E65S55", "W65S55", false); // 131
+    Game.map.getRoomLinearDistance("E65S55", "W65S55", true); // 11
+}
+
+// Game.map.getTerrainAt(x, y, roomName)
+// Game.map.getTerrainAt(pos)
+
+{
+    Game.map.getTerrainAt(25, 20, "W10N10");
+}
+
+{
+    Game.map.getTerrainAt(new RoomPosition(25, 20, "W10N10"));
+}
+
+// Game.map.isRoomAvailable(roomName)
+
+{
+    if (Game.map.isRoomAvailable(room.name)) {
+        creep.moveTo(room.getPositionAt(25, 25)!);
+    }
+}
+
+// Game.market
+
+{
+    // Game.market.calcTransactionCost(amount, roomName1, roomName2)
+    const cost = Game.market.calcTransactionCost(1000, "W0N0", "W10N5");
+
+    // Game.market.cancelOrder(orderId)
+    for (const id in Game.market.orders) {
+        Game.market.cancelOrder(id);
+    }
+
+    // Game.market.changeOrderPrice(orderId, newPrice)
+    Game.market.changeOrderPrice("57bec1bf77f4d17c4c011960", 9.95);
+
+    // Game.market.createOrder(type, resourceType, price, totalAmount, [roomName])
+    Game.market.createOrder(ORDER_SELL, RESOURCE_GHODIUM, 9.95, 10000, "W1N1");
+
+    // Game.market.deal(orderId, amount, [yourRoomName])
+    Game.market.deal("57cd2b12cda69a004ae223a3", 1000, "W1N1");
+
+    const amountToBuy = 2000;
+    const maxTransferEnergyCost = 500;
+    const orders = Game.market.getAllOrders({ type: ORDER_SELL, resourceType: RESOURCE_GHODIUM });
+
+    for (const i of orders) {
+        if (i.roomName) {
+            const transferEnergyCost = Game.market.calcTransactionCost(amountToBuy, "W1N1", i.roomName);
+
+            if (transferEnergyCost < maxTransferEnergyCost) {
+                Game.market.deal(i.id, amountToBuy, "W1N1");
+                break;
+            }
+        }
+    }
+
+    // Game.market.extendOrder(orderId, addAmount)
+    Game.market.extendOrder("57bec1bf77f4d17c4c011960", 10000);
+
+    // Game.market.getAllOrders([filter])
+    Game.market.getAllOrders();
+    Game.market.getAllOrders({ type: ORDER_SELL, resourceType: RESOURCE_GHODIUM });
+
+    const targetRoom = "W1N1";
+    Game.market.getAllOrders((currentOrder) => currentOrder.resourceType === RESOURCE_GHODIUM &&
+        currentOrder.type === ORDER_SELL &&
+        Game.market.calcTransactionCost(1000, targetRoom, currentOrder.roomName!) < 500);
+
+    // Game.market.getOrderById(id)
+    const order = Game.market.getOrderById("55c34a6b5be41a0a6e80c123");
+}
+
+// PathFinder
+
+{
+    const pfCreep = Game.creeps.John;
+
+    const goals = pfCreep.room.find(FIND_SOURCES).map((source) => {
+        // We can't actually walk on sources-- set `range` to 1
+        // so we path next to it.
+        return { pos: source.pos, range: 1 };
+    });
+
+    const ret = PathFinder.search(
+        pfCreep.pos, goals,
+        {
+            // We need to set the defaults costs higher so that we
+            // can set the road cost lower in `roomCallback`
+            plainCost: 2,
+            swampCost: 10,
+
+            roomCallback(roomName) {
+                const curRoom = Game.rooms[roomName];
+                // In this example `room` will always exist, but since
+                // PathFinder supports searches which span multiple rooms
+                // you should be careful!
+                if (!curRoom) {
+                    return false;
+                }
+                const costs = new PathFinder.CostMatrix();
+
+                curRoom.find(FIND_STRUCTURES).forEach((struct) => {
+                    if (struct.structureType === STRUCTURE_ROAD) {
+                        // Favor roads over plain tiles
+                        costs.set(struct.pos.x, struct.pos.y, 1);
+                    } else if (struct.structureType !== STRUCTURE_CONTAINER &&
+                        (struct.structureType !== STRUCTURE_RAMPART ||
+                            !(struct as OwnedStructure).my)) {
+                        // Can't walk through non-walkable buildings
+                        costs.set(struct.pos.x, struct.pos.y, 0xff);
+                    }
+                });
+
+                // Avoid creeps in the room
+                curRoom.find(FIND_CREEPS).forEach((thisCreep) => {
+                    costs.set(thisCreep.pos.x, thisCreep.pos.y, 0xff);
+                });
+
+                return costs;
+            },
+        }
+    );
+
+    const pos = ret.path[0];
+    pfCreep.move(pfCreep.pos.getDirectionTo(pos));
+}
+
+// RawMemory
+
+{
+    // RawMemory.segments
+
+    RawMemory.setActiveSegments([0, 3]);
+    // on the next tick
+    const segmentZero = RawMemory.segments[0];
+    RawMemory.segments[3] = '{"foo": "bar", "counter": 15}';
+
+    // RawMemory.foreignSegment
+
+    RawMemory.setActiveForeignSegment("player");
+    // on the next tick
+    const playerSegment = RawMemory.foreignSegment;
+    // --> {"username": "player", "id": 40, "data": "Hello!"}
+
+    // RawMemory.interShardSegment
+
+    RawMemory.interShardSegment = JSON.stringify({
+        creeps: {
+            Bob: {role: "claimer"}
+        }
+    });
+
+    // on another shard
+    const interShardData = JSON.parse(RawMemory.interShardSegment);
+    if (interShardData.creeps[creep.name]) {
+        creep.memory = interShardData[creep.name];
+        delete interShardData.creeps[creep.name]; // tslint:disable-line no-dynamic-delete
+    }
+    RawMemory.interShardSegment = JSON.stringify(interShardData);
+
+    // RawMemory.get()
+    const myMemory = JSON.parse(RawMemory.get());
+
+    // RawMemory.set(value)
+    RawMemory.set(JSON.stringify(myMemory));
+
+    // RawMemory.setActiveSegments(ids)
+    RawMemory.setActiveSegments([0, 3]);
+
+    // RawMemory.setActiveForeignSegment(username, [id])
+    RawMemory.setActiveForeignSegment("player");
+    RawMemory.setActiveForeignSegment("player", 10);
+    RawMemory.setActiveForeignSegment(null);
+
+    // RawMemory.setDefaultPublicSegment(id)
+    RawMemory.setPublicSegments([5, 20, 21]);
+    RawMemory.setDefaultPublicSegment(5);
+    RawMemory.setDefaultPublicSegment(null);
+
+    // RawMemory.setPublicSegments(ids)
+    RawMemory.setPublicSegments([5, 3]);
+    RawMemory.setPublicSegments([]);
+}
+
+// Find Overloads
+
+{
+    const creeps = room.find(FIND_HOSTILE_CREEPS);
+    creeps[0].say(creeps[1].name);
+
+    const flags = room.find(FIND_FLAGS);
+    flags[0].remove();
+
+    const spawns = room.find(FIND_HOSTILE_SPAWNS);
+    spawns[0].spawning;
+
+    const sources = room.find(FIND_SOURCES);
+    sources[0].ticksToRegeneration;
+
+    const resources = room.find(FIND_DROPPED_RESOURCES);
+    resources[0].resourceType;
+
+    const energy = room.find(FIND_DROPPED_ENERGY);
+    energy[0].resourceType;
+
+    const sites = room.find(FIND_CONSTRUCTION_SITES);
+    sites[0].remove();
+
+    // Should have type (_HasRoomPosition | RoomPosition)[]
+    const exits = room.find(FIND_EXIT);
+
+    const creepsHere = room.lookForAt(LOOK_CREEPS, 10, 10);
+    creepsHere[0]!.getActiveBodyparts(ATTACK);
+
+    const towers = room.find<StructureTower>(FIND_MY_STRUCTURES, {
+        filter: (structure) => {
+            return (structure.structureType === STRUCTURE_TOWER);
+        }
+    });
+    towers[0].attack(creeps[0]);
+}
+
+// RoomPosition Finds
+
+{
+    // Should have type Creep
+    const hostileCreep = creep.pos.findClosestByRange(FIND_HOSTILE_CREEPS);
+
+    creep.say(hostileCreep.name);
+
+    const tower = creep.pos.findClosestByPath<StructureTower>(FIND_HOSTILE_STRUCTURES, {
+        filter: (structure) => {
+            return structure.structureType === STRUCTURE_TOWER;
+        }
+    });
+
+    tower.attack(creep);
+
+    const rampart = creep.pos.findClosestByRange<StructureRampart>(FIND_HOSTILE_STRUCTURES, {
+        filter: (structure) => {
+            return structure.structureType === STRUCTURE_RAMPART;
+        }
+    });
+
+    rampart.isPublic;
+
+    // Should have type Creep[]
+    const hostileCreeps = creep.pos.findInRange(FIND_HOSTILE_CREEPS, 10);
+    hostileCreeps[0].saying;
+
+    const labs = creep.pos.findInRange<StructureLab>(FIND_MY_STRUCTURES, 4, {
+        filter: (structure) => {
+            return structure.structureType === STRUCTURE_LAB;
+        }
+    });
+
+    labs[0].boostCreep(creep);
+}
+
+// LookAt Finds
+
+{
+    const nukes = room.lookForAt(LOOK_NUKES, creep.pos);
+
+    nukes[0]!.launchRoomName;
+
+    const flags = room.lookForAtArea(LOOK_FLAGS, 10, 10, 20, 20);
+
+    const x = flags[10];
+    const y = x[11];
+    const entry = y[0];
+    entry.flag!.remove();
+
+    const creeps = room.lookForAtArea(LOOK_CREEPS, 10, 10, 20, 20, true);
+
+    creeps[0].x;
+    creeps[0].y;
+    creeps[0].creep!.move(TOP);
+}
+
+// Advanced Structure types
+{
+    const owned = Game.getObjectById<AnyOwnedStructure>("blah");
+    const owner = owned!.owner.username;
+    owned!.notifyWhenAttacked(false);
+
+    const unowned = Game.getObjectById<AnyStructure>("blah2")!;
+    const hp = unowned.hits / unowned.hitsMax;
+
+    // test discriminated union
+    switch (unowned.structureType) {
+        case STRUCTURE_TOWER:
+            unowned.heal(Game.creeps.myCreep);
+        break;
+        case STRUCTURE_CONTAINER:
+        case STRUCTURE_STORAGE:
+        case STRUCTURE_TERMINAL:
+            const energyPercent = unowned.store.energy / unowned.storeCapacity;
+        break;
+        case STRUCTURE_WALL:
+        case STRUCTURE_RAMPART:
+            const wallHp = unowned.hits / unowned.hitsMax;
+        break;
+    }
+
+    // test discriminated union using filter functions on find
+    const from = Game.rooms.myRoom.find(FIND_STRUCTURES, (s) => (s.structureType === STRUCTURE_CONTAINER || s.structureType === STRUCTURE_STORAGE) && s.store.energy > 0)[0];
+    const to = from.pos.findClosestByPath(FIND_MY_STRUCTURES, {filter: (s) => (s.structureType === STRUCTURE_SPAWN || s.structureType === STRUCTURE_EXTENSION) && s.energy < s.energyCapacity});
+
+    Game.rooms.myRoom.find(FIND_MY_STRUCTURES, (s) => s.structureType === STRUCTURE_RAMPART).forEach((r) => r.notifyWhenAttacked(false));
+}
diff --git a/types/screeps/tsconfig.json b/types/screeps/tsconfig.json
new file mode 100644
index 0000000000..0e153958c2
--- /dev/null
+++ b/types/screeps/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "screeps-tests.ts"
+    ]
+  }
diff --git a/types/screeps/tslint.json b/types/screeps/tslint.json
new file mode 100644
index 0000000000..f3ea5020c6
--- /dev/null
+++ b/types/screeps/tslint.json
@@ -0,0 +1,12 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-redundant-jsdoc-2": false,
+        "dt-header": false,
+        "no-empty-interface": false,
+        "no-unnecessary-generics": false,
+        "no-misused-new": false,
+        "no-any-union": false,
+        "no-redundant-undefined": false
+    }
+}
diff --git a/types/scriptjs/tslint.json b/types/scriptjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/scriptjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/scroll-into-view/tslint.json b/types/scroll-into-view/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/scroll-into-view/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/scroller/index.d.ts b/types/scroller/index.d.ts
index 2e481395aa..9230285414 100644
--- a/types/scroller/index.d.ts
+++ b/types/scroller/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Zynga Scroller
-// Project: https://github.com/zynga/scroller
-// Definitions by: Boris Yankov <https://github.com/borisyankov>
+// Type definitions for Zynga Scroller 0.1
+// Project: http://zynga.github.com/scroller/
+// Definitions by: Marcelo Haskell Camargo <https://github.com/haskellcamargo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-interface ScrollerOptions {
+declare namespace Scroller {
+  interface Options {
     scrollingX?: boolean;
     scrollingY?: boolean;
     animating?: boolean;
@@ -13,46 +13,48 @@ interface ScrollerOptions {
     locking?: boolean;
     paging?: boolean;
     snapping?: boolean;
-    zooming?: boolean;
+    zooming?: number;
     minZoom?: number;
     maxZoom?: number;
-    speedMultiplier?: number;
-}
-
-interface ScrollValues {
-    left: number;
-    top: number;
-}
-
-interface ScrollValuesWithZoom extends ScrollValues {
-    zoom: number;
+  }
 }
 
 declare class Scroller {
-    constructor (callback: (left: number, top: number, zoom: number) => void , options: ScrollerOptions);
+  constructor(callback: (left: number, top: number, zoom: number) => void, options?: Scroller.Options);
+  setDimensions(clientWidth: number, clientHeight: number, contentWidth: number, contentHeight: number): void;
+  setPosition(clientLeft: number, clientTop: number): void;
+  setSnapSize(width: number, height: number): void;
+  activatePullToRefresh(height: number, activate: () => void, deactivate: () => void, start: () => void): void;
+  finishPullToRefresh(): void;
+  getValues(): {
+    left: number;
+    top: number;
+    zoom: number
+  };
+  getScrollMax(): { left: number; top: number; };
+  zoomTo(level: number, animate?: boolean, originLeft?: number,
+    originTop?: number, callback?: () => void): void;
+  zoomBy(factor: number, animate?: boolean, originLeft?: number,
+    originTop?: number, callback?: () => void): void;
+  scrollTo(left: number, top: number, animate?: boolean, zoom?: number): void;
+  scrollBy(leftOffset: number, topOffset: number, animate?: boolean): void;
 
-    setDimensions(clientWidth: number, clientHeight: number, contentWidth: number, contentHeight: number): void;
-    setPosition(left: number, top: number): void;
-    setSnapSize(width: number, height: number): void;
-    activatePullToRefresh(height: number, activateCallback: Function, deactivateCallback: Function, startCallback: Function): void;
-    finishPullToRefresh(): void;
-    getValues(): ScrollValuesWithZoom;
-    getScrollMax(): ScrollValues;
-    zoomTo(level: number, animate?: boolean, originLeft?: number, originTop?: number, callback?: Function): void;
-    zoomBy(factor: number, animate?: boolean, originLeft?: number, originTop?: number, callback?: Function): void;
-    scrollTo(left?: number, top?: number, animate?: boolean, zoom?: number): void;
-    scrollBy(left?: number, top?: number, animate?: boolean): void;
-
-    doMouseZoom(wheelDelta: number, timeStamp: number, pageX: number, pageY: number): void;
-    doTouchStart(touches: any[], timeStamp: number): void;
-    doTouchMove(touches: any[], timeStamp: number, scale?: number): void;
-    doTouchEnd(timeStamp: number): void;
+  doMouseZoom(wheelData: number, timeStamp: number, pageX: number, pageY: number): void;
+  doTouchStart(touches: Array<{
+    pageX: number;
+    pageY: number
+  }>, timeStamp: number): void;
+  doTouchMove(touches: Array<{
+    pageX: number;
+    pageY: number
+  }>, timeStamp: number, scale?: number): void;
+  doTouchEnd(timeStamp: number): void;
 }
 
 declare class EasyScroller  {
-    constructor (content: any, options: ScrollerOptions);
+  constructor(content: any, options: Scroller.Options);
 
-    render(): void;
-    reflow(): void;
-    bindEvents(): void;
+  render(): void;
+  reflow(): void;
+  bindEvents(): void;
 }
diff --git a/types/scroller/scroller-tests.ts b/types/scroller/scroller-tests.ts
index a4ac515b6c..bd681ead8c 100644
--- a/types/scroller/scroller-tests.ts
+++ b/types/scroller/scroller-tests.ts
@@ -1,11 +1,45 @@
-var clientWidth: any;
-var clientHeight: any;
-var render: any;
+let scroller: Scroller = new Scroller((left, top, zoom) => { });
+scroller = new Scroller((left, top, zoom) => { }, {
+  scrollingX: true,
+  scrollingY: true,
+  animating: true,
+  animationDuration: 400,
+  bouncing: false,
+  locking: false,
+  paging: false,
+  snapping: true,
+  zooming: 10,
+  minZoom: 1,
+  maxZoom: 2
+});
 
-var Tiling: any;
+scroller.setDimensions(10, 10, 10, 10);
+scroller.setPosition(200, 300);
+scroller.setSnapSize(300, 300);
+scroller.activatePullToRefresh(200, () => { }, () => { }, () => { });
+scroller.finishPullToRefresh();
+const data: {
+  left: number;
+  top: number;
+  zoom: number
+} = scroller.getValues();
+scroller.zoomTo(10);
+scroller.zoomBy(10);
+scroller.doMouseZoom(10, 10, 10, 10);
+scroller.doTouchStart([{
+  pageX: 10,
+  pageY: 20
+}], 200);
+scroller.doTouchEnd(300);
+
+declare const clientWidth: number;
+declare const clientHeight: number;
+declare function render(left: number, top: number, zoom: number): void;
+
+declare const Tiling: any; // TODO: What is this?
 
 function test_basic() {
-    var scrollerObj = new Scroller(function (left, top, zoom) {
+    const scrollerObj = new Scroller((left, top, zoom) => {
     }, {
         scrollingY: false
     });
@@ -13,106 +47,106 @@ function test_basic() {
 }
 
 function test_canvas() {
-    var contentWidth = 2000;
-    var contentHeight = 2000;
-    var cellWidth = 100;
-    var cellHeight = 100;
-    var content = <HTMLCanvasElement>document.getElementById('content');
-    var context = content.getContext('2d');
-    var tiling = new Tiling();
-    var render = function (left, top, zoom) {
+    const contentWidth = 2000;
+    const contentHeight = 2000;
+    const cellWidth = 100;
+    const cellHeight = 100;
+    const content = document.getElementById('content') as HTMLCanvasElement;
+    const context = content.getContext('2d');
+    const tiling = new Tiling();
+    function render(left: number, top: number, zoom: number) {
         content.width = clientWidth;
         content.height = clientHeight;
         context.clearRect(0, 0, clientWidth, clientHeight);
         tiling.setup(clientWidth, clientHeight, contentWidth, contentHeight, cellWidth, cellHeight);
         tiling.render(left, top, zoom, paint);
-    };
-    var paint = function (row, col, left, top, width, height, zoom) {
+    }
+    function paint(row: number, col: number, left: number, top: number, width: number, height: number, zoom: number) {
         context.fillStyle = row % 2 + col % 2 > 0 ? "#ddd" : "#fff";
         context.fillRect(left, top, width, height);
         context.fillStyle = "black";
         context.font = (14 * zoom).toFixed(2) + 'px "Helvetica Neue", Helvetica, Arial, sans-serif';
-        context.fillText(row + "," + col, left + (6 * zoom), top + (18 * zoom));
-    };
+        context.fillText(`${row},${col}`, left + (6 * zoom), top + (18 * zoom));
+    }
 }
 
 function test_domlist() {
-    var container = document.getElementById("container");
-    var content = document.getElementById("content");
-    var refreshElem = <HTMLElement>content.getElementsByTagName("div")[0];
-    var scroller = new Scroller(render, {
+    const container = document.getElementById("container");
+    const content = document.getElementById("content");
+    const refreshElem = content.getElementsByTagName("div")[0];
+    const scroller = new Scroller(render, {
         scrollingX: false
     });
-    scroller.activatePullToRefresh(50, function () {
+    scroller.activatePullToRefresh(50, () => {
         refreshElem.className += " active";
         refreshElem.innerHTML = "Release to Refresh";
-    }, function () {
+    }, () => {
         refreshElem.className = refreshElem.className.replace(" active", "");
         refreshElem.innerHTML = "Pull to Refresh";
-    }, function () {
+    }, () => {
         refreshElem.className += " running";
         refreshElem.innerHTML = "Refreshing...";
-        setTimeout(function () {
+        setTimeout(() => {
             refreshElem.className = refreshElem.className.replace(" running", "");
             insertItems();
             scroller.finishPullToRefresh();
         }, 2000);
     });
-    var rect = container.getBoundingClientRect();
+    const rect = container.getBoundingClientRect();
     scroller.setPosition(rect.left + container.clientLeft, rect.top + container.clientTop);
-    var insertItems = function () {
-        for (var i = 0; i < 15; i++) {
-            var row = document.createElement("div");
+    const insertItems = () => {
+        for (let i = 0; i < 15; i++) {
+            const row = document.createElement("div");
             row.className = "row";
             row.style.backgroundColor = i % 2 > 0 ? "#ddd" : "";
-            row.innerHTML = <any>Math.random();
-            if (content.firstChild == content.lastChild) {
+            row.innerHTML = Math.random().toString();
+            if (content.firstChild === content.lastChild) {
                 content.appendChild(row);
             } else {
-                content.insertBefore(row, content.childNodes[1])
+                content.insertBefore(row, content.childNodes[1]);
             }
         }
         scroller.setDimensions(container.clientWidth, container.clientHeight, content.offsetWidth, content.offsetHeight - 50);
     };
     insertItems();
     if ('ontouchstart' in window) {
-        container.addEventListener("touchstart", function (e) {
+        container.addEventListener("touchstart", e => {
             // Don't react if initial down happens on a form element
-            if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
+            if ((e.target as any).tagName.match(/input|textarea|select/i)) {
                 return;
             }
-            scroller.doTouchStart((<any>e).touches, e.timeStamp);
+            scroller.doTouchStart((e as any).touches, e.timeStamp);
             e.preventDefault();
         }, false);
-        document.addEventListener("touchmove", function (e) {
-            scroller.doTouchMove((<any>e).touches, e.timeStamp);
+        document.addEventListener("touchmove", e => {
+            scroller.doTouchMove((e as any).touches, e.timeStamp);
         }, false);
-        document.addEventListener("touchend", function (e) {
+        document.addEventListener("touchend", e => {
             scroller.doTouchEnd(e.timeStamp);
         }, false);
     } else {
-        var mousedown = false;
-        container.addEventListener("mousedown", function (e) {
-            if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
+        let mousedown = false;
+        container.addEventListener("mousedown", e => {
+            if ((e.target as any).tagName.match(/input|textarea|select/i)) {
                 return;
             }
             scroller.doTouchStart([{
-                pageX: (<any>e).pageX,
-                pageY: (<any>e).pageY
+                pageX: (e as any).pageX,
+                pageY: (e as any).pageY
             }], e.timeStamp);
             mousedown = true;
         }, false);
-        document.addEventListener("mousemove", function (e) {
+        document.addEventListener("mousemove", e => {
             if (!mousedown) {
                 return;
             }
             scroller.doTouchMove([{
-                pageX: (<any>e).pageX,
-                pageY: (<any>e).pageY
+                pageX: (e as any).pageX,
+                pageY: (e as any).pageY
             }], e.timeStamp);
             mousedown = true;
         }, false);
-        document.addEventListener("mouseup", function (e) {
+        document.addEventListener("mouseup", e => {
             if (!mousedown) {
                 return;
             }
@@ -123,63 +157,63 @@ function test_domlist() {
 }
 
 function test_dompaging() {
-    var container = document.getElementById("container");
-    var content = document.getElementById("content");
-    var size = 400;
-    var frag = document.createDocumentFragment();
-    for (var cell = 0, cl = content.clientWidth / size; cell < cl; cell++) {
-        var elem = document.createElement("div");
+    const container = document.getElementById("container");
+    const content = document.getElementById("content");
+    const size = 400;
+    const frag = document.createDocumentFragment();
+    for (let cell = 0, cl = content.clientWidth / size; cell < cl; cell++) {
+        const elem = document.createElement("div");
         elem.className = "cell";
         elem.style.backgroundColor = cell % 2 > 0 ? "#ddd" : "";
-        elem.innerHTML = <any>cell;
+        elem.innerHTML = cell.toString();
         frag.appendChild(elem);
     }
     content.appendChild(frag);
-    var scroller = new Scroller(render, {
+    const scroller = new Scroller(render, {
         scrollingY: false,
         paging: true
     });
-    var rect = container.getBoundingClientRect();
+    const rect = container.getBoundingClientRect();
     scroller.setPosition(rect.left + container.clientLeft, rect.top + container.clientTop);
     scroller.setDimensions(container.clientWidth, container.clientHeight, content.offsetWidth, content.offsetHeight);
     if ('ontouchstart' in window) {
-        container.addEventListener("touchstart", function (e) {
-            if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
+        container.addEventListener("touchstart", e => {
+            if ((e.target as any).tagName.match(/input|textarea|select/i)) {
                 return;
             }
-            scroller.doTouchStart((<any>e).touches, e.timeStamp);
+            scroller.doTouchStart((e as any).touches, e.timeStamp);
             e.preventDefault();
         }, false);
-        document.addEventListener("touchmove", function (e) {
-            scroller.doTouchMove((<any>e).touches, e.timeStamp);
+        document.addEventListener("touchmove", e => {
+            scroller.doTouchMove((e as any).touches, e.timeStamp);
         }, false);
-        document.addEventListener("touchend", function (e) {
+        document.addEventListener("touchend", e => {
             scroller.doTouchEnd(e.timeStamp);
         }, false);
     } else {
-        var mousedown = false;
-        container.addEventListener("mousedown", function (e) {
-            if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
+        let mousedown = false;
+        container.addEventListener("mousedown", e => {
+            if ((e.target as any).tagName.match(/input|textarea|select/i)) {
                 return;
             }
             scroller.doTouchStart([{
-                pageX: (<any>e).pageX,
-                pageY: (<any>e).pageY
+                pageX: (e as any).pageX,
+                pageY: (e as any).pageY
             }], e.timeStamp);
             mousedown = true;
         }, false);
-        document.addEventListener("mousemove", function (e) {
+        document.addEventListener("mousemove", e => {
             if (!mousedown) {
                 return;
             }
             scroller.doTouchMove([{
-                pageX: (<any>e).pageX,
-                pageY: (<any>e).pageY
+                pageX: (e as any).pageX,
+                pageY: (e as any).pageY
             }], e.timeStamp);
             mousedown = true;
         }, false);
 
-        document.addEventListener("mouseup", function (e) {
+        document.addEventListener("mouseup", e => {
             if (!mousedown) {
                 return;
             }
@@ -190,64 +224,64 @@ function test_dompaging() {
 }
 
 function test_domsnapping() {
-    var container = document.getElementById("container");
-    var content = document.getElementById("content");
-    var size = 100;
-    var frag = document.createDocumentFragment();
-    for (var row = 0, rl = content.clientHeight / size; row < rl; row++) {
-        for (var cell = 0, cl = content.clientWidth / size; cell < cl; cell++) {
-            var elem = document.createElement("div");
+    const container = document.getElementById("container");
+    const content = document.getElementById("content");
+    const size = 100;
+    const frag = document.createDocumentFragment();
+    for (let row = 0, rl = content.clientHeight / size; row < rl; row++) {
+        for (let cell = 0, cl = content.clientWidth / size; cell < cl; cell++) {
+            const elem = document.createElement("div");
             elem.className = "cell";
             elem.style.backgroundColor = row % 2 + cell % 2 > 0 ? "#ddd" : "";
-            elem.innerHTML = row + "," + cell;
+            elem.innerHTML = `${row},${cell}`;
             frag.appendChild(elem);
         }
     }
     content.appendChild(frag);
-    var scroller = new Scroller(render, {
+    const scroller = new Scroller(render, {
         snapping: true
     });
-    var rect = container.getBoundingClientRect();
+    const rect = container.getBoundingClientRect();
     scroller.setPosition(rect.left + container.clientLeft, rect.top + container.clientTop);
     scroller.setDimensions(container.clientWidth, container.clientHeight, content.offsetWidth, content.offsetHeight);
     scroller.setSnapSize(100, 100);
     if ('ontouchstart' in window) {
-        container.addEventListener("touchstart", function (e) {
-            if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
+        container.addEventListener("touchstart", e => {
+            if ((e.target as any).tagName.match(/input|textarea|select/i)) {
                 return;
             }
-            scroller.doTouchStart((<any>e).touches, e.timeStamp);
+            scroller.doTouchStart((e as any).touches, e.timeStamp);
             e.preventDefault();
         }, false);
-        document.addEventListener("touchmove", function (e) {
-            scroller.doTouchMove((<any>e).touches, e.timeStamp);
+        document.addEventListener("touchmove", e => {
+            scroller.doTouchMove((e as any).touches, e.timeStamp);
         }, false);
-        document.addEventListener("touchend", function (e) {
+        document.addEventListener("touchend", e => {
             scroller.doTouchEnd(e.timeStamp);
         }, false);
     } else {
-        var mousedown = false;
-        container.addEventListener("mousedown", function (e) {
-            if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
+        let mousedown = false;
+        container.addEventListener("mousedown", e => {
+            if ((e.target as any).tagName.match(/input|textarea|select/i)) {
                 return;
             }
             scroller.doTouchStart([{
-                pageX: (<any>e).pageX,
-                pageY: (<any>e).pageY
+                pageX: (e as any).pageX,
+                pageY: (e as any).pageY
             }], e.timeStamp);
             mousedown = true;
         }, false);
-        document.addEventListener("mousemove", function (e) {
+        document.addEventListener("mousemove", e => {
             if (!mousedown) {
                 return;
             }
             scroller.doTouchMove([{
-                pageX: (<any>e).pageX,
-                pageY: (<any>e).pageY
+                pageX: (e as any).pageX,
+                pageY: (e as any).pageY
             }], e.timeStamp);
             mousedown = true;
         }, false);
-        document.addEventListener("mouseup", function (e) {
+        document.addEventListener("mouseup", e => {
             if (!mousedown) {
                 return;
             }
@@ -255,4 +289,4 @@ function test_domsnapping() {
             mousedown = false;
         }, false);
     }
-}
\ No newline at end of file
+}
diff --git a/types/scroller/tsconfig.json b/types/scroller/tsconfig.json
index 5db383d25b..e0caa39d51 100644
--- a/types/scroller/tsconfig.json
+++ b/types/scroller/tsconfig.json
@@ -5,7 +5,7 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": false,
+        "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
diff --git a/types/scroller/tslint.json b/types/scroller/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/scroller/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/scrollreveal/tslint.json b/types/scrollreveal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/scrollreveal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/scrolltofixed/tslint.json b/types/scrolltofixed/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/scrolltofixed/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/scrypt-async/tslint.json b/types/scrypt-async/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/scrypt-async/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/scryptsy/index.d.ts b/types/scryptsy/index.d.ts
new file mode 100644
index 0000000000..e716f7c56c
--- /dev/null
+++ b/types/scryptsy/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for scryptsy 2.0
+// Project: https://github.com/cryptocoinjs/scryptsy
+// Definitions by: Satana Charuwichitratana <https://github.com/micksatana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = scryptsy;
+
+declare function scryptsy(key: Buffer | string, salt: Buffer | string, N: number, r: number, p: number, dkLen: number,
+                          progressCallback?: (status: { current: number, total: number, percent: number }) => void): Buffer;
+
+declare namespace scryptsy {
+    const prototype: {};
+}
diff --git a/types/scryptsy/scryptsy-tests.ts b/types/scryptsy/scryptsy-tests.ts
new file mode 100644
index 0000000000..12c5a89d6d
--- /dev/null
+++ b/types/scryptsy/scryptsy-tests.ts
@@ -0,0 +1,14 @@
+import scrypt = require('scryptsy');
+
+const key = 'TheKey';
+const salt = 'Salty';
+
+// Test without processCallback
+const data: Buffer = scrypt(key, salt, 16384, 8, 1, 64);
+
+// Test with processCallback
+scrypt(key, salt, 16384, 8, 1, 64, (status) => {
+    status.current;
+    status.total;
+    status.percent;
+});
diff --git a/types/scryptsy/tsconfig.json b/types/scryptsy/tsconfig.json
new file mode 100644
index 0000000000..ae751a1eb0
--- /dev/null
+++ b/types/scryptsy/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "scryptsy-tests.ts"
+    ]
+}
diff --git a/types/scryptsy/tslint.json b/types/scryptsy/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/scryptsy/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/seamless/tslint.json b/types/seamless/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/seamless/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/seedrandom/tslint.json b/types/seedrandom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/seedrandom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/segment-analytics/tslint.json b/types/segment-analytics/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/segment-analytics/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/select2/tslint.json b/types/select2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/select2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/selectables/index.d.ts b/types/selectables/index.d.ts
new file mode 100644
index 0000000000..3834428240
--- /dev/null
+++ b/types/selectables/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for selectables 1.4
+// Project: https://github.com/p34eu/Selectables#readme
+// Definitions by: Soner Köksal <https://github.com/renjfk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Selectables;
+
+declare class Selectables {
+    options: Selectables.Options;
+
+    constructor(options?: Selectables.Options);
+
+    enable(): void;
+
+    disable(): void;
+}
+
+declare namespace Selectables {
+    interface Options {
+        zone?: string;
+        elements?: string;
+        selectedClass?: string;
+        key?: string | boolean;
+        moreUsing?: string;
+        enabled?: boolean;
+
+        start?(e: Event): void;
+
+        stop?(e: Event): void;
+
+        onSelect?(el: Element): void;
+
+        onDeselect?(el: Element): void;
+    }
+}
diff --git a/types/selectables/selectables-tests.ts b/types/selectables/selectables-tests.ts
new file mode 100644
index 0000000000..595f2ca738
--- /dev/null
+++ b/types/selectables/selectables-tests.ts
@@ -0,0 +1,15 @@
+import * as Selectables from "selectables";
+
+const dr = new Selectables({
+    zone: '#div',
+    elements: 'li'
+});
+
+// later
+dr.disable();
+
+// enable again
+dr.enable();
+
+// set options
+dr.options.key = 'altKey';
diff --git a/types/selectables/tsconfig.json b/types/selectables/tsconfig.json
new file mode 100644
index 0000000000..e34d4a6078
--- /dev/null
+++ b/types/selectables/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "selectables-tests.ts"
+    ]
+}
diff --git a/types/selectables/tslint.json b/types/selectables/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/selectables/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/selectize/index.d.ts b/types/selectize/index.d.ts
index f6c2498d70..042e628e12 100644
--- a/types/selectize/index.d.ts
+++ b/types/selectize/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/brianreavis/selectize.js
 // Definitions by: Adi Dahiya <https://github.com/adidahiya>, Natalie Bausch <https://github.com/naBausch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace Selectize {
     // see https://github.com/brianreavis/selectize.js/blob/master/docs/usage.md
@@ -11,6 +12,11 @@ declare namespace Selectize {
         // General
         // ------------------------------------------------------------------------------------------------------------
 
+        /**
+         * An array of the initial selected values. By default this is populated from the original input element.
+         */
+        items?: T[];
+
         /**
          * The string to separate items by. This option is only used when Selectize is instantiated from a
          * <input type="text"> element.
@@ -94,6 +100,13 @@ declare namespace Selectize {
          */
         hideSelected?: boolean;
 
+        /**
+         * If true, the dropdown will be closed after a selection is made.
+         *
+         * Default: false
+         */
+        closeAfterSelect?: boolean;
+
         /**
          * If true, Selectize will treat any options with a "" value like normal. This defaults to false to
          * accomodate the common <select> practice of having the first empty option act as a placeholder.
@@ -124,7 +137,7 @@ declare namespace Selectize {
          *
          * Default: false
          */
-        preload?: any;
+        preload?: boolean | 'focus';
 
         /**
          * The element the dropdown menu is appended to. This should be "body" or null.
@@ -218,6 +231,13 @@ declare namespace Selectize {
          */
         optgroupField?: string;
 
+        /**
+         * The name of the property to disabled option and optgroup.
+         *
+         * Default: 'disabled'
+         */
+        disabledField?: string;
+
         /**
          * A single field or an array of fields to sort by. Each item in the array should be an object containing at
          * least a "field" property. Optionally, "direction" can be set to "asc" or "desc". The order of the array
@@ -228,14 +248,14 @@ declare namespace Selectize {
          *
          * Default: "$order"
          */
-        sortField?: any;
+        sortField?: string | { field: string, direction?: 'asc' | 'desc' }[];
 
         /**
          * An array of property names to analyze when filtering options.
          *
          * Default: ["text"]
          */
-        searchField?: any;
+        searchField?: string | string[];
 
         /**
          * When searching for multiple terms (separated by a space), this is the operator used. Can be "and" or "or".
@@ -244,6 +264,14 @@ declare namespace Selectize {
          */
         searchConjunction?: string;
 
+        /**
+         * If truthy, Selectize will make all optgroups be in the same order as they were added (by the `$order`
+         * property). Otherwise, it will order based on the score of the results in each.
+         *
+         * Default: false
+         */
+        lockOptgroupOrder?: boolean;
+
         /**
          * An array of optgroup values that indicates the order they should be listed in in the dropdown.
          * If not provided, groups will be ordered by the ranking of the options within them.
@@ -279,6 +307,16 @@ declare namespace Selectize {
          */
         onInitialize?(): any;
 
+        /**
+         * Invoked when the control gains focus.
+         */
+        onFocus?(): any;
+
+        /**
+         * Invoked when the control loses focus.
+         */
+        onBlur?(): any;
+
         /**
          * Invoked when the value of the control changes.
          *
@@ -426,7 +464,7 @@ declare namespace Selectize {
         /**
          * Resets / clears all selected items from the control.
          */
-        clear(): void;
+        clear(silent?: boolean): void;
 
         /**
          * Returns the jQuery element of the item matching the given value.
@@ -436,18 +474,18 @@ declare namespace Selectize {
         /**
          * "Selects" an item. Adds it to the list at the current caret position.
          */
-        addItem(value: T): void;
+        addItem(value: T, silent?: boolean): void;
 
         /**
          * Removes the selected item matching the provided value.
          */
-        removeItem(value: T): void;
+        removeItem(value: T, silent?: boolean): void;
 
         /**
          * Invokes the "create" method provided in the selectize options that should provide the data for the
          * new item, given the user input. Once this completes, it will be added to the item list.
          */
-        createItem(value: T): void;
+        createItem(value: T, triggerDropdown?: boolean, callback?: (data?: any) => void): void;
 
         /**
          * Re-renders the selected item lists.
diff --git a/types/selectize/tslint.json b/types/selectize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/selectize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/selenium-webdriver/remote.d.ts b/types/selenium-webdriver/remote.d.ts
index d1c5e4616c..3ef73c953d 100644
--- a/types/selenium-webdriver/remote.d.ts
+++ b/types/selenium-webdriver/remote.d.ts
@@ -157,6 +157,52 @@ export namespace DriverService {
     }
 }
 
+/**
+ * Manages the life and death of the
+ * <a href="http://selenium-release.storage.googleapis.com/index.html">
+ * standalone Selenium server</a>.
+ */
+export class SeleniumServer extends DriverService {
+    /**
+     * @param {string} jar Path to the Selenium server jar.
+     * @param {SeleniumServer.Options=} opt_options Configuration options for the
+     *     server.
+     * @throws {Error} If the path to the Selenium jar is not specified or if an
+     *     invalid port is specified.
+     **/
+    constructor(jar: string, opt_options?: SeleniumServer.Options);
+}
+
+export namespace SeleniumServer {
+    /**
+     * Options for the Selenium server
+     */
+    interface Options {
+        /** Whether the server should only be accessed on this host's loopback address.*/
+        loopback?: boolean;
+
+        /** The port to start the server on (must be > 0). If the port is provided
+        as a promise, the service will wait for the promise to resolve before starting. */
+        port?: number|webdriver.promise.IThenable<number>;
+
+        /** The arguments to pass to the service. If a promise is provided, the
+        service will wait for it to resolve before starting. */
+        args?: string[]|webdriver.promise.IThenable<string[]>;
+
+        /** The arguments to pass to the JVM. If a promise is provided, the service
+        will wait for it to resolve before starting. */
+        jvmArgs?: string[]|webdriver.promise.IThenable<string[]>;
+
+        /** The environment variables that should be visible to the server process.
+        Defaults to inheriting the current process's environment.*/
+        env?: {[key: string]: string};
+
+        /** IO configuration for the spawned server process. For more information,
+        refer to the documentation of `child_process.spawn`*/
+        stdio?: string|Array<string|number>;
+    }
+}
+
 /**
  * A {@link webdriver.FileDetector} that may be used when running
  * against a remote
diff --git a/types/selenium-webdriver/test/remote.ts b/types/selenium-webdriver/test/remote.ts
index a783101290..014fd33af4 100644
--- a/types/selenium-webdriver/test/remote.ts
+++ b/types/selenium-webdriver/test/remote.ts
@@ -9,3 +9,21 @@ function TestRemoteFileDetector() {
     const fileDetector: remote.FileDetector = new remote.FileDetector();
     fileDetector.handleFile(driver, 'path/to/file').then((path: string) => { /* empty */ });
 }
+
+function TestSeleniumServer() {
+    const pathToJar = '/path/to/jar';
+    const seleniumServer: remote.SeleniumServer = new remote.SeleniumServer(pathToJar);
+}
+
+function TestSeleniumServerOptions() {
+    const pathToJar = '/path/to/jar';
+    const options: remote.SeleniumServer.Options = {
+        loopback: false,
+        port: 4444,
+        args: ['--testArg'],
+        jvmArgs: ['--testJvmArg'],
+        env: {test1: 'test1', test2: 'test2'},
+        stdio: 'inherit'
+    }
+    const seleniumServer: remote.SeleniumServer = new remote.SeleniumServer(pathToJar, options);
+}
diff --git a/types/selenium-webdriver/tslint.json b/types/selenium-webdriver/tslint.json
index 5ffc468766..5ae3225834 100644
--- a/types/selenium-webdriver/tslint.json
+++ b/types/selenium-webdriver/tslint.json
@@ -10,6 +10,10 @@
         "no-empty-interface": false,
         "no-inferrable-types": false,
         "no-any-union": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
         "prefer-const": false,
         "semicolon": false,
diff --git a/types/selenium-webdriver/v2/chrome.d.ts b/types/selenium-webdriver/v2/chrome.d.ts
index eb7b9f13c1..ce26566f02 100644
--- a/types/selenium-webdriver/v2/chrome.d.ts
+++ b/types/selenium-webdriver/v2/chrome.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 import * as remote from './remote';
 
diff --git a/types/selenium-webdriver/v2/edge.d.ts b/types/selenium-webdriver/v2/edge.d.ts
index 576dc01f94..b18a959700 100644
--- a/types/selenium-webdriver/v2/edge.d.ts
+++ b/types/selenium-webdriver/v2/edge.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 import * as remote from './remote';
 
diff --git a/types/selenium-webdriver/v2/executors.d.ts b/types/selenium-webdriver/v2/executors.d.ts
index ddb3e5b752..c7bf15ef8d 100644
--- a/types/selenium-webdriver/v2/executors.d.ts
+++ b/types/selenium-webdriver/v2/executors.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 
 /**
diff --git a/types/selenium-webdriver/v2/firefox.d.ts b/types/selenium-webdriver/v2/firefox.d.ts
index 9865896ba7..7678c404ce 100644
--- a/types/selenium-webdriver/v2/firefox.d.ts
+++ b/types/selenium-webdriver/v2/firefox.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 import * as remote from './remote';
 
diff --git a/types/selenium-webdriver/v2/http.d.ts b/types/selenium-webdriver/v2/http.d.ts
index bdb2797406..a0a25a7955 100644
--- a/types/selenium-webdriver/v2/http.d.ts
+++ b/types/selenium-webdriver/v2/http.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 
 /**
diff --git a/types/selenium-webdriver/v2/ie.d.ts b/types/selenium-webdriver/v2/ie.d.ts
index a9ae4b2c4a..9e8cab2457 100644
--- a/types/selenium-webdriver/v2/ie.d.ts
+++ b/types/selenium-webdriver/v2/ie.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 
 /**
diff --git a/types/selenium-webdriver/v2/index.d.ts b/types/selenium-webdriver/v2/index.d.ts
index 25e9e0f606..25b9b96017 100644
--- a/types/selenium-webdriver/v2/index.d.ts
+++ b/types/selenium-webdriver/v2/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Bill Armstrong <https://github.com/BillArmstrong>, Yuki Kokubun <https://github.com/Kuniwak>, Craig Nishina <https://github.com/cnishina>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
-/* tslint:disable */
 
 import * as chrome from './chrome';
 import * as edge from './edge';
diff --git a/types/selenium-webdriver/v2/opera.d.ts b/types/selenium-webdriver/v2/opera.d.ts
index 9976995e65..cd02889527 100644
--- a/types/selenium-webdriver/v2/opera.d.ts
+++ b/types/selenium-webdriver/v2/opera.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 import * as remote from './remote';
 
diff --git a/types/selenium-webdriver/v2/remote.d.ts b/types/selenium-webdriver/v2/remote.d.ts
index de31a0fbe7..384ca521ac 100644
--- a/types/selenium-webdriver/v2/remote.d.ts
+++ b/types/selenium-webdriver/v2/remote.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 
 /**
diff --git a/types/selenium-webdriver/v2/safari.d.ts b/types/selenium-webdriver/v2/safari.d.ts
index 0633f9f782..7a6f1701c4 100644
--- a/types/selenium-webdriver/v2/safari.d.ts
+++ b/types/selenium-webdriver/v2/safari.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from './index';
 
 export class Server { }
diff --git a/types/selenium-webdriver/v2/test/chrome.ts b/types/selenium-webdriver/v2/test/chrome.ts
index f9c896fbee..e651bb83bb 100644
--- a/types/selenium-webdriver/v2/test/chrome.ts
+++ b/types/selenium-webdriver/v2/test/chrome.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as chrome from 'selenium-webdriver/chrome';
 import * as remote from 'selenium-webdriver/remote';
 import * as webdriver from 'selenium-webdriver';
@@ -10,7 +9,7 @@ function TestChromeDriver() {
         new remote.DriverService('executable', new chrome.Options()),
         new webdriver.promise.ControlFlow());
 
-    var baseDriver: webdriver.WebDriver = driver;
+    const baseDriver: webdriver.WebDriver = driver;
 }
 
 function TestChromeOptions() {
@@ -44,7 +43,7 @@ function TestServiceBuilder() {
     var builder: chrome.ServiceBuilder = new chrome.ServiceBuilder();
     builder = new chrome.ServiceBuilder('exe');
 
-    var anything: any = builder.build();
+    const anything: any = builder.build();
     builder = builder.usingPort(8080);
     builder = builder.setAdbPort(5037);
     builder = builder.loggingTo('path');
@@ -57,6 +56,6 @@ function TestServiceBuilder() {
 }
 
 function TestChromeModule() {
-    var service: any = chrome.getDefaultService();
+    const service: any = chrome.getDefaultService();
     chrome.setDefaultService(new remote.DriverService('executable', new chrome.Options()));
 }
diff --git a/types/selenium-webdriver/v2/test/firefox.ts b/types/selenium-webdriver/v2/test/firefox.ts
index 2f3aeb928c..2a4d5a1d0d 100644
--- a/types/selenium-webdriver/v2/test/firefox.ts
+++ b/types/selenium-webdriver/v2/test/firefox.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as firefox from 'selenium-webdriver/firefox';
 import * as remote from 'selenium-webdriver/remote';
 import * as webdriver from 'selenium-webdriver';
@@ -8,7 +7,7 @@ function TestBinary() {
     binary = new firefox.Binary('exe');
 
     binary.addArguments('A', 'B', 'C');
-    var promise: webdriver.promise.Promise<void> = binary.kill();
+    const promise: webdriver.promise.Promise<void> = binary.kill();
     binary.launch('profile').then((result: any) => {});
 }
 
@@ -17,7 +16,7 @@ function TestFirefoxDriver() {
     driver = new firefox.Driver(webdriver.Capabilities.firefox());
     driver = new firefox.Driver(webdriver.Capabilities.firefox(), new webdriver.promise.ControlFlow());
 
-    var baseDriver: webdriver.WebDriver = driver;
+    const baseDriver: webdriver.WebDriver = driver;
 }
 
 function TestFirefoxOptions() {
@@ -29,7 +28,7 @@ function TestFirefoxOptions() {
     options = options.setProfile('profile');
     options = options.setProfile(new firefox.Profile());
     options = options.setProxy({ proxyType: 'proxy' });
-    var capabilities: webdriver.Capabilities = options.toCapabilities();
+    const capabilities: webdriver.Capabilities = options.toCapabilities();
 }
 
 function TestFirefoxProfile() {
@@ -40,8 +39,8 @@ function TestFirefoxProfile() {
     profile.addExtension('ext');
     bool = profile.assumeUntrustedCertIssuer();
     profile.encode().then((prof: string) => {});
-    var num: number = profile.getPort();
-    var anything: any = profile.getPreference('key');
+    const num: number = profile.getPort();
+    const anything: any = profile.getPreference('key');
     bool = profile.nativeEventsEnabled();
     profile.setAcceptUntrustedCerts(true);
     profile.setAssumeUntrustedCertIssuer(true);
diff --git a/types/selenium-webdriver/v2/test/index.ts b/types/selenium-webdriver/v2/test/index.ts
index ba783f86fc..98d98519eb 100644
--- a/types/selenium-webdriver/v2/test/index.ts
+++ b/types/selenium-webdriver/v2/test/index.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 import * as webdriver from 'selenium-webdriver';
 import * as chrome from 'selenium-webdriver/chrome';
 import * as firefox from 'selenium-webdriver/firefox';
@@ -7,21 +6,21 @@ import * as executors from 'selenium-webdriver/executors';
 import * as testing from 'selenium-webdriver/testing';
 
 function TestExecutors() {
-    var exec: webdriver.Executor = executors.createExecutor('url');
-    var promise: webdriver.promise.Promise<string>;
+    let exec: webdriver.Executor = executors.createExecutor('url');
+    const promise: webdriver.promise.Promise<string> = {} as any;
     exec = executors.createExecutor(promise);
 }
 
 function TestBuilder() {
-    var builder: webdriver.Builder = new webdriver.Builder();
+    let builder: webdriver.Builder = new webdriver.Builder();
 
-    var driver: webdriver.WebDriver = builder.build();
+    const driver: webdriver.WebDriver = builder.build();
     builder = builder.forBrowser('name');
     builder = builder.forBrowser('name', 'version');
     builder = builder.forBrowser('name', 'version', 'platform');
 
-    var cap: webdriver.Capabilities = builder.getCapabilities();
-    var str: string = builder.getServerUrl();
+    const cap: webdriver.Capabilities = builder.getCapabilities();
+    const str: string = builder.getServerUrl();
 
     builder = builder.setAlertBehavior('behavior');
     builder = builder.setChromeOptions(new chrome.Options());
@@ -38,13 +37,13 @@ function TestBuilder() {
 }
 
 function TestActionSequence() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var sequence: webdriver.ActionSequence = new webdriver.ActionSequence(driver);
-    var element: webdriver.WebElement = new webdriver.WebElement(driver, 'elementId');
-    var promise: webdriver.promise.Promise<string>;
+    let sequence: webdriver.ActionSequence = new webdriver.ActionSequence(driver);
+    let element: webdriver.WebElement = new webdriver.WebElement(driver, 'elementId');
+    const promise: webdriver.promise.Promise<string> = {} as any;
     element = new webdriver.WebElement(driver, promise);
 
     // Click
@@ -94,12 +93,12 @@ function TestActionSequence() {
 }
 
 function TestTouchSequence() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
-    var element: webdriver.WebElement = new webdriver.WebElement(driver, 'elementId');
+    const element: webdriver.WebElement = new webdriver.WebElement(driver, 'elementId');
 
-    var sequence: webdriver.TouchSequence = new webdriver.TouchSequence(driver);
+    let sequence: webdriver.TouchSequence = new webdriver.TouchSequence(driver);
 
     sequence = sequence.tap(element);
     sequence = sequence.doubleTap(element);
@@ -116,11 +115,11 @@ function TestTouchSequence() {
 }
 
 function TestAlert() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var alert: webdriver.Alert = driver.switchTo().alert();
+    const alert: webdriver.Alert = driver.switchTo().alert();
 
     alert.accept().then(() => {});
     alert.dismiss().then(() => {});
@@ -129,7 +128,7 @@ function TestAlert() {
 }
 
 function TestBrowser() {
-    var browser: string;
+    let browser: string;
 
     browser = webdriver.Browser.ANDROID;
     browser = webdriver.Browser.CHROME;
@@ -144,7 +143,7 @@ function TestBrowser() {
 }
 
 function TestButton() {
-    var button: string;
+    let button: string;
 
     button = webdriver.Button.LEFT;
     button = webdriver.Button.MIDDLE;
@@ -152,14 +151,14 @@ function TestButton() {
 }
 
 function TestCapabilities() {
-    var capabilities: webdriver.Capabilities = new webdriver.Capabilities();
+    let capabilities: webdriver.Capabilities = new webdriver.Capabilities();
     capabilities = new webdriver.Capabilities(webdriver.Capabilities.chrome());
-    var objCapabilities: any = {};
+    const objCapabilities: any = {};
     objCapabilities[webdriver.Capability.BROWSER_NAME] = webdriver.Browser.PHANTOM_JS;
     capabilities = new webdriver.Capabilities(objCapabilities);
 
-    var anything: any = capabilities.get(webdriver.Capability.SECURE_SSL);
-    var check: boolean = capabilities.has(webdriver.Capability.SECURE_SSL);
+    let anything: any = capabilities.get(webdriver.Capability.SECURE_SSL);
+    const check: boolean = capabilities.has(webdriver.Capability.SECURE_SSL);
     capabilities = capabilities.merge(capabilities);
     capabilities = capabilities.merge(objCapabilities);
     capabilities = capabilities.set(webdriver.Capability.VERSION, { abc: 'def' });
@@ -187,7 +186,7 @@ function TestCapabilities() {
 }
 
 function TestCapability() {
-    var capability: string;
+    let capability: string;
 
     capability = webdriver.Capability.ACCEPT_SSL_CERTS;
     capability = webdriver.Capability.BROWSER_NAME;
@@ -209,24 +208,24 @@ function TestCapability() {
 }
 
 function TestCommand() {
-    var command: webdriver.Command = new webdriver.Command(webdriver.CommandName.ADD_COOKIE);
+    let command: webdriver.Command = new webdriver.Command(webdriver.CommandName.ADD_COOKIE);
 
-    var name: string = command.getName();
-    var param: any = command.getParameter('param');
+    const name: string = command.getName();
+    const param: any = command.getParameter('param');
 
-    var params: any = command.getParameters();
+    const params: any = command.getParameters();
 
     command = command.setParameter('param', 123);
     command = command.setParameters({ param: 123 });
 }
 
 function TestDeferredExecutor() {
-    var promise: webdriver.promise.Promise<webdriver.Executor>;
-    var executor: webdriver.DeferredExecutor = new webdriver.DeferredExecutor(promise);
+    const promise: webdriver.promise.Promise<webdriver.Executor> = {} as any;
+    const executor: webdriver.DeferredExecutor = new webdriver.DeferredExecutor(promise);
 }
 
 function TestCommandName() {
-    var command: string;
+    let command: string;
 
     command = webdriver.CommandName.ACCEPT_ALERT;
     command = webdriver.CommandName.ADD_COOKIE;
@@ -327,21 +326,21 @@ function TestCommandName() {
 }
 
 function TestEventEmitter() {
-    var emitter: webdriver.EventEmitter = new webdriver.EventEmitter();
+    let emitter: webdriver.EventEmitter = new webdriver.EventEmitter();
 
-    var callback = (a: number, b: number, c: number) => {};
+    const callback = (a: number, b: number, c: number) => {};
 
     emitter = emitter.addListener('ABC', callback);
     emitter = emitter.addListener('ABC', callback, this);
 
     emitter.emit('ABC', 1, 2, 3);
 
-    var listeners = emitter.listeners('ABC');
+    const listeners = emitter.listeners('ABC');
     if (listeners[0].oneshot) {
         listeners[0].fn.apply(listeners[0].scope);
     }
-    var length: number = listeners.length;
-    var listenerInfo = listeners[0];
+    const length: number = listeners.length;
+    const listenerInfo = listeners[0];
     if (listenerInfo.oneshot) {
         listenerInfo.fn.apply(listenerInfo.scope, [1, 2, 3]);
     }
@@ -359,7 +358,7 @@ function TestEventEmitter() {
 }
 
 function TestKey() {
-    var key: string;
+    let key: string;
 
     key = webdriver.Key.ADD;
     key = webdriver.Key.ALT;
@@ -424,13 +423,13 @@ function TestKey() {
 }
 
 function TestBy() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var locator: webdriver.By = new webdriver.By('class name', 'class');
+    let locator: webdriver.By = new webdriver.By('class name', 'class');
 
-    var str: string = locator.toString();
+    const str: string = locator.toString();
 
     locator = webdriver.By.className('class');
     locator = webdriver.By.css('css');
@@ -442,9 +441,9 @@ function TestBy() {
     locator = webdriver.By.xpath('xpath');
 
     // Can import 'By' without import declarations
-    var By = webdriver.By;
+    const By = webdriver.By;
 
-    var locatorHash: webdriver.ByHash;
+    let locatorHash: webdriver.ByHash;
     locatorHash = { className: 'class' };
     locatorHash = { css: 'css' };
     locatorHash = { id: 'id' };
@@ -458,53 +457,53 @@ function TestBy() {
 }
 
 function TestSession() {
-    var session: webdriver.Session = new webdriver.Session('ABC', webdriver.Capabilities.android());
-    var capabilitiesObj: any = {};
+    let session: webdriver.Session = new webdriver.Session('ABC', webdriver.Capabilities.android());
+    const capabilitiesObj: any = {};
     capabilitiesObj[webdriver.Capability.BROWSER_NAME] = webdriver.Browser.ANDROID;
     capabilitiesObj[webdriver.Capability.PLATFORM] = 'ANDROID';
     session = new webdriver.Session('ABC', capabilitiesObj);
 
-    var capabilities: webdriver.Capabilities = session.getCapabilities();
-    var capability: any = session.getCapability(webdriver.Capability.BROWSER_NAME);
-    var id: string = session.getId();
-    var data: string = session.toJSON();
+    const capabilities: webdriver.Capabilities = session.getCapabilities();
+    const capability: any = session.getCapability(webdriver.Capability.BROWSER_NAME);
+    const id: string = session.getId();
+    const data: string = session.toJSON();
 }
 
 function TestUnhandledAlertError() {
-    var someFunc = (error: webdriver.UnhandledAlertError) => {
-        var baseError: Error = error;
-        var str: string = error.getAlertText();
+    const someFunc = (error: webdriver.UnhandledAlertError) => {
+        const baseError: Error = error;
+        let str: string = error.getAlertText();
         str = error.toString();
     };
 }
 
 function TestWebDriverFileDetector() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
+    const fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
 
     fileDetector.handleFile(driver, 'path/to/file').then((path: string) => {});
 }
 
 function TestWebDriverLogs() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var logs: webdriver.Logs = new webdriver.Logs(driver);
+    const logs: webdriver.Logs = new webdriver.Logs(driver);
 
     logs.get(webdriver.logging.Type.BROWSER).then((entries: webdriver.logging.Entry[]) => {});
     logs.getAvailableLogTypes().then((types: string[]) => {});
 }
 
 function TestWebDriverNavigation() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var navigation: webdriver.Navigation = new webdriver.Navigation(driver);
+    const navigation: webdriver.Navigation = new webdriver.Navigation(driver);
 
     navigation.back().then(() => {});
     navigation.forward().then(() => {});
@@ -513,12 +512,12 @@ function TestWebDriverNavigation() {
 }
 
 function TestWebDriverOptions() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var options: webdriver.Options = new webdriver.Options(driver);
-    var promise: webdriver.promise.Promise<void>;
+    const options: webdriver.Options = new webdriver.Options(driver);
+    let promise: webdriver.promise.Promise<void>;
 
     // Add Cookie
     promise = options.addCookie('name', 'value');
@@ -533,33 +532,33 @@ function TestWebDriverOptions() {
     options.getCookie('name').then((cookies: webdriver.IWebDriverOptionsCookie) => {});
     options.getCookies().then((cookies: webdriver.IWebDriverOptionsCookie[]) => {});
 
-    var logs: webdriver.Logs = options.logs();
-    var timeouts: webdriver.Timeouts = options.timeouts();
-    var window: webdriver.Window = options.window();
+    const logs: webdriver.Logs = options.logs();
+    const timeouts: webdriver.Timeouts = options.timeouts();
+    const window: webdriver.Window = options.window();
 }
 
 function TestWebDriverTargetLocator() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var locator: webdriver.TargetLocator = new webdriver.TargetLocator(driver);
-    var promise: webdriver.promise.Promise<void>;
+    const locator: webdriver.TargetLocator = new webdriver.TargetLocator(driver);
+    let promise: webdriver.promise.Promise<void>;
 
-    var element: webdriver.WebElement = locator.activeElement();
-    var alert: webdriver.Alert = locator.alert();
+    const element: webdriver.WebElement = locator.activeElement();
+    const alert: webdriver.Alert = locator.alert();
     promise = locator.defaultContent();
     promise = locator.frame(1);
     promise = locator.window('nameOrHandle');
 }
 
 function TestWebDriverTimeouts() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var timeouts: webdriver.Timeouts = new webdriver.Timeouts(driver);
-    var promise: webdriver.promise.Promise<void>;
+    const timeouts: webdriver.Timeouts = new webdriver.Timeouts(driver);
+    let promise: webdriver.promise.Promise<void>;
 
     promise = timeouts.implicitlyWait(123);
     promise = timeouts.pageLoadTimeout(123);
@@ -567,14 +566,14 @@ function TestWebDriverTimeouts() {
 }
 
 function TestWebDriverWindow() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var window: webdriver.Window = new webdriver.Window(driver);
-    var locationPromise: webdriver.promise.Promise<webdriver.ILocation>;
-    var sizePromise: webdriver.promise.Promise<webdriver.ISize>;
-    var voidPromise: webdriver.promise.Promise<void>;
+    const window: webdriver.Window = new webdriver.Window(driver);
+    let locationPromise: webdriver.promise.Promise<webdriver.ILocation>;
+    let sizePromise: webdriver.promise.Promise<webdriver.ISize>;
+    let voidPromise: webdriver.promise.Promise<void>;
 
     locationPromise = window.getPosition();
     sizePromise = window.getSize();
@@ -584,26 +583,26 @@ function TestWebDriverWindow() {
 }
 
 function TestWebDriver() {
-    var session: webdriver.Session = new webdriver.Session('ABC', webdriver.Capabilities.android());
-    var sessionPromise: webdriver.promise.Promise<webdriver.Session>;
-    var executor: webdriver.Executor = executors.createExecutor('http://someserver');
-    var flow: webdriver.promise.ControlFlow = new webdriver.promise.ControlFlow();
-    var driver: webdriver.WebDriver = new webdriver.WebDriver(session, executor);
+    const session: webdriver.Session = new webdriver.Session('ABC', webdriver.Capabilities.android());
+    const sessionPromise: webdriver.promise.Promise<webdriver.Session> = {} as any;
+    const executor: webdriver.Executor = executors.createExecutor('http://someserver');
+    let flow: webdriver.promise.ControlFlow = new webdriver.promise.ControlFlow();
+    let driver: webdriver.WebDriver = new webdriver.WebDriver(session, executor);
     driver = new webdriver.WebDriver(session, executor, flow);
     driver = new webdriver.WebDriver(sessionPromise, executor);
     driver = new webdriver.WebDriver(sessionPromise, executor, flow);
 
-    var voidPromise: webdriver.promise.Promise<void>;
-    var stringPromise: webdriver.promise.Promise<string>;
-    var booleanPromise: webdriver.promise.Promise<boolean>;
+    let voidPromise: webdriver.promise.Promise<void>;
+    let stringPromise: webdriver.promise.Promise<string>;
+    let booleanPromise: webdriver.promise.Promise<boolean>;
 
-    var actions: webdriver.ActionSequence = driver.actions();
-    var touchActions: webdriver.TouchSequence = driver.touchActions();
+    const actions: webdriver.ActionSequence = driver.actions();
+    const touchActions: webdriver.TouchSequence = driver.touchActions();
 
     // call
     stringPromise = driver.call<string>(() => 'value');
     stringPromise = driver.call<string>(() => stringPromise);
-    stringPromise = driver.call<string>(() => { var d: any = this; return 'value'; }, driver);
+    stringPromise = driver.call<string>(() => { const d: any = this; return 'value'; }, driver);
     stringPromise = driver.call<string>((a: number) => 'value', driver, 1);
 
     voidPromise = driver.close();
@@ -622,7 +621,7 @@ function TestWebDriver() {
     stringPromise = driver.executeScript<string>((a: number) => {}, 1);
 
     // findElement
-    var element: webdriver.WebElement;
+    let element: webdriver.WebElement;
     element = driver.findElement(webdriver.By.id('ABC'));
     element = driver.findElement(webdriver.By.js('function(){}'));
 
@@ -642,11 +641,11 @@ function TestWebDriver() {
     booleanPromise = driver.isElementPresent(webdriver.By.className('ABC'));
     booleanPromise = driver.isElementPresent(webdriver.By.js('function(){}'));
 
-    var options: webdriver.Options = driver.manage();
-    var navigation: webdriver.Navigation = driver.navigate();
-    var locator: webdriver.TargetLocator = driver.switchTo();
+    const options: webdriver.Options = driver.manage();
+    const navigation: webdriver.Navigation = driver.navigate();
+    const locator: webdriver.TargetLocator = driver.switchTo();
 
-    var fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
+    const fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
     driver.setFileDetector(fileDetector);
 
     voidPromise = driver.quit();
@@ -654,7 +653,7 @@ function TestWebDriver() {
     voidPromise = driver.sleep(123);
     stringPromise = driver.takeScreenshot();
 
-    var booleanCondition: webdriver.until.Condition<boolean>;
+    const booleanCondition: webdriver.until.Condition<boolean> = {} as any;
     booleanPromise = driver.wait(booleanPromise);
     booleanPromise = driver.wait(booleanCondition);
     booleanPromise = driver.wait((driver: webdriver.WebDriver) => true);
@@ -668,24 +667,24 @@ function TestWebDriver() {
 }
 
 function TestSerializable() {
-    var serializable: webdriver.Serializable<string>;
-    var serial: string | webdriver.promise.IThenable<string> = serializable.serialize();
+    const serializable: webdriver.Serializable<string> = {} as any;
+    const serial: string | webdriver.promise.IThenable<string> = serializable.serialize();
 }
 
 function TestWebElement() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    let driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var promise: webdriver.promise.Promise<string>;
-    var element: webdriver.WebElement;
+    const promise: webdriver.promise.Promise<string> = {} as any;
+    let element: webdriver.WebElement;
 
     element = new webdriver.WebElement(driver, 'elementId');
     element = new webdriver.WebElement(driver, promise);
 
-    var voidPromise: webdriver.promise.Promise<void>;
-    var stringPromise: webdriver.promise.Promise<string>;
-    var booleanPromise: webdriver.promise.Promise<boolean>;
+    let voidPromise: webdriver.promise.Promise<void>;
+    let stringPromise: webdriver.promise.Promise<string>;
+    let booleanPromise: webdriver.promise.Promise<boolean>;
 
     voidPromise = element.clear();
     voidPromise = element.click();
@@ -720,16 +719,16 @@ function TestWebElement() {
 }
 
 function TestWebElementPromise() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var elementPromise: webdriver.WebElementPromise = driver.findElement(webdriver.By.id('id'));
+    const elementPromise: webdriver.WebElementPromise = driver.findElement(webdriver.By.id('id'));
 
     elementPromise.cancel();
     elementPromise.cancel('reason');
 
-    var bool: boolean = elementPromise.isPending();
+    const bool: boolean = elementPromise.isPending();
 
     elementPromise.then();
     elementPromise.then((element: webdriver.WebElement) => {});
@@ -742,11 +741,11 @@ function TestWebElementPromise() {
 }
 
 function TestLogging() {
-    var preferences: webdriver.logging.Preferences = new webdriver.logging.Preferences();
+    const preferences: webdriver.logging.Preferences = new webdriver.logging.Preferences();
     preferences.setLevel(webdriver.logging.Type.BROWSER, webdriver.logging.Level.ALL);
-    var prefs: any = preferences.toJSON();
+    const prefs: any = preferences.toJSON();
 
-    var level: webdriver.logging.Level = webdriver.logging.getLevel('OFF');
+    let level: webdriver.logging.Level = webdriver.logging.getLevel('OFF');
     level = webdriver.logging.getLevel(1);
 
     level = webdriver.logging.Level.ALL;
@@ -756,10 +755,10 @@ function TestLogging() {
     level = webdriver.logging.Level.SEVERE;
     level = webdriver.logging.Level.WARNING;
 
-    var name: string = level.name;
-    var value: number = level.value;
+    const name: string = level.name;
+    const value: number = level.value;
 
-    var type: string;
+    let type: string;
     type = webdriver.logging.Type.BROWSER;
     type = webdriver.logging.Type.CLIENT;
     type = webdriver.logging.Type.DRIVER;
@@ -768,7 +767,7 @@ function TestLogging() {
 }
 
 function TestLoggingEntry() {
-    var entry: webdriver.logging.Entry;
+    let entry: webdriver.logging.Entry;
 
     entry = new webdriver.logging.Entry(webdriver.logging.Level.ALL, 'ABC');
     entry = new webdriver.logging.Entry('ALL', 'ABC');
@@ -777,23 +776,22 @@ function TestLoggingEntry() {
     entry = new webdriver.logging.Entry(webdriver.logging.Level.ALL, 'ABC', 123, webdriver.logging.Type.BROWSER);
     entry = new webdriver.logging.Entry('ALL', 'ABC', 123, webdriver.logging.Type.BROWSER);
 
-    var entryObj: any = entry.toJSON();
+    const entryObj: any = entry.toJSON();
 
-    var message: string = entry.message;
-    var timestamp: number = entry.timestamp;
-    var type: string = entry.type;
+    const message: string = entry.message;
+    const timestamp: number = entry.timestamp;
+    const type: string = entry.type;
 }
 
 function TestPromiseModule() {
-    var cancellationError: webdriver.promise.CancellationError = new webdriver.promise.CancellationError();
+    let cancellationError: webdriver.promise.CancellationError = new webdriver.promise.CancellationError();
     cancellationError = new webdriver.promise.CancellationError('message');
-    var str: string = cancellationError.message;
+    let str: string = cancellationError.message;
     str = cancellationError.name;
 
-    var stringPromise: webdriver.promise.Promise<string>;
-    var numberPromise: webdriver.promise.Promise<number>;
-    var booleanPromise: webdriver.promise.Promise<boolean>;
-    var voidPromise: webdriver.promise.Promise<void>;
+    let stringPromise: webdriver.promise.Promise<string>;
+    let numberPromise: webdriver.promise.Promise<number>;
+    let voidPromise: webdriver.promise.Promise<void>;
 
     webdriver.promise.all([stringPromise]).then((values: string[]) => {});
 
@@ -811,7 +809,7 @@ function TestPromiseModule() {
     webdriver.promise.consume((a: number, b: number, c: number) => 5, this, 1, 2, 3)
         .then((value: number) => {});
 
-    var numbersPromise: webdriver.promise.Promise<number[]> = webdriver.promise.filter([1, 2, 3], (element: number, type: any, index: number, arr: number[]) => {
+    let numbersPromise: webdriver.promise.Promise<number[]> = webdriver.promise.filter([1, 2, 3], (element: number, type: any, index: number, arr: number[]) => {
         return true;
     });
     numbersPromise = webdriver.promise.filter([1, 2, 3], (element: number, type: any, index: number, arr: number[]) => {
@@ -837,11 +835,11 @@ function TestPromiseModule() {
         return true;
     }, this);
 
-    var flow: webdriver.promise.ControlFlow = webdriver.promise.controlFlow();
+    const flow: webdriver.promise.ControlFlow = webdriver.promise.controlFlow();
 
     stringPromise = webdriver.promise.createFlow<string>((newFlow: webdriver.promise.ControlFlow) => 'ABC');
 
-    var deferred: webdriver.promise.Deferred<string>;
+    let deferred: webdriver.promise.Deferred<string>;
     deferred = webdriver.promise.defer();
     deferred = webdriver.promise.defer();
 
@@ -857,8 +855,8 @@ function TestPromiseModule() {
 
     stringPromise = webdriver.promise.fullyResolved('abc');
 
-    var bool: boolean = webdriver.promise.isGenerator(() => {});
-    var isPromise: boolean = webdriver.promise.isPromise('ABC');
+    const bool: boolean = webdriver.promise.isGenerator(() => {});
+    const isPromise: boolean = webdriver.promise.isPromise('ABC');
 
     stringPromise = webdriver.promise.rejected('{a: 123}');
 
@@ -868,18 +866,18 @@ function TestPromiseModule() {
 }
 
 function TestUntilModule() {
-    var driver: webdriver.WebDriver = new webdriver.Builder().
+    const driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var conditionB: webdriver.until.Condition<boolean> = new webdriver.until.Condition<boolean>('message', (driver: webdriver.WebDriver) => true);
-    var conditionBBase: webdriver.until.Condition<boolean> = conditionB;
-    var conditionWebElement: webdriver.until.Condition<webdriver.WebElement>;
-    var conditionWebElements: webdriver.until.Condition<webdriver.WebElement[]>;
+    let conditionB: webdriver.until.Condition<boolean> = new webdriver.until.Condition<boolean>('message', (driver: webdriver.WebDriver) => true);
+    const conditionBBase: webdriver.until.Condition<boolean> = conditionB;
+    let conditionWebElement: webdriver.until.Condition<webdriver.WebElement>;
+    let conditionWebElements: webdriver.until.Condition<webdriver.WebElement[]>;
 
     conditionB = webdriver.until.ableToSwitchToFrame(5);
-    var conditionAlert: webdriver.until.Condition<webdriver.Alert> = webdriver.until.alertIsPresent();
-    var el: webdriver.WebElement = driver.findElement(webdriver.By.id('id'));
+    const conditionAlert: webdriver.until.Condition<webdriver.Alert> = webdriver.until.alertIsPresent();
+    const el: webdriver.WebElement = driver.findElement(webdriver.By.id('id'));
     conditionB = webdriver.until.elementIsDisabled(el);
     conditionB = webdriver.until.elementIsEnabled(el);
     conditionB = webdriver.until.elementIsNotSelected(el);
@@ -899,31 +897,31 @@ function TestUntilModule() {
 }
 
 function TestControlFlow() {
-    var flow: webdriver.promise.ControlFlow;
+    let flow: webdriver.promise.ControlFlow;
     flow = new webdriver.promise.ControlFlow();
 
-    var emitter: webdriver.EventEmitter = flow;
+    const emitter: webdriver.EventEmitter = flow;
 
-    var eventType: string;
+    let eventType: string;
 
     eventType = webdriver.promise.ControlFlow.EventType.IDLE;
     eventType = webdriver.promise.ControlFlow.EventType.RESET;
     eventType = webdriver.promise.ControlFlow.EventType.SCHEDULE_TASK;
     eventType = webdriver.promise.ControlFlow.EventType.UNCAUGHT_EXCEPTION;
 
-    var stringPromise: webdriver.promise.Promise<string>;
+    let stringPromise: webdriver.promise.Promise<string>;
     stringPromise = flow.execute(() => 'value');
     stringPromise = flow.execute(() => stringPromise);
     stringPromise = flow.execute(() => stringPromise, 'Description');
 
-    var schedule: string;
+    let schedule: string;
     schedule = flow.toString();
     schedule = flow.getSchedule();
     schedule = flow.getSchedule(true);
 
     flow.reset();
 
-    var voidPromise: webdriver.promise.Promise<void> = flow.timeout(123);
+    let voidPromise: webdriver.promise.Promise<void> = flow.timeout(123);
     voidPromise = flow.timeout(123, 'Description');
 
     stringPromise = flow.wait(stringPromise);
@@ -934,12 +932,12 @@ function TestControlFlow() {
 }
 
 function TestDeferred() {
-    var deferred: webdriver.promise.Deferred<string>;
+    let deferred: webdriver.promise.Deferred<string>;
 
     deferred = new webdriver.promise.Deferred<string>();
     deferred = new webdriver.promise.Deferred<string>(new webdriver.promise.ControlFlow());
 
-    var promise: webdriver.promise.Promise<string> = deferred.promise;
+    const promise: webdriver.promise.Promise<string> = deferred.promise;
 
     deferred.errback(new Error('Error'));
     deferred.errback('Error');
@@ -950,15 +948,15 @@ function TestDeferred() {
 }
 
 function TestPromiseClass() {
-    var controlFlow: webdriver.promise.ControlFlow;
-    var promise: webdriver.promise.Promise<string>;
-    promise = new webdriver.promise.Promise<string>((resolve: (value: string) => void, reject: () => void) => {});
-    promise = new webdriver.promise.Promise<string>((resolve: (value: webdriver.promise.Promise<string>) => void, reject: () => void) => {});
-    promise = new webdriver.promise.Promise<string>((resolve: (value: string) => void, reject: () => void) => {}, controlFlow);
+    const controlFlow: webdriver.promise.ControlFlow = {} as any;
+    let promise: webdriver.promise.Promise<string>;
+    promise = new webdriver.promise.Promise<string>((resolve: (value: string) => void, reject: (reason: any) => void) => {});
+    promise = new webdriver.promise.Promise<string>((resolve: (value: webdriver.promise.Promise<string>) => void, reject: (reason: any) => void) => {});
+    promise = new webdriver.promise.Promise<string>((resolve: (value: string) => void, reject: (readon: any) => void) => {}, controlFlow);
 
     promise.cancel('Abort');
 
-    var isPending: boolean = promise.isPending();
+    const isPending: boolean = promise.isPending();
 
     promise = promise.then();
     promise = promise.then((a: string) => 'cde');
@@ -971,13 +969,13 @@ function TestPromiseClass() {
 }
 
 function TestThenableClass() {
-    var thenable: webdriver.promise.Promise<string> = new webdriver.promise.Promise<string>((resolve, reject) => {
+    let thenable: webdriver.promise.Promise<string> = new webdriver.promise.Promise<string>((resolve, reject) => {
         resolve('a');
     });
 
     thenable.cancel('Abort');
 
-    var isPending: boolean = thenable.isPending();
+    const isPending: boolean = thenable.isPending();
 
     thenable = thenable.then((a: string) => 'cde');
     thenable = thenable.then((a: string) => 'cde', (e: any) => {});
@@ -989,7 +987,7 @@ function TestThenableClass() {
 }
 
 function TestErrorCode() {
-    var errorCode: number;
+    let errorCode: number;
 
     errorCode = new webdriver.error.ElementNotSelectableError().code();
     errorCode = new webdriver.error.ElementNotVisibleError().code();
@@ -1018,8 +1016,8 @@ function TestErrorCode() {
 }
 
 async function TestAsyncAwaitable() {
-    var thenable: webdriver.promise.Promise<string> = new webdriver.promise.Promise<string>((resolve, reject) => resolve('foo'));
-    var str: string = await thenable;
+    const thenable: webdriver.promise.Promise<string> = new webdriver.promise.Promise<string>((resolve, reject) => resolve('foo'));
+    const str: string = await thenable;
 }
 
 function TestTestingModule() {
diff --git a/types/selenium-webdriver/v2/test/remote.ts b/types/selenium-webdriver/v2/test/remote.ts
index 08722d5b1f..a783101290 100644
--- a/types/selenium-webdriver/v2/test/remote.ts
+++ b/types/selenium-webdriver/v2/test/remote.ts
@@ -1,5 +1,3 @@
-/* tslint:disable */
-
 import * as remote from "selenium-webdriver/remote";
 import * as webdriver from "selenium-webdriver";
 
diff --git a/types/selenium-webdriver/v2/testing.d.ts b/types/selenium-webdriver/v2/testing.d.ts
index ec8e7123d7..34d72e4627 100644
--- a/types/selenium-webdriver/v2/testing.d.ts
+++ b/types/selenium-webdriver/v2/testing.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /**
 * Registers a new test suite.
 * @param name The suite name.
diff --git a/types/selenium-webdriver/v2/tslint.json b/types/selenium-webdriver/v2/tslint.json
index 65c83fb1e3..3f8f8da0ad 100644
--- a/types/selenium-webdriver/v2/tslint.json
+++ b/types/selenium-webdriver/v2/tslint.json
@@ -1,6 +1,23 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "dt-header": false
+        // TODOs
+        "ban-types": false,
+        "callable-types": false,
+        "dt-header": false,
+        "interface-name": false,
+        "jsdoc-format": false,
+        "no-any-union": false,
+        "no-consecutive-blank-lines": false,
+        "no-empty-interface": false,
+        "no-padding": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-var-keyword": false,
+        "semicolon": false,
+        "strict-export-declare-modifiers": false,
+        "unified-signatures": false
     }
 }
diff --git a/types/semantic-ui-form/global.d.ts b/types/semantic-ui-form/global.d.ts
index 0bc8bf9b66..8e5b2c20b8 100644
--- a/types/semantic-ui-form/global.d.ts
+++ b/types/semantic-ui-form/global.d.ts
@@ -14,6 +14,10 @@ declare namespace SemanticUI {
          * Returns true/false whether a form passes its validation rules
          */
         (behavior: 'is valid'): boolean;
+        /**
+         * Returns true/false whether a field passes its validation rules
+         */
+        (behavior: 'is valid', field: string): boolean;
         /**
          * Adds rule to existing rules for field
          * @since 2.2.11
diff --git a/types/semantic-ui-form/semantic-ui-form-tests.ts b/types/semantic-ui-form/semantic-ui-form-tests.ts
index 76b9b95968..f17ca33112 100644
--- a/types/semantic-ui-form/semantic-ui-form-tests.ts
+++ b/types/semantic-ui-form/semantic-ui-form-tests.ts
@@ -1,5 +1,3 @@
-/* tslint:disable:only-arrow-functions */
-
 function test_form_static() {
     $.fn.form.settings.error!.method = 'method';
     $.fn.form.settings.namespace = 'namespace';
@@ -14,6 +12,7 @@ function test_form() {
     const selector = '.ui.form';
     $(selector).form('submit'); // $ExpectType JQuery<HTMLElement>
     $(selector).form('is valid'); // $ExpectType boolean
+    $(selector).form('is valid', 'field'); // $ExpectType boolean
     $(selector).form('add rule', 'field', 'rule'); // $ExpectType JQuery<HTMLElement>
     $(selector).form('add rule', 'field', ['rule1', 'rule2']); // $ExpectType JQuery<HTMLElement>
     // $ExpectType JQuery<HTMLElement>
@@ -216,7 +215,7 @@ function adding_rules_programmatically() {
     {
         // lets toggle some validation based on button
         $('.add.example .ui.positive.button')
-            .on('click', function() {
+            .on('click', () => {
                 $('.add.example .ui.form')
                 // adding longform
                     .form('add rule', 'gender', {
@@ -233,7 +232,7 @@ function adding_rules_programmatically() {
     }
     {
         $('.add.example .ui.negative.button')
-            .on('click', function() {
+            .on('click', () => {
                 $('.add.example .ui.form')
                 // removing multiple at once
                     .form('remove fields', ['gender', 'password']);
diff --git a/types/semantic-ui/index.d.ts b/types/semantic-ui/index.d.ts
index e36ff8c748..00b2c7c273 100644
--- a/types/semantic-ui/index.d.ts
+++ b/types/semantic-ui/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://semantic-ui.com/
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/semaphore/index.d.ts b/types/semaphore/index.d.ts
index 5733785782..3164f95d9e 100644
--- a/types/semaphore/index.d.ts
+++ b/types/semaphore/index.d.ts
@@ -1,10 +1,9 @@
-// Type definitions for semaphore v1.0.3
+// Type definitions for semaphore v1.1.0
 // Project: https://github.com/abrkn/semaphore.js
 // Definitions by: Matt Frantz <https://github.com/mhfrantz>
+//                 Arturas Molcanovas <https://github.com/Alorel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
 declare function semaphore(capacity?: number): semaphore.Semaphore;
 
 declare namespace semaphore {
@@ -16,6 +15,8 @@ declare namespace semaphore {
     interface Semaphore {
         capacity: number;
 
+        available(n: number): boolean;
+
         take(task: Task): void;
         take(n: number, task: Task): void;
 
diff --git a/types/semaphore/semaphore-tests.ts b/types/semaphore/semaphore-tests.ts
index c3d53990fc..5770a9ba15 100644
--- a/types/semaphore/semaphore-tests.ts
+++ b/types/semaphore/semaphore-tests.ts
@@ -10,3 +10,5 @@ function task() {
 sem.take(task);
 sem.take(2, task);
 sem.leave(2);
+
+const available: boolean = sem.available(2);
diff --git a/types/semaphore/tslint.json b/types/semaphore/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/semaphore/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sencha_touch/tslint.json b/types/sencha_touch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sencha_touch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/send/index.d.ts b/types/send/index.d.ts
index 6c38861c4f..f491817c16 100644
--- a/types/send/index.d.ts
+++ b/types/send/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/pillarjs/send
 // Definitions by: Mike Jerred <https://github.com/MikeJerred>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/send/tslint.json b/types/send/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/send/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/seneca/tslint.json b/types/seneca/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/seneca/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sequelize-fixtures/tslint.json b/types/sequelize-fixtures/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sequelize-fixtures/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index f1dc66fce5..2db7dcfe11 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sequelize 4.0.0
+// Type definitions for Sequelize 4.27.0
 // Project: http://sequelizejs.com
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
@@ -7,6 +7,8 @@
 //                 Patsakol Tangjitcharoenchai <https://github.com/kukoo1>
 //                 Sebastien Bramille <https://github.com/oktapodia>
 //                 Nick Mueller <https://github.com/morpheusxaut>
+//                 Philippe D'Alva <https://github.com/TitaneBoy>
+//                 Carven Zhang <https://github.com/zjy01>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -17,6 +19,7 @@
 
 import * as _ from "lodash";
 import * as Promise from "bluebird";
+import * as cls from "continuation-local-storage"
 
 declare namespace sequelize {
 
@@ -1328,7 +1331,13 @@ declare namespace sequelize {
          * A string or a data type to represent the identifier in the table
          */
         keyType?: DataTypeAbstract;
-
+        /**
+         * A string to represent the name of the field to use as the key for an 1 to many association in the source table. 
+         * 
+         * @see http://docs.sequelizejs.com/class/lib/model.js~Model.html#static-method-hasMany
+         * @see https://github.com/sequelize/sequelize/blob/b4fd46426db9cdbb97074bea121203d565e4195d/lib/associations/has-many.js#L81
+         */
+        sourceKey?: string;
     }
 
     /**
@@ -1694,6 +1703,34 @@ declare namespace sequelize {
 
     }
 
+    interface DataTypeTinyInt extends DataTypeAbstractNumber<DataTypeTinyInt> {
+
+        /**
+         * Length of the number field.
+         */
+        (options?: { length: number }): DataTypeTinyInt;
+        (length: number): DataTypeTinyInt;
+
+    }
+    interface DataTypeSmallInt extends DataTypeAbstractNumber<DataTypeSmallInt> {
+
+        /**
+         * Length of the number field.
+         */
+        (options?: { length: number }): DataTypeSmallInt;
+        (length: number): DataTypeSmallInt;
+
+    }
+    interface DataTypeMediumInt extends DataTypeAbstractNumber<DataTypeMediumInt> {
+
+        /**
+         * Length of the number field.
+         */
+        (options?: { length: number }): DataTypeMediumInt;
+        (length: number): DataTypeMediumInt;
+
+    }
+
     interface DataTypeBigInt extends DataTypeAbstractNumber<DataTypeBigInt> {
 
         /**
@@ -1885,6 +1922,9 @@ declare namespace sequelize {
         CHAR: DataTypeChar;
         TEXT: DataTypeText;
         NUMBER: DataTypeNumber;
+        TINYINT: DataTypeTinyInt;
+        SMALLINT: DataTypeSmallInt;
+        MEDIUMINT: DataTypeMediumInt;
         INTEGER: DataTypeInteger;
         BIGINT: DataTypeBigInt;
         FLOAT: DataTypeFloat;
@@ -3108,7 +3148,7 @@ declare namespace sequelize {
      * typesafety, but there is no way to pass the tests if we just remove it.
      */
     type WhereOptions<T> = {
-        [P in keyof T]?: string | number | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | Array<string | number> | null;
+        [P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | Array<string | number> | null;
     };
 
     /**
@@ -5507,6 +5547,13 @@ declare namespace sequelize {
          */
         quoteIdentifiers?: boolean;
 
+        /**
+         * The version of the database. Most times, this is automatically detected and is not needed.
+         *
+         * Defaults to 0
+         */
+        databaseVersion?: number;
+
         /**
          * Set the default transaction isolation level. See `Sequelize.Transaction.ISOLATION_LEVELS` for possible
          * options.
@@ -5739,6 +5786,7 @@ declare namespace sequelize {
          * Provide access to continuation-local-storage (http://docs.sequelizejs.com/en/latest/api/sequelize/#transactionoptions-promise)
          */
         cls: any;
+        useCLS(namespace:cls.Namespace): Sequelize;
 
     }
 
@@ -6055,7 +6103,7 @@ declare namespace sequelize {
          * Normally this is done on process exit, so you only need to call this method if you are creating multiple
          * instances, and want to garbage collect some of them.
          */
-        close(): void;
+        close(): Promise<void>;
 
         /**
          * Returns the database version
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index a04140e508..29e9252fe4 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -491,6 +491,33 @@ Sequelize.UUID;
 Sequelize.UUIDV1;
 Sequelize.UUIDV4;
 Sequelize.NOW;
+Sequelize.TINYINT;
+Sequelize.TINYINT.UNSIGNED;
+Sequelize.TINYINT.UNSIGNED.ZEROFILL;
+Sequelize.TINYINT( 11 );
+Sequelize.TINYINT( { length : 11 } );
+Sequelize.TINYINT( 11 ).UNSIGNED;
+Sequelize.TINYINT( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.TINYINT( 11 ).ZEROFILL;
+Sequelize.TINYINT( 11 ).ZEROFILL.UNSIGNED;
+Sequelize.SMALLINT;
+Sequelize.SMALLINT.UNSIGNED;
+Sequelize.SMALLINT.UNSIGNED.ZEROFILL;
+Sequelize.SMALLINT( 11 );
+Sequelize.SMALLINT( { length : 11 } );
+Sequelize.SMALLINT( 11 ).UNSIGNED;
+Sequelize.SMALLINT( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.SMALLINT( 11 ).ZEROFILL;
+Sequelize.SMALLINT( 11 ).ZEROFILL.UNSIGNED;
+Sequelize.MEDIUMINT;
+Sequelize.MEDIUMINT.UNSIGNED;
+Sequelize.MEDIUMINT.UNSIGNED.ZEROFILL;
+Sequelize.MEDIUMINT( 11 );
+Sequelize.MEDIUMINT( { length : 11 } );
+Sequelize.MEDIUMINT( 11 ).UNSIGNED;
+Sequelize.MEDIUMINT( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.MEDIUMINT( 11 ).ZEROFILL;
+Sequelize.MEDIUMINT( 11 ).ZEROFILL.UNSIGNED;
 Sequelize.INTEGER;
 Sequelize.INTEGER.UNSIGNED;
 Sequelize.INTEGER.UNSIGNED.ZEROFILL;
@@ -1439,7 +1466,7 @@ s.define( 'profile', {
 s.define( 'ScopeMe', {
     username : Sequelize.STRING,
     email : Sequelize.STRING,
-    access_level : Sequelize.INTEGER,
+    access_level : Sequelize.TINYINT,
     other_value : Sequelize.INTEGER
 }, {
     defaultScope : {
diff --git a/types/sequelize/tslint.json b/types/sequelize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sequelize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sequelize/v3/tslint.json b/types/sequelize/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sequelize/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sequencify/index.d.ts b/types/sequencify/index.d.ts
new file mode 100644
index 0000000000..526baa8f54
--- /dev/null
+++ b/types/sequencify/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for sequencify 0.1
+// Project: https://github.com/robrich/sequencify
+// Definitions by: Nicolas Penin <https://github.com/npenin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Definition file started by dts-gen
+// TypeScript Version: 2.1
+
+export = sequencify;
+
+declare namespace sequencify {
+    interface Task {
+        name: string;
+        dep: string[];
+    }
+
+    interface TaskMap {
+        [name: string]: Task;
+    }
+}
+
+declare function sequencify<T extends sequencify.TaskMap>(tasks: T, names: Array<keyof T>, results: Array<keyof T>, nest?: string[]): void;
diff --git a/types/sequencify/sequencify-tests.ts b/types/sequencify/sequencify-tests.ts
new file mode 100644
index 0000000000..26506d7fbd
--- /dev/null
+++ b/types/sequencify/sequencify-tests.ts
@@ -0,0 +1,34 @@
+/* Add tests for your definition file here */
+
+/// <reference types="node" />
+
+import sequencify = require('sequencify');
+
+const items: sequencify.TaskMap = {
+    a: {
+        name: 'a',
+        dep: []
+        // other properties as needed
+    },
+    b: {
+        name: 'b',
+        dep: ['a']
+    },
+    c: {
+        name: 'c',
+        dep: ['a']
+    },
+    d: {
+        name: 'd',
+        dep: ['c']
+    },
+};
+
+const names = ['d', 'b', 'c', 'a']; // The names of the items you want arranged, need not be all
+
+const results: string[] = [];
+
+sequencify(items, names, results);
+
+console.log(results);
+// ['a','b','c','d'];
diff --git a/types/sequencify/tsconfig.json b/types/sequencify/tsconfig.json
new file mode 100644
index 0000000000..1f6ed9d033
--- /dev/null
+++ b/types/sequencify/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "files": [
+        "index.d.ts",
+        "sequencify-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "lib": [
+            "es6"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/sequencify/tslint.json b/types/sequencify/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/sequencify/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/sequester/tslint.json b/types/sequester/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sequester/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/serialize-javascript/index.d.ts b/types/serialize-javascript/index.d.ts
index deb4331961..b0331a3d03 100644
--- a/types/serialize-javascript/index.d.ts
+++ b/types/serialize-javascript/index.d.ts
@@ -9,7 +9,7 @@ declare namespace serializeJavascript {
          * This option is the same as the space argument that can be passed to JSON.stringify.
          * It can be used to add whitespace and indentation to the serialized output to make it more readable.
          */
-        space?: string | number | undefined;
+        space?: string | number;
         /**
          * This option is a signal to serialize() that the object being serialized does not contain any function or regexps values.
          * This enables a hot-path that allows serialization to be over 3x faster.
@@ -21,9 +21,9 @@ declare namespace serializeJavascript {
 
 /**
  * Serialize JavaScript to a superset of JSON that includes regular expressions and functions.
- * @param {any} input data to serialize
- * @param {serializeJavascript.SerializeJSOptions} options optional object
- * @returns {string} serialized data
+ * @param input data to serialize
+ * @param options optional object
+ * @returns serialized data
  */
 declare function serializeJavascript(input: any, options?: serializeJavascript.SerializeJSOptions): string;
 export = serializeJavascript;
diff --git a/types/serialport/index.d.ts b/types/serialport/index.d.ts
index 345aa22a24..74a4f90e42 100644
--- a/types/serialport/index.d.ts
+++ b/types/serialport/index.d.ts
@@ -1,45 +1,70 @@
-// Type definitions for serialport 4.0
+// Type definitions for serialport 6.0
 // Project: https://github.com/EmergingTechnologyAdvisors/node-serialport
 // Definitions by: Jeremy Foster <https://github.com/codefoster>
+//                 Andrew Pearson <https://github.com/apearson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="streamjs" />
 
-export = SerialPort;
+import * as Stream from 'stream';
 
-declare class SerialPort extends Stream<any> {
-	// openImmediately already removed in 4.0.7
-	constructor(path: string, options?: SerialPort.options|SerialPort.callback, callback?: SerialPort.callback);
-	isOpen(): boolean;
-	on(event: string, callback?: (data?: any) => void): void;
-	open(callback?: SerialPort.callback): void;
-	write(buffer: any, callback?: (err: any, bytesWritten: number) => void): void;
-	pause(): void;
-	resume(): void;
-	disconnected(err: Error): void;
-	close(callback?: SerialPort.callback): void;
-	flush(callback?: SerialPort.callback): void;
-	set(options: SerialPort.setOptions, callback: SerialPort.callback): void;
-	drain(callback?: SerialPort.callback): void;
-	update(options: SerialPort.updateOptions, callback?: SerialPort.callback): void;
-	static list(callback: (err: any, ports: SerialPort.portConfig[]) => void): void;
-	// https://github.com/EmergingTechnologyAdvisors/node-serialport/blob/4.0.7/lib/parsers.js
-	static parsers: SerialPort.parsers;
+declare class SerialPort extends Stream.Duplex {
+	constructor(path: string, callback?: SerialPort.ErrorCallback);
+	constructor(path: string, options?: SerialPort.OpenOptions, callback?: SerialPort.ErrorCallback);
+
+	open(callback?: SerialPort.ErrorCallback): void;
+	update(options: SerialPort.UpdateOptions, callback?: SerialPort.ErrorCallback): void;
+
+	write(data: string| number[] | Buffer, callback?: (error: any, bytesWritten: number) => void): boolean;
+	write(buffer: string| number[] | Buffer, encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex', callback?: (error: any, bytesWritten: number) => void): boolean;
+
+	read(size?: number): string | Buffer | null;
+
+	close(callback?: (error: Error) => void): void;
+
+	set(options: SerialPort.SetOptions, callback?: SerialPort.ErrorCallback): void;
+	get(callback?: SerialPort.ModemBitsCallback): void;
+
+	flush(callback?: SerialPort.ErrorCallback): void;
+	drain(callback?: SerialPort.ErrorCallback): void;
+
+	pause(): this;
+	resume(): this;
+
+	on(event: string, callback?: (data?: any) => void): this;
+
+	static Binding: SerialPort.BaseBinding;
 }
 
 declare namespace SerialPort {
-	interface portConfig {
-		comName: string;
-		manufacturer: string;
-		serialNumber: string;
-		pnpId: string;
-		locationId: string;
-		vendorId: string;
-		productId: string;
-	}
+	// Callbacks Type Defs
+	type ErrorCallback = (error: Error) => void;
+	type ModemBitsCallback = (error: Error, status: {cts: boolean, dsr: boolean, dcd: boolean }) => void;
+	type ListCallback = (error: Error, port: any[]) => void;
 
-	interface setOptions {
+	// Options Type Defs
+	interface OpenOptions {
+		autoOpen?: boolean;
+		baudRate?: 115200|57600|38400|19200|9600|4800|2400|1800|1200|600|300|200|150|134|110|75|50|number;
+		dataBits?: 8|7|6|5;
+		highWaterMark?: number;
+		lock?: boolean;
+		stopBits?: 1|2;
+		parity?: 'none'|'even'|'mark'|'odd'|'space';
+		rtscts?: boolean;
+		xon?: boolean;
+		xoff?: boolean;
+		xany?: boolean;
+		binding?: BaseBinding;
+		bindingOptions?: {
+			vmin?: number;
+			vtime?: number;
+		};
+	}
+	interface UpdateOptions {
+		baudRate?: 115200|57600|38400|19200|9600|4800|2400|1800|1200|600|300|200|150|134|110|75|50|number;
+	}
+	interface SetOptions {
 		brk?: boolean;
 		cts?: boolean;
 		dsr?: boolean;
@@ -47,43 +72,48 @@ declare namespace SerialPort {
 		rts?: boolean;
 	}
 
-	interface updateOptions {
-		baudRate?: number;
+	namespace parsers {
+		class ByteLength extends Stream.Transform {
+			constructor(options: {length: number});
+		}
+		class CCTalk extends Stream.Transform {
+			constructor();
+		}
+		class Delimiter extends Stream.Transform {
+			constructor(options: {delimiter: string | Buffer | number[]});
+		}
+		class Readline extends Delimiter {
+			constructor(options: {delimiter: string | Buffer | number[], encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex'});
+		}
+		class Ready extends Stream.Transform {
+			constructor(options: {data: string | Buffer | number[]});
+		}
+		class Regex extends Stream.Transform {
+			constructor(options: {regex: RegExp});
+		}
 	}
 
-	type serialParser = (emitter: NodeJS.EventEmitter, buffer: Buffer|string) => void;
+		// Binding Type Defs
+		type win32Binding = BaseBinding;
+		type darwinBinding = BaseBinding;
+		type linuxBinding = BaseBinding;
 
-	type readlineParser = (delimiter: string, encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex') => serialParser;
+		// Binding Type Def
+		class BaseBinding {
+			constructor(options: any);
 
-	type byteLengthParser = (delimiter: number) => serialParser;
+			open(path: string, options: OpenOptions): Promise<any>;
+			close(): Promise<any>;
 
-	type byteDelimiterParser = (delimiter: number[]) => serialParser;
-
-	type callback = (error: any) => void;
-
-	interface parsers {
-		Raw: serialParser;
-		Readline: readlineParser;
-		ByteLength: byteLengthParser;
-		ByteDelimiter: byteDelimiterParser;
-	}
-
-	// https://github.com/EmergingTechnologyAdvisors/node-serialport/blob/4.0.7/README.md#user-content-serialport-path-options-opencallback
-	interface options {
-		autoOpen?: boolean;
-		lock?: boolean;
-		baudRate?: 115200|57600|38400|19200|9600|4800|2400|1800|1200|600|300|200|150|134|110|75|50|number;
-		dataBits?: 8|7|6|5;
-		stopBits?: 1|2;
-		parity?: 'none'|'even'|'mark'|'odd'|'space';
-		rtscts?: boolean;
-		xon?: boolean;
-		xoff?: boolean;
-		bufferSize?: number;
-		parser?: serialParser;
-		platformOptions?: {
-			vmin?: number;
-			vtime?: number;
-		};
-	}
+			read(data: Buffer, offset: number, length: number): Promise<any>;
+			write(data: Buffer): Promise<any>;
+			update(options?: UpdateOptions): Promise<any>;
+			set(options?: SetOptions): Promise<any>;
+			get(): Promise<any>;
+			flush(): Promise<any>;
+			drain(): Promise<any>;
+			static list(): Promise<any>;
+		}
 }
+
+export = SerialPort;
diff --git a/types/serialport/serialport-tests.ts b/types/serialport/serialport-tests.ts
index a5908df77f..70dff8bdbd 100644
--- a/types/serialport/serialport-tests.ts
+++ b/types/serialport/serialport-tests.ts
@@ -8,26 +8,9 @@ function test_basic_connect() {
 
 function test_connect_config() {
     const port1 = new SerialPort('', {
-            baudRate: 0,
-            parser: SerialPort.parsers.Raw
-        }, (err: any) => {});
-
-    const port2 = new SerialPort('', {
-            baudRate: 0,
-            parser: SerialPort.parsers.Readline('\n', 'ascii')
-        }, (err: any) => {});
-
-    const port3 = new SerialPort('', {
-            baudRate: 0,
-            parser: SerialPort.parsers.ByteLength(7)
-        }, (err: any) => {});
+        }, (error: Error) => {});
 
     const port4 = new SerialPort('', {
-            baudRate: 0,
-            parser: SerialPort.parsers.ByteDelimiter([3, 4, 5])
-        }, (err: any) => {});
-
-    const port5 = new SerialPort('', {
             autoOpen: false,
             lock: false,
             baudRate: 115200,
@@ -37,24 +20,100 @@ function test_connect_config() {
             rtscts: true,
             xon: true,
             xoff: true,
-            bufferSize: 1024,
-            platformOptions: {
+            highWaterMark: 1024,
+            bindingOptions: {
                 vmin: 1,
                 vtime: 1
             }
-        }, (err: any) => {});
+        }, (error: Error) => {});
+}
+
+function test_open() {
+    const port = new SerialPort('');
+    port.open(() => {});
+}
+
+function test_update() {
+    const port = new SerialPort('');
+    port.update({baudRate: 57600});
 }
 
 function test_write() {
     const port = new SerialPort('');
-    port.write('main screen turn on', (err, bytesWritten) => {});
+
+    port.write('test', (error: Error) => {});
+    port.write('test', 'utf8', (error: Error) => {});
 }
 
-function test_events() {
+function test_read() {
     const port = new SerialPort('');
-    port.on('open', () => {});
+
+    const data = port.read(8);
 }
 
-function test_list_ports() {
-    SerialPort.list((err: string, ports: SerialPort.portConfig[]) => {});
+function test_close() {
+    const port = new SerialPort('');
+
+    port.close((error: Error) => {});
+}
+
+function test_set() {
+    const port = new SerialPort('');
+
+    port.set({}, (error: Error) => {});
+}
+
+function test_get() {
+    const port = new SerialPort('');
+
+    port.get((error, status) => {});
+}
+
+function test_flush() {
+    const port = new SerialPort('');
+
+    port.flush((error: Error) => {});
+}
+
+function test_drain() {
+    const port = new SerialPort('');
+
+    port.drain((error: Error) => {});
+}
+
+function test_pause_resume() {
+    const port = new SerialPort('');
+
+    const pauseItem: SerialPort =  port.pause();
+    const resumeItem: SerialPort = port.resume();
+}
+
+function test_on_events() {
+    const port = new SerialPort('');
+
+    const onItem: SerialPort = port.on('event', (data: any) => {});
+}
+
+function test_binding() {
+    const port = new SerialPort('');
+
+    const bindingItem: SerialPort.BaseBinding = SerialPort.Binding;
+}
+
+function test_parsers() {
+    const port = new SerialPort('');
+
+    const ByteLengthParser = new SerialPort.parsers.ByteLength({length: 8});
+    const CCTalkParser = new SerialPort.parsers.CCTalk();
+    const DelimiterParser = new SerialPort.parsers.Delimiter({ delimiter: Buffer.from('EOL') });
+    const ReadlineParser = new SerialPort.parsers.Readline({ delimiter: '\r\n' });
+    const ReadyParser = new SerialPort.parsers.Ready({ data: 'READY' });
+    const RegexParser = new SerialPort.parsers.Regex({regex: /.*/});
+
+    port.pipe(ByteLengthParser);
+    port.pipe(CCTalkParser);
+    port.pipe(DelimiterParser);
+    port.pipe(ReadlineParser);
+    port.pipe(ReadyParser);
+    port.pipe(RegexParser);
 }
diff --git a/types/serialport/v4/index.d.ts b/types/serialport/v4/index.d.ts
new file mode 100644
index 0000000000..b6f643bf76
--- /dev/null
+++ b/types/serialport/v4/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for serialport 4.0
+// Project: https://github.com/EmergingTechnologyAdvisors/node-serialport
+// Definitions by: Jeremy Foster <https://github.com/codefoster>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="streamjs" />
+
+export = SerialPort;
+
+declare class SerialPort extends Stream<any> {
+	// openImmediately already removed in 4.0.7
+	constructor(path: string, options?: SerialPort.Options|SerialPort.callback, callback?: SerialPort.callback);
+	isOpen(): boolean;
+	on(event: string, callback?: (data?: any) => void): void;
+	open(callback?: SerialPort.callback): void;
+	write(buffer: any, callback?: (err: any, bytesWritten: number) => void): void;
+	pause(): void;
+	resume(): void;
+	disconnected(err: Error): void;
+	close(callback?: SerialPort.callback): void;
+	flush(callback?: SerialPort.callback): void;
+	set(options: SerialPort.SetOptions, callback: SerialPort.callback): void;
+	drain(callback?: SerialPort.callback): void;
+	update(options: SerialPort.UpdateOptions, callback?: SerialPort.callback): void;
+	static list(callback: (err: any, ports: SerialPort.PortConfig[]) => void): void;
+	// https://github.com/EmergingTechnologyAdvisors/node-serialport/blob/4.0.7/lib/parsers.js
+	static parsers: SerialPort.Parsers;
+}
+
+declare namespace SerialPort {
+	interface PortConfig {
+		comName: string;
+		manufacturer: string;
+		serialNumber: string;
+		pnpId: string;
+		locationId: string;
+		vendorId: string;
+		productId: string;
+	}
+
+	interface SetOptions {
+		brk?: boolean;
+		cts?: boolean;
+		dsr?: boolean;
+		dtr?: boolean;
+		rts?: boolean;
+	}
+
+	interface UpdateOptions {
+		baudRate?: number;
+	}
+
+	type serialParser = (emitter: NodeJS.EventEmitter, buffer: Buffer|string) => void;
+
+	type readlineParser = (delimiter: string, encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex') => serialParser;
+
+	type byteLengthParser = (delimiter: number) => serialParser;
+
+	type byteDelimiterParser = (delimiter: number[]) => serialParser;
+
+	type callback = (error: any) => void;
+
+	interface Parsers {
+		Raw: serialParser;
+		Readline: readlineParser;
+		ByteLength: byteLengthParser;
+		ByteDelimiter: byteDelimiterParser;
+	}
+
+	// https://github.com/EmergingTechnologyAdvisors/node-serialport/blob/4.0.7/README.md#user-content-serialport-path-options-opencallback
+	interface Options {
+		autoOpen?: boolean;
+		lock?: boolean;
+		baudRate?: 115200|57600|38400|19200|9600|4800|2400|1800|1200|600|300|200|150|134|110|75|50|number;
+		dataBits?: 8|7|6|5;
+		stopBits?: 1|2;
+		parity?: 'none'|'even'|'mark'|'odd'|'space';
+		rtscts?: boolean;
+		xon?: boolean;
+		xoff?: boolean;
+		bufferSize?: number;
+		parser?: serialParser;
+		platformOptions?: {
+			vmin?: number;
+			vtime?: number;
+		};
+	}
+}
diff --git a/types/serialport/v4/serialport-tests.ts b/types/serialport/v4/serialport-tests.ts
new file mode 100644
index 0000000000..c0bd59b274
--- /dev/null
+++ b/types/serialport/v4/serialport-tests.ts
@@ -0,0 +1,60 @@
+// Tests taken from documentation samples.
+
+import * as SerialPort from 'serialport';
+
+function test_basic_connect() {
+    const port = new SerialPort('');
+}
+
+function test_connect_config() {
+    const port1 = new SerialPort('', {
+            baudRate: 0,
+            parser: SerialPort.parsers.Raw
+        }, (err: any) => {});
+
+    const port2 = new SerialPort('', {
+            baudRate: 0,
+            parser: SerialPort.parsers.Readline('\n', 'ascii')
+        }, (err: any) => {});
+
+    const port3 = new SerialPort('', {
+            baudRate: 0,
+            parser: SerialPort.parsers.ByteLength(7)
+        }, (err: any) => {});
+
+    const port4 = new SerialPort('', {
+            baudRate: 0,
+            parser: SerialPort.parsers.ByteDelimiter([3, 4, 5])
+        }, (err: any) => {});
+
+    const port5 = new SerialPort('', {
+            autoOpen: false,
+            lock: false,
+            baudRate: 115200,
+            dataBits: 5,
+            stopBits: 2,
+            parity: 'odd',
+            rtscts: true,
+            xon: true,
+            xoff: true,
+            bufferSize: 1024,
+            platformOptions: {
+                vmin: 1,
+                vtime: 1
+            }
+        }, (err: any) => {});
+}
+
+function test_write() {
+    const port = new SerialPort('');
+    port.write('main screen turn on', (err, bytesWritten) => {});
+}
+
+function test_events() {
+    const port = new SerialPort('');
+    port.on('open', () => {});
+}
+
+function test_list_ports() {
+    SerialPort.list((err: string, ports: SerialPort.PortConfig[]) => {});
+}
diff --git a/types/serialport/v4/tsconfig.json b/types/serialport/v4/tsconfig.json
new file mode 100644
index 0000000000..8c1a36c640
--- /dev/null
+++ b/types/serialport/v4/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "serialport": ["serialport/v4"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "serialport-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/serialport/v4/tslint.json b/types/serialport/v4/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/serialport/v4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/serve-favicon/index.d.ts b/types/serve-favicon/index.d.ts
index 71d5fa75ff..005769b805 100644
--- a/types/serve-favicon/index.d.ts
+++ b/types/serve-favicon/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/expressjs/serve-favicon
 // Definitions by: Uros Smolnik <https://github.com/urossmolnik>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /* =================== USAGE ===================
 
diff --git a/types/serve-favicon/tslint.json b/types/serve-favicon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/serve-favicon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/serve-index/index.d.ts b/types/serve-index/index.d.ts
index 91437ac338..e6aafaa5e0 100644
--- a/types/serve-index/index.d.ts
+++ b/types/serve-index/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/expressjs/serve-index
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 
 
diff --git a/types/serve-index/tslint.json b/types/serve-index/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/serve-index/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/serve-static/index.d.ts b/types/serve-static/index.d.ts
index 0676f0c41e..f02d7cf96e 100644
--- a/types/serve-static/index.d.ts
+++ b/types/serve-static/index.d.ts
@@ -1,7 +1,9 @@
-// Type definitions for serve-static 1.7.1
+// Type definitions for serve-static 1.13
 // Project: https://github.com/expressjs/serve-static
 // Definitions by: Uros Smolnik <https://github.com/urossmolnik>
+//                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /* =================== USAGE ===================
 
@@ -54,6 +56,12 @@ declare namespace serveStatic {
          */
         fallthrough?: boolean;
 
+        /**
+         * Enable or disable the immutable directive in the Cache-Control response header.
+         * If enabled, the maxAge option should also be specified to enable caching. The immutable directive will prevent supported clients from making conditional requests during the life of the maxAge option to check if the file has changed.
+         */
+        immutable?: boolean;
+
         /**
          * By default this module will send "index.html" files in response to a request on a directory.
          * To disable this set false or to supply a new index pass a string or an array in preferred order.
diff --git a/types/serve-static/tslint.json b/types/serve-static/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/serve-static/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/session-file-store/index.d.ts b/types/session-file-store/index.d.ts
index 5b755cafb9..0cbe77d9ef 100644
--- a/types/session-file-store/index.d.ts
+++ b/types/session-file-store/index.d.ts
@@ -1,282 +1,130 @@
-// Type definitions for express session-file-store 1.0
+// Type definitions for express session-file-store 1.2
 // Project: https://github.com/valery-barysok/session-file-store
 // Definitions by: Gevik Babakhani <https://github.com/blendsdk>
+//                 Junyoung Choi <https://github.com/rokt33r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-/// <reference types="express-session" />
+import * as express from "express";
+import * as session from "express-session";
 
-export = FileStore;
+export = f;
 
-declare namespace FileStore {
+declare function f(options: (options?: session.SessionOptions) => express.RequestHandler): f.FileStore;
+
+declare namespace f {
+    interface FileStore {
+        new (options?: Options): session.Store;
+    }
     /**
      * FileStore Options
-     *
-     * @interface Options
      */
     interface Options {
         /**
          * The directory where the session files will be stored. Defaults to `./sessions`
-         *
-         * @type {string}
-         * @memberOf Options
          */
         path?: string;
 
         /**
          * Session time to live in seconds. Defaults to `3600`
-         *
-         * @type {number}
-         * @memberOf Options
          */
         ttl?: number;
 
         /**
          * The number of retries to get session data from a session file. Defaults to `5`
-         *
-         * @type {number}
-         * @memberOf Options
          */
         retries?: number;
 
         /**
          * The exponential factor to use for retry. Defaults to `1`
-         *
-         * @type {number}
-         * @memberOf Options
          */
         factor?: number;
 
         /**
          * The number of milliseconds before starting the first retry. Defaults to `50`
-         *
-         * @type {number}
-         * @memberOf Options
          */
         minTimeout?: number;
 
         /**
          * The maximum number of milliseconds between two retries. Defaults to `100`
-         *
-         * @type {number}
-         * @memberOf Options
          */
         maxTimeout?: number;
 
         /**
          * [OUT] Contains intervalObject if reap was scheduled
-         *
-         * @type {*}
-         * @memberOf Options
          */
         reapIntervalObject?: any;
 
         /**
          * Interval to clear expired sessions in seconds or -1 if do not need. Defaults to `1 hour`
-         *
-         * @type {number}
-         * @memberOf Options
          */
         reapInterval?: number;
 
         /**
          * Undocumented
-         *
-         * @type {number}
-         * @memberOf Options
          */
         reapMaxConcurrent?: number;
 
         /**
          * Use distinct worker process for removing stale sessions. Defaults to `false`
-         *
-         * @type {boolean}
-         * @memberOf Options
          */
         reapAsync?: boolean;
 
         /**
          * Reap stale sessions synchronously if can not do it asynchronously. Default to `false`
-         *
-         * @type {boolean}
-         * @memberOf Options
          */
         reapSyncFallback?: boolean;
 
         /**
          * Log messages. Defaults to `console.log`
-         *
-         * @type {Function}
-         * @memberOf Options
          */
         logFn?(...args: any[]): void;
 
         /**
          * Returns fallback session object after all failed retries. No defaults
-         *
-         * @type {Function}
-         * @memberOf Options
          */
         fallbackSessionFn?(...args: any[]): void;
 
         /**
          * Object-to-text text encoding. Can be null. Defaults to `'utf8'`
-         *
-         * @type {string}
-         * @memberOf Options
          */
         encoding?: string;
 
         /**
          * Encoding function. Takes object, returns encoded data. Defaults to `JSON.stringify`
-         *
-         * @type {Function}
-         * @memberOf Options
          */
         encoder?(...args: any[]): void;
 
         /**
          * Decoding function. Takes encoded data, returns object. Defaults to `JSON.parse`
-         *
-         * @type {Function}
-         * @memberOf Options
          */
         decoder?(...args: any[]): void;
 
         /**
          * If secret string is specified then enables encryption of the session before
          * writing the file and also decryption when reading it.
-         *
-         * @type {string}
-         * @memberOf Options
          */
         secret?: string;
 
         /**
          * Encryption output encoding. Defaults to `'hex'`
-         *
-         * @type {string}
-         * @memberOf Options
          */
         encryptEncoding?: string;
 
         /**
          * File extension of saved files. Defaults to `'.json'`
-         *
-         * @type {string}
-         * @memberOf Options
          */
         fileExtension?: string;
 
         /**
          * Undocumented
-         *
-         * @type {RegExp}
-         * @memberOf Options
          */
         filePattern?: RegExp;
 
         /**
          * Encryption key retrieval function. Takes secret andsession id, returns key.
          * Defaults to `function(secret, sessionId){return secret + sessionId;}`
-         *
-         *
-         * @memberOf Options
          */
         keyFunction?(secret: string, sessionId: string): string;
     }
 }
-
-/**
- * Session file store is a provision for storing session data in
- * the session file
- *
- * @class FileStore
- */
-declare class FileStore {
-    /**
-     * Creates an instance of FileStore.
-     * @param {FileStore.Options} options
-     *
-     * @memberOf FileStore
-     */
-    constructor(options: FileStore.Options);
-
-    /**
-     * Attempts to fetch session from a session file by the given `sessionId`
-     *
-     * @param {string} sessionId
-     * @param {(err: any, session: Express.Session) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    get(sessionId: string, callback: (err: any, session: Express.Session) => void): void;
-
-    /**
-     * Attempts to commit the given session associated with the given `sessionId` to a session file
-     *
-     * @param {string} sessionId
-     * @param {Express.Session} session
-     * @param {(err: any) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    set(sessionId: string, session: Express.Session, callback: (err: any) => void): void;
-
-    /**
-     * Touch the given session object associated with the given `sessionId`
-     *
-     * @param {string} sessionId
-     * @param {Express.Session} session
-     * @param {(err: any) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    touch(sessionId: string, session: Express.Session, callback: (err: any) => void): void;
-
-    /**
-     * Attempts to unlink a given session by its id
-     *
-     * @param {string} sessionId
-     * @param {(err: any) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    destroy(sessionId: string, callback: (err: any) => void): void;
-
-    /**
-     * Attempts to fetch number of the session files
-     *
-     * @param {(err: any, length: number) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    length(callback: (err: any, length: number) => void): void;
-
-    /**
-     * Attempts to clear out all of the existing session files
-     *
-     * @param {(err: any) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    clear(callback: (err: any) => void): void;
-
-    /**
-     *
-     *
-     * @param {(err: any, files: Array<string>) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    list(callback: (err: any, files: string[]) => void): void;
-
-    /**
-     * Attempts to detect whether a session file is already expired or not
-     *
-     * @param {string} sessionId
-     * @param {(errr: any, isExpired: boolean) => void} callback
-     *
-     * @memberOf FileStore
-     */
-    expired(sessionId: string, callback: (errr: any, isExpired: boolean) => void): void;
-}
diff --git a/types/session-file-store/session-file-store-tests.ts b/types/session-file-store/session-file-store-tests.ts
index 50d30da2ac..001aacca60 100644
--- a/types/session-file-store/session-file-store-tests.ts
+++ b/types/session-file-store/session-file-store-tests.ts
@@ -1,11 +1,11 @@
-import FileStore = require("session-file-store");
+import session = require("express-session");
+import f = require("session-file-store");
 
-const options: FileStore.Options = {
+const options: f.Options = {
     path: "./tmp/sessions/",
     logFn: (a: string) => {
     }
 };
+const FileStore = f(session);
 
-const sessionStore = new FileStore(options);
-
-sessionStore.list((err: any, file: string[]) => {});
+const sessionStore: session.Store = new FileStore(options);
diff --git a/types/set-cookie-parser/tslint.json b/types/set-cookie-parser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/set-cookie-parser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sha1/index.d.ts b/types/sha1/index.d.ts
index 81b2202dc3..bb55d2f4fc 100644
--- a/types/sha1/index.d.ts
+++ b/types/sha1/index.d.ts
@@ -8,9 +8,9 @@
 /**
  * js function for hashing messages with SHA1
  *
- * @param {(string | Buffer)} message - a string or buffer to hash
- * @param {Sha1Options} options - an options object
- * @returns {string} the resultant SHA1 hash of the given message
+ * @param message - a string or buffer to hash
+ * @param options - an options object
+ * @returns the resultant SHA1 hash of the given message
  */
 declare function main(message: string | Buffer, options?: Sha1Options): string | Uint8Array;
 export = main;
diff --git a/types/shallowequal/tslint.json b/types/shallowequal/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/shallowequal/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/shapefile/index.d.ts b/types/shapefile/index.d.ts
index 335592565c..54a18a2503 100644
--- a/types/shapefile/index.d.ts
+++ b/types/shapefile/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mbostock/shapefile
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="geojson"/>
 
diff --git a/types/shapefile/tslint.json b/types/shapefile/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/shapefile/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sharedworker/tslint.json b/types/sharedworker/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sharedworker/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index 708e32b2e1..4852d8440c 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for Microsoft SharePoint: 2016.0
+// Type definitions for Microsoft SharePoint: 2016.1
 // Project: https://msdn.microsoft.com/en-us/library/office/jj193034.aspx
 // Definitions by: Stanislav Vyshchepan <https://github.com/gandjustas>
 //                 Andrey Markeev <https://github.com/andrei-markeev>
 //                 Vincent Biret <https://github.com/baywet>
 //                 Tero Arvola <https://github.com/teroarvola>
+//                 Dennis George <https://github.com/dennispg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -16,26 +17,43 @@ declare function ExecuteOrDelayUntilBodyLoaded(initFunc: () => void): void;
 declare function ExecuteOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
 declare function ExecuteOrDelayUntilEventNotified(func: (...args: any[]) => void, eventName: string): boolean;
 declare var Strings: any;
-
+declare const enum Sods {
+    missing =  1,
+    loading = 2,
+    pending = 3,
+    loaded = 4,
+    error = 5
+}
+interface Sod {
+    url: string;
+    key: string;
+    loaded: boolean;
+    depkeys?: string[];
+    state: Sods;
+    qfn?: any[];
+    reset?: boolean;
+}
+declare var _v_dictSod: { [address: string]: Sod };
 declare namespace SP {
-    class SOD {
-        static execute(fileName: string, functionName: string, ...args: any[]): void;
-        static executeFunc(fileName: string, typeName: string, fn: () => void): void;
-        static executeOrDelayUntilEventNotified(func: (...args: any[]) => void, eventName: string): boolean;
-        static executeOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
-        static notifyScriptLoadedAndExecuteWaitingJobs(scriptFileName: string): void;
-        static notifyEventAndExecuteWaitingJobs(eventName: string, args?: any[]): void;
-        static registerSod(fileName: string, url: string): void;
-        static registerSodDep(fileName: string, dependentFileName: string): void;
-        static loadMultiple(keys: string[], fn: () => void, bSync?: boolean): void;
-        static delayUntilEventNotified(func: (...args: any[]) => void, eventName: string): void;
+    interface SOD {
+        execute(fileName: string, functionName: string, ...args: any[]): void;
+        executeFunc(fileName: string, typeName: string, fn: () => void): void;
+        executeOrDelayUntilEventNotified(func: (...args: any[]) => void, eventName: string): boolean;
+        executeOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
+        notifyScriptLoadedAndExecuteWaitingJobs(scriptFileName: string): void;
+        notifyEventAndExecuteWaitingJobs(eventName: string, args?: any[]): void;
+        registerSod(fileName: string, url: string): void;
+        registerSodDep(fileName: string, dependentFileName: string): void;
+        loadMultiple(keys: string[], fn: () => void, bSync?: boolean): void;
+        delayUntilEventNotified(func: (...args: any[]) => void, eventName: string): void;
 
-        static get_prefetch(): boolean;
-        static set_prefetch(value: boolean): void;
+        get_prefetch(): boolean;
+        set_prefetch(value: boolean): void;
 
-        static get_ribbonImagePrefetchEnabled(): boolean;
-        static set_ribbonImagePrefetchEnabled(value: boolean): void;
+        get_ribbonImagePrefetchEnabled(): boolean;
+        set_ribbonImagePrefetchEnabled(value: boolean): void;
     }
+    let SOD: SOD;
 
     enum ListLevelPermissionMask {
         viewListItems, // : 1,
@@ -88,27 +106,33 @@ declare namespace SP {
         static resizeImageToSquareLength(imgElement: HTMLImageElement, squareLength: number): void;
     }
 
-    class PageContextInfo {
-        static get_siteServerRelativeUrl(): string;
-        static get_webServerRelativeUrl(): string;
-        static get_webAbsoluteUrl(): string;
-        static get_serverRequestPath(): string;
-        static get_siteAbsoluteUrl(): string;
-        static get_webTitle(): string;
-        static get_tenantAppVersion(): string;
-        static get_webLogoUrl(): string;
-        static get_webLanguage(): number;
-        static get_currentLanguage(): number;
-        static get_pageItemId(): number;
-        static get_pageListId(): string;
-        static get_webPermMasks(): { High: number; Low: number; };
-        static get_currentCultureName(): string;
-        static get_currentUICultureName(): string;
-        static get_clientServerTimeDelta(): number;
-        static get_userLoginName(): string;
-        static get_webTemplate(): string;
+    interface PageContextInfo {
+        new(): PageContextInfoInstance;
+        get_siteServerRelativeUrl(): string;
+        get_webServerRelativeUrl(): string;
+        get_webAbsoluteUrl(): string;
+        get_serverRequestPath(): string;
+        get_siteAbsoluteUrl(): string;
+        get_webTitle(): string;
+        get_tenantAppVersion(): string;
+        get_isAppWeb(): boolean;
+        get_webLogoUrl(): string;
+        get_webLanguage(): number;
+        get_currentLanguage(): number;
+        get_pageItemId(): number;
+        get_pageListId(): string;
+        get_webPermMasks(): { High: number; Low: number; };
+        get_currentCultureName(): string;
+        get_currentUICultureName(): string;
+        get_clientServerTimeDelta(): number;
+        get_userLoginName(): string;
+        get_webTemplate(): string;
+    }
+
+    interface PageContextInfoInstance {
         get_pagePersonalizationScope(): string;
     }
+    let PageContextInfo: PageContextInfo;
 
     class ContextPermissions {
         has(perm: number): boolean;
@@ -154,97 +178,99 @@ declare class JSRequest {
     static PathName: string;
 }
 
-declare class _spPageContextInfo {
-    static alertsEnabled: boolean; // true
-    static allowSilverlightPrompt: string; // "True"
-    static blockDownloadsExperienceEnabled: boolean; // true
-    static canUserCreateMicrosoftForm: boolean; // true
-    static cdnPrefix: string; // "static.sharepointonline.com/bld"
-    static clientServerTimeDelta: number; // -182
-    static CorrelationId: string; // "6161f99d-10e5-4000-ad30-1016270fe31d"
-    static crossDomainPhotosEnabled: boolean; // true
-    static currentCultureName: string; // "ru-RU"
-    static currentLanguage: number; // 1049
-    static currentUICultureName: string; // "ru-RU"
-    static disableAppViews: boolean; // true
-    static disableFlows: boolean; // true
-    static env: string; // "prod"
-    static farmLabel: string; // "US_4_Content"
-    static formDigestValue: string; // "0x5F3FE84E7EE9089C7D11DCDAFFB9E69CF8241E68B9EF071FA92CD419E878AC4F7C16E34696EFA667EFD0712FC1DF4945DDC0D09B5D23153A698A727AF076B5DE,07 Jun 2017 18:55:22 -0000"
-    static formDigestTimeoutSeconds: number; // 1800
-    static groupColor: string; // "#d40ac7"
-    static groupHasHomepage: boolean; // true
-    static groupId: string; //
-    static guestsEnabled: boolean; // true
-    static hasManageWebPermissions: boolean; // true
-    static isAnonymousGuestUser: boolean; // true
-    static isAppWeb: boolean; // true
-    static isExternalGuestUser: boolean; // true
-    static isNoScriptEnabled: boolean; // true
-    static isSiteAdmin: boolean; // true
-    static isSPO: boolean; // true
-    static isTenantDevSite: boolean; // true
-    static isWebWelcomePage: boolean; // true
-    static layoutsUrl: string;  // "_layouts/15"
-    static listBaseTemplate: number; // 119
-    static listId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static listPermsMask: { High: number; Low: number; };
-    static listTitle: string; // "Site Pages"
-    static listUrl: string; // "/sites/site/list"
-    static maximumFileSize: number; // 15360
-    static openInClient: boolean; // true
-    static pageListId: string;  // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static pageItemId: number;
-    static pagePermsMask: { High: number; Low: number; };
-    static pagePersonalizationScope: string; // 1
-    static PreviewFeaturesEnabled: boolean; // true
-    static preferUserTimeZone: boolean; // false
-    static ProfileUrl: string; // "https://tenant-my.sharepoint.com/person.aspx"
-    static PublishingFeatureOn: boolean; // true
-    static RecycleBinItemCount: number; // -1
-    static serverRedirectedUrl: string;
-    static serverRequestPath: string; // "/SPTypeScript/Lists/ConditionalFormattingTasksList/AllItems.aspx"
-    static serverTime: string; // "2017-06-07T18:55:22.3499459Z"
-    static siteAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com"
-    static siteClassification: string; //
-    static siteClientTag: string; // "0$$15.0.4454.1021"
-    static siteColor: string; // "#d40ac7"
-    static siteId: string; // "{3e09a056-f68f-44a3-8e0f-ff2c123b82cb}"
-    static sitePagesEnabled: boolean; // true
-    static siteServerRelativeUrl: string; // "/"
-    static siteSubscriptionId: string; // 4eedf5f3-f71f-4e73-82ee-e19081363c8c
-    static supportPoundStorePath: boolean; // true
-    static supportPercentStorePath: boolean; // true
-    static systemUserKey: string; // "i:0h.f|membership|10033fff84e7cb2b@live.com"
-    static tenantAppVersion: string; // "0"
-    static themeCacheToken: string; // "/sites/site::0:16.0.6525.1206"
-    static themedCssFolderUrl: string;
-    static themedImageFileNames: string;
-    static updateFormDigestPageLoaded: string; // "2017-06-07T18:55:25.821Z"
-    static userDisplayName: string; // "John Doe"
-    static userEmail: string; // "john.doe@fabrikam.onmicrosoft.com"
-    static userId: number; // 12
-    static userLoginName: string; // "john.doe@fabrikam.onmicrosoft.com"
-    static viewOnlyExperienceEnabled: boolean; // true
-    static viewId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static webAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com/SPTypeScript"
-    static webDescription: string; // "Some description"
-    static webId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static webLanguage: number; // 1049
-    static webLogoUrl: string; // "/_layouts/15/images/siteIcon.png?rev=23"
-    static webPermMasks: { High: number; Low: number; };
-    static webServerRelativeUrl: string; // "/SPTypeScript"
-    static webTemplate: string; // "17"
-    static webTitle: string; // "SPTypeScript"
-    static webUIVersion: number; // 15
+interface _spPageContextInfo {
+    alertsEnabled: boolean; // true
+    allowSilverlightPrompt: string; // "True"
+    blockDownloadsExperienceEnabled: boolean; // true
+    canUserCreateMicrosoftForm: boolean; // true
+    cdnPrefix: string; // "static.sharepointonline.com/bld"
+    clientServerTimeDelta: number; // -182
+    CorrelationId: string; // "6161f99d-10e5-4000-ad30-1016270fe31d"
+    crossDomainPhotosEnabled: boolean; // true
+    currentCultureName: string; // "ru-RU"
+    currentLanguage: number; // 1049
+    currentUICultureName: string; // "ru-RU"
+    disableAppViews: boolean; // true
+    disableFlows: boolean; // true
+    env: string; // "prod"
+    farmLabel: string; // "US_4_Content"
+    formDigestValue: string; // "0x5F3FE84E7EE9089C7D11DCDAFFB9E69CF8241E68B9EF071FA92CD419E878AC4F7C16E34696EFA667EFD0712FC1DF4945DDC0D09B5D23153A698A727AF076B5DE,07 Jun 2017 18:55:22 -0000"
+    formDigestTimeoutSeconds: number; // 1800
+    groupColor: string; // "#d40ac7"
+    groupHasHomepage: boolean; // true
+    groupId: string; //
+    guestsEnabled: boolean; // true
+    hasManageWebPermissions: boolean; // true
+    isAnonymousGuestUser: boolean; // true
+    isAppWeb: boolean; // true
+    isExternalGuestUser: boolean; // true
+    isNoScriptEnabled: boolean; // true
+    isSiteAdmin: boolean; // true
+    isSPO: boolean; // true
+    isTenantDevSite: boolean; // true
+    isWebWelcomePage: boolean; // true
+    layoutsUrl: string;  // "_layouts/15"
+    listBaseTemplate: number; // 119
+    listId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    listPermsMask: { High: number; Low: number; };
+    listTitle: string; // "Site Pages"
+    listUrl: string; // "/sites/site/list"
+    maximumFileSize: number; // 15360
+    openInClient: boolean; // true
+    pageListId: string;  // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    pageItemId: number;
+    pagePermsMask: { High: number; Low: number; };
+    pagePersonalizationScope: string; // 1
+    PreviewFeaturesEnabled: boolean; // true
+    preferUserTimeZone: boolean; // false
+    ProfileUrl: string; // "https://tenant-my.sharepoint.com/person.aspx"
+    PublishingFeatureOn: boolean; // true
+    RecycleBinItemCount: number; // -1
+    serverRedirectedUrl: string;
+    serverRequestPath: string; // "/SPTypeScript/Lists/ConditionalFormattingTasksList/AllItems.aspx"
+    serverTime: string; // "2017-06-07T18:55:22.3499459Z"
+    siteAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com"
+    siteClassification: string; //
+    siteClientTag: string; // "0$$15.0.4454.1021"
+    siteColor: string; // "#d40ac7"
+    siteId: string; // "{3e09a056-f68f-44a3-8e0f-ff2c123b82cb}"
+    sitePagesEnabled: boolean; // true
+    siteServerRelativeUrl: string; // "/"
+    siteSubscriptionId: string; // 4eedf5f3-f71f-4e73-82ee-e19081363c8c
+    supportPoundStorePath: boolean; // true
+    supportPercentStorePath: boolean; // true
+    systemUserKey: string; // "i:0h.f|membership|10033fff84e7cb2b@live.com"
+    tenantAppVersion: string; // "0"
+    themeCacheToken: string; // "/sites/site::0:16.0.6525.1206"
+    themedCssFolderUrl: string;
+    themedImageFileNames: string;
+    updateFormDigestPageLoaded: string; // "2017-06-07T18:55:25.821Z"
+    userDisplayName: string; // "John Doe"
+    userEmail: string; // "john.doe@fabrikam.onmicrosoft.com"
+    userId: number; // 12
+    userLoginName: string; // "john.doe@fabrikam.onmicrosoft.com"
+    viewOnlyExperienceEnabled: boolean; // true
+    viewId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    webAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com/SPTypeScript"
+    webDescription: string; // "Some description"
+    webId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    webLanguage: number; // 1049
+    webLogoUrl: string; // "/_layouts/15/images/siteIcon.png?rev=23"
+    webPermMasks: { High: number; Low: number; };
+    webServerRelativeUrl: string; // "/SPTypeScript"
+    webTemplate: string; // "17"
+    webTitle: string; // "SPTypeScript"
+    webUIVersion: number; // 15
 }
+declare var _spPageContextInfo: _spPageContextInfo;
 
-declare class _spFriendlyUrlPageContextInfo {
-    static termId: string;
-    static termSetId: string;
-    static termStoreId: string;
-    static title: string;
+interface _spFriendlyUrlPageContextInfo {
+    termId: string;
+    termSetId: string;
+    termStoreId: string;
+    title: string;
 }
+declare var _spFriendlyUrlPageContextInfo: _spFriendlyUrlPageContextInfo;
 
 declare function STSHtmlEncode(value: string): string;
 declare function STSHtmlDecode(value: string): string;
@@ -323,6 +349,7 @@ interface ContextInfo extends SPClientTemplates.RenderContext {
     ContentTypesEnabled: boolean;
     CurrentSelectedItems: boolean;
     CurrentUserId: number;
+    CurrentUserIsSiteAdmin: boolean;
     EnableMinorVersions: boolean;
     ExternalDataList: boolean;
     HasRelatedCascadeLists: boolean;
@@ -2112,7 +2139,7 @@ declare namespace SP {
         constructor();
     }
     /** Provides a base class for a collection of objects on a remote client. */
-    class ClientObjectCollection<T> extends SP.ClientObject implements IEnumerable<T> {
+    interface ClientObjectCollection<T> extends SP.ClientObject, IEnumerable<T> {
         get_areItemsAvailable(): boolean;
         /** Gets the data for all of the items in the collection. */
         retrieveItems(): SP.ClientObjectPrototype;
@@ -2125,12 +2152,20 @@ declare namespace SP {
         getItemAtIndex(index: number): T;
         fromJson(obj: any): void;
     }
+    interface ClientObjectCollectionConstructor {
+        new<T>(): ClientObjectCollection<T>;
+    }
+    let ClientObjectCollection: ClientObjectCollectionConstructor;
 
-    class ClientObjectList<T> extends SP.ClientObjectCollection<T> {
-        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
+    interface ClientObjectList<T> extends SP.ClientObjectCollection<T> {
+        new(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
         fromJson(initValue: any): void;
         customFromJson(initValue: any): boolean;
     }
+    interface ClientObjectListConstructor {
+        new<T>(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any): ClientObjectList<T>;
+    }
+    let ClientObjectList: ClientObjectListConstructor;
     class ClientObjectPrototype {
         retrieve(propertyNames?: string[]): void;
         retrieveObject(propertyName: string): SP.ClientObjectPrototype;
@@ -2174,8 +2209,8 @@ declare namespace SP {
     }
     class ClientRequestSucceededEventArgs extends SP.ClientRequestEventArgs {
     }
-    class ClientRuntimeContext implements Sys.IDisposable {
-        constructor(serverRelativeUrlOrFullUrl: string);
+    interface ClientRuntimeContext extends Sys.IDisposable {
+        new(serverRelativeUrlOrFullUrl: string);
         get_url(): string;
         get_viaUrl(): string;
         set_viaUrl(value: string): void;
@@ -2412,13 +2447,16 @@ declare namespace SP {
         assemblyVersion: string;
         wssMajorVersion: string;
     }
-    class ClientContext extends SP.ClientRuntimeContext {
-        constructor(serverRelativeUrlOrFullUrl?: string);
-        static get_current(): SP.ClientContext;
+    interface ClientContext extends SP.ClientRuntimeContext {
         get_web(): SP.Web;
         get_site(): SP.Site;
         get_serverVersion(): string;
     }
+    interface ClientContextConstructor {
+        new(serverRelativeUrlOrFullUrl?: string): ClientContext;
+        get_current(): SP.ClientContext;
+    }
+    let ClientContext: ClientContextConstructor;
     enum ULSTraceLevel {
         verbose,
     }
@@ -2556,7 +2594,7 @@ declare namespace SP {
         get_serverRelativeUrl(): string;
         deleteObject(): void;
     }
-    class AttachmentCollection extends SP.ClientObjectCollection<Attachment> {
+    interface AttachmentCollection extends SP.ClientObjectCollection<Attachment> {
         itemAt(index: number): SP.Attachment;
         get_item(index: number): SP.Attachment;
         getByFileName(fileName: string): SP.Attachment;
@@ -2653,7 +2691,7 @@ declare namespace SP {
         get_alertId(): SP.Guid;
         get_webId(): SP.Guid;
     }
-    class ChangeCollection extends SP.ClientObjectCollection<Change> {
+    interface ChangeCollection extends SP.ClientObjectCollection<Change> {
         itemAt(index: number): SP.Change;
         get_item(index: number): SP.Change;
     }
@@ -2873,7 +2911,7 @@ declare namespace SP {
         update(updateChildren: boolean): void;
         deleteObject(): void;
     }
-    class ContentTypeCollection extends SP.ClientObjectCollection<ContentType> {
+    interface ContentTypeCollection extends SP.ClientObjectCollection<ContentType> {
         itemAt(index: number): SP.ContentType;
         get_item(index: number): SP.ContentType;
         getById(contentTypeId: string): SP.ContentType;
@@ -2931,7 +2969,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class EventReceiverDefinitionCollection extends SP.ClientObjectCollection<EventReceiverDefinition> {
+    interface EventReceiverDefinitionCollection extends SP.ClientObjectCollection<EventReceiverDefinition> {
         itemAt(index: number): SP.EventReceiverDefinition;
         get_item(index: number): SP.EventReceiverDefinition;
         getById(eventReceiverId: SP.Guid): SP.EventReceiverDefinition;
@@ -3042,7 +3080,7 @@ declare namespace SP {
     class Feature extends SP.ClientObject {
         get_definitionId(): SP.Guid;
     }
-    class FeatureCollection extends SP.ClientObjectCollection<Feature> {
+    interface FeatureCollection extends SP.ClientObjectCollection<Feature> {
         itemAt(index: number): SP.Feature;
         get_item(index: number): SP.Feature;
         getById(featureId: SP.Guid): SP.Feature;
@@ -3135,7 +3173,7 @@ declare namespace SP {
         get_editFormat(): SP.ChoiceFormatType;
         set_editFormat(value: SP.ChoiceFormatType): void;
     }
-    class FieldCollection extends SP.ClientObjectCollection<Field> {
+    interface FieldCollection extends SP.ClientObjectCollection<Field> {
         itemAt(index: number): SP.Field;
         get_item(index: number): SP.Field;
         get_schemaXml(): string;
@@ -3194,7 +3232,7 @@ declare namespace SP {
         set_required(value: boolean): void;
         deleteObject(): void;
     }
-    class FieldLinkCollection extends SP.ClientObjectCollection<FieldLink> {
+    interface FieldLinkCollection extends SP.ClientObjectCollection<FieldLink> {
         itemAt(index: number): SP.FieldLink;
         get_item(index: number): SP.FieldLink;
         getById(id: SP.Guid): SP.FieldLink;
@@ -3407,7 +3445,7 @@ declare namespace SP {
         recycle(): SP.GuidResult;
         checkOut(): void;
     }
-    class FileCollection extends SP.ClientObjectCollection<File> {
+    interface FileCollection extends SP.ClientObjectCollection<File> {
         itemAt(index: number): SP.File;
         get_item(index: number): SP.File;
         getByUrl(url: string): SP.File;
@@ -3460,7 +3498,7 @@ declare namespace SP {
         get_versionLabel(): string;
         deleteObject(): void;
     }
-    class FileVersionCollection extends SP.ClientObjectCollection<FileVersion> {
+    interface FileVersionCollection extends SP.ClientObjectCollection<FileVersion> {
         itemAt(index: number): SP.FileVersion;
         get_item(index: number): SP.FileVersion;
         getById(versionid: number): SP.FileVersion;
@@ -3487,7 +3525,7 @@ declare namespace SP {
         deleteObject(): void;
         recycle(): SP.GuidResult;
     }
-    class FolderCollection extends SP.ClientObjectCollection<Folder> {
+    interface FolderCollection extends SP.ClientObjectCollection<Folder> {
         itemAt(index: number): SP.Folder;
         get_item(index: number): SP.Folder;
         getByUrl(url: string): SP.Folder;
@@ -3498,7 +3536,7 @@ declare namespace SP {
         get_serverRelativeUrl(): string;
         get_formType(): SP.PageType;
     }
-    class FormCollection extends SP.ClientObjectCollection<Form> {
+    interface FormCollection extends SP.ClientObjectCollection<Form> {
         itemAt(index: number): SP.Form;
         get_item(index: number): SP.Form;
         getByPageType(formType: SP.PageType): SP.Form;
@@ -3534,7 +3572,7 @@ declare namespace SP {
         get_users(): SP.UserCollection;
         update(): void;
     }
-    class GroupCollection extends SP.ClientObjectCollection<Group> {
+    interface GroupCollection extends SP.ClientObjectCollection<Group> {
         itemAt(index: number): SP.Group;
         get_item(index: number): SP.Group;
         getByName(name: string): SP.Group;
@@ -3825,7 +3863,7 @@ declare namespace SP {
         addItem(parameters: SP.ListItemCreationInformation): SP.ListItem<T>;
     }
     /** Represents a collection of SP.List objects */
-    class ListCollection extends SP.ClientObjectCollection<List> {
+    interface ListCollection extends SP.ClientObjectCollection<List> {
         /** Gets the list at the specified index in the collection. */
         itemAt<T = any>(index: number): SP.List<T>;
         /** Gets the list at the specified index in the collection. */
@@ -3948,7 +3986,7 @@ declare namespace SP {
         /** Validates form values specified for the list item. Errors are returned through hasException and errorMessage properties of the ListItemFormUpdateValue objects */
         validateUpdateListItem(formValues: SP.ListItemFormUpdateValue[], bNewDocumentUpdate: boolean): SP.ListItemFormUpdateValue[];
     }
-    class ListItemCollection<T = any> extends SP.ClientObjectCollection<ListItem<T>> {
+    interface ListItemCollection<T = any> extends SP.ClientObjectCollection<ListItem<T>> {
         itemAt(index: number): SP.ListItem<T>;
         get_item(index: number): SP.ListItem<T>;
         getById(id: number | string): SP.ListItem<T>;
@@ -3976,7 +4014,7 @@ declare namespace SP {
         writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
         constructor();
     }
-    class ListItemEntityCollection<T> extends SP.ClientObjectCollection<ListItem<T>> {
+    interface ListItemEntityCollection<T> extends SP.ClientObjectCollection<ListItem<T>> {
         itemAt(index: number): SP.ListItem<T>;
         get_item(index: number): SP.ListItem<T>;
     }
@@ -4007,7 +4045,7 @@ declare namespace SP {
         get_listTemplateTypeKind(): number;
         get_unique(): boolean;
     }
-    class ListTemplateCollection extends SP.ClientObjectCollection<ListTemplate> {
+    interface ListTemplateCollection extends SP.ClientObjectCollection<ListTemplate> {
         itemAt(index: number): SP.ListTemplate;
         get_item(index: number): SP.ListTemplate;
         getByName(name: string): SP.ListTemplate;
@@ -4101,7 +4139,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class NavigationNodeCollection extends SP.ClientObjectCollection<NavigationNode> {
+    interface NavigationNodeCollection extends SP.ClientObjectCollection<NavigationNode> {
         itemAt(index: number): SP.NavigationNode;
         get_item(index: number): SP.NavigationNode;
         add(parameters: SP.NavigationNodeCreationInformation): SP.NavigationNode;
@@ -4191,7 +4229,7 @@ declare namespace SP {
         get_user(): SP.User;
         update(): void;
     }
-    class PushNotificationSubscriberCollection extends SP.ClientObjectCollection<PushNotificationSubscriber> {
+    interface PushNotificationSubscriberCollection extends SP.ClientObjectCollection<PushNotificationSubscriber> {
         itemAt(index: number): SP.PushNotificationSubscriber;
         get_item(index: number): SP.PushNotificationSubscriber;
         getByStoreId(id: string): SP.PushNotificationSubscriber;
@@ -4215,7 +4253,7 @@ declare namespace SP {
         deleteObject(): void;
         restore(): void;
     }
-    class RecycleBinItemCollection extends SP.ClientObjectCollection<RecycleBinItem> {
+    interface RecycleBinItemCollection extends SP.ClientObjectCollection<RecycleBinItem> {
         itemAt(index: number): SP.RecycleBinItem;
         get_item(index: number): SP.RecycleBinItem;
         getById(id: SP.Guid): SP.RecycleBinItem;
@@ -4280,7 +4318,7 @@ declare namespace SP {
         get_relationshipDeleteBehavior(): SP.RelationshipDeleteBehaviorType;
         get_webId(): SP.Guid;
     }
-    class RelatedFieldCollection extends SP.ClientObjectCollection<RelatedField> {
+    interface RelatedFieldCollection extends SP.ClientObjectCollection<RelatedField> {
         itemAt(index: number): SP.RelatedField;
         get_item(index: number): SP.RelatedField;
     }
@@ -4292,7 +4330,7 @@ declare namespace SP {
         get_toolTipDescription(): string;
         get_webId(): SP.Guid;
     }
-    class RelatedFieldExtendedDataCollection extends SP.ClientObjectCollection<RelatedFieldExtendedData> {
+    interface RelatedFieldExtendedDataCollection extends SP.ClientObjectCollection<RelatedFieldExtendedData> {
         itemAt(index: number): SP.RelatedFieldExtendedData;
         get_item(index: number): SP.RelatedFieldExtendedData;
     }
@@ -4341,7 +4379,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class RoleAssignmentCollection extends SP.ClientObjectCollection<RoleAssignment> {
+    interface RoleAssignmentCollection extends SP.ClientObjectCollection<RoleAssignment> {
         itemAt(index: number): SP.RoleAssignment;
         get_item(index: number): SP.RoleAssignment;
         get_groups(): SP.GroupCollection;
@@ -4364,16 +4402,19 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
+    interface RoleDefinitionBindingCollectionConstructor {
+        new(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
+        newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
+    }
+    interface RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
         itemAt(index: number): SP.RoleDefinition;
         get_item(index: number): SP.RoleDefinition;
-        constructor(context: SP.ClientRuntimeContext);
-        static newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
         add(roleDefinition: SP.RoleDefinition): void;
         remove(roleDefinition: SP.RoleDefinition): void;
         removeAll(): void;
     }
-    class RoleDefinitionCollection extends SP.ClientObjectCollection<RoleDefinition> {
+    let RoleDefinitionBindingCollection: RoleDefinitionBindingCollectionConstructor;
+    interface RoleDefinitionCollection extends SP.ClientObjectCollection<RoleDefinition> {
         itemAt(index: number): SP.RoleDefinition;
         get_item(index: number): SP.RoleDefinition;
         getByName(name: string): SP.RoleDefinition;
@@ -4486,7 +4527,7 @@ declare namespace SP {
         localTimeToUTC(date: Date): SP.DateTimeResult;
         utcToLocalTime(date: Date): SP.DateTimeResult;
     }
-    class TimeZoneCollection extends SP.ClientObjectCollection<TimeZone> {
+    interface TimeZoneCollection extends SP.ClientObjectCollection<TimeZone> {
         itemAt(index: number): SP.TimeZone;
         get_item(index: number): SP.TimeZone;
         getById(id: number): SP.TimeZone;
@@ -4555,7 +4596,7 @@ declare namespace SP {
         get_userId(): SP.UserIdInfo;
         update(): void;
     }
-    class UserCollection extends SP.ClientObjectCollection<User> {
+    interface UserCollection extends SP.ClientObjectCollection<User> {
         itemAt(index: number): SP.User;
         get_item(index: number): SP.User;
         getByLoginName(loginName: string): SP.User;
@@ -4613,7 +4654,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class UserCustomActionCollection extends SP.ClientObjectCollection<UserCustomAction> {
+    interface UserCustomActionCollection extends SP.ClientObjectCollection<UserCustomAction> {
         itemAt(index: number): SP.UserCustomAction;
         get_item(index: number): SP.UserCustomAction;
         getById(id: SP.Guid): SP.UserCustomAction;
@@ -4706,7 +4747,7 @@ declare namespace SP {
         renderAsHtml(): SP.StringResult;
         update(): void;
     }
-    class ViewCollection extends SP.ClientObjectCollection<View> {
+    interface ViewCollection extends SP.ClientObjectCollection<View> {
         itemAt(index: number): SP.View;
         get_item(index: number): SP.View;
         getByTitle(strTitle: string): SP.View;
@@ -4734,7 +4775,7 @@ declare namespace SP {
         writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
         constructor();
     }
-    class ViewFieldCollection extends SP.ClientObjectCollection<string> {
+    interface ViewFieldCollection extends SP.ClientObjectCollection<string> {
         itemAt(index: number): string;
         get_item(index: number): string;
         get_schemaXml(): string;
@@ -4866,7 +4907,7 @@ declare namespace SP {
         /** Available after March 2015 CU for SharePoint 2013*/
         getList(url: string): List;
     }
-    class WebCollection extends SP.ClientObjectCollection<Web> {
+    interface WebCollection extends SP.ClientObjectCollection<Web> {
         itemAt(index: number): SP.Web;
         get_item(index: number): SP.Web;
         add(parameters: SP.WebCreationInformation): SP.Web;
@@ -4939,7 +4980,7 @@ declare namespace SP {
         get_name(): string;
         get_title(): string;
     }
-    class WebTemplateCollection extends SP.ClientObjectCollection<WebTemplate> {
+    interface WebTemplateCollection extends SP.ClientObjectCollection<WebTemplate> {
         itemAt(index: number): SP.WebTemplate;
         get_item(index: number): SP.WebTemplate;
         getByName(name: string): SP.WebTemplate;
@@ -5267,14 +5308,17 @@ declare namespace Microsoft.SharePoint.Client.Search {
             exportPopularQueries: (web: SP.Web, sourceId: SP.Guid) => SP.JsonObjectResult;
         }
 
-        class StringCollection extends SP.ClientObjectCollection<string> {
-            constructor(context: SP.ClientContext);
+        interface StringCollection extends SP.ClientObjectCollection<string> {
             itemAt: (index: number) => string;
             get_item: (index: number) => string;
             get_childItemType: () => typeof String;
             add: (property: string) => void;
             clear: () => void;
         }
+        interface StringCollectionConstructor {
+            new(context: SP.ClientContext): StringCollection;
+        }
+        let StringCollection: StringCollectionConstructor;
 
         class QueryPersonalizationData extends SP.ClientObject {
             // It's really empty;
@@ -5348,7 +5392,7 @@ declare namespace Microsoft.SharePoint.Client.Search {
             static getQueryPropertyValueType: (val: QueryPropertyValue) => QueryPropertyValueType;
             static queryPropertyValueToObject: (val: QueryPropertyValue) => any;
         }
-        class ReorderingRuleCollection extends SP.ClientObjectCollection<ReorderingRule> {
+        interface ReorderingRuleCollection extends SP.ClientObjectCollection<ReorderingRule> {
             itemAt: (index: number) => ReorderingRule;
             get_item: (index: number) => ReorderingRule;
             get_childItemType: () => typeof ReorderingRule;
@@ -5379,7 +5423,7 @@ declare namespace Microsoft.SharePoint.Client.Search {
             set_matchValue: (value: string) => void;
         }
 
-        class SortCollection extends SP.ClientObjectCollection<Sort> {
+        interface SortCollection extends SP.ClientObjectCollection<Sort> {
             itemAt: (index: number) => Sort;
             get_item: (index: number) => Sort;
             get_childItemType: () => typeof Sort;
@@ -5713,7 +5757,7 @@ declare namespace SP {
         class MethodExecutionResult extends SP.ClientObject {
             get_returnParameterCollection(): SP.BusinessData.ReturnParameterCollection;
         }
-        class ReturnParameterCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityFieldValueDictionary> {
+        interface ReturnParameterCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityFieldValueDictionary> {
             itemAt(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
             get_item(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
         }
@@ -5732,28 +5776,28 @@ declare namespace SP {
             getParentTypeDescriptor(): SP.BusinessData.TypeDescriptor;
         }
         namespace Collections {
-            class EntityFieldCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityField> {
+            interface EntityFieldCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityField> {
                 itemAt(index: number): SP.BusinessData.EntityField;
                 get_item(index: number): SP.BusinessData.EntityField;
             }
-            class EntityIdentifierCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityIdentifier> {
+            interface EntityIdentifierCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityIdentifier> {
                 itemAt(index: number): SP.BusinessData.EntityIdentifier;
                 get_item(index: number): SP.BusinessData.EntityIdentifier;
             }
-            class EntityInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityInstance> {
+            interface EntityInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityInstance> {
                 itemAt(index: number): SP.BusinessData.Runtime.EntityInstance;
                 get_item(index: number): SP.BusinessData.Runtime.EntityInstance;
             }
-            class FilterCollection extends SP.ClientObjectCollection<SP.BusinessData.Filter> {
+            interface FilterCollection extends SP.ClientObjectCollection<SP.BusinessData.Filter> {
                 itemAt(index: number): SP.BusinessData.Filter;
                 get_item(index: number): SP.BusinessData.Filter;
                 setFilterValue(inputFilterName: string, valueIndex: number, value: any): void;
             }
-            class LobSystemInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.LobSystemInstance> {
+            interface LobSystemInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.LobSystemInstance> {
                 itemAt(index: number): SP.BusinessData.LobSystemInstance;
                 get_item(index: number): SP.BusinessData.LobSystemInstance;
             }
-            class TypeDescriptorCollection extends SP.ClientObjectCollection<SP.BusinessData.TypeDescriptor> {
+            interface TypeDescriptorCollection extends SP.ClientObjectCollection<SP.BusinessData.TypeDescriptor> {
                 itemAt(index: number): SP.BusinessData.TypeDescriptor;
                 get_item(index: number): SP.BusinessData.TypeDescriptor;
             }
@@ -6562,7 +6606,7 @@ declare namespace SP {
             getDefaultSiteCollectionTermStore(): TermStore;
         }
 
-        class TermStoreCollection extends SP.ClientObjectCollection<TermStore> {
+        interface TermStoreCollection extends SP.ClientObjectCollection<TermStore> {
             itemAt(index: number): TermStore;
             get_item(index: number): TermStore;
             getById(id: SP.Guid): TermStore;
@@ -6623,7 +6667,7 @@ declare namespace SP {
             deleteObject(): void;
         }
 
-        class TermGroupCollection extends SP.ClientObjectCollection<TermGroup> {
+        interface TermGroupCollection extends SP.ClientObjectCollection<TermGroup> {
             itemAt(index: number): TermGroup;
             get_item(index: number): TermGroup;
             getById(id: SP.Guid): TermGroup;
@@ -6660,7 +6704,7 @@ declare namespace SP {
             setCustomProperty(name: string, value: string): void;
         }
 
-        class TermSetCollection extends SP.ClientObjectCollection<TermSet> {
+        interface TermSetCollection extends SP.ClientObjectCollection<TermSet> {
             itemAt(index: number): TermSet;
             get_item(index: number): TermSet;
             getById(id: SP.Guid): TermSet;
@@ -6690,7 +6734,7 @@ declare namespace SP {
             move(targetGroup: TermGroup): void;
         }
 
-        class TermCollection extends SP.ClientObjectCollection<Term> {
+        interface TermCollection extends SP.ClientObjectCollection<Term> {
             itemAt(index: number): Term;
             get_item(index: number): Term;
             getById(id: SP.Guid): Term;
@@ -6744,7 +6788,7 @@ declare namespace SP {
             getPath(lcid: number): SP.StringResult;
         }
 
-        class LabelCollection extends SP.ClientObjectCollection<Label> {
+        interface LabelCollection extends SP.ClientObjectCollection<Label> {
             itemAt(index: number): Label;
             get_item(index: number): Label;
             getByValue(name: string): Label;
@@ -6807,7 +6851,7 @@ declare namespace SP {
             set_withinTimeSpan(value: number): void;
         }
 
-        class ChangedItemCollection extends SP.ClientObjectCollection<ChangedItem> {
+        interface ChangedItemCollection extends SP.ClientObjectCollection<ChangedItem> {
             itemAt(index: number): ChangedItem;
             get_item(index: number): ChangedItem;
         }
@@ -6884,12 +6928,15 @@ declare namespace SP {
             getValidatedString(value: TaxonomyFieldValue): SP.StringResult;
         }
 
-        class TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
-            constructor(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field);
+        interface TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
             itemAt(index: number): TaxonomyFieldValue;
             get_item(index: number): TaxonomyFieldValue;
             populateFromLabelGuidPairs(text: string): void;
         }
+        interface TaxonomyFieldValueCollectionConstructor {
+            new(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field): TaxonomyFieldValueCollection;
+        }
+        let TaxonomyFieldValueCollection: TaxonomyFieldValueCollectionConstructor;
 
         class TaxonomyFieldValue extends SP.ClientValueObject {
             get_label(): string;
@@ -7508,7 +7555,7 @@ declare namespace SP {
             get_useCount(): number;
         }
 
-        class HashTagCollection extends SP.ClientObjectCollection<HashTag> {
+        interface HashTagCollection extends SP.ClientObjectCollection<HashTag> {
             itemAt(index: number): HashTag;
             get_item(index: number): HashTag;
         }
@@ -8140,7 +8187,7 @@ declare namespace SP {
             deleteWebPart(): void;
             moveWebPartTo(zoneID: string, zoneIndex: number): void;
         }
-        class WebPartDefinitionCollection extends SP.ClientObjectCollection<WebPartDefinition> {
+        interface WebPartDefinitionCollection extends SP.ClientObjectCollection<WebPartDefinition> {
             itemAt(index: number): SP.WebParts.WebPartDefinition;
             get_item(index: number): SP.WebParts.WebPartDefinition;
             getById(id: SP.Guid): SP.WebParts.WebPartDefinition;
@@ -8182,7 +8229,7 @@ declare namespace SP {
             update(): void;
             deleteObject(): void;
         }
-        class WorkflowAssociationCollection extends SP.ClientObjectCollection<WorkflowAssociation> {
+        interface WorkflowAssociationCollection extends SP.ClientObjectCollection<WorkflowAssociation> {
             itemAt(index: number): SP.Workflow.WorkflowAssociation;
             get_item(index: number): SP.Workflow.WorkflowAssociation;
             getById(associationId: SP.Guid): SP.Workflow.WorkflowAssociation;
@@ -8217,7 +8264,7 @@ declare namespace SP {
             get_name(): string;
             get_permissionsManual(): SP.BasePermissions;
         }
-        class WorkflowTemplateCollection extends SP.ClientObjectCollection<WorkflowTemplate> {
+        interface WorkflowTemplateCollection extends SP.ClientObjectCollection<WorkflowTemplate> {
             itemAt(index: number): SP.Workflow.WorkflowTemplate;
             get_item(index: number): SP.Workflow.WorkflowTemplate;
             getById(templateId: SP.Guid): SP.Workflow.WorkflowTemplate;
@@ -8313,7 +8360,7 @@ declare namespace SP.WorkflowServices {
     }
 
     /** Represents a collection of WorkflowDefinition objects */
-    class WorkflowDefinitionCollection extends SP.ClientObjectCollection<WorkflowDefinition> {
+    interface WorkflowDefinitionCollection extends SP.ClientObjectCollection<WorkflowDefinition> {
         itemAt(index: number): WorkflowDefinition;
         get_item(index: number): WorkflowDefinition;
         /** returns SP.WorkflowDefinition class */
@@ -8390,7 +8437,7 @@ declare namespace SP.WorkflowServices {
     }
 
     /** Represents a collection of WorkflowInstance objects */
-    class WorkflowInstanceCollection extends SP.ClientObjectCollection<WorkflowInstance> {
+    interface WorkflowInstanceCollection extends SP.ClientObjectCollection<WorkflowInstance> {
         itemAt(index: number): WorkflowInstance;
         get_item(index: number): WorkflowInstance;
         /** returns SP.WorkflowInstance class */
@@ -8503,7 +8550,7 @@ declare namespace SP.WorkflowServices {
     }
 
     /** Represents a collection of WorkflowSubscription objects */
-    class WorkflowSubscriptionCollection extends SP.ClientObjectCollection<WorkflowSubscription> {
+    interface WorkflowSubscriptionCollection extends SP.ClientObjectCollection<WorkflowSubscription> {
         itemAt(index: number): WorkflowSubscription;
         get_item(index: number): WorkflowSubscription;
         /** returns SP.WorkflowInstance class */
@@ -8771,7 +8818,7 @@ declare namespace SP {
                 getResolvedDisplayUrl(browserQueryString: string): StringResult;
             }
 
-            class NavigationTermCollection extends ClientObjectCollection<NavigationTerm> {
+            interface NavigationTermCollection extends ClientObjectCollection<NavigationTerm> {
             }
 
             class NavigationTerm extends NavigationTermSetItem {
@@ -8859,7 +8906,7 @@ declare namespace SP {
                 static getAsResolvedByView(context: ClientContext, termSet: Taxonomy.TermSet, view: NavigationTermSetView): NavigationTermSet;
             }
 
-            class NavigationTermProviderNameCollection extends ClientObjectCollection<string> {
+            interface NavigationTermProviderNameCollection extends ClientObjectCollection<string> {
                 Add(item: string): void;
                 Clear(): void;
                 Remove(item: string): BooleanResult;
diff --git a/types/sharepoint/sharepoint-tests.ts b/types/sharepoint/sharepoint-tests.ts
index 2b9bba7943..e76536cd18 100644
--- a/types/sharepoint/sharepoint-tests.ts
+++ b/types/sharepoint/sharepoint-tests.ts
@@ -2355,7 +2355,7 @@ namespace App {
 
         static $inject: string[] = ["$SharePoint", "$spnotify"];
 
-        constructor(private $SharePoint: App.SharePoint, private $n: App.SpNotify) {
+        constructor(private readonly $SharePoint: App.SharePoint, private readonly $n: App.SpNotify) {
             this.activate();
         }
 
diff --git a/types/sharepoint/tslint.json b/types/sharepoint/tslint.json
index 41a338313d..4f0bed9264 100644
--- a/types/sharepoint/tslint.json
+++ b/types/sharepoint/tslint.json
@@ -10,6 +10,7 @@
         "no-inferrable-types": false,
         "no-namespace": false,
         "no-mergeable-namespace": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,
         "no-unnecessary-type-assertion": false,
diff --git a/types/sharp-timer/index.d.ts b/types/sharp-timer/index.d.ts
deleted file mode 100644
index 6bc54e4713..0000000000
--- a/types/sharp-timer/index.d.ts
+++ /dev/null
@@ -1,315 +0,0 @@
-// Type definitions for sharp-timer library. 1.0
-// Project: https://github.com/afractal/SharpTimer
-// Definitions by: Hermes Gjini - afractal <https://github.com/afractal>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-export const millisPerSecond: 1000;
-export const millisPerMinute: 60000;
-export const millisPerHour: 3600000;
-export const millisPerDay: 86400000;
-export type ElapsedEvent = () => void;
-export type ElapsingEvent = (intervalValue: number) => void;
-
-/**
- * Simulates the actions of a generic timer,
- * generates elapsing and elapsed events for a specified interval.
- */
-export class Timer {
-    private _enabled: boolean;
-    private _stopped: boolean;
-    private _interval: number;
-    private _intervalElapsedEvents: ElapsedEvent[];
-    private _intervalElapsingEvents: ElapsingEvent[];
-
-    /**
-     * Initializes a new instance of the Timer class,
-     * and sets all the properties to their initial values.
-     * @param interval
-     * The time, in milliseconds, in which the timer will be active.
-     * The value must be greater than zero.
-     */
-    constructor(interval: number);
-
-    /**
-     * Gets a boolean value to indicate the enabled state
-     * of the current Timer instance.
-     * @readonly
-     * @default true
-     */
-    readonly enabled: boolean;
-
-    /**
-     * Gets a boolean value to indicate the stopped state
-     * of the current Timer instance.
-     * @readonly
-     * @default false
-     */
-    readonly stopped: boolean;
-
-    /**
-     * Gets or sets the remaining interval in milliseconds.
-     * The value must be greater than zero.
-     */
-    interval: number;
-
-    /**
-     * Starts raising the Timer events
-     * by setting the enabled property to true.
-     */
-    start(): void;
-
-    /**
-     * Pauses the Timer instance by setting the enabled property to false.
-     */
-    pause(): void;
-
-    /**
-     * Resumes the Timer instance by setting the enabled property to true.
-     */
-    resume(): void;
-
-    /**
-     * Stops raising the Timer event
-     * by setting the enabled property to false.
-     */
-    stop(): void;
-
-    /**
-     * Occurs when the interval has completely elapsed.
-     * @param intervalElapsedHandler
-     * The callback which will be executed when
-     * the interval elapsed event occurs.
-     */
-    onIntervalElapsed(intervalElapsedHandler: ElapsedEvent): void;
-
-    /**
-     * Occurs when the interval elapses and completely elapsed.
-     * @param intervalElapsingHandler
-     * The callback which will be executed when
-     * the interval elapsing event occurs.
-     */
-    onIntervalElapsing(intervalElapsingHandler: ElapsingEvent): void;
-
-    /**
-     * Returns a string represenation of the remaining
-     * in this format: minutes:seconds.
-     * examples: 20:23, 00:04, 59:59
-     */
-    toString(): string;
-
-    private getDoubleDigit(number: number): string;
-
-    private checkForValidInterval(interval: number): void;
-}
-
-/**
- * Simulates the actions of a generic stopwatch.
- */
-export class Stopwatch {
-    private _isRunning: boolean;
-    private _elapsedMilliseconds: number;
-    private _startedTimeInMillis: number;
-    private _intervalIds: Array<number | NodeJS.Timer>;
-
-    /**
-     * Initializes a new instance of the Stopwatch class.
-     */
-    constructor();
-
-    /**
-     * Gets the elapsed time in this format:
-     * hrs:mins:secs:ms
-     * @readonly
-     */
-    readonly elapsed: string;
-
-    /**
-     * Gets the elapsed time in milliseconds.
-     * @readonly
-     */
-    readonly elapsedMilliseconds: number;
-
-    /**
-     * Gets the elapsed time in seconds.
-     * @readonly
-     */
-    readonly elapsedSeconds: number;
-
-    /**
-     * Gets the elapsed time in minutes.
-     * @readonly
-     */
-    readonly elapsedMinutes: number;
-
-    /**
-     * Gets the elapsed hours in hours.
-     * @readonly
-     */
-    readonly elapsedHours: number;
-
-    /**
-     * Gets the isRunning state of the current Stopwatch instance.
-     * @readonly
-     * @default false
-     */
-    readonly isRunning: boolean;
-
-    /**
-     * Initializes a new Stopwatch instance and
-     * starts measuring elapsed time.
-     */
-    static startNew(): Stopwatch;
-
-    /**
-     * Starts, or resumes the Stopwatch
-     * from measuring elapsed time.
-     */
-    start(): void;
-
-    /**
-     * Stops the Stopwatch from measuring elapsed time.
-     */
-    stop(): void;
-
-    /**
-     * Stops the Stopwatch and resets the elapsed time to zero.
-     */
-    reset(): void;
-
-    /**
-     * Stops the Stopwatch,
-     * resets the elapsed time to zero
-     * and starts the Stopwatch for measuring elapsed time.
-     * It is a shortcut for writing
-     * reset then start.
-     */
-    restart(): void;
-
-    /**
-     * Stops the Stopwatch and cleans up the intervals.
-     */
-    dispose(): void;
-
-    private getDoubleDigit(num: number): string;
-}
-
-/**
- * Simulates an object that represents a time interval.
- */
-export class Timespan {
-    private _milliseconds: number;
-    private constructor(milliseconds: number);
-
-    /**
-     * Gets the time interval in milliseconds.
-     * @readonly
-     */
-    readonly milliseconds: number;
-
-    /**
-     * Gets the time interval in seconds.
-     * @readonly
-     */
-    readonly seconds: number;
-
-    /**
-     * Gets the time interval in minutes.
-     * @readonly
-     */
-    readonly minutes: number;
-
-    /**
-     * Gets the time interval in hours.
-     * @readonly
-     */
-    readonly hours: number;
-
-    /**
-     * Gets the time interval in days.
-     * @readonly
-     */
-    readonly days: number;
-
-    /**
-     * Returns a Timespan that represents a specified number of days.
-     * @param days The number of days.
-     */
-    static fromDays(days: number): Timespan;
-
-    /**
-     * Returns a Timespan that represents a specified number of hours.
-     * @param hours The number of hours.
-     */
-    static fromHours(hours: number): Timespan;
-
-    /**
-     * Returns a Timespan that represents a specified number of minutes.
-     * @param minutes The number of minutes.
-     */
-    static fromMinutes(minutes: number): Timespan;
-
-    /**
-     * Returns a Timespan that represents a specified number of seconds.
-     * @param seconds The number of seconds.
-     */
-    static fromSeconds(seconds: number): Timespan;
-
-    /**
-     * Returns a Timespan that represents a specified number of milliseconds.
-     * @param milliseconds The number of milliseconds.
-     */
-    static fromMilliseconds(milliseconds: number): Timespan;
-
-    /**
-     * Compares two Timespan objects and
-     * returns an integer that indicates whether
-     * the first value is shorter than, equal to,
-     * or longer than the second value.
-     * @param t1 The first Timespan to compare.
-     * @param t2 The second Timespan to compare.
-     */
-    static compare(t1: Timespan, t2: Timespan): 1 | 0 | -1;
-
-    /**
-     * Returns a boolean value that indicates
-     * whether two specified instances of Timespan are equal.
-     * @param t1 The first Timespan to compare.
-     * @param t2 The second Timespan to compare.
-     */
-    static equals(t1: Timespan, t2: Timespan): boolean;
-
-    /**
-     * Adds the specified Timespan to this instance.
-     * @param timespan The Timespan to add.
-     */
-    addMutable(timespan: Timespan): void;
-
-    /**
-     * Substracts the specified Timespan from this instance.
-     * @param timespan The Timespan to substract.
-     */
-    substractMutable(timespan: Timespan): void;
-
-    /**
-     * Returns a new Timespan object whose
-     * value is the sum of the specified Timespan object and this instance.
-     * @param timespan The Timespan to add.
-     */
-    add(timespan: Timespan): Timespan;
-
-    /**
-     * Returns a new Timespan object whose
-     * value is the difference between the
-     * specified Timespan object and this instance.
-     * @param timespan The Timespan to substract.
-     */
-    substract(timespan: Timespan): Timespan;
-
-    /**
-     * Returns a new Timespan object
-     * whose value is the negated value of this instance.
-     */
-    negate(): Timespan;
-}
diff --git a/types/sharp-timer/sharp-timer-tests.ts b/types/sharp-timer/sharp-timer-tests.ts
deleted file mode 100644
index a2ec71ac3c..0000000000
--- a/types/sharp-timer/sharp-timer-tests.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Timer, Stopwatch, Timespan, millisPerSecond } from 'sharp-timer';
-
-const millisecondsPerSecond = millisPerSecond;
-
-// timer test
-const timer = new Timer(10);
-timer.toString();
-timer.onIntervalElapsing(i => { });
-timer.onIntervalElapsed(() => {
-    timer.stop();
-});
-
-timer.start();
-
-// stopwatch test
-const stopwatch = Stopwatch.startNew();
-
-const intervalId = setInterval(() => { }, 10);
-
-setTimeout(() => {
-    clearInterval(intervalId);
-    stopwatch.dispose();
-}, 100);
-
-// timespan test
-const {
-    days,
-    hours,
-    minutes,
-    seconds,
-    milliseconds
-} = Timespan.fromDays(2);
diff --git a/types/sharp-timer/tsconfig.json b/types/sharp-timer/tsconfig.json
deleted file mode 100644
index b7ab232b28..0000000000
--- a/types/sharp-timer/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "sharp-timer-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/sharp-timer/v0/index.d.ts b/types/sharp-timer/v0/index.d.ts
deleted file mode 100644
index c5be32264c..0000000000
--- a/types/sharp-timer/v0/index.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for sharp-timer 0.3
-// Project: https://github.com/afractal/SharpTimer
-// Definitions by: Hermes Gjini - afractal <https://github.com/afractal>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export type ElapsedEvent = () => void;
-export type ElapsingEvent = (intervalValue: number) => void;
-
-export class Timer {
-    private _enabled;
-    private _stopped;
-    private _interval;
-    private _intervalElapsedEvents;
-    private _intervalElapsingEvents;
-    constructor(interval: number);
-    readonly enabled: boolean;
-    readonly stopped: boolean;
-    interval: number;
-    start(): void;
-    pause(): void;
-    resume(): void;
-    stop(): void;
-    onIntervalElapsed(intervalElapsedHandler: ElapsedEvent): void;
-    onIntervalElapsing(intervalElapsingHandler: ElapsingEvent): void;
-    toString(): string;
-    private getDoubleDigit(number);
-    private checkForValidInterval(interval);
-}
-
-export class Stopwatch {
-    private _isRunning;
-    private _elapsedMilliseconds;
-    private _startedTimeInMillis;
-    private _intervalIds;
-    private static readonly millisPerSecond;
-    private static readonly millisPerMinute;
-    private static readonly millisPerHour;
-    constructor();
-    readonly elapsed: string;
-    readonly elapsedMilliseconds: number;
-    readonly elapsedSeconds: number;
-    readonly elapsedMinutes: number;
-    readonly elapsedHours: number;
-    readonly isRunning: boolean;
-    static startNew(): Stopwatch;
-    start(): void;
-    stop(): void;
-    reset(): void;
-    restart(): void;
-    dispose(): void;
-    private getDoubleDigit(num);
-}
diff --git a/types/sharp-timer/v0/sharp-timer-tests.ts b/types/sharp-timer/v0/sharp-timer-tests.ts
deleted file mode 100644
index e99e550df7..0000000000
--- a/types/sharp-timer/v0/sharp-timer-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Timer, Stopwatch } from 'sharp-timer';
-
-const timer = new Timer(10);
-
-timer.onIntervalElapsing(i => { });
-timer.onIntervalElapsed(() => {
-    timer.stop();
-});
-
-timer.start();
diff --git a/types/sharp-timer/v0/tsconfig.json b/types/sharp-timer/v0/tsconfig.json
deleted file mode 100644
index 423755928a..0000000000
--- a/types/sharp-timer/v0/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "sharp-timer": [
-                "sharp-timer/v0"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "sharp-timer-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index 710416f109..69f4bc970a 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -9,10 +9,10 @@ import { Duplex } from "stream";
 
 /**
  * Creates a sharp instance from an image
- * @param {string} input Buffer containing JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data, or String containing the path to an JPEG, PNG, WebP, GIF, SVG or TIFF image file.
- * @param {sharp.SharpOptions} options Object with optional attributes.
+ * @param input Buffer containing JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data, or String containing the path to an JPEG, PNG, WebP, GIF, SVG or TIFF image file.
+ * @param options Object with optional attributes.
  * @throws {Error} Invalid parameters
- * @returns {sharp.SharpInstance} A sharp instance that can be used to chain operations
+ * @returns A sharp instance that can be used to chain operations
  */
 declare function sharp(input?: string | Buffer, options?: sharp.SharpOptions): sharp.SharpInstance;
 declare namespace sharp {
@@ -22,24 +22,23 @@ declare namespace sharp {
      * Gets, or when options are provided sets, the limits of libvips' operation cache.
      * Existing entries in the cache will be trimmed after any change in limits.
      * This method always returns cache statistics, useful for determining how much working memory is required for a particular task.
-     * @param {boolean|sharp.CacheOptions} options Object with the cache options, or Boolean where true uses default cache settings and false removes all caching.
-     * @returns {Object}
+     * @param options Object with the cache options, or Boolean where true uses default cache settings and false removes all caching.
      */
     function cache(options?: boolean | CacheOptions): CacheResult;
     /**
      * Gets, or when a concurrency is provided sets, the number of threads libvips' should create to process each image.
-     * @param {number} concurrency concurrency value
+     * @param concurrency concurrency value
      */
     function concurrency(threads?: number): number;
     /**
      * Provides access to internal task counters.
-     * @returns {sharp.SharpCounters} Object containing task counters
+     * @returns Object containing task counters
      */
     function counters(): SharpCounters;
     /**
      * Get and set use of SIMD vector unit instructions.
-     * @param {boolean} enable enable or disable use of SIMD vector unit instructions
-     * @returns {boolean} true if usage of SIMD vector unit instructions is enabled
+     * @param enable enable or disable use of SIMD vector unit instructions
+     * @returns true if usage of SIMD vector unit instructions is enabled
      */
     function simd(enable?: boolean): boolean;
     const kernel: KernelEnum;
@@ -82,67 +81,67 @@ declare namespace sharp {
     interface SharpInstance extends Duplex {
         /**
          * Fast access to image metadata without decoding any compressed image data.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         metadata(callback: (err: Error, metadata: Metadata) => void): SharpInstance;
         /**
          * Fast access to image metadata without decoding any compressed image data.
-         * @returns {Promise<Metadata>} A promise that fulfills with a metadata object.
+         * @returns A promise that fulfills with a metadata object.
          */
         metadata(): Promise<Metadata>;
         /**
          * Take a "snapshot" of the Sharp instance, returning a new instance.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         clone(): SharpInstance;
         /**
          * An advanced setting that switches the libvips access method to VIPS_ACCESS_SEQUENTIAL.
-         * @param {boolean} sequentialRead true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param sequentialRead true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         sequentialRead(sequentialRead?: boolean): SharpInstance;
         /**
          * Do not process input images where the number of pixels (width _ height) exceeds this limit.
-         * @param {number|boolean} pixels An integral Number of pixels, zero or false to remove limit, true to use default limit.
+         * @param pixels An integral Number of pixels, zero or false to remove limit, true to use default limit.
          * @throws {Error} Invalid limit
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         limitInputPixels(pixels: number | boolean): SharpInstance;
         /**
          * Resize image to width x height. By default, the resized image is centre cropped to the exact size specified.
-         * @param {number} width pixels wide the resultant image should be, between 1 and 16383 (0x3FFF). Use null or  undefined to auto-scale the width to match the height.
-         * @param {number} height pixels high the resultant image should be, between 1 and 16383. Use null or undefined to auto-scale the height to match the width.
-         * @param {ResizeOptions} options resize options
+         * @param width pixels wide the resultant image should be, between 1 and 16383 (0x3FFF). Use null or  undefined to auto-scale the width to match the height.
+         * @param height pixels high the resultant image should be, between 1 and 16383. Use null or undefined to auto-scale the height to match the width.
+         * @param options resize options
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         resize(width?: number, height?: number, options?: ResizeOptions): SharpInstance;
         /**
          * Crop the resized image to the exact size specified, the default behaviour.
-         * @param {number|string} crop A member of sharp.gravity to crop to an edge/corner or sharp.strategy to crop dynamically. (optional, default 'centre')
+         * @param crop A member of sharp.gravity to crop to an edge/corner or sharp.strategy to crop dynamically. (optional, default 'centre')
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         crop(crop?: number | string): SharpInstance;
         /**
          * Preserving aspect ratio, resize the image to the maximum width or height specified then embed on a background of the exact width and height specified.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         embed(): SharpInstance;
         /**
          * Preserving aspect ratio, resize the image to be as large as possible while ensuring its dimensions are less than or equal to the width and height specified.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         max(): SharpInstance;
         /**
          * Preserving aspect ratio, resize the image to be as small as possible while ensuring its dimensions are greater than or equal to the width and height specified.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         min(): SharpInstance;
         /**
          * Do not enlarge the output image if the input image width or height are already less than the required dimensions.
-         * @param {boolean} withoutEnlargement true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param withoutEnlargement true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         withoutEnlargement(withoutEnlargement?: boolean): SharpInstance;
         /**
@@ -151,99 +150,99 @@ declare namespace sharp {
         ignoreAspectRatio(): SharpInstance;
         /**
          * Extract a region of the image.
-         * @param {Region} region Region to extract
+         * @param region Region to extract
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         extract(region: Region): SharpInstance;
         /**
          * Trim "boring" pixels from all edges that contain values within a percentage similarity of the top-left pixel.
-         * @param {number} tolerance value between 1 and 99 representing the percentage similarity. (optional, default 10)
+         * @param tolerance value between 1 and 99 representing the percentage similarity. (optional, default 10)
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         trim(tolerance?: number): SharpInstance;
         /**
          * Set the background for the embed, flatten and extend operations. The default background is {r: 0, g: 0, b: 0, alpha: 1}, black without transparency.
-         * @param {RGBA|string} rgba String or Object parsed by the color module to extract values for red, green, blue and alpha.
+         * @param rgba String or Object parsed by the color module to extract values for red, green, blue and alpha.
          * @throws {Error} Invalid parameter
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         background(rgba?: RGBA | string): SharpInstance; // Wait for typings to fetch latest color typings from DT
         /**
          * Merge alpha transparency channel, if any, with background.
-         * @param {boolean} flatten true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param flatten true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         flatten(flatten?: boolean): SharpInstance;
         /**
          * Extends/pads the edges of the image with the colour provided to the background method.
-         * @param {number|ExtendOptions} extend single pixel count to add to all edges or an Object with per-edge counts
+         * @param extend single pixel count to add to all edges or an Object with per-edge counts
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         extend(extend: number | ExtendOptions): SharpInstance;
         /**
          * Produce the "negative" of the image.
-         * @param {boolean} negate true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param negate true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         negate(negate?: boolean): SharpInstance;
         /**
          * Rotate the output image by either an explicit angle or auto-orient based on the EXIF Orientation tag.
-         * @param {number} angle 0, 90, 180 or 270. (optional, default auto)
+         * @param angle 0, 90, 180 or 270. (optional, default auto)
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         rotate(angle?: number): SharpInstance;
         /**
          * Flip the image about the vertical Y axis.
-         * @param {boolean} flip true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param flip true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         flip(flip?: boolean): SharpInstance;
         /**
          * Flop the image about the horizontal X axis.
-         * @param {boolean} flop true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param flop true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         flop(flop?: boolean): SharpInstance;
         /**
          * Blur the image.
-         * @param {number} sigma a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where sigma = 1 + radius / 2.
+         * @param sigma a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where sigma = 1 + radius / 2.
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         blur(sigma?: number): SharpInstance;
         /**
          * Convolve the image with the specified kernel.
-         * @param {Kernel} kernel the specified kernel
+         * @param kernel the specified kernel
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         convolve(kernel: Kernel): SharpInstance;
         /**
          * Sharpen the image.
-         * @param {number} sigma the sigma of the Gaussian mask, where sigma = 1 + radius / 2.
-         * @param {number} flat the level of sharpening to apply to "flat" areas. (optional, default 1.0)
-         * @param {number} jagged the level of sharpening to apply to "jagged" areas. (optional, default 2.0)
+         * @param sigma the sigma of the Gaussian mask, where sigma = 1 + radius / 2.
+         * @param flat the level of sharpening to apply to "flat" areas. (optional, default 1.0)
+         * @param jagged the level of sharpening to apply to "jagged" areas. (optional, default 2.0)
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         sharpen(sigma?: number, flat?: number, jagged?: number): SharpInstance;
         /**
          * Any pixel value greather than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
-         * @param {number} threshold a value in the range 0-255 representing the level at which the threshold will be applied. (optional, default 128)
-         * @param {ThresholdOptions} options threshold options
+         * @param threshold a value in the range 0-255 representing the level at which the threshold will be applied. (optional, default 128)
+         * @param options threshold options
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         threshold(threshold?: number, options?: ThresholdOptions): SharpInstance;
         /**
          * Apply a gamma correction by reducing the encoding (darken) pre-resize at a factor of 1/gamma then increasing the encoding (brighten) post-resize at a factor of gamma.
-         * @param {number} gamma value between 1.0 and 3.0. (optional, default 2.2)
+         * @param gamma value between 1.0 and 3.0. (optional, default 2.2)
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         gamma(gamma?: number): SharpInstance;
         /**
@@ -254,8 +253,8 @@ declare namespace sharp {
          * By default the output image will be web-friendly sRGB and contain three (identical) color channels.
          * This may be overridden by other sharp operations such as toColourspace('b-w'), which will produce an output image containing one color channel.
          * An alpha channel may be present, and will be unchanged by the operation.
-         * @param {boolean} grayscale true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param grayscale true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         grayscale(grayscale?: boolean): SharpInstance;
         /**
@@ -265,157 +264,156 @@ declare namespace sharp {
          * By default the output image will be web-friendly sRGB and contain three (identical) color channels.
          * This may be overridden by other sharp operations such as toColourspace('b-w'), which will produce an output image containing one color channel.
          * An alpha channel may be present, and will be unchanged by the operation.
-         * @param {boolean} greyscale true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param greyscale true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         greyscale(greyscale?: boolean): SharpInstance;
         /**
          * Enhance output image contrast by stretching its luminance to cover the full dynamic range.
-         * @param {boolean} normalize true to enable and false to disable (defaults to true)
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param normalize true to enable and false to disable (defaults to true)
+         * @returns A sharp instance that can be used to chain operations
          */
         normalize(normalize?: boolean): SharpInstance;
         /**
          * Alternative spelling of normalise.
          * Enhance output image contrast by stretching its luminance to cover the full dynamic range.
-         * @param {boolean} normalise true to enable and false to disable (defaults to true)
+         * @param normalise true to enable and false to disable (defaults to true)
          */
         normalise(normalise?: boolean): SharpInstance;
         /**
          * Overlay (composite) an image over the processed (resized, extracted etc.) image.
-         * @param {string|Buffer} image Buffer containing image data or String containing the path to an image file.
-         * @param {OverlayOptions} options overlay options
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param image Buffer containing image data or String containing the path to an image file.
+         * @param options overlay options
+         * @returns A sharp instance that can be used to chain operations
          */
         overlayWith(image: string | Buffer, options?: OverlayOptions): SharpInstance;
         /**
          * Set the output colourspace.
-         * @param {string} colourspace output colourspace e.g. srgb, rgb, cmyk, lab, b-w ...
+         * @param colourspace output colourspace e.g. srgb, rgb, cmyk, lab, b-w ...
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         toColourspace(colourspace?: string): SharpInstance;
         /**
          * Alternative spelling of toColourspace.
          * Set the output colorspace.
-         * @param {string} colorspace output colourspace e.g. srgb, rgb, cmyk, lab, b-w ...
+         * @param colorspace output colourspace e.g. srgb, rgb, cmyk, lab, b-w ...
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         toColorspace(colorspace: string): SharpInstance;
         /**
          * Extract a single channel from a multi-channel image.
-         * @param {number|string} channel zero-indexed band number to extract, or red, green or blue as alternative to 0, 1 or 2 respectively.
+         * @param channel zero-indexed band number to extract, or red, green or blue as alternative to 0, 1 or 2 respectively.
          * @throws {Error} Invalid channel
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         extractChannel(channel: number | string): SharpInstance;
         /**
          * Join one or more channels to the image. The meaning of the added channels depends on the output colourspace, set with toColourspace().
-         * @param {string|string[]|Buffer|Buffer[]} channels one or more images (file paths, Buffers).
-         * @param {{raw:Raw}} options image options
+         * @param channels one or more images (file paths, Buffers).
+         * @param options image options
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         joinChannel(channels: string | string[] | Buffer | Buffer[], options?: { raw: Raw }): SharpInstance;
         /**
          * Perform a bitwise boolean operation on all input image channels (bands) to produce a single channel output image.
-         * @param {string} boolOp one of and, or or eor to perform that bitwise operation, like the C logic operators &, | and ^ respectively.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @param boolOp one of and, or or eor to perform that bitwise operation, like the C logic operators &, | and ^ respectively.
+         * @returns A sharp instance that can be used to chain operations
          */
         bandbool(boolOp: string): SharpInstance;
         /**
          * Perform a bitwise boolean operation with operand image.
-         * @param {string|Buffer} image Buffer containing image data or String containing the path to an image file.
-         * @param {strip} operator one of and, or or eor to perform that bitwise operation, like the C logic operators &, | and ^ respectively.
-         * @param {{raw:Raw}} options describes operand when using raw pixel data.
+         * @param image Buffer containing image data or String containing the path to an image file.
+         * @param operator one of and, or or eor to perform that bitwise operation, like the C logic operators &, | and ^ respectively.
+         * @param options describes operand when using raw pixel data.
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         boolean(operand: string | Buffer, operator: string, options?: { raw: Raw }): SharpInstance;
         /**
          * Write output image data to a file.
-         * @param {string} fileOut The path to write the image data to.
-         * @param {Function} callback Callback function called on completion with two arguments (err, info).  info contains the output image format, size (bytes), width, height and channels.
+         * @param fileOut The path to write the image data to.
+         * @param callback Callback function called on completion with two arguments (err, info).  info contains the output image format, size (bytes), width, height and channels.
          * @throws {Error} Invalid parameters
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         toFile(fileOut: string, callback: (err: Error, info: OutputInfo) => void): SharpInstance;
         /**
          * Write output image data to a file.
-         * @param {string} fileOut The path to write the image data to.
+         * @param fileOut The path to write the image data to.
          * @throws {Error} Invalid parameters
-         * @returns {Promise<OutputInfo>} A promise that fulfills with an object containing informations on the resulting file
+         * @returns A promise that fulfills with an object containing informations on the resulting file
          */
         toFile(fileOut: string): Promise<OutputInfo>;
         /**
          * Write output to a Buffer. JPEG, PNG, WebP, and RAW output are supported. By default, the format will match the input image, except GIF and SVG input which become PNG output.
-         * @param {Function} callback Callback function called on completion with three arguments (err, buffer, info).
+         * @param callback Callback function called on completion with three arguments (err, buffer, info).
          *                            err is an error message, if any.
          *                            buffer is the output image data.
          *                            info contains the output image format, size (bytes), width, height and channels.
          *                            A Promises/A+ promise is returned when callback is not provided.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         toBuffer(callback: (err: Error, buffer: Buffer, info: OutputInfo) => void): SharpInstance;
         /**
          * Write output to a Buffer. JPEG, PNG, WebP, and RAW output are supported. By default, the format will match the input image, except GIF and SVG input which become PNG output.
-         * @returns {Promise<Buffer>} A promise that fulfills with the resulting Buffer
+         * @returns A promise that fulfills with the resulting Buffer
          */
         toBuffer(): Promise<Buffer>;
         /**
          * Use these JPEG options for output image.
-         * @param {JpegOptions} options Output options.
+         * @param options Output options.
          * @throws {Error} Invalid options
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         jpeg(options?: JpegOptions): SharpInstance;
         /**
          * Use these PNG options for output image.
-         * @param {PngOptions} options Output options.
+         * @param options Output options.
          * @throws {Error} Invalid options
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         png(options?: PngOptions): SharpInstance;
         /**
          * Use these WebP options for output image.
-         * @param {OutputOptions} options Output options.
+         * @param options Output options.
          * @throws {Error} Invalid options
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         webp(options?: OutputOptions): SharpInstance;
         /**
          * Use these TIFF options for output image.
-         * @param {OutputOptions} options Output options.
+         * @param options Output options.
          * @throws {Error} Invalid options
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         tiff(options?: OutputOptions): SharpInstance;
         /**
          * Force output to be raw, uncompressed uint8 pixel data.
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         raw(): SharpInstance;
         /**
          * Force output to a given format.
-         * @param {string|AvailableFormatInfo} format a String or an Object with an 'id' attribute
-         * @param {OutputOptions|JpegOptions|PngOptions} options output options
+         * @param format a String or an Object with an 'id' attribute
+         * @param options output options
          * @throws {Error} Unsupported format or options
-         * @returns {SharpInstance} A sharp instance that can be used to chain operations
+         * @returns A sharp instance that can be used to chain operations
          */
         toFormat(format: string | AvailableFormatInfo, options?: OutputOptions | JpegOptions | PngOptions): SharpInstance;
         /**
          * Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
          * The default behaviour, when withMetadata is not used, is to strip all metadata and convert to the device-independent sRGB colour space.
          * This will also convert to and add a web-friendly sRGB ICC profile.
-         * @param {Metadata}
          * @throws {Error} Invalid parameters.
          */
         withMetadata(metadata?: Metadata): SharpInstance;
         /**
          * Use tile-based deep zoom (image pyramid) output. Set the format and options for tile images via the  toFormat, jpeg, png or webp functions.
          * Use a .zip or .szi file extension with toFile to write to a compressed archive file format.
-         * @param {TileOptions} options options
+         * @param options options
          */
         tile(options: TileOptions): SharpInstance;
     }
@@ -425,6 +423,8 @@ declare namespace sharp {
         density?: number;
         /** describes raw pixel image data. */
         raw?: Raw;
+        /** describes a blank overlay to be created. */
+        create?: Create;
     }
 
     interface CacheOptions {
@@ -447,6 +447,17 @@ declare namespace sharp {
         channels: number;
     }
 
+    interface Create {
+        /** Number of pixels wide */
+        width: number;
+        /** Number of pixels high */
+        height: number;
+        /** Number of bands e.g. 3 for RGB, 4 for RGBA */
+        channels: number;
+        /** parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha. */
+        background: string | RGBA;
+    }
+
     interface Metadata {
         /** Name of decoder used to decompress image data e.g. jpeg, png, webp, gif, svg */
         format?: string;
diff --git a/types/shelljs/index.d.ts b/types/shelljs/index.d.ts
index d2bc88875c..8d96561a1d 100644
--- a/types/shelljs/index.d.ts
+++ b/types/shelljs/index.d.ts
@@ -11,421 +11,293 @@ import glob = require("glob");
 
 /**
  * Changes to directory dir for the duration of the script
- * @param {string} dir Directory to change in.
+ * @param dir Directory to change in.
  */
 export function cd(dir: string): void;
 
 /**
  * Returns the current directory.
- * @return {string} The current directory.
+ * @return The current directory.
  */
-export function pwd(): string;
+export function pwd(): ShellString;
 
 /**
  * Returns array of files in the given path, or in current directory if no path provided.
- * @param  {string[]} ...paths Paths to search.
- * @return {string[]}          An array of files in the given path(s).
+ * @param  ...paths Paths to search.
+ * @return          An array of files in the given path(s).
  */
-export function ls(...paths: string[]): string[];
+export function ls(...paths: Array<string | string[]>): ShellArray;
 
 /**
  * Returns array of files in the given path, or in current directory if no path provided.
- * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
- * @param  {string[]} ...paths Paths to search.
- * @return {string[]}          An array of files in the given path(s).
+ * @param    options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
+ * @param  ...paths Paths to search.
+ * @return          An array of files in the given path(s).
  */
-export function ls(options: string, ...paths: string[]): string[];
-
-/**
- * Returns array of files in the given path, or in current directory if no path provided.
- * @param  {string[]} paths Paths to search.
- * @return {string[]}       An array of files in the given path(s).
- */
-export function ls(paths: string[]): string[];
-
-/**
- * Returns array of files in the given path, or in current directory if no path provided.
- * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
- * @param  {string[]} paths    Paths to search.
- * @return {string[]}          An array of files in the given path(s).
- */
-export function ls(options: string, paths: string[]): string[];
+export function ls(options: string, ...paths: Array<string | string[]>): ShellArray;
 
 /**
  * Returns array of all files (however deep) in the given paths.
- * @param {string[]} ...path   The path(s) to search.
- * @return {string[]}          An array of all files (however deep) in the given path(s).
+ * @param ...path   The path(s) to search.
+ * @return          An array of all files (however deep) in the given path(s).
  */
-export function find(...path: string[]): string[];
-
-/**
- * Returns array of all files (however deep) in the given paths.
- * @param {string[]} path   The path(s) to search.
- * @return {string[]}       An array of all files (however deep) in the given path(s).
- */
-export function find(path: string[]): string[];
+export function find(...path: Array<string | string[]>): ShellArray;
 
 /**
  * Copies files. The wildcard * is accepted.
- * @param {string} source  The source.
- * @param {string}   dest  The destination.
+ * @param source  The source.
+ * @param   dest  The destination.
  */
-export function cp(source: string, dest: string): void;
+export function cp(source: string | string[], dest: string): void;
 
 /**
  * Copies files. The wildcard * is accepted.
- * @param {string[]} source  The source.
- * @param {string}   dest    The destination.
+ * @param options Available options: -f (force), -r, -R (recursive)
+ * @param source  The source.
+ * @param dest    The destination.
  */
-export function cp(source: string[], dest: string): void;
-
-/**
- * Copies files. The wildcard * is accepted.
- * @param {string}   options Available options: -f (force), -r, -R (recursive)
- * @param {strin]}   source  The source.
- * @param {string}   dest    The destination.
- */
-export function cp(options: string, source: string, dest: string): void;
-
-/**
- * Copies files. The wildcard * is accepted.
- * @param {string}   options Available options: -f (force), -r, -R (recursive)
- * @param {string[]} source  The source.
- * @param {string}   dest    The destination.
- */
-export function cp(options: string, source: string[], dest: string): void;
+export function cp(options: string, source: string | string[], dest: string): void;
 
 /**
  * Removes files. The wildcard * is accepted.
- * @param {string[]} ...files Files to remove.
+ * @param ...files Files to remove.
  */
-export function rm(...files: string[]): void;
+export function rm(...files: Array<string | string[]>): void;
 
 /**
  * Removes files. The wildcard * is accepted.
- * @param {string[]} files Files to remove.
+ * @param   options  Available options: -f (force), -r, -R (recursive)
+ * @param ...files Files to remove.
  */
-export function rm(files: string[]): void;
-
-/**
- * Removes files. The wildcard * is accepted.
- * @param {string}   options  Available options: -f (force), -r, -R (recursive)
- * @param {string[]} ...files Files to remove.
- */
-export function rm(options: string, ...files: string[]): void;
-
-/**
- * Removes files. The wildcard * is accepted.
- * @param {string}   options  Available options: -f (force), -r, -R (recursive)
- * @param {string[]} ...files Files to remove.
- */
-export function rm(options: string, files: string[]): void;
+export function rm(options: string, ...files: Array<string | string[]>): void;
 
 /**
  * Moves files. The wildcard * is accepted.
- * @param {string} source The source.
- * @param {string} dest   The destination.
+ * @param source The source.
+ * @param dest   The destination.
  */
-export function mv(source: string, dest: string): void;
-
-/**
- * Moves files. The wildcard * is accepted.
- * @param {string[]} source The source.
- * @param {string}   dest   The destination.
- */
-export function mv(source: string[], dest: string): void;
+export function mv(source: string | string[], dest: string): void;
 
 /**
  * Creates directories.
- * @param {string[]} ...dir Directories to create.
+ * @param ...dir Directories to create.
  */
-export function mkdir(...dir: string[]): void;
+export function mkdir(...dir: Array<string | string[]>): void;
 
 /**
  * Creates directories.
- * @param {string[]} dir Directories to create.
+ * @param   options Available options: p (full paths, will create intermediate dirs if necessary)
+ * @param ...dir  The directories to create.
  */
-export function mkdir(dir: string[]): void;
-
-/**
- * Creates directories.
- * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
- * @param {string[]} ...dir  The directories to create.
- */
-export function mkdir(options: string, ...dir: string[]): void;
-
-/**
- * Creates directories.
- * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
- * @param {string[]} dir     The directories to create.
- */
-export function mkdir(options: string, dir: string[]): void;
+export function mkdir(options: string, ...dir: Array<string | string[]>): void;
 
 /**
  * Evaluates expression using the available primaries and returns corresponding value.
- * @param  {string}  option '-b': true if path is a block device; '-c': true if path is a character device; '-d': true if path is a directory; '-e': true if path exists; '-f': true if path is a regular file; '-L': true if path is a symboilc link; '-p': true if path is a pipe (FIFO); '-S': true if path is a socket
- * @param  {string}  path   The path.
- * @return {boolean}        See option parameter.
+ * @param   option '-b': true if path is a block device; '-c': true if path is a character device; '-d': true if path is a directory; '-e': true if path exists; '-f': true if path is a regular file; '-L': true if path is a symboilc link; '-p': true if path is a pipe (FIFO); '-S': true if path is a socket
+ * @param   path   The path.
+ * @return        See option parameter.
  */
 export function test(option: string, path: string): boolean;
 
 /**
  * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
- * @param  {string[]} ...files Files to use.
- * @return {string}            A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
+ * @param  ...files Files to use.
+ * @return            A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
  */
-export function cat(...files: string[]): string;
-
-/**
- * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
- * @param  {string[]} files Files to use.
- * @return {string}         A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
- */
-export function cat(files: string[]): string;
-
-// Does not work yet.
-export interface String {
-    /**
-     * Analogous to the redirection operator > in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc). Like Unix redirections, to() will overwrite any existing file!
-     * @param {string} file The file to use.
-     */
-    to(file: string): void;
-
-    /**
-     * Analogous to the redirect-and-append operator >> in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc).
-     * @param {string} file The file to append to.
-     */
-    toEnd(file: string): void;
-}
+export function cat(...files: Array<string | string[]>): ShellString;
 
 /**
  * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
- * @param  {RegExp} searchRegex The regular expression to use for search.
- * @param  {string} replacement The replacement.
- * @param  {string} file        The file to process.
- * @return {string}             The new string after replacement.
+ * @param  searchRegex The regular expression to use for search.
+ * @param  replacement The replacement.
+ * @param  file        The file to process.
+ * @return             The new string after replacement.
  */
-export function sed(searchRegex: RegExp, replacement: string, file: string): string;
+export function sed(searchRegex: string | RegExp, replacement: string, file: string): ShellString;
 
 /**
  * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
- * @param  {string} searchRegex The regular expression to use for search.
- * @param  {string} replacement The replacement.
- * @param  {string} file        The file to process.
- * @return {string}             The new string after replacement.
+ * @param  options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
+ * @param  searchRegex The regular expression to use for search.
+ * @param  replacement The replacement.
+ * @param  file        The file to process.
+ * @return             The new string after replacement.
  */
-export function sed(searchRegex: string, replacement: string, file: string): string;
-
-/**
- * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
- * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
- * @param  {RegExp} searchRegex The regular expression to use for search.
- * @param  {string} replacement The replacement.
- * @param  {string} file        The file to process.
- * @return {string}             The new string after replacement.
- */
-export function sed(options: string, searchRegex: RegExp, replacement: string, file: string): string;
-
-/**
- * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
- * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
- * @param  {string} searchRegex The regular expression to use for search.
- * @param  {string} replacement The replacement.
- * @param  {string} file        The file to process.
- * @return {string}             The new string after replacement.
- */
-export function sed(options: string, searchRegex: string, replacement: string, file: string): string;
+export function sed(options: string, searchRegex: string | RegExp, replacement: string, file: string): ShellString;
 
 /**
  * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
- * @param  {RegExp}   regex_filter The regular expression to use.
- * @param  {string[]} ...files     The files to process.
- * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ * @param    regex_filter The regular expression to use.
+ * @param  ...files     The files to process.
+ * @return                Returns a string containing all lines of the file that match the given regex_filter.
  */
-export function grep(regex_filter: RegExp, ...files: string[]): string;
+export function grep(regex_filter: string | RegExp, ...files: Array<string | string[]>): ShellString;
 
 /**
  * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
- * @param  {RegExp}   regex_filter The regular expression to use.
- * @param  {string[]} ...files     The files to process.
- * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ * @param    options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
+ * @param    regex_filter The regular expression to use.
+ * @param  ...files     The files to process.
+ * @return                Returns a string containing all lines of the file that match the given regex_filter.
  */
-export function grep(regex_filter: RegExp, files: string[]): string;
-
-/**
- * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
- * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
- * @param  {string}   regex_filter The regular expression to use.
- * @param  {string[]} ...files     The files to process.
- * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
- */
-export function grep(options: string, regex_filter: string, ...files: string[]): string;
-
-/**
- * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
- * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
- * @param  {string}   regex_filter The regular expression to use.
- * @param  {string[]} files        The files to process.
- * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
- */
-export function grep(options: string, regex_filter: string, files: string[]): string;
+export function grep(options: string, regex_filter: string | RegExp, ...files: Array<string | string[]>): ShellString;
 
 /**
  * Searches for command in the system's PATH. On Windows looks for .exe, .cmd, and .bat extensions.
- * @param  {string} command The command to search for.
- * @return {string}         Returns string containing the absolute path to the command.
+ * @param  command The command to search for.
+ * @return         Returns string containing the absolute path to the command.
  */
-export function which(command: string): string;
+export function which(command: string): ShellString;
 
 /**
  * Prints string to stdout, and returns string with additional utility methods like .to().
- * @param  {string[]} ...text The text to print.
- * @return {string}           Returns the string that was passed as argument.
+ * @param  ...text The text to print.
+ * @return           Returns the string that was passed as argument.
  */
-export function echo(...text: string[]): string;
+export function echo(...text: string[]): ShellString;
 
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
- * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
- * @return {string[]}     Returns an array of paths in the stack.
+ * @param      dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return     Returns an array of paths in the stack.
  */
-export function pushd(dir: "+N"): string[];
+export function pushd(dir: "+N"): ShellArray;
 
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
- * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
- * @return {string[]}     Returns an array of paths in the stack.
+ * @param      dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return     Returns an array of paths in the stack.
  */
-export function pushd(dir: "-N"): string[];
+export function pushd(dir: "-N"): ShellArray;
 
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
- * @param  {string}     dir Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
- * @return {string[]}       Returns an array of paths in the stack.
+ * @param      dir Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
+ * @return       Returns an array of paths in the stack.
  */
-export function pushd(dir: string): string[];
+export function pushd(dir: string): ShellArray;
 
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
- * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
- * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
- * @return {string[]}     Returns an array of paths in the stack.
+ * @param    options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param      dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return     Returns an array of paths in the stack.
  */
-export function pushd(options: string, dir: "+N"): string[];
+export function pushd(options: string, dir: "+N"): ShellArray;
 
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
- * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
- * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
- * @return {string[]}     Returns an array of paths in the stack.
+ * @param    options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param      dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return     Returns an array of paths in the stack.
  */
-export function pushd(options: string, dir: "-N"): string[];
+export function pushd(options: string, dir: "-N"): ShellArray;
 
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
- * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
- * @param  {string}   dir     Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
- * @return {string[]}         Returns an array of paths in the stack.
+ * @param    options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param    dir     Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
+ * @return         Returns an array of paths in the stack.
  */
-export function pushd(options: string, dir: string): string[];
+export function pushd(options: string, dir: string): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param  {"+N"}     dir Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
- * @return {string[]}     Returns an array of paths in the stack.
+ * @param      dir Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
+ * @return     Returns an array of paths in the stack.
  */
-export function popd(dir: "+N"): string[];
+export function popd(dir: "+N"): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @return {string[]}     Returns an array of paths in the stack.
+ * @return     Returns an array of paths in the stack.
  */
-export function popd(): string[];
+export function popd(): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param  {"-N"}     dir Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
- * @return {string[]}     Returns an array of paths in the stack.
+ * @param      dir Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
+ * @return     Returns an array of paths in the stack.
  */
-export function popd(dir: "-N"): string[];
+export function popd(dir: "-N"): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param  {string}     dir You can only use -N and +N.
- * @return {string[]}       Returns an array of paths in the stack.
+ * @param      dir You can only use -N and +N.
+ * @return       Returns an array of paths in the stack.
  */
-export function popd(dir: string): string[];
+export function popd(dir: string): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
- * @param  {"+N"}     dir     Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
- * @return {string[]}         Returns an array of paths in the stack.
+ * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param      dir     Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
+ * @return         Returns an array of paths in the stack.
  */
-export function popd(options: string, dir: "+N"): string[];
+export function popd(options: string, dir: "+N"): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
- * @param  {"-N"}     dir     Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
- * @return {string[]}         Returns an array of paths in the stack.
+ * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param      dir     Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
+ * @return         Returns an array of paths in the stack.
  */
-export function popd(options: string, dir: "-N"): string[];
+export function popd(options: string, dir: "-N"): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
- * @param  {string}   dir     You can only use -N and +N.
- * @return {string[]}         Returns an array of paths in the stack.
+ * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param    dir     You can only use -N and +N.
+ * @return         Returns an array of paths in the stack.
  */
-export function popd(options: string, dir: string): string[];
+export function popd(options: string, dir: string): ShellArray;
 
 /**
  * Clears the directory stack by deleting all of the elements.
- * @param  {"-c"}     options Clears the directory stack by deleting all of the elements.
- * @return {string[]}         Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param      options Clears the directory stack by deleting all of the elements.
+ * @return         Returns an array of paths in the stack, or a single path if +N or -N was specified.
  */
-export function dirs(options: "-c"): string[];
+export function dirs(options: "-c"): ShellArray;
 
 /**
  * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
- * @param  {"+N"}   options Displays the Nth directory (counting from the left of the list printed by dirs when invoked without options), starting with zero.
- * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param    options Displays the Nth directory (counting from the left of the list printed by dirs when invoked without options), starting with zero.
+ * @return       Returns an array of paths in the stack, or a single path if +N or -N was specified.
  */
-export function dirs(options: "+N"): string;
+export function dirs(options: "+N"): ShellString;
 
 /**
  * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
- * @param  {"-N"}   options Displays the Nth directory (counting from the right of the list printed by dirs when invoked without options), starting with zero.
- * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param    options Displays the Nth directory (counting from the right of the list printed by dirs when invoked without options), starting with zero.
+ * @return       Returns an array of paths in the stack, or a single path if +N or -N was specified.
  */
-export function dirs(options: "-N"): string;
+export function dirs(options: "-N"): ShellString;
 
 /**
  * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
- * @param  {string} options Available options: -c, -N, +N. You can only use those.
- * @return {any}            Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param  options Available options: -c, -N, +N. You can only use those.
+ * @return            Returns an array of paths in the stack, or a single path if +N or -N was specified.
  */
 export function dirs(options: string): any;
 
 /**
  * Links source to dest. Use -f to force the link, should dest already exist.
- * @param {string} source The source.
- * @param {string} dest   The destination.
+ * @param source The source.
+ * @param dest   The destination.
  */
 export function ln(source: string, dest: string): void;
 
 /**
  * Links source to dest. Use -f to force the link, should dest already exist.
- * @param {string} options Available options: s (symlink), f (force)
- * @param {string} source The source.
- * @param {string} dest   The destination.
+ * @param options Available options: s (symlink), f (force)
+ * @param source The source.
+ * @param dest   The destination.
  */
 export function ln(options: string, source: string, dest: string): void;
 
 /**
  * Exits the current process with the given exit code.
- * @param {number} code The exit code.
+ * @param code The exit code.
  */
 export function exit(code: number): void;
 
@@ -436,28 +308,28 @@ export const env: { [key: string]: string };
 
 /**
  * Executes the given command synchronously.
- * @param  {string}                 command The command to execute.
- * @return {ExecOutputReturnValue}          Returns an object containing the return code and output as string.
+ * @param                  command The command to execute.
+ * @return          Returns an object containing the return code and output as string.
  */
 export function exec(command: string): ExecOutputReturnValue;
 /**
  * Executes the given command synchronously.
- * @param  {string}                                     command The command to execute.
- * @param  {ExecOptions}                                options Silence and synchronous options.
- * @return {ExecOutputReturnValue | child.ChildProcess}         Returns an object containing the return code and output as string, or if {async:true} was passed, a ChildProcess.
+ * @param                                      command The command to execute.
+ * @param                                 options Silence and synchronous options.
+ * @return         Returns an object containing the return code and output as string, or if {async:true} was passed, a ChildProcess.
  */
 export function exec(command: string, options: ExecOptions): ExecOutputReturnValue | child.ChildProcess;
 /**
  * Executes the given command synchronously.
- * @param  {string}          command  The command to execute.
- * @param  {ExecOptions}     options  Silence and synchronous options.
- * @param  {ExecCallback}    callback Receives code and output asynchronously.
+ * @param           command  The command to execute.
+ * @param      options  Silence and synchronous options.
+ * @param     callback Receives code and output asynchronously.
  */
 export function exec(command: string, options: ExecOptions, callback: ExecCallback): child.ChildProcess;
 /**
  * Executes the given command synchronously.
- * @param  {string}          command  The command to execute.
- * @param  {ExecCallback}    callback Receives code and output asynchronously.
+ * @param           command  The command to execute.
+ * @param     callback Receives code and output asynchronously.
  */
 export function exec(command: string, callback: ExecCallback): child.ChildProcess;
 
@@ -474,12 +346,36 @@ export interface ExecOutputReturnValue {
     stderr: string;
 }
 
+export interface ShellReturnValue extends ExecOutputReturnValue {
+    /**
+     * Analogous to the redirection operator > in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc). Like Unix redirections, to() will overwrite any existing file!
+     * @param file The file to use.
+     */
+    to(file: string): void;
+
+    /**
+     * Analogous to the redirect-and-append operator >> in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc).
+     * @param file The file to append to.
+     */
+    toEnd(file: string): void;
+
+    cat(...files: string[]): ShellString;
+    exec(callback: ExecCallback): child.ChildProcess;
+    exec(): ExecOutputReturnValue;
+    grep(...files: Array<string | string[]>): ShellString;
+    sed(replacement: string, file: string): ShellString;
+}
+
+export type ShellString = string & ShellReturnValue;
+
+export type ShellArray = string[] & ShellReturnValue;
+
 /**
  * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
  * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
  * - There is no "quiet" option since default behavior is to run silent.
- * @param {number} octalMode The access mode. Octal.
- * @param {string} file      The file to use.
+ * @param octalMode The access mode. Octal.
+ * @param file      The file to use.
  */
 export function chmod(octalMode: number, file: string): void;
 
@@ -487,8 +383,8 @@ export function chmod(octalMode: number, file: string): void;
  * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
  * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
  * - There is no "quiet" option since default behavior is to run silent.
- * @param {string} mode      The access mode. Can be an octal string or a symbolic mode string.
- * @param {string} file      The file to use.
+ * @param mode      The access mode. Can be an octal string or a symbolic mode string.
+ * @param file      The file to use.
  */
 export function chmod(mode: string, file: string): void;
 
@@ -496,75 +392,72 @@ export function chmod(mode: string, file: string): void;
 
 /**
  * Searches and returns string containing a writeable, platform-dependent temporary directory. Follows Python's tempfile algorithm.
- * @return {string} The temp file path.
+ * @return The temp file path.
  */
-export function tempdir(): string;
+export function tempdir(): ShellString;
 
 /**
  * Tests if error occurred in the last command.
- * @return {string} Returns null if no error occurred, otherwise returns string explaining the error
+ * @return Returns null if no error occurred, otherwise returns string explaining the error
  */
-export function error(): string;
+export function error(): ShellString;
 
 export type TouchOptionsLiteral = "-a" | "-c" | "-m" | "-d" | "-r";
 
 /**
  * Update the access and modification times of each FILE to the current time. A FILE argument that does not exist is created empty, unless -c is supplied
  */
-export interface touchOptionsArray {
+export interface TouchOptionsArray {
     '-d'?: string;
     '-r'?: string;
 }
 
 export function touch(...files: string[]): void;
 export function touch(files: string[]): void;
-export function touch(options: TouchOptionsLiteral, ...files: string[]): void;
-export function touch(options: TouchOptionsLiteral, files: string[]): void;
-export function touch(options: touchOptionsArray, ...files: string[]): void;
-export function touch(options: touchOptionsArray, files: string[]): void;
+export function touch(options: TouchOptionsLiteral, ...files: Array<string | string[]>): void;
+export function touch(options: TouchOptionsArray, ...files: Array<string | string[]>): void;
+
+/**
+ * Sets global configuration variables
+ * @param options Available options: `+/-e`: exit upon error (`config.fatal`), `+/-v`: verbose: show all commands (`config.verbose`), `+/-f`: disable filename expansion (globbing)
+ */
+export function set(options: string): void;
 
 // Configuration
 
 export interface ShellConfig {
     /**
      * Suppresses all command output if true, except for echo() calls. Default is false.
-     * @type {boolean}
      */
     silent: boolean;
 
     /**
      * If true the script will die on errors. Default is false.
-     * @type {boolean}
      */
     fatal: boolean;
 
     /**
      * Will print each executed command to the screen. Default is true.
-     * @type {boolean}
      */
     verbose: boolean;
 
     /**
      * Passed to glob.sync() instead of the default options ({}).
-     * @type {glob.IOptions}
      */
     globOptions: glob.IOptions;
 
     /**
      * Absolute path of the Node binary. Default is null (inferred).
-     * @type {string|null}
      */
     execPath: string | null;
 
     /**
      * Reset shell.config to the defaults.
-     * @returns {void}
      */
     reset(): void;
 }
 
 /**
  * The shelljs configuration.
- * @type {ShellConfig}
  */
 export const config: ShellConfig;
diff --git a/types/shelljs/shelljs-tests.ts b/types/shelljs/shelljs-tests.ts
index 2e7c5e7e8d..f098e76f7a 100644
--- a/types/shelljs/shelljs-tests.ts
+++ b/types/shelljs/shelljs-tests.ts
@@ -106,6 +106,13 @@ const childProc = shell.exec("node --version", (code: number) => {
 });
 pid = childProc.pid;
 
+shell.set('+e');
+shell.set('-e');
+shell.set('+v');
+shell.set('-v');
+shell.set('+f');
+shell.set('-f');
+
 shell.chmod(755, "/Users/brandon");
 shell.chmod("755", "/Users/brandon"); // same as above
 shell.chmod("u+x", "/Users/brandon");
diff --git a/types/shimmer/index.d.ts b/types/shimmer/index.d.ts
new file mode 100644
index 0000000000..fd62f8074c
--- /dev/null
+++ b/types/shimmer/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for Shimmer 1.x
+// Project: https://github.com/othiym23/shimmer
+// Definitions by: Kelvin Jin <https://github.com/kjin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare global {
+    interface Function {
+        __wrapped?: boolean;
+    }
+}
+
+declare const shimmer: {
+    (options: { logger?(msg: string): void }): void;
+    wrap<T extends (...args: any[]) => any>(
+        nodule: object,
+        name: string,
+        wrapper: (original: T) => T
+    ): void;
+    massWrap<T extends (...args: any[]) => any>(
+        nodules: object[],
+        names: string[],
+        wrapper: (original: T) => T
+    ): void;
+    unwrap(
+        nodule: object,
+        name: string
+    ): void;
+    massUnwrap(
+        nodules: object[],
+        names: string[]
+    ): void;
+};
+
+export = shimmer;
diff --git a/types/shimmer/shimmer-tests.ts b/types/shimmer/shimmer-tests.ts
new file mode 100644
index 0000000000..c7b51debe2
--- /dev/null
+++ b/types/shimmer/shimmer-tests.ts
@@ -0,0 +1,23 @@
+import * as shimmer from 'shimmer';
+
+const isWrapped: boolean = [].forEach.__wrapped || false;
+
+shimmer.wrap(Array.prototype, 'forEach', (forEach) => {
+    return (...args: any[]) => {
+      forEach(...args);
+    };
+});
+
+shimmer.unwrap(Array.prototype, 'forEach');
+
+shimmer.massWrap([Map.prototype, Set.prototype], ['clear', 'forEach'], (fn) => {
+    return (...args: any[]) => {
+      const result = fn(...args);
+      if (result) {
+        throw new Error();
+      }
+      return result;
+    };
+});
+
+shimmer.massUnwrap([Map.prototype, Set.prototype], ['clear', 'forEach']);
diff --git a/types/shimmer/tsconfig.json b/types/shimmer/tsconfig.json
new file mode 100644
index 0000000000..3883d26b91
--- /dev/null
+++ b/types/shimmer/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "shimmer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/shimmer/tslint.json b/types/shimmer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/shimmer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/shopify-buy/tslint.json b/types/shopify-buy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/shopify-buy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/shortid/tslint.json b/types/shortid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/shortid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/shot/tslint.json b/types/shot/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/shot/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/should-promised/index.d.ts b/types/should-promised/index.d.ts
deleted file mode 100644
index 96d21ff534..0000000000
--- a/types/should-promised/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for should-promised
-// Project: https://github.com/shouldjs/promised
-// Definitions by: Yaroslav Admin <https://github.com/devoto13>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface ShouldAssertion {
-  // all of the extensions are now part of should itself
-}
diff --git a/types/should-promised/should-promised-tests.ts b/types/should-promised/should-promised-tests.ts
deleted file mode 100644
index d68742938f..0000000000
--- a/types/should-promised/should-promised-tests.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/// <reference types="should" />
-
-
-var promise: Promise<number> = new Promise<number>(function (resolve, reject) {});
-
-promise.should.be.Promise;
-(10).should.not.be.a.Promise;
-
-promise.should.be.fulfilled();
-
-promise.should.be.rejected();
-
-promise.should.be.rejectedWith(Error);
-promise.should.be.rejectedWith('boom');
-promise.should.be.rejectedWith(/boom/);
-promise.should.be.rejectedWith(Error, { message: 'boom' });
-promise.should.be.rejectedWith({ message: 'boom' });
-
-promise.should.be.eventually.equal(10);
-promise.should.be.finally.equal(10);
diff --git a/types/should-promised/tsconfig.json b/types/should-promised/tsconfig.json
deleted file mode 100644
index fc192e4140..0000000000
--- a/types/should-promised/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "should-promised-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/should/index.d.ts b/types/should/index.d.ts
deleted file mode 100644
index 8f10ae4a76..0000000000
--- a/types/should/index.d.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-// Type definitions for should.js v11.2.0
-// Project: https://github.com/shouldjs/should.js
-// Definitions by: Alex Varju <https://github.com/varju>
-//                 Maxime LUCE <https://github.com/SomaticIT/>
-//                 Lukas Spieß <https://github.com/lumaxis/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Object {
-  should: ShouldAssertion;
-}
-
-interface ShouldAssertion {
-  // basic grammar
-  a: ShouldAssertion;
-  an: ShouldAssertion;
-  and: ShouldAssertion;
-  be: ShouldAssertion;
-  has: ShouldAssertion;
-  have: ShouldAssertion;
-  is: ShouldAssertion;
-  it: ShouldAssertion;
-  with: ShouldAssertion;
-  which: ShouldAssertion;
-  the: ShouldAssertion;
-  of: ShouldAssertion;
-  not: ShouldAssertion;
-
-  // validators
-  arguments(): ShouldAssertion;
-  empty(): ShouldAssertion;
-  ok(): ShouldAssertion;
-  true(): ShouldAssertion;
-  false(): ShouldAssertion;
-  NaN(): ShouldAssertion;
-  Infinity(): ShouldAssertion;
-  Array(): ShouldAssertion;
-  Object(): ShouldAssertion;
-  String(): ShouldAssertion;
-  Boolean(): ShouldAssertion;
-  Number(): ShouldAssertion;
-  Error(): ShouldAssertion;
-  Function(): ShouldAssertion;
-  Date(): ShouldAssertion;
-  Class(): ShouldAssertion;
-  Undefined(): ShouldAssertion;
-  Null(): ShouldAssertion;
-  Promise(): ShouldAssertion;
-  generator(): ShouldAssertion;
-  iterable(): ShouldAssertion;
-  iterator(): ShouldAssertion;
-  eql(expected: any, description?: string): ShouldAssertion;
-  equal(expected: any, description?: string): ShouldAssertion;
-  equalOneOf(...values: any[]): ShouldAssertion;
-  within(start: number, finish: number, description?: string): ShouldAssertion;
-  approximately(value: number, delta: number, description?: string): ShouldAssertion;
-  type(expected: any, description?: string): ShouldAssertion;
-  instanceof(constructor: Function, description?: string): ShouldAssertion;
-  above(n: number, description?: string): ShouldAssertion;
-  below(n: number, description?: string): ShouldAssertion;
-  aboveOrEqual(n: number, description?: string): ShouldAssertion;
-  greaterThanOrEqual(n: number, description?: string): ShouldAssertion;
-  belowOrEqual(n: number, description?: string): ShouldAssertion;
-  lessThanOrEqual(n: number, description?: string): ShouldAssertion;
-  match(other: {}, description?: string): ShouldAssertion;
-  match(other: (val: any) => any, description?: string): ShouldAssertion;
-  match(regexp: RegExp, description?: string): ShouldAssertion;
-  match(other: any, description?: string): ShouldAssertion;
-  matchEach(other: {}, description?: string): ShouldAssertion;
-  matchEach(other: (val: any) => any, description?: string): ShouldAssertion;
-  matchEach(regexp: RegExp, description?: string): ShouldAssertion;
-  matchEach(other: any, description?: string): ShouldAssertion;
-  matchAny(other: {}, description?: string): ShouldAssertion;
-  matchAny(other: (val: any) => any, description?: string): ShouldAssertion;
-  matchAny(regexp: RegExp, description?: string): ShouldAssertion;
-  matchAny(other: any, description?: string): ShouldAssertion;
-  length(n: number, description?: string): ShouldAssertion;
-  property(name: string, description?: string): ShouldAssertion;
-  property(name: string, val: any, description?: string): ShouldAssertion;
-  properties(names: string[]): ShouldAssertion;
-  properties(name: string): ShouldAssertion;
-  properties(descriptor: any): ShouldAssertion;
-  properties(...properties: string[]): ShouldAssertion;
-  propertyByPath(...properties: string[]): ShouldAssertion;
-  propertyWithDescriptor(name: string, descriptor: PropertyDescriptor): ShouldAssertion;
-  oneOf(...values: any[]): ShouldAssertion;
-  ownProperty(name: string, description?: string): ShouldAssertion;
-  containEql(obj: any): ShouldAssertion;
-  containDeep(obj: any): ShouldAssertion;
-  containDeepOrdered(obj: any): ShouldAssertion;
-  keys(...allKeys: string[]): ShouldAssertion;
-  keys(allKeys: string[]): ShouldAssertion;
-  enumerable(property: string, value?: any): ShouldAssertion;
-  size(size: number): ShouldAssertion;
-  value(key: string | number, value: any): ShouldAssertion;
-  enumerables(...properties: string[]): ShouldAssertion;
-  startWith(expected: string, message?: any): ShouldAssertion;
-  endWith(expected: string, message?: any): ShouldAssertion;
-  throw(message?: any, properties?: {}): ShouldAssertion;
-
-  //promises
-  eventually: ShouldAssertion;
-  finally: ShouldAssertion;
-  fulfilled(): Promise<any>;
-  fulfilledWith(value: any): Promise<any>
-  rejected(): Promise<any>;
-  rejectedWith(message: (string | Function | RegExp), properties?: {}): Promise<any>;
-  rejectedWith(errType: Object): Promise<any>;
-
-  //http
-  header(field: string, val?: string): ShouldAssertion;
-  status(code: number): ShouldAssertion;
-  json(): ShouldAssertion;
-  html(): ShouldAssertion;
-
-  //stubs
-  alwaysCalledOn(thisTarget: any): ShouldAssertion;
-  alwaysCalledWith(...arguments: any[]): ShouldAssertion;
-  alwaysCalledWithExactly(...arguments: any[]): ShouldAssertion;
-  alwaysCalledWithMatch(...arguments: any[]): ShouldAssertion;
-  alwaysCalledWithNew(): ShouldAssertion;
-  alwaysThrew(exception?: any): ShouldAssertion;
-  callCount(count: number): ShouldAssertion;
-  called(): ShouldAssertion;
-  calledOn(thisTarget: any): ShouldAssertion;
-  calledOnce(): ShouldAssertion;
-  calledTwice(): ShouldAssertion;
-  calledThrice(): ShouldAssertion;
-  calledWith(...arguments: any[]): ShouldAssertion;
-  calledWithExactly(...arguments: any[]): ShouldAssertion;
-  calledWithMatch(...arguments: any[]): ShouldAssertion;
-  calledWithNew(): ShouldAssertion;
-  neverCalledWith(...arguments: any[]): ShouldAssertion;
-  neverCalledWithMatch(...arguments: any[]): ShouldAssertion;
-  threw(exception?: any): ShouldAssertion;
-
-  // aliases
-  True(): ShouldAssertion;
-  False(): ShouldAssertion;
-  Arguments(): ShouldAssertion;
-  class(): ShouldAssertion;
-  deepEqual(expected: any, description?: string): ShouldAssertion;
-  exactly(expected: any, description?: string): ShouldAssertion;
-  instanceOf(constructor: Function, description?: string): ShouldAssertion;
-  throwError(message?: any, properties?: {}): ShouldAssertion;
-  lengthOf(n: number, description?: string): ShouldAssertion;
-  key(key: string): ShouldAssertion;
-  hasOwnProperty(name: string, description?: string): ShouldAssertion;
-  greaterThan(n: number, description?: string): ShouldAssertion;
-  lessThan(n: number, description?: string): ShouldAssertion;
-  null(): ShouldAssertion;
-  undefined(): ShouldAssertion;
-}
-
-interface ShouldInternal {
-  // should.js's extras
-  exist(actual: any, msg?: string): void;
-  exists(actual: any, msg?: string): void;
-  not: ShouldInternal;
-}
-
-interface Internal extends ShouldInternal {
-  (obj: any): ShouldAssertion;
-
-  // node.js's assert functions
-  fail(actual: any, expected: any, message: string, operator: string): void;
-  assert(value: any, message: string): void;
-  ok(value: any, message?: string): void;
-  equal(actual: any, expected: any, message?: string): void;
-  notEqual(actual: any, expected: any, message?: string): void;
-  deepEqual(actual: any, expected: any, message?: string): void;
-  notDeepEqual(actual: any, expected: any, message?: string): void;
-  strictEqual(actual: any, expected: any, message?: string): void;
-  notStrictEqual(actual: any, expected: any, message?: string): void;
-  throws(block: any, error?: any, message?: string): void;
-  doesNotThrow(block: any, message?: string): void;
-  ifError(value: any): void;
-  inspect(value: any, obj: any): any;
-}
-
-declare var should: Internal;
-declare var Should: Internal;
-interface Window {
-  Should: Internal;
-}
-
-declare module "should" {
-  export = should;
-}
diff --git a/types/should/should-tests.ts b/types/should/should-tests.ts
deleted file mode 100644
index 9f894233bd..0000000000
--- a/types/should/should-tests.ts
+++ /dev/null
@@ -1,286 +0,0 @@
-
-
-import should = require('should');
-
-should.fail('actual', 'expected', 'msg', 'operator');
-should.assert('value', 'msg');
-should.ok('value');
-should.equal('actual', 'expected');
-should.notEqual('actual', 'expected');
-should.deepEqual('actual', 'expected');
-should.notDeepEqual('actual', 'expected');
-should.strictEqual('actual', 'expected');
-should.notStrictEqual('actual', 'expected');
-should.throws(() => {});
-should.doesNotThrow(() => {});
-should.ifError('value');
-
-(0).should
-  .a
-  .an
-  .and
-  .be
-  .has
-  .have
-  .is
-  .it
-  .of
-  .the
-  .which
-  .with
-  .equal(0)
-
-class User {
-  name: string;
-  pets: string[];
-  age: number;
-}
-
-var user = {
-  name: 'tj',
-  pets: ['tobi', 'loki', 'jane', 'bandit'],
-  age: 17
-};
-
-user.should.have.property('name', 'tj');
-user.should.have.property('pets').with.lengthOf(4);
-
-should.exist('hello');
-should.exist([]);
-should.exist(null);
-
-should.not.exist(false);
-should.not.exist('');
-should.not.exist({});
-
-Should.exist(null);
-window.Should.exist(null);
-
-user.should.have.property('pets').with.lengthOf(4);
-user.pets.should.have.lengthOf(4);
-user.should.be.of.type('object').and.have.property('name', 'tj');
-
-'foo'.should.equal('bar');
-
-should.exist({});
-should.exist([]);
-should.exist('');
-should.exist(0);
-should.exist(null);
-should.exist(undefined);
-
-should.not.exist(undefined);
-should.not.exist(null);
-should.not.exist('');
-should.not.exist({});
-
-true.should.be.ok();
-'yay'.should.be.ok();
-(1).should.be.ok();
-
-false.should.not.be.ok();
-''.should.not.be.ok();
-(0).should.not.be.ok();
-
-true.should.be.true();
-true.should.be.True();
-'1'.should.not.be.true();
-
-false.should.be.false();
-false.should.be.False();
-(0).should.not.be.false();
-
-var args = function (a: string, b: string, c: string) { return arguments; };
-args.should.be.arguments();
-args.should.be.Arguments();
-['a'].should.not.be.arguments();
-
-['a'].should.be.empty();
-''.should.be.empty();
-({ length: 0 }).should.be.empty();
-
-({ foo: 'bar' }).should.eql({ foo: 'bar' });
-[1, 2, 3].should.eql([1, 2, 3]);
-[1, 2, 3].should.deepEqual([1, 2, 3]);
-
-(4).should.equal(4);
-'test'.should.equal('test');
-[1, 2, 3].should.not.equal([1, 2, 3]);
-
-'ab'.should.equalOneOf('a', 10, 'ab');
-'ab'.should.equalOneOf(['a', 10, 'ab']);
-
-({a: 10}).should.be.oneOf('a', 10, 'ab', {a: 10});
-({a: 10}).should.be.oneOf(['a', 10, 'ab', {a: 10}]);
-
-'1'.should.be.exactly('1');
-'1'.should.not.be.exactly(1);
-
-user.age.should.be.within(5, 50);
-
-user.should.be.of.type('object');
-'test'.should.be.of.type('string');
-
-user.should.be.an.instanceof(User);
-['a'].should.be.an.instanceOf(Array);
-
-user.age.should.be.above(5);
-user.age.should.not.be.above(100);
-
-user.age.should.be.below(100);
-user.age.should.not.be.below(5);
-
-'username'.should.match(/^\w+$/);
-
-user.pets.should.have.length(5);
-user.pets.should.have.lengthOf(5);
-
-user.should.have.property('name');
-user.should.have.property('age', 15);
-user.should.not.have.property('rawr');
-user.should.not.have.property('age', 0);
-
-({ a: 10 }).should.have.properties('a');
-({ a: 10, b: 20 }).should.have.properties([ 'a' ]);
-({ a: 10, b: 20 }).should.have.properties({ b: 20 });
-({ foo: 'bar' }).should.have.ownProperty('foo');
-({ foo: 'bar' }).should.hasOwnProperty('foo');
-({ a: {b: 10}}).should.have.propertyByPath('a', 'b').eql(10);
-({ a: 10 }).should.have.propertyWithDescriptor('a', { enumerable: true });
-
-NaN.should.be.NaN();
-Infinity.should.be.Infinity();
-new Date().should.be.a.Date();
-({}).should.be.an.Object();
-"".should.be.a.String();
-true.should.be.a.Boolean();
-(4).should.be.a.Number();
-new ReferenceError("error").should.be.an.Error();
-(function() {}).should.be.a.Function();
-User.should.be.a.class();
-User.should.be.a.Class();
-'a'.should.not.be.a.generator();
-[].should.be.iterable();
-[].should.be.an.iterator();
-[].should.be.an.Array();
-should(undefined).be.undefined();
-should(null).be.null();
-
-var res = {};
-res.should.have.status(200);
-
-res.should.have.header('content-length');
-res.should.have.header('Content-Length', '123');
-res.should.have.header('content-length', '123');
-
-res.should.be.json();
-
-res.should.be.html();
-
-[1, 2, 3].should.containEql(3);
-[1, 2, 3].should.containEql(2);
-[1, 2, 3].should.not.containEql(4);
-
-'foo bar baz'.should.containEql('foo');
-'foo bar baz'.should.containEql('bar');
-'foo bar baz'.should.containEql('baz');
-'foo bar baz'.should.not.containEql('FOO')
-
-var tobi = { name: 'Tobi', age: 1 };
-var jane = { name: 'Jane', age: 5 };
-var tj = { name: 'TJ', pet: tobi };
-tj.should.containEql({ pet: tobi });
-tj.should.containEql({ pet: tobi, name: 'TJ' });
-tj.should.not.containEql({ pet: jane });
-tj.should.not.containEql({ name: 'Someone' });
-
-[[1], [2], [3]].should.containEql([3]);
-[[1], [2], [3]].should.containEql([2]);
-[[1], [2], [3]].should.not.containEql([4]);
-
-var spy = function() { };
-spy.should.be.alwaysCalledOn({});
-spy.should.be.alwaysCalledWith(1, 2);
-spy.should.be.alwaysCalledWithExactly(1, 2);
-spy.should.be.alwaysCalledWithMatch(1, 2);
-spy.should.have.alwaysThrew("ReferenceError");
-spy.should.have.callCount(1);
-spy.should.be.called();
-spy.should.be.calledOn({});
-spy.should.be.calledOnce();
-spy.should.be.calledTwice();
-spy.should.be.calledThrice();
-spy.should.be.calledWith(1, 2);
-spy.should.be.calledWithExactly(1, 2);
-spy.should.be.calledWithMatch(1, 2);
-spy.should.be.calledWithNew();
-spy.should.be.neverCalledWith(1, 2);
-spy.should.be.neverCalledWithMatch(1, 2);
-spy.should.have.threw("ReferenceError");
-
-(10).should.be.aboveOrEqual(0);
-(10).should.be.aboveOrEqual(10);
-(10).should.be.greaterThanOrEqual(0);
-(10).should.be.greaterThanOrEqual(10);
-
-(0).should.be.belowOrEqual(10);
-(0).should.be.belowOrEqual(0);
-(0).should.be.lessThanOrEqual(10);
-(0).should.be.lessThanOrEqual(0);
-
-(function () {
-  throw new Error('fail');
-}).should.throw();
-
-(function () {
-}).should.not.throw();
-
-(function () {
-  throw new Error('fail');
-}).should.throw('fail');
-
-(function () {
-  throw new Error('failed to foo');
-}).should.throw(/^fail/);
-
-(function () {
-  throw new Error('failed to foo');
-}).should.throw(Error);
-
-(function () {
-  throw new Error('failed to foo');
-}).should.throw(Error, { message: 'failed to baz' });
-
-(function () {
-  throw new Error('failed to foo');
-}).should.throwError(Error, { message: 'failed to baz' });
-
-(function () {
-  throw new Error('failed to baz');
-}).should.throwError(/^fail.*/);
-
-var obj = { foo: 'bar', baz: 'raz' };
-obj.should.have.keys('foo', 'bar');
-obj.should.have.keys(['foo', 'bar']);
-obj.should.have.key('foo');
-
-({ a: 10 }).should.have.size(1);
-
-({ a: 10 }).should.have.value('a', 10);
-({ a: 10 }).should.have.value(1, 2);
-
-({ a: 10 }).should.have.enumerable('a');
-({ a: 10 }).should.have.enumerable('a', 10);
-({ a: 10, b: 10 }).should.have.enumerables('a', 'b');
-
-(1).should.eql(0, 'some useful description');
-
-[ 1, 2, 3].should.containDeep([2, 1]);
-[ 1, 2, [ 1, 2, 3 ]].should.containDeep([ 1, [ 3, 1 ]]);
-
-[ 1, 2, 3].should.containDeepOrdered([1, 2]);
-[ 1, 2, [ 1, 2, 3 ]].should.containDeepOrdered([ 1, [ 2, 3 ]]);
-
-({ a: 10, b: { c: 10, d: [1, 2, 3] }}).should.containDeepOrdered({a: 10});
-({ a: 10, b: { c: 10, d: [1, 2, 3] }}).should.containDeepOrdered({b: {c: 10}});
-({ a: 10, b: { c: 10, d: [1, 2, 3] }}).should.containDeepOrdered({b: {d: [1, 3]}});
diff --git a/types/should/tsconfig.json b/types/should/tsconfig.json
deleted file mode 100644
index 2e4d8cdeed..0000000000
--- a/types/should/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "should-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/showdown/index.d.ts b/types/showdown/index.d.ts
index 62cecfda30..3a1accb411 100644
--- a/types/showdown/index.d.ts
+++ b/types/showdown/index.d.ts
@@ -298,9 +298,9 @@ declare namespace Showdown {
          * Setting a "local" option only affects the specified Converter object.
          *
          * @param optionKey
-         * @param string
+         * @param value
          */
-        setOption(optionKey: string, value: string): void;
+        setOption(optionKey: string, value: any): void;
 
         /**
          * Get the option of this Converter instance.
diff --git a/types/showdown/tslint.json b/types/showdown/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/showdown/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/shrink-ray/index.d.ts b/types/shrink-ray/index.d.ts
new file mode 100644
index 0000000000..a237c298fa
--- /dev/null
+++ b/types/shrink-ray/index.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for shrink-ray 0.1
+// Project: https://github.com/aickin/shrink-ray
+// Definitions by: forabi <https://github.com/forabi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { RequestHandler, Request, Response } from 'express';
+import * as zlib from 'zlib';
+type FilterFunction = (req: Request, res: Response) => boolean;
+
+type Options = Partial<{
+    cacheSize: number;
+    threshold: number;
+    zlib: Partial<{
+        /** default: zlib.constants.Z_NO_FLUSH */
+        flush?: number;
+
+        /** default: zlib.constants.Z_FINISH */
+        finishFlush?: number;
+
+        /** default: 16*1024 */
+        chunkSize?: number;
+        windowBits?: number;
+
+        /** compression only */
+        strategy?: number;
+
+        /** deflate/inflate only, empty dictionary by default */
+        dictionary?: any;
+
+        /** compression only */
+        level: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+
+        /** compression only */
+        memLevel: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    }>;
+    brotli: {
+        lgblock: number;
+        lgwin: number;
+        mode: 0 | 1 | 2;
+        quality: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11;
+    };
+    filter: FilterFunction;
+    cache(req: Request, res: Response): boolean;
+}>;
+
+interface CreateMiddleware {
+    (options?: Options): RequestHandler;
+    filter: FilterFunction;
+}
+
+declare const createMiddleware: CreateMiddleware;
+
+export = createMiddleware;
diff --git a/types/shrink-ray/shrink-ray-tests.ts b/types/shrink-ray/shrink-ray-tests.ts
new file mode 100644
index 0000000000..e221806b88
--- /dev/null
+++ b/types/shrink-ray/shrink-ray-tests.ts
@@ -0,0 +1,6 @@
+import * as express from 'express';
+import * as shrinkRay from 'shrink-ray';
+
+const app = express();
+
+app.use(shrinkRay());
diff --git a/types/shrink-ray/tsconfig.json b/types/shrink-ray/tsconfig.json
new file mode 100644
index 0000000000..84b143dd64
--- /dev/null
+++ b/types/shrink-ray/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "shrink-ray-tests.ts"
+    ]
+}
diff --git a/types/shrink-ray/tslint.json b/types/shrink-ray/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/shrink-ray/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/shuffle-array/tslint.json b/types/shuffle-array/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/shuffle-array/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/siema/index.d.ts b/types/siema/index.d.ts
index 682c0e907e..8c1739d58c 100644
--- a/types/siema/index.d.ts
+++ b/types/siema/index.d.ts
@@ -1,8 +1,11 @@
 // Type definitions for siema 1.4
 // Project: https://github.com/pawelgrzybek/siema
 // Definitions by: Irmantas Zenkus <https://github.com/Irmiz>
+//                 Pavel Puchkov <https://github.com/0x6368656174>
+//                 Sam Nau <https://github.com/samnau>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare class Siema {
+
+export default class Siema {
     currentSlide: number;
 
     constructor(options?: SiemaOptions);
@@ -11,24 +14,26 @@ declare class Siema {
     prev(index?: number, callback?: () => void): void;
     goTo(index: number, callback?: () => void): void;
     remove(index: number, callback?: () => void): void;
-    insert(item: any, index: number, callback?: () => void): void;
-    prepend(item: any, callback?: () => void): void;
-    append(item: any, callback?: () => void): void;
-    destroy(restoreMarkup: boolean, callback?: () => void): void;
+    insert(item: HTMLElement, index: number, callback?: () => void): void;
+    prepend(item: HTMLElement, callback?: () => void): void;
+    append(item: HTMLElement, callback?: () => void): void;
+    destroy(restoreMarkup?: boolean, callback?: () => void): void;
 }
 
-interface SiemaOptions {
-    selector?: string;
+export interface PageInterface {
+  [key: number]: number;
+}
+
+export interface SiemaOptions {
+    selector?: string | HTMLElement;
     duration?: number;
     easing?: string;
-    perPage?: number;
+    perPage?: number | PageInterface;
     startIndex?: number;
     draggable?: boolean;
     multipleDrag?: boolean;
     threshold?: number;
     loop?: boolean;
-    onInit(): void;
+    onInit?(): void;
     onChange?(): void;
 }
-
-export = Siema;
diff --git a/types/siema/siema-tests.ts b/types/siema/siema-tests.ts
index c8d9e755b2..61635ce5a3 100644
--- a/types/siema/siema-tests.ts
+++ b/types/siema/siema-tests.ts
@@ -1,4 +1,4 @@
-import Siema = require('siema');
+import Siema from 'siema';
 
 const siema = new Siema({
     selector: '.siema',
@@ -14,11 +14,14 @@ const siema = new Siema({
     onChange: () => {},
 });
 
+const elem = new HTMLDivElement();
+
 siema.next();
 siema.prev();
 siema.goTo(siema.currentSlide);
 siema.remove(0, () => {});
-siema.insert('item', 0, () => {});
-siema.prepend('item', () => {});
-siema.append('item', () => {});
+siema.insert(elem, 0, () => {});
+siema.prepend(elem, () => {});
+siema.append(elem, () => {});
+siema.destroy();
 siema.destroy(true, () => {});
diff --git a/types/siema/tsconfig.json b/types/siema/tsconfig.json
index 4fe63d2a73..035dfc51d0 100644
--- a/types/siema/tsconfig.json
+++ b/types/siema/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -20,4 +21,4 @@
         "index.d.ts",
         "siema-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/siesta/tslint.json b/types/siesta/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/siesta/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sigmajs/tslint.json b/types/sigmajs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sigmajs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/signalr/tslint.json b/types/signalr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/signalr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/signalr/v1/tslint.json b/types/signalr/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/signalr/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/signals/index.d.ts b/types/signals/index.d.ts
index 879aa189f1..be0a87df74 100644
--- a/types/signals/index.d.ts
+++ b/types/signals/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for JS-Signals
+// Type definitions for JS-Signals 1.0
 // Project: http://millermedeiros.github.io/js-signals/
 // Definitions by: Diullei Gomes <https://github.com/diullei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var signals: signals.SignalWrapper;
 
@@ -9,32 +10,29 @@ export = signals;
 export as namespace signals;
 
 declare namespace signals {
-
-    interface SignalWrapper {
-        Signal: Signal
+    interface SignalWrapper<T = any> {
+        Signal: Signal<T>;
     }
 
-    interface SignalBinding {
+    interface SignalBinding<T = any> {
         active: boolean;
         context: any;
         params: any;
         detach(): Function;
         execute(paramsArr?: any[]): any;
-        getListener(): Function;
-        getSignal(): Signal;
+        getListener(): (...params: T[]) => void;
+        getSignal(): Signal<T>;
         isBound(): boolean;
         isOnce(): boolean;
     }
 
-    interface Signal {
+    interface Signal<T = any> {
         /**
          * Custom event broadcaster
          * <br />- inspired by Robert Penner's AS3 Signals.
-         * @name Signal
          * @author Miller Medeiros
-         * @constructor
          */
-        new (): Signal;
+        new (): Signal<T>;
 
         /**
          * If Signal is active and should broadcast events.
@@ -57,25 +55,29 @@ declare namespace signals {
          *
          * @param listener Signal handler function.
          * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
-         * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
+         * @param priority The priority level of the event listener.
+         *        Listeners with higher priority will be executed before listeners with lower priority.
+         *        Listeners with same priority level will be executed at the same order as they were added. (default = 0)
          */
-        add(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
+        add(listener: (...params: T[]) => void, listenerContext?: any, priority?: Number): SignalBinding<T>;
 
         /**
-        * Add listener to the signal that should be removed after first execution (will be executed only once).
-        *
-        * @param listener Signal handler function.
-        * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
-        * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
-        */
-        addOnce(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
+         * Add listener to the signal that should be removed after first execution (will be executed only once).
+         *
+         * @param listener Signal handler function.
+         * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
+         * @param priority The priority level of the event listener.
+         *                 Listeners with higher priority will be executed before listeners with lower priority.
+         *                 Listeners with same priority level will be executed at the same order as they were added. (default = 0)
+         */
+        addOnce(listener: (...params: T[]) => void, listenerContext?: any, priority?: Number): SignalBinding<T>;
 
         /**
          * Dispatch/Broadcast Signal to all listeners added to the queue.
          *
          * @param params Parameters that should be passed to each handler.
          */
-        dispatch(...params: any[]): void;
+        dispatch(...params: T[]): void;
 
         /**
          * Remove all bindings from signal and destroy any reference to external objects (destroy Signal object).
@@ -100,12 +102,12 @@ declare namespace signals {
         /**
          * Check if listener was attached to Signal.
          */
-        has(listener: Function, context?: any): boolean;
+        has(listener: (...params: T[]) => void, context?: any): boolean;
 
         /**
          * Remove a single listener from the dispatch queue.
          */
-        remove(listener: Function, context?: any): Function;
+        remove(listener: (...params: T[]) => void, context?: any): Function;
 
         removeAll(): void;
     }
diff --git a/types/signals/signals-tests.ts b/types/signals/signals-tests.ts
index a0fa8e34f1..b3d16d9d39 100644
--- a/types/signals/signals-tests.ts
+++ b/types/signals/signals-tests.ts
@@ -5,203 +5,203 @@ interface TestObject {
   stopped: signals.Signal;
 }
 
-namespace Signals.Tests {
-  //store local reference for brevity
-  var Signal = signals.Signal;
+function tests() {
+  // store local reference for brevity
+  const Signal = signals.Signal;
 
-  //custom object that dispatch signals
-  var myObject: TestObject = {
-    started : new Signal(), //past tense is the recommended signal naming convention
+  // custom object that dispatch signals
+  const myObject: TestObject = {
+    started : new Signal(), // past tense is the recommended signal naming convention
     stopped : new Signal()
   };
 
-  //single listener
-  function onStarted(param1:string, param2:string){
+  // single listener
+  function onStarted(param1: string, param2: string) {
     alert(param1 + param2);
   }
 
-  myObject.started.add(onStarted); //add listener
-  myObject.started.dispatch('foo', 'bar'); //dispatch signal passing custom parameters
-  myObject.started.remove(onStarted); //remove a single listener
+  myObject.started.add(onStarted); // add listener
+  myObject.started.dispatch('foo', 'bar'); // dispatch signal passing custom parameters
+  myObject.started.remove(onStarted); // remove a single listener
 
-  //multiple listeners
-  function onStopped(){
+  // multiple listeners
+  function onStopped() {
     alert('stopped');
   }
-  function onStopped2(){
+  function onStopped2() {
     alert('stopped listener 2');
   }
   myObject.stopped.add(onStopped);
   myObject.stopped.add(onStopped2);
   myObject.stopped.dispatch();
-  myObject.stopped.removeAll(); //remove all listeners of the `stopped` signal
+  myObject.stopped.removeAll(); // remove all listeners of the `stopped` signal
 
-  //multiple dispatches
-  var i = 0;
-  myObject.started.add(function(){
+  // multiple dispatches
+  let i = 0;
+  myObject.started.add(() => {
     i += 1;
     alert(i);
   });
-  myObject.started.dispatch(); //will alert 1
-  myObject.started.dispatch(); //will alert 2
+  myObject.started.dispatch(); // will alert 1
+  myObject.started.dispatch(); // will alert 2
 
-  //multiple dispatches + addOnce()
-  var i = 0;
-  myObject.started.addOnce(function(){
+  // multiple dispatches + addOnce()
+  i = 0;
+  myObject.started.addOnce(() => {
     i += 1;
     alert(i);
   });
-  myObject.started.dispatch(); //will alert 1
-  myObject.started.dispatch(); //nothing happens
+  myObject.started.dispatch(); // will alert 1
+  myObject.started.dispatch(); // nothing happens
 
-  //enable/disable signal
-  var i = 0;
-  myObject.started.add(function(){
+  // enable/disable signal
+  i = 0;
+  myObject.started.add(() => {
     i += 1;
     alert(i);
   });
-  myObject.started.dispatch(); //will alert 1
+  myObject.started.dispatch(); // will alert 1
   myObject.started.active = false;
-  myObject.started.dispatch(); //nothing happens
+  myObject.started.dispatch(); // nothing happens
   myObject.started.active = true;
-  myObject.started.dispatch(); //will alert 2
+  myObject.started.dispatch(); // will alert 2
 
-  //Stop/Halt Propagation (method 1)
-  myObject.started.add(function(){
-    myObject.started.halt(); //prevent next listeners on the queue from being executed
+  // Stop/Halt Propagation (method 1)
+  myObject.started.add(() => {
+    myObject.started.halt(); // prevent next listeners on the queue from being executed
   });
-  myObject.started.add(function(){
-    alert('second listener'); //won't be called since first listener stops propagation
+  myObject.started.add(() => {
+    alert('second listener'); // won't be called since first listener stops propagation
   });
   myObject.started.dispatch();
 
-  //Stop/Halt Propagation (method 2)
-  myObject.started.add(function(){
-    return false; //if handler returns `false` will also stop propagation
+  // Stop/Halt Propagation (method 2)
+  myObject.started.add(() => {
+    return false; // if handler returns `false` will also stop propagation
   });
-  myObject.started.add(function(){
-    alert('second listener'); //won't be called since first listener stops propagation
+  myObject.started.add(() => {
+    alert('second listener'); // won't be called since first listener stops propagation
   });
   myObject.started.dispatch();
 
-  //Set execution context of the listener handler
-  var foo = 'bar';
-  var obj = {
+  // Set execution context of the listener handler
+  const foo = 'bar';
+  const obj = {
     foo : 10
   };
 
-  function handler1(){
+  function handler1() {
     alert(this.foo);
   }
 
-  function handler2(){
+  function handler2() {
     alert(this.foo);
   }
 
-  //note that you cannot add the same handler twice to the same signal without removing it first
-  myObject.started.add(handler1); //default execution context
-  myObject.started.add(handler2, obj); //set a different execution context
-  myObject.started.dispatch(); //first handler will alert "bar", second will alert "10".
+  // note that you cannot add the same handler twice to the same signal without removing it first
+  myObject.started.add(handler1); // default execution context
+  myObject.started.add(handler2, obj); // set a different execution context
+  myObject.started.dispatch(); // first handler will alert "bar", second will alert "10".
 }
 
-namespace Signals.AdvancedTests {
-  //store local reference for brevity
-  var Signal = signals.Signal;
+function advancedTests() {
+  // store local reference for brevity
+  const Signal = signals.Signal;
 
-  //custom object that dispatch signals
-  var myObject: TestObject = {
-    started : new Signal(), //past tense is the recommended signal naming convention
+  // custom object that dispatch signals
+  const myObject: TestObject = {
+    started : new Signal(), // past tense is the recommended signal naming convention
     stopped : new Signal()
   };
 
-  //Set listener priority/order (v0.5.3+)
-  var handler1 = function(){
+  // Set listener priority/order (v0.5.3+)
+  let handler1 = () => {
     alert('foo');
   };
-  var handler2 = function(){
+  let handler2 = () => {
     alert('bar');
   };
-  myObject.started.add(handler1); //default priority is 0
-  myObject.started.add(handler2, null, 2); //setting priority to 2 will make `handler2` execute before `handler1`
-  myObject.started.dispatch(); //will alert "bar" than "foo"
+  myObject.started.add(handler1); // default priority is 0
+  myObject.started.add(handler2, null, 2); // setting priority to 2 will make `handler2` execute before `handler1`
+  myObject.started.dispatch(); // will alert "bar" than "foo"
 
-  //Enable/Disable a single SignalBinding
-  var handler1 = function(){
+  // Enable/Disable a single SignalBinding
+  handler1 = () => {
     alert('foo bar');
   };
-  var handler2 = function(){
+  handler2 = () => {
     alert('lorem ipsum');
   };
-  var binding1 = myObject.started.add(handler1); //methods `add()` and `addOnce()` returns a SignalBinding object
+  let binding1 = myObject.started.add(handler1); // methods `add()` and `addOnce()` returns a SignalBinding object
   myObject.started.add(handler2);
-  myObject.started.dispatch(); //will alert "foo bar" than "lorem ipsum"
-  binding1.active = false; //disable a single binding
-  myObject.started.dispatch(); //will alert "lorem ipsum"
+  myObject.started.dispatch(); // will alert "foo bar" than "lorem ipsum"
+  binding1.active = false; // disable a single binding
+  myObject.started.dispatch(); // will alert "lorem ipsum"
   binding1.active = true;
-  myObject.started.dispatch(); //will alert "foo bar" than "lorem ipsum"
+  myObject.started.dispatch(); // will alert "foo bar" than "lorem ipsum"
 
-  //Manually execute a signal handler
-  var handler = function(){
+  // Manually execute a signal handler
+  const handler = () => {
     alert('foo bar');
   };
-  var binding: signals.SignalBinding = myObject.started.add(handler); //methods `add()` and `addOnce()` returns a SignalBinding object
-  binding.execute(); //will alert "foo bar"
+  let binding: signals.SignalBinding<() => void> = myObject.started.add(handler); // methods `add()` and `addOnce()` returns a SignalBinding object
+  binding.execute(); // will alert "foo bar"
 
-  //Retrieve anonymous listener
-  var binding:signals.SignalBinding = myObject.started.add(function(){
+  // Retrieve anonymous listener
+  binding = myObject.started.add(() => {
     alert('foo bar');
   });
 
   // note: in the original docs, this is handler, but that collides with handler above because these are in one giant scope
   // perhaps these are best split into functions for readability
-  var anonymousHandler = binding.getListener(); //reference to the anonymous function
+  const anonymousHandler = binding.getListener(); // reference to the anonymous function
 
-  //Remove / Detach anonymous listener
-  var binding:signals.SignalBinding = myObject.started.add(function(){
+  // Remove / Detach anonymous listener
+  binding = myObject.started.add(() => {
     alert('foo bar');
   });
-  myObject.started.dispatch(); //will alert "foo bar"
+  myObject.started.dispatch(); // will alert "foo bar"
   binding.detach();
-  alert(binding.isBound()); //will alert `false`
-  myObject.started.dispatch(); //nothing happens
+  alert(binding.isBound()); // will alert `false`
+  myObject.started.dispatch(); // nothing happens
 
-  //Check if binding will execute only once
-  var binding1:signals.SignalBinding = myObject.started.add(function(){
+  // Check if binding will execute only once
+  binding1 = myObject.started.add(() => {
     alert('foo bar');
   });
-  var binding2:signals.SignalBinding = myObject.started.addOnce(function(){
+  const binding2: signals.SignalBinding<() => void> = myObject.started.addOnce(() => {
     alert('foo bar');
   });
-  alert(binding1.isOnce()); //alert "false"
-  alert(binding2.isOnce()); //alert "true"
+  alert(binding1.isOnce()); // alert "false"
+  alert(binding2.isOnce()); // alert "true"
 
-  //Change listener execution context on-the-fly
-  var foo = 'bar';
-  var obj = {
+  // Change listener execution context on-the-fly
+  const foo = 'bar';
+  const obj = {
     foo : "it's over 9000!"
   };
-  var binding:signals.SignalBinding = myObject.started.add(function(){
+  binding = myObject.started.add(function() {
     alert(this.foo);
   });
-  myObject.started.dispatch(); //will alert "bar"
+  myObject.started.dispatch(); // will alert "bar"
   binding.context = obj;
-  myObject.started.dispatch(); //will alert "it's over 9000!"
+  myObject.started.dispatch(); // will alert "it's over 9000!"
 
-  //Add default parameters to Signal dispatch (v0.6.3+)
-  var binding:signals.SignalBinding = myObject.started.add(function(a:string, b:string, c:string){
-    alert(a +' '+ b +' '+ c);
+  // Add default parameters to Signal dispatch (v0.6.3+)
+  binding = myObject.started.add((a: string, b: string, c: string) => {
+    alert(`${a} ${b} ${c}`);
   });
-  binding.params = ['lorem', 'ipsum']; //set default parameters of the binding
-  myObject.started.dispatch('dolor'); //will alert "lorem ipsum dolor"
+  binding.params = ['lorem', 'ipsum']; // set default parameters of the binding
+  myObject.started.dispatch('dolor'); // will alert "lorem ipsum dolor"
 
-  //Check if Signal has specific listener (v0.7.0+)
-  function onStart(a:string){
+  // Check if Signal has specific listener (v0.7.0+)
+  function onStart(a: string) {
     console.log(a);
   }
   myObject.started.add(onStart);
   myObject.started.has(onStart); // true
 
-  //Memorize previously dispatched values / forget values (v0.7.0+)
+  // Memorize previously dispatched values / forget values (v0.7.0+)
   myObject.started.memorize = true; // default is false
   myObject.started.dispatch('foo');
 
diff --git a/types/signals/tslint.json b/types/signals/tslint.json
new file mode 100644
index 0000000000..09c89d645d
--- /dev/null
+++ b/types/signals/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "ban-types": false,
+        "no-misused-new": false
+    }
+}
diff --git a/types/signature_pad/tslint.json b/types/signature_pad/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/signature_pad/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simple-assign/tslint.json b/types/simple-assign/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simple-assign/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simple-cw-node/tslint.json b/types/simple-cw-node/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simple-cw-node/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simple-lru/index.d.ts b/types/simple-lru/index.d.ts
new file mode 100644
index 0000000000..8132362f8e
--- /dev/null
+++ b/types/simple-lru/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for simple-lru 0.0
+// Project: https://github.com/smagch/simple-lru
+// Definitions by: NN <https://github.com/NN--->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+declare class SimpleLRU<K, V> {
+    constructor(max: number);
+    del(key: K): V | undefined;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    keys(): K[];
+    length(): number;
+    max(max?: number): number;
+    peek(key: K): V | undefined;
+    reset(): void;
+    set(key: K, val: V): void;
+    static version: string;
+}
+
+export = SimpleLRU;
diff --git a/types/simple-lru/simple-lru-tests.ts b/types/simple-lru/simple-lru-tests.ts
new file mode 100644
index 0000000000..e400bba4aa
--- /dev/null
+++ b/types/simple-lru/simple-lru-tests.ts
@@ -0,0 +1,18 @@
+import SimpleLRU = require('simple-lru');
+
+const cache = new SimpleLRU(3);
+cache.set('a', 'A');
+cache.set('b', 'B');
+cache.set('c', 'C');
+cache.set('d', 'D');
+const a = cache.get('a'); // a = undefined;
+const b = cache.get('b'); // b = 'B'
+const c = cache.get('c'); // c = 'C'
+const d = cache.get('d'); // d = 'D'
+const e = cache.peek('d'); // e = 'D'
+const f = cache.del('d');
+const keys = cache.keys(); // keys = ['b', 'c', 'd']
+cache.max(10);
+const m = cache.max();
+const l = cache.length();
+cache.reset();
diff --git a/types/simple-lru/tsconfig.json b/types/simple-lru/tsconfig.json
new file mode 100644
index 0000000000..bb7678005c
--- /dev/null
+++ b/types/simple-lru/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "simple-lru-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/simple-lru/tslint.json b/types/simple-lru/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/simple-lru/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/simple-mock/tslint.json b/types/simple-mock/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simple-mock/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simple-oauth2/index.d.ts b/types/simple-oauth2/index.d.ts
index 37add22766..499f39e56e 100644
--- a/types/simple-oauth2/index.d.ts
+++ b/types/simple-oauth2/index.d.ts
@@ -83,7 +83,7 @@ export interface OAuthClient {
     authorizationCode: {
         /**
          * Redirect the user to the autorization page
-         * @return {string} the absolute authorization url
+         * @return the absolute authorization url
          */
         authorizeURL(params?: {
             /** A string that represents the registered application URI where the user is redirected after authentication */
diff --git a/types/simple-peer/index.d.ts b/types/simple-peer/index.d.ts
index 0ddc548ea8..6e41100b41 100644
--- a/types/simple-peer/index.d.ts
+++ b/types/simple-peer/index.d.ts
@@ -20,7 +20,7 @@ declare namespace SimplePeer {
         answerConstraints?: {}; // custom answer constraints (used by createAnswer method)
         reconnectTimer?: boolean | number; // wait __ milliseconds after ICE 'disconnect' for reconnect attempt before emitting 'close'
         sdpTransform?<T extends any>(sdp: T): T; // function to transform the generated SDP signaling data (for advanced users)
-        stream?: boolean; // if video/voice is desired, pass stream returned from getUserMedia
+        stream?: MediaStream; // if video/voice is desired, pass stream returned from getUserMedia
         trickle?: boolean; // set to false to disable trickle ICE and get a single 'signal' event (slower)
         wrtc?: {}; // RTCPeerConnection/RTCSessionDescription/RTCIceCandidate
         objectMode?: boolean; // set to true to create the stream in Object Mode. In this mode, incoming string data is not automatically converted to Buffer objects.
diff --git a/types/simple-url-cache/tslint.json b/types/simple-url-cache/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simple-url-cache/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simplebar/v1/tslint.json b/types/simplebar/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simplebar/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simplemde/tslint.json b/types/simplemde/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simplemde/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simplesmtp/tslint.json b/types/simplesmtp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simplesmtp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/simplestorage.js/tslint.json b/types/simplestorage.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/simplestorage.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sinon-as-promised/tslint.json b/types/sinon-as-promised/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sinon-as-promised/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sinon-chai/tslint.json b/types/sinon-chai/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sinon-chai/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index 89434cf791..bc33b04d17 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/vitalets/sinon-chrome
 // Definitions by: Tim Perry <https://github.com/pimterry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="chrome"/>
 /// <reference types="sinon"/>
diff --git a/types/sinon-chrome/tslint.json b/types/sinon-chrome/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sinon-chrome/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sinon-mongoose/index.d.ts b/types/sinon-mongoose/index.d.ts
index ac8397bf9e..2d9099a060 100644
--- a/types/sinon-mongoose/index.d.ts
+++ b/types/sinon-mongoose/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/underscopeio/sinon-mongoose
 // Definitions by: stevehipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as s from "sinon";
 
diff --git a/types/sinon-mongoose/tslint.json b/types/sinon-mongoose/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sinon-mongoose/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sinon-stub-promise/index.d.ts b/types/sinon-stub-promise/index.d.ts
index 2141009456..2df6502e11 100644
--- a/types/sinon-stub-promise/index.d.ts
+++ b/types/sinon-stub-promise/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/substantial/sinon-stub-promise
 // Definitions by: Thiago Temple <https://github.com/vintem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="sinon"/>
 
diff --git a/types/sinon-stub-promise/tslint.json b/types/sinon-stub-promise/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sinon-stub-promise/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index f8258efc95..f0433a694e 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sinon 2.3
+// Type definitions for Sinon 4.1
 // Project: http://sinonjs.org/
 // Definitions by: William Sears <https://github.com/mrbigdog2u>
 //                 Jonathan Little <https://github.com/rationull>
@@ -11,10 +11,8 @@
 // sinon uses DOM dependencies which are absent in browser-less environment like node.js
 // to avoid compiler errors this monkey patch is used
 // see more details in https://github.com/DefinitelyTyped/DefinitelyTyped/issues/11351
-// tslint:disable no-empty-interface
-interface Event { }
-interface Document { }
-// tslint:enable no-empty-interface
+interface Event { } // tslint:disable-line no-empty-interface
+interface Document { } // tslint:disable-line no-empty-interface
 
 declare namespace Sinon {
     interface SinonSpyCallApi {
@@ -89,7 +87,9 @@ declare namespace Sinon {
         invokeCallback(...args: any[]): void;
         getCall(n: number): SinonSpyCall;
         getCalls(): SinonSpyCall[];
+        /// @deprecated Use resetHistory() instead
         reset(): void;
+        resetHistory(): void;
         printf(format: string, ...args: any[]): string;
         restore(): void;
     }
@@ -152,7 +152,7 @@ declare namespace Sinon {
 
     interface SinonStubStatic {
         (): SinonStub;
-        (obj: any): SinonStub;
+        <T>(obj: T): SinonStubbedInstance<T>;
         <T>(obj: T, method: keyof T): SinonStub;
         <T>(obj: T, method: keyof T, func: Function): SinonStub;
     }
@@ -204,6 +204,9 @@ declare namespace Sinon {
         setInterval(callback: (...args: any[]) => void, timeout: number, ...args: any[]): number;
         clearInterval(id: number): void;
         tick(ms: number): number;
+        next(): void;
+        runAll(): void;
+        runToLast(): void;
         reset(): void;
         Date(): Date;
         Date(year: number): Date;
@@ -290,14 +293,10 @@ declare namespace Sinon {
         FakeXMLHttpRequest: SinonFakeXMLHttpRequest;
     }
 
-    interface SinonFakeServer {
+    interface SinonFakeServer extends SinonFakeServerOptions {
         // Properties
-        autoRespond: boolean;
-        autoRespondAfter: number;
-        fakeHTTPMethods: boolean;
         getHTTPMethod(request: SinonFakeXMLHttpRequest): string;
         requests: SinonFakeXMLHttpRequest[];
-        respondImmediately: boolean;
 
         // Methods
         respondWith(body: string): void;
@@ -319,8 +318,15 @@ declare namespace Sinon {
         restore(): void;
     }
 
+    interface SinonFakeServerOptions {
+        autoRespond?: boolean;
+        autoRespondAfter?: number;
+        fakeHTTPMethods?: boolean;
+        respondImmediately?: boolean;
+    }
+
     interface SinonFakeServerStatic {
-        create(): SinonFakeServer;
+        create(options?: SinonFakeServerOptions): SinonFakeServer;
     }
 
     interface SinonStatic {
@@ -491,6 +497,8 @@ declare namespace Sinon {
         usingPromise(promiseLibrary: any): SinonSandbox;
         verify(): void;
         verifyAndRestore(): void;
+        createStubInstance(constructor: any): any;
+        createStubInstance<TType>(constructor: StubbableType<TType>): SinonStubbedInstance<TType>;
     }
 
     interface SinonSandboxStatic {
@@ -529,7 +537,7 @@ declare namespace Sinon {
         /**
          * Creates a new object with the given functions as the prototype and stubs all implemented functions.
          *
-         * @type TType   Type being stubbed.
+         * @template TType Type being stubbed.
          * @param constructor   Object or class to stub.
          * @returns A stubbed version of the constructor.
          * @remarks The given constructor function is not invoked. See also the stub API.
@@ -543,7 +551,7 @@ declare namespace Sinon {
     /**
      * Stubbed type of an object with members replaced by stubs.
      *
-     * @type TType   Type being stubbed.
+     * @template TType Type being stubbed.
      */
     interface StubbableType<TType> {
         new(...args: any[]): TType;
@@ -552,9 +560,11 @@ declare namespace Sinon {
     /**
      * An instance of a stubbed object type with members replaced by stubs.
      *
-     * @type TType   Object type being stubbed.
+     * @template TType Object type being stubbed.
      */
     type SinonStubbedInstance<TType> = {
+        // TODO: this should really only replace functions on TType with SinonStubs, not all properties
+        // Likely infeasible without mapped conditional types, per https://github.com/Microsoft/TypeScript/issues/12424
         [P in keyof TType]: SinonStub;
     };
 }
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 33ac93f595..2e2286e538 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -129,6 +129,8 @@ function testSandbox() {
     sandbox.resetBehavior();
     sandbox.verify();
     sandbox.verifyAndRestore();
+    sandbox.createStubInstance(TestCreateStubInstance).someTestMethod('some argument');
+    sandbox.createStubInstance<TestCreateStubInstance>(TestCreateStubInstance).someTestMethod('some argument');
 }
 
 function testPromises() {
@@ -155,6 +157,7 @@ function testSymbolMatch() {
 
 function testResetHistory() {
     sinon.stub().resetHistory();
+    sinon.spy().resetHistory();
 }
 
 function testUsingPromises() {
@@ -230,6 +233,25 @@ function testSpy() {
     sinon.spy().calledImmediatelyBefore(otherSpy);
 }
 
+function testFakeServer() {
+    sinon.fakeServer.create({
+        autoRespond: true,
+        autoRespondAfter: 3,
+        fakeHTTPMethods: true,
+        respondImmediately: false
+    });
+}
+
+function testStubObject() {
+    const myObj = {
+        setStatus() {},
+        json() {}
+    };
+    const stub = sinon.stub(myObj);
+    stub.setStatus.returns(stub);
+    stub.json.callCount;
+}
+
 testOne();
 testTwo();
 testThree();
@@ -249,6 +271,7 @@ testGetterStub();
 testSetterStub();
 testValueStub();
 testThrowsStub();
+testFakeServer();
 
 const clock = sinon.useFakeTimers();
 clock.setSystemTime(1000);
diff --git a/types/sip.js/index.d.ts b/types/sip.js/index.d.ts
index ca679979f1..65aa453a68 100644
--- a/types/sip.js/index.d.ts
+++ b/types/sip.js/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for sip.js 0.7
+// Type definitions for sip.js 0.8
 // Project: http://sipjs.com
 // Definitions by: Kir Dergachev <https://github.com/decyrus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 export as namespace sipjs;
 
@@ -71,6 +72,27 @@ export namespace C {
     }
 }
 
+export type DescriptionModifier = (description: RTCSessionDescription) => Promise<RTCSessionDescription>;
+
+export interface SessionDescriptionHandler {
+    getDescription(options: SessionDescriptionHandlerParameters, modifiers: DescriptionModifier[]): Promise<any>;
+    setDescription(sessionDescription: string, options: SessionDescriptionHandlerParameters, modifiers: DescriptionModifier[]): Promise<any>;
+    hasDescription: (contentType: string) => boolean;
+    close: () => void;
+    holdModifier: (description: RTCSessionDescription) => Promise<RTCSessionDescription>;
+
+    on(name: 'userMediaRequest', callback: (constraints: MediaConstraints) => void): void;
+    on(name: 'userMedia', callback: (stream: MediaStream) => void): void;
+    on(name: 'userMediaFailed', callback: (error: string) => void): void;
+    on(name: 'iceCandidate', callback: (candidate: any) => void): void;
+    on(
+        name: 'iceGathering' | 'iceGatheringComplete' | 'iceConnection' | 'iceConnectionChecking' | 'iceConnectionConnected' | 'iceConnectionCompleted' | 'iceConnectionFailed' |
+            'iceConnectionDisconnected' | 'iceConnectionClosed' | string,
+        callback: () => void): void;
+    on(name: 'dataChannel' | 'getDescription' | 'setDescription', callback: (sdpWrapper: { type: string, sdp: string }) => void): void;
+    on(name: 'addTrack', callback: (track: any) => void): void;
+}
+
 export interface Session {
     startTime?: Date;
     endTime?: Date;
@@ -81,6 +103,7 @@ export interface Session {
     localIdentity?: NameAddrHeader;
     remoteIdentity?: NameAddrHeader;
     data: ClientContext | ServerContext;
+    sessionDescriptionHandler: SessionDescriptionHandler;
 
     dtmf(tone: string | number, options?: Session.DtmfOptions): Session;
     terminate(options?: Session.CommonOptions): Session;
@@ -140,7 +163,7 @@ export namespace Session {
         };
     }
 
-    interface DTMF extends Object {}
+    interface DTMF extends Object { }
 
     interface Muted {
         audio?: boolean;
@@ -189,10 +212,22 @@ export namespace WebRTC {
         on(name: 'iceCandidate', callback: (candidate: any) => void): void;
         on(
             name: 'iceGathering' | 'iceGatheringComplete' | 'iceConnection' | 'iceConnectionChecking' | 'iceConnectionConnected' | 'iceConnectionCompleted' | 'iceConnectionFailed' |
-                  'iceConnectionDisconnected' | 'iceConnectionClosed' | string,
+                'iceConnectionDisconnected' | 'iceConnectionClosed' | string,
             callback: () => void): void;
         on(name: 'dataChannel' | 'getDescription' | 'setDescription', callback: (sdpWrapper: { type: string, sdp: string }) => void): void;
     }
+
+    class Simple {
+        constructor(options: SimpleConfigurationParameters);
+
+        on(name: 'registered' | 'unregistered', callback: (ua: UA) => void): void;
+        on(name: 'ringing' | 'connecting' | 'connected' | 'ended', callback: (session: Session) => void): void;
+        on(name: 'message', callback: (message: Message) => void): void;
+
+        call(target: string | URI): Session;
+        toggleMute(mute: boolean): void;
+        hangup: () => Session | void;
+    }
 }
 
 /* Parameters */
@@ -242,6 +277,39 @@ export interface ConfigurationParameters {
     wsServerReconnectionTimeout?: number;
 }
 
+export interface SimpleConfigurationParameters {
+    ua: {
+        wsServers?: string | Array<string | { ws_uri: string; weight?: number }>;
+        uri?: string;
+        authorizationUser?: string;
+        password?: string;
+        displayName?: string;
+        traceSip?: boolean;
+        userAgentString?: string;
+    };
+    media?: {
+        remote?: {
+            audio?: Element;
+            video?: Element;
+        };
+        local?: {
+            audio?: Element;
+            video?: Element;
+        };
+    };
+}
+
+export interface SessionDescriptionHandlerParameters {
+    constraints?: any;
+    peerConnectionOptions?: {
+        rtcConfiguration: {
+            iceServers: TurnServer[];
+            iceCheckingTimeout: number;
+        };
+        RTCOfferOptions: {};
+    };
+}
+
 /* Options */
 export interface ExtraHeadersOptions {
     extraHeaders?: string[];
@@ -336,10 +404,10 @@ export interface IncomingMessage extends Request {
 
 /* Header */
 export class NameAddrHeader {
-    uri: string | URI;
+    uri: URI;
     displayName: string;
 
-    constructor(uri: string | sipjs.URI, displayName: string, parameters: Array<{ key: string, value: string }>);
+    constructor(uri: sipjs.URI, displayName: string, parameters: Array<{ key: string, value: string }>);
     static parse(name_addr_header: string): sipjs.NameAddrHeader;
 
     setParam(key: string, value?: string): void;
diff --git a/types/sipml/tslint.json b/types/sipml/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sipml/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sizzle/index.d.ts b/types/sizzle/index.d.ts
index bfe24791bf..1b79089b52 100644
--- a/types/sizzle/index.d.ts
+++ b/types/sizzle/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://sizzlejs.com
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 export as namespace Sizzle;
 
diff --git a/types/sizzle/sizzle-tests.ts b/types/sizzle/sizzle-tests.ts
index 3c6d17dc64..0662380942 100644
--- a/types/sizzle/sizzle-tests.ts
+++ b/types/sizzle/sizzle-tests.ts
@@ -47,8 +47,8 @@ function setFilters_0() {
 }
 
 function setFilters_1(oldPOS: RegExp) {
-    Sizzle.selectors.match['POS'] = new RegExp(oldPOS.source.replace('first', 'uno'), 'gi');
-    Sizzle.selectors.setFilters['uno'] = Sizzle.selectors.setFilters['first'];
-    delete Sizzle.selectors.setFilters['first'];
+    Sizzle.selectors.match.POS = new RegExp(oldPOS.source.replace('first', 'uno'), 'gi');
+    Sizzle.selectors.setFilters.uno = Sizzle.selectors.setFilters.first;
+    delete Sizzle.selectors.setFilters.first;
     Sizzle('div:uno'); // ==> [ <div> ]
 }
diff --git a/types/sjcl/tslint.json b/types/sjcl/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sjcl/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ski/tslint.json b/types/ski/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ski/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/skyway/tslint.json b/types/skyway/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/skyway/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/slack-node/index.d.ts b/types/slack-node/index.d.ts
index c10e744e28..072c2fb745 100644
--- a/types/slack-node/index.d.ts
+++ b/types/slack-node/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/clonn/slack-node-sdk
 // Definitions by: Joshua DeVinney <https://github.com/geoffreak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as request from "request";
 
diff --git a/types/slack-node/tslint.json b/types/slack-node/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/slack-node/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/slackify-html/tslint.json b/types/slackify-html/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/slackify-html/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/slate-irc/tslint.json b/types/slate-irc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/slate-irc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sleep/tslint.json b/types/sleep/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sleep/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/slick-carousel/tslint.json b/types/slick-carousel/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/slick-carousel/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/slickgrid/test/index.ts b/types/slickgrid/test/index.ts
index d0ee85a23c..a0b5f178c5 100644
--- a/types/slickgrid/test/index.ts
+++ b/types/slickgrid/test/index.ts
@@ -62,7 +62,7 @@ $('.newSelection');
 grid.setSelectedRows([0, 1, 2]);
 
 class SingleCellSelectionModel extends Slick.SelectionModel<MyData, Slick.Range[]> {
-	private self: SingleCellSelectionModel = null;
+	private readonly self: SingleCellSelectionModel = null;
 	private _grid: Slick.Grid<MyData>;
 
 	constructor() {
diff --git a/types/slickgrid/tslint.json b/types/slickgrid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/slickgrid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/slideout/tslint.json b/types/slideout/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/slideout/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/slocket/index.d.ts b/types/slocket/index.d.ts
index a33ab9ffd8..c21fb10c23 100644
--- a/types/slocket/index.d.ts
+++ b/types/slocket/index.d.ts
@@ -19,9 +19,9 @@ interface Slocket {
 declare namespace slocket {
     interface Slocket extends EventEmitter {
         then<TResult1 = Lock, TResult2 = never>(
-            onfulfilled?: ((value: Lock) => TResult1 | PromiseLike<TResult1>) | undefined | null,
-            onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-        catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<Lock | TResult>;
+            onfulfilled?: ((value: Lock) => TResult1 | PromiseLike<TResult1>) | null,
+            onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
+        catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null): Promise<Lock | TResult>;
     }
 
     interface Lock {
diff --git a/types/smart-fox-server/tslint.json b/types/smart-fox-server/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/smart-fox-server/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/smooth-scrollbar/index.d.ts b/types/smooth-scrollbar/index.d.ts
deleted file mode 100644
index 74feda3351..0000000000
--- a/types/smooth-scrollbar/index.d.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-// Type definitions for smooth-scrollbar 7.2
-// Project: https://github.com/idiotWu/smooth-scrollbar
-// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export as namespace Scrollbar;
-
-export interface ScrollbarOptions {
-    /**
-     * Scrolling speed scale.
-     * @default 1
-     */
-    speed?: number;
-    /**
-     * Delta reduction damping, a float value between (0, 1), the lower the value is, the more smooth the scrolling will be.
-     * @default 0.1
-     */
-    damping?: number;
-    /**
-     * Minimal size for scrollbar thumb.
-     * @default 20
-     */
-    thumbMinSize?: number;
-    /**
-     * Execute listeners in synchronous or asynchronous.
-     * @default false
-     */
-    syncCallbacks?: boolean;
-    /**
-     * Render scrolling by integer pixels, set to true to improve performance.
-     * @default true
-     */
-    renderByPixels?: boolean;
-    /**
-     * Whether allow upper scrollable content to continue scrolling when current scrollbar reaches edge.
-     * When set to "auto", it will be enabled on nested scrollbars, and disabled on first-class scrollbars.
-     * @default "auto"
-     */
-    continuousScrolling?: boolean | "auto";
-    /**
-     * Experimental overscroll effect, "bounce" for iOS style effect and "glow" for Android style effect.
-     * Be careful when you enable this feature!
-     * @default false
-     */
-    overscrollEffect?: boolean | "bounce" | "glow";
-    /**
-     * Canvas paint color with 'glow' effect.
-     * @default "#87ceeb"
-     */
-    overscrollEffectColor?: string;
-    /**
-     * The same as damping, but for overscrolling.
-     * @default 0.2
-     */
-    overscrollDamping?: number;
-}
-
-export interface ScrollbarTargets {
-    readonly container: HTMLElement;
-    readonly content: HTMLElement;
-    readonly xAxis: {
-        readonly track: HTMLElement;
-        readonly thumb: HTMLElement;
-    };
-    readonly yAxis: {
-        readonly track: HTMLElement;
-        readonly thumb: HTMLElement;
-    };
-}
-
-export interface ScrollIntoViewOptions {
-    /**
-     * scrolling stop offset to top edge of container
-     * @default 0
-     */
-    offsetTop?: number;
-    /**
-     * scrolling stop offset to left edge of container
-     * @default 0
-     */
-    offsetLeft?: number;
-    /**
-     * whether to scroll container when target element is visible
-     * @default false
-     */
-    onlyScrollIfNeeded?: boolean;
-}
-
-export interface ScrollStatusObject {
-    /**
-     * Scrolling direction
-     */
-    direction: {
-        x: "none" | "right" | "left";
-        y: "none" | "up" | "down";
-    };
-    /**
-     * Scrolling offset
-     */
-    offset: {
-        x: number;
-        y: number;
-    };
-    /**
-     * Max scroll distance in px
-     */
-    limit: {
-        x: number;
-        y: number;
-    };
-}
-
-export default class Scrollbar {
-    /**
-     * Init scrollbar on given element, and returns scrollbar instance
-     * @param {HTMLElement} element Element to init scrollbar
-     * @param {ScrollbarOptions} options Scrollbar options
-     * @return {Scrollbar} Scrollbar instance
-     */
-    static init(element: HTMLElement, options?: ScrollbarOptions): Scrollbar;
-    /**
-     * Automatically init scrollbar on all elements refer to selector scrollbar, [scrollbar], [data-scrollbar]
-     * @return {Scrollbar[]} An array of scrollbars
-     */
-    static initAll(options?: ScrollbarOptions): Scrollbar[];
-    /**
-     * Check if scrollbar exists on given element:
-     * @param {HTMLElement} element HTML element
-     * @return {boolean}
-     */
-    static has(element: HTMLElement): boolean;
-    /**
-     * Get scrollbar on the given element
-     * @param {HTMLElement} element HTML element
-     * @return {Scrollbar|undefined} Scrollbar instance of undefined if element doesn't have scrollbar
-     */
-    static get(element: HTMLElement): Scrollbar | undefined;
-    /**
-     * Get all scrollbar instances
-     * @return {Scrollbar[]} An array of scrollbar instances
-     */
-    static getAll(): Scrollbar[];
-    /**
-     * Remove scrollbar on the given element
-     * @param {HTMLElement} element HTML element
-     * @param {boolean} isRemoval
-     */
-    static destroy(element: HTMLElement, isRemoval?: boolean): void;
-    /**
-     * Destroys all scrollbar instances
-     */
-    static destroyAll(): void;
-    /**
-     * Current scrollbar targets
-     */
-    readonly targets: ScrollbarTargets;
-    /**
-     * Current scrolling offset
-     */
-    offset: {
-        x: number;
-        y: number;
-    };
-    /**
-     * Max scrolling offset
-     */
-    limit: {
-        x: number;
-        y: number;
-    };
-    /**
-     * Alias for offset.y
-     */
-    scrollTop: number;
-    /**
-     * Alias for offset.x
-     */
-    scrollLeft: number;
-
-    /**
-     * Scrollbars are automatically updated with 100ms debounce (or childList changes if MutationObserver is supported).
-     * You can call update() to force an update, this will be useful when you modified contents inside scrollbar
-     * @param {boolean} async By default, updating will operate synchronously, set to true to update asynchronously (in next frame).
-     */
-    update(async?: boolean): void;
-    /**
-     * Return the size of scrollbar container and scroll content
-     * @return {Object} Container and content dimensions
-     */
-    getSize(): { container: { width: number; height: number }; content: { width: number; height: number } };
-    /**
-     * Like window.scrollTo(), scroll content will be set to the given position immediately.
-     * @param {number} x X position
-     * @param {number} y Y position
-     * @param {boolean} withoutCallbacks Set to true to disable callback functions temporarily.
-     */
-    setPosition(x: number, y: number, withoutCallbacks?: boolean): void;
-    /**
-     * Scroll to given position with easing, callback will be invoked with instance after scrolling:
-     * @param {number} x X position
-     * @param {number} y Y position
-     * @param {number} duration description
-     * @param {Function} callback Callback
-     */
-    scrollTo(x: number, y: number, duration?: number, callback?: (instance: this) => void): void;
-    /**
-     * Scroll target element into visible area of scrollbar, like DOM method element.scrollIntoView().
-     * This will be helpful when you want to create some anchors.
-     * @param {HTMLElement} element Element to scroll into
-     * @param {ScrollIntoViewOptions} options Options
-     */
-    scrollIntoView(element: HTMLElement, options?: ScrollIntoViewOptions): void;
-    /**
-     * Check if an element is visible in the current view area.
-     * @param {HTMLElement} element HTML element
-     * @return {boolean} True/false
-     */
-    isVisible(element: HTMLElement): boolean;
-    /**
-     * Register scrolling listener to scrollbar instance, callbacks will be invoked in every small scrolling.
-     * @param {Function} listener A listener
-     */
-    addListener(listener: (status: ScrollStatusObject) => void): void;
-    /**
-     * Remove the given listeneer from listeners collection, like Element.removeEventListener().
-     * @param {Function} listener A listener
-     */
-    removeListener(listener: (status: ScrollStatusObject) => void): void;
-    /**
-     * This is another useful method when you want to make infinite scrolling.
-     * Callbacks will be invoked with status object when you scrolling down over a threshold.
-     * @param {Function} listener A listener
-     * @param {number} threshold Threshold, default 50
-     */
-    infiniteScroll(listener: (status: ScrollStatusObject) => void, threshold?: number): void;
-    /**
-     * Remove DOM event handlers that match regex rules
-     * @param {RegExp[]} regexps regexps
-     * @example
-     * instance.unregisterEvents(/touch/, /key/);
-     */
-    unregisterEvents(...regexps: RegExp[]): void;
-    /**
-     * Recover events that are unregistered.
-     * @param {RegExp[]} regexps regexps
-     */
-    registerEvents(...regexps: RegExp[]): void;
-    /**
-     * Clear all movements and stop scrollbar immediately, will be useful when you want to stop scrollbar and set it to another position.
-     */
-    clearMovement(): void;
-    /**
-     * Alias for clearMovement() method.
-     */
-    stop(): void;
-    /**
-     * Remove this scrollbar instance
-     * @param {boolean} isRemoval Set to true if scrollbar being removed from DOM
-     */
-    destroy(isRemoval?: boolean): void;
-    /**
-     * Get content element of the scrollbar, which contains all of your contents within scrollbar.
-     * In other words, all contents that you've put them into target element, will be moved here after you initialized the scrollbar.
-     * @return {HTMLElement} HTML content element
-     */
-    getContentElem(): HTMLElement;
-    /**
-     * Show scrollbar track, you can choose whether 'x' or 'y' or 'both', default is 'both' which will show tracks both on x-axis and y-axis.
-     * @param {"x"|"y"|"both"} direction Track direction
-     */
-    showTrack(direction?: "x" | "y" | "both"): void;
-    /**
-     * Like showTrack() method, but for hiding the track on specified direction.
-     * @param {"x"|"y"|"both"} direction Track direction
-     */
-    hideTrack(direction?: "x" | "y" | "both"): void;
-}
diff --git a/types/smooth-scrollbar/smooth-scrollbar-tests.ts b/types/smooth-scrollbar/smooth-scrollbar-tests.ts
deleted file mode 100644
index 2072caa3c8..0000000000
--- a/types/smooth-scrollbar/smooth-scrollbar-tests.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import Scrollbar from "smooth-scrollbar";
-
-const elem = document.createElement("div");
-
-const scrollbar = Scrollbar.init(elem, {
-    continuousScrolling: true,
-    damping: 5,
-    overscrollDamping: 5,
-    overscrollEffect: "glow",
-    overscrollEffectColor: "green",
-    renderByPixels: true,
-    speed: 10,
-    syncCallbacks: true,
-    thumbMinSize: 1
-});
-
-Scrollbar.has(elem);
-Scrollbar.get(elem) === scrollbar;
-
-scrollbar.targets.container;
-scrollbar.targets.xAxis.track;
-
-scrollbar.update(true);
-scrollbar.setPosition(10, 10);
-
-scrollbar.addListener(status => status.direction);
-scrollbar.infiniteScroll(status => status.direction.y);
-
-scrollbar.hideTrack("both");
-scrollbar.showTrack("x");
-scrollbar.destroy(true);
diff --git a/types/smooth-scrollbar/tsconfig.json b/types/smooth-scrollbar/tsconfig.json
deleted file mode 100644
index 78ba6e77ee..0000000000
--- a/types/smooth-scrollbar/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "smooth-scrollbar-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/smoothie/index.d.ts b/types/smoothie/index.d.ts
deleted file mode 100644
index 853b1fbc25..0000000000
--- a/types/smoothie/index.d.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-// Type definitions for Smoothie Charts 1.25
-// Project: https://github.com/joewalnes/smoothie
-// Definitions by: Drew Noakes <https://drewnoakes.com>, Mike H. Hawley <https://github.com/mikehhawley>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/smoothie
-
-// NOTE this reference is here to make the DefinitelyTyped `npm test` suite pass and
-//      may be removed if you are using this module declaration in isolation from the
-//      rest of DefinitelyTyped.
-/// <reference types="node" />
-
-
-export interface ITimeSeriesOptions {
-    resetBounds?: boolean;
-    resetBoundsInterval?: number;
-}
-
-export interface ITimeSeriesPresentationOptions {
-    strokeStyle?: string;
-    fillStyle?: string;
-    lineWidth?: number;
-}
-
-export declare class TimeSeries {
-    /**
-     * Initialises a new <code>TimeSeries</code> with optional data options.
-     *
-     * Options are of the form (defaults shown):
-     *
-     * <pre>
-     * {
-     *   resetBounds: true,        // enables/disables automatic scaling of the y-axis
-     *   resetBoundsInterval: 3000 // the period between scaling calculations, in millis
-     * }
-     * </pre>
-     *
-     * Presentation options for TimeSeries are specified as an argument to <code>SmoothieChart.addTimeSeries</code>.
-     */
-    constructor(options?: ITimeSeriesOptions);
-
-    /**
-     * Clears all data and state from this TimeSeries object.
-     */
-    clear(): void;
-
-    /**
-     * Recalculate the min/max values for this <code>TimeSeries</code> object.
-     *
-     * This causes the graph to scale itself in the y-axis.
-     */
-    resetBounds(): void;
-
-    /**
-     * Adds a new data point to the <code>TimeSeries</code>, preserving chronological order.
-     *
-     * @param timestamp the position, in time, of this data point
-     * @param value the value of this data point
-     * @param sumRepeatedTimeStampValues if <code>timestamp</code> has an exact match in the series, this flag controls
-     * whether it is replaced, or the values summed (defaults to false.)
-     */
-    append(timestamp: number, value: number, sumRepeatedTimeStampValues?: boolean): void;
-
-    dropOldData(oldestValidTime: number, maxDataSetLength: number): void;
-}
-
-export interface IGridOptions {
-    /** The background colour of the chart. */
-    fillStyle?: string;
-    /** The pixel width of grid lines. */
-    lineWidth?: number;
-    /** Colour of grid lines. */
-    strokeStyle?: string;
-    /** Distance between vertical grid lines. */
-    millisPerLine?: number;
-    /** Controls whether grid lines are 1px sharp, or softened. */
-    sharpLines?: boolean;
-    /** Number of vertical sections marked out by horizontal grid lines. */
-    verticalSections?: number;
-    /** Whether the grid lines trace the border of the chart or not. */
-    borderVisible?: boolean;
-}
-
-export interface ILabelOptions {
-    /** Enables/disables labels showing the min/max values. */
-    disabled?: boolean;
-    /** Colour for text of labels. */
-    fillStyle?: string;
-    fontSize?: number;
-    fontFamily?: string;
-    precision?: number;
-}
-
-export interface IRange { min: number; max: number }
-
-export interface IHorizontalLine {
-    value?: number;
-    color?: string;
-    lineWidth?: number;
-}
-
-export interface IChartOptions {
-    /** Specify to clamp the lower y-axis to a given value. */
-    minValue?: number;
-    /** Specify to clamp the upper y-axis to a given value. */
-    maxValue?: number;
-    /** Allows proportional padding to be added above the chart. for 10% padding, specify 1.1. */
-    maxValueScale?: number;
-    yRangeFunction?: (range: IRange) => IRange;
-    /** Controls the rate at which y-value zoom animation occurs. */
-    scaleSmoothing?: number;
-    /** Sets the speed at which the chart pans by. */
-    millisPerPixel?: number;
-    /** Whether to render at different DPI depending upon the device. Enabled by default. */
-    enableDpiScaling?: boolean;
-    yMinFormatter?: (min: number, precision: number) => string;
-    yMaxFormatter?: (max: number, precision: number) => string;
-    maxDataSetLength?: number;
-    /** One of: 'bezier', 'linear', 'step' */
-    interpolation?: string;
-    /** Optional function to format time stamps for bottom of chart. You may use <code>SmoothieChart.timeFormatter</code>, or your own/ */
-    timestampFormatter?: (date: Date) => string;
-    horizontalLines?: IHorizontalLine[];
-
-    grid?: IGridOptions;
-
-    labels?: ILabelOptions;
-}
-
-/**
- * Initialises a new <code>SmoothieChart</code>.
- *
- * Options are optional and may be sparsely populated. Just specify the values you
- * need and the rest will be given sensible defaults.
- */
-export declare class SmoothieChart {
-    options: IChartOptions;
-
-    constructor(chartOptions?: IChartOptions);
-
-    /**
-     * Adds a <code>TimeSeries</code> to this chart, with optional presentation options.
-     */
-    addTimeSeries(series: TimeSeries, seriesOptions?: ITimeSeriesPresentationOptions): void;
-
-    /**
-     * Removes the specified <code>TimeSeries</code> from the chart.
-     */
-    removeTimeSeries(series: TimeSeries): void;
-
-    /**
-     * Gets render options for the specified <code>TimeSeries</code>.
-     *
-     * As you may use a single <code>TimeSeries</code> in multiple charts with different formatting in each usage,
-     * these settings are stored in the chart.
-     */
-    getTimeSeriesOptions(timeSeries: TimeSeries): ITimeSeriesPresentationOptions;
-
-    /**
-     * Brings the specified <code>TimeSeries</code> to the top of the chart. It will be rendered last.
-     */
-    bringToFront(timeSeries: TimeSeries): void;
-
-    /**
-     * Instructs the <code>SmoothieChart</code> to start rendering to the provided canvas, with specified delay.
-     *
-     * @param canvas the target canvas element
-     * @param delayMillis an amount of time to wait before a data point is shown. This can prevent the end of the series
-     * from appearing on screen, with new values flashing into view, at the expense of some latency.
-     */
-    streamTo(canvas: HTMLCanvasElement, delayMillis?: number): void;
-
-    /**
-     * Starts the animation of this chart. Called by <code>streamTo</code>.
-     */
-    start(): void;
-
-    /**
-     * Stops the animation of this chart.
-     */
-    stop(): void;
-
-    updateValueRange(): void;
-
-    render(canvas?: HTMLCanvasElement, time?: number): void;
-
-    static timeFormatter(date: Date): string;
-}
diff --git a/types/smoothie/smoothie-tests.ts b/types/smoothie/smoothie-tests.ts
deleted file mode 100644
index 5a89014192..0000000000
--- a/types/smoothie/smoothie-tests.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// Smoothie supports browserify
-import smoothie = require('smoothie');
-
-var canvas: HTMLCanvasElement = document.createElement('canvas');
-
-document.body.appendChild(canvas);
-
-var series: smoothie.TimeSeries   = new smoothie.TimeSeries(),
-	chart: smoothie.SmoothieChart = new smoothie.SmoothieChart({
-    grid : {
-        strokeStyle : '#404040'
-    },
-    maxValue :    1,
-    minValue :    0
-});
-
-chart.addTimeSeries(series, {
-    strokeStyle : '#FFFFFF',
-    fillStyle   : 'rgba(64, 64, 64, 0.25)',
-    lineWidth   : 2
-});
-
-var DELAY: number = 500;
-
-chart.streamTo(canvas, DELAY);
-chart.addTimeSeries(series);
-
-setInterval(() =>
-	series.append(Date.now(), Math.random()),
-	DELAY);
diff --git a/types/smoothie/tsconfig.json b/types/smoothie/tsconfig.json
deleted file mode 100644
index 7e9fd9b698..0000000000
--- a/types/smoothie/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "smoothie-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/smtp-server/index.d.ts b/types/smtp-server/index.d.ts
index 15befe8d7c..6e71373260 100644
--- a/types/smtp-server/index.d.ts
+++ b/types/smtp-server/index.d.ts
@@ -1,386 +1,315 @@
-// Type definitions for smtp-server v1.15.0
-// Project: https://github.com/andris9/smtp-server
+// Type definitions for smtp-server 3.3
+// Project: https://github.com/nodemailer/smtp-server
 // Definitions by: markisme <https://github.com/markisme>
 //                 taisiias <https://github.com/Taisiias>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+//                 Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+/// <reference types="nodemailer" />
 
-/// <reference types="node"/>
 import { EventEmitter } from 'events';
+import * as net from 'net';
+import * as shared from 'nodemailer/lib/shared';
+import { Readable } from 'stream';
+import * as tls from 'tls';
 
-export class SMTPServer extends EventEmitter {
-    constructor(options: SMTPServerOptions);
-    close(callback: (err?: Error) => any): any;
-    listen(...args: any[]): void;
-    onAuth(auth: Authentication, session: Session, callback: any): any;
-    onClose(callback: (err?: Error) => any): any;
-    onConnect(session: Session, callback: (err?: Error) => any): any;
-    onData(stream: any, session: Session, callback: (err?: Error) => any): any;
-    onMailFrom(address: Address, session: Session, callback: (err?: Error) => any): any;
-    onRcptTo(address: Address, session: Session, callback: (err?: Error) => any): any;
-}
+export type ms = number;
 
-export interface SMTPServerOptions {
-    /**
-     * if true, the connection will use TLS. The default is false. 
-     * If the server doesn't start in TLS mode, 
-     * it is still possible to upgrade clear text socket to 
-     * TLS socket with the STARTTLS command (unless you disable support for it). 
-     * If secure is true, additional tls options for tls.
-     * createServer can be added directly onto this options object.
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    secure?: boolean;
-    key?: any;
-    cert?: any;
-    ca?: any;
-    /**
-     * optional hostname of the server,
-     *  used for identifying to the client (defaults to os.hostname())
-     * 
-     * @type {string}
-     * @memberOf SMTPServerOptions
-     */
-    name?: string;
-    /**
-     * optional greeting message.
-     *  This message is appended to the default ESMTP response.
-     * 
-     * @type {string}
-     * @memberOf SMTPServerOptions
-     */
-    banner?: string;
-    /**
-     * optional maximum allowed message size in bytes, 
-     * see details:https://github.com/andris9/smtp-server#using-size-extension
-     * 
-     * @type {number}
-     * @memberOf SMTPServerOptions
-     */
-    size?: number;
-    /**
-     * optional array of allowed authentication methods, defaults to ['PLAIN', 'LOGIN']. 
-     * Only the methods listed in this array are allowed, 
-     * so if you set it to ['XOAUTH2'] then PLAIN and LOGIN are not available. 
-     * Use ['PLAIN', 'LOGIN', 'XOAUTH2'] to allow all three. 
-     * Authentication is only allowed in secure mode 
-     * (either the server is started with secure: true option or STARTTLS command is used)
-     * 
-     * @type {string[]}
-     * @memberOf SMTPServerOptions
-     */
-    authMethods?: string[];
-    /**
-     * allow authentication, but do not require it
-     * 
-     * @type {*}
-     * @memberOf SMTPServerOptions
-     */
-    authOptional?: any;
-    /**
-     * optional array of disabled commands (see all supported commands here). 
-     * For example if you want to disable authentication, 
-     * use ['AUTH'] as this value. 
-     * If you want to allow authentication in clear text, set it to ['STARTTLS'].
-     * 
-     * @type {*}
-     * @memberOf SMTPServerOptions
-     */
-    disabledCommands?: string[];
-    /**
-     * optional boolean, if set to true then allow using STARTTLS 
-     * but do not advertise or require it. It only makes sense 
-     * when creating integration test servers for testing the scenario 
-     * where you want to try STARTTLS even when it is not advertised
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    hideSTARTTLS?: boolean;
-    /**
-     * optional boolean, if set to true then does not show PIPELINING in feature list
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    hidePIPELINING?: boolean;
-    /**
-     * optional boolean, if set to true then does not show 8BITMIME in features list
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    hide8BITMIME?: boolean;
-    /**
-     * optional boolean, if set to true then does not show SMTPUTF8 in features list
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    hideSMTPUTF8?: boolean;
-    /**
-     * optional boolean, if set to true allows authentication even if connection is not secured first
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    allowInsecureAuth?: boolean;
-    /**
-     * optional boolean, if set to true then does not try to reverse resolve client hostname
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    disableReverseLookup?: boolean;
-    /**
-     * optional Map or an object of TLS options for SNI where servername is the key. Overrided by SNICallback.
-     * 
-     * @type {Object}
-     * @memberOf SMTPServerOptions
-     */
-    sniOptions?: Object;
-    /**
-     * optional bunyan compatible logger instance. 
-     * If set to true then logs to console. 
-     * If value is not set or is false then nothing is logged
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    logger?: boolean;
-    /**
-     * sets the maximum number of concurrently connected clients, defaults to Infinity
-     * 
-     * @type {number}
-     * @memberOf SMTPServerOptions
-     */
-    maxClients?: number;//defaults to Infinity
-    /**
-     * boolean, if set to true expects to be behind a proxy that emits a 
-     * PROXY header{http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt} (version 1 only)
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    useProxy?: boolean;
-    /**
-     * boolean, if set to true, enables usage of 
-     * XCLIENT{http://www.postfix.org/XCLIENT_README.html} extension to override connection properties. 
-     * See session.xClient (Map object) for the details provided by the client
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    useXClient?: boolean;
-    /**
-     * boolean, if set to true, enables usage of XFORWARD{http://www.postfix.org/XFORWARD_README.html} extension. 
-     * See session.xForward (Map object) for the details provided by the client
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    useXForward?: boolean;
-    /**
-     * boolean, if set to true use LMTP protocol instead of SMTP
-     * 
-     * @type {boolean}
-     * @memberOf SMTPServerOptions
-     */
-    lmtp?: boolean;
-    /**
-     * How many milliseconds of inactivity to allow before disconnecting the client (defaults to 1 minute)
-     * 
-     * @type {number}
-     * @memberOf SMTPServerOptions
-     */
-    socketTimeout?: number;//millisceonds
-    /**
-     * How many millisceonds to wait before disconnecting pending 
-     * connections once server.close() has been called (defaults to 30 seconds)
-     * 
-     * @type {number}
-     * @memberOf SMTPServerOptions
-     */
-    closeTimeout?: number;//millisceonds
-    /**
-     * The callback to handle authentications (see details https://github.com/andris9/smtp-server#handling-authentication)
-     * 
-     * 
-     * @memberOf SMTPServerOptions
-     */
-    onAuth?: (auth: Authentication, session: Session, callback: (err?: Error, response?: AuthenticationResponse) => any) => any;
-    /**
-     * The callback to handle the client connection. (see details https://github.com/andris9/smtp-server#validating-client-connection)
-     * 
-     * 
-     * @memberOf SMTPServerOptions
-     */
-    onConnect?: (session: Session, callback: (err?: Error) => any) => any;
-    /**
-     * the callback to validate MAIL FROM commands (see details https://github.com/andris9/smtp-server#validating-sender-addresses)
-     * 
-     * 
-     * @memberOf SMTPServerOptions
-     */
-    onMailFrom?: (address: Address, session: Session, callback: (err?: Error) => any) => any;
-    /**
-     * The callback to validate RCPT TO commands (see details https://github.com/andris9/smtp-server#validating-recipient-addresses)
-     * 
-     * 
-     * @memberOf SMTPServerOptions
-     */
-    onRcptTo?: (address: Address, session: Session, callback: (err?: Error) => any) => any;
-    /**
-     * the callback to handle incoming messages (see details https://github.com/andris9/smtp-server#processing-incoming-message)
-     * 
-     * 
-     * @memberOf SMTPServerOptions
-     */
-    onData?: (stream: any, session: Session, callback: (err?: Error) => any) => any;
-    /**
-     * the callback that informs about closed client connection
-     * 
-     * 
-     * @memberOf SMTPServerOptions
-     */
-    onClose?: (session: Session) => any;
-}
-
-export interface Authentication {
-    /**
-     * indicates the authentication method used, 'PLAIN', 'LOGIN' or 'XOAUTH2'
-     * 
-     * @type {string}
-     * @memberOf Authentication
-     */
-    method: "PLAIN" | "LOGIN" | "XOAUTH2";//'PLAIN', 'LOGIN' or 'XOAUTH2'
-    /**
-     * the username of the user
-     * 
-     * @type {string}
-     * @memberOf Authentication
-     */
-    username?: string;
-    /**
-     * the password if LOGIN or PLAIN was used
-     * 
-     * @type {string}
-     * @memberOf Authentication
-     */
-    password?: string;
-    /**
-     *  the OAuth2 bearer access token if 'XOAUTH2' was used as the authentication method
-     * 
-     * @type {string}
-     * @memberOf Authentication
-     */
-    accessToken?: string;
-    /**
-     * a function for validating CRAM-MD5 challenge responses. 
-     * Takes the password of the user as an argument and returns true if the response matches the password
-     * 
-     * 
-     * @memberOf Authentication
-     */
-    validatePassword: (password: string) => boolean;
-}
-
-export interface AuthenticationResponse {
-    /**
-     * can be any value - if this is set then the user is considered logged in 
-     * and this value is used later with the session data to identify the user. 
-     * If this value is empty, then the authentication is considered failed
-     * 
-     * @type {*}
-     * @memberOf AuthenticationResponse
-     */
-    user: any;
-    /**
-     * an object to return if XOAUTH2 authentication failed (do not set the error object in this case). 
-     * This value is serialized to JSON and base64 encoded automatically, so you can just return the object
-     * 
-     * @type {{}}
-     * @memberOf AuthenticationResponse
-     */
-    data?: {};
-}
-
-export interface Session {
-    /**
-     * random string identificator generated when the client connected
-     * 
-     * @type {string}
-     * @memberOf Session
-     */
-    id: string;
-    /**
-     * the IP address for the connected client
-     * 
-     * @type {Address}
-     * @memberOf Session
-     */
-    remoteAddress: Address;
-    /**
-     * reverse resolved hostname for remoteAddress
-     * 
-     * @type {string}
-     * @memberOf Session
-     */
-    clientHostname: string;
-    /**
-     * the opening SMTP command (HELO/EHLO/LHLO)
-     * 
-     * @type {string}
-     * @memberOf Session
-     */
-    openingCommand: string;
-    /**
-     * hostname the client provided with HELO/EHLO call
-     * 
-     * @type {string}
-     * @memberOf Session
-     */
-    hostNameApearsAs: string;
-    /**
-     * Envelope Object
-     * 
-     * @type {Envelope}
-     * @memberOf Session
-     */
-    envelope: Envelope;
-}
-
-export interface Envelope {
-    /**
-     * includes an address object or is set to false
-     * 
-     * @type {Address}
-     * @memberOf Envelope
-     */
-    mailFrom: Address;
-    /**
-     * includes an array of address objects
-     * 
-     * @type {Address[]}
-     * @memberOf Envelope
-     */
-    rcptTo: Address[];
-}
-
-export interface Address {
+export interface SMTPServerAddress {
     /**
      * the address provided with the MAIL FROM or RCPT TO command
-     * 
-     * @type {string}
-     * @memberOf Address
      */
     address: string;
     /**
      * an object with additional arguments (all key names are uppercase)
-     * 
-     * @type {Object}
-     * @memberOf Address
      */
-    args: Object;
+    args: object;
+}
+
+export interface SMTPServerAuthentication {
+    /**
+     * indicates the authentication method used, 'PLAIN', 'LOGIN' or 'XOAUTH2'
+     */
+    method: 'PLAIN' | 'LOGIN' | 'XOAUTH2';
+    /**
+     * the username of the user
+     */
+    username?: string;
+    /**
+     * the password if LOGIN or PLAIN was used
+     */
+    password?: string;
+    /**
+     *  the OAuth2 bearer access token if 'XOAUTH2' was used as the authentication method
+     */
+    accessToken?: string;
+    /**
+     * a function for validating CRAM-MD5 challenge responses.
+     * Takes the password of the user as an argument and returns true if the response matches the password
+     */
+    validatePassword(password: string): boolean;
+}
+
+export interface SMTPServerAuthenticationResponse {
+    /**
+     * can be any value - if this is set then the user is considered logged in
+     * and this value is used later with the session data to identify the user.
+     * If this value is empty, then the authentication is considered failed
+     */
+    user: any;
+    /**
+     * an object to return if XOAUTH2 authentication failed (do not set the error object in this case).
+     * This value is serialized to JSON and base64 encoded automatically, so you can just return the object
+     */
+    data?: object;
+}
+
+export interface SMTPServerSession {
+    /**
+     * random string identificator generated when the client connected
+     */
+    id: string;
+    /**
+     * the IP address for the connected client
+     */
+    remoteAddress: SMTPServerAddress;
+    /**
+     * reverse resolved hostname for remoteAddress
+     */
+    clientHostname: string;
+    /**
+     * the opening SMTP command (HELO/EHLO/LHLO)
+     */
+    openingCommand: string;
+    /**
+     * hostname the client provided with HELO/EHLO call
+     */
+    hostNameAppearsAs: string;
+    /**
+     * Envelope Object
+     */
+    envelope: SMTPServerEnvelope;
+    transmissionType: string;
+
+    tlsOptions: tls.TlsOptions;
+}
+
+export interface SMTPServerEnvelope {
+    /**
+     * includes an address object or is set to false
+     */
+    mailFrom: SMTPServerAddress;
+    /**
+     * includes an array of address objects
+     */
+    rcptTo: SMTPServerAddress[];
+}
+
+export interface SMTPServerOptions extends tls.TlsOptions {
+    /**
+     * if true, the connection will use TLS. The default is false.
+     * If the server doesn't start in TLS mode,
+     * it is still possible to upgrade clear text socket to
+     * TLS socket with the STARTTLS command (unless you disable support for it).
+     * If secure is true, additional tls options for tls.
+     * createServer can be added directly onto this options object.
+     */
+    secure?: boolean;
+    /** optional private keys in PEM format */
+    key?: string | string[] | Buffer | Buffer[] | Array<{ pem: string | Buffer, passphrase: string }>;
+    /** optional cert chains in PEM format */
+    cert?: string | string[] | Buffer | Buffer[];
+    /** optionally override the trusted CA certificates */
+    ca?: string | string[] | Buffer | Buffer[];
+    /**
+     * optional hostname of the server,
+     * used for identifying to the client (defaults to os.hostname())
+     */
+    name?: string;
+    /**
+     * optional greeting message.
+     * This message is appended to the default ESMTP response.
+     */
+    banner?: string;
+    /**
+     * optional maximum allowed message size in bytes,
+     * see details:https://github.com/andris9/smtp-server#using-size-extension
+     */
+    size?: number;
+    /**
+     * optional array of allowed authentication methods, defaults to ['PLAIN', 'LOGIN'].
+     * Only the methods listed in this array are allowed,
+     * so if you set it to ['XOAUTH2'] then PLAIN and LOGIN are not available.
+     * Use ['PLAIN', 'LOGIN', 'XOAUTH2'] to allow all three.
+     * Authentication is only allowed in secure mode
+     * (either the server is started with secure: true option or STARTTLS command is used)
+     */
+    authMethods?: string[];
+    /**
+     * allow authentication, but do not require it
+     */
+    authOptional?: boolean;
+    /**
+     * optional array of disabled commands (see all supported commands here).
+     * For example if you want to disable authentication,
+     * use ['AUTH'] as this value.
+     * If you want to allow authentication in clear text, set it to ['STARTTLS'].
+     */
+    disabledCommands?: string[]; // TODO ('AUTH' | 'STARTTLS' | 'XCLIENT' | 'XFORWARD')[];
+    /**
+     * optional boolean, if set to true then allow using STARTTLS
+     * but do not advertise or require it. It only makes sense
+     * when creating integration test servers for testing the scenario
+     * where you want to try STARTTLS even when it is not advertised
+     */
+    hideSTARTTLS?: boolean;
+    /**
+     * optional boolean, if set to true then does not show PIPELINING in feature list
+     */
+    hidePIPELINING?: boolean;
+    /**
+     * optional boolean, if set to true then does not show 8BITMIME in features list
+     */
+    hide8BITMIME?: boolean;
+    /**
+     * optional boolean, if set to true then does not show SMTPUTF8 in features list
+     */
+    hideSMTPUTF8?: boolean;
+    /**
+     * optional boolean, if set to true allows authentication even if connection is not secured first
+     */
+    allowInsecureAuth?: boolean;
+    /**
+     * optional boolean, if set to true then does not try to reverse resolve client hostname
+     */
+    disableReverseLookup?: boolean;
+    /**
+     * optional Map or an object of TLS options for SNI where servername is the key. Overrided by SNICallback.
+     */
+    sniOptions?: { [servername: string]: tls.TlsOptions } | Map<string, tls.TlsOptions>;
+    /**
+     * optional boolean, if set to true then upgrade sockets to TLS immediately after connection is established. Works with secure: true
+     */
+    needsUpgrade?: boolean;
+    /**
+     * optional bunyan compatible logger instance.
+     * If set to true then logs to console.
+     * If value is not set or is false then nothing is logged
+     */
+    logger?: shared.Logger | boolean;
+    /**
+     * sets the maximum number of concurrently connected clients, defaults to Infinity
+     */
+    maxClients?: number;
+    /**
+     * boolean, if set to true expects to be behind a proxy that emits a
+     * PROXY header{http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt} (version 1 only)
+     */
+    useProxy?: boolean;
+    /**
+     * boolean, if set to true, enables usage of
+     * XCLIENT{http://www.postfix.org/XCLIENT_README.html} extension to override connection properties.
+     * See session.xClient (Map object) for the details provided by the client
+     */
+    useXClient?: boolean;
+    /**
+     * boolean, if set to true, enables usage of XFORWARD{http://www.postfix.org/XFORWARD_README.html} extension.
+     * See session.xForward (Map object) for the details provided by the client
+     */
+    useXForward?: boolean;
+    /**
+     * boolean, if set to true use LMTP protocol instead of SMTP
+     */
+    lmtp?: boolean;
+    /**
+     * How many milliseconds of inactivity to allow before disconnecting the client (defaults to 1 minute)
+     */
+    socketTimeout?: ms;
+    /**
+     * How many millisceonds to wait before disconnecting pending
+     * connections once server.close() has been called (defaults to 30 seconds)
+     */
+    closeTimeout?: ms;
+    /**
+     * The callback to handle authentications (see details https://github.com/andris9/smtp-server#handling-authentication)
+     */
+    onAuth?(auth: SMTPServerAuthentication, session: SMTPServerSession, callback: (err: Error | null | undefined, response: SMTPServerAuthenticationResponse) => void): void;
+    /**
+     * The callback to handle the client connection. (see details https://github.com/andris9/smtp-server#validating-client-connection)
+     */
+    onConnect?(session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    /**
+     * the callback to validate MAIL FROM commands (see details https://github.com/andris9/smtp-server#validating-sender-addresses)
+     */
+    onMailFrom?(address: SMTPServerAddress, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    /**
+     * The callback to validate RCPT TO commands (see details https://github.com/andris9/smtp-server#validating-recipient-addresses)
+     */
+    onRcptTo?(address: SMTPServerAddress, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    /**
+     * the callback to handle incoming messages (see details https://github.com/andris9/smtp-server#processing-incoming-message)
+     */
+    onData?(stream: Readable, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    /**
+     * the callback that informs about closed client connection
+     */
+    onClose?(session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+}
+
+/** Creates a SMTP server instance */
+export class SMTPServer extends EventEmitter {
+    options: SMTPServerOptions;
+    logger: shared.Logger;
+    secureContext: Map<string, tls.SecureContext>;
+    connections: Set<any>;
+    server: net.Server;
+
+    constructor(options?: SMTPServerOptions);
+
+    /** Start listening on selected port and interface */
+    listen(port?: number, hostname?: string, backlog?: number, listeningListener?: () => void): net.Server;
+    listen(port?: number, hostname?: string, listeningListener?: () => void): net.Server;
+    listen(port?: number, backlog?: number, listeningListener?: () => void): net.Server; // tslint:disable-line unified-signatures
+    listen(port?: number, listeningListener?: () => void): net.Server;
+    listen(path: string, backlog?: number, listeningListener?: () => void): net.Server;
+    listen(path: string, listeningListener?: () => void): void;
+    listen(options: net.ListenOptions, listeningListener?: () => void): net.Server;
+    listen(handle: any, backlog?: number, listeningListener?: () => void): net.Server; // tslint:disable-line unified-signatures
+    listen(handle: any, listeningListener?: () => void): net.Server; // tslint:disable-line unified-signatures
+
+    /** Closes the server */
+    close(callback: (err?: Error | null) => void): void;
+
+    updateSecureContext(options: tls.TlsOptions): void;
+
+    /** Authentication handler. Override this */
+    onAuth(auth: SMTPServerAuthentication, session: SMTPServerSession, callback: (err: Error | null | undefined, response: SMTPServerAuthenticationResponse) => void): void;
+    onClose(session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    onConnect(session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    onData(stream: Readable, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    onMailFrom(address: SMTPServerAddress, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    onRcptTo(address: SMTPServerAddress, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+
+    addListener(event: 'close', listener: () => void): this;
+    addListener(event: 'error', listener: (err: Error) => void): this;
+
+    emit(event: 'close'): boolean;
+    emit(event: 'error', err: Error): boolean;
+
+    on(event: 'close', listener: () => void): this;
+    on(event: 'error', listener: (err: Error) => void): this;
+
+    once(event: 'close', listener: () => void): this;
+    once(event: 'error', listener: (err: Error) => void): this;
+
+    prependListener(event: 'close', listener: () => void): this;
+    prependListener(event: 'error', listener: (err: Error) => void): this;
+
+    prependOnceListener(event: 'close', listener: () => void): this;
+    prependOnceListener(event: 'error', listener: (err: Error) => void): this;
+
+    listeners(event: 'close'): Array<() => void>;
+    listeners(event: 'error'): Array<(err: Error) => void>;
 }
diff --git a/types/smtp-server/smtp-server-tests.ts b/types/smtp-server/smtp-server-tests.ts
index 368d2f8585..29c05c942e 100644
--- a/types/smtp-server/smtp-server-tests.ts
+++ b/types/smtp-server/smtp-server-tests.ts
@@ -1,15 +1,75 @@
-import { SMTPServer, SMTPServerOptions } from 'smtp-server';
+import { SMTPServer, SMTPServerAddress, SMTPServerAuthentication, SMTPServerAuthenticationResponse, SMTPServerOptions, SMTPServerSession } from 'smtp-server';
+import { Readable } from 'stream';
 
-function SMTPServerConnectTest() {
-    let options: SMTPServerOptions = {
-        secure: false,
-    };
-    let server = new SMTPServer(options);
-    server.on('error', err => {
-        console.log('Error %s', err.message);
-    });
-    server.listen(2323);
+const options: SMTPServerOptions = {
+    hideSTARTTLS: true,
+    onConnect,
+    onMailFrom,
+    onRcptTo,
+    onData,
+    onClose,
+    port: 2525
+};
+
+function onConnect(session: SMTPServerSession, callback: (err?: Error) => void): void {
+    console.log(`[${session.id}] onConnect`);
+    callback();
 }
 
-SMTPServerConnectTest();
+function onAuth(auth: SMTPServerAuthentication, session: SMTPServerSession, callback: (err: Error | undefined, response?: SMTPServerAuthenticationResponse) => void): void {
+    if (auth.method === 'PLAIN' && auth.username === 'username' && auth.password === 'password') {
+        callback(undefined, { user: auth.username });
+    } else {
+        callback(new Error('Invalid username or password'));
+    }
+}
 
+function onMailFrom(from: SMTPServerAddress, session: SMTPServerSession, callback: (err?: Error) => void): void {
+    console.log(`[${session.id}] onMailFrom ${from.address}`);
+    if (from.address.split('@')[1] === 'spammer.com') {
+        // code 421 disconnects SMTP session immediately
+        callback(Object.assign(new Error('we do not like spam!'), { responseCode: 421 }));
+    } else {
+        callback();
+    }
+}
+
+function onRcptTo(to: SMTPServerAddress, session: SMTPServerSession, callback: (err?: Error) => void): void {
+    console.log(`[${session.id}] onRcptTo ${to.address}`);
+    callback();
+}
+
+function onData(stream: Readable, session: SMTPServerSession, callback: (err?: Error) => void): void {
+    console.log(`[${session.id}] onData started`);
+
+    let messageLength = 0;
+
+    stream.on('data', (chunk: Buffer) => {
+        console.log(`[${session.id}] onData got data chunk ${chunk.length} bytes`);
+        messageLength += chunk.length;
+    });
+
+    stream.once('end', () => {
+        console.log(`[${session.id}] onData finished after reading ${messageLength} bytes`);
+        callback();
+    });
+}
+
+function onClose(session: SMTPServerSession) {
+    console.log(`[${session.id}] onClose`);
+}
+
+const server = new SMTPServer(options);
+
+server.on('error', (err) => {
+    console.log(`Server got error:`, err);
+});
+
+server.on('close', () => {
+    console.log('Server closed');
+});
+
+server.listen(options.port, () => {
+    const address = server.server.address();
+    console.log(`Listening on [${address.address}]:${address.port}`);
+});
diff --git a/types/smtp-server/tsconfig.json b/types/smtp-server/tsconfig.json
index e5087d15b9..1301c38576 100644
--- a/types/smtp-server/tsconfig.json
+++ b/types/smtp-server/tsconfig.json
@@ -6,8 +6,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/smtp-server/tslint.json b/types/smtp-server/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/smtp-server/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/smtp-server/v1/index.d.ts b/types/smtp-server/v1/index.d.ts
new file mode 100644
index 0000000000..15befe8d7c
--- /dev/null
+++ b/types/smtp-server/v1/index.d.ts
@@ -0,0 +1,386 @@
+// Type definitions for smtp-server v1.15.0
+// Project: https://github.com/andris9/smtp-server
+// Definitions by: markisme <https://github.com/markisme>
+//                 taisiias <https://github.com/Taisiias>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+
+/// <reference types="node"/>
+import { EventEmitter } from 'events';
+
+export class SMTPServer extends EventEmitter {
+    constructor(options: SMTPServerOptions);
+    close(callback: (err?: Error) => any): any;
+    listen(...args: any[]): void;
+    onAuth(auth: Authentication, session: Session, callback: any): any;
+    onClose(callback: (err?: Error) => any): any;
+    onConnect(session: Session, callback: (err?: Error) => any): any;
+    onData(stream: any, session: Session, callback: (err?: Error) => any): any;
+    onMailFrom(address: Address, session: Session, callback: (err?: Error) => any): any;
+    onRcptTo(address: Address, session: Session, callback: (err?: Error) => any): any;
+}
+
+export interface SMTPServerOptions {
+    /**
+     * if true, the connection will use TLS. The default is false. 
+     * If the server doesn't start in TLS mode, 
+     * it is still possible to upgrade clear text socket to 
+     * TLS socket with the STARTTLS command (unless you disable support for it). 
+     * If secure is true, additional tls options for tls.
+     * createServer can be added directly onto this options object.
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    secure?: boolean;
+    key?: any;
+    cert?: any;
+    ca?: any;
+    /**
+     * optional hostname of the server,
+     *  used for identifying to the client (defaults to os.hostname())
+     * 
+     * @type {string}
+     * @memberOf SMTPServerOptions
+     */
+    name?: string;
+    /**
+     * optional greeting message.
+     *  This message is appended to the default ESMTP response.
+     * 
+     * @type {string}
+     * @memberOf SMTPServerOptions
+     */
+    banner?: string;
+    /**
+     * optional maximum allowed message size in bytes, 
+     * see details:https://github.com/andris9/smtp-server#using-size-extension
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    size?: number;
+    /**
+     * optional array of allowed authentication methods, defaults to ['PLAIN', 'LOGIN']. 
+     * Only the methods listed in this array are allowed, 
+     * so if you set it to ['XOAUTH2'] then PLAIN and LOGIN are not available. 
+     * Use ['PLAIN', 'LOGIN', 'XOAUTH2'] to allow all three. 
+     * Authentication is only allowed in secure mode 
+     * (either the server is started with secure: true option or STARTTLS command is used)
+     * 
+     * @type {string[]}
+     * @memberOf SMTPServerOptions
+     */
+    authMethods?: string[];
+    /**
+     * allow authentication, but do not require it
+     * 
+     * @type {*}
+     * @memberOf SMTPServerOptions
+     */
+    authOptional?: any;
+    /**
+     * optional array of disabled commands (see all supported commands here). 
+     * For example if you want to disable authentication, 
+     * use ['AUTH'] as this value. 
+     * If you want to allow authentication in clear text, set it to ['STARTTLS'].
+     * 
+     * @type {*}
+     * @memberOf SMTPServerOptions
+     */
+    disabledCommands?: string[];
+    /**
+     * optional boolean, if set to true then allow using STARTTLS 
+     * but do not advertise or require it. It only makes sense 
+     * when creating integration test servers for testing the scenario 
+     * where you want to try STARTTLS even when it is not advertised
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hideSTARTTLS?: boolean;
+    /**
+     * optional boolean, if set to true then does not show PIPELINING in feature list
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hidePIPELINING?: boolean;
+    /**
+     * optional boolean, if set to true then does not show 8BITMIME in features list
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hide8BITMIME?: boolean;
+    /**
+     * optional boolean, if set to true then does not show SMTPUTF8 in features list
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hideSMTPUTF8?: boolean;
+    /**
+     * optional boolean, if set to true allows authentication even if connection is not secured first
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    allowInsecureAuth?: boolean;
+    /**
+     * optional boolean, if set to true then does not try to reverse resolve client hostname
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    disableReverseLookup?: boolean;
+    /**
+     * optional Map or an object of TLS options for SNI where servername is the key. Overrided by SNICallback.
+     * 
+     * @type {Object}
+     * @memberOf SMTPServerOptions
+     */
+    sniOptions?: Object;
+    /**
+     * optional bunyan compatible logger instance. 
+     * If set to true then logs to console. 
+     * If value is not set or is false then nothing is logged
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    logger?: boolean;
+    /**
+     * sets the maximum number of concurrently connected clients, defaults to Infinity
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    maxClients?: number;//defaults to Infinity
+    /**
+     * boolean, if set to true expects to be behind a proxy that emits a 
+     * PROXY header{http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt} (version 1 only)
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    useProxy?: boolean;
+    /**
+     * boolean, if set to true, enables usage of 
+     * XCLIENT{http://www.postfix.org/XCLIENT_README.html} extension to override connection properties. 
+     * See session.xClient (Map object) for the details provided by the client
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    useXClient?: boolean;
+    /**
+     * boolean, if set to true, enables usage of XFORWARD{http://www.postfix.org/XFORWARD_README.html} extension. 
+     * See session.xForward (Map object) for the details provided by the client
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    useXForward?: boolean;
+    /**
+     * boolean, if set to true use LMTP protocol instead of SMTP
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    lmtp?: boolean;
+    /**
+     * How many milliseconds of inactivity to allow before disconnecting the client (defaults to 1 minute)
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    socketTimeout?: number;//millisceonds
+    /**
+     * How many millisceonds to wait before disconnecting pending 
+     * connections once server.close() has been called (defaults to 30 seconds)
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    closeTimeout?: number;//millisceonds
+    /**
+     * The callback to handle authentications (see details https://github.com/andris9/smtp-server#handling-authentication)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onAuth?: (auth: Authentication, session: Session, callback: (err?: Error, response?: AuthenticationResponse) => any) => any;
+    /**
+     * The callback to handle the client connection. (see details https://github.com/andris9/smtp-server#validating-client-connection)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onConnect?: (session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * the callback to validate MAIL FROM commands (see details https://github.com/andris9/smtp-server#validating-sender-addresses)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onMailFrom?: (address: Address, session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * The callback to validate RCPT TO commands (see details https://github.com/andris9/smtp-server#validating-recipient-addresses)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onRcptTo?: (address: Address, session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * the callback to handle incoming messages (see details https://github.com/andris9/smtp-server#processing-incoming-message)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onData?: (stream: any, session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * the callback that informs about closed client connection
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onClose?: (session: Session) => any;
+}
+
+export interface Authentication {
+    /**
+     * indicates the authentication method used, 'PLAIN', 'LOGIN' or 'XOAUTH2'
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    method: "PLAIN" | "LOGIN" | "XOAUTH2";//'PLAIN', 'LOGIN' or 'XOAUTH2'
+    /**
+     * the username of the user
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    username?: string;
+    /**
+     * the password if LOGIN or PLAIN was used
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    password?: string;
+    /**
+     *  the OAuth2 bearer access token if 'XOAUTH2' was used as the authentication method
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    accessToken?: string;
+    /**
+     * a function for validating CRAM-MD5 challenge responses. 
+     * Takes the password of the user as an argument and returns true if the response matches the password
+     * 
+     * 
+     * @memberOf Authentication
+     */
+    validatePassword: (password: string) => boolean;
+}
+
+export interface AuthenticationResponse {
+    /**
+     * can be any value - if this is set then the user is considered logged in 
+     * and this value is used later with the session data to identify the user. 
+     * If this value is empty, then the authentication is considered failed
+     * 
+     * @type {*}
+     * @memberOf AuthenticationResponse
+     */
+    user: any;
+    /**
+     * an object to return if XOAUTH2 authentication failed (do not set the error object in this case). 
+     * This value is serialized to JSON and base64 encoded automatically, so you can just return the object
+     * 
+     * @type {{}}
+     * @memberOf AuthenticationResponse
+     */
+    data?: {};
+}
+
+export interface Session {
+    /**
+     * random string identificator generated when the client connected
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    id: string;
+    /**
+     * the IP address for the connected client
+     * 
+     * @type {Address}
+     * @memberOf Session
+     */
+    remoteAddress: Address;
+    /**
+     * reverse resolved hostname for remoteAddress
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    clientHostname: string;
+    /**
+     * the opening SMTP command (HELO/EHLO/LHLO)
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    openingCommand: string;
+    /**
+     * hostname the client provided with HELO/EHLO call
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    hostNameApearsAs: string;
+    /**
+     * Envelope Object
+     * 
+     * @type {Envelope}
+     * @memberOf Session
+     */
+    envelope: Envelope;
+}
+
+export interface Envelope {
+    /**
+     * includes an address object or is set to false
+     * 
+     * @type {Address}
+     * @memberOf Envelope
+     */
+    mailFrom: Address;
+    /**
+     * includes an array of address objects
+     * 
+     * @type {Address[]}
+     * @memberOf Envelope
+     */
+    rcptTo: Address[];
+}
+
+export interface Address {
+    /**
+     * the address provided with the MAIL FROM or RCPT TO command
+     * 
+     * @type {string}
+     * @memberOf Address
+     */
+    address: string;
+    /**
+     * an object with additional arguments (all key names are uppercase)
+     * 
+     * @type {Object}
+     * @memberOf Address
+     */
+    args: Object;
+}
diff --git a/types/smtp-server/v1/smtp-server-tests.ts b/types/smtp-server/v1/smtp-server-tests.ts
new file mode 100644
index 0000000000..368d2f8585
--- /dev/null
+++ b/types/smtp-server/v1/smtp-server-tests.ts
@@ -0,0 +1,15 @@
+import { SMTPServer, SMTPServerOptions } from 'smtp-server';
+
+function SMTPServerConnectTest() {
+    let options: SMTPServerOptions = {
+        secure: false,
+    };
+    let server = new SMTPServer(options);
+    server.on('error', err => {
+        console.log('Error %s', err.message);
+    });
+    server.listen(2323);
+}
+
+SMTPServerConnectTest();
+
diff --git a/types/smtp-server/v1/tsconfig.json b/types/smtp-server/v1/tsconfig.json
new file mode 100644
index 0000000000..b038c6c6f8
--- /dev/null
+++ b/types/smtp-server/v1/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "smtp-server": [
+                "smtp-server/v1"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "smtp-server-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/smtp-server/v1/tslint.json b/types/smtp-server/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/smtp-server/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/smtpapi/tslint.json b/types/smtpapi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/smtpapi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/snapsvg/tslint.json b/types/snapsvg/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/snapsvg/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/snazzy-info-window/index.d.ts b/types/snazzy-info-window/index.d.ts
index e4f644ece0..82b6ca6efe 100644
--- a/types/snazzy-info-window/index.d.ts
+++ b/types/snazzy-info-window/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/atmist/snazzy-info-window
 // Definitions by: Milos Danilov <https://github.com/milosd92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="googlemaps" />
 
@@ -304,7 +305,6 @@ declare class SnazzyInfoWindow extends google.maps.OverlayView {
      * Set the position of the info window.
      * A valid Google Map instance must be associated to the info window.
      * This could be either through the marker or map option.
-     * @param latLng
      */
     setPosition(latLng: google.maps.LatLng | google.maps.LatLngLiteral): void;
 
diff --git a/types/snoowrap/index.d.ts b/types/snoowrap/index.d.ts
index 05dfc821fd..e80814d6f9 100644
--- a/types/snoowrap/index.d.ts
+++ b/types/snoowrap/index.d.ts
@@ -62,7 +62,7 @@ declare class Snoowrap {
   getFriends(): Promise<_RedditUser[]>;
   getGoldSubreddits(options?: ListingOptions): _Listing<_Subreddit>;
   getHot(subredditName?: string, options?: ListingOptions): _Listing<_Submission>;
-  getInbox(options?: { filter?: string }): _Listing<_PrivateMessage | Comment>;
+  getInbox(options?: { filter?: string }): _Listing<_PrivateMessage | _Comment>;
   getKarma(): Promise<Array<{ sr: _Subreddit; comment_karma: number; link_karma: number; }>>;
   getLivethread(threadId: string): _LiveThread;
   getMe(): _RedditUser;
@@ -73,7 +73,7 @@ declare class Snoowrap {
   getMyTrophies(): Promise<Snoowrap.Trophy[]>;
   getNew(subredditName?: string, options?: ListingOptions): _Listing<_Submission>;
   getNewCaptchaIdentifier(): Promise<string>;
-  getNewComments(subredditName?: string, options?: ListingOptions): _Listing<Comment>;
+  getNewComments(subredditName?: string, options?: ListingOptions): _Listing<_Comment>;
   getNewSubreddits(options?: ListingOptions): _Listing<_Subreddit>;
   getOauthScopeList(): Promise<{ [key: string]: { description: string; id: string; name: string } }>;
   getPopularSubreddit(options?: ListingOptions): _Listing<_Subreddit>;
diff --git a/types/snoowrap/snoowrap-tests.ts b/types/snoowrap/snoowrap-tests.ts
index 7c0588372c..dfea881a8b 100644
--- a/types/snoowrap/snoowrap-tests.ts
+++ b/types/snoowrap/snoowrap-tests.ts
@@ -1,6 +1,7 @@
 import * as Snoowrap from 'snoowrap';
 import {
   Comment,
+  Listing,
   LiveThread,
   MultiReddit,
   PrivateMessage,
@@ -45,3 +46,7 @@ export function subreddit(name: string): Subreddit {
 export function wiki(subreddit: string, page: string): WikiPage {
   return r.getSubreddit(subreddit).getWikiPage(page);
 }
+
+export function getNewComments(subreddit: string): Listing<Comment> {
+  return r.getNewComments(subreddit);
+}
diff --git a/types/soap/index.d.ts b/types/soap/index.d.ts
deleted file mode 100644
index 762b803d12..0000000000
--- a/types/soap/index.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// Type definitions for soap 0.18
-// Project: https://www.npmjs.com/package/soap
-// Definitions by: Leo Liang <https://github.com/aleung>, Cage Fox <https://github.com/cagefox>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-import * as events from 'events';
-
-interface Security {
-}
-
-export interface SoapMethod {
-    (args: any, callback: (err: any, result: any) => void, options?: any, extraHeaders?: any): void;
-}
-
-export class BasicAuthSecurity implements Security {
-    constructor(username: string, password: string);
-}
-
-export class BearerSecurity implements Security {
-    constructor(token: string);
-}
-
-export class WSSecurity implements Security {
-    constructor(username: string, password: string, options?: any);
-}
-
-export class ClientSSLSecurity implements Security {
-    constructor(key: Buffer | string, cert: Buffer | string, ca: Buffer | string, defaults?: any);
-    constructor(key: Buffer | string, cert: Buffer | string, defaults?: any);
-}
-
-export interface Client extends events.EventEmitter {
-    addBodyAttribute(bodyAttribute: any, name?: string, namespace?: string, xmlns?: string): void;
-    addHttpHeader(name: string, value: any): void;
-    addSoapHeader(soapHeader: any, name?: string, namespace?: string, xmlns?: string): number;
-    changeSoapHeader(index: number, soapHeader: any, name?: string, namespace?: string, xmlns?: string): void;
-    clearBodyAttributes(): void;
-    clearHttpHeaders(): void;
-    clearSoapHeaders(): void;
-    describe(): any;
-    getBodyAttributes(): any[];
-    getHttpHeaders(): any[];
-    getSoapHeaders(): any[];
-    setEndpoint(endpoint: string): void;
-    setSOAPAction(action: string): void;
-    setSecurity(s: Security): void;
-    [method: string]: SoapMethod | Function;
-}
-
-export interface Server extends events.EventEmitter {
-    addSoapHeader(soapHeader: any, name: any, namespace: any, xmlns: any): any;
-    changeSoapHeader(index: any, soapHeader: any, name: any, namespace: any, xmlns: any): any;
-    getSoapHeaders(): any;
-    clearSoapHeaders(): any;
-    log(type: any, data: any): any;
-}
-export function listen(server: any, path: string, service: any, wsdl: string): Server;
-declare function createClient(wsdlPath: string, options: Option, fn: (err: any, client: Client) => void): void;
-
-export interface Option {
-    attributesKey?: string;
-    disableCache?: boolean;
-    endpoint?: string;
-    envelopeKey?: string;
-    escapeXML?: boolean;
-    forceSoap12Headers?: boolean;
-    httpClient?: HttpClient;
-    ignoreBaseNameSpaces?: boolean,
-    ignoredNamespaces?: string[] | { namespaces: string[], override: boolean };
-    overrideRootElement?: { namespace: string, xmlnsAttributes?: string[] };
-    request?: (options: any, callback?: (error: any, res: any, body: any) => void) => void;
-    stream?: boolean;
-    valueKey?: string;
-    wsdl_headers?: { [key: string]: any };
-    wsdl_options?: { [key: string]: any };
-    xmlKey?: string;
-}
-
-export class HttpClient {
-    constructor(options?: Option);
-    buildRequest(rurl: string, data: any | string, exheaders?: { [key: string]: any }, exoptions?: { [key: string]: any }): any;
-    handleResponse(req: any, res: any, body: any | string): any | string;
-    request(rurl: string, data: any | string, callback: (err: any, res: any, body: any | string) => void, exheaders?: { [key: string]: any }, exoptions?: { [key: string]: any }): any;
-    requestStream(rurl: string, data: any | string, exheaders?: { [key: string]: any }, exoptions?: { [key: string]: any }): any;
-}
diff --git a/types/soap/soap-tests.ts b/types/soap/soap-tests.ts
deleted file mode 100644
index 72a1d1a85d..0000000000
--- a/types/soap/soap-tests.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import * as soap from 'soap';
-import * as events from 'events';
-import * as fs from 'fs';
-import * as http from 'http';
-
-const url = 'http://example.com/wsdl?wsdl';
-// wsdlOptions set only default values
-const wsdlOptions = <soap.Option>{
-    attributesKey: 'attributes',
-    disableCache: false,
-    endpoint: url,
-    envelopeKey: 'soap',
-    escapeXML: true,
-    forceSoap12Headers: false,
-    httpClient: new soap.HttpClient(),
-    ignoreBaseNameSpaces: false,
-    ignoredNamespaces: ['tns', 'targetNamespace', 'typedNamespace'],
-    request: require('request'),
-    stream: false,
-    wsdl_headers: [],
-    wsdl_options: [],
-    valueKey: '$value',
-    xmlKey: '$xml'
-};
-
-soap.createClient(url, wsdlOptions, (err: any, client: soap.Client) => {
-    let securityOptions = { hasTimeStamp: false };
-    client.setSecurity(new soap.WSSecurity('user', 'password', securityOptions));
-    client.setSecurity(new soap.BasicAuthSecurity('user', 'password'));
-    client.setSecurity(new soap.BearerSecurity('token'));
-    client.setSecurity(new soap.WSSecurity('user', 'password', securityOptions));
-    let defaults = { rejectUnauthorized: false };
-    client.setSecurity(new soap.ClientSSLSecurity('/path/to/key', '/path/to/cert', '/path/to/ca', defaults));
-    client.setSecurity(new soap.ClientSSLSecurity('/path/to/key', '/path/to/cert', defaults));
-    client.setSecurity(new soap.ClientSSLSecurity('/path/to/key', '/path/to/cert', '/path/to/ca'));
-    client.setEndpoint('http://localhost');
-    client.describe();
-    client.addBodyAttribute({});
-    client.addHttpHeader('test', true);
-    client.addSoapHeader({});
-    client.changeSoapHeader(0, {});
-    client.clearBodyAttributes();
-    client.clearHttpHeaders();
-    client.clearSoapHeaders();
-    client.getBodyAttributes();
-    client.getHttpHeaders();
-    client.getSoapHeaders();
-    client.setSOAPAction('action');
-    (client['create'] as soap.SoapMethod)({ name: 'value' }, (err: any, result: any) => {
-        // result is an object
-    });
-    (client['create'] as soap.SoapMethod)({ name: 'value' }, (err: any, result: any) => {
-        // result is an object
-    }, {});
-    client.on('request', (obj: any) => {
-        //obj is an object
-    });
-});
-
-var myService = {
-    MyService: {
-        MyPort: {
-            MyFunction: (args: any) => {
-                return {
-                    name: args.name
-                };
-            },
-
-            // This is how to define an asynchronous function.
-            MyAsyncFunction: (args: any, callback: any) => {
-                // do some work
-                callback({
-                    name: args.name
-                });
-            },
-
-            // This is how to receive incoming headers
-            HeadersAwareFunction: (args: any, cb: any, headers: any) => {
-                return {
-                    name: headers.Token
-                };
-            },
-
-            // You can also inspect the original `req`
-            reallyDeatailedFunction: (args: any, cb: any, headers: any, req: any) => {
-                console.log('SOAP `reallyDeatailedFunction` request from ' + req.connection.remoteAddress);
-                return {
-                    name: headers.Token
-                };
-            }
-        }
-    }
-};
-
-var xml = fs.readFileSync('myservice.wsdl', 'utf8'),
-    server = http.createServer((request, response) => {
-        response.end('404: Not Found: ' + request.url);
-    });
-
-server.listen(8000);
-soap.listen(server, '/wsdl', myService, xml);
diff --git a/types/soap/tsconfig.json b/types/soap/tsconfig.json
deleted file mode 100644
index 5f207207ac..0000000000
--- a/types/soap/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "soap-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/socket.io-client/index.d.ts b/types/socket.io-client/index.d.ts
index f4f14c41c6..75f313a3a6 100644
--- a/types/socket.io-client/index.d.ts
+++ b/types/socket.io-client/index.d.ts
@@ -617,9 +617,9 @@ declare namespace SocketIOClient {
 		onlyBinaryUpgrades?: boolean;
 
 		/**
-		 * Header options for Node.js client
+		 * Transport options for Node.js client (headers etc)
 		 */
-		extraHeaders?: Object;
+		transportOptions?: Object;
 
 		/**
 		 * (SSL) Certificate, Private key and CA certificates to use for SSL.
diff --git a/types/socket.io-client/tslint.json b/types/socket.io-client/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/socket.io-client/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/socket.io-parser/index.d.ts b/types/socket.io-parser/index.d.ts
index 5f1a7a104e..66ca1be4c5 100644
--- a/types/socket.io-parser/index.d.ts
+++ b/types/socket.io-parser/index.d.ts
@@ -1,39 +1,33 @@
-// Type definitions for json-editor
+// Type definitions for socket.io-parser 2.2
 // Project: https://github.com/socketio/socket.io-parser
-// Definitions by: York Yao <https://github.com/plantain-00/>
+// Definitions by: York Yao <https://github.com/plantain-00>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="node" />
+/// <reference types="node" />
 
-declare module "socket.io-parser" {
-    namespace Parser {
-        type Packet = {
-            type: number,
-            data: any,
-            id: number
-        }
-        type EncodedPacket = string | Buffer | ArrayBuffer | Blob;
+export interface Packet {
+    type: number;
+    data: any;
+    id: number;
+}
+export type EncodedPacket = string | Buffer | ArrayBuffer | Blob;
 
-        var types: string[];
+export const types: string[];
 
-        var CONNECT: number;
-        var DISCONNECT: number;
-        var EVENT: number;
-        var ACK: number;
-        var ERROR: number;
-        var BINARY_EVENT: number;
-        var BINARY_ACK: number;
+export const CONNECT: number;
+export const DISCONNECT: number;
+export const EVENT: number;
+export const ACK: number;
+export const ERROR: number;
+export const BINARY_EVENT: number;
+export const BINARY_ACK: number;
 
-        class Encoder {
-            encode(packet: Packet, callback: (encodedPackets: EncodedPacket[]) => void): void;
-        }
+export class Encoder {
+    encode(packet: Packet, callback: (encodedPackets: EncodedPacket[]) => void): void;
+}
 
-        class Decoder {
-            on(event: string, callback: (decodedPacket: Packet) => void): void;
-            add(encodedPacket: EncodedPacket): void;
-            destroy(): void;
-        }
-    }
-
-    export = Parser;
+export class Decoder {
+    on(event: string, callback: (decodedPacket: Packet) => void): void;
+    add(encodedPacket: EncodedPacket): void;
+    destroy(): void;
 }
diff --git a/types/socket.io-parser/socket.io-parser-tests.ts b/types/socket.io-parser/socket.io-parser-tests.ts
index 07646f48ce..b30a32aff0 100644
--- a/types/socket.io-parser/socket.io-parser-tests.ts
+++ b/types/socket.io-parser/socket.io-parser-tests.ts
@@ -1,38 +1,38 @@
 import * as parser from 'socket.io-parser';
-var encoder = new parser.Encoder();
-var packet = {
+const encoder = new parser.Encoder();
+const packet = {
     type: parser.EVENT,
     data: 'test-packet',
-    id: 13
+    id: 13,
 };
-encoder.encode(packet, function (encodedPackets) {
-    var decoder = new parser.Decoder();
-    decoder.on('decoded', function (decodedPacket) {
-        decodedPacket.type == parser.EVENT
-        decodedPacket.data == 'test-packet'
-        decodedPacket.id == 13
+encoder.encode(packet, encodedPackets => {
+    const decoder = new parser.Decoder();
+    decoder.on('decoded', decodedPacket => {
+        decodedPacket.type === parser.EVENT;
+        decodedPacket.data === 'test-packet';
+        decodedPacket.id === 13;
     });
 
-    for (var i = 0; i < encodedPackets.length; i++) {
-        decoder.add(encodedPackets[i]);
+    for (const encoded of encodedPackets) {
+        decoder.add(encoded);
     }
 });
 
-var packet2 = {
+const packet2 = {
     type: parser.BINARY_EVENT,
     data: { i: new Buffer(1234), j: new Blob([new ArrayBuffer(2)]) },
-    id: 15
+    id: 15,
 };
-encoder.encode(packet2, function (encodedPackets) {
-    var decoder = new parser.Decoder();
-    decoder.on('decoded', function (decodedPacket) {
-        decodedPacket.type == parser.BINARY_EVENT
-        Buffer.isBuffer(decodedPacket.data.i) == true
-        Buffer.isBuffer(decodedPacket.data.j) == true
-        decodedPacket.id == 15
+encoder.encode(packet2, encodedPackets => {
+    const decoder = new parser.Decoder();
+    decoder.on('decoded', decodedPacket => {
+        decodedPacket.type === parser.BINARY_EVENT;
+        Buffer.isBuffer(decodedPacket.data.i); // $ExpectType boolean
+        Buffer.isBuffer(decodedPacket.data.j); // $ExpectType boolean
+        decodedPacket.id === 15;
     });
 
-    for (var i = 0; i < encodedPackets.length; i++) {
-        decoder.add(encodedPackets[i]);
+    for (const encoded of encodedPackets) {
+        decoder.add(encoded);
     }
 });
diff --git a/types/socket.io-parser/tslint.json b/types/socket.io-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/socket.io-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/socket.io-redis/index.d.ts b/types/socket.io-redis/index.d.ts
index a4ce38a265..d6e5edf92b 100644
--- a/types/socket.io-redis/index.d.ts
+++ b/types/socket.io-redis/index.d.ts
@@ -116,5 +116,71 @@ declare namespace SocketIORedis {
 			(id: string): void;
 			(id: string, callback?: (err?: any) => void): void;
 		};
+
+		/**
+		 * clients returns the list of client IDs connected to rooms across all nodes.
+		 * @param {string[]} rooms
+		 * @param {(err?: any, clients: string[]) => void} callback
+		 */
+		clients(rooms: string[], callback: (err: any, clients: string[]) => void) : void;
+
+		/**
+		 * clients returns the list of client IDs connected to rooms across all nodes.
+		 * @param {(err?: any, clients: string[]) => void} callback
+		 */
+		clients(callback: (err: any, clients: string[]) => void) : void;
+
+		/**
+		 * clientRooms returns the list of rooms the client with the given ID has joined 
+		 * (even on another node).
+		 * @param {string} id 
+		 * @param {(err: any, rooms: string[]) => void} callback 
+		 */
+		clientRooms(id: string, callback: (err: any, rooms: string[]) => void) : void;
+
+		/**
+		 * allRooms returns the list of all rooms.
+		 * @param {(err: any, rooms: string[]) => void} callback 
+		 */
+		allRooms(callback: (err: any, rooms: string[]) => void) : void;
+
+		/**
+		 * remoteJoin rakes the socket with the given id join the room.
+		 * The callback will be called once the socket has joined the room, or with an
+		 * err argument if the socket was not found.
+		 * @param {string} id the socket Id.
+		 * @param {string} room the room Id.
+		 * @param {(err: any) => void} callback 
+		 */
+		remoteJoin(id: string, room: string, callback: (err: any) => void) : void;
+
+		/**
+		 * remoteLeave makes the socket with the given id leave the room.
+		 * The callback will be called once the socket has left the room, or with an
+		 * err argument if the socket was not found.
+		 * @param {string} id the socket Id.
+		 * @param {string} room the room Id.
+		 * @param {(err: any) => void} callback 
+		 */
+		remoteLeave(id: string, room: string, callback: (err: any) => void) : void;
+
+		/**
+		 * remoteDisconnect makes the socket with the given id to get disconnected. 
+		 * If close is set to true, it also closes the underlying socket. 
+		 * The callback will be called once the socket was disconnected, or with an 
+		 * err argument if the socket was not found.
+		 * @param {string} id the socket Id.
+		 * @param {boolean} close close the underlying socket
+		 * @param {(err: any) => void} callback 
+		 */
+		remoteDisconnect(id: string, close: boolean, callback: (err: any) => void) : void;
+
+		/**
+		 * customRequest sends a request to every nodes, that will respond through the 
+		 * customHook method.
+		 * @param {any} data
+		 * @param {(err: any, replies: any[]) => void} callback 
+		 */
+		customRequest(data: any, callback: (err: any, replies: any[]) => void) : void;
 	}
 }
diff --git a/types/socket.io-redis/tslint.json b/types/socket.io-redis/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/socket.io-redis/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/socket.io.users/index.d.ts b/types/socket.io.users/index.d.ts
index e7c346f7f4..053d80450c 100644
--- a/types/socket.io.users/index.d.ts
+++ b/types/socket.io.users/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nodets/socket.io.users
 // Definitions by: Makis Maropoulos <https://github.com/kataras>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/socket.io.users/tslint.json b/types/socket.io.users/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/socket.io.users/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/socket.io/tslint.json b/types/socket.io/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/socket.io/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/socketty/tslint.json b/types/socketty/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/socketty/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sockjs-client/index.d.ts b/types/sockjs-client/index.d.ts
index 96d783aa98..aed69a2a02 100644
--- a/types/sockjs-client/index.d.ts
+++ b/types/sockjs-client/index.d.ts
@@ -1,17 +1,18 @@
-// Type definitions for sockjs-client 1.0
+// Type definitions for sockjs-client 1.1
 // Project: https://github.com/sockjs/sockjs-client
 // Definitions by: Emil Ivanov <https://github.com/vladev>
 //                 Alexander Rusakov <https://github.com/arusakov>
 //                 BendingBender <https://github.com/BendingBender>
+//                 Soner Köksal <https://github.com/renjfk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = SockJS;
 export as namespace SockJS;
 
 declare const SockJS: {
-    new (url: string, _reserved?: any, options?: SockJS.Options): SockJS.Socket;
-    (url: string, _reserved?: any, options?: SockJS.Options): SockJS.Socket;
-    prototype: SockJS.Socket;
+    new (url: string, _reserved?: any, options?: SockJS.Options): WebSocket;
+    (url: string, _reserved?: any, options?: SockJS.Options): WebSocket;
+    prototype: WebSocket;
     CONNECTING: SockJS.CONNECTING;
     OPEN: SockJS.OPEN;
     CLOSING: SockJS.CLOSING;
@@ -49,15 +50,4 @@ declare namespace SockJS {
         sessionId?: number | SessionGenerator;
         transports?: string | string[];
     }
-
-    interface Socket extends EventTarget {
-        readyState: State;
-        protocol: string;
-        url: string;
-        onopen(e: OpenEvent): any;
-        onclose(e: CloseEvent): any;
-        onmessage(e: MessageEvent): any;
-        send(data: any): void;
-        close(code?: number, reason?: string): void;
-    }
 }
diff --git a/types/sockjs-client/sockjs-client-tests.ts b/types/sockjs-client/sockjs-client-tests.ts
index c7c4ae1daa..591cd98603 100644
--- a/types/sockjs-client/sockjs-client-tests.ts
+++ b/types/sockjs-client/sockjs-client-tests.ts
@@ -43,5 +43,4 @@ sockJs.close(100, 'reason');
 sockJs.close(200);
 sockJs.close();
 
-type MySocket = SockJS.Socket;
 type MessageEvent = SockJS.MessageEvent;
diff --git a/types/solution-center-communicator/tslint.json b/types/solution-center-communicator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/solution-center-communicator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sort-array/index.d.ts b/types/sort-array/index.d.ts
new file mode 100644
index 0000000000..a94ff269ff
--- /dev/null
+++ b/types/sort-array/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for sort-array 2.0
+// Project: https://github.com/75lb/sort-array#readme
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+type ColumnNames<T> = keyof T | Array<keyof T>;
+type CustomOrderTypes<T> = Array<T[keyof T]>;
+type CustomOrder<T> = Record<keyof T, CustomOrderTypes<T>>;
+
+declare function sortArray<T>(recordset: T[], columnNames: ColumnNames<T>, customOrder?: Partial<CustomOrder<T>>): T[];
+declare function sortArray(recordset: object[], columnNames: string | string[], customOrder?: Record<string, any[]>): object[];
+
+export = sortArray;
diff --git a/types/sort-array/sort-array-tests.ts b/types/sort-array/sort-array-tests.ts
new file mode 100644
index 0000000000..cc33e5600d
--- /dev/null
+++ b/types/sort-array/sort-array-tests.ts
@@ -0,0 +1,37 @@
+import sort = require('sort-array');
+
+interface AlphabetItem {
+    letter: string;
+    position: number;
+}
+
+const alphabet: AlphabetItem[] = [
+    { letter: 'b', position: 2 },
+    { letter: 'a', position: 1 },
+    { letter: 'c', position: 3 }
+];
+
+// $ExpectType AlphabetItem[]
+sort(alphabet, 'letter');
+sort(alphabet, ['letter']);
+sort(alphabet, 'letter');
+
+sort<AlphabetItem>(alphabet, 'letter', { letter: ['c', 'a'] });
+
+// Allow to use string and number, because we cannot get type of the current property
+sort<AlphabetItem>(alphabet, 'letter', { letter: ['c', 'a', 1] });
+
+interface Input {
+    inner: { number: number };
+}
+
+const input: Input[] = [
+    { inner: { number: 5 } },
+    { inner: { number: 3 } }
+];
+
+// Allow to use without types
+
+// $ExpectType object[]
+sort(input, 'inner.number');
+sort(input, 'inner.number', { 'inner.number': [5, 3] });
diff --git a/types/sort-array/tsconfig.json b/types/sort-array/tsconfig.json
new file mode 100644
index 0000000000..935747c5e6
--- /dev/null
+++ b/types/sort-array/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sort-array-tests.ts"
+    ]
+}
diff --git a/types/sort-array/tslint.json b/types/sort-array/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sort-array/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sortablejs/tslint.json b/types/sortablejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sortablejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/soundjs/tslint.json b/types/soundjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/soundjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/soundmanager2/index.d.ts b/types/soundmanager2/index.d.ts
index d211e4c359..5f5e9a1ffb 100644
--- a/types/soundmanager2/index.d.ts
+++ b/types/soundmanager2/index.d.ts
@@ -60,7 +60,6 @@ declare namespace soundmanager {
          * soundmanager2_flash9.swf and debug versions etc.) Note that SM2 will
          * append the correct SWF file name, depending on flashVersion and
          * debugMode settings.
-         * @type {string}
          */
         url?: string;
 
@@ -110,8 +109,6 @@ declare namespace soundmanager {
         clearOnPosition(id: string, msecOffset: number, callback?: (() => void)): SMSound;
         /**
          * Creates a sound object, supporting an arbitrary number of optional arguments. Returns a SMSound object instance. At minimum, a url parameter is required.
-         * @param  {SoundProperties} properties [description]
-         * @return {SMSound}                    [description]
          */
         createSound(properties: SoundProperties): SMSound;
         destroySound(id: string): void;
@@ -135,7 +132,7 @@ declare namespace soundmanager {
         setVolume(id: string, volume: number): SMSound;
         /**
          * Sets the volume of all sound objects. Accepted values: 0-100. Affects volume property.
-         * @param {number} volume [Volume of all sound objects. Accepted values: 0 - 100]
+         * @param volume Volume of all sound objects. Accepted values: 0 - 100
          */
         setVolume(volume: number): void;
         stop(id: string): SMSound;
diff --git a/types/source-list-map/tslint.json b/types/source-list-map/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/source-list-map/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/source-map/index.d.ts b/types/source-map/index.d.ts
deleted file mode 100644
index 0bf31eb438..0000000000
--- a/types/source-map/index.d.ts
+++ /dev/null
@@ -1,332 +0,0 @@
-// Type definitions for source-map 0.5
-// Project: https://github.com/mozilla/source-map
-// Definitions by: Morten Houston Ludvigsen <https://github.com/MortenHoustonLudvigsen>,
-//                 Ron Buckton <https://github.com/rbuckton>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export as namespace sourceMap;
-
-export interface StartOfSourceMap {
-    file?: string;
-    sourceRoot?: string;
-    skipValidation?: boolean;
-}
-
-export interface RawSourceMap {
-    version: number;
-    sources: string[];
-    names: string[];
-    sourceRoot?: string;
-    sourcesContent?: string[];
-    mappings: string;
-    file: string;
-}
-
-export interface RawIndexMap extends StartOfSourceMap {
-    version: number;
-    sections: RawSection[];
-}
-
-export interface RawSection {
-    offset: Position;
-    map: RawSourceMap;
-}
-
-export interface Position {
-    line: number;
-    column: number;
-}
-
-export interface NullablePosition {
-    line: number | null;
-    column: number | null;
-    lastColumn: number | null;
-}
-
-export interface MappedPosition {
-    source: string;
-    line: number;
-    column: number;
-    name?: string;
-}
-
-export interface NullableMappedPosition {
-    source: string | null;
-    line: number | null;
-    column: number | null;
-    name: string | null;
-}
-
-export interface MappingItem {
-    source: string;
-    generatedLine: number;
-    generatedColumn: number;
-    originalLine: number;
-    originalColumn: number;
-    name: string;
-}
-
-export interface Mapping {
-    generated: Position;
-    original: Position;
-    source: string;
-    name?: string;
-}
-
-export interface CodeWithSourceMap {
-    code: string;
-    map: SourceMapGenerator;
-}
-
-export interface SourceMapConsumer {
-    /**
-     * Compute the last column for each generated mapping. The last column is
-     * inclusive.
-     */
-    computeColumnSpans(): void;
-
-    /**
-     * Returns the original source, line, and column information for the generated
-     * source's line and column positions provided. The only argument is an object
-     * with the following properties:
-     *
-     *   - line: The line number in the generated source.
-     *   - column: The column number in the generated source.
-     *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
-     *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
-     *     closest element that is smaller than or greater than the one we are
-     *     searching for, respectively, if the exact element cannot be found.
-     *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
-     *
-     * and an object is returned with the following properties:
-     *
-     *   - source: The original source file, or null.
-     *   - line: The line number in the original source, or null.
-     *   - column: The column number in the original source, or null.
-     *   - name: The original identifier, or null.
-     */
-    originalPositionFor(generatedPosition: Position & { bias?: number }): NullableMappedPosition;
-
-    /**
-     * Returns the generated line and column information for the original source,
-     * line, and column positions provided. The only argument is an object with
-     * the following properties:
-     *
-     *   - source: The filename of the original source.
-     *   - line: The line number in the original source.
-     *   - column: The column number in the original source.
-     *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
-     *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
-     *     closest element that is smaller than or greater than the one we are
-     *     searching for, respectively, if the exact element cannot be found.
-     *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
-     *
-     * and an object is returned with the following properties:
-     *
-     *   - line: The line number in the generated source, or null.
-     *   - column: The column number in the generated source, or null.
-     */
-    generatedPositionFor(originalPosition: MappedPosition & { bias?: number }): NullablePosition;
-
-    /**
-     * Returns all generated line and column information for the original source,
-     * line, and column provided. If no column is provided, returns all mappings
-     * corresponding to a either the line we are searching for or the next
-     * closest line that has any mappings. Otherwise, returns all mappings
-     * corresponding to the given line and either the column we are searching for
-     * or the next closest column that has any offsets.
-     *
-     * The only argument is an object with the following properties:
-     *
-     *   - source: The filename of the original source.
-     *   - line: The line number in the original source.
-     *   - column: Optional. the column number in the original source.
-     *
-     * and an array of objects is returned, each with the following properties:
-     *
-     *   - line: The line number in the generated source, or null.
-     *   - column: The column number in the generated source, or null.
-     */
-    allGeneratedPositionsFor(originalPosition: MappedPosition): NullablePosition[];
-
-    /**
-     * Return true if we have the source content for every source in the source
-     * map, false otherwise.
-     */
-    hasContentsOfAllSources(): boolean;
-
-    /**
-     * Returns the original source content. The only argument is the url of the
-     * original source file. Returns null if no original source content is
-     * available.
-     */
-    sourceContentFor(source: string, returnNullOnMissing?: boolean): string | null;
-
-    /**
-     * Iterate over each mapping between an original source/line/column and a
-     * generated line/column in this source map.
-     *
-     * @param callback
-     *        The function that is called with each mapping.
-     * @param context
-     *        Optional. If specified, this object will be the value of `this` every
-     *        time that `aCallback` is called.
-     * @param order
-     *        Either `SourceMapConsumer.GENERATED_ORDER` or
-     *        `SourceMapConsumer.ORIGINAL_ORDER`. Specifies whether you want to
-     *        iterate over the mappings sorted by the generated file's line/column
-     *        order or the original's source/line/column order, respectively. Defaults to
-     *        `SourceMapConsumer.GENERATED_ORDER`.
-     */
-    eachMapping(callback: (mapping: MappingItem) => void, context?: any, order?: number): void;
-}
-
-export interface SourceMapConsumerConstructor {
-    prototype: SourceMapConsumer;
-
-    GENERATED_ORDER: number;
-    ORIGINAL_ORDER: number;
-    GREATEST_LOWER_BOUND: number;
-    LEAST_UPPER_BOUND: number;
-
-    new (rawSourceMap: RawSourceMap): BasicSourceMapConsumer;
-    new (rawSourceMap: RawIndexMap): IndexedSourceMapConsumer;
-    new (rawSourceMap: RawSourceMap | RawIndexMap | string): BasicSourceMapConsumer | IndexedSourceMapConsumer;
-
-    /**
-     * Create a BasicSourceMapConsumer from a SourceMapGenerator.
-     *
-     * @param sourceMap
-     *        The source map that will be consumed.
-     */
-    fromSourceMap(sourceMap: SourceMapGenerator): BasicSourceMapConsumer;
-}
-
-export const SourceMapConsumer: SourceMapConsumerConstructor;
-
-export interface BasicSourceMapConsumer extends SourceMapConsumer {
-    file: string;
-    sourceRoot: string;
-    sources: string[];
-    sourcesContent: string[];
-}
-
-export interface BasicSourceMapConsumerConstructor {
-    prototype: BasicSourceMapConsumer;
-
-    new (rawSourceMap: RawSourceMap | string): BasicSourceMapConsumer;
-
-    /**
-     * Create a BasicSourceMapConsumer from a SourceMapGenerator.
-     *
-     * @param sourceMap
-     *        The source map that will be consumed.
-     */
-    fromSourceMap(sourceMap: SourceMapGenerator): BasicSourceMapConsumer;
-}
-
-export const BasicSourceMapConsumer: BasicSourceMapConsumerConstructor;
-
-export interface IndexedSourceMapConsumer extends SourceMapConsumer {
-    sources: string[];
-}
-
-export interface IndexedSourceMapConsumerConstructor {
-    prototype: IndexedSourceMapConsumer;
-
-    new (rawSourceMap: RawIndexMap | string): IndexedSourceMapConsumer;
-}
-
-export const IndexedSourceMapConsumer: IndexedSourceMapConsumerConstructor;
-
-export class SourceMapGenerator {
-    constructor(startOfSourceMap?: StartOfSourceMap);
-
-    /**
-     * Creates a new SourceMapGenerator based on a SourceMapConsumer
-     *
-     * @param sourceMapConsumer The SourceMap.
-     */
-    static fromSourceMap(sourceMapConsumer: SourceMapConsumer): SourceMapGenerator;
-
-    /**
-     * Add a single mapping from original source line and column to the generated
-     * source's line and column for this source map being created. The mapping
-     * object should have the following properties:
-     *
-     *   - generated: An object with the generated line and column positions.
-     *   - original: An object with the original line and column positions.
-     *   - source: The original source file (relative to the sourceRoot).
-     *   - name: An optional original token name for this mapping.
-     */
-    addMapping(mapping: Mapping): void;
-
-    /**
-     * Set the source content for a source file.
-     */
-    setSourceContent(sourceFile: string, sourceContent: string): void;
-
-    /**
-     * Applies the mappings of a sub-source-map for a specific source file to the
-     * source map being generated. Each mapping to the supplied source file is
-     * rewritten using the supplied source map. Note: The resolution for the
-     * resulting mappings is the minimium of this map and the supplied map.
-     *
-     * @param sourceMapConsumer The source map to be applied.
-     * @param sourceFile Optional. The filename of the source file.
-     *        If omitted, SourceMapConsumer's file property will be used.
-     * @param sourceMapPath Optional. The dirname of the path to the source map
-     *        to be applied. If relative, it is relative to the SourceMapConsumer.
-     *        This parameter is needed when the two source maps aren't in the same
-     *        directory, and the source map to be applied contains relative source
-     *        paths. If so, those relative source paths need to be rewritten
-     *        relative to the SourceMapGenerator.
-     */
-    applySourceMap(sourceMapConsumer: SourceMapConsumer, sourceFile?: string, sourceMapPath?: string): void;
-
-    toString(): string;
-
-    toJSON(): RawSourceMap;
-}
-
-export class SourceNode {
-    children: SourceNode[];
-    sourceContents: any;
-    line: number;
-    column: number;
-    source: string;
-    name: string;
-
-    constructor();
-    constructor(
-        line: number,
-        column: number,
-        source: string,
-        chunks?: Array<(string | SourceNode)> | SourceNode | string,
-        name?: string
-    );
-
-    static fromStringWithSourceMap(
-        code: string,
-        sourceMapConsumer: SourceMapConsumer,
-        relativePath?: string
-    ): SourceNode;
-
-    add(chunk: Array<(string | SourceNode)> | SourceNode | string): SourceNode;
-
-    prepend(chunk: Array<(string | SourceNode)> | SourceNode | string): SourceNode;
-
-    setSourceContent(sourceFile: string, sourceContent: string): void;
-
-    walk(fn: (chunk: string, mapping: MappedPosition) => void): void;
-
-    walkSourceContents(fn: (file: string, content: string) => void): void;
-
-    join(sep: string): SourceNode;
-
-    replaceRight(pattern: string, replacement: string): SourceNode;
-
-    toString(): string;
-
-    toStringWithSourceMap(startOfSourceMap?: StartOfSourceMap): CodeWithSourceMap;
-}
diff --git a/types/source-map/source-map-tests.ts b/types/source-map/source-map-tests.ts
deleted file mode 100644
index f87194395b..0000000000
--- a/types/source-map/source-map-tests.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import SourceMap = require('source-map');
-
-function testSourceMapConsumer() {
-    function testConstructor() {
-        let scm: SourceMap.SourceMapConsumer;
-
-        // create with full RawSourceMap
-        scm = new SourceMap.SourceMapConsumer({
-            version: 3,
-            sources: ['foo', 'bar'],
-            names: ['foo', 'bar'],
-            sourcesContent: ['foo'],
-            mappings: 'foo',
-            file: 'sdf'
-        });
-
-        scm = new SourceMap.SourceMapConsumer(JSON.stringify({
-            version: 3,
-            sources: ['foo', 'bar'],
-            names: ['foo', 'bar'],
-            sourcesContent: ['foo'],
-            mappings: 'foo',
-            file: 'sdf'
-        }));
-
-        // create with partial RawSourceMap
-        scm = new SourceMap.SourceMapConsumer({
-            version: 3,
-            sources: ['foo', 'bar'],
-            names: ['foo', 'bar'],
-            mappings: 'foo',
-            file: 'sdf'
-        });
-
-        // create from index map
-        const iscm: SourceMap.IndexedSourceMapConsumer = new SourceMap.SourceMapConsumer({
-            version: 3,
-            sections: [
-                { offset: { line: 0, column: 0 }, map: {
-                    version: 3,
-                    sources: ['foo', 'bar'],
-                    names: ['foo', 'bar'],
-                    mappings: 'foo',
-                    file: 'foo'
-                } }
-            ]
-        });
-
-        let scg: SourceMap.SourceMapGenerator;
-        const bscm: SourceMap.BasicSourceMapConsumer = SourceMap.SourceMapConsumer.fromSourceMap(scg);
-    }
-
-    function testOriginalPositionFor(scm: SourceMap.SourceMapConsumer) {
-        let origPos: SourceMap.MappedPosition;
-        origPos = scm.originalPositionFor({ line: 42, column: 42 });
-        origPos = scm.originalPositionFor({ line: 42, column: 42, bias: SourceMap.SourceMapConsumer.LEAST_UPPER_BOUND });
-    }
-
-    function testAllGeneratedPositionsFor(scm: SourceMap.SourceMapConsumer) {
-        let origPos: SourceMap.MappedPosition;
-        let origPoses: SourceMap.Position[];
-        origPoses = scm.allGeneratedPositionsFor(origPos);
-    }
-
-    function testGeneratedPositionFor(scm: SourceMap.SourceMapConsumer) {
-        let genPos: SourceMap.Position;
-        genPos = scm.generatedPositionFor({ line: 42, column: 42, source: 'foo' });
-        genPos = scm.generatedPositionFor({ line: 42, column: 42, source: 'foo', name: 'bar' });
-        genPos = scm.generatedPositionFor({ line: 42, column: 42, source: 'foo', name: 'bar', bias: SourceMap.SourceMapConsumer.LEAST_UPPER_BOUND });
-    }
-
-    function testSourceContentFor(scm: SourceMap.SourceMapConsumer) {
-        let content: string;
-        content = scm.sourceContentFor('foo');
-    }
-
-    function testEachMapping(scm: SourceMap.SourceMapConsumer) {
-        let x: SourceMap.MappingItem;
-        let context: {};
-
-        scm.eachMapping(mapping => { x = mapping; });
-        scm.eachMapping(mapping => { x = mapping; }, context);
-        scm.eachMapping(mapping => { x = mapping; }, context, SourceMap.SourceMapConsumer.GENERATED_ORDER);
-        scm.eachMapping(mapping => { x = mapping; }, context, SourceMap.SourceMapConsumer.ORIGINAL_ORDER);
-    }
-}
-
-function testSourceMapGenerator() {
-    function testConstructor() {
-        let generator: SourceMap.SourceMapGenerator;
-
-        generator = new SourceMap.SourceMapGenerator();
-        generator = new SourceMap.SourceMapGenerator({
-            file: 'foo'
-        });
-        generator = new SourceMap.SourceMapGenerator({
-            sourceRoot: 'foo'
-        });
-        generator = new SourceMap.SourceMapGenerator({
-            file: 'foo',
-            sourceRoot: 'bar'
-        });
-    }
-
-    function testFromSourceMap(generator: SourceMap.SourceMapGenerator, scm: SourceMap.SourceMapConsumer) {
-        generator = SourceMap.SourceMapGenerator.fromSourceMap(scm);
-    }
-
-    function testAddMapping(generator: SourceMap.SourceMapGenerator) {
-        generator.addMapping({
-            generated: { line: 42, column: 42 },
-            original: { line: 42, column: 42 },
-            source: 'foo',
-            name: 'foo'
-        });
-
-        generator.addMapping({
-            generated: { line: 42, column: 42 },
-            original: { line: 42, column: 42 },
-            source: 'foo'
-        });
-    }
-
-    function testSetSourceContent(generator: SourceMap.SourceMapGenerator) {
-        generator.setSourceContent('foo', 'bar');
-    }
-
-    function testApplySourceMap(generator: SourceMap.SourceMapGenerator, scm: SourceMap.SourceMapConsumer) {
-        generator.applySourceMap(scm);
-        generator.applySourceMap(scm, 'foo');
-        generator.applySourceMap(scm, 'foo', 'bar');
-    }
-
-    function testToString(generator: SourceMap.SourceMapGenerator) {
-        let str: string;
-        str = generator.toString();
-    }
-}
-
-function testSourceNode() {
-    function testConstructor() {
-        let node: SourceMap.SourceNode;
-
-        node = new SourceMap.SourceNode();
-        node = new SourceMap.SourceNode(42, 42, 'foo');
-        node = new SourceMap.SourceNode(42, 42, 'foo', 'bar');
-        node = new SourceMap.SourceNode(42, 42, 'foo', 'bar', 'slam');
-        node = new SourceMap.SourceNode(42, 42, 'foo', ['bar', 'slam']);
-    }
-
-    function testFromStringWithSourceMap(scm: SourceMap.SourceMapConsumer) {
-        let node: SourceMap.SourceNode;
-
-        node = SourceMap.SourceNode.fromStringWithSourceMap('foo', scm);
-        node = SourceMap.SourceNode.fromStringWithSourceMap('foo', scm, 'bar');
-    }
-
-    function testAdd(node: SourceMap.SourceNode) {
-        node.add('foo');
-        node.add(new SourceMap.SourceNode());
-        node.add([new SourceMap.SourceNode(), 'bar']);
-    }
-
-    function testPrepend(node: SourceMap.SourceNode) {
-        node.prepend('foo');
-        node.prepend(new SourceMap.SourceNode());
-        node.prepend([new SourceMap.SourceNode(), 'bar']);
-    }
-
-    function testSetSourceContent(node: SourceMap.SourceNode) {
-        node.setSourceContent('foo', 'bar');
-    }
-
-    function testWalk(node: SourceMap.SourceNode) {
-        let chunk: string;
-        let mapping: SourceMap.MappedPosition;
-
-        node.walk((c, m) => { chunk = c; mapping = m; });
-    }
-
-    function testWalkSourceContents(node: SourceMap.SourceNode) {
-        let file: string;
-        let content: string;
-
-        node.walkSourceContents((f, c) => { file = f; content = c; });
-    }
-
-    function testJoin(node: SourceMap.SourceNode) {
-        node = node.join('foo');
-    }
-
-    function testReplaceRight(node: SourceMap.SourceNode) {
-        node = node.replaceRight('foo', 'bar');
-    }
-
-    function testToString(node: SourceMap.SourceNode) {
-        let str: string;
-        str = node.toString();
-    }
-
-    function testToStringWithSourceMap(node: SourceMap.SourceNode, sos: SourceMap.StartOfSourceMap) {
-        let result: SourceMap.CodeWithSourceMap;
-        result = node.toStringWithSourceMap();
-        result = node.toStringWithSourceMap(sos);
-    }
-}
diff --git a/types/source-map/tsconfig.json b/types/source-map/tsconfig.json
deleted file mode 100644
index f625e560df..0000000000
--- a/types/source-map/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "source-map-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/source-map/tslint.json b/types/source-map/tslint.json
deleted file mode 100644
index 7210289f52..0000000000
--- a/types/source-map/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODO
-		"prefer-const": false
-	}
-}
\ No newline at end of file
diff --git a/types/space-pen/tslint.json b/types/space-pen/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/space-pen/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sparkpost/index.d.ts b/types/sparkpost/index.d.ts
index 24ac0efbcc..b6914240b2 100644
--- a/types/sparkpost/index.d.ts
+++ b/types/sparkpost/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/SparkPost/node-sparkpost
 // Definitions by: Joshua DeVinney <https://github.com/geoffreak>, Bond <https://github.com/bondz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 
@@ -95,26 +96,20 @@ declare class SparkPost {
          * Retrieve details about a specified recipient list by specifying its id in the URI path.
          * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
          *
-         * @param {string} id
-         * @param {{ show_recipients?: boolean }} specifies whether to retrieve the recipients. Defaults to false
-         * @param {SparkPost.Callback<SparkPost.RecipientListWithRecipients>} callback
+         * @param specifies whether to retrieve the recipients. Defaults to false
          */
         get(id: string, options: { show_recipients?: boolean }, callback: SparkPost.Callback<SparkPost.RecipientListWithRecipients>): void;
         /**
          * Retrieve details about a specified recipient list by specifying its id in the URI path.
          * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
          *
-         * @param {string} id
-         * @param {SparkPost.Callback<SparkPost.RecipientListWithRecipients>} callback
          */
         get(id: string, callback: SparkPost.Callback<SparkPost.RecipientListWithRecipients>): void;
         /**
          * Retrieve details about a specified recipient list by specifying its id in the URI path.
          * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
          *
-         * @param {string} id
-         * @param {{ show_recipients?: boolean }} [options] specifies whether to retrieve the recipients. Defaults to false
-         * @returns {Promise<SparkPost.RecipientListWithRecipients>}
+         * @param [options] specifies whether to retrieve the recipients. Defaults to false
          */
         get(id: string, options?: { show_recipients?: boolean }): SparkPost.ResultsPromise<SparkPost.RecipientListWithRecipients>;
         /**
@@ -139,7 +134,7 @@ declare class SparkPost {
          * Update an existing recipient list by specifying its ID in the URI path and use a recipient list object as the PUT request body.
          * Use the num_rcpt_errors parameter to limit the number of recipient errors returned.
          *
-         * @param {string} id Identifier of the recipient list
+         * @param id Identifier of the recipient list
          * @param options The update options
          * @param callback The request callback with metadata results
          */
@@ -148,9 +143,7 @@ declare class SparkPost {
          * Update an existing recipient list by specifying its ID in the URI path and use a recipient list object as the PUT request body.
          * Use the num_rcpt_errors parameter to limit the number of recipient errors returned.
          *
-         * @param {string} id Identifier of the recipient list
-         * @param {SparkPost.UpdateRecipientList} options
-         * @returns {SparkPost.ResultsPromise<SparkPost.RecipientListMetadata>}
+         * @param id Identifier of the recipient list
          */
         update(id: string, options: SparkPost.UpdateRecipientList): SparkPost.ResultsPromise<SparkPost.RecipientListMetadata>;
         /**
@@ -373,49 +366,48 @@ declare class SparkPost {
         /**
          * List all entries in your suppression list, filtered by an optional set of search parameters.
          *
-         * @param {SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>} callback The request callback with supression lists.
+         * @param callback The request callback with supression lists.
          */
         list(callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
         /**
          * List all entries in your suppression list, filtered by an optional set of search parameters.
          *
-         * @param {SparkPost.SupressionSearchParameters} parameters an object of [search parameters]{@link https://developers.sparkpost.com/api/suppression-list#suppression-list-search-get}
-         * @param {SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>} callback The request callback with supression lists.
+         * @param parameters an object of [search parameters]{@link https://developers.sparkpost.com/api/suppression-list#suppression-list-search-get}
+         * @param callback The request callback with supression lists.
          */
         list(parameters: SparkPost.SupressionSearchParameters, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
         /**
          * List all entries in your suppression list, filtered by an optional set of search parameters.
          *
-         * @param {SparkPost.SupressionSearchParameters} [parameters] an object of [search parameters]{@link https://developers.sparkpost.com/api/suppression-list#suppression-list-search-get}
-         * @returns {Promise<SparkPost.SupressionListEntry[]>} Promise The supression lists
+         * @param [parameters] an object of [search parameters]{@link https://developers.sparkpost.com/api/suppression-list#suppression-list-search-get}
+         * @returns Promise The supression lists
          */
         list(parameters?: SparkPost.SupressionSearchParameters): SparkPost.ResultsPromise<SparkPost.SupressionListEntry[]>;
         /**
          * Retrieve an entry by recipient email.
          *
-         * @param {string} email address to check
+         * @param email address to check
          * @returns void
          */
         get(email: string, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
         /**
          * Retrieve an entry by recipient email.
          *
-         * @param {string} email address to check
+         * @param email address to check
          * @returns void
          */
         get(email: string): SparkPost.ResultsPromise<SparkPost.SupressionListEntry[]>;
         /**
          * Delete a recipient from the list by specifying the recipient’s email address in the URI path.
          *
-         * @param {string} email Recipient email address
-         * @param callback
+         * @param email Recipient email address
          */
         delete(email: string, callback: SparkPost.Callback<void>): void;
         /**
          * Delete a recipient from the list by specifying the recipient’s email address in the URI path.
          *
-         * @param {string} email Recipient email address
-         * @returns {Promise<void>} void
+         * @param email Recipient email address
+         * @returns void
          */
         delete(email: string): Promise<void>;
         /**
@@ -428,8 +420,7 @@ declare class SparkPost {
         /**
          * Insert or update one or many entries.
          *
-         * @param {(SparkPost.CreateSupressionListEntry | SparkPost.CreateSupressionListEntry[])} listEntries The suppression entry list
-         * @returns {Promise<{ message: string }>}
+         * @param listEntries The suppression entry list
          */
         upsert(listEntries: SparkPost.CreateSupressionListEntry | SparkPost.CreateSupressionListEntry[]): SparkPost.ResultsPromise<{ message: string }>;
     };
@@ -442,7 +433,7 @@ declare class SparkPost {
         /**
          * List a summary of all templates.
          *
-         * @returns {SparkPost.ResultsPromise<SparkPost.TemplateMeta[]>} The TemplateMeta results array
+         * @returns The TemplateMeta results array
          */
         list(): SparkPost.ResultsPromise<SparkPost.TemplateMeta[]>;
         /**
@@ -456,16 +447,16 @@ declare class SparkPost {
         /**
          * Retrieve details about a specified template by its id
          *
-         * @param {string} id the id of the template you want to look up
-         * @param {SparkPost.ResultsCallback<SparkPost.Template>} callback The request callback with Template results
+         * @param id the id of the template you want to look up
+         * @param callback The request callback with Template results
          */
         get(id: string, callback: SparkPost.ResultsCallback<SparkPost.Template>): void;
         /**
          * Retrieve details about a specified template by its id
          *
-         * @param {string} id the id of the template you want to look up
-         * @param {{ draft?: boolean }} [options] specifies a draft or published template
-         * @returns {SparkPost.ResultsPromise<SparkPost.Template>} The Template results
+         * @param id the id of the template you want to look up
+         * @param [options] specifies a draft or published template
+         * @returns The Template results
          */
         get(id: string, options?: { draft?: boolean }): SparkPost.ResultsPromise<SparkPost.Template>;
         /**
@@ -478,14 +469,14 @@ declare class SparkPost {
         /**
          * Create a new template
          *
-         * @param {SparkPost.CreateTemplate} template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
-         * @returns {SparkPost.ResultsPromise<{ id: string }>} The template id results
+         * @param template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
+         * @returns The template id results
          */
         create(template: SparkPost.CreateTemplate): SparkPost.ResultsPromise<{ id: string }>;
         /**
          * Update an existing template
          *
-         * @param {string} id the id of the template you want to update
+         * @param id the id of the template you want to update
          * @param template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
          * @param options The create options. If true, directly overwrite the existing published template. If false, create a new draft
          * @param callback The request callback with template id results
@@ -498,9 +489,9 @@ declare class SparkPost {
         /**
          * Update an existing template
          *
-         * @param {string} id the id of the template you want to update
-         * @param {SparkPost.UpdateTemplate} template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
-         * @param {SparkPost.ResultsCallback<{ id: string }>} callback The request callback with template id results
+         * @param id the id of the template you want to update
+         * @param template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
+         * @param callback The request callback with template id results
          */
         update(
             id: string,
@@ -509,12 +500,10 @@ declare class SparkPost {
         /**
          * Update an existing template
          *
-         * @param {string} id the id of the template you want to update
-         * @param {SparkPost.UpdateTemplate} template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
-         * @param {{
-         *             update_published?: boolean;
-         *         }} [options] If true, directly overwrite the existing published template. If false, create a new draft
-         * @returns {SparkPost.ResultsPromise<{ id: string }>} The template id results
+         * @param id the id of the template you want to update
+         * @param template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
+         * @param options If true, directly overwrite the existing published template. If false, create a new draft
+         * @returns The template id results
          */
         update(id: string, template: SparkPost.UpdateTemplate, options?: {
             update_published?: boolean;
@@ -535,7 +524,7 @@ declare class SparkPost {
         /**
          * Preview the most recent version of an existing template by id
          *
-         * @param {string} id the id of the template you want to look up
+         * @param id the id of the template you want to look up
          * @param options The preview options
          * @param callback The request callback with webhook id results
          */
@@ -543,16 +532,15 @@ declare class SparkPost {
         /**
          * Preview the most recent version of an existing template by id
          *
-         * @param {string} id the id of the template you want to look up
-         * @param {SparkPost.ResultsCallback<SparkPost.TemplateContent>} callback The request callback with webhook id results
+         * @param id the id of the template you want to look up
+         * @param callback The request callback with webhook id results
          */
         preview(id: string, callback: SparkPost.ResultsCallback<SparkPost.TemplateContent>): void;
         /**
          * Preview the most recent version of an existing template by id
          *
-         * @param {string} id the id of the template you want to look up
-         * @param {{ substitution_data: any, draft?: boolean }} [options]
-         * @returns {SparkPost.ResultsPromise<SparkPost.TemplateContent>} The webhook id results
+         * @param id the id of the template you want to look up
+         * @returns The webhook id results
          */
         preview(id: string, options?: { substitution_data?: any, draft?: boolean }): SparkPost.ResultsPromise<SparkPost.TemplateContent>;
     };
@@ -566,15 +554,13 @@ declare class SparkPost {
         /**
          * List an overview of all transmissions in the account
          *
-         * @param {{ campaign_id?: string, template_id: string }} options
-         * @param {SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>} callback The request callback with Transmission results array
+         * @param callback The request callback with Transmission results array
          */
         list(options: { campaign_id?: string, template_id?: string }, callback: SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>): void;
         /**
          * List an overview of all transmissions in the account
          *
-         * @param {{ campaign_id?: string, template_id: string }} [options]
-         * @returns {SparkPost.ResultsPromise<SparkPost.TransmissionSummary[]>} The Transmission results array
+         * @returns The Transmission results array
          */
         list(options?: { campaign_id?: string, template_id?: string }): SparkPost.ResultsPromise<SparkPost.TransmissionSummary[]>;
         /**
@@ -587,8 +573,8 @@ declare class SparkPost {
         /**
          * Retrieve the details about a transmission by its ID
          *
-         * @param {string} id The id of the transmission you want to look up
-         * @returns {SparkPost.ResultsPromise<SparkPost.Transmission>} The Transmission results
+         * @param id The id of the transmission you want to look up
+         * @returns The Transmission results
          */
         get(id: string): SparkPost.ResultsPromise<SparkPost.Transmission>;
         /**
@@ -606,12 +592,8 @@ declare class SparkPost {
         /**
          *
          *
-         * @param {SparkPost.CreateTransmission} transmission an object of [transmission attributes]{@link https://developers.sparkpost.com/api/transmissions#header-transmission-attributes}
-         * @param {SparkPost.ResultsCallback<{
-         *             total_rejected_recipients: number;
-         *             total_accepted_recipients: number;
-         *             id: string;
-         *         }>} callback The request callback with metadata and id results
+         * @param transmission an object of [transmission attributes]{@link https://developers.sparkpost.com/api/transmissions#header-transmission-attributes}
+         * @param callback The request callback with metadata and id results
          */
         send(transmission: SparkPost.CreateTransmission, callback: SparkPost.ResultsCallback<{
             total_rejected_recipients: number;
@@ -621,13 +603,9 @@ declare class SparkPost {
         /**
          * Sends a message by creating a new transmission
          *
-         * @param {SparkPost.CreateTransmission} transmission an object of [transmission attributes]{@link https://developers.sparkpost.com/api/transmissions#header-transmission-attributes}
-         * @param {{ num_rcpt_errors?: number }} [options] specify maximum number of recipient errors returned
-         * @returns {SparkPost.ResultsPromise<{
-         *             total_rejected_recipients: number;
-         *             total_accepted_recipients: number;
-         *             id: string;
-         *         }>} The metadata and id results
+         * @param transmission an object of [transmission attributes]{@link https://developers.sparkpost.com/api/transmissions#header-transmission-attributes}
+         * @param [options] specify maximum number of recipient errors returned
+         * @returns The metadata and id results
          */
         send(transmission: SparkPost.CreateTransmission, options?: { num_rcpt_errors?: number }): SparkPost.ResultsPromise<{
             total_rejected_recipients: number;
@@ -650,14 +628,12 @@ declare class SparkPost {
         /**
          * List currently existing webhooks.the timezone to use for the last_successful and last_failure properties | Default: UTC
          *
-         * @param {{ timezone?: string }} [options]
-         * @returns {(SparkPost.ResultsPromise<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>)}
          */
         list(options?: { timezone?: string }): SparkPost.ResultsPromise<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>;
         /**
          * Retrieve details about a specified webhook by its id
          *
-         * @param {string} id The id of the webhook to get
+         * @param id The id of the webhook to get
          * @param options Object containing id and optional timezone
          * @param callback The request callback with RelayWebhook results
          */
@@ -665,16 +641,16 @@ declare class SparkPost {
         /**
          * Retrieve details about a specified webhook by its id
          *
-         * @param {string} id The id of the webhook to get
-         * @param {(SparkPost.ResultsCallback<SparkPost.WebhookLinks & SparkPost.Webhook>)} callback The request callback with RelayWebhook results
+         * @param id The id of the webhook to get
+         * @param callback The request callback with RelayWebhook results
          */
         get(id: string, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & SparkPost.Webhook>): void;
         /**
          * Retrieve details about a specified webhook by its id
          *
-         * @param {string} id The id of the webhook to get
-         * @param {{ timezone?: string }} [options] the timezone to use for the last_successful and last_failure properties
-         * @returns {(SparkPost.ResultsPromise<SparkPost.WebhookLinks & SparkPost.Webhook>)} The RelayWebhook results
+         * @param id The id of the webhook to get
+         * @param [options] the timezone to use for the last_successful and last_failure properties
+         * @returns The RelayWebhook results
          */
         get(id: string, options?: { timezone?: string }): SparkPost.ResultsPromise<SparkPost.WebhookLinks & SparkPost.Webhook>;
         /**
@@ -687,13 +663,13 @@ declare class SparkPost {
         /**
          * Create a new webhook
          *
-         * @param {SparkPost.Webhook} options a hash of [webhook attributes]{@link https://developers.sparkpost.com/api/webhooks#header-webhooks-object-properties}
-         * @returns {(SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>)} The webhook id results
+         * @param options a hash of [webhook attributes]{@link https://developers.sparkpost.com/api/webhooks#header-webhooks-object-properties}
+         * @returns The webhook id results
          */
         create(options: SparkPost.Webhook): SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>;
         /**
          * Update an existing webhook
-         * @param {string} id the id of the webhook to update
+         * @param id the id of the webhook to update
          * @param options A hash of [webhook attribues]{@link https://developers.sparkpost.com/api/webhooks#header-webhooks-object-properties}
          * @param callback The request callback with webhook id results
          */
@@ -701,9 +677,6 @@ declare class SparkPost {
         /**
          * Update an existing webhook
          *
-         * @param {string} id
-         * @param {SparkPost.UpdateWebhook} options
-         * @returns {(SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>)}
          */
         update(id: string, options: SparkPost.UpdateWebhook): SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>;
         /**
@@ -715,14 +688,13 @@ declare class SparkPost {
         /**
          * Delete an existing webhook.
          *
-         * @param {string} id The id of the webhook to delete
-         * @returns {Promise<void>}
+         * @param id The id of the webhook to delete
          */
         delete(id: string): Promise<void>;
         /**
          * Sends an example message event batch from the Webhook API to the target URL
          *
-         * @param {string} id The id of the webhook to validate
+         * @param id The id of the webhook to validate
          * @param options the message (payload) to send to the webhook consumer
          * @param callback The request callback with validation results
          */
@@ -737,16 +709,9 @@ declare class SparkPost {
         /**
          * Sends an example message event batch from the Webhook API to the target URL.
          *
-         * @param {string} id The id of the webhook to validate
-         * @param {{ message: any }} options The message (payload) to send to the webhook consumer
-         * @returns {SparkPost.ResultsPromise<{
-         *             msg: string;
-         *             response: {
-         *                 status: number;
-         *                 headers: any;
-         *                 body: string;
-         *             }
-         *         }>} The validation results
+         * @param id The id of the webhook to validate
+         * @param options The message (payload) to send to the webhook consumer
+         * @returns The validation results
          */
         validate(id: string, options: { message: any }): SparkPost.ResultsPromise<{
             msg: string;
@@ -759,7 +724,7 @@ declare class SparkPost {
         /**
          * Gets recent status information about a webhook.
          *
-         * @param {string} id The id of the webhook
+         * @param id The id of the webhook
          * @param options  An optional limit that specifies the maximum number of results to return. Defaults to 1000
          * @param callback The request callback with status results
          */
@@ -772,13 +737,8 @@ declare class SparkPost {
         /**
          * Gets recent status information about a webhook.
          *
-         * @param {string} id The id of the webhook
-         * @param {SparkPost.ResultsCallback<{
-         *             batch_id: string;
-         *             ts: string;
-         *             attempts: number;
-         *             response_code: number;
-         *         }[]>} callback The request callback with status results
+         * @param id The id of the webhook
+         * @param callback The request callback with status results
          */
         getBatchStatus(id: string, callback: SparkPost.ResultsCallback<Array<{
             batch_id: string;
@@ -789,14 +749,9 @@ declare class SparkPost {
         /**
          * Gets recent status information about a webhook.
          *
-         * @param {string} id The id of the webhook
-         * @param {{ limit?: number }} Maximum number of results to return. Defaults to 1000
-         * @returns {SparkPost.ResultsPromise<{
-         *             batch_id: string;
-         *             ts: string;
-         *             attempts: number;
-         *             response_code: number;
-         *         }[]>} The status results
+         * @param id The id of the webhook
+         * @param Maximum number of results to return. Defaults to 1000
+         * @returns The status results
          */
         getBatchStatus(id: string, options: { limit?: number }): SparkPost.ResultsPromise<Array<{
             batch_id: string;
@@ -812,7 +767,7 @@ declare class SparkPost {
         /**
          * Lists descriptions of the events, event types, and event fields that could be included in a Webhooks post to your target URL.
          *
-         * @returns {SparkPost.ResultsPromise<any>} The documentation results
+         * @returns The documentation results
          */
         getDocumentation(): SparkPost.ResultsPromise<any>;
         /**
@@ -829,9 +784,8 @@ declare class SparkPost {
         /**
          * List an example of the event data that will be posted by a Webhook for the specified events.
          *
-         * @param {{ events?: string }} options [event types]{@link https://support.sparkpost.com/customer/portal/articles/1976204} for which to get a sample payload
+         * @param options [event types]{@link https://support.sparkpost.com/customer/portal/articles/1976204} for which to get a sample payload
          * Default: all event types returned
-         * @returns {Promise<SparkPost.Response<any>>}
          */
         getSamples(options?: { events?: string }): Promise<SparkPost.Response<any>>;
     };
@@ -1046,16 +1000,12 @@ declare namespace SparkPost {
          * Address information for a recipient. At a minimum, address or multichannel_addresses is required.
          * If both address and multichannel_addresses are specified only multichannel_addresses will be used.
          *
-         * @type {(Address | string)}
-         * @memberOf RecipientWithMultichannelAddresses
          */
         address?: Address | string;
         /**
          * Array of Multichannel Address objects for a recipient. At a minimum, address or multichannel_addresses is required.
          * If both address and multichannel_addresses are specified only multichannel_addresses will be used.
          *
-         * @type {MultichannelAddress[]}
-         * @memberOf RecipientWithMultichannelAddresses
          */
         multichannel_addresses: MultichannelAddress[];
     }
@@ -1195,44 +1145,32 @@ declare namespace SparkPost {
         /**
          * Request verification of DKIM record
          *
-         * @type {boolean}
-         * @memberOf VerifyOptions
          */
         dkim_verify?: boolean;
         /**
          * Request verification of SPF record
          *
-         * @type {boolean}
          * @deprecated
-         * @memberOf VerifyOptions
          */
         spf_verify?: boolean;
         /**
          * Request an email with a verification link to be sent to the sending domain’s postmaster@ mailbox.
          *
-         * @type {boolean}
-         * @memberOf VerifyOptions
          */
         postmaster_at_verify?: boolean;
         /**
          * Request an email with a verification link to be sent to the sending domain’s abuse@ mailbox.
          *
-         * @type {boolean}
-         * @memberOf VerifyOptions
          */
         abuse_at_verify?: boolean;
         /**
          * A token retrieved from the verification link contained in the postmaster@ verification email.
          *
-         * @type {string}
-         * @memberOf VerifyOptions
          */
         postmaster_at_token?: string;
         /**
          * A token retrieved from the verification link contained in the abuse@ verification email.
          *
-         * @type {string}
-         * @memberOf VerifyOptions
          */
         abuse_at_token?: string;
     }
@@ -1289,15 +1227,11 @@ declare namespace SparkPost {
         /**
          * Email address to be suppressed
          *
-         * @type {string}
-         * @memberOf CreateSupressionListEntry
          */
         recipient: string;
         /**
          * Type of suppression record
          *
-         * @type {("transactional" | "non_transactional")}
-         * @memberOf CreateSupressionListEntry
          */
         type?: "transactional" | "non_transactional";
         /**
@@ -1305,8 +1239,6 @@ declare namespace SparkPost {
          * Not required if a valid type is passed
          *
          * @deprecated Available, but deprecated in favor of type
-         * @type {boolean}
-         * @memberOf CreateSupressionListEntry
          */
         transactional?: boolean;
         /**
@@ -1314,16 +1246,12 @@ declare namespace SparkPost {
          * Not required if a valid type is passed
          *
          * @deprecated Available, but deprecated in favor of type
-         * @type {boolean}
-         * @memberOf CreateSupressionListEntry
          */
         non_transactional?: boolean;
         /**
          * Source responsible for inserting the list entry
          * no - entries created by the user are marked as Manually Added
          *
-         * @type {("Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance")}
-         * @memberOf CreateSupressionListEntry
          */
         readonly source?: "Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance";
         /** Short explanation of the suppression */
@@ -1334,8 +1262,6 @@ declare namespace SparkPost {
         /**
          * Email address to be suppressed
          *
-         * @type {string}
-         * @memberOf SupressionListEntry
          */
         recipient: string;
         /**
@@ -1343,8 +1269,6 @@ declare namespace SparkPost {
          * Not required if a valid type is passed
          *
          * @deprecated Available, but deprecated in favor of type
-         * @type {boolean}
-         * @memberOf SupressionListEntry
          */
         transactional?: boolean;
         /**
@@ -1352,8 +1276,6 @@ declare namespace SparkPost {
          * Not required if a valid type is passed
          *
          * @deprecated Available, but deprecated in favor of type
-         * @type {boolean}
-         * @memberOf SupressionListEntry
          */
         non_transactional?: boolean;
         /** Type of suppression record: transactional or non_transactional */
@@ -1363,8 +1285,6 @@ declare namespace SparkPost {
          *
          * no - entries created by the user are marked as Manually Added
          *
-         * @type {("Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance")}
-         * @memberOf SupressionListEntry
          */
         source?: "Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance";
         /** Short explanation of the suppression */
@@ -1381,24 +1301,18 @@ declare namespace SparkPost {
         /**
          * Domain of entries to include in the search. ( Note: SparkPost only)
          *
-         * @type {string}
-         * @memberOf SupressionSearch
          */
         domain?: string;
         /**
          * The results cursor location to return, to start paging with cursor, use the value of ‘initial’.
          * When cursor is provided the page parameter is ignored. (Note: SparkPost only)
          *
-         * @type {string}
-         * @memberOf SupressionSearch
          */
         cursor?: string;
         /**
          * Maximum number of results to return per page. Must be between 1 and 10,000.
          * ( Note: SparkPost only)
          * @default 1000
-         * @type {string}
-         * @memberOf SupressionSearch
          */
         per_page?: string | number;
         /**
@@ -1407,8 +1321,6 @@ declare namespace SparkPost {
          * You must use the cursor parameter and start with cursor=initial to page result sets larger than 10,000
          * ( Note: SparkPost only)
          *
-         * @type {string}
-         * @memberOf SupressionSearch
          */
         page?: string | number;
         /** Types of entries to include in the search, i.e. entries with “transactional� and/or “non_transactional� keys set to true */
@@ -1419,15 +1331,11 @@ declare namespace SparkPost {
          * Description of the entries to include in the search, i.e descriptions that include the text submitted.
          * ( Note: SparkPost only)
          *
-         * @type {string}
-         * @memberOf SupressionSearch
          */
         description?: string;
         /**
          * Maximum number of results to return per page. Must be between 1 and 10,000.
-         * @type {number}
          * @deprecated use per_page instead
-         * @memberOf SupressionSearch
          */
         limit?: number;
     }
@@ -1443,8 +1351,6 @@ declare namespace SparkPost {
          * Address "from" : "deals@company.com" or JSON object composed of the "name" and "email" fields.
          * "from" : { "name" : "My Company", "email" : "deals@company.com" } used to compose the email’s "From" header.
          *
-         * @type {(Address | string)}
-         * @memberOf TemplateContent
          */
         from: Address | string;
         /** Email address used to compose the email’s “Reply-To� header. */
@@ -1464,8 +1370,6 @@ declare namespace SparkPost {
          * Address "from" : "deals@company.com" or JSON object composed of the "name" and "email" fields.
          * "from" : { "name" : "My Company", "email" : "deals@company.com" } used to compose the email’s "From" header.
          *
-         * @type {(Address | string)}
-         * @memberOf TemplateContent
          */
         from: Address | string;
         /** Email address used to compose the email’s “Reply-To� header. */
@@ -1492,8 +1396,6 @@ declare namespace SparkPost {
          * It is auto generated if not provided.
          * After a template has been created, this property cannot be changed. Maximum length - 64 bytes
          *
-         * @type {string}
-         * @memberOf Template
          */
         id: string;
         /** Content that will be used to construct a message  yes  For a full description, see the Content Attributes. Maximum length - 20 MBs */
@@ -1519,8 +1421,6 @@ declare namespace SparkPost {
          * It is auto generated if not provided.
          * After a template has been created, this property cannot be changed. Maximum length - 64 bytes
          *
-         * @type {string}
-         * @memberOf CreateTemplate
          */
         id?: string;
         /** Content that will be used to construct a message  yes  For a full description, see the Content Attributes. Maximum length - 20 MBs */
@@ -1572,15 +1472,11 @@ declare namespace SparkPost {
         /**
          * Recipients to receive a carbon copy of the transmission
          *
-         * @type {Recipient[]}
-         * @memberOf CreateTransmission
          */
         cc?: Recipient[];
         /**
          * Recipients to discreetly receive a carbon copy of the transmission
          *
-         * @type {Recipient[]}
-         * @memberOf CreateTransmission
          */
         bcc?: Recipient[];
         /** Inline recipient objects or object containing stored recipient list ID */
@@ -1692,8 +1588,6 @@ declare namespace SparkPost {
          * including the “charset� parameter (text/html; charset=“UTF-8�) if needed.
          * The value will apply “as-is� to the “Content-Type� header of the generated MIME part for the attachment.
          *
-         * @type {string}
-         * @memberOf Attachment
          */
         type: string;
         /**   The filename of the attachment (for example, “document.pdf�). This is inserted into the filename parameter of the Content-Disposition header. */
@@ -1703,8 +1597,6 @@ declare namespace SparkPost {
          * The string should not contain \r\n line breaks.
          * The SparkPost systems will add line breaks as necessary to ensure the Base64 encoded lines contain no more than 76 characters each.
          *
-         * @type {string}
-         * @memberOf Attachment
          */
         data: string;
     }
@@ -1720,8 +1612,6 @@ declare namespace SparkPost {
          * Reserved for future use
          *
          * @default {true}
-         * @type {boolean}
-         * @memberOf Webhook
          */
         active?: boolean;
         /** Type of authentication to be used during POST requests to target */
@@ -1764,8 +1654,6 @@ declare namespace SparkPost {
         /**
          * Domain (or subdomain) name for which SparkPost will receive inbound emails
          *
-         * @type {string}
-         * @memberOf CreateOpts
          */
         domain: string;
     }
diff --git a/types/sparkpost/v1/index.d.ts b/types/sparkpost/v1/index.d.ts
index b12f3712ab..51434cc840 100644
--- a/types/sparkpost/v1/index.d.ts
+++ b/types/sparkpost/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/SparkPost/node-sparkpost
 // Definitions by: Joshua DeVinney <https://github.com/geoffreak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 
diff --git a/types/sparkpost/v1/tslint.json b/types/sparkpost/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sparkpost/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/spdx-correct/index.d.ts b/types/spdx-correct/index.d.ts
new file mode 100644
index 0000000000..bbdfa6af31
--- /dev/null
+++ b/types/spdx-correct/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for spdx-correct 2.0
+// Project: https://github.com/jslicense/spdx-correct.js#readme
+// Definitions by: Jinwoo Lee <https://github.com/jinwoo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function spdxCorrect(identifier: string): string|null;
+export = spdxCorrect;
diff --git a/types/spdx-correct/spdx-correct-tests.ts b/types/spdx-correct/spdx-correct-tests.ts
new file mode 100644
index 0000000000..c28729c22b
--- /dev/null
+++ b/types/spdx-correct/spdx-correct-tests.ts
@@ -0,0 +1,3 @@
+import spdxCorrect = require('spdx-correct');
+
+spdxCorrect('BSD');
diff --git a/types/spdx-correct/tsconfig.json b/types/spdx-correct/tsconfig.json
new file mode 100644
index 0000000000..a7c8604db7
--- /dev/null
+++ b/types/spdx-correct/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "spdx-correct-tests.ts"
+    ]
+}
diff --git a/types/spdx-correct/tslint.json b/types/spdx-correct/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/spdx-correct/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/spdx-satisfies/index.d.ts b/types/spdx-satisfies/index.d.ts
new file mode 100644
index 0000000000..e576305571
--- /dev/null
+++ b/types/spdx-satisfies/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for spdx-satisfies 0.1
+// Project: https://github.com/kemitchell/spdx-satisfies.js#readme
+// Definitions by: Jinwoo Lee <https://github.com/jinwoo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function spdxSatisfies(first: string, second: string): boolean;
+export = spdxSatisfies;
diff --git a/types/spdx-satisfies/spdx-satisfies-tests.ts b/types/spdx-satisfies/spdx-satisfies-tests.ts
new file mode 100644
index 0000000000..6b2e7f78c4
--- /dev/null
+++ b/types/spdx-satisfies/spdx-satisfies-tests.ts
@@ -0,0 +1,3 @@
+import spdxSatisfies = require('spdx-satisfies');
+
+spdxSatisfies('BSD-2-Clause', '(BSD-2-Clause OR MIT)');
diff --git a/types/spdx-satisfies/tsconfig.json b/types/spdx-satisfies/tsconfig.json
new file mode 100644
index 0000000000..7aff811650
--- /dev/null
+++ b/types/spdx-satisfies/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "spdx-satisfies-tests.ts"
+    ]
+}
diff --git a/types/spdx-satisfies/tslint.json b/types/spdx-satisfies/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/spdx-satisfies/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/speakeasy/index.d.ts b/types/speakeasy/index.d.ts
index 4e281f996f..06d79ea6aa 100644
--- a/types/speakeasy/index.d.ts
+++ b/types/speakeasy/index.d.ts
@@ -1,8 +1,13 @@
 // Type definitions for speakeasy v2.0.0
-// Project: https://github.com/markbao/speakeasy
-// Definitions by: Lucas Woo <https://github.com/legendecas>, Alexander Batukhtin <https://github.com/mrOlorin>
+// Project: https://github.com/speakeasyjs/speakeasy
+// Definitions by: Lucas Woo <https://github.com/legendecas>, Alexander Batukhtin <https://github.com/mrOlorin>, Aayush Kapoor <https://github.com/xeoneux>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+interface SharedOptions {
+    encoding?: string;
+    algorithm?: string;
+}
+
 interface Key {
     ascii: string;
     base32: string;
@@ -14,11 +19,9 @@ interface Key {
     otpauth_url?: string;
 }
 
-interface DigestOptions {
+interface DigestOptions extends SharedOptions {
     secret: string;
     counter: string;
-    encoding?: string;
-    algorithm?: string;
     key?: string;
 }
 
@@ -39,56 +42,78 @@ interface GenerateSecretOptions {
     symbols?: boolean;
 }
 
-interface TotpOptions {
+interface TotpOptions extends SharedOptions {
     key?: string;
     step?: number;
     time?: number;
     initial_time?: number;
     length?: number;
-    encoding?: string;
     counter?: number;
     epoch?: number;
     secret?: string;
     digits?: number;
     digest?: () => string;
-    algorithm?: string;
 }
 
-interface HotpOptions {
+interface TotpVerifyOptions extends SharedOptions {
+    secret: string;
+    token: string;
+    time?: number;
+    step?: number;
+    epoch?: number;
+    counter?: number;
+    digits?: number;
+    window?: number;
+}
+
+interface HotpOptions extends SharedOptions {
     key: string;
     counter: number;
     length?: number;
-    encoding?: string;
     digits?: number;
     digest?: () => string;
 }
 
-interface OtpauthURLOptions {
+interface HotpVerifyOptions extends SharedOptions {
+    secret: string;
+    token: string;
+    counter: number;
+    digits?: number;
+    window?: number;
+}
+
+interface OtpauthURLOptions extends SharedOptions {
     secret: string;
     label: string;
     issuer?: any;
     type?: string;
     counter?: number;
-    algorithm?: string;
     digits?: number;
     period?: number;
-    encoding?: string;
 }
 
-export declare function digest(options: DigestOptions): string;
+interface Hotp {
+    (options: HotpOptions): string;
+    verifyDelta: (options: HotpVerifyOptions) => boolean;
+    verify: (options: HotpVerifyOptions) => boolean;
+}
 
-export declare function generate_key(options: GenerateOptions): Key;
+interface Totp {
+    (options: TotpOptions): string;
+    verifyDelta: (options: TotpVerifyOptions) => boolean;
+    verify: (options: TotpVerifyOptions) => boolean;
+}
 
-export declare function generateSecret(options: GenerateSecretOptions): Key;
-
-export declare function generateSecretASCII(length?: number, symbols?: boolean): string;
-
-export declare function otpauthURL(options: OtpauthURLOptions): string;
-
-export declare function hotp(options: HotpOptions): string;
-
-export declare function counter(options: HotpOptions): string;
-
-export declare function totp(options: TotpOptions): string;
+export declare const hotp: Hotp;
+export declare const totp: Totp;
 
 export declare function time(options: TotpOptions): string;
+export declare function counter(options: HotpOptions): string;
+export declare function digest(options: DigestOptions): string;
+export declare function generate_key(options: GenerateOptions): Key;
+export declare function generateSecret(options?: GenerateSecretOptions): Key;
+export declare function generateSecretASCII(
+    length?: number,
+    symbols?: boolean
+): string;
+export declare function otpauthURL(options: OtpauthURLOptions): string;
diff --git a/types/speakeasy/speakeasy-tests.ts b/types/speakeasy/speakeasy-tests.ts
index ae1ed061da..c807e568a3 100644
--- a/types/speakeasy/speakeasy-tests.ts
+++ b/types/speakeasy/speakeasy-tests.ts
@@ -37,4 +37,12 @@ speakeasy.generateSecretASCII(5, true);
 speakeasy.otpauthURL({
     secret: 'otpauthURLSecret',
     label: 'otpauthURLLength'
-});
\ No newline at end of file
+});
+
+speakeasy.totp.verify({secret: "secret", token: "123456"})
+
+speakeasy.totp.verifyDelta({secret: "secret", token: "123456"})
+
+speakeasy.hotp.verify({secret: "secret", token: "123456", counter: 123})
+
+speakeasy.hotp.verifyDelta({secret: "secret", token: "123456", counter: 123})
diff --git a/types/speakeasy/tslint.json b/types/speakeasy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/speakeasy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/spectacle/tslint.json b/types/spectacle/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/spectacle/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/spectrum/tslint.json b/types/spectrum/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/spectrum/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/spin.js/index.d.ts b/types/spin.js/index.d.ts
deleted file mode 100644
index 633a308e53..0000000000
--- a/types/spin.js/index.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// Type definitions for Spin.js 2.3.2
-// Project: http://fgnass.github.com/spin.js/
-// Definitions by: Boris Yankov <https://github.com/borisyankov>, Theodore Brown <https://github.com/theodorejb>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface SpinnerOptions {
-    lines?: number; // The number of lines to draw
-    length?: number; // The length of each line
-    width?: number;  // The line thickness
-    radius?: number; // The radius of the inner circle
-    corners?: number; // Corner roundness (0..1)
-    rotate?: number; // The rotation offset
-    direction?: number; // 1: clockwise, -1: counterclockwise
-    color?: any; // #rgb or #rrggbb or array of colors
-    speed?: number; // Rounds per second
-    trail?: number; // Afterglow percentage
-    shadow?: boolean; // Whether to render a shadow
-    hwaccel?: boolean; // Whether to use hardware acceleration
-    className?: string; // The CSS class to assign to the spinner
-    zIndex?: number; // The z-index (defaults to 2000000000)
-    top?: string; // Top position relative to parent in px
-    left?: string; // Left position relative to parent in px
-    scale?: number; // Scales overall size of the spinner
-    opacity?: number; // Opacity of the lines
-    fps?: number; // Frames per second when using setTimeout() as a fallback for CSS
-    position?: string; // Element positioning
-}
-
-
-declare class Spinner {
-    /** The Spinner's HTML element - can be used to manually insert the spinner into the DOM  */
-    public el: HTMLElement;
-    constructor(options?: SpinnerOptions);
-
-    /**
-     * Adds the spinner to the given target element. If this instance is already
-     * spinning, it is automatically removed from its previous target by calling
-     * stop() internally.
-     */
-    spin(target?: HTMLElement): Spinner;
-
-    /**
-     * Stops and removes the Spinner.
-     * Stopped spinners may be reused by calling spin() again.
-     */
-    stop(): Spinner;
-    lines(el:HTMLElement, o:SpinnerOptions):HTMLElement;
-    opacity(el:HTMLElement, i:number, val:number, o:SpinnerOptions):void;
-}
-
-declare module "spin.js" {
-    export = Spinner;
-}
diff --git a/types/spin.js/spin.js-tests.ts b/types/spin.js/spin.js-tests.ts
deleted file mode 100644
index e9ae63c9a7..0000000000
--- a/types/spin.js/spin.js-tests.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-var spinner = new Spinner().spin();
-target.appendChild(spinner.el);
-
-var target = document.getElementById('foo');
-var opts = { speed: 5, color: '#abcdef' };
-var spinner2 = new Spinner(opts).spin(target);
-
-var opts2 = {
-    lines: 10,
-    length: 20,
-    width: 7,
-    radius: 14,
-    corners: 0.6,
-    rotate: 0,
-    direction: 1,
-    color: ['#aaa', '#fedcba', '#fff', '#aef02b'],
-    speed: 1.5,
-    trail: 50,
-    shadow: true,
-    hwaccel: true,
-    className: 'spinner',
-    zIndex: 5,
-    top: '28',
-    left: 'auto',
-    scale: 1,
-    opacity: 0.25,
-    fps: 20,
-    position: 'absolute'
-};
-
-var newTarget = document.getElementById('bar');
-var spinner3 = new Spinner(opts2).spin(newTarget);
diff --git a/types/spin.js/tsconfig.json b/types/spin.js/tsconfig.json
deleted file mode 100644
index 55b1f25e2d..0000000000
--- a/types/spin.js/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "spin.js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/split.js/index.d.ts b/types/split.js/index.d.ts
index d69548913e..cba8052b72 100644
--- a/types/split.js/index.d.ts
+++ b/types/split.js/index.d.ts
@@ -1,17 +1,30 @@
-// Type definitions for splitjs v1.3.4
+// Type definitions for split.js 1.3
 // Project: https://github.com/nathancahill/Split.js
 // Definitions by: Ilia Choly <https://github.com/icholy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+// Global variable outside module loader
+export as namespace Split;
+
+// Module loader
+export = Split;
+
+declare function Split(
+  elements: Array<string | HTMLElement>,
+  options?: Split.Options
+): Split.Instance;
 
 declare namespace Split {
+  type Partial<T> = {[P in keyof T]?: T[P]};
+  type CSSStyleDeclarationPartial = Partial<CSSStyleDeclaration>;
 
   interface Options {
-
     // Initial sizes of each element in percents or CSS values.
-    sizes?:   number[];
+    sizes?: number[];
 
     // Minimum size of each element.
-    minSize?: number|number[];
+    minSize?: number | number[];
 
     // Gutter size in pixels.
     gutterSize?: number;
@@ -20,43 +33,43 @@ declare namespace Split {
     snapOffset?: number;
 
     // Direction to split: horizontal or vertical.
-    direction?: "horizontal"|"vertical";
+    direction?: 'horizontal' | 'vertical';
 
     // Cursor to display while dragging.
-    cursor?: string;
-
-    // Called to create each gutter element
-    gutter?: (
-      index:     number,
-      direction: "horizontal"|"vertical"
-    ) => HTMLElement;
-
-    // 	Called to set the style of each element.
-    elementStyle?: (
-      dimension:   "width"|"height",
-      elementSize: number,
-      gutterSize:  number
-    ) => any;
-
-    // Called to set the style of the gutter.
-    gutterStyle?: (
-      dimension:  "width"|"height",
-      gutterSize: number
-    ) => any;
+    cursor?: 'col-resize' | 'row-resize';
 
     // Callback on drag.
-    onDrag?: Function;
+    onDrag?(): void;
 
     // Callback on drag start.
-    onDragStart?: Function;
+    onDragStart?(): void;
 
     // Callback on drag end.
-    onDragEnd?: Function;
+    onDragEnd?(): void;
+
+    // Called to create each gutter element
+    gutter?(
+      index: number,
+      direction: 'horizontal' | 'vertical'
+    ): HTMLElement;
+
+    // Called to set the style of each element.
+    elementStyle?(
+      dimension: 'width' | 'height',
+      elementSize: number,
+      gutterSize: number
+    ): CSSStyleDeclarationPartial;
+
+    // Called to set the style of the gutter.
+    gutterStyle?(
+      dimension: 'width' | 'height',
+      gutterSize: number
+    ): CSSStyleDeclarationPartial;
   }
 
   interface Instance {
     // setSizes behaves the same as the sizes configuration option, passing an array of percents or CSS values.
-    // It updates the sizes of the elements in the split. 
+    // It updates the sizes of the elements in the split.
     setSizes(sizes: number[]): void;
 
     // getSizes returns an array of percents, suitable for using with setSizes or creation.
@@ -72,11 +85,4 @@ declare namespace Split {
     // Destroy the instance. It removes the gutter elements, and the size CSS styles Split.js set.
     destroy(): void;
   }
-
 }
-
-declare function Split(
-  elements:  (string | HTMLElement)[],
-  options?: Split.Options
-): Split.Instance;
-
diff --git a/types/split.js/split.js-tests.ts b/types/split.js/split.js-tests.ts
index 72dc7238ee..69428b600a 100644
--- a/types/split.js/split.js-tests.ts
+++ b/types/split.js/split.js-tests.ts
@@ -1,12 +1,13 @@
+import Split = require('split.js');
 
-let split = Split(['#one', '#two'], {
+const split = Split(['#one', '#two'], {
   sizes: [25, 75],
-  gutter: (index, direction) => {
+  gutter(index: number, direction: 'horizontal' | 'vertical'): HTMLElement {
     const gutter = document.createElement('div');
     gutter.className = `gutter gutter-${direction}`;
     return gutter;
   },
-  onDragEnd: () => {
+  onDragEnd(): void {
     console.log(split.getSizes());
   }
 });
diff --git a/types/split.js/tslint.json b/types/split.js/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/split.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/split/tslint.json b/types/split/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/split/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/split2/tslint.json b/types/split2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/split2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/spotify-api/tslint.json b/types/spotify-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/spotify-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/spotify-web-playback-sdk/index.d.ts b/types/spotify-web-playback-sdk/index.d.ts
new file mode 100644
index 0000000000..95d8375b56
--- /dev/null
+++ b/types/spotify-web-playback-sdk/index.d.ts
@@ -0,0 +1,124 @@
+// Type definitions for spotify-web-playback-sdk 0.1
+// Project: https://beta.developer.spotify.com/documentation/web-playback-sdk/reference/
+// Definitions by: Festify Dev Team <https://github.com/Festify>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Window {
+    onSpotifyWebPlaybackSDKReady(): void;
+}
+
+declare namespace Spotify {
+    const Player: typeof SpotifyPlayer;
+
+    interface Album {
+        uri: string;
+        name: string;
+        images: Image[];
+    }
+
+    interface Artist {
+        name: string;
+        uri: string;
+    }
+
+    interface Error {
+        message: string;
+    }
+
+    type ErrorTypes = 'account_error' | 'authentication_error' | 'initialization_error' | 'playback_error';
+
+    interface Image {
+        url: string;
+    }
+
+    interface PlaybackContext {
+        metadata: any;
+        uri: string | null;
+    }
+
+    interface PlaybackDisallows {
+        pausing: boolean;
+        peeking_next: boolean;
+        peeking_prev: boolean;
+        resuming: boolean;
+        seeking: boolean;
+        skipping_next: boolean;
+        skipping_prev: boolean;
+    }
+
+    interface PlaybackRestrictions {
+        disallow_pausing_reasons: string[];
+        disallow_peeking_next_reasons: string[];
+        disallow_peeking_prev_reasons: string[];
+        disallow_resuming_reasons: string[];
+        disallow_seeking_reasons: string[];
+        disallow_skipping_next_reasons: string[];
+        disallow_skipping_prev_reasons: string[];
+    }
+
+    interface PlaybackState {
+        context: PlaybackContext;
+        disallows: PlaybackDisallows;
+        duration: number;
+        paused: boolean;
+        position: number;
+        repeat_mode: RepeatMode;
+        shuffle: boolean;
+        restrictions: PlaybackRestrictions;
+        track_window: PlaybackTrackWindow;
+    }
+
+    interface PlaybackTrackWindow {
+        current_track: Track;
+        previous_tracks: Track[];
+        next_tracks: Track[];
+    }
+
+    interface PlayerInit {
+        name: string;
+        getOAuthToken(cb: (token: string) => void): void;
+        volume?: number;
+    }
+
+    enum RepeatMode {
+        NO_REPEAT = 0,
+        ONCE_REPEAT = 1,
+        FULL_REPEAT = 2,
+    }
+
+    class SpotifyPlayer {
+        constructor(options: PlayerInit);
+
+        connect(): Promise<boolean>;
+        disconnect(): void;
+        getCurrentState(): Promise<PlaybackState | null>;
+        getVolume(): Promise<number>;
+        nextTrack(): Promise<void>;
+
+        on(event: 'ready', cb: (pb: WebPlaybackInstance) => void): void;
+        on(event: 'player_state_changed', cb: (pb: PlaybackState) => void): void;
+        on(event: ErrorTypes, cb: (err: Error) => void): void;
+
+        pause(): Promise<void>;
+        previousTrack(): Promise<void>;
+        resume(): Promise<void>;
+        seek(pos_ms: number): Promise<void>;
+        setVolume(volume: number): Promise<void>;
+        togglePlay(): Promise<void>;
+    }
+
+    interface Track {
+        uri: string;
+        id: string | null;
+        type: 'track' | 'episode' | 'ad';
+        media_type: 'audio' | 'video';
+        name: string;
+        is_playable: boolean;
+        album: Album;
+        artists: Artist[];
+    }
+
+    interface WebPlaybackInstance {
+        device_id: string;
+    }
+}
diff --git a/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts b/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts
new file mode 100644
index 0000000000..afb82ef994
--- /dev/null
+++ b/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts
@@ -0,0 +1,99 @@
+/*
+ * Taken from https://beta.developer.spotify.com/documentation/web-playback-sdk/reference/
+ * © 2017 Spotify AB
+ */
+
+const player = new Spotify.Player({
+    name: "Carly Rae Jepsen Player",
+    getOAuthToken: (callback) => {
+        // Run code to get a fresh access token
+        callback("access token here");
+    },
+    volume: 0.5
+});
+
+player.connect().then((success) => {
+    if (success) {
+        console.log("The Web Playback SDK successfully connected to Spotify!");
+    }
+});
+
+player.disconnect();
+
+player.on("ready", (data) => {
+    console.log("The Web Playback SDK is ready to play music!");
+});
+
+player.getCurrentState().then((playbackState) => {
+    if (playbackState) {
+        const { current_track, next_tracks } = playbackState.track_window;
+
+        console.log("Currently Playing", current_track);
+        console.log("Playing Next", next_tracks[0]);
+    } else {
+        console.error("The user is not playing music through the Web Playback SDK");
+    }
+});
+
+player.getVolume().then((volume) => {
+    const volume_percentage = (volume * 100);
+    console.log(`The volume of the player is ${volume_percentage}%`);
+});
+
+player.setVolume(0.5).then(() => {
+    console.log("Volume updated!");
+});
+
+player.pause().then(() => {
+    console.log("Paused!");
+});
+
+player.resume().then(() => {
+    console.log("Resumed!");
+});
+
+player.togglePlay().then(() => {
+    console.log("Toggled playback!");
+});
+
+player.seek(60 * 1000).then(() => {
+    console.log("Changed position!");
+});
+
+player.previousTrack().then(() => {
+    console.log("Set to previous track!");
+});
+
+player.nextTrack().then(() => {
+    console.log("Skipped to next track!");
+});
+
+player.on("ready", (data) => {
+    const { device_id } = data;
+    console.log("Connected with Device ID", device_id);
+});
+
+player.on("player_state_changed", (playbackState) => {
+    const { position, duration } = playbackState;
+    const { current_track } = playbackState.track_window;
+
+    console.log("Currently Playing", current_track);
+    console.log("Position in Song", position);
+    console.log("Duration of Song", duration);
+});
+
+player.on('initialization_error', (e) => {
+    console.error("Failed to initialize", e.message);
+});
+
+player.on('authentication_error', (e) => {
+    console.error("Failed to authenticate", e.message);
+});
+
+player.on('account_error', (e) => {
+    console.error("Failed to validate Spotify account", e.message);
+});
+
+player.on('playback_error', (e) => {
+    console.error("Failed to perform playback", e.message);
+});
diff --git a/types/spotify-web-playback-sdk/tsconfig.json b/types/spotify-web-playback-sdk/tsconfig.json
new file mode 100644
index 0000000000..c6b3dd1448
--- /dev/null
+++ b/types/spotify-web-playback-sdk/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "spotify-web-playback-sdk-tests.ts"
+    ]
+}
diff --git a/types/spotify-web-playback-sdk/tslint.json b/types/spotify-web-playback-sdk/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/spotify-web-playback-sdk/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sql.js/tslint.json b/types/sql.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sql.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sqs-consumer/index.d.ts b/types/sqs-consumer/index.d.ts
index dfc61f3933..73da1ff980 100644
--- a/types/sqs-consumer/index.d.ts
+++ b/types/sqs-consumer/index.d.ts
@@ -1,29 +1,35 @@
-// Type definitions for sqs-consumer 3.5
+// Type definitions for sqs-consumer 3.7
 // Project: https://github.com/BBC/sqs-consumer
-// Definitions by: Daniel Chao <http://dchao.co/>, Eric Byers <http://www.github.com/EricByers>
+// Definitions by: Daniel Chao <http://dchao.co/>
+//                 Eric Byers <http://github.com/EricByers>
+//                 Ezinwa Okpoechi <http://github.com/BrainMaestro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 import { SQS } from "aws-sdk";
 
-export type ConsumerDone = (error?: Error) => void;
+declare namespace Consumer {
+    export type ConsumerDone = (error?: Error) => void;
 
-export interface Options {
-  queueUrl: string;
-  handleMessage(message: SQS.Message, done: ConsumerDone): any;
-  region?: string;
-  attributeNames?: string[];
-  messageAttributeNames?: string[];
-  batchSize?: number;
-  visibilityTimeout?: number;
-  waitTimeSeconds?: number;
-  authenticationErrorTimeout?: number;
-  sqs?: SQS;
+    export interface Options {
+        queueUrl: string;
+        handleMessage(message: SQS.Message, done: ConsumerDone): any;
+        region?: string;
+        attributeNames?: string[];
+        messageAttributeNames?: string[];
+        batchSize?: number;
+        visibilityTimeout?: number;
+        waitTimeSeconds?: number;
+        authenticationErrorTimeout?: number;
+        sqs?: SQS;
+    }
 }
 
-export interface Consumer extends NodeJS.EventEmitter {
-  start(): void;
-  stop(): void;
+declare class Consumer extends NodeJS.EventEmitter {
+    constructor(options: Consumer.Options);
+    start(): void;
+    stop(): void;
+    static create(options: Consumer.Options): Consumer;
 }
 
-export function create(opts: Options): Consumer;
+export = Consumer;
diff --git a/types/sqs-consumer/package.json b/types/sqs-consumer/package.json
index 6a583a47b0..3711406140 100644
--- a/types/sqs-consumer/package.json
+++ b/types/sqs-consumer/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "aws-sdk": "^2.37.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/sqs-consumer/sqs-consumer-tests.ts b/types/sqs-consumer/sqs-consumer-tests.ts
index b76c5116ba..f22e75b523 100644
--- a/types/sqs-consumer/sqs-consumer-tests.ts
+++ b/types/sqs-consumer/sqs-consumer-tests.ts
@@ -1,23 +1,23 @@
-import * as Consumer from "sqs-consumer";
+import Consumer = require("sqs-consumer");
 import { SQS } from "aws-sdk";
 
 const app = Consumer.create({
-  queueUrl: 'https://sqs.eu-west-1.amazonaws.com/account-id/queue-name',
-  handleMessage(message, done) {
+    queueUrl: 'https://sqs.eu-west-1.amazonaws.com/account-id/queue-name',
+    handleMessage(message, done) {
     // do some work with `message`
-    done();
-  }
+        done();
+    }
 });
 
 const app2 = Consumer.create({
-  queueUrl: 'https://sqs.eu-west-1.amazonaws.com/account-id/queue-name',
-  handleMessage(message, done) {
-    done();
-  },
-  region: "us-west-1",
-  batchSize: 15,
-  visibilityTimeout: 50,
-  waitTimeSeconds: 50
+    queueUrl: 'https://sqs.eu-west-1.amazonaws.com/account-id/queue-name',
+    handleMessage(message, done) {
+        done();
+    },
+    region: "us-west-1",
+    batchSize: 15,
+    visibilityTimeout: 50,
+    waitTimeSeconds: 50
 });
 
 // Test message handler.
@@ -30,8 +30,13 @@ const app3 = Consumer.create({
 	handleMessage
 });
 
+const app4 = new Consumer({
+	queueUrl: 'https://sqs.eu-west-1.amazonaws.com/account-id/queue-name',
+	handleMessage
+});
+
 app.on('error', (err: any) => {
-  console.log(err.message);
+    console.log(err.message);
 });
 
 app.start();
diff --git a/types/sqs-consumer/tslint.json b/types/sqs-consumer/tslint.json
index 10e16aef18..a0d5a61bd8 100644
--- a/types/sqs-consumer/tslint.json
+++ b/types/sqs-consumer/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "ban-types": false,
-        "dt-header": false
+        "dt-header": false,
+        "strict-export-declare-modifiers": false
     }
 }
diff --git a/types/sqs-producer/package.json b/types/sqs-producer/package.json
index 6a583a47b0..3711406140 100644
--- a/types/sqs-producer/package.json
+++ b/types/sqs-producer/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "aws-sdk": "^2.37.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/squirejs/tslint.json b/types/squirejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/squirejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/srp/tslint.json b/types/srp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/srp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ss-utils/index.d.ts b/types/ss-utils/index.d.ts
deleted file mode 100644
index 3f99c785a3..0000000000
--- a/types/ss-utils/index.d.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-// Type definitions for ServiceStack Utils v0.0.1
-// Project: https://servicestack.net/
-// Definitions by: Demis Bellot <https://github.com/mythz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="jquery" />
-
-declare namespace ssutils {
-
-    interface Static {
-        handlers: { [index: string]: Function };
-        onSubmitDisable: string;
-        validation: Validation;
-        clearAdjacentError: () => void;
-        todate: (s: string) => Date;
-        todfmt: (s: string) => string;
-        dfmt: (d: Date) => string;
-        dfmthm: (d: Date) => string;
-        tfmt12: (d: Date) => string;
-        splitOnFirst: (s: string, delimiter:string) => string[];
-        splitOnLast: (s: string, delimiter: string) => string[];
-        getSelection: () => string;
-        combinePaths: (...paths:string[]) => string;
-        queryString: (url: string) => { [index: string]: string };
-        createPath: (route: string, args: any) => string;
-        createUrl: (route: string, args: any) => string;
-        humanize: (s: string) => string;
-        normalizeKey: (key: string) => string;
-        normalize: (dto: any, deep?:boolean) => any;
-        parseResponseStatus: (json: string, defaultMsg?: string) => any;
-        postJSON: (url: string, data: Object | String, success?: Function, error?: Function) => any;
-
-        listenOn: string;
-        eventReceivers: any;
-        eventChannels: string[];
-        eventSourceUrl: string;
-        updateSubscriberUrl: string;
-        updateChannels: (channels: string[]) => void;
-        updateSubscriber: (data: UpdateSubscriberOptions, cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
-        subscribeToChannels: (channels: string[], cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
-        unsubscribeFromChannels: (channels: string[], cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
-        reconnectServerEvents: (opt: ReconnectServerEventsOptions) => any;
-    }
-
-    interface Validation {
-        overrideMessages: boolean;
-        messages: { [index: string]: string };
-        errorFilter: (errorMsg: string, errorCode: string, type: string) => void;
-    }
-
-    interface ValidationOptional {
-        overrideMessages?: boolean;
-        messages?: { [index: string]: string };
-        errorFilter?: (errorMsg: string, errorCode: string, type: string) => void;
-    }
-
-    interface ApplyErrorsOptions extends ValidationOptional {
-    }
-
-    interface BindFormOptions {
-        validation?: ValidationOptional;
-        validate?: (form: HTMLFormElement) => boolean;
-        onSubmitDisable?: string;
-        complete?: (...args: any[]) => void;
-        error?: (...args: any[]) => void;
-    }
-
-    interface HandleServerEventsOptions {
-        handlers?: { [index: string]: Function };
-        validate?: (op?: string, target?: string, msg?: string, json?: string) => boolean;
-        heartbeatUrl?: string;
-        heartbeatIntervalMs?: number;
-        unRegisterUrl?: string;
-        receivers?: { [index: string]: any };
-        success?: (selector: string, msg: string, e: any) => void;
-    }
-
-    interface UpdateSubscriberOptions {
-        SubscribeChannels?: string;
-        UnsubscribeChannels?: string;
-    }
-
-    interface ResponseStatus {
-        errorCode: string;
-        message: string;
-        stackTrace: string;
-        errors: ResponseError[];
-    }
-    interface ResponseError {
-        errorCode: string;
-        fieldName: string;
-        message: string;
-    }
-
-    interface SSECommand {
-        userId: string;
-        displayName: string;
-        channels: string;
-        profileUrl: string;
-    }
-
-    interface SSEHeartbeat extends SSECommand { }
-    interface SSEJoin extends SSECommand { }
-    interface SSELeave extends SSECommand { }
-    interface SSEUpdate extends SSECommand { }
-
-    interface SSEConnect extends SSECommand {
-        id: string;
-        unRegisterUrl: string;
-        heartbeatUrl: string;
-        updateSubscriberUrl: string;
-        heartbeatIntervalMs: number;
-        idleTimeoutMs: number;
-    }
-
-    interface ReconnectServerEventsOptions {
-        url?: string;
-        onerror?: (...args: any[]) => void;
-        onmessage?: (...args: any[]) => void;
-        errorArgs?: any[];
-    }
-
-    /**
-     * EventSource
-     */
-    enum ReadyState { CONNECTING = 0, OPEN = 1, CLOSED = 2 }
-
-    interface IEventSourceStatic extends EventTarget {
-        new (url: string, eventSourceInitDict?: IEventSourceInit): IEventSourceStatic;
-        url: string;
-        withCredentials: boolean;
-        CONNECTING: ReadyState; // constant, always 0
-        OPEN: ReadyState; // constant, always 1
-        CLOSED: ReadyState; // constant, always 2
-        readyState: ReadyState;
-        onopen: Function;
-        onmessage: (event: IOnMessageEvent) => void;
-        onerror: Function;
-        close: () => void;
-    }
-
-    interface IEventSourceInit {
-        withCredentials?: boolean;
-    }
-
-    interface IOnMessageEvent {
-        data: string;
-    }
-}
-
-//Needs to be declared locally
-//declare var EventSource: ssutils.IEventSourceStatic;
-
-interface JQuery {
-    setFieldError: (name: string, msg: string) => void;
-    serializeMap: () => { [index: string]: any };
-    applyErrors: (status: ssutils.ResponseStatus, opt?: ssutils.ApplyErrorsOptions) => JQuery;
-    clearErrors: () => JQuery;
-    bindForm: (opt?: ssutils.ApplyErrorsOptions) => JQuery;
-    applyValues: (values: { [index: string]: string }) => JQuery;
-    bindHandlers: (handlers: { [index: string]: Function }) => JQuery;
-    setActiveLinks: () => JQuery;
-    handleServerEvents: (opt?: ssutils.HandleServerEventsOptions) => void;
-}
-
-interface JQueryStatic {
-    ss: ssutils.Static;
-}
-
-declare module "ss-utils" {
-    export = ssutils;
-}
diff --git a/types/ss-utils/ss-utils-tests.ts b/types/ss-utils/ss-utils-tests.ts
deleted file mode 100644
index 9bbd30da9a..0000000000
--- a/types/ss-utils/ss-utils-tests.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-declare var EventSource : ssutils.IEventSourceStatic;
-
-function test_ssutils() {
-     $.ss.eventReceivers = { "document": document };
-
-    var source = new EventSource("/event-stream?channels=home,work");
-    $(source).handleServerEvents({
-        handlers: {
-            onConnect: function(connect:ssutils.SSEConnect) {},
-            onHeartbeat: function(msg:ssutils.SSEHeartbeat, e:MessageEvent){},
-            onJoin: function(msg:ssutils.SSEJoin) {},
-            onLeave: function(msg:ssutils.SSELeave) {},
-            onUpdate: function(msg:ssutils.SSEUpdate) {}
-        },
-        receivers: {
-            tv: {
-                watch: function(){}
-            }
-        }
-    });
-
-    $(document).bindHandlers({
-        announce: function (msg:string) {}
-    })
-    .on('customEvent', function (e, msg, msgEvent) { });
-
-    $.ss.handlers["changeChannel"]("home");
-}
-
-function test_jQuery_functions(){
-    $("document").setFieldError("name","message");
-    var map = $("form").serializeMap();
-    $("form").applyErrors({errorCode:"",message:"",stackTrace:"",errors:[]});
-    $("form").clearErrors();
-    $("form").bindForm({
-        overrideMessages: true,
-        messages: {"NotFound": "Not Found"},
-        errorFilter: function(errorMsg, errorCode, type){}
-    });
-    $("form").applyValues({
-        "Key": "Value"
-    });
-    $("form").bindHandlers({
-        "test": function() {}
-    });
-}
-
-function test_ssutils_Static(){
-    $.ss.handlers["key"] = () => 0;
-    $.ss.onSubmitDisable = "class";
-    $.ss.validation.messages["Code"] = "Message";
-    $.ss.clearAdjacentError();
-    var date:Date = $.ss.todate("2001-01-01");
-    var dateFmt:String = $.ss.todfmt("2001-01-01");
-    dateFmt = $.ss.dfmt(new Date(2001,1,1));
-    dateFmt = $.ss.dfmthm(new Date(2001,1,1));
-    dateFmt = $.ss.tfmt12(new Date(2001,1,1));
-    var parts:string[] = $.ss.splitOnFirst("A;B;C",";");
-    parts = $.ss.splitOnLast("A;B;C", ";");
-    var selectedText = $.ss.getSelection();
-    var qs:{ [index: string]: string } = $.ss.queryString("http://google.com?a=b&c=d");
-    var relativePath = $.ss.createUrl("/path/to/{File}", {File:"file.js"});
-    var readableText = $.ss.humanize("TheVariableName");
-    $.ss.normalizeKey("aAa");
-    $.ss.normalize({"AA":1,"bB":2,"C":{"A":11,"B":22},"D":[1,2],"E":[{"A":111,"B":222}]});
-    $.ss.normalize({"AA":1,"bB":2,"C":{"A":11,"B":22},"D":[1,2],"E":[{"A":111,"B":222}]}, true);
-    $.ss.parseResponseStatus('{"message":"test"}');
-    $.ss.postJSON("/path/to/url", {json:"data"}, function(r:any) {});
-
-    $.ss.listenOn = "click onmousedown";
-    $.ss.eventReceivers = { "document": document };
-    $.ss.handlers["changeChannel"]("home");
-}
\ No newline at end of file
diff --git a/types/ss-utils/tsconfig.json b/types/ss-utils/tsconfig.json
deleted file mode 100644
index 1092eab097..0000000000
--- a/types/ss-utils/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ss-utils-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index e7bddb2cad..a91725d7a4 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ssh2-sftp-client 1.1
+// Type definitions for ssh2-sftp-client 2.0
 // Project: https://www.npmjs.com/package/ssh2-sftp-client
 // Definitions by: igrayson <https://github.com/igrayson>, Ascari Andrea <https://github.com/ascariandrea>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -13,6 +13,7 @@ declare class sftp {
   get(remoteFilePath: string, useCompression?: boolean, encoding?: string): Promise<NodeJS.ReadableStream>;
   put(input: string | Buffer | NodeJS.ReadableStream, remoteFilePath: string, useCompression?: boolean, encoding?: string): Promise<void>;
   mkdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
+  rmdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
   delete(remoteFilePath: string): Promise<void>;
   rename(remoteSourcePath: string, remoteDestPath: string): Promise<void>;
   end(): Promise<void>;
diff --git a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
index e519ed2902..ec64afe698 100644
--- a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
+++ b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
@@ -19,6 +19,7 @@ client.put(new Buffer('content'), '/remote/path').then(() => null);
 client.put(fs.createReadStream('Hello World'), '/remote/path').then(() => null);
 
 client.mkdir('/remote/path/dir', true).then(() => null);
+client.rmdir('/remote/path/dir', true).then(() => null);
 
 client.delete('remote/path').then(() => null);
 
diff --git a/types/ssh2-streams/tslint.json b/types/ssh2-streams/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ssh2-streams/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ssh2/ssh2-tests.ts b/types/ssh2/ssh2-tests.ts
index 1244ccb3fa..e6d03e939f 100644
--- a/types/ssh2/ssh2-tests.ts
+++ b/types/ssh2/ssh2-tests.ts
@@ -388,7 +388,7 @@ new ssh2.Server({
             var session = accept();
             session.on('sftp', (accept: any, reject: any) => {
                 console.log('Client SFTP session');
-                var openFiles: any = {};
+                var openFiles = new Set<number>();
                 var handleCount = 0;
                 // `sftpStream` is an `SFTPStream` instance in server mode
                 // see: https://github.com/mscdex/ssh2-streams/blob/master/SFTPStream.md
@@ -401,12 +401,12 @@ new ssh2.Server({
                     // be a real file descriptor number for example if actually opening
                     // the file on the disk
                     var handle = new Buffer(4);
-                    openFiles[handleCount] = true;
+                    openFiles.add(handleCount);
                     handle.writeUInt32BE(handleCount++, 0, true);
                     sftpStream.handle(reqid, handle);
                     console.log('Opening file for write')
                 }).on('WRITE', (reqid: any, handle: any, offset: any, data: any) => {
-                    if (handle.length !== 4 || !openFiles[handle.readUInt32BE(0, true)])
+                    if (handle.length !== 4 || !openFiles.has(handle.readUInt32BE(0, true)))
                         return sftpStream.status(reqid, STATUS_CODE.FAILURE);
                     // fake the write
                     sftpStream.status(reqid, STATUS_CODE.OK);
@@ -414,9 +414,9 @@ new ssh2.Server({
                     console.log('Write to file at offset %d: %s', offset, inspected);
                 }).on('CLOSE', (reqid: any, handle: any) => {
                     var fnum: any;
-                    if (handle.length !== 4 || !openFiles[(fnum = handle.readUInt32BE(0, true))])
+                    if (handle.length !== 4 || !openFiles.has((fnum = handle.readUInt32BE(0, true))))
                         return sftpStream.status(reqid, STATUS_CODE.FAILURE);
-                    delete openFiles[fnum];
+                    openFiles.delete(fnum);
                     sftpStream.status(reqid, STATUS_CODE.OK);
                     console.log('Closing file');
                 });
diff --git a/types/ssh2/tslint.json b/types/ssh2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ssh2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sshpk/tslint.json b/types/sshpk/tslint.json
index 3db14f85ea..6a82dd0467 100644
--- a/types/sshpk/tslint.json
+++ b/types/sshpk/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODO
+		"no-unnecessary-class": false
+	}
+}
diff --git a/types/stack-mapper/tslint.json b/types/stack-mapper/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stack-mapper/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stack-trace/index.d.ts b/types/stack-trace/index.d.ts
index e25523b8ba..843d15d0dc 100644
--- a/types/stack-trace/index.d.ts
+++ b/types/stack-trace/index.d.ts
@@ -9,7 +9,6 @@ export interface StackFrame {
     getFunctionName(): string;
     getMethodName(): string;
     getFileName(): string;
-    getTypeName(): string;
     getLineNumber(): number;
     getColumnNumber(): number;
     isNative(): boolean;
diff --git a/types/stack-trace/tslint.json b/types/stack-trace/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stack-trace/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stack-utils/index.d.ts b/types/stack-utils/index.d.ts
index b8815641c5..f29a42298a 100644
--- a/types/stack-utils/index.d.ts
+++ b/types/stack-utils/index.d.ts
@@ -6,7 +6,6 @@
 
 export = StackUtils;
 
-// tslint:disable ban-types
 declare class StackUtils {
     static nodeInternals(): RegExp[];
     constructor(options?: StackUtils.Options);
diff --git a/types/stack-utils/tslint.json b/types/stack-utils/tslint.json
index 3db14f85ea..3d04da382b 100644
--- a/types/stack-utils/tslint.json
+++ b/types/stack-utils/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "ban-types": false
+    }
+}
diff --git a/types/stacktrace-js/tslint.json b/types/stacktrace-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stacktrace-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stampit/tslint.json b/types/stampit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stampit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/static-eval/tslint.json b/types/static-eval/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/static-eval/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stats.js/index.d.ts b/types/stats.js/index.d.ts
index 55b655f5bc..6449d82fd5 100644
--- a/types/stats.js/index.d.ts
+++ b/types/stats.js/index.d.ts
@@ -1,9 +1,12 @@
-// Type definitions for Stats.js 0.16.0
+// Type definitions for Stats.js 0.17.0
 // Project: https://github.com/mrdoob/stats.js
-// Definitions by: Gregory Dalton <https://github.com/gregolai>, Harm Berntsen <https://github.com/hberntsen>
+// Definitions by: Gregory Dalton <https://github.com/gregolai>,
+//                 Harm Berntsen <https://github.com/hberntsen>,
+//                 Dan Vanderkam <https://github.com/danvk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare class Stats {
+    constructor();
     REVISION: number;
     dom: HTMLDivElement;
 
@@ -14,8 +17,18 @@ declare class Stats {
     begin(): void;
     end(): number;
     update(): void;
+
+    addPanel(panel: Stats.Panel): Stats.Panel;
 }
 
-declare module "stats.js" {
+declare namespace Stats {
+    class Panel {
+        constructor(name: string, foregroundColor: string, backgroundColor: string);
+        dom: HTMLCanvasElement;
+        update(value: number, maxValue: number): void;
+    }
+}
+
+declare module 'stats.js' {
     export = Stats;
 }
diff --git a/types/stats.js/stats.js-tests.ts b/types/stats.js/stats.js-tests.ts
index dfaf72e8de..21e1e4b8e5 100644
--- a/types/stats.js/stats.js-tests.ts
+++ b/types/stats.js/stats.js-tests.ts
@@ -1,17 +1,21 @@
-
-
-var stats = new Stats();
+const stats = new Stats();
 stats.showPanel( 1 ); // 0: fps, 1: ms, 2: mb, 3+: custom
 document.body.appendChild( stats.dom );
 
+const panel = stats.addPanel(
+    new Stats.Panel('custom', 'red', 'pink'));
+
 function animate() {
 
     stats.begin();
 
     // monitored code goes here
 
+    // $ExpectType number
     stats.end();
 
+    panel.update(40, 100);
+
     requestAnimationFrame( animate );
 
 }
diff --git a/types/stats.js/tslint.json b/types/stats.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stats.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/statsd-client/index.d.ts b/types/statsd-client/index.d.ts
index 7bb83b7393..591e7e72aa 100644
--- a/types/statsd-client/index.d.ts
+++ b/types/statsd-client/index.d.ts
@@ -1,9 +1,15 @@
-// Type definitions for statsd-client v0.1.0
+// Type definitions for statsd-client v0.4.0
 // Project: https://github.com/msiebuhr/node-statsd-client
 // Definitions by: Peter Kooijmans <https://github.com/peterkooijmans>
+//                 Christopher Eck <https://github.com/chrisleck>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
+import * as express from "express";
 
+interface Tags {
+    [key: string]: string | number;
+}
 
 interface CommonOptions {
     /**
@@ -16,6 +22,13 @@ interface CommonOptions {
      */
     debug?: boolean;
 
+    /**
+     * Object of string key/value pairs which will be appended on 
+     * to all StatsD payloads (excluding raw payloads)
+     * (default {})
+     */
+    tags?: Tags;
+
     /**
      * User specifically wants to use tcp (default false)
      */
@@ -79,24 +92,53 @@ interface HttpOptions extends CommonOptions {
     method?: string;
 }
 
+interface ExpressMiddlewareOptions {
+    /**
+     * Metric name to use for reporting if a matching route is not
+     * found (default "unknown_express_route").
+     */
+    notFoundRouteName?: string;
+
+    /**
+     * Optional callback called after reporting metrics for an
+     * express route.
+     */
+    onResponseEnd?: (client: StatsdClient, startTime: Date, req: express.Request, res: express.Response) => void;
+
+    /**
+     * Enables inclusion of per-URL response code and timing
+     * metrics (default false).
+     */
+    timeByUrl?: boolean;
+}
+
 declare class StatsdClient {
     constructor(options: TcpOptions | UdpOptions | HttpOptions);
 
-    counter(metric: string, delta: number): void;
-    increment(metric: string, delta?: number): void;
-    decrement(metric: string, delta?: number): void;
+    counter(metric: string, delta: number, tags?: Tags): this;
+    increment(metric: string, delta?: number, tags?: Tags): this;
+    decrement(metric: string, delta?: number, tags?: Tags): this;
 
-    gauge(name: string, value: number): void;
-    gaugeDelta(name: string, delta: number): void;
+    gauge(name: string, value: number, tags?: Tags): this;
+    gaugeDelta(name: string, delta: number, tags?: Tags): this;
 
-    set(name: string, value: number): void;
+    set(name: string, value: number, tags?: Tags): this;
 
-    timing(name: string, start: Date): void;
-    timing(name: string, duration: number): void;
+    timing(name: string, startOrDuration: Date | number, tags?: Tags): this;    
 
-    close(): void;
+    histogram(name: string, value: number, tags?: Tags): this;
+
+    raw(rawData: string): this;
+
+    close(): this;
 
     getChildClient(name: string): StatsdClient;
+
+    formatTags(tags?: Tags): string;
+
+    helpers: {
+        getExpressMiddleware(prefix?: string, options?: ExpressMiddlewareOptions): express.RequestHandler;
+    };
 }
 
 declare namespace StatsdClient {}
diff --git a/types/statsd-client/statsd-client-tests.ts b/types/statsd-client/statsd-client-tests.ts
index d8490448a5..205b28b851 100644
--- a/types/statsd-client/statsd-client-tests.ts
+++ b/types/statsd-client/statsd-client-tests.ts
@@ -1,9 +1,9 @@
 
 import SDC = require("statsd-client");
 
-var sdc = new SDC( { host: 'statsd.example.com' });
+let sdc = new SDC( { host: 'statsd.example.com' });
 
-var timer = new Date();
+const timer = new Date();
 sdc.increment('some.counter'); // Increment by one.
 sdc.gauge('some.gauge', 10); // Set gauge to 10
 sdc.timing('some.timer', timer); // Calculates time diff
@@ -11,12 +11,16 @@ sdc.timing('some.timer', timer); // Calculates time diff
 sdc.close(); // Optional - stop NOW
 
 // Initialization
-sdc = new SDC({host: 'statsd.example.com', port: 8124, debug: true});
+sdc = new SDC({host: 'statsd.example.com', port: 8124, debug: true, tags: {foo: 'bar'}});
 
 // Counting stuff
 sdc.increment('systemname.subsystem.value'); // Increment by one
 sdc.decrement('systemname.subsystem.value', -10); // Decrement by 10
 sdc.counter('systemname.subsystem.value', 100); // Increment by 100
+sdc.increment('systemname.subsystem.value.tagged', 1, {biz: 'baz'}); // Increment tagged metric by one
+sdc.decrement('systemname.subsystem.value.tagged', -10, {biz: 'baz'}); // Decrement tagged metric  by 10
+sdc.counter('systemname.subsystem.value.tagged', 100, {biz: 'baz'}); // Increment tagged metric  by 100
+
 
 // Gauges
 sdc.gauge('what.you.gauge', 100);
@@ -24,17 +28,37 @@ sdc.gaugeDelta('what.you.gauge', 20);  // Will now count 120
 sdc.gaugeDelta('what.you.gauge', -70); // Will now count 50
 sdc.gauge('what.you.gauge', 10);       // Will now count 10
 
+sdc.gauge('what.you.gauge.tagged', 100, {biz: 'baz'});
+sdc.gaugeDelta('what.you.gauge.tagged', 20, {biz: 'baz'});  // Will now count 120
+sdc.gaugeDelta('what.you.gauge.tagged', -70, {biz: 'baz'}); // Will now count 50
+sdc.gauge('what.you.gauge.tagged', 10, {biz: 'baz'});       // Will now count 10
+
 // Set
 sdc.set('your.set', 200);
+sdc.set('your.set.tagged', 200, {biz: 'baz'});
 
 // Timeouts
-var start = new Date();
+let start = new Date();
 setTimeout(function () {
     sdc.timing('random.timeout', start);
 }, 100 * Math.random());
 
+setTimeout(function () {
+    sdc.timing('random.timeout.tagged', start, {biz: 'baz'});
+}, 100 * Math.random());
+
+// Histogram
+sdc.histogram('histogram.stuff', 40);
+sdc.histogram('histogram.stuff', 44, {biz: 'baz'});
+
+// Raw string output
+sdc.raw('my.metric:123|g');
+
+// Internal tags formatting
+sdc.formatTags({biz: 'baz'});
+
 // Stopping gracefully
-var start = new Date();
+start = new Date();
 setTimeout(function () {
     sdc.timing('random.timeout', start); // 2 - implicitly re-creates socket.
     sdc.close(); // 3 - Closes socket after last use.
@@ -43,14 +67,17 @@ sdc.close(); // 1 - Closes socket early.
 
 // Prefix magic
 // Create generic client
-var sdc = new SDC({host: 'statsd.example.com', prefix: 'systemname'});
+sdc = new SDC({host: 'statsd.example.com', prefix: 'systemname'});
 sdc.increment('foo'); // Increments 'systemname.foo'
 // ... do great stuff ...
 
 // Subsystem A
-var sdcA = sdc.getChildClient('a');
+const sdcA = sdc.getChildClient('a');
 sdcA.increment('foo'); // Increments 'systemname.a.foo'
 
 // Subsystem B
-var sdcB = sdc.getChildClient('b');
+const sdcB = sdc.getChildClient('b');
 sdcB.increment('foo'); // Increments 'systemname.b.foo'
+
+// Express middleware helper
+sdc.helpers.getExpressMiddleware('express.metrics', {timeByUrl: true}); // Returns an express handler
diff --git a/types/statsd-client/tslint.json b/types/statsd-client/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/statsd-client/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/status-bar/README.md b/types/status-bar/README.md
deleted file mode 100644
index 91b72cc583..0000000000
--- a/types/status-bar/README.md
+++ /dev/null
@@ -1 +0,0 @@
-***NOTE:*** *This package is deprecated and new versions have been merged into [`@types/atom`](https://www.npmjs.com/package/@types/atom). The most recent version can be accessed as part of the `Atom.Services` namespace.*
diff --git a/types/status-bar/index.d.ts b/types/status-bar/index.d.ts
deleted file mode 100644
index 116e045dbe..0000000000
--- a/types/status-bar/index.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for status-bar
-// Project: https://github.com/atom/status-bar
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="space-pen" />
-/// <reference types="text-buffer/v0" />
-
-declare namespace StatusBar {
-	interface IStatusBarViewStatic {
-		content():any;
-
-		new(...args:any[]):IStatusBarView;
-	}
-
-	interface IStatusBarView extends View {
-
-		initialize():any;
-		attach():any;
-		destroy():any;
-		appendLeft(view:View):any;
-		prependLeft(view:View):any;
-		appendRight(view:View):any;
-		prependRight(view:View):any;
-		getActiveBuffer():TextBuffer.ITextBuffer;
-		getActiveItem():any;
-		storeActiveBuffer():TextBuffer.ITextBuffer;
-		subscribeToBuffer(event:string, callback:Function):any;
-		subscribeAllToBuffer():any[];
-		unsubscribeAllFromBuffer():any[];
-	}
-}
diff --git a/types/status-bar/status-bar-tests.ts b/types/status-bar/status-bar-tests.ts
deleted file mode 100644
index 7a1448b9ec..0000000000
--- a/types/status-bar/status-bar-tests.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-declare var StatusBarView:StatusBar.IStatusBarViewStatic;
-
-StatusBarView.content();
-
-var statusBar = new StatusBarView();
-statusBar.appendLeft(new View());
diff --git a/types/status-bar/tsconfig.json b/types/status-bar/tsconfig.json
deleted file mode 100644
index 14756934ad..0000000000
--- a/types/status-bar/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "status-bar-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/steam/tslint.json b/types/steam/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/steam/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stemmer/index.d.ts b/types/stemmer/index.d.ts
new file mode 100644
index 0000000000..60bcf6ae22
--- /dev/null
+++ b/types/stemmer/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for stemmer 1.0
+// Project: https://github.com/wooorm/stemmer#readme
+// Definitions by: Will Ockmore <https://github.com/will-ockmore>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function stemmer(value: string): string;
+
+export = stemmer;
diff --git a/types/stemmer/stemmer-tests.ts b/types/stemmer/stemmer-tests.ts
new file mode 100644
index 0000000000..db9f19d996
--- /dev/null
+++ b/types/stemmer/stemmer-tests.ts
@@ -0,0 +1,3 @@
+import stemmer = require('stemmer');
+
+stemmer('Working');  // $ExpectType string
diff --git a/types/stemmer/tsconfig.json b/types/stemmer/tsconfig.json
new file mode 100644
index 0000000000..7224a39eb8
--- /dev/null
+++ b/types/stemmer/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stemmer-tests.ts"
+    ]
+}
diff --git a/types/stemmer/tslint.json b/types/stemmer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stemmer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sticky-cluster/index.d.ts b/types/sticky-cluster/index.d.ts
new file mode 100644
index 0000000000..7d51cad34f
--- /dev/null
+++ b/types/sticky-cluster/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for sticky-cluster 0.3
+// Project: https://github.com/uqee/sticky-cluster
+// Definitions by: Austin Turner <https://github.com/paustint>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node"/>
+import * as http from 'http';
+
+declare namespace stickyCluster {
+    type InitializeFn = (callback: Callback) => void;
+    type Callback = (server: http.Server) => void;
+    interface Options {
+        concurrency?: number;
+        port?: number;
+        debug?: boolean;
+        prefix?: string;
+        env?: (index: number) => { stickycluster_worker_index: number };
+        hardShutdownDelay?: number;
+        errorHandler?: (err: any) => void;
+    }
+}
+
+declare function stickyCluster(callback: stickyCluster.InitializeFn, options?: stickyCluster.Options): void;
+export = stickyCluster;
diff --git a/types/sticky-cluster/sticky-cluster-tests.ts b/types/sticky-cluster/sticky-cluster-tests.ts
new file mode 100644
index 0000000000..e730275d78
--- /dev/null
+++ b/types/sticky-cluster/sticky-cluster-tests.ts
@@ -0,0 +1,34 @@
+import stickyCluster = require('sticky-cluster');
+import * as express from 'express';
+import * as http from 'http';
+
+/** test with all params */
+stickyCluster(
+    (callback) => {
+        const app = express();
+        const server = http.createServer(app);
+
+        // don't do server.listen(), just pass the server instance into the callback
+        callback(server);
+    },
+    {
+        prefix: 'sticky-cluster:',
+        concurrency: 10,
+        port: 3000,
+        debug: true,
+        hardShutdownDelay: 60 * 1000,
+        env: (index) => ({ stickycluster_worker_index: index }),
+        errorHandler: (err) => { console.log(err); process.exit(1); }
+    }
+);
+
+/** test with no params */
+stickyCluster(
+    (callback) => {
+        const app = express();
+        const server = http.createServer(app);
+
+        // don't do server.listen(), just pass the server instance into the callback
+        callback(server);
+    }
+);
diff --git a/types/sticky-cluster/tsconfig.json b/types/sticky-cluster/tsconfig.json
new file mode 100644
index 0000000000..dcfc338f93
--- /dev/null
+++ b/types/sticky-cluster/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sticky-cluster-tests.ts"
+    ]
+}
diff --git a/types/sticky-cluster/tslint.json b/types/sticky-cluster/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sticky-cluster/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stompjs/tslint.json b/types/stompjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stompjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/storejs/tslint.json b/types/storejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/storejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/storejs/v1/tslint.json b/types/storejs/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/storejs/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/storybook__addon-backgrounds/index.d.ts b/types/storybook__addon-backgrounds/index.d.ts
new file mode 100644
index 0000000000..c76a6d160e
--- /dev/null
+++ b/types/storybook__addon-backgrounds/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for @storybook/addon-backgrounds 3.2
+// Project: https://github.com/storybooks/storybook
+// Definitions by: HyunSeob <https://github.com/hyunseob>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { StoryDecorator } from '@storybook/react';
+
+export interface Background {
+    name: string;
+    value: string;
+    default?: boolean;
+}
+
+declare function backgrounds(backgrounds: Background[]): StoryDecorator;
+
+export default backgrounds;
diff --git a/types/storybook__addon-backgrounds/storybook__addon-backgrounds-tests.tsx b/types/storybook__addon-backgrounds/storybook__addon-backgrounds-tests.tsx
new file mode 100644
index 0000000000..d68d9b146a
--- /dev/null
+++ b/types/storybook__addon-backgrounds/storybook__addon-backgrounds-tests.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import backgrounds from '@storybook/addon-backgrounds';
+
+storiesOf('Text', module)
+    .addDecorator(
+        backgrounds([
+            {
+                name: 'white',
+                value: '#fff',
+                default: true
+            },
+            {
+                name: 'black',
+                value: '#000'
+            }
+        ])
+    )
+    .add('default', () => <p>This is just sample.</p>);
diff --git a/types/storybook__addon-backgrounds/tsconfig.json b/types/storybook__addon-backgrounds/tsconfig.json
new file mode 100644
index 0000000000..cfc58e4a8c
--- /dev/null
+++ b/types/storybook__addon-backgrounds/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@storybook/addon-backgrounds": [
+                "storybook__addon-backgrounds"
+            ],
+            "@storybook/react": [
+                "storybook__react"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addon-backgrounds-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/storybook__addon-backgrounds/tslint.json b/types/storybook__addon-backgrounds/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__addon-backgrounds/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__addon-info/index.d.ts b/types/storybook__addon-info/index.d.ts
index 68179af293..c42c8d359a 100644
--- a/types/storybook__addon-info/index.d.ts
+++ b/types/storybook__addon-info/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for @storybook/addon-info 3.2
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Mark Kornblum <https://github.com/mkornblum>
+//                 Mattias Wikstrom <https://github.com/fyrkant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -18,7 +19,7 @@ export interface Options {
   header?: boolean;
   inline?: boolean;
   source?: boolean;
-  propTables?: JSX.Element[];
+  propTables?: JSX.Element[] | false;
   propTablesExclude?: JSX.Element[];
   styles?: object;
   marksyConf?: object;
@@ -29,3 +30,5 @@ export interface Options {
 }
 
 export function withInfo(textOrOptions: string | Options): (storyFn: RenderFunction) => () => React.ReactElement<WrapStoryProps>;
+
+export function setDefaults(newDefaults: Options): Options;
diff --git a/types/storybook__addon-info/storybook__addon-info-tests.tsx b/types/storybook__addon-info/storybook__addon-info-tests.tsx
index 562727c6fa..b51a48c4cc 100644
--- a/types/storybook__addon-info/storybook__addon-info-tests.tsx
+++ b/types/storybook__addon-info/storybook__addon-info-tests.tsx
@@ -2,10 +2,15 @@
 
 import * as React from 'react';
 import { storiesOf } from '@storybook/react';
-import { withInfo } from '@storybook/addon-info';
+import { setDefaults, withInfo } from '@storybook/addon-info';
 
 const { Component } = React;
 
+setDefaults({
+    inline: false,
+    propTables: false
+});
+
 storiesOf('Component', module)
   .add('simple info',
        withInfo('doc string about my component')(() =>
diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index c202d2d845..c2f8c954ec 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -37,8 +37,10 @@ export function color(name: string, value: string): string;
 
 export function object<T>(name: string, value: T): T;
 
-export function select<T>(name: string, options: { [s: string]: T }, value: string): T;
-export function select(name: string, options: string[], value: string): string;
+export type SelectValue = string | number;
+export function select<T extends string>(name: string, options: { [s: string]: string }, value: T): T;
+export function select<T extends number>(name: string, options: { [s: number]: string }, value: T): T;
+export function select<T extends SelectValue>(name: string, options: T[], value: T): T;
 
 export function date(name: string, value?: Date): Date;
 
diff --git a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
index dba68729fe..9e1c1dbd6b 100644
--- a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
+++ b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
@@ -14,6 +14,11 @@ import {
   knob,
 } from '@storybook/addon-knobs';
 
+enum SomeEnum {
+  Type1 = 1,
+  Type2
+}
+
 const stories = storiesOf('Example of Knobs', module);
 
 stories.addDecorator(withKnobs);
@@ -39,9 +44,18 @@ stories.add('with all knobs', () => {
   });
 
   const genericObject: string = object<string>('Some generic object', 'value');
+
   type X = 'a' | 'b';
-  const genericSelect: X = select<X>('Some generic select', { a: 'a', b: 'b'}, 'b');
+
+  const genericSelect: X = select<X>('Some generic select', { a: 'type a', b: 'type b'}, 'b');
+
+  const enumSelectOptions: { [s: number]: string } = {};
+  enumSelectOptions[SomeEnum.Type1] = "Type 1";
+  enumSelectOptions[SomeEnum.Type2] = "Type 2";
+  const genericSelect2: SomeEnum = select<SomeEnum>('Some generic select', enumSelectOptions, SomeEnum.Type1);
+
   const genericArray: string[] = array<string>('Some generic array', ['red', 'green', 'blue']);
+
   const genericKnob: X = knob<X>('Some generic knob', { value: 'a', type: 'text' });
 
   const style = {
diff --git a/types/storybook__addon-notes/index.d.ts b/types/storybook__addon-notes/index.d.ts
index 4ba96ed38f..7e9e94746e 100644
--- a/types/storybook__addon-notes/index.d.ts
+++ b/types/storybook__addon-notes/index.d.ts
@@ -1,10 +1,13 @@
-// Type definitions for @storybook/addon-notes 3.0
+// Type definitions for @storybook/addon-notes 3.3
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
+import { RenderFunction } from '@storybook/react';
+
+export function withNotes(textOrOptions: string | object): (getStory: RenderFunction) => RenderFunction;
 
 export interface WithNotesProps extends React.HTMLProps<HTMLDivElement> {
     notes?: string;
diff --git a/types/storybook__addon-notes/storybook__addon-notes-tests.tsx b/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
index efd71d9771..2ad783cc5d 100644
--- a/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
+++ b/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
@@ -1,11 +1,16 @@
 import * as React from 'react';
 
 import { storiesOf } from '@storybook/react';
-import { WithNotes } from '@storybook/addon-notes';
+import { withNotes, WithNotes } from '@storybook/addon-notes';
 
 storiesOf('Component', module)
   .add('with some emoji', () => (
     <WithNotes notes={'A very simple component'}>
       my component
     </WithNotes>
-  ));
+  ))
+  .add('with withNotes',
+    withNotes('A very simple component')(
+      () => (<div>my component</div>)
+    )
+  );
diff --git a/types/storybook__react/index.d.ts b/types/storybook__react/index.d.ts
index 1228124376..dd93b9459b 100644
--- a/types/storybook__react/index.d.ts
+++ b/types/storybook__react/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for @storybook/react 3.0
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
+//                 Anton Izmailov <https://github.com/wapgear>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -9,7 +10,7 @@
 import * as React from 'react';
 
 export type Renderable = React.ComponentType | JSX.Element;
-export type RenderFunction = () => Renderable;
+export type RenderFunction = () => Renderable | Renderable[];
 
 export type StoryDecorator = (story: RenderFunction, context: { kind: string, story: string }) => Renderable | null;
 
diff --git a/types/storybook__react/storybook__react-tests.tsx b/types/storybook__react/storybook__react-tests.tsx
index 13cf6aff50..9e7b8f5723 100644
--- a/types/storybook__react/storybook__react-tests.tsx
+++ b/types/storybook__react/storybook__react-tests.tsx
@@ -6,7 +6,8 @@ const Decorator = (story: RenderFunction) => <div>{story()}</div>;
 storiesOf('Welcome', module)
     // local addDecorator
     .addDecorator(Decorator)
-    .add('to Storybook', () => <div/>);
+    .add('to Storybook', () => <div/>)
+    .add('to Storybook as Array', () => [<div />, <div />]);
 
 // global addDecorator
 addDecorator(Decorator);
@@ -26,6 +27,7 @@ storiesOf<AnyAddon>('withAnyAddon', module)
     .addWithSideEffect('custom story', () => <div/>)
     .addWithSideEffect('more', () => <div/>)
     .add('another story', () => <div/>)
+    .add('to Storybook as Array', () => [<div />, <div />])
     .addWithSideEffect('even more', () => <div/>);
 
 // configure
diff --git a/types/stream-meter/tslint.json b/types/stream-meter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stream-meter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stream-series/tslint.json b/types/stream-series/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stream-series/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/streamjs/tslint.json b/types/streamjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/streamjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/strftime/tslint.json b/types/strftime/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/strftime/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/string-hash/tslint.json b/types/string-hash/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/string-hash/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/string-similarity/string-similarity-tests.ts b/types/string-similarity/string-similarity-tests.ts
index 216c1dedf2..1e5003522c 100644
--- a/types/string-similarity/string-similarity-tests.ts
+++ b/types/string-similarity/string-similarity-tests.ts
@@ -9,16 +9,11 @@ const match: stringSimilarity.BestMatch = stringSimilarity.findBestMatch('Olive-
 ]);
 
 // ratings accessible
-for (const rating of match.ratings){
-    isString(rating.target);
-    isNumber(rating.rating);
+for (const rating of match.ratings) {
+    rating.target; // $ExpectType string
+    rating.rating; // $ExpectType number
 }
 
 // bestMatch accessible
 match.bestMatch.rating;
 match.bestMatch.target;
-
-function isString(x: string): void {
-}
-function isNumber(x: number): void {
-}
diff --git a/types/string-template/tslint.json b/types/string-template/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/string-template/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/string/tslint.json b/types/string/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/string/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/string_score/tslint.json b/types/string_score/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/string_score/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/strip-json-comments/tslint.json b/types/strip-json-comments/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/strip-json-comments/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stripe-node/index.d.ts b/types/stripe-node/index.d.ts
deleted file mode 100644
index 9bf45d3411..0000000000
--- a/types/stripe-node/index.d.ts
+++ /dev/null
@@ -1,6565 +0,0 @@
-// Type definitions for stripe-node 4.7.0
-// Project: https://github.com/stripe/stripe-node/
-// Definitions by: William Johnston <https://github.com/wjohnsto>, Peter Harris <https://github.com/codeanimal>, Sampson Oliver <https://github.com/sampsonjoliver> 
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-declare module 'stripe' {
-    var out: StripeNode.StripeExport;
-    export = out;
-}
-
-declare namespace StripeNode {
-    interface StripeExport extends StripeStatic {
-        new (apiKey: string, version?: string): Stripe;
-        (apiKey: string, version?: string): Stripe;
-    }
-
-    interface StripeStatic {
-        DEFAULT_HOST: string;
-        DEFAULT_PORT: string;
-        DEFAULT_BASE_PATH: string;
-        DEFAULT_API_VERSION: string;
-        DEFAULT_TIMEOUT: number;
-        PACKAGE_VERSION: string;
-        USER_AGENT: {
-            bindings_version: string;
-            lang: string;
-            lang_version: string;
-            platform: string;
-            publisher: string;
-            uname: string;
-        };
-        USER_AGENT_SERIALIZED: string;
-
-        resources: typeof resources;
-        StripeResource: typeof StripeResource;
-    }
-
-    // Helper
-    type IBankAccount = bankAccounts.IBankAccount;
-    type ICard = cards.ICard;
-
-    interface Stripe extends StripeStatic {
-        accounts: resources.Accounts;
-        balance: resources.Balance;
-        charges: resources.Charges;
-        coupons: resources.Coupons;
-        customers: resources.Customers;
-        disputes: resources.Disputes;
-        events: resources.Events;
-        invoices: resources.Invoices;
-        invoiceItems: resources.InvoiceItems;
-        plans: resources.Plans;
-        /**
-         * @deprecated
-         */
-        recipientCards: resources.RecipientCards;
-        /**
-         * @deprecated
-         */
-        recipients: resources.Recipients;
-        subscriptions: resources.Subscriptions;
-        tokens: resources.Tokens;
-        transfers: resources.Transfers;
-        applicationFees: resources.ApplicationFees;
-        fileUploads: resources.FileUploads;
-        bitcoinReceivers: resources.BitcoinReceivers;
-        refunds: resources.Refunds;
-        countrySpecs: resources.CountrySpecs;
-        orders: resources.Orders;
-        products: resources.Products;
-        skus: resources.SKUs;
-        webhooks: resources.WebHooks;
-        
-        setHost(host: string): void;
-        setHost(host: string, port: string|number): void;
-        setHost(host: string, port: string|number, protocol: string): void;
-
-        setProtocol(protocol: string): void;
-        setPort(port: string|number): void;
-        setApiVersion(version?: string): void;
-        setApiKey(key?: string): void;
-        setTimeout(timeout?: number): void;
-        setHttpAgent(agent: string): void;
-        getConstant(c: string): any;
-        getClientUserAgent(response: (userAgent: string) => void): void;
-    }
-
-    namespace accounts {
-        interface IAccount extends IResourceObject, IAccountShared {
-            /**
-             * Value is "account"
-             */
-            object: string;
-
-            /**
-             * Whether or not the account can create live charges
-             */
-            charges_enabled: boolean;
-
-            /**
-             * The country of the account
-             */
-            country: string;
-
-            /**
-             * Whether or not account details have been submitted yet. Standalone
-             * accounts cannot receive transfers before this is true.
-             */
-            details_submitted: boolean;
-
-            /**
-             * The display name for this account. This is used on the Stripe dashboard to
-             * help you differentiate between accounts.
-             */
-            display_name: string;
-
-            /**
-             * Whether or not Stripe will send automatic transfers for this account. This
-             * is only false when Stripe is waiting for additional information from the
-             * account holder.
-             */
-            transfers_enabled: boolean;
-
-            /**
-             * The state of the account’s information requests, including what
-             * information is needed and by when it must be provided.
-             */
-            verification: {
-                /**
-                 * A string describing the reason for this account being unable to charge
-                 * and/or transfer, if that is the case. Possible values are "rejected.fraud",
-                 * "rejected.terms_of_service", "rejected.listed", "rejected.other",
-                 * "fields_needed", "listed", or "other".
-                 */
-                disabled_reason: string;
-
-                /**
-                 * At what time the fields_needed must be provided. If this date is in
-                 * the past, the account is already in bad standing, and providing
-                 * fields_needed is necessary to re-enable transfers and prevent other
-                 * consequences. If this date is in the future, fields_needed must be
-                 * provided to ensure the account remains in good standing.
-                 */
-                due_by: number;
-
-                /**
-                 * Field names that need to be provided for the account to remain in good
-                 * standing. Nested fields are separated by "." (for example,
-                 * "legal_entity.first_name").
-                 */
-                fields_needed: Array<string>;
-            }
-        }
-
-        interface IAccountCreationOptions extends IAccountUpdateOptions {
-            /**
-             * The country the account holder resides in or that the business is legally
-             * established in. For example, if you are in the United States and the
-             * business you’re creating an account for is legally represented in Canada,
-             * you would use “CA� as the country for the account being created.
-             */
-            country?: string;
-
-            /**
-             * The email address of the account holder. For standalone accounts, Stripe
-             * will email your user with instructions for how to set up their account. For
-             * managed accounts, this is only to make the account easier to identify to
-             * you: Stripe will never directly reach out to your users.
-             */
-            email: string;
-
-            /**
-             * Whether you'd like to create a managed or standalone account. Managed
-             * accounts have extra parameters available to them, and require that you,
-             * the platform, handle all communication with the account holder.
-             * Standalone accounts are normal Stripe accounts: Stripe will email the
-             * account holder to setup a username and password, and handle all account
-             * management directly with them.
-             */
-            managed?: boolean;
-        }
-
-        interface IAccountShared {
-            business_logo?: string;
-
-            /**
-             * The publicly sharable name for this account
-             */
-            business_name?: string;
-
-            /**
-             * A CSS hex color value representing the primary branding color for this
-             * account
-             */
-            business_primary_color?: string;
-
-            /**
-             * The URL that best shows the service or product provided for this account
-             */
-            business_url?: string;
-
-            /**
-             * A boolean for whether or not Stripe should try to reclaim negative
-             * balances from the account holder’s bank account. See our managed
-             * account bank transfer guide for more information
-             */
-            debit_negative_balances?: boolean;
-
-            /**
-             * Account-level settings to automatically decline certain types of charges
-             * regardless of the bank’s decision.
-             */
-            decline_charge_on?: {
-                /**
-                 * Whether or not Stripe should automatically decline charges with an
-                 * incorrect zip/postal code. This setting only applies if a card includes a
-                 * zip code and the bank specifically marks it as failed.
-                 */
-                avs_failure?: boolean;
-
-                /**
-                 * Whether or not Stripe should automatically decline charges with an
-                 * incorrect CVC. This setting only applies if a card includes a CVC and the
-                 * bank specifically marks it as failed.
-                 */
-                cvc_failure?: boolean;
-            };
-
-            /**
-             * Three-letter ISO currency code representing the default currency for the
-             * account. This must be a currency that Stripe supports in the account’s
-             * country.
-             */
-            default_currency?: string;
-
-            /**
-             * Email address of the account holder. For standalone accounts, this is used
-             * to email them asking them to claim their Stripe account. For managed
-             * accounts, this is only to make the account easier to identify to you: Stripe
-             * will not email the account holder.
-             */
-            email?: string;
-
-            /**
-             * Information about the holder of this account, i.e. the user receiving funds
-             * from this account
-             */
-            legal_entity?: {}; //TODO: Implement this type definition.
-
-            /**
-             * A set of key/value pairs that you can attach to an account object. It can be
-             * useful for storing additional information about the account in a structured
-             * format. This can be unset by updating the value to null and then saving.
-             */
-            metadata?: IMetadata;
-
-            /**
-             * Internal-only description of the product being sold or service being
-             * provided by this account. It’s used by Stripe for risk and underwriting
-             * purposes.
-             */
-            product_description?: string;
-
-            /**
-             * The text that will appear on credit card statements by default if a charge is
-             * being made directly on the account.
-             */
-            statement_descriptor?: string;
-
-            /**
-             * A publicly shareable email address that can be reached for support for this
-             * account
-             */
-            support_email?: string;
-
-            /**
-             * A publicly shareable phone number that can be reached for support for
-             * this account
-             */
-            support_phone?: string;
-
-            /**
-             * A publicly shareable URL that can be reached for support for this account
-             */
-            support_url?: string;
-
-            /**
-             * Details on who accepted the Stripe terms of service, and when they
-             * accepted it. See our updating managed accounts guide for more
-             * information
-             */
-            tos_acceptance?: {
-                /**
-                 * The unix timestamp that Stripe’s terms of service were agreed to by the
-                 * account holder
-                 */
-                date: number;
-
-                /**
-                 * The IP address from which Stripe’s terms of service were agreed to by the account holder
-                 */
-                ip?: string;
-
-                /**
-                 * The user agent of the browser from which Stripe’s terms of service
-                 * were agreed to by the account holder
-                 */
-                user_agent?: string;
-            };
-
-            /**
-             * Details on when this account will make funds from charges available, and
-             * when they will be paid out to the account holder’s bank account. See our
-             * managed account bank transfer guide for more information
-             */
-            transfer_schedule?: {
-                /**
-                 * The number of days charges for the account will be held before being
-                 * paid out. May also be the string “minimum� for the lowest available
-                 * value (based on country). Default is “minimum�. Does not apply when
-                 * interval is “manual�.
-                 */
-                delay_days?: number | string;
-
-                /**
-                 * How frequently funds will be paid out. One of "manual" (for only
-                 * triggered via API call), "daily", "weekly", or "monthly". Default is "daily".
-                 */
-                interval?: string;
-
-                /**
-                 * The day of the month funds will be paid out. Required and available
-                 * only if interval is "monthly".
-                 */
-                monthly_anchor?: number;
-
-                /**
-                 * The day of the week funds will be paid out, of the style ‘monday’,
-                 * ‘tuesday’, etc. Required and available only if interval is weekly.
-                 */
-                weekly_anchor?: string;
-            }
-        }
-
-        interface IAccountUpdateOptions extends IDataOptions, IAccountShared {
-            /**
-             * A card or bank account to attach to the account. You can provide either a
-             * token, like the ones returned by Stripe.js, or a dictionary as documented in
-             * the external_account parameter for either card or bank account creation.
-             *
-             * This will create a new external account object, make it the new default
-             * external account for its currency, and delete the old default if one exists. If
-             * you want to add additional external accounts instead of replacing the
-             * existing default for this currency, use the bank account or card creation
-             * API.
-             */
-            external_account?: {
-                /**
-                 * The type of external account. Should be "bank_account".
-                 */
-                object: string;
-
-                /**
-                 * The account number for the bank account in string form. Must be a
-                 * checking account.
-                 */
-                account_number: string;
-
-                /**
-                 * The country the bank account is in.
-                 */
-                country: string;
-
-                /**
-                 * The currency the bank account is in. This must be a country/currency
-                 * pairing that Stripe supports.
-                 */
-                currency: string;
-
-                /**
-                 * The name of the person or business that owns the bank account. This
-                 * field is required when attaching the bank account to a customer object.
-                 */
-                account_holder_name?: string;
-
-                /**
-                 * The type of entity that holds the account. This can be either
-                 * "individual" or "company". This field is required when attaching the
-                 * bank account to a customer object.
-                 */
-                account_holder_type?: string;
-
-                /**
-                 * The routing number, sort code, or other country-appropriate institution
-                 * number for the bank account. For US bank accounts, this is required
-                 * and should be the ACH routing number, not the wire routing number. If
-                 * you are providing an IBAN for account_number, this field is not
-                 * required.
-                 */
-                routing_number?: string;
-            }
-        }
-
-        interface IExternalAccountCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * When adding a card to a customer, the parameter name is source. When
-             * adding to an account, the parameter name is external_account. The
-             * value can either be a token, like the ones returned by our Stripe.js, or a
-             * dictionary containing a user’s credit card details (with the options shown
-             * below). Stripe will automatically validate the card.
-             */
-            external_account: string ;
-
-            /**
-             * Only applicable on accounts (not customers or recipients). If you set this to true (or if this is the first external account being added
-             * in this currency) this card will become the default external account for its currency.
-             */
-            default_for_currency?: boolean;
-        }
-
-        interface IExternalAccountUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * If set to true, this bank account will become the default external account for its currency.
-             */
-            default_for_currency?: boolean;
-        }
-
-        interface IBankAccountListOptions extends IListOptions {
-            object: "bank_account"
-        }
-
-        interface ICardListOptions extends IListOptions {
-            object: "card"
-        }
-
-        interface IRejectReason {
-            /**
-             * The reason for rejecting the account. May be one of "fraud",
-             * "terms_of_service", or "other".
-             */
-            reason: "fraud" | "terms_of_service" | "other" ;
-        }
-    }
-
-    namespace applicationFees {
-        interface IApplicationFee extends IResourceObject {
-            /**
-             * Value is "application_fee"
-             */
-            object: string;
-
-            /**
-             * ID of the Stripe account this fee was taken from. [Expandable]
-             */
-            account: string | accounts.IAccount;
-
-            /**
-             * Amount earned, in cents/pence.
-             */
-            amount: number;
-
-            /**
-             * Positive integer or zero
-             */
-            amount_refunded: number;
-
-            /**
-             * ID of the Connect Application that earned the fee. [Expandable]
-             */
-            application: string; //TODO: Implement IApplication interface and reference type here for expansion:- "string | IApplication"
-
-            /**
-             * Balance transaction that describes the impact of this collected application
-             * fee on your account balance (not including refunds). [Expandable]
-             */
-            balance_transaction: string | balance.IBalanceTransaction;
-
-            /**
-             * ID of the charge that the application fee was taken from. [Expandable]
-             */
-            charge: string | charges.ICharge;
-
-            created: number;
-
-            /**
-             * Three-letter ISO code representing the currency of the charge.
-             */
-            currency: string;
-
-            livemode: boolean;
-
-            /**
-             * ID of the corresponding charge on the platform account, if this fee was the
-             * result of a charge using the destination parameter. [Expandable]
-             */
-            originating_transaction: string;
-
-            /**
-             * Whether or not the fee has been fully refunded. If the fee is only partially
-             * refunded, this attribute will still be false.
-             */
-            refunded: boolean;
-
-            /**
-             * A list of refunds that have been applied to the fee.
-             */
-            refunds: IApplicationFeeRefunds;
-        }
-
-        interface IApplicationFeeListOptions extends IListOptionsCreated {
-            /**
-             * Only return application fees for the charge specified by this charge ID.
-             */
-            charge: string;
-        }
-
-        interface IApplicationFeeRefund extends IResourceObject {
-            /**
-             * Value is "fee_refund"
-             */
-            object:string;
-
-            /**
-             * Amount, in cents/pence.
-             */
-            amount: number;
-
-            /**
-             * Balance transaction that describes the impact on your account balance.
-             */
-            balance_transaction: string | balance.IBalanceTransaction;
-
-            created: number;
-
-            /**
-             * Three-letter ISO code representing the currency.
-             */
-            currency: string;
-
-            /**
-             * ID of the application fee that was refunded.
-             */
-            fee: string | IApplicationFee;
-
-            /**
-             * A set of key/value pairs that you can attach to the object. It can be useful
-             * for storing additional information in a structured format.
-             */
-            metadata: IMetadata;
-        }
-
-        interface IApplicationFeeRefunds extends IList<IApplicationFeeRefund>, resources.ApplicationFeeRefunds { }
-
-        interface IApplicationFeeRefundCreationOptions extends IDataOptions {
-            /**
-             * A positive integer in pence representing how much of this fee to refund.
-             * Can only refund up to the unrefunded amount remaining of the fee.
-             *
-             * default is entire application fee
-             */
-            amount?: number;
-
-            /**
-             * A set of key/value pairs that you can attach to a refund object. It can be
-             * useful for storing additional information about the refund in a structured
-             * format. You can unset an individual key by setting its value to null and
-             * then saving. To clear all keys, set metadata to null, then save.
-             */
-            metadata?: IMetadata;
-        }
-    }
-
-    namespace balance {
-        interface IBalance extends IObject {
-            /**
-             * Value is 'balance'
-             */
-            object: string;
-
-            /**
-             * Funds that are available to be paid out automatically by Stripe or explicitly
-             * via the transfers API. The available balance for each currency and payment
-             * type can be found in the source_types property.
-             */
-            available: Array<ISourceType>;
-
-            livemode: boolean;
-
-            /**
-             * Funds that are not available in the balance yet, due to the 7-day rolling pay
-             * cycle. The pending balance for each currency and payment type can be
-             * found in the source_types property
-             */
-            pending: Array<ISourceType>;
-        }
-
-        interface ISourceType {
-            currency: string;
-            amount: number;
-            source_types: {
-                card: number;
-                bitcoin_receiver?: number;
-                customer_bank_account?: number;
-                alipay_account?: number;
-            }
-        }
-
-        interface IBalanceTransaction extends IResourceObject {
-            /**
-             * Value is 'balance_transaction'
-             */
-            object: string;
-
-            /**
-             * Gross amount of the transaction, in cents/pence.
-             */
-            amount: number;
-
-            /**
-             * The date the transaction's net funds will become available in the Stripe balance.
-             */
-            available_on: number;
-
-            created: number;
-
-            /**
-             * Three-letter ISO currency code representing the currency.
-             */
-            currency: string;
-
-            description?: string;
-
-            /**
-             * Fee (in cents/pence) paid for this transaction
-             */
-            fee: number;
-
-            /**
-             * Detailed breakdown of fees (in cents/pence) paid for this transaction
-             */
-            fee_details: Array<{
-                amount: number;
-                application: string;
-
-                /**
-                 * Three-letter ISO currency code representing the currency of the amount that was disputed.
-                 */
-                currency: string;
-
-                description: string;
-
-                /**
-                 * Type of the fee, one of: "application_fee", "stripe_fee"" or "tax".
-                 */
-                type: string;
-            }>;
-
-            /**
-             * Net amount of the transaction, in cents.
-             */
-            net: number;
-
-            /**
-             * The Stripe object this transaction is related to. [Expandable]
-             */
-            source: string | IResourceObject;
-
-            /**
-             * The transfers (if any) for which source is a source_transaction.
-             */
-            source_transfers: IList<transfers.ITransfer>;
-
-            /**
-             * If the transaction's net funds are available in the Stripe balance yet. Either "available" or "pending".
-             */
-            status: string;
-
-            /**
-             * Transaction type: "adjustment", "application_fee",
-             * "application_fee_refund", "charge", "payment", "payment_refund",
-             * "refund", "transfer", "transfer_cancel", "transfer_failure", or
-             * "transfer_refund".
-             */
-            type: string;
-        }
-
-        interface IBalanceListOptions extends IListOptions {
-            available_on?: string | IDateFilter;
-            currency?: string;
-
-            /**
-             * Only returns transactions that are related to the specified Stripe object ID
-             * (e.g. filtering by a charge ID will return all related charge transactions).
-             */
-            source?: string;
-
-            /**
-             * For automatic Stripe transfers only, only returns transactions that were
-             * transferred out on the specified transfer ID.
-             */
-            transfer?: string;
-
-            /**
-             * Only returns transactions of the given type. One of: "charge", "refund",
-             * "adjustment", "application_fee", "application_fee_refund", "transfer",
-             * or "transfer_failure"
-             */
-            type?: string;
-        }
-    }
-
-    namespace charges {
-
-        /**
-         * To charge a credit or a debit card, you create a charge object. You can retrieve and refund individual
-         * charges as well as list all charges. Charges are identified by a unique random ID.
-         */
-        interface ICharge extends IResourceObject {
-            /**
-             * Value is 'charge'
-             */
-            object: "charge";
-
-            /**
-             * Amount charged in cents/pence, positive integer or zero.
-             */
-            amount: number;
-
-            /**
-             * Amount in cents/pence refunded (can be less than the amount attribute on the
-             * charge if a partial refund was issued), positive integer or zero.
-             */
-            amount_refunded: number;
-
-            /**
-             * The application fee (if any) for the charge. See the Connect documentation
-             * for details. [Expandable]
-             */
-            application_fee?: string;
-
-            /**
-             * ID of the balance transaction that describes the impact of this charge on
-             * your account balance (not including refunds or disputes). [Expandable]
-             */
-            balance_transaction: string | balance.IBalanceTransaction;
-
-            /**
-             * If the charge was created without capturing, this boolean represents whether or not it is
-             * still uncaptured or has since been captured.
-             */
-            captured: boolean;
-
-            created: number;
-
-            /**
-             * Three-letter ISO currency code representing the currency in which the
-             * charge was made.
-             */
-            currency: string;
-
-            /**
-             * ID of the customer this charge is for if one exists. [Expandable]
-             */
-            customer: string | customers.ICustomer;
-
-            description?: string;
-
-            /**
-             * Details about the dispute if the charge has been disputed.
-             */
-            dispute?: disputes.IDispute;
-
-            /**
-             * Error code explaining reason for charge failure if available (see the errors section for a list of
-             * codes: https://stripe.com/docs/api#errors).
-             */
-            failure_code: string;
-
-            /**
-             * Message to user further explaining reason for charge failure if available.
-             */
-            failure_message: string;
-
-            /**
-             * Hash with information on fraud assessments for the charge.
-             */
-            fraud_details: {
-                /**
-                 * Assessments reported by you have the key user_report and, if set, possible values of "safe" and "fraudulent".
-                 */
-                user_report?: "fraudulent" | "safe";
-
-                /**
-                 * Assessments from Stripe have the key stripe_report and, if set, the value "fraudulent".
-                 */
-                stripe_report?: "fraudulent";
-            };
-
-            /**
-             * ID of the invoice this charge is for if one exists. [Expandable]
-             */
-            invoice: string | invoices.IInvoice;
-
-            livemode: boolean;
-
-            metadata: IMetadata;
-
-            /**
-             * ID of the order this charge is for if one exists. [Expandable]
-             */
-            order: string | orders.IOrder;
-
-            /**
-             * true if the charge succeeded, or was successfully authorized for later capture.
-             */
-            paid: boolean;
-
-            /**
-             * This is the email address that the receipt for this charge was sent to.
-             */
-            receipt_email: string;
-
-            /**
-             * This is the transaction number that appears on email receipts sent for this charge.
-             */
-            receipt_number: string;
-
-            /**
-             * Whether or not the charge has been fully refunded. If the charge is only partially refunded,
-             * this attribute will still be false.
-             */
-            refunded: boolean;
-
-            /**
-             * A list of refunds that have been applied to the charge.
-             */
-            refunds: IChargeRefunds;
-
-            /**
-             * Shipping information for the charge.
-             */
-            shipping?: IShippingInformation;
-
-            /**
-             * For most Stripe users, the source of every charge is a credit or debit card.
-             * This hash is then the card object describing that card.
-             */
-            source: cards.ICard | bitcoinReceivers.IBitcoinReceiver;
-
-            /**
-             * The transfer ID which created this charge. Only present if the charge came
-             * from another Stripe account. See the Connect documentation for details.
-             * [Expandable]
-             */
-            source_transfer: string | transfers.ITransfer;
-
-            /**
-             * Extra information about a charge. This will appear on your customer’s
-             * credit card statement.
-             */
-            statement_descriptor: string;
-
-            /**
-             * The status of the payment is either "succeeded", "pending", or "failed".
-             */
-            status: "succeeded" | "pending" | "failed";
-
-            /**
-             * ID of the transfer to the destination account (only applicable if the
-             * charge was created using the destination parameter). [Expandable]
-             */
-            transfer: string | transfers.ITransfer;
-        }
-
-        interface IChargeCreationOptions extends IDataOptions {
-            /**
-             * A positive integer in the smallest currency unit (e.g 100 cents to charge
-             * $1.00, or 1 to charge ¥1, a 0-decimal currency) representing how much to
-             * charge the card. The minimum amount is £0.50 (or equivalent in charge
-             * currency).
-             */
-            amount: number;
-
-            /**
-             * 3-letter ISO code for currency.
-             */
-            currency: string;
-
-            /**
-             * A fee in pence that will be applied to the charge and transferred to the
-             * application owner's Stripe account. To use an application fee, the request
-             * must be made on behalf of another account, using the Stripe-Account
-             * header, an OAuth key, or the destination parameter. For more
-             * information, see the application fees documentation.
-             *
-             * Connect only.
-             */
-            application_fee?: number;
-
-            /**
-             * Whether or not to immediately capture the charge. When false, the charge
-             * issues an authorization (or pre-authorization), and will need to be
-             * captured later. Uncaptured charges expire in 7 days. For more information,
-             * see authorizing charges and settling later.
-             */
-            capture?: boolean;
-
-            /**
-             * An arbitrary string which you can attach to a charge object. It is displayed
-             * when in the web interface alongside the charge. Note that if you use Stripe
-             * to send automatic email receipts to your customers, your receipt emails
-             * will include the description of the charge(s) that they are describing.
-             */
-            description?: string;
-
-            /**
-             * An account to make the charge on behalf of. If specified, the charge will be
-             * attributed to the destination account for tax reporting, and the funds from
-             * the charge will be transferred to the destination account. The ID of the
-             * resulting transfer will be returned in the transfer field of the response. See
-             * the documentation for details.
-             *
-             * Connect only.
-             */
-            destination?: string;
-
-            /**
-             * A set of key/value pairs that you can attach to a charge object. It can be
-             * useful for storing additional information about the customer in a
-             * structured format. It's often a good idea to store an email address in
-             * metadata for tracking later.
-             */
-            metadata?: IMetadata;
-
-            /**
-             * The email address to send this charge's receipt to. The receipt will not be
-             * sent until the charge is paid. If this charge is for a customer, the email
-             * address specified here will override the customer's email address.
-             * Receipts will not be sent for test mode charges. If receipt_email is
-             * specified for a charge in live mode, a receipt will be sent regardless of your
-             * email settings.
-             */
-            receipt_email?: string;
-
-            /**
-             * Shipping information for the charge. Helps prevent fraud on charges for
-             * physical goods. For more information, see the Charge object
-             * documentation.
-             */
-            shipping?: IShippingInformation;
-
-            /**
-             * The ID of an existing customer that will be charged in this request.
-             */
-            customer?: string;
-
-            /**
-             * A payment source to be charged, such as a credit card. If you also pass a
-             * customer ID, the source must be the ID of a source belonging to the
-             * customer. Otherwise, if you do not pass a customer ID, the source you
-             * provide must either be a token, like the ones returned by Stripe.js, or a
-             * object containing a user's credit card details, with the options described
-             * below. Although not all information is required, the extra info helps
-             * prevent fraud.
-             */
-            source?: sources.ISourceCreationOptions;
-
-            /**
-             * An arbitrary string to be displayed on your customer's credit card
-             * statement. This may be up to 22 characters. As an example, if your
-             * website is RunClub and the item you're charging for is a race ticket, you
-             * may want to specify a statement_descriptor of
-             * RunClub 5K race ticket. The statement description may not include
-             * <>"' characters, and will appear on your customer's statement in capital
-             * letters. Non-ASCII characters are automatically stripped. While most
-             * banks display this information consistently, some may display it
-             * incorrectly or not at all.
-             */
-            statement_descriptor?: string;
-        }
-
-        interface IChargeUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * An arbitrary string which you can attach to a charge object. It is displayed when in the web interface alongside the charge.
-             * Note that if you use Stripe to send automatic email receipts to your customers, your receipt emails will include the description
-             * of the charge(s) that they are describing. This can be unset by updating the value to null and then saving.
-             */
-            description?: string;
-
-            /**
-             * A set of key/value pairs you can attach to a charge giving information about its riskiness.
-             */
-            fraud_details?: {
-                /**
-                 * If you believe a charge is fraudulent, include a user_report key with a value of fraudulent. If you believe a
-                 * charge is safe, include a user_report key with a value of safe. Note that you must refund a charge before setting
-                 * the user_report to fraudulent. Stripe will use the information you send to improve our fraud detection algorithm
-                 */
-                user_report?: "fraudulent" | "safe";
-            }
-
-            /**
-             * This is the email address that the receipt for this charge will be sent to.
-             * If this field is updated, then a new email receipt will be sent to the updated address.
-             */
-            receipt_email?: string;
-
-            /**
-             * Shipping information for the charge. Helps prevent fraud on charges for
-             * physical goods.
-             */
-            shipping?: IShippingInformation;
-        }
-
-        interface IChargeListOptions extends IListOptionsCreated {
-            /**
-             * Only return charges for the customer specified by this customer ID.
-             */
-            customer?: string;
-
-            /**
-             * A filter on the list based on the source of the charge. The value can be a
-             * dictionary with the following options:
-             */
-            source?: {
-                /**
-                 * Return charges that match this source type string. Available options are
-                 * "all", "alipay_account", "bitcoin_receiver", or "card".
-                 */
-                object: "all" | "alipay_account" | "bitcoin_receiver" | "card";
-            }
-        }
-
-        interface IChargeRefunds extends IList<refunds.IRefund>, resources.ChargeRefunds { }
-    }
-
-    namespace coupons {
-        /**
-         * A discount represents the actual application of a coupon to a particular customer. It contains information
-         * about when the discount began and when it will end.
-         */
-        interface IDiscount extends IObject {
-            /**
-             * Value is 'discount'
-             */
-            object: "discount";
-
-            /**
-             * Hash describing the coupon applied to create this discount
-             */
-            coupon: ICoupon;
-
-            customer: string;
-
-            /**
-             * If the coupon has a duration of once or repeating, the date that this discount will end. If the coupon
-             * used has a forever duration, this attribute will be null.
-             */
-            end: number;
-
-            /**
-             * Date that the coupon was applied
-             */
-            start: number;
-
-            /**
-             * The subscription that this coupon is applied to, if it is applied to a particular subscription
-             */
-            subscription: string;
-        }
-
-        /**
-         * A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer.
-         * Coupons only apply to invoices; they do not apply to one-off charges.
-         */
-        interface ICoupon extends IResourceObject {
-            /**
-             * Value is 'coupon'
-             */
-            object: "coupon";
-
-            /**
-             * Amount (in the currency specified) that will be taken off the subtotal of any invoices for this customer.
-             */
-            amount_off: number;
-
-            created: number;
-
-            /**
-             * If amount_off has been set, the currency of the amount to take off.
-             */
-            currency: string;
-
-            /**
-             * One of "forever", "once", and "repeating". Describes how long a customer who applies this coupon will get the discount.
-             */
-            duration: "forever" | "once" | "repeating" ;
-
-            /**
-             * If duration is repeating, the number of months the coupon applies. Null if coupon duration is forever or once.
-             */
-            duration_in_months: number;
-
-            livemode: boolean;
-
-            /**
-             * Maximum number of times this coupon can be redeemed, in total, before it is no longer valid.
-             */
-            max_redemptions: number;
-
-            metadata: IMetadata;
-
-            /**
-             * Percent that will be taken off the subtotal of any invoices for this customer for the duration
-             * of the coupon. For example, a coupon with percent_off of 50 will make a $100 invoice $50 instead.
-             */
-            percent_off: number;
-
-            /**
-             * Date after which the coupon can no longer be redeemed
-             */
-            redeem_by: number;
-
-            /**
-             * Number of times this coupon has been applied to a customer.
-             */
-            times_redeemed: number;
-
-            /**
-             * Taking account of the above properties, whether this coupon can still be applied to a customer
-             */
-            valid: boolean;
-        }
-
-        interface ICouponCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * Unique string of your choice that will be used to identify this coupon when applying it to a customer. This is often a specific
-             * code you’ll give to your customer to use when signing up (e.g. FALL25OFF). If you don’t want to specify a particular code, you
-             * can leave the ID blank and we’ll generate a random code for you.
-             */
-            id?: string;
-
-            /**
-             * Specifies how long the discount will be in effect. Can be forever, once, or repeating.
-             */
-            duration: "forever" | "once" | "repeating" ;
-
-            /**
-             * A positive integer representing the amount to subtract from an invoice total (required if percent_off is not passed)
-             */
-            amount_off?: number;
-
-            /**
-             * Currency of the amount_off parameter (required if amount_off is passed)
-             */
-            currency?: string;
-
-            /**
-             * Required only if duration is repeating, in which case it must be a positive integer that specifies the number of months
-             * the discount will be in effect.
-             */
-            duration_in_months?: number;
-
-            /**
-             * A positive integer specifying the number of times the coupon can be redeemed before it’s no longer valid.
-             *
-             * For example, you might have a 50% off coupon that the first 20 readers of your blog can use.
-             */
-            max_redemptions?: number;
-
-            /**
-             * A positive integer between 1 and 100 that represents the discount the coupon will apply (required if amount_off is not passed)
-             */
-            percent_off?: number;
-
-            /**
-             * Unix timestamp specifying the last time at which the coupon can be redeemed.
-             * After the redeem_by date, the coupon can no longer be applied to new customers.
-             */
-            redeem_by?: number;
-        }
-    }
-
-    namespace customers {
-        /**
-         * Customer objects allow you to perform recurring charges and track multiple charges that are associated
-         * with the same customer. The API allows you to create, delete, and update your customers. You can
-         * retrieve individual customers as well as a list of all your customers.
-         */
-        interface ICustomer extends IResourceObject {
-            /**
-             * Value is 'customer'
-             */
-            object: "customer";
-
-            /**
-             * Current balance, if any, being stored on the customer's account. If negative, the customer has credit to apply to
-             * the next invoice. If positive, the customer has an amount owed that will be added to the next invoice. The balance
-             * does not refer to any unpaid invoices; it solely takes into account amounts that have yet to be successfully applied
-             * to any invoice. This balance is only taken into account for recurring charges.
-             */
-            account_balance?: number;
-
-            created: number;
-
-            /**
-             * The currency the customer can be charged in for recurring billing purposes (subscriptions, invoices, invoice items).
-             */
-            currency: string;
-
-            /**
-             * ID of the default source attached to this customer. [Expandable]
-             */
-            default_source: string | cards.ICard | bitcoinReceivers.IBitcoinReceiver;
-
-            /**
-             * Whether or not the latest charge for the customer's latest invoice has failed
-             */
-            delinquent: boolean;
-
-            description?: string;
-
-            /**
-             * Describes the current discount active on the customer, if there is one.
-             */
-            discount?: coupons.IDiscount;
-
-            email?: string;
-
-            livemode: boolean;
-
-            metadata?: IMetadata;
-
-            /**
-             * Shipping information associated with the customer.
-             */
-            shipping: IShippingInformation;
-
-            /**
-             * The customer’s payment sources, if any
-             */
-            sources?: IList<cards.ICard | bitcoinReceivers.IBitcoinReceiver>;
-
-            cards?: resources.CustomerCards;
-
-            /**
-             * The customer's current subscriptions, if any
-             */
-            subscriptions: ICustomerSubscriptions;
-        }
-
-        interface ICustomerSubscriptions extends IList<subscriptions.ISubscription>, resources.CustomerSubscriptions {}
-
-        interface ICustomerCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
-             * will be used before attempting any charges to the customer's card; a positive amount will be added to the next invoice.
-             */
-            account_balance?: number;
-
-            /**
-             * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
-             * API will not have the discount.
-             */
-            coupon?: string;
-
-            /**
-             * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
-             * be unset by updating the value to null and then saving.
-             */
-            description?: string;
-
-            /**
-             * Customer's email address. It's displayed alongside the customer in your dashboard and can be useful for searching and tracking.
-             * This can be unset by updating the value to null and then saving.
-             */
-            email?: string;
-
-            /**
-             * The identifier of the plan to subscribe the customer to. If provided, the returned customer object will have a list of subscriptions
-             * that the customer is currently subscribed to. If you subscribe a customer to a plan without a free trial, the customer must have a
-             * valid card as well.
-             */
-            plan?: string;
-
-            /**
-             * The quantity you'd like to apply to the subscription you're creating (if you pass in a plan). For example, if your plan is
-             * 10 cents/user/month, and your customer has 5 users, you could pass 5 as the quantity to have the customer charged 50 cents
-             * (5 x 10 cents) monthly. Defaults to 1 if not set. Only applies when the plan parameter is also provided.
-             */
-            quantity?: number;
-
-            shipping?: IShippingInformation;
-
-            /**
-             * The source can either be a token, like the ones returned by our Stripe.js, or
-             * a dictionary containing a user’s credit card details.
-             */
-            source?: sources.ISourceCreationOptionsExtended;
-
-            /**
-             * A positive decimal (with at most two decimal places) between 1 and 100.
-             * This represents the percentage of the subscription invoice subtotal that
-             * will be calculated and added as tax to the final amount each billing period.
-             * For example, a plan which charges $10/month with a tax_percent of 20.0
-             * will charge $12 per invoice. Can only be used if a plan is provided.
-             */
-            tax_percent?: number;
-
-            /**
-             * Unix timestamp representing the end of the trial period the customer will get before being charged. If set, trial_end will
-             * override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to
-             * end the customer's trial immediately. Only applies when the plan parameter is also provided.
-             */
-            trial_end?: number;
-        }
-
-        interface ICustomerUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
-             * will be used before attempting any charges to the customer's card; a positive amount will be added to the next invoice.
-             */
-            account_balance?: number;
-
-            /**
-             * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
-             * API will not have the discount.
-             */
-            coupon?: string;
-
-            /**
-             * ID of source to make the customer’s new default for invoice payments
-             */
-            default_source?: string;
-
-            /**
-             * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
-             * be unset by updating the value to null and then saving.
-             */
-            description?: string;
-
-            /**
-             * Customer's email address. It's displayed alongside the customer in your dashboard and can be useful for searching and tracking.
-             * This can be unset by updating the value to null and then saving.
-             */
-            email?: string;
-
-            shipping?: IShippingInformation;
-
-            /**
-             * The source can either be a token, like the ones returned by our Stripe.js, or
-             * a dictionary containing a user’s credit card details (with the options shown
-             * below). Passing source will create a new source object, make it the new
-             * customer default source, and delete the old customer default if one exists.
-             * If you want to add additional sources instead of replacing the existing
-             * default, use the card creation API. Whenever you attach a card to a
-             * customer, Stripe will automatically validate the card.
-             */
-            source?: sources.ISourceCreationOptionsExtended;
-        }
-
-        interface ICustomerSourceCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * When adding a card to a customer, the parameter name is source. When
-             * adding to an account, the parameter name is external_account. The
-             * value can either be a token, like the ones returned by our Stripe.js, or a
-             * dictionary containing a user’s credit card details (with the options shown
-             * below). Stripe will automatically validate the card.
-             */
-            source: sources.ISourceCreationOptions;
-        }
-
-        interface ICustomerCardSourceCreationOptions extends ICustomerSourceCreationOptions {
-            source: cards.ISourceCreationOptions;
-        }
-
-        interface IBankAccountSourceListOptions extends IListOptions {
-            object: "bank_account"
-        }
-
-        interface ICardSourceListOptions extends IListOptions {
-            object: "card"
-        }
-    }
-
-    namespace disputes {
-        /**
-         * A dispute occurs when a customer questions your charge with their bank or credit card company.
-         * When a customer disputes your charge, you're given the opportunity to respond to the dispute with
-         * evidence that shows the charge is legitimate. You can find more information about the dispute process
-         * in our disputes FAQ: https://stripe.com/help/disputes
-         */
-        interface IDispute extends IResourceObject {
-            /**
-             * Value is 'dispute'
-             */
-            object: "dispute";
-
-            /**
-             * Disputed amount. Usually the amount of the charge, but can differ (usually because of currency
-             * fluctuation or because only part of the order is disputed).
-             */
-            amount: number;
-
-            /**
-             * List of zero, one, or two balance transactions that show funds withdrawn and reinstated to your
-             * Stripe account as a result of this dispute.
-             */
-            balance_transactions: Array<balance.IBalanceTransaction>;
-
-            /**
-             * ID of the charge that was disputed. [Expandable]
-             */
-            charge: string | charges.ICharge;
-
-            /**
-             * Date dispute was opened
-             */
-            created: number;
-
-            /**
-             * Three-letter ISO currency code representing the currency of the amount that was disputed.
-             */
-            currency: string;
-
-            /**
-             * Evidence provided to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
-             */
-            evidence: IDisputeEvidence;
-
-            /**
-             * Information about the evidence submission.
-             */
-            evidence_details?: {
-                /**
-                 * Date by which evidence must be submitted in order to successfully challenge dispute. Will be null
-                 * if the customer's bank or credit card company doesn't allow a response for this particular dispute.
-                 */
-                due_by: number;
-
-                /**
-                 * Whether or not evidence has been saved for this dispute.
-                 */
-                has_evidence: boolean;
-
-                /**
-                 * Whether or not the last evidence submission was submitted past the due date. Defaults to false
-                 * if no evidence submissions have occurred. If true, then delivery of the latest evidence is not guaranteed.
-                 */
-                past_due: boolean;
-
-                /**
-                 * The number of times the evidence has been submitted. You may submit evidence a maximum of 5 times
-                 */
-                submission_count: number;
-            };
-
-            /**
-             * If true, it is still possible to refund the disputed payment. Once the payment has been fully
-             * refunded, no further funds will be withdrawn from your Stripe account as a result of this dispute.
-             */
-            is_charge_refundable: boolean;
-
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * Reason given by cardholder for dispute.
-             * Possible values are duplicate, fraudulent, subscription_canceled, product_unacceptable,
-             * product_not_received, unrecognized, credit_not_processed, incorrect_account_details,
-             * insufficient_funds, bank_cannot_process, debit_not_authorized, general.
-             * Read more about dispute reasons: https://stripe.com/help/disputes#reasons
-             */
-            reason: "duplicate" | "fraudulent" | "subscription_canceled" | "product_unacceptable" | "product_not_received" | "unrecognized" | "credit_not_processed" | "incorrect_account_details" | "insufficient_funds" | "bank_cannot_process" | "debit_not_authorized" | "general";
-
-            /**
-             * Current status of dispute. Possible values are warning_needs_response, warning_under_review, warning_closed,
-             * needs_response, response_disabled, under_review, charge_refunded, won, lost.
-             */
-            status: "warning_needs_response" | "warning_under_review" | "warning_closed" | "needs_response" | "response_disabled" | "under_review" | "charge_refunded" | "won" | "lost";
-        }
-
-        interface IDisputeEvidence {
-            /**
-             * Any server or activity logs showing proof that the customer accessed or downloaded the purchased
-             * digital product. This information should include IP addresses, corresponding timestamps, and any
-             * detailed recorded activity.
-             */
-            access_activity_log?: string;
-
-            /**
-             * The billing addess provided by the customer.
-             */
-            billing_address?: string;
-
-            /**
-             * (ID of a file upload) Your subscription cancellation policy, as shown to the customer. [Expandable]
-             */
-            cancellation_policy?: string;
-
-            /**
-             * An explanation of how and when the customer was shown your refund policy prior to purchase.
-             */
-            cancellation_policy_disclosure?: string;
-
-            /**
-             * A justification for why the customer's subscription was not canceled.
-             */
-            cancellation_rebuttal?: string;
-
-            /**
-             * (ID of a file upload) Any communication with the customer that you feel is relevant to your case (for
-             * example emails proving that they received the product or service, or demonstrating their use of or
-             * satisfaction with the product or service).
-             */
-            customer_communication?: string;
-
-            /**
-             * The email address of the customer.
-             */
-            customer_email_address?: string;
-
-            /**
-             * The name of the customer.
-             */
-            customer_name?: string;
-
-            /**
-             * The IP address that the customer used when making the purchase.
-             */
-            customer_purchase_ip?: string;
-
-            /**
-             * (ID of a file upload) A relevant document or contract showing the customer's signature. [Expandable]
-             */
-            customer_signature?: string;
-
-            /**
-             * (ID of a file upload) Documentation for the prior charge that can uniquely identify the charge,
-             * such as a receipt, shipping label, work order, etc. This document should be paired with a similar
-             * document from the disputed payment that proves the two payments are separate. [Expandable]
-             */
-            duplicate_charge_documentation?: string;
-
-            /**
-             * An explanation of the difference between the disputed charge and the prior charge that appears to be a duplicate.
-             */
-            duplicate_charge_explanation?: string;
-
-            /**
-             * The Stripe ID for the prior charge which appears to be a duplicate of the disputed charge.
-             */
-            duplicate_charge_id?: string;
-
-            /**
-             * A description of the product or service which was sold.
-             */
-            product_description?: string;
-
-            /**
-             * (ID of a file upload) Any receipt or message sent to the customer notifying them of the charge. [Expandable]
-             */
-            receipt?: string;
-
-            /**
-             * (ID of a file upload) Your refund policy, as shown to the customer. [Expandable]
-             */
-            refund_policy?: string;
-
-            /**
-             * Documentation demonstrating that the customer was shown your refund policy prior to purchase.
-             */
-            refund_policy_disclosure?: string;
-
-            /**
-             * A justification for why the customer is not entitled to a refund.
-             */
-            refund_refusal_explanation?: string;
-
-            /**
-             * The date on which the customer received or began receiving the purchased service, in a clear human-readable format.
-             */
-            service_date?: string;
-
-            /**
-             * (ID of a file upload) Documentation showing proof that a service was provided to the customer. This could
-             * include a copy of a signed contract, work order, or other form of written agreement.
-             */
-            service_documentation?: string;
-
-            /**
-             * The address to which a physical product was shipped. You should try to include as much complete address information as possible.
-             */
-            shipping_address?: string;
-
-            /**
-             * The delivery service that shipped a physical product, such as Fedex, UPS, USPS, etc. If multiple carriers were used
-             * for this purchase, please separate them with commas.
-             */
-            shipping_carrier?: string;
-
-            /**
-             * The date on which a physical product began its route to the shipping address, in a clear human-readable format.
-             */
-            shipping_date?: string;
-
-            /**
-             * (ID of a file upload) Documentation showing proof that a product was shipped to the customer at the same address
-             * the customer provided to you. This could include a copy of the shipment receipt, shipping label, etc, and should
-             * show the full shipping address of the customer, if possible. [Expandable]
-             */
-            shipping_documentation?: string;
-
-            /**
-             * The tracking number for a physical product, obtained from the delivery service. If multiple tracking numbers
-             * were generated for this purchase, please separate them with commas.
-             */
-            shipping_tracking_number?: string;
-
-            /**
-             * (ID of a file upload) Any additional evidence or statements. [Expandable]
-             */
-            uncategorized_file?: string;
-
-            /**
-             * Any additional evidence or statements.
-             */
-            uncategorized_text?: string;
-        }
-
-        interface IDisputeUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * Evidence to upload to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
-             */
-            evidence?: disputes.IDisputeEvidence;
-        }
-    }
-
-    namespace events {
-        interface IEvent extends IResourceObject {
-            /**
-             * Value is "event"
-             */
-            object: "event";
-
-            /**
-             * The Stripe API version used to render data.
-             * Note: this property is populated for events on or after October 31, 2014.
-             */
-            api_version: string;
-
-            created: number;
-
-            /**
-             * Hash containing data associated with the event.
-             */
-            data: {
-                /**
-                 * describes the object the event is about. For example, an
-                 * invoice.created event will have a full invoice object as the value of
-                 * the object key.
-                 */
-                object: IObject;
-
-                /**
-                 *
-                 */
-                previous_attributes?: {};
-            };
-
-            livemode: boolean;
-
-            /**
-             * Number of webhooks yet to be delivered successfully (return a 20x response) to the URLs you’ve specified.
-             *
-             * positive integer or zero
-             */
-            pending_webhooks: number;
-
-            /**
-             * ID of the API request that caused the event. If null, the event was
-             * automatic (e.g. Stripe’s automatic subscription handling). Request logs are
-             * available in the dashboard but currently not in the API. Note: this property
-             * is populated for events on or after April 23, 2013.
-             */
-            request?: string;
-
-            /**
-             * Description of the event: e.g. invoice.created, charge.refunded, etc.
-             */
-            type: string;
-        }
-
-        interface IEventListOptions extends IListOptionsCreated {
-            /**
-             * A string containing a specific event name, or group of events using * as a
-             * wildcard. The list will be filtered to include only events with a matching
-             * event property
-             */
-            type: string;
-        }
-     }
-
-    namespace fileUploads {
-        interface IFileUpdate extends IResourceObject {
-            /**
-             * Value is "file_upload"
-             */
-            object: "file_upload";
-
-            created: number;
-
-            /**
-             * The purpose of the uploaded file. Possible values are "business_logo",
-             * "dispute_evidence", "identity_document", "incorporation_article",
-             * "incorporation_document".
-             */
-            purpose: IPurpose;
-
-            /**
-             * The size in bytes of the file upload object.
-             */
-            size: number;
-
-            /**
-             * The type of the file returned. Returns one of the following:
-             * pdf, jpg, png.
-             */
-            type: "pdf" | "jpg" | "png";
-
-            /**
-             * A read-only URL where the uploaded file can be accessed. Will be nil
-             * unless the uploaded file has one of the following purposes:
-             *  business_logo, dispute_evidence, incorporation_document.
-             * Also nil if retrieved with the publishable API key.
-             */
-            url: string;
-        }
-
-        interface IFileUploadCreationOptions extends IDataOptions {
-            purpose: IPurpose;
-            file: {
-                data: string | Buffer;
-                name: string;
-                type: string | "application/octet-stream";
-            }
-        }
-
-        interface IFileUploadListOptions extends IListOptionsCreated {
-            /**
-             * The file purpose to filter queries by. If none is provided, files will not be
-             * filtered by purpose.
-             */
-            purpose: IPurpose;
-        }
-
-        type IPurpose = "business_logo" | "dispute_evidence" | "identity_document" | "incorporation_article" | "incorporation_document";
-     }
-
-    namespace invoices {
-        /**
-         * Invoices are statements of what a customer owes for a particular billing period, including subscriptions,
-         * invoice items, and any automatic proration adjustments if necessary. Once an invoice is created, payment
-         * is automatically attempted. Note that the payment, while automatic, does not happen exactly at the time of
-         * invoice creation. If you have configured webhooks, the invoice will wait until one hour after the last
-         * webhook is successfully sent (or the last webhook times out after failing). Any customer credit on the
-         * account is applied before determining how much is due for that invoice (the amount that will be actually
-         * charged). If the amount due for the invoice is less than 50 cents (the minimum for a charge), we add the
-         * amount to the customer's running account balance to be added to the next invoice. If this amount is
-         * negative, it will act as a credit to offset the next invoice. Note that the customer account balance does
-         * not include unpaid invoices; it only includes balances that need to be taken into account when calculating
-         * the amount due for the next invoice.
-         */
-        interface IInvoice extends IResourceObject {
-            /**
-             * Value is 'invoice'
-             */
-            object: "invoice";
-
-            /**
-             * Final amount due at this time for this invoice. If the invoice's total is smaller than the minimum charge
-             * amount, for example, or if there is account credit that can be applied to the invoice, the amount_due may
-             * be 0. If there is a positive starting_balance for the invoice (the customer owes money), the amount_due
-             * will also take that into account. The charge that gets generated for the invoice will be for the amount
-             * specified in amount_due.
-             */
-            amount_due: number;
-
-            /**
-             * The fee in cents that will be applied to the invoice and transferred to the application owner's
-             * Stripe account when the invoice is paid.
-             */
-            application_fee: number;
-
-            /**
-             * Number of payment attempts made for this invoice, from the perspective of the payment retry schedule. Any
-             * payment attempt counts as the first attempt, and subsequently only automatic retries increment the attempt
-             * count. In other words, manual payment attempts after the first attempt do not affect the retry schedule.
-             */
-            attempt_count: number;
-
-            /**
-             * Whether or not an attempt has been made to pay the invoice. An invoice is not attempted until 1 hour after
-             * the invoice.created webhook, for example, so you might not want to display that invoice as unpaid to your
-             * users.
-             */
-            attempted: boolean;
-
-            /**
-             * ID of the latest charge generated for this invoice, if any. [Expandable]
-             */
-            charge: string | charges.ICharge;
-
-            /**
-             * Whether or not the invoice is still trying to collect payment. An invoice is closed if it's either paid or
-             * it has been marked closed. A closed invoice will no longer attempt to collect payment.
-             */
-            closed: boolean;
-
-            currency: string;
-            customer: string;
-            date: number;
-            description: string;
-            discount: coupons.IDiscount;
-
-            /**
-             * Ending customer balance after attempting to pay invoice. If the invoice has not been attempted yet,
-             * this will be null.
-             */
-            ending_balance: number;
-
-            /**
-             * Whether or not the invoice has been forgiven. Forgiving an invoice instructs us to update the subscription
-             * status as if the invoice were succcessfully paid. Once an invoice has been forgiven, it cannot be unforgiven
-             * or reopened
-             */
-            forgiven: boolean;
-
-            /**
-             * The individual line items that make up the invoice.
-             *
-             * lines is sorted as follows: invoice items in reverse chronological order, followed by the subscription, if any.
-             */
-            lines: IList<IInvoiceLineItem>;
-
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * The time at which payment will next be attempted.
-             */
-            next_payment_attempt: number;
-
-            /**
-             * Whether or not payment was successfully collected for this invoice. An invoice can be paid (most commonly)
-             * with a charge or with credit from the customer's account balance.
-             */
-            paid: boolean;
-
-            /**
-             * End of the usage period during which invoice items were added to this invoice
-             */
-            period_end: number;
-
-            /**
-             * Start of the usage period during which invoice items were added to this invoice
-             */
-            period_start: number;
-
-            /**
-             * This is the transaction number that appears on email receipts sent for this invoice.
-             */
-            receipt_number: string;
-
-            /**
-             * Starting customer balance before attempting to pay invoice. If the invoice has not been attempted yet,
-             * this will be the current customer balance.
-             */
-            starting_balance: number;
-
-            /**
-             * Extra information about an invoice for the customer�s credit card statement.
-             */
-            statement_descriptor: string;
-
-            /**
-             * The subscription that this invoice was prepared for, if any.
-             */
-            subscription: string;
-
-            /**
-             * Only set for upcoming invoices that preview prorations. The time used to calculate prorations.
-             */
-            subscription_proration_date: number;
-
-            /**
-             * Total of all subscriptions, invoice items, and prorations on the invoice before any discount is applied
-             */
-            subtotal: number;
-
-            /**
-             * The amount of tax included in the total, calculated from tax_percent and the subtotal. If no tax_percent
-             * is defined, this value will be null.
-             */
-            tax: number;
-
-            /**
-             * This percentage of the subtotal has been added to the total amount of the invoice, including invoice line
-             * items and discounts. This field is inherited from the subscription's tax_percent field, but can be changed
-             * before the invoice is paid. This field defaults to null.
-             */
-            tax_percent: number;
-
-            /**
-             * Total after discount
-             */
-            total: number;
-
-            /**
-             * The time at which webhooks for this invoice were successfully delivered (if the invoice had no webhooks to
-             * deliver, this will match date). Invoice payment is delayed until webhooks are delivered, or until all webhook
-             * delivery attempts have been exhausted.
-             */
-            webhooks_delivered_at: number;
-        }
-
-        interface IInvoiceLineItem extends IResourceObject {
-            /**
-             * The ID of the source of this line item, either an invoice item or a subscription
-             */
-            id: string;
-
-            /**
-             * Value is "line_item"
-             */
-            object: "line_item";
-
-            /**
-             * The amount, in cents/pence
-             */
-            amount: number;
-
-            currency: string;
-
-            /**
-             * A text description of the line item, if the line item is an invoice item
-             */
-            description: string;
-
-            /**
-             * If true, discounts will apply to this line item. Always false for prorations.
-             */
-            discountable: boolean;
-
-            /**
-             * Whether or not this is a test line item
-             */
-            livemode: boolean;
-
-            metadata: IMetadata;
-
-            /**
-             * The period this line_item covers. For subscription line items, this is the subscription period. For prorations, this starts when
-             * the proration was calculated, and ends at the period end of the subscription. For invoice items, this is the time at which the
-             * invoice item was created, so the period start and end are the same time.
-             */
-            period: IPeriod;
-
-            /**
-             * The plan of the subscription, if the line item is a subscription or a proration
-             */
-            plan: plans.IPlan;
-
-            /**
-             * Whether or not this is a proration
-             */
-            proration: boolean;
-
-            /**
-             * The quantity of the subscription, if the line item is a subscription or a proration
-             */
-            quantity: number;
-
-            /**
-             * When type is invoiceitem, the subscription that the invoice item pertains to, if any. Left blank when
-             * type is already subscription, as it'd be redundant with id.
-             */
-            subscription: string;
-
-            /**
-             * A string identifying the type of the source of this line item, either an invoiceitem or a subscription
-             */
-            type: "invoiceitem" | "subscription";
-        }
-
-        interface IInvoiceCreationOptions extends IDataOptionsWithMetadata {
-            customer: string;
-
-            /**
-             * A fee in pence that will be applied to the invoice and transferred to the application owner’s Stripe account.
-             * The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee.
-             * For more information, see the application fees documentation.
-             */
-            application_fee?: number;
-
-            description?: string;
-
-            /**
-             * Extra information about a charge for the customer’s credit card statement.
-             */
-            statement_descriptor?: string
-
-            /**
-             * The ID of the subscription to invoice. If not set, the created invoice will include all pending invoice items for
-             * the customer. If set, the created invoice will exclude pending invoice items that pertain to other subscriptions.
-             */
-            subscription?: string;
-
-            /**
-             * The percent tax rate applied to the invoice, represented as a decimal number.
-             */
-            tax_percent?: number;
-        }
-
-        interface IInvoiceUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * A fee in pence that will be applied to the invoice and transferred to the application owner’s Stripe account.
-             * The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee.
-             * For more information, see the application fees documentation.
-             */
-            application_fee?: number;
-
-            /**
-             * Boolean representing whether an invoice is closed or not. To close an invoice, pass true.
-             */
-            closed?: boolean;
-
-            description?: string;
-
-            /**
-             * Boolean representing whether an invoice is forgiven or not. To forgive an invoice, pass true. Forgiving an invoice
-             * instructs us to update the subscription status as if the invoice were successfully paid. Once an invoice has been
-             * forgiven, it cannot be unforgiven or reopened.
-             */
-            forgiven?: boolean;
-
-            /**
-             * Extra information about a charge for the customer’s credit card statement.
-             */
-            statement_descriptor?: string
-
-            /**
-             * The percent tax rate applied to the invoice, represented as a decimal number.
-             */
-            tax_percent?: number;
-        }
-
-        interface IInvoiceListOptions extends IListOptions {
-            /**
-             * The identifier of the customer whose invoices to return. If none is provided, all invoices will be returned.
-             */
-            customer?: string;
-
-            date?: IDateFilter;
-        }
-
-        interface IInvoiceLineItemRetrievalOptions extends IListOptions {
-            coupon?: string;
-
-            /**
-             * In the case of upcoming invoices, the customer of the upcoming invoice is required. In other cases it is ignored.
-             */
-            customer?: string;
-
-            /**
-             * In the case of upcoming invoices, the subscription of the upcoming invoice is optional. In other cases it is ignored.
-             */
-            subscription?: string;
-
-            subscription_plan?: string;
-            subscription_prorate?: boolean;
-            subscription_proration_date?: number;
-            subscription_quantity?: number;
-            subscription_trial_end?: number;
-        }
-
-        interface IInvoiceUpcomingOptions extends IDataOptions {
-            /**
-             * The code of the coupon to apply. If a subscription or subscription_plan is provided, the invoice returned will preview updating
-             * or creating a subscription with that coupon. Otherwise, it will preview applying that coupon to the customer for the next upcoming
-             * invoice from among the customer’s subscriptions.
-             */
-            coupon?: string;
-
-            /**
-             * The identifier of the subscription for which you’d like to retrieve the upcoming invoice. If not provided, but a subscription_plan
-             * is provided, you will preview creating a subscription to that plan. If neither subscription nor subscription_plan is provided, you
-             * will retrieve the next upcoming invoice from among the customer’s subscriptions.
-             */
-            subscription?: string;
-
-            /**
-             * If set, the invoice returned will preview updating the subscription given to this plan, or creating a new subscription to this plan
-             * if no subscription is given.
-             */
-            subscription_plan?: string;
-
-            /**
-             * If previewing an update to a subscription, this decides whether the preview will show the result of applying prorations or not. If
-             * set, one of subscription_plan or subscription, and one of subscription_plan, subscription_quantity or subscription_trial_end are
-             * required.
-             */
-            subscription_prorate?: boolean;
-
-            /**
-             * If previewing an update to a subscription, and doing proration, subscription_proration_date forces the proration to be calculated as
-             * though the update was done at the specified time. The time given must be within the current subscription period, and cannot be
-             * before the subscription was on its current plan.If set, subscription, and one of subscription_plan, subscription_quantity or
-             * subscription_trial_end are required. Also, subscription_proration cannot be set to false.
-             */
-            subscription_proration_date?: number;
-
-            /**
-             * If provided, the invoice returned will preview updating or creating a subscription with that quantity. If set, one of subscription_plan
-             * or subscription is required.
-             */
-            subscription_quantity?: number;
-
-            /**
-             * If provided, the invoice returned will preview updating or creating a subscription with that trial end. If set, one of subscription_plan
-             * or subscription is required.
-             */
-            subscription_trial_end?: number;
-        }
-
-        interface IPeriod {
-            /**
-             * The period start date
-             */
-            start: number;
-            /**
-             * The period end date
-             */
-            end: number;
-        }
-    }
-    namespace invoiceItems {
-        interface InvoiceItem extends IResourceObject {
-            /**
-             * Value is "invoiceitem"
-             */
-            object: "invoiceitem";
-
-            amount: number;
-            currency: string;
-            customer: string;
-            date: number;
-            description: string;
-
-            /**
-             * If true, discounts will apply to this invoice item. Always false for prorations.
-             */
-            discountable: boolean;
-
-            invoice: string;
-            livemode: boolean;
-            metadata: IMetadata;
-
-            period: invoices.IPeriod;
-
-            /**
-             * If the invoice item is a proration, the plan of the subscription that the proration was computed for.
-             */
-            plan: plans.IPlan;
-
-            /**
-             * Whether or not the invoice item was created automatically as a proration adjustment when the customer switched plans
-             */
-            proration: boolean;
-
-            /**
-             * If the invoice item is a proration, the quantity of the subscription that the proration was computed for.
-             */
-            quantity: number;
-
-            /**
-             * The subscription that this invoice item has been created for, if any.
-             */
-            subscription: string;
-        }
-
-        interface InvoiceItemCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * The integer amount in cents of the charge to be applied to the upcoming invoice. If you want to apply a credit to the customer’s
-             * account, pass a negative amount.
-             */
-            amount: number;
-
-            /**
-             * 3-letter ISO code for currency.
-             */
-            currency: string;
-
-            /**
-             * The ID of the customer who will be billed when this invoice item is billed.
-             */
-            customer: string;
-
-            /**
-             * An arbitrary string which you can attach to the invoice item. The description is displayed in the invoice for easy tracking.
-             * This can be unset by updating the value to null and then saving.
-             */
-            description?: string;
-
-            /**
-             * Controls whether discounts apply to this invoice item. Defaults to false for prorations or negative invoice items, and true for
-             * all other invoice items.
-             */
-            discountable?: boolean;
-
-            /**
-             * The ID of an existing invoice to add this invoice item to. When left blank, the invoice item will be added to the next upcoming
-             * scheduled invoice. Use this when adding invoice items in response to an invoice.created webhook. You cannot add an invoice item
-             * to an invoice that has already been paid, attempted or closed.
-             */
-            invoice?: string;
-
-            /**
-             * The ID of a subscription to add this invoice item to. When left blank, the invoice item will be be added to the next upcoming
-             * scheduled invoice. When set, scheduled invoices for subscriptions other than the specified subscription will ignore the invoice
-             * item. Use this when you want to express that an invoice item has been accrued within the context of a particular subscription.
-             */
-            subscription?: string;
-        }
-
-        interface InvoiceItemUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * The integer amount in cents/pence of the charge to be applied to the upcoming invoice. If you want to apply a credit to the customer's
-             * account, pass a negative amount.
-             */
-            amount?: number;
-
-            /**
-             * An arbitrary string which you can attach to the invoice item. The description is displayed in the invoice for easy tracking. This can be
-             * unset by updating the value to null and then saving.
-             */
-            description?: string;
-
-            /**
-             * Controls whether discounts apply to this invoice item. Defaults to false for prorations or negative invoice items, and true for all other
-             * invoice items. Cannot be set to true for prorations.
-             */
-            discountable?: boolean;
-        }
-
-        interface InvoiceItemListOptions extends IListOptionsCreated {
-            /**
-             * The identifier of the customer whose invoice items to return. If none is provided, all invoice items will be returned.
-             */
-            customer?: string;
-        }
-    }
-
-    namespace orders {
-        interface IOrder extends IResourceObject {
-            /**
-             * Value is "order"
-             */
-            object: "order";
-
-            /**
-             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal
-             * currency) representing the total amount for the order.
-             */
-            amount: number;
-
-            /**
-             * ID of the Connect Application that created the order.
-             */
-            application: string;
-
-            application_fee: number;
-
-            /**
-             * The ID of the payment used to pay for the order. Present if the order status is paid, fulfilled, or refunded. [Expandable]
-             */
-            charge: string | charges.ICharge;
-
-            created: number;
-
-            /**
-             * 3-letter ISO code representing the currency in which the order was made.
-             */
-            currency: string;
-
-            /**
-             * The customer used for the order. [Expandable]
-             */
-            customer: string | customers.ICustomer;
-
-            /**
-             * The email address of the customer placing the order.
-             */
-            email: string;
-
-            external_coupon_code: string;
-
-            /**
-             * List of items constituting the order.
-             */
-            items: Array<IOrderItem>;
-
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * The shipping method that is currently selected for this order, if any. If present, it is equal to one of the ids of shipping methods
-             * in the shipping_methods array. At order creation time, if there are multiple shipping methods, Stripe will automatically selected
-             * the first method.
-             */
-            selected_shipping_method: string;
-
-            /**
-             * The shipping address for the order. Present if the order is for goods to be shipped.
-             */
-            shipping: IShippingInformation;
-
-            /**
-             * A list of supported shipping methods for this order. The desired shipping method can be specified either by updating the order, or
-             * when paying it.
-             */
-            shipping_methods: Array<IShippingMethod>;
-
-            status: OrderStatus;
-
-            /**
-             * The timestamps at which the order status was updated
-             */
-            status_transactions: {
-                canceled: number;
-                fulfiled: number;
-                paid: number;
-                returned: number;
-            };
-
-            updated: number;
-        }
-
-        interface IOrderItem extends IObject {
-            /**
-             * value is "order_item"
-             */
-            object: "order_item";
-
-            /**
-             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency)
-             * representing the total amount for the line item.
-             */
-            amount: number;
-
-            /**
-             * 3-letter ISO code representing the currency of the line item.
-             */
-            currency: string;
-
-            /**
-             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
-             */
-            description: string;
-
-            /**
-             * The ID of the associated object for this line item. Expandable if not null (e.g., expandable to a SKU). [Expandable]
-             */
-            parent: string | skus.ISku;
-
-            /**
-             * A positive integer representing the number of instances of parent that are included in this order item.
-             * Applicable/present only if type is sku.
-             */
-            quantity: number;
-
-            /**
-             * The type of line item. One of "sku", "tax", "shipping", or "discount".
-             */
-            type: "sku" | "tax" | "shipping" | "discount" ;
-        }
-
-        interface IOrderCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * 3-letter ISO code representing the currency in which the order should be made. Stripe will validate that all entries in items match
-             * the currency specified here.
-             */
-            currency: string;
-
-            /**
-             * A coupon code that represents a discount to be applied to this order. Must be one-time duration and in same currency as the order.
-             */
-            coupon?: string;
-
-            /**
-             * The ID of an existing customer to use for this order. If provided, the customer email and shipping address will be used to create
-             * the order. Subsequently, the customer will also be charged to pay the order. If email or shipping are also provided, they will
-             * override the values retrieved from the customer object.
-             */
-            customer?: string;
-
-            /**
-             * The email address of the customer placing the order.
-             */
-            email?: string;
-
-            /**
-             * List of items constituting the order.
-             */
-            items?: Array<IOrderItemCreationHash>;
-
-            /**
-             * Shipping address for the order. Required if any of the SKUs are for products that have shippable set to true.
-             */
-            shipping?: IShippingInformation;
-        }
-
-        interface IOrderUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * A coupon code that represents a discount to be applied to this order. Must be one-time duration and in same currency as the order.
-             */
-            coupon?: string;
-
-            /**
-             * The shipping method to select for fulfilling this order. If specified, must be one of the ids of a shipping method in the
-             * shipping_methods array. If specified, will overwrite the existing selected shipping method, updating items as necessary.
-             */
-            selected_shipping_method?: string;
-
-            status: OrderStatus;
-        }
-
-        interface IOrderPayOptions extends IDataOptionsWithMetadata {
-            /**
-             * The ID of an existing customer that will be charged in this request.
-             *
-             * Either customer or source is required
-             */
-            customer?: string;
-
-            /**
-             * A payment source to be charged, such as a credit card. If you also pass a customer ID, the source must be the ID of a source belonging
-             * to the customer. Otherwise, if you do not pass a customer ID, the source you provide must either be a token, like the ones returned
-             * by Stripe.js, or a object containing a user's credit card details, with the options described below. Although not all information is
-             * required, the extra info helps prevent fraud.
-             *
-             * Either source or customer is required
-             */
-            source?: sources.ISourceCreationOptions;
-
-            /**
-             * A fee in cents/pence that will be applied to the order and transferred to the application owner's Stripe account. To use an application
-             * fee, the request must be made on behalf of another account, using the Stripe-Account header or OAuth key. For more information, see
-             * the application fees documentation.
-             */
-            application_fee?: number;
-
-            /**
-             * The email address of the customer placing the order. If a customer is specified, that customer's email address will be used.
-             *
-             * Optional, but required if not previously specified.
-             */
-            email?: string;
-        }
-
-        interface IOrderListOptions extends IListOptionsCreated {
-            /**
-             * Only return orders for the given customer
-             */
-            customer?: string;
-
-            /**
-             * Only return orders with the given IDs
-             */
-            ids?: Array<string>;
-
-            /**
-             * Only return orders that have the given status. One of "created", "paid", "fulfilled", or "refunded".
-             */
-            status: OrderStatus;
-
-            /**
-             * Filter orders based on when they were "paid", "fulfilled", "canceled", or "returned"
-             */
-            status_transitions?: {
-                /**
-                 * A filter on the list based on the object canceled field. The value can be a string with an integer Unix timestamp,
-                 * or it can be a dictionary with the following options:
-                 */
-                canceled?: IDateFilter;
-
-                /**
-                 * A filter on the list based on the object fulfilled field. The value can be a string with an integer Unix timestamp,
-                 * or it can be a dictionary with the following options:
-                 */
-                fulfilled?: IDateFilter;
-
-                /**
-                 * A filter on the list based on the object paid field. The value can be a string with an integer Unix timestamp,
-                 * or it can be a dictionary with the following options:
-                 */
-                paid?: IDateFilter;
-
-                /**
-                 * A filter on the list based on the object returned field. The value can be a string with an integer Unix timestamp,
-                 * or it can be a dictionary with the following options:
-                 */
-                returned?: IDateFilter;
-            }
-        }
-
-        interface IOrderItemCreationHash {
-            /**
-             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency)
-             * representing the total amount for the line item.
-             */
-            amount?: number;
-
-            /**
-             * 3-letter ISO code representing the currency of the line item.
-             */
-            currency?: string;
-
-            /**
-             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
-             */
-            description?: string;
-
-            /**
-             * The ID of the SKU being ordered.
-             */
-            parent: string;
-
-            /**
-             * The quantity of this order item. When type is sku, this is the number of instances of the SKU to be ordered.
-             */
-            quantity?: number;
-
-            /**
-             * The type of line item. One of "sku", "tax", "shipping", or "discount".
-             */
-            type?: "sku" | "tax" | "shipping" | "discount" ;
-        }
-
-        interface IShippingMethod {
-            id: string;
-
-            /**
-             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency)
-             * representing the total amount for the line item.
-             */
-            amount: number;
-
-            /**
-             * 3-letter ISO code representing the currency of the line item.
-             */
-            currency: string;
-
-            /**
-             * The estimated delivery date for the given shipping method. Can be either a specific date or a range.
-             */
-            delivery_estimate: {
-                /**
-                 * If type is "exact", date will be the expected delivery date in the format YYYY-MM-DD
-                 */
-                date: string;
-
-                /**
-                 * If type is "range", earliest will be be the earliest delivery date in the format YYYY-MM-DD
-                 */
-                earliest: string;
-
-                /**
-                 * If type is "range", latest will be the latest delivery date in the format YYYY-MM-DD
-                 */
-                latest: string;
-
-                /**
-                 * The type of estimate. Must be either "range" or "exact"
-                 */
-                type: "range" | "exact";
-            };
-
-            /**
-             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
-             */
-            description: string;
-        }
-
-        /**
-         * Current order status. One of created, paid, canceled, fulfilled, or returned. More detail in the Relay API Overview.
-         */
-        type OrderStatus = "created" | "paid" | "canceled" | "fulfilled" | "returned";
-    }
-
-    namespace plans {
-        /**
-         * A subscription plan contains the pricing information for different products and feature levels on your site.
-         * For example, you might have a $10/month plan for basic features and a different $20/month plan for premium features.
-         */
-        interface IPlan extends IResourceObject {
-            /**
-             * Value is "plan"
-             */
-            object: "plan";
-
-            /**
-             * The amount in cents to be charged on the interval specified
-             */
-            amount: number;
-
-            created: number;
-
-            /**
-             * Currency in which subscription will be charged
-             */
-            currency: string;
-
-            /**
-             * One of "day", "week", "month" or "year". The frequency with which a subscription should be billed.
-             */
-            interval: IntervalUnit;
-
-            /**
-             * The number of intervals (specified in the interval property) between each subscription billing. For example,
-             * interval=month and interval_count=3 bills every 3 months.
-             */
-            interval_count: number;
-
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * Display name of the plan
-             */
-            name: string;
-
-            /**
-             * Extra information about a charge for the customer's credit card statement.
-             */
-            statement_descriptor: string;
-
-            /**
-             * Number of trial period days granted when subscribing a customer to this plan. Null if the plan has no trial period.
-             */
-            trial_period_days: number;
-        }
-
-        interface IPlanCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * Unique string of your choice that will be used to identify this plan when subscribing a customer. This could be an identifier
-             * like "gold" or a primary key from your own database.
-             */
-            id: string;
-
-            /**
-             * A positive integer in cents/pence (or 0 for a free plan) representing how much to charge (on a recurring basis).
-             */
-            amount: number;
-
-            /**
-             * 3-letter ISO code for currency.
-             */
-            currency: string;
-
-            /**
-             * Specifies billing frequency. Either "day", "week", "month" or "year".
-             */
-            interval: IntervalUnit;
-
-            /**
-             * Name of the plan, to be displayed on invoices and in the web interface.
-             */
-            name: string;
-
-            /**
-             * The number of intervals between each subscription billing. For example, interval=month and interval_count=3 bills every 3 months.
-             * Maximum of one year interval allowed (1 year, 12 months, or 52 weeks).
-             */
-            interval_count?: number;
-
-            /**
-             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website
-             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan.
-             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII
-             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
-             */
-            statement_descriptor?: string;
-
-            /**
-             * Specifies a trial period in (an integer number of) days. If you include a trial period, the customer won't be billed for the first time
-             * until the trial period ends. If the customer cancels before the trial period is over, she'll never be billed at all.
-             */
-            trial_period_days?: number;
-        }
-
-        interface IPlanUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * Name of the plan, to be displayed on invoices and in the web interface.
-             */
-            name?: string;
-
-            /**
-             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website
-             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan.
-             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII
-             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
-             */
-            statement_descriptor?: string;
-        }
-
-        type IntervalUnit = "day" | "week" | "month" | "year";
-    }
-
-    namespace products {
-        interface IProduct extends IResourceObject {
-            /**
-             * Value is "product"
-             */
-            object: "product";
-
-            /**
-             * Whether or not the product is currently available for purchase.
-             */
-            active: boolean;
-
-            /**
-             * A list of up to 5 attributes that each SKU can provide values for (e.g. ["color", "size"]).
-             */
-            attributes: Array<string>;
-
-            /**
-             * A short one-line description of the product, meant to be displayable to the customer.
-             */
-            caption: string;
-
-            created: number;
-
-            /**
-             * An array of connect application identifiers that cannot purchase this product.
-             */
-            deactivated_on: Array<string>;
-
-            /**
-             * The product’s description, meant to be displayable to the customer.
-             */
-            description: string;
-
-            /**
-             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
-             */
-            images: Array<string>;
-
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * The product’s name, meant to be displayable to the customer.
-             */
-            name: string;
-
-            package_dimensions: IPackageDimensions;
-
-            /**
-             * Whether this product is a shipped good.
-             */
-            shippable: boolean;
-
-            /**
-             * A sublist of active SKUs associated with this product.
-             */
-            skus: IList<skus.ISku>;
-
-            updated: number;
-
-            /**
-             * A URL of a publicly-accessible webpage for this product.
-             */
-            url: string;
-        }
-
-        interface IProductCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * The identifier for the product. Must be unique. If not provided, an identifier will be randomly generated.
-             */
-            id?: string;
-
-            /**
-             * The product’s name, meant to be displayable to the customer.
-             */
-            name: string;
-
-            /**
-             * Whether or not the product is currently available for purchase. Defaults to true.
-             */
-            active?: boolean;
-
-            /**
-             * A list of up to 5 alphanumeric attributes that each SKU can provide values for (e.g. ["color", "size"]).
-             */
-            attribute?: Array<string>;
-
-            /**
-             * A short one-line description of the product, meant to be displayable to the customer.
-             */
-            caption?: string;
-
-            /**
-             * An array of Connect application names or identifiers that should not be able to order the SKUs for this product.
-             */
-            deactivate_on?: Array<string>;
-
-            /**
-             * The product’s description, meant to be displayable to the customer.
-             */
-            description?: string;
-
-            /**
-             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
-             */
-            images?: Array<string>;
-
-            package_dimensions?: IPackageDimensions;
-
-            /**
-             * Whether this product is shipped (i.e. physical goods). Defaults to true.
-             */
-            shippable?: boolean;
-
-            /**
-             * A URL of a publicly-accessible webpage for this product.
-             */
-            url?: string;
-        }
-
-        interface IProductUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * Whether or not the product is available for purchase. Setting this to false also deactivates any active, related SKUs. Setting this to
-             * true does not automatically activate any deactivated, related SKUs.
-             */
-            active?: boolean;
-
-            /**
-             * A short one-line description of the product, meant to be displayable to the customer.
-             */
-            caption?: string;
-
-            /**
-             * An array of Connect application names or identifiers that should not be able to order the SKUs for this product. This can be unset
-             * by updating the value to null and then saving.
-             */
-            deactivate_on?: Array<string>;
-
-            /**
-             * The product’s description, meant to be displayable to the customer.
-             */
-            description?: string;
-
-            /**
-             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer. This can be unset by updating the value to
-             * null and then saving.
-             */
-            images?: Array<string>;
-
-            /**
-             * The product’s name, meant to be displayable to the customer.
-             */
-            name?: string;
-
-            package_dimensions?: IPackageDimensions;
-
-            /**
-             * Whether this product is shipped (i.e. physical goods). Defaults to true.
-             */
-            shippable?: boolean;
-
-            /**
-             * A URL of a publicly-accessible webpage for this product.
-             */
-            url?: string;
-        }
-
-        interface IProductListOptions extends IListOptions {
-            /**
-             * Only return products that are active or inactive (e.g. pass false to list all inactive products).
-             */
-            active?: boolean;
-
-            /**
-             * Only return products with the given IDs.
-             */
-            ids?: Array<string>;
-
-            /**
-             * Only return products that can be shipped (i.e., physical, not digital products).
-             */
-            shippable?: boolean;
-
-            /**
-             * Only return products with the given url
-             */
-            url?: string;
-        }
-
-        /**
-         * The dimensions of this product for shipping purposes. A SKU associated with this product can override this value by having its
-         * own package_dimensions
-         */
-        interface IPackageDimensions {
-            /**
-             * Height, in inches. Maximum precision is 2 decimal places.
-             */
-            height: number;
-            /**
-             * Length, in inches. Maximum precision is 2 decimal places.
-             */
-            length: number;
-            /**
-             * Weight, in ounces. Maximum precision is 2 decimal places.
-             */
-            weight: number;
-            /**
-             * Width, in inches. Maximum precision is 2 decimal places.
-             */
-            width: number;
-        }
-    }
-
-    namespace recipientCards { }
-
-    namespace recipients {
-        interface IRecipient extends IResourceObject {
-
-        }
-     }
-
-    namespace skus {
-        interface ISku extends IResourceObject {
-            /**
-             * Value is "sku"
-             */
-            object: "sku";
-
-            /**
-             * Whether or not the SKU is available for purchase.
-             */
-            active: boolean;
-
-            attributes: ISkuAttributes;
-            created: number;
-
-            /**
-             * 3-letter ISO code for currency.
-             */
-            currency: string;
-
-            /**
-             * The URL of an image for this SKU, meant to be displayable to the customer.
-             */
-            image: string;
-
-            inventory: IInventory;
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * The dimensions of this SKU for shipping purposes.
-             */
-            package_dimensions: products.IPackageDimensions;
-
-            /**
-             * The cost of the item as a positive integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1,
-             * Japanese Yen being a 0-decimal currency).
-             */
-            price: number;
-
-            /**
-             * The ID of the product this SKU is associated with. The product must be currently active. [Expandable]
-             */
-            product: string | products.IProduct;
-
-            updated: number;
-        }
-
-        interface ISkuCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * The identifier for the SKU. Must be unique. If not provided, an identifier will be randomly generated.
-             */
-            id?: string;
-
-            /**
-             * 3-letter ISO code for currency.
-             */
-            currency: string;
-
-            inventory: IInventory;
-
-            /**
-             * The cost of the item as a nonnegative integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1,
-             * Japanese Yen being a 0-decimal currency).
-             */
-            price: number;
-
-            /**
-             * The ID of the product this SKU is associated with.
-             */
-            product: string;
-
-            /**
-             * Whether or not the SKU is available for purchase. Default to true.
-             */
-            active?: boolean;
-
-            attributes?: ISkuAttributes;
-
-            /**
-             * The URL of an image for this SKU, meant to be displayable to the customer.
-             */
-            image?: string;
-
-            /**
-             * The dimensions of this SKU for shipping purposes.
-             */
-            package_dimensions?: products.IPackageDimensions;
-        }
-
-        interface ISkuUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * Whether or not the SKU is available for purchase.
-             */
-            active?: boolean;
-
-            /**
-             * 3-letter ISO code for currency.
-             */
-            currency?: string;
-
-            /**
-             * The URL of an image for this SKU, meant to be displayable to the customer.
-             * This can be unset by updating the value to null and then saving.
-             */
-            image?: string;
-
-            inventory?: IInventory;
-
-            /**
-             * The dimensions of this SKU for shipping purposes.
-             */
-            package_dimensions?: products.IPackageDimensions;
-
-            /**
-             * The cost of the item as a nonnegative integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1,
-             * Japanese Yen being a 0-decimal currency).
-             */
-            price?: number;
-
-            /**
-             * The ID of the product this SKU is associated with.
-             */
-            product?: string;
-        }
-
-        interface ISkuListOptions extends IListOptions {
-            /**
-             * Only return SKUs that are active or inactive (e.g. pass false to list all inactive products).
-             */
-            active?: boolean;
-
-            /**
-             * Only return SKUs that have the specified key/value pairs in this partially constructed dictionary.
-             * Can be specified only if product is also supplied. For instance, if the associated product has
-             * attributes ["color", "size"], passing in attributes[color]=red returns all the SKUs for this product
-             * that have color set to red.
-             */
-            attributes?: ISkuAttributes;
-
-            /**
-             * Only return SKUs with the given IDs.
-             */
-            ids?: Array<string>;
-
-            /**
-             * Only return SKUs that are either in stock or out of stock (e.g. pass false to list all SKUs that are out of stock).
-             * If no value is provided, all SKUs are returned.
-             */
-            in_stock?: boolean;
-
-            /**
-             * The ID of the product whose SKUs will be retrieved.
-             */
-            product?: string;
-        }
-
-        /**
-         * Description of the SKU’s inventory.
-         */
-        interface IInventory {
-            /**
-             * The count of inventory available. Will be present if and only if type is "finite".
-             *
-             * Positive integer or zero
-             */
-            quantity?: number;
-
-            /**
-             * Inventory type. Possible values are "finite", "bucket"" (not quantified), and "infinite".
-             */
-            type: "finite" | "bucket" | "infinite" ;
-
-            /**
-             * An indicator of the inventory available. Possible values are "in_stock", "limited", and "out_of_stock".
-             * Will be present if and only if type is "bucket".
-             */
-            value?: "in_stock" | "limited" | "out_of_stock";
-        }
-
-        /**
-         * A dictionary of attributes and values for the attributes defined by the product.
-         * If, for example, a product’s attributes are ["size", "gender"],
-         * a valid SKU has the following dictionary of attributes: {"size": "Medium", "gender": "Unisex"}.
-         */
-        interface ISkuAttributes {}
-    }
-
-    namespace webhooks {
-        interface StripeWebhookEvent<T> {
-            id: string;
-            object: string;
-            api_version: string;
-            created: Date;
-            data: {
-              object: T;
-            };
-            livemode: boolean;
-            pending_webhooks: number;
-            /**
-             * One of https://stripe.com/docs/api#event_types
-             * E.g. account.updated
-             */
-            type: string;
-        }
-    }
-
-    namespace tokens {
-        interface IToken extends ICardToken, IBankAccountToken { }
-
-        interface ICardToken extends ITokenBase {
-            /**
-             * Hash describing the card used to make the charge
-             */
-            card?: cards.ICardHash;
-        }
-
-        interface IBankAccountToken extends ITokenBase {
-            /**
-             * Hash describing the bank account
-             */
-            bank_account?: bankAccounts.IBankAccountHash;
-        }
-
-        interface ITokenBase extends IResourceObject {
-            /**
-             * Value is "token""
-             */
-            object: "token" ;
-
-            /**
-             * IP address of the client that generated the token
-             */
-            client_ip: string;
-
-            created: number;
-            livemode: boolean;
-
-            /**
-             * Type of the token: card or bank_account
-             */
-            type: "card" | "bank_account" ;
-
-            /**
-             * Whether or not this token has already been used (tokens can be used only once)
-             */
-            used: boolean;
-        }
-
-        interface ITokenCreationOptionsBase extends IDataOptions {
-            /**
-             * The customer (owned by the application's account) to create a
-             * token for. For use with Stripe Connect only; this can only be used
-             * with an OAuth access token or Stripe-Account header. For more
-             * details, see the shared customers documentation.
-             *
-             * Stripe connect only
-             */
-            customer?: string;
-        }
-
-        interface ICardTokenCreationOptions extends ITokenCreationOptionsBase {
-            /**
-             * The card this token will represent. If you also pass in a customer,
-             * the card must be the ID of a card belonging to the customer.
-             * Otherwise, if you do not pass a customer, a object containing a
-             * user's credit card details, with the options described below.
-             */
-            card: sources.ISourceCreationOptions;
-        }
-
-        interface IBankAccountTokenCreationOptions extends ITokenCreationOptionsBase {
-            /**
-             * The card this token will represent. If you also pass in a customer,
-             * the card must be the ID of a card belonging to the customer.
-             * Otherwise, if you do not pass a customer, a object containing a
-             * user's credit card details, with the options described below.
-             */
-            bank_account: bankAccounts.ISourceCreationOptions;
-        }
-
-        interface IPiiTokenCreationOptions extends IDataOptions {
-            pii: {
-                /**
-                 * The personal_id_number for PII in string form.
-                 */
-                personal_id_number: string;
-            }
-        }
-    }
-
-    namespace transfers {
-        interface ITransfer extends IResourceObject {
-            /**
-             * Value is "transfer"
-             */
-            object: "transfer";
-
-            /**
-             * Amount (in cents) to be transferred to your bank account
-             */
-            amount: number;
-
-            /**
-             * Amount in cents reversed (can be less than the amount attribute on the transfer if a partial reversal was issued).
-             */
-            amount_reversed: number;
-
-            application_fee: string;
-
-            /**
-             * Balance transaction that describes the impact of this transfer on your account balance. [Expandable]
-             */
-            balance_transaction: string | balance.IBalanceTransaction;
-
-            /**
-             * Time that this record of the transfer was first created.
-             */
-            created: number;
-
-            /**
-             * Three-letter ISO currency code representing the currency.
-             */
-            currency: string;
-
-            /**
-             * Date the transfer is scheduled to arrive in the bank. This factors in delays like weekends or bank holidays.
-             */
-            date: number;
-
-            /**
-             * Internal-only description of the transfer
-             */
-            description: string;
-
-            /**
-             * ID of the bank account, card, or Stripe account the transfer was sent to. [Expandable]
-             */
-            destination: string | bankAccounts.IBankAccount | cards.ICardHash | accounts.IAccount;
-
-            /**
-             * If the destination is a Stripe account, this will be the ID of the
-             * payment that the destination account received for the transfer. [Expandable]
-             */
-            destination_payment: string;
-
-            /**
-             * Error code explaining reason for transfer failure if available. See Types of transfer failures for a
-             * list of failure codes: https://stripe.com/docs/api#transfer_failures
-             */
-            failure_code: string;
-
-            /**
-             * Message to user further explaining reason for transfer failure if available.
-             */
-            failure_message: string;
-
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * A list of reversals that have been applied to the transfer.
-             */
-            reversals: ITransferReversals;
-
-            /**
-             * Whether or not the transfer has been fully reversed. If the transfer is only partially reversed, this attribute
-             * will still be false.
-             */
-            reversed: boolean;
-
-            /**
-             * ID of the charge (or other transaction) that was used to fund the
-             * transfer. If null, the transfer was funded from the available
-             * balance. [Expandable]
-             */
-            source_transaction: string | charges.ICharge;
-
-            /**
-             * The source balance this transfer came from.
-             * One of card, bank_account, bitcoin_receiver, or alipay_account
-             */
-            source_type: SourceTypes;
-
-            /**
-             * Extra information about a transfer to be displayed on the user's bank statement.
-             */
-            statement_descriptor: string;
-
-            /**
-             * Current status of the transfer (paid, pending, in_transit, canceled or failed).
-             * A transfer will be pending until it is submitted to the bank, at which point
-             * it becomes in_transit. It will then change to paid if the transaction goes
-             * through. If it does not go through successfully, its status will change to
-             * failed or canceled.
-             */
-            status: Statuses;
-
-            /**
-             * Can be card, bank_account, or stripe_account.
-             */
-            type: "card" | "bank_account" | "stripe_account" ;
-        }
-
-        interface ITransferReversals extends IList<transferReversals.IReversal>, resources.TransferReversals {}
-
-        interface ITransferCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * A positive integer in cents/pence representing how much to transfer.
-             */
-            amount: number;
-
-            /**
-             * 3-letter ISO code for currency.
-             */
-            currency: string;
-
-            /**
-             * The id of a bank account or a card to send the transfer to, or the
-             * string "default_for_currency" to use the default external
-             * account for the specified currency.
-             *
-             * If you use Stripe Connect, this can be the the id of a connected
-             * Stripe account; see the details about when such transfers are
-             * permitted.
-             */
-            destination: string;
-
-            /**
-             * An arbitrary string which you can attach to a transfer object. It is
-             * displayed when in the web interface alongside the transfer.
-             */
-            description?: string
-
-            /**
-             * You can use this parameter to transfer funds from a charge (or
-             * other transaction) before they are added to your available
-             * balance. A pending balance will transfer immediately but the
-             * funds will not become available until the original charge
-             * becomes available. See the Connect documentation for details.
-             */
-            source_transaction?: string;
-
-            /**
-             * A string to be displayed on the recipient's bank or card
-             * statement. This may be at most 22 characters. Attempting to use
-             * a statement_descriptor longer than 22 characters will return
-             * an error. Note: Most banks will truncate this information and/or
-             * display it inconsistently. Some may not display it at all.
-             */
-            statement_descriptor?: string;
-
-            /**
-             * The source balance to draw this transfer from. Balances for
-             * different payment sources are kept separately. You can find the
-             * amounts with the balances API. Valid options are:
-             * "alipay_account", "bank_account", "bitcoin_receiver", and "card".
-             */
-            source_type?: SourceTypes;
-        }
-
-        interface ITransferUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * An arbitrary string which you can attach to a transfer object. It is
-             * displayed when in the web interface alongside the transfer. This
-             * can be unset by updating the value to null and then saving.
-             */
-            description?: string;
-        }
-
-        interface ITransferListOptions extends IListOptionsCreated {
-            date?: IDateFilter;
-
-            /**
-             * Only return transfers for the destination specified by this
-             * account ID.
-             */
-            destination?: string;
-
-            /**
-             * Only return transfers for the recipient specified by this
-             * recipient ID.
-             */
-            recipient?: string;
-
-            /**
-             * Only return transfers that have the given status:
-             * pending, paid, failed, in_transit, or canceled.
-             */
-            status: Statuses;
-        }
-
-        type SourceTypes = "alipay_account" | "bank_account" | "bitcoin_receiver" | "card";
-
-        type Statuses = "pending" | "paid" | "failed" | "in_transit" | "canceled";
-    }
-
-    namespace transferReversals {
-        interface IReversal extends IResourceObject {
-            /**
-             * Value is 'transfer_reversal'
-             */
-            object: "transfer_reversal";
-
-            /**
-             * Amount reversed, in cents/pence.
-             */
-            amount: number;
-
-            /**
-             * Balance transaction that describes the impact of this reversal on your account balance. [Expandable]
-             */
-            balance_transaction: string | balance.IBalanceTransaction;
-
-            created: number;
-
-            /**
-             * Three-letter ISO currency code representing the currency.
-             */
-            currency: string;
-
-            metadata: IMetadata;
-
-            /**
-             * ID of the transfer that was reversed. [Expandable]
-             */
-            transfer: string | transfers.ITransfer;
-        }
-
-        interface IReversalCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * A positive integer in cents/pence representing how much of this transfer to reverse. Can only reverse up to the unreversed amount
-             * remaining of the transfer. Partial transfer reversals are only allowed for transfers to Stripe Accounts.
-             */
-            amount?: number;
-
-            /**
-             * An arbitrary string which you can attach to a reversal object. It is displayed alongside the reversal in the dashboard. This will
-             * be unset if you POST an empty value.
-             */
-            description?: string;
-
-            /**
-             * Boolean indicating whether the application fee should be refunded when reversing this transfer. If a full transfer reversal is
-             * given, the full application fee will be refunded. Otherwise, the application fee will be refunded with an amount proportional to
-             * the amount of the transfer reversed.
-             */
-            refund_application_fee?: boolean;
-        }
-
-        interface IReversalUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * An arbitrary string which you can attach to a reversal object. It is displayed when in the web interface alongside the
-             * reversal. This can be unset by updating the value to null and then saving.
-             */
-            description?: string;
-        }
-    }
-
-    namespace bankAccounts {
-        interface IBankAccount extends IBankAccountHash {
-            account: string;
-
-            /**
-             * This indicates whether or not this bank account is the default external account for its currency.
-             */
-            default_for_currency: boolean;
-
-            /**
-             * A set of key/value pairs that you can attach to a bank account object. It
-             * can be useful for storing additional information about the bank account in
-             * a structured format.
-             */
-            metadata: IMetadata;
-        }
-
-        interface IBankAccountHash extends IResourceObject {
-            /**
-             * value is "customer_bank_account"
-             */
-            object: "customer_bank_account";
-
-            /**
-             * The name of the person or business that owns the bank account.
-             */
-            account_holder_name: string;
-
-            /**
-             * The type of entity that holds the account. This can be either
-             * "individual"" or "company".
-             */
-            account_holder_type: string;
-
-            /**
-             * Name of the bank associated with the routing number, e.g. WELLS FARGO.
-             */
-            bank_name: string;
-
-            /**
-             * Two-letter ISO code representing the country the bank account is located in.
-             */
-            country: string;
-
-            /**
-             * Three-letter ISO currency code representing the currency paid out to the bank account.
-             */
-            currency: string;
-
-            /**
-             * Uniquely identifies this particular bank account. You can use this attribute
-             * to check whether two bank accounts are the same.
-             */
-            fingerprint: string;
-
-            last4: string;
-
-            /**
-             * The routing transit number for the bank account.
-             */
-            routing_number: string;
-
-            /**
-             * Possible values are "new", "validated", "verified", "verification_failed",
-             * or "errored". A bank account that hasn’t had any activity or validation
-             * performed is "new". If Stripe can determine that the bank account exists, its
-             * status will be "validated". Note that there often isn’t enough information
-             * to know (e.g. for smaller credit unions), and the validation is not always
-             * run. If customer bank account verification has succeeded, the bank
-             * account status will be "verified". If the verification failed for any reason,
-             * such as microdeposit failure, the status will be "verification_failed". If a
-             * transfer sent to this bank account fails, we’ll set the status to "errored""
-             * and will not continue to send transfers until the bank details are updated.
-             */
-            status: "new" | "validated" | "verified" | "verification_failed" | "error" ;
-        }
-
-        interface ISourceCreationOptions {
-            /**
-             * The account number for the bank account in string form.
-             * Must be a checking account.
-             */
-            account_number: string;
-
-            /**
-             * The country the bank account is in.
-             */
-            country: string;
-
-            /**
-             * The currency the bank account is in. This must be a
-             * country/currency pairing that Stripe supports.
-             */
-            currency: string;
-
-            /**
-             * The routing number, sort code, or other country-appropriate
-             * institution number for the bank account. For US bank
-             * accounts, this is required and should be the ACH routing
-             * number, not the wire routing number. If you are providing an
-             * IBAN for account_number, this field is not required.
-             */
-            routing_number?: string;
-
-            /**
-             * The name of the person or business that owns the bank
-             * account. This field is required when attaching the bank
-             * account to a customer object.
-             */
-            account_holder_name?: string;
-
-            /**
-             * The type of entity that holds the account. This can be either
-             * "individual" or "company". This field is required when
-             * attaching the bank account to a customer object.
-             */
-            account_holder_type?: "individual" | "company" ;
-        }
-
-        interface IBankAccountUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * The name of the person or business that owns the bank account.
-             */
-            account_holder_name?: string;
-
-            /**
-             * The type of entity that holds the account. This can be either "individual" or "company".
-             */
-            account_holder_type?: "individual" | "company";
-        }
-    }
-
-    namespace bitcoinReceivers {
-        /**
-         * A Bitcoin receiver wraps a Bitcoin address so that a customer can push a payment to you. This guide describes how to use
-         * receivers to create Bitcoin payments.
-         */
-        interface IBitcoinReceiver extends IResourceObject {
-            /**
-             * Value is "bitcoin_receiver"
-             */
-            object: "bitcoin_receiver";
-
-            /**
-             * True when this bitcoin receiver has received a non-zero amount of bitcoin.
-             */
-            active: boolean;
-
-            /**
-             * The amount of currency that you are collecting as payment.
-             */
-            amount: number;
-
-            /**
-             * The amount of currency to which bitcoin_amount_received has been converted.
-             */
-            amount_received: number;
-
-            /**
-             * The amount of bitcoin that the customer should send to fill the receiver. The bitcoin_amount is denominated in Satoshi:
-             * there are 10^8 Satoshi in one bitcoin.
-             */
-            bitcoin_amount: number;
-
-            /**
-             * The amount of bitcoin that has been sent by the customer to this receiver.
-             */
-            bitcoin_amount_received: number;
-
-            /**
-             * This URI can be displayed to the customer as a clickable link (to activate their bitcoin client) or as a QR code (for mobile wallets).
-             */
-            bitcoin_uri: number;
-
-            created: number;
-
-            /**
-             * Three-letter ISO currency code representing the currency to which the bitcoin will be converted.
-             */
-            currency: string;
-
-            customer: string;
-            description: string;
-
-            /**
-             * The customer's email address, set by the API call that creates the receiver.
-             */
-            email: string;
-
-            /**
-             * This flag is initially false and updates to true when the customer sends the bitcoin_amount to this receiver.
-             */
-            filled: boolean;
-
-            /**
-             * A bitcoin address that is specific to this receiver. The customer can send bitcoin to this address to fill the receiver.
-             */
-            inbound_address: string;
-
-            livemode: boolean;
-            metadata: IMetadata;
-
-            /**
-             * The ID of the payment created from the receiver, if any. Hidden when viewing the receiver with a publishable key.
-             */
-            payment: string;
-
-            /**
-             * The refund address for these bitcoin, if communicated by the customer.
-             */
-            refund_address: string;
-
-            /**
-             * A list with one entry for each time that the customer sent bitcoin to the receiver. Hidden when viewing the
-             * receiver with a publishable key.
-             */
-            transactions: IList<IBitcoinTransaction>;
-
-            /**
-             * This receiver contains uncaptured funds that can be used for a payment or refunded.
-             */
-            uncaptured_funds: boolean;
-
-            used_for_payment: boolean;
-        }
-
-        interface IBitcoinTransaction extends IResourceObject {
-            /**
-             * Value is 'list'
-             */
-            object: string;
-
-            /**
-             * The amount of currency that the transaction was converted to in real-time.
-             */
-            amount: number;
-
-            /**
-             * The amount of bitcoin contained in the transaction.
-             */
-            bitcoin_amount: number;
-
-            created: number;
-
-            /**
-             * The currency to which this transaction was converted.
-             */
-            currency: string;
-
-            /**
-             * The receiver to which this transaction was sent.
-             */
-            receiver: string;
-        }
-
-        interface IBitcoinReceiverCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * The amount of currency that you will be paid.
-             */
-            amount: number;
-
-            /**
-             * The currency to which the bitcoin will be converted. You will be paid out in this currency. Only USD is currently supported.
-             */
-            currency: string;
-
-            /**
-             * The email address of the customer.
-             */
-            email: string;
-
-            description?: string;
-
-            /**
-             * A flag that indicates whether you would like Stripe to automatically handle refunds for any mispayments to the receiver.
-             */
-            refund_mispayments?: boolean;
-        }
-
-        interface IBitcoinReceiverListOptions extends IListOptions {
-            /**
-             * Filter for active receivers.
-             */
-            active?: boolean;
-
-            /**
-             * Filter for filled receivers.
-             */
-            filled?: boolean;
-
-            /**
-             * Filter for receivers with uncaptured funds.
-             */
-            uncaptured_funds?: boolean;
-        }
-    }
-
-    namespace cards {
-        /**
-         * You can store multiple cards on a customer in order to charge the customer later. You
-         * can also store multiple debit cards on a recipient in order to transfer to those cards later.
-         */
-        interface ICard extends ICardHash {
-            /**
-             * The account this card belongs to. This attribute will not be in the
-             * card object if the card belongs to a customer or recipient instead.
-             * [Expandable]
-             */
-            account?: string | accounts.IAccount;
-
-            /**
-             * Only applicable on accounts (not customers or recipients). The
-             * card can be used as a transfer destination for funds in this
-             * currency.
-             */
-            currency?: string;
-
-            /**
-             * The customer that this card belongs to. This attribute will not be
-             * in the card object if the card belongs to an account or recipient
-             * instead.
-             */
-            customer?: customers.ICustomer;
-
-            /**
-             * Only applicable on accounts (not customers or recipients). This
-             * indicates whether or not this card is the default external account
-             * for its currency.
-             */
-            default_for_currency?: boolean;
-
-            /**
-             * The recipient that this card belongs to. This attribute will not be
-             * in the card object if the card belongs to a customer or account
-             * instead. [Expandable]
-             */
-            recipient?: string | recipients.IRecipient;
-        }
-
-        /**
-         * Hash describing the card used to make the charge
-         */
-        interface ICardHash extends IResourceObject {
-            /**
-             * ID of card (used in conjunction with a customer or recipient ID)
-             */
-            id: string;
-
-            /**
-             * Value is 'card'
-             */
-            object: string;
-
-            /**
-             * The card number
-             */
-            number: number;
-
-            /**
-             * Card brand. Can be Visa, American Express, MasterCard, Discover, JCB, Diners Club, or Unknown.
-             */
-            brand: "Visa" | "American Express" | "MasterCard" | "Discover" | "JCB" | "Diners Club" | "Unknown" ;
-            exp_month: number;
-            exp_year: number;
-
-            /**
-             * Card funding type. Can be credit, debit, prepaid, or unknown
-             */
-            funding: "credit" | "debit" | "prepaid" | "unknown";
-            last4: string;
-            address_city: string;
-
-            /**
-             * Billing address country, if provided when creating card
-             */
-            address_country: string;
-            address_line1: string;
-
-            /**
-             * If address_line1 was provided, results of the check: pass, fail, unavailable, or unchecked.
-             */
-            address_line1_check: string;
-            address_line2: string;
-            address_state: string;
-            address_zip: string;
-
-            /**
-             * If address_zip was provided, results of the check: pass, fail, unavailable, or unchecked.
-             */
-            address_zip_check: "pass" | "fail" | "unavailable" | "unchecked" ;
-
-            /**
-             * Two-letter ISO code representing the country of the card. You could use this
-             * attribute to get a sense of the international breakdown of cards you've collected.
-             */
-            country: string;
-
-            /**
-             * If a CVC was provided, results of the check: pass, fail, unavailable, or unchecked
-             */
-            cvc_check: "pass" | "fail" | "unavailable" | "unchecked";
-
-            /**
-             * (For Apple Pay integrations only.) The last four digits of the device account number.
-             */
-            dynamic_last4: string;
-
-            /**
-             * Cardholder name
-             */
-            name: string;
-
-            /**
-             * Uniquely identifies this particular card number. You can use this attribute to check
-             * whether two customers who've signed up with you are using the same card number, for example.
-             */
-            fingerprint: string;
-
-            metadata?: IMetadata;
-
-            /**
-             * If the card number is tokenized, this is the method that was
-             * used. Can be "apple_pay" or "android_pay".
-             */
-            tokenization_method: "apple_pay" | "android_pay";
-        }
-
-        interface ICardUpdateOptions extends IDataOptionsWithMetadata {
-            address_city?: string;
-            address_country?: string;
-            address_line1?: string;
-            address_line2?: string;
-            address_state?: string;
-            address_zip?: string;
-
-            /**
-             * Only applicable on accounts (not customers or recipients).
-             * If set to true, this card will become the default external
-             * account for its currency.
-             *
-             * Managed accounts only
-             */
-            default_for_currency?: boolean;
-
-            exp_month?: number;
-            exp_year?: number;
-
-            /**
-             * Cardholder name
-             */
-            name?: string;
-        }
-
-        interface ISourceCreationOptions {
-            /**
-             * he type of payment source. Should be "card".
-             */
-            object: "card";
-
-            /**
-             * Two digit number representing the card's expiration month.
-             */
-            exp_month: number;
-
-            /**
-             * Two or four digit number representing the card's expiration year.
-             */
-            exp_year: number;
-
-            /**
-             * The card number, as a string without any separators.
-             */
-            number: number;
-
-            /**
-             * Card security code. Required unless your account is registered in
-             * Australia, Canada, or the United States. Highly recommended to always
-             * include this value.
-             */
-            cvc?: string;
-
-            /**
-             * Cardholder's full name.
-             */
-            name?: string;
-
-            address_city?: string;
-            address_country?: string;
-            address_line1?: string;
-            address_line2?: string;
-            address_state?: string;
-            address_zip?: string;
-
-            metadata?: IMetadata;
-        }
-
-        interface ISourceCreationOptionsExtended extends ISourceCreationOptions {
-            /**
-             * Required when adding a card to an account (not applicable to a
-             * customers or recipients). The card (which must be a debit card) can be
-             * used as a transfer destination for funds in this currency. Currently, the
-             * only supported currency for debit card transfers is usd.
-             *
-             * Managed accounts only.
-             */
-            currency?: string;
-
-            /**
-             * Only applicable on accounts (not customers or recipients). If you set
-             * this to true (or if this is the first external account being added in this
-             * currency) this card will become the default external account for its
-             * currency.
-             *
-             * Managed accounts only.
-             */
-            default_for_currency?: boolean;
-        }
-    }
-
-    namespace subscriptions {
-        /**
-         * Subscriptions allow you to charge a customer's card on a recurring basis. A subscription ties a customer to
-         * a particular plan you've created: https://stripe.com/docs/api#create_plan
-         */
-        interface ISubscription extends IResourceObject {
-            /**
-             * Value is "subscription"
-             */
-            object: "subscription";
-
-            /**
-             * A positive decimal that represents the fee percentage of the subscription invoice amount that will be transferred to
-             * the application owner's Stripe account each billing period.
-             */
-            application_fee_percent: number;
-
-            /**
-             * If the subscription has been canceled with the at_period_end flag set to true, cancel_at_period_end on the
-             * subscription will be true. You can use this attribute to determine whether a subscription that has a status
-             * of active is scheduled to be canceled at the end of the current period.
-             */
-            cancel_at_period_end: boolean;
-
-            /**
-             * If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with
-             * cancel_at_period_end, canceled_at will still reflect the date of the initial cancellation request, not the end of the
-             * subscription period when the subscription is automatically moved to a canceled state.
-             */
-            canceled_at: number;
-
-            created: number;
-
-            /**
-             * End of the current period that the subscription has been invoiced for. At the end of this period, a new invoice will be created.
-             */
-            current_period_end: number;
-
-            /**
-             * Start of the current period that the subscription has been invoiced for
-             */
-            current_period_start: number;
-
-            customer: string;
-
-            /**
-             * Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a
-             * subscription overrides a discount applied on a customer-wide basis.
-             */
-            discount: coupons.IDiscount;
-
-            /**
-             * If the subscription has ended (either because it was canceled or because the customer was switched to a subscription
-             * to a new plan), the date the subscription ended
-             */
-            ended_at: number;
-
-            metadata: IMetadata;
-
-            /**
-             * Hash describing the plan the customer is subscribed to
-             */
-            plan: plans.IPlan;
-
-            /**
-             * The number of subscriptions for the associated plan
-             */
-            quantity: number;
-
-            /**
-             * Date the subscription started
-             */
-            start: number;
-
-            /**
-             * Possible values are "trialing", "active", "past_due", "canceled", or "unpaid". A subscription still in its trial period is trialing
-             * and moves to active when the trial period is over. When payment to renew the subscription fails, the subscription becomes
-             * past_due. After Stripe has exhausted all payment retry attempts, the subscription ends up with a status of either canceled
-             * or unpaid depending on your retry settings. Note that when a subscription has a status of unpaid, no subsequent invoices
-             * will be attempted (invoices will be created, but then immediately automatically closed. Additionally, updating customer
-             * card details will not lead to Stripe retrying the latest invoice.). After receiving updated card details from a customer,
-             * you may choose to reopen and pay their closed invoices.
-             */
-            status: "trialing" | "active" | "past_due" | "canceled" | "unpaid";
-
-            /**
-             * If provided, each invoice created by this subscription will apply the tax rate, increasing the amount billed to the customer.
-             */
-            tax_percent: number;
-
-            /**
-             * If the subscription has a trial, the end of that trial.
-             */
-            trial_end: number;
-
-            /**
-             * If the subscription has a trial, the beginning of that trial.
-             */
-            trial_start: number;
-        }
-
-        interface ISubscriptionCustCreationOptions extends IDataOptionsWithMetadata {
-            /**
-             * The identifier of the plan to subscribe the customer to.
-             */
-            plan: string;
-
-            /**
-             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
-             * subtotal that will be transferred to the application owner’s Stripe account. The request must be made with an OAuth key in order
-             * to set an application fee percentage. For more information, see the application fees documentation.
-             */
-            application_fee_percent?: number;
-
-            /**
-             * The code of the coupon to apply to this subscription. A coupon applied to a subscription will only affect invoices created for that
-             * particular subscription.
-             */
-            coupon?: string;
-
-            source?: sources.ISourceCreationOptions;
-
-            /**
-             * The quantity you'd like to apply to the subscription you're creating. For example, if your plan is £10/user/month, and your customer
-             * has 5 users, you could pass 5 as the quantity to have the customer charged £50 (5 x £10) monthly. If you update a subscription but
-             * don't change the plan ID (e.g. changing only the trial_end), the subscription will inherit the old subscription's quantity attribute
-             * unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new subscription will not inherit
-             * the quantity attribute and will default to 1 unless you pass a quantity parameter.
-             */
-            quantity?: number;
-
-            /**
-             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
-             * subtotal that will be calculated and added as tax to the final amount each billing period. For example, a plan which charges $10/month
-             * with a tax_percent of 20.0 will charge $12 per invoice.
-             */
-            tax_percent?: number;
-
-            /**
-             * Unix timestamp representing the end of the trial period the customer will get before being charged for the first time. If set, trial_end
-             * will override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to end the
-             * customer's trial immediately.
-             */
-            trial_end?: number;
-        }
-
-        interface ISubscriptionCreationOptions extends ISubscriptionCustCreationOptions {
-            /***
-             * The identifier of the customer to subscribe.
-             */
-            customer: string;
-        }
-
-        interface ISubscriptionUpdateOptions extends IDataOptionsWithMetadata {
-            /**
-             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
-             * subtotal that will be transferred to the application owner’s Stripe account. The request must be made with an OAuth key in order
-             * to set an application fee percentage. For more information, see the application fees documentation.
-             */
-            application_fee_percent?: number;
-
-            /**
-             * The code of the coupon to apply to this subscription. A coupon applied to a subscription will only affect invoices created for that
-             * particular subscription.
-             */
-            coupon?: string;
-
-            /**
-             * The identifier of the plan to update the subscription to. If omitted, the subscription will not change plans.
-             */
-            plan?: string;
-
-            /**
-             * Flag telling us whether to prorate switching plans during a billing cycle.
-             */
-            prorate?: boolean;
-
-            /**
-             * If set, the proration will be calculated as though the subscription was updated at the given time. This can be used to apply exactly the
-             * same proration that was previewed with upcoming invoice endpoint. It can also be used to implement custom proration logic, such as
-             * prorating by day instead of by second, by providing the time that you wish to use for proration calculations.
-             */
-            proration_date?: number;
-
-            /**
-             * The quantity you'd like to apply to the subscription you're creating. For example, if your plan is £10/user/month, and your customer
-             * has 5 users, you could pass 5 as the quantity to have the customer charged £50 (5 x £10) monthly. If you update a subscription but
-             * don't change the plan ID (e.g. changing only the trial_end), the subscription will inherit the old subscription's quantity attribute
-             * unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new subscription will not inherit
-             * the quantity attribute and will default to 1 unless you pass a quantity parameter.
-             */
-            quantity?: number;
-
-            source?: sources.ISourceCreationOptions;
-
-            /**
-             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
-             * subtotal that will be calculated and added as tax to the final amount each billing period. For example, a plan which charges $10/month
-             * with a tax_percent of 20.0 will charge $12 per invoice.
-             */
-            tax_percent?: number;
-
-            /**
-             * Unix timestamp representing the end of the trial period the customer will get before being charged for the first time. If set, trial_end
-             * will override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to end the
-             * customer's trial immediately.
-             */
-            trial_end?: number;
-        }
-
-        interface ISubscriptionCancellationOptions extends IDataOptions {
-            /**
-             * A flag that if set to true will delay the cancellation of the subscription until the end of the current period.
-             */
-            at_period_end?: boolean;
-        }
-
-        interface ISubscriptionListOptions extends IListOptionsCreated {
-            /**
-             * The ID of the customer whose subscriptions will be retrieved
-             */
-            customer?: string;
-
-            /**
-             * The ID of the plan whose subscriptions will be retrieved
-             */
-            plan?: string;
-        }
-    }
-
-    namespace refunds {
-        interface IRefund {
-            id: string;
-
-            /**
-             * Value is 'refund'
-             */
-            object: string;
-
-            /**
-             * Amount in cents/pence.
-             */
-            amount: number;
-
-            /**
-             * Balance transaction that describes the impact of this reversal on your account balance.
-             */
-            balance_transaction: string;
-
-            /**
-             * ID of the charge that was refunded. [Expandable]
-             */
-            charge: string | charges.ICharge;
-
-            created: number;
-
-            /**
-             * Three-letter ISO currency code representing the currency in which the charge was made.
-             */
-            currency: string;
-
-            description: string;
-
-            /**
-             * A set of key/value pairs that you can attach to the object. It can be useful
-             * for storing additional information in a structured format.
-             */
-            metadata: IMetadata;
-
-            /**
-             * Reason for the refund. If set, possible values are "duplicate", "fraudulent", and "requested_by_customer".
-             */
-            reason: string;
-
-            /**
-             * This is the transaction number that appears on email receipts sent for this refund.
-             */
-            receipt_number: string;
-        }
-
-        interface IRefundCreationOptions extends IDataOptions {
-            /**
-             * A positive integer in cents/pence representing how much of this charge to
-             * refund. Can only refund up to the unrefunded amount remaining of the
-             * charge.
-             *
-             * default is entire charge
-             */
-            amount?: number;
-
-            /**
-             * A set of key/value pairs that you can attach to a refund object. It can be
-             * useful for storing additional information about the refund in a structured
-             * format. You can unset an individual key by setting its value to null and
-             * then saving. To clear all keys, set metadata to null, then save.
-             */
-            metadata?: IMetadata;
-
-            /**
-             * String indicating the reason for the refund. If set, possible values are
-             * "duplicate", "fraudulent", and "requested_by_customer". Specifying
-             * "fraudulent" as the reason when you believe the charge to be fraudulent
-             * will help us improve our fraud detection algorithms.
-             */
-            reason?: string;
-
-            /**
-             * Boolean indicating whether the application fee should be refunded when
-             * refunding this charge. If a full charge refund is given, the full application
-             * fee will be refunded. Else, the application fee will be refunded with an
-             * amount proportional to the amount of the charge refunded.
-             * An application fee can only be refunded by the application that created the
-             * charge.
-             *
-             * Connect only, default is false.
-             */
-            refund_application_fee?: boolean;
-
-            /**
-             * Boolean indicating whether the transfer should be reversed when
-             * refunding this charge. The transfer will be reversed for the same amount
-             * being refunded (either the entire or partial amount).
-             * A transfer can only be reversed by the application that created the charge.
-             *
-             * Connect only, default is false.
-             */
-            reverse_transfer?: boolean;
-        }
-
-        interface IRefundCreationOptionsWithCharge extends IRefundCreationOptions {
-            /**
-             * The identifier of the charge to refund.
-             */
-            charge: string;
-        }
-
-        interface IRefundListOptions extends IListOptions {
-            /**
-             * Only return refunds for the charge specified by this charge ID.
-             */
-            charge?: string;
-        }
-    }
-
-    namespace sources {
-        /**
-         * The source can either be a token, like the ones returned by our
-         * Stripe.js, or a object containing a user's credit card details (with
-         * the options shown below). You must provide a source if the
-         * customer does not already have a valid source attached, and you
-         * are subscribing the customer for a plan that is not free. Passing
-         * source will create a new source object, make it the customer
-         * default source, and delete the old customer default if one exists.
-         * If you want to add an additional source to use with subscriptions,
-         * instead use the card creation API to add the card and then the
-         * customer update API to set it as the default. Whenever you
-         * attach a card to a customer, Stripe will automatically validate the
-         * card.
-         */
-        type ISourceCreationOptions = string | cards.ISourceCreationOptions;
-
-        /**
-         * The source can either be a token, like the ones returned by our
-         * Stripe.js, or a object containing a user's credit card details (with
-         * the options shown below). You must provide a source if the
-         * customer does not already have a valid source attached, and you
-         * are subscribing the customer for a plan that is not free. Passing
-         * source will create a new source object, make it the customer
-         * default source, and delete the old customer default if one exists.
-         * If you want to add an additional source to use with subscriptions,
-         * instead use the card creation API to add the card and then the
-         * customer update API to set it as the default. Whenever you
-         * attach a card to a customer, Stripe will automatically validate the
-         * card.
-         */
-        type ISourceCreationOptionsExtended = string | cards.ISourceCreationOptionsExtended;
-    }
-
-    namespace countrySpecs {
-        interface ICountrySpec extends IResourceObject {
-            /**
-             * Value is "country_spec"
-             */
-            object: "country_spec";
-
-            /**
-             * The default currency for this country. This applies to both payment methods and bank accounts.
-             */
-            default_currency: string;
-
-            /**
-             * Currencies that can be accepted in the specific country (for transfers).
-             */
-            supported_bank_account_currencies: {};
-
-            /**
-             * Currencies that can be accepted in the specified country (for payments).
-             */
-            supported_payment_currencies: Array<string>;
-
-            /**
-             * Payment methods available in the specified country. You will need to enable bitcoin and ACH payments on your account for those methods to
-             * appear in this list. The stripe payment method refers to charging through your platform.
-             */
-            supported_payment_methods: Array<string>;
-
-            /**
-             * Lists the types of verification data needed to keep an account open. Includes 'minimum' fields, which every account must eventually
-             * provide, as well as a 'additional' fields, which are only required for some merchants.
-             */
-            verification_fields: {
-                individual: {
-                    minimum: Array<string>;
-                    additional: Array<string>;
-                },
-                company: {
-                    minimum: Array<string>;
-                    additional: Array<string>;
-                }
-            }
-        }
-    }
-
-    class StripeResource {
-        constructor(stripe: Stripe, urlData: any);
-    }
-
-    namespace resources {
-        class Accounts extends StripeResource {
-            /**
-             * With Connect, you can create Stripe accounts for your users. To do this, you'll first need to register your platform.
-             */
-            create(data: accounts.IAccountCreationOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            create(data: accounts.IAccountCreationOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-
-            /**
-             * Retrieves the details of the account.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            retrieve(id: string, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            retrieve(options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            retrieve(response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-
-            /**
-             * Updates an account by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             *
-             * You may only update accounts that you manage. To update your own account, you can currently only do so via the dashboard.
-             * For more information on updating managed accounts, see our guide.
-             */
-            update(id: string, data: accounts.IAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            update(id: string, data: accounts.IAccountUpdateOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-
-            /**
-             * With Connect, you may delete Stripe accounts you manage.
-             *
-             * Managed accounts created using test-mode keys can be deleted at any time. Managed accounts created using live-mode keys may only be
-             * deleted once all balances are zero.
-             *
-             * If you are looking to close your own account, use the data tab in your account settings instead.
-             */
-            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-
-            /**
-             * With Connect, you may flag managed accounts as suspicious.
-             *
-             * Managed accounts created using test-mode keys can be rejected at any time. Managed accounts created using live-mode keys may only be
-             * rejected once all balances are zero.
-             */
-            reject(id: string, data: accounts.IRejectReason, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-            reject(id: string, data: accounts.IRejectReason, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
-
-            /**
-             * Returns a list of accounts connected to your platform via Connect. If you’re not a platform, the list will be empty.
-             */
-            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
-            list(data: IListOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
-            list(response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
-
-            /**
-             * When you create a new bank account or credit card, you must specify a managed account to create it on.
-             *
-             * If the bank account's owner has no other external account in the bank account's currency, the new bank account will become the
-             * default for that currency. However, if the owner already has a bank account for that currency, the new account will only become
-             * the default if the default_for_currency parameter is set to true.
-             *
-             * If the account has no default destination card, then the new card will become the default. However, if the owner already has a
-             * default then it will not change. To change the default, you should set default_for_currency to true when creating a card for a
-             * managed account.
-             */
-            createExternalAccount(accId: string, data: accounts.IExternalAccountCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-            createExternalAccount(accId: string, data: accounts.IExternalAccountCreationOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-
-            /**
-             * By default, you can see the 10 most recent bank accounts stored on a managed account directly on the object, but you can also
-             * retrieve details about a specific bank account stored on the Stripe account.
-             */
-            retrieveExternalAccount(accId: string, bankAccId: string, options: HeaderOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
-            retrieveExternalAccount(accId: string, bankAccId: string, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
-
-            /**
-             * You can always see the 10 most recent cards directly on a managed account; this method lets you retrieve details about a specific
-             * card stored on the account.
-             */
-            retrieveCard(accId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            retrieveCard(accId: string, cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * Updates the metadata of a bank account belonging to a managed account, and optionally sets it as the default for its currency.
-             * Other bank account details are not editable by design.
-             */
-            updateExternalAccount(accId: string, bankAccId: string, data: accounts.IExternalAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
-            updateExternalAccount(accId: string, bankAccId: string, data: accounts.IExternalAccountUpdateOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
-            /**
-             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
-             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
-             * interruption.
-             *
-             * When you update a card, Stripe will automatically validate the card.
-             */
-            updateExternalAccount(accId: string, cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            updateExternalAccount(accId: string, cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * You can delete destination bank accounts and cards from a managed account. If a bank account is the default external account for its currency
-             * or card's default_for_currency property is true, it can only be deleted if it is the only external account for that currency, and the
-             * currency is not the Stripe account's default currency. Otherwise, you must set another external account to be the default for the currency
-             * before deleting it.
-             */
-            deleteExternalAccount(accId: string, id: string, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-            deleteExternalAccount(accId: string, id: string, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-
-            /**
-             * You can see a list of the bank accounts belonging to a managed account. Note that the 10 most recent external accounts are always
-             * available by default on the corresponding Stripe object. If you need more than those 10, you can use this API method and the limit
-             * and starting_after parameters to page through additional bank accounts.
-             */
-            listExternalAccounts(accId: string, data: accounts.IBankAccountListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
-            listExternalAccounts(accId: string, data: accounts.IBankAccountListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
-
-            /**
-             * You can see a list of the cards belonging to a managed account. Note that the 10 most recent external accounts are available on the
-             * account object. If you need more than those 10, you can use this API method and the limit and starting_after parameters to page
-             * through additional cards.
-             */
-            listExternalAccounts(accId: string, data: accounts.ICardListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            listExternalAccounts(accId: string, data: accounts.ICardListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-        }
-
-        class ApplicationFees extends StripeResource {
-            /**
-             * Retrieves the details of an application fee that your account has collected. The same information is returned when refunding the
-             * application fee.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
-            retrieve(id: string, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
-
-            /**
-             * Returns a list of application fees you’ve previously collected. The application fees are returned in sorted order, with the most
-             * recent fees appearing first.
-             */
-            list(data: applicationFees.IApplicationFeeListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
-            list(data: applicationFees.IApplicationFeeListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
-            list(response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
-
-            /**
-             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that
-             * the fee was originally collected from.
-             *
-             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
-             *
-             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded
-             * application fee, or when trying to refund more money than is left on an application fee.
-             */
-            refund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            refund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            refund(feeId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            refund(feeId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-
-            /**
-             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that
-             * the fee was originally collected from.
-             *
-             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
-             *
-             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded
-             * application fee, or when trying to refund more money than is left on an application fee.
-             */
-            createRefund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            createRefund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            createRefund(feeId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            createRefund(feeId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-
-            /**
-             * By default, you can see the 10 most recent refunds stored directly on the application fee object, but you can also retrieve details
-             * about a specific refund stored on the application fee.
-             */
-            retreiveRefund(feeId: string, refundId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            retreiveRefund(feeId: string, refundId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-
-            /**
-             * Updates the specified application fee refund by setting the values of the parameters passed. Any parameters not provided will be left
-             * unchanged.
-             *
-             * This request only accepts metadata as an argument.
-             */
-            updateRefund(feeId: string, refundId: string, data: { metadata?: IMetadata }, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            updateRefund(feeId: string, refundId: string, data: { metadata?: IMetadata }, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-
-            /**
-             * You can see a list of the refunds belonging to a specific application fee. Note that the 10 most recent refunds are always available
-             * by default on the application fee object. If you need more than those 10, you can use this API method and the limit and starting_after
-             * parameters to page through additional refunds.
-             */
-            listRefunds(feeId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-            listRefunds(feeId: string, data: IListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-            listRefunds(feeId: string, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-            listRefunds(feeId: string, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-        }
-
-        class ApplicationFeeRefunds extends StripeResource {
-            /**
-             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that
-             * the fee was originally collected from.
-             *
-             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
-             *
-             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded
-             * application fee, or when trying to refund more money than is left on an application fee.
-             */
-            create(data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            create(data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            create(options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            create(response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-
-            /**
-             * By default, you can see the 10 most recent refunds stored directly on the application fee object, but you can also retrieve details
-             * about a specific refund stored on the application fee.
-             */
-            retrieve(refundId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            retrieve(refundId: string, options: IDataOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            retrieve(refundId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            retrieve(refundId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-
-
-            /**
-             * Updates the specified application fee refund by setting the values of the parameters passed. Any parameters not provided will be left
-             * unchanged.
-             *
-             * This request only accepts metadata as an argument.
-             */
-            update(refundId: string, data: { metadata?: IMetadata }, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-            update(refundId: string, data: { metadata?: IMetadata }, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
-
-            /**
-             * You can see a list of the refunds belonging to a specific application fee. Note that the 10 most recent refunds are always available
-             * by default on the application fee object. If you need more than those 10, you can use this API method and the limit and starting_after
-             * parameters to page through additional refunds.
-             */
-            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-            list(data: IListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-            list(response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
-        }
-
-        class Balance extends StripeResource {
-            retrieve(options: HeaderOptions, response?: IResponseFn<balance.IBalance>): Promise<balance.IBalance>;
-            retrieve(response?: IResponseFn<balance.IBalance>): Promise<balance.IBalance>;
-
-            retrieveTransaction(id: string, options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<balance.IBalanceTransaction>;
-            retrieveTransaction(id: string, response?: IResponseFn<balance.IBalanceTransaction>): Promise<balance.IBalanceTransaction>;
-
-            listTransactions(data: balance.IBalanceListOptions, options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
-            listTransactions(data: balance.IBalanceListOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
-            listTransactions(options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
-            listTransactions(response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
-        }
-
-        class BitcoinReceivers extends StripeResource {
-            /**
-             * Creates a Bitcoin receiver object that can be used to accept bitcoin payments from your customer. The receiver exposes a Bitcoin address
-             * and is created with a bitcoin to USD exchange rate that is valid for 10 minutes.
-             */
-            create(data: bitcoinReceivers.IBitcoinReceiverCreationOptions, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
-            create(data: bitcoinReceivers.IBitcoinReceiverCreationOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
-
-            /**
-             * Retrieves the Bitcoin receiver with the given ID.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
-            retrieve(id: string, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
-
-
-            /**
-             * Returns a list of your receivers. Receivers are returned sorted by creation date, with the most recently created receivers appearing first.
-             */
-            list(data: bitcoinReceivers.IBitcoinReceiverListOptions, options: HeaderOptions, response?: IResponseFn<IList<bitcoinReceivers.IBitcoinReceiver>>): Promise<IList<bitcoinReceivers.IBitcoinReceiver>>;
-            list(data: bitcoinReceivers.IBitcoinReceiverListOptions, response?: IResponseFn<IList<bitcoinReceivers.IBitcoinReceiver>>): Promise<IList<bitcoinReceivers.IBitcoinReceiver>>;
-
-            //update(id: string): void; // This does seem to be a method in the library (https://github.com/stripe/stripe-node/blob/master/lib/resources/BitcoinReceivers.js#L12), but isn't in the API documentation.
-
-            setMetadata(): void; //TODO: Implement placeholder method
-            getMetadata(): void; //TODO: Implement placeholder method
-        }
-
-        class Charges extends StripeResource {
-            /**
-             * To charge a credit card, you create a charge object. If your API key is in test mode, the supplied card won't actually be charged, though
-             * everything else will occur as if in live mode. (Stripe assumes that the charge would have completed successfully).
-             *
-             * @returns Returns a charge object if the charge succeeded. Throws an error if something goes wrong. A common source of error is an invalid or
-             * expired card, or a valid card with insufficient available balance. If the cvc parameter is provided, Stripe will attempt to check the CVC's
-             * correctness, and the check's result will be returned. Similarly, If address_line1 or address_zip are provided, Stripe will similarly try to
-             * check the validity of those parameters. Some banks do not support checking one or more of these parameters, in which case Stripe will return
-             * an 'unavailable' result. Also note that, depending on the bank, charges can succeed even when passed incorrect CVC and address information.
-             *
-             * @param options Options for creating a charge.
-             * @param response A callback to receive the response and newly created charge, or errors if they exist.
-             */
-            create(data: charges.IChargeCreationOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-            create(data: charges.IChargeCreationOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-
-            /**
-             * Retrieves the details of a charge that has previously been created. Supply the unique charge ID that was returned
-             * from your previous request, and Stripe will return the corresponding charge information. The same information is
-             * returned when creating or refunding the charge.
-             *
-             * @param id The identifier of the charge to be retrieved
-             * @param response A callback that takes in a potential error and a charge object.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-            retrieve(id: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-
-
-            /**
-             * Updates the specified charge by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             * This request accepts only the description, metadata, receipt_emailand fraud_details as arguments.
-             *
-             * @param id The identifier of the charge to be updated
-             * @param data An object containing the updated properties.
-             */
-            update(id: string, data: charges.IChargeUpdateOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-            update(id: string, data: charges.IChargeUpdateOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-
-            /**
-             * Capture the payment of an existing, uncaptured, charge. This is the second half of the two-step payment flow, where first
-             * you created a charge with the capture option set to false. Uncaptured payments expire exactly seven days after they are
-             * created. If they are not captured by that point in time, they will be marked as refunded and will no longer be capturable.
-             */
-            capture(id: string, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-            capture(id: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-
-            /**
-             * Returns a list of charges you've previously created. The charges are returned in sorted order, with the most recent charges
-             * appearing first.
-             *
-             * @returns An object with a data property that contains an array of up to limit charges, starting after charge starting_after.
-             * Each entry in the array is a separate charge object. If no more charges are available, the resulting array will be empty.
-             * If you provide a non-existent customer ID, this call throws an error. You can optionally request that the response include
-             * the total count of all charges that match your filters. To do so, specify include[]=total_count in your request.
-             *
-             * @param data Filtering options for the returned items.
-             */
-            list(data: charges.IChargeListOptions, options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
-            list(data: charges.IChargeListOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
-            list(response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
-
-            /**
-             * When you create a new refund, you must specify a charge to create it on.
-             * Creating a new refund will refund a charge that has previously been created but not yet refunded. Funds will be refunded to the credit or debit card that was originally charged. The fees you were originally charged are also refunded.
-             * You can optionally refund only part of a charge. You can do so as many times as you wish until the entire charge has been refunded.
-             * Once entirely refunded, a charge can't be refunded again. This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
-             */
-            refund(chargeId: string, data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            refund(chargeId: string, data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            refund(chargeId: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            refund(chargeId: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * When you create a new refund, you must specify a charge to create it on. Creating a new refund will refund a charge that has previously
-             * been created but not yet refunded. Funds will be refunded to the credit or debit card that was originally charged. The fees you were
-             * originally charged are also refunded. You can optionally refund only part of a charge. You can do so as many times as you wish until
-             * the entire charge has been refunded. Once entirely refunded, a charge can't be refunded again. This method will throw an error when
-             * called on an already-refunded charge, or when trying to refund more money than is left on a charge.
-             *
-             * @returns Returns the refund object if the refund succeeded. Throws an error if the charge has already been refunded or an invalid
-             * charge identifier was provided.
-             *
-             * @param id The identifier of the charge to be refunded.
-             * @param data Options for specifying reasons and refund amount
-             * @param response The refund.
-             *
-             * @deprecated According to source code (https://github.com/stripe/stripe-node/blob/master/lib/resources/Charges.js#L43)
-             */
-            createRefund(id: string, data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            createRefund(id: string, data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            createRefund(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            createRefund(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * By default, you can see the 10 most recent refunds stored directly on the charge object, but you can also retrieve details about a specific
-             * refund stored on the charge.
-             *
-             * @param chargeId The ID of the charge refunded
-             * @param refundId The ID of the refund to retrieve
-             */
-            retrieveRefund(chargeId: string, refundId: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieveRefund(chargeId: string, refundId: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * Updates the specified refund by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             * This request only accepts metadata as an argument.
-             *
-             * @param chargeId The ID of the charge refunded
-             * @param refundId The ID of the refund to update
-             */
-            updateRefund(chargeId: string, refundId: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            updateRefund(chargeId: string, refundId: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * You can see a list of the refunds belonging to a specific charge. Note that the 10 most recent refunds are always available by default on
-             * the charge object. If you need more than those 10, you can use this API method and the limit and starting_after parameters to page through
-             * additional refunds.
-             *
-             * @returns A object with a data property that contains an array of up to limit refunds, starting after refund starting_after.
-             * Each entry in the array is a separate refund object. If no more refunds are available, the resulting array will be empty. If you provide
-             * a non-existent customer ID or charge ID, this call throws an error. You can optionally request that the response include the total count
-             * of all refunds that match your filters. To do so, specify include[]=total_count in your request.
-             *
-             * @param chargeId The ID of the charge refunded
-             * @param data Used to filter the refunds returned
-             */
-            listRefunds(chargeId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            listRefunds(chargeId: string, data: IListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            listRefunds(chargeId: string, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            listRefunds(chargeId: string, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-
-            markAsSafe(chargeId: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-            markAsFraudulent(chargeId: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
-        }
-
-        class ChargeRefunds extends StripeResource {
-            /**
-             * When you create a new refund, you must specify a charge to create it on.
-             *
-             * Creating a new refund will refund a charge that has previously been created but not yet refunded.
-             * Funds will be refunded to the credit or debit card that was originally charged.
-             * The fees you were originally charged are also refunded.
-             *
-             * You can optionally refund only part of a charge.
-             * You can do so as many times as you wish until the entire charge has been refunded.
-             *
-             * Once entirely refunded, a charge can't be refunded again.
-             * This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
-             */
-            create(data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            create(data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            create(options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            create(response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * Retrieves the details of an existing refund.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-
-            /**
-             * Updates the specified refund by setting the values of the parameters passed.
-             * Any parameters not provided will be left unchanged.
-             *
-             * This request only accepts metadata as an argument.
-             */
-            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * Returns a list of all refunds you’ve previously created. The refunds are returned in sorted order,
-             * with the most recent refunds appearing first.
-             * For convenience, the 10 most recent refunds are always available by default on the charge object.
-             */
-            list(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-        }
-
-        class Coupons extends StripeResource {
-            /**
-             * You can create coupons easily via the coupon management page of the Stripe dashboard. Coupon creation is also accessible via the API if
-             * you need to create coupons on the fly. A coupon has either a percent_off or an amount_off and currency. If you set an amount_off, that
-             * amount will be subtracted from any invoice's subtotal. For example, an invoice with a subtotal of $10 will have a final total of $0 if
-             * a coupon with an amount_off of 2000 is applied to it and an invoice with a subtotal of $30 will have a final total of $10 if a coupon
-             * with an amount_off of 2000 is applied to it.
-             *
-             * @returns Returns the coupon object.
-             *
-             * @param data Options for creating the coupon.
-             */
-            create(data: coupons.ICouponCreationOptions, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-            create(data: coupons.ICouponCreationOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-
-            /**
-             * Retrieves the coupon with the given ID.
-             *
-             * @returns Returns a coupon if a valid coupon ID was provided. Throws an error otherwise.
-             *
-             * @param id The ID of the desired coupon
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-            retrieve(id: string, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-
-
-            /**
-             * Updates the metadata of a coupon. Other coupon details (currency, duration, amount_off) are, by design, not editable.
-             *
-             * @returns The newly updated coupon object if the call succeeded. Otherwise, this call throws an error, such as if the coupon has
-             * been deleted.
-             *
-             * @param id The ID of the coupon to be updated
-             * @param data Metadata to update
-             */
-            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
-
-            /**
-             * You can delete coupons via the coupon management page of the Stripe dashboard. However, deleting a coupon does not affect any
-             * customers who have already applied the coupon; it means that new customers can't redeem the coupon. You can also delete coupons
-             * via the API.
-             *
-             * @returns An object with the deleted coupon's ID and a deleted flag upon success. Otherwise, this call throws an error, such as
-             * if the coupon has already been deleted.
-             *
-             * @param id The ID of the coupon to be deleted.
-             */
-            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-
-            /**
-             * Returns a list of your coupons.
-             *
-             * @returns A object with a data property that contains an array of up to limit coupons, starting after coupon starting_after. Each
-             * entry in the array is a separate coupon object. If no more coupons are available, the resulting array will be empty. This request
-             * should never throw an error. You can optionally request that the response include the total count of all coupons. To do so, specify
-             * include[]=total_count in your request.
-             *
-             * @param data Filtering options for the list.
-             */
-            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
-            list(data: IListOptionsCreated, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
-            list(response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
-        }
-
-        class CustomerCards extends StripeResource {
-            /**
-             * When you create a new credit card, you must specify a customer or recipient to create it on. If the card's owner has no default card,
-             * then the new card will become the default. However, if the owner already has a default then it will not change. To change the default,
-             * you should either update the customer to have a new default_source or update the recipient to have a new default_card.
-             *
-             * @returns Returns the card object.
-             */
-            create(data: {
-                card?: sources.ISourceCreationOptionsExtended;
-            }, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            create(data: {
-                card?: sources.ISourceCreationOptionsExtended;
-            }, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
-             * cards are always available by default on the customer or recipient object. If you need more than
-             * those 10, you can use this API method and the limit and starting_after parameters to page through
-             * additional cards.
-             *
-             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
-             * that the response include the total count of all cards for the customer or recipient. To do so,
-             * specify include[]=total_count in your request.
-             * @param data Filtering options
-             */
-            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            list(data: IListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            list(response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-
-            /**
-             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
-             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
-             * interruption. When you update a card, Stripe will automatically validate the card.
-             *
-             * @returns Returns the card object.
-             *
-             * @param cardId The ID of the card to be retrieved.
-             */
-            update(cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            update(cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * By default, you can see the 10 most recent cards stored on a customer or recipient directly on the customer or recipient object, but
-             * you can also retrieve details about a specific card stored on the customer or recipient.
-             *
-             * @returns Returns the card object.
-             *
-             * @param cardId The ID of the card to be retrieved.
-             */
-            retrieve(cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            retrieve(cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * You can delete cards from a customer or recipient. If you delete a card that is currently the
-             * default source on a customer, then the most recently added source will become the new default.
-             * If you delete a card that is the last remaining source on the customer then the default_source
-             * attribute will become null. Similarly, if you delete the default card on a recipient, then the
-             * most recently added card will become the new default. If you delete the last remaining card on
-             * a recipient, then the default_card attribute will become null. Note that for cards belonging to
-             * customers, you may want to prevent customers on paid subscriptions from deleting all cards on
-             * file so that there is at least one default card for the next invoice payment attempt.
-             *
-             * @returns Returns the deleted card object.
-             *
-             * @param cardId The ID of the card to be retrieved.
-             */
-            del(cardId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(cardId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-        }
-
-        class Customers extends StripeResource {
-            /**
-             * Creates a new customer object.
-             *
-             * @returns Returns a customer object if the call succeeded. The returned object will have information about subscriptions, discount,
-             * and payment sources, if that information has been provided. If a non-free plan is specified and a source is not provided (unless
-             * the plan has a trial period), the call will throw an error. If a non-existent plan or a non-existent or expired coupon is provided,
-             * the call will throw an error. If a source has been attached to the customer, the returned customer object will have a default_source
-             * attribute, which is an ID that can be expanded into the full source details when retrieving the customer.
-             *
-             * @param data The options for the new customer
-             */
-            create(data: customers.ICustomerCreationOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-            create(data: customers.ICustomerCreationOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-
-            /**
-             * Returns a list of your customers. The customers are returned sorted by creation date, with the most recently created customers
-             * appearing first.
-             *
-             * @returns A object with a data property that contains an array of up to limit customers, starting after customer starting_after.
-             * Each entry in the array is a separate customer object. If no more customers are available, the resulting array will be empty.
-             * This request should never throw an error. You can optionally request that the response include the total count of all customers
-             * that match your filters. To do so, specify include[]=total_count in your request.
-             *
-             * @param data Allows you to filter the customers you want.
-             */
-            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
-            list(data: IListOptionsCreated, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
-            list(response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
-
-            /**
-             * Updates the specified customer by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             * For example, if you pass the card parameter, that becomes the customer's active card to be used for all charges in the future.
-             * When you update a customer to a new valid card: for each of the customer's current subscriptions, if the subscription is in the
-             * past_due state, then the latest unpaid, unclosed invoice for the subscription will be retried (note that this retry will not count
-             * as an automatic retry, and will not affect the next regularly scheduled payment for the invoice). (Note also that no invoices
-             * pertaining to subscriptions in the unpaid state, or invoices pertaining to canceled subscriptions, will be retried as a result
-             * of updating the customer's card.) This request accepts mostly the same arguments as the customer creation call.
-             *
-             * @returns Returns the customer object if the update succeeded. Throws an error if update parameters are invalid (e.g. specifying
-             * an invalid coupon or an invalid card).
-             *
-             * @param id The identifier of the customer to be retrieved.
-             */
-            update(id: string, data: customers.ICustomerUpdateOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-            update(id: string, data: customers.ICustomerUpdateOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-
-            /**
-             * Retrieves the details of an existing customer. You need only supply the unique customer identifier that was returned upon customer
-             * creation.
-             *
-             * @returns Returns a customer object if a valid identifier was provided. When requesting the ID of a customer that has been deleted,
-             * a subset of the customer's information will be returned, including a "deleted" property, which will be true.
-             *
-             * @param id The identifier of the customer to be retrieved.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-            retrieve(id: string, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
-
-            /**
-             * Permanently deletes a customer. It cannot be undone. Also immediately cancels any active subscriptions on the customer.
-             *
-             * @returns Returns an object with a deleted parameter on success. If the customer ID does not exist, this call throws an error. Unlike
-             * other objects, deleted customers can still be retrieved through the API, in order to be able to track the history of customers while
-             * still removing their credit card details and preventing any further operations to be performed (such as adding a new subscription).
-             *
-             * @param id The identifier of the customer to be deleted.
-             */
-            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-
-
-
-            /**
-             * When you create a new credit card, you must specify a customer or recipient to create it on. If the card's owner has no default card,
-             * then the new card will become the default. However, if the owner already has a default then it will not change. To change the default,
-             * you should either update the customer to have a new default_source or update the recipient to have a new default_card.
-             *
-             * @returns Returns the card object.
-             *
-             * @param customerId The customer ID to which to add the card.
-             *
-             * @deprecated
-             */
-            createCard(customerId: string, data: {
-                card?: sources.ISourceCreationOptionsExtended;
-            }, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            createCard(customerId: string, data: {
-                card?: sources.ISourceCreationOptionsExtended;
-            }, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * By default, you can see the 10 most recent cards stored on a customer or recipient directly on the customer or recipient object, but
-             * you can also retrieve details about a specific card stored on the customer or recipient.
-             *
-             * @returns Returns the card object.
-             *
-             * @param customerId The ID of the customer whose card needs to be retrieved.
-             * @param cardId The ID of the card to be retrieved.
-             */
-            retrieveCard(customerId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            retrieveCard(customerId: string, cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
-             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
-             * interruption. When you update a card, Stripe will automatically validate the card.
-             *
-             * @returns Returns the card object.
-             *
-             * @param customerId The ID of the customer whose card needs to be retrieved.
-             * @param cardId The ID of the card to be retrieved.
-             */
-            updateCard(customerId: string, cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            updateCard(customerId: string, cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * You can delete cards from a customer or recipient. If you delete a card that is currently the
-             * default source on a customer, then the most recently added source will become the new default.
-             * If you delete a card that is the last remaining source on the customer then the default_source
-             * attribute will become null. Similarly, if you delete the default card on a recipient, then the
-             * most recently added card will become the new default. If you delete the last remaining card on
-             * a recipient, then the default_card attribute will become null. Note that for cards belonging to
-             * customers, you may want to prevent customers on paid subscriptions from deleting all cards on
-             * file so that there is at least one default card for the next invoice payment attempt.
-             *
-             * @returns Returns the deleted card object.
-             *
-             * @param customerId The ID of the customer whose card needs to be retrieved.
-             * @param cardId The ID of the card to be retrieved.
-             */
-            deleteCard(customerId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            deleteCard(customerId: string, cardId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-
-            /**
-             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
-             * cards are always available by default on the customer or recipient object. If you need more than
-             * those 10, you can use this API method and the limit and starting_after parameters to page through
-             * additional cards.
-             *
-             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
-             * that the response include the total count of all cards for the customer or recipient. To do so,
-             * specify include[]=total_count in your request.
-             *
-             * @param customerId The ID of the customer whose cards will be retrieved
-             * @param data Filtering options
-             */
-            listCards(customerId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            listCards(customerId: string, data: IListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            listCards(customerId: string, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            listCards(customerId: string, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-
-
-            /**
-             * When adding a card to a customer, the parameter name is source. When
-             * adding to an account, the parameter name is external_account. The
-             * value can either be a token, like the ones returned by our Stripe.js, or a
-             * dictionary containing a user's credit card details.
-             * Stripe will automatically validate the card.
-             *
-             * @returns Returns the card object.
-             *
-             * @param customerId The customer ID to which to add the card.
-             */
-            createSource(customerId: string, data: customers.ICustomerCardSourceCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            createSource(customerId: string, data: customers.ICustomerCardSourceCreationOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            /**
-             * When adding a card to a customer, the parameter name is source. When
-             * adding to an account, the parameter name is external_account. The
-             * value can either be a token, like the ones returned by our Stripe.js, or a
-             * dictionary containing a user’s credit card details.
-             * Stripe will automatically validate the card.
-             *
-             * @returns Returns the card or bank account object.
-             *
-             * @param customerId The customer ID to which to add the card.
-             */
-            createSource(customerId: string, data: customers.ICustomerSourceCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-            createSource(customerId: string, data: customers.ICustomerSourceCreationOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-
-            /**
-             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
-             * cards are always available by default on the customer or recipient object. If you need more than
-             * those 10, you can use this API method and the limit and starting_after parameters to page through
-             * additional cards.
-             *
-             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
-             * that the response include the total count of all cards for the customer or recipient. To do so,
-             * specify include[]=total_count in your request.
-             *
-             * @param customerId The ID of the customer whose cards will be retrieved
-             * @param data Filtering options
-             */
-            listSource(customerId: string, data: customers.ICardSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            listSource(customerId: string, data: customers.ICardSourceListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            /**
-             * You can see a list of the bank accounts belonging to a customer or recipient. Note that the 10 most recent
-             * bank accounts are always available by default on the customer or recipient object. If you need more than
-             * those 10, you can use this API method and the limit and starting_after parameters to page through
-             * additional cards.
-             *
-             * @returns Returns a list of the bank accounts stored on the customer or recipient. You can optionally request
-             * that the response include the total count of all bank accounts for the customer or recipient. To do so,
-             * specify include[]=total_count in your request.
-             *
-             * @param customerId The ID of the customer whose cards will be retrieved
-             * @param data Filtering options
-             */
-            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
-            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
-
-            /**
-             * By default, you can see the 10 most recent cards/bank accounts stored on a customer or recipient directly on the customer or recipient object, but
-             * you can also retrieve details about a specific card/bank account stored on the customer or recipient.
-             *
-             * @returns Returns the card/bank account object.
-             *
-             * @param customerId The ID of the customer whose card needs to be retrieved.
-             * @param sourceId The ID of the source to be retrieved.
-             */
-            retrieveSource(customerId: string, sourceId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-            retrieveSource(customerId: string, sourceId: string, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
-
-            /**
-             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
-             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
-             * interruption. When you update a card, Stripe will automatically validate the card.
-             *
-             * @returns Returns the card object.
-             *
-             * @param customerId The ID of the customer whose card needs to be retrieved.
-             * @param sourceId The ID of the card to be retrieved.
-             */
-            updateSource(customerId: string, sourceId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            updateSource(customerId: string, sourceId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-
-            /**
-             * Updates the metadata, account_holder_name, and account_holder_type of a bank account belonging to a Customer. Other bank account details
-             * are not editable by design.
-             *
-             * @returns Returns the bank account object.
-             *
-             * @param customerId The ID of the customer whose card needs to be retrieved.
-             * @param sourceId The ID of the bank account to be updated.
-             */
-            updateSource(customerId: string, sourceId: string, data: bankAccounts.IBankAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
-            updateSource(customerId: string, sourceId: string, data: bankAccounts.IBankAccountUpdateOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
-
-            /**
-             * You can delete cards or bank accounts from a customer or recipient. If you delete a card or bank account that is currently the
-             * default source on a customer, then the most recently added source will become the new default.
-             * If you delete a card or bank account that is the last remaining source on the customer then the default_source
-             * attribute will become null. Similarly, if you delete the default card or bank account on a recipient, then the
-             * most recently added source will become the new default. If you delete the last remaining source on
-             * a recipient, then the default_card attribute will become null. Note that for sources belonging to
-             * customers, you may want to prevent customers on paid subscriptions from deleting all sources on
-             * file so that there is at least one default source for the next invoice payment attempt.
-             *
-             * @returns Returns a confirmation object.
-             *
-             * @param customerId The ID of the customer whose source needs to be deleted.
-             * @param sourceId The ID of the source to be deleted.
-             */
-            deleteSource(customerId: string, sourceId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            deleteSource(customerId: string, sourceId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-
-
-            verifySource(customerId: string, sourceId: string, options: HeaderOptions): Promise<{}>; //TODO: This still needs properly implementing.
-            verifySource(customerId: string, sourceId: string): Promise<{}>; //TODO: This still needs properly implementing.
-
-
-            /**
-             * Creates a new subscription on an existing customer.
-             *
-             * @returns The newly created subscription object if the call succeeded. If the customer has no card or the
-             * attempted charge fails, this call throws an error (unless the specified plan is free or has a trial
-             * period).
-             *
-             * @param customerId The customer to which the add the subscription.
-             * @param options The options for the new subscription
-             */
-            createSubscription(customerId: string, data: subscriptions.ISubscriptionCustCreationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            createSubscription(customerId: string, data: subscriptions.ISubscriptionCustCreationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-
-            /**
-             * By default, you can see the 10 most recent active subscriptions stored on a customer directly on the customer
-             * object, but you can also retrieve details about a specific active subscription for a customer.
-             *
-             * @returns Returns the subscription object.
-             *
-             * @param customerId The customer ID for the subscription
-             * @param subscriptionId The ID of the subscription to retrieve
-             */
-            retrieveSubscription(customerId: string, subscriptionId: string, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            retrieveSubscription(customerId: string, subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-
-            /**
-             * Updates an existing subscription on a customer to match the specified parameters. When changing plans or quantities,
-             * we will optionally prorate the price we charge next month to make up for any price changes.
-             *
-             * By default, we prorate subscription changes. For example, if a customer signs up on May 1 for a $10 plan, she'll be billed
-             * $10 immediately. If she then switches to a $20 plan on May 15, on June 1 she'll be billed $25 ($20 for a renewal of her
-             * subscription and a $5 prorating adjustment for the previous month). Similarly, a downgrade will generate a credit to be
-             * applied to the next invoice. We also prorate when you make quantity changes. Switching plans does not change the billing
-             * date or generate an immediate charge unless you're switching between different intervals (e.g. monthly to yearly), in which
-             * case we apply a credit for the time unused on the old plan and charge for the new plan starting right away, resetting the
-             * billing date. (Note that if we charge for the new plan, and that payment fails, the plan change will not go into effect). If
-             * you'd like to charge for an upgrade immediately, just pass prorate as true as usual, and then invoice the customer as soon
-             * as you make the subscription change. That'll collect the proration adjustments into a new invoice, and Stripe will automatically
-             * attempt to pay the invoice. If you don't want to prorate at all, set the prorate option to false and the customer would be billed
-             * $10 on May 1 and $20 on June 1. Similarly, if you set prorate to false when switching between different billing intervals
-             * (monthly to yearly, for example), we won't generate any credits for the old subscription's unused time, although we will still
-             * reset the billing date and bill immediately for the new subscription.
-             *
-             * @returns The newly updated subscription object if the call succeeded. If a charge is required for the update, and
-             * the charge fails, this call raises throws an error, and the subscription update does not go into effect.
-             *
-             * @param customerId The ID of the customer whose subscription needs to be updated.
-             * @param subscriptionId The ID of the subscription to update.
-             * @param data The fields to update
-             */
-            updateSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            updateSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-
-            /**
-             * Cancels a customer's subscription. If you set the at_period_end parameter to true, the subscription will remain active until
-             * the end of the period, at which point it will be canceled and not renewed. By default, the subscription is terminated
-             * immediately. In either case, the customer will not be charged again for the subscription. Note, however, that any pending
-             * invoice items that you've created will still be charged for at the end of the period unless manually deleted. If you've set
-             * the subscription to cancel at period end, any pending prorations will also be left in place and collected at the end of the
-             * period, but if the subscription is set to cancel immediately, pending prorations will be removed. By default, all unpaid
-             * invoices for the customer will be closed upon subscription cancellation. We do this in order to prevent unexpected payment
-             * retries once the customer has canceled a subscription. However, you can reopen the invoices manually after subscription
-             * cancellation to have us proceed with automatic retries, or you could even re-attempt payment yourself on all unpaid invoices
-             * before allowing the customer to cancel the subscription at all.
-             *
-             * @returns The canceled subscription object. Its subscription status will be set to "canceled" unless you've set at_period_end
-             * to true when canceling, in which case the status will remain "active" but the cancel_at_period_end attribute will change to true.
-             *
-             * @param customerId The ID of the customer whose subscription needs to be cancelled.
-             * @param subscriptionId The ID of the subscription to cancel.
-             * @param data Specify when to cancel the subscription
-             */
-            cancelSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            cancelSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            cancelSubscription(customerId: string, subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-
-            /**
-             * You can see a list of the customer's active subscriptions. Note that the 10 most recent active subscriptions are always available
-             * by default on the customer object. If you need more than those 10, you can use the limit and starting_after parameters to page
-             * through additional subscriptions.
-             *
-             * @returns Returns a list of the customer's active subscriptions. You can optionally request that the response include the total
-             * count of all subscriptions for the customer. To do so, specify include[]=total_count in your request.
-             *
-             * @param customerId The ID of the customer whose subscriptions will be retrieved
-             * @param data Filtering options
-             */
-            listSubscriptions(customerId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-            listSubscriptions(customerId: string, data: IListOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-            listSubscriptions(customerId: string, options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-            listSubscriptions(customerId: string, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-
-
-            /**
-             * Removes the currently applied discount on a customer.
-             *
-             * @returns An object with a deleted flag set to true upon success. This call throws an error otherwise, such as if no
-             * discount exists on this customer.
-             *
-             * @param customerId The ID of the customer.
-             */
-            deleteDiscount(customerId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
-            deleteDiscount(customerId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
-
-            /**
-             * Removes the currently applied discount on a subscription.
-             *
-             * @returns An object with a deleted flag set to true upon success. This call throws an error otherwise, such as if no
-             * discount exists on this subscription.
-             *
-             * @param customerId The ID of the customer.
-             * @param subscriptionId The ID of the subscription.
-             */
-            deleteSubscriptionDiscount(customerId: string, subscriptionId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
-            deleteSubscriptionDiscount(customerId: string, subscriptionId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
-        }
-
-        class SubscriptionsBase extends StripeResource {
-            /**
-             * By default, you can see the 10 most recent active subscriptions stored on a customer directly on the customer
-             * object, but you can also retrieve details about a specific active subscription for a customer.
-             *
-             * @returns Returns the subscription object.
-             *
-             * @param subscriptionId The ID of the subscription to retrieve
-             */
-            retrieve(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            retrieve(subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-
-            /**
-             * Updates an existing subscription on a customer to match the specified parameters. When changing plans or quantities,
-             * we will optionally prorate the price we charge next month to make up for any price changes.
-             *
-             * By default, we prorate subscription changes. For example, if a customer signs up on May 1 for a $10 plan, she'll be billed
-             * $10 immediately. If she then switches to a $20 plan on May 15, on June 1 she'll be billed $25 ($20 for a renewal of her
-             * subscription and a $5 prorating adjustment for the previous month). Similarly, a downgrade will generate a credit to be
-             * applied to the next invoice. We also prorate when you make quantity changes. Switching plans does not change the billing
-             * date or generate an immediate charge unless you're switching between different intervals (e.g. monthly to yearly), in which
-             * case we apply a credit for the time unused on the old plan and charge for the new plan starting right away, resetting the
-             * billing date. (Note that if we charge for the new plan, and that payment fails, the plan change will not go into effect). If
-             * you'd like to charge for an upgrade immediately, just pass prorate as true as usual, and then invoice the customer as soon
-             * as you make the subscription change. That'll collect the proration adjustments into a new invoice, and Stripe will automatically
-             * attempt to pay the invoice. If you don't want to prorate at all, set the prorate option to false and the customer would be billed
-             * $10 on May 1 and $20 on June 1. Similarly, if you set prorate to false when switching between different billing intervals
-             * (monthly to yearly, for example), we won't generate any credits for the old subscription's unused time, although we will still
-             * reset the billing date and bill immediately for the new subscription.
-             *
-             * @returns The newly updated subscription object if the call succeeded. If a charge is required for the update, and
-             * the charge fails, this call raises throws an error, and the subscription update does not go into effect.
-             *
-             * @param subscriptionId The ID of the subscription to update.
-             * @param data The fields to update
-             */
-            update(subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            update(subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-
-            /**
-             * Cancels a customer's subscription. If you set the at_period_end parameter to true, the subscription will remain active until
-             * the end of the period, at which point it will be canceled and not renewed. By default, the subscription is terminated
-             * immediately. In either case, the customer will not be charged again for the subscription. Note, however, that any pending
-             * invoice items that you've created will still be charged for at the end of the period unless manually deleted. If you've set
-             * the subscription to cancel at period end, any pending prorations will also be left in place and collected at the end of the
-             * period, but if the subscription is set to cancel immediately, pending prorations will be removed. By default, all unpaid
-             * invoices for the customer will be closed upon subscription cancellation. We do this in order to prevent unexpected payment
-             * retries once the customer has canceled a subscription. However, you can reopen the invoices manually after subscription
-             * cancellation to have us proceed with automatic retries, or you could even re-attempt payment yourself on all unpaid invoices
-             * before allowing the customer to cancel the subscription at all.
-             *
-             * @returns The canceled subscription object. Its subscription status will be set to "canceled" unless you've set at_period_end
-             * to true when canceling, in which case the status will remain "active" but the cancel_at_period_end attribute will change to true.
-             *
-             * @param subscriptionId The ID of the subscription to cancel.
-             * @param data Specify when to cancel the subscription
-             */
-            del(subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            del(subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            del(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            del(subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-
-            /**
-             * You can see a list of the customer's active subscriptions. Note that the 10 most recent active subscriptions are always available
-             * by default on the customer object. If you need more than those 10, you can use the limit and starting_after parameters to page
-             * through additional subscriptions.
-             *
-             * @returns Returns a list of the customer's active subscriptions. You can optionally request that the response include the total
-             * count of all subscriptions for the customer. To do so, specify include[]=total_count in your request.
-             *
-             * @param data Filtering options
-             */
-            list(data: subscriptions.ISubscriptionListOptions, options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-            list(data: subscriptions.ISubscriptionListOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-            list(response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
-
-            /**
-             * Removes the currently applied discount on a subscription.
-             *
-             * @returns An object with a deleted flag set to true upon success. This call throws an error otherwise, such as if no
-             * discount exists on this subscription.
-             *
-             * @param subscriptionId The ID of the subscription.
-             */
-            deleteDiscount(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
-            deleteDiscount(subscriptionId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
-        }
-
-        class Subscriptions extends SubscriptionsBase {
-            /**
-             * Creates a new subscription on an existing customer.
-             *
-             * @returns The newly created subscription object if the call succeeded. If the customer has no card or the
-             * attempted charge fails, this call throws an error (unless the specified plan is free or has a trial
-             * period).
-             *
-             * @param options The options for the new subscription
-             */
-            create(data: subscriptions.ISubscriptionCreationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            create(data: subscriptions.ISubscriptionCreationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-        }
-        class CustomerSubscriptions extends SubscriptionsBase {
-            /**
-             * Creates a new subscription on an existing customer.
-             *
-             * @returns The newly created subscription object if the call succeeded. If the customer has no card or the
-             * attempted charge fails, this call throws an error (unless the specified plan is free or has a trial
-             * period).
-             *
-             * @param options The options for the new subscription
-             */
-            create(data: subscriptions.ISubscriptionCustCreationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-            create(data: subscriptions.ISubscriptionCustCreationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
-        }
-
-        class Disputes extends StripeResource {
-            /**
-             * Retrieves the dispute with the given ID.
-             */
-            retrieve(disputeId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-            retrieve(disputeId: string, data: IDataOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-            retrieve(disputeId: string, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-            retrieve(disputeId: string, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-
-
-            /**
-             * When you get a dispute, contacting your customer is always the best first step. If that doesn't work, you can submit evidence in
-             * order to help us resolve the dispute in your favor. You can do this in your dashboard, but if you prefer, you can use the API to
-             * submit evidence programmatically. Depending on your dispute type, different evidence fields will give you a better chance of winning
-             * your dispute. You may want to consult our guide to dispute types to help you figure out which evidence fields to provide:
-             * https://stripe.com/help/dispute-types
-             *
-             * @param data The fields to update
-             */
-            update(disputeId: string, data: disputes.IDisputeUpdateOptions, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-            update(disputeId: string, data: disputes.IDisputeUpdateOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-
-            /**
-             * Closing the dispute for a charge indicates that you do not have any evidence to submit and are
-             * essentially ‘dismissing’ the dispute, acknowledging it as lost
-             *
-             * The status of the dispute will change from needs_response to lost.
-             *
-             * *Closing a dispute is irreversible!*
-             */
-            close(disputeId: string, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-            close(disputeId: string, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
-
-            /**
-             * Returns a list of your disputes.
-             */
-            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
-            list(data: IListOptionsCreated, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
-            list(response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
-
-            setMetadata(): void; //TODO: Implement placeholder method
-            getMetadata(): void; //TODO: Implement placeholder method
-        }
-
-        class Events extends StripeResource {
-            /**
-             * Retrieves the details of an event. Supply the unique identifier of the event, which you might have
-             * received in a webhook.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
-            retrieve(id: string, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
-
-
-            /**
-             * List events, going back up to 30 days.
-             */
-            list(data: events.IEventListOptions, options: HeaderOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
-            list(data: events.IEventListOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
-            list(response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
-        }
-
-        class FileUploads extends StripeResource {
-            /**
-             * To upload a file to Stripe, you’ll need to send a request of type multipart/form-data.
-             * The request should contain the file you would like to upload, as well as the parameters for creating a file.
-             *
-             * All of Stripe’s officially supported API libraries should have support for sending multipart/form-data.
-             */
-            create(data: fileUploads.IFileUploadCreationOptions, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
-            create(data: fileUploads.IFileUploadCreationOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
-
-            /**
-             * Retrieves the details of an existing file object.
-             * Supply the unique file upload ID from a file creation request, and Stripe will return the corresponding transfer information.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
-            retrieve(id: string, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
-
-            /**
-             * Returns a list of the files that you have uploaded to Stripe.
-             * The file uploads are returned sorted by creation date, with the most recently created file uploads appearing first.
-             */
-            list(data: fileUploads.IFileUploadListOptions, options: HeaderOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
-            list(data: fileUploads.IFileUploadListOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
-            list(response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
-        }
-
-        class Invoices extends StripeResource {
-            /**
-             * If you need to invoice your customer outside the regular billing cycle, you can create an invoice that
-             * pulls in all pending invoice items, including prorations. The customer's billing cycle and regular subscription
-             * won't be affected. Once you create the invoice, it'll be picked up and paid automatically, though you can
-             * choose to pay it right away: https://stripe.com/docs/api#pay_invoice
-             *
-             * @returns Returns the invoice object if there are pending invoice items to invoice. Throws an error if there
-             * are no pending invoice items or if the customer ID provided is invalid.
-             *
-             * @param data Options used to create the invoice.
-             */
-            create(data: invoices.IInvoiceCreationOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            create(data: invoices.IInvoiceCreationOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-
-            /**
-             * Retrieves the invoice with the given ID. The invoice object contains a
-             * lines hash that contains information about the subscriptions and invoice items that have been applied to the
-             * invoice, as well as any prorations that Stripe has automatically calculated. Each line on the invoice has an
-             * amount attribute that represents the amount actually contributed to the invoice's total. For invoice items and
-             * prorations, the amount attribute is the same as for the invoice item or proration respectively. For
-             * subscriptions, the amount may be different from the plan's regular price depending on whether the invoice
-             * covers a trial period or the invoice period differs from the plan's usual interval. The invoice object has
-             * both a subtotal and a total. The subtotal represents the total before any discounts, while the total is the final
-             * amount to be charged to the customer after all coupons have been applied. The invoice also has a
-             * next_payment_attempt attribute that tells you the next time (as a Unix timestamp) payment for the invoice will be
-             * automatically attempted. For invoices that have been closed or that have reached the maximum number of retries
-             * (specified in your retry settings), the next_payment_attempt will be null.
-             *
-             * @returns Returns an invoice object if a valid invoice ID was provided. Throws an error otherwise.
-             *
-             * @param id The ID of the desired invoice.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            retrieve(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-
-            /**
-             * When retrieving an invoice, you'll get a lines property containing the total count of line items and the first
-             * handful of those items. There is also a URL where you can retrieve the full (paginated) list of line items.
-             *
-             * @returns Returns a list of line_item objects.
-             *
-             * @param id The id of the invoice containing the lines to be retrieved
-             * @param data Filtering options
-             */
-            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
-            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
-            retrieveLines(id: string, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
-            retrieveLines(id: string, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
-
-            /**
-             * At any time, you can preview the upcoming invoice for a customer. This will show you all the charges that are pending,
-             * including subscription renewal charges, invoice item charges, etc. It will also show you any discount that is applicable
-             * to the customer. Note that when you are viewing an upcoming invoice, you are simply viewing a preview -- the invoice has
-             * not yet been created. As such, the upcoming invoice will not show up in invoice listing calls, and you cannot use the API
-             * to pay or edit the invoice. If you want to change the amount that your customer will be billed, you can add, remove, or
-             * update pending invoice items, or update the customer's discount.
-             *
-             * @returns Returns an invoice if a valid customer ID was provided. Throws an error otherwise.
-             *
-             * @param id The identifier of the customer whose upcoming invoice you'd like to retrieve.
-             */
-            retrieveUpcoming(id: string, data: invoices.IInvoiceUpcomingOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            retrieveUpcoming(id: string, data: invoices.IInvoiceUpcomingOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            retrieveUpcoming(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            retrieveUpcoming(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-
-            /**
-             * Until an invoice is paid, it is marked as open (closed=false). If you'd like to stop Stripe from automatically attempting
-             * payment on an invoice or would simply like to close the invoice out as no longer owed by the customer, you can update the
-             * closed parameter.
-             *
-             * @returns Returns the invoice object.
-             *
-             * @param id The ID of the invoice to update
-             * @param data Fields to update
-             */
-            update(id: string, data: invoices.IInvoiceUpdateOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            update(id: string, data: invoices.IInvoiceUpdateOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-
-            /**
-             * Stripe automatically creates and then attempts to pay invoices for customers on subscriptions. We'll also retry unpaid
-             * invoices according to your retry settings. However, if you'd like to attempt to collect payment on an invoice out of the
-             * normal retry schedule or for some other reason, you can do so.
-             *
-             * @returns Returns the invoice object.
-             *
-             * @param id The ID of the invoice to pay.
-             */
-            pay(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-            pay(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
-
-            /**
-             * You can list all invoices, or list the invoices for a specific customer. The invoices are returned
-             * sorted by creation date, with the most recently created invoices appearing first.
-             *
-             * @returns A object with a data property that contains an array of invoice objects. Throws an error if the
-             * customer ID is invalid.
-             *
-             * @param data Filtering options
-             */
-            list(data: invoices.IInvoiceListOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
-            list(data: invoices.IInvoiceListOptions, response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
-            list(response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
-        }
-
-        class InvoiceItems extends StripeResource {
-            /**
-             * Adds an arbitrary charge or credit to the customer’s upcoming invoice.
-             */
-            create(data: invoiceItems.InvoiceItemCreationOptions, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
-            create(data: invoiceItems.InvoiceItemCreationOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
-
-            /**
-             * Retrieves the invoice item with the given ID.
-             */
-            retrieve(invoiceItemId: string, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
-            retrieve(invoiceItemId: string, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
-
-            /**
-             * Updates the amount or description of an invoice item on an upcoming invoice. Updating an invoice item is only possible before the
-             * invoice it's attached to is closed.
-             */
-            update(invoiceItemId: string, data: invoiceItems.InvoiceItemUpdateOptions, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
-            update(invoiceItemId: string, data: invoiceItems.InvoiceItemUpdateOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
-
-            /**
-             * Returns a list of your invoice items. Invoice items are returned sorted by creation date, with the most recently created invoice
-             * items appearing first.
-             */
-            list(data: invoiceItems.InvoiceItemListOptions, options: HeaderOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
-            list(data: invoiceItems.InvoiceItemListOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
-            list(response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
-
-            /**
-             * Removes an invoice item from the upcoming invoice. Removing an invoice item is only possible before the invoice it's attached
-             * to is closed.
-             */
-            del(invoiceItemId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(invoiceItemId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-        }
-
-        class Plans extends StripeResource {
-            /**
-             * You can create plans easily via the plan management page of the Stripe dashboard. Plan creation is also
-             * accessible via the API if you need to create plans on the fly.
-             *
-             * @returns The newly created plan
-             *
-             * @param data Creation options for the new plan.
-             */
-            create(data: plans.IPlanCreationOptions, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
-            create(data: plans.IPlanCreationOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
-
-            /**
-             * Retrieves the plan with the given ID.
-             *
-             * @returns Returns a plan if a valid plan ID was provided. Throws an error otherwise.
-             *
-             * @param planName The identifier of the desired plan.
-             */
-            retrieve(planName: string, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
-            retrieve(planName: string, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
-
-            /**
-             * Updates the name of a plan. Other plan details (price, interval, etc.) are, by design, not editable.
-             *
-             * @returns The updated plan object is returned upon success. Otherwise, this call throws an error.
-             *
-             * @param planName The identifier of the plan to update
-             * @param data The fields to update
-             */
-            update(planName: string, data: plans.IPlanUpdateOptions, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
-            update(planName: string, data: plans.IPlanUpdateOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
-
-            /**
-             * You can delete plans via the plan management page of the Stripe dashboard. However, deleting a plan does not affect
-             * any current subscribers to the plan; it merely means that new subscribers can't be added to that plan. You can also
-             * delete plans via the API.
-             *
-             * @returns An object with the deleted plan's ID and a deleted flag upon success. Otherwise, this call throws an error, such as if the plan has already been deleted.
-             *
-             * @param planName The identifier of the plan to be deleted.
-             */
-            del(planName: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(planName: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-
-            /**
-             * Returns a list of your plans.
-             *
-             * @returns An object with a data property that contains an array of up to limit plans, starting after plan starting_after.
-             * Each entry in the array is a separate plan object. If no more plans are available, the resulting array will be empty. This
-             * request should never throw an error. You can optionally request that the response include the total count of all plans. To
-             * do so, specify include[]=total_count in your request.
-             */
-            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
-            list(data: IListOptionsCreated, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
-            list(response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
-        }
-
-        /**
-         * @deprecated
-         */
-        class RecipientCards extends StripeResource {
-            /**
-             * @deprecated
-             */
-            create(): void;
-            /**
-             * @deprecated
-             */
-            list(): void;
-            /**
-             * @deprecated
-             */
-            update(id: string): void;
-            /**
-             * @deprecated
-             */
-            retrieve(id: string): void;
-            //options: IDataOptions
-            /**
-             * @deprecated
-             */
-            del(id: string): void;
-        }
-
-        /**
-         * @deprecated
-         */
-        class Recipients extends StripeResource {
-            /**
-             * @deprecated
-             */
-            create(): void;
-            /**
-             * @deprecated
-             */
-            list(): void;
-            /**
-             * @deprecated
-             */
-            update(id: string): void;
-            /**
-             * @deprecated
-             */
-            retrieve(id: string): void;
-            //options: IDataOptions
-            /**
-             * @deprecated
-             */
-            del(id: string): void;
-        }
-
-        class Refunds extends StripeResource {
-            /**
-             * When you create a new refund, you must specify a charge to create it on.
-             *
-             * Creating a new refund will refund a charge that has previously been created but not yet refunded.
-             * Funds will be refunded to the credit or debit card that was originally charged.
-             * The fees you were originally charged are also refunded.
-             *
-             * You can optionally refund only part of a charge.
-             * You can do so as many times as you wish until the entire charge has been refunded.
-             *
-             * Once entirely refunded, a charge can't be refunded again.
-             * This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
-             */
-            create(data: refunds.IRefundCreationOptionsWithCharge, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            create(data: refunds.IRefundCreationOptionsWithCharge, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * Retrieves the details of an existing refund.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-
-            /**
-             * Updates the specified refund by setting the values of the parameters passed.
-             * Any parameters not provided will be left unchanged.
-             *
-             * This request only accepts metadata as an argument.
-             */
-            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-
-            /**
-             * Returns a list of all refunds you’ve previously created. The refunds are returned in sorted order,
-             * with the most recent refunds appearing first.
-             * For convenience, the 10 most recent refunds are always available by default on the charge object.
-             */
-            list(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-        }
-
-        class Tokens extends StripeResource {
-            /**
-             * Creates a single use token that wraps the details of a credit card. This token can be used
-             * in place of a credit card object with any API method. These tokens can only be used once:
-             * by creating a new charge object, or attaching them to a customer.
-             */
-            create(data: tokens.ICardTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.ICardToken>): Promise<tokens.ICardToken>;
-            create(data: tokens.ICardTokenCreationOptions, response?: IResponseFn<tokens.ICardToken>): Promise<tokens.ICardToken>;
-
-            /**
-             * Creates a single use token that wraps the details of a bank account. This token can be used
-             * in place of a bank account object with any API method. These tokens can only be used once:
-             * by attaching them to a recipient or managed account.
-             */
-            create(data: tokens.IBankAccountTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.IBankAccountToken>): Promise<tokens.IBankAccountToken>;
-            create(data: tokens.IBankAccountTokenCreationOptions, response?: IResponseFn<tokens.IBankAccountToken>): Promise<tokens.IBankAccountToken>;
-
-            /**
-             * Creates a single use token that wraps the details of personally identifiable information (PII).
-             * This token can be used in place of a personal_id_number in the Account Update API method.
-             * These tokens can only be used once.
-             */
-            create(data: tokens.IPiiTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
-            create(data: tokens.IPiiTokenCreationOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
-
-            /**
-             * Retrieves the token with the given ID.
-             */
-            retrieve(tokenId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
-            retrieve(tokenId: string, data: IDataOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
-            retrieve(tokenId: string, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
-            retrieve(tokenId: string, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
-
-        }
-
-        class Transfers extends StripeResource {
-            /**
-             * To send funds from your Stripe account to a third-party recipient or to your own bank account, you create a new transfer
-             * object. Your Stripe balance must be able to cover the transfer amount, or you'll receive an "Insufficient Funds" error.
-             *
-             * If your API key is in test mode, money won't actually be sent, though everything else will occur as if in live mode.
-             *
-             * If you are creating a manual transfer or a special case transfer on a Stripe account that uses multiple payment source
-             * types, you'll need to specify the source type balance that the transfer should draw from. The balance object details
-             * available and pending amounts by source type.
-             */
-            create(data: transfers.ITransferCreationOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-            create(data: transfers.ITransferCreationOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-
-            /**
-             * Retrieves the details of an existing transfer. Supply the unique transfer ID from either a transfer creation request or
-             * the transfer list, and Stripe will return the corresponding transfer information.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-            retrieve(id: string, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-
-
-            /**
-             * Updates the specified transfer by setting the values of the parameters passed. Any parameters not provided will be left
-             * unchanged.
-             *
-             * This request accepts only the description and metadata as arguments.
-             */
-            update(id: string, data: transfers.ITransferUpdateOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-            update(id: string, data: transfers.ITransferUpdateOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-
-            /**
-             * Returns a list of existing transfers sent to third-party bank accounts or that Stripe has sent you. The transfers are
-             * returned in sorted order, with the most recently created transfers appearing first.
-             */
-            list(data: transfers.ITransferListOptions, options: HeaderOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
-            list(data: transfers.ITransferListOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
-            list(response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
-
-            cancel(id: string, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-            cancel(id: string, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
-
-            listTransactions(options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>; //TODO: Not sure if this should be a list of balance transactions or charges.
-            listTransactions(response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>; //TODO: Not sure if this should be a list of balance transactions or charges.
-
-            /**
-             * When you create a new reversal, you must specify a transfer to create it on.
-             *
-             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance
-             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
-             *
-             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish
-             * until the entire transfer has been reversed.
-             *
-             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer,
-             * or when trying to reverse more money than is left on a transfer.
-             */
-            reverse(id: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            reverse(id: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            reverse(id: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-
-            /**
-             * When you create a new reversal, you must specify a transfer to create it on.
-             *
-             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance
-             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
-             *
-             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish
-             * until the entire transfer has been reversed.
-             *
-             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer,
-             * or when trying to reverse more money than is left on a transfer.
-             */
-            createReverse(transferId: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            createReverse(transferId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            createReverse(transferId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-
-            /**
-             * By default, you can see the 10 most recent reversals stored directly on the transfer object, but you can also retrieve details about a
-             * specific reversal stored on the transfer.
-             */
-            retrieveReversal(transferId: string, reversalId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            retrieveReversal(transferId: string, reversalId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-
-            /**
-             * Updates the specified reversal by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             *
-             * This request only accepts metadata and description as arguments.
-             */
-            updateReversal(transferId: string, reversalId: string, data: transferReversals.IReversalUpdateOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            updateReversal(transferId: string, reversalId: string, data: transferReversals.IReversalUpdateOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-
-            /**
-             * You can see a list of the reversals belonging to a specific transfer. Note that the 10 most recent reversals are always available by
-             * default on the transfer object. If you need more than those 10, you can use this API method and the limit and starting_after
-             * parameters to page through additional reversals.
-             */
-            listReversals(transferId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-            listReversals(transferId: string, data: IListOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-            listReversals(transferId: string, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-            listReversals(transferId: string, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-
-            setMetadata(): void; //TODO: Implement placeholder method
-            getMetadata(): void; //TODO: Implement placeholder method
-        }
-
-        class TransferReversals extends StripeResource {
-            /**
-             * When you create a new reversal, you must specify a transfer to create it on.
-             *
-             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance
-             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
-             *
-             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish
-             * until the entire transfer has been reversed.
-             *
-             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer,
-             * or when trying to reverse more money than is left on a transfer.
-             */
-            create(data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            create(options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            create(response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-
-            /**
-             * By default, you can see the 10 most recent reversals stored directly on the transfer object, but you can also retrieve details about a
-             * specific reversal stored on the transfer.
-             */
-            retrieve(reversalId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            retrieve(reversalId: string, data: IDataOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            retrieve(reversalId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            retrieve(reversalId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-
-            /**
-             * Updates the specified reversal by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             *
-             * This request only accepts metadata and description as arguments.
-             */
-            update(reversalId: string, data: transferReversals.IReversalUpdateOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            update(reversalId: string, data: transferReversals.IReversalUpdateOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-
-            /**
-             * You can see a list of the reversals belonging to a specific transfer. Note that the 10 most recent reversals are always available by
-             * default on the transfer object. If you need more than those 10, you can use this API method and the limit and starting_after
-             * parameters to page through additional reversals.
-             */
-            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-            list(data: IListOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-            list(response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
-        }
-
-        class CountrySpecs extends StripeResource {
-            /**
-             * Lists all Country Spec objects available in the API.
-             */
-            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
-            list(data: IListOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
-            list(response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
-
-            /**
-             * Returns a Country Spec for a given Country code.
-             *
-             * @param retrieve  An ISO country code. Available country codes can be listed with the List Country Specs endpoint.
-             */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
-            retrieve(id: string, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
-        }
-
-        class Orders {
-            /**
-             * Creates a new order object.
-             */
-            create(data: orders.IOrderCreationOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-            create(data: orders.IOrderCreationOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-
-            /**
-             * Retrieves the details of an existing order. Supply the unique order ID from either an order creation request or the order list,
-             * and Stripe will return the corresponding order information.
-             */
-            retrieve(orderId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-            retrieve(orderId: string, data: IDataOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-            retrieve(orderId: string, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-            retrieve(orderId: string, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-
-            /**
-             * Updates the specific order by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             * This request accepts only the metadata, and status as arguments.
-             */
-            update(orderId: string, data: orders.IOrderUpdateOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-            update(orderId: string, data: orders.IOrderUpdateOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-
-            /**
-             * Pay an order by providing a source to create a payment.
-             */
-            pay(orderId: string, data: orders.IOrderPayOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-            pay(orderId: string, data: orders.IOrderPayOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
-
-            /**
-             * Returns a list of your orders. The orders are returned sorted by creation date, with the most recently created orders appearing first.
-             */
-            list(data: orders.IOrderListOptions, options: HeaderOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
-            list(data: orders.IOrderListOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
-            list(response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
-        }
-
-        class Products {
-            /**
-             * Creates a new product object.
-             */
-            create(data: products.IProductCreationOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-            create(data: products.IProductCreationOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-
-            /**
-             * Retrieves the details of an existing product. Supply the unique product ID from either a product creation request or the product
-             * list, and Stripe will return the corresponding product information.
-             */
-            retrieve(productId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-            retrieve(productId: string, data: IDataOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-            retrieve(productId: string, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-            retrieve(productId: string, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-
-            /**
-             * Updates the specific product by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             *
-             * Note that a product's attributes are not editable. Instead, you would need to deactivate the existing product and create a new one
-             * with the new attribute values.
-             */
-            update(productId: string, data: products.IProductUpdateOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-            update(productId: string, data: products.IProductUpdateOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
-
-            /**
-             * Returns a list of your products. The products are returned sorted by creation date, with the most recently created products appearing first.
-             */
-            list(data: products.IProductListOptions, options: HeaderOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
-            list(data: products.IProductListOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
-            list(response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
-
-            /**
-             * Delete a product. Deleting a product is only possible if it has no SKUs associated with it.
-             */
-            del(productId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(productId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-        }
-
-        class SKUs {
-            /**
-             * Creates a new SKU associated with a product.
-             */
-            create(data: skus.ISkuCreationOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-            create(data: skus.ISkuCreationOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-
-            /**
-             * Retrieves the details of an existing SKU. Supply the unique SKU identifier from either a SKU creation request or from the
-             * product, and Stripe will return the corresponding SKU information.
-             */
-            retrieve(skuId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-            retrieve(skuId: string, data: IDataOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-            retrieve(skuId: string, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-            retrieve(skuId: string, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-
-            /**
-             * Updates the specific SKU by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
-             *
-             * Note that a SKU's attributes are not editable. Instead, you would need to deactivate the existing SKU and create a new one with
-             * the new attribute values.
-             */
-            update(skuId: string, data: skus.ISkuUpdateOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-            update(skuId: string, data: skus.ISkuUpdateOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
-
-            /**
-             * Returns a list of your SKUs. The SKUs are returned sorted by creation date, with the most recently created SKUs appearing first.
-             */
-            list(data: skus.ISkuListOptions, options: HeaderOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
-            list(data: skus.ISkuListOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
-            list(response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
-
-            /**
-             * Delete a SKU. Deleting a SKU is only possible until it has been used in an order.
-             */
-            del(skuId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-            del(skuId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
-        }
-    
-        class WebHooks {
-            constructEvent<T>(requestBody: any, signature: string | string[], endpointSecret: string): webhooks.StripeWebhookEvent<T>;
-        }
-    }
-
-    interface IObject {
-        object: string;
-    }
-
-    interface IResourceObject extends IObject {
-        id: string;
-    }
-
-    interface IResponseFn<R> {
-        (err: IStripeError, value: R): void;
-    }
-
-    interface IDeleteConfirmation { id: string; deleted: boolean; }
-
-    /**
-     * A filter on the list based on this object field. The value can
-     * be a string with an integer Unix timestamp, or it can be a
-     * dictionary with the following options:
-     */
-    type IDateFilter = string | {
-        /**
-         * Return values where the created field is after this timestamp.
-         */
-        gt?: string;
-
-        /**
-         * Return values where the created field is after or equal to this timestamp.
-         */
-        gte?: string;
-
-        /**
-         * Return values where the created field is before this timestamp.
-         */
-        lt?: string;
-
-        /**
-         * Return values where the created field is before or equal to this timestamp.
-         */
-        lte?: string;
-    }
-
-    /**
-     * A set of key/value pairs that you can attach to an object. It can be useful for storing
-     * additional information about the object in a structured format.
-     */
-    interface IMetadata { }
-
-    interface IShippingInformation {
-        /**
-         * Shipping address.
-         */
-        address: {
-            /**
-             * Address line 1 (Street address/PO Box/Company name)
-             */
-            line1: string;
-
-            /**
-             * Address line 2 (Apartment/Suite/Unit/Building)
-             */
-            line2?: string;
-
-            /**
-             * City/Suburb/Town/Village
-             */
-            city?: string;
-
-            /**
-             * State/Province/County
-             */
-            state?: string;
-
-            /**
-             * Zip/Postal Code
-             */
-            postal_code?: string;
-
-            /**
-             * 2-letter country code
-             */
-            country?: string;
-        };
-
-        /**
-         * Recipient name.
-         */
-        name: string;
-
-        /**
-         * The delivery service that shipped a physical product, such as Fedex, UPS, USPS, etc.
-         */
-        carrier?: string;
-
-        /**
-         * Recipient phone (including extension).
-         */
-        phone?: string;
-
-        /**
-         * The tracking number for a physical product, obtained from the delivery service. If multiple
-         * tracking numbers were generated for this purchase, please separate them with commas.
-         */
-        tracking_number?: string;
-    }
-
-
-    interface IList<T> {
-        /**
-         * Value is 'list'
-         */
-        object: string;
-
-        /**
-         * An array containing the actual response elements, paginated by any request parameters.
-         */
-        data: Array<T>;
-
-        /**
-         * Whether or not there are more elements available after this set. If false, this set comprises the end of the list.
-         */
-        has_more: boolean;
-
-        /**
-         * The URL for accessing this list.
-         */
-        url: string;
-
-        /**
-         * The total number of items available. This value is not included by default,
-         * but you can request it by specifying ?include[]=total_count
-         */
-        total_count?: number;
-    }
-
-    interface IListOptions extends IDataOptions {
-        /**
-         * A cursor for use in pagination. ending_before is an object ID that defines your place in the list. For instance, if you make
-         * a list request and receive 100 objects, starting with obj_bar, your subsequent call can include ending_before=obj_bar in
-         * order to fetch the previous page of the list.
-         */
-        ending_before?: string;
-
-        /**
-         * A limit on the number of objects to be returned. Limit can range between 1 and 100 items.
-         */
-        limit?: number;
-
-        /**
-         * A cursor for use in pagination. starting_after is an object ID that defines your place in the list. For instance, if you make
-         * a list request and receive 100 objects, ending with obj_foo, your subsequent call can include starting_after=obj_foo in order
-         * to fetch the next page of the list.
-         */
-        starting_after?: string;
-    }
-    interface IListOptionsCreated extends IListOptions {
-        /**
-         * A filter on the list based on the object created field. The value can be a string with an integer Unix timestamp, or it can
-         * be a dictionary.
-         */
-        created?: string | IDateFilter;
-    }
-
-    interface IDataOptions {
-        expand?: Array<string>;
-        include?: Array<string>;
-    }
-
-    interface IDataOptionsWithMetadata extends IDataOptions {
-        /**
-         * A set of key/value pairs that you can attach to an object. It can be
-         * useful for storing additional information about the object in a structured
-         * format. You can unset an individual key by setting its value to null and
-         * then saving. To clear all keys, set metadata to null, then save.
-         */
-        metadata?: IMetadata;
-    }
-
-    interface IHeaderOptions {
-        /**
-         * To safely retry an API request without accidentally performing the same operation twice,
-         * you can attach a unique key to any POST request made to the Stripe API via the Idempotency-Key: <key> header.
-         * For example, if a request to create a charge fails due to a network connection error, you can make
-         * a second request with the same key to guarantee that only a single charge is created.
-         * The creation of the key is completely up to you. We suggest using random strings or UUIDs.
-         * We'll always send back the same response for requests made with the same key, even if you make the request
-         * with different request parameters. The keys expire after 24 hours.
-         */
-        idempotency_key?: string;
-
-        stripe_account?: string;
-
-        api_key?: string;
-    }
-
-    /**
-     * Header options can either be a Connect Account Secret Key,
-     * or a hash with one or more of these keys: idempotency_key, stripe_account, api_key
-     */
-    type HeaderOptions = IHeaderOptions | string;
-
-    /**
-     * Stripe uses conventional HTTP response codes to indicate success or failure of an API request.
-     * In general, codes in the 2xx range indicate success, codes in the 4xx range indicate an error that
-     * resulted from the provided information (e.g. a required parameter was missing, a charge failed, etc.),
-     * and codes in the 5xx range indicate an error with Stripe's servers. Not all errors map cleanly onto HTTP
-     * response codes, however. When a request is valid but does not complete successfully (e.g. a card is
-     * declined), we return a 402 error code.
-     *
-     * 200 - OK                           Everything worked as expected.
-     * 400 - Bad Request                  Often missing a required parameter.
-     * 401 - Unauthorized                 No valid API key provided.
-     * 402 - Request Failed               Parameters were valid but request failed.
-     * 404 - Not Found                    The requested item doesn't exist.
-     * 500, 502, 503, 504 - Server Errors Something went wrong on Stripe's end.
-     */
-    interface IStripeError {
-        /**
-         * The type of error returned. Can be invalid_request_error, api_error, or card_error.
-         *
-         *
-         * invalid_request_error Invalid request errors arise when your request has invalid parameters.
-         *
-         * api_error             API errors cover any other type of problem (e.g. a temporary problem with Stripe's
-         *                       servers) and should turn up only very infrequently.
-         *
-         * card_error            Card errors are the most common type of error you should expect to handle. They result
-         *                       when the user enters a card that can't be charged for some reason.
-         */
-        type: string;
-
-        /**
-         * A human-readable message giving more details about the error. For card errors, these messages can
-         * be shown to your users.
-         */
-        message?: string;
-
-        /**
-         * For card errors, a short string from amongst those listed on the right describing the kind of card
-         * error that occurred.
-         *
-         * incorrect_number          The card number is incorrect.
-         * invalid_number            The card number is not a valid credit card number.
-         * invalid_expiry_month      The card's expiration month is invalid.
-         * invalid_expiry_year       The card's expiration year is invalid.
-         * invalid_cvc               The card's security code is invalid.
-         * expired_card              The card has expired.
-         * incorrect_cvc             The card's security code is incorrect.
-         * incorrect_zip             The card's zip code failed validation.
-         * card_declined             The card was declined.
-         * missing                   There is no card on a customer that is being charged.
-         * processing_error          An error occurred while processing the card.
-         * rate_limit                An error occurred due to requests hitting the API too
-         *                             quickly. Please let us know if you're consistently running
-         *                             into this error.
-         */
-        code?: string;
-
-        /**
-         * The parameter the error relates to if the error is parameter-specific. You can use this to display a
-         * message near the correct form field, for example.
-         */
-        param?: string;
-    }
-}
diff --git a/types/stripe-node/stripe-node-tests.ts b/types/stripe-node/stripe-node-tests.ts
deleted file mode 100644
index f8a3f5c353..0000000000
--- a/types/stripe-node/stripe-node-tests.ts
+++ /dev/null
@@ -1,993 +0,0 @@
-import StripeNode = require('stripe');
-
-var stripeTor = new StripeNode("sk_test_BF573NobVn98OiIsPAv7A04K");
-var stripe = StripeNode("sk_test_BF573NobVn98OiIsPAv7A04K")
-
-stripe.setApiVersion('2016-03-07');
-
-
-//#region Balance tests
-// ##################################################################################
-
-stripe.balance.retrieve(function (err, balance) {
-    // asynchronously called
-});
-stripe.balance.retrieve().then(function (balance) {
-    // asynchronously called
-});
-
-stripe.balance.retrieveTransaction(
-    "txn_17xMvmBoqMA9o2xkYNH2ewNj",
-    function (err, balanceTransaction) {
-        // asynchronously called
-    }
-);
-stripe.balance.retrieveTransaction(
-    "txn_17xMvmBoqMA9o2xkYNH2ewNj").then(
-    function (balanceTransaction) {
-        // asynchronously called
-    }
-);
-
-stripe.balance.listTransactions({ limit: 3 }, function (err, transactions) {
-    // asynchronously called
-});
-stripe.balance.listTransactions({ limit: 3 }).then( function (transactions) {
-    // asynchronously called
-});
-stripe.balance.listTransactions().then(function (transactions) {
-    // asynchronously called
-});
-//#endregion
-
-//#region Charges tests
-// ##################################################################################
-
-stripe.charges.create({
-    amount: 400,
-    currency: "gbp",
-    source: "tok_17wV94BoqMA9o2xkhlAd3ALf", // obtained with Stripe.js
-    description: "Charge for test@example.com"
-}, function (err, charge) {
-    // asynchronously called
-    });
-stripe.charges.create({
-    amount: 400,
-    currency: "gbp",
-    source: "tok_17wV94BoqMA9o2xkhlAd3ALf", // obtained with Stripe.js
-    description: "Charge for test@example.com"
-}).then(function (charge) {
-    // asynchronously called
-
-    charge.refunds.create().then(function (refund) {
-        // asynchronously called
-    });
-    charge.refunds.create({ amount: 100 }).then(function (refund) {
-        // asynchronously called
-    });
-
-    charge.refunds.retrieve("re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
-
-    });
-
-    charge.refunds.update("re_15jzA4Ee31JkLCeQcxbTbjaL", { metadata: { test: "data" } }).then(function (refund) {
-
-    });
-
-    charge.refunds.list({ limit: 3 }).then(function (refund) {
-
-    });
-    charge.refunds.list().then(function (refund) {
-
-    });
-});
-
-stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9", function (err, charge) {
-    // asynchronously called
-});
-stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (charge) {
-    // asynchronously called
-});
-
-stripe.charges.update(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    {
-        description: "Charge for test@example.com"
-    },
-    function (err, charge) {
-        // asynchronously called
-    }
-);
-stripe.charges.update(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    {
-        description: "Charge for test@example.com"
-    })
-    .then(function (charge) {
-        // asynchronously called
-    });
-
-stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9", function (err, charge) {
-    // asynchronously called
-});
-stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9").then( function (charge) {
-    // asynchronously called
-});
-
-stripe.charges.list({ limit: 3 }, function (err, charges) {
-    // asynchronously called
-});
-stripe.charges.list({ limit: 3 }).then(function (charges) {
-    // asynchronously called
-});
-
-stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9", {},
-    function (err, refund) {
-        // asynchronously called
-    }
-);
-stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9", {}).then(function (refund) {
-    // asynchronously called
-});
-stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (refund) {
-    // asynchronously called
-});
-
-stripe.charges.retrieveRefund(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    "re_15jzA4Ee31JkLCeQcxbTbjaL",
-    function (err, refund) {
-        // asynchronously called
-    }
-);
-stripe.charges.retrieveRefund(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    "re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
-        // asynchronously called
-    }
-);
-
-stripe.charges.createRefund(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    {},
-    function (err, refund) {
-        // asynchronously called
-    }
-);
-stripe.charges.createRefund(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    function (err, refund) {
-        // asynchronously called
-    }
-);
-stripe.charges.createRefund("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (refund) {
-    // asynchronously called
-});
-
-stripe.charges.updateRefund(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    "re_15jzA4Ee31JkLCeQcxbTbjaL",
-    { metadata: { key: "value" } },
-    function (err: StripeNode.IStripeError, refund: StripeNode.refunds.IRefund) {
-        // asynchronously called
-
-    }
-);
-stripe.charges.updateRefund(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    "re_15jzA4Ee31JkLCeQcxbTbjaL",
-    { metadata: { key: "value" } }).then(
-    function (refund) {
-        // asynchronously called
-
-    }
-);
-
-stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
-    // asynchronously called
-});
-stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
-    // asynchronously called
-});
-stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', { limit: 3 }, function (err, refunds) {
-    // asynchronously called
-});
-stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', { limit: 3 }).then(function (refunds) {
-    // asynchronously called
-});
-
-stripe.charges.markAsSafe('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
-    // asynchronously called
-});
-stripe.charges.markAsSafe('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
-    // asynchronously called
-});
-
-stripe.charges.markAsFraudulent('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
-    // asynchronously called
-});
-stripe.charges.markAsFraudulent('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
-    // asynchronously called
-});
-
-//#endregion
-
-//#region Customer tests
-// ##################################################################################
-
-stripe.customers.create({
-    description: 'Customer for test@example.com',
-    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
-}, function (err, customer) {
-    // asynchronously called
-    });
-stripe.customers.create({
-    description: 'Customer for test@example.com',
-    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
-}).then( function (customer) {
-    // asynchronously called
-    customer.cards.create({ card: "tok_17wV94BoqMA9o2xkhlAd3ALf"}).then(function (customer) {});
-    customer.cards.retrieve("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (card) {});
-    customer.cards.update("card_17xMvXBoqMA9o2xkq6W5gamx", { name: "Test" }).then(function (card) {});
-    customer.cards.list().then(function (cards) {});
-    customer.cards.del("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (confirmation) {});
-
-    customer.subscriptions.create({ plan: "gold" }).then(function (subscription) { });
-    customer.subscriptions.retrieve("sub_8Eluur5KoIKxuy").then(function (subscription) { });
-    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { plan: "silver" }).then(function (subscription) { });
-    customer.subscriptions.list().then(function (subscriptions) { });
-    customer.subscriptions.del("sub_8Eluur5KoIKxuy").then(function (subscription) { });
-    customer.subscriptions.deleteDiscount("sub_8Eluur5KoIKxuy").then(function (confirmation) { });
-});
-
-
-stripe.customers.create({
-    description: 'Customer for test@example.com',
-    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
-}, { stripe_account: "" }, function (err, customer) {
-    // asynchronously called
-});
-stripe.customers.create({
-    description: 'Customer for test@example.com',
-    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
-}, { stripe_account: "" }).then(function (customer) {
-
-});
-
-stripe.customers.retrieve(
-    "cus_5rfJKDJkuxzh5Q",
-    function (err, customer) {
-        // asynchronously called
-        customer.cards.create(
-            { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
-            function (err, card) {
-                // asynchronously called
-                card.brand;
-            }
-        );
-    }
-);
-stripe.customers.retrieve("cus_5rfJKDJkuxzh5Q").then(function (customer) {
-    // asynchronously called
-});
-
-stripe.customers.update("cus_5rfJKDJkuxzh5Q", {
-    description: "Customer for test@example.com"
-}, function (err, customer) {
-    // asynchronously called
-    });
-stripe.customers.update("cus_5rfJKDJkuxzh5Q", {
-    description: "Customer for test@example.com"
-}).then(function (customer) {
-    // asynchronously called
-});
-
-stripe.customers.del(
-    "cus_5rfJKDJkuxzh5Q",
-    function (err, confirmation) {
-        // asynchronously called
-    }
-);
-stripe.customers.del("cus_5rfJKDJkuxzh5Q").then(function (confirmation) {
-        // asynchronously called
-    }
-);
-
-stripe.customers.list({ limit: 3 }, function (err, customers) {
-    // asynchronously called
-});
-stripe.customers.list({ limit: 3 }).then(function (customers) {
-    // asynchronously called
-});
-
-stripe.customers.createCard(
-    "cus_5rfJKDJkuxzh5Q",
-    { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
-    function (err, card) {
-        // asynchronously called
-    }
-);
-stripe.customers.createCard("cus_5rfJKDJkuxzh5Q", { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (card) {
-    // asynchronously called
-});
-
-stripe.customers.createSource(
-    "cus_5rfJKDJkuxzh5Q",
-    { source: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
-    function (err, source) {
-        var card = <StripeNode.ICard>source;
-        var bankAcc = <StripeNode.IBankAccount>source;
-    }
-);
-stripe.customers.createSource("cus_5rfJKDJkuxzh5Q", { source: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (source) {
-    var card = <StripeNode.ICard>source;
-    var bankAcc = <StripeNode.IBankAccount>source;
-});
-
-stripe.customers.createSource(
-    "cus_5rfJKDJkuxzh5Q",
-    {
-        source: {
-            object: "card",
-            exp_month: 1,
-            exp_year: 16,
-            number: 4242424242424242
-        }
-    },
-    function (err, card) {
-        // asynchronously called
-        var obj: StripeNode.ICard = card;
-    }
-);
-stripe.customers.createSource(
-    "cus_5rfJKDJkuxzh5Q",
-    {
-        source: {
-            object: "card",
-            exp_month: 1,
-            exp_year: 16,
-            number: 4242424242424242
-        }
-    }).then(
-    function (card) {
-        // asynchronously called
-        var obj: StripeNode.ICard = card;
-    }
-);
-
-stripe.customers.createSource(
-    "cus_5rfJKDJkuxzh5Q",
-    { source: "btok_8E264Lxsbyvj3E" },
-    function (err: StripeNode.IStripeError, bankAcc: StripeNode.IBankAccount) {
-        // asynchronously called
-        bankAcc.bank_name;
-    }
-);
-stripe.customers.createSource(
-    "cus_5rfJKDJkuxzh5Q",
-    { source: "btok_8E264Lxsbyvj3E" }).then(function (bankAcc: StripeNode.IBankAccount) {
-        // asynchronously called
-        bankAcc.bank_name;
-    }
-);
-
-stripe.customers.retrieveCard(
-    "cus_5rfJKDJkuxzh5Q",
-    "card_15fvyXEe31JkLCeQ9KMktP5S",
-    function (err, card) {
-        // asynchronously called
-        var obj: StripeNode.ICard = card;
-    }
-);
-stripe.customers.retrieveCard(
-    "cus_5rfJKDJkuxzh5Q",
-    "card_15fvyXEe31JkLCeQ9KMktP5S").then(function (card) {
-        // asynchronously called
-        var obj: StripeNode.ICard = card;
-    });
-
-stripe.customers.updateCard(
-    "cus_5rfJKDJkuxzh5Q",
-    "card_15fvyXEe31JkLCeQ9KMktP5S",
-    { name: "Jane Austen" },
-    function (err, card) {
-        // asynchronously called
-        var obj: StripeNode.ICard = card;
-    }
-);
-
-stripe.customers.updateCard(
-    "cus_5rfJKDJkuxzh5Q",
-    "card_15fvyXEe31JkLCeQ9KMktP5S",
-    { name: "Jane Austen" }).then(function (card) {
-        // asynchronously called
-        var obj: StripeNode.ICard = card;
-    });
-
-stripe.customers.deleteCard(
-    "cus_5rfJKDJkuxzh5Q",
-    "card_15fvyXEe31JkLCeQ9KMktP5S",
-    function (err, confirmation) {
-        // asynchronously called
-    }
-);
-stripe.customers.deleteCard(
-    "cus_5rfJKDJkuxzh5Q",
-    "card_15fvyXEe31JkLCeQ9KMktP5S").then(function (confirmation) {
-        // asynchronously called
-    });
-
-stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', null, function (err, cards) {
-    // asynchronously called
-});
-stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', null).then(function (cards) {
-    // asynchronously called
-});
-
-stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', function (err, cards) {
-    // asynchronously called
-});
-stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc').then(function (cards) {
-    // asynchronously called
-});
-
-stripe.customers.retrieveSubscription(
-    "cus_5rfJKDJkuxzh5Q",
-    "sub_5rfJxnBLGSwsYp",
-    function (err, subscription) {
-        // asynchronously called
-    }
-);
-stripe.customers.retrieveSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (subscription) {
-    // asynchronously called
-});
-
-stripe.customers.updateSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", { plan: "platypi-dev" },
-    function (err, subscription) {
-        // asynchronously called
-    }
-);
-stripe.customers.updateSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", { plan: "platypi-dev" }).then(function (subscription) {
-    // asynchronously called
-});
-
-stripe.customers.cancelSubscription(
-    "cus_5rfJKDJkuxzh5Q",
-    "sub_5rfJxnBLGSwsYp",
-    null,
-    function (err, confirmation) {
-        // asynchronously called
-    }
-);
-stripe.customers.cancelSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", null).then(function (confirmation) {
-    // asynchronously called
-});
-
-stripe.customers.cancelSubscription(
-    "cus_5rfJKDJkuxzh5Q",
-    "sub_5rfJxnBLGSwsYp",
-    function (err, confirmation) {
-        // asynchronously called
-    }
-);
-stripe.customers.cancelSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (confirmation) {
-    // asynchronously called
-});
-
-stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', null, function (err, subscriptions) {
-    // asynchronously called
-});
-stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', null).then(function (subscriptions) {
-    // asynchronously called
-});
-
-stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', function (err, subscriptions) {
-    // asynchronously called
-});
-stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc').then(function (subscriptions) {
-    // asynchronously called
-});
-
-stripe.customers.deleteDiscount("cus_5rfJKDJkuxzh5Q", function (err, confirmation) {
-    // asynchronously called
-});
-stripe.customers.deleteDiscount("cus_5rfJKDJkuxzh5Q").then(function (confirmation) {
-    // asynchronously called
-});
-
-stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", function (err, confirmation) {
-    // asynchronously called
-});
-stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (confirmation) {
-    // asynchronously called
-});
-
-//#endregion
-
-//#region Disputes tests
-// ##################################################################################
-
-//#endregion
-
-//#region Events tests
-// ##################################################################################
-
-//#endregion
-
-//#region File Uploads tests
-// ##################################################################################
-
-//#endregion
-
-//#region Refunds tests
-// ##################################################################################
-
-
-//#endregion
-
-//#region Tokens tests
-// ##################################################################################
-
-//#endregion
-
-//#region Transfers tests
-// ##################################################################################
-
-//#endregion
-
-//#region Transfers Reversals tests
-// ##################################################################################
-
-//#endregion
-
-//#region Accounts test
-// ##################################################################################
-
-stripe.accounts.create({
-    email: ""
-}, function (err, customer) {
-    // asynchronously called
-    }
-);
-stripe.accounts.create({
-    email: ""
-}).then(function (customer) {
-    // asynchronously called
-    }
-);
-
-stripe.accounts.retrieve(
-    "acct_17wV8KBoqMA9o2xk",
-    function (err, account) {
-        // asynchronously called
-    }
-);
-stripe.accounts.retrieve(
-    "acct_17wV8KBoqMA9o2xk").then(
-    function (account) {
-        // asynchronously called
-    }
-);
-
-stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
-    {
-        support_phone: "555-867-5309"
-    },
-    function(err, account) {
-        // asynchronously called
-    }
-);
-stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
-    {
-        support_phone: "555-867-5309"
-    }).then(
-    function(account) {
-        // asynchronously called
-    }
-);
-
-stripe.accounts.del("acct_17wV8KBoqMA9o2xk", function (err, confirmation) { });
-stripe.accounts.del("acct_17wV8KBoqMA9o2xk").then(function (confirmation) { });
-
-stripe.accounts.reject("acct_17wV8KBoqMA9o2xk", { reason: 'fraud' }, function (err, account) {
-    // asynchronously called
-});
-stripe.accounts.reject("acct_17wV8KBoqMA9o2xk", { reason: 'fraud' }).then(function (account) {
-    // asynchronously called
-});
-
-stripe.accounts.list(
-    { limit: 3 },
-    function (err, accounts) {
-        // asynchronously called
-    }
-);
-stripe.accounts.list(
-    { limit: 3 }).then(
-    function (accounts) {
-        // asynchronously called
-    }
-);
-//#endregion
-
-//#region Application Fee Refunds tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Application Fees tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Country Specs tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region External Accounts tests
-// ##################################################################################
-
-stripe.accounts.createExternalAccount("", { external_account: "btok_8E264Lxsbyvj3E" }, function (err, extAcc) {
-    var card = <StripeNode.ICard>extAcc;
-    var bankAcc = <StripeNode.IBankAccount>extAcc;
-});
-stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (extAcc) {
-    var card = <StripeNode.ICard>extAcc;
-    var bankAcc = <StripeNode.IBankAccount>extAcc;
-});
-
-stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }, { stripe_account: "acct_17wV8KOoqMF9a2xk" }).then(function (extAcc) {
-    var card = <StripeNode.ICard>extAcc;
-    var bankAcc = <StripeNode.IBankAccount>extAcc;
-});
-stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }, "acct_17wV8KOoqMF9a2xk").then(function (extAcc) {
-    var card = <StripeNode.ICard>extAcc;
-    var bankAcc = <StripeNode.IBankAccount>extAcc;
-});
-
-//#endregion
-
-//#region Bank Accounts tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Bitcoin Receivers tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Cards tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Orders tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Order Items tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Products tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region SKUs tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region WebHooks tests
-// ##################################################################################
-
-const webhookRequest = {
-  rawBody: '',
-  headers: { 'stripe-signature': '' }
-};
-const webhookSecret = '';
-
-const event = stripe.webhooks.constructEvent<StripeNode.subscriptions.ISubscription>(
-  webhookRequest.rawBody,
-  webhookRequest.headers['stripe-signature'],
-  webhookSecret
-);
-
-//#endregion
-
-//#region Coupons tests
-// ##################################################################################
-
-stripe.coupons.create({
-    percent_off: 25,
-    duration: 'repeating',
-    duration_in_months: 3,
-    id: '25OFF'
-}, function (err, coupon) {
-    // asynchronously called
-    });
-stripe.coupons.create({
-    percent_off: 25,
-    duration: 'repeating',
-    duration_in_months: 3,
-    id: '25OFF'
-}).then(function (coupon) {
-    // asynchronously called
-});
-
-stripe.coupons.retrieve(
-    "25OFF",
-    function (err, coupon) {
-        // asynchronously called
-    }
-);
-stripe.coupons.retrieve("25OFF").then(function (coupon) {
-    // asynchronously called
-});
-
-stripe.coupons.update("25OFF", {
-    metadata: { key: "value" }
-}, function (err: StripeNode.IStripeError, coupon: StripeNode.coupons.ICoupon) {
-    // asynchronously called
-});
-stripe.coupons.update("25OFF", {
-    metadata: { key: "value" }
-}).then(function (coupon) {
-    // asynchronously called
-});
-
-stripe.coupons.del("25OFF", function (err, confirmation) {
-
-});
-stripe.coupons.del("25OFF").then(function (confirmation) {
-
-});
-
-stripe.coupons.list({ limit: 3 }, function (err, coupons) {
-    // asynchronously called
-});
-stripe.coupons.list({ limit: 3 }).then(function (coupons) {
-    // asynchronously called
-});
-
-//#endregion
-
-//#region Discounts tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Invoices tests
-// ##################################################################################
-
-stripe.invoices.create({
-    customer: "cus_5rfJKDJkuxzh5Q"
-}, function (err, invoice) {
-    // asynchronously called
-    });
-stripe.invoices.create({
-    customer: "cus_5rfJKDJkuxzh5Q"
-}).then(function (invoice) {
-    // asynchronously called
-});
-
-stripe.invoices.retrieve(
-    "in_15fvyXEe31JkLCeQH7QbgZZb",
-    function (err, invoice) {
-        // asynchronously called
-    }
-);
-stripe.invoices.retrieve("in_15fvyXEe31JkLCeQH7QbgZZb").then(function (invoice) {
-    // asynchronously called
-});
-
-stripe.invoices.retrieveLines(
-    "in_15fvyXEe31JkLCeQH7QbgZZb",
-    { limit: 5 },
-    function (err, lines) {
-        // asynchronously called
-        lines.data[0].type = "invoiceitem"
-    }
-);
-stripe.invoices.retrieveLines("in_15fvyXEe31JkLCeQH7QbgZZb", { limit: 5 }).then(function (lines) {
-    // asynchronously called
-});
-
-stripe.invoices.retrieveUpcoming(
-    "cus_5rfJKDJkuxzh5Q",
-    null,
-    function (err, upcoming) {
-        // asynchronously called
-    }
-);
-stripe.invoices.retrieveUpcoming("cus_5rfJKDJkuxzh5Q", null).then(function (upcoming) {
-    // asynchronously called
-});
-
-stripe.invoices.retrieveUpcoming(
-    "cus_5rfJKDJkuxzh5Q",
-    function (err, upcoming) {
-        // asynchronously called
-    }
-);
-stripe.invoices.retrieveUpcoming("cus_5rfJKDJkuxzh5Q").then(function (upcoming) {
-    // asynchronously called
-});
-
-stripe.invoices.update(
-    "in_15fvyXEe31JkLCeQH7QbgZZb",
-    {
-        closed: true
-    },
-    function (err, invoice) {
-        // asynchronously called
-    }
-);
-stripe.invoices.update(
-    "in_15fvyXEe31JkLCeQH7QbgZZb",
-    {
-        closed: true
-    }).then(function (invoice) {
-        // asynchronously called
-    }
-);
-
-stripe.invoices.pay("in_15fvyXEe31JkLCeQH7QbgZZb", function (err, invoice) {
-    // asynchronously called
-});
-stripe.invoices.pay("in_15fvyXEe31JkLCeQH7QbgZZb").then(function (invoice) {
-    // asynchronously called
-});
-
-stripe.invoices.list(
-    { customer: "cus_5rfJKDJkuxzh5Q", limit: 3 },
-    function (err, invoices) {
-        // asynchronously called
-    }
-);
-stripe.invoices.list({ customer: "cus_5rfJKDJkuxzh5Q", limit: 3 }).then(function (invoices) {
-    // asynchronously called
-});
-
-//#endregion
-
-//#region Invoice Items tests
-// ##################################################################################
-
-
-
-//#endregion
-
-//#region Plans tests
-// ##################################################################################
-
-stripe.plans.create({
-    amount: 2000,
-    interval: "month",
-    name: "Amazing Gold Plan",
-    currency: "usd",
-    id: "gold"
-}, function (err, plan) {
-    // asynchronously called
-    });
-stripe.plans.create({
-    amount: 2000,
-    interval: "month",
-    name: "Amazing Gold Plan",
-    currency: "usd",
-    id: "gold"
-}).then(function (plan) {
-    // asynchronously called
-});
-
-stripe.plans.retrieve(
-    "platypi-dev",
-    function (err, plan) {
-        // asynchronously called
-    }
-);
-stripe.plans.retrieve("platypi-dev").then(function (plan) {
-    // asynchronously called
-});
-
-stripe.plans.update("platypi-dev", {
-    name: "New plan name"
-}, function (err, plan) {
-    // asynchronously called
-});
-stripe.plans.update("platypi-dev", { name: "New plan name" }).then(function (plan) {
-    // asynchronously called
-});
-
-stripe.plans.del(
-    "platypi-dev",
-    function (err, confirmation) {
-        // asynchronously called
-    }
-);
-stripe.plans.del("platypi-dev").then(function (confirmation) {
-    // asynchronously called
-});
-
-stripe.plans.list(null, function (err, plans) {
-    // asynchronously called
-});
-stripe.plans.list(null).then(function (plans) {
-    // asynchronously called
-});
-
-stripe.plans.list(function (err, plans) {
-    // asynchronously called
-});
-stripe.plans.list().then(function (plans) {
-    // asynchronously called
-});
-
-//#endregion
-
-//#region Subscriptions tests
-// ##################################################################################
-
-stripe.subscriptions.create({ plan: "platypi-dev", customer: "cus_5rfJKDJkuxzh5Q" }, function(err, subscription) {
-    // asynchronously called
-});
-stripe.subscriptions.create({ plan: "platypi-dev", customer: "cus_5rfJKDJkuxzh5Q" }).then(function(subscription) {
-    // asynchronously called
-});
-
-stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt", function(err, subscription) {
-    // asynchronously called
-});
-stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt").then(function(subscription) {
-    // asynchronously called
-});
-
-stripe.subscriptions.update("sub_8QwCiwZ9tmMSpt", { plan: "platypi" }, function(err, subscription) {
-    // asynchronously called
-});
-stripe.subscriptions.update("sub_8QwCiwZ9tmMSpt", { plan: "platypi" }).then(function(subscription) {
-    // asynchronously called
-});
-
-stripe.subscriptions.del("sub_8QwCiwZ9tmMSpt", function(err, subscription) {
-    // asynchronously called
-});
-stripe.subscriptions.del("sub_8QwCiwZ9tmMSpt").then(function(subscription) {
-    // asynchronously called
-});
-
-stripe.subscriptions.list({ customer: "cus_5rfJKDJkuxzh5Q", plan: "platypi-dev" }, function(err, subscriptions) {
-    // asynchronously called
-});
-stripe.subscriptions.list({ customer: "cus_5rfJKDJkuxzh5Q", plan: "platypi-dev" }).then(function(subscriptions) {
-    // asynchronously called
-});
-
-//#endregion
diff --git a/types/stripe-node/tsconfig.json b/types/stripe-node/tsconfig.json
deleted file mode 100644
index 7723446cb5..0000000000
--- a/types/stripe-node/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "stripe-node-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/stripe-v3/index.d.ts b/types/stripe-v3/index.d.ts
index db8257401c..76666e747a 100644
--- a/types/stripe-v3/index.d.ts
+++ b/types/stripe-v3/index.d.ts
@@ -118,7 +118,7 @@ declare namespace stripe {
         charge: string;
         message?: string;
         code?: string;
-        declined_code?: string;
+        decline_code?: string;
         param?: string;
     }
 
@@ -185,6 +185,7 @@ declare namespace stripe {
             blur(): void;
             clear(): void;
             unmount(): void;
+            destroy(): void;
             update(options: ElementsOptions): void;
         }
 
diff --git a/types/stripe-v3/stripe-v3-tests.ts b/types/stripe-v3/stripe-v3-tests.ts
index acf878d945..ccf86e5215 100644
--- a/types/stripe-v3/stripe-v3-tests.ts
+++ b/types/stripe-v3/stripe-v3-tests.ts
@@ -42,6 +42,7 @@ describe("Stripe", () => {
             (error: stripe.Error) => {
                 console.error(error);
             });
+        card.destroy();
     });
 });
 
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
new file mode 100644
index 0000000000..49ba212f95
--- /dev/null
+++ b/types/stripe/index.d.ts
@@ -0,0 +1,6824 @@
+// Type definitions for stripe 5.0
+// Project: https://github.com/stripe/stripe-node/
+// Definitions by: William Johnston <https://github.com/wjohnsto>
+//                 Peter Harris <https://github.com/codeanimal>
+//                 Sampson Oliver <https://github.com/sampsonjoliver>
+//                 Linus Unnebäck <https://github.com/LinusU>
+//                 Brannon Jones <https://github.com/brannon>
+//                 Kyle Kamperschroer <https://github.com/kkamperschroer>
+//                 Kensuke Hoshikawa <https://github.com/starhoshi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare class Stripe {
+    DEFAULT_HOST: string;
+    DEFAULT_PORT: string;
+    DEFAULT_BASE_PATH: string;
+    DEFAULT_API_VERSION: string;
+    DEFAULT_TIMEOUT: number;
+    PACKAGE_VERSION: string;
+    USER_AGENT: {
+        bindings_version: string;
+        lang: string;
+        lang_version: string;
+        platform: string;
+        publisher: string;
+        uname: string;
+    };
+    USER_AGENT_SERIALIZED: string;
+
+    resources: typeof Stripe.resources;
+    StripeResource: typeof Stripe.StripeResource;
+
+    constructor(apiKey: string, version?: string);
+
+    accounts: Stripe.resources.Accounts;
+    balance: Stripe.resources.Balance;
+    charges: Stripe.resources.Charges;
+    coupons: Stripe.resources.Coupons;
+    customers: Stripe.resources.Customers;
+    disputes: Stripe.resources.Disputes;
+    events: Stripe.resources.Events;
+    invoices: Stripe.resources.Invoices;
+    invoiceItems: Stripe.resources.InvoiceItems;
+    payouts: Stripe.resources.Payouts;
+    plans: Stripe.resources.Plans;
+    /**
+     * @deprecated
+     */
+    recipientCards: Stripe.resources.RecipientCards;
+    /**
+     * @deprecated
+     */
+    recipients: Stripe.resources.Recipients;
+    subscriptions: Stripe.resources.Subscriptions;
+    tokens: Stripe.resources.Tokens;
+    transfers: Stripe.resources.Transfers;
+    applicationFees: Stripe.resources.ApplicationFees;
+    fileUploads: Stripe.resources.FileUploads;
+    bitcoinReceivers: Stripe.resources.BitcoinReceivers;
+    refunds: Stripe.resources.Refunds;
+    countrySpecs: Stripe.resources.CountrySpecs;
+    orders: Stripe.resources.Orders;
+    products: Stripe.resources.Products;
+    skus: Stripe.resources.SKUs;
+    webhooks: Stripe.resources.WebHooks;
+    ephemeralKeys: Stripe.resources.EphemeralKeys;
+
+    setHost(host: string): void;
+    setHost(host: string, port: string|number): void;
+    setHost(host: string, port: string|number, protocol: string): void;
+
+    setProtocol(protocol: string): void;
+    setPort(port: string|number): void;
+    setApiVersion(version?: string): void;
+    setApiKey(key?: string): void;
+    setTimeout(timeout?: number): void;
+    setHttpAgent(agent: string): void;
+    getConstant(c: string): any;
+    getClientUserAgent(response: (userAgent: string) => void): void;
+}
+export = Stripe;
+
+declare namespace Stripe {
+    // Helper
+    type IBankAccount = bankAccounts.IBankAccount;
+    type ICard = cards.ICard;
+
+    namespace accounts {
+        interface IAccount extends IResourceObject, IAccountShared {
+            /**
+             * Value is "account"
+             */
+            object: string;
+
+            /**
+             * Whether or not the account can create live charges
+             */
+            charges_enabled: boolean;
+
+            /**
+             * The country of the account
+             */
+            country: string;
+
+            /**
+             * Whether or not account details have been submitted yet. Standalone
+             * accounts cannot receive transfers before this is true.
+             */
+            details_submitted: boolean;
+
+            /**
+             * The display name for this account. This is used on the Stripe dashboard to
+             * help you differentiate between accounts.
+             */
+            display_name: string;
+
+            /**
+             * Whether or not Stripe will send automatic transfers for this account. This
+             * is only false when Stripe is waiting for additional information from the
+             * account holder.
+             */
+            transfers_enabled: boolean;
+
+            /**
+             * The state of the account’s information requests, including what
+             * information is needed and by when it must be provided.
+             */
+            verification: {
+                /**
+                 * A string describing the reason for this account being unable to charge
+                 * and/or transfer, if that is the case. Possible values are "rejected.fraud",
+                 * "rejected.terms_of_service", "rejected.listed", "rejected.other",
+                 * "fields_needed", "listed", or "other".
+                 */
+                disabled_reason: string;
+
+                /**
+                 * At what time the fields_needed must be provided. If this date is in
+                 * the past, the account is already in bad standing, and providing
+                 * fields_needed is necessary to re-enable transfers and prevent other
+                 * consequences. If this date is in the future, fields_needed must be
+                 * provided to ensure the account remains in good standing.
+                 */
+                due_by: number;
+
+                /**
+                 * Field names that need to be provided for the account to remain in good
+                 * standing. Nested fields are separated by "." (for example,
+                 * "legal_entity.first_name").
+                 */
+                fields_needed: Array<string>;
+            }
+        }
+
+        interface IAccountCreationOptions extends IAccountUpdateOptions {
+            /**
+             * The country the account holder resides in or that the business is legally
+             * established in. For example, if you are in the United States and the
+             * business you’re creating an account for is legally represented in Canada,
+             * you would use “CA� as the country for the account being created.
+             * 
+             * optional, default is your own country
+             */
+            country?: string;
+
+            /**
+             * The email address of the account holder. For standalone accounts, Stripe
+             * will email your user with instructions for how to set up their account. For
+             * managed accounts, this is only to make the account easier to identify to
+             * you: Stripe will never directly reach out to your users.
+             * 
+             * required if type is "standard"
+             */
+            email?: string;
+
+            /**
+             * Whether you'd like to create a Custom or Standard account. Custom
+             * accounts have extra parameters available to them, and require that you,
+             * the platform, handle all communication with the account holder.
+             * Standard accounts are normal Stripe accounts: Stripe will email the
+             * account holder to setup a username and password, and handle all account
+             * management directly with them. Possible values are custom and standard.
+             */
+            type: 'custom' | 'standard';
+        }
+
+        interface IAccountShared {
+            business_logo?: string;
+
+            /**
+             * The publicly sharable name for this account
+             */
+            business_name?: string;
+
+            /**
+             * A CSS hex color value representing the primary branding color for this
+             * account
+             */
+            business_primary_color?: string;
+
+            /**
+             * The URL that best shows the service or product provided for this account
+             */
+            business_url?: string;
+
+            /**
+             * A boolean for whether or not Stripe should try to reclaim negative
+             * balances from the account holder’s bank account. See our managed
+             * account bank transfer guide for more information
+             */
+            debit_negative_balances?: boolean;
+
+            /**
+             * Account-level settings to automatically decline certain types of charges
+             * regardless of the bank’s decision.
+             */
+            decline_charge_on?: {
+                /**
+                 * Whether or not Stripe should automatically decline charges with an
+                 * incorrect zip/postal code. This setting only applies if a card includes a
+                 * zip code and the bank specifically marks it as failed.
+                 */
+                avs_failure?: boolean;
+
+                /**
+                 * Whether or not Stripe should automatically decline charges with an
+                 * incorrect CVC. This setting only applies if a card includes a CVC and the
+                 * bank specifically marks it as failed.
+                 */
+                cvc_failure?: boolean;
+            };
+
+            /**
+             * Three-letter ISO currency code representing the default currency for the
+             * account. This must be a currency that Stripe supports in the account’s
+             * country.
+             */
+            default_currency?: string;
+
+            /**
+             * Email address of the account holder. For standalone accounts, this is used
+             * to email them asking them to claim their Stripe account. For managed
+             * accounts, this is only to make the account easier to identify to you: Stripe
+             * will not email the account holder.
+             */
+            email?: string;
+
+            /**
+             * Information about the holder of this account, i.e. the user receiving funds
+             * from this account
+             */
+            legal_entity?: {}; //TODO: Implement this type definition.
+
+            /**
+             * A set of key/value pairs that you can attach to an account object. It can be
+             * useful for storing additional information about the account in a structured
+             * format. This can be unset by updating the value to null and then saving.
+             */
+            metadata?: IMetadata;
+
+            /**
+             * Internal-only description of the product being sold or service being
+             * provided by this account. It’s used by Stripe for risk and underwriting
+             * purposes.
+             */
+            product_description?: string;
+
+            /**
+             * The text that will appear on credit card statements by default if a charge is
+             * being made directly on the account.
+             */
+            statement_descriptor?: string;
+
+            /**
+             * A publicly shareable email address that can be reached for support for this
+             * account
+             */
+            support_email?: string;
+
+            /**
+             * A publicly shareable phone number that can be reached for support for
+             * this account
+             */
+            support_phone?: string;
+
+            /**
+             * A publicly shareable URL that can be reached for support for this account
+             */
+            support_url?: string;
+
+            /**
+             * Details on who accepted the Stripe terms of service, and when they
+             * accepted it. See our updating managed accounts guide for more
+             * information
+             */
+            tos_acceptance?: {
+                /**
+                 * The unix timestamp that Stripe’s terms of service were agreed to by the
+                 * account holder
+                 */
+                date: number;
+
+                /**
+                 * The IP address from which Stripe’s terms of service were agreed to by the account holder
+                 */
+                ip?: string;
+
+                /**
+                 * The user agent of the browser from which Stripe’s terms of service
+                 * were agreed to by the account holder
+                 */
+                user_agent?: string;
+            };
+
+            /**
+             * Details on when this account will make funds from charges available, and
+             * when they will be paid out to the account holder’s bank account. See our
+             * managed account bank transfer guide for more information
+             */
+            transfer_schedule?: {
+                /**
+                 * The number of days charges for the account will be held before being
+                 * paid out. May also be the string “minimum� for the lowest available
+                 * value (based on country). Default is “minimum�. Does not apply when
+                 * interval is “manual�.
+                 */
+                delay_days?: number | string;
+
+                /**
+                 * How frequently funds will be paid out. One of "manual" (for only
+                 * triggered via API call), "daily", "weekly", or "monthly". Default is "daily".
+                 */
+                interval?: string;
+
+                /**
+                 * The day of the month funds will be paid out. Required and available
+                 * only if interval is "monthly".
+                 */
+                monthly_anchor?: number;
+
+                /**
+                 * The day of the week funds will be paid out, of the style ‘monday’,
+                 * ‘tuesday’, etc. Required and available only if interval is weekly.
+                 */
+                weekly_anchor?: string;
+            }
+        }
+
+        interface IAccountUpdateOptions extends IDataOptions, IAccountShared {
+            /**
+             * A card or bank account to attach to the account. You can provide either a
+             * token, like the ones returned by Stripe.js, or a dictionary as documented in
+             * the external_account parameter for either card or bank account creation.
+             *
+             * This will create a new external account object, make it the new default
+             * external account for its currency, and delete the old default if one exists. If
+             * you want to add additional external accounts instead of replacing the
+             * existing default for this currency, use the bank account or card creation
+             * API.
+             */
+            external_account?: {
+                /**
+                 * The type of external account. Should be "bank_account".
+                 */
+                object: string;
+
+                /**
+                 * The account number for the bank account in string form. Must be a
+                 * checking account.
+                 */
+                account_number: string;
+
+                /**
+                 * The country the bank account is in.
+                 */
+                country: string;
+
+                /**
+                 * The currency the bank account is in. This must be a country/currency
+                 * pairing that Stripe supports.
+                 */
+                currency: string;
+
+                /**
+                 * The name of the person or business that owns the bank account. This
+                 * field is required when attaching the bank account to a customer object.
+                 */
+                account_holder_name?: string;
+
+                /**
+                 * The type of entity that holds the account. This can be either
+                 * "individual" or "company". This field is required when attaching the
+                 * bank account to a customer object.
+                 */
+                account_holder_type?: string;
+
+                /**
+                 * The routing number, sort code, or other country-appropriate institution
+                 * number for the bank account. For US bank accounts, this is required
+                 * and should be the ACH routing number, not the wire routing number. If
+                 * you are providing an IBAN for account_number, this field is not
+                 * required.
+                 */
+                routing_number?: string;
+            }
+        }
+
+        interface IExternalAccountCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * When adding a card to a customer, the parameter name is source. When
+             * adding to an account, the parameter name is external_account. The
+             * value can either be a token, like the ones returned by our Stripe.js, or a
+             * dictionary containing a user’s credit card details (with the options shown
+             * below). Stripe will automatically validate the card.
+             */
+            external_account: string ;
+
+            /**
+             * Only applicable on accounts (not customers or recipients). If you set this to true (or if this is the first external account being added
+             * in this currency) this card will become the default external account for its currency.
+             */
+            default_for_currency?: boolean;
+        }
+
+        interface IExternalAccountUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * If set to true, this bank account will become the default external account for its currency.
+             */
+            default_for_currency?: boolean;
+        }
+
+        interface IBankAccountListOptions extends IListOptions {
+            object: "bank_account"
+        }
+
+        interface ICardListOptions extends IListOptions {
+            object: "card"
+        }
+
+        interface IRejectReason {
+            /**
+             * The reason for rejecting the account. May be one of "fraud",
+             * "terms_of_service", or "other".
+             */
+            reason: "fraud" | "terms_of_service" | "other" ;
+        }
+    }
+
+    namespace applicationFees {
+        interface IApplicationFee extends IResourceObject {
+            /**
+             * Value is "application_fee"
+             */
+            object: string;
+
+            /**
+             * ID of the Stripe account this fee was taken from. [Expandable]
+             */
+            account: string | accounts.IAccount;
+
+            /**
+             * Amount earned, in cents/pence.
+             */
+            amount: number;
+
+            /**
+             * Positive integer or zero
+             */
+            amount_refunded: number;
+
+            /**
+             * ID of the Connect Application that earned the fee. [Expandable]
+             */
+            application: string; //TODO: Implement IApplication interface and reference type here for expansion:- "string | IApplication"
+
+            /**
+             * Balance transaction that describes the impact of this collected application
+             * fee on your account balance (not including refunds). [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+
+            /**
+             * ID of the charge that the application fee was taken from. [Expandable]
+             */
+            charge: string | charges.ICharge;
+
+            created: number;
+
+            /**
+             * Three-letter ISO code representing the currency of the charge.
+             */
+            currency: string;
+
+            livemode: boolean;
+
+            /**
+             * ID of the corresponding charge on the platform account, if this fee was the
+             * result of a charge using the destination parameter. [Expandable]
+             */
+            originating_transaction: string;
+
+            /**
+             * Whether or not the fee has been fully refunded. If the fee is only partially
+             * refunded, this attribute will still be false.
+             */
+            refunded: boolean;
+
+            /**
+             * A list of refunds that have been applied to the fee.
+             */
+            refunds: IApplicationFeeRefunds;
+        }
+
+        interface IApplicationFeeListOptions extends IListOptionsCreated {
+            /**
+             * Only return application fees for the charge specified by this charge ID.
+             */
+            charge: string;
+        }
+
+        interface IApplicationFeeRefund extends IResourceObject {
+            /**
+             * Value is "fee_refund"
+             */
+            object:string;
+
+            /**
+             * Amount, in cents/pence.
+             */
+            amount: number;
+
+            /**
+             * Balance transaction that describes the impact on your account balance.
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+
+            created: number;
+
+            /**
+             * Three-letter ISO code representing the currency.
+             */
+            currency: string;
+
+            /**
+             * ID of the application fee that was refunded.
+             */
+            fee: string | IApplicationFee;
+
+            /**
+             * A set of key/value pairs that you can attach to the object. It can be useful
+             * for storing additional information in a structured format.
+             */
+            metadata: IMetadata;
+        }
+
+        interface IApplicationFeeRefunds extends IList<IApplicationFeeRefund>, resources.ApplicationFeeRefunds { }
+
+        interface IApplicationFeeRefundCreationOptions extends IDataOptions {
+            /**
+             * A positive integer in pence representing how much of this fee to refund.
+             * Can only refund up to the unrefunded amount remaining of the fee.
+             *
+             * default is entire application fee
+             */
+            amount?: number;
+
+            /**
+             * A set of key/value pairs that you can attach to a refund object. It can be
+             * useful for storing additional information about the refund in a structured
+             * format. You can unset an individual key by setting its value to null and
+             * then saving. To clear all keys, set metadata to null, then save.
+             */
+            metadata?: IMetadata;
+        }
+    }
+
+    namespace balance {
+        interface IBalance extends IObject {
+            /**
+             * Value is 'balance'
+             */
+            object: string;
+
+            /**
+             * Funds that are available to be paid out automatically by Stripe or explicitly
+             * via the transfers API. The available balance for each currency and payment
+             * type can be found in the source_types property.
+             */
+            available: Array<ISourceType>;
+
+            livemode: boolean;
+
+            /**
+             * Funds that are not available in the balance yet, due to the 7-day rolling pay
+             * cycle. The pending balance for each currency and payment type can be
+             * found in the source_types property
+             */
+            pending: Array<ISourceType>;
+        }
+
+        interface ISourceType {
+            currency: string;
+            amount: number;
+            source_types: {
+                card: number;
+                bitcoin_receiver?: number;
+                customer_bank_account?: number;
+                alipay_account?: number;
+            }
+        }
+
+        interface IBalanceTransaction extends IResourceObject {
+            /**
+             * Value is 'balance_transaction'
+             */
+            object: string;
+
+            /**
+             * Gross amount of the transaction, in cents/pence.
+             */
+            amount: number;
+
+            /**
+             * The date the transaction's net funds will become available in the Stripe balance.
+             */
+            available_on: number;
+
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency.
+             */
+            currency: string;
+
+            description?: string;
+
+            /**
+             * Fee (in cents/pence) paid for this transaction
+             */
+            fee: number;
+
+            /**
+             * Detailed breakdown of fees (in cents/pence) paid for this transaction
+             */
+            fee_details: Array<{
+                amount: number;
+                application: string;
+
+                /**
+                 * Three-letter ISO currency code representing the currency of the amount that was disputed.
+                 */
+                currency: string;
+
+                description: string;
+
+                /**
+                 * Type of the fee, one of: "application_fee", "stripe_fee"" or "tax".
+                 */
+                type: string;
+            }>;
+
+            /**
+             * Net amount of the transaction, in cents.
+             */
+            net: number;
+
+            /**
+             * The Stripe object this transaction is related to. [Expandable]
+             */
+            source: string | IResourceObject;
+
+            /**
+             * The transfers (if any) for which source is a source_transaction.
+             */
+            source_transfers: IList<transfers.ITransfer>;
+
+            /**
+             * If the transaction's net funds are available in the Stripe balance yet. Either "available" or "pending".
+             */
+            status: string;
+
+            /**
+             * Transaction type: "adjustment", "application_fee",
+             * "application_fee_refund", "charge", "payment", "payment_refund",
+             * "refund", "transfer", "transfer_cancel", "transfer_failure", or
+             * "transfer_refund".
+             */
+            type: string;
+        }
+
+        interface IBalanceListOptions extends IListOptions {
+            available_on?: string | IDateFilter;
+            currency?: string;
+
+            /**
+             * Only returns transactions that are related to the specified Stripe object ID
+             * (e.g. filtering by a charge ID will return all related charge transactions).
+             */
+            source?: string;
+
+            /**
+             * For automatic Stripe transfers only, only returns transactions that were
+             * transferred out on the specified transfer ID.
+             */
+            transfer?: string;
+
+            /**
+             * Only returns transactions of the given type. One of: "charge", "refund",
+             * "adjustment", "application_fee", "application_fee_refund", "transfer",
+             * or "transfer_failure"
+             */
+            type?: string;
+        }
+    }
+
+    namespace charges {
+
+        /**
+         * To charge a credit or a debit card, you create a charge object. You can retrieve and refund individual
+         * charges as well as list all charges. Charges are identified by a unique random ID.
+         */
+        interface ICharge extends IResourceObject {
+            /**
+             * Value is 'charge'
+             */
+            object: "charge";
+
+            /**
+             * Amount charged in cents/pence, positive integer or zero.
+             */
+            amount: number;
+
+            /**
+             * Amount in cents/pence refunded (can be less than the amount attribute on the
+             * charge if a partial refund was issued), positive integer or zero.
+             */
+            amount_refunded: number;
+
+            /**
+             * The application fee (if any) for the charge. See the Connect documentation
+             * for details. [Expandable]
+             */
+            application_fee?: string | applicationFees.IApplicationFee;
+
+            /**
+             * ID of the balance transaction that describes the impact of this charge on
+             * your account balance (not including refunds or disputes). [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+
+            /**
+             * If the charge was created without capturing, this boolean represents whether or not it is
+             * still uncaptured or has since been captured.
+             */
+            captured: boolean;
+
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency in which the
+             * charge was made.
+             */
+            currency: string;
+
+            /**
+             * ID of the customer this charge is for if one exists. [Expandable]
+             */
+            customer: string | customers.ICustomer;
+
+            description?: string;
+
+            /**
+             * Details about the dispute if the charge has been disputed.
+             */
+            dispute?: disputes.IDispute;
+
+            /**
+             * Error code explaining reason for charge failure if available (see the errors section for a list of
+             * codes: https://stripe.com/docs/api#errors).
+             */
+            failure_code: string;
+
+            /**
+             * Message to user further explaining reason for charge failure if available.
+             */
+            failure_message: string;
+
+            /**
+             * Hash with information on fraud assessments for the charge.
+             */
+            fraud_details: {
+                /**
+                 * Assessments reported by you have the key user_report and, if set, possible values of "safe" and "fraudulent".
+                 */
+                user_report?: "fraudulent" | "safe";
+
+                /**
+                 * Assessments from Stripe have the key stripe_report and, if set, the value "fraudulent".
+                 */
+                stripe_report?: "fraudulent";
+            };
+
+            /**
+             * ID of the invoice this charge is for if one exists. [Expandable]
+             */
+            invoice: string | invoices.IInvoice;
+
+            livemode: boolean;
+
+            metadata: IMetadata;
+
+            /**
+             * ID of the order this charge is for if one exists. [Expandable]
+             */
+            order: string | orders.IOrder;
+
+            /**
+             * true if the charge succeeded, or was successfully authorized for later capture.
+             */
+            paid: boolean;
+
+            /**
+             * This is the email address that the receipt for this charge was sent to.
+             */
+            receipt_email: string;
+
+            /**
+             * This is the transaction number that appears on email receipts sent for this charge.
+             */
+            receipt_number: string;
+
+            /**
+             * Whether or not the charge has been fully refunded. If the charge is only partially refunded,
+             * this attribute will still be false.
+             */
+            refunded: boolean;
+
+            /**
+             * A list of refunds that have been applied to the charge.
+             */
+            refunds: IChargeRefunds;
+
+            /**
+             * Shipping information for the charge.
+             */
+            shipping?: IShippingInformation;
+
+            /**
+             * For most Stripe users, the source of every charge is a credit or debit card.
+             * This hash is then the card object describing that card.
+             */
+            source: cards.ICard | bitcoinReceivers.IBitcoinReceiver;
+
+            /**
+             * The transfer ID which created this charge. Only present if the charge came
+             * from another Stripe account. See the Connect documentation for details.
+             * [Expandable]
+             */
+            source_transfer: string | transfers.ITransfer;
+
+            /**
+             * Extra information about a charge. This will appear on your customer’s
+             * credit card statement.
+             */
+            statement_descriptor: string;
+
+            /**
+             * The status of the payment is either "succeeded", "pending", or "failed".
+             */
+            status: "succeeded" | "pending" | "failed";
+
+            /**
+             * ID of the transfer to the destination account (only applicable if the
+             * charge was created using the destination parameter). [Expandable]
+             */
+            transfer: string | transfers.ITransfer;
+        }
+
+        interface IChargeCreationOptions extends IDataOptions {
+            /**
+             * A positive integer in the smallest currency unit (e.g 100 cents to charge
+             * $1.00, or 1 to charge ¥1, a 0-decimal currency) representing how much to
+             * charge the card. The minimum amount is £0.50 (or equivalent in charge
+             * currency).
+             */
+            amount: number;
+
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+
+            /**
+             * A fee in pence that will be applied to the charge and transferred to the
+             * application owner's Stripe account. To use an application fee, the request
+             * must be made on behalf of another account, using the Stripe-Account
+             * header, an OAuth key, or the destination parameter. For more
+             * information, see the application fees documentation.
+             *
+             * Connect only.
+             */
+            application_fee?: number;
+
+            /**
+             * Whether or not to immediately capture the charge. When false, the charge
+             * issues an authorization (or pre-authorization), and will need to be
+             * captured later. Uncaptured charges expire in 7 days. For more information,
+             * see authorizing charges and settling later.
+             */
+            capture?: boolean;
+
+            /**
+             * An arbitrary string which you can attach to a charge object. It is displayed
+             * when in the web interface alongside the charge. Note that if you use Stripe
+             * to send automatic email receipts to your customers, your receipt emails
+             * will include the description of the charge(s) that they are describing.
+             */
+            description?: string;
+
+            /**
+             * An account to make the charge on behalf of. If specified, the charge will be
+             * attributed to the destination account for tax reporting, and the funds from
+             * the charge will be transferred to the destination account. The ID of the
+             * resulting transfer will be returned in the transfer field of the response. See
+             * the documentation for details.
+             *
+             * Connect only.
+             */
+            destination?: string;
+
+            /**
+             * A string that identifies this transaction as part of a group.
+             * See the Connect documentation for details.
+             *
+             * Connect only.
+             */
+            transfer_group?: string;
+
+            /**
+             * The Stripe account ID that these funds are intended for.
+             * Automatically set if you use the destination parameter.
+             * See the Connect documentation for details.
+             *
+             * Connect only.
+             */
+            on_behalf_of?: string;
+
+            /**
+             * A set of key/value pairs that you can attach to a charge object. It can be
+             * useful for storing additional information about the customer in a
+             * structured format. It's often a good idea to store an email address in
+             * metadata for tracking later.
+             */
+            metadata?: IMetadata;
+
+            /**
+             * The email address to send this charge's receipt to. The receipt will not be
+             * sent until the charge is paid. If this charge is for a customer, the email
+             * address specified here will override the customer's email address.
+             * Receipts will not be sent for test mode charges. If receipt_email is
+             * specified for a charge in live mode, a receipt will be sent regardless of your
+             * email settings.
+             */
+            receipt_email?: string;
+
+            /**
+             * Shipping information for the charge. Helps prevent fraud on charges for
+             * physical goods. For more information, see the Charge object
+             * documentation.
+             */
+            shipping?: IShippingInformation;
+
+            /**
+             * The ID of an existing customer that will be charged in this request.
+             */
+            customer?: string;
+
+            /**
+             * A payment source to be charged, such as a credit card. If you also pass a
+             * customer ID, the source must be the ID of a source belonging to the
+             * customer. Otherwise, if you do not pass a customer ID, the source you
+             * provide must either be a token, like the ones returned by Stripe.js, or a
+             * object containing a user's credit card details, with the options described
+             * below. Although not all information is required, the extra info helps
+             * prevent fraud.
+             */
+            source?: sources.ISourceCreationOptions;
+
+            /**
+             * An arbitrary string to be displayed on your customer's credit card
+             * statement. This may be up to 22 characters. As an example, if your
+             * website is RunClub and the item you're charging for is a race ticket, you
+             * may want to specify a statement_descriptor of
+             * RunClub 5K race ticket. The statement description may not include
+             * <>"' characters, and will appear on your customer's statement in capital
+             * letters. Non-ASCII characters are automatically stripped. While most
+             * banks display this information consistently, some may display it
+             * incorrectly or not at all.
+             */
+            statement_descriptor?: string;
+        }
+
+        interface IChargeCaptureOptions extends IDataOptions {
+            /**
+             * A positive integer in the smallest currency unit (e.g 100 cents to charge
+             * $1.00, or 1 to charge ¥1, a 0-decimal currency) representing how much to
+             * charge the card. The minimum amount is £0.50 (or equivalent in charge
+             * currency).
+             */
+            amount?: number;
+        }
+
+        interface IChargeUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An arbitrary string which you can attach to a charge object. It is displayed when in the web interface alongside the charge.
+             * Note that if you use Stripe to send automatic email receipts to your customers, your receipt emails will include the description
+             * of the charge(s) that they are describing. This can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * A set of key/value pairs you can attach to a charge giving information about its riskiness.
+             */
+            fraud_details?: {
+                /**
+                 * If you believe a charge is fraudulent, include a user_report key with a value of fraudulent. If you believe a
+                 * charge is safe, include a user_report key with a value of safe. Note that you must refund a charge before setting
+                 * the user_report to fraudulent. Stripe will use the information you send to improve our fraud detection algorithm
+                 */
+                user_report?: "fraudulent" | "safe";
+            }
+
+            /**
+             * This is the email address that the receipt for this charge will be sent to.
+             * If this field is updated, then a new email receipt will be sent to the updated address.
+             */
+            receipt_email?: string;
+
+            /**
+             * Shipping information for the charge. Helps prevent fraud on charges for
+             * physical goods.
+             */
+            shipping?: IShippingInformation;
+        }
+
+        interface IChargeListOptions extends IListOptionsCreated {
+            /**
+             * Only return charges for the customer specified by this customer ID.
+             */
+            customer?: string;
+
+            /**
+             * A filter on the list based on the source of the charge. The value can be a
+             * dictionary with the following options:
+             */
+            source?: {
+                /**
+                 * Return charges that match this source type string. Available options are
+                 * "all", "alipay_account", "bitcoin_receiver", or "card".
+                 */
+                object: "all" | "alipay_account" | "bitcoin_receiver" | "card";
+            }
+        }
+
+        interface IChargeRefunds extends IList<refunds.IRefund>, resources.ChargeRefunds { }
+    }
+
+    namespace coupons {
+        /**
+         * A discount represents the actual application of a coupon to a particular customer. It contains information
+         * about when the discount began and when it will end.
+         */
+        interface IDiscount extends IObject {
+            /**
+             * Value is 'discount'
+             */
+            object: "discount";
+
+            /**
+             * Hash describing the coupon applied to create this discount
+             */
+            coupon: ICoupon;
+
+            customer: string;
+
+            /**
+             * If the coupon has a duration of once or repeating, the date that this discount will end. If the coupon
+             * used has a forever duration, this attribute will be null.
+             */
+            end: number;
+
+            /**
+             * Date that the coupon was applied
+             */
+            start: number;
+
+            /**
+             * The subscription that this coupon is applied to, if it is applied to a particular subscription
+             */
+            subscription: string;
+        }
+
+        /**
+         * A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer.
+         * Coupons only apply to invoices; they do not apply to one-off charges.
+         */
+        interface ICoupon extends IResourceObject {
+            /**
+             * Value is 'coupon'
+             */
+            object: "coupon";
+
+            /**
+             * Amount (in the currency specified) that will be taken off the subtotal of any invoices for this customer.
+             */
+            amount_off: number;
+
+            created: number;
+
+            /**
+             * If amount_off has been set, the currency of the amount to take off.
+             */
+            currency: string;
+
+            /**
+             * One of "forever", "once", and "repeating". Describes how long a customer who applies this coupon will get the discount.
+             */
+            duration: "forever" | "once" | "repeating" ;
+
+            /**
+             * If duration is repeating, the number of months the coupon applies. Null if coupon duration is forever or once.
+             */
+            duration_in_months: number;
+
+            livemode: boolean;
+
+            /**
+             * Maximum number of times this coupon can be redeemed, in total, before it is no longer valid.
+             */
+            max_redemptions: number;
+
+            metadata: IMetadata;
+
+            /**
+             * Percent that will be taken off the subtotal of any invoices for this customer for the duration
+             * of the coupon. For example, a coupon with percent_off of 50 will make a $100 invoice $50 instead.
+             */
+            percent_off: number;
+
+            /**
+             * Date after which the coupon can no longer be redeemed
+             */
+            redeem_by: number;
+
+            /**
+             * Number of times this coupon has been applied to a customer.
+             */
+            times_redeemed: number;
+
+            /**
+             * Taking account of the above properties, whether this coupon can still be applied to a customer
+             */
+            valid: boolean;
+        }
+
+        interface ICouponCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * Unique string of your choice that will be used to identify this coupon when applying it to a customer. This is often a specific
+             * code you’ll give to your customer to use when signing up (e.g. FALL25OFF). If you don’t want to specify a particular code, you
+             * can leave the ID blank and we’ll generate a random code for you.
+             */
+            id?: string;
+
+            /**
+             * Specifies how long the discount will be in effect. Can be forever, once, or repeating.
+             */
+            duration: "forever" | "once" | "repeating" ;
+
+            /**
+             * A positive integer representing the amount to subtract from an invoice total (required if percent_off is not passed)
+             */
+            amount_off?: number;
+
+            /**
+             * Currency of the amount_off parameter (required if amount_off is passed)
+             */
+            currency?: string;
+
+            /**
+             * Required only if duration is repeating, in which case it must be a positive integer that specifies the number of months
+             * the discount will be in effect.
+             */
+            duration_in_months?: number;
+
+            /**
+             * A positive integer specifying the number of times the coupon can be redeemed before it’s no longer valid.
+             *
+             * For example, you might have a 50% off coupon that the first 20 readers of your blog can use.
+             */
+            max_redemptions?: number;
+
+            /**
+             * A positive integer between 1 and 100 that represents the discount the coupon will apply (required if amount_off is not passed)
+             */
+            percent_off?: number;
+
+            /**
+             * Unix timestamp specifying the last time at which the coupon can be redeemed.
+             * After the redeem_by date, the coupon can no longer be applied to new customers.
+             */
+            redeem_by?: number;
+        }
+    }
+
+    namespace customers {
+        /**
+         * Customer objects allow you to perform recurring charges and track multiple charges that are associated
+         * with the same customer. The API allows you to create, delete, and update your customers. You can
+         * retrieve individual customers as well as a list of all your customers.
+         */
+        interface ICustomer extends IResourceObject {
+            /**
+             * Value is 'customer'
+             */
+            object: "customer";
+
+            /**
+             * Current balance, if any, being stored on the customer's account. If negative, the customer has credit to apply to
+             * the next invoice. If positive, the customer has an amount owed that will be added to the next invoice. The balance
+             * does not refer to any unpaid invoices; it solely takes into account amounts that have yet to be successfully applied
+             * to any invoice. This balance is only taken into account for recurring charges.
+             */
+            account_balance?: number;
+
+            created: number;
+
+            /**
+             * The currency the customer can be charged in for recurring billing purposes (subscriptions, invoices, invoice items).
+             */
+            currency: string;
+
+            /**
+             * ID of the default source attached to this customer. [Expandable]
+             */
+            default_source: string | cards.ICard | bitcoinReceivers.IBitcoinReceiver;
+
+            /**
+             * Whether or not the latest charge for the customer's latest invoice has failed
+             */
+            delinquent: boolean;
+
+            description?: string;
+
+            /**
+             * Describes the current discount active on the customer, if there is one.
+             */
+            discount?: coupons.IDiscount;
+
+            email?: string;
+
+            livemode: boolean;
+
+            metadata?: IMetadata;
+
+            /**
+             * Shipping information associated with the customer.
+             */
+            shipping: IShippingInformation;
+
+            /**
+             * The customer’s payment sources, if any
+             */
+            sources?: IList<cards.ICard | bitcoinReceivers.IBitcoinReceiver>;
+
+            cards?: resources.CustomerCards;
+
+            /**
+             * The customer's current subscriptions, if any
+             */
+            subscriptions: ICustomerSubscriptions;
+        }
+
+        interface ICustomerSubscriptions extends IList<subscriptions.ISubscription>, resources.CustomerSubscriptions {}
+
+        interface ICustomerCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
+             * will be used before attempting any charges to the customer's card; a positive amount will be added to the next invoice.
+             */
+            account_balance?: number;
+
+            /**
+             * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
+             * API will not have the discount.
+             */
+            coupon?: string;
+
+            /**
+             * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
+             * be unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * Customer's email address. It's displayed alongside the customer in your dashboard and can be useful for searching and tracking.
+             * This can be unset by updating the value to null and then saving.
+             */
+            email?: string;
+
+            /**
+             * The identifier of the plan to subscribe the customer to. If provided, the returned customer object will have a list of subscriptions
+             * that the customer is currently subscribed to. If you subscribe a customer to a plan without a free trial, the customer must have a
+             * valid card as well.
+             */
+            plan?: string;
+
+            /**
+             * The quantity you'd like to apply to the subscription you're creating (if you pass in a plan). For example, if your plan is
+             * 10 cents/user/month, and your customer has 5 users, you could pass 5 as the quantity to have the customer charged 50 cents
+             * (5 x 10 cents) monthly. Defaults to 1 if not set. Only applies when the plan parameter is also provided.
+             */
+            quantity?: number;
+
+            shipping?: IShippingInformation;
+
+            /**
+             * The source can either be a token, like the ones returned by our Stripe.js, or
+             * a dictionary containing a user’s credit card details.
+             */
+            source?: sources.ISourceCreationOptionsExtended;
+
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100.
+             * This represents the percentage of the subscription invoice subtotal that
+             * will be calculated and added as tax to the final amount each billing period.
+             * For example, a plan which charges $10/month with a tax_percent of 20.0
+             * will charge $12 per invoice. Can only be used if a plan is provided.
+             */
+            tax_percent?: number;
+
+            /**
+             * Unix timestamp representing the end of the trial period the customer will get before being charged. If set, trial_end will
+             * override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to
+             * end the customer's trial immediately. Only applies when the plan parameter is also provided.
+             */
+            trial_end?: number;
+        }
+
+        interface ICustomerUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
+             * will be used before attempting any charges to the customer's card; a positive amount will be added to the next invoice.
+             */
+            account_balance?: number;
+
+            /**
+             * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
+             * API will not have the discount.
+             */
+            coupon?: string;
+
+            /**
+             * ID of source to make the customer’s new default for invoice payments
+             */
+            default_source?: string;
+
+            /**
+             * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
+             * be unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * Customer's email address. It's displayed alongside the customer in your dashboard and can be useful for searching and tracking.
+             * This can be unset by updating the value to null and then saving.
+             */
+            email?: string;
+
+            shipping?: IShippingInformation;
+
+            /**
+             * The source can either be a token, like the ones returned by our Stripe.js, or
+             * a dictionary containing a user’s credit card details (with the options shown
+             * below). Passing source will create a new source object, make it the new
+             * customer default source, and delete the old customer default if one exists.
+             * If you want to add additional sources instead of replacing the existing
+             * default, use the card creation API. Whenever you attach a card to a
+             * customer, Stripe will automatically validate the card.
+             */
+            source?: sources.ISourceCreationOptionsExtended;
+        }
+
+        interface ICustomerSourceCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * When adding a card to a customer, the parameter name is source. When
+             * adding to an account, the parameter name is external_account. The
+             * value can either be a token, like the ones returned by our Stripe.js, or a
+             * dictionary containing a user’s credit card details (with the options shown
+             * below). Stripe will automatically validate the card.
+             */
+            source: sources.ISourceCreationOptions;
+        }
+
+        interface ICustomerCardSourceCreationOptions extends ICustomerSourceCreationOptions {
+            source: cards.ISourceCreationOptions;
+        }
+
+        interface IBankAccountSourceListOptions extends IListOptions {
+            object: "bank_account"
+        }
+
+        interface ICardSourceListOptions extends IListOptions {
+            object: "card"
+        }
+    }
+
+    namespace disputes {
+        /**
+         * A dispute occurs when a customer questions your charge with their bank or credit card company.
+         * When a customer disputes your charge, you're given the opportunity to respond to the dispute with
+         * evidence that shows the charge is legitimate. You can find more information about the dispute process
+         * in our disputes FAQ: https://stripe.com/help/disputes
+         */
+        interface IDispute extends IResourceObject {
+            /**
+             * Value is 'dispute'
+             */
+            object: "dispute";
+
+            /**
+             * Disputed amount. Usually the amount of the charge, but can differ (usually because of currency
+             * fluctuation or because only part of the order is disputed).
+             */
+            amount: number;
+
+            /**
+             * List of zero, one, or two balance transactions that show funds withdrawn and reinstated to your
+             * Stripe account as a result of this dispute.
+             */
+            balance_transactions: Array<balance.IBalanceTransaction>;
+
+            /**
+             * ID of the charge that was disputed. [Expandable]
+             */
+            charge: string | charges.ICharge;
+
+            /**
+             * Date dispute was opened
+             */
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency of the amount that was disputed.
+             */
+            currency: string;
+
+            /**
+             * Evidence provided to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
+             */
+            evidence: IDisputeEvidence;
+
+            /**
+             * Information about the evidence submission.
+             */
+            evidence_details?: {
+                /**
+                 * Date by which evidence must be submitted in order to successfully challenge dispute. Will be null
+                 * if the customer's bank or credit card company doesn't allow a response for this particular dispute.
+                 */
+                due_by: number;
+
+                /**
+                 * Whether or not evidence has been saved for this dispute.
+                 */
+                has_evidence: boolean;
+
+                /**
+                 * Whether or not the last evidence submission was submitted past the due date. Defaults to false
+                 * if no evidence submissions have occurred. If true, then delivery of the latest evidence is not guaranteed.
+                 */
+                past_due: boolean;
+
+                /**
+                 * The number of times the evidence has been submitted. You may submit evidence a maximum of 5 times
+                 */
+                submission_count: number;
+            };
+
+            /**
+             * If true, it is still possible to refund the disputed payment. Once the payment has been fully
+             * refunded, no further funds will be withdrawn from your Stripe account as a result of this dispute.
+             */
+            is_charge_refundable: boolean;
+
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * Reason given by cardholder for dispute.
+             * Possible values are duplicate, fraudulent, subscription_canceled, product_unacceptable,
+             * product_not_received, unrecognized, credit_not_processed, incorrect_account_details,
+             * insufficient_funds, bank_cannot_process, debit_not_authorized, general.
+             * Read more about dispute reasons: https://stripe.com/help/disputes#reasons
+             */
+            reason: "duplicate" | "fraudulent" | "subscription_canceled" | "product_unacceptable" | "product_not_received" | "unrecognized" | "credit_not_processed" | "incorrect_account_details" | "insufficient_funds" | "bank_cannot_process" | "debit_not_authorized" | "general";
+
+            /**
+             * Current status of dispute. Possible values are warning_needs_response, warning_under_review, warning_closed,
+             * needs_response, response_disabled, under_review, charge_refunded, won, lost.
+             */
+            status: "warning_needs_response" | "warning_under_review" | "warning_closed" | "needs_response" | "response_disabled" | "under_review" | "charge_refunded" | "won" | "lost";
+        }
+
+        interface IDisputeEvidence {
+            /**
+             * Any server or activity logs showing proof that the customer accessed or downloaded the purchased
+             * digital product. This information should include IP addresses, corresponding timestamps, and any
+             * detailed recorded activity.
+             */
+            access_activity_log?: string;
+
+            /**
+             * The billing addess provided by the customer.
+             */
+            billing_address?: string;
+
+            /**
+             * (ID of a file upload) Your subscription cancellation policy, as shown to the customer. [Expandable]
+             */
+            cancellation_policy?: string;
+
+            /**
+             * An explanation of how and when the customer was shown your refund policy prior to purchase.
+             */
+            cancellation_policy_disclosure?: string;
+
+            /**
+             * A justification for why the customer's subscription was not canceled.
+             */
+            cancellation_rebuttal?: string;
+
+            /**
+             * (ID of a file upload) Any communication with the customer that you feel is relevant to your case (for
+             * example emails proving that they received the product or service, or demonstrating their use of or
+             * satisfaction with the product or service).
+             */
+            customer_communication?: string;
+
+            /**
+             * The email address of the customer.
+             */
+            customer_email_address?: string;
+
+            /**
+             * The name of the customer.
+             */
+            customer_name?: string;
+
+            /**
+             * The IP address that the customer used when making the purchase.
+             */
+            customer_purchase_ip?: string;
+
+            /**
+             * (ID of a file upload) A relevant document or contract showing the customer's signature. [Expandable]
+             */
+            customer_signature?: string;
+
+            /**
+             * (ID of a file upload) Documentation for the prior charge that can uniquely identify the charge,
+             * such as a receipt, shipping label, work order, etc. This document should be paired with a similar
+             * document from the disputed payment that proves the two payments are separate. [Expandable]
+             */
+            duplicate_charge_documentation?: string;
+
+            /**
+             * An explanation of the difference between the disputed charge and the prior charge that appears to be a duplicate.
+             */
+            duplicate_charge_explanation?: string;
+
+            /**
+             * The Stripe ID for the prior charge which appears to be a duplicate of the disputed charge.
+             */
+            duplicate_charge_id?: string;
+
+            /**
+             * A description of the product or service which was sold.
+             */
+            product_description?: string;
+
+            /**
+             * (ID of a file upload) Any receipt or message sent to the customer notifying them of the charge. [Expandable]
+             */
+            receipt?: string;
+
+            /**
+             * (ID of a file upload) Your refund policy, as shown to the customer. [Expandable]
+             */
+            refund_policy?: string;
+
+            /**
+             * Documentation demonstrating that the customer was shown your refund policy prior to purchase.
+             */
+            refund_policy_disclosure?: string;
+
+            /**
+             * A justification for why the customer is not entitled to a refund.
+             */
+            refund_refusal_explanation?: string;
+
+            /**
+             * The date on which the customer received or began receiving the purchased service, in a clear human-readable format.
+             */
+            service_date?: string;
+
+            /**
+             * (ID of a file upload) Documentation showing proof that a service was provided to the customer. This could
+             * include a copy of a signed contract, work order, or other form of written agreement.
+             */
+            service_documentation?: string;
+
+            /**
+             * The address to which a physical product was shipped. You should try to include as much complete address information as possible.
+             */
+            shipping_address?: string;
+
+            /**
+             * The delivery service that shipped a physical product, such as Fedex, UPS, USPS, etc. If multiple carriers were used
+             * for this purchase, please separate them with commas.
+             */
+            shipping_carrier?: string;
+
+            /**
+             * The date on which a physical product began its route to the shipping address, in a clear human-readable format.
+             */
+            shipping_date?: string;
+
+            /**
+             * (ID of a file upload) Documentation showing proof that a product was shipped to the customer at the same address
+             * the customer provided to you. This could include a copy of the shipment receipt, shipping label, etc, and should
+             * show the full shipping address of the customer, if possible. [Expandable]
+             */
+            shipping_documentation?: string;
+
+            /**
+             * The tracking number for a physical product, obtained from the delivery service. If multiple tracking numbers
+             * were generated for this purchase, please separate them with commas.
+             */
+            shipping_tracking_number?: string;
+
+            /**
+             * (ID of a file upload) Any additional evidence or statements. [Expandable]
+             */
+            uncategorized_file?: string;
+
+            /**
+             * Any additional evidence or statements.
+             */
+            uncategorized_text?: string;
+        }
+
+        interface IDisputeUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Evidence to upload to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
+             */
+            evidence?: disputes.IDisputeEvidence;
+        }
+    }
+
+    namespace events {
+        interface IEvent extends IResourceObject {
+            /**
+             * Value is "event"
+             */
+            object: "event";
+
+            /**
+             * The Stripe API version used to render data.
+             * Note: this property is populated for events on or after October 31, 2014.
+             */
+            api_version: string;
+
+            created: number;
+
+            /**
+             * Hash containing data associated with the event.
+             */
+            data: {
+                /**
+                 * describes the object the event is about. For example, an
+                 * invoice.created event will have a full invoice object as the value of
+                 * the object key.
+                 */
+                object: IObject;
+
+                /**
+                 *
+                 */
+                previous_attributes?: {};
+            };
+
+            livemode: boolean;
+
+            /**
+             * Number of webhooks yet to be delivered successfully (return a 20x response) to the URLs you’ve specified.
+             *
+             * positive integer or zero
+             */
+            pending_webhooks: number;
+
+            /**
+             * ID of the API request that caused the event. If null, the event was
+             * automatic (e.g. Stripe’s automatic subscription handling). Request logs are
+             * available in the dashboard but currently not in the API. Note: this property
+             * is populated for events on or after April 23, 2013.
+             */
+            request?: string;
+
+            /**
+             * Description of the event: e.g. invoice.created, charge.refunded, etc.
+             */
+            type: string;
+        }
+
+        interface IEventListOptions extends IListOptionsCreated {
+            /**
+             * A string containing a specific event name, or group of events using * as a
+             * wildcard. The list will be filtered to include only events with a matching
+             * event property
+             */
+            type: string;
+        }
+     }
+
+    namespace fileUploads {
+        interface IFileUpdate extends IResourceObject {
+            /**
+             * Value is "file_upload"
+             */
+            object: "file_upload";
+
+            created: number;
+
+            /**
+             * The purpose of the uploaded file. Possible values are "business_logo",
+             * "dispute_evidence", "identity_document", "incorporation_article",
+             * "incorporation_document".
+             */
+            purpose: IPurpose;
+
+            /**
+             * The size in bytes of the file upload object.
+             */
+            size: number;
+
+            /**
+             * The type of the file returned. Returns one of the following:
+             * pdf, jpg, png.
+             */
+            type: "pdf" | "jpg" | "png";
+
+            /**
+             * A read-only URL where the uploaded file can be accessed. Will be nil
+             * unless the uploaded file has one of the following purposes:
+             *  business_logo, dispute_evidence, incorporation_document.
+             * Also nil if retrieved with the publishable API key.
+             */
+            url: string;
+        }
+
+        interface IFileUploadCreationOptions extends IDataOptions {
+            purpose: IPurpose;
+            file: {
+                data: string | Buffer;
+                name: string;
+                type: string | "application/octet-stream";
+            }
+        }
+
+        interface IFileUploadListOptions extends IListOptionsCreated {
+            /**
+             * The file purpose to filter queries by. If none is provided, files will not be
+             * filtered by purpose.
+             */
+            purpose: IPurpose;
+        }
+
+        type IPurpose = "business_logo" | "dispute_evidence" | "identity_document" | "incorporation_article" | "incorporation_document";
+     }
+
+    namespace invoices {
+        /**
+         * Invoices are statements of what a customer owes for a particular billing period, including subscriptions,
+         * invoice items, and any automatic proration adjustments if necessary. Once an invoice is created, payment
+         * is automatically attempted. Note that the payment, while automatic, does not happen exactly at the time of
+         * invoice creation. If you have configured webhooks, the invoice will wait until one hour after the last
+         * webhook is successfully sent (or the last webhook times out after failing). Any customer credit on the
+         * account is applied before determining how much is due for that invoice (the amount that will be actually
+         * charged). If the amount due for the invoice is less than 50 cents (the minimum for a charge), we add the
+         * amount to the customer's running account balance to be added to the next invoice. If this amount is
+         * negative, it will act as a credit to offset the next invoice. Note that the customer account balance does
+         * not include unpaid invoices; it only includes balances that need to be taken into account when calculating
+         * the amount due for the next invoice.
+         */
+        interface IInvoice extends IResourceObject {
+            /**
+             * Value is 'invoice'
+             */
+            object: "invoice";
+
+            /**
+             * Final amount due at this time for this invoice. If the invoice's total is smaller than the minimum charge
+             * amount, for example, or if there is account credit that can be applied to the invoice, the amount_due may
+             * be 0. If there is a positive starting_balance for the invoice (the customer owes money), the amount_due
+             * will also take that into account. The charge that gets generated for the invoice will be for the amount
+             * specified in amount_due.
+             */
+            amount_due: number;
+
+            /**
+             * The fee in cents that will be applied to the invoice and transferred to the application owner's
+             * Stripe account when the invoice is paid.
+             */
+            application_fee: number;
+
+            /**
+             * Number of payment attempts made for this invoice, from the perspective of the payment retry schedule. Any
+             * payment attempt counts as the first attempt, and subsequently only automatic retries increment the attempt
+             * count. In other words, manual payment attempts after the first attempt do not affect the retry schedule.
+             */
+            attempt_count: number;
+
+            /**
+             * Whether or not an attempt has been made to pay the invoice. An invoice is not attempted until 1 hour after
+             * the invoice.created webhook, for example, so you might not want to display that invoice as unpaid to your
+             * users.
+             */
+            attempted: boolean;
+
+            /**
+             * ID of the latest charge generated for this invoice, if any. [Expandable]
+             */
+            charge: string | charges.ICharge;
+
+            /**
+             * Whether or not the invoice is still trying to collect payment. An invoice is closed if it's either paid or
+             * it has been marked closed. A closed invoice will no longer attempt to collect payment.
+             */
+            closed: boolean;
+
+            currency: string;
+            customer: string;
+            date: number;
+            description: string;
+            discount: coupons.IDiscount;
+
+            /**
+             * Ending customer balance after attempting to pay invoice. If the invoice has not been attempted yet,
+             * this will be null.
+             */
+            ending_balance: number;
+
+            /**
+             * Whether or not the invoice has been forgiven. Forgiving an invoice instructs us to update the subscription
+             * status as if the invoice were succcessfully paid. Once an invoice has been forgiven, it cannot be unforgiven
+             * or reopened
+             */
+            forgiven: boolean;
+
+            /**
+             * The individual line items that make up the invoice.
+             *
+             * lines is sorted as follows: invoice items in reverse chronological order, followed by the subscription, if any.
+             */
+            lines: IList<IInvoiceLineItem>;
+
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * The time at which payment will next be attempted.
+             */
+            next_payment_attempt: number;
+
+            /**
+             * Whether or not payment was successfully collected for this invoice. An invoice can be paid (most commonly)
+             * with a charge or with credit from the customer's account balance.
+             */
+            paid: boolean;
+
+            /**
+             * End of the usage period during which invoice items were added to this invoice
+             */
+            period_end: number;
+
+            /**
+             * Start of the usage period during which invoice items were added to this invoice
+             */
+            period_start: number;
+
+            /**
+             * This is the transaction number that appears on email receipts sent for this invoice.
+             */
+            receipt_number: string;
+
+            /**
+             * Starting customer balance before attempting to pay invoice. If the invoice has not been attempted yet,
+             * this will be the current customer balance.
+             */
+            starting_balance: number;
+
+            /**
+             * Extra information about an invoice for the customer�s credit card statement.
+             */
+            statement_descriptor: string;
+
+            /**
+             * The subscription that this invoice was prepared for, if any.
+             */
+            subscription: string;
+
+            /**
+             * Only set for upcoming invoices that preview prorations. The time used to calculate prorations.
+             */
+            subscription_proration_date: number;
+
+            /**
+             * Total of all subscriptions, invoice items, and prorations on the invoice before any discount is applied
+             */
+            subtotal: number;
+
+            /**
+             * The amount of tax included in the total, calculated from tax_percent and the subtotal. If no tax_percent
+             * is defined, this value will be null.
+             */
+            tax: number;
+
+            /**
+             * This percentage of the subtotal has been added to the total amount of the invoice, including invoice line
+             * items and discounts. This field is inherited from the subscription's tax_percent field, but can be changed
+             * before the invoice is paid. This field defaults to null.
+             */
+            tax_percent: number;
+
+            /**
+             * Total after discount
+             */
+            total: number;
+
+            /**
+             * The time at which webhooks for this invoice were successfully delivered (if the invoice had no webhooks to
+             * deliver, this will match date). Invoice payment is delayed until webhooks are delivered, or until all webhook
+             * delivery attempts have been exhausted.
+             */
+            webhooks_delivered_at: number;
+        }
+
+        interface IInvoiceLineItem extends IResourceObject {
+            /**
+             * The ID of the source of this line item, either an invoice item or a subscription
+             */
+            id: string;
+
+            /**
+             * Value is "line_item"
+             */
+            object: "line_item";
+
+            /**
+             * The amount, in cents/pence
+             */
+            amount: number;
+
+            currency: string;
+
+            /**
+             * A text description of the line item, if the line item is an invoice item
+             */
+            description: string;
+
+            /**
+             * If true, discounts will apply to this line item. Always false for prorations.
+             */
+            discountable: boolean;
+
+            /**
+             * Whether or not this is a test line item
+             */
+            livemode: boolean;
+
+            metadata: IMetadata;
+
+            /**
+             * The period this line_item covers. For subscription line items, this is the subscription period. For prorations, this starts when
+             * the proration was calculated, and ends at the period end of the subscription. For invoice items, this is the time at which the
+             * invoice item was created, so the period start and end are the same time.
+             */
+            period: IPeriod;
+
+            /**
+             * The plan of the subscription, if the line item is a subscription or a proration
+             */
+            plan: plans.IPlan;
+
+            /**
+             * Whether or not this is a proration
+             */
+            proration: boolean;
+
+            /**
+             * The quantity of the subscription, if the line item is a subscription or a proration
+             */
+            quantity: number;
+
+            /**
+             * When type is invoiceitem, the subscription that the invoice item pertains to, if any. Left blank when
+             * type is already subscription, as it'd be redundant with id.
+             */
+            subscription: string;
+
+            /**
+             * A string identifying the type of the source of this line item, either an invoiceitem or a subscription
+             */
+            type: "invoiceitem" | "subscription";
+        }
+
+        interface IInvoiceCreationOptions extends IDataOptionsWithMetadata {
+            customer: string;
+
+            /**
+             * A fee in pence that will be applied to the invoice and transferred to the application owner’s Stripe account.
+             * The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee.
+             * For more information, see the application fees documentation.
+             */
+            application_fee?: number;
+
+            description?: string;
+
+            /**
+             * Extra information about a charge for the customer’s credit card statement.
+             */
+            statement_descriptor?: string
+
+            /**
+             * The ID of the subscription to invoice. If not set, the created invoice will include all pending invoice items for
+             * the customer. If set, the created invoice will exclude pending invoice items that pertain to other subscriptions.
+             */
+            subscription?: string;
+
+            /**
+             * The percent tax rate applied to the invoice, represented as a decimal number.
+             */
+            tax_percent?: number;
+        }
+
+        interface IInvoiceUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * A fee in pence that will be applied to the invoice and transferred to the application owner’s Stripe account.
+             * The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee.
+             * For more information, see the application fees documentation.
+             */
+            application_fee?: number;
+
+            /**
+             * Boolean representing whether an invoice is closed or not. To close an invoice, pass true.
+             */
+            closed?: boolean;
+
+            description?: string;
+
+            /**
+             * Boolean representing whether an invoice is forgiven or not. To forgive an invoice, pass true. Forgiving an invoice
+             * instructs us to update the subscription status as if the invoice were successfully paid. Once an invoice has been
+             * forgiven, it cannot be unforgiven or reopened.
+             */
+            forgiven?: boolean;
+
+            /**
+             * Extra information about a charge for the customer’s credit card statement.
+             */
+            statement_descriptor?: string
+
+            /**
+             * The percent tax rate applied to the invoice, represented as a decimal number.
+             */
+            tax_percent?: number;
+        }
+
+        interface IInvoiceListOptions extends IListOptions {
+            /**
+             * The identifier of the customer whose invoices to return. If none is provided, all invoices will be returned.
+             */
+            customer?: string;
+
+            date?: IDateFilter;
+        }
+
+        interface IInvoiceLineItemRetrievalOptions extends IListOptions {
+            coupon?: string;
+
+            /**
+             * In the case of upcoming invoices, the customer of the upcoming invoice is required. In other cases it is ignored.
+             */
+            customer?: string;
+
+            /**
+             * In the case of upcoming invoices, the subscription of the upcoming invoice is optional. In other cases it is ignored.
+             */
+            subscription?: string;
+
+            subscription_plan?: string;
+            subscription_prorate?: boolean;
+            subscription_proration_date?: number;
+            subscription_quantity?: number;
+            subscription_trial_end?: number;
+        }
+
+        interface IInvoiceUpcomingOptions extends IDataOptions {
+            /**
+             * The code of the coupon to apply. If a subscription or subscription_plan is provided, the invoice returned will preview updating
+             * or creating a subscription with that coupon. Otherwise, it will preview applying that coupon to the customer for the next upcoming
+             * invoice from among the customer’s subscriptions.
+             */
+            coupon?: string;
+
+            /**
+             * The identifier of the subscription for which you’d like to retrieve the upcoming invoice. If not provided, but a subscription_plan
+             * is provided, you will preview creating a subscription to that plan. If neither subscription nor subscription_plan is provided, you
+             * will retrieve the next upcoming invoice from among the customer’s subscriptions.
+             */
+            subscription?: string;
+
+            /**
+             * If set, the invoice returned will preview updating the subscription given to this plan, or creating a new subscription to this plan
+             * if no subscription is given.
+             */
+            subscription_plan?: string;
+
+            /**
+             * If previewing an update to a subscription, this decides whether the preview will show the result of applying prorations or not. If
+             * set, one of subscription_plan or subscription, and one of subscription_plan, subscription_quantity or subscription_trial_end are
+             * required.
+             */
+            subscription_prorate?: boolean;
+
+            /**
+             * If previewing an update to a subscription, and doing proration, subscription_proration_date forces the proration to be calculated as
+             * though the update was done at the specified time. The time given must be within the current subscription period, and cannot be
+             * before the subscription was on its current plan.If set, subscription, and one of subscription_plan, subscription_quantity or
+             * subscription_trial_end are required. Also, subscription_proration cannot be set to false.
+             */
+            subscription_proration_date?: number;
+
+            /**
+             * If provided, the invoice returned will preview updating or creating a subscription with that quantity. If set, one of subscription_plan
+             * or subscription is required.
+             */
+            subscription_quantity?: number;
+
+            /**
+             * If provided, the invoice returned will preview updating or creating a subscription with that trial end. If set, one of subscription_plan
+             * or subscription is required.
+             */
+            subscription_trial_end?: number;
+        }
+
+        interface IPeriod {
+            /**
+             * The period start date
+             */
+            start: number;
+            /**
+             * The period end date
+             */
+            end: number;
+        }
+    }
+    namespace invoiceItems {
+        interface InvoiceItem extends IResourceObject {
+            /**
+             * Value is "invoiceitem"
+             */
+            object: "invoiceitem";
+
+            amount: number;
+            currency: string;
+            customer: string;
+            date: number;
+            description: string;
+
+            /**
+             * If true, discounts will apply to this invoice item. Always false for prorations.
+             */
+            discountable: boolean;
+
+            invoice: string;
+            livemode: boolean;
+            metadata: IMetadata;
+
+            period: invoices.IPeriod;
+
+            /**
+             * If the invoice item is a proration, the plan of the subscription that the proration was computed for.
+             */
+            plan: plans.IPlan;
+
+            /**
+             * Whether or not the invoice item was created automatically as a proration adjustment when the customer switched plans
+             */
+            proration: boolean;
+
+            /**
+             * If the invoice item is a proration, the quantity of the subscription that the proration was computed for.
+             */
+            quantity: number;
+
+            /**
+             * The subscription that this invoice item has been created for, if any.
+             */
+            subscription: string;
+        }
+
+        interface InvoiceItemCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The integer amount in cents of the charge to be applied to the upcoming invoice. If you want to apply a credit to the customer’s
+             * account, pass a negative amount.
+             */
+            amount: number;
+
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+
+            /**
+             * The ID of the customer who will be billed when this invoice item is billed.
+             */
+            customer: string;
+
+            /**
+             * An arbitrary string which you can attach to the invoice item. The description is displayed in the invoice for easy tracking.
+             * This can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * Controls whether discounts apply to this invoice item. Defaults to false for prorations or negative invoice items, and true for
+             * all other invoice items.
+             */
+            discountable?: boolean;
+
+            /**
+             * The ID of an existing invoice to add this invoice item to. When left blank, the invoice item will be added to the next upcoming
+             * scheduled invoice. Use this when adding invoice items in response to an invoice.created webhook. You cannot add an invoice item
+             * to an invoice that has already been paid, attempted or closed.
+             */
+            invoice?: string;
+
+            /**
+             * The ID of a subscription to add this invoice item to. When left blank, the invoice item will be be added to the next upcoming
+             * scheduled invoice. When set, scheduled invoices for subscriptions other than the specified subscription will ignore the invoice
+             * item. Use this when you want to express that an invoice item has been accrued within the context of a particular subscription.
+             */
+            subscription?: string;
+        }
+
+        interface InvoiceItemUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * The integer amount in cents/pence of the charge to be applied to the upcoming invoice. If you want to apply a credit to the customer's
+             * account, pass a negative amount.
+             */
+            amount?: number;
+
+            /**
+             * An arbitrary string which you can attach to the invoice item. The description is displayed in the invoice for easy tracking. This can be
+             * unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * Controls whether discounts apply to this invoice item. Defaults to false for prorations or negative invoice items, and true for all other
+             * invoice items. Cannot be set to true for prorations.
+             */
+            discountable?: boolean;
+        }
+
+        interface InvoiceItemListOptions extends IListOptionsCreated {
+            /**
+             * The identifier of the customer whose invoice items to return. If none is provided, all invoice items will be returned.
+             */
+            customer?: string;
+        }
+    }
+
+    namespace orders {
+        interface IOrder extends IResourceObject {
+            /**
+             * Value is "order"
+             */
+            object: "order";
+
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal
+             * currency) representing the total amount for the order.
+             */
+            amount: number;
+
+            /**
+             * ID of the Connect Application that created the order.
+             */
+            application: string;
+
+            application_fee: number;
+
+            /**
+             * The ID of the payment used to pay for the order. Present if the order status is paid, fulfilled, or refunded. [Expandable]
+             */
+            charge: string | charges.ICharge;
+
+            created: number;
+
+            /**
+             * 3-letter ISO code representing the currency in which the order was made.
+             */
+            currency: string;
+
+            /**
+             * The customer used for the order. [Expandable]
+             */
+            customer: string | customers.ICustomer;
+
+            /**
+             * The email address of the customer placing the order.
+             */
+            email: string;
+
+            external_coupon_code: string;
+
+            /**
+             * List of items constituting the order.
+             */
+            items: Array<IOrderItem>;
+
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * The shipping method that is currently selected for this order, if any. If present, it is equal to one of the ids of shipping methods
+             * in the shipping_methods array. At order creation time, if there are multiple shipping methods, Stripe will automatically selected
+             * the first method.
+             */
+            selected_shipping_method: string;
+
+            /**
+             * The shipping address for the order. Present if the order is for goods to be shipped.
+             */
+            shipping: IShippingInformation;
+
+            /**
+             * A list of supported shipping methods for this order. The desired shipping method can be specified either by updating the order, or
+             * when paying it.
+             */
+            shipping_methods: Array<IShippingMethod>;
+
+            status: OrderStatus;
+
+            /**
+             * The timestamps at which the order status was updated
+             */
+            status_transitions: {
+                canceled: number;
+                fulfiled: number;
+                paid: number;
+                returned: number;
+            };
+
+            updated: number;
+        }
+
+        interface IOrderItem extends IObject {
+            /**
+             * value is "order_item"
+             */
+            object: "order_item";
+
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency)
+             * representing the total amount for the line item.
+             */
+            amount: number;
+
+            /**
+             * 3-letter ISO code representing the currency of the line item.
+             */
+            currency: string;
+
+            /**
+             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
+             */
+            description: string;
+
+            /**
+             * The ID of the associated object for this line item. Expandable if not null (e.g., expandable to a SKU). [Expandable]
+             */
+            parent: string | skus.ISku;
+
+            /**
+             * A positive integer representing the number of instances of parent that are included in this order item.
+             * Applicable/present only if type is sku.
+             */
+            quantity: number;
+
+            /**
+             * The type of line item. One of "sku", "tax", "shipping", or "discount".
+             */
+            type: "sku" | "tax" | "shipping" | "discount" ;
+        }
+
+        interface IOrderCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * 3-letter ISO code representing the currency in which the order should be made. Stripe will validate that all entries in items match
+             * the currency specified here.
+             */
+            currency: string;
+
+            /**
+             * A coupon code that represents a discount to be applied to this order. Must be one-time duration and in same currency as the order.
+             */
+            coupon?: string;
+
+            /**
+             * The ID of an existing customer to use for this order. If provided, the customer email and shipping address will be used to create
+             * the order. Subsequently, the customer will also be charged to pay the order. If email or shipping are also provided, they will
+             * override the values retrieved from the customer object.
+             */
+            customer?: string;
+
+            /**
+             * The email address of the customer placing the order.
+             */
+            email?: string;
+
+            /**
+             * List of items constituting the order.
+             */
+            items?: Array<IOrderItemCreationHash>;
+
+            /**
+             * Shipping address for the order. Required if any of the SKUs are for products that have shippable set to true.
+             */
+            shipping?: IShippingInformation;
+        }
+
+        interface IOrderUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * A coupon code that represents a discount to be applied to this order. Must be one-time duration and in same currency as the order.
+             */
+            coupon?: string;
+
+            /**
+             * The shipping method to select for fulfilling this order. If specified, must be one of the ids of a shipping method in the
+             * shipping_methods array. If specified, will overwrite the existing selected shipping method, updating items as necessary.
+             */
+            selected_shipping_method?: string;
+
+            status: OrderStatus;
+        }
+
+        interface IOrderPayOptions extends IDataOptionsWithMetadata {
+            /**
+             * The ID of an existing customer that will be charged in this request.
+             *
+             * Either customer or source is required
+             */
+            customer?: string;
+
+            /**
+             * A payment source to be charged, such as a credit card. If you also pass a customer ID, the source must be the ID of a source belonging
+             * to the customer. Otherwise, if you do not pass a customer ID, the source you provide must either be a token, like the ones returned
+             * by Stripe.js, or a object containing a user's credit card details, with the options described below. Although not all information is
+             * required, the extra info helps prevent fraud.
+             *
+             * Either source or customer is required
+             */
+            source?: sources.ISourceCreationOptions;
+
+            /**
+             * A fee in cents/pence that will be applied to the order and transferred to the application owner's Stripe account. To use an application
+             * fee, the request must be made on behalf of another account, using the Stripe-Account header or OAuth key. For more information, see
+             * the application fees documentation.
+             */
+            application_fee?: number;
+
+            /**
+             * The email address of the customer placing the order. If a customer is specified, that customer's email address will be used.
+             *
+             * Optional, but required if not previously specified.
+             */
+            email?: string;
+        }
+
+        interface IOrderListOptions extends IListOptionsCreated {
+            /**
+             * Only return orders for the given customer
+             */
+            customer?: string;
+
+            /**
+             * Only return orders with the given IDs
+             */
+            ids?: Array<string>;
+
+            /**
+             * Only return orders that have the given status. One of "created", "paid", "fulfilled", or "refunded".
+             */
+            status: OrderStatus;
+
+            /**
+             * Filter orders based on when they were "paid", "fulfilled", "canceled", or "returned"
+             */
+            status_transitions?: {
+                /**
+                 * A filter on the list based on the object canceled field. The value can be a string with an integer Unix timestamp,
+                 * or it can be a dictionary with the following options:
+                 */
+                canceled?: IDateFilter;
+
+                /**
+                 * A filter on the list based on the object fulfilled field. The value can be a string with an integer Unix timestamp,
+                 * or it can be a dictionary with the following options:
+                 */
+                fulfilled?: IDateFilter;
+
+                /**
+                 * A filter on the list based on the object paid field. The value can be a string with an integer Unix timestamp,
+                 * or it can be a dictionary with the following options:
+                 */
+                paid?: IDateFilter;
+
+                /**
+                 * A filter on the list based on the object returned field. The value can be a string with an integer Unix timestamp,
+                 * or it can be a dictionary with the following options:
+                 */
+                returned?: IDateFilter;
+            }
+        }
+
+        interface IOrderItemCreationHash {
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency)
+             * representing the total amount for the line item.
+             */
+            amount?: number;
+
+            /**
+             * 3-letter ISO code representing the currency of the line item.
+             */
+            currency?: string;
+
+            /**
+             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
+             */
+            description?: string;
+
+            /**
+             * The ID of the SKU being ordered.
+             */
+            parent: string;
+
+            /**
+             * The quantity of this order item. When type is sku, this is the number of instances of the SKU to be ordered.
+             */
+            quantity?: number;
+
+            /**
+             * The type of line item. One of "sku", "tax", "shipping", or "discount".
+             */
+            type?: "sku" | "tax" | "shipping" | "discount" ;
+        }
+
+        interface IShippingMethod {
+            id: string;
+
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency)
+             * representing the total amount for the line item.
+             */
+            amount: number;
+
+            /**
+             * 3-letter ISO code representing the currency of the line item.
+             */
+            currency: string;
+
+            /**
+             * The estimated delivery date for the given shipping method. Can be either a specific date or a range.
+             */
+            delivery_estimate: {
+                /**
+                 * If type is "exact", date will be the expected delivery date in the format YYYY-MM-DD
+                 */
+                date: string;
+
+                /**
+                 * If type is "range", earliest will be be the earliest delivery date in the format YYYY-MM-DD
+                 */
+                earliest: string;
+
+                /**
+                 * If type is "range", latest will be the latest delivery date in the format YYYY-MM-DD
+                 */
+                latest: string;
+
+                /**
+                 * The type of estimate. Must be either "range" or "exact"
+                 */
+                type: "range" | "exact";
+            };
+
+            /**
+             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
+             */
+            description: string;
+        }
+
+        /**
+         * Current order status. One of created, paid, canceled, fulfilled, or returned. More detail in the Relay API Overview.
+         */
+        type OrderStatus = "created" | "paid" | "canceled" | "fulfilled" | "returned";
+    }
+
+    namespace payouts {
+        interface IPayout extends IResourceObject {
+            /**
+             * Value is "payout"
+             */
+            object: "payout";
+
+            /**
+             * Amount (in cents) to be transferred to your bank account or debit card
+             */
+            amount: number;
+
+            /**
+             * Date the payout is expected to arrive in the bank. This factors in delays like weekends or bank holidays
+             */
+            arrival_date: number;
+
+            /**
+             * Balance transaction that describes the impact of this transfer on your account balance. [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+
+            /**
+             * Time at which the object was created. Measured in seconds since the Unix epoch
+             */
+            created: number;
+
+            /**
+             * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+             * https://stripe.com/docs/currencies
+             */
+            currency: string;
+
+            /**
+             * An arbitrary string attached to the object. Often useful for displaying to users
+             */
+            description: string;
+
+            /**
+             * ID of the bank account or card the payout was sent to. [Expandable]
+             */
+            destination: string | bankAccounts.IBankAccount | cards.ICardHash;
+
+            /**
+             * If the payout failed or was canceled, this will be the ID of the balance
+             * transaction that reversed the initial balance transaction, and puts the
+             * funds from the failed payout back in your balance. [Expandable]
+             */
+            failure_balance_transaction: string | balance.IBalanceTransaction;
+
+            /**
+             * Error code explaining reason for payout failure if available. See Types of payout failures for a
+             * list of failure codes: https://stripe.com/docs/api#payout_failures
+             */
+            failure_code: string;
+
+            /**
+             * Message to user further explaining reason for the payout failure if available
+             */
+            failure_message: string;
+
+            /**
+             * Flag indicating whether the object exists in live mode or test mode
+             */
+            livemode: boolean;
+
+            /**
+             * Set of key/value pairs that you can attach to an object. It can be useful for storing additional
+             * information about the object in a structured format.
+             */
+            metadata: IMetadata;
+
+            /**
+             * The method used to send this payout, which can be standard or instant. instant is only supported
+             * for payouts to debit cards.
+             */
+            method: PayoutMethods;
+
+            /**
+             * The source balance this payout came from.
+             * One of card, bank_account, bitcoin_receiver, or alipay_account
+             */
+            source_type: "alipay_account" | "bank_account" | "bitcoin_receiver" | "card";
+
+            /**
+             * Extra information about a payout to be displayed on the user's bank statement
+             */
+            statement_descriptor: string;
+
+            /**
+             * Current status of the payout (paid, pending, in_transit, canceled or failed).
+             * A payout will be pending until it is submitted to the bank, at which point it
+             * becomes in_transit. It will then change to paid if the transaction goes through.
+             * If it does not go through successfully, its status will change to failed or canceled.
+             */
+            status: "canceled" | "failed" | "in_transit" | "paid" | "pending";
+
+            /**
+             * Can be bank_account or card.
+             */
+            type: PayoutTypes;
+        }
+
+        interface IPayoutCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * A positive integer in cents representing how much to payout.
+             */
+            amount: number;
+
+            /**
+             * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+             * https://stripe.com/docs/currencies
+             */
+            currency: string;
+
+            /**
+             * An arbitrary string attached to the object. Often useful for displaying to users.
+             * This can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * The ID of a bank account or a card to send the payout to. If no destination is supplied,
+             * the default external account for the specified currency will be used.
+             */
+            destination?: string;
+
+            /**
+             * The method used to send this payout, which can be standard or instant.
+             * instant is only supported for payouts to debit cards.
+             */
+            method?: PayoutMethods;
+
+            /**
+             * The source balance to draw this payout from. Balances for different payment sources are
+             * kept separately. You can find the amounts with the balances API.
+             * Valid options are: alipay_account, bank_account, and card.
+             */
+            source_type?: "alipay_account" | "bank_account" | "card";
+
+            /**
+             * A string to be displayed on the recipient’s bank or card statement. This may be at most 22 characters.
+             * Attempting to use a statement_descriptor longer than 22 characters will return an error.
+             * Note: Most banks will truncate this information and/or display it inconsistently. Some may not display it at all.
+             */
+            statement_descriptor?: string;
+        }
+
+        interface IPayoutListOptions extends IListOptionsCreated {
+            arrival_date?: string | IDateFilter;
+            destination?: string;
+            status?: "canceled" | "failed" | "paid" | "pending";
+        }
+
+        type PayoutMethods = "instant" | "standard";
+        type PayoutTypes = "bank_account" | "card";
+    }
+
+    namespace plans {
+        /**
+         * A subscription plan contains the pricing information for different products and feature levels on your site.
+         * For example, you might have a $10/month plan for basic features and a different $20/month plan for premium features.
+         */
+        interface IPlan extends IResourceObject {
+            /**
+             * Value is "plan"
+             */
+            object: "plan";
+
+            /**
+             * The amount in cents to be charged on the interval specified
+             */
+            amount: number;
+
+            created: number;
+
+            /**
+             * Currency in which subscription will be charged
+             */
+            currency: string;
+
+            /**
+             * One of "day", "week", "month" or "year". The frequency with which a subscription should be billed.
+             */
+            interval: IntervalUnit;
+
+            /**
+             * The number of intervals (specified in the interval property) between each subscription billing. For example,
+             * interval=month and interval_count=3 bills every 3 months.
+             */
+            interval_count: number;
+
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * Display name of the plan
+             */
+            name: string;
+
+            /**
+             * Extra information about a charge for the customer's credit card statement.
+             */
+            statement_descriptor: string;
+
+            /**
+             * Number of trial period days granted when subscribing a customer to this plan. Null if the plan has no trial period.
+             */
+            trial_period_days: number;
+        }
+
+        interface IPlanCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * Unique string of your choice that will be used to identify this plan when subscribing a customer. This could be an identifier
+             * like "gold" or a primary key from your own database.
+             */
+            id: string;
+
+            /**
+             * A positive integer in cents/pence (or 0 for a free plan) representing how much to charge (on a recurring basis).
+             */
+            amount: number;
+
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+
+            /**
+             * Specifies billing frequency. Either "day", "week", "month" or "year".
+             */
+            interval: IntervalUnit;
+
+            /**
+             * Name of the plan, to be displayed on invoices and in the web interface.
+             */
+            name: string;
+
+            /**
+             * The number of intervals between each subscription billing. For example, interval=month and interval_count=3 bills every 3 months.
+             * Maximum of one year interval allowed (1 year, 12 months, or 52 weeks).
+             */
+            interval_count?: number;
+
+            /**
+             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website
+             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan.
+             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII
+             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             */
+            statement_descriptor?: string;
+
+            /**
+             * Specifies a trial period in (an integer number of) days. If you include a trial period, the customer won't be billed for the first time
+             * until the trial period ends. If the customer cancels before the trial period is over, she'll never be billed at all.
+             */
+            trial_period_days?: number;
+        }
+
+        interface IPlanUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Name of the plan, to be displayed on invoices and in the web interface.
+             */
+            name?: string;
+
+            /**
+             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website
+             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan.
+             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII
+             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             */
+            statement_descriptor?: string;
+        }
+
+        type IntervalUnit = "day" | "week" | "month" | "year";
+    }
+
+    namespace products {
+        interface IProduct extends IResourceObject {
+            /**
+             * Value is "product"
+             */
+            object: "product";
+
+            /**
+             * Whether or not the product is currently available for purchase.
+             */
+            active: boolean;
+
+            /**
+             * A list of up to 5 attributes that each SKU can provide values for (e.g. ["color", "size"]).
+             */
+            attributes: Array<string>;
+
+            /**
+             * A short one-line description of the product, meant to be displayable to the customer.
+             */
+            caption: string;
+
+            created: number;
+
+            /**
+             * An array of connect application identifiers that cannot purchase this product.
+             */
+            deactivated_on: Array<string>;
+
+            /**
+             * The product’s description, meant to be displayable to the customer.
+             */
+            description: string;
+
+            /**
+             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
+             */
+            images: Array<string>;
+
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * The product’s name, meant to be displayable to the customer.
+             */
+            name: string;
+
+            package_dimensions: IPackageDimensions;
+
+            /**
+             * Whether this product is a shipped good.
+             */
+            shippable: boolean;
+
+            /**
+             * A sublist of active SKUs associated with this product.
+             */
+            skus: IList<skus.ISku>;
+
+            updated: number;
+
+            /**
+             * A URL of a publicly-accessible webpage for this product.
+             */
+            url: string;
+        }
+
+        interface IProductCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The identifier for the product. Must be unique. If not provided, an identifier will be randomly generated.
+             */
+            id?: string;
+
+            /**
+             * The product’s name, meant to be displayable to the customer.
+             */
+            name: string;
+
+            /**
+             * Whether or not the product is currently available for purchase. Defaults to true.
+             */
+            active?: boolean;
+
+            /**
+             * A list of up to 5 alphanumeric attributes that each SKU can provide values for (e.g. ["color", "size"]).
+             */
+            attribute?: Array<string>;
+
+            /**
+             * A short one-line description of the product, meant to be displayable to the customer.
+             */
+            caption?: string;
+
+            /**
+             * An array of Connect application names or identifiers that should not be able to order the SKUs for this product.
+             */
+            deactivate_on?: Array<string>;
+
+            /**
+             * The product’s description, meant to be displayable to the customer.
+             */
+            description?: string;
+
+            /**
+             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
+             */
+            images?: Array<string>;
+
+            package_dimensions?: IPackageDimensions;
+
+            /**
+             * Whether this product is shipped (i.e. physical goods). Defaults to true.
+             */
+            shippable?: boolean;
+
+            /**
+             * A URL of a publicly-accessible webpage for this product.
+             */
+            url?: string;
+        }
+
+        interface IProductUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Whether or not the product is available for purchase. Setting this to false also deactivates any active, related SKUs. Setting this to
+             * true does not automatically activate any deactivated, related SKUs.
+             */
+            active?: boolean;
+
+            /**
+             * A short one-line description of the product, meant to be displayable to the customer.
+             */
+            caption?: string;
+
+            /**
+             * An array of Connect application names or identifiers that should not be able to order the SKUs for this product. This can be unset
+             * by updating the value to null and then saving.
+             */
+            deactivate_on?: Array<string>;
+
+            /**
+             * The product’s description, meant to be displayable to the customer.
+             */
+            description?: string;
+
+            /**
+             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer. This can be unset by updating the value to
+             * null and then saving.
+             */
+            images?: Array<string>;
+
+            /**
+             * The product’s name, meant to be displayable to the customer.
+             */
+            name?: string;
+
+            package_dimensions?: IPackageDimensions;
+
+            /**
+             * Whether this product is shipped (i.e. physical goods). Defaults to true.
+             */
+            shippable?: boolean;
+
+            /**
+             * A URL of a publicly-accessible webpage for this product.
+             */
+            url?: string;
+        }
+
+        interface IProductListOptions extends IListOptions {
+            /**
+             * Only return products that are active or inactive (e.g. pass false to list all inactive products).
+             */
+            active?: boolean;
+
+            /**
+             * Only return products with the given IDs.
+             */
+            ids?: Array<string>;
+
+            /**
+             * Only return products that can be shipped (i.e., physical, not digital products).
+             */
+            shippable?: boolean;
+
+            /**
+             * Only return products with the given url
+             */
+            url?: string;
+        }
+
+        /**
+         * The dimensions of this product for shipping purposes. A SKU associated with this product can override this value by having its
+         * own package_dimensions
+         */
+        interface IPackageDimensions {
+            /**
+             * Height, in inches. Maximum precision is 2 decimal places.
+             */
+            height: number;
+            /**
+             * Length, in inches. Maximum precision is 2 decimal places.
+             */
+            length: number;
+            /**
+             * Weight, in ounces. Maximum precision is 2 decimal places.
+             */
+            weight: number;
+            /**
+             * Width, in inches. Maximum precision is 2 decimal places.
+             */
+            width: number;
+        }
+    }
+
+    namespace recipientCards { }
+
+    namespace recipients {
+        interface IRecipient extends IResourceObject {
+
+        }
+     }
+
+    namespace skus {
+        interface ISku extends IResourceObject {
+            /**
+             * Value is "sku"
+             */
+            object: "sku";
+
+            /**
+             * Whether or not the SKU is available for purchase.
+             */
+            active: boolean;
+
+            attributes: ISkuAttributes;
+            created: number;
+
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+
+            /**
+             * The URL of an image for this SKU, meant to be displayable to the customer.
+             */
+            image: string;
+
+            inventory: IInventory;
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * The dimensions of this SKU for shipping purposes.
+             */
+            package_dimensions: products.IPackageDimensions;
+
+            /**
+             * The cost of the item as a positive integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1,
+             * Japanese Yen being a 0-decimal currency).
+             */
+            price: number;
+
+            /**
+             * The ID of the product this SKU is associated with. The product must be currently active. [Expandable]
+             */
+            product: string | products.IProduct;
+
+            updated: number;
+        }
+
+        interface ISkuCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The identifier for the SKU. Must be unique. If not provided, an identifier will be randomly generated.
+             */
+            id?: string;
+
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+
+            inventory: IInventory;
+
+            /**
+             * The cost of the item as a nonnegative integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1,
+             * Japanese Yen being a 0-decimal currency).
+             */
+            price: number;
+
+            /**
+             * The ID of the product this SKU is associated with.
+             */
+            product: string;
+
+            /**
+             * Whether or not the SKU is available for purchase. Default to true.
+             */
+            active?: boolean;
+
+            attributes?: ISkuAttributes;
+
+            /**
+             * The URL of an image for this SKU, meant to be displayable to the customer.
+             */
+            image?: string;
+
+            /**
+             * The dimensions of this SKU for shipping purposes.
+             */
+            package_dimensions?: products.IPackageDimensions;
+        }
+
+        interface ISkuUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Whether or not the SKU is available for purchase.
+             */
+            active?: boolean;
+
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency?: string;
+
+            /**
+             * The URL of an image for this SKU, meant to be displayable to the customer.
+             * This can be unset by updating the value to null and then saving.
+             */
+            image?: string;
+
+            inventory?: IInventory;
+
+            /**
+             * The dimensions of this SKU for shipping purposes.
+             */
+            package_dimensions?: products.IPackageDimensions;
+
+            /**
+             * The cost of the item as a nonnegative integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1,
+             * Japanese Yen being a 0-decimal currency).
+             */
+            price?: number;
+
+            /**
+             * The ID of the product this SKU is associated with.
+             */
+            product?: string;
+        }
+
+        interface ISkuListOptions extends IListOptions {
+            /**
+             * Only return SKUs that are active or inactive (e.g. pass false to list all inactive products).
+             */
+            active?: boolean;
+
+            /**
+             * Only return SKUs that have the specified key/value pairs in this partially constructed dictionary.
+             * Can be specified only if product is also supplied. For instance, if the associated product has
+             * attributes ["color", "size"], passing in attributes[color]=red returns all the SKUs for this product
+             * that have color set to red.
+             */
+            attributes?: ISkuAttributes;
+
+            /**
+             * Only return SKUs with the given IDs.
+             */
+            ids?: Array<string>;
+
+            /**
+             * Only return SKUs that are either in stock or out of stock (e.g. pass false to list all SKUs that are out of stock).
+             * If no value is provided, all SKUs are returned.
+             */
+            in_stock?: boolean;
+
+            /**
+             * The ID of the product whose SKUs will be retrieved.
+             */
+            product?: string;
+        }
+
+        /**
+         * Description of the SKU’s inventory.
+         */
+        interface IInventory {
+            /**
+             * The count of inventory available. Will be present if and only if type is "finite".
+             *
+             * Positive integer or zero
+             */
+            quantity?: number;
+
+            /**
+             * Inventory type. Possible values are "finite", "bucket"" (not quantified), and "infinite".
+             */
+            type: "finite" | "bucket" | "infinite" ;
+
+            /**
+             * An indicator of the inventory available. Possible values are "in_stock", "limited", and "out_of_stock".
+             * Will be present if and only if type is "bucket".
+             */
+            value?: "in_stock" | "limited" | "out_of_stock";
+        }
+
+        /**
+         * A dictionary of attributes and values for the attributes defined by the product.
+         * If, for example, a product’s attributes are ["size", "gender"],
+         * a valid SKU has the following dictionary of attributes: {"size": "Medium", "gender": "Unisex"}.
+         */
+        interface ISkuAttributes {}
+    }
+
+    namespace webhooks {
+        interface StripeWebhookEvent<T> {
+            id: string;
+            object: string;
+            api_version: string;
+            created: Date;
+            data: {
+              object: T;
+            };
+            livemode: boolean;
+            pending_webhooks: number;
+            /**
+             * One of https://stripe.com/docs/api#event_types
+             * E.g. account.updated
+             */
+            type: string;
+        }
+    }
+
+    namespace ephemeralKeys {
+        interface IStripeVersion {
+            /**
+             * https://stripe.com/docs/upgrades#api-changelog
+             */
+            stripe_version: string;
+        }
+
+        interface ICustomer {
+            /**
+             * customer id
+             */
+            customer: string;
+        }
+
+        interface IEphemeralKey extends IResourceObject {
+            object: "ephemeral_key";
+            associated_objects: Array<IAssociatedObject>
+            created: number;
+            expires: number;
+            livemode: boolean;
+            secret: string;
+        }
+
+        interface IAssociatedObject {
+            id: string;
+            type: string;
+        }
+    }
+
+    namespace tokens {
+        interface IToken extends ICardToken, IBankAccountToken { }
+
+        interface ICardToken extends ITokenBase {
+            /**
+             * Hash describing the card used to make the charge
+             */
+            card?: cards.ICardHash;
+        }
+
+        interface IBankAccountToken extends ITokenBase {
+            /**
+             * Hash describing the bank account
+             */
+            bank_account?: bankAccounts.IBankAccountHash;
+        }
+
+        interface ITokenBase extends IResourceObject {
+            /**
+             * Value is "token""
+             */
+            object: "token" ;
+
+            /**
+             * IP address of the client that generated the token
+             */
+            client_ip: string;
+
+            created: number;
+            livemode: boolean;
+
+            /**
+             * Type of the token: card or bank_account
+             */
+            type: "card" | "bank_account" ;
+
+            /**
+             * Whether or not this token has already been used (tokens can be used only once)
+             */
+            used: boolean;
+        }
+
+        interface ITokenCreationOptionsBase extends IDataOptions {
+            /**
+             * The customer (owned by the application's account) to create a
+             * token for. For use with Stripe Connect only; this can only be used
+             * with an OAuth access token or Stripe-Account header. For more
+             * details, see the shared customers documentation.
+             *
+             * Stripe connect only
+             */
+            customer?: string;
+        }
+
+        interface ICardTokenCreationOptions extends ITokenCreationOptionsBase {
+            /**
+             * The card this token will represent. If you also pass in a customer,
+             * the card must be the ID of a card belonging to the customer.
+             * Otherwise, if you do not pass a customer, a object containing a
+             * user's credit card details, with the options described below.
+             */
+            card: sources.ISourceCreationOptions;
+        }
+
+        interface IBankAccountTokenCreationOptions extends ITokenCreationOptionsBase {
+            /**
+             * The card this token will represent. If you also pass in a customer,
+             * the card must be the ID of a card belonging to the customer.
+             * Otherwise, if you do not pass a customer, a object containing a
+             * user's credit card details, with the options described below.
+             */
+            bank_account: bankAccounts.ISourceCreationOptions;
+        }
+
+        interface IPiiTokenCreationOptions extends IDataOptions {
+            pii: {
+                /**
+                 * The personal_id_number for PII in string form.
+                 */
+                personal_id_number: string;
+            }
+        }
+    }
+
+    namespace transfers {
+        interface ITransfer extends IResourceObject {
+            /**
+             * Value is "transfer"
+             */
+            object: "transfer";
+
+            /**
+             * Amount (in cents) to be transferred to your bank account
+             */
+            amount: number;
+
+            /**
+             * Amount in cents reversed (can be less than the amount attribute on the transfer if a partial reversal was issued).
+             */
+            amount_reversed: number;
+
+            application_fee: string;
+
+            /**
+             * Balance transaction that describes the impact of this transfer on your account balance. [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+
+            /**
+             * Time that this record of the transfer was first created.
+             */
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency.
+             */
+            currency: string;
+
+            /**
+             * Date the transfer is scheduled to arrive in the bank. This factors in delays like weekends or bank holidays.
+             */
+            date: number;
+
+            /**
+             * Internal-only description of the transfer
+             */
+            description: string;
+
+            /**
+             * ID of the bank account, card, or Stripe account the transfer was sent to. [Expandable]
+             */
+            destination: string | bankAccounts.IBankAccount | cards.ICardHash | accounts.IAccount;
+
+            /**
+             * If the destination is a Stripe account, this will be the ID of the
+             * payment that the destination account received for the transfer. [Expandable]
+             */
+            destination_payment: string;
+
+            /**
+             * Error code explaining reason for transfer failure if available. See Types of transfer failures for a
+             * list of failure codes: https://stripe.com/docs/api#transfer_failures
+             */
+            failure_code: string;
+
+            /**
+             * Message to user further explaining reason for transfer failure if available.
+             */
+            failure_message: string;
+
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * A list of reversals that have been applied to the transfer.
+             */
+            reversals: ITransferReversals;
+
+            /**
+             * Whether or not the transfer has been fully reversed. If the transfer is only partially reversed, this attribute
+             * will still be false.
+             */
+            reversed: boolean;
+
+            /**
+             * ID of the charge (or other transaction) that was used to fund the
+             * transfer. If null, the transfer was funded from the available
+             * balance. [Expandable]
+             */
+            source_transaction: string | charges.ICharge;
+
+            /**
+             * The source balance this transfer came from.
+             * One of card, bank_account, bitcoin_receiver, or alipay_account
+             */
+            source_type: SourceTypes;
+
+            /**
+             * Extra information about a transfer to be displayed on the user's bank statement.
+             */
+            statement_descriptor: string;
+
+            /**
+             * Current status of the transfer (paid, pending, in_transit, canceled or failed).
+             * A transfer will be pending until it is submitted to the bank, at which point
+             * it becomes in_transit. It will then change to paid if the transaction goes
+             * through. If it does not go through successfully, its status will change to
+             * failed or canceled.
+             */
+            status: Statuses;
+
+            /**
+             * Can be card, bank_account, or stripe_account.
+             */
+            type: "card" | "bank_account" | "stripe_account" ;
+        }
+
+        interface ITransferReversals extends IList<transferReversals.IReversal>, resources.TransferReversals {}
+
+        interface ITransferCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * A positive integer in cents/pence representing how much to transfer.
+             */
+            amount: number;
+
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+
+            /**
+             * The id of a bank account or a card to send the transfer to, or the
+             * string "default_for_currency" to use the default external
+             * account for the specified currency.
+             *
+             * If you use Stripe Connect, this can be the the id of a connected
+             * Stripe account; see the details about when such transfers are
+             * permitted.
+             */
+            destination: string;
+
+            /**
+             * You can use this parameter to transfer funds from a charge (or
+             * other transaction) before they are added to your available
+             * balance. A pending balance will transfer immediately but the
+             * funds will not become available until the original charge
+             * becomes available. See the Connect documentation for details.
+             */
+            source_transaction?: string;
+
+            /**
+             * A string that identifies this transaction as part of a group.
+             * See the Connect documentation for details.
+             */
+            transfer_group?: string;
+        }
+
+        interface ITransferUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An arbitrary string which you can attach to a transfer object. It is
+             * displayed when in the web interface alongside the transfer. This
+             * can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+        }
+
+        interface ITransferListOptions extends IListOptionsCreated {
+            date?: IDateFilter;
+
+            /**
+             * Only return transfers for the destination specified by this
+             * account ID.
+             */
+            destination?: string;
+
+            /**
+             * Only return transfers for the recipient specified by this
+             * recipient ID.
+             */
+            recipient?: string;
+
+            /**
+             * Only return transfers that have the given status:
+             * pending, paid, failed, in_transit, or canceled.
+             */
+            status: Statuses;
+        }
+
+        type SourceTypes = "alipay_account" | "bank_account" | "bitcoin_receiver" | "card";
+
+        type Statuses = "pending" | "paid" | "failed" | "in_transit" | "canceled";
+    }
+
+    namespace transferReversals {
+        interface IReversal extends IResourceObject {
+            /**
+             * Value is 'transfer_reversal'
+             */
+            object: "transfer_reversal";
+
+            /**
+             * Amount reversed, in cents/pence.
+             */
+            amount: number;
+
+            /**
+             * Balance transaction that describes the impact of this reversal on your account balance. [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency.
+             */
+            currency: string;
+
+            metadata: IMetadata;
+
+            /**
+             * ID of the transfer that was reversed. [Expandable]
+             */
+            transfer: string | transfers.ITransfer;
+        }
+
+        interface IReversalCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * A positive integer in cents/pence representing how much of this transfer to reverse. Can only reverse up to the unreversed amount
+             * remaining of the transfer. Partial transfer reversals are only allowed for transfers to Stripe Accounts.
+             */
+            amount?: number;
+
+            /**
+             * An arbitrary string which you can attach to a reversal object. It is displayed alongside the reversal in the dashboard. This will
+             * be unset if you POST an empty value.
+             */
+            description?: string;
+
+            /**
+             * Boolean indicating whether the application fee should be refunded when reversing this transfer. If a full transfer reversal is
+             * given, the full application fee will be refunded. Otherwise, the application fee will be refunded with an amount proportional to
+             * the amount of the transfer reversed.
+             */
+            refund_application_fee?: boolean;
+        }
+
+        interface IReversalUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An arbitrary string which you can attach to a reversal object. It is displayed when in the web interface alongside the
+             * reversal. This can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+        }
+    }
+
+    namespace bankAccounts {
+        interface IBankAccount extends IBankAccountHash {
+            account: string;
+
+            /**
+             * This indicates whether or not this bank account is the default external account for its currency.
+             */
+            default_for_currency: boolean;
+
+            /**
+             * A set of key/value pairs that you can attach to a bank account object. It
+             * can be useful for storing additional information about the bank account in
+             * a structured format.
+             */
+            metadata: IMetadata;
+        }
+
+        interface IBankAccountHash extends IResourceObject {
+            /**
+             * value is "customer_bank_account"
+             */
+            object: "customer_bank_account";
+
+            /**
+             * The name of the person or business that owns the bank account.
+             */
+            account_holder_name: string;
+
+            /**
+             * The type of entity that holds the account. This can be either
+             * "individual"" or "company".
+             */
+            account_holder_type: string;
+
+            /**
+             * Name of the bank associated with the routing number, e.g. WELLS FARGO.
+             */
+            bank_name: string;
+
+            /**
+             * Two-letter ISO code representing the country the bank account is located in.
+             */
+            country: string;
+
+            /**
+             * Three-letter ISO currency code representing the currency paid out to the bank account.
+             */
+            currency: string;
+
+            /**
+             * Uniquely identifies this particular bank account. You can use this attribute
+             * to check whether two bank accounts are the same.
+             */
+            fingerprint: string;
+
+            last4: string;
+
+            /**
+             * The routing transit number for the bank account.
+             */
+            routing_number: string;
+
+            /**
+             * Possible values are "new", "validated", "verified", "verification_failed",
+             * or "errored". A bank account that hasn’t had any activity or validation
+             * performed is "new". If Stripe can determine that the bank account exists, its
+             * status will be "validated". Note that there often isn’t enough information
+             * to know (e.g. for smaller credit unions), and the validation is not always
+             * run. If customer bank account verification has succeeded, the bank
+             * account status will be "verified". If the verification failed for any reason,
+             * such as microdeposit failure, the status will be "verification_failed". If a
+             * transfer sent to this bank account fails, we’ll set the status to "errored""
+             * and will not continue to send transfers until the bank details are updated.
+             */
+            status: "new" | "validated" | "verified" | "verification_failed" | "error" ;
+        }
+
+        interface ISourceCreationOptions {
+            /**
+             * The account number for the bank account in string form.
+             * Must be a checking account.
+             */
+            account_number: string;
+
+            /**
+             * The country the bank account is in.
+             */
+            country: string;
+
+            /**
+             * The currency the bank account is in. This must be a
+             * country/currency pairing that Stripe supports.
+             */
+            currency: string;
+
+            /**
+             * The routing number, sort code, or other country-appropriate
+             * institution number for the bank account. For US bank
+             * accounts, this is required and should be the ACH routing
+             * number, not the wire routing number. If you are providing an
+             * IBAN for account_number, this field is not required.
+             */
+            routing_number?: string;
+
+            /**
+             * The name of the person or business that owns the bank
+             * account. This field is required when attaching the bank
+             * account to a customer object.
+             */
+            account_holder_name?: string;
+
+            /**
+             * The type of entity that holds the account. This can be either
+             * "individual" or "company". This field is required when
+             * attaching the bank account to a customer object.
+             */
+            account_holder_type?: "individual" | "company" ;
+        }
+
+        interface IBankAccountUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * The name of the person or business that owns the bank account.
+             */
+            account_holder_name?: string;
+
+            /**
+             * The type of entity that holds the account. This can be either "individual" or "company".
+             */
+            account_holder_type?: "individual" | "company";
+        }
+    }
+
+    namespace bitcoinReceivers {
+        /**
+         * A Bitcoin receiver wraps a Bitcoin address so that a customer can push a payment to you. This guide describes how to use
+         * receivers to create Bitcoin payments.
+         */
+        interface IBitcoinReceiver extends IResourceObject {
+            /**
+             * Value is "bitcoin_receiver"
+             */
+            object: "bitcoin_receiver";
+
+            /**
+             * True when this bitcoin receiver has received a non-zero amount of bitcoin.
+             */
+            active: boolean;
+
+            /**
+             * The amount of currency that you are collecting as payment.
+             */
+            amount: number;
+
+            /**
+             * The amount of currency to which bitcoin_amount_received has been converted.
+             */
+            amount_received: number;
+
+            /**
+             * The amount of bitcoin that the customer should send to fill the receiver. The bitcoin_amount is denominated in Satoshi:
+             * there are 10^8 Satoshi in one bitcoin.
+             */
+            bitcoin_amount: number;
+
+            /**
+             * The amount of bitcoin that has been sent by the customer to this receiver.
+             */
+            bitcoin_amount_received: number;
+
+            /**
+             * This URI can be displayed to the customer as a clickable link (to activate their bitcoin client) or as a QR code (for mobile wallets).
+             */
+            bitcoin_uri: number;
+
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency to which the bitcoin will be converted.
+             */
+            currency: string;
+
+            customer: string;
+            description: string;
+
+            /**
+             * The customer's email address, set by the API call that creates the receiver.
+             */
+            email: string;
+
+            /**
+             * This flag is initially false and updates to true when the customer sends the bitcoin_amount to this receiver.
+             */
+            filled: boolean;
+
+            /**
+             * A bitcoin address that is specific to this receiver. The customer can send bitcoin to this address to fill the receiver.
+             */
+            inbound_address: string;
+
+            livemode: boolean;
+            metadata: IMetadata;
+
+            /**
+             * The ID of the payment created from the receiver, if any. Hidden when viewing the receiver with a publishable key.
+             */
+            payment: string;
+
+            /**
+             * The refund address for these bitcoin, if communicated by the customer.
+             */
+            refund_address: string;
+
+            /**
+             * A list with one entry for each time that the customer sent bitcoin to the receiver. Hidden when viewing the
+             * receiver with a publishable key.
+             */
+            transactions: IList<IBitcoinTransaction>;
+
+            /**
+             * This receiver contains uncaptured funds that can be used for a payment or refunded.
+             */
+            uncaptured_funds: boolean;
+
+            used_for_payment: boolean;
+        }
+
+        interface IBitcoinTransaction extends IResourceObject {
+            /**
+             * Value is 'list'
+             */
+            object: string;
+
+            /**
+             * The amount of currency that the transaction was converted to in real-time.
+             */
+            amount: number;
+
+            /**
+             * The amount of bitcoin contained in the transaction.
+             */
+            bitcoin_amount: number;
+
+            created: number;
+
+            /**
+             * The currency to which this transaction was converted.
+             */
+            currency: string;
+
+            /**
+             * The receiver to which this transaction was sent.
+             */
+            receiver: string;
+        }
+
+        interface IBitcoinReceiverCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The amount of currency that you will be paid.
+             */
+            amount: number;
+
+            /**
+             * The currency to which the bitcoin will be converted. You will be paid out in this currency. Only USD is currently supported.
+             */
+            currency: string;
+
+            /**
+             * The email address of the customer.
+             */
+            email: string;
+
+            description?: string;
+
+            /**
+             * A flag that indicates whether you would like Stripe to automatically handle refunds for any mispayments to the receiver.
+             */
+            refund_mispayments?: boolean;
+        }
+
+        interface IBitcoinReceiverListOptions extends IListOptions {
+            /**
+             * Filter for active receivers.
+             */
+            active?: boolean;
+
+            /**
+             * Filter for filled receivers.
+             */
+            filled?: boolean;
+
+            /**
+             * Filter for receivers with uncaptured funds.
+             */
+            uncaptured_funds?: boolean;
+        }
+    }
+
+    namespace cards {
+        /**
+         * You can store multiple cards on a customer in order to charge the customer later. You
+         * can also store multiple debit cards on a recipient in order to transfer to those cards later.
+         */
+        interface ICard extends ICardHash {
+            /**
+             * The account this card belongs to. This attribute will not be in the
+             * card object if the card belongs to a customer or recipient instead.
+             * [Expandable]
+             */
+            account?: string | accounts.IAccount;
+
+            /**
+             * Only applicable on accounts (not customers or recipients). The
+             * card can be used as a transfer destination for funds in this
+             * currency.
+             */
+            currency?: string;
+
+            /**
+             * The customer that this card belongs to. This attribute will not be
+             * in the card object if the card belongs to an account or recipient
+             * instead.
+             */
+            customer?: customers.ICustomer;
+
+            /**
+             * Only applicable on accounts (not customers or recipients). This
+             * indicates whether or not this card is the default external account
+             * for its currency.
+             */
+            default_for_currency?: boolean;
+
+            /**
+             * The recipient that this card belongs to. This attribute will not be
+             * in the card object if the card belongs to a customer or account
+             * instead. [Expandable]
+             */
+            recipient?: string | recipients.IRecipient;
+        }
+
+        /**
+         * Hash describing the card used to make the charge
+         */
+        interface ICardHash extends IResourceObject {
+            /**
+             * ID of card (used in conjunction with a customer or recipient ID)
+             */
+            id: string;
+
+            /**
+             * Value is 'card'
+             */
+            object: string;
+
+            /**
+             * The card number
+             */
+            number: number;
+
+            /**
+             * Card brand. Can be Visa, American Express, MasterCard, Discover, JCB, Diners Club, or Unknown.
+             */
+            brand: "Visa" | "American Express" | "MasterCard" | "Discover" | "JCB" | "Diners Club" | "Unknown" ;
+            exp_month: number;
+            exp_year: number;
+
+            /**
+             * Card funding type. Can be credit, debit, prepaid, or unknown
+             */
+            funding: "credit" | "debit" | "prepaid" | "unknown";
+            last4: string;
+            address_city: string;
+
+            /**
+             * Billing address country, if provided when creating card
+             */
+            address_country: string;
+            address_line1: string;
+
+            /**
+             * If address_line1 was provided, results of the check: pass, fail, unavailable, or unchecked.
+             */
+            address_line1_check: string;
+            address_line2: string;
+            address_state: string;
+            address_zip: string;
+
+            /**
+             * If address_zip was provided, results of the check: pass, fail, unavailable, or unchecked.
+             */
+            address_zip_check: "pass" | "fail" | "unavailable" | "unchecked" ;
+
+            /**
+             * Two-letter ISO code representing the country of the card. You could use this
+             * attribute to get a sense of the international breakdown of cards you've collected.
+             */
+            country: string;
+
+            /**
+             * If a CVC was provided, results of the check: pass, fail, unavailable, or unchecked
+             */
+            cvc_check: "pass" | "fail" | "unavailable" | "unchecked";
+
+            /**
+             * (For Apple Pay integrations only.) The last four digits of the device account number.
+             */
+            dynamic_last4: string;
+
+            /**
+             * Cardholder name
+             */
+            name: string;
+
+            /**
+             * Uniquely identifies this particular card number. You can use this attribute to check
+             * whether two customers who've signed up with you are using the same card number, for example.
+             */
+            fingerprint: string;
+
+            metadata?: IMetadata;
+
+            /**
+             * If the card number is tokenized, this is the method that was
+             * used. Can be "apple_pay" or "android_pay".
+             */
+            tokenization_method: "apple_pay" | "android_pay";
+        }
+
+        interface ICardUpdateOptions extends IDataOptionsWithMetadata {
+            address_city?: string;
+            address_country?: string;
+            address_line1?: string;
+            address_line2?: string;
+            address_state?: string;
+            address_zip?: string;
+
+            /**
+             * Only applicable on accounts (not customers or recipients).
+             * If set to true, this card will become the default external
+             * account for its currency.
+             *
+             * Managed accounts only
+             */
+            default_for_currency?: boolean;
+
+            exp_month?: number;
+            exp_year?: number;
+
+            /**
+             * Cardholder name
+             */
+            name?: string;
+        }
+
+        interface ISourceCreationOptions {
+            /**
+             * he type of payment source. Should be "card".
+             */
+            object: "card";
+
+            /**
+             * Two digit number representing the card's expiration month.
+             */
+            exp_month: number;
+
+            /**
+             * Two or four digit number representing the card's expiration year.
+             */
+            exp_year: number;
+
+            /**
+             * The card number, as a string without any separators.
+             */
+            number: number;
+
+            /**
+             * Card security code. Required unless your account is registered in
+             * Australia, Canada, or the United States. Highly recommended to always
+             * include this value.
+             */
+            cvc?: string;
+
+            /**
+             * Cardholder's full name.
+             */
+            name?: string;
+
+            address_city?: string;
+            address_country?: string;
+            address_line1?: string;
+            address_line2?: string;
+            address_state?: string;
+            address_zip?: string;
+
+            metadata?: IMetadata;
+        }
+
+        interface ISourceCreationOptionsExtended extends ISourceCreationOptions {
+            /**
+             * Required when adding a card to an account (not applicable to a
+             * customers or recipients). The card (which must be a debit card) can be
+             * used as a transfer destination for funds in this currency. Currently, the
+             * only supported currency for debit card transfers is usd.
+             *
+             * Managed accounts only.
+             */
+            currency?: string;
+
+            /**
+             * Only applicable on accounts (not customers or recipients). If you set
+             * this to true (or if this is the first external account being added in this
+             * currency) this card will become the default external account for its
+             * currency.
+             *
+             * Managed accounts only.
+             */
+            default_for_currency?: boolean;
+        }
+    }
+
+    namespace subscriptions {
+        type SubscriptionStatus = "trialing" | "active" | "past_due" | "canceled" | "unpaid";
+        /**
+         * Subscriptions allow you to charge a customer's card on a recurring basis. A subscription ties a customer to
+         * a particular plan you've created: https://stripe.com/docs/api#create_plan
+         */
+        interface ISubscription extends IResourceObject {
+            /**
+             * Value is "subscription"
+             */
+            object: "subscription";
+
+            /**
+             * A positive decimal that represents the fee percentage of the subscription invoice amount that will be transferred to
+             * the application owner's Stripe account each billing period.
+             */
+            application_fee_percent: number;
+
+            /**
+             * If the subscription has been canceled with the at_period_end flag set to true, cancel_at_period_end on the
+             * subscription will be true. You can use this attribute to determine whether a subscription that has a status
+             * of active is scheduled to be canceled at the end of the current period.
+             */
+            cancel_at_period_end: boolean;
+
+            /**
+             * If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with
+             * cancel_at_period_end, canceled_at will still reflect the date of the initial cancellation request, not the end of the
+             * subscription period when the subscription is automatically moved to a canceled state.
+             */
+            canceled_at: number;
+
+            created: number;
+
+            /**
+             * End of the current period that the subscription has been invoiced for. At the end of this period, a new invoice will be created.
+             */
+            current_period_end: number;
+
+            /**
+             * Start of the current period that the subscription has been invoiced for
+             */
+            current_period_start: number;
+
+            /**
+             * ID of the customer who owns the subscription. [Expandable]
+             */
+            customer: string | customers.ICustomer;
+
+            /**
+             * Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a
+             * subscription overrides a discount applied on a customer-wide basis.
+             */
+            discount: coupons.IDiscount;
+
+            /**
+             * If the subscription has ended (either because it was canceled or because the customer was switched to a subscription
+             * to a new plan), the date the subscription ended
+             */
+            ended_at: number;
+
+            metadata: IMetadata;
+
+            /**
+             * Hash describing the plan the customer is subscribed to
+             */
+            plan: plans.IPlan;
+
+            /**
+             * The number of subscriptions for the associated plan
+             */
+            quantity: number;
+
+            /**
+             * Date the subscription started
+             */
+            start: number;
+
+            /**
+             * Possible values are "trialing", "active", "past_due", "canceled", or "unpaid". A subscription still in its trial period is trialing
+             * and moves to active when the trial period is over. When payment to renew the subscription fails, the subscription becomes
+             * past_due. After Stripe has exhausted all payment retry attempts, the subscription ends up with a status of either canceled
+             * or unpaid depending on your retry settings. Note that when a subscription has a status of unpaid, no subsequent invoices
+             * will be attempted (invoices will be created, but then immediately automatically closed. Additionally, updating customer
+             * card details will not lead to Stripe retrying the latest invoice.). After receiving updated card details from a customer,
+             * you may choose to reopen and pay their closed invoices.
+             */
+            status: SubscriptionStatus;
+
+            /**
+             * If provided, each invoice created by this subscription will apply the tax rate, increasing the amount billed to the customer.
+             */
+            tax_percent: number;
+
+            /**
+             * If the subscription has a trial, the end of that trial.
+             */
+            trial_end: number;
+
+            /**
+             * If the subscription has a trial, the beginning of that trial.
+             */
+            trial_start: number;
+        }
+
+        interface ISubscriptionCustCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The identifier of the plan to subscribe the customer to.
+             */
+            plan: string;
+
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
+             * subtotal that will be transferred to the application owner’s Stripe account. The request must be made with an OAuth key in order
+             * to set an application fee percentage. For more information, see the application fees documentation.
+             */
+            application_fee_percent?: number;
+
+            /**
+             * The code of the coupon to apply to this subscription. A coupon applied to a subscription will only affect invoices created for that
+             * particular subscription.
+             */
+            coupon?: string;
+
+            source?: sources.ISourceCreationOptions;
+
+            /**
+             * The quantity you'd like to apply to the subscription you're creating. For example, if your plan is £10/user/month, and your customer
+             * has 5 users, you could pass 5 as the quantity to have the customer charged £50 (5 x £10) monthly. If you update a subscription but
+             * don't change the plan ID (e.g. changing only the trial_end), the subscription will inherit the old subscription's quantity attribute
+             * unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new subscription will not inherit
+             * the quantity attribute and will default to 1 unless you pass a quantity parameter.
+             */
+            quantity?: number;
+
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
+             * subtotal that will be calculated and added as tax to the final amount each billing period. For example, a plan which charges $10/month
+             * with a tax_percent of 20.0 will charge $12 per invoice.
+             */
+            tax_percent?: number;
+
+            /**
+             * Unix timestamp representing the end of the trial period the customer will get before being charged for the first time. If set, trial_end
+             * will override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to end the
+             * customer's trial immediately.
+             */
+            trial_end?: number;
+        }
+
+        interface ISubscriptionCreationOptions extends ISubscriptionCustCreationOptions {
+            /***
+             * The identifier of the customer to subscribe.
+             */
+            customer: string;
+        }
+
+        interface ISubscriptionUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
+             * subtotal that will be transferred to the application owner’s Stripe account. The request must be made with an OAuth key in order
+             * to set an application fee percentage. For more information, see the application fees documentation.
+             */
+            application_fee_percent?: number;
+
+            /**
+             * The code of the coupon to apply to this subscription. A coupon applied to a subscription will only affect invoices created for that
+             * particular subscription.
+             */
+            coupon?: string;
+
+            /**
+             * The identifier of the plan to update the subscription to. If omitted, the subscription will not change plans.
+             */
+            plan?: string;
+
+            /**
+             * Flag telling us whether to prorate switching plans during a billing cycle.
+             */
+            prorate?: boolean;
+
+            /**
+             * If set, the proration will be calculated as though the subscription was updated at the given time. This can be used to apply exactly the
+             * same proration that was previewed with upcoming invoice endpoint. It can also be used to implement custom proration logic, such as
+             * prorating by day instead of by second, by providing the time that you wish to use for proration calculations.
+             */
+            proration_date?: number;
+
+            /**
+             * The quantity you'd like to apply to the subscription you're creating. For example, if your plan is £10/user/month, and your customer
+             * has 5 users, you could pass 5 as the quantity to have the customer charged £50 (5 x £10) monthly. If you update a subscription but
+             * don't change the plan ID (e.g. changing only the trial_end), the subscription will inherit the old subscription's quantity attribute
+             * unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new subscription will not inherit
+             * the quantity attribute and will default to 1 unless you pass a quantity parameter.
+             */
+            quantity?: number;
+
+            source?: sources.ISourceCreationOptions;
+
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice
+             * subtotal that will be calculated and added as tax to the final amount each billing period. For example, a plan which charges $10/month
+             * with a tax_percent of 20.0 will charge $12 per invoice.
+             */
+            tax_percent?: number;
+
+            /**
+             * Unix timestamp representing the end of the trial period the customer will get before being charged for the first time. If set, trial_end
+             * will override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to end the
+             * customer's trial immediately.
+             */
+            trial_end?: number;
+        }
+
+        interface ISubscriptionCancellationOptions extends IDataOptions {
+            /**
+             * A flag that if set to true will delay the cancellation of the subscription until the end of the current period.
+             */
+            at_period_end?: boolean;
+        }
+
+        interface ISubscriptionListOptions extends IListOptionsCreated {
+            /**
+             * The billing mode of the subscriptions to retrieve.
+             */
+            billing?: "charge_automatically" | "send_invoice";
+
+            /**
+             * The ID of the customer whose subscriptions will be retrieved
+             */
+            customer?: string;
+
+            /**
+             * The ID of the plan whose subscriptions will be retrieved
+             */
+            plan?: string;
+
+            /**
+             * The status of the subscriptions to retrieve.
+             */
+            status?: SubscriptionStatus | "all";
+        }
+    }
+
+    namespace refunds {
+        interface IRefund {
+            id: string;
+
+            /**
+             * Value is 'refund'
+             */
+            object: string;
+
+            /**
+             * Amount in cents/pence.
+             */
+            amount: number;
+
+            /**
+             * Balance transaction that describes the impact of this reversal on your account balance.
+             */
+            balance_transaction: string;
+
+            /**
+             * ID of the charge that was refunded. [Expandable]
+             */
+            charge: string | charges.ICharge;
+
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency in which the charge was made.
+             */
+            currency: string;
+
+            description: string;
+
+            /**
+             * A set of key/value pairs that you can attach to the object. It can be useful
+             * for storing additional information in a structured format.
+             */
+            metadata: IMetadata;
+
+            /**
+             * Reason for the refund. If set, possible values are "duplicate", "fraudulent", and "requested_by_customer".
+             */
+            reason: string;
+
+            /**
+             * This is the transaction number that appears on email receipts sent for this refund.
+             */
+            receipt_number: string;
+        }
+
+        interface IRefundCreationOptions extends IDataOptions {
+            /**
+             * A positive integer in cents/pence representing how much of this charge to
+             * refund. Can only refund up to the unrefunded amount remaining of the
+             * charge.
+             *
+             * default is entire charge
+             */
+            amount?: number;
+
+            /**
+             * A set of key/value pairs that you can attach to a refund object. It can be
+             * useful for storing additional information about the refund in a structured
+             * format. You can unset an individual key by setting its value to null and
+             * then saving. To clear all keys, set metadata to null, then save.
+             */
+            metadata?: IMetadata;
+
+            /**
+             * String indicating the reason for the refund. If set, possible values are
+             * "duplicate", "fraudulent", and "requested_by_customer". Specifying
+             * "fraudulent" as the reason when you believe the charge to be fraudulent
+             * will help us improve our fraud detection algorithms.
+             */
+            reason?: string;
+
+            /**
+             * Boolean indicating whether the application fee should be refunded when
+             * refunding this charge. If a full charge refund is given, the full application
+             * fee will be refunded. Else, the application fee will be refunded with an
+             * amount proportional to the amount of the charge refunded.
+             * An application fee can only be refunded by the application that created the
+             * charge.
+             *
+             * Connect only, default is false.
+             */
+            refund_application_fee?: boolean;
+
+            /**
+             * Boolean indicating whether the transfer should be reversed when
+             * refunding this charge. The transfer will be reversed for the same amount
+             * being refunded (either the entire or partial amount).
+             * A transfer can only be reversed by the application that created the charge.
+             *
+             * Connect only, default is false.
+             */
+            reverse_transfer?: boolean;
+        }
+
+        interface IRefundCreationOptionsWithCharge extends IRefundCreationOptions {
+            /**
+             * The identifier of the charge to refund.
+             */
+            charge: string;
+        }
+
+        interface IRefundListOptions extends IListOptions {
+            /**
+             * Only return refunds for the charge specified by this charge ID.
+             */
+            charge?: string;
+        }
+    }
+
+    namespace sources {
+        /**
+         * The source can either be a token, like the ones returned by our
+         * Stripe.js, or a object containing a user's credit card details (with
+         * the options shown below). You must provide a source if the
+         * customer does not already have a valid source attached, and you
+         * are subscribing the customer for a plan that is not free. Passing
+         * source will create a new source object, make it the customer
+         * default source, and delete the old customer default if one exists.
+         * If you want to add an additional source to use with subscriptions,
+         * instead use the card creation API to add the card and then the
+         * customer update API to set it as the default. Whenever you
+         * attach a card to a customer, Stripe will automatically validate the
+         * card.
+         */
+        type ISourceCreationOptions = string | cards.ISourceCreationOptions;
+
+        /**
+         * The source can either be a token, like the ones returned by our
+         * Stripe.js, or a object containing a user's credit card details (with
+         * the options shown below). You must provide a source if the
+         * customer does not already have a valid source attached, and you
+         * are subscribing the customer for a plan that is not free. Passing
+         * source will create a new source object, make it the customer
+         * default source, and delete the old customer default if one exists.
+         * If you want to add an additional source to use with subscriptions,
+         * instead use the card creation API to add the card and then the
+         * customer update API to set it as the default. Whenever you
+         * attach a card to a customer, Stripe will automatically validate the
+         * card.
+         */
+        type ISourceCreationOptionsExtended = string | cards.ISourceCreationOptionsExtended;
+    }
+
+    namespace countrySpecs {
+        interface ICountrySpec extends IResourceObject {
+            /**
+             * Value is "country_spec"
+             */
+            object: "country_spec";
+
+            /**
+             * The default currency for this country. This applies to both payment methods and bank accounts.
+             */
+            default_currency: string;
+
+            /**
+             * Currencies that can be accepted in the specific country (for transfers).
+             */
+            supported_bank_account_currencies: {};
+
+            /**
+             * Currencies that can be accepted in the specified country (for payments).
+             */
+            supported_payment_currencies: Array<string>;
+
+            /**
+             * Payment methods available in the specified country. You will need to enable bitcoin and ACH payments on your account for those methods to
+             * appear in this list. The stripe payment method refers to charging through your platform.
+             */
+            supported_payment_methods: Array<string>;
+
+            /**
+             * Lists the types of verification data needed to keep an account open. Includes 'minimum' fields, which every account must eventually
+             * provide, as well as a 'additional' fields, which are only required for some merchants.
+             */
+            verification_fields: {
+                individual: {
+                    minimum: Array<string>;
+                    additional: Array<string>;
+                },
+                company: {
+                    minimum: Array<string>;
+                    additional: Array<string>;
+                }
+            }
+        }
+    }
+
+    class StripeResource {
+        constructor(stripe: Stripe, urlData: any);
+    }
+
+    namespace resources {
+        class Accounts extends StripeResource {
+            /**
+             * With Connect, you can create Stripe accounts for your users. To do this, you'll first need to register your platform.
+             */
+            create(data: accounts.IAccountCreationOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            create(data: accounts.IAccountCreationOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+
+            /**
+             * Retrieves the details of the account.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(id: string, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+
+            /**
+             * Updates an account by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             *
+             * You may only update accounts that you manage. To update your own account, you can currently only do so via the dashboard.
+             * For more information on updating managed accounts, see our guide.
+             */
+            update(id: string, data: accounts.IAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            update(id: string, data: accounts.IAccountUpdateOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+
+            /**
+             * With Connect, you may delete Stripe accounts you manage.
+             *
+             * Managed accounts created using test-mode keys can be deleted at any time. Managed accounts created using live-mode keys may only be
+             * deleted once all balances are zero.
+             *
+             * If you are looking to close your own account, use the data tab in your account settings instead.
+             */
+            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+
+            /**
+             * With Connect, you may flag managed accounts as suspicious.
+             *
+             * Managed accounts created using test-mode keys can be rejected at any time. Managed accounts created using live-mode keys may only be
+             * rejected once all balances are zero.
+             */
+            reject(id: string, data: accounts.IRejectReason, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            reject(id: string, data: accounts.IRejectReason, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+
+            /**
+             * Returns a list of accounts connected to your platform via Connect. If you’re not a platform, the list will be empty.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+            list(data: IListOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+            list(response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+
+            /**
+             * When you create a new bank account or credit card, you must specify a managed account to create it on.
+             *
+             * If the bank account's owner has no other external account in the bank account's currency, the new bank account will become the
+             * default for that currency. However, if the owner already has a bank account for that currency, the new account will only become
+             * the default if the default_for_currency parameter is set to true.
+             *
+             * If the account has no default destination card, then the new card will become the default. However, if the owner already has a
+             * default then it will not change. To change the default, you should set default_for_currency to true when creating a card for a
+             * managed account.
+             */
+            createExternalAccount(accId: string, data: accounts.IExternalAccountCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            createExternalAccount(accId: string, data: accounts.IExternalAccountCreationOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+
+            /**
+             * By default, you can see the 10 most recent bank accounts stored on a managed account directly on the object, but you can also
+             * retrieve details about a specific bank account stored on the Stripe account.
+             */
+            retrieveExternalAccount(accId: string, bankAccId: string, options: HeaderOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+            retrieveExternalAccount(accId: string, bankAccId: string, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+
+            /**
+             * You can always see the 10 most recent cards directly on a managed account; this method lets you retrieve details about a specific
+             * card stored on the account.
+             */
+            retrieveCard(accId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            retrieveCard(accId: string, cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * Updates the metadata of a bank account belonging to a managed account, and optionally sets it as the default for its currency.
+             * Other bank account details are not editable by design.
+             */
+            updateExternalAccount(accId: string, bankAccId: string, data: accounts.IExternalAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+            updateExternalAccount(accId: string, bankAccId: string, data: accounts.IExternalAccountUpdateOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+            /**
+             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
+             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
+             * interruption.
+             *
+             * When you update a card, Stripe will automatically validate the card.
+             */
+            updateExternalAccount(accId: string, cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateExternalAccount(accId: string, cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * You can delete destination bank accounts and cards from a managed account. If a bank account is the default external account for its currency
+             * or card's default_for_currency property is true, it can only be deleted if it is the only external account for that currency, and the
+             * currency is not the Stripe account's default currency. Otherwise, you must set another external account to be the default for the currency
+             * before deleting it.
+             */
+            deleteExternalAccount(accId: string, id: string, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            deleteExternalAccount(accId: string, id: string, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+
+            /**
+             * You can see a list of the bank accounts belonging to a managed account. Note that the 10 most recent external accounts are always
+             * available by default on the corresponding Stripe object. If you need more than those 10, you can use this API method and the limit
+             * and starting_after parameters to page through additional bank accounts.
+             */
+            listExternalAccounts(accId: string, data: accounts.IBankAccountListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            listExternalAccounts(accId: string, data: accounts.IBankAccountListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+
+            /**
+             * You can see a list of the cards belonging to a managed account. Note that the 10 most recent external accounts are available on the
+             * account object. If you need more than those 10, you can use this API method and the limit and starting_after parameters to page
+             * through additional cards.
+             */
+            listExternalAccounts(accId: string, data: accounts.ICardListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listExternalAccounts(accId: string, data: accounts.ICardListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+        }
+
+        class ApplicationFees extends StripeResource {
+            /**
+             * Retrieves the details of an application fee that your account has collected. The same information is returned when refunding the
+             * application fee.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+            retrieve(id: string, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+
+            /**
+             * Returns a list of application fees you’ve previously collected. The application fees are returned in sorted order, with the most
+             * recent fees appearing first.
+             */
+            list(data: applicationFees.IApplicationFeeListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+            list(data: applicationFees.IApplicationFeeListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+            list(response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+
+            /**
+             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that
+             * the fee was originally collected from.
+             *
+             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
+             *
+             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded
+             * application fee, or when trying to refund more money than is left on an application fee.
+             */
+            refund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            refund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            refund(feeId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            refund(feeId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+
+            /**
+             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that
+             * the fee was originally collected from.
+             *
+             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
+             *
+             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded
+             * application fee, or when trying to refund more money than is left on an application fee.
+             */
+            createRefund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            createRefund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            createRefund(feeId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            createRefund(feeId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+
+            /**
+             * By default, you can see the 10 most recent refunds stored directly on the application fee object, but you can also retrieve details
+             * about a specific refund stored on the application fee.
+             */
+            retreiveRefund(feeId: string, refundId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retreiveRefund(feeId: string, refundId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+
+            /**
+             * Updates the specified application fee refund by setting the values of the parameters passed. Any parameters not provided will be left
+             * unchanged.
+             *
+             * This request only accepts metadata as an argument.
+             */
+            updateRefund(feeId: string, refundId: string, data: { metadata?: IMetadata }, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            updateRefund(feeId: string, refundId: string, data: { metadata?: IMetadata }, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+
+            /**
+             * You can see a list of the refunds belonging to a specific application fee. Note that the 10 most recent refunds are always available
+             * by default on the application fee object. If you need more than those 10, you can use this API method and the limit and starting_after
+             * parameters to page through additional refunds.
+             */
+            listRefunds(feeId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            listRefunds(feeId: string, data: IListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            listRefunds(feeId: string, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            listRefunds(feeId: string, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+        }
+
+        class ApplicationFeeRefunds extends StripeResource {
+            /**
+             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that
+             * the fee was originally collected from.
+             *
+             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
+             *
+             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded
+             * application fee, or when trying to refund more money than is left on an application fee.
+             */
+            create(data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            create(data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            create(options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            create(response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+
+            /**
+             * By default, you can see the 10 most recent refunds stored directly on the application fee object, but you can also retrieve details
+             * about a specific refund stored on the application fee.
+             */
+            retrieve(refundId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retrieve(refundId: string, options: IDataOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retrieve(refundId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retrieve(refundId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+
+
+            /**
+             * Updates the specified application fee refund by setting the values of the parameters passed. Any parameters not provided will be left
+             * unchanged.
+             *
+             * This request only accepts metadata as an argument.
+             */
+            update(refundId: string, data: { metadata?: IMetadata }, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            update(refundId: string, data: { metadata?: IMetadata }, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+
+            /**
+             * You can see a list of the refunds belonging to a specific application fee. Note that the 10 most recent refunds are always available
+             * by default on the application fee object. If you need more than those 10, you can use this API method and the limit and starting_after
+             * parameters to page through additional refunds.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            list(data: IListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            list(response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+        }
+
+        class Balance extends StripeResource {
+            retrieve(options: HeaderOptions, response?: IResponseFn<balance.IBalance>): Promise<balance.IBalance>;
+            retrieve(response?: IResponseFn<balance.IBalance>): Promise<balance.IBalance>;
+
+            retrieveTransaction(id: string, options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<balance.IBalanceTransaction>;
+            retrieveTransaction(id: string, response?: IResponseFn<balance.IBalanceTransaction>): Promise<balance.IBalanceTransaction>;
+
+            listTransactions(data: balance.IBalanceListOptions, options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
+            listTransactions(data: balance.IBalanceListOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
+            listTransactions(options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
+            listTransactions(response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
+        }
+
+        class BitcoinReceivers extends StripeResource {
+            /**
+             * Creates a Bitcoin receiver object that can be used to accept bitcoin payments from your customer. The receiver exposes a Bitcoin address
+             * and is created with a bitcoin to USD exchange rate that is valid for 10 minutes.
+             */
+            create(data: bitcoinReceivers.IBitcoinReceiverCreationOptions, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            create(data: bitcoinReceivers.IBitcoinReceiverCreationOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+
+            /**
+             * Retrieves the Bitcoin receiver with the given ID.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            retrieve(id: string, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+
+
+            /**
+             * Returns a list of your receivers. Receivers are returned sorted by creation date, with the most recently created receivers appearing first.
+             */
+            list(data: bitcoinReceivers.IBitcoinReceiverListOptions, options: HeaderOptions, response?: IResponseFn<IList<bitcoinReceivers.IBitcoinReceiver>>): Promise<IList<bitcoinReceivers.IBitcoinReceiver>>;
+            list(data: bitcoinReceivers.IBitcoinReceiverListOptions, response?: IResponseFn<IList<bitcoinReceivers.IBitcoinReceiver>>): Promise<IList<bitcoinReceivers.IBitcoinReceiver>>;
+
+            //update(id: string): void; // This does seem to be a method in the library (https://github.com/stripe/stripe-node/blob/master/lib/resources/BitcoinReceivers.js#L12), but isn't in the API documentation.
+
+            setMetadata(): void; //TODO: Implement placeholder method
+            getMetadata(): void; //TODO: Implement placeholder method
+        }
+
+        class Charges extends StripeResource {
+            /**
+             * To charge a credit card, you create a charge object. If your API key is in test mode, the supplied card won't actually be charged, though
+             * everything else will occur as if in live mode. (Stripe assumes that the charge would have completed successfully).
+             *
+             * @returns Returns a charge object if the charge succeeded. Throws an error if something goes wrong. A common source of error is an invalid or
+             * expired card, or a valid card with insufficient available balance. If the cvc parameter is provided, Stripe will attempt to check the CVC's
+             * correctness, and the check's result will be returned. Similarly, If address_line1 or address_zip are provided, Stripe will similarly try to
+             * check the validity of those parameters. Some banks do not support checking one or more of these parameters, in which case Stripe will return
+             * an 'unavailable' result. Also note that, depending on the bank, charges can succeed even when passed incorrect CVC and address information.
+             *
+             * @param options Options for creating a charge.
+             * @param response A callback to receive the response and newly created charge, or errors if they exist.
+             */
+            create(data: charges.IChargeCreationOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            create(data: charges.IChargeCreationOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+
+            /**
+             * Retrieves the details of a charge that has previously been created. Supply the unique charge ID that was returned
+             * from your previous request, and Stripe will return the corresponding charge information. The same information is
+             * returned when creating or refunding the charge.
+             *
+             * @param id The identifier of the charge to be retrieved
+             * @param response A callback that takes in a potential error and a charge object.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            retrieve(id: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+
+
+            /**
+             * Updates the specified charge by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * This request accepts only the description, metadata, receipt_emailand fraud_details as arguments.
+             *
+             * @param id The identifier of the charge to be updated
+             * @param data An object containing the updated properties.
+             */
+            update(id: string, data: charges.IChargeUpdateOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            update(id: string, data: charges.IChargeUpdateOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+
+            /**
+             * Capture the payment of an existing, uncaptured, charge. This is the second half of the two-step payment flow, where first
+             * you created a charge with the capture option set to false. Uncaptured payments expire exactly seven days after they are
+             * created. If they are not captured by that point in time, they will be marked as refunded and will no longer be capturable.
+             */
+            capture(id: string, data?: charges.IChargeCaptureOptions, options?: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+
+            /**
+             * Returns a list of charges you've previously created. The charges are returned in sorted order, with the most recent charges
+             * appearing first.
+             *
+             * @returns An object with a data property that contains an array of up to limit charges, starting after charge starting_after.
+             * Each entry in the array is a separate charge object. If no more charges are available, the resulting array will be empty.
+             * If you provide a non-existent customer ID, this call throws an error. You can optionally request that the response include
+             * the total count of all charges that match your filters. To do so, specify include[]=total_count in your request.
+             *
+             * @param data Filtering options for the returned items.
+             */
+            list(data: charges.IChargeListOptions, options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+            list(data: charges.IChargeListOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+            list(response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+
+            /**
+             * When you create a new refund, you must specify a charge to create it on.
+             * Creating a new refund will refund a charge that has previously been created but not yet refunded. Funds will be refunded to the credit or debit card that was originally charged. The fees you were originally charged are also refunded.
+             * You can optionally refund only part of a charge. You can do so as many times as you wish until the entire charge has been refunded.
+             * Once entirely refunded, a charge can't be refunded again. This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
+             */
+            refund(chargeId: string, data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            refund(chargeId: string, data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            refund(chargeId: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            refund(chargeId: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * When you create a new refund, you must specify a charge to create it on. Creating a new refund will refund a charge that has previously
+             * been created but not yet refunded. Funds will be refunded to the credit or debit card that was originally charged. The fees you were
+             * originally charged are also refunded. You can optionally refund only part of a charge. You can do so as many times as you wish until
+             * the entire charge has been refunded. Once entirely refunded, a charge can't be refunded again. This method will throw an error when
+             * called on an already-refunded charge, or when trying to refund more money than is left on a charge.
+             *
+             * @returns Returns the refund object if the refund succeeded. Throws an error if the charge has already been refunded or an invalid
+             * charge identifier was provided.
+             *
+             * @param id The identifier of the charge to be refunded.
+             * @param data Options for specifying reasons and refund amount
+             * @param response The refund.
+             *
+             * @deprecated According to source code (https://github.com/stripe/stripe-node/blob/master/lib/resources/Charges.js#L43)
+             */
+            createRefund(id: string, data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            createRefund(id: string, data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            createRefund(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            createRefund(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * By default, you can see the 10 most recent refunds stored directly on the charge object, but you can also retrieve details about a specific
+             * refund stored on the charge.
+             *
+             * @param chargeId The ID of the charge refunded
+             * @param refundId The ID of the refund to retrieve
+             */
+            retrieveRefund(chargeId: string, refundId: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieveRefund(chargeId: string, refundId: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * Updates the specified refund by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * This request only accepts metadata as an argument.
+             *
+             * @param chargeId The ID of the charge refunded
+             * @param refundId The ID of the refund to update
+             */
+            updateRefund(chargeId: string, refundId: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            updateRefund(chargeId: string, refundId: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * You can see a list of the refunds belonging to a specific charge. Note that the 10 most recent refunds are always available by default on
+             * the charge object. If you need more than those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional refunds.
+             *
+             * @returns A object with a data property that contains an array of up to limit refunds, starting after refund starting_after.
+             * Each entry in the array is a separate refund object. If no more refunds are available, the resulting array will be empty. If you provide
+             * a non-existent customer ID or charge ID, this call throws an error. You can optionally request that the response include the total count
+             * of all refunds that match your filters. To do so, specify include[]=total_count in your request.
+             *
+             * @param chargeId The ID of the charge refunded
+             * @param data Used to filter the refunds returned
+             */
+            listRefunds(chargeId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            listRefunds(chargeId: string, data: IListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            listRefunds(chargeId: string, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            listRefunds(chargeId: string, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+
+            markAsSafe(chargeId: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            markAsFraudulent(chargeId: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+        }
+
+        class ChargeRefunds extends StripeResource {
+            /**
+             * When you create a new refund, you must specify a charge to create it on.
+             *
+             * Creating a new refund will refund a charge that has previously been created but not yet refunded.
+             * Funds will be refunded to the credit or debit card that was originally charged.
+             * The fees you were originally charged are also refunded.
+             *
+             * You can optionally refund only part of a charge.
+             * You can do so as many times as you wish until the entire charge has been refunded.
+             *
+             * Once entirely refunded, a charge can't be refunded again.
+             * This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
+             */
+            create(data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * Retrieves the details of an existing refund.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+
+            /**
+             * Updates the specified refund by setting the values of the parameters passed.
+             * Any parameters not provided will be left unchanged.
+             *
+             * This request only accepts metadata as an argument.
+             */
+            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * Returns a list of all refunds you’ve previously created. The refunds are returned in sorted order,
+             * with the most recent refunds appearing first.
+             * For convenience, the 10 most recent refunds are always available by default on the charge object.
+             */
+            list(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+        }
+
+        class Coupons extends StripeResource {
+            /**
+             * You can create coupons easily via the coupon management page of the Stripe dashboard. Coupon creation is also accessible via the API if
+             * you need to create coupons on the fly. A coupon has either a percent_off or an amount_off and currency. If you set an amount_off, that
+             * amount will be subtracted from any invoice's subtotal. For example, an invoice with a subtotal of $10 will have a final total of $0 if
+             * a coupon with an amount_off of 2000 is applied to it and an invoice with a subtotal of $30 will have a final total of $10 if a coupon
+             * with an amount_off of 2000 is applied to it.
+             *
+             * @returns Returns the coupon object.
+             *
+             * @param data Options for creating the coupon.
+             */
+            create(data: coupons.ICouponCreationOptions, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            create(data: coupons.ICouponCreationOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+
+            /**
+             * Retrieves the coupon with the given ID.
+             *
+             * @returns Returns a coupon if a valid coupon ID was provided. Throws an error otherwise.
+             *
+             * @param id The ID of the desired coupon
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            retrieve(id: string, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+
+
+            /**
+             * Updates the metadata of a coupon. Other coupon details (currency, duration, amount_off) are, by design, not editable.
+             *
+             * @returns The newly updated coupon object if the call succeeded. Otherwise, this call throws an error, such as if the coupon has
+             * been deleted.
+             *
+             * @param id The ID of the coupon to be updated
+             * @param data Metadata to update
+             */
+            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+
+            /**
+             * You can delete coupons via the coupon management page of the Stripe dashboard. However, deleting a coupon does not affect any
+             * customers who have already applied the coupon; it means that new customers can't redeem the coupon. You can also delete coupons
+             * via the API.
+             *
+             * @returns An object with the deleted coupon's ID and a deleted flag upon success. Otherwise, this call throws an error, such as
+             * if the coupon has already been deleted.
+             *
+             * @param id The ID of the coupon to be deleted.
+             */
+            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+
+            /**
+             * Returns a list of your coupons.
+             *
+             * @returns A object with a data property that contains an array of up to limit coupons, starting after coupon starting_after. Each
+             * entry in the array is a separate coupon object. If no more coupons are available, the resulting array will be empty. This request
+             * should never throw an error. You can optionally request that the response include the total count of all coupons. To do so, specify
+             * include[]=total_count in your request.
+             *
+             * @param data Filtering options for the list.
+             */
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
+            list(response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
+        }
+
+        class CustomerCards extends StripeResource {
+            /**
+             * When you create a new credit card, you must specify a customer or recipient to create it on. If the card's owner has no default card,
+             * then the new card will become the default. However, if the owner already has a default then it will not change. To change the default,
+             * you should either update the customer to have a new default_source or update the recipient to have a new default_card.
+             *
+             * @returns Returns the card object.
+             */
+            create(data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            create(data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
+             * cards are always available by default on the customer or recipient object. If you need more than
+             * those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional cards.
+             *
+             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
+             * that the response include the total count of all cards for the customer or recipient. To do so,
+             * specify include[]=total_count in your request.
+             * @param data Filtering options
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            list(data: IListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            list(response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+
+            /**
+             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
+             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
+             * interruption. When you update a card, Stripe will automatically validate the card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param cardId The ID of the card to be retrieved.
+             */
+            update(cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            update(cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * By default, you can see the 10 most recent cards stored on a customer or recipient directly on the customer or recipient object, but
+             * you can also retrieve details about a specific card stored on the customer or recipient.
+             *
+             * @returns Returns the card object.
+             *
+             * @param cardId The ID of the card to be retrieved.
+             */
+            retrieve(cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            retrieve(cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * You can delete cards from a customer or recipient. If you delete a card that is currently the
+             * default source on a customer, then the most recently added source will become the new default.
+             * If you delete a card that is the last remaining source on the customer then the default_source
+             * attribute will become null. Similarly, if you delete the default card on a recipient, then the
+             * most recently added card will become the new default. If you delete the last remaining card on
+             * a recipient, then the default_card attribute will become null. Note that for cards belonging to
+             * customers, you may want to prevent customers on paid subscriptions from deleting all cards on
+             * file so that there is at least one default card for the next invoice payment attempt.
+             *
+             * @returns Returns the deleted card object.
+             *
+             * @param cardId The ID of the card to be retrieved.
+             */
+            del(cardId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(cardId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+        }
+
+        class Customers extends StripeResource {
+            /**
+             * Creates a new customer object.
+             *
+             * @returns Returns a customer object if the call succeeded. The returned object will have information about subscriptions, discount,
+             * and payment sources, if that information has been provided. If a non-free plan is specified and a source is not provided (unless
+             * the plan has a trial period), the call will throw an error. If a non-existent plan or a non-existent or expired coupon is provided,
+             * the call will throw an error. If a source has been attached to the customer, the returned customer object will have a default_source
+             * attribute, which is an ID that can be expanded into the full source details when retrieving the customer.
+             *
+             * @param data The options for the new customer
+             */
+            create(data: customers.ICustomerCreationOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            create(data: customers.ICustomerCreationOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+
+            /**
+             * Returns a list of your customers. The customers are returned sorted by creation date, with the most recently created customers
+             * appearing first.
+             *
+             * @returns A object with a data property that contains an array of up to limit customers, starting after customer starting_after.
+             * Each entry in the array is a separate customer object. If no more customers are available, the resulting array will be empty.
+             * This request should never throw an error. You can optionally request that the response include the total count of all customers
+             * that match your filters. To do so, specify include[]=total_count in your request.
+             *
+             * @param data Allows you to filter the customers you want.
+             */
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            list(response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+
+            /**
+             * Updates the specified customer by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * For example, if you pass the card parameter, that becomes the customer's active card to be used for all charges in the future.
+             * When you update a customer to a new valid card: for each of the customer's current subscriptions, if the subscription is in the
+             * past_due state, then the latest unpaid, unclosed invoice for the subscription will be retried (note that this retry will not count
+             * as an automatic retry, and will not affect the next regularly scheduled payment for the invoice). (Note also that no invoices
+             * pertaining to subscriptions in the unpaid state, or invoices pertaining to canceled subscriptions, will be retried as a result
+             * of updating the customer's card.) This request accepts mostly the same arguments as the customer creation call.
+             *
+             * @returns Returns the customer object if the update succeeded. Throws an error if update parameters are invalid (e.g. specifying
+             * an invalid coupon or an invalid card).
+             *
+             * @param id The identifier of the customer to be retrieved.
+             */
+            update(id: string, data: customers.ICustomerUpdateOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            update(id: string, data: customers.ICustomerUpdateOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+
+            /**
+             * Retrieves the details of an existing customer. You need only supply the unique customer identifier that was returned upon customer
+             * creation.
+             *
+             * @returns Returns a customer object if a valid identifier was provided. When requesting the ID of a customer that has been deleted,
+             * a subset of the customer's information will be returned, including a "deleted" property, which will be true.
+             *
+             * @param id The identifier of the customer to be retrieved.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            retrieve(id: string, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+
+            /**
+             * Permanently deletes a customer. It cannot be undone. Also immediately cancels any active subscriptions on the customer.
+             *
+             * @returns Returns an object with a deleted parameter on success. If the customer ID does not exist, this call throws an error. Unlike
+             * other objects, deleted customers can still be retrieved through the API, in order to be able to track the history of customers while
+             * still removing their credit card details and preventing any further operations to be performed (such as adding a new subscription).
+             *
+             * @param id The identifier of the customer to be deleted.
+             */
+            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+
+
+
+            /**
+             * When you create a new credit card, you must specify a customer or recipient to create it on. If the card's owner has no default card,
+             * then the new card will become the default. However, if the owner already has a default then it will not change. To change the default,
+             * you should either update the customer to have a new default_source or update the recipient to have a new default_card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param customerId The customer ID to which to add the card.
+             *
+             * @deprecated
+             */
+            createCard(customerId: string, data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            createCard(customerId: string, data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * By default, you can see the 10 most recent cards stored on a customer or recipient directly on the customer or recipient object, but
+             * you can also retrieve details about a specific card stored on the customer or recipient.
+             *
+             * @returns Returns the card object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param cardId The ID of the card to be retrieved.
+             */
+            retrieveCard(customerId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            retrieveCard(customerId: string, cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
+             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
+             * interruption. When you update a card, Stripe will automatically validate the card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param cardId The ID of the card to be retrieved.
+             */
+            updateCard(customerId: string, cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateCard(customerId: string, cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * You can delete cards from a customer or recipient. If you delete a card that is currently the
+             * default source on a customer, then the most recently added source will become the new default.
+             * If you delete a card that is the last remaining source on the customer then the default_source
+             * attribute will become null. Similarly, if you delete the default card on a recipient, then the
+             * most recently added card will become the new default. If you delete the last remaining card on
+             * a recipient, then the default_card attribute will become null. Note that for cards belonging to
+             * customers, you may want to prevent customers on paid subscriptions from deleting all cards on
+             * file so that there is at least one default card for the next invoice payment attempt.
+             *
+             * @returns Returns the deleted card object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param cardId The ID of the card to be retrieved.
+             */
+            deleteCard(customerId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            deleteCard(customerId: string, cardId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+
+            /**
+             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
+             * cards are always available by default on the customer or recipient object. If you need more than
+             * those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional cards.
+             *
+             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
+             * that the response include the total count of all cards for the customer or recipient. To do so,
+             * specify include[]=total_count in your request.
+             *
+             * @param customerId The ID of the customer whose cards will be retrieved
+             * @param data Filtering options
+             */
+            listCards(customerId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listCards(customerId: string, data: IListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listCards(customerId: string, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listCards(customerId: string, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+
+
+            /**
+             * When adding a card to a customer, the parameter name is source. When
+             * adding to an account, the parameter name is external_account. The
+             * value can either be a token, like the ones returned by our Stripe.js, or a
+             * dictionary containing a user's credit card details.
+             * Stripe will automatically validate the card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param customerId The customer ID to which to add the card.
+             */
+            createSource(customerId: string, data: customers.ICustomerCardSourceCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            createSource(customerId: string, data: customers.ICustomerCardSourceCreationOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            /**
+             * When adding a card to a customer, the parameter name is source. When
+             * adding to an account, the parameter name is external_account. The
+             * value can either be a token, like the ones returned by our Stripe.js, or a
+             * dictionary containing a user’s credit card details.
+             * Stripe will automatically validate the card.
+             *
+             * @returns Returns the card or bank account object.
+             *
+             * @param customerId The customer ID to which to add the card.
+             */
+            createSource(customerId: string, data: customers.ICustomerSourceCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            createSource(customerId: string, data: customers.ICustomerSourceCreationOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+
+            /**
+             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
+             * cards are always available by default on the customer or recipient object. If you need more than
+             * those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional cards.
+             *
+             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
+             * that the response include the total count of all cards for the customer or recipient. To do so,
+             * specify include[]=total_count in your request.
+             *
+             * @param customerId The ID of the customer whose cards will be retrieved
+             * @param data Filtering options
+             */
+            listSource(customerId: string, data: customers.ICardSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listSource(customerId: string, data: customers.ICardSourceListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            /**
+             * You can see a list of the bank accounts belonging to a customer or recipient. Note that the 10 most recent
+             * bank accounts are always available by default on the customer or recipient object. If you need more than
+             * those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional cards.
+             *
+             * @returns Returns a list of the bank accounts stored on the customer or recipient. You can optionally request
+             * that the response include the total count of all bank accounts for the customer or recipient. To do so,
+             * specify include[]=total_count in your request.
+             *
+             * @param customerId The ID of the customer whose cards will be retrieved
+             * @param data Filtering options
+             */
+            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+
+            /**
+             * By default, you can see the 10 most recent cards/bank accounts stored on a customer or recipient directly on the customer or recipient object, but
+             * you can also retrieve details about a specific card/bank account stored on the customer or recipient.
+             *
+             * @returns Returns the card/bank account object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param sourceId The ID of the source to be retrieved.
+             */
+            retrieveSource(customerId: string, sourceId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            retrieveSource(customerId: string, sourceId: string, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+
+            /**
+             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
+             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
+             * interruption. When you update a card, Stripe will automatically validate the card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param sourceId The ID of the card to be retrieved.
+             */
+            updateSource(customerId: string, sourceId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateSource(customerId: string, sourceId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+
+            /**
+             * Updates the metadata, account_holder_name, and account_holder_type of a bank account belonging to a Customer. Other bank account details
+             * are not editable by design.
+             *
+             * @returns Returns the bank account object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param sourceId The ID of the bank account to be updated.
+             */
+            updateSource(customerId: string, sourceId: string, data: bankAccounts.IBankAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateSource(customerId: string, sourceId: string, data: bankAccounts.IBankAccountUpdateOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+
+            /**
+             * You can delete cards or bank accounts from a customer or recipient. If you delete a card or bank account that is currently the
+             * default source on a customer, then the most recently added source will become the new default.
+             * If you delete a card or bank account that is the last remaining source on the customer then the default_source
+             * attribute will become null. Similarly, if you delete the default card or bank account on a recipient, then the
+             * most recently added source will become the new default. If you delete the last remaining source on
+             * a recipient, then the default_card attribute will become null. Note that for sources belonging to
+             * customers, you may want to prevent customers on paid subscriptions from deleting all sources on
+             * file so that there is at least one default source for the next invoice payment attempt.
+             *
+             * @returns Returns a confirmation object.
+             *
+             * @param customerId The ID of the customer whose source needs to be deleted.
+             * @param sourceId The ID of the source to be deleted.
+             */
+            deleteSource(customerId: string, sourceId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            deleteSource(customerId: string, sourceId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+
+
+            verifySource(customerId: string, sourceId: string, options: HeaderOptions): Promise<{}>; //TODO: This still needs properly implementing.
+            verifySource(customerId: string, sourceId: string): Promise<{}>; //TODO: This still needs properly implementing.
+
+
+            /**
+             * Creates a new subscription on an existing customer.
+             *
+             * @returns The newly created subscription object if the call succeeded. If the customer has no card or the
+             * attempted charge fails, this call throws an error (unless the specified plan is free or has a trial
+             * period).
+             *
+             * @param customerId The customer to which the add the subscription.
+             * @param options The options for the new subscription
+             */
+            createSubscription(customerId: string, data: subscriptions.ISubscriptionCustCreationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            createSubscription(customerId: string, data: subscriptions.ISubscriptionCustCreationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+
+            /**
+             * By default, you can see the 10 most recent active subscriptions stored on a customer directly on the customer
+             * object, but you can also retrieve details about a specific active subscription for a customer.
+             *
+             * @returns Returns the subscription object.
+             *
+             * @param customerId The customer ID for the subscription
+             * @param subscriptionId The ID of the subscription to retrieve
+             */
+            retrieveSubscription(customerId: string, subscriptionId: string, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            retrieveSubscription(customerId: string, subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+
+            /**
+             * Updates an existing subscription on a customer to match the specified parameters. When changing plans or quantities,
+             * we will optionally prorate the price we charge next month to make up for any price changes.
+             *
+             * By default, we prorate subscription changes. For example, if a customer signs up on May 1 for a $10 plan, she'll be billed
+             * $10 immediately. If she then switches to a $20 plan on May 15, on June 1 she'll be billed $25 ($20 for a renewal of her
+             * subscription and a $5 prorating adjustment for the previous month). Similarly, a downgrade will generate a credit to be
+             * applied to the next invoice. We also prorate when you make quantity changes. Switching plans does not change the billing
+             * date or generate an immediate charge unless you're switching between different intervals (e.g. monthly to yearly), in which
+             * case we apply a credit for the time unused on the old plan and charge for the new plan starting right away, resetting the
+             * billing date. (Note that if we charge for the new plan, and that payment fails, the plan change will not go into effect). If
+             * you'd like to charge for an upgrade immediately, just pass prorate as true as usual, and then invoice the customer as soon
+             * as you make the subscription change. That'll collect the proration adjustments into a new invoice, and Stripe will automatically
+             * attempt to pay the invoice. If you don't want to prorate at all, set the prorate option to false and the customer would be billed
+             * $10 on May 1 and $20 on June 1. Similarly, if you set prorate to false when switching between different billing intervals
+             * (monthly to yearly, for example), we won't generate any credits for the old subscription's unused time, although we will still
+             * reset the billing date and bill immediately for the new subscription.
+             *
+             * @returns The newly updated subscription object if the call succeeded. If a charge is required for the update, and
+             * the charge fails, this call raises throws an error, and the subscription update does not go into effect.
+             *
+             * @param customerId The ID of the customer whose subscription needs to be updated.
+             * @param subscriptionId The ID of the subscription to update.
+             * @param data The fields to update
+             */
+            updateSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            updateSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+
+            /**
+             * Cancels a customer's subscription. If you set the at_period_end parameter to true, the subscription will remain active until
+             * the end of the period, at which point it will be canceled and not renewed. By default, the subscription is terminated
+             * immediately. In either case, the customer will not be charged again for the subscription. Note, however, that any pending
+             * invoice items that you've created will still be charged for at the end of the period unless manually deleted. If you've set
+             * the subscription to cancel at period end, any pending prorations will also be left in place and collected at the end of the
+             * period, but if the subscription is set to cancel immediately, pending prorations will be removed. By default, all unpaid
+             * invoices for the customer will be closed upon subscription cancellation. We do this in order to prevent unexpected payment
+             * retries once the customer has canceled a subscription. However, you can reopen the invoices manually after subscription
+             * cancellation to have us proceed with automatic retries, or you could even re-attempt payment yourself on all unpaid invoices
+             * before allowing the customer to cancel the subscription at all.
+             *
+             * @returns The canceled subscription object. Its subscription status will be set to "canceled" unless you've set at_period_end
+             * to true when canceling, in which case the status will remain "active" but the cancel_at_period_end attribute will change to true.
+             *
+             * @param customerId The ID of the customer whose subscription needs to be cancelled.
+             * @param subscriptionId The ID of the subscription to cancel.
+             * @param data Specify when to cancel the subscription
+             */
+            cancelSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            cancelSubscription(customerId: string, subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            cancelSubscription(customerId: string, subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+
+            /**
+             * You can see a list of the customer's active subscriptions. Note that the 10 most recent active subscriptions are always available
+             * by default on the customer object. If you need more than those 10, you can use the limit and starting_after parameters to page
+             * through additional subscriptions.
+             *
+             * @returns Returns a list of the customer's active subscriptions. You can optionally request that the response include the total
+             * count of all subscriptions for the customer. To do so, specify include[]=total_count in your request.
+             *
+             * @param customerId The ID of the customer whose subscriptions will be retrieved
+             * @param data Filtering options
+             */
+            listSubscriptions(customerId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+            listSubscriptions(customerId: string, data: IListOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+            listSubscriptions(customerId: string, options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+            listSubscriptions(customerId: string, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+
+
+            /**
+             * Removes the currently applied discount on a customer.
+             *
+             * @returns An object with a deleted flag set to true upon success. This call throws an error otherwise, such as if no
+             * discount exists on this customer.
+             *
+             * @param customerId The ID of the customer.
+             */
+            deleteDiscount(customerId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+            deleteDiscount(customerId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+
+            /**
+             * Removes the currently applied discount on a subscription.
+             *
+             * @returns An object with a deleted flag set to true upon success. This call throws an error otherwise, such as if no
+             * discount exists on this subscription.
+             *
+             * @param customerId The ID of the customer.
+             * @param subscriptionId The ID of the subscription.
+             */
+            deleteSubscriptionDiscount(customerId: string, subscriptionId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+            deleteSubscriptionDiscount(customerId: string, subscriptionId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+        }
+
+        class SubscriptionsBase extends StripeResource {
+            /**
+             * By default, you can see the 10 most recent active subscriptions stored on a customer directly on the customer
+             * object, but you can also retrieve details about a specific active subscription for a customer.
+             *
+             * @returns Returns the subscription object.
+             *
+             * @param subscriptionId The ID of the subscription to retrieve
+             */
+            retrieve(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            retrieve(subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+
+            /**
+             * Updates an existing subscription on a customer to match the specified parameters. When changing plans or quantities,
+             * we will optionally prorate the price we charge next month to make up for any price changes.
+             *
+             * By default, we prorate subscription changes. For example, if a customer signs up on May 1 for a $10 plan, she'll be billed
+             * $10 immediately. If she then switches to a $20 plan on May 15, on June 1 she'll be billed $25 ($20 for a renewal of her
+             * subscription and a $5 prorating adjustment for the previous month). Similarly, a downgrade will generate a credit to be
+             * applied to the next invoice. We also prorate when you make quantity changes. Switching plans does not change the billing
+             * date or generate an immediate charge unless you're switching between different intervals (e.g. monthly to yearly), in which
+             * case we apply a credit for the time unused on the old plan and charge for the new plan starting right away, resetting the
+             * billing date. (Note that if we charge for the new plan, and that payment fails, the plan change will not go into effect). If
+             * you'd like to charge for an upgrade immediately, just pass prorate as true as usual, and then invoice the customer as soon
+             * as you make the subscription change. That'll collect the proration adjustments into a new invoice, and Stripe will automatically
+             * attempt to pay the invoice. If you don't want to prorate at all, set the prorate option to false and the customer would be billed
+             * $10 on May 1 and $20 on June 1. Similarly, if you set prorate to false when switching between different billing intervals
+             * (monthly to yearly, for example), we won't generate any credits for the old subscription's unused time, although we will still
+             * reset the billing date and bill immediately for the new subscription.
+             *
+             * @returns The newly updated subscription object if the call succeeded. If a charge is required for the update, and
+             * the charge fails, this call raises throws an error, and the subscription update does not go into effect.
+             *
+             * @param subscriptionId The ID of the subscription to update.
+             * @param data The fields to update
+             */
+            update(subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            update(subscriptionId: string, data: subscriptions.ISubscriptionUpdateOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+
+            /**
+             * Cancels a customer's subscription. If you set the at_period_end parameter to true, the subscription will remain active until
+             * the end of the period, at which point it will be canceled and not renewed. By default, the subscription is terminated
+             * immediately. In either case, the customer will not be charged again for the subscription. Note, however, that any pending
+             * invoice items that you've created will still be charged for at the end of the period unless manually deleted. If you've set
+             * the subscription to cancel at period end, any pending prorations will also be left in place and collected at the end of the
+             * period, but if the subscription is set to cancel immediately, pending prorations will be removed. By default, all unpaid
+             * invoices for the customer will be closed upon subscription cancellation. We do this in order to prevent unexpected payment
+             * retries once the customer has canceled a subscription. However, you can reopen the invoices manually after subscription
+             * cancellation to have us proceed with automatic retries, or you could even re-attempt payment yourself on all unpaid invoices
+             * before allowing the customer to cancel the subscription at all.
+             *
+             * @returns The canceled subscription object. Its subscription status will be set to "canceled" unless you've set at_period_end
+             * to true when canceling, in which case the status will remain "active" but the cancel_at_period_end attribute will change to true.
+             *
+             * @param subscriptionId The ID of the subscription to cancel.
+             * @param data Specify when to cancel the subscription
+             */
+            del(subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            del(subscriptionId: string, data: subscriptions.ISubscriptionCancellationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            del(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            del(subscriptionId: string, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+
+            /**
+             * You can see a list of the customer's active subscriptions. Note that the 10 most recent active subscriptions are always available
+             * by default on the customer object. If you need more than those 10, you can use the limit and starting_after parameters to page
+             * through additional subscriptions.
+             *
+             * @returns Returns a list of the customer's active subscriptions. You can optionally request that the response include the total
+             * count of all subscriptions for the customer. To do so, specify include[]=total_count in your request.
+             *
+             * @param data Filtering options
+             */
+            list(data: subscriptions.ISubscriptionListOptions, options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+            list(data: subscriptions.ISubscriptionListOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+            list(response?: IResponseFn<IList<subscriptions.ISubscription>>): Promise<IList<subscriptions.ISubscription>>;
+
+            /**
+             * Removes the currently applied discount on a subscription.
+             *
+             * @returns An object with a deleted flag set to true upon success. This call throws an error otherwise, such as if no
+             * discount exists on this subscription.
+             *
+             * @param subscriptionId The ID of the subscription.
+             */
+            deleteDiscount(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+            deleteDiscount(subscriptionId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+        }
+
+        class Subscriptions extends SubscriptionsBase {
+            /**
+             * Creates a new subscription on an existing customer.
+             *
+             * @returns The newly created subscription object if the call succeeded. If the customer has no card or the
+             * attempted charge fails, this call throws an error (unless the specified plan is free or has a trial
+             * period).
+             *
+             * @param options The options for the new subscription
+             */
+            create(data: subscriptions.ISubscriptionCreationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            create(data: subscriptions.ISubscriptionCreationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+        }
+        class CustomerSubscriptions extends SubscriptionsBase {
+            /**
+             * Creates a new subscription on an existing customer.
+             *
+             * @returns The newly created subscription object if the call succeeded. If the customer has no card or the
+             * attempted charge fails, this call throws an error (unless the specified plan is free or has a trial
+             * period).
+             *
+             * @param options The options for the new subscription
+             */
+            create(data: subscriptions.ISubscriptionCustCreationOptions, options: HeaderOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+            create(data: subscriptions.ISubscriptionCustCreationOptions, response?: IResponseFn<subscriptions.ISubscription>): Promise<subscriptions.ISubscription>;
+        }
+
+        class Disputes extends StripeResource {
+            /**
+             * Retrieves the dispute with the given ID.
+             */
+            retrieve(disputeId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            retrieve(disputeId: string, data: IDataOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            retrieve(disputeId: string, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            retrieve(disputeId: string, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+
+
+            /**
+             * When you get a dispute, contacting your customer is always the best first step. If that doesn't work, you can submit evidence in
+             * order to help us resolve the dispute in your favor. You can do this in your dashboard, but if you prefer, you can use the API to
+             * submit evidence programmatically. Depending on your dispute type, different evidence fields will give you a better chance of winning
+             * your dispute. You may want to consult our guide to dispute types to help you figure out which evidence fields to provide:
+             * https://stripe.com/help/dispute-types
+             *
+             * @param data The fields to update
+             */
+            update(disputeId: string, data: disputes.IDisputeUpdateOptions, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            update(disputeId: string, data: disputes.IDisputeUpdateOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+
+            /**
+             * Closing the dispute for a charge indicates that you do not have any evidence to submit and are
+             * essentially ‘dismissing’ the dispute, acknowledging it as lost
+             *
+             * The status of the dispute will change from needs_response to lost.
+             *
+             * *Closing a dispute is irreversible!*
+             */
+            close(disputeId: string, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            close(disputeId: string, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+
+            /**
+             * Returns a list of your disputes.
+             */
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+            list(response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+
+            setMetadata(): void; //TODO: Implement placeholder method
+            getMetadata(): void; //TODO: Implement placeholder method
+        }
+
+        class Events extends StripeResource {
+            /**
+             * Retrieves the details of an event. Supply the unique identifier of the event, which you might have
+             * received in a webhook.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+            retrieve(id: string, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+
+
+            /**
+             * List events, going back up to 30 days.
+             */
+            list(data: events.IEventListOptions, options: HeaderOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
+            list(data: events.IEventListOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
+            list(response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
+        }
+
+        class FileUploads extends StripeResource {
+            /**
+             * To upload a file to Stripe, you’ll need to send a request of type multipart/form-data.
+             * The request should contain the file you would like to upload, as well as the parameters for creating a file.
+             *
+             * All of Stripe’s officially supported API libraries should have support for sending multipart/form-data.
+             */
+            create(data: fileUploads.IFileUploadCreationOptions, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            create(data: fileUploads.IFileUploadCreationOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+
+            /**
+             * Retrieves the details of an existing file object.
+             * Supply the unique file upload ID from a file creation request, and Stripe will return the corresponding transfer information.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            retrieve(id: string, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+
+            /**
+             * Returns a list of the files that you have uploaded to Stripe.
+             * The file uploads are returned sorted by creation date, with the most recently created file uploads appearing first.
+             */
+            list(data: fileUploads.IFileUploadListOptions, options: HeaderOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
+            list(data: fileUploads.IFileUploadListOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
+            list(response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
+        }
+
+        class Invoices extends StripeResource {
+            /**
+             * If you need to invoice your customer outside the regular billing cycle, you can create an invoice that
+             * pulls in all pending invoice items, including prorations. The customer's billing cycle and regular subscription
+             * won't be affected. Once you create the invoice, it'll be picked up and paid automatically, though you can
+             * choose to pay it right away: https://stripe.com/docs/api#pay_invoice
+             *
+             * @returns Returns the invoice object if there are pending invoice items to invoice. Throws an error if there
+             * are no pending invoice items or if the customer ID provided is invalid.
+             *
+             * @param data Options used to create the invoice.
+             */
+            create(data: invoices.IInvoiceCreationOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            create(data: invoices.IInvoiceCreationOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+
+            /**
+             * Retrieves the invoice with the given ID. The invoice object contains a
+             * lines hash that contains information about the subscriptions and invoice items that have been applied to the
+             * invoice, as well as any prorations that Stripe has automatically calculated. Each line on the invoice has an
+             * amount attribute that represents the amount actually contributed to the invoice's total. For invoice items and
+             * prorations, the amount attribute is the same as for the invoice item or proration respectively. For
+             * subscriptions, the amount may be different from the plan's regular price depending on whether the invoice
+             * covers a trial period or the invoice period differs from the plan's usual interval. The invoice object has
+             * both a subtotal and a total. The subtotal represents the total before any discounts, while the total is the final
+             * amount to be charged to the customer after all coupons have been applied. The invoice also has a
+             * next_payment_attempt attribute that tells you the next time (as a Unix timestamp) payment for the invoice will be
+             * automatically attempted. For invoices that have been closed or that have reached the maximum number of retries
+             * (specified in your retry settings), the next_payment_attempt will be null.
+             *
+             * @returns Returns an invoice object if a valid invoice ID was provided. Throws an error otherwise.
+             *
+             * @param id The ID of the desired invoice.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieve(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+
+            /**
+             * When retrieving an invoice, you'll get a lines property containing the total count of line items and the first
+             * handful of those items. There is also a URL where you can retrieve the full (paginated) list of line items.
+             *
+             * @returns Returns a list of line_item objects.
+             *
+             * @param id The id of the invoice containing the lines to be retrieved
+             * @param data Filtering options
+             */
+            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            retrieveLines(id: string, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            retrieveLines(id: string, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+
+            /**
+             * At any time, you can preview the upcoming invoice for a customer. This will show you all the charges that are pending,
+             * including subscription renewal charges, invoice item charges, etc. It will also show you any discount that is applicable
+             * to the customer. Note that when you are viewing an upcoming invoice, you are simply viewing a preview -- the invoice has
+             * not yet been created. As such, the upcoming invoice will not show up in invoice listing calls, and you cannot use the API
+             * to pay or edit the invoice. If you want to change the amount that your customer will be billed, you can add, remove, or
+             * update pending invoice items, or update the customer's discount.
+             *
+             * @returns Returns an invoice if a valid customer ID was provided. Throws an error otherwise.
+             *
+             * @param id The identifier of the customer whose upcoming invoice you'd like to retrieve.
+             */
+            retrieveUpcoming(id: string, data: invoices.IInvoiceUpcomingOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieveUpcoming(id: string, data: invoices.IInvoiceUpcomingOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieveUpcoming(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieveUpcoming(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+
+            /**
+             * Until an invoice is paid, it is marked as open (closed=false). If you'd like to stop Stripe from automatically attempting
+             * payment on an invoice or would simply like to close the invoice out as no longer owed by the customer, you can update the
+             * closed parameter.
+             *
+             * @returns Returns the invoice object.
+             *
+             * @param id The ID of the invoice to update
+             * @param data Fields to update
+             */
+            update(id: string, data: invoices.IInvoiceUpdateOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            update(id: string, data: invoices.IInvoiceUpdateOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+
+            /**
+             * Stripe automatically creates and then attempts to pay invoices for customers on subscriptions. We'll also retry unpaid
+             * invoices according to your retry settings. However, if you'd like to attempt to collect payment on an invoice out of the
+             * normal retry schedule or for some other reason, you can do so.
+             *
+             * @returns Returns the invoice object.
+             *
+             * @param id The ID of the invoice to pay.
+             */
+            pay(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            pay(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+
+            /**
+             * You can list all invoices, or list the invoices for a specific customer. The invoices are returned
+             * sorted by creation date, with the most recently created invoices appearing first.
+             *
+             * @returns A object with a data property that contains an array of invoice objects. Throws an error if the
+             * customer ID is invalid.
+             *
+             * @param data Filtering options
+             */
+            list(data: invoices.IInvoiceListOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
+            list(data: invoices.IInvoiceListOptions, response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
+            list(response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
+        }
+
+        class InvoiceItems extends StripeResource {
+            /**
+             * Adds an arbitrary charge or credit to the customer’s upcoming invoice.
+             */
+            create(data: invoiceItems.InvoiceItemCreationOptions, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            create(data: invoiceItems.InvoiceItemCreationOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+
+            /**
+             * Retrieves the invoice item with the given ID.
+             */
+            retrieve(invoiceItemId: string, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            retrieve(invoiceItemId: string, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+
+            /**
+             * Updates the amount or description of an invoice item on an upcoming invoice. Updating an invoice item is only possible before the
+             * invoice it's attached to is closed.
+             */
+            update(invoiceItemId: string, data: invoiceItems.InvoiceItemUpdateOptions, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            update(invoiceItemId: string, data: invoiceItems.InvoiceItemUpdateOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+
+            /**
+             * Returns a list of your invoice items. Invoice items are returned sorted by creation date, with the most recently created invoice
+             * items appearing first.
+             */
+            list(data: invoiceItems.InvoiceItemListOptions, options: HeaderOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+            list(data: invoiceItems.InvoiceItemListOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+            list(response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+
+            /**
+             * Removes an invoice item from the upcoming invoice. Removing an invoice item is only possible before the invoice it's attached
+             * to is closed.
+             */
+            del(invoiceItemId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(invoiceItemId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+        }
+
+        class Payouts extends StripeResource {
+            /**
+             * To send funds to your own bank account, you create a new payout object. Your Stripe balance must be able to cover the payout amount, or you’ll receive an “Insufficient Funds� error.
+             *
+             * If your API key is in test mode, money won’t actually be sent, though everything else will occur as if in live mode.
+             *
+             * If you are creating a manual payout on a Stripe account that uses multiple payment source types, you’ll need to specify the source type balance that the payout should draw from.
+             * The balance object details available and pending amounts by source type.
+             *
+             */
+            create(data: payouts.IPayoutCreationOptions, options: HeaderOptions, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+            create(data: payouts.IPayoutCreationOptions, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+
+            /**
+             * Retrieves the details of an existing payout. Supply the unique payout ID from either a payout creation request or the payout list, and Stripe will return the corresponding payout information.
+             */
+            retrieve(payoutId: string, options: HeaderOptions, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+            retrieve(payoutId: string, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+
+            /**
+             * Updates the specified payout by setting the values of the parameters passed. Any parameters not provided will be left unchanged. This request accepts only the metadata as arguments.
+             */
+            update(payoutId: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+            update(payoutId: string, data: IDataOptionsWithMetadata, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+
+            /**
+             * Returns a list of existing payouts sent to third-party bank accounts or that Stripe has sent you. The payouts are returned in sorted order, with the most recently created payouts appearing first.
+             */
+            list(data: payouts.IPayoutListOptions, options: HeaderOptions, response?: IResponseFn<IList<payouts.IPayout>>): Promise<IList<payouts.IPayout>>;
+            list(data: payouts.IPayoutListOptions, response?: IResponseFn<IList<payouts.IPayout>>): Promise<IList<payouts.IPayout>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<payouts.IPayout>>): Promise<IList<payouts.IPayout>>;
+            list(response?: IResponseFn<IList<payouts.IPayout>>): Promise<IList<payouts.IPayout>>;
+
+            /**
+             * A previously created payout can be canceled if it has not yet been paid out. Funds will be refunded to your available balance, and the fees you were originally charged on the payout will be refunded.
+             * You may not cancel automatic Stripe payouts.
+             */
+            cancel(payoutId: string, options: HeaderOptions, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+            cancel(payoutId: string, response?: IResponseFn<payouts.IPayout>): Promise<payouts.IPayout>;
+        }
+
+        class Plans extends StripeResource {
+            /**
+             * You can create plans easily via the plan management page of the Stripe dashboard. Plan creation is also
+             * accessible via the API if you need to create plans on the fly.
+             *
+             * @returns The newly created plan
+             *
+             * @param data Creation options for the new plan.
+             */
+            create(data: plans.IPlanCreationOptions, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            create(data: plans.IPlanCreationOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+
+            /**
+             * Retrieves the plan with the given ID.
+             *
+             * @returns Returns a plan if a valid plan ID was provided. Throws an error otherwise.
+             *
+             * @param planName The identifier of the desired plan.
+             */
+            retrieve(planName: string, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            retrieve(planName: string, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+
+            /**
+             * Updates the name of a plan. Other plan details (price, interval, etc.) are, by design, not editable.
+             *
+             * @returns The updated plan object is returned upon success. Otherwise, this call throws an error.
+             *
+             * @param planName The identifier of the plan to update
+             * @param data The fields to update
+             */
+            update(planName: string, data: plans.IPlanUpdateOptions, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            update(planName: string, data: plans.IPlanUpdateOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+
+            /**
+             * You can delete plans via the plan management page of the Stripe dashboard. However, deleting a plan does not affect
+             * any current subscribers to the plan; it merely means that new subscribers can't be added to that plan. You can also
+             * delete plans via the API.
+             *
+             * @returns An object with the deleted plan's ID and a deleted flag upon success. Otherwise, this call throws an error, such as if the plan has already been deleted.
+             *
+             * @param planName The identifier of the plan to be deleted.
+             */
+            del(planName: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(planName: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+
+            /**
+             * Returns a list of your plans.
+             *
+             * @returns An object with a data property that contains an array of up to limit plans, starting after plan starting_after.
+             * Each entry in the array is a separate plan object. If no more plans are available, the resulting array will be empty. This
+             * request should never throw an error. You can optionally request that the response include the total count of all plans. To
+             * do so, specify include[]=total_count in your request.
+             */
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+            list(response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+        }
+
+        /**
+         * @deprecated
+         */
+        class RecipientCards extends StripeResource {
+            /**
+             * @deprecated
+             */
+            create(): void;
+            /**
+             * @deprecated
+             */
+            list(): void;
+            /**
+             * @deprecated
+             */
+            update(id: string): void;
+            /**
+             * @deprecated
+             */
+            retrieve(id: string): void;
+            //options: IDataOptions
+            /**
+             * @deprecated
+             */
+            del(id: string): void;
+        }
+
+        /**
+         * @deprecated
+         */
+        class Recipients extends StripeResource {
+            /**
+             * @deprecated
+             */
+            create(): void;
+            /**
+             * @deprecated
+             */
+            list(): void;
+            /**
+             * @deprecated
+             */
+            update(id: string): void;
+            /**
+             * @deprecated
+             */
+            retrieve(id: string): void;
+            //options: IDataOptions
+            /**
+             * @deprecated
+             */
+            del(id: string): void;
+        }
+
+        class Refunds extends StripeResource {
+            /**
+             * When you create a new refund, you must specify a charge to create it on.
+             *
+             * Creating a new refund will refund a charge that has previously been created but not yet refunded.
+             * Funds will be refunded to the credit or debit card that was originally charged.
+             * The fees you were originally charged are also refunded.
+             *
+             * You can optionally refund only part of a charge.
+             * You can do so as many times as you wish until the entire charge has been refunded.
+             *
+             * Once entirely refunded, a charge can't be refunded again.
+             * This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
+             */
+            create(data: refunds.IRefundCreationOptionsWithCharge, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(data: refunds.IRefundCreationOptionsWithCharge, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * Retrieves the details of an existing refund.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+
+            /**
+             * Updates the specified refund by setting the values of the parameters passed.
+             * Any parameters not provided will be left unchanged.
+             *
+             * This request only accepts metadata as an argument.
+             */
+            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * Returns a list of all refunds you’ve previously created. The refunds are returned in sorted order,
+             * with the most recent refunds appearing first.
+             * For convenience, the 10 most recent refunds are always available by default on the charge object.
+             */
+            list(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+        }
+
+        class Tokens extends StripeResource {
+            /**
+             * Creates a single use token that wraps the details of a credit card. This token can be used
+             * in place of a credit card object with any API method. These tokens can only be used once:
+             * by creating a new charge object, or attaching them to a customer.
+             */
+            create(data: tokens.ICardTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.ICardToken>): Promise<tokens.ICardToken>;
+            create(data: tokens.ICardTokenCreationOptions, response?: IResponseFn<tokens.ICardToken>): Promise<tokens.ICardToken>;
+
+            /**
+             * Creates a single use token that wraps the details of a bank account. This token can be used
+             * in place of a bank account object with any API method. These tokens can only be used once:
+             * by attaching them to a recipient or managed account.
+             */
+            create(data: tokens.IBankAccountTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.IBankAccountToken>): Promise<tokens.IBankAccountToken>;
+            create(data: tokens.IBankAccountTokenCreationOptions, response?: IResponseFn<tokens.IBankAccountToken>): Promise<tokens.IBankAccountToken>;
+
+            /**
+             * Creates a single use token that wraps the details of personally identifiable information (PII).
+             * This token can be used in place of a personal_id_number in the Account Update API method.
+             * These tokens can only be used once.
+             */
+            create(data: tokens.IPiiTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            create(data: tokens.IPiiTokenCreationOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+
+            /**
+             * Retrieves the token with the given ID.
+             */
+            retrieve(tokenId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            retrieve(tokenId: string, data: IDataOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            retrieve(tokenId: string, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            retrieve(tokenId: string, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+
+        }
+
+        class Transfers extends StripeResource {
+            /**
+             * To send funds from your Stripe account to a third-party recipient or to your own bank account, you create a new transfer
+             * object. Your Stripe balance must be able to cover the transfer amount, or you'll receive an "Insufficient Funds" error.
+             *
+             * If your API key is in test mode, money won't actually be sent, though everything else will occur as if in live mode.
+             *
+             * If you are creating a manual transfer or a special case transfer on a Stripe account that uses multiple payment source
+             * types, you'll need to specify the source type balance that the transfer should draw from. The balance object details
+             * available and pending amounts by source type.
+             */
+            create(data: transfers.ITransferCreationOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            create(data: transfers.ITransferCreationOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+
+            /**
+             * Retrieves the details of an existing transfer. Supply the unique transfer ID from either a transfer creation request or
+             * the transfer list, and Stripe will return the corresponding transfer information.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            retrieve(id: string, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+
+
+            /**
+             * Updates the specified transfer by setting the values of the parameters passed. Any parameters not provided will be left
+             * unchanged.
+             *
+             * This request accepts only the description and metadata as arguments.
+             */
+            update(id: string, data: transfers.ITransferUpdateOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            update(id: string, data: transfers.ITransferUpdateOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+
+            /**
+             * Returns a list of existing transfers sent to third-party bank accounts or that Stripe has sent you. The transfers are
+             * returned in sorted order, with the most recently created transfers appearing first.
+             */
+            list(data: transfers.ITransferListOptions, options: HeaderOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+            list(data: transfers.ITransferListOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+            list(response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+
+            cancel(id: string, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            cancel(id: string, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+
+            listTransactions(options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>; //TODO: Not sure if this should be a list of balance transactions or charges.
+            listTransactions(response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>; //TODO: Not sure if this should be a list of balance transactions or charges.
+
+            /**
+             * When you create a new reversal, you must specify a transfer to create it on.
+             *
+             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance
+             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
+             *
+             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish
+             * until the entire transfer has been reversed.
+             *
+             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer,
+             * or when trying to reverse more money than is left on a transfer.
+             */
+            reverse(id: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            reverse(id: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            reverse(id: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+
+            /**
+             * When you create a new reversal, you must specify a transfer to create it on.
+             *
+             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance
+             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
+             *
+             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish
+             * until the entire transfer has been reversed.
+             *
+             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer,
+             * or when trying to reverse more money than is left on a transfer.
+             */
+            createReverse(transferId: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            createReverse(transferId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            createReverse(transferId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+
+            /**
+             * By default, you can see the 10 most recent reversals stored directly on the transfer object, but you can also retrieve details about a
+             * specific reversal stored on the transfer.
+             */
+            retrieveReversal(transferId: string, reversalId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieveReversal(transferId: string, reversalId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+
+            /**
+             * Updates the specified reversal by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             *
+             * This request only accepts metadata and description as arguments.
+             */
+            updateReversal(transferId: string, reversalId: string, data: transferReversals.IReversalUpdateOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            updateReversal(transferId: string, reversalId: string, data: transferReversals.IReversalUpdateOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+
+            /**
+             * You can see a list of the reversals belonging to a specific transfer. Note that the 10 most recent reversals are always available by
+             * default on the transfer object. If you need more than those 10, you can use this API method and the limit and starting_after
+             * parameters to page through additional reversals.
+             */
+            listReversals(transferId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            listReversals(transferId: string, data: IListOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            listReversals(transferId: string, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            listReversals(transferId: string, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+
+            setMetadata(): void; //TODO: Implement placeholder method
+            getMetadata(): void; //TODO: Implement placeholder method
+        }
+
+        class TransferReversals extends StripeResource {
+            /**
+             * When you create a new reversal, you must specify a transfer to create it on.
+             *
+             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance
+             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
+             *
+             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish
+             * until the entire transfer has been reversed.
+             *
+             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer,
+             * or when trying to reverse more money than is left on a transfer.
+             */
+            create(data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            create(options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            create(response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+
+            /**
+             * By default, you can see the 10 most recent reversals stored directly on the transfer object, but you can also retrieve details about a
+             * specific reversal stored on the transfer.
+             */
+            retrieve(reversalId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieve(reversalId: string, data: IDataOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieve(reversalId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieve(reversalId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+
+            /**
+             * Updates the specified reversal by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             *
+             * This request only accepts metadata and description as arguments.
+             */
+            update(reversalId: string, data: transferReversals.IReversalUpdateOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            update(reversalId: string, data: transferReversals.IReversalUpdateOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+
+            /**
+             * You can see a list of the reversals belonging to a specific transfer. Note that the 10 most recent reversals are always available by
+             * default on the transfer object. If you need more than those 10, you can use this API method and the limit and starting_after
+             * parameters to page through additional reversals.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            list(data: IListOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            list(response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+        }
+
+        class CountrySpecs extends StripeResource {
+            /**
+             * Lists all Country Spec objects available in the API.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+            list(data: IListOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+            list(response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+
+            /**
+             * Returns a Country Spec for a given Country code.
+             *
+             * @param retrieve  An ISO country code. Available country codes can be listed with the List Country Specs endpoint.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+            retrieve(id: string, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+        }
+
+        class Orders {
+            /**
+             * Creates a new order object.
+             */
+            create(data: orders.IOrderCreationOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            create(data: orders.IOrderCreationOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+
+            /**
+             * Retrieves the details of an existing order. Supply the unique order ID from either an order creation request or the order list,
+             * and Stripe will return the corresponding order information.
+             */
+            retrieve(orderId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            retrieve(orderId: string, data: IDataOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            retrieve(orderId: string, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            retrieve(orderId: string, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+
+            /**
+             * Updates the specific order by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * This request accepts only the metadata, and status as arguments.
+             */
+            update(orderId: string, data: orders.IOrderUpdateOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            update(orderId: string, data: orders.IOrderUpdateOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+
+            /**
+             * Pay an order by providing a source to create a payment.
+             */
+            pay(orderId: string, data: orders.IOrderPayOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            pay(orderId: string, data: orders.IOrderPayOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+
+            /**
+             * Returns a list of your orders. The orders are returned sorted by creation date, with the most recently created orders appearing first.
+             */
+            list(data: orders.IOrderListOptions, options: HeaderOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+            list(data: orders.IOrderListOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+            list(response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+        }
+
+        class Products {
+            /**
+             * Creates a new product object.
+             */
+            create(data: products.IProductCreationOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            create(data: products.IProductCreationOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+
+            /**
+             * Retrieves the details of an existing product. Supply the unique product ID from either a product creation request or the product
+             * list, and Stripe will return the corresponding product information.
+             */
+            retrieve(productId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            retrieve(productId: string, data: IDataOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            retrieve(productId: string, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            retrieve(productId: string, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+
+            /**
+             * Updates the specific product by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             *
+             * Note that a product's attributes are not editable. Instead, you would need to deactivate the existing product and create a new one
+             * with the new attribute values.
+             */
+            update(productId: string, data: products.IProductUpdateOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            update(productId: string, data: products.IProductUpdateOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+
+            /**
+             * Returns a list of your products. The products are returned sorted by creation date, with the most recently created products appearing first.
+             */
+            list(data: products.IProductListOptions, options: HeaderOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+            list(data: products.IProductListOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+            list(response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+
+            /**
+             * Delete a product. Deleting a product is only possible if it has no SKUs associated with it.
+             */
+            del(productId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(productId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+        }
+
+        class SKUs {
+            /**
+             * Creates a new SKU associated with a product.
+             */
+            create(data: skus.ISkuCreationOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            create(data: skus.ISkuCreationOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+
+            /**
+             * Retrieves the details of an existing SKU. Supply the unique SKU identifier from either a SKU creation request or from the
+             * product, and Stripe will return the corresponding SKU information.
+             */
+            retrieve(skuId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            retrieve(skuId: string, data: IDataOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            retrieve(skuId: string, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            retrieve(skuId: string, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+
+            /**
+             * Updates the specific SKU by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             *
+             * Note that a SKU's attributes are not editable. Instead, you would need to deactivate the existing SKU and create a new one with
+             * the new attribute values.
+             */
+            update(skuId: string, data: skus.ISkuUpdateOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            update(skuId: string, data: skus.ISkuUpdateOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+
+            /**
+             * Returns a list of your SKUs. The SKUs are returned sorted by creation date, with the most recently created SKUs appearing first.
+             */
+            list(data: skus.ISkuListOptions, options: HeaderOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+            list(data: skus.ISkuListOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+            list(response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+
+            /**
+             * Delete a SKU. Deleting a SKU is only possible until it has been used in an order.
+             */
+            del(skuId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(skuId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+        }
+
+        class WebHooks {
+            constructEvent<T>(requestBody: any, signature: string | string[], endpointSecret: string): webhooks.StripeWebhookEvent<T>;
+        }
+
+        class EphemeralKeys {
+            create(customer: ephemeralKeys.ICustomer, stripe_version: ephemeralKeys.IStripeVersion, response?: IResponseFn<ephemeralKeys.IEphemeralKey>): Promise<ephemeralKeys.IEphemeralKey>;
+        }
+    }
+
+    interface IObject {
+        object: string;
+    }
+
+    interface IResourceObject extends IObject {
+        id: string;
+    }
+
+    interface IResponseFn<R> {
+        (err: IStripeError, value: R): void;
+    }
+
+    interface IDeleteConfirmation { id: string; deleted: boolean; }
+
+    /**
+     * A filter on the list based on this object field. The value can
+     * be a string with an integer Unix timestamp, or it can be a
+     * dictionary with the following options:
+     */
+    type IDateFilter = string | {
+        /**
+         * Return values where the created field is after this timestamp.
+         */
+        gt?: string;
+
+        /**
+         * Return values where the created field is after or equal to this timestamp.
+         */
+        gte?: string;
+
+        /**
+         * Return values where the created field is before this timestamp.
+         */
+        lt?: string;
+
+        /**
+         * Return values where the created field is before or equal to this timestamp.
+         */
+        lte?: string;
+    }
+
+    /**
+     * A set of key/value pairs that you can attach to an object. It can be useful for storing
+     * additional information about the object in a structured format.
+     */
+    interface IMetadata { }
+
+    interface IShippingInformation {
+        /**
+         * Shipping address.
+         */
+        address: {
+            /**
+             * Address line 1 (Street address/PO Box/Company name)
+             */
+            line1: string;
+
+            /**
+             * Address line 2 (Apartment/Suite/Unit/Building)
+             */
+            line2?: string;
+
+            /**
+             * City/Suburb/Town/Village
+             */
+            city?: string;
+
+            /**
+             * State/Province/County
+             */
+            state?: string;
+
+            /**
+             * Zip/Postal Code
+             */
+            postal_code?: string;
+
+            /**
+             * 2-letter country code
+             */
+            country?: string;
+        };
+
+        /**
+         * Recipient name.
+         */
+        name: string;
+
+        /**
+         * The delivery service that shipped a physical product, such as Fedex, UPS, USPS, etc.
+         */
+        carrier?: string;
+
+        /**
+         * Recipient phone (including extension).
+         */
+        phone?: string;
+
+        /**
+         * The tracking number for a physical product, obtained from the delivery service. If multiple
+         * tracking numbers were generated for this purchase, please separate them with commas.
+         */
+        tracking_number?: string;
+    }
+
+
+    interface IList<T> {
+        /**
+         * Value is 'list'
+         */
+        object: string;
+
+        /**
+         * An array containing the actual response elements, paginated by any request parameters.
+         */
+        data: Array<T>;
+
+        /**
+         * Whether or not there are more elements available after this set. If false, this set comprises the end of the list.
+         */
+        has_more: boolean;
+
+        /**
+         * The URL for accessing this list.
+         */
+        url: string;
+
+        /**
+         * The total number of items available. This value is not included by default,
+         * but you can request it by specifying ?include[]=total_count
+         */
+        total_count?: number;
+    }
+
+    interface IListOptions extends IDataOptions {
+        /**
+         * A cursor for use in pagination. ending_before is an object ID that defines your place in the list. For instance, if you make
+         * a list request and receive 100 objects, starting with obj_bar, your subsequent call can include ending_before=obj_bar in
+         * order to fetch the previous page of the list.
+         */
+        ending_before?: string;
+
+        /**
+         * A limit on the number of objects to be returned. Limit can range between 1 and 100 items.
+         */
+        limit?: number;
+
+        /**
+         * A cursor for use in pagination. starting_after is an object ID that defines your place in the list. For instance, if you make
+         * a list request and receive 100 objects, ending with obj_foo, your subsequent call can include starting_after=obj_foo in order
+         * to fetch the next page of the list.
+         */
+        starting_after?: string;
+    }
+    interface IListOptionsCreated extends IListOptions {
+        /**
+         * A filter on the list based on the object created field. The value can be a string with an integer Unix timestamp, or it can
+         * be a dictionary.
+         */
+        created?: string | IDateFilter;
+    }
+
+    interface IDataOptions {
+        expand?: Array<string>;
+        include?: Array<string>;
+    }
+
+    interface IDataOptionsWithMetadata extends IDataOptions {
+        /**
+         * A set of key/value pairs that you can attach to an object. It can be
+         * useful for storing additional information about the object in a structured
+         * format. You can unset an individual key by setting its value to null and
+         * then saving. To clear all keys, set metadata to null, then save.
+         */
+        metadata?: IMetadata;
+    }
+
+    interface IHeaderOptions {
+        /**
+         * To safely retry an API request without accidentally performing the same operation twice,
+         * you can attach a unique key to any POST request made to the Stripe API via the Idempotency-Key: <key> header.
+         * For example, if a request to create a charge fails due to a network connection error, you can make
+         * a second request with the same key to guarantee that only a single charge is created.
+         * The creation of the key is completely up to you. We suggest using random strings or UUIDs.
+         * We'll always send back the same response for requests made with the same key, even if you make the request
+         * with different request parameters. The keys expire after 24 hours.
+         */
+        idempotency_key?: string;
+
+        stripe_account?: string;
+
+        api_key?: string;
+    }
+
+    /**
+     * Header options can either be a Connect Account Secret Key,
+     * or a hash with one or more of these keys: idempotency_key, stripe_account, api_key
+     */
+    type HeaderOptions = IHeaderOptions | string;
+
+    /**
+     * Stripe uses conventional HTTP response codes to indicate success or failure of an API request.
+     * In general, codes in the 2xx range indicate success, codes in the 4xx range indicate an error that
+     * resulted from the provided information (e.g. a required parameter was missing, a charge failed, etc.),
+     * and codes in the 5xx range indicate an error with Stripe's servers. Not all errors map cleanly onto HTTP
+     * response codes, however. When a request is valid but does not complete successfully (e.g. a card is
+     * declined), we return a 402 error code.
+     *
+     * 200 - OK                           Everything worked as expected.
+     * 400 - Bad Request                  Often missing a required parameter.
+     * 401 - Unauthorized                 No valid API key provided.
+     * 402 - Request Failed               Parameters were valid but request failed.
+     * 404 - Not Found                    The requested item doesn't exist.
+     * 500, 502, 503, 504 - Server Errors Something went wrong on Stripe's end.
+     */
+    interface IStripeError {
+        /**
+         * The type of error returned. Can be invalid_request_error, api_error, or card_error.
+         *
+         *
+         * invalid_request_error Invalid request errors arise when your request has invalid parameters.
+         *
+         * api_error             API errors cover any other type of problem (e.g. a temporary problem with Stripe's
+         *                       servers) and should turn up only very infrequently.
+         *
+         * card_error            Card errors are the most common type of error you should expect to handle. They result
+         *                       when the user enters a card that can't be charged for some reason.
+         */
+        type: string;
+
+        /**
+         * A human-readable message giving more details about the error. For card errors, these messages can
+         * be shown to your users.
+         */
+        message?: string;
+
+        /**
+         * For card errors, a short string from amongst those listed on the right describing the kind of card
+         * error that occurred.
+         *
+         * incorrect_number          The card number is incorrect.
+         * invalid_number            The card number is not a valid credit card number.
+         * invalid_expiry_month      The card's expiration month is invalid.
+         * invalid_expiry_year       The card's expiration year is invalid.
+         * invalid_cvc               The card's security code is invalid.
+         * expired_card              The card has expired.
+         * incorrect_cvc             The card's security code is incorrect.
+         * incorrect_zip             The card's zip code failed validation.
+         * card_declined             The card was declined.
+         * missing                   There is no card on a customer that is being charged.
+         * processing_error          An error occurred while processing the card.
+         * rate_limit                An error occurred due to requests hitting the API too
+         *                             quickly. Please let us know if you're consistently running
+         *                             into this error.
+         */
+        code?: string;
+
+        /**
+         * The parameter the error relates to if the error is parameter-specific. You can use this to display a
+         * message near the correct form field, for example.
+         */
+        param?: string;
+    }
+}
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
new file mode 100644
index 0000000000..03f9baeb9a
--- /dev/null
+++ b/types/stripe/stripe-tests.ts
@@ -0,0 +1,1132 @@
+import Stripe = require('stripe');
+
+var stripe = new Stripe("sk_test_BF573NobVn98OiIsPAv7A04K")
+
+stripe.setApiVersion('2016-03-07');
+
+//#region Balance tests
+// ##################################################################################
+
+stripe.balance.retrieve(function (err, balance) {
+    // asynchronously called
+});
+stripe.balance.retrieve().then(function (balance) {
+    // asynchronously called
+});
+
+stripe.balance.retrieveTransaction(
+    "txn_17xMvmBoqMA9o2xkYNH2ewNj",
+    function (err, balanceTransaction) {
+        // asynchronously called
+    }
+);
+stripe.balance.retrieveTransaction(
+    "txn_17xMvmBoqMA9o2xkYNH2ewNj").then(
+    function (balanceTransaction) {
+        // asynchronously called
+    }
+);
+
+stripe.balance.listTransactions({ limit: 3 }, function (err, transactions) {
+    // asynchronously called
+});
+stripe.balance.listTransactions({ limit: 3 }).then( function (transactions) {
+    // asynchronously called
+});
+stripe.balance.listTransactions().then(function (transactions) {
+    // asynchronously called
+});
+//#endregion
+
+//#region Charges tests
+// ##################################################################################
+
+stripe.charges.create({
+    amount: 400,
+    currency: "gbp",
+    source: "tok_17wV94BoqMA9o2xkhlAd3ALf", // obtained with Stripe.js
+    description: "Charge for test@example.com"
+}, function (err, charge) {
+    // asynchronously called
+    });
+stripe.charges.create({
+    amount: 400,
+    currency: "gbp",
+    source: "tok_17wV94BoqMA9o2xkhlAd3ALf", // obtained with Stripe.js
+    description: "Charge for test@example.com"
+}).then(function (charge) {
+    // asynchronously called
+
+    charge.refunds.create().then(function (refund) {
+        // asynchronously called
+    });
+    charge.refunds.create({ amount: 100 }).then(function (refund) {
+        // asynchronously called
+    });
+
+    charge.refunds.retrieve("re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
+
+    });
+
+    charge.refunds.update("re_15jzA4Ee31JkLCeQcxbTbjaL", { metadata: { test: "data" } }).then(function (refund) {
+
+    });
+
+    charge.refunds.list({ limit: 3 }).then(function (refund) {
+
+    });
+    charge.refunds.list().then(function (refund) {
+
+    });
+});
+
+stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9", function (err, charge) {
+    // asynchronously called
+    if (typeof charge.application_fee === "object") {
+        charge.application_fee.amount;
+    }
+});
+stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (charge) {
+    // asynchronously called
+    if (typeof charge.application_fee === "object") {
+        charge.application_fee.amount;
+    }
+});
+
+stripe.charges.update(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    {
+        description: "Charge for test@example.com"
+    },
+    function (err, charge) {
+        // asynchronously called
+    }
+);
+stripe.charges.update(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    {
+        description: "Charge for test@example.com"
+    })
+    .then(function (charge) {
+        // asynchronously called
+    });
+
+stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9", {amount: 1}, {}, function (err, charge) {
+    // asynchronously called
+});
+stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9", {amount: 1}, {}).then( function (charge) {
+    // asynchronously called
+});
+stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9", {}, {},function (err, charge) {
+    // asynchronously called
+});
+stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9", {}).then( function (charge) {
+    // asynchronously called
+});
+stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9").then( function (charge) {
+    // asynchronously called
+});
+
+stripe.charges.list({ limit: 3 }, function (err, charges) {
+    // asynchronously called
+});
+stripe.charges.list({ limit: 3 }).then(function (charges) {
+    // asynchronously called
+});
+
+stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9", {},
+    function (err, refund) {
+        // asynchronously called
+    }
+);
+stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9", {}).then(function (refund) {
+    // asynchronously called
+});
+stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (refund) {
+    // asynchronously called
+});
+
+stripe.charges.retrieveRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    "re_15jzA4Ee31JkLCeQcxbTbjaL",
+    function (err, refund) {
+        // asynchronously called
+    }
+);
+stripe.charges.retrieveRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    "re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
+        // asynchronously called
+    }
+);
+
+stripe.charges.createRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    {},
+    function (err, refund) {
+        // asynchronously called
+    }
+);
+stripe.charges.createRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    function (err, refund) {
+        // asynchronously called
+    }
+);
+stripe.charges.createRefund("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (refund) {
+    // asynchronously called
+});
+
+stripe.charges.updateRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    "re_15jzA4Ee31JkLCeQcxbTbjaL",
+    { metadata: { key: "value" } },
+    function (err: Stripe.IStripeError, refund: Stripe.refunds.IRefund) {
+        // asynchronously called
+
+    }
+);
+stripe.charges.updateRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    "re_15jzA4Ee31JkLCeQcxbTbjaL",
+    { metadata: { key: "value" } }).then(
+    function (refund) {
+        // asynchronously called
+
+    }
+);
+
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
+    // asynchronously called
+});
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
+    // asynchronously called
+});
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', { limit: 3 }, function (err, refunds) {
+    // asynchronously called
+});
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', { limit: 3 }).then(function (refunds) {
+    // asynchronously called
+});
+
+stripe.charges.markAsSafe('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
+    // asynchronously called
+});
+stripe.charges.markAsSafe('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
+    // asynchronously called
+});
+
+stripe.charges.markAsFraudulent('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
+    // asynchronously called
+});
+stripe.charges.markAsFraudulent('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Customer tests
+// ##################################################################################
+
+stripe.customers.create({
+    description: 'Customer for test@example.com',
+    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
+}, function (err, customer) {
+    // asynchronously called
+    });
+stripe.customers.create({
+    description: 'Customer for test@example.com',
+    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
+}).then( function (customer) {
+    // asynchronously called
+    customer.cards.create({ card: "tok_17wV94BoqMA9o2xkhlAd3ALf"}).then(function (customer) {});
+    customer.cards.retrieve("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (card) {});
+    customer.cards.update("card_17xMvXBoqMA9o2xkq6W5gamx", { name: "Test" }).then(function (card) {});
+    customer.cards.list().then(function (cards) {});
+    customer.cards.del("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (confirmation) {});
+
+    customer.subscriptions.create({ plan: "gold" }).then(function (subscription) { });
+    customer.subscriptions.retrieve("sub_8Eluur5KoIKxuy").then(function (subscription) { });
+    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { plan: "silver" }).then(function (subscription) { });
+    customer.subscriptions.list().then(function (subscriptions) { });
+    customer.subscriptions.del("sub_8Eluur5KoIKxuy").then(function (subscription) { });
+    customer.subscriptions.deleteDiscount("sub_8Eluur5KoIKxuy").then(function (confirmation) { });
+});
+
+
+stripe.customers.create({
+    description: 'Customer for test@example.com',
+    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
+}, { stripe_account: "" }, function (err, customer) {
+    // asynchronously called
+});
+stripe.customers.create({
+    description: 'Customer for test@example.com',
+    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
+}, { stripe_account: "" }).then(function (customer) {
+
+});
+
+stripe.customers.retrieve(
+    "cus_5rfJKDJkuxzh5Q",
+    function (err, customer) {
+        // asynchronously called
+        customer.cards.create(
+            { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
+            function (err, card) {
+                // asynchronously called
+                card.brand;
+            }
+        );
+    }
+);
+stripe.customers.retrieve("cus_5rfJKDJkuxzh5Q").then(function (customer) {
+    // asynchronously called
+});
+
+stripe.customers.update("cus_5rfJKDJkuxzh5Q", {
+    description: "Customer for test@example.com"
+}, function (err, customer) {
+    // asynchronously called
+    });
+stripe.customers.update("cus_5rfJKDJkuxzh5Q", {
+    description: "Customer for test@example.com"
+}).then(function (customer) {
+    // asynchronously called
+});
+
+stripe.customers.del(
+    "cus_5rfJKDJkuxzh5Q",
+    function (err, confirmation) {
+        // asynchronously called
+    }
+);
+stripe.customers.del("cus_5rfJKDJkuxzh5Q").then(function (confirmation) {
+        // asynchronously called
+    }
+);
+
+stripe.customers.list({ limit: 3 }, function (err, customers) {
+    // asynchronously called
+});
+stripe.customers.list({ limit: 3 }).then(function (customers) {
+    // asynchronously called
+});
+
+stripe.customers.createCard(
+    "cus_5rfJKDJkuxzh5Q",
+    { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
+    function (err, card) {
+        // asynchronously called
+    }
+);
+stripe.customers.createCard("cus_5rfJKDJkuxzh5Q", { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (card) {
+    // asynchronously called
+});
+
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    { source: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
+    function (err, source) {
+        var card = <Stripe.ICard>source;
+        var bankAcc = <Stripe.IBankAccount>source;
+    }
+);
+stripe.customers.createSource("cus_5rfJKDJkuxzh5Q", { source: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (source) {
+    var card = <Stripe.ICard>source;
+    var bankAcc = <Stripe.IBankAccount>source;
+});
+
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    {
+        source: {
+            object: "card",
+            exp_month: 1,
+            exp_year: 16,
+            number: 4242424242424242
+        }
+    },
+    function (err, card) {
+        // asynchronously called
+        var obj: Stripe.ICard = card;
+    }
+);
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    {
+        source: {
+            object: "card",
+            exp_month: 1,
+            exp_year: 16,
+            number: 4242424242424242
+        }
+    }).then(
+    function (card) {
+        // asynchronously called
+        var obj: Stripe.ICard = card;
+    }
+);
+
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    { source: "btok_8E264Lxsbyvj3E" },
+    function (err: Stripe.IStripeError, bankAcc: Stripe.IBankAccount) {
+        // asynchronously called
+        bankAcc.bank_name;
+    }
+);
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    { source: "btok_8E264Lxsbyvj3E" }).then(function (bankAcc: Stripe.IBankAccount) {
+        // asynchronously called
+        bankAcc.bank_name;
+    }
+);
+
+stripe.customers.retrieveCard(
+    "cus_5rfJKDJkuxzh5Q",
+    "card_15fvyXEe31JkLCeQ9KMktP5S",
+    function (err, card) {
+        // asynchronously called
+        var obj: Stripe.ICard = card;
+    }
+);
+stripe.customers.retrieveCard(
+    "cus_5rfJKDJkuxzh5Q",
+    "card_15fvyXEe31JkLCeQ9KMktP5S").then(function (card) {
+        // asynchronously called
+        var obj: Stripe.ICard = card;
+    });
+
+stripe.customers.updateCard(
+    "cus_5rfJKDJkuxzh5Q",
+    "card_15fvyXEe31JkLCeQ9KMktP5S",
+    { name: "Jane Austen" },
+    function (err, card) {
+        // asynchronously called
+        var obj: Stripe.ICard = card;
+    }
+);
+
+stripe.customers.updateCard(
+    "cus_5rfJKDJkuxzh5Q",
+    "card_15fvyXEe31JkLCeQ9KMktP5S",
+    { name: "Jane Austen" }).then(function (card) {
+        // asynchronously called
+        var obj: Stripe.ICard = card;
+    });
+
+stripe.customers.deleteCard(
+    "cus_5rfJKDJkuxzh5Q",
+    "card_15fvyXEe31JkLCeQ9KMktP5S",
+    function (err, confirmation) {
+        // asynchronously called
+    }
+);
+stripe.customers.deleteCard(
+    "cus_5rfJKDJkuxzh5Q",
+    "card_15fvyXEe31JkLCeQ9KMktP5S").then(function (confirmation) {
+        // asynchronously called
+    });
+
+stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', null, function (err, cards) {
+    // asynchronously called
+});
+stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', null).then(function (cards) {
+    // asynchronously called
+});
+
+stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', function (err, cards) {
+    // asynchronously called
+});
+stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc').then(function (cards) {
+    // asynchronously called
+});
+
+stripe.customers.retrieveSubscription(
+    "cus_5rfJKDJkuxzh5Q",
+    "sub_5rfJxnBLGSwsYp",
+    function (err, subscription) {
+        // asynchronously called
+    }
+);
+stripe.customers.retrieveSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (subscription) {
+    // asynchronously called
+});
+
+stripe.customers.updateSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", { plan: "platypi-dev" },
+    function (err, subscription) {
+        // asynchronously called
+    }
+);
+stripe.customers.updateSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", { plan: "platypi-dev" }).then(function (subscription) {
+    // asynchronously called
+});
+
+stripe.customers.cancelSubscription(
+    "cus_5rfJKDJkuxzh5Q",
+    "sub_5rfJxnBLGSwsYp",
+    null,
+    function (err, confirmation) {
+        // asynchronously called
+    }
+);
+stripe.customers.cancelSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", null).then(function (confirmation) {
+    // asynchronously called
+});
+
+stripe.customers.cancelSubscription(
+    "cus_5rfJKDJkuxzh5Q",
+    "sub_5rfJxnBLGSwsYp",
+    function (err, confirmation) {
+        // asynchronously called
+    }
+);
+stripe.customers.cancelSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (confirmation) {
+    // asynchronously called
+});
+
+stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', null, function (err, subscriptions) {
+    // asynchronously called
+});
+stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', null).then(function (subscriptions) {
+    // asynchronously called
+});
+
+stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', function (err, subscriptions) {
+    // asynchronously called
+});
+stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc').then(function (subscriptions) {
+    // asynchronously called
+});
+
+stripe.customers.deleteDiscount("cus_5rfJKDJkuxzh5Q", function (err, confirmation) {
+    // asynchronously called
+});
+stripe.customers.deleteDiscount("cus_5rfJKDJkuxzh5Q").then(function (confirmation) {
+    // asynchronously called
+});
+
+stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", function (err, confirmation) {
+    // asynchronously called
+});
+stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (confirmation) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Disputes tests
+// ##################################################################################
+
+//#endregion
+
+//#region Events tests
+// ##################################################################################
+
+//#endregion
+
+//#region File Uploads tests
+// ##################################################################################
+
+//#endregion
+
+//#region Refunds tests
+// ##################################################################################
+
+
+//#endregion
+
+//#region Tokens tests
+// ##################################################################################
+
+//#endregion
+
+//#region Transfers tests
+// ##################################################################################
+
+//#endregion
+
+//#region Transfers Reversals tests
+// ##################################################################################
+
+//#endregion
+
+//#region Accounts test
+// ##################################################################################
+
+stripe.accounts.create({
+    email: "",
+    type: "standard"
+}, function (err, customer) {
+    // asynchronously called
+    }
+);
+stripe.accounts.create({
+    type: "custom"
+}).then(function (customer) {
+    // asynchronously called
+    }
+);
+
+stripe.accounts.retrieve(
+    "acct_17wV8KBoqMA9o2xk",
+    function (err, account) {
+        // asynchronously called
+    }
+);
+stripe.accounts.retrieve(
+    "acct_17wV8KBoqMA9o2xk").then(
+    function (account) {
+        // asynchronously called
+    }
+);
+
+stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
+    {
+        support_phone: "555-867-5309"
+    },
+    function(err, account) {
+        // asynchronously called
+    }
+);
+stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
+    {
+        support_phone: "555-867-5309"
+    }).then(
+    function(account) {
+        // asynchronously called
+    }
+);
+
+stripe.accounts.del("acct_17wV8KBoqMA9o2xk", function (err, confirmation) { });
+stripe.accounts.del("acct_17wV8KBoqMA9o2xk").then(function (confirmation) { });
+
+stripe.accounts.reject("acct_17wV8KBoqMA9o2xk", { reason: 'fraud' }, function (err, account) {
+    // asynchronously called
+});
+stripe.accounts.reject("acct_17wV8KBoqMA9o2xk", { reason: 'fraud' }).then(function (account) {
+    // asynchronously called
+});
+
+stripe.accounts.list(
+    { limit: 3 },
+    function (err, accounts) {
+        // asynchronously called
+    }
+);
+stripe.accounts.list(
+    { limit: 3 }).then(
+    function (accounts) {
+        // asynchronously called
+    }
+);
+//#endregion
+
+//#region Application Fee Refunds tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Application Fees tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Country Specs tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region External Accounts tests
+// ##################################################################################
+
+stripe.accounts.createExternalAccount("", { external_account: "btok_8E264Lxsbyvj3E" }, function (err, extAcc) {
+    var card = <Stripe.ICard>extAcc;
+    var bankAcc = <Stripe.IBankAccount>extAcc;
+});
+stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (extAcc) {
+    var card = <Stripe.ICard>extAcc;
+    var bankAcc = <Stripe.IBankAccount>extAcc;
+});
+
+stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }, { stripe_account: "acct_17wV8KOoqMF9a2xk" }).then(function (extAcc) {
+    var card = <Stripe.ICard>extAcc;
+    var bankAcc = <Stripe.IBankAccount>extAcc;
+});
+stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }, "acct_17wV8KOoqMF9a2xk").then(function (extAcc) {
+    var card = <Stripe.ICard>extAcc;
+    var bankAcc = <Stripe.IBankAccount>extAcc;
+});
+
+//#endregion
+
+//#region Bank Accounts tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Bitcoin Receivers tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Cards tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Orders tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Order Items tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Products tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region SKUs tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region WebHooks tests
+// ##################################################################################
+
+const webhookRequest = {
+  rawBody: '',
+  headers: { 'stripe-signature': '' }
+};
+const webhookSecret = '';
+
+const event = stripe.webhooks.constructEvent<Stripe.subscriptions.ISubscription>(
+  webhookRequest.rawBody,
+  webhookRequest.headers['stripe-signature'],
+  webhookSecret
+);
+
+//#endregion
+
+//#region Coupons tests
+// ##################################################################################
+
+stripe.coupons.create({
+    percent_off: 25,
+    duration: 'repeating',
+    duration_in_months: 3,
+    id: '25OFF'
+}, function (err, coupon) {
+    // asynchronously called
+    });
+stripe.coupons.create({
+    percent_off: 25,
+    duration: 'repeating',
+    duration_in_months: 3,
+    id: '25OFF'
+}).then(function (coupon) {
+    // asynchronously called
+});
+
+stripe.coupons.retrieve(
+    "25OFF",
+    function (err, coupon) {
+        // asynchronously called
+    }
+);
+stripe.coupons.retrieve("25OFF").then(function (coupon) {
+    // asynchronously called
+});
+
+stripe.coupons.update("25OFF", {
+    metadata: { key: "value" }
+}, function (err: Stripe.IStripeError, coupon: Stripe.coupons.ICoupon) {
+    // asynchronously called
+});
+stripe.coupons.update("25OFF", {
+    metadata: { key: "value" }
+}).then(function (coupon) {
+    // asynchronously called
+});
+
+stripe.coupons.del("25OFF", function (err, confirmation) {
+
+});
+stripe.coupons.del("25OFF").then(function (confirmation) {
+
+});
+
+stripe.coupons.list({ limit: 3 }, function (err, coupons) {
+    // asynchronously called
+});
+stripe.coupons.list({ limit: 3 }).then(function (coupons) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Discounts tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Invoices tests
+// ##################################################################################
+
+stripe.invoices.create({
+    customer: "cus_5rfJKDJkuxzh5Q"
+}, function (err, invoice) {
+    // asynchronously called
+    });
+stripe.invoices.create({
+    customer: "cus_5rfJKDJkuxzh5Q"
+}).then(function (invoice) {
+    // asynchronously called
+});
+
+stripe.invoices.retrieve(
+    "in_15fvyXEe31JkLCeQH7QbgZZb",
+    function (err, invoice) {
+        // asynchronously called
+    }
+);
+stripe.invoices.retrieve("in_15fvyXEe31JkLCeQH7QbgZZb").then(function (invoice) {
+    // asynchronously called
+});
+
+stripe.invoices.retrieveLines(
+    "in_15fvyXEe31JkLCeQH7QbgZZb",
+    { limit: 5 },
+    function (err, lines) {
+        // asynchronously called
+        lines.data[0].type = "invoiceitem"
+    }
+);
+stripe.invoices.retrieveLines("in_15fvyXEe31JkLCeQH7QbgZZb", { limit: 5 }).then(function (lines) {
+    // asynchronously called
+});
+
+stripe.invoices.retrieveUpcoming(
+    "cus_5rfJKDJkuxzh5Q",
+    null,
+    function (err, upcoming) {
+        // asynchronously called
+    }
+);
+stripe.invoices.retrieveUpcoming("cus_5rfJKDJkuxzh5Q", null).then(function (upcoming) {
+    // asynchronously called
+});
+
+stripe.invoices.retrieveUpcoming(
+    "cus_5rfJKDJkuxzh5Q",
+    function (err, upcoming) {
+        // asynchronously called
+    }
+);
+stripe.invoices.retrieveUpcoming("cus_5rfJKDJkuxzh5Q").then(function (upcoming) {
+    // asynchronously called
+});
+
+stripe.invoices.update(
+    "in_15fvyXEe31JkLCeQH7QbgZZb",
+    {
+        closed: true
+    },
+    function (err, invoice) {
+        // asynchronously called
+    }
+);
+stripe.invoices.update(
+    "in_15fvyXEe31JkLCeQH7QbgZZb",
+    {
+        closed: true
+    }).then(function (invoice) {
+        // asynchronously called
+    }
+);
+
+stripe.invoices.pay("in_15fvyXEe31JkLCeQH7QbgZZb", function (err, invoice) {
+    // asynchronously called
+});
+stripe.invoices.pay("in_15fvyXEe31JkLCeQH7QbgZZb").then(function (invoice) {
+    // asynchronously called
+});
+
+stripe.invoices.list(
+    { customer: "cus_5rfJKDJkuxzh5Q", limit: 3 },
+    function (err, invoices) {
+        // asynchronously called
+    }
+);
+stripe.invoices.list({ customer: "cus_5rfJKDJkuxzh5Q", limit: 3 }).then(function (invoices) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Invoice Items tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Payouts tests
+// ##################################################################################
+stripe.payouts.create({
+    amount: 2000,
+    currency: "usd",
+    description: "The Payout",
+}, function(err, payout) {});
+stripe.payouts.create({
+    amount: 2000,
+    currency: "usd",
+    description: "The Payout",
+}).then(function(payout) {});
+stripe.payouts.create({
+    amount: 2000,
+    currency: "usd",
+    description: "The Payout",
+}, {
+    stripe_account: "acct_abc12345678",
+}, function(err, payout) {});
+stripe.payouts.create({
+    amount: 2000,
+    currency: "usd",
+    description: "The Payout",
+}, {
+    stripe_account: "acct_abc12345678",
+}).then(function(payout) {});
+
+stripe.payouts.retrieve(
+    "po_5rfJKDJkuxzh5Q",
+    function(err, payout) {}
+);
+stripe.payouts.retrieve("po_5rfJKDJkuxzh5Q").then(
+    function(payout) {}
+);
+stripe.payouts.retrieve(
+    "po_5rfJKDJkuxzh5Q",
+    { stripe_account: "acct_abc12345678" },
+    function(err, payout) {}
+);
+stripe.payouts.retrieve(
+    "po_5rfJKDJkuxzh5Q",
+    { stripe_account: "acct_abc12345678" }
+).then(function(payout) {});
+
+stripe.payouts.update(
+    "po_5rfJKDJkuxzh5Q",
+    { metadata: { key: "value" } },
+    function(err: Stripe.IStripeError, payout: Stripe.payouts.IPayout) {}
+);
+stripe.payouts.update(
+    "po_5rfJKDJkuxzh5Q",
+    { metadata: { key: "value" } },
+).then(function(payout) {});
+stripe.payouts.update(
+    "po_5rfJKDJkuxzh5Q",
+    { metadata: { key: "value" } },
+    { stripe_account: "acct_abc12345678" },
+    function(err, payout) {}
+);
+stripe.payouts.update(
+    "po_5rfJKDJkuxzh5Q",
+    { metadata: { key: "value" } },
+    { stripe_account: "acct_abc12345678" },
+).then(function(payout) {});
+
+stripe.payouts.list(
+    { limit: 100 },
+    { stripe_account: "acct_abc12345678" },
+    function(err, payouts) {}
+);
+stripe.payouts.list(
+    { limit: 100 },
+    { stripe_account: "acct_abc12345678" },
+).then(function(payouts) {});
+stripe.payouts.list(
+    { limit: 100 },
+    function(err, payouts) {}
+);
+stripe.payouts.list(
+    { limit: 100 },
+).then(function(payouts) {});
+stripe.payouts.list(
+    { stripe_account: "acct_abc12345678" },
+    function(err, payouts) {}
+);
+stripe.payouts.list(
+    { stripe_account: "acct_abc12345678" },
+).then(function(payouts) {});
+stripe.payouts.list(
+    function(err, payouts) {}
+);
+stripe.payouts.list().then(function(payouts) {});
+
+stripe.payouts.cancel(
+    "po_5rfJKDJkuxzh5Q",
+    { stripe_account: "acct_abc12345678" },
+    function(err, payout) {}
+);
+stripe.payouts.cancel(
+    "po_5rfJKDJkuxzh5Q",
+    { stripe_account: "acct_abc12345678" },
+).then(function(payout) {});
+stripe.payouts.cancel(
+    "po_5rfJKDJkuxzh5Q",
+    function(err, payout) {}
+);
+stripe.payouts.cancel(
+    "po_5rfJKDJkuxzh5Q",
+).then(function(payout) {});
+
+//#endregion
+
+//#region Plans tests
+// ##################################################################################
+
+stripe.plans.create({
+    amount: 2000,
+    interval: "month",
+    name: "Amazing Gold Plan",
+    currency: "usd",
+    id: "gold"
+}, function (err, plan) {
+    // asynchronously called
+    });
+stripe.plans.create({
+    amount: 2000,
+    interval: "month",
+    name: "Amazing Gold Plan",
+    currency: "usd",
+    id: "gold"
+}).then(function (plan) {
+    // asynchronously called
+});
+
+stripe.plans.retrieve(
+    "platypi-dev",
+    function (err, plan) {
+        // asynchronously called
+    }
+);
+stripe.plans.retrieve("platypi-dev").then(function (plan) {
+    // asynchronously called
+});
+
+stripe.plans.update("platypi-dev", {
+    name: "New plan name"
+}, function (err, plan) {
+    // asynchronously called
+});
+stripe.plans.update("platypi-dev", { name: "New plan name" }).then(function (plan) {
+    // asynchronously called
+});
+
+stripe.plans.del(
+    "platypi-dev",
+    function (err, confirmation) {
+        // asynchronously called
+    }
+);
+stripe.plans.del("platypi-dev").then(function (confirmation) {
+    // asynchronously called
+});
+
+stripe.plans.list(null, function (err, plans) {
+    // asynchronously called
+});
+stripe.plans.list(null).then(function (plans) {
+    // asynchronously called
+});
+
+stripe.plans.list(function (err, plans) {
+    // asynchronously called
+});
+stripe.plans.list().then(function (plans) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Subscriptions tests
+// ##################################################################################
+
+stripe.subscriptions.create({ plan: "platypi-dev", customer: "cus_5rfJKDJkuxzh5Q" }, function(err, subscription) {
+    // asynchronously called
+});
+stripe.subscriptions.create({ plan: "platypi-dev", customer: "cus_5rfJKDJkuxzh5Q" }).then(function(subscription) {
+    // asynchronously called
+});
+
+stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt", function(err, subscription) {
+    // asynchronously called
+    if (typeof subscription.customer === "object") {
+        subscription.customer.email;
+    }
+});
+stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt").then(function(subscription) {
+    // asynchronously called
+    if (typeof subscription.customer === "object") {
+        subscription.customer.email;
+    }
+});
+
+stripe.subscriptions.update("sub_8QwCiwZ9tmMSpt", { plan: "platypi" }, function(err, subscription) {
+    // asynchronously called
+});
+stripe.subscriptions.update("sub_8QwCiwZ9tmMSpt", { plan: "platypi" }).then(function(subscription) {
+    // asynchronously called
+});
+
+stripe.subscriptions.del("sub_8QwCiwZ9tmMSpt", function(err, subscription) {
+    // asynchronously called
+});
+stripe.subscriptions.del("sub_8QwCiwZ9tmMSpt").then(function(subscription) {
+    // asynchronously called
+});
+
+stripe.subscriptions.list({ customer: "cus_5rfJKDJkuxzh5Q", plan: "platypi-dev" }, function(err, subscriptions) {
+    // asynchronously called
+});
+stripe.subscriptions.list({ customer: "cus_5rfJKDJkuxzh5Q", plan: "platypi-dev" }).then(function(subscriptions) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Ephemeral keys tests
+// ##################################################################################
+
+stripe.ephemeralKeys.create({ customer: "cus_5rfJKDJkuxzh5Q" }, { stripe_version: "2017-08-15" }).then(function(ephemeralKeys) {
+    // asynchronously called
+});
diff --git a/types/stripe/tsconfig.json b/types/stripe/tsconfig.json
new file mode 100644
index 0000000000..f2ac469aad
--- /dev/null
+++ b/types/stripe/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stripe-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/stripe/tslint.json b/types/stripe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stripe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/striptags/index.d.ts b/types/striptags/index.d.ts
deleted file mode 100644
index dfbf79adc1..0000000000
--- a/types/striptags/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for striptags
-// Project: https://github.com/ericnorris/striptags
-// Definitions by: Craig Citro <https://github.com/ccitro>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'striptags' {
-    export default function strip (html: string, allowedTags?: string | string[]): string;
-}
diff --git a/types/striptags/striptags-tests.ts b/types/striptags/striptags-tests.ts
deleted file mode 100644
index 315fa50105..0000000000
--- a/types/striptags/striptags-tests.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import striptags from 'striptags';
-
-    function testStriptags() {
-    var html =
-        '<a href="https://example.com">' +
-            'lorem ipsum <strong>dolor</strong> <em>sit</em> amet' +
-        '</a>';
-
-    striptags(html);
-    striptags(html, '<a><strong>');
-    striptags(html, ['a']);
-}
\ No newline at end of file
diff --git a/types/striptags/tsconfig.json b/types/striptags/tsconfig.json
deleted file mode 100644
index 5823e343cd..0000000000
--- a/types/striptags/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "striptags-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/strong-cluster-control/index.d.ts b/types/strong-cluster-control/index.d.ts
index e0b3fb5c12..d0d577236c 100644
--- a/types/strong-cluster-control/index.d.ts
+++ b/types/strong-cluster-control/index.d.ts
@@ -53,7 +53,6 @@ declare namespace StrongClusterControl {
 
         /**
          * @description Stop the controller, after stopping workers (if the size is being controlled, see setSize()).
-         * @param callback
          */
         stop(callback?: () => any): this;
 
diff --git a/types/strophe/tslint.json b/types/strophe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/strophe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/styled-jsx/css.d.ts b/types/styled-jsx/css.d.ts
new file mode 100644
index 0000000000..55a9533bb8
--- /dev/null
+++ b/types/styled-jsx/css.d.ts
@@ -0,0 +1,4 @@
+type Tag = (chunks: TemplateStringsArray, ...args: any[]) => string;
+
+declare let css: Tag;
+export default css;
diff --git a/types/styled-jsx/index.d.ts b/types/styled-jsx/index.d.ts
new file mode 100644
index 0000000000..5072cdc7b9
--- /dev/null
+++ b/types/styled-jsx/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for styled-jsx 2.2
+// Project: https://github.com/zeit/styled-jsx
+// Definitions by: R1ZZU <https://github.com/R1ZZU>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import "react";
+
+import * as css from "./css";
+import * as server from "./server";
+
+declare module "react" {
+    interface StyleHTMLAttributes<T> extends HTMLAttributes<T> {
+        jsx?: boolean;
+        global?: boolean;
+    }
+}
diff --git a/types/styled-jsx/server.d.ts b/types/styled-jsx/server.d.ts
new file mode 100644
index 0000000000..7d67967842
--- /dev/null
+++ b/types/styled-jsx/server.d.ts
@@ -0,0 +1,7 @@
+import { ReactElement } from "react";
+
+declare function flushToHTML(): string;
+declare function flushToReact<T>(): ReactElement<T>[];
+
+export { flushToHTML };
+export default flushToReact;
diff --git a/types/styled-jsx/styled-jsx-tests.tsx b/types/styled-jsx/styled-jsx-tests.tsx
new file mode 100644
index 0000000000..ada37c2248
--- /dev/null
+++ b/types/styled-jsx/styled-jsx-tests.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react';
+import css from 'styled-jsx/css';
+import flushToReact, { flushToHTML } from 'styled-jsx/server';
+
+const styled = (
+    <div>
+        <style jsx>{`
+            color: rebeccapurple;
+        `}</style>
+    </div>
+);
+
+const styledGlobal = (
+    <div>
+        <style jsx global>{`
+            color: rebeccapurple;
+        `}</style>
+    </div>
+);
+
+const buttonColor = 'red';
+const separatedCSS = css`button { color: ${buttonColor}; }`;
+const withSeparatedCSS = (
+    <div>
+        <style jsx>{separatedCSS}</style>
+    </div>
+);
+
+const stylesChildren = flushToReact();
+const jsxToRender = (
+    <head>{ stylesChildren }</head>
+);
+
+const stylesAsString: string = flushToHTML();
+const html = `
+    <head>${stylesAsString}</head>
+`;
diff --git a/types/styled-jsx/tsconfig.json b/types/styled-jsx/tsconfig.json
new file mode 100644
index 0000000000..494ed25a0a
--- /dev/null
+++ b/types/styled-jsx/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "styled-jsx-tests.tsx"
+    ]
+}
diff --git a/types/styled-jsx/tslint.json b/types/styled-jsx/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/styled-jsx/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stylelint/index.d.ts b/types/stylelint/index.d.ts
index 926223ad65..1606d1805c 100644
--- a/types/stylelint/index.d.ts
+++ b/types/stylelint/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stylelint 7.10
+// Type definitions for stylelint 7.11
 // Project: https://github.com/stylelint/stylelint
 // Definitions by: Alan Agius <https://github.com/alan-agius4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -17,6 +17,7 @@ export interface LinterOptions {
     cache?: boolean;
     cacheLocation?: string;
     files?: string | string[];
+    fix?: boolean;
     formatter?: FormatterType;
     ignoreDisables?: boolean;
     reportNeedlessDisables?: boolean;
diff --git a/types/stylelint/tslint.json b/types/stylelint/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stylelint/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/stylus/index.d.ts b/types/stylus/index.d.ts
index 47854aaf60..58a41872b1 100644
--- a/types/stylus/index.d.ts
+++ b/types/stylus/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stylus 0.48.1
+// Type definitions for stylus 0.48
 // Project: https://github.com/LearnBoost/stylus
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,6 @@ declare var stylus: Stylus.Static;
 export = stylus;
 
 declare namespace Stylus {
-
     export interface Static {
         /**
          * Return a new `Renderer` for the given `str` and `options`.
@@ -583,7 +582,7 @@ declare namespace Stylus {
         /**
          * Return param names for `fn`.
          */
-        params(fn: Function): string[];
+        params(fn: (...args: any[]) => any): string[];
 
         /**
          * Merge object `b` with `a`.
@@ -618,9 +617,7 @@ declare namespace Stylus {
         };
     }
 
-    export interface Middleware {
-        (req: any, res: any, next: Function): void;
-    }
+    export type Middleware = (req: any, res: any, next: (...args: any[]) => any) => void;
 
     //#endregion
 
@@ -664,7 +661,7 @@ declare namespace Stylus {
         /**
          * Set option `key` to `val`.
          */
-        set(key: string, val: any): Renderer;
+        set(key: string, val: any): this;
 
         /**
          * Get option `key`.
@@ -674,7 +671,7 @@ declare namespace Stylus {
         /**
          * Include the given `path` to the lookup paths array.
          */
-        include(path: string): Renderer;
+        include(path: string): this;
 
         /**
          * Use the given `fn`.
@@ -682,34 +679,34 @@ declare namespace Stylus {
          * This allows for plugins to alter the renderer in
          * any way they wish, exposing paths etc.
          */
-        use(fn: (renderer: Renderer) => any): Renderer;
+        use(fn: (renderer: Renderer) => any): this;
 
         /**
          * Define function or global var with the given `name`. Optionally
          * the function may accept full expressions, by setting `raw`
          * to `true`.
          */
-        define(name: string, fn: Function): Renderer;
-        define(name: string, node: Nodes.Node): Renderer;
-        define(name: string, val: any): Renderer;
-        define(name: string, fn: Function, raw: boolean): Renderer;
-        define(name: string, node: Nodes.Node, raw: boolean): Renderer;
-        define(name: string, val: any, raw: boolean): Renderer;
+        define(name: string, fn: (...args: any[]) => any): this;
+        define(name: string, node: Nodes.Node): this;
+        define(name: string, val: any): this;
+        define(name: string, fn: (...args: any[]) => any, raw: boolean): this;
+        define(name: string, node: Nodes.Node, raw: boolean): this;
+        define(name: string, val: any, raw: boolean): this;
 
         /**
          * Import the given `file`.
          */
-        import(file: string): Renderer;
+        import(file: string): this;
 
         //#region EventEmitter Members
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => any): this;
+        on(event: string, listener: (...args: any[]) => any): this;
+        once(event: string, listener: (...args: any[]) => any): this;
+        removeListener(event: string, listener: (...args: any[]) => any): this;
         removeAllListeners(event?: string): this;
         setMaxListeners(n: number): this;
         getMaxListeners(): number;
-        listeners(event: string): Function[];
+        listeners(event: string): Array<(...args: any[]) => any>;
         emit(event: string, ...args: any[]): boolean;
         listenerCount(type: string): number;
         //#endregion
@@ -720,7 +717,6 @@ declare namespace Stylus {
     //#region Nodes Classes
 
     export module Nodes {
-
         export class Node {
             lineno: number;
             column: number;
@@ -750,7 +746,8 @@ declare namespace Stylus {
             /**
              * Return true.
              */
-            toBoolean(): Boolean;
+            // tslint:disable-next-line no-unnecessary-qualifier
+            toBoolean(): Nodes.Boolean;
 
             /**
              * Return the expression, or wrap this node in an expression.
@@ -807,9 +804,7 @@ declare namespace Stylus {
             toJSON(): { val: string; quote: string; lineno: number; column: number; filename: string };
         }
 
-        export class Number extends Node {
-
-        }
+        export class Number extends Node { }
 
         export class Boolean extends Node {
             val: boolean;
@@ -822,12 +817,13 @@ declare namespace Stylus {
             /**
              * Negate the value.
              */
-            negate(): Boolean;
+            // tslint:disable-next-line no-unnecessary-qualifier
+            negate(): Nodes.Boolean;
 
             /**
              * Return 'Boolean'.
              */
-            inspect(): Boolean;
+            inspect(): string;
 
             /**
              * Return a JSON representation of this node.
@@ -844,7 +840,7 @@ declare namespace Stylus {
             /**
              * Set `key` to `val`.
              */
-            set(key: string, value: Node): Object;
+            set(key: string, value: Node): this;
 
             /**
              * Get `key`.
@@ -1420,9 +1416,7 @@ declare namespace Stylus {
         Evaluator?: typeof Evaluator;
     }
 
-    export interface RenderCallback {
-        (err: Error, css: string, js: string): void;
-    }
+    export type RenderCallback = (err: Error, css: string, js: string) => void;
 
     export interface UrlOptions {
         limit?: string;
diff --git a/types/stylus/stylus-tests.ts b/types/stylus/stylus-tests.ts
index 248b6a9a04..d92dcbc0c8 100644
--- a/types/stylus/stylus-tests.ts
+++ b/types/stylus/stylus-tests.ts
@@ -6,19 +6,19 @@
 
 import stylus = require("stylus");
 
-var str = "This is a stylus test";
+const str = "This is a stylus test";
 
 /**
  * Basic Usage
  */
-stylus.render(str, { filename: 'nesting.css' }, function(err, css){
+stylus.render(str, { filename: 'nesting.css' }, (err, css) => {
   if (err) throw err;
   console.log(css);
 });
 
 stylus(str)
     .set('filename', 'nesting.css')
-    .render(function (err, css) {
+    .render((err, css) => {
         // logic
     });
 
@@ -29,7 +29,7 @@ stylus(str)
 stylus(str)
     .set('filename', __dirname + '/test.styl')
     .set('paths', [__dirname, __dirname + '/mixins'])
-    .render(function (err, css) {
+    .render((err, css) => {
         // logic
     });
 
@@ -40,7 +40,7 @@ stylus(str)
 stylus(str)
     .include(require('nib').path)
     .include(process.env.HOME + '/mixins')
-    .render(function (err, css) {
+    .render((err, css) => {
         // logic
     });
 
@@ -51,7 +51,7 @@ stylus(str)
 stylus(str)
     .set('filename', __dirname + '/test.styl')
     .import('mixins/vendor')
-    .render(function (err, css) {
+    .render((err, css) => {
         if (err) throw err;
         console.log(css);
     });
@@ -72,11 +72,11 @@ stylus(str)
     .define('list', { foo: 'bar', bar: 'baz' })
     .define('families', ['Helvetica Neue', 'Helvetica', 'sans-serif'])
 
-    .define('get-list', function () {
+    .define('get-list', () => {
         return ['foo', 'bar', 'baz'];
     })
 
-    .render(function (err, css) {
+    .render((err, css) => {
         if (err) throw err;
         console.log(css);
     });
@@ -85,16 +85,16 @@ stylus(str)
  * .use(fn)
  * https://github.com/LearnBoost/stylus/blob/master/docs/js.md#usefn
  */
-var mylib = function (style: any) {
+const mylib = (style: any) => {
     style.define('number', 15.5);
-    style.define('get-list', function () {
+    style.define('get-list', () => {
         return ['foo', 'bar', 'baz'];
     });
 };
 
 stylus(str)
     .use(mylib)
-    .render(function (err, css) {
+    .render((err, css) => {
         if (err) throw err;
         console.log(css);
     });
diff --git a/types/stylus/tslint.json b/types/stylus/tslint.json
new file mode 100644
index 0000000000..ec84f4dd4a
--- /dev/null
+++ b/types/stylus/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-internal-module": false,
+        "no-var-requires": false,
+        "strict-export-declare-modifiers": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/succinct/tslint.json b/types/succinct/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/succinct/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/suitescript/tslint.json b/types/suitescript/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/suitescript/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sumo-logger/index.d.ts b/types/sumo-logger/index.d.ts
index 9ada2e9051..bc89e0eaa8 100644
--- a/types/sumo-logger/index.d.ts
+++ b/types/sumo-logger/index.d.ts
@@ -118,7 +118,8 @@ declare class SumoLogger {
      */
     log<T extends object>(event: Partial<SumoLogger.PerMessageOptions> & T): void;
 
-    /** Force any pending logs to be sent immediately. This is mainly for use in a
+    /**
+     * Force any pending logs to be sent immediately. This is mainly for use in a
      * logOut/`window.onBeforeUnload` flow to ensure that any remaining queued
      * messages are sent to Sumo Logic.
      */
diff --git a/types/supercluster/index.d.ts b/types/supercluster/index.d.ts
index 2954bb3763..7fd487ae09 100644
--- a/types/supercluster/index.d.ts
+++ b/types/supercluster/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mapbox/supercluster
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as GeoJSON from 'geojson';
 
@@ -32,6 +33,27 @@ export interface Options {
      * Whether timing info should be logged.
      */
     log?: boolean;
+    /**
+     * a reduce function for calculating custom cluster properties
+     *
+     * @example
+     * function (accumulated, props) { accumulated.sum += props.sum; }
+     */
+    reduce?: (accumulated: any, props: any) => void;
+    /**
+     * initial properties of a cluster (before running the reducer)
+     *
+     * @example
+     * function () { return {sum: 0}; }
+     */
+    initial?: () => any;
+    /**
+     * properties to use for individual points when running the reducer
+     *
+     * @example
+     * function (props) { return {sum: props.my_value}; }
+     */
+    map?: (props: any) => any;
 }
 
 export class Supercluster {
diff --git a/types/supercluster/supercluster-tests.ts b/types/supercluster/supercluster-tests.ts
index 2fe5eeff39..e3120206e9 100644
--- a/types/supercluster/supercluster-tests.ts
+++ b/types/supercluster/supercluster-tests.ts
@@ -2,21 +2,36 @@ import supercluster, { Point } from 'supercluster';
 
 const point1: Point = {
     type: 'Feature',
-    properties: {},
+    properties: {my_value: 2},
     geometry: { type: 'Point', coordinates: [10, 20] }
 };
 const point2: Point = {
     type: 'Feature',
-    properties: {},
+    properties: {my_value: 3},
     geometry: { type: 'Point', coordinates: [20, 30] }
 };
 const points = [point1, point2];
 
+const initialFunction = () => {
+  return {sum: 0};
+};
+
+const mapFunction = (props: any) => {
+  return {sum: props.my_value};
+};
+
+const reduceFunction = (accumulated: any, props: any) => {
+  accumulated.sum += props.sum;
+};
+
 const index = supercluster({
     radius: 40,
     maxZoom: 16,
     extent: 256,
-    log: true
+    log: true,
+    initial: initialFunction,
+    map: mapFunction,
+    reduce: reduceFunction,
 });
 index.load(points);
 const clusters = index.getClusters([-180, -85, 180, 85], 2);
diff --git a/types/supertest-as-promised/index.d.ts b/types/supertest-as-promised/index.d.ts
index 1f58455f16..f88c80eaba 100644
--- a/types/supertest-as-promised/index.d.ts
+++ b/types/supertest-as-promised/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/WhoopInc/supertest-as-promised
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as supertest from "supertest";
 import * as superagent from "superagent";
diff --git a/types/supertest/index.d.ts b/types/supertest/index.d.ts
index 6da2f54206..0716f9e1b5 100644
--- a/types/supertest/index.d.ts
+++ b/types/supertest/index.d.ts
@@ -32,7 +32,10 @@ declare namespace supertest {
       end(callback?: CallbackHandler): this;
     }
 
-    function agent(app?: any): SuperTest<Test>;
+    interface AgentOptions {
+      ca?: any;
+    }
+    function agent(app?: any, options?: AgentOptions): SuperTest<Test>;
 
     interface SuperTest<T extends superagent.SuperAgentRequest> extends superagent.SuperAgent<T> {
     }
diff --git a/types/supertest/supertest-tests.ts b/types/supertest/supertest-tests.ts
index 7241aac5c3..868aa8fdce 100644
--- a/types/supertest/supertest-tests.ts
+++ b/types/supertest/supertest-tests.ts
@@ -42,6 +42,11 @@ client
       });
   });
 
+// allow passing trusted CA as option to TestAgent
+supertest.agent(app, {
+  ca: 'test ca',
+});
+
 // functional expect
 (request
   .get('/') as supertest.Test)
diff --git a/types/supertest/tslint.json b/types/supertest/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/supertest/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/supports-color/tslint.json b/types/supports-color/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/supports-color/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/survey-knockout/index.d.ts b/types/survey-knockout/index.d.ts
deleted file mode 100644
index cb0f7776ac..0000000000
--- a/types/survey-knockout/index.d.ts
+++ /dev/null
@@ -1,1176 +0,0 @@
-// Type definitions for Survey JavaScript library v0.9.7
-// Project: http://surveyjs.org/
-// Definitions by: Andrew Telnov <https://github.com/andrewtelnov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module Survey {
-    interface HashTable<T> {
-        [key: string]: T;
-    }
-    interface ISurvey {
-        getValue(name: string): any;
-        setValue(name: string, newValue: any): any;
-        getComment(name: string): string;
-        setComment(name: string, newValue: string): any;
-        pageVisibilityChanged(page: IPage, newValue: boolean): any;
-        questionVisibilityChanged(question: IQuestion, newValue: boolean): any;
-        questionAdded(question: IQuestion, index: number): any;
-        questionRemoved(question: IQuestion): any;
-        validateQuestion(name: string): SurveyError;
-        processHtml(html: string): string;
-        processText(text: string): string;
-        isDesignMode: boolean;
-        requiredText: string;
-    }
-    interface IQuestion {
-        name: string;
-        visible: boolean;
-        hasTitle: boolean;
-        setVisibleIndex(value: number): any;
-        onSurveyValueChanged(newValue: any): any;
-    }
-    interface IPage {
-        visible: boolean;
-    }
-    class ItemValue {
-        static Separator: string;
-        static setData(items: Array<ItemValue>, values: Array<any>): void;
-        static getData(items: Array<ItemValue>): any;
-        private itemValue;
-        private itemText;
-        constructor(value: any, text?: string);
-        getType(): string;
-        value: any;
-        hasText: boolean;
-        text: string;
-    }
-    class Base {
-        getType(): string;
-    }
-    class SurveyError {
-        getText(): string;
-    }
-    class Event<T extends Function, Options> {
-        private callbacks;
-        isEmpty: boolean;
-        fire(sender: any, options: Options): void;
-        add(func: T): void;
-        remove(func: T): void;
-    }
-}
-
-declare module Survey {
-    class dxSurveyService {
-        static serviceUrl: string;
-        constructor();
-        loadSurvey(surveyId: string, onLoad: (success: boolean, result: string, response: any) => void): void;
-        sendResult(postId: string, result: JSON, onSendResult: (success: boolean, response: any) => void, clientId?: string, isPartialCompleted?: boolean): void;
-        getResult(resultId: string, name: string, onGetResult: (success: boolean, data: any, dataList: Array<any>, response: any) => void): void;
-        isCompleted(resultId: string, clientId: string, onIsCompleted: (success: boolean, result: string, response: any) => void): void;
-    }
-}
-
-declare module Survey {
-    var surveyLocalization: {
-        currentLocale: string;
-        locales: {};
-        getString: (strName: string) => any;
-        getLocales: () => string[];
-    };
-    var surveyStrings: {
-        pagePrevText: string;
-        pageNextText: string;
-        completeText: string;
-        otherItemText: string;
-        progressText: string;
-        emptySurvey: string;
-        completingSurvey: string;
-        loadingSurvey: string;
-        optionsCaption: string;
-        requiredError: string;
-        numericError: string;
-        textMinLength: string;
-        minSelectError: string;
-        maxSelectError: string;
-        numericMinMax: string;
-        numericMin: string;
-        numericMax: string;
-        invalidEmail: string;
-        otherRequiredError: string;
-    };
-}
-
-/// <reference path="base.d.ts" />
-/// <reference path="surveyStrings.d.ts" />
-declare module Survey {
-    class AnswerRequiredError extends SurveyError {
-        constructor();
-        getText(): string;
-    }
-    class RequreNumericError extends SurveyError {
-        constructor();
-        getText(): string;
-    }
-    class CustomError extends SurveyError {
-        private text;
-        constructor(text: string);
-        getText(): string;
-    }
-}
-
-/// <reference path="base.d.ts" />
-declare module Survey {
-    class JsonObjectProperty {
-        name: string;
-        private typeValue;
-        private choicesValue;
-        private choicesfunc;
-        className: string;
-        classNamePart: string;
-        baseClassName: string;
-        defaultValue: any;
-        onGetValue: (obj: any) => any;
-        onSetValue: (obj: any, value: any, jsonConv: JsonObject) => any;
-        constructor(name: string);
-        type: string;
-        hasToUseGetValue: (obj: any) => any;
-        isDefaultValue(value: any): boolean;
-        getValue(obj: any): any;
-        hasToUseSetValue: (obj: any, value: any, jsonConv: JsonObject) => any;
-        setValue(obj: any, value: any, jsonConv: JsonObject): void;
-        getObjType(objType: string): string;
-        getClassName(className: string): string;
-        choices: Array<any>;
-        setChoices(value: Array<any>, valueFunc: () => Array<any>): void;
-    }
-    class JsonMetadataClass {
-        name: string;
-        creator: () => any;
-        parentName: string;
-        static requiredSymbol: string;
-        static typeSymbol: string;
-        properties: Array<JsonObjectProperty>;
-        requiredProperties: Array<string>;
-        constructor(name: string, propertiesNames: Array<string>, creator?: () => any, parentName?: string);
-        find(name: string): JsonObjectProperty;
-        private getPropertyName(propertyName);
-    }
-    class JsonMetadata {
-        private classes;
-        private childrenClasses;
-        private classProperties;
-        private classRequiredProperties;
-        addClass(name: string, propertiesNames: Array<string>, creator?: () => any, parentName?: string): JsonMetadataClass;
-        overrideClassCreatore(name: string, creator: () => any): void;
-        setPropertyValues(name: string, propertyName: string, propertyClassName: string, defaultValue?: any, onGetValue?: (obj: any) => any, onSetValue?: (obj: any, value: any, jsonConv: JsonObject) => any): void;
-        setPropertyChoices(name: string, propertyName: string, choices: Array<any>, choicesFunc?: () => Array<any>): void;
-        setPropertyClassInfo(name: string, propertyName: string, baseClassName: string, classNamePart?: string): void;
-        getProperties(name: string): Array<JsonObjectProperty>;
-        createClass(name: string): any;
-        getChildrenClasses(name: string, canBeCreated?: boolean): Array<JsonMetadataClass>;
-        getRequiredProperties(name: string): Array<string>;
-        private fillChildrenClasses(name, canBeCreated, result);
-        private findClass(name);
-        private findProperty(name, propertyName);
-        private fillProperties(name, list);
-        private addProperty(property, list, endIndex);
-        private fillRequiredProperties(name, list);
-    }
-    class JsonError {
-        type: string;
-        message: string;
-        description: string;
-        at: Number;
-        constructor(type: string, message: string);
-        getFullDescription(): string;
-    }
-    class JsonUnknownPropertyError extends JsonError {
-        propertyName: string;
-        className: string;
-        constructor(propertyName: string, className: string);
-    }
-    class JsonMissingTypeErrorBase extends JsonError {
-        baseClassName: string;
-        type: string;
-        message: string;
-        constructor(baseClassName: string, type: string, message: string);
-    }
-    class JsonMissingTypeError extends JsonMissingTypeErrorBase {
-        propertyName: string;
-        baseClassName: string;
-        constructor(propertyName: string, baseClassName: string);
-    }
-    class JsonIncorrectTypeError extends JsonMissingTypeErrorBase {
-        propertyName: string;
-        baseClassName: string;
-        constructor(propertyName: string, baseClassName: string);
-    }
-    class JsonRequiredPropertyError extends JsonError {
-        propertyName: string;
-        className: string;
-        constructor(propertyName: string, className: string);
-    }
-    class JsonObject {
-        private static typePropertyName;
-        private static positionPropertyName;
-        private static metaDataValue;
-        static metaData: JsonMetadata;
-        errors: JsonError[];
-        toJsonObject(obj: any): any;
-        toObject(jsonObj: any, obj: any): void;
-        protected toJsonObjectCore(obj: any, property: JsonObjectProperty): any;
-        protected valueToJson(obj: any, result: any, property: JsonObjectProperty): void;
-        protected valueToObj(value: any, obj: any, key: any, property: JsonObjectProperty): void;
-        private isValueArray(value);
-        private createNewObj(value, property);
-        private checkNewObjectOnErrors(newObj, value, property, className);
-        private addNewError(error, jsonObj);
-        private valueToArray(value, obj, key, property);
-        private findProperty(properties, key);
-    }
-}
-
-/// <reference path="base.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionBase extends Base implements IQuestion {
-        name: string;
-        protected data: ISurvey;
-        private visibleValue;
-        private visibleIndexValue;
-        width: string;
-        visibilityChangedCallback: () => void;
-        visibleIndexChangedCallback: () => void;
-        constructor(name: string);
-        visible: boolean;
-        visibleIndex: number;
-        hasErrors(): boolean;
-        hasTitle: boolean;
-        hasComment: boolean;
-        setData(newValue: ISurvey): void;
-        protected fireCallback(callback: () => void): void;
-        protected onSetData(): void;
-        protected onCreating(): void;
-        onSurveyValueChanged(newValue: any): void;
-        setVisibleIndex(value: number): void;
-    }
-}
-
-/// <reference path="questionbase.d.ts" />
-/// <reference path="base.d.ts" />
-declare module Survey {
-    class QuestionFactory {
-        static Instance: QuestionFactory;
-        static DefaultChoices: (string | {
-            value: number;
-            text: string;
-        })[];
-        private creatorHash;
-        registerQuestion(questionType: string, questionCreator: (name: string) => QuestionBase): void;
-        getAllTypes(): Array<string>;
-        createQuestion(questionType: string, name: string): QuestionBase;
-    }
-}
-
-/// <reference path="questionbase.d.ts" />
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class PageModel extends Base implements IPage {
-        name: string;
-        questions: Array<QuestionBase>;
-        data: ISurvey;
-        title: string;
-        visibleIndex: number;
-        private numValue;
-        private visibleValue;
-        constructor(name?: string);
-        processedTitle: string;
-        num: number;
-        visible: boolean;
-        getType(): string;
-        isVisible: boolean;
-        addQuestion(question: QuestionBase, index?: number): void;
-        addNewQuestion(questionType: string, name: string): QuestionBase;
-        removeQuestion(question: QuestionBase): void;
-        hasErrors(): boolean;
-        addQuestionsToList(list: Array<IQuestion>, visibleOnly?: boolean): void;
-        protected onNumChanged(value: number): void;
-    }
-}
-
-/// <reference path="base.d.ts" />
-/// <reference path="error.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class ValidatorResult {
-        value: any;
-        error: SurveyError;
-        constructor(value: any, error?: SurveyError);
-    }
-    class SurveyValidator extends Base {
-        text: string;
-        constructor();
-        protected getErrorText(name: string): string;
-        protected getDefaultErrorText(name: string): string;
-        validate(value: any, name?: string): ValidatorResult;
-    }
-    interface IValidatorOwner {
-        validators: Array<SurveyValidator>;
-        value: any;
-        getValidatorTitle(): string;
-    }
-    class ValidatorRunner {
-        run(owner: IValidatorOwner): SurveyError;
-    }
-    class NumericValidator extends SurveyValidator {
-        minValue: number;
-        maxValue: number;
-        constructor(minValue?: number, maxValue?: number);
-        getType(): string;
-        validate(value: any, name?: string): ValidatorResult;
-        protected getDefaultErrorText(name: string): any;
-        private isNumber(value);
-    }
-    class TextValidator extends SurveyValidator {
-        minLength: number;
-        constructor(minLength?: number);
-        getType(): string;
-        validate(value: any, name?: string): ValidatorResult;
-        protected getDefaultErrorText(name: string): any;
-    }
-    class AnswerCountValidator extends SurveyValidator {
-        minCount: number;
-        maxCount: number;
-        constructor(minCount?: number, maxCount?: number);
-        getType(): string;
-        validate(value: any, name?: string): ValidatorResult;
-        protected getDefaultErrorText(name: string): string;
-    }
-    class RegexValidator extends SurveyValidator {
-        regex: string;
-        constructor(regex?: string);
-        getType(): string;
-        validate(value: any, name?: string): ValidatorResult;
-    }
-    class EmailValidator extends SurveyValidator {
-        private re;
-        constructor();
-        getType(): string;
-        validate(value: any, name?: string): ValidatorResult;
-        protected getDefaultErrorText(name: string): any;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="error.d.ts" />
-/// <reference path="validator.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-/// <reference path="questionbase.d.ts" />
-declare module Survey {
-    class Question extends QuestionBase implements IValidatorOwner {
-        name: string;
-        private titleValue;
-        private questionValue;
-        private isRequiredValue;
-        private hasCommentValue;
-        private hasOtherValue;
-        errors: Array<SurveyError>;
-        validators: Array<SurveyValidator>;
-        valueChangedCallback: () => void;
-        commentChangedCallback: () => void;
-        errorsChangedCallback: () => void;
-        constructor(name: string);
-        hasTitle: boolean;
-        title: string;
-        processedTitle: string;
-        supportComment(): boolean;
-        supportOther(): boolean;
-        isRequired: boolean;
-        hasComment: boolean;
-        hasOther: boolean;
-        protected onSetData(): void;
-        value: any;
-        comment: string;
-        isEmpty(): boolean;
-        hasErrors(): boolean;
-        requiredText: string;
-        private checkForErrors();
-        protected onCheckForErrors(errors: Array<SurveyError>): void;
-        protected runValidators(): SurveyError;
-        private isValueChangedInSurvey;
-        protected setNewValue(newValue: any): void;
-        protected onValueChanged(): void;
-        private setNewComment(newValue);
-        onSurveyValueChanged(newValue: any): void;
-        getValidatorTitle(): string;
-    }
-}
-
-/// <reference path="jsonobject.d.ts" />
-/// <reference path="surveyStrings.d.ts" />
-declare module Survey {
-    class QuestionSelectBase extends Question {
-        otherItem: ItemValue;
-        choicesValues: Array<ItemValue>;
-        otherErrorText: string;
-        choicesOrderValue: string;
-        constructor(name: string);
-        isOtherSelected: boolean;
-        choices: Array<any>;
-        choicesOrder: string;
-        otherText: string;
-        visibleChoices: Array<ItemValue>;
-        supportComment(): boolean;
-        supportOther(): boolean;
-        protected onCheckForErrors(errors: Array<SurveyError>): void;
-        sortVisibleChoices(array: Array<ItemValue>): Array<ItemValue>;
-        sortArray(array: Array<ItemValue>, mult: number): Array<ItemValue>;
-        randomizeArray(array: Array<ItemValue>): Array<ItemValue>;
-    }
-    class QuestionCheckboxBase extends QuestionSelectBase {
-        name: string;
-        private colCountValue;
-        colCountChangedCallback: () => void;
-        constructor(name: string);
-        colCount: number;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionCheckboxModel extends QuestionCheckboxBase {
-        name: string;
-        constructor(name: string);
-        isOtherSelected: boolean;
-        getType(): string;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionCommentModel extends Question {
-        name: string;
-        rows: number;
-        cols: number;
-        constructor(name: string);
-        getType(): string;
-        isEmpty(): boolean;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionDropdownModel extends QuestionSelectBase {
-        name: string;
-        private optionsCaptionValue;
-        constructor(name: string);
-        optionsCaption: string;
-        getType(): string;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionHtmlModel extends QuestionBase {
-        name: string;
-        private htmlValue;
-        constructor(name: string);
-        getType(): string;
-        html: string;
-        processedHtml: string;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    interface IMatrixData {
-        onMatrixRowChanged(row: MatrixRowModel): any;
-    }
-    class MatrixRowModel extends Base {
-        name: any;
-        text: string;
-        fullName: string;
-        private data;
-        protected rowValue: any;
-        constructor(name: any, text: string, fullName: string, data: IMatrixData, value: any);
-        value: any;
-        protected onValueChanged(): void;
-    }
-    class QuestionMatrixModel extends Question implements IMatrixData {
-        name: string;
-        private columnsValue;
-        private rowsValue;
-        private isRowChanging;
-        private generatedVisibleRows;
-        constructor(name: string);
-        getType(): string;
-        hasRows: boolean;
-        columns: Array<any>;
-        rows: Array<any>;
-        visibleRows: Array<MatrixRowModel>;
-        protected createMatrixRow(name: any, text: string, fullName: string, value: any): MatrixRowModel;
-        protected onValueChanged(): void;
-        onMatrixRowChanged(row: MatrixRowModel): void;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionRadiogroupModel extends QuestionCheckboxBase {
-        name: string;
-        constructor(name: string);
-        getType(): string;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionTextModel extends Question {
-        name: string;
-        size: number;
-        constructor(name: string);
-        getType(): string;
-        isEmpty(): boolean;
-    }
-}
-
-/// <reference path="question.d.ts" />
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-/// <reference path="question_dropdown.d.ts" />
-/// <reference path="question_checkbox.d.ts" />
-/// <reference path="question_radiogroup.d.ts" />
-/// <reference path="question_text.d.ts" />
-/// <reference path="question_comment.d.ts" />
-declare module Survey {
-    interface IMatrixDropdownData {
-        onCellChanged(cell: MatrixDropdownCellModel): any;
-        columns: Array<MatrixDropdownColumn>;
-        choices: Array<any>;
-        optionsCaption: string;
-    }
-    class MatrixDropdownColumn extends Base {
-        name: string;
-        private choicesValue;
-        private titleValue;
-        optionsCaption: string;
-        private cellTypeValue;
-        private colCountValue;
-        constructor(name: string, title?: string);
-        getType(): string;
-        title: string;
-        choices: Array<any>;
-        cellType: string;
-        colCount: number;
-    }
-    class MatrixDropdownCellModel {
-        column: MatrixDropdownColumn;
-        row: MatrixDropdownRowModel;
-        private data;
-        private questionValue;
-        constructor(column: MatrixDropdownColumn, row: MatrixDropdownRowModel, data: IMatrixDropdownData, value: any);
-        choices: Array<any>;
-        optionsCaption: string;
-        question: Question;
-        value: any;
-        protected onValueChanged(): void;
-        protected createQuestion(): Question;
-        protected createDropdown(name: string): QuestionDropdownModel;
-        protected createCheckbox(name: string): QuestionCheckboxModel;
-        protected createRadiogroup(name: string): QuestionRadiogroupModel;
-        protected createText(name: string): QuestionTextModel;
-        protected createComment(name: string): QuestionCommentModel;
-        protected createDropdownCore(name: string): QuestionDropdownModel;
-        protected createCheckboxCore(name: string): QuestionCheckboxModel;
-        protected createRadiogroupCore(name: string): QuestionRadiogroupModel;
-        protected getQuestionName(): string;
-    }
-    class MatrixDropdownRowModel {
-        name: any;
-        text: string;
-        protected data: IMatrixDropdownData;
-        protected rowValue: any;
-        cells: Array<MatrixDropdownCellModel>;
-        constructor(name: any, text: string, data: IMatrixDropdownData, value: any);
-        value: any;
-        private buildCells();
-        protected createCell(column: MatrixDropdownColumn, value: any): MatrixDropdownCellModel;
-        protected getCellValue(column: MatrixDropdownColumn): any;
-    }
-    class QuestionMatrixDropdownModel extends Question implements IMatrixDropdownData {
-        name: string;
-        private columnsValue;
-        private rowsValue;
-        private choicesValue;
-        private optionsCaptionValue;
-        private isRowChanging;
-        private generatedVisibleRows;
-        constructor(name: string);
-        getType(): string;
-        columns: Array<MatrixDropdownColumn>;
-        rows: Array<any>;
-        choices: Array<any>;
-        optionsCaption: string;
-        addColumn(name: string, title?: string): MatrixDropdownColumn;
-        visibleRows: Array<MatrixDropdownRowModel>;
-        protected createMatrixRow(name: any, text: string, value: any): MatrixDropdownRowModel;
-        protected onValueChanged(): void;
-        onCellChanged(cell: MatrixDropdownCellModel): void;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    interface IMultipleTextData {
-        getMultipleTextValue(name: string): any;
-        setMultipleTextValue(name: string, value: any): any;
-    }
-    class MultipleTextItemModel extends Base implements IValidatorOwner {
-        name: any;
-        private data;
-        private titleValue;
-        validators: Array<SurveyValidator>;
-        constructor(name?: any, title?: string);
-        getType(): string;
-        setData(data: IMultipleTextData): void;
-        title: string;
-        value: any;
-        onValueChanged(newValue: any): void;
-        getValidatorTitle(): string;
-    }
-    class QuestionMultipleTextModel extends Question implements IMultipleTextData {
-        name: string;
-        private colCountValue;
-        colCountChangedCallback: () => void;
-        itemSize: number;
-        private itemsValues;
-        constructor(name: string);
-        getType(): string;
-        items: Array<MultipleTextItemModel>;
-        AddItem(name: string, title?: string): MultipleTextItemModel;
-        colCount: number;
-        getRows(): Array<any>;
-        private isMultipleItemValueChanging;
-        protected onValueChanged(): void;
-        protected createTextItem(name: string, title: string): MultipleTextItemModel;
-        protected onItemValueChanged(): void;
-        protected runValidators(): SurveyError;
-        getMultipleTextValue(name: string): any;
-        setMultipleTextValue(name: string, value: any): void;
-    }
-}
-
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class QuestionRatingModel extends Question {
-        name: string;
-        static defaultRateValues: ItemValue[];
-        private rates;
-        mininumRateDescription: string;
-        maximumRateDescription: string;
-        rateValuesChangedCallback: () => void;
-        constructor(name: string);
-        rateValues: Array<any>;
-        visibleRateValues: ItemValue[];
-        getType(): string;
-        supportComment(): boolean;
-        supportOther(): boolean;
-    }
-}
-
-/// <reference path="base.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-declare module Survey {
-    class Trigger extends Base {
-        static operatorsValue: HashTable<Function>;
-        static operators: HashTable<Function>;
-        private opValue;
-        value: any;
-        constructor();
-        operator: string;
-        check(value: any): void;
-        protected onSuccess(): void;
-        protected onFailure(): void;
-    }
-    interface ISurveyTriggerOwner {
-        getObjects(pages: string[], questions: string[]): any[];
-        doComplete(): any;
-        setTriggerValue(name: string, value: any, isVariable: boolean): any;
-    }
-    class SurveyTrigger extends Trigger {
-        name: string;
-        protected owner: ISurveyTriggerOwner;
-        constructor();
-        setOwner(owner: ISurveyTriggerOwner): void;
-        isOnNextPage: boolean;
-    }
-    class SurveyTriggerVisible extends SurveyTrigger {
-        pages: string[];
-        questions: string[];
-        constructor();
-        getType(): string;
-        protected onSuccess(): void;
-        protected onFailure(): void;
-        private onTrigger(func);
-        protected onItemSuccess(item: any): void;
-        protected onItemFailure(item: any): void;
-    }
-    class SurveyTriggerComplete extends SurveyTrigger {
-        constructor();
-        getType(): string;
-        isOnNextPage: boolean;
-        protected onSuccess(): void;
-    }
-    class SurveyTriggerSetValue extends SurveyTrigger {
-        setToName: string;
-        setValue: any;
-        isVariable: boolean;
-        constructor();
-        getType(): string;
-        protected onSuccess(): void;
-    }
-}
-
-declare module Survey {
-    class TextPreProcessor {
-        onProcess: (name: string) => any;
-        onHasValue: (name: string) => boolean;
-        constructor();
-        process(text: string): string;
-        private getItems(text);
-        private getName(name);
-        private canProcessName(name);
-    }
-}
-
-/// <reference path="base.d.ts" />
-/// <reference path="page.d.ts" />
-/// <reference path="trigger.d.ts" />
-/// <reference path="jsonobject.d.ts" />
-/// <reference path="dxSurveyService.d.ts" />
-/// <reference path="textPreProcessor.d.ts" />
-declare module Survey {
-    class SurveyModel extends Base implements ISurvey, ISurveyTriggerOwner {
-        surveyId: string;
-        surveyPostId: string;
-        clientId: string;
-        cookieName: string;
-        sendResultOnPageNext: boolean;
-        commentPrefix: string;
-        title: string;
-        showNavigationButtons: boolean;
-        showTitle: boolean;
-        showPageTitles: boolean;
-        completedHtml: string;
-        requiredText: string;
-        showProgressBar: string;
-        pages: Array<PageModel>;
-        triggers: Array<SurveyTrigger>;
-        private currentPageValue;
-        private valuesHash;
-        private variablesHash;
-        private pagePrevTextValue;
-        private pageNextTextValue;
-        private completeTextValue;
-        private showPageNumbersValue;
-        private showQuestionNumbersValue;
-        private localeValue;
-        private isCompleted;
-        private isLoading;
-        private processedTextValues;
-        private textPreProcessor;
-        onComplete: Event<(sender: SurveyModel) => any, any>;
-        onCurrentPageChanged: Event<(sender: SurveyModel, options: any) => any, any>;
-        onValueChanged: Event<(sender: SurveyModel, options: any) => any, any>;
-        onVisibleChanged: Event<(sender: SurveyModel, options: any) => any, any>;
-        onPageVisibleChanged: Event<(sender: SurveyModel, options: any) => any, any>;
-        onQuestionAdded: Event<(sender: SurveyModel, options: any) => any, any>;
-        onQuestionRemoved: Event<(sender: SurveyModel, options: any) => any, any>;
-        onValidateQuestion: Event<(sender: SurveyModel, options: any) => any, any>;
-        onProcessHtml: Event<(sender: SurveyModel, options: any) => any, any>;
-        onSendResult: Event<(sender: SurveyModel, options: any) => any, any>;
-        onGetResult: Event<(sender: SurveyModel, options: any) => any, any>;
-        jsonErrors: Array<JsonError>;
-        mode: string;
-        constructor(jsonObj?: any);
-        getType(): string;
-        locale: string;
-        getLocString(str: string): any;
-        emptySurveyText: string;
-        pagePrevText: string;
-        pageNextText: string;
-        completeText: string;
-        showPageNumbers: boolean;
-        showQuestionNumbers: string;
-        data: any;
-        comments: any;
-        visiblePages: Array<PageModel>;
-        isEmpty: boolean;
-        PageCount: number;
-        visiblePageCount: number;
-        currentPage: PageModel;
-        state: string;
-        clear(): void;
-        protected mergeValues(src: any, dest: any): void;
-        protected currentPageChanged(newValue: PageModel, oldValue: PageModel): void;
-        getProgress(): number;
-        isDesignMode: boolean;
-        hasCookie: boolean;
-        setCookie(): void;
-        deleteCookie(): void;
-        nextPage(): boolean;
-        isCurrentPageHasErrors: boolean;
-        prevPage(): boolean;
-        completeLastPage(): boolean;
-        isFirstPage: boolean;
-        isLastPage: boolean;
-        doComplete(): void;
-        protected setCompleted(): void;
-        processedCompletedHtml: string;
-        processedLoadingHtml: string;
-        progressText: string;
-        getPage(index: number): PageModel;
-        addPage(page: PageModel): void;
-        addNewPage(name: string): PageModel;
-        removePage(page: PageModel): void;
-        getQuestionByName(name: string, caseInsensitive?: boolean): IQuestion;
-        getQuestionsByNames(names: string[], caseInsensitive?: boolean): IQuestion[];
-        getPageByQuestion(question: IQuestion): PageModel;
-        getPageByName(name: string): PageModel;
-        getPagesByNames(names: string[]): PageModel[];
-        getAllQuestions(visibleOnly?: boolean): Array<IQuestion>;
-        protected createNewPage(name: string): PageModel;
-        private notifyQuestionOnValueChanged(name, newValue);
-        private notifyAllQuestionsOnValueChanged();
-        protected doSurveyValueChanged(question: IQuestion, newValue: any): void;
-        private checkOnPageTriggers();
-        private checkTriggers(name, newValue, isOnNextPage);
-        sendResult(postId?: string, clientId?: string, isPartialCompleted?: boolean): void;
-        getResult(resultId: string, name: string): void;
-        loadSurveyFromService(surveyId?: string): void;
-        protected onLoadingSurveyFromService(): void;
-        protected onLoadSurveyFromService(): void;
-        private updateVisibleIndexes();
-        private updatePageVisibleIndexes(showIndex);
-        private updateQuestionVisibleIndexes(questions, showIndex);
-        private setJsonObject(jsonObj);
-        protected onBeforeCreating(): void;
-        protected onCreating(): void;
-        private updateProcessedTextValues();
-        private addQuestionToProcessedTextValues(question);
-        private getProcessedTextValue(name);
-        getVariable(name: string): any;
-        setVariable(name: string, newValue: any): void;
-        getValue(name: string): any;
-        setValue(name: string, newValue: any): void;
-        getComment(name: string): string;
-        setComment(name: string, newValue: string): void;
-        questionVisibilityChanged(question: IQuestion, newValue: boolean): void;
-        pageVisibilityChanged(page: IPage, newValue: boolean): void;
-        questionAdded(question: IQuestion, index: number): void;
-        questionRemoved(question: IQuestion): void;
-        validateQuestion(name: string): SurveyError;
-        processHtml(html: string): string;
-        processText(text: string): string;
-        getObjects(pages: string[], questions: string[]): any[];
-        setTriggerValue(name: string, value: any, isVariable: boolean): void;
-    }
-}
-
-declare module Survey {
-    class SurveyWindowModel extends Base {
-        static surveyElementName: string;
-        surveyValue: SurveyModel;
-        windowElement: HTMLDivElement;
-        isShowingValue: boolean;
-        isExpandedValue: boolean;
-        titleValue: string;
-        templateValue: string;
-        constructor(jsonObj: any);
-        getType(): string;
-        survey: SurveyModel;
-        isShowing: boolean;
-        isExpanded: boolean;
-        title: string;
-        expand(): void;
-        collapse(): void;
-        protected createSurvey(jsonObj: any): SurveyModel;
-        protected expandcollapse(value: boolean): void;
-    }
-}
-
-declare module Survey {
-}
-
-declare module Survey {
-}
-
-declare module Survey {
-}
-
-declare module Survey {
-    class Page extends PageModel {
-        koNo: any;
-        constructor(name?: string);
-        protected onCreating(): void;
-        protected onNumChanged(value: number): void;
-    }
-}
-
-declare module Survey {
-    class QuestionImplementorBase {
-        question: QuestionBase;
-        koVisible: any;
-        koNo: any;
-        koErrors: any;
-        constructor(question: QuestionBase);
-        protected onVisibilityChanged(): void;
-        protected onVisibleIndexChanged(): void;
-        protected getNo(): string;
-    }
-}
-
-declare module Survey {
-    class QuestionImplementor extends QuestionImplementorBase {
-        question: Question;
-        private isUpdating;
-        koValue: any;
-        koComment: any;
-        constructor(question: Question);
-        protected onValueChanged(): void;
-        protected onCommentChanged(): void;
-        protected onVisibilityChanged(): void;
-        protected onVisibleIndexChanged(): void;
-        protected onErrorsChanged(): void;
-        protected createkoValue(): any;
-        protected setkoValue(newValue: any): void;
-        protected updateValue(newValue: any): void;
-        protected updateComment(newValue: any): void;
-        protected getNo(): string;
-    }
-}
-
-/// <reference path="koquestion.d.ts" />
-declare module Survey {
-    class QuestionSelectBaseImplementor extends QuestionImplementor {
-        koOtherVisible: any;
-        constructor(question: Question);
-        protected isOtherSelected: boolean;
-    }
-    class QuestionCheckboxBaseImplementor extends QuestionSelectBaseImplementor {
-        koWidth: any;
-        constructor(question: Question);
-        protected onColCountChanged(): void;
-        protected colWidth: string;
-        private koAfterRender(el, con);
-    }
-}
-
-declare module Survey {
-    class QuestionCheckbox extends QuestionCheckboxModel {
-        name: string;
-        constructor(name: string);
-    }
-}
-
-declare module Survey {
-    class QuestionComment extends QuestionCommentModel {
-        name: string;
-        constructor(name: string);
-    }
-}
-
-declare module Survey {
-    class QuestionDropdown extends QuestionDropdownModel {
-        name: string;
-        constructor(name: string);
-    }
-}
-
-declare module Survey {
-    class QuestionHtml extends QuestionHtmlModel {
-        name: string;
-        constructor(name: string);
-    }
-}
-
-declare module Survey {
-    class MatrixRow extends MatrixRowModel {
-        name: any;
-        text: string;
-        fullName: string;
-        private isValueUpdating;
-        koValue: any;
-        constructor(name: any, text: string, fullName: string, data: IMatrixData, value: any);
-        protected onValueChanged(): void;
-    }
-    class QuestionMatrix extends QuestionMatrixModel {
-        name: string;
-        constructor(name: string);
-        protected createMatrixRow(name: any, text: string, fullName: string, value: any): MatrixRowModel;
-    }
-}
-
-declare module Survey {
-    class QuestionRadiogroup extends QuestionRadiogroupModel {
-        name: string;
-        constructor(name: string);
-    }
-}
-
-declare module Survey {
-    class QuestionText extends QuestionTextModel {
-        name: string;
-        constructor(name: string);
-    }
-}
-
-declare module Survey {
-    class MatrixDropdownCell extends MatrixDropdownCellModel {
-        column: MatrixDropdownColumn;
-        row: MatrixDropdownRowModel;
-        constructor(column: MatrixDropdownColumn, row: MatrixDropdownRowModel, data: IMatrixDropdownData, value: any);
-        protected createText(name: string): QuestionTextModel;
-        protected createComment(name: string): QuestionCommentModel;
-        protected createDropdownCore(name: string): QuestionDropdownModel;
-        protected createCheckboxCore(name: string): QuestionCheckboxModel;
-        protected createRadiogroupCore(name: string): QuestionRadiogroupModel;
-    }
-    class MatrixDropdownRow extends MatrixDropdownRowModel {
-        name: any;
-        text: string;
-        constructor(name: any, text: string, data: IMatrixDropdownData, value: any);
-        protected createCell(column: MatrixDropdownColumn, value: any): MatrixDropdownCellModel;
-    }
-    class QuestionMatrixDropdown extends QuestionMatrixDropdownModel {
-        name: string;
-        constructor(name: string);
-        protected createMatrixRow(name: any, text: string, value: any): MatrixDropdownRowModel;
-    }
-}
-
-declare module Survey {
-    class MultipleTextItem extends MultipleTextItemModel {
-        name: any;
-        private isKOValueUpdating;
-        koValue: any;
-        constructor(name?: any, title?: string);
-        onValueChanged(newValue: any): void;
-    }
-    class QuestionMultipleTextImplementor extends QuestionImplementor {
-        koRows: any;
-        constructor(question: Question);
-        protected onColCountChanged(): void;
-    }
-    class QuestionMultipleText extends QuestionMultipleTextModel {
-        name: string;
-        constructor(name: string);
-        protected createTextItem(name: string, title: string): MultipleTextItemModel;
-    }
-}
-
-declare module Survey {
-    class QuestionRating extends QuestionRatingModel {
-        name: string;
-        itemCss: string;
-        constructor(name: string);
-        protected onSetData(): void;
-    }
-}
-
-declare module Survey {
-    class SurveyBase extends SurveyModel {
-        private renderedElement;
-        private cssValue;
-        onRendered: Event<(sender: SurveyModel) => any, any>;
-        koCurrentPage: any;
-        koIsFirstPage: any;
-        koIsLastPage: any;
-        dummyObservable: any;
-        koState: any;
-        koProgress: any;
-        koProgressText: any;
-        constructor(jsonObj?: any, renderedElement?: any, css?: any);
-        css: any;
-        render(element?: any): void;
-        loadSurveyFromService(surveyId?: string, renderedElement?: any): void;
-        protected setCompleted(): void;
-        protected createNewPage(name: string): Page;
-        protected createCssObject(): any;
-        protected getTemplate(): string;
-        protected onBeforeCreating(): void;
-        protected currentPageChanged(newValue: PageModel, oldValue: PageModel): void;
-        protected onLoadSurveyFromService(): void;
-        protected onLoadingSurveyFromService(): void;
-        private applyBinding();
-        private updateKoCurrentPage();
-    }
-}
-
-declare module Survey {
-    class SurveyWindowBase extends SurveyWindowModel {
-        koExpanded: any;
-        doExpand: any;
-        constructor(jsonObj: any);
-        protected createSurvey(jsonObj: any): SurveyModel;
-        protected expandcollapse(value: boolean): void;
-        protected template: string;
-        show(): void;
-        protected getDefaultTemplate(): string;
-        hide(): void;
-        private changeExpanded();
-        private onComplete();
-    }
-}
-
-declare module Survey {
-    class SurveyTemplateTextBase {
-        constructor();
-        replaceText(replaceText: string, id: string, questionType?: string): void;
-        protected getId(id: string, questionType: string): string;
-        protected text: string;
-    }
-}
-
-declare module template.ko {
-    var html: string;
-}
-
-declare module Survey {
-    class Survey extends SurveyBase {
-        constructor(jsonObj?: any, renderedElement?: any, css?: any);
-        protected getTemplate(): string;
-        protected createCssObject(): any;
-    }
-}
-
-declare module Survey {
-    class SurveyWindow extends SurveyWindowBase {
-        koExpanded: any;
-        doExpand: any;
-        constructor(jsonObj: any);
-        protected createSurvey(jsonObj: any): SurveyModel;
-        protected getDefaultTemplate(): string;
-    }
-}
-
-declare module template.window.ko {
-    var html: string;
-}
-
-
-declare module Survey {
-    class SurveyTemplateText extends SurveyTemplateTextBase {
-        protected text: string;
-    }
-}
diff --git a/types/survey-knockout/survey-knockout-tests.ts b/types/survey-knockout/survey-knockout-tests.ts
deleted file mode 100644
index e658b88002..0000000000
--- a/types/survey-knockout/survey-knockout-tests.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-
-                     
-function createFromCodeTests() {
-    var survey = new Survey.SurveyModel();
-    var page = survey.addNewPage("Page 1");
-    page.addNewQuestion("text", "question1");
-    page.addNewQuestion("comment", "question2");
-    page = survey.addNewPage("Page 2");
-    page.addNewQuestion("matrix", "question3");
-    page.addNewQuestion("matrixdropdown", "question4");
-    return survey;
-}
-function createFromJSONTests() {
-    var survey = new Survey.SurveyModel({
-        pages: [{
-            "name": "page1",
-            "questions": [{ "type": "text", "name": "textQuestion", "isRequired": "true" }, { "type": "checkbox", "name": "checkboxQuestion", "isRequired": "true", "choices": ["red", "white"] }]
-        }]
-    });
-    survey.setValue("textQuestion", "newValue");
-    return survey;
-}
diff --git a/types/survey-knockout/tsconfig.json b/types/survey-knockout/tsconfig.json
deleted file mode 100644
index 362b411778..0000000000
--- a/types/survey-knockout/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "survey-knockout-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/svg-injector/tslint.json b/types/svg-injector/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/svg-injector/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/svg-pan-zoom/index.d.ts b/types/svg-pan-zoom/index.d.ts
deleted file mode 100644
index aacf5a5d0a..0000000000
--- a/types/svg-pan-zoom/index.d.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-// Type definitions for svg-pan-zoom v3.3.0
-// Project: https://github.com/ariutta/svg-pan-zoom
-// Definitions by: César Vidril <https://github.com/Yimiprod>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace SvgPanZoom {
-    interface Options {
-        viewportSelector?: string|HTMLElement|SVGElement; // can be querySelector string or SVGElement (default enabled)
-        panEnabled?: boolean; // enable or disable panning (default enabled)
-        controlIconsEnabled?: boolean; // insert icons to give user an option in addition to mouse events to control pan/zoom (default disabled)
-        zoomEnabled?: boolean; // enable or disable zooming (default enabled)
-        dblClickZoomEnabled?: boolean; // enable or disable zooming by double clicking (default enabled)
-        mouseWheelZoomEnabled?: boolean; // (default enabled)
-        preventMouseEventsDefault?: boolean; // (default enabled)
-        zoomScaleSensitivity?: number; // Zoom sensitivity (Default 0.2)
-        minZoom?: number; // Minimum Zoom level (Default 0.5)
-        maxZoom?: number; // Maximum Zoom level  (Default 10)
-        fit?: boolean; // enable or disable viewport fit in SVG (default true)
-        contain?: boolean; // (default true)
-        center?: boolean; // enable or disable viewport centering in SVG (default true)
-        refreshRate?: number | 'auto'; // (default 'auto')
-        beforeZoom?: (oldScale:number, newScale:number) => boolean;
-        onZoom?: (newScale:number) => void;
-        beforePan?: (oldPan:Point, newPan:Point) => boolean | PointModifier;
-        onPan?: (newPan:Point) => void;
-        customEventsHandler?: CustomEventHandler; // (default null)
-        eventsListenerElement?: SVGElement; // (default null)
-    }
-
-    interface CustomEventHandler {
-        haltEventListeners: string[],
-        init: (options: CustomEventOptions) => void,
-        destroy: Function
-    }
-
-    interface CustomEventOptions {
-        svgElement: SVGSVGElement,
-        instance: Instance
-    }
-
-    interface Point {
-        x: number;
-        y: number;
-    }
-
-    interface PointModifier {
-        x: number|boolean;
-        y: number|boolean;
-    }
-
-    interface Instance {
-        /**
-         * Creates a new SvgPanZoom instance with given element selector.
-         *
-         * @param  {string|HTMLElement|SVGElement} svg selector of the tag on which it is to be applied.
-         * @param  {Object} options        provides customization options at the initialization of the object.
-         * @return {Instance}              Current instance
-         */
-        (svg:string|HTMLElement|SVGElement, options?:Options): Instance;
-
-        /**
-         * Enables Panning on svg element
-         * @return {Instance} Current instance
-         */
-        enablePan(): Instance;
-
-        /**
-         * Disables panning on svg element
-         * @return {Instance} Current instance
-         */
-        disablePan(): Instance;
-
-        /**
-         * Checks if Panning is enabled or not
-         * @return {Boolean} true or false based on panning settings
-         */
-        isPanEnabled(): boolean;
-
-        setBeforePan(fn: (point:Point)=> void): Instance;
-
-        setOnPan(fn: (x:number, y:number)=> void): Instance;
-
-        /**
-         * Pan to a rendered position
-         *
-         * @param  {Object} point {x: 0, y: 0}
-         * @return {Instance}    Current instance
-         */
-        pan(point: Point): Instance;
-
-        /**
-         * Relatively pan the graph by a specified rendered position vector
-         *
-         * @param  {Object} point {x: 0, y: 0}
-         * @return {Instance}    Current instance
-         */
-        panBy(point: Point): Instance;
-
-        /**
-         * Get pan vector
-         *
-         * @return {Object} {x: 0, y: 0}
-         * @return {Instance}    Current instance
-         */
-        getPan(): Point;
-
-        resetPan(): Instance;
-
-        enableZoom(): Instance;
-
-        disableZoom(): Instance;
-
-        isZoomEnabled(): boolean;
-
-        enableControlIcons(): Instance;
-
-        disableControlIcons(): Instance;
-
-        isControlIconsEnabled(): boolean;
-
-        enableDblClickZoom(): Instance;
-
-        disableDblClickZoom(): Instance;
-
-        isDblClickZoomEnabled(): boolean;
-
-        enableMouseWheelZoom(): Instance;
-
-        disableMouseWheelZoom(): Instance;
-
-        isMouseWheelZoomEnabled(): boolean;
-
-        setZoomScaleSensitivity(scale: number): Instance;
-
-        setMinZoom(zoom: number): Instance;
-
-        setMaxZoom(zoom: number): Instance;
-
-        setBeforeZoom(fn: (scale: number) => void): Instance;
-
-        setOnZoom(fn: (scale: number) => void): Instance;
-
-        zoom(scale: number):void;
-
-        zoomIn(): Instance;
-
-        zoomOut(): Instance;
-
-        zoomBy(scale: number): Instance;
-
-        zoomAtPoint(scale:number, point:Point): Instance;
-
-        zoomAtPointBy(scale:number, point:Point): Instance;
-
-        resetZoom(): Instance;
-
-        /**
-         * Get zoom scale/level
-         *
-         * @return {float} zoom scale
-         */
-        getZoom(): number;
-
-        /**
-         * Adjust viewport size (only) so it will fit in SVG
-         * Does not center image
-         *
-         * @return {Instance}    Current instance
-         */
-        fit(): Instance;
-
-        /**
-         * Adjust viewport size (only) so it will contain in SVG
-         * Does not center image
-         *
-         * @return {Instance}    Current instance
-         */
-        contain(): Instance;
-
-        /**
-         * Adjust viewport pan (only) so it will be centered in SVG
-         * Does not zoom/fit image
-         *
-         * @return {Instance}    Current instance
-         */
-        center(): Instance;
-
-        /**
-         * Recalculates cached svg dimensions and controls position
-         *
-         * @return {Instance}    Current instance
-         */
-        resize(): Instance;
-
-        reset(): Instance;
-
-        /**
-         * Update content cached BorderBox
-         * Use when viewport contents change
-         *
-         * @return {Instance}    Current instance
-         */
-        updateBBox(): Instance;
-
-        destroy(): void;
-    }
-}
-
-declare const svgPanZoom:SvgPanZoom.Instance;
-
-declare module 'svg-pan-zoom' {
-    export = svgPanZoom;
-}
diff --git a/types/svg-pan-zoom/svg-pan-zoom-tests.ts b/types/svg-pan-zoom/svg-pan-zoom-tests.ts
deleted file mode 100644
index 317bb2149d..0000000000
--- a/types/svg-pan-zoom/svg-pan-zoom-tests.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-var svgPanZoomOptions : SvgPanZoom.Options = {
-    panEnabled: true // enable or disable panning (default enabled)
-    , controlIconsEnabled: false // insert icons to give user an option in addition to mouse events to control pan/zoom (default disabled)
-    , zoomEnabled: true // enable or disable zooming (default enabled)
-    , dblClickZoomEnabled: true // enable or disable zooming by double clicking (default enabled)
-    , zoomScaleSensitivity: 0.2 // Zoom sensitivity
-    , minZoom: 0.5 // Minimum Zoom level
-    , maxZoom: 10 // Maximum Zoom level
-    , fit: true // enable or disable viewport fit in SVG (default true)
-    , center: true // enable or disable viewport centering in SVG (default true)
-    , beforeZoom: null
-    , onZoom: function(){}
-    , beforePan: null
-    , onPan: function(){}
-    , refreshRate: 60 // in hz
-};
-
-var panZoomTiger: SvgPanZoom.Instance = svgPanZoom('#demo-tiger');
-
-var svgElement = <SVGElement>document.querySelector('#demo-tiger');
-panZoomTiger = svgPanZoom(svgElement);
-
-panZoomTiger = svgPanZoom('#demo-tiger', {
-    panEnabled: true
-    , controlIconsEnabled: false
-    , zoomEnabled: true
-    , dblClickZoomEnabled: true
-    , mouseWheelZoomEnabled: true
-    , preventMouseEventsDefault: true
-    , zoomScaleSensitivity: 0.2
-    , minZoom: 0.5
-    , maxZoom: 10
-    , fit: true
-    , contain: false
-    , center: true
-    , refreshRate: 'auto'
-    , beforeZoom: function(oldScale, newScale){ return true; }
-    , onZoom: function(newScale){}
-    , beforePan: function(oldPan, newPan){ return {x: true, y: true}; }
-    , customEventsHandler: null
-    , eventsListenerElement: null
-});
-
-/**
- * PAN
- */
-// Pan to rendered point x = 50, y = 50
-panZoomTiger.pan({x: 50, y: 50});
-
-// Pan by x = 50, y = 50 of rendered pixels
-panZoomTiger.panBy({x: 50, y: 50});
-
-panZoomTiger.getPan();
-
-panZoomTiger.resetPan();
-
-panZoomTiger.enablePan();
-panZoomTiger.disablePan();
-
-panZoomTiger.isPanEnabled();
-
-/**
- * ZOOM
- */
-// Set zoom level to 2
-panZoomTiger.zoom(2);
-
-// Zoom by 130%
-panZoomTiger.zoomBy(1.3);
-
-// Set zoom level to 2 at point
-panZoomTiger.zoomAtPoint(2, {x: 50, y: 50});
-
-// Zoom by 130% at point
-panZoomTiger.zoomAtPointBy(1.3, {x: 50, y: 50});
-
-panZoomTiger.zoomIn();
-panZoomTiger.zoomOut();
-
-panZoomTiger.getZoom();
-
-panZoomTiger.resetZoom();
-
-panZoomTiger.enableZoom();
-panZoomTiger.disableZoom();
-
-panZoomTiger.isZoomEnabled();
-
-/**
- * controls
- */
-panZoomTiger.enableControlIcons();
-panZoomTiger.disableControlIcons();
-panZoomTiger.isControlIconsEnabled();
-
-panZoomTiger.enableDblClickZoom();
-panZoomTiger.disableDblClickZoom();
-panZoomTiger.isDblClickZoomEnabled();
-
-panZoomTiger.enableMouseWheelZoom();
-panZoomTiger.disableMouseWheelZoom();
-panZoomTiger.isMouseWheelZoomEnabled();
-
-panZoomTiger.center();
-panZoomTiger.fit();
-panZoomTiger.contain();
-
-panZoomTiger.resize(); // update SVG cached size and controls positions
-panZoomTiger.updateBBox();
-
-panZoomTiger.fit().center(); // can chain method
-
-panZoomTiger.destroy(); // destroy instance
diff --git a/types/svg-pan-zoom/tsconfig.json b/types/svg-pan-zoom/tsconfig.json
deleted file mode 100644
index c304d09b35..0000000000
--- a/types/svg-pan-zoom/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "svg-pan-zoom-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/svg-pan-zoom/v2/index.d.ts b/types/svg-pan-zoom/v2/index.d.ts
deleted file mode 100644
index 92b1ffeaa5..0000000000
--- a/types/svg-pan-zoom/v2/index.d.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-// Type definitions for svg-pan-zoom v2.3.9
-// Project: https://github.com/ariutta/svg-pan-zoom
-// Definitions by: Chintan Shah <https://github.com/Promact>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace SvgPanZoom {
-
-    interface OptionConfig {
-        panEnabled?: boolean; // enable or disable panning (default enabled)
-        controlIconsEnabled?: boolean; // insert icons to give user an option in addition to mouse events to control pan/zoom (default disabled)
-        zoomEnabled?: boolean; // enable or disable zooming (default enabled)
-        dblClickZoomEnabled?: boolean; // enable or disable zooming by double clicking (default enabled)
-        zoomScaleSensitivity?: number; // Zoom sensitivity
-        minZoom?: number; // Minimum Zoom level
-        maxZoom?: number; // Maximum Zoom level
-        fit?: boolean; // enable or disable viewport fit in SVG (default true)
-        center?: boolean; // enable or disable viewport centering in SVG (default true)
-        beforeZoom?: (scale:number) => void;
-        onZoom?: (scale:number) => void;
-        beforePan?: (point:IPoint) => void;
-        onPan?: (x:number, y:number) => void;
-        refreshRate?: any; // in hz
-    }
-
-    interface IPoint {
-        x: number;
-        y: number;
-    }
-
-    interface ISvgPanZoom {
-        /**
-         * Creates a new SvgPanZoom instance with given element selector.
-         *
-         * @param svg selector of the tag on which it is to be applied.
-         * @param options provides customization options at the initialization of the object.
-         */
-        (svg:any, options?:OptionConfig):  ISvgPanZoom;
-
-        /**
-         * Enables Panning on svg element
-         */
-        enablePan(): void;
-
-        /**
-         * Disables panning on svg element
-         */
-        disablePan(): void;
-
-        /**
-         * Checks if Panning is enabled or not
-         * @return true or false based on panning settings
-         */
-        isPanEnabled(): boolean;
-
-
-        setBeforePan(fn: (point:IPoint)=> void): void;
-
-        setOnPan(fn: (x:number, y:number)=> void): void;
-
-        enableZoom(): void;
-
-        disableZoom(): void;
-
-        isZoomEnabled(): boolean;
-
-        enableControlIcons(): void;
-
-        disableControlIcons(): void;
-
-        isControlIconsEnabled(): boolean;
-
-        enableDblClickZoom(): void;
-
-        disableDblClickZoom(): void;
-
-        setZoomScaleSensitivity(scale: number): void;
-
-        setMinZoom(zoom: number): void;
-
-        setMaxZoom(zoom: number): void;
-
-        setBeforeZoom(fn: (scale: number) => void): void;
-
-        setOnZoom(fn: (scale: number) => void): void;
-
-        zoom(scale: number):void;
-
-        zoomIn(): void;
-
-        zoomOut(): void;
-
-        zoomBy(scale: number): void;
-
-        resetZoom(): void;
-
-        /**
-         * Get zoom scale/level
-         *
-         * @return {float} zoom scale
-         */
-        getZoom(): number;
-
-        /**
-         * Adjust viewport size (only) so it will fit in SVG
-         * Does not center image
-         *
-         * @param  {bool} dropCache drop viewBox cache and recalculate SVG's viewport sizes. Default false
-         */
-        fit(dropCache?: boolean): void;
-
-        /**
-         * Adjust viewport pan (only) so it will be centered in SVG
-         * Does not zoom/fit image
-         *
-         * @param  {bool} dropCache drop viewBox cache and recalculate SVG's viewport sizes. Default false
-         */
-        center(dropCache?: boolean): void;
-
-        /**
-         * Recalculates cached svg dimensions and controls position
-         */
-        resize(): void;
-
-        /**
-         * Pan to a rendered position
-         *
-         * @param  {object} point {x: 0, y: 0}
-         */
-        pan(point: IPoint): void;
-
-        /**
-         * Relatively pan the graph by a specified rendered position vector
-         *
-         * @param  {object} point {x: 0, y: 0}
-         */
-        panBy(point: IPoint): void;
-
-        /**
-         * Get pan vector
-         *
-         * @return {object} {x: 0, y: 0}
-         */
-        getPan(): IPoint;
-
-        zoomAtPoint(scale:number, point:IPoint): boolean;
-
-        zoomAtPointBy(scale:number, point:IPoint): boolean;
-    }
-}
-
-declare var svgPanZoom:SvgPanZoom.ISvgPanZoom;
diff --git a/types/svg-pan-zoom/v2/tsconfig.json b/types/svg-pan-zoom/v2/tsconfig.json
deleted file mode 100644
index 67cb4d7679..0000000000
--- a/types/svg-pan-zoom/v2/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "types": [],
-        "paths": {
-            "svg-pan-zoom": [
-                "svg-pan-zoom/v2"
-            ]
-        },
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/svg-parser/index.d.ts b/types/svg-parser/index.d.ts
new file mode 100644
index 0000000000..4d3bdad0e1
--- /dev/null
+++ b/types/svg-parser/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for svg-parser 1.0
+// Project: https://gitlab.com/Rich-Harris/svg-parser#README
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export interface Node {
+    name: string;
+    attributes: Record<string, string | number>;
+    children: Node[];
+    metadata?: string;
+}
+
+export function parse(content: string): Node;
diff --git a/types/svg-parser/svg-parser-tests.ts b/types/svg-parser/svg-parser-tests.ts
new file mode 100644
index 0000000000..47c53b8db9
--- /dev/null
+++ b/types/svg-parser/svg-parser-tests.ts
@@ -0,0 +1,4 @@
+import * as parser from 'svg-parser';
+
+// $ExpectType Node
+parser.parse('<svg></svg>');
diff --git a/types/svg-parser/tsconfig.json b/types/svg-parser/tsconfig.json
new file mode 100644
index 0000000000..c24afbd999
--- /dev/null
+++ b/types/svg-parser/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "svg-parser-tests.ts"
+    ]
+}
diff --git a/types/svg-parser/tslint.json b/types/svg-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/svg-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/svg-sprite/tslint.json b/types/svg-sprite/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/svg-sprite/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/svgjs.draggable/tslint.json b/types/svgjs.draggable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/svgjs.draggable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/svgjs.resize/tslint.json b/types/svgjs.resize/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/svgjs.resize/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swag/tslint.json b/types/swag/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swag/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swagger-express-middleware/index.d.ts b/types/swagger-express-middleware/index.d.ts
index f9d7033412..acc36d3356 100644
--- a/types/swagger-express-middleware/index.d.ts
+++ b/types/swagger-express-middleware/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/BigstickCarpet/swagger-express-middleware
 // Definitions by: Alexandre Roba <https://github.com/alexandreroba>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
 import * as express from "express";
diff --git a/types/swagger-express-middleware/tslint.json b/types/swagger-express-middleware/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swagger-express-middleware/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swagger-express-mw/index.d.ts b/types/swagger-express-mw/index.d.ts
index 5fcd008ba0..deb9f0d51f 100644
--- a/types/swagger-express-mw/index.d.ts
+++ b/types/swagger-express-mw/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/apigee-127/swagger-express#readme
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.4
 
 /* =================== USAGE ===================
 
diff --git a/types/swagger-express-mw/tsconfig.json b/types/swagger-express-mw/tsconfig.json
index 8495da733e..c529b14c27 100644
--- a/types/swagger-express-mw/tsconfig.json
+++ b/types/swagger-express-mw/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "swagger-express-mw-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-hapi/index.d.ts b/types/swagger-hapi/index.d.ts
index 292cc46d82..943ae30b5c 100644
--- a/types/swagger-hapi/index.d.ts
+++ b/types/swagger-hapi/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/apigee-127/swagger-hapi#readme
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.4
 
 /* =================== USAGE ===================
 
diff --git a/types/swagger-hapi/tsconfig.json b/types/swagger-hapi/tsconfig.json
index 78127356a4..ea5343eb59 100644
--- a/types/swagger-hapi/tsconfig.json
+++ b/types/swagger-hapi/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "swagger-hapi-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-jsdoc/index.d.ts b/types/swagger-jsdoc/index.d.ts
index 2181c35a03..673ac30579 100644
--- a/types/swagger-jsdoc/index.d.ts
+++ b/types/swagger-jsdoc/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/surnet/swagger-jsdoc
 // Definitions by: Daniel Grove <https://github.com/drGrove>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /* =================== USAGE ===================
 
diff --git a/types/swagger-jsdoc/tslint.json b/types/swagger-jsdoc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swagger-jsdoc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swagger-node-runner/index.d.ts b/types/swagger-node-runner/index.d.ts
index 6bcb1c12e7..88da16aceb 100644
--- a/types/swagger-node-runner/index.d.ts
+++ b/types/swagger-node-runner/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/swagger-node-runner
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.4
 
 /* =================== USAGE ===================
 
@@ -116,10 +116,7 @@ export interface ConfigInternal {
 export type SwaggerToolsMiddleware = (req: any, res: any, next: any) => any;
 
 /**
- * @param  {any} request
- * @param  {any} securityDefinition
- * @param  {any} scopes
- * @param  {(err:Error)=>void} callback - Error is returned if request is unauthorized.
+ * @param  callback - Error is returned if request is unauthorized.
  * The Error may include "message", "state", and "code" fields to be conveyed to the client in the response body and a
  * "headers" field containing an object representing headers to be set on the response to the client.
  * In addition, if the Error has a statusCode field, the response statusCode will be set to match -
@@ -158,15 +155,15 @@ export interface Runner extends EventEmitter {
         /**
          * Middleware for providing Swagger information to downstream middleware and request handlers.
          *
-         * @param {any} rlOrSO - The Resource Listing (Swagger 1.2) or Swagger Object (Swagger 2.0)
-         * @param {any[]} apiDeclarations - The array of API Declarations (Swagger 1.2)
+         * @param rlOrSO - The Resource Listing (Swagger 1.2) or Swagger Object (Swagger 2.0)
+         * @param apiDeclarations - The array of API Declarations (Swagger 1.2)
          *
          * @see {@link https://github.com/apigee-127/swagger-tools/blob/master/middleware/swagger-metadata.js|Git Source}
          */
         swaggerMetadata(rlOrSO: any, apiDeclarations: any[]): SwaggerToolsMiddleware
         /**
          *  Middleware for using Swagger information to route requests to handlers.
-         * @param [{any}] options - The configuration options
+         * @param [] options - The configuration options
          *
          * @see {@link https://github.com/apigee-127/swagger-tools/blob/master/docs/Middleware.md#swaggerrouteroptions|Docs}
          * @see {@link https://github.com/apigee-127/swagger-tools/blob/master/middleware/swagger-router.js|Github Source}
@@ -174,7 +171,7 @@ export interface Runner extends EventEmitter {
         swaggerRouter(options?: any): SwaggerToolsMiddleware
         /**
          * Middleware for using Swagger security information to authenticate requests.
-         * @param [{any}] options - The configuration options
+         * @param [] options - The configuration options
          *
          * @see {@link https://github.com/apigee-127/swagger-tools/blob/master/middleware/swagger-security.js|Github Source}
          */
@@ -182,16 +179,16 @@ export interface Runner extends EventEmitter {
         /**
          * Middleware for serving the Swagger documents and Swagger UI.
          *
-         * @param {any} rlOrSO - The Resource Listing (Swagger 1.2) or Swagger Object (Swagger 2.0)
-         * @param {any[]} apiDeclarations - The array of API Declarations (Swagger 1.2)
-         * @param [{any}] options - The configuration options
+         * @param rlOrSO - The Resource Listing (Swagger 1.2) or Swagger Object (Swagger 2.0)
+         * @param apiDeclarations - The array of API Declarations (Swagger 1.2)
+         * @param [] options - The configuration options
          *
          * @see {@link https://github.com/apigee-127/swagger-tools/blob/master/middleware/swagger-ui.js|Github Source}
          */
         swaggerUi(rlOrSO: any, apiDeclarations: any[], options?: any): SwaggerToolsMiddleware
         /**
          * Middleware for using Swagger information to validate API requests/responses.type
-         * @param [{any}] options - The configuration options
+         * @param [] options - The configuration options
          *
          * @see {@link https://github.com/apigee-127/swagger-tools/blob/master/middleware/swagger-validator.js|Github Source}
          */
@@ -227,7 +224,8 @@ export interface ConnectMiddleware extends Middleware {
     /** Register this Middleware with `app`  */
     register(app: Express.Application): void;
 }
-/** Express specific Middleware
+/**
+ * Express specific Middleware
  *
  * _Alias for `ConnectMiddleware`_
  */
@@ -255,9 +253,9 @@ export interface HapiMiddleware extends Middleware {
             /**
              * Registers Plugin with `onRequest` and traces `request-error` callbacks
              *             *
-             * @param  {Hapi.Server} server - Hapi server
-             * @param  {any} options - options for plugin (not used in the moment)
-             * @param  {()=>void} next - callback called when register is done
+             * @param  server - Hapi server
+             * @param  options - options for plugin (not used in the moment)
+             * @param  next - callback called when register is done
              */
             (server: Hapi.Server, options: any, next: () => void): void;
             /** Object attached to `register` function to provide hapi with some additional information about the plugin */
@@ -286,7 +284,7 @@ export interface RestifyMiddleware extends Middleware {
  *   3. read from swagger node in `default.yaml` in config directory
  *   4. defaults
  *
- * @param {Config} config - Configuration for `Runner`
- * @param {Function} runner - This Callback is called when the `Runner` has been instantiated
+ * @param config - Configuration for `Runner`
+ * @param runner - This Callback is called when the `Runner` has been instantiated
  */
 export function create(config: Config, cb: (err: Error | undefined, runner: Runner) => void): void;
diff --git a/types/swagger-node-runner/tsconfig.json b/types/swagger-node-runner/tsconfig.json
index 3d7cac28ea..1d3ae44a1a 100644
--- a/types/swagger-node-runner/tsconfig.json
+++ b/types/swagger-node-runner/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "swagger-node-runner-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-restify-mw/index.d.ts b/types/swagger-restify-mw/index.d.ts
index 3a4b925a81..74cce1f580 100644
--- a/types/swagger-restify-mw/index.d.ts
+++ b/types/swagger-restify-mw/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/apigee-127/swagger-restify#readme
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.4
 
 /* =================== USAGE ===================
 import * as SwaggerRestify from "swagger-restify-mw";
diff --git a/types/swagger-restify-mw/tsconfig.json b/types/swagger-restify-mw/tsconfig.json
index 1ebe8fc759..a9dcb8c0da 100644
--- a/types/swagger-restify-mw/tsconfig.json
+++ b/types/swagger-restify-mw/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "swagger-restify-mw-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-sails-hook/index.d.ts b/types/swagger-sails-hook/index.d.ts
index 203dc5d62f..2f18fcb14e 100644
--- a/types/swagger-sails-hook/index.d.ts
+++ b/types/swagger-sails-hook/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/apigee-127/swagger-sails#readme
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 /* =================== USAGE ===================
 // Registers itself as sails hook, when added to the project via `npm install swagger-sails-hook`.
@@ -14,7 +15,7 @@ export = SwaggerHook;
 
 /**
  * Create a new `swagger-sails-hook` sails hook and register it with `sails`
- * @param  {any} sails - reference to the running sails instance
+ * @param sails - reference to the running sails instance
  * @returns SailsHook - `swagger-sails-hook` object implementing the Sails' hook specification.
  */
 declare function SwaggerHook(sails: any): SwaggerHook.SailsHook;
@@ -30,7 +31,7 @@ declare namespace SwaggerHook {
 		/**
 		 * Perform startup tasks.
 		 * All Sails configuration is guaranteed to be completed before a hook’s initialize function runs.
-		 * @param {Function} done - called when `swagger-sails-hook`'s startup tasks have finished.
+		 * @param done - called when `swagger-sails-hook`'s startup tasks have finished.
 		 */
 		initialize(done: () => any): void;
 
diff --git a/types/swagger-sails-hook/tsconfig.json b/types/swagger-sails-hook/tsconfig.json
index 8700d1e356..44a316b98b 100644
--- a/types/swagger-sails-hook/tsconfig.json
+++ b/types/swagger-sails-hook/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "swagger-sails-hook-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-schema-official/index.d.ts b/types/swagger-schema-official/index.d.ts
index fbdd5b6d8f..48173c0883 100644
--- a/types/swagger-schema-official/index.d.ts
+++ b/types/swagger-schema-official/index.d.ts
@@ -55,18 +55,19 @@ export interface QueryParameter extends BaseParameter, BaseSchema {
   allowEmptyValue?: boolean;
 }
 
-export interface PathParameter extends BaseParameter {
+export interface PathParameter extends BaseParameter, BaseSchema {
   type: string;
   required: boolean;
 }
 
-export interface HeaderParameter extends BaseParameter {
+export interface HeaderParameter extends BaseParameter, BaseSchema {
   type: string;
 }
 
 export interface FormDataParameter extends BaseParameter, BaseSchema {
   type: string;
   collectionFormat?: string;
+  allowEmptyValue?: boolean;
 }
 
 export type Parameter =
@@ -164,7 +165,7 @@ export interface BaseSecurity {
   description?: string;
 }
 
-// tslint:disable:no-empty-interface
+// tslint:disable-next-line no-empty-interface
 export interface BasicAuthenticationSecurity extends BaseSecurity {
   // It's the exact same interface as BaseSecurity
 }
diff --git a/types/swagger-schema-official/swagger-schema-official-tests.ts b/types/swagger-schema-official/swagger-schema-official-tests.ts
index 8b2c57bd58..dd8b1a4485 100644
--- a/types/swagger-schema-official/swagger-schema-official-tests.ts
+++ b/types/swagger-schema-official/swagger-schema-official-tests.ts
@@ -1,7 +1,5 @@
 import * as swagger from "swagger-schema-official";
 
-// tslint:disable:max-line-length
-
 const apiExample: swagger.Spec = {
   "swagger": "2.0",
   "info": {
diff --git a/types/swagger-schema-official/tslint.json b/types/swagger-schema-official/tslint.json
index 30297e76ae..4de1adc227 100644
--- a/types/swagger-schema-official/tslint.json
+++ b/types/swagger-schema-official/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
+        "max-line-length": false,
         "object-literal-key-quotes": false
     }
 }
diff --git a/types/swagger-tools/index.d.ts b/types/swagger-tools/index.d.ts
index 4f39031477..a6e2cf14a6 100644
--- a/types/swagger-tools/index.d.ts
+++ b/types/swagger-tools/index.d.ts
@@ -8,32 +8,42 @@ import { NextHandleFunction } from 'connect';
 import { IncomingMessage, ServerResponse } from 'http';
 
 export interface SwaggerParameterSchema {
+    allowMultiple?: boolean;
+    description?: string;
+    format?: string;
+    in?: string;
+    maximum?: string;
+    minimum?: string;
     name: string;
-    in: string;
+    paramType?: string;
+    required?: boolean;
+    type: string;
 }
 
-export interface SwaggerRequestParameter {
-    path: string;
+export interface SwaggerRequestParameter<T> {
+    path: string[];
     schema: SwaggerParameterSchema;
     originalValue: any;
-    value: any;
+    value: T;
 }
 
 export interface SwaggerRequestParameters {
-    [paramName: string]: SwaggerRequestParameter;
+    [paramName: string]: SwaggerRequestParameter<any> | undefined;
 }
 
 export interface Swagger12Request extends IncomingMessage {
     swagger: {
-        api: string;
+        api: any;
         apiDeclaration: any;
         apiIndex: number;
-        authorizations?: any[];
-        operation?: string;
-        operationPath?: string;
+        authorizations?: any;
+        operation?: any;
+        operationPath?: string[];
         params: SwaggerRequestParameters;
         resourceIndex: number;
         resourceListing: any;
+        swaggerVersion: string;
+        useStubs?: boolean;
     };
 }
 
@@ -50,24 +60,44 @@ export interface SwaggerRouter12Options {
 }
 
 export interface OperationParameter {
-    path: string;
+    path: string[];
     schema: SwaggerParameterSchema;
 }
 
-export interface Swagger20Request extends IncomingMessage {
+export interface Swagger20Security {
+    [name: string]: any;
+}
+
+export interface Swagger20Response {
+    description?: string;
+    schema?: any;
+}
+
+export interface Swagger20Operation {
+    operationId?: string;
+    parameters?: SwaggerParameterSchema[];
+    responses: { [code: string]: Swagger20Response };
+    security?: Swagger20Security[];
+    summary?: string;
+    tags?: string[];
+}
+
+export interface Swagger20Request<P extends SwaggerRequestParameters> extends IncomingMessage {
     swagger: {
         apiPath: string;
-        operation?: string;
-        operationPath?: string;
+        operation?: Swagger20Operation;
+        operationPath?: string[];
         operationParameters?: OperationParameter[];
-        path: string;
-        params: SwaggerRequestParameters;
+        path: any;
+        params: P;
         security: any[];
         swaggerObject: any;
+        swaggerVersion: string;
+        useStubs?: boolean;
     };
 }
 
-export type SwaggerRouter20HandlerFunction = (req: Swagger20Request, res: ServerResponse, next: (arg?: any) => void) => void;
+export type SwaggerRouter20HandlerFunction = (req: Swagger20Request<any>, res: ServerResponse, next: (arg?: any) => void) => void;
 
 export interface SwaggerRouter20OptionsControllers {
     [handlerName: string]: SwaggerRouter20HandlerFunction;
diff --git a/types/swagger-tools/swagger-tools-tests.ts b/types/swagger-tools/swagger-tools-tests.ts
index 12a7993819..7b05595269 100644
--- a/types/swagger-tools/swagger-tools-tests.ts
+++ b/types/swagger-tools/swagger-tools-tests.ts
@@ -37,17 +37,102 @@ swaggerTools.initializeMiddleware(swaggerDoc20, middleware => {
     // Test passing in the handlers directly
     app.use(middleware.swaggerRouter({
         controllers: {
-            foo_bar: (req, res, next) => {
-                console.log(req.swagger.apiPath);
-                console.log(req.swagger.operation);
-                console.log(req.swagger.operationParameters);
-                console.log(req.swagger.operationPath);
-                console.log(req.swagger.path);
-                console.log(req.swagger.security);
-                console.log(req.swagger.swaggerObject);
+            // These tests are based on tests here:
+            // https://github.com/apigee-127/swagger-tools/blob/0cea535b122265c6d01546e199e2e8fda4c0f5da/test/2.0/test-middleware-swagger-metadata.js#L102-L138
 
-                console.log(req.swagger.params.location.value);
-                console.log(req.swagger.params.unit.value);
+            foo_bar: (req, res, next) => {
+                req.swagger.swaggerVersion = '2.0';
+                req.swagger.apiPath = '/pets/{id}';
+                req.swagger.operation = {
+                    security: [
+                        {
+                        oauth2: ["read"]
+                    }
+                    ],
+                    tags: [ "Pet Operations" ],
+                    operationId: "getPetById",
+                    summary: "Finds the pet by id",
+                    responses: {
+                        200: {
+                            description: "Pet response",
+                            schema: {
+                                $ref: "#/definitions/Pet"
+                            }
+                        },
+                    default: {
+                        description: "Unexpected error",
+                        schema: {
+                            $ref: "#/definitions/Error"
+                        }
+                    }
+                    },
+                    parameters: [
+                        {
+                        in: 'query',
+                        name: 'mock',
+                        description: 'Mock mode',
+                        required: false,
+                        type: 'boolean'
+                    }
+                    ]
+                };
+
+                req.swagger.operationParameters = [
+                    {
+                    path: ['paths', '/pets/{id}', 'get', 'parameters', '0'],
+                    schema: {
+                        in: 'query',
+                        name: 'mock',
+                        description: 'Mock mode',
+                        required: false,
+                        type: 'boolean'
+                    },
+                },
+                    {
+                    path: ['paths', '/pets/{id}', 'parameters', '0'],
+                    schema: {
+                        name: "id",
+                        in: "path",
+                        description: "ID of pet",
+                        required: true,
+                        type: "integer",
+                        format: "int64"
+                    }
+                }
+                ];
+                req.swagger.operationPath = ['paths', '/pets/{id}', 'get'];
+                req.swagger.security = [
+                    {
+                    oauth2: [ 'read' ]
+                }
+                ];
+                req.swagger.params = {
+                    id: {
+                        path: ['paths', '/pets/{id}', 'parameters', '0'],
+                        schema: {
+                            name: "id",
+                            in: "path",
+                            description: "ID of pet",
+                            required: true,
+                            type: "integer",
+                            format: "int64"
+                        },
+                        originalValue: '1',
+                        value: 1
+                    },
+                    mock: {
+                        path: ['paths', '/pets/{id}', 'get', 'parameters', '0'],
+                        schema: {
+                            in: 'query',
+                            name: 'mock',
+                            description: 'Mock mode',
+                            required: false,
+                            type: 'boolean'
+                        },
+                        originalValue: 'false',
+                        value: false
+                    }
+                };
 
                 res.setHeader('Content-Type', 'application/json');
                 res.end([ 'foo', 0 ]);
@@ -90,17 +175,139 @@ swaggerTools.initializeMiddleware(apiDoc12, apiDeclarations, middleware => {
     // Test passing in the handlers directly
     app.use(middleware.swaggerRouter({
         controllers: {
-            foo_bar: (req, res, next) => {
-                console.log(req.swagger.api);
-                console.log(req.swagger.apiDeclaration);
-                console.log(req.swagger.apiIndex);
-                console.log(req.swagger.operation);
-                console.log(req.swagger.operationPath);
-                console.log(req.swagger.resourceIndex);
-                console.log(req.swagger.resourceListing);
+            // These tests are based on tests here:
+            // https://github.com/apigee-127/swagger-tools/blob/0cea535b122265c6d01546e199e2e8fda4c0f5da/test/1.2/test-middleware-swagger-metadata.js#L72-L89
 
-                console.log(req.swagger.params.location.value);
-                console.log(req.swagger.params.unit.value);
+            foo_bar: (req, res, next) => {
+                req.swagger.swaggerVersion = '1.2';
+                req.swagger.api = {
+                    operations: [
+                        {
+                            authorizations: {},
+                            method: "GET",
+                            nickname: "getPetById",
+                            notes: "Returns a pet based on ID",
+                            parameters: [
+                                {
+                                    allowMultiple: false,
+                                    description: "ID of pet that needs to be fetched",
+                                    format: "int64",
+                                    maximum: "100000.0",
+                                    minimum: "1.0",
+                                    name: "petId",
+                                    paramType: "path",
+                                    required: true,
+                                    type: "integer"
+                                }
+                            ],
+                            responseMessages: [
+                                {
+                                    code: 400,
+                                    message: "Invalid ID supplied"
+                                },
+                                {
+                                    code: 404,
+                                    message: "Pet not found"
+                                }
+                            ],
+                            summary: "Find pet by ID",
+                            type: "Pet"
+                        },
+                        {
+                            authorizations: {
+                                oauth2: [
+                                    {
+                                        description: "modify pets in your account",
+                                        scope: "write:pets"
+                                    }
+                                ]
+                            },
+                            method: "DELETE",
+                            nickname: "deletePet",
+                            notes: "",
+                            parameters: [
+                                {
+                                    allowMultiple: false,
+                                    description: "Pet id to delete",
+                                    name: "petId",
+                                    paramType: "path",
+                                    required: true,
+                                    type: "string"
+                                }
+                            ],
+                            responseMessages: [
+                                {
+                                    code: 400,
+                                    message: "Invalid pet value"
+                                }
+                            ],
+                            summary: "Deletes a pet",
+                            type: "void"
+                        },
+                    ],
+                    path: "/pet/{petId}"
+                };
+
+                req.swagger.apiDeclaration = {};
+                req.swagger.apiIndex = 0;
+                req.swagger.authorizations = {
+                    oauth2: [
+                        {
+                            description: "modify pets in your account",
+                            scope: "write:pets"
+                        }
+                    ]
+                };
+                req.swagger.operation = {
+                    authorizations: {},
+                    method: "GET",
+                    nickname: "getPetById",
+                    notes: "Returns a pet based on ID",
+                    parameters: [
+                        {
+                            allowMultiple: false,
+                            description: "ID of pet that needs to be fetched",
+                            format: "int64",
+                            maximum: "100000.0",
+                            minimum: "1.0",
+                            name: "petId",
+                            paramType: "path",
+                            required: true,
+                            type: "integer"
+                        }
+                    ],
+                    responseMessages: [
+                        {
+                            code: 400,
+                            message: "Invalid ID supplied"
+                        },
+                        {
+                            code: 404,
+                            message: "Pet not found"
+                        }
+                    ],
+                    summary: "Find pet by ID",
+                    type: "Pet"
+                };
+                req.swagger.operationPath = ['apis', '0', 'operations', '0'];
+                req.swagger.params = {
+                    petId: {
+                        path: ['apis', '0', 'operations', '0', 'parameters', '0'],
+                        schema: {
+                            allowMultiple: false,
+                            description: "ID of pet that needs to be fetched",
+                            format: "int64",
+                            maximum: "100000.0",
+                            minimum: "1.0",
+                            name: "petId",
+                            paramType: "path",
+                            required: true,
+                            type: "integer"
+                        },
+                        originalValue: '1',
+                        value: 1
+                    }
+                };
 
                 res.setHeader('Content-Type', 'application/json');
                 res.end([ 'foo', 0 ]);
@@ -118,3 +325,20 @@ swaggerTools.initializeMiddleware(apiDoc12, apiDeclarations, middleware => {
         console.log('Your server is listening on port %d (http://localhost:%d)', serverPort, serverPort);
     });
 });
+
+// Testing that handler functions can type the incoming request
+type TypedRequest = swaggerTools.Swagger20Request<{
+    foo: swaggerTools.SwaggerRequestParameter<number>;
+    bar?: swaggerTools.SwaggerRequestParameter<string>;
+}>;
+
+swaggerTools.initializeMiddleware(swaggerDoc20, middleware => {
+    app.use(middleware.swaggerRouter({
+        controllers: {
+            foo_bar: (req: TypedRequest, res, next) => {
+                req.swagger.params.foo.value + 2;
+                req.swagger.params.bar && req.swagger.params.bar.value.replace('a', 'b');
+            },
+        }
+    }));
+});
diff --git a/types/swaggerize-express/index.d.ts b/types/swaggerize-express/index.d.ts
index d7a8df14bb..25a3261e82 100644
--- a/types/swaggerize-express/index.d.ts
+++ b/types/swaggerize-express/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for swaggerize-express 4.x
 // Project: https://github.com/krakenjs/swaggerize-express
 // Definitions by: TANAKA Koichi <https://github.com/mugeso>
-//                 Nick Morton <https://github.com/nickmorton>    
+//                 Nick Morton <https://github.com/nickmorton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* =================== USAGE ===================
  import express = require('express');
diff --git a/types/swaggerize-express/tslint.json b/types/swaggerize-express/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swaggerize-express/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sweetalert/index.d.ts b/types/sweetalert/index.d.ts
deleted file mode 100644
index bb7e135e0a..0000000000
--- a/types/sweetalert/index.d.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-// Type definitions for SweetAlert 1.1.3
-// Project: https://github.com/t4t5/sweetalert/
-// Definitions by: Markus Peloso <https://github.com/ToastHawaii>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var sweetAlert: SweetAlert.SweetAlertStatic;
-declare var swal: SweetAlert.SweetAlertStatic;
-
-declare module "sweetalert" {
-    export = swal;
-}
-
-declare namespace SweetAlert {
-    type AlertType = "warning" | "error" | "success" | "info";
-
-    type PromtType = "input" | "prompt";
-
-    interface SettingsBase {
-        /**
-         * A description for the modal.
-         * Default: null
-         */
-        text?: string;
-
-        /**
-         * If set to true, the user can dismiss the modal by pressing the Escape key.
-         * Default: true
-         */
-        allowEscapeKey?: boolean;
-
-        /**
-         * A custom CSS class for the modal.
-         * Default: null
-         */
-        customClass?: string;
-
-        /**
-         * If set to true, the user can dismiss the modal by clicking outside it.
-         * Default: false
-         */
-        allowOutsideClick?: boolean;
-
-        /**
-         * If set to true, a "Cancel"-button will be shown, which the user can click on to dismiss the modal.
-         * Default: false
-         */
-        showCancelButton?: boolean;
-
-        /**
-         * If set to false, the "OK/Confirm"-button will be hidden. Make sure you set a timer or set allowOutsideClick to true when using this, in order not to annoy the user.
-         * Default: true
-         */
-        showConfirmButton?: boolean;
-
-        /**
-         * Use this to change the text on the "Confirm"-button. If showCancelButton is set as true, the confirm button will automatically show "Confirm" instead of "OK".
-         * Default: "OK"
-         */
-        confirmButtonText?: string;
-
-        /**
-         * Use this to change the background color of the "Confirm"-button (must be a HEX value).
-         * Default: "#8CD4F5"
-         */
-        confirmButtonColor?: string;
-
-        /**
-         * Use this to change the text on the "Cancel"-button.
-         * Default: "Cancel"
-         */
-        cancelButtonText?: string;
-
-        /**
-         * Set to false if you want the modal to stay open even if the user presses the "Confirm"-button. This is especially useful if the function attached to the "Confirm"-button is another SweetAlert.
-         * Default: true
-         */
-        closeOnConfirm?: boolean;
-
-        /**
-         * Set to false if you want the modal to stay open even if the user presses the "Cancel"-button. This is especially useful if the function attached to the "Cancel"-button is another SweetAlert.
-         * Default: true
-         */
-        closeOnCancel?: boolean;
-
-        /**
-         * Add a customized icon for the modal.Should contain a string with the path to the image.
-         * Default: null
-         */
-        imageUrl?: string;
-
-        /**
-         * If imageUrl is set, you can specify imageSize to describes how big you want the icon to be in px. Pass in a string with two values separated by an "x". The first value is the width, the second is the height.
-         * Default: "80x80"
-         */
-        imageSize?: string;
-
-        /**
-         * Auto close timer of the modal. Set in ms (milliseconds).
-         * Default: null
-         */
-        timer?: number;
-
-        /**
-         * If set to true, will not escape title and text parameters. (Set to false if you're worried about XSS attacks.)
-         * Default: false
-         */
-        html?: boolean;
-
-        /**
-         * If set to false, the modal's animation will be disabled. Possible animations: "slide-from-top", "slide-from-bottom", "pop" (use true instead) and "none" (use false instead).
-         * Default: true
-         */
-        animation?: boolean | "slide-from-top" | "slide-from-bottom" | "pop" | "none" | string;
-
-        /**
-         * Set to true to disable the buttons and show that something is loading.
-         * Default: false
-         */
-        showLoaderOnConfirm?: boolean;
-    }
-
-    interface AlertModalSettings extends SettingsBase {
-        /**
-         * The type of the modal. SweetAlert comes with 4 built-in types which will show a corresponding icon animation: "warning", "error", "success" and "info". You can also set it as "input" to get a prompt modal.
-         * Default: null
-         */
-        type?: AlertType;
-    }
-
-    interface PromtModalSettings extends SettingsBase {
-        /**
-         * The type of the modal. SweetAlert comes with 4 built-in types which will show a corresponding icon animation: "warning", "error", "success" and "info". You can also set it as "input" to get a prompt modal.
-         * Default: null
-         */
-        type?: PromtType;
-
-        /**
-         * Change the type of the input field when using type: "input" (this can be useful if you want users to type in their password for example).
-         * Default: "text"
-         */
-        inputType?: string;
-
-        /**
-         * When using the input-type, you can specify a placeholder to help the user.
-         * Default: null
-         */
-        inputPlaceholder?: string;
-
-        /**
-         * Specify a default text value that you want your input to show when using type: "input"
-         * Default: null
-         */
-        inputValue?: string;
-    }
-
-    interface Settings {
-        /**
-         * The title of the modal.
-         */
-        title: string;
-    }
-
-    interface SetDefaultsSettings {
-        /**
-         * The title of the modal.
-         * Default: null
-         */
-        title?: string;
-    }
-
-    interface SweetAlertStatic {
-        /**
-         * SweetAlert automatically centers itself on the page and looks great no matter if you're using a desktop computer, mobile or tablet. An awesome replacement for JavaScript's alert.
-         * @param title The title of the modal.
-         */
-        (title: string): void;
-
-        /**
-         * SweetAlert automatically centers itself on the page and looks great no matter if you're using a desktop computer, mobile or tablet. An awesome replacement for JavaScript's alert.
-         * @param title The title of the modal.
-         * @param text A description for the modal.
-         */
-        (title: string, text: string): void;
-
-        /**
-         * SweetAlert automatically centers itself on the page and looks great no matter if you're using a desktop computer, mobile or tablet. An awesome replacement for JavaScript's alert.
-         * @param title The title of the modal.
-         * @param text A description for the modal.
-         * @param type The type of the modal. SweetAlert comes with 4 built-in types which will show a corresponding icon animation: "warning", "error", "success" and "info". You can also set it as "input" to get a prompt modal.
-         */
-        (title: string, text: string, type: AlertType | PromtType): void;
-
-        /**
-         * SweetAlert automatically centers itself on the page and looks great no matter if you're using a desktop computer, mobile or tablet. An awesome replacement for JavaScript's alert.
-         * @param callback The callback from the users action. The value is true or false if the user confirms or cancels the alert.
-         */
-        (settings: Settings & AlertModalSettings, callback?: (isConfirm: boolean) => any): void;
-
-        /**
-         * SweetAlert automatically centers itself on the page and looks great no matter if you're using a desktop computer, mobile or tablet. An awesome replacement for JavaScript's alert.
-         * @param callback The callback from the users action. When the user confirms the prompt, the argument contains the value of the input element. When the user cancels the prompt, the argument is false.
-         */
-        (settings: Settings & PromtModalSettings, callback?: (isConfirmOrInputValue: boolean | string) => any): void;
-
-        /**
-         * If you end up using a lot of the same settings when calling SweetAlert, you can use setDefaults at the start of your program to set them once and for all!
-         */
-        setDefaults(settings: SetDefaultsSettings & AlertModalSettings & PromtModalSettings): void;
-
-        /**
-         * Close the currently open SweetAlert programmatically.
-         */
-        close(): void;
-
-        /**
-         * Show an error message after validating the input field, if the user's data is bad.
-         */
-        showInputError(errorMessage: string): void;
-
-        /**
-         * Enable the user to click on the cancel and confirm buttons.
-         */
-        enableButtons(): void;
-
-        /**
-         * Disable the user to click on the cancel and confirm buttons.
-         */
-        disableButtons(): void;
-    }
-}
diff --git a/types/sweetalert/sweetalert-tests.ts b/types/sweetalert/sweetalert-tests.ts
deleted file mode 100644
index d309dacf8d..0000000000
--- a/types/sweetalert/sweetalert-tests.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-// A basic message
-swal("Here's a message!");
-
-// A title with a text under
-swal("Here's a message!", "It's pretty, isn't it?");
-
-// A success message!
-swal("Good job!", "You clicked the button!", "success");
-
-// A warning message, with a function attached to the "Confirm"-button...
-swal({
-    title: "Are you sure?",
-    text: "You will not be able to recover this imaginary file!",
-    type: "warning",
-    showCancelButton: true,
-    confirmButtonColor: "#DD6B55",
-    confirmButtonText: "Yes, delete it!",
-    closeOnConfirm: false
-},
-    function () {
-        swal("Deleted!", "Your imaginary file has been deleted.", "success");
-    });
-
-// ... and by passing a parameter, you can execute something else for "Cancel".
-swal({
-    title: "Are you sure?",
-    text: "You will not be able to recover this imaginary file!",
-    type: "warning",
-    showCancelButton: true,
-    confirmButtonColor: "#DD6B55",
-    confirmButtonText: "Yes, delete it!",
-    cancelButtonText: "No, cancel plx!",
-    closeOnConfirm: false,
-    closeOnCancel: false
-},
-    function (isConfirm) {
-        if (isConfirm) {
-            swal("Deleted!", "Your imaginary file has been deleted.", "success");
-        } else {
-            swal("Cancelled", "Your imaginary file is safe :)", "error");
-        }
-    });
-
-// A message with a custom icon
-swal({
-    title: "Sweet!",
-    text: "Here's a custom image.",
-    imageUrl: "images/thumbs-up.jpg"
-});
-
-// An HTML message
-swal({
-    title: "HTML <small>Title</small>!",
-    text: "A custom <span style=\"color: #F8BB86\">html<span> message.",
-    html: true
-});
-
-// A message with auto close timer
-swal({
-    title: "Auto close alert!",
-    text: "I will close in 2 seconds.",
-    timer: 2000,
-    showConfirmButton: false
-},
-    function () {
-        swal("Time Out!", "The time is out of joint.", "success");
-    });
-
-// A replacement for the "prompt" function
-swal({
-    title: "An input!",
-    text: "Write something interesting:",
-    type: "input",
-    showCancelButton: true,
-    closeOnConfirm: false,
-    animation: "slide-from-top",
-    inputPlaceholder: "Write something plx",
-    inputValue: "Write something"
-},
-    function (inputValue) {
-        if (inputValue === false) return false;
-
-        if (inputValue === "") {
-            swal.showInputError("You need to write something!");
-            return false;
-        }
-
-        swal("Nice!", "You wrote: " + inputValue, "success");
-    }
-    );
-
-// With a loader (for AJAX request for example)
-swal({
-    title: "Ajax request example",
-    text: "Submit to run ajax request",
-    type: "info",
-    showCancelButton: true,
-    closeOnConfirm: false,
-    showLoaderOnConfirm: true
-},
-    function () {
-        setTimeout(function () {
-            swal("Ajax request finished!");
-        }, 2000);
-    });
-
-swal.setDefaults({ confirmButtonColor: "#000000" });
-
-swal.close();
-
-swal.showInputError("Invalid email!");
-
-swal.disableButtons();
-
-swal.enableButtons();
\ No newline at end of file
diff --git a/types/sweetalert/tsconfig.json b/types/sweetalert/tsconfig.json
deleted file mode 100644
index a7294d8385..0000000000
--- a/types/sweetalert/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "sweetalert-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/swfobject/tslint.json b/types/swfobject/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swfobject/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swiftclick/tslint.json b/types/swiftclick/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swiftclick/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swig-email-templates/index.d.ts b/types/swig-email-templates/index.d.ts
index 26b5944053..8297b022b6 100644
--- a/types/swig-email-templates/index.d.ts
+++ b/types/swig-email-templates/index.d.ts
@@ -1,20 +1,30 @@
-// Type definitions for swig-email-templates
+// Type definitions for swig-email-templates 5.0
 // Project: https://github.com/andrewrk/swig-email-templates
 // Definitions by: Adam Babcock <https://github.com/mrhen>
+//                 Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
-/// <reference types="swig" />
+/// <reference types="jquery" />
 
 import swig = require('swig');
 
-interface SwigRender<T> {
-    (file: string, context: T, callback: (err: any, html: string, text: string) => any): any;
-}
+type SwigRender<T> = (file: string, context: T, callback: (err: any, html: string, text: string) => any) => any;
 
 interface SwigEmailTemplatesOptions extends swig.SwigOptions {
     root?: string;
+    juice?: any;
+    rewriteUrl?: (href: string) => string;
+    rewrite?: ($: JQueryStatic) => void;
 }
 
-declare function init<T>(options: SwigEmailTemplatesOptions, cb: (err: any, render: SwigRender<T>) => any): any;
-export = init;
+declare class EmailTemplates {
+    constructor(options?: SwigEmailTemplatesOptions);
 
+    generateText(templatePath: string, context: any, html: string, cb: (error: any, text: string | null) => void): void;
+    generateSubject(templatePath: string, context: any, cb: (error: any, text: string | null) => void): void;
+    rewriteUrls($: JQueryStatic, rewrite: (href: string) => void): void;
+    render(templatePath: string, context: any, cb: (error: any, inlinedHTML?: string, text?: string, subject?: string) => void): void;
+}
+
+export = EmailTemplates;
diff --git a/types/swig-email-templates/swig-email-templates-tests.ts b/types/swig-email-templates/swig-email-templates-tests.ts
index de396909a6..1103ab9019 100644
--- a/types/swig-email-templates/swig-email-templates-tests.ts
+++ b/types/swig-email-templates/swig-email-templates-tests.ts
@@ -1,15 +1,15 @@
+import EmailTemplates = require('swig-email-templates');
+import jQuery = require('jquery');
 
-import emailTemplates = require('swig-email-templates');
+const templates = new EmailTemplates();
+const withOptions = new EmailTemplates({ root: '' });
 
-var options = {
-  root: "root"
-};
+templates.generateText('templatePath', {}, 'html', () => {});
+templates.generateSubject('templatePath', {}, () => {});
+templates.rewriteUrls(jQuery, () => {});
+templates.render('templatePath', {}, () => {});
 
-emailTemplates(options, function(err, render) {
-  var context = {
-    meatballCount: 9001,
-  };
-  render('meatball-sandwich.html', context, function(err, html, text) {
-    // send html/text email
-  });
-});
+withOptions.generateText('templatePath', {}, 'html', () => {});
+withOptions.generateSubject('templatePath', {}, () => { });
+withOptions.rewriteUrls(jQuery, () => {});
+withOptions.render('templatePath', {}, () => {});
diff --git a/types/swig-email-templates/tsconfig.json b/types/swig-email-templates/tsconfig.json
index b25f125136..987a6f629a 100644
--- a/types/swig-email-templates/tsconfig.json
+++ b/types/swig-email-templates/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "swig-email-templates-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swig-email-templates/tslint.json b/types/swig-email-templates/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/swig-email-templates/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/swig/tslint.json b/types/swig/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swig/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swipe/tslint.json b/types/swipe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swipe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swiper/index.d.ts b/types/swiper/index.d.ts
index a0e6b3da6d..5f4cf01298 100644
--- a/types/swiper/index.d.ts
+++ b/types/swiper/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nolimits4web/Swiper
 // Definitions by: Sebastián Galiano <https://github.com/sgaliano>, Luca Trazzi <https://github.com/lucax88x>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface SwiperOptions {
     initialSlide?: number;
diff --git a/types/swipeview/tslint.json b/types/swipeview/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swipeview/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/switchery/tslint.json b/types/switchery/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/switchery/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/swiz/tslint.json b/types/swiz/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/swiz/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/sylvester/tslint.json b/types/sylvester/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sylvester/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/synaptic/tslint.json b/types/synaptic/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/synaptic/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/table/index.d.ts b/types/table/index.d.ts
index 9deca5a961..dfa921bcb2 100644
--- a/types/table/index.d.ts
+++ b/types/table/index.d.ts
@@ -1,50 +1,52 @@
 // Type definitions for Tabris.js 4.0
 // Project: https://github.com/gajus/table
 // Definitions by: Evan Shortiss <https://github.com/evanshortiss>
+//                 mrmlnc <https://github.com/mrmlnc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export type borderType = 'honeywell' | 'norc' | 'ramac' | 'void';
+export type BorderType = 'honeywell' | 'norc' | 'ramac' | 'void';
 
 export interface ColumnConfig {
-  alignment?: string;
-  width?: number;
-  truncate?: number;
-  paddingLeft?: string;
-  paddingRight?: string;
+    alignment?: 'left' | 'center' | 'right';
+    width?: number;
+    truncate?: number;
+    paddingLeft?: number;
+    paddingRight?: number;
 }
 
 export interface JoinStruct {
-  topBody?: string;
-  topJoin?: string;
-  topLeft?: string;
-  topRight?: string;
+    topBody?: string;
+    topJoin?: string;
+    topLeft?: string;
+    topRight?: string;
 
-  bottomBody?: string;
-  bottomJoin?: string;
-  bottomLeft?: string;
-  bottomRight?: string;
+    bottomBody?: string;
+    bottomJoin?: string;
+    bottomLeft?: string;
+    bottomRight?: string;
 
-  bodyLeft?: string;
-  bodyRight?: string;
-  bodyJoin?: string;
+    bodyLeft?: string;
+    bodyRight?: string;
+    bodyJoin?: string;
 
-  joinBody?: string;
-  joinLeft?: string;
-  joinRight?: string;
-  joinJoin?: string;
+    joinBody?: string;
+    joinLeft?: string;
+    joinRight?: string;
+    joinJoin?: string;
 }
 
 export interface TableUserConfig {
-  columns?: {
-    [index: number]: ColumnConfig
-  };
-  drawJoin?(index: number, size: number): boolean;
-  border?: JoinStruct;
-  columnDefault?: ColumnConfig;
+    columns?: {
+        [index: number]: ColumnConfig
+    };
+    drawHorizontalLine?: (index: number, size: number) => boolean;
+    border?: JoinStruct;
+    columnDefault?: ColumnConfig;
+    columnCount?: number;
 }
 
 export function table(data: any[], userConfig?: TableUserConfig): string;
 
 export function createStream(userConfig: TableUserConfig): { write: string[] };
 
-export function getBorderCharacters(templateName: borderType): JoinStruct;
+export function getBorderCharacters(templateName: BorderType): JoinStruct;
diff --git a/types/table/table-tests.ts b/types/table/table-tests.ts
index f3f4662b69..5cb1eaa19b 100644
--- a/types/table/table-tests.ts
+++ b/types/table/table-tests.ts
@@ -3,11 +3,15 @@ import * as table from 'table';
 const border: table.JoinStruct = table.getBorderCharacters('norc');
 
 const data = [
-  ['first name', 'last name'],
-  ['jane', 'doe'],
-  ['john', 'doe']
+    ['first name', 'last name'],
+    ['jane', 'doe'],
+    ['john', 'doe']
 ];
 
-const config: table.TableUserConfig = { border };
+const config: table.TableUserConfig = {
+    border,
+    columnCount: 1,
+    drawHorizontalLine: () => true
+};
 
 table.table(data, config);
diff --git a/types/tabris-plugin-firebase/index.d.ts b/types/tabris-plugin-firebase/index.d.ts
index 3a9e7b350f..0ade0c9dcf 100644
--- a/types/tabris-plugin-firebase/index.d.ts
+++ b/types/tabris-plugin-firebase/index.d.ts
@@ -68,7 +68,6 @@ declare class NativeObject {
 
     /**
      * Gets the current value of the given *property*.
-     * @param property
      */
     get(property: string): any;
 
@@ -116,14 +115,11 @@ declare class NativeObject {
 
     /**
      * Sets the given property.
-     * @param property
-     * @param value
      */
     set(property: string, value: any): this;
 
     /**
      * Sets all key-value pairs in the properties object as widget properties.
-     * @param properties
      */
     set(properties: object): this;
 
@@ -137,9 +133,8 @@ declare class NativeObject {
 
     /**
      * An application-wide unique identifier automatically assigned to all native objects on creation.
-     * @static
      */
-    readonly cid: string;
+    static readonly cid: string;
 }
 
 interface PropertyChangedEvent<T, U> {
diff --git a/types/tabris-plugin-firebase/tsconfig.json b/types/tabris-plugin-firebase/tsconfig.json
index 38a1c8d42c..118339f812 100644
--- a/types/tabris-plugin-firebase/tsconfig.json
+++ b/types/tabris-plugin-firebase/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/tabtab/tslint.json b/types/tabtab/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tabtab/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tapable/tslint.json b/types/tapable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tapable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tape/index.d.ts b/types/tape/index.d.ts
index d7da838859..581a669606 100644
--- a/types/tape/index.d.ts
+++ b/types/tape/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for tape v4.2.29
+// Type definitions for tape v4.2.30
 // Project: https://github.com/substack/tape
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Haoqun Jiang <https://github.com/sodatea>
 //                 Dennis Schwartz <https://github.com/DennisSchwartz>
+//                 Michael Henretty <https://github.com/mikehenrty>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -73,6 +74,7 @@ declare namespace tape {
          * Additional tests queued up after t will not be run until all subtests finish.
          */
         test(name: string, cb: tape.TestCase): void;
+        test(name: string, opts: TestOptions, cb: tape.TestCase): void;
 
         /**
          * Declare that n assertions should be run. end() will be called automatically after the nth assertion.
diff --git a/types/tape/tape-tests.ts b/types/tape/tape-tests.ts
index 09847fe9a9..6f5ad605e5 100644
--- a/types/tape/tape-tests.ts
+++ b/types/tape/tape-tests.ts
@@ -156,5 +156,9 @@ tape(name, (test: tape.Test) => {
 		t = st;
 	});
 
+	test.test(name, opts, (st) => {
+		t = st;
+	});
+
 	test.comment(msg);
 });
diff --git a/types/tape/tslint.json b/types/tape/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tape/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tcp-ping/index.d.ts b/types/tcp-ping/index.d.ts
new file mode 100644
index 0000000000..615b0f9241
--- /dev/null
+++ b/types/tcp-ping/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for tcp-ping 0.1
+// Project: https://github.com/wesolyromek/tcp-ping
+// Definitions by: JUNG YONG WOO <https://github.com/stegano>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Options {
+    address?: string;
+    port?: number;
+    attempts?: number;
+    timeout?: number;
+}
+
+export interface Results {
+    seq: number | undefined;
+    time: number | undefined;
+    error?: Error;
+}
+
+export interface Result {
+    address: string;
+    port: number;
+    attempts: number;
+    avg: number;
+    max: number;
+    min: number;
+    results: Results[];
+}
+
+export function ping(options: Options, callback: (error: Error, result: Result) => void): void;
+export function probe(address: string, port: number, callback: (error: Error, result: Result) => void): void;
diff --git a/types/tcp-ping/tcp-ping-tests.ts b/types/tcp-ping/tcp-ping-tests.ts
new file mode 100644
index 0000000000..cebb178c34
--- /dev/null
+++ b/types/tcp-ping/tcp-ping-tests.ts
@@ -0,0 +1,27 @@
+import * as tp from 'tcp-ping';
+
+// $ExpectType void
+tp.ping({}, (err, result) => {
+    // $ExpectType Result
+    result;
+    // $ExpectType Results[]
+    result.results;
+});
+
+// $ExpectError
+tp.ping();
+
+// $ExpectError
+tp.ping({});
+
+// $ExpectType void
+tp.probe("localhost", 8080, () => {});
+
+// $ExpectError
+tp.probe("localhost", 8080);
+
+// $ExpectError
+tp.probe("localhost");
+
+// $ExpectError
+tp.probe();
diff --git a/types/tcp-ping/tsconfig.json b/types/tcp-ping/tsconfig.json
new file mode 100644
index 0000000000..20d82ad303
--- /dev/null
+++ b/types/tcp-ping/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "tcp-ping-tests.ts"
+    ]
+}
diff --git a/types/tcp-ping/tslint.json b/types/tcp-ping/tslint.json
new file mode 100644
index 0000000000..495d29983d
--- /dev/null
+++ b/types/tcp-ping/tslint.json
@@ -0,0 +1,5 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+    }
+}
diff --git a/types/tea-merge/tslint.json b/types/tea-merge/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tea-merge/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tedious/tslint.json b/types/tedious/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tedious/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/teechart/tslint.json b/types/teechart/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/teechart/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/temp-fs/tslint.json b/types/temp-fs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/temp-fs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/terminal-menu/tslint.json b/types/terminal-menu/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/terminal-menu/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tesseract.js/tslint.json b/types/tesseract.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tesseract.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tether-drop/index.d.ts b/types/tether-drop/index.d.ts
index 5e05987670..758e8f80e2 100644
--- a/types/tether-drop/index.d.ts
+++ b/types/tether-drop/index.d.ts
@@ -2,8 +2,7 @@
 // Project: https://github.hubspot.com/drop/
 // Definitions by: Adi Dahiya <https://github.com/adidahiya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference types="tether" />
+// TypeScript Version: 2.3
 
 import Tether = require("tether");
 
diff --git a/types/tether-drop/tslint.json b/types/tether-drop/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tether-drop/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tether-shepherd/tslint.json b/types/tether-shepherd/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tether-shepherd/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tether/tslint.json b/types/tether/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tether/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/text-buffer/README.md b/types/text-buffer/README.md
index f4d852a5e5..969eaf20e9 100644
--- a/types/text-buffer/README.md
+++ b/types/text-buffer/README.md
@@ -29,3 +29,19 @@ The three primary classes of TextBuffer are Point, Range, and TextBuffer, yet th
 ```ts
 function example(marker: TextBuffer.Marker) {}
 ```
+
+### Exposing Private Methods and Properties
+
+[Declaration Merging](https://www.typescriptlang.org/docs/handbook/declaration-merging.html) can be used to augment any of the types used within Text Buffer. As an example, if we wanted to reveal the private ```emitDidStopChangingEvent``` method within the TextBuffer class, then we would create a file with the following contents:
+
+```ts
+// <<filename>>.d.ts
+
+declare namespace TextBuffer {
+  interface TextBuffer {
+    emitDidStopChangingEvent(): void;
+  }
+}
+```
+
+Once this file is either referenced or included within your project, then this new member function would be freely usable on instances of the TextBuffer class without TypeScript reporting errors.
diff --git a/types/text-buffer/index.d.ts b/types/text-buffer/index.d.ts
index feae93f5b1..103f34fab7 100644
--- a/types/text-buffer/index.d.ts
+++ b/types/text-buffer/index.d.ts
@@ -2,1416 +2,1479 @@
 // Project: https://github.com/atom/text-buffer
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
-/// <reference types="event-kit" />
-/// <reference types="pathwatcher" />
+import { Disposable } from "event-kit";
+import { File } from "pathwatcher";
 
 declare global {
-	namespace TextBuffer {
-		/** Objects that appear as parameters to callbacks. */
-		namespace Events {
-			interface BufferWatchError {
-				/** The error object. */
-				error: Error;
+    namespace TextBuffer {
+        /**
+         *  The event objects that are passed into the callbacks which the user provides to
+         *  specific API calls.
+         */
+        namespace Events {
+            interface BufferWatchError {
+                /** The error object. */
+                error: Error;
 
-				/** Call this function to indicate you have handled the error.
-				 *  The error will not be thrown if this function is called.
-				 */
-				handle(): void;
-			}
+                /**
+                 *  Call this function to indicate you have handled the error.
+                 *  The error will not be thrown if this function is called.
+                 */
+                handle(): void;
+            }
+
+            interface FileSaved {
+                /** The path to which the buffer was saved. */
+                path: string;
+            }
+
+            interface MarkerChanged {
+                /** Point representing the former head position. */
+                oldHeadPosition: Point;
+
+                /** Point representing the new head position. */
+                newHeadPosition: Point;
+
+                /** Point representing the former tail position. */
+                oldTailPosition: Point;
+
+                /** Point representing the new tail position. */
+                newTailPosition: Point;
+
+                /** Boolean indicating whether the marker was valid before the change. */
+                wasValid: boolean;
+
+                /** Boolean indicating whether the marker is now valid. */
+                isValid: boolean;
+
+                /** Boolean indicating whether the marker had a tail before the change. */
+                hadTail: boolean;
+
+                /** Boolean indicating whether the marker now has a tail. */
+                hasTail: boolean;
+
+                /**
+                 *  Object containing the marker's custom properties before the change.
+                 *  @deprecated
+                 */
+                oldProperties: object;
+
+                /**
+                 *  Object containing the marker's custom properties after the change.
+                 *  @deprecated
+                 */
+                newProperties: object;
+
+                /**
+                 *  Boolean indicating whether this change was caused by a textual
+                 *  change to the buffer or whether the marker was manipulated directly
+                 *  via its public API.
+                 */
+                textChanged: boolean;
+            }
+
+            interface DisplayMarkerChanged {
+                /** Point representing the former head buffer position. */
+                oldHeadBufferPosition: Point;
+
+                /** Point representing the new head buffer position. */
+                newHeadBufferPosition: Point;
+
+                // Point representing the former tail buffer position. */
+                oldTailBufferPosition: Point;
+
+                /** Point representing the new tail buffer position. */
+                newTailBufferPosition: Point;
+
+                /** Point representing the former head screen position. */
+                oldHeadScreenPosition: Point;
+
+                /** Point representing the new head screen position. */
+                newHeadScreenPosition: Point;
+
+                /** Point representing the former tail screen position. */
+                oldTailScreenPosition: Point;
+
+                /** Point representing the new tail screen position. */
+                newTailScreenPosition: Point;
+
+                /** Boolean indicating whether the marker was valid before the change. */
+                wasValid: boolean;
+
+                /** Boolean indicating whether the marker is now valid. */
+                isValid: boolean;
+
+                /** Boolean indicating whether the marker had a tail before the change. */
+                hadTail: boolean;
+
+                /** Boolean indicating whether the marker now has a tail */
+                hasTail: boolean;
+
+                /**
+                 *  Object containing the marker's custom properties before the change.
+                 *  @deprecated
+                 */
+                oldProperties: object;
 
-			interface FileSaved {
-				/** The path to which the buffer was saved. */
-				path: string;
-			}
+                /**
+                 *  Object containing the marker's custom properties after the change.
+                 *  @deprecated
+                 */
+                newProperties: object;
 
-			interface MarkerChanged {
-				/** Point representing the former head position. */
-				oldHeadPosition: Point;
+                /**
+                 *  Boolean indicating whether this change was caused by a textual change to the
+                 *  buffer or whether the marker was manipulated directly via its public API.
+                 */
+                textChanged: boolean;
+            }
 
-				/** Point representing the new head position. */
-				newHeadPosition: Point;
+            interface BufferChanging {
+                /** Range of the old text. */
+                oldRange: Range;
+            }
 
-				/** Point representing the former tail position. */
-				oldTailPosition: Point;
+            interface BufferChanged {
+                /** Range of the old text. */
+                oldRange: Range;
 
-				/** Point representing the new tail position. */
-				newTailPosition: Point;
+                /** Range of the new text. */
+                newRange: Range;
 
-				/** Boolean indicating whether the marker was valid before the change. */
-				wasValid: boolean;
+                /** String containing the text that was replaced. */
+                oldText: string;
 
-				/** Boolean indicating whether the marker is now valid. */
-				isValid: boolean;
+                /** String containing the text that was inserted. */
+                newText: string;
+            }
 
-				/** Boolean indicating whether the marker had a tail before the change. */
-				hadTail: boolean;
+            interface BufferStoppedChanging {
+                changes: Structures.TextChange[];
+            }
+        }
 
-				/** Boolean indicating whether the marker now has a tail. */
-				hasTail: boolean;
+        /**
+         *  The option objects that the user is expected to fill out and provide to
+         *  specific API calls.
+         */
+        namespace Options {
+            interface BufferLoad {
+                /** The file's encoding. */
+                encoding?: string;
 
-				/** -DEPRECATED- Object containing the marker's custom properties before the change.
-				 *  @deprecated
-				 */
-				oldProperties: object;
-
-				/** -DEPRECATED- Object containing the marker's custom properties after the change.
-				 *  @deprecated
-				 */
-				newProperties: object;
+                /**
+                 *  A function that returns a boolean indicating whether the buffer should
+                 *  be destroyed if its file is deleted.
+                 */
+                shouldDestroyOnFileDelete?(): boolean;
+            }
 
-				/** Boolean indicating whether this change was caused by a textual
-				 *  change to the buffer or whether the marker was manipulated directly
-				 *  via its public API.
-				 */
-				textChanged: boolean;
-			}
+            interface FindMarker {
+                /** Only include markers that start at the given Point. */
+                startPosition?: PointCompatible;
 
-			interface DisplayMarkerChanged {
-				/** Point representing the former head buffer position. */
-				oldHeadBufferPosition: Point;
+                /** Only include markers that end at the given Point. */
+                endPosition?: PointCompatible;
 
-				/** Point representing the new head buffer position. */
-				newHeadBufferPosition: Point;
+                /** Only include markers that start inside the given Range. */
+                startsInRange?: RangeCompatible;
 
-				// Point representing the former tail buffer position. */
-				oldTailBufferPosition: Point;
+                /** Only include markers that end inside the given Range. */
+                endsInRange?: RangeCompatible;
 
-				/** Point representing the new tail buffer position. */
-				newTailBufferPosition: Point;
+                /** Only include markers that contain the given Point, inclusive. */
+                containsPoint?: PointCompatible;
 
-				/** Point representing the former head screen position. */
-				oldHeadScreenPosition: Point;
+                /** Only include markers that contain the given Range, inclusive. */
+                containsRange?: RangeCompatible;
 
-				/** Point representing the new head screen position. */
-				newHeadScreenPosition: Point;
+                /** Only include markers that start at the given row number. */
+                startRow?: number;
 
-				/** Point representing the former tail screen position. */
-				oldTailScreenPosition: Point;
+                /** Only include markers that end at the given row number. */
+                endRow?: number;
 
-				/** Point representing the new tail screen position. */
-				newTailScreenPosition: Point;
+                /** Only include markers that intersect the given row number. */
+                intersectsRow?: number;
+            }
 
-				/** Boolean indicating whether the marker was valid before the change. */
-				wasValid: boolean;
+            interface FindDisplayMarker {
+                /** Only include markers starting at this Point in buffer coordinates. */
+                startBufferPosition?: PointCompatible;
 
-				/** Boolean indicating whether the marker is now valid. */
-				isValid: boolean;
+                /** Only include markers ending at this Point in buffer coordinates. */
+                endBufferPosition?: PointCompatible;
+
+                /** Only include markers starting at this Point in screen coordinates. */
+                startScreenPosition?: PointCompatible;
+
+                /** Only include markers ending at this Point in screen coordinates. */
+                endScreenPosition?: PointCompatible;
+
+                /** Only include markers starting inside this Range in buffer coordinates. */
+                startsInBufferRange?: RangeCompatible;
+
+                /** Only include markers ending inside this Range in buffer coordinates. */
+                endsInBufferRange?: RangeCompatible;
+
+                /** Only include markers starting inside this Range in screen coordinates. */
+                startsInScreenRange?: RangeCompatible;
+
+                /** Only include markers ending inside this Range in screen coordinates. */
+                endsInScreenRange?: RangeCompatible;
+
+                /** Only include markers starting at this row in buffer coordinates. */
+                startBufferRow?: number;
+
+                /** Only include markers ending at this row in buffer coordinates. */
+                endBufferRow?: number;
+
+                /** Only include markers starting at this row in screen coordinates. */
+                startScreenRow?: number;
+
+                /** Only include markers ending at this row in screen coordinates. */
+                endScreenRow?: number;
+
+                /**
+                 *  Only include markers intersecting this Array of [startRow, endRow] in
+                 *  buffer coordinates.
+                 */
+                intersectsBufferRowRange?: [number, number];
+
+                /**
+                 *  Only include markers intersecting this Array of [startRow, endRow] in
+                 *  screen coordinates.
+                 */
+                intersectsScreenRowRange?: [number, number];
+
+                /** Only include markers containing this Range in buffer coordinates. */
+                containsBufferRange?: RangeCompatible;
+
+                /** Only include markers containing this Point in buffer coordinates. */
+                containsBufferPosition?: PointCompatible;
+
+                /** Only include markers contained in this Range in buffer coordinates. */
+                containedInBufferRange?: RangeCompatible;
+
+                /** Only include markers contained in this Range in screen coordinates. */
+                containedInScreenRange?: RangeCompatible;
+
+                /** Only include markers intersecting this Range in buffer coordinates. */
+                intersectsBufferRange?: RangeCompatible;
+
+                /** Only include markers intersecting this Range in screen coordinates. */
+                intersectsScreenRange?: RangeCompatible;
+            }
+
+            interface CopyMarker {
+                /** Whether or not the marker should be tailed. */
+                tailed?: boolean;
+
+                /** Creates the marker in a reversed orientation. */
+                reversed?: boolean;
+
+                /** Determines the rules by which changes to the buffer invalidate the marker. */
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch";
+
+                /**
+                 *  Indicates whether insertions at the start or end of the marked range should
+                 *  be interpreted as happening outside the marker.
+                 */
+                exclusive?: boolean;
+
+                /**
+                 *  Custom properties to be associated with the marker.
+                 *  @deprecated
+                 */
+                properties?: object;
+            }
+
+            interface ScanContext {
+                /** The number of lines before the matched line to include in the results object. */
+                leadingContextLineCount?: number;
+
+                /** The number of lines after the matched line to include in the results object. */
+                trailingContextLineCount?: number;
+            }
+        }
+
+        /** The structures that are passed to the user by Atom following specific API calls. */
+        namespace Structures {
+            interface TextChange {
+                newExtent: Point;
+                oldExtent: Point;
+                newRange: Range;
+                oldRange: Range;
+                newText: string;
+                oldText: string;
+                start: Point;
+            }
+
+            interface BufferScanResult {
+                buffer: TextBuffer;
+                lineText: string;
+                match: RegExpExecArray;
+                matchText: string;
+                range: Range;
+                replace(replacementText: string): void;
+                stop(): void;
+                stopped: boolean;
+            }
+
+            interface ContextualBufferScanResult extends BufferScanResult {
+                leadingContextLines: string[];
+                trailingContextLines: string[];
+            }
+        }
+
+        /**
+         *  Represents a buffer annotation that remains logically stationary even as
+         *  the buffer changes.
+         */
+        interface Marker {
+            // Properties
+            id: number;
+            tailed: boolean;
+            reversed: boolean;
+            valid: boolean;
+            invalidate: string;
+            properties: object;
+
+            // Lifecycle
+            /**
+             *  Creates and returns a new Marker with the same properties as this
+             *  marker.
+             */
+            copy(options?: Options.CopyMarker): Marker;
+
+            /** Destroys the marker, causing it to emit the "destroyed" event. */
+            destroy(): void;
+
+            // Event Subscription
+            /** Invoke the given callback when the marker is destroyed. */
+            onDidDestroy(callback: () => void): Disposable;
+
+            /** Invoke the given callback when the state of the marker changes. */
+            onDidChange(callback: (event: Events.MarkerChanged) => void): Disposable;
+
+            // Marker Details
+            /** Returns the current range of the marker. The range is immutable. */
+            getRange(): Range;
+
+            /** Returns a point representing the marker's current head position. */
+            getHeadPosition(): Point;
+
+            /** Returns a point representing the marker's current tail position. */
+            getTailPosition(): Point;
+
+            /**
+             *  Returns a point representing the start position of the marker, which
+             *  could be the head or tail position, depending on its orientation.
+             */
+            getStartPosition(): Point;
+
+            /**
+             *  Returns a point representing the end position of the marker, which
+             *  could be the head or tail position, depending on its orientation.
+             */
+            getEndPosition(): Point;
+
+            /** Returns a boolean indicating whether the head precedes the tail. */
+            isReversed(): boolean;
+
+            /** Returns a boolean indicating whether the marker has a tail. */
+            hasTail(): boolean;
+
+            /** Is the marker valid? */
+            isValid(): boolean;
+
+            /** Is the marker destroyed? */
+            isDestroyed(): boolean;
+
+            /**
+             *  Returns a boolean indicating whether changes that occur exactly at
+             *  the marker's head or tail cause it to move.
+             */
+            isExclusive(): boolean;
+
+            /** Get the invalidation strategy for this marker. */
+            getInvalidationStrategy(): string;
+
+            // Mutating Markers
+            /**
+             *  Sets the range of the marker.
+             *  Returns a boolean indicating whether or not the marker was updated.
+             */
+            setRange(range: RangeCompatible, params?: { reversed?: boolean, exclusive?:
+                boolean }): boolean;
+
+            /**
+             *  Sets the head position of the marker.
+             *  Returns a boolean indicating whether or not the marker was updated.
+             */
+            setHeadPosition(position: PointCompatible): boolean;
+
+            /**
+             *  Sets the tail position of the marker.
+             *  Returns a boolean indicating whether or not the marker was updated.
+             */
+            setTailPosition(position: PointCompatible): boolean;
+
+            /**
+             *  Removes the marker's tail.
+             *  Returns a boolean indicating whether or not the marker was updated.
+             */
+            clearTail(): boolean;
+
+            /**
+             *  Plants the marker's tail at the current head position.
+             *  Returns a boolean indicating whether or not the marker was updated.
+             */
+            plantTail(): boolean;
+
+            // Comparison
+            /**
+             *  Returns a boolean indicating whether this marker is equivalent to
+             *  another marker, meaning they have the same range and options.
+             */
+            isEqual(other: Marker): boolean;
+
+            /**
+             *  Compares this marker to another based on their ranges.
+             *  Returns "-1" if this marker precedes the argument.
+             *  Returns "0" if this marker is equivalent to the argument.
+             *  Returns "1" if this marker follows the argument.
+             */
+            compare(other: Marker): number;
+        }
+
+        /** Experimental: A container for a related set of markers. */
+        interface MarkerLayer {
+            // Lifecycle
+            /** Create a copy of this layer with markers in the same state and locations. */
+            copy(): MarkerLayer;
+
+            /** Destroy this layer. */
+            destroy(): boolean;
+
+            /** Remove all markers from this layer. */
+            clear(): void;
+
+            /** Determine whether this layer has been destroyed. */
+            isDestroyed(): boolean;
+
+            // Querying
+            /** Get an existing marker by its id. */
+            getMarker(id: number): Marker|undefined;
+
+            /** Get all existing markers on the marker layer. */
+            getMarkers(): Marker[];
+
+            /** Get the number of markers in the marker layer. */
+            getMarkerCount(): number;
+
+            /** Find markers in the layer conforming to the given parameters. */
+            findMarkers(params: Options.FindMarker): Marker[];
+
+            // Marker Creation
+            /** Create a marker with the given range. */
+            markRange(range: RangeCompatible, options?: {
+                reversed?: boolean,
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+                exclusive?: boolean,
+            }): Marker;
+
+            /** Create a marker at with its head at the given position with no tail. */
+            markPosition(position: PointCompatible, options?: {
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+                exclusive?: boolean,
+            }): Marker;
+
+            // Event Subscription
+            /**
+             *  Subscribe to be notified asynchronously whenever markers are created,
+             *  updated, or destroyed on this layer.
+             */
+            onDidUpdate(callback: () => void): Disposable;
+
+            /**
+             *  Subscribe to be notified synchronously whenever markers are created on
+             *  this layer.
+             */
+            onDidCreateMarker(callback: (marker: Marker) => void): Disposable;
+
+            /** Subscribe to be notified synchronously when this layer is destroyed. */
+            onDidDestroy(callback: () => void): Disposable;
+        }
+
+        /**
+         *  Represents a buffer annotation that remains logically stationary even as the
+         *  buffer changes. This is used to represent cursors, folds, snippet targets,
+         *  misspelled words, and anything else that needs to track a logical location
+         *  in the buffer over time.
+         */
+        interface DisplayMarker {
+            // Construction and Destruction
+            /**
+             *  Destroys the marker, causing it to emit the 'destroyed' event. Once destroyed,
+             *  a marker cannot be restored by undo/redo operations.
+             */
+            destroy(): void;
+
+            /** Creates and returns a new DisplayMarker with the same properties as this marker. */
+            copy(options?: Options.CopyMarker): DisplayMarker;
+
+            // Event Subscription
+            /** Invoke the given callback when the state of the marker changes. */
+            onDidChange(callback: (event: Events.DisplayMarkerChanged) => void):
+                Disposable;
+
+            /** Invoke the given callback when the marker is destroyed. */
+            onDidDestroy(callback: () => void): Disposable;
+
+            // TextEditorMarker Details
+            /**
+             *  Returns a boolean indicating whether the marker is valid. Markers can be
+             *  invalidated when a region surrounding them in the buffer is changed.
+             */
+            isValid(): boolean;
+
+            /**
+             *  Returns a boolean indicating whether the marker has been destroyed. A marker
+             *  can be invalid without being destroyed, in which case undoing the invalidating
+             *  operation would restore the marker.
+             */
+            isDestroyed(): boolean;
+
+            /** Returns a boolean indicating whether the head precedes the tail. */
+            isReversed(): boolean;
+
+            /**
+             *  Returns a boolean indicating whether changes that occur exactly at the marker's
+             *  head or tail cause it to move.
+             */
+            isExclusive(): boolean;
+
+            /**
+             *  Get the invalidation strategy for this marker.
+             *  Valid values include: never, surround, overlap, inside, and touch.
+             */
+            getInvalidationStrategy(): string;
+
+            /** Returns an Object containing any custom properties associated with the marker. */
+            getProperties(): object;
+
+            /** Merges an Object containing new properties into the marker's existing properties. */
+            setProperties(properties: object): void;
+
+            /** Returns whether this marker matches the given parameters. */
+            matchesProperties(attributes: Options.FindDisplayMarker): boolean;
+
+            // Comparing to other markers
+            /** Compares this marker to another based on their ranges. */
+            compare(other: DisplayMarker): number;
+
+            /**
+             *  Returns a boolean indicating whether this marker is equivalent to another
+             *  marker, meaning they have the same range and options.
+             */
+            isEqual(other: DisplayMarker): boolean;
+
+            // Managing the marker's range
+            /** Gets the buffer range of this marker. */
+            getBufferRange(): Range;
+
+            /** Gets the screen range of this marker. */
+            getScreenRange(): Range;
+
+            /** Modifies the buffer range of this marker. */
+            setBufferRange(bufferRange: RangeCompatible, properties?: { reversed: boolean }):
+                void;
+
+            /** Modifies the screen range of this marker. */
+            setScreenRange(screenRange: RangeCompatible, options?: { reversed?: boolean,
+                clipDirection?: "backward"|"forward"|"closest" }): void;
+
+            /**
+             *  Retrieves the screen position of the marker's start. This will always be
+             *  less than or equal to the result of DisplayMarker::getEndScreenPosition.
+             */
+            getStartScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+                Point;
+
+            /**
+             *  Retrieves the screen position of the marker's end. This will always be
+             *  greater than or equal to the result of DisplayMarker::getStartScreenPosition.
+             */
+            getEndScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+                Point;
+
+            /** Retrieves the buffer position of the marker's head. */
+            getHeadBufferPosition(): Point;
+
+            /** Sets the buffer position of the marker's head. */
+            setHeadBufferPosition(bufferPosition: PointCompatible): void;
+
+            /** Retrieves the screen position of the marker's head. */
+            getHeadScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+                Point;
+
+            /** Sets the screen position of the marker's head. */
+            setHeadScreenPosition(screenPosition: PointCompatible,
+                options?: { clipDirection: "backward"|"forward"|"closest" }): void;
+
+            /** Retrieves the buffer position of the marker's tail. */
+            getTailBufferPosition(): Point;
+
+            /** Sets the buffer position of the marker's tail. */
+            setTailBufferPosition(bufferPosition: PointCompatible): void;
+
+            /** Retrieves the screen position of the marker's tail. */
+            getTailScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
+                Point;
+
+            /** Sets the screen position of the marker's tail. */
+            setTailScreenPosition(screenPosition: PointCompatible,
+                options?: { clipDirection: "backward"|"forward"|"closest" }): void;
+
+            /**
+             *  Retrieves the buffer position of the marker's start. This will always be less
+             *  than or equal to the result of DisplayMarker::getEndBufferPosition.
+             */
+            getStartBufferPosition(): Point;
+
+            /**
+             *  Retrieves the buffer position of the marker's end. This will always be greater
+             *  than or equal to the result of DisplayMarker::getStartBufferPosition.
+             */
+            getEndBufferPosition(): Point;
+
+            /** Returns a boolean indicating whether the marker has a tail. */
+            hasTail(): boolean;
+
+            /**
+             *  Plants the marker's tail at the current head position. After calling the
+             *  marker's tail position will be its head position at the time of the call,
+             *  regardless of where the marker's head is moved.
+             */
+            plantTail(): void;
+
+            /**
+             *  Removes the marker's tail. After calling the marker's head position will be
+             *  reported as its current tail position until the tail is planted again.
+             */
+            clearTail(): void;
+        }
+
+        /**
+         *  Experimental: A container for a related set of markers at the DisplayLayer level.
+         *  Wraps an underlying MarkerLayer on the TextBuffer.
+         *
+         *  This API is experimental and subject to change on any release.
+         */
+        interface DisplayMarkerLayer {
+            // Lifecycle
+            /** Destroy this layer. */
+            destroy(): void;
+
+            /** Destroy all markers in this layer. */
+            clear(): void;
+
+            /** Determine whether this layer has been destroyed. */
+            isDestroyed(): boolean;
+
+            // Event Subscription
+            /** Subscribe to be notified synchronously when this layer is destroyed. */
+            onDidDestroy(callback: () => void): Disposable;
+
+            /**
+             *  Subscribe to be notified asynchronously whenever markers are created, updated,
+             *  or destroyed on this layer. Prefer this method for optimal performance when
+             *  interacting with layers that could contain large numbers of markers.
+             */
+            onDidUpdate(callback: () => void): Disposable;
+
+            /**
+             *  Subscribe to be notified synchronously whenever markers are created on this
+             *  layer. Avoid this method for optimal performance when interacting with layers
+             *  that could contain large numbers of markers.
+             */
+            onDidCreateMarker(callback: (marker: DisplayMarker|Marker) => void): Disposable;
+
+            // Marker creation
+            /** Create a marker with the given screen range. */
+            markScreenRange(range: RangeCompatible, options?: {
+                reversed?: boolean,
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+                exclusive?: boolean,
+                clipDirection?: "backward"|"forward"|"closest"
+            }): DisplayMarker;
+
+            /**
+             *  Create a marker on this layer with its head at the given screen position
+             *  and no tail.
+             */
+            markScreenPosition(screenPosition: PointCompatible, options?: {
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+                exclusive?: boolean,
+                clipDirection?: "backward"|"forward"|"closest"
+            }): DisplayMarker;
+
+            /** Create a marker with the given buffer range. */
+            markBufferRange(range: RangeCompatible, options?: {
+                reversed?: boolean,
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+                exclusive?: boolean
+            }): DisplayMarker;
+
+            /**
+             *  Create a marker on this layer with its head at the given buffer position
+             *  and no tail.
+             */
+            markBufferPosition(bufferPosition: PointCompatible, options?: {
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+                exclusive?: boolean
+            }): DisplayMarker;
+
+            // Querying
+            /** Get an existing marker by its id. */
+            getMarker(id: number): DisplayMarker;
+
+            /** Get all markers in the layer. */
+            getMarkers(): DisplayMarker[];
+
+            /** Get the number of markers in the marker layer. */
+            getMarkerCount(): number;
+
+            /**
+             *  Find markers in the layer conforming to the given parameters.
+             *
+             *  This method finds markers based on the given properties. Markers can be associated
+             *  with custom properties that will be compared with basic equality. In addition,
+             *  there are several special properties that will be compared with the range of the
+             *  markers rather than their properties.
+             */
+            findMarkers(properties: Options.FindDisplayMarker): DisplayMarker[];
+        }
+
+        /** Represents a point in a buffer in row/column coordinates. */
+        interface Point {
+            // Properties
+            /** A zero-indexed number representing the row of the Point. */
+            row: number;
+
+            /** A zero-indexed number representing the column of the Point. */
+            column: number;
+
+            // Construction
+            /** Returns a new Point with the same row and column. */
+            copy(): Point;
+
+            /** Returns a new Point with the row and column negated. */
+            negate(): Point;
+
+            // Comparison
+            /**
+             *  Compare another Point to this Point instance.
+             *  Returns -1 if this point precedes the argument.
+             *  Returns 0 if this point is equivalent to the argument.
+             *  Returns 1 if this point follows the argument.
+             */
+            compare(other: PointCompatible): number;
+
+            /**
+             *  Returns a boolean indicating whether this point has the same row and
+             *  column as the given Point.
+             */
+            isEqual(other: PointCompatible): boolean;
+
+            /** Returns a Boolean indicating whether this point precedes the given Point. */
+            isLessThan(other: PointCompatible): boolean;
+
+            /**
+             *  Returns a Boolean indicating whether this point precedes or is equal to
+             *  the given Point.
+             */
+            isLessThanOrEqual(other: PointCompatible): boolean;
+
+            /** Returns a Boolean indicating whether this point follows the given Point. */
+            isGreaterThan(other: PointCompatible): boolean;
+
+            /**
+             *  Returns a Boolean indicating whether this point follows or is equal to
+             *  the given Point.
+             */
+            isGreaterThanOrEqual(other: PointCompatible): boolean;
+
+            // Operations
+            /** Makes this point immutable and returns itself. */
+            freeze(): Readonly<Point>;
+
+            /**
+             *  Build and return a new point by adding the rows and columns of the
+             *  given point.
+             */
+            translate(other: PointCompatible): Point;
+
+            /**
+             *  Build and return a new Point by traversing the rows and columns
+             *  specified by the given point.
+             */
+            traverse(other: PointCompatible): Point;
+
+            /** Returns an array of this point's row and column. */
+            toArray(): [number, number];
+
+            /** Returns an array of this point's row and column. */
+            serialize(): [number, number];
+
+            /** Returns a string representation of the point. */
+            toString(): string;
+        }
+
+        /** The static side to the Point class. */
+        interface PointStatic {
+            /**
+             *  Create a Point from an array containing two numbers representing the
+             *  row and column.
+             */
+            fromObject(object: PointCompatible, copy?: boolean): Point;
+
+            /** Construct a Point object */
+            new (row?: number, column?: number): Point;
+
+            /** Returns the given Point that is earlier in the buffer. */
+            min(point1: PointCompatible, point2: PointCompatible): Point;
+        }
+
+        /** The types usable when constructing a point via the Point::fromObject method. */
+        type PointCompatible = PointLike|[number, number];
+
+        /** The interface that should be implemented for all "point-compatible" objects. */
+        interface PointLike {
+            /** A zero-indexed number representing the row of the Point. */
+            row: number;
+
+            /** A zero-indexed number representing the column of the Point. */
+            column: number;
+        }
+
+        /** Represents a region in a buffer in row/column coordinates. */
+        interface Range {
+            // Properties
+            /** A Point representing the start of the Range. */
+            start: PointLike;
+
+            /** A Point representing the end of the Range. */
+            end: PointLike;
+
+            // Construction
+            /** Returns a new range with the same start and end positions. */
+            copy(): Range;
+
+            /** Returns a new range with the start and end positions negated. */
+            negate(): Range;
+
+            // Serialization and Deserialization
+            /** Returns a plain javascript object representation of the range. */
+            serialize(): number[][];
+
+            // Range Details
+            /** Is the start position of this range equal to the end position? */
+            isEmpty(): boolean;
+
+            /**
+             *  Returns a boolean indicating whether this range starts and ends on the
+             *  same row.
+             */
+            isSingleLine(): boolean;
+
+            /** Get the number of rows in this range. */
+            getRowCount(): number;
+
+            /** Returns an array of all rows in the range. */
+            getRows(): number[];
+
+            // Operations
+            /**
+             *  Freezes the range and its start and end point so it becomes immutable
+             *  and returns itself.
+             */
+            freeze(): Readonly<Range>;
+
+            // NOTE: this function doesn't actually take a range-compatible parameter.
+            /** Returns a new range that contains this range and the given range. */
+            union(other: RangeLike): Range;
+
+            /**
+             *  Build and return a new range by translating this range's start and end
+             *  points by the given delta(s).
+             */
+            translate(startDelta: PointCompatible, endDelta?: PointCompatible): Range;
+
+            /**
+             *  Build and return a new range by traversing this range's start and end
+             *  points by the given delta.
+             */
+            traverse(delta: PointCompatible): Range;
+
+            // Comparison
+            /**
+             *  Compare two Ranges.
+             *  Returns -1 if this range starts before the argument or contains it.
+             *  Returns 0 if this range is equivalent to the argument.
+             *  Returns 1 if this range starts after the argument or is contained by it.
+             */
+            compare(otherRange: RangeCompatible): number;
+
+            /**
+             *  Returns a Boolean indicating whether this range has the same start and
+             *  end points as the given Range.
+             */
+            isEqual(otherRange: RangeCompatible): boolean;
+
+            // NOTE: this function doesn't actually take a range-compatible parameter.
+            /**
+             *  Returns a Boolean indicating whether this range starts and ends on the
+             *  same row as the argument.
+             */
+            coversSameRows(otherRange: RangeLike): boolean;
+
+            // NOTE: this function doesn't actually take a range-compatible parameter.
+            /** Determines whether this range intersects with the argument. */
+            intersectsWith(otherRange: RangeLike, exclusive?: boolean): boolean;
+
+            /** Returns a boolean indicating whether this range contains the given range. */
+            containsRange(otherRange: RangeCompatible, exclusive?: boolean): boolean;
+
+            /** Returns a boolean indicating whether this range contains the given point. */
+            containsPoint(point: PointCompatible, exclusive?: boolean): boolean;
+
+            /**
+             *  Returns a boolean indicating whether this range intersects the given
+             *  row number.
+             */
+            intersectsRow(row: number): boolean;
+
+            /**
+             *  Returns a boolean indicating whether this range intersects the row range
+             *  indicated by the given startRow and endRow numbers.
+             */
+            intersectsRowRange(startRow: number, endRow: number): boolean;
+
+            // Conversion
+            /** Returns a string representation of the range. */
+            toString(): string;
+        }
+
+        /** The static side to the Range class. */
+        interface RangeStatic {
+            /** Convert any range-compatible object to a Range. */
+            fromObject(object: RangeCompatible, copy?: boolean): Range;
+
+            /** Construct a Range object. */
+            new (pointA?: PointCompatible, pointB?: PointCompatible): Range;
+
+            /** Call this with the result of Range::serialize to construct a new Range. */
+            deserialize(array: object): Range;
+        }
+
+        /** The types usable when constructing a range via the Range::fromObject method. */
+        type RangeCompatible =
+            | RangeLike
+            | [PointLike, PointLike]
+            | [PointLike, [number, number]]
+            | [[number, number], PointLike]
+            | [[number, number], [number, number]];
+
+        /** The interface that should be implemented for all "range-compatible" objects. */
+        interface RangeLike {
+            /** A Point representing the start of the Range. */
+            start: PointLike;
+
+            /** A Point representing the end of the Range. */
+            end: PointLike;
+        }
+
+        /**
+         *  A mutable text container with undo/redo support and the ability to
+         *  annotate logical regions in the text.
+         */
+        interface TextBuffer {
+            // Properties
+            file: File;
+            lines: string[];
+            lineEndings: string[];
+            stoppedChangingDelay: number;
+            conflict: boolean;
+            loaded: boolean;
+            destroyed: boolean;
+            refcount: number;
+            id: string;
+
+            /**
+             *  Schedules a 'did-stop-changing' emission. The event will be emitted between
+             *  now and TextBuffer::stoppedChangingDelay milliseconds in the future.
+             */
+            debouncedEmitDidStopChangingEvent(): void;
+
+            // Lifecycle
+            /** Destroys the buffer, emitting the 'did-destroy' prior to doing so. */
+            destroy(): void;
+
+            /** Returns whether or not the given buffer is alive. */
+            isAlive(): boolean;
+
+            /** Returns whether or not the given buffer has been destroyed. */
+            isDestroyed(): boolean;
+
+            /** Returns whether or not this text buffer is currently retained. */
+            isRetained(): boolean;
+
+            /** Retains the text buffer, preventing its destruction via TextBuffer::release. */
+            retain(): TextBuffer;
+
+            /** Release the text buffer, destroying it if there are no other retainers. */
+            release(): TextBuffer;
+
+            // Event Subscription
+            /**
+             *  Invoke the given callback synchronously before the content of the buffer
+             *  changes.
+             */
+            onWillChange(callback: (event: Events.BufferChanging) => void): Disposable;
+
+            /**
+             *  Invoke the given callback synchronously when the content of the buffer
+             *  changes. You should probably not be using this in packages.
+             */
+            onDidChange(callback: (event: Events.BufferChanged) => void): Disposable;
+
+            /**
+             *  Invoke the given callback synchronously when a transaction finishes with
+             *  a list of all the changes in the transaction.
+             */
+            onDidChangeText(callback: (event: Events.BufferStoppedChanging) => void):
+                Disposable;
+
+            /**
+             *  Invoke the given callback asynchronously following one or more changes after
+             *  ::getStoppedChangingDelay milliseconds elapse without an additional change.
+             */
+            onDidStopChanging(callback: (event: Events.BufferStoppedChanging) => void):
+                Disposable;
+
+            /**
+             *  Invoke the given callback when the in-memory contents of the buffer become
+             *  in conflict with the contents of the file on disk.
+             */
+            onDidConflict(callback: () => void): Disposable;
+
+            /** Invoke the given callback if the value of ::isModified changes. */
+            onDidChangeModified(callback: (modified: boolean) => void): Disposable;
+
+            /**
+             *  Invoke the given callback when all marker ::onDidChange observers have been
+             *  notified following a change to the buffer.
+             */
+            onDidUpdateMarkers(callback: () => void): Disposable;
+
+            onDidCreateMarker(callback: (marker: Marker) => void): Disposable;
+
+            /** Invoke the given callback when the value of ::getPath changes. */
+            onDidChangePath(callback: (path: string) => void): Disposable;
+
+            /** Invoke the given callback when the value of ::getEncoding changes. */
+            onDidChangeEncoding(callback: (encoding: string) => void): Disposable;
+
+            /**
+             *  Invoke the given callback before the buffer is saved to disk. If the
+             *  given callback returns a promise, then the buffer will not be saved until
+             *  the promise resolves.
+             */
+            onWillSave(callback: () => Promise<void>|void): Disposable;
+
+            /** Invoke the given callback after the buffer is saved to disk. */
+            onDidSave(callback: (event: Events.FileSaved) => void): Disposable;
+
+            /** Invoke the given callback after the file backing the buffer is deleted. */
+            onDidDelete(callback: () => void): Disposable;
+
+            /**
+             *  Invoke the given callback before the buffer is reloaded from the contents
+             *  of its file on disk.
+             */
+            onWillReload(callback: () => void): Disposable;
+
+            /**
+             *  Invoke the given callback after the buffer is reloaded from the contents
+             *  of its file on disk.
+             */
+            onDidReload(callback: () => void): Disposable;
+
+            /** Invoke the given callback when the buffer is destroyed. */
+            onDidDestroy(callback: () => void): Disposable;
+
+            /** Invoke the given callback when there is an error in watching the file. */
+            onWillThrowWatchError(callback: (errorObject: Events.BufferWatchError) =>
+                void): Disposable;
+
+            /**
+             *  Get the number of milliseconds that will elapse without a change before
+             *  ::onDidStopChanging observers are invoked following a change.
+             */
+            getStoppedChangingDelay(): number;
+
+            /** Performs the necessary work, then emits the 'did-stop-changing' event. */
+            emitDidStopChangingEvent(): void;
+
+            // File Details
+            /**
+             *  Determine if the in-memory contents of the buffer differ from its contents
+             *  on disk.
+             *  If the buffer is unsaved, always returns true unless the buffer is empty.
+             */
+            isModified(): boolean;
+
+            /**
+             *  Determine if the in-memory contents of the buffer conflict with the on-disk
+             *  contents of its associated file.
+             */
+            isInConflict(): boolean;
+
+            /** Get the path of the associated file. */
+            getPath(): string|undefined;
+
+            /** Set the path for the buffer's associated file. */
+            setPath(filePath: string): void;
+
+            /** Sets the character set encoding for this buffer. */
+            setEncoding(encoding: string): void;
+
+            /** Returns the string encoding of this buffer. */
+            getEncoding(): string;
+
+            /** Get the path of the associated file. */
+            getUri(): string;
+
+            /** Identifies if the buffer belongs to multiple editors. */
+            hasMultipleEditors(): boolean;
+
+            // Reading Text
+            /** Determine whether the buffer is empty. */
+            isEmpty(): boolean;
 
-				/** Boolean indicating whether the marker had a tail before the change. */
-				hadTail: boolean;
+            /** Get the entire text of the buffer. */
+            getText(): string;
 
-				/** Boolean indicating whether the marker now has a tail */
-				hasTail: boolean;
+            /** Get the text in a range. */
+            getTextInRange(range: RangeCompatible): string;
 
-				/** -DEPRECATED- Object containing the marker's custom properties before the change.
-				 *  @deprecated
-				 */
-				oldProperties: object;
+            /** Get the text of all lines in the buffer, without their line endings. */
+            getLines(): string[];
 
-				/** -DEPRECATED- Object containing the marker's custom properties after the change.
-				 *  @deprecated
-				 */
-				newProperties: object;
+            /** Get the text of the last line of the buffer, without its line ending. */
+            getLastLine(): string;
 
-				/** Boolean indicating whether this change was caused by a textual change to the
-				 *  buffer or whether the marker was manipulated directly via its public API.
-				 */
-				textChanged: boolean;
-			}
+            /** Get the text of the line at the given row, without its line ending. */
+            lineForRow(row: number): string|undefined;
 
-			interface BufferChanging {
-				/** Range of the old text. */
-				oldRange: Range;
-			}
+            /** Get the line ending for the given 0-indexed row. */
+            lineEndingForRow(row: number): string|undefined;
 
-			interface BufferChanged {
-				/** Range of the old text. */
-				oldRange: Range;
-
-				/** Range of the new text. */
-				newRange: Range;
-
-				/** String containing the text that was replaced. */
-				oldText: string;
-
-				/** String containing the text that was inserted. */
-				newText: string;
-			}
-
-			interface BufferStoppedChanging {
-				changes: Structures.TextChange[];
-			}
-		}
-
-		/** Objects that appear as parameters to functions. */
-		namespace Options {
-			interface BufferLoad {
-				/** The file's encoding. */
-				encoding?: string;
-
-				/** A function that returns a boolean indicating whether the buffer should
-				 *  be destroyed if its file is deleted.
-				 */
-				shouldDestroyOnFileDelete?(): boolean;
-			}
-
-			interface FindMarker {
-				/** Only include markers that start at the given Point. */
-				startPosition?: PointLike|[number, number];
-
-				/** Only include markers that end at the given Point. */
-				endPosition?: PointLike|[number, number];
-
-				/** Only include markers that start inside the given Range. */
-				startsInRange?: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-					[[number, number], PointLike]|[[number, number], [number, number]];
-
-				/** Only include markers that end inside the given Range. */
-				endsInRange?: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-					[[number, number], PointLike]|[[number, number], [number, number]];
-
-				/** Only include markers that contain the given Point, inclusive. */
-				containsPoint?: PointLike|[number, number];
-
-				/** Only include markers that contain the given Range, inclusive. */
-				containsRange?: RangeLike|[PointLike, PointLike]|
-					[PointLike, [number, number]]|[[number, number], PointLike]|
-					[[number, number], [number, number]];
-
-				/** Only include markers that start at the given row number. */
-				startRow?: number;
-
-				/** Only include markers that end at the given row number. */
-				endRow?: number;
-
-				/** Only include markers that intersect the given row number. */
-				intersectsRow?: number;
-			}
-
-			interface FindDisplayMarker {
-				/** Only include markers starting at this Point in buffer coordinates. */
-				startBufferPosition?: PointLike|[number, number];
-
-				/** Only include markers ending at this Point in buffer coordinates. */
-				endBufferPosition?: PointLike|[number, number];
-
-				/** Only include markers starting at this Point in screen coordinates. */
-				startScreenPosition?: PointLike|[number, number];
-
-				/** Only include markers ending at this Point in screen coordinates. */
-				endScreenPosition?: PointLike|[number, number];
-
-				/** Only include markers starting inside this Range in buffer coordinates. */
-				startsInBufferRange?: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-					[[number, number], PointLike]|[[number, number], [number, number]];
-
-				/** Only include markers ending inside this Range in buffer coordinates. */
-				endsInBufferRange?: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-					[[number, number], PointLike]|[[number, number], [number, number]];
-
-				/** Only include markers starting inside this Range in screen coordinates. */
-				startsInScreenRange?: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-					[[number, number], PointLike]|[[number, number], [number, number]];
-
-				/** Only include markers ending inside this Range in screen coordinates. */
-				endsInScreenRange?: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-					[[number, number], PointLike]|[[number, number], [number, number]];
-
-				/** Only include markers starting at this row in buffer coordinates. */
-				startBufferRow?: number;
-
-				/** Only include markers ending at this row in buffer coordinates. */
-				endBufferRow?: number;
-
-				/** Only include markers starting at this row in screen coordinates. */
-				startScreenRow?: number;
-
-				/** Only include markers ending at this row in screen coordinates. */
-				endScreenRow?: number;
-
-				/** Only include markers intersecting this Array of [startRow, endRow] in
-				 *  buffer coordinates.
-				 */
-				intersectsBufferRowRange?: [number, number];
-
-				/** Only include markers intersecting this Array of [startRow, endRow] in
-				 *  screen coordinates.
-				 */
-				intersectsScreenRowRange?: [number, number];
-
-				/** Only include markers containing this Range in buffer coordinates. */
-				containsBufferRange?: RangeLike|[PointLike, PointLike]|
-					[PointLike, [number, number]]|[[number, number], PointLike]|
-					[[number, number], [number, number]];
-
-				/** Only include markers containing this Point in buffer coordinates. */
-				containsBufferPosition?: PointLike|[number, number];
-
-				/** Only include markers contained in this Range in buffer coordinates. */
-				containedInBufferRange?: RangeLike|[PointLike, PointLike]|
-					[PointLike, [number, number]]|[[number, number], PointLike]|
-					[[number, number], [number, number]];
-
-				/** Only include markers contained in this Range in screen coordinates. */
-				containedInScreenRange?: RangeLike|[PointLike, PointLike]|
-					[PointLike, [number, number]]|[[number, number], PointLike]|
-					[[number, number], [number, number]];
-
-				/** Only include markers intersecting this Range in buffer coordinates. */
-				intersectsBufferRange?: RangeLike|[PointLike, PointLike]|
-					[PointLike, [number, number]]|[[number, number], PointLike]|
-					[[number, number], [number, number]];
-
-				/** Only include markers intersecting this Range in screen coordinates. */
-				intersectsScreenRange?: RangeLike|[PointLike, PointLike]|
-					[PointLike, [number, number]]|[[number, number], PointLike]|
-					[[number, number], [number, number]];
-			}
-
-			interface CopyMarker {
-				/** Whether or not the marker should be tailed. */
-				tailed?: boolean;
-
-				/** Creates the marker in a reversed orientation. */
-				reversed?: boolean;
-
-				/** Determines the rules by which changes to the buffer invalidate the marker. */
-				invalidate?: "never"|"surround"|"overlap"|"inside"|"touch";
-
-				/** Indicates whether insertions at the start or end of the marked range should
-				 *  be interpreted as happening outside the marker.
-				 */
-				exclusive?: boolean;
-
-				/** -DEPRECATED- Custom properties to be associated with the marker. */
-				properties?: object;
-			}
-
-			interface ScanContext {
-				/** The number of lines before the matched line to include in the results object. */
-				leadingContextLineCount?: number;
-
-				/** The number of lines after the matched line to include in the results object. */
-				trailingContextLineCount?: number;
-			}
-		}
-
-		/** The static side to each exported class. Should generally only be used internally. */
-		namespace Statics {
-			/* tslint:disable:no-unnecessary-qualifier */
-			/** The static side to the Point class. */
-			interface Point {
-				/** Create a Point from an array containing two numbers representing the
-				 *  row and column.
-				 */
-				fromObject(object: [number, number]): TextBuffer.Point;
-
-				/** Create a Point from an existing object which implements PointLike. */
-				fromObject(object: TextBuffer.PointLike, copy?: boolean): TextBuffer.Point;
-
-				/** Construct a Point object */
-				new (row?: number, column?: number): TextBuffer.Point;
-
-				/** Returns the given Point that is earlier in the buffer. */
-				min(point1: TextBuffer.PointLike|[number, number], point2: TextBuffer.PointLike|
-					[number, number]): TextBuffer.Point;
-			}
-
-			/** The static side to the Range class. */
-			interface Range {
-				/** Convert any range-compatible object to a Range. */
-				fromObject(object: TextBuffer.RangeLike|[TextBuffer.PointLike, TextBuffer.PointLike]|
-					[TextBuffer.PointLike, [number, number]]|[[number, number], TextBuffer.PointLike]|
-					[[number, number], [number, number]], copy?: boolean): TextBuffer.Range;
-
-				/** Construct a Range object. */
-				new (pointA?: TextBuffer.PointLike|[number, number], pointB?: TextBuffer.PointLike|
-					[number, number]): TextBuffer.Range;
-
-				/** Call this with the result of Range::serialize to construct a new Range. */
-				deserialize(array: object): TextBuffer.Range;
-			}
-
-			/** The static side to the TextBuffer class. */
-			interface TextBuffer {
-				Point: TextBuffer.Statics.Point;
-				Range: TextBuffer.Statics.Range;
-
-				/** Create a new buffer with the given starting text. */
-				new (text: string): TextBuffer.TextBuffer;
-				/** Create a new buffer with the given params. */
-				new (params?: {
-					/** The initial string text of the buffer. */
-					text?: string
-					/** A function that returns a Boolean indicating whether the buffer should
-					 *  be destroyed if its file is deleted.
-					 */
-					shouldDestroyOnFileDelete?(): boolean
-				}): TextBuffer.TextBuffer;
-
-				/** Create a new buffer backed by the given file path. */
-				load(source: string, params?: TextBuffer.Options.BufferLoad):
-					Promise<TextBuffer.TextBuffer>;
-
-				/** Create a new buffer backed by the given file path. For better performance,
-				 *  use TextBuffer.load instead.
-				 */
-				loadSync(filePath: string, params?: TextBuffer.Options.BufferLoad):
-					TextBuffer.TextBuffer;
-
-				/** Restore a TextBuffer based on an earlier state created using the TextBuffer::serialize
-				 *  method.
-				 */
-				deserialize(params: object): Promise<TextBuffer.TextBuffer>;
-			}
-			/* tslint:enable:no-unnecessary-qualifier */
-		}
-
-		/** Data structures that are used within classes. */
-		namespace Structures {
-			interface TextChange {
-				newExtent: Point;
-				oldExtent: Point;
-				newRange: Range;
-				oldRange: Range;
-				newText: string;
-				oldText: string;
-				start: Point;
-			}
-
-			interface BufferScanResult {
-				buffer: TextBuffer;
-				lineText: string;
-				match: RegExpExecArray;
-				matchText: string;
-				range: Range;
-				replace(replacementText: string): void;
-				stop(): void;
-				stopped: boolean;
-			}
-
-			interface ContextualBufferScanResult extends BufferScanResult {
-				leadingContextLines: string[];
-				trailingContextLines: string[];
-			}
-		}
-
-		/** The interface that should be implemented for all "point-compatible" objects. */
-		interface PointLike {
-			/** A zero-indexed number representing the row of the Point. */
-			row: number;
-
-			/** A zero-indexed number representing the column of the Point. */
-			column: number;
-		}
-
-		/** Represents a point in a buffer in row/column coordinates. */
-		interface Point extends PointLike {
-			// Properties
-			/** A zero-indexed number representing the row of the Point. */
-			row: number;
-
-			/** A zero-indexed number representing the column of the Point. */
-			column: number;
-
-			// Construction
-			/** Returns a new Point with the same row and column. */
-			copy(): Point;
-
-			/** Returns a new Point with the row and column negated. */
-			negate(): Point;
-
-			// Comparison
-			/** Compare another Point to this Point instance.
-			 *  Returns -1 if this point precedes the argument.
-			 *  Returns 0 if this point is equivalent to the argument.
-			 *  Returns 1 if this point follows the argument.
-			 */
-			compare(other: PointLike|[number, number]): number;
-
-			/** Returns a boolean indicating whether this point has the same row and
-			 *  column as the given Point.
-			 */
-			isEqual(other: PointLike|[number, number]): boolean;
-
-			/** Returns a Boolean indicating whether this point precedes the given Point. */
-			isLessThan(other: PointLike|[number, number]): boolean;
-
-			/** Returns a Boolean indicating whether this point precedes or is equal to
-			 *  the given Point.
-			 */
-			isLessThanOrEqual(other: PointLike|[number, number]): boolean;
-
-			/** Returns a Boolean indicating whether this point follows the given Point. */
-			isGreaterThan(other: PointLike|[number, number]): boolean;
-
-			/** Returns a Boolean indicating whether this point follows or is equal to
-			 *  the given Point.
-			 */
-			isGreaterThanOrEqual(other: PointLike|[number, number]): boolean;
-
-			// Operations
-			/** Makes this point immutable and returns itself. */
-			freeze(): Readonly<Point>;
-
-			/** Build and return a new point by adding the rows and columns of the
-			 *  given point.
-			 */
-			translate(other: PointLike|[number, number]): Point;
-
-			/** Build and return a new Point by traversing the rows and columns
-			 *  specified by the given point.
-			 */
-			traverse(other: PointLike|[number, number]): Point;
-
-			/** Returns an array of this point's row and column. */
-			toArray(): [number, number];
-
-			/** Returns an array of this point's row and column. */
-			serialize(): [number, number];
-
-			/** Returns a string representation of the point. */
-			toString(): string;
-		}
-
-		/** The interface that should be implemented for all "range-compatible" objects. */
-		interface RangeLike {
-			/** A Point representing the start of the Range. */
-			start: PointLike;
-
-			/** A Point representing the end of the Range. */
-			end: PointLike;
-		}
-
-		/** Represents a region in a buffer in row/column coordinates. */
-		interface Range extends RangeLike {
-			// Properties
-			/** A Point representing the start of the Range. */
-			start: PointLike;
-
-			/** A Point representing the end of the Range. */
-			end: PointLike;
-
-			// Construction
-			/** Returns a new range with the same start and end positions. */
-			copy(): Range;
-
-			/** Returns a new range with the start and end positions negated. */
-			negate(): Range;
-
-			// Serialization and Deserialization
-			/** Returns a plain javascript object representation of the range. */
-			serialize(): number[][];
-
-			// Range Details
-			/** Is the start position of this range equal to the end position? */
-			isEmpty(): boolean;
-
-			/** Returns a boolean indicating whether this range starts and ends on the
-			 *  same row.
-			 */
-			isSingleLine(): boolean;
-
-			/** Get the number of rows in this range. */
-			getRowCount(): number;
-
-			/** Returns an array of all rows in the range. */
-			getRows(): number[];
-
-			// Operations
-			/** Freezes the range and its start and end point so it becomes immutable
-			 *  and returns itself.
-			 */
-			freeze(): Readonly<Range>;
-
-			// NOTE: this function doesn't actually take a range-compatible parameter.
-			/** Returns a new range that contains this range and the given range. */
-			union(other: RangeLike): Range;
-
-			/** Build and return a new range by translating this range's start and end
-			 *  points by the given delta(s).
-			 */
-			translate(startDelta: PointLike|[number, number], endDelta?: PointLike|
-				[number, number]): Range;
-
-			/** Build and return a new range by traversing this range's start and end
-			 *  points by the given delta.
-			 */
-			traverse(delta: PointLike|[number, number]): Range;
-
-			// Comparison
-			/** Compare two Ranges.
-			 *  Returns -1 if this range starts before the argument or contains it.
-			 *  Returns 0 if this range is equivalent to the argument.
-			 *  Returns 1 if this range starts after the argument or is contained by it.
-			 */
-			compare(otherRange: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]]): number;
-
-			/** Returns a Boolean indicating whether this range has the same start and
-			 *  end points as the given Range.
-			 */
-			isEqual(otherRange: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]]): boolean;
-
-			// NOTE: this function doesn't actually take a range-compatible parameter.
-			/** Returns a Boolean indicating whether this range starts and ends on the
-			 *  same row as the argument.
-			 */
-			coversSameRows(otherRange: RangeLike): boolean;
-
-			// NOTE: this function doesn't actually take a range-compatible parameter.
-			/** Determines whether this range intersects with the argument. */
-			intersectsWith(otherRange: RangeLike, exclusive?: boolean): boolean;
-
-			/** Returns a boolean indicating whether this range contains the given range. */
-			containsRange(otherRange: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]], exclusive?:
-				boolean): boolean;
-
-			/** Returns a boolean indicating whether this range contains the given point. */
-			containsPoint(point: PointLike|[number, number], exclusive?: boolean): boolean;
-
-			/** Returns a boolean indicating whether this range intersects the given
-			 *  row number.
-			 */
-			intersectsRow(row: number): boolean;
-
-			/** Returns a boolean indicating whether this range intersects the row range
-			 *  indicated by the given startRow and endRow numbers.
-			 */
-			intersectsRowRange(startRow: number, endRow: number): boolean;
-
-			// Conversion
-			/** Returns a string representation of the range. */
-			toString(): string;
-		}
-
-		/** Represents a buffer annotation that remains logically stationary even as
-		 *  the buffer changes.
-		 */
-		interface Marker {
-			// Properties
-			id: number;
-			tailed: boolean;
-			reversed: boolean;
-			valid: boolean;
-			invalidate: string;
-			properties: object;
-
-			// Lifecycle
-			/** Creates and returns a new Marker with the same properties as this
-			 *  marker.
-			 */
-			copy(options?: Options.CopyMarker): Marker;
-
-			/** Destroys the marker, causing it to emit the "destroyed" event. */
-			destroy(): void;
-
-			// Event Subscription
-			/** Invoke the given callback when the marker is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the state of the marker changes. */
-			onDidChange(callback: (event: Events.MarkerChanged) => void):
-				EventKit.Disposable;
-
-			// Marker Details
-			/** Returns the current range of the marker. The range is immutable. */
-			getRange(): Range;
-
-			/** Returns a point representing the marker's current head position. */
-			getHeadPosition(): Point;
-
-			/** Returns a point representing the marker's current tail position. */
-			getTailPosition(): Point;
-
-			/** Returns a point representing the start position of the marker, which
-			 *  could be the head or tail position, depending on its orientation.
-			 */
-			getStartPosition(): Point;
-
-			/** Returns a point representing the end position of the marker, which
-			 *  could be the head or tail position, depending on its orientation.
-			 */
-			getEndPosition(): Point;
-
-			/** Returns a boolean indicating whether the head precedes the tail. */
-			isReversed(): boolean;
-
-			/** Returns a boolean indicating whether the marker has a tail. */
-			hasTail(): boolean;
-
-			/** Is the marker valid? */
-			isValid(): boolean;
-
-			/** Is the marker destroyed? */
-			isDestroyed(): boolean;
-
-			/** Returns a boolean indicating whether changes that occur exactly at
-			 *  the marker's head or tail cause it to move.
-			 */
-			isExclusive(): boolean;
-
-			/** Get the invalidation strategy for this marker. */
-			getInvalidationStrategy(): string;
-
-			// Mutating Markers
-			/** Sets the range of the marker.
-			 *  Returns a boolean indicating whether or not the marker was updated.
-			 */
-			setRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]], params?: {
-				reversed?: boolean, exclusive?: boolean }): boolean;
-
-			/** Sets the head position of the marker.
-			 *  Returns a boolean indicating whether or not the marker was updated.
-			 */
-			setHeadPosition(position: PointLike|[number, number]): boolean;
-
-			/** Sets the tail position of the marker.
-			 *  Returns a boolean indicating whether or not the marker was updated.
-			 */
-			setTailPosition(position: PointLike|[number, number]): boolean;
-
-			/** Removes the marker's tail.
-			 *  Returns a boolean indicating whether or not the marker was updated.
-			 */
-			clearTail(): boolean;
-
-			/** Plants the marker's tail at the current head position.
-			 *  Returns a boolean indicating whether or not the marker was updated.
-			 */
-			plantTail(): boolean;
-
-			// Comparison
-			/** Returns a boolean indicating whether this marker is equivalent to
-			 *  another marker, meaning they have the same range and options.
-			 */
-			isEqual(other: Marker): boolean;
-
-			/** Compares this marker to another based on their ranges.
-			 *  Returns "-1" if this marker precedes the argument.
-			 *  Returns "0" if this marker is equivalent to the argument.
-			 *  Returns "1" if this marker follows the argument.
-			 */
-			compare(other: Marker): number;
-		}
-
-		/** Experimental: A container for a related set of markers. */
-		interface MarkerLayer {
-			// Lifecycle
-			/** Create a copy of this layer with markers in the same state and locations. */
-			copy(): MarkerLayer;
-
-			/** Destroy this layer. */
-			destroy(): boolean;
-
-			/** Remove all markers from this layer. */
-			clear(): void;
-
-			/** Determine whether this layer has been destroyed. */
-			isDestroyed(): boolean;
-
-			// Querying
-			/** Get an existing marker by its id. */
-			getMarker(id: number): Marker|undefined;
-
-			/** Get all existing markers on the marker layer. */
-			getMarkers(): Marker[];
-
-			/** Get the number of markers in the marker layer. */
-			getMarkerCount(): number;
-
-			/** Find markers in the layer conforming to the given parameters. */
-			findMarkers(params: Options.FindMarker): Marker[];
-
-			// Marker Creation
-			/** Create a marker with the given range. */
-			markRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]], options?:
-				{ reversed?: boolean, invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
-				exclusive?: boolean }): Marker;
-
-			/** Create a marker at with its head at the given position with no tail. */
-			markPosition(position: PointLike|[number, number], options?: {
-				invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
-				exclusive?: boolean
-			}): Marker;
-
-			// Event Subscription
-			/** Subscribe to be notified asynchronously whenever markers are created,
-			 *  updated, or destroyed on this layer.
-			 */
-			onDidUpdate(callback: () => void): EventKit.Disposable;
-
-			/** Subscribe to be notified synchronously whenever markers are created on
-			 *  this layer.
-			 */
-			onDidCreateMarker(callback: (marker: Marker) => void): EventKit.Disposable;
-
-			/** Subscribe to be notified synchronously when this layer is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-		}
-
-		/** A mutable text container with undo/redo support and the ability to
-		 *  annotate logical regions in the text.
-		 */
-		interface TextBuffer {
-			// Properties
-			file: PathWatcher.File;
-			lines: string[];
-			lineEndings: string[];
-			stoppedChangingDelay: number;
-			conflict: boolean;
-			loaded: boolean;
-			destroyed: boolean;
-			refcount: number;
-			id: string;
-
-			/** Schedules a 'did-stop-changing' emission. The event will be emitted between
-			 *  now and TextBuffer::stoppedChangingDelay milliseconds in the future.
-			 */
-			debouncedEmitDidStopChangingEvent(): void;
-
-			// Lifecycle
-			/** Destroys the buffer, emitting the 'did-destroy' prior to doing so. */
-			destroy(): void;
-
-			/** Returns whether or not the given buffer is alive. */
-			isAlive(): boolean;
-
-			/** Returns whether or not the given buffer has been destroyed. */
-			isDestroyed(): boolean;
-
-			/** Returns whether or not this text buffer is currently retained. */
-			isRetained(): boolean;
-
-			/** Retains the text buffer, preventing its destruction via TextBuffer::release. */
-			retain(): TextBuffer;
-
-			/** Release the text buffer, destroying it if there are no other retainers. */
-			release(): TextBuffer;
-
-			// Event Subscription
-			/** Invoke the given callback synchronously before the content of the buffer
-			 *  changes.
-			 */
-			onWillChange(callback: (event: Events.BufferChanging) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback synchronously when the content of the buffer
-			 *  changes. You should probably not be using this in packages.
-			 */
-			onDidChange(callback: (event: Events.BufferChanged) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback synchronously when a transaction finishes with
-			 *  a list of all the changes in the transaction.
-			 */
-			onDidChangeText(callback: (event: Events.BufferStoppedChanging) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback asynchronously following one or more changes after
-			 *  ::getStoppedChangingDelay milliseconds elapse without an additional change.
-			 */
-			onDidStopChanging(callback: (event: Events.BufferStoppedChanging) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when the in-memory contents of the buffer become
-			 *  in conflict with the contents of the file on disk.
-			 */
-			onDidConflict(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback if the value of ::isModified changes. */
-			onDidChangeModified(callback: (modified: boolean) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when all marker ::onDidChange observers have been
-			 *  notified following a change to the buffer.
-			 */
-			onDidUpdateMarkers(callback: () => void): EventKit.Disposable;
-
-			onDidCreateMarker(callback: (marker: Marker) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when the value of ::getPath changes. */
-			onDidChangePath(callback: (path: string) => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the value of ::getEncoding changes. */
-			onDidChangeEncoding(callback: (encoding: string) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback before the buffer is saved to disk. If the
-			 *  given callback returns a promise, then the buffer will not be saved until
-			 *  the promise resolves.
-			 */
-			onWillSave(callback: () => Promise<void>|void): EventKit.Disposable;
-
-			/** Invoke the given callback after the buffer is saved to disk. */
-			onDidSave(callback: (event: Events.FileSaved) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback after the file backing the buffer is deleted. */
-			onDidDelete(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback before the buffer is reloaded from the contents
-			 *  of its file on disk.
-			 */
-			onWillReload(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback after the buffer is reloaded from the contents
-			 *  of its file on disk.
-			 */
-			onDidReload(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when the buffer is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Invoke the given callback when there is an error in watching the file. */
-			onWillThrowWatchError(callback: (errorObject: Events.BufferWatchError) =>
-				void): EventKit.Disposable;
-
-			/** Get the number of milliseconds that will elapse without a change before
-			 *  ::onDidStopChanging observers are invoked following a change.
-			 */
-			getStoppedChangingDelay(): number;
-
-			/** Performs the necessary work, then emits the 'did-stop-changing' event. */
-			emitDidStopChangingEvent(): void;
-
-			// File Details
-			/** Determine if the in-memory contents of the buffer differ from its contents
-			 *  on disk.
-			 *  If the buffer is unsaved, always returns true unless the buffer is empty.
-			 */
-			isModified(): boolean;
-
-			/** Determine if the in-memory contents of the buffer conflict with the on-disk
-			 *  contents of its associated file.
-			 */
-			isInConflict(): boolean;
-
-			/** Get the path of the associated file. */
-			getPath(): string|undefined;
-
-			/** Set the path for the buffer's associated file. */
-			setPath(filePath: string): void;
-
-			/** Sets the character set encoding for this buffer. */
-			setEncoding(encoding: string): void;
-
-			/** Returns the string encoding of this buffer. */
-			getEncoding(): string;
-
-			/** Get the path of the associated file. */
-			getUri(): string;
-
-			/** Identifies if the buffer belongs to multiple editors. */
-			hasMultipleEditors(): boolean;
-
-			// Reading Text
-			/** Determine whether the buffer is empty. */
-			isEmpty(): boolean;
-
-			/** Get the entire text of the buffer. */
-			getText(): string;
-
-			/** Get the text in a range. */
-			getTextInRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]]): string;
-
-			/** Get the text of all lines in the buffer, without their line endings. */
-			getLines(): string[];
-
-			/** Get the text of the last line of the buffer, without its line ending. */
-			getLastLine(): string;
-
-			/** Get the text of the line at the given row, without its line ending. */
-			lineForRow(row: number): string|undefined;
-
-			/** Get the line ending for the given 0-indexed row. */
-			lineEndingForRow(row: number): string|undefined;
-
-			/** Get the length of the line for the given 0-indexed row, without its line
-			 *  ending.
-			 */
-			lineLengthForRow(row: number): number;
-
-			/** Determine if the given row contains only whitespace. */
-			isRowBlank(row: number): boolean;
-
-			/** Given a row, find the first preceding row that's not blank.
-			 *  Returns a number or null if there's no preceding non-blank row.
-			 */
-			previousNonBlankRow(startRow: number): number|null;
-
-			/** Given a row, find the next row that's not blank.
-			 *  Returns a number or null if there's no next non-blank row.
-			 */
-			nextNonBlankRow(startRow: number): number|null;
-
-			// Mutating Text
-			/** Replace the entire contents of the buffer with the given text. */
-			setText(text: string): Range;
-
-			/** Replace the current buffer contents by applying a diff based on the
-			 *  given text.
-			 */
-			setTextViaDiff(text: string): void;
-
-			/** Set the text in the given range. */
-			setTextInRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]], text: string,
-				options?: { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
-
-			/** Insert text at the given position. */
-			insert(position: PointLike|[number, number], text: string, options?: {
-				normalizeLineEndings?: boolean,
-				undo?: "skip"
-			}): Range;
-
-			/** Append text to the end of the buffer. */
-			append(text: string, options?: {
-				normalizeLineEndings?: boolean,
-				undo?: "skip"
-			}): Range;
-
-			/** Delete the text in the given range. */
-			delete(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]]): Range;
-
-			/** Delete the line associated with a specified row. */
-			deleteRow(row: number): Range;
-
-			/** Delete the lines associated with the specified row range. */
-			deleteRows(startRow: number, endRow: number): Range;
-
-			// Markers
-			/** Create a layer to contain a set of related markers. */
-			addMarkerLayer(options?: {
-				maintainHistory?: boolean,
-				persistent?: boolean
-			}): MarkerLayer;
-
-			/** Get a MarkerLayer by id.
-			 *  Returns a MarkerLayer or `` if no layer exists with the given id.
-			 */
-			getMarkerLayer(id: string): MarkerLayer|undefined;
-
-			/** Get the default MarkerLayer. */
-			getDefaultMarkerLayer(): MarkerLayer;
-
-			/** Create a marker with the given range in the default marker layer. */
-			markRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]], properties?:
-				{ reversed?: boolean, invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
-				exclusive?: boolean }): Marker;
-
-			/** Create a marker at the given position with no tail in the default marker layer. */
-			markPosition(position: PointLike|[number, number], options?: {
-				invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
-				exclusive?: boolean
-			}): Marker;
-
-			/** Get all existing markers on the default marker layer. */
-			getMarkers(): Marker[];
-
-			/** Get an existing marker by its id from the default marker layer. */
-			getMarker(id: number): Marker;
-
-			/** Find markers conforming to the given parameters in the default marker layer. */
-			findMarkers(params: Options.FindMarker): Marker[];
-
-			/** Get the number of markers in the default marker layer. */
-			getMarkerCount(): number;
-
-			// History
-			/** Undo the last operation. If a transaction is in progress, aborts it. */
-			undo(): boolean;
-
-			/** Redo the last operation. */
-			redo(): boolean;
-
-			/** Batch multiple operations as a single undo/redo step. */
-			transact<T>(groupingInterval: number, fn: () => T): T;
-			transact<T>(fn: () => T): T;
-
-			/** Call within a transaction to terminate the function's execution and
-			 *  revert any changes performed up to the abortion.
-			 */
-			abortTransaction(): void;
-
-			/** Clear the undo stack. When calling this method within a transaction,
-			 *  the ::onDidChangeText event will not be triggered because the information
-			 *  describing the changes is lost.
-			 */
-			clearUndoStack(): void;
-
-			/** Create a pointer to the current state of the buffer for use with
-			 *  ::revertToCheckpoint and ::groupChangesSinceCheckpoint.
-			 */
-			createCheckpoint(): number;
-
-			/** Revert the buffer to the state it was in when the given checkpoint was created.
-			 *  Returns a boolean indicating whether the operation succeeded.
-			 */
-			revertToCheckpoint(checkpoint: number): boolean;
-
-			/** Group all changes since the given checkpoint into a single transaction for
-			 *  purposes of undo/redo.
-			 *  Returns a boolean indicating whether the operation succeeded.
-			 */
-			groupChangesSinceCheckpoint(checkpoint: number): boolean;
-
-			/** Returns a list of changes since the given checkpoint.
-			 *  If the given checkpoint is no longer present in the undo history, this method
-			 *  will return an empty Array.
-			 */
-			getChangesSinceCheckpoint(checkpoint: number): Array<{
-				/** A Point representing where the change started. */
-				start: Point,
-
-				/** A Point representing the replaced extent. */
-				oldExtent: Point,
-
-				/** A Point representing the replacement extent. */
-				newExtent: Point,
-
-				/** A String representing the replacement text. */
-				newText: string
-			}>;
-
-			// Search and Replace
-			/** Scan regular expression matches in the entire buffer, calling the given
-			 *  iterator function on each match.
-			 */
-			scan(regex: RegExp, iterator: (params: Structures.BufferScanResult) => void): void;
-			/** Scan regular expression matches in the entire buffer, calling the given
-			 *  iterator function on each match.
-			 */
-			scan(regex: RegExp, options: Options.ScanContext, iterator: (params:
-				Structures.ContextualBufferScanResult) => void): void;
-
-			/** Scan regular expression matches in the entire buffer in reverse order,
-			 *  calling the given iterator function on each match.
-			 */
-			backwardsScan(regex: RegExp, iterator: (params: Structures.BufferScanResult) => void):
-				void;
-			/** Scan regular expression matches in the entire buffer in reverse order,
-			 *  calling the given iterator function on each match.
-			 */
-			backwardsScan(regex: RegExp, options: Options.ScanContext, iterator: (params:
-				Structures.ContextualBufferScanResult) => void): void;
-
-			/** Scan regular expression matches in a given range , calling the given
-			 *  iterator function on each match.
-			 */
-			scanInRange(regex: RegExp, range: RangeLike|[PointLike, PointLike]|[PointLike,
-				[number, number]]|[[number, number], PointLike]|[[number, number], [number, number]],
-				iterator: (params: Structures.BufferScanResult) => void): void;
-			/** Scan regular expression matches in a given range , calling the given
-			 *  iterator function on each match.
-			 */
-			scanInRange(regex: RegExp, range: RangeLike|[PointLike, PointLike]|[PointLike,
-				[number, number]]|[[number, number], PointLike]|[[number, number], [number, number]],
-				options: Options.ScanContext, iterator: (params:
-				Structures.ContextualBufferScanResult) => void): void;
-
-			/** Scan regular expression matches in a given range in reverse order,
-			 *  calling the given iterator function on each match.
-			 */
-			backwardsScanInRange(regex: RegExp, range: RangeLike|[PointLike, PointLike]|[PointLike,
-				[number, number]]|[[number, number], PointLike]|[[number, number], [number, number]],
-				iterator: (params: Structures.BufferScanResult) => void): void;
-			/** Scan regular expression matches in a given range in reverse order,
-			 *  calling the given iterator function on each match.
-			 */
-			backwardsScanInRange(regex: RegExp, range: RangeLike|[PointLike, PointLike]|[PointLike,
-				[number, number]]|[[number, number], PointLike]|[[number, number], [number, number]],
-				options: Options.ScanContext, iterator: (params:
-				Structures.ContextualBufferScanResult) => void): void;
-
-			/** Replace all regular expression matches in the entire buffer. */
-			replace(regex: RegExp, replacementText: string): number;
-
-			// Buffer Range Details
-			/** Get the range spanning from [0, 0] to ::getEndPosition. */
-			getRange(): Range;
-
-			/** Get the number of lines in the buffer. */
-			getLineCount(): number;
-
-			/** Get the last 0-indexed row in the buffer. */
-			getLastRow(): number;
-
-			/** Get the first position in the buffer, which is always [0, 0]. */
-			getFirstPosition(): Point;
-
-			/** Get the maximal position in the buffer, where new text would be appended. */
-			getEndPosition(): Point;
-
-			/** Get the length of the buffer in characters. */
-			getMaxCharacterIndex(): number;
-
-			/** Get the range for the given row. */
-			rangeForRow(row: number, includeNewline: boolean): Range;
-
-			/** Convert a position in the buffer in row/column coordinates to an absolute
-			 *  character offset, inclusive of line ending characters.
-			 */
-			characterIndexForPosition(position: Point|[number, number]): number;
-
-			/** Convert an absolute character offset, inclusive of newlines, to a position
-			 *  in the buffer in row/column coordinates.
-			 */
-			positionForCharacterIndex(offset: number): Point;
-
-			/** Clip the given range so it starts and ends at valid positions. */
-			clipRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]]): Range;
-
-			/** Clip the given point so it is at a valid position in the buffer. */
-			clipPosition(position: PointLike|[number, number]): Point;
-
-			// Buffer Operations
-			/** Save the buffer. */
-			save(): Promise<void>;
-
-			/** Save the buffer at a specific path. */
-			saveAs(filePath: string): Promise<void>;
-
-			/** Reload the buffer's contents from disk. */
-			reload(): void;
-		}
-
-		/** Represents a buffer annotation that remains logically stationary even as the
-		 *  buffer changes. This is used to represent cursors, folds, snippet targets,
-		 *  misspelled words, and anything else that needs to track a logical location
-		 *  in the buffer over time.
-		 */
-		interface DisplayMarker {
-			// Construction and Destruction
-			/** Destroys the marker, causing it to emit the 'destroyed' event. Once destroyed,
-			 *  a marker cannot be restored by undo/redo operations.
-			 */
-			destroy(): void;
-
-			/** Creates and returns a new DisplayMarker with the same properties as this marker. */
-			copy(options?: Options.CopyMarker): DisplayMarker;
-
-			// Event Subscription
-			/** Invoke the given callback when the state of the marker changes. */
-			onDidChange(callback: (event: Events.DisplayMarkerChanged) => void):
-				EventKit.Disposable;
-
-			/** Invoke the given callback when the marker is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			// TextEditorMarker Details
-			/** Returns a boolean indicating whether the marker is valid. Markers can be
-			 *  invalidated when a region surrounding them in the buffer is changed.
-			 */
-			isValid(): boolean;
-
-			/** Returns a boolean indicating whether the marker has been destroyed. A marker
-			 *  can be invalid without being destroyed, in which case undoing the invalidating
-			 *  operation would restore the marker.
-			 */
-			isDestroyed(): boolean;
-
-			/** Returns a boolean indicating whether the head precedes the tail. */
-			isReversed(): boolean;
-
-			/** Returns a boolean indicating whether changes that occur exactly at the marker's
-			 *  head or tail cause it to move.
-			 */
-			isExclusive(): boolean;
-
-			/** Get the invalidation strategy for this marker.
-			 *  Valid values include: never, surround, overlap, inside, and touch.
-			 */
-			getInvalidationStrategy(): string;
-
-			/** Returns an Object containing any custom properties associated with the marker. */
-			getProperties(): object;
-
-			/** Merges an Object containing new properties into the marker's existing properties. */
-			setProperties(properties: object): void;
-
-			/** Returns whether this marker matches the given parameters. */
-			matchesProperties(attributes: Options.FindDisplayMarker): boolean;
-
-			// Comparing to other markers
-			/** Compares this marker to another based on their ranges. */
-			compare(other: DisplayMarker): number;
-
-			/** Returns a boolean indicating whether this marker is equivalent to another
-			 *  marker, meaning they have the same range and options.
-			 */
-			isEqual(other: DisplayMarker): boolean;
-
-			// Managing the marker's range
-			/** Gets the buffer range of this marker. */
-			getBufferRange(): Range;
-
-			/** Gets the screen range of this marker. */
-			getScreenRange(): Range;
-
-			/** Modifies the buffer range of this marker. */
-			setBufferRange(bufferRange: RangeLike|[PointLike, PointLike]|[PointLike,
-				[number, number]]|[[number, number], PointLike]|[[number, number], [number, number]],
-				properties?: { reversed: boolean }): void;
-
-			/** Modifies the screen range of this marker. */
-			setScreenRange(screenRange: RangeLike|[PointLike, PointLike]|[PointLike,
-				[number, number]]|[[number, number], PointLike]|[[number, number], [number, number]],
-				options?: { reversed?: boolean, clipDirection?: "backward"|"forward"|"closest" }): void;
-
-			/** Retrieves the screen position of the marker's start. This will always be
-			 *  less than or equal to the result of DisplayMarker::getEndScreenPosition.
-			 */
-			getStartScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
-				Point;
-
-			/** Retrieves the screen position of the marker's end. This will always be
-			 *  greater than or equal to the result of DisplayMarker::getStartScreenPosition.
-			 */
-			getEndScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
-				Point;
-
-			/** Retrieves the buffer position of the marker's head. */
-			getHeadBufferPosition(): Point;
-
-			/** Sets the buffer position of the marker's head. */
-			setHeadBufferPosition(bufferPosition: PointLike|[number, number]): void;
-
-			/** Retrieves the screen position of the marker's head. */
-			getHeadScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
-				Point;
-
-			/** Sets the screen position of the marker's head. */
-			setHeadScreenPosition(screenPosition: PointLike|[number, number], options?:
-				{ clipDirection: "backward"|"forward"|"closest" }): void;
-
-			/** Retrieves the buffer position of the marker's tail. */
-			getTailBufferPosition(): Point;
-
-			/** Sets the buffer position of the marker's tail. */
-			setTailBufferPosition(bufferPosition: PointLike|[number, number]): void;
-
-			/** Retrieves the screen position of the marker's tail. */
-			getTailScreenPosition(options?: { clipDirection: "backward"|"forward"|"closest" }):
-				Point;
-
-			/** Sets the screen position of the marker's tail. */
-			setTailScreenPosition(screenPosition: PointLike|[number, number], options?:
-				{ clipDirection: "backward"|"forward"|"closest" }): void;
-
-			/** Retrieves the buffer position of the marker's start. This will always be less
-			 *  than or equal to the result of DisplayMarker::getEndBufferPosition.
-			 */
-			getStartBufferPosition(): Point;
-
-			/** Retrieves the buffer position of the marker's end. This will always be greater
-			 *  than or equal to the result of DisplayMarker::getStartBufferPosition.
-			 */
-			getEndBufferPosition(): Point;
-
-			/** Returns a boolean indicating whether the marker has a tail. */
-			hasTail(): boolean;
-
-			/** Plants the marker's tail at the current head position. After calling the
-			 *  marker's tail position will be its head position at the time of the call,
-			 *  regardless of where the marker's head is moved.
-			 */
-			plantTail(): void;
-
-			/** Removes the marker's tail. After calling the marker's head position will be
-			 *  reported as its current tail position until the tail is planted again.
-			 */
-			clearTail(): void;
-		}
-
-		/** Experimental: A container for a related set of markers at the DisplayLayer level.
-		 *  Wraps an underlying MarkerLayer on the TextBuffer.
-		 *
-		 *  This API is experimental and subject to change on any release.
-		 */
-		interface DisplayMarkerLayer {
-			// Lifecycle
-			/** Destroy this layer. */
-			destroy(): void;
-
-			/** Destroy all markers in this layer. */
-			clear(): void;
-
-			/** Determine whether this layer has been destroyed. */
-			isDestroyed(): boolean;
-
-			// Event Subscription
-			/** Subscribe to be notified synchronously when this layer is destroyed. */
-			onDidDestroy(callback: () => void): EventKit.Disposable;
-
-			/** Subscribe to be notified asynchronously whenever markers are created, updated,
-			 *  or destroyed on this layer. Prefer this method for optimal performance when
-			 *  interacting with layers that could contain large numbers of markers.
-			 */
-			onDidUpdate(callback: () => void): EventKit.Disposable;
-
-			/** Subscribe to be notified synchronously whenever markers are created on this
-			 *  layer. Avoid this method for optimal performance when interacting with layers
-			 *  that could contain large numbers of markers.
-			 */
-			onDidCreateMarker(callback: (marker: DisplayMarker|Marker) => void): EventKit.Disposable;
-
-			// Marker creation
-			/** Create a marker with the given screen range. */
-			markScreenRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]], options?:
-				{ reversed?: boolean, invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
-				exclusive?: boolean, clipDirection?: "backward"|"forward"|"closest" }): DisplayMarker;
-
-			/** Create a marker on this layer with its head at the given screen position
-			 *  and no tail.
-			 */
-			markScreenPosition(screenPosition: PointLike|[number, number], options?: {
-				invalidate?: "never"|"surround"|"overlap"|"inside"|"touch", exclusive?: boolean,
-				clipDirection?: "backward"|"forward"|"closest" }): DisplayMarker;
-
-			/** Create a marker with the given buffer range. */
-			markBufferRange(range: RangeLike|[PointLike, PointLike]|[PointLike, [number, number]]|
-				[[number, number], PointLike]|[[number, number], [number, number]], options?: {
-				reversed?: boolean, invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
-				exclusive?: boolean }): DisplayMarker;
-
-			/** Create a marker on this layer with its head at the given buffer position and no tail. */
-			markBufferPosition(bufferPosition: PointLike|[number, number], options?: { invalidate?:
-				"never"|"surround"|"overlap"|"inside"|"touch", exclusive?: boolean }): DisplayMarker;
-
-			// Querying
-			/** Get an existing marker by its id. */
-			getMarker(id: number): DisplayMarker;
-
-			/** Get all markers in the layer. */
-			getMarkers(): DisplayMarker[];
-
-			/** Get the number of markers in the marker layer. */
-			getMarkerCount(): number;
-
-			/** Find markers in the layer conforming to the given parameters.
-			 *
-			 *  This method finds markers based on the given properties. Markers can be associated
-			 *  with custom properties that will be compared with basic equality. In addition,
-			 *  there are several special properties that will be compared with the range of the
-			 *  markers rather than their properties.
-			 */
-			findMarkers(properties: Options.FindDisplayMarker): DisplayMarker[];
-		}
-	}
+            /**
+             *  Get the length of the line for the given 0-indexed row, without its line
+             *  ending.
+             */
+            lineLengthForRow(row: number): number;
+
+            /** Determine if the given row contains only whitespace. */
+            isRowBlank(row: number): boolean;
+
+            /**
+             *  Given a row, find the first preceding row that's not blank.
+             *  Returns a number or null if there's no preceding non-blank row.
+             */
+            previousNonBlankRow(startRow: number): number|null;
+
+            /**
+             *  Given a row, find the next row that's not blank.
+             *  Returns a number or null if there's no next non-blank row.
+             */
+            nextNonBlankRow(startRow: number): number|null;
+
+            // Mutating Text
+            /** Replace the entire contents of the buffer with the given text. */
+            setText(text: string): Range;
+
+            /**
+             *  Replace the current buffer contents by applying a diff based on the
+             *  given text.
+             */
+            setTextViaDiff(text: string): void;
+
+            /** Set the text in the given range. */
+            setTextInRange(range: RangeCompatible, text: string, options?:
+                { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+
+            /** Insert text at the given position. */
+            insert(position: PointCompatible, text: string, options?:
+                { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+
+            /** Append text to the end of the buffer. */
+            append(text: string, options?: { normalizeLineEndings?: boolean, undo?:
+                "skip" }): Range;
+
+            /** Delete the text in the given range. */
+            delete(range: RangeCompatible): Range;
+
+            /** Delete the line associated with a specified row. */
+            deleteRow(row: number): Range;
+
+            /** Delete the lines associated with the specified row range. */
+            deleteRows(startRow: number, endRow: number): Range;
+
+            // Markers
+            /** Create a layer to contain a set of related markers. */
+            addMarkerLayer(options?: { maintainHistory?: boolean, persistent?: boolean }):
+                MarkerLayer;
+
+            /**
+             *  Get a MarkerLayer by id.
+             *  Returns a MarkerLayer or `` if no layer exists with the given id.
+             */
+            getMarkerLayer(id: string): MarkerLayer|undefined;
+
+            /** Get the default MarkerLayer. */
+            getDefaultMarkerLayer(): MarkerLayer;
+
+            /** Create a marker with the given range in the default marker layer. */
+            markRange(range: RangeCompatible, properties?: { reversed?: boolean,
+                invalidate?: "never"|"surround"|"overlap"|"inside"|"touch",
+                exclusive?: boolean }): Marker;
+
+            /** Create a marker at the given position with no tail in the default marker layer. */
+            markPosition(position: PointCompatible, options?: { invalidate?: "never"|"surround"
+                |"overlap"|"inside"|"touch", exclusive?: boolean }): Marker;
+
+            /** Get all existing markers on the default marker layer. */
+            getMarkers(): Marker[];
+
+            /** Get an existing marker by its id from the default marker layer. */
+            getMarker(id: number): Marker;
+
+            /** Find markers conforming to the given parameters in the default marker layer. */
+            findMarkers(params: Options.FindMarker): Marker[];
+
+            /** Get the number of markers in the default marker layer. */
+            getMarkerCount(): number;
+
+            // History
+            /** Undo the last operation. If a transaction is in progress, aborts it. */
+            undo(): boolean;
+
+            /** Redo the last operation. */
+            redo(): boolean;
+
+            /** Batch multiple operations as a single undo/redo step. */
+            transact<T>(groupingInterval: number, fn: () => T): T;
+            transact<T>(fn: () => T): T;
+
+            /**
+             *  Call within a transaction to terminate the function's execution and
+             *  revert any changes performed up to the abortion.
+             */
+            abortTransaction(): void;
+
+            /**
+             *  Clear the undo stack. When calling this method within a transaction,
+             *  the ::onDidChangeText event will not be triggered because the information
+             *  describing the changes is lost.
+             */
+            clearUndoStack(): void;
+
+            /**
+             *  Create a pointer to the current state of the buffer for use with
+             *  ::revertToCheckpoint and ::groupChangesSinceCheckpoint.
+             */
+            createCheckpoint(): number;
+
+            /**
+             *  Revert the buffer to the state it was in when the given checkpoint was created.
+             *  Returns a boolean indicating whether the operation succeeded.
+             */
+            revertToCheckpoint(checkpoint: number): boolean;
+
+            /**
+             *  Group all changes since the given checkpoint into a single transaction for
+             *  purposes of undo/redo.
+             *  Returns a boolean indicating whether the operation succeeded.
+             */
+            groupChangesSinceCheckpoint(checkpoint: number): boolean;
+
+            /**
+             *  Returns a list of changes since the given checkpoint.
+             *  If the given checkpoint is no longer present in the undo history, this method
+             *  will return an empty Array.
+             */
+            getChangesSinceCheckpoint(checkpoint: number): Array<{
+                /** A Point representing where the change started. */
+                start: Point,
+
+                /** A Point representing the replaced extent. */
+                oldExtent: Point,
+
+                /** A Point representing the replacement extent. */
+                newExtent: Point,
+
+                /** A String representing the replacement text. */
+                newText: string
+            }>;
+
+            // Search and Replace
+            /**
+             *  Scan regular expression matches in the entire buffer, calling the given
+             *  iterator function on each match.
+             */
+            scan(regex: RegExp, iterator: (params: Structures.BufferScanResult) => void): void;
+            /**
+             *  Scan regular expression matches in the entire buffer, calling the given
+             *  iterator function on each match.
+             */
+            scan(regex: RegExp, options: Options.ScanContext, iterator: (params:
+                Structures.ContextualBufferScanResult) => void): void;
+
+            /**
+             *  Scan regular expression matches in the entire buffer in reverse order,
+             *  calling the given iterator function on each match.
+             */
+            backwardsScan(regex: RegExp, iterator: (params: Structures.BufferScanResult) => void):
+                void;
+            /**
+             *  Scan regular expression matches in the entire buffer in reverse order,
+             *  calling the given iterator function on each match.
+             */
+            backwardsScan(regex: RegExp, options: Options.ScanContext, iterator: (params:
+                Structures.ContextualBufferScanResult) => void): void;
+
+            /**
+             *  Scan regular expression matches in a given range , calling the given
+             *  iterator function on each match.
+             */
+            scanInRange(regex: RegExp, range: RangeCompatible, iterator:
+                (params: Structures.BufferScanResult) => void): void;
+            /**
+             *  Scan regular expression matches in a given range , calling the given
+             *  iterator function on each match.
+             */
+            scanInRange(regex: RegExp, range: RangeCompatible, options: Options.ScanContext,
+                iterator: (params: Structures.ContextualBufferScanResult) => void): void;
+
+            /**
+             *  Scan regular expression matches in a given range in reverse order,
+             *  calling the given iterator function on each match.
+             */
+            backwardsScanInRange(regex: RegExp, range: RangeCompatible, iterator:
+                (params: Structures.BufferScanResult) => void): void;
+            /**
+             *  Scan regular expression matches in a given range in reverse order,
+             *  calling the given iterator function on each match.
+             */
+            backwardsScanInRange(regex: RegExp, range: RangeCompatible, options:
+                Options.ScanContext, iterator:
+                (params: Structures.ContextualBufferScanResult) => void): void;
+
+            /** Replace all regular expression matches in the entire buffer. */
+            replace(regex: RegExp, replacementText: string): number;
+
+            // Buffer Range Details
+            /** Get the range spanning from [0, 0] to ::getEndPosition. */
+            getRange(): Range;
+
+            /** Get the number of lines in the buffer. */
+            getLineCount(): number;
+
+            /** Get the last 0-indexed row in the buffer. */
+            getLastRow(): number;
+
+            /** Get the first position in the buffer, which is always [0, 0]. */
+            getFirstPosition(): Point;
+
+            /** Get the maximal position in the buffer, where new text would be appended. */
+            getEndPosition(): Point;
+
+            /** Get the length of the buffer in characters. */
+            getMaxCharacterIndex(): number;
+
+            /** Get the range for the given row. */
+            rangeForRow(row: number, includeNewline: boolean): Range;
+
+            /**
+             *  Convert a position in the buffer in row/column coordinates to an absolute
+             *  character offset, inclusive of line ending characters.
+             */
+            characterIndexForPosition(position: Point|[number, number]): number;
+
+            /**
+             *  Convert an absolute character offset, inclusive of newlines, to a position
+             *  in the buffer in row/column coordinates.
+             */
+            positionForCharacterIndex(offset: number): Point;
+
+            /** Clip the given range so it starts and ends at valid positions. */
+            clipRange(range: RangeCompatible): Range;
+
+            /** Clip the given point so it is at a valid position in the buffer. */
+            clipPosition(position: PointCompatible): Point;
+
+            // Buffer Operations
+            /** Save the buffer. */
+            save(): Promise<void>;
+
+            /** Save the buffer at a specific path. */
+            saveAs(filePath: string): Promise<void>;
+
+            /** Reload the buffer's contents from disk. */
+            reload(): void;
+        }
+
+        /** The static side to the TextBuffer class. */
+        interface TextBufferStatic {
+            Point: PointStatic;
+            Range: RangeStatic;
+
+            /** Create a new buffer backed by the given file path. */
+            load(source: string, params?: Options.BufferLoad): Promise<TextBuffer>;
+
+            /**
+             *  Create a new buffer backed by the given file path. For better performance,
+             *  use TextBuffer.load instead.
+             */
+            loadSync(filePath: string, params?: Options.BufferLoad): TextBuffer;
+
+            /**
+             *  Restore a TextBuffer based on an earlier state created using the
+             *  TextBuffer::serialize method.
+             */
+            deserialize(params: object): Promise<TextBuffer>;
+
+            /** Create a new buffer with the given starting text. */
+            new (text: string): TextBuffer;
+            /** Create a new buffer with the given params. */
+            new (params?: {
+                /** The initial string text of the buffer. */
+                text?: string
+                /**
+                 *  A function that returns a Boolean indicating whether the buffer should
+                 *  be destroyed if its file is deleted.
+                 */
+                shouldDestroyOnFileDelete?(): boolean
+            }): TextBuffer;
+        }
+    }
 }
 
-declare let tb: TextBuffer.Statics.TextBuffer;
+declare const tb: TextBuffer.TextBufferStatic;
 export = tb;
diff --git a/types/text-buffer/text-buffer-tests.ts b/types/text-buffer/text-buffer-tests.ts
index 52e4383158..c21c1a0ef5 100644
--- a/types/text-buffer/text-buffer-tests.ts
+++ b/types/text-buffer/text-buffer-tests.ts
@@ -1,5 +1,5 @@
+import { Disposable } from "event-kit";
 import TextBuffer = require("text-buffer");
-import * as ImportTest from "text-buffer";
 
 declare let obj: object;
 declare let bool: boolean;
@@ -15,7 +15,7 @@ declare let displayMarkerLayer: TextBuffer.DisplayMarkerLayer;
 declare let marker: TextBuffer.Marker;
 declare let markers: TextBuffer.Marker[];
 declare let markerLayer: TextBuffer.MarkerLayer;
-declare let sub: EventKit.Disposable;
+declare let sub: Disposable;
 
 // Point ======================================================================
 let point = new TextBuffer.Point(42, 42);
@@ -163,10 +163,10 @@ new TextBuffer({ shouldDestroyOnFileDelete });
 new TextBuffer({ text: "Test", shouldDestroyOnFileDelete });
 
 async function bufferLoadFile() {
-	buffer = await TextBuffer.load("Test.file");
-	buffer = await TextBuffer.load("Test.file", { encoding: "utf8" });
-	buffer = await TextBuffer.load("Test.file", { shouldDestroyOnFileDelete });
-	buffer = await TextBuffer.load("Test.file", { encoding: "utf8", shouldDestroyOnFileDelete });
+    buffer = await TextBuffer.load("Test.file");
+    buffer = await TextBuffer.load("Test.file", { encoding: "utf8" });
+    buffer = await TextBuffer.load("Test.file", { shouldDestroyOnFileDelete });
+    buffer = await TextBuffer.load("Test.file", { encoding: "utf8", shouldDestroyOnFileDelete });
 }
 
 buffer = TextBuffer.loadSync("Test.file");
@@ -175,7 +175,7 @@ TextBuffer.loadSync("Test.file", { shouldDestroyOnFileDelete });
 TextBuffer.loadSync("Test.file", { encoding: "uft8", shouldDestroyOnFileDelete });
 
 async function deserializeBuffer() {
-	buffer = await TextBuffer.deserialize({});
+    buffer = await TextBuffer.deserialize({});
 }
 
 // Event Subscription
@@ -184,9 +184,9 @@ sub = buffer.onDidChange(() => void {});
 sub = buffer.onDidChangeText(() => void {});
 
 sub = buffer.onDidStopChanging((event): void => {
-	for (const change of event.changes) {
-		change.newExtent;
-	}
+    for (const change of event.changes) {
+        change.newExtent;
+    }
 });
 
 sub = buffer.onDidConflict(() => void {});
@@ -195,7 +195,7 @@ sub = buffer.onDidUpdateMarkers(() => void {});
 sub = buffer.onDidCreateMarker(() => void {});
 
 sub = buffer.onDidChangePath((path): void => {
-	str = path;
+    str = path;
 });
 
 sub = buffer.onDidChangeEncoding(() => void {});
@@ -218,7 +218,7 @@ bool = buffer.isInConflict();
 
 const path = buffer.getPath();
 if (path) {
-	str = path.substr(0, 42);
+    str = path.substr(0, 42);
 }
 
 buffer.setPath("Test.file");
@@ -241,12 +241,12 @@ str = buffer.getLastLine();
 
 const rowText = buffer.lineForRow(42);
 if (rowText) {
-	str = rowText;
+    str = rowText;
 }
 
 const lineEnding = buffer.lineEndingForRow(42);
 if (lineEnding) {
-	str = lineEnding;
+    str = lineEnding;
 }
 
 num = buffer.lineLengthForRow(42);
@@ -254,12 +254,12 @@ bool = buffer.isRowBlank(42);
 
 const prevRow = buffer.previousNonBlankRow(42);
 if (prevRow) {
-	num = prevRow;
+    num = prevRow;
 }
 
 const nextRow = buffer.nextNonBlankRow(42);
 if (nextRow) {
-	num = nextRow;
+    num = nextRow;
 }
 
 // Mutating Text
@@ -305,7 +305,7 @@ buffer.addMarkerLayer({ maintainHistory: true, persistent: true });
 
 const testMarkerLayer = buffer.getMarkerLayer("Test");
 if (testMarkerLayer) {
-	markerLayer = testMarkerLayer;
+    markerLayer = testMarkerLayer;
 }
 
 markerLayer = buffer.getDefaultMarkerLayer();
@@ -332,15 +332,15 @@ markers = buffer.getMarkers();
 marker = buffer.getMarker(42);
 
 markers = buffer.findMarkers({
-	startPosition: point,
-	endPosition: point,
-	startsInRange: range,
-	endsInRange: range,
-	containsPoint: point,
-	containsRange: range,
-	startRow: num,
-	endRow: num,
-	intersectsRow: num,
+    startPosition: point,
+    endPosition: point,
+    startsInRange: range,
+    endsInRange: range,
+    containsPoint: point,
+    containsRange: range,
+    startRow: num,
+    endRow: num,
+    intersectsRow: num,
 });
 markers = buffer.findMarkers({ startsInRange: [point, point] });
 markers = buffer.findMarkers({ startsInRange: [point, [0, 0]] });
@@ -364,79 +364,79 @@ buffer.getChangesSinceCheckpoint(42);
 // Search And Replace
 buffer.scan(/r^Test/, (): void => {});
 buffer.scan(/r^Test/, (params) => {
-	num = params.match.index;
-	str = params.matchText;
-	range = params.range;
-	params.replace("Test");
-	params.stop();
+    num = params.match.index;
+    str = params.matchText;
+    range = params.range;
+    params.replace("Test");
+    params.stop();
 });
 buffer.scan(/r^Test/, {
-	leadingContextLineCount: 5,
-	trailingContextLineCount: 5,
+    leadingContextLineCount: 5,
+    trailingContextLineCount: 5,
 }, (params) => {
-	strs = params.leadingContextLines;
-	strs = params.trailingContextLines;
+    strs = params.leadingContextLines;
+    strs = params.trailingContextLines;
 });
 
 buffer.backwardsScan(/r^Test/, (): void => {});
 buffer.backwardsScan(/r^Test/, (params) => {
-	num = params.match.index;
-	str = params.matchText;
-	range = params.range;
-	params.replace("Test");
-	params.stop();
+    num = params.match.index;
+    str = params.matchText;
+    range = params.range;
+    params.replace("Test");
+    params.stop();
 });
 buffer.backwardsScan(/r^Test/, {
-	leadingContextLineCount: 5,
-	trailingContextLineCount: 5,
+    leadingContextLineCount: 5,
+    trailingContextLineCount: 5,
 }, (params) => {
-	strs = params.leadingContextLines;
-	strs = params.trailingContextLines;
+    strs = params.leadingContextLines;
+    strs = params.trailingContextLines;
 });
 
 buffer.scanInRange(/r^Test/, range, (): void => {});
 buffer.scanInRange(/r^Test/, range, (params) => {
-	num = params.match.index;
-	str = params.matchText;
-	range = params.range;
-	params.replace("Test");
-	params.stop();
+    num = params.match.index;
+    str = params.matchText;
+    range = params.range;
+    params.replace("Test");
+    params.stop();
 });
 buffer.scanInRange(/r^Test/, range, {
-	leadingContextLineCount: 5,
-	trailingContextLineCount: 5,
+    leadingContextLineCount: 5,
+    trailingContextLineCount: 5,
 }, (params) => {
-	strs = params.leadingContextLines;
-	strs = params.trailingContextLines;
+    strs = params.leadingContextLines;
+    strs = params.trailingContextLines;
 });
 buffer.scanInRange(/r^Test/, [point, point], (): void => {});
 buffer.scanInRange(/r^Test/, [[0, 0], [0, 0]], (): void => {});
 buffer.scanInRange(/r^Test/, [point, [0, 0]], (): void => {});
 buffer.scanInRange(/r^Test/, [[0, 0], point], (): void => {});
 buffer.scanInRange(/r^Test/, [[0, 0], [0, 0]], { trailingContextLineCount: 42 },
-	(): void => {});
+    (): void => {});
 
 buffer.backwardsScanInRange(/r^Test/, range, (): void => {});
 buffer.backwardsScanInRange(/r^Test/, range, (params) => {
-	num = params.match.index;
-	str = params.matchText;
-	range = params.range;
-	params.replace("Test");
-	params.stop();
+    num = params.match.index;
+    str = params.matchText;
+    range = params.range;
+    params.replace("Test");
+    params.stop();
 });
 buffer.backwardsScanInRange(/r^Test/, range, {
-	leadingContextLineCount: 5,
-	trailingContextLineCount: 5,
+    leadingContextLineCount: 5,
+    trailingContextLineCount: 5,
 }, (params) => {
-	strs = params.leadingContextLines;
-	strs = params.trailingContextLines;
+    strs = params.leadingContextLines;
+    strs = params.trailingContextLines;
 });
 buffer.backwardsScanInRange(/r^Test/, [point, point], (): void => {});
 buffer.backwardsScanInRange(/r^Test/, [[0, 0], [0, 0]], (): void => {});
 buffer.backwardsScanInRange(/r^Test/, [point, [0, 0]], (): void => {});
 buffer.backwardsScanInRange(/r^Test/, [[0, 0], point], (): void => {});
 buffer.backwardsScanInRange(/r^Test/, [[0, 0], [0, 0]], { trailingContextLineCount: 42 },
-	(): void => {});
+    (): void => {});
 
 num = buffer.replace(/r^Test/, "Test");
 
@@ -462,8 +462,8 @@ point = buffer.clipPosition([0, 0]);
 
 // Buffer Operations
 async function saveBuffer() {
-	await buffer.save();
-	await buffer.saveAs("Test.file");
+    await buffer.save();
+    await buffer.saveAs("Test.file");
 }
 
 buffer.reload();
@@ -478,11 +478,11 @@ str = marker.invalidate;
 
 // Lifecycle
 marker = marker.copy({
-	tailed: true,
-	reversed: true,
-	invalidate: "surround",
-	exclusive: false,
-	properties: { custom: "prop" },
+    tailed: true,
+    reversed: true,
+    invalidate: "surround",
+    exclusive: false,
+    properties: { custom: "prop" },
 });
 
 marker.destroy();
@@ -491,17 +491,17 @@ marker.destroy();
 sub = marker.onDidDestroy(() => {});
 
 sub = marker.onDidChange(event => {
-	event.oldHeadPosition;
-	event.newHeadPosition;
-	event.oldTailPosition;
-	event.newTailPosition;
-	event.wasValid;
-	event.isValid;
-	event.hadTail;
-	event.hasTail;
-	event.oldProperties;
-	event.newProperties;
-	event.textChanged;
+    event.oldHeadPosition;
+    event.newHeadPosition;
+    event.oldTailPosition;
+    event.newTailPosition;
+    event.wasValid;
+    event.isValid;
+    event.hadTail;
+    event.hasTail;
+    event.oldProperties;
+    event.newProperties;
+    event.textChanged;
 });
 
 // Marker Details
@@ -554,15 +554,15 @@ markers = markerLayer.getMarkers();
 num = markerLayer.getMarkerCount();
 
 markers = markerLayer.findMarkers({
-	startPosition: point,
-	endPosition: point,
-	startsInRange: range,
-	endsInRange: range,
-	containsPoint: point,
-	containsRange: range,
-	startRow: num,
-	endRow: num,
-	intersectsRow: num,
+    startPosition: point,
+    endPosition: point,
+    startsInRange: range,
+    endsInRange: range,
+    containsPoint: point,
+    containsRange: range,
+    startRow: num,
+    endRow: num,
+    intersectsRow: num,
 });
 markers = markerLayer.findMarkers({ containsRange: [point, point] });
 markers = markerLayer.findMarkers({ containsRange: [point, [0, 0]] });
@@ -578,7 +578,7 @@ marker = markerLayer.markRange([[0, 0], [0, 0]]);
 marker = markerLayer.markRange(range, { exclusive: true });
 marker = markerLayer.markRange([point, point], { invalidate: "never" });
 marker = markerLayer.markRange(range, {
-	exclusive: false, invalidate: "surround", reversed: false,
+    exclusive: false, invalidate: "surround", reversed: false,
 });
 
 marker = markerLayer.markPosition(point);
@@ -599,11 +599,11 @@ displayMarker.destroy();
 displayMarker = displayMarker.copy();
 displayMarker = displayMarker.copy({});
 displayMarker = displayMarker.copy({
-	tailed: true,
-	reversed: false,
-	invalidate: "never",
-	exclusive: false,
-	properties: { deprecated: "property" },
+    tailed: true,
+    reversed: false,
+    invalidate: "never",
+    exclusive: false,
+    properties: { deprecated: "property" },
 });
 
 // Event Subscription
@@ -620,38 +620,38 @@ obj = displayMarker.getProperties();
 displayMarker.setProperties(obj);
 
 bool = displayMarker.matchesProperties({
-	startBufferPosition: point,
-	endBufferPosition: point,
-	startScreenPosition: point,
-	endScreenPosition: point,
-	startsInBufferRange: range,
-	endsInBufferRange: range,
-	startsInScreenRange: range,
-	endsInScreenRange: range,
-	startBufferRow: num,
-	endBufferRow: num,
-	startScreenRow: num,
-	endScreenRow: num,
-	intersectsBufferRowRange: [num, num],
-	intersectsScreenRowRange: [num, num],
-	containsBufferRange: range,
-	containsBufferPosition: point,
-	containedInBufferRange: range,
-	containedInScreenRange: range,
-	intersectsBufferRange: range,
-	intersectsScreenRange: range,
+    startBufferPosition: point,
+    endBufferPosition: point,
+    startScreenPosition: point,
+    endScreenPosition: point,
+    startsInBufferRange: range,
+    endsInBufferRange: range,
+    startsInScreenRange: range,
+    endsInScreenRange: range,
+    startBufferRow: num,
+    endBufferRow: num,
+    startScreenRow: num,
+    endScreenRow: num,
+    intersectsBufferRowRange: [num, num],
+    intersectsScreenRowRange: [num, num],
+    containsBufferRange: range,
+    containsBufferPosition: point,
+    containedInBufferRange: range,
+    containedInScreenRange: range,
+    intersectsBufferRange: range,
+    intersectsScreenRange: range,
 });
 bool = displayMarker.matchesProperties({
-	intersectsBufferRange: [point, point],
+    intersectsBufferRange: [point, point],
 });
 bool = displayMarker.matchesProperties({
-	intersectsBufferRange: [point, [0, 0]],
+    intersectsBufferRange: [point, [0, 0]],
 });
 bool = displayMarker.matchesProperties({
-	intersectsBufferRange: [[0, 0], point],
+    intersectsBufferRange: [[0, 0], point],
 });
 bool = displayMarker.matchesProperties({
-	intersectsBufferRange: [[0, 0], [0, 0]],
+    intersectsBufferRange: [[0, 0], [0, 0]],
 });
 
 // Comparing to other markers
@@ -730,7 +730,7 @@ displayMarker = displayMarkerLayer.markScreenRange(range, { exclusive: true });
 displayMarker = displayMarkerLayer.markScreenRange(range, { invalidate: "never" });
 displayMarker = displayMarkerLayer.markScreenRange(range, { reversed: true });
 displayMarker = displayMarkerLayer.markScreenRange(range, { clipDirection: "backward",
-	exclusive: false, invalidate: "overlap", reversed: false });
+    exclusive: false, invalidate: "overlap", reversed: false });
 displayMarker = displayMarkerLayer.markScreenRange([point, point]);
 displayMarker = displayMarkerLayer.markScreenRange([point, [0, 0]]);
 displayMarker = displayMarkerLayer.markScreenRange([[0, 0], point]);
@@ -743,7 +743,7 @@ displayMarker = displayMarkerLayer.markScreenPosition(point, { clipDirection: "f
 displayMarker = displayMarkerLayer.markScreenPosition(point, { exclusive: true });
 displayMarker = displayMarkerLayer.markScreenPosition(point, { invalidate: "never" });
 displayMarker = displayMarkerLayer.markScreenPosition(point, { clipDirection: "backward",
-	exclusive: false, invalidate: "overlap" });
+    exclusive: false, invalidate: "overlap" });
 displayMarker = displayMarkerLayer.markScreenPosition([0, 0]);
 displayMarker = displayMarkerLayer.markScreenPosition([0, 0], { exclusive: false });
 
@@ -753,7 +753,7 @@ displayMarker = displayMarkerLayer.markBufferRange(range, { invalidate: "inside"
 displayMarker = displayMarkerLayer.markBufferRange(range, { exclusive: true });
 displayMarker = displayMarkerLayer.markBufferRange(range, { reversed: true });
 displayMarker = displayMarkerLayer.markBufferRange(range, { exclusive: false,
-	invalidate: "overlap", reversed: false });
+    invalidate: "overlap", reversed: false });
 displayMarker = displayMarkerLayer.markBufferRange([point, point]);
 displayMarker = displayMarkerLayer.markBufferRange([point, [0, 0]]);
 displayMarker = displayMarkerLayer.markBufferRange([[0, 0], point]);
@@ -765,7 +765,7 @@ displayMarker = displayMarkerLayer.markBufferPosition(point, {});
 displayMarker = displayMarkerLayer.markBufferPosition(point, { exclusive: true });
 displayMarker = displayMarkerLayer.markBufferPosition(point, { invalidate: "never" });
 displayMarker = displayMarkerLayer.markBufferPosition(point, { exclusive: false,
-	invalidate: "overlap" });
+    invalidate: "overlap" });
 displayMarker = displayMarkerLayer.markBufferPosition([0, 0]);
 displayMarker = displayMarkerLayer.markBufferPosition([0, 0], { exclusive: false });
 
@@ -775,36 +775,36 @@ displayMarkers = displayMarkerLayer.getMarkers();
 num = displayMarkerLayer.getMarkerCount();
 
 displayMarkers = displayMarkerLayer.findMarkers({
-	startBufferPosition: point,
-	endBufferPosition: point,
-	startScreenPosition: point,
-	endScreenPosition: point,
-	startsInBufferRange: range,
-	endsInBufferRange: range,
-	startsInScreenRange: range,
-	endsInScreenRange: range,
-	startBufferRow: num,
-	endBufferRow: num,
-	startScreenRow: num,
-	endScreenRow: num,
-	intersectsBufferRowRange: [num, num],
-	intersectsScreenRowRange: [num, num],
-	containsBufferRange: range,
-	containsBufferPosition: point,
-	containedInBufferRange: range,
-	containedInScreenRange: range,
-	intersectsBufferRange: range,
-	intersectsScreenRange: range,
+    startBufferPosition: point,
+    endBufferPosition: point,
+    startScreenPosition: point,
+    endScreenPosition: point,
+    startsInBufferRange: range,
+    endsInBufferRange: range,
+    startsInScreenRange: range,
+    endsInScreenRange: range,
+    startBufferRow: num,
+    endBufferRow: num,
+    startScreenRow: num,
+    endScreenRow: num,
+    intersectsBufferRowRange: [num, num],
+    intersectsScreenRowRange: [num, num],
+    containsBufferRange: range,
+    containsBufferPosition: point,
+    containedInBufferRange: range,
+    containedInScreenRange: range,
+    intersectsBufferRange: range,
+    intersectsScreenRange: range,
 });
 displayMarkers = displayMarkerLayer.findMarkers({
-	intersectsScreenRange: [point, point],
+    intersectsScreenRange: [point, point],
 });
 displayMarkers = displayMarkerLayer.findMarkers({
-	intersectsScreenRange: [point, [0, 0]],
+    intersectsScreenRange: [point, [0, 0]],
 });
 displayMarkers = displayMarkerLayer.findMarkers({
-	intersectsScreenRange: [[0, 0], point],
+    intersectsScreenRange: [[0, 0], point],
 });
 displayMarkers = displayMarkerLayer.findMarkers({
-	intersectsScreenRange: [[0, 0], [0, 0]],
+    intersectsScreenRange: [[0, 0], [0, 0]],
 });
diff --git a/types/text-buffer/tsconfig.json b/types/text-buffer/tsconfig.json
index 786f6efe5e..dd4d1eeb3e 100644
--- a/types/text-buffer/tsconfig.json
+++ b/types/text-buffer/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -21,4 +21,4 @@
         "index.d.ts",
         "text-buffer-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/text-buffer/tslint.json b/types/text-buffer/tslint.json
index 4b036f727a..e0508241c7 100644
--- a/types/text-buffer/tslint.json
+++ b/types/text-buffer/tslint.json
@@ -1,37 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Custom rules.
-        "class-name": true,
-        "indent": [true, "tabs"],
-        "jsdoc-format": true,
+        "indent": [true, "spaces", 4],
         "max-line-length": [true, 100],
-        "quotemark": [true, "double", "avoid-escape"],
-        "trailing-comma": [true, {
-            "multiline": { "objects": "always", "arrays": "always", "functions": "never" },
-            "singleline": { "objects": "never", "arrays": "never", "functions": "never" }
-        }],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-separator",
-            "check-type",
-            "check-typecast",
-            "check-rest-spread",
-            "check-preblock"
-        ],
-        // Soon to be defaults.
-        "arrow-return-shorthand": [true, "multiline"],
-        "no-any": true,
-        "no-floating-promises": true,
-        "no-unbound-method": true,
-        "no-unsafe-any": true,
-        "number-literal-format": true,
-        "restrict-plus-operands": true,
-        "return-undefined": true,
-        "switch-final-break": true
+        "no-any": true
     }
 }
diff --git a/types/text-buffer/v0/index.d.ts b/types/text-buffer/v0/index.d.ts
deleted file mode 100644
index 6d171e622c..0000000000
--- a/types/text-buffer/v0/index.d.ts
+++ /dev/null
@@ -1,301 +0,0 @@
-// Type definitions for text-buffer
-// Project: https://github.com/atom/text-buffer
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="emissary" />
-
-declare namespace TextBuffer {
-
-	interface IPointStatic {
-		new (row?:number, column?:number):IPoint;
-
-		fromObject(point:IPoint, copy?:boolean):IPoint;
-		fromObject(object:number[]):IPoint;
-		fromObject(object:{row:number; column:number;}):IPoint;
-
-		min(point1:IPoint, point2:IPoint):IPoint;
-		min(point1:number[], point2:IPoint):IPoint;
-		min(point1:{row:number; column:number;}, point2:IPoint):IPoint;
-
-		min(point1:IPoint, point2:number[]):IPoint;
-		min(point1:number[], point2:number[]):IPoint;
-		min(point1:{row:number; column:number;}, point2:number[]):IPoint;
-
-		min(point1:IPoint, point2:{row:number; column:number;}):IPoint;
-		min(point1:number[], point2:{row:number; column:number;}):IPoint;
-		min(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IPoint;
-	}
-
-	interface IPoint {
-		constructor: IPointStatic;
-
-		row:number;
-		column:number;
-
-		copy():IPoint;
-		freeze():IPoint;
-
-		translate(delta:IPoint):IPoint;
-		translate(delta:number[]):IPoint;
-		translate(delta:{row:number; column:number;}):IPoint;
-
-		add(other:IPoint):IPoint;
-		add(other:number[]):IPoint;
-		add(other:{row:number; column:number;}):IPoint;
-
-		splitAt(column:number):IPoint[];
-		compare(other:IPoint):number;
-		isEqual(other:IPoint):boolean;
-		isLessThan(other:IPoint):boolean;
-		isLessThanOrEqual(other:IPoint):boolean;
-		isGreaterThan(other:IPoint):boolean;
-		isGreaterThanOrEqual(other:IPoint):boolean;
-		toArray():number[];
-		serialize():number[];
-	}
-
-	interface IRangeStatic {
-		deserialize(array:IPoint[]):IRange;
-
-		fromObject(object:IPoint[]):IRange;
-
-		fromObject(object:IRange, copy?:boolean):IRange;
-
-		fromObject(object:{start: IPoint; end: IPoint}):IRange;
-		fromObject(object:{start: number[]; end: IPoint}):IRange;
-		fromObject(object:{start: {row:number; column:number;}; end: IPoint}):IRange;
-
-		fromObject(object:{start: IPoint; end: number[]}):IRange;
-		fromObject(object:{start: number[]; end: number[]}):IRange;
-		fromObject(object:{start: {row:number; column:number;}; end: number[]}):IRange;
-
-		fromObject(object:{start: IPoint; end: {row:number; column:number;}}):IRange;
-		fromObject(object:{start: number[]; end: {row:number; column:number;}}):IRange;
-		fromObject(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange;
-
-		fromText(point:IPoint, text:string):IRange;
-		fromText(point:number[], text:string):IRange;
-		fromText(point:{row:number; column:number;}, text:string):IRange;
-		fromText(text:string):IRange;
-
-		fromPointWithDelta(startPoint:IPoint, rowDelta:number, columnDelta:number):IRange;
-		fromPointWithDelta(startPoint:number[], rowDelta:number, columnDelta:number):IRange;
-		fromPointWithDelta(startPoint:{row:number; column:number;}, rowDelta:number, columnDelta:number):IRange;
-
-		new(point1:IPoint, point2:IPoint):IRange;
-		new(point1:number[], point2:IPoint):IRange;
-		new(point1:{row:number; column:number;}, point2:IPoint):IRange;
-
-		new(point1:IPoint, point2:number[]):IRange;
-		new(point1:number[], point2:number[]):IRange;
-		new(point1:{row:number; column:number;}, point2:number[]):IRange;
-
-		new(point1:IPoint, point2:{row:number; column:number;}):IRange;
-		new(point1:number[], point2:{row:number; column:number;}):IRange;
-		new(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IRange;
-	}
-
-	interface IRange {
-		constructor:IRangeStatic;
-
-		start: IPoint;
-		end: IPoint;
-
-		serialize():number[][];
-		copy():IRange;
-		freeze():IRange;
-		isEqual(other:IRange):boolean;
-		isEqual(other:IPoint[]):boolean;
-
-		compare(object:IPoint[]):number;
-
-		compare(object:{start: IPoint; end: IPoint}):number;
-		compare(object:{start: number[]; end: IPoint}):number;
-		compare(object:{start: {row:number; column:number;}; end: IPoint}):number;
-
-		compare(object:{start: IPoint; end: number[]}):number;
-		compare(object:{start: number[]; end: number[]}):number;
-		compare(object:{start: {row:number; column:number;}; end: number[]}):number;
-
-		compare(object:{start: IPoint; end: {row:number; column:number;}}):number;
-		compare(object:{start: number[]; end: {row:number; column:number;}}):number;
-		compare(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):number;
-
-		isSingleLine():boolean;
-		coversSameRows(other:IRange):boolean;
-
-		add(object:IPoint[]):IRange;
-
-		add(object:{start: IPoint; end: IPoint}):IRange;
-		add(object:{start: number[]; end: IPoint}):IRange;
-		add(object:{start: {row:number; column:number;}; end: IPoint}):IRange;
-
-		add(object:{start: IPoint; end: number[]}):IRange;
-		add(object:{start: number[]; end: number[]}):IRange;
-		add(object:{start: {row:number; column:number;}; end: number[]}):IRange;
-
-		add(object:{start: IPoint; end: {row:number; column:number;}}):IRange;
-		add(object:{start: number[]; end: {row:number; column:number;}}):IRange;
-		add(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange;
-
-		translate(startPoint:IPoint, endPoint:IPoint):IRange;
-		translate(startPoint:IPoint):IRange;
-
-		intersectsWith(otherRange:IRange):boolean;
-		containsRange(otherRange:IRange, exclusive:boolean):boolean;
-
-		containsPoint(point:IPoint, exclusive:boolean):boolean;
-		containsPoint(point:number[], exclusive:boolean):boolean;
-		containsPoint(point:{row:number; column:number;}, exclusive:boolean):boolean;
-
-		intersectsRow(row:number):boolean;
-		intersectsRowRange(startRow:number, endRow:number):boolean;
-		union(otherRange:IRange):IRange;
-		isEmpty():boolean;
-		toDelta():IPoint;
-		getRowCount():number;
-		getRows():number[];
-	}
-
-	interface IHistory {
-		// TBD
-	}
-
-	interface IMarkerManager {
-		// TBD
-	}
-
-	interface IMarker {
-		// TBD
-	}
-
-	interface IBufferPatch {
-		// TBD
-	}
-
-	interface ITextBufferStatic {
-		Point: IPointStatic;
-		Range: IRangeStatic;
-		newlineRegex:any;
-
-		new (text:string): ITextBuffer;
-		new (params:any): ITextBuffer;
-	}
-
-	interface ITextBuffer extends Emissary.IEmitter, Emissary.ISubscriber {
-		// Delegator.includeInto(TextBuffer);
-		// Serializable.includeInto(TextBuffer);
-
-		cachedText:string;
-		stoppedChangingDelay:number;
-		stoppedChangingTimeout:any;
-		cachedDiskContents:string;
-		conflict:boolean;
-		file:any; // pathwatcher.IFile
-		refcount:number;
-
-		lines:string[];
-		lineEndings:string[];
-		offsetIndex:any; // span-skip-list.SpanSkipList
-		history:IHistory;
-		markers:IMarkerManager;
-		loaded:boolean;
-		digestWhenLastPersisted:string;
-		modifiedWhenLastPersisted:boolean;
-		useSerializedText:boolean;
-
-		deserializeParams(params:any):any;
-		serializeParams():any;
-
-		getText():string;
-		getLines():string;
-		isEmpty():boolean;
-		getLineCount():number;
-		getLastRow():number;
-		lineForRow(row:number):string;
-		getLastLine():string;
-		lineEndingForRow(row:number):string;
-		lineLengthForRow(row:number):number;
-		setText(text:string):IRange;
-		setTextViaDiff(text:any):any[];
-		setTextInRange(range:IRange, text:string, normalizeLineEndings?:boolean):IRange;
-		insert(position:IPoint, text:string, normalizeLineEndings?:boolean):IRange;
-		append(text:string, normalizeLineEndings?:boolean):IRange;
-		delete(range:IRange):IRange;
-		deleteRow(row:number):IRange;
-		deleteRows(startRow:number, endRow:number):IRange;
-		buildPatch(oldRange:IRange, newText:string, normalizeLineEndings?:boolean):IBufferPatch;
-		applyPatch(patch:IBufferPatch):any;
-		getTextInRange(range:IRange):string;
-		clipRange(range:IRange):IRange;
-		clipPosition(position:IPoint):IPoint;
-		getFirstPosition():IPoint;
-		getEndPosition():IPoint;
-		getRange():IRange;
-		rangeForRow(row:number, includeNewline?:boolean):IRange;
-		characterIndexForPosition(position:IPoint):number;
-		positionForCharacterIndex(offset:number):IPoint;
-		getMaxCharacterIndex():number;
-		loadSync():ITextBuffer;
-		load():Promise<ITextBuffer>;
-		finishLoading():ITextBuffer;
-		handleTextChange(event:any):any;
-		destroy():any;
-		isAlive():boolean;
-		isDestroyed():boolean;
-		isRetained():boolean;
-		retain():ITextBuffer;
-		release():ITextBuffer;
-		subscribeToFile():any;
-		hasMultipleEditors():boolean;
-		reload():any;
-		updateCachedDiskContentsSync():string;
-		updateCachedDiskContents():Promise<string>;
-		getBaseName():string;
-		getPath():string;
-		getUri():string;
-		setPath(filePath:string):any;
-		save():void;
-		saveAs(filePath:string):any;
-		isModified():boolean;
-		isInConflict():boolean;
-		destroyMarker(id:any):any;
-		matchesInCharacterRange(regex:any, startIndex:any, endIndex:any):any[];
-		scan(regex:any, iterator:any):any;
-		backwardsScan(regex:any, iterator:any):any;
-		replace(regex:any, replacementText:any):any;
-		scanInRange(regex:any, range:any, iterator:any, reverse:any):any;
-		backwardsScanInRange(regex:any, range:any, iterator:any):any;
-		isRowBlank(row:number):boolean;
-		previousNonBlankRow(startRow:number):number;
-		nextNonBlankRow(startRow:number):number;
-		usesSoftTabs():boolean;
-		cancelStoppedChangingTimeout():any;
-		scheduleModifiedEvents():any;
-		emitModifiedStatusChanged(modifiedStatus:any):any;
-		logLines(start:number, end:number):void;
-
-		// delegate to history property
-		undo():any;
-		redo():any;
-		transact(fn:Function):any;
-		beginTransaction():any;
-		commitTransaction():any;
-		abortTransaction():any;
-		clearUndoStack():any;
-
-		// delegate to markers property
-		markRange(range:any, properties:any):any;
-		markPosition(range:any, properties:any):any;
-		getMarker(id:number):IMarker;
-		getMarkers():IMarker[];
-		getMarkerCount():number;
-	}
-}
-
-declare module "text-buffer" {
-	var _: TextBuffer.ITextBufferStatic;
-	export = _;
-}
diff --git a/types/text-buffer/v0/text-buffer-tests.ts b/types/text-buffer/v0/text-buffer-tests.ts
deleted file mode 100644
index 5b79f711cb..0000000000
--- a/types/text-buffer/v0/text-buffer-tests.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-declare var Point: TextBuffer.IPointStatic;
-
-var pointA = new Point(1, 2);
-pointA.row;
-pointA.column;
-
-var pointB = Point.fromObject({row: 2, column: 3});
-var pointC = Point.min(pointA, pointB);
-
-declare var TRange: TextBuffer.IRangeStatic;
-
-var rangeA = new TRange(pointA, pointB);
-
-declare var TextBufferStatic: TextBuffer.ITextBufferStatic;
-
-var textBuffer = new TextBufferStatic("Hello, world!");
-textBuffer.getLineCount();
diff --git a/types/text-buffer/v0/tsconfig.json b/types/text-buffer/v0/tsconfig.json
deleted file mode 100644
index d6dcbb8c5d..0000000000
--- a/types/text-buffer/v0/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "text-buffer": [
-                "text-buffer/v0"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "text-buffer-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/text-encoding-utf-8/index.d.ts b/types/text-encoding-utf-8/index.d.ts
new file mode 100644
index 0000000000..525077a2a5
--- /dev/null
+++ b/types/text-encoding-utf-8/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for text-encoding-utf-8 1.0
+// Project: https://github.com/arv/text-encoding-utf-8
+// Definitions by: Paul Taylor <https://github.com/trxcllnt>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export namespace TextEncoding {
+    interface TextDecoderOptions {
+        fatal?: boolean;
+        ignoreBOM?: boolean;
+    }
+
+    interface TextDecodeOptions {
+        stream?: boolean;
+    }
+
+    interface TextEncoderOptions {
+        NONSTANDARD_allowLegacyEncoding?: boolean;
+    }
+
+    interface TextDecoder {
+        encoding: string;
+        fatal: boolean;
+        ignoreBOM: boolean;
+        decode(input?: ArrayBuffer | ArrayBufferView, options?: TextDecodeOptions): string;
+    }
+
+    interface TextEncoder {
+        encoding: string;
+        encode(input?: string, options?: TextEncodeOptions): Uint8Array;
+    }
+
+    interface TextEncodeOptions {
+        stream?: boolean;
+    }
+
+    interface TextEncoderStatic {
+        (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
+        new (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
+    }
+
+    interface TextDecoderStatic {
+        (label?: string, options?: TextDecoderOptions): TextDecoder;
+        new (label?: string, options?: TextDecoderOptions): TextDecoder;
+    }
+
+    interface TextEncodingStatic {
+        TextEncoder: TextEncoderStatic;
+        TextDecoder: TextDecoderStatic;
+    }
+}
+
+export const TextDecoder: TextEncoding.TextDecoderStatic;
+
+export const TextEncoder: TextEncoding.TextEncoderStatic;
+
+export const TextEncoding: TextEncoding.TextEncodingStatic;
+
+export as namespace TextEncoding;
diff --git a/types/text-encoding-utf-8/text-encoding-utf-8-tests.ts b/types/text-encoding-utf-8/text-encoding-utf-8-tests.ts
new file mode 100644
index 0000000000..71887c3c7d
--- /dev/null
+++ b/types/text-encoding-utf-8/text-encoding-utf-8-tests.ts
@@ -0,0 +1,52 @@
+import { TextDecoder, TextEncoder } from "text-encoding-utf-8";
+
+function test_encoder() {
+    const text = "plain text";
+    let uint8array: Uint8Array;
+
+    // constructor
+    uint8array = new TextEncoder().encode(text);
+    uint8array = new TextEncoder('utf-8').encode(text);
+
+    uint8array = TextEncoder().encode(text);
+    uint8array = TextEncoder('utf-8').encode(text);
+
+    // attributes
+    const encoder = new TextEncoder();
+    encoder.encoding = 'utf-8';
+    const encoding: string = encoder.encoding;
+
+    // methods
+    encoder.encode();
+    encoder.encode(text);
+}
+
+function test_decoder() {
+    let text = "plain text";
+    const uint8array: Uint8Array = TextEncoder().encode(text);
+    const arrayBuffer: ArrayBuffer = uint8array.buffer;
+
+    // constructor
+    text = new TextDecoder().decode(uint8array);
+    text = new TextDecoder('utf-8').decode(uint8array);
+
+    text = TextDecoder().decode(uint8array);
+    text = TextDecoder('utf-8').decode(uint8array);
+
+    // attributes
+    const decoder = new TextDecoder();
+
+    decoder.encoding = 'utf-8';
+    const encoding: string = decoder.encoding;
+
+    decoder.fatal = true;
+    const fatal: boolean = decoder.fatal;
+
+    decoder.ignoreBOM = true;
+    const ignoreBOM: boolean = decoder.ignoreBOM;
+
+    // methods
+    decoder.decode();
+    decoder.decode(uint8array);
+    decoder.decode(arrayBuffer);
+}
diff --git a/types/text-encoding-utf-8/tsconfig.json b/types/text-encoding-utf-8/tsconfig.json
new file mode 100644
index 0000000000..f9d410c8c5
--- /dev/null
+++ b/types/text-encoding-utf-8/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "text-encoding-utf-8-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/text-encoding-utf-8/tslint.json b/types/text-encoding-utf-8/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/text-encoding-utf-8/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/text-encoding/tslint.json b/types/text-encoding/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/text-encoding/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index f9dcc7a762..2cea550034 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for three.js 0.84
-// Project: http://mrdoob.github.com/three.js/
-// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>
+// Type definitions for three.js 0.89
+// Project: https://threejs.org
+// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>, Roelof Jooste <https://github.com/PsychoSTS>, Daniel Hritzkiv <https://github.com/dhritzkiv>
 // Definitions: https://github.com//DefinitelyTyped
 
 export * from "./three-core";
@@ -22,9 +22,11 @@ export * from "./three-objloader";
 export * from "./three-octree";
 export * from "./three-orbitcontrols";
 export * from "./three-orthographictrackballcontrols";
+export * from "./three-outlinepass";
 export * from "./three-projector";
 export * from "./three-renderpass";
 export * from "./three-shaderpass";
+export * from "./three-smaapass";
 export * from "./three-trackballcontrols";
 export * from "./three-transformcontrols";
 export * from "./three-vrcontrols";
diff --git a/types/three/test/css3d/css3d_sprites.ts b/types/three/test/css3d/css3d_sprites.ts
index 4eda3d73a8..bd59334c36 100644
--- a/types/three/test/css3d/css3d_sprites.ts
+++ b/types/three/test/css3d/css3d_sprites.ts
@@ -24,14 +24,14 @@
         scene = new THREE.Scene();
 
         var image = document.createElement('img');
-        image.addEventListener('load', function (event: Event) {
+        image.addEventListener('load', function(event: Event) {
 
             for (var i = 0; i < particlesTotal; i++) {
 
                 var object = new THREE.CSS3DSprite(image.cloneNode());
-                object.position.x = Math.random() * 4000 - 2000,
-                object.position.y = Math.random() * 4000 - 2000,
-                object.position.z = Math.random() * 4000 - 2000
+                object.position.x = Math.random() * 4000 - 2000;
+                object.position.y = Math.random() * 4000 - 2000;
+                object.position.z = Math.random() * 4000 - 2000;
                 scene.add(object);
 
                 objects.push(object);
@@ -85,7 +85,7 @@
                 Math.random() * 4000 - 2000,
                 Math.random() * 4000 - 2000,
                 Math.random() * 4000 - 2000
-                );
+            );
 
         }
 
@@ -102,7 +102,7 @@
                 radius * Math.cos(theta) * Math.sin(phi),
                 radius * Math.sin(theta) * Math.sin(phi),
                 radius * Math.cos(phi)
-                );
+            );
 
         }
 
@@ -138,7 +138,7 @@
         var offset = current * particlesTotal * 3;
         var duration = 2000;
 
-        for (var i = 0, j = offset; i < particlesTotal; i++, j += 3) {
+        for (var i = 0, j = offset; i < particlesTotal;) {
 
             var object = objects[i];
 
@@ -150,7 +150,8 @@
                 }, Math.random() * duration + duration)
                 .easing(TWEEN.Easing.Exponential.InOut)
                 .start();
-
+            i++ ;
+            j += 3;
         }
 
         new TWEEN.Tween(this)
@@ -182,4 +183,4 @@
         renderer.render(scene, camera);
 
     }
-}
\ No newline at end of file
+}
diff --git a/types/three/test/webgl/webgl_materials.ts b/types/three/test/webgl/webgl_materials.ts
index 94f91b2fef..23d2d98a23 100644
--- a/types/three/test/webgl/webgl_materials.ts
+++ b/types/three/test/webgl/webgl_materials.ts
@@ -10,12 +10,12 @@
 
     var camera: THREE.PerspectiveCamera, scene: THREE.Scene, renderer: THREE.WebGLRenderer, objects: THREE.Mesh[];
     var particleLight: THREE.Mesh;
-    var materials: ( THREE.MeshBasicMaterial |
-                     THREE.MeshPhongMaterial |
-                     THREE.MeshNormalMaterial |
-                     THREE.MeshLambertMaterial |
-                     THREE.MeshFaceMaterial |
-                     THREE.MeshDepthMaterial ) [] = [];
+    var materials: (THREE.MeshBasicMaterial |
+        THREE.MeshPhongMaterial |
+        THREE.MeshNormalMaterial |
+        THREE.MeshLambertMaterial |
+        THREE.MeshFaceMaterial |
+        THREE.MeshDepthMaterial)[] = [];
 
     init();
     animate();
@@ -100,7 +100,7 @@
             let material = materials[i];
 
             geometry = material instanceof THREE.MeshFaceMaterial ? geometry_pieces :
-            (material.shading == THREE.FlatShading ? geometry_flat : geometry_smooth);
+                (material.shading == THREE.FlatShading ? geometry_flat : geometry_smooth);
 
             sphere = new THREE.Mesh(geometry, material);
 
@@ -178,7 +178,7 @@
 
         var x = 0, y = 0;
 
-        for (var i = 0, j = 0, l = image.data.length; i < l; i += 4, j++) {
+        for (var i = 0, j = 0, l = image.data.length; i < l;) {
 
             x = j % 256;
             y = x == 0 ? y + 1 : y;
@@ -187,6 +187,8 @@
             image.data[i + 1] = 255;
             image.data[i + 2] = 255;
             image.data[i + 3] = Math.floor(x ^ y);
+            i += 4;
+            j++;
 
         }
 
@@ -235,4 +237,4 @@
         renderer.render(scene, camera);
 
     }
-}
\ No newline at end of file
+}
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index ea63110057..880a150a06 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -463,6 +463,8 @@ export class CubeCamera extends Object3D {
     renderTarget: WebGLRenderTargetCube;
 
     updateCubeMap(renderer: Renderer, scene: Scene): void;
+
+    update(renderer: Renderer, scene: Scene): void;
 }
 
 /**
@@ -671,7 +673,9 @@ export class BufferAttribute {
     normalized: boolean;
     needsUpdate: boolean;
     count: number;
+	onUpload: Function;
 
+    setArray(array?: ArrayBufferView): void;
     setDynamic(dynamic: boolean): BufferAttribute;
     clone(): this;
     copy(source: this): this;
@@ -682,7 +686,7 @@ export class BufferAttribute {
     copyVector2sArray(vectors: {x: number, y: number}[]): BufferAttribute;
     copyVector3sArray(vectors: {x: number, y: number, z: number}[]): BufferAttribute;
     copyVector4sArray(vectors: {x: number, y: number, z: number, w: number}[]): BufferAttribute;
-    set(value: ArrayLike<number>, offset?: number): BufferAttribute;
+    set(value: ArrayLike<number>|ArrayBufferView, offset?: number): BufferAttribute;
     getX(index: number): number;
     setX(index: number, x: number): BufferAttribute;
     getY(index: number): number;
@@ -861,7 +865,8 @@ export class BufferGeometry extends EventDispatcher {
 
     center(): Vector3;
 
-    setFromObject(object: Object3D): void;
+    setFromObject(object: Object3D): BufferGeometry;
+    setFromPoints(points: Vector3[]): BufferGeometry;
     updateFromObject(object: Object3D): void;
 
     fromGeometry(geometry: Geometry, settings?: any): BufferGeometry;
@@ -1365,6 +1370,8 @@ export class Geometry extends EventDispatcher {
      */
     mergeVertices(): number;
 
+    setFromPoints(points: Array<Vector2> | Array<Vector3>): this;
+
     sortFacesByMaterialIndex(): void;
 
     toJSON(): any;
@@ -1445,6 +1452,7 @@ export class InterleavedBuffer {
     count: number;
     needsUpdate: boolean;
 
+    setArray(array?: ArrayBufferView): void;
     setDynamic(dynamic: boolean): InterleavedBuffer;
     clone(): this;
     copy(source: this): this;
@@ -1466,7 +1474,7 @@ export class InstancedInterleavedBuffer extends 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, normalized: boolean);
+    constructor(interleavedBuffer: InterleavedBuffer, itemSize: number, offset: number, normalized?: boolean);
 
     uuid: string;
     data: InterleavedBuffer;
@@ -1917,9 +1925,9 @@ export class LightShadow {
 export class AmbientLight extends Light {
     /**
      * This creates a Ambientlight with a color.
-     * @param hex Numeric value of the RGB component of the color.
+     * @param color Numeric value of the RGB component of the color or a Color instance.
      */
-    constructor(hex?: number|string, intensity?: number);
+    constructor(color?: Color | string | number, intensity?: number);
 
     castShadow: boolean;
 }
@@ -1936,7 +1944,7 @@ export class AmbientLight extends Light {
  * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/lights/DirectionalLight.js">src/lights/DirectionalLight.js</a>
  */
 export class DirectionalLight extends Light {
-    constructor(hex?: number|string, intensity?: number);
+    constructor(color?: Color | string | number, intensity?: number);
 
     /**
      * Target used for shadow camera orientation.
@@ -1957,8 +1965,9 @@ export class DirectionalLightShadow extends LightShadow {
 }
 
 export class HemisphereLight extends Light {
-    constructor(skyColorHex?: number|string, groundColorHex?: number|string, intensity?: number);
+    constructor(skyColor?: Color | string | number, groundColor?: Color | string | number, intensity?: number);
 
+	skyColor: Color;
     groundColor: Color;
     intensity: number;
 }
@@ -1972,7 +1981,7 @@ export class HemisphereLight extends Light {
  * scene.add( light );
  */
 export class PointLight extends Light {
-    constructor(hex?: number|string, intensity?: number, distance?: number, decay?: number);
+    constructor(color?: Color | string | number, intensity?: number, distance?: number, decay?: number);
 
     /*
         * Light's intensity.
@@ -1999,7 +2008,7 @@ export class PointLightShadow extends LightShadow {
  * A point light that can cast shadow in one direction.
  */
 export class SpotLight extends Light {
-    constructor(hex?: number|string, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
+    constructor(color?: Color | string | number, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
 
     /**
      * Spotlight focus points at target.position.
@@ -2594,7 +2603,7 @@ export class Material extends EventDispatcher {
 }
 
 export interface LineBasicMaterialParameters extends MaterialParameters {
-    color?: number|string|Color;
+    color?: Color | string | number;
     linewidth?: number;
     linecap?: string;
     linejoin?: string;
@@ -2612,7 +2621,7 @@ export class LineBasicMaterial extends Material {
 }
 
 export interface LineDashedMaterialParameters extends MaterialParameters {
-    color?: number|string|Color;
+    color?: Color | string | number;
     linewidth?: number;
     scale?: number;
     dashSize?: number;
@@ -2635,7 +2644,7 @@ export class LineDashedMaterial extends Material {
  * parameters is an object with one or more properties defining the material's appearance.
  */
 export interface MeshBasicMaterialParameters extends MaterialParameters {
-    color?: number|string|Color;
+    color?: Color | string | number;
     opacity?: number;
     map?: Texture;
     aoMap?: Texture;
@@ -2694,8 +2703,8 @@ export class MeshDepthMaterial extends Material {
 }
 
 export interface MeshLambertMaterialParameters extends MaterialParameters {
-    color?: number|string|Color;
-    emissive?: number|string;
+    color?: Color | string | number;
+    emissive?: Color | string | number;
     emissiveIntensity?: number;
     emissiveMap?: Texture;
     map?: Texture;
@@ -2748,7 +2757,7 @@ export class MeshLambertMaterial extends Material {
 }
 
 export interface MeshStandardMaterialParameters extends MaterialParameters {
-    color?: number|string|Color;
+    color?: Color | string | number;
     roughness?: number;
     metalness?: number;
     map?: Texture;
@@ -2756,7 +2765,7 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
     lightMapIntensity?: number;
     aoMap?: Texture;
     aoMapIntensity?: number;
-    emissive?: Color;
+    emissive?: Color | string | number;
     emissiveIntensity?: number;
     emissiveMap?: Texture;
     bumpMap?: Texture;
@@ -2836,8 +2845,8 @@ export class MeshNormalMaterial extends Material {
 
 export interface MeshPhongMaterialParameters extends MaterialParameters {
     /** geometry color in hexadecimal. Default is 0xffffff. */
-    color?: number|string|Color;
-    specular?: number;
+    color?: Color | string | number;
+    specular?: Color | string | number;
     shininess?: number;
     opacity?: number;
     map?: Texture;
@@ -2845,7 +2854,7 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
     lightMapIntensity?: number;
     aoMap?: Texture;
     aoMapIntensity?: number;
-    emissive?: number;
+    emissive?: Color | string | number;
     emissiveIntensity?: number;
     emissiveMap?: Texture;
     bumpMap?: Texture;
@@ -2873,7 +2882,7 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
 export class MeshPhongMaterial extends Material {
     constructor(parameters?: MeshPhongMaterialParameters);
 
-    color: Color; // diffuse
+    color: Color;
     specular: Color;
     shininess: number;
     map: Texture;
@@ -2946,7 +2955,7 @@ export class MultiMaterial extends Material {
 export class MeshFaceMaterial extends MultiMaterial {}
 
 export interface PointsMaterialParameters extends MaterialParameters {
-    color?: number|string|Color;
+    color?: Color | string | number;
     map?: Texture;
     size?: number;
     sizeAttenuation?: boolean;
@@ -3023,7 +3032,7 @@ export class RawShaderMaterial extends ShaderMaterial {
 }
 
 export interface SpriteMaterialParameters extends MaterialParameters {
-    color?: number|string|Color;
+    color?: Color | string | number;
     map?: Texture;
     rotation?: number;
 }
@@ -3881,6 +3890,19 @@ export class Spherical {
     setFromVector3(vec3: Vector3): Spherical;
 }
 
+export class Cylindrical {
+    constructor(radius?: number, theta?: number, y?: number);
+
+    radius: number;
+    theta: number;
+    y: number;
+
+    clone(): this;
+    copy(other: this): this;
+    set(radius: number, theta: number, y: number): this;
+    setFromVector3(vec3: Vector3): this;
+}
+
 /**
  * Implementation of a quaternion. This is used for rotating things without incurring in the dreaded gimbal lock issue, amongst other advantages.
  *
@@ -4486,6 +4508,7 @@ export class Vector3 implements Vector {
      * http://en.wikipedia.org/wiki/Taxicab_geometry
      */
     lengthManhattan(): number;
+    manhattanDistanceTo(v:Vector3):number;
 
     /**
      * Normalizes this vector.
@@ -4837,6 +4860,8 @@ export class Mesh extends Object3D {
     geometry: Geometry|BufferGeometry;
     material: Material | Material[];
     drawMode: TrianglesDrawModes;
+    morphTargetInfluences?: number[];
+    morphTargetDictionary?: { [key: string]: number; };
 
     setDrawMode(drawMode: TrianglesDrawModes): void;
     updateMorphTargets(): void;
@@ -5205,6 +5230,10 @@ export class WebGLRenderer implements Renderer {
     setTexture(texture: Texture, slot: number): void;
     setTexture2D(texture: Texture, slot: number): void;
     setTextureCube(texture: Texture, slot: number): void;
+    getRenderTarget(): RenderTarget;
+	/**
+     * @deprecated Use getRenderTarget instead.
+     */
     getCurrentRenderTarget(): RenderTarget;
     setRenderTarget(renderTarget: RenderTarget): void;
     readRenderTargetPixels( renderTarget: RenderTarget, x: number, y: number, width: number, height: number, buffer: any ): void;
@@ -5232,14 +5261,14 @@ export interface RenderTarget {} // not defined in the code, used in LightShadow
 
 export interface RenderItem
 {
-    id: number
-    object: THREE.Object3D,
-    geometry: THREE.Geometry | THREE.BufferGeometry,
-    material: THREE.Material,
-    program: THREE.WebGLProgram,
-    renderOrder: number,
-    z: number,
-    group: THREE.Group
+    id: number;
+    object: Object3D;
+    geometry: Geometry | BufferGeometry;
+    material: Material;
+    program: WebGLProgram;
+    renderOrder: number;
+    z: number;
+    group: Group;
 }
 
 export class WebGLRenderList
@@ -5980,6 +6009,8 @@ export class Texture extends EventDispatcher {
     type: TextureDataType;
     offset: Vector2;
     repeat: Vector2;
+    center: Vector2;
+    rotation: number;
     generateMipmaps: boolean;
     premultiplyAlpha: boolean;
     flipY: boolean;
diff --git a/types/three/three-outlinepass.d.ts b/types/three/three-outlinepass.d.ts
new file mode 100644
index 0000000000..4cc7ad92d6
--- /dev/null
+++ b/types/three/three-outlinepass.d.ts
@@ -0,0 +1,17 @@
+import { Camera, Color, Object3D, Scene, Vector2 } from './three-core';
+
+export class OutlinePass {
+    constructor(size: Vector2, scene: Scene, camer: Camera, selectedObjects?: Array<Object3D>);
+    selectedObjects: Array<Object3D>;
+    renderCamera: Camera;
+    visibleEdgeColor: Color;
+    hiddenEdgeColor: Color;
+    edgeGlow: number;
+    usePatternTexture: boolean;
+    edgeThickness: number;
+    edgeStrength: number;
+    downSampleRatio: number;
+    pulsePeriod: number;
+    resolution: Vector2;
+}
+
diff --git a/types/three/three-smaapass.d.ts b/types/three/three-smaapass.d.ts
new file mode 100644
index 0000000000..2b48811697
--- /dev/null
+++ b/types/three/three-smaapass.d.ts
@@ -0,0 +1,5 @@
+export class SMAAPass {
+    constructor(width: number, height: number);
+    renderToScreen: boolean;
+}
+
diff --git a/types/three/tslint.json b/types/three/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/three/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/thrift/index.d.ts b/types/thrift/index.d.ts
index 69d546e901..c5cb6f20a3 100644
--- a/types/thrift/index.d.ts
+++ b/types/thrift/index.d.ts
@@ -10,6 +10,7 @@
 
 import * as net from 'net';
 import * as http from 'http';
+import * as https from 'https';
 import * as tls from 'tls';
 
 // Thrift re-exports node-int64 and Q
@@ -50,6 +51,11 @@ export interface TStruct {
     fname: string;
 }
 
+export interface TStructLike {
+    read(input: TProtocol): void;
+    write(output: TProtocol): void;
+}
+
 export interface TTransport {
     commitPosition(): void;
     rollbackPosition(): void;
@@ -115,6 +121,10 @@ export interface TProtocol {
     skip(type: Thrift.Type): void;
 }
 
+export interface HttpHeaders {
+    [name: string]: number | string | string[] | undefined;
+}
+
 export interface SeqId2Service {
     [seqid: number]: string;
 }
@@ -158,7 +168,7 @@ export class XHRConnection extends NodeJS.EventEmitter {
     recv_buf: string;
     transport: TTransport;
     protocol: TProtocol;
-    headers: http.OutgoingHttpHeaders;
+    headers: HttpHeaders;
     constructor(host: string, port: number, options?: ConnectOptions);
     getXmlHttpRequestObject(): XMLHttpRequest;
     flush(): void;
@@ -176,7 +186,7 @@ export interface WSOptions {
     host: string;
     port: number;
     path: string;
-    headers: http.OutgoingHttpHeaders;
+    headers: HttpHeaders;
 }
 
 export class WSConnection extends NodeJS.EventEmitter {
@@ -224,7 +234,7 @@ export interface ServiceOptions<TProcessor, THandler> {
 export interface ServerOptions<TProcessor, THandler> extends ServiceOptions<TProcessor, THandler> {
     cors?: string[];
     files?: string;
-    headers?: http.IncomingHttpHeaders;
+    headers?: HttpHeaders;
     services?: ServiceMap<TProcessor, THandler>;
     tls?: tls.TlsOptions;
 }
@@ -233,21 +243,21 @@ export interface ConnectOptions {
     transport?: TTransportConstructor;
     protocol?: TProtocolConstructor;
     path?: string;
-    headers?: http.OutgoingHttpHeaders;
+    headers?: HttpHeaders;
     https?: boolean;
     debug?: boolean;
     max_attempts?: number;
     retry_max_delay?: number;
     connect_timeout?: number;
     timeout?: number;
-    nodeOptions?: http.ClientRequestArgs;
+    nodeOptions?: http.RequestOptions | https.RequestOptions;
 }
 
 export interface WSConnectOptions {
     transport?: TTransportConstructor;
     protocol?: TProtocolConstructor;
     path?: string;
-    headers?: http.OutgoingHttpHeaders;
+    headers?: HttpHeaders;
     secure?: boolean;
     wsOptions?: WSOptions;
 }
@@ -311,7 +321,7 @@ export function createServer<TProcessor, THandler>(
 export function createWebServer<TProcessor, THandler>(options: WebServerOptions<TProcessor, THandler>): http.Server | tls.Server;
 
 export class TBufferedTransport implements TTransport {
-    constructor(buffer: Buffer | undefined, callback: TTransportCallback);
+    constructor(buffer?: Buffer, callback?: TTransportCallback);
     static receiver(callback: (trans: TBufferedTransport, seqid: number) => void, seqid: number): (data: Buffer) => void;
     commitPosition(): void;
     rollbackPosition(): void;
@@ -331,7 +341,7 @@ export class TBufferedTransport implements TTransport {
 }
 
 export class TFramedTransport implements TTransport {
-    constructor(buffer: Buffer | undefined, callback: TTransportCallback);
+    constructor(buffer?: Buffer, callback?: TTransportCallback);
     static receiver(callback: (trans: TFramedTransport, seqid: number) => void, seqid: number): (data: Buffer) => void;
     commitPosition(): void;
     rollbackPosition(): void;
@@ -351,7 +361,7 @@ export class TFramedTransport implements TTransport {
 }
 
 export interface TTransportConstructor {
-  new (buffer: Buffer | undefined, callback: TTransportCallback): TTransport;
+  new (buffer?: Buffer, callback?: TTransportCallback): TTransport;
 }
 
 export class TBinaryProtocol implements TProtocol {
diff --git a/types/thrift/thrift-tests.ts b/types/thrift/thrift-tests.ts
index da9e9eafa0..385a1051b9 100644
--- a/types/thrift/thrift-tests.ts
+++ b/types/thrift/thrift-tests.ts
@@ -1,3 +1,6 @@
+import * as http from 'http';
+import * as https from 'https';
+
 import {
   createConnection,
   createServer,
@@ -23,11 +26,9 @@ interface MockServiceHandlers {
 }
 
 class MockProcessor {
-  constructor() {}
 }
 
 class MockClient {
-  constructor() {}
 }
 
 const mockServiceHandlers: MockServiceHandlers = {
@@ -43,10 +44,33 @@ const mockGeneratedService = {
 
 createServer<MockProcessor, MockServiceHandlers>(mockGeneratedService, mockServiceHandlers);
 
+const httpOptions: http.RequestOptions = {
+    timeout: 10000,
+    headers: {
+        'Content-Type': 'application/octet-stream'
+    }
+};
+
+const httpsOptions: https.RequestOptions = {
+    timeout: 10000,
+    headers: {
+        'Content-Type': 'application/octet-stream'
+    },
+    secureProtocol: 'SSLv3_method'
+};
+
 const clientConnection = createConnection('0.0.0.0', 1234, {
-  transport: TBufferedTransport,
-  protocol: TBinaryProtocol
+    transport: TBufferedTransport,
+    protocol: TBinaryProtocol,
+    nodeOptions: httpOptions
 });
+
+const secureConnection = createConnection('0.0.0.0', 1234, {
+    transport: TBufferedTransport,
+    protocol: TBinaryProtocol,
+    nodeOptions: httpsOptions
+});
+
 createClient<MockClient>(mockGeneratedService, clientConnection);
 
 const mockBuffer: Buffer = Buffer.alloc(8);
diff --git a/types/throng/index.d.ts b/types/throng/index.d.ts
index 76a64932db..f962ce1ca9 100644
--- a/types/throng/index.d.ts
+++ b/types/throng/index.d.ts
@@ -1,18 +1,21 @@
 // Type definitions for throng 4.0
 // Project: https://github.com/hunterloftis/throng
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+//                 Tate Thurston <https://github.com/tatethurston>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function throng(options: throng.WorkerCallback | throng.Options | number, startFunction?: throng.WorkerCallback): void;
+declare function throng(startOrOptions: throng.ProcessCallback | throng.Options): void;
+declare function throng(workers: throng.WorkerCount, start: throng.ProcessCallback): void;
 declare namespace throng {
-    type WorkerCallback = (id: number) => void;
+    type WorkerCount = number | string;
+    type ProcessCallback = (id: number) => any;
 
     interface Options {
         grace?: number;
         lifetime?: number;
-        master(): void;
-        start: WorkerCallback;
-        workers: number;
+        master?: ProcessCallback;
+        start: ProcessCallback;
+        workers?: WorkerCount;
     }
 }
 
diff --git a/types/throttle-debounce/index.d.ts b/types/throttle-debounce/index.d.ts
new file mode 100644
index 0000000000..ded0507caf
--- /dev/null
+++ b/types/throttle-debounce/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for throttle-debounce 1.0
+// Project: https://github.com/niksy/throttle-debounce
+// Definitions by: Marek Buchar <https://github.com/czbuchi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Throttle execution of a function. Especially useful for rate limiting
+ * execution of handlers on events like resize and scroll.
+ *
+ * @param delay
+ * A zero-or-greater delay in milliseconds. For event callbacks, values around
+ * 100 or 250 (or even higher) are most useful.
+ *
+ * @param noTrailing
+ * If noTrailing is true, callback will only execute every `delay` milliseconds
+ * while the throttled-function is being called. If noTrailing is false or
+ * unspecified, callback will be executed one final time fter the last
+ * throttled-function call. (After the throttled-function has not been called
+ * for `delay` milliseconds, the internal counter is reset)
+ *
+ * @param callback
+ * A function to be executed after delay milliseconds. The `this` context and
+ * all arguments are passed through, as-is, to `callback` when the
+ * throttled-function is executed.
+ *
+ * @param debounceMode If `debounceMode` is true (at begin), schedule
+ * `callback` to execute after `delay` ms. If `debounceMode` is false (at end),
+ * schedule `callback` to execute after `delay` ms.
+ *
+ * @return
+ * A new, throttled, function.
+ */
+export function throttle<T>(
+    delay: number,
+    noTrailing: boolean,
+    callback: T,
+    debounceMode?: boolean,
+): T;
+
+/**
+ * Throttle execution of a function. Especially useful for rate limiting
+ * execution of handlers on events like resize and scroll.
+ *
+ * @param delay
+ * A zero-or-greater delay in milliseconds. For event callbacks, values around
+ * 100 or 250 (or even higher) are most useful.
+ *
+ * @param callback
+ * A function to be executed after delay milliseconds. The `this` context and
+ * all arguments are passed through, as-is, to `callback` when the
+ * throttled-function is executed.
+ *
+ * @param debounceMode If `debounceMode` is true (at begin), schedule
+ * `callback` to execute after `delay` ms. If `debounceMode` is false (at end),
+ * schedule `callback` to execute after `delay` ms.
+ *
+ * @return
+ * A new, throttled, function.
+ */
+export function throttle<T>(
+    delay: number,
+    callback: T,
+    debounceMode?: boolean,
+): T;
+
+/**
+ * Debounce execution of a function. Debouncing, unlike throttling,
+ * guarantees that a function is only executed a single time, either at the
+ * very beginning of a series of calls, or at the very end.
+ *
+ * @param delay
+ * A zero-or-greater delay in milliseconds. For event callbacks, values around
+ * 100 or 250 (or even higher) are most useful.
+ *
+ * @param atBegin
+ * If atBegin is false or unspecified, callback will only be executed `delay`
+ * milliseconds after the last debounced-function call. If atBegin is true,
+ * callback will be executed only at the first debounced-function call. (After
+ * the throttled-function has not been called for `delay` milliseconds, the
+ * internal counter is reset).
+ *
+ * @param callback
+ * A function to be executed after delay milliseconds. The `this` context and
+ * all arguments are passed through, as-is, to `callback` when the
+ * debounced-function is executed.
+ *
+ * @return
+ * A new, debounced function.
+ */
+export function debounce<T>(delay: number, atBegin: boolean, callback: T): T;
+
+/**
+ * Debounce execution of a function. Debouncing, unlike throttling,
+ * guarantees that a function is only executed a single time, either at the
+ * very beginning of a series of calls, or at the very end.
+ *
+ * @param delay
+ * A zero-or-greater delay in milliseconds. For event callbacks, values around
+ * 100 or 250 (or even higher) are most useful.
+ *
+ * @param callback
+ * A function to be executed after delay milliseconds. The `this` context and
+ * all arguments are passed through, as-is, to `callback` when the
+ * debounced-function is executed.
+ *
+ * @return
+ * A new, debounced function.
+ */
+export function debounce<T>(delay: number, callback: T): T;
diff --git a/types/throttle-debounce/throttle-debounce-tests.ts b/types/throttle-debounce/throttle-debounce-tests.ts
new file mode 100644
index 0000000000..0090eb1039
--- /dev/null
+++ b/types/throttle-debounce/throttle-debounce-tests.ts
@@ -0,0 +1,15 @@
+import throttleDebounce = require('throttle-debounce');
+
+const { throttle, debounce } = throttleDebounce;
+
+type Func = () => void;
+
+const func: Func = () => {};
+
+const throttle1: Func = throttle(42, true, func, true);
+const throttle2: Func = throttle(42, true, func);
+const throttle3: Func = throttle(42, func, true);
+const throttle4: Func = throttle(42, func);
+
+const debounce1: Func = debounce(42, true, func);
+const debounce2: Func = debounce(42, func);
diff --git a/types/throttle-debounce/tsconfig.json b/types/throttle-debounce/tsconfig.json
new file mode 100644
index 0000000000..cf362d7611
--- /dev/null
+++ b/types/throttle-debounce/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "throttle-debounce-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/throttle-debounce/tslint.json b/types/throttle-debounce/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/throttle-debounce/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/through/tslint.json b/types/through/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/through/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/through2/tslint.json b/types/through2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/through2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/through2/v0/tslint.json b/types/through2/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/through2/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tile-reduce/tslint.json b/types/tile-reduce/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tile-reduce/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tilebelt/index.d.ts b/types/tilebelt/index.d.ts
index 9d0f15d4ee..f8d3adae1c 100644
--- a/types/tilebelt/index.d.ts
+++ b/types/tilebelt/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mapbox/tilebelt
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="geojson" />
 
diff --git a/types/tilebelt/tslint.json b/types/tilebelt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tilebelt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/timelinejs/tslint.json b/types/timelinejs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/timelinejs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/timelinejs3/tslint.json b/types/timelinejs3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/timelinejs3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/timezone-js/tslint.json b/types/timezone-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/timezone-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/timezonecomplete/index.d.ts b/types/timezonecomplete/index.d.ts
deleted file mode 100644
index 0f8f94d420..0000000000
--- a/types/timezonecomplete/index.d.ts
+++ /dev/null
@@ -1,1519 +0,0 @@
-// Type definitions for timezonecomplete 1.15.0
-// Project: https://github.com/SpiritIT/timezonecomplete
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'timezonecomplete' {
-    import basics = require("__timezonecomplete/basics");
-    export import TimeUnit = basics.TimeUnit;
-    export import WeekDay = basics.WeekDay;
-    export import timeUnitToMilliseconds = basics.timeUnitToMilliseconds;
-    export import isLeapYear = basics.isLeapYear;
-    export import daysInMonth = basics.daysInMonth;
-    export import daysInYear = basics.daysInYear;
-    export import firstWeekDayOfMonth = basics.firstWeekDayOfMonth;
-    export import lastWeekDayOfMonth = basics.lastWeekDayOfMonth;
-    export import weekDayOnOrAfter = basics.weekDayOnOrAfter;
-    export import weekDayOnOrBefore = basics.weekDayOnOrBefore;
-    export import weekNumber = basics.weekNumber;
-    export import weekOfMonth = basics.weekOfMonth;
-    export import dayOfYear = basics.dayOfYear;
-    export import secondOfDay = basics.secondOfDay;
-    export import timeUnitToString = basics.timeUnitToString;
-    export import stringToTimeUnit = basics.stringToTimeUnit;
-    import datetime = require("__timezonecomplete/datetime");
-    export import DateTime = datetime.DateTime;
-    export import now = datetime.now;
-    export import nowLocal = datetime.nowLocal;
-    export import nowUtc = datetime.nowUtc;
-    import duration = require("__timezonecomplete/duration");
-    export import Duration = duration.Duration;
-    export import years = duration.years;
-    export import months = duration.months;
-    export import days = duration.days;
-    export import hours = duration.hours;
-    export import minutes = duration.minutes;
-    export import seconds = duration.seconds;
-    export import milliseconds = duration.milliseconds;
-    import javascript = require("__timezonecomplete/javascript");
-    export import DateFunctions = javascript.DateFunctions;
-    import period = require("__timezonecomplete/period");
-    export import Period = period.Period;
-    export import PeriodDst = period.PeriodDst;
-    export import periodDstToString = period.periodDstToString;
-    import timesource = require("__timezonecomplete/timesource");
-    export import TimeSource = timesource.TimeSource;
-    export import RealTimeSource = timesource.RealTimeSource;
-    import timezone = require("__timezonecomplete/timezone");
-    export import NormalizeOption = timezone.NormalizeOption;
-    export import TimeZoneKind = timezone.TimeZoneKind;
-    export import TimeZone = timezone.TimeZone;
-    export import local = timezone.local;
-    export import utc = timezone.utc;
-    export import zone = timezone.zone;
-    import globals = require("__timezonecomplete/globals");
-    export import min = globals.min;
-    export import max = globals.max;
-}
-
-declare module '__timezonecomplete/basics' {
-    import javascript = require("__timezonecomplete/javascript");
-    import DateFunctions = javascript.DateFunctions;
-    /**
-        * Day-of-week. Note the enum values correspond to JavaScript day-of-week:
-        * Sunday = 0, Monday = 1 etc
-        */
-    export enum WeekDay {
-            Sunday = 0,
-            Monday = 1,
-            Tuesday = 2,
-            Wednesday = 3,
-            Thursday = 4,
-            Friday = 5,
-            Saturday = 6,
-    }
-    /**
-        * Time units
-        */
-    export enum TimeUnit {
-            Millisecond = 0,
-            Second = 1,
-            Minute = 2,
-            Hour = 3,
-            Day = 4,
-            Week = 5,
-            Month = 6,
-            Year = 7,
-            /**
-                * End-of-enum marker, do not use
-                */
-            MAX = 8,
-    }
-    /**
-        * Approximate number of milliseconds for a time unit.
-        * A day is assumed to have 24 hours, a month is assumed to equal 30 days
-        * and a year is set to 360 days (because 12 months of 30 days).
-        *
-        * @param unit	Time unit e.g. TimeUnit.Month
-        * @returns	The number of milliseconds.
-        */
-    export function timeUnitToMilliseconds(unit: TimeUnit): number;
-    /**
-        * Time unit to lowercase string. If amount is specified, then the string is put in plural form
-        * if necessary.
-        * @param unit The unit
-        * @param amount If this is unequal to -1 and 1, then the result is pluralized
-        */
-    export function timeUnitToString(unit: TimeUnit, amount?: number): string;
-    export function stringToTimeUnit(s: string): TimeUnit;
-    /**
-        * @return True iff the given year is a leap year.
-        */
-    export function isLeapYear(year: number): boolean;
-    /**
-        * The days in a given year
-        */
-    export function daysInYear(year: number): number;
-    /**
-        * @param year	The full year
-        * @param month	The month 1-12
-        * @return The number of days in the given month
-        */
-    export function daysInMonth(year: number, month: number): number;
-    /**
-        * Returns the day of the year of the given date [0..365]. January first is 0.
-        *
-        * @param year	The year e.g. 1986
-        * @param month Month 1-12
-        * @param day Day of month 1-31
-        */
-    export function dayOfYear(year: number, month: number, day: number): number;
-    /**
-        * Returns the last instance of the given weekday in the given month
-        *
-        * @param year	The year
-        * @param month	the month 1-12
-        * @param weekDay	the desired week day
-        *
-        * @return the last occurrence of the week day in the month
-        */
-    export function lastWeekDayOfMonth(year: number, month: number, weekDay: WeekDay): number;
-    /**
-        * Returns the first instance of the given weekday in the given month
-        *
-        * @param year	The year
-        * @param month	the month 1-12
-        * @param weekDay	the desired week day
-        *
-        * @return the first occurrence of the week day in the month
-        */
-    export function firstWeekDayOfMonth(year: number, month: number, weekDay: WeekDay): number;
-    /**
-        * Returns the day-of-month that is on the given weekday and which is >= the given day.
-        * Throws if the month has no such day.
-        */
-    export function weekDayOnOrAfter(year: number, month: number, day: number, weekDay: WeekDay): number;
-    /**
-        * Returns the day-of-month that is on the given weekday and which is <= the given day.
-        * Throws if the month has no such day.
-        */
-    export function weekDayOnOrBefore(year: number, month: number, day: number, weekDay: WeekDay): number;
-    /**
-        * The week of this month. There is no official standard for this,
-        * but we assume the same rules for the weekNumber (i.e.
-        * week 1 is the week that has the 4th day of the month in it)
-        *
-        * @param year The year
-        * @param month The month [1-12]
-        * @param day The day [1-31]
-        * @return Week number [1-5]
-        */
-    export function weekOfMonth(year: number, month: number, day: number): number;
-    /**
-        * The ISO 8601 week number for the given date. Week 1 is the week
-        * that has January 4th in it, and it starts on Monday.
-        * See https://en.wikipedia.org/wiki/ISO_week_date
-        *
-        * @param year	Year e.g. 1988
-        * @param month	Month 1-12
-        * @param day	Day of month 1-31
-        *
-        * @return Week number 1-53
-        */
-    export function weekNumber(year: number, month: number, day: number): number;
-    /**
-        * Convert a unix milli timestamp into a TimeT structure.
-        * This does NOT take leap seconds into account.
-        */
-    export function unixToTimeNoLeapSecs(unixMillis: number): TimeStruct;
-    /**
-        * Convert a year, month, day etc into a unix milli timestamp.
-        * This does NOT take leap seconds into account.
-        *
-        * @param year	Year e.g. 1970
-        * @param month	Month 1-12
-        * @param day	Day 1-31
-        * @param hour	Hour 0-23
-        * @param minute	Minute 0-59
-        * @param second	Second 0-59 (no leap seconds)
-        * @param milli	Millisecond 0-999
-        */
-    export function timeToUnixNoLeapSecs(year?: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, milli?: number): number;
-    /**
-        * Convert a TimeT structure into a unix milli timestamp.
-        * This does NOT take leap seconds into account.
-        */
-    export function timeToUnixNoLeapSecs(tm: TimeStruct): number;
-    /**
-        * Return the day-of-week.
-        * This does NOT take leap seconds into account.
-        */
-    export function weekDayNoLeapSecs(unixMillis: number): WeekDay;
-    /**
-        * N-th second in the day, counting from 0
-        */
-    export function secondOfDay(hour: number, minute: number, second: number): number;
-    /**
-        * Basic representation of a date and time
-        */
-    export class TimeStruct {
-            /**
-                * Year, 1970-...
-                */
-            year: number;
-            /**
-                * Month 1-12
-                */
-            month: number;
-            /**
-                * Day of month, 1-31
-                */
-            day: number;
-            /**
-                * Hour 0-23
-                */
-            hour: number;
-            /**
-                * Minute 0-59
-                */
-            minute: number;
-            /**
-                * Seconds, 0-59
-                */
-            second: number;
-            /**
-                * Milliseconds 0-999
-                */
-            milli: number;
-            /**
-                * Create a TimeStruct from a number of unix milliseconds
-                */
-            static fromUnix(unixMillis: number): TimeStruct;
-            /**
-                * Create a TimeStruct from a JavaScript date
-                *
-                * @param d	The date
-                * @param df	Which functions to take (getX() or getUTCX())
-                */
-            static fromDate(d: Date, df: DateFunctions): TimeStruct;
-            /**
-                * Returns a TimeStruct from an ISO 8601 string WITHOUT time zone
-                */
-            static fromString(s: string): TimeStruct;
-            /**
-                * Constructor
-                *
-                * @param year	Year e.g. 1970
-                * @param month	Month 1-12
-                * @param day	Day 1-31
-                * @param hour	Hour 0-23
-                * @param minute	Minute 0-59
-                * @param second	Second 0-59 (no leap seconds)
-                * @param milli	Millisecond 0-999
-                */
-            constructor(
-                    /**
-                        * Year, 1970-...
-                        */
-                    year?: number,
-                    /**
-                        * Month 1-12
-                        */
-                    month?: number,
-                    /**
-                        * Day of month, 1-31
-                        */
-                    day?: number,
-                    /**
-                        * Hour 0-23
-                        */
-                    hour?: number,
-                    /**
-                        * Minute 0-59
-                        */
-                    minute?: number,
-                    /**
-                        * Seconds, 0-59
-                        */
-                    second?: number,
-                    /**
-                        * Milliseconds 0-999
-                        */
-                    milli?: number);
-            /**
-                * Validate a TimeStruct, returns false if invalid.
-                */
-            validate(): boolean;
-            /**
-                * The day-of-year 0-365
-                */
-            yearDay(): number;
-            /**
-                * Returns this time as a unix millisecond timestamp
-                * Does NOT take leap seconds into account.
-                */
-            toUnixNoLeapSecs(): number;
-            /**
-                * Deep equals
-                */
-            equals(other: TimeStruct): boolean;
-            /**
-                * < operator
-                */
-            lessThan(other: TimeStruct): boolean;
-            clone(): TimeStruct;
-            valueOf(): number;
-            /**
-                * ISO 8601 string YYYY-MM-DDThh:mm:ss.nnn
-                */
-            toString(): string;
-            inspect(): string;
-    }
-}
-
-declare module '__timezonecomplete/datetime' {
-    import basics = require("__timezonecomplete/basics");
-    import WeekDay = basics.WeekDay;
-    import TimeUnit = basics.TimeUnit;
-    import duration = require("__timezonecomplete/duration");
-    import Duration = duration.Duration;
-    import javascript = require("__timezonecomplete/javascript");
-    import DateFunctions = javascript.DateFunctions;
-    import timesource = require("__timezonecomplete/timesource");
-    import TimeSource = timesource.TimeSource;
-    import timezone = require("__timezonecomplete/timezone");
-    import TimeZone = timezone.TimeZone;
-    /**
-        * Current date+time in local time
-        */
-    export function nowLocal(): DateTime;
-    /**
-        * Current date+time in UTC time
-        */
-    export function nowUtc(): DateTime;
-    /**
-        * Current date+time in the given time zone
-        * @param timeZone	The desired time zone (optional, defaults to UTC).
-        */
-    export function now(timeZone?: TimeZone): DateTime;
-    /**
-        * DateTime class which is time zone-aware
-        * and which can be mocked for testing purposes.
-        */
-    export class DateTime {
-            /**
-                * Actual time source in use. Setting this property allows to
-                * fake time in tests. DateTime.nowLocal() and DateTime.nowUtc()
-                * use this property for obtaining the current time.
-                */
-            static timeSource: TimeSource;
-            /**
-                * Current date+time in local time
-                */
-            static nowLocal(): DateTime;
-            /**
-                * Current date+time in UTC time
-                */
-            static nowUtc(): DateTime;
-            /**
-                * Current date+time in the given time zone
-                * @param timeZone	The desired time zone (optional, defaults to UTC).
-                */
-            static now(timeZone?: TimeZone): DateTime;
-            /**
-                * Create a DateTime from a Lotus 123 / Microsoft Excel date-time value
-                * i.e. a double representing days since 1-1-1900 where 1900 is incorrectly seen as leap year
-                */
-            static fromExcel(n: number, timeZone?: TimeZone): DateTime;
-            /**
-                * Constructor. Creates current time in local timezone.
-                */
-            constructor();
-            /**
-                * Constructor
-                * Non-existing local times are normalized by rounding up to the next DST offset.
-                *
-                * @param isoString	String in ISO 8601 format. Instead of ISO time zone,
-                *		 it may include a space and then and IANA time zone.
-                * e.g. "2007-04-05T12:30:40.500"					(no time zone, naive date)
-                * e.g. "2007-04-05T12:30:40.500+01:00"				(UTC offset without daylight saving time)
-                * or   "2007-04-05T12:30:40.500Z"					(UTC)
-                * or   "2007-04-05T12:30:40.500 Europe/Amsterdam"	(IANA time zone, with daylight saving time if applicable)
-                * @param timeZone	if given, the date in the string is assumed to be in this time zone.
-                *					Note that it is NOT CONVERTED to the time zone. Useful
-                *					for strings without a time zone
-                */
-            constructor(isoString: string, timeZone?: TimeZone);
-            /**
-                * Constructor. You provide a date, then you say whether to take the
-                * date.getYear()/getXxx methods or the date.getUTCYear()/date.getUTCXxx methods,
-                * and then you state which time zone that date is in.
-                * Non-existing local times are normalized by rounding up to the next DST offset.
-                * Note that the Date class has bugs and inconsistencies when constructing them with times around
-                * DST changes.
-                *
-                * @param date	A date object.
-                * @param getters	Specifies which set of Date getters contains the date in the given time zone: the
-                *					Date.getXxx() methods or the Date.getUTCXxx() methods.
-                * @param timeZone	The time zone that the given date is assumed to be in (may be null for unaware dates)
-                */
-            constructor(date: Date, getFuncs: DateFunctions, timeZone?: TimeZone);
-            /**
-                * Constructor. Note that unlike JavaScript dates we require fields to be in normal ranges.
-                * Use the add(duration) or sub(duration) for arithmetic.
-                * @param year	The full year (e.g. 2014)
-                * @param month	The month [1-12] (note this deviates from JavaScript Date)
-                * @param day	The day of the month [1-31]
-                * @param hour	The hour of the day [0-24)
-                * @param minute	The minute of the hour [0-59]
-                * @param second	The second of the minute [0-59]
-                * @param millisecond	The millisecond of the second [0-999]
-                * @param timeZone	The time zone, or null (for unaware dates)
-                */
-            constructor(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number, timeZone?: TimeZone);
-            /**
-                * Constructor
-                * @param unixTimestamp	milliseconds since 1970-01-01T00:00:00.000
-                * @param timeZone	the time zone that the timestamp is assumed to be in (usually UTC).
-                */
-            constructor(unixTimestamp: number, timeZone?: TimeZone);
-            /**
-                * @return a copy of this object
-                */
-            clone(): DateTime;
-            /**
-                * @return The time zone that the date is in. May be null for unaware dates.
-                */
-            zone(): TimeZone;
-            /**
-                * Zone name abbreviation at this time
-                * @param dstDependent (default true) set to false for a DST-agnostic abbreviation
-                * @return The abbreviation
-                */
-            zoneAbbreviation(dstDependent?: boolean): string;
-            /**
-                * @return the offset w.r.t. UTC in minutes. Returns 0 for unaware dates and for UTC dates.
-                */
-            offset(): number;
-            /**
-                * @return The full year e.g. 2014
-                */
-            year(): number;
-            /**
-                * @return The month 1-12 (note this deviates from JavaScript Date)
-                */
-            month(): number;
-            /**
-                * @return The day of the month 1-31
-                */
-            day(): number;
-            /**
-                * @return The hour 0-23
-                */
-            hour(): number;
-            /**
-                * @return the minutes 0-59
-                */
-            minute(): number;
-            /**
-                * @return the seconds 0-59
-                */
-            second(): number;
-            /**
-                * @return the milliseconds 0-999
-                */
-            millisecond(): number;
-            /**
-                * @return the day-of-week (the enum values correspond to JavaScript
-                * week day numbers)
-                */
-            weekDay(): WeekDay;
-            /**
-                * Returns the day number within the year: Jan 1st has number 0,
-                * Jan 2nd has number 1 etc.
-                *
-                * @return the day-of-year [0-366]
-                */
-            dayOfYear(): number;
-            /**
-                * The ISO 8601 week number. Week 1 is the week
-                * that has January 4th in it, and it starts on Monday.
-                * See https://en.wikipedia.org/wiki/ISO_week_date
-                *
-                * @return Week number [1-53]
-                */
-            weekNumber(): number;
-            /**
-                * The week of this month. There is no official standard for this,
-                * but we assume the same rules for the weekNumber (i.e.
-                * week 1 is the week that has the 4th day of the month in it)
-                *
-                * @return Week number [1-5]
-                */
-            weekOfMonth(): number;
-            /**
-                * Returns the number of seconds that have passed on the current day
-                * Does not consider leap seconds
-                *
-                * @return seconds [0-86399]
-                */
-            secondOfDay(): number;
-            /**
-                * @return Milliseconds since 1970-01-01T00:00:00.000Z
-                */
-            unixUtcMillis(): number;
-            /**
-                * @return The full year e.g. 2014
-                */
-            utcYear(): number;
-            /**
-                * @return The UTC month 1-12 (note this deviates from JavaScript Date)
-                */
-            utcMonth(): number;
-            /**
-                * @return The UTC day of the month 1-31
-                */
-            utcDay(): number;
-            /**
-                * @return The UTC hour 0-23
-                */
-            utcHour(): number;
-            /**
-                * @return The UTC minutes 0-59
-                */
-            utcMinute(): number;
-            /**
-                * @return The UTC seconds 0-59
-                */
-            utcSecond(): number;
-            /**
-                * Returns the UTC day number within the year: Jan 1st has number 0,
-                * Jan 2nd has number 1 etc.
-                *
-                * @return the day-of-year [0-366]
-                */
-            utcDayOfYear(): number;
-            /**
-                * @return The UTC milliseconds 0-999
-                */
-            utcMillisecond(): number;
-            /**
-                * @return the UTC day-of-week (the enum values correspond to JavaScript
-                * week day numbers)
-                */
-            utcWeekDay(): WeekDay;
-            /**
-                * The ISO 8601 UTC week number. Week 1 is the week
-                * that has January 4th in it, and it starts on Monday.
-                * See https://en.wikipedia.org/wiki/ISO_week_date
-                *
-                * @return Week number [1-53]
-                */
-            utcWeekNumber(): number;
-            /**
-                * The week of this month. There is no official standard for this,
-                * but we assume the same rules for the weekNumber (i.e.
-                * week 1 is the week that has the 4th day of the month in it)
-                *
-                * @return Week number [1-5]
-                */
-            utcWeekOfMonth(): number;
-            /**
-                * Returns the number of seconds that have passed on the current day
-                * Does not consider leap seconds
-                *
-                * @return seconds [0-86399]
-                */
-            utcSecondOfDay(): number;
-            /**
-                * Convert this date to the given time zone (in-place).
-                * Throws if this date does not have a time zone.
-                * @return this (for chaining)
-                */
-            convert(zone?: TimeZone): DateTime;
-            /**
-                * Returns this date converted to the given time zone.
-                * Unaware dates can only be converted to unaware dates (clone)
-                * Converting an unaware date to an aware date throws an exception. Use the constructor
-                * if you really need to do that.
-                *
-                * @param zone	The new time zone. This may be null to create unaware date.
-                * @return The converted date
-                */
-            toZone(zone?: TimeZone): DateTime;
-            /**
-                * Convert to JavaScript date with the zone time in the getX() methods.
-                * Unless the timezone is local, the Date.getUTCX() methods will NOT be correct.
-                * This is because Date calculates getUTCX() from getX() applying local time zone.
-                */
-            toDate(): Date;
-            /**
-                * Add a time duration relative to UTC.
-                * @return this + duration
-                */
-            add(duration: Duration): DateTime;
-            /**
-                * Add an amount of time relative to UTC, as regularly as possible.
-                *
-                * Adding e.g. 1 hour will increment the utcHour() field, adding 1 month
-                * increments the utcMonth() field.
-                * Adding an amount of units leaves lower units intact. E.g.
-                * adding a month will leave the day() field untouched if possible.
-                *
-                * Note adding Months or Years will clamp the date to the end-of-month if
-                * the start date was at the end of a month, i.e. contrary to JavaScript
-                * Date#setUTCMonth() it will not overflow into the next month
-                *
-                * In case of DST changes, the utc time fields are still untouched but local
-                * time fields may shift.
-                */
-            add(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Add an amount of time to the zone time, as regularly as possible.
-                *
-                * Adding e.g. 1 hour will increment the hour() field of the zone
-                * date by one. In case of DST changes, the time fields may additionally
-                * increase by the DST offset, if a non-existing local time would
-                * be reached otherwise.
-                *
-                * Adding a unit of time will leave lower-unit fields intact, unless the result
-                * would be a non-existing time. Then an extra DST offset is added.
-                *
-                * Note adding Months or Years will clamp the date to the end-of-month if
-                * the start date was at the end of a month, i.e. contrary to JavaScript
-                * Date#setUTCMonth() it will not overflow into the next month
-                */
-            addLocal(duration: Duration): DateTime;
-            addLocal(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Same as add(-1*duration);
-                */
-            sub(duration: Duration): DateTime;
-            /**
-                * Same as add(-1*amount, unit);
-                */
-            sub(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Same as addLocal(-1*amount, unit);
-                */
-            subLocal(duration: Duration): DateTime;
-            subLocal(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Time difference between two DateTimes
-                * @return this - other
-                */
-            diff(other: DateTime): Duration;
-            /**
-             * Chops off the time part, yields the same date at 00:00:00.000
-             * @return a new DateTime
-             */
-            startOfDay(): DateTime;
-            /**
-                * @return True iff (this < other)
-                */
-            lessThan(other: DateTime): boolean;
-            /**
-                * @return True iff (this <= other)
-                */
-            lessEqual(other: DateTime): boolean;
-            /**
-                * @return True iff this and other represent the same moment in time in UTC
-                */
-            equals(other: DateTime): boolean;
-            /**
-                * @return True iff this and other represent the same time and the same zone
-                */
-            identical(other: DateTime): boolean;
-            /**
-                * @return True iff this > other
-                */
-            greaterThan(other: DateTime): boolean;
-            /**
-                * @return True iff this >= other
-                */
-            greaterEqual(other: DateTime): boolean;
-            /**
-                * @return The minimum of this and other
-                */
-            min(other: DateTime): DateTime;
-            /**
-                * @return The maximum of this and other
-                */
-            max(other: DateTime): DateTime;
-            /**
-                * Proper ISO 8601 format string with any IANA zone converted to ISO offset
-                * E.g. "2014-01-01T23:15:33+01:00" for Europe/Amsterdam
-                */
-            toIsoString(): string;
-            /**
-                * Return a string representation of the DateTime according to the
-                * specified format. The format is implemented as the LDML standard
-                * (http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns)
-                *
-                * @param formatString The format specification (e.g. "dd/MM/yyyy HH:mm:ss")
-                * @return The string representation of this DateTime
-                */
-            format(formatString: string): string;
-            /**
-                * Modified ISO 8601 format string with IANA name if applicable.
-                * E.g. "2014-01-01T23:15:33.000 Europe/Amsterdam"
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-            /**
-                * The valueOf() method returns the primitive value of the specified object.
-                */
-            valueOf(): any;
-            /**
-                * Modified ISO 8601 format string in UTC without time zone info
-                */
-            toUtcString(): string;
-    }
-}
-
-declare module '__timezonecomplete/duration' {
-    import basics = require("__timezonecomplete/basics");
-    import TimeUnit = basics.TimeUnit;
-    /**
-        * Construct a time duration
-        * @param n	Number of years (may be fractional or negative)
-        * @return A duration of n years
-        */
-    export function years(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of months (may be fractional or negative)
-        * @return A duration of n months
-        */
-    export function months(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of days (may be fractional or negative)
-        * @return A duration of n days
-        */
-    export function days(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of hours (may be fractional or negative)
-        * @return A duration of n hours
-        */
-    export function hours(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of minutes (may be fractional or negative)
-        * @return A duration of n minutes
-        */
-    export function minutes(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of seconds (may be fractional or negative)
-        * @return A duration of n seconds
-        */
-    export function seconds(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of milliseconds (may be fractional or negative)
-        * @return A duration of n milliseconds
-        */
-    export function milliseconds(n: number): Duration;
-    /**
-        * Time duration which is represented as an amount and a unit e.g.
-        * '1 Month' or '166 Seconds'. The unit is preserved through calculations.
-        *
-        * It has two sets of getter functions:
-        * - second(), minute(), hour() etc, singular form: these can be used to create string representations.
-        *   These return a part of your string representation. E.g. for 2500 milliseconds, the millisecond() part would be 500
-        * - seconds(), minutes(), hours() etc, plural form: these return the total amount represented in the corresponding unit.
-        */
-    export class Duration {
-            /**
-                * Construct a time duration
-                * @param n	Number of years (may be fractional or negative)
-                * @return A duration of n years
-                */
-            static years(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of months (may be fractional or negative)
-                * @return A duration of n months
-                */
-            static months(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of days (may be fractional or negative)
-                * @return A duration of n days
-                */
-            static days(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of hours (may be fractional or negative)
-                * @return A duration of n hours
-                */
-            static hours(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of minutes (may be fractional or negative)
-                * @return A duration of n minutes
-                */
-            static minutes(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of seconds (may be fractional or negative)
-                * @return A duration of n seconds
-                */
-            static seconds(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of milliseconds (may be fractional or negative)
-                * @return A duration of n milliseconds
-                */
-            static milliseconds(n: number): Duration;
-            /**
-                * Construct a time duration of 0
-                */
-            constructor();
-            /**
-                * Construct a time duration from a string in one of two formats:
-                * 1) [-]hhhh[:mm[:ss[.nnn]]] e.g. '-01:00:30.501'
-                * 2) amount and unit e.g. '-1 days' or '1 year'. The unit may be in singular or plural form and is case-insensitive
-                */
-            constructor(input: string);
-            /**
-                * Construct a duration from an amount and a time unit.
-                * @param amount	Number of units
-                * @param unit	A time unit i.e. TimeUnit.Second, TimeUnit.Hour etc. Default Millisecond.
-                */
-            constructor(amount: number, unit?: TimeUnit);
-            /**
-                * @return another instance of Duration with the same value.
-                */
-            clone(): Duration;
-            /**
-                * Returns this duration expressed in different unit (positive or negative, fractional).
-                * This is precise for Year <-> Month and for time-to-time conversion (i.e. Hour-or-less to Hour-or-less).
-                * It is approximate for any other conversion
-                */
-            as(unit: TimeUnit): number;
-            /**
-                * Convert this duration to a Duration in another unit. You always get a clone even if you specify
-                * the same unit.
-                * This is precise for Year <-> Month and for time-to-time conversion (i.e. Hour-or-less to Hour-or-less).
-                * It is approximate for any other conversion
-                */
-            convert(unit: TimeUnit): Duration;
-            /**
-                * The entire duration in milliseconds (negative or positive)
-                * For Day/Month/Year durations, this is approximate!
-                */
-            milliseconds(): number;
-            /**
-                * The millisecond part of the duration (always positive)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 400 for a -01:02:03.400 duration
-                */
-            millisecond(): number;
-            /**
-                * The entire duration in seconds (negative or positive, fractional)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 1.5 for a 1500 milliseconds duration
-                */
-            seconds(): number;
-            /**
-                * The second part of the duration (always positive)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 3 for a -01:02:03.400 duration
-                */
-            second(): number;
-            /**
-                * The entire duration in minutes (negative or positive, fractional)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 1.5 for a 90000 milliseconds duration
-                */
-            minutes(): number;
-            /**
-                * The minute part of the duration (always positive)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 2 for a -01:02:03.400 duration
-                */
-            minute(): number;
-            /**
-                * The entire duration in hours (negative or positive, fractional)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 1.5 for a 5400000 milliseconds duration
-                */
-            hours(): number;
-            /**
-                * The hour part of a duration. This assumes that a day has 24 hours (which is not the case
-                * during DST changes).
-                */
-            hour(): number;
-            /**
-                * DEPRECATED
-                * The hour part of the duration (always positive).
-                * Note that this part can exceed 23 hours, because for
-                * now, we do not have a days() function
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 25 for a -25:02:03.400 duration
-                */
-            wholeHours(): number;
-            /**
-                * The entire duration in days (negative or positive, fractional)
-                * This is approximate if this duration is not in days!
-                */
-            days(): number;
-            /**
-                * The day part of a duration. This assumes that a month has 30 days.
-                */
-            day(): number;
-            /**
-                * The entire duration in days (negative or positive, fractional)
-                * This is approximate if this duration is not in Months or Years!
-                */
-            months(): number;
-            /**
-                * The month part of a duration.
-                */
-            month(): number;
-            /**
-                * The entire duration in years (negative or positive, fractional)
-                * This is approximate if this duration is not in Months or Years!
-                */
-            years(): number;
-            /**
-                * Non-fractional positive years
-                */
-            wholeYears(): number;
-            /**
-                * Amount of units (positive or negative, fractional)
-                */
-            amount(): number;
-            /**
-                * The unit this duration was created with
-                */
-            unit(): TimeUnit;
-            /**
-                * Sign
-                * @return "-" if the duration is negative
-                */
-            sign(): string;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff (this < other)
-                */
-            lessThan(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff (this <= other)
-                */
-            lessEqual(other: Duration): boolean;
-            /**
-                * Similar but not identical
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff this and other represent the same time duration
-                */
-            equals(other: Duration): boolean;
-            /**
-                * Similar but not identical
-                * Returns false if we cannot determine whether they are equal in all time zones
-                * so e.g. 60 minutes equals 1 hour, but 24 hours do NOT equal 1 day
-                *
-                * @return True iff this and other represent the same time duration
-                */
-            equalsExact(other: Duration): boolean;
-            /**
-                * Same unit and same amount
-                */
-            identical(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff this > other
-                */
-            greaterThan(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff this >= other
-                */
-            greaterEqual(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return The minimum (most negative) of this and other
-                */
-            min(other: Duration): Duration;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return The maximum (most positive) of this and other
-                */
-            max(other: Duration): Duration;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * Multiply with a fixed number.
-                * @return a new Duration of (this * value)
-                */
-            multiply(value: number): Duration;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * Divide by a fixed number.
-                * @return a new Duration of (this / value)
-                */
-            divide(value: number): Duration;
-            /**
-                * Add a duration.
-                * @return a new Duration of (this + value) with the unit of this duration
-                */
-            add(value: Duration): Duration;
-            /**
-                * Subtract a duration.
-                * @return a new Duration of (this - value) with the unit of this duration
-                */
-            sub(value: Duration): Duration;
-            /**
-                * Return the absolute value of the duration i.e. remove the sign.
-                */
-            abs(): Duration;
-            /**
-                * DEPRECATED
-                * String in [-]hhhh:mm:ss.nnn notation. All fields are
-                * always present except the sign.
-                */
-            toFullString(): string;
-            /**
-                * String in [-]hhhh:mm[:ss[.nnn]] notation.
-                * @param full If true, then all fields are always present except the sign. Otherwise, seconds and milliseconds
-                *             are chopped off if zero
-                */
-            toHmsString(full?: boolean): string;
-            /**
-                * String in ISO 8601 notation e.g. 'P1M' for one month or 'PT1M' for one minute
-                */
-            toIsoString(): string;
-            /**
-                * String representation with amount and unit e.g. '1.5 years' or '-1 day'
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-            /**
-                * The valueOf() method returns the primitive value of the specified object.
-                */
-            valueOf(): any;
-    }
-}
-
-declare module '__timezonecomplete/javascript' {
-    /**
-        * Indicates how a Date object should be interpreted.
-        * Either we can take getYear(), getMonth() etc for our field
-        * values, or we can take getUTCYear(), getUtcMonth() etc to do that.
-        */
-    export enum DateFunctions {
-            /**
-                * Use the Date.getFullYear(), Date.getMonth(), ... functions.
-                */
-            Get = 0,
-            /**
-                * Use the Date.getUTCFullYear(), Date.getUTCMonth(), ... functions.
-                */
-            GetUTC = 1,
-    }
-}
-
-declare module '__timezonecomplete/period' {
-    import basics = require("__timezonecomplete/basics");
-    import TimeUnit = basics.TimeUnit;
-    import duration = require("__timezonecomplete/duration");
-    import Duration = duration.Duration;
-    import datetime = require("__timezonecomplete/datetime");
-    import DateTime = datetime.DateTime;
-    /**
-        * Specifies how the period should repeat across the day
-        * during DST changes.
-        */
-    export enum PeriodDst {
-            /**
-                * Keep repeating in similar intervals measured in UTC,
-                * unaffected by Daylight Saving Time.
-                * E.g. a repetition of one hour will take one real hour
-                * every time, even in a time zone with DST.
-                * Leap seconds, leap days and month length
-                * differences will still make the intervals different.
-                */
-            RegularIntervals = 0,
-            /**
-                * Ensure that the time at which the intervals occur stay
-                * at the same place in the day, local time. So e.g.
-                * a period of one day, starting at 8:05AM Europe/Amsterdam time
-                * will always start at 8:05 Europe/Amsterdam. This means that
-                * in UTC time, some intervals will be 25 hours and some
-                * 23 hours during DST changes.
-                * Another example: an hourly interval will be hourly in local time,
-                * skipping an hour in UTC for a DST backward change.
-                */
-            RegularLocalTime = 1,
-            /**
-                * End-of-enum marker
-                */
-            MAX = 2,
-    }
-    /**
-        * Convert a PeriodDst to a string: "regular intervals" or "regular local time"
-        */
-    export function periodDstToString(p: PeriodDst): string;
-    /**
-        * Repeating time period: consists of a starting point and
-        * a time length. This class accounts for leap seconds and leap days.
-        */
-    export class Period {
-            /**
-                * Constructor
-                * LIMITATION: if dst equals RegularLocalTime, and unit is Second, Minute or Hour,
-                * then the amount must be a factor of 24. So 120 seconds is allowed while 121 seconds is not.
-                * This is due to the enormous processing power required by these cases. They are not
-                * implemented and you will get an assert.
-                *
-                * @param start The start of the period. If the period is in Months or Years, and
-                *				the day is 29 or 30 or 31, the results are maximised to end-of-month.
-                * @param interval	The interval of the period
-                * @param dst	Specifies how to handle Daylight Saving Time. Not relevant
-                *              if the time zone of the start datetime does not have DST.
-                *              Defaults to RegularLocalTime.
-                */
-            constructor(start: DateTime, interval: Duration, dst?: PeriodDst);
-            /**
-                * Constructor
-                * LIMITATION: if dst equals RegularLocalTime, and unit is Second, Minute or Hour,
-                * then the amount must be a factor of 24. So 120 seconds is allowed while 121 seconds is not.
-                * This is due to the enormous processing power required by these cases. They are not
-                * implemented and you will get an assert.
-                *
-                * @param start The start of the period. If the period is in Months or Years, and
-                *				the day is 29 or 30 or 31, the results are maximised to end-of-month.
-                * @param amount	The amount of units.
-                * @param unit	The unit.
-                * @param dst	Specifies how to handle Daylight Saving Time. Not relevant
-                *              if the time zone of the start datetime does not have DST.
-                *              Defaults to RegularLocalTime.
-                */
-            constructor(start: DateTime, amount: number, unit: TimeUnit, dst?: PeriodDst);
-            /**
-                * The start date
-                */
-            start(): DateTime;
-            /**
-                * The interval
-                */
-            interval(): Duration;
-            /**
-                * DEPRECATED
-                * The amount of units of the interval
-                */
-            amount(): number;
-            /**
-                * DEPRECATED
-                * The unit of the interval
-                */
-            unit(): TimeUnit;
-            /**
-                * The dst handling mode
-                */
-            dst(): PeriodDst;
-            /**
-                * The first occurrence of the period greater than
-                * the given date. The given date need not be at a period boundary.
-                * Pre: the fromdate and startdate must either both have timezones or not
-                * @param fromDate: the date after which to return the next date
-                * @return the first date matching the period after fromDate, given
-                *			in the same zone as the fromDate.
-                */
-            findFirst(fromDate: DateTime): DateTime;
-            /**
-                * Returns the next timestamp in the period. The given timestamp must
-                * be at a period boundary, otherwise the answer is incorrect.
-                * This function has MUCH better performance than findFirst.
-                * Returns the datetime "count" times away from the given datetime.
-                * @param prev	Boundary date. Must have a time zone (any time zone) iff the period start date has one.
-                * @param count	Optional, must be >= 1 and whole.
-                * @return (prev + count * period), in the same timezone as prev.
-                */
-            findNext(prev: DateTime, count?: number): DateTime;
-            /**
-                * Checks whether the given date is on a period boundary
-                * (expensive!)
-                */
-            isBoundary(occurrence: DateTime): boolean;
-            /**
-                * Returns true iff this period has the same effect as the given one.
-                * i.e. a period of 24 hours is equal to one of 1 day if they have the same UTC start moment
-                * and same dst.
-                */
-            equals(other: Period): boolean;
-            /**
-                * Returns true iff this period was constructed with identical arguments to the other one.
-                */
-            identical(other: Period): boolean;
-            /**
-                * Returns an ISO duration string e.g.
-                * 2014-01-01T12:00:00.000+01:00/P1H
-                * 2014-01-01T12:00:00.000+01:00/PT1M   (one minute)
-                * 2014-01-01T12:00:00.000+01:00/P1M   (one month)
-                */
-            toIsoString(): string;
-            /**
-                * A string representation e.g.
-                * "10 years, starting at 2014-03-01T12:00:00 Europe/Amsterdam, keeping regular intervals".
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-    }
-}
-
-declare module '__timezonecomplete/timesource' {
-    /**
-        * For testing purposes, we often need to manipulate what the current
-        * time is. This is an interface for a custom time source object
-        * so in tests you can use a custom time source.
-        */
-    export interface TimeSource {
-            /**
-                * Return the current date+time as a javascript Date object
-                */
-            now(): Date;
-    }
-    /**
-        * Default time source, returns actual time
-        */
-    export class RealTimeSource implements TimeSource {
-            now(): Date;
-    }
-}
-
-declare module '__timezonecomplete/timezone' {
-    import javascript = require("__timezonecomplete/javascript");
-    import DateFunctions = javascript.DateFunctions;
-    /**
-        * The local time zone for a given date as per OS settings. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        */
-    export function local(): TimeZone;
-    /**
-        * Coordinated Universal Time zone. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        */
-    export function utc(): TimeZone;
-    /**
-        * @param offset offset w.r.t. UTC in minutes, e.g. 90 for +01:30. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        * @returns a time zone with the given fixed offset
-        */
-    export function zone(offset: number): TimeZone;
-    /**
-        * Time zone for an offset string or an IANA time zone string. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        * @param s Empty string for no time zone (null is returned),
-        *          "localtime" for local time,
-        *          a TZ database time zone name (e.g. Europe/Amsterdam),
-        *          or an offset string (either +01:30, +0130, +01, Z). For a full list of names, see:
-        *          https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-        * @param dst	Optional, default true: adhere to Daylight Saving Time if applicable. Note for
-        *              "localtime", timezonecomplete will adhere to the computer settings, the DST flag
-        *              does not have any effect.
-        */
-    export function zone(name: string, dst?: boolean): TimeZone;
-    /**
-        * The type of time zone
-        */
-    export enum TimeZoneKind {
-            /**
-                * Local time offset as determined by JavaScript Date class.
-                */
-            Local = 0,
-            /**
-                * Fixed offset from UTC, without DST.
-                */
-            Offset = 1,
-            /**
-                * IANA timezone managed through Olsen TZ database. Includes
-                * DST if applicable.
-                */
-            Proper = 2,
-    }
-    /**
-        * Option for TimeZone#normalizeLocal()
-        */
-    export enum NormalizeOption {
-            /**
-                * Normalize non-existing times by ADDING the DST offset
-                */
-            Up = 0,
-            /**
-                * Normalize non-existing times by SUBTRACTING the DST offset
-                */
-            Down = 1,
-    }
-    /**
-        * Time zone. The object is immutable because it is cached:
-        * requesting a time zone twice yields the very same object.
-        * Note that we use time zone offsets inverted w.r.t. JavaScript Date.getTimezoneOffset(),
-        * i.e. offset 90 means +01:30.
-        *
-        * Time zones come in three flavors: the local time zone, as calculated by JavaScript Date,
-        * a fixed offset ("+01:30") without DST, or a IANA timezone ("Europe/Amsterdam") with DST
-        * applied depending on the time zone rules.
-        */
-    export class TimeZone {
-            /**
-                * The local time zone for a given date. Note that
-                * the time zone varies with the date: amsterdam time for
-                * 2014-01-01 is +01:00 and amsterdam time for 2014-07-01 is +02:00
-                */
-            static local(): TimeZone;
-            /**
-                * The UTC time zone.
-                */
-            static utc(): TimeZone;
-            /**
-                * Time zone with a fixed offset
-                * @param offset	offset w.r.t. UTC in minutes, e.g. 90 for +01:30
-                */
-            static zone(offset: number): TimeZone;
-            /**
-                * Time zone for an offset string or an IANA time zone string. Note that time zones are cached
-                * so you don't necessarily get a new object each time.
-                * @param s Empty string for no time zone (null is returned),
-                *          "localtime" for local time,
-                *          a TZ database time zone name (e.g. Europe/Amsterdam),
-                *          or an offset string (either +01:30, +0130, +01, Z). For a full list of names, see:
-                *          https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-                *          TZ database zone name may be suffixed with " without DST" to indicate no DST should be applied.
-                *          In that case, the dst parameter is ignored.
-                * @param dst	Optional, default true: adhere to Daylight Saving Time if applicable. Note for
-                *              "localtime", timezonecomplete will adhere to the computer settings, the DST flag
-                *              does not have any effect.
-                */
-            static zone(s: string, dst?: boolean): TimeZone;
-            /**
-                * Do not use this constructor, use the static
-                * TimeZone.zone() method instead.
-                * @param name NORMALIZED name, assumed to be correct
-                * @param dst	Adhere to Daylight Saving Time if applicable, ignored for local time and fixed offsets
-                */
-            constructor(name: string, dst?: boolean);
-            /**
-                * The time zone identifier. Can be an offset "-01:30" or an
-                * IANA time zone name "Europe/Amsterdam", or "localtime" for
-                * the local time zone.
-                */
-            name(): string;
-            dst(): boolean;
-            /**
-                * The kind of time zone (Local/Offset/Proper)
-                */
-            kind(): TimeZoneKind;
-            /**
-                * Equality operator. Maps zero offsets and different names for UTC onto
-                * each other. Other time zones are not mapped onto each other.
-                */
-            equals(other: TimeZone): boolean;
-            /**
-                * Returns true iff the constructor arguments were identical, so UTC !== GMT
-                */
-            identical(other: TimeZone): boolean;
-            /**
-                * Is this zone equivalent to UTC?
-                */
-            isUtc(): boolean;
-            /**
-                * Does this zone have Daylight Saving Time at all?
-                */
-            hasDst(): boolean;
-            /**
-                * Calculate timezone offset from a UTC time.
-                *
-                * @param year Full year
-                * @param month Month 1-12 (note this deviates from JavaScript date)
-                * @param day Day of month 1-31
-                * @param hour Hour 0-23
-                * @param minute Minute 0-59
-                * @param second Second 0-59
-                * @param millisecond Millisecond 0-999
-                *
-                * @return the offset of this time zone with respect to UTC at the given time, in minutes.
-                */
-            offsetForUtc(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number): number;
-            /**
-                * Calculate timezone offset from a zone-local time (NOT a UTC time).
-                * @param year local full year
-                * @param month local month 1-12 (note this deviates from JavaScript date)
-                * @param day local day of month 1-31
-                * @param hour local hour 0-23
-                * @param minute local minute 0-59
-                * @param second local second 0-59
-                * @param millisecond local millisecond 0-999
-                * @return the offset of this time zone with respect to UTC at the given time, in minutes.
-                */
-            offsetForZone(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number): number;
-            /**
-                * Note: will be removed in version 2.0.0
-                *
-                * Convenience function, takes values from a Javascript Date
-                * Calls offsetForUtc() with the contents of the date
-                *
-                * @param date: the date
-                * @param funcs: the set of functions to use: get() or getUTC()
-                */
-            offsetForUtcDate(date: Date, funcs: DateFunctions): number;
-            /**
-                * Note: will be removed in version 2.0.0
-                *
-                * Convenience function, takes values from a Javascript Date
-                * Calls offsetForUtc() with the contents of the date
-                *
-                * @param date: the date
-                * @param funcs: the set of functions to use: get() or getUTC()
-                */
-            offsetForZoneDate(date: Date, funcs: DateFunctions): number;
-            /**
-                * Zone abbreviation at given UTC timestamp e.g. CEST for Central European Summer Time.
-                *
-                * @param year Full year
-                * @param month Month 1-12 (note this deviates from JavaScript date)
-                * @param day Day of month 1-31
-                * @param hour Hour 0-23
-                * @param minute Minute 0-59
-                * @param second Second 0-59
-                * @param millisecond Millisecond 0-999
-                * @param dstDependent (default true) set to false for a DST-agnostic abbreviation
-                *
-                * @return "local" for local timezone, the offset for an offset zone, or the abbreviation for a proper zone.
-                */
-            abbreviationForUtc(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number, dstDependent?: boolean): string;
-            /**
-                * Normalizes non-existing local times by adding a forward offset change.
-                * During a forward standard offset change or DST offset change, some amount of
-                * local time is skipped. Therefore, this amount of local time does not exist.
-                * This function adds the amount of forward change to any non-existing time. After all,
-                * this is probably what the user meant.
-                *
-                * @param localUnixMillis	Unix timestamp in zone time
-                * @param opt	(optional) Round up or down? Default: up
-                *
-                * @returns	Unix timestamp in zone time, normalized.
-                */
-            normalizeZoneTime(localUnixMillis: number, opt?: NormalizeOption): number;
-            /**
-                * The time zone identifier (normalized).
-                * Either "localtime", IANA name, or "+hh:mm" offset.
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-            /**
-                * Convert an offset number into an offset string
-                * @param offset The offset in minutes from UTC e.g. 90 minutes
-                * @return the offset in ISO notation "+01:30" for +90 minutes
-                */
-            static offsetToString(offset: number): string;
-            /**
-                * String to offset conversion.
-                * @param s	Formats: "-01:00", "-0100", "-01", "Z"
-                * @return offset w.r.t. UTC in minutes
-                */
-            static stringToOffset(s: string): number;
-    }
-}
-
-declare module '__timezonecomplete/globals' {
-    import datetime = require("__timezonecomplete/datetime");
-    import DateTime = datetime.DateTime;
-    import duration = require("__timezonecomplete/duration");
-    import Duration = duration.Duration;
-    /**
-        * Returns the minimum of two DateTimes
-        */
-    export function min(d1: DateTime, d2: DateTime): DateTime;
-    /**
-        * Returns the minimum of two Durations
-        */
-    export function min(d1: Duration, d2: Duration): Duration;
-    /**
-        * Returns the maximum of two DateTimes
-        */
-    export function max(d1: DateTime, d2: DateTime): DateTime;
-    /**
-        * Returns the maximum of two Durations
-        */
-    export function max(d1: Duration, d2: Duration): Duration;
-    /**
-        * Returns the absolute value of a Duration
-        */
-    export function abs(d: Duration): Duration;
-}
diff --git a/types/timezonecomplete/timezonecomplete-tests.ts b/types/timezonecomplete/timezonecomplete-tests.ts
deleted file mode 100644
index 8c6d14cad7..0000000000
--- a/types/timezonecomplete/timezonecomplete-tests.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-import tc = require("timezonecomplete");
-
-var b: boolean;
-var n: number;
-var s: string;
-var w: tc.WeekDay;
-
-n = tc.timeUnitToMilliseconds(tc.TimeUnit.Month);
-b = tc.isLeapYear(2014);
-n = tc.daysInMonth(2014, 10);
-n = tc.daysInYear(2014);
-n = tc.dayOfYear(2014, 1, 2);
-w = tc.firstWeekDayOfMonth(2014, 1, tc.WeekDay.Sunday);
-w = tc.lastWeekDayOfMonth(2014, 1, tc.WeekDay.Sunday);
-n = tc.weekDayOnOrAfter(2014, 1, 14, tc.WeekDay.Monday);
-n = tc.weekDayOnOrBefore(2014, 1, 14, tc.WeekDay.Monday);
-n = tc.secondOfDay(13, 59, 59);
-n = tc.weekOfMonth(2014, 1, 1);
-
-s = tc.timeUnitToString(tc.TimeUnit.Second);
-var tu: tc.TimeUnit = tc.stringToTimeUnit("bla");
-
-// DURATION
-
-var d: tc.Duration;
-var d1: tc.Duration = tc.Duration.hours(24);
-var d2: tc.Duration = tc.Duration.minutes(24);
-var d3: tc.Duration = tc.Duration.seconds(24);
-var d4: tc.Duration = tc.Duration.milliseconds(24);
-var d5: tc.Duration = tc.hours(24);
-var d6: tc.Duration = tc.minutes(24);
-var d7: tc.Duration = tc.seconds(24);
-var d8: tc.Duration = tc.milliseconds(24);
-var d9: tc.Duration = new tc.Duration(24);
-var d10: tc.Duration = new tc.Duration("00:01");
-var d11: tc.Duration = d6.clone();
-var d12: tc.Duration = new tc.Duration(4, tc.TimeUnit.Second);
-
-n = d7.wholeHours();
-n = d7.hours();
-n = d7.minutes();
-n = d7.minute();
-n = d7.seconds();
-n = d7.second();
-n = d7.milliseconds();
-n = d7.millisecond();
-s = d7.sign();
-b = d7.lessThan(d6);
-b = d7.greaterThan(d6);
-d = d7.min(d6);
-d = d7.max(d6);
-d = d7.multiply(3);
-d = d7.divide(0.3);
-d = d7.add(d6);
-d = d7.sub(d6);
-s = d7.toString();
-
-b = d7.equals(d6);
-b = d7.equalsExact(d6);
-b = d7.identical(d6);
-
-// TIMEZONE
-
-var t: tc.TimeZone;
-var k: tc.TimeZoneKind;
-
-t = tc.TimeZone.local();
-t = tc.TimeZone.utc();
-t = tc.TimeZone.zone(2);
-t = tc.TimeZone.zone("+01:00");
-t = tc.local();
-t = tc.utc();
-t = tc.zone(2);
-t = tc.zone("+01:00");
-t = tc.zone("Europe/Amsterdam", false);
-s = t.name();
-k = t.kind();
-b = t.equals(t);
-b = t.isUtc();
-b = t.dst();
-n = t.offsetForUtc(2014, 1, 1, 13, 0, 5, 123);
-n = t.offsetForZone(2014, 1, 1, 13, 0, 5, 123);
-n = t.offsetForUtcDate(new Date(2014, 1, 1, 13, 0, 5, 123), tc.DateFunctions.Get);
-n = t.offsetForZoneDate(new Date(2014, 1, 1, 13, 0, 5, 123), tc.DateFunctions.GetUTC);
-s = t.toString();
-s = tc.TimeZone.offsetToString(2);
-n = tc.TimeZone.stringToOffset("+00:01");
-b = t.equals(t);
-b = t.identical(t);
-
-// REALTIMESOURCE
-
-var date: Date = (new tc.RealTimeSource()).now();
-
-// DATETIME
-
-var dt: tc.DateTime;
-
-var ts: tc.TimeSource = tc.DateTime.timeSource;
-
-dt = tc.DateTime.nowLocal();
-dt = tc.DateTime.nowUtc();
-dt = tc.DateTime.now(tc.TimeZone.local());
-dt = tc.DateTime.fromExcel(1.5);
-dt = tc.nowLocal();
-dt = tc.nowUtc();
-dt = tc.now(tc.TimeZone.local());
-dt = new tc.DateTime();
-dt = new tc.DateTime("2014-01-01T13:05:01.123 UTC");
-dt = new tc.DateTime("2014-01-01T13:05:01.123", tc.TimeZone.utc());
-dt = new tc.DateTime(date, tc.DateFunctions.Get);
-dt = new tc.DateTime(date, tc.DateFunctions.Get, tc.TimeZone.utc());
-dt = new tc.DateTime(2014, 1, 1, 13, 5, 1, 123);
-dt = new tc.DateTime(2014, 1, 1, 13, 5, 1, 123, tc.TimeZone.utc());
-dt = new tc.DateTime(89949284);
-dt = new tc.DateTime(89949284, tc.TimeZone.utc());
-dt = dt.clone();
-t = dt.zone();
-n = dt.offset();
-n = dt.year();
-n = dt.month();
-n = dt.day();
-n = dt.hour();
-n = dt.minute();
-n = dt.second();
-n = dt.weekNumber();
-n = dt.weekOfMonth();
-n = dt.secondOfDay();
-n = dt.dayOfYear();
-n = dt.millisecond();
-n = dt.unixUtcMillis();
-n = dt.utcYear();
-n = dt.utcMonth();
-n = dt.utcDay();
-n = dt.utcHour();
-n = dt.utcMinute();
-n = dt.utcSecond();
-n = dt.utcMillisecond();
-n = dt.utcWeekNumber();
-n = dt.utcWeekOfMonth();
-n = dt.utcSecondOfDay();
-n = dt.utcDayOfYear();
-s = dt.format("%Y-%m-%d");
-dt.convert(tc.TimeZone.local());
-dt = dt.toZone(tc.TimeZone.utc());
-date = dt.toDate();
-dt = dt.add(tc.Duration.seconds(2));
-dt = dt.add(2, tc.TimeUnit.Year);
-dt = dt.add(2, tc.TimeUnit.Month);
-dt = dt.add(2, tc.TimeUnit.Week);
-dt = dt.add(2, tc.TimeUnit.Day);
-dt = dt.add(2, tc.TimeUnit.Hour);
-dt = dt.add(2, tc.TimeUnit.Minute);
-dt = dt.add(2, tc.TimeUnit.Second);
-dt = dt.addLocal(2, tc.TimeUnit.Second);
-dt = dt.addLocal(tc.minutes(2));
-dt = dt.sub(tc.Duration.seconds(2));
-dt = dt.sub(2, tc.TimeUnit.Year);
-dt = dt.sub(2, tc.TimeUnit.Month);
-dt = dt.sub(2, tc.TimeUnit.Week);
-dt = dt.sub(2, tc.TimeUnit.Day);
-dt = dt.sub(2, tc.TimeUnit.Hour);
-dt = dt.sub(2, tc.TimeUnit.Minute);
-dt = dt.sub(2, tc.TimeUnit.Second);
-dt = dt.subLocal(2, tc.TimeUnit.Second);
-dt = dt.subLocal(tc.minutes(2));
-d = dt.diff(new tc.DateTime(9289234, tc.TimeZone.local()));
-b = dt.lessThan(new tc.DateTime(9289234, tc.TimeZone.local()));
-b = dt.lessEqual(new tc.DateTime(9289234, tc.TimeZone.local()));
-b = dt.greaterThan(new tc.DateTime(9289234, tc.TimeZone.local()));
-b = dt.greaterEqual(new tc.DateTime(9289234, tc.TimeZone.local()));
-dt = dt.min(new tc.DateTime(9289234, tc.TimeZone.local()));
-dt = dt.max(new tc.DateTime(9289234, tc.TimeZone.local()));
-s = dt.toIsoString();
-s = dt.toString();
-s = dt.toUtcString();
-dt = dt.startOfDay();
-
-var wd: tc.WeekDay;
-wd = dt.weekDay();
-wd = dt.utcWeekDay();
-
-// PERIOD
-
-s = tc.periodDstToString(tc.PeriodDst.RegularIntervals);
-s = tc.periodDstToString(tc.PeriodDst.RegularLocalTime);
-
-var p: tc.Period;
-
-p = new tc.Period(tc.DateTime.nowLocal(), 1, tc.TimeUnit.Hour, tc.PeriodDst.RegularLocalTime);
-p = new tc.Period(tc.DateTime.nowLocal(), tc.hours(1), tc.PeriodDst.RegularLocalTime);
-dt = p.start();
-n = p.amount();
-var tu: tc.TimeUnit = p.unit();
-var pd: tc.PeriodDst = p.dst();
-dt = p.findFirst(tc.DateTime.nowLocal());
-dt = p.findNext(dt);
-s = p.toIsoString();
-s = p.toString();
-b = p.isBoundary(dt);
-b = p.equals(p);
-b = p.identical(p);
-
-
-// GLOBALS
-d = tc.min(tc.Duration.seconds(2), tc.Duration.seconds(3));
-d = tc.max(tc.Duration.seconds(2), tc.Duration.seconds(3));
-
-dt = tc.min(new tc.DateTime(2), new tc.DateTime(3));
-dt = tc.max(new tc.DateTime(2), new tc.DateTime(3));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/types/timezonecomplete/tsconfig.json b/types/timezonecomplete/tsconfig.json
deleted file mode 100644
index 57312fb0fe..0000000000
--- a/types/timezonecomplete/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "timezonecomplete-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/tinder/tslint.json b/types/tinder/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tinder/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tinycolor2/tslint.json b/types/tinycolor2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tinycolor2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tinycopy/tslint.json b/types/tinycopy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tinycopy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index 65c33f4adb..3719b35784 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -826,7 +826,7 @@ export namespace dom {
 
     parseStyle(cssText: string): {};
 
-    remove<T>(node: string, keepChildren?: boolean): Element | T[];
+    remove<T>(node: string | Element, keepChildren?: boolean): Element | T[];
 
     removeAllAttribs(e: Element): void;
 
diff --git a/types/tinymce/tslint.json b/types/tinymce/tslint.json
index a42975357d..4df63472dd 100644
--- a/types/tinymce/tslint.json
+++ b/types/tinymce/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "no-empty-interface": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/titanium/tslint.json b/types/titanium/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/titanium/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/title/tslint.json b/types/title/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/title/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tldjs/tslint.json b/types/tldjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tldjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/to-absolute-glob/index.d.ts b/types/to-absolute-glob/index.d.ts
new file mode 100644
index 0000000000..1042bbace7
--- /dev/null
+++ b/types/to-absolute-glob/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for to-absolute-glob 2.0
+// Project: https://github.com/jonschlinkert/to-absolute-glob
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function toAbsoluteGlob(pattern: string, options?: toAbsoluteGlob.Options): string;
+declare namespace toAbsoluteGlob {
+    interface Options {
+        cwd?: string;
+        root?: string;
+    }
+}
+export = toAbsoluteGlob;
diff --git a/types/to-absolute-glob/to-absolute-glob-tests.ts b/types/to-absolute-glob/to-absolute-glob-tests.ts
new file mode 100644
index 0000000000..51c9afde48
--- /dev/null
+++ b/types/to-absolute-glob/to-absolute-glob-tests.ts
@@ -0,0 +1,6 @@
+import toAbsoluteGlob = require('to-absolute-glob');
+
+let result: string = toAbsoluteGlob('foo.*');
+result = toAbsoluteGlob('/foo.*', {root: '/bar'});
+result = toAbsoluteGlob('foo.*', {cwd: '/bar'});
+result = toAbsoluteGlob('foo.*', {cwd: '/bar', root: '/bar'});
diff --git a/types/to-absolute-glob/tsconfig.json b/types/to-absolute-glob/tsconfig.json
new file mode 100644
index 0000000000..a143fec271
--- /dev/null
+++ b/types/to-absolute-glob/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "to-absolute-glob-tests.ts"
+    ]
+}
diff --git a/types/to-absolute-glob/tslint.json b/types/to-absolute-glob/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/to-absolute-glob/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/to-title-case-gouch/tslint.json b/types/to-title-case-gouch/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/to-title-case-gouch/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/toastr/tslint.json b/types/toastr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/toastr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tocktimer/index.d.ts b/types/tocktimer/index.d.ts
index 20bd344c83..a48929f169 100644
--- a/types/tocktimer/index.d.ts
+++ b/types/tocktimer/index.d.ts
@@ -31,13 +31,12 @@ declare namespace t {
     class Tock {
         /**
          * Create a Tock instance
-         * @param opts
          */
         constructor(opts?: TockOptions)
 
         /**
          * Start the timer
-         * @param [time] {Number} Optional. Can be either a countdown value or a starting value.
+         * @param time Can be either a countdown value or a starting value.
          * If a countdown timer then set time to count down from.
          * If a starting value then set time to the desired start time to count up from.
          */
@@ -65,14 +64,11 @@ declare namespace t {
 
         /**
          * Convert number of milliseconds to a MM:SS time string. Won't handle times greater than 1 hour
-         * @param ms
          */
         msToTime: (ms: number) => string;
 
         /**
          * Convert number of milliseconds to timecode string
-         * @param ms
-         * @param showMs
          */
         msToTimecode: (ms: number, showMs?: boolean) => string;
 
@@ -80,7 +76,6 @@ declare namespace t {
          * Convert a time string to a number of milliseconds. Should be a duration as a string of form MM:SS, MM:SS:ms, MM:SS.ms, HH:MM:SS
          * Alternatively a time in the future can be provided using the form yyyy-mm-dd HH:MM:SS.ms. The difference between this time and present will be returned.
          * If the input cannot be recognized as one of the above then 0 is returned
-         * @param ms
          */
         timeToMS: (time: string) => number;
     }
diff --git a/types/tooltipster/index.d.ts b/types/tooltipster/index.d.ts
index 008bd556af..be35207e9f 100644
--- a/types/tooltipster/index.d.ts
+++ b/types/tooltipster/index.d.ts
@@ -1,12 +1,16 @@
 // Type definitions for tooltipster
 // Project: https://github.com/iamceege/tooltipster
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+//                 Patrick Magee <https://github.com/pjmagee>,
+//                 Dmitry Pesterev <https://github.com/VorobeY1326>,
+//                 Leonard Thieu <https://github.com/leonard-thieu>,
+//                 Jan Hirzel <https://github.com/janhi>,
+//                 Joe Skeen <https://github.com/joeskeen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
-
 declare namespace JQueryTooltipster {
 	/**
 	* Tooltipster options @see http://iamceege.github.io/tooltipster/
@@ -14,198 +18,228 @@ declare namespace JQueryTooltipster {
 	export interface ITooltipsterOptions {
 
 		/**
-		 * Determines how the tooltip will animate in and out. Feel free to modify or create custom transitions in the tooltipster.css file.
-		 * In IE9 and 8, all animations default to a JavaScript generated, fade animation. Default: 'fade'
+		 * Determines how the tooltip will animate in and out. In addition to the built-in transitions, 
+		 * you may also create custom transitions in your CSS files. In IE9 and lower, all animations 
+		 * default to a JavaScript generated, fade animation. 
+		 * @default 'fade'
 		 */
-		animation?: string;
+		animation?: 'fade' | 'grow' | 'swing' | 'slide' | 'fall';
 
 		/**
-		 * Adds the "speech bubble arrow" to the tooltip. Default: true
+		 * Sets the duration of the animation, in milliseconds. If you wish to provide different durations 
+		 * for the opening and closing animations, provide an array of two different values. 
+		 * @default 350
+		 */
+		animationDuration?: number | number[];
+
+		/**
+		 * Add a "speech bubble" arrow to the tooltip. 
+		 * @default true
 		 */
 		arrow?: boolean;
 
 		/**
-		 * Select a specific color for the "speech bubble arrow". Default: will inherit the tooltip's background color
+		 * If set, this will override the content of the tooltip. If you provide something else than a string 
+		 * or jQuery-wrapped HTML element, you will need to use the 'functionFormat' option to format your 
+		 * content for display. 
+		 * @default null
 		 */
-		arrowColor?: string;
+		content?: string | JQuery | any;
 
 		/**
-		 * If autoClose is set to false, the tooltip will never close unless you call the 'hide' method yourself. Default: true
-		 */
-		autoClose?: boolean;
-
-		/**
-		 * If set, this will override the content of the tooltip. Default: null
-		 */
-		content?: string;
-
-		/**
-		 * If the content of the tooltip is provided as a string, it is displayed as plain text by default.
-		 * If this content should actually be interpreted as HTML, set this option to true. Default: false
+		 * If the content of the tooltip is provided as a string, it is displayed as plain text by default. 
+		 * If this content should actually be interpreted as HTML, set this option to true. 
+		 * @default false
 		 */
 		contentAsHTML?: boolean;
 
 		/**
-		 * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object that should actually be used. Default: true
+		 * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object 
+		 * that should actually be used. 
+		 * @default false
 		 */
 		contentCloning?: boolean;
 
 		/**
-		 * Tooltipster logs notices into the console when you're doing something you ideally shouldn't be doing. Set to false to disable logging. Default: true
+		 * Tooltipster logs hints and notices into the console when you're doing something you ideally shouldn't 
+		 * be doing. Set to false to disable logging. 
+		 * @default true
 		 */
 		debug?: boolean;
 
 		/**
-		 * Delay how long it takes (in milliseconds) for the tooltip to start animating in. Default: 200
+		 * Upon mouse interaction, this is the delay before the tooltip starts its opening and closing animations 
+		 * when the 'hover' trigger is used (*). If you wish to specify different delays for opening and closing, 
+		 * you may provide an array of two different values. 
+		 * @default 300
 		 */
-		delay?: number;
+		delay?: number | number[];
 
 		/**
-		 * Set a minimum width for the tooltip. Default: 0 (auto width)
+		 * Upon touch interaction, this is the delay before the tooltip starts its opening and closing animations 
+		 * when the 'hover' trigger is used (*). If you wish to specify different delays for opening and closing, 
+		 * you may provide an array of two different values. 
+		 * @default [300, 500]
 		 */
-		minWidth?: number;
+		delayTouch?: number | number[];
 
 		/**
-		 * Set a maximum width for the tooltip. Default: null (no max width)
+		 * The distance between the origin and the tooltip, in pixels. The value may be an integer or an array of 
+		 * integers (in the usual CSS syntax) if you wish to specify a different distance for each side. 
+		 * @default 6
 		 */
-		maxWidth?: number;
+		distance?: number | number[];
 
 		/**
-		 * Create a custom function to be fired only once at instantiation. If the function returns a value, this value will become the content of the tooltip.
-		 * @param origin
-		 * @param content
+		 * A custom function to be fired only once at instantiation. 
+		 * @default null
 		 */
-		functionInit?: (origin: JQuery, content: string) => void;
+		functionInit?: TooltipsterStandardCallbackFunction;
 
 		/**
-		 * Create a custom function to be fired before the tooltip opens. This function may prevent or hold off the opening.
-		 * @param origin
-		 * @param continueTooltip
+		 * A custom function to be fired before the tooltip is opened. This function may prevent the opening if it 
+		 * returns false. 
+		 * @default null
 		 */
-		functionBefore?: (origin: JQuery, continueTooltip: () => void) => void;
+		functionBefore?: TooltipsterStandardCallbackFunction;
 
 		/**
-		 * Create a custom function to be fired when the tooltip and its contents have been added to the DOM.
-		 * @param origin
-		 * @param tooltip
+		 * A custom function to be fired when the tooltip and its contents have been added to the DOM. 
+		 * @default null
 		 */
-		functionReady?: (origin: JQuery, tooltip: JQuery) => void;
+		functionReady?: TooltipsterStandardCallbackFunction;
 
 		/**
-		 * Create a custom function to be fired once the tooltip has been closed and removed from the DOM.
-		 * @param origin
+		 * A custom function to be fired once the tooltip has been closed and removed from the DOM. 
+		 * @default null
 		 */
-		functionAfter?: (origin: JQuery) => void;
+		functionAfter?: TooltipsterStandardCallbackFunction;
 
 		/**
-		 * If true, the tooltip will close if its origin is clicked. This option only applies when 'trigger' is 'hover' and 'autoClose' is false. Default: false
+		 * A custom function that does not modify the content but that can format it for display. It gets the two 
+		 * first usual arguments and also the content as third argument. It must return the value that will be 
+		 * displayed in the tooltip, either a string or a jQuery-wrapped HTML element (see the formatting section). 
+		 * @default null
 		 */
-		hideOnClick?: boolean;
+		functionFormat?: (instance: ITooltipsterInstance, helper: ITooltipsterHelper, content: any) => string | JQuery;
 
 		/**
-		 * If using the iconDesktop or iconTouch options, this sets the content for your icon. Default: '(?)'
+		 * A custom function fired when the tooltip is repositioned. It gives you the ability to slightly or 
+		 * completely modify the position that Tooltipster is about to give to the tooltip. It gets the proposed 
+		 * set of placement values as third argument. The function must return the set of placement values, which 
+		 * you may have edited (see the positioning section). 
+		 * @default null
 		 */
-		icon?: string|JQuery;
+		functionPosition?: (instance: ITooltipsterInstance, helper: ITooltipsterHelper, position: ITooltipPosition) => ITooltipPosition;
 
 		/**
-		 * If you provide a jQuery object to the 'icon' option, this sets if it is a clone of this object that should actually be used. Default: true
+		 * The minimum version of Internet Explorer to run on. 
+		 * @default 6
 		 */
-		iconCloning?: boolean;
+		IEmin?: number;
 
 		/**
-		 * Generate an icon next to your content that is responsible for activating the tooltip on non-touch devices. Default: false
-		 */
-		iconDesktop?: boolean;
-
-		/**
-		 * If using the iconDesktop or iconTouch options, this sets the class on the icon (used to style the icon). Default: 'tooltipster-icon'
-		 */
-		iconTheme?: string;
-
-		/**
-		 * Generate an icon next to your content that is responsible for activating the tooltip on touch devices (tablets, phones, etc). Default: false
-		 */
-		iconTouch?: boolean;
-
-		/**
-		 * Give users the possibility to interact with the tooltip. Unless autoClose is set to false, the tooltip will still close if the user moves away from or clicks out of the tooltip.
-		 * Default: false
+		 * Give users the possibility to interact with the content of the tooltip. If you want them to be able to 
+		 * make clicks, fill forms or do other interactions inside the tooltip, you have to set this option to 
+		 * true. When the 'hover' close trigger is used, the user has to move the cursor to the tooltip before it 
+		 * starts closing (this lapse of time has its duration set by the 'delay' option). 
+		 * @default false
 		 */
 		interactive?: boolean;
 
 		/**
-		 * If the tooltip is interactive and activated by a hover event, set the amount of time (milliseconds) allowed for a user to hover off
-		 * of the tooltip activator (origin) on to the tooltip itself - keeping the tooltip from closing. Default: 350
+		 * Set a maximum width for the tooltip. 
+		 * @default null (no max width)
 		 */
-		interactiveTolerance?: number;
+		maxWidth?: number;
 
 		/**
-		 * Allows you to put multiple tooltips on a single element. Read further instructions down this page. Default: false
+		 * Corresponds to the minimum distance to enforce between the center of the arrow and the edges of the 
+		 * tooltip. Mainly used to create an arrow bigger than those of the default themes. 
+		 * @default 16
+		 */
+		minIntersection?: number;
+
+		/**
+		 * Set a minimum width for the tooltip. 
+		 * @default 0 (auto width)
+		 */
+		minWidth?: number;
+
+		/**
+		 * Allows you to put several tooltips on a single element (see the multiple section). 
+		 * @default false
 		 */
 		multiple?: boolean;
 
 		/**
-		 * Offsets the tooltip (in pixels) farther left/right from the origin. Default: 0
+		 * The names of plugins to be used by Tooltipster. 
+		 * @default ['sideTip']
 		 */
-		offsetX?: number;
+		plugins?: string[];
 
 		/**
-		 * Offsets the tooltip (in pixels) farther up/down from the origin. Default: 0
+		 * Several plugins may have options of the same name. To resolve the conflict, wrap the options of plugins 
+		 * under a property with their full name.
 		 */
-		offsetY?: number;
+		[pluginName: string]: any;
 
 		/**
-		 * If true, only one tooltip will be allowed to be active at a time. Non-autoclosing tooltips will not be closed though. Default: false
+		 * Repositions the tooltip if it goes out of the viewport when the user scrolls the page, in order to 
+		 * keep it visible as long as possible. 
+		 * @default false
 		 */
-		onlyOne?: boolean;
+		repositionOnScroll?: boolean;
 
 		/**
-		 * Set the position of the tooltip. Default: 'top'
-		 * Possible values: right, left, top, top-right, top-left, bottom, bottom-right, bottom-left
+		 * Specifies if a TITLE attribute should be restored on the HTML element after a call to the 'destroy' 
+		 * method. This attribute may be omitted, or be restored with the value that existed before Tooltipster 
+		 * was initialized, or be restored with the stringified value of the current content. Note: in case of 
+		 * multiple tooltips on a single element, only the last destroyed tooltip may trigger a restoration. 
+		 * 
+		 * @default 'none'
 		 */
-		position?: string;
+		restoration?: 'none' | 'previous' | 'current';
 
 		/**
-		 * Will reposition the tooltip if the origin moves. As this option may have an impact on performance, we suggest you enable it only if you need to. Default: false
+		 * Sets if the tooltip should self-destruct after a few seconds when its origin is removed from the DOM. 
+		 * This prevents memory leaks. 
+		 * @default true
 		 */
-		positionTracker?: boolean;
+		selfDestruction?: boolean;
 
 		/**
-		 * Called after the tooltip has been repositioned by the position tracker (if enabled).
-		 * Default: A function that will close the tooltip if the trigger is 'hover' and autoClose is false.
+		 * Sets the side of the tooltip. The value may one of the following: 'top', 'bottom', 'left', 'right'. 
+		 * It may also be an array containing one or more of these values. When using an array, the order of 
+		 * values is taken into account as order of fallbacks and the absence of a side disables it (see the 
+		 * sides section). Default: ['top', 'bottom', 'right', 'left']
 		 */
-		positionTrackerCallback?: Function;
+		side?: TooltipPositioningSide | TooltipPositioningSide[];
 
 		/**
-		 * Specify if a TITLE attribute should be restored on the HTML element after a call to the 'destroy' method.
-		 * This attribute may be omitted, or be restored with the value that existed before Tooltipster was initialized, or be restored with the stringified value of the current content.
-		 * Note: in case of multiple tooltips on a single element, only the last destroyed tooltip may trigger a restoration. Default: 'current'
-		 *
-		 * Possible values: 'none', 'previous' or 'current'
-		 */
-		restoration?: string;
-
-		/**
-		 * Set the speed of the animation. Default: 350
-		 */
-		speed?: number;
-
-		/**
-		 * How long the tooltip should be allowed to live before closing. Default: 0 (disabled)
+		 * How long (in ms) the tooltip should live before closing. 
+		 * @default 0 (disabled)
 		 */
 		timer?: number;
 
 		/**
-		 * Set the theme (CSS class) used for your tooltip. Default: 'tooltipster-default'
+		 * Set a theme that will override the default tooltip appearance. You may provide an array of strings 
+		 * to apply several themes at once (see the themes section). 
+		 * @default: []
 		 */
-		theme?: string;
+		theme?: string | string[];
 
 		/**
-		 *
-		 * If set to false, tooltips will not show on pure-touch devices, unless you open them yourself with the 'show' method.
-		 * Touch gestures on devices which also have a mouse will still open the tooltips though. Default: true
+		 * Sets how often the tracker should run (see trackOrigin and trackTooltip), in milliseconds. The tracker 
+		 * runs even if trackOrigin and trackTooltip are false to check if the origin has not been removed while 
+		 * the tooltip was open, so you shouldn't set too high or too low values unless you need to. 
+		 * @default 500
 		 */
-		touchDevices?: boolean;
+		trackerInterval?: number;
+
+		trackOrigin?: boolean;
+
+		trackTooltip?: boolean;
 
 		/**
 		 * Set how tooltips should be activated and closed.
@@ -214,66 +248,471 @@ declare namespace JQueryTooltipster {
 		trigger?: string;
 
 		/**
-		 * If a tooltip is open while its content is updated, play a subtle animation when the content changes. Default: true
+		 * When 'trigger' is set to 'custom', all built-in close triggers are disabled by default. This option 
+		 * allows you to reactivate the triggers of your choice to create a customized behavior. Only applies 
+		 * if 'trigger' is set to 'custom'. See http://iamceege.github.io/tooltipster/#triggers.
 		 */
-		updateAnimation?: boolean;
+		triggerClose?: {
+			/**
+			 * When a mouse click happens anywhere in the page. However, if the interactive option is set to true, 
+			 * a click happening inside the tooltip will not close it.
+			 */
+			click?: boolean;
+			/**
+			 * When the mouse goes away from the origin. The delay option is taken into account as the delay before 
+			 * closing.
+			 */
+			mouseleave?: boolean;
+			/**
+			 * When the origin is clicked by a mouse. This mimics a behavior that browsers usually have and is meant 
+			 * to be used with the mouseenter open trigger.
+			 */
+			originClick?: boolean;
+			/**
+			 * When scrolling happens in the window or in a scrollable area which is a parent of the origin.
+			 */
+			scroll?: boolean;
+			/**
+			 * When the finger taps (ie presses and releases) anywhere in the touch screen.
+			 */
+			tap?: boolean;
+			/**
+			 * When the finger is removed from the touch screen or if the interaction was stopped by the device. The 
+			 * delayTouch option is taken into account as the delay before closing.
+			 */
+			touchleave?: boolean;
+		};
+
+		/**
+		 * When 'trigger' is set to 'custom', all built-in open triggers are disabled by default. This option 
+		 * allows you to reactivate the triggers of your choice to create a customized behavior. Only applies 
+		 * if 'trigger' is set to 'custom'. See http://iamceege.github.io/tooltipster/#triggers.
+		 */
+		triggerOpen?: {
+			/**
+			 * When the origin is clicked by a mouse.
+			 */
+			click?: boolean;
+			/**
+			 * When a mouse comes over the origin. The delay option is taken into account as the delay before 
+			 * opening.
+			 */
+			mouseenter?: boolean;
+			/**
+			 * When the origin is pressed on a touch screen. The delayTouch option is taken into account as the 
+			 * delay before opening.
+			 */
+			touchstart?: boolean;
+			/**
+			 * When the origin is tapped (ie pressed and then released) on a touch screen.
+			 */
+			tap?: boolean;
+		};
+
+		/**
+		 * Plays a subtle animation when the content of the tooltip is updated (if the tooltip is open). You 
+		 * may create custom animations in your CSS files. Set to null to disable the animation. 
+		 * @default 'rotate'
+		 */
+		updateAnimation?: 'fade' | 'rotate' | 'scale' | null;
+
+		/**
+		 * Tries to place the tooltip in such a way that it will be entirely visible on screen when it's opened.
+		 * If the tooltip is to be opened while its origin is off screen (using a method call), you may want to 
+		 * set this option to false. 
+		 * @default true
+		 */
+		viewportAware?: boolean;
+
+		/**
+		 * Set the z-index of the tooltip. 
+		 * @default 9999999
+		 */
+		zIndex?: number;
 	}
 
+	type TooltipsterStandardCallbackFunction = (instance: ITooltipsterInstance, helper: ITooltipsterHelper) => void;
+
+	interface ITooltipsterHelper {
+		origin: HTMLElement;
+
+		/** provided on functionReady and open callbacks */
+		tooltip?: HTMLElement | undefined;
+
+		/** provided on functionBefore and functionAfter callbacks */
+		event?: MouseEvent | TouchEvent | null | undefined;
+
+		/** provided on position callback */
+		mode?: 'natural' | 'constrained';
+		/** provided on position callback */
+		tooltipClone?: HTMLElement;
+		/** provided on position callback */
+		geo?: ITooltipsterGeoHelper;
+	}
+
+	interface ITooltipsterGeoHelper {
+		document: {
+			size: {
+				height: number;
+				width: number;
+			};
+		};
+		window: {
+			scroll: {
+				left: number;
+				top: number;
+			};
+			size: {
+				height: number;
+				width: number;
+			}
+		};
+		origin: {
+			/** the origin has a fixed lineage if itself or one of its ancestors has a fixed position */
+			fixedLineage: boolean;
+			offset: {
+				/** this is the distance between the bottom side of the origin and the top of the document */
+				bottom: number;
+				left: number;
+				/** this is the distance between the right side of the origin and the left of the document */
+				right: number;
+				top: number;
+			};
+			size: {
+				height: number;
+				width: number
+			};
+			/** if the origin is a map area, this will hold the associated image element */
+			usemapImage: HTMLImageElement | null;
+			windowOffset: {
+				/** this is the distance between the bottom side of the origin and the top of the viewport */
+				bottom: number;
+				left: number;
+				/** this is the distance between the right side of the origin and the left of the viewport */
+				right: number;
+				top: number
+			}
+		}
+	}
+
+	/** see http://iamceege.github.io/tooltipster/#positioning */
+	interface ITooltipPosition {
+		/** determines the position of the tooltip and are relative to the viewport */
+		coord: {
+			left: number;
+			top: number;
+		};
+		/** the offset that will be applied between the origin and the tooltip */
+		distance: number;
+		/** is the side Tooltipster has judged best for your tooltip, according to your requirements */
+		side: TooltipPositioningSide;
+		/**
+		 * the size that your tooltip will have. It is either the natural size of the tooltip, or a size that has been 
+		 * set by Tooltipster to fit best on screen according to your requirements
+		 */
+		size: {
+			height: number;
+			width: number;
+		};
+		/**
+		 * the location Tooltipster thinks the tooltip should ideally be centered on, and the arrow aiming at. It is 
+		 * given as the distance from the relevant edge of the viewport (left edge if the side is "top" or "bottom", 
+		 * top edge if the side is "left" or "right"). The target is usually the middle of the origin, but can be 
+		 * somewhere else when the origin is actually a portion of text split in several lines. Editing this value 
+		 * will change the location the arrow is aiming at but will not change the position of the tooltip itself 
+		 * (use coord for that).
+		 */
+		target: number;
+	}
+
+	type TooltipPositioningSide = 'top' | 'bottom' | 'left' | 'right';
+	type TooltipEventName = 'init' | 'before' | 'ready' | 'after' | 'format' | 'position'
+		| 'close' | 'closing' | 'created' | 'destroy' | 'destroyed' | 'dismissable'
+		| 'geometry' | 'positionTest' | 'positionTested' | 'reposition' | 'repositioned'
+		| 'scroll' | 'start' | 'startcancel' | 'startend' | 'state' | 'updated';
+
 	/**
 	* Tooltipster tooltip instance object.
 	*/
 	export interface ITooltipsterInstance {
 
 		/**
-		 * Updates the content of the tooltip.
-		 * @param value
-		 * @returns {}
+		 * Closes the tooltip. When the animation is over, its HTML element is destroyed (definitely removed from the 
+		 * DOM). The `callback` function argument is optional.
 		 */
-		content(value: string): JQuery;
+		close(callback?: TooltipsterStandardCallbackFunction): void;
 
 		/**
-		 * Shows the tooltip.
+		 * Returns a tooltip's current content. If the selector matches multiple origins, only the value of the first 
+		 * will be returned.
 		 */
-		show(): void;
+		content(): any;
 
 		/**
-		 * Hides the tooltip (this will aslo causo it to be removed from the DOM, not simply hides it), however leaving the listeners.
+		 * Updates the tooltip's content.
+		 * @param value the new content of the tooltip
 		 */
-		hide(): void;
+		content(value: any): ITooltipsterInstance;
 
 		/**
-		 * Disables the tooltip, causing it to not show unless its re-enabled.
-		 */
-		disable(): void;
-
-		/**
-		 * Enables the tooltip.
-		 */
-		enable(): void;
-
-		/**
-		 * Destroy the tooltip and its listeners.
+		 * Closes and destroys the tooltip functionality.
 		 */
 		destroy(): void;
 
 		/**
-		 * Reposition and resize the tooltip.
+		 * Temporarily disables a tooltip from being able to open.
 		 */
-		reposition(): void;
+		disable(): void;
 
 		/**
-		 * Returns the root element of the tooltip.
+		 * Returns the HTML element which has been tooltipped.
 		 */
-		elementTooltip(): JQuery;
+		elementOrigin(): HTMLElement;
 
 		/**
-		 * Returns the root element of the icon if there is one, otherwise 'undefined'.
+		 * Returns the HTML root element of the tooltip if it is open, `null` if it is closed.
 		 */
-		elementIcon(): JQuery;
+		elementTooltip(): HTMLElement | null;
+
+		/**
+		 * If a tooltip was disabled, restores its previous functionality.
+		 */
+		enable(): void;
+
+		/**
+		 * Returns the instance of Tooltipster associated to the tooltip. If the selector matches multiple origins, 
+		 * only the instance of the first will be returned.
+		 */
+		instance(): ITooltipsterInstance;
+
+		/**
+		 * Handle Tooltipster's `on` event coming from any instance. See http://iamceege.github.io/tooltipster/#events
+		 * for a complete description of available events.
+		 */
+		on(eventName: string, callback: (e: JQueryEventObject) => void): ITooltipsterInstance;
+		/**
+		 * Handle Tooltipster's `one` event coming from any instance.
+		 */
+		one(eventName: string, callback: (e: JQueryEventObject) => void): ITooltipsterInstance;
+		/**
+		 * Handle Tooltipster's `off` event coming from any instance.
+		 */
+		off(eventName: string): ITooltipsterInstance;
+		/**
+		 * Trigger a Tooltipster's event coming from any instance.
+		 */
+		triggerHandler(eventName: string): ITooltipsterInstance;
+
+		/**
+		 * Opens the tooltip. The `callback` function argument is optional (see its input signature) and, if provided, 
+		 * is called when the opening animation has ended
+		 */
+		open(callback?: TooltipsterStandardCallbackFunction): ITooltipsterInstance;
+
+		/**
+		 * Returns the value of an option.
+		 */
+		option(optionName: string): any;
+
+		/**
+		 * Sets the value of an option (for advanced users only; we do not provide support on unexpected results).
+		 */
+		option(optionName: string, optionValue: any): ITooltipsterInstance;
+
+		/**
+		 * Resizes and repositions the tooltip.
+		 */
+		reposition(): ITooltipsterInstance;
+
+		/**
+		 * Returns various information about the tooltip, like whether it is open or not. See 
+		 * http://iamceege.github.io/tooltipster/#status
+		 */
+		status(): ITooltipStatus;
+
+		/**
+		 * Several plugins may have methods of the same name. To resolve the conflict, use the instance object of the 
+		 * tooltip and specify the full name of the desired plugin in your calls.
+		 */
+		[pluginName: string]: any;
+	}
+
+	/**
+	* Tooltipster methods available on a JQuery object
+	*/
+	export interface ITooltipsterJQuery {
+
+		/** Activates Tooltipster */
+		(options?: ITooltipsterOptions): JQuery;
+
+		/**
+		 * Closes the tooltip. When the animation is over, its HTML element is destroyed (definitely removed from the 
+		 * DOM). The `callback` function argument is optional.
+		 */
+		(method: 'close', callback?: TooltipsterStandardCallbackFunction): JQuery;
+
+		/**
+		 * Returns a tooltip's current content. If the selector matches multiple origins, only the value of the first 
+		 * will be returned.
+		 */
+		(method: 'content'): any;
+
+		/**
+		 * Updates the tooltip's content.
+		 * @param value the new content of the tooltip
+		 */
+		(method: 'content', value: string): JQuery;
+
+		/**
+		 * Closes and destroys the tooltip functionality.
+		 */
+		(method: 'destroy'): JQuery;
+
+		/**
+		 * Temporarily disables a tooltip from being able to open.
+		 */
+		(method: 'disable'): JQuery;
+
+		/**
+		 * Returns the HTML element which has been tooltipped.
+		 */
+		(method: 'elementOrigin'): HTMLElement;
+
+		/**
+		 * Returns the HTML root element of the tooltip if it is open, `null` if it is closed.
+		 */
+		(method: 'elementTooltip'): HTMLElement | null;
+
+		/**
+		 * If a tooltip was disabled, restores its previous functionality.
+		 */
+		(method: 'enable'): JQuery;
+
+		/**
+		 * Returns the instance of Tooltipster associated to the tooltip. If the selector matches multiple origins, 
+		 * only the instance of the first will be returned.
+		 */
+		(method: 'instance'): ITooltipsterInstance;
+
+		/**
+		 * Handle Tooltipster's `on` event coming from any instance. See http://iamceege.github.io/tooltipster/#events
+		 * for a complete description of available events.
+		 */
+		(method: 'on', eventName: string, callback: (e: JQueryEventObject) => void): JQuery;
+		/**
+		 * Handle Tooltipster's `one` event coming from any instance.
+		 */
+		(method: 'one', eventName: string, callback: (e: JQueryEventObject) => void): JQuery;
+		/**
+		 * Handle Tooltipster's `off` event coming from any instance.
+		 */
+		(method: 'off', eventName: string): JQuery;
+		/**
+		 * Trigger a Tooltipster's event coming from any instance.
+		 */
+		(method: 'triggerHandler', eventName: string): JQuery;
+
+		/**
+		 * Opens the tooltip. The `callback` function argument is optional (see its input signature) and, if provided, 
+		 * is called when the opening animation has ended
+		 */
+		(method: 'open', callback?: TooltipsterStandardCallbackFunction): JQuery;
+
+		/**
+		 * Returns the value of an option.
+		 */
+		(method: 'option', optionName: string): any;
+
+		/**
+		 * Sets the value of an option (for advanced users only; we do not provide support on unexpected results).
+		 */
+		(method: 'option', optionName: string, optionValue: any): JQuery;
+
+		/**
+		 * Resizes and repositions the tooltip.
+		 */
+		(method: 'reposition'): JQuery;
+
+		/**
+		 * Returns various information about the tooltip, like whether it is open or not. See 
+		 * http://iamceege.github.io/tooltipster/#status
+		 */
+		(method: 'status'): ITooltipStatus;
+	}
+
+	interface ITooltipsterStatic {
+		/**
+		 * all instances of all tooltips present in the page are returned
+		 */
+		instances(): ITooltipsterInstance[];
+		/**
+		 * Returns the instances of Tooltipster of all tooltips set on the element(s) matched by the argument.
+		 */
+		instances(selector: string | JQuery): ITooltipsterInstance[];
+		/**
+		 * Returns the instances of Tooltipster of all tooltips set on the element(s) matched by the argument.
+		 */
+		instances(element: HTMLElement): ITooltipsterInstance[];
+
+		/**
+		 * Returns the instances of Tooltipster which were generated during the last initializing call.
+		 */
+		instancesLatest(): ITooltipsterInstance[];
+
+		/**
+		 * Handle Tooltipster's `on` event coming from any instance. See http://iamceege.github.io/tooltipster/#events
+		 * for a complete description of available events.
+		 */
+		on(eventName: string, callback: (e: ITooltipEvent) => void): ITooltipsterStatic;
+		/**
+		 * Handle Tooltipster's `one` event coming from any instance.
+		 */
+		one(eventName: string, callback: (e: ITooltipEvent) => void): ITooltipsterStatic;
+		/**
+		 * Handle Tooltipster's `off` event coming from any instance.
+		 */
+		off(eventName: string): ITooltipsterStatic;
+		/**
+		 * Trigger a Tooltipster's event coming from any instance.
+		 */
+		triggerHandler(eventName: string): ITooltipsterStatic;
+
+		/**
+		 * Returns an array of all HTML elements in the page which have one or several tooltips initialized. If a selector 
+		 * is passed, the results will be limited to the descendants of the matched elements.
+		 */
+		origins(selector?: string | JQuery): HTMLElement[];
+
+		/**
+		 * Changes the default options that will apply to any tooltips created from now on.
+		 */
+		setDefaults(options: ITooltipsterOptions): void;
+	}
+
+	interface ITooltipEvent {
+		instance: ITooltipsterInstance;
+		origin: HTMLElement;
+		event: JQueryEventObject;
+	}
+
+	interface ITooltipStatus {
+		/** if the tooltip has been destroyed */
+		destroyed: boolean,
+		/** if the tooltip is scheduled for destruction (which means that the tooltip is currently closing and may not be reopened) */
+		destroying: boolean,
+		/** if the tooltip is enabled */
+		enabled: boolean,
+		/** if the tooltip is open (either appearing, stable or disappearing) */
+		open: boolean,
+		/** the state equals one of these four values: */
+		state: 'appearing' | 'stable' | 'disappearing' | 'closed'
 	}
 }
 
-
 interface JQuery {
-	tooltipster(options?: JQueryTooltipster.ITooltipsterOptions): JQuery|JQueryTooltipster.ITooltipsterInstance[];
+	tooltipster: JQueryTooltipster.ITooltipsterJQuery;
+}
+
+interface JQueryStatic {
+	tooltipster: JQueryTooltipster.ITooltipsterStatic;
 }
diff --git a/types/tooltipster/tooltipster-tests.ts b/types/tooltipster/tooltipster-tests.ts
index 8627989cc1..c81f8db37a 100644
--- a/types/tooltipster/tooltipster-tests.ts
+++ b/types/tooltipster/tooltipster-tests.ts
@@ -1,15 +1,441 @@
+/* tests from examples in the documentation at http://iamceege.github.io/tooltipster */
+
+$(document).ready(function () {
+	$('.tooltip').tooltipster();
+});
+
+$('.tooltip').tooltipster({
+	theme: 'tooltipster-noir'
+});
+
+$('.tooltip').tooltipster({
+	contentCloning: true
+});
+
+$('.tooltip').tooltipster({
+	animation: 'fade',
+	delay: 200,
+	theme: 'tooltipster-punk',
+	trigger: 'click'
+});
+
+// initialize your tooltip as usual:
+$('#my-tooltip').tooltipster({});
+// at some point you may decide to update its content:
+$('#my-tooltip').tooltipster('content', 'My new content');
+// ...and open it:
+$('#my-tooltip').tooltipster('open');
+
+// NOTE: most methods are actually chainable, as you would expect them to be:
+$('#my-other-tooltip')
+	.tooltipster({})
+	.tooltipster('content', 'My new content')
+	.tooltipster('open');
+
+$('.tooltip').tooltipster({
+	functionBefore: function (instance, helper) {
+		instance.content('My new content');
+	}
+});
+
+// Set default options for all future tooltip instantiations
+$.tooltipster.setDefaults({
+	side: 'bottom'
+});
 
 
-$(function() {
-	var tooltips = <JQueryTooltipster.ITooltipsterInstance[]>$("#tooltip").tooltipster({
-		content: "hi friend!",
-		delay: 300,
-		functionAfter: (origin) => {
-			console.log("tooltip closed!");
-		},
-		multiple: true
+// The `instances` method, when used without a second parameter, allows you to access all tooltips present in the page.
+// That may be useful to close all tooltips at once for example:
+var instances = $.tooltipster.instances();
+$.each(instances, function (i, instance) {
+	instance.close();
+});
+
+
+$('.tooltip1').tooltipster();
+$('.tooltip2').tooltipster();
+// this method call will only return an array with the instances created for the elements that matched '.tooltip2' because that's the latest initializing call.
+var instances = $.tooltipster.instancesLatest();
+
+$('.tooltip').tooltipster({
+	theme: ['tooltipster-noir', 'tooltipster-noir-customized']
+});
+
+$('#myelement').tooltipster('content', 'My new content');
+
+// or when you have the instance of the tooltip:
+let instance: JQueryTooltipster.ITooltipsterInstance;
+instance.content('My new content');
+
+$('.tooltip').tooltipster({
+	content: 'Loading...',
+	// 'instance' is basically the tooltip. More details in the "Object-oriented Tooltipster" section.
+	functionBefore: function (instance, helper) {
+
+		var $origin = $(helper.origin);
+
+		// we set a variable so the data is only loaded once via Ajax, not every time the tooltip opens
+		if ($origin.data('loaded') !== true) {
+
+			$.get('http://example.com/ajax.php', function (data) {
+
+				// call the 'content' method to update the content of our tooltip with the returned data.
+				// note: this content update will trigger an update animation (see the updateAnimation option)
+				instance.content(data);
+
+				// to remember that the data has been loaded
+				$origin.data('loaded', true);
+			});
+		}
+	}
+});
+
+$(document).ready(function () {
+
+	$('.tooltip').tooltipster();
+
+	$('#example').tooltipster('open', function (instance, helper) {
+		alert('The tooltip is now fully shown. Its content is: ' + instance.content());
 	});
-	tooltips[0].show();
-	tooltips[0].hide();
-	tooltips[0].destroy();
-});
\ No newline at end of file
+
+	$(window).keypress(function () {
+		$('#example').tooltipster('close', function (instance, helper) {
+			alert('The tooltip is now fully hidden');
+		});
+	});
+});
+
+$('#example').tooltipster({
+	trigger: 'custom',
+	triggerOpen: {
+		mouseenter: true
+	},
+	triggerClose: {
+		click: true,
+		scroll: true
+	}
+});
+
+$('#example').tooltipster({
+	trigger: 'custom',
+	triggerOpen: {
+		mouseenter: true,
+		touchstart: true
+	},
+	triggerClose: {
+		click: true,
+		scroll: true,
+		tap: true
+	}
+});
+
+$('#example').tooltipster({
+	trigger: 'custom',
+	triggerOpen: {
+		mouseenter: true,
+		touchstart: true
+	},
+	triggerClose: {
+		mouseleave: true,
+		originClick: true,
+		touchleave: true
+	}
+});
+
+$('#example').tooltipster({
+	trigger: 'custom',
+	triggerOpen: {
+		click: true,
+		tap: true
+	},
+	triggerClose: {
+		click: true,
+		tap: true
+	}
+});
+
+$(document).ready(function () {
+
+	// first on page load, initialize all tooltips
+	$('.tooltip').tooltipster();
+
+	// then immediately open the tooltip of the element named "example"
+	$('#example').tooltipster('open');
+
+	// as soon as a key is pressed on the keyboard, close the tooltip.
+	$(window).keypress(function () {
+		$('#example').tooltipster('close');
+	});
+});
+
+$('#my-tooltip').tooltipster({
+	functionPosition: function (instance, helper, position) {
+		position.coord.top += 10;
+		position.coord.left += 10;
+		return position;
+	}
+});
+
+$('#tooltip').tooltipster({
+	content: $('#tooltip_content'),
+	// if you use a single element as content for several tooltips, set this option to true
+	contentCloning: false
+});
+
+$('.tooltip').tooltipster({
+	functionInit: function (instance, helper) {
+		var content = $(helper.origin).find('.tooltip_content').detach();
+		instance.content(content);
+	}
+});
+
+$('.tooltip').tooltipster({
+	functionInit: function (instance, helper) {
+
+		var $origin = $(helper.origin);
+		const dataOptionsJson = $origin.attr('data-tooltipster');
+
+		if (dataOptionsJson) {
+
+			const dataOptions = JSON.parse(dataOptionsJson);
+
+			// example in the documentation isn't valid:
+			// $.each(dataOptions, function(name, option){
+			// 		instance.option(name, option);
+			// });
+			Object.keys(dataOptions).forEach(key => {
+				instance.option(key, dataOptions[key]);
+			});
+		}
+	}
+});
+
+$('#example').tooltipster({
+	functionInit: function (instance, helper) {
+
+		// parse the content
+		var content = instance.content(),
+			people = JSON.parse(content),
+			// and use it to make a sentence
+			newContent = 'We have ' + people.length + ' people today. Say hello to ' + people.join(', ');
+
+		// save the edited content
+		instance.content(newContent);
+	}
+});
+
+// this logs: "We have 3 people today. Say hello to Sarah, John, Matthew"
+console.log($('#example').tooltipster('content'));
+
+$('#example').tooltipster({
+
+	functionInit: function (instance, helper) {
+
+		var content = instance.content(),
+			people = JSON.parse(content);
+
+		instance.content(people);
+	},
+	// this formats the content on the fly when it needs to be displayed but does not modify its value
+	functionFormat: function (instance, helper, content) {
+
+		var displayedContent = 'We have ' + content.length + ' people today. Say hello to ' + content.join(', ');
+
+		return displayedContent;
+	}
+});
+
+// Alright! this logs: ["Sarah", "John", "Matthew"]
+console.log($('#example').tooltipster('content'));
+
+$('#my-element').tooltipster();
+
+$('#my-element').tooltipster('open').tooltipster('content', 'My new content');
+
+$('#my-element').tooltipster();
+
+instance = $('#my-element').tooltipster('instance');
+
+instance.open().content('My new content');
+
+$('#origin').tooltipster({
+	functionBefore: function (instance, helper) {
+		instance.content('Random content');
+	}
+});
+
+var $myElement = $('#my-element');
+
+// create a first tooltip as usual. The multiple option is actually optional for the first tooltip
+$myElement.tooltipster({
+	content: 'My first tooltip',
+	side: 'top'
+});
+
+// initialize a second tooltip
+$myElement.tooltipster({
+	// don't forget to provide content here as the first tooltip will have deleted the original title attribute of the element
+	content: 'My second tooltip',
+	multiple: true,
+	side: 'bottom'
+});
+
+var instances = $.tooltipster.instances($myElement);
+
+// use the instances to make any method calls on the tooltips
+instances[0].content('New content for my first tooltip').open();
+instances[1].content('New content for my second tooltip').open();
+
+// WARNING: calling  methods in the usual way only affects the first tooltip that was created on the element
+$myElement.tooltipster('content', 'New content for my first tooltip')
+
+$('#my-element').tooltipster({
+	content: 'HELLO',
+	functionInit: function (instance, helper) {
+		var string = instance.content();
+		instance.content(string.toLowerCase());
+	},
+	multiple: true
+});
+
+$('body').on('mouseenter', '.tooltip:not(.tooltipstered)', function () {
+	$(this)
+		.tooltipster({})
+		.tooltipster('open');
+});
+
+const doThis = () => { };
+const doThat = () => { };
+
+$("#my-tooltip").tooltipster({
+	functionBefore: function (instance, helper) {
+		doThis();
+		doThat();
+	}
+});
+
+instance = $("#my-tooltip").tooltipster({}).tooltipster('instance');
+
+instance
+	.on('before', doThis)
+	.on('before', doThat);
+
+$.tooltipster.on('init', function (event) {
+	doThis();
+});
+
+$("#my-tooltip").tooltipster({
+	functionInit: doThat
+});
+
+$('#example').tooltipster({
+	plugins: ['pluginNamespace.pluginName']
+});
+
+$('#example').tooltipster({
+	plugins: ['laa.follower']
+});
+
+$('#example').tooltipster({
+	content: 'Hello',
+	theme: 'tooltipster-noir',
+	'laa.follower': {
+			anchor: 'top-center'
+	},
+	'some.otherPlugin': {
+			anchor: 'value'
+	}
+});
+
+$('#example').tooltipster({
+	functionBefore: function(instance, helper) {
+			instance['laa.follower'].methodName();
+	}
+});
+
+$('#nesting').tooltipster({
+	content: $('<span>Hover me too!</span>'),
+	functionReady: function(instance, helper){
+			
+			// the nested tooltip must be initialized once the first tooltip is open, that's why we do this inside functionReady()
+			instance.content().tooltipster({
+					content: 'I am a nested tooltip!',
+					distance: 0
+			});
+	},
+	interactive: true
+});
+
+// initialize tooltips in the page as usual
+$('.tooltip').tooltipster();
+
+// bind on start events (triggered on mouseenter)
+$.tooltipster.on('start', function(event) {
+
+    if ($(event.instance.elementOrigin()).hasClass('tooltip_group')) {
+
+        var instances = $.tooltipster.instances('.tooltip_group'),
+            open = false,
+            duration;
+
+        $.each(instances, function (i, instance) {
+
+            if (instance !== event.instance) {
+
+                // if another instance is already open
+                if (instance.status().open){
+
+                    open = true;
+
+                    // get the current animationDuration
+                    duration = instance.option('animationDuration');
+
+                    // close the tooltip without animation
+                    instance.option('animationDuration', 0);
+                    instance.close();
+                    
+                    // restore the animationDuration to its normal value
+                    instance.option('animationDuration', duration);
+                }
+            }
+        });
+
+        // if another instance was open
+        if (open) {
+
+            duration = event.instance.option('animationDuration');
+
+            // open the tooltip without animation
+            event.instance.option('animationDuration', 0);
+            event.instance.open();
+            
+            // restore the animationDuration to its normal value
+            event.instance.option('animationDuration', duration);
+
+            // now that we have opened the tooltip, the hover trigger must be stopped
+            event.instance.stop();
+        }
+    }
+});
+
+$('#myfield').tooltipster({
+	functionInit: function(instance, helper){
+			var content = $('#myfield_description').html();
+			instance.content(content);
+	},
+	functionReady: function(instance, helper){
+			$('#myfield_description').attr('aria-hidden', 'false');
+	},
+	functionAfter: function(instance, helper){
+			$('#myfield_description').attr('aria-hidden', 'true');
+	}
+});
+
+// if in addition you want the tooltip to be displayed when the field gets focus, add these custom triggers :
+$('#myfield')
+	.focus(function(){
+			$(this).tooltipster('open');
+	})
+	.blur(function(){
+			$(this).tooltipster('close');
+	});
\ No newline at end of file
diff --git a/types/tooltipster/tslint.json b/types/tooltipster/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tooltipster/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/torrent-stream/tslint.json b/types/torrent-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/torrent-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/touch-events/tslint.json b/types/touch-events/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/touch-events/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tough-cookie/index.d.ts b/types/tough-cookie/index.d.ts
index 7aeb7b111f..ee431874dc 100644
--- a/types/tough-cookie/index.d.ts
+++ b/types/tough-cookie/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for tough-cookie 2.3
 // Project: https://github.com/salesforce/tough-cookie
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+//                 LiJinyao <https://github.com/LiJinyao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -159,7 +160,7 @@ export class CookieJar {
     setCookie(cookieOrString: Cookie | string, currentUrl: string, options: CookieJar.SetCookieOptions, cb: (err: Error | null, cookie: Cookie) => void): void;
     setCookie(cookieOrString: Cookie | string, currentUrl: string, cb: (err: Error, cookie: Cookie) => void): void;
 
-    setCookieSync(cookieOrString: Cookie | string, currentUrl: string, options: CookieJar.SetCookieOptions): void;
+    setCookieSync(cookieOrString: Cookie | string, currentUrl: string, options?: CookieJar.SetCookieOptions): void;
 
     getCookies(currentUrl: string, options: CookieJar.GetCookiesOptions, cb: (err: Error | null, cookies: Cookie[]) => void): void;
     getCookies(currentUrl: string, cb: (err: Error | null, cookies: Cookie[]) => void): void;
diff --git a/types/traceback/tslint.json b/types/traceback/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/traceback/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tracking/tslint.json b/types/tracking/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tracking/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/trash/index.d.ts b/types/trash/index.d.ts
new file mode 100644
index 0000000000..772b86c434
--- /dev/null
+++ b/types/trash/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for trash 4.2
+// Project: https://github.com/sindresorhus/trash#readme
+// Definitions by: Matthew James <https://github.com/matthew-matvei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface TrashOptions {
+    glob: boolean;
+}
+
+declare function trash(iterable: Iterable<string>, opts?: TrashOptions): Promise<void>;
+
+export default trash;
diff --git a/types/trash/trash-tests.ts b/types/trash/trash-tests.ts
new file mode 100644
index 0000000000..88a29c80f4
--- /dev/null
+++ b/types/trash/trash-tests.ts
@@ -0,0 +1,15 @@
+import trash from "trash";
+
+async function testTrashNoArgs() {
+    await trash(["/path/to/item1", "/path/to/item2"]);
+}
+
+async function testTrashWithArgs() {
+    await trash(["/path/to/item1", "/path/to/item2"], { glob: false });
+}
+
+async function testTrashPerDocumentation() {
+    trash(["*.png", "!rainbow.png"]).then(() => {
+        console.log("done");
+    });
+}
diff --git a/types/trash/tsconfig.json b/types/trash/tsconfig.json
new file mode 100644
index 0000000000..92b58c4679
--- /dev/null
+++ b/types/trash/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "target": "es2015",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "trash-tests.ts"
+    ]
+}
diff --git a/types/trash/tslint.json b/types/trash/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/trash/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/traverse/tslint.json b/types/traverse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/traverse/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/traverson/tslint.json b/types/traverson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/traverson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/trayballoon/tslint.json b/types/trayballoon/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/trayballoon/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tress/index.d.ts b/types/tress/index.d.ts
index a7237fbb98..ab4783746d 100644
--- a/types/tress/index.d.ts
+++ b/types/tress/index.d.ts
@@ -4,155 +4,157 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-export type TressJobCallback = (this: TressJobData, ...args: any[]) => void;
-export type TressWorkerDoneCallback = (err: boolean | Error | null | undefined, ...args: any[]) => void;
+declare namespace tress {
+	export type TressJobCallback = (this: TressJobData, ...args: any[]) => void;
+	export type TressWorkerDoneCallback = (err: boolean | Error | null | undefined, ...args: any[]) => void;
 
-export interface TressJobData { [name: string]: {}; }
+	export interface TressJobData { [name: string]: {}; }
 
-export interface TressJob {
-	data: TressJobData;
-	callback: TressJobCallback;
-}
+	export interface TressJob {
+		data: TressJobData;
+		callback: TressJobCallback;
+	}
 
-export interface TressJobQueues {
-	failed: TressJobData[];
-	finished: TressJobData[];
-	waiting: TressJobData[];
-}
+	export interface TressJobQueues {
+		failed: TressJobData[];
+		finished: TressJobData[];
+		waiting: TressJobData[];
+	}
 
-export interface TressStatic {
-	// Properties
+	export interface TressStatic {
+		// Properties
 
-	/**
-	 * Array of jobs currently being processed (readonly)
-	 */
-	readonly active: TressJob[];
-	/**
-	 * A minimum threshold buffer in order to say that the queue is unsaturated
-	 */
-	buffer: number;
-	/**
-	 * This property for alter the concurrency/delay on-the-fly
-	 */
-	concurrency: number;
-	/**
-	 * Array of failed jobs
-	 * (the done callback was called from worker with error in first argument) (readonly)
-	 */
-	readonly failed: TressJob[];
-	/**
-	 * Array of correctly finished jobs
-	 * (the done callback was called from worker with null or undefined (or any other false equivalent) in first argument) (readonly)
-	 */
-	readonly finished: TressJob[];
-	/**
-	 *  A boolean for determining whether the queue is in a paused state.
-	 * (readonly - use pause() and resume() instead)
-	 */
-	readonly paused: boolean;
-	/**
-	 * false untill any items have been pushed and processed by the queue.
-	 * Then becomes true and never changes in queue lifecycle (readonly)
-	 */
-	readonly started: boolean;
-	/**
-	 * Array of queued jobs (readonly)
-	 */
-	readonly waiting: TressJob[];
+		/**
+		 * Array of jobs currently being processed (readonly)
+		 */
+		readonly active: TressJob[];
+		/**
+		 * A minimum threshold buffer in order to say that the queue is unsaturated
+		 */
+		buffer: number;
+		/**
+		 * This property for alter the concurrency/delay on-the-fly
+		 */
+		concurrency: number;
+		/**
+		 * Array of failed jobs
+		 * (the done callback was called from worker with error in first argument) (readonly)
+		 */
+		readonly failed: TressJob[];
+		/**
+		 * Array of correctly finished jobs
+		 * (the done callback was called from worker with null or undefined (or any other false equivalent) in first argument) (readonly)
+		 */
+		readonly finished: TressJob[];
+		/**
+		 *  A boolean for determining whether the queue is in a paused state.
+		 * (readonly - use pause() and resume() instead)
+		 */
+		readonly paused: boolean;
+		/**
+		 * false untill any items have been pushed and processed by the queue.
+		 * Then becomes true and never changes in queue lifecycle (readonly)
+		 */
+		readonly started: boolean;
+		/**
+		 * Array of queued jobs (readonly)
+		 */
+		readonly waiting: TressJob[];
 
-	// Methods
+		// Methods
 
-	/**
-	 * Returns false if there are items waiting or being processed,
-	 * or true if not
-	 */
-	idle(): boolean;
-	/**
-	 * Removes the drain callback and empties remaining jobs from the queue
-	 * forcing it to go idle
-	 */
-	kill(): void;
-	/**
-	 * Returns the number of items waiting to be processed
-	 */
-	length(): number;
-	/**
-	 * Loads new arrays from data object to waiting, failed, and finished arrays and sets active to empty array.
-	 * Rises an error if started is true
-	 */
-	load(data: TressJobQueues): void;
-	/**
-	 * Pauses the processing of jobs until resume() is called
-	 */
-	pause(): void;
-	/**
-	 * Adds a new job to the queue.
-	 * Instead of a single job, a jobs array can be submitted.
-	 * Note, that if you pass callback as second argument,
-	 * tress calls this callback once the worker has finished processing the job
-	 */
-	push(job: TressJobData | TressJobData[], done?: TressJobCallback): void;
-	/**
-	 * Resumes the processing of queued jobs when the queue is paused
-	 */
-	resume(): void;
-	/**
-	 * Returns the number of items currently being processed
-	 */
-	running(): number;
-	/**
-	 * Runs a callback with object, that contains arrays of waiting, failed, and finished jobs.
-	 * If there are any active jobs at the moment, they will be concatenated to waiting array
-	 */
-	save(callback: (data: TressJobQueues) => void): void;
-	/**
-	 * Returns the status of job ("waiting", "running", "finished", "pending" or "missing")
-	 */
-	status(job: TressJob): "active" | "failed" | "finished" | "missing" | "waiting";
-	/**
-	 * Adds a new job to the front of the queue.
-	 * Instead of a single job, a jobs array can be submitted.
-	 * Note, that if you pass callback as second argument,
-	 * tress calls this callback once the worker has finished processing the job
-	 */
-	unshift(job: TressJobData | TressJobData[], done?: TressJobCallback): void;
-	/**
-	 * Returns the array of items currently being processed
-	 */
-	workersList(): TressStatic["active"];
+		/**
+		 * Returns false if there are items waiting or being processed,
+		 * or true if not
+		 */
+		idle(): boolean;
+		/**
+		 * Removes the drain callback and empties remaining jobs from the queue
+		 * forcing it to go idle
+		 */
+		kill(): void;
+		/**
+		 * Returns the number of items waiting to be processed
+		 */
+		length(): number;
+		/**
+		 * Loads new arrays from data object to waiting, failed, and finished arrays and sets active to empty array.
+		 * Rises an error if started is true
+		 */
+		load(data: TressJobQueues): void;
+		/**
+		 * Pauses the processing of jobs until resume() is called
+		 */
+		pause(): void;
+		/**
+		 * Adds a new job to the queue.
+		 * Instead of a single job, a jobs array can be submitted.
+		 * Note, that if you pass callback as second argument,
+		 * tress calls this callback once the worker has finished processing the job
+		 */
+		push(job: TressJobData | TressJobData[], done?: TressJobCallback): void;
+		/**
+		 * Resumes the processing of queued jobs when the queue is paused
+		 */
+		resume(): void;
+		/**
+		 * Returns the number of items currently being processed
+		 */
+		running(): number;
+		/**
+		 * Runs a callback with object, that contains arrays of waiting, failed, and finished jobs.
+		 * If there are any active jobs at the moment, they will be concatenated to waiting array
+		 */
+		save(callback: (data: TressJobQueues) => void): void;
+		/**
+		 * Returns the status of job ("waiting", "running", "finished", "pending" or "missing")
+		 */
+		status(job: TressJob): "active" | "failed" | "finished" | "missing" | "waiting";
+		/**
+		 * Adds a new job to the front of the queue.
+		 * Instead of a single job, a jobs array can be submitted.
+		 * Note, that if you pass callback as second argument,
+		 * tress calls this callback once the worker has finished processing the job
+		 */
+		unshift(job: TressJobData | TressJobData[], done?: TressJobCallback): void;
+		/**
+		 * Returns the array of items currently being processed
+		 */
+		workersList(): TressStatic["active"];
 
-	// Callbacks
+		// Callbacks
 
-	/**
-	 * A callback that is called when the last item from the queue has returned from the worker
-	 */
-	drain(): void;
-	/**
-	 * A callback that is called when the last item from the queue is given to a worker
-	 */
-	empty(): void;
-	/**
-	 * A callback that is called when job failed (worker call done with error as first argument).
-	 * Note, that this callback is called after job has been moved from active to failed/finished and after job callback (from push/unshift) was called
-	 */
-	error(this: TressJobData, err: Error, job: TressJobData, ...args: any[]): void;
-	/**
-	 * A  callback that is called when job returned to queue (worker call done with boolean as first argument)
-	 */
-	retry(this: TressJobData, ...args: any[]): void;
-	/**
-	 * A callback that is called when the number of running workers hits the concurrency limit, and further jobs will be queued
-	 */
-	saturated(): void;
-	/**
-	 * A callback that is called when job correctly finished (worker call done with null or undefined as first argument).
-	 * Note, that this callback is called after job has been moved from active to failed/finished and after job callback (from push/unshift) was called
-	 */
-	success(this: TressJobData, ...args: any[]): void;
-	/**
-	 * A callback that is called when the number of running workers is less than the concurrency & buffer limits, and further jobs will not be queued
-	 */
-	unsaturated(): void;
+		/**
+		 * A callback that is called when the last item from the queue has returned from the worker
+		 */
+		drain(): void;
+		/**
+		 * A callback that is called when the last item from the queue is given to a worker
+		 */
+		empty(): void;
+		/**
+		 * A callback that is called when job failed (worker call done with error as first argument).
+		 * Note, that this callback is called after job has been moved from active to failed/finished and after job callback (from push/unshift) was called
+		 */
+		error(this: TressJobData, err: Error, job: TressJobData, ...args: any[]): void;
+		/**
+		 * A  callback that is called when job returned to queue (worker call done with boolean as first argument)
+		 */
+		retry(this: TressJobData, ...args: any[]): void;
+		/**
+		 * A callback that is called when the number of running workers hits the concurrency limit, and further jobs will be queued
+		 */
+		saturated(): void;
+		/**
+		 * A callback that is called when job correctly finished (worker call done with null or undefined as first argument).
+		 * Note, that this callback is called after job has been moved from active to failed/finished and after job callback (from push/unshift) was called
+		 */
+		success(this: TressJobData, ...args: any[]): void;
+		/**
+		 * A callback that is called when the number of running workers is less than the concurrency & buffer limits, and further jobs will not be queued
+		 */
+		unsaturated(): void;
+	}
 }
 
 /**
@@ -169,6 +171,8 @@ export interface TressStatic {
  * should be run in parallel. If omitted, the concurrency defaults to 1.
  * If negative - no parallel and delay between worker functions (concurrency -1,000 sets 1 second delay)
  */
-export function tress(
-	worker: (job: TressJobData, done: TressWorkerDoneCallback) => void,
-	concurrency?: number): TressStatic;
+declare function tress(
+	worker: (job: tress.TressJobData, done: tress.TressWorkerDoneCallback) => void,
+	concurrency?: number): tress.TressStatic;
+
+export = tress;
diff --git a/types/tress/tress-tests.ts b/types/tress/tress-tests.ts
index 6d76d7e40d..bf2667ec85 100644
--- a/types/tress/tress-tests.ts
+++ b/types/tress/tress-tests.ts
@@ -1,6 +1,6 @@
 /// <reference types="node" />
 
-import { tress } from "tress";
+import tress = require("tress");
 
 function someAsyncFunction(job: any, callback: (err: any, data?: any) => void): void {
 	const p = Promise.resolve(job)
diff --git a/types/tress/tslint.json b/types/tress/tslint.json
index 49b250ccb9..a67cd2c5e9 100644
--- a/types/tress/tslint.json
+++ b/types/tress/tslint.json
@@ -1,6 +1,7 @@
 {
 	"extends": "dtslint/dt.json",
 	"rules": {
-		"space-before-function-paren": false
+		"space-before-function-paren": false,
+		"strict-export-declare-modifiers": false
 	}
 }
\ No newline at end of file
diff --git a/types/trim/tslint.json b/types/trim/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/trim/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/trunk8/tslint.json b/types/trunk8/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/trunk8/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tspromise/tslint.json b/types/tspromise/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tspromise/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/turf/index.d.ts b/types/turf/index.d.ts
deleted file mode 100644
index be6b41662e..0000000000
--- a/types/turf/index.d.ts
+++ /dev/null
@@ -1,1281 +0,0 @@
-// Type definitions for Turf 3.5.2
-// Project: http://turfjs.org/
-// Definitions by: Guillaume Croteau <https://github.com/gcroteau>, Denis Carriere <https://github.com/DenisCarriere>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="geojson" />
-
-/**
-#### TODO:
-
-Update all methods with newest JSDocs & tests based on the latest TurfJS library.
-
-AGGREGATION
-- [x] collect
-MEASUREMENT
-- [ ] along
-- [ ] area
-- [ ] bboxPolygon
-- [ ] bearing
-- [ ] center
-- [ ] centroid
-- [ ] destination
-- [ ] distance
-- [ ] envelope
-- [ ] lineDistance
-- [ ] midpoint
-- [ ] pointOnSurface
-- [ ] square
-TRANSFORMATION
-- [ ] bezier
-- [ ] buffer
-- [ ] concave
-- [ ] convex
-- [ ] difference
-- [ ] intersect
-- [ ] simplify
-- [ ] union
-MISC
-- [ ] combine
-- [ ] explode
-- [ ] flip
-- [ ] kinks
-- [ ] lineSlice
-- [ ] pointOnLine
-HELPER
-- [x] featureCollection
-- [x] feature
-- [x] lineString
-- [x] multiLineString
-- [x] point
-- [x] multiPoint
-- [x] polygon
-- [x] multiPolygon
-- [x] geometryCollection
-DATA
-- [x] random
-- [x] sample
-INTERPOLATION
-- [ ] isolines
-- [ ] planepoint
-- [ ] tin
-JOINS
-- [x] inside
-- [x] tag
-- [ ] within
-GRIDS
-- [x] hexGrid
-- [x] pointGrid
-- [x] squareGrid
-- [x] triangleGrid
-CLASSIFICATION
-- [ ] nearest
-META
-- [ ] propEach
-- [ ] coordEach
-- [ ] coordReduce
-- [ ] featureEach
-- [ ] getCoord
-ASSERTIONS
-- [ ] featureOf
-- [ ] collectionOf
-- [x] bbox
-- [x] circle
-- [x] geojsonType
-- [x] propReduce
-- [x] coordAll
-- [x] tesselate
- */
-
-declare const turf: turf.TurfStatic;
-declare const TemplateUnits: 'miles' | 'nauticalmiles' | 'degrees' | 'radians' | 'inches' | 'yards' | 'meters' | 'metres' | 'kilometers' | 'kilometres'
-declare const TemplateType: 'point'| 'points' | 'polygon' | 'polygons'
-declare interface OptionsRandom {
-    bbox?: Array<number>
-    num_vertices?: number
-    max_radial_length?: number
-}
-declare type PropReduceCallback = (memo: any, coord: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>) => any
-declare module turf {
-  interface TurfStatic {
-    //////////////////////////////////////////////////////
-    // Aggregation
-    //////////////////////////////////////////////////////
-
-    /**
-     * Merges a specified property from a FeatureCollection of points into a FeatureCollection of polygons. Given an `inProperty` on points and an `outProperty` for polygons, this finds every point that lies within each polygon, collects the `inProperty` values from those points, and adds them as an array to `outProperty` on the polygon.
-     *
-     * @name [collect](http://turfjs.org/docs/#collect)
-     * @param {FeatureCollection<Polygon>} polygons polygons with values on which to aggregate
-     * @param {FeatureCollection<Point>} points points to be aggregated
-     * @param {string} inProperty property to be nested from
-     * @param {string} outProperty property to be nested into
-     * @return {FeatureCollection<Polygon>} polygons with properties listed based on `outField`
-     * @example
-     * var poly1 = polygon([[[0,0],[10,0],[10,10],[0,10],[0,0]]])
-     * var poly2 = polygon([[[10,0],[20,10],[20,20],[20,0],[10,0]]])
-     * var polyFC = featurecollection([poly1, poly2])
-     * var pt1 = point([5,5], {population: 200})
-     * var pt2 = point([1,3], {population: 600})
-     * var pt3 = point([14,2], {population: 100})
-     * var pt4 = point([13,1], {population: 200})
-     * var pt5 = point([19,7], {population: 300})
-     * var ptFC = featurecollection([pt1, pt2, pt3, pt4, pt5])
-     * var aggregated = aggregate(polyFC, ptFC, 'population', 'values')
-     *
-     * aggregated.features[0].properties.values // => [200, 600])
-     */
-    collect(
-      polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>,
-      points: GeoJSON.FeatureCollection<GeoJSON.Point>,
-      inProperty: string,
-      outProperty: string
-    ): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Measurement
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a line and returns a point at a specified distance along the line.
-    * @param line Input line
-    * @param distance Distance along the line
-    * @param [units=miles] 'miles', 'kilometers', 'radians' or 'degrees'
-    * @returns Point along the line
-    */
-    along(
-      line: GeoJSON.Feature<GeoJSON.LineString>,
-      distance: number,
-      units?: typeof TemplateUnits
-    ): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes one or more features and returns their area in square meters.
-    * @param input Input features
-    * @returns Area in square meters
-    */
-    area(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): number;
-
-    /**
-     * Takes a set of features, calculates the bbox of all input features, and returns a bounding box.
-     *
-     * @name bbox
-     * @param {(Feature|FeatureCollection)} geojson input features
-     * @return {Array<number>} bbox extent in [minX, minY, maxX, maxY] order
-     * @example
-     * var pt1 = point([114.175329, 22.2524])
-     * var pt2 = point([114.170007, 22.267969])
-     * var pt3 = point([114.200649, 22.274641])
-     * var pt4 = point([114.200649, 22.274641])
-     * var pt5 = point([114.186744, 22.265745])
-     * var features = featureCollection([pt1, pt2, pt3, pt4, pt5])
-     *
-     * var bbox = turf.bbox(features);
-     *
-     * var bboxPolygon = turf.bboxPolygon(bbox);
-     *
-     * //=bbox
-     *
-     * //=bboxPolygon
-     */
-    bbox(bbox: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): Array<number>;
-
-    /**
-     * Takes a {@link Point} and calculates the circle polygon given a radius in degrees, radians, miles, or kilometers; and steps for precision.
-     *
-     * @name circle
-     * @param {Feature<Point>} center center point
-     * @param {number} radius radius of the circle
-     * @param {number} [steps=64] number of steps
-     * @param {string} [units=kilometers] miles, kilometers, degrees, or radians
-     * @returns {Feature<Polygon>} circle polygon
-     * @example
-     * var center = point([-75.343, 39.984]);
-     * var radius = 5;
-     * var steps = 10;
-     * var units = 'kilometers';
-     *
-     * var circle = turf.circle(center, radius, steps, units);
-     *
-     * //=circle
-     */
-    circle(center: GeoJSON.Feature<GeoJSON.Point>, radius: number, steps?: number, units?: typeof TemplateUnits): GeoJSON.Feature<GeoJSON.Polygon>;
-
-
-    /**
-     * Enforce expectations about types of GeoJSON objects for Turf.
-     *
-     * @name geojsonType
-     * @param {GeoJSON} value any GeoJSON object
-     * @param {string} type expected GeoJSON type
-     * @param {string} name name of calling function
-     * @throws {Error} if value is not the expected type.
-     */
-    geojsonType(value: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>, type: string, name: string): void
-
-    /**
-     * Reduce properties in any GeoJSON object into a single value, similar to how Array.reduce works. However, in this case we lazily run the reduction, so an array of all properties is unnecessary.
-     *
-     * @name propReduce
-     * @param {GeoJSON} layer any GeoJSON object
-     * @param {Function} callback a method that takes (memo, coord) and returns a new memo
-     * @param {*} memo the starting value of memo: can be any type.
-     * @return {*} combined value
-     */
-    propReduce(layer: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>, callback: PropReduceCallback, memo: any): any
-
-    /**
-     * Get all coordinates from any GeoJSON object, returning an array of coordinate arrays.
-     *
-     * @name coordAll
-     * @param {GeoJSON} layer any GeoJSON object
-     * @returns {Array<Array<Number>>} coordinate position array
-     */
-    coordAll(layer: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): Array<Array<number>>
-
-    /**
-     * Tesselates a {@link Feature<Polygon>} into a {@link FeatureCollection<Polygon>} of triangles using [earcut](https://github.com/mapbox/earcut).
-     *
-     * @name tesselate
-     * @param {Feature<Polygon>} polygon the polygon to tesselate
-     * @returns {FeatureCollection<Polygon>} a geometrycollection feature
-     * @example
-     * var polygon = turf.random('polygon').features[0];
-     *
-     * var triangles = turf.tesselate(polygon);
-     *
-     * //=triangles
-     */
-    tesselate(poly: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Polygon>
-
-    /**
-    * Takes a bbox and returns an equivalent polygon.
-    * @param bbox An Array of bounding box coordinates in the form: [xLow, yLow, xHigh, yHigh]
-    * @returns A Polygon representation of the bounding box
-    */
-    bboxPolygon(bbox: Array<number>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes two points and finds the geographic bearing between them.
-    * @param start Starting Point
-    * @param end Ending point
-    * @returns Bearing in decimal degrees
-    */
-    bearing(start: GeoJSON.Feature<GeoJSON.Point>, end: GeoJSON.Feature<GeoJSON.Point>): number;
-
-    /**
-    * Takes a FeatureCollection and returns the absolute center point of all features.
-    * @param features Input features
-    * @returns A Point feature at the absolute center point of all input features
-    */
-    center(features: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes one or more features and calculates the centroid using the arithmetic mean of all vertices.
-    * This lessens the effect of small islands and artifacts when calculating the centroid of a set of polygons.
-    * @param features Input features
-    * @returns The centroid of the input features
-    */
-    centroid(features: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a Point and calculates the location of a destination point given a distance in degrees, radians, miles, or kilometers and bearing in degrees.
-    * This uses the Haversine formula to account for global curvature.
-    * @param start Starting point
-    * @param distance Distance from the starting point
-    * @param bearing Ranging from -180 and 180
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Destination point
-    */
-    destination(
-      start: GeoJSON.Feature<GeoJSON.Point>,
-      distance: number,
-      bearing: number,
-      units?: typeof TemplateUnits
-    ): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Calculates the distance between two points in degress, radians, miles, or kilometers.
-    * This uses the Haversine formula to account for global curvature.
-    * @param from Origin point
-    * @param to Destination point
-    * @param [units=kilometers] 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Distance between the two points
-    */
-    distance(
-      from: GeoJSON.Feature<GeoJSON.Point>,
-      to: GeoJSON.Feature<GeoJSON.Point>,
-      units?: typeof TemplateUnits
-    ): number;
-
-    /**
-    * Takes any number of features and returns a rectangular Polygon that encompasses all vertices.
-    * @param fc Input features
-    * @returns A rectangular Polygon feature that encompasses all vertices
-    */
-    envelope(fc: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes a line and measures its length in the specified units.
-    * @param line Line to measure
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Length of the input line
-    */
-    lineDistance(
-      line: GeoJSON.Feature<GeoJSON.LineString>,
-      units?: typeof TemplateUnits
-    ): number;
-
-    /**
-    * Takes two points and returns a point midway between them.
-    * @param pt1 First point
-    * @param pt2 Second point
-    * @returns A point midway between pt1 and pt2
-    */
-    midpoint(pt1: GeoJSON.Feature<GeoJSON.Point>, pt2: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a feature and returns a Point guaranteed to be on the surface of the feature. Given a Polygon, the point will be in the area of the polygon.
-    * Given a LineString, the point will be along the string. Given a Point, the point will the same as the input.
-    * @param input Any feature or set of features
-    * @returns A point on the surface of input
-    */
-    pointOnSurface(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any>;
-
-    /**
-    * Takes a bounding box and calculates the minimum square bounding box that would contain the input.
-    * @param bbox A bounding box
-    * @returns A square surrounding bbox
-    */
-    square(bbox: Array<number>): Array<number>;
-
-    //////////////////////////////////////////////////////
-    // Transformation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a line and returns a curved version by applying a Bezier spline algorithm.
-    * The bezier spline implementation is by Leszek Rybicki.
-    * @param line Input LineString
-    * @param [resolution=10000] Time in milliseconds between points
-    * @param [sharpness=0.85] A measure of how curvy the path should be between splines
-    * @returns Curved line
-    */
-    bezier(line: GeoJSON.Feature<GeoJSON.LineString>, resolution?: number, sharpness?: number): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Calculates a buffer for input features for a given radius. Units supported are miles, kilometers, and degrees.
-    * @param feature Input to be buffered
-    * @param distance Distance to draw the buffer
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Buffered features
-    */
-    buffer(feature: GeoJSON.Feature<GeoJSON.Polygon>, distance: number, units?: typeof TemplateUnits): GeoJSON.Feature<GeoJSON.Polygon>;
-    buffer(feature: GeoJSON.Feature<GeoJSON.MultiPolygon>, distance: number, units?: typeof TemplateUnits): GeoJSON.Feature<GeoJSON.MultiPolygon>;
-    buffer(feature: GeoJSON.Feature<GeoJSON.Point>, distance: number, units?: typeof TemplateUnits): GeoJSON.Feature<GeoJSON.Point>;
-    buffer(feature: GeoJSON.Feature<any>, distance: number, units?: typeof TemplateUnits): GeoJSON.Feature<any>;
-    buffer(feature: GeoJSON.FeatureCollection<GeoJSON.Polygon>, distance: number, units?: typeof TemplateUnits): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-    buffer(feature: GeoJSON.FeatureCollection<GeoJSON.MultiPolygon>, distance: number, units?: typeof TemplateUnits): GeoJSON.FeatureCollection<GeoJSON.MultiPolygon>;
-    buffer(feature: GeoJSON.FeatureCollection<GeoJSON.Point>, distance: number, units?: typeof TemplateUnits): GeoJSON.FeatureCollection<GeoJSON.Point>;
-    buffer(feature: GeoJSON.FeatureCollection<any>, distance: number, units?: typeof TemplateUnits): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a set of points and returns a concave hull polygon. Internally, this implements a Monotone chain algorithm.
-    * @param points Input points
-    * @param maxEdge The size of an edge necessary for part of the hull to become concave (in miles)
-    * @param units Used for maxEdge distance (miles or kilometers)
-    * @returns A concave hull
-    */
-    concave(
-      points: GeoJSON.FeatureCollection<GeoJSON.Point>,
-      maxEdge: number,
-      units?: typeof TemplateUnits
-    ): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of points and returns a convex hull polygon. Internally this uses the convex-hull module that implements a monotone chain hull.
-    * @param input Input points
-    * @returns A convex hull
-    */
-    convex(
-      input: GeoJSON.FeatureCollection<GeoJSON.Point>
-    ): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Finds the difference between two polygons by clipping the second polygon from the first.
-    * @param poly1 Input Polygon feaure
-    * @param poly2 Polygon feature to difference from poly1
-    * @returns A Polygon feature showing the area of poly1 excluding the area of poly2
-    */
-    difference(
-      poly1: GeoJSON.Feature<GeoJSON.Polygon>,
-      poly2: GeoJSON.Feature<GeoJSON.Polygon>
-    ): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-     * Takes two Features and finds their intersection.
-     * If they share a border, returns the border if they don't intersect, returns undefined.
-     *
-     * @name [intersect](http://turfjs.org/docs/#intersect)
-     * @param {Feature<Polygon>} poly1
-     * @param {Feature<Polygon>} poly2
-     * @returns {Feature|undefined} A feature representing the point(s) they share (in case of a {Point}  or {MultiPoint}), the borders they share (in case of a {LineString} or a {MultiLineString}), the area they share (in case of {Polygon} or {MultiPolygon}). If they do not share any point, returns `undefined`.
-     * @example
-     * var poly1 = polygon([[
-     *   [-122.801742, 45.48565],
-     *   [-122.801742, 45.60491],
-     *   [-122.584762, 45.60491],
-     *   [-122.584762, 45.48565],
-     *   [-122.801742, 45.48565]
-     * ]]);
-     *
-     * var poly2 = polygon([[
-     *   [-122.520217, 45.535693],
-     *   [-122.64038, 45.553967],
-     *   [-122.720031, 45.526554],
-     *   [-122.669906, 45.507309],
-     *   [-122.723464, 45.446643],
-     *   [-122.532577, 45.408574],
-     *   [-122.487258, 45.477466],
-     *   [-122.520217, 45.535693]
-     * ]]);
-     * var polygons = featureCollection([poly1, poly2]);
-     *
-     * var intersection = turf.intersect(poly1, poly2);
-     *
-     * //=polygons
-     *
-     * //=intersection
-     */
-    intersect(
-      feature1: GeoJSON.Feature<GeoJSON.Polygon>,
-      feature2: GeoJSON.Feature<GeoJSON.Polygon>
-    ): GeoJSON.Feature<GeoJSON.Point | GeoJSON.LineString | GeoJSON.Polygon>;
-    intersect(
-      feature1: GeoJSON.Feature<any>,
-      feature2: GeoJSON.Feature<any>
-    ): GeoJSON.Feature<any>;
-
-    /**
-    * Takes a LineString or Polygon and returns a simplified version.
-    * Internally uses simplify-js to perform simplification.
-    * @param feature Feature to be simplified
-    * @param tolerance Simplification tolerance
-    * @param highQuality Whether or not to spend more time to create a higher-quality simplification with a different algorithm
-    * @returns A simplified feature
-    */
-    simplify(feature: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection, tolerance: number, highQuality: boolean): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection;
-
-    /**
-    * Takes two polygons and returns a combined polygon.
-    * If the input polygons are not contiguous, this function returns a MultiPolygon feature.;
-    * @param poly1 Input polygon
-    * @param poly2 Another input polygon
-    * @returns A combined Polygon or MultiPolygon feature
-    */
-    union(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiPolygon>;
-
-    //////////////////////////////////////////////////////
-    // Misc
-    //////////////////////////////////////////////////////
-
-    /**
-    * Combines a FeatureCollection of Point, LineString, or Polygon features into MultiPoint, MultiLineString, or MultiPolygon features.
-    * @param fc A FeatureCollection of any type
-    * @returns A FeatureCollection of corresponding type to input
-    */
-    combine(fc: GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a feature or set of features and returns all positions as points.
-    * @param input Input features
-    * @returns Points representing the exploded input features
-    */
-    explode(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes input features and flips all of their coordinates from [x, y] to [y, x].
-    * @param input Input features
-    * @returns A feature or set of features of the same type as input with flipped coordinates
-    */
-    flip(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a polygon and returns points at all self-intersections.
-    * @param polygon Input polygon
-    * @returns Self-intersections
-    */
-    kinks(polygon: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a line, a start Point, and a stop point and returns the line in between those points.
-    * @param point1 Starting point
-    * @param point2 Stopping point
-    * @param line Line to slice
-    * @returns Sliced line
-    */
-    lineSlice(point1: GeoJSON.Feature<GeoJSON.Point>, point2: GeoJSON.Feature<GeoJSON.Point>, line: GeoJSON.Feature<GeoJSON.LineString>): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Takes a Point and a LineString and calculates the closest Point on the LineString.
-    * @param line Line to snap to
-    * @param point Point to snap from
-    * @returns Closest point on the line to point
-    */
-    pointOnLine(line: GeoJSON.Feature<GeoJSON.LineString>, point: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    //////////////////////////////////////////////////////
-    // Helper
-    //////////////////////////////////////////////////////
-
-    /**
-     * Takes one or more {@link Feature|Features} and creates a {@link FeatureCollection}.
-     *
-     * @name [featureCollection](http://turfjs.org/docs/#featurecollection)
-     * @param {Feature[]} features input features
-     * @returns {FeatureCollection} a FeatureCollection of input features
-     * @example
-     * var features = [
-     *  turf.point([-75.343, 39.984], {name: 'Location A'}),
-     *  turf.point([-75.833, 39.284], {name: 'Location B'}),
-     *  turf.point([-75.534, 39.123], {name: 'Location C'})
-     * ]
-     *
-     * var fc = turf.featureCollection(features)
-     *
-     * //=fc
-     */
-    featureCollection(features: Array<GeoJSON.Feature<any>>): GeoJSON.FeatureCollection<any>;
-
-    /**
-     * Wraps a GeoJSON {@link Geometry} in a GeoJSON {@link Feature}.
-     *
-     * @name [feature](http://turfjs.org/docs/#feature)
-     * @param {Geometry} geometry input geometry
-     * @param {Object} properties properties
-     * @returns {FeatureCollection} a FeatureCollection of input features
-     * @example
-     * var geometry = {
-     *      "type": "Point",
-     *      "coordinates": [
-     *        67.5,
-     *        32.84267363195431
-     *      ]
-     *    }
-     *
-     * var feature = turf.feature(geometry)
-     *
-     * //=feature
-     */
-    feature(geometry:GeoJSON.Feature<any>, properties?: any): GeoJSON.Feature<any>;
-
-    /**
-     * Creates a {@link LineString} based on a coordinate array. Properties can be added optionally.
-     *
-     * @name [lineString](http://turfjs.org/docs/#linestring)
-     * @param {Array<Array<number>>} coordinates an array of Positions
-     * @param {Object=} properties an Object of key-value pairs to add as properties
-     * @returns {Feature<LineString>} a LineString feature
-     * @throws {Error} if no coordinates are passed
-     * @example
-     * var linestring1 = turf.lineString([
-     *    [-21.964416, 64.148203],
-     *    [-21.956176, 64.141316],
-     *    [-21.93901, 64.135924],
-     *    [-21.927337, 64.136673]
-     * ])
-     * var linestring2 = turf.lineString([
-     *    [-21.929054, 64.127985],
-     *    [-21.912918, 64.134726],
-     *    [-21.916007, 64.141016],
-     *   [-21.930084, 64.14446]
-     * ], {name: 'line 1', distance: 145})
-     *
-     * //=linestring1
-     *
-     * //=linestring2
-     */
-    lineString(coordinates: Array<Array<number>>, properties?: any): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-     * Creates a {@link Feature<MultiLineString>} based on a coordinate array. Properties can be added optionally.
-     *
-     * @name [multiLineString](http://turfjs.org/docs/#multilinestring)
-     * @param {Array<Array<Array<number>>>} coordinates an array of LineStrings
-     * @param {Object=} properties an Object of key-value pairs to add as properties
-     * @returns {Feature<MultiLineString>} a MultiLineString feature
-     * @throws {Error} if no coordinates are passed
-     * @example
-     * var multiLine = turf.multiLineString([[[0,0],[10,10]]])
-     *
-     * //=multiLine
-     *
-     */
-    multiLineString(coordinates: Array<Array<Array<number>>>, properties?: any): GeoJSON.Feature<GeoJSON.MultiLineString>;
-
-    /**
-     * Takes coordinates and properties (optional) and returns a new {@link Point} feature.
-     *
-     * @name [point](http://turfjs.org/docs/#point)
-     * @param {Array<number>} coordinates longitude, latitude position (each in decimal degrees)
-     * @param {Object=} properties an Object that is used as the {@link Feature}'s
-     * properties
-     * @returns {Feature<Point>} a Point feature
-     * @example
-     * var pt1 = turf.point([-75.343, 39.984]);
-     *
-     * //=pt1
-     */
-    point(coordinates: Array<number>, properties?: any): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-     * Creates a {@link Feature<MultiPoint>} based on a coordinate array. Properties can be added optionally.
-     *
-     * @name [multiPoint](http://turfjs.org/docs/#multipoint)
-     * @param {Array<Array<number>>} coordinates an array of Positions
-     * @param {Object=} properties an Object of key-value pairs to add as properties
-     * @returns {Feature<MultiPoint>} a MultiPoint feature
-     * @throws {Error} if no coordinates are passed
-     * @example
-     * var multiPt = turf.multiPoint([[0,0],[10,10]])
-     *
-     * //=multiPt
-     *
-     */
-    multiPoint(coordinates: Array<Array<number>>, properties?: any): GeoJSON.Feature<GeoJSON.MultiPoint>;
-
-    /**
-     * Takes an array of LinearRings and optionally an {@link Object} with properties and returns a {@link Polygon} feature.
-     *
-     * @name [polygon](http://turfjs.org/docs/#polygon)
-     * @param {Array<Array<Array<number>>>} coordinates an array of LinearRings
-     * @param {Object=} properties a properties object
-     * @returns {Feature<Polygon>} a Polygon feature
-     * @throws {Error} throw an error if a LinearRing of the polygon has too few positions
-     * or if a LinearRing of the Polygon does not have matching Positions at the
-     * beginning & end.
-     * @example
-     * var polygon = turf.polygon([[
-     *  [-2.275543, 53.464547],
-     *  [-2.275543, 53.489271],
-     *  [-2.215118, 53.489271],
-     *  [-2.215118, 53.464547],
-     *  [-2.275543, 53.464547]
-     * ]], { name: 'poly1', population: 400});
-     *
-     * //=polygon
-     */
-    polygon(coordinates: Array<Array<Array<number>>>, properties?: any): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-     * Creates a {@link Feature<MultiPolygon>} based on a coordinate array. Properties can be added optionally.
-     *
-     * @name [multiPolygon](http://turfjs.org/docs/#multipolygon)
-     * @param {Array<Array<Array<Array<number>>>>} coordinates an array of Polygons
-     * @param {Object=} properties an Object of key-value pairs to add as properties
-     * @returns {Feature<MultiPolygon>} a multipolygon feature
-     * @throws {Error} if no coordinates are passed
-     * @example
-     * var multiPoly = turf.multiPolygon([[[[0,0],[0,10],[10,10],[10,0],[0,0]]]);
-     *
-     * //=multiPoly
-     *
-     */
-    multiPolygon(coordinates: Array<Array<Array<Array<number>>>>, properties?: any): GeoJSON.Feature<GeoJSON.MultiPolygon>;
-
-    /**
-     * Creates a {@link Feature<GeometryCollection>} based on acoordinate array. Properties can be added optionally.
-     *
-     * @name [geometryCollection](http://turfjs.org/docs/#geometrycollection)
-     * @param {Array<{Geometry}>} geometries an array of GeoJSON Geometries
-     * @param {Object=} properties an Object of key-value pairs to add as properties
-     * @returns {Feature<GeometryCollection>} a GeoJSON GeometryCollection Feature
-     * @example
-     * var point = {
-     *     "type": "Point",
-     *       "coordinates": [100, 0]
-     *     };
-     * var line = {
-     *     "type": "LineString",
-     *     "coordinates": [ [101, 0], [102, 1] ]
-     *   };
-     * var collection = turf.geometryCollection([point, line]);
-     *
-     * //=collection
-     */
-    geometryCollection(geometries: Array<GeoJSON.GeometryObject>, properties?: any): GeoJSON.GeometryCollection;
-
-    //////////////////////////////////////////////////////
-    // Data
-    //////////////////////////////////////////////////////
-
-    /**
-     * Generates random {@link GeoJSON} data, including {@link Point|Points} and {@link Polygon|Polygons}, for testing and experimentation.
-     *
-     * @name [random](http://turfjs.org/docs/#random)
-     * @param {String} [type='point'] type of features desired: 'points' or 'polygons'
-     * @param {Number} [count=1] how many geometries should be generated.
-     * @param {Object} options options relevant to the feature desired. Can include:
-     * @param {Array<number>} options.bbox a bounding box inside of which geometries
-     * are placed. In the case of {@link Point} features, they are guaranteed to be within this bounds,
-     * while {@link Polygon} features have their centroid within the bounds.
-     * @param {Number} [options.num_vertices=10] options.vertices the number of vertices added
-     * to polygon features.
-     * @param {Number} [options.max_radial_length=10] the total number of decimal
-     * degrees longitude or latitude that a polygon can extent outwards to
-     * from its center.
-     * @return {FeatureCollection} generated random features
-     * @example
-     * var points = turf.random('points', 100, {
-     *   bbox: [-70, 40, -60, 60]
-     * })
-     *
-     * //=points
-     *
-     * var polygons = turf.random('polygons', 4, {
-     *   bbox: [-70, 40, -60, 60]
-     * })
-     *
-     * //=polygons
-     */
-    random(type?: 'point', count?: number, options?: OptionsRandom): GeoJSON.FeatureCollection<GeoJSON.Point>;
-    random(type?: 'points', count?: number, options?: OptionsRandom): GeoJSON.FeatureCollection<GeoJSON.Point>;
-    random(type?: 'polygon', count?: number, options?: OptionsRandom): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-    random(type?: 'polygons', count?: number, options?: OptionsRandom): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-    random(type?: typeof TemplateType, count?: number, options?: OptionsRandom): GeoJSON.FeatureCollection<any>;
-
-    /**
-     * Takes a {@link FeatureCollection} and returns a FeatureCollection with given number of {@link Feature|features} at random.
-     *
-     * @name [sample](http://turfjs.org/docs/#sample)
-     * @param {FeatureCollection} featurecollection set of input features
-     * @param {number} num number of features to select
-     * @return {FeatureCollection} a FeatureCollection with `n` features
-     * @example
-     * var points = turf.random('points', 1000);
-     *
-     * //=points
-     *
-     * var sample = turf.sample(points, 10);
-     *
-     * //=sample
-     */
-    sample(featurecollection: GeoJSON.FeatureCollection<any>, num: number): GeoJSON.FeatureCollection<any>;
-
-    //////////////////////////////////////////////////////
-    // GRIDS
-    //////////////////////////////////////////////////////
-
-    /**
-     * Takes a bounding box and a cell size in degrees and returns a {@link FeatureCollection} of flat-topped hexagons ({@link Polygon} features) aligned in an "odd-q" vertical grid as described in [Hexagonal Grids](http://www.redblobgames.com/grids/hexagons/).
-     *
-     * @name [hexGrid](http://turfjs.org/docs/#hexgrid)
-     * @param {Array<number>} bbox bounding box in [minX, minY, maxX, maxY] order
-     * @param {number} cellSize dimension of cell in specified units
-     * @param {string} units used in calculating cellSize ('miles' or 'kilometers')
-     * @param {boolean} triangles whether to return as triangles instead of hexagons
-     * @return {FeatureCollection<Polygon>} a hexagonal grid
-     * @example
-     * var bbox = [-96,31,-84,40];
-     * var cellSize = 50;
-     * var units = 'miles';
-     *
-     * var hexgrid = turf.hexGrid(bbox, cellSize, units);
-     *
-     * //=hexgrid
-     */
-    hexGrid(
-      bbox: Array<number>,
-      cellSize: number,
-      units?: typeof TemplateUnits,
-      triangles?: boolean
-    ): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-     * Takes a bounding box and a cell depth and returns a set of {@link Point|points} in a grid.
-     *
-     * @name [pointGrid](http://turfjs.org/docs/#pointgrid)
-     * @param {Array<number>} bbox extent in [minX, minY, maxX, maxY] order
-     * @param {number} cellSize the distance across each cell
-     * @param {string} [units=kilometers] used in calculating cellSize, can be degrees, radians, miles, or kilometers
-     * @return {FeatureCollection<Point>} grid of points
-     * @example
-     * var extent = [-70.823364, -33.553984, -70.473175, -33.302986];
-     * var cellSize = 3;
-     * var units = 'miles';
-     *
-     * var grid = turf.pointGrid(extent, cellSize, units);
-     *
-     * //=grid
-     */
-    pointGrid(
-      bbox: Array<number>,
-      cellSize: number,
-      units?: typeof TemplateUnits
-    ): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-     * Takes a bounding box and a cell depth and returns a set of square {@link Polygon|polygons} in a grid.
-     *
-     * @name [squareGrid](http://turfjs.org/docs/#squaregrid)
-     * @param {Array<number>} bbox extent in [minX, minY, maxX, maxY] order
-     * @param {number} cellSize width of each cell
-     * @param {string} [units=kilometers] used in calculating cellSize, can be degrees, radians, miles, or kilometers
-     * @return {FeatureCollection<Polygon>} grid a grid of polygons
-     * @example
-     * var bbox = [-96,31,-84,40]
-     * var cellSize = 10
-     * var units = 'miles'
-     *
-     * var squareGrid = turf.squareGrid(bbox, cellSize, units)
-     *
-     * //=squareGrid
-     */
-    squareGrid(
-      bbox: Array<number>,
-      cellSize: number,
-      units?: typeof TemplateUnits
-    ): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-     * Takes a bounding box and a cell depth and returns a set of triangular {@link Polygon|polygons} in a grid.
-     *
-     * @name [triangleGrid](http://turfjs.org/docs/#trianglegrid))
-     * @param {Array<number>} bbox extent in [minX, minY, maxX, maxY] order
-     * @param {number} cellSize dimension of each cell
-     * @param {string} [units=kilometers] used in calculating cellSize, can be degrees, radians, miles, or kilometers
-     * @return {FeatureCollection<Polygon>} grid of polygons
-     * @example
-     * var bbox = [-96,31,-84,40]
-     * var cellSize = 10;
-     * var units = 'miles';
-     *
-     * var triangleGrid = turf.triangleGrid(extent, cellSize, units);
-     *
-     * //=triangleGrid
-     */
-    triangleGrid(
-      bbox: Array<number>,
-      cellSize: number,
-      units?: typeof TemplateUnits
-    ): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Interpolation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes points with z-values and an array of value breaks and generates isolines.
-    * @param points Input points
-    * @param z The property name in points from which z-values will be pulled
-    * @param resolution Resolution of the underlying grid
-    * @param breaks Where to draw contours
-    * @returns Isolines
-    */
-    isolines(points: GeoJSON.FeatureCollection<GeoJSON.Point>, z: string, resolution: number, breaks: Array<number>): GeoJSON.FeatureCollection<GeoJSON.LineString>;
-
-    /**
-    * Takes a triangular plane as a Polygon and a Point within that triangle and returns the z-value at that point.
-    * The Polygon needs to have properties a, b, and c that define the values at its three corners.
-    * @param interpolatedPoint The Point for which a z-value will be calculated
-    * @param triangle A Polygon feature with three vertices
-    * @returns The z-value for interpolatedPoint
-    */
-    planepoint(interpolatedpoint: GeoJSON.Feature<GeoJSON.Point>, triangle: GeoJSON.Feature<GeoJSON.Polygon>): number;
-
-    /**
-    * Takes a set of points and the name of a z-value property and creates a Triangulated Irregular Network, or a TIN for short, returned as a collection of Polygons.
-    * These are often used for developing elevation contour maps or stepped heat visualizations.
-    * This triangulates the points, as well as adds properties called a, b, and c representing the value of the given propertyName at each of the points that represent the corners of the triangle.
-    * @param points Input points
-    * @param [propertyName] Name of the property from which to pull z values This is optional: if not given, then there will be no extra data added to the derived triangles.
-    * @returns TIN output
-    */
-    tin(points: GeoJSON.FeatureCollection<GeoJSON.Point>, propertyName?: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Joins
-    //////////////////////////////////////////////////////
-
-    /**
-     * Takes a {<Point>} and a {<Polygon>} or {<MultiPolygon>} and determines if the point resides inside the polygon. The polygon can be convex or concave. The function accounts for holes.
-     *
-     * @name [inside](http://turfjs.org/docs/#inside)
-     * @param {Feature<Point>} point input point
-     * @param {Feature<(Polygon|MultiPolygon)>} polygon input polygon or multipolygon
-     * @return {Boolean} `true` if the Point is inside the Polygon; `false` if the Point is not inside the Polygon
-     * @example
-     * var pt = point([-77, 44])
-     * var poly = polygon([[[-81, 41], [-81, 47], [-72, 47], [-72, 41], [-81, 41]]])
-     *
-     * var isInside = turf.inside(pt, poly)
-     *
-     * //=isInside
-     */
-    inside(
-      point: GeoJSON.Feature<GeoJSON.Point>,
-      polygon: GeoJSON.Feature<GeoJSON.Polygon>
-    ): boolean;
-
-    /**
-     * Takes a {FeatureCollection<Point>} and a {FeatureCollection<Polygon>} and performs a spatial join.
-     *
-     * @name [tag](http://turfjs.org/docs/#inside)
-     * @param {FeatureCollection<Point>} points input points
-     * @param {FeatureCollection<Polygon>} polygons input polygons
-     * @param {string} field property in `polygons` to add to joined {<Point>} features
-     * @param {string} outField property in `points` in which to store joined property from `polygons`
-     * @return {FeatureCollection<Point>} points with `containingPolyId` property containing values from `polyId`
-     * @example
-     * var pt1 = point([-77, 44])
-     * var pt2 = point([-77, 38])
-     * var poly1 = polygon([[[-81, 41], [-81, 47], [-72, 47], [-72, 41], [-81, 41]]], {pop: 1000})
-     * var poly2 = polygon([[[-81, 35], [-81, 41], [-72, 41], [-72, 35], [-81, 35]]], {pop: 3000})
-     *
-     * var points = featureCollection([pt1, pt2])
-     * var polygons = featureCollection([poly1, poly2])
-     *
-     * var tagged = turf.tag(points, polygons, 'pop', 'population')
-     * //=tagged
-     */
-    tag(
-      points: GeoJSON.FeatureCollection<GeoJSON.Point>,
-      polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>,
-      field: string,
-      outField: string
-    ): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a set of points and a set of polygons and returns the points that fall within the polygons.
-    * @param points Input points
-    * @param polygons Input polygons
-    * @returns Points that land within at least one polygon
-    */
-    within(
-      points: GeoJSON.FeatureCollection<GeoJSON.Point>,
-      polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>
-    ): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    //////////////////////////////////////////////////////
-    // Classification
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a reference point and a set of points and returns the point from the set closest to the reference.
-    * @param point The reference point
-    * @param against Input point set
-    * @returns The closest point in the set to the reference point
-    */
-    nearest(
-      point: GeoJSON.Feature<GeoJSON.Point>,
-      against: GeoJSON.FeatureCollection<GeoJSON.Point>
-    ): GeoJSON.Feature<GeoJSON.Point>;
-  }
-}
-
-// NPM Stable version of Turf
-declare module "turf" {
-  export = turf
-}
-
-// Latest version of Turf
-declare module "@turf/turf" {
-  export = turf
-}
-
-// AGGREGATION
-declare module "@turf/collect" {
-   const collect: typeof turf.collect;
-   export = collect;
-}
-
-// MEASUREMENT
-declare module "@turf/along" {
-   const along: typeof turf.along;
-   export = along;
-}
-
-declare module "@turf/area" {
-   const area: typeof turf.area;
-   export = area;
-}
-
-declare module "@turf/bbox-polygon" {
-   const bboxPolygon: typeof turf.bboxPolygon;
-   export = bboxPolygon;
-}
-
-declare module "@turf/bearing" {
-   const bearing: typeof turf.bearing;
-   export = bearing;
-}
-
-declare module "@turf/center" {
-   const center: typeof turf.center;
-   export = center;
-}
-
-declare module "@turf/centroid" {
-   const centroid: typeof turf.centroid;
-   export = centroid;
-}
-
-declare module "@turf/destination" {
-   const destination: typeof turf.destination;
-   export = destination;
-}
-
-declare module "@turf/distance" {
-   const distance: typeof turf.distance;
-   export = distance;
-}
-
-declare module "@turf/envelope" {
-   const envelope: typeof turf.envelope;
-   export = envelope;
-}
-
-declare module "@turf/line-distance" {
-   const lineDistance: typeof turf.lineDistance;
-   export = lineDistance;
-}
-
-declare module "@turf/midpoint" {
-   const midpoint: typeof turf.midpoint;
-   export = midpoint;
-}
-
-declare module "@turf/point-on-surface" {
-   const pointOnSurface: typeof turf.pointOnSurface;
-   export = pointOnSurface;
-}
-
-declare module "@turf/square" {
-   const square: typeof turf.square;
-   export = square;
-}
-
-// TRANSFORMATION
-declare module "@turf/bezier" {
-   const bezier: typeof turf.bezier;
-   export = bezier;
-}
-
-declare module "@turf/buffer" {
-   const buffer: typeof turf.buffer;
-   export = buffer;
-}
-
-declare module "@turf/concave" {
-   const concave: typeof turf.concave;
-   export = concave;
-}
-
-declare module "@turf/convex" {
-   const convex: typeof turf.convex;
-   export = convex;
-}
-
-declare module "@turf/difference" {
-   const difference: typeof turf.difference;
-   export = difference;
-}
-
-declare module "@turf/intersect" {
-   const intersect: typeof turf.intersect;
-   export = intersect;
-}
-
-declare module "@turf/simplify" {
-   const simplify: typeof turf.simplify;
-   export = simplify;
-}
-
-declare module "@turf/union" {
-   const union: typeof turf.union;
-   export = union;
-}
-
-// MISC
-declare module "@turf/combine" {
-   const combine: typeof turf.combine;
-   export = combine;
-}
-
-declare module "@turf/explode" {
-   const explode: typeof turf.explode;
-   export = explode;
-}
-
-declare module "@turf/flip" {
-   const flip: typeof turf.flip;
-   export = flip;
-}
-
-declare module "@turf/kinks" {
-   const kinks: typeof turf.kinks;
-   export = kinks;
-}
-
-declare module "@turf/line-slice" {
-   const lineSlice: typeof turf.lineSlice;
-   export = lineSlice;
-}
-
-declare module "@turf/point-on-line" {
-   const pointOnLine: typeof turf.pointOnLine;
-   export = pointOnLine;
-}
-
-// HELPER
-declare module "@turf/helpers" {
-   const helpers: {
-     featureCollection: typeof turf.featureCollection,
-     feature: typeof turf.feature,
-     lineString: typeof turf.lineString,
-     multiLineString: typeof turf.multiLineString,
-     point: typeof turf.point,
-     multiPoint: typeof turf.multiPoint,
-     polygon: typeof turf.polygon,
-     multiPolygon: typeof turf.multiPolygon,
-     geometryCollection: typeof turf.geometryCollection,
-   };
-   export = helpers;
-}
-
-// DATA
-declare module "@turf/random" {
-   const random: typeof turf.random;
-   export = random;
-}
-
-declare module "@turf/sample" {
-   const sample: typeof turf.sample;
-   export = sample;
-}
-
-// INTERPOLATION
-declare module "@turf/isolines" {
-   const isolines: typeof turf.isolines;
-   export = isolines;
-}
-
-declare module "@turf/planepoint" {
-   const planepoint: typeof turf.planepoint;
-   export = planepoint;
-}
-
-declare module "@turf/tin" {
-   const tin: typeof turf.tin;
-   export = tin;
-}
-
-// JOINS
-declare module "@turf/inside" {
-   const inside: typeof turf.inside;
-   export = inside;
-}
-
-declare module "@turf/tag" {
-   const tag: typeof turf.tag;
-   export = tag;
-}
-
-declare module "@turf/within" {
-   const within: typeof turf.within;
-   export = within;
-}
-
-// GRIDS
-declare module "@turf/hex-grid" {
-   const hexGrid: typeof turf.hexGrid;
-   export = hexGrid;
-}
-
-declare module "@turf/point-grid" {
-   const pointGrid: typeof turf.pointGrid;
-   export = pointGrid;
-}
-
-declare module "@turf/square-grid" {
-   const squareGrid: typeof turf.squareGrid;
-   export = squareGrid;
-}
-
-declare module "@turf/triangle-grid" {
-   const triangleGrid: typeof turf.triangleGrid;
-   export = triangleGrid;
-}
-
-// CLASSIFICATION
-declare module "@turf/nearest" {
-   const nearest: typeof turf.nearest;
-   export = nearest;
-}
-
-// // META
-// declare module "@turf/propEach" {
-//    const propEach: typeof turf.propEach;
-//    export = propEach;
-// }
-
-// declare module "@turf/coordEach" {
-//    const coordEach: typeof turf.coordEach;
-//    export = coordEach;
-// }
-
-// declare module "@turf/coordReduce" {
-//    const coordReduce: typeof turf.coordReduce;
-//    export = coordReduce;
-// }
-
-// declare module "@turf/featureEach" {
-//    const featureEach: typeof turf.featureEach;
-//    export = featureEach;
-// }
-
-// declare module "@turf/getCoord" {
-//    const getCoord: typeof turf.getCoord;
-//    export = getCoord;
-// }
-
-// // ASSERTIONS
-// declare module "@turf/featureOf" {
-//    const featureOf: typeof turf.featureOf;
-//    export = featureOf;
-// }
-
-// declare module "@turf/collectionOf" {
-//    const collectionOf: typeof turf.collectionOf;
-//    export = collectionOf;
-// }
-
-declare module "@turf/bbox" {
-   const bbox: typeof turf.bbox;
-   export = bbox;
-}
-
-declare module "@turf/circle" {
-   const circle: typeof turf.circle;
-   export = circle;
-}
-
-declare module "@turf/geojsonType" {
-   const geojsonType: typeof turf.geojsonType;
-   export = geojsonType;
-}
-
-declare module "@turf/propReduce" {
-   const propReduce: typeof turf.propReduce;
-   export = propReduce;
-}
-
-declare module "@turf/coordAll" {
-   const coordAll: typeof turf.coordAll;
-   export = coordAll;
-}
-
-declare module "@turf/tesselate" {
-   const tesselate: typeof turf.tesselate;
-   export = tesselate;
-}
diff --git a/types/turf/tsconfig.json b/types/turf/tsconfig.json
deleted file mode 100644
index 344431ad7a..0000000000
--- a/types/turf/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "turf-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/turf/turf-tests.ts b/types/turf/turf-tests.ts
deleted file mode 100644
index 1c18d01a7d..0000000000
--- a/types/turf/turf-tests.ts
+++ /dev/null
@@ -1,522 +0,0 @@
-import * as turf from '@turf/turf'
-// AGGREGATION
-import * as collect from '@turf/collect'
-// MEASUREMENT
-import * as along from '@turf/along'
-import * as area from '@turf/area'
-import * as bboxPolygon from '@turf/bbox-polygon'
-import * as bearing from '@turf/bearing'
-import * as center from '@turf/center'
-import * as centroid from '@turf/centroid'
-import * as destination from '@turf/destination'
-import * as envelope from '@turf/envelope'
-import * as lineDistance from '@turf/line-distance'
-import * as midpoint from '@turf/midpoint'
-import * as pointOnSurce from '@turf/point-on-surface'
-import * as square from '@turf/square'
-// TRANSFORMATION
-import * as bezier from '@turf/bezier'
-import * as buffer from '@turf/buffer'
-import * as concave from '@turf/concave'
-import * as convex from '@turf/convex'
-import * as difference from '@turf/difference'
-import * as intersect from '@turf/intersect'
-import * as simplify from '@turf/simplify'
-import * as union from '@turf/union'
-// MISC
-import * as combine from '@turf/combine'
-import * as explode from '@turf/explode'
-import * as flip from '@turf/flip'
-import * as kinks from '@turf/kinks'
-import * as lineSlice from '@turf/line-slice'
-import * as pointOnLine from '@turf/point-on-line'
-// HELPER
-import {
-  featureCollection,
-  feature,
-  lineString,
-  multiLineString,
-  point,
-  multiPoint,
-  polygon,
-  multiPolygon,
-  geometryCollection } from '@turf/helpers'
-// DATA
-import * as random from '@turf/random'
-import * as sample from '@turf/sample'
-// INTERPOLATION
-import * as isolines from '@turf/isolines'
-import * as planepoint from '@turf/planepoint'
-import * as tin from '@turf/tin'
-// JOINS
-import * as inside from '@turf/inside'
-import * as tag from '@turf/tag'
-import * as within from '@turf/within'
-// GRIDS
-import * as hexGrid from '@turf/hex-grid'
-import * as pointGrid from '@turf/point-grid'
-import * as squareGrid from '@turf/square-grid'
-import * as triangleGrid from '@turf/triangle-grid'
-// CLASSIFICATION
-import * as nearest from '@turf/nearest'
-// // META
-// import * as propEach from '@turf/propEach'
-// import * as coordEach from '@turf/coordEach'
-// import * as coordReduce from '@turf/coordReduce'
-// import * as featureEach from '@turf/featureEach'
-// import * as getCoord from '@turf/getCoord'
-// // ASSERTIONS
-// import * as featureOf from '@turf/featureOf'
-// import * as collectionOf from '@turf/collectionOf'
-import * as bboxAssertions from '@turf/bbox'
-// import * as circle from '@turf/circle'
-// import * as geojsonType from '@turf/geojsonType'
-// import * as propReduce from '@turf/propReduce'
-// import * as coordAll from '@turf/coordAll'
-// import * as tesselate from '@turf/tesselate'
-
-///////////////////////////////////////////
-// Tests data initialisation
-///////////////////////////////////////////
-const bbox = [0, 0, 10, 10]
-const properties = {pop: 3000}
-const point1: GeoJSON.Feature<GeoJSON.Point> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Point",
-    "coordinates": [-75.343, 39.984]
-  }
-}
-
-const point2: GeoJSON.Feature<GeoJSON.Point> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Point",
-    "coordinates": [-75.401, 39.884]
-  }
-}
-
-const multiPoint1: GeoJSON.Feature<GeoJSON.MultiPoint> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "MultiPoint",
-    "coordinates": [ [100.0, 0.0], [101.0, 1.0] ]
-  }
-}
-
-const lineString1: GeoJSON.Feature<GeoJSON.LineString> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "LineString",
-    "coordinates": [
-      [-77.031669, 38.878605],
-      [-77.029609, 38.881946],
-      [-77.020339, 38.884084],
-      [-77.025661, 38.885821],
-      [-77.021884, 38.889563],
-      [-77.019824, 38.892368]
-    ]
-  }
-}
-
-const multiLineString1: GeoJSON.Feature<GeoJSON.MultiLineString> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "MultiLineString",
-    "coordinates": [
-        [ [100.0, 0.0], [101.0, 1.0] ],
-        [ [102.0, 2.0], [103.0, 3.0] ]
-      ]
-  }
-}
-
-const polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon> = {
-  "type": "FeatureCollection",
-  "features": [
-    {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [[
-          [-67.031021, 10.458102],
-          [-67.031021, 10.53372],
-          [-66.929397, 10.53372],
-          [-66.929397, 10.458102],
-          [-67.031021, 10.458102]
-        ]]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [[
-          [-66.919784, 10.397325],
-          [-66.919784, 10.513467],
-          [-66.805114, 10.513467],
-          [-66.805114, 10.397325],
-          [-66.919784, 10.397325]
-        ]]
-      }
-    }
-  ]
-}
-
-const polygon1: GeoJSON.Feature<GeoJSON.Polygon> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [[
-      [105.818939,21.004714],
-      [105.818939,21.061754],
-      [105.890007,21.061754],
-      [105.890007,21.004714],
-      [105.818939,21.004714]
-    ]]
-  }
-}
-
-const polygon2: GeoJSON.Feature<GeoJSON.Polygon> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [[
-      [-122.520217, 45.535693],
-      [-122.64038, 45.553967],
-      [-122.720031, 45.526554],
-      [-122.669906, 45.507309],
-      [-122.723464, 45.446643],
-      [-122.532577, 45.408574],
-      [-122.487258, 45.477466],
-      [-122.520217, 45.535693]
-    ]]
-  }
-}
-
-const multiPolygon1: GeoJSON.Feature<GeoJSON.MultiPolygon> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "MultiPolygon",
-    "coordinates": [
-      [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
-      [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
-       [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
-      ]
-  }
-}
-
-const points: GeoJSON.FeatureCollection<GeoJSON.Point> = {
-  "type": "FeatureCollection",
-  "features": [
-    {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-63.601226, 44.642643]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-63.591442, 44.651436]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-63.580799, 44.648749]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-63.573589, 44.641788]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-63.587665, 44.64533]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-63.595218, 44.64765]
-      }
-    }
-  ]
-}
-
-const triangle: GeoJSON.Feature<GeoJSON.Polygon> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [[
-      [-75.1221, 39.57],
-      [-75.58, 39.18],
-      [-75.97, 39.86],
-      [-75.1221, 39.57]
-    ]]
-  }
-}
-
-///////////////////////////////////////////
-// Tests Measurement
-///////////////////////////////////////////
-
-// -- Test along --
-turf.along(lineString1, 50)
-turf.along(lineString1, 50, 'miles')
-
-// -- Test area --
-turf.area(polygons)
-
-// -- Test bboxPolygon --
-turf.bboxPolygon(bbox)
-
-// -- Test bearing --
-turf.bearing(point1, point2)
-
-// -- Test center
-turf.center(points)
-
-// -- Test centroid --
-turf.centroid(polygon1)
-
-// -- Test destination --
-turf.destination(point1, 50, 90)
-turf.destination(point1, 50, 90, 'miles')
-
-// -- Test distance --
-turf.distance(point1, point2)
-turf.distance(point1, point2, 'miles')
-
-// -- Test envelope --
-turf.envelope(polygons)
-
-// -- Test lineDistance
-turf.lineDistance(lineString1)
-turf.lineDistance(lineString1, 'miles')
-
-// -- Test midpoint --
-turf.midpoint(point1, point2)
-
-// -- Test pointOnSurface --
-turf.pointOnSurface(polygon1)
-
-// -- Test square --
-turf.square(bbox)
-
-///////////////////////////////////////////
-// Tests Transformation
-///////////////////////////////////////////
-
-// -- Test bezier --
-turf.bezier(lineString1)
-
-// -- Test buffer --
-turf.buffer(point1, 50)
-turf.buffer(point1, 50, 'miles')
-
-// -- Test concave --
-turf.concave(points, 1, 'miles')
-
-// -- Test convex --
-turf.convex(points)
-
-// -- Test difference --
-turf.difference(polygon1, polygon2)
-
-// -- Test intersect --
-turf.intersect(polygon1, polygon2)
-turf.intersect(point1, polygon1)
-turf.intersect(point1, point1)
-turf.intersect(polygon1, point1)
-turf.intersect(polygon1, lineString1)
-turf.intersect(lineString1, point1)
-
-// -- Test simplify --
-
-turf.simplify(polygon1, 0.01, false)
-
-// -- Test union --
-turf.union(polygon1, polygon2)
-
-///////////////////////////////////////////
-// Tests Misc
-///////////////////////////////////////////
-
-// -- Test combine --
-turf.combine(points)
-
-// -- Test explode --
-turf.explode(polygon1)
-
-// -- Test flip --
-turf.flip(point1)
-
-// -- Test kinks --
-turf.kinks(polygon1)
-
-// -- Test lineSlice --
-turf.lineSlice(point1, point2, lineString1)
-
-// -- Test pointOnLine --
-turf.pointOnLine(lineString1, point1)
-
-///////////////////////////////////////////
-// Tests Helper
-///////////////////////////////////////////
-
-// -- Test featurecollection --
-turf.featureCollection([point1, point2])
-turf.featureCollection([point1, polygon1])
-turf.featureCollection([polygon1, polygon2])
-turf.featureCollection([lineString1, polygon1])
-turf.featureCollection([lineString1, point1])
-
-// -- Test feature --
-turf.feature(point1)
-turf.feature(polygon1)
-turf.feature(lineString1)
-
-// -- Test lineString --
-turf.lineString(lineString1.geometry.coordinates)
-turf.lineString(lineString1.geometry.coordinates, properties)
-
-// -- Test multiLineString --
-turf.multiLineString(multiLineString1.geometry.coordinates)
-
-// -- Test point --
-turf.point(point1.geometry.coordinates)
-turf.point(point1.geometry.coordinates, properties)
-
-// -- Test multiPoint --
-turf.multiPoint(multiPoint1.geometry.coordinates)
-
-// -- Test polygon --
-turf.polygon(polygon1.geometry.coordinates, properties)
-
-// -- Test multiPolygon --
-turf.multiPolygon(multiPolygon1.geometry.coordinates, properties)
-
-// -- Test geometryCollection --
-turf.geometryCollection([point1.geometry, lineString1.geometry]);
-
-///////////////////////////////////////////
-// Tests Data
-///////////////////////////////////////////
-
-// -- Test random --
-turf.random('points', 100)
-turf.random('points', 100, { bbox })
-turf.random('polygons', 100, {
-  bbox,
-  num_vertices: 10,
-  max_radial_length: 10
-})
-
-// -- Test sample --
-turf.random('points', 100)
-turf.sample(points, 10)
-
-///////////////////////////////////////////
-// Tests Interpolation
-///////////////////////////////////////////
-
-// -- Test hexGrid --
-turf.hexGrid(bbox, 50)
-turf.hexGrid(bbox, 50, 'miles')
-
-// -- Test pointGrid --
-turf.pointGrid(bbox, 50)
-turf.pointGrid(bbox, 50, 'miles')
-
-// -- Test squareGrid --
-turf.squareGrid(bbox, 50)
-turf.squareGrid(bbox, 50, 'miles')
-
-// -- Test triangleGrid --
-turf.triangleGrid(bbox, 50)
-turf.triangleGrid(bbox, 50, 'miles')
-
-///////////////////////////////////////////
-// Tests Interpolation
-///////////////////////////////////////////
-
-// -- Test isolines --
-turf.isolines(points, 'z', 15, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-
-// -- Test planepoint --
-turf.planepoint(point1, triangle)
-
-// -- Test tin --
-turf.tin(points, 'z')
-
-///////////////////////////////////////////
-// Tests Joins
-///////////////////////////////////////////
-
-// -- Test inside --
-turf.inside(point1, polygon1)
-
-// -- Test tag --
-turf.tag(points, polygons, 'pop', 'population')
-
-// -- Test within --
-turf.within(points, polygons)
-
-///////////////////////////////////////////
-// Tests Classification
-///////////////////////////////////////////
-
-// -- Test nearest --
-turf.nearest(point1, points)
-
-///////////////////////////////////////////
-// Tests Aggregation
-///////////////////////////////////////////
-turf.collect(polygons, points, 'population', 'values')
-
-///////////////////////////////////////////
-// Tests Assertions
-///////////////////////////////////////////
-// -- Test bbox --
-turf.bbox(polygon1)
-turf.bbox(point1)
-turf.bbox(lineString1)
-turf.bbox(multiLineString1)
-turf.bbox(multiPolygon1)
-// -- Test circle --
-turf.circle(point1, 10)
-turf.circle(point1, 10, 32)
-turf.circle(point1, 10, 64, 'miles')
-
-// -- Test geojsonType --
-turf.geojsonType(point1, 'point', 'Test')
-
-// -- Test propReduce --
-turf.propReduce(point1, (memo, coord) => {}, 'point')
-
-// -- Test coordAll --
-turf.coordAll(polygon1)
-
-// -- Test tesselate --
-turf.tesselate(polygon1)
\ No newline at end of file
diff --git a/types/turf/v2/index.d.ts b/types/turf/v2/index.d.ts
deleted file mode 100644
index 529be0afa1..0000000000
--- a/types/turf/v2/index.d.ts
+++ /dev/null
@@ -1,580 +0,0 @@
-// Type definitions for Turf 2.0
-// Project: http://turfjs.org/
-// Definitions by: Guillaume Croteau <https://github.com/gcroteau>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="geojson" />
-
-declare module turf {
-    //////////////////////////////////////////////////////
-    // Aggregation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Calculates a series of aggregations for a set of points within a set of polygons.
-    * Sum, average, count, min, max, and deviation are supported.
-    * @param polygons Polygons with values on which to aggregate
-    * @param points Points to be aggregated
-    * @param aggregations An array of aggregation objects
-    * @returns Polygons with properties listed based on outField values in aggregations
-    */
-    function aggregate(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, aggregations: Array<{aggregation: string, inField: string, outField: string}>): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the average value of a field for a set of points within a set of polygons.
-    * @param polygons Polygons with values on which to average
-    * @param points Points from which to calculate the average
-    * @param field The field in the points features from which to pull values to average
-    * @param outField The field in polygons to put results of the averages
-    * @returns Polygons with the value of outField set to the calculated averages
-    */
-    function average(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, field: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of points and a set of polygons and calculates the number of points that fall within the set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param countField A field to append to the attributes of the Polygon features representing Point counts
-    * @returns Polygons with countField appended
-    */
-    function count(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, countField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the standard deviation value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in points from which to aggregate
-    * @param outField The field to append to polygons representing deviation
-    * @returns Polygons with appended field representing deviation
-    */
-    function deviation(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the maximum value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField values
-    */
-    function max(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the median value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField values
-    */
-    function median(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the minimum value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField values
-    */
-    function min(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the sum of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField
-    */
-    function sum(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the variance value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField
-    */
-    function variance(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Measurement
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a line and returns a point at a specified distance along the line.
-    * @param line Input line
-    * @param distance Distance along the line
-    * @param [units=miles] 'miles', 'kilometers', 'radians' or 'degrees'
-    * @returns Point along the line
-    */
-    function along(line: GeoJSON.Feature<GeoJSON.LineString>, distance: number, units?: string): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes one or more features and returns their area in square meters.
-    * @param input Input features
-    * @returns Area in square meters
-    */
-    function area(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): number;
-
-    /**
-    * Takes a bbox and returns an equivalent polygon.
-    * @param bbox An Array of bounding box coordinates in the form: [xLow, yLow, xHigh, yHigh]
-    * @returns A Polygon representation of the bounding box
-    */
-    function bboxPolygon(bbox: Array<number>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes two points and finds the geographic bearing between them.
-    * @param start Starting Point
-    * @param end Ending point
-    * @returns Bearing in decimal degrees
-    */
-    function bearing(start: GeoJSON.Feature<GeoJSON.Point>, end: GeoJSON.Feature<GeoJSON.Point>): number;
-
-    /**
-    * Takes a FeatureCollection and returns the absolute center point of all features.
-    * @param features Input features
-    * @returns A Point feature at the absolute center point of all input features
-    */
-    function center(features: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes one or more features and calculates the centroid using the arithmetic mean of all vertices.
-    * This lessens the effect of small islands and artifacts when calculating the centroid of a set of polygons.
-    * @param features Input features
-    * @returns The centroid of the input features
-    */
-    function centroid(features: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a Point and calculates the location of a destination point given a distance in degrees, radians, miles, or kilometers; and bearing in degrees.
-    * This uses the Haversine formula to account for global curvature.
-    * @param start Starting point
-    * @param distance Distance from the starting point
-    * @param bearing Ranging from -180 and 180
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Destination point
-    */
-    function destination(start: GeoJSON.Feature<GeoJSON.Point>, distance: number, bearing: number, units: string): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Calculates the distance between two points in degress, radians, miles, or kilometers.
-    * This uses the Haversine formula to account for global curvature.
-    * @param from Origin point
-    * @param to Destination point
-    * @param [units=kilometers] 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Distance between the two points
-    */
-    function distance(from: GeoJSON.Feature<GeoJSON.Point>, to: GeoJSON.Feature<GeoJSON.Point>, units?: string): number;
-
-    /**
-    * Takes any number of features and returns a rectangular Polygon that encompasses all vertices.
-    * @param fc Input features
-    * @returns A rectangular Polygon feature that encompasses all vertices
-    */
-    function envelope(fc: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of features, calculates the extent of all input features, and returns a bounding box.
-    * @param input Input features
-    * @returns The bounding box of input given as an array in WSEN order (west, south, east, north)
-    */
-    function extent(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): Array<number>;
-
-    /**
-    * Takes a line and measures its length in the specified units.
-    * @param line Line to measure
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Length of the input line
-    */
-    function lineDistance(line: GeoJSON.Feature<GeoJSON.LineString>, units: string): number;
-
-    /**
-    * Takes two points and returns a point midway between them.
-    * @param pt1 First point
-    * @param pt2 Second point
-    * @returns A point midway between pt1 and pt2
-    */
-    function midpoint(pt1: GeoJSON.Feature<GeoJSON.Point>, pt2: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a feature and returns a Point guaranteed to be on the surface of the feature. Given a Polygon, the point will be in the area of the polygon.
-    * Given a LineString, the point will be along the string. Given a Point, the point will the same as the input.
-    * @param input Any feature or set of features
-    * @returns A point on the surface of input
-    */
-    function pointOnSurface(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any>;
-
-    /**
-    * Takes a bounding box and returns a new bounding box with a size expanded or contracted by a factor of X.
-    * @param bbox A bounding box
-    * @param factor The ratio of the new bbox to the input bbox
-    * @returns The resized bbox
-    */
-    function size(bbox: Array<number>, factor: number): Array<number>;
-
-    /**
-    * Takes a bounding box and calculates the minimum square bounding box that would contain the input.
-    * @param bbox A bounding box
-    * @returns A square surrounding bbox
-    */
-    function square(bbox: Array<number>): Array<number>;
-
-    //////////////////////////////////////////////////////
-    // Transformation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a line and returns a curved version by applying a Bezier spline algorithm.
-    * The bezier spline implementation is by Leszek Rybicki.
-    * @param line Input LineString
-    * @param [resolution=10000] Time in milliseconds between points
-    * @param [sharpness=0.85] A measure of how curvy the path should be between splines
-    * @returns Curved line
-    */
-    function bezier(line: GeoJSON.Feature<GeoJSON.LineString>, resolution?: number, sharpness?: number): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Calculates a buffer for input features for a given radius. Units supported are miles, kilometers, and degrees.
-    * @param feature Input to be buffered
-    * @param distance Distance to draw the buffer
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Buffered features
-    */
-    function buffer(feature: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>, distance: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon> | GeoJSON.FeatureCollection<GeoJSON.MultiPolygon> | GeoJSON.Polygon | GeoJSON.MultiPolygon;
-
-    /**
-    * Takes a set of points and returns a concave hull polygon. Internally, this implements a Monotone chain algorithm.
-    * @param points Input points
-    * @param maxEdge The size of an edge necessary for part of the hull to become concave (in miles)
-    * @param units Used for maxEdge distance (miles or kilometers)
-    * @returns A concave hull
-    */
-    function concave(points: GeoJSON.FeatureCollection<GeoJSON.Point>, maxEdge: number, units: string): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of points and returns a convex hull polygon. Internally this uses the convex-hull module that implements a monotone chain hull.
-    * @param input Input points
-    * @returns A convex hull
-    */
-    function convex(input: GeoJSON.FeatureCollection<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Finds the difference between two polygons by clipping the second polygon from the first.
-    * @param poly1 Input Polygon feaure
-    * @param poly2 Polygon feature to difference from poly1
-    * @returns A Polygon feature showing the area of poly1 excluding the area of poly2
-    */
-    function difference(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes two polygons and finds their intersection.
-    *  If they share a border, returns the border; if they don't intersect, returns undefined.
-    * @param poly1 The first polygon
-    * @param poly2 The second polygon
-    * @returns If poly1 and poly2 overlap, returns a Polygon feature representing the area they overlap;
-    * if poly1 and poly2 do not overlap, returns undefined;
-    * if poly1 and poly2 share a border, a MultiLineString of the locations where their borders are shared
-    */
-    function intersect(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiLineString> | typeof undefined;
-
-    /**
-    * Takes a set of polygons and returns a single merged polygon feature.
-    * If the input polygon features are not contiguous, this function returns a MultiPolygon feature.
-    * @param fc Input polygons
-    * @returns Merged polygon or multipolygon
-    */
-    function merge(fc: GeoJSON.FeatureCollection<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiPolygon>;
-
-    /**
-    * Takes a LineString or Polygon and returns a simplified version.
-    * Internally uses simplify-js to perform simplification.
-    * @param feature Feature to be simplified
-    * @param tolerance Simplification tolerance
-    * @param highQuality Whether or not to spend more time to create a higher-quality simplification with a different algorithm
-    * @returns A simplified feature
-    */
-    function simplify(feature: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection, tolerance: number, highQuality: boolean): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection;
-
-    /**
-    * Takes two polygons and returns a combined polygon.
-    * If the input polygons are not contiguous, this function returns a MultiPolygon feature.
-    * @param poly1 Input polygon
-    * @param poly2 Another input polygon
-    * @returns A combined Polygon or MultiPolygon feature
-    */
-    function union(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiPolygon>;
-
-    //////////////////////////////////////////////////////
-    // Misc
-    //////////////////////////////////////////////////////
-
-    /**
-    * Combines a FeatureCollection of Point, LineString, or Polygon features into MultiPoint, MultiLineString, or MultiPolygon features.
-    * @param fc A FeatureCollection of any type
-    * @returns A FeatureCollection of corresponding type to input
-    */
-    function combine(fc: GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a feature or set of features and returns all positions as points.
-    * @param input Input features
-    * @returns Points representing the exploded input features
-    */
-    function explode(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes input features and flips all of their coordinates from [x, y] to [y, x].
-    * @param input Input features
-    * @returns A feature or set of features of the same type as input with flipped coordinates
-    */
-    function flip(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a polygon and returns points at all self-intersections.
-    * @param polygon Input polygon
-    * @returns Self-intersections
-    */
-    function kinks(polygon: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a line, a start Point, and a stop point and returns the line in between those points.
-    * @param point1 Starting point
-    * @param point2 Stopping point
-    * @param line Line to slice
-    * @returns Sliced line
-    */
-    function lineSlice(point1: GeoJSON.Feature<GeoJSON.Point>, point2: GeoJSON.Feature<GeoJSON.Point>, line: GeoJSON.Feature<GeoJSON.LineString>): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Takes a Point and a LineString and calculates the closest Point on the LineString.
-    * @param line Line to snap to
-    * @param point Point to snap from
-    * @returns Closest point on the line to point
-    */
-    function pointOnLine(line: GeoJSON.Feature<GeoJSON.LineString>, point: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    //////////////////////////////////////////////////////
-    // Helper
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes one or more Features and creates a FeatureCollection.
-    * @param features Input features
-    * @returns A FeatureCollection of input features
-    */
-    function featurecollection(features: Array<GeoJSON.Feature<any>>): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Creates a LineString based on a coordinate array. Properties can be added optionally.
-    * @param coordinates An array of Positions
-    * @param [properties] An Object of key-value pairs to add as properties
-    * @returns A LineString feature
-    */
-    function linestring(coordinates: Array<Array<number>>, properties?: any): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Takes coordinates and properties (optional) and returns a new Point feature.
-    * @param coordinates Longitude, latitude position (each in decimal degrees)
-    * @param [properties] An Object of key-value pairs to add as properties
-    * @returns A Point feature
-    */
-    function point(coordinates: Array<number>, properties?: any): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes an array of LinearRings and optionally an Object with properties and returns a Polygon feature.
-    * @param rings An array of LinearRings
-    * @param [properties] An Object of key-value pairs to add as properties
-    * @returns A Polygon feature
-    */
-    function polygon(rings: Array<Array<Array<number>>>, properties?: any): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Data
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a FeatureCollection and filters it by a given property and value.
-    * @param features Input features
-    * @param key The property on which to filter
-    * @param value The value of that property on which to filter
-    * @returns A filtered collection with only features that match input key and value
-    */
-    function filter(features: GeoJSON.FeatureCollection<any>, key: string, value: string): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Generates random GeoJSON data, including Points and Polygons, for testing and experimentation.
-    * @param [type='point'] Type of features desired: 'points' or 'polygons'
-    * @param [count=1] How many geometries should be generated.
-    * @param [options] Options relevant to the feature desired. Can include:
-    *   - A bounding box inside of which geometries are placed. In the case of Point features, they are guaranteed to be within this bounds, while Polygon features have their centroid within the bounds.
-    *   - The number of vertices added to polygon features. Default is 10;
-    *   - The total number of decimal degrees longitude or latitude that a polygon can extent outwards to from its center. Default is 10.
-    * @returns Generated random features
-    */
-    function random(type?: string, count?: number, options?: {bbox?: Array<number>; num_vertices?: number; max_radial_length?: number;}): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a FeatureCollection of any type, a property, and a value and returns a FeatureCollection with features matching that property-value pair removed.
-    * @param features Set of input features
-    * @param property The property to remove
-    * @param value The value to remove
-    * @returns The resulting FeatureCollection without features that match the property-value pair
-    */
-    function remove(features: GeoJSON.FeatureCollection<any>, property: string, value: string): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a FeatureCollection and returns a FeatureCollection with given number of features at random.
-    * @param features Set of input features
-    * @param n Number of features to select
-    * @returns A FeatureCollection with n features
-    */
-    function sample(features: GeoJSON.FeatureCollection<any>, n: number): GeoJSON.FeatureCollection<any>;
-
-    //////////////////////////////////////////////////////
-    // Interpolation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a bounding box and a cell size in degrees and returns a FeatureCollection of flat-topped hexagons (Polygon features) aligned in an "odd-q" vertical grid as described in Hexagonal Grids.
-    * @param bbox Bounding box in [minX, minY, maxX, maxY] order
-    * @param cellWidth Width of cell in specified units
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns A hexagonal grid
-    */
-    function hexGrid(bbox: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes points with z-values and an array of value breaks and generates isolines.
-    * @param points Input points
-    * @param z The property name in points from which z-values will be pulled
-    * @param resolution Resolution of the underlying grid
-    * @param breaks Where to draw contours
-    * @returns Isolines
-    */
-    function isolines(points: GeoJSON.FeatureCollection<GeoJSON.Point>, z: string, resolution: number, breaks: Array<number>): GeoJSON.FeatureCollection<GeoJSON.LineString>;
-
-    /**
-    * Takes a triangular plane as a Polygon and a Point within that triangle and returns the z-value at that point.
-    * The Polygon needs to have properties a, b, and c that define the values at its three corners.
-    * @param interpolatedPoint The Point for which a z-value will be calculated
-    * @param triangle A Polygon feature with three vertices
-    * @returns The z-value for interpolatedPoint
-    */
-    function planepoint(interpolatedpoint: GeoJSON.Feature<GeoJSON.Point>, triangle: GeoJSON.Feature<GeoJSON.Polygon>): number;
-
-    /**
-    * Takes a bounding box and a cell depth and returns a set of points in a grid.
-    * @param extent Extent in [minX, minY, maxX, maxY] order
-    * @param cellWidth The distance across each cell
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns Grid of points
-    */
-    function pointGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a bounding box and a cell depth and returns a set of square polygons in a grid.
-    * @param extent Extent in [minX, minY, maxX, maxY] order
-    * @param cellWidth Width of each cell
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns Grid of polygons
-    */
-    function squareGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of points and the name of a z-value property and creates a Triangulated Irregular Network, or a TIN for short, returned as a collection of Polygons.
-    * These are often used for developing elevation contour maps or stepped heat visualizations.
-    * This triangulates the points, as well as adds properties called a, b, and c representing the value of the given propertyName at each of the points that represent the corners of the triangle.
-    * @param points Input points
-    * @param [propertyName] Name of the property from which to pull z values This is optional: if not given, then there will be no extra data added to the derived triangles.
-    * @returns TIN output
-    */
-    function tin(points: GeoJSON.FeatureCollection<GeoJSON.Point>, propertyName?: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes a bounding box and a cell depth and returns a set of triangular polygons in a grid.
-    * @param extent Extent in [minX, minY, maxX, maxY] order
-    * @param cellWidth Width of each cell
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns Grid of triangles
-    */
-    function triangleGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Joins
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a Point and a Polygon or MultiPolygon and determines if the point resides inside the polygon.
-    * The polygon can be convex or concave. The function accounts for holes.
-    * @param point Input point
-    * @param polygon Input polygon or multipolygon
-    * @returns true if the Point is inside the Polygon; false if the Point is not inside the Polygon
-    */
-    function inside(point: GeoJSON.Feature<GeoJSON.Point>, polygon: GeoJSON.Feature<GeoJSON.Polygon>): boolean;
-
-    /**
-    * Takes a set of points and a set of polygons and performs a spatial join.
-    * @param points Input points
-    * @param polygons Input polygons
-    * @param polyId Property in polygons to add to joined Point features
-    * @param containingPolyId Property in points in which to store joined property from polygons
-    * @returns Points with containingPolyId property containing values from polyId
-    */
-    function tag(points: GeoJSON.FeatureCollection<GeoJSON.Point>, polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, polyId: string, containingPolyId: string): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a set of points and a set of polygons and returns the points that fall within the polygons.
-    * @param points Input points
-    * @param polygons Input polygons
-    * @returns Points that land within at least one polygon
-    */
-    function within(points: GeoJSON.FeatureCollection<GeoJSON.Point>, polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    //////////////////////////////////////////////////////
-    // Classification
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a set of features and returns an array of the Jenks Natural breaks for a given property.
-    * @param input Input features
-    * @param field The property in input on which to calculate Jenks natural breaks
-    * @param numberOfBreaks Number of classes in which to group the data
-    * @returns The break number for each class plus the minimum and maximum values
-    */
-    function jenks(input: GeoJSON.FeatureCollection<any>, field: string, numberOfBreaks: number): Array<number>;
-
-    /**
-    * Takes a reference point and a set of points and returns the point from the set closest to the reference.
-    * @param point The reference point
-    * @param against Input point set
-    * @returns The closest point in the set to the reference point
-    */
-    function nearest(point: GeoJSON.Feature<GeoJSON.Point>, against: GeoJSON.FeatureCollection<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a FeatureCollection, a property name, and a set of percentiles and returns a quantile array.
-    * @param input Set of features
-    * @param field The property in input from which to retrieve quantile values
-    * @param percentiles An Array of percentiles on which to calculate quantile values
-    * @returns An array of the break values
-    */
-    function quantile(input: GeoJSON.FeatureCollection<any>, field: string, percentiles: Array<number>): Array<number>;
-
-    /**
-    * Takes a FeatureCollection, an input field, an output field, and an array of translations and outputs an identical FeatureCollection with the output field property populated.
-    * @param input Set of input features
-    * @param inField The field to translate
-    * @param outField The field in which to store translated results
-    * @param translations An array of translations
-    * @returns A FeatureCollection with identical geometries to input but with outField populated.
-    */
-    function reclass(input: GeoJSON.FeatureCollection<any>, inField: string, outField: string, translations: Array<any>): GeoJSON.FeatureCollection<any>;
-}
-
-declare module 'turf' {
-  export= turf;
-}
diff --git a/types/turf/v2/tsconfig.json b/types/turf/v2/tsconfig.json
deleted file mode 100644
index ce4a40bcfa..0000000000
--- a/types/turf/v2/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "types": [],
-        "paths": {
-            "turf": [
-                "turf/v2"
-            ]
-        },
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "turf-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/turf/v2/turf-tests.ts b/types/turf/v2/turf-tests.ts
deleted file mode 100644
index 22e36aa4ec..0000000000
--- a/types/turf/v2/turf-tests.ts
+++ /dev/null
@@ -1,520 +0,0 @@
-///////////////////////////////////////////
-// Tests data initialisation
-///////////////////////////////////////////
-
-var point1: GeoJSON.Feature<GeoJSON.Point> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Point",
-    "coordinates": [-75.343, 39.984]
-  }
-};
-
-var point2: GeoJSON.Feature<GeoJSON.Point> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Point",
-    "coordinates": [-75.534, 39.123]
-    }
-};
-
-var line: GeoJSON.Feature<GeoJSON.LineString> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "LineString",
-    "coordinates": [
-      [-77.031669, 38.878605],
-      [-77.029609, 38.881946],
-      [-77.020339, 38.884084],
-      [-77.025661, 38.885821],
-      [-77.021884, 38.889563],
-      [-77.019824, 38.892368]
-    ]
-  }
-};
-
-var polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon> = {
-  "type": "FeatureCollection",
-  "features": [
-    {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [[
-          [-67.031021, 10.458102],
-          [-67.031021, 10.53372],
-          [-66.929397, 10.53372],
-          [-66.929397, 10.458102],
-          [-67.031021, 10.458102]
-        ]]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [[
-          [-66.919784, 10.397325],
-          [-66.919784, 10.513467],
-          [-66.805114, 10.513467],
-          [-66.805114, 10.397325],
-          [-66.919784, 10.397325]
-        ]]
-      }
-    }
-  ]
-};
-
-var polygon1: GeoJSON.Feature<GeoJSON.Polygon> = {
-  "type": "Feature",
-  "properties": {},
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [[
-      [105.818939,21.004714],
-      [105.818939,21.061754],
-      [105.890007,21.061754],
-      [105.890007,21.004714],
-      [105.818939,21.004714]
-    ]]
-  }
-};
-
-var polygon2: GeoJSON.Feature<GeoJSON.Polygon> = {
-  "type": "Feature",
-  "properties": {
-    "fill": "#00f"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [[
-      [-122.520217, 45.535693],
-      [-122.64038, 45.553967],
-      [-122.720031, 45.526554],
-      [-122.669906, 45.507309],
-      [-122.723464, 45.446643],
-      [-122.532577, 45.408574],
-      [-122.487258, 45.477466],
-      [-122.520217, 45.535693]
-    ]]
-  }
-}
-
-var features: GeoJSON.FeatureCollection<GeoJSON.Point> = {
-  "type": "FeatureCollection",
-  "features": [
-    {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.522259, 35.4691]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.502754, 35.463455]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.508269, 35.463245]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.516809, 35.465779]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.515372, 35.467072]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.509363, 35.463053]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.511123, 35.466601]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.518547, 35.469327]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.519706, 35.469659]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.517839, 35.466998]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.508678, 35.464942]
-      }
-    }, {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "type": "Point",
-        "coordinates": [-97.514914, 35.463453]
-      }
-    }
-  ]
-};
-
-var triangle: GeoJSON.Feature<GeoJSON.Polygon> = {
-  "type": "Feature",
-  "properties": {
-    "a": 11,
-    "b": 122,
-    "c": 44
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [[
-      [-75.1221, 39.57],
-      [-75.58, 39.18],
-      [-75.97, 39.86],
-      [-75.1221, 39.57]
-    ]]
-  }
-};
-
-var aggregations = [
-  {
-    aggregation: 'sum',
-    inField: 'population',
-    outField: 'pop_sum'
-  },
-  {
-    aggregation: 'average',
-    inField: 'population',
-    outField: 'pop_avg'
-  },
-  {
-    aggregation: 'median',
-    inField: 'population',
-    outField: 'pop_median'
-  },
-  {
-    aggregation: 'min',
-    inField: 'population',
-    outField: 'pop_min'
-  },
-  {
-    aggregation: 'max',
-    inField: 'population',
-    outField: 'pop_max'
-  },
-  {
-    aggregation: 'deviation',
-    inField: 'population',
-    outField: 'pop_deviation'
-  },
-  {
-    aggregation: 'variance',
-    inField: 'population',
-    outField: 'pop_variance'
-  },
-  {
-    aggregation: 'count',
-    inField: '',
-    outField: 'point_count'
-  }
-];
-
-///////////////////////////////////////////
-// Tests Aggregation
-///////////////////////////////////////////
-
-// -- Test aggregate --
-var aggregated = turf.aggregate(polygons, points, aggregations);
-
-// -- Test average --
-var averaged = turf.average(polygons, points, 'population', 'pop_avg');
-
-// -- Test count --
-var counted = turf.count(polygons, points, 'pt_count');
-
-// -- Test deviation --
-var deviated = turf.deviation(polygons, points, 'population', 'pop_deviation');
-
-// -- Test max --
-var aggregated = turf.max(polygons, points, 'population', 'max');
-
-// -- Test median --
-var medians = turf.median(polygons, points, 'population', 'median');
-
-// -- Test min --
-var minimums = turf.min(polygons, points, 'population', 'min');
-
-// -- Test sum --
-var summed = turf.sum(polygons, points, 'population', 'sum');
-
-// -- Test variance --
-var varianced = turf.variance(polygons, points, 'population', 'variance');
-
-///////////////////////////////////////////
-// Tests Measurement
-///////////////////////////////////////////
-
-// -- Test along --
-var along = turf.along(line, 1, 'miles');
-
-// -- Test area --
-var area = turf.area(polygons);
-
-// -- Test bboxPolygon --
-var bbox = [0, 0, 10, 10];
-var poly = turf.bboxPolygon(bbox);
-
-// -- Test bearing --
-var bearing = turf.bearing(point1, point2);
-
-// -- Test center
-var centerPt = turf.center(features);
-
-// -- Test centroid --
-var centroidPt = turf.centroid(polygon1);
-
-// -- Test destination --
-var distance = 50;
-var bearing = 90;
-var units = 'miles';
-var destination = turf.destination(point1, distance, bearing, units);
-
-// -- Test distance --
-var units = "miles";
-var distance = turf.distance(point1, point2, units);
-
-// -- Test envelope --
-var enveloped = turf.envelope(polygons);
-
-// -- Test extent --
-var bbox = turf.extent(polygons);
-
-// -- Test lineDistance
-var length = turf.lineDistance(line, 'miles');
-
-// -- Test midpoint --
-var midpointed = turf.midpoint(point1, point2);
-
-// -- Test pointOnSurface --
-var pointOnPolygon = turf.pointOnSurface(polygon1);
-
-// -- Test size --
-var resized = turf.size(bbox, 2);
-
-// -- Test square --
-var squared = turf.square(bbox);
-
-///////////////////////////////////////////
-// Tests Transformation
-///////////////////////////////////////////
-
-// -- Test bezier --
-var curved = turf.bezier(line);
-
-// -- Test buffer --
-var buffered = turf.buffer(point1, 500, units);
-
-// -- Test concave --
-var hull = turf.concave(features, 1, 'miles');
-
-// -- Test convex --
-var hull = turf.convex(features);
-
-// -- Test difference --
-var differenced = turf.difference(polygon1, polygon2);
-
-// -- Test intersect --
-var intersection = turf.intersect(polygon1, polygon2);
-
-// -- Test merge --
-var merged = turf.merge(polygons);
-
-// -- Test simplify --
-var tolerance = 0.01;
-var simplified = turf.simplify(polygon1, tolerance, false);
-
-// -- Test union --
-var union = turf.union(polygon1, polygon2);
-
-///////////////////////////////////////////
-// Tests Misc
-///////////////////////////////////////////
-
-// -- Test combine --
-var combined = turf.combine(features);
-
-// -- Test explode --
-var points = turf.explode(polygon1);
-
-// -- Test flip --
-var flipedPoint = turf.flip(point1);
-
-// -- Test kinks --
-var kinks = turf.kinks(polygon1);
-
-// -- Test lineSlice --
-var sliced = turf.lineSlice(point1, point2, line);
-
-// -- Test pointOnLine --
-var snapped = turf.pointOnLine(line, point1);
-
-///////////////////////////////////////////
-// Tests Helper
-///////////////////////////////////////////
-
-// -- Test featurecollection --
-var fc = turf.featurecollection([point1, point2]);
-
-// -- Test linestring --
-var linestring1 = turf.linestring([
-	[-21.964416, 64.148203],
-	[-21.956176, 64.141316],
-	[-21.93901, 64.135924],
-	[-21.927337, 64.136673]
-]);
-var linestring2 = turf.linestring([
-	[-21.929054, 64.127985],
-	[-21.912918, 64.134726],
-	[-21.916007, 64.141016],
-	[-21.930084, 64.14446]
-], {name: 'line 1', distance: 145});
-
-// -- Test point --
-var pt1 = turf.point([-75.343, 39.984]);
-var pt2 = turf.point([-75.343, 39.984], {name: 'point 1', distance: 145});
-
-// -- Test polygon --
-var polygon = turf.polygon([[
- [-2.275543, 53.464547],
- [-2.275543, 53.489271],
- [-2.215118, 53.489271],
- [-2.215118, 53.464547],
- [-2.275543, 53.464547]
-]], { name: 'poly1', population: 400});
-
-///////////////////////////////////////////
-// Tests Data
-///////////////////////////////////////////
-
-// -- Test filter --
-var key = "species";
-var value = "oak";
-var filtered = turf.filter(features, key, value);
-
-// -- Test random --
-var randomPoints = turf.random('points', 100, {
-  bbox: [-70, 40, -60, 60]
-});
-
-var randomPoints = turf.random('points', 100, {
-  bbox: [-70, 40, -60, 60],
-  num_vertices: 2,
-  max_radial_length: 10
-});
-
-// -- Test remove --
-var filtered = turf.remove(points, 'marker-color', '#00f');
-
-// -- Test sample --
-var randomPoints = turf.random('points', 1000);
-var sample = turf.sample(points, 10);
-
-///////////////////////////////////////////
-// Tests Interpolation
-///////////////////////////////////////////
-
-// -- Test hexGrid --
-var cellWidth = 50;
-var hexgrid = turf.hexGrid(bbox, cellWidth, units);
-
-// -- Test isolines --
-var breaks = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-var isolined = turf.isolines(points, 'z', 15, breaks);
-
-// -- Test planepoint --
-var zValue = turf.planepoint(point1, triangle);
-
-// -- Test pointGrid --
-var extent = [-70.823364, -33.553984, -70.473175, -33.302986];
-var cellWidth = 3;
-var grid = turf.pointGrid(extent, cellWidth, units);
-
-// -- Test squareGrid --
-var squareGrid = turf.squareGrid(extent, cellWidth, units);
-
-// -- Test tin --
-var tin = turf.tin(points, 'z');
-
-// -- Test triangleGrid --
-var triangleGrid = turf.triangleGrid(extent, cellWidth, units);
-
-///////////////////////////////////////////
-// Tests Joins
-///////////////////////////////////////////
-
-// -- Test inside --
-var isInside1 = turf.inside(point1, polygon);
-
-// -- Test tag --
-var tagged = turf.tag(points, triangleGrid, 'fill', 'marker-color');
-
-// -- Test within --
-var ptsWithin = turf.within(points, polygons);
-
-///////////////////////////////////////////
-// Tests Classification
-///////////////////////////////////////////
-
-// -- Test jenks --
-var breaks = turf.jenks(points, 'population', 3);
-
-// -- Test nearest --
-var nearest = turf.nearest(point1, points);
-
-// -- Test quantile --
-var breaks = turf.quantile(points, 'population', [25, 50, 75, 99]);
-
-// -- Test reclass --
-var translations = [
-  [0, 200, "small"],
-  [200, 400, "medium"],
-  [400, 600, "large"]
-];
-var reclassed = turf.reclass(points, 'population', 'size', translations);
diff --git a/types/tv4/tslint.json b/types/tv4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tv4/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tween.js/tslint.json b/types/tween.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tween.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tweenjs/tslint.json b/types/tweenjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tweenjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/twilio/tslint.json b/types/twilio/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/twilio/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 63ca3b747d..0392ad5526 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -1,7 +1,9 @@
 // Type definitions for twit 2.2
 // Project: https://github.com/ttezel/twit
 // Definitions by: Volox <https://github.com/Volox>
+//                 lostfictions <https://github.com/lostfictions>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="geojson" />
@@ -207,12 +209,22 @@ declare module 'twit' {
         query?: string,
         max_id_str?: string
       }
+
+      export interface Errors {
+        errors: {
+          code: number
+          message: string
+        }[]
+      }
+
+      export interface SearchResults {
+        statuses: Twitter.Status[],
+        search_metadata: Twitter.Metadata,
+      }
     }
 
-    export interface Response {
-      statuses: Twitter.Status[],
-      search_metadata: Twitter.Metadata,
-    }
+    export type Response = object
+
     interface MediaParam {
       file_path: string
     }
@@ -246,10 +258,11 @@ declare module 'twit' {
       lat?: number,
       long?: number,
       follow?: boolean,
+      include_email?: boolean,
     }
     export interface PromiseResponse {
       data: Response,
-      responde: IncomingMessage,
+      resp: IncomingMessage,
     }
     export interface Callback {
       (err: Error, result: Response, response: IncomingMessage): void
diff --git a/types/twit/tslint.json b/types/twit/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/twit/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/twit/twit-tests.ts b/types/twit/twit-tests.ts
index e346771f35..c74f5d6855 100644
--- a/types/twit/twit-tests.ts
+++ b/types/twit/twit-tests.ts
@@ -5,3 +5,9 @@ const t = new Twit( {
   consumer_secret: '',
   app_only_auth: true,
 } );
+
+t.post('statuses/update', { status: 'hello!' }).then(res => {
+    const status = res.data as Twit.Twitter.Status
+    console.log(status.id_str)
+    console.log(res.resp.statusCode)
+})
diff --git a/types/twitter-stream-channels/index.d.ts b/types/twitter-stream-channels/index.d.ts
index 1b72384bf1..789f1d259a 100644
--- a/types/twitter-stream-channels/index.d.ts
+++ b/types/twitter-stream-channels/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/topheman/twitter-stream-channels
 // Definitions by: Adrian Bardan <https://github.com/adrianbardan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="twit" />
diff --git a/types/twitter-stream-channels/tslint.json b/types/twitter-stream-channels/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/twitter-stream-channels/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/twitter-text/index.d.ts b/types/twitter-text/index.d.ts
index accac12333..652f93da51 100644
--- a/types/twitter-text/index.d.ts
+++ b/types/twitter-text/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for twitter-text v1.13.4
+// Type definitions for twitter-text v2.0.0
 // Project: https://github.com/twitter/twitter-text
-// Definitions by: rhysd <https://rhysd.github.io>
+// Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -36,13 +36,17 @@ interface Indices {
     indices: [number, number];
 }
 
+interface Attributes {
+    [name: string]: string | null;
+}
+
 export declare function htmlEscape(text: string): string;
 export declare function splitTags(text: string): string[];
 
 export declare function extractHashtags(text: string): string[];
 export declare function extractHashtagsWithIndices(text: string): HashtagWithIndices[];
 export declare function extractUrls(text: string): string[];
-export declare function extractUrlsWithIndices(text: string): UrlWithIndices[];
+export declare function extractUrlsWithIndices(text: string, options?: {extractUrlsWithoutProtocol: boolean}): UrlWithIndices[];
 export declare function extractMentions(text: string): string[];
 export declare function extractMentionsWithIndices(text: string): MentionWithIndices[];
 export declare function extractMentionsOrListsWithIndices(text: string): MentionOrListWithIndices[];
@@ -69,12 +73,17 @@ export interface AutoLinkOptions {
     usernameClass?: string;
     usernameUrlBase?: string;
     listUrlBase?: string;
-    htmlAttrs?: string;
     invisibleTagAttrs?: string;
     htmlEscapeNonEntities?: boolean;
     targetBlank?: boolean;
     suppressNoFollow?: boolean;
     urlEntities?: UrlEntity[];
+    usernameIncludeSymbol?: boolean;
+    linkAttributeBlock?: (entity: EntityWithIndices, attributes: Attributes) => void;
+    linkTextBlock?: (entity: EntityWithIndices, text: string) => void;
+    symbolTag?: string;
+    textWithSymbolTag?: string;
+    htmlAttrs?: Attributes;
 }
 
 export declare function autoLink(text: string, options?: AutoLinkOptions): string;
@@ -103,3 +112,28 @@ export declare function getUnicodeTextLength(text: string): number;
 export declare function convertUnicodeIndices(text: string, entities: EntityWithIndices[], indicesInUTF16?: boolean): void;
 
 export declare function hitHighlight(text: string, hits?: number[][], options?: { tag: string }): string;
+
+export interface ParseTweetOptions {
+    version?: number;
+    maxWeightedTweetLength?: number;
+    scale?: number;
+    defaultWeight?: number;
+    transformedURLLength?: number;
+    ranges?: Array<{
+        start: number;
+        end: number;
+        weight: number;
+    }>;
+}
+
+export interface ParsedTweet {
+    weightedLength: number;
+    permillage: number;
+    valid: boolean;
+    displayRangeEnd: number;
+    displayRangeStart: number;
+    validRangeEnd: number;
+    validRangeStart: number;
+}
+
+export declare function parseTweet(text: string, options?: ParseTweetOptions): ParsedTweet;
diff --git a/types/twitter-text/tslint.json b/types/twitter-text/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/twitter-text/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/twitter-text/twitter-text-tests.ts b/types/twitter-text/twitter-text-tests.ts
index c1cc0917e0..fdf816ec8f 100644
--- a/types/twitter-text/twitter-text-tests.ts
+++ b/types/twitter-text/twitter-text-tests.ts
@@ -42,6 +42,7 @@ result = twitter.autoLinkUsernamesOrLists(text);
 result = twitter.autoLinkHashtags(text);
 result = twitter.autoLinkCashtags(text);
 result = twitter.autoLinkUrlsCustom(text, {targetBlank: true, suppressNoFollow: true});
+result = twitter.autoLinkUrlsCustom(text, {usernameIncludeSymbol: true, linkTextBlock: (entity, text) => {}});
 
 const len: number = twitter.getTweetLength(text);
 
@@ -59,3 +60,6 @@ const linked: string = twitter.autoLink("link @user, and expand url... http://t.
     ]});
 
 const usernames: string[] = twitter.extractMentions("Mentioning @twitter and @jack");
+
+const tweet = twitter.parseTweet('foo');
+const tweetWithOptions = twitter.parseTweet('foo', {maxWeightedTweetLength: 140});
diff --git a/types/twitter/tslint.json b/types/twitter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/twitter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/twix/package.json b/types/twix/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/twix/package.json
+++ b/types/twix/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/twix/tslint.json b/types/twix/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/twix/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/type-check/tslint.json b/types/type-check/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/type-check/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/type-detect/tslint.json b/types/type-detect/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/type-detect/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/type-is/index.d.ts b/types/type-is/index.d.ts
index 69b585e093..9fffd0bb9a 100644
--- a/types/type-is/index.d.ts
+++ b/types/type-is/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jshttp/type-is#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
@@ -12,7 +13,9 @@ declare function typeIs(request: IncomingMessage, types: string[]): string | fal
 declare function typeIs(request: IncomingMessage, ...types: string[]): string | false | null;
 
 declare namespace typeIs {
+    function normalize(type: string): string | false;
     function hasBody(request: IncomingMessage): boolean;
     function is(mediaType: string, types: string[]): string | false;
     function is(mediaType: string, ...types: string[]): string | false;
+    function mimeMatch(expected: false | string, actual: string): boolean;
 }
diff --git a/types/type-name/tslint.json b/types/type-name/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/type-name/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/typeahead/tslint.json b/types/typeahead/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/typeahead/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/typedarray-pool/tslint.json b/types/typedarray-pool/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/typedarray-pool/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/typescript-deferred/tslint.json b/types/typescript-deferred/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/typescript-deferred/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/tz-format/tslint.json b/types/tz-format/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tz-format/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ua-parser-js/tslint.json b/types/ua-parser-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ua-parser-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uglify-js/package.json b/types/uglify-js/package.json
new file mode 100644
index 0000000000..100334a89f
--- /dev/null
+++ b/types/uglify-js/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.1"
+    }
+}
diff --git a/types/uglify-js/tslint.json b/types/uglify-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uglify-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uglifycss/tslint.json b/types/uglifycss/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uglifycss/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ui-grid/tslint.json b/types/ui-grid/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ui-grid/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ui-select/tslint.json b/types/ui-select/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ui-select/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uid-safe/tslint.json b/types/uid-safe/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uid-safe/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uikit/index.d.ts b/types/uikit/index.d.ts
index 3b62df407e..dff8bb8482 100644
--- a/types/uikit/index.d.ts
+++ b/types/uikit/index.d.ts
@@ -14,7 +14,6 @@ declare namespace UIkit {
         show(): void;
         /**
          * Hide the dropdown
-         * @param {boolean} force
          */
         hide(force?: boolean): void;
     }
@@ -101,7 +100,7 @@ declare namespace UIkit {
         hide(): void;
         /**
          * Return if the modal is active on the page
-         * @return {boolean} True if the modal is current active on the page, false otherwise
+         * @return True if the modal is current active on the page, false otherwise
          */
         isActive(): boolean;
     }
@@ -182,42 +181,42 @@ declare namespace UIkit {
     interface Modal {
         /**
          * Create a alert dialog
-         * @param  {string} message The message to display. Can be Html
+         * @param  message The message to display. Can be Html
          */
         alert(message: string): void;
         /**
          * Create a confirm dialog
-         * @param  {string} message The message to display. Can be Html
-         * @param  {ModalOptions} [options={bgclose: true, keyboard: false, modal: false}] The modal options
+         * @param  message The message to display. Can be Html
+         * @param  [options={bgclose: true, keyboard: false, modal: false}] The modal options
          */
         confirm(message: string, options?: ModalOptions): void;
         /**
          * Create a confirm dialog and execute onconfirm on confirmation
-         * @param  {string} message The message to display. Can be Html
-         * @param  {function} onconfirm A function to execute on confirmation
-         * @param  {ModalOptions} [options={bgclose: true, keyboard: false, modal: false}] The modal options
+         * @param  message The message to display. Can be Html
+         * @param  onconfirm A function to execute on confirmation
+         * @param  [options={bgclose: true, keyboard: false, modal: false}] The modal options
          */
         confirm(message: string, onconfirm: () => any, options?: ModalOptions): void;
         /**
          * Create a confirm dialog and execute onconfirm on confirmation and oncancel on cancelation.
-         * @param  {string} message The message to display. Can be Html
-         * @param  {function} onconfirm A function to execute on confirmation
-         * @param  {function} oncancel A function to execute on cancelation
-         * @param  {ModalOptions} [options={bgclose: true, keyboard: false, modal: false}] The modal options
+         * @param  message The message to display. Can be Html
+         * @param  onconfirm A function to execute on confirmation
+         * @param  oncancel A function to execute on cancelation
+         * @param  [options={bgclose: true, keyboard: false, modal: false}] The modal options
          */
         confirm(message: string, onconfirm: () => any, oncancel?: () => any, options?: ModalOptions): void;
         /**
          * Create a prompt dialog, where the user enter information
-         * @param  {string} message The message to display. Can be Html
-         * @param  {string} value   A value to init the input
-         * @param  {function} fn  A function to execute on submission. The function receive the new value as a parameter
-         * @param  {ModalOptions} [options={bgclose: true, keyboard: false, modal: false}] The modal options
+         * @param  message The message to display. Can be Html
+         * @param  value   A value to init the input
+         * @param  fn  A function to execute on submission. The function receive the new value as a parameter
+         * @param  [options={bgclose: true, keyboard: false, modal: false}] The modal options
          */
         prompt(message: string, value: string, onsubmit?: (newValue: string) => any, options?: ModalOptions): void;
         /**
          * Create a modal that blocks the entire page
-         * @param {string} content A content to display. Can be Html
-         * @param  {ModalOptions} [options={bgclose: true, keyboard: false, modal: false}] The modal options
+         * @param content A content to display. Can be Html
+         * @param  [options={bgclose: true, keyboard: false, modal: false}] The modal options
          */
         blockUI(content: string, options?: ModalOptions): ModalElement;
         /**
@@ -260,13 +259,13 @@ declare namespace UIkit {
     interface OffCanvas {
         /**
          * Show an off-canvas matching the passed CSS selector
-         * @param  {string} selector A CSS selector
+         * @param  selector A CSS selector
          */
         show(selector: string): void;
         /**
          * Hide any active offcanvas. Set force to true, if you don't want any
          * animation
-         * @param  {boolean} force When seted to true do not run animations.
+         * @param  force When seted to true do not run animations.
          * @default false
          */
         hide(force?: boolean): void;
@@ -318,8 +317,8 @@ declare namespace UIkit {
     interface LightBox {
         /**
          * Create dynamic lightbox
-         * @param  {LightBoxItem[]} items Group of items on the lightbox
-         * @return {LightBoxElement}           The lightbox element to show
+         * @param  items Group of items on the lightbox
+         * @return           The lightbox element to show
          */
         create(items: LightBoxItem[]): LightBoxElement;
         /**
@@ -371,8 +370,6 @@ declare namespace UIkit {
      * <td>On autocomplete dropdown show</td>
      * </tr>
      * </table>
-     * @param element
-     * @param options
      */
     type AutoComplete = (element: string|JQuery, options?: AutoCompleteOptions) => any;
     interface DatePickerOptions {
@@ -854,7 +851,7 @@ declare namespace UIkit {
         /**
          * Show a notification
          * @param message The html message
-         * @param {string|NotifyOptions} [status] The status or options
+         * @param [status] The status or options
          */
         (message: string, status?: string|NotifyOptions): any;
         /**
diff --git a/types/uinput/index.d.ts b/types/uinput/index.d.ts
new file mode 100644
index 0000000000..8f389ea8ab
--- /dev/null
+++ b/types/uinput/index.d.ts
@@ -0,0 +1,768 @@
+// Type definitions for uinput 1.1
+// Project: https://github.com/santigimeno/node-uinput#readme
+// Definitions by: Florian Richter <https://github.com/Fidge123>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as fs from "fs";
+
+export interface SetupOptions {
+  EV_KEY: any[];
+}
+
+export interface CreateOptions {
+  name: string;
+  id: CreateID;
+}
+
+export interface CreateID {
+  bustype: number;
+  vendor: number;
+  product: number;
+  version: number;
+  ff_effects_max?: number;
+  absmax?: number[];
+  absmin?: number[];
+  absfuzz?: number[];
+  absflat?: number[];
+}
+
+export function setup(
+  options: SetupOptions,
+  callback: (err: Error, stream: fs.WriteStream) => void
+): void;
+export function create(
+  stream: fs.WriteStream,
+  options: CreateOptions,
+  callback: (err: Error) => void
+): void;
+export function send_event(
+  stream: fs.WriteStream,
+  typeParam: number,
+  code: number,
+  value: number,
+  callback: (err: Error) => void
+): void;
+export function key_event(
+  stream: fs.WriteStream,
+  code: number,
+  callback: (err: Error) => void
+): void;
+export function emit_combo(
+  stream: fs.WriteStream,
+  codes: number[],
+  callback: (err: Error) => void
+): void;
+
+export const BUS_PCI: number;
+export const BUS_ISAPNP: number;
+export const BUS_USB: number;
+export const BUS_HIL: number;
+export const BUS_BLUETOOTH: number;
+export const BUS_VIRTUAL: number;
+export const BUS_ISA: number;
+export const BUS_I8042: number;
+export const BUS_XTKBD: number;
+export const BUS_RS232: number;
+export const BUS_GAMEPORT: number;
+export const BUS_PARPORT: number;
+export const BUS_AMIGA: number;
+export const BUS_ADB: number;
+export const BUS_I2C: number;
+export const BUS_HOST: number;
+export const BUS_GSC: number;
+export const BUS_ATARI: number;
+export const BUS_SPI: number;
+
+export const KEY_RESERVED: number;
+export const KEY_ESC: number;
+export const KEY_1: number;
+export const KEY_2: number;
+export const KEY_3: number;
+export const KEY_4: number;
+export const KEY_5: number;
+export const KEY_6: number;
+export const KEY_7: number;
+export const KEY_8: number;
+export const KEY_9: number;
+export const KEY_0: number;
+export const KEY_MINUS: number;
+export const KEY_EQUAL: number;
+export const KEY_BACKSPACE: number;
+export const KEY_TAB: number;
+export const KEY_Q: number;
+export const KEY_W: number;
+export const KEY_E: number;
+export const KEY_R: number;
+export const KEY_T: number;
+export const KEY_Y: number;
+export const KEY_U: number;
+export const KEY_I: number;
+export const KEY_O: number;
+export const KEY_P: number;
+export const KEY_LEFTBRACE: number;
+export const KEY_RIGHTBRACE: number;
+export const KEY_ENTER: number;
+export const KEY_LEFTCTRL: number;
+export const KEY_A: number;
+export const KEY_S: number;
+export const KEY_D: number;
+export const KEY_F: number;
+export const KEY_G: number;
+export const KEY_H: number;
+export const KEY_J: number;
+export const KEY_K: number;
+export const KEY_L: number;
+export const KEY_SEMICOLON: number;
+export const KEY_APOSTROPHE: number;
+export const KEY_GRAVE: number;
+export const KEY_LEFTSHIFT: number;
+export const KEY_BACKSLASH: number;
+export const KEY_Z: number;
+export const KEY_X: number;
+export const KEY_C: number;
+export const KEY_V: number;
+export const KEY_B: number;
+export const KEY_N: number;
+export const KEY_M: number;
+export const KEY_COMMA: number;
+export const KEY_DOT: number;
+export const KEY_SLASH: number;
+export const KEY_RIGHTSHIFT: number;
+export const KEY_KPASTERISK: number;
+export const KEY_LEFTALT: number;
+export const KEY_SPACE: number;
+export const KEY_CAPSLOCK: number;
+export const KEY_F1: number;
+export const KEY_F2: number;
+export const KEY_F3: number;
+export const KEY_F4: number;
+export const KEY_F5: number;
+export const KEY_F6: number;
+export const KEY_F7: number;
+export const KEY_F8: number;
+export const KEY_F9: number;
+export const KEY_F10: number;
+export const KEY_NUMLOCK: number;
+export const KEY_SCROLLLOCK: number;
+export const KEY_KP7: number;
+export const KEY_KP8: number;
+export const KEY_KP9: number;
+export const KEY_KPMINUS: number;
+export const KEY_KP4: number;
+export const KEY_KP5: number;
+export const KEY_KP6: number;
+export const KEY_KPPLUS: number;
+export const KEY_KP1: number;
+export const KEY_KP2: number;
+export const KEY_KP3: number;
+export const KEY_KP0: number;
+export const KEY_KPDOT: number;
+export const KEY_ZENKAKUHANKAKU: number;
+export const KEY_102ND: number;
+export const KEY_F11: number;
+export const KEY_F12: number;
+export const KEY_RO: number;
+export const KEY_KATAKANA: number;
+export const KEY_HIRAGANA: number;
+export const KEY_HENKAN: number;
+export const KEY_KATAKANAHIRAGANA: number;
+export const KEY_MUHENKAN: number;
+export const KEY_KPJPCOMMA: number;
+export const KEY_KPENTER: number;
+export const KEY_RIGHTCTRL: number;
+export const KEY_KPSLASH: number;
+export const KEY_SYSRQ: number;
+export const KEY_RIGHTALT: number;
+export const KEY_LINEFEED: number;
+export const KEY_HOME: number;
+export const KEY_UP: number;
+export const KEY_PAGEUP: number;
+export const KEY_LEFT: number;
+export const KEY_RIGHT: number;
+export const KEY_END: number;
+export const KEY_DOWN: number;
+export const KEY_PAGEDOWN: number;
+export const KEY_INSERT: number;
+export const KEY_DELETE: number;
+export const KEY_MACRO: number;
+export const KEY_MUTE: number;
+export const KEY_VOLUMEDOWN: number;
+export const KEY_VOLUMEUP: number;
+export const KEY_POWER: number;
+export const KEY_KPEQUAL: number;
+export const KEY_KPPLUSMINUS: number;
+export const KEY_PAUSE: number;
+export const KEY_SCALE: number;
+export const KEY_KPCOMMA: number;
+export const KEY_HANGEUL: number;
+export const KEY_HANJA: number;
+export const KEY_YEN: number;
+export const KEY_LEFTMETA: number;
+export const KEY_RIGHTMETA: number;
+export const KEY_COMPOSE: number;
+export const KEY_STOP: number;
+export const KEY_AGAIN: number;
+export const KEY_PROPS: number;
+export const KEY_UNDO: number;
+export const KEY_FRONT: number;
+export const KEY_COPY: number;
+export const KEY_OPEN: number;
+export const KEY_PASTE: number;
+export const KEY_FIND: number;
+export const KEY_CUT: number;
+export const KEY_HELP: number;
+export const KEY_MENU: number;
+export const KEY_CALC: number;
+export const KEY_SETUP: number;
+export const KEY_SLEEP: number;
+export const KEY_WAKEUP: number;
+export const KEY_FILE: number;
+export const KEY_SENDFILE: number;
+export const KEY_DELETEFILE: number;
+export const KEY_XFER: number;
+export const KEY_PROG1: number;
+export const KEY_PROG2: number;
+export const KEY_WWW: number;
+export const KEY_MSDOS: number;
+export const KEY_COFFEE: number;
+export const KEY_ROTATE_DISPLAY: number;
+export const KEY_CYCLEWINDOWS: number;
+export const KEY_MAIL: number;
+export const KEY_BOOKMARKS: number;
+export const KEY_COMPUTER: number;
+export const KEY_BACK: number;
+export const KEY_FORWARD: number;
+export const KEY_CLOSECD: number;
+export const KEY_EJECTCD: number;
+export const KEY_EJECTCLOSECD: number;
+export const KEY_NEXTSONG: number;
+export const KEY_PLAYPAUSE: number;
+export const KEY_PREVIOUSSONG: number;
+export const KEY_STOPCD: number;
+export const KEY_RECORD: number;
+export const KEY_REWIND: number;
+export const KEY_PHONE: number;
+export const KEY_ISO: number;
+export const KEY_CONFIG: number;
+export const KEY_HOMEPAGE: number;
+export const KEY_REFRESH: number;
+export const KEY_EXIT: number;
+export const KEY_MOVE: number;
+export const KEY_EDIT: number;
+export const KEY_SCROLLUP: number;
+export const KEY_SCROLLDOWN: number;
+export const KEY_KPLEFTPAREN: number;
+export const KEY_KPRIGHTPAREN: number;
+export const KEY_NEW: number;
+export const KEY_REDO: number;
+export const KEY_F13: number;
+export const KEY_F14: number;
+export const KEY_F15: number;
+export const KEY_F16: number;
+export const KEY_F17: number;
+export const KEY_F18: number;
+export const KEY_F19: number;
+export const KEY_F20: number;
+export const KEY_F21: number;
+export const KEY_F22: number;
+export const KEY_F23: number;
+export const KEY_F24: number;
+export const KEY_PLAYCD: number;
+export const KEY_PAUSECD: number;
+export const KEY_PROG3: number;
+export const KEY_PROG4: number;
+export const KEY_DASHBOARD: number;
+export const KEY_SUSPEND: number;
+export const KEY_CLOSE: number;
+export const KEY_PLAY: number;
+export const KEY_FASTFORWARD: number;
+export const KEY_BASSBOOST: number;
+export const KEY_PRINT: number;
+export const KEY_HP: number;
+export const KEY_CAMERA: number;
+export const KEY_SOUND: number;
+export const KEY_QUESTION: number;
+export const KEY_EMAIL: number;
+export const KEY_CHAT: number;
+export const KEY_SEARCH: number;
+export const KEY_CONNECT: number;
+export const KEY_FINANCE: number;
+export const KEY_SPORT: number;
+export const KEY_SHOP: number;
+export const KEY_ALTERASE: number;
+export const KEY_CANCEL: number;
+export const KEY_BRIGHTNESSDOWN: number;
+export const KEY_BRIGHTNESSUP: number;
+export const KEY_MEDIA: number;
+export const KEY_SWITCHVIDEOMODE: number;
+export const KEY_KBDILLUMTOGGLE: number;
+export const KEY_KBDILLUMDOWN: number;
+export const KEY_KBDILLUMUP: number;
+export const KEY_SEND: number;
+export const KEY_REPLY: number;
+export const KEY_FORWARDMAIL: number;
+export const KEY_SAVE: number;
+export const KEY_DOCUMENTS: number;
+export const KEY_BATTERY: number;
+export const KEY_BLUETOOTH: number;
+export const KEY_WLAN: number;
+export const KEY_UWB: number;
+export const KEY_UNKNOWN: number;
+export const KEY_VIDEO_NEXT: number;
+export const KEY_VIDEO_PREV: number;
+export const KEY_BRIGHTNESS_CYCLE: number;
+export const KEY_BRIGHTNESS_AUTO: number;
+export const KEY_DISPLAY_OFF: number;
+export const KEY_WWAN: number;
+export const KEY_RFKILL: number;
+export const KEY_MICMUTE: number;
+
+export const BTN_MISC: number;
+export const BTN_0: number;
+export const BTN_1: number;
+export const BTN_2: number;
+export const BTN_3: number;
+export const BTN_4: number;
+export const BTN_5: number;
+export const BTN_6: number;
+export const BTN_7: number;
+export const BTN_8: number;
+export const BTN_9: number;
+
+export const BTN_MOUSE: number;
+export const BTN_LEFT: number;
+export const BTN_RIGHT: number;
+export const BTN_MIDDLE: number;
+export const BTN_SIDE: number;
+export const BTN_EXTRA: number;
+export const BTN_FORWARD: number;
+export const BTN_BACK: number;
+export const BTN_TASK: number;
+
+export const BTN_JOYSTICK: number;
+export const BTN_TRIGGER: number;
+export const BTN_THUMB: number;
+export const BTN_THUMB2: number;
+export const BTN_TOP: number;
+export const BTN_TOP2: number;
+export const BTN_PINKIE: number;
+export const BTN_BASE: number;
+export const BTN_BASE2: number;
+export const BTN_BASE3: number;
+export const BTN_BASE4: number;
+export const BTN_BASE5: number;
+export const BTN_BASE6: number;
+export const BTN_DEAD: number;
+
+export const BTN_GAMEPAD: number;
+export const BTN_SOUTH: number;
+export const BTN_EAST: number;
+export const BTN_C: number;
+export const BTN_NORTH: number;
+export const BTN_WEST: number;
+export const BTN_Z: number;
+export const BTN_TL: number;
+export const BTN_TR: number;
+export const BTN_TL2: number;
+export const BTN_TR2: number;
+export const BTN_SELECT: number;
+export const BTN_START: number;
+export const BTN_MODE: number;
+export const BTN_THUMBL: number;
+export const BTN_THUMBR: number;
+
+export const BTN_DIGI: number;
+export const BTN_TOOL_PEN: number;
+export const BTN_TOOL_RUBBER: number;
+export const BTN_TOOL_BRUSH: number;
+export const BTN_TOOL_PENCIL: number;
+export const BTN_TOOL_AIRBRUSH: number;
+export const BTN_TOOL_FINGER: number;
+export const BTN_TOOL_MOUSE: number;
+export const BTN_TOOL_LENS: number;
+export const BTN_TOOL_QUINTTAP: number;
+export const BTN_TOUCH: number;
+export const BTN_STYLUS: number;
+export const BTN_STYLUS2: number;
+export const BTN_TOOL_DOUBLETAP: number;
+export const BTN_TOOL_TRIPLETAP: number;
+export const BTN_TOOL_QUADTAP: number;
+
+export const BTN_WHEEL: number;
+export const BTN_GEAR_DOWN: number;
+export const BTN_GEAR_UP: number;
+
+export const BTN_DPAD_UP: number;
+export const BTN_DPAD_DOWN: number;
+export const BTN_DPAD_LEFT: number;
+export const BTN_DPAD_RIGHT: number;
+
+export const BTN_TRIGGER_HAPPY: number;
+export const BTN_TRIGGER_HAPPY1: number;
+export const BTN_TRIGGER_HAPPY2: number;
+export const BTN_TRIGGER_HAPPY3: number;
+export const BTN_TRIGGER_HAPPY4: number;
+export const BTN_TRIGGER_HAPPY5: number;
+export const BTN_TRIGGER_HAPPY6: number;
+export const BTN_TRIGGER_HAPPY7: number;
+export const BTN_TRIGGER_HAPPY8: number;
+export const BTN_TRIGGER_HAPPY9: number;
+export const BTN_TRIGGER_HAPPY10: number;
+export const BTN_TRIGGER_HAPPY11: number;
+export const BTN_TRIGGER_HAPPY12: number;
+export const BTN_TRIGGER_HAPPY13: number;
+export const BTN_TRIGGER_HAPPY14: number;
+export const BTN_TRIGGER_HAPPY15: number;
+export const BTN_TRIGGER_HAPPY16: number;
+export const BTN_TRIGGER_HAPPY17: number;
+export const BTN_TRIGGER_HAPPY18: number;
+export const BTN_TRIGGER_HAPPY19: number;
+export const BTN_TRIGGER_HAPPY20: number;
+export const BTN_TRIGGER_HAPPY21: number;
+export const BTN_TRIGGER_HAPPY22: number;
+export const BTN_TRIGGER_HAPPY23: number;
+export const BTN_TRIGGER_HAPPY24: number;
+export const BTN_TRIGGER_HAPPY25: number;
+export const BTN_TRIGGER_HAPPY26: number;
+export const BTN_TRIGGER_HAPPY27: number;
+export const BTN_TRIGGER_HAPPY28: number;
+export const BTN_TRIGGER_HAPPY29: number;
+export const BTN_TRIGGER_HAPPY30: number;
+export const BTN_TRIGGER_HAPPY31: number;
+export const BTN_TRIGGER_HAPPY32: number;
+export const BTN_TRIGGER_HAPPY33: number;
+export const BTN_TRIGGER_HAPPY34: number;
+export const BTN_TRIGGER_HAPPY35: number;
+export const BTN_TRIGGER_HAPPY36: number;
+export const BTN_TRIGGER_HAPPY37: number;
+export const BTN_TRIGGER_HAPPY38: number;
+export const BTN_TRIGGER_HAPPY39: number;
+export const BTN_TRIGGER_HAPPY40: number;
+
+export const KEY_OK: number;
+export const KEY_SELECT: number;
+export const KEY_GOTO: number;
+export const KEY_CLEAR: number;
+export const KEY_POWER2: number;
+export const KEY_OPTION: number;
+export const KEY_INFO: number;
+export const KEY_TIME: number;
+export const KEY_VENDOR: number;
+export const KEY_ARCHIVE: number;
+export const KEY_PROGRAM: number;
+export const KEY_CHANNEL: number;
+export const KEY_FAVORITES: number;
+export const KEY_EPG: number;
+export const KEY_PVR: number;
+export const KEY_MHP: number;
+export const KEY_LANGUAGE: number;
+export const KEY_TITLE: number;
+export const KEY_SUBTITLE: number;
+export const KEY_ANGLE: number;
+export const KEY_ZOOM: number;
+export const KEY_MODE: number;
+export const KEY_KEYBOARD: number;
+export const KEY_SCREEN: number;
+export const KEY_PC: number;
+export const KEY_TV: number;
+export const KEY_TV2: number;
+export const KEY_VCR: number;
+export const KEY_VCR2: number;
+export const KEY_SAT: number;
+export const KEY_SAT2: number;
+export const KEY_CD: number;
+export const KEY_TAPE: number;
+export const KEY_RADIO: number;
+export const KEY_TUNER: number;
+export const KEY_PLAYER: number;
+export const KEY_TEXT: number;
+export const KEY_DVD: number;
+export const KEY_AUX: number;
+export const KEY_MP3: number;
+export const KEY_AUDIO: number;
+export const KEY_VIDEO: number;
+export const KEY_DIRECTORY: number;
+export const KEY_LIST: number;
+export const KEY_MEMO: number;
+export const KEY_CALENDAR: number;
+export const KEY_RED: number;
+export const KEY_GREEN: number;
+export const KEY_YELLOW: number;
+export const KEY_BLUE: number;
+export const KEY_CHANNELUP: number;
+export const KEY_CHANNELDOWN: number;
+export const KEY_FIRST: number;
+export const KEY_LAST: number;
+export const KEY_AB: number;
+export const KEY_NEXT: number;
+export const KEY_RESTART: number;
+export const KEY_SLOW: number;
+export const KEY_SHUFFLE: number;
+export const KEY_BREAK: number;
+export const KEY_PREVIOUS: number;
+export const KEY_DIGITS: number;
+export const KEY_TEEN: number;
+export const KEY_TWEN: number;
+export const KEY_VIDEOPHONE: number;
+export const KEY_GAMES: number;
+export const KEY_ZOOMIN: number;
+export const KEY_ZOOMOUT: number;
+export const KEY_ZOOMRESET: number;
+export const KEY_WORDPROCESSOR: number;
+export const KEY_EDITOR: number;
+export const KEY_SPREADSHEET: number;
+export const KEY_GRAPHICSEDITOR: number;
+export const KEY_PRESENTATION: number;
+export const KEY_DATABASE: number;
+export const KEY_NEWS: number;
+export const KEY_VOICEMAIL: number;
+export const KEY_ADDRESSBOOK: number;
+export const KEY_MESSENGER: number;
+export const KEY_DISPLAYTOGGLE: number;
+export const KEY_SPELLCHECK: number;
+export const KEY_LOGOFF: number;
+
+export const KEY_DOLLAR: number;
+export const KEY_EURO: number;
+
+export const KEY_FRAMEBACK: number;
+export const KEY_FRAMEFORWARD: number;
+export const KEY_CONTEXT_MENU: number;
+export const KEY_MEDIA_REPEAT: number;
+export const KEY_10CHANNELSUP: number;
+export const KEY_10CHANNELSDOWN: number;
+export const KEY_IMAGES: number;
+
+export const KEY_DEL_EOL: number;
+export const KEY_DEL_EOS: number;
+export const KEY_INS_LINE: number;
+export const KEY_DEL_LINE: number;
+
+export const KEY_FN: number;
+export const KEY_FN_ESC: number;
+export const KEY_FN_F1: number;
+export const KEY_FN_F2: number;
+export const KEY_FN_F3: number;
+export const KEY_FN_F4: number;
+export const KEY_FN_F5: number;
+export const KEY_FN_F6: number;
+export const KEY_FN_F7: number;
+export const KEY_FN_F8: number;
+export const KEY_FN_F9: number;
+export const KEY_FN_F10: number;
+export const KEY_FN_F11: number;
+export const KEY_FN_F12: number;
+export const KEY_FN_1: number;
+export const KEY_FN_2: number;
+export const KEY_FN_D: number;
+export const KEY_FN_E: number;
+export const KEY_FN_F: number;
+export const KEY_FN_S: number;
+export const KEY_FN_B: number;
+
+export const KEY_BRL_DOT1: number;
+export const KEY_BRL_DOT2: number;
+export const KEY_BRL_DOT3: number;
+export const KEY_BRL_DOT4: number;
+export const KEY_BRL_DOT5: number;
+export const KEY_BRL_DOT6: number;
+export const KEY_BRL_DOT7: number;
+export const KEY_BRL_DOT8: number;
+export const KEY_BRL_DOT9: number;
+export const KEY_BRL_DOT10: number;
+
+export const KEY_NUMERIC_0: number;
+export const KEY_NUMERIC_1: number;
+export const KEY_NUMERIC_2: number;
+export const KEY_NUMERIC_3: number;
+export const KEY_NUMERIC_4: number;
+export const KEY_NUMERIC_5: number;
+export const KEY_NUMERIC_6: number;
+export const KEY_NUMERIC_7: number;
+export const KEY_NUMERIC_8: number;
+export const KEY_NUMERIC_9: number;
+export const KEY_NUMERIC_STAR: number;
+export const KEY_NUMERIC_POUND: number;
+export const KEY_NUMERIC_A: number;
+export const KEY_NUMERIC_B: number;
+export const KEY_NUMERIC_C: number;
+export const KEY_NUMERIC_D: number;
+
+export const KEY_CAMERA_FOCUS: number;
+export const KEY_WPS_BUTTON: number;
+
+export const KEY_TOUCHPAD_TOGGLE: number;
+export const KEY_TOUCHPAD_ON: number;
+export const KEY_TOUCHPAD_OFF: number;
+
+export const KEY_CAMERA_ZOOMIN: number;
+export const KEY_CAMERA_ZOOMOUT: number;
+export const KEY_CAMERA_UP: number;
+export const KEY_CAMERA_DOWN: number;
+export const KEY_CAMERA_LEFT: number;
+export const KEY_CAMERA_RIGHT: number;
+
+export const KEY_ATTENDANT_ON: number;
+export const KEY_ATTENDANT_OFF: number;
+export const KEY_ATTENDANT_TOGGLE: number;
+export const KEY_LIGHTS_TOGGLE: number;
+
+export const KEY_ALS_TOGGLE: number;
+
+export const KEY_BUTTONCONFIG: number;
+export const KEY_TASKMANAGER: number;
+export const KEY_JOURNAL: number;
+export const KEY_CONTROLPANEL: number;
+export const KEY_APPSELECT: number;
+export const KEY_SCREENSAVER: number;
+export const KEY_VOICECOMMAND: number;
+export const KEY_ASSISTANT: number;
+
+export const KEY_BRIGHTNESS_MIN: number;
+export const KEY_BRIGHTNESS_MAX: number;
+
+export const KEY_KBDINPUTASSIST_PREV: number;
+export const KEY_KBDINPUTASSIST_NEXT: number;
+export const KEY_KBDINPUTASSIST_PREVGROUP: number;
+export const KEY_KBDINPUTASSIST_NEXTGROUP: number;
+export const KEY_KBDINPUTASSIST_ACCEPT: number;
+export const KEY_KBDINPUTASSIST_CANCEL: number;
+
+export const KEY_RIGHT_UP: number;
+export const KEY_RIGHT_DOWN: number;
+export const KEY_LEFT_UP: number;
+export const KEY_LEFT_DOWN: number;
+
+export const KEY_ROOT_MENU: number;
+
+export const KEY_MEDIA_TOP_MENU: number;
+export const KEY_NUMERIC_11: number;
+export const KEY_NUMERIC_12: number;
+export const KEY_AUDIO_DESC: number;
+export const KEY_3D_MODE: number;
+export const KEY_NEXT_FAVORITE: number;
+export const KEY_STOP_RECORD: number;
+export const KEY_PAUSE_RECORD: number;
+export const KEY_VOD: number;
+export const KEY_UNMUTE: number;
+export const KEY_FASTREVERSE: number;
+export const KEY_SLOWREVERSE: number;
+export const KEY_DATA: number;
+export const KEY_ONSCREEN_KEYBOARD: number;
+
+export const KEY_MAX: number;
+export const KEY_CNT: number;
+export const REL_X: number;
+export const REL_Y: number;
+export const REL_Z: number;
+export const REL_RX: number;
+export const REL_RY: number;
+export const REL_RZ: number;
+export const REL_HWHEEL: number;
+export const REL_DIAL: number;
+export const REL_WHEEL: number;
+export const REL_MISC: number;
+export const REL_MAX: number;
+export const REL_CNT: number;
+export const ABS_X: number;
+export const ABS_Y: number;
+export const ABS_Z: number;
+export const ABS_RX: number;
+export const ABS_RY: number;
+export const ABS_RZ: number;
+export const ABS_THROTTLE: number;
+export const ABS_RUDDER: number;
+export const ABS_WHEEL: number;
+export const ABS_GAS: number;
+export const ABS_BRAKE: number;
+export const ABS_HAT0X: number;
+export const ABS_HAT0Y: number;
+export const ABS_HAT1X: number;
+export const ABS_HAT1Y: number;
+export const ABS_HAT2X: number;
+export const ABS_HAT2Y: number;
+export const ABS_HAT3X: number;
+export const ABS_HAT3Y: number;
+export const ABS_PRESSURE: number;
+export const ABS_DISTANCE: number;
+export const ABS_TILT_X: number;
+export const ABS_TILT_Y: number;
+export const ABS_TOOL_WIDTH: number;
+
+export const ABS_VOLUME: number;
+
+export const ABS_MISC: number;
+
+export const ABS_MT_SLOT: number;
+export const ABS_MT_TOUCH_MAJOR: number;
+export const ABS_MT_TOUCH_MINOR: number;
+export const ABS_MT_WIDTH_MAJOR: number;
+export const ABS_MT_WIDTH_MINOR: number;
+export const ABS_MT_ORIENTATION: number;
+export const ABS_MT_POSITION_X: number;
+export const ABS_MT_POSITION_Y: number;
+export const ABS_MT_TOOL_TYPE: number;
+export const ABS_MT_BLOB_ID: number;
+export const ABS_MT_TRACKING_ID: number;
+export const ABS_MT_PRESSURE: number;
+export const ABS_MT_DISTANCE: number;
+export const ABS_MT_TOOL_X: number;
+export const ABS_MT_TOOL_Y: number;
+
+export const ABS_MAX: number;
+export const ABS_CNT: number;
+export const SW_LID: number;
+export const SW_TABLET_MODE: number;
+export const SW_HEADPHONE_INSERT: number;
+export const SW_RFKILL_ALL: number;
+
+export const SW_MICROPHONE_INSERT: number;
+export const SW_DOCK: number;
+export const SW_LINEOUT_INSERT: number;
+export const SW_JACK_PHYSICAL_INSERT: number;
+export const SW_VIDEOOUT_INSERT: number;
+export const SW_CAMERA_LENS_COVER: number;
+export const SW_KEYPAD_SLIDE: number;
+export const SW_FRONT_PROXIMITY: number;
+export const SW_ROTATE_LOCK: number;
+export const SW_LINEIN_INSERT: number;
+export const SW_MUTE_DEVICE: number;
+export const SW_PEN_INSERTED: number;
+export const SW_MAX: number;
+export const SW_CNT: number;
+
+export const MSC_SERIAL: number;
+export const MSC_PULSELED: number;
+export const MSC_GESTURE: number;
+export const MSC_RAW: number;
+export const MSC_SCAN: number;
+export const MSC_TIMESTAMP: number;
+export const MSC_MAX: number;
+export const MSC_CNT: number;
+
+export const LED_NUML: number;
+export const LED_CAPSL: number;
+export const LED_SCROLLL: number;
+export const LED_COMPOSE: number;
+export const LED_KANA: number;
+export const LED_SLEEP: number;
+export const LED_SUSPEND: number;
+export const LED_MUTE: number;
+export const LED_MISC: number;
+export const LED_MAIL: number;
+export const LED_CHARGING: number;
+export const LED_MAX: number;
+export const LED_CNT: number;
+
+export const REP_DELAY: number;
+export const REP_PERIOD: number;
+export const REP_MAX: number;
+export const REP_CNT: number;
+
+export const SND_CLICK: number;
+export const SND_BELL: number;
+export const SND_TONE: number;
+export const SND_MAX: number;
+export const SND_CNT: number;
diff --git a/types/uinput/tsconfig.json b/types/uinput/tsconfig.json
new file mode 100644
index 0000000000..3114301619
--- /dev/null
+++ b/types/uinput/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "uinput-tests.ts"
+  ]
+}
diff --git a/types/uinput/tslint.json b/types/uinput/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/uinput/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/uinput/uinput-tests.ts b/types/uinput/uinput-tests.ts
new file mode 100644
index 0000000000..05071982a3
--- /dev/null
+++ b/types/uinput/uinput-tests.ts
@@ -0,0 +1,42 @@
+import * as fs from "fs";
+import * as uinput from 'uinput';
+
+const setupOptions: uinput.SetupOptions = {
+  EV_KEY: [uinput.KEY_A, uinput.KEY_B]
+};
+
+const createID: uinput.CreateID = {
+  product: 123,
+  vendor: 456,
+  version: 789,
+  bustype: uinput.BUS_VIRTUAL
+};
+
+const createOptions: uinput.CreateOptions = {
+  id: createID,
+  name: "TestDevice"
+};
+
+uinput.setup(setupOptions, (err0: Error | undefined, stream: fs.WriteStream): void => {
+  if (err0 instanceof Error) {
+    throw err0;
+  }
+
+  uinput.create(stream, createOptions, (err1?: Error) => {
+    if (err1 instanceof Error) {
+      throw err1;
+    }
+
+    uinput.key_event(stream, uinput.KEY_A, (err2?: Error) => {
+      if (err2 instanceof Error) {
+        throw err2;
+      }
+    });
+
+    uinput.emit_combo(stream, [uinput.KEY_A, uinput.KEY_B], (err3?: Error) => {
+      if (err3 instanceof Error) {
+        throw err3;
+      }
+    });
+  });
+});
diff --git a/types/uk.co.workingedge.phonegap.plugin.launchnavigator/index.d.ts b/types/uk.co.workingedge.phonegap.plugin.launchnavigator/index.d.ts
deleted file mode 100644
index 378a74e09d..0000000000
--- a/types/uk.co.workingedge.phonegap.plugin.launchnavigator/index.d.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-// Type definitions for uk.co.workingedge.phonegap.plugin.launchnavigator v3.2.1
-// Project: https://github.com/dpa99c/phonegap-launch-navigator
-// Definitions by: Dave Alden <https://github.com/dpa99c>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface Window {
-    /**
-     * Indicates whether the current device is a tablet or a phone.
-     * @return {boolean} true if the device is a tablet; false if the device is a phone.
-     */
-    LaunchNavigator(): LaunchNavigator;
-}
-
-interface LaunchNavigatorOptions {
-
-    /**
-     * A callback to invoke when the navigation app is successfully launched.
-     */
-    successCallback?: Function;
-
-    /**
-     * A callback to invoke if an error is encountered while launching the app.
-     * A single string argument containing the error message will be passed in.
-     */
-    errorCallback?: (error: string) => void;
-
-    /**
-     * name of the navigation app to use for directions.
-     * Specify using launchnavigator.APP constants.
-     * e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * If not specified, defaults to User Selection.
-     */
-    app?: string;
-
-    /**
-     * nickname to display in app for destination. e.g. "Bob's House".
-     */
-    destinationName?: string;
-
-    /**
-     * Start point of the navigation.
-     * If not specified, the current device location will be used.
-     * Either:
-     *  - a {string} containing the address. e.g. "Buckingham Palace, London"
-     *  - a {string} containing a latitude/longitude coordinate. e.g. "50.1. -4.0"
-     *  - an {array}, where the first element is the latitude and the second element is a longitude, as decimal numbers. e.g. [50.1, -4.0]
-     */
-    start?: string | number[];
-
-    /**
-     * nickname to display in app for start . e.g. "My House".
-     */
-    startName?: string;
-
-    /**
-     * Transportation mode for navigation: "driving", "walking" or "transit". Defaults to "driving" if not specified.
-     */
-    transportMode?: string;
-
-    /**
-     * If true, debug log output will be generated by the plugin. Defaults to false.
-     */
-    enableDebug?: boolean;
-
-    /**
-     * a key/value map of extra app-specific parameters. For example, to tell Google Maps on Android to display Satellite view in "maps" launch mode: `{"t": "k"}`
-     */
-    extras?: any;
-
-    /**
-     * (Android only) mode in which to open Google Maps app: "maps" or "turn-by-turn". Defaults to "maps" if not specified. Specify using launchnavigator.LAUNCH_MODE constants.
-     */
-    launchMode?: string;
-
-    /**
-     * text to display in the native picker which enables user to select which navigation app to launch. Defaults to "Select app for navigation" if not specified.
-     */
-    appSelectionDialogHeader?: string;
-
-    /**
-     * text to display for the cancel button in the native picker which enables user to select which navigation app to launch. Defaults to "Cancel" if not specified.
-     */
-    appSelectionCancelButton?: string;
-
-    /**
-     * List of apps, defined as `launchnavigator.APP` constants, which should be displayed in the picker if the app is available.
-     * This can be used to restrict which apps are displayed, even if they are installed.
-     * By default, all available apps will be displayed.
-     */
-    appSelectionList?: string[];
-
-    /**
-     * Callback to invoke when the user selects an app in the native picker.
-     * A single string argument is passed which is the app what was selected defined as a `launchnavigator.APP` constant.
-     */
-    appSelectionCallback?: (app: string) => void;
-}
-
-
-interface LaunchNavigator {
-
-    /**
-     * Supported platforms
-     */
-    PLATFORM: any;
-
-    /**
-     * string constants, used to identify apps in native code
-     */
-    APP: any;
-
-    /**
-     * All possible transport modes
-     */
-    TRANSPORT_MODE: any;
-
-    /**
-     * Launch modes supported by Google Maps on Android
-     */
-    LAUNCH_MODE: any;
-
-
-    /**
-     * Launches navigator app
-     * @param destination {string|number[]} Location name or coordinates (as string or array)
-     * Either:
-     * - a {string} containing the address. e.g. "Buckingham Palace, London"
-     * - a {string} containing a latitude/longitude coordinate. e.g. "50.1. -4.0"
-     * - an {array}, where the first element is the latitude and the second element is a longitude, as decimal numbers. e.g. [50.1, -4.0]
-     * @param options {LaunchNavigatorOptions}
-     * @returns {Promise<any>}
-     */
-    navigate: (
-        destination: string | number[], 
-        options?: LaunchNavigatorOptions
-    ) => void;
-    
-    logEvent: (name: string, params?: any, valueToSum?: number) => void;
-
-    
-
-    /**
-     * Determines if the given app is installed and available on the current device.
-     * @param app {string}
-     */
-    isAppAvailable: (
-        app: string,
-        successCallback: (isAvailable: boolean) => void,
-        errorCallback?: (error: string) => void
-    ) => void;
-
-    /**
-     * Returns a list indicating which apps are installed and available on the current device.
-     * @return string[]
-     */
-    availableApps: (
-        successCallback: (apps: any ) => void,
-        errorCallback?: (error: string) => void
-    ) => void;
-
-    /**
-     * Returns the display name of the specified app.
-     * @param {string} app - specified as a constant in `launchnavigator.APP`. e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * @return {string} - app display name. e.g. "Google Maps".
-     */
-    getAppDisplayName: (app: string) => string;
-
-    /**
-     * Returns list of supported apps on a given platform.
-     * @param {string} platform - specified as a constant in `launchnavigator.PLATFORM`. e.g. `launchnavigator.PLATFORM.IOS`.
-     * @return {array} - apps supported on specified platform as a list of `launchnavigator.APP` constants.
-     */
-    getAppsForPlatform: (platform: string) => string[];
-
-    /**
-     * Indicates if an app on a given platform supports specification of transport mode.
-     * @param {string} app - specified as a constant in `launchnavigator.APP`. e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * @param {string} platform - specified as a constant in `launchnavigator.PLATFORM`. e.g. `launchnavigator.PLATFORM.IOS`.
-     * @return {boolean} - true if app/platform combination supports specification of transport mode.
-     */
-    supportsTransportMode: (
-        app: string,
-        platform: string
-    ) => boolean;
-
-    /**
-     * Returns the list of transport modes supported by an app on a given platform.
-     * @param {string} app - specified as a constant in `launchnavigator.APP`. e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * @param {string} platform - specified as a constant in `launchnavigator.PLATFORM`. e.g. `launchnavigator.PLATFORM.IOS`.
-     * @return {array} - list of transports modes as constants in `launchnavigator.TRANSPORT_MODE`.
-     * If app/platform combination doesn't support specification of transport mode, the list will be empty;
-     */
-    getTransportModes: (
-        app: string,
-        platform: string
-    ) => string[];
-
-    /**
-     * Indicates if an app on a given platform supports specification of launch mode.
-     * Note that currently only Google Maps on Android does.
-     * @param {string} app - specified as a constant in `launchnavigator.APP`. e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * @param {string} platform - specified as a constant in `launchnavigator.PLATFORM`. e.g. `launchnavigator.PLATFORM.ANDROID`.
-     * @return {boolean} - true if app/platform combination supports specification of transport mode.
-     */
-    supportsLaunchMode: (
-        app: string,
-        platform: string
-    ) => boolean;
-
-    /**
-     * Indicates if an app on a given platform supports specification of start location.
-     * @param {string} app - specified as a constant in `launchnavigator.APP`. e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * @param {string} platform - specified as a constant in `launchnavigator.PLATFORM`. e.g. `launchnavigator.PLATFORM.IOS`.
-     * @return {boolean} - true if app/platform combination supports specification of start location.
-     */
-    supportsStart: (
-        app: string,
-        platform: string
-    ) => boolean;
-
-    /**
-     * Indicates if an app on a given platform supports specification of a custom nickname for start location.
-     * @param {string} app - specified as a constant in `launchnavigator.APP`. e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * @param {string} platform - specified as a constant in `launchnavigator.PLATFORM`. e.g. `launchnavigator.PLATFORM.IOS`.
-     * @return {boolean} - true if app/platform combination supports specification of start location.
-     */
-    supportsStartName: (
-        app: string,
-        platform: string
-    ) => boolean;
-
-    /**
-     * Indicates if an app on a given platform supports specification of a custom nickname for destination location.
-     * @param {string} app - specified as a constant in `launchnavigator.APP`. e.g. `launchnavigator.APP.GOOGLE_MAPS`.
-     * @param {string} platform - specified as a constant in `launchnavigator.PLATFORM`. e.g. `launchnavigator.PLATFORM.IOS`.
-     * @return {boolean} - true if app/platform combination supports specification of destination location.
-     */
-    supportsDestName: (
-        app: string,
-        platform: string
-    ) => boolean;
-
-
-    /**
-     * Triggers the native dialog picker for user to choose wich app to use.
-     * @param {mixed} destination (required) - destination location to use for navigation - see launchnavigator.navigate()
-     * @param {object} options (optional) - optional parameters - see launchnavigator.navigate()
-     * @param {Function} successCallback (optional) - optional callback to be invoked on success
-     * @param {Function} errorCallback (optional) - optional callback to be invoked on error
-     */
-    userSelect: (
-        destination: string | number[],
-        options: LaunchNavigatorOptions
-    ) => void;
-}
-
-declare var launchnavigator: LaunchNavigator;
\ No newline at end of file
diff --git a/types/uk.co.workingedge.phonegap.plugin.launchnavigator/tsconfig.json b/types/uk.co.workingedge.phonegap.plugin.launchnavigator/tsconfig.json
deleted file mode 100644
index a6bd2c9ec0..0000000000
--- a/types/uk.co.workingedge.phonegap.plugin.launchnavigator/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "uk.co.workingedge.phonegap.plugin.launchnavigator-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/uk.co.workingedge.phonegap.plugin.launchnavigator/uk.co.workingedge.phonegap.plugin.launchnavigator-tests.ts b/types/uk.co.workingedge.phonegap.plugin.launchnavigator/uk.co.workingedge.phonegap.plugin.launchnavigator-tests.ts
deleted file mode 100644
index 63b02a03d4..0000000000
--- a/types/uk.co.workingedge.phonegap.plugin.launchnavigator/uk.co.workingedge.phonegap.plugin.launchnavigator-tests.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-let app = launchnavigator.APP["GOOGLE_MAPS"];
-let platform = launchnavigator.PLATFORM["ANDROID"];
-
-let destination = "Westminster, London, UK";
-
-let options = {
-    successCallback: () => {
-        console.log("success");
-    },
-    errorCallback: (error:string) => {
-        console.log("error: "+error);
-    },
-    app: app,
-    destinationName: "Bob's House",
-    start: "Buckingham Palace, London, UK",
-    startName: "My House",
-    transportMode: launchnavigator.TRANSPORT_MODE["walking"],
-    enableDebug: true,
-    extras: {"t": "k"},
-    launchMode: launchnavigator.LAUNCH_MODE["maps"],
-    appSelectionDialogHeader: "Select app for navigation",
-    appSelectionCancelButton: "Cancel",
-    appSelectionList: [
-        launchnavigator.APP["GOOGLE_MAPS"],
-        launchnavigator.APP["WAZE"]
-    ],
-    appSelectionCallback: (app:string) => {
-        console.log("selected app: "+app);
-    }
-};
-
-launchnavigator.navigate(destination, options);
-
-launchnavigator.userSelect(destination, options);
-
-launchnavigator.isAppAvailable(
-    app,
-    (isAvailable) => {
-        console.log("isAvailable:" + isAvailable);
-    },
-    (error) => {
-        console.error("ERROR:" + error);
-    }
-);
-
-launchnavigator.availableApps(
-    (apps) => {
-        for (let app of apps){
-            console.log("available:" + app);
-        }
-    },
-    (error) => {
-        console.error("ERROR:" + error);
-    }
-);
-
-(function(){
-    let name = launchnavigator.getAppDisplayName(app);
-    console.log("App Name: "+ name);
-}());
-
-(function(){
-    let apps = launchnavigator.getAppsForPlatform(platform);
-    for (let app of apps){
-        console.log("available for platform:" + app);
-    }
-}());
-
-(function(){
-    let supported = launchnavigator.supportsTransportMode(app, platform);
-    console.log("supported: "+ supported);
-}());
-
-(function(){
-    var modes = launchnavigator.getTransportModes(app, platform);
-    for (let mode of modes){
-        console.log("transport modes for platform:" + mode);
-    }
-}());
-
-(function(){
-    let supported = launchnavigator.supportsLaunchMode(app, platform);
-    console.log("supported: "+ supported);
-}());
-
-(function(){
-    let supported = launchnavigator.supportsStart(app, platform);
-    console.log("supported: "+ supported);
-}());
-
-(function(){
-    let supported = launchnavigator.supportsStartName(app, platform);
-    console.log("supported: "+ supported);
-}());
-
-(function(){
-    let supported = launchnavigator.supportsDestName(app, platform);
-    console.log("supported: "+ supported);
-}());
\ No newline at end of file
diff --git a/types/ultra-strftime/index.d.ts b/types/ultra-strftime/index.d.ts
new file mode 100644
index 0000000000..f02d27d43f
--- /dev/null
+++ b/types/ultra-strftime/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for ultra-strftime 1.0
+// Project: https://github.com/xio4/ultra_strftime
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function strftime(fmt: string, d?: Date, locale?: strftime.Locale, options?: strftime.Options): string;
+declare function strftime(fmt: string, locale?: strftime.Locale, options?: strftime.Options): string;
+
+declare namespace strftime {
+    type StrftimeFunction = (fmt: string, d?: Date, options?: Options) => string;
+
+    interface LocaleFormats {
+        /** equivalent to %m/%d/%y in en_US */
+        D: string;
+        /** equivalent to %Y-%m-%d in en_US */
+        F: string;
+        /** equivalent to %H:%M in en_US */
+        R: string;
+        /** equivalent to %D in en_US */
+        X: string;
+        /** equivalent to %a %b %d %X %Y %Z in en_US */
+        c: string;
+        /** equivalent to %I:%M:%S %p in en_US */
+        r: string;
+        /** equivalent to %H:%M:%S in en_US */
+        T: string;
+        /** equivalent to %e-%b-%Y in en_US */
+        v: string;
+        /** equivalent to %T in en_US */
+        x: string;
+    }
+
+    interface Locale {
+        days: string[];
+        shortDays: string[];
+        months: string[];
+        shortMonths: string[];
+        AM: string;
+        PM: string;
+        am: string;
+        pm: string;
+        formats: LocaleFormats;
+    }
+
+    interface Options {
+        timezone?: string | number;
+        utc?: boolean;
+    }
+
+    function strftimeUTC(fmt: string, d?: Date, locale?: Locale): string;
+    function strftimeTZ(fmt: string, d: Date, locale: Locale, timezone: number): string;
+    function strftimeTZ(fmt: string, d: Date, timezone: number): string;
+    function localizedStrftime(locale: Locale): StrftimeFunction;
+
+    function strftime(fmt: string, d?: Date, locale?: Locale, options?: Options): string;
+    function strftime(fmt: string, locale?: Locale, options?: Options): string;
+}
+
+export = strftime;
diff --git a/types/ultra-strftime/tsconfig.json b/types/ultra-strftime/tsconfig.json
new file mode 100644
index 0000000000..3b9461c0b6
--- /dev/null
+++ b/types/ultra-strftime/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ultra-strftime-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/ultra-strftime/tslint.json b/types/ultra-strftime/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/ultra-strftime/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/ultra-strftime/ultra-strftime-tests.ts b/types/ultra-strftime/ultra-strftime-tests.ts
new file mode 100644
index 0000000000..4439425663
--- /dev/null
+++ b/types/ultra-strftime/ultra-strftime-tests.ts
@@ -0,0 +1,41 @@
+import * as strftime from "ultra-strftime";
+
+const it_IT = {
+    days: ['domenica', 'lunedi', 'martedi', 'mercoledi', 'giovedi', 'venerdi', 'sabato'],
+    shortDays: ['dom', 'lun', 'mar', 'mer', 'gio', 'ven', 'sab'],
+    months: ['gennaio', 'febbraio', 'marzo', 'aprile', 'maggio', 'giugno', 'luglio', 'agosto', 'settembre', 'ottobre', 'novembre', 'dicembre'],
+    shortMonths: ['gen', 'feb', 'mar', 'apr', 'mag', 'giu', 'lug', 'ago', 'set', 'ott', 'nov', 'dic'],
+    AM: 'AM',
+    PM: 'PM',
+    am: 'am',
+    pm: 'pm',
+    formats: {
+        D: '%m/%d/%y',
+        F: '%Y-%m-%d',
+        R: '%H:%M',
+        X: '%T',
+        c: '%a %b %d %X %Y',
+        r: '%I:%M:%S %p',
+        T: '%H:%M:%S',
+        v: '%e-%b-%Y',
+        x: '%D'
+    }
+};
+
+strftime('%B %d, %Y %H:%M:%S');
+strftime('%B %d, %Y %H:%M:%S', new Date(1307472705067));
+strftime('%B %d, %Y %H:%M:%S', new Date(1307472705067), it_IT);
+strftime('%B %d, %Y %H:%M:%S', new Date(1307472705067), it_IT, { timezone: -420 });
+strftime('%B %d, %Y %H:%M:%S', new Date(1307472705067), it_IT, { timezone: '-0700' });
+strftime('%B %d, %Y %H:%M:%S', new Date(1307472705067), it_IT, { utc: true });
+
+const strftimeIT = strftime.localizedStrftime(it_IT);
+strftimeIT('%B %d, %Y %H:%M:%S');
+strftimeIT('%B %d, %Y %H:%M:%S', new Date(1307472705067));
+
+strftime.strftimeUTC('%B %d, %y %H:%M:%S', new Date(1307472705067), it_IT);
+strftime.strftimeUTC('%B %d, %y %H:%M:%S', new Date(1307472705067));
+strftime.strftimeUTC('%B %d, %y %H:%M:%S');
+
+strftime.strftimeTZ('%B %d, %y %H:%M:%S', new Date(1307472705067), it_IT, -420);
+strftime.strftimeTZ('%B %d, %y %H:%M:%S', new Date(1307472705067), -420);
diff --git a/types/umbraco/tslint.json b/types/umbraco/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/umbraco/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/umd/tslint.json b/types/umd/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/umd/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/umzug/index.d.ts b/types/umzug/index.d.ts
index 0954170b71..931434aea3 100644
--- a/types/umzug/index.d.ts
+++ b/types/umzug/index.d.ts
@@ -1,9 +1,11 @@
-// Type definitions for Umzug v2.0.1
+// Type definitions for Umzug v2.1.0
 // Project: https://github.com/sequelize/umzug
 // Definitions by: Ivan Drinchev <https://github.com/drinchev>
+//                 Margus Lamp <https://github.com/mlamp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+import { EventEmitter } from 'events';
 import Sequelize = require("sequelize");
 
 declare namespace umzug {
@@ -28,6 +30,16 @@ declare namespace umzug {
          */
         wrap?: <T>(fn: T) => T;
 
+        /**
+         * A function that maps a file path to a migration object in the form
+         * { up: Function, down: Function }. The default for this is to require(...)
+         * the file as javascript, but you can use this to transpile TypeScript,
+         * read raw sql etc.
+         * See https://github.com/sequelize/umzug/tree/master/test/fixtures
+         * for examples.
+         */
+        customResolver?(path: string): { up: () => Promise<any>, down?: () => Promise<any> };
+        
     }
 
     interface JSONStorageOptions {
@@ -159,7 +171,7 @@ declare namespace umzug {
         file: string;
     }
 
-    interface Umzug {
+    interface Umzug extends EventEmitter {
         /**
          * The execute method is a general purpose function that runs for
          * every specified migrations the respective function.
@@ -190,6 +202,10 @@ declare namespace umzug {
         down(migrations?: string[]): Promise<Migration[]>;
         down(options?: DownToOptions | UpDownMigrationsOptions): Promise<Migration[]>;
 
+        on(eventName: 'migrating' | 'reverting' | 'migrated' | 'reverted', cb?: (name: string, migration: Migration) => void): this;
+        addListener(eventName: 'migrating' | 'reverting' | 'migrated' | 'reverted', cb?: (name: string, migration: Migration) => void): this;
+        removeListener(eventName: 'migrating' | 'reverting' | 'migrated' | 'reverted', cb?: (name: string, migration: Migration) => void): this;
+
     }
 
     interface UmzugStatic {
@@ -197,5 +213,5 @@ declare namespace umzug {
     }
 }
 
-declare var umzug: umzug.UmzugStatic;
+declare const umzug: umzug.UmzugStatic;
 export = umzug;
diff --git a/types/umzug/tslint.json b/types/umzug/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/umzug/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/umzug/umzug-tests.ts b/types/umzug/umzug-tests.ts
index b5def394e9..fad7b11427 100644
--- a/types/umzug/umzug-tests.ts
+++ b/types/umzug/umzug-tests.ts
@@ -1,133 +1,123 @@
-import * as Umzug from "umzug";
-import * as Sequelize from "sequelize";
+import * as Umzug from 'umzug';
+import * as Sequelize from 'sequelize';
 
-var someVar:Umzug.Umzug;
-var umzug = new Umzug({});
+let someVar: Umzug.Umzug;
+const umzug = new Umzug({});
 someVar = umzug;
 
-umzug.up().then(function (result) {
-  // do something with the result
-});
+umzug.up().then((migrations: Umzug.Migration[]) => null);
 
 umzug.execute({
   migrations: ['some-id', 'some-other-id'],
   method: 'up'
-}).then(function (migrations) {
-  // "migrations" will be an Array of all executed/reverted migrations.
+}).then((migrations: Umzug.Migration[]) => null);
+
+umzug.pending().then((migrations: Umzug.Migration[]) => null);
+
+umzug.executed().then((migrations: Umzug.Migration[]) => null);
+
+umzug.up().then((migrations: Umzug.Migration[]) => null);
+
+umzug.up({ to: '20141101203500-task' }).then((migrations: Umzug.Migration[]) => null);
+
+umzug.up({ migrations: ['20141101203500-task', '20141101203501-task-2'] }).then((migrations: Umzug.Migration[]) => null);
+
+umzug.up('20141101203500-task').then((migrations: Umzug.Migration[]) => null); // Runs just the passed migration
+umzug.up(['20141101203500-task', '20141101203501-task-2']).then((migrations: Umzug.Migration[]) => null);
+
+umzug.down().then((migrations: Umzug.Migration[]) => null);
+
+umzug.down({ to: '20141031080000-task' }).then((migrations: Umzug.Migration[]) => null);
+
+umzug.down({ migrations: ['20141101203500-task', '20141101203501-task-2'] }).then((migrations: Umzug.Migration[]) => null);
+
+umzug.down('20141101203500-task').then((migrations: Umzug.Migration[]) => null);
+umzug.down(['20141101203500-task', '20141101203501-task-2']).then((migrations: Umzug.Migration[]) => null);
+
+umzug.down({ to: 0 }).then((migrations: Umzug.Migration[]) => null);
+
+umzug.on('migrating', (name: string, migration: Umzug.Migration) => null);
+umzug.on('migrated', (name: string, migration: Umzug.Migration) => null);
+umzug.on('reverting', (name: string, migration: Umzug.Migration) => null);
+umzug.on('reverted', (name: string, migration: Umzug.Migration) => null);
+
+
+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 every time 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: <T> (fun: T) => fun,
+    },
 });
 
-umzug.pending().then(function (migrations) {
-  // "migrations" will be an Array with the names of
-  // pending migrations.
+new Umzug({
+    // The storage.
+    // Possible values: 'json', 'sequelize', an object
+    storage: 'json',
+    storageOptions: {
+        path: '/db/sequelize-meta.json',
+    },
 });
 
-umzug.executed().then(function (migrations) {
-  // "migrations" will be an Array of already executed migrations.
-});
+const sequelize = new Sequelize('');
 
-umzug.up().then(function (migrations) {
-  // "migrations" will be an Array with the names of the
-  // executed migrations.
-});
+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,
 
-umzug.up({ to: '20141101203500-task' }).then(function (migrations) {});
+        // The to be used Sequelize model.
+        // Must have column name matching `columnName` option
+        // Optional of `sequelize` is passed.
+        model: sequelize.define<any, any>('model', {}),
 
-umzug.up({ migrations: ['20141101203500-task', '20141101203501-task-2'] });
+        // The name of the to be used model.
+        // Defaults to 'SequelizeMeta'
+        modelName: 'Schema',
 
-umzug.up('20141101203500-task'); // Runs just the passed migration
-umzug.up(['20141101203500-task', '20141101203501-task-2']);
+        // The name of table to create if `model` option is not supplied
+        // Defaults to `modelName`
+        tableName: 'Schema',
 
-umzug.down().then(function (migration) {
-  // "migration" will the name of the reverted migration.
-});
+        // The name of table column holding migration name.
+        // Defaults to 'name'.
+        columnName: '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']);
-
-umzug.down({to: 0}); // Reverts every migration. 
-
-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: <T>(fun: T) => fun,
-  }
-});
-
-var AnotherUmzug = new Umzug({
-  // The storage.
-  // Possible values: 'json', 'sequelize', an object
-  storage: 'json',
-  storageOptions: {
-      path: '/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)
-  }
+        // The type of the column holding migration name.
+        // Defaults to `Sequelize.STRING`
+        columnType: Sequelize.STRING(100),
+    },
 
 });
diff --git a/types/underscore-ko/index.d.ts b/types/underscore-ko/index.d.ts
index 8b04a28f39..25413677ef 100644
--- a/types/underscore-ko/index.d.ts
+++ b/types/underscore-ko/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kamranayub/UnderscoreKO
 // Definitions by: Maurits Elbers <https://github.com/MagicMau>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/underscore-ko/tslint.json b/types/underscore-ko/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/underscore-ko/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/underscore.string/index.d.ts b/types/underscore.string/index.d.ts
index c173dfbfa5..2d067679d5 100644
--- a/types/underscore.string/index.d.ts
+++ b/types/underscore.string/index.d.ts
@@ -91,6 +91,13 @@ declare module 'underscore' {
          */
         clean(str: string): string;
 
+        /**
+         * Replace diacritic characters with closest ASCII equivalents.
+         * cleanDiacritics('ääkkönen') => 'aakkonen'
+         * @param str
+         */
+        cleanDiacritics(str: string): string;
+
         /**
          * Count occurences of a sub string.
          * ('Hello world', 'l') => 3
diff --git a/types/underscore.string/tslint.json b/types/underscore.string/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/underscore.string/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/underscore.string/underscore.string-tests.ts b/types/underscore.string/underscore.string-tests.ts
index 8eed630854..545f6362d6 100644
--- a/types/underscore.string/underscore.string-tests.ts
+++ b/types/underscore.string/underscore.string-tests.ts
@@ -13,6 +13,8 @@ _.chop('whitespace', 3);
 
 _.clean(' foo    bar   ');
 
+_.cleanDiacritics('ääkkönen');
+
 _.chars('Hello');
 
 _.swapCase('hELLO');
diff --git a/types/underscore/index.d.ts b/types/underscore/index.d.ts
index 2803c89b96..72a2c23c33 100644
--- a/types/underscore/index.d.ts
+++ b/types/underscore/index.d.ts
@@ -1,12 +1,18 @@
 // Type definitions for Underscore 1.8
 // Project: http://underscorejs.org/
-// Definitions by: Boris Yankov <https://github.com/borisyankov>, Josh Baldwin <https://github.com/jbaldwin>, Christopher Currens <https://github.com/ccurrens>
+// Definitions by: Boris Yankov <https://github.com/borisyankov>, Josh Baldwin <https://github.com/jbaldwin>, Christopher Currens <https://github.com/ccurrens>, Cassey Lottman <https://github.com/clottman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var _: _.UnderscoreStatic;
 export = _;
 export as namespace _;
 
+// The DOM is not required to be present, but these definitions reference type Element for the 
+// isElement check. If the DOM is present, this declaration will merge.
+declare global {
+    interface Element { }
+}
+
 declare module _ {
     /**
     * underscore.js _.throttle options.
@@ -920,7 +926,7 @@ declare module _ {
         **/
         uniq<T, TSort>(
             array: _.List<T>,
-            iterator?: _.ListIterator<T, TSort>,
+            iterator?: _.ListIterator<T, TSort> | _.IterateePropertyShorthand,
             context?: any): T[];
 
         /**
@@ -937,7 +943,7 @@ declare module _ {
         unique<T, TSort>(
             array: _.List<T>,
             isSorted?: boolean,
-            iterator?: _.ListIterator<T, TSort>,
+            iterator?: _.ListIterator<T, TSort>  | _.IterateePropertyShorthand,
             context?: any): T[];
 
 
@@ -1058,12 +1064,15 @@ declare module _ {
         * @param list The sorted list.
         * @param value The value to determine its index within `list`.
         * @param iterator Iterator to compute the sort ranking of each value, optional.
+        * @param context `this` object in `iterator`, optional.
         * @return The index where `value` should be inserted into `list`.
         **/
         sortedIndex<T, TSort>(
             list: _.List<T>,
             value: T,
-            iterator?: (x: T) => TSort, context?: any): number;
+            iterator?: ((x: T) => TSort) | string,
+            context?: any
+        ): number;
 
         /**
         * A function to create flexibly-numbered lists of integers, handy for each and map loops. start, if omitted,
@@ -4512,7 +4521,7 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.uniq
         **/
-        uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any>): T[];
+        uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any> |  _.IterateePropertyShorthand): T[];
 
         /**
         * Wrapped type `any[]`.
@@ -5472,23 +5481,23 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.uniq
         **/
-        uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any>): _Chain<T>;
+        uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any> | _.IterateePropertyShorthand): _Chain<T>;
 
         /**
         * Wrapped type `any[]`.
         * @see _.uniq
         **/
-        uniq<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): _Chain<T>;
+        uniq<TSort>(iterator?: _.ListIterator<T, TSort> | _.IterateePropertyShorthand, context?: any): _Chain<T>;
 
         /**
         * @see _.uniq
         **/
-        unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): _Chain<T>;
+        unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort> | _.IterateePropertyShorthand): _Chain<T>;
 
         /**
         * @see _.uniq
         **/
-        unique<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): _Chain<T>;
+        unique<TSort>(iterator?: _.ListIterator<T, TSort> | _.IterateePropertyShorthand, context?: any): _Chain<T>;
 
         /**
         * Wrapped type `any[][]`.
@@ -5685,6 +5694,12 @@ declare module _ {
         **/
         values(): _Chain<T>;
 
+        /**
+        * Wrapped type `object`.
+        * @see _.mapObject
+        **/
+        mapObject(fn: _.ListIterator<T, any>): _Chain<T>;
+
         /**
         * Wrapped type `object`.
         * @see _.pairs
@@ -6087,6 +6102,5 @@ declare module _ {
     }
     interface _ChainOfArrays<T> extends _Chain<T[]> {
         flatten(shallow?: boolean): _Chain<T>;
-        mapObject(fn: _.ListIterator<T, any>): _ChainOfArrays<T>;
     }
 }
diff --git a/types/underscore/tsconfig.json b/types/underscore/tsconfig.json
index 549c23e027..806e81d1ad 100644
--- a/types/underscore/tsconfig.json
+++ b/types/underscore/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": false,
         "noImplicitThis": false,
@@ -21,4 +20,4 @@
         "index.d.ts",
         "underscore-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/underscore/tslint.json b/types/underscore/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/underscore/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/underscore/underscore-tests.ts b/types/underscore/underscore-tests.ts
index f72bb3ca68..419479f689 100644
--- a/types/underscore/underscore-tests.ts
+++ b/types/underscore/underscore-tests.ts
@@ -1,6 +1,8 @@
 
 
-declare var $: any;
+declare var $: any, window: any;
+declare var alert: (msg: string) => any;
+declare var console: {log: any};
 
 _.each([1, 2, 3], (num) => alert(num.toString()));
 _.each({ one: 1, two: 2, three: 3 }, (value, key) => alert(value.toString()));
diff --git a/types/undertaker-registry/index.d.ts b/types/undertaker-registry/index.d.ts
index 02bff9fab3..34b56b4113 100644
--- a/types/undertaker-registry/index.d.ts
+++ b/types/undertaker-registry/index.d.ts
@@ -8,7 +8,7 @@ declare class UndertakerRegistry {
      * Returns the task with that name or undefined if no task is registered with that name.
      * Useful for custom task storage.
      * Custom registries can override this method when inheriting from this default registry.
-     * @param taskName {string} - Name of task.
+     * @param taskName - Name of task.
      */
     get<TTaskFunction>(taskName: string): TTaskFunction;
 
@@ -16,7 +16,7 @@ declare class UndertakerRegistry {
      * No-op method that receives the undertaker instance.
      * Useful to set pre-defined tasks using the undertaker.task(taskName, fn) method.
      * Custom registries can override this method when inheriting from this default registry.
-     * @param taker {any} - Instance of undertaker.
+     * @param taker - Instance of undertaker.
      */
     init(taker: any): void;
 
@@ -25,8 +25,8 @@ declare class UndertakerRegistry {
      * If set modifies a task, it should return the new task so Undertaker can properly maintain metadata for the task.
      * Useful for adding custom behavior to every task as it is registered in the system.
      * Custom registries can override this method when inheriting from this default registry.
-     * @param taskName {string} - Name of task.
-     * @param fn {UndertakerRegistry.TaskFunction} - Task function.
+     * @param taskName - Name of task.
+     * @param fn - Task function.
      */
     set<TTaskFunction>(taskName: string, fn: TTaskFunction): TTaskFunction;
 
diff --git a/types/undertaker/index.d.ts b/types/undertaker/index.d.ts
index b19ad4ac79..f7775ce28b 100644
--- a/types/undertaker/index.d.ts
+++ b/types/undertaker/index.d.ts
@@ -46,20 +46,28 @@ declare class Undertaker extends EventEmitter {
 
     /**
      * Returns the registered function.
-     * @param {string} taskName - Task name.
+     * @param taskName - Task name.
      */
     task(taskName: string): Undertaker.TaskFunction;
 
     /**
      * Register the task by the taskName.
-     * @param {string} taskName - Task name.
-     * @param {TaskFunction} fn - Task function.
+     * @param taskName - Task name.
+     * @param fn - Task function.
      */
     task(taskName: string, fn: Undertaker.TaskFunction): void;
 
+    /**
+     * Register the task by the taskName.
+     * @param taskName - Task name.
+     * @param dependencies - Task dependencies.
+     * @param fn - Task function.
+     */
+    task(taskName: string, dependencies: string[], fn: Undertaker.TaskFunction): void;
+
     /**
      * Register the task by the name property of the function.
-     * @param {TaskFunction} fn - Task function.
+     * @param fn - Task function.
      */
     task(fn: Undertaker.TaskFunction): void;
 
@@ -70,7 +78,7 @@ declare class Undertaker extends EventEmitter {
      *
      * When the returned function is executed, the tasks or functions will be executed in series,
      * each waiting for the prior to finish. If an error occurs, execution will stop.
-     * @param {...Undertaker.Task[]} tasks - List of tasks.
+     * @param tasks - List of tasks.
      */
     series(...tasks: Undertaker.Task[]): Undertaker.TaskFunction;
 
@@ -81,7 +89,7 @@ declare class Undertaker extends EventEmitter {
      *
      * When the returned function is executed, the tasks or functions will be executed in series,
      * each waiting for the prior to finish. If an error occurs, execution will stop.
-     * @param {Undertaker.Task[]} tasks - List of tasks.
+     * @param tasks - List of tasks.
      */
     series(tasks: Undertaker.Task[]): Undertaker.TaskFunction;
 
@@ -92,7 +100,7 @@ declare class Undertaker extends EventEmitter {
      *
      * When the returned function is executed, the tasks or functions will be executed in parallel,
      * all being executed at the same time. If an error occurs, all execution will complete.
-     * @param {...Undertaker.Task[]} tasks - list of tasks.
+     * @param tasks - list of tasks.
      */
     parallel(...tasks: Undertaker.Task[]): Undertaker.TaskFunction;
 
@@ -103,7 +111,7 @@ declare class Undertaker extends EventEmitter {
      *
      * When the returned function is executed, the tasks or functions will be executed in parallel,
      * all being executed at the same time. If an error occurs, all execution will complete.
-     * @param {Undertaker.Task[]} tasks - list of tasks.
+     * @param tasks - list of tasks.
      */
     parallel(tasks: Undertaker.Task[]): Undertaker.TaskFunction;
 
@@ -115,21 +123,21 @@ declare class Undertaker extends EventEmitter {
     /**
      * The tasks from the current registry will be transferred to it
      * and the current registry will be replaced with the new registry.
-     * @param {Registry} registry - Instance of registry.
+     * @param registry - Instance of registry.
      */
     registry(registry: Registry): void;
 
     /**
      * Optionally takes an object (options) and returns an object representing the tree of registered tasks.
-     * @param {Undertaker.TreeOptions} options - Tree options.
+     * @param options - Tree options.
      */
     tree(options?: Undertaker.TreeOptions): Undertaker.TreeResult;
 
     /**
      * Takes a string or function (task) and returns a timestamp of the last time the task was run successfully.
      * The time will be the time the task started.  Returns undefined if the task has not been run.
-     * @param {Undertaker.Task} task - Task.
-     * @param {number} [timeResolution] - Time resolution.
+     * @param task - Task.
+     * @param [timeResolution] - Time resolution.
      */
     lastRun(task: Undertaker.Task, timeResolution?: number): number;
 }
diff --git a/types/undertaker/undertaker-tests.ts b/types/undertaker/undertaker-tests.ts
index c7969a3c52..d9ec56255e 100644
--- a/types/undertaker/undertaker-tests.ts
+++ b/types/undertaker/undertaker-tests.ts
@@ -22,6 +22,13 @@ taker.task("task3", () => {
     });
 });
 
+taker.task("task3", ["task1"], () => {
+    return new Promise((resolve, reject) => {
+        // do things depending on "task1"
+        resolve(); // when everything is done
+    });
+});
+
 taker.task("combined", taker.series("task1", "task2"));
 
 taker.task("all", taker.parallel("combined", "task3"));
diff --git a/types/uniq/tslint.json b/types/uniq/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uniq/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/unique-random/tslint.json b/types/unique-random/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/unique-random/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/unity-webapi/tslint.json b/types/unity-webapi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/unity-webapi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/universal-analytics/index.d.ts b/types/universal-analytics/index.d.ts
index 25c72ed3ce..fd4d741190 100644
--- a/types/universal-analytics/index.d.ts
+++ b/types/universal-analytics/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/peaksandpies/universal-analytics
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Iker Pérez Brunelli <https://github.com/DarkerTV>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare namespace ua {
     type Callback = (error: Error | null, count: number) => void;
diff --git a/types/universal-router/index.d.ts b/types/universal-router/index.d.ts
index b17256ce77..47a7384872 100644
--- a/types/universal-router/index.d.ts
+++ b/types/universal-router/index.d.ts
@@ -60,9 +60,9 @@ export type Routes<C, R> = Array<Route<C, R>>;
  * @template R Result that every action function resolves to. If the action
  *  returns a Promise, R can be the type the Promise resolves to.
  *
- * @param {Routes<C, R> | Route<C, R>} routes - Single route or array of routes.
- * @param {string | String | Context & C}  pathOrContext - path to resolve or
+ * @param routes - Single route or array of routes.
+ * @param pathOrContext - path to resolve or
  *  context object that contains the path along with other data.
- * @return {Promise<R>} - Result of matched action function wrapped in a Promsie.
+ * @return - Result of matched action function wrapped in a Promsie.
  */
 export function resolve<C, R>(routes: Routes<C, R> | Route<C, R>, pathOrContext: string | String | Context & C): Promise<R>;
diff --git a/types/unorm/tslint.json b/types/unorm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/unorm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/unzip/index.d.ts b/types/unzip/index.d.ts
new file mode 100644
index 0000000000..8971ff28df
--- /dev/null
+++ b/types/unzip/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for unzip 0.1
+// Project: https://github.com/EvanOxfeld/node-unzip
+// Definitions by: Ravi L. <https://github.com/coding2012>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+export function Extract(options: { path: string }): NodeJS.WritableStream;
+export function Parse(): NodeJS.WritableStream;
+
+/**
+ * Code example from https://www.npmjs.com/package/unzip with type unzip.Entry added
+ * ```
+ * fs.createReadStream('path/to/archive.zip')
+ *  .pipe(unzip.Parse())
+ *  .on('entry', function (entry: unzip.Entry) {
+ *    var fileName = entry.path;
+ *    var type = entry.type; // 'Directory' or 'File'
+ *    var size = entry.size;
+ *    if (fileName === "this IS the file I'm looking for") {
+ *      entry.pipe(fs.createWriteStream('output/path'));
+ *    } else {
+ *      entry.autodrain();
+ *    }
+ *  });
+ * ```
+ */
+export interface Entry {
+    path: string;
+    type: 'Directory' | 'File';
+    size: number;
+    pipe: (stream: NodeJS.WritableStream) => void;
+    autodrain: () => void;
+}
diff --git a/types/unzip/tsconfig.json b/types/unzip/tsconfig.json
new file mode 100644
index 0000000000..b5207a6cdc
--- /dev/null
+++ b/types/unzip/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "unzip-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/unzip/tslint.json b/types/unzip/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/unzip/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/unzip/unzip-tests.ts b/types/unzip/unzip-tests.ts
new file mode 100644
index 0000000000..c910af7722
--- /dev/null
+++ b/types/unzip/unzip-tests.ts
@@ -0,0 +1,18 @@
+import * as unzip from 'unzip';
+import * as fs from 'fs';
+
+fs.createReadStream('path/to/archive.zip')
+    .pipe(unzip.Extract({ path: 'output/path' }));
+
+fs.createReadStream('path/to/archive.zip')
+    .pipe(unzip.Parse())
+    .on('entry', (entry: unzip.Entry) => {
+        const fileName = entry.path;
+        const type = entry.type; // 'Directory' or 'File'
+        const size = entry.size;
+        if (fileName === "this IS the file I'm looking for") {
+            entry.pipe(fs.createWriteStream('output/path'));
+        } else {
+            entry.autodrain();
+        }
+    });
diff --git a/types/urbanairship-cordova/tslint.json b/types/urbanairship-cordova/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/urbanairship-cordova/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uri-templates/tslint.json b/types/uri-templates/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uri-templates/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/urijs/tslint.json b/types/urijs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/urijs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uritemplate/index.d.ts b/types/uritemplate/index.d.ts
index 7a3f7f4d5d..25dcb497b7 100644
--- a/types/uritemplate/index.d.ts
+++ b/types/uritemplate/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for URI Template JS 0.3.4
+// Type definitions for URI Template JS 0.3
 // Project: https://github.com/fxa/uritemplate-js
 // Definitions by: Chui Tey <https://github.com/teyc>
+//                 Ruben Taelman <https://github.com/rubensworks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*
@@ -8,49 +9,32 @@
  Available via the MIT license.
 */
 
-declare namespace uritemplate {
-
-    interface UriTemplate {
-        
-        /**
-         * Expands template into a string using parameter
-         * supplied
-         */
-        expand(data: {}): string;
-    }
-
-    interface UriTemplateErrorOptions {
-        expressionText: string
-        message: string
-        position: number
-    }
-
-    interface UriTemplateError {
-        new (options: UriTemplateErrorOptions): UriTemplateError
-    }
-
-
-    interface UriTemplateStatic {
-
-        /**
-         * parse template text returning instance of UriTemplate
-         * @param template text
-         * @return instance of UriTemplate
-         * @example
-         *   import UriTemplate = require('uritemplate');
-         *   let template = UriTemplate.parse('http://localhost/query{?name,city}');
-         *   let result   = template.expand({name: 'Jayden', city: 'Wodonga'});
-         *   // returns http://localhost/query?name=Jayden&city=Wodonga
-         */
-        parse(templateText: string): uritemplate.UriTemplate;
-
-        UriTemplateError: new (options: uritemplate.UriTemplateErrorOptions) => uritemplate.UriTemplateError;
-    }
-
+export class UriTemplate {
+    /**
+     * Expands template into a string using parameter
+     * supplied
+     */
+    expand(data: {}): string;
 }
 
-declare module 'uritemplate' {
-
-    export var UriTemplate: uritemplate.UriTemplateStatic;
-
+export interface UriTemplateErrorOptions {
+    expressionText: string;
+    message: string;
+    position: number;
 }
+
+export class UriTemplateError {
+    constructor(options: UriTemplateErrorOptions);
+}
+
+/**
+ * parse template text returning instance of UriTemplate
+ * @param template text
+ * @return instance of UriTemplate
+ * @example
+ *   import UriTemplate = require('uritemplate');
+ *   let template = UriTemplate.parse('http://localhost/query{?name,city}');
+ *   let result   = template.expand({name: 'Jayden', city: 'Wodonga'});
+ *   // returns http://localhost/query?name=Jayden&city=Wodonga
+ */
+export function parse(templateText: string): UriTemplate;
diff --git a/types/uritemplate/tslint.json b/types/uritemplate/tslint.json
new file mode 100644
index 0000000000..cf21118d0e
--- /dev/null
+++ b/types/uritemplate/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-unnecessary-class": false
+    }
+}
diff --git a/types/uritemplate/uritemplate-tests.ts b/types/uritemplate/uritemplate-tests.ts
index 07ce1dbcfb..492488f8a3 100644
--- a/types/uritemplate/uritemplate-tests.ts
+++ b/types/uritemplate/uritemplate-tests.ts
@@ -1,28 +1,26 @@
-
-import { UriTemplate } from 'uritemplate';
+import { parse as parseUriTemplate, UriTemplate, UriTemplateError } from "uritemplate";
 
 function test_uritemplate() {
-
     // syntax check: UriTemplate.parse
-    var template = UriTemplate.parse('http://localhost/categories{/categoryId}{?sort,pageNumber}');
+    const template: UriTemplate = parseUriTemplate('http://localhost/categories{/categoryId}{?sort,pageNumber}');
 
     // syntax check: template.expand
-    var url = template.expand({
+    const url: string = template.expand({
         categoryId : 'shoes',
         sort: 'price',
         pageNumber: 8
     });
 
     // import module check
-    var expectedUrl = 'http://localhost/categories/shoes?sort=price&pageNumber=8';
-    if (expectedUrl != url) {
-        throw `Expected ${expectedUrl}, got ${url}`;
+    const expectedUrl = 'http://localhost/categories/shoes?sort=price&pageNumber=8';
+    if (expectedUrl !== url) {
+        throw new Error(`Expected ${expectedUrl}, got ${url}`);
     } else {
         console.log('Test passed');
     }
 
-    // syntax check: new UriTemplate.UriTemplateError
-    let error = new UriTemplate.UriTemplateError({
+    // syntax check: new UriTemplateError
+    const error: UriTemplateError = new UriTemplateError({
         expressionText: 'error expression',
         message: 'error message',
         position: 5
diff --git a/types/url-join/tslint.json b/types/url-join/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/url-join/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/url-metadata/index.d.ts b/types/url-metadata/index.d.ts
new file mode 100644
index 0000000000..2d909b15e1
--- /dev/null
+++ b/types/url-metadata/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for url-metadata 2.1
+// Project: https://github.com/LevelNewsOrg/url-metadata
+// Definitions by: Kevin Gravier <https://github.com/mrkmg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = urlMetadata;
+
+declare function urlMetadata(url: string, options?: urlMetadata.Options): Promise<urlMetadata.Result>;
+
+declare namespace urlMetadata {
+    interface Options {
+        userAgent?: string;
+        fromEmail?: string;
+        maxRedirects?: number;
+        timeout?: number;
+        descriptionLength?: number;
+        ensureSecureImageRequest?: boolean;
+        sourceMap?: { [key: string]: string };
+        encode?: () => void;
+    }
+
+    interface Result {
+        "url": string;
+        "canonical": string;
+        "title": string;
+        "image": string;
+        "author": string;
+        "description": string;
+        "keywords": string;
+        "source": string;
+        "og:url": string;
+        "og:locale": string;
+        "og:locale:alternate": string;
+        "og:title": string;
+        "og:type": string;
+        "og:description": string;
+        "og:determiner": string;
+        "og:site_name": string;
+        "og:image": string;
+        "og:image:secure_url": string;
+        "og:image:type": string;
+        "og:image:width": string;
+        "og:image:height": string;
+        "article:published_time"?: string;
+        "article:modified_time"?: string;
+        "article:expiration_time"?: string;
+        "article:author"?: string;
+        "article:section"?: string;
+        "article:tag"?: string;
+        "og:article:published_time"?: string;
+        "og:article:modified_time"?: string;
+        "og:article:expiration_time"?: string;
+        "og:article:author"?: string;
+        "og:article:section"?: string;
+        "og:article:tag"?: string;
+    }
+}
diff --git a/types/url-metadata/tsconfig.json b/types/url-metadata/tsconfig.json
new file mode 100644
index 0000000000..e12ebe2932
--- /dev/null
+++ b/types/url-metadata/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "url-metadata-tests.ts"
+    ]
+}
diff --git a/types/url-metadata/tslint.json b/types/url-metadata/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/url-metadata/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/url-metadata/url-metadata-tests.ts b/types/url-metadata/url-metadata-tests.ts
new file mode 100644
index 0000000000..ab45090783
--- /dev/null
+++ b/types/url-metadata/url-metadata-tests.ts
@@ -0,0 +1,15 @@
+import * as urlMetadata from "url-metadata";
+
+const opts: urlMetadata.Options = {
+    userAgent: "url-metadata-test",
+    fromEmail: "testing@url-metadata.com",
+    maxRedirects: 3,
+    timeout: 10000,
+    descriptionLength: 10000,
+    ensureSecureImageRequest: true
+};
+const url = "https://google.com";
+
+urlMetadata(url, opts).then((result: urlMetadata.Result) => {
+    result; // $ExpectType Result
+});
diff --git a/types/url-template/tslint.json b/types/url-template/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/url-template/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/urlrouter/tslint.json b/types/urlrouter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/urlrouter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/urlsafe-base64/tslint.json b/types/urlsafe-base64/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/urlsafe-base64/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/usage/tslint.json b/types/usage/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/usage/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/usb/index.d.ts b/types/usb/index.d.ts
index 20da725cf6..5e24e16bac 100644
--- a/types/usb/index.d.ts
+++ b/types/usb/index.d.ts
@@ -1,10 +1,12 @@
 // Type definitions for node-usb 1.1
-// Project: https://github.com/nonolith/node-usb
+// Project: https://github.com/tessel/node-usb
 // Definitions by: Eric Brody <https://github.com/underscorebrody>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference types="node" />
 
+import { EventEmitter } from "events";
+
 export class Device {
   timeout: number;
   busNumber: number;
@@ -81,25 +83,25 @@ export class InterfaceDescriptor {
   extra: Buffer;
 }
 
-export interface Endpoint {
+export interface Endpoint extends EventEmitter {
   direction: string;
   transferType: number;
   timeout: number;
   descriptor: EndpointDescriptor;
 }
 
-export class InEndpoint implements Endpoint {
+export class InEndpoint extends EventEmitter implements Endpoint {
   direction: string;
   transferType: number;
   timeout: number;
   descriptor: EndpointDescriptor;
   constructor(device: Device, descriptor: EndpointDescriptor);
   transfer(length: number, callback: (error: string, data: Buffer) => void): InEndpoint;
-  startPoll(nTransfers: number, transferSize: number): void;
-  stopPoll(cb: () => void): void;
+  startPoll(nTransfers?: number, transferSize?: number): void;
+  stopPoll(cb?: () => void): void;
 }
 
-export class OutEndpoint implements Endpoint {
+export class OutEndpoint extends EventEmitter implements Endpoint {
   direction: string;
   transferType: number;
   timeout: number;
diff --git a/types/usb/usb-tests.ts b/types/usb/usb-tests.ts
index 31e287c5b8..53b214460e 100644
--- a/types/usb/usb-tests.ts
+++ b/types/usb/usb-tests.ts
@@ -82,14 +82,19 @@ inEndpoint.transferType = 1;
 inEndpoint.timeout = 1;
 inEndpoint.descriptor = endpointDesc;
 const xferInEndpoint: usb.InEndpoint = inEndpoint.transfer(1, (error: string, data: Buffer) => inEndpoint);
+inEndpoint.on("data", (data) => null);
 inEndpoint.startPoll(1, 1);
+inEndpoint.startPoll(1);
+inEndpoint.startPoll();
 inEndpoint.stopPoll(() => null);
+inEndpoint.stopPoll();
 
 const outEndpoint: usb.OutEndpoint = new usb.OutEndpoint(device, endpointDesc);
 outEndpoint.direction = "out";
 outEndpoint.transferType = 1;
 outEndpoint.timeout = 1;
 outEndpoint.descriptor = endpointDesc;
+inEndpoint.on("error", (err) => null);
 const xferOutEndpoint: usb.OutEndpoint = outEndpoint.transfer(new Buffer([]), (error: string) => null);
 outEndpoint.transferWithZLP(new Buffer([]), (error: string) => null);
 
diff --git a/types/useragent/tslint.json b/types/useragent/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/useragent/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/username/tslint.json b/types/username/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/username/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/utf8/tslint.json b/types/utf8/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/utf8/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/utils-merge/tslint.json b/types/utils-merge/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/utils-merge/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uuid-1345/tslint.json b/types/uuid-1345/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uuid-1345/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uuid/index.d.ts b/types/uuid/index.d.ts
index 75bc7e6661..cc4c1a1ef7 100644
--- a/types/uuid/index.d.ts
+++ b/types/uuid/index.d.ts
@@ -10,11 +10,12 @@
 // because of the existing uuid-js npm types package being at 3.3.28,
 // meaning that `npm install @types/uuid` was installing the typings for uuid-js, not this
 
-import { v1, v4 } from './interfaces';
+import { v1, v4, v5 } from './interfaces';
 
 interface UuidStatic {
     v1: v1;
     v4: v4;
+    v5: v5;
 }
 
 declare const uuid: UuidStatic & v4;
diff --git a/types/uuid/v2/tslint.json b/types/uuid/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uuid/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uuidjs/index.d.ts b/types/uuidjs/index.d.ts
deleted file mode 100644
index 63f911fa16..0000000000
--- a/types/uuidjs/index.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for UUID.js v3.3.0
-// Project: https://github.com/LiosK/UUID.js
-// Definitions by: Jason Jarrett <https://github.com/staxmanade>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
-interface UUID {
-    intFields: UUIDArray<number>;
-    bitFields: UUIDArray<string>;
-    hexFields: UUIDArray<string>;
-    version: number;
-    bitString: string;
-    hexString: string;
-    urn: string;
-
-
-    /**
-     * Tests if two {@link UUID} objects are equal.
-     * @param {UUID} uuid
-     * @returns {bool} True if two {@link UUID} objects are equal.
-     */
-    equals(uuid: UUID): boolean;
-
-    /**
-     * Returns UUID string representation.
-     * @returns {string} {@link UUID#hexString}.
-     */
-    toString(): string;
-}
-
-interface UUIDArray<T> extends Array<T> {
-    timeLow: string;
-    timeMid: string;
-    timeHiAndVersion: string;
-    clockSeqHiAndReserved: string;
-    clockSeqLow: string;
-    node: string;
-}
-
-/**
- * The simplest function to get an UUID string.
- * @returns {string} A version 4 UUID string.
- */
-export declare function generate(): string;
-
-/**
- * Generates a version 4 {@link UUID}.
- * @returns {UUID} A version 4 {@link UUID} object.
- * @since 3.0
- */
-export declare function genV4(): UUID;
-
-
-/**
- * Generates a version 1 {@link UUID}.
- * @returns {UUID} A version 1 {@link UUID} object.
- * @since 3.0
- */
-export declare function genV1(): UUID;
-
-/**
- * Converts hexadecimal UUID string to an {@link UUID} object.
- * @param {string} uuid UUID hexadecimal string representation ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
- * @returns {UUID} {@link UUID} object or null.
- * @since 3.0
- */
-export declare function parse(uuid: string): UUID;
-
-
-/**
- * Re-initializes version 1 UUID state.
- * @since 3.0
- */
-export declare function resetState(): void;
-
-/**
- * Reinstalls {@link UUID.generate} method to emulate the interface of UUID.js version 2.x.
- * @since 3.1
- * @deprecated Version 2.x. compatible interface is not recommended.
- */
-export declare function makeBackwardCompatible(): void;
diff --git a/types/uuidjs/tsconfig.json b/types/uuidjs/tsconfig.json
deleted file mode 100644
index ee3725fc8f..0000000000
--- a/types/uuidjs/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "uuidjs-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/uuidjs/uuidjs-tests.ts b/types/uuidjs/uuidjs-tests.ts
deleted file mode 100644
index 51bed1c700..0000000000
--- a/types/uuidjs/uuidjs-tests.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import UUID = require("uuidjs");
-
-const uuid1: string = UUID.generate()
-const uuid2: UUID.UUID = UUID.genV4()
-const uuid3: UUID.UUID = UUID.genV1()
-
-// Copied below from readme at https://github.com/LiosK/UUID.js
-
-// the simplest way to get an UUID (as a hexadecimal string)
-console.log(UUID.generate());  // "0db9a5fa-f532-4736-89d6-8819c7f3ac7b"
-
-// create a version 4 (random-numbers-based) UUID object
-var objV4 = UUID.genV4();
-
-// create a version 1 (time-based) UUID object
-var objV1 = UUID.genV1();
-
-// create an UUID object from a hexadecimal string
-var uuid = UUID.parse("a0e0f130-8c21-11df-92d9-95795a3bcd40");
-
-
-// UUID object as a string
-console.log(uuid.toString());  // "a0e0f130-8c21-11df-92d9-95795a3bcd40"
-console.log(uuid.hexString);   // "a0e0f130-8c21-11df-92d9-95795a3bcd40"
-console.log(uuid.bitString);   // "101000001110000 ... 1100110101000000"
-console.log(uuid.urn);         // "urn:uuid:a0e0f130-8c21-11df-92d9-95795a3bcd40"
-
-// compare UUID objects
-console.log(objV4.equals(objV1));  // false
-
-// show version numbers
-console.log(objV4.version);  // 4
-console.log(objV1.version);  // 1
-
-// get UUID field values in 3 different formats by 2 different accessors
-console.log(uuid.intFields.timeLow);               // 2699096368
-console.log(uuid.bitFields.timeMid);               // "1000110000100001"
-console.log(uuid.hexFields.timeHiAndVersion);      // "11df"
-console.log(uuid.intFields.clockSeqHiAndReserved); // 146
-console.log(uuid.bitFields.clockSeqLow);           // "11011001"
-console.log(uuid.hexFields.node);                  // "95795a3bcd40"
-
-console.log(uuid.intFields[0]);                    // 2699096368
-console.log(uuid.bitFields[1]);                    // "1000110000100001"
-console.log(uuid.hexFields[2]);                    // "11df"
-console.log(uuid.intFields[3]);                    // 146
-console.log(uuid.bitFields[4]);                    // "11011001"
-console.log(uuid.hexFields[5]);                    // "95795a3bcd40"
diff --git a/types/uws/index.d.ts b/types/uws/index.d.ts
index 89578fc22d..6072c41534 100644
--- a/types/uws/index.d.ts
+++ b/types/uws/index.d.ts
@@ -56,7 +56,7 @@ declare class WebSocket extends events.EventEmitter {
     }) => void): void;
     addEventListener(method: 'error', cb?: (err: Error) => void): void;
     addEventListener(method: 'open', cb?: (event: { target: WebSocket }) => void): void;
-    addEventListener(method: string, listener?: () => void): void;
+    addEventListener(method: string, listener?: (...args: any[]) => void): void;
 
     // Events
     on(event: 'error', cb: (err: Error) => void): this;
@@ -65,7 +65,7 @@ declare class WebSocket extends events.EventEmitter {
     on(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
     on(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
     on(event: 'open', cb: () => void): this;
-    on(event: string, listener: () => void): this;
+    on(event: string, listener: (...args: any[]) => void): this;
 
     addListener(event: 'error', cb: (err: Error) => void): this;
     addListener(event: 'close', cb: (code: number, message: string) => void): this;
@@ -73,7 +73,7 @@ declare class WebSocket extends events.EventEmitter {
     addListener(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
     addListener(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
     addListener(event: 'open', cb: () => void): this;
-    addListener(event: string, listener: () => void): this;
+    addListener(event: string, listener: (...args: any[]) => void): this;
 }
 
 declare namespace WebSocket {
@@ -142,12 +142,12 @@ declare namespace WebSocket {
         on(event: 'error', cb: (err: Error) => void): this;
         on(event: 'headers', cb: (headers: string[]) => void): this;
         on(event: 'connection', cb: (client: WebSocket) => void): this;
-        on(event: string, listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
 
         addListener(event: 'error', cb: (err: Error) => void): this;
         addListener(event: 'headers', cb: (headers: string[]) => void): this;
         addListener(event: 'connection', cb: (client: WebSocket) => void): this;
-        addListener(event: string, listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
     }
 
     export interface UwsHttp {
diff --git a/types/uws/tslint.json b/types/uws/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uws/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/v8-profiler/tslint.json b/types/v8-profiler/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/v8-profiler/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/valdr-message/tslint.json b/types/valdr-message/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/valdr-message/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/valdr/tslint.json b/types/valdr/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/valdr/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/valerie/index.d.ts b/types/valerie/index.d.ts
index cab8ee7467..733014b37e 100644
--- a/types/valerie/index.d.ts
+++ b/types/valerie/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/davewatts/valerie
 // Definitions by: Howard Richards <https://github.com/conficient>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 
diff --git a/types/valerie/tslint.json b/types/valerie/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/valerie/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vali-date/index.d.ts b/types/vali-date/index.d.ts
new file mode 100644
index 0000000000..8df7dee517
--- /dev/null
+++ b/types/vali-date/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for vali-date 1.0
+// Project: https://github.com/SamVerschueren/vali-date
+// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function valiDate(input: string): boolean;
+declare namespace valiDate { }
+export = valiDate;
diff --git a/types/vali-date/tsconfig.json b/types/vali-date/tsconfig.json
new file mode 100644
index 0000000000..8e27969380
--- /dev/null
+++ b/types/vali-date/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "vali-date-tests.ts"
+    ]
+}
diff --git a/types/vali-date/tslint.json b/types/vali-date/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/vali-date/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/vali-date/vali-date-tests.ts b/types/vali-date/vali-date-tests.ts
new file mode 100644
index 0000000000..85a3e39bc5
--- /dev/null
+++ b/types/vali-date/vali-date-tests.ts
@@ -0,0 +1,5 @@
+import * as valiDate from 'vali-date';
+
+valiDate('foo');
+valiDate('bar');
+valiDate('2017-05-10');
diff --git a/types/valid-url/tslint.json b/types/valid-url/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/valid-url/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/validate.js/index.d.ts b/types/validate.js/index.d.ts
deleted file mode 100644
index 35754e844c..0000000000
--- a/types/validate.js/index.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for Validate.js
-// Project: https://github.com/ansman/validate.js
-// Definitions by: Travis Hill <https://github.com/HillTravis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace ValidateJS {
-
-  export interface Validator {
-    message?: string | ((value: any, attribute: any, validatorOptions: any, attributes: any, globalOptions: any) => string);
-  }
-
-  namespace Validator {
-
-    export interface Date extends Validator {
-      earliest?: string;
-      latest?: string;
-
-      notValid?: string;
-      tooEarly?: string;
-      tooLate?: string;
-    }
-
-    export interface DateTime extends Date {
-      dateOnly?: boolean;
-    }
-
-    export interface Email extends Validator {}
-
-    export interface Equality extends Validator {
-      attribute?: string;
-      comparator?: (v1: any, v2: any) => boolean;
-    }
-
-    export interface Exclusion extends Validator {
-      within: any[] | {[key: string]: any};
-    }
-
-    export interface Format extends Validator {
-      pattern: string | RegExp;
-      flags?: string;
-    }
-
-    export interface Inclusion extends Validator {
-      within: any[] | {[key: string]: any};
-    }
-
-    export interface Length extends Validator {
-      is?: number;
-      minimum?: number;
-      maximum?: number;
-
-      notValid?: string;
-      tooLong?: string;
-      tooShort?: string;
-      wrongLength?: string;
-
-      tokenizer?: (value: string | any[]) => string | any[];
-    }
-
-    export interface Numericality extends Validator {
-      onlyInteger?: boolean;
-      strict?: boolean;
-      greaterThan?: number;
-      greaterThanOrEqualTo?: number;
-      equalTo?: number;
-      lessThanOrEqualTo?: number;
-      lessThan?: number;
-      divisibleBy?: number;
-      odd?: boolean;
-      even?: boolean;
-
-      notValid?: string;
-      notInteger?: string;
-      notGreaterThan?: string;
-      notGreaterThanOrEqualTo?: string;
-      notEqualTo?: string;
-      notLessThanOrEqualTo?: string;
-      notLessThan?: string;
-      notDivisibleBy?: string;
-      notOdd?: string;
-      notEven?: string;
-    }
-
-    export interface Presence extends Validator {}
-
-    export interface Url extends Validator {
-      schemes?: [string | RegExp];
-      allowLocal?: boolean;
-    }
-  }
-
-  export interface Field {
-    date?: Validator.Date | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Date);
-    datetime?: Validator.DateTime | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.DateTime);
-    email?: Validator.Email | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Email);
-    equality?: Validator.Equality | string | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Equality);
-    exclusion?: Validator.Exclusion | any[] | {[key: string]: any} | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Exclusion);
-    format?: Validator.Format | string | RegExp | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Format);
-    inclusion?: Validator.Inclusion | any[] | {[key: string]: any} | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Inclusion);
-    length?: Validator.Length | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Length);
-    numericality?: Validator.Numericality | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Numericality);
-    presence?: Validator.Presence | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Presence);
-    url?: Validator.Url | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Url);
-  }
-
-  export interface Constraints {
-    [attribute: string]: Field | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Field);
-  }
-}
diff --git a/types/validate.js/tsconfig.json b/types/validate.js/tsconfig.json
deleted file mode 100644
index 3da830187f..0000000000
--- a/types/validate.js/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "validate.js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/validate.js/validate.js-tests.ts b/types/validate.js/validate.js-tests.ts
deleted file mode 100644
index f2dcb79838..0000000000
--- a/types/validate.js/validate.js-tests.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-import Validator = ValidateJS.Validator;
-import Field = ValidateJS.Field;
-import Constraints = ValidateJS.Constraints;
-
-let validator: Validator;
-validator = {};
-validator = {message: 'test'};
-validator = {message: (value: any, attribute: any, validatorOptions: any, attributes: any, globalOptions: any) => 'test'};
-
-let date: Validator.Date;
-date = {};
-date = {
-	earliest: 'a',
-	latest: 'b',
-	notValid: 'c',
-	tooEarly: 'd',
-	tooLate: 'e',
-	message: 'test',
-};
-
-let dateTime: Validator.DateTime;
-dateTime = {};
-dateTime = {
-	dateOnly: true,
-	earliest: 'a',
-	latest: 'b',
-	notValid: 'c',
-	tooEarly: 'd',
-	tooLate: 'e',
-	message: 'test',
-};
-
-let email: Validator.Email;
-email = {};
-email = {message: 'test'};
-
-let equality: Validator.Equality;
-equality = {};
-equality = {
-	attribute: 'a',
-	comparator: (v1: any, v2: any) => true,
-	message: 'test',
-};
-
-let exclusion: Validator.Exclusion;
-exclusion = {
-	within: ['a', 'b'],
-	message: 'test',
-};
-exclusion = {
-	within: {a: 'b', c: 'd'},
-};
-
-let format: Validator.Format;
-format = {
-	pattern: 'a',
-	message: 'test',
-};
-format = {
-	pattern: /a/g,
-};
-format = {
-	pattern: new RegExp('a'),
-};
-
-let inclusion: Validator.Inclusion;
-inclusion = {
-	within: ['a', 'b'],
-	message: 'test',
-};
-inclusion = {
-	within: {a: 'b', c: 'd'},
-};
-
-let _length: Validator.Length;
-_length = {};
-_length = {
-	is: 1,
-	notValid: 'a',
-	wrongLength: 'b',
-	message: 'test',
-	tokenizer: (value: any[]) => [1, 2],
-};
-_length = {
-	minimum: 2,
-	maximum: 4,
-	tooShort: 'a',
-	tooLong: 'b',
-	tokenizer: (value: string) => 'test',
-};
-
-let numericality: Validator.Numericality;
-numericality = {};
-numericality = {
-	onlyInteger: true,
-	strict: true,
-	equalTo: 8,
-	divisibleBy: 4,
-	even: true,
-	notValid: 'a',
-	notInteger: 'b',
-	notEqualTo: 'c',
-	notDivisibleBy: 'd',
-	notEven: 'e',
-	message: 'test',
-};
-numericality = {
-	greaterThan: 4,
-	lessThan: 10,
-	odd: true,
-	notGreaterThan: 'a',
-	notLessThan: 'b',
-	notOdd: 'c',
-};
-numericality = {
-	greaterThanOrEqualTo: 4,
-	lessThanOrEqualTo: 7,
-	notGreaterThanOrEqualTo: 'a',
-	notLessThanOrEqualTo: 'b',
-};
-
-let presence: Validator.Presence;
-presence = {};
-presence = {message: 'test'};
-
-let url: Validator.Url;
-url = {};
-url = {
-	schemes: ['a', /b/g, new RegExp('c')],
-	allowLocal: true,
-	message: 'test',
-};
-
-let field: Field;
-field = {};
-field = {
-	date: {earliest: 'a'},
-	datetime: {dateOnly: true},
-	email: {message: 'test'},
-	equality: {attribute: 'b'},
-	exclusion: {within: ['c']},
-	format: {pattern: 'd'},
-	inclusion: {within: ['e']},
-	length: {is: 4},
-	numericality: {onlyInteger: true},
-	presence: {message: 'test2'},
-	url: {schemes: ['f']},
-};
-field = {
-	date: true,
-	datetime: true,
-	email: true,
-	equality: 'a',
-	exclusion: ['b'],
-	format: 'c',
-	inclusion: ['d'],
-	numericality: true,
-	presence: true,
-	url: true,
-};
-field = {
-	format: /a/g,
-};
-field = {
-	date: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({earliest: 'a'}),
-	datetime: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({dateOnly: true}),
-	email: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({message: 'test'}),
-	equality: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({attribute: 'b'}),
-	exclusion: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({within: ['c']}),
-	format: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({pattern: 'd'}),
-	inclusion: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({within: ['e']}),
-	length: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({is: 4}),
-	numericality: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({onlyInteger: true}),
-	presence: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({message: 'test2'}),
-	url: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({schemes: ['f']}),
-};
-
-let constraints: Constraints;
-constraints = {};
-constraints = {
-	a: {date: true},
-	b: (value: any, attribute: any, attributeName: any, options: any, constraints: any) => ({datetime: true}),
-};
\ No newline at end of file
diff --git a/types/validator/tslint.json b/types/validator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/validator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/validatorjs/index.d.ts b/types/validatorjs/index.d.ts
index cf962f1568..b5047a6656 100644
--- a/types/validatorjs/index.d.ts
+++ b/types/validatorjs/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for validatorjs v3.7.0
 // Project: https://github.com/skaterdav85/validatorjs
 // Definitions by: Karol Janyst <https://github.com/LKay>
+//                 Dan Manastireanu <https://github.com/danmana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Validator {
@@ -14,7 +15,7 @@ declare namespace Validator {
     }
 
     interface ErrorMessages {
-        [key: string]: string
+        [key: string]: string | ErrorMessages
     }
 
     interface AttributeNames {
diff --git a/types/validatorjs/tslint.json b/types/validatorjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/validatorjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/validatorjs/validatorjs-tests.ts b/types/validatorjs/validatorjs-tests.ts
index b25551bc2f..c8094936b7 100644
--- a/types/validatorjs/validatorjs-tests.ts
+++ b/types/validatorjs/validatorjs-tests.ts
@@ -24,7 +24,14 @@ var error: Array<string> = errors.get("foo")
 var first: string | boolean = errors.first("foo")
 var has: boolean = errors.has("foo")
 
-Validator.setMessages("en", {})
+Validator.setMessages("en", {
+        integer: 'The :attribute must be an integer.',
+        min: {
+            numeric: 'The :attribute must be at least :min.',
+            string: 'The :attribute must be at least :min characters.'
+        }
+    }
+);
 var messages: Validator.ErrorMessages = Validator.getMessages("en")
 Validator.useLang("en")
 var lang: string = Validator.getDefaultLang()
diff --git a/types/vanilla-modal/index.d.ts b/types/vanilla-modal/index.d.ts
new file mode 100644
index 0000000000..6c15609ce2
--- /dev/null
+++ b/types/vanilla-modal/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for vanilla-modal 1.6
+// Project: https://github.com/benceg/vanilla-modal
+// Definitions by: Sam Nau <https://github.com/samnau>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface VanillaModalConfig {
+  modal?: string | HTMLElement;
+  modalInner?: string;
+  modalContent?: string;
+  open?: string;
+  close?: string;
+  page?: string;
+  class?: string;
+  loadClass?: string;
+  clickOutside?: boolean;
+  closeKeys?: [number];
+  transitions?: string;
+  transitionEnd?(): undefined;
+  onBeforeOpen?(): undefined;
+  onBeforeClose?(): undefined;
+  onOpen?(): undefined;
+  onClose?(): undefined;
+}
+export interface VanillaModalDomNodes {
+  modal: HTMLElement;
+  page: HTMLElement;
+  modalInner: HTMLElement;
+  modalContent: HTMLElement;
+}
+
+export default class VanillaModal {
+  constructor(settings?: VanillaModalConfig);
+  getDomNodes(): VanillaModalDomNodes;
+  addLoadedCssClass(): void;
+  setOpenId(id: string): void;
+  removeOpenId(): void;
+  open(allMatches: string, e?: Event): void;
+  detectTransition(): boolean;
+  close(e?: Event): void;
+  closeModal(e: Event): void;
+  closeModalWithTransition(e: Event): void;
+  captureNode(node: Node): void;
+  releaseNode(node: Node): void;
+  closeKeyHandler(e: Event): void;
+  outsideClickHandler(e: Event): void;
+  delegateOpen(e: Event): void;
+  delegateClose(e: Event): void;
+  listen(): void;
+  destroy(): void;
+}
diff --git a/types/vanilla-modal/tsconfig.json b/types/vanilla-modal/tsconfig.json
new file mode 100644
index 0000000000..f6d7663c4f
--- /dev/null
+++ b/types/vanilla-modal/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames" : true
+    },
+    "files": [
+        "index.d.ts",
+        "vanilla-modal-tests.ts"
+    ]
+}
diff --git a/types/vanilla-modal/tslint.json b/types/vanilla-modal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vanilla-modal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vanilla-modal/vanilla-modal-tests.ts b/types/vanilla-modal/vanilla-modal-tests.ts
new file mode 100644
index 0000000000..69c98baf3c
--- /dev/null
+++ b/types/vanilla-modal/vanilla-modal-tests.ts
@@ -0,0 +1,4 @@
+import VanillaModal from 'vanilla-modal';
+
+const modalInstance = new VanillaModal();
+modalInstance.open('#foo');
diff --git a/types/vast-client/index.d.ts b/types/vast-client/index.d.ts
index 680e1e2dd8..4ab079a431 100644
--- a/types/vast-client/index.d.ts
+++ b/types/vast-client/index.d.ts
@@ -200,7 +200,7 @@ export interface VastRequestOptions {
      * A VAST XML document. When response is provided, no Ajax request is made and thus the url parameter is ignored.
      */
     response?: string;
-    /**a
+    /**
      * A URL handler module, used to fetch the VAST document instead of the default ones.
      */
     urlhandler?: any;
diff --git a/types/vec3/tslint.json b/types/vec3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vec3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vectorious/tslint.json b/types/vectorious/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vectorious/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vega/tslint.json b/types/vega/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vega/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/velocity-animate/index.d.ts b/types/velocity-animate/index.d.ts
index 63574f7503..f6b696870f 100644
--- a/types/velocity-animate/index.d.ts
+++ b/types/velocity-animate/index.d.ts
@@ -6,6 +6,12 @@
 
 /// <reference types="jquery" />
 
+declare const Velocity: jquery.velocity.VelocityStatic;
+
+declare module "velocity-animate" {
+  export = Velocity;
+}
+
 interface JQuery {
 	velocity(name: string, options: jquery.velocity.RegisteredEffectOptions): JQuery;
 	velocity(options: {properties: jquery.velocity.Properties; options: jquery.velocity.Options}): JQuery;
diff --git a/types/velocity-animate/tslint.json b/types/velocity-animate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/velocity-animate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/verror/index.d.ts b/types/verror/index.d.ts
index ec2cb0f698..36d2a9ef3b 100644
--- a/types/verror/index.d.ts
+++ b/types/verror/index.d.ts
@@ -30,7 +30,7 @@ declare class VError extends Error {
 
     cause(): Error | undefined;
     constructor(options: VError.Options | Error, message: string, ...params: any[]);
-    constructor(message: string, ...params: any[]);
+    constructor(message?: string, ...params: any[]);
 }
 
 declare namespace VError {
@@ -39,7 +39,7 @@ declare namespace VError {
     }
 
     interface Options {
-        cause?: Error | null | undefined;
+        cause?: Error | null;
         name?: string;
         strict?: boolean;
         constructorOpt?(...args: any[]): void;
diff --git a/types/vex-js/tslint.json b/types/vex-js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vex-js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vexflow/tslint.json b/types/vexflow/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vexflow/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index caccb1774a..2ef3b03f19 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: bizen241 <https://github.com/bizen241>
 //                 Junyoung Choi <https://github.com/rokt33r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.4
 
 /// <reference types='node' />
 
diff --git a/types/victor/tslint.json b/types/victor/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/victor/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 6640fdd7f5..b41fb96068 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -764,6 +764,10 @@ declare module "victory" {
          * @default <GridLine/>
          */
         gridComponent?: React.ReactElement<any>;
+        /**
+         * If true, this value will flip the domain of a given axis.
+         */
+        invertAxis?: boolean;
         /**
          * The label prop defines the label that will appear along the axis. This
          * prop should be given as a value or an entire, HTML-complete label
diff --git a/types/victory/tslint.json b/types/victory/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/victory/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index c6df37371c..cde81fbe46 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -1,7 +1,9 @@
 // Type definitions for Video.js 6.2
-// Project: https://github.com/zencoder/video-js
+// Project: https://github.com/videojs/video.js
 // Definitions by: Vincent Bortone <https://github.com/vbortone>
 //                 Simon Clériot <https://github.com/scleriot>
+//                 Sean Bennett <https://github.com/SWBennett06>
+//                 Christoph Wagner <https://github.com/IgelCampus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // The Video.js API allows you to interact with the video through
@@ -15,15 +17,24 @@ export as namespace videojs;
 declare namespace videojs {
 	interface PlayerOptions {
 		techOrder?: string[];
+		sourceOrder?: boolean;
 		html5?: any;
 		width?: number;
 		height?: number;
 		defaultVolume?: number;
 		children?: string[];
+		loop?: boolean;
+		muted?: boolean;
 		controls?: boolean;
 		src?: string;
 		autoplay?: boolean;
 		preload?: string;
+		sources?: Source[];
+		aspectRatio?: string;
+		fluid?: boolean;
+		language?: string;
+		notSupportedMessage?: string;
+		plugins?: any;
 	}
 
 	interface Source {
diff --git a/types/viewerjs/index.d.ts b/types/viewerjs/index.d.ts
index 28c26c911e..20a0806633 100644
--- a/types/viewerjs/index.d.ts
+++ b/types/viewerjs/index.d.ts
@@ -212,7 +212,6 @@ declare namespace Viewer {
 
     /**
      * Change the global default options.
-     * @param options
      */
     function setDefaults(options: ViewerOption): void;
 
@@ -222,7 +221,8 @@ declare namespace Viewer {
     function noConflict(): void;
 }
 
-/** * JavaScript image viewer.
+/**
+ * JavaScript image viewer.
  * @see {@link https://github.com/fengyuanchen/viewerjs}
  */
 declare class Viewer {
@@ -292,7 +292,6 @@ declare class Viewer {
 
     /**
      * Rotate the image to an absolute degree.
-     * @param degree
      */
     rotateTo(degree: number): void;
 
@@ -365,7 +364,8 @@ declare class Viewer {
     destroy(): void;
 }
 
-/** JavaScript image viewer.
+/**
+ * JavaScript image viewer.
  * @see {@link https://github.com/fengyuanchen/viewerjs}
  */
 export = Viewer;
diff --git a/types/viewporter/tslint.json b/types/viewporter/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/viewporter/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/viewporter/viewporter-tests.ts b/types/viewporter/viewporter-tests.ts
index 9c720bec65..94df0749fa 100644
--- a/types/viewporter/viewporter-tests.ts
+++ b/types/viewporter/viewporter-tests.ts
@@ -45,12 +45,12 @@ function test_swipey() {
     function rainbow(numOfSteps, step) {
             var r, g, b, h = step / numOfSteps, i = ~~(h * 6), f = h * 6 - i, q = 1 - f;
         switch (i % 6) {
-            case 0: r = 1, g = f, b = 0; break;
-            case 1: r = q, g = 1, b = 0; break;
-            case 2: r = 0, g = 1, b = f; break;
-            case 3: r = 0, g = q, b = 1; break;
-            case 4: r = f, g = 0, b = 1; break;
-            case 5: r = 1, g = 0, b = q; break;
+            case 0: r = 1; g = f; b = 0; break;
+            case 1: r = q; g = 1; b = 0; break;
+            case 2: r = 0; g = 1; b = f; break;
+            case 3: r = 0; g = q; b = 1; break;
+            case 4: r = f; g = 0; b = 1; break;
+            case 5: r = 1; g = 0; b = q; break;
         }
         return [((~ ~(r * 255))), (~ ~(g * 255)), (~ ~(b * 255))];
     }
@@ -109,7 +109,7 @@ function test_swipey() {
         var canvas = <HTMLCanvasElement>$('canvas')[0];
         var context = canvas.getContext('2d');
         var iOS = (/iphone|ipad/i).test(navigator.userAgent);
-        var pointers = {};
+        var pointers = new Map<string, any>();
         // handle resizing / rotating of the viewport
         var width, height;
         $(window).bind(viewporter.ACTIVE ? 'viewportchange' : 'resize', function () {
@@ -123,11 +123,12 @@ function test_swipey() {
             for (var i = 0; i < touches.length; i++) {
                 identifier = touches[i].identifier || 'mouse';
                 // if no pointer has been created for this finger yet, do it
-                if (!pointers[identifier]) {
-                    pointers[identifier] = new drawingPointer(context, rainbow(8, Object.keys(pointers).length));
+                let pointer = pointers.get(identifier);
+                if (!pointer) {
+                    pointers.set(identifier, pointer = new drawingPointer(context, rainbow(8, Object.keys(pointers).length)));
                 }
-                pointers[identifier].start();
-                pointers[identifier].addPoint(touches[i].pageX, touches[i].pageY);
+                pointer.start();
+                pointer.addPoint(touches[i].pageX, touches[i].pageY);
             }
         });
 
@@ -136,8 +137,9 @@ function test_swipey() {
             var identifier;
             for (var i = 0; i < touches.length; i++) {
                 identifier = touches[i].identifier || 'mouse';
-                if (pointers[identifier] && pointers[identifier].painting) {
-                    pointers[identifier].addPoint(touches[i].pageX, touches[i].pageY, true);
+                const pointer = pointers.get(identifier);
+                if (pointer && pointer.painting) {
+                    pointer.addPoint(touches[i].pageX, touches[i].pageY, true);
                 }
             }
         });
@@ -147,11 +149,12 @@ function test_swipey() {
             var identifier;
             for (var i = 0; i < touches.length; i++) {
                 identifier = touches[i].identifier || 'mouse';
-                if (pointers[identifier]) {
-                    pointers[identifier].stop();
+                const pointer = pointers.get(identifier);
+                if (pointer) {
+                    pointer.stop();
                     (function (identifier) {
                         setTimeout(function () {
-                            delete pointers[identifier];
+                            pointers.delete(identifier);
                         }, 300);
                     })(identifier);
                 }
@@ -161,14 +164,14 @@ function test_swipey() {
         window.setInterval(function () {
             context.clearRect(0, 0, width, height);
             var counter = 0, ratio = (<any>window).devicePixelRatio || 1;
-            for (var identifier in pointers) {
-                pointers[identifier].redraw();
+            pointers.forEach(pointer => {
+                pointer.redraw();
                 counter++;
-            }
+            });
             context.font = (10 * ratio) + 'pt Arial';
             context.fillText(counter + ' active pointers', 15 * ratio, 25 * ratio);
 
         }, 16);
 
     });
-}
\ No newline at end of file
+}
diff --git a/types/vimeo/tslint.json b/types/vimeo/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vimeo/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vinyl-buffer/index.d.ts b/types/vinyl-buffer/index.d.ts
index 72d5067769..949efd20cc 100644
--- a/types/vinyl-buffer/index.d.ts
+++ b/types/vinyl-buffer/index.d.ts
@@ -1,15 +1,12 @@
-// Type definitions for vinyl-buffer
+// Type definitions for vinyl-buffer 1.0
 // Project: https://github.com/hughsk/vinyl-buffer
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-
 declare namespace buffer {
-    interface Buffer {
-        (): NodeJS.ReadWriteStream;
-    }
+    type Buffer = () => NodeJS.ReadWriteStream;
 }
 
 declare var buffer: buffer.Buffer;
diff --git a/types/vinyl-buffer/tsconfig.json b/types/vinyl-buffer/tsconfig.json
index a3d680f61e..e96042ec50 100644
--- a/types/vinyl-buffer/tsconfig.json
+++ b/types/vinyl-buffer/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/vinyl-buffer/tslint.json b/types/vinyl-buffer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vinyl-buffer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vinyl-buffer/vinyl-buffer-tests.ts b/types/vinyl-buffer/vinyl-buffer-tests.ts
index b1311ccbc0..fdfb84b194 100644
--- a/types/vinyl-buffer/vinyl-buffer-tests.ts
+++ b/types/vinyl-buffer/vinyl-buffer-tests.ts
@@ -1,8 +1,8 @@
 import buffer = require('vinyl-buffer');
-import gulp = require('gulp')
+import gulp = require('gulp');
 import browserify = require('browserify');
 
-gulp.task('build', function() {
+gulp.task('build', () => {
     return browserify('./index.js')
         .bundle()
         .pipe(buffer())
diff --git a/types/vinyl-fs/index.d.ts b/types/vinyl-fs/index.d.ts
index 4e0ac3317b..d3b13baeaa 100644
--- a/types/vinyl-fs/index.d.ts
+++ b/types/vinyl-fs/index.d.ts
@@ -108,12 +108,14 @@ export interface SrcOptions extends globStream.Options {
 }
 
 export interface DestOptions {
-   /** Specify the working directory the folder is relative to
+   /**
+    * Specify the working directory the folder is relative to
     * Default is process.cwd()
     */
    cwd?: string;
 
-   /** Specify the mode the files should be created with
+   /**
+    * Specify the mode the files should be created with
     * Default is the mode of the input file (file.stat.mode)
     * or the process mode if the input file has no mode property
     */
@@ -125,12 +127,14 @@ export interface DestOptions {
    /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
    overwrite?: boolean;
 
-   /** Enables sourcemap support on files passed through the stream. Will write inline soucemaps if
+   /**
+    * Enables sourcemap support on files passed through the stream. Will write inline soucemaps if
     * specified as true. Specifying a string path will write external sourcemaps at the given path.
     */
    sourcemaps?: true | string;
 
-   /** When creating a symlink, whether or not the created symlink should be relative. If false,
+   /**
+    * When creating a symlink, whether or not the created symlink should be relative. If false,
     * the symlink will be absolute. Note: This option will be ignored if a junction is being created.
     */
    relativeSymlinks?: boolean;
diff --git a/types/vinyl-fs/vinyl-fs-tests.ts b/types/vinyl-fs/vinyl-fs-tests.ts
index 573f25f086..9aa9a02513 100644
--- a/types/vinyl-fs/vinyl-fs-tests.ts
+++ b/types/vinyl-fs/vinyl-fs-tests.ts
@@ -13,9 +13,20 @@ import File = require('vinyl');
 // const spies = require('./spy');
 declare const spies: any;
 
-import * as should from 'should';
 import 'mocha';
 
+// TODO: These aren't useful as types tests since they take `any`.
+declare const should: ShouldStatic;
+interface ShouldStatic {
+	exist(obj: any, desc?: string): void;
+	not: this;
+}
+declare global {
+	interface Object {
+		should: { equal(obj: any): void; };
+	}
+}
+
 declare const gulp: any;
 let bufferStream: any;
 
diff --git a/types/vinyl-paths/tsconfig.json b/types/vinyl-paths/tsconfig.json
index 231e345008..520193e6cf 100644
--- a/types/vinyl-paths/tsconfig.json
+++ b/types/vinyl-paths/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/vinyl-paths/tslint.json b/types/vinyl-paths/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vinyl-paths/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vinyl-source-stream/tsconfig.json b/types/vinyl-source-stream/tsconfig.json
index 7d29c29e60..8167f27eeb 100644
--- a/types/vinyl-source-stream/tsconfig.json
+++ b/types/vinyl-source-stream/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/vinyl-source-stream/tslint.json b/types/vinyl-source-stream/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vinyl-source-stream/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vinyl/index.d.ts b/types/vinyl/index.d.ts
index f6cd0c8609..c62007372e 100644
--- a/types/vinyl/index.d.ts
+++ b/types/vinyl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for vinyl 2.0.0
+// Type definitions for vinyl 2.0
 // Project: https://github.com/gulpjs/vinyl
 // Definitions by: vvakame <https://github.com/vvakame>, jedmao <https://github.com/jedmao>, Georgii Dolzhykov <https://github.com/thorn0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,8 +9,8 @@ import * as fs from 'fs';
 
 interface ConstructorOptions {
     /**
-    * The current working directory of the file. Default: process.cwd()
-    */
+     * The current working directory of the file. Default: process.cwd()
+     */
     cwd?: string;
 
     /**
diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
new file mode 100644
index 0000000000..1e30988418
--- /dev/null
+++ b/types/vinyl/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-var-requires": false
+    }
+}
diff --git a/types/vinyl/v0/tslint.json b/types/vinyl/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vinyl/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vinyl/v0/vinyl-tests.ts b/types/vinyl/v0/vinyl-tests.ts
index e9017f7235..27ea92a283 100644
--- a/types/vinyl/v0/vinyl-tests.ts
+++ b/types/vinyl/v0/vinyl-tests.ts
@@ -1,7 +1,4 @@
 /// <reference types="mocha" />
-/// <reference types="should" />
-
-
 
 import File = require('vinyl');
 import Stream = require('stream');
@@ -9,6 +6,23 @@ import fs = require('fs');
 
 declare var fakeStream: NodeJS.ReadWriteStream;
 
+// TODO: These aren't useful as types tests since they take `any`.
+declare const should: ShouldStatic;
+interface ShouldStatic {
+	exist(obj: any, desc?: string): void;
+	not: this;
+};
+interface Should {
+	be: { true: undefined; false: undefined; };
+	equal(obj: any, desc?: string): void;
+	not: this;
+}
+declare global {
+	interface Object {
+		should: Should;
+	}
+}
+
 describe('File', () => {
 
 	describe('constructor()', () => {
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index f9e71dd532..3a73249b60 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -3,8 +3,8 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as expect from 'expect';
-var miss = require('mississippi');
-var cloneable = require('cloneable-readable');
+const miss = require('mississippi');
+const cloneable = require('cloneable-readable');
 
 import File = require('vinyl');
 
@@ -24,60 +24,56 @@ interface TestFile extends File {
 	_base?: string;
 }
 
-declare module 'fs' {
-	class Stats { }
-}
+const pipe: (streams: [NodeJS.ReadableStream, NodeJS.WritableStream], cb: (err?: Error) => void) => void = miss.pipe;
+const from: (values: any[]) => NodeJS.ReadableStream = miss.from;
+const concat: (fn: (d: Buffer) => void) => NodeJS.WritableStream = miss.concat;
+const isCloneable: (obj: any) => boolean = cloneable.isCloneable;
 
-var pipe: (streams: [NodeJS.ReadableStream, NodeJS.WritableStream], cb: (err?: Error) => void) => void = miss.pipe;
-var from: (values: any[]) => NodeJS.ReadableStream = miss.from;
-var concat: (fn: (d: Buffer) => void) => NodeJS.WritableStream = miss.concat;
-var isCloneable: (obj: any) => boolean = cloneable.isCloneable;
+const isWin = (process.platform === 'win32');
 
-var isWin = (process.platform === 'win32');
-
-describe('File', function () {
-
-	describe('isVinyl()', function () {
-
-		it('returns true for a Vinyl object', function (done) {
-			var file = new File();
-			var result = File.isVinyl(file);
+describe('File', () => {
+	describe('isVinyl()', () => {
+		it('returns true for a Vinyl object', done => {
+			const file = new File();
+			const result = File.isVinyl(file);
 			expect(result).toEqual(true);
 			done();
 		});
 
-		it('returns false for a normal object', function (done) {
-			var result = File.isVinyl({});
+		it('returns false for a normal object', done => {
+			const result = File.isVinyl({});
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for null', function (done) {
-			var result = File.isVinyl(null);
+		it('returns false for null', done => {
+			const result = File.isVinyl(null);
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a string', function (done) {
-			var result = File.isVinyl('foobar');
+		it('returns false for a string', done => {
+			const result = File.isVinyl('foobar');
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a String object', function (done) {
-			var result = File.isVinyl(new String('foobar'));
+		it('returns false for a String object', done => {
+			// tslint:disable-next-line:no-construct
+			const result = File.isVinyl(new String('foobar'));
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a number', function (done) {
-			var result = File.isVinyl(1);
+		it('returns false for a number', done => {
+			const result = File.isVinyl(1);
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a Number object', function (done) {
-			var result = File.isVinyl(new Number(1));
+		it('returns false for a Number object', done => {
+			// tslint:disable-next-line:no-construct
+			const result = File.isVinyl(new Number(1));
 			expect(result).toEqual(false);
 			done();
 		});
@@ -85,198 +81,196 @@ describe('File', function () {
 		// This is based on current implementation
 		// A test was added to document and make aware during internal changes
 		// TODO: decide if this should be leak-able
-		it('returns true for a mocked object', function (done) {
-			var result = File.isVinyl({ _isVinyl: true });
+		it('returns true for a mocked object', done => {
+			const result = File.isVinyl({ _isVinyl: true });
 			expect(result).toEqual(true);
 			done();
 		});
 	});
 
-	describe('defaults', function () {
-
-		it('defaults cwd to process.cwd', function (done) {
-			var file = new File();
+	describe('defaults', () => {
+		it('defaults cwd to process.cwd', done => {
+			const file = new File();
 			expect(file.cwd).toEqual(process.cwd());
 			done();
 		});
 
-		it('defaults base to process.cwd', function (done) {
-			var file = new File();
+		it('defaults base to process.cwd', done => {
+			const file = new File();
 			expect(file.base).toEqual(process.cwd());
 			done();
 		});
 
-		it('defaults base to cwd property', function (done) {
-			var cwd = path.normalize('/');
-			var file = new File({ cwd: cwd });
+		it('defaults base to cwd property', done => {
+			const cwd = path.normalize('/');
+			const file = new File({ cwd });
 			expect(file.base).toEqual(cwd);
 			done();
 		});
 
-		it('defaults path to null', function (done) {
-			var file = new File();
+		it('defaults path to null', done => {
+			const file = new File();
 			expect(file.path).toNotExist();
 			expect(file.path).toEqual(null);
 			done();
 		});
 
-		it('defaults history to an empty array', function (done) {
-			var file = new File();
+		it('defaults history to an empty array', done => {
+			const file = new File();
 			expect(file.history).toEqual([]);
 			done();
 		});
 
-		it('defaults stat to null', function (done) {
-			var file = new File();
+		it('defaults stat to null', done => {
+			const file = new File();
 			expect(file.stat).toNotExist();
 			expect(file.stat).toEqual(null);
 			done();
 		});
 
-		it('defaults contents to null', function (done) {
-			var file = new File();
+		it('defaults contents to null', done => {
+			const file = new File();
 			expect(file.contents).toNotExist();
 			expect(file.contents).toEqual(null);
 			done();
 		});
 	});
 
-	describe('constructor()', function () {
-
-		it('sets base', function (done) {
-			var val = path.normalize('/');
-			var file = new File({ base: val });
+	describe('constructor()', () => {
+		it('sets base', done => {
+			const val = path.normalize('/');
+			const file = new File({ base: val });
 			expect(file.base).toEqual(val);
 			done();
 		});
 
-		it('sets cwd', function (done) {
-			var val = path.normalize('/');
-			var file = new File({ cwd: val });
+		it('sets cwd', done => {
+			const val = path.normalize('/');
+			const file = new File({ cwd: val });
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
-		it('sets path (and history)', function (done) {
-			var val = path.normalize('/test.coffee');
-			var file = new File({ path: val });
+		it('sets path (and history)', done => {
+			const val = path.normalize('/test.coffee');
+			const file = new File({ path: val });
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual([val]);
 			done();
 		});
 
-		it('sets history (and path)', function (done) {
-			var val = path.normalize('/test.coffee');
-			var file = new File({ history: [val] });
+		it('sets history (and path)', done => {
+			const val = path.normalize('/test.coffee');
+			const file = new File({ history: [val] });
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual([val]);
 			done();
 		});
 
-		it('sets stat', function (done) {
-			var val = {};
-			var file = new File({ stat: val as any as fs.Stats });
+		it('sets stat', done => {
+			const val = {};
+			const file = new File({ stat: val as any as fs.Stats });
 			expect(file.stat).toEqual(val);
 			done();
 		});
 
-		it('sets contents', function (done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+		it('sets contents', done => {
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
-		it('sets custom properties', function (done) {
-			var sourceMap = {};
-			var file = new File({ sourceMap: sourceMap }) as TestFile;
+		it('sets custom properties', done => {
+			const sourceMap = {};
+			const file = new File({ sourceMap }) as TestFile;
 			expect(file.sourceMap).toEqual(sourceMap);
 			done();
 		});
 
-		it('normalizes path', function (done) {
-			var val = '/test/foo/../test.coffee';
-			var expected = path.normalize(val);
-			var file = new File({ path: val });
+		it('normalizes path', done => {
+			const val = '/test/foo/../test.coffee';
+			const expected = path.normalize(val);
+			const file = new File({ path: val });
 			expect(file.path).toEqual(expected);
 			expect(file.history).toEqual([expected]);
 			done();
 		});
 
-		it('normalizes and removes trailing separator from path', function (done) {
-			var val = '/test/foo/../foo/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File({ path: val });
+		it('normalizes and removes trailing separator from path', done => {
+			const val = '/test/foo/../foo/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File({ path: val });
 			expect(file.path).toEqual(expected);
 			done();
 		});
 
-		it('normalizes history', function (done) {
-			var val = [
+		it('normalizes history', done => {
+			const val = [
 				'/test/bar/../bar/test.coffee',
 				'/test/foo/../test.coffee',
 			];
-			var expected = val.map(function (p) {
+			const expected = val.map(p => {
 				return path.normalize(p);
 			});
-			var file = new File({ history: val });
+			const file = new File({ history: val });
 			expect(file.path).toEqual(expected[1]);
 			expect(file.history).toEqual(expected);
 			done();
 		});
 
-		it('normalizes and removes trailing separator from history', function (done) {
-			var val = [
+		it('normalizes and removes trailing separator from history', done => {
+			const val = [
 				'/test/foo/../foo/',
 				'/test/bar/../bar/',
 			];
-			var expected = val.map(function (p) {
+			const expected = val.map(p => {
 				return path.normalize(p.slice(0, -1));
 			});
-			var file = new File({ history: val });
+			const file = new File({ history: val });
 			expect(file.history).toEqual(expected);
 			done();
 		});
 
-		it('appends path to history if both exist and different from last', function (done) {
-			var val = path.normalize('/test/baz/test.coffee');
-			var history = [
+		it('appends path to history if both exist and different from last', done => {
+			const val = path.normalize('/test/baz/test.coffee');
+			const history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 			];
-			var file = new File({ path: val, history: history });
+			const file = new File({ path: val, history });
 
-			var expectedHistory = history.concat(val);
+			const expectedHistory = history.concat(val);
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(expectedHistory);
 			done();
 		});
 
-		it('does not append path to history if both exist and same as last', function (done) {
-			var val = path.normalize('/test/baz/test.coffee');
-			var history = [
+		it('does not append path to history if both exist and same as last', done => {
+			const val = path.normalize('/test/baz/test.coffee');
+			const history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 				val,
 			];
-			var file = new File({ path: val, history: history });
+			const file = new File({ path: val, history });
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(history);
 			done();
 		});
 
-		it('does not mutate history array passed in', function (done) {
-			var val = path.normalize('/test/baz/test.coffee');
-			var history = [
+		it('does not mutate history array passed in', done => {
+			const val = path.normalize('/test/baz/test.coffee');
+			const history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 			];
-			var historyCopy = Array.prototype.slice.call(history);
-			var file = new File({ path: val, history: history });
+			const historyCopy = Array.prototype.slice.call(history);
+			const file = new File({ path: val, history });
 
-			var expectedHistory = history.concat(val);
+			const expectedHistory = history.concat(val);
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(expectedHistory);
@@ -285,166 +279,162 @@ describe('File', function () {
 		});
 	});
 
-	describe('isBuffer()', function () {
-
-		it('returns true when the contents are a Buffer', function (done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+	describe('isBuffer()', () => {
+		it('returns true when the contents are a Buffer', done => {
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(true);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
-			var val = from([]);
-			var file = new File({ contents: val });
+		it('returns false when the contents are a Stream', done => {
+			const val = from([]);
+			const file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are null', function (done) {
-			var file = new File({ contents: null });
+		it('returns false when the contents are null', done => {
+			const file = new File({ contents: null });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isStream()', function () {
-
-		it('returns false when the contents are a Buffer', function (done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+	describe('isStream()', () => {
+		it('returns false when the contents are a Buffer', done => {
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are a Stream', function (done) {
-			var val = from([]);
-			var file = new File({ contents: val });
+		it('returns true when the contents are a Stream', done => {
+			const val = from([]);
+			const file = new File({ contents: val });
 			expect(file.isStream()).toEqual(true);
 			done();
 		});
 
-		it('returns false when the contents are null', function (done) {
-			var file = new File({ contents: null });
+		it('returns false when the contents are null', done => {
+			const file = new File({ contents: null });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isNull()', function () {
-
-		it('returns false when the contents are a Buffer', function (done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+	describe('isNull()', () => {
+		it('returns false when the contents are a Buffer', done => {
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
-			var val = from([]);
-			var file = new File({ contents: val });
+		it('returns false when the contents are a Stream', done => {
+			const val = from([]);
+			const file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null', function (done) {
-			var file = new File({ contents: null });
+		it('returns true when the contents are null', done => {
+			const file = new File({ contents: null });
 			expect(file.isNull()).toEqual(true);
 			done();
 		});
 	});
 
-	describe('isDirectory()', function () {
-		var fakeStat = {
-			isDirectory: function () {
+	describe('isDirectory()', () => {
+		const fakeStat = {
+			isDirectory() {
 				return true;
 			},
 		} as any as fs.Stats;
 
-		it('returns false when the contents are a Buffer', function (done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val, stat: fakeStat });
+		it('returns false when the contents are a Buffer', done => {
+			const val = new Buffer('test');
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
-			var val = from([]);
-			var file = new File({ contents: val, stat: fakeStat });
+		it('returns false when the contents are a Stream', done => {
+			const val = from([]);
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null & stat.isDirectory is true', function (done) {
-			var file = new File({ contents: null, stat: fakeStat });
+		it('returns true when the contents are null & stat.isDirectory is true', done => {
+			const file = new File({ contents: null, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(true);
 			done();
 		});
 
-		it('returns false when stat exists but does not contain an isDirectory method', function (done) {
-			var file = new File({ contents: null, stat: {} as any as fs.Stats });
+		it('returns false when stat exists but does not contain an isDirectory method', done => {
+			const file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns false when stat does not exist', function (done) {
-			var file = new File({ contents: null });
+		it('returns false when stat does not exist', done => {
+			const file = new File({ contents: null });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isSymbolic()', function () {
-		var fakeStat = {
-			isSymbolicLink: function () {
+	describe('isSymbolic()', () => {
+		const fakeStat = {
+			isSymbolicLink() {
 				return true;
 			},
 		} as any as fs.Stats;
 
-		it('returns false when the contents are a Buffer', function (done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val, stat: fakeStat });
+		it('returns false when the contents are a Buffer', done => {
+			const val = new Buffer('test');
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
-			var val = from([]);
-			var file = new File({ contents: val, stat: fakeStat });
+		it('returns false when the contents are a Stream', done => {
+			const val = from([]);
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null & stat.isSymbolicLink is true', function (done) {
-			var file = new File({ contents: null, stat: fakeStat });
+		it('returns true when the contents are null & stat.isSymbolicLink is true', done => {
+			const file = new File({ contents: null, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(true);
 			done();
 		});
 
-		it('returns false when stat exists but does not contain an isSymbolicLink method', function (done) {
-			var file = new File({ contents: null, stat: {} as any as fs.Stats });
+		it('returns false when stat exists but does not contain an isSymbolicLink method', done => {
+			const file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns false when stat does not exist', function (done) {
-			var file = new File({ contents: null });
+		it('returns false when stat does not exist', done => {
+			const file = new File({ contents: null });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('clone()', function () {
-
-		it('copies all attributes over with Buffer contents', function (done) {
-			var options = {
+	describe('clone()', () => {
+		it('copies all attributes over with Buffer contents', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: new Buffer('test'),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -455,36 +445,36 @@ describe('File', function () {
 			done();
 		});
 
-		it('assigns Buffer content reference when contents option is false', function (done) {
-			var options = {
+		it('assigns Buffer content reference when contents option is false', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.js',
 				contents: new Buffer('test'),
 			};
-			var file = new File(options);
+			const file = new File(options);
 
-			var copy1 = file.clone({ contents: false });
+			const copy1 = file.clone({ contents: false });
 			expect(copy1.contents).toBe(file.contents);
 
-			var copy2 = file.clone();
+			const copy2 = file.clone();
 			expect(copy2.contents).toNotBe(file.contents);
 
 			// TypeScript: expected compilation error
-			//var copy3 = file.clone({ contents: 'invalid' });
-			//expect(copy3.contents).toNotBe(file.contents);
-			//done();
+			// var copy3 = file.clone({ contents: 'invalid' });
+			// expect(copy3.contents).toNotBe(file.contents);
+			// done();
 		});
 
-		it('copies all attributes over with Stream contents', function (done) {
-			var options = {
+		it('copies all attributes over with Stream contents', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -492,9 +482,9 @@ describe('File', function () {
 			expect(file2.path).toEqual(file.path);
 			expect(file2.contents).toNotBe(file.contents);
 
-			var ends = 2;
-			var data: Buffer;
-			var data2: Buffer;
+			let ends = 2;
+			let data: Buffer;
+			let data2: Buffer;
 
 			function assert(err: any) {
 				if (err) {
@@ -511,32 +501,32 @@ describe('File', function () {
 
 			pipe([
 				file.contents,
-				concat(function (d) {
+				concat(d => {
 					data = d;
 				}),
 			], assert);
 
 			pipe([
 				file2.contents,
-				concat(function (d) {
+				concat(d => {
 					data2 = d;
 				}),
 			], assert);
 		});
 
-		it('does not start flowing until all clones flows (data)', function (done) {
-			var options = {
+		it('does not start flowing until all clones flows (data)', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
-			var ends = 2;
+			const file = new File(options);
+			const file2 = file.clone();
+			let ends = 2;
 
-			var data = '';
-			var data2 = '';
+			let data = '';
+			let data2 = '';
 
 			function assert() {
 				if (--ends === 0) {
@@ -546,17 +536,17 @@ describe('File', function () {
 			}
 
 			// Start flowing file2
-			file2.contents.on('data', function (chunk: Buffer) {
+			file2.contents.on('data', (chunk: Buffer) => {
 				data2 += chunk.toString('utf8');
 			});
 
-			process.nextTick(function () {
+			process.nextTick(() => {
 				// Nothing was written yet
 				expect(data).toEqual('');
 				expect(data2).toEqual('');
 
 				// Starts flowing file
-				file.contents.on('data', function (chunk: Buffer) {
+				file.contents.on('data', (chunk: Buffer) => {
 					data += chunk.toString('utf8');
 				});
 			});
@@ -565,26 +555,25 @@ describe('File', function () {
 			file.contents.on('end', assert);
 		});
 
-		it('does not start flowing until all clones flows (readable)', function (done) {
-			var options = {
+		it('does not start flowing until all clones flows (readable)', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
-			var data2 = '';
+			let data2 = '';
 
 			function assert(data: Buffer) {
 				expect(data.toString('utf8')).toEqual(data2);
 			}
 
 			// Start flowing file2
-			file2.contents.on('readable', function (this: NodeJS.ReadableStream) {
-				var chunk: string | Buffer;
-				while ((chunk = this.read()) !== null) {
+			file2.contents.on('readable', function(this: NodeJS.ReadableStream) {
+				for (let chunk: string | Buffer = this.read(); chunk !== null; chunk = this.read()) {
 					data2 += chunk.toString();
 				}
 			});
@@ -595,15 +584,15 @@ describe('File', function () {
 			], done);
 		});
 
-		it('copies all attributes over with null contents', function (done) {
-			var options = {
+		it('copies all attributes over with null contents', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: null,
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -613,8 +602,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('properly clones the `stat` property', function (done) {
-			var options = {
+		it('properly clones the `stat` property', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.js',
@@ -622,8 +611,8 @@ describe('File', function () {
 				stat: fs.statSync(__filename),
 			};
 
-			var file = new File(options);
-			var copy = file.clone();
+			const file = new File(options);
+			const copy = file.clone();
 
 			expect(copy.stat).toExist();
 			if (copy.stat != null) {
@@ -635,16 +624,16 @@ describe('File', function () {
 			done();
 		});
 
-		it('properly clones the `history` property', function (done) {
-			var options = {
+		it('properly clones the `history` property', done => {
+			const options = {
 				cwd: path.normalize('/'),
 				base: path.normalize('/test/'),
 				path: path.normalize('/test/test.js'),
 				contents: new Buffer('test'),
 			};
 
-			var file = new File(options);
-			var copy = file.clone();
+			const file = new File(options);
+			const copy = file.clone();
 
 			expect(copy.history[0]).toEqual(options.path);
 			copy.path = 'lol';
@@ -652,8 +641,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('copies custom properties', function (done) {
-			var options = {
+		it('copies custom properties', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -661,8 +650,8 @@ describe('File', function () {
 				custom: { meta: {} },
 			};
 
-			var file = new File(options) as TestFile;
-			var file2 = file.clone();
+			const file = new File(options) as TestFile;
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -674,23 +663,23 @@ describe('File', function () {
 			done();
 		});
 
-		it('copies history', function (done) {
-			var options = {
+		it('copies history', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: null,
 			};
-			var history = [
+			const history = [
 				path.normalize('/test/test.coffee'),
 				path.normalize('/test/test.js'),
 				path.normalize('/test/test-938di2s.js'),
 			];
 
-			var file = new File(options);
+			const file = new File(options);
 			file.path = history[1];
 			file.path = history[2];
-			var file2 = file.clone();
+			const file2 = file.clone();
 
 			expect(file2.history).toEqual(history);
 			expect(file2.history).toNotBe(file.history);
@@ -698,8 +687,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('supports deep & shallow copy of all attributes', function (done) {
-			var options = {
+		it('supports deep & shallow copy of all attributes', done => {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -707,33 +696,33 @@ describe('File', function () {
 				custom: { meta: {} },
 			};
 
-			var file = new File(options) as TestFile;
+			const file = new File(options) as TestFile;
 
-			var file2 = file.clone();
+			const file2 = file.clone();
 			expect(file2.custom).toEqual(file.custom);
 			expect(file2.custom).toNotBe(file.custom);
 			expect(file2.custom.meta).toEqual(file.custom.meta);
 			expect(file2.custom.meta).toNotBe(file.custom.meta);
 
-			var file3 = file.clone(true);
+			const file3 = file.clone(true);
 			expect(file3.custom).toEqual(file.custom);
 			expect(file3.custom).toNotBe(file.custom);
 			expect(file3.custom.meta).toEqual(file.custom.meta);
 			expect(file3.custom.meta).toNotBe(file.custom.meta);
 
-			var file4 = file.clone({ deep: true });
+			const file4 = file.clone({ deep: true });
 			expect(file4.custom).toEqual(file.custom);
 			expect(file4.custom).toNotBe(file.custom);
 			expect(file4.custom.meta).toEqual(file.custom.meta);
 			expect(file4.custom.meta).toNotBe(file.custom.meta);
 
-			var file5 = file.clone(false);
+			const file5 = file.clone(false);
 			expect(file5.custom).toEqual(file.custom);
 			expect(file5.custom).toBe(file.custom);
 			expect(file5.custom.meta).toEqual(file.custom.meta);
 			expect(file5.custom.meta).toBe(file.custom.meta);
 
-			var file6 = file.clone({ deep: false });
+			const file6 = file.clone({ deep: false });
 			expect(file6.custom).toEqual(file.custom);
 			expect(file6.custom).toBe(file.custom);
 			expect(file6.custom.meta).toEqual(file.custom.meta);
@@ -759,24 +748,23 @@ describe('File', function () {
 		// });
 	});
 
-	describe('inspect()', function () {
-
-		it('returns correct format when no contents and no path', function (done) {
-			var file = new File();
+	describe('inspect()', () => {
+		it('returns correct format when no contents and no path', done => {
+			const file = new File();
 			expect(file.inspect()).toEqual('<File >');
 			done();
 		});
 
-		it('returns correct format when Buffer contents and no path', function (done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+		it('returns correct format when Buffer contents and no path', done => {
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.inspect()).toEqual('<File <Buffer 74 65 73 74>>');
 			done();
 		});
 
-		it('returns correct format when Buffer contents and relative path', function (done) {
-			var val = new Buffer('test');
-			var file = new File({
+		it('returns correct format when Buffer contents and relative path', done => {
+			const val = new Buffer('test');
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -786,8 +774,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns correct format when Stream contents and relative path', function (done) {
-			var file = new File({
+		it('returns correct format when Stream contents and relative path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -797,8 +785,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns correct format when null contents and relative path', function (done) {
-			var file = new File({
+		it('returns correct format when null contents and relative path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -809,52 +797,51 @@ describe('File', function () {
 		});
 	});
 
-	describe('contents get/set', function () {
-
-		it('returns _contents', function (done) {
-			var val = new Buffer('test');
-			var file = new File() as TestFile;
+	describe('contents get/set', () => {
+		it('returns _contents', done => {
+			const val = new Buffer('test');
+			const file = new File() as TestFile;
 			file._contents = val;
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
-		it('sets _contents', function (done) {
-			var val = new Buffer('test');
-			var file = new File() as TestFile;
+		it('sets _contents', done => {
+			const val = new Buffer('test');
+			const file = new File() as TestFile;
 			file.contents = val;
 			expect(file._contents).toEqual(val);
 			done();
 		});
 
-		it('sets a Buffer', function (done) {
-			var val = new Buffer('test');
-			var file = new File();
+		it('sets a Buffer', done => {
+			const val = new Buffer('test');
+			const file = new File();
 			file.contents = val;
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
-		it('wraps Stream in Cloneable', function (done) {
-			var val = from([]);
-			var file = new File();
+		it('wraps Stream in Cloneable', done => {
+			const val = from([]);
+			const file = new File();
 			file.contents = val;
 			expect(isCloneable(file.contents)).toEqual(true);
 			done();
 		});
 
-		it('does not double wrap a Cloneable', function (done) {
-			var val = from([]);
-			var clone = cloneable(val);
-			var file = new File();
+		it('does not double wrap a Cloneable', done => {
+			const val = from([]);
+			const clone = cloneable(val);
+			const file = new File();
 			file.contents = clone;
 			expect((file.contents as any)._original).toBe(val);
 			done();
 		});
 
-		it('sets null', function (done) {
-			var val = null;
-			var file = new File();
+		it('sets null', done => {
+			const val = null;
+			const file = new File();
 			file.contents = val;
 			expect(file.contents).toEqual(null);
 			done();
@@ -872,35 +859,34 @@ describe('File', function () {
 		// });
 	});
 
-	describe('cwd get/set', function () {
-
-		it('returns _cwd', function (done) {
-			var val = '/test';
-			var file = new File() as TestFile;
+	describe('cwd get/set', () => {
+		it('returns _cwd', done => {
+			const val = '/test';
+			const file = new File() as TestFile;
 			file._cwd = val;
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
-		it('sets _cwd', function (done) {
-			var val = '/test';
-			var file = new File() as TestFile;
+		it('sets _cwd', done => {
+			const val = '/test';
+			const file = new File() as TestFile;
 			file.cwd = val;
 			expect(file._cwd).toEqual(path.normalize(val));
 			done();
 		});
 
-		it('normalizes and removes trailing separator on set', function (done) {
-			var val = '/test/foo/../foo/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File();
+		it('normalizes and removes trailing separator on set', done => {
+			const val = '/test/foo/../foo/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File();
 
 			file.cwd = val;
 
 			expect(file.cwd).toEqual(expected);
 
-			var val2 = '\\test\\foo\\..\\foo\\';
-			var expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
+			const val2 = '\\test\\foo\\..\\foo\\';
+			const expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
 
 			file.cwd = val2;
 
@@ -935,23 +921,22 @@ describe('File', function () {
 		// });
 	});
 
-	describe('base get/set', function () {
-
-		it('proxies cwd when omitted', function (done) {
-			var file = new File({ cwd: '/test' });
+	describe('base get/set', () => {
+		it('proxies cwd when omitted', done => {
+			const file = new File({ cwd: '/test' });
 			expect(file.base).toEqual(file.cwd);
 			done();
 		});
 
-		it('proxies cwd when same', function (done) {
-			var file = new File({
+		it('proxies cwd when same', done => {
+			const file = new File({
 				cwd: '/test',
 				base: '/test',
 			});
 			file.cwd = '/foo/';
 			expect(file.base).toEqual(file.cwd);
 
-			var file2 = new File({
+			const file2 = new File({
 				cwd: '/test',
 			});
 			file2.base = '/test/';
@@ -976,33 +961,33 @@ describe('File', function () {
 		// 	done();
 		// });
 
-		it('returns _base', function (done) {
-			var val = '/test/';
-			var file = new File() as TestFile;
+		it('returns _base', done => {
+			const val = '/test/';
+			const file = new File() as TestFile;
 			file._base = val;
 			expect(file.base).toEqual(val);
 			done();
 		});
 
-		it('sets _base', function (done) {
-			var val = '/test/foo';
-			var file = new File() as TestFile;
+		it('sets _base', done => {
+			const val = '/test/foo';
+			const file = new File() as TestFile;
 			file.base = val;
 			expect(file._base).toEqual(path.normalize(val));
 			done();
 		});
 
-		it('normalizes and removes trailing separator on set', function (done) {
-			var val = '/test/foo/../foo/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File();
+		it('normalizes and removes trailing separator on set', done => {
+			const val = '/test/foo/../foo/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File();
 
 			file.base = val;
 
 			expect(file.base).toEqual(expected);
 
-			var val2 = '\\test\\foo\\..\\foo\\';
-			var expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
+			const val2 = '\\test\\foo\\..\\foo\\';
+			const expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
 
 			file.base = val2;
 
@@ -1036,10 +1021,9 @@ describe('File', function () {
 		// });
 	});
 
-	describe('relative get/set', function () {
-
-		it('throws on set', function (done) {
-			var file = new File();
+	describe('relative get/set', () => {
+		it('throws on set', done => {
+			const file = new File();
 
 			function invalid() {
 				file.relative = 'test';
@@ -1049,8 +1033,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on get with no path', function (done) {
-			var file = new File();
+		it('throws on get with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.relative;
@@ -1060,8 +1044,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns a relative path from base', function (done) {
-			var file = new File({
+		it('returns a relative path from base', done => {
+			const file = new File({
 				base: '/test/',
 				path: '/test/test.coffee',
 			});
@@ -1070,8 +1054,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns a relative path from cwd', function (done) {
-			var file = new File({
+		it('returns a relative path from cwd', done => {
+			const file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
@@ -1080,12 +1064,12 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append separator when directory', function (done) {
-			var file = new File({
+		it('does not append separator when directory', done => {
+			const file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1095,12 +1079,12 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append separator when symlink', function (done) {
-			var file = new File({
+		it('does not append separator when symlink', done => {
+			const file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1110,15 +1094,15 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append separator when directory & symlink', function (done) {
-			var file = new File({
+		it('does not append separator when directory & symlink', done => {
+			const file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1129,10 +1113,9 @@ describe('File', function () {
 		});
 	});
 
-	describe('dirname get/set', function () {
-
-		it('throws on get with no path', function (done) {
-			var file = new File();
+	describe('dirname get/set', () => {
+		it('throws on get with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.dirname;
@@ -1142,8 +1125,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the dirname without trailing separator', function (done) {
-			var file = new File({
+		it('returns the dirname without trailing separator', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test',
 				path: '/test/test.coffee',
@@ -1153,8 +1136,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
-			var file = new File();
+		it('throws on set with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.dirname = '/test';
@@ -1164,8 +1147,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the dirname of the path', function (done) {
-			var file = new File({
+		it('replaces the dirname of the path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1177,10 +1160,9 @@ describe('File', function () {
 		});
 	});
 
-	describe('basename get/set', function () {
-
-		it('throws on get with no path', function (done) {
-			var file = new File();
+	describe('basename get/set', () => {
+		it('throws on get with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				return file.basename;
@@ -1190,8 +1172,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the basename of the path', function (done) {
-			var file = new File({
+		it('returns the basename of the path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1201,11 +1183,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append trailing separator when directory', function (done) {
-			var file = new File({
+		it('does not append trailing separator when directory', done => {
+			const file = new File({
 				path: '/test/foo',
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1215,11 +1197,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append trailing separator when symlink', function (done) {
-			var file = new File({
+		it('does not append trailing separator when symlink', done => {
+			const file = new File({
 				path: '/test/foo',
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1229,14 +1211,14 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append trailing separator when directory & symlink', function (done) {
-			var file = new File({
+		it('does not append trailing separator when directory & symlink', done => {
+			const file = new File({
 				path: '/test/foo',
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1246,8 +1228,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator', function (done) {
-			var file = new File({
+		it('removes trailing separator', done => {
+			const file = new File({
 				path: '/test/foo/',
 			});
 
@@ -1255,11 +1237,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator when directory', function (done) {
-			var file = new File({
+		it('removes trailing separator when directory', done => {
+			const file = new File({
 				path: '/test/foo/',
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1269,11 +1251,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator when symlink', function (done) {
-			var file = new File({
+		it('removes trailing separator when symlink', done => {
+			const file = new File({
 				path: '/test/foo/',
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1283,14 +1265,14 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator when directory & symlink', function (done) {
-			var file = new File({
+		it('removes trailing separator when directory & symlink', done => {
+			const file = new File({
 				path: '/test/foo/',
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1300,8 +1282,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
-			var file = new File();
+		it('throws on set with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.basename = 'test.coffee';
@@ -1311,8 +1293,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the basename of the path', function (done) {
-			var file = new File({
+		it('replaces the basename of the path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1324,10 +1306,9 @@ describe('File', function () {
 		});
 	});
 
-	describe('stem get/set', function () {
-
-		it('throws on get with no path', function (done) {
-			var file = new File();
+	describe('stem get/set', () => {
+		it('throws on get with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.stem;
@@ -1337,8 +1318,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the stem of the path', function (done) {
-			var file = new File({
+		it('returns the stem of the path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1348,8 +1329,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
-			var file = new File();
+		it('throws on set with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.stem = 'test.coffee';
@@ -1359,8 +1340,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the stem of the path', function (done) {
-			var file = new File({
+		it('replaces the stem of the path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1372,10 +1353,9 @@ describe('File', function () {
 		});
 	});
 
-	describe('extname get/set', function () {
-
-		it('throws on get with no path', function (done) {
-			var file = new File();
+	describe('extname get/set', () => {
+		it('throws on get with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.extname;
@@ -1385,8 +1365,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the extname of the path', function (done) {
-			var file = new File({
+		it('returns the extname of the path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1396,8 +1376,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
-			var file = new File();
+		it('throws on set with no path', done => {
+			const file = new File();
 
 			function invalid() {
 				file.extname = '.coffee';
@@ -1407,8 +1387,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the extname of the path', function (done) {
-			var file = new File({
+		it('replaces the extname of the path', done => {
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1420,14 +1400,13 @@ describe('File', function () {
 		});
 	});
 
-	describe('path get/set', function () {
-
-		it('records path in history upon instantiation', function (done) {
-			var file = new File({
+	describe('path get/set', () => {
+		it('records path in history upon instantiation', done => {
+			const file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
-			var history = [
+			const history = [
 				path.normalize('/test/test.coffee'),
 			];
 
@@ -1436,13 +1415,13 @@ describe('File', function () {
 			done();
 		});
 
-		it('records path in history when set', function (done) {
-			var val = path.normalize('/test/test.js');
-			var file = new File({
+		it('records path in history when set', done => {
+			const val = path.normalize('/test/test.js');
+			const file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
-			var history = [
+			const history = [
 				path.normalize('/test/test.coffee'),
 				val,
 			];
@@ -1451,7 +1430,7 @@ describe('File', function () {
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(history);
 
-			var val2 = path.normalize('/test/test.es6');
+			const val2 = path.normalize('/test/test.es6');
 			history.push(val2);
 
 			file.path = val2;
@@ -1460,13 +1439,13 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not record path in history when set to the current path', function (done) {
-			var val = path.normalize('/test/test.coffee');
-			var file = new File({
+		it('does not record path in history when set to the current path', done => {
+			const val = path.normalize('/test/test.coffee');
+			const file = new File({
 				cwd: '/',
 				path: val,
 			});
-			var history = [
+			const history = [
 				val,
 			];
 
@@ -1477,13 +1456,13 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not record path in history when set to empty string', function (done) {
-			var val = path.normalize('/test/test.coffee');
-			var file = new File({
+		it('does not record path in history when set to empty string', done => {
+			const val = path.normalize('/test/test.coffee');
+			const file = new File({
 				cwd: '/',
 				path: val,
 			});
-			var history = [
+			const history = [
 				val,
 			];
 
@@ -1494,7 +1473,7 @@ describe('File', function () {
 		});
 
 		// TypeScript: known issue, see the comment for the `base` property.
-		// it('throws on set with null path', function(done) {
+		// it('throws on set with null path', done => {
 		//   var file = new File();
 
 		//   expect(file.path).toNotExist();
@@ -1508,10 +1487,10 @@ describe('File', function () {
 		//   done();
 		// });
 
-		it('normalizes the path upon set', function (done) {
-			var val = '/test/foo/../test.coffee';
-			var expected = path.normalize(val);
-			var file = new File();
+		it('normalizes the path upon set', done => {
+			const val = '/test/foo/../test.coffee';
+			const expected = path.normalize(val);
+			const file = new File();
 
 			file.path = val;
 
@@ -1520,8 +1499,8 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set', function (done) {
-			var file = new File();
+		it('removes the trailing separator upon set', done => {
+			const file = new File();
 			file.path = '/test/';
 
 			expect(file.path).toEqual(path.normalize('/test'));
@@ -1529,10 +1508,10 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set when directory', function (done) {
-			var file = new File({
+		it('removes the trailing separator upon set when directory', done => {
+			const file = new File({
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1544,10 +1523,10 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set when symlink', function (done) {
-			var file = new File({
+		it('removes the trailing separator upon set when symlink', done => {
+			const file = new File({
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1559,13 +1538,13 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set when directory & symlink', function (done) {
-			var file = new File({
+		it('removes the trailing separator upon set when directory & symlink', done => {
+			const file = new File({
 				stat: {
-					isDirectory: function () {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1578,26 +1557,25 @@ describe('File', function () {
 		});
 	});
 
-	describe('symlink get/set', function () {
-
-		it('return null on get with no symlink', function (done) {
-			var file = new File();
+	describe('symlink get/set', () => {
+		it('return null on get with no symlink', done => {
+			const file = new File();
 
 			expect(file.symlink).toEqual(null);
 			done();
 		});
 
-		it('returns _symlink', function (done) {
-			var val = '/test/test.coffee';
-			var file = new File() as TestFile;
+		it('returns _symlink', done => {
+			const val = '/test/test.coffee';
+			const file = new File() as TestFile;
 			file._symlink = val;
 
 			expect(file.symlink).toEqual(val);
 			done();
 		});
 
-		it('throws on set with non-string', function (done) {
-			var file = new File();
+		it('throws on set with non-string', done => {
+			const file = new File();
 
 			function invalid() {
 				file.symlink = null;
@@ -1607,29 +1585,29 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets _symlink', function (done) {
-			var val = '/test/test.coffee';
-			var expected = path.normalize(val);
-			var file = new File() as TestFile;
+		it('sets _symlink', done => {
+			const val = '/test/test.coffee';
+			const expected = path.normalize(val);
+			const file = new File() as TestFile;
 			file.symlink = val;
 
 			expect(file._symlink).toEqual(expected);
 			done();
 		});
 
-		it('allows relative symlink', function (done) {
-			var val = 'test.coffee';
-			var file = new File();
+		it('allows relative symlink', done => {
+			const val = 'test.coffee';
+			const file = new File();
 			file.symlink = val;
 
 			expect(file.symlink).toEqual(val);
 			done();
 		});
 
-		it('normalizes and removes trailing separator upon set', function (done) {
-			var val = '/test/foo/../bar/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File();
+		it('normalizes and removes trailing separator upon set', done => {
+			const val = '/test/foo/../bar/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File();
 			file.symlink = val;
 
 			expect(file.symlink).toEqual(expected);
diff --git a/types/virtual-dom/tslint.json b/types/virtual-dom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/virtual-dom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index ee2c753129..9c0adb0a97 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for vis.js 4.18
+// Type definitions for vis.js 4.21
 // Project: https://github.com/almende/vis
 // Definitions by: Michaël Bitard <https://github.com/MichaelBitard>
 //                 MacLeod Broad <https://github.com/macleodbroad-wf>
@@ -7,13 +7,14 @@
 //                 kaktus40 <https://github.com/kaktus40>
 //                 Matthieu Maitre <https://github.com/mmaitre314>
 //                 Adam Lewis <https://github.com/supercargo>
+//                 Alex Soh <https://github.com/takato1314>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { MomentInput, MomentFormatSpecification, Moment } from 'moment';
 export type MomentConstructor1 =
-    (inp?: MomentInput, format?: MomentFormatSpecification, strict?: boolean) => Moment;
+  (inp?: MomentInput, format?: MomentFormatSpecification, strict?: boolean) => Moment;
 export type MomentConstructor2 =
-    (inp?: MomentInput, format?: MomentFormatSpecification, language?: string, strict?: boolean) => Moment;
+  (inp?: MomentInput, format?: MomentFormatSpecification, language?: string, strict?: boolean) => Moment;
 
 export type MomentConstructor = MomentConstructor1 | MomentConstructor2;
 
@@ -21,7 +22,7 @@ export type IdType = string | number;
 export type SubgroupType = IdType;
 export type DateType = Date | number | string;
 export type HeightWidthType = IdType;
-export type TimelineItemType = 'box'| 'point' | 'range' | 'background';
+export type TimelineItemType = 'box' | 'point' | 'range' | 'background';
 export type TimelineAlignType = 'auto' | 'center' | 'left' | 'right';
 export type TimelineTimeAxisScaleType = 'millisecond' | 'second' | 'minute' | 'hour' |
   'weekday' | 'day' | 'month' | 'year';
@@ -269,34 +270,71 @@ export interface TimelineOptions {
   zoomMin?: number;
 }
 
-export interface TimelineFitAnimation {
-  duration?: number;
-  easingFunction?: string;
-}
+/**
+ * If true (default) or an Object, the range is animated smoothly to the new window.
+ * An object can be provided to specify duration and easing function.
+ * Default duration is 500 ms, and default easing function is 'easeInOutQuad'.
+ */
+export type TimelineAnimationType = boolean | AnimationOptions;
 
-export type TimelineFitAnimationType = boolean | TimelineFitAnimation;
-
-export interface TimelineFitOptions {
-  animation?: TimelineFitAnimationType;
+export interface TimelineAnimationOptions {
+  animation?: TimelineAnimationType;
 }
 
 export interface TimelineEventPropertiesResult {
-  group?: number;
-  item?: number;
+  /**
+   *  The id of the clicked group
+   */
+  group?: number | null;
+
+  /**
+   * The id of the clicked item.
+   */
+  item?: number | null;
+
+  /**
+   * Absolute horizontal position of the click event.
+   */
   pageX: number;
+
+  /**
+   * Absolute vertical position of the click event.
+   */
   pageY: number;
+
+  /**
+   * Relative horizontal position of the click event.
+   */
   x: number;
+
+  /**
+   * Relative vertical position of the click event.
+   */
   y: number;
+
+  /**
+   *  Date of the clicked event.
+   */
   time: Date;
+
+  /**
+   * Date of the clicked event, snapped to a nice value.
+   */
   snappedTime: Date;
+
+  /**
+   * Name of the clicked thing.
+   */
   what?: TimelineEventPropertiesResultWhatType;
+
+  /**
+   * The original click event.
+   */
   event: Event;
 }
 
 /**
  * Options that can be passed to a DataSet.
- *
- * @interface DataSetOptions
  */
 export interface DataSetOptions extends DataSetQueueOptions {
   /**
@@ -304,9 +342,6 @@ export interface DataSetOptions extends DataSetQueueOptions {
    * When data is fetched from a server which uses some specific field to identify items,
    * this field name can be specified in the DataSet using the option fieldId.
    * For example CouchDB uses the field "_id" to identify documents.
-   *
-   * @type {string}
-   * @memberOf DataSetOptions
    */
   fieldId?: string;
 
@@ -317,9 +352,6 @@ export interface DataSetOptions extends DataSetQueueOptions {
    * This is useful for example to automatically convert stringified dates coming
    * from a server into JavaScript Date objects.
    * The available data types are listed in section Data Types.
-   *
-   * @type {*}
-   * @memberOf DataSetOptions
    */
   type?: any;
 }
@@ -335,9 +367,6 @@ export interface DataSetQueueOptions {
    * Default value is null.
    * max: number - When the queue exceeds the given maximum number of entries, the queue is flushed automatically. Default value is Infinity.
    * Default value is Infinity.
-   *
-   * @type {(any | boolean)}
-   * @memberOf DataSetOptions
    */
   queue?: any | boolean;
 }
@@ -346,27 +375,20 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
   /**
    * Creates an instance of DataSet.
    *
-   * @param {DataSetOptions} [options] DataSet options.
-   *
-   * @memberOf DataSet
+   * @param [options] DataSet options.
    */
   constructor(options: DataSetOptions);
 
   /**
    * Creates an instance of DataSet.
    *
-   * @param {T[]} [data] An Array with items.
-   * @param {DataSetOptions} [options] DataSet options.
-   *
-   * @memberOf DataSet
+   * @param [data] An Array with items.
+   * @param [options] DataSet options.
    */
   constructor(data?: T[], options?: DataSetOptions);
 
   /**
    * The number of items in the DataSet.
-   *
-   * @type {number}
-   * @memberOf DataSet
    */
   length: number;
 
@@ -374,21 +396,17 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
    * Add one or multiple items to the DataSet.
    * Adding an item will fail when there already is an item with the same id.
    *
-   * @param {(T | T[])} data data can be a single item or an array with items.
-   * @param {IdType} [senderId] Optional sender id.
-   * @returns {IdType[]} The function returns an array with the ids of the added items.
-   *
-   * @memberOf DataSet
+   * @param data data can be a single item or an array with items.
+   * @param [senderId] Optional sender id.
+   * @returns The function returns an array with the ids of the added items.
    */
   add(data: T | T[], senderId?: IdType): IdType[];
 
   /**
    * Clear all data from the DataSet.
    *
-   * @param {IdType} [senderId] Optional sender id.
-   * @returns {IdType[]} The function returns an array with the ids of the removed items.
-   *
-   * @memberOf DataSet
+   * @param [senderId] Optional sender id.
+   * @returns The function returns an array with the ids of the removed items.
    */
   clear(senderId?: IdType): IdType[];
 
@@ -396,63 +414,50 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
    * Find all distinct values of a specified field.
    * If data items do not contain the specified field are ignored.
    *
-   * @param {string} field The search term.
-   * @returns {any[]} Returns an unordered array containing all distinct values.
-   *
-   * @memberOf DataSet
+   * @param field The search term.
+   * @returns Returns an unordered array containing all distinct values.
    */
   distinct(field: string): any[];
 
   /**
    * Flush queued changes.
    * Only available when the DataSet is configured with the option queue.
-   *
-   * @memberOf DataSet
    */
   flush(): void;
 
   /**
    * Execute a callback function for every item in the dataset.
    *
-   * @param {(item: T, id: IdType) => void} callback The item callback.
-   * @param {DataSelectionOptions<T>} [options] Optional options
-   *
-   * @memberOf DataSet
+   * @param callback The item callback.
+   * @param [options] Optional options
    */
   forEach(callback: (item: T, id: IdType) => void, options?: DataSelectionOptions<T>): void;
 
   /**
    * Get all items from the DataSet.
    *
-   * @param {DataSelectionOptions<T>} [options] Optional options.
-   * @returns {T[]} When no item is found, null is returned when a single item was requested,
+   * @param [options] Optional options.
+   * @returns When no item is found, null is returned when a single item was requested,
    * and and empty Array is returned in case of multiple id's.
-   *
-   * @memberOf DataSet
    */
   get(options?: DataSelectionOptions<T>): T[];
 
   /**
    * Get a single item from the DataSet.
    *
-   * @param {IdType} id The item id.
-   * @param {DataSelectionOptions<T>} [options]
-   * @returns {T} When no item is found, null is returned when a single item was requested,
+   * @param id The item id.
+   * @returns When no item is found, null is returned when a single item was requested,
    * and and empty Array is returned in case of multiple id's.
-   *
-   * @memberOf DataSet
    */
   get(id: IdType, options?: DataSelectionOptions<T>): T;
 
   /**
    * Get multiple items from the DataSet.
    *
-   * @param {IdType[]} ids Array of item ids.
-   * @param {DataSelectionOptions<T>} [options] Optional options.
-   * @returns {T[]} When no item is found, null is returned when a single item was requested,
+   * @param ids Array of item ids.
+   * @param [options] Optional options.
+   * @returns When no item is found, null is returned when a single item was requested,
    * and and empty Array is returned in case of multiple id's.
-   *
-   * @memberOf DataSet
    */
   get(ids: IdType[], options?: DataSelectionOptions<T>): T[];
 
@@ -461,92 +466,69 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
    * In case of a DataView, this function does not return the DataSet
    * to which the DataView is connected.
    *
-   * @returns {DataSet<T>} The DataSet itself.
-   *
-   * @memberOf DataSet
+   * @returns The DataSet itself.
    */
   getDataSet(): DataSet<T>;
 
   /**
    * Get ids of all items or of a filtered set of items.
    *
-   * @param {DataSelectionOptions<T>} [options]
-   * @returns {IdType[]} ids of all items or of a filtered set of items.
-   *
-   * @memberOf DataSet
+   * @returns ids of all items or of a filtered set of items.
    */
   getIds(options?: DataSelectionOptions<T>): IdType[];
 
   /**
    * Map every item in the DataSet.
    *
-   * @param {(item: T, id: IdType) => T} callback The mapping callback.
-   * @param {DataSelectionOptions<T>} [options] Optional options.
-   * @returns {T[]} The mapped items.
-   *
-   * @memberOf DataSet
+   * @param callback The mapping callback.
+   * @param [options] Optional options.
+   * @returns The mapped items.
    */
   map(callback: (item: T, id: IdType) => any, options?: DataSelectionOptions<T>): any[];
 
   /**
    * Find the item with maximum value of specified field.
    *
-   * @param {string} field
-   * @returns {T} Returns null if no item is found.
-   *
-   * @memberOf DataSet
+   * @returns Returns null if no item is found.
    */
   max(field: string): T;
 
   /**
    * Find the item with minimum value of specified field.
    *
-   * @param {string} field
-   * @returns {T} Returns null if no item is found.
-   *
-   * @memberOf DataSet
+   * @returns Returns null if no item is found.
    */
   min(field: string): T;
 
   /**
    * Subscribe from an event.
    *
-   * @param {string} event The event name.
-   * @param {((event: string, properties: any, senderId: IdType) => void)} callback
+   * @param event The event name.
+   * @param callback
    * a callback function which will be called each time the event occurs.
-   *
-   * @memberOf DataSet
    */
   on(event: string, callback: (event: string, properties: any, senderId: IdType) => void): void;
 
   /**
    * Unsubscribe to an event.
    *
-   * @param {string} event The event name.
-   * @param {((event: string, properties: any, senderId: IdType) => void)} callback
+   * @param event The event name.
+   * @param callback
    * The exact same callback that was used when calling 'on'.
-   *
-   * @memberOf DataSet
    */
   off(event: string, callback: (event: string, properties: any, senderId: IdType) => void): void;
 
   /**
    * Remove one or more items by id.
    *
-   * @param {IdType} id The item id.
-   * @param {IdType} [senderId] The sender id.
-   * @returns {IdType[]} Returns an array with the ids of the removed items.
-   *
-   * @memberOf DataSet
+   * @param id The item id.
+   * @param [senderId] The sender id.
+   * @returns Returns an array with the ids of the removed items.
    */
   remove(id: IdType | IdType[], senderId?: IdType): IdType[];
 
   /**
    * Set options for the DataSet.
-   *
-   * @param {DataSetQueueOptions} [options]
-   *
-   * @memberOf DataSet
    */
   setOptions(options?: DataSetQueueOptions): void;
 
@@ -554,11 +536,8 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
    * Update one or multiple existing items.
    * When an item doesn't exist, it will be created.
    *
-   * @param {(T | T[])} data a single item or an array with items.
-   * @param {IdType} [senderId]
-   * @returns {IdType[]} Returns an array with the ids of the updated items.
-   *
-   * @memberOf DataSet
+   * @param data a single item or an array with items.
+   * @returns Returns an array with the ids of the updated items.
    */
   update(data: T | T[], senderId?: IdType): IdType[];
 }
@@ -567,8 +546,6 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
  * The DataSet contains functionality to format, filter, and sort data retrieved
  * via the methods get, getIds, forEach, and map.
  * These methods can have these options as a parameter.
- *
- * @interface DataSelectionOptions
  */
 export interface DataSelectionOptions<T> {
   /**
@@ -577,9 +554,6 @@ export interface DataSelectionOptions<T> {
    * By default, all properties of the items are emitted.
    * When fields is defined, only the properties whose name is specified
    * in fields will be included in the returned items.
-   *
-   * @type {(string[] | any)}
-   * @memberOf DataSelectionOptions
    */
   fields?: string[] | any;
 
@@ -589,9 +563,6 @@ export interface DataSelectionOptions<T> {
    * When a field type is specified, this field in the items will be converted to the specified type.
    * This can be used for example to convert ISO strings containing a date to a JavaScript Date object,
    * or convert strings to numbers or vice versa. The available data types are listed in section Data Types.
-   *
-   * @type {*}
-   * @memberOf DataSelectionOptions
    */
   type?: any;
 
@@ -602,16 +573,11 @@ export interface DataSelectionOptions<T> {
    * The function must return a boolean.
    * All items for which the filter function returns true will be emitted.
    * See section Data Filtering.
-   *
-   * @memberOf DataSelectionOptions
    */
   filter?(item: T): boolean;
 
   /**
    * Order the items by a field name or custom sort function.
-   *
-   * @type {(string | any)}
-   * @memberOf DataSelectionOptions
    */
   order?: string | any;
 
@@ -620,9 +586,6 @@ export interface DataSelectionOptions<T> {
    * Allowed values are 'Array' | 'Object'.
    * The default returnType is an Array.
    * The Object type will return a JSON object with the ID's as keys.
-   *
-   * @type {string}
-   * @memberOf DataSelectionOptions
    */
   returnType?: string;
 }
@@ -751,8 +714,8 @@ export class Graph2d {
 
   addCustomTime(time: DateType, id?: IdType): IdType;
   destroy(): void;
-  fit(options?: TimelineFitOptions): void;
-  focus(ids: IdType | IdType[], options?: TimelineFitOptions): void;
+  fit(options?: TimelineAnimationOptions): void;
+  focus(ids: IdType | IdType[], options?: TimelineAnimationOptions): void;
   getCurrentTime(): Date;
   getCustomTime(id?: IdType): Date;
   getEventProperties(event: Event): TimelineEventPropertiesResult;
@@ -760,7 +723,7 @@ export class Graph2d {
   getSelection(): IdType[];
   getVisibleItems(): IdType[];
   getWindow(): { start: Date, end: Date };
-  moveTo(time: DateType, options?: TimelineFitOptions): void;
+  moveTo(time: DateType, options?: TimelineAnimationOptions): void;
   on(event: TimelineEvents, callback: () => void): void;
   off(event: TimelineEvents, callback: () => void): void;
   redraw(): void;
@@ -773,7 +736,7 @@ export class Graph2d {
   setItems(items: DataItemCollectionType): void;
   setOptions(options: TimelineOptions): void;
   setSelection(ids: IdType | IdType[]): void;
-  setWindow(start: DateType, end: DateType, options?: TimelineFitOptions): void;
+  setWindow(start: DateType, end: DateType, options?: TimelineAnimationOptions): void;
 }
 
 export interface Graph2d {
@@ -793,41 +756,174 @@ export class Timeline {
     groups: DataGroupCollectionType,
     options?: TimelineOptions
   );
+
   constructor(
     container: HTMLElement,
     items: DataItemCollectionType,
     options?: TimelineOptions
   );
 
+  /**
+   * Add new vertical bar representing a custom time that can be dragged by the user. Parameter time can be a Date, Number, or String, and is new Date() by default.
+   * Parameter id can be Number or String and is undefined by default. The id is added as CSS class name of the custom time bar, allowing to style multiple time bars differently.
+   * The method returns id of the created bar.
+   */
   addCustomTime(time: DateType, id?: IdType): IdType;
+
+  /**
+   * Destroy the Timeline. The timeline is removed from memory. all DOM elements and event listeners are cleaned up.
+   */
   destroy(): void;
-  fit(options?: TimelineFitOptions): void;
-  focus(ids: IdType | IdType[], options?: TimelineFitOptions): void;
+
+  /**
+   * Adjust the visible window such that it fits all items. See also focus(id).
+   */
+  fit(options?: TimelineAnimationOptions): void;
+
+  /**
+   * Adjust the visible window such that the selected item (or multiple items) are centered on screen. See also function fit()
+   */
+  focus(ids: IdType | IdType[], options?: TimelineAnimationOptions): void;
+
+  /**
+   * Get the current time. Only applicable when option showCurrentTime is true.
+   */
   getCurrentTime(): Date;
+
+  /**
+   * Retrieve the custom time from the custom time bar with given id.
+   * @param id Id is undefined by default.
+   */
   getCustomTime(id?: IdType): Date;
+
   getEventProperties(event: Event): TimelineEventPropertiesResult;
+
+  /**
+   * Get the range of all the items as an object containing min date and max date
+   */
   getItemRange(): { min: Date, max: Date };
+
+  /**
+   * Get an array with the ids of the currently selected items
+   */
   getSelection(): IdType[];
+
+  /**
+   * Get an array with the ids of the currently visible items.
+   */
   getVisibleItems(): IdType[];
+
+  /**
+   * Get the current visible window.
+   */
   getWindow(): TimelineWindow;
-  moveTo(time: DateType, options?: TimelineFitOptions): void;
-  on(event: TimelineEvents, callback: () => void): void;
-  off(event: TimelineEvents, callback: () => void): void;
+
+  /**
+   * Move the window such that given time is centered on screen.
+   */
+  moveTo(time: DateType, options?: TimelineAnimationOptions, callback?: (properties?: any) => void): void;
+
+  /**
+   * Create an event listener. The callback function is invoked every time the event is triggered.
+   */
+  on(event: TimelineEvents, callback?: (properties?: any) => void): void;
+
+  /**
+   * Remove an event listener created before via function on(event[, callback]).
+   */
+  off(event: TimelineEvents, callback?: (properties?: any) => void): void;
+
+  /**
+   * Force a redraw of the Timeline. The size of all items will be recalculated.
+   * Can be useful to manually redraw when option autoResize=false and the window has been resized, or when the items CSS has been changed.
+   */
   redraw(): void;
+
+  /**
+   * Remove vertical bars previously added to the timeline via addCustomTime method.
+   * @param id ID of the custom vertical bar returned by addCustomTime method.
+   */
   removeCustomTime(id: IdType): void;
+
+  /**
+   * Set a current time. This can be used for example to ensure that a client's time is synchronized with a shared server time. Only applicable when option showCurrentTime is true.
+   */
   setCurrentTime(time: DateType): void;
+
+  /**
+   * Adjust the time of a custom time bar.
+   * @param time The time the custom time bar should point to
+   * @param id Id of the custom time bar, and is undefined by default.
+   */
   setCustomTime(time: DateType, id?: IdType): void;
+
+  /**
+   * Adjust the title attribute of a custom time bar.
+   * @param title The title shown when hover over time bar
+   * @param id Id of the custom time bar, and is undefined by default.
+   */
   setCustomTimeTitle(title: string, id?: IdType): void;
+
+  /**
+   * Set both groups and items at once. Both properties are optional.
+   * This is a convenience method for individually calling both setItems(items) and setGroups(groups).
+   * Both items and groups can be an Array with Objects, a DataSet (offering 2 way data binding), or a DataView (offering 1 way data binding).
+   */
   setData(data: { groups?: DataGroupCollectionType; items?: DataItemCollectionType }): void;
+
+  /**
+   * Set a data set with groups for the Timeline.
+   */
   setGroups(groups?: DataGroupCollectionType): void;
+
+  /**
+   * Set a data set with items for the Timeline.
+   */
   setItems(items: DataItemCollectionType): void;
+
+  /**
+   * Set or update options. It is possible to change any option of the timeline at any time. You can for example switch orientation on the fly.
+   */
   setOptions(options: TimelineOptions): void;
-  setSelection(ids: IdType | IdType[]): void;
-  setWindow(start: DateType, end: DateType, options?: TimelineFitOptions, callback?: () => void): void;
+
+  /**
+   * Select one or multiple items by their id. The currently selected items will be unselected. To unselect all selected items, call `setSelection([])`.
+   */
+  setSelection(ids: IdType | IdType[], options?: { focus: boolean, animation: TimelineAnimationOptions }): void;
+
+  /**
+   * Set the current visible window.
+   * @param start If the parameter value of start is null, the parameter will be left unchanged.
+   * @param end If the parameter value of end is null, the parameter will be left unchanged.
+   * @param options Timeline animation options. See {@link TimelineAnimationOptions}
+   * @param callback The callback function
+   */
+  setWindow(start: DateType, end: DateType, options?: TimelineAnimationOptions, callback?: () => void): void;
+
+  /**
+   * Toggle rollingMode.
+   */
+  toggleRollingMode(): void;
+
+  /**
+   * Zoom in the current visible window.
+   * @param percentage A number and must be between 0 and 1. If null, the window will be left unchanged.
+   * @param options Timeline animation options. See {@link TimelineAnimationOptions}
+   * @param callback The callback function
+   */
+  zoomIn(percentage: number, options?: TimelineAnimationOptions, callback?: () => void): void;
+
+  /**
+   * Zoom out the current visible window.
+   * @param percentage A number and must be between 0 and 1. If null, the window will be left unchanged.
+   * @param options Timeline animation options. See {@link TimelineAnimationOptions}
+   * @param callback The callback function
+   */
+  zoomOut(percentage: number, options?: TimelineAnimationOptions, callback?: () => void): void;
 }
 
 export interface TimelineStatic {
-  new (id: HTMLElement, data: any, options?: any): vis.Timeline;
+  new(id: HTMLElement, data: any, options?: any): vis.Timeline;
 }
 
 export interface Timeline {
@@ -837,6 +933,7 @@ export interface Timeline {
   setWindow(start: any, date: any): void;
   focus(selection: any): void;
   on(event?: string, callback?: (properties: any) => void): void;
+  off(event: string, callback?: (properties?: any) => void): void;
 }
 
 export interface TimelineWindow {
@@ -920,27 +1017,19 @@ export type NetworkEvents =
  * The visualization is easy to use and supports custom shapes, styles, colors, sizes, images, and more.
  * The network visualization works smooth on any modern browser for up to a few thousand nodes and edges.
  * To handle a larger amount of nodes, Network has clustering support. Network uses HTML canvas for rendering.
- *
- * @export
- * @class Network
- * @implements {INetwork}
  */
 export class Network {
   /**
    * Creates an instance of Network.
    *
-   * @param {HTMLElement} container the HTML element representing the network container
-   * @param {IData} data network data
-   * @param {IOptions} [options] optional network options
-   *
-   * @memberOf Network
+   * @param container the HTML element representing the network container
+   * @param data network data
+   * @param [options] optional network options
    */
   constructor(container: HTMLElement, data: Data, options?: Options);
 
   /**
    * 	Remove the network from the DOM and remove all Hammer bindings and references.
-   *
-   * @memberOf Network
    */
   destroy(): void;
 
@@ -950,9 +1039,7 @@ export class Network {
    * the network will stabilize again.
    * This method is also performed when first initializing the network.
    *
-   * @param {IData} data network data
-   *
-   * @memberOf Network
+   * @param data network data
    */
   setData(data: Data): void;
 
@@ -961,9 +1048,7 @@ export class Network {
    * All available options can be found in the modules above.
    * Each module requires it's own container with the module name to contain its options.
    *
-   * @param {IOptions} options network options
-   *
-   * @memberOf Network
+   * @param options network options
    */
   setOptions(options: Options): void;
 
@@ -971,10 +1056,8 @@ export class Network {
    * Set an event listener.
    * Depending on the type of event you get different parameters for the callback function.
    *
-   * @param {string} eventName the name of the event, f.e. 'click'
-   * @param {(params?: any) => void} callback the callback function that will be raised
-   *
-   * @memberOf Network
+   * @param eventName the name of the event, f.e. 'click'
+   * @param callback the callback function that will be raised
    */
   on(eventName: NetworkEvents, callback: (params?: any) => void): void;
 
@@ -983,10 +1066,8 @@ export class Network {
    * The function you supply has to be the exact same as the one you used in the on function.
    * If no function is supplied, all listeners will be removed.
    *
-   * @param {string} eventName the name of the event, f.e. 'click'
-   * @param {(params?: any) => void} [callback] the exact same callback function that was used when calling 'on'
-   *
-   * @memberOf Network
+   * @param eventName the name of the event, f.e. 'click'
+   * @param [callback] the exact same callback function that was used when calling 'on'
    */
   off(eventName: NetworkEvents, callback?: (params?: any) => void): void;
 
@@ -995,10 +1076,8 @@ export class Network {
    * After it has taken place, the event listener will be removed.
    * Depending on the type of event you get different parameters for the callback function.
    *
-   * @param {string} eventName the name of the event, f.e. 'click'
-   * @param {(params?: any) => void} callback the callback function that will be raised once
-   *
-   * @memberOf Network
+   * @param eventName the name of the event, f.e. 'click'
+   * @param callback the callback function that will be raised once
    */
   once(eventName: NetworkEvents, callback: (params?: any) => void): void;
 
@@ -1007,10 +1086,8 @@ export class Network {
    * Input and output are in the form of {x:Number, y:Number} (IPosition interface).
    * The DOM values are relative to the network container.
    *
-   * @param {IPosition} position the canvas coordinates
-   * @returns {IPosition} the DOM coordinates
-   *
-   * @memberOf Network
+   * @param position the canvas coordinates
+   * @returns the DOM coordinates
    */
   canvasToDOM(position: Position): Position;
 
@@ -1019,17 +1096,13 @@ export class Network {
    * Input and output are in the form of {x:Number,y:Number} (IPosition interface).
    * The DOM values are relative to the network container.
    *
-   * @param {IPosition} position the DOM coordinates
-   * @returns {IPosition} the canvas coordinates
-   *
-   * @memberOf Network
+   * @param position the DOM coordinates
+   * @returns the canvas coordinates
    */
   DOMtoCanvas(position: Position): Position;
 
   /**
    * Redraw the network.
-   *
-   * @memberOf Network
    */
   redraw(): void;
 
@@ -1037,19 +1110,13 @@ export class Network {
    * Set the size of the canvas.
    * This is automatically done on a window resize.
    *
-   * @param {string} width width in a common format, f.e. '100px'
-   * @param {string} height height in a common format, f.e. '100px'
-   *
-   * @memberOf Network
+   * @param width width in a common format, f.e. '100px'
+   * @param height height in a common format, f.e. '100px'
    */
   setSize(width: string, height: string): void;
 
   /**
    * The joinCondition function is presented with all nodes.
-   *
-   * @param {IClusterOptions} [options]
-   *
-   * @memberOf Network
    */
   cluster(options?: ClusterOptions): void;
 
@@ -1059,10 +1126,8 @@ export class Network {
    * All options of this object are explained below.
    * The joinCondition is only presented with the connected nodes.
    *
-   * @param {string} nodeId the id of the node
-   * @param {IClusterOptions} [options] the cluster options
-   *
-   * @memberOf Network
+   * @param nodeId the id of the node
+   * @param [options] the cluster options
    */
   clusterByConnection(nodeId: string, options?: ClusterOptions): void;
 
@@ -1074,19 +1139,15 @@ export class Network {
    * For all qualifying nodes, clusterByConnection is performed on each of them.
    * The options object is described for clusterByConnection and does the same here.
    *
-   * @param {number} [hubsize] optional hubsize
-   * @param {IClusterOptions} [options] optional cluster options
-   *
-   * @memberOf Network
+   * @param [hubsize] optional hubsize
+   * @param [options] optional cluster options
    */
   clusterByHubsize(hubsize?: number, options?: ClusterOptions): void;
 
   /**
    * This method will cluster all nodes with 1 edge with their respective connected node.
    *
-   * @param {IClusterOptions} [options] optional cluster options
-   *
-   * @memberOf Network
+   * @param [options] optional cluster options
    */
   clusterOutliers(options?: ClusterOptions): void;
 
@@ -1101,10 +1162,8 @@ export class Network {
    *
    * network.clustering.findNode('fred') will return ['A','B','C','fred'].
    *
-   * @param {IdType} nodeId the node id.
-   * @returns {IdType[]} an array of nodeIds showing where the node is
-   *
-   * @memberOf Network
+   * @param nodeId the node id.
+   * @returns an array of nodeIds showing where the node is
    */
   findNode(nodeId: IdType): IdType[];
 
@@ -1112,8 +1171,8 @@ export class Network {
    * Similar to findNode in that it returns all the edge ids that were
    * created from the provided edge during clustering.
    *
-   * @param {IdType} baseEdgeId the base edge id
-   * @returns {IdType[]} an array of edgeIds
+   * @param baseEdgeId the base edge id
+   * @returns an array of edgeIds
    */
   getClusteredEdges(baseEdgeId: IdType): IdType[];
 
@@ -1122,9 +1181,6 @@ export class Network {
    * baseEdgeId provided in data.edges ie.
    * After clustering the 'SelectEdge' event is fired but provides only the clustered edge.
    * This method can then be used to return the baseEdgeId.
-   *
-   * @param {IdType} clusteredEdgeId
-   * @returns {IdType}
    */
   getBaseEdge(clusteredEdgeId: IdType): IdType;
 
@@ -1134,9 +1190,6 @@ export class Network {
    * the edges between clusters are created and the previous edges are hidden,
    * until the cluster is opened. This method takes an edgeId (ie. a base edgeId from data.edges)
    * and applys the options to it and any edges that were created from it while clustering.
-   *
-   * @param {IdType} startEdgeId
-   * @param {IEdgeOptions} [options]
    */
   updateEdge(startEdgeId: IdType, options?: EdgeOptions): void;
 
@@ -1149,10 +1202,7 @@ export class Network {
   /**
    * Returns true if the node whose ID has been supplied is a cluster.
    *
-   * @param {IdType} nodeId the node id.
-   * @returns {boolean}
-   *
-   * @memberOf Network
+   * @param nodeId the node id.
    */
   isCluster(nodeId: IdType): boolean;
 
@@ -1160,10 +1210,7 @@ export class Network {
    * Returns an array of all nodeIds of the nodes that
    * would be released if you open the cluster.
    *
-   * @param {IdType} clusterNodeId the id of the cluster node
-   * @returns {IdType[]}
-   *
-   * @memberOf Network
+   * @param clusterNodeId the id of the cluster node
    */
   getNodesInCluster(clusterNodeId: IdType): IdType[];
 
@@ -1174,10 +1221,8 @@ export class Network {
    * releaseFunction, which is a function that can be used to manually
    * position the nodes after the cluster is opened.
    *
-   * @param {IdType} nodeId the node id
-   * @param {IOpenClusterOptions} [options] optional open cluster options
-   *
-   * @memberOf Network
+   * @param nodeId the node id
+   * @param [options] optional open cluster options
    */
   openCluster(nodeId: IdType, options?: OpenClusterOptions): void;
 
@@ -1186,25 +1231,19 @@ export class Network {
    * and would like it to start in the same way next time,
    * ask for the seed using this method and put it in the layout.randomSeed option.
    *
-   * @returns {number} the current seed of the network.
-   *
-   * @memberOf Network
+   * @returns the current seed of the network.
    */
   getSeed(): number;
 
   /**
    * 	Programatically enable the edit mode.
    * Similar effect to pressing the edit button.
-   *
-   * @memberOf Network
    */
   enableEditMode(): void;
 
   /**
    * Programatically disable the edit mode.
    * Similar effect to pressing the close icon (small cross in the corner of the toolbar).
-   *
-   * @memberOf Network
    */
   disableEditMode(): void;
 
@@ -1213,40 +1252,30 @@ export class Network {
    * To get out of this mode, call disableEditMode().
    * The callback functions defined in handlerFunctions still apply.
    * To use these methods without having the manipulation GUI, make sure you set enabled to false.
-   *
-   * @memberOf Network
    */
   addNodeMode(): void;
 
   /**
    * Edit the selected node.
    * The explaination from addNodeMode applies here as well.
-   *
-   * @memberOf Network
    */
   editNode(): void;
 
   /**
    * Go into addEdge mode.
    * The explaination from addNodeMode applies here as well.
-   *
-   * @memberOf Network
    */
   addEdgeMode(): void;
 
   /**
    * Go into editEdge mode.
    * The explaination from addNodeMode applies here as well.
-   *
-   * @memberOf Network
    */
   editEdgeMode(): void;
 
   /**
    * Delete selected.
    * Having edit mode or manipulation enabled is not required.
-   *
-   * @memberOf Network
    */
   deleteSelected(): void;
 
@@ -1256,11 +1285,6 @@ export class Network {
    * Alternative inputs are a String containing a nodeId or nothing.
    * When a String is supplied, the position of the node corresponding to the ID is returned.
    * When nothing is supplied, the positions of all nodes are returned.
-   *
-   * @param {string[]} nodeIds
-   * @returns {{[nodeId: IdType]: IPosition}}
-   *
-   * @memberOf Network
    */
   getPositions(nodeIds?: IdType[]): { [nodeId: string]: Position };
   getPositions(nodeId: IdType): Position;
@@ -1278,8 +1302,6 @@ export class Network {
    * This method does not support clustering.
    * At the moment it is not possible to cache positions when using clusters since
    * they cannot be correctly initialized from just the positions.
-   *
-   * @memberOf Network
    */
   storePositions(): void;
 
@@ -1287,21 +1309,15 @@ export class Network {
    * You can use this to programatically move a node.
    * The supplied x and y positions have to be in canvas space!
    *
-   * @param {IdType} nodeId the node that will be moved
-   * @param {number} x new canvas space x position
-   * @param {number} y new canvas space y position
-   *
-   * @memberOf Network
+   * @param nodeId the node that will be moved
+   * @param x new canvas space x position
+   * @param y new canvas space y position
    */
   moveNode(nodeId: IdType, x: number, y: number): void;
 
   /**
    * Returns a bounding box for the node including label.
    *
-   * @param {IdType} nodeId
-   * @returns {IBoundingBox}
-   *
-   * @memberOf Network
    */
   getBoundingBox(nodeId: IdType): BoundingBox;
 
@@ -1310,20 +1326,14 @@ export class Network {
    * If you supply an edgeId, vis will first match the id to nodes.
    * If no match is found, it will search in the edgelist and return an array: [fromId, toId].
    *
-   * @param {IdType} nodeOrEdgeId a node or edge id
-   * @returns {(IdType[] | {fromId: IdType, toId: IdType}[])}
-   *
-   * @memberOf Network
+   * @param nodeOrEdgeId a node or edge id
    */
   getConnectedNodes(nodeOrEdgeId: IdType): IdType[] | Array<{ fromId: IdType, toId: IdType }>;
 
   /**
    * Returns an array of edgeIds of the edges connected to this node.
    *
-   * @param {IdType} nodeId the node id
-   * @returns {IdType[]}
-   *
-   * @memberOf Network
+   * @param nodeId the node id
    */
   getConnectedEdges(nodeId: IdType): IdType[];
 
@@ -1331,8 +1341,6 @@ export class Network {
    * Start the physics simulation.
    * This is normally done whenever needed and is only really useful
    * if you stop the simulation yourself and wish to continue it afterwards.
-   *
-   * @memberOf Network
    */
   startSimulation(): void;
 
@@ -1340,8 +1348,6 @@ export class Network {
    * This stops the physics simulation and triggers a stabilized event.
    * Tt can be restarted by dragging a node,
    * altering the dataset or calling startSimulation().
-   *
-   * @memberOf Network
    */
   stopSimulation(): void;
 
@@ -1350,18 +1356,13 @@ export class Network {
    * All the stabilization options above are used.
    * You can optionally supply the number of iterations it should do.
    *
-   * @param {number} [iterations] the number of iterations it should do
-   *
-   * @memberOf Network
+   * @param [iterations] the number of iterations it should do
    */
   stabilize(iterations?: number): void;
 
   /**
    * Returns an object with selected nodes and edges ids.
    *
-   * @returns {{ nodes: IdType[], edges: IdType[] }}
-   *
-   * @memberOf Network
    */
   getSelection(): { nodes: IdType[], edges: IdType[] };
 
@@ -1369,9 +1370,6 @@ export class Network {
    * Returns an array of selected node ids like so:
    * [nodeId1, nodeId2, ..].
    *
-   * @returns {IdType[]}
-   *
-   * @memberOf Network
    */
   getSelectedNodes(): IdType[];
 
@@ -1379,9 +1377,6 @@ export class Network {
    * Returns an array of selected edge ids like so:
    * [edgeId1, edgeId2, ..].
    *
-   * @returns {IdType[]}
-   *
-   * @memberOf Network
    */
   getSelectedEdges(): IdType[];
 
@@ -1389,10 +1384,6 @@ export class Network {
    * Returns a nodeId or undefined.
    * The DOM positions are expected to be in pixels from the top left corner of the canvas.
    *
-   * @param {IPosition} position
-   * @returns {IdType}
-   *
-   * @memberOf Network
    */
   getNodeAt(position: Position): IdType;
 
@@ -1400,10 +1391,6 @@ export class Network {
    * Returns a edgeId or undefined.
    * The DOM positions are expected to be in pixels from the top left corner of the canvas.
    *
-   * @param {IPosition} position
-   * @returns {IdType}
-   *
-   * @memberOf Network
    */
   getEdgeAt(position: Position): IdType;
 
@@ -1412,10 +1399,6 @@ export class Network {
    * If highlightEdges is true or undefined, the neighbouring edges will also be selected.
    * This method unselects all other objects before selecting its own objects. Does not fire events.
    *
-   * @param {IdType[]} nodeIds
-   * @param {boolean} [highlightEdges]
-   *
-   * @memberOf Network
    */
   selectNodes(nodeIds: IdType[], highlightEdges?: boolean): void;
 
@@ -1424,9 +1407,6 @@ export class Network {
    * This method unselects all other objects before selecting its own objects.
    * Does not fire events.
    *
-   * @param {IdType[]} edgeIds
-   *
-   * @memberOf Network
    */
   selectEdges(edgeIds: IdType[]): void;
 
@@ -1434,18 +1414,12 @@ export class Network {
    * Sets the selection.
    * You can also pass only nodes or edges in selection object.
    *
-   * @param {{ nodes: IdType[], edges: IdType[] }} selection
-   * @param {ISelectionOptions} [options]
-   *
-   * @memberOf Network
    */
   setSelection(selection: { nodes: IdType[], edges: IdType[] }, options?: SelectionOptions): void;
 
   /**
    * Unselect all objects.
    * Does not fire events.
-   *
-   * @memberOf Network
    */
   unselectAll(): void;
 
@@ -1453,27 +1427,21 @@ export class Network {
    * Returns the current scale of the network.
    * 1.0 is comparible to 100%, 0 is zoomed out infinitely.
    *
-   * @returns {number} the current scale of the network
-   *
-   * @memberOf Network
+   * @returns the current scale of the network
    */
   getScale(): number;
 
   /**
    * Returns the current central focus point of the view in the form: { x: {Number}, y: {Number} }
    *
-   * @returns {IPosition} the view position;
-   *
-   * @memberOf Network
+   * @returns the view position;
    */
   getViewPosition(): Position;
 
   /**
    * Zooms out so all nodes fit on the canvas.
    *
-   * @param {IFitOptions} [options] All options are optional for the fit method
-   *
-   * @memberOf Network
+   * @param [options] All options are optional for the fit method
    */
   fit(options?: FitOptions): void;
 
@@ -1482,26 +1450,17 @@ export class Network {
    * What that means is the view will lock onto that node, if it is moving, the view will also move accordingly.
    * If the view is dragged by the user, the focus is broken. You can supply options to customize the effect.
    *
-   * @param {IdType} nodeId
-   * @param {IFocusOptions} [options]
-   *
-   * @memberOf Network
    */
   focus(nodeId: IdType, options?: FocusOptions): void;
 
   /**
    * You can animate or move the camera using the moveTo method.
    *
-   * @param {IMoveToOptions} options
-   *
-   * @memberOf Network
    */
   moveTo(options: MoveToOptions): void;
 
   /**
    * Programatically release the focussed node.
-   *
-   * @memberOf Network
    */
   releaseNode(): void;
 
@@ -1509,63 +1468,41 @@ export class Network {
    * If you use the configurator, you can call this method to get an options object that contains
    * all differences from the default options caused by users interacting with the configurator.
    *
-   * @returns {*}
-   *
-   * @memberOf Network
    */
   getOptionsFromConfigurator(): any;
 }
 
 /**
  * Options interface for focus function.
- *
- * @export
- * @interface IFocusOptions
- * @extends {IViewPortOptions}
  */
 export interface FocusOptions extends ViewPortOptions {
   /**
    * Locked denotes whether or not the view remains locked to
    * the node once the zoom-in animation is finished.
    * Default value is true.
-   *
-   * @type {boolean}
-   * @memberOf IFocusOptions
    */
   locked?: boolean;
 }
 
 /**
  * Base options interface for some viewport functions.
- *
- * @export
- * @interface IViewPortOptions
  */
 export interface ViewPortOptions {
   /**
    * The scale is the target zoomlevel.
    * Default value is 1.0.
-   *
-   * @type {number} the scale.
-   * @memberOf IFocusOptions
    */
   scale?: number;
 
   /**
    * The offset (in DOM units) is how many pixels from the center the view is focussed.
    * Default value is {x:0,y:0}
-   *
-   * @type {IPosition}
-   * @memberOf IFocusOptions
    */
   offset?: Position;
 
   /**
    * For animation you can either use a Boolean to use it with the default options or
    * disable it or you can define the duration (in milliseconds) and easing function manually.
-   *
-   * @type {(IAnimationOptions | boolean)}
-   * @memberOf IFitOptions
    */
   animation?: AnimationOptions | boolean;
 }
@@ -1573,33 +1510,20 @@ export interface ViewPortOptions {
 /**
  * You will have to define at least a scale, position or offset.
  * Otherwise, there is nothing to move to.
- *
- * @export
- * @interface IMoveToOptions
- * @extends {IViewPortOptions}
  */
 export interface MoveToOptions extends ViewPortOptions {
   /**
    * The position (in canvas units!) is the position of the central focus point of the camera.
-   *
-   * @type {IPosition}
-   * @memberOf IMoveToOptions
    */
   position?: Position;
 }
 
 /**
  * Animation options interface.
- *
- * @export
- * @interface IAnimationOptions
  */
 export interface AnimationOptions {
   /**
    * The duration (in milliseconds).
-   *
-   * @type {number}
-   * @memberOf IAnimationOptions
    */
   duration: number;
   /**
@@ -1609,36 +1533,39 @@ export interface AnimationOptions {
    * linear, easeInQuad, easeOutQuad, easeInOutQuad, easeInCubic,
    * easeOutCubic, easeInOutCubic, easeInQuart, easeOutQuart, easeInOutQuart,
    * easeInQuint, easeOutQuint, easeInOutQuint.
-   *
-   * @type {string}
-   * @memberOf IAnimationOptions
    */
-  easingFunction: string;
+  easingFunction: EasingFunction;
 }
 
+export type EasingFunction =
+  'linear' |
+  'easeInQuad' |
+  'easeOutQuad' |
+  'easeInOutQuad' |
+  'easeInCubic' |
+  'easeOutCubic' |
+  'easeInOutCubic' |
+  'easeInQuart' |
+  'easeOutQuart' |
+  'easeInOutQuart' |
+  'easeInQuint' |
+  'easeOutQuint' |
+  'easeInOutQuint';
+
 /**
  * Optional options for the fit method.
- *
- * @export
- * @interface IFitOptions
  */
 export interface FitOptions {
   /**
    * The nodes can be used to zoom to fit only specific nodes in the view.
-   *
-   * @type {string[]}
-   * @memberOf IFitOptions
    */
   nodes?: string[];
 
   /**
    * For animation you can either use a Boolean to use it with the default options or
    * disable it or you can define the duration (in milliseconds) and easing function manually.
-   *
-   * @type {(IAnimationOptions | boolean)}
-   * @memberOf IFitOptions
    */
-  animation: AnimationOptions | boolean;
+  animation: TimelineAnimationType;
 }
 
 export interface SelectionOptions {
@@ -1648,9 +1575,6 @@ export interface SelectionOptions {
 
 /**
  * These values are in canvas space.
- *
- * @export
- * @interface IBoundingBox
  */
 export interface BoundingBox {
   top: number;
@@ -1661,9 +1585,6 @@ export interface BoundingBox {
 
 /**
  * Cluster methods options interface.
- *
- * @export
- * @interface IClusterOptions
  */
 export interface ClusterOptions {
   /**
@@ -1672,8 +1593,6 @@ export interface ClusterOptions {
    * and calls this function with their data as argument. If this function returns true,
    * this node will be added to the cluster. You have access to all options (including the default)
    * as well as any custom fields you may have added to the node to determine whether or not to include it in the cluster.
-   *
-   * @memberOf IClusterOptions
    */
   joinCondition?(nodeOptions: any): boolean;
 
@@ -1683,9 +1602,6 @@ export interface ClusterOptions {
    * supplied by you (clusterNodeProperties), all contained nodes and all contained edges.
    * You can use this to update the properties of the cluster based on which items it contains.
    * The function should return the properties to create the cluster node.
-   *
-   * @type {(clusterOptions: any, childNodesOptions: any[], childEdgesOptions: any[])}
-   * @memberOf IClusterOptions
    */
   processProperties?(clusterOptions: any, childNodesOptions: any[], childEdgesOptions: any[]): any;
 
@@ -1696,9 +1612,6 @@ export interface ClusterOptions {
    * This allows you to style your cluster node any way you want.
    * This is also the style object that is provided in the processProperties function for fine tuning.
    * If undefined, default node options will be used.
-   *
-   * @type {INodeOptions}
-   * @memberOf IClusterOptions
    */
   clusterNodeProperties?: NodeOptions;
 
@@ -1709,18 +1622,12 @@ export interface ClusterOptions {
    * Using this, you can style the edges connecting to the cluster any way you want.
    * If none are provided, the options from the edges that are replaced are used.
    * If undefined, default edge options will be used.
-   *
-   * @type {IEdgeOptions}
-   * @memberOf IClusterOptions
    */
   clusterEdgeProperties?: EdgeOptions;
 }
 
 /**
  * Options for the openCluster function of Network.
- *
- * @export
- * @interface IOpenClusterOptions
  */
 export interface OpenClusterOptions {
   /**
@@ -1734,8 +1641,6 @@ export interface OpenClusterOptions {
    * For all nodeIds not listed in this returned object,
    * we will position them at the location of the cluster.
    * This is also the default behaviour when no releaseFunction is defined.
-   *
-   * @memberOf IOpenClusterOptions
    */
   releaseFunction(
     clusterPosition: Position,
@@ -1783,6 +1688,7 @@ export interface Node {
   fixed?: boolean;
   image?: string;
   shape?: string;
+  color?: string | Color;
 }
 
 export interface Edge {
@@ -1792,30 +1698,31 @@ export interface Edge {
 }
 
 export interface Locales {
-    [language: string]: LocaleMessages | undefined;
-    en?: LocaleMessages;
-    de?: LocaleMessages;
-    es?: LocaleMessages;
-    it?: LocaleMessages;
-    nl?: LocaleMessages;
-    'pt-br'?: LocaleMessages;
-    ru?: LocaleMessages;
+  [language: string]: LocaleMessages | undefined;
+  en?: LocaleMessages;
+  cn?: LocaleMessages;
+  de?: LocaleMessages;
+  es?: LocaleMessages;
+  it?: LocaleMessages;
+  nl?: LocaleMessages;
+  'pt-br'?: LocaleMessages;
+  ru?: LocaleMessages;
 }
 
 export interface LocaleMessages {
-    edit: string;
-    del: string;
-    back: string;
-    addNode: string;
-    addEdge: string;
-    editNode: string;
-    editEdge: string;
-    addDescription: string;
-    edgeDescription: string;
-    editEdgeDescription: string;
-    createEdgeError: string;
-    deleteClusterError: string;
-    editClusterError: string;
+  edit: string;
+  del: string;
+  back: string;
+  addNode: string;
+  addEdge: string;
+  editNode: string;
+  editEdge: string;
+  addDescription: string;
+  edgeDescription: string;
+  editEdgeDescription: string;
+  createEdgeError: string;
+  deleteClusterError: string;
+  editClusterError: string;
 }
 
 export interface Options {
@@ -1848,6 +1755,22 @@ export interface Options {
   physics?: any; // http://visjs.org/docs/network/physics.html#
 }
 
+export interface Color {
+  border?: string;
+
+  background?: string;
+
+  highlight?: string | {
+    border?: string;
+    background?: string;
+  };
+
+  hover?: string | {
+    border?: string;
+    background?: string;
+  };
+}
+
 export interface NodeOptions {
   borderWidth?: number;
 
@@ -1855,18 +1778,7 @@ export interface NodeOptions {
 
   brokenImage?: string;
 
-  color?: {
-    border?: string,
-    background?: string,
-    highlight?: string | {
-      border?: string,
-      background?: string,
-    },
-    hover?: string | {
-      border?: string,
-      background?: string,
-    }
-  };
+  color?: Color;
 
   fixed?: boolean | {
     x?: boolean,
diff --git a/types/vis/package.json b/types/vis/package.json
index 690220b60f..7f2ca0779d 100644
--- a/types/vis/package.json
+++ b/types/vis/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.13.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/vision/index.d.ts b/types/vision/index.d.ts
index 61e1390cfb..5539ad07c2 100644
--- a/types/vision/index.d.ts
+++ b/types/vision/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/vision
 // Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as Hapi from 'hapi';
 
diff --git a/types/vision/tsconfig.json b/types/vision/tsconfig.json
index b5a7337fa7..d00003dd52 100644
--- a/types/vision/tsconfig.json
+++ b/types/vision/tsconfig.json
@@ -13,6 +13,9 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": ["boom/v4"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -20,4 +23,4 @@
         "index.d.ts",
         "vision-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/vision/tslint.json b/types/vision/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vision/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vitalsigns/index.d.ts b/types/vitalsigns/index.d.ts
index a7a986a085..1d9e6b79c5 100644
--- a/types/vitalsigns/index.d.ts
+++ b/types/vitalsigns/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/TomFrost/node-vitalsigns
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 ///<reference types="express"/>
 
diff --git a/types/vitalsigns/tslint.json b/types/vitalsigns/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vitalsigns/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vivus/tslint.json b/types/vivus/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vivus/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/voronoi-diagram/tslint.json b/types/voronoi-diagram/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/voronoi-diagram/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vortex-web-client/tslint.json b/types/vortex-web-client/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vortex-web-client/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/voximplant-websdk/tslint.json b/types/voximplant-websdk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/voximplant-websdk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vue-i18n/index.d.ts b/types/vue-i18n/index.d.ts
deleted file mode 100644
index 02174cb784..0000000000
--- a/types/vue-i18n/index.d.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-// Type definitions for vue-i18n 6.1
-// Project: https://github.com/kazupon/vue-i18n
-// Definitions by: Kombu <https://github.com/aicest>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as Vue from 'vue';
-import { PluginFunction } from 'vue';
-
-declare namespace VueI18n {
-    type Path = string;
-    type Locale = string;
-    type Values = any[] | { [key: string]: any };
-    type Choice = number;
-    type LocaleMessage = string | LocaleMessageObject | LocaleMessageArray;
-    interface LocaleMessageObject { [key: string]: LocaleMessage; }
-    interface LocaleMessageArray { [index: number]: LocaleMessage; }
-    interface LocaleMessages { [key: string]: LocaleMessageObject; }
-    type TranslateResult = string | LocaleMessageArray;
-
-    interface Formatter {
-        format(message: string, values: Values): string;
-    }
-
-    type MissingHandler = (locale: Locale, key: Path, vm?: Vue) => void;
-
-    // tslint:disable-next-line:interface-name
-    interface I18nOptions {
-        locale?: Locale;
-        fallbackLocale?: Locale;
-        messages?: LocaleMessages;
-        formatter?: Formatter;
-        missing?: MissingHandler;
-        fallbackRoot?: boolean;
-        sync?: boolean;
-        silentTranslationWarn?: boolean;
-    }
-}
-
-declare class VueI18n {
-    constructor(options?: VueI18n.I18nOptions)
-
-    readonly messages: VueI18n.LocaleMessages;
-
-    locale: VueI18n.Locale;
-    fallbackLocale: VueI18n.Locale;
-    missing: VueI18n.MissingHandler;
-    formatter: VueI18n.Formatter;
-    silentTranslationWarn: boolean;
-
-    t(key: VueI18n.Path, values?: VueI18n.Values): VueI18n.TranslateResult;
-    t(key: VueI18n.Path, locale: VueI18n.Locale, values?: VueI18n.Values): VueI18n.TranslateResult;
-    tc(key: VueI18n.Path, choice?: VueI18n.Choice, values?: VueI18n.Values): string;
-    tc(key: VueI18n.Path, choice: VueI18n.Choice, locale: VueI18n.Locale, values?: VueI18n.Values): string;
-    te(key: VueI18n.Path, locale?: VueI18n.Locale): boolean;
-
-    getLocaleMessage(locale: VueI18n.Locale): VueI18n.LocaleMessageObject;
-    setLocaleMessage(locale: VueI18n.Locale, message: VueI18n.LocaleMessageObject): void;
-    mergeLocaleMessage(locale: VueI18n.Locale, message: VueI18n.LocaleMessageObject): void;
-
-    static install: PluginFunction<never>;
-    static version: string;
-}
-
-declare module 'vue/types/vue' {
-    interface Vue {
-        readonly $i18n: VueI18n;
-        $t: typeof VueI18n.prototype.t;
-        $tc: typeof VueI18n.prototype.tc;
-        $te: typeof VueI18n.prototype.te;
-    }
-}
-
-declare module 'vue/types/options' {
-    interface ComponentOptions<V extends Vue> {
-        i18n?: VueI18n;
-    }
-}
-
-export = VueI18n;
diff --git a/types/vue-i18n/package.json b/types/vue-i18n/package.json
deleted file mode 100644
index c799230c79..0000000000
--- a/types/vue-i18n/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "vue": "^2.2.6"
-    }
-}
\ No newline at end of file
diff --git a/types/vue-i18n/tsconfig.json b/types/vue-i18n/tsconfig.json
deleted file mode 100644
index 01d16389e6..0000000000
--- a/types/vue-i18n/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "vue-i18n-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/vue-i18n/tslint.json b/types/vue-i18n/tslint.json
deleted file mode 100644
index 099be8c124..0000000000
--- a/types/vue-i18n/tslint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "dtslint/dt.json",
-  "rules": {
-    // TODO
-    "no-duplicate-imports": false,
-    "prefer-const": false
-  }
-}
diff --git a/types/vue-i18n/vue-i18n-tests.ts b/types/vue-i18n/vue-i18n-tests.ts
deleted file mode 100644
index 7ff9dab6e1..0000000000
--- a/types/vue-i18n/vue-i18n-tests.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/// <reference types="../../node" />
-
-const assert = console.assert;
-const random = () => Math.trunc(Math.exp(Math.log(Date.now()) * Math.random()));
-
-import * as Vue from 'vue';
-import * as VueI18n from 'vue-i18n';
-import { ComponentOptions } from 'vue';
-
-/**
- * VueI18n.install
- */
-Vue.use(VueI18n);
-VueI18n.install(Vue);
-
-/**
- * VueI18n.version
- */
-assert(typeof VueI18n.version === 'string');
-
-/**
- * VueI18n Instance
- */
-const locale = random().toString();
-const key = `_${random()}`;
-const value = `${random()}|${random()}|${random()}`;
-const i18n = new VueI18n({
-  locale,
-  fallbackLocale: locale,
-  messages: {
-    [locale]: {
-      [key]: value,
-    },
-  },
-  formatter: {
-    format(message, values) {
-      return message;
-    },
-  },
-  missing(locale, key, vm) {
-  },
-  fallbackRoot: false,
-  sync: true,
-  silentTranslationWarn: true,
-});
-assert(i18n.messages[locale][key] === value);
-assert(i18n.locale === locale);
-assert(i18n.fallbackLocale === locale);
-assert(typeof i18n.missing === 'function');
-assert(typeof i18n.formatter.format === 'function');
-assert(i18n.silentTranslationWarn);
-i18n.setLocaleMessage(locale, {});
-assert(i18n.getLocaleMessage(locale)[key] === undefined);
-i18n.mergeLocaleMessage(locale, { [key]: value });
-assert(i18n.getLocaleMessage(locale)[key] === value);
-assert(typeof i18n.t === 'function');
-assert(typeof i18n.tc === 'function');
-assert(typeof i18n.te === 'function');
-
-/**
- * Vue
- */
-const vm = new Vue({
-  i18n,
-});
-assert(vm.$i18n === i18n);
-assert(vm.$t(key) === value);
-assert(vm.$t(key, ['', 0, false, null, undefined]) === value);
-assert(vm.$t(key, { x: 'x' }) === value);
-assert(vm.$t(key, locale) === value);
-assert(vm.$t(key, locale, ['', 0, false, null, undefined]) === value);
-assert(vm.$t(key, locale, { x: 'x' }) === value);
-assert(vm.$tc(key) === value);
-assert(vm.$tc(key, 1) === value.split('|')[1]);
-assert(vm.$tc(key, 1, []) === value.split('|')[1]);
-assert(vm.$tc(key, 1, {}) === value.split('|')[1]);
-assert(vm.$tc(key, 1, locale) === value.split('|')[1]);
-assert(vm.$tc(key, 1, locale, []) === value.split('|')[1]);
-assert(vm.$tc(key, 1, locale, {}) === value.split('|')[1]);
-assert(vm.$te(key));
-assert(vm.$te(key, locale));
-
-/**
- * VueI18n
- */
-{
-  let path: VueI18n.Path;
-  let locale: VueI18n.Locale;
-  let values: VueI18n.Values;
-  let choice: VueI18n.Choice;
-  let localeMessage: VueI18n.LocaleMessage;
-  let localeMessageObject: VueI18n.LocaleMessageObject;
-  let localeMessageArray: VueI18n.LocaleMessageArray;
-  let localeMessages: VueI18n.LocaleMessages;
-  let translateResult: VueI18n.TranslateResult;
-  let formatter: VueI18n.Formatter;
-  let missingHandler: VueI18n.MissingHandler;
-  let i18nOptions: VueI18n.I18nOptions;
-}
diff --git a/types/vue-resource/package.json b/types/vue-resource/package.json
index 2ad1e2b77d..95d860e575 100644
--- a/types/vue-resource/package.json
+++ b/types/vue-resource/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "@types/vue": "^1.0.31"
     }
-}
\ No newline at end of file
+}
diff --git a/types/vue-resource/tslint.json b/types/vue-resource/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vue-resource/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/vue-scrollto/index.d.ts b/types/vue-scrollto/index.d.ts
index e20879473f..47371283d9 100644
--- a/types/vue-scrollto/index.d.ts
+++ b/types/vue-scrollto/index.d.ts
@@ -2,16 +2,17 @@
 // Project: https://github.com/rigor789/vue-scrollto#readme
 // Definitions by: Kovács Vince <https://github.com/vincekovacs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 import { PluginFunction } from "vue";
 
 declare namespace VueScrollTo {
     interface Options {
         // The element you want to scroll to.
-        el?: string;
-        element?: string;
+        el?: string | Element;
+        element?: string | Element;
         // The container that has to be scrolled. Default: body
-        container?: string;
+        container?: string | Element;
         // The duration (in milliseconds) of the scrolling animation. Default: 500
         duration?: number;
         // The easing to be used when animating. Default: ease
@@ -30,17 +31,23 @@ declare namespace VueScrollTo {
         // Whether or not we want scrolling on the y axis. Default: true
         y?: boolean;
     }
+
+    interface VueStatic {
+        (options: Options): void;
+        (element: string | Element, options?: Options): void;
+        (element: string | Element, duration: number, options?: Options): void;
+    }
 }
 
 declare class VueScrollTo {
     static install: PluginFunction<never>;
 
-    scrollTo(element: string | HTMLElement, options?: VueScrollTo.Options): void;
+    scrollTo: VueScrollTo.VueStatic;
 }
 
-declare module "vue/types/vue" {
+declare module 'vue/types/vue' {
     interface Vue {
-        $scrollTo: typeof VueScrollTo.prototype.scrollTo;
+        $scrollTo: VueScrollTo.VueStatic;
     }
 }
 
diff --git a/types/vue-scrollto/tsconfig.json b/types/vue-scrollto/tsconfig.json
index 6afe67dfcb..fd030de5e6 100644
--- a/types/vue-scrollto/tsconfig.json
+++ b/types/vue-scrollto/tsconfig.json
@@ -8,6 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/vue-scrollto/vue-scrollto-tests.ts b/types/vue-scrollto/vue-scrollto-tests.ts
index 55b4d32305..3ca628823b 100644
--- a/types/vue-scrollto/vue-scrollto-tests.ts
+++ b/types/vue-scrollto/vue-scrollto-tests.ts
@@ -1,4 +1,4 @@
-import * as Vue from "vue";
+import Vue from "vue";
 import * as VueScrollTo from "vue-scrollto";
 
 Vue.use(VueScrollTo);
diff --git a/types/vuex-i18n/index.d.ts b/types/vuex-i18n/index.d.ts
new file mode 100644
index 0000000000..2332ef4436
--- /dev/null
+++ b/types/vuex-i18n/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for vuex-i18n 1.7
+// Project: https://github.com/dkfbasel/vuex-i18n
+// Definitions by: Cedric Kemp <https://github.com/jaeggerr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import _Vue, { PluginObject } from "vue";
+
+declare module "vue/types/vue" {
+  interface Vue {
+    $i18n: Ii18n;
+  }
+
+  interface VueConstructor<V extends Vue = Vue> {
+    i18n: Ii18n;
+  }
+}
+
+export interface Translations {
+  [key: string]: string;
+}
+
+export interface Ii18n {
+  /** get the current locale */
+  locale(): string;
+
+  /** set the current locale (i.e. 'de', 'en') */
+  set(locale: string): void;
+
+  /**
+   * add locale translation to the storage. this will extend existing information
+   * (i.e. 'de', {'message': 'Eine Nachricht'})
+   */
+  add(locale: string, translations: Translations): void;
+
+  /**
+   * replace locale translations in the storage. this will remove all previous
+   * locale information for the specified locale
+   */
+  replace(locale: string, translations: Translations): void;
+
+  /**
+   * remove the given locale from the store
+   */
+  remove(locale: string): void;
+
+  /**
+   * set a fallback locale if translation for current locale does not exist
+   */
+  fallback(locale: string): void;
+
+  /**
+   * get localized string from store. note that we pass the arguments passed
+   * to the function directly to the translateInLanguage function
+   */
+  translate(key: string, options: any, pluralization?: number): string | undefined;
+
+  /**
+   * get localized string from store. note that we pass the arguments passed
+   * to the function directly to the translateInLanguage function
+   */
+  translate(key: string, defaultValue: string, options: any, pluralization?: number): string | undefined;
+
+  /**
+   * get localized string from store in a given language if available.
+   */
+  translateIn(locale: string, key: string, options: any, pluralization?: number): string | undefined;
+
+  /**
+   * get localized string from store in a given language if available.
+   */
+  translateIn(locale: string, key: string, defaultValue: string, options: any, pluralization?: number): string | undefined;
+
+  /**
+   * check if the given locale translations are present in the store
+   */
+  localeExists(locale: string): boolean;
+
+  /**
+   * check if the given key is available in the current or fallback locale
+   */
+  keyExists(key: string): boolean;
+}
+
+declare const _default: {
+  plugin: PluginObject<Ii18n>;
+};
+
+export default _default;
diff --git a/types/vuex-i18n/package.json b/types/vuex-i18n/package.json
new file mode 100644
index 0000000000..f180048358
--- /dev/null
+++ b/types/vuex-i18n/package.json
@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "dependencies": {
+    "vue": ">=2.0.0",
+    "vuex": ">=2.0.0"
+  }
+}
diff --git a/types/vuex-i18n/tsconfig.json b/types/vuex-i18n/tsconfig.json
new file mode 100644
index 0000000000..9f8f6eb2fd
--- /dev/null
+++ b/types/vuex-i18n/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "types": [],
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "vuex-i18n-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/vuex-i18n/tslint.json b/types/vuex-i18n/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/vuex-i18n/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/vuex-i18n/vuex-i18n-tests.ts b/types/vuex-i18n/vuex-i18n-tests.ts
new file mode 100644
index 0000000000..218bd12ccf
--- /dev/null
+++ b/types/vuex-i18n/vuex-i18n-tests.ts
@@ -0,0 +1,41 @@
+// load vue and vuex instance
+import Vue from "vue";
+import { Store } from "vuex";
+
+// load vuex i18n module
+import vuexI18n from "vuex-i18n";
+
+// initialize the vuex store using the vuex module. note that you can change the
+//  name of the module if you wish
+const store = new Store({});
+
+// initialize the internationalization plugin on the vue instance. note that
+// the store must be passed to the plugin. the plugin will then generate some
+// helper functions for components (i.e. this.$i18n.set, this.$t) and on the vue
+// instance (i.e. Vue.i18n.set).
+Vue.use(vuexI18n.plugin, store);
+
+// please note that you must specify the name of the vuex module if it is
+// different from i18n. i.e. Vue.use(vuexI18n.plugin, store, "myName")
+
+// add some translations (could also be loaded from a separate file)
+// note that it is possible to use placeholders. translations can also be
+// structured as object trees and will automatically be flattened by the the
+// plugin
+const translationsEn = {
+  content: "This is some {type} content"
+};
+
+// translations can be kept in separate files for each language
+// i.e. resources/i18n/de.json.
+const translationsDe = {
+  "My nice title": "Ein schöner Titel",
+  content: "Dies ist ein toller Inhalt"
+};
+
+// add translations directly to the application
+Vue.i18n.add("en", translationsEn);
+Vue.i18n.add("de", translationsDe);
+
+// set the start locale to use
+Vue.i18n.set("en");
diff --git a/types/w2ui/tslint.json b/types/w2ui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/w2ui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/w3c-image-capture/index.d.ts b/types/w3c-image-capture/index.d.ts
new file mode 100644
index 0000000000..8f04fad534
--- /dev/null
+++ b/types/w3c-image-capture/index.d.ts
@@ -0,0 +1,139 @@
+// Type definitions for W3C Image Capture 1.0
+// Project: https://www.w3.org/TR/image-capture/
+// Definitions by: Cosium <https://github.com/cosium>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="webrtc" />
+
+declare class ImageCapture {
+    constructor(videoTrack: MediaStreamTrack);
+
+    takePhoto(photoSettings?: PhotoSettings): Promise<Blob>;
+
+    getPhotoCapabilities(): Promise<PhotoCapabilities>;
+
+    getPhotoSettings(): Promise<PhotoSettings>;
+
+    grabFrame(): Promise<ImageBitmap>;
+
+    readonly track: MediaStreamTrack;
+}
+
+interface PhotoCapabilities {
+    readonly redEyeReduction: RedEyeReduction;
+    readonly imageHeight: MediaSettingsRange;
+    readonly imageWidth: MediaSettingsRange;
+    readonly fillLightMode: FillLightMode[];
+}
+
+interface PhotoSettings {
+    fillLightMode?: FillLightMode;
+    imageHeight?: number;
+    imageWidth?: number;
+    redEyeReduction?: boolean;
+}
+
+interface MediaSettingsRange {
+    readonly max: number;
+    readonly min: number;
+    readonly step: number;
+}
+
+type RedEyeReduction = 'never' | 'always' | 'controllable';
+type FillLightMode = 'auto' | 'off' | 'flash';
+
+interface MediaTrackCapabilities {
+    whiteBalanceMode: MeteringMode[];
+    exposureMode: MeteringMode[];
+    focusMode: MeteringMode[];
+
+    exposureCompensation: MediaSettingsRange;
+    colorTemperature: MediaSettingsRange;
+    iso: MediaSettingsRange;
+    brightness: MediaSettingsRange;
+    contrast: MediaSettingsRange;
+    saturation: MediaSettingsRange;
+    sharpness: MediaSettingsRange;
+
+    focusDistance: MediaSettingsRange;
+    zoom: MediaSettingsRange;
+    torch: boolean;
+}
+
+declare namespace W3C {
+    type ConstrainPoint2D = Point2D[] | ConstrainPoint2DParameters;
+}
+
+interface MediaTrackConstraintSet {
+    whiteBalanceMode?: W3C.ConstrainString;
+    exposureMode?: W3C.ConstrainString;
+    focusMode?: W3C.ConstrainString;
+    pointsOfInterest?: W3C.ConstrainPoint2D;
+
+    exposureCompensation?: W3C.ConstrainDouble;
+    colorTemperature?: W3C.ConstrainDouble;
+    iso?: W3C.ConstrainDouble;
+
+    brightness?: W3C.ConstrainDouble;
+    contrast?: W3C.ConstrainDouble;
+    saturation?: W3C.ConstrainDouble;
+    sharpness?: W3C.ConstrainDouble;
+
+    focusDistance?: W3C.ConstrainDouble;
+    zoom?: W3C.ConstrainDouble;
+
+    torch?: W3C.ConstrainBoolean;
+}
+
+interface MediaTrackSettings {
+    whiteBalanceMode: MeteringMode;
+    exposureMode: MeteringMode;
+    focusMode: MeteringMode;
+    pointsOfInterest: Point2D[];
+
+    exposureCompensation: number;
+    colorTemperature: number;
+    iso: number;
+
+    brightness: number;
+    contrast: number;
+    saturation: number;
+    sharpness: number;
+
+    focusDistance: number;
+    zoom: number;
+
+    torch: boolean;
+}
+
+interface MediaTrackSupportedConstraints {
+    whiteBalanceMode: boolean;
+    exposureMode: boolean;
+    focusMode: boolean;
+    pointsOfInterest: boolean;
+
+    exposureCompensation: boolean;
+    colorTemperature: boolean;
+    iso: boolean;
+
+    brightness: boolean;
+    contrast: boolean;
+    saturation: boolean;
+    sharpness: boolean;
+    focusDistance: boolean;
+    zoom: boolean;
+    torch: boolean;
+}
+
+interface ConstrainPoint2DParameters {
+    exact: Point2D[];
+    ideal: Point2D[];
+}
+
+type MeteringMode = 'none' | 'manual' | 'single-shot' | 'continuous';
+
+interface Point2D {
+    x: number;
+    y: number;
+}
diff --git a/types/w3c-image-capture/tsconfig.json b/types/w3c-image-capture/tsconfig.json
new file mode 100644
index 0000000000..1dc1d0ce51
--- /dev/null
+++ b/types/w3c-image-capture/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "w3c-image-capture-tests.ts"
+    ]
+}
diff --git a/types/w3c-image-capture/tslint.json b/types/w3c-image-capture/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/w3c-image-capture/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/w3c-image-capture/w3c-image-capture-tests.ts b/types/w3c-image-capture/w3c-image-capture-tests.ts
new file mode 100644
index 0000000000..fa9b05802a
--- /dev/null
+++ b/types/w3c-image-capture/w3c-image-capture-tests.ts
@@ -0,0 +1,189 @@
+// Example 1 (from the spec):
+const updateZoomAndTakePhoto = () => {
+    let imageCapture: ImageCapture;
+
+    const gotMedia = (mediastream: MediaStream) => {
+        const video = document.querySelector('video');
+        if (!video) {
+            return;
+        }
+        video.srcObject = mediastream;
+
+        const track = mediastream.getVideoTracks()[0];
+        imageCapture = new ImageCapture(track);
+
+        const capabilities = track.getCapabilities();
+        // Check whether zoom is supported or not.
+        if (!capabilities.zoom) {
+            return;
+        }
+
+        // Map zoom to a slider element.
+        const input = document.querySelector('input[type="range"]');
+        if (!input) {
+            return;
+        }
+        const inputRange = <HTMLInputElement> input;
+        inputRange.min = capabilities.zoom.min.toString();
+        inputRange.max = capabilities.zoom.max.toString();
+        inputRange.step = capabilities.zoom.step.toString();
+        inputRange.value = track.getSettings().zoom.toString();
+
+        inputRange.oninput = (event) => {
+            const input: HTMLInputElement = <HTMLInputElement> event.target;
+            track.applyConstraints({advanced: [{zoom: Number(input.value)}]});
+        };
+        inputRange.hidden = false;
+    };
+
+    navigator.mediaDevices.getUserMedia({video: true})
+        .then(gotMedia)
+        .catch(err => console.error('getUserMedia() failed: ', err));
+
+    const takePhoto = () => {
+        imageCapture.takePhoto()
+            .then(blob => {
+                console.log(`Photo taken: ${blob.type}, ${blob.size}B`);
+
+                const image = document.querySelector('img');
+                if (!image) {
+                    return;
+                }
+                image.src = URL.createObjectURL(blob);
+            })
+            .catch(err => console.error('takePhoto() failed: ', err));
+    };
+};
+
+// Example 2 (from the spec):
+const repeatGrab = () => {
+    const canvas = <HTMLCanvasElement> document.querySelector('canvas');
+
+    let interval: number;
+    let track: MediaStreamTrack;
+
+    const gotMedia = (mediastream: MediaStream) => {
+        track = mediastream.getVideoTracks()[0];
+        const imageCapture = new ImageCapture(track);
+        interval = setInterval(() => {
+            imageCapture.grabFrame()
+                .then(processFrame)
+                .catch(err => console.error('grabFrame() failed: ', err));
+        }, 1000);
+    };
+
+    navigator.mediaDevices.getUserMedia({video: true})
+        .then(gotMedia)
+        .catch(err => console.error('getUserMedia() failed: ', err));
+
+    const processFrame = (imgData: ImageBitmap) => {
+        canvas.width = imgData.width;
+        canvas.height = imgData.height;
+        const context2D = canvas.getContext('2d');
+        if (!context2D) {
+            return;
+        }
+        context2D.drawImage(imgData, 0, 0);
+    };
+
+    const stopGrabFrame = (e: Event) => {
+        clearInterval(interval);
+        track.stop();
+    };
+};
+
+// Example 3 (from the spec):
+const grabAndPostProcessFrame = () => {
+    const canvas = <HTMLCanvasElement> document.querySelector('canvas');
+
+    let track: MediaStreamTrack;
+
+    const gotMedia = (mediastream: MediaStream) => {
+        track = mediastream.getVideoTracks()[0];
+        const imageCapture = new ImageCapture(track);
+        imageCapture.grabFrame()
+            .then(processFrame)
+            .catch(err => console.error('grabFrame() failed: ', err));
+    };
+
+    navigator.mediaDevices.getUserMedia({video: true})
+        .then(gotMedia)
+        .catch(err => console.error('getUserMedia() failed: ', err));
+
+    const processFrame = (imageBitmap: ImageBitmap) => {
+        track.stop();
+
+        // |imageBitmap| pixels are not directly accessible: we need to paint
+        // the grabbed frame onto a <canvas>, then getImageData() from it.
+        const ctx = canvas.getContext('2d');
+        if (!ctx) {
+            return;
+        }
+        canvas.width = imageBitmap.width;
+        canvas.height = imageBitmap.height;
+        ctx.drawImage(imageBitmap, 0, 0);
+
+        // Read back the pixels from the <canvas>, and invert the colors.
+        const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+
+        const data = imageData.data;
+        for (let i = 0; i < data.length; i += 4) {
+            data[i] = 255 - data[i];     // red
+            data[i + 1] = 255 - data[i + 1]; // green
+            data[i + 2] = 255 - data[i + 2]; // blue
+        }
+        // Finally, draw the inverted image to the <canvas>
+        ctx.putImageData(imageData, 0, 0);
+    };
+};
+
+// Example 4 (from the spec):
+const updateFocusAndTrakePhoto = () => {
+    let imageCapture: ImageCapture;
+
+    const gotMedia = (mediastream: MediaStream) => {
+        const video = <HTMLVideoElement> document.querySelector('video');
+        video.srcObject = mediastream;
+
+        const track = mediastream.getVideoTracks()[0];
+        imageCapture = new ImageCapture(track);
+
+        const capabilities = track.getCapabilities();
+        // Check whether focus distance is supported or not.
+        if (!capabilities.focusDistance) {
+            return;
+        }
+
+        // Map focus distance to a slider element.
+        const input = <HTMLInputElement> document.querySelector('input[type="range"]');
+        input.min = capabilities.focusDistance.min.toString();
+        input.max = capabilities.focusDistance.max.toString();
+        input.step = capabilities.focusDistance.step.toString();
+        input.value = track.getSettings().focusDistance.toString();
+
+        input.oninput = (event) => {
+            track.applyConstraints({
+                advanced: [{
+                    focusMode: "manual",
+                    focusDistance: Number((<HTMLInputElement> event.target).value)
+                }]
+            });
+        };
+        input.hidden = false;
+    };
+
+    navigator.mediaDevices.getUserMedia({video: true})
+        .then(gotMedia)
+        .catch(err => console.error('getUserMedia() failed: ', err));
+
+    const takePhoto = () => {
+        imageCapture.takePhoto()
+            .then(blob => {
+                console.log(`Photo taken: ${blob.type}, ${blob.size}B`);
+
+                const image = <HTMLImageElement> document.querySelector('img');
+                image.src = URL.createObjectURL(blob);
+            })
+            .catch(err => console.error('takePhoto() failed: ', err));
+    };
+};
diff --git a/types/waitme/tslint.json b/types/waitme/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/waitme/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wake_on_lan/tslint.json b/types/wake_on_lan/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wake_on_lan/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wallabyjs/tslint.json b/types/wallabyjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wallabyjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wallabyjs/wallabyjs-tests.ts b/types/wallabyjs/wallabyjs-tests.ts
index 141e55d708..b4120d74ba 100644
--- a/types/wallabyjs/wallabyjs-tests.ts
+++ b/types/wallabyjs/wallabyjs-tests.ts
@@ -37,5 +37,5 @@ export class WallabyConfig implements wallabyjs.IWallabyConfig {
     }
   };
 
-  constructor(private wallaby: wallabyjs.IWallaby) { }
+  constructor(private readonly wallaby: wallabyjs.IWallaby) { }
 }
diff --git a/types/wampy/tslint.json b/types/wampy/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wampy/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/warning/tslint.json b/types/warning/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/warning/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/watchify/tslint.json b/types/watchify/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/watchify/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/watchpack/index.d.ts b/types/watchpack/index.d.ts
index 9a987be3da..880e0d8a6d 100644
--- a/types/watchpack/index.d.ts
+++ b/types/watchpack/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/webpack/watchpack
 // Definitions by: e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/waterline/tslint.json b/types/waterline/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/waterline/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/weak/index.d.ts b/types/weak/index.d.ts
new file mode 100644
index 0000000000..456a578539
--- /dev/null
+++ b/types/weak/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for weak 1.0
+// Project: https://github.com/TooTallNate/node-weak
+// Definitions by: William Kapp <https://github.com/int0h>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+declare class WeakRef<T> {}
+
+/**
+ * Makes weak references to JavaScript Objects
+ * @param object can be a regular Object, an Array, a Function, a RegExp, or any of the primitive types or constructor function created with new
+ * @param callback a callback function to be invoked before the object is garbage collected
+ */
+declare function weak<T extends object>(object: T, callback?: () => void): WeakRef<T>;
+
+declare namespace weak {
+    /**
+     * Returns the actual reference to the Object that this weak reference was created with. If this is called with a dead reference, undefined is returned.
+     * @param ref weak reference object
+     */
+    function get<T>(ref: WeakRef<T>): T | undefined;
+
+    /**
+     * Checks to see if ref is a dead reference. Returns true if the original Object has already been GC'd, false otherwise
+     * @param ref weak reference object
+     */
+    function isDead(ref: WeakRef<any>): ref is WeakRef<undefined>;
+
+    /**
+     * Checks to see if ref is "near death". This will be true exactly during the weak reference callback function, and false any other time.
+     * @param ref weak reference object
+     */
+    function isNearDeath(ref: WeakRef<any>): ref is WeakRef<undefined>;
+
+    /**
+     * Checks to see if obj is "weak reference" instance. Returns true if the passed in object is a "weak reference", false otherwise.
+     * @param obj object to check
+     */
+    function isWeakRef(obj: any): obj is WeakRef<any>;
+
+    /**
+     * Adds callback to the Array of callback functions that will be invoked before the Object gets garbage collected. The callbacks get executed in the order that they are added.
+     * @param ref weak reference object
+     * @param callback function to be called
+     */
+    function addCallback(ref: WeakRef<any>, callback: () => void): NodeJS.EventEmitter;
+
+    /**
+     * Removes callback from the Array of callback functions that will be invoked before the Object gets garbage collected.
+     * @param ref weak reference object
+     * @param callback function to be called
+     */
+    function removeCallback(ref: WeakRef<any>, callback: () => void): NodeJS.EventEmitter;
+
+    /**
+     * Empties the Array of callback functions that will be invoked before the Object gets garbage collected.
+     * @param ref weak reference object
+     */
+    function removeCallbacks(ref: WeakRef<any>): NodeJS.EventEmitter;
+
+    /**
+     * Returns an Array that ref iterates through to invoke the GC callbacks. This utilizes node's EventEmitter#listeners() function and therefore returns a copy in node 0.10 and newer.
+     * @param ref weak reference object
+     */
+    function callbacks(ref: WeakRef<any>): Array<(() => void)>;
+}
+
+export = weak;
diff --git a/types/weak/tsconfig.json b/types/weak/tsconfig.json
new file mode 100644
index 0000000000..33d1a4cdf3
--- /dev/null
+++ b/types/weak/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "weak-tests.ts"
+    ]
+}
diff --git a/types/weak/tslint.json b/types/weak/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/weak/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/weak/weak-tests.ts b/types/weak/weak-tests.ts
new file mode 100644
index 0000000000..a77180823e
--- /dev/null
+++ b/types/weak/weak-tests.ts
@@ -0,0 +1,26 @@
+import weak = require('weak');
+
+const obj = {a: 123};
+
+const weakReference = weak(obj, () => {
+    // collected
+});
+
+const sameType = weak.get(weakReference);
+
+function foo(a: {a: number}) {}
+
+if (sameType) {
+    foo(sameType);
+}
+
+const anyVar = null as any;
+
+if (weak.isWeakRef(anyVar)) {
+    const a = anyVar; // WeakRef<any>
+}
+
+if (weak.isDead(weakReference)) {
+    const a = weakReference; // WeakRef<undefined>
+    const value = weak.get(weakReference); // undefined only possible
+}
diff --git a/types/weapp-api/tslint.json b/types/weapp-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/weapp-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/web-bluetooth/index.d.ts b/types/web-bluetooth/index.d.ts
index 912a7fdd55..d2f92309ed 100644
--- a/types/web-bluetooth/index.d.ts
+++ b/types/web-bluetooth/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Web Bluetooth
 // Project: https://webbluetoothcg.github.io/web-bluetooth/
 // Definitions by: Uri Shaked <https://github.com/urish>
+// 								 Xavier Lozinguez <http://github.com/xlozinguez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 type BluetoothServiceUUID = number | string;
@@ -15,11 +16,13 @@ interface BluetoothRequestDeviceFilter {
 	serviceDataUUID?: BluetoothServiceUUID;
 }
 
-interface RequestDeviceOptions {
+type RequestDeviceOptions = {
 	filters: BluetoothRequestDeviceFilter[];
 	optionalServices?: BluetoothServiceUUID[];
-	acceptAllDevices?: boolean;
-}
+} | {
+	acceptAllDevices: boolean;
+	optionalServices?: BluetoothServiceUUID[];
+};
 
 interface BluetoothRemoteGATTDescriptor {
 	readonly characteristic: BluetoothRemoteGATTCharacteristic;
@@ -98,11 +101,9 @@ interface BluetoothDevice extends EventTarget, BluetoothDeviceEventHandlers, Cha
 	readonly name?: string;
 	readonly gatt?: BluetoothRemoteGATTServer;
 	readonly uuids?: string[];
-
 	watchAdvertisements(): Promise<void>;
 	unwatchAdvertisements(): void;
 	readonly watchingAdvertisements: boolean;
-
 	addEventListener(type: "gattserverdisconnected", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
 	addEventListener(type: "advertisementreceived", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
 	addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -113,7 +114,6 @@ interface Bluetooth extends EventTarget, BluetoothDeviceEventHandlers, Character
 	onavailabilitychanged: (this: this, ev: Event) => any;
 	readonly referringDevice?: BluetoothDevice;
 	requestDevice(options?: RequestDeviceOptions): Promise<BluetoothDevice>;
-
 	addEventListener(type: "availabilitychanged", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
 	addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
diff --git a/types/web-bluetooth/tslint.json b/types/web-bluetooth/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/web-bluetooth/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webappsec-credential-management/index.d.ts b/types/webappsec-credential-management/index.d.ts
index af99a50d27..2859e02d8a 100644
--- a/types/webappsec-credential-management/index.d.ts
+++ b/types/webappsec-credential-management/index.d.ts
@@ -122,7 +122,7 @@ interface CredentialData {
     id: string;
 }
 
-type Credential = PasswordCredential|FederatedCredential;
+type Credential = PasswordCredential|FederatedCredential|PublicKeyCredential;
 
 /**
  * A generic and extensible Credential interface from which all credentials
@@ -309,6 +309,11 @@ interface CredentialRequestOptions {
      * request.
      */
     mediation?: CredentialMediationRequirement;
+
+    /**
+     * This property specifies options for requesting a public-key signature.
+     */
+    publicKey?: PublicKeyCredentialRequestOptions;
 }
 
 /**
@@ -333,6 +338,10 @@ interface CredentialCreationOptions {
      * @see {@link https://www.w3.org/TR/2017/WD-credential-management-1-20170804/#dom-credentialcreationoptions-federated}
      */
     federated?: FederatedCredentialInit;
+    /**
+     * @see {@link https://w3c.github.io/webauthn/#dictionary-makecredentialoptions}
+     */
+    publicKey?: MakePublicKeyCredentialOptions;
 }
 
 /**
@@ -351,3 +360,110 @@ interface FederatedCredentialRequestOptions {
      */
     protocols?: string[];
 }
+
+// Type definitions for webauthn
+// Spec: https://w3c.github.io/webauthn/
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialrequestoptions}
+ */
+interface PublicKeyCredentialRequestOptions {
+    challenge: BufferSource;
+    timeout: number;
+    rpId: string;
+    allowCredentials: PublicKeyCredentialDescriptor[];
+    userVerification?: 'required' | 'preferred' | 'discouraged';
+    extensions?: any;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialrpentity}
+ */
+interface PublicKeyCredentialRpEntity {
+    id: string;
+    name: string;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialuserentity}
+ */
+interface PublicKeyCredentialUserEntity {
+    id: BufferSource;
+    name: string;
+    displayName: string;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialparameters}
+ */
+interface PublicKeyCredentialParameters {
+    type: 'public-key';
+    alg: number;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialdescriptor}
+ */
+interface PublicKeyCredentialDescriptor {
+    type: 'public-key';
+    id: BufferSource;
+    transports?: string[];
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#dictdef-authenticatorselectioncriteria}
+ */
+interface AuthenticatorSelectionCriteria {
+    authenticatorAttachment?: string;
+    requireResidentKey?: boolean;
+    requireUserVerification?: string;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#dictdef-makepublickeycredentialoptions}
+ */
+interface MakePublicKeyCredentialOptions {
+    rp: PublicKeyCredentialRpEntity;
+    user: PublicKeyCredentialUserEntity;
+
+    challenge: BufferSource;
+    pubKeyCredParams: PublicKeyCredentialParameters[];
+
+    timeout?: number;
+    excludeCredentials?: PublicKeyCredentialDescriptor[];
+    authenticatorSelection?: AuthenticatorSelectionCriteria;
+    attestation?: 'none' | 'indirect' | 'direct';
+    extensions?: any;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#authenticatorresponse}
+ */
+interface AuthenticatorResponse {
+    readonly clientDataJSON: ArrayBuffer;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#authenticatorattestationresponse}
+ */
+interface AuthenticatorAttestationResponse extends AuthenticatorResponse {
+    readonly attestationObject: ArrayBuffer;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#iface-authenticatorassertionresponse}
+ */
+interface AuthenticatorAssertionResponse extends AuthenticatorResponse {
+    readonly authenticatorData: ArrayBuffer;
+    readonly signature: ArrayBuffer;
+    readonly userHandle: ArrayBuffer;
+}
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#publickeycredential}
+ */
+interface PublicKeyCredential extends CredentialData {
+    readonly type: 'public-key';
+    readonly rawId: ArrayBuffer;
+    readonly response: AuthenticatorAttestationResponse|AuthenticatorAssertionResponse;
+}
diff --git a/types/webappsec-credential-management/webappsec-credential-management-tests.ts b/types/webappsec-credential-management/webappsec-credential-management-tests.ts
index 5850d86e72..58503208b3 100644
--- a/types/webappsec-credential-management/webappsec-credential-management-tests.ts
+++ b/types/webappsec-credential-management/webappsec-credential-management-tests.ts
@@ -138,9 +138,10 @@ function federatedSignIn() {
                         break;
                 }
             } else {
+                const pwCred = credential as PasswordCredential;
                 fetch(
                     'https://example.com/loginEndpoint',
-                    {credentials: credential, method: 'POST'});
+                    {credentials: pwCred, method: 'POST'});
             }
         });
 }
@@ -270,3 +271,71 @@ function createFederatedCredential() {
         // Credential created!
     });
 }
+
+function webauthnRegister() {
+    if (!navigator.credentials) {
+        return;
+    }
+
+    const challenge = new Uint8Array(32);
+    window.crypto.getRandomValues(challenge);
+
+    const credPromise = navigator.credentials.create({
+        publicKey: {
+            rp: {
+                id: document.domain,
+                name: document.domain,
+            },
+            user: {
+                id: (new Uint8Array(1)).buffer,
+                name: 'test user',
+                displayName: 'test user',
+            },
+            challenge,
+            pubKeyCredParams: [
+                {type: 'public-key', alg: -7},
+            ],
+            timeout: 5000,
+            authenticatorSelection: {},
+        }
+    });
+
+    credPromise.then((cred) => {
+        const pubKeyCred = cred as PublicKeyCredential;
+        console.log(pubKeyCred);
+    }, (e) => {
+        console.log(e.message);
+    });
+}
+
+function webauthnAuthenticate() {
+    if (!navigator.credentials) {
+        return;
+    }
+
+    const credentialID = new Uint8Array(64);
+    const challenge = new Uint8Array(32);
+    window.crypto.getRandomValues(challenge);
+
+    const authPromise = navigator.credentials.get({publicKey: {
+        challenge,
+        timeout: 5000,
+        rpId: document.domain,
+        allowCredentials: [{
+            type: "public-key",
+            id: credentialID,
+        }],
+    }});
+
+    authPromise.then((cred) => {
+        if (cred === null) {
+            return;
+        }
+
+        const pubKeyCred = cred as PublicKeyCredential;
+        const response = <AuthenticatorAssertionResponse> pubKeyCred.response;
+        const authData = new Uint8Array(response.authenticatorData);
+    }, (e) => {
+        console.log(e.message);
+    });
+}
diff --git a/types/webassembly-js-api/tslint.json b/types/webassembly-js-api/tslint.json
index 65c83fb1e3..d8590b6513 100644
--- a/types/webassembly-js-api/tslint.json
+++ b/types/webassembly-js-api/tslint.json
@@ -1,6 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "dt-header": false
+        // TODOs
+        "dt-header": false,
+        "no-unnecessary-class": false
     }
 }
diff --git a/types/webcl/tslint.json b/types/webcl/tslint.json
new file mode 100644
index 0000000000..7f51cc6e38
--- /dev/null
+++ b/types/webcl/tslint.json
@@ -0,0 +1,80 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-initializer": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webcrypto/tslint.json b/types/webcrypto/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webcrypto/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index f1d37d0f88..47d1e8320d 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -793,8 +793,8 @@ declare namespace WebdriverIO {
     interface Client<T> {
         background(seconds: number): Client<T>;
         closeApp(): Client<T>;
-        context(id?: string): Client<T>;
-        contexts(): Client<T>;
+        context(id?: string): Client<T> & RawResult<string>;
+        contexts(): Client<T> & RawResult<string[]>;
         currentActivity(): any;
         deviceKeyEvent(keyValue: number): Client<T>;
         getAppStrings(language: string): Client<T>;
@@ -863,6 +863,9 @@ declare namespace WebdriverIO {
         touchMultiPerform(actions: any): Client<T>;
         touchPerform(actions: any): Client<T>;
         unlock(): Client<T>;
+        isIOS: boolean;
+        isAndroid: boolean;
+        isMobile: boolean;
     }
 
     // Property
diff --git a/types/webdriverio/tslint.json b/types/webdriverio/tslint.json
index 1881fbd79d..5ab241cb96 100644
--- a/types/webdriverio/tslint.json
+++ b/types/webdriverio/tslint.json
@@ -6,6 +6,7 @@
         "no-declare-current-package": false,
         "no-single-declare-module": false,
         "unified-signatures": false,
+        "no-unnecessary-class": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/webfontloader/tslint.json b/types/webfontloader/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webfontloader/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webgl-ext/tslint.json b/types/webgl-ext/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webgl-ext/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webgme/index.d.ts b/types/webgme/index.d.ts
deleted file mode 100644
index 01a70c73f2..0000000000
--- a/types/webgme/index.d.ts
+++ /dev/null
@@ -1,960 +0,0 @@
-// Type definitions for webgme
-// Project: https://webgme.org
-// Definitions by: Fred Eisele <https://github.com/phreed>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-// Based on examination of
-// Example: https://github.com/typed-typings/env-node/blob/master/0.12/node.d.ts
-// Source: https://raw.githubusercontent.com/phreed/typed-npm-webgme/master/webgme.d.ts
-// Documentation: https://editor.webgme.org/docs/source/index.html
-
-declare module "blob/BlobMetadata" {
-    export default class BlobMetadata implements Blobs.BlobMetadata {
-        constructor();
-        name: string;
-        size: number;
-        mime: string;
-        context: Common.DataObject;
-        contentType: string;
-    }
-}
-
-declare module "plugin/PluginBase" {
-    export = Core.PluginBase;
-}
-
-declare module "plugin/PluginConfig" {
-    export = Config.PluginConfig;
-}
-
-declare module "webgme/config/config.default" {
-    export = Config.config;
-}
-
-declare module "webgme/common" {
-    export = Common;
-}
-
-declare module "common/util/canon" {
-    export = Util.CANON;
-}
-
-declare module "common/util/assert" {
-    export = Util.ASSERT;
-}
-
-
-declare namespace Common {
-
-    export type ISO8601 = string;
-    export type ErrorStr = string;
-    export type MetadataHash = string;
-    export type MetadataHashArray = string[];
-    export type ArtifactHash = string;
-    export type Name = string;
-
-    export type Metadata = {}
-    export class Node {
-        constructor();
-    }
-
-    export type DataObject = {}
-    export type Buffer = GLbyte[];
-    export type Payload = string | Buffer | Buffer[];
-    export type Content = DataObject | Buffer | Buffer[];
-    export type ContentString = string;
-    export type Primitive = string | number;
-    export type OutAttr = DataObject | Primitive | undefined | null;
-    export type InAttr = DataObject | Primitive | null;
-    export type OutPath = string | undefined | null;
-
-    export type VoidFn = () => void;
-
-    export type MetadataHashCallback = (err: Error, result: MetadataHash) => void;
-    export type MetadataHashArrayCallback = (err: Error, result: MetadataHashArray) => void;
-    export type MetadataCallback = (err: Error, result: Metadata) => void;
-    export type ObjectCallback = (err: Error, result: DataObject) => void;
-    export type ObjectArrayCallback = (err: Error, result: DataObject[]) => void;
-    export type JSONCallback = (err: Error, result: JSON) => void;
-}
-
-declare namespace Util {
-
-    class Canon {
-        stringify(thing: any): string;
-        parse(thing: any): string;
-    }
-
-    export let CANON: Canon;
-
-    export function ASSERT(condition: boolean): never;
-}
-
-declare namespace Blobs {
-
-    export type ObjectBlob = string;
-
-    export interface BlobMetadata {
-        name: string;
-        size: number;
-        mime: string;
-        context: Common.DataObject;
-        contentType: string;
-    }
-
-    export type BlobMetadataDescriptor = {}
-
-    export class BlobClient {
-        constructor();
-
-        createArtifact(name: Common.Name): Core.Artifact;
-        getArtifact: {
-            (metadataHash: Common.MetadataHash, callback: Core.ArtifactCallback): void;
-            (metadataHash: Common.MetadataHash): Promise<Core.Artifact>;
-        }
-        getMetadataURL(metadataHash: Common.MetadataHash): string;
-        getRelativeMetadataURL(metadataHash: Common.MetadataHash): string;
-        getViewURL(metadataHash: Common.MetadataHash, subpath: string): string;
-        getDownloadURL(metadataHash: Common.MetadataHash, subpath: string): string;
-        getRelativeDownloadURL(metadataHash: Common.MetadataHash, subpath: string): string;
-        getCreateURL(filename: Common.Name, isMetadata: boolean): string;
-        getRelativeCreateURL(filename: Common.Name, isMetadata: boolean): string;
-        getSubObject: {
-            (metadataHash: Common.MetadataHash, subpath: string, callback: Common.ObjectCallback): void;
-            (metadataHash: Common.MetadataHash, subpath: string): Promise<Common.DataObject>;
-        }
-        getObject: {
-            (metadataHash: Common.MetadataHash, callback: Common.ObjectCallback, subpath: string): Common.Content;
-            (metadataHash: Common.MetadataHash, subpath: string): Promise<Common.Content>;
-        }
-        getObjectAsString: {
-            (metadataHash: Common.MetadataHash, callback: Common.MetadataHashCallback): Common.ContentString;
-            (metadataHash: Common.MetadataHash): Promise<Common.ContentString>;
-        }
-        getObjectAsJSON: {
-            (metadataHash: Common.MetadataHash, callback: Common.JSONCallback): void;
-            (metadataHash: Common.MetadataHash): Promise<JSON>;
-        }
-        getMetadata: {
-            (metadataHash: Common.MetadataHash, callback: Common.MetadataCallback): Common.Metadata;
-            (metadataHash: Common.MetadataHash): Promise<Common.Metadata>;
-        }
-        getHumanSize(bytes: number, si: boolean): string;
-        putFile: {
-            (name: Common.Name, data: Common.Payload, callback: Common.MetadataHashCallback): void;
-            (name: Common.Name, data: Common.Payload): Promise<Common.MetadataHash>;
-        }
-        putMetadata: {
-            (metadataDescriptor: BlobMetadataDescriptor, callback: Common.MetadataHashCallback): void;
-            (metadataDescriptor: BlobMetadataDescriptor): Promise<Common.MetadataHash>;
-        }
-        putFiles: {
-            (o: { [name: string]: Common.Payload }, callback: Common.MetadataHashArrayCallback): void;
-            (o: { [name: string]: Common.Payload }): Promise<Common.MetadataHashArray>;
-        }
-        saveAllArtifacts: {
-            (callback: Common.MetadataHashArrayCallback): void;
-            (): Promise<Common.MetadataHashArray>;
-        }
-    }
-
-}
-
-
-/**
-Describe plugins
-*/
-declare namespace Core {
-
-    export interface ResultCallback {
-        (err: Error | null, result: Result): void;
-    }
-
-    export interface Message {
-        msg: string;
-    }
-
-    export type ArtifactCallback = (err: Error, result: Artifact) => void;
-
-    export interface Artifact {
-        name: Common.Name;
-        blobClient: Blobs.BlobClient;
-        descriptor: Blobs.BlobMetadata;
-
-        constructor(name: Common.Name, blobClient: Blobs.BlobClient, descriptor: Blobs.BlobMetadata): void;
-
-        /** Adds content to the artifact as a file. */
-        addFile: {
-            (name: Common.Name, content: Blobs.ObjectBlob, callback: Common.MetadataHashCallback): void;
-            (name: Common.Name, content: Blobs.ObjectBlob): Promise<Common.MetadataHash>;
-        }
-        /** Adds files as soft-link. */
-        addFileAsSoftLink: {
-            (name: Common.Name, content: Blobs.ObjectBlob, callback: Common.MetadataHashCallback): void;
-            (name: Common.Name, content: Blobs.ObjectBlob): Promise<Common.MetadataHash>;
-        }
-        /** Adds multiple files. */
-        addFiles: {
-            (files: { [name: string]: Blobs.ObjectBlob }, callback: Common.MetadataHashArrayCallback): void;
-            (files: { [name: string]: Blobs.ObjectBlob }): Promise<Common.MetadataHashArray> | Promise<string>;
-        }
-        /** Adds multiple files as soft-links. */
-        addFilesAsSoftLinks: {
-            (files: { [name: string]: Blobs.ObjectBlob }, callback: Common.MetadataHashArrayCallback): void;
-            (files: { [name: string]: Blobs.ObjectBlob }): Promise<Common.MetadataHashArray>;
-        }
-        /** Adds a metadataHash to the artifact using the given file path. */
-        addMetadataHash: {
-            (name: Common.Name, metadataHash: Common.MetadataHash, size: number, callback: Common.MetadataHashCallback): void;
-            (name: Common.Name, metadataHash: Common.MetadataHash, size?: number): Promise<Common.MetadataHash>;
-
-            (objectHashes: { [name: string]: string }, callback: Common.MetadataHashCallback): void;
-            (objectHashes: { [name: string]: string }): Promise<Common.MetadataHash>;
-        }
-        /** Adds metadataHashes to the artifact using the given file paths. */
-        addMetadataHashes: {
-            (name: Common.Name, metadataHash: Common.MetadataHash, size: number, callback: Common.MetadataHashArrayCallback): void;
-            (name: Common.Name, metadataHash: Common.MetadataHash, size?: number): Promise<Common.MetadataHashArray>;
-
-            (objectHashes: { [name: string]: string }, callback: Common.MetadataHashArrayCallback): void;
-            (objectHashes: { [name: string]: string }): Promise<Common.MetadataHashArray>;
-        }
-        /** Adds a metadataHash to the artifact using the given file path. */
-        addObjectHash: {
-            (name: Common.Name, metadataHash: Common.MetadataHash, callback: Common.MetadataHashCallback): void;
-            (name: Common.Name, metadataHash: Common.MetadataHash): Promise<Common.MetadataHash>;
-        }
-        /** Adds metadataHashes to the artifact using the given file paths. */
-        addObjectHashes: {
-            (objectHashes: { [name: string]: string }, callback: Common.MetadataHashArrayCallback): void;
-            (objectHashes: { [name: string]: string }): Promise<Common.MetadataHashArray>;
-        }
-        /** Saves this artifact and uploads the metadata to the server's storage. */
-        save: {
-            (callback: Common.MetadataHashCallback): void;
-            (message?: string): Promise<Common.MetadataHash>;
-        }
-    }
-    /**
-     commitHash - metadataHash of the commit.
-     status - storage.constants./SYNCED/FORKED/MERGED
-    */
-    export interface Commit {
-        commitHash: Common.MetadataHash;
-        status: string;
-        branchName: string;
-    }
-
-    export interface Result {
-        success: boolean;
-        messages: string[]; // array of PluginMessages
-        artifacts: Common.ArtifactHash[]; // array of hashes
-        pluginName: string;
-        startTime: Date;
-        finishTime: Date;
-        error: Error;
-        projectId: any;
-        commits: any[];
-
-        /**
-        * Gets the success flag of this result object
-        */
-        getSuccess(): boolean;
-        /**
-        * Sets the success flag of this result.
-        */
-        setSuccess(value: boolean): void;
-        /**
-        * Returns with the plugin messages.
-        */
-        getMessages(): Message[];
-        /**
-        * Adds a new plugin message to the messages list.
-        */
-        addMessage(pluginMessage: Message): void;
-        /**
-        * Returns the plugin artifacts.
-        */
-        getArtifacts(): Artifact[];
-        /**
-        * Adds a saved artifact to the result - linked via its metadataHash.
-        * Takes the metadataHash of saved artifact.
-        */
-        addArtifact(metadataHash: Common.MetadataHash): void;
-        /**
-        * Adds a commit to the commit container.
-        */
-        addCommit(commitData: Commit): void;
-        /**
-        * Gets the name of the plugin to which the result object belongs.
-        */
-        getPluginName(): string;
-        //------------------------------------------
-        // Methods used by the plugin manager
-        //-----------------------------------------
-        /**
-        * Sets the name of the plugin to which the result object belongs to.
-        */
-        setPluginName(pluginName: string): string;
-        /**
-        * Sets the name of the projectId the result was generated from.
-        */
-        setProjectId(projectId: string): void;
-        /**
-        * Gets the ISO 8601 representation of the time when the plugin started its execution.
-        */
-        getStartTime(): Common.ISO8601;
-        /**
-        * Sets the ISO 8601 representation of the time when the plugin started its execution.
-        */
-        setStartTime(time: Common.ISO8601): void;
-        /**
-        * Gets the ISO 8601 representation of the time when the plugin finished its execution.
-        */
-        getFinishTime(): Common.ISO8601;
-        /**
-        * Sets the ISO 8601 representation of the time when the plugin finished its execution.
-        */
-        setFinishTime(time: Common.ISO8601): void;
-        /**
-        * Gets error if any error occured during execution.
-        * FIXME: should this return an Error object?
-        */
-        getError(): Common.ErrorStr;
-        /**
-        * Sets the error string if any error occured during execution.
-        */
-        setError(error: Common.ErrorStr | Error): void;
-        /**
-        * Serializes this object to a JSON representation.
-        */
-        serialize(): { success: boolean, messages: Message[], pluginName: string, finishTime: string };
-    }
-
-
-    export interface RelationRule {
-        /** The minimum amount of target necessary for the relationship (if not present or '-1' then there is no minimum rule that applies) */
-        min?: number;
-        /** The maximum amount of target necessary for the relationship (if not present or '-1' then there is no maximum rule that applies) */
-        max?: number;
-        absolutePathOfTarget?: {
-            min?: number;
-            max?: number;
-        }
-    }
-
-    export interface Constraint {
-        script: string;
-        info: string;
-        priority: string;
-    }
-
-    export interface MixinViolation {
-        severity?: string;
-        type?: string;
-        ruleName?: string | undefined;
-        targetInfo?: string | undefined;
-        targetNode?: Common.Node | undefined;
-        collisionPaths?: string[];
-        collisionNodes?: Common.Node[];
-        message?: string;
-        hint?: string;
-    }
-    export interface GmePersisted { rootHash: Common.MetadataHash }
-    export enum TraversalOrder { 'BFS', 'DFS' }
-    export type GUID = string;
-
-    export interface NodeParameters {
-        parent: Common.Node | null;
-        base: Common.Node | null;
-        relid?: string;
-        guid?: GUID;
-    }
-    export interface LibraryInfo {
-        projectId: string;
-        branchName: string;
-        commitHash: string;
-    }
-    export interface MetaNodeParameters {
-        object: { node: Common.Node, children: Common.Node[] };
-        sensitive: boolean;
-        multiplicity: boolean;
-        aspect: string;
-    }
-    export interface MetaRule {
-        type: string | number | boolean;
-        enum: string[];
-    }
-
-    export interface TraversalOptions {
-        excludeRoot?: boolean;
-        order?: TraversalOrder;
-        maxParallelLoad?: number;
-        stopOnError?: boolean;
-    }
-
-    export interface Core {
-
-        addLibrary: {
-            (node: Common.Node, name: Common.Name, libraryRootHash: string,
-                libraryInfo: LibraryInfo, callback: Common.ObjectCallback): void;
-            (node: Common.Node, name: Common.Name, libraryRootHash: string,
-                libraryInfo: LibraryInfo): Promise<Common.DataObject>;
-        }
-        addMember(node: Common.Node, name: Common.Name, member: Common.Node): undefined | Error;
-        addMixin(node: Common.Node, mixinPath: string): undefined | Error;
-        applyResolution(conflict: {}): {};
-        applyTreeDiff: {
-            (root: Common.Node, patch: Common.DataObject, callback: Common.ObjectCallback): void;
-            (root: Common.Node, patch: Common.DataObject): Promise<Common.DataObject>;
-        }
-        canSetAsMixin(node: Common.Node, mixinPath: string): boolean | string;
-        clearMetaRules(node: Common.Node): undefined | Error;
-        clearMixins(node: Common.Node): undefined | Error;
-        copyNode(node: Common.Node, parent: Common.Node): Common.Node | Error;
-        copyNodes(nodes: Common.Node[], parent: Common.Node): Common.Node[] | Error;
-        createNode(parameters: NodeParameters): Common.Node | Error;
-        createSet(node: Common.Node, name: Common.Name): undefined | Error;
-        delAspectMeta(node: Common.Node, name: Common.Name): undefined | Error;
-        delAspectMetaTarget(node: Common.Node, name: Common.Name, targetPath: string): undefined | Error;
-        delAttribute(node: Common.Node, name: Common.Name): undefined | Error;
-        delAttributeMeta(node: Common.Node, name: Common.Name): undefined | Error;
-        delChildMeta(node: Common.Node, childPath: string): undefined | Error;
-        delConstraint(node: Common.Node, name: Common.Name): undefined | Error;
-        deleteNode(node: Common.Node): undefined | Error;
-        deletePointer(node: Common.Node, name: Common.Name): undefined | Error;
-        deleteSet(node: Common.Node, name: Common.Name): undefined | Error;
-        delMember(node: Common.Node, name: Common.Name, path: string): undefined | Error;
-        delMemberAttribute(node: Common.Node, setName: string, memberPath: string, attrName: string): undefined | Error;
-        delMemberRegistry(node: Common.Node, setName: string, memberPath: string, regName: string): undefined | Error;
-        delMixin(node: Common.Node, mixinPath: string): undefined | Error;
-        delPointerMeta(node: Common.Node, name: Common.Name): undefined | Error;
-        delPointerMetaTarget(node: Common.Node, name: Common.Name, targetPath: string): undefined | Error;
-        delRegistry(node: Common.Node, name: Common.Name): undefined | Error;
-        generateTreeDiff: {
-            (sourceRoot: Common.Node, targetRoot: Common.Node, callBack: Common.ObjectCallback): void;
-            (sourceRoot: Common.Node, targetRoot: Common.Node): Promise<Common.DataObject>;
-        }
-        getAllMetaNodes(node: Common.Node): { [name: string]: Common.Node };
-        getAspectMeta(node: Common.Node, name: Common.Name): string[];
-        /**
-        * Retrieves the value of the given attribute of the given node.
-        * @param node - the node in question.
-        * @param name - the name of the attribute.
-        *
-        * @return The function returns the value of the attribute of the node.
-        * The retrieved attribute should not be modified as is - it should be copied first!
-        * The value can be an object or any primitive type.
-        * If the return value is undefined; the node does not have such attribute defined.
-        * If the node is undefined the returned value is null.
-        */
-        getAttribute(node: Common.Node | undefined, name: Common.Name): Common.OutAttr;
-        getAttributeMeta(node: Common.Node, name: Common.Name): {};
-        /** Get the defined attribute names */
-        getAttributeNames(node: Common.Node): string[];
-        /** Get the base node */
-        getBase(node: Common.Node): Common.Node; // null
-        /** Get the base node at the top of the inheritance chain (typically the fco). */
-        getBaseRoot(node: Common.Node): Common.Node;
-        /** Get the most specific meta node. */
-        getBaseType(node: Common.Node): Common.Node; // null
-        getChild(node: Common.Node, relativeId: string): Common.Node;
-        getChildrenHashes(node: Common.Node): { [name: string]: Common.MetadataHash };
-        getChildrenMeta(node: Common.Node): RelationRule;
-        /** The children paths are available from the node. */
-        getChildrenPaths(parent: Common.Node): string[];
-        getChildrenRelids(parent: Common.Node): string[];
-        getCollectionNames(node: Common.Node): string[];
-        getCollectionPaths(node: Common.Node, name: Common.Name): string[];
-        getConstraint(node: Common.Node, name: Common.Name): Constraint; // null
-        getConstraintNames(node: Common.Node): string[];
-        getFCO(node: Common.Node): Common.Node;
-        getFullyQualifiedName(node: Common.Node): string;
-        getGuid(node: Common.Node): GUID;
-        getHash(node: Common.Node): Common.MetadataHash;
-        getJsonMeta(node: Common.Node): {};
-        getLibraryGuid(node: Common.Node, name: Common.Name): GUID | Error;
-        getLibraryInfo(node: Common.Node, name: Common.Name): LibraryInfo;
-        getLibraryMetaNodes(node: Common.Node, name: Common.Name, onlyOwn?: boolean): Common.Node[];
-        getLibraryNames(node: Common.Node): string[];
-        getLibraryRoot(node: Common.Node, name: Common.Name): Common.Node; // null
-        getMemberAttribute(node: Common.Node, setName: string, memberPath: string, attrName: string): Common.OutAttr;
-        getMemberAttributeNames(node: Common.Node, name: Common.Name, memberPath: string): string[];
-        getMemberOwnAttributeNames(node: Common.Node, name: Common.Name, memberPath: string): string[];
-        getMemberOwnRegistry(node: Common.Node, name: Common.Name, memberPath: string): string[];
-        getMemberPaths(node: Common.Node, name: Common.Name): string[];
-        getMemberRegistry(node: Common.Node, setName: string, memberPath: string, regName: string): Common.OutAttr;
-        getMemberRegistryNames(node: Common.Node, name: Common.Name, memberpath: string): string[];
-        getMixinErrors(node: Common.Node): MixinViolation[];
-        getMixinNodes(node: Common.Node): { [name: string]: Common.Node };
-        getMixinPaths(node: Common.Node): string[];
-        getNamespace(node: Common.Node): string;
-        getOwnAttribute(node: Common.Node, name: Common.Name): Common.OutAttr;
-        getOwnAttributeNames(node: Common.Node): string[];
-        getOwnChildrenPaths(parent: Common.Node): string[];
-        getOwnChildrenRelids(parent: Common.Node): string[];
-        getOwnConstraintNames(node: Common.Node): string[];
-        getOwnJsonMeta(node: Common.Node): Common.DataObject;
-        getOwnMemberPaths(node: Common.Node, name: Common.Name): string[];
-        getOwnMixinNodes(node: Common.Node): { [name: string]: Common.Node };
-        getOwnMixinPaths(node: Common.Node): string[];
-        getOwnPointerNames(node: Common.Node): string[];
-        getOwnPointerPath(node: Common.Node, name: Common.Name): Common.OutPath;
-        getOwnRegistry(node: Common.Node, name: Common.Name): Common.OutAttr;
-        getOwnRegistryNames(node: Common.Node): string[];
-        getOwnValidAspectNames(node: Common.Node): string[];
-        getOwnValidAttributeNames(node: Common.Node): string[];
-        /** The parent paths are available from the node. */
-        getParent(node: Common.Node): Common.Node;
-        /**  Get the path/id */
-        getPath(node: Common.Node): string;
-        getPointerMeta(node: Common.Node, name: Common.Name): RelationRule;
-        getPointerNames(node: Common.Node): string[];
-        getPointerPath(node: Common.Node, name: Common.Name): Common.OutPath;
-        /** Get the assigned registry */
-        getRegistry(node: Common.Node, name: Common.Name): Common.OutAttr;
-        /** Get the defined registry names */
-        getRegistryNames(node: Common.Node): string[];
-        /** Get the relative id */
-        getRelid(node: Common.Node): string;
-        getRoot(node: Common.Node): Common.Node;
-        getSetNames(node: Common.Node): string[];
-        getTypeRoot(node: Common.Node): Common.Node;
-        getValidAspectNames(node: Common.Node): string[];
-        getValidAttributeNames(node: Common.Node): string[];
-        getValidChildrenMetaNodes(parameters: MetaNodeParameters): Common.Node[];
-        getValidChildrenPaths(node: Common.Node): string[];
-        getValidPointerNames(node: Common.Node): string[];
-        getValidSetMetaNodes(parameters: MetaNodeParameters): Common.Node[];
-        getValidSetNames(node: Common.Node): string[];
-        isAbstract(node: Common.Node): boolean;
-        /** Connections are just nodes with two pointers named "src" and "dst". */
-        isConnection(node: Common.Node): boolean;
-        isEmpty(node: Common.Node): boolean;
-        isFullyOverriddenMember(node: Common.Node, setName: string, memberPath: string): boolean;
-        isInstanceOf(node: Common.Node, name: Common.Name): boolean;
-        isLibraryElement(node: Common.Node): boolean;
-        isLibraryRoot(node: Common.Node): boolean;
-        isMemberOf(node: Common.Node): Common.DataObject;
-        isMetaNode(node: Common.Node): boolean;
-        isTypeOf(node: Common.Node, type: Common.Node): boolean;
-        isValidAttributeValueOf(node: Common.Node, name: Common.Name, value: Common.InAttr): boolean;
-        isValidChildOf(node: Common.Node, parent: Common.Node): boolean;
-        isValidTargetOf(node: Common.Node, source: Common.Node, name: Common.Name): boolean;
-        loadByPath: {
-            (startNode: Common.Node, relativePath: string, callback: Common.ObjectCallback): void;
-            (startNode: Common.Node, relativePath: string): Promise<Common.DataObject>;
-        };
-        loadChild: {
-            (parent: Common.Node, relativeId: string, callback: Common.ObjectCallback): void;
-            (parent: Common.Node, relativeId: string): Promise<Common.DataObject>;
-        };
-        /** Loading the children however requires data that is not (necessarily) available */
-        loadChildren: {
-            (parent: Common.Node, callback: Common.ObjectArrayCallback): void;
-            (parent: Common.Node): Promise<Common.DataObject>;
-        }
-        loadCollection: {
-            (target: Common.Node, pointerName: string, callback: Common.ObjectCallback): void;
-            (target: Common.Node, pointerName: string): Promise<Common.DataObject>;
-        };
-        loadOwnSubTree: {
-            (node: Common.Node, callback: Common.ObjectCallback): void;
-            (node: Common.Node): Promise<Common.DataObject>;
-        };
-        loadPointer: {
-            (node: Common.Node, pointerName: string, callback: Common.ObjectCallback): void;
-            (node: Common.Node, pointerName: string): Promise<Common.DataObject>;
-        };
-        loadRoot: {
-            (metadataHash: Common.MetadataHash, callback: Common.ObjectCallback): void;
-            (metadataHash: Common.MetadataHash): Promise<Common.DataObject>;
-        };
-        loadSubTree: {
-            (node: Common.Node, callback: Common.ObjectCallback): void;
-            (node: Common.Node): Promise<Common.DataObject>;
-        };
-        loadTree: {
-            (rootHash: Common.MetadataHash, callback: Common.ObjectCallback): void;
-            (rootHash: Common.MetadataHash): Promise<Common.DataObject>;
-        };
-        moveNode(node: Common.Node, parent: Common.Node): Common.Node | Error;
-        persist(node: Common.Node): GmePersisted;
-        removeLibrary(node: Common.Node, name: Common.Name): void;
-        renameLibrary(node: Common.Node, oldName: string, newName: string): void;
-        setAspectMetaTarget(node: Common.Node, name: Common.Name, target: Common.Node): undefined | Error;
-        setAttribute(node: Common.Node, name: Common.Name, value: Common.InAttr): undefined | Error;
-        setAttributeMeta(node: Common.Node, name: Common.Name, rule: MetaRule): undefined | Error;
-        setBase(node: Common.Node, base: Common.Node): undefined | Error;
-        setChildMeta(node: Common.Node, child: Common.Node, min?: number, max?: number): undefined | Error;
-        setChildrenMetaLimits(node: Common.Node, min?: number, max?: number): undefined | Error;
-        setConstraint(node: Common.Node, name: Common.Name, constraint: Constraint): undefined | Error;
-        setGuid: {
-            (node: Common.Node, guid: GUID, callback: Common.ObjectCallback): undefined | Error;
-            (node: Common.Node, guid: GUID): Promise<Common.DataObject>;
-        };
-        setMemberAttribute: {
-            (node: Common.Node, setName: string, memberPath: string,
-                SVGPathSegLinetoHorizontalAbsme: string,
-                value?: Common.InAttr): undefined | Error;
-        };
-        setMemberRegistry(node: Common.Node, setName: string, memberPath: string, regName: string,
-            value?: Common.InAttr): undefined | Error;
-        setPointer(node: Common.Node, name: Common.Name, target: Common.Node | null): undefined | Error;
-        setPointerMetaLimits(node: Common.Node, memberPath: string,
-            min?: number, max?: number): undefined | Error;
-        setPointerMetaTarget(node: Common.Node, name: Common.Name, target: Common.Node, min?: number, max?: number): undefined | Error;
-        /** Get the assigned registry */
-        setRegistry(node: Common.Node, name: Common.Name, value: Common.InAttr): undefined | Error;
-
-        /**
-         * the visitation function will be called for
-         * every node in the sub-tree, the second parameter of the function
-         * is a callback that should be called to
-         * note to the traversal function that the visitation for a given node is finished.
-         */
-        traverse: {
-            // takes a callback & returning *no* promise
-            (node: Common.Node,
-                options: TraversalOptions,
-                visitFn: (node: Common.Node, finished: Common.VoidFn) => void,
-                callback: Common.ObjectCallback)
-                : void;
-            // takes *no* callback & returns a promise
-            (node: Common.Node,
-                options: TraversalOptions,
-                visitFn: (node: Common.Node, finished: Common.VoidFn) => void)
-                : Promise<void>;
-        }
-        tryToConcatChanges(mine: Common.DataObject, theirs: Common.DataObject): Common.DataObject;
-        updateLibrary: {
-            (node: Common.Node, name: Common.Name, libraryRootHash: Common.MetadataHash,
-                libraryInfo: LibraryInfo, callback: Common.ObjectCallback): void;
-            (node: Common.Node, name: Common.Name, libraryRootHash: Common.MetadataHash,
-                libraryInfo: LibraryInfo): Promise<Common.DataObject>;
-        }
-    }
-
-    export interface Dictionary {
-        // allow any number of 'other' properties.
-        [propName: string]: any;
-    }
-
-
-    /**
-    Logs debug messages
-    https://editor.webgme.org/docs/source/global.html#GmeLogger
-    */
-    export interface GmeLogger {
-        debug(fmt: string, msg?: string | undefined): void;
-        info(fmt: string, msg?: string | undefined): void;
-        warn(fmt: string, msg?: string | undefined): void;
-        error(fmt: string, msg?: string | undefined): void;
-        /**
-        Creates a new logger with the same settings
-        and a name that is an augmentation of this logger and the
-        provided string.
-        If the second argument is true
-        - the provided name will be used as is.
-        */
-        fork(fmt: string, reuse: boolean): GmeLogger;
-    }
-    export interface ProjectInterface {
-
-    }
-
-
-    export interface ThenCallback {
-        (): void;
-    }
-    export interface CatchCallback {
-        (err: Error): void;
-    }
-
-    export interface Promisable {
-        then(callback: ThenCallback): Promisable;
-        catch(callback: CatchCallback): Promisable;
-    }
-
-    /**
-    The base plugin object from which all plugins should inherit.
-    */
-    export interface Base {
-
-        activeNode: Common.Node;
-        activeSelection: Common.Node[];
-        blobClient: Blobs.BlobClient;
-        core: Core;
-        gmeConfig: Config.GmeConfig;
-        isConfigured: boolean;
-        logger: GmeLogger;
-        /**
-         * The resolved META nodes based on the active namespace. Index by the fully qualified meta node names
-         * with the namespace stripped off at the start.
-         *
-         * For example, if a project has a library A with a library B. If the project and the libraries all have
-         * two meta nodes named a and b. Depending on the namespace the META will have the following keys:
-         *
-         * 1) namespace = '' -> ['a', 'b', 'A.a', 'A.b', 'A.B.a', 'A.B.b']
-         * 2) namespace = 'A' -> ['a', 'b', 'B.a', 'B.b']
-         * 3) namespace = 'A.B' -> ['a', 'b']
-         *
-         * (N.B. 'a' and 'b' in example 3) are pointing to the meta nodes defined in A.B.)
-         */
-        META: any;
-        /**
-         * The namespace the META nodes are coming from (set by invoker).
-         * The default is the full meta, i.e. the empty string namespace.
-         * For example, if a project has a library A with a library B. The possible namespaces are:
-         * '', 'A' and 'A.B'.
-         */
-        namespace: string;
-        notificationHandlers: any[];
-        pluginMetadata: Common.Metadata;
-        project: ProjectInterface;
-        result: Result;
-        rootNode: Common.Node;
-
-        addCommitToResult(status: string): void;
-        baseIsMeta(node: any): boolean;
-
-        configure(config: Config.GmeConfig): void;
-        createMessage(node: any, message: string, serverity: string): void;
-        /**
-         * Gets the configuration structure for the plugin.
-         * The ConfigurationStructure defines the configuration for the plugin
-         * and will be used to populate the GUI when invoking the plugin from webGME.
-         */
-        getConfigStructure(): Config.ConfigItem[];
-        getCurrentConfig(): Config.GmeConfig;
-        getDefaultConfig(): Config.GmeConfig;
-        /**
-         * Gets the description of the plugin.
-         */
-        getDescription(): string;
-        getMetadata(): any;
-        getMetaType(node: any): any;
-        /**
-         * Gets the name of the plugin.
-         */
-        getName(): string;
-        /**
-         * Gets the semantic version (semver.org) of the plugin.
-         */
-        getVersion(): string;
-        initialize(logger: GmeLogger, blobClient: Blobs.BlobClient, gmeConfig: Config.GmeConfig): void;
-        isInvalidActiveNode(pluginId: any): any;
-        isMetaTypeOf(node: any, metaNode: any): boolean;
-        /**
-          Main function for the plugin to execute.
-          Notes:
-          - Always log with the provided logger.[error,warning,info,debug].
-          - Do NOT put any user interaction logic UI, etc. inside this method.
-          - handler always has to be called even if error happened.
-     
-          When this runs the core api is used to extract the essential
-          meta-model and the model-instance, these are then written to the mega-model.
-          The mega-model contains all of the models used to describe the target system.
-     
-          https://github.com/ptaoussanis/sente
-          and https://github.com/cognitect/transit-format
-          will be used to connect to the
-          graph database (immortals) where the mega-model is stored.
-     
-          @param {function(string, plugin.PluginResult)} handler - the result handler
-         */
-        main(callback: ResultCallback): void;
-        save(message?: string): Promisable; // returns a promise?
-        sendNotification: {
-            (message: string, callback: Common.ObjectCallback): void;
-            (message: string): Promise<Common.DataObject>;
-        }
-        setCurrentConfig(newConfig: Config.GmeConfig): void;
-        updateMeta(generatedMeta: any): void;
-        updateSuccess(value: boolean, message: TemplateStringsArray): void;
-    }
-
-    class PluginBase implements Base {
-        constructor();
-
-        activeNode: Common.Node;
-        activeSelection: Common.Node[];
-        blobClient: Blobs.BlobClient;
-        core: Core.Core;
-        gmeConfig: Config.GmeConfig;
-        isConfigured: boolean;
-        logger: Core.GmeLogger;
-        META: any;
-        namespace: string;
-        notificationHandlers: any[];
-        pluginMetadata: Common.Metadata;
-        project: Core.ProjectInterface;
-        result: Core.Result;
-        rootNode: Common.Node;
-
-        addCommitToResult(status: string): void;
-        baseIsMeta(node: any): boolean;
-        configure(config: Config.GmeConfig): void;
-        createMessage(node: any, message: string, serverity: string): void;
-        getConfigStructure(): any;
-        getCurrentConfig(): Config.GmeConfig;
-        getDefaultConfig(): Config.GmeConfig;
-        getDescription(): string;
-        getMetadata(): any;
-        getMetaType(node: any): any;
-        getName(): string;
-        getVersion(): string;
-        initialize(logger: GmeLogger, blobClient: Blobs.BlobClient, gmeConfig: Config.GmeConfig): void;
-        isInvalidActiveNode(pluginId: any): any;
-        isMetaTypeOf(node: any, metaNode: any): boolean;
-        main(callback: Core.ResultCallback): void;
-        save(message?: string): Core.Promisable;
-        sendNotification: {
-            (message: string, callback: Core.ResultCallback): void;
-            (message: string): Promise<Common.DataObject>;
-        }
-        setCurrentConfig(newConfig: Config.GmeConfig): void;
-        updateMeta(generatedMeta: any): void;
-        updateSuccess(value: boolean, message: TemplateStringsArray): void;
-    }
-
-}
-
-/**
- * Each Plugin has a configuration specified via a metadata.json file.
- * This interface prescribes that configuration file.
- * 
- */
-declare namespace Config {
-
-    type StringDictionary = { [key: string]: string };
-
-    export interface ConfigItem {
-        // a unique name for the configuration item
-        name: Common.Name;
-        // a human comprehensible name
-        displayName: string;
-        // a detailed description fo the item
-        description: string;
-        // the value of the item: if valueItem is provided it must be one of those values.
-        value: string;
-        // the datatype of the value: 'string', 'integer', ...
-        valueType: string,
-        // an enumeration of the allowed values for the value field
-        valueItems?: string[];
-        // a regular expression limiting the values allowed.
-        // e.g. '^[a-zA-Z]+$'
-        regex?: RegExp;
-        // a description of the regex grammar
-        // e.g. 'Name can only contain English characters!'
-        regexMessage?: string;
-        // can the value be changed?
-        readOnly?: boolean;
-    }
-
-
-    /**
-       https://editor.webgme.org/docs/source/global.html#GmeConfig	
-       https://github.com/webgme/webgme/blob/master/config/README.md
-    */
-    export class GmeConfig {
-        constructor();
-        /**  Add-on related settings. */
-        addOns: any;
-        /**  Authentication related settings. */
-        authentication: {
-            enable: boolean,
-            jwt: { privateKey: string, publicKey: string },
-            logInUrl: string,
-            logOutUrl: string
-        };
-        /** Bin script related settings. */
-        bin: any;
-        /** Blob related settings. */
-        blob: Blobs.ObjectBlob;
-        /** Client related settings. */
-        client: { log: { level: string } };
-        /** Client related settings. */
-        core: Core.Core;
-        /** Enables debug mode. */
-        public debug: boolean;
-        /** Executor related settings. */
-        executor: any;
-        /** Mongo database related settings. */
-        mongo: { uri: string };
-        /** Plugin related settings. */
-        plugin: {
-            basePaths: string[],
-            allowBrowserExecution: boolean,
-            allowServerExecution: boolean
-        };
-        /** Additional paths to for requirejs. */
-        requirejsPaths: StringDictionary;
-        /** REST related settings. */
-        rest: any;
-        /** Seed related settings. */
-        seedProjects: {
-            basePaths: string[],
-            panelPaths: string[],
-            enable: boolean,
-            allowDuplication: boolean
-        };
-        /** Server related settings. */
-        server: {
-            port: number, handle: { fd: number },
-            log: any
-        };
-        /** Socket IO related settings. */
-        socketIO: any;
-        /** Storage related settings. */
-        storage: any;
-        /** Visualization related settings. */
-        visualization: {
-            panelPaths: string[],
-            visualizerDescriptors: string[],
-            extraCss: string[]
-        };
-
-        serialize(): any;
-    }
-
-
-    export class PluginConfig extends Config.GmeConfig {
-        [propName: string]: any;
-    }
-
-    export let config: PluginConfig;
-
-}
-
-/**
-Things in this module are deprecated.
-This was a serialization supported in version 1.
-*/
-declare module "webgme/v1" {
-    export type GUID = string;
-
-    export interface JsonContainment {
-        [index: string]: JsonContainment;
-    }
-    export interface JsonNode {
-        attributes: any;
-        base: string;
-        meta: any;
-        parent: string;
-        pointers: any;
-        registry: any;
-        sets: any;
-        constratints: any;
-    }
-    export interface JsonObj {
-        root: { path: string; guid: GUID };
-        containment: JsonContainment; // guid tree of hashes
-        bases: any; //
-        nodes: any;
-        relids: any;
-        metaSheets: any;
-    }
-}
\ No newline at end of file
diff --git a/types/webgme/tsconfig.json b/types/webgme/tsconfig.json
deleted file mode 100644
index 20b15fd0c0..0000000000
--- a/types/webgme/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "webgme-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/webgme/webgme-tests.ts b/types/webgme/webgme-tests.ts
deleted file mode 100644
index 1cb2c78814..0000000000
--- a/types/webgme/webgme-tests.ts
+++ /dev/null
@@ -1,590 +0,0 @@
-/**
- * In actual usage the MetaDataStr would most likely
- * be initialized with an import...
- *
-  import MetaDataStr = require("text!metadata.json");
- *
- * Which would require a declaration, like...
- * `text.d.ts`
- *
-  declare module "text!*" {
-    var text: string;
-    export = text;
-  }
- *
- */
-const MetaDataStr = "";
-
-import PluginBase = require("plugin/PluginBase");
-
-import * as fs from "fs";
-import * as stream from "stream";
-import * as Common from "webgme/common";
-
-/**
- * The following items are not created directly by the
- * plugin driver.
- *
- * self is an instance of the PluginBase class.
- */
-let self = new PluginBase();
-let node = new Common.Node();
-let connNode = new Common.Node();
-let sourceNode = new Common.Node();
-let destinationNode = new Common.Node();
-
-/**
- * These tests are derived from...
- * https://github.com/webgme/webgme/wiki/GME-Core-API
- *
- * Nearly all core functions takes a CoreNode as its first argument.
- * When using the Core API externally each CoreNode corresponds
- * to one node/model in the project tree.
- * To access data from the node the Core API should be used
- * and the properties on the CoreNode itself should
- * not be accessed or modified directly.
- *
- * Below follows a handpicked selection of basic core functions.
- */
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Core-API#common-properties
- */
-function test_core_common_properties() {
-    let path = self.core.getPath(node);
-    let relid = self.core.getRelid(node);
-    let guid = self.core.getGuid(node);
-}
-
-/**
-https://github.com/webgme/webgme/wiki/GME-Core-API#attributes
-*/
-function test_core_attributes() {
-    let name = self.core.getAttribute(node, 'name');
-    self.core.setAttribute(node, 'name', 'newName');
-    let attributeNames = self.core.getAttributeNames(node);
-}
-
-/**
-https://github.com/webgme/webgme/wiki/GME-Core-API#registries
-*/
-function test_core_registries() {
-    let position = self.core.getRegistry(node, 'position');
-    self.core.setRegistry(node, 'position', { x: 100, y: 100 });
-    let registryNames = self.core.getRegistryNames(node);
-}
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Core-API#inheritance
- */
-function test_core_inheritance() {
-    let baseNode = self.core.getBase(node);
-    let fcoNode = self.core.getBaseRoot(node);
-    let aMetaNode = self.core.getBaseType(node);
-}
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Core-API#the-traverse-method
- */
-function test_core_containment_traversal() {
-    function atNode(node: Common.Node, done: Common.VoidFn) {
-        let metaNode = self.core.getBaseType(node);
-        let nodeName = self.core.getAttribute(node, 'name');
-        // Library-roots do not have a meta-type either.
-        let metaName = metaNode ? self.core.getAttribute(metaNode, 'name') : ':LibraryRoot:';
-
-        console.log(`${nodeName} at ${self.core.getPath(node)} is of meta type ${metaName}`);
-        done();
-    }
-    // Traversal from the root-node (itself will be excluded since it doesn't have a meta-type).
-    self.core.traverse(self.rootNode, { excludeRoot: true }, atNode, (err): void => {
-        if (err) {
-            // Something went wrong!
-            // Handle the error and return.
-        }
-        // At this point we have successfully visited all nodes.
-    });
-}
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Core-API#containment-methods
- */
-function test_core_containment_methods() {
-    let childrenPaths = self.core.getChildrenPaths(node);
-    let parentNode = self.core.getParent(node);
-    let baseNode = self.core.getBase(node);
-    let rootNode = self.core.getRoot;
-
-    // Loading the children however requires data that is not (necessarily) available
-    self.core.loadChildren(node, (err, children) => {
-        if (err) {
-            // Something went wrong!
-            // Handle the error and return.
-        }
-        // We have an array of the children and can get information from them.
-        for (let child of children) {
-            console.log(self.core.getAttribute(child, 'name'));
-        }
-    });
-    // This line will be hit before the callback of loadChildren
-
-    // Create a new node, the new node is available directly.
-    let params = {
-        parent: parentNode,
-        base: baseNode
-    };
-
-    var newNode = self.core.createNode(params);
-
-    // Copy a node.
-    var copiedNode = self.core.copyNode(node, parentNode);
-
-    // Delete a node.
-    self.core.deleteNode(newNode);
-
-    // Loading nodes by paths
-    // N.B. the path provided is relative the node in the first argument,
-    // here the root-node is passed to the path is the absolute (i.e. same
-    // as self.core.getPath(someNode);)
-    self.core.loadByPath(rootNode, '/1', (err, node) => {
-        if (err) {
-            // Handle error
-        }
-        // Here we have access to the node.
-    });
-
-    // Loading an entire sub-tree of nodes
-    // N.B. this requires all nodes to be loaded at the same time.
-    // For larger models core.traverse is preferred.
-    self.core.loadSubTree(node, (err, nodes) => {
-        if (err) {
-            // Handle error
-        }
-        // Here we have access to all the nodes that is contained in node
-        // at any level.
-    });
-}
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Core-API#pointers-and-connections
- */
-
-function test_core_pointers_connections() {
-
-    //
-    let isConn = self.core.isConnection(connNode);
-
-    // Get the path of the node that is pointed to, via 'src', from connNode.
-    // (Here the paths to the source node of the connection.)
-    var sourceNodePath = self.core.getPointerPath(connNode, 'src');
-
-    // Load the node node that is pointed to, via 'src', from connNode.
-    // (Here the source node of the connection.)
-    self.core.loadPointer(connNode, 'src', (err, sourceNode) => {
-        if (err) {
-            // Handle error
-        }
-        // Here we have access to the sourceNode.
-    });
-
-    //  Get the paths of the nodes with pointers named 'src' to the sourceNode.
-    // (Here the paths to the connections that have sourceNode as source.)
-    let connectionPaths = self.core.getCollectionPaths(sourceNode, 'src');
-
-    // Load the nodes with pointers named 'src' to the sourceNode.
-    // (Here the connections that have sourceNode as source.)
-    self.core.loadCollection(sourceNode, 'src', (err, connNodes) => {
-        if (err) {
-            // Handle error
-        }
-        // connNodes is an array (a node can have multiple connections/pointers)
-        // connNode above is within connNodes.
-    });
-
-    // Creating new pointers.
-    // (Since we create both the 'src' and 'dst' this will be rendered as a connection between the two nodes.)
-    self.core.setPointer(connNode, 'src', sourceNode);
-    self.core.setPointer(connNode, 'dst', destinationNode);
-}
-
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Blob-Storage-API
- *
- * File-like objects/artifacts
- * (which are neither a meta archetype model, nor an instance model)
- * are stored separately from the WebGME meta-models and models.
- * An example of such an artifact would be a resource
- * file that is associated with a model
- * (e.g., data for an instance model, or a generated artifact from analyzing a model).
- *
- * One reason for treating these objects differently is that they do not conform to the data model,
- * and they might not be well-suited for storage in a database
- * (the Blob is suited to handle binary objects of any size and structure).
- */
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Blob-Storage-API#usage
- */
-function test_client_creating_an_instance() {
-    // let client = new GME.classes.Client(GME.gmeConfig);
-}
-
-/**
- * Add the remaining tests.
- */
-
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Blob-Storage-API
- *
- * File-like objects/artifacts
- * (which are neither a meta archetype model, nor an instance model)
- * are stored separately from the WebGME meta-models and models.
- * An example of such an artifact would be a resource
- * file that is associated with a model
- * (e.g., data for an instance model, or a generated artifact from analyzing a model).
- *
- * One reason for treating these objects differently is that they do not conform to the data model,
- * and they might not be well-suited for storage in a database
- * (the Blob is suited to handle binary objects of any size and structure).
- */
-
-
-
-/**
- * The following items are not created directly by the
- * plugin driver.
- *
- * self is an instance of the PluginBase class.
- */
-
-interface DataModel {
-    stateMachine: {
-        name: string,
-        initialState: string | null,
-        finalStates: any[], states: any[]
-    }
-};
-
-/**
- * https://github.com/webgme/webgme/wiki/GME-Blob-Storage-API#usage
- */
-function test_client_using_a_blob() {
-
-    class SamplePlugin extends PluginBase {
-        pluginMetadata: any;
-        private dataModel: DataModel;
-
-        constructor() {
-            super();
-            this.pluginMetadata = JSON.parse(MetaDataStr);
-        }
-
-        extractDataModel(): DataModel {
-            return { stateMachine: { name: "dm", initialState: null, finalStates: [], states: [] } };
-        }
-
-        async main(mainHandler: Core.ResultCallback): Promise<string[]> {
-            let artifact: Core.Artifact;
-
-            const dataModel = this.extractDataModel();
-            var dataModelStr = JSON.stringify(dataModel, null, 4);
-            this.dataModel = dataModel;
-
-            this.logger.info('Extracted dataModel', dataModelStr);
-
-            const jsonFileHash = await self.blobClient.putFile('dataModel.json', dataModelStr);
-            // Add link from result to this file.
-            self.result.addArtifact(jsonFileHash);
-
-            // Create a complex artifact, with links to multiple files.
-            artifact = self.blobClient.createArtifact('simulator');
-
-            let programJS = "some javascript file";
-            self.logger.info('program.js', programJS);
-
-            return artifact.addFilesAsSoftLinks({
-                'program.js': programJS,
-                'index.html': this.pluginMetadata
-            });
-        }
-    }
-}
-
-/**
- * Add the remaining tests.
- */
-
-/**
- * This is an extract from a Darpa project.
- */
-
-
-type DictionaryAny = { [key: string]: any };
-
-/**
-* Visit the node and perform the function.
-* Related example using traverse.
-* https://github.com/webgme/xmi-tools/blob/master/src/plugins/XMIExporter/XMIExporter.js#L430
-*/
-async function test_core_containment_traversal_complete() {
-    const BLANK = "";
-    const NULL_OBJECT = "_OBJECT"
-    const NULL_GUID = "00000000-0000-0000-0000-000000000000";
-
-    async function getEdgesModel(sponsor: PluginBase, core: Core.Core,
-        _rootNode: Common.Node, _metaNode: Common.Node): Promise<Core.Dictionary> {
-
-        let fcoName = core.getAttribute(core.getFCO(sponsor.rootNode), "name");
-        let languageName = core.getAttribute(sponsor.rootNode, "name");
-        sponsor.logger.info(`get model edges : ${languageName} : ${fcoName}`);
-
-        let rootEntry
-            = {
-                "version": "0.0.1",
-                "pointers": {}, "inv_pointers": {},
-                "sets": {}, "inv_sets": {},
-                "base": {
-                    "name": NULL_OBJECT,
-                    "guid": NULL_GUID,
-                },
-                "name": {
-                    "name": NULL_OBJECT, "uriExt": BLANK, "uriPrefix": BLANK,
-                    "uriName": BLANK, "uriGen": BLANK
-                },
-                "type": {
-                    "domain": languageName,
-                    "meta": NULL_GUID, "root": NULL_GUID, "base": NULL_GUID, "parent": NULL_GUID
-                },
-                "attributes": {},
-                "children": {},
-                "guid": NULL_GUID
-            };
-        let nodeGuidMap: Core.Dictionary = {
-            [NULL_GUID]: rootEntry
-        };
-
-        sponsor.logger.info("A dictionary: look up nodes based on their path name.");
-        let path2entry: Core.Dictionary = { [BLANK]: rootEntry };
-
-        /**
-         * A filter mechanism to effectively eliminate containment branches.
-         * Any path included in the prune-list will be the root of a
-         * pruned subtree.
-         */
-        let pruneList: string[] = [];
-
-        /**
-         * The base node makes reference to inheritance.
-         * The parent node makes reference to containment.
-         * The traverse function follows the containment tree.
-         * @type {[type]}
-         */
-        let visitFn = async (node: Node, done: Common.VoidFn): Promise<void> => {
-            try {
-                let core = sponsor.core;
-                let nodePath: string = core.getPath(node);
-
-                let prunedRootPath: string | null = null;
-                for (let pl of pruneList) {
-                    if (nodePath.indexOf(pl) !== 0) { continue; }
-                    // console.log(`pruned: ${nodePath}::${pl}`);
-                    prunedRootPath = pl;
-                }
-
-                let nodeNameAttr = core.getAttribute(node, "name");
-                if (typeof nodeNameAttr !== "string") { return; }
-
-                // sponsor.logger.info(`visitor function with ${nodeNameAttr}`);
-
-                let baseNodeGuid: string = core.getGuid(core.getBase(node));
-                let baseNodeTypeGuid: string = core.getGuid(core.getBaseType(node));
-                let baseNodeRootGuid: string = core.getGuid(core.getBaseRoot(node));
-
-                // set the nodes sourceGuid
-                let sourceGuid: string = core.getGuid(node);
-                let sourceEntry
-                    = {
-                        "guid": sourceGuid,
-                        "name": {},
-                        "type": {
-                            "domain": languageName,
-                            "meta": baseNodeTypeGuid,
-                            "root": baseNodeRootGuid,
-                            "base": baseNodeGuid
-                        },
-                        "pointers": {}, "inv_pointers": {},
-                        "sets": {}, "inv_sets": {},
-                        "base": {
-                            "name": NULL_OBJECT,
-                            "guid": NULL_GUID
-                        },
-                        "attributes": {},
-                        "children": {}
-                    };
-                nodeGuidMap[sourceGuid] = sourceEntry;
-
-                let metaName: string;
-                let metaNodeGuid: string;
-                if (node === sponsor.rootNode) {
-                    metaName = ":Root:";
-                    sourceEntry.type = {
-                        "domain": BLANK,
-                        "meta": NULL_GUID,
-                        "root": NULL_GUID,
-                        "base": NULL_GUID
-                    };
-                    metaNodeGuid = NULL_GUID;
-                } else if (core.isLibraryRoot(node)) {
-                    metaName = ":LibraryRoot:";
-                    metaNodeGuid = core.getGuid(node);
-
-                    // console.log(`prune: ${nodePath}`);
-                    pruneList.push(nodePath);
-                    prunedRootPath = nodePath;
-                } else {
-                    let metaNameAttr = core.getAttribute(core.getBaseType(node), "name");
-                    if (typeof metaNameAttr !== "string") { return; }
-                    metaName = metaNameAttr;
-                    metaNodeGuid = core.getGuid(core.getParent(node));
-                }
-                let containRel = metaName;
-                path2entry[nodePath] = sourceEntry;
-
-                // set the parent to know its child the root node has no parent
-                // if a non-pruned item has a pruned parent then bring it in.
-                if (node !== sponsor.rootNode) {
-                    let parent: Common.Node = core.getParent(node);
-                    let parentPath: string = core.getPath(parent);
-
-                    let parentData = path2entry[parentPath];
-                    let children = parentData.children;
-                    children[containRel] = children[containRel] || [];
-                    // children[containRel].push(sourceEntry);
-                    children[containRel].push(sourceGuid);
-                }
-
-                // set the nodes attributes
-                core.getAttributeNames(node).forEach((attrName: string) => {
-                    let attrValueRaw = core.getAttribute(node, attrName);
-                    let attrValue: string;
-                    if (typeof attrValueRaw === "string") {
-                        attrValue = attrValueRaw;
-                    } else {
-                        attrValue = "<undefined>";
-                    }
-                    let sen = sourceEntry.name;
-                });
-
-                // get pointers & inv_pointers
-                const ptrNames = await core.getPointerNames(node);
-                Promise.all(ptrNames.map(async ptrName => {
-                    let targetPathRaw = core.getPointerPath(node, ptrName);
-                    if (typeof targetPathRaw !== "string") { return; }
-
-                    let targetPath: string = targetPathRaw;
-                    const targetNode = core.loadByPath(sponsor.rootNode, targetPath);
-                    let targetGuid = core.getGuid(targetNode);
-                    if (ptrName === "base") {
-
-                    } else {
-                        let pointers: DictionaryAny = sourceEntry.pointers;
-                        let targetMetaNode = core.getBaseType(targetNode);
-                        let targetMetaName = core.getAttribute(targetMetaNode, "name");
-                        if (typeof targetMetaName === "string") {
-                            pointers[ptrName] = {
-                                name: targetMetaName,
-                                guid: targetGuid
-                            };
-                        }
-                        let targetEntry = nodeGuidMap[targetGuid];
-                        if (targetEntry === undefined) {
-                            targetEntry = {
-                                "name": {},
-                                "guid": targetGuid,
-                                "pointers": {}, "inv_pointers": {},
-                                "sets": {}, "inv_sets": {}
-                            };
-                            nodeGuidMap[targetGuid] = targetEntry;
-                        }
-                        targetEntry.inv_pointers[ptrName] = {
-                            name: targetMetaName,
-                            guid: sourceGuid
-                        };
-                    }
-                }));
-
-                // get sets & inv_set
-                const setNames = await core.getValidSetNames(node);
-                Promise.all(setNames.map(setName => {
-                    let targetMemberPathsRaw = core.getMemberPaths(node, setName);
-                    for (let targetMemberPath of targetMemberPathsRaw) {
-                        if (typeof targetMemberPath !== "string") { return; }
-                        let targetPath: string = targetMemberPath;
-
-                        try {
-                            const targetNode = core.loadByPath(sponsor.rootNode, targetPath);
-                            let targetGuid = core.getGuid(targetNode);
-                            let sets: DictionaryAny = sourceEntry.sets;
-                            let targetMetaNode = core.getBaseType(targetNode);
-                            let targetMetaName = core.getAttribute(targetMetaNode, "name");
-                            if (typeof targetMetaName === "string") {
-                                let load = {
-                                    name: targetMetaName,
-                                    guid: targetGuid
-                                };
-                                let sourceSet = sets[setName];
-                                if (sourceSet === undefined) {
-                                    sets[setName] = [load];
-                                } else {
-                                    sourceSet.push(load);
-                                }
-                            }
-                            let targetEntry = nodeGuidMap[targetGuid];
-                            if (targetEntry === undefined) {
-                                targetEntry = {
-                                    "name": {},
-                                    "guid": targetGuid,
-                                    "pointers": {}, "inv_pointers": {},
-                                    "sets": {}, "inv_sets": {}
-                                };
-                                nodeGuidMap[targetGuid] = targetEntry;
-                            }
-                            let invSets = targetEntry.inv_sets;
-                            let targetSet = invSets[setName];
-                            let invLoad = {
-                                name: targetMetaName,
-                                guid: sourceGuid
-                            };
-                            if (targetSet === undefined) {
-                                invSets[setName] = [invLoad];
-                            } else {
-                                targetSet.push(invLoad);
-                            };
-                        }
-                        catch (err) {
-                            console.log(`difficulty loading target path: ${targetPath} with err: ${err.message}`);
-                            let load = {
-                                "fault": `could not load member path: ${targetPath}`
-                            };
-                            let sets: DictionaryAny = sourceEntry.sets;
-                            let sourceSet = sets[setName];
-                            if (sourceSet === undefined) {
-                                sets[setName] = [load];
-                            } else {
-                                sourceSet.push(load);
-                            }
-                        }
-                    }
-                }));
-            } finally {
-                done();
-            }
-        };
-
-        await core.traverse(sponsor.rootNode, { excludeRoot: false }, visitFn);
-        return nodeGuidMap;
-    }
-}
-
diff --git a/types/webix/tslint.json b/types/webix/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webix/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webpack-cleanup-plugin/index.d.ts b/types/webpack-cleanup-plugin/index.d.ts
new file mode 100644
index 0000000000..f5fa620413
--- /dev/null
+++ b/types/webpack-cleanup-plugin/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for webpack-cleanup-plugin 0.5
+// Project: https://github.com/gpbl/webpack-cleanup-plugin#readme
+// Definitions by: Luka Maljic <https://github.com/malj>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import webpack = require('webpack');
+
+export = WebpackCleanupPlugin;
+
+declare class WebpackCleanupPlugin extends webpack.Plugin {
+    constructor(options?: WebpackCleanupPlugin.Options);
+}
+
+declare namespace WebpackCleanupPlugin {
+    interface Options {
+        /**
+         * Keep some files in the output path. It accepts globbing as in [minimatch](https://github.com/isaacs/minimatch).
+         */
+        exclude?: string[];
+
+        /**
+         * Print the list of the files that will be deleted without actually deleting them.
+         */
+        preview?: boolean;
+
+        /**
+         * Mute the console output.
+         */
+        quiet?: boolean;
+    }
+}
diff --git a/types/webpack-cleanup-plugin/tsconfig.json b/types/webpack-cleanup-plugin/tsconfig.json
new file mode 100644
index 0000000000..f2712d3d73
--- /dev/null
+++ b/types/webpack-cleanup-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "webpack-cleanup-plugin-tests.ts"
+    ]
+}
diff --git a/types/webpack-cleanup-plugin/tslint.json b/types/webpack-cleanup-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-cleanup-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-cleanup-plugin/webpack-cleanup-plugin-tests.ts b/types/webpack-cleanup-plugin/webpack-cleanup-plugin-tests.ts
new file mode 100644
index 0000000000..dcd5f75c02
--- /dev/null
+++ b/types/webpack-cleanup-plugin/webpack-cleanup-plugin-tests.ts
@@ -0,0 +1,7 @@
+import WebpackCleanupPlugin = require('webpack-cleanup-plugin');
+
+new WebpackCleanupPlugin({
+    exclude: ["stats.json", "important.js", "folder/**/*"],
+    preview: true,
+    quiet: true
+});
diff --git a/types/webpack-dev-middleware/index.d.ts b/types/webpack-dev-middleware/index.d.ts
index 4302fadfbf..cc3e7e03dd 100644
--- a/types/webpack-dev-middleware/index.d.ts
+++ b/types/webpack-dev-middleware/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for webpack-dev-middleware 1.9
+// Type definitions for webpack-dev-middleware 2.0
 // Project: https://github.com/webpack/webpack-dev-middleware
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
+//                 reduckted <https://github.com/reduckted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import { NextHandleFunction } from 'connect';
 import * as webpack from 'webpack';
+import * as loglevel from 'loglevel';
+import { NextHandleFunction } from 'connect';
+import MemoryFileSystem = require('memory-fs');
 
 export = WebpackDevMiddleware;
 
@@ -15,8 +19,7 @@ declare function WebpackDevMiddleware(
 
 declare namespace WebpackDevMiddleware {
 	interface Options {
-		noInfo?: boolean;
-		quiet?: boolean;
+		logLevel?: string;
 		lazy?: boolean;
 		watchOptions?: webpack.Options.WatchOptions;
 		publicPath: string;
@@ -27,26 +30,24 @@ declare namespace WebpackDevMiddleware {
 		stats?: webpack.Options.Stats;
 		reporter?: Reporter | null;
 		serverSideRender?: boolean;
-
-		log?: Logger;
-		warn?: Logger;
-		error?: Logger;
+		logger?: Logger;
 		filename?: string;
 	}
 
 	interface ReporterOptions {
 		state: boolean;
-		stats: webpack.Stats;
-		options: Options;
+		stats?: webpack.Stats;
+		log: Logger;
 	}
 
-	type Reporter = (reporterOptions: ReporterOptions) => void;
-
-	type Logger = (message?: any, ...optionalParams: any[]) => void;
+	type Logger = loglevel.Logger;
+	type Reporter = (middlewareOptions: Options, reporterOptions: ReporterOptions) => void;
 
 	interface WebpackDevMiddleware {
 		close(callback?: () => void): void;
 		invalidate(callback?: (stats: webpack.Stats) => void): void;
 		waitUntilValid(callback?: (stats: webpack.Stats) => void): void;
+		getFilenameFromUrl: (url: string) => string | false;
+		fileSystem: MemoryFileSystem;
 	}
 }
diff --git a/types/webpack-dev-middleware/v1/index.d.ts b/types/webpack-dev-middleware/v1/index.d.ts
new file mode 100644
index 0000000000..e88cec98ef
--- /dev/null
+++ b/types/webpack-dev-middleware/v1/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for webpack-dev-middleware 1.12
+// Project: https://github.com/webpack/webpack-dev-middleware
+// Definitions by: Benjamin Lim <https://github.com/bumbleblym>
+//                 reduckted <https://github.com/reduckted>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { NextHandleFunction } from 'connect';
+import * as webpack from 'webpack';
+import MemoryFileSystem = require('memory-fs');
+
+export = WebpackDevMiddleware;
+
+declare function WebpackDevMiddleware(
+	compiler: webpack.ICompiler,
+	options?: WebpackDevMiddleware.Options
+): WebpackDevMiddleware.WebpackDevMiddleware & NextHandleFunction;
+
+declare namespace WebpackDevMiddleware {
+	interface Options {
+		noInfo?: boolean;
+		quiet?: boolean;
+		lazy?: boolean;
+		watchOptions?: webpack.Options.WatchOptions;
+		publicPath: string;
+		index?: string;
+		headers?: {
+			[name: string]: string;
+		};
+		stats?: webpack.Options.Stats;
+		reporter?: Reporter | null;
+		serverSideRender?: boolean;
+
+		log?: Logger;
+		warn?: Logger;
+		error?: Logger;
+		filename?: string;
+	}
+
+	interface ReporterOptions {
+		state: boolean;
+		stats: webpack.Stats;
+		options: Options;
+	}
+
+	type Reporter = (reporterOptions: ReporterOptions) => void;
+
+	type Logger = (message?: any, ...optionalParams: any[]) => void;
+
+	interface WebpackDevMiddleware {
+		close(callback?: () => void): void;
+		invalidate(callback?: (stats: webpack.Stats) => void): void;
+		waitUntilValid(callback?: (stats: webpack.Stats) => void): void;
+		getFilenameFromUrl: (url: string) => string | false;
+		fileSystem: MemoryFileSystem;
+	}
+}
diff --git a/types/webpack-dev-middleware/v1/tsconfig.json b/types/webpack-dev-middleware/v1/tsconfig.json
new file mode 100644
index 0000000000..32d37ba3c6
--- /dev/null
+++ b/types/webpack-dev-middleware/v1/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "webpack-dev-middleware": [
+                "webpack-dev-middleware/v1"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "webpack-dev-middleware-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/webpack-dev-middleware/v1/tslint.json b/types/webpack-dev-middleware/v1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-dev-middleware/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-dev-middleware/v1/webpack-dev-middleware-tests.ts b/types/webpack-dev-middleware/v1/webpack-dev-middleware-tests.ts
new file mode 100644
index 0000000000..8df4675595
--- /dev/null
+++ b/types/webpack-dev-middleware/v1/webpack-dev-middleware-tests.ts
@@ -0,0 +1,50 @@
+import * as express from 'express';
+import * as webpack from 'webpack';
+import * as webpackDevMiddleware from 'webpack-dev-middleware';
+
+const compiler = webpack({});
+
+let webpackDevMiddlewareInstance = webpackDevMiddleware(compiler);
+
+webpackDevMiddlewareInstance = webpackDevMiddleware(compiler, {
+	noInfo: false,
+	quiet: false,
+	lazy: true,
+	watchOptions: {
+		aggregateTimeout: 300,
+		poll: true,
+	},
+	publicPath: '/assets/',
+	index: 'index.html',
+	headers: {
+		'X-Custom-Header': 'yes'
+	},
+	stats: {
+		colors: true,
+	},
+	reporter: null,
+	serverSideRender: false,
+});
+
+const app = express();
+app.use([webpackDevMiddlewareInstance]);
+
+webpackDevMiddlewareInstance.close(() => {
+	console.log('closed');
+});
+
+webpackDevMiddlewareInstance.invalidate((stats) => {
+	console.log(stats.toJson());
+});
+
+webpackDevMiddlewareInstance.waitUntilValid((stats) => {
+	console.log('Package is in a valid state:' + stats.toJson());
+});
+
+const fs = webpackDevMiddlewareInstance.fileSystem;
+fs.mkdirpSync('foo');
+
+let filename = webpackDevMiddlewareInstance.getFilenameFromUrl('url');
+if (filename !== false) {
+	filename = filename.substr(0);
+}
diff --git a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
index a4b1d57822..2ccfb90a0c 100644
--- a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
+++ b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
@@ -7,8 +7,7 @@ const compiler = webpack({});
 let webpackDevMiddlewareInstance = webpackDevMiddleware(compiler);
 
 webpackDevMiddlewareInstance = webpackDevMiddleware(compiler, {
-	noInfo: false,
-	quiet: false,
+	logLevel: 'silent',
 	lazy: true,
 	watchOptions: {
 		aggregateTimeout: 300,
@@ -29,8 +28,22 @@ webpackDevMiddlewareInstance = webpackDevMiddleware(compiler, {
 const app = express();
 app.use([webpackDevMiddlewareInstance]);
 
-webpackDevMiddlewareInstance.close();
-webpackDevMiddlewareInstance.invalidate();
-webpackDevMiddlewareInstance.waitUntilValid(() => {
-	console.log('Package is in a valid state');
+webpackDevMiddlewareInstance.close(() => {
+	console.log('closed');
 });
+
+webpackDevMiddlewareInstance.invalidate((stats) => {
+	console.log(stats.toJson());
+});
+
+webpackDevMiddlewareInstance.waitUntilValid((stats) => {
+	console.log('Package is in a valid state:' + stats.toJson());
+});
+
+const fs = webpackDevMiddlewareInstance.fileSystem;
+fs.mkdirpSync('foo');
+
+let filename = webpackDevMiddlewareInstance.getFilenameFromUrl('url');
+if (filename !== false) {
+	filename = filename.substr(0);
+}
diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts
index f561075761..797ae437dc 100644
--- a/types/webpack-dev-server/index.d.ts
+++ b/types/webpack-dev-server/index.d.ts
@@ -3,7 +3,9 @@
 // Definitions by: maestroh <https://github.com/maestroh>
 //                 Dave Parslow <https://github.com/daveparslow>
 //                 Zheyang Song <https://github.com/ZheyangSong>
+//                 Alan Agius <https://github.com/alan-agius4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as webpack from 'webpack';
 import * as core from 'express-serve-static-core';
@@ -61,7 +63,7 @@ declare namespace WebpackDevServer {
         setup?: expressAppHook; // will be depreacted in v3.0.0 and replaced by before
         socket?: string;
         staticOptions?: serveStatic.ServeStaticOptions;
-        stats?: webpack.compiler.StatsOptions| webpack.compiler.StatsToStringOptions;
+        stats?: webpack.compiler.StatsOptions | webpack.compiler.StatsToStringOptions;
         useLocalIp?: boolean;
         watchContentBase?: boolean;
         watchOptions?: webpack.WatchOptions;
@@ -70,20 +72,15 @@ declare namespace WebpackDevServer {
 
 declare class WebpackDevServer {
     constructor(
-        webpack: webpack.compiler.Compiler,
+        webpack: webpack.Compiler | webpack.MultiCompiler,
         config: WebpackDevServer.Configuration
     );
 
-    listen(
-        port: number,
-        hostname: string,
-        callback?: (...args: any[]) => any
-    ): http.Server;
+    listen(port: number, hostname: string, callback?: (error?: Error) => void): http.Server;
 
-    listen(
-        port: number,
-        callback?: (...args: any[]) => any
-    ): http.Server;
+    listen(port: number, callback?: (error?: Error) => void): http.Server;
+
+    close(callback?: () => void): void;
 }
 
 export = WebpackDevServer;
diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts
index 3ba5c43e45..e13babe83c 100644
--- a/types/webpack-dev-server/webpack-dev-server-tests.ts
+++ b/types/webpack-dev-server/webpack-dev-server-tests.ts
@@ -2,6 +2,7 @@ import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import * as core from 'express-serve-static-core';
 const compiler = webpack({});
+const multipleCompiler = webpack([]);
 
 // basic example
 let server = new WebpackDevServer(compiler, {
@@ -81,4 +82,11 @@ server = new WebpackDevServer(compiler, {
     publicPath: "/assets/",
     https: true
 });
+
 server.listen(8080, "localhost", () => {});
+
+server.close();
+
+// multiple compilers
+
+server = new WebpackDevServer(multipleCompiler, config);
diff --git a/types/webpack-env/index.d.ts b/types/webpack-env/index.d.ts
index cb1250fc08..9d866cbba8 100644
--- a/types/webpack-env/index.d.ts
+++ b/types/webpack-env/index.d.ts
@@ -11,6 +11,7 @@
 declare namespace __WebpackModuleApi {
     interface RequireContext {
         keys(): string[];
+        (id: string): any;
         <T>(id: string): T;
         resolve(id: string): string;
     }
@@ -19,6 +20,7 @@ declare namespace __WebpackModuleApi {
         /**
          * Returns the exports from a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
          */
+        (path: string): any;
         <T>(path: string): T;
         /**
          * Behaves similar to require.ensure, but the callback is called with the exports of each dependency in the paths array. There is no option to provide a chunk name.
@@ -29,8 +31,9 @@ declare namespace __WebpackModuleApi {
          *
          * This creates a chunk. The chunk can be named. If a chunk with this name already exists, the dependencies are merged into that chunk and that chunk is used.
          */
-        ensure: (paths: string[], callback: (require: <T>(path: string) => T) => void, chunkName?: string) => void;
-        context: (path: string, deep?: boolean, filter?: RegExp) => RequireContext;
+        ensure(paths: string[], callback: (require: (id: string) => any) => void, chunkName?: string): void;
+        ensure(paths: string[], callback: (require: <T>(id: string) => T) => void, chunkName?: string): void;
+        context(path: string, deep?: boolean, filter?: RegExp): RequireContext;
         /**
          * Returns the module id of a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
          *
@@ -56,6 +59,7 @@ declare namespace __WebpackModuleApi {
     interface Module {
         exports: any;
         require(id: string): any;
+        require<T>(id: string): T;
         id: string;
         filename: string;
         loaded: boolean;
@@ -104,7 +108,8 @@ declare namespace __WebpackModuleApi {
          * The data will be available at module.hot.data on the new module.
          * @param callback
          */
-        dispose<T>(callback: (data: T) => void): void;
+        dispose(callback: (data: any) => void): void;
+        dispose(callback: <T>(data: T) => void): void;
         /**
          * Add a one time handler, which is executed when the current module code is replaced.
          * Here you should destroy/remove any persistent resource you have claimed/created.
@@ -112,12 +117,14 @@ declare namespace __WebpackModuleApi {
          * The data will be available at module.hot.data on the new module.
          * @param callback
          */
+        addDisposeHandler(callback: (data: any) => void): void;
         addDisposeHandler<T>(callback: (data: T) => void): void;
         /**
          * Remove a handler.
          * This can useful to add a temporary dispose handler. You could i. e. replace code while in the middle of a multi-step async function.
          * @param callback
          */
+        removeDisposeHandler(callback: (data: any) => void): void;
         removeDisposeHandler<T>(callback: (data: T) => void): void;
         /**
          * Throws an exceptions if status() is not idle.
@@ -166,7 +173,7 @@ declare namespace __WebpackModuleApi {
         removeStatusHandler(callback: (status: string) => void): void;
 
         active: boolean;
-        data: {};
+        data: any;
     }
 
     interface AcceptOptions {
@@ -178,7 +185,17 @@ declare namespace __WebpackModuleApi {
          * Indicates that apply() is automatically called by check function
          */
         autoApply?: boolean;
-  }
+    }
+    /**
+    * Inside env you can pass any variable
+    */
+    interface NodeProcess {
+        env?: any;
+    }
+
+    type __Require1 = (id: string) => any;
+    type __Require2 = <T>(id: string) => T;
+    type RequireLambda = __Require1 & __Require2;
 }
 
 interface NodeRequire extends __WebpackModuleApi.RequireFunction {
@@ -209,7 +226,7 @@ declare var __webpack_require__: any;
  * @param chunkId The id for the chunk to load.
  * @param callback A callback function called once the chunk is loaded.
  */
-declare var __webpack_chunk_load__: (chunkId: any, callback: (require: (id: string) => any) => void) => void;
+declare var __webpack_chunk_load__: (chunkId: any, callback: (require: __WebpackModuleApi.RequireLambda) => void) => void;
 
 /**
  * Access to the internal object of all modules.
@@ -236,3 +253,11 @@ declare var DEBUG: boolean;
 interface NodeModule extends __WebpackModuleApi.Module {}
 
 declare var module: NodeModule;
+
+/**
+* Declare process variable
+*/
+declare namespace NodeJS {
+    interface Process extends __WebpackModuleApi.NodeProcess {}
+}
+declare var process: NodeJS.Process;
diff --git a/types/webpack-env/tslint.json b/types/webpack-env/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webpack-env/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webpack-env/webpack-env-tests.ts b/types/webpack-env/webpack-env-tests.ts
index 43d1ff3605..61fb3f6c55 100644
--- a/types/webpack-env/webpack-env-tests.ts
+++ b/types/webpack-env/webpack-env-tests.ts
@@ -7,6 +7,9 @@ interface SomeModule {
 let someModule = require<SomeModule>('./someModule');
 someModule.someMethod();
 
+let otherModule = require('./otherModule');
+otherModule.otherMethod();
+
 let context = require.context('./somePath', true);
 let contextModule = context<SomeModule>('./someModule');
 
diff --git a/types/webpack-fail-plugin/tslint.json b/types/webpack-fail-plugin/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webpack-fail-plugin/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webpack-hot-middleware/index.d.ts b/types/webpack-hot-middleware/index.d.ts
index 725fb65c4f..d1a591801a 100644
--- a/types/webpack-hot-middleware/index.d.ts
+++ b/types/webpack-hot-middleware/index.d.ts
@@ -1,15 +1,16 @@
 // Type definitions for webpack-hot-middleware 2.16
 // Project: https://github.com/glenjamin/webpack-hot-middleware#readme
-// Definitions by: Benjamin Lim <https://github.com/bumbleblym>
+// Definitions by: Benjamin Lim <https://github.com/bumbleblym>, Ron Martinez <https://github.com/icylace>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { NextHandleFunction } from 'connect';
-import { compiler } from 'webpack';
+import * as webpack from 'webpack';
 
 export = WebpackHotMiddleware;
 
 declare function WebpackHotMiddleware(
-	compiler: compiler.Compiler,
+	compiler: webpack.ICompiler,
 	options?: WebpackHotMiddleware.Options
 ): NextHandleFunction & WebpackHotMiddleware.EventStream;
 
diff --git a/types/webpack-manifest-plugin/index.d.ts b/types/webpack-manifest-plugin/index.d.ts
new file mode 100644
index 0000000000..cb61e42c18
--- /dev/null
+++ b/types/webpack-manifest-plugin/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for webpack-manifest-plugin 1.3
+// Project: https://github.com/danethurber/webpack-manifest-plugin
+// Definitions by: Andrew Makarov <https://github.com/r3nya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { Plugin } from 'webpack';
+
+export = WebpackManifestPlugin;
+
+declare class WebpackManifestPlugin extends Plugin {
+    constructor(options?: WebpackManifestPlugin.Options);
+}
+
+declare namespace WebpackManifestPlugin {
+    interface Chunk {
+        id: string;
+        parents: string[];
+        [propName: string]: any;
+    }
+
+    interface HooksOptions {
+        path: string;
+        chunk: Chunk;
+        name: string | null;
+        isChunk: boolean;
+        isInitial: boolean;
+        isAsset: boolean;
+        isModuleAsset: boolean;
+    }
+
+    interface Options {
+        /**
+         * The manifest filename in your output directory.
+         * Default: manifest.json
+         */
+        fileName?: string;
+
+        /**
+         * A path prefix for all file references. Useful for including your output path in the manifest.
+         */
+        basePath?: string;
+
+        /**
+         * A path prefix used only on output files, similar to Webpack's output.publicPath. Ignored if basePath was also provided.
+         */
+        publicPath?: string;
+
+        /**
+         * If set to true will emit to build folder and memory in combination with webpack-dev-server
+         * Default: false
+         */
+        writeToFileEmit?: boolean;
+
+        /**
+         * A cache of key/value pairs to used to seed the manifest. This may include a set of custom key/value pairs to include in your manifest,
+         * or may be used to combine manifests across compilations in multi-compiler mode.
+         * To combine manifests, pass a shared seed object to each compiler's ManifestPlugin instance.
+         * Default: {}
+         */
+        seed?: object;
+
+        /**
+         * Filter out files.
+         */
+        filter?: (options: HooksOptions) => void;
+
+        /**
+         * Modify files details before the manifest is created.
+         */
+        map?: (options: HooksOptions) => void;
+
+        /**
+         * Create the manifest. It can return anything as long as it's serialisable by JSON.stringify. Use the seed options to populate manifest.
+         * Default: (manifest, {name, path}) => ({...manifest, [name]: path})
+         */
+        reduce?: (manifest: any, options: HooksOptions) => void;
+    }
+}
diff --git a/types/webpack-manifest-plugin/tsconfig.json b/types/webpack-manifest-plugin/tsconfig.json
new file mode 100644
index 0000000000..9ff3d85f05
--- /dev/null
+++ b/types/webpack-manifest-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "webpack-manifest-plugin-tests.ts"
+    ]
+}
diff --git a/types/webpack-manifest-plugin/tslint.json b/types/webpack-manifest-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-manifest-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-manifest-plugin/webpack-manifest-plugin-tests.ts b/types/webpack-manifest-plugin/webpack-manifest-plugin-tests.ts
new file mode 100644
index 0000000000..3c34f052fa
--- /dev/null
+++ b/types/webpack-manifest-plugin/webpack-manifest-plugin-tests.ts
@@ -0,0 +1,38 @@
+import { Configuration } from 'webpack';
+import path = require('path');
+import WebpackManifestPlugin = require('webpack-manifest-plugin');
+
+const options: WebpackManifestPlugin.Options = {
+    fileName: 'manifest.json',
+    basePath: '/src/',
+    seed: {
+        name: 'Hello world',
+    },
+    publicPath: 'prod',
+    writeToFileEmit: false,
+    filter: (file) => file.isInitial,
+    map: (file) => {
+        if (file.name) {
+            file.name = path.join(path.dirname(file.path), file.name);
+            return file;
+        }
+    },
+    reduce: (manifest, { name, path }) => {
+        if (name) {
+            return { ...manifest, [name]: path };
+        }
+    },
+};
+
+const c: Configuration = {
+    plugins: [
+        new WebpackManifestPlugin(),
+        new WebpackManifestPlugin({
+            fileName: 'my-manifest.json',
+            basePath: '/app/',
+            seed: {
+                name: 'My Manifest',
+            },
+        }),
+    ],
+};
diff --git a/types/webpack-merge/index.d.ts b/types/webpack-merge/index.d.ts
index 421737ccaf..54c94a738e 100644
--- a/types/webpack-merge/index.d.ts
+++ b/types/webpack-merge/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/survivejs/webpack-merge
 // Definitions by: Simon Hartcher <https://github.com/deevus>, Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import webpack = require('webpack');
 
diff --git a/types/webpack-merge/v0/tslint.json b/types/webpack-merge/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webpack-merge/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webpack-sources/package.json b/types/webpack-sources/package.json
new file mode 100644
index 0000000000..100334a89f
--- /dev/null
+++ b/types/webpack-sources/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.1"
+    }
+}
diff --git a/types/webpack-stream/index.d.ts b/types/webpack-stream/index.d.ts
index d5cb6186ee..41fbb3592b 100644
--- a/types/webpack-stream/index.d.ts
+++ b/types/webpack-stream/index.d.ts
@@ -12,9 +12,9 @@ export = webpackStream;
 /**
  * Run webpack with the specified configuration and webpack instance
  *
- * @param {webpack.Configuration} config - Webpack configuration
- * @param {webpack} wp - A webpack object
- * @param {webpack.Compiler.Handler} callback - A callback with the webpack stats and error objects.
+ * @param config - Webpack configuration
+ * @param wp - A webpack object
+ * @param callback - A callback with the webpack stats and error objects.
  */
 declare function webpackStream(
 	config?: webpack.Configuration,
diff --git a/types/webpack-validator/tslint.json b/types/webpack-validator/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webpack-validator/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index b99f489cec..18eed1cc7a 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack 3.0
+// Type definitions for webpack 3.8
 // Project: https://github.com/webpack/webpack
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Benjamin Lim <https://github.com/bumbleblym>
@@ -7,6 +7,7 @@
 //                 Mohsen Azimi <https://github.com/mohsen1>
 //                 Jonathan Creamer <https://github.com/jcreamer898>
 //                 Ahmed T. Ali <https://github.com/ahmed-taj>
+//                 Alan Agius <https://github.com/alan-agius4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -98,6 +99,8 @@ declare namespace webpack {
         stats?: Options.Stats;
         /** Performance options */
         performance?: Options.Performance;
+        /** Limit the number of parallel processed modules. Can be used to fine tune performance or to get more reliable profiling results */
+        parallelism?: number;
     }
 
     interface Entry {
@@ -167,6 +170,8 @@ declare namespace webpack {
          * </ul>
          */
         libraryTarget?: 'var' | 'this' | 'commonjs' | 'commonjs2' | 'amd' | 'umd' | 'window' | 'assign' | 'jsonp';
+        /** Configure which module or modules will be exposed via the `libraryTarget` */
+        libraryExport?: string | string[];
         /** If output.libraryTarget is set to umd and output.library is set, setting this to true will name the AMD module. */
         umdNamedDefine?: boolean;
         /** Prefixes every line of the source in the bundle with this string. */
@@ -181,7 +186,7 @@ declare namespace webpack {
         /** A array of applied post loaders. */
         postLoaders?: Rule[];
         /** A RegExp or an array of RegExps. Don’t parse files matching. */
-        noParse?: RegExp | RegExp[];
+        noParse?: RegExp | RegExp[] | ((content: string) => boolean);
         unknownContextRequest?: string;
         unknownContextRecursive?: boolean;
         unknownContextRegExp?: RegExp;
@@ -203,9 +208,10 @@ declare namespace webpack {
         /** An array of rules applied for modules. */
         rules: Rule[];
     }
+
     type Module = OldModule | NewModule;
 
-    interface NewResolve {
+    interface Resolve {
         /**
          * A list of directories to resolve modules from.
          *
@@ -302,71 +308,7 @@ declare namespace webpack {
         symlinks?: boolean;
     }
 
-    interface OldResolve {
-        /** Replace modules by other modules or paths. */
-        alias?: { [key: string]: string; };
-        /**
-         * The directory (absolute path) that contains your modules.
-         * May also be an array of directories.
-         * This setting should be used to add individual directories to the search path.
-         *
-         * @deprecated Replaced by `modules` in webpack 2.
-         */
-        root?: string | string[];
-        /**
-         * An array of directory names to be resolved to the current directory as well as its ancestors, and searched for modules.
-         * This functions similarly to how node finds “node_modules� directories.
-         * For example, if the value is ["mydir"], webpack will look in “./mydir�, “../mydir�, “../../mydir�, etc.
-         *
-         * @deprecated Replaced by `modules` in webpack 2.
-         */
-        modulesDirectories?: string[];
-        /**
-         * A directory (or array of directories absolute paths),
-         * in which webpack should look for modules that weren’t found in resolve.root or resolve.modulesDirectories.
-         *
-         * @deprecated Replaced by `modules` in webpack 2.
-         */
-        fallback?: string | string[];
-        /**
-         * An array of extensions that should be used to resolve modules.
-         * For example, in order to discover CoffeeScript files, your array should contain the string ".coffee".
-         */
-        extensions?: string[];
-        /**
-         * Check these fields in the package.json for suitable files.
-         *
-         * @deprecated Replaced by `mainFields` in webpack 2.
-         */
-        packageMains?: Array<string | string[]>;
-
-        /**
-         * Check this field in the package.json for an object. Key-value-pairs are threaded as aliasing according to this spec
-         *
-         * @deprecated Replaced by `aliasFields` in webpack 2.
-         */
-        packageAlias?: Array<string | string[]>;
-
-        /**
-         * Enable aggressive but unsafe caching for the resolving of a part of your files.
-         * Changes to cached paths may cause failure (in rare cases). An array of RegExps, only a RegExp or true (all files) is expected.
-         * If the resolved path matches, it’ll be cached.
-         *
-         * @deprecated Split into `unsafeCache` and `cachePredicate` in webpack 2.
-         */
-        unsafeCache?: RegExp | RegExp[] | boolean;
-    }
-
-    type Resolve = OldResolve | NewResolve;
-
-    interface OldResolveLoader extends OldResolve {
-        /** It describes alternatives for the module name that are tried.
-         * @deprecated Replaced by `moduleExtensions` in webpack 2.
-         */
-        moduleTemplates?: string[];
-    }
-
-    interface NewResolveLoader extends NewResolve {
+    interface ResolveLoader extends Resolve {
         /**
          * List of strings to append to a loader's name when trying to resolve it.
          */
@@ -375,8 +317,6 @@ declare namespace webpack {
         enforceModuleExtension?: boolean;
     }
 
-    type ResolveLoader = OldResolveLoader | NewResolveLoader;
-
     type ExternalsElement = string | RegExp | ExternalsObjectElement | ExternalsFunctionElement;
 
     interface ExternalsObjectElement {
@@ -420,7 +360,7 @@ declare namespace webpack {
     type ConditionSpec = TestConditionSpec | OrConditionSpec | AndConditionSpec | NotConditionSpec;
 
     // tslint:disable-next-line:no-empty-interface
-    interface ConditionArray extends Array<Condition> {}
+    interface ConditionArray extends Array<Condition> { }
     type Condition = string | RegExp | ((absPath: string) => boolean) | ConditionSpec | ConditionArray;
 
     interface OldLoader {
@@ -613,7 +553,8 @@ declare namespace webpack {
         }
     }
 
-    abstract class MultiCompiler implements ICompiler {
+    abstract class MultiCompiler extends Tapable implements ICompiler {
+        compilers: ICompiler[];
         run(handler: MultiCompiler.Handler): void;
         watch(watchOptions: MultiCompiler.WatchOptions, handler: MultiCompiler.Handler): MultiWatching;
     }
@@ -663,6 +604,8 @@ declare namespace webpack {
             assetsSort?: string;
             /** Add information about cached (not built) modules */
             cached?: boolean;
+            /** Show cached assets (setting this to `false` only shows emitted files) */
+            cachedAssets?: boolean;
             /** Add children information */
             children?: boolean;
             /** Add built modules information to chunk information */
@@ -675,16 +618,32 @@ declare namespace webpack {
             chunksSort?: string;
             /** Context directory for request shortening */
             context?: string;
-            /** Add details to errors (like resolving log) */
-            errorDetails?: boolean;
+            /** Display the distance from the entry point for each module */
+            depth?: boolean;
+            /** Display the entry points with the corresponding bundles */
+            entrypoints?: boolean;
+            /** Add --env information */
+            env?: boolean;
             /** Add errors */
             errors?: boolean;
+            /** Add details to errors (like resolving log) */
+            errorDetails?: boolean;
+            /** Exclude assets from being displayed in stats */
+            excludeAssets?: StatsExcludeFilter;
+            /** Exclude modules from being displayed in stats */
+            excludeModules?: StatsExcludeFilter;
+            /** See excludeModules */
+            exclude?: StatsExcludeFilter;
             /** Add the hash of the compilation */
             hash?: boolean;
+            /** Set the maximum number of modules to be shown */
+            maxModules?: number;
             /** Add built modules information */
             modules?: boolean;
             /** Sort the modules by a field */
             modulesSort?: string;
+            /** Show dependencies and origin of warnings/errors */
+            moduleTrace?: boolean;
             /** Add public path information */
             publicPath?: boolean;
             /** Add information about the reasons why modules are included */
@@ -697,10 +656,20 @@ declare namespace webpack {
             version?: boolean;
             /** Add warnings */
             warnings?: boolean;
+            /** Show which exports of a module are used */
+            usedExports?: boolean;
+            /** Filter warnings to be shown */
+            warningsFilter?: string | RegExp | Array<string | RegExp> | ((warning: string) => boolean);
+            /** Show performance hint when file size exceeds `performance.maxAssetSize` */
+            performance?: boolean;
+            /** Show the exports of the modules */
+            providedExports?: boolean;
         }
 
         type ToJsonOptions = Preset | ToJsonOptionsObject;
 
+        type StatsExcludeFilter = string | string[] | RegExp | RegExp[] | ((assetName: string) => boolean) | Array<(assetName: string) => boolean>;
+
         interface ToStringOptionsObject extends ToJsonOptionsObject {
             /** `webpack --colors` equivalent */
             colors?: boolean;
@@ -735,7 +704,7 @@ declare namespace webpack {
     }
 
     class DefinePlugin extends Plugin {
-        constructor(definitions: {[key: string]: any});
+        constructor(definitions: { [key: string]: any });
     }
 
     class DllPlugin extends Plugin {
@@ -861,7 +830,7 @@ declare namespace webpack {
     }
 
     class NamedChunksPlugin extends Plugin {
-        constructor(nameResolver?: (chunk: any) => string | null );
+        constructor(nameResolver?: (chunk: any) => string | null);
     }
 
     class NoEmitOnErrorsPlugin extends Plugin {
@@ -888,11 +857,11 @@ declare namespace webpack {
     }
 
     class EnvironmentPlugin extends Plugin {
-        constructor(envs: string[] | {[key: string]: any});
+        constructor(envs: string[] | { [key: string]: any });
     }
 
     class ProvidePlugin extends Plugin {
-        constructor(definitions: {[key: string]: any});
+        constructor(definitions: { [key: string]: any });
     }
 
     class SourceMapDevToolPlugin extends Plugin {
@@ -926,7 +895,7 @@ declare namespace webpack {
     }
 
     namespace optimize {
-        class ModuleConcatenationPlugin extends Plugin {}
+        class ModuleConcatenationPlugin extends Plugin { }
         class AggressiveMergingPlugin extends Plugin {
             constructor(options?: AggressiveMergingPlugin.Options);
         }
@@ -1058,9 +1027,6 @@ declare namespace webpack {
              * They only care for metadata. The pitch method on the loaders is called from left to right before the loaders are called (from right to left).
              * If a loader delivers a result in the pitch method the process turns around and skips the remaining loaders,
              * continuing with the calls to the more left loaders. data can be passed between pitch and normal call.
-             * @param remainingRequest
-             * @param precedingRequest
-             * @param data
              */
             pitch?(remainingRequest: string, precedingRequest: string, data: any): any | undefined;
 
@@ -1165,13 +1131,11 @@ declare namespace webpack {
 
             /**
              * Emit a warning.
-             * @param message
              */
             emitWarning(message: string | Error): void;
 
             /**
              * Emit a error.
-             * @param message
              */
             emitError(message: string | Error): void;
 
@@ -1180,23 +1144,16 @@ declare namespace webpack {
              *
              * Don't use require(this.resourcePath), use this function to make loaders chainable!
              *
-             * @param code
-             * @param filename
              */
             exec(code: string, filename: string): any;
 
             /**
              * Resolve a request like a require expression.
-             * @param context
-             * @param request
-             * @param callback
              */
             resolve(context: string, request: string, callback: (err: Error, result: string) => void): any;
 
             /**
              * Resolve a request like a require expression.
-             * @param context
-             * @param request
              */
             resolveSync(context: string, request: string): string;
 
@@ -1204,7 +1161,6 @@ declare namespace webpack {
              * Adds a file as dependency of the loader result in order to make them watchable.
              * For example, html-loader uses this technique as it finds src and src-set attributes.
              * Then, it sets the url's for those attributes as dependencies of the html file that is parsed.
-             * @param file
              */
             addDependency(file: string): void;
 
@@ -1212,13 +1168,11 @@ declare namespace webpack {
              * Adds a file as dependency of the loader result in order to make them watchable.
              * For example, html-loader uses this technique as it finds src and src-set attributes.
              * Then, it sets the url's for those attributes as dependencies of the html file that is parsed.
-             * @param file
              */
             dependency(file: string): void;
 
             /**
              * Add a directory as dependency of the loader result.
-             * @param directory
              */
             addContextDependency(directory: string): void;
 
@@ -1276,11 +1230,8 @@ declare namespace webpack {
 
             /**
              * Emit a file. This is webpack-specific.
-             * @param name
-             * @param content
-             * @param sourceMap
              */
-            emitFile(name: string, content: Buffer|string, sourceMap: any): void;
+            emitFile(name: string, content: Buffer | string, sourceMap: any): void;
 
             /**
              * Access to the compilation's inputFileSystem property.
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 09405f3271..0816416c2c 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -116,10 +116,10 @@ configuration = {
     ]
 };
 
-configuration =  {
+configuration = {
     entry: { a: "./a", b: "./b" },
     output: { filename: "[name].js" },
-    plugins: [ new webpack.optimize.CommonsChunkPlugin({ name: "init.js" }) ]
+    plugins: [new webpack.optimize.CommonsChunkPlugin({ name: "init.js" })]
 };
 
 //
@@ -234,7 +234,7 @@ configuration = {
 
 configuration = {
     resolve: {
-        root: __dirname
+        modules: [__dirname]
     }
 };
 
@@ -451,8 +451,8 @@ plugin = new webpack.LoaderOptionsPlugin({
     debug: true
 });
 plugin = new webpack.EnvironmentPlugin(['a', 'b']);
-plugin = new webpack.EnvironmentPlugin({a: true, b: 'c'});
-plugin = new webpack.ProgressPlugin((percent: number, message: string) => {});
+plugin = new webpack.EnvironmentPlugin({ a: true, b: 'c' });
+plugin = new webpack.ProgressPlugin((percent: number, message: string) => { });
 plugin = new webpack.HashedModuleIdsPlugin();
 plugin = new webpack.HashedModuleIdsPlugin({
     hashFunction: 'sha256',
@@ -531,8 +531,11 @@ webpack({
         source: true,
         timings: true,
         version: true,
-        warnings: true
+        warnings: true,
+        warningsFilter: ["filter", /filter/],
+        excludeAssets: ["filter", "excluded"]
     });
+
     if (jsonStats.errors.length > 0)
         return handleSoftErrors(jsonStats.errors);
     if (jsonStats.warnings.length > 0)
@@ -542,7 +545,7 @@ webpack({
 
 declare const fs: any;
 
-compiler = webpack({ });
+compiler = webpack({});
 compiler.outputFileSystem = fs;
 compiler.run((err, stats) => {
     // ...
@@ -567,47 +570,49 @@ rule = {
 configuration = {
     module: {
         rules: [
-            { oneOf: [
-                {
-                    test: {
-                        and: [
-                            /a.\.js$/,
-                            /b\.js$/
-                        ]
-                    },
-                    loader: "./loader?first"
-                },
-                {
-                    test: [
-                        require.resolve("./a"),
-                        require.resolve("./c"),
-                    ],
-                    issuer: require.resolve("./b"),
-                    use: [
-                        "./loader?second-1",
-                        {
-                            loader: "./loader",
-                            options: "second-2"
+            {
+                oneOf: [
+                    {
+                        test: {
+                            and: [
+                                /a.\.js$/,
+                                /b\.js$/
+                            ]
                         },
-                        {
-                            loader: "./loader",
-                            options: {
-                                get: () => "second-3"
-                            }
-                        }
-                    ]
-                },
-                {
-                    test: {
-                        or: [
+                        loader: "./loader?first"
+                    },
+                    {
+                        test: [
                             require.resolve("./a"),
                             require.resolve("./c"),
+                        ],
+                        issuer: require.resolve("./b"),
+                        use: [
+                            "./loader?second-1",
+                            {
+                                loader: "./loader",
+                                options: "second-2"
+                            },
+                            {
+                                loader: "./loader",
+                                options: {
+                                    get: () => "second-3"
+                                }
+                            }
                         ]
                     },
-                    loader: "./loader",
-                    options: "third"
-                }
-            ]}
+                    {
+                        test: {
+                            or: [
+                                require.resolve("./a"),
+                                require.resolve("./c"),
+                            ]
+                        },
+                        loader: "./loader",
+                        options: "third"
+                    }
+                ]
+            }
         ]
     }
 };
@@ -638,7 +643,7 @@ function loader(this: webpack.loader.LoaderContext, source: string | Buffer, sou
 
     this.addDependency('');
 
-    this.resolve('context', 'request', ( err: Error, result: string) => {});
+    this.resolve('context', 'request', (err: Error, result: string) => { });
 
     this.emitWarning('warning message');
     this.emitWarning(new Error('warning message'));
@@ -650,6 +655,6 @@ function loader(this: webpack.loader.LoaderContext, source: string | Buffer, sou
 }
 
 (loader as webpack.loader.Loader).raw = true;
-(loader as webpack.loader.Loader).pitch = (remainingRequest: string, precedingRequest: string, data: any) => {};
+(loader as webpack.loader.Loader).pitch = (remainingRequest: string, precedingRequest: string, data: any) => { };
 const loaderRef: webpack.loader.Loader = loader;
 console.log(loaderRef.raw === true);
diff --git a/types/website-scraper/index.d.ts b/types/website-scraper/index.d.ts
index f913b5ca5a..1e16c80191 100644
--- a/types/website-scraper/index.d.ts
+++ b/types/website-scraper/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/s0ph1e/node-website-scraper
 // Definitions by: Christian Rackerseder <https://www.echooff.de>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as request from 'request';
 
diff --git a/types/website-scraper/tslint.json b/types/website-scraper/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/website-scraper/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/websocket/index.d.ts b/types/websocket/index.d.ts
index 3b41a5f6da..ab4e453e80 100644
--- a/types/websocket/index.d.ts
+++ b/types/websocket/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for websocket
 // Project: https://github.com/theturtle32/WebSocket-Node
 // Definitions by: Paul Loyd <https://github.com/loyd>,
-//                 Kay Schecker <https://github.com/flynetworks>
+//                 Kay Schecker <https://github.com/flynetworks>,
+//                 Zhao Lei <https://github.com/zhaoleimxd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -563,10 +564,10 @@ declare class client extends events.EventEmitter {
      *                 any scripting content that caused the connection to be requested.
      * @param requestUrl should be a standard websocket url
      */
-    connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[]): void;
-    connect(requestUrl: string, protocols?: string[], origin?: string, headers?: any[]): void;
-    connect(requestUrl: url.Url, protocols?: string, origin?: string, headers?: any[]): void;
-    connect(requestUrl: string, protocols?: string, origin?: string, headers?: any[]): void;
+    connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
+    connect(requestUrl: string, protocols?: string[], origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
+    connect(requestUrl: url.Url, protocols?: string, origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
+    connect(requestUrl: string, protocols?: string, origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
 
     // Events
     on(event: string, listener: () => void): this;
diff --git a/types/websocket/tslint.json b/types/websocket/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/websocket/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/websocket/websocket-tests.ts b/types/websocket/websocket-tests.ts
index 5ecee0080d..3044f9bf7d 100644
--- a/types/websocket/websocket-tests.ts
+++ b/types/websocket/websocket-tests.ts
@@ -1,8 +1,10 @@
 
 import websocket = require('websocket');
 import http = require('http');
+import os = require('os');
 
-{
+/*
+function serverTest() {
     var server = http.createServer((req, res) => {
         console.log((new Date()) + ' Received request for ' + req.url);
         res.writeHead(404);
@@ -88,7 +90,7 @@ import http = require('http');
     wsRouter.unmount(/^route\/[a-zA-Z]+$/, 'protocol');
 }
 
-{
+function clientTest() {
     var WebSocketClient = require('websocket').client;
     var client = new WebSocketClient();
 
@@ -124,4 +126,62 @@ import http = require('http');
     });
 
     client.connect('ws://localhost:8080/', 'echo-protocol');
+}*/
+
+function getLocalIpArray(): Array<string> {
+    var interfaces: any = os.networkInterfaces();
+    var ipArray: Array<string> = [];
+    for (var dev in interfaces) {
+        for (var i = 0; i < interfaces[dev].length; i++) {
+            if (interfaces[dev][i].family == "IPv4" && interfaces[dev][i].internal == false) {
+                ipArray.push(interfaces[dev][i].address);
+            }
+        }
+    }
+    return ipArray;
+}
+
+function serverTest2() {
+    var server = http.createServer((req, rsp) => {
+        rsp.writeHead(200);
+        rsp.end("Hello, world!");
+    });
+    server.listen(8888);
+
+    var wsServer = new websocket.server({
+        httpServer: server,
+        autoAcceptConnections: true
+    });
+
+    wsServer.on("connect", (conn) => {
+        conn.sendUTF(`Your IP Address is - ${conn.remoteAddress}`)
+    });
+}
+
+function clientTest2() {
+    var ipArray = getLocalIpArray();
+    
+    var client = new websocket.client();
+    client.on("connect", (conn) => {
+        console.log(`on connect`);
+        conn.on("frame", (frame) => {
+            console.log(`on frame - ${frame.binaryPayload.toString()}`);
+        });
+        conn.on("message", (data) => {
+            console.log(`on message - ${data.utf8Data}`);
+        });
+    });
+    client.on("connectFailed", (err) => {
+        console.log(`on failed: ${err}`);
+    });
+    client.connect(`ws://${ipArray[0]}:8888`, undefined, undefined, undefined, {
+        localAddress: ipArray[0]
+    });
+    
+}
+
+{
+    console.log(`websocket test start.`);
+    serverTest2();
+    clientTest2();
 }
diff --git a/types/webspeechapi/index.d.ts b/types/webspeechapi/index.d.ts
index 3041c778b4..a7aae15987 100644
--- a/types/webspeechapi/index.d.ts
+++ b/types/webspeechapi/index.d.ts
@@ -25,6 +25,7 @@ interface SpeechRecognition extends EventTarget {
     onspeechstart: (ev: Event) => any;
     onspeechend: (ev: Event) => any;
     onsoundend: (ev: Event) => any;
+    onaudioend: (ev: Event) => any;
     onresult: (ev: SpeechRecognitionEvent) => any;
     onnomatch: (ev: SpeechRecognitionEvent) => any;
     onerror: (ev: SpeechRecognitionError) => any;
diff --git a/types/websql/tslint.json b/types/websql/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/websql/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webvr-api/tslint.json b/types/webvr-api/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/webvr-api/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/weighted/tslint.json b/types/weighted/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/weighted/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/weixin-app/index.d.ts b/types/weixin-app/index.d.ts
index 6ee9f35e59..851216466e 100644
--- a/types/weixin-app/index.d.ts
+++ b/types/weixin-app/index.d.ts
@@ -559,8 +559,8 @@ declare namespace wx {
 	 * 将 data 存储在本地缓存中指定的 key 中，
 	 * 会覆盖掉原�该 key 对应的内容，这是一个�步接�。
 	 *
-	 * @param {string} key 本地缓存中的指定的 key
-	 * @param {(Object | string)} data 需�存储的内容
+	 * @param key 本地缓存中的指定的 key
+	 * @param data 需�存储的内容
 	 */
 	function setStorageSync(key: string, data: any | string): void;
 
@@ -578,8 +578,6 @@ declare namespace wx {
 	/**
 	 * 从本地缓存中�步获�指定 key 对应的内容。
 	 *
-	 * @param {string} key
-	 * @returns {(Object | string)}
 	 */
 	function getStorageSync(key: string): any | string;
 
@@ -1379,7 +1377,7 @@ declare namespace wx {
 		 * �以在一组动画中调用任�多个动画方法，
 		 * 一组动画中的所有动画会�时开始，
 		 * 一组动画完���会进行下一组动画。
-		 * @param {CreateAnimationOptions} options 指定当�组动画的�置
+		 * @param options 指定当�组动画的�置
 		 */
 		step(options?: CreateAnimationOptions): void;
 		/**
@@ -1498,8 +1496,8 @@ declare namespace wx {
 		 * 在调用scale方法�，之�创建的路径其横纵�标会被缩放。
 		 * 多次调用scale，�数会相乘。
 		 *
-		 * @param {number} scaleWidth 横�标缩放的�数
-		 * @param {number} scaleHeight 纵�标轴缩放的�数
+		 * @param scaleWidth 横�标缩放的�数
+		 * @param scaleHeight 纵�标轴缩放的�数
 		 */
 		scale(scaleWidth: number, scaleHeight?: number): void;
 		/**
@@ -1507,15 +1505,15 @@ declare namespace wx {
 		 * 以原点为中心，原点�以用 translate方法修改。
 		 * 顺时针旋转当��标轴。多次调用rotate，旋转的角度会�加。
 		 *
-		 * @param {number} rotate 旋转角度，以弧度计。
+		 * @param rotate 旋转角度，以弧度计。
 		 */
 		rotate(rotate: number): void;
 		/**
 		 * 对�标原点进行缩放
 		 * 对当��标系的原点(0, 0)进行��，默认的�标系原点为页�左上角。
 		 *
-		 * @param {number} x 水平�标平移�
-		 * @param {number} y 竖直�标平移�
+		 * @param x 水平�标平移�
+		 * @param y 竖直�标平移�
 		 */
 		translate(x: number, y: number): void;
 		/**
@@ -1530,46 +1528,42 @@ declare namespace wx {
 		 * 在给定的矩形区域内，清除画布上的�素
 		 * 清除画布上在该矩形区域内的内容。
 		 *
-		 * @param {number} x 矩形区域左上角的x�标
-		 * @param {number} y 矩形区域左上角的y�标
-		 * @param {number} width 矩形区域的宽度
-		 * @param {number} height 矩形区域的高度
+		 * @param x 矩形区域左上角的x�标
+		 * @param y 矩形区域左上角的y�标
+		 * @param width 矩形区域的宽度
+		 * @param height 矩形区域的高度
 		 */
 		clearRect(x: number, y: number, width: number, height: number): void;
 		/**
 		 * 在画布上绘制被填充的文本
 		 *
-		 * @param {string} text 在画布上输出的文本
-		 * @param {number} x 绘制文本的左上角x�标�置
-		 * @param {number} y 绘制文本的左上角y�标�置
+		 * @param text 在画布上输出的文本
+		 * @param x 绘制文本的左上角x�标�置
+		 * @param y 绘制文本的左上角y�标�置
 		 */
 		fillText(text: string, x: number, y: number): void;
 		/**
 		 * 用于设置文字的对�
 		 *
-		 * @param {('left' | 'center' | 'right')} align
 		 *
-		 * @memberOf CanvasContext
 		 */
 		setTextAlign(align: 'left' | 'center' | 'right'): void;
 		/**
 		 * 绘制图�，图���原始尺寸。
 		 *
-		 * @param {string} imageResource 所�绘制的图片资�。 通过chooseImage得到一个文件路径或者一个项目目录内的图片
-		 * @param {number} x 图�左上角的x�标
-		 * @param {number} y 图�左上角的y�标
-		 * @param {number} width 图�宽度
-		 * @param {number} height 图�高度
+		 * @param imageResource 所�绘制的图片资�。 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+		 * @param x 图�左上角的x�标
+		 * @param y 图�左上角的y�标
+		 * @param width 图�宽度
+		 * @param height 图�高度
 		 *
-		 * @memberOf CanvasContext
 		 */
 		drawImage(imageResource: string, x: number, y: number, width: number, height: number): void;
 		/**
 		 * 设置全局画笔�明度。
 		 *
-		 * @param {number} alpha 0~1	�明度，0 表示完全�明，1 表示完全��明
+		 * @param alpha 0~1	�明度，0 表示完全�明，1 表示完全��明
 		 *
-		 * @memberOf CanvasContext
 		 */
 		setGlobalAlpha(alpha: number): void;
 		/**
@@ -1596,111 +1590,108 @@ declare namespace wx {
 		/**
 		 * 把路径移动到画布中的指定点，但�创建线�。
 		 *
-		 * @param {number} x 目标�置的x�标
-		 * @param {number} y 目标�置的y�标
+		 * @param x 目标�置的x�标
+		 * @param y 目标�置的y�标
 		 */
 		moveTo(x: number, y: number): void;
 		/**
 		 * 在当��置添加一个新点，然�在画布中创建从该点到最�指定点的路径。
 		 *
-		 * @param {number} x 目标�置的x�标
-		 * @param {number} y 目标�置的y�标
+		 * @param x 目标�置的x�标
+		 * @param y 目标�置的y�标
 		 */
 		lineTo(x: number, y: number): void;
 		/**
 		 * 添加一个矩形路径到当�路径。
 		 *
-		 * @param {number} x 矩形路径左上角的x�标
-		 * @param {number} y 矩形路径左上角的y�标
-		 * @param {number} width 矩形路径的宽度
-		 * @param {number} height 矩形路径的高度
+		 * @param x 矩形路径左上角的x�标
+		 * @param y 矩形路径左上角的y�标
+		 * @param width 矩形路径的宽度
+		 * @param height 矩形路径的高度
 		 */
 		rect(x: number, y: number, width: number, height: number): void;
 
 		/**
 		 * 填充一个矩形。
 		 * Tip: 用 setFillStyle() 设置矩形的填充色，如果没设置默认是黑色。
-		 * @param {number} x 矩形路径左上角的x�标
-		 * @param {number} y 矩形路径左上角的y�标
-		 * @param {number} width 矩形路径的宽度
-		 * @param {number} height 矩形路径的高度
+		 * @param x 矩形路径左上角的x�标
+		 * @param y 矩形路径左上角的y�标
+		 * @param width 矩形路径的宽度
+		 * @param height 矩形路径的高度
 		 *
-		 * @memberOf CanvasContext
 		 */
 		fillRect(x: number, y: number, width: number, height: number): void;
 		/**
 		 * 画一个矩形(�填充)。
 		 * Tip: 用 setFillStroke() 设置矩形线�的颜色，如果没设置默认是黑色。
-		 * @param {number} x 矩形路径左上角的x�标
-		 * @param {number} y 矩形路径左上角的y�标
-		 * @param {number} width 矩形路径的宽度
-		 * @param {number} height 矩形路径的高度
+		 * @param x 矩形路径左上角的x�标
+		 * @param y 矩形路径左上角的y�标
+		 * @param width 矩形路径的宽度
+		 * @param height 矩形路径的高度
 		 *
-		 * @memberOf CanvasContext
 		 */
 		strokeRect(x: number, y: number, width: number, height: number): void;
 		/**
 		 * 添加一个弧形路径到当�路径，顺时针绘制。
 		 *
-		 * @param {number} x 圆的x�标
-		 * @param {number} y 圆的y�标
-		 * @param {number} radius 圆的�径
-		 * @param {number} startAngle 起始弧度，��弧度（在3点钟方�）
-		 * @param {number} endAngle 终止弧度
-		 * @param {boolean} counterclockwise 指定弧度的方�是逆时针还是顺时针。默认是false，�顺时针。
+		 * @param x 圆的x�标
+		 * @param y 圆的y�标
+		 * @param radius 圆的�径
+		 * @param startAngle 起始弧度，��弧度（在3点钟方�）
+		 * @param endAngle 终止弧度
+		 * @param counterclockwise 指定弧度的方�是逆时针还是顺时针。默认是false，�顺时针。
 		 */
 		arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void;
 		/**
 		 * 创建二次方�塞尔曲线
 		 *
-		 * @param {number} cpx �塞尔控制点的x�标
-		 * @param {number} cpy �塞尔控制点的y�标
-		 * @param {number} x 结�点的x�标
-		 * @param {number} y 结�点的y�标
+		 * @param cpx �塞尔控制点的x�标
+		 * @param cpy �塞尔控制点的y�标
+		 * @param x 结�点的x�标
+		 * @param y 结�点的y�标
 		 */
 		quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
 		/**
 		 * 创建三次方�塞尔曲线
 		 *
-		 * @param {number} cp1x 第一个�塞尔控制点的 x �标
-		 * @param {number} cp1y 第一个�塞尔控制点的 y �标
-		 * @param {number} cp2x 第二个�塞尔控制点的 x �标
-		 * @param {number} cp2y 第二个�塞尔控制点的 y �标
-		 * @param {number} x 结�点的x�标
-		 * @param {number} y 结�点的y�标
+		 * @param cp1x 第一个�塞尔控制点的 x �标
+		 * @param cp1y 第一个�塞尔控制点的 y �标
+		 * @param cp2x 第二个�塞尔控制点的 x �标
+		 * @param cp2y 第二个�塞尔控制点的 y �标
+		 * @param x 结�点的x�标
+		 * @param y 结�点的y�标
 		 */
 		bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
 		/**
 		 * 设置填充样�
 		 *
-		 * @param {string} color 设置为填充样�的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格�的颜色字符串
+		 * @param color 设置为填充样�的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格�的颜色字符串
 		 */
 		setFillStyle(color: string): void;
 		/**
 		 * 设置线�样�
 		 *
-		 * @param {string} color 设置为填充样�的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格�的颜色字符串
+		 * @param color 设置为填充样�的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格�的颜色字符串
 		 */
 		setStrokeStyle(color: string): void;
 		/**
 		 * 设置阴影
 		 *
-		 * @param {number} offsetX 阴影相对于形状在水平方�的�移
-		 * @param {number} offsetY 阴影相对于形状在竖直方�的�移
-		 * @param {number} blur 阴影的模糊级别，数值越大越模糊 0~100
-		 * @param {string} color 阴影的颜色。 'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格�的颜色字符串
+		 * @param offsetX 阴影相对于形状在水平方�的�移
+		 * @param offsetY 阴影相对于形状在竖直方�的�移
+		 * @param blur 阴影的模糊级别，数值越大越模糊 0~100
+		 * @param color 阴影的颜色。 'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格�的颜色字符串
 		 */
 		setShadow(offsetX: number, offsetY: number, blur: number, color: string): void;
 
 		/**
 		 * 创建一个线性的��颜色。
 		 * Tip: 需�使用 addColorStop() �指定��点，至少�两个。
-		 * @param {number} x0 起点的x�标
-		 * @param {number} y0 起点的y�标
-		 * @param {number} x1 终点的x�标
-		 * @param {number} y1 终点的y�标
+		 * @param x0 起点的x�标
+		 * @param y0 起点的y�标
+		 * @param x1 终点的x�标
+		 * @param y1 终点的y�标
 		 *
-		 * @memberOf CanvasContext
 		 */
 		createLinearGradient(x0: number, y0: number, x1: number, y1: number): void;
 
@@ -1708,59 +1699,57 @@ declare namespace wx {
 		 * 创建一个颜色的��点。
 		 * Tip: �于最� stop 的部分会按最� stop 的 color �渲染，大于最大 stop 的部分会按最大 stop 的 color �渲染。
 		 * Tip: 需�使用 addColorStop() �指定��点，至少�两个。
-		 * @param {number} stop (0-1)	表示��点在起点和终点中的�置
-		 * @param {string} color ��点的颜色
+		 * @param stop (0-1)	表示��点在起点和终点中的�置
+		 * @param color ��点的颜色
 		 *
-		 * @memberOf CanvasContext
 		 */
 		addColorStop(stop: number, color: string): void;
 
 		/**
 		 * 创建一个圆形的��颜色。
 		 *
-		 * @param {number} x 圆心的x�标
-		 * @param {number} y 圆心的y�标
-		 * @param {number} r 圆的�径
+		 * @param x 圆心的x�标
+		 * @param y 圆心的y�标
+		 * @param r 圆的�径
 		 *
-		 * @memberOf CanvasContext
 		 */
 		createCircularGradient(x: number, y: number, r: number): void;
 		/**
 		 * 设置字体大�
 		 *
-		 * @param {number} fontSize 字体的字�
+		 * @param fontSize 字体的字�
 		 */
 		setFontSize(fontSize: number): void;
 		/**
 		 * 设置线�端点的样�
 		 *
-		 * @param {LineCapType} lineCap 线�的结�端点样�。 'butt'�'round'�'square'
+		 * @param lineCap 线�的结�端点样�。 'butt'�'round'�'square'
 		 */
 		setLineCap(lineCap: LineCapType): void;
 		/**
 		 * 设置两线相交处的样�
-		 *  @param {LineJoinType} lineJoin 两�线相交时，所创建的�角类型
+		 *  @param lineJoin 两�线相交时，所创建的�角类型
 		 */
 		setLineJoin(lineJoin: LineJoinType): void;
 		/**
 		 * 设置线�宽度
 		 *
-		 * @param {number} lineWidth 线�的宽度
+		 * @param lineWidth 线�的宽度
 		 */
 		setLineWidth(lineWidth: number): void;
-		/** 设置最大斜接长度，斜接长度指的是在两�线交汇处内角和外角之间的�离。
+		/**
+		 * 设置最大斜接长度，斜接长度指的是在两�线交汇处内角和外角之间的�离。
 		 * 当 setLineJoin为 miter 时�有效。
 		 * 超过最大倾斜长度的，连接处将以 lineJoin 为 bevel �显示
 		 *
-		 * @param {number} miterLimit 最大斜接长度
+		 * @param miterLimit 最大斜接长度
 		 */
 		setMiterLimit(miterLimit: number): void;
 		/**
 		 * 将之�在绘图上下文中的�述（路径��形�样�）画到 canvas 中。
 		 * Tip: 绘图上下文需�由 wx.createCanvasContext(canvasId) �创建。
-		 * @param {boolean} [reserve] �必填。本次绘制是�接�上一次绘制，�reserve�数为false，则在本次调用drawCanvas绘制之�native层应先清空画布�继续绘制；若reserver�数为true，则�留当�画布上的内容，本次调用drawCanvas绘制的内容覆盖在上�，默认 false
+		 * @param [reserve] �必填。本次绘制是�接�上一次绘制，�reserve�数为false，则在本次调用drawCanvas绘制之�native层应先清空画布�继续绘制；若reserver�数为true，则�留当�画布上的内容，本次调用drawCanvas绘制的内容覆盖在上�，默认 false
 		 *
-		 * @memberOf CanvasContext
 		 */
 		draw(reserve?: boolean): void;
 	}
@@ -1830,7 +1819,8 @@ declare namespace wx {
 	interface LoginResponse {
 		/** 调用结果 */
 		errMsg: string;
-		/** 用户�许登录�，回调内容会带上 code（有效期五分钟），
+		/**
+		 * 用户�许登录�，回调内容会带上 code（有效期五分钟），
 		 * 开�者需�将 code ��到开�者�务器��，
 		 * 使用code �� session_key api，
 		 * 将 code �� openid 和 session_key
@@ -1853,7 +1843,6 @@ declare namespace wx {
 	 * 检测当�用户登录�是�有效。
 	 * 通过wx.login获得的用户登录�拥有一定的时效性。用户越久未使用�程�，用户登录�越有�能失效。�之如果用户一直在使用�程�，则用户登录�一直��有效。具体时效逻辑由微信维护，对开�者�明。开�者�需�调用wx.checkSession接�检测当�用户登录�是�有效。登录�过期�开�者�以�调用wx.login获�新的用户登录�。
 	 *
-	 * @param {CheckSessionOption} options
 	 */
 	function checkSession(options: CheckSessionOption): void;
 }
@@ -1912,16 +1901,12 @@ declare namespace wx {
 		/**
 		 * 分享标题	默认为当��程��称
 		 *
-		 * @type {string}
-		 * @memberOf ShareAppMessage
 		 */
 		title?: string;
 		/**
 		 * 分享路径	当默认为�页� path ，
 		 * 必须是以 / 开头的完整路径
 		 *
-		 * @type {string}
-		 * @memberOf ShareAppMessage
 		 */
 		path?: string;
 	}
@@ -1933,13 +1918,11 @@ declare namespace wx {
 	/**
 	 * 显示分享按钮
 	 *
-	 * @param {ShowShareMenuOptions} [options]
 	 */
 	function showShareMenu(options?: ShareMenuOptions): void;
 	/**
 	 * ��分享按钮
 	 *
-	 * @param {ShareMenuOptions} [options]
 	 */
 	function hideShareMenu(options?: ShareMenuOptions): void;
 }
@@ -1950,55 +1933,46 @@ declare namespace wx {
 			/**
 			 * 调用结果
 			 *
-			 * @type {string}
 			 */
 			errMsg: string;
 			/**
 			 * 收货人姓�
 			 *
-			 * @type {string}
 			 */
 			userName: string;
 			/**
 			 * 邮编
 			 *
-			 * @type {string}
 			 */
 			postalCode: string;
 			/**
 			 * 国标收货地�第一级地�
 			 *
-			 * @type {string}
 			 */
 			provinceName: string;
 			/**
 			 * 国标收货地�第二级地�
 			 *
-			 * @type {string}
 			 */
 			cityName: string;
 			/**
 			 * 国标收货地�第三级地�
 			 *
-			 * @type {string}
 			 */
 			countyName: string;
 			/**
 			 * 详细收货地�信�
 			 *
-			 * @type {string}
 			 */
 			detailInfo: string;
 			/**
 			 * 收货地�国家�
 			 *
-			 * @type {string}
 			 */
 			nationalCode: string;
 			/**
 			 * 收货人手机��
 			 *
-			 * @type {string}
 			 */
 			telNumber: string;
 		}): void;
@@ -2018,7 +1992,6 @@ declare namespace wx {
 	/**
 	 * 批�添加�券。
 	 *
-	 * @param {ChooseAddressOptions} options
 	 */
 	function addCard(options: ChooseAddressOptions): void;
 	interface OpenCardOptions extends BaseOptions {
@@ -2027,7 +2000,6 @@ declare namespace wx {
 	/**
 	 * 查看微信�包中的�券。
 	 *
-	 * @param {OpenCardOptions} options
 	 */
 	function openCard(options: OpenCardOptions): void;
 }
@@ -2051,15 +2023,11 @@ declare namespace wx {
 	/**
 	 * 将 ArrayBuffer 数�转� Base64 字符串
 	 *
-	 * @param {ArrayBuffer} arrayBuffer
-	 * @returns {string}
 	 */
 	function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string;
 	/**
 	 * 将 Base64 字符串转� ArrayBuffer 数�
 	 *
-	 * @param {string} base64
-	 * @returns {ArrayBuffer}
 	 */
 	function base64ToArrayBuffer(base64: string): ArrayBuffer;
 }
diff --git a/types/whatwg-streams/tslint.json b/types/whatwg-streams/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/whatwg-streams/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/whatwg-streams/whatwg-streams-tests.ts b/types/whatwg-streams/whatwg-streams-tests.ts
index 528c2f1f01..9456ff2983 100644
--- a/types/whatwg-streams/whatwg-streams-tests.ts
+++ b/types/whatwg-streams/whatwg-streams-tests.ts
@@ -295,7 +295,7 @@ function streamifyWebSocket(url: string, protocol: string) {
 }
 
 class WebSocketSource implements ReadableStreamSource {
-    private _ws: WebSocket;
+    private readonly _ws: WebSocket;
 
     constructor(ws: WebSocket) {
         this._ws = ws;
@@ -316,7 +316,7 @@ class WebSocketSource implements ReadableStreamSource {
 }
 
 class WebSocketSink implements WritableStreamSink {
-    private _ws: WebSocket;
+    private readonly _ws: WebSocket;
 
     constructor(ws: WebSocket) {
         this._ws = ws;
diff --git a/types/wheel/index.d.ts b/types/wheel/index.d.ts
new file mode 100644
index 0000000000..a4ecd27100
--- /dev/null
+++ b/types/wheel/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for wheel 0.0
+// Project: https://github.com/anvaka/wheel
+// Definitions by: Bradley Odell <https://github.com/BTOdell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Adds a callback to receive mouse wheel events from the given element.
+ */
+declare function wheel(element: GlobalEventHandlers,
+    callback: (event: WheelEvent) => void,
+    useCapture?: boolean): void;
+
+declare namespace wheel {
+    /**
+     * Adds a callback to receive mouse wheel events from the given element.
+     */
+    function addWheelListener(element: GlobalEventHandlers,
+        callback: (event: WheelEvent) => void,
+        useCapture?: boolean): void;
+
+    /**
+     *  Removes a previously added wheel listener callback.
+     */
+    function removeWheelListener(element: GlobalEventHandlers,
+        callback: (event: WheelEvent) => void,
+        useCapture?: boolean): void;
+}
+
+export = wheel;
diff --git a/types/wheel/tsconfig.json b/types/wheel/tsconfig.json
new file mode 100644
index 0000000000..2857ce81c3
--- /dev/null
+++ b/types/wheel/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es5", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "wheel-tests.ts"
+    ]
+}
diff --git a/types/wheel/tslint.json b/types/wheel/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/wheel/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/wheel/wheel-tests.ts b/types/wheel/wheel-tests.ts
new file mode 100644
index 0000000000..ab8f521012
--- /dev/null
+++ b/types/wheel/wheel-tests.ts
@@ -0,0 +1,21 @@
+import wheel = require("wheel");
+import { addWheelListener, removeWheelListener } from "wheel";
+
+// Test 'wheel' function and module
+
+const wheelListener1 = (event: WheelEvent) => {
+    event.preventDefault();
+    wheel.removeWheelListener(document, wheelListener1);
+};
+
+wheel(document, wheelListener1);
+wheel.addWheelListener(document, wheelListener1);
+
+// Test 'addWheelListener' and 'removeWheelListener' functions.
+
+const wheelListener2 = (event: WheelEvent) => {
+    event.preventDefault();
+    removeWheelListener(document, wheelListener2);
+};
+
+addWheelListener(document, wheelListener2);
diff --git a/types/when/tslint.json b/types/when/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/when/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/when/when-tests.ts b/types/when/when-tests.ts
index 57523b00ac..63fbba2234 100644
--- a/types/when/when-tests.ts
+++ b/types/when/when-tests.ts
@@ -7,7 +7,7 @@ import dns = require('dns');
 import when = require("when");
 
 class ForeignPromise<T> {
-	constructor(private value: T) {
+	constructor(private readonly value: T) {
 	}
 
 	then<U>(onFulfilled: (value: T) => U, onRejected?: (reason: any) => U) { return new ForeignPromise<U>(onFulfilled(this.value)); }
diff --git a/types/which/index.d.ts b/types/which/index.d.ts
index 1fcfbc60e3..edfbc8b366 100644
--- a/types/which/index.d.ts
+++ b/types/which/index.d.ts
@@ -1,12 +1,67 @@
-// Type definitions for which 1.0.8
+// Type definitions for which 1.3.0
 // Project: https://github.com/isaacs/node-which
 // Definitions by: vvakame <https://github.com/vvakame>
+//                 cspotcode <https://github.com/cspotcode>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare function when(cmd: string, cb: (err: Error, path: string) => void): void;
-declare namespace when {
+/** Finds all instances of a specified executable in the PATH environment variable */
+declare function which(cmd: string, options: which.AsyncOptions & which.OptionsAll, cb: (err: Error | null, paths: Array<string> | undefined) => void): void;
+/** Finds the first instance of a specified executable in the PATH environment variable */
+declare function which(cmd: string, options: which.AsyncOptions & which.OptionsFirst, cb: (err: Error | null, path: string | undefined) => void): void;
+/** Finds the first instance of a specified executable in the PATH environment variable */
+declare function which(cmd: string, options: which.AsyncOptions, cb: (err: Error | null, path: string | Array<string> | undefined) => void): void;
+/** Finds the first instance of a specified executable in the PATH environment variable */
+declare function which(cmd: string, cb: (err: Error | null, path: string | undefined) => void): void;
+declare namespace which {
+    /** Finds all instances of a specified executable in the PATH environment variable */
+    function sync(cmd: string, options: which.Options & which.OptionsAll & which.OptionsNoThrow): Array<string> | null;
+    /** Finds the first instance of a specified executable in the PATH environment variable */
+    function sync(cmd: string, options: which.Options & which.OptionsFirst & which.OptionsNoThrow): string | null;
+    /** Finds all instances of a specified executable in the PATH environment variable */
+    function sync(cmd: string, options: which.Options & which.OptionsAll & which.OptionsThrow): Array<string>;
+    /** Finds the first instance of a specified executable in the PATH environment variable */
+    function sync(cmd: string, options: which.Options & which.OptionsFirst & which.OptionsThrow): string;
+    /** Finds the first instance of a specified executable in the PATH environment variable */
+    function sync(cmd: string, options: which.Options): string | Array<string> | null;
+    /** Finds the first instance of a specified executable in the PATH environment variable */
     function sync(cmd: string): string;
+
+    /** Options that ask for all matches. */
+    interface OptionsAll extends AsyncOptions {
+        all: true;
+    }
+
+    /** Options that ask for the first match (the default behavior) */
+    interface OptionsFirst extends AsyncOptions {
+        all?: false | undefined;
+    }
+
+    /** Options that ask to receive null instead of a thrown error */
+    interface OptionsNoThrow extends Options {
+        nothrow: true;
+    }
+
+    /** Options that ask for a thrown error if executable is not found (the default behavior) */
+    interface OptionsThrow extends Options {
+        nothrow?: false | undefined;
+    }
+
+    /** Options for which() async API */
+    interface AsyncOptions {
+        /** If true, return all matches, instead of just the first one. Note that this means the function returns an array of strings instead of a single string. */
+        all?: boolean;
+        /** Use instead of the PATH environment variable. */
+        path?: string;
+        /** Use instead of the PATHEXT environment variable. */
+        pathExt?: string;
+    }
+    
+    /** Options for which() sync and async APIs */
+    interface Options extends AsyncOptions {
+        /** If true, returns null when not found */
+        nothrow?: boolean;
+    }
 }
 
-export = when;
+export = which;
diff --git a/types/which/tsconfig.json b/types/which/tsconfig.json
index 3c3883a801..2ee304960e 100644
--- a/types/which/tsconfig.json
+++ b/types/which/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/which/tslint.json b/types/which/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/which/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/which/which-tests.ts b/types/which/which-tests.ts
index 68cd2c03ac..0220c3ad14 100644
--- a/types/which/which-tests.ts
+++ b/types/which/which-tests.ts
@@ -7,3 +7,29 @@ which("cat", (err, path) => {
 
 var path = which.sync("cat");
 console.log(path);
+
+which("cat", {all: true}, (err, paths) => {
+  if(err) return;
+  if(paths) {
+    for(let path of paths) {
+      console.log(path);
+    }
+  }
+});
+
+var paths = which.sync("cat", {all: true});
+for(let path of paths) {
+  console.log(path);
+}
+
+var paths2 = which.sync("cat", {all: true, nothrow: true});
+if(paths2 !== null) {
+  for(let path of paths2) {
+    console.log(path);
+  }
+}
+
+var path2 = which.sync("cat", {path: 'replacement path', pathExt: 'replacement pathext'});
+which("cat", {path: 'replacement path', pathExt: 'replacement pathext'}, (err, path) => {
+  const a: string = path!;
+});
diff --git a/types/why-did-you-update/tslint.json b/types/why-did-you-update/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/why-did-you-update/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wicg-mediasession/index.d.ts b/types/wicg-mediasession/index.d.ts
index 389d2d2b5b..ac08c8ef4f 100644
--- a/types/wicg-mediasession/index.d.ts
+++ b/types/wicg-mediasession/index.d.ts
@@ -19,7 +19,7 @@ interface MediaSession {
   // Current media session playback state.
   playbackState: MediaSessionPlaybackState;
   // Current media session meta data.
-  metadata?: MediaMetadata;
+  metadata?: MediaMetadata|null;
 
   // Set/Unset actions handlers.
   setActionHandler(action: MediaSessionAction, listener?: () => void): void;
diff --git a/types/wiiu/tslint.json b/types/wiiu/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wiiu/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/window-size/tslint.json b/types/window-size/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/window-size/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/windows-1251/tslint.json b/types/windows-1251/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/windows-1251/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/windows-service/tslint.json b/types/windows-service/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/windows-service/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winjs/tslint.json b/types/winjs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/winjs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winjs/v1/tslint.json b/types/winjs/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/winjs/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winjs/v2/tslint.json b/types/winjs/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/winjs/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winreg/tslint.json b/types/winreg/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/winreg/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winrt-uwp/index.d.ts b/types/winrt-uwp/index.d.ts
index 02490e6010..6e0a460e33 100644
--- a/types/winrt-uwp/index.d.ts
+++ b/types/winrt-uwp/index.d.ts
@@ -2,6 +2,8 @@
 // Project: http://msdn.microsoft.com/en-us/library/windows/apps/br211377.aspx
 // Definitions by: Kagami Sascha Rosylight <https://github.com/saschanaz>, Taylor Starfield <https://github.com/taylor224>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
 // Generator: uwp-type-generator <https://github.com/saschanaz/uwp-type-generator>
 
 declare namespace Windows {
@@ -18,7 +20,7 @@ declare namespace Windows {
 }
 
 declare namespace Windows.Foundation {
-    interface IPromise<TResult> {
+    interface IPromise<TResult> extends PromiseLike<TResult> {
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
         then<U>(success?: (value: TResult) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
@@ -48901,6 +48903,594 @@ declare namespace Windows {
             namespace LocalSearch {
             }
         }
+
+        /** Provides types and members you can use to access and manage Windows Store-related data for the current app. */
+        namespace Store {
+            /** Defines values that represent the status of an request that is related to a consumable add-on. */
+            enum StoreConsumableStatus {
+                /** The request did not succeed because the remaining balance of the consumable add-on is too low. */
+                insufficentQuantity = 1,
+                /** The request did not succeed because of a network connectivity error. */
+                networkError = 2,
+                /** The request did not succeed because of a server error returned by the Windows Store. */
+                serverError = 3,
+                /** The request succeeded. */
+                succeeded = 0,
+            }
+
+            /** Defines values that represent the state of a package download or installation request. */
+            enum StorePackageUpdateState {
+                /** The download or installation of the package updates was canceled. */
+                canceled = 4,
+                /** The package updates have finished downloading or installing. */
+                completed = 3,
+                /** The package updates are being deployed to the device. */
+                deploying = 2,
+                /** The package updates are being downloaded. */
+                downloading = 1,
+                /** The download or installation of the package updates did not succeed because the device does not have enough battery power. */
+                errorLowBattery = 6,
+                /** The download did not succeed because a Wi-Fi connection is recommended to download the package updates. */
+                errorWiFiRecommended = 7,
+                /** The download did not succeed because a Wi-Fi connection is required to download the package updates. */
+                errorWiFiRequired = 8,
+                /** An unknown error occurred. */
+                otherError = 5,
+                /** The download of the package updates has not started. */
+                pending = 0,
+            }
+
+            /** Defines values that represent the units of a trial period or billing period for a subscription. */
+            enum StoreDurationUnit {
+                /** The period is defined in days. */
+                day = 2,
+                /** The period is defined in hours. */
+                hour = 1,
+                /** The period is defined in minutes. */
+                minute = 0,
+                /** The period is defined in months. */
+                month = 4,
+                /** The period is defined in weeks. */
+                week = 3,
+                /** The period is defined in years. */
+                year = 5,
+            }
+
+            /** Defines values that represent the status of a request to purchase an app or add-on. */
+            enum StorePurchaseStatus {
+                /** The current user has already purchased the specified app or add-on. */
+                alreadyPurchased = 1,
+                /** The purchase request did not succeed because of a network connectivity error. */
+                networkError = 3,
+                /** The purchase request did not succeed. */
+                notPurchased = 2,
+                /** The purchase request did not succeed because of a server error returned by the Windows Store. */
+                serverError = 4,
+                /** The purchase request succeeded. */
+                succeeded = 0,
+            }
+
+            /** Provides status info for a package that is associated with a download or installation request. */
+            interface StorePackageUpdateStatus {
+                /** The number of bytes that have been downloaded. */
+                packageBytesDownloaded: number;
+                /** The download (or download and install) progress of the current package, represented by a value from 0.0 to 1.0. When you use RequestDownloadStorePackageUpdatesAsync to download packages, this value increases from 0.0 to 1.0 during the download of each package. When you use RequestDownloadAndInstallStorePackageUpdatesAsync to download and install packages in a single operation, this value increases from 0.0 to 0.8 during the download of each package, and then it increases from 0.8 to 1.0 during the install phase. */
+                packageDownloadProgress: number;
+                /** The size of the package that is being downloaded, in bytes. This is an estimate, and it might change during the download process. */
+                packageDownloadSizeInBytes: number;
+                /** The family name of the package that is being downloaded or installed. */
+                packageFamilyName: string;
+                /** A StorePackageUpdateState value that indicates the state of the package that is being downloaded or installed. */
+                packageUpdateState: StorePackageUpdateState;
+                /** The current progress of all package downloads in the request, represented by a value from 0.0 to 1.0. */
+                totalDownloadProgress: number;
+            }
+
+            /** Provides response data for a request to acquire a downloadable content (DLC) package license. */
+            abstract class StoreAcquireLicenseResult  {
+                /** Gets the error code for the request, if the operation encountered an error. */
+                extendedError: WinRTError;
+                /** Gets an object that represents the downloadable content (DLC) package license. */
+                storePackageLicense: StorePackageLicense;
+            }
+
+            /** Provides license info for the current app, including licenses for products that are offered by the app. */
+            abstract class StoreAppLicense {
+                /** Gets the collection of licenses for add-ons that can be used offline (typically durable add-ons), for which the user has entitlements to use. This property does not include licenses for consumable add-ons. */
+                addOnLicenses: Windows.Foundation.Collections.IMapView<string, StoreLicense>;
+                /** Gets the expiration date and time for the app license. */
+                expirationDate: Date;
+                /** Gets complete license data in JSON format. */
+                extendedJsonData: string;
+                /** Gets a value that indicates whether the license is active. */
+                isActive: boolean;
+                /** Gets a value that indicates whether the license is a trial license. */
+                isTrial: boolean;
+                /** Gets a value that indicates whether the current user has an entitlement for the usage-limited trial that is associated with this app license. */
+                isTrialOwnedByThisUser: boolean;
+                /** Gets the Store ID of the licensed app SKU from the Windows Store catalog. */
+                skuStoreId: string;
+                /** Gets the remaining time for the usage-limited trial that is associated with this app license. */
+                trialTimeRemaining: number;
+                /** Gets a unique ID that identifies the combination of the current user and the usage-limited trial that is associated with this app license. */
+                trialUniqueId: string;
+            }
+
+            /** Represents a specific instance of a product SKU that can be purchased. */
+            abstract class StoreAvailability {
+                /** Gets the end date for the current SKU availability. */
+                endDate: Date;
+                /** Gets complete data for the current SKU availability from the Store in JSON format. */
+                extendedJsonData: string;
+                /** Gets price info for the current SKU availability, including the base price, current price, and sale info. */
+                price: StorePrice;
+                /**
+                 * Requests the purchase of the current SKU availability and displays the UI that is used to complete the transaction via the Windows Store.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                */
+                requestPurchaseAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /**
+                 * Requests the purchase of the current SKU availability and displays the UI that is used to complete the transaction via the Windows Store. This method provides the option to specify additional details for a specific offer within a large catalog of products that are represented by a single listing in the Windows Store, including the product name to display to the user during the purchase.
+                 * @param {StorePurchaseProperties} storePurchaseProperties An object that specifies additional info for the purchase request, including the product name to display to the user during the purchase.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                */
+                requestPurchaseAsync(storePurchaseProperties: StorePurchaseProperties): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /** Gets the Store ID of the current SKU availability from the Windows Store catalog. */
+                storeId: string;
+            }
+
+            /** Provides additional data for a product SKU that the user has an entitlement to use. */
+            abstract class StoreCollectionData  {
+                /** Gets the date on which the product SKU was acquired. */
+                acquiredDate: Date;
+                /** Gets the promotion campaign ID that is associated with the product SKU. */
+                campaignId: string;
+                /** Gets the developer offer ID that is associated with the product SKU. */
+                developerOfferId: string;
+                /** Gets the end date of the trial for the product SKU, if the SKU is a trial version or a durable add-on that expires after a set duration. */
+                endDate: Date;
+                /** Gets complete collection data for the product SKU in JSON format. */
+                extendedJsonData: string;
+                /** Gets a value that indicates whether the product SKU is a trial version. */
+                isTrial: boolean;
+                /** Gets the start date of the trial for the product SKU, if the SKU is a trial version or a durable add-on that expires after a set duration. */
+                startDate: Date;
+                /** Gets the remaining trial time for the product SKU. */
+                trialTimeRemaining: number;
+            }
+
+            /** Provides response data for a request that involves a consumable add-on for the current app. */
+            abstract class StoreConsumableResult {
+                /** Gets the remaining balance for the consumable add-on. */
+                balanceRemaining: number;
+                /** Gets the error code for the request, if the operation encountered an error. */
+                extendedError: WinRTError;
+                /** Gets the status of the request. */
+                status: StoreConsumableStatus;
+                /** Gets the tracking ID that was submitted with the ReportConsumableFulfillmentAsync request. */
+                trackingId: string;
+            }
+
+            /** Provides members you can use to access and manage Windows Store-related data for the current app. For example, you can use members of this class to get Windows Store listing and license info for the current app, purchase the current app or products that are offered by the app, or download and install package updates for the app. */
+            abstract class StoreContext {
+                /**
+                 * Acquires a license for the specified downloadable content (DLC) package for the current app.
+                 * @param optionalPackage The DLC package for which to acquire a license.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreAcquireLicenseResult object that contains the license.
+                 */
+                acquireStoreLicenseForOptionalPackageAsync(optionalPackage: Windows.ApplicationModel.Package): Windows.Foundation.IPromiseWithIAsyncOperation<StoreAcquireLicenseResult>;
+                /**
+                 * Gets Store product details for the app or add-on that is associated with the specified package.
+                 * @param productKinds An array of strings that specify the types of Store products that might be associated with the package. For a list of the supported string values, see the ProductKind property.
+                 * @param package A Package that represents the package for which you want to get the corresponding Store product details.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductResult object. Use the Product property of this object to access a StoreProduct that contains Store product details for the specified package.
+                 */
+                findStoreProductForPackageAsync(productKinds: Windows.Foundation.Collections.IIterable<string>, package: Windows.ApplicationModel.Package): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductResult>;
+                /**
+                 * Gets the collection of packages for the current app that have updates available for download from the Windows Store, including optional packages for the app (also called downloadable content or DLC).
+                 * @return An asynchronous operation that, on successful completion, returns a collection of StorePackageUpdate objects that represent the packages that have updates available.
+                 */
+                getAppAndOptionalStorePackageUpdatesAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<StorePackageUpdate>;
+                /**
+                 * Gets license info for the current app, including licenses for add-ons for the current app.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreAppLicense object that contains license info for the current app, including add-on licenses.
+                 */
+                getAppLicenseAsync():  Windows.Foundation.IPromiseWithIAsyncOperation<StoreAppLicense>;
+                /**
+                 * Gets the list of products that can be purchased from within the current app.
+                 * @param productKinds An array of strings that specify the types of products you want to get. For a list of the supported string values, see the ProductKind property.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductQueryResult that provides access to the associated products and relevant error info.
+                 */
+                getAssociatedStoreProductsAsync(productKinds: Windows.Foundation.Collections.IIterable<string>): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductQueryResult>;
+                /**
+                 * Gets the list of products that can be purchased from within the current app. This method supports paging to return the results.
+                 * @param productKinds An array of strings that specify the types of products you want to get. For a list of the supported string values, see the ProductKind property.
+                 * @param maxItemsToRetrievePerPage The maximum number of products to return in each page of results.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductPagedQueryResult that provides access to the associated products, relevant error info, and the next page of results.
+                 */
+                getAssociatedStoreProductsWithPagingAsync(productKinds: Windows.Foundation.Collections.IIterable<string>, maxItemsToRetrievePerPage: number): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductPagedQueryResult>;
+                /**
+                 * Gets the remaining balance for the specified consumable add-on for the current app.
+                 * @param productStoreId The Store ID for the add-on (as provided by the StoreId property of the StoreProduct that represents the add-on).
+                 * @return An asynchronous operation that, on successful completion, returns a StoreConsumableResult that provides the remaining balance and other info.
+                 */
+                getConsumableBalanceRemainingAsync(productStoreId: string): Windows.Foundation.IPromiseWithIAsyncOperation<StoreConsumableResult>;
+                /**
+                 * Retrieves a Windows Store collections ID key that can be used to query for product entitlements or to consume product entitlements that are owned by the current user.
+                 * @param serviceTicket An Azure Active Directory access token that identifies the publisher of the current app. For more information about generating this token, see Manage product entitlements from a service.
+                 * @param publisherUserId An anonymous ID that identifies the current user in the context of services that are managed by the publisher of the current app. If the publisher maintains anonymous user IDs for use in their services, they can use this parameter to correlate these user IDs with the calls they make to Windows Store services. This parameter is optional.
+                 * @return An asynchronous operation that, on successful completion, returns the collections ID key for the current user. This key is valid for 90 days.
+                 */
+                getCustomerCollectionsIdAsync(serviceTicket: string, publisherUserId?: string): Windows.Foundation.IPromiseWithIAsyncOperation<string>;
+                /**
+                 * Retrieves a Windows Store purchase ID key that can be used to grant entitlements for free products on behalf of the current user.
+                 * @param serviceTicket An Azure Active Directory access token that identifies the publisher of the current app. For more information about generating this token, see Manage product entitlements from a service.
+                 * @param publisherUserId An anonymous ID that identifies the current user in the context of services that are managed by the publisher of the current app. If the publisher maintains anonymous user IDs for use in their services, they can use this parameter to correlate these user IDs with the calls they make to Windows Store services. This parameter is optional.
+                 * @return An asynchronous operation that, on successful completion, returns the purchase ID key for the current user. This key is valid for 90 days.
+                 */
+                getCustomerPurchaseIdAsync(serviceTicket: string, publisherUserId?: string): Windows.Foundation.IPromiseWithIAsyncOperation<string>;
+                /**
+                 * Gets a StoreContext object that can be used to access and manage Windows Store-related data for the current user in the context of the current app.
+                 * @return An object that you can use to access and manage Windows Store-related data for the current user.
+                 */
+                static getDefault(): StoreContext;
+                /**
+                 * Gets a StoreContext object that can be used to access and manage Windows Store-related data for the specified user in the context of the current app.
+                 * @param user An object that identifies the user whose Windows Store-related data you want to access and manage.
+                 * @return An object that you can use to access and manage Windows Store-related data for the specified user.
+                 */
+                static getForUser(user: Windows.System.User): StoreContext;
+                /**
+                 * Gets Windows Store listing info for the current app and provides access to a method that you can use to purchase the app for the current user.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductResult object that contains Windows Store listing info for the current app and any relevant error info.
+                 */
+                getStoreProductForCurrentAppAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductResult>;
+                /**
+                 * Gets Windows Store listing info for the specified products that can be purchased from within the current app.
+                 * @param productKinds An array of strings that specify the types of products for which you want to retrieve listing info. For a list of the supported string values, see the ProductKind property.
+                 * @param storeIds An array of the Store ID strings for the products for which you want to retrieve listing info.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductQueryResult object that contains Windows Store listing info for the specified products and any relevant error info.
+                 */
+                getStoreProductsAsync(productKinds: Windows.Foundation.Collections.IIterable<string>, storeIds: Windows.Foundation.Collections.IIterable<string>): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductQueryResult>;
+                /**
+                 * Gets Windows Store info for the add-ons of the current app for which the user has entitlements to use.
+                 * @param productKinds An array of strings that specify the types of add-ons for which you want to retrieve listing info. For a list of the supported string values, see the ProductKind property.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductQueryResult object that contains Windows Store listing info for the add-ons of the current app for which the user has entitlements to use.
+                 */
+                getUserCollectionAsync(productKinds: Windows.Foundation.Collections.IIterable<string>): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductQueryResult>;
+                /**
+                 * Gets Windows Store info for the add-ons of the current app for which the user has entitlements to use. This method supports paging to return the results.
+                 * @param productKinds An array of strings that specify the types of add-ons for which you want to retrieve listing info. For a list of the supported string values, see the ProductKind property.
+                 * @param maxItemsToRetrievePerPage The maximum number of add-ons to return in each page of results.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductPagedQueryResult object that provides access to the Windows Store listing info for the add-ons of the current app for which the user has entitlements to use, as well as the next page of results.
+                 */
+                getUserCollectionWithPagingAsync(productKinds: Windows.Foundation.Collections.IIterable<string>, maxItemsToRetrievePerPage: number): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductPagedQueryResult>;
+                /** Raised when the status of the app's license changes (for example, the trial period has expired or the user has purchased the full version of the app). */
+                onofflinelicenseschanged: Windows.Foundation.TypedEventHandler<StoreContext, object>;
+                /**
+                 * Reports a consumable add-on for the current app as fulfilled in the Windows Store.
+                 * @param productStoreId The Store ID of the consumable add-on that you want to report as fulfilled.
+                 * @param quantity The number of units of the consumable add-on that you want to report as fulfilled. For a Store-managed consumable (that is, a consumable where Microsoft keeps track of the balance), specify the number of units that have been consumed. For a developer-managed consumable (that is, a consumable where the developer keeps track of the balance), specify 1.
+                 * @param trackingId A developer-supplied GUID that identifies the specific transaction that the fulfillment operation is associated with for tracking purposes. For more information, see the remarks.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreConsumableResult object that contains info about the fulfillment operation, such as the remaining balance of add-on units.
+                 */
+                reportConsumableFulfillmentAsync(productStoreId: string, quantity: number, trackingId: string): Windows.Foundation.IPromiseWithIAsyncOperation<StoreConsumableResult>;
+                /**
+                 * Downloads and installs the specified downloadable content (DLC) packages for the current app from the Windows Store.
+                 * @param storeIds The product IDs of the add-on packages to install.
+                 * @return An object that the caller can observe to track progress and completion for the operation. On successful completion, the result is a StorePackageUpdateResult object that provides info about the package updates.
+                 */
+                requestDownloadAndInstallStorePackagesAsync(storeIds: Windows.Foundation.Collections.IIterable<string>): Windows.Foundation.IPromiseWithIAsyncOperationWithProgress<StorePackageUpdateResult, StorePackageUpdateStatus>;
+                /**
+                 * Downloads and installs the specified package updates for the current app from the Windows Store.
+                 * @param storePackageUpdates The set of StorePackageUpdate objects that represent the updated packages to download and install.
+                 * @return An object that the caller can observe to track progress and completion for the operation. On successful completion, the result is a StorePackageUpdateResult object that provides info about the package updates.
+                 */
+                requestDownloadAndInstallStorePackageUpdatesAsync(storePackageUpdates: Windows.Foundation.Collections.IIterable<StorePackageUpdate>): Windows.Foundation.IPromiseWithIAsyncOperationWithProgress<StorePackageUpdateResult, StorePackageUpdateStatus>;
+                /**
+                 * Downloads the specified package updates for the current app from the Windows Store.
+                 * @param storePackageUpdates The set of StorePackageUpdate objects that represent the updated packages to download.
+                 * @return An object that the caller can observe to track progress and completion for the operation. On successful completion, the result is a StorePackageUpdateResult object that provides info about the package updates.
+                 */
+                requestDownloadStorePackageUpdatesAsync(storePackageUpdates: Windows.Foundation.Collections.IIterable<StorePackageUpdate>): Windows.Foundation.IPromiseWithIAsyncOperationWithProgress<StorePackageUpdateResult, StorePackageUpdateStatus>;
+                /**
+                 * Requests the purchase for the specified app or add-on and displays the UI that is used to complete the transaction via the Windows Store.
+                 * @param storeId The Store ID of the app or the add-on that you want to purchase for the current user.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                 */
+                requestPurchaseAsync(storeId: string): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /**
+                 * Requests the purchase for the specified app or add-on and displays the UI that is used to complete the transaction via the Windows Store. This method provides the option to specify additional details for a specific offer within a large catalog of products that are represented by a single listing in the Windows Store, including the product name to display to the user during the purchase.
+                 * @param storeId The Store ID of the app or the add-on that you want to purchase for the current user.
+                 * @param storePurchaseProperties An object that specifies additional info for the purchase request, including the product name to display to the user during the purchase.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                 */
+                requestPurchaseAsync(storeId: string, storePurchaseProperties: StorePurchaseProperties): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /** Gets an object that provides info about the current user. */
+                user: Windows.System.User;
+            }
+
+            /** Represents an image that is associated with a product listing in the Windows Store. */
+            abstract class StoreImage {
+                /** Gets the caption for the image. */
+                caption: string;
+                /** Gets the height of the image, in pixels. */
+                height: number;
+                /** Gets the tag for the image. */
+                imagePurposeTag: string;
+                /** Gets the URI of the image. */
+                uri: Windows.Foundation.Uri;
+                /** Gets the width of the image, in pixels. */
+                width: number;
+            }
+
+            /** Provides license info for an add-on that is associated with the current app. */
+            abstract class StoreLicense {
+                /** Gets the expiration date and time for the add-on license. */
+                expirationDate: Date;
+                /** Gets complete license data in JSON format. */
+                extendedJsonData: string;
+                /** Gets in the product ID for the add-on. */
+                inAppOfferToken: string;
+                /** Gets a value that indicates whether the add-on license is active. */
+                isActive: boolean;
+                /** Gets the Store ID of the licensed add-on SKU from the Windows Store catalog. */
+                skuStoreId: string;
+            }
+
+            /** Provides license info for a downloadable content (DLC) package for the current app. */
+            abstract class StorePackageLicense {
+                /** Closes and releases any resources used by this StorePackageLicense. */
+                close(): void;
+                /** Gets a value that indicates whether the license is valid. */
+                isValid: boolean;
+                /** Raised when user no longer has rights to the license on the current device (for example, the user has acquired the license on a different device). */
+                onlicenselost: Windows.Foundation.TypedEventHandler<StorePackageLicense, object>;
+                /** Gets the downloadable content (DLC) package that is associated with the license. */
+                package: Windows.ApplicationModel.Package;
+                /** Releases the license for the downloadable content (DLC) package. */
+                releaseLicense(): void;
+            }
+
+            /** Provides info about a package for the current app that has an update available for download from the Windows Store. */
+            abstract class StorePackageUpdate {
+                /** Gets a value that indicates whether the package that has an update available for download from the Windows Store is a mandatory package, as specified by the developer in the Windows Dev Center dashboard. */
+                mandatory: boolean;
+                /** Gets the package that has an update available for download from the Windows Store. */
+                package: Windows.ApplicationModel.Package;
+            }
+
+            /** Provides info about a completed package update request for the current app. */
+            abstract class StorePackageUpdateResult {
+                /** Gets the state of the completed package update request. */
+                overallState: StorePackageUpdateState;
+                /** Gets info about the status of each of the package updates that are associated with the completed request. */
+                storePackageUpdateStatuses: Windows.Foundation.Collections.IVectorView<StorePackageUpdateStatus>;
+            }
+
+            /** Contains pricing info for a product listing in the Windows Store. */
+            abstract class StorePrice {
+                /** Gets the ISO 4217 currency code for the market of the current user. */
+                currencyCode: string;
+                /** Gets the base price for the product with the appropriate formatting for the market of the current user. */
+                formattedBasePrice: string;
+                /** Gets the purchase price for the product with the appropriate formatting for the market of the current user. */
+                formattedPrice: string;
+                /** Gets the recurring price for the product with the appropriate formatting for the market of the current user, if recurring billing is enabled for this product. */
+                formattedRecurrencePrice: string;
+                /** Gets a value that indicates whether the product is on sale. */
+                isOnSale: boolean;
+                /** Gets the end date for the sale period for the product, if the product is on sale. */
+                saleEndDate: Date;
+            }
+
+            /** Represents a product that is available in the Windows Store. */
+            abstract class StoreProduct {
+                /** Gets the product description from the Windows Store listing. */
+                description: string;
+                /** Gets complete data for the product from the Store in JSON format. */
+                extendedJsonData: string;
+                /**
+                 * Indicates whether any SKU of this product is installed on the current device. This method is intended to be used for products that have downloadable content (DLC).
+                 * @return An asynchronous operation that, on successful completion, returns true if a SKU of this product is installed on the current device; otherwise, false.
+                 */
+                getIsAnySkuInstalledAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<boolean>;
+                /** Gets a value that indicates whether the product has optional downloadable content (DLC). */
+                hasDigitalDownload: boolean;
+                /** Gets the images from the Windows Store listing for the product. */
+                images: Windows.Foundation.Collections.IVectorView<StoreImage>;
+                /** Gets the product ID for this product, if the current StoreProduct represents an add-on. */
+                inAppOfferToken: string;
+                /** Gets a value that indicates whether the current user has an entitlement to use the default SKU of the product. */
+                isInUserCollection: boolean;
+                /** Gets the keywords that are associated with the product in the Windows Dev Center dashboard. This property only applies to StoreProduct objects that represent add-ons. These strings correspond to the value of the Keywords field in the properties page for the add-on in the Windows Dev Center dashboard. */
+                keywords: Windows.Foundation.Collections.IVectorView<string>;
+                /** Gets the language for the data in the Windows Store listing for the product. */
+                language: string;
+                /** Gets the URI to the Windows Store listing for the product. */
+                linkUri: Windows.Foundation.Uri;
+                /** Gets the price for the default SKU and availability for the product. */
+                price: StorePrice;
+                /** Gets the type of the product. These values are currently supported: Application, Game, Consumable, UnmanagedConsumable, and Durable. */
+                productKind: string;
+                /**
+                 * Requests the purchase of the default SKU and availability for the product and displays the UI that is used to complete the transaction via the Windows Store.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                 */
+                requestPurchaseAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /**
+                 * Requests the purchase of the default SKU and availability for the product and displays the UI that is used to complete the transaction via the Windows Store. This method provides the option to specify additional details for a specific offer within a large catalog of products that are represented by a single listing in the Windows Store, including the product name to display to the user during the purchase.
+                 * @param storePurchaseProperties An object that specifies additional info for the purchase request, including the product name to display to the user during the purchase.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                 */
+                requestPurchaseAsync(storePurchaseProperties: StorePurchaseProperties): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /** Gets the list of available SKUs for the product. */
+                skus: Windows.Foundation.Collections.IVectorView<StoreSku>;
+                /** Gets the Store ID for this product. */
+                storeId: string;
+                /** Gets the product title from the Windows Store listing. */
+                title: string;
+                /** Gets the videos from the Windows Store listing for the product. */
+                videos: Windows.Foundation.Collections.IVectorView<StoreVideo>;
+            }
+
+            /** Provides response data for a paged request to retrieve details about products that can be purchased from within the current app. */
+            abstract class StoreProductPagedQueryResult {
+                /** Gets the error code for the request, if the operation encountered an error. */
+                extendedError: WinRTError;
+                /**
+                 * Returns the next page of results. To determine if there are more pages of results, use the HasMoreResults property.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreProductPagedQueryResult object that provides the next page of results.
+                 */
+                getNextAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<StoreProductPagedQueryResult>;
+                /** Gets a value that indicates whether there are additional pages of results. To get the next page of results, use the GetNextAsync method. */
+                hasMoreResults: boolean;
+                /** Gets the collection of products returned by the request. */
+                products: Windows.Foundation.Collections.IMapView<string, StoreProduct>;
+            }
+
+            /** Provides response data for a request to retrieve details about products that can be purchased from within the current app. */
+            abstract class StoreProductQueryResult {
+                /** Gets the error code for the request, if the operation encountered an error. */
+                extendedError: WinRTError;
+                /** Gets the collection of products returned by the request. */
+                products: Windows.Foundation.Collections.IMapView<string, StoreProduct>;
+            }
+
+            /** Provides response data for a request to retrieve details about the current app. */
+            abstract class StoreProductResult {
+                /** Gets the error code for the request, if the operation encountered an error. */
+                extendedError: WinRTError;
+                /** Gets info about the current app. */
+                product: StoreProduct;
+            }
+
+            /** Contains additional details that you can pass to a purchase request for a product, including the product name to display to the user during the purchase. */
+            class StorePurchaseProperties {
+                /** Initializes a new instance of the StorePurchaseProperties class. */
+                constructor();
+                /** Initializes a new instance of the StorePurchaseProperties class. This overload provides the option to specify the product name that is displayed to the user during the purchase.
+                 * @param name The product name that is displayed to the user during the purchase.
+                 */
+                constructor(name: string);
+                /** Gets or sets a JSON-formatted string that contains extended data to pass with the purchase request to the Windows Store. */
+                extendedJsonData: string;
+                /** Gets or sets the product name that is displayed to the user during the purchase. The specified name appears in the title bar of the purchase UI. */
+                name: string;
+            }
+
+            /** Provides response data for a request to purchase an app or product that is offered by the app. */
+            abstract class StorePurchaseResult {
+                /** Gets the error code for the purchase request, if the operation encountered an error. */
+                extendedError: WinRTError;
+                /** Gets the status of the purchase request. */
+                status: StorePurchaseStatus;
+            }
+
+            /** Provides a helper method that can be used to send requests to the Windows Store for operations that do not yet have a corresponding API available in the Windows SDK. */
+            abstract class StoreRequestHelper {
+                /**
+                 * Sends the specified request to the Windows Store with the provided context and parameters.
+                 * @param context An object that specifies the user for which to perform the operation. If your app is a single-user app (that is, it runs only in the context of the user that launched the app), use the StoreContext.GetDefault method to get a StoreContext object that you can use to send a request that operates in the context of the user. If your app is a multi-user app, use the StoreContext.GetForUser method to get a StoreContext object that you can use to send a request that operates in the context of a specific user.
+                 * @param requestKind A value that identifies the request that you want to send to the Windows Store.
+                 * @param parametersAsJson A JSON-formatted string that contains the arguments to pass to the request.
+                 * @return An asynchronous operation that, on successful completion, returns a StoreSendRequestResult object that provides status and error info about the request.
+                 */
+                static sendRequestAsync(context: StoreContext, requestKind: number, parametersAsJson: string): Windows.Foundation.IPromiseWithIAsyncOperation<StoreSendRequestResult>;
+            }
+
+            /** Provides response data for a request that is sent to the Windows Store. */
+            abstract class StoreSendRequestResult {
+                /** Gets the error code for the request, if the operation encountered an error. */
+                extendedError: WinRTError;
+                /** Gets the HTTP status code for the request. */
+                httpStatusCode: Windows.Web.Http.HttpStatusCode;
+                /** Gets the response data for the request. */
+                response: string;
+            }
+
+            /** Provides info for a SKU of a product in the Windows Store. */
+            abstract class StoreSku {
+                /** Gets the availabilities for the current product SKU. Each product SKU can have one or more availabilities that have different prices. */
+                availabilities: Windows.Foundation.Collections.IVectorView<StoreAvailability>;
+                /** Gets the list of Store IDs for the apps or add-ons that are bundled with this product SKU. */
+                bundledSkus: Windows.Foundation.Collections.IVectorView<string>;
+                /** Gets additional data for the current product SKU, if the user has an entitlement to use the SKU. */
+                collectionData: StoreCollectionData;
+                /** Gets the custom developer data string (also called a tag) that contains custom information about the add-on that this product SKU represents. This string corresponds to the value of the Custom developer data field in the properties page for the add-on in the Windows Dev Center dashboard. */
+                customDeveloperData: string;
+                /** Gets the product SKU description from the Windows Store listing. */
+                description: string;
+                /** Gets complete data for the current product SKU from the Store in JSON format. */
+                extendedJsonData: string;
+                /**
+                 * Indicates whether this product SKU is installed on the current device.
+                 * @return An asynchronous operation that, on successful completion, returns true if this product SKU is installed on the current device; otherwise, false.
+                 */
+                getIsInstalledAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<boolean>;
+                /** Gets the images from the Windows Store listing for the product SKU. */
+                images: Windows.Foundation.Collections.IVectorView<StoreImage>;
+                /** Gets a value that indicates whether the current user has an entitlement to use the current product SKU. */
+                isInUserCollection: boolean;
+                /** Gets a value that indicates whether the current product SKU is a subscription with recurring billing. For more information about the subscription, see the SubscriptionInfo property. */
+                isSubscription: boolean;
+                /** Gets a value that indicates whether the current product SKU is a trial SKU. */
+                isTrial: boolean;
+                /** Gets the language for the data in the Windows Store listing for the product SKU. */
+                language: string;
+                /** Gets the price of the default availability for this product SKU. */
+                price: StorePrice;
+                /**
+                 * Requests the purchase of the product SKU and displays the UI that is used to complete the transaction via the Windows Store.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                 */
+                requestPurchaseAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /**
+                 * Requests the purchase of the product SKU and displays the UI that is used to complete the transaction via the Windows Store. This method provides the option to specify additional details for a specific offer within a large catalog of products that are represented by a single listing in the Windows Store, including the product name to display to the user during the purchase.
+                 * @param storePurchaseProperties An object that specifies additional info for the purchase request, including the product name to display to the user during the purchase.
+                 * @return An asynchronous operation that, on successful completion, returns a StorePurchaseResult object that provides status and error info about the purchase.
+                 */
+                requestPurchaseAsync(storePurchaseProperties: StorePurchaseProperties): Windows.Foundation.IPromiseWithIAsyncOperation<StorePurchaseResult>;
+                /** Gets the Store ID of this product SKU. */
+                storeId: string;
+                /** Gets subscription information for this product SKU, if this product SKU is a subscription with recurring billing. To determine whether this product SKU is a subscription, use the IsSubscription property. */
+                subscriptionInfo: StoreSubscriptionInfo;
+                /** Gets the product SKU title from the Windows Store listing. */
+                title: string;
+                /** Gets the videos from the Windows Store listing for the product SKU. */
+                videos: Windows.Foundation.Collections.IVectorView<StoreVideo>;
+            }
+
+            /** Provides subscription info for a product SKU that represents a subscription with recurring billing. */
+            abstract class StoreSubscriptionInfo {
+                /** Gets the duration of the billing period for a subscription, in the units specified by the BillingPeriodUnit property. */
+                billingPeriod: number;
+                /** Gets the units of the billing period for a subscription. */
+                billingPeriodUnit: StoreDurationUnit;
+                /** Gets a value that indicates whether the subscription contains a trial period. */
+                hasTrialPeriod: boolean;
+                /** Gets the duration of the trial period for the subscription, in the units specified by the TrialPeriodUnit property. To determine whether the subscription has a trial period, use the HasTrialPeriod property. */
+                trialPeriod: number;
+                /** Gets the units of the trial period for the subscription. */
+                trialPeriodUnit: StoreDurationUnit;
+            }
+
+            /** Represents a video that is associated with a product listing in the Windows Store. */
+            abstract class StoreVideo {
+                /** Gets the caption for the video. */
+                caption: string;
+                /** Gets the height of the video, in pixels. */
+                height: number;
+                /** Gets the preview image that is displayed for the video. */
+                previewImage: StoreImage;
+                /** Gets the URI of the video. */
+                uri: Windows.Foundation.Uri;
+                /** Gets the tag for the video. */
+                videoPurposeTag: string;
+                /** Gets the width of the video, in pixels. */
+                width: number;
+            }
+        }
     }
     /** Provides classes for managing files, folders, and application settings. */
     namespace Storage {
diff --git a/types/winrt-uwp/tslint.json b/types/winrt-uwp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/winrt-uwp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winrt/tslint.json b/types/winrt/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/winrt/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winston-dynamodb/tslint.json b/types/winston-dynamodb/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/winston-dynamodb/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/winston/index.d.ts b/types/winston/index.d.ts
index b4c888965a..3de43e4349 100644
--- a/types/winston/index.d.ts
+++ b/types/winston/index.d.ts
@@ -242,10 +242,7 @@ declare namespace winston {
         level?: string;
         levels?: AbstractConfigSetLevels;
 
-        /**
-         * @type {(boolean|(err: Error) => void)}
-         */
-        exitOnError?: any;
+        exitOnError?: boolean | ((err: Error) => void);
 
         // TODO: Need to make instances specific,
         //       and need to get options for each instance.
diff --git a/types/wiredep/tsconfig.json b/types/wiredep/tsconfig.json
index abf8541ebd..f7f4e66431 100644
--- a/types/wiredep/tsconfig.json
+++ b/types/wiredep/tsconfig.json
@@ -12,11 +12,6 @@
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [
-                "q/v0"
-            ]
-        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/wiredep/tslint.json b/types/wiredep/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wiredep/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wiring-pi/tslint.json b/types/wiring-pi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wiring-pi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wnumb/index.d.ts b/types/wnumb/index.d.ts
index 664942b20e..03fd0c81af 100644
--- a/types/wnumb/index.d.ts
+++ b/types/wnumb/index.d.ts
@@ -1,86 +1,78 @@
-// Type definitions for nouislider v1.0.0
+// Type definitions for wnumb 1.0
 // Project: https://github.com/leongersen/wnumb
 // Definitions by: Corey Jepperson <https://github.com/acoreyj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare var wNumb: wNumb;
 
-interface wNumbOptions {
-    /**
-     *     decimals	The number of decimals to include in the result. Limited to 7.
-     */
-    decimals?: number;
-    /**
-     * The decimal separator.
-     * Defaults to '.' if thousand isn't already set to '.'.
-     */
-    mark?: string;
-    /**
-     * Separator for large numbers. For example: ' ' would result in a formatted number of 1 000 000.
-     */
-    thousand?: string;
-    /**
-     * A string to prepend to the number. Use cases include prefixing with money symbols such as '$' or '€'.
-     */
-    prefix?: string;
-    /**
-     * A number to append to a number. For example: ',-'.
-     */
-    postfix?: string;
-    /**
-     * The prefix for negative values. Defaults to '-' if negativeBefore isn't set.
-     */
-    negative?: string;
-    /**
-     * The prefix for a negative number. Inserted before prefix.
-     */
-    negativeBefore?: string;
-    /**This is a powerful option to manually modify the slider output.
-     *
-     *For example, to show a number in another currency:
-     * function( value ){
-     *  return value * 1.32;
-     * }
-     */
-    encoder?: (value: number) => number;
-    /**
-     * Reverse the operations set in encoder.
-     * Use this option to undo modifications made while encoding the value.
-     * function( value ){
-     * return value / 1.32;
-     * }
-     */
-    decoder?: (value: number) => number;
-    /**
-     * Similar to encoder, but applied after all other formatting options are applied.
-     */
-    edit?: (value: number) => number;
-    /**
-     * Similar to decoder and the reverse for edit.
-     * Applied before all other formatting options are applied.
-     */
-    undo?: (value: number) => number;
-}
+/**
+ * Create a wNumb
+ */
+declare function wNumb(options?: wNumb.Options): wNumb.Instance;
 
+declare namespace wNumb {
+    interface Options {
+        /** The number of decimals to include in the result. Limited to 7. */
+        decimals?: number;
+        /**
+         * The decimal separator.
+         * Defaults to '.' if thousand isn't already set to '.'.
+         */
+        mark?: string;
+        /**
+         * Separator for large numbers. For example: ' ' would result in a formatted number of 1 000 000.
+         */
+        thousand?: string;
+        /**
+         * A string to prepend to the number. Use cases include prefixing with money symbols such as '$' or '€'.
+         */
+        prefix?: string;
+        /**
+         * A number to append to a number. For example: ',-'.
+         */
+        postfix?: string;
+        /**
+         * The prefix for negative values. Defaults to '-' if negativeBefore isn't set.
+         */
+        negative?: string;
+        /**
+         * The prefix for a negative number. Inserted before prefix.
+         */
+        negativeBefore?: string;
+        /**
+         * This is a powerful option to manually modify the slider output.
+         *
+         * For example, to show a number in another currency:
+         * function( value ){
+         *  return value * 1.32;
+         * }
+         */
+        encoder?: (value: number) => number;
+        /**
+         * Reverse the operations set in encoder.
+         * Use this option to undo modifications made while encoding the value.
+         * function( value ){
+         *   return value / 1.32;
+         * }
+         */
+        decoder?: (value: number) => number;
+        /**
+         * Similar to encoder, but applied after all other formatting options are applied.
+         */
+        edit?: (value: number) => number;
+        /**
+         * Similar to decoder and the reverse for edit.
+         * Applied before all other formatting options are applied.
+         */
+        undo?: (value: number) => number;
+    }
 
-interface wNumb {
-    /**
-     * Create a wNumb
-     *
-     * @param options - the options
-     */
-    (options?: wNumbOptions): wNumbInstance;
-}
-
-interface wNumbInstance {
-
-
-
-    /**
-     * format to string
-     */
-    to(val: number): string;
-    /**
-     * get number from formatted string
-     */
-    from(val: string): number;
+    interface Instance {
+        /**
+         * format to string
+         */
+        to(val: number): string;
+        /**
+         * get number from formatted string
+         */
+        from(val: string): number;
+    }
 }
diff --git a/types/wnumb/tslint.json b/types/wnumb/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wnumb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wnumb/wnumb-tests.ts b/types/wnumb/wnumb-tests.ts
index 31989e6127..be34fb98bb 100644
--- a/types/wnumb/wnumb-tests.ts
+++ b/types/wnumb/wnumb-tests.ts
@@ -1,18 +1,15 @@
-
-
-
-var moneyFormat = wNumb({
+const moneyFormat = wNumb({
 	mark: '.',
 	thousand: ',',
 	prefix: '$ ',
 	postfix: ' p.p.'
 });
 
-moneyFormat.to( 301980.62 );
+moneyFormat.to(301980.62);
 
-moneyFormat.from( '$ 301,980.62 p.p.' );
+moneyFormat.from('$ 301,980.62 p.p.');
 
-var Format = wNumb({
+let Format = wNumb({
 	prefix: '$ ',
 	decimals: 3,
 	thousand: ','
@@ -20,12 +17,8 @@ var Format = wNumb({
 
 Format = wNumb({
 	thousand: '.',
-	encoder: function( a ){
-		return a * 1E7;
-	},
-	decoder: function( a ){
-		return a / 1E7;
-	}
+	encoder: a => a * 1E7,
+	decoder: a => a / 1E7,
 });
 
 Format = wNumb({
@@ -34,9 +27,7 @@ Format = wNumb({
 	thousand: ','
 });
 
-
 Format = wNumb({
 	prefix: '$',
 	negativeBefore: '[NEGATIVE] '
 });
-
diff --git a/types/wolfy87-eventemitter/index.d.ts b/types/wolfy87-eventemitter/index.d.ts
deleted file mode 100644
index 8932d8db7a..0000000000
--- a/types/wolfy87-eventemitter/index.d.ts
+++ /dev/null
@@ -1,509 +0,0 @@
-// Type definitions for wolfy87-eventemitter v4.2.9
-// Project: https://github.com/Wolfy87/EventEmitter
-// Definitions by: ryiwamoto <https://github.com/ryiwamoto>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class EventEmitter extends Wolfy87EventEmitter.EventEmitter {}
-export = EventEmitter;
-export as namespace EventEmitter;
-
-declare namespace Wolfy87EventEmitter {
-
-    /**
-     * Hash Object for manipulating multiple events.
-     */
-    interface MultipleEvents {
-        [event: string]: any //Function | Function[]
-    }
-
-    /**
-     * Class for managing events.
-     * Can be extended to provide event functionality in other classes.
-     *
-     * @class EventEmitter Manages event registering and emitting.
-     */
-    export class EventEmitter {
-        /**
-         * Reverts the global {@link EventEmitter} to its previous value and returns a reference to this version.
-         * @return {Function} Non conflicting EventEmitter class.
-         */
-        static noConflict(): typeof EventEmitter;
-
-        /**
-         * Returns the listener array for the specified event.
-         * Will initialise the event object and listener arrays if required.
-         * Will return an object if you use a regex search. The object contains keys for each matched event.
-         * So /ba[rz]/ might return an object containing bar and baz.
-         * But only if you have either defined them with defineEvent or added some listeners to them.
-         * Each property in the object response is an array of listener functions.
-         *
-         * @param {string|RegExp} event Name of the event to return the listeners from.
-         * @return {Function[|Object]} All listener functions for the event.
-         */
-        getListeners(event: string): Function[];
-
-        /**
-         * Returns the listener array for the specified event.
-         * Will initialise the event object and listener arrays if required.
-         * Will return an object if you use a regex search. The object contains keys for each matched event.
-         * So /ba[rz]/ might return an object containing bar and baz.
-         * But only if you have either defined them with defineEvent or added some listeners to them.
-         * Each property in the object response is an array of listener functions.
-         *
-         * @param {string|RegExp} event Name of the event to return the listeners from.
-         * @return {Function[]|Object} All listener functions for the event.
-         */
-        getListeners(event: RegExp): {[event:string]: Function};
-
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListener(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListener(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        on(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        on(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Takes a list of listener objects and flattens it into a list of listener functions.
-         *
-         * @param {Object[]} listeners Raw listener objects.
-         * @return {Function[]} Just the listener functions.
-         */
-        flattenListeners(listeners: {listener: Function}[]): Function[];
-
-        /**
-         * Fetches the requested listeners via getListeners but will always return the results inside an object.
-         * This is mainly for internal use but others may find it useful.
-         *
-         * @param event {string|RegExp} Name of the event to return the listeners from.
-         * @return {Object} All listener functions for an event in object
-         */
-        getListenersAsObject(event: string): {[event:string]: Function};
-
-        /**
-         * Fetches the requested listeners via getListeners but will always return the results inside an object.
-         * This is mainly for internal use but others may find it useful.
-         *
-         * @param event {string|RegExp} Name of the event to return the listeners from.
-         * @return {Object} All listener functions for an event in object
-         */
-        getListenersAsObject(event: RegExp): {[event:string]: Function};
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addOnceListener(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addOnceListener(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        once(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        once(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Defines an event name.
-         * This is required if you want to use a regex to add a listener to multiple events at once.
-         * If you don't do this then how do you expect it to know what event to add to?
-         * Should it just add to every possible match for a regex? No. That is scary and bad.
-         * You need to tell it what event names should be matched by a regex.
-         *
-         * @param {string} event Name of the event to create.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        defineEvent(event: string): EventEmitter;
-
-        /**
-         * Defines an event name.
-         * This is required if you want to use a regex to add a listener to multiple events at once.
-         * If you don't do this then how do you expect it to know what event to add to?
-         * Should it just add to every possible match for a regex? No. That is scary and bad.
-         * You need to tell it what event names should be matched by a regex.
-         *
-         * @param {string[]} events Name of the event to create.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        defineEvents(events: string[]): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListener(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListener(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        off(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        off(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Adds listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can add to multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added.
-         * You can also pass it a regular expression to add the array of listeners to all events that match it.
-         * Yeah, this function does quite a bit. That's probably a bad thing.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add to multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListeners(event: string, listeners: Function[]): EventEmitter;
-
-        /**
-         * Adds listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can add to multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added.
-         * You can also pass it a regular expression to add the array of listeners to all events that match it.
-         * Yeah, this function does quite a bit. That's probably a bad thing.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add to multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListeners(event: RegExp, listeners: Function[]): EventEmitter;
-
-        /**
-         * Adds listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can add to multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added.
-         * You can also pass it a regular expression to add the array of listeners to all events that match it.
-         * Yeah, this function does quite a bit. That's probably a bad thing.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add to multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListeners(event: MultipleEvents): EventEmitter;
-
-        /**
-         * Removes listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be removed.
-         * You can also pass it a regular expression to remove the listeners from all events that match it.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListeners(event: string, listeners: Function[]): EventEmitter;
-
-        /**
-         * Removes listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be removed.
-         * You can also pass it a regular expression to remove the listeners from all events that match it.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListeners(event: RegExp, listeners: Function[]): EventEmitter;
-
-        /**
-         * Removes listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be removed.
-         * You can also pass it a regular expression to remove the listeners from all events that match it.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListeners(event: MultipleEvents): EventEmitter;
-
-        /**
-         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
-         * You should really use those instead, this is a little lower level.
-         * The first argument will determine if the listeners are removed (true) or added (false).
-         * If you pass an object as the second argument you can add/remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added/removed.
-         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
-         *
-         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add/remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        manipulateListeners(remove: boolean, event: string, listeners: Function[]): EventEmitter;
-
-        /**
-         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
-         * You should really use those instead, this is a little lower level.
-         * The first argument will determine if the listeners are removed (true) or added (false).
-         * If you pass an object as the second argument you can add/remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added/removed.
-         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
-         *
-         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add/remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        manipulateListeners(remove: boolean, event: RegExp, listeners: Function[]): EventEmitter;
-
-        /**
-         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
-         * You should really use those instead, this is a little lower level.
-         * The first argument will determine if the listeners are removed (true) or added (false).
-         * If you pass an object as the second argument you can add/remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added/removed.
-         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
-         *
-         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add/remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        manipulateListeners(remove: boolean, event: MultipleEvents): EventEmitter;
-
-        /**
-         * Removes all listeners from a specified event.
-         * If you do not specify an event then all listeners will be removed.
-         * That means every event will be emptied.
-         * You can also pass a regex to remove all events that match it.
-         *
-         * @param {String|RegExp} [event] Optional name of the event to remove all listeners for.
-         * Will remove from every event if not passed.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeEvent(event?: string): EventEmitter;
-
-        /**
-         * Removes all listeners from a specified event.
-         * If you do not specify an event then all listeners will be removed.
-         * That means every event will be emptied.
-         * You can also pass a regex to remove all events that match it.
-         *
-         * @param {String|RegExp} [event] Optional name of the event to remove all listeners for.
-         * Will remove from every event if not passed.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeEvent(event?: RegExp): EventEmitter;
-
-        /**
-         * Alias of removeEvent.
-         *
-         * Added to mirror the node API.
-         */
-        removeAllListeners(event?: string): EventEmitter;
-
-        /**
-         * Alias of removeEvent.
-         *
-         * Added to mirror the node API.
-         */
-        removeAllListeners(event?: RegExp): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emitEvent(event: string, ...args: any[]): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emitEvent(event: RegExp, ...args: any[]): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        trigger(event: string, ...args: any[]): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        trigger(event: RegExp, ...args: any[]): EventEmitter;
-
-        /**
-         * Subtly different from emitEvent in that it will pass its arguments on to the listeners,
-         * as opposed to taking a single array of arguments to pass on.
-         * As with emitEvent, you can pass a regex in place of the event name to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {... any[]} args Optional additional arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emit(event: string, ...args: any[]): EventEmitter;
-
-        /**
-         * Subtly different from emitEvent in that it will pass its arguments on to the listeners,
-         * as opposed to taking a single array of arguments to pass on.
-         * As with emitEvent, you can pass a regex in place of the event name to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {... any[]} args Optional additional arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emit(event: RegExp, ...args: any[]): EventEmitter;
-
-        /**
-         * Sets the current value to check against when executing listeners. If a
-         * listeners return value matches the one set here then it will be removed
-         * after execution. This value defaults to true.
-         *
-         * @param {any} value The new value to check for when executing listeners.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        setOnceReturnValue(value: any): EventEmitter;
-    }
-}
diff --git a/types/wolfy87-eventemitter/tsconfig.json b/types/wolfy87-eventemitter/tsconfig.json
deleted file mode 100644
index 9ab352c8d4..0000000000
--- a/types/wolfy87-eventemitter/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "wolfy87-eventemitter-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/wolfy87-eventemitter/wolfy87-eventemitter-tests.ts b/types/wolfy87-eventemitter/wolfy87-eventemitter-tests.ts
deleted file mode 100644
index b521f773bf..0000000000
--- a/types/wolfy87-eventemitter/wolfy87-eventemitter-tests.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import EventEmitter = require("wolfy87-eventemitter");
-
-var emitter = new EventEmitter();
-
-var listener = function (value: any) {
-    console.log("The event was raised.");
-};
-
-function testGetListeners() {
-    var listeners: Function[] = emitter.getListeners("foo");
-    var listenersSearchedByRegexp: {[key:string]: Function} = emitter.getListeners(/^foo/);
-}
-
-function testFlattenListeners() {
-    var listeners: Function[] = emitter.flattenListeners([{listener: listener}]);
-}
-
-function testGetListenersAsObject() {
-    emitter.getListenersAsObject("foo");
-    emitter.getListenersAsObject(/^foo/);
-}
-
-function testAddListener() {
-    var e = emitter
-        .addListener("foo", listener)
-        .addListener(/^foo/, listener);
-}
-
-function testOn() {
-    var e = emitter
-        .on("foo", listener)
-        .on(/^foo/, listener);
-}
-
-function testAddOnceListener() {
-    var e = emitter
-        .addOnceListener("foo", listener)
-        .addOnceListener(/^foo/, listener);
-}
-
-function testOnce() {
-    var e = emitter
-        .once("foo", listener)
-        .once(/^foo/, listener);
-}
-
-function testDefineEvent() {
-    var e = emitter.defineEvent("foo");
-}
-
-function testDefineEvents() {
-    var e = emitter.defineEvents(["foo", "bar"]);
-}
-
-function testAddListeners() {
-    var e = emitter
-        .addListeners("foo", [listener])
-        .addListeners({
-            "foo": listener,
-            "bar": [listener]
-        });
-}
-
-function testRemoveListeners() {
-    var e = emitter
-        .removeListeners("foo", [listener])
-        .removeListeners({
-            "foo": listener,
-            "bar": [listener]
-        });
-}
-
-function testRemoveListener() {
-    var e = emitter.removeListener("foo", listener);
-}
-
-function testManipulateListeners() {
-    var e = emitter
-        .manipulateListeners(true, "foo", [listener])
-        .manipulateListeners(true, {
-            "foo": listener
-        });
-}
-
-function testRemoveEvent() {
-    var e = emitter.removeEvent("foo").removeEvent();
-}
-
-function testEmitEvent() {
-    var e = emitter.emitEvent("foo", ["arg1", "arg2"]).emitEvent("foo");
-}
-
-function testTrigger() {
-    var e = emitter.trigger("foo", ["arg1", "arg2"]).trigger("foo");
-}
-
-function testEmit() {
-    var e = emitter.emit("foo", ["arg1", "arg2"]).emit("foo");
-}
-
-function testSetOnceReturnValue() {
-    var e = emitter.setOnceReturnValue(false);
-}
-
-function testNoConflict() {
-    var NoConflictEventEmitter = EventEmitter.noConflict();
-    var e = new NoConflictEventEmitter();
-}
diff --git a/types/wonder-commonlib/index.d.ts b/types/wonder-commonlib/index.d.ts
deleted file mode 100644
index 267d86538d..0000000000
--- a/types/wonder-commonlib/index.d.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-// Type definitions for wonder-commonlib 0.2.0
-// Project: https://github.com/yyc-git/Wonder-CommonLib
-// Definitions by: YYC <https://github.com/yyc-git>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference types="node" />
-
-// Generated by dts-bundle v0.7.2
-
-declare module 'wonder-commonlib/dist/es2015' {
-    export { Collection } from "wonder-commonlib/dist/es2015/Collection";
-    export { $BREAK, $REMOVE } from "wonder-commonlib/dist/es2015/global/Const";
-    export { root } from "wonder-commonlib/dist/es2015/global/Variable";
-    export { Hash } from "wonder-commonlib/dist/es2015/Hash";
-    export { List } from "wonder-commonlib/dist/es2015/List";
-    export { Log } from "wonder-commonlib/dist/es2015/Log";
-    export { Queue } from "wonder-commonlib/dist/es2015/Queue";
-    export { Stack } from "wonder-commonlib/dist/es2015/Stack";
-    export { AjaxUtils } from "wonder-commonlib/dist/es2015/utils/AjaxUtils";
-    export { ArrayUtils } from "wonder-commonlib/dist/es2015/utils/ArrayUtils";
-    export { ConvertUtils } from "wonder-commonlib/dist/es2015/utils/ConvertUtils";
-    export { DomQuery } from "wonder-commonlib/dist/es2015/utils/DomQuery";
-    export { EventUtils } from "wonder-commonlib/dist/es2015/utils/EventUtils";
-    export { ExtendUtils } from "wonder-commonlib/dist/es2015/utils/ExtendUtils";
-    export { FunctionUtils } from "wonder-commonlib/dist/es2015/utils/FunctionUtils";
-    export { JudgeUtils } from "wonder-commonlib/dist/es2015/utils/JudgeUtils";
-    export { PathUtils } from "wonder-commonlib/dist/es2015/utils/PathUtils";
-}
-
-declare module 'wonder-commonlib/dist/es2015/Collection' {
-    import { List } from "wonder-commonlib/dist/es2015/List";
-    export class Collection<T> extends List<T> {
-        static create<T>(children?: any[]): Collection<T>;
-        constructor(children?: Array<T>);
-        clone(): any;
-        clone(isDeep: boolean): any;
-        clone(target: Collection<T>): any;
-        clone(target: Collection<T>, isDeep: boolean): any;
-        filter(func: (value: T, index: number) => boolean): Collection<T>;
-        findOne(func: (value: T, index: number) => boolean): T;
-        reverse(): Collection<T>;
-        removeChild(arg: any): Collection<T>;
-        sort(func: (a: T, b: T) => any, isSortSelf?: boolean): Collection<T>;
-        map(func: (value: T, index: number) => any): Collection<any>;
-        removeRepeatItems(): Collection<T>;
-        hasRepeatItems(): boolean;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/global/Const' {
-    export const $BREAK: {
-        break: boolean;
-    };
-    export const $REMOVE: any;
-}
-
-declare module 'wonder-commonlib/dist/es2015/global/Variable' {
-    export var root: any;
-}
-
-declare module 'wonder-commonlib/dist/es2015/Hash' {
-    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
-    export class Hash<T> {
-        static create<T>(children?: {}): Hash<T>;
-        constructor(children?: {
-            [s: string]: T;
-        });
-        getChildren(): {
-            [s: string]: T;
-        };
-        getCount(): number;
-        getKeys(): Collection<string>;
-        getValues(): Collection<T>;
-        getChild(key: string): T;
-        setValue(key: string, value: any): this;
-        addChild(key: string, value: any): this;
-        addChildren(arg: {} | Hash<T>): this;
-        appendChild(key: string, value: any): this;
-        setChildren(children: {
-            [s: string]: T;
-        }): void;
-        removeChild(arg: any): Collection<T>;
-        removeAllChildren(): void;
-        hasChild(key: string): boolean;
-        hasChildWithFunc(func: Function): boolean;
-        forEach(func: Function, context?: any): this;
-        filter(func: Function): Hash<T>;
-        findOne(func: Function): any[];
-        map(func: Function): Hash<T>;
-        toCollection(): Collection<any>;
-        toArray(): Array<T>;
-        clone(): any;
-        clone(isDeep: boolean): any;
-        clone(target: Hash<T>): any;
-        clone(target: Hash<T>, isDeep: boolean): any;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/List' {
-    export class List<T> {
-        protected children: Array<T>;
-        getCount(): number;
-        hasChild(child: any): boolean;
-        hasChildWithFunc(func: Function): boolean;
-        getChildren(): T[];
-        getChild(index: number): T;
-        addChild(child: T): this;
-        addChildren(arg: Array<T> | List<T> | any): this;
-        setChildren(children: Array<T>): this;
-        unShiftChild(child: T): void;
-        removeAllChildren(): this;
-        forEach(func: Function, context?: any): this;
-        toArray(): T[];
-        protected copyChildren(): T[];
-        protected removeChildHelper(arg: any): Array<T>;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/Log' {
-    export class Log {
-        static info: {
-            INVALID_PARAM: string;
-            helperFunc: (...args: any[]) => string;
-            assertion: (...args: any[]) => any;
-            FUNC_INVALID: (...args: any[]) => any;
-            FUNC_MUST: (...args: any[]) => any;
-            FUNC_MUST_BE: (...args: any[]) => any;
-            FUNC_MUST_NOT_BE: (...args: any[]) => any;
-            FUNC_SHOULD: (...args: any[]) => any;
-            FUNC_SHOULD_NOT: (...args: any[]) => any;
-            FUNC_SUPPORT: (...args: any[]) => any;
-            FUNC_NOT_SUPPORT: (...args: any[]) => any;
-            FUNC_MUST_DEFINE: (...args: any[]) => any;
-            FUNC_MUST_NOT_DEFINE: (...args: any[]) => any;
-            FUNC_UNKNOW: (...args: any[]) => any;
-            FUNC_EXPECT: (...args: any[]) => any;
-            FUNC_UNEXPECT: (...args: any[]) => any;
-            FUNC_EXIST: (...args: any[]) => any;
-            FUNC_NOT_EXIST: (...args: any[]) => any;
-            FUNC_ONLY: (...args: any[]) => any;
-            FUNC_CAN_NOT: (...args: any[]) => any;
-        };
-        static log(...messages: any[]): void;
-        static assert(cond: any, ...messages: any[]): void;
-        static error(cond: any, ...message: any[]): any;
-        static warn(...message: any[]): void;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/Queue' {
-    import { List } from "wonder-commonlib/dist/es2015/List";
-    export class Queue<T> extends List<T> {
-        static create<T>(children?: any[]): Queue<T>;
-        constructor(children?: Array<T>);
-        readonly front: T;
-        readonly rear: T;
-        push(element: T): void;
-        pop(): T;
-        clear(): void;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/Stack' {
-    import { List } from "wonder-commonlib/dist/es2015/List";
-    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
-    export class Stack<T> extends List<T> {
-        static create<T>(children?: any[]): Stack<T>;
-        constructor(children?: Array<T>);
-        readonly top: T;
-        push(element: T): void;
-        pop(): T;
-        clear(): void;
-        clone(): any;
-        clone(isDeep: boolean): any;
-        clone(target: Stack<T>): any;
-        clone(target: Stack<T>, isDeep: boolean): any;
-        filter(func: (value: T, index: number) => boolean): Collection<T>;
-        findOne(func: (value: T, index: number) => boolean): T;
-        reverse(): Collection<T>;
-        removeChild(arg: any): Collection<T>;
-        sort(func: (a: T, b: T) => any, isSortSelf?: boolean): Collection<T>;
-        map(func: (value: T, index: number) => any): Collection<any>;
-        removeRepeatItems(): Collection<T>;
-        hasRepeatItems(): boolean;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/AjaxUtils' {
-    export class AjaxUtils {
-        static ajax(conf: any): void;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/ArrayUtils' {
-    export class ArrayUtils {
-        static removeRepeatItems(arr: Array<any>, isEqual?: (a: any, b: any) => boolean): any[];
-        static contain(arr: Array<any>, ele: any): boolean;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/ConvertUtils' {
-    export class ConvertUtils {
-        static toString(obj: any): string;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/DomQuery' {
-    export class DomQuery {
-        static create(eleStr: string): any;
-        static create(dom: HTMLElement): any;
-        constructor(eleStr: string);
-        constructor(dom: HTMLElement);
-        get(index: any): HTMLElement;
-        prepend(eleStr: string): any;
-        prepend(dom: HTMLElement): any;
-        prependTo(eleStr: string): this;
-        remove(): this;
-        css(property: string, value: string): void;
-        attr(name: string): any;
-        attr(name: string, value: string): any;
-        text(str?: string): string;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/EventUtils' {
-    export class EventUtils {
-        static bindEvent(context: any, func: any): (event: any) => any;
-        static addEvent(dom: any, eventName: any, handler: any): void;
-        static removeEvent(dom: any, eventName: any, handler: any): void;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/ExtendUtils' {
-    export class ExtendUtils {
-        static extendDeep(parent: any, child?: any, filter?: (val: any, i: any) => boolean): any;
-        static extend(destination: any, source: any): any;
-        static copyPublicAttri(source: any): {};
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/FunctionUtils' {
-    export class FunctionUtils {
-        static bind(object: any, func: Function): () => any;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/JudgeUtils' {
-    export class JudgeUtils {
-        static isArray(arr: any): boolean;
-        static isArrayExactly(arr: any): boolean;
-        static isNumber(num: any): boolean;
-        static isNumberExactly(num: any): boolean;
-        static isString(str: any): boolean;
-        static isStringExactly(str: any): boolean;
-        static isBoolean(bool: any): boolean;
-        static isDom(obj: any): boolean;
-        static isObject(obj: any): boolean;
-        static isDirectObject(obj: any): boolean;
-        static isHostMethod(object: any, property: any): boolean;
-        static isNodeJs(): boolean;
-        static isFunction(func: any): boolean;
-    }
-}
-
-declare module 'wonder-commonlib/dist/es2015/utils/PathUtils' {
-    export class PathUtils {
-        static basename(path: string, ext?: string): string;
-        static changeExtname(pathStr: string, extname: string): string;
-        static changeBasename(pathStr: string, basename: string, isSameExt?: boolean): string;
-        static extname(path: string): string;
-        static dirname(path: string): string;
-    }
-}
-
diff --git a/types/wonder-commonlib/tsconfig.json b/types/wonder-commonlib/tsconfig.json
deleted file mode 100644
index 960dbbaa5c..0000000000
--- a/types/wonder-commonlib/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "wonder-commonlib-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/wonder-commonlib/wonder-commonlib-tests.ts b/types/wonder-commonlib/wonder-commonlib-tests.ts
deleted file mode 100644
index 602be32a6b..0000000000
--- a/types/wonder-commonlib/wonder-commonlib-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Collection } from "wonder-commonlib/dist/es2015/Collection";
-
-var list = Collection.create();
-
-list.addChild(1);
-
-
diff --git a/types/wonder-frp/index.d.ts b/types/wonder-frp/index.d.ts
deleted file mode 100644
index e68e019ead..0000000000
--- a/types/wonder-frp/index.d.ts
+++ /dev/null
@@ -1,889 +0,0 @@
-// Type definitions for wonder-frp 0.2.0
-// Project: https://github.com/yyc-git/Wonder-FRP
-// Definitions by: YYC <https://github.com/yyc-git>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="wonder-commonlib" />
-/// <reference types="node" />
-
-// Generated by dts-bundle v0.7.2
-// Dependencies for this module:
-//   ../../wonder-commonlib/dist/es2015/utils/JudgeUtils
-//   ../../wonder-commonlib/dist/es2015/Collection
-
-declare module 'wonder-frp/dist/es2015' {
-    export { JudgeUtils } from "wonder-frp/dist/es2015/JudgeUtils";
-    export { fromNodeCallback, fromStream, fromReadableStream, fromWritableStream, fromTransformStream } from "wonder-frp/dist/es2015/binding/nodejs/NodeOperator";
-    export { Entity } from "wonder-frp/dist/es2015/core/Entity";
-    export { Main } from "wonder-frp/dist/es2015/core/Main";
-    export { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    export { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    export { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    export { assert, requireCheck, ensure, requireGetter, requireSetter, ensureGetter, ensureSetter, invariant } from "wonder-frp/dist/es2015/definition/typescript/decorator/contract";
-    export { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export { InnerSubscription } from "wonder-frp/dist/es2015/Disposable/InnerSubscription";
-    export { InnerSubscriptionGroup } from "wonder-frp/dist/es2015/Disposable/InnerSubscriptionGroup";
-    export { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export { FilterState } from "wonder-frp/dist/es2015/enum/FilterState";
-    export { createStream, fromArray, fromPromise, fromEventPattern, interval, intervalRequest, timeout, empty, callFunc, judge, defer, just } from "wonder-frp/dist/es2015/global/Operator";
-    export { root } from "wonder-frp/dist/es2015/global/Variable";
-    export { AnonymousObserver } from "wonder-frp/dist/es2015/observer/AnonymousObserver";
-    export { AutoDetachObserver } from "wonder-frp/dist/es2015/observer/AutoDetachObserver";
-    export { ConcatObserver } from "wonder-frp/dist/es2015/observer/ConcatObserver";
-    export { DoObserver } from "wonder-frp/dist/es2015/observer/DoObserver";
-    export { FilterObserver } from "wonder-frp/dist/es2015/observer/FilterObserver";
-    export { FilterWithStateObserver } from "wonder-frp/dist/es2015/observer/FilterWithStateObserver";
-    export { IgnoreElementsObserver } from "wonder-frp/dist/es2015/observer/IgnoreElementsObserver";
-    export { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export { ISubjectObserver } from "wonder-frp/dist/es2015/observer/ISubjectObserver";
-    export { MapObserver } from "wonder-frp/dist/es2015/observer/MapObserver";
-    export { MergeAllObserver } from "wonder-frp/dist/es2015/observer/MergeAllObserver";
-    export { MergeObserver } from "wonder-frp/dist/es2015/observer/MergeObserver";
-    export { SkipUntilOtherObserver } from "wonder-frp/dist/es2015/observer/SkipUntilOtherObserver";
-    export { SkipUntilSourceObserver } from "wonder-frp/dist/es2015/observer/SkipUntilSourceObserver";
-    export { SubjectObserver } from "wonder-frp/dist/es2015/observer/SubjectObserver";
-    export { TakeUntilObserver } from "wonder-frp/dist/es2015/observer/TakeUntilObserver";
-    export { AnonymousStream } from "wonder-frp/dist/es2015/stream/AnonymousStream";
-    export { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    export { ConcatStream } from "wonder-frp/dist/es2015/stream/ConcatStream";
-    export { DeferStream } from "wonder-frp/dist/es2015/stream/DeferStream";
-    export { DoStream } from "wonder-frp/dist/es2015/stream/DoStream";
-    export { FilterStream } from "wonder-frp/dist/es2015/stream/FilterStream";
-    export { FilterWithStateStream } from "wonder-frp/dist/es2015/stream/FilterWithStateStream";
-    export { FromArrayStream } from "wonder-frp/dist/es2015/stream/FromArrayStream";
-    export { FromEventPatternStream } from "wonder-frp/dist/es2015/stream/FromEventPatternStream";
-    export { FromPromiseStream } from "wonder-frp/dist/es2015/stream/FromPromiseStream";
-    export { IgnoreElementsStream } from "wonder-frp/dist/es2015/stream/IgnoreElementsStream";
-    export { IntervalRequestStream } from "wonder-frp/dist/es2015/stream/IntervalRequestStream";
-    export { IntervalStream } from "wonder-frp/dist/es2015/stream/IntervalStream";
-    export { MapStream } from "wonder-frp/dist/es2015/stream/MapStream";
-    export { MergeAllStream } from "wonder-frp/dist/es2015/stream/MergeAllStream";
-    export { MergeStream } from "wonder-frp/dist/es2015/stream/MergeStream";
-    export { RepeatStream } from "wonder-frp/dist/es2015/stream/RepeatStream";
-    export { SkipUntilStream } from "wonder-frp/dist/es2015/stream/SkipUntilStream";
-    export { TakeUntilStream } from "wonder-frp/dist/es2015/stream/TakeUntilStream";
-    export { TimeoutStream } from "wonder-frp/dist/es2015/stream/TimeoutStream";
-    export { GeneratorSubject } from "wonder-frp/dist/es2015/subject/GeneratorSubject";
-    export { Subject } from "wonder-frp/dist/es2015/subject/Subject";
-    export { ActionType } from "wonder-frp/dist/es2015/testing/ActionType";
-    export { MockObserver } from "wonder-frp/dist/es2015/testing/MockObserver";
-    export { MockPromise } from "wonder-frp/dist/es2015/testing/MockPromise";
-    export { Record } from "wonder-frp/dist/es2015/testing/Record";
-    export { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
-    export { TestStream } from "wonder-frp/dist/es2015/testing/TestStream";
-    //import "./extend/root";
-    //import "./global/init";
-}
-
-declare module 'wonder-frp/dist/es2015/JudgeUtils' {
-    import { JudgeUtils as JudgeUtils$ } from "wonder-commonlib/dist/es2015/utils/JudgeUtils";
-    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class JudgeUtils extends JudgeUtils$ {
-        static isPromise(obj: any): boolean;
-        static isEqual(ob1: Entity, ob2: Entity): boolean;
-        static isIObserver(i: IObserver): () => any;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/binding/nodejs/NodeOperator' {
-    import { AnonymousStream } from "wonder-frp/dist/es2015/stream/AnonymousStream";
-    export var fromNodeCallback: (func: Function, context?: any) => (...funcArgs: any[]) => AnonymousStream;
-    export var fromStream: (stream: any, finishEventName?: string) => AnonymousStream;
-    export var fromReadableStream: (stream: any) => AnonymousStream;
-    export var fromWritableStream: (stream: any) => AnonymousStream;
-    export var fromTransformStream: (stream: any) => AnonymousStream;
-}
-
-declare module 'wonder-frp/dist/es2015/core/Entity' {
-    export abstract class Entity {
-        static UID: number;
-        uid: string;
-        constructor(uidPre: string);
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/core/Main' {
-    export class Main {
-        static isTest: boolean;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/core/Observer' {
-    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export abstract class Observer extends Entity implements IObserver {
-        isDisposed: boolean;
-        protected onUserNext: Function;
-        protected onUserError: Function;
-        protected onUserCompleted: Function;
-        constructor(observer: IObserver);
-        constructor(onNext: Function, onError: Function, onCompleted: Function);
-        next(value: any): any;
-        error(error: any): void;
-        completed(): void;
-        dispose(): void;
-        setDisposable(disposable: IDisposable): void;
-        protected abstract onNext(value: any): any;
-        protected abstract onError(error: any): any;
-        protected abstract onCompleted(): any;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/core/Scheduler' {
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class Scheduler {
-        static create(...args: any[]): Scheduler;
-        requestLoopId: any;
-        publishRecursive(observer: IObserver, initial: any, action: Function): void;
-        publishInterval(observer: IObserver, initial: any, interval: number, action: Function): number;
-        publishIntervalRequest(observer: IObserver, action: Function): void;
-        publishTimeout(observer: IObserver, time: number, action: Function): number;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/core/Stream' {
-    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export abstract class Stream extends Entity {
-        scheduler: Scheduler;
-        subscribeFunc: (observer: IObserver) => Function | void;
-        constructor(subscribeFunc: any);
-        abstract subscribe(arg1: Function | Observer | Subject, onError?: Function, onCompleted?: Function): IDisposable;
-        buildStream(observer: IObserver): IDisposable;
-        do(onNext?: Function, onError?: Function, onCompleted?: Function): any;
-        map(selector: Function): any;
-        flatMap(selector: Function): any;
-        concatMap(selector: Function): any;
-        mergeAll(): any;
-        concatAll(): any;
-        skipUntil(otherStream: Stream): any;
-        takeUntil(otherStream: Stream): any;
-        take(count?: number): any;
-        takeLast(count?: number): any;
-        takeWhile(predicate: (value: any, index: number, source: Stream) => boolean, thisArg?: this): any;
-        lastOrDefault(defaultValue?: any): any;
-        filter(predicate: (value: any) => boolean, thisArg?: this): any;
-        filterWithState(predicate: (value: any) => boolean, thisArg?: this): any;
-        concat(streamArr: Array<Stream>): any;
-        concat(...otherStream: any[]): any;
-        merge(maxConcurrent: number): any;
-        merge(streamArr: Array<Stream>): any;
-        merge(...otherStreams: any[]): any;
-        repeat(count?: number): any;
-        ignoreElements(): any;
-        protected handleSubject(subject: any): boolean;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/definition/typescript/decorator/contract' {
-    export function assert(cond: boolean, message?: string): void;
-    export function requireCheck(InFunc: any): (target: any, name: any, descriptor: any) => any;
-    export function ensure(OutFunc: any): (target: any, name: any, descriptor: any) => any;
-    export function requireGetter(InFunc: any): (target: any, name: any, descriptor: any) => any;
-    export function requireSetter(InFunc: any): (target: any, name: any, descriptor: any) => any;
-    export function ensureGetter(OutFunc: any): (target: any, name: any, descriptor: any) => any;
-    export function ensureSetter(OutFunc: any): (target: any, name: any, descriptor: any) => any;
-    export function invariant(func: any): (target: any) => void;
-}
-
-declare module 'wonder-frp/dist/es2015/Disposable/GroupDisposable' {
-    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class GroupDisposable extends Entity implements IDisposable {
-        static create(disposable?: IDisposable): GroupDisposable;
-        constructor(disposable?: IDisposable);
-        add(disposable: IDisposable): this;
-        remove(disposable: IDisposable): this;
-        dispose(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/Disposable/IDisposable' {
-    export interface IDisposable {
-        dispose(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/Disposable/InnerSubscription' {
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
-    import { GeneratorSubject } from "wonder-frp/dist/es2015/subject/GeneratorSubject";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    export class InnerSubscription implements IDisposable {
-        static create(subject: Subject | GeneratorSubject, observer: Observer): InnerSubscription;
-        constructor(subject: Subject | GeneratorSubject, observer: Observer);
-        dispose(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/Disposable/InnerSubscriptionGroup' {
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class InnerSubscriptionGroup implements IDisposable {
-        static create(): InnerSubscriptionGroup;
-        addChild(child: IDisposable): void;
-        dispose(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/Disposable/SingleDisposable' {
-    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class SingleDisposable extends Entity implements IDisposable {
-        static create(disposeHandler?: Function): SingleDisposable;
-        constructor(disposeHandler: Function);
-        setDisposeHandler(handler: Function): void;
-        dispose(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/enum/FilterState' {
-    export enum FilterState {
-        TRIGGER = 0,
-        ENTER = 1,
-        LEAVE = 2,
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/global/Operator' {
-    import { AnonymousStream } from "wonder-frp/dist/es2015/stream/AnonymousStream";
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { FromArrayStream } from "wonder-frp/dist/es2015/stream/FromArrayStream";
-    import { FromPromiseStream } from "wonder-frp/dist/es2015/stream/FromPromiseStream";
-    import { FromEventPatternStream } from "wonder-frp/dist/es2015/stream/FromEventPatternStream";
-    import { IntervalStream } from "wonder-frp/dist/es2015/stream/IntervalStream";
-    import { IntervalRequestStream } from "wonder-frp/dist/es2015/stream/IntervalRequestStream";
-    import { TimeoutStream } from "wonder-frp/dist/es2015/stream/TimeoutStream";
-    import { DeferStream } from "wonder-frp/dist/es2015/stream/DeferStream";
-    export class Operator {
-        static empty(): AnonymousStream;
-        static createStream(subscribeFunc: any): AnonymousStream;
-        static fromArray(array: Array<any>, scheduler?: Scheduler): FromArrayStream;
-    }
-    export var createStream: typeof Operator.createStream;
-    export var empty: typeof Operator.empty;
-    export var fromArray: typeof Operator.fromArray;
-    export var fromPromise: (promise: any, scheduler?: Scheduler) => FromPromiseStream;
-    export var fromEventPattern: (addHandler: Function, removeHandler: Function) => FromEventPatternStream;
-    export var interval: (interval: any, scheduler?: Scheduler) => IntervalStream;
-    export var intervalRequest: (scheduler?: Scheduler) => IntervalRequestStream;
-    export var timeout: (time: any, scheduler?: Scheduler) => TimeoutStream;
-    export var callFunc: (func: Function, context?: any) => AnonymousStream;
-    export var judge: (condition: Function, thenSource: Function, elseSource: Function) => any;
-    export var defer: (buildStreamFunc: Function) => DeferStream;
-    export var just: (returnValue: any) => AnonymousStream;
-}
-
-declare module 'wonder-frp/dist/es2015/global/Variable' {
-    export var root: any;
-}
-
-declare module 'wonder-frp/dist/es2015/observer/AnonymousObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    export class AnonymousObserver extends Observer {
-        static create(onNext: Function, onError: Function, onCompleted: Function): AnonymousObserver;
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/AutoDetachObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class AutoDetachObserver extends Observer {
-        static create(observer: IObserver): any;
-        static create(onNext: Function, onError: Function, onCompleted: Function): any;
-        dispose(): void;
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/ConcatObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class ConcatObserver extends Observer {
-        static create(currentObserver: IObserver, startNextStream: Function): ConcatObserver;
-        protected currentObserver: any;
-        constructor(currentObserver: IObserver, startNextStream: Function);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/DoObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class DoObserver extends Observer {
-        static create(currentObserver: IObserver, prevObserver: IObserver): DoObserver;
-        constructor(currentObserver: IObserver, prevObserver: IObserver);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/FilterObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    export class FilterObserver extends Observer {
-        static create(prevObserver: IObserver, predicate: (value: any, index?: number, source?: Stream) => boolean, source: Stream): FilterObserver;
-        constructor(prevObserver: IObserver, predicate: (value: any) => boolean, source: Stream);
-        protected prevObserver: IObserver;
-        protected source: Stream;
-        protected i: number;
-        protected predicate: (value: any, index?: number, source?: Stream) => boolean;
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/FilterWithStateObserver' {
-    import { FilterObserver } from "wonder-frp/dist/es2015/observer/FilterObserver";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    export class FilterWithStateObserver extends FilterObserver {
-        static create(prevObserver: IObserver, predicate: (value: any, index?: number, source?: Stream) => boolean, source: Stream): FilterWithStateObserver;
-        protected onNext(value: any): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/IgnoreElementsObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class IgnoreElementsObserver extends Observer {
-        static create(currentObserver: IObserver): IgnoreElementsObserver;
-        constructor(currentObserver: IObserver);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/IObserver' {
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export interface IObserver extends IDisposable {
-        next(value: any): any;
-        error(error: any): any;
-        completed(): any;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/ISubjectObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    export interface ISubjectObserver {
-        addChild(observer: Observer): any;
-        removeChild(observer: Observer): any;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/MapObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class MapObserver extends Observer {
-        static create(currentObserver: IObserver, selector: Function): MapObserver;
-        constructor(currentObserver: IObserver, selector: Function);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/MergeAllObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class MergeAllObserver extends Observer {
-        static create(currentObserver: IObserver, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable): MergeAllObserver;
-        constructor(currentObserver: IObserver, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable);
-        done: boolean;
-        currentObserver: IObserver;
-        protected onNext(innerSource: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/MergeObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class MergeObserver extends Observer {
-        static create(currentObserver: IObserver, maxConcurrent: number, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable): MergeObserver;
-        constructor(currentObserver: IObserver, maxConcurrent: number, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable);
-        done: boolean;
-        currentObserver: IObserver;
-        activeCount: number;
-        q: Array<Stream>;
-        handleSubscribe(innerSource: any): void;
-        protected onNext(innerSource: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/SkipUntilOtherObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SkipUntilStream } from "wonder-frp/dist/es2015/stream/SkipUntilStream";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class SkipUntilOtherObserver extends Observer {
-        static create(prevObserver: IObserver, skipUntilStream: SkipUntilStream): SkipUntilOtherObserver;
-        otherDisposable: IDisposable;
-        constructor(prevObserver: IObserver, skipUntilStream: SkipUntilStream);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/SkipUntilSourceObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SkipUntilStream } from "wonder-frp/dist/es2015/stream/SkipUntilStream";
-    export class SkipUntilSourceObserver extends Observer {
-        static create(prevObserver: IObserver, skipUntilStream: SkipUntilStream): SkipUntilSourceObserver;
-        constructor(prevObserver: IObserver, skipUntilStream: SkipUntilStream);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/SubjectObserver' {
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    export class SubjectObserver implements IObserver {
-        observers: Collection<IObserver>;
-        isEmpty(): boolean;
-        next(value: any): void;
-        error(error: any): void;
-        completed(): void;
-        addChild(observer: Observer): void;
-        removeChild(observer: Observer): void;
-        dispose(): void;
-        setDisposable(disposable: IDisposable): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/observer/TakeUntilObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class TakeUntilObserver extends Observer {
-        static create(prevObserver: IObserver): TakeUntilObserver;
-        constructor(prevObserver: IObserver);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/AnonymousStream' {
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class AnonymousStream extends Stream {
-        static create(subscribeFunc: Function): AnonymousStream;
-        constructor(subscribeFunc: Function);
-        buildStream(observer: IObserver): IDisposable;
-        subscribe(subject: Subject): IDisposable;
-        subscribe(observer: IObserver): IDisposable;
-        subscribe(onNext: (value: any) => void): IDisposable;
-        subscribe(onNext: (value: any) => void, onError: (e: any) => void): IDisposable;
-        subscribe(onNext: (value: any) => void, onError: (e: any) => void, onComplete: () => void): IDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/BaseStream' {
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
-    export abstract class BaseStream extends Stream {
-        abstract subscribeCore(observer: IObserver): IDisposable;
-        subscribe(arg1: Function | Observer | Subject, onError?: any, onCompleted?: any): IDisposable;
-        buildStream(observer: IObserver): IDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/ConcatStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class ConcatStream extends BaseStream {
-        static create(sources: Array<Stream>): ConcatStream;
-        constructor(sources: Array<Stream>);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/DeferStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class DeferStream extends BaseStream {
-        static create(buildStreamFunc: Function): DeferStream;
-        constructor(buildStreamFunc: Function);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/DoStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class DoStream extends BaseStream {
-        static create(source: Stream, onNext?: Function, onError?: Function, onCompleted?: Function): DoStream;
-        constructor(source: Stream, onNext: Function, onError: Function, onCompleted: Function);
-        subscribeCore(observer: IObserver): IDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/FilterStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class FilterStream extends BaseStream {
-        static create(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): FilterStream;
-        constructor(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any);
-        predicate: (value: any, index?: number, source?: Stream) => boolean;
-        subscribeCore(observer: IObserver): IDisposable;
-        internalFilter(predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): Stream;
-        protected createObserver(observer: IObserver): Observer;
-        protected createStreamForInternalFilter(source: Stream, innerPredicate: any, thisArg: any): Stream;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/FilterWithStateStream' {
-    import { FilterStream } from "wonder-frp/dist/es2015/stream/FilterStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { FilterWithStateObserver } from "wonder-frp/dist/es2015/observer/FilterWithStateObserver";
-    export class FilterWithStateStream extends FilterStream {
-        static create(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): FilterWithStateStream;
-        protected createObserver(observer: IObserver): FilterWithStateObserver;
-        protected createStreamForInternalFilter(source: Stream, innerPredicate: any, thisArg: any): Stream;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/FromArrayStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export class FromArrayStream extends BaseStream {
-        static create(array: Array<any>, scheduler: Scheduler): FromArrayStream;
-        constructor(array: Array<any>, scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/FromEventPatternStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export class FromEventPatternStream extends BaseStream {
-        static create(addHandler: Function, removeHandler: Function): FromEventPatternStream;
-        constructor(addHandler: Function, removeHandler: Function);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/FromPromiseStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export class FromPromiseStream extends BaseStream {
-        static create(promise: any, scheduler: Scheduler): FromPromiseStream;
-        constructor(promise: any, scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/IgnoreElementsStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class IgnoreElementsStream extends BaseStream {
-        static create(source: Stream): IgnoreElementsStream;
-        constructor(source: Stream);
-        subscribeCore(observer: IObserver): IDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/IntervalRequestStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export class IntervalRequestStream extends BaseStream {
-        static create(scheduler: Scheduler): IntervalRequestStream;
-        constructor(scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/IntervalStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export class IntervalStream extends BaseStream {
-        static create(interval: number, scheduler: Scheduler): IntervalStream;
-        constructor(interval: number, scheduler: Scheduler);
-        initWhenCreate(): void;
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/MapStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class MapStream extends BaseStream {
-        static create(source: Stream, selector: Function): MapStream;
-        constructor(source: Stream, selector: Function);
-        subscribeCore(observer: IObserver): IDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/MergeAllStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class MergeAllStream extends BaseStream {
-        static create(source: Stream): MergeAllStream;
-        constructor(source: Stream);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/MergeStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class MergeStream extends BaseStream {
-        static create(source: Stream, maxConcurrent: number): MergeStream;
-        constructor(source: Stream, maxConcurrent: number);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/RepeatStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class RepeatStream extends BaseStream {
-        static create(source: Stream, count: number): RepeatStream;
-        constructor(source: Stream, count: number);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/SkipUntilStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class SkipUntilStream extends BaseStream {
-        static create(source: Stream, otherSteam: Stream): SkipUntilStream;
-        isOpen: boolean;
-        constructor(source: Stream, otherStream: Stream);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/TakeUntilStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
-    export class TakeUntilStream extends BaseStream {
-        static create(source: Stream, otherSteam: Stream): TakeUntilStream;
-        constructor(source: Stream, otherStream: Stream);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/stream/TimeoutStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export class TimeoutStream extends BaseStream {
-        static create(time: number, scheduler: Scheduler): TimeoutStream;
-        constructor(time: number, scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/subject/GeneratorSubject' {
-    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class GeneratorSubject extends Entity implements IObserver {
-        static create(): GeneratorSubject;
-        isStart: boolean;
-        constructor();
-        observer: any;
-        onBeforeNext(value: any): void;
-        onAfterNext(value: any): void;
-        onIsCompleted(value: any): boolean;
-        onBeforeError(error: any): void;
-        onAfterError(error: any): void;
-        onBeforeCompleted(): void;
-        onAfterCompleted(): void;
-        subscribe(arg1?: Function | Observer, onError?: Function, onCompleted?: Function): IDisposable;
-        next(value: any): void;
-        error(error: any): void;
-        completed(): void;
-        toStream(): any;
-        start(): void;
-        stop(): void;
-        remove(observer: Observer): void;
-        dispose(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/subject/Subject' {
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
-    export class Subject implements IObserver {
-        static create(): Subject;
-        source: Stream;
-        subscribe(arg1?: Function | Observer, onError?: Function, onCompleted?: Function): IDisposable;
-        next(value: any): void;
-        error(error: any): void;
-        completed(): void;
-        start(): void;
-        remove(observer: Observer): void;
-        dispose(): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/testing/ActionType' {
-    export enum ActionType {
-        NEXT = 0,
-        ERROR = 1,
-        COMPLETED = 2,
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/testing/MockObserver' {
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
-    import { Record } from "wonder-frp/dist/es2015/testing/Record";
-    export class MockObserver extends Observer {
-        static create(scheduler: TestScheduler): MockObserver;
-        messages: [Record];
-        constructor(scheduler: TestScheduler);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-        dispose(): void;
-        clone(): MockObserver;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/testing/MockPromise' {
-    import { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
-    import { Record } from "wonder-frp/dist/es2015/testing/Record";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    export class MockPromise {
-        static create(scheduler: TestScheduler, messages: [Record]): MockPromise;
-        constructor(scheduler: TestScheduler, messages: [Record]);
-        then(successCb: Function, errorCb: Function, observer: IObserver): void;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/testing/Record' {
-    import { ActionType } from "wonder-frp/dist/es2015/testing/ActionType";
-    export class Record {
-        static create(time: number, value: any, actionType?: ActionType, comparer?: Function): Record;
-        time: number;
-        value: number;
-        actionType: ActionType;
-        constructor(time: any, value: any, actionType: ActionType, comparer: Function);
-        equals(other: any): any;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/testing/TestScheduler' {
-    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
-    import { Record } from "wonder-frp/dist/es2015/testing/Record";
-    import { MockObserver } from "wonder-frp/dist/es2015/testing/MockObserver";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
-    import { TestStream } from "wonder-frp/dist/es2015/testing/TestStream";
-    import { MockPromise } from "wonder-frp/dist/es2015/testing/MockPromise";
-    export class TestScheduler extends Scheduler {
-        static next(tick: any, value: any): Record;
-        static error(tick: any, error: any): Record;
-        static completed(tick: any): Record;
-        static create(isReset?: boolean): TestScheduler;
-        constructor(isReset: boolean);
-        clock: number;
-        setStreamMap(observer: IObserver, messages: [Record]): void;
-        remove(observer: Observer): void;
-        publishRecursive(observer: MockObserver, initial: any, recursiveFunc: Function): void;
-        publishInterval(observer: IObserver, initial: any, interval: number, action: Function): number;
-        publishIntervalRequest(observer: IObserver, action: Function): number;
-        publishTimeout(observer: IObserver, time: number, action: Function): number;
-        startWithTime(create: Function, subscribedTime: number, disposedTime: number): MockObserver;
-        startWithSubscribe(create: any, subscribedTime?: number): MockObserver;
-        startWithDispose(create: any, disposedTime?: number): MockObserver;
-        publicAbsolute(time: any, handler: any): void;
-        start(): void;
-        createStream(args: any): TestStream;
-        createObserver(): MockObserver;
-        createResolvedPromise(time: number, value: any): MockPromise;
-        createRejectPromise(time: number, error: any): MockPromise;
-    }
-}
-
-declare module 'wonder-frp/dist/es2015/testing/TestStream' {
-    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
-    import { Record } from "wonder-frp/dist/es2015/testing/Record";
-    import { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
-    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
-    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
-    export class TestStream extends BaseStream {
-        static create(messages: [Record], scheduler: TestScheduler): TestStream;
-        scheduler: TestScheduler;
-        constructor(messages: [Record], scheduler: TestScheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
diff --git a/types/wonder-frp/tsconfig.json b/types/wonder-frp/tsconfig.json
deleted file mode 100644
index 3df4543743..0000000000
--- a/types/wonder-frp/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "wonder-frp-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/wonder-frp/wonder-frp-tests.ts b/types/wonder-frp/wonder-frp-tests.ts
deleted file mode 100644
index 66387b193e..0000000000
--- a/types/wonder-frp/wonder-frp-tests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { fromArray } from "wonder-frp/dist/es2015/global/Operator";
-
-fromArray([1,2,3])
-    .subscribe(function(){
-    });
diff --git a/types/wonder.js/package.json b/types/wonder.js/package.json
new file mode 100644
index 0000000000..76d470d51d
--- /dev/null
+++ b/types/wonder.js/package.json
@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "dependencies": {
+    "@types/wonder-commonlib": "0.2.0",
+    "@types/wonder-frp": "0.2.0"
+  }
+}
diff --git a/types/wonder.js/tslint.json b/types/wonder.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wonder.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/word-list-json/index.d.ts b/types/word-list-json/index.d.ts
new file mode 100644
index 0000000000..e221d3795f
--- /dev/null
+++ b/types/word-list-json/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for word-list-json 0.2
+// Project: https://github.com/sindresorhus/word-list
+// Definitions by: Dovid Meiseles <https://github.com/dovidm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+interface Lengths {
+    [key: string]: number;
+}
+
+export const lengths: Lengths;
+
+type wordsArray = string[];
+interface Words extends wordsArray {
+    lengths: Lengths;
+}
+
+declare const words: Words;
+
+export default words;
diff --git a/types/word-list-json/tsconfig.json b/types/word-list-json/tsconfig.json
new file mode 100644
index 0000000000..8f34d90409
--- /dev/null
+++ b/types/word-list-json/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "word-list-json-tests.ts"
+    ]
+}
diff --git a/types/word-list-json/tslint.json b/types/word-list-json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/word-list-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/word-list-json/word-list-json-tests.ts b/types/word-list-json/word-list-json-tests.ts
new file mode 100644
index 0000000000..d12edf731d
--- /dev/null
+++ b/types/word-list-json/word-list-json-tests.ts
@@ -0,0 +1,5 @@
+import wordListJson from 'word-list-json';
+
+wordListJson.lengths; // $ExpectType Lengths
+
+wordListJson; // $ExpectType Words
diff --git a/types/wordcloud/tslint.json b/types/wordcloud/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wordcloud/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wrap-ansi/tslint.json b/types/wrap-ansi/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wrap-ansi/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wreck/tslint.json b/types/wreck/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wreck/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wrench/tslint.json b/types/wrench/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wrench/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index bbb589a76d..2a52883365 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for ws 3.2
+// Type definitions for ws 4.0
 // Project: https://github.com/websockets/ws
 // Definitions by: Paul Loyd <https://github.com/loyd>
 //                 Matt Silverlock <https://github.com/elithrar>
 //                 Margus Lamp <https://github.com/mlamp>
+//                 Philippe D'Alva <https://github.com/TitaneBoy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -21,10 +22,8 @@ declare class WebSocket extends events.EventEmitter {
 
     binaryType: string;
     bufferedAmount: number;
-    bytesReceived: number;
-    extensions: {};
+    extensions: string;
     protocol: string;
-    protocolVersion: number;
     readyState: number;
     url: string;
 
@@ -34,7 +33,7 @@ declare class WebSocket extends events.EventEmitter {
     CLOSED: number;
 
     onopen: (event: { target: WebSocket }) => void;
-    onerror: (err: Error) => void;
+    onerror: (event: {error: any, message: string, type: string, target: WebSocket }) => void;
     onclose: (event: { wasClean: boolean; code: number; reason: string; target: WebSocket }) => void;
     onmessage: (event: { data: WebSocket.Data; type: string; target: WebSocket }) => void;
 
@@ -42,14 +41,10 @@ declare class WebSocket extends events.EventEmitter {
     constructor(address: string, protocols?: string | string[], options?: WebSocket.ClientOptions);
 
     close(code?: number, data?: string): void;
-    pause(): void;
-    resume(): void;
-    ping(data?: any, mask?: boolean, failSilently?: boolean): void;
-    pong(data?: any, mask?: boolean, failSilently?: boolean): void;
+    ping(data?: any, mask?: boolean, cb?: (err: Error) => void): void;
+    pong(data?: any, mask?: boolean, cb?: (err: Error) => void): void;
     send(data: any, cb?: (err: Error) => void): void;
-    send(data: any, options: { mask?: boolean; binary?: boolean }, cb?: (err: Error) => void): void;
-    stream(options: { mask?: boolean; binary?: boolean }, cb?: (err: Error, final: boolean) => void): void;
-    stream(cb?: (err: Error, final: boolean) => void): void;
+    send(data: any, options: { mask?: boolean; binary?: boolean; compress?: boolean; fin?: boolean }, cb?: (err: Error) => void): void;
     terminate(): void;
 
     // HTML5 WebSocket events
@@ -58,14 +53,23 @@ declare class WebSocket extends events.EventEmitter {
         wasClean: boolean; code: number;
         reason: string; target: WebSocket
     }) => void): void;
-    addEventListener(method: 'error', cb?: (err: Error) => void): void;
+    addEventListener(method: 'error', cb?: (event: {error: any, message: any, type: string, target: WebSocket }) => void): void;
     addEventListener(method: 'open', cb?: (event: { target: WebSocket }) => void): void;
     addEventListener(method: string, listener?: () => void): void;
 
+    removeEventListener(method: 'message', cb?: (event: { data: any; type: string; target: WebSocket }) => void): void;
+    removeEventListener(method: 'close', cb?: (event: {
+        wasClean: boolean; code: number;
+        reason: string; target: WebSocket
+    }) => void): void;
+    removeEventListener(method: 'error', cb?: (event: {error: any, message: any, type: string, target: WebSocket }) => void): void;
+    removeEventListener(method: 'open', cb?: (event: { target: WebSocket }) => void): void;
+    removeEventListener(method: string, listener?: () => void): void;
+
     // Events
     on(event: 'close', listener: (code: number, reason: string) => void): this;
-    on(event: 'error', listener: (err: Error) => void): this;
-    on(event: 'headers', listener: (headers: {}, request: http.IncomingMessage) => void): this;
+    on(event: 'error', listener: (event: {error: any, message: any, type: string, target: WebSocket }) => void): this;
+    on(event: 'upgrade', listener: (request: http.IncomingMessage) => void): this;
     on(event: 'message', listener: (data: WebSocket.Data) => void): this;
     on(event: 'open' , listener: () => void): this;
     on(event: 'ping' | 'pong', listener: (data: Buffer) => void): this;
@@ -74,12 +78,21 @@ declare class WebSocket extends events.EventEmitter {
 
     addListener(event: 'close', listener: (code: number, message: string) => void): this;
     addListener(event: 'error', listener: (err: Error) => void): this;
-    addListener(event: 'headers', listener: (headers: {}, request: http.IncomingMessage) => void): this;
+    addListener(event: 'upgrade', listener: (request: http.IncomingMessage) => void): this;
     addListener(event: 'message', listener: (data: WebSocket.Data) => void): this;
     addListener(event: 'open' , listener: () => void): this;
     addListener(event: 'ping' | 'pong', listener: (data: Buffer) => void): this;
     addListener(event: 'unexpected-response', listener: (request: http.ClientRequest, response: http.IncomingMessage) => void): this;
     addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+    removeListener(event: 'close', listener: (code: number, message: string) => void): this;
+    removeListener(event: 'error', listener: (err: Error) => void): this;
+    removeListener(event: 'upgrade', listener: (request: http.IncomingMessage) => void): this;
+    removeListener(event: 'message', listener: (data: WebSocket.Data) => void): this;
+    removeListener(event: 'open' , listener: () => void): this;
+    removeListener(event: 'ping' | 'pong', listener: (data: Buffer) => void): this;
+    removeListener(event: 'unexpected-response', listener: (request: http.ClientRequest, response: http.IncomingMessage) => void): this;
+    removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
 }
 
 declare namespace WebSocket {
diff --git a/types/ws/ws-tests.ts b/types/ws/ws-tests.ts
index 27b75703ba..29334a647f 100644
--- a/types/ws/ws-tests.ts
+++ b/types/ws/ws-tests.ts
@@ -24,9 +24,8 @@ import * as https from 'https';
         ws.send('something');
     });
 
-    wss.on('headers', (headers, req) => {
-        console.log(`received headers: ${headers}`);
-        console.log(`received request: ${Object.keys(req)}`);
+    wss.on('upgrade', (res) => {
+        console.log(`response: ${Object.keys(res)}`);
     });
 }
 
diff --git a/types/wtfnode/index.d.ts b/types/wtfnode/index.d.ts
new file mode 100644
index 0000000000..a33af419c3
--- /dev/null
+++ b/types/wtfnode/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for wtfnode 0.5
+// Project: https://github.com/myndzi/wtfnode
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function dump(): void;
+export function init(): void;
diff --git a/types/wtfnode/tsconfig.json b/types/wtfnode/tsconfig.json
new file mode 100644
index 0000000000..429ee54cb7
--- /dev/null
+++ b/types/wtfnode/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "wtfnode-tests.ts"
+    ]
+}
diff --git a/types/wtfnode/tslint.json b/types/wtfnode/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wtfnode/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wtfnode/wtfnode-tests.ts b/types/wtfnode/wtfnode-tests.ts
new file mode 100644
index 0000000000..a87800aee5
--- /dev/null
+++ b/types/wtfnode/wtfnode-tests.ts
@@ -0,0 +1,4 @@
+import * as wtf from 'wtfnode';
+
+wtf.init();
+wtf.dump();
diff --git a/types/wu/index.d.ts b/types/wu/index.d.ts
index 640450cd81..5bd56f391b 100644
--- a/types/wu/index.d.ts
+++ b/types/wu/index.d.ts
@@ -104,4 +104,6 @@ declare namespace Wu {
 		tee(n?: number): Array<WuIterable<T>>;
 	}
 }
-declare var wu: Wu.WuStatic;
+declare const wu: Wu.WuStatic;
+export = wu;
+export as namespace wu;
diff --git a/types/x-editable/tslint.json b/types/x-editable/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/x-editable/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/x-ray-crawler/index.d.ts b/types/x-ray-crawler/index.d.ts
new file mode 100644
index 0000000000..7696ecf903
--- /dev/null
+++ b/types/x-ray-crawler/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for x-ray-crawler 2.0
+// Project: https://github.com/lapwinglabs/x-ray-crawler#readme
+// Definitions by: Matt Traynham <https://github.com/mtraynham>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import HttpContext = require('http-context');
+
+export = XRayCrawler;
+
+declare function XRayCrawler(driver?: XRayCrawler.Driver): XRayCrawler.Instance;
+
+declare namespace XRayCrawler {
+    type Callback<T> = (err: Error, obj: T) => void;
+    type Driver = (context: HttpContext.Context, callback: Callback<HttpContext.Context>) => void;
+    type RequestHook = (request: HttpContext.Request) => void;
+    type ResponseHook = (response: HttpContext.Response) => void;
+    type RandomDelay = () => number;
+
+    interface Instance {
+        (url: string, callback: Callback<HttpContext.Context>): void;
+        driver(): Driver;
+        driver(driver: Driver): this;
+        throttle(): number;
+        throttle(requests: string | number, rate: string | number): this;
+        delay(): RandomDelay;
+        delay(from: string | number, to?: string | number): this;
+        timeout(): number;
+        timeout(n: string | number): this;
+        concurrency(): number;
+        concurrency(n: number): this;
+        request(): RequestHook;
+        request(fn: RequestHook): this;
+        response(): ResponseHook;
+        response(fn: ResponseHook): this;
+        limit(): number;
+        limit(n: number): this;
+    }
+}
diff --git a/types/x-ray-crawler/tsconfig.json b/types/x-ray-crawler/tsconfig.json
new file mode 100644
index 0000000000..3b3a573f0a
--- /dev/null
+++ b/types/x-ray-crawler/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "x-ray-crawler-tests.ts"
+    ]
+}
diff --git a/types/x-ray-crawler/tslint.json b/types/x-ray-crawler/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/x-ray-crawler/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/x-ray-crawler/x-ray-crawler-tests.ts b/types/x-ray-crawler/x-ray-crawler-tests.ts
new file mode 100644
index 0000000000..697ddd5dbb
--- /dev/null
+++ b/types/x-ray-crawler/x-ray-crawler-tests.ts
@@ -0,0 +1,52 @@
+import HttpContext = require('http-context');
+import XRayCrawler = require('x-ray-crawler');
+
+const xRayCrawler: XRayCrawler.Instance = XRayCrawler();
+
+const driver: XRayCrawler.Driver = xRayCrawler.driver();
+xRayCrawler.driver(driver);
+
+const throttle: number = xRayCrawler.throttle();
+xRayCrawler.throttle(5, 4);
+xRayCrawler.throttle(5, '4ms');
+
+const randomDelay: XRayCrawler.RandomDelay = xRayCrawler.delay();
+const delay: number = randomDelay();
+xRayCrawler.delay(0, 2);
+xRayCrawler.delay(0);
+xRayCrawler.delay('0s', '5s');
+
+const timeout: number = xRayCrawler.timeout();
+xRayCrawler.timeout(timeout);
+xRayCrawler.timeout('5s');
+
+const concurrency: number = xRayCrawler.concurrency();
+xRayCrawler.concurrency(5);
+
+const requestHook: XRayCrawler.RequestHook = xRayCrawler.request();
+xRayCrawler.request(requestHook);
+xRayCrawler.request((request: HttpContext.Request) => {
+    console.log(request);
+});
+
+const responseHook: XRayCrawler.ResponseHook = xRayCrawler.response();
+xRayCrawler.response(responseHook);
+xRayCrawler.response((response: HttpContext.Response) => {
+    console.log(response);
+});
+
+const limit: number = xRayCrawler.limit();
+xRayCrawler.limit(limit);
+
+const xRayCrawler2: XRayCrawler.Instance = XRayCrawler()
+    .throttle(5, '10s')
+    .delay('5s', '10s')
+    .timeout('20s')
+    .concurrency(4)
+    .request((request: HttpContext.Request) => {
+        console.log(request);
+    })
+    .response((response: HttpContext.Response) => {
+        console.log(response);
+    })
+    .limit(10);
diff --git a/types/x-ray/index.d.ts b/types/x-ray/index.d.ts
new file mode 100644
index 0000000000..271155ef94
--- /dev/null
+++ b/types/x-ray/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for x-ray 2.3
+// Project: https://github.com/lapwinglabs/x-ray#readme
+// Definitions by: Matt Traynham <https://github.com/mtraynham>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import Bluebird = require('bluebird');
+import XRayCrawler = require('x-ray-crawler');
+
+export = XRay;
+
+declare function XRay(options?: XRay.Options): XRay.Instance;
+
+declare namespace XRay {
+    type Filter = (value: any, ...args: string[]) => any;
+    interface Options {
+        filters: {[key: string]: Filter};
+    }
+    type Callback = (err: Error, data: any) => void;
+
+    // circularly references itself
+    // https://stackoverflow.com/a/41826582
+    type ScalarSelector =
+        string |
+        InstanceInvocation |
+        {[key: string]: Selector};
+    interface SelectorArray extends Array<ScalarSelector | SelectorArray> {
+        [index: number]: ScalarSelector | SelectorArray;
+    }
+    type Selector = ScalarSelector | SelectorArray;
+
+    interface Instance extends XRayCrawler.Instance {
+        (
+            source: string,
+            selector: Selector
+        ): InstanceInvocation;
+        (
+            source: string,
+            context: string,
+            selector: Selector
+        ): InstanceInvocation;
+        (
+            context: string,
+            selector: Selector
+        ): InstanceInvocation;
+        (
+            selector: Selector
+        ): InstanceInvocation;
+    }
+
+    interface InstanceInvocation {
+        (callback: Callback): void;
+        (source: string, callback: Callback): void;
+        abort(): this;
+        paginate(selector: Selector): this;
+        limit(n: number): this;
+        stream(): NodeJS.ReadStream;
+        then<U>(fn?: (value: any) => U | PromiseLike<U>): Bluebird<U>;
+        write(path?: string): (err: NodeJS.ErrnoException) => void;
+    }
+}
diff --git a/types/x-ray/tsconfig.json b/types/x-ray/tsconfig.json
new file mode 100644
index 0000000000..7dc474842a
--- /dev/null
+++ b/types/x-ray/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "x-ray-tests.ts"
+    ]
+}
diff --git a/types/x-ray/tslint.json b/types/x-ray/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/x-ray/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/x-ray/x-ray-tests.ts b/types/x-ray/x-ray-tests.ts
new file mode 100644
index 0000000000..8bc056b2f6
--- /dev/null
+++ b/types/x-ray/x-ray-tests.ts
@@ -0,0 +1,112 @@
+import express = require('express');
+import XRay = require('x-ray');
+
+const x: XRay.Instance = XRay();
+
+// README Examples
+x('https://blog.ycombinator.com/', '.post', [{
+        title: 'h1 a',
+        link: '.article-title@href'
+    }])
+    .paginate('.nav-previous a@href')
+    .limit(3)
+    .write('results.json');
+
+x('http://google.com', 'title')((err: Error, title: string) => {
+    console.log(title); // Google
+});
+
+const fn: XRay.Callback = (err: Error, data: any) => {
+    console.log(data);
+};
+x('http://reddit.com', '.content')(fn);
+x('http://techcrunch.com', 'img.logo@src')(fn);
+x('http://news.ycombinator.com', 'body@html')(fn);
+
+const html = '<body><h2>Pear</h2></body>';
+x(html, 'body', 'h2')((err: Error, header: string) => {
+    console.log(header); // => Pear
+});
+
+const app = express();
+app.get('/', (req: express.Request, res: express.Response) => {
+    const stream = x('http://google.com', 'title').stream();
+    stream.pipe(res);
+});
+
+x('https://dribbble.com', 'li.group', [{
+        title: '.dribbble-img strong',
+        image: '.dribbble-img [data-src]@data-src',
+    }])
+    .paginate('.next_page@href')
+    .limit(3)
+    .then((res: Array<{title: string, image: string}>) => {
+        console.log(res[0]); // prints first result
+    })
+    .catch((err: Error) => {
+        console.log(err); // handle error in promise
+    });
+
+x('http://google.com', {
+    main: 'title',
+    image: x('#gbar a@href', 'title'), // follow link to google images
+})(fn);
+
+x('http://mat.io', {
+    title: 'title',
+    items: x('.item', [{
+        title: '.item-content h2',
+        description: '.item-content section'
+    }])
+})(fn);
+
+const x2 = XRay({
+    filters: {
+        trim: (value: string): string => {
+            return typeof value === 'string' ? value.trim() : value;
+        },
+        reverse: (value: string): string => {
+            return typeof value === 'string' ? value.split('').reverse().join('') : value;
+        },
+        slice: (value: string, start: string, end: string): string => {
+            return typeof value === 'string' ? value.slice(+start, +end) : value;
+        }
+    }
+});
+x2('http://mat.io', {
+  title: 'title | trim | reverse | slice:2,3'
+})(fn);
+
+// Examples
+x(html, 'h2')(console.log);
+
+x(html, {
+    title: '.title',
+    image: 'img@src',
+    tags: ['li']
+})(console.log);
+
+x(html, ['a'])(console.log);
+
+x(html, '.item', [{
+    title: 'h2',
+    tags: x('.tags', ['li'])
+}])(console.log);
+
+x(html, '.tags', [['li']])(console.log);
+
+// Tests
+x({
+    title: 'title@text',
+    image: x('#gbar a@href', 'title'),
+    scoped_title: x('head', 'title'),
+    inner: x('title', {
+        title: '@text'
+    })
+})('http://www.google.com/ncr', fn);
+
+x({
+    list: x('body', {
+      first: x('a@href', 'title')
+    })
+})(fn);
diff --git a/types/xadesjs/index.d.ts b/types/xadesjs/index.d.ts
deleted file mode 100644
index cad137db05..0000000000
--- a/types/xadesjs/index.d.ts
+++ /dev/null
@@ -1,1085 +0,0 @@
-// Type definitions for xadesjs v1.0.0
-// Project: https://github.com/PeculiarVentures/xadesjs
-// Definitions by: Stepan Miroshin <https://github.com/microshine>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/**
- * A pure Javascript implementation of XMLDSIG and XAdES based on Web Crypto https://xadesjs.com
- * v1.0.0
- */
-
-declare namespace xadesjs {
-    
-    type PromiseType = any;
-    
-    const APPLICATION_XML: string;
-
-    class XmlError extends Error {
-        stack: any;
-        constructor(code: XE, ...args: any[]);
-    }
-
-    enum XE {
-        NONE = 0,
-        NULL_REFERENCE = 1,
-        METHOD_NOT_IMPLEMENTED = 2,
-        METHOD_NOT_SUPPORTED = 3,
-        PARAM_REQUIRED = 4,
-        CONVERTER_UNSUPPORTED = 5,
-        ELEMENT_MALFORMED = 6,
-        CRYPTOGRAPHIC = 7,
-        CRYPTOGRAPHIC_NO_MODULE = 8,
-        CRYPTOGRAPHIC_UNKNOWN_TRANSFORM = 9,
-        ALGORITHM_NOT_SUPPORTED = 10,
-        ALGORITHM_WRONG_NAME = 11,
-        XML_EXCEPTION = 12,
-    }
-
-    interface CryptoEx extends Crypto {
-        name: string;
-    }
-
-    class Application {
-        /**
-         * Sets crypto engine for the current Application
-         * @param  {string} name
-         * @param  {Crypto} crypto
-         * @returns void
-         */
-        static setEngine(name: string, crypto: Crypto): void;
-        /**
-         * Gets the crypto module from the Application
-         */
-        static crypto: CryptoEx;
-        static isNodePlugin(): boolean;
-    }
-
-    enum XmlNodeType {
-        None = 0,
-        Element = 1,
-        Attribute = 2,
-        Text = 3,
-        CDATA = 4,
-        EntityReference = 5,
-        Entity = 6,
-        ProcessingInstruction = 7,
-        Comment = 8,
-        Document = 9,
-        DocumentType = 10,
-        DocumentFragment = 11,
-        Notation = 12,
-        Whitespace = 13,
-        SignificantWhitespace = 14,
-        EndElement = 15,
-        EndEntity = 16,
-        XmlDeclaration = 17,
-    }
-
-    interface IXmlSerializable {
-        Prefix: string;
-        /**
-         * Writes object to XML node
-         * @returns Node
-         */
-        GetXml(): Node;
-        /**
-         * Reads XML from string
-         * @param  {Node} node
-         * @returns void
-         */
-        LoadXml(node: Node): void;
-    }
-
-    abstract class XmlObject implements IXmlSerializable {
-        protected m_prefix: string;
-        Prefix: string;
-        protected GetPrefix(): string;
-        GetXml(): Node;
-        GetXml(document: Document): Node;
-        LoadXml(node: Node): void;
-        toString(): string;
-        protected getAttribute(xel: Element, attribute: string): string;
-    }
-
-    const DEFAULT_ROOT_NAME: string;
-    function IsEqualsEmptyStrings(s1: string, s2: string): boolean;
-    /**
-     * Creates new instance of XmlDocument with given name of root element
-     * @param  {string} root Name of root element
-     * @param  {string} namespaceUri
-     * @param  {string} prefix
-     * @returns Document
-     */
-    function CreateDocument(root?: string, namespaceUri?: string, prefix?: string): Document;
-    /**
-     * Returns signle Node from given Node
-     * @param  {Node} node
-     * @param  {string} path
-     * @returns Node
-     */
-    function SelectSingleNode(node: Node, path: string): Node;
-
-    function findAttr(node: Node, localName: string, nameSpace?: string): Attr;
-    function findFirst(doc: Node, xpath: string): Node;
-    function findChilds(node: Node, localName: string, nameSpace?: string): Node[];
-    interface IAssocArray {
-        [index: string]: string;
-    }
-    function encodeSpecialCharactersInAttribute(attributeValue: string): string;
-    function encodeSpecialCharactersInText(text: string): string;
-    function SelectNamespaces(node: Element): Node[];
-
-    class Convert {
-        static ToBase64UrlString(text: string): string;
-        static FromBase64UrlString(base64UrlText: string): string;
-        static ToBase64String(text: string): string;
-        static FromBase64String(base64Text: string): string;
-        static Base64UrlToBase64(base64url: string): string;
-        static Base64ToBase64Url(base64: string): string;
-        static ToBufferUtf8String(text: string): Uint8Array;
-        static FromBufferUtf8String(buffer: Uint8Array): string;
-        static ToBufferString(text: string): Uint8Array;
-        static FromBufferString(buffer: ArrayBuffer): string;
-        static FromBufferString(buffer: Uint8Array): string;
-    }
-
-    interface IAlgorithm {
-        algorithm: Algorithm;
-        xmlNamespace: string;
-        getAlgorithmName(): string;
-    }
-    interface IHashAlgorithm extends IAlgorithm {
-        getHash(xml: string): PromiseType;
-    }
-    interface IHashAlgorithmConstructable {
-        new (): IHashAlgorithm;
-    }
-    abstract class XmlAlgorithm implements IAlgorithm {
-        algorithm: Algorithm;
-        xmlNamespace: string;
-        getAlgorithmName(): string;
-    }
-    abstract class HashAlgorithm extends XmlAlgorithm implements IHashAlgorithm {
-        getHash(xml: string): PromiseType;
-    }
-    interface ISignatureAlgorithm extends IAlgorithm {
-        getSignature(signedInfo: string, signingKey: CryptoKey, algorithm: Algorithm): PromiseType;
-        verifySignature(signedInfo: string, key: CryptoKey, signatureValue: string, algorithm?: Algorithm): PromiseType;
-    }
-    interface ISignatureAlgorithmConstructable {
-        new (): ISignatureAlgorithm;
-    }
-    abstract class SignatureAlgorithm extends XmlAlgorithm implements ISignatureAlgorithm {
-        /**
-         * Sign the given string using the given key
-         */
-        getSignature(signedInfo: string, signingKey: CryptoKey, algorithm: Algorithm): PromiseType;
-        /**
-        * Verify the given signature of the given string using key
-        */
-        verifySignature(signedInfo: string, key: CryptoKey, signatureValue: string, algorithm?: Algorithm): PromiseType;
-    }
-
-    const SHA1: string;
-    const SHA224: string;
-    const SHA256: string;
-    const SHA384: string;
-    const SHA512: string;
-    const SHA1_NAMESPACE: string;
-    const SHA224_NAMESPACE: string;
-    const SHA256_NAMESPACE: string;
-    const SHA384_NAMESPACE: string;
-    const SHA512_NAMESPACE: string;
-    class Sha1 extends HashAlgorithm {
-        algorithm: {
-            name: string;
-        };
-        xmlNamespace: string;
-    }
-    class Sha224 extends HashAlgorithm {
-        algorithm: {
-            name: string;
-        };
-        xmlNamespace: string;
-    }
-    class Sha256 extends HashAlgorithm {
-        algorithm: {
-            name: string;
-        };
-        xmlNamespace: string;
-    }
-    class Sha384 extends HashAlgorithm {
-        algorithm: {
-            name: string;
-        };
-        xmlNamespace: string;
-    }
-    class Sha512 extends HashAlgorithm {
-        algorithm: {
-            name: string;
-        };
-        xmlNamespace: string;
-    }
-
-    // RSA PKCS1
-
-    const RSA_PKCS1: string;
-    const RSA_PKCS1_SHA1_NAMESPACE: string;
-    const RSA_PKCS1_SHA224_NAMESPACE: string;
-    const RSA_PKCS1_SHA256_NAMESPACE: string;
-    const RSA_PKCS1_SHA384_NAMESPACE: string;
-    const RSA_PKCS1_SHA512_NAMESPACE: string;
-
-    class RsaPkcs1Sha1 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPkcs1Sha224 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPkcs1Sha256 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPkcs1Sha384 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPkcs1Sha512 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-
-    // RSA PSS
-
-    const RSA_PSS: string;
-    const RSA_PSS_WITH_PARAMS_NAMESPACE: string;
-    const RSA_PSS_WITH_PARAMS_MGF1_NAMESPACE: string;
-
-    class RsaPssSha1 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPssSha224 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPssSha256 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPssSha384 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class RsaPssSha512 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class PssAlgorithmParams extends XmlObject {
-        private m_digest_method;
-        private m_salt_length;
-        private m_mgf;
-        private element;
-        dsPrefix: string;
-        DigestMethod: string;
-        SaltLength: number;
-        MGF: string;
-        GetXml(): Element;
-        LoadXml(value: Element): void;
-    }
-
-    // HMAC
-
-    const HMAC_ALGORITHM: string;
-    const HMAC_SHA1_NAMESPACE: string;
-    const HMAC_SHA256_NAMESPACE: string;
-    const HMAC_SHA384_NAMESPACE: string;
-    const HMAC_SHA512_NAMESPACE: string;
-
-    class HmacSha1 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class HmacSha256 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class HmacSha384 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class HmacSha512 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-
-    // ECDSA
-
-    const ECDSA_SIGN_ALGORITHM: string;
-    const ECDSA_SHA1_NAMESPACE: string;
-    const ECDSA_SHA224_NAMESPACE: string;
-    const ECDSA_SHA256_NAMESPACE: string;
-    const ECDSA_SHA384_NAMESPACE: string;
-    const ECDSA_SHA512_NAMESPACE: string;
-    class EcdsaSha1 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class EcdsaSha224 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class EcdsaSha256 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class EcdsaSha384 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-    class EcdsaSha512 extends SignatureAlgorithm {
-        algorithm: any;
-        xmlNamespace: string;
-    }
-
-    /**
-     * Represents an <X509Certificate> element.
-     */
-    class X509Certificate {
-        protected raw: Uint8Array;
-        protected cert_simpl: any;
-        protected publicKey: CryptoKey;
-        constructor(rawData?: Uint8Array);
-        /**
-         * Loads X509Certificate from DER data
-         * @param  {Uint8Array} rawData
-         */
-        protected LoadFromRawData(rawData: Uint8Array): void;
-        /**
-         * Gets the public key from the X509Certificate
-         */
-        PublicKey: CryptoKey;
-        /**
-         * Returns DER raw of X509Certificate
-         */
-        GetRawCertData(): Uint8Array;
-        /**
-         * Returns public key from X509Certificate
-         * @param  {Algorithm} algorithm
-         * @returns PromiseType
-         */
-        exportKey(algorithm: Algorithm): PromiseType;
-    }
-
-    enum X509IncludeOption {
-        None = 0,
-        EndCertOnly = 1,
-        ExcludeRoot = 2,
-        WholeChain = 3,
-    }
-    interface X509IssuerSerial {
-        issuerName: string;
-        serialNumber: string;
-    }
-    /**
-     * Represents an <X509Data> subelement of an XMLDSIG or XML Encryption <KeyInfo> element.
-     */
-    class KeyInfoX509Data extends XmlObject implements KeyInfoClause {
-
-        constructor();
-        constructor(rgbCert: Uint8Array);
-        constructor(cert: X509Certificate);
-        /**
-         * Gets public key of the X509Data
-         */
-        Key: CryptoKey;
-        importKey(key: CryptoKey): PromiseType;
-        /**
-         * Exports key from X509Data object
-         * @param  {Algorithm} alg
-         * @returns PromiseType
-         */
-        exportKey(alg: Algorithm): PromiseType;
-        /**
-         * Gets a list of the X.509v3 certificates contained in the KeyInfoX509Data object.
-         */
-        Certificates: X509Certificate[];
-        /**
-         * Gets or sets the Certificate Revocation List (CRL) contained within the KeyInfoX509Data object.
-         */
-        CRL: Uint8Array;
-        /**
-         * Gets a list of X509IssuerSerial structures that represent an issuer name and serial number pair.
-         */
-        IssuerSerials: X509IssuerSerial[];
-        /**
-         * Gets a list of the subject key identifiers (SKIs) contained in the KeyInfoX509Data object.
-         */
-        SubjectKeyIds: Uint8Array[];
-        /**
-         * Gets a list of the subject names of the entities contained in the KeyInfoX509Data object.
-         */
-        SubjectNames: string[];
-        /**
-         * Adds the specified X.509v3 certificate to the KeyInfoX509Data.
-         * @param  {X509Certificate} certificate
-         * @returns void
-         */
-        AddCertificate(certificate: X509Certificate): void;
-        /**
-         * Adds the specified issuer name and serial number pair to the KeyInfoX509Data object.
-         * @param  {string} issuerName
-         * @param  {string} serialNumber
-         * @returns void
-         */
-        AddIssuerSerial(issuerName: string, serialNumber: string): void;
-        /**
-         * Adds the specified subject key identifier (SKI) to the KeyInfoX509Data object.
-         * @param  {string | Uint8Array} subjectKeyId
-         * @returns void
-         */
-        AddSubjectKeyId(subjectKeyId: string): void;
-        AddSubjectKeyId(subjectKeyId: Uint8Array): void;
-        /**
-         * Adds the subject name of the entity that was issued an X.509v3 certificate to the KeyInfoX509Data object.
-         * @param  {string} subjectName
-         * @returns void
-         */
-        AddSubjectName(subjectName: string): void;
-        /**
-         * Returns an XML representation of the KeyInfoX509Data object.
-         * @returns Element
-         */
-        GetXml(): Element;
-        /**
-         * Parses the input XmlElement object and configures the internal state of the KeyInfoX509Data object to match.
-         * @param  {Element} element
-         * @returns void
-         */
-        LoadXml(element: Element): void;
-    }
-
-    interface IJwkRsa {
-        alg: string;
-        kty: string;
-        e: string;
-        n: string;
-        ext: boolean;
-    }
-    /**
-     * Represents the <RSAKeyValue> element of an XML signature.
-     */
-    class RsaKeyValue extends XmlObject implements KeyInfoClause {
-        /**
-         * Gets or sets the instance of RSA that holds the public key.
-         */
-        Key: CryptoKey;
-        /**
-         * Gets the algorithm of the public key
-         */
-        Algorithm: ISignatureAlgorithm;
-        /**
-         * Gets the Modulus of the public key
-         */
-        Modulus: Uint8Array;
-        /**
-         * Gets the Exponent of the public key
-         */
-        Exponent: Uint8Array;
-        constructor();
-        /**
-         * Imports key to the RSAKeyValue object
-         * @param  {CryptoKey} key
-         * @returns PromiseType
-         */
-        importKey(key: CryptoKey): PromiseType;
-        /**
-         * Exports key from the RSAKeyValue object
-         * @param  {Algorithm} alg
-         * @returns PromiseType
-         */
-        exportKey(alg: Algorithm): PromiseType;
-        /**
-         * Returns the XML representation of the RSA key clause.
-         * @returns Element
-         */
-        GetXml(): Element;
-        /**
-         * Loads an RSA key clause from an XML element.
-         * @param  {Element} element
-         * @returns void
-         */
-        LoadXml(element: Element): void;
-    }
-
-    type NamedCurve = "P-256" | "P-384" | "P-521";
-
-    interface IJwkEcdsa {
-        crv: NamedCurve;
-        kty: "EC";
-        x: string;
-        y: string;
-        ext: boolean;
-    }
-
-    /**
-     * Represents the <ECKeyValue> element of an XML signature.
-     */
-    class EcdsaKeyValue extends XmlObject implements KeyInfoClause {
-        /**
-         * Gets or sets the instance of ECDSA that holds the public key.
-         */
-        Key: CryptoKey;
-        /**
-         * Gets the algorithm of the public key
-         */
-        Algorithm: ISignatureAlgorithm;
-        /**
-         * Gets the X point value of then public key
-         */
-        X: Uint8Array;
-        /**
-         * Gets the Y point value of then public key
-         */
-        Y: Uint8Array;
-        /**
-         * Gets the NamedCurve value of then public key
-         */
-        NamedCurve: NamedCurve;
-        constructor();
-        /**
-         * Imports key to the ECKeyValue object
-         * @param  {CryptoKey} key
-         * @returns PromiseType
-         */
-        importKey(key: CryptoKey): PromiseType;
-        /**
-         * Exports key from the ECKeyValue object
-         * @param  {Algorithm} alg
-         * @returns PromiseType
-         */
-        exportKey(alg: Algorithm): PromiseType;
-        /**
-         * Returns the XML representation of the ECDSA key clause.
-         * @returns Element
-         */
-        GetXml(): Element;
-        /**
-         * Loads an ECDSA key clause from an XML element.
-         * @param  {Element} element
-         * @returns void
-         */
-        LoadXml(element: Element): void;
-    }
-
-    type XmlNamespace = {
-        prefix: string;
-        namespace: string;
-    };
-
-    enum XmlCanonicalizerState {
-        BeforeDocElement = 0,
-        InsideDocElement = 1,
-        AfterDocElement = 2,
-    }
-
-    class XmlCanonicalizer {
-        constructor(withComments: boolean, excC14N: boolean, propagatedNamespaces?: XmlNamespace[]);
-        InclusiveNamespacesPrefixList: string;
-        Canonicalize(node: Node): string;
-    }
-
-    interface Transform extends IXmlSerializable {
-        Algorithm: string;
-        LoadInnerXml(node: Node): void;
-        GetInnerXml(): Node;
-        GetOutput(): string;
-    }
-
-    interface ICanonicalizationAlgorithmConstructable {
-        new (): Transform;
-    }
-    /**
-     * Represents the abstract base class from which all <Transform> elements
-     * that can be used in an XML digital signature derive.
-     */
-    abstract class Transform extends XmlObject implements Transform {
-        protected innerXml: Node;
-        LoadXml(value: Node): void;
-        /**
-         * Returns the XML representation of the current Transform object.
-         * @returns Element
-         */
-        GetXml(): Element;
-    }
-
-    /**
-     * Represents the enveloped signature transform for an XML digital signature as defined by the W3C.
-     */
-    class XmlDsigEnvelopedSignatureTransform extends Transform {
-        Algorithm: string;
-        /**
-         * Returns the output of the current XmlDsigEnvelopedSignatureTransform object.
-         * @returns string
-         */
-        GetOutput(): string;
-    }
-
-    /**
-     * Represents the C14N XML canonicalization transform for a digital signature
-     * as defined by the World Wide Web Consortium (W3C), without comments.
-     */
-    class XmlDsigC14NTransform extends Transform {
-        protected xmlCanonicalizer: XmlCanonicalizer;
-        Algorithm: string;
-        /**
-         * Returns the output of the current XmlDsigC14NTransform object.
-         * @returns string
-         */
-        GetOutput(): string;
-    }
-    /**
-     * Represents the C14N XML canonicalization transform for a digital signature
-     * as defined by the World Wide Web Consortium (W3C), with comments.
-     */
-    class XmlDsigC14NWithCommentsTransform extends XmlDsigC14NTransform {
-        Algorithm: string;
-        protected xmlCanonicalizer: XmlCanonicalizer;
-    }
-
-    /**
-     * Represents the exclusive C14N XML canonicalization transform for a digital signature
-     * as defined by the World Wide Web Consortium (W3C), without comments.
-     */
-    class XmlDsigExcC14NTransform extends Transform {
-        protected xmlCanonicalizer: XmlCanonicalizer;
-        Algorithm: string;
-        /**
-         * Gets or sets a string that contains namespace prefixes to canonicalize
-         * using the standard canonicalization algorithm.
-         */
-        InclusiveNamespacesPrefixList: string;
-        /**
-         * Returns the output of the current XmlDsigExcC14NTransform object
-         */
-        GetOutput(): string;
-    }
-    /**
-     * Represents the exclusive C14N XML canonicalization transform for a digital signature
-     * as defined by the World Wide Web Consortium (W3C), with comments.
-     */
-    class XmlDsigExcC14NWithCommentsTransform extends XmlDsigExcC14NTransform {
-        Algorithm: string;
-        protected xmlCanonicalizer: XmlCanonicalizer;
-    }
-
-    class CryptoConfig {
-        static CreateFromName(name: string): Transform;
-        static CreateSignatureAlgorithm(namespace: string): SignatureAlgorithm;
-        static CreateHashAlgorithm(namespace: string): HashAlgorithm;
-    }
-
-    /**
-     * Represents the object element of an XML signature that holds data to be signed.
-     */
-    class DataObject extends XmlObject {
-        constructor();
-        constructor(id?: string, mimeType?: string, encoding?: string, data?: Element);
-        /**
-         * Gets or sets the data value of the current DataObject object.
-         */
-        Data: NodeList;
-        /**
-         * Gets or sets the encoding of the current DataObject object.
-         */
-        Encoding: string;
-        /**
-         * Gets or sets the identification of the current DataObject object.
-         */
-        Id: string;
-        /**
-         * Gets or sets the MIME type of the current DataObject object.
-         */
-        MimeType: string;
-        /**
-         * Returns the XML representation of the DataObject object.
-         * @returns Element
-         */
-        GetXml(): Element;
-        /**
-         * Loads a DataObject state from an XML element.
-         * @param  {Element} value
-         * @returns void
-         */
-        LoadXml(value: Element): void;
-    }
-
-    /**
-     * Represents the <reference> element of an XML signature.
-     */
-    class Reference extends XmlObject {
-
-        constructor(p?: string);
-        /**
-         * Gets or sets the digest method Uniform Resource Identifier (URI) of the current
-         */
-        DigestMethod: string;
-        /**
-         * Gets or sets the digest value of the current Reference.
-         */
-        DigestValue: ArrayBuffer;
-        /**
-         * Gets or sets the ID of the current Reference.
-         */
-        Id: string;
-        /**
-         * Gets the transform chain of the current Reference.
-         */
-        TransformChain: Transform[];
-        /**
-         * Gets or sets the type of the object being signed.
-         */
-        Type: string;
-        /**
-         * Gets or sets the Uri of the current Reference.
-         */
-        Uri: string;
-        /**
-         * Adds a Transform object to the list of transforms to be performed
-         * on the data before passing it to the digest algorithm.
-         * @param  {Transform} transform The transform to be added to the list of transforms.
-         * @returns void
-         */
-        AddTransform(transform: Transform): void;
-        /**
-         * Returns the XML representation of the Reference.
-         * @returns Element
-         */
-        GetXml(): Element;
-        /**
-         * Loads a Reference state from an XML element.
-         * @param  {Element} value
-         */
-        LoadXml(value: Element): void;
-    }
-
-    /**
-     * Represents an XML digital signature or XML encryption <KeyInfo> element.
-     */
-    class KeyInfo extends XmlObject {
-        constructor();
-        /**
-         * Gets the number of KeyInfoClause objects contained in the KeyInfo object.
-         */
-        length: number;
-        /**
-         * Gets or sets the key information identity.
-         */
-        Id: string;
-        /**
-         * Returns an enumerator of the KeyInfoClause objects in the KeyInfo object.
-         * @param  {any} requestedObjectType?
-         */
-        GetEnumerator(): Array<KeyInfoClause>;
-        GetEnumerator(requestedObjectType: any): Array<KeyInfoClause>;
-        /**
-         * Returns an enumerator of the KeyInfoClause objects in the KeyInfo object.
-         * @param  {KeyInfoClause} clause The KeyInfoClause to add to the KeyInfo object.
-         * @returns void
-         */
-        AddClause(clause: KeyInfoClause): void;
-        /**
-         * Returns the XML representation of the KeyInfo object.
-         * @returns Node
-         */
-        GetXml(): Node;
-        /**
-         * Loads a KeyInfo state from an XML element.
-         * @param  {Element} value
-         * @returns void
-         */
-        LoadXml(value: Element): void;
-    }
-    interface KeyInfoClause extends IXmlSerializable {
-        Key: CryptoKey;
-        importKey(key: CryptoKey): PromiseType;
-        exportKey(alg: Algorithm): PromiseType;
-    }
-
-    /**
-     * Represents the <Signature> element of an XML signature.
-     */
-    class Signature extends XmlObject {
-
-        constructor();
-        /**
-         * Gets or sets the ID of the current Signature.
-         */
-        Id: string;
-        /**
-         * Gets or sets the KeyInfo of the current Signature.
-         */
-        KeyInfo: KeyInfo;
-        /**
-         * Gets or sets a list of objects to be signed.
-         */
-        ObjectList: Array<DataObject>;
-        /**
-         * Gets or sets the value of the digital signature.
-         */
-        SignatureValue: Uint8Array;
-        /**
-         * Gets or sets the SignedInfo of the current Signature.
-         */
-        SignedInfo: SignedInfo;
-        /**
-         * Adds a DataObject to the list of objects to be signed.
-         * @param  {DataObject} dataObject The DataObject to be added to the list of objects to be signed.
-         * @returns void
-         */
-        AddObject(dataObject: DataObject): void;
-        /**
-         * Returns the XML representation of the Signature.
-         * @returns Element
-         */
-        GetXml(): Element;
-        /**
-         * Loads a Signature state from an XML element.
-         * @param  {Element} value
-         * @returns void
-         */
-        LoadXml(value: Element): void;
-    }
-    const XmlSignature: {
-        ElementNames: {
-            CanonicalizationMethod: string;
-            DigestMethod: string;
-            DigestValue: string;
-            DSAKeyValue: string;
-            EncryptedKey: string;
-            HMACOutputLength: string;
-            RSAPSSParams: string;
-            MaskGenerationFunction: string;
-            SaltLength: string;
-            KeyInfo: string;
-            KeyName: string;
-            KeyValue: string;
-            Modulus: string;
-            Exponent: string;
-            Manifest: string;
-            Object: string;
-            Reference: string;
-            RetrievalMethod: string;
-            RSAKeyValue: string;
-            ECKeyValue: string;
-            NamedCurve: string;
-            PublicKey: string;
-            Signature: string;
-            SignatureMethod: string;
-            SignatureValue: string;
-            SignedInfo: string;
-            Transform: string;
-            Transforms: string;
-            X509Data: string;
-            X509IssuerSerial: string;
-            X509IssuerName: string;
-            X509SerialNumber: string;
-            X509SKI: string;
-            X509SubjectName: string;
-            X509Certificate: string;
-            X509CRL: string;
-        };
-        AttributeNames: {
-            Algorithm: string;
-            Encoding: string;
-            Id: string;
-            MimeType: string;
-            Type: string;
-            URI: string;
-        };
-        AlgorithmNamespaces: {
-            XmlDsigBase64Transform: string;
-            XmlDsigC14NTransform: string;
-            XmlDsigC14NWithCommentsTransform: string;
-            XmlDsigEnvelopedSignatureTransform: string;
-            XmlDsigXPathTransform: string;
-            XmlDsigXsltTransform: string;
-            XmlDsigExcC14NTransform: string;
-            XmlDsigExcC14NWithCommentsTransform: string;
-            XmlDecryptionTransform: string;
-            XmlLicenseTransform: string;
-        };
-        Uri: {
-            Manifest: string;
-        };
-        NamespaceURI: string;
-        NamespaceURIMore: string;
-        NamespaceURIPss: string;
-        Prefix: string;
-        GetChildElement: (xel: Node, element: string, ns: string) => Element;
-        GetAttributeFromElement: (xel: Element, attribute: string, element: string) => string;
-        GetChildElements: (xel: Element, element: string) => Element[];
-    };
-
-    /**
-     * The SignedInfo class represents the <SignedInfo> element
-     * of an XML signature defined by the XML digital signature specification
-     */
-    class SignedInfo extends XmlObject {
-
-        constructor(signedXml?: SignedXml);
-        /**
-         * Gets or sets the canonicalization algorithm that is used before signing
-         * for the current SignedInfo object.
-         */
-        CanonicalizationMethod: string;
-        /**
-         * Gets a Transform object used for canonicalization.
-         * @returns Transform
-         */
-        CanonicalizationMethodObject: Transform;
-        /**
-         * Gets the number of references in the current SignedInfo object.
-         */
-        Count: number;
-        /**
-         * Gets or sets the ID of the current SignedInfo object.
-         */
-        Id: string;
-        /**
-         * Gets a value that indicates whether the collection is read-only.
-         * @returns boolean
-         */
-        IsReadOnly: boolean;
-        /**
-         * Gets a value that indicates whether the collection is synchronized.
-         * @returns boolean
-         */
-        IsSynchronized: boolean;
-        /**
-         * Gets a list of the Reference objects of the current SignedInfo object.
-         */
-        References: Reference[];
-        /**
-         * Gets or sets the length of the signature for the current SignedInfo object.
-         */
-        SignatureLength: string;
-        /**
-         * Gets or sets the name of the algorithm used for signature generation
-         * and validation for the current SignedInfo object.
-         */
-        SignatureMethod: string;
-        SignatureParams: XmlObject;
-        /**
-         * Gets an object to use for synchronization.
-         */
-        SyncRoot: any;
-        /**
-         * Adds a Reference object to the list of references to digest and sign.
-         * @param  {Reference} reference The reference to add to the list of references.
-         * @returns void
-         */
-        AddReference(reference: Reference): void;
-        /**
-         * Copies the elements of this instance into an Array object, starting at a specified index in the array.
-         * @param  {any[]} array
-         * @param  {number} index
-         * @returns void
-         */
-        CopyTo(array: any[], index: number): void;
-        /**
-         * Returns the XML representation of the SignedInfo object.
-         * @returns Node
-         */
-        GetXml(): Node;
-        /**
-         * Loads a SignedInfo state from an XML element.
-         * @param  {Element} value
-         * @returns void
-         */
-        LoadXml(value: Element): void;
-    }
-
-    /**
-    * Provides a wrapper on a core XML signature object to facilitate creating XML signatures.
-    */
-    class SignedXml extends XmlObject {
-        /**
-         * Gets or sets the KeyInfo object of the current SignedXml object.
-         */
-        KeyInfo: KeyInfo;
-        /**
-         * Gets the Signature object of the current SignedXml object.
-         */
-        Signature: Signature;
-        /**
-         * Gets or sets the prefix for the current SignedXml object.
-         */
-        Prefix: string;
-        /**
-         * Gets the length of the signature for the current SignedXml object.
-         */
-        SignatureLength: number;
-        SignatureMethod: string;
-        /**
-         * Gets the signature value of the current SignedXml object.
-         */
-        SignatureValue: ArrayBuffer;
-        /**
-         * Gets the CanonicalizationMethod of the current SignedXml object.
-         */
-        CanonicalizationMethod: string;
-        /**
-         * Gets the SignedInfo object of the current SignedXml object.
-         */
-        SignedInfo: SignedInfo;
-        /**
-         * Gets or sets the asymmetric algorithm key used for signing a SignedXml object.
-         */
-        SigningKey: CryptoKey;
-        /**
-         * Gets or sets the name of the installed key to be used for signing the SignedXml object.
-         */
-        SigningKeyName: string;
-        /**
-         * @param {string} idMode. Value of "wssecurity" will create/validate id's with the ws-security namespace
-         */
-        constructor();
-        constructor(node: Document);
-        constructor(node: Element);
-        /**
-         * Adds a Reference object to the SignedXml object that describes a digest method,
-         * digest value, and transform to use for creating an XML digital signature.
-         * @param  {Reference} reference The Reference object that describes a digest method, digest value,
-         * and transform to use for creating an XML digital signature.
-         * @returns void
-         */
-        AddReference(reference: Reference): void;
-        /**
-         * Computes an XML digital signature using the specified algorithm.
-         * @param  {Algorithm} algorithm Specified WebCrypto Algoriithm
-         * @returns PromiseType
-         */
-        ComputeSignature(algorithm: Algorithm): PromiseType;
-        /**
-         * Determines whether the SignedXml.Signature property verifies using the public key in the signature.
-         * @returns PromiseType
-         */
-        CheckSignature(): PromiseType;
-        CheckSignature(key: CryptoKey): PromiseType;
-        CheckSignature(cert: X509Certificate): PromiseType;
-        /**
-         * Loads a SignedXml state from an XML element.
-         * @param  {Element} value The XML element to load the SignedXml state from.
-         * @returns void
-         */
-        LoadXml(value: Element): void;
-        /**
-         * Returns the XML representation of a SignedXml object.
-         * @returns Element
-         */
-        GetXml(): Element;
-    }
-}
diff --git a/types/xadesjs/tsconfig.json b/types/xadesjs/tsconfig.json
deleted file mode 100644
index 1a5e5c7ca1..0000000000
--- a/types/xadesjs/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "xadesjs-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/xadesjs/xadesjs-tests.ts b/types/xadesjs/xadesjs-tests.ts
deleted file mode 100644
index d2f97683d9..0000000000
--- a/types/xadesjs/xadesjs-tests.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-let xmlString = "<root><child1/><child2/><child3/></root>";
-let xmlDoc = new DOMParser().parseFromString(xmlString, "application/xml");
-let signedXml = new xadesjs.SignedXml(xmlDoc);
-
-let alg = {
-    name: "ECDSA",
-    namedCurve: "P-256"
-};
-xadesjs.Application.crypto.subtle.generateKey(
-    alg,
-    false,
-    ["sign", "verify"]
-)
-    .then((keys: CryptoKeyPair) => {
-        signedXml.SigningKey = keys.privateKey;
-
-        // Add the key to the SignedXml document.
-        // Create a reference to be signed.
-        let reference = new xadesjs.Reference();
-        reference.Uri = "";
-        // Add an enveloped transformation to the reference.
-        reference.AddTransform(new xadesjs.XmlDsigEnvelopedSignatureTransform());
-        // Add the reference to the SignedXml object.
-        signedXml.AddReference(reference);
-        // Set prefix for Signature namespace
-        signedXml.Prefix = "ds";
-
-        // Compute the signature.
-        return signedXml.ComputeSignature({ name: "ECDSA", hash: { name: "SHA-256" } } as any);
-    })
-    .then(function () {
-        // Append signature
-        let xmlDigitalSignature = signedXml.GetXml();
-        xmlDoc.documentElement.appendChild(xmlDigitalSignature);
-
-        // Serialize XML document
-        let signedDocument = new XMLSerializer().serializeToString(xmlDoc);
-        return Promise.resolve(signedDocument);
-    })
-    .then((doc: string) => {
-        console.log("Signed document:", doc);
-    })
-    // .catch((e: any) => {
-    //     console.error("Error", e);
-    // });
\ No newline at end of file
diff --git a/types/xdate/tslint.json b/types/xdate/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xdate/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xdomain/tslint.json b/types/xdomain/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xdomain/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xml-parser/tslint.json b/types/xml-parser/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xml-parser/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xml2js/index.d.ts b/types/xml2js/index.d.ts
index 59af909a09..248f29814b 100644
--- a/types/xml2js/index.d.ts
+++ b/types/xml2js/index.d.ts
@@ -4,10 +4,12 @@
 //                 Jason McNeil <https://github.com/jasonrm>
 //                 Christopher Currens <https://github.com/ccurrens>
 //                 Edward Hinkle <https://github.com/edwardhinkle>
+//                 Behind The Math <https://github.com/BehindTheMath>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
 import { EventEmitter } from 'events';
+import * as processors from './lib/processors';
 
 export function parseString(xml: convertableToString, callback: (err: any, result: any) => void): void;
 export function parseString(xml: convertableToString, options: OptionsV2, callback: (err: any, result: any) => void): void;
@@ -31,8 +33,8 @@ export class Parser extends EventEmitter {
 export interface Options {
     async?: boolean;
     attrkey?: string;
-    attrNameProcessors?: [(name: string) => any];
-    attrValueProcessors?: [(name: string) => any];
+    attrNameProcessors?: Array<(name: string) => any>;
+    attrValueProcessors?: Array<(name: string) => any>;
     charkey?: string;
     charsAsChildren?: boolean;
     childkey?: string;
@@ -47,10 +49,10 @@ export interface Options {
     normalize?: boolean;
     normalizeTags?: boolean;
     strict?: boolean;
-    tagNameProcessors?: [(name: string) => any];
+    tagNameProcessors?: Array<(name: string) => any>;
     trim?: boolean;
     validator?: Function;
-    valueProcessors?: [(name: string) => any];
+    valueProcessors?: Array<(name: string) => any>;
     xmlns?: boolean;
 }
 
@@ -76,3 +78,5 @@ export interface OptionsV2 extends Options {
 export interface convertableToString {
     toString(): string;
 }
+
+export { processors };
diff --git a/types/xml2js/xml2js-tests.ts b/types/xml2js/xml2js-tests.ts
index 4ee1c04e5a..d3298dbf4c 100644
--- a/types/xml2js/xml2js-tests.ts
+++ b/types/xml2js/xml2js-tests.ts
@@ -33,7 +33,7 @@ xml2js.parseString('<root>Hello xml2js!</root>', {
 }, (err: any, result: any) => { });
 
 xml2js.parseString('<root>Hello xml2js!</root>', {
-    attrNameProcessors: [processors.firstCharLowerCase],
+    attrNameProcessors: [processors.firstCharLowerCase, xml2js.processors.normalize],
     attrValueProcessors: [processors.normalize],
     tagNameProcessors: [processors.stripPrefix],
     valueProcessors: [processors.parseBooleans, processors.parseNumbers]
diff --git a/types/xmlbuilder/index.d.ts b/types/xmlbuilder/index.d.ts
index cd018e8e55..2115d30754 100644
--- a/types/xmlbuilder/index.d.ts
+++ b/types/xmlbuilder/index.d.ts
@@ -5,85 +5,87 @@
 
 
 export = xmlbuilder;
-declare class XMLDocType {
-    clone(): XMLDocType;
-    element(name: string, value?: Object): XMLDocType;
-    attList(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
-    entity(name: string, value: any): XMLDocType;
-    pEntity(name: string, value: any): XMLDocType;
-    notation(name: string, value: any): XMLDocType;
-    cdata(value: string): XMLDocType;
-    comment(value: string): XMLDocType;
-    instruction(target: string, value: any): XMLDocType;
-    root(): XMLDocType;
-    document(): any;
-    toString(options?: Object, level?: Number): string;
-
-    ele(name: string, value?: Object): XMLDocType;
-    att(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
-    ent(name: string, value: any): XMLDocType;
-    pent(name: string, value: any): XMLDocType;
-    not(name: string, value: any): XMLDocType;
-    dat(value: string): XMLDocType;
-    com(value: string): XMLDocType;
-    ins(target: string, value: any): XMLDocType;
-    up(): XMLDocType;
-    doc(): any;
-}
-
-declare class XMLElementOrXMLNode {
-    // XMLElement:
-    clone(): XMLElementOrXMLNode;
-    attribute(name: any, value?: any): XMLElementOrXMLNode;
-    att(name: any, value?: any): XMLElementOrXMLNode;
-    removeAttribute(name: string): XMLElementOrXMLNode;
-    instruction(target: string, value: any): XMLElementOrXMLNode;
-    instruction(array: Array<any>): XMLElementOrXMLNode;
-    instruction(obj: Object): XMLElementOrXMLNode;
-    ins(target: string, value: any): XMLElementOrXMLNode;
-    ins(array: Array<any>): XMLElementOrXMLNode;
-    ins(obj: Object): XMLElementOrXMLNode;
-    a(name: any, value?: any): XMLElementOrXMLNode;
-    i(target: string, value: any): XMLElementOrXMLNode;
-    i(array: Array<any>): XMLElementOrXMLNode;
-    i(obj: Object): XMLElementOrXMLNode;
-    toString(options?: Object, level?: Number): string;
-    // XMLNode:
-    element(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    ele(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    insertBefore(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    insertAfter(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    remove(): XMLElementOrXMLNode;
-    node(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    text(value: string): XMLElementOrXMLNode;
-    cdata(value: string): XMLElementOrXMLNode;
-    comment(value: string): XMLElementOrXMLNode;
-    raw(value: string): XMLElementOrXMLNode;
-    declaration(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
-    doctype(pubID: string, sysID: string): XMLDocType;
-    up(): XMLElementOrXMLNode;
-    importDocument(input: XMLElementOrXMLNode): XMLElementOrXMLNode;
-    root(): XMLElementOrXMLNode;
-    document(): any;
-    end(options?: Object): string;
-    prev(): XMLElementOrXMLNode;
-    next(): XMLElementOrXMLNode;
-    nod(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    txt(value: string): XMLElementOrXMLNode;
-    dat(value: string): XMLElementOrXMLNode;
-    com(value: string): XMLElementOrXMLNode;
-    doc(): XMLElementOrXMLNode;
-    dec(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
-    dtd(pubID: string, sysID: string): XMLDocType;
-    e(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    n(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-    t(value: string): XMLElementOrXMLNode;
-    d(value: string): XMLElementOrXMLNode;
-    c(value: string): XMLElementOrXMLNode;
-    r(value: string): XMLElementOrXMLNode;
-    u(): XMLElementOrXMLNode;
-}
 
 declare namespace xmlbuilder {
+
+    class XMLDocType {
+        clone(): XMLDocType;
+        element(name: string, value?: Object): XMLDocType;
+        attList(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
+        entity(name: string, value: any): XMLDocType;
+        pEntity(name: string, value: any): XMLDocType;
+        notation(name: string, value: any): XMLDocType;
+        cdata(value: string): XMLDocType;
+        comment(value: string): XMLDocType;
+        instruction(target: string, value: any): XMLDocType;
+        root(): XMLDocType;
+        document(): any;
+        toString(options?: Object, level?: Number): string;
+
+        ele(name: string, value?: Object): XMLDocType;
+        att(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
+        ent(name: string, value: any): XMLDocType;
+        pent(name: string, value: any): XMLDocType;
+        not(name: string, value: any): XMLDocType;
+        dat(value: string): XMLDocType;
+        com(value: string): XMLDocType;
+        ins(target: string, value: any): XMLDocType;
+        up(): XMLDocType;
+        doc(): any;
+    }
+
+    class XMLElementOrXMLNode {
+        // XMLElement:
+        clone(): XMLElementOrXMLNode;
+        attribute(name: any, value?: any): XMLElementOrXMLNode;
+        att(name: any, value?: any): XMLElementOrXMLNode;
+        removeAttribute(name: string): XMLElementOrXMLNode;
+        instruction(target: string, value: any): XMLElementOrXMLNode;
+        instruction(array: Array<any>): XMLElementOrXMLNode;
+        instruction(obj: Object): XMLElementOrXMLNode;
+        ins(target: string, value: any): XMLElementOrXMLNode;
+        ins(array: Array<any>): XMLElementOrXMLNode;
+        ins(obj: Object): XMLElementOrXMLNode;
+        a(name: any, value?: any): XMLElementOrXMLNode;
+        i(target: string, value: any): XMLElementOrXMLNode;
+        i(array: Array<any>): XMLElementOrXMLNode;
+        i(obj: Object): XMLElementOrXMLNode;
+        toString(options?: Object, level?: Number): string;
+        // XMLNode:
+        element(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        ele(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        insertBefore(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        insertAfter(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        remove(): XMLElementOrXMLNode;
+        node(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        text(value: string): XMLElementOrXMLNode;
+        cdata(value: string): XMLElementOrXMLNode;
+        comment(value: string): XMLElementOrXMLNode;
+        raw(value: string): XMLElementOrXMLNode;
+        declaration(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
+        doctype(pubID: string, sysID: string): XMLDocType;
+        up(): XMLElementOrXMLNode;
+        importDocument(input: XMLElementOrXMLNode): XMLElementOrXMLNode;
+        root(): XMLElementOrXMLNode;
+        document(): any;
+        end(options?: Object): string;
+        prev(): XMLElementOrXMLNode;
+        next(): XMLElementOrXMLNode;
+        nod(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        txt(value: string): XMLElementOrXMLNode;
+        dat(value: string): XMLElementOrXMLNode;
+        com(value: string): XMLElementOrXMLNode;
+        doc(): XMLElementOrXMLNode;
+        dec(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
+        dtd(pubID: string, sysID: string): XMLDocType;
+        e(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        n(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+        t(value: string): XMLElementOrXMLNode;
+        d(value: string): XMLElementOrXMLNode;
+        c(value: string): XMLElementOrXMLNode;
+        r(value: string): XMLElementOrXMLNode;
+        u(): XMLElementOrXMLNode;
+    }
+
     function create(nameOrObjSpec: string | { [name:string]: Object }, xmldec?: Object, doctype?: any, options?: Object): XMLElementOrXMLNode;
 }
diff --git a/types/xmlbuilder/tslint.json b/types/xmlbuilder/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xmlbuilder/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xmldoc/index.d.ts b/types/xmldoc/index.d.ts
index 53f21f2027..d4e9f92ec6 100644
--- a/types/xmldoc/index.d.ts
+++ b/types/xmldoc/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for xmldoc 1.1
 // Project: https://www.npmjs.com/package/xmldoc
-// Definitions by:  Xavier Stouder <https://github.com/Xstoudi>, Andrew Sheehan <https://github.com/ajsheehan>
+// Definitions by:  Xavier Stouder <https://github.com/Xstoudi>
+//                  Andrew Sheehan <https://github.com/ajsheehan>
+//                  Jordi Bunster <https://github.com/notlaforge>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped): // TypeScript Version: 2.1
 
 export class XmlDocument extends XmlElement {
@@ -18,6 +20,10 @@ export class XmlElement {
     children: XmlElement[];
     firstChild: XmlElement;
     lastChild: XmlElement;
+    line: number;
+    column: number;
+    position: number;
+    startTagPosition: number;
 
     eachChild(func: (child: XmlElement, index?: number, array?: XmlElement[]) => void): void;
     childNamed(name: string): XmlElement;
diff --git a/types/xmldom/tslint.json b/types/xmldom/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xmldom/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xmlpoke/tslint.json b/types/xmlpoke/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xmlpoke/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xmlrpc/tslint.json b/types/xmlrpc/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xmlrpc/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xmltojson/tslint.json b/types/xmltojson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xmltojson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xregexp/tslint.json b/types/xregexp/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xregexp/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index a3b49f391d..3f6cac4711 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -1,17 +1,34 @@
-// Type definitions for Microsoft Dynamics xRM API 8.2
-// Project: http://www.microsoft.com/en-us/download/details.aspx?id=44567
-// Definitions by: David Berry <https://github.com/6ix4our>, Matt Ngan <https://github.com/mattngan>, Markus Mauch <https://github.com/markusmauch>, Daryl LaBar <https://github.com/daryllabar>, Tully H <https://github.com/clownwilleatme>
+// Type definitions for Microsoft Dynamics xRM API 9.0
+// Project: https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/developer-guide
+// Definitions by:  David Berry <https://github.com/6ix4our>
+//                  Matt Ngan <https://github.com/mattngan>
+//                  Markus Mauch <https://github.com/markusmauch>
+//                  Daryl LaBar <https://github.com/daryllabar>
+//                  Tully H <https://github.com/clownwilleatme>
+//                  Scott Durow <https://github.com/scottdurow>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.4
 
 declare var Xrm: Xrm.XrmStatic;
-declare function GetGlobalContext(): Xrm.Context;
+
+/**
+ * Gets the global context.
+ * The method provides access to the global context without going through the form context.
+ *
+ * It is preferreed to use {@link Xrm.Utility.getGlobalContext Xrm.Utility.getGlobalContext()} instead.
+ * @see {@link Xrm.Utility.getGlobalContext}
+ */
+declare function GetGlobalContext(): Xrm.GlobalContext;
 
 interface Window {
     Xrm: Xrm.XrmStatic;
-    GetGlobalContext(): Xrm.Context;
+    GetGlobalContext(): Xrm.GlobalContext;
 }
 
+/**
+ * Xrm Namespace
+ * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference External Link: Client API Reference}
+ */
 declare namespace Xrm {
     /**
      * Static xRM object.
@@ -19,39 +36,99 @@ declare namespace Xrm {
     interface XrmStatic {
         /**
          * Provides a namespace container for the context, data and ui objects.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         Page: Page;
 
+        /** Provides navigation-related methods.
+         */
+        Navigation: Navigation;
+
         /**
          * Provides a container for useful functions not directly related to the current page.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
          */
         Utility: Utility;
 
         /**
          * Provides methods to create and manage records in the mobile clients (for phones tablets).
+         * @deprecated Use {@link Xrm.WebApi} instead.
          */
         Mobile: Mobile;
 
         /**
-         * Provides methods to display a web page in the side pane of web client.
+         * Provides a method to display a web page in the side pane of the Customer Engagement form.
          *
-         * @see {@link https://msdn.microsoft.com/en-us/library/mt790281.aspx} for details.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel External Link: Xrm.Panel}
          */
         Panel: Panel;
+
+        /**
+         * Provides properties and methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement.
+         *
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi External Link: Xrm.WebApi (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/use-microsoft-dynamics-365-web-api External Link: Use the Customer Engagement Web API}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/webapi/get-started-web-api-client-side-javascript External Link: Get started with the Customer Engagement Web API (client-side JavaScript)}
+         */
+        WebApi: WebApi;
+
+        /**
+         * Provides methods to use native device capabilities of mobile devices.
+         *
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
+         */
+        Device: Device;
+
+        /**
+         * Provides methods to encode strings.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding External Link: Xrm.Encoding (Client API reference)}
+         */
+        Encoding: Encoding;
     }
 
     /**
-     * Client Types for Xrm.Page.context.getClient().
+     * Client Types for {@link ClientContext.getClient clientContext.getClient()}.
+     * @see {@link XrmEnum.Client}
      */
-    type Client = "Web" | "Outlook" | "Mobile";
+    type Client = "Web" | "Outlook" | "Mobile" | "UnifiedServiceDesk";
 
     /**
-     * Client States for Xrm.Page.context.getClientState().
+     * Client States for {@link ClientContext.getClientState clientContext.getClientState()}.
+     * @see {@link XrmEnum.ClientState}
      */
     type ClientState = "Online" | "Offline";
 
     /**
-     * Themes for Xrm.Page.context.getCurrentTheme().
+     * Display States for setDisplayState() on {@link Controls.ProcessControl.setDisplayState Processes} and {@link Controls.Tab.setDisplayState Tabs}.
+     * @see {@link XrmEnum.DisplayState}
+     */
+    type DisplayState = "collapsed" | "expanded";
+
+    /**
+     * The {@link Entity.save Entity}'s Save Mode
+     * @see {@link XrmEnum.EntitySaveMode}
+     * @see {@link Entity}
+     * @see {@link Entity.save}
+     */
+    type EntitySaveMode = "saveandclose" | "saveandnew";
+
+    /**
+     * Form Notification Levels for {@link Ui.setFormNotification formContext.ui.setFormNotification()}.
+     * @see {@link XrmEnum.FormNotificationLevel}
+     */
+    type FormNotificationLevel = "ERROR" | "INFO" | "WARNING";
+
+    /**
+     * Submit Mode for {@link Attributes.Attribute.setSubmitMode} Attributes.Attribute.setSubmitMode().
+     * @see {@link XrmEnum.SubmitMode}
+     */
+    type SubmitMode = "always" | "dirty" | "never";
+
+    /**
+     * Themes for {@link GlobalContext.getCurrentTheme globalContext.getCurrentTheme()}.
+     * @remarks getCurrentTheme() does not work with Dynamics CRM for tablets or in the unified interface.
+     * @see {@link XrmEnum.Theme}
      */
     type Theme = "default" | "Office12Blue" | "Office14Silver";
 
@@ -61,144 +138,497 @@ declare namespace Xrm {
     interface ClientContext {
         /**
          * Returns a value to indicate which client the script is executing in.
-         *
-         * @return  The client, as either "Web", "Outlook", or "Mobile"
+         * @returns The client, as either "Web", "Outlook", or "Mobile"
          */
         getClient(): Client;
 
         /**
          * Gets client's current state.
-         *
-         * @return  The client state, as either "Online" or "Offline"
+         * @returns The client state, as either "Online" or "Offline"
          */
         getClientState(): ClientState;
+
+        /**
+         * Use this method to get information about the kind of device the user is using.
+         */
+        getFormFactor(): XrmEnum.ClientFormFactor;
+
+        /**
+         * Returns information whether the server is online or offline.
+         */
+        isOffline(): boolean;
+    }
+
+    /**
+     * Returns information about the current organization settings.
+     */
+    interface OrganizationSettings {
+        /**
+         * Returns the ID of the base currency for the current organization.
+         */
+        baseCurrencyId: string;
+
+        /**
+         * Returns the default country/region code for phone numbers for the current organization.
+         */
+        defaultCountryCode: string;
+        /**
+         * Indicates whether the auto-save option is enabled for the current organization.
+         */
+        isAutoSaveEnabled: boolean;
+
+        /**
+         * Returns the preferred language ID for the current organization.
+         */
+        languageId: number;
+
+        /**
+         * Returns the ID of the current organization.
+         */
+        organizationId: string;
+
+        /**
+         * Returns the unique name of the current organization.
+         */
+        uniqueName: string;
+
+        /**
+         * Indicates whether the Skype protocol is used for the current organization.
+         */
+        useSkypeProtocol: boolean;
+    }
+
+    /**
+     * Interface for the DateFormattingInfo.calendar field
+     */
+    interface Calendar {
+        MinSupportedDateTime: Date;
+        MaxSupportedDateTime: Date;
+        AlgorithmType: number;
+        CalendarType: number;
+        Eras: number[];
+        TwoDigitYearMax: number;
+        IsReadOnly: boolean;
+    }
+
+    /**
+     * Interface for UserSettings.dateFormattingInfo response
+     */
+    interface DateFormattingInfo {
+        amDesignator: string;
+        abbreviatedDayNames: string[];
+        abbreviatedMonthGenitiveNames: string[];
+        abbreviatedMonthNames: string[];
+        calendarWeekRule: number;
+        calendar: Calendar;
+        dateSeparator: string;
+        dayNames: string[];
+        firstDayOfWeek: number;
+        fullDateTimePattern: string;
+        longDatePattern: string;
+        longTimePattern: string;
+        monthDayPattern: string;
+        monthGenitiveNames: string[];
+        monthNames: string[];
+        pmDesignator: string;
+        shortDatePattern: string;
+        shortTimePattern: string;
+        shortestDayNames: string[];
+        sortableDateTimePattern: string;
+        timeSeparator: string;
+        universalSortableDateTimePattern: string;
+        yearMonthPattern: string;
+    }
+
+    /**
+     * Holds information about the current user settings.
+     */
+    interface UserSettings {
+        /**
+         * Returns the date formatting information for the current user.
+         */
+        dateFormattingInfo(): DateFormattingInfo;
+        /**
+         * Returns the ID of the default dashboard for the current user.
+         */
+        defaultDashboardId: string;
+        /**
+         * Indicates whether guided help is enabled for the current user.
+         */
+        isGuidedHelpEnabled: boolean;
+        /**
+         * Indicates whether high contrast is enabled for the current user.
+         */
+        isHighContrastEnabled: boolean;
+        /**
+         * Indicates whether the language for the current user is a right-to-left (RTL) language.
+         */
+        isRTL: boolean;
+        /**
+         * Returns the language ID for the current user.
+         */
+        languageId: number;
+        /**
+         * Returns an array of strings that represent the GUID values of each of the security role privilege that the user is associated with or any teams that the user is associated with.
+         */
+        securityRolePrivileges: string[];
+        /**
+         * Returns an array of strings that represent the GUID values of each of the security role that the user is associated with or any teams that the user is associated with.
+         */
+        securityRoles: string[];
+        /**
+         * Returns the transaction currency ID for the current user.
+         */
+        transactionCurrencyId: string;
+        /**
+         * Returns the GUID of the SystemUser.Id value for the current user.
+         */
+        userId: string;
+        /**
+         * Returns the name of the current user.
+         */
+        userName: string;
+        /**
+         * Returns the difference in minutes between the local time and Coordinated Universal Time (UTC).
+         */
+        getTimeZoneOffsetMinutes(): number;
+    }
+
+    /**
+     * properties of the current business app in Customer Engagement.
+     */
+    interface AppProperties {
+        appId?: string;
+        displayName?: string;
+        uniqueName?: string;
+        url?: string;
+        webResourceId?: string;
+        webResourceName?: string;
+        welcomePageId?: string;
+        welcomePageName?: string;
     }
 
     /**
      * Interface for the xRM application context.
+     * GetGlobalContext()
      */
-    interface Context {
+    interface GlobalContext {
         /**
          * The client's context instance.
          */
         client: ClientContext;
 
+        /**
+         * Returns information about the current organization settings.
+         */
+        organizationSettings: OrganizationSettings;
+
+        /**
+         * Returns information about the current user settings.
+         */
+        userSettings: UserSettings;
+
+        /**
+         * Returns information about the advanced configuration settings for the organization.
+         * @param setting Name of the configuration setting.
+         * @see {@link XrmEnum.AdvancedConfigSettingOption}
+         */
+        getAdvancedConfigSetting(setting: "MaxChildIncidentNumber" | "MaxIncidentMergeNumber"): number;
+
         /**
          * Gets client's base URL for Dynamics CRM
-         *
-         * @return  The client's base URL
-         *
-         * @remarks For Dynamics CRM On-Premises:               http(s)://server/org
-         *          For Dynamics CRM Online:                    https://org.crm.dynamics.com
-         *          For Dynamics CRM for Outlook (Offline):     http://localhost:2525
+         * @returns The client's base URL
+         * @example
+         * * For Dynamics CRM On-Premises:               http(s)://server/org
+         * * For Dynamics CRM Online:                    https://org.crm.dynamics.com
+         * * For Dynamics CRM for Outlook (Offline):     http://localhost:2525
          */
         getClientUrl(): string;
 
+        /**
+         * Returns the name of the current business app in Customer Engagement.
+         */
+        getCurrentAppName(): Async.PromiseLike<string>;
+
+        /**
+         * Returns the properties of the current business app in Customer Engagement.
+         */
+        getCurrentAppProperties(): Async.PromiseLike<AppProperties>;
+
+        /**
+         * Returns the URL of the current business app in Customer Engagement.
+         * @example
+         * * Online        https://**org**.crm.dynamics.com/main.aspx?appid=**GUID**
+         * * OnPrem        https://**server**\/**org**\/main.aspx?appid=**GUID**
+         * @returns A string containing the url of the current business app.
+         */
+        getCurrentAppUrl(): string;
+
         /**
          * Gets current styling theme.
-         *
-         * @return  The name of the current theme, as either "default", "Office12Blue", or "Office14Silver"
-         *
-         * @remarks This function does not work with Dynamics CRM for tablets.
+         * @remarks This function does not work with Dynamics CRM for tablets or in the unified interface.
+         * @returns The name of the current theme, as either "default", "Office12Blue", or "Office14Silver"
          */
         getCurrentTheme(): Theme;
 
         /**
          * Gets whether automatic save is enabled.
-         *
-         * @return  true if automatic saving is enabled, otherwise false.
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.isAutoSaveEnabled globalContext.organizationSettings.isAutoSaveEnabled} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns true if automatic saving is enabled, otherwise false.
          */
         getIsAutoSaveEnabled(): boolean;
 
         /**
          * Gets organization's LCID (language code).
-         *
-         * @return  The organization language code.
-         *
-         * @see     {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.languageId globalContext.organizationSettings.languageId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The organization language code.
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx External Link: Microsoft Locale ID Values}
          */
         getOrgLcid(): number;
 
         /**
          * Gets organization's unique name.
-         *
-         * @return  The organization's unique name.
-         *
-         * @remarks This value can be found on the Developer Resources page within Dynamics CRM
+         * @remarks This value can be found on the Developer Resources page within Dynamics CRM.
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.uniqueName} globalContext.organizationSettings.uniqueName instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The organization's unique name.
          */
         getOrgUniqueName(): string;
 
         /**
          * Gets query string parameters.
-         *
-         * @return  The query string parameters, in a dictionary object representing name and value pairs.
+         * @returns The query string parameters, in a dictionary object representing name and value pairs.
+         * @deprecated Deprecated in v9 (Still applicable in Web Client).
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         getQueryStringParameters(): { [index: string]: any };
 
         /**
          * Returns the difference between the local time and Coordinated Universal Time (UTC).
-         *
-         * @return  The time zone offset, in minutes.
+         * @returns The time zone offset, in minutes.
          */
         getTimeZoneOffsetMinutes(): number;
 
         /**
          * Gets user's unique identifier.
-         *
-         * @return  The user's identifier in Guid format.
-         *
-         * @remarks Example: "{B05EC7CE-5D51-DF11-97E0-00155DB232D0}"
+         * @deprecated Deprecated in v9.  Use {@link Xrm.UserSettings.userId globalContext.userSettings.userId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's identifier in Guid format.
+         * @example Example: "{B05EC7CE-5D51-DF11-97E0-00155DB232D0}"
          */
         getUserId(): string;
 
         /**
          * Gets user's LCID (language code).
-         *
-         * @return  The user's language code.
-         *
-         * @see     {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         * @deprecated Deprecated in v9. Use {@link Xrm.UserSettings.languageId globalContext.userSetings.languageId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's language code.
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx External Link: Microsoft Locale ID Values}
          */
         getUserLcid(): number;
 
         /**
          * Gets the name of the current user.
-         *
-         * @return  The user's name.
+         * @deprecated Deprecated in v9. Use {@link Xrm.UserSettings.userName globalContext.userSettings.userName} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's name.
          */
         getUserName(): string;
 
         /**
          * Gets all user security roles.
-         *
-         * @return  An array of user role identifiers, in Guid format.
-         *
-         * @remarks Example: ["cf4cc7ce-5d51-df11-97e0-00155db232d0"]
+         * @deprecated Deprecated in v9.  Use {@link Xrm.UserSettings.securityRoles globalContext.userSettings.securityRoles} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns An array of user role identifiers, in Guid format.
+         * @example Example: ["cf4cc7ce-5d51-df11-97e0-00155db232d0"]
          */
         getUserRoles(): string[];
 
         /**
          * Returns the version number of the Dynamics 365 server.
-         *
-         * @return The version number
+         * @returns The version number
          */
         getVersion(): string;
 
+        /**
+         * Returns a boolean value indicating if the Customer Engagement instance is hosted on- premises or online.
+         */
+        isOnPremise(): boolean;
+
         /**
          * Prefixes the current organization's unique name to a string; typically a URL path.
-         *
-         * @param   {string}    sPath   Local pathname of the resource.
-         *
-         * @return  A path string with the organization name.
-         *
-         * @remarks Format: "/"+ OrgName + sPath
+         * @param sPath Local pathname of the resource.
+         * @returns A path string with the organization name. Format: "/"+ OrgName + sPath
          */
         prependOrgName(sPath: string): string;
     }
 
+    namespace Events {
+        /**
+         * Interface for save event arguments.
+         */
+        interface SaveEventArguments {
+            /**
+             * @summary Gets save mode, as an integer.
+             * @returns The save mode.
+             * @description Gets save mode, as an integer.<BR>
+             * **Values returned are**:
+             * * 1      Save
+             * * 2      Save and Close
+             * * 59     Save and New
+             * * 70     AutoSave (Where enabled; can be used with an OnSave handler to conditionally disable auto-saving)
+             * * 58     Save as Completed (Activities)
+             * * 5      Deactivate
+             * * 6      Reactivate
+             * * 47     Assign (All user- or team-owned entities)
+             * * 7      Send (Email)
+             * * 16     Qualify (Lead)
+             * * 15     Disqualify (Lead)
+             */
+            getSaveMode(): XrmEnum.SaveMode;
+
+            /**
+             * Returns a boolean value to indicate if the record's save has been prevented.
+             * @returns true if saving is prevented, otherwise false.
+             */
+            isDefaultPrevented(): boolean;
+
+            /**
+             * Prevents the save operation from being submitted to the server.
+             * All remaining "on save" handlers will continue execution.
+             */
+            preventDefault(): void;
+        }
+
+        /**
+         * Interface for process stage change event arguments.
+         */
+        interface StageChangeEventArguments {
+            /**
+             * Gets the direction of the stage change.
+             * @returns The direction: "next" or "previous"
+             */
+            getDirection(): ProcessFlow.StageChangeDirection;
+
+            /**
+             * Gets the destination stage object
+             * @returns The stage object. For switching between entities, returns the previous stage object
+             */
+            getStage(): ProcessFlow.Stage;
+        }
+
+        /**
+         * Interface for process stage selected event arguments.
+         */
+        interface StageSelectedEventArguments {
+            /**
+             * Gets the selected stage object
+             * @returns The stage object
+             */
+            getStage(): ProcessFlow.Stage;
+        }
+
+        /**
+         * Interface for the event context.
+         * In the API documentation, this is sometimes refferred to as the executionContext.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/clientapi-execution-context External Link: Client API execution context}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/execution-context External Link: Execution context (Client API reference)}
+         */
+        interface EventContext {
+            /**
+             * Gets the Xrm context.
+             * @returns The Xrm context.
+             */
+            getContext(): GlobalContext;
+
+            /**
+             * Gets the handler's depth, which is the order in which the handler is executed.
+             * @returns The depth, a 0-based index.
+             */
+            getDepth(): number;
+
+            /**
+             * Gets a reference to the object for which event occurred.
+             * @returns The event source.
+             */
+            getEventSource(): Attributes.Attribute | Controls.Control | Entity;
+
+            /**
+             * Gets a reference to the currnet form context
+             * @returns The {@link FormContext form context}
+             */
+            getFormContext(): FormContext;
+
+            /**
+             * @summary Gets the shared variable with the specified key.
+             * @param T Generic type parameter.
+             * @param key The key.
+             * @returns The shared variable.
+             * @desc Gets the shared variable with the specified key.
+             * Used to pass values between handlers of an event.
+             */
+            getSharedVariable<T>(key: string): T;
+
+            /**
+             * @summary Sets a shared variable.
+             * @param T Generic type parameter.
+             * @param key The key.
+             * @param value The value.
+             * @desc Sets the shared variable with the specified key.
+             * Used to pass values between handlers of an event.
+             */
+            setSharedVariable<T>(key: string, value: T): void;
+        }
+
+        /**
+         * Interface for a save event context
+         */
+        interface SaveEventContext extends EventContext {
+            /**
+             * Gets save-event arguments.
+             * @returns The event arguments.  Returns null for all but the "save" event.
+             */
+            getEventArgs(): SaveEventArguments;
+        }
+
+        /**
+         * Interface for a process stage change event context
+         */
+        interface StageChangeEventContext extends EventContext {
+            /**
+             * Gets process stage change event arguments.
+             * @returns The event arguments.
+             */
+            getEventArgs(): StageChangeEventArguments;
+        }
+
+        interface StageSelectedEventContext extends EventContext {
+            /**
+             * Gets process stage selected event arguments.
+             * @returns The event arguments.
+             */
+            getEventArgs(): StageSelectedEventArguments;
+        }
+
+        /**
+         * Type for a context-sensitive handler.
+         * @param context The context.
+         */
+        type ContextSensitiveHandler = (context: EventContext) => void;
+
+        /**
+         * Type for a process status change handler.
+         * @param status The process status.
+         */
+        type ProcessStatusChangeHandler = (status: ProcessFlow.ProcessStatus) => void;
+    }
+
     /**
      * Defines save options to control how appointment, recurring appointment, or service activity records are processed.
      *
-     * @see {@link https://msdn.microsoft.com/en-us/library/dn481607.aspx#Anchor_2} for details.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data/save External Link: save(Client API reference)}
      */
     interface SaveOptions {
         /**
@@ -209,188 +639,175 @@ declare namespace Xrm {
     }
 
     /**
-     * Interface for the Xrm.Page.data object.
+     * Interface for the formContext.data object.
+     * @note NTOE NOTE
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data External Link: formContext.data (Client API reference)}
      */
     interface Data {
         /**
          * Asynchronously refreshes data on the form, without reloading the page.
-         *
-         * @param   {boolean}   save    true to save the record, after the refresh.
-         *
-         * @return  {Async.XrmPromise} Returns an asynchronous promise.
+         * @param save true to save the record, after the refresh.
+         * @returns Returns an asynchronous promise.
          */
-        refresh(save: boolean): Async.XrmPromise<Async.SuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        refresh(save: boolean): Async.PromiseLike<undefined>;
 
         /**
          * Asynchronously saves the record.
-         *
-         * @return  {Async.XrmPromise} Returns an asynchronous promise.
+         * @returns Returns an asynchronous promise.
          */
-        save(): Async.XrmPromise<Async.SuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        save(): Async.PromiseLike<undefined>;
 
         /**
          * Asynchronously saves the record  with the option to set callback functions to be executed after the save operation is completed.
-         *
-         * @param   {saveOptions}   saveOptions    Options to control how appointment, recurring appointment, or service activity records are processed.
-         *
-         * @return  {Async.XrmPromise} Returns an asynchronous promise.
+         * @param saveOptions Options to control how appointment, recurring appointment, or service activity records are processed.
+         * @returns Returns an asynchronous promise.
          */
-        save(saveOptions: SaveOptions): Async.XrmPromise<Async.SuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        save(saveOptions: SaveOptions): Async.PromiseLike<undefined>;
 
         /**
-         * The record context of the form.
+         * Collection of non-entity data on the form.
+         * Items in this collection are of the same type as the attributes collection, but they are not attributes of the form entity.
+         * In V9 this is only available in the Unified Client
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         * @see {@link Attributes}
          */
-        entity: Page.Entity;
+        attributes: Collection.ItemCollection<Attributes.Attribute>;
 
         /**
-         * The process API for Xrm.Page.data.
-         *
+         * The record context of the form, {@link Entity formContext.data.entity}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-entity External Link: formContext.data.entity (Client API reference)}
+         */
+        entity: Entity;
+
+        /**
+         * The process API for {@link ProcessFlow.ProcessManager formContext.ui.process}.
          * @remarks This member may be undefined when Process Flows are not used by the current entity.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-process External Link: formContext.data.process (Client API reference)}
          */
-        process: Page.data.ProcessManager;
+        process: ProcessFlow.ProcessManager;
     }
 
-    interface Page {
-        /**
-         * Provides methods to retrieve information specific to an organization, a user, or parameters passed to a page.
-         */
-        context: Context;
-
+    /**
+     * Interface for formContext
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/executioncontext/getformcontext External Link: getFormContext (Client API reference)}
+     */
+    interface FormContext {
         /**
          * Provides methods to work with the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data External Link: formContext.data (Client API reference)}
          */
         data: Data;
 
         /**
          * Contains properties and methods to retrieve information about the user interface as well as collections for several subcomponents of the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
          */
         ui: Ui;
 
         /**
          * Gets all attributes.
-         *
-         * @return  An array of attributes.
+         * @returns An array of attributes.
          */
-        getAttribute(): Page.Attribute[];
+        getAttribute(): Attributes.Attribute[];
 
         /**
          * Gets an attribute matching attributeName.
-         *
-         * @tparam  T   An Attribute type.
-         * @param   {string}    attributeName   Name of the attribute.
-         *
-         * @return  The attribute.
+         * @param T An Attribute type.
+         * @param attributeName Name of the attribute.
+         * @returns The attribute.
          */
-        getAttribute<T extends Page.Attribute>(attributeName: string): T;
+        getAttribute<T extends Attributes.Attribute>(attributeName: string): T;
 
         /**
          * Gets an attribute matching attributeName.
-         *
-         * @param   {string}    attributeName   Name of the attribute.
-         *
-         * @return  The attribute.
+         * @param attributeName Name of the attribute.
+         * @returns The attribute.
          */
-        getAttribute(attributeName: string): Page.Attribute;
+        getAttribute(attributeName: string): Attributes.Attribute;
 
         /**
          * Gets an attribute by index.
-         *
-         * @param   {number}    index   The attribute index.
-         *
-         * @return  The attribute.
+         * @param index The attribute index.
+         * @returns The attribute.
          */
-        getAttribute(index: number): Page.Attribute;
+        getAttribute(index: number): Attributes.Attribute;
 
         /**
          * Gets an attribute.
-         *
-         * @param   {Collection.MatchingDelegate{Attribute}}    delegateFunction    A matching delegate function
-         *
-         * @return  An array of attribute.
+         * @param delegateFunction A matching delegate function
+         * @returns An array of attribute.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        getAttribute(delegateFunction: Collection.MatchingDelegate<Page.Attribute>): Page.Attribute[];
+        getAttribute(delegateFunction: Collection.MatchingDelegate<Attributes.Attribute>): Attributes.Attribute[];
 
         /**
          * Gets all controls.
-         *
-         * @return  An array of controls.
+         * @returns An array of controls.
          */
-        getControl(): Page.Control[];
+        getControl(): Controls.Control[];
 
         /**
          * Gets a control matching controlName.
-         *
-         * @tparam  T   A Control type
-         * @param   {string}    controlName    Name of the control.
-         *
-         * @return  The control.
+         * @param T A Control type
+         * @param controlName Name of the control.
+         * @returns The control.
          */
-        getControl<T extends Page.Control>(controlName: string): T;
+        getControl<T extends Controls.Control>(controlName: string): T;
 
         /**
          * Gets a control matching controlName.
-         *
-         * @param   {string}    controlName   Name of the control.
-         *
-         * @return  The control.
+         * @param controlName   Name of the control.
+         * @returns The control.
          */
-        getControl(controlName: string): Page.Control;
+        getControl(controlName: string): Controls.Control;
 
         /**
          * Gets a control by index.
-         *
-         * @tparam  T   A Control type
-         * @param   {number}    index   The control index.
-         *
-         * @return  The control.
+         * @param T A Control type
+         * @param index The control index.
+         * @returns The control.
          */
-        getControl<T extends Page.Control>(index: number): T;
+        getControl<T extends Controls.Control>(index: number): T;
 
         /**
          * Gets a control by index.
-         *
-         * @param   {number}    index   The control index.
-         *
-         * @return  The control.
+         * @param index The control index.
+         * @returns The control.
          */
-        getControl(index: number): Page.Control;
+        getControl(index: number): Controls.Control;
 
         /**
          * Gets a control.
-         *
-         * @param   {Collection.MatchingDelegate{Control}}  delegateFunction    A matching delegate function.
-         *
-         * @return  An array of control.
+         * @param delegateFunction A matching delegate function.
+         * @returns An array of control.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        getControl(delegateFunction: Collection.MatchingDelegate<Page.Control>): Page.Control[];
+        getControl(delegateFunction: Collection.MatchingDelegate<Controls.Control>): Controls.Control[];
     }
 
     /**
-     * Interface for the Xrm.Page.ui object.
+     * Interface for the formContext.ui object.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
      */
     interface Ui {
         /**
          * Displays a form level notification. Any number of notifications can be displayed and will remain until removed using clearFormNotification.
          * The height of the notification area is limited so each new message will be added to the top.
-         *
-         * @param   {string}                            message     The text of the notification message.
-         * @param   {Page.ui.FormNotificationLevel}     level    The level of the notification which defines how the message will be displayed, such as the icon.
-         * @param   {string}                            uniqueId    Unique identifier for the notification which is used with clearFormNotification to remove the notification.
-         *
-         * @return  true if it succeeds, otherwise false.
-         *
-         * @remarks     Values for level are:    ERROR   Notification will use the system error icon.
-         *                                       WARNING Notification will use the system warning icon.
-         *                                       INFO    Notification will use the system info icon.
+         * @param message The text of the notification message.
+         * @param level The level of the notification which defines how the message will be displayed, such as the icon.
+         * ERROR: Notification will use the system error icon.
+         * WARNING: Notification will use the system warning icon.
+         * INFO: Notification will use the system info icon.
+         * @param uniqueId Unique identifier for the notification which is used with clearFormNotification to remove the notification.
+         * @returns true if it succeeds, otherwise false.
          */
-        setFormNotification(message: string, level: Page.ui.FormNotificationLevel, uniqueId: string): boolean;
+        setFormNotification(message: string, level: FormNotificationLevel, uniqueId: string): boolean;
 
         /**
          * Clears the form notification described by uniqueId.
-         *
-         * @param   {string}    uniqueId    Unique identifier.
-         *
-         * @return  True if it succeeds, otherwise false.
+         * @param uniqueId Unique identifier.
+         * @returns True if it succeeds, otherwise false.
          */
         clearFormNotification(uniqueId: string): boolean;
 
@@ -401,40 +818,34 @@ declare namespace Xrm {
 
         /**
          * Gets form type.
-         *
-         * @return  The form type.
-         *
-         * @remarks     Values returned are: 0  Undefined
-         *                                   1  Create
-         *                                   2  Update
-         *                                   3  Read Only
-         *                                   4  Disabled
-         *                                   6  Bulk Edit
-         *              Deprecated values are 5 (Quick Create), and 11 (Read Optimized)
+         * @returns The form type.
+         * @remarks **Values returned are**:
+         * * 0  Undefined
+         * * 1  Create
+         * * 2  Update
+         * * 3  Read Only
+         * * 4  Disabled
+         * * 6  Bulk Edit
+         * * Deprecated values are 5 (Quick Create), and 11 (Read Optimized)
          */
         getFormType(): XrmEnum.FormType;
 
         /**
          * Gets view port height.
-         *
-         * @return  The view port height, in pixels.
-         *
+         * @returns The view port height, in pixels.
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         getViewPortHeight(): number;
 
         /**
          * Gets view port width.
-         *
-         * @return  The view port width, in pixels.
-         *
+         * @returns The view port width, in pixels.
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         getViewPortWidth(): number;
 
         /**
          * Re-evaluates the ribbon's configured EnableRules.
-         *
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         refreshRibbon(): void;
@@ -442,109 +853,209 @@ declare namespace Xrm {
         /**
          * The business process flow API, used to interact with the business process flow control in a form.
          */
-        process: Page.ui.ProcessManager;
+        process: Controls.ProcessControl;
 
         /**
          * A reference to the collection of controls on the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        controls: Collection.ItemCollection<Page.Control>;
+        controls: Collection.ItemCollection<Controls.Control>;
 
         /**
          * The form selector API.
-         *
          * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
          */
-        formSelector: Page.FormSelector;
+        formSelector: Controls.FormSelector;
 
         /**
          * The navigation API.
-         *
          * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
          */
-        navigation: Page.Navigation;
+        navigation: Controls.Navigation;
 
         /**
          * A reference to the collection of tabs on the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        tabs: Collection.ItemCollection<Page.Tab>;
+        tabs: Collection.ItemCollection<Controls.Tab>;
 
         /**
          * A collection of all the quick view controls on a form using the new form rendering engine (also called "turbo forms").
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-quickforms ExternalLink: formContext.ui.quickForms (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
          */
-        quickForms: Collection.ItemCollection<Page.ui.QuickForm>;
+        quickForms: Collection.ItemCollection<Controls.QuickFormControl>;
     }
 
+    /**
+     * Interface for options used in Xrm.Utility.lookupObjects
+     */
+    interface LookupOptions {
+        /**
+         * Indicates whether the lookup allows more than one item to be selected.
+         */
+        allowMultiSelect?: boolean;
+        /**
+         * The default entity type to use.
+         */
+        defaultEntityType?: string;
+        /**
+         * The default view to use.
+         */
+        defaultViewId?: string;
+        /**
+         * The entity types to display.
+         */
+        entityTypes?: string[];
+        /**
+         * Indicates whether the lookup control should show the barcode scanner in mobile clients.
+         */
+        showBarcodeScanner?: boolean;
+        /**
+         * The views to be available in the view picker.Only system views are supported.
+         */
+        viewIds?: string[];
+    }
+
+    /**
+     * Interface for the Xrm.Utility API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
+     */
     interface Utility {
+        /**
+         * Closes a progress dialog box.
+         */
+        closeProgressIndicator(): void;
+
+        /**
+         * Returns the valid state transitions for the specified entity type and state code.
+         * TODO: No info on the return type is available
+         * @param entityName    The logical name of the entity.
+         * @param stateCode     The state code to find out the allowed status transition values.
+         */
+        getAllowedStatusTransitions(entityName: string, stateCode: number): Async.PromiseLike<any>;
+
+        /**
+         * Returns the entity metadata for the specified entity.
+         * @param entityName The logical name of the entity.
+         * @param attributes The attributes to get metadata for.
+         */
+        getEntityMetadata(entityName: string, attributes?: string[]): Async.PromiseLike<Metadata.EntityMetadata>;
+
+        /**
+         * The method provides access to the global context without going through the form context.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/getglobalcontext External Link: getGlobalContext (Client API reference)}
+         */
+        getGlobalContext(): GlobalContext;
+
+        /**
+         * Returns the localized string for a given key associated with the specified web resource.
+         * @param webResourceName The name of the web resource.
+         * @param key The key for the localized string.
+         * @returns A localized string.
+         */
+        getResourceString(webResourceName: string, key: string): string;
+
+        /**
+         * Invokes an action based on the specified parameters
+         * @param name Name of the process action to invoke.
+         * @param parameters An object containing input parameters for the action. You define an object using key:value pairs of items, where key is of String type.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/invokeprocessaction External Link: invokeProcessAction (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/customize/actions External Link: Actions overview}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/create-own-actions External Link: Create your own actions}
+         */
+        invokeProcessAction(name: string, parameters: Collection.Dictionary<any>): Async.PromiseLike<any>;
+
+        /**
+         * Opens a lookup control to select one or more items.
+         * @param lookupOptions Defines the options for opening the lookup dialog
+         */
+        lookupObjects(lookupOptions: LookupOptions): Async.PromiseLike<LookupValue>;
+
+        /**
+         * Refreshes the parent grid containing the specified record.
+         * @param lookupOptions: The lookup value of the parent object to refresh.
+         */
+        refreshParentGrid(lookupOptions: LookupValue): void;
+
+        /**
+         * Displays a progress dialog with the specified message.
+         * Any subsequent call to this method will update the displayed message in the existing progress dialog with the message specified in the latest method call.
+         * @param message The message to be displayed in the progress dialog.
+         */
+        showProgressIndicator(message: string): void;
+
         /**
          * Displays an alert dialog, with an "OK" button.
-         *
-         * @param   {string}        message         The message.
-         * @param   {function()}    onCloseCallback The "OK" callback.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openAlertDialog} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param message The message.
+         * @param onCloseCallback The "OK" callback.
          */
         alertDialog(message: string, onCloseCallback: () => void): void;
 
         /**
          * Displays a confirmation dialog, with "OK" and "Cancel" buttons.
-         *
-         * @param   {string}        message             The message.
-         * @param   {function()}    yesCloseCallback    The "OK" callback.
-         * @param   {function()}    noCloseCallback     The "Cancel" callback.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openConfirmDialog} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param message The message.
+         * @param yesCloseCallback The "OK" callback.
+         * @param noCloseCallback The "Cancel" callback.
          */
         confirmDialog(message: string, yesCloseCallback: () => void, noCloseCallback: () => void): void;
 
         /**
          * Query if 'entityType' is an Activity entity.
-         *
-         * @param   {string}    entityType  Type of the entity.
-         *
-         * @return  true if the entity is an Activity, false if not.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Utility.getEntityMetadata  Xrm.Utility.getEntityMetadata(entityName, ["IsActivity"])} instead.
+         * @remarks The isActivityType method is synchronous so it was suitable for ribbon rules.
+         * However, the replacement method, getEntityMetadata, is asynchronous, and is not suitable for ribbon rules.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param entityType Type of the entity.
+         * @returns true if the entity is an Activity, false if not.
          */
         isActivityType(entityType: string): boolean;
 
         /**
          * Opens quick create.
-         *
-         * @param   {string}    entityLogicalName           The logical name of the entity to create.
-         * @param   {Page.LookupValue}  createFromEntity    (Optional) Designates a record that will provide default values
-         *                                                  based on mapped attribute values.
-         * @param   {OpenParameters}    parameters          (Optional) A dictionary object that passes extra query string
-         *                                                  parameters to the form. Invalid query string parameters will cause an
-         *                                                  error.
-         * @return  {Async.XrmPromise} Returns an asynchronous promise.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openForm} instead with the option {useQuickCreateForm:true}.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param entityLogicalName  The logical name of the entity to create.
+         * @param createFromEntity (Optional) Designates a record that will provide default values based on mapped attribute values.
+         * @param parameters (Optional) A dictionary object that passes extra query string parameters to the form. Invalid query string parameters will cause an error.
+         * @returns Returns an asynchronous promise.
          */
-        openQuickCreate(entityLogicalName: string, createFromEntity?: Page.LookupValue, parameters?: Utility.OpenParameters):
-            Async.XrmPromise<Async.QuickCreateSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        openQuickCreate(entityLogicalName: string, createFromEntity?: LookupValue, parameters?: Utility.OpenParameters):
+            Async.PromiseLike<Async.OpenQuickCreateSuccessCallbackObject>;
 
         /**
          * Opens an entity form.
-         *
-         * @param   {string}    name                The entity's logical name.
-         * @param   {string}    id                  (Optional) The unique identifier for the record.
-         * @param   {FormParameters}    parameters  (Optional) A dictionary object that passes extra query string parameters to the form.
-         * @param   {WindowOptions} windowOptions   (Optional) Options for controlling the window.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openForm} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param name The entity's logical name.
+         * @param id (Optional) The unique identifier for the record.
+         * @param parameters (Optional) A dictionary object that passes extra query string parameters to the form.
+         * @param windowOptions (Optional) Options for controlling the window.
          */
         openEntityForm(name: string, id?: string, parameters?: Utility.FormOpenParameters, windowOptions?: Utility.WindowOptions): void;
 
         /**
          * Opens an HTML Web Resource in a new browser window.
-         *
-         * @param   {string}    webResourceName Name of the HTML web resource. Can be used to pass URL
-         *                                      parameters.  See Remarks.
-         * @param   {string}    webResourceData (Optional) Data to pass into the Web Resource's data parameter.
-         *                                                 It is advised to use encodeURIcomponent() to encode the value.
-         * @param   {number}    width           (Optional) The width of the new window.
-         * @param   {number}    height          (Optional) The height of the new window.
-         *
-         * @return  A Window reference, containing the opened Web Resource.
-         *
-         * @remarks This function will not work with Microsoft Dynamics CRM for tablets.
-         *          Valid WebResource URL Parameters:   typename
-         *                                              type
-         *                                              id
-         *                                              orgname
-         *                                              userlcid
-         *                                              data (identical to this method's webResourceData parameter)
-         *                                              formid
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openWebResource} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param webResourceName Name of the HTML web resource. Can be used to pass URL parameters.  See Remarks.
+         * @param webResourceData (Optional) Data to pass into the Web Resource's data parameter. It is advised to use encodeURIcomponent() to encode the value.
+         * @param width (Optional) The width of the new window.
+         * @param height (Optional) The height of the new window.
+         * @returns A Window reference, containing the opened Web Resource.
+         * @remarks This function will not work with Microsoft Dynamics CRM for tablets.<BR>
+         * **Valid WebResource URL Parameters**:
+         * * typename
+         * * type
+         * * id
+         * * orgname
+         * * userlcid
+         * * data (identical to this method's webResourceData parameter)
+         * * formid
          */
         openWebResource(webResourceName: string, webResourceData?: string, width?: number, height?: number): Window;
     }
@@ -555,178 +1066,133 @@ declare namespace Xrm {
     interface Mobile {
         /**
          * Provides methods to create and manage records in the mobile clients while working in the offline mode.
-         *
-         * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+         * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx External Link: Xrm.Mobile.offline (client-side reference)}
+         * @deprecated Use {@link Xrm.WebApi.offline} instead.  Xrm.WebApi.offline is implemented differently than Xrm.Mobile.offline
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         offline: MobileOffline;
     }
 
     /**
      * Interface for the Mobile.offline methods to create and manage records in the mobile clients while working in the offline mode.
-     *
-     * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+     * @deprecated Use {@link Xrm.WebApi.offline} instead.  Xrm.WebApi.offline is implemented differently than Xrm.Mobile.offline
+     * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx External Link: Xrm.Mobile.offline (client-side reference)}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
      */
     interface MobileOffline {
         /**
          * Returns whether an entity is offline enabled.
-         *
-         * @param    {string}    entityType    The logical name of the entity.
-         *
-         * @return   {boolean}   True if the entity is offline enabled; otherwise False.
+         * @param entityType The logical name of the entity.
+         * @returns True if the entity is offline enabled; otherwise False.
+         * @deprecated Use {@link Xrm.WebApi.isAvailableOffline} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         isOfflineEnabled(entityType: string): boolean;
 
         /**
          * Creates an entity record in mobile clients while working in the offline mode.
-         *
-         * @param    {string}    entityType    The logical name of the entity.
-         * @param    {Object}    data          A dictionary object containing key : value pairs for the record to create.
-         *
-         * @return   {Async.XrmPromise}        Returns an asynchronous promise.
-         *
-         * @remarks  You cannot create intersect and activity party entities.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @param entityType The logical name of the entity.
+         * @param data A dictionary object containing key : value pairs for the record to create.
+         * @returns Returns an asynchronous promise.
+         * @remarks  You cannot create intersect and activity party entities.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.createRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
-        createRecord(entityType: string, data: { [attributeName: string]: any }): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        createRecord(entityType: string, data: { [attributeName: string]: any }): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
         /**
          * Retrieves an entity record in mobile clients while working in the offline mode.
          *
-         * @param    {string}    entityType    The logical name of the entity.
-         * @param    {string}    id            GUID of the record to retrieve.
-         * @param    {string}    options       (Optional) OData system query options to retrieve your data. Supports $select and $expand
-         *                                     Example: ?$select=name&$expand=primarycontactid($select=contactid,fullname)
-         *
-         * @return   {Async.XrmPromise} Returns an asynchronous promise.
-         *
-         * @remarks  Only $select option can be specified within $expand.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @param entityType The logical name of the entity.
+         * @param id GUID of the record to retrieve.
+         * @param options (Optional) OData system query options to retrieve your data. Supports $select and $expand
+         * @example <caption>Example options</caption>
+         * options: ?$select=name&$expand=primarycontactid($select=contactid,fullname)
+         * @returns Returns an asynchronous promise.
+         * @remarks  Only $select option can be specified within $expand.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.retrieveRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
-        retrieveRecord(entityType: string, id: string, options: string): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        retrieveRecord(entityType: string, id: string, options: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
         /**
          * Retrieves a collection of entity records in mobile clients while working in the offline mode.
          *
-         * @param    {string}    entityType    The logical name of the entity.
-         * @param    {string}    options       (Optional) The logical name of the enti
-         * @param    {string}    maxPageSize   (Optional) A positive number to indicates the number of entity records to be returned per page.
-         *                                     If you do not specify this parameter, the default value is passed as 5000.
-         *                                     If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
-         *                                     will be returned, and you can use the value of the @odata.nextLink property with a new GET
-         *                                     request to return next set of records.
-         *
-         * @return   {Async.XrmPromise} Returns an asynchronous promise.
-         *
+         * @param entityType The logical name of the entity.
+         * @param options (Optional) The logical name of the enti
+         * @param maxPageSize (Optional) A positive number to indicates the number of entity records to be returned per page.
+         * * If you do not specify this parameter, the default value is passed as 5000.
+         * * If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
+         * will be returned, and you can use the value of the @odata.nextLink property with a new GET
+         * request to return next set of records.
+         * @returns Returns an asynchronous promise.
          * @remarks  A maximum of 5000 related records can be retrieved when using $expand.
-         *           Only $select option can be specified within $expand.
-         *           $skip query option is not supported.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * * Only $select option can be specified within $expand.
+         * * $skip query option is not supported.
+         * * Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.retrieveMultipleRecords} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
-        retrieveMultipleRecords(entityType: string, options: string, maxPageSize: number): Async.XrmPromise<Async.OfflineRetrieveMultipleSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        retrieveMultipleRecords(entityType: string, options: string, maxPageSize: number): Async.PromiseLike<Array<{ [key: string]: any }>>;
 
         /**
          * Updates an entity record in mobile clients while working in the offline mode.
-         *
-         * @param    {string}    entityType    The logical name of the entity.
-         * @param    {string}    id            GUID of the record to update.
-         * @param    {Object}    data          A dictionary object containing key : value pairs for the record to update.
-         *
-         * @return   {Async.XrmPromise} Returns an asynchronous promise.
-         *
-         * @remarks  You cannot update intersect and activity party entities.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @param entityType The logical name of the entity.
+         * @param id GUID of the record to update.
+         * @param data A dictionary object containing key : value pairs for the record to update.
+         * @returns Returns an asynchronous promise.
+         * @remarks  You cannot update intersect and activity party entities.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.updateRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
-        updateRecord(entityType: string, id: string, data: { [attributeName: string]: any }): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        updateRecord(entityType: string, id: string, data: { [attributeName: string]: any }): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
         /**
          * Deletes an entity record in mobile clients while working in the offline mode.
-         *
-         * @param    {string}    entityType    The logical name of the entity.
-         * @param    {string}    id            GUID of the record to delete.
-         *
-         * @return   {Async.XrmPromise} Returns an asynchronous promise.
-         *
+         * @param entityType The logical name of the entity.
+         * @param id GUID of the record to delete.
+         * @returns Returns an asynchronous promise.
          * @remarks  You cannot delete intersect and activity party entities.
+         * @deprecated Use {@link Xrm.WebApi.deleteRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
-        deleteRecord(entityType: string, id: string): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+        deleteRecord(entityType: string, id: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
     }
 
+    /**
+     * Interface for the Xrm.Panel API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel External Link: Xrm.Panel}
+     */
     interface Panel {
         /**
-         * Displays the web page represented by a URL in the static area in the side pane, which appears on all pages in the web client.
-         *
-         * @param    {string}    url    URL of the page to be loaded in the side pane static area.
-         * @param    {string}    url    Title of the side pane static area.
-         *
+         * Displays the web page represented by a URL in the static area in the side pane, which appears on all pages in the Customer Engagement web client.
+         * @param url URL of the page to be loaded in the side pane static area.
+         * @param title Title of the side pane static area.
          * @remarks  This method is only supported for the web client.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel/loadpanel External Link: loadPanel (Client-side reference)}
          */
-        LoadPanel(url: string, title: string): void;
+        loadPanel(url: string, title: string): void;
     }
 
     /**
      *  A definition module for asynchronous interface declarations.
      */
     namespace Async {
-        /**
-         * Called when the operation is successful.
-         */
-        type SuccessCallbackDelegate = () => void;
-
-        /**
-         * Called when the operation fails.
-         *
-         * @param   {ErrorCallbackObject}    error   The error object.
-         */
-        type ErrorCallbackDelegate = (error: ErrorCallbackObject) => void;
-
-        /**
-         * Called when the Xrm.Utility.openQuickCreate operation is successful and a new record has been created.
-         *
-         * @param   {OpenQuickCreateSuccessCallbackObject}    record   An object which contains a lookup value which identifies the record which has been created.
-         *
-         * @see {Xrm.Utility.openQuickCreate}
-         */
-        type QuickCreateSuccessCallbackDelegate = (record: OpenQuickCreateSuccessCallbackObject) => void;
-
-        /**
-         * Called when the offline operation is successful.
-         *
-         * @param   {OfflineOperationSuccessCallbackObject}    record   The record returned from the operation.
-         *
-         * @see {Xrm.Mobile.offline}
-         */
-        type OfflineOperationSuccessCallbackDelegate = (record: OfflineOperationSuccessCallbackObject) => void;
-
-        /**
-         * Called when the offline retrieve multiple operation is successful.
-         *
-         * @param   {OfflineRetrieveMultipleSuccessCallbackDelegate}    resultSet   The dictionary of records retrieved from the operation.
-         *
-         * @see {Xrm.Mobile.offline.retrieveMultipleRecords}
-         */
-        type OfflineRetrieveMultipleSuccessCallbackDelegate = (resultSet: Array<{ [key: string]: any }>) => void;
-
-        /**
-         * Called when the operation fails.
-         *
-         * @param   {OfflineErrorCallbackObject}    error   The error object.
-         *
-         * @see {Xrm.Mobile.offline}
-         */
-        type OfflineErrorCallbackDelegate = (error: OfflineErrorCallbackObject) => void;
-
         /**
          * Object passed to ErrorCallbackDelegate.
          */
@@ -749,7 +1215,7 @@ declare namespace Xrm {
             /**
              * A lookup value which identifies the record which has been created.
              */
-            savedEntityReference: Page.LookupValue;
+            savedEntityReference: LookupValue;
         }
 
         /**
@@ -778,19 +1244,38 @@ declare namespace Xrm {
         }
 
         /**
-         * Interface for asynchronous promises used in Xrm.Page.data and Xrm.Utility.openQuickCreate.
-         *
-         * @tparam  TSuccessCallback   Generic success callback parameter.
-         * @tparam  TErrorCallback     Generic error callback parameter.
+         * Interface for asynchronous promises. Based on JQuery Promise
          */
-        interface XrmPromise<TSuccessCallback, TErrorCallback> {
+        interface PromiseLike<T> {
             /**
-             * A basic 'then' promise.
-             *
-             * @param   {SuccessCallbackDelegate}   successCallback   The success callback.
-             * @param   {ErrorCallbackDelegate}     errorCallback     The error callback.
+             * 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(successCallback: TSuccessCallback, errorCallback: TErrorCallback): void;
+            then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => U | PromiseLike<U>):
+                PromiseLike<U>;
+            then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => void): PromiseLike<U>;
+
+            /**
+             * UNDOCUMENTED (Web Client only) Add handlers to be called when the Deferred object is rejected.
+             */
+            fail<U>(onRejected?: (reason: ErrorResponse) => U | PromiseLike<U>): PromiseLike<U>;
+
+            /**
+             * UNDOCUMENTED (Web Client only): Add handlers to be called when the Deferred object is either resolved or rejected.
+             */
+            always<U>(alwaysCallback: (() => U | PromiseLike<U>)): PromiseLike<U>;
+
+            /**
+             * UNDOCUMENTED (Unified Client only): Add handlers to be called when the Deferred object is rejected.
+             */
+            catch<U>(onRejected?: (reason: ErrorResponse) => U | PromiseLike<U>): PromiseLike<U>;
+
+            /**
+             * UNDOCUMENTED (Unified Client only): Add handlers to be called when the Deferred object is either resolved or rejected.
+             */
+            finally<U>(finallyCallback: (() => U | PromiseLike<U>)): PromiseLike<U>;
         }
     }
 
@@ -800,369 +1285,1204 @@ declare namespace Xrm {
     namespace Collection {
         /**
          * Called for each item in an array
-         *
-         * @param   {T} item            The item.
-         * @param   {number}    index   Zero-based index of the item array.
-         *
-         * @return  true if the item matches, false if it does not.
+         * @param item The item.
+         * @param index Zero-based index of the item array.
+         * @returns true if the item matches, false if it does not.
          */
         type MatchingDelegate<T> = (item: T, index?: number) => boolean;
 
         /**
          * Called for each item in an array
-         *
-         * @param   {T} item            The item.
-         * @param   {number}    index   Zero-based index of the item array.
+         * @param item The item.
+         * @param index Zero-based index of the item array.
          */
         type IterativeDelegate<T> = (item: T, index?: number) => void;
 
         /**
          * Interface for an item collection.
-         *
-         * @tparam  T   Generic type parameter.
+         * @param T Generic type parameter.
          */
-        interface ItemCollection<T> {
+        interface Dictionary<T> {
+            [key: string]: T;
+            [index: number]: T;
+        }
+
+        /**
+         * Collections are structures to provide access to data that represent an array, but without the ability to modify the data in the array.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         */
+        type ItemCollection<T> = Dictionary<T> & {
             /**
              * Applies an operation to all items in this collection.
-             *
-             * @param   {IterativeDelegate{T}}  delegate    An iterative delegate function
+             * @param delegate An iterative delegate function
              */
             forEach(delegate: IterativeDelegate<T>): void;
 
             /**
-             * Gets.
-             *
-             * @param   {MatchingDelegate{T}}   delegate    A matching delegate function
-             *
-             * @return  A T[] whose members have been validated by delegate.
+             * Gets the item using a delegate matching function
+             * @param delegate A matching delegate function
+             * @returns A T[] whose members have been validated by delegate.
              */
             get(delegate: MatchingDelegate<T>): T[];
 
             /**
              * Gets the item given by the index.
-             *
-             * @param   {number}    itemNumber  The item number to get.
-             *
-             * @return  The T in the itemNumber-th place.
+             * @param itemNumber The item number to get.
+             * @returns The T in the itemNumber-th place.
              */
             get(itemNumber: number): T;
 
+            /**
+             * Gets the item given by the index.
+             * @param itemNumber The item number to get.
+             * @returns The T in the itemNumber-th place.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
+             */
+            get<TSubType extends T>(itemNumber: number): TSubType;
+
             /**
              * Gets the item given by the key.
-             *
-             * @param   {string}    itemName    The item name to get.
-             *
-             * @return  The T matching the key itemName.
-             *
-             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             * @param itemName The item name to get.
+             * @returns The T matching the key itemName.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
              */
             get(itemName: string): T;
 
+            /**
+             * Gets the item given by the key.
+             * @param itemName The item name to get.
+             * @returns The T matching the key itemName.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
+             */
+            get<TSubType extends T>(attributeName: string): TSubType;
+
             /**
              * Gets the entire array of T.
-             *
-             * @return  A T[].
+             * @returns A T[].
              */
             get(): T[];
 
             /**
              * Gets the length of the collection.
-             *
-             * @return  The length.
+             * @returns The length.
              */
             getLength(): number;
+        };
+    }
+
+    /**
+     * Interface for Page context
+     * @deprecated Use {@link Xrm.Events.EventContext.getFormContext formContext} instead.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}a
+     */
+    interface Page extends FormContext {
+        /**
+         * Provides methods to retrieve information specific to an organization, a user, or parameters passed to a page.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         */
+        context: GlobalContext;
+    }
+
+    /**
+     * Xrm.Page namespace has been deprecated
+     * @deprecated Use {@link Xrm.Events.EventContext.getFormContext formContext} instead.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+     */
+    namespace Page {
+        /**
+         * @deprecated Use {@link Xrm.Controls.AddControlNotificationOptions} instead.
+         */
+        interface AddControlNotificationOptions extends Controls.AddControlNotificationOptions { }
+
+        /**
+         * Interface to define the actions on a control notification
+         * @deprecated Use {@link Xrm.Controls.ControlNotificationAction} instead.
+         */
+        interface ControlNotificationAction extends Controls.ControlNotificationAction { }
+
+        /**
+         * Interface for an entity's form selector item.
+         * @deprecated Use {@link Xrm.Controls.FormItem} instead.
+         */
+        interface FormItem extends Controls.FormItem { }
+
+        /**
+         * Interface for the form selector API.
+         * @deprecated Use {@link Xrm.Controls.FormSelector} instead.
+         */
+        interface FormSelector extends Controls.FormSelector { }
+
+        /**
+         * Interface for Xrm.Page.ui.navigation.
+         * @deprecated Use {@link Xrm.Controls.Navigation} instead.
+         */
+        interface Navigation extends Controls.Navigation { }
+
+        /**
+         * Interface for a navigation item.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @deprecated Use {@link Xrm.Controls.NavigationItem} instead.
+         */
+        interface NavigationItem extends Controls.NavigationItem { }
+
+        /**
+         * Constants to use with the addNotification method of form controls
+         * @deprecated Use {@link Xrm.Controls.NotificationLevel} instead.
+         */
+        type NotificationLevel = Controls.NotificationLevel;
+        /**
+         * Requirement Level for Xrm.Page.Attribute.getRequiredLevel() and Xrm.Page.Attribute.setRequiredLevel().
+         * @deprecated Use {@link Xrm.Attributes.RequirementLevel} instead.
+         */
+        type RequirementLevel = Attributes.RequirementLevel;
+
+        /**
+         * Save Modes for Xrm.Page.Entity.save().
+         * @deprecated Use {@link Xrm.EntitySaveMode} instead.
+         */
+        type SaveMode = EntitySaveMode;
+
+        /**
+         * Status for Xrm.Page.Stage.getStatus().
+         * @deprecated Use {@link Xrm.ProcessFlow.StageStatus} instead.
+         */
+        type StageStatus = ProcessFlow.StageStatus;
+
+        /**
+         * Status for Xrm.Page.Process.getStatus().
+         * @deprecated Use {@link Xrm.ProcessFlow.ProcessStatus} instead
+         */
+        type ProcessStatus = ProcessFlow.ProcessStatus;
+
+        /**
+         * Submit Mode for Xrm.Page.Attribute.getSubmitMode() and Xrm.Page.Attribute.setSubmitMode().
+         * @deprecated Use {@link Xrm.SubmitMode} instead.
+         */
+        type SubmitMode = Xrm.SubmitMode;
+
+        /**
+         * Control type for Xrm.Page.ui.QuickForm.getControlType().
+         * @deprecated Use {@link Xrm.Controls.ControlQuickFormType} instead.
+         *
+         */
+        type ControlQuickFormType = Controls.ControlQuickFormType;
+
+        /**
+         * Control types for Xrm.Page.Control.getControlType().
+         * @deprecated Use {@link Xrm.Controls.ControlType} instead.
+         */
+        type ControlType = Controls.ControlType;
+
+        /**
+         * Date attribute formats for Xrm.Page.Attribute.getFormat(), used by DateAttribute.
+         * @deprecated Use {@link Xrm.Attributes.DateAttributeFormat} instead.
+         */
+        type DateAttributeFormat = Attributes.DateAttributeFormat;
+
+        /**
+         * Integer attribute formats for Xrm.Page.Attribute.getFormat(), used by NumberAttribute.
+         * @deprecated Use {@link Xrm.Attributes.IntegerAttributeFormat} instead.
+         */
+        type IntegerAttributeFormat = Attributes.IntegerAttributeFormat;
+
+        /**
+         * OptionSet attribute formats for Xrm.Page.Attribute.getFormat(), used by OptionSetAttribute.
+         * @deprecated Use {@link Xrm.Attributes.OptiopnSetAttributeFormat} instead.
+         */
+        type OptionSetAttributeFormat = Attributes.OptionSetAttributeFormat;
+
+        /**
+         * String attribute formats for Xrm.Page.Attribute.getFormat(), used by StringAttribute.
+         * @deprecated Use {@link Xrm.Attributes.StringAttributeFormat} instead.
+         */
+        type StringAttributeFormat = Attributes.StringAttributeFormat;
+
+        /**
+         * Attribute types for Xrm.ui.ProcessMonitor Xrm.Page.Attribute.setDisplayState().
+         * @deprecated Use {@link Xrm.Attributes.AttributeType} instead.
+         */
+        type AttributeType = Attributes.AttributeType;
+
+        /**
+         * Direction types for a process stage change event
+         * @deprecated Use {@link Xrm.ProcessFlow.StageChangeDirection} instead.
+         */
+        type StageChangeDirection = ProcessFlow.StageChangeDirection;
+
+        /**
+         * Attribute formats for Xrm.Page.Attribute.getFormat().
+         * @deprecated Use {@link Xrm.Attributes.AttributeFormat} instead.
+         */
+        type AttributeFormat = Attributes.AttributeFormat;
+
+        /**
+         * Interface for a CRM Business Process Flow instance.
+         * @deprecated Use {@link Xrm.ProcessFlow.Process} instead.
+         */
+        interface Process extends ProcessFlow.Process { }
+
+        /**
+         * Interface for CRM Business Process Flow stages.
+         * @deprecated Use {@link Xrm.ProcessFlow.Stage} instead.
+         */
+        interface Stage extends ProcessFlow.Stage { }
+
+        /**
+         * Interface for CRM Business Process Flow steps.
+         * @deprecated Use {@link Xrm.ProcessFlow.Step} instead.
+         */
+        interface Step extends ProcessFlow.Step { }
+
+        /**
+         * Interface for the event context.
+         * @deprecated Use {@link Xrm.Events.EventContext} instead.
+         */
+        interface EventContext extends Events.EventContext { }
+
+        /**
+         * Interface for a save event context
+         * @deprecated Use {@link Xrm.Events.SaveEventContext} instead.
+         */
+        interface SaveEventContext extends Events.SaveEventContext { }
+
+        /**
+         * Interface for a process stage change event context
+         * @deprecated Use {@link Xrm.Events.StageChangeEventContext} instead.
+         */
+        interface StageChangeEventContext extends Events.StageChangeEventContext { }
+
+        /**
+         * Interface for a process stage select event context
+         * @deprecated  Use {@link Xrm.Events.StageSelectedEventContext} instead.
+         */interface StageSelectedEventContext extends Events.StageSelectedEventContext { }
+
+        /**
+         * Type for a context-sensitive handler.
+         * @param context The context.
+         * @deprecated Use {@link Xrm.Events.ContextSensitiveHandler} instead.
+         */
+        type ContextSensitiveHandler = Events.ContextSensitiveHandler;
+
+        /**
+         * Type for a process status change handler.
+         * @param status The process status.
+         * @deprecated Use {@link Xrm.Events.ProcessStatusChangeHandler} instead.
+         */
+        type ProcessStatusChangeHandler = Events.ProcessStatusChangeHandler;
+
+        /**
+         * Interface for UI elements with labels.
+         * @deprecated Use {@link Xrm.Controls.UiLabelElement} instead.
+         */
+        interface UiLabelElement extends Controls.UiLabelElement { }
+
+        /**
+         * Interface for UI elements which can have the visibility value read.
+         * @deprecated Use {@link Xrm.Controls.UiCanGetVisibleElement} instead.
+         */
+        interface UiCanGetVisibleElement extends Controls.UiCanGetVisibleElement { }
+
+        /**
+         * Interface for UI elements which can have the visibility value updated.
+         * @deprecated Use {@link Xrm.Controls.UiCanSetVisibleElement} instead.
+         */
+        interface UiCanSetVisibleElement extends Controls.UiCanSetVisibleElement { }
+
+        /**
+         * Base interface for standard UI elements.
+         * @deprecated Use {@link Xrm.Controls.UiStandardElement} instead.
+         */
+        interface UiStandardElement extends Controls.UiStandardElement { }
+
+        /**
+         * Interface for focusable UI elements.
+         * @deprecated Use {@link Xrm.Controls.UiFocusable} instead.
+         */
+        interface UiFocusable extends Controls.UiFocusable { }
+
+        /**
+         * Interface for controls which methods provide immediate feedback or take actions as user types in a control.
+         * Contains methods which can be used to perform data validations in a control even before the user commits (saves) the value in a form.
+         * @deprecated Use {@link Xrm.Controls.UiKeyPressable} instead.
+         */
+        interface UiKeyPressable extends Controls.UiKeyPressable { }
+
+        /**
+         * Interface for Result value of AutoCompleteResultSet
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteResult} instead.
+         */
+        interface AutoCompleteResult extends Controls.AutoCompleteResult { }
+
+        /**
+         * Interface for command of AutoCompleteResultSet.  This is displayed at the bottom of the auto complete view
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteCommand} instead.
+         */
+        interface AutoCompleteCommand extends Controls.AutoCompleteCommand { }
+
+        /**
+         * Interface for showAutoComplete argument
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteResultSet} instead.
+         */
+        interface AutoCompleteResultSet extends Controls.AutoCompleteResultSet { }
+
+        /**
+         * Interface for a Lookup value.
+         * @deprecated Use {@link Xrm.LookupValue} instead.
+         */
+        interface LookupValue extends Xrm.LookupValue { }
+
+        /**
+         * Interface for an OptionSet value.
+         * @deprecated Use {@link Xrm.OptionSetValue} instead.
+         */
+        interface OptionSetValue extends Xrm.OptionSetValue { }
+
+        /**
+         * Interface for a privilege.
+         * @deprecated Use {@link Xrm.Privilege} instead.
+         */
+        interface Privilege extends Xrm.Privilege { }
+
+        /**
+         * Interface for an Entity attribute.
+         * @deprecated Use {@link Xrm.Attributes.Attribute} instead.
+         */
+        interface Attribute extends Attributes.Attribute { }
+
+        /**
+         * Interface for a Number attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.NumberAttribute} instead.
+         */
+        interface NumberAttribute extends Attributes.NumberAttribute { }
+
+        /**
+         * Interface for a String attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.StringAttribute} instead.
+         */
+        interface StringAttribute extends Attributes.StringAttribute { }
+
+        /**
+         * Common interface for enumeration attributes (OptionSet and Boolean).
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.EnumAttribute} instead.
+         */
+        interface EnumAttribute extends Attributes.EnumAttribute { }
+
+        /**
+         * Interface for a Boolean attribute.
+         * @see {@link EnumAttribute}
+         * @deprecated Use {@link Xrm.Attributes.BooleanAttribute} instead.
+         */
+        interface BooleanAttribute extends Attributes.BooleanAttribute { }
+
+        /**
+         * Interface for a Date attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.DateAttribute} instead.
+         */
+        interface DateAttribute extends Attributes.DateAttribute { }
+
+        /**
+         * Interface an OptionSet attribute.
+         * @see {@link EnumAttribute}
+         * @deprecated Use {@link Xrm.Attributes.OptionSetAttribute} instead.
+         */
+        interface OptionSetAttribute extends Attributes.OptionSetAttribute { }
+
+        /**
+         * Interface a Lookup attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.LookupAttribute} instead.
+         */
+        interface LookupAttribute extends Attributes.LookupAttribute { }
+
+        /**
+         * Interface for the form's record context, Xrm.Page.data.entity
+         * @deprecated Use {@link Xrm.Entity} instead.
+         */
+        interface Entity extends Xrm.Entity { }
+
+        /**
+         * Interface for save event arguments.
+         * @deprecated Use {@link Xrm.Events.SaveEventContext} instead.
+         */
+        interface SaveEventArguments extends Events.SaveEventContext { }
+
+        /**
+         * Interface for process stage change event arguments.
+         * @deprecated Use {@link Xrm.Events.StageChangeEventArguments} instead.
+         */
+        interface StageChangeEventArguments extends Events.StageChangeEventArguments { }
+
+        /**
+         * Interface for process stage selected event arguments.
+         * @deprecated Use {@link Xrm.Events.StageSelectedEventArguments} instead.
+         */
+        interface StageSelectedEventArguments extends Events.StageSelectedEventArguments { }
+
+        /**
+         * Interface for Xrm.Page.ui controls.
+         * @see {@link UiElement}
+         * @deprecated Use {@link Xrm.Controls.Control} instead.
+         */
+        interface Control extends Controls.Control { }
+
+        /**
+         * Interface for a standard control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.StandardControl} instead.
+         */
+        interface StandardControl extends Controls.StandardControl { }
+
+        /**
+         * Interface for Auto Lookup Control.
+         * This is not an Entity Lookup, but a control that supports AutoComplete / KeyPress Events (Text or Number)
+         * @remarks This interface is not supported for CRM mobile clients (phones or tablets) and the interactive service hub.  It is only available for Updated entities.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.AutoLookupControl} instead.
+         */
+        interface AutoLookupControl extends Controls.AutoLookupControl { }
+
+        /**
+         * Interface for a String control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.StringControl} instead.
+         */
+        interface StringControl extends Controls.StringControl { }
+
+        /**
+         * Interface for a Number control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.NumberControl} instead.
+         */
+        interface NumberControl extends AutoLookupControl { }
+
+        /**
+         * Interface for a Date control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.DateControl} instead.
+         */
+        interface DateControl extends StandardControl { }
+
+        /**
+         * Interface for a Lookup control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.LookupControl} instead.
+         */
+        interface LookupControl extends Controls.LookupControl { }
+
+        /**
+         * Interface for an OptionSet control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.OptionSetControl} instead.
+         */
+        interface OptionSetControl extends Controls.OptionSetControl { }
+
+        /**
+         * Interface for a CRM grid control.
+         *
+         * @see {@link Control}
+         * @deprecated  Use {@link Xrm.Controls.GridControl} instead.
+         */
+        interface GridControl extends Controls.GridControl { }
+
+        /**
+         * Interface for a framed control, which is either a Web Resource or an Iframe.
+         * @see {@link Control}
+         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
+         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
+         * @deprecated  Use {@link Xrm.Controls.FramedControl} instead.
+         */
+        interface FramedControl extends Controls.FramedControl { }
+
+        /**
+         * Interface for an Iframe control.
+         * @see {@link FramedControl}
+         * @deprecated  Use {@link Xrm.Controls.IframeControl} instead.
+         */
+        interface IframeControl extends Controls.IframeControl { }
+
+        /**
+         * Interface for a Silverlight control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.SilverlightControl} instead.
+         */
+        interface SilverlightControl extends Controls.SilverlightControl { }
+
+        /**
+         * Interface for a Timeline control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.TimelineWall} instead.
+         */
+        interface TimelineWall extends Controls.TimelineWall { }
+
+        /**
+         * Interface for a form tab.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @deprecated Use {@link Xrm.Controls.Tab} instead.
+         */
+        interface Tab extends Controls.Tab { }
+
+        /**
+         * Interface for a form section.
+         * @see {@link UiElement}
+         * @deprecated Use {@link Xrm.Controls.Section} instead.
+         */
+        interface Section extends Controls.Section { }
+
+        /**
+         * Module for the Xrm.Page.data API.
+         * @deprecated Use {@link Xrm.Form.data formContext.data} has been deprecated.
+         */
+        namespace data {
+            /**
+             * Interface for the Xrm.Page.data.process API.
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessManager} instead.
+             */
+            interface ProcessManager extends ProcessFlow.ProcessManager {
+            }
+
+            /**
+             * Called when method to get active processes is complete
+             * @param status The result of the get active processes operation.
+             * @remarks **Returns object with the following key-value pairs**:
+             * * CreatedOn
+             * * ProcessDefinitionID
+             * * ProcessDefinitionName
+             * * ProcessInstanceID
+             * * ProcessInstanceName
+             * * StatusCodeName
+             * @deprecated Use {@link Xrm.ProcessFlow.GetProcessInstancesDelegate} instead.
+             */
+            type GetProcessInstancesDelegate = ProcessFlow.GetProcessInstancesDelegate;
+
+            /**
+             * Called when method to set active process is complete
+             * @param status The result of the set active process operation.
+             * @remarks **Values returned are**:
+             * * success        (The operation succeeded.)
+             * * invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
+             * @deprecated Use {@link Xrm.ProcessFlow.SetProcessInstanceDelegate} instead.
+             */
+            type SetProcessInstanceDelegate = ProcessFlow.SetProcessInstanceDelegate;
+
+            /**
+             * Called when process change methods have completed.
+             * @param status The result of the process change operation.
+             * @remarks **Values returned are**:
+             * * success        (The operation succeeded.)
+             * * crossEntity    (The previous stage is for a different entity.)
+             * * beginning      (The active stage is the first stage of the active path.)
+             * * invalid        (The operation failed because the selected stage isn’t the same as the active stage.)
+             * * unreachable    (The stage exists on a different path.)
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessCallbackDelegate} instead.
+             */
+            type ProcessCallbackDelegate = ProcessFlow.ProcessCallbackDelegate;
+
+            /**
+             * Called when process set status method has completed.
+             * @param status The new status of the process instance
+             * @remarks **Values returned are**:
+             * * active
+             * * aborted
+             * * finished
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessSetStatusDelegate} instead.
+             */
+            type ProcessSetStatusDelegate = ProcessFlow.ProcessSetStatusDelegate;
+
+            /**
+             * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessDictionary} instead.
+             */
+            interface ProcessDictionary extends ProcessFlow.ProcessDictionary { }
+        }
+
+        /**
+         * Contains properties and methods to retrieve information about the user interface as well as collections for several subcomponents of the form.
+         * @deprecated Use {@link Xrm.Form.ui formContext.ui} instead.
+         */
+        namespace ui {
+            /**
+             * Form Notification Levels for Xrm.Ui.setFormNotification().
+             * @deprecated Use {@link Xrm.FormNotificationLevel} instead.
+             */
+            type FormNotificationLevel = Xrm.FormNotificationLevel;
+
+            /**
+             * Display States for Xrm.ui.ProcessMonitor.setDisplayState().
+             * @deprecated Use {@link Xrm.DisplayState} instead.
+             */
+            type DisplayState = Xrm.DisplayState;
+
+            /**
+             * Interface for Xrm.Page.ui.process API
+             * @deprecated Use {@link Xrm.Controls.ProcessControl} instead.
+             */
+            interface ProcessManager extends Controls.ProcessControl { }
+
+            /**
+             * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
+             * GridControl.getGrid method.
+             * @deprecated Use {@link Xrm.Controls.Grid} instead.
+             */
+            interface Grid extends Controls.Grid { }
+
+            /**
+             * Interface for a grid row.  Use the GridRow.getData method to access the GridRowData. A collection of GridRow is
+             * returned by Grid.getRows and Grid.getSelectedRows methods.
+             * In V9 - this is essentailly a form context.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRow} instead.
+             */
+            interface GridRow extends Controls.Grid.GridRow { }
+
+            /**
+             * Interface for grid row data.  Use the GridRowData.getEntity method to access the GridEntity. GridRowData is
+             * returned by the GridRow.getData method.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRowData} instead.
+             */
+            interface GridRowData extends Controls.Grid.GridRowData { }
+
+            /**
+             * Interface for a grid entity.  Use the GridEntity methods to access data about the specific records in the rows.
+             * GridEntity is returned by the GridRowData.getEntity method.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRowData} instead.v
+             */
+            interface GridEntity extends Controls.Grid.GridEntity { }
+
+            /**
+             * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
+             * of the grid control.
+             * @deprecated Use {@link Xrm.Controls.ViewSelector} instead.
+             */
+            interface ViewSelector extends Controls.ViewSelector { }
+
+            /**
+             * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
+             * the ViewSelector.setCurrentView method.
+             * @deprecated Use {@link Xrm.Controls.ViewSelectorItem} instead.
+             */
+            interface ViewSelectorItem extends Controls.ViewSelectorItem { }
+
+            /**
+             * Interface for a quick view control instance on a form.
+             * @see {@link https://msdn.microsoft.com/en-us/library/mt736908.aspx External Link: Xrm.Page.ui quickForms (client-side reference)}
+             * @deprecated Use {@link Xrm.Controls.ViewSelectorItem} instead.
+             */
+            interface QuickForm extends Controls.QuickFormControl { }
         }
     }
 
     /**
-     * The Xrm.Page API
-     *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     * Interface for a Lookup value.
      */
-    namespace Page {
+    interface LookupValue {
         /**
-         * Requirement Level for Xrm.Page.Attribute.getRequiredLevel() and Xrm.Page.Attribute.setRequiredLevel().
+         * The identifier.
+         */
+        id: string;
+
+        /**
+         * The name
+         */
+        name?: string;
+
+        /**
+         * Type of the entity.
+         */
+        entityType: string;
+    }
+
+    /**
+     * Interface for an OptionSet value.
+     */
+    interface OptionSetValue {
+        /**
+         * The label text.
+         */
+        text: string;
+
+        /**
+         * The value, as a number
+         */
+        value: number;
+    }
+
+    /**
+     * A collection of types and methods for working with formContext attributes.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+     */
+    namespace Attributes {
+        /**
+         * Requirement Level for {@link Attributes.Attribute.getRequiredLevel Attributes.Attribute.getRequiredLevel()} and
+         * {@link Attributes.Attribute.setRequiredLevel Attributes.Attribute.setRequiredLevel()}.
+         * @see {@link XrmEnum.AttributeRequirementLevel}
          */
         type RequirementLevel = "none" | "recommended" | "required";
 
         /**
-         * Save Modes for Xrm.Page.Entity.save().
-         */
-        type SaveMode = "saveandclose" | "saveandnew";
-
-        /**
-         * Status for Xrm.Page.Stage.getStatus().
-         */
-        type StageStatus = "active" | "inactive";
-
-        /**
-         * Status for Xrm.Page.Process.getStatus().
-         */
-        type ProcessStatus = "active" | "aborted" | "finished";
-
-        /**
-         * Submit Mode for Xrm.Page.Attribute.getSubmitMode() and Xrm.Page.Attribute.setSubmitMode().
-         */
-        type SubmitMode = "always" | "dirty" | "never";
-
-        /**
-         * Control type for Xrm.Page.ui.QuickForm.getControlType().
-         */
-        type ControlQuickFormType = "quickform";
-
-        /**
-         * Control types for Xrm.Page.Control.getControlType().
-         */
-        type ControlType = "standard" | "iframe" | "lookup" | "optionset" | "subgrid" | "webresource" | "notes" | "timercontrol" | "kbsearch" | ControlQuickFormType;
-
-        /**
-         * Date attribute formats for Xrm.Page.Attribute.getFormat(), used by DateAttribute.
+         * Date attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.DateAttribute DateAttribute}.
+         * @see {@link XrmEnum.DateAttributeFormat}
          */
         type DateAttributeFormat = "date" | "datetime";
 
         /**
-         * Integer attribute formats for Xrm.Page.Attribute.getFormat(), used by NumberAttribute.
+         * Integer attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.NumberAttribute NumberAttribute}.
+         * @see {@link XrmEnum.IntegerAttributeFormat}
          */
         type IntegerAttributeFormat = "duration" | "none";
 
         /**
-         * OptionSet attribute formats for Xrm.Page.Attribute.getFormat(), used by OptionSetAttribute.
+         * OptionSet attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.OptionSetAttribute OptionSetAttribute}.
+         * @see {@link XrmEnum.OptionSetAttributeFormat}
          */
         type OptionSetAttributeFormat = "language" | "timezone";
 
         /**
-         * String attribute formats for Xrm.Page.Attribute.getFormat(), used by StringAttribute.
+         * String attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.StringAttribute StringAttribute}.
+         * @see {@link XrmEnum.StringAttributeFormat}
          */
         type StringAttributeFormat = "email" | "phone" | "text" | "textarea" | "tickersymbol" | "url";
 
         /**
-         * Attribute types for Xrm.ui.ProcessMonitor Xrm.Page.Attribute.setDisplayState().
+         * Attribute types for {@link Attributes.Attribute.setDisplayState()}.
+         * @see {@link XrmEnum.AttributeType}
          */
-        type AttributeType = "boolean" | "datetime" | "decimal" | "double" | "integer" | "lookup" | "memo" | "money" | "optionset" | "string";
+        type AttributeType = "boolean" | "datetime" | "decimal" | "double" | "integer" |
+            "lookup" | "memo" | "money" | "multioptionset" | "optionset" | "string";
 
         /**
-         * Direction types for a process stage change event
-         */
-        type StageChangeDirection = "Next" | "Previous";
-
-        /**
-         * Attribute formats for Xrm.Page.Attribute.getFormat().
+         * Attribute formats for {@link Attributes.Attribute.getFormat Attributes.Attribute.getFormat()}.
+         * @see {@link XrmEnum.DateAttributeFormat}
+         * @see {@link XrmEnum.IntegerAttributeFormat}
+         * @see {@link XrmEnum.OptionSetAttributeFormat}
+         * @see {@link XrmEnum.StringAttributeFormat}
          */
         type AttributeFormat = DateAttributeFormat | IntegerAttributeFormat | OptionSetAttributeFormat | StringAttributeFormat;
 
         /**
-         * Interface for a CRM Business Process Flow instance.
+         * Interface for an Entity attribute.
          */
-        interface Process {
+        interface Attribute {
             /**
-             * Returns the unique identifier of the process.
-             *
-             * @return The identifier for this process, in GUID format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             * Adds a handler to be called when the attribute's value is changed.
+             * @param handler The function reference.
              */
-            getId(): string;
+            addOnChange(handler: Events.ContextSensitiveHandler): void;
 
             /**
-             * Returns the name of the process.
-             *
-             * @return  The name.
+             * Fire all "on change" event handlers.
+             */
+            fireOnChange(): void;
+
+            /**
+             * Gets attribute type.
+             * @returns The attribute's type name.<BR><BR>
+             * **Values returned are**:
+             * * boolean
+             * * datetime
+             * * decimal
+             * * double
+             * * integer
+             * * lookup
+             * * memo
+             * * money
+             * * optionset
+             * * string
+             */
+            getAttributeType(): string;
+
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.<BR><BR>
+             * **Values returned are**:
+             * * date           (datetime)
+             * * datetime       (datetime)
+             * * duration       (integer)
+             * * email          (string)
+             * * language       (optionset)
+             * * none           (integer)
+             * * phone          (string)
+             * * text           (string)
+             * * textarea       (string)
+             * * tickersymbol   (string)
+             * * timezone       (optionset)
+             * * url            (string)
+             * @see {@link getAttributeType}
+             */
+            getFormat(): AttributeFormat;
+
+            /**
+             * Gets a boolean value indicating whether this Attribute has unsaved changes.
+             * @returns true if there are unsaved changes, otherwise false.
+             */
+            getIsDirty(): boolean;
+
+            /**
+             * Gets the logical name of the attribute.
+             * @returns The logical name.
              */
             getName(): string;
 
             /**
-             * Returns an collection of stages in the process.
-             *
-             * @return  The stages.
+             * Gets a reference to the record context of this attribute.
+             * @returns The parent record context.
              */
-            getStages(): Collection.ItemCollection<Stage>;
+            getParent(): Entity;
 
             /**
-             * Returns a boolean value to indicate if the process is rendered.
-             *
-             * @return  true if the process is rendered, false if not.
+             * Gets the current level of requirement for the attribute.
+             * @returns The required level, as either "none", "required", or "recommended"
              */
-            isRendered(): boolean;
+            getRequiredLevel(): RequirementLevel;
+
+            /**
+             * Gets current submit mode for the attribute.
+             * @returns The submit mode, as either "always", "never", or "dirty"
+             * @remarks The default value is "dirty"
+             */
+            getSubmitMode(): SubmitMode;
+
+            /**
+             * Gets the current user's privileges for the attribute.
+             * @returns The user privileges.
+             */
+            getUserPrivilege(): Privilege;
+
+            /**
+             * Removes the handler from the "on change" event.
+             * @param handler The handler.
+             */
+            removeOnChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Sets the required level.
+             * @param requirementLevel The requirement level, as either "none", "required", or "recommended"
+             * @see {@link XrmEnum.AttributeRequirementLevel}
+             */
+            setRequiredLevel(requirementLevel: RequirementLevel): void;
+
+            /**
+             * Sets the submit mode.
+             * @param submitMode The submit mode, as either "always", "never", or "dirty".
+             * @default submitMode "dirty"
+             * @see {@link XrmEnum.AttributeRequirementLevel}
+             */
+            setSubmitMode(submitMode: SubmitMode): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.Control>;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): any;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             */
+            setValue(value: any): void;
         }
 
         /**
-         * Interface for CRM Business Process Flow stages.
+         * Interface for a Number attribute.
+         * @see {@link Attribute}
          */
-        interface Stage {
+        interface NumberAttribute extends Attribute {
             /**
-             * Returns an object with a getValue method which will return the integer value of the business process flow
-             * category.
-             *
-             * @return  The stage category.
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: duration, none
              */
-            getCategory(): { getValue(): XrmEnum.StageCategory };
+            getFormat(): IntegerAttributeFormat;
 
             /**
-             * Returns the logical name of the entity associated with the stage.
-             *
-             * @return  The entity name.
+             * Gets the maximum value allowed.
+             * @returns The maximum value allowed.
              */
-            getEntityName(): string;
+            getMax(): number;
 
             /**
-             * Returns the unique identifier of the stage.
-             *
-             * @return  The identifier of the Stage, in GUID format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             * Gets the minimum value allowed.
+             * @returns The minimum value allowed.
              */
-            getId(): string;
+            getMin(): number;
 
             /**
-             * Returns the name of the stage.
-             *
-             * @return  The name.
+             * Gets the attribute's configured precision.
+             * @returns The total number of allowed decimal places.
              */
-            getName(): string;
+            getPrecision(): number;
 
             /**
-             * Returns the status of the stage.
-             *
-             * @return  The status.
-             *
-             * @remarks  This method will return either "active" or "inactive".
+             * Gets the value.
+             * @returns The value.
              */
-            getStatus(): StageStatus;
+            getValue(): number;
 
             /**
-             * Returns a collection of steps in the stage.
-             *
-             * @return  An array of Step.
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
              */
-            getSteps(): Step[];
-        }
-
-        interface Step {
-            /**
-             * Returns the logical name of the attribute associated to the step.
-             *
-             * @return  The attribute.
-             *
-             * @remarks  Some steps don’t contain an attribute value.
-             */
-            getAttribute(): string;
+            setValue(value: number): void;
 
             /**
-             * Returns the name of the step.
-             *
-             * @return  The name.
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            getName(): string;
-
-            /**
-             * Returns whether the step is required in the business process flow.
-             *
-             * @return  true if required, false if not.
-             *
-             * @remarks     Returns true if the step is marked as required in the Business Process Flow editor; otherwise, false.
-             *              There is no connection between this value and the values you can change in the Xrm.Page.data.entity
-             *              attribute RequiredLevel methods.
-             */
-            isRequired(): boolean;
+            controls: Collection.ItemCollection<Controls.NumberControl>;
         }
 
         /**
-         * Interface for the event context.
+         * Interface for a String attribute.
+         * @see {@link Attribute}
          */
-        interface EventContext {
+        interface StringAttribute extends Attribute {
             /**
-             * Gets the Xrm context.
-             *
-             * @return  The Xrm context.
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: email, phone, text, textarea, tickersymbol, url
              */
-            getContext(): Context;
+            getFormat(): StringAttributeFormat;
 
             /**
-             * Gets the handler's depth, which is the order in which the handler is executed.
-             *
-             * @return  The depth, a 0-based index.
+             * Gets maximum length allowed.
+             * @returns The maximum length allowed.
+             * @remarks The email form's "Description" attribute does not have the this method.
              */
-            getDepth(): number;
+            getMaxLength(): number;
 
             /**
-             * Gets a reference to the object for which event occurred.
+             * Gets the value.
              *
-             * @return  The event source.
+             * @returns The value.
              */
-            getEventSource(): Attribute | Control | Entity;
+            getValue(): string;
 
             /**
-             * Gets the shared variable with the specified key.
-             *
-             * @tparam  T   Generic type parameter.
-             * @param   {string}    key The key.
-             *
-             * @return  The shared variable.
-             *
-             * @remarks Used to pass values between handlers of an event.
+             * Sets the value.
+             * @param value The value.
+             * @remarks A String field with the {@link Attribute.getFormat|email} format enforces email
+             *          address formatting. Attributes on Quick Create Forms will not save values set
+             *          with this method.
              */
-            getSharedVariable<T>(key: string): T;
+            setValue(value: string): void;
 
             /**
-             * Sets a shared variable.
-             *
-             * @tparam  T   Generic type parameter.
-             * @param   {string}    key The key.
-             * @param   {T} value       The value.
-             *
-             * @remarks Used to pass values between handlers of an event.
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            setSharedVariable<T>(key: string, value: T): void;
+            controls: Collection.ItemCollection<Controls.StringControl>;
         }
 
         /**
-         * Interface for a save event context
+         * Common interface for enumeration attributes (OptionSet and Boolean).
+         * @see {@link Attribute}
          */
-        interface SaveEventContext extends EventContext {
+        interface EnumAttribute extends Attribute {
             /**
-             * Gets save-event arguments.
-             *
-             * @return  The event arguments.
-             *
-             * @remarks Returns null for all but the "save" event.
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
              */
-            getEventArgs(): SaveEventArguments;
+            getInitialValue(): number | boolean;
         }
 
         /**
-         * Interface for a process stage change event context
+         * Interface for a Boolean attribute.
+         * @see {@link EnumAttribute}
          */
-        interface StageChangeEventContext extends EventContext {
+        interface BooleanAttribute extends EnumAttribute {
             /**
-             * Gets process stage change event arguments.
-             *
-             * @return  The event arguments.
-             *
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
              */
-            getEventArgs(): StageChangeEventArguments;
-        }
+            getInitialValue(): boolean;
 
-        interface StageSelectedEventContext extends EventContext {
             /**
-             * Gets process stage selected event arguments.
-             *
-             * @return  The event arguments.
-             *
+             * Gets the value.
+             * @returns true if it succeeds, false if it fails.
              */
-            getEventArgs(): StageSelectedEventArguments;
+            getValue(): boolean;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: boolean): void;
         }
 
         /**
-         * Type for a context-sensitive handler.
-         * @param   {EventContext}  context The context.
+         * Interface for a Date attribute.
+         *
+         * @see {@link Attribute}
          */
-        type ContextSensitiveHandler = (context: EventContext) => void;
+        interface DateAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             *
+             * @returns The format of the attribute.
+             * Values returned are: date, datetime
+             */
+            getFormat(): DateAttributeFormat;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): Date;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: Date): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.DateControl>;
+        }
 
         /**
-         * Type for a process status change handler.
-         * @param   {ProcessStatus}  status The process status.
+         * Interface an OptionSet attribute.
+         * @see {@link EnumAttribute}
          */
-        type ProcessStatusChangeHandler = (status: ProcessStatus) => void;
+        interface OptionSetAttribute extends EnumAttribute {
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: language, timezone
+             */
+            getFormat(): OptionSetAttributeFormat;
+
+            /**
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): number;
+
+            /**
+             * Gets the option matching a value.
+             * @param value The enumeration value of the option desired.
+             * @returns The option.
+             */
+            getOption(value: number): OptionSetValue;
+
+            /**
+             * Gets the option matching a label.
+             * @param label The label of the option desired.
+             * @returns The option.
+             */
+            getOption(label: string): OptionSetValue;
+
+            /**
+             * Gets all of the options.
+             * @returns An array of options.
+             */
+            getOptions(): OptionSetValue[];
+
+            /**
+             * Gets selected option.
+             * @returns The selected option.
+             */
+            getSelectedOption(): OptionSetValue;
+
+            /**
+             * Gets the label of the currently selected option.
+             * @returns The current value's label.
+             */
+            getText(): string;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks     The getOptions() method returns option values as strings. You must use parseInt
+             *              to convert them to numbers before you can use those values to set the value of an
+             *              OptionSet attribute. Attributes on Quick Create Forms will not save values set
+             *              with this method.
+             */
+            setValue(value: number): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.OptionSetControl>;
+        }
+
+        /**
+         * Interface a Lookup attribute.
+         *
+         * @see {@link Attribute}
+         */
+        interface LookupAttribute extends Attribute {
+            /**
+             * Gets a boolean value indicating whether the Lookup is a multi-value PartyList.
+             * @returns true the attribute is a PartyList, otherwise false.
+             */
+            getIsPartyList(): boolean;
+
+            /**
+             * Gets the value.
+             * @returns An array of LookupValue.
+             */
+            getValue(): LookupValue[];
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: LookupValue[]): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.LookupControl>;
+        }
+    }
+
+    /**
+     * A collection of types and methods for working with formContext controls.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+     */
+    namespace Controls {
+        /**
+         * Control type for formContext.ui.quickForms.getControlType().
+         */
+        type ControlQuickFormType = "quickform";
+
+        /**
+         * Control types for {@link Controls.Control.getControlType Controls.Control.getControlType()}.
+         * @see {@link XrmEnum.StandardControlType}
+         */
+        type ControlType = "standard" | "iframe" | "lookup" | "optionset" |
+            "subgrid" | "webresource" | "notes" | "timercontrol" | "kbsearch" |
+            "timelinewall" | ControlQuickFormType;
 
         /**
          * Interface for UI elements with labels.
@@ -1170,15 +2490,13 @@ declare namespace Xrm {
         interface UiLabelElement {
             /**
              * Gets the label.
-             *
-             * @return  The label.
+             * @returns The label.
              */
             getLabel(): string;
 
             /**
              * Sets the label.
-             *
-             * @param   {string}    label   The label.
+             * @param label The label.
              */
             setLabel(label: string): void;
         }
@@ -1189,8 +2507,7 @@ declare namespace Xrm {
         interface UiCanGetVisibleElement {
             /**
              * Gets the visibility state.
-             *
-             * @return  true if the tab is visible, otherwise false.
+             * @returns true if the tab is visible, otherwise false.
              */
             getVisible(): boolean;
         }
@@ -1201,8 +2518,7 @@ declare namespace Xrm {
         interface UiCanSetVisibleElement {
             /**
              * Sets the visibility state.
-             *
-             * @param   {boolean}   visible true to show, false to hide.
+             * @param visible true to show, false to hide.
              */
             setVisible(visible: boolean): void;
         }
@@ -1213,8 +2529,7 @@ declare namespace Xrm {
         interface UiStandardElement extends UiCanGetVisibleElement, UiLabelElement {
             /**
              * Sets the visibility state.
-             *
-             * @param   {boolean}   visible true to show, false to hide.
+             * @param visible true to show, false to hide.
              */
             setVisible(visible: boolean): void;
         }
@@ -1237,10 +2552,11 @@ declare namespace Xrm {
             /**
              * Use this to add a function as an event handler for the keypress event so that the function is called when you type a character in the specific text or number field.
              * For a sample JavaScript code that uses the addOnKeyPress method to configure the auto-completion experience, see Sample: Auto-complete in CRM controls.
-             *
-             * @param   {ContextSensitiveHandler}  handler The function reference.
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+             * @param handler The function reference.
              */
-            addOnKeyPress(handler: ContextSensitiveHandler): void;
+            addOnKeyPress(handler: Events.ContextSensitiveHandler): void;
 
             /**
              * Use this to manually fire an event handler that you created for a specific text or number field to be executed on the keypress event.
@@ -1249,11 +2565,12 @@ declare namespace Xrm {
 
             /**
              * Use this to remove an event handler for a text or number field that you added using addOnKeyPress.
-             *
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              * Remarks:  If an anonymous function is set using addOnKeyPress, it can’t be removed using this method.
-             * @param   {ContextSensitiveHandler}  handler The function reference.
+             * @param handler The function reference.
              */
-            removeOnKeyPress(handler: ContextSensitiveHandler): void;
+            removeOnKeyPress(handler: Events.ContextSensitiveHandler): void;
         }
 
         /**
@@ -1317,968 +2634,33 @@ declare namespace Xrm {
         }
 
         /**
-         * Interface for a Lookup value.
-         */
-        interface LookupValue {
-            /**
-             * The identifier.
-             */
-            id: string;
-
-            /**
-             * The name
-             */
-            name?: string;
-
-            /**
-             * Type of the entity.
-             */
-            entityType: string;
-        }
-
-        /**
-         * Interface for an OptionSet value.
-         */
-        interface OptionSetValue {
-            /**
-             * The label text.
-             */
-            text: string;
-
-            /**
-             * The value, as a number
-             */
-            value: number;
-        }
-
-        /**
-         * Interface for a privilege.
-         */
-        interface Privilege {
-            /**
-             * True if the user can read.
-             */
-            canRead: boolean;
-
-            /**
-             * True if the user can update.
-             */
-            canUpdate: boolean;
-
-            /**
-             * True if the user can create.
-             */
-            canCreate: boolean;
-        }
-
-        /**
-         * Interface for an Entity attribute.
-         */
-        interface Attribute {
-            /**
-             * Adds a handler to be called when the attribute's value is changed.
-             *
-             * @param   {ContextSensitiveHandler}  handler The function reference.
-             */
-            addOnChange(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Fire all "on change" event handlers.
-             */
-            fireOnChange(): void;
-
-            /**
-             * Gets attribute type.
-             *
-             * @return  The attribute's type name.
-             *
-             * @remarks Values returned are: boolean
-             *                               datetime
-             *                               decimal
-             *                               double
-             *                               integer
-             *                               lookup
-             *                               memo
-             *                               money
-             *                               optionset
-             *                               string
-             */
-            getAttributeType(): string;
-
-            /**
-             * Gets the attribute format.
-             *
-             * @return  The format of the attribute.
-             *
-             * @see {@link getAttributeType()}
-             *
-             * @remarks Values returned are: date           (datetime)
-             *                               datetime       (datetime)
-             *                               duration       (integer)
-             *                               email          (string)
-             *                               language       (optionset)
-             *                               none           (integer)
-             *                               phone          (string)
-             *                               text           (string)
-             *                               textarea       (string)
-             *                               tickersymbol   (string)
-             *                               timezone       (optionset)
-             *                               url            (string)
-             */
-            getFormat(): AttributeFormat;
-
-            /**
-             * Gets a boolean value indicating whether this Attribute has unsaved changes.
-             *
-             * @return  true if there are unsaved changes, otherwise false.
-             */
-            getIsDirty(): boolean;
-
-            /**
-             * Gets the logical name of the attribute.
-             *
-             * @return  The logical name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the record context of this attribute.
-             *
-             * @return  The parent record context.
-             */
-            getParent(): Entity;
-
-            /**
-             * Gets the current level of requirement for the attribute.
-             *
-             * @return  The required level, as either "none", "required", or "recommended"
-             */
-            getRequiredLevel(): RequirementLevel;
-
-            /**
-             * Gets current submit mode for the attribute.
-             *
-             * @return  The submit mode, as either "always", "never", or "dirty"
-             *
-             * @remarks The default value is "dirty"
-             */
-            getSubmitMode(): SubmitMode;
-
-            /**
-             * Gets the current user's privileges for the attribute.
-             *
-             * @return  The user privileges.
-             */
-            getUserPrivilege(): Privilege;
-
-            /**
-             * Removes the handler from the "on change" event.
-             *
-             * @param   {ContextSensitiveHandler}   handler The handler.
-             */
-            removeOnChange(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Sets the required level.
-             *
-             * @param   {string}    requirementLevel    The requirement level, as either "none", "required", or "recommended"
-             */
-            setRequiredLevel(requirementLevel: RequirementLevel): void;
-
-            /**
-             * Sets the submit mode.
-             *
-             * @param   {string}    submitMode  The submit mode, as either "always", "never", or "dirty".
-             *
-             * @remarks The default value is "dirty"
-             */
-            setSubmitMode(submitMode: SubmitMode): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<Control>;
-
-            /**
-             * Gets the value.
-             *
-             * @return  The value.
-             */
-            getValue(): any;
-
-            /**
-             * Sets the value.
-             *
-             * @param   {any}    value   The value.
-             */
-            setValue(value: any): void;
-        }
-
-        /**
-         * Interface for a Number attribute.
+         * Interface for controls.
          *
-         * @sa  Attribute
-         */
-        interface NumberAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return  The format of the attribute.
-             *
-             * @remarks Values returned are: duration
-             *                               none
-             */
-            getFormat(): IntegerAttributeFormat;
-
-            /**
-             * Gets the maximum value allowed.
-             *
-             * @return  The maximum value allowed.
-             */
-            getMax(): number;
-
-            /**
-             * Gets the minimum value allowed.
-             *
-             * @return  The minimum value allowed.
-             */
-            getMin(): number;
-
-            /**
-             * Gets the attribute's configured precision.
-             *
-             * @return  The total number of allowed decimal places.
-             */
-            getPrecision(): number;
-
-            /**
-             * Gets the value.
-             *
-             * @return  The value.
-             */
-            getValue(): number;
-
-            /**
-             * Sets the value.
-             *
-             * @param   {number}    value   The value.
-             *
-             * @remarks Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: number): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<NumberControl>;
-        }
-
-        /**
-         * Interface for a String attribute.
-         *
-         * @sa  Attribute
-         */
-        interface StringAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return  The format of the attribute.
-             *
-             * @remarks Values returned are: email
-             *                               phone
-             *                               text
-             *                               textarea
-             *                               tickersymbol
-             *                               url
-             */
-            getFormat(): StringAttributeFormat;
-
-            /**
-             * Gets maximum length allowed.
-             *
-             * @return  The maximum length allowed.
-             *
-             * @remarks The email form's "Description" attribute does not have the this method.
-             */
-            getMaxLength(): number;
-
-            /**
-             * Gets the value.
-             *
-             * @return  The value.
-             */
-            getValue(): string;
-
-            /**
-             * Sets the value.
-             *
-             * @param   {string}    value   The value.
-             *
-             * @remarks     A String field with the {@link Attribute.getFormat|email} format enforces email
-             *              address formatting. Attributes on Quick Create Forms will not save values set
-             *              with this method.
-             */
-            setValue(value: string): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<StringControl>;
-        }
-
-        /**
-         * Common interface for enumeration attributes (OptionSet and Boolean).
-         *
-         * @sa  Attribute
-         */
-        interface EnumAttribute extends Attribute {
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return  The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): number | boolean;
-        }
-
-        /**
-         * Interface for a Boolean attribute.
-         *
-         * @sa  EnumAttribute
-         */
-        interface BooleanAttribute extends EnumAttribute {
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return  The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): boolean;
-
-            /**
-             * Gets the value.
-             *
-             * @return  true if it succeeds, false if it fails.
-             */
-            getValue(): boolean;
-
-            /**
-             * Sets the value.
-             *
-             * @param   {boolean}   value   The value.
-             *
-             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: boolean): void;
-        }
-
-        /**
-         * Interface for a Date attribute.
-         *
-         * @sa  Attribute
-         */
-        interface DateAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return  The format of the attribute.
-             *
-             * @remarks Values returned are: date
-             *                               datetime
-             */
-            getFormat(): DateAttributeFormat;
-
-            /**
-             * Gets the value.
-             *
-             * @return  The value.
-             */
-            getValue(): Date;
-
-            /**
-             * Sets the value.
-             *
-             * @param   {Date}  value   The value.
-             *
-             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: Date): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<DateControl>;
-        }
-
-        /**
-         * Interface an OptionSet attribute.
-         *
-         * @sa  EnumAttribute
-         */
-        interface OptionSetAttribute extends EnumAttribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return  The format of the attribute.
-             *
-             * @remarks Values returned are: language
-             *                               timezone
-             */
-            getFormat(): OptionSetAttributeFormat;
-
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return  The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): number;
-
-            /**
-             * Gets the option matching a value.
-             *
-             * @param   {number}    value   The enumeration value of the option desired.
-             *
-             * @return  The option.
-             */
-            getOption(value: number): OptionSetValue;
-
-            /**
-             * Gets the option matching a label.
-             *
-             * @param   {string}    label   The label of the option desired.
-             *
-             * @return  The option.
-             */
-            getOption(label: string): OptionSetValue;
-
-            /**
-             * Gets all of the options.
-             *
-             * @return  An array of options.
-             */
-            getOptions(): OptionSetValue[];
-
-            /**
-             * Gets selected option.
-             *
-             * @return  The selected option.
-             */
-            getSelectedOption(): OptionSetValue;
-
-            /**
-             * Gets the label of the currently selected option.
-             *
-             * @return  The current value's label.
-             */
-            getText(): string;
-
-            /**
-             * Gets the value.
-             *
-             * @return  The value.
-             */
-            getValue(): number;
-
-            /**
-             * Sets the value.
-             *
-             * @param   {number}    value   The value.
-             *
-             * @remarks     The getOptions() method returns option values as strings. You must use parseInt
-             *              to convert them to numbers before you can use those values to set the value of an
-             *              OptionSet attribute. Attributes on Quick Create Forms will not save values set
-             *              with this method.
-             */
-            setValue(value: number): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<OptionSetControl>;
-        }
-
-        /**
-         * Interface a Lookup attribute.
-         *
-         * @sa  Attribute
-         */
-        interface LookupAttribute extends Attribute {
-            /**
-             * Gets a boolean value indicating whether the Lookup is a multi-value PartyList.
-             *
-             * @return  true the attribute is a PartyList, otherwise false.
-             */
-            getIsPartyList(): boolean;
-
-            /**
-             * Gets the value.
-             *
-             * @return  An array of LookupValue.
-             */
-            getValue(): LookupValue[];
-
-            /**
-             * Sets the value.
-             *
-             * @param   {LookupValue[]} value   The value.
-             *
-             * @remarks Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: LookupValue[]): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<LookupControl>;
-        }
-
-        /**
-         * Interface for the form's record context, Xrm.Page.data.entity
-         */
-        interface Entity {
-            /**
-             * Adds a handler to be called when the record is saved.
-             *
-             * @param   {ContextSensitiveHandler}   handler The handler.
-             */
-            addOnSave(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Gets an serialized-XML string representing data that will be passed to the server upon saving
-             * the record.
-             *
-             * @return  The XML in string format.
-             *
-             * @remarks     This function does not work with Microsoft Dynamics CRM for tablets. Example:
-             *              "<account><name>Contoso</name><accountnumber>55555</accountnumber><telephone2>425
-             *              555-1234</telephone2></account>".
-             */
-            getDataXml(): string;
-
-            /**
-             * Gets entity's logical name.
-             *
-             * @return  The logical name.
-             */
-            getEntityName(): string;
-
-            /**
-             * Gets the record's unique identifier.
-             *
-             * @return  The identifier, in Guid format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
-             */
-            getId(): string;
-
-            /**
-             * Gets a boolean value indicating whether the record has unsaved changes.
-             *
-             * @return  true if there are unsaved changes, otherwise false.
-             */
-            getIsDirty(): boolean;
-
-            /**
-             * Gets the record's primary attribute value.
-             *
-             * @return  The primary attribute value.
-             *
-             * @remarks The value for this attribute is used when links to the record are displayed.
-             */
-            getPrimaryAttributeValue(): string;
-
-            /**
-             * Removes the handler from the "on save" event.
-             *
-             * @param   {ContextSensitiveHandler}   handler The handler.
-             */
-            removeOnSave(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Saves the record.
-             *
-             * @remarks  When using quick create forms in the web application the saveandnew option is not
-             *           applied. It will always work as if saveandclose were used. Quick create forms in
-             *           Microsoft Dynamics CRM for tablets will apply the saveandnew behavior.
-             */
-            save(): void;
-
-            /**
-             * Saves the record with the given save mode.
-             *
-             * @param   {string}    saveMode    (Optional) the save mode to save, as either "saveandclose" or
-             *                                  "saveandnew".
-             */
-            save(saveMode: SaveMode): void;
-
-            /**
-             * The collection of attributes for the record.
-             */
-            attributes: Collection.ItemCollection<Attribute>;
-        }
-
-        /**
-         * Interface for save event arguments.
-         */
-        interface SaveEventArguments {
-            /**
-             * Gets save mode, as an integer.
-             *
-             * @return  The save mode.
-             *
-             * @remarks Values returned are: 1      Save
-             *                               2      Save and Close
-             *                               59     Save and New
-             *                               70     AutoSave (Where enabled; can be used with an OnSave handler
-             *                                                to conditionally disable auto-saving)
-             *                               58     Save as Completed (Activities)
-             *                               5      Deactivate
-             *                               6      Reactivate
-             *                               47     Assign (All user- or team-owned entities)
-             *                               7      Send (Email)
-             *                               16     Qualify (Lead)
-             *                               15     Disqualify (Lead)
-             */
-            getSaveMode(): XrmEnum.SaveMode;
-
-            /**
-             * Returns a boolean value to indicate if the record's save has been prevented.
-             *
-             * @return  true if saving is prevented, otherwise false.
-             */
-            isDefaultPrevented(): boolean;
-
-            /**
-             * Prevents the save operation from being submitted to the server.
-             *
-             * @remarks All remaining "on save" handlers will continue execution.
-             */
-            preventDefault(): void;
-        }
-
-        /**
-         * Interface for process stage change event arguments.
-         */
-        interface StageChangeEventArguments {
-            /**
-             * Gets the direction of the stage change.
-             *
-             * @return  The direction.
-             *
-             * @remarks Values returned are: "next" or "previous"
-             */
-            getDirection(): StageChangeDirection;
-
-            /**
-             * Gets the destination stage object
-             *
-             * @return  The stage object
-             *
-             * @remarks For switching between entities, returns the previous stage object
-             */
-            getStage(): Stage;
-        }
-
-        /**
-         * Interface for process stage selected event arguments.
-         */
-        interface StageSelectedEventArguments {
-            /**
-             * Gets the selected stage object
-             *
-             * @return  The stage object
-             */
-            getStage(): Stage;
-        }
-
-        /**
-         * Module for the Xrm.Page.data API.
-         */
-        namespace data {
-            /**
-             * Interface for the Xrm.Page.data.process API.
-             */
-            interface ProcessManager {
-                /**
-                 * Returns a Process object representing the active process.
-                 *
-                 * @return  current active process.
-                 */
-                getActiveProcess(): Process;
-
-                /**
-                 * Set a Process as the active process.
-                 *
-                 * @param   {string}    processId           The Id of the process to make the active process.
-                 * @param   {function}  callbackFunction    (Optional) a function to call when the operation is complete.
-                 */
-                setActiveProcess(processId: string, callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Returns all process instances for the entity record that the calling user has access to.
-                 *
-                 * @param   {function}  callbackFunction    (Optional) a function to call when the operation is complete.
-                 */
-                getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
-
-                /**
-                 * Sets a process instance as the active instance
-                 *
-                 * @param   {string}    processInstanceId           The Id of the process instance to make the active instance.
-                 * @param   {function}  callbackFunction    (Optional) a function to call when the operation is complete.
-                 */
-                setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
-
-                /**
-                 * Returns a Stage object representing the active stage.
-                 *
-                 * @return  current active stage.
-                 */
-                getActiveStage(): Stage;
-
-                /**
-                 * Set a stage as the active stage.
-                 *
-                 * @param   {string}    stageId             the Id of the stage to make the active stage.
-                 * @param   {function}  callbackFunction    (Optional) a function to call when the operation is complete.
-                 */
-                setActiveStage(stageId: string, callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Use this method to get a collection of stages currently in the active path with methods to interact with the
-                 * stages displayed in the business process flow control. The active path represents stages currently rendered in
-                 * the process control based on the branching rules and current data in the record.
-                 *
-                 * @return  A collection of all completed stages, the currently active stage, and the predicted set of future stages
-                 *          based on satisfied conditions in the branching rule. This may be a subset of the stages returned with
-                 *          Xrm.Page.data.process.getActiveProcess because it will only include those stages which represent a valid
-                 *          transition from the current stage based on branching that has occurred in the process.
-                 */
-                getActivePath(): Collection.ItemCollection<Stage>;
-
-                /**
-                 * Use this method to asynchronously retrieve the enabled business process flows that the user can switch to for an
-                 * entity.
-                 *
-                 * @param   {Function} callbackFunction The callback function must accept a parameter that contains an object with
-                 *                                      dictionary properties where the name of the property is the Id of the
-                 *                                      business process flow and the value of the property is the name of the
-                 *                                      business process flow.
-                 *
-                 *                                      The enabled processes are filtered according to the user’s privileges. The
-                 *                                      list of enabled processes is the same ones a user can see in the UI if they
-                 *                                      want to change the process manually.
-                 */
-                getEnabledProcesses(callbackFunction: (enabledProcesses: ProcessDictionary) => void): void;
-
-                /**
-                 * Use this method to get the currently selected stage.
-                 *
-                 * @return  The currently selected stage.
-                 */
-                getSelectedStage(): Stage;
-
-                /**
-                 * Use this to add a function as an event handler for the OnStageChange event so that it will be called when the
-                 * business process flow stage changes.
-                 * @param   {ContextSensitiveHandler}   handler The function will be added to the bottom of the event
-                 *                                              handler pipeline. The execution context is automatically
-                 *                                              set to be the first parameter passed to the event handler.
-                 *
-                 *                                              Use a reference to a named function rather than an
-                 *                                              anonymous function if you may later want to remove the
-                 *                                              event handler.
-                 */
-                addOnStageChange(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to add a function as an event handler for the OnProcessStatusChange event so that it will be called when the
-                 * business process flow status changes.
-                 * @param   {ProcessStatusChangeHandler}   handler The function will be added to the bottom of the event
-                 *                                              handler pipeline. The execution context is automatically
-                 *                                              set to be the first parameter passed to the event handler.
-                 *
-                 *                                              Use a reference to a named function rather than an
-                 *                                              anonymous function if you may later want to remove the
-                 *                                              event handler.
-                 */
-                addOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
-
-                /**
-                 * Use this to add a function as an event handler for the OnStageSelected event so that it will be called
-                 * when a business process flow stage is selected.
-                 *
-                 * @param   {ContextSensitiveHandler}   handler The function will be added to the bottom of the event
-                 *                                              handler pipeline. The execution context is automatically
-                 *                                              set to be the first parameter passed to the event handler.
-                 *
-                 *                                              Use a reference to a named function rather than an
-                 *                                              anonymous function if you may later want to remove the
-                 *                                              event handler.
-                 */
-                addOnStageSelected(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnProcessStatusChange event.
-                 *
-                 * @param   {ProcessStatusChangeHandler}   handler If an anonymous function is set using the addOnProcessStatusChange method it
-                 *                                              cannot be removed using this method.
-                 */
-                removeOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnStageChange event.
-                 *
-                 * @param   {ContextSensitiveHandler}   handler If an anonymous function is set using the addOnStageChange method it
-                 *                                              cannot be removed using this method.
-                 */
-                removeOnStageChange(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnStageChange event.
-                 *
-                 * @param   {ContextSensitiveHandler}   handler If an anonymous function is set using the addOnStageChange method it
-                 *                                              cannot be removed using this method.
-                 */
-                removeOnStageSelected(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Progresses to the next stage.
-                 *
-                 * @param   {ProcessCallbackDelegate}   callbackFunction    (Optional) A function to call when the operation is
-                 *                                                          complete.
-                 */
-                moveNext(callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Moves to the previous stage.
-                 *
-                 * @param   {ProcessCallbackDelegate}   callbackFunction    (Optional) A function to call when the operation is
-                 *                                                          complete.
-                 */
-                movePrevious(callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Use this method to get the unique identifier of the process instance
-                 *
-                 * @return  The unique identifier of the process instance
-                 */
-                getInstanceId(): string;
-
-                /**
-                 * Use this method to get the name of the process instance
-                 *
-                 * @return  The name of the process instance
-                 */
-                getInstanceName(): string;
-
-                /**
-                 * Use this method to get the current status of the process instance
-                 *
-                 * @return  The current status of the process
-                 */
-                getStatus(): ProcessStatus;
-
-                /**
-                 * Use this method to set the current status of the process instance
-                 *
-                 * @param   {ProcessStatus}  status         The new status for the process
-                 * @param   {function}  callbackFunction    (Optional) a function to call when the operation is complete.
-                 */
-                setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
-            }
-
-            /**
-             * Called when method to get active processes is complete
-             *
-             * @param       {string}    status  The result of the get active processes operation.
-             *
-             * @remarks     Returns object with the following key-value pairs:
-             *                          CreatedOn
-             *                          ProcessDefinitionID
-             *                          ProcessDefinitionName
-             *                          ProcessInstanceID
-             *                          ProcessInstanceName
-             *                          StatusCodeName
-             */
-            type GetProcessInstancesDelegate = (object: ProcessDictionary) => void;
-
-            /**
-             * Called when method to set active process is complete
-             *
-             * @param       {string}    status  The result of the set active process operation.
-             *
-             * @remarks     Values returned are: success        (The operation succeeded.)
-             *                                   invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
-             */
-            type SetProcessInstanceDelegate = (status: string) => void;
-
-            /**
-             * Called when process change methods have completed.
-             *
-             * @param       {string}    status  The result of the process change operation.
-             *
-             * @remarks     Values returned are: success        (The operation succeeded.)
-             *                                   crossEntity    (The previous stage is for a different entity.)
-             *                                   beginning      (The active stage is the first stage of the active path.)
-             *                                   invalid        (The operation failed because the selected stage isn’t the same
-             *                                   as the active stage.)
-             *                                   unreachable    (The stage exists on a different path.)
-             */
-            type ProcessCallbackDelegate = (status: string) => void;
-
-            /**
-             * Called when process set status method has completed.
-             *
-             * @param       {ProcessStatus}    status  The new status of the process instance
-             *
-             * @remarks     Values returned are: active
-             *                                   aborted
-             *                                   finished
-             */
-            type ProcessSetStatusDelegate = (status: ProcessStatus) => void;
-
-            /**
-             * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
-             */
-            interface ProcessDictionary { [index: string]: string; }
-        }
-
-        /**
-         * Interface for Xrm.Page.ui controls.
-         *
-         * @sa  UiElement
+         * @see {@link UiElement}
          */
         interface Control extends UiLabelElement, UiCanGetVisibleElement {
             /**
              * Gets the controls type.
-             *
-             * @return  The control type.
-             *
-             * @remarks Values returned are: standard
-             *                               iframe
-             *                               lookup
-             *                               optionset
-             *                               subgrid
-             *                               webresource
-             *                               notes
-             *                               timercontrol
-             *                               kbsearch (CRM Online Only, use parature.d.ts)
-             *                               quickform (see ui.QuickForm)
-             *                               customcontrol: <namespace>.<name> (A custom control for mobile phone and tablet clients).
-             *                               customsubgrid: <namespace>.<name> (A custom dataset control for mobile phone and tablet clients).
+             * @returns The control type.<BR><BR>
+             * **Values returned are**:
+             * * standard
+             * * iframe
+             * * lookup
+             * * optionset
+             * * subgrid
+             * * webresource
+             * * notes
+             * * timercontrol
+             * * kbsearch (CRM Online Only, use parature.d.ts)
+             * * quickform (see ui.QuickForm)
+             * * customcontrol: <namespace>.<name> (A custom control for mobile phone and tablet clients).
+             * * customsubgrid: <namespace>.<name> (A custom dataset control for mobile phone and tablet clients).
              */
             getControlType(): ControlType | string;
 
             /**
              * Gets the name of the control on the form.
-             *
-             * @return  The name of the control.
-             *
+             * @returns The name of the control.
              * @remarks     The name assigned to a control is not determined until the form loads. Changes to
              *              the form may change the name assigned to a given control.
              *              When you use the control getName method the name of the first control will be the
@@ -2294,80 +2676,97 @@ declare namespace Xrm {
 
             /**
              * Gets a reference to the Section parent of the control.
-             *
-             * @return  The parent Section.
+             * @returns The parent Section.
              */
             getParent(): Section;
         }
 
+        /**
+         * Interface for {@link Ui.navigation formContext.ui.navigation}.
+         */
+        interface Navigation {
+            /**
+             * A reference to the collection of available navigation items.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            items: Collection.ItemCollection<NavigationItem>;
+        }
+
+        /**
+         * Interface for a navigation item.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-navigation External Link: formContext.ui.navigation item (Client API reference)}
+         */
+        interface NavigationItem extends UiStandardElement, UiFocusable {
+            /**
+             * Gets the name of the item.
+             * @returns The identifier.
+             */
+            getId(): string;
+        }
+
         /**
          * Interface for a standard control.
-         *
-         * @sa  Control
+         * @see {@link Control}
          */
         interface StandardControl extends Control, UiStandardElement, UiFocusable {
             /**
              * Clears the notification identified by uniqueId.
-             *
-             * @param   {string}    uniqueId    (Optional) Unique identifier.
-             *
-             * @return  true if it succeeds, false if it fails.
-             *
+             * @param uniqueId (Optional) Unique identifier.
+             * @returns true if it succeeds, false if it fails.
              * @remarks If the uniqueId parameter is not used, the current notification shown will be removed.
              */
             clearNotification(uniqueId?: string): boolean;
 
             /**
              * Gets a boolean value, indicating whether the control is disabled.
-             *
-             * @return  true if it is disabled, otherwise false.
+             * @returns true if it is disabled, otherwise false.
              */
             getDisabled(): boolean;
 
             /**
              * Sets the state of the control to either enabled, or disabled.
-             *
-             * @param   {boolean}   disabled    true to disable, false to enable.
+             * @param disabled true to disable, false to enable.
              */
             setDisabled(disabled: boolean): void;
 
             /**
              * Sets a control-local notification message.
-             *
-             * @param   {string}    message     The message.
-             * @param   {string}    uniqueId    Unique identifier.
-             *
-             * @return  true if it succeeds, false if it fails.
-             *
+             * @param message The message.
+             * @param uniqueId Unique identifier.
+             * @returns true if it succeeds, false if it fails.
              * @remarks     When this method is used on Microsoft Dynamics CRM for tablets a red "X" icon
              *              appears next to the control. Tapping on the icon will display the message.
              */
             setNotification(message: string, uniqueId: string): boolean;
 
             /**
-             * Gets the control's bound attribute.
-             *
-             * @tparam  T   An Attribute type.
-             *
-             * @return  The attribute.
+             * Displays an error or recommendation notification for a control, and lets you specify actions to execute based on the notification.
              */
-            getAttribute<T extends Attribute>(): T;
+            addNotification(notification: AddControlNotificationOptions): void;
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @return  The attribute.
+             * @template T An Attribute type.
+             * @returns The attribute.
              */
-            getAttribute(): Attribute;
+            getAttribute<T extends Attributes.Attribute>(): T;
+
+            /**
+             * Gets the control's bound attribute.
+             * @returns The attribute.
+             */
+            getAttribute(): Attributes.Attribute;
         }
 
         /**
          * Interface for Auto Lookup Control.
          * This is not an Entity Lookup, but a control that supports AutoComplete / KeyPress Events (Text or Number)
-         *
          * @remarks This interface is not supported for CRM mobile clients (phones or tablets) and the interactive service hub.  It is only available for Updated entities.
-         *
-         * @sa  StandardControl
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @see {@link StandardControl}
          */
         interface AutoLookupControl extends StandardControl, UiKeyPressable {
             /**
@@ -2380,99 +2779,89 @@ declare namespace Xrm {
 
             /**
              * Hides the auto-completion drop-down list configured for a specific text field
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              */
             hideAutoComplete(): void;
 
             /**
              * Shows upt to 10 matching strings in a drop-down list as users press keys to type charactrer in a specific text field.
              * On selecting an item in the drop-down list, the value in the text field changes to the selected item, the drop-down list disappears, and the OnChange event for the text field is invoked
-             * @param resultSet
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+             * @param resultSet The results to show
              */
             showAutoComplete(resultSet: AutoCompleteResultSet): void;
         }
 
         /**
          * Interface for a String control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface StringControl extends AutoLookupControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return  The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): StringAttribute;
+            getAttribute(): Attributes.StringAttribute;
         }
 
         /**
          * Interface for a Number control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface NumberControl extends AutoLookupControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return  The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): NumberAttribute;
+            getAttribute(): Attributes.NumberAttribute;
         }
 
         /**
          * Interface for a Date control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface DateControl extends StandardControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return  The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): DateAttribute;
+            getAttribute(): Attributes.DateAttribute;
 
             /**
              * Gets the status of the time-of-day component of the Date control.
-             *
-             * @return  true if the time is shown, otherwise false.
+             * @returns true if the time is shown, otherwise false.
              */
             getShowTime(): boolean;
 
             /**
              * Sets the visibility of the time component of the Date control.
-             *
-             * @param   {boolean}   showTimeValue   true to show, false to hide the time value.
+             * @param showTimeValue true to show, false to hide the time value.
              */
             setShowTime(showTimeValue: boolean): void;
         }
 
         /**
          * Interface for a Lookup control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface LookupControl extends StandardControl {
             /**
              * Adds a handler to the "pre search" event of the Lookup control.
-             *
-             * @param   {Function}  handler The handler.
+             * @param handler The handler.
              */
-            addPreSearch(handler: ContextSensitiveHandler): void;
+            addPreSearch(handler: Events.ContextSensitiveHandler): void;
 
             /**
              * Adds an additional custom filter to the lookup, with the "AND" filter operator.
              * Can only be used within a "pre search" event handler
-             *
-             * @sa addPreSearch
-             *
-             * @param   {string}    filter              Specifies the filter, as a serialized FetchXML
-             *                                          "filter" node.
-             * @param   {string}    entityLogicalName   (Optional) The logical name of the entity.
-             *
+             * @see {@link addPreSearch}
+             * @param filter Specifies the filter, as a serialized FetchXML "filter" node.
+             * @param entityLogicalName (Optional) The logical name of the entity.
              * @remarks     If entityLogicalName is not specified, the filter will be applied to all entities
              *              valid for the Lookup control.
-             *              Example filter: <filter type="and">
+             * @example     Example filter: <filter type="and">
              *                              <condition attribute="address1_city" operator="eq" value="Redmond" />
              *                              </filter>
              */
@@ -2480,66 +2869,68 @@ declare namespace Xrm {
 
             /**
              * Adds a custom view for the Lookup dialog.
-             *
-             * @param   {string}    viewId          Unique identifier for the view, in Guid format.
-             * @param   {string}    entityName      Name of the entity.
-             * @param   {string}    viewDisplayName Name of the view to display.
-             * @param   {string}    fetchXml        The FetchXML query for the view's contents, serialized as a string.
-             * @param   {string}    layoutXml       The Layout XML, serialized as a string.
-             * @param   {boolean}   isDefault       true, to treat this view as default.
-             *
+             * @param viewId Unique identifier for the view, in Guid format.
+             * @param entityName Name of the entity.
+             * @param viewDisplayName Name of the view to display.
+             * @param fetchXml The FetchXML query for the view's contents, serialized as a string.
+             * @param layoutXml The Layout XML, serialized as a string.
+             * @param isDefault true, to treat this view as default.
              * @remarks Cannot be used on "Owner" Lookup controls.
              *          The viewId is never saved to CRM, but must be unique across available views.  Generating
-             *          a new value can be accomplished with a {@link http://www.guidgen.com/|Guid generator}.
-             *          Example viewId value: "{00000000-0000-0000-0000-000000000001}"
-             *          Layout XML Reference: {@link http://msdn.microsoft.com/en-us/library/gg334522.aspx}
+             *          a new value can be accomplished with a {@link http://www.guidgen.com/ Guid generator(external link)}.
+             * @example Example viewId value: "{00000000-0000-0000-0000-000000000001}"
+             * @see {@link http://msdn.microsoft.com/en-us/library/gg334522.aspx External Link: Layout XML Reference}
              */
             addCustomView(viewId: string, entityName: string, viewDisplayName: string, fetchXml: string, layoutXml: string, isDefault: boolean): void;
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @return  The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): LookupAttribute;
+            getAttribute(): Attributes.LookupAttribute;
 
             /**
              * Gets the unique identifier of the default view.
-             *
-             * @return  The default view, in Guid format.
-             *
-             * @remarks Example: "{00000000-0000-0000-0000-000000000000}"
+             * @returns The default view, in Guid format.
+             * @example Example return: "{00000000-0000-0000-0000-000000000000}"
              */
             getDefaultView(): string;
 
             /**
              * Removes the handler from the "pre search" event of the Lookup control.
-             *
-             * @param   {Function}  handler The handler.
+             * @param handler The handler.
              */
             removePreSearch(handler: () => void): void;
 
             /**
              * Sets the Lookup's default view.
-             *
-             * @param   {string}    viewGuid    Unique identifier for the view.
-             *
-             * @remarks Example viewGuid value: "{00000000-0000-0000-0000-000000000000}"
+             * @param viewGuid Unique identifier for the view.
+             * @example Example viewGuid value: "{00000000-0000-0000-0000-000000000000}"
              */
             setDefaultView(viewGuid: string): void;
+
+            /**
+             * Gets the types of entities allowed in the lookup control.
+             */
+            getEntityTypes(): string[];
+
+            /**
+             * Sets the types of entities allowed in the lookup control.
+             */
+            setEntityTypes(entityLogicalNames: string[]): void;
         }
 
         /**
          * Interface for an OptionSet control.
          *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface OptionSetControl extends StandardControl {
             /**
              * Adds an option.
              *
-             * @param   {OptionSetValue}    option  The option.
-             * @param   {number}    index           (Optional) zero-based index of the option.
+             * @param option The option.
+             * @param index (Optional) zero-based index of the option.
              *
              * @remarks This method does not check that the values within the options you add are valid.
              *          If index is not provided, the new option will be added to the end of the list.
@@ -2554,14 +2945,14 @@ declare namespace Xrm {
             /**
              * Gets the control's bound attribute.
              *
-             * @return  The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): OptionSetAttribute;
+            getAttribute(): Attributes.OptionSetAttribute;
 
             /**
              * Removes the option matching the value.
              *
-             * @param   {number}    value   The value.
+             * @param value The value.
              */
             removeOption(value: number): void;
         }
@@ -2569,282 +2960,96 @@ declare namespace Xrm {
         /**
          * Interface for a CRM grid control.
          *
-         * @sa  Control
+         * @see {@link Control}
          */
         interface GridControl extends Control {
             /**
              * Use this method to add event handlers to the GridControl's OnLoad event.
              *
-             * @param   {Function} handler The event handler.
+             * @param handler The event handler.
              */
             addOnLoad(handler: () => void): void;
 
             /**
              * This method returns context information about the GridControl.
              *
-             * @return  The context type.
+             * @returns The context type.
              */
             getContextType(): XrmEnum.GridControlContext;
 
             /**
              * Use this method to get the logical name of the entity data displayed in the grid.
              *
-             * @return  The entity name.
+             * @returns The entity name.
              */
             getEntityName(): string;
 
             /**
              * Use this method to get access to the Grid available in the GridControl.
-             *
-             * @return  The grid.
+             * @returns The grid.
              */
-            getGrid(): ui.Grid;
+            getGrid(): Grid;
 
             /**
              * Use this method to get access to the ViewSelector available for the GridControl when it is configured to display views.
-             *
-             * @return  The view selector.
+             * @returns The view selector.
              */
-            getViewSelector(): ui.ViewSelector;
+            getViewSelector(): ViewSelector;
 
             /**
              * Refreshes the sub grid.
-             *
              * @remarks Not available during the "on load" event of the form.
              */
             refresh(): void;
 
             /**
              * Use this method to remove event handlers from the GridControl's OnLoad event.
-             *
-             * @param   {Function} handler The handler.
+             * @param handler The handler.
              */
             removeOnLoad(handler: () => void): void;
         }
 
         /**
-         * Interface for a framed control, which is either a Web Resource or an Iframe.
-         *
-         * @sa  Control
-         *
-         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
-         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
+         * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
+         * GridControl.getGrid method.
          */
-        interface FramedControl extends Control {
+        interface Grid {
             /**
-             * Gets the DOM element containing the control.
-             *
-             * @return  The container object.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns a collection of every GridRow in the Grid.
+             * @returns The rows.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            getObject(): HTMLIFrameElement;
+            getRows(): Collection.ItemCollection<Grid.GridRow>;
 
             /**
-             * Gets the URL value of the control.
-             *
-             * @return  The source URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns a collection of every selected GridRow in the Grid.
+             * @returns The selected rows.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            getSrc(): string;
+            getSelectedRows(): Collection.ItemCollection<Grid.GridRow>;
 
             /**
-             * Sets the URL value of the control.
-             *
-             * @param   {string}    src The source URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns the total number of records in the Grid.
+             * @returns The total record count.
              */
-            setSrc(src: string): void;
+            getTotalRecordCount(): number;
         }
 
-        /**
-         * Interface for an Iframe control.
-         *
-         * @sa  FramedControl
-         */
-        interface IframeControl extends FramedControl, UiCanSetVisibleElement {
-            /**
-             * Gets initial URL defined for the Iframe.
-             *
-             * @return  The initial URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getInitialUrl(): string;
-        }
-
-        /**
-         * Interface for a Silverlight control.
-         *
-         * @sa  Control
-         */
-        interface SilverlightControl extends Control {
-            /**
-             * Gets the query string value passed to Silverlight.
-             *
-             * @return  The data.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getData(): string;
-
-            /**
-             * Sets the query string value passed to Silverlight.
-             *
-             * @param   {string}    data    The data.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            setData(data: string): void;
-
-            /**
-             * Gets the DOM element containing the control.
-             *
-             * @return  The container object.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getObject(): HTMLObjectElement;
-        }
-
-        /**
-         * Interface for a form tab.
-         *
-         * @sa  UiElement
-         * @sa  UiFocusable
-         */
-        interface Tab extends UiStandardElement, UiFocusable {
-            /**
-             * Gets display state of the tab.
-             *
-             * @return  The display state, as either "expanded" or "collapsed"
-             */
-            getDisplayState(): ui.DisplayState;
-
-            /**
-             * Gets the name of the tab.
-             *
-             * @return  The name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the Xrm.Page.ui parent of the tab.
-             *
-             * @return  The parent.
-             */
-            getParent(): Ui;
-
-            /**
-             * Sets display state of the tab.
-             *
-             * @param   {string}    displayState   Display state of the tab, as either "expanded" or "collapsed"
-             */
-            setDisplayState(displayState: ui.DisplayState): void;
-
-            /**
-             * A reference to the collection of form sections within this tab.
-             */
-            sections: Collection.ItemCollection<Section>;
-        }
-
-        /**
-         * Interface for a form section.
-         *
-         * @sa  UiElement
-         */
-        interface Section extends UiStandardElement {
-            /**
-             * Gets the name of the section.
-             *
-             * @return  The name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the Xrm.Page.Tab parent of this item.
-             *
-             * @return  The parent.
-             */
-            getParent(): Tab;
-
-            /**
-             * A reference to the collection of controls within this tab.
-             */
-            controls: Collection.ItemCollection<Control>;
-        }
-
-        /**
-         * Module for Xrm.Page.ui API.
-         */
-        namespace ui {
-            /**
-             * Form Notification Levels for Xrm.Ui.setFormNotification().
-             */
-            type FormNotificationLevel = "ERROR" | "INFO" | "WARNING";
-
-            /**
-             * Display States for Xrm.ui.ProcessMonitor.setDisplayState().
-             */
-            type DisplayState = "collapsed" | "expanded";
-
-            /**
-             * Interface for Xrm.Page.ui.process API
-             */
-            interface ProcessManager {
-                /**
-                 * Sets display state of the process flow control.
-                 *
-                 * @param   {string}    displayState   Display state of the process flow control, as either "expanded" or "collapsed"
-                 */
-                setDisplayState(displayState: DisplayState): void;
-
-                /**
-                 * Sets the visibility state.
-                 *
-                 * @param   {boolean}   visible true to show, false to hide.
-                 */
-                setVisible(visible: boolean): void;
-            }
-
-            /**
-             * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
-             * GridControl.getGrid method.
-             */
-            interface Grid {
-                /**
-                 * Returns a collection of every GridRow in the Grid.
-                 *
-                 * @return  The rows.
-                 */
-                getRows(): Collection.ItemCollection<GridRow>;
-
-                /**
-                 * Returns a collection of every selected GridRow in the Grid.
-                 *
-                 * @return  The selected rows.
-                 */
-                getSelectedRows(): Collection.ItemCollection<GridRow>;
-
-                /**
-                 * Returns the total number of records in the Grid.
-                 *
-                 * @return  The total record count.
-                 */
-                getTotalRecordCount(): number;
-            }
-
+        namespace Grid {
             /**
              * Interface for a grid row.  Use the GridRow.getData method to access the GridRowData. A collection of GridRow is
              * returned by Grid.getRows and Grid.getSelectedRows methods.
+             * In V9 - this is essentailly a form context
              */
             interface GridRow {
+                /**
+                 * Provides methods to work with the row data.
+                 */
+                data: Data;
                 /**
                  * Returns the GridRowData for the GridRow.
-                 *
-                 * @return  The data.
+                 * @deprecated Deprecated in V9 - use data field instead
+                 * @returns The data.
                  */
                 getData(): GridRowData;
             }
@@ -2856,8 +3061,8 @@ declare namespace Xrm {
             interface GridRowData {
                 /**
                  * Returns the GridEntity for the GridRowData.
-                 *
-                 * @return  The entity.
+                 * @returns The entity.
+                 * @deprecated Use GridRow.data.entity instead of using GridRow.getData().getEntity().
                  */
                 getEntity(): GridEntity;
             }
@@ -2865,189 +3070,318 @@ declare namespace Xrm {
             /**
              * Interface for a grid entity.  Use the GridEntity methods to access data about the specific records in the rows.
              * GridEntity is returned by the GridRowData.getEntity method.
+             *
+             * @deprecated Use GridRow.data.entity instead.
              */
             interface GridEntity {
                 /**
                  * Returns the logical name for the record in the row.
                  *
-                 * @return  The entity name.
+                 * @returns The entity name.
+                 * @deprecated Use GridRow.data.entity.getEntityName() instead.
                  */
                 getEntityName(): string;
 
                 /**
                  * Returns a LookupValue that references this record.
                  *
-                 * @return  The entity reference.
+                 * @returns The entity reference.
+                 * @deprecated Use GridRow.data.entity.getEntityReference() instead.
                  */
                 getEntityReference(): LookupValue;
 
                 /**
                  * Returns the id for the record in the row.
                  *
-                 * @return  The identifier of the GridEntity, in GUID format.
-                 *
-                 * @remarks Example return: "{00000000-0000-0000-0000-000000000000}"
+                 * @returns The identifier of the GridEntity, in GUID format.
+                 * @example Example return: "{00000000-0000-0000-0000-000000000000}"
+                 * @deprecated Use GridRow.data.entity.getId() instead.
                  */
                 getId(): string;
 
                 /**
                  * Returns the primary attribute value for the record in the row.  (Commonly the name.)
                  *
-                 * @return  The primary attribute value.
+                 * @returns The primary attribute value.
+                 * @deprecated Use GridRow.data.entity.getPrimaryAttributeValue() instead.
                  */
                 getPrimaryAttributeValue(): string;
             }
-
-            /**
-             * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
-             * of the grid control.
-             */
-            interface ViewSelector {
-                /**
-                 * Use this method to get a reference to the current view.
-                 *
-                 * @return  The current view.
-                 */
-                getCurrentView(): ViewSelectorItem;
-
-                /**
-                 * Use this method to determine whether the view selector is visible.
-                 *
-                 * @return  true if visible, false if not.
-                 */
-                isVisible(): boolean;
-
-                /**
-                 * Use this method to set the current view.
-                 *
-                 * @param   {ViewSelectorItem}  viewSelectorItem    The view selector item.
-                 */
-                setCurrentView(viewSelectorItem: ViewSelectorItem): void;
-            }
-
-            /**
-             * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
-             * the ViewSelector.setCurrentView method.
-             */
-            interface ViewSelectorItem {
-                /**
-                 * Returns a LookupValue that references this view.
-                 *
-                 * @return  The entity reference.
-                 */
-                getEntityReference(): LookupValue;
-            }
-
-            /**
-             * Interface for a quick view control instance on a form.
-             *
-             * @see {@link https://msdn.microsoft.com/en-us/library/mt736908.aspx#bkmk_isLoaded} for details.
-             */
-            interface QuickForm extends Control, UiLabelElement, UiCanGetVisibleElement {
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @return  An array of controls.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(): Control[];
-
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @tparam  T   A Control type
-                 * @param   {string}    controlName    Name of the control.
-                 *
-                 * @return  The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl<T extends Control>(controlName: string): T;
-
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @param   {string}    controlName    Name of the control.
-                 *
-                 * @return  The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(controlName: string): Control;
-
-                /**
-                 * Gets a control by index.
-                 *
-                 * @tparam  T   A Control type
-                 * @param   {number}    index   The control index.
-                 *
-                 * @return  The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl<T extends Control>(index: number): T;
-
-                /**
-                 * Gets a control by index.
-                 *
-                 * @param   {number}    index   The control index.
-                 *
-                 * @return  The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(index: number): Control;
-
-                /**
-                 * Gets the controls type.
-                 *
-                 * @return  Returns a string value that categorizes quick view controls.
-                 */
-                getControlType(): ControlQuickFormType;
-
-                /**
-                 * Returns whether the data binding for the constituent controls in a quick view control is complete.
-                 *
-                 * @return   True is the data binding for a constituent control is complete, otherwise false.
-                 *           because the quick view form that the control is bound to may not have loaded completely.
-                 *           As a result, using the getAttribute or any data-related methods on a constituent control might not work.
-                 *           The isLoaded method for the quick view control helps determine the data binding status for constituent controls in a quick view control.
-                 *
-                 *  @remarks The data binding for the constituent controls in a quick view control may not be complete during the main form OnLoad event
-                 */
-                isLoaded(): boolean;
-
-                /**
-                 * Refreshes the data displayed in a quick view control.
-                 */
-                refresh(): void;
-            }
         }
 
         /**
-         * Interface for a navigation item.
-         *
-         * @sa  UiElement
-         * @sa  UiFocusable
+         * Interface for a framed control, which is either a Web Resource or an Iframe.
+         * @see {@link Control}
+         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
+         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
          */
-        interface NavigationItem extends UiStandardElement, UiFocusable {
+        interface FramedControl extends Control {
             /**
-             * Gets the name of the item.
-             *
-             * @return  The identifier.
+             * Gets the DOM element containing the control.
+             * @returns The container object.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            getId(): string;
+            getObject(): HTMLIFrameElement;
+
+            /**
+             * Gets the URL value of the control.
+             * @returns The source URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getSrc(): string;
+
+            /**
+             * Sets the URL value of the control.
+             * @param src The source URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            setSrc(src: string): void;
         }
 
         /**
-         * Interface for Xrm.Page.ui.navigation.
+         * Interface for an Iframe control.
+         * @see {@link FramedControl}
          */
-        interface Navigation {
+        interface IframeControl extends FramedControl, UiCanSetVisibleElement {
             /**
-             * A reference to the collection of available navigation items.
+             * Gets initial URL defined for the Iframe.
+             * @returns The initial URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            items: Collection.ItemCollection<NavigationItem>;
+            getInitialUrl(): string;
+        }
+
+        /**
+         * Interface for a quick view control instance on a form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-quickforms External Link: formContext.ui.quickForms (Client API reference)}
+         */
+        interface QuickFormControl extends Control, UiLabelElement, UiCanGetVisibleElement {
+            /**
+             * Gets the constituent controls in a quick view control.
+             * @returns An array of controls.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl(): Control[];
+
+            /**
+             * Gets the constituent controls in a quick view control.
+             * @param T A Control type
+             * @param controlName Name of the control.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl<T extends Control>(controlName: string): T;
+
+            /**
+             * Gets the constituent controls in a quick view control.
+             * @param controlName Name of the control.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl(controlName: string): Control;
+
+            /**
+             * Gets a control by index.
+             * @param T A Control type
+             * @param index The control index.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl<T extends Control>(index: number): T;
+
+            /**
+             * Gets a control by index.
+             * @param index The control index.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl(index: number): Control;
+
+            /**
+             * Gets the controls type.
+             * @returns Returns a string value ("quickform") that categorizes quick view controls.
+             */
+            getControlType(): ControlQuickFormType;
+
+            /**
+             * Returns whether the data binding for the constituent controls in a quick view control is complete.
+             * @returns  True is the data binding for a constituent control is complete, otherwise false.
+             *          because the quick view form that the control is bound to may not have loaded completely.
+             *          As a result, using the getAttribute or any data-related methods on a constituent control might not work.
+             *          The isLoaded method for the quick view control helps determine the data binding status for constituent controls in a quick view control.
+             * @remarks The data binding for the constituent controls in a quick view control may not be complete during the main form OnLoad event
+             */
+            isLoaded(): boolean;
+
+            /**
+             * Refreshes the data displayed in a quick view control.
+             */
+            refresh(): void;
+        }
+
+        /**
+         * Interface for a Silverlight control.
+         * @see {@link Control}
+         * @deprecated The Silverlight WebResource is deprecated on the web client, and is not supported on the new Unified Interface in v9.
+         * Instead of silverlight, use custom controls created using the HTML web resources with HTML5 to create UI components to visualize and interact with data.
+         */
+        interface SilverlightControl extends Control {
+            /**
+             * Gets the query string value passed to Silverlight.
+             * @returns The data.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getData(): string;
+
+            /**
+             * Sets the query string value passed to Silverlight.
+             * @param data The data.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            setData(data: string): void;
+
+            /**
+             * Gets the DOM element containing the control.
+             * @returns The container object.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getObject(): HTMLObjectElement;
+        }
+
+        /**
+         * Interface for a Timeline control.
+         * @see {@link Control}
+         */
+        interface TimelineWall extends Control {
+            /**
+             * Refreshes the data displayed in a timelinewall and timer control.
+             */
+            refresh(): void;
+        }
+
+        /**
+         * Interface for a form tab.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         */
+        interface Tab extends UiStandardElement, UiFocusable {
+            /**
+             * Gets display state of the tab.
+             * @returns The display state, as either "expanded" or "collapsed"
+             */
+            getDisplayState(): DisplayState;
+
+            /**
+             * Gets the name of the tab.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the {@link FormContext.ui formContext.ui} parent of the tab.
+             * @returns The parent.
+             */
+            getParent(): Ui;
+
+            /**
+             * Sets display state of the tab.
+             * @param displayState Display state of the tab, as either "expanded" or "collapsed"
+             */
+            setDisplayState(displayState: DisplayState): void;
+
+            /**
+             * A reference to the collection of form sections within this tab.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            sections: Collection.ItemCollection<Section>;
+        }
+
+        /**
+         * Interface for a form section.
+         * @see {@link UiElement}
+         */
+        interface Section extends UiStandardElement {
+            /**
+             * Gets the name of the section.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the parent {@link Tab}.
+             * @returns The parent.
+             */
+            getParent(): Tab;
+
+            /**
+             * A reference to the collection of controls within this tab.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Control>;
+        }
+
+        interface AddControlNotificationOptions {
+            /**
+             * A collection of actions
+             */
+            actions?: ControlNotificationAction[];
+
+            /**
+             * The message to display in the notification.
+             * In the current release, only the first message specified in this array will be displayed.
+             */
+            messages: string[];
+
+            /**
+             * Defines the type of notification.
+             */
+            notificationLevel?: NotificationLevel;
+
+            /**
+             * The ID to use to clear this notification when using the clearNotification method.
+             */
+            uniqueId: string;
+        }
+
+        /**
+         * Constants to use with the addNotification method of form controls
+         */
+        type NotificationLevel = "ERROR" | "RECOMMENDATION";
+
+        /**
+         * interface to define the actions on a control notification
+         */
+        interface ControlNotificationAction {
+            /**
+             * The body message of the notification to be displayed to the user. Limit your message to 100 characters for optimal user experience.
+             */
+            message?: string;
+
+            /**
+             * Array of functions. The corresponding actions for the message.
+             */
+            actions: Array<() => void>;
+        }
+
+        interface ProcessControl extends UiCanGetVisibleElement, UiCanSetVisibleElement {
+            /**
+             * Sets display state of the process flow control.
+             * @param displayState Display state of the process flow control, as either "expanded" or "collapsed"
+             */
+            setDisplayState(displayState: DisplayState): void;
+
+            /**
+             * Gets the display state of the process flow control.
+             */
+            getDisplayState(): DisplayState;
+
+            /**
+             * Reflow the UI of the process control
+             * @param updateUI Specify true to update the UI of the process control; false otherwise.
+             * @param parentStage ID of the parent stage.
+             * @param nextStage ID of the next stage.
+             */
+            reflow(updateUI: boolean, parentStage: string, nextStage: string): void;
         }
 
         /**
@@ -3056,15 +3390,13 @@ declare namespace Xrm {
         interface FormItem {
             /**
              * Gets the unique identifier of the form.
-             *
-             * @return  The identifier, in Guid format.
+             * @returns The identifier, in Guid format.
              */
             getId(): string;
 
             /**
              * Gets the label for the form.
-             *
-             * @return  The label.
+             * @returns The label.
              */
             getLabel(): string;
 
@@ -3080,38 +3412,508 @@ declare namespace Xrm {
         interface FormSelector {
             /**
              * Gets current form.
-             *
-             * @return  The current item.
-             *
+             * @returns The current item.
              * @remarks When only one form is available this method will return null.
              */
             getCurrentItem(): FormItem;
 
             /**
              * A reference to the collection of available forms.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
             items: Collection.ItemCollection<FormItem>;
         }
+
+        /**
+         * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
+         * of the grid control.
+         */
+        interface ViewSelector {
+            /**
+             * Use this method to get a reference to the current view.
+             * @returns The current view.
+             */
+            getCurrentView(): ViewSelectorItem;
+
+            /**
+             * Use this method to determine whether the view selector is visible.
+             * @returns true if visible, false if not.
+             */
+            isVisible(): boolean;
+
+            /**
+             * Use this method to set the current view.
+             * @param viewSelectorItem The view selector item.
+             */
+            setCurrentView(viewSelectorItem: ViewSelectorItem): void;
+        }
+
+        /**
+         * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
+         * the ViewSelector.setCurrentView method.
+         */
+        interface ViewSelectorItem {
+            /**
+             * Returns a LookupValue that references this view.
+             * @returns The entity reference.
+             */
+            getEntityReference(): LookupValue;
+        }
+    }
+
+    /**
+     * Interface for the form's record context, {@link Data.entity formContext.data.entity}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-entity External Link: formContext.data.entity (Client API reference)}
+     */
+    interface Entity {
+        /**
+         * Adds a handler to be called when the record is saved.
+         * @param handler The handler.
+         */
+        addOnSave(handler: Events.ContextSensitiveHandler): void;
+
+        /**
+         * Gets an serialized-XML string representing data that will be passed to the server upon saving the record.
+         * @returns The XML in string format.
+         * @remarks This function does not work with Microsoft Dynamics CRM for tablets.
+         * @example "<account><name>Contoso</name><accountnumber>55555</accountnumber><telephone2>425
+         *          555-1234</telephone2></account>".
+         */
+        getDataXml(): string;
+
+        /**
+         * Gets entity's logical name.
+         * @returns  The logical name.
+         */
+        getEntityName(): string;
+
+        /**
+         * Gets the record's unique identifier.
+         * @returns The identifier, in Guid format.
+         * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+         */
+        getId(): string;
+
+        /**
+         * Gets a boolean value indicating whether the record has unsaved changes.
+         * @returns true if there are unsaved changes, otherwise false.
+         */
+        getIsDirty(): boolean;
+
+        /**
+         * Gets the record's primary attribute value.
+         * @returns The primary attribute value.
+         * @remarks The value for this attribute is used when links to the record are displayed.
+         */
+        getPrimaryAttributeValue(): string;
+
+        /**
+         * Removes the handler from the "on save" event.
+         * @param handler The handler.
+         */
+        removeOnSave(handler: Events.ContextSensitiveHandler): void;
+
+        /**
+         * Saves the record.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @remarks  When using quick create forms in the web application the saveandnew option is not
+         *           applied. It will always work as if saveandclose were used. Quick create forms in
+         *           Microsoft Dynamics CRM for tablets will apply the saveandnew behavior.
+         */
+        save(): void;
+
+        /**
+         * Saves the record with the given save mode.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param saveMode (Optional) the save mode to save, as either "saveandclose" or "saveandnew".
+         */
+        save(saveMode: EntitySaveMode): void;
+
+        /**
+         * The collection of attributes for the record.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         */
+        attributes: Collection.ItemCollection<Attributes.Attribute>;
+    }
+
+    namespace ProcessFlow {
+        /**
+         * Direction types for a process stage change event
+         * @see {@link XrmEnum.StageChangeDirection}
+         */
+        type StageChangeDirection = "Next" | "Previous";
+
+        /**
+         * Status for {@link ProcessFlow.Stage.getStatus Stage.getStatus()}.
+         * @see {@link XrmEnum.StageStatus}
+         */
+        type StageStatus = "active" | "inactive";
+
+        /**
+         * Status for {@link ProcessFlow.Process.getStatus Process.getStatus()}.
+         * @see {@link XrmEnum.ProcessStatus}
+         */
+        type ProcessStatus = "active" | "aborted" | "finished";
+
+        /**
+         * Interface for a CRM Business Process Flow instance.
+         */
+        interface Process {
+            /**
+             * Returns the unique identifier of the process.
+             * @returns The identifier for this process, in GUID format.
+             * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the process.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns an collection of stages in the process.
+             * @returns The stages.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            getStages(): Collection.ItemCollection<Stage>;
+
+            /**
+             * Returns a boolean value to indicate if the process is rendered.
+             * @returns true if the process is rendered, false if not.
+             */
+            isRendered(): boolean;
+        }
+
+        /**
+         * Interface for CRM Business Process Flow stages.
+         */
+        interface Stage {
+            /**
+             * Returns an object with a getValue method which will return the integer value of the business process flow
+             * category.
+             * @returns The stage category.
+             */
+            getCategory(): { getValue(): XrmEnum.StageCategory };
+
+            /**
+             * Returns the logical name of the entity associated with the stage.
+             * @returns The entity name.
+             */
+            getEntityName(): string;
+
+            /**
+             * Returns the unique identifier of the stage.
+             * @returns The identifier of the Stage, in GUID format.
+             * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the stage.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns the status of the stage.
+             * @returns The status, either "active" or "inactive".
+             */
+            getStatus(): StageStatus;
+
+            /**
+             * Returns a collection of steps in the stage.
+             * @returns An array of Step.
+             */
+            getSteps(): Step[];
+        }
+
+        interface Step {
+            /**
+             * Returns the logical name of the attribute associated to the step.
+             * @returns The attribute.
+             * @remarks Some steps don’t contain an attribute value.
+             */
+            getAttribute(): string;
+
+            /**
+             * Returns the name of the step.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns whether the step is required in the business process flow.
+             * @returns true if required, false if not.
+             * @remarks     Returns true if the step is marked as required in the Business Process Flow editor; otherwise, false.
+             *              There is no connection between this value and the values you can change in the formContext.data.entity
+             *              attribute RequiredLevel methods.
+             */
+            isRequired(): boolean;
+        }
+
+        /**
+         * Interface for the formContext.data.process API.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-process External Link: formContext.data.process (Client API reference)}
+         */
+        interface ProcessManager {
+            /**
+             * Returns a Process object representing the active process.
+             * @returns current active process.
+             */
+            getActiveProcess(): Process;
+
+            /**
+             * Set a Process as the active process.
+             * @param processId The Id of the process to make the active process.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveProcess(processId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Returns all process instances for the entity record that the calling user has access to.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
+
+            /**
+             * Sets a process instance as the active instance
+             * @param processInstanceId The Id of the process instance to make the active instance.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
+
+            /**
+             * Returns a Stage object representing the active stage.
+             * @returns current active stage.
+             */
+            getActiveStage(): Stage;
+
+            /**
+             * Set a stage as the active stage.
+             * @param stageId the Id of the stage to make the active stage.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveStage(stageId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Use this method to get a collection of stages currently in the active path with methods to interact with the
+             * stages displayed in the business process flow control. The active path represents stages currently rendered in
+             * the process control based on the branching rules and current data in the record.
+             * @returns A collection of all completed stages, the currently active stage, and the predicted set of future stages
+             *          based on satisfied conditions in the branching rule. This may be a subset of the stages returned with
+             *          formContext.data.process.getActiveProcess because it will only include those stages which represent a valid
+             *          transition from the current stage based on branching that has occurred in the process.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            getActivePath(): Collection.ItemCollection<Stage>;
+
+            /**
+             * Use this method to asynchronously retrieve the enabled business process flows that the user can switch to for an
+             * entity.
+             * @param callbackFunction The callback function must accept a parameter that contains an object with
+             *                         dictionary properties where the name of the property is the Id of the
+             *                         business process flow and the value of the property is the name of the
+             *                         business process flow.
+             *                         The enabled processes are filtered according to the user’s privileges. The
+             *                         list of enabled processes is the same ones a user can see in the UI if they
+             *                         want to change the process manually.
+             */
+            getEnabledProcesses(callbackFunction: (enabledProcesses: ProcessDictionary) => void): void;
+
+            /**
+             * Use this method to get the currently selected stage.
+             * @returns The currently selected stage.
+             */
+            getSelectedStage(): Stage;
+
+            /**
+             * Use this to add a function as an event handler for the OnStageChange event so that it will be called when the
+             * business process flow stage changes.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnStageChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to add a function as an event handler for the OnProcessStatusChange event so that it will be called when the
+             * business process flow status changes.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnProcessStatusChange(handler: Events.ProcessStatusChangeHandler): void;
+
+            /**
+             * Use this to add a function as an event handler for the OnStageSelected event so that it will be called
+             * when a business process flow stage is selected.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnStageSelected(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnProcessStatusChange event.
+             * @param handler If an anonymous function is set using the addOnProcessStatusChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnProcessStatusChange(handler: Events.ProcessStatusChangeHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnStageChange event.
+             * @param handler If an anonymous function is set using the addOnStageChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnStageChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnStageChange event.
+             * @param handler If an anonymous function is set using the addOnStageChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnStageSelected(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Progresses to the next stage.
+             * @param callbackFunction (Optional) A function to call when the operation is complete.
+             */
+            moveNext(callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Moves to the previous stage.
+             * @param callbackFunction (Optional) A function to call when the operation is complete.
+             */
+            movePrevious(callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Use this method to get the unique identifier of the process instance
+             * @returns The unique identifier of the process instance
+             */
+            getInstanceId(): string;
+
+            /**
+             * Use this method to get the name of the process instance
+             * @returns The name of the process instance
+             */
+            getInstanceName(): string;
+
+            /**
+             * Use this method to get the current status of the process instance
+             * @returns The current status of the process
+             */
+            getStatus(): ProcessStatus;
+
+            /**
+             * Use this method to set the current status of the process instance
+             * @param status The new status for the process
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
+        }
+
+        /**
+         * Called when method to get active processes is complete
+         * @param status The result of the get active processes operation.
+         * @remarks **Returns object with the following key-value pairs**:
+         * * CreatedOn
+         * * ProcessDefinitionID
+         * * ProcessDefinitionName
+         * * ProcessInstanceID
+         * * ProcessInstanceName
+         * * StatusCodeName
+         */
+        type GetProcessInstancesDelegate = (object: ProcessDictionary) => void;
+
+        /**
+         * Called when method to set active process is complete
+         * @param status The result of the set active process operation.
+         * @remarks **Values returned are**:
+         * * success        (The operation succeeded.)
+         * * invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
+         */
+        type SetProcessInstanceDelegate = (status: string) => void;
+
+        /**
+         * Called when process change methods have completed.
+         * @param status The result of the process change operation.
+         * @remarks **Values returned are**:
+         * * success        (The operation succeeded.)
+         * * crossEntity    (The previous stage is for a different entity.)
+         * * beginning      (The active stage is the first stage of the active path.)
+         * * invalid        (The operation failed because the selected stage isn’t the same as the active stage.)
+         * * unreachable    (The stage exists on a different path.)
+         */
+        type ProcessCallbackDelegate = (status: string) => void;
+
+        /**
+         * Called when process set status method has completed.
+         * @param status The new status of the process instance: active, aborted, or finished
+         */
+        type ProcessSetStatusDelegate = (status: ProcessStatus) => void;
+
+        /**
+         * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
+         */
+        interface ProcessDictionary {
+            [index: string]: string;
+        }
+    }
+
+    /**
+     * Interface for a user attribute privilege.
+     */
+    interface Privilege {
+        /**
+         * True if the user can read.
+         */
+        canRead: boolean;
+
+        /**
+         * True if the user can update.
+         */
+        canUpdate: boolean;
+
+        /**
+         * True if the user can create.
+         */
+        canCreate: boolean;
     }
 
     /**
      * An definition module for URL-based, CRM component parameters.
-     *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+     * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
      */
     namespace Url {
         /**
          * Command Bar Display options for Xrm.Url.FormOpenParameters.cmdbar, Xrm.Url.ViewOpenParameters.cmdbar, and Xrm.Utility.FormOpenParameters.cmdbar.
+         * @see {@link XrmEnum.CmdBarDisplay}
          */
-
         type CmdBarDisplay = "true" | "false";
+
         /**
          * Navigation Bar Display options for Xrm.Url.FormOpenParameters.navbar, Xrm.Url.ViewOpenParameters.navbar, and Xrm.Utility.FormOpenParameters.navbar.
+         * @see {@link XrmEnum.NavBarDisplay}
          */
         type NavBarDisplay = "entity" | "off" | "on";
 
         /**
          * Report Open Action options for Xrm.Url.ReportOpenParameters.actions.
+         * @see {@link XrmEnum.ReportAction}
          */
         type ReportAction = "filter" | "run";
 
@@ -3119,9 +3921,7 @@ declare namespace Xrm {
          * Interface for defining parameters on a request to open a form with main.aspx (as with
          * window.open). Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
-         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          * @remarks  A member for "pagetype" is not provided.  The value "entityrecord" is required in
          *           the URL, for forms. Example:  "pagetype=entityrecord"
          */
@@ -3135,24 +3935,24 @@ declare namespace Xrm {
              * Additional parameters can be provided to the request. This can only be used to provide
              * default field values for the form, or pass data to custom parameters that have been
              * customized for the form.  See example below for setting the selected form.
-             *
-             * @remarks Example:  encodeURIComponent("formid={8c9f3e6f-7839-e211-831e-00155db7d98f}");
+             * @example Example:  encodeURIComponent("formid={8c9f3e6f-7839-e211-831e-00155db7d98f}");
              */
             extraqs?: string;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: CmdBarDisplay;
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: NavBarDisplay;
         }
@@ -3161,9 +3961,7 @@ declare namespace Xrm {
          * Interface for defining parameters on a request to open a view with main.aspx (as with
          * window.open). Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
-         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          * @remarks  A member for "pagetype" is not provided.  The value "entitylist" is required in
          *           the URL, for views. Example:  "pagetype=entitylist"
          */
@@ -3181,25 +3979,26 @@ declare namespace Xrm {
 
             /**
              * The type of view identified by {@link viewid}.
-             *
-             * @remarks  Accepted values are:    1039    System View
-             *                                   4230    User View.
+             * @remarks **Accepted values are**:
+             * * 1039    System View
+             * * 4230    User View.
              */
             viewtype: XrmEnum.ViewType;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: CmdBarDisplay;
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: NavBarDisplay;
         }
@@ -3208,8 +4007,7 @@ declare namespace Xrm {
          * Interface for defining parameters of a request to open a dialog with rundialog.aspx (as with
          * window.open).  Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          */
         interface DialogOpenParameters {
             /**
@@ -3234,14 +4032,14 @@ declare namespace Xrm {
          * window.open).  Useful for parsing out the keys and values into a string of the format:
          * "&key=value"
          *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          */
         interface ReportOpenParameters {
             /**
              * The action to perform, as either "run" or "filter".
-             *
-             * @remarks  "run"       Executes the report with default filters.
-             *           "filter"    Presents the user with the filter editor, and a "Run Report" button.
+             * @remarks **Actions**:
+             * * "run"       Executes the report with default filters.
+             * * "filter"    Presents the user with the filter editor, and a "Run Report" button.
              */
             action: ReportAction;
 
@@ -3261,9 +4059,12 @@ declare namespace Xrm {
     /**
      * The Xrm.Utility API
      *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
      */
     namespace Utility {
+        /**
+         * Interface use to provide parameters when opening new entiy forms
+         */
         interface OpenParameters {
             /**
              * Additional parameters can be provided to the request, by overloading
@@ -3285,17 +4086,18 @@ declare namespace Xrm {
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: Url.NavBarDisplay;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: Url.CmdBarDisplay;
         }
@@ -3310,6 +4112,754 @@ declare namespace Xrm {
             openInNewWindow: boolean;
         }
     }
+
+    /**
+     * Namespace to hold Xrm.Navigation related types
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-navigation External Link: Xrm.Navigation (Client API reference)}
+     */
+    namespace Navigation {
+        interface AlertStrings {
+            /**
+             * (Optional) The confirm button label.If you do not specify the button label, OK is used as the button label.
+             */
+            confirmButtonLabel?: string;
+            /**
+             *  The message to be displyed in the alert dialog.
+             */
+            text: string;
+        }
+
+        interface ConfirmStrings {
+            /**
+             * (Optional) The cancel button label. If you do not specify the cancel button label, Cancel is used as the button label.
+             */
+            cancelButtonLabel?: string;
+
+            /**
+             * (Optional) The confirm button label.If you do not specify the button label, OK is used as the button label.
+             */
+            confirmButtonLabel?: string;
+
+            /**
+             * (Optional) The subtitle to be displayed in the confirmation dialog.
+             */
+            subtitle?: string;
+
+            /**
+             * (Optional) The title to be displyed in the confirmation dialog.
+             */
+            title?: string;
+
+            /**
+             * The message to be displyed in the alert dialog.
+             */
+            text: string;
+        }
+
+        interface DialogSizeOptions {
+            /**
+             * Height of the alert dialog in pixels.
+             */
+            height: number;
+            /**
+             * Width of the alert dialog pixels.
+             */
+            width: number;
+        }
+
+        interface OpenWebresourceOptions extends DialogSizeOptions {
+            /**
+             * Indicates whether to open the web resource in a new window.
+             */
+            openInNewWindow: boolean;
+        }
+
+        /**
+         * An object with the confirmed (Boolean) attribute is passed that indicates whether the confirm button was clicked to close the dialog.
+         */
+        interface ConfirmResult {
+            /**
+             * true if the confirm button was clicked to close the dialog.
+             */
+            confirmed: boolean;
+        }
+
+        /**
+         * Details to show in the Error dialog
+         */
+        interface ErrorDialogOptions {
+            /**
+             * Details about the error. When you specify this, the Download Log File button is available in the error message,
+             * and clicking it will let users download a text file with the content specified in this attribute.
+             */
+            details?: string;
+            /**
+             * The error code. If you just set errorCode, the message for the error code is automatically
+             * retrieved from the server and displayed in the error dialog.
+             * If you specify an invalid errorCode value, an error dialog with a default error message is displyed.
+             */
+            errorCode?: number;
+            /**
+             *  The message to be displayed in the error dialog.
+             */
+            message?: string;
+        }
+
+        interface FileDetails {
+            /**
+             * Contents of the file.
+             */
+            fileContent: string;
+            /**
+             * Name of the file.
+             */
+            fileName: string;
+            /**
+             * Size of the file in KB.
+             */
+            fileSize: number;
+            /**
+             * String. MIME type of the file.
+             */
+            mimeType: string;
+        }
+
+        /**
+         * Entity form options for opening the form
+         */
+        interface EntityFormOptions {
+            /**
+             * Indicates whether to display the command bar.If you do not specify this parameter, the command bar is displayed by default.
+             */
+            cmdbar?: boolean;
+            /**
+             * Designates a record that will provide default values based on mapped attribute values.The lookup object has the following String properties: entityType, id, and name (optional).
+             */
+            createFromEntity?: LookupValue;
+            /**
+             * ID of the entity record to display the form for.
+             */
+            entityId?: string;
+            /**
+             * Logical name of the entity to display the form for.
+             */
+            entityName?: string;
+            /**
+             * ID of the form instance to be displayed.
+             */
+            formId?: string;
+            /**
+             * Height of the form window to be displayed in pixels.
+             */
+            height?: number;
+            /**
+             * Undocumented at this time
+             */
+            isCrossEntityNavigate?: boolean;
+            /**
+             * Undocumented at this time
+             */
+            isOfflineSyncError?: boolean;
+            /**
+             * Controls whether the navigation bar is displayed and whether application navigation is available using the areas and subareas defined in the sitemap.Valid vlaues are: "on", "off", or "entity".
+             * * on: The navigation bar is displayed.This is the default behavior if the navBar parameter is not used.
+             * * off: The navigation bar is not displayed.People can navigate using other user interface elements or the back and forward buttons.
+             * * entity: On an entity form, only the navigation options for related entities are available.After navigating to a related entity, a back button is displayed in the navigation bar to allow returning to the original record.
+             */
+            navBar?: Url.NavBarDisplay;
+            /**
+             * Indicates whether to display form in a new window.
+             */
+            openInNewWindow?: boolean;
+            /**
+             * Specify one of the following values for the window position of the form on the screen:
+             * * 1:center
+             * * 2:side
+             */
+            windowPosition?: XrmEnum.WindowPositions;
+            /**
+             * ID of the business process to be displayed on the form.
+             */
+            processId?: string;
+            /**
+             * ID of the business process instance to be displayed on the form.
+             */
+            processInstanceId?: string;
+            /**
+             * Define a relationship object to display the related records on the form.
+             */
+            relationship?: Relationship;
+            /**
+             * ID of the selected stage in business process instance.
+             */
+            selectedStageId?: string;
+            /**
+             * Indicates whether to open a quick create form.
+             */
+            useQuickCreateForm?: boolean;
+            /**
+             * Width of the form window to be displayed in pixels.
+             */
+            width?: number;
+        }
+
+        interface Relationship {
+            /**
+             * Name of the attribute used for relationship.
+             */
+            attributeName: string;
+            /**
+             * Name of the relationship.
+             */
+            name: string;
+            /**
+             * Name of the navigation property for this relationship.
+             */
+            navigationPropertyName?: string;
+            /**
+             * Relationship type.Specify one of the following values:
+             * * 0:OneToMany
+             * * 1:ManyToMany
+             */
+            relationshipType?: XrmEnum.RelationshipType;    //
+            /**
+             * Role type in relationship.Specify one of the following values:
+             * * 1:Referencing
+             * * 2:AssociationEntity
+             */
+            roleType?: XrmEnum.RoleType;
+        }
+    }
+
+    /**
+     * Interface for the Xrm.Navigation API
+     */
+    interface Navigation {
+        /**
+         * Displays an alert dialog containing a message and a button.
+         * @param alertStrings The strings to be used in the alert dialog.
+         * @param alertOptions The height and width options for alert dialog
+         */
+        openAlertDialog(alertStrings: Navigation.AlertStrings, alertOptions: Navigation.DialogSizeOptions): Async.PromiseLike<any>;
+
+        /**
+         * Displays a confirmation dialog box containing a message and two buttons.
+         * @param confirmStrings The strings to be used in the confirm dialog.
+         * @param confirmOptions The height and width options for alert dialog
+         */
+        openConfirmDialog(confirmStrings: Navigation.ConfirmStrings, confirmOptions: Navigation.DialogSizeOptions): Async.PromiseLike<Navigation.ConfirmResult>;
+
+        /**
+         * Displays an error dialog.
+         * @param confirmStrings The strings to be used in the confirm dialog.
+         * @param confirmOptions The height and width options for alert dialog
+         */
+        openConfirmDialog(errorOptions: Navigation.ErrorDialogOptions): Async.PromiseLike<any>;
+
+        /**
+         * Opens a file.
+         */
+        openFile(file: Navigation.FileDetails, openFileOptions: XrmEnum.OpenFileOptions): void;
+
+        /**
+         * Opens an entity form or a quick create form.
+         */
+        openForm(entityFormOptions: Navigation.EntityFormOptions, formParameters: Utility.OpenParameters): Async.PromiseLike<any>;
+
+        /**
+         * Opens a URL, including file URLs.
+         * @param url URL to open.
+         * @param openUrlOptions Options to open the URL
+         */
+        openUrl(url: string, openUrlOptions?: Navigation.DialogSizeOptions): void;
+
+        /**
+         * Opens an HTML web resource.
+         * @param webResourceName Name of the HTML web resource.
+         * @param windowOptions (Optional) Window options for opening the web resource.
+         *                                                 It is advised to use encodeURIcomponent() to encode the value.
+         */
+        openWebResource(webResourceName: string, windowOptions?: Navigation.OpenWebresourceOptions, data?: string): void;
+    }
+
+    /**
+     * Namespace to hold the Metadata types
+     */
+    namespace Metadata {
+        /**
+         * Types returned by a call to getEntityMetadata
+         */
+        interface EntityMetadata {
+            ActivityTypeMask: number;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            Attributes: Collection.ItemCollection<AttributeMetadata>;
+            AutoRouteToOwnerQueue: boolean;
+            CanEnableSyncToExternalSearchIndex: boolean;
+            CanBeInManyToMany: boolean;
+            CanBePrimaryEntityInRelationship: boolean;
+            CanBeRelatedEntityInRelationship: boolean;
+            CanCreateAttributes: boolean;
+            CanCreateCharts: boolean;
+            CanCreateForms: boolean;
+            CanCreateViews: boolean;
+            CanModifyAdditionalSettings: boolean;
+            CanTriggerWorkflow: boolean;
+            Description: Label;
+            DisplayCollectionName: Label;
+            DisplayName: Label;
+            EntityColor: string;
+            EntitySetName: string;
+            IconLargeName: string;
+            IconMediumName: string;
+            IconSmallName: string;
+            IsActivity: boolean;
+            IsActivityParty: boolean;
+            IsAuditEnabled: boolean;
+            IsAvailableOffline: boolean;
+            IsBPFEntity: boolean;
+            IsChildEntity: boolean;
+            IsConnectionsEnabled: boolean;
+            IsCustomEntity: boolean;
+            IsCustomizable: boolean;
+            IsDocumentManagementEnabled: boolean;
+            IsDuplicateDetectionEnabled: boolean;
+            IsEnabledForCharts: boolean;
+            IsOneNotIntegrationEnabled: boolean;
+            IsOptimisitcConcurrencyEnabled: boolean;
+            IsQuickCreateEnabled: boolean;
+            IsImportable: boolean;
+            IsIntersect: boolean;
+            IsMailMergeEnabled: boolean;
+            IsManaged: boolean;
+            IsMappable: boolean;
+            IsReadingPaneEnabled: boolean;
+            IsRenameable: boolean;
+            IsStateModelAware: boolean;
+            IsValidForAdvancedFind: boolean;
+            IsValidForQueue: boolean;
+            IsVisibleInMobileClient: boolean;
+            LogicalCollectionName: string;
+            LogicalName: string;
+            ObjectTypeCode: number;
+            OwnershipTypeCode: number;
+            PrimaryIdAttribute: string;
+            PrimaryNameAttribute: string;
+            RecurrenceBaseEntityLogicalName: string;
+            PrimaryImageAttribute: string;
+        }
+
+        /**
+         * Type to hold Labels as part of the EntityMetadata
+         */
+        interface Label {
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            LocalizedLabels: Collection.ItemCollection<LocalizedLabel>;
+            UserLocalizedLabel: LocalizedLabel;
+        }
+
+        /**
+         * Type to hold a Label as part of the EntityMetadata
+         */
+        interface LocalizedLabel {
+            Label: string;
+            LanguageCode: number;
+        }
+
+        /**
+         * Type to hold the Attribute metadata as part of the EntityMetadata
+         */
+        interface AttributeMetadata {
+            defaultFormValue: number;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            options: Collection.ItemCollection<string>;
+            logicalName: string;
+            displayName: string;
+            attributeType: XrmEnum.AttributeTypeCode;
+            entityLogicalName: string;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            optionSet: Collection.ItemCollection<OptionMetadata>;
+        }
+
+        /**
+         * Type to hold the optionset metadata as part of the EntityMetadata
+         */
+        interface OptionMetadata {
+            Value: number;
+            Color: string;
+            IsManaged: boolean;
+            ExternalValue: any;
+            MetadataId: string;
+            HasChanged: boolean;
+            State: number;
+            TransitionData: any;
+            Label: Label;
+            Description: Label;
+        }
+    }
+
+    /**
+     * Namespace to hold Xrm.Device related types
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
+     */
+    namespace Device {
+        /**
+         * Xrm.Device.captureAudio/captureImage/captureVideo response
+         */
+        interface CaptureFileResponse {
+            /**
+             * Base64 encoded contents of the file.
+             */
+            fileContent: string;
+            /**
+             * Name of the audio file.
+             */
+            fileName: string;
+            /**
+             * Size of the file in KB.
+             */
+            fileSize: number;
+            /**
+             * File MIME type.
+             */
+            mimeType: string;
+        }
+
+        /**
+         * Options for Xrm.Device.captureImage
+         */
+        interface CaptureImageOptions {
+            /**
+             * Indicates whether to edit the image before saving.
+             */
+            allowEdit: boolean;
+            /**
+             * Height of the image to capture.
+             */
+            height: number;
+            /**
+             * Indicates whether to capture image using the front camera of the device.
+             */
+            preferFrontCamera: boolean;
+            /**
+             * Quality of the image file in percentage. Number.
+             */
+            quality: number;
+            /**
+             * Width of the image to capture
+             */
+            width: number;
+        }
+
+        /**
+         * Interface for Xrm.Device.getCurrentPosition response
+         */
+        interface GetCurrentPositionResponse {
+            /**
+             * Contains a set of geographic coordinates along with associated accuracy as well as a set of other optional attributes such as altitude and speed.
+             */
+            coords: any;
+            /**
+             * Represents the time when the object was acquired and is represented as DOMTimeStamp.
+             */
+            timestamp: number;
+        }
+
+        /**
+         * Posible file types for Xrm.Device.pickFile options
+         * @see {@link XrmEnum.DevicePickFileType}
+         */
+        type PickFileTypes = "audio" | "video" | "image";
+
+        /**
+         * Interface for Xrm.Device.pickFile options
+         */
+        interface PickFileOptions {
+            /**
+             * Image file types to select.
+             */
+            accept: PickFileTypes;
+            /**
+             * Indicates whether to allow selecting multiple files.
+             */
+            allowMultipleFiles: boolean;
+            /**
+             * Maximum size of the files(s) to be selected.
+             */
+            maximumAllowedFileSize: number;
+        }
+    }
+
+    /**
+     * Interface for Xrm.Device API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
+     */
+    interface Device {
+        /**
+         * Invokes the device microphone to record audio.
+         * @returns On success, returns Base64 encoded file
+         */
+        captureAudio(): Async.PromiseLike<Device.CaptureFileResponse>;
+
+        /**
+         * Invokes the device camera to capture an image.
+         * @returns On success, returns Base64 encoded file
+         */
+        captureImage(imageOptions: Device.CaptureImageOptions): Async.PromiseLike<Device.CaptureFileResponse>;
+
+        /**
+         * Invokes the device camera to capture video.
+         * @returns On success, returns Base64 encoded file
+         */
+        captureVideo(): Async.PromiseLike<Device.CaptureFileResponse>;
+
+        /**
+         * Invokes the device camera to scan the barcode information, such as a product number.
+         * @returns On success, Barcode value is returned as a String
+         */
+        getBarcodeValue(): Async.PromiseLike<string>;
+
+        /**
+         * Returns the current location using the device geolocation capability.
+         * @returns On success, returns current geolocation information
+         */
+        getCurrentPosition(): Async.PromiseLike<Device.GetCurrentPositionResponse>;
+
+        /**
+         * Opens a dialog box to select files from your computer (web client) or mobile device (mobile clients).
+         * @returns On success, returns an array of files
+         */
+        pickFile(pickFileOptions: Device.PickFileOptions): Async.PromiseLike<Device.CaptureFileResponse[]>;
+    }
+
+    /**
+     * Interface for Xrm.Encoding API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding External Link: Xrm.Encoding (Client API reference)}
+     */
+    interface Encoding {
+        /**
+         * Applies attribute encoding to a string.
+         * @param arg String to be encoded.
+         * @returns Encoded string.
+         */
+        xmlAttributeEncode(arg: string): string;
+
+        /**
+         * Applies XML encoding to a string.
+         * @param arg String to be encoded.
+         * @returns Encoded string.
+         */
+        xmlEncode(arg: string): string;
+    }
+
+    /**
+     * Provides properties and methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi External Link: Xrm.WebApi (Client API reference)}
+     */
+    interface WebApi extends WebApiOffline {
+        /**
+         * Returns a boolean value indicating whether an entity is offline enabled.
+         * @param entityLogicalName    Logical name of the entity. For example: "account".
+         * @returns true if the entity is offline enabled; otherwise false.
+         */
+        isAvailableOffline(entityLogicalName: string): boolean;
+
+        /**
+         * Provides methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement when connected to the Customer Engagement server (online mode).
+         */
+        online: WebApiOnline;
+
+        /**
+         * Provides methods to create and manage records in the Dynamics 365 Customer Engagement mobile clients while working in the offline mode.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/offline}
+         */
+        offline: WebApiOffline;
+    }
+
+    /**
+     * Interface for the Xrm.WebApi.online API
+     * Execute and ExecuteMultiple are only available when online, not offline.
+     */
+    interface WebApiOnline extends WebApiOffline {
+        /**
+         * Execute a single action, function, or CRUD operation.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/execute External Link: execute (Client API reference)}
+         * @param request Object that will be passed to the Web API endpoint to execute an action, function, or CRUD request.
+         * @remarks The object exposes a getMetadata method that lets you define the metadata for the action, function or CRUD request you want to execute.<BR>
+         * **The getMetadata method has the following parameters**:
+         *   - boundParameter: (Optional) String. The name of the bound parameter for the action or function to execute.
+         *       * Specify undefined if you are executing a CRUD request.
+         *       * Specify null if the action or function to execute is not bound to any entity.
+         *       * Specify entity logical name or entity set name in case the action or function to execute is bound to one.
+         *   - operationName: (Optional). String. Name of the action, function, or one of the following values if you are executing a CRUD request: "Create", "Retrieve", "RetrieveMultiple", "Update", or "Delete".
+         *   - operationType: (Optional). Number. Indicates the type of operation you are executing; specify one of the following values:
+         *       * 0: Action
+         *       * 1: Function
+         *       * 2: CRUD
+         *   - parameterTypes: Object. The metadata for parameter types. The object has the following attributes:
+         *   - enumProperties: (Optional) Object. The metadata for enum types. The object has two string attributes: name and value
+         *   - structuralProperty: Number. The category of the parameter type. Specify one of the following values:
+         *       * 0: Unknown
+         *       * 1: PrimitiveType
+         *       * 2: ComplexType
+         *       * 3: EnumerationType
+         *       * 4: Collection
+         *       * 5: EntityType
+         *   - typeName: String. The fully qualified name of the parameter type.
+         */
+        execute(request: any): Async.PromiseLike<ExecuteResponse>;
+
+        /**
+         * Execute a collection of action, function, or CRUD operations.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/executemultiple External Link: executeMultiple (Client API reference)}
+         * @param request   An array of one of one of the following types:
+         *    -objects where each object is an action, function, or CRUD request that you want to execute
+         *        * against the Web API endpoint. Each object exposes a getMetadata method that lets you define
+         *        the metadata for the action, function or CRUD request you want to execute. This is the same
+         *        object that you pass in the execute method. For information about the object, see execute.
+         *    -change set (an array of objects), where each object in the change set is as defined above.
+         *        * In this case, all the request objects specified in the change set will get executed in a
+         *        transaction.
+         */
+        executeMultiple(request: any[]): Async.PromiseLike<ExecuteResponse[]>;
+    }
+
+    /**
+     * Interface for the Xrm.WebApi.offline API
+     */
+    interface WebApiOffline {
+        /**
+         * Creates an entity record
+         * @param entityLogicalName Logical name of the entity you want to create. For example: "account".
+         * @param record A JSON object defining the attributes and values for the new entity record.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/createrecord External Link: createRecord (Client API reference)}
+         */
+        createRecord(entityLogicalName: string, record: any): Async.PromiseLike<string>;
+
+        /**
+         * Deletes an entity record.
+         * @param entityLogicalName The entity logical name of the record you want to delete. For example: "account".
+         * @param id GUID of the entity record you want to delete.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/deleterecord External Link: deleteRecord (Client API reference)}
+         */
+        deleteRecord(entityLogicalName: string, id: string): Async.PromiseLike<string>;
+
+        /**
+         * Retrieves an entity record.
+         * @param entityLogicalName The entity logical name of the record you want to retrieve. For example: "account".
+         * @param id GUID of the entity record you want to retrieve.
+         * @param options (Optional) OData system query options, $select and $expand, to retrieve your data.
+         * - Use the $select system query option to limit the properties returned by including a comma-separated
+         *   list of property names. This is an important performance best practice. If properties aren’t
+         *   specified using $select, all properties will be returned.
+         * - Use the $expand system query option to control what data from related entities is returned. If you
+         *   just include the name of the navigation property, you’ll receive all the properties for related
+         *   records. You can limit the properties returned for related records using the $select system query
+         *   option in parentheses after the navigation property name. Use this for both single-valued and
+         *   collection-valued navigation properties.
+         * - You can also specify multiple query options by using & to separate the query options.
+         * @example <caption>options example:</caption>
+         * options: $select=name&$expand=primarycontactid($select=contactid,fullname)
+         * @returns On success, returns a promise containing a JSON object with the retrieved attributes and their values.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrieverecord External Link: retrieveRecord (Client API reference)}
+         */
+        retrieveRecord(entityLogicalName: string, id: string, options: string): Async.PromiseLike<any>;
+
+        /**
+         * Retrieves a collection of entity records.
+         * @param entityLogicalName The entity logical name of the records you want to retrieve. For example: "account".
+         * @param options (Optional) OData system query options or FetchXML query to retrieve your data.
+         * * Following system query options are supported: $select, $top, $filter, $expand, and $orderby.
+         * * To specify a FetchXML query, use the fetchXml attribute to specify the query.
+         * * NOTE: You must always use the $select system query option to limit the properties returned for an entity
+         * record by including a comma-separated list of property names. This is an important performance best practice.
+         * * If properties aren’t specified using $select, all properties will be returned.
+         * * You can specify multiple system query options by using & to separate the query options.
+         * @param maxPageSize (Optional) Specify a positive number that indicates the number of entity records to be returned per page.
+         * * If you do not specify this parameter, the default value is passed as 5000. If the number of records being retrieved is more than the specified
+         * maxPageSize value, nextLink attribute in the returned promise object will contain a link to retrieve the next set of entities.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrievemultiplerecords External Link: retrieveMultipleRecords (Client API reference)}
+         */
+        retrieveMultipleRecords(entityLogicalName: string, options?: string, maxPageSize?: number): Async.PromiseLike<RetrieveMultipleResult>;
+
+        /**
+         * Updates an entity record.
+         * @param entityLogicalName The entity logical name of the record you want to update. For example: "account".
+         * @param id GUID of the entity record you want to update.
+         * @param Data A JSON object containing key: value pairs, where key is the property of the entity and value is the value of the property you want update.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/updaterecord External Link: updateRecord (Client API reference)}
+         */
+        updateRecord(entityLogicalName: string, id: string, data: any): Async.PromiseLike<any>;
+    }
+
+    /**
+     * Interface for the Promise error response arguments
+     */
+    interface ErrorResponse {
+        errorCode: number;
+        message: string;
+    }
+
+    /**
+     * Interface for the WebAPI RetrieveMultiple request response
+     */
+    interface RetrieveMultipleResult {
+        /**
+         * An array of JSON objects, where each object represents the retrieved entity record containing attributes and their values as key: value pairs. The Id of the entity record is retrieved by default.
+         */
+        entities: any[];
+        /**
+         * If the number of records being retrieved is more than the value specified in the maxPageSize parameter, this attribute returns the URL to return next set of records.
+         */
+        nextLink: string;
+    }
+
+    /**
+     * Interface for the WebAPI Execute request response
+     */
+    interface ExecuteResponse {
+        /**
+         * (Optional). Object.Response body.
+         */
+        body: string;
+        /**
+         * Response headers.
+         */
+        headers: any;
+        /**
+         * Indicates whether the request was successful.
+         */
+        ok: boolean;
+        /**
+         * Numeric value in the response status code.
+         * @example 200
+         */
+        status: number;
+        /**
+         * Description of the response status code.
+         * @example "OK"
+         */
+        statusText: string;
+        /**
+         * Response type.Values are: the empty string (default), "arraybuffer", "blob", "document", "json", and "text".
+         */
+        type: string;
+        /**
+         * Request URL of the action, function, or CRUD request that was sent to the Web API endpoint.
+         */
+        url: string;
+    }
 }
 
 declare namespace XrmEnum {
@@ -3322,7 +4872,15 @@ declare namespace XrmEnum {
         Update = 2,
         ReadOnly = 3,
         Disabled = 4,
-        BulkEdit = 6
+        BulkEdit = 6,
+        /**
+         * @deprecated QuickCreate has been deprecated
+         */
+        QuickCreate = 5,
+        /**
+         * @deprecated ReadOptimized has been deprecated.
+         */
+        ReadOptimized = 11
     }
 
     /**
@@ -3373,4 +4931,311 @@ declare namespace XrmEnum {
         SystemView = 1039,
         UserView = 4230
     }
+
+    /**
+     * An enumeration for Attribute Type metadata
+     */
+    const enum AttributeTypeCode {
+        Boolean = 0,
+        Customer = 1,
+        DateTime = 2,
+        Decimal = 3,
+        Double = 4,
+        Integer = 5,
+        Lookup = 6,
+        Memo = 7,
+        Money = 8,
+        Owner = 9,
+        PartyList = 10,
+        Picklist = 11,
+        State = 12,
+        Status = 13,
+        String = 14,
+        Uniqueidentifier = 15,
+        CalendarRules = 16,
+        Virtual = 17,
+        BigInt = 18,
+        ManagedProperty = 19,
+        EntityName = 20
+    }
+
+    /**
+     * An enumeration for Attribute required level metadata
+     */
+    const enum AttributeRequiredLevel {
+        None = 0,
+        SystemRequired = 1,
+        ApplicationRequired = 2,
+        Recommended = 3
+    }
+
+    /**
+     * An enumeration for open file dialog options
+     */
+    const enum OpenFileOptions {
+        Open = 1,
+        Save = 2
+    }
+
+    /**
+     * An enumeration for window positions when opening a new window
+     */
+    const enum WindowPositions {
+        Center = 1,
+        Side = 2
+    }
+
+    /**
+     * An enumeration for Relationship Type Metadata
+     */
+    const enum RelationshipType {
+        OneToMany = 0,
+        ManyToMany = 1
+    }
+
+    /**
+     * An enumeration for Relationship Role Type Metadata
+     */
+    const enum RoleType {
+        Referencing = 1,
+        AssociationEntity = 2
+    }
+
+    const enum ClientFormFactor {
+        Unknown = 1,
+        Desktop = 2,
+        Tablet = 3,
+        Phone = 4
+    }
+
+    /**
+     * Constant Enum: Client Types for {@link ClientContext.getClient clientContext.getClient()}.
+     * @see {@link Xrm.Client}
+     */
+    const enum Client {
+        Web = "Web",
+        Outlook = "Outlook",
+        Mobile = "Mobile",
+        UnifiedServiceDesk = "UnifiedServiceDesk",
+        USD = "UnifiedServiceDesk"
+    }
+
+    /**
+     * Constant Enum: Client States for {@link ClientContext.getClientState clientContext.getClientState()}.
+     * @see {@link Xrm.ClientState}
+     */
+    const enum ClientState {
+        Online = "Online",
+        Offline = "Offline"
+    }
+
+    /**
+     * Constant Enum: Display States for setDisplayState() on {@link Controls.ProcessControl.setDisplayState Processes} and {@link Controls.Tab.setDisplayState Tabs}.
+     * @see {@link Xrm.DisplayState}
+     */
+    const enum DisplayState {
+        Expanded = "expanded",
+        Collapsed = "collapsed"
+    }
+
+    /**
+     * Constant Enum: {@link Entity.save Entity} Save Modes
+     * @see {@link Xrm.EntitySaveMode}
+     * @see {@link Entity}
+     * @see {@link Entity.save}
+     */
+    const enum EntitySaveMode {
+        SaveAndClose = "saveandclose",
+        SaveAndNew = "saveandnew"
+    }
+
+    /**
+     * Constant Enum: Form Notification Levels for {@link Ui.setFormNotification formContext.ui.setFormNotification()}.
+     * @see {@link Xrm.FormNotificationLevel}
+     */
+    const enum FormNotificationLevel {
+        Error = "ERROR",
+        Info = "INFO",
+        Warning = "Warning"
+    }
+
+    /**
+     * Constant Enum: Submit Modes for {@link Attributes.Attribute.setSubmitMode} Attributes.Attribute.setSubmitMode().
+     * @see {@link Xrm.SubmitMode}
+     */
+    const enum SubmitMode {
+        Always = "always",
+        Dirty = "dirty",
+        Never = "never"
+    }
+
+    /**
+     * Constant Enum: Themes for {@link GlobalContext.getCurrentTheme globalContext.getCurrentTheme()}.
+     * @remarks getCurrentTheme() does not work with Dynamics CRM for tablets or in the unified interface.
+     */
+    const enum Theme {
+        Default = "default",
+        Office12Blue = "Office12Blue",
+        Office14Silver = "Office14Silver"
+    }
+
+    /**
+     * Constant Enum: Settings for {@link GlobalContext.getAdvancedConfigSetting globalContext.getAdvancedConfigSetting(setting)}
+     */
+    const enum AdvancedConfigSettingOption {
+        MaxChildIncidentNumber = "MaxChildIncidentNumber",
+        MaxIncidentMergeNumber = "MaxIncidentMergeNumber"
+    }
+
+    /**
+     * Constant Enum: Requirement Level for {@link Attributes.Attribute.getRequiredLevel Attributes.Attribute.getRequiredLevel()} and
+     * {@link Attributes.Attribute.setRequiredLevel Attributes.Attribute.setRequiredLevel()}.
+     * @see {@link Xrm.Attributes.RequirementLevel}
+     */
+    const enum AttributeRequirementLevel {
+        None = "none",
+        Recommended = "recommended",
+        Required = "required"
+    }
+
+    /**
+     * Constant Enum: Date attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.DateAttribute DateAttribute}.
+     * @see {@link Xrm.Attributes.DateAttributeFormat}
+     */
+    const enum DateAttributeFormat {
+        Date = "date",
+        DateTime = "datetime"
+    }
+
+    /**
+     * Constant Enum: Integer attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.NumberAttribute NumberAttribute}.
+     * @see {@link Xrm.Attributes.IntegerAttributeFormat}
+     */
+    const enum IntegerAttributeFormat {
+        Duration = "duration",
+        None = "none"
+    }
+
+    /**
+     * Constant Enum: OptionSet attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.OptionSetAttribute OptionSetAttribute}.
+     * @see {@link Xrm.Attributes.OptionSetAttributeFormat}
+     */
+    const enum OptionSetAttributeFormat {
+        Language = "language",
+        TimeZone = "timezone"
+    }
+
+    /**
+     * Constant Enum: String attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.StringAttribute StringAttribute}.
+     * @see {@link Xrm.Attributes.StringAttributeFormat}
+     */
+    const enum StringAttributeFormat {
+        Email = "email",
+        Phone = "phone",
+        Text = "text",
+        TextArea = "textarea",
+        TickerSymbol = "tickersymbol",
+        URL = "url"
+    }
+
+    /**
+     * Constant Enum: Attribute types for {@link Attributes.Attribute.setDisplayState()}.
+     * @see {@link Xrm.Attributes.AttributeType}
+     */
+    const enum AttributeType {
+        Boolean = "boolean",
+        DateTime = "datetime",
+        Decimal = "decimal",
+        Double = "double",
+        Integer = "integer",
+        Lookup = "lookup",
+        Memo = "memo",
+        Money = "money",
+        OptionSet = "optionset",
+        String = "string"
+    }
+
+    /**
+     * Constant Enum: Control types for {@link Controls.Control.getControlType Controls.Control.getControlType()}.
+     * @see {@link Xrm.Controls.ControlType}
+     */
+    const enum StandardControlType {
+        Standard = "standard",
+        IFrame = "iframe",
+        Lookup = "lookup",
+        OptionSet = "optionset",
+        SubGrid = "subgrid",
+        WebResource = "webresource",
+        Notes = "notes",
+        TimerControl = "timercontrol",
+        KBSearch = "kbsearch",
+        TimeLineWall = "timelinewall",
+        QuickForm = "quickform"
+    }
+
+    /**
+     * Constant Enum: Direction types for a process stage change event
+     * @see {@link ProcessFlow.StageChangeDirection}
+     */
+    const enum StageChangeDirection {
+        Next = "Next",
+        Previous = "Previous"
+    }
+
+    /**
+     * Constant Enum: Status for {@link ProcessFlow.Stage.getStatus Stage.getStatus()}.
+     * @see {@link ProcessFlow.StageStatus}
+     */
+    const enum StageStatus {
+        Active = "active",
+        Inactive = "inactive"
+    }
+
+    /**
+     * Constant Enum: Status for {@link ProcessFlow.Process.getStatus Process.getStatus()}.
+     * @see {@link ProcessFlow.ProcessStatus}
+     */
+    const enum ProcessStatus {
+        Active = "active",
+        Aborted = "aborted",
+        Finished = "finished"
+    }
+
+     /**
+      * Constant Enum: Command Bar Display options for Xrm.Url.FormOpenParameters.cmdbar, Xrm.Url.ViewOpenParameters.cmdbar, and Xrm.Utility.FormOpenParameters.cmdbar.
+      * @see {@link Xrm.Url.CmdBarDisplay}
+      */
+    const enum CmdBarDisplay {
+        True = "true",
+        False = "false"
+    }
+
+    /**
+     * Constant Enum: Navigation Bar Display options for Xrm.Url.FormOpenParameters.navbar, Xrm.Url.ViewOpenParameters.navbar, and Xrm.Utility.FormOpenParameters.navbar.
+     * @see {@link Xrm.Url.NavBarDisplay}
+     */
+    const enum NavBarDisplay {
+        Entity = "entity",
+        On = "on",
+        Off = "off"
+    }
+
+    /**
+     * Constant Enum: Report Open Action options for Xrm.Url.ReportOpenParameters.actions.
+     * @see {@link Xrm.Url.ReportAction}
+     */
+    const enum ReportAction {
+        Filter = "filter",
+        Run = "run"
+    }
+
+    /**
+     * Constant Enum: Posible file types for Xrm.Device.pickFile options
+     * @see {@link Xrm.Device.PickFileTypes}
+     */
+    const enum DevicePickFileType {
+        Audio = "audio",
+        Video = "vidoe",
+        Image = "image"
+    }
 }
diff --git a/types/xrm/tslint.json b/types/xrm/tslint.json
index f4cc3f2d22..6164356b33 100644
--- a/types/xrm/tslint.json
+++ b/types/xrm/tslint.json
@@ -18,6 +18,7 @@
             "double"
         ],
         "jsdoc-format": true,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        "no-empty-interface": false
     }
 }
diff --git a/types/xrm/v6/tslint.json b/types/xrm/v6/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xrm/v6/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xrm/v7/tslint.json b/types/xrm/v7/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xrm/v7/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xrm/v8/index.d.ts b/types/xrm/v8/index.d.ts
new file mode 100644
index 0000000000..810d461033
--- /dev/null
+++ b/types/xrm/v8/index.d.ts
@@ -0,0 +1,3400 @@
+// Type definitions for Microsoft Dynamics xRM API 8.2
+// Project: http://www.microsoft.com/en-us/download/details.aspx?id=44567
+// Definitions by: David Berry <https://github.com/6ix4our>
+//                 Matt Ngan <https://github.com/mattngan>
+//                 Markus Mauch <https://github.com/markusmauch>
+//                 Daryl LaBar <https://github.com/daryllabar>
+//                 Tully H <https://github.com/clownwilleatme>
+//                 Marius Agur <https://github.com/mariusagur>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare var Xrm: Xrm.XrmStatic;
+declare function GetGlobalContext(): Xrm.Context;
+
+interface Window {
+    Xrm: Xrm.XrmStatic;
+    GetGlobalContext(): Xrm.Context;
+}
+
+declare namespace Xrm {
+    /**
+     * Static xRM object.
+     */
+    interface XrmStatic {
+        /**
+         * Provides a namespace container for the context, data and ui objects.
+         */
+        Page: Page;
+
+        /**
+         * Provides a container for useful functions not directly related to the current page.
+         */
+        Utility: Utility;
+
+        /**
+         * Provides methods to create and manage records in the mobile clients (for phones tablets).
+         */
+        Mobile: Mobile;
+
+        /**
+         * Provides methods to display a web page in the side pane of web client.
+         *
+         * @see {@link https://msdn.microsoft.com/en-us/library/mt790281.aspx} for details.
+         */
+        Panel: Panel;
+    }
+
+    /**
+     * Client Types for Xrm.Page.context.getClient().
+     */
+    type Client = "Web" | "Outlook" | "Mobile";
+
+    /**
+     * Client States for Xrm.Page.context.getClientState().
+     */
+    type ClientState = "Online" | "Offline";
+
+    /**
+     * Themes for Xrm.Page.context.getCurrentTheme().
+     */
+    type Theme = "default" | "Office12Blue" | "Office14Silver";
+
+    /**
+     * Interface for the client context.
+     */
+    interface ClientContext {
+        /**
+         * Returns a value to indicate which client the script is executing in.
+         *
+         * @return  The client, as either "Web", "Outlook", or "Mobile"
+         */
+        getClient(): Client;
+
+        /**
+         * Gets client's current state.
+         *
+         * @return  The client state, as either "Online" or "Offline"
+         */
+        getClientState(): ClientState;
+    }
+
+    /**
+     * Interface for the xRM application context.
+     */
+    interface Context {
+        /**
+         * The client's context instance.
+         */
+        client: ClientContext;
+
+        /**
+         * Gets client's base URL for Dynamics CRM
+         *
+         * @return  The client's base URL
+         *
+         * @remarks For Dynamics CRM On-Premises:               http(s)://server/org
+         *          For Dynamics CRM Online:                    https://org.crm.dynamics.com
+         *          For Dynamics CRM for Outlook (Offline):     http://localhost:2525
+         */
+        getClientUrl(): string;
+
+        /**
+         * Gets current styling theme.
+         *
+         * @return  The name of the current theme, as either "default", "Office12Blue", or "Office14Silver"
+         *
+         * @remarks This function does not work with Dynamics CRM for tablets.
+         */
+        getCurrentTheme(): Theme;
+
+        /**
+         * Gets whether automatic save is enabled.
+         *
+         * @return  true if automatic saving is enabled, otherwise false.
+         */
+        getIsAutoSaveEnabled(): boolean;
+
+        /**
+         * Gets organization's LCID (language code).
+         *
+         * @return  The organization language code.
+         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         */
+        getOrgLcid(): number;
+
+        /**
+         * Gets organization's unique name.
+         *
+         * @return  The organization's unique name.
+         *
+         * @remarks This value can be found on the Developer Resources page within Dynamics CRM
+         */
+        getOrgUniqueName(): string;
+
+        /**
+         * Gets query string parameters.
+         *
+         * @return  The query string parameters, in a dictionary object representing name and value pairs.
+         */
+        getQueryStringParameters(): { [index: string]: any };
+
+        /**
+         * Returns the difference between the local time and Coordinated Universal Time (UTC).
+         *
+         * @return  The time zone offset, in minutes.
+         */
+        getTimeZoneOffsetMinutes(): number;
+
+        /**
+         * Gets user's unique identifier.
+         *
+         * @return  The user's identifier in Guid format.
+         *
+         * @remarks Example: "{B05EC7CE-5D51-DF11-97E0-00155DB232D0}"
+         */
+        getUserId(): string;
+
+        /**
+         * Gets user's LCID (language code).
+         *
+         * @return  The user's language code.
+         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         */
+        getUserLcid(): number;
+
+        /**
+         * Gets the name of the current user.
+         *
+         * @return  The user's name.
+         */
+        getUserName(): string;
+
+        /**
+         * Gets all user security roles.
+         *
+         * @return  An array of user role identifiers, in Guid format.
+         *
+         * @remarks Example: ["cf4cc7ce-5d51-df11-97e0-00155db232d0"]
+         */
+        getUserRoles(): string[];
+
+        /**
+         * Returns the version number of the Dynamics 365 server.
+         *
+         * @return The version number
+         */
+        getVersion(): string;
+
+        /**
+         * Prefixes the current organization's unique name to a string; typically a URL path.
+         *
+         * @param       sPath   Local pathname of the resource.
+         *
+         * @return  A path string with the organization name.
+         *
+         * @remarks Format: "/"+ OrgName + sPath
+         */
+        prependOrgName(sPath: string): string;
+    }
+
+    /**
+     * Defines save options to control how appointment, recurring appointment, or service activity records are processed.
+     *
+     * @see {@link https://msdn.microsoft.com/en-us/library/dn481607.aspx#Anchor_2} for details.
+     */
+    interface SaveOptions {
+        /**
+         * Indicates whether to use the Book or Reschedule messages rather than the Create or Update messages.
+         * Applicable to appointment, recurring appointment, or service activity records.
+         */
+        UseSchedulingEngine?: boolean;
+    }
+
+    /**
+     * Interface for the Xrm.Page.data object.
+     */
+    interface Data {
+        /**
+         * Asynchronously refreshes data on the form, without reloading the page.
+         *
+         * @param      save    true to save the record, after the refresh.
+         *
+         * @return   Returns an asynchronous promise.
+         */
+        refresh(save: boolean): Async.XrmPromise<Async.SuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * Asynchronously saves the record.
+         *
+         * @return   Returns an asynchronous promise.
+         */
+        save(): Async.XrmPromise<Async.SuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * Asynchronously saves the record  with the option to set callback functions to be executed after the save operation is completed.
+         *
+         * @param      saveOptions    Options to control how appointment, recurring appointment, or service activity records are processed.
+         *
+         * @return   Returns an asynchronous promise.
+         */
+        save(saveOptions: SaveOptions): Async.XrmPromise<Async.SuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * The record context of the form.
+         */
+        entity: Page.Entity;
+
+        /**
+         * The process API for Xrm.Page.data.
+         *
+         * @remarks This member may be undefined when Process Flows are not used by the current entity.
+         */
+        process: Page.data.ProcessManager;
+    }
+
+    interface Page {
+        /**
+         * Provides methods to retrieve information specific to an organization, a user, or parameters passed to a page.
+         */
+        context: Context;
+
+        /**
+         * Provides methods to work with the form.
+         */
+        data: Data;
+
+        /**
+         * Contains properties and methods to retrieve information about the user interface as well as collections for several subcomponents of the form.
+         */
+        ui: Ui;
+
+        /**
+         * Gets all attributes.
+         *
+         * @return  An array of attributes.
+         */
+        getAttribute(): Page.Attribute[];
+
+        /**
+         * Gets an attribute matching attributeName.
+         *
+         * @tparam  T   An Attribute type.
+         * @param       attributeName   Name of the attribute.
+         *
+         * @return  The attribute.
+         */
+        getAttribute<T extends Page.Attribute>(attributeName: string): T;
+
+        /**
+         * Gets an attribute matching attributeName.
+         *
+         * @param       attributeName   Name of the attribute.
+         *
+         * @return  The attribute.
+         */
+        getAttribute(attributeName: string): Page.Attribute;
+
+        /**
+         * Gets an attribute by index.
+         *
+         * @param       index   The attribute index.
+         *
+         * @return  The attribute.
+         */
+        getAttribute(index: number): Page.Attribute;
+
+        /**
+         * Gets an attribute.
+         *
+         * @param       delegateFunction    A matching delegate function
+         *
+         * @return  An array of attribute.
+         */
+        getAttribute(delegateFunction: Collection.MatchingDelegate<Page.Attribute>): Page.Attribute[];
+
+        /**
+         * Gets all controls.
+         *
+         * @return  An array of controls.
+         */
+        getControl(): Page.Control[];
+
+        /**
+         * Gets a control matching controlName.
+         *
+         * @tparam  T   A Control type
+         * @param       controlName    Name of the control.
+         *
+         * @return  The control.
+         */
+        getControl<T extends Page.Control>(controlName: string): T;
+
+        /**
+         * Gets a control matching controlName.
+         *
+         * @param       controlName   Name of the control.
+         *
+         * @return  The control.
+         */
+        getControl(controlName: string): Page.Control;
+
+        /**
+         * Gets a control by index.
+         *
+         * @tparam  T   A Control type
+         * @param       index   The control index.
+         *
+         * @return  The control.
+         */
+        getControl<T extends Page.Control>(index: number): T;
+
+        /**
+         * Gets a control by index.
+         *
+         * @param       index   The control index.
+         *
+         * @return  The control.
+         */
+        getControl(index: number): Page.Control;
+
+        /**
+         * Gets a control.
+         *
+         * @param     delegateFunction    A matching delegate function.
+         *
+         * @return  An array of control.
+         */
+        getControl(delegateFunction: Collection.MatchingDelegate<Page.Control>): Page.Control[];
+    }
+
+    /**
+     * Interface for the Xrm.Page.ui object.
+     */
+    interface Ui {
+        /**
+         * Displays a form level notification. Any number of notifications can be displayed and will remain until removed using clearFormNotification.
+         * The height of the notification area is limited so each new message will be added to the top.
+         *
+         * @param                               message     The text of the notification message.
+         * @param        level    The level of the notification which defines how the message will be displayed, such as the icon.
+         * @param                               uniqueId    Unique identifier for the notification which is used with clearFormNotification to remove the notification.
+         *
+         * @return  true if it succeeds, otherwise false.
+         *
+         * @remarks     Values for level are:    ERROR   Notification will use the system error icon.
+         *                                       WARNING Notification will use the system warning icon.
+         *                                       INFO    Notification will use the system info icon.
+         */
+        setFormNotification(message: string, level: Page.ui.FormNotificationLevel, uniqueId: string): boolean;
+
+        /**
+         * Clears the form notification described by uniqueId.
+         *
+         * @param       uniqueId    Unique identifier.
+         *
+         * @return  True if it succeeds, otherwise false.
+         */
+        clearFormNotification(uniqueId: string): boolean;
+
+        /**
+         * Closes the form.
+         */
+        close(): void;
+
+        /**
+         * Gets form type.
+         *
+         * @return  The form type.
+         *
+         * @remarks     Values returned are: 0  Undefined
+         *                                   1  Create
+         *                                   2  Update
+         *                                   3  Read Only
+         *                                   4  Disabled
+         *                                   6  Bulk Edit
+         *              Deprecated values are 5 (Quick Create), and 11 (Read Optimized)
+         */
+        getFormType(): XrmEnum.FormType;
+
+        /**
+         * Gets view port height.
+         *
+         * @return  The view port height, in pixels.
+         *
+         * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
+         */
+        getViewPortHeight(): number;
+
+        /**
+         * Gets view port width.
+         *
+         * @return  The view port width, in pixels.
+         *
+         * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
+         */
+        getViewPortWidth(): number;
+
+        /**
+         * Re-evaluates the ribbon's configured EnableRules.
+         *
+         * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
+         */
+        refreshRibbon(): void;
+
+        /**
+         * The business process flow API, used to interact with the business process flow control in a form.
+         */
+        process: Page.ui.ProcessManager;
+
+        /**
+         * A reference to the collection of controls on the form.
+         */
+        controls: Collection.ItemCollection<Page.Control>;
+
+        /**
+         * The form selector API.
+         *
+         * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
+         */
+        formSelector: Page.FormSelector;
+
+        /**
+         * The navigation API.
+         *
+         * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
+         */
+        navigation: Page.Navigation;
+
+        /**
+         * A reference to the collection of tabs on the form.
+         */
+        tabs: Collection.ItemCollection<Page.Tab>;
+
+        /**
+         * A collection of all the quick view controls on a form using the new form rendering engine (also called "turbo forms").
+         */
+        quickForms: Collection.ItemCollection<Page.ui.QuickForm>;
+    }
+
+    interface Utility {
+        /**
+         * Displays an alert dialog, with an "OK" button.
+         *
+         * @param           message         The message.
+         * @param       onCloseCallback The "OK" callback.
+         */
+        alertDialog(message: string, onCloseCallback: () => void): void;
+
+        /**
+         * Displays a confirmation dialog, with "OK" and "Cancel" buttons.
+         *
+         * @param           message             The message.
+         * @param       yesCloseCallback    The "OK" callback.
+         * @param       noCloseCallback     The "Cancel" callback.
+         */
+        confirmDialog(message: string, yesCloseCallback: () => void, noCloseCallback: () => void): void;
+
+        /**
+         * Query if 'entityType' is an Activity entity.
+         *
+         * @param       entityType  Type of the entity.
+         *
+         * @return  true if the entity is an Activity, false if not.
+         */
+        isActivityType(entityType: string): boolean;
+
+        /**
+         * Opens quick create.
+         *
+         * @param       entityLogicalName           The logical name of the entity to create.
+         * @param     createFromEntity    (Optional) Designates a record that will provide default values
+         *                                                  based on mapped attribute values.
+         * @param       parameters          (Optional) A dictionary object that passes extra query string
+         *                                                  parameters to the form. Invalid query string parameters will cause an
+         *                                                  error.
+         * @return   Returns an asynchronous promise.
+         */
+        openQuickCreate(entityLogicalName: string, createFromEntity?: Page.LookupValue, parameters?: Utility.OpenParameters):
+            Async.XrmPromise<Async.QuickCreateSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * Opens an entity form.
+         *
+         * @param       name                The entity's logical name.
+         * @param       id                  (Optional) The unique identifier for the record.
+         * @param       parameters  (Optional) A dictionary object that passes extra query string parameters to the form.
+         * @param    windowOptions   (Optional) Options for controlling the window.
+         */
+        openEntityForm(name: string, id?: string, parameters?: Utility.FormOpenParameters, windowOptions?: Utility.WindowOptions): void;
+
+        /**
+         * Opens an HTML Web Resource in a new browser window.
+         *
+         * @param       webResourceName Name of the HTML web resource. Can be used to pass URL
+         *                                      parameters.  See Remarks.
+         * @param       webResourceData (Optional) Data to pass into the Web Resource's data parameter.
+         *                                                 It is advised to use encodeURIcomponent() to encode the value.
+         * @param       width           (Optional) The width of the new window.
+         * @param       height          (Optional) The height of the new window.
+         *
+         * @return  A Window reference, containing the opened Web Resource.
+         *
+         * @remarks This function will not work with Microsoft Dynamics CRM for tablets.
+         *          Valid WebResource URL Parameters:   typename
+         *                                              type
+         *                                              id
+         *                                              orgname
+         *                                              userlcid
+         *                                              data (identical to this method's webResourceData parameter)
+         *                                              formid
+         */
+        openWebResource(webResourceName: string, webResourceData?: string, width?: number, height?: number): Window;
+    }
+
+    /**
+     * Interface for methods to create and manage records in the mobile clients (for phones tablets).
+     */
+    interface Mobile {
+        /**
+         * Provides methods to create and manage records in the mobile clients while working in the offline mode.
+         *
+         * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+         */
+        offline: MobileOffline;
+    }
+
+    /**
+     * Interface for the Mobile.offline methods to create and manage records in the mobile clients while working in the offline mode.
+     *
+     * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+     */
+    interface MobileOffline {
+        /**
+         * Returns whether an entity is offline enabled.
+         *
+         * @param        entityType    The logical name of the entity.
+         *
+         * @return      True if the entity is offline enabled; otherwise False.
+         */
+        isOfflineEnabled(entityType: string): boolean;
+
+        /**
+         * Creates an entity record in mobile clients while working in the offline mode.
+         *
+         * @param        entityType    The logical name of the entity.
+         * @param        data          A dictionary object containing key : value pairs for the record to create.
+         *
+         * @return           Returns an asynchronous promise.
+         *
+         * @remarks  You cannot create intersect and activity party entities.
+         *           Only the following attribute types are supported in offline mode:
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         *             Status, UniqueIdentifier
+         */
+        createRecord(entityType: string, data: { [attributeName: string]: any }): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * Retrieves an entity record in mobile clients while working in the offline mode.
+         *
+         * @param        entityType    The logical name of the entity.
+         * @param        id            GUID of the record to retrieve.
+         * @param        options       (Optional) OData system query options to retrieve your data. Supports $select and $expand
+         *                                     Example: ?$select=name&$expand=primarycontactid($select=contactid,fullname)
+         *
+         * @return    Returns an asynchronous promise.
+         *
+         * @remarks  Only $select option can be specified within $expand.
+         *           Only the following attribute types are supported in offline mode:
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         *             Status, UniqueIdentifier
+         */
+        retrieveRecord(entityType: string, id: string, options: string): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * Retrieves a collection of entity records in mobile clients while working in the offline mode.
+         *
+         * @param        entityType    The logical name of the entity.
+         * @param        options       (Optional) The logical name of the enti
+         * @param        maxPageSize   (Optional) A positive number to indicates the number of entity records to be returned per page.
+         *                                     If you do not specify this parameter, the default value is passed as 5000.
+         *                                     If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
+         *                                     will be returned, and you can use the value of the @odata.nextLink property with a new GET
+         *                                     request to return next set of records.
+         *
+         * @return    Returns an asynchronous promise.
+         *
+         * @remarks  A maximum of 5000 related records can be retrieved when using $expand.
+         *           Only $select option can be specified within $expand.
+         *           $skip query option is not supported.
+         *           Only the following attribute types are supported in offline mode:
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         *             Status, UniqueIdentifier
+         */
+        retrieveMultipleRecords(entityType: string, options: string, maxPageSize: number): Async.XrmPromise<Async.OfflineRetrieveMultipleSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * Updates an entity record in mobile clients while working in the offline mode.
+         *
+         * @param        entityType    The logical name of the entity.
+         * @param        id            GUID of the record to update.
+         * @param        data          A dictionary object containing key : value pairs for the record to update.
+         *
+         * @return    Returns an asynchronous promise.
+         *
+         * @remarks  You cannot update intersect and activity party entities.
+         *           Only the following attribute types are supported in offline mode:
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         *             Status, UniqueIdentifier
+         */
+        updateRecord(entityType: string, id: string, data: { [attributeName: string]: any }): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+
+        /**
+         * Deletes an entity record in mobile clients while working in the offline mode.
+         *
+         * @param        entityType    The logical name of the entity.
+         * @param        id            GUID of the record to delete.
+         *
+         * @return    Returns an asynchronous promise.
+         *
+         * @remarks  You cannot delete intersect and activity party entities.
+         */
+        deleteRecord(entityType: string, id: string): Async.XrmPromise<Async.OfflineOperationSuccessCallbackDelegate, Async.ErrorCallbackDelegate>;
+    }
+
+    interface Panel {
+        /**
+         * Displays the web page represented by a URL in the static area in the side pane, which appears on all pages in the web client.
+         *
+         * @param        url    URL of the page to be loaded in the side pane static area.
+         * @param        url    Title of the side pane static area.
+         *
+         * @remarks  This method is only supported for the web client.
+         */
+        LoadPanel(url: string, title: string): void;
+    }
+
+    /**
+     *  A definition module for asynchronous interface declarations.
+     */
+    namespace Async {
+        /**
+         * Called when the operation is successful.
+         */
+        type SuccessCallbackDelegate = () => void;
+
+        /**
+         * Called when the operation fails.
+         *
+         * @param       error   The error object.
+         */
+        type ErrorCallbackDelegate = (error: ErrorCallbackObject) => void;
+
+        /**
+         * Called when the Xrm.Utility.openQuickCreate operation is successful and a new record has been created.
+         *
+         * @param       record   An object which contains a lookup value which identifies the record which has been created.
+         *
+         * @see {Xrm.Utility.openQuickCreate}
+         */
+        type QuickCreateSuccessCallbackDelegate = (record: OpenQuickCreateSuccessCallbackObject) => void;
+
+        /**
+         * Called when the offline operation is successful.
+         *
+         * @param       record   The record returned from the operation.
+         *
+         * @see {Xrm.Mobile.offline}
+         */
+        type OfflineOperationSuccessCallbackDelegate = (record: OfflineOperationSuccessCallbackObject) => void;
+
+        /**
+         * Called when the offline retrieve multiple operation is successful.
+         *
+         * @param       resultSet   The dictionary of records retrieved from the operation.
+         *
+         * @see {Xrm.Mobile.offline.retrieveMultipleRecords}
+         */
+        type OfflineRetrieveMultipleSuccessCallbackDelegate = (resultSet: Array<{ [key: string]: any }>) => void;
+
+        /**
+         * Called when the operation fails.
+         *
+         * @param       error   The error object.
+         *
+         * @see {Xrm.Mobile.offline}
+         */
+        type OfflineErrorCallbackDelegate = (error: OfflineErrorCallbackObject) => void;
+
+        /**
+         * Object passed to ErrorCallbackDelegate.
+         */
+        interface ErrorCallbackObject {
+            /**
+             * The error code.
+             */
+            errorCode: number;
+
+            /**
+             * An error message describing the issue.
+             */
+            message: string;
+        }
+
+        /**
+         * Object passed to QuickCreateSuccessCallbackDelegate.
+         */
+        interface OpenQuickCreateSuccessCallbackObject {
+            /**
+             * A lookup value which identifies the record which has been created.
+             */
+            savedEntityReference: Page.LookupValue;
+        }
+
+        /**
+         * Object passed to OfflineOperationSuccessCallbackDelegate;
+         */
+        interface OfflineOperationSuccessCallbackObject {
+            /**
+             * GUID of the record;
+             */
+            id: string;
+
+            /**
+             * Logical name of the entity.
+             */
+            logicalName: string;
+        }
+
+        /**
+         * Object passed to OfflineErrorCallbackDelegate.
+         */
+        interface OfflineErrorCallbackObject extends ErrorCallbackObject {
+            /**
+             * An internal error message that might contain additional details about the issue.
+             */
+            debugMessage: string;
+        }
+
+        /**
+         * Interface for asynchronous promises used in Xrm.Page.data and Xrm.Utility.openQuickCreate.
+         *
+         * @tparam  TSuccessCallback   Generic success callback parameter.
+         * @tparam  TErrorCallback     Generic error callback parameter.
+         */
+        interface XrmPromise<TSuccessCallback, TErrorCallback> {
+            /**
+             * A basic 'then' promise.
+             *
+             * @param      successCallback   The success callback.
+             * @param        errorCallback     The error callback.
+             */
+            then(successCallback: TSuccessCallback, errorCallback: TErrorCallback): void;
+        }
+    }
+
+    /**
+     * A definition module for collection interface declarations.
+     */
+    namespace Collection {
+        /**
+         * Called for each item in an array
+         *
+         * @param    item            The item.
+         * @param       index   Zero-based index of the item array.
+         *
+         * @return  true if the item matches, false if it does not.
+         */
+        type MatchingDelegate<T> = (item: T, index?: number) => boolean;
+
+        /**
+         * Called for each item in an array
+         *
+         * @param    item            The item.
+         * @param       index   Zero-based index of the item array.
+         */
+        type IterativeDelegate<T> = (item: T, index?: number) => void;
+
+        /**
+         * Interface for an item collection.
+         *
+         * @tparam  T   Generic type parameter.
+         */
+        interface ItemCollection<T> {
+            /**
+             * Applies an operation to all items in this collection.
+             *
+             * @param     delegate    An iterative delegate function
+             */
+            forEach(delegate: IterativeDelegate<T>): void;
+
+            /**
+             * Gets.
+             *
+             * @param      delegate    A matching delegate function
+             *
+             * @return  A T[] whose members have been validated by delegate.
+             */
+            get(delegate: MatchingDelegate<T>): T[];
+
+            /**
+             * Gets the item given by the index.
+             *
+             * @param       itemNumber  The item number to get.
+             *
+             * @return  The T in the itemNumber-th place.
+             */
+            get(itemNumber: number): T;
+
+            /**
+             * Gets the item given by the key.
+             *
+             * @param       itemName    The item name to get.
+             *
+             * @return  The T matching the key itemName.
+             *
+             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             */
+            get(itemName: string): T;
+
+            /**
+             * Gets the entire array of T.
+             *
+             * @return  A T[].
+             */
+            get(): T[];
+
+            /**
+             * Gets the length of the collection.
+             *
+             * @return  The length.
+             */
+            getLength(): number;
+        }
+    }
+
+    /**
+     * The Xrm.Page API
+     *
+     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     */
+    namespace Page {
+        /**
+         * Requirement Level for Xrm.Page.Attribute.getRequiredLevel() and Xrm.Page.Attribute.setRequiredLevel().
+         */
+        type RequirementLevel = "none" | "recommended" | "required";
+
+        /**
+         * Save Modes for Xrm.Page.Entity.save().
+         */
+        type SaveMode = "saveandclose" | "saveandnew";
+
+        /**
+         * Status for Xrm.Page.Stage.getStatus().
+         */
+        type StageStatus = "active" | "inactive";
+
+        /**
+         * Status for Xrm.Page.Process.getStatus().
+         */
+        type ProcessStatus = "active" | "aborted" | "finished";
+
+        /**
+         * Submit Mode for Xrm.Page.Attribute.getSubmitMode() and Xrm.Page.Attribute.setSubmitMode().
+         */
+        type SubmitMode = "always" | "dirty" | "never";
+
+        /**
+         * Control type for Xrm.Page.ui.QuickForm.getControlType().
+         */
+        type ControlQuickFormType = "quickform";
+
+        /**
+         * Control types for Xrm.Page.Control.getControlType().
+         */
+        type ControlType = "standard" | "iframe" | "lookup" | "optionset" | "subgrid" | "webresource" | "notes" | "timercontrol" | "kbsearch" | ControlQuickFormType;
+
+        /**
+         * Date attribute formats for Xrm.Page.Attribute.getFormat(), used by DateAttribute.
+         */
+        type DateAttributeFormat = "date" | "datetime";
+
+        /**
+         * Integer attribute formats for Xrm.Page.Attribute.getFormat(), used by NumberAttribute.
+         */
+        type IntegerAttributeFormat = "duration" | "none";
+
+        /**
+         * OptionSet attribute formats for Xrm.Page.Attribute.getFormat(), used by OptionSetAttribute.
+         */
+        type OptionSetAttributeFormat = "language" | "timezone";
+
+        /**
+         * String attribute formats for Xrm.Page.Attribute.getFormat(), used by StringAttribute.
+         */
+        type StringAttributeFormat = "email" | "phone" | "text" | "textarea" | "tickersymbol" | "url";
+
+        /**
+         * Attribute types for Xrm.ui.ProcessMonitor Xrm.Page.Attribute.setDisplayState().
+         */
+        type AttributeType = "boolean" | "datetime" | "decimal" | "double" | "integer" | "lookup" | "memo" | "money" | "optionset" | "string";
+
+        /**
+         * Direction types for a process stage change event
+         */
+        type StageChangeDirection = "Next" | "Previous";
+
+        /**
+         * Attribute formats for Xrm.Page.Attribute.getFormat().
+         */
+        type AttributeFormat = DateAttributeFormat | IntegerAttributeFormat | OptionSetAttributeFormat | StringAttributeFormat;
+
+        /**
+         * Interface for a CRM Business Process Flow instance.
+         */
+        interface Process {
+            /**
+             * Returns the unique identifier of the process.
+             *
+             * @return The identifier for this process, in GUID format.
+             *
+             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the process.
+             *
+             * @return  The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns an collection of stages in the process.
+             *
+             * @return  The stages.
+             */
+            getStages(): Collection.ItemCollection<Stage>;
+
+            /**
+             * Returns a boolean value to indicate if the process is rendered.
+             *
+             * @return  true if the process is rendered, false if not.
+             */
+            isRendered(): boolean;
+        }
+
+        /**
+         * Interface for CRM Business Process Flow stages.
+         */
+        interface Stage {
+            /**
+             * Returns an object with a getValue method which will return the integer value of the business process flow
+             * category.
+             *
+             * @return  The stage category.
+             */
+            getCategory(): { getValue(): XrmEnum.StageCategory };
+
+            /**
+             * Returns the logical name of the entity associated with the stage.
+             *
+             * @return  The entity name.
+             */
+            getEntityName(): string;
+
+            /**
+             * Returns the unique identifier of the stage.
+             *
+             * @return  The identifier of the Stage, in GUID format.
+             *
+             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the stage.
+             *
+             * @return  The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns the status of the stage.
+             *
+             * @return  The status.
+             *
+             * @remarks  This method will return either "active" or "inactive".
+             */
+            getStatus(): StageStatus;
+
+            /**
+             * Returns a collection of steps in the stage.
+             *
+             * @return  An array of Step.
+             */
+            getSteps(): Step[];
+        }
+
+        interface Step {
+            /**
+             * Returns the logical name of the attribute associated to the step.
+             *
+             * @return  The attribute.
+             *
+             * @remarks  Some steps don’t contain an attribute value.
+             */
+            getAttribute(): string;
+
+            /**
+             * Returns the name of the step.
+             *
+             * @return  The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns whether the step is required in the business process flow.
+             *
+             * @return  true if required, false if not.
+             *
+             * @remarks     Returns true if the step is marked as required in the Business Process Flow editor; otherwise, false.
+             *              There is no connection between this value and the values you can change in the Xrm.Page.data.entity
+             *              attribute RequiredLevel methods.
+             */
+            isRequired(): boolean;
+        }
+
+        /**
+         * Interface for the event context.
+         */
+        interface EventContext {
+            /**
+             * Gets the Xrm context.
+             *
+             * @return  The Xrm context.
+             */
+            getContext(): Context;
+
+            /**
+             * Gets the handler's depth, which is the order in which the handler is executed.
+             *
+             * @return  The depth, a 0-based index.
+             */
+            getDepth(): number;
+
+            /**
+             * Returns the event arguments for the event context
+             * Get event args returns null for read operations
+             *
+             * @return The event arguments or null
+             */
+            getEventArgs(): SaveEventArguments | StageChangeEventArguments | StageSelectedEventArguments;
+
+            /**
+             * Gets a reference to the object for which event occurred.
+             *
+             * @return  The event source.
+             */
+            getEventSource(): Attribute | Control | Entity;
+
+            /**
+             * Gets the shared variable with the specified key.
+             *
+             * @tparam  T   Generic type parameter.
+             * @param       key The key.
+             *
+             * @return  The shared variable.
+             *
+             * @remarks Used to pass values between handlers of an event.
+             */
+            getFormContext(): Page;
+
+            /**
+             * Gets the shared variable with the specified key.
+             *
+             * @param T Generic type parameter.
+             * @param key The key.
+             *
+             * @return The shared variable.
+             *
+             * @remarks Used to pass values between handlers of an event.
+             */
+            getSharedVariable<T>(key: string): T;
+
+            /**
+             * Sets a shared variable.
+             *
+             * @tparam  T   Generic type parameter.
+             * @param       key The key.
+             * @param    value       The value.
+             *
+             * @remarks Used to pass values between handlers of an event.
+             */
+            setSharedVariable<T>(key: string, value: T): void;
+        }
+
+        /**
+         * Interface for a save event context
+         */
+        interface SaveEventContext extends EventContext {
+            /**
+             * Gets save-event arguments.
+             *
+             * @return  The event arguments.
+             *
+             * @remarks Returns null for all but the "save" event.
+             */
+            getEventArgs(): SaveEventArguments;
+        }
+
+        /**
+         * Interface for a process stage change event context
+         */
+        interface StageChangeEventContext extends EventContext {
+            /**
+             * Gets process stage change event arguments.
+             *
+             * @return  The event arguments.
+             *
+             */
+            getEventArgs(): StageChangeEventArguments;
+        }
+
+        interface StageSelectedEventContext extends EventContext {
+            /**
+             * Gets process stage selected event arguments.
+             *
+             * @return  The event arguments.
+             *
+             */
+            getEventArgs(): StageSelectedEventArguments;
+        }
+
+        /**
+         * Type for a context-sensitive handler.
+         * @param     context The context.
+         */
+        type ContextSensitiveHandler = (context: EventContext) => void;
+
+        /**
+         * Type for a process status change handler.
+         * @param     status The process status.
+         */
+        type ProcessStatusChangeHandler = (status: ProcessStatus) => void;
+
+        /**
+         * Interface for UI elements with labels.
+         */
+        interface UiLabelElement {
+            /**
+             * Gets the label.
+             *
+             * @return  The label.
+             */
+            getLabel(): string;
+
+            /**
+             * Sets the label.
+             *
+             * @param       label   The label.
+             */
+            setLabel(label: string): void;
+        }
+
+        /**
+         * Interface for UI elements which can have the visibility value read.
+         */
+        interface UiCanGetVisibleElement {
+            /**
+             * Gets the visibility state.
+             *
+             * @return  true if the tab is visible, otherwise false.
+             */
+            getVisible(): boolean;
+        }
+
+        /**
+         * Interface for UI elements which can have the visibility value updated.
+         */
+        interface UiCanSetVisibleElement {
+            /**
+             * Sets the visibility state.
+             *
+             * @param      visible true to show, false to hide.
+             */
+            setVisible(visible: boolean): void;
+        }
+
+        /**
+         * Base interface for standard UI elements.
+         */
+        interface UiStandardElement extends UiCanGetVisibleElement, UiLabelElement {
+            /**
+             * Sets the visibility state.
+             *
+             * @param      visible true to show, false to hide.
+             */
+            setVisible(visible: boolean): void;
+        }
+
+        /**
+         * Interface for focusable UI elements.
+         */
+        interface UiFocusable {
+            /**
+             * Sets focus on the element.
+             */
+            setFocus(): void;
+        }
+
+        /**
+         * Interface for controls which methods provide immediate feedback or take actions as user types in a control.
+         * Contains methods which can be used to perform data validations in a control even before the user commits (saves) the value in a form.
+         */
+        interface UiKeyPressable {
+            /**
+             * Use this to add a function as an event handler for the keypress event so that the function is called when you type a character in the specific text or number field.
+             * For a sample JavaScript code that uses the addOnKeyPress method to configure the auto-completion experience, see Sample: Auto-complete in CRM controls.
+             *
+             * @param     handler The function reference.
+             */
+            addOnKeyPress(handler: ContextSensitiveHandler): void;
+
+            /**
+             * Use this to manually fire an event handler that you created for a specific text or number field to be executed on the keypress event.
+             */
+            fireOnKeyPress(): void;
+
+            /**
+             * Use this to remove an event handler for a text or number field that you added using addOnKeyPress.
+             *
+             * Remarks:  If an anonymous function is set using addOnKeyPress, it can’t be removed using this method.
+             * @param     handler The function reference.
+             */
+            removeOnKeyPress(handler: ContextSensitiveHandler): void;
+        }
+
+        /**
+         * Interface for Result value of AutoCompleteResultSet
+         */
+        interface AutoCompleteResult {
+            /**
+             * The Identifier
+             */
+            id: string | number;
+
+            /**
+             * Url of the icon to display
+             */
+            icon?: string;
+
+            /**
+             * Display value(s) for this auto-complete option
+             */
+            fields: string[];
+        }
+
+        /**
+         * Interface for command of AutoCompleteResultSet.  This is displayed at the bottom of the auto complete view
+         */
+        interface AutoCompleteCommand {
+            /**
+             * The Identifier
+             */
+            id: string;
+
+            /**
+             * Url of the icon to display
+             */
+            icon?: string;
+
+            /**
+             * Label to display at the bottom of the auto complete view
+             */
+            label: string;
+
+            /**
+             * Action to perform when user clicks on label
+             */
+            action(): void;
+        }
+
+        /**
+         * Interface for showAutoComplete argument
+         */
+        interface AutoCompleteResultSet {
+            /**
+             * Results to show
+             */
+            results: AutoCompleteResult[];
+
+            /**
+             * Command to show/execute at the bottom of the results displayed
+             */
+            commands?: AutoCompleteCommand;
+        }
+
+        /**
+         * Interface for a Lookup value.
+         */
+        interface LookupValue {
+            /**
+             * The identifier.
+             */
+            id: string;
+
+            /**
+             * The name
+             */
+            name?: string;
+
+            /**
+             * Type of the entity.
+             */
+            entityType: string;
+        }
+
+        /**
+         * Interface for an OptionSet value.
+         */
+        interface OptionSetValue {
+            /**
+             * The label text.
+             */
+            text: string;
+
+            /**
+             * The value, as a number
+             */
+            value: number;
+        }
+
+        /**
+         * Interface for a privilege.
+         */
+        interface Privilege {
+            /**
+             * True if the user can read.
+             */
+            canRead: boolean;
+
+            /**
+             * True if the user can update.
+             */
+            canUpdate: boolean;
+
+            /**
+             * True if the user can create.
+             */
+            canCreate: boolean;
+        }
+
+        /**
+         * Interface for an Entity attribute.
+         */
+        interface Attribute {
+            /**
+             * Adds a handler to be called when the attribute's value is changed.
+             *
+             * @param     handler The function reference.
+             */
+            addOnChange(handler: ContextSensitiveHandler): void;
+
+            /**
+             * Fire all "on change" event handlers.
+             */
+            fireOnChange(): void;
+
+            /**
+             * Gets attribute type.
+             *
+             * @return  The attribute's type name.
+             *
+             * @remarks Values returned are: boolean
+             *                               datetime
+             *                               decimal
+             *                               double
+             *                               integer
+             *                               lookup
+             *                               memo
+             *                               money
+             *                               optionset
+             *                               string
+             */
+            getAttributeType(): string;
+
+            /**
+             * Gets the attribute format.
+             *
+             * @return  The format of the attribute.
+             *
+             * @see {@link getAttributeType()}
+             *
+             * @remarks Values returned are: date           (datetime)
+             *                               datetime       (datetime)
+             *                               duration       (integer)
+             *                               email          (string)
+             *                               language       (optionset)
+             *                               none           (integer)
+             *                               phone          (string)
+             *                               text           (string)
+             *                               textarea       (string)
+             *                               tickersymbol   (string)
+             *                               timezone       (optionset)
+             *                               url            (string)
+             */
+            getFormat(): AttributeFormat;
+
+            /**
+             * Gets a boolean value indicating whether this Attribute has unsaved changes.
+             *
+             * @return  true if there are unsaved changes, otherwise false.
+             */
+            getIsDirty(): boolean;
+
+            /**
+             * Gets the logical name of the attribute.
+             *
+             * @return  The logical name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the record context of this attribute.
+             *
+             * @return  The parent record context.
+             */
+            getParent(): Entity;
+
+            /**
+             * Gets the current level of requirement for the attribute.
+             *
+             * @return  The required level, as either "none", "required", or "recommended"
+             */
+            getRequiredLevel(): RequirementLevel;
+
+            /**
+             * Gets current submit mode for the attribute.
+             *
+             * @return  The submit mode, as either "always", "never", or "dirty"
+             *
+             * @remarks The default value is "dirty"
+             */
+            getSubmitMode(): SubmitMode;
+
+            /**
+             * Gets the current user's privileges for the attribute.
+             *
+             * @return  The user privileges.
+             */
+            getUserPrivilege(): Privilege;
+
+            /**
+             * Removes the handler from the "on change" event.
+             *
+             * @param      handler The handler.
+             */
+            removeOnChange(handler: ContextSensitiveHandler): void;
+
+            /**
+             * Sets the required level.
+             *
+             * @param       requirementLevel    The requirement level, as either "none", "required", or "recommended"
+             */
+            setRequiredLevel(requirementLevel: RequirementLevel): void;
+
+            /**
+             * Sets the submit mode.
+             *
+             * @param       submitMode  The submit mode, as either "always", "never", or "dirty".
+             *
+             * @remarks The default value is "dirty"
+             */
+            setSubmitMode(submitMode: SubmitMode): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             */
+            controls: Collection.ItemCollection<Control>;
+
+            /**
+             * Gets the value.
+             *
+             * @return  The value.
+             */
+            getValue(): any;
+
+            /**
+             * Sets the value.
+             *
+             * @param       value   The value.
+             */
+            setValue(value: any): void;
+        }
+
+        /**
+         * Interface for a Number attribute.
+         *
+         * @sa  Attribute
+         */
+        interface NumberAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             *
+             * @return  The format of the attribute.
+             *
+             * @remarks Values returned are: duration
+             *                               none
+             */
+            getFormat(): IntegerAttributeFormat;
+
+            /**
+             * Gets the maximum value allowed.
+             *
+             * @return  The maximum value allowed.
+             */
+            getMax(): number;
+
+            /**
+             * Gets the minimum value allowed.
+             *
+             * @return  The minimum value allowed.
+             */
+            getMin(): number;
+
+            /**
+             * Gets the attribute's configured precision.
+             *
+             * @return  The total number of allowed decimal places.
+             */
+            getPrecision(): number;
+
+            /**
+             * Gets the value.
+             *
+             * @return  The value.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value.
+             *
+             * @param       value   The value.
+             *
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: number): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             */
+            controls: Collection.ItemCollection<NumberControl>;
+        }
+
+        /**
+         * Interface for a String attribute.
+         *
+         * @sa  Attribute
+         */
+        interface StringAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             *
+             * @return  The format of the attribute.
+             *
+             * @remarks Values returned are: email
+             *                               phone
+             *                               text
+             *                               textarea
+             *                               tickersymbol
+             *                               url
+             */
+            getFormat(): StringAttributeFormat;
+
+            /**
+             * Gets maximum length allowed.
+             *
+             * @return  The maximum length allowed.
+             *
+             * @remarks The email form's "Description" attribute does not have the this method.
+             */
+            getMaxLength(): number;
+
+            /**
+             * Gets the value.
+             *
+             * @return  The value.
+             */
+            getValue(): string;
+
+            /**
+             * Sets the value.
+             *
+             * @param       value   The value.
+             *
+             * @remarks     A String field with the {@link Attribute.getFormat|email} format enforces email
+             *              address formatting. Attributes on Quick Create Forms will not save values set
+             *              with this method.
+             */
+            setValue(value: string): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             */
+            controls: Collection.ItemCollection<StringControl>;
+        }
+
+        /**
+         * Common interface for enumeration attributes (OptionSet and Boolean).
+         *
+         * @sa  Attribute
+         */
+        interface EnumAttribute extends Attribute {
+            /**
+             * Gets the initial value of the attribute.
+             *
+             * @return  The initial value.
+             *
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): number | boolean;
+        }
+
+        /**
+         * Interface for a Boolean attribute.
+         *
+         * @sa  EnumAttribute
+         */
+        interface BooleanAttribute extends EnumAttribute {
+            /**
+             * Gets the initial value of the attribute.
+             *
+             * @return  The initial value.
+             *
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): boolean;
+
+            /**
+             * Gets the value.
+             *
+             * @return  true if it succeeds, false if it fails.
+             */
+            getValue(): boolean;
+
+            /**
+             * Sets the value.
+             *
+             * @param      value   The value.
+             *
+             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: boolean): void;
+        }
+
+        /**
+         * Interface for a Date attribute.
+         *
+         * @sa  Attribute
+         */
+        interface DateAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             *
+             * @return  The format of the attribute.
+             *
+             * @remarks Values returned are: date
+             *                               datetime
+             */
+            getFormat(): DateAttributeFormat;
+
+            /**
+             * Gets the value.
+             *
+             * @return  The value.
+             */
+            getValue(): Date;
+
+            /**
+             * Sets the value.
+             *
+             * @param     value   The value.
+             *
+             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: Date): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             */
+            controls: Collection.ItemCollection<DateControl>;
+        }
+
+        /**
+         * Interface an OptionSet attribute.
+         *
+         * @sa  EnumAttribute
+         */
+        interface OptionSetAttribute extends EnumAttribute {
+            /**
+             * Gets the attribute format.
+             *
+             * @return  The format of the attribute.
+             *
+             * @remarks Values returned are: language
+             *                               timezone
+             */
+            getFormat(): OptionSetAttributeFormat;
+
+            /**
+             * Gets the initial value of the attribute.
+             *
+             * @return  The initial value.
+             *
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): number;
+
+            /**
+             * Gets the option matching a value.
+             *
+             * @param       value   The enumeration value of the option desired.
+             *
+             * @return  The option.
+             */
+            getOption(value: number): OptionSetValue;
+
+            /**
+             * Gets the option matching a label.
+             *
+             * @param       label   The label of the option desired.
+             *
+             * @return  The option.
+             */
+            getOption(label: string): OptionSetValue;
+
+            /**
+             * Gets all of the options.
+             *
+             * @return  An array of options.
+             */
+            getOptions(): OptionSetValue[];
+
+            /**
+             * Gets selected option.
+             *
+             * @return  The selected option.
+             */
+            getSelectedOption(): OptionSetValue;
+
+            /**
+             * Gets the label of the currently selected option.
+             *
+             * @return  The current value's label.
+             */
+            getText(): string;
+
+            /**
+             * Gets the value.
+             *
+             * @return  The value.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value.
+             *
+             * @param       value   The value.
+             *
+             * @remarks     The getOptions() method returns option values as strings. You must use parseInt
+             *              to convert them to numbers before you can use those values to set the value of an
+             *              OptionSet attribute. Attributes on Quick Create Forms will not save values set
+             *              with this method.
+             */
+            setValue(value: number): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             */
+            controls: Collection.ItemCollection<OptionSetControl>;
+        }
+
+        /**
+         * Interface a Lookup attribute.
+         *
+         * @sa  Attribute
+         */
+        interface LookupAttribute extends Attribute {
+            /**
+             * Gets a boolean value indicating whether the Lookup is a multi-value PartyList.
+             *
+             * @return  true the attribute is a PartyList, otherwise false.
+             */
+            getIsPartyList(): boolean;
+
+            /**
+             * Gets the value.
+             *
+             * @return  An array of LookupValue.
+             */
+            getValue(): LookupValue[];
+
+            /**
+             * Sets the value.
+             *
+             * @param   value   The value.
+             *
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: LookupValue[]): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             */
+            controls: Collection.ItemCollection<LookupControl>;
+        }
+
+        /**
+         * Interface for the form's record context, Xrm.Page.data.entity
+         */
+        interface Entity {
+            /**
+             * Adds a handler to be called when the record is saved.
+             *
+             * @param      handler The handler.
+             */
+            addOnSave(handler: ContextSensitiveHandler): void;
+
+            /**
+             * Gets an serialized-XML string representing data that will be passed to the server upon saving
+             * the record.
+             *
+             * @return  The XML in string format.
+             *
+             * @remarks     This function does not work with Microsoft Dynamics CRM for tablets. Example:
+             *              "<account><name>Contoso</name><accountnumber>55555</accountnumber><telephone2>425
+             *              555-1234</telephone2></account>".
+             */
+            getDataXml(): string;
+
+            /**
+             * Gets entity's logical name.
+             *
+             * @return  The logical name.
+             */
+            getEntityName(): string;
+
+            /**
+             * Gets the record's unique identifier.
+             *
+             * @return  The identifier, in Guid format.
+             *
+             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Gets a boolean value indicating whether the record has unsaved changes.
+             *
+             * @return  true if there are unsaved changes, otherwise false.
+             */
+            getIsDirty(): boolean;
+
+            /**
+             * Gets the record's primary attribute value.
+             *
+             * @return  The primary attribute value.
+             *
+             * @remarks The value for this attribute is used when links to the record are displayed.
+             */
+            getPrimaryAttributeValue(): string;
+
+            /**
+             * Removes the handler from the "on save" event.
+             *
+             * @param      handler The handler.
+             */
+            removeOnSave(handler: ContextSensitiveHandler): void;
+
+            /**
+             * Saves the record.
+             *
+             * @remarks  When using quick create forms in the web application the saveandnew option is not
+             *           applied. It will always work as if saveandclose were used. Quick create forms in
+             *           Microsoft Dynamics CRM for tablets will apply the saveandnew behavior.
+             */
+            save(): void;
+
+            /**
+             * Saves the record with the given save mode.
+             *
+             * @param       saveMode    (Optional) the save mode to save, as either "saveandclose" or
+             *                                  "saveandnew".
+             */
+            save(saveMode: SaveMode): void;
+
+            /**
+             * The collection of attributes for the record.
+             */
+            attributes: Collection.ItemCollection<Attribute>;
+        }
+
+        /**
+         * Interface for save event arguments.
+         */
+        interface SaveEventArguments {
+            /**
+             * Gets save mode, as an integer.
+             *
+             * @return  The save mode.
+             *
+             * @remarks Values returned are: 1      Save
+             *                               2      Save and Close
+             *                               59     Save and New
+             *                               70     AutoSave (Where enabled; can be used with an OnSave handler
+             *                                                to conditionally disable auto-saving)
+             *                               58     Save as Completed (Activities)
+             *                               5      Deactivate
+             *                               6      Reactivate
+             *                               47     Assign (All user- or team-owned entities)
+             *                               7      Send (Email)
+             *                               16     Qualify (Lead)
+             *                               15     Disqualify (Lead)
+             */
+            getSaveMode(): XrmEnum.SaveMode;
+
+            /**
+             * Returns a boolean value to indicate if the record's save has been prevented.
+             *
+             * @return  true if saving is prevented, otherwise false.
+             */
+            isDefaultPrevented(): boolean;
+
+            /**
+             * Prevents the save operation from being submitted to the server.
+             *
+             * @remarks All remaining "on save" handlers will continue execution.
+             */
+            preventDefault(): void;
+        }
+
+        /**
+         * Interface for process stage change event arguments.
+         */
+        interface StageChangeEventArguments {
+            /**
+             * Gets the direction of the stage change.
+             *
+             * @return  The direction.
+             *
+             * @remarks Values returned are: "next" or "previous"
+             */
+            getDirection(): StageChangeDirection;
+
+            /**
+             * Gets the destination stage object
+             *
+             * @return  The stage object
+             *
+             * @remarks For switching between entities, returns the previous stage object
+             */
+            getStage(): Stage;
+        }
+
+        /**
+         * Interface for process stage selected event arguments.
+         */
+        interface StageSelectedEventArguments {
+            /**
+             * Gets the selected stage object
+             *
+             * @return  The stage object
+             */
+            getStage(): Stage;
+        }
+
+        /**
+         * Module for the Xrm.Page.data API.
+         */
+        namespace data {
+            /**
+             * Interface for the Xrm.Page.data.process API.
+             */
+            interface ProcessManager {
+                /**
+                 * Returns a Process object representing the active process.
+                 *
+                 * @return  current active process.
+                 */
+                getActiveProcess(): Process;
+
+                /**
+                 * Set a Process as the active process.
+                 *
+                 * @param       processId           The Id of the process to make the active process.
+                 * @param     callbackFunction    (Optional) a function to call when the operation is complete.
+                 */
+                setActiveProcess(processId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+                /**
+                 * Returns all process instances for the entity record that the calling user has access to.
+                 *
+                 * @param     callbackFunction    (Optional) a function to call when the operation is complete.
+                 */
+                getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
+
+                /**
+                 * Sets a process instance as the active instance
+                 *
+                 * @param       processInstanceId           The Id of the process instance to make the active instance.
+                 * @param     callbackFunction    (Optional) a function to call when the operation is complete.
+                 */
+                setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
+
+                /**
+                 * Returns a Stage object representing the active stage.
+                 *
+                 * @return  current active stage.
+                 */
+                getActiveStage(): Stage;
+
+                /**
+                 * Set a stage as the active stage.
+                 *
+                 * @param       stageId             the Id of the stage to make the active stage.
+                 * @param     callbackFunction    (Optional) a function to call when the operation is complete.
+                 */
+                setActiveStage(stageId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+                /**
+                 * Use this method to get a collection of stages currently in the active path with methods to interact with the
+                 * stages displayed in the business process flow control. The active path represents stages currently rendered in
+                 * the process control based on the branching rules and current data in the record.
+                 *
+                 * @return  A collection of all completed stages, the currently active stage, and the predicted set of future stages
+                 *          based on satisfied conditions in the branching rule. This may be a subset of the stages returned with
+                 *          Xrm.Page.data.process.getActiveProcess because it will only include those stages which represent a valid
+                 *          transition from the current stage based on branching that has occurred in the process.
+                 */
+                getActivePath(): Collection.ItemCollection<Stage>;
+
+                /**
+                 * Use this method to asynchronously retrieve the enabled business process flows that the user can switch to for an
+                 * entity.
+                 *
+                 * @param    callbackFunction The callback function must accept a parameter that contains an object with
+                 *                                      dictionary properties where the name of the property is the Id of the
+                 *                                      business process flow and the value of the property is the name of the
+                 *                                      business process flow.
+                 *
+                 *                                      The enabled processes are filtered according to the user’s privileges. The
+                 *                                      list of enabled processes is the same ones a user can see in the UI if they
+                 *                                      want to change the process manually.
+                 */
+                getEnabledProcesses(callbackFunction: (enabledProcesses: ProcessDictionary) => void): void;
+
+                /**
+                 * Use this method to get the currently selected stage.
+                 *
+                 * @return  The currently selected stage.
+                 */
+                getSelectedStage(): Stage;
+
+                /**
+                 * Use this to add a function as an event handler for the OnStageChange event so that it will be called when the
+                 * business process flow stage changes.
+                 * @param      handler The function will be added to the bottom of the event
+                 *                                              handler pipeline. The execution context is automatically
+                 *                                              set to be the first parameter passed to the event handler.
+                 *
+                 *                                              Use a reference to a named function rather than an
+                 *                                              anonymous function if you may later want to remove the
+                 *                                              event handler.
+                 */
+                addOnStageChange(handler: ContextSensitiveHandler): void;
+
+                /**
+                 * Use this to add a function as an event handler for the OnProcessStatusChange event so that it will be called when the
+                 * business process flow status changes.
+                 * @param      handler The function will be added to the bottom of the event
+                 *                                              handler pipeline. The execution context is automatically
+                 *                                              set to be the first parameter passed to the event handler.
+                 *
+                 *                                              Use a reference to a named function rather than an
+                 *                                              anonymous function if you may later want to remove the
+                 *                                              event handler.
+                 */
+                addOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
+
+                /**
+                 * Use this to add a function as an event handler for the OnStageSelected event so that it will be called
+                 * when a business process flow stage is selected.
+                 *
+                 * @param      handler The function will be added to the bottom of the event
+                 *                                              handler pipeline. The execution context is automatically
+                 *                                              set to be the first parameter passed to the event handler.
+                 *
+                 *                                              Use a reference to a named function rather than an
+                 *                                              anonymous function if you may later want to remove the
+                 *                                              event handler.
+                 */
+                addOnStageSelected(handler: ContextSensitiveHandler): void;
+
+                /**
+                 * Use this to remove a function as an event handler for the OnProcessStatusChange event.
+                 *
+                 * @param      handler If an anonymous function is set using the addOnProcessStatusChange method it
+                 *                                              cannot be removed using this method.
+                 */
+                removeOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
+
+                /**
+                 * Use this to remove a function as an event handler for the OnStageChange event.
+                 *
+                 * @param      handler If an anonymous function is set using the addOnStageChange method it
+                 *                                              cannot be removed using this method.
+                 */
+                removeOnStageChange(handler: ContextSensitiveHandler): void;
+
+                /**
+                 * Use this to remove a function as an event handler for the OnStageChange event.
+                 *
+                 * @param      handler If an anonymous function is set using the addOnStageChange method it
+                 *                                              cannot be removed using this method.
+                 */
+                removeOnStageSelected(handler: ContextSensitiveHandler): void;
+
+                /**
+                 * Progresses to the next stage.
+                 *
+                 * @param      callbackFunction    (Optional) A function to call when the operation is
+                 *                                                          complete.
+                 */
+                moveNext(callbackFunction?: ProcessCallbackDelegate): void;
+
+                /**
+                 * Moves to the previous stage.
+                 *
+                 * @param      callbackFunction    (Optional) A function to call when the operation is
+                 *                                                          complete.
+                 */
+                movePrevious(callbackFunction?: ProcessCallbackDelegate): void;
+
+                /**
+                 * Use this method to get the unique identifier of the process instance
+                 *
+                 * @return  The unique identifier of the process instance
+                 */
+                getInstanceId(): string;
+
+                /**
+                 * Use this method to get the name of the process instance
+                 *
+                 * @return  The name of the process instance
+                 */
+                getInstanceName(): string;
+
+                /**
+                 * Use this method to get the current status of the process instance
+                 *
+                 * @return  The current status of the process
+                 */
+                getStatus(): ProcessStatus;
+
+                /**
+                 * Use this method to set the current status of the process instance
+                 *
+                 * @param     status         The new status for the process
+                 * @param     callbackFunction    (Optional) a function to call when the operation is complete.
+                 */
+                setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
+            }
+
+            /**
+             * Called when method to get active processes is complete
+             *
+             * @param           status  The result of the get active processes operation.
+             *
+             * @remarks     Returns object with the following key-value pairs:
+             *                          CreatedOn
+             *                          ProcessDefinitionID
+             *                          ProcessDefinitionName
+             *                          ProcessInstanceID
+             *                          ProcessInstanceName
+             *                          StatusCodeName
+             */
+            type GetProcessInstancesDelegate = (object: ProcessDictionary) => void;
+
+            /**
+             * Called when method to set active process is complete
+             *
+             * @param           status  The result of the set active process operation.
+             *
+             * @remarks     Values returned are: success        (The operation succeeded.)
+             *                                   invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
+             */
+            type SetProcessInstanceDelegate = (status: string) => void;
+
+            /**
+             * Called when process change methods have completed.
+             *
+             * @param           status  The result of the process change operation.
+             *
+             * @remarks     Values returned are: success        (The operation succeeded.)
+             *                                   crossEntity    (The previous stage is for a different entity.)
+             *                                   beginning      (The active stage is the first stage of the active path.)
+             *                                   invalid        (The operation failed because the selected stage isn’t the same
+             *                                   as the active stage.)
+             *                                   unreachable    (The stage exists on a different path.)
+             */
+            type ProcessCallbackDelegate = (status: string) => void;
+
+            /**
+             * Called when process set status method has completed.
+             *
+             * @param           status  The new status of the process instance
+             *
+             * @remarks     Values returned are: active
+             *                                   aborted
+             *                                   finished
+             */
+            type ProcessSetStatusDelegate = (status: ProcessStatus) => void;
+
+            /**
+             * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
+             */
+            interface ProcessDictionary { [index: string]: string; }
+        }
+
+        /**
+         * Interface for Xrm.Page.ui controls.
+         *
+         * @sa  UiElement
+         */
+        interface Control extends UiLabelElement, UiCanGetVisibleElement {
+            /**
+             * Gets the controls type.
+             *
+             * @return  The control type.
+             *
+             * @remarks Values returned are: standard
+             *                               iframe
+             *                               lookup
+             *                               optionset
+             *                               subgrid
+             *                               webresource
+             *                               notes
+             *                               timercontrol
+             *                               kbsearch (CRM Online Only, use parature.d.ts)
+             *                               quickform (see ui.QuickForm)
+             *                               customcontrol: <namespace>.<name> (A custom control for mobile phone and tablet clients).
+             *                               customsubgrid: <namespace>.<name> (A custom dataset control for mobile phone and tablet clients).
+             */
+            getControlType(): ControlType | string;
+
+            /**
+             * Gets the name of the control on the form.
+             *
+             * @return  The name of the control.
+             *
+             * @remarks     The name assigned to a control is not determined until the form loads. Changes to
+             *              the form may change the name assigned to a given control.
+             *              When you use the control getName method the name of the first control will be the
+             *              same as the name of the attribute. The second instance of a control for that
+             *              attribute will be "<attributeName>1". The pattern <attributeName>+N
+             *              will continue for each additional control added to the form for a specific
+             *              attribute. When a form displays a business process flow control in the header,
+             *              additional controls will be added for each attribute that is displayed in the
+             *              business process flow. These controls have a unique name like the following:
+             *              header_process_<attribute name>.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the Section parent of the control.
+             *
+             * @return  The parent Section.
+             */
+            getParent(): Section;
+        }
+
+        /**
+         * Interface for a standard control.
+         *
+         * @sa  Control
+         */
+        interface StandardControl extends Control, UiStandardElement, UiFocusable {
+            /**
+             * Clears the notification identified by uniqueId.
+             *
+             * @param       uniqueId    (Optional) Unique identifier.
+             *
+             * @return  true if it succeeds, false if it fails.
+             *
+             * @remarks If the uniqueId parameter is not used, the current notification shown will be removed.
+             */
+            clearNotification(uniqueId?: string): boolean;
+
+            /**
+             * Gets a boolean value, indicating whether the control is disabled.
+             *
+             * @return  true if it is disabled, otherwise false.
+             */
+            getDisabled(): boolean;
+
+            /**
+             * Sets the state of the control to either enabled, or disabled.
+             *
+             * @param      disabled    true to disable, false to enable.
+             */
+            setDisabled(disabled: boolean): void;
+
+            /**
+             * Sets a control-local notification message.
+             *
+             * @param       message     The message.
+             * @param       uniqueId    Unique identifier.
+             *
+             * @return  true if it succeeds, false if it fails.
+             *
+             * @remarks     When this method is used on Microsoft Dynamics CRM for tablets a red "X" icon
+             *              appears next to the control. Tapping on the icon will display the message.
+             */
+            setNotification(message: string, uniqueId: string): boolean;
+
+            /**
+             * Gets the control's bound attribute.
+             *
+             * @tparam  T   An Attribute type.
+             *
+             * @return  The attribute.
+             */
+            getAttribute<T extends Attribute>(): T;
+
+            /**
+             * Gets the control's bound attribute.
+             *
+             * @return  The attribute.
+             */
+            getAttribute(): Attribute;
+        }
+
+        /**
+         * Interface for Auto Lookup Control.
+         * This is not an Entity Lookup, but a control that supports AutoComplete / KeyPress Events (Text or Number)
+         *
+         * @remarks This interface is not supported for CRM mobile clients (phones or tablets) and the interactive service hub.  It is only available for Updated entities.
+         *
+         * @sa  StandardControl
+         */
+        interface AutoLookupControl extends StandardControl, UiKeyPressable {
+            /**
+             * Gets the latest value in a control as the user types characters in a specific text or number field.
+             * This method helps you to build interactive experiences by validating data and alerting users as they type characters in a control.
+             * The getValue method is different from the attribute getValue method because the control method retrieves the value from the control
+             * as the user is typing in the control as opposed to the attribute getValue method that retrieves the value after the user commits (saves) the field.
+             */
+            getValue(): string;
+
+            /**
+             * Hides the auto-completion drop-down list configured for a specific text field
+             */
+            hideAutoComplete(): void;
+
+            /**
+             * Shows upt to 10 matching strings in a drop-down list as users press keys to type charactrer in a specific text field.
+             * On selecting an item in the drop-down list, the value in the text field changes to the selected item, the drop-down list disappears, and the OnChange event for the text field is invoked
+             */
+            showAutoComplete(resultSet: AutoCompleteResultSet): void;
+        }
+
+        /**
+         * Interface for a String control.
+         *
+         * @sa  StandardControl
+         */
+        interface StringControl extends AutoLookupControl {
+            /**
+             * Gets the control's bound attribute.
+             *
+             * @return  The attribute.
+             */
+            getAttribute(): StringAttribute;
+        }
+
+        /**
+         * Interface for a Number control.
+         *
+         * @sa  StandardControl
+         */
+        interface NumberControl extends AutoLookupControl {
+            /**
+             * Gets the control's bound attribute.
+             *
+             * @return  The attribute.
+             */
+            getAttribute(): NumberAttribute;
+        }
+
+        /**
+         * Interface for a Date control.
+         *
+         * @sa  StandardControl
+         */
+        interface DateControl extends StandardControl {
+            /**
+             * Gets the control's bound attribute.
+             *
+             * @return  The attribute.
+             */
+            getAttribute(): DateAttribute;
+
+            /**
+             * Gets the status of the time-of-day component of the Date control.
+             *
+             * @return  true if the time is shown, otherwise false.
+             */
+            getShowTime(): boolean;
+
+            /**
+             * Sets the visibility of the time component of the Date control.
+             *
+             * @param      showTimeValue   true to show, false to hide the time value.
+             */
+            setShowTime(showTimeValue: boolean): void;
+        }
+
+        /**
+         * Interface for a Lookup control.
+         *
+         * @sa  StandardControl
+         */
+        interface LookupControl extends StandardControl {
+            /**
+             * Adds a handler to the "pre search" event of the Lookup control.
+             *
+             * @param     handler The handler.
+             */
+            addPreSearch(handler: ContextSensitiveHandler): void;
+
+            /**
+             * Adds an additional custom filter to the lookup, with the "AND" filter operator.
+             * Can only be used within a "pre search" event handler
+             *
+             * @sa addPreSearch
+             *
+             * @param       filter              Specifies the filter, as a serialized FetchXML
+             *                                          "filter" node.
+             * @param       entityLogicalName   (Optional) The logical name of the entity.
+             *
+             * @remarks     If entityLogicalName is not specified, the filter will be applied to all entities
+             *              valid for the Lookup control.
+             *              Example filter: <filter type="and">
+             *                              <condition attribute="address1_city" operator="eq" value="Redmond" />
+             *                              </filter>
+             */
+            addCustomFilter(filter: string, entityLogicalName?: string): void;
+
+            /**
+             * Adds a custom view for the Lookup dialog.
+             *
+             * @param       viewId          Unique identifier for the view, in Guid format.
+             * @param       entityName      Name of the entity.
+             * @param       viewDisplayName Name of the view to display.
+             * @param       fetchXml        The FetchXML query for the view's contents, serialized as a string.
+             * @param       layoutXml       The Layout XML, serialized as a string.
+             * @param      isDefault       true, to treat this view as default.
+             *
+             * @remarks Cannot be used on "Owner" Lookup controls.
+             *          The viewId is never saved to CRM, but must be unique across available views.  Generating
+             *          a new value can be accomplished with a {@link http://www.guidgen.com/|Guid generator}.
+             *          Example viewId value: "{00000000-0000-0000-0000-000000000001}"
+             *          Layout XML Reference: {@link http://msdn.microsoft.com/en-us/library/gg334522.aspx}
+             */
+            addCustomView(viewId: string, entityName: string, viewDisplayName: string, fetchXml: string, layoutXml: string, isDefault: boolean): void;
+
+            /**
+             * Gets the control's bound attribute.
+             *
+             * @return  The attribute.
+             */
+            getAttribute(): LookupAttribute;
+
+            /**
+             * Gets the unique identifier of the default view.
+             *
+             * @return  The default view, in Guid format.
+             *
+             * @remarks Example: "{00000000-0000-0000-0000-000000000000}"
+             */
+            getDefaultView(): string;
+
+            /**
+             * Removes the handler from the "pre search" event of the Lookup control.
+             *
+             * @param     handler The handler.
+             */
+            removePreSearch(handler: () => void): void;
+
+            /**
+             * Sets the Lookup's default view.
+             *
+             * @param       viewGuid    Unique identifier for the view.
+             *
+             * @remarks Example viewGuid value: "{00000000-0000-0000-0000-000000000000}"
+             */
+            setDefaultView(viewGuid: string): void;
+        }
+
+        /**
+         * Interface for an OptionSet control.
+         *
+         * @sa  StandardControl
+         */
+        interface OptionSetControl extends StandardControl {
+            /**
+             * Adds an option.
+             *
+             * @param       option  The option.
+             * @param       index           (Optional) zero-based index of the option.
+             *
+             * @remarks This method does not check that the values within the options you add are valid.
+             *          If index is not provided, the new option will be added to the end of the list.
+             */
+            addOption(option: OptionSetValue, index?: number): void;
+
+            /**
+             * Clears all options.
+             */
+            clearOptions(): void;
+
+            /**
+             * Gets the control's bound attribute.
+             *
+             * @return  The attribute.
+             */
+            getAttribute(): OptionSetAttribute;
+
+            /**
+             * Removes the option matching the value.
+             *
+             * @param       value   The value.
+             */
+            removeOption(value: number): void;
+        }
+
+        /**
+         * Interface for a CRM grid control.
+         *
+         * @sa  Control
+         */
+        interface GridControl extends Control {
+            /**
+             * Use this method to add event handlers to the GridControl's OnLoad event.
+             *
+             * @param    handler The event handler.
+             */
+            addOnLoad(handler: () => void): void;
+
+            /**
+             * This method returns context information about the GridControl.
+             *
+             * @return  The context type.
+             */
+            getContextType(): XrmEnum.GridControlContext;
+
+            /**
+             * Use this method to get the logical name of the entity data displayed in the grid.
+             *
+             * @return  The entity name.
+             */
+            getEntityName(): string;
+
+            /**
+             * Use this method to get access to the Grid available in the GridControl.
+             *
+             * @return  The grid.
+             */
+            getGrid(): ui.Grid;
+
+            /**
+             * Use this method to get access to the ViewSelector available for the GridControl when it is configured to display views.
+             *
+             * @return  The view selector.
+             */
+            getViewSelector(): ui.ViewSelector;
+
+            /**
+             * Refreshes the sub grid.
+             *
+             * @remarks Not available during the "on load" event of the form.
+             */
+            refresh(): void;
+
+            /**
+             * Use this method to remove event handlers from the GridControl's OnLoad event.
+             *
+             * @param    handler The handler.
+             */
+            removeOnLoad(handler: () => void): void;
+        }
+
+        /**
+         * Interface for a framed control, which is either a Web Resource or an Iframe.
+         *
+         * @sa  Control
+         *
+         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
+         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
+         */
+        interface FramedControl extends Control {
+            /**
+             * Gets the DOM element containing the control.
+             *
+             * @return  The container object.
+             *
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getObject(): HTMLIFrameElement;
+
+            /**
+             * Gets the URL value of the control.
+             *
+             * @return  The source URL.
+             *
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getSrc(): string;
+
+            /**
+             * Sets the URL value of the control.
+             *
+             * @param       src The source URL.
+             *
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            setSrc(src: string): void;
+        }
+
+        /**
+         * Interface for an Iframe control.
+         *
+         * @sa  FramedControl
+         */
+        interface IframeControl extends FramedControl, UiCanSetVisibleElement {
+            /**
+             * Gets initial URL defined for the Iframe.
+             *
+             * @return  The initial URL.
+             *
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getInitialUrl(): string;
+        }
+
+        /**
+         * Interface for a Silverlight control.
+         *
+         * @sa  Control
+         */
+        interface SilverlightControl extends Control {
+            /**
+             * Gets the query string value passed to Silverlight.
+             *
+             * @return  The data.
+             *
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getData(): string;
+
+            /**
+             * Sets the query string value passed to Silverlight.
+             *
+             * @param       data    The data.
+             *
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            setData(data: string): void;
+
+            /**
+             * Gets the DOM element containing the control.
+             *
+             * @return  The container object.
+             *
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getObject(): HTMLObjectElement;
+        }
+
+        /**
+         * Interface for a form tab.
+         *
+         * @sa  UiElement
+         * @sa  UiFocusable
+         */
+        interface Tab extends UiStandardElement, UiFocusable {
+            /**
+             * Gets display state of the tab.
+             *
+             * @return  The display state, as either "expanded" or "collapsed"
+             */
+            getDisplayState(): ui.DisplayState;
+
+            /**
+             * Gets the name of the tab.
+             *
+             * @return  The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the Xrm.Page.ui parent of the tab.
+             *
+             * @return  The parent.
+             */
+            getParent(): Ui;
+
+            /**
+             * Sets display state of the tab.
+             *
+             * @param       displayState   Display state of the tab, as either "expanded" or "collapsed"
+             */
+            setDisplayState(displayState: ui.DisplayState): void;
+
+            /**
+             * A reference to the collection of form sections within this tab.
+             */
+            sections: Collection.ItemCollection<Section>;
+        }
+
+        /**
+         * Interface for a form section.
+         *
+         * @sa  UiElement
+         */
+        interface Section extends UiStandardElement {
+            /**
+             * Gets the name of the section.
+             *
+             * @return  The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the Xrm.Page.Tab parent of this item.
+             *
+             * @return  The parent.
+             */
+            getParent(): Tab;
+
+            /**
+             * A reference to the collection of controls within this tab.
+             */
+            controls: Collection.ItemCollection<Control>;
+        }
+
+        /**
+         * Module for Xrm.Page.ui API.
+         */
+        namespace ui {
+            /**
+             * Form Notification Levels for Xrm.Ui.setFormNotification().
+             */
+            type FormNotificationLevel = "ERROR" | "INFO" | "WARNING";
+
+            /**
+             * Display States for Xrm.ui.ProcessMonitor.setDisplayState().
+             */
+            type DisplayState = "collapsed" | "expanded";
+
+            /**
+             * Interface for Xrm.Page.ui.process API
+             */
+            interface ProcessManager {
+                /**
+                 * Sets display state of the process flow control.
+                 *
+                 * @param       displayState   Display state of the process flow control, as either "expanded" or "collapsed"
+                 */
+                setDisplayState(displayState: DisplayState): void;
+
+                /**
+                 * Sets the visibility state.
+                 *
+                 * @param      visible true to show, false to hide.
+                 */
+                setVisible(visible: boolean): void;
+            }
+
+            /**
+             * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
+             * GridControl.getGrid method.
+             */
+            interface Grid {
+                /**
+                 * Returns a collection of every GridRow in the Grid.
+                 *
+                 * @return  The rows.
+                 */
+                getRows(): Collection.ItemCollection<GridRow>;
+
+                /**
+                 * Returns a collection of every selected GridRow in the Grid.
+                 *
+                 * @return  The selected rows.
+                 */
+                getSelectedRows(): Collection.ItemCollection<GridRow>;
+
+                /**
+                 * Returns the total number of records in the Grid.
+                 *
+                 * @return  The total record count.
+                 */
+                getTotalRecordCount(): number;
+            }
+
+            /**
+             * Interface for a grid row.  Use the GridRow.getData method to access the GridRowData. A collection of GridRow is
+             * returned by Grid.getRows and Grid.getSelectedRows methods.
+             */
+            interface GridRow {
+                /**
+                 * Returns the GridRowData for the GridRow.
+                 *
+                 * @return  The data.
+                 */
+                getData(): GridRowData;
+            }
+
+            /**
+             * Interface for grid row data.  Use the GridRowData.getEntity method to access the GridEntity. GridRowData is
+             * returned by the GridRow.getData method.
+             */
+            interface GridRowData {
+                /**
+                 * Returns the GridEntity for the GridRowData.
+                 *
+                 * @return  The entity.
+                 */
+                getEntity(): GridEntity;
+            }
+
+            /**
+             * Interface for a grid entity.  Use the GridEntity methods to access data about the specific records in the rows.
+             * GridEntity is returned by the GridRowData.getEntity method.
+             */
+            interface GridEntity {
+                /**
+                 * Returns the logical name for the record in the row.
+                 *
+                 * @return  The entity name.
+                 */
+                getEntityName(): string;
+
+                /**
+                 * Returns a LookupValue that references this record.
+                 *
+                 * @return  The entity reference.
+                 */
+                getEntityReference(): LookupValue;
+
+                /**
+                 * Returns the id for the record in the row.
+                 *
+                 * @return  The identifier of the GridEntity, in GUID format.
+                 *
+                 * @remarks Example return: "{00000000-0000-0000-0000-000000000000}"
+                 */
+                getId(): string;
+
+                /**
+                 * Returns the primary attribute value for the record in the row.  (Commonly the name.)
+                 *
+                 * @return  The primary attribute value.
+                 */
+                getPrimaryAttributeValue(): string;
+            }
+
+            /**
+             * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
+             * of the grid control.
+             */
+            interface ViewSelector {
+                /**
+                 * Use this method to get a reference to the current view.
+                 *
+                 * @return  The current view.
+                 */
+                getCurrentView(): ViewSelectorItem;
+
+                /**
+                 * Use this method to determine whether the view selector is visible.
+                 *
+                 * @return  true if visible, false if not.
+                 */
+                isVisible(): boolean;
+
+                /**
+                 * Use this method to set the current view.
+                 *
+                 * @param     viewSelectorItem    The view selector item.
+                 */
+                setCurrentView(viewSelectorItem: ViewSelectorItem): void;
+            }
+
+            /**
+             * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
+             * the ViewSelector.setCurrentView method.
+             */
+            interface ViewSelectorItem {
+                /**
+                 * Returns a LookupValue that references this view.
+                 *
+                 * @return  The entity reference.
+                 */
+                getEntityReference(): LookupValue;
+            }
+
+            /**
+             * Interface for a quick view control instance on a form.
+             *
+             * @see {@link https://msdn.microsoft.com/en-us/library/mt736908.aspx#bkmk_isLoaded} for details.
+             */
+            interface QuickForm extends Control, UiLabelElement, UiCanGetVisibleElement {
+                /**
+                 * Gets the constituent controls in a quick view control.
+                 *
+                 * @return  An array of controls.
+                 *
+                 * @remarks Constituent controls in a quick view control are read only.
+                 */
+                getControl(): Control[];
+
+                /**
+                 * Gets the constituent controls in a quick view control.
+                 *
+                 * @tparam  T   A Control type
+                 * @param       controlName    Name of the control.
+                 *
+                 * @return  The control.
+                 *
+                 * @remarks Constituent controls in a quick view control are read only.
+                 */
+                getControl<T extends Control>(controlName: string): T;
+
+                /**
+                 * Gets the constituent controls in a quick view control.
+                 *
+                 * @param       controlName    Name of the control.
+                 *
+                 * @return  The control.
+                 *
+                 * @remarks Constituent controls in a quick view control are read only.
+                 */
+                getControl(controlName: string): Control;
+
+                /**
+                 * Gets a control by index.
+                 *
+                 * @tparam  T   A Control type
+                 * @param       index   The control index.
+                 *
+                 * @return  The control.
+                 *
+                 * @remarks Constituent controls in a quick view control are read only.
+                 */
+                getControl<T extends Control>(index: number): T;
+
+                /**
+                 * Gets a control by index.
+                 *
+                 * @param       index   The control index.
+                 *
+                 * @return  The control.
+                 *
+                 * @remarks Constituent controls in a quick view control are read only.
+                 */
+                getControl(index: number): Control;
+
+                /**
+                 * Gets the controls type.
+                 *
+                 * @return  Returns a string value that categorizes quick view controls.
+                 */
+                getControlType(): ControlQuickFormType;
+
+                /**
+                 * Returns whether the data binding for the constituent controls in a quick view control is complete.
+                 *
+                 * @return   True is the data binding for a constituent control is complete, otherwise false.
+                 *           because the quick view form that the control is bound to may not have loaded completely.
+                 *           As a result, using the getAttribute or any data-related methods on a constituent control might not work.
+                 *           The isLoaded method for the quick view control helps determine the data binding status for constituent controls in a quick view control.
+                 *
+                 *  @remarks The data binding for the constituent controls in a quick view control may not be complete during the main form OnLoad event
+                 */
+                isLoaded(): boolean;
+
+                /**
+                 * Refreshes the data displayed in a quick view control.
+                 */
+                refresh(): void;
+            }
+        }
+
+        /**
+         * Interface for a navigation item.
+         *
+         * @sa  UiElement
+         * @sa  UiFocusable
+         */
+        interface NavigationItem extends UiStandardElement, UiFocusable {
+            /**
+             * Gets the name of the item.
+             *
+             * @return  The identifier.
+             */
+            getId(): string;
+        }
+
+        /**
+         * Interface for Xrm.Page.ui.navigation.
+         */
+        interface Navigation {
+            /**
+             * A reference to the collection of available navigation items.
+             */
+            items: Collection.ItemCollection<NavigationItem>;
+        }
+
+        /**
+         * Interface for an entity's form selector item.
+         */
+        interface FormItem {
+            /**
+             * Gets the unique identifier of the form.
+             *
+             * @return  The identifier, in Guid format.
+             */
+            getId(): string;
+
+            /**
+             * Gets the label for the form.
+             *
+             * @return  The label.
+             */
+            getLabel(): string;
+
+            /**
+             * Navigates the user to this form.
+             */
+            navigate(): void;
+        }
+
+        /**
+         * Interface for the form selector API.
+         */
+        interface FormSelector {
+            /**
+             * Gets current form.
+             *
+             * @return  The current item.
+             *
+             * @remarks When only one form is available this method will return null.
+             */
+            getCurrentItem(): FormItem;
+
+            /**
+             * A reference to the collection of available forms.
+             */
+            items: Collection.ItemCollection<FormItem>;
+        }
+    }
+
+    /**
+     * An definition module for URL-based, CRM component parameters.
+     *
+     * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+     */
+    namespace Url {
+        /**
+         * Command Bar Display options for Xrm.Url.FormOpenParameters.cmdbar, Xrm.Url.ViewOpenParameters.cmdbar, and Xrm.Utility.FormOpenParameters.cmdbar.
+         */
+
+        type CmdBarDisplay = "true" | "false";
+        /**
+         * Navigation Bar Display options for Xrm.Url.FormOpenParameters.navbar, Xrm.Url.ViewOpenParameters.navbar, and Xrm.Utility.FormOpenParameters.navbar.
+         */
+        type NavBarDisplay = "entity" | "off" | "on";
+
+        /**
+         * Report Open Action options for Xrm.Url.ReportOpenParameters.actions.
+         */
+        type ReportAction = "filter" | "run";
+
+        /**
+         * Interface for defining parameters on a request to open a form with main.aspx (as with
+         * window.open). Useful for parsing the keys and values into a string of the format:
+         * "&key=value".
+         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         *
+         * @remarks  A member for "pagetype" is not provided.  The value "entityrecord" is required in
+         *           the URL, for forms. Example:  "pagetype=entityrecord"
+         */
+        interface FormOpenParameters {
+            /**
+             * The logical name of the entity.
+             */
+            etn: string;
+
+            /**
+             * Additional parameters can be provided to the request. This can only be used to provide
+             * default field values for the form, or pass data to custom parameters that have been
+             * customized for the form.  See example below for setting the selected form.
+             *
+             * @remarks Example:  encodeURIComponent("formid={8c9f3e6f-7839-e211-831e-00155db7d98f}");
+             */
+            extraqs?: string;
+
+            /**
+             * Controls whether the command bar is displayed.
+             * Accepted values are: "true"    (The command bar is displayed.)
+             *                      "false"   (The command bar is not displayed.)
+             */
+            cmdbar?: CmdBarDisplay;
+
+            /**
+             * Controls whether the Navigation bar is displayed on the form.
+             * Accepted values are: "on"      (The navigation bar is displayed.)
+             *                      "off"     (The navigation bar is not displayed.)
+             *                      "entity"  (On an entity form, only the navigation options for related
+             *                                entities are available.)
+             */
+            navbar?: NavBarDisplay;
+        }
+
+        /**
+         * Interface for defining parameters on a request to open a view with main.aspx (as with
+         * window.open). Useful for parsing the keys and values into a string of the format:
+         * "&key=value".
+         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         *
+         * @remarks  A member for "pagetype" is not provided.  The value "entitylist" is required in
+         *           the URL, for views. Example:  "pagetype=entitylist"
+         */
+        interface ViewOpenParameters {
+            /**
+             * The logical name of the entity.
+             */
+            etn: string;
+
+            /**
+             * The unique identifier of a view, in Guid format, which is valid for the entity described by
+             * {@link etn}.
+             */
+            viewid: string;
+
+            /**
+             * The type of view identified by {@link viewid}.
+             *
+             * @remarks  Accepted values are:    1039    System View
+             *                                   4230    User View.
+             */
+            viewtype: XrmEnum.ViewType;
+
+            /**
+             * Controls whether the command bar is displayed.
+             * Accepted values are: "true"    (The command bar is displayed.)
+             *                      "false"   (The command bar is not displayed.)
+             */
+            cmdbar?: CmdBarDisplay;
+
+            /**
+             * Controls whether the Navigation bar is displayed on the form.
+             * Accepted values are: "on"      (The navigation bar is displayed.)
+             *                      "off"     (The navigation bar is not displayed.)
+             *                      "entity"  (On an entity form, only the navigation options for related
+             *                                entities are available.)
+             */
+            navbar?: NavBarDisplay;
+        }
+
+        /**
+         * Interface for defining parameters of a request to open a dialog with rundialog.aspx (as with
+         * window.open).  Useful for parsing the keys and values into a string of the format:
+         * "&key=value".
+         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         */
+        interface DialogOpenParameters {
+            /**
+             * The unique identifier of the dialog, in Guid format, which is valid for the entity described
+             * by: {@link EntityName}
+             */
+            DialogId: string;
+
+            /**
+             * The logical name of the entity.
+             */
+            EntityName: string;
+
+            /**
+             * The unique identifier for the targeted record.
+             */
+            ObjectId: string;
+        }
+
+        /**
+         * Interface for defining parameters of a request to open a report with viewer.apsx (as with
+         * window.open).  Useful for parsing out the keys and values into a string of the format:
+         * "&key=value"
+         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         */
+        interface ReportOpenParameters {
+            /**
+             * The action to perform, as either "run" or "filter".
+             *
+             * @remarks  "run"       Executes the report with default filters.
+             *           "filter"    Presents the user with the filter editor, and a "Run Report" button.
+             */
+            action: ReportAction;
+
+            /**
+             * The file name of the report.  For out-of-box reports, this parameter enables context-sensitive
+             * help.
+             */
+            helpID?: string;
+
+            /**
+             * The unique identifier, held in the report's 'reportid' attribute, in Guid format.
+             */
+            id: string;
+        }
+    }
+
+    /**
+     * The Xrm.Utility API
+     *
+     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     */
+    namespace Utility {
+        interface OpenParameters {
+            /**
+             * Additional parameters can be provided to the request, by overloading
+             * this object with additional key and value pairs. This can only be used
+             * to provide default field values for the form, or pass data to custom
+             * parameters that have been customized for the form.
+             */
+            [index: string]: string | undefined;
+        }
+
+        /**
+         * Interface for defining parameters on a Xrm.Utility.openEntityForm() request.
+         */
+        interface FormOpenParameters extends OpenParameters {
+            /**
+             * The identifier of the form to use, when several are available.
+             */
+            formid?: string;
+
+            /**
+             * Controls whether the Navigation bar is displayed on the form.
+             * Accepted values are: "on"      (The navigation bar is displayed.)
+             *                      "off"     (The navigation bar is not displayed.)
+             *                      "entity"  (On an entity form, only the navigation options for related
+             *                                entities are available.)
+             */
+            navbar?: Url.NavBarDisplay;
+
+            /**
+             * Controls whether the command bar is displayed.
+             * Accepted values are: "true"    (The command bar is displayed.)
+             *                      "false"   (The command bar is not displayed.)
+             */
+            cmdbar?: Url.CmdBarDisplay;
+        }
+
+        /**
+         * Interface for window options.
+         */
+        interface WindowOptions {
+            /**
+             * Direct the form to open in a new window.
+             */
+            openInNewWindow: boolean;
+        }
+    }
+}
+
+declare namespace XrmEnum {
+    /**
+     * Enumeration of entity form states/types.
+     */
+    const enum FormType {
+        Undefined = 0,
+        Create = 1,
+        Update = 2,
+        ReadOnly = 3,
+        Disabled = 4,
+        BulkEdit = 6
+    }
+
+    /**
+     * Enumeration of entity form save modes.
+     */
+    const enum SaveMode {
+        Save = 1,
+        SaveAndClose = 2,
+        SaveAndNew = 59,
+        AutoSave = 70,
+        SaveAsCompleted = 58,
+        Deactivate = 5,
+        Reactivate = 6,
+        Assign = 47,
+        Send = 7,
+        Qualify = 16,
+        Disqualify = 15
+    }
+
+    /**
+     * Enumeration of stage categories.
+     */
+    const enum StageCategory {
+        Qualify = 0,
+        Develop = 1,
+        Propose = 2,
+        Close = 3,
+        Identify = 4,
+        Research = 5,
+        Resolve = 6
+    }
+
+    /**
+     * Enumeration of grid control context resolutions.
+     */
+    const enum GridControlContext {
+        Unknown = 0,
+        RibbonContextForm = 1,
+        RibbonContextListing = 2,
+        FormContextUnrelated = 3,
+        FormContextRelated = 4
+    }
+
+    /**
+     * An enumeration for view types.
+     */
+    const enum ViewType {
+        SystemView = 1039,
+        UserView = 4230
+    }
+}
diff --git a/types/xrm/v8/tsconfig.json b/types/xrm/v8/tsconfig.json
new file mode 100644
index 0000000000..b8c9b525fc
--- /dev/null
+++ b/types/xrm/v8/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "files": [
+        "index.d.ts",
+        "xrm-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "xrm": [
+                "xrm/v8"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/xrm/v8/tslint.json b/types/xrm/v8/tslint.json
new file mode 100644
index 0000000000..f4cc3f2d22
--- /dev/null
+++ b/types/xrm/v8/tslint.json
@@ -0,0 +1,23 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "unified-signatures": false,
+        "class-name": true,
+        "indent": [
+            true,
+            "spaces"
+        ],
+        "max-line-length": [
+            true,
+            250
+        ],
+        "no-unnecessary-type-assertion": false,
+        "quotemark": [
+            true,
+            "double"
+        ],
+        "jsdoc-format": true,
+        "no-unnecessary-generics": false
+    }
+}
diff --git a/types/xrm/v8/xrm-tests.ts b/types/xrm/v8/xrm-tests.ts
new file mode 100644
index 0000000000..182afa1450
--- /dev/null
+++ b/types/xrm/v8/xrm-tests.ts
@@ -0,0 +1,177 @@
+/// Demonstrate usage in the browser's window object
+
+window.Xrm.Utility.alertDialog("message", () => {});
+parent.Xrm.Page.context.getOrgLcid();
+
+/// Demonstrate clientglobalcontext.d.ts
+
+function _getContext() {
+    const errorMessage = "Context is not available.";
+    if (typeof GetGlobalContext !== "undefined") {
+        return GetGlobalContext();
+    } else if (typeof Xrm !== "undefined") {
+        return Xrm.Page.context;
+    } else {
+        throw new Error(errorMessage);
+    }
+}
+
+const crmContext = _getContext();
+
+/// Demonstrate iterator typing
+
+const grids = Xrm.Page.getControl((control) => {
+    return control.getControlType() === "subgrid";
+});
+
+const selectedGridReferences: Xrm.Page.LookupValue[] = [];
+
+/// Demonstrate iterator typing with v7.1 additions
+
+grids.forEach((gridControl: Xrm.Page.GridControl) => {
+    gridControl.getGrid().getSelectedRows().forEach((row) => {
+        selectedGridReferences.push(row.getData().getEntity().getEntityReference());
+    });
+});
+
+/// Demonstrate generic overload vs typecast
+
+const lookupAttribute = <Xrm.Page.LookupControl> Xrm.Page.getControl("customerid");
+const lookupAttribute2 = Xrm.Page.getControl<Xrm.Page.LookupControl>("customerid");
+
+/// Demonstrate ES6 String literal syntax
+
+lookupAttribute.addCustomFilter(`<filter type="and">
+    <condition attribute="address1_city" operator="eq" value="Redmond" />
+</filter>`, "account");
+
+lookupAttribute.addPreSearch(() => { alert("A search was performed."); });
+
+/// Demonstrate strong-typed attribute association with strong-typed control
+
+const lookupValues = lookupAttribute.getAttribute().getValue();
+
+if (lookupValues !== null)
+    if (!lookupValues[0].id || !lookupValues[0].entityType)
+        throw new Error("Invalid value in Lookup control.");
+
+/// Demonstrate v7.0 BPF API
+
+if (Xrm.Page.data.process != null)
+    Xrm.Page.data.process.moveNext((status) => { alert(`Process moved forward with status: ${status}`); });
+
+/// Demonstrate v7.1 Quick Create form
+
+Xrm.Utility.openQuickCreate("account").then(
+    (object) => { if (object) alert(`Newly created record Id: ${object.savedEntityReference.id}`); },
+    (error) => {console.log(`Code: ${error.errorCode}, Message: ${error.message}`); });
+
+/// Make all controls visible.
+
+// Xrm.Page.ui.controls.forEach((control) => { control.setVisible(true); }); // No longer works
+Xrm.Page.ui.controls.forEach((control: Xrm.Page.StandardControl) => { control.setVisible(true); }); // Must cast to StandardControl
+
+/// Make all tabs and sections visible.
+
+Xrm.Page.ui.tabs.forEach((tab) => {
+    tab.setVisible(true);
+
+    tab.sections.forEach((section) => {
+        section.setVisible(true);
+    });
+});
+
+/// Demonstrate OnSave event context.
+
+Xrm.Page.data.entity.addOnSave((context: Xrm.Page.SaveEventContext) => {
+    const eventArgs = context.getEventArgs();
+
+    if (eventArgs.getSaveMode() === XrmEnum.SaveMode.AutoSave || eventArgs.getSaveMode() === XrmEnum.SaveMode.SaveAndClose)
+        eventArgs.preventDefault();
+});
+
+/// Demonstrate ES6 String literal with templates
+
+alert(`The current form type is: ${Xrm.Page.ui.getFormType() }`);
+
+alert(`The current entity type is: ${Xrm.Page.data.entity.getEntityName() }`);
+
+/// Demonstrate Optionset Value as int in Turbo Forms
+
+const optionSetAttribute = Xrm.Page.getAttribute<Xrm.Page.OptionSetAttribute>("statuscode");
+const optionValue: number = optionSetAttribute.getOptions()[0].value;
+
+/// Demonstrate Control.setFocus();
+
+optionSetAttribute.controls.get(0).setFocus();
+
+/// Demonstrate setFormNotification
+
+let level: Xrm.Page.ui.FormNotificationLevel;
+level = "ERROR";
+Xrm.Page.ui.setFormNotification("Test", level, "uniqueId");
+
+/// Demonstrate Requirement Level and Submit Mode both via string parameters and String Literal Types
+
+let requirementLevel: Xrm.Page.RequirementLevel = "none";
+const requirementLevelString = "none";
+let submitMode: Xrm.Page.SubmitMode = "always";
+const submitModeString = "always";
+
+let attribute = Xrm.Page.getAttribute<Xrm.Page.LookupAttribute>("customerid");
+attribute.setSubmitMode(submitMode);
+attribute.setSubmitMode(submitModeString); // Works if the string is a const
+attribute.setRequiredLevel(requirementLevel);
+attribute.setRequiredLevel(requirementLevelString); // Works if the string is a const
+
+/// Demonstrate v8 AutoComplete
+
+let autoCompleteControl = Xrm.Page.getControl<Xrm.Page.AutoLookupControl>("name");
+const userInput = autoCompleteControl.getValue();
+const accountResult = {  };
+const resultSet: Xrm.Page.AutoCompleteResultSet = {
+    results: new Array() as Xrm.Page.AutoCompleteResult[],
+    commands: {
+        id: "sp_commands",
+        label: "Learn More",
+        action() {
+            // Specify what you want to do when the user
+            // clicks the "Learn More" link at the bottom
+            // of the auto-completion list.
+            // For this sample, we are just opening a page
+            // that provides information on working with
+            // accounts in CRM.
+            window.open("http://www.microsoft.com/en-us/dynamics/crm-customer-center/create-or-edit-an-account.aspx");
+        }
+    }
+};
+resultSet.results.push({
+    id: 0,
+    fields: ["A. Datum Corporation"]
+});
+autoCompleteControl.addOnKeyPress(() => { });
+autoCompleteControl.fireOnKeyPress();
+autoCompleteControl.removeOnKeyPress(() => {});
+autoCompleteControl.showAutoComplete(resultSet);
+autoCompleteControl.hideAutoComplete();
+
+/// Demonstrate v8.2 quick form controls
+
+const quickForm = Xrm.Page.ui.quickForms.get(0);
+quickForm.getControlType(); // == "quickform"
+quickForm.getName();
+quickForm.getParent();
+quickForm.getVisible(); // From UiCanSetVisibleElement
+quickForm.getLabel(); // From UiLabelElement
+quickForm.setLabel("Label"); // From UiLabelElement
+quickForm.refresh();
+
+// Get standard control
+const ctrl = Xrm.Page.getControl<Xrm.Page.StandardControl>("controlName");
+ctrl.getControlType();
+ctrl.getName();
+ctrl.getParent();
+ctrl.getLabel();
+ctrl.setLabel("Label name");
+ctrl.getVisible();
+ctrl.setVisible(true);
diff --git a/types/xrm/xrm-tests.ts b/types/xrm/xrm-tests.ts
index 182afa1450..6c1018ca05 100644
--- a/types/xrm/xrm-tests.ts
+++ b/types/xrm/xrm-tests.ts
@@ -175,3 +175,25 @@ ctrl.getLabel();
 ctrl.setLabel("Label name");
 ctrl.getVisible();
 ctrl.setVisible(true);
+
+// Demonstrate getEntityMetadata
+Xrm.Utility.getEntityMetadata("account", ["telephone1"]).then((metadata) => {
+    console.log(metadata.Attributes["statuscode"].optionSet[0].Label.LocalizedLabels[0].Label);
+});
+
+// Demonstrate WebAPI RetrieveMultiple
+Xrm.WebApi.retrieveMultipleRecords("contact", `?fetchXml=<fetch version='1.0' mapping='logical' distinct='false'>
+    <entity name='contact'>
+        <attribute name='fullname' />
+        <attribute name='telephone1' />
+        <attribute name='contactid' />
+        <order attribute='fullname' descending='false' />
+        <link-entity name= 'account' from='accountid' to='parentcustomerid' visible= 'false' link-type='outer' alias= 'a_dc9b80f8c78146d89fd6a3b610836975' >
+            <attribute name='accountratingcode' />
+            <attribute name='accountnumber' />
+            <attribute name='name' />
+        </link-entity>
+    </entity>
+    </fetch>`).then((response) => {
+        console.log("Query Returned : " + response.entities.length);
+    });
diff --git a/types/xsockets/tslint.json b/types/xsockets/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xsockets/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xss-filters/tslint.json b/types/xss-filters/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xss-filters/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xtend/tslint.json b/types/xtend/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xtend/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/xterm/tslint.json b/types/xterm/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/xterm/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/yamljs/tslint.json b/types/yamljs/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/yamljs/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/yandex-maps/index.d.ts b/types/yandex-maps/index.d.ts
index 21e4f0860e..94806b9254 100644
--- a/types/yandex-maps/index.d.ts
+++ b/types/yandex-maps/index.d.ts
@@ -26,9 +26,9 @@ declare namespace ymaps {
 	//[number, number]
 	//[[number, number], [number, number]]
 
-	export namespace behavior {
-		export class DblClickZoom implements IBehavior {
-			constructor(options?: IDblClickZoomOptions | undefined);
+	namespace behavior {
+		class DblClickZoom implements IBehavior {
+			constructor(options?: IDblClickZoomOptions);
 
 			events: IEventManager;
 			options: IOptionManager;
@@ -49,7 +49,7 @@ declare namespace ymaps {
 			duration?: number;
 		}
 
-		export class Drag implements IBehavior {
+		class Drag implements IBehavior {
 			constructor(options?: IDragOptions)
 
 			events: IEventManager;
@@ -74,7 +74,7 @@ declare namespace ymaps {
 			tremor?: number;
 		}
 
-		export class LeftMouseButtonMagnifier implements IBehavior {
+		class LeftMouseButtonMagnifier implements IBehavior {
 			constructor(options?: ILeftMouseButtonMagnifierOptions)
 
 			events: IEventManager;
@@ -97,7 +97,7 @@ declare namespace ymaps {
 			duration?: number;
 		}
 
-		export class MultiTouch implements IBehavior {
+		class MultiTouch implements IBehavior {
 			constructor(options?: IMultiTouchOptions)
 
 			events: IEventManager;
@@ -118,7 +118,7 @@ declare namespace ymaps {
 			tremor?: number;
 		}
 
-		export class RightMouseButtonMagnifier implements IBehavior {
+		class RightMouseButtonMagnifier implements IBehavior {
 			constructor(options?: IRightMouseButtonMagnifierOptions)
 
 			events: IEventManager;
@@ -140,7 +140,7 @@ declare namespace ymaps {
 			duration?: number;
 		}
 
-		export class RouteEditor implements IBehavior {
+		class RouteEditor implements IBehavior {
 			events: IEventManager;
 			options: IOptionManager;
 
@@ -161,7 +161,7 @@ declare namespace ymaps {
 			setState(state: string | null): void;
 		}
 
-		export class Ruler implements IBehavior {
+		class Ruler implements IBehavior {
 			constructor(options?: IRulerOptions)
 
 			events: IEventManager;
@@ -188,7 +188,7 @@ declare namespace ymaps {
 			balloonAutoPan?: boolean;
 		}
 
-		export class ScrollZoom implements IBehavior {
+		class ScrollZoom implements IBehavior {
 			constructor(options?: IScrollZoomOptions)
 
 			events: IEventManager;
@@ -210,11 +210,11 @@ declare namespace ymaps {
 			speed?: number;
 		}
 
-		export const storage: util.Storage;
+		const storage: util.Storage;
 	}
 
-	export namespace clusterer {
-		export class Balloon implements IBalloonManager<Clusterer> { //tslint:disable-line no-shadowed-variable
+	namespace clusterer {
+		class Balloon implements IBalloonManager<Clusterer> { //tslint:disable-line no-shadowed-variable
 			constructor(clusterer: Clusterer);
 
 			events: IEventManager;
@@ -246,7 +246,7 @@ declare namespace ymaps {
 			setPosition(position: number[]): Promise<Clusterer>;
 		}
 
-		export class Hint implements IHintManager<Clusterer> {
+		class Hint implements IHintManager<Clusterer> {
 			constructor(clusterer: Clusterer);
 
 			events: IEventManager;
@@ -277,8 +277,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace collection {
-		export class Item implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
+	namespace collection {
+		class Item implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
 			constructor(options?: object);
 
 			events: IEventManager;
@@ -296,8 +296,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace control {
-		export class Button implements ICustomizable, ISelectableControl {
+	namespace control {
+		class Button implements ICustomizable, ISelectableControl {
 			constructor(parameters?: IButtonParameters | string);
 
 			options: IOptionManager;
@@ -353,7 +353,7 @@ declare namespace ymaps {
 			};
 		}
 
-		export class FullscreenControl extends Button {
+		class FullscreenControl extends Button {
 			constructor(parameters?: IFullscreenControlParameters);
 
 			enterFullscreen(): void;
@@ -375,7 +375,7 @@ declare namespace ymaps {
 			};
 		}
 
-		export class GeolocationControl extends Button {
+		class GeolocationControl extends Button {
 			constructor(parameters?: IGeolocationControlParameters);
 		}
 
@@ -387,7 +387,7 @@ declare namespace ymaps {
 			options?: IBaseButtonParametersOptions;
 		}
 
-		export class ListBox implements ICollection, IControl, ICustomizable {
+		class ListBox implements ICollection, IControl, ICustomizable {
 			constructor(parameters?: IListBoxParameters);
 
 			events: IEventManager;
@@ -412,7 +412,7 @@ declare namespace ymaps {
 			};
 		}
 
-		export class ListBoxItem implements ICustomizable, ISelectableControl {
+		class ListBoxItem implements ICustomizable, ISelectableControl {
 			constructor(parameters?: IListBoxItemParameters);
 
 			options: IOptionManager;
@@ -456,8 +456,8 @@ declare namespace ymaps {
 			};
 		}
 
-		export class Manager {
-			constructor(map: Map, controls?: (string | IControl)[], options?: IManagerOptions);
+		class Manager {
+			constructor(map: Map, controls?: Array<string | IControl>, options?: IManagerOptions);
 
 			events: event.Manager;
 			options: option.Manager;
@@ -497,7 +497,7 @@ declare namespace ymaps {
 			};
 		}
 
-		export class RouteButton implements IControl, ICustomizable {
+		class RouteButton implements IControl, ICustomizable {
 			constructor(parameters?: IRouteButtonParameters);
 
 			events: IEventManager;
@@ -532,7 +532,7 @@ declare namespace ymaps {
 			};
 		}
 
-		export class RouteEditor extends Button {
+		class RouteEditor extends Button {
 			constructor(parameters?: IRouteEditorParameters);
 
 			getRoute(): router.Route;
@@ -547,7 +547,7 @@ declare namespace ymaps {
 			state?: {};
 		}
 
-		export class RulerControl extends Button {
+		class RulerControl extends Button {
 			constructor(parameters?: IRulerControlParameters);
 		}
 
@@ -567,7 +567,7 @@ declare namespace ymaps {
 			state?: {};
 		}
 
-		export class SearchControl implements IControl, ICustomizable {
+		class SearchControl implements IControl, ICustomizable {
 			constructor(parameters?: ISearchControlParameters);
 
 			events: IEventManager;
@@ -640,8 +640,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace data {
-		export class Manager implements IDataManager, IFreezable {
+	namespace data {
+		class Manager implements IDataManager, IFreezable {
 			constructor(data?: object);
 
 			events: IEventManager;
@@ -678,8 +678,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace event {
-		export class Manager implements IEventManager {
+	namespace event {
+		class Manager implements IEventManager {
 			constructor(params?: { context?: object; controllers?: IEventWorkflowController[]; parent?: IEventManager });
 
 			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
@@ -700,9 +700,9 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace geometry {
-		export namespace base {
-			export class LineString implements IBaseLineStringGeometry { //tslint:disable-line no-shadowed-variable
+	namespace geometry {
+		namespace base {
+			class LineString implements IBaseLineStringGeometry { //tslint:disable-line no-shadowed-variable
 				static fromEncodedCoordinates(encodedCoordinates: string): geometry.LineString; //tslint:disable-line function-name
 
 				static toEncodedCoordinates(geometry: geometry.LineString): string; //tslint:disable-line function-name
@@ -752,7 +752,7 @@ declare namespace ymaps {
 				fire(type: string, eventobject: object | IEvent): this;
 			}
 
-			export class Point implements IBasePointGeometry { //tslint:disable-line no-shadowed-variable
+			class Point implements IBasePointGeometry { //tslint:disable-line no-shadowed-variable
 				events: IEventManager;
 
 				getBounds(): number[][] | null;
@@ -765,7 +765,7 @@ declare namespace ymaps {
 			}
 		}
 
-		export class LineString implements ILineStringGeometry {
+		class LineString implements ILineStringGeometry {
 			constructor(coordinates?: number[][], options?: {
 				coordRendering?: "shortestPath" | "straightPath";
 				geodesic?: boolean;
@@ -830,7 +830,7 @@ declare namespace ymaps {
 			fire(type: string, eventobject: object | IEvent): this;
 		}
 
-		export class Point implements IPointGeometry {
+		class Point implements IPointGeometry {
 			constructor(coordinates?: number[] | null);
 
 			options: IOptionManager;
@@ -852,8 +852,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace geoObject {
-		export class Balloon implements IBalloonManager<GeoObject> { //tslint:disable-line no-shadowed-variable
+	namespace geoObject {
+		class Balloon implements IBalloonManager<GeoObject> { //tslint:disable-line no-shadowed-variable
 			constructor(geoObject: GeoObject);
 
 			events: IEventManager;
@@ -885,7 +885,7 @@ declare namespace ymaps {
 			setPosition(position: number[]): Promise<GeoObject>;
 		}
 
-		export class Hint implements IHintManager<GeoObject> {
+		class Hint implements IHintManager<GeoObject> {
 			constructor(geoObject: GeoObject);
 
 			events: IEventManager;
@@ -915,7 +915,7 @@ declare namespace ymaps {
 			setPosition(position: number[]): Promise<GeoObject>;
 		}
 
-		export class Sequence implements IGeoObject, IGeoObjectSequence {
+		class Sequence implements IGeoObject, IGeoObjectSequence {
 			constructor(geoObject: GeoObject);
 
 			geometry: IGeometry | null;
@@ -950,9 +950,9 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace layout {
-		export namespace templateBased {
-			export class Base implements ILayout {
+	namespace layout {
+		namespace templateBased {
+			class Base implements ILayout {
 				constructor(data: object);
 
 				events: IEventManager;
@@ -982,9 +982,9 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace map {
-		export namespace action {
-			export class Manager implements IEventEmitter {
+	namespace map {
+		namespace action {
+			class Manager implements IEventEmitter {
 				constructor(map: Map);
 
 				events: IEventManager;
@@ -1003,8 +1003,8 @@ declare namespace ymaps {
 			}
 		}
 
-		export namespace behavior { // tslint:disable-line no-shadowed-variable
-			export class Manager implements ICustomizable, IEventEmitter, IParentOnMap {
+		namespace behavior { // tslint:disable-line no-shadowed-variable
+			class Manager implements ICustomizable, IEventEmitter, IParentOnMap {
 				constructor(map: Map, behaviors?: string[][] | string[], options?: object);
 
 				options: IOptionManager;
@@ -1022,8 +1022,8 @@ declare namespace ymaps {
 			}
 		}
 
-		export namespace layer {
-			export class Manager implements ILayer, IMapObjectCollection {
+		namespace layer {
+			class Manager implements ILayer, IMapObjectCollection {
 				constructor(map: Map, options?: {
 					trafficImageZIndex?: number;
 					trafficInfoZIndex?: number;
@@ -1047,8 +1047,8 @@ declare namespace ymaps {
 			}
 		}
 
-		export namespace margin {
-			export class Accessor {
+		namespace margin {
+			class Accessor {
 				constructor(screenArea: object);
 
 				getArea(): object;
@@ -1058,7 +1058,7 @@ declare namespace ymaps {
 				setArea(screenArea: object): this;
 			}
 
-			export class Manager {
+			class Manager {
 				constructor(map: Map);
 
 				addArea(screenArea: object): Accessor;
@@ -1073,8 +1073,8 @@ declare namespace ymaps {
 			}
 		}
 
-		export namespace pane {
-			export class Manager {
+		namespace pane {
+			class Manager {
 				constructor(map: Map);
 
 				append(key: string, pane: IPane): void;
@@ -1093,7 +1093,7 @@ declare namespace ymaps {
 			}
 		}
 
-		export class Balloon implements IBalloonManager<Balloon>/*, IBalloonSharingManager*/ { //tslint:disable-line no-shadowed-variable
+		class Balloon implements IBalloonManager<Balloon>/*, IBalloonSharingManager*/ { //tslint:disable-line no-shadowed-variable
 			constructor(map: Map);
 
 			events: IEventManager;
@@ -1125,7 +1125,7 @@ declare namespace ymaps {
 			setPosition(position: number[]): Promise<Balloon>;
 		}
 
-		export class Container implements IDomEventEmitter {
+		class Container implements IDomEventEmitter {
 			constructor(parentElement: string | HTMLElement);
 
 			events: IEventManager;
@@ -1147,7 +1147,7 @@ declare namespace ymaps {
 			isFullscreen(): boolean;
 		}
 
-		export class Converter {
+		class Converter {
 			constructor(map: Map);
 
 			globalToPage(globalPixelPoint: number[]): number[];
@@ -1155,21 +1155,21 @@ declare namespace ymaps {
 			pageToGlobal(pagePixelPoint: number[]): number[];
 		}
 
-		export class Copyrights {
+		class Copyrights {
 			constructor(map: Map);
 
-			add(customCopyrights: string | HTMLElement | (string | HTMLElement)[]): ICopyrightsAccessor;
+			add(customCopyrights: string | HTMLElement | Array<string | HTMLElement>): ICopyrightsAccessor;
 
 			addProvider(provider: ICopyrightsProvider): this;
 
-			get(point?: number[], zoom?: number): Promise<(string | HTMLElement)[]>;
+			get(point?: number[], zoom?: number): Promise<Array<string | HTMLElement>>;
 
 			getPromoLink(): string;
 
 			removeProvider(provider: ICopyrightsProvider): this;
 		}
 
-		export class GeoObjects implements IGeoObjectCollection {
+		class GeoObjects implements IGeoObjectCollection {
 			constructor(map: Map, options?: object);
 
 			options: IOptionManager;
@@ -1202,7 +1202,7 @@ declare namespace ymaps {
 			getMap(): Map;
 		}
 
-		export class Hint implements IHintManager<Hint>/*, IHintSharingManager*/ {
+		class Hint implements IHintManager<Hint>/*, IHintSharingManager*/ {
 			constructor(map: Map);
 
 			events: IEventManager;
@@ -1232,7 +1232,7 @@ declare namespace ymaps {
 			setPosition(position: number[]): Promise<Hint>;
 		}
 
-		export class ZoomRange implements IEventEmitter {
+		class ZoomRange implements IEventEmitter {
 			constructor(map: Map, constraints: number[]);
 
 			events: IEventManager;
@@ -1243,9 +1243,9 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace multiRouter {
-		export namespace driving {
-			export class Path implements IGeoObject {
+	namespace multiRouter {
+		namespace driving {
+			class Path implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: data.Manager;
 				state: IDataManager;
@@ -1266,7 +1266,7 @@ declare namespace ymaps {
 				getSegments(): GeoObjectCollection;
 			}
 
-			export class PathModel implements IEventEmitter {
+			class PathModel implements IEventEmitter {
 				events: IEventManager;
 				properties: data.Manager;
 				route: RouteModel;
@@ -1280,7 +1280,7 @@ declare namespace ymaps {
 				update(pathJson: object): void;
 			}
 
-			export class Route implements IGeoObject {
+			class Route implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: IDataManager;
 				state: IDataManager;
@@ -1300,7 +1300,7 @@ declare namespace ymaps {
 				getPaths(): GeoObjectCollection;
 			}
 
-			export class RouteModel implements IEventEmitter {
+			class RouteModel implements IEventEmitter {
 				events: IEventManager;
 				multiRoute: MultiRouteModel;
 				properties: data.Manager;
@@ -1314,7 +1314,7 @@ declare namespace ymaps {
 				getType(): string;
 			}
 
-			export class Segment implements IGeoObject {
+			class Segment implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: data.Manager;
 				state: IDataManager;
@@ -1332,7 +1332,7 @@ declare namespace ymaps {
 				getMap(): Map;
 			}
 
-			export class SegmentModel implements IEventEmitter {
+			class SegmentModel implements IEventEmitter {
 				events: IEventManager;
 				geometry: geometry.base.LineString;
 				path: PathModel;
@@ -1347,8 +1347,8 @@ declare namespace ymaps {
 			}
 		}
 
-		export namespace masstransit {
-			export class Path implements IGeoObject {
+		namespace masstransit {
+			class Path implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: data.Manager;
 				state: IDataManager;
@@ -1371,21 +1371,21 @@ declare namespace ymaps {
 				getSegments(): GeoObjectCollection;
 			}
 
-			export class PathModel implements IEventEmitter {
+			class PathModel implements IEventEmitter {
 				events: IEventManager;
 				properties: data.Manager;
 				route: RouteModel;
 
 				destroy(): void;
 
-				getSegments(): (TransferSegmentModel | TransportSegmentModel | WalkSegmentModel)[];
+				getSegments(): Array<TransferSegmentModel | TransportSegmentModel | WalkSegmentModel>;
 
 				getType(): string;
 
 				update(pathJson: object): void;
 			}
 
-			export class Route implements IGeoObject {
+			class Route implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: data.Manager;
 				model: RouteModel;
@@ -1406,7 +1406,7 @@ declare namespace ymaps {
 				getPaths(): GeoObjectCollection;
 			}
 
-			export class RouteModel implements IEventEmitter {
+			class RouteModel implements IEventEmitter {
 				events: IEventManager;
 				multiRoute: MultiRouteModel;
 				properties: data.Manager;
@@ -1420,7 +1420,7 @@ declare namespace ymaps {
 				update(routeJson: object): void;
 			}
 
-			export class StopModel implements IEventEmitter {
+			class StopModel implements IEventEmitter {
 				events: IEventManager;
 				geometry: geometry.base.Point;
 				properties: data.Manager;
@@ -1429,7 +1429,7 @@ declare namespace ymaps {
 				update(stopJson: object): void;
 			}
 
-			export class TransferSegment implements IGeoObject {
+			class TransferSegment implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: data.Manager;
 				state: IDataManager;
@@ -1448,7 +1448,7 @@ declare namespace ymaps {
 				getMap(): Map;
 			}
 
-			export class TransferSegmentModel implements IEventEmitter {
+			class TransferSegmentModel implements IEventEmitter {
 				events: IEventManager;
 				geometry: geometry.base.LineString;
 				path: PathModel;
@@ -1459,7 +1459,7 @@ declare namespace ymaps {
 				getType(): string;
 			}
 
-			export class TransportSegment implements IGeoObject {
+			class TransportSegment implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: data.Manager;
 				state: IDataManager;
@@ -1478,7 +1478,7 @@ declare namespace ymaps {
 				getMap(): Map;
 			}
 
-			export class TransportSegmentModel implements IEventEmitter {
+			class TransportSegmentModel implements IEventEmitter {
 				events: IEventManager;
 				geometry: geometry.base.LineString;
 				path: PathModel;
@@ -1493,7 +1493,7 @@ declare namespace ymaps {
 				update(segmentJson: object): void;
 			}
 
-			export class WalkSegment implements IGeoObject {
+			class WalkSegment implements IGeoObject {
 				geometry: IGeometry | null;
 				properties: data.Manager;
 				state: IDataManager;
@@ -1512,7 +1512,7 @@ declare namespace ymaps {
 				getMap(): Map;
 			}
 
-			export class WalkSegmentModel implements IEventEmitter {
+			class WalkSegmentModel implements IEventEmitter {
 				events: IEventManager;
 				geometry: geometry.base.LineString;
 				path: PathModel;
@@ -1524,7 +1524,7 @@ declare namespace ymaps {
 			}
 		}
 
-		export class EditorAddon implements ICustomizable, IEventEmitter {
+		class EditorAddon implements ICustomizable, IEventEmitter {
 			options: IOptionManager;
 			events: IEventManager;
 			state: data.Manager;
@@ -1536,7 +1536,7 @@ declare namespace ymaps {
 			stop(): void;
 		}
 
-		export class MultiRoute implements IGeoObject {
+		class MultiRoute implements IGeoObject {
 			constructor(model: MultiRouteModel | IMultiRouteModelJson, options?: {
 				activeRouteAutoSelection?: boolean;
 				boundsAutoApply?: boolean;
@@ -1580,7 +1580,7 @@ declare namespace ymaps {
 			setActiveRoute(route: driving.Route | masstransit.Route | null): void;
 		}
 
-		export class MultiRouteModel implements IEventEmitter {
+		class MultiRouteModel implements IEventEmitter {
 			constructor(referencePoints: IMultiRouteReferencePoint[], params?: IMultiRouteParams);
 
 			events: IEventManager;
@@ -1588,13 +1588,13 @@ declare namespace ymaps {
 
 			destroy(): void;
 
-			getAllPoints(): (WayPointModel | ViaPointModel)[];
+			getAllPoints(): Array<WayPointModel | ViaPointModel>;
 
 			getJson(): object;
 
 			getParams(): IMultiRouteParams;
 
-			getPoints(): (WayPointModel | ViaPointModel)[];
+			getPoints(): Array<WayPointModel | ViaPointModel>;
 
 			getReferencePointIndexes(): object;
 
@@ -1611,7 +1611,7 @@ declare namespace ymaps {
 			setReferencePoints(referencePoints: IMultiRouteReferencePoint[], viaIndexes?: number[], clearRequests?: boolean): void;
 		}
 
-		export class ViaPoint implements IGeoObject {
+		class ViaPoint implements IGeoObject {
 			geometry: IGeometry | null;
 			properties: data.Manager;
 			state: IDataManager;
@@ -1629,7 +1629,7 @@ declare namespace ymaps {
 			getMap(): Map;
 		}
 
-		export class ViaPointModel implements IEventEmitter {
+		class ViaPointModel implements IEventEmitter {
 			events: IEventManager;
 			geometry: geometry.base.Point;
 			multiRoute: MultiRouteModel;
@@ -1646,7 +1646,7 @@ declare namespace ymaps {
 			update(viaPointJson: object): void;
 		}
 
-		export class WayPoint implements IGeoObject {
+		class WayPoint implements IGeoObject {
 			geometry: IGeometry | null;
 			properties: data.Manager;
 			state: IDataManager;
@@ -1665,7 +1665,7 @@ declare namespace ymaps {
 			getMap(): Map;
 		}
 
-		export class WayPointModel implements IEventEmitter {
+		class WayPointModel implements IEventEmitter {
 			events: IEventManager;
 			geometry: geometry.base.Point;
 			multiRoute: MultiRouteModel;
@@ -1683,8 +1683,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace option {
-		export class Manager implements IOptionManager {
+	namespace option {
+		class Manager implements IOptionManager {
 			constructor(options?: object, parent?: IOptionManager, name?: string);
 
 			events: IEventManager;
@@ -1727,8 +1727,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace panorama {
-		export class Manager implements IEventEmitter {
+	namespace panorama {
+		class Manager implements IEventEmitter {
 			events: IEventManager;
 
 			closePlayer(): void;
@@ -1744,7 +1744,7 @@ declare namespace ymaps {
 			openPlayer(panorama: IPanorama[] | number): Promise<void>;
 		}
 
-		export class Player implements IEventEmitter {
+		class Player implements IEventEmitter {
 			constructor(element: HTMLElement | string, panorama: IPanorama, options?: {
 				autoFitToViewport?: "none" | "ifNull" | "always";
 				controls?: string[];
@@ -1783,8 +1783,8 @@ declare namespace ymaps {
 		}
 	}
 
-	export namespace router {
-		export class Editor implements ICustomizable, IEventEmitter {
+	namespace router {
+		class Editor implements ICustomizable, IEventEmitter {
 			options: IOptionManager;
 			events: IEventManager;
 
@@ -1800,7 +1800,7 @@ declare namespace ymaps {
 			stop(): void;
 		}
 
-		export abstract class Route implements IGeoObject {
+		abstract class Route implements IGeoObject {
 			geometry: IGeometry | null;
 			properties: IDataManager;
 			state: IDataManager;
@@ -1838,7 +1838,7 @@ declare namespace ymaps {
 		}
 	}
 
-	export class Balloon extends Popup<Balloon> implements IBaloon<Balloon> {
+	class Balloon extends Popup<Balloon> implements IBaloon<Balloon> {
 		constructor(map: Map, options?: IBalloonOptions);
 
 		getData(): object;
@@ -1889,7 +1889,7 @@ declare namespace ymaps {
 		shadowOffset?: number[];
 	}
 
-	export class Circle implements GeoObject {
+	class Circle implements GeoObject {
 		constructor(geometry: ICircleGeometry[][][][] | number[][] | object, properties?: object | IDataManager, options?: ICircleOptions)
 
 		balloon: geoObject.Balloon;
@@ -1949,7 +1949,7 @@ declare namespace ymaps {
 		zIndexHover?: number;
 	}
 
-	export class Clusterer implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
+	class Clusterer implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
 		constructor(options?: IClustererOptions);
 
 		events: IEventManager;
@@ -1982,7 +1982,7 @@ declare namespace ymaps {
 		zoomMargin?: number[][] | number[] | number;
 	}
 
-	export class ClusterPlacemark implements IGeoObject, collection.Item {
+	class ClusterPlacemark implements IGeoObject, collection.Item {
 		constructor(geometry: number[] | object | IPointGeometry, properties: IClusterPlacemarkProperties, options?: IClusterPlacemarkOptions);
 
 		geometry: IGeometry | null;
@@ -2026,12 +2026,12 @@ declare namespace ymaps {
 		iconColor?: string;
 		iconContentLayout?: string | IClassConstructor<ILayout>;
 		iconLayout?: string | IClassConstructor<ILayout>;
-		icons?: {
+		icons?: Array<{
 			href: string;
 			size: number[];
 			ooffset: number[];
 			shape?: IShape | IGeometryJson;
-		}[];
+		}>;
 		iconShape?: IGeometryJson;
 		interactivityModel?: InteractivityModelKey;
 		numbers?: number[];
@@ -2041,7 +2041,7 @@ declare namespace ymaps {
 		zIndexHover?: number;
 	}
 
-	export class Collection implements ICollection, collection.Item {
+	class Collection implements ICollection, collection.Item {
 		constructor(options?: object);
 
 		events: IEventManager;
@@ -2076,7 +2076,7 @@ declare namespace ymaps {
 		removeAll(): this;
 	}
 
-	export class Event implements IEvent {
+	class Event implements IEvent {
 		constructor(originalEvent: object, sourceEvent: IEvent);
 
 		allowMapEvent(): void;
@@ -2102,7 +2102,7 @@ declare namespace ymaps {
 		stopPropagation(): boolean;
 	}
 
-	export class GeoObject implements IGeoObject {
+	class GeoObject implements IGeoObject {
 		constructor(feature?: IGeoObjectFeature, options?: IGeoObjectOptions);
 
 		geometry: IGeometry | null;
@@ -2161,7 +2161,7 @@ declare namespace ymaps {
 		setMapCursorInDragging?: boolean;
 	}
 
-	export class GeoObjectCollection implements IGeoObject, IGeoObjectCollection {
+	class GeoObjectCollection implements IGeoObject, IGeoObjectCollection {
 		constructor(feature?: {
 			children?: IGeoObject[];
 			geometry?: IGeometry | object;
@@ -2211,7 +2211,7 @@ declare namespace ymaps {
 		toArray(): IGeoObject[];
 	}
 
-	export class Layer implements ILayer, IParentOnMap, IPositioningContext {
+	class Layer implements ILayer, IParentOnMap, IPositioningContext {
 		constructor(tileUrlTemplate: string | ((tileNumber: number[], tileZoom: number) => string));
 
 		events: IEventManager;
@@ -2230,7 +2230,7 @@ declare namespace ymaps {
 		getMap(): Map;
 	}
 
-	export class Map implements IDomEventEmitter {
+	class Map implements IDomEventEmitter {
 		constructor(parentElement: HTMLElement | string, state: IMapState, options?: IMapOptions)
 
 		action: map.action.Manager;
@@ -2304,8 +2304,8 @@ declare namespace ymaps {
 		safe?: boolean;
 	}
 
-	export class MapType {
-		constructor(name: string, layers: (IClassConstructor<Layer> | string)[])
+	class MapType {
+		constructor(name: string, layers: Array<IClassConstructor<Layer> | string>)
 	}
 
 	interface IMapState {
@@ -2336,7 +2336,7 @@ declare namespace ymaps {
 		yandexMapDisablePoiInteractivity?: boolean;
 	}
 
-	export class Placemark extends GeoObject {
+	class Placemark extends GeoObject {
 		constructor(geometry: number[] | object | IPointGeometry, properties: object | IDataManager, options?: IPlacemarkOptions)
 	}
 
@@ -2347,7 +2347,7 @@ declare namespace ymaps {
 		[index: string]: any;
 	}
 
-	export class Popup<T> implements IPopup<T> {
+	class Popup<T> implements IPopup<T> {
 		constructor(map: Map, options?: IPopupOptions);
 
 		options: IOptionManager;
@@ -2381,7 +2381,7 @@ declare namespace ymaps {
 		zIndex?: number;
 	}
 
-	export function ready(successCallback?: () => any | IReadyobject, errorCallback?: () => any, context?: object): Promise<void>;
+	function ready(successCallback?: () => any | IReadyobject, errorCallback?: () => any, context?: object): Promise<void>;
 
 	interface IReadyobject {
 		require?: string[];
@@ -2392,13 +2392,13 @@ declare namespace ymaps {
 		errorCallback?(): void;
 	}
 
-	export namespace templateLayoutFactory {
-		export function createClass(template: string, overrides?: object, staticMethods?: object): IClassConstructor<layout.templateBased.Base>;
+	namespace templateLayoutFactory {
+		function createClass(template: string, overrides?: object, staticMethods?: object): IClassConstructor<layout.templateBased.Base>;
 	}
 
-	export namespace util {
-		export namespace cursor {
-			export class Accessor {
+	namespace util {
+		namespace cursor {
+			class Accessor {
 				constructor(key: string);
 
 				getKey(): string;
@@ -2408,14 +2408,14 @@ declare namespace ymaps {
 				setKey(): void;
 			}
 
-			export class Manager {
+			class Manager {
 				constructor(element: HTMLElement);
 
 				push(key: string): Accessor;
 			}
 		}
 
-		export class Storage {
+		class Storage {
 			add(key: string, object: object): this;
 
 			get(key: string | object): object | string;
@@ -2426,27 +2426,27 @@ declare namespace ymaps {
 
 	/*Interfaces*/
 
-	export interface IBaloon<T> extends IPopup<T>, ICustomizable, IChild<T>, IFreezable {
+	interface IBaloon<T> extends IPopup<T>, ICustomizable, IChild<T>, IFreezable {
 		autoPan(): Promise<T>;
 	}
 
-	export interface IBalloonManager<T> extends IPopupManager<T> {
+	interface IBalloonManager<T> extends IPopupManager<T> {
 		autoPan(): Promise<T>;
 	}
 
-	export interface IBaseGeometry extends IEventEmitter {
+	interface IBaseGeometry extends IEventEmitter {
 		getBounds(): number[][] | null;
 
 		getType(): string;
 	}
 
-	export interface IBaseLineStringGeometry extends IBaseGeometry, ILineStringGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IBaseLineStringGeometry extends IBaseGeometry, ILineStringGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IBasePointGeometry extends IBaseGeometry, IPointGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IBasePointGeometry extends IBaseGeometry, IPointGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IBehavior extends IChildOnMap, ICustomizable {
+	interface IBehavior extends IChildOnMap, ICustomizable {
 		disable(): void;
 
 		enable(): void;
@@ -2454,19 +2454,19 @@ declare namespace ymaps {
 		isEnabled(): boolean;
 	}
 
-	export interface IChild<T> extends IEventEmitter {
+	interface IChild<T> extends IEventEmitter {
 		getParent(): object | null;
 
 		setParent(parent: object | null): this;
 	}
 
-	export interface IChildOnMap extends IChild<IControlParent> { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IChildOnMap extends IChild<IControlParent> { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface ICircleGeometry extends ICircleGeometryAccess, IGeometry { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface ICircleGeometry extends ICircleGeometryAccess, IGeometry { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface ICircleGeometryAccess extends IFreezable {
+	interface ICircleGeometryAccess extends IFreezable {
 		contains(position: number[]): boolean;
 
 		getClosest(anchorPosition: number[]): object;
@@ -2480,7 +2480,7 @@ declare namespace ymaps {
 		setRadius(radius: number): this;
 	}
 
-	export interface ICollection extends IEventEmitter {
+	interface ICollection extends IEventEmitter {
 		add(object: object): this;
 
 		getIterator(): IIterator;
@@ -2488,15 +2488,15 @@ declare namespace ymaps {
 		remove(object: object): this;
 	}
 
-	export interface IControl extends IChildOnMap { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IControl extends IChildOnMap { //tslint:disable-line no-empty-interface no-empty-interfaces
 		// new (options?: object);
 	}
 
-	export interface IControlParent extends IParentOnMap {
+	interface IControlParent extends IParentOnMap {
 		getChildElement(child: IControl): Promise<HTMLElement>;
 	}
 
-	export interface ICoordSystem {
+	interface ICoordSystem {
 		getDistance(point1: number[], point2: number[]): number;
 
 		solveDirectProblem(startPoint: number[], direction: number[], distance: number): object;
@@ -2504,29 +2504,29 @@ declare namespace ymaps {
 		solveInverseProblem(startPoint: number[], endPoint: number[], reverseDirection?: boolean): object;
 	}
 
-	export interface ICopyrightsAccessor extends ICopyrightsProvider { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface ICopyrightsAccessor extends ICopyrightsProvider { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface ICopyrightsProvider extends IEventEmitter {
-		getCopyrights(coords: number[], zoom: number): Promise<(string | HTMLElement)[]>;
+	interface ICopyrightsProvider extends IEventEmitter {
+		getCopyrights(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
 
 		remove(): void;
 
-		setCopyrights(copyrights: string | HTMLElement | (string | HTMLElement)[]): void;
+		setCopyrights(copyrights: string | HTMLElement | Array<string | HTMLElement>): void;
 	}
 
-	export interface ICustomizable extends IEventEmitter {
+	interface ICustomizable extends IEventEmitter {
 		options: IOptionManager;
 	}
 
-	export interface IDataManager extends IEventEmitter {
+	interface IDataManager extends IEventEmitter {
 		get(path: string, defaultValue: object): object;
 	}
 
-	export interface IDomEventEmitter extends IEventEmitter { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IDomEventEmitter extends IEventEmitter { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IEvent {
+	interface IEvent {
 		allowMapEvent(): void;
 
 		callMethod(name: string): void;
@@ -2550,17 +2550,17 @@ declare namespace ymaps {
 		stopPropagation(): boolean;
 	}
 
-	export interface IEventController {
+	interface IEventController {
 		onStartListening?(events: IEventManager, type: string): void;
 
 		onStopListening?(events: IEventManager, type: string): void;
 	}
 
-	export interface IEventEmitter {
+	interface IEventEmitter {
 		events: IEventManager;
 	}
 
-	export interface IEventGroup {
+	interface IEventGroup {
 		add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
 
 		remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
@@ -2568,7 +2568,7 @@ declare namespace ymaps {
 		removeAll(): this;
 	}
 
-	export interface IEventManager extends IEventTrigger {
+	interface IEventManager extends IEventTrigger {
 		add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
 
 		getParent(): object | null;
@@ -2580,20 +2580,20 @@ declare namespace ymaps {
 		setParent(parent: object | null): this;
 	}
 
-	export interface IEventTrigger {
+	interface IEventTrigger {
 		fire(type: string, eventobject: object | IEvent): this;
 	}
 
-	export interface IEventWorkflowController extends IEventController {
+	interface IEventWorkflowController extends IEventController {
 		onAfterEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
 
 		onBeforeEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
 	}
 
-	export interface IExpandableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IExpandableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IFreezable extends IEventManager {
+	interface IFreezable extends IEventManager {
 		freeze(): IFreezable;
 
 		isFrozen(): boolean;
@@ -2601,13 +2601,13 @@ declare namespace ymaps {
 		unfreeze(): IFreezable;
 	}
 
-	export interface IGeocodeProvider {
+	interface IGeocodeProvider {
 		geocode(request: string, options?: { boundedBy?: number[][], results?: number, skip?: number, strictBounds?: boolean }): Promise<object>;
 
 		suggest(request: string, options?: { boundedBy?: number[][], results?: number, strictBounds?: boolean }): Promise<object>;
 	}
 
-	export interface IGeometry extends IBaseGeometry, ICustomizable {
+	interface IGeometry extends IBaseGeometry, ICustomizable {
 		getMap(): Map | null;
 
 		getPixelGeometry(options?: object): IPixelGeometry;
@@ -2615,17 +2615,17 @@ declare namespace ymaps {
 		setMap(map: Map): void;
 	}
 
-	export interface IGeometryEditor extends ICustomizable, IEventEmitter {
+	interface IGeometryEditor extends ICustomizable, IEventEmitter {
 		startEditing(): void;
 
 		stopEditing(): void;
 	}
 
-	export interface IGeometryJson {
+	interface IGeometryJson {
 		type: string;
 	}
 
-	export interface IGeoObject extends IChildOnMap, ICustomizable, IDomEventEmitter, IParentOnMap {
+	interface IGeoObject extends IChildOnMap, ICustomizable, IDomEventEmitter, IParentOnMap {
 		geometry: IGeometry | null;
 		properties: IDataManager;
 		state: IDataManager;
@@ -2635,7 +2635,7 @@ declare namespace ymaps {
 		getOverlaySync(): IOverlay | null;
 	}
 
-	export interface IGeoObjectCollection extends ICustomizable, IEventEmitter, IParentOnMap {
+	interface IGeoObjectCollection extends ICustomizable, IEventEmitter, IParentOnMap {
 		add(child: IGeoObject, index?: number): this;
 
 		each(callback: (object: IGeoObject) => void, context: object): void;
@@ -2661,7 +2661,7 @@ declare namespace ymaps {
 		splice(index: number, length: number): this;
 	}
 
-	export interface IGeoObjectSequence extends ICustomizable, IEventEmitter, IParentOnMap {
+	interface IGeoObjectSequence extends ICustomizable, IEventEmitter, IParentOnMap {
 		each(callback: (geoObject: IGeoObject) => void, context?: object): void;
 
 		get(index: number): IGeoObject;
@@ -2677,22 +2677,22 @@ declare namespace ymaps {
 		indexOf(geoObject: IGeoObject): number;
 	}
 
-	export interface IHintManager<T> extends IPopupManager<T> { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IHintManager<T> extends IPopupManager<T> { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IIterator {
+	interface IIterator {
 		getNext(): object | null;
 	}
 
-	export interface ILayer extends IChildOnMap, ICustomizable, IEventEmitter {
+	interface ILayer extends IChildOnMap, ICustomizable, IEventEmitter {
 		getBrightness?(): number;
 
-		getCopyrights?(coords: number[], zoom: number): Promise<(string | HTMLElement)[]>;
+		getCopyrights?(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
 
 		getZoomRange?(point: number[]): Promise<number[]>;
 	}
 
-	export interface ILayout extends IDomEventEmitter {
+	interface ILayout extends IDomEventEmitter {
 		// new (data: object);
 		destroy(): void;
 
@@ -2709,10 +2709,10 @@ declare namespace ymaps {
 		setParentElement(parent: HTMLElement | null): void;
 	}
 
-	export interface ILineStringGeometry extends IGeometry, ILineStringGeometryAccess {  //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface ILineStringGeometry extends IGeometry, ILineStringGeometryAccess {  //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface ILineStringGeometryAccess extends IFreezable {
+	interface ILineStringGeometryAccess extends IFreezable {
 		get(index: number): number[];
 
 		getChildGeometry(index: number): IPointGeometryAccess;
@@ -2734,21 +2734,21 @@ declare namespace ymaps {
 		splice(index: number, length: number): number[][];
 	}
 
-	export interface IMapAction extends IEventEmitter {
+	interface IMapAction extends IEventEmitter {
 		begin(mapActionManager: map.action.Manager): void;
 
 		end(): void;
 	}
 
-	export interface IMapObjectCollection extends ICollection, ICustomizable, IParentOnMap {  //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IMapObjectCollection extends ICollection, ICustomizable, IParentOnMap {  //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IMultiRouteModelJson {
+	interface IMultiRouteModelJson {
 		params: IMultiRouteParams;
 		referencePoints: IMultiRouteReferencePoint[];
 	}
 
-	export interface IMultiRouteParams {
+	interface IMultiRouteParams {
 		avoidTrafficJams?: boolean;
 		boundedBy?: number[][] | null;
 		requestSendInterval?: string | number;
@@ -2760,9 +2760,9 @@ declare namespace ymaps {
 		viaIndexes?: number[];
 	}
 
-	export type IMultiRouteReferencePoint = string | number[] | geometry.Point;
+	type IMultiRouteReferencePoint = string | number[] | geometry.Point;
 
-	export interface IOptionManager extends IChild<IOptionManager>, IEventEmitter, IFreezable {
+	interface IOptionManager extends IChild<IOptionManager>, IEventEmitter, IFreezable {
 		get(key: string, defaultValue: object): object;
 
 		getAll(): object;
@@ -2776,7 +2776,7 @@ declare namespace ymaps {
 		setName(name: string): void;
 	}
 
-	export interface IOverlay extends ICustomizable, IDomEventEmitter {
+	interface IOverlay extends ICustomizable, IDomEventEmitter {
 		getData(): object;
 
 		getGeometry(): IPixelGeometry;
@@ -2794,7 +2794,7 @@ declare namespace ymaps {
 		setMap(map: Map | null): void;
 	}
 
-	export interface IPane extends IEventEmitter {
+	interface IPane extends IEventEmitter {
 		destroy(): void;
 
 		getElement(): HTMLElement;
@@ -2806,7 +2806,7 @@ declare namespace ymaps {
 		getZIndex(): number;
 	}
 
-	export interface IPanorama {
+	interface IPanorama {
 		getAngularBBox(): number[];
 
 		getConnectionArrows(): IPanoramaConnectionArrow[];
@@ -2832,11 +2832,11 @@ declare namespace ymaps {
 		getTileSize(): number[];
 	}
 
-	export interface IPanoramaConnection {
+	interface IPanoramaConnection {
 		getConnectedPanorama(): Promise<IPanorama>;
 	}
 
-	export interface IPanoramaConnectionArrow extends IPanoramaConnection {
+	interface IPanoramaConnectionArrow extends IPanoramaConnection {
 		properties: data.Manager;
 
 		getDirection(): number[];
@@ -2844,10 +2844,10 @@ declare namespace ymaps {
 		getPanorama(): IPanorama;
 	}
 
-	export interface IPanoramaConnectionMarker extends IPanoramaConnection, IPanoramaMarker {  //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IPanoramaConnectionMarker extends IPanoramaConnection, IPanoramaMarker {  //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IPanoramaGraph {
+	interface IPanoramaGraph {
 		getEdges(): IPanoramaGraphEdge[];
 
 		getNodes(): IPanoramaGraphEdge[];
@@ -2855,15 +2855,15 @@ declare namespace ymaps {
 		getPanorama(): IPanorama;
 	}
 
-	export interface IPanoramaGraphEdge {
+	interface IPanoramaGraphEdge {
 		getEndNodes(): IPanoramaGraphNode[];
 	}
 
-	export interface IPanoramaGraphNode {
+	interface IPanoramaGraphNode {
 		getConnectedPanorama(): Promise<IPanorama>;
 	}
 
-	export interface IPanoramaMarker {
+	interface IPanoramaMarker {
 		properties: data.Manager;
 
 		getIconSet(): Promise<IPanoramaMarkerIconSet>;
@@ -2873,35 +2873,35 @@ declare namespace ymaps {
 		getPosition(): number[];
 	}
 
-	export interface IPanoramaMarkerIcon {
+	interface IPanoramaMarkerIcon {
 		image: HTMLCanvasElement | HTMLImageElement;
 		offset: number[];
 	}
 
-	export interface IPanoramaMarkerIconSet {
+	interface IPanoramaMarkerIconSet {
 		default: IPanoramaMarkerIcon | null;
 		expanded: IPanoramaMarkerIcon | null;
 		expandedHovered: IPanoramaMarkerIcon | null;
 		hovered: IPanoramaMarkerIcon | null;
 	}
 
-	export interface IPanoramaTileLevel {
+	interface IPanoramaTileLevel {
 		getImageSize(): number[];
 
 		getTileUrl(x: number, y: number): string;
 	}
 
-	export interface IParentOnMap {
+	interface IParentOnMap {
 		getMap(): Map;
 	}
 
-	export interface IPixelCircleGeometry extends IPixelGeometry {
+	interface IPixelCircleGeometry extends IPixelGeometry {
 		getCoordinates(): number[];
 
 		getRadius(): number;
 	}
 
-	export interface IPixelLineStringGeometry extends IPixelGeometry {
+	interface IPixelLineStringGeometry extends IPixelGeometry {
 		getClosest(anchorPosition: number[]): object;
 
 		getCoordinates(): number[][];
@@ -2909,7 +2909,7 @@ declare namespace ymaps {
 		getLength(): number;
 	}
 
-	export interface IPixelGeometry extends IBaseGeometry {
+	interface IPixelGeometry extends IBaseGeometry {
 		equals(geometry: IPixelGeometry): boolean;
 
 		getMetaData(): object;
@@ -2919,16 +2919,16 @@ declare namespace ymaps {
 		shift(offset: number[]): IPixelGeometry;
 	}
 
-	export interface IPointGeometry extends IGeometry, IPointGeometryAccess { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface IPointGeometry extends IGeometry, IPointGeometryAccess { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IPointGeometryAccess {
+	interface IPointGeometryAccess {
 		getCoordinates(): number[] | null;
 
 		setCoordinates(coordinates: number[] | null): this;
 	}
 
-	export interface IPopup<T> extends ICustomizable, IEventEmitter {
+	interface IPopup<T> extends ICustomizable, IEventEmitter {
 		close(force?: boolean): Promise<T>;
 
 		getData(): object;
@@ -2948,7 +2948,7 @@ declare namespace ymaps {
 		setPosition(position: number[]): Promise<T>;
 	}
 
-	export interface IPopupManager<T> extends IEventEmitter {
+	interface IPopupManager<T> extends IEventEmitter {
 		close(force?: boolean): Promise<T>;
 
 		destroy(): void;
@@ -2974,7 +2974,7 @@ declare namespace ymaps {
 		setPosition(position: number[]): Promise<T>;
 	}
 
-	export interface IPositioningContext {
+	interface IPositioningContext {
 		fromClientPixels(clientPixelPoint: number[]): number[];
 
 		getZoom(): number;
@@ -2982,7 +2982,7 @@ declare namespace ymaps {
 		toClientPixels(globalPixelPoint: number[]): number[];
 	}
 
-	export interface IProjection {
+	interface IProjection {
 		fromGlobalPixels(globalPixelPoint: number[], zoom: number): number[];
 
 		getCoordSystem(): ICoordSystem;
@@ -2992,7 +2992,7 @@ declare namespace ymaps {
 		toGlobalPixels(coordPoint: number[], zoom: number): number[];
 	}
 
-	export interface IRoutePanel {
+	interface IRoutePanel {
 		options: IOptionManager;
 		state: IDataManager;
 
@@ -3001,10 +3001,10 @@ declare namespace ymaps {
 		switchPoints(): void;
 	}
 
-	export interface ISearchControlLayout extends IExpandableControlLayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface ISearchControlLayout extends IExpandableControlLayout { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface ISelectableControl extends IControl {
+	interface ISelectableControl extends IControl {
 		deselect(): void;
 
 		disable(): void;
@@ -3018,10 +3018,10 @@ declare namespace ymaps {
 		select(): void;
 	}
 
-	export interface ISelectableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+	interface ISelectableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
 	}
 
-	export interface IShape {
+	interface IShape {
 		contains(position: number[]): boolean;
 
 		equals(shape: IShape): boolean;
@@ -3036,4 +3036,12 @@ declare namespace ymaps {
 
 		shift(offset: number[]): IShape;
 	}
+	class Monitor {
+    	constructor(dataManager: IDataManager | IOptionManager);
+   		add(name: string[] | string, changeCallback: (event: (object | IEvent)) => void, context?: any, params?: any): Monitor;
+    	forceChange(): Monitor;
+    	get(name: string): any;
+    	remove(name: string): Monitor;
+    	removeAll(): Monitor;
+	}
 }
diff --git a/types/yandex-maps/tslint.json b/types/yandex-maps/tslint.json
index 80826ab363..f9675c6e21 100644
--- a/types/yandex-maps/tslint.json
+++ b/types/yandex-maps/tslint.json
@@ -1,10 +1,10 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "array-type": false,
-        "interface-name": false,
-        "comment-format": false,
+        // TODOs
         "no-any-union": false,
-        "strict-export-declare-modifiers": false
+        "no-unnecessary-class": false,
+        "interface-name": false,
+        "comment-format": false
     }
 }
diff --git a/types/yandex-money-sdk/tslint.json b/types/yandex-money-sdk/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/yandex-money-sdk/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index d99529a0d0..d4a47c84e7 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -1,60 +1,161 @@
-// Type definitions for yargs 8.0
+// Type definitions for yargs 10.0
 // Project: https://github.com/chevex/yargs
 // Definitions by: Martin Poelstra <https://github.com/poelstra>
 //                 Mizunashi Mana <https://github.com/mizunashi-mana>
 //                 Jeffery Grajkowski <https://github.com/pushplay>
 //                 Jeff Kenney <https://github.com/jeffkenney>
+//                 Jimi (Dimitris) Charalampidis <https://github.com/JimiC>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
+// The following TSLint rules have been disabled:
 // unified-signatures: Because there is useful information in the argument names of the overloaded signatures
-// prefer-method-signature: Because it makes more sense for optional functions provided in options objects
-/* tslint:disable:unified-signatures prefer-method-signature */
+
+// Convention:
+// Use 'union types' when:
+//  - parameter types have similar signature type (i.e. 'string | string[]')
+//  - parameter names have the same semantic meaning (i.e. ['command', 'commands'] , ['key', 'keys'])
+//    An example for not using 'union types' is the declaration of 'env' where `prefix` and `enable` parameters
+//    have different semantics. On the other hand, in the declaration of 'usage', a `command: string` parameter
+//    has the same semantic meaning with declaring an overload method by using `commands: string[]`, thus
+//    it's prefered to use `command: string | string[]`
+// Use parameterless declaration instead of declaring all parameters optional,
+// when all parameters are optional and more than one
 
 declare namespace yargs {
     interface Argv {
-        argv: Arguments;
-        (args?: string[], cwd?: string): Arguments;
-        parse(args: string | string[], context?: object, parseCallback?: ParseCallback): Arguments;
+        (): Arguments;
+        (args: string[], cwd?: string): Arguments;
 
-        reset(): Argv;
-
-        locale(): string;
-        locale(loc: string): Argv;
-
-        detectLocale(detect: boolean): Argv;
-
-        terminalWidth(): number;
-
-        alias(shortName: string, longName: string | string[]): Argv;
-        alias(shortNames: string[], longName: string): Argv;
+        alias(shortName: string | string[], longName: string | string[]): Argv;
         alias(aliases: { [shortName: string]: string | string[] }): Argv;
 
-        array(key: string): Argv;
-        array(keys: string[]): Argv;
+        argv: Arguments;
+
+        array(key: string | string[]): Argv;
+
+        boolean(key: string | string[]): Argv;
+
+        check(func: (argv: Arguments, aliases: { [alias: string]: string }) => any, global?: boolean): Argv;
+
+        choices(key: string, values: Choices): Argv;
+        choices(choices: { [argName: string]: Choices }): Argv;
+
+        coerce(key: string | string[], func: (arg: any) => any): Argv;
+        coerce(opts: { [key: string]: (arg: any) => any; }): Argv;
+
+        command(command: string | string[], description: string, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], description: string, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], description: string, module: CommandModule): Argv;
+        command(command: string | string[], showInHelp: false, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], showInHelp: false, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], showInHelp: false, module: CommandModule): Argv;
+        command(module: CommandModule): Argv;
+
+        // Advanced API
+        commandDir(dir: string, opts?: RequireDirectoryOptions): Argv;
+
+        completion(): Argv;
+        completion(cmd: string, func?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, func?: SyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, func?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, func?: SyncCompletionFunction): Argv;
+
+        config(): Argv;
+        config(key: string | string[], description?: string, parseFn?: (configPath: string) => object): Argv;
+        config(key: string | string[], parseFn: (configPath: string) => object): Argv;
+        config(explicitConfigurationObject: object): Argv;
+
+        conflicts(key: string, value: string | string[]): Argv;
+        conflicts(conflicts: { [key: string]: string | string[] }): Argv;
+
+        count(key: string | string[]): Argv;
 
         default(key: string, value: any, description?: string): Argv;
         default(defaults: { [key: string]: any }, description?: string): Argv;
 
         /**
          * @deprecated since version 6.6.0
+         * Use '.demandCommand()' or '.demandOption()' instead
          */
-        demand(key: string, msg: string): Argv;
-        demand(key: string, required?: boolean): Argv;
-        demand(keys: string[], msg: string): Argv;
-        demand(keys: string[], required?: boolean): Argv;
-        demand(positionals: number, required?: boolean): Argv;
+        demand(key: string | string[], msg: string): Argv;
+        demand(key: string | string[], required?: boolean): Argv;
         demand(positionals: number, msg: string): Argv;
+        demand(positionals: number, required?: boolean): Argv;
         demand(positionals: number, max: number, msg?: string): Argv;
 
-        demandCommand(min: number, minMsg?: string): Argv;
-        demandCommand(min: number, max?: number, minMsg?: string, maxMsg?: string): Argv;
-
         demandOption(key: string | string[], msg?: string): Argv;
         demandOption(key: string | string[], demand?: boolean): Argv;
 
+        demandCommand(): Argv;
+        demandCommand(min: number, minMsg?: string): Argv;
+        demandCommand(min: number, max?: number, minMsg?: string, maxMsg?: string): Argv;
+
+        describe(key: string | string[], description: string): Argv;
+        describe(descriptions: { [key: string]: string }): Argv;
+
+        detectLocale(detect: boolean): Argv;
+
+        env(): Argv;
+        env(prefix: string): Argv;
+        env(enable: boolean): Argv;
+
+        epilog(msg: string): Argv;
+
+        epilogue(msg: string): Argv;
+
+        example(command: string, description: string): Argv;
+
+        exitProcess(enabled: boolean): Argv;
+
+        fail(func: (msg: string, err: Error) => any): Argv;
+
+        getCompletion(args: string[], done: (completions: string[]) => void): Argv;
+
+        global(key: string | string[]): Argv;
+
+        group(key: string | string[], groupName: string): Argv;
+
+        help(): Argv;
+        help(enableExplicit: boolean): Argv;
+        help(option: string, enableExplicit: boolean): Argv;
+        help(option: string, description?: string, enableExplicit?: boolean): Argv;
+
+        implies(key: string, value: string | string[]): Argv;
+        implies(implies: { [key: string]: string | string[] }): Argv;
+
+        locale(): string;
+        locale(loc: string): Argv;
+
+        nargs(key: string, count: number): Argv;
+        nargs(nargs: { [key: string]: number }): Argv;
+
+        normalize(key: string | string[]): Argv;
+
+        number(key: string | string[]): Argv;
+
+        option(key: string, options: Options): Argv;
+        option(options: { [key: string]: Options }): Argv;
+
+        options(key: string, options: Options): Argv;
+        options(options: { [key: string]: Options }): Argv;
+
+        parse(): Arguments;
+        parse(arg: string | string[], context?: object, parseCallback?: ParseCallback): Arguments;
+
+        pkgConf(key: string | string[], cwd?: string): Argv;
+
+        /**
+         * 'positional' should be called in a command's builder function, and is not
+         * available on the top-level yargs instance. If so, it will throw an error.
+         */
+        positional(key: string, opt: PositionalOptions): Argv;
+
+        recommendCommands(): Argv;
+
         /**
          * @deprecated since version 6.6.0
+         * Use '.demandCommand()' or '.demandOption()' instead
          */
         require(key: string, msg: string): Argv;
         require(key: string, required: boolean): Argv;
@@ -65,6 +166,7 @@ declare namespace yargs {
 
         /**
          * @deprecated since version 6.6.0
+         * Use '.demandCommand()' or '.demandOption()' instead
          */
         required(key: string, msg: string): Argv;
         required(key: string, required: boolean): Argv;
@@ -73,124 +175,46 @@ declare namespace yargs {
         required(positionals: number, required: boolean): Argv;
         required(positionals: number, msg: string): Argv;
 
-        requiresArg(key: string): Argv;
-        requiresArg(keys: string[]): Argv;
+        requiresArg(key: string | string[]): Argv;
 
-        describe(key: string | string[], description: string): Argv;
-        describe(descriptions: { [key: string]: string }): Argv;
-
-        option(key: string, options: Options): Argv;
-        option(options: { [key: string]: Options }): Argv;
-        options(key: string, options: Options): Argv;
-        options(options: { [key: string]: Options }): Argv;
-
-        usage(message: string, options?: { [key: string]: Options }): Argv;
-        usage(options?: { [key: string]: Options }): Argv;
-
-        command(command: string | string[], description: string): Argv;
-        command(command: string | string[], description: string, builder: (args: Argv) => Argv): Argv;
-        command(command: string | string[], description: string, builder: { [optionName: string]: Options }): Argv;
-        command(command: string | string[], description: string, builder: { [optionName: string]: Options }, handler: (args: Arguments) => void): Argv;
-        command(command: string | string[], description: string, builder: (args: Argv) => Argv, handler: (args: Arguments) => void): Argv;
-        command(command: string | string[], description: string, module: CommandModule): Argv;
-        command(module: CommandModule): Argv;
-
-        commandDir(dir: string, opts?: RequireDirectoryOptions): Argv;
-
-        completion(): Argv;
-        completion(cmd: string, fn?: AsyncCompletionFunction): Argv;
-        completion(cmd: string, fn?: SyncCompletionFunction): Argv;
-        completion(cmd: string, description?: string, fn?: AsyncCompletionFunction): Argv;
-        completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
-
-        example(command: string, description: string): Argv;
-
-        check(func: (argv: Arguments, aliases: { [alias: string]: string }) => any, global?: boolean): Argv;
-
-        boolean(key: string): Argv;
-        boolean(keys: string[]): Argv;
-
-        string(key: string): Argv;
-        string(keys: string[]): Argv;
-
-        number(key: string): Argv;
-        number(keys: string[]): Argv;
-
-        choices(choices: { [argName: string]: Choices }): Argv;
-        choices(key: string, values: Choices): Argv;
-
-        config(): Argv;
-        config(explicitConfigurationObject: object): Argv;
-        config(key: string, description?: string, parseFn?: (configPath: string) => object): Argv;
-        config(keys: string[], description?: string, parseFn?: (configPath: string) => object): Argv;
-        config(key: string, parseFn: (configPath: string) => object): Argv;
-        config(keys: string[], parseFn: (configPath: string) => object): Argv;
-
-        conflicts(key: string, value: string): Argv;
-        conflicts(conflicts: { [key: string]: string }): Argv;
-
-        wrap(columns: number): Argv;
-
-        strict(): Argv;
-
-        help(): Argv;
-        help(enableExplicit: boolean): Argv;
-        help(option: string, enableExplicit: boolean): Argv;
-        help(option: string, description?: string, enableExplicit?: boolean): Argv;
-
-        env(prefix?: string): Argv;
-        env(enable: boolean): Argv;
-
-        epilog(msg: string): Argv;
-        epilogue(msg: string): Argv;
-
-        version(version?: string, option?: string, description?: string): Argv;
-        version(version: () => string, option?: string, description?: string): Argv;
-
-        showHelpOnFail(enable: boolean, message?: string): Argv;
-
-        showHelp(consoleLevel?: string): Argv;
-
-        exitProcess(enabled: boolean): Argv;
-
-        global(key: string): Argv;
-        global(keys: string[]): Argv;
-
-        group(key: string, groupName: string): Argv;
-        group(keys: string[], groupName: string): Argv;
-
-        nargs(key: string, count: number): Argv;
-        nargs(nargs: { [key: string]: number }): Argv;
-
-        normalize(key: string): Argv;
-        normalize(keys: string[]): Argv;
-
-        implies(key: string, value: string): Argv;
-        implies(implies: { [key: string]: string }): Argv;
-
-        count(key: string): Argv;
-        count(keys: string[]): Argv;
-
-        fail(func: (msg: string, err: Error) => any): Argv;
-
-        coerce<T, U>(key: string | string[], func: (arg: T) => U): Argv;
-        coerce<T, U>(opts: { [key: string]: (arg: T) => U; }): Argv;
-
-        getCompletion(args: string[], done: (completions: string[]) => void): Argv;
-
-        pkgConf(key: string, cwd?: string): Argv;
-        pkgConf(keys: string[], cwd?: string): Argv;
-
-        recommendCommands(): Argv;
+        /**
+         * @deprecated since version 6.6.0
+         * Use '.global()' instead
+         */
+        reset(): Argv;
 
         showCompletionScript(): Argv;
 
-        skipValidation(key: string): Argv;
-        skipValidation(keys: string[]): Argv;
+        showHelp(consoleLevel?: string): Argv;
+
+        showHelpOnFail(enable: boolean, message?: string): Argv;
+
+        skipValidation(key: string | string[]): Argv;
+
+        strict(): Argv;
+
+        string(key: string | string[]): Argv;
+
+        // Intended to be used with '.wrap()'
+        terminalWidth(): number;
 
         updateLocale(obj: { [key: string]: string }): Argv;
 
         updateStrings(obj: { [key: string]: string }): Argv;
+
+        usage(message: string): Argv;
+        usage(command: string | string[], description: string, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        usage(command: string | string[], showInHelp: boolean, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        usage(command: string | string[], description: string, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+        usage(commands: string | string[], showInHelp: boolean, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+
+        version(): Argv;
+        version(version: string): Argv;
+        version(enable: boolean): Argv;
+        version(optionKey: string, version: string): Argv;
+        version(optionKey: string, description: string, version: string): Argv;
+
+        wrap(columns: number | null): Argv;
     }
 
     interface Arguments {
@@ -198,9 +222,8 @@ declare namespace yargs {
         _: string[];
         /** The script name or node command */
         $0: string;
-
         /** All remaining options */
-        [ argName: string ]: any;
+        [argName: string]: any;
     }
 
     interface RequireDirectoryOptions {
@@ -219,11 +242,14 @@ declare namespace yargs {
         coerce?: (arg: any) => any;
         config?: boolean;
         configParser?: (configPath: string) => object;
-        conflicts?: string | object;
+        conflicts?: string | string[] | { [key: string]: string | string[] };
         count?: boolean;
         default?: any;
         defaultDescription?: string;
-        /** @deprecated since version 6.6.0 */
+        /**
+         *  @deprecated since version 6.6.0
+         *  Use 'demandOption' instead
+         */
         demand?: boolean | string;
         demandOption?: boolean | string;
         desc?: string;
@@ -231,7 +257,8 @@ declare namespace yargs {
         description?: string;
         global?: boolean;
         group?: string;
-        implies?: string | object;
+        hidden?: boolean;
+        implies?: string | string[] | { [key: string]: string | string[] };
         nargs?: number;
         normalize?: boolean;
         number?: boolean;
@@ -240,7 +267,21 @@ declare namespace yargs {
         requiresArg?: boolean | string;
         skipValidation?: boolean;
         string?: boolean;
-        type?: "array" | "boolean" | "count" | "number" | "string";
+        type?: "array" | "count" | PositionalOptionsType;
+    }
+
+    interface PositionalOptions {
+        alias?: string | string[];
+        choices?: Choices;
+        coerce?: (arg: any) => any;
+        conflicts?: string | string[] | { [key: string]: string | string[] };
+        default?: any;
+        desc?: string;
+        describe?: string;
+        description?: string;
+        implies?: string | string[] | { [key: string]: string | string[] };
+        normalize?: boolean;
+        type?: PositionalOptionsType;
     }
 
     interface CommandModule {
@@ -255,8 +296,8 @@ declare namespace yargs {
     type CommandBuilder = { [key: string]: Options } | ((args: Argv) => Argv);
     type SyncCompletionFunction = (current: string, argv: any) => string[];
     type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
-    type Choice = string | true | undefined;
-    type Choices = Choice[];
+    type Choices = Array<string | true | undefined>;
+    type PositionalOptionsType = "boolean" | "number" | "string";
 }
 
 declare var yargs: yargs.Argv;
diff --git a/types/yargs/tsconfig.json b/types/yargs/tsconfig.json
index 003b792854..f0fcef8f10 100644
--- a/types/yargs/tsconfig.json
+++ b/types/yargs/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "yargs-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/yargs/tslint.json b/types/yargs/tslint.json
index 08337e85f7..08b1465cd6 100644
--- a/types/yargs/tslint.json
+++ b/types/yargs/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-object-literal-type-assertion": false,
-        "no-unnecessary-generics": false
+        "unified-signatures": false
     }
 }
diff --git a/types/yargs/v8/.editorconfig b/types/yargs/v8/.editorconfig
new file mode 100644
index 0000000000..db9b917e06
--- /dev/null
+++ b/types/yargs/v8/.editorconfig
@@ -0,0 +1,5 @@
+[*.ts]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
diff --git a/types/yargs/v8/index.d.ts b/types/yargs/v8/index.d.ts
new file mode 100644
index 0000000000..2ebe5dfb54
--- /dev/null
+++ b/types/yargs/v8/index.d.ts
@@ -0,0 +1,262 @@
+// Type definitions for yargs 8.0
+// Project: https://github.com/chevex/yargs
+// Definitions by: Martin Poelstra <https://github.com/poelstra>
+//                 Mizunashi Mana <https://github.com/mizunashi-mana>
+//                 Jeffery Grajkowski <https://github.com/pushplay>
+//                 Jeff Kenney <https://github.com/jeffkenney>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// The following TSLint rules have been disabled:
+// unified-signatures: Because there is useful information in the argument names of the overloaded signatures
+
+declare namespace yargs {
+    interface Argv {
+        argv: Arguments;
+        (args?: string[], cwd?: string): Arguments;
+        parse(args: string | string[], context?: object, parseCallback?: ParseCallback): Arguments;
+
+        reset(): Argv;
+
+        locale(): string;
+        locale(loc: string): Argv;
+
+        detectLocale(detect: boolean): Argv;
+
+        terminalWidth(): number;
+
+        alias(shortName: string, longName: string | string[]): Argv;
+        alias(shortNames: string[], longName: string): Argv;
+        alias(aliases: { [shortName: string]: string | string[] }): Argv;
+
+        array(key: string): Argv;
+        array(keys: string[]): Argv;
+
+        default(key: string, value: any, description?: string): Argv;
+        default(defaults: { [key: string]: any }, description?: string): Argv;
+
+        /**
+         * @deprecated since version 6.6.0
+         */
+        demand(key: string, msg: string): Argv;
+        demand(key: string, required?: boolean): Argv;
+        demand(keys: string[], msg: string): Argv;
+        demand(keys: string[], required?: boolean): Argv;
+        demand(positionals: number, required?: boolean): Argv;
+        demand(positionals: number, msg: string): Argv;
+        demand(positionals: number, max: number, msg?: string): Argv;
+
+        demandCommand(min: number, minMsg?: string): Argv;
+        demandCommand(min: number, max?: number, minMsg?: string, maxMsg?: string): Argv;
+
+        demandOption(key: string | string[], msg?: string): Argv;
+        demandOption(key: string | string[], demand?: boolean): Argv;
+
+        /**
+         * @deprecated since version 6.6.0
+         */
+        require(key: string, msg: string): Argv;
+        require(key: string, required: boolean): Argv;
+        require(keys: number[], msg: string): Argv;
+        require(keys: number[], required: boolean): Argv;
+        require(positionals: number, required: boolean): Argv;
+        require(positionals: number, msg: string): Argv;
+
+        /**
+         * @deprecated since version 6.6.0
+         */
+        required(key: string, msg: string): Argv;
+        required(key: string, required: boolean): Argv;
+        required(keys: number[], msg: string): Argv;
+        required(keys: number[], required: boolean): Argv;
+        required(positionals: number, required: boolean): Argv;
+        required(positionals: number, msg: string): Argv;
+
+        requiresArg(key: string): Argv;
+        requiresArg(keys: string[]): Argv;
+
+        describe(key: string | string[], description: string): Argv;
+        describe(descriptions: { [key: string]: string }): Argv;
+
+        option(key: string, options: Options): Argv;
+        option(options: { [key: string]: Options }): Argv;
+        options(key: string, options: Options): Argv;
+        options(options: { [key: string]: Options }): Argv;
+
+        usage(message: string, options?: { [key: string]: Options }): Argv;
+        usage(options?: { [key: string]: Options }): Argv;
+
+        command(command: string | string[], description: string): Argv;
+        command(command: string | string[], description: string, builder: (args: Argv) => Argv): Argv;
+        command(command: string | string[], description: string, builder: { [optionName: string]: Options }): Argv;
+        command(command: string | string[], description: string, builder: { [optionName: string]: Options }, handler: (args: Arguments) => void): Argv;
+        command(command: string | string[], description: string, builder: (args: Argv) => Argv, handler: (args: Arguments) => void): Argv;
+        command(command: string | string[], description: string, module: CommandModule): Argv;
+        command(module: CommandModule): Argv;
+
+        commandDir(dir: string, opts?: RequireDirectoryOptions): Argv;
+
+        completion(): Argv;
+        completion(cmd: string, fn?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, fn?: SyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, fn?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
+
+        example(command: string, description: string): Argv;
+
+        check(func: (argv: Arguments, aliases: { [alias: string]: string }) => any, global?: boolean): Argv;
+
+        boolean(key: string): Argv;
+        boolean(keys: string[]): Argv;
+
+        string(key: string): Argv;
+        string(keys: string[]): Argv;
+
+        number(key: string): Argv;
+        number(keys: string[]): Argv;
+
+        choices(choices: { [argName: string]: Choices }): Argv;
+        choices(key: string, values: Choices): Argv;
+
+        config(): Argv;
+        config(explicitConfigurationObject: object): Argv;
+        config(key: string, description?: string, parseFn?: (configPath: string) => object): Argv;
+        config(keys: string[], description?: string, parseFn?: (configPath: string) => object): Argv;
+        config(key: string, parseFn: (configPath: string) => object): Argv;
+        config(keys: string[], parseFn: (configPath: string) => object): Argv;
+
+        conflicts(key: string, value: string): Argv;
+        conflicts(conflicts: { [key: string]: string }): Argv;
+
+        wrap(columns: number): Argv;
+
+        strict(): Argv;
+
+        help(): Argv;
+        help(enableExplicit: boolean): Argv;
+        help(option: string, enableExplicit: boolean): Argv;
+        help(option: string, description?: string, enableExplicit?: boolean): Argv;
+
+        env(prefix?: string): Argv;
+        env(enable: boolean): Argv;
+
+        epilog(msg: string): Argv;
+        epilogue(msg: string): Argv;
+
+        version(version?: string, option?: string, description?: string): Argv;
+        version(version: () => string, option?: string, description?: string): Argv;
+
+        showHelpOnFail(enable: boolean, message?: string): Argv;
+
+        showHelp(consoleLevel?: string): Argv;
+
+        exitProcess(enabled: boolean): Argv;
+
+        global(key: string): Argv;
+        global(keys: string[]): Argv;
+
+        group(key: string, groupName: string): Argv;
+        group(keys: string[], groupName: string): Argv;
+
+        nargs(key: string, count: number): Argv;
+        nargs(nargs: { [key: string]: number }): Argv;
+
+        normalize(key: string): Argv;
+        normalize(keys: string[]): Argv;
+
+        implies(key: string, value: string): Argv;
+        implies(implies: { [key: string]: string }): Argv;
+
+        count(key: string): Argv;
+        count(keys: string[]): Argv;
+
+        fail(func: (msg: string, err: Error) => any): Argv;
+
+        coerce<T, U>(key: string | string[], func: (arg: T) => U): Argv;
+        coerce<T, U>(opts: { [key: string]: (arg: T) => U; }): Argv;
+
+        getCompletion(args: string[], done: (completions: string[]) => void): Argv;
+
+        pkgConf(key: string, cwd?: string): Argv;
+        pkgConf(keys: string[], cwd?: string): Argv;
+
+        recommendCommands(): Argv;
+
+        showCompletionScript(): Argv;
+
+        skipValidation(key: string): Argv;
+        skipValidation(keys: string[]): Argv;
+
+        updateLocale(obj: { [key: string]: string }): Argv;
+
+        updateStrings(obj: { [key: string]: string }): Argv;
+    }
+
+    interface Arguments {
+        /** Non-option arguments */
+        _: string[];
+        /** The script name or node command */
+        $0: string;
+
+        /** All remaining options */
+        [ argName: string ]: any;
+    }
+
+    interface RequireDirectoryOptions {
+        recurse?: boolean;
+        extensions?: string[];
+        visit?: (commandObject: any, pathToFile?: string, filename?: string) => any;
+        include?: RegExp | ((pathToFile: string) => boolean);
+        exclude?: RegExp | ((pathToFile: string) => boolean);
+    }
+
+    interface Options {
+        alias?: string | string[];
+        array?: boolean;
+        boolean?: boolean;
+        choices?: Choices;
+        coerce?: (arg: any) => any;
+        config?: boolean;
+        configParser?: (configPath: string) => object;
+        conflicts?: string | object;
+        count?: boolean;
+        default?: any;
+        defaultDescription?: string;
+        /** @deprecated since version 6.6.0 */
+        demand?: boolean | string;
+        demandOption?: boolean | string;
+        desc?: string;
+        describe?: string;
+        description?: string;
+        global?: boolean;
+        group?: string;
+        implies?: string | object;
+        nargs?: number;
+        normalize?: boolean;
+        number?: boolean;
+        require?: boolean | string;
+        required?: boolean | string;
+        requiresArg?: boolean | string;
+        skipValidation?: boolean;
+        string?: boolean;
+        type?: "array" | "boolean" | "count" | "number" | "string";
+    }
+
+    interface CommandModule {
+        aliases?: string[] | string;
+        builder?: CommandBuilder;
+        command?: string[] | string;
+        describe?: string | false;
+        handler: (args: any) => void;
+    }
+
+    type ParseCallback = (err: Error | undefined, argv: Arguments, output: string) => void;
+    type CommandBuilder = { [key: string]: Options } | ((args: Argv) => Argv);
+    type SyncCompletionFunction = (current: string, argv: any) => string[];
+    type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
+    type Choice = string | true | undefined;
+    type Choices = Choice[];
+}
+
+declare var yargs: yargs.Argv;
+export = yargs;
diff --git a/types/yargs/v8/tsconfig.json b/types/yargs/v8/tsconfig.json
new file mode 100644
index 0000000000..191904df93
--- /dev/null
+++ b/types/yargs/v8/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "paths": {
+            "yargs": [
+                "yargs/v8"
+            ]
+        },
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yargs-tests.ts"
+    ]
+}
diff --git a/types/yargs/v8/tslint.json b/types/yargs/v8/tslint.json
new file mode 100644
index 0000000000..8c7b0a6ee1
--- /dev/null
+++ b/types/yargs/v8/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-object-literal-type-assertion": false,
+        "no-unnecessary-generics": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/yargs/v8/yargs-tests.ts b/types/yargs/v8/yargs-tests.ts
new file mode 100644
index 0000000000..3f5b8829aa
--- /dev/null
+++ b/types/yargs/v8/yargs-tests.ts
@@ -0,0 +1,634 @@
+/// <reference types="node" />
+
+import * as yargs from 'yargs';
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+const stringVal = 'string';
+
+// Examples taken from yargs website
+// https://github.com/chevex/yargs
+
+// With yargs, the options be just a hash!
+function xup() {
+    const argv = yargs.argv;
+
+    if (argv.rif - 5 * argv.xup > 7.138) {
+        console.log('Plunder more riffiwobbles!');
+    } else {
+        console.log('Drop the xupptumblers!');
+    }
+}
+
+// And non-hyphenated options too! Just use argv._!
+function nonopt() {
+    const argv = yargs.argv;
+    console.log('(%d,%d)', argv.x, argv.y);
+    console.log(argv._);
+}
+
+// Yargs even counts your booleans!
+function count() {
+    const argv = yargs
+        .count('verbose')
+        .alias('v', 'verbose')
+        .argv;
+
+    const VERBOSE_LEVEL: number = argv.verbose;
+
+    function WARN() { VERBOSE_LEVEL >= 0 && console.log.apply(console, arguments); }
+    function INFO() { VERBOSE_LEVEL >= 1 && console.log.apply(console, arguments); }
+    function DEBUG() { VERBOSE_LEVEL >= 2 && console.log.apply(console, arguments); }
+}
+
+// Tell users how to use yer options and make demands.
+function divide() {
+    const argv = yargs
+        .usage('Usage: $0 -x [num] -y [num]')
+        .demand(['x', 'y'])
+        .argv;
+
+    console.log(argv.x / argv.y);
+}
+
+// After yer demands have been met, demand more! Ask for non-hypenated arguments!
+function demand_count() {
+    const argv = yargs
+        .demand(2)
+        .demand(2, false)
+        .demand(2, 2)
+        .demand(2, 2, "message")
+        .argv;
+    console.dir(argv);
+}
+
+// EVEN MORE SHIVER ME TIMBERS!
+function default_singles() {
+    const argv = yargs
+        .default('x', 10)
+        .default('y', 10)
+        .argv
+        ;
+    console.log(argv.x + argv.y);
+}
+function default_hash() {
+    const argv = yargs
+        .default({ x: 10, y: 10 })
+        .argv
+        ;
+    console.log(argv.x + argv.y);
+}
+
+// And if you really want to get all descriptive about it...
+function boolean_single() {
+    const argv = yargs
+        .boolean('v')
+        .argv
+        ;
+    console.dir(argv.v);
+    console.dir(argv._);
+}
+function boolean_double() {
+    const argv = yargs
+        .boolean(['x', 'y', 'z'])
+        .argv
+        ;
+    console.dir([argv.x, argv.y, argv.z]);
+    console.dir(argv._);
+}
+
+// Yargs is here to help you...
+function line_count() {
+    const argv = yargs
+        .usage('Count the lines in a file.\nUsage: $0')
+        .example('$0 -f', 'count the lines in the given file')
+        .demand('f')
+        .alias('f', 'file')
+        .describe('f', 'Load a file')
+        .argv
+        ;
+}
+
+// Below are tests for individual methods.
+// Not all methods are covered yet, and neither are all possible invocations of methods.
+
+function Argv$argv() {
+    const argv = yargs.argv;
+    console.log("command name: " + argv.$0);
+    console.log("command: " + argv._[1]);
+}
+
+function Argv_parsing() {
+    const argv1 = yargs.argv;
+    const argv2 = yargs(['-x', '1', '-y', '2']).argv;
+    const argv3 = yargs.parse(['-x', '1', '-y', '2']);
+    console.log(argv1.x, argv2.x, argv3.x);
+}
+
+function Argv$options() {
+    const argv1 = yargs
+        .options('f', {
+            alias: 'file',
+            default: '/etc/passwd',
+            defaultDescription: 'The /etc/passwd file',
+            group: 'files',
+            normalize: true,
+            global: false,
+            array: true,
+            nargs: 3,
+            implies: 'other-arg',
+            conflicts: 'conflicting-arg',
+        })
+        .argv
+        ;
+
+    const argv2 = yargs
+        .alias('f', 'file')
+        .default('f', '/etc/passwd')
+        .argv
+        ;
+}
+
+function Argv$global() {
+    const argv = yargs
+        .global('foo')
+        .global(['bar', 'baz', 'fizz', 'buzz']);
+}
+
+function Argv$group() {
+    const argv = yargs
+        .group('foo', 'foogroup')
+        .group(['bing', 'bang', 'buzz'], 'onomatopoeia');
+}
+
+function Argv$env() {
+    const argv = yargs
+        .env('YARGS_PREFIX_')
+        .env()
+        .env(true);
+}
+
+function Argv$array() {
+    const argv = yargs
+        .array('foo')
+        .array(['bar', 'baz']);
+}
+
+function Argv$nargs() {
+    const argv = yargs
+        .nargs('foo', 12)
+        .nargs({ bing: 3, bang: 2, buzz: 4 });
+}
+
+function Argv$choices() {
+    // example from documentation
+    const argv = yargs
+        .alias('i', 'ingredient')
+        .describe('i', 'choose your sandwich ingredients')
+        .choices('i', ['peanut-butter', 'jelly', 'banana', 'pickles'])
+        .help('help')
+        .argv;
+
+    yargs
+        .choices('i', [undefined, true, 'asdf', 'test'])
+        .choices({
+            test: [undefined, true, 'test-value']
+        });
+}
+
+function command() {
+    const argv = yargs
+        .usage('npm <command>')
+        .command('install', 'tis a mighty fine package to install')
+        .command('publish', 'shiver me timbers, should you be sharing all that', yargs =>
+            yargs.option('f', {
+                alias: 'force',
+                description: 'yar, it usually be a bad idea'
+            })
+                .help('help')
+        )
+        .command("build", "arghh, build it mate", {
+            tag: {
+                default: true,
+                demand: true,
+                description: "Tag the build, mate!"
+            },
+            publish: {
+                default: false,
+                description: "Should i publish?"
+            }
+        })
+        .command({
+            command: "test",
+            describe: "test package",
+            builder: {
+                mateys: {
+                    demand: false
+                }
+            },
+            handler: (args: any) => {
+                /* handle me mateys! */
+            }
+        })
+        .command("test", "test mateys", {
+            handler: (args: any) => {
+                /* handle me mateys! */
+            }
+        })
+        .help('help')
+        .argv;
+
+    yargs
+        .command('get', 'make a get HTTP request', (yargs) => {
+            return yargs.option('url', {
+                alias: 'u',
+                default: 'http://yargs.js.org/'
+            });
+        })
+        .help()
+        .argv;
+
+    yargs
+        .command(
+        'get',
+        'make a get HTTP request',
+        (yargs) => {
+            return yargs.option('u', {
+                alias: 'url',
+                describe: 'the URL to make an HTTP request to'
+            });
+        },
+        (argv) => {
+            console.dir(argv.url);
+        }
+        )
+        .help()
+        .argv;
+}
+
+function completion_sync() {
+    const argv = yargs
+        .completion('completion', (current, argv) => {
+            // 'current' is the current command being completed.
+            // 'argv' is the parsed arguments so far.
+            // simply return an array of completions.
+            return [
+                'foo',
+                'bar'
+            ];
+        })
+        .argv;
+}
+
+function completion_async() {
+    const argv = yargs
+        .completion('completion', (current: string, argv: any, done: (completion: string[]) => void) => {
+            setTimeout(() => {
+                done([
+                    'apple',
+                    'banana'
+                ]);
+            }, 500);
+        })
+        .argv;
+}
+
+function Argv$help() {
+    const argv = yargs
+        .usage("$0 -operand1 number -operand2 number -operation [add|subtract]")
+        .help()
+        .argv;
+}
+
+function Argv$showHelpOnFail() {
+    const argv = yargs
+        .usage('Count the lines in a file.\nUsage: $0')
+        .demand('f')
+        .alias('f', 'file')
+        .describe('f', 'Load a file')
+        .showHelpOnFail(false, "Specify --help for available options")
+        .argv;
+}
+
+function Argv$showHelp() {
+    const yargs1 = yargs
+        .usage("$0 -operand1 number -operand2 number -operation [add|subtract]");
+    yargs1.showHelp();
+}
+
+function Argv$version() {
+    const argv1 = yargs
+        .version();
+
+    const argv2 = yargs
+        .version('1.0.0');
+
+    const argv3 = yargs
+        .version('1.0.0', '--version');
+
+    const argv4 = yargs
+        .version('1.0.0', '--version', 'description');
+
+    const argv5 = yargs
+        .version(() => '1.0.0', '--version', 'description');
+}
+
+function Argv$wrap() {
+    const argv1 = yargs
+        .wrap(null);
+
+    const argv2 = yargs
+        .wrap(yargs.terminalWidth());
+}
+
+function Argv$locale() {
+    const argv = yargs
+        .usage('./$0 - follow ye instructions true')
+        .option('option', {
+            alias: 'o',
+            describe: "'tis a mighty fine option",
+            demand: true
+        })
+        .command('run', "Arrr, ya best be knowin' what yer doin'")
+        .example('$0 run foo', "shiver me timbers, here's an example for ye")
+        .help('help')
+        .wrap(70)
+        .locale('pirate')
+        .argv;
+}
+
+function Argv$epilogue() {
+    const argv = yargs
+        .epilogue('for more information, find our manual at http://example.com');
+}
+
+function Argv$reset() {
+    const ya = yargs
+        .usage('$0 command')
+        .command('hello', 'hello command')
+        .command('world', 'world command')
+        .demand(1, 'must provide a valid command');
+    const argv = yargs.argv;
+    const command = argv._[0];
+
+    if (command === 'hello') {
+        ya.reset()
+            .usage('$0 hello')
+            .help('h')
+            .example('$0 hello', 'print the hello message!')
+            .argv;
+
+        console.log('hello!');
+    } else if (command === 'world') {
+        ya.reset()
+            .usage('$0 world')
+            .help('h')
+            .example('$0 world', 'print the world message!')
+            .argv;
+
+        console.log('world!');
+    } else {
+        ya.showHelp();
+    }
+}
+
+// http://yargs.js.org/docs/#methods-commanddirdirectory-opts
+function Argv$commandDir() {
+    const ya = yargs
+        .commandDir('.')
+        .argv;
+}
+
+// http://yargs.js.org/docs/#methods-commanddirdirectory-opts
+function Argv$commandDirWithOptions() {
+    const ya = yargs
+        .commandDir('.', {
+            recurse: false,
+            extensions: ['js'],
+            visit: (commandObject: any, pathToFile: string, filename: string) => { },
+            include: /.*\.js$/,
+            exclude: /.*\.spec.js$/,
+        })
+        .argv;
+}
+
+function Argv$normalize() {
+    const ya = yargs
+        .normalize('path')
+        .normalize(['user', 'group'])
+        .argv;
+}
+
+// From http://yargs.js.org/docs/#methods-coercekey-fn
+function Argv$coerce() {
+    const ya = yargs
+        .coerce('file', (arg: string) => {
+            return fs.readFileSync(arg, 'utf8');
+        })
+        .argv;
+}
+function Argv$coerces() {
+    const ya = yargs
+        .coerce({
+            date: Date.parse,
+            json: JSON.parse
+        })
+        .argv;
+}
+function Argv$coerceWithKeys() {
+    const ya = yargs
+        .coerce(['src', 'dest'], path.resolve)
+        .argv;
+}
+
+// From http://yargs.js.org/docs/#methods-failfn
+function Argv$fail() {
+    const ya = yargs
+        .fail((msg, err) => {
+            if (err) throw err; // preserve stack
+            console.error('You broke it!');
+            console.error(msg);
+            process.exit(1);
+        })
+        .argv;
+}
+
+function Argv$implies() {
+    const ya = yargs
+        .implies('foo', 'snuh')
+        .implies({
+            x: 'y'
+        })
+        .argv;
+}
+
+function Argv$count() {
+    const ya = yargs
+        .count('size')
+        .count(['w', 'h'])
+        .argv;
+}
+
+function Argv$number() {
+    const ya = yargs
+        .number('n')
+        .number(['width', 'height'])
+        .argv;
+}
+
+function Argv$updateStrings() {
+    const ya = yargs
+        .command('run', 'the run command')
+        .help('help')
+        .updateStrings({
+            'Commands:': 'My Commands -->\n'
+        })
+        .wrap(null)
+        .argv;
+}
+
+function Argv$default() {
+    const ya = yargs
+        .default('random', function randomValue() {
+            return Math.random() * 256;
+        })
+        .argv;
+}
+
+function Argv$configObject() {
+    const ya = yargs
+        .config({ foo: 1, bar: 2 })
+        .argv;
+}
+
+function Argv$configParseFunction() {
+    const ya = yargs
+        .config('settings', (configPath) => {
+            return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        })
+        .config('settings', 'description', (configPath) => {
+            return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        })
+        .argv;
+}
+
+function Argv$helpDescriptionExplicit() {
+    const ya = yargs
+        .help('help', 'description', true)
+        .argv;
+}
+
+function Argv$showHelpConsoleLevel() {
+    yargs.showHelp("log"); // prints to stdout using console.log()
+}
+
+function Argv$getCompletion() {
+    const ya = yargs
+        .option('foobar', {})
+        .option('foobaz', {})
+        .completion()
+        .getCompletion(['./test.js', '--foo'], (completions) => {
+            console.log(completions);
+        })
+        .argv;
+}
+
+function Argv$pkgConf() {
+    const ya = yargs
+        .pkgConf(['key1', 'key2'], 'configFile.json')
+        .argv;
+}
+
+function Argv$recommendCommands() {
+    const ya = yargs
+        .recommendCommands()
+        .argv;
+}
+
+function Argv$showCompletionScript() {
+    const ya = yargs
+        .showCompletionScript()
+        .argv;
+}
+
+function Argv$skipValidation() {
+    const ya = yargs
+        .skipValidation('arg1')
+        .skipValidation(['arg2', 'arg3'])
+        .argv;
+}
+
+function Argv$commandObject() {
+    const ya = yargs
+        .command("commandname", "description", {
+            arg: ({
+                alias: "string",
+                array: true,
+                boolean: true,
+                choices: [undefined, false, "a", "b", "c"],
+                coerce: f => JSON.stringify(f),
+                config: true,
+                configParser: t => JSON.parse(fs.readFileSync(t, "utf8")),
+                count: true,
+                default: "myvalue",
+                defaultDescription: "description",
+                demand: true,
+                demandOption: true,
+                desc: "desc",
+                describe: "describe",
+                description: "description",
+                global: false,
+                group: "group",
+                nargs: 1,
+                normalize: false,
+                number: true,
+                requiresArg: true,
+                skipValidation: false,
+                string: true,
+                type: "string"
+            } as yargs.Options)
+        });
+}
+
+function Argv$demandCommand() {
+    const ya = yargs
+        .demandCommand(1)
+        .demandCommand(1, 'at least 1 command required')
+        .demandCommand(1, 2)
+        .demandCommand(1, 2, 'at least 1 command required')
+        .demandCommand(1, 2, 'at least 1 command required', 'at most 2 commands required')
+        .argv;
+}
+
+function Argv$demandOption() {
+    const ya = yargs
+        .demandOption('a')
+        .demandOption('a', 'a is required')
+        .demandOption('a', true)
+        .demandOption(['a', 'b'])
+        .demandOption(['a', 'b'], 'a and b are required')
+        .demandOption(['a', 'b'], true)
+        .argv;
+}
+
+function Argv$conflicts() {
+    const ya = yargs
+        .conflicts('a', 'b')
+        .conflicts({
+            a: 'b'
+        })
+        .argv;
+}
+
+function Argv$commandArray() {
+    const ya = yargs
+        .command(['commandName', 'commandAlias'], 'command description')
+        .argv;
+}
+
+function Argv$check() {
+    const ya = yargs
+        .check((argv, aliases) => {})
+        .check((argv, aliases) => {}, false);
+}
diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index 3f5b8829aa..aa0ff28235 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -120,7 +120,7 @@ function Argv$argv() {
 }
 
 function Argv_parsing() {
-    const argv1 = yargs.argv;
+    const argv1 = yargs.parse();
     const argv2 = yargs(['-x', '1', '-y', '2']).argv;
     const argv3 = yargs.parse(['-x', '1', '-y', '2']);
     console.log(argv1.x, argv2.x, argv3.x);
@@ -197,7 +197,25 @@ function Argv$choices() {
         });
 }
 
-function command() {
+function Argv$usage_as_default_command() {
+    const argv = yargs
+        .usage(
+        "$0 get",
+        'make a get HTTP request',
+        (yargs) => {
+            return yargs.option('u', {
+                alias: 'url',
+                describe: 'the URL to make an HTTP request to'
+            });
+        },
+        (argv) => {
+            console.dir(argv.url);
+        }
+        )
+        .argv;
+}
+
+function Argv$command() {
     const argv = yargs
         .usage('npm <command>')
         .command('install', 'tis a mighty fine package to install')
@@ -267,7 +285,7 @@ function command() {
         .argv;
 }
 
-function completion_sync() {
+function Argv$completion_sync() {
     const argv = yargs
         .completion('completion', (current, argv) => {
             // 'current' is the current command being completed.
@@ -281,7 +299,7 @@ function completion_sync() {
         .argv;
 }
 
-function completion_async() {
+function Argv$completion_async() {
     const argv = yargs
         .completion('completion', (current: string, argv: any, done: (completion: string[]) => void) => {
             setTimeout(() => {
@@ -325,13 +343,13 @@ function Argv$version() {
         .version('1.0.0');
 
     const argv3 = yargs
-        .version('1.0.0', '--version');
+        .version('--version', '1.0.0');
 
     const argv4 = yargs
-        .version('1.0.0', '--version', 'description');
+        .version('--version', 'Show version', '1.0.0');
 
     const argv5 = yargs
-        .version(() => '1.0.0', '--version', 'description');
+        .version(false);
 }
 
 function Argv$wrap() {
@@ -406,7 +424,7 @@ function Argv$commandDirWithOptions() {
         .commandDir('.', {
             recurse: false,
             extensions: ['js'],
-            visit: (commandObject: any, pathToFile: string, filename: string) => { },
+            visit: (commandObject: any, pathToFile: string, filename: string) => void 0,
             include: /.*\.js$/,
             exclude: /.*\.spec.js$/,
         })
@@ -560,35 +578,33 @@ function Argv$skipValidation() {
 }
 
 function Argv$commandObject() {
-    const ya = yargs
-        .command("commandname", "description", {
-            arg: ({
-                alias: "string",
-                array: true,
-                boolean: true,
-                choices: [undefined, false, "a", "b", "c"],
-                coerce: f => JSON.stringify(f),
-                config: true,
-                configParser: t => JSON.parse(fs.readFileSync(t, "utf8")),
-                count: true,
-                default: "myvalue",
-                defaultDescription: "description",
-                demand: true,
-                demandOption: true,
-                desc: "desc",
-                describe: "describe",
-                description: "description",
-                global: false,
-                group: "group",
-                nargs: 1,
-                normalize: false,
-                number: true,
-                requiresArg: true,
-                skipValidation: false,
-                string: true,
-                type: "string"
-            } as yargs.Options)
-        });
+    const options: yargs.Options = {
+        alias: "string",
+        array: true,
+        boolean: true,
+        choices: [undefined, true, "a", "b", "c"],
+        coerce: f => JSON.stringify(f),
+        config: true,
+        configParser: t => JSON.parse(fs.readFileSync(t, "utf8")),
+        count: true,
+        default: "myvalue",
+        defaultDescription: "description",
+        demand: true,
+        demandOption: true,
+        desc: "desc",
+        describe: "describe",
+        description: "description",
+        global: false,
+        group: "group",
+        nargs: 1,
+        normalize: false,
+        number: true,
+        requiresArg: true,
+        skipValidation: false,
+        string: true,
+        type: "string"
+    };
+    const ya = yargs.command("commandname", "description", { arg: options });
 }
 
 function Argv$demandCommand() {
@@ -629,6 +645,6 @@ function Argv$commandArray() {
 
 function Argv$check() {
     const ya = yargs
-        .check((argv, aliases) => {})
-        .check((argv, aliases) => {}, false);
+        .check((argv, aliases) => void 0)
+        .check((argv, aliases) => void 0, false);
 }
diff --git a/types/yayson/tslint.json b/types/yayson/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/yayson/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/ydn-db/tslint.json b/types/ydn-db/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ydn-db/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/yeoman-generator/index.d.ts b/types/yeoman-generator/index.d.ts
index 554a38f040..fb5c1b881c 100644
--- a/types/yeoman-generator/index.d.ts
+++ b/types/yeoman-generator/index.d.ts
@@ -1,14 +1,26 @@
-// Type definitions for yeoman-generator 1.0
+// Type definitions for yeoman-generator 2.0
 // Project: https://github.com/yeoman/generator
-// Definitions by: Kentaro Okuno <https://github.com/armorik83>, Jay Anslow <https://github.com/janslow>
+// Definitions by: Kentaro Okuno <https://github.com/armorik83>
+//                 Jay Anslow <https://github.com/janslow>
+//                 Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { EventEmitter } from 'events';
-import { Questions, Answers } from 'inquirer';
+import * as inquirer from 'inquirer';
 
 type Callback = (err: any) => void;
 
 declare namespace Base {
+    interface Question extends inquirer.Question {
+        /**
+         * whether to store the user's previous answer
+         */
+        store?: boolean;
+    }
+    type Questions = Question | Question[] | Rx.Observable<Question>;
+    type Answers = inquirer.Answers;
+
     class Storage {
         constructor(name: string, fs: MemFsEditor, configPath: string);
 
@@ -20,11 +32,22 @@ declare namespace Base {
         set(key: string, value: any): any;
     }
     interface InstallOptions {
-        npm?: boolean;
-        bower?: boolean;
-        yarn?: boolean;
+        /**
+         * whether to run `npm install` or can be options to pass to `dargs` as arguments
+         */
+        npm?: boolean | object;
+        /**
+         * whether to run `bower install` or can be options to pass to `dargs` as arguments
+         */
+        bower?: boolean | object;
+        /**
+         * whether to run `yarn install` or can be options to pass to `dargs` as arguments
+         */
+        yarn?: boolean | object;
+        /**
+         * whether to log the used commands
+         */
         skipMessage?: boolean;
-        callback?: Callback;
     }
     interface ArgumentConfig {
         description?: string;
@@ -57,11 +80,11 @@ declare namespace Base {
 }
 
 declare class Base extends EventEmitter {
-    static extend(protoProps?: any, staticProps?: any): Base;
-
     constructor(args: string|string[], options: {});
 
-    env: {};
+    env: {
+        error(...e: Error[]): void
+    };
     args: {};
     resolved: string;
     description: string;
@@ -77,7 +100,7 @@ declare class Base extends EventEmitter {
     destinationRoot(rootPath?: string): string;
     determineAppname(): string;
     option(name: string, config: Base.OptionConfig): this;
-    prompt(questions: Questions): Promise<Answers>;
+    prompt(questions: Base.Questions): Promise<Base.Answers>;
     registerTransformStream(stream: {}|Array<{}>): this;
     rootGeneratorName(): string;
     rootGeneratorVersion(): string;
@@ -97,20 +120,97 @@ declare class Base extends EventEmitter {
     spawnCommandSync(command: string, args: string[], opt?: {}): any;
 
     // actions/install mixin
-    bowerInstall(component?: string|string[], options?: {}, cb?: Callback, spawnOptions?: {}): this;
-    installDependencies(options?: Base.InstallOptions): this;
-    npmInstall(pkgs?: string|string[], options?: {}, cb?: Callback, spawnOptions?: {}): this;
-    runInstall(installer: string, paths?: string|string[], options?: {}, cb?: Callback, spawnOptions?: {}): this;
-    yarnInstall(pkgs?: string|string[], options?: {}, cb?: Callback, spawnOptions?: {}): this;
+    /**
+     * Receives a list of `components` and an `options` object to install through bower.
+     *
+     * The installation will automatically run during the run loop `install` phase.
+     *
+     * @param component Components to install
+     * @param options Options to pass to `dargs` as arguments
+     * @param spawnOptions Options to pass `child_process.spawn`.
+     * @return Resolved if install successful, rejected otherwise
+     */
+    bowerInstall(component?: string|string[], options?: object, spawnOptions?: object): Promise<void>;
+    /**
+     * Runs `npm` and `bower`, in sequence, in the generated directory and prints a
+     * message to let the user know.
+     *
+     * @example
+     * this.installDependencies({
+     *   bower: true,
+     *   npm: true
+     * }).then(() => console.log('Everything is ready!'));
+     *
+     * @example
+     * this.installDependencies({
+     *   yarn: {force: true},
+     *   npm: false
+     * }).then(() => console.log('Everything is ready!'));
+     *
+     * @return Resolved if install successful, rejected otherwise
+     */
+    installDependencies(options?: Base.InstallOptions): Promise<void>;
+    /**
+     * Receives a list of `packages` and an `options` object to install through npm.
+     *
+     * The installation will automatically run during the run loop `install` phase.
+     *
+     * @param pkgs Packages to install
+     * @param options Options to pass to `dargs` as arguments
+     * @param spawnOptions Options to pass `child_process.spawn`.
+     * @return Resolved if install successful, rejected otherwise
+     */
+    npmInstall(pkgs?: string|string[], options?: object, spawnOptions?: object): Promise<void>;
+    /**
+     * Combine package manager cmd line arguments and run the `install` command.
+     *
+     * During the `install` step, every command will be scheduled to run once, on the
+     * run loop. This means you can use `Promise.then` to log information, but don't
+     * return it or mix it with `this.async` as it'll dead lock the process.
+     *
+     * @param installer Which package manager to use
+     * @param paths Packages to install. Use an empty string for `npm install`
+     * @param options Options to pass to `dargs` as arguments
+     * @param spawnOptions Options to pass `child_process.spawn`. ref
+     *                     https://nodejs.org/api/child_process.html#child_process_child_process_spawn_command_args_options
+     * @return Resolved if install successful, rejected otherwise
+     */
+    runInstall(installer: string, paths?: string|string[], options?: object, spawnOptions?: object): Promise<void>;
+    /**
+     * Receives a list of `packages` and an `options` object to install through npm.
+     *
+     * The installation will automatically run during the run loop `install` phase.
+     *
+     * @param pkgs Packages to install
+     * @param options Options to pass to `dargs` as arguments
+     * @param spawnOptions Options to pass `child_process.spawn`.
+     * @return Resolved if install successful, rejected otherwise
+     */
+    yarnInstall(pkgs?: string|string[], options?: object, spawnOptions?: object): Promise<void>;
 
     // actions/user mixin
     readonly user: {
         readonly git: {
+            /**
+             * Retrieves user's email from Git in the global scope or the project scope
+             * (it'll take what Git will use in the current context)
+             * @return configured git email or undefined
+             */
             email(): string;
+            /**
+             * Retrieves user's name from Git in the global scope or the project scope
+             * (it'll take what Git will use in the current context)
+             * @return configured git name or undefined
+             */
             name(): string;
         };
         readonly github: {
-            username(): string;
+            /**
+             * Retrieves GitHub's username from the GitHub API
+             * @return Resolved with the GitHub username or rejected if unable to
+             *         get the information
+             */
+            username(): Promise<string>;
         }
     };
 }
diff --git a/types/yeoman-generator/yeoman-generator-tests.ts b/types/yeoman-generator/yeoman-generator-tests.ts
index f6655aab17..52136a885a 100644
--- a/types/yeoman-generator/yeoman-generator-tests.ts
+++ b/types/yeoman-generator/yeoman-generator-tests.ts
@@ -1,15 +1,9 @@
 import Base = require('yeoman-generator');
-import { Questions, Answers } from 'inquirer';
+import { Questions, Answers } from 'yeoman-generator';
 import { EventEmitter } from 'events';
 
 class MyES2015Generator extends Base {}
 
-const MyGenerator = Base.extend({
-  writing(this: Base): void {
-    this.fs.write('var foo = 1;', this.destinationPath('index.js'));
-  }
-});
-
 const generator = new MyES2015Generator(['arg1', 'arg2'], { opt1: 'foo', opt2: 3, opt3: false });
 const eventEmitter: EventEmitter = generator;
 
@@ -48,42 +42,37 @@ generator.argument('arg4', {
 
 const argsHelp = generator.argumentsHelp();
 
-generator.installDependencies();
-generator.installDependencies({
-  bower: true,
-  npm: true,
-  callback() {
-    console.log('Everything is ready!');
-  }
-});
+async function install() {
+    await generator.installDependencies();
+    await generator.installDependencies({
+        bower: true,
+        npm: true,
+    });
 
-generator.bowerInstall();
-generator.bowerInstall('pkg');
-generator.bowerInstall(['pkg1', 'pkg2']);
-generator.bowerInstall('pkg', {});
-generator.bowerInstall('pkg', { 'custom-option': 3 }, () => {});
-generator.bowerInstall('pkg', {}, () => {}, {});
+    await generator.bowerInstall();
+    await generator.bowerInstall('pkg');
+    await generator.bowerInstall(['pkg1', 'pkg2']);
+    await generator.bowerInstall('pkg', {});
+    await generator.bowerInstall('pkg', { 'custom-option': 3 }, {});
 
-generator.npmInstall();
-generator.npmInstall('pkg');
-generator.npmInstall(['pkg1', 'pkg2']);
-generator.npmInstall('pkg', {});
-generator.npmInstall('pkg', { 'custom-option': 3 }, () => {});
-generator.npmInstall('pkg', {}, () => {}, {});
+    await generator.npmInstall();
+    await generator.npmInstall('pkg');
+    await generator.npmInstall(['pkg1', 'pkg2']);
+    await generator.npmInstall('pkg', {});
+    await generator.npmInstall('pkg', { 'custom-option': 3 }, {});
 
-generator.yarnInstall();
-generator.yarnInstall('pkg');
-generator.yarnInstall(['pkg1', 'pkg2']);
-generator.yarnInstall('pkg', {});
-generator.yarnInstall('pkg', { 'custom-option': 3 }, () => {});
-generator.yarnInstall('pkg', {}, () => {}, {});
+    await generator.yarnInstall();
+    await generator.yarnInstall('pkg');
+    await generator.yarnInstall(['pkg1', 'pkg2']);
+    await generator.yarnInstall('pkg', {});
+    await generator.yarnInstall('pkg', { 'custom-option': 3 }, {});
 
-generator.runInstall('installer');
-generator.runInstall('installer', 'pkg');
-generator.runInstall('installer', ['pkg1', 'pkg2']);
-generator.runInstall('installer', 'pkg', {});
-generator.runInstall('installer', 'pkg', { 'custom-option': 3 }, () => {});
-generator.runInstall('installer', 'pkg', {}, () => {}, {});
+    await generator.runInstall('installer');
+    await generator.runInstall('installer', 'pkg');
+    await generator.runInstall('installer', ['pkg1', 'pkg2']);
+    await generator.runInstall('installer', 'pkg', {});
+    await generator.runInstall('installer', 'pkg', { 'custom-option': 3 }, {});
+}
 
 const composed1: Base = generator.composeWith('bootstrap', { sass: true });
 const composed2: Base = generator.composeWith(require.resolve('generator-bootstrap/app/main.js'), { sass: true });
@@ -98,7 +87,7 @@ const appname2: string = generator.determineAppname();
 
 const gitEmail: string = generator.user.git.email();
 const gitName: string = generator.user.git.name();
-const githubUsername: string = generator.user.github.username();
+const githubUsername: Promise<string> = generator.user.github.username();
 
 const help: string = generator.help();
 
@@ -122,6 +111,10 @@ generator.option('opt4', {
 const optionsHelp: string = generator.optionsHelp();
 
 const answers: Promise<Answers> = generator.prompt([] as Questions);
+const answers2: Promise<Answers> = generator.prompt([{store: true}] as Questions);
+const answers3: Promise<Answers> = generator.prompt([{type: "input"}] as Questions);
+const answers4: Promise<Answers> = generator.prompt({type: "input"});
+const answers5: Promise<Answers> = generator.prompt({type: "input", store: false});
 
 generator.registerTransformStream([]);
 
diff --git a/types/yeoman-test/index.d.ts b/types/yeoman-test/index.d.ts
index 9106df49c4..7602d94a87 100644
--- a/types/yeoman-test/index.d.ts
+++ b/types/yeoman-test/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yeoman/yeoman-test
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 import { EventEmitter } from 'events';
 import Generator = require('yeoman-generator');
@@ -24,8 +24,8 @@ export type Dependency = string | [Generator, string];
  * cd into it, and create a dummy gruntfile inside. Intended for use
  * as a callback for the mocha `before` hook.
  *
- * @param {String} dir - path to the test directory
- * @returns {Function} mocha callback
+ * @param dir - path to the test directory
+ * @returns mocha callback
  */
 export function setUpTestDirectory(dir: string): (done: (...args: any[]) => void) => void;
 
@@ -34,16 +34,16 @@ export function setUpTestDirectory(dir: string): (done: (...args: any[]) => void
  * Generates a new Gruntfile.js in the current working directory based on
  * options hash passed in.
  *
- * @param {Object} options - Grunt configuration
- * @param {Function} done  - callback to call on completion
+ * @param options - Grunt configuration
+ * @param done  - callback to call on completion
  */
 export function gruntfile(options: Dictionary<any>, done: (...args: any[]) => void): void;
 
 /**
  * Clean-up the test directory and cd into it.
  * Call given callback after entering the test directory.
- * @param {String} dir - path to the test directory
- * @param {Function} cb - callback executed after setting working directory to dir
+ * @param dir - path to the test directory
+ * @param cb - callback executed after setting working directory to dir
  * @example
  * testDirectory(path.join(__dirname, './temp'), function () {
  *   fs.writeFileSync('testfile', 'Roses are red.');
@@ -53,8 +53,8 @@ export function testDirectory(dir: string, cb: (error?: any) => void): void;
 
 /**
  * Answer prompt questions for the passed-in generator
- * @param {Generator} generator - a Yeoman generator
- * @param {Object} answers - an object where keys are the
+ * @param generator - a Yeoman generator
+ * @param answers - an object where keys are the
  *   generators prompt names and values are the answers to
  *   the prompt questions
  * @example
@@ -64,14 +64,13 @@ export function mockPrompt(generator: Generator, answers: Dictionary<any>): void
 
 /**
  * Restore defaults prompts on a generator.
- * @param {Generator} generator
  */
 export function restorePrompt(generator: Generator): void;
 
 /**
  * Provide mocked values to the config
- * @param  {Generator} generator - a Yeoman generator
- * @param  {Object} localConfig - localConfig - should look just like if called config.getAll()
+ * @param  generator - a Yeoman generator
+ * @param  localConfig - localConfig - should look just like if called config.getAll()
  */
 export function mockLocalConfig(generator: Generator, localConfig: Dictionary<any>): void;
 
@@ -84,11 +83,11 @@ export function createDummyGenerator(): Generator;
  * Create a generator, using the given dependencies and controller arguments
  * Dependecies can be path (autodiscovery) or an array [<generator>, <name>]
  *
- * @param {String} name - the name of the generator
- * @param {Array} dependencies - paths to the generators dependencies
- * @param {Array|String} args - arguments to the generator;
+ * @param name - the name of the generator
+ * @param dependencies - paths to the generators dependencies
+ * @param args - arguments to the generator;
  *   if String, will be split on spaces to create an Array
- * @param {Object} options - configuration for the generator
+ * @param options - configuration for the generator
  * @example
  *  var deps = ['../../app',
  *              '../../common',
@@ -104,32 +103,31 @@ export function createGenerator(name: string, dependencies: Dependency[], args?:
  * Register a list of dependent generators into the provided env.
  * Dependecies can be path (autodiscovery) or an array [<generator>, <name>]
  *
- * @param {Array} dependencies - paths to the generators dependencies
+ * @param dependencies - paths to the generators dependencies
  */
 export function registerDependencies(env: any, dependencies: Dependency[]): void;
 
 /**
  * Run the provided Generator
- * @param  {String|Function} GeneratorOrNamespace - Generator constructor or namespace
- * @return {RunContext}
+ * @param  GeneratorOrNamespace - Generator constructor or namespace
  */
 export function run(GeneratorOrNamespace: string | Constructor<Generator>, settings?: RunContextSettings): RunContext;
 
 export interface RunContextSettings {
-  tmpdir: boolean;
+	/**
+	 * Automatically run this generator in a tmp dir
+	 * @default true
+	 */
+	tmpdir: boolean;
 }
 
 export interface RunContextConstructor {
 	/**
 	 * This class provide a run context object to façade the complexity involved in setting
 	 * up a generator for testing
-	 * @constructor
-	 * @param {String|Function} Generator - Namespace or generator constructor. If the later
+	 * @param Generator - Namespace or generator constructor. If the later
 	 *                                      is provided, then namespace is assumed to be
 	 *                                      'gen:test' in all cases
-	 * @param {Object} [settings]
-	 * @param {Boolean} [settings.tmpdir=true] - Automatically run this generator in a tmp dir
-	 * @return {this}
 	 */
 	new (Generator: string | Constructor<Generator>, settings?: RunContextSettings): RunContext;
 }
@@ -137,42 +135,40 @@ export interface RunContextConstructor {
 export interface RunContext extends EventEmitter {
 	/**
 	 * Hold the execution until the returned callback is triggered
-	 * @return {Function} Callback to notify the normal execution can resume
+	 * @return Callback to notify the normal execution can resume
 	 */
 	async(): () => void;
 
 	/**
 	 * Return a promise representing the generator run process
-	 * @return {Promise} Promise resolved on end or rejected on error
+	 * @return Promise resolved on end or rejected on error
 	 */
 	toPromise(): Promise<string>;
 
 	/**
 	 * Promise `.then()` duck typing
-	 * @return {Promise}
 	 */
 	then: Promise<string>['then'];
 
 	/**
 	 * Promise `.catch()` duck typing
-	 * @return {Promise}
 	 */
 	catch: Promise<string>['catch'];
 
 	/**
 	 * Clean the provided directory, then change directory into it
-	 * @param  {String} dirPath - Directory path (relative to CWD). Prefer passing an absolute
+	 * @param  dirPath - Directory path (relative to CWD). Prefer passing an absolute
 	 *                            file path for predictable results
-	 * @param {Function} [cb] - callback who'll receive the folder path as argument
-	 * @return {this} run context instance
+	 * @param [cb] - callback who'll receive the folder path as argument
+	 * @return run context instance
 	 */
 	inDir(dirPath: string, cb: (folderPath: string) => void): this;
 
 	/**
 	 * Change directory without deleting directory content.
-	 * @param  {String} dirPath - Directory path (relative to CWD). Prefer passing an absolute
+	 * @param  dirPath - Directory path (relative to CWD). Prefer passing an absolute
 	 *                            file path for predictable results
-	 * @return {this} run context instance
+	 * @return run context instance
 	 */
 	cd(dirPath: string): this;
 
@@ -182,8 +178,8 @@ export interface RunContext extends EventEmitter {
 	 * This method is called automatically when creating a RunContext. Only use it if you need
 	 * to use the callback.
 	 *
-	 * @param {Function} [cb] - callback who'll receive the folder path as argument
-	 * @return {this} run context instance
+	 * @param [cb] - callback who'll receive the folder path as argument
+	 * @return run context instance
 	 */
 	inTmpDir(cb: (folderPath: string) => void): this;
 
@@ -194,29 +190,25 @@ export interface RunContext extends EventEmitter {
 
 	/**
 	 * Provide arguments to the run context
-	 * @param  {String|Array} args - command line arguments as Array or space separated string
-	 * @return {this}
+	 * @param  args - command line arguments as Array or space separated string
 	 */
 	withArguments(args: string | string[]): this;
 
 	/**
 	 * Provide options to the run context
-	 * @param  {Object} options - command line options (e.g. `--opt-one=foo`)
-	 * @return {this}
+	 * @param  options - command line options (e.g. `--opt-one=foo`)
 	 */
 	withOptions(options: Dictionary<any>): this;
 
 	/**
 	 * Mock the prompt with dummy answers
-	 * @param  {Object} answers - Answers to the prompt questions
-	 * @return {this}
+	 * @param  answers - Answers to the prompt questions
 	 */
 	withPrompts(answers: Dictionary<any>): this;
 
 	/**
 	 * Provide dependent generators
-	 * @param {Array} dependencies - paths to the generators dependencies
-	 * @return {this}
+	 * @param dependencies - paths to the generators dependencies
 	 * @example
 	 * var angular = new RunContext('../../app');
 	 * angular.withGenerators([
@@ -233,8 +225,7 @@ export interface RunContext extends EventEmitter {
 
 	/**
 	 * Mock the local configuration with the provided config
-	 * @param  {Object} localConfig - should look just like if called config.getAll()
-	 * @return {this}
+	 * @param  localConfig - should look just like if called config.getAll()
 	 */
 	withLocalConfig(localConfig: Dictionary<any>): this;
 }
diff --git a/types/yfiles/index.d.ts b/types/yfiles/index.d.ts
index a3593bdc76..2d47b00067 100644
--- a/types/yfiles/index.d.ts
+++ b/types/yfiles/index.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for yFiles for HTML 2.0.1.2
+// Type definitions for yFiles for HTML 2.0.13
 // Project: http://www.yworks.com/products/yfiles-for-html
 // Definitions by: yWorks GmbH HTML Team <https://github.com/yGuy>
 // Definitions: https://github.com/yWorks/DefinitelyTyped
 
 /****************************************************************************
  **
- ** This file is part of yFiles for HTML 2.0.1.2
+ ** This file is part of yFiles for HTML 2.0.1.3
  **
  ** yWorks proprietary/confidential. Use is subject to license terms.
  **
@@ -25,8 +25,7 @@ declare namespace yfiles{
     function BaseClass(...base:any[]):yfiles.lang.ClassConstructor<yfiles.lang.Object>;
     function BaseClass<T>(...base:any[]):yfiles.lang.ClassConstructor<T>;
   }
-}
-declare namespace yfiles{
+}declare namespace yfiles{
   export namespace lang{
     /**
      * The root of the class hierarchy of the yFiles for HTML class framework.
@@ -158,15 +157,15 @@ declare namespace yfiles{
      * var MyList = yfiles.lang.Class('MyList', {
      *     $extends: my.AbstractList,
      *     $with: [my.Iterable, my.Collection],
-     *
+     * 
      *     constructor: function() { // the constructor function
      *     },
-     *
+     * 
      *     add: function(obj) { ... },
      *     size: { // transformed into a property
      *      'get': function() { return ...; }
      *     },
-     *
+     * 
      *     $static: {
      *      create: function() { ... }
      *     }
@@ -176,7 +175,7 @@ declare namespace yfiles{
      * list.add("hello");
      * list.size === 1; // true
      * </pre>
-     *
+     * 
      * <p>
      * The constructor property can be either a function (in case of a single constructor) or an object that is transformed
      * into named constructors.
@@ -197,7 +196,7 @@ declare namespace yfiles{
      * myrect = new Rect.FromPoint({x: 10, y: 10}, 50, 50);
      * myrect instanceof Rect; // true
      * </pre>
-     *
+     * 
      * <p>
      * Named constructors can call other constructors and can be written like any other constructor, i.e. <code>this</code> will be a new
      * instance of the class that is being constructed.
@@ -211,7 +210,7 @@ declare namespace yfiles{
      * <pre>
      * Rect.$super.toString.call(this);
      * </pre>
-     *
+     * 
      * <p>
      * If you do not specify the parent class of a new class, then {@link yfiles.lang.Object} will be used as its base type. The parent
      * class of {@link yfiles.lang.Object} is the standard JavaScript <code>Object.prototype</code>.
@@ -285,13 +284,13 @@ declare namespace yfiles{
        * //yfiles.lang.Class.injectInterfaces(myHitTestable, [yfiles.drawing.IHitTestable.$class, yfiles.support.ILookup.$class]);
        * //As well as using a variable number of arguments, such as:
        * //yfiles.lang.Class.injectInterfaces(myHitTestable, yfiles.drawing.IHitTestable, yfiles.support.ILookup);
-       *
+       * 
        * //This is true now:
        * yfiles.drawing.IHitTestable.isInstance(myHitTestable);
        * //And the object can be used where an interface instance is expected:
        * graphEditorInputMode.clickInputMode.validClickHitTestable = myHitTestable;
        * </pre>
-       *
+       * 
        * <p>
        * It is also possible to modify an object prototype, e.g. in TypeScript: Class definition:
        * </p>
@@ -302,7 +301,7 @@ declare namespace yfiles{
        *    }
        * }
        * </pre>
-       *
+       * 
        * <p>
        * Usage:
        * </p>
@@ -317,7 +316,7 @@ declare namespace yfiles{
        * //And the object can be used where an interface instance is expected:
        * graphEditorInputMode.clickInputMode.validClickHitTestable = myHitTestable;
        * </pre>
-       *
+       * 
        * @param obj The object to modify.
        * @param interfaces Array or variable number of {@link }s, {@link } objects of interfaces or fully qualified string
        * names of interfaces.
@@ -439,7 +438,7 @@ declare namespace yfiles{
       /**
        * This methods creates an instance of the struct in which all of its values are set to their default values without using
        * any of its constructors.
-       * @returns
+       * @returns 
        * @static
        */
       static createDefault():any;
@@ -478,7 +477,7 @@ declare namespace yfiles{
      *    });
      *    if(state === RequestState.FAILED) { ... }
      * </pre>
-     *
+     * 
      * @class
      */
     export interface Enum extends yfiles.lang.Object{}
@@ -691,7 +690,7 @@ declare namespace yfiles{
      * var attr = yfiles.lang.Attribute.getCustomAttribute(MyClass.$class, MyAttribute.$class);
      * console.log(attr.message + ' ' + attr.recipient); // 'hello world'
      * </pre>
-     *
+     * 
      * <p>
      * Even though MyAttribute is invoked at the definition of MyClass, no attribute is created until the reflection API is
      * used (in the above example: using getCustomAttribute).
@@ -908,7 +907,7 @@ declare namespace yfiles{
       /**
        * Compares this object to the given object of the same type.
        * @param obj The object to compare this to.
-       * @returns
+       * @returns 
        * <ul>
        * <li>-1: this is less than <code>obj</code></li>
        * <li>0: this is equal to <code>obj</code></li>
@@ -961,9 +960,9 @@ declare namespace yfiles{
        */
       constructor(ticks:number);
       /**
-       *
+       * 
        * @param obj
-       * @returns
+       * @returns 
        */
       compareTo(obj:any):number;
       /**
@@ -1131,12 +1130,12 @@ declare namespace yfiles{
        */
       constructor(options?:{entries?:Array<any>});
       /**
-       *
+       * 
        * @param item
        */
       add(item:yfiles.collections.MapEntry<TKey,TValue>):void;
       /**
-       *
+       * 
        */
       clear():void;
       /**
@@ -1146,69 +1145,69 @@ declare namespace yfiles{
        */
       containsValue(value:TValue):boolean;
       /**
-       *
+       * 
        * @param array
        * @param arrayIndex
        */
       copyTo(array:yfiles.collections.MapEntry<TKey,TValue>[],arrayIndex:number):void;
       /**
-       *
+       * 
        * @param key
-       * @returns
+       * @returns 
        */
       delete(key:TKey):boolean;
       /**
-       *
+       * 
        * @param key
-       * @returns
+       * @returns 
        */
       get(key:TKey):TValue;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<yfiles.collections.MapEntry<TKey,TValue>>;
       /**
-       *
+       * 
        * @param key
-       * @returns
+       * @returns 
        */
       has(key:TKey):boolean;
       /**
-       *
+       * 
        * @param item
-       * @returns
+       * @returns 
        */
       includes(item:yfiles.collections.MapEntry<TKey,TValue>):boolean;
       /**
-       *
+       * 
        * @param item
-       * @returns
+       * @returns 
        */
       remove(item:yfiles.collections.MapEntry<TKey,TValue>):boolean;
       /**
-       *
+       * 
        * @param key
        * @param value
        */
       set(key:TKey,value:TValue):void;
       /**
-       *
+       * 
        * @type {number}
        */
       size:number;
       /**
-       *
+       * 
        * @type {boolean}
        */
       isReadOnly:boolean;
       /**
-       *
+       * 
        * @type {yfiles.collections.ICollection.<TKey>}
        */
       keys:yfiles.collections.ICollection<TKey>;
       /**
-       *
+       * 
        * @type {yfiles.collections.ICollection.<TValue>}
        */
       values:yfiles.collections.ICollection<TValue>;
@@ -1301,7 +1300,7 @@ declare namespace yfiles{
        * Getter: if there is no key/value pair with the given key in this dictionary <code>null</code> will be returned.
        * </p>
        * @param key
-       * @returns
+       * @returns 
        * @see yfiles.collections.IMap.<TKey,TValue>#set
        * @abstract
        */
@@ -1352,9 +1351,9 @@ declare namespace yfiles{
      */
     export interface IEnumerable<T> extends yfiles.lang.Object{
       /**
-       *
+       * 
        * @param enumerable
-       * @returns
+       * @returns 
        */
       concat?(enumerable:yfiles.collections.IEnumerable<T>):yfiles.collections.IEnumerable<T>;
       /**
@@ -1560,7 +1559,7 @@ declare namespace yfiles{
      *   var current = e.current;
      * }
      * </pre>
-     *
+     * 
      * Type parameter <code>T</code>.
      * @interface
      * @template T
@@ -1702,7 +1701,7 @@ declare namespace yfiles{
        */
       constructor(options?:{items?:Array<any>});
       /**
-       *
+       * 
        * @param item
        */
       add(item:T):void;
@@ -1723,11 +1722,11 @@ declare namespace yfiles{
        */
       binarySearch(item:T,comparer:yfiles.collections.IComparer<T>):number;
       /**
-       *
+       * 
        */
       clear():void;
       /**
-       *
+       * 
        * @param array
        * @param arrayIndex
        */
@@ -1757,38 +1756,38 @@ declare namespace yfiles{
        */
       static fromArray<T>(array:T[]):yfiles.collections.List<T>;
       /**
-       *
+       * 
        * @param index
-       * @returns
+       * @returns 
        */
       get(index:number):T;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<T>;
       /**
-       *
+       * 
        * @param item
-       * @returns
+       * @returns 
        */
       includes(item:T):boolean;
       /**
-       *
+       * 
        * @param item
-       * @returns
+       * @returns 
        */
       indexOf(item:T):number;
       /**
-       *
+       * 
        * @param index
        * @param item
        */
       insert(index:number,item:T):void;
       /**
-       *
+       * 
        * @param item
-       * @returns
+       * @returns 
        */
       remove(item:T):boolean;
       /**
@@ -1799,7 +1798,7 @@ declare namespace yfiles{
        */
       removeAll(match:(obj:T)=>boolean):number;
       /**
-       *
+       * 
        * @param index
        */
       removeAt(index:number):void;
@@ -1814,7 +1813,7 @@ declare namespace yfiles{
        */
       reverse():void;
       /**
-       *
+       * 
        * @param index
        * @param value
        */
@@ -1839,12 +1838,12 @@ declare namespace yfiles{
        */
       toArray():T[];
       /**
-       *
+       * 
        * @type {number}
        */
       size:number;
       /**
-       *
+       * 
        * @type {boolean}
        */
       isReadOnly:boolean;
@@ -1863,7 +1862,7 @@ declare namespace yfiles{
        * Compares two objects of type T.
        * @param x The first object.
        * @param y The second object.
-       * @returns
+       * @returns 
        * <ul>
        * <li>-1: <code>x</code> is less than <code>y</code></li>
        * <li>0: <code>x</code> is equal to <code>y</code></li>
@@ -1912,7 +1911,7 @@ declare namespace yfiles{
       copyTo(array:T[],arrayIndex:number):void;
       /**
        * Returns an enumerator over the elements in this collection.
-       * @returns
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<T>;
       /**
@@ -2065,18 +2064,18 @@ declare namespace yfiles{
        */
       clear():void;
       /**
-       *
+       * 
        * @param key
        */
       delete(key:K):void;
       /**
-       *
+       * 
        * @param key
-       * @returns
+       * @returns 
        */
       get(key:K):V;
       /**
-       *
+       * 
        * @param key
        * @param value
        */
@@ -2218,14 +2217,14 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param i
-       * @returns
+       * @returns 
        */
       get(i:number):T;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<T>;
       /**
@@ -2234,7 +2233,7 @@ declare namespace yfiles{
        */
       backingEnumerable:yfiles.collections.IEnumerable<T>;
       /**
-       *
+       * 
        * @type {number}
        */
       size:number;
@@ -2500,7 +2499,7 @@ declare namespace yfiles{
        *    &lt;/PropertyTypeName>
        * &lt;/ParentObjectName.Name>
        * </pre>
-       *
+       * 
        * <p>
        * Default value is <code>true</code>.
        * </p>
@@ -2589,7 +2588,7 @@ declare namespace yfiles{
        * <pre>
        * {x:Static myNSDeclarationPrefix:ContainingType.ContainedTypeSingleton}
        * </pre>
-       *
+       * 
        * @type {Array.<yfiles.lang.Class>}
        */
       singletonContainers:yfiles.lang.Class[];
@@ -3707,7 +3706,7 @@ declare namespace yfiles{
       flushDocument():void;
       /**
        * Gets a text representation of all content that has been written so far.
-       * @returns
+       * @returns 
        * @abstract
        */
       getXmlString():string;
@@ -5104,7 +5103,7 @@ declare namespace yfiles{
        * <p>
        * This method is called for each read or write process.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       createXamlNameMapper():yfiles.graphml.IXamlNameMapper;
@@ -5113,7 +5112,7 @@ declare namespace yfiles{
        * <p>
        * This method is called for each write process.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       createXamlPrefixMapper():yfiles.graphml.IXamlPrefixMapper;
@@ -5476,7 +5475,7 @@ declare namespace yfiles{
        * @param document The XML document. <b>Note</b>: If you are using Internet Explorer 9 and {@link }s to retrieve the document, you may not use
        * the value from the {@link #responseXML} property. Please parse {@link #responseText} instead and use the
        * result. For further reference see {@link http://msdn.microsoft.com/en-us/library/ie/hh180177.aspx}.
-       * @returns
+       * @returns 
        * @throws {Stubs.Exceptions.ArgumentError} <code>document</code> is null.
        * @throws {Stubs.Exceptions.ArgumentError} <code>graph</code> is null.
        */
@@ -5485,7 +5484,7 @@ declare namespace yfiles{
        * Convenience method that imports the <code>graph</code> from an XML data provided in a string <code>data</code>.
        * @param graph The Graph object that is to be populated with nodes and edges as read from the GraphML data.
        * @param data A string that contains GraphML data.
-       * @returns
+       * @returns 
        */
       readFromGraphMLText(graph:yfiles.graph.IGraph,data:string):Promise<yfiles.graph.IGraph>;
       /**
@@ -5496,7 +5495,7 @@ declare namespace yfiles{
        * </p>
        * @param graph The Graph object that is to be populated with nodes and edges as read from the GraphML file.
        * @param url The url of the file to be read.
-       * @returns
+       * @returns 
        * @throws {Stubs.Exceptions.ArgumentError} <code>url</code> is null.
        * @throws {Stubs.Exceptions.ArgumentError} <code>graph</code> is null.
        */
@@ -6143,7 +6142,7 @@ declare namespace yfiles{
       isInstance(o:any):o is yfiles.graphml.IGenericInputHandlerFactory;
     };
     /**
-     *
+     * 
      * @class
      */
     export interface GraphMLSupport extends yfiles.lang.Object{}
@@ -6353,33 +6352,33 @@ declare namespace yfiles{
        */
       constructor(parentContext:yfiles.graphml.IParseContext);
       /**
-       *
+       * 
        * Type parameter <code>T</code>.
        * @param targetType
        * @param context
        * @param targetNode
-       * @returns
+       * @returns 
        * @template T
        */
       deserializeCore<T>(targetType:yfiles.lang.Class,context:yfiles.graphml.IParseContext,targetNode:Node):T;
       /**
-       *
+       * 
        * Type parameter <code>T</code>.
        * @param itemType
-       * @returns
+       * @returns 
        * @template T
        */
       getCurrent<T>(itemType:yfiles.lang.Class):T;
       /**
-       *
+       * 
        * @param key
-       * @returns
+       * @returns 
        */
       getDeserializationProperty(key:string):any;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -6415,17 +6414,17 @@ declare namespace yfiles{
        */
       parentContext:yfiles.graphml.IParseContext;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<any>}
        */
       objectStack:yfiles.collections.IListEnumerable<any>;
       /**
-       *
+       * 
        * @type {yfiles.graphml.IParseEvents}
        */
       parseEvents:yfiles.graphml.IParseEvents;
       /**
-       *
+       * 
        * @type {yfiles.graph.IGraph}
        */
       graph:yfiles.graph.IGraph;
@@ -6596,7 +6595,7 @@ declare namespace yfiles{
       /**
        * Retrieve a deserialization property that has been set by {@link yfiles.graphml.GraphMLParser#setDeserializationProperty}.
        * @param key The key for the property.
-       * @returns
+       * @returns 
        * @see yfiles.graphml.IParseContext#getDeserializationProperty
        */
       getDeserializationProperty(key:string):any;
@@ -6667,7 +6666,7 @@ declare namespace yfiles{
        * and use the result. For further reference see {@link http://msdn.microsoft.com/en-us/library/ie/hh180177.aspx}.
        * @param graph The graph instance that is populated.
        * @param elementFactory The {@link } instance that is used to create the elements.
-       * @returns
+       * @returns 
        * @see yfiles.graphml.GraphMLIOHandler#readFromDocument
        */
       parseFromDocument(graph:yfiles.graph.IGraph,document:Document,elementFactory:yfiles.graphml.IGraphElementFactory):Promise<yfiles.graph.IGraph>;
@@ -6679,7 +6678,7 @@ declare namespace yfiles{
        * @param url The URL to the input to parse.
        * @param graph The graph instance that is populated.
        * @param elementFactory The {@link } instance that is used to create the elements.
-       * @returns
+       * @returns 
        * @see yfiles.graphml.GraphMLIOHandler#readFromGraphMLText
        */
       parseFromURL(graph:yfiles.graph.IGraph,url:string,elementFactory:yfiles.graphml.IGraphElementFactory):Promise<yfiles.graph.IGraph>;
@@ -6968,61 +6967,61 @@ declare namespace yfiles{
        * Factory method to create a default implementation of {@link yfiles.graphml.IGraphElementIdProvider} that delegates to <code>fallback</code>
        * and uses the values stored by this {@link yfiles.graphml.GraphElementIdAcceptor} instance, if possible.
        * @param fallback The fallback.
-       * @returns
+       * @returns 
        */
       createIdProvider(fallback:yfiles.graphml.IGraphElementIdProvider):yfiles.graphml.IGraphElementIdProvider;
       /**
-       *
+       * 
        * @param context
        * @param id
-       * @returns
+       * @returns 
        */
       resolveEdge(context:yfiles.graphml.IParseContext,id:string):yfiles.graph.IEdge;
       /**
-       *
+       * 
        * @param context
        * @param id
-       * @returns
+       * @returns 
        */
       resolveGraph(context:yfiles.graphml.IParseContext,id:string):yfiles.graph.IGraph;
       /**
-       *
+       * 
        * @param context
        * @param id
-       * @returns
+       * @returns 
        */
       resolveNode(context:yfiles.graphml.IParseContext,id:string):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param context
        * @param ownerId
        * @param id
-       * @returns
+       * @returns 
        */
       resolvePort(context:yfiles.graphml.IParseContext,ownerId:string,id:string):yfiles.graph.IPort;
       /**
-       *
+       * 
        * @param context
        * @param edge
        * @param id
        */
       storeEdgeId(context:yfiles.graphml.IParseContext,edge:yfiles.graph.IEdge,id:string):void;
       /**
-       *
+       * 
        * @param context
        * @param graph
        * @param id
        */
       storeGraphId(context:yfiles.graphml.IParseContext,graph:yfiles.graph.IGraph,id:string):void;
       /**
-       *
+       * 
        * @param context
        * @param node
        * @param id
        */
       storeNodeId(context:yfiles.graphml.IParseContext,node:yfiles.graph.INode,id:string):void;
       /**
-       *
+       * 
        * @param context
        * @param port
        * @param id
@@ -7435,23 +7434,23 @@ declare namespace yfiles{
        */
       constructor(parentContext:yfiles.graphml.IWriteContext);
       /**
-       *
+       * 
        * Type parameter <code>T</code>.
        * @param itemType
-       * @returns
+       * @returns 
        * @template T
        */
       getCurrent<T>(itemType:yfiles.lang.Class):T;
       /**
-       *
+       * 
        * @param key
-       * @returns
+       * @returns 
        */
       getSerializationProperty(key:string):any;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -7467,7 +7466,7 @@ declare namespace yfiles{
        */
       removeSerializationProperty(key:string):void;
       /**
-       *
+       * 
        * Type parameter <code>T</code>.
        * @param targetType
        * @param context
@@ -7491,12 +7490,12 @@ declare namespace yfiles{
        */
       setSerializationProperty(key:string,value:any):void;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<any>}
        */
       objectStack:yfiles.collections.IListEnumerable<any>;
       /**
-       *
+       * 
        * @type {yfiles.graphml.IWriteEvents}
        */
       writeEvents:yfiles.graphml.IWriteEvents;
@@ -7514,7 +7513,7 @@ declare namespace yfiles{
        */
       writer:yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @type {yfiles.graph.IGraph}
        */
       graph:yfiles.graph.IGraph;
@@ -7557,7 +7556,7 @@ declare namespace yfiles{
       /**
        * Retrieve a serialization property that has been set by {@link yfiles.graphml.GraphMLWriter#setSerializationProperty}.
        * @param key The key for the property.
-       * @returns
+       * @returns 
        * @see yfiles.graphml.IWriteContext#getSerializationProperty
        */
       getSerializationProperty(key:string):any;
@@ -8084,12 +8083,12 @@ declare namespace yfiles{
        */
       precedence:yfiles.graphml.WritePrecedence;
       /**
-       *
+       * 
        * @type {yfiles.collections.IEnumerable.<yfiles.graphml.GraphMLXmlAttribute>}
        */
       keyDefinitionAttributes:yfiles.collections.IEnumerable<yfiles.graphml.GraphMLXmlAttribute>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IEnumerable.<yfiles.graphml.GraphMLXmlAttribute>}
        */
       dataTagAttributes:yfiles.collections.IEnumerable<yfiles.graphml.GraphMLXmlAttribute>;
@@ -8160,7 +8159,7 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param addEndTag
        * @protected
        */
@@ -8172,81 +8171,81 @@ declare namespace yfiles{
        */
       createNamespaceManager():yfiles.graphml.IXmlNamespaceManager;
       /**
-       *
+       * 
        */
       flushDocument():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getXmlString():string;
       /**
-       *
+       * 
        * @param prefix
        * @param localName
        * @param ns
        * @param value
-       * @returns
+       * @returns 
        */
       writeAttributeNS(prefix:string,localName:string,ns:string,value:string):yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @param content
-       * @returns
+       * @returns 
        */
       writeCData(content:string):yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @param comment
-       * @returns
+       * @returns 
        */
       writeComment(comment:string):yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @param fragment
-       * @returns
+       * @returns 
        */
       writeDocumentFragment(fragment:Document):yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        */
       writeEndDocument():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       writeEndElement():yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @param target
        * @param data
-       * @returns
+       * @returns 
        */
       writeProcessingInstruction(target:string,data:string):yfiles.graphml.IXmlWriter;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       writeStartDocument():yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @param prefix
        * @param localName
        * @param ns
-       * @returns
+       * @returns 
        */
       writeStartElement(prefix:string,localName:string,ns:string):yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @param localName
        * @param ns
-       * @returns
+       * @returns 
        */
       writeStartElement(localName:string,ns:string):yfiles.graphml.IXmlWriter;
       /**
-       *
+       * 
        * @param s
-       * @returns
+       * @returns 
        */
       writeString(s:string):yfiles.graphml.IXmlWriter;
       /**
@@ -8507,15 +8506,15 @@ declare namespace yfiles{
        */
       constructor(context:yfiles.graphml.IParseContext);
       /**
-       *
+       * 
        * @param property
-       * @returns
+       * @returns 
        */
       getValueSerializerFor(property:yfiles.graphml.Property):yfiles.graphml.ValueSerializer;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       getValueSerializerFor(type:yfiles.lang.Class):yfiles.graphml.ValueSerializer;
       /**
@@ -8545,15 +8544,15 @@ declare namespace yfiles{
        */
       constructor(context:yfiles.graphml.IWriteContext);
       /**
-       *
+       * 
        * @param property
-       * @returns
+       * @returns 
        */
       getValueSerializerFor(property:yfiles.graphml.Property):yfiles.graphml.ValueSerializer;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       getValueSerializerFor(type:yfiles.lang.Class):yfiles.graphml.ValueSerializer;
       /**
@@ -8807,14 +8806,14 @@ declare namespace yfiles{
       /**
        * Animates the given animation instance and triggers the callback upon completion.
        * @param animation The animation to perform.
-       * @returns
+       * @returns 
        */
       animate(animation:yfiles.view.IAnimation):Promise<yfiles.view.IAnimation>;
       /**
        * Starts animating the given animation for the specified duration.
        * @param callback The callback to use for the animation.
        * @param duration The duration in milliseconds that the animation should last.
-       * @returns
+       * @returns 
        */
       animate(callback:(time:number)=>void,duration:yfiles.lang.TimeSpan):Promise<yfiles.view.IAnimation>;
       /**
@@ -8907,7 +8906,7 @@ declare namespace yfiles{
        * </p>
        * @param [easeIn=0.5] The ratio for the ease-in time [0,1] where 0 is the start of the animation and 1 the end. <code>0.5</code> is the default value.
        * @param [easeOut=0.5] The ratio for the ease-out time [0,1] where 0 is the start of the animation and 1 the end. <code>0.5</code> is the default value.
-       * @returns
+       * @returns 
        */
       createEasedAnimation?(easeIn?:number,easeOut?:number):yfiles.view.IAnimation;
       /**
@@ -8924,7 +8923,7 @@ declare namespace yfiles{
        * @param {Object} options The parameters to pass.
        * @param [options.easeIn=0.5] The ratio for the ease-in time [0,1] where 0 is the start of the animation and 1 the end. <code>0.5</code> is the default value.
        * @param [options.easeOut=0.5] The ratio for the ease-out time [0,1] where 0 is the start of the animation and 1 the end. <code>0.5</code> is the default value.
-       * @returns
+       * @returns 
        */
       createEasedAnimation?(options:{easeIn?:number,easeOut?:number}):yfiles.view.IAnimation;
       /**
@@ -8964,7 +8963,7 @@ declare namespace yfiles{
        * @param endSourceLocation The absolute position of the source port after the animation.
        * @param endTargetLocation The absolute position of the target port after the animation.
        * @param preferredDuration The preferred duration of the animation in milliseconds.
-       * @returns
+       * @returns 
        * @static
        */
       createEdgeSegmentAnimation?(graph:yfiles.graph.IGraph,edge:yfiles.graph.IEdge,endBends:yfiles.geometry.IPoint[],endSourceLocation:yfiles.geometry.Point,endTargetLocation:yfiles.geometry.Point,preferredDuration:yfiles.lang.TimeSpan):yfiles.view.IAnimation;
@@ -8977,7 +8976,7 @@ declare namespace yfiles{
        * @param targetLayoutParameters The label model parameters for each label after the animation.
        * @param targetPortLocations The {@link }s for each {@link } in the graph that will be morphed.
        * @param preferredDuration The preferred duration of the animation in milliseconds.
-       * @returns
+       * @returns 
        * @static
        */
       createGraphAnimation?(graph:yfiles.graph.IGraph,targetNodeLayouts:yfiles.collections.IMapper<yfiles.graph.INode,yfiles.geometry.IRectangle>,targetBendLocations:yfiles.collections.IMapper<yfiles.graph.IEdge,yfiles.geometry.IPoint[]>,targetPortLocations:yfiles.collections.IMapper<yfiles.graph.IPort,yfiles.graph.IPortLocationModelParameter>,targetLayoutParameters:yfiles.collections.IMapper<yfiles.graph.ILabel,yfiles.graph.ILabelModelParameter>,preferredDuration:yfiles.lang.TimeSpan):yfiles.view.IAnimation;
@@ -9009,7 +9008,7 @@ declare namespace yfiles{
        * @param graph the graph for which the layout should be animated
        * @param layoutGraph the {@link } that contains all target layout information
        * @param preferredDuration the preferred duration of the animation
-       * @returns
+       * @returns 
        * @static
        */
       createLayoutAnimation?(graph:yfiles.graph.IGraph,layoutGraph:yfiles.layout.CopiedLayoutGraph,preferredDuration:yfiles.lang.TimeSpan):yfiles.view.IAnimation;
@@ -9041,7 +9040,7 @@ declare namespace yfiles{
        * @param path The path to animate the point along.
        * @param animationPoint The mutable point instance that will be manipulated by the animation.
        * @param preferredDuration The preferred duration of the animation.
-       * @returns
+       * @returns 
        * @static
        */
       createPathAnimation?(path:yfiles.geometry.GeneralPath,animationPoint:yfiles.geometry.IMutablePoint,preferredDuration:yfiles.lang.TimeSpan):yfiles.view.IAnimation;
@@ -9073,7 +9072,7 @@ declare namespace yfiles{
        * @param table The table to animate.
        * @param columnLayout The sizes of the <b>leaf</b> columns, in natural order.
        * @param rowLayout The sizes of the <b>leaf</b> rows, in natural order.
-       * @returns
+       * @returns 
        * @static
        */
       createTableAnimation?(table:yfiles.graph.ITable,columnLayout:number[],rowLayout:number[]):yfiles.view.IAnimation;
@@ -9111,7 +9110,7 @@ declare namespace yfiles{
        */
       constructor(options:{canvas:yfiles.view.CanvasComponent,targetBounds:yfiles.geometry.Rect,preferredDuration?:yfiles.lang.TimeSpan,considerViewportLimiter?:boolean,maximumTargetZoom?:number});
       /**
-       *
+       * 
        * @param time
        */
       animate(time:number):void;
@@ -9560,7 +9559,7 @@ declare namespace yfiles{
        * This will return the canvas object that is painted last at the given position.
        * </p>
        * @param location the coordinates of the query in the world coordinate system
-       * @returns
+       * @returns 
        */
       getCanvasObject(location:yfiles.geometry.Point):yfiles.view.ICanvasObject;
       /**
@@ -9587,7 +9586,7 @@ declare namespace yfiles{
       /**
        * Gets the {@link yfiles.view.CanvasComponent} instance that is associated with the given DOM element, or null.
        * @param element
-       * @returns
+       * @returns 
        * @static
        */
       static getComponent(element:Element):yfiles.view.CanvasComponent;
@@ -9719,9 +9718,9 @@ declare namespace yfiles{
        */
       localToGlobal(localPoint:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -11304,7 +11303,7 @@ declare namespace yfiles{
        * controlled for each image individually by overwriting the predicate method {@link yfiles.view.SvgExport#shouldInlineSvgImage}.
        * </p>
        * @param canvas The canvas to be exported.
-       * @returns
+       * @returns 
        */
       exportSvgAsync(canvas:yfiles.view.CanvasComponent):Promise<Element>;
       /**
@@ -11704,7 +11703,7 @@ declare namespace yfiles{
        * @param layout
        * @param [morphDuration=null]
        * @param [layoutData=null]
-       * @returns
+       * @returns 
        */
       morphLayout(layout:yfiles.layout.ILayoutAlgorithm,morphDuration?:yfiles.lang.TimeSpan,layoutData?:yfiles.layout.LayoutData):Promise<any>;
       /**
@@ -11721,7 +11720,7 @@ declare namespace yfiles{
        * @param options.layout
        * @param [options.morphDuration=null]
        * @param [options.layoutData=null]
-       * @returns
+       * @returns 
        */
       morphLayout(options:{layout:yfiles.layout.ILayoutAlgorithm,morphDuration?:yfiles.lang.TimeSpan,layoutData?:yfiles.layout.LayoutData}):Promise<any>;
       /**
@@ -12056,7 +12055,7 @@ declare namespace yfiles{
        * @param canvas the canvas
        * @param [zoom=0] the zoom level
        * @param [hitTestRadius=-1] the hit test radius
-       * @returns
+       * @returns 
        * @static
        */
       createCanvasContext?(canvas:yfiles.view.CanvasComponent,zoom?:number,hitTestRadius?:number):yfiles.view.ICanvasContext;
@@ -12069,7 +12068,7 @@ declare namespace yfiles{
        * @param options.canvas the canvas
        * @param [options.zoom=0] the zoom level
        * @param [options.hitTestRadius=-1] the hit test radius
-       * @returns
+       * @returns 
        * @static
        */
       createCanvasContext?(options:{canvas:yfiles.view.CanvasComponent,zoom?:number,hitTestRadius?:number}):yfiles.view.ICanvasContext;
@@ -13052,7 +13051,7 @@ declare namespace yfiles{
     export interface ItemModelManager<T> extends yfiles.lang.Object{}
     export class ItemModelManager<T> {
       /**
-       *
+       * 
        * @param itemType The type of managed items.
        */
       constructor(itemType:yfiles.lang.Class);
@@ -13213,12 +13212,12 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        */
       clear():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<T>;
       /**
@@ -13271,17 +13270,17 @@ declare namespace yfiles{
        */
       selection:yfiles.collections.IObservableCollection<T>;
       /**
-       *
+       * 
        * @type {number}
        */
       size:number;
       /**
-       *
+       * 
        * @param listener
        */
       addItemSelectionChangedListener(listener:(sender:any,evt:yfiles.view.ItemSelectionChangedEventArgs<T>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeItemSelectionChangedListener(listener:(sender:any,evt:yfiles.view.ItemSelectionChangedEventArgs<T>)=>void):void;
@@ -13671,7 +13670,7 @@ declare namespace yfiles{
       /**
        * Adds an item to the current selection.
        * @param item The item whose selection decorator will added.
-       * @returns
+       * @returns 
        */
       addSelection(item:T):yfiles.view.ICanvasObject;
       /**
@@ -13769,16 +13768,16 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -13863,7 +13862,7 @@ declare namespace yfiles{
       /**
        * Creates an instance that returns the given model as the bounds.
        * @param bounds the rectangle
-       * @returns
+       * @returns 
        * @static
        */
       fromRectangle?(bounds:yfiles.geometry.IRectangle):yfiles.view.IBoundsProvider;
@@ -14109,14 +14108,14 @@ declare namespace yfiles{
       /**
        * Returns <code>null</code>.
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
        * Returns <code>null</code>.
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -14167,11 +14166,11 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param context
        * @param group
        * @param item
-       * @returns
+       * @returns 
        */
       addCanvasObject(context:yfiles.view.ICanvasContext,group:yfiles.view.ICanvasObjectGroup,item:any):yfiles.view.ICanvasObject;
       /**
@@ -14236,11 +14235,11 @@ declare namespace yfiles{
        */
       constructor(point:yfiles.geometry.IPoint);
       /**
-       *
+       * 
        * @param context
        * @param group
        * @param item
-       * @returns
+       * @returns 
        */
       addCanvasObject(context:yfiles.view.ICanvasContext,group:yfiles.view.ICanvasObjectGroup,item:any):yfiles.view.ICanvasObject;
       /**
@@ -14249,7 +14248,7 @@ declare namespace yfiles{
        * This implementation simply returns the value provided to the constructor.
        * </p>
        * @param userObject
-       * @returns
+       * @returns 
        * @protected
        */
       getCenterPoint(userObject:any):yfiles.geometry.IPoint;
@@ -14304,11 +14303,11 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param context
        * @param group
        * @param item
-       * @returns
+       * @returns 
        */
       addCanvasObject(context:yfiles.view.ICanvasContext,group:yfiles.view.ICanvasObjectGroup,item:any):yfiles.view.ICanvasObject;
       /**
@@ -14448,34 +14447,34 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param forUserObject
-       * @returns
+       * @returns 
        */
       getBoundsProvider(forUserObject:any):yfiles.view.IBoundsProvider;
       /**
-       *
+       * 
        * @param forUserObject
-       * @returns
+       * @returns 
        */
       getHitTestable(forUserObject:any):yfiles.input.IHitTestable;
       /**
-       *
+       * 
        * @param forUserObject
-       * @returns
+       * @returns 
        */
       getVisibilityTestable(forUserObject:any):yfiles.view.IVisibilityTestable;
       /**
-       *
+       * 
        * @param forUserObject
-       * @returns
+       * @returns 
        */
       getVisualCreator(forUserObject:any):yfiles.view.IVisualCreator;
       /**
-       *
+       * 
        * @param context
        * @param canvasObject
-       * @returns
+       * @returns 
        */
       isDirty(context:yfiles.view.ICanvasContext,canvasObject:yfiles.view.ICanvasObject):boolean;
       /**
@@ -14632,7 +14631,7 @@ declare namespace yfiles{
        * </p>
        * Type parameter <code>T</code>.
        * @param itemType
-       * @returns
+       * @returns 
        * @template T
        */
       createHitTester<T extends yfiles.graph.IModelItem>(itemType:yfiles.lang.Class):yfiles.input.IHitTester<T>;
@@ -15025,36 +15024,36 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        */
       clear():void;
       /**
        * Factory method that creates the {@link yfiles.view.DefaultSelectionModel.<T>} to use for the bends.
-       * @returns
+       * @returns 
        * @protected
        */
       createBendSelectionModel():yfiles.view.DefaultSelectionModel<yfiles.graph.IBend>;
       /**
        * Factory method that creates the {@link yfiles.view.DefaultSelectionModel.<T>} to use for the edges.
-       * @returns
+       * @returns 
        * @protected
        */
       createEdgeSelectionModel():yfiles.view.DefaultSelectionModel<yfiles.graph.IEdge>;
       /**
        * Factory method that creates the {@link yfiles.view.DefaultSelectionModel.<T>} to use for the labels.
-       * @returns
+       * @returns 
        * @protected
        */
       createLabelSelectionModel():yfiles.view.DefaultSelectionModel<yfiles.graph.ILabel>;
       /**
        * Factory method that creates the {@link yfiles.view.DefaultSelectionModel.<T>} to use for the nodes.
-       * @returns
+       * @returns 
        * @protected
        */
       createNodeSelectionModel():yfiles.view.DefaultSelectionModel<yfiles.graph.INode>;
       /**
        * Factory method that creates the {@link yfiles.view.DefaultSelectionModel.<T>} to use for the ports.
-       * @returns
+       * @returns 
        * @protected
        */
       createPortSelectionModel():yfiles.view.DefaultSelectionModel<yfiles.graph.IPort>;
@@ -15064,9 +15063,9 @@ declare namespace yfiles{
        */
       getEnumerator():yfiles.collections.IEnumerator<yfiles.graph.IModelItem>;
       /**
-       *
+       * 
        * @param item
-       * @returns
+       * @returns 
        */
       isSelected(item:yfiles.graph.IModelItem):boolean;
       /**
@@ -15076,38 +15075,38 @@ declare namespace yfiles{
        */
       onItemSelectionChanged(evt:yfiles.view.ItemSelectionChangedEventArgs<yfiles.graph.IModelItem>):void;
       /**
-       *
+       * 
        * @param item
        * @param selected
        */
       setSelected(item:yfiles.graph.IModelItem,selected:boolean):void;
       /**
-       *
+       * 
        * @type {yfiles.view.ISelectionModel.<yfiles.graph.INode>}
        */
       selectedNodes:yfiles.view.ISelectionModel<yfiles.graph.INode>;
       /**
-       *
+       * 
        * @type {yfiles.view.ISelectionModel.<yfiles.graph.IEdge>}
        */
       selectedEdges:yfiles.view.ISelectionModel<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @type {yfiles.view.ISelectionModel.<yfiles.graph.ILabel>}
        */
       selectedLabels:yfiles.view.ISelectionModel<yfiles.graph.ILabel>;
       /**
-       *
+       * 
        * @type {yfiles.view.ISelectionModel.<yfiles.graph.IPort>}
        */
       selectedPorts:yfiles.view.ISelectionModel<yfiles.graph.IPort>;
       /**
-       *
+       * 
        * @type {yfiles.view.ISelectionModel.<yfiles.graph.IBend>}
        */
       selectedBends:yfiles.view.ISelectionModel<yfiles.graph.IBend>;
       /**
-       *
+       * 
        * @type {number}
        */
       size:number;
@@ -15117,12 +15116,12 @@ declare namespace yfiles{
        */
       graph:yfiles.graph.IGraph;
       /**
-       *
+       * 
        * @param listener
        */
       addItemSelectionChangedListener(listener:(sender:any,evt:yfiles.view.ItemSelectionChangedEventArgs<yfiles.graph.IModelItem>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeItemSelectionChangedListener(listener:(sender:any,evt:yfiles.view.ItemSelectionChangedEventArgs<yfiles.graph.IModelItem>)=>void):void;
@@ -15336,6 +15335,9 @@ declare namespace yfiles{
     /**
      * Allows the use of an {@link yfiles.styles.IEdgeStyle} to render the selection, highlight or focus indicator of edges.
      * <p>
+     * The renderer of the {@link yfiles.view.EdgeStyleDecorationInstaller#edgeStyle} used by this class must create {@link yfiles.view.SvgVisual}s.
+     * </p>
+     * <p>
      * The {@link yfiles.view.EdgeStyleDecorationInstaller#zoomPolicy} property defines how the zoom level affects the rendering of the indicator. It can either scale according to the
      * zoom level similar to regular graph items or have always to same thickness regardless of the zoom, similar to the
      * default yFiles indicators.
@@ -15439,6 +15441,9 @@ declare namespace yfiles{
     /**
      * Allows the use of an {@link yfiles.styles.ILabelStyle} to render the selection, highlight or focus indicator of labels.
      * <p>
+     * The renderer of the {@link yfiles.view.LabelStyleDecorationInstaller#labelStyle} used by this class must create {@link yfiles.view.SvgVisual}s.
+     * </p>
+     * <p>
      * The {@link yfiles.view.LabelStyleDecorationInstaller#zoomPolicy} property defines how the zoom level affects the rendering of the indicator. It can either scale according to the
      * zoom level similar to regular graph items or have always to same thickness regardless of the zoom, similar to the
      * default yFiles indicators.
@@ -15521,6 +15526,9 @@ declare namespace yfiles{
     /**
      * Allows the use of an {@link yfiles.styles.INodeStyle} to render the selection, highlight or focus indicator of nodes.
      * <p>
+     * The renderer of the {@link yfiles.view.NodeStyleDecorationInstaller#nodeStyle} used by this class must create {@link yfiles.view.SvgVisual}s.
+     * </p>
+     * <p>
      * The {@link yfiles.view.NodeStyleDecorationInstaller#zoomPolicy} property defines how the zoom level affects the rendering of the indicator. It can either scale according to the
      * zoom level similar to regular graph items or have always to same thickness regardless of the zoom, similar to the
      * default yFiles indicators.
@@ -15649,7 +15657,7 @@ declare namespace yfiles{
       freeze():void;
       /**
        * Determines if this instance is frozen.
-       * @returns
+       * @returns 
        */
       isFrozen():boolean;
       /**
@@ -17702,23 +17710,23 @@ declare namespace yfiles{
       static isInstance(o:any):o is yfiles.view.Color;
     }
     /**
-     *
+     * 
      * @class
      * @extends {yfiles.graphml.MarkupExtension}
      */
     export interface ColorExtension extends yfiles.graphml.MarkupExtension{}
     export class ColorExtension {
       /**
-       *
+       * 
        * @param color
        */
       constructor(color:yfiles.view.Color);
       /**
-       *
+       * 
        */
       constructor();
       /**
-       *
+       * 
        * @type {string}
        */
       value:string;
@@ -18056,7 +18064,7 @@ declare namespace yfiles{
       freeze():void;
       /**
        * Determines if this instance is frozen.
-       * @returns
+       * @returns 
        */
       isFrozen():boolean;
       /**
@@ -18366,7 +18374,7 @@ declare namespace yfiles{
       freeze():void;
       /**
        * Determines if this instance is frozen.
-       * @returns
+       * @returns 
        */
       isFrozen():boolean;
       /**
@@ -18683,11 +18691,11 @@ declare namespace yfiles{
        */
       constructor(options?:{startPoint?:yfiles.geometry.Point,endPoint?:yfiles.geometry.Point,spreadMethod?:yfiles.view.GradientSpreadMethod,gradientStops?:Array<any>});
       /**
-       *
+       * 
        * @param context
        * @param item
        * @param id
-       * @returns
+       * @returns 
        */
       accept(context:yfiles.view.ICanvasContext,item:Node,id:string):boolean;
       /**
@@ -18771,21 +18779,21 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param context
        * @param node
        * @param id
-       * @returns
+       * @returns 
        */
       accept(context:yfiles.view.ICanvasContext,node:Node,id:string):boolean;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createDefsElement(context:yfiles.view.ICanvasContext):SVGElement;
       /**
-       *
+       * 
        * @param context
        * @param oldElement
        */
@@ -18904,7 +18912,7 @@ declare namespace yfiles{
       clone():any;
       /**
        * Clones the current value of this instance to a new unfrozen {@link yfiles.view.Stroke}.
-       * @returns
+       * @returns 
        */
       cloneCurrentValue():yfiles.view.Stroke;
       /**
@@ -18916,7 +18924,7 @@ declare namespace yfiles{
       freeze():void;
       /**
        * Determines if this instance is frozen.
-       * @returns
+       * @returns 
        */
       isFrozen():boolean;
       /**
@@ -19594,11 +19602,11 @@ declare namespace yfiles{
        */
       constructor(options?:{center?:yfiles.geometry.Point,radiusX?:number,radiusY?:number,spreadMethod?:yfiles.view.GradientSpreadMethod,gradientOrigin?:yfiles.geometry.Point,gradientStops?:Array<any>});
       /**
-       *
+       * 
        * @param context
        * @param item
        * @param id
-       * @returns
+       * @returns 
        */
       accept(context:yfiles.view.ICanvasContext,item:Node,id:string):boolean;
       /**
@@ -20724,12 +20732,12 @@ declare namespace yfiles{
        */
       constructor(table:yfiles.graph.ITable,columnLayout:number[],rowLayout:number[]);
       /**
-       *
+       * 
        * @param time
        */
       animate(time:number):void;
       /**
-       *
+       * 
        */
       cleanup():void;
       /**
@@ -20741,7 +20749,7 @@ declare namespace yfiles{
        */
       createStripeAnimation(stripe:yfiles.graph.IStripe,targetSize:number):yfiles.view.IAnimation;
       /**
-       *
+       * 
        */
       initialize():void;
       /**
@@ -20813,12 +20821,12 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        */
       clear():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<yfiles.graph.IStripe>;
       /**
@@ -20834,7 +20842,7 @@ declare namespace yfiles{
        */
       onItemSelectionChanged(evt:yfiles.view.ItemSelectionChangedEventArgs<yfiles.graph.IStripe>):void;
       /**
-       *
+       * 
        * @param item
        * @param selected
        */
@@ -20856,27 +20864,27 @@ declare namespace yfiles{
        */
       allowCrossTableSelection:boolean;
       /**
-       *
+       * 
        * @type {yfiles.view.ISelectionModel.<yfiles.graph.IRow>}
        */
       selectedRows:yfiles.view.ISelectionModel<yfiles.graph.IRow>;
       /**
-       *
+       * 
        * @type {yfiles.view.ISelectionModel.<yfiles.graph.IColumn>}
        */
       selectedColumns:yfiles.view.ISelectionModel<yfiles.graph.IColumn>;
       /**
-       *
+       * 
        * @type {number}
        */
       size:number;
       /**
-       *
+       * 
        * @param listener
        */
       addItemSelectionChangedListener(listener:(sender:any,evt:yfiles.view.ItemSelectionChangedEventArgs<yfiles.graph.IStripe>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeItemSelectionChangedListener(listener:(sender:any,evt:yfiles.view.ItemSelectionChangedEventArgs<yfiles.graph.IStripe>)=>void):void;
@@ -21399,7 +21407,7 @@ declare namespace yfiles{
        */
       inputModeContext:yfiles.input.IInputModeContext;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -21554,19 +21562,19 @@ declare namespace yfiles{
       cancel():void;
       /**
        * Creates the event recognizer that is used to recognize the clicks for this instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createClickRecognizer():(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean;
       /**
        * Creates the event recognizer that is used to recognize the press event for this instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createPressRecognizer():(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean;
       /**
        * Creates the event recognizer that is used to recognize the release event for this instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createReleaseRecognizer():(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean;
@@ -21593,7 +21601,7 @@ declare namespace yfiles{
        * Determines whether the given event is a press event that occurred at an invalid location.
        * @param eventSource
        * @param evt
-       * @returns
+       * @returns 
        * @see yfiles.input.ClickInputMode#validClickHitTestable
        * @protected
        */
@@ -21602,7 +21610,7 @@ declare namespace yfiles{
        * Determines whether the given event is a valid click event.
        * @param src
        * @param evt
-       * @returns
+       * @returns 
        * @see yfiles.input.ClickInputMode#validClickHitTestable
        * @protected
        */
@@ -21611,7 +21619,7 @@ declare namespace yfiles{
        * Determines whether the given event is a valid press event.
        * @param eventSource
        * @param evt
-       * @returns
+       * @returns 
        * @protected
        */
       isValidPress(eventSource:any,evt:yfiles.lang.EventArgs):boolean;
@@ -21619,7 +21627,7 @@ declare namespace yfiles{
        * Determines whether the given event is a valid release event.
        * @param src
        * @param evt
-       * @returns
+       * @returns 
        * @see yfiles.input.ClickInputMode#validClickHitTestable
        * @protected
        */
@@ -21744,13 +21752,13 @@ declare namespace yfiles{
        * <p>
        * To ensure that the flag really acts just once, this method resets the flag and returns its value prior to the reset.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       queryAndResetPreventNextDoubleClick():boolean;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -21767,7 +21775,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -21793,7 +21801,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -22417,14 +22425,14 @@ declare namespace yfiles{
        * </p>
        * @param [queryLocation=null] The optional location for which the context menu content should be queried. This value will be passed to {@link #onPopulateMenu}
        * and will ultimately be available in {@link #queryLocation}. If not specified, the last known mouse location will be used.
-       * @returns
+       * @returns 
        * @see yfiles.input.ContextMenuInputMode#menuClosed
        * @see yfiles.input.ContextMenuInputMode#addCloseMenuListener
        */
       shouldOpenMenu(queryLocation?:yfiles.geometry.Point):boolean;
       /**
        * Stops the display of the context menu and requests that the context menu is closed.
-       * @returns
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -22433,7 +22441,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -22459,7 +22467,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -22584,7 +22592,7 @@ declare namespace yfiles{
       /**
        * Callback that adjusts the effect accordingly.
        * @param evt
-       * @returns
+       * @returns 
        * @protected
        */
       adjustEffect(evt:yfiles.view.DragEventArgs):boolean;
@@ -22700,7 +22708,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -22726,7 +22734,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -22963,7 +22971,7 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        */
       cancel():void;
       /**
@@ -23030,8 +23038,8 @@ declare namespace yfiles{
        */
       onStopped():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -23048,7 +23056,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -23062,7 +23070,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -23149,7 +23157,7 @@ declare namespace yfiles{
        */
       beginDragging(handle:yfiles.input.IHandle):void;
       /**
-       *
+       * 
        */
       cancel():void;
       /**
@@ -23351,8 +23359,8 @@ declare namespace yfiles{
        */
       removeHandle(handle:yfiles.input.IHandle):void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -23361,7 +23369,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -23390,7 +23398,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -24096,13 +24104,13 @@ declare namespace yfiles{
        */
       constructor(gridSize:number);
       /**
-       *
+       * 
        * @param context
        * @param item
        * @param location
        * @param xSnapPolicy
        * @param ySnapPolicy
-       * @returns
+       * @returns 
        */
       snapToGrid(context:yfiles.input.IInputModeContext,item:T,location:yfiles.geometry.IMutablePoint,xSnapPolicy:yfiles.input.SnapPolicy,ySnapPolicy:yfiles.input.SnapPolicy):boolean;
       /**
@@ -24554,7 +24562,7 @@ declare namespace yfiles{
        * @param parent
        * @param parentContext
        * @param lookupCallback
-       * @returns
+       * @returns 
        * @static
        */
       createInputModeContext?(parent:yfiles.input.IInputMode,parentContext:yfiles.input.IInputModeContext,lookupCallback:(subject:any,type:yfiles.lang.Class)=>any):yfiles.input.IInputModeContext;
@@ -24562,7 +24570,7 @@ declare namespace yfiles{
        * Factory method that creates an {@link yfiles.input.IInputModeContext} that uses the provided parent mode and lookup decoration.
        * @param parent
        * @param lookupCallback
-       * @returns
+       * @returns 
        * @static
        */
       createInputModeContext?(parent:yfiles.input.IInputMode,lookupCallback:(subject:any,type:yfiles.lang.Class)=>any):yfiles.input.IInputModeContext;
@@ -24571,7 +24579,7 @@ declare namespace yfiles{
        * @param canvas The {@link } to use, may not be <code>null</code>.
        * @param [parent=null] The mode to set as the parent. This may be <code>null</code> for the canvas' context.
        * @param [lookup=null] The lookup to use.
-       * @returns
+       * @returns 
        * @static
        */
       createInputModeContext?(canvas:yfiles.view.CanvasComponent,parent?:yfiles.input.IInputMode,lookup?:yfiles.graph.ILookup):yfiles.input.IInputModeContext;
@@ -24581,7 +24589,7 @@ declare namespace yfiles{
        * @param options.canvas The {@link } to use, may not be <code>null</code>.
        * @param [options.parent=null] The mode to set as the parent. This may be <code>null</code> for the canvas' context.
        * @param [options.lookup=null] The lookup to use.
-       * @returns
+       * @returns 
        * @static
        */
       createInputModeContext?(options:{canvas:yfiles.view.CanvasComponent,parent?:yfiles.input.IInputMode,lookup?:yfiles.graph.ILookup}):yfiles.input.IInputModeContext;
@@ -24591,7 +24599,7 @@ declare namespace yfiles{
        * @param parent
        * @param parentContext
        * @param lookup
-       * @returns
+       * @returns 
        * @static
        */
       createInputModeContext?(parent:yfiles.input.IInputMode,parentContext:yfiles.input.IInputModeContext,lookup:yfiles.graph.ILookup):yfiles.input.IInputModeContext;
@@ -24599,7 +24607,7 @@ declare namespace yfiles{
        * Factory method that creates an {@link yfiles.input.IInputModeContext} that uses the provided parent mode and lookup decoration.
        * @param parent
        * @param [lookup=null]
-       * @returns
+       * @returns 
        * @static
        */
       createInputModeContext?(parent:yfiles.input.IInputMode,lookup?:yfiles.graph.ILookup):yfiles.input.IInputModeContext;
@@ -24823,7 +24831,7 @@ declare namespace yfiles{
        */
       addRecognizerBinding(recognizer:(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean,command:yfiles.input.ICommand,commandParameter?:any):yfiles.input.KeyboardInputModeBinding;
       /**
-       *
+       * 
        */
       cancel():void;
       /**
@@ -24920,7 +24928,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -24946,7 +24954,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -25146,8 +25154,8 @@ declare namespace yfiles{
        */
       onStopped():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -25164,7 +25172,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -25190,7 +25198,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -25477,7 +25485,7 @@ declare namespace yfiles{
        */
       adjustTooltipPosition(originalPosition:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
-       *
+       * 
        */
       cancel():void;
       /**
@@ -25625,7 +25633,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -25651,7 +25659,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -25945,8 +25953,8 @@ declare namespace yfiles{
        */
       onStopped():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -25972,7 +25980,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -25983,7 +25991,7 @@ declare namespace yfiles{
        */
       controller:yfiles.input.ConcurrencyController;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -26473,17 +26481,17 @@ declare namespace yfiles{
        */
       onStopped():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
-       *
+       * 
        * @param context
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -26509,7 +26517,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -26822,7 +26830,7 @@ declare namespace yfiles{
        */
       initialize():void;
       /**
-       *
+       * 
        * @param context
        * @param controller
        */
@@ -26864,11 +26872,11 @@ declare namespace yfiles{
       subModePriorityChanged():void;
       /**
        * Tries to stop all modes.
-       * @returns
+       * @returns 
        */
       tryStop():boolean;
       /**
-       *
+       * 
        * @param context
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
@@ -26894,12 +26902,12 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -27650,7 +27658,7 @@ declare namespace yfiles{
        * @param snapLine The snap line this class would snap to or <code>null</code> if it doesn't snap to a <code>SnapLine</code>.
        * @param snappedCoordinates The coordinates at the moved item at which the drawn snap line should end.
        * @param movedObject The moved object for which this result is created.
-       * @returns
+       * @returns 
        * @static
        */
       static createLabelSnapResult(layoutParameter:yfiles.graph.ILabelModelParameter,weight:number,delta:yfiles.geometry.Point,tag:any,snapLine:yfiles.input.SnapLine,snappedCoordinates:yfiles.geometry.Point,movedObject:any):yfiles.input.SnapResult;
@@ -27677,7 +27685,7 @@ declare namespace yfiles{
        * size and the object which is currently reshaped.
        * @param size The target size to which the resized object will snap.
        * @param horizontal Indicates whether width or height should snap. <code>true</code> if the width should snap.
-       * @returns
+       * @returns 
        * @static
        */
       static createResizeSnapResult(weight:number,delta:number,tag:any,rectangles:yfiles.collections.IEnumerable<yfiles.geometry.IRectangle>,size:number,horizontal:boolean):yfiles.input.SnapResult;
@@ -27691,7 +27699,7 @@ declare namespace yfiles{
        * @param snapLine The snap line this class would snap to or <code>null</code> if it doesn't snap to a <code>SnapLine</code>.
        * @param snappedLocation The coordinates at the moved item at which the drawn snap line should end.
        * @param movedObject The moved object for which this result is created.
-       * @returns
+       * @returns 
        * @static
        */
       static createSnapLineSnapResult(weight:number,delta:yfiles.geometry.Point,tag:any,snapLine:yfiles.input.SnapLine,snappedLocation:yfiles.geometry.Point,movedObject:any):yfiles.input.SnapResult;
@@ -27913,19 +27921,19 @@ declare namespace yfiles{
       cancel():void;
       /**
        * Creates the event recognizer that is used to recognize the press event for this instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createPressRecognizer():(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean;
       /**
        * Creates the event recognizer that is used to recognize the release event for this instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createReleaseRecognizer():(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean;
       /**
        * Creates the event recognizer that is used to recognize the taps for this instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createTapRecognizer():(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean;
@@ -27952,7 +27960,7 @@ declare namespace yfiles{
        * Determines whether the given event is a press event that occurred at an invalid location.
        * @param eventSource
        * @param evt
-       * @returns
+       * @returns 
        * @see yfiles.input.TapInputMode#validTapHitTestable
        * @protected
        */
@@ -27961,7 +27969,7 @@ declare namespace yfiles{
        * Determines whether the given event is a valid press event.
        * @param eventSource
        * @param evt
-       * @returns
+       * @returns 
        * @protected
        */
       isValidPress(eventSource:any,evt:yfiles.lang.EventArgs):boolean;
@@ -27969,7 +27977,7 @@ declare namespace yfiles{
        * Determines whether the given event is a valid release event.
        * @param eventSource
        * @param evt
-       * @returns
+       * @returns 
        * @protected
        */
       isValidRelease(eventSource:any,evt:yfiles.lang.EventArgs):boolean;
@@ -27977,7 +27985,7 @@ declare namespace yfiles{
        * Determines whether the given event is a valid tap event.
        * @param eventSource
        * @param evt
-       * @returns
+       * @returns 
        * @protected
        */
       isValidTap(eventSource:any,evt:yfiles.lang.EventArgs):boolean;
@@ -28063,13 +28071,13 @@ declare namespace yfiles{
        * <p>
        * To ensure that the flag really acts just once, this method resets the flag and returns its value prior to the reset.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       queryAndResetPreventNextDoubleTap():boolean;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -28086,7 +28094,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -28112,7 +28120,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -28263,7 +28271,7 @@ declare namespace yfiles{
       ensureVisible():void;
       /**
        * Returns the bounds of the text area in world coordinates.
-       * @returns
+       * @returns 
        * @protected
        */
       getTextBoxBounds():yfiles.geometry.Rect;
@@ -28402,7 +28410,7 @@ declare namespace yfiles{
        */
       uninstallTextBox():void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -28428,7 +28436,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -28642,7 +28650,7 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        */
       cancel():void;
       /**
@@ -28743,8 +28751,8 @@ declare namespace yfiles{
        */
       startWaiting():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -28761,7 +28769,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -28775,7 +28783,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -29113,7 +29121,7 @@ declare namespace yfiles{
       /**
        * Wrap a handler into an interface.
        * @param handler
-       * @returns
+       * @returns 
        * @static
        */
       create?(handler:(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point)=>boolean):yfiles.input.IHitTestable;
@@ -29556,7 +29564,7 @@ declare namespace yfiles{
       createItemHoverInputMode():yfiles.input.ItemHoverInputMode;
       /**
        * Factory method that creates the {@link yfiles.input.GraphInputMode#keyboardInputMode} instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createKeyboardInputMode():yfiles.input.KeyboardInputMode;
@@ -31623,21 +31631,21 @@ declare namespace yfiles{
        */
       constructor(minimumSize:yfiles.geometry.ISize,maximumSize:yfiles.geometry.ISize,minimumEnclosedArea?:yfiles.geometry.IRectangle);
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getMaximumSize(node:yfiles.graph.INode):yfiles.geometry.Size;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getMinimumEnclosedArea(node:yfiles.graph.INode):yfiles.geometry.Rect;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getMinimumSize(node:yfiles.graph.INode):yfiles.geometry.Size;
       /**
@@ -31860,7 +31868,7 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        */
       cancel():void;
       /**
@@ -31979,7 +31987,7 @@ declare namespace yfiles{
        */
       updateHover(location?:yfiles.geometry.Point):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -32005,7 +32013,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -32448,7 +32456,7 @@ declare namespace yfiles{
        */
       adjustGroupNodeLocation(collapse:boolean,groupNode:yfiles.graph.INode):void;
       /**
-       *
+       * 
        */
       cancel():void;
       /**
@@ -32779,7 +32787,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -32805,7 +32813,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -33764,7 +33772,7 @@ declare namespace yfiles{
        * This implementation will delegate to the {@link yfiles.input.DefaultPortCandidate#createInstance} method.
        * </p>
        * @param context
-       * @returns
+       * @returns 
        */
       createPort(context:yfiles.input.IInputModeContext):yfiles.graph.IPort;
       /**
@@ -33870,41 +33878,41 @@ declare namespace yfiles{
        */
       constructor(node:yfiles.graph.INode,wrappedHandler?:yfiles.input.IPositionHandler);
       /**
-       *
-       * @param inputModeContext
+       * 
+       * @param context
        * @param originalLocation
        */
-      cancelDrag(inputModeContext:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point):void;
+      cancelDrag(context:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point):void;
       /**
-       *
-       * @param inputModeContext
+       * 
+       * @param context
        * @param originalLocation
        * @param newLocation
        */
-      dragFinished(inputModeContext:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point,newLocation:yfiles.geometry.Point):void;
+      dragFinished(context:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point,newLocation:yfiles.geometry.Point):void;
       /**
-       *
-       * @param inputModeContext
+       * 
+       * @param context
        * @param originalLocation
        * @param newLocation
        */
-      handleMove(inputModeContext:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point,newLocation:yfiles.geometry.Point):void;
+      handleMove(context:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point,newLocation:yfiles.geometry.Point):void;
       /**
-       *
-       * @param inputModeContext
+       * 
+       * @param context
        */
-      initializeDrag(inputModeContext:yfiles.input.IInputModeContext):void;
+      initializeDrag(context:yfiles.input.IInputModeContext):void;
       /**
        * Sets a temporary visual parent for the node during reparenting.
        * <p>
        * This is used to show the grouping hierarchy level a node would end in after finishing the reparenting gesture. Override
        * this method with an empty implementation to not change the z-order of the dragged node during the gesture.
        * </p>
-       * @param inputModeContext The current {@link }.
+       * @param context The current {@link }.
        * @param node The node being reparented.
        * @param parent The temporary parent for the node.
        */
-      setCurrentParent(inputModeContext:yfiles.input.IInputModeContext,node:yfiles.graph.INode,parent:yfiles.graph.INode):void;
+      setCurrentParent(context:yfiles.input.IInputModeContext,node:yfiles.graph.INode,parent:yfiles.graph.INode):void;
       /**
        * Gets a view of the location of the item.
        * <p>
@@ -34382,14 +34390,14 @@ declare namespace yfiles{
       /**
        * Creates a generic composite implementation for the {@link yfiles.input.IPortCandidateProvider} interface.
        * @param providers The providers to create the composite from.
-       * @returns
+       * @returns 
        * @static
        */
       combine?(...providers:yfiles.input.IPortCandidateProvider[]):yfiles.input.IPortCandidateProvider;
       /**
        * Creates a generic composite implementation for the {@link yfiles.input.IPortCandidateProvider} interface.
        * @param providers The providers to create the composite from.
-       * @returns
+       * @returns 
        * @static
        */
       combine?(providers:yfiles.collections.IEnumerable<yfiles.input.IPortCandidateProvider>):yfiles.input.IPortCandidateProvider;
@@ -34411,7 +34419,7 @@ declare namespace yfiles{
        * Creates an implementation of the {@link yfiles.input.IPortCandidateProvider} interface that returns the ports that exist in the
        * given {@link yfiles.graph.IPortOwner#ports}'s {@link yfiles.graph.IPortOwner} collection.
        * @param owner The owner of the port collection.
-       * @returns
+       * @returns 
        * @static
        */
       fromExistingPorts?(owner:yfiles.graph.IPortOwner):yfiles.input.IPortCandidateProvider;
@@ -34419,7 +34427,7 @@ declare namespace yfiles{
        * Creates a trivial implementation of an {@link yfiles.input.IPortCandidateProvider} that always returns exactly one candidate
        * that is centered at the node's {@link yfiles.graph.INode#layout}.
        * @param node The node to get the layout's center from.
-       * @returns
+       * @returns 
        * @static
        */
       fromNodeCenter?(node:yfiles.graph.INode):yfiles.input.PortCandidateProviderBase;
@@ -34427,7 +34435,7 @@ declare namespace yfiles{
        * Creates a simple implementation of an {@link yfiles.input.IPortCandidateProvider} that always returns a candidate that uses the
        * default {@link yfiles.graph.IPortDefaults#locationParameter} for the corresponding {@link yfiles.graph.IPortDefaults}.
        * @param owner
-       * @returns
+       * @returns 
        * @static
        */
       fromPortDefaults?(owner:yfiles.graph.IPortOwner):yfiles.input.IPortCandidateProvider;
@@ -34439,7 +34447,7 @@ declare namespace yfiles{
        * @param ratios A number of double values that are interpreted as ratio values between 0.0 and 1.0. If none are given, the provider
        * inserts a port candidate at the center of each straight line segment.
        * @param addExistingPortsEnabled determines whether {@link #addExistingPorts existing ports should be added to the list of ports}.
-       * @returns
+       * @returns 
        * @static
        */
       fromShapeGeometry?(owner:yfiles.graph.IPortOwner,addExistingPortsEnabled:boolean,minimumSegmentLength:number,...ratios:number[]):yfiles.input.PortCandidateProviderBase;
@@ -34449,7 +34457,7 @@ declare namespace yfiles{
        * @param owner The owner to receive the shape geometry from
        * @param ratios A number of double values that are interpreted as ratio values between 0.0 and 1.0. If none are given, the provider
        * inserts a port candidate at the center of each straight line segment.
-       * @returns
+       * @returns 
        * @static
        */
       fromShapeGeometry?(owner:yfiles.graph.IPortOwner,...ratios:number[]):yfiles.input.PortCandidateProviderBase;
@@ -34457,7 +34465,7 @@ declare namespace yfiles{
        * Creates a simple implementation of an {@link yfiles.input.IPortCandidateProvider} that returns unoccupied ports at a given
        * entity.
        * @param owner The owner to query the ports from.
-       * @returns
+       * @returns 
        * @static
        */
       fromUnoccupiedPorts?(owner:yfiles.graph.IPortOwner):yfiles.input.IPortCandidateProvider;
@@ -34528,7 +34536,7 @@ declare namespace yfiles{
        * This instance uses the lookup mechanism of the nodes to query the providers.
        * </p>
        * @param edge
-       * @returns
+       * @returns 
        * @static
        */
       fromSourceAndTarget?(edge:yfiles.graph.IEdge):yfiles.input.IEdgeReconnectionPortCandidateProvider;
@@ -35624,7 +35632,7 @@ declare namespace yfiles{
        * @param type The type of the event.
        * @param value The key that is subject of the event.
        * @param [modifiers=yfiles.view.ModifierKeys.NONE] The state of the modifiers that must be set. This is {@link #NONE} if not set.
-       * @returns
+       * @returns 
        * @static
        */
       static create(type:yfiles.view.KeyEventType,value:yfiles.view.Key,modifiers?:yfiles.view.ModifierKeys):(eventSource:any,evt:yfiles.lang.EventArgs)=>boolean;
@@ -36198,7 +36206,7 @@ declare namespace yfiles{
        * Determines whether the current location is valid to begin a bend creation gesture.
        * @param source
        * @param evt
-       * @returns
+       * @returns 
        * @protected
        */
       isValidBegin(source:any,evt:yfiles.lang.EventArgs):boolean;
@@ -36277,8 +36285,8 @@ declare namespace yfiles{
        */
       onStopped():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -36295,7 +36303,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -36321,7 +36329,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -36702,7 +36710,7 @@ declare namespace yfiles{
        * Retrieves the port owner at a given position in world coordinates.
        * <p>
        * If there is a {@link yfiles.input.IHitTester.<T>} for type {@link yfiles.graph.INode} in the lookup of this mode's {@link yfiles.input.CreateEdgeInputMode#inputModeContext} then this instance will be used for the query.
-       *
+       * 
        * <br />
        * Otherwise this implementation calls the {@link yfiles.styles.INodeStyleRenderer#getHitTestable} method of the nodes to find hit
        * nodes and uses an {@link yfiles.collections.IComparer.<T>} to determine the first hit node.
@@ -36757,7 +36765,7 @@ declare namespace yfiles{
        * {@link yfiles.input.CreateEdgeInputMode#getSourcePortCandidate}.
        * </p>
        * @param location The location where the gesture was initiated.
-       * @returns
+       * @returns 
        * @see yfiles.input.CreateEdgeInputMode#getSource
        * @see yfiles.input.CreateEdgeInputMode#getSourcePortCandidateProvider
        * @see yfiles.input.CreateEdgeInputMode#getSourcePortCandidate
@@ -37008,8 +37016,8 @@ declare namespace yfiles{
        */
       resolveCandidates(candidates:yfiles.collections.IEnumerable<yfiles.input.IPortCandidate>,location:yfiles.geometry.Point):yfiles.collections.IEnumerable<yfiles.input.IPortCandidate>;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -37053,7 +37061,7 @@ declare namespace yfiles{
        */
       updateTargetLocation(location:yfiles.geometry.Point):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -37079,7 +37087,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -37983,7 +37991,7 @@ declare namespace yfiles{
       /**
        * Creates a node on click.
        * <p>
-       * This method is only called if no item has been and {@link yfiles.input.GraphInputMode#clickClearSelection} returned <code>false</code>.
+       * This method is only called if no item has been hit and {@link yfiles.input.GraphInputMode#clickClearSelection} returned <code>false</code>.
        * </p>
        * @param context The input mode context.
        * @param location The location of the click.
@@ -38194,7 +38202,7 @@ declare namespace yfiles{
        * <p>
        * This method determines the label owner to add to and delegates to {@link yfiles.input.GraphEditorInputMode#createLabel}.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       onAddLabel():boolean;
@@ -38259,7 +38267,7 @@ declare namespace yfiles{
        * This method determines the label to edit and delegates to either {@link yfiles.input.GraphEditorInputMode#editLabel} or {@link yfiles.input.GraphEditorInputMode#createLabel}
        * if no label could be found.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       onEditLabel():boolean;
@@ -39722,7 +39730,7 @@ declare namespace yfiles{
        */
       constructor(label:yfiles.graph.ILabel);
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        */
@@ -39736,7 +39744,7 @@ declare namespace yfiles{
        */
       createCandidateDescriptor(context:yfiles.input.IInputModeContext,highlight:boolean):yfiles.view.ICanvasObjectDescriptor;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
@@ -39758,14 +39766,14 @@ declare namespace yfiles{
        */
       getParameterCandidates(label:yfiles.graph.ILabel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
        */
       handleMove(context:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point,newLocation:yfiles.geometry.Point):void;
       /**
-       *
+       * 
        * @param context
        */
       initializeDrag(context:yfiles.input.IInputModeContext):void;
@@ -39777,7 +39785,7 @@ declare namespace yfiles{
        */
       setLayoutParameter(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):void;
       /**
-       *
+       * 
        * @param location
        */
       setPosition(location:yfiles.geometry.Point):void;
@@ -39787,7 +39795,7 @@ declare namespace yfiles{
        * This implementation returns <code>true</code> if the {@link yfiles.input.LabelPositionHandler#useFinder} property is <code>true</code> and the control key is pressed.
        * </p>
        * @param context The context that is currently being used - may be <code>null</code> if the method is called without context.
-       * @returns
+       * @returns 
        * @protected
        */
       useParameterFinder(context:yfiles.input.IInputModeContext):boolean;
@@ -39829,7 +39837,7 @@ declare namespace yfiles{
        */
       label:yfiles.graph.ILabel;
       /**
-       *
+       * 
        * @type {yfiles.geometry.IPoint}
        */
       location:yfiles.geometry.IPoint;
@@ -39918,7 +39926,7 @@ declare namespace yfiles{
        */
       addSnapLines(snapContext:yfiles.input.LabelSnapContext,inputModeContext:yfiles.input.IInputModeContext,label:yfiles.graph.ILabel):void;
       /**
-       *
+       * 
        * @param context
        * @param evt
        * @param suggestedLayout
@@ -40691,7 +40699,7 @@ declare namespace yfiles{
        * </p>
        * @param context The input mode context.
        * @param bend The bend that is designated for removal.
-       * @returns
+       * @returns 
        * @protected
        */
       canRemoveBend(context:yfiles.input.IInputModeContext,bend:yfiles.graph.IBend):boolean;
@@ -40768,7 +40776,7 @@ declare namespace yfiles{
        */
       constructor(port:yfiles.graph.IPort);
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        */
@@ -40785,7 +40793,7 @@ declare namespace yfiles{
        */
       collectSnapResults(source:any,evt:yfiles.input.CollectSnapResultsEventArgs):void;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
@@ -40821,14 +40829,14 @@ declare namespace yfiles{
        */
       getNewParameter(port:yfiles.graph.IPort,model:yfiles.graph.IPortLocationModel,location:yfiles.geometry.Point):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
        */
       handleMove(context:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point,newLocation:yfiles.geometry.Point):void;
       /**
-       *
+       * 
        * @param context
        */
       initializeDrag(context:yfiles.input.IInputModeContext):void;
@@ -40841,7 +40849,7 @@ declare namespace yfiles{
        */
       setParameter(graph:yfiles.graph.IGraph,port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):void;
       /**
-       *
+       * 
        * @type {yfiles.geometry.IPoint}
        */
       location:yfiles.geometry.IPoint;
@@ -40874,32 +40882,32 @@ declare namespace yfiles{
     export class ReparentNodeHandler {
       constructor();
       /**
-       *
+       * 
        * @param context
        * @param node
-       * @returns
+       * @returns 
        */
       isReparentGesture(context:yfiles.input.IInputModeContext,node:yfiles.graph.INode):boolean;
       /**
-       *
+       * 
        * @param context
        * @param node
        * @param newParent
-       * @returns
+       * @returns 
        */
       isValidParent(context:yfiles.input.IInputModeContext,node:yfiles.graph.INode,newParent:yfiles.graph.INode):boolean;
       /**
-       *
+       * 
        * @param context
        * @param node
        * @param newParent
        */
       reparent(context:yfiles.input.IInputModeContext,node:yfiles.graph.INode,newParent:yfiles.graph.INode):void;
       /**
-       *
+       * 
        * @param context
        * @param node
-       * @returns
+       * @returns 
        */
       shouldReparent(context:yfiles.input.IInputModeContext,node:yfiles.graph.INode):boolean;
       /**
@@ -41139,7 +41147,7 @@ declare namespace yfiles{
        */
       collectSnapLineSnapResults(context:yfiles.input.GraphSnapContext,evt:yfiles.input.CollectSnapResultsEventArgs,suggestedLayout:yfiles.geometry.Rect,node:yfiles.graph.INode):void;
       /**
-       *
+       * 
        * @param context
        * @param evt
        * @param suggestedLayout
@@ -41305,7 +41313,7 @@ declare namespace yfiles{
        * @param node The node that is being reshaped.
        * @param reshapeContext The reshape context that contains information about the nature of the resize.
        * @param suggestedLayout The layout of the node as it would be if the mouse location would not be snapped.
-       * @returns
+       * @returns 
        * @protected
        */
       getSnapLines(context:yfiles.input.GraphSnapContext,node:yfiles.graph.INode,reshapeContext:yfiles.input.ReshapeRectangleContext,suggestedLayout:yfiles.geometry.Rect):yfiles.collections.IEnumerable<yfiles.input.SnapLine>;
@@ -41330,12 +41338,12 @@ declare namespace yfiles{
     export interface DefaultBendCreator extends yfiles.lang.Object,yfiles.input.IBendCreator{}
     export class DefaultBendCreator {
       /**
-       *
+       * 
        * @param context
        * @param graph
        * @param edge
        * @param location
-       * @returns
+       * @returns 
        */
       createBend(context:yfiles.input.IInputModeContext,graph:yfiles.graph.IGraph,edge:yfiles.graph.IEdge,location:yfiles.geometry.Point):number;
       static $class:yfiles.lang.Class;
@@ -41407,26 +41415,26 @@ declare namespace yfiles{
        * Convenience implementation that simply delegates to {@link yfiles.input.PortCandidateProviderBase#getPortCandidates}.
        * @param context
        * @param target
-       * @returns
+       * @returns 
        */
       getSourcePortCandidates(context:yfiles.input.IInputModeContext,target:yfiles.input.IPortCandidate):yfiles.collections.IEnumerable<yfiles.input.IPortCandidate>;
       /**
        * Convenience implementation that simply delegates to {@link yfiles.input.PortCandidateProviderBase#getPortCandidates}.
        * @param context
-       * @returns
+       * @returns 
        */
       getSourcePortCandidates(context:yfiles.input.IInputModeContext):yfiles.collections.IEnumerable<yfiles.input.IPortCandidate>;
       /**
        * Convenience implementation that simply delegates to {@link yfiles.input.PortCandidateProviderBase#getPortCandidates}.
        * @param context
        * @param source
-       * @returns
+       * @returns 
        */
       getTargetPortCandidates(context:yfiles.input.IInputModeContext,source:yfiles.input.IPortCandidate):yfiles.collections.IEnumerable<yfiles.input.IPortCandidate>;
       /**
        * Convenience implementation that simply delegates to {@link yfiles.input.PortCandidateProviderBase#getPortCandidates}.
        * @param context
-       * @returns
+       * @returns 
        */
       getTargetPortCandidates(context:yfiles.input.IInputModeContext):yfiles.collections.IEnumerable<yfiles.input.IPortCandidate>;
       /**
@@ -41470,7 +41478,7 @@ declare namespace yfiles{
        */
       constructor(graph:yfiles.graph.IGraph,edge:yfiles.graph.IEdge,sourceEnd:boolean);
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        */
@@ -41515,7 +41523,7 @@ declare namespace yfiles{
        */
       createPortCandidateDescriptor():yfiles.view.ICanvasObjectDescriptor;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
@@ -41566,7 +41574,7 @@ declare namespace yfiles{
        */
       getPortCandidates(context:yfiles.input.IInputModeContext,edge:yfiles.graph.IEdge,sourcePort:boolean):yfiles.collections.IEnumerable<yfiles.input.IPortCandidate>;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
@@ -41582,7 +41590,7 @@ declare namespace yfiles{
        */
       hideOriginalEdge(context:yfiles.input.IInputModeContext,edge:yfiles.graph.IEdge):void;
       /**
-       *
+       * 
        * @param context
        */
       initializeDrag(context:yfiles.input.IInputModeContext):void;
@@ -41698,12 +41706,12 @@ declare namespace yfiles{
        */
       addExistingPort:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.HandleTypes}
        */
       type:yfiles.input.HandleTypes;
       /**
-       *
+       * 
        * @type {yfiles.view.Cursor}
        */
       cursor:yfiles.view.Cursor;
@@ -41811,9 +41819,9 @@ declare namespace yfiles{
        */
       createPortRelocationHandle(graph:yfiles.graph.IGraph,edge:yfiles.graph.IEdge,sourcePort:boolean):yfiles.input.IHandle;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getHandles(context:yfiles.input.IInputModeContext):yfiles.collections.IEnumerable<yfiles.input.IHandle>;
       /**
@@ -41856,7 +41864,7 @@ declare namespace yfiles{
       /**
        * Retrieves the handle implementation from the port's lookup.
        * @param port
-       * @returns
+       * @returns 
        * @protected
        */
       getHandle(port:yfiles.graph.IPort):yfiles.input.IHandle;
@@ -42044,8 +42052,8 @@ declare namespace yfiles{
        */
       onStopped():void;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       tryStop():boolean;
       /**
@@ -42062,7 +42070,7 @@ declare namespace yfiles{
        */
       uninstall(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @type {number}
        */
       priority:number;
@@ -42088,7 +42096,7 @@ declare namespace yfiles{
        */
       enabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.input.IInputModeContext}
        */
       inputModeContext:yfiles.input.IInputModeContext;
@@ -42434,7 +42442,7 @@ declare namespace yfiles{
        */
       constructor(movedStripe:yfiles.graph.IStripe);
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        */
@@ -42479,7 +42487,7 @@ declare namespace yfiles{
        */
       determineGesture(context:yfiles.input.IInputModeContext,location:yfiles.geometry.IPoint,sourceStripe:yfiles.graph.IStripe,targetSubregion:yfiles.input.StripeSubregion,targetBounds:yfiles.geometry.Rect):yfiles.input.StripeReparentPolicy;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
@@ -42493,14 +42501,14 @@ declare namespace yfiles{
        */
       getTargetSubregion(location:yfiles.geometry.Point):yfiles.input.StripeSubregion;
       /**
-       *
+       * 
        * @param context
        * @param originalLocation
        * @param newLocation
        */
       handleMove(context:yfiles.input.IInputModeContext,originalLocation:yfiles.geometry.Point,newLocation:yfiles.geometry.Point):void;
       /**
-       *
+       * 
        * @param context
        */
       initializeDrag(context:yfiles.input.IInputModeContext):void;
@@ -42511,7 +42519,7 @@ declare namespace yfiles{
        */
       onStripeChanged(evt:yfiles.graph.StripeEventArgs):void;
       /**
-       *
+       * 
        * @param location
        */
       setPosition(location:yfiles.geometry.Point):void;
@@ -42524,7 +42532,7 @@ declare namespace yfiles{
        * @param targetVisualization The canvas object for the target visualization
        * @param targetStripe The target for the reparent gesture
        * @param reparentPosition Where to place the stripe after reparenting.
-       * @returns
+       * @returns 
        * @protected
        */
       updateSourceVisualization(context:yfiles.input.IInputModeContext,targetVisualization:yfiles.view.ICanvasObject,targetStripe:yfiles.graph.IStripe,reparentPosition:yfiles.input.StripeReparentPolicy):yfiles.view.ICanvasObject;
@@ -42540,7 +42548,7 @@ declare namespace yfiles{
        * @param reparentPosition The mode the describes the results of the reparent gesture.
        * @param targetBounds The current visualization bounds that have been computed with
        * {@link #updateTargetVisualizationBounds}
-       * @returns
+       * @returns 
        * @protected
        */
       updateTargetVisualization(context:yfiles.input.IInputModeContext,targetVisualization:yfiles.view.ICanvasObject,targetStripe:yfiles.graph.IStripe,reparentPosition:yfiles.input.StripeReparentPolicy,targetBounds:yfiles.geometry.Rect):yfiles.view.ICanvasObject;
@@ -42554,7 +42562,7 @@ declare namespace yfiles{
        */
       updateTargetVisualizationBounds(originalTargetBounds:yfiles.geometry.Rect,reparentPosition:yfiles.input.StripeReparentPolicy,targetStripe:yfiles.graph.IStripe):yfiles.geometry.Rect;
       /**
-       *
+       * 
        * @type {yfiles.geometry.IPoint}
        */
       location:yfiles.geometry.IPoint;
@@ -42614,7 +42622,7 @@ declare namespace yfiles{
       constructor();
       /**
        * Create a preview version of the table that is temporarily used to show the dragged stripe.
-       * @returns
+       * @returns 
        * @protected
        */
       createPreviewTable():yfiles.graph.ITable;
@@ -42771,13 +42779,13 @@ declare namespace yfiles{
       clearSelection():void;
       /**
        * Factory method that creates the {@link yfiles.input.TableEditorInputMode#keyboardInputMode} instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createClickInputMode():yfiles.input.ClickInputMode;
       /**
        * Factory method that creates the {@link yfiles.input.TableEditorInputMode#keyboardInputMode} instance.
-       * @returns
+       * @returns 
        * @protected
        */
       createKeyboardInputMode():yfiles.input.KeyboardInputMode;
@@ -42877,7 +42885,7 @@ declare namespace yfiles{
        * handlers or {@link yfiles.input.IEditLabelHelper}s.
        * </p>
        * @param label The label to edit.
-       * @returns
+       * @returns 
        * @see yfiles.input.TableEditorInputMode#onLabelTextEdited
        */
       editLabel(label:yfiles.graph.ILabel):Promise<yfiles.graph.ILabel>;
@@ -42917,7 +42925,7 @@ declare namespace yfiles{
        * <p>
        * This method determines the label owner to add to and delegates to {@link yfiles.input.TableEditorInputMode#createLabel}.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       onAddLabel():boolean;
@@ -42968,7 +42976,7 @@ declare namespace yfiles{
        * This method determines the label to edit and delegates to either {@link yfiles.input.TableEditorInputMode#editLabel} or {@link yfiles.input.TableEditorInputMode#createLabel}
        * if no label could be found.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       onEditLabel():boolean;
@@ -43567,25 +43575,25 @@ declare namespace yfiles{
        */
       constructor(coreHandler:yfiles.input.IReshapeHandler,tableNode:yfiles.graph.INode,table:yfiles.graph.ITable);
       /**
-       *
+       * 
        * @param context
        * @param originalBounds
        */
       cancelReshape(context:yfiles.input.IInputModeContext,originalBounds:yfiles.geometry.Rect):void;
       /**
-       *
+       * 
        * @param context
        * @param originalBounds
        * @param newBounds
        */
       handleReshape(context:yfiles.input.IInputModeContext,originalBounds:yfiles.geometry.Rect,newBounds:yfiles.geometry.Rect):void;
       /**
-       *
+       * 
        * @param context
        */
       initializeReshape(context:yfiles.input.IInputModeContext):void;
       /**
-       *
+       * 
        * @param context
        * @param originalBounds
        * @param newBounds
@@ -43607,7 +43615,7 @@ declare namespace yfiles{
        */
       table:yfiles.graph.ITable;
       /**
-       *
+       * 
        * @type {yfiles.geometry.IRectangle}
        */
       bounds:yfiles.geometry.IRectangle;
@@ -44070,30 +44078,30 @@ declare namespace yfiles{
        */
       createFromTarget(bendIndex:number):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param owner
        * @param location
-       * @returns
+       * @returns 
        */
       createParameter(owner:yfiles.graph.IPortOwner,location:yfiles.geometry.Point):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getContext(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getLocation(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.geometry.Point;
       /**
        * This implementation has nothing in its lookup and will always yield <code>null</code>
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -44161,17 +44169,17 @@ declare namespace yfiles{
        */
       findBestParameter(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel,layout:yfiles.geometry.IOrientedRectangle):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
@@ -44186,9 +44194,9 @@ declare namespace yfiles{
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -44221,9 +44229,9 @@ declare namespace yfiles{
        */
       constructor(owner:yfiles.graph.IEdge,location:yfiles.geometry.IPoint);
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -44258,7 +44266,7 @@ declare namespace yfiles{
        */
       y:number;
       /**
-       *
+       * 
        * @type {any}
        */
       tag:any;
@@ -44296,9 +44304,9 @@ declare namespace yfiles{
        */
       constructor(sourcePort:yfiles.graph.IPort,targetPort:yfiles.graph.IPort);
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -44345,7 +44353,7 @@ declare namespace yfiles{
        */
       labels:yfiles.collections.IListEnumerable<yfiles.graph.ILabel>;
       /**
-       *
+       * 
        * @type {any}
        */
       tag:any;
@@ -44407,26 +44415,26 @@ declare namespace yfiles{
        */
       constructor(options?:{edgeDefaults?:yfiles.graph.IEdgeDefaults,groupNodeDefaults?:yfiles.graph.INodeDefaults,mapperRegistry?:yfiles.graph.IMapperRegistry,nodeDefaults?:yfiles.graph.INodeDefaults,undoEngineEnabled?:boolean,nodes?:Array<any>});
       /**
-       *
+       * 
        * @param edge
        * @param location
        * @param [index=-1]
-       * @returns
+       * @returns 
        */
       addBend(edge:yfiles.graph.IEdge,location:yfiles.geometry.Point,index?:number):yfiles.graph.IBend;
       /**
-       *
+       * 
        * @param owner
        * @param text
        * @param [layoutParameter=null]
        * @param [style=null]
        * @param [preferredSize=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       addLabel(owner:yfiles.graph.ILabelOwner,text:string,layoutParameter?:yfiles.graph.ILabelModelParameter,style?:yfiles.styles.ILabelStyle,preferredSize?:yfiles.geometry.Size,tag?:any):yfiles.graph.ILabel;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.owner
        * @param options.text
@@ -44434,7 +44442,7 @@ declare namespace yfiles{
        * @param [options.style=null]
        * @param [options.preferredSize=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       addLabel(options:{owner:yfiles.graph.ILabelOwner,text:string,layoutParameter?:yfiles.graph.ILabelModelParameter,style?:yfiles.styles.ILabelStyle,preferredSize?:yfiles.geometry.Size,tag?:Object}):yfiles.graph.ILabel;
       /**
@@ -44474,22 +44482,22 @@ declare namespace yfiles{
        */
       contains(item:yfiles.graph.IModelItem):boolean;
       /**
-       *
+       * 
        * @param sourcePort
        * @param targetPort
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createEdge(sourcePort:yfiles.graph.IPort,targetPort:yfiles.graph.IPort,style?:yfiles.styles.IEdgeStyle,tag?:any):yfiles.graph.IEdge;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.sourcePort
        * @param options.targetPort
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createEdge(options:{sourcePort:yfiles.graph.IPort,targetPort:yfiles.graph.IPort,style?:yfiles.styles.IEdgeStyle,tag?:Object}):yfiles.graph.IEdge;
       /**
@@ -44538,58 +44546,58 @@ declare namespace yfiles{
        */
       createEdge(options:{source:yfiles.graph.INode,target:yfiles.graph.INode,style?:yfiles.styles.IEdgeStyle,tag?:Object}):yfiles.graph.IEdge;
       /**
-       *
+       * 
        * @param [parent=null]
        * @param [layout=null]
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createGroupNode(parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:any):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param [options.parent=null]
        * @param [options.layout=null]
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createGroupNode(options:{parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:Object}):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param layout
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createNode(layout:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:any):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.layout
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createNode(options:{layout:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:Object}):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param [parent=null]
        * @param [layout=null]
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createNode(parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:any):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param [options.parent=null]
        * @param [options.layout=null]
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createNode(options:{parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:Object}):yfiles.graph.INode;
       /**
@@ -44699,23 +44707,23 @@ declare namespace yfiles{
        */
       createUndoUnitForPortRemoval(port:yfiles.graph.IPort):yfiles.graph.IUndoUnit;
       /**
-       *
+       * 
        * @param owner
        * @param [type=yfiles.graph.AdjacencyTypes.ALL]
-       * @returns
+       * @returns 
        */
       edgesAt(owner:yfiles.graph.IPortOwner,type?:yfiles.graph.AdjacencyTypes):yfiles.collections.IListEnumerable<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @param port
        * @param [type=yfiles.graph.AdjacencyTypes.ALL]
-       * @returns
+       * @returns 
        */
       edgesAt(port:yfiles.graph.IPort,type?:yfiles.graph.AdjacencyTypes):yfiles.collections.IListEnumerable<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getChildren(node:yfiles.graph.INode):yfiles.collections.IListEnumerable<yfiles.graph.INode>;
       /**
@@ -44749,15 +44757,15 @@ declare namespace yfiles{
        */
       getNewTargetPort(targetOwner:yfiles.graph.IPortOwner):yfiles.graph.IPort;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getParent(node:yfiles.graph.INode):yfiles.graph.INode;
       /**
        * The last element in the lookup chain is implemented by this method.
        * @param type
-       * @returns
+       * @returns 
        * @protected
        */
       innerLookup(type:yfiles.lang.Class):any;
@@ -44770,9 +44778,9 @@ declare namespace yfiles{
        */
       invalidateDisplays():void;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       isGroupNode(node:yfiles.graph.INode):boolean;
       /**
@@ -45221,7 +45229,7 @@ declare namespace yfiles{
        */
       onRemovingPort(port:yfiles.graph.IPort):void;
       /**
-       *
+       * 
        * @param item
        */
       remove(item:yfiles.graph.IModelItem):void;
@@ -45254,19 +45262,19 @@ declare namespace yfiles{
        */
       setEdgePorts(edge:yfiles.graph.IEdge,sourcePort:yfiles.graph.IPort,targetPort:yfiles.graph.IPort):void;
       /**
-       *
+       * 
        * @param node
        * @param isGroupNode
        */
       setIsGroupNode(node:yfiles.graph.INode,isGroupNode:boolean):void;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
        */
       setLabelLayoutParameter(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):void;
       /**
-       *
+       * 
        * @param label
        * @param size
        */
@@ -45305,25 +45313,25 @@ declare namespace yfiles{
        */
       setNodeLayout(node:yfiles.graph.INode,layout:yfiles.geometry.Rect):void;
       /**
-       *
+       * 
        * @param node
        * @param parent
        */
       setParent(node:yfiles.graph.INode,parent:yfiles.graph.INode):void;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
        */
       setPortLocationParameter(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):void;
       /**
-       *
+       * 
        * @param port
        * @param style
        */
       setStyle(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):void;
       /**
-       *
+       * 
        * @param edge
        * @param style
        */
@@ -45433,342 +45441,342 @@ declare namespace yfiles{
        */
       undoEngineEnabled:boolean;
       /**
-       *
+       * 
        * @type {yfiles.graph.IEdgeDefaults}
        */
       edgeDefaults:yfiles.graph.IEdgeDefaults;
       /**
-       *
+       * 
        * @type {yfiles.graph.INodeDefaults}
        */
       nodeDefaults:yfiles.graph.INodeDefaults;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.INode>}
        */
       nodes:yfiles.collections.IListEnumerable<yfiles.graph.INode>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.ILabel>}
        */
       labels:yfiles.collections.IListEnumerable<yfiles.graph.ILabel>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.IPort>}
        */
       ports:yfiles.collections.IListEnumerable<yfiles.graph.IPort>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.IEdge>}
        */
       edges:yfiles.collections.IListEnumerable<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @param listener
        */
       addGraphTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IGraph,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeGraphTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IGraph,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.INode>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.INode>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeRemovedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeRemovedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,yfiles.styles.INodeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,yfiles.styles.INodeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeLayoutChangedListener(listener:(source:any,node:yfiles.graph.INode,oldLayout:yfiles.geometry.Rect)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeLayoutChangedListener(listener:(source:any,node:yfiles.graph.INode,oldLayout:yfiles.geometry.Rect)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IEdge>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IEdge>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeRemovedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeRemovedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,yfiles.styles.IEdgeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,yfiles.styles.IEdgeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgePortsChangedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgePortsChangedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IBend>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IBend>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendRemovedListener(listener:(sender:any,evt:yfiles.graph.BendEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendRemovedListener(listener:(sender:any,evt:yfiles.graph.BendEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendLocationChangedListener(listener:(source:any,bend:yfiles.graph.IBend,oldLocation:yfiles.geometry.Point)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendLocationChangedListener(listener:(source:any,bend:yfiles.graph.IBend,oldLocation:yfiles.geometry.Point)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IBend,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IBend,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelRemovedListener(listener:(sender:any,evt:yfiles.graph.LabelEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelRemovedListener(listener:(sender:any,evt:yfiles.graph.LabelEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.styles.ILabelStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.styles.ILabelStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelPreferredSizeChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.geometry.Size>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelPreferredSizeChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.geometry.Size>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelTextChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,string>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelTextChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,string>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelLayoutParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.graph.ILabelModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelLayoutParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.graph.ILabelModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IPort>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IPort>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortRemovedListener(listener:(sender:any,evt:yfiles.graph.PortEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortRemovedListener(listener:(sender:any,evt:yfiles.graph.PortEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.styles.IPortStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.styles.IPortStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortLocationParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.graph.IPortLocationModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortLocationParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.graph.IPortLocationModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addDisplaysInvalidatedListener(listener:(sender:any,evt:yfiles.lang.EventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeDisplaysInvalidatedListener(listener:(sender:any,evt:yfiles.lang.EventArgs)=>void):void;
       /**
-       *
+       * 
        * @type {yfiles.graph.INodeDefaults}
        */
       groupNodeDefaults:yfiles.graph.INodeDefaults;
       /**
-       *
+       * 
        * @param listener
        */
       addParentChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeParentChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addIsGroupNodeChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeIsGroupNodeChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @type {any}
        */
       tag:any;
@@ -45803,9 +45811,9 @@ declare namespace yfiles{
        */
       adoptPreferredSizeFromStyle():void;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -45856,7 +45864,7 @@ declare namespace yfiles{
        */
       preferredSize:yfiles.geometry.Size;
       /**
-       *
+       * 
        * @type {any}
        */
       tag:any;
@@ -45895,9 +45903,9 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -45930,7 +45938,7 @@ declare namespace yfiles{
        */
       labels:yfiles.collections.IListEnumerable<yfiles.graph.ILabel>;
       /**
-       *
+       * 
        * @type {any}
        */
       tag:any;
@@ -45968,9 +45976,9 @@ declare namespace yfiles{
        */
       constructor(owner:yfiles.graph.IPortOwner,locationParameter:yfiles.graph.IPortLocationModelParameter);
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -46009,7 +46017,7 @@ declare namespace yfiles{
        */
       owner:yfiles.graph.IPortOwner;
       /**
-       *
+       * 
        * @type {any}
        */
       tag:any;
@@ -46064,37 +46072,37 @@ declare namespace yfiles{
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getDescriptor(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILabelCandidateDescriptor;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -46259,7 +46267,7 @@ declare namespace yfiles{
        * <p>
        * Returns a model parameter that encodes the default position of this model's allowed edge label positions.
        * </p>
-       * @returns
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
@@ -46278,9 +46286,9 @@ declare namespace yfiles{
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -46405,7 +46413,7 @@ declare namespace yfiles{
        * <p>
        * Returns a model parameter that encodes the default position of this model's allowed edge label positions.
        * </p>
-       * @returns
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
@@ -46445,9 +46453,9 @@ declare namespace yfiles{
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -46602,8 +46610,8 @@ declare namespace yfiles{
        */
       constructor(options?:{insets?:yfiles.geometry.Insets});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
@@ -46613,30 +46621,30 @@ declare namespace yfiles{
        */
       createParameter(position:yfiles.graph.ExteriorLabelModelPosition):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -46800,22 +46808,22 @@ declare namespace yfiles{
        */
       edgePredicate:(obj:yfiles.graph.IEdge)=>boolean;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.INode>}
        */
       nodes:yfiles.collections.IListEnumerable<yfiles.graph.INode>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.IEdge>}
        */
       edges:yfiles.collections.IListEnumerable<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.ILabel>}
        */
       labels:yfiles.collections.IListEnumerable<yfiles.graph.ILabel>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.IPort>}
        */
       ports:yfiles.collections.IListEnumerable<yfiles.graph.IPort>;
@@ -46834,8 +46842,8 @@ declare namespace yfiles{
     export interface FreeEdgeLabelModel extends yfiles.lang.Object,yfiles.graph.ILabelModelParameterFinder,yfiles.graph.ILabelModel{}
     export class FreeEdgeLabelModel {
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
@@ -46860,23 +46868,23 @@ declare namespace yfiles{
        */
       findBestParameter(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel,layout:yfiles.geometry.IOrientedRectangle):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -46926,8 +46934,8 @@ declare namespace yfiles{
        */
       createAnchored(location:yfiles.geometry.IPoint,angle:number):yfiles.graph.ILabelModelParameter;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
@@ -46937,23 +46945,23 @@ declare namespace yfiles{
        */
       createDynamic(layout:yfiles.geometry.IOrientedRectangle):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -47038,10 +47046,10 @@ declare namespace yfiles{
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
@@ -47074,10 +47082,10 @@ declare namespace yfiles{
     export interface FreeNodePortLocationModel extends yfiles.lang.Object,yfiles.graph.IPortLocationModel{}
     export class FreeNodePortLocationModel {
       /**
-       *
+       * 
        * @param owner
        * @param location
-       * @returns
+       * @returns 
        */
       createParameter(owner:yfiles.graph.IPortOwner,location:yfiles.geometry.Point):yfiles.graph.IPortLocationModelParameter;
       /**
@@ -47092,23 +47100,23 @@ declare namespace yfiles{
        */
       createParameterForRatios(ratios:yfiles.geometry.Point,offset?:yfiles.geometry.Point):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getContext(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getLocation(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.geometry.Point;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -47259,15 +47267,15 @@ declare namespace yfiles{
        */
       addParameter(layoutParameter:yfiles.graph.ILabelModelParameter,descriptor?:yfiles.graph.ILabelCandidateDescriptor):yfiles.graph.ILabelModelParameter;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
@@ -47279,9 +47287,9 @@ declare namespace yfiles{
        */
       getDescriptor(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILabelCandidateDescriptor;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       static $class:yfiles.lang.Class;
@@ -47347,23 +47355,23 @@ declare namespace yfiles{
        */
       createParameter(owner:yfiles.graph.IPortOwner,location:yfiles.geometry.Point):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getContext(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getLocation(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.geometry.Point;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -47732,7 +47740,7 @@ declare namespace yfiles{
        * <p>
        * Custom ID can be used to map between elements in different graphs.
        * </p>
-       * @returns
+       * @returns 
        * @protected
        */
       createDefaultClipboardIdProvider():yfiles.graph.IClipboardIdProvider;
@@ -47835,7 +47843,7 @@ declare namespace yfiles{
        * @param coreFilter The core predicate for the base set of elements.
        * @param graph The graph to use for determining adjacency.
        * @param restrictive Whether to create a restriction or extension for the <code>coreFilter</code> predicate
-       * @returns
+       * @returns 
        * @static
        */
       static createWrappedFilter(coreFilter:(obj:yfiles.graph.IModelItem)=>boolean,graph:yfiles.graph.IGraph,restrictive:boolean):(obj:yfiles.graph.IModelItem)=>boolean;
@@ -50609,13 +50617,13 @@ declare namespace yfiles{
       /**
        * Determines the nearest common ancestor of the provided nodes in the graph.
        * @param nodes The nodes to find the nearest common ancestor of.
-       * @returns
+       * @returns 
        */
       getNearestCommonAncestor(...nodes:yfiles.graph.INode[]):yfiles.graph.INode;
       /**
        * Determines the nearest common ancestor of the provided nodes in the graph.
        * @param nodes The nodes to find the nearest common ancestor of.
-       * @returns
+       * @returns 
        */
       getNearestCommonAncestor(nodes:yfiles.collections.IEnumerable<yfiles.graph.INode>):yfiles.graph.INode;
       /**
@@ -50665,11 +50673,11 @@ declare namespace yfiles{
        */
       constructor(graph:yfiles.graph.IGraph);
       /**
-       *
+       * 
        * @param edge
        * @param location
        * @param [index=-1]
-       * @returns
+       * @returns 
        */
       addBend(edge:yfiles.graph.IEdge,location:yfiles.geometry.Point,index?:number):yfiles.graph.IBend;
       /**
@@ -50679,18 +50687,18 @@ declare namespace yfiles{
        */
       addEventHandlers(graph:yfiles.graph.IGraph):void;
       /**
-       *
+       * 
        * @param owner
        * @param text
        * @param [layoutParameter=null]
        * @param [style=null]
        * @param [preferredSize=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       addLabel(owner:yfiles.graph.ILabelOwner,text:string,layoutParameter?:yfiles.graph.ILabelModelParameter,style?:yfiles.styles.ILabelStyle,preferredSize?:yfiles.geometry.Size,tag?:any):yfiles.graph.ILabel;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.owner
        * @param options.text
@@ -50698,125 +50706,125 @@ declare namespace yfiles{
        * @param [options.style=null]
        * @param [options.preferredSize=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       addLabel(options:{owner:yfiles.graph.ILabelOwner,text:string,layoutParameter?:yfiles.graph.ILabelModelParameter,style?:yfiles.styles.ILabelStyle,preferredSize?:yfiles.geometry.Size,tag?:Object}):yfiles.graph.ILabel;
       /**
-       *
+       * 
        * @param owner
        * @param [locationParameter=null]
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       addPort(owner:yfiles.graph.IPortOwner,locationParameter?:yfiles.graph.IPortLocationModelParameter,style?:yfiles.styles.IPortStyle,tag?:any):yfiles.graph.IPort;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.owner
        * @param [options.locationParameter=null]
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       addPort(options:{owner:yfiles.graph.IPortOwner,locationParameter?:yfiles.graph.IPortLocationModelParameter,style?:yfiles.styles.IPortStyle,tag?:Object}):yfiles.graph.IPort;
       /**
-       *
+       * 
        * @param item
-       * @returns
+       * @returns 
        */
       contains(item:yfiles.graph.IModelItem):boolean;
       /**
-       *
+       * 
        * @param source
        * @param target
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createEdge(source:yfiles.graph.INode,target:yfiles.graph.INode,style?:yfiles.styles.IEdgeStyle,tag?:any):yfiles.graph.IEdge;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.source
        * @param options.target
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createEdge(options:{source:yfiles.graph.INode,target:yfiles.graph.INode,style?:yfiles.styles.IEdgeStyle,tag?:Object}):yfiles.graph.IEdge;
       /**
-       *
+       * 
        * @param sourcePort
        * @param targetPort
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createEdge(sourcePort:yfiles.graph.IPort,targetPort:yfiles.graph.IPort,style?:yfiles.styles.IEdgeStyle,tag?:any):yfiles.graph.IEdge;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.sourcePort
        * @param options.targetPort
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createEdge(options:{sourcePort:yfiles.graph.IPort,targetPort:yfiles.graph.IPort,style?:yfiles.styles.IEdgeStyle,tag?:Object}):yfiles.graph.IEdge;
       /**
-       *
+       * 
        * @param [parent=null]
        * @param [layout=null]
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createGroupNode(parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:any):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param [options.parent=null]
        * @param [options.layout=null]
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createGroupNode(options:{parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:Object}):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param layout
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createNode(layout:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:any):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.layout
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createNode(options:{layout:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:Object}):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param [parent=null]
        * @param [layout=null]
        * @param [style=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       createNode(parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:any):yfiles.graph.INode;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param [options.parent=null]
        * @param [options.layout=null]
        * @param [options.style=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       createNode(options:{parent?:yfiles.graph.INode,layout?:yfiles.geometry.Rect,style?:yfiles.styles.INodeStyle,tag?:Object}):yfiles.graph.INode;
       /**
@@ -50828,50 +50836,50 @@ declare namespace yfiles{
        */
       dispose():void;
       /**
-       *
+       * 
        * @param owner
        * @param [type=yfiles.graph.AdjacencyTypes.ALL]
-       * @returns
+       * @returns 
        */
       edgesAt(owner:yfiles.graph.IPortOwner,type?:yfiles.graph.AdjacencyTypes):yfiles.collections.IListEnumerable<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @param port
        * @param [type=yfiles.graph.AdjacencyTypes.ALL]
-       * @returns
+       * @returns 
        */
       edgesAt(port:yfiles.graph.IPort,type?:yfiles.graph.AdjacencyTypes):yfiles.collections.IListEnumerable<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getChildren(node:yfiles.graph.INode):yfiles.collections.IListEnumerable<yfiles.graph.INode>;
       /**
        * Gets the lookup instance to use in {@link yfiles.graph.GraphWrapperBase#lookup}
-       * @returns
+       * @returns 
        */
       getLookup():yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getParent(node:yfiles.graph.INode):yfiles.graph.INode;
       /**
-       *
+       * 
        */
       invalidateDisplays():void;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       isGroupNode(node:yfiles.graph.INode):boolean;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -51068,7 +51076,7 @@ declare namespace yfiles{
        */
       onPortTagChanged(evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,any>):void;
       /**
-       *
+       * 
        * @param item
        */
       remove(item:yfiles.graph.IModelItem):void;
@@ -51079,38 +51087,38 @@ declare namespace yfiles{
        */
       removeEventHandlers(graph:yfiles.graph.IGraph):void;
       /**
-       *
+       * 
        * @param bend
        * @param location
        */
       setBendLocation(bend:yfiles.graph.IBend,location:yfiles.geometry.Point):void;
       /**
-       *
+       * 
        * @param edge
        * @param sourcePort
        * @param targetPort
        */
       setEdgePorts(edge:yfiles.graph.IEdge,sourcePort:yfiles.graph.IPort,targetPort:yfiles.graph.IPort):void;
       /**
-       *
+       * 
        * @param node
        * @param isGroupNode
        */
       setIsGroupNode(node:yfiles.graph.INode,isGroupNode:boolean):void;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
        */
       setLabelLayoutParameter(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):void;
       /**
-       *
+       * 
        * @param label
        * @param preferredSize
        */
       setLabelPreferredSize(label:yfiles.graph.ILabel,preferredSize:yfiles.geometry.Size):void;
       /**
-       *
+       * 
        * @param label
        * @param text
        */
@@ -51121,43 +51129,43 @@ declare namespace yfiles{
        */
       setLookup(lookup:yfiles.graph.ILookup):void;
       /**
-       *
+       * 
        * @param node
        * @param layout
        */
       setNodeLayout(node:yfiles.graph.INode,layout:yfiles.geometry.Rect):void;
       /**
-       *
+       * 
        * @param node
        * @param parent
        */
       setParent(node:yfiles.graph.INode,parent:yfiles.graph.INode):void;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
        */
       setPortLocationParameter(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):void;
       /**
-       *
+       * 
        * @param port
        * @param style
        */
       setStyle(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):void;
       /**
-       *
+       * 
        * @param edge
        * @param style
        */
       setStyle(edge:yfiles.graph.IEdge,style:yfiles.styles.IEdgeStyle):void;
       /**
-       *
+       * 
        * @param label
        * @param style
        */
       setStyle(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):void;
       /**
-       *
+       * 
        * @param node
        * @param style
        */
@@ -51168,347 +51176,347 @@ declare namespace yfiles{
        */
       wrappedGraph:yfiles.graph.IGraph;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.INode>}
        */
       nodes:yfiles.collections.IListEnumerable<yfiles.graph.INode>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.IEdge>}
        */
       edges:yfiles.collections.IListEnumerable<yfiles.graph.IEdge>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.ILabel>}
        */
       labels:yfiles.collections.IListEnumerable<yfiles.graph.ILabel>;
       /**
-       *
+       * 
        * @type {yfiles.collections.IListEnumerable.<yfiles.graph.IPort>}
        */
       ports:yfiles.collections.IListEnumerable<yfiles.graph.IPort>;
       /**
-       *
+       * 
        * @type {yfiles.graph.IEdgeDefaults}
        */
       edgeDefaults:yfiles.graph.IEdgeDefaults;
       /**
-       *
+       * 
        * @type {yfiles.graph.INodeDefaults}
        */
       nodeDefaults:yfiles.graph.INodeDefaults;
       /**
-       *
+       * 
        * @param listener
        */
       addGraphTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IGraph,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeGraphTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IGraph,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.INode>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.INode>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeRemovedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeRemovedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,yfiles.styles.INodeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,yfiles.styles.INodeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeLayoutChangedListener(listener:(source:any,node:yfiles.graph.INode,oldLayout:yfiles.geometry.Rect)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeLayoutChangedListener(listener:(source:any,node:yfiles.graph.INode,oldLayout:yfiles.geometry.Rect)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addNodeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeNodeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.INode,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IEdge>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IEdge>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeRemovedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeRemovedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,yfiles.styles.IEdgeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,yfiles.styles.IEdgeStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgePortsChangedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgePortsChangedListener(listener:(sender:any,evt:yfiles.graph.EdgeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addEdgeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeEdgeTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IEdge,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IBend>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IBend>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendRemovedListener(listener:(sender:any,evt:yfiles.graph.BendEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendRemovedListener(listener:(sender:any,evt:yfiles.graph.BendEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendLocationChangedListener(listener:(source:any,bend:yfiles.graph.IBend,oldLocation:yfiles.geometry.Point)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendLocationChangedListener(listener:(source:any,bend:yfiles.graph.IBend,oldLocation:yfiles.geometry.Point)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addBendTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IBend,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeBendTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IBend,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelRemovedListener(listener:(sender:any,evt:yfiles.graph.LabelEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelRemovedListener(listener:(sender:any,evt:yfiles.graph.LabelEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.styles.ILabelStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.styles.ILabelStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelPreferredSizeChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.geometry.Size>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelPreferredSizeChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.geometry.Size>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelTextChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,string>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelTextChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,string>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelLayoutParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.graph.ILabelModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelLayoutParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,yfiles.graph.ILabelModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.ILabel,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IPort>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IPort>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortRemovedListener(listener:(sender:any,evt:yfiles.graph.PortEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortRemovedListener(listener:(sender:any,evt:yfiles.graph.PortEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.styles.IPortStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortStyleChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.styles.IPortStyle>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortLocationParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.graph.IPortLocationModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortLocationParameterChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,yfiles.graph.IPortLocationModelParameter>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addPortTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removePortTagChangedListener(listener:(sender:any,evt:yfiles.graph.ItemChangedEventArgs<yfiles.graph.IPort,any>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addDisplaysInvalidatedListener(listener:(sender:any,evt:yfiles.lang.EventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeDisplaysInvalidatedListener(listener:(sender:any,evt:yfiles.lang.EventArgs)=>void):void;
       /**
-       *
+       * 
        * @type {yfiles.graph.IMapperRegistry}
        */
       mapperRegistry:yfiles.graph.IMapperRegistry;
       /**
-       *
+       * 
        * @type {yfiles.graph.INodeDefaults}
        */
       groupNodeDefaults:yfiles.graph.INodeDefaults;
       /**
-       *
+       * 
        * @param listener
        */
       addParentChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeParentChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addIsGroupNodeChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeIsGroupNodeChangedListener(listener:(sender:any,evt:yfiles.graph.NodeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @type {any}
        */
       tag:any;
@@ -54735,7 +54743,7 @@ declare namespace yfiles{
        * Always yields the parameter that has been passed to the constructor.
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getDescriptor(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILabelCandidateDescriptor;
       /**
@@ -54784,24 +54792,24 @@ declare namespace yfiles{
        */
       static INTERNAL_DESCRIPTOR:yfiles.graph.ILabelCandidateDescriptor;
       /**
-       *
+       * 
        * @type {boolean}
        */
       externalCandidate:boolean;
       /**
-       *
+       * 
        * @default 1.0
        * @type {number}
        */
       edgeOverlapPenalty:number;
       /**
-       *
+       * 
        * @default 1.0
        * @type {number}
        */
       nodeOverlapPenalty:number;
       /**
-       *
+       * 
        * @default 1.0
        * @type {number}
        */
@@ -55712,28 +55720,28 @@ declare namespace yfiles{
        */
       constructor(options?:{insets?:yfiles.geometry.Insets});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
        * Creates the parameter for the given position.
        * @param position The position.
-       * @returns
+       * @returns 
        */
       createParameter(position:yfiles.graph.InteriorStretchLabelModelPosition):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
@@ -55753,16 +55761,16 @@ declare namespace yfiles{
        */
       getNodeInsets(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.Insets;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -55883,28 +55891,28 @@ declare namespace yfiles{
        */
       constructor(options?:{insets?:yfiles.geometry.Insets});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
        * Creates the parameter for the given position.
        * @param position The position.
-       * @returns
+       * @returns 
        */
       createParameter(position:yfiles.graph.InteriorLabelModelPosition):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
@@ -55924,16 +55932,16 @@ declare namespace yfiles{
        */
       getNodeInsets(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.Insets;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -56068,12 +56076,12 @@ declare namespace yfiles{
        */
       static create<TKey,TValue>(keyType:yfiles.lang.Class,valueType:yfiles.lang.Class,mapper:yfiles.collections.IMapper<TKey,TValue>):yfiles.graph.MapperMetadata;
       /**
-       *
+       * 
        * @type {yfiles.lang.Class}
        */
       keyType:yfiles.lang.Class;
       /**
-       *
+       * 
        * @type {yfiles.lang.Class}
        */
       valueType:yfiles.lang.Class;
@@ -56090,7 +56098,7 @@ declare namespace yfiles{
     export class MapperRegistry {
       constructor();
       /**
-       *
+       * 
        * Type parameter <code>K</code>.
        * Type parameter <code>V</code>.
        * @param valueType
@@ -56101,33 +56109,33 @@ declare namespace yfiles{
        */
       addMapper<K,V>(keyType:yfiles.lang.Class,valueType:yfiles.lang.Class,tag:any,mapper:yfiles.collections.IMapper<K,V>):void;
       /**
-       *
+       * 
        * Type parameter <code>K</code>.
        * Type parameter <code>V</code>.
        * @param tag
-       * @returns
+       * @returns 
        * @template K,V
        */
       getMapper<K,V>(tag:any):yfiles.collections.IMapper<K,V>;
       /**
-       *
+       * 
        * @param tag
-       * @returns
+       * @returns 
        */
       getMapperMetadata(tag:any):yfiles.graph.MapperMetadata;
       /**
-       *
+       * 
        * @param tag
        */
       removeMapper(tag:any):void;
       /**
-       *
+       * 
        * @param tag
        * @param metadata
        */
       setMapperMetadata(tag:any,metadata:yfiles.graph.MapperMetadata):void;
       /**
-       *
+       * 
        * @type {yfiles.collections.IEnumerable.<any>}
        */
       registeredTags:yfiles.collections.IEnumerable<any>;
@@ -56204,8 +56212,8 @@ declare namespace yfiles{
        */
       constructor(options?:{angle?:number,distance?:number});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
@@ -56215,30 +56223,30 @@ declare namespace yfiles{
        */
       createParameter(position:yfiles.graph.NinePositionsEdgeLabelModelPosition):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -56370,45 +56378,45 @@ declare namespace yfiles{
        */
       constructor(options?:{yOffset?:number});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
        * Creates a parameter for the north side of the node.
-       * @returns
+       * @returns 
        */
       createNorthParameter():yfiles.graph.ILabelModelParameter;
       /**
        * Creates a parameter for the south side of the node.
-       * @returns
+       * @returns 
        */
       createSouthParameter():yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -56464,30 +56472,30 @@ declare namespace yfiles{
        */
       createFromTarget(ratio:number,segmentIndex:number):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param owner
        * @param location
-       * @returns
+       * @returns 
        */
       createParameter(owner:yfiles.graph.IPortOwner,location:yfiles.geometry.Point):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getContext(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param port
        * @param locationParameter
-       * @returns
+       * @returns 
        */
       getLocation(port:yfiles.graph.IPort,locationParameter:yfiles.graph.IPortLocationModelParameter):yfiles.geometry.Point;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -56541,8 +56549,8 @@ declare namespace yfiles{
        */
       constructor(options?:{angle?:number,autoRotation?:boolean});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
@@ -56566,18 +56574,18 @@ declare namespace yfiles{
        */
       createParameterFromTarget(segmentIndex:number,distance:number,segmentRatio:number):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param model
        * @param layout
-       * @returns
+       * @returns 
        */
       findBestParameter(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel,layout:yfiles.geometry.IOrientedRectangle):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
@@ -56587,16 +56595,16 @@ declare namespace yfiles{
        */
       getDistance(layoutParameter:yfiles.graph.ILabelModelParameter):number;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -56671,41 +56679,41 @@ declare namespace yfiles{
        */
       GetDefaultStyleInstance():yfiles.styles.IPortStyle;
       /**
-       *
+       * 
        * @param owner
-       * @returns
+       * @returns 
        */
       getLocationParameterInstance(owner:yfiles.graph.IPortOwner):yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @param owner
-       * @returns
+       * @returns 
        */
       getStyleInstance(owner:yfiles.graph.IPortOwner):yfiles.styles.IPortStyle;
       /**
-       *
+       * 
        * @default true
        * @type {boolean}
        */
       autoCleanup:boolean;
       /**
-       *
+       * 
        * @type {yfiles.graph.IPortLocationModelParameter}
        */
       locationParameter:yfiles.graph.IPortLocationModelParameter;
       /**
-       *
+       * 
        * @default true
        * @type {boolean}
        */
       shareLocationParameterInstance:boolean;
       /**
-       *
+       * 
        * @type {yfiles.styles.IPortStyle}
        */
       style:yfiles.styles.IPortStyle;
       /**
-       *
+       * 
        * @default true
        * @type {boolean}
        */
@@ -56731,32 +56739,32 @@ declare namespace yfiles{
        */
       constructor(options?:{size?:yfiles.geometry.Size,labels?:yfiles.graph.ILabelDefaults,ports?:yfiles.graph.IPortDefaults,style?:yfiles.styles.INodeStyle,shareStyleInstance?:boolean});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getStyleInstance():yfiles.styles.INodeStyle;
       /**
-       *
+       * 
        * @type {yfiles.geometry.Size}
        */
       size:yfiles.geometry.Size;
       /**
-       *
+       * 
        * @type {yfiles.graph.ILabelDefaults}
        */
       labels:yfiles.graph.ILabelDefaults;
       /**
-       *
+       * 
        * @type {yfiles.graph.IPortDefaults}
        */
       ports:yfiles.graph.IPortDefaults;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyle}
        */
       style:yfiles.styles.INodeStyle;
       /**
-       *
+       * 
        * @default true
        * @type {boolean}
        */
@@ -56781,27 +56789,27 @@ declare namespace yfiles{
        */
       constructor(options?:{labels?:yfiles.graph.ILabelDefaults,ports?:yfiles.graph.IPortDefaults,style?:yfiles.styles.IEdgeStyle,shareStyleInstance?:boolean});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getStyleInstance():yfiles.styles.IEdgeStyle;
       /**
-       *
+       * 
        * @type {yfiles.graph.ILabelDefaults}
        */
       labels:yfiles.graph.ILabelDefaults;
       /**
-       *
+       * 
        * @type {yfiles.graph.IPortDefaults}
        */
       ports:yfiles.graph.IPortDefaults;
       /**
-       *
+       * 
        * @type {yfiles.styles.IEdgeStyle}
        */
       style:yfiles.styles.IEdgeStyle;
       /**
-       *
+       * 
        * @default true
        * @type {boolean}
        */
@@ -56827,39 +56835,39 @@ declare namespace yfiles{
        */
       constructor(options?:{autoAdjustPreferredSize?:boolean,shareLayoutParameterInstance?:boolean,layoutParameter?:yfiles.graph.ILabelModelParameter,shareStyleInstance?:boolean,style?:yfiles.styles.ILabelStyle});
       /**
-       *
+       * 
        * @param owner
-       * @returns
+       * @returns 
        */
       getLayoutParameterInstance(owner:yfiles.graph.ILabelOwner):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param owner
-       * @returns
+       * @returns 
        */
       getStyleInstance(owner:yfiles.graph.ILabelOwner):yfiles.styles.ILabelStyle;
       /**
-       *
+       * 
        * @type {boolean}
        */
       autoAdjustPreferredSize:boolean;
       /**
-       *
+       * 
        * @type {boolean}
        */
       shareLayoutParameterInstance:boolean;
       /**
-       *
+       * 
        * @type {yfiles.graph.ILabelModelParameter}
        */
       layoutParameter:yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @type {yfiles.styles.ILabelStyle}
        */
       style:yfiles.styles.ILabelStyle;
       /**
-       *
+       * 
        * @type {boolean}
        */
       shareStyleInstance:boolean;
@@ -56919,12 +56927,12 @@ declare namespace yfiles{
       add(unit:yfiles.graph.IUndoUnit):void;
       /**
        * Determines whether a call to {@link yfiles.graph.CompositeUndoUnit#redo} can be made.
-       * @returns
+       * @returns 
        */
       canRedo():boolean;
       /**
        * Determines whether a call to {@link yfiles.graph.CompositeUndoUnit#undo} can be made.
-       * @returns
+       * @returns 
        */
       canUndo():boolean;
       /**
@@ -57285,7 +57293,7 @@ declare namespace yfiles{
       /**
        * Determines whether this instance can be used to decorate the lookup for a certain type.
        * @param t The type to decorate the lookup for.
-       * @returns
+       * @returns 
        * @abstract
        */
       canDecorate(t:yfiles.lang.Class):boolean;
@@ -57460,10 +57468,10 @@ declare namespace yfiles{
      * <br /> <b>Customizing Undo/Redo</b>
      * <ul>
      *   <li>
-     *     In general, to be able to undo or redo certain work client code can <b>implement {@link yfiles.graph.IUndoUnit} or subclass
-     *     {@link yfiles.graph.UndoUnitBase UndoUnitBase}</b>. The client application needs to encapsulate
-     *     changes in this implementation and provide the logic to completely undo and redo these changes.
-     *     Instances of your custom {@link yfiles.graph.IUndoUnit} implementations need to be added to the {@link yfiles.graph.UndoEngine}
+     *     In general, to be able to undo or redo certain work client code can <b>implement {@link yfiles.graph.IUndoUnit} or subclass 
+     *     {@link yfiles.graph.UndoUnitBase UndoUnitBase}</b>. The client application needs to encapsulate 
+     *     changes in this implementation and provide the logic to completely undo and redo these changes. 
+     *     Instances of your custom {@link yfiles.graph.IUndoUnit} implementations need to be added to the {@link yfiles.graph.UndoEngine} 
      *     manually via {@link yfiles.graph.UndoEngine#addUnit}.
      *   </li>
      *   <li>
@@ -57477,7 +57485,7 @@ declare namespace yfiles{
      *   </li>
      *   <li>
      *     <b>It is generally not necessary to subclass {@link yfiles.graph.UndoEngine}</b> unless you want to customize the internal
-     *     handling of the units, which is both complicated and prone to errors. In most use cases it is sufficient
+     *     handling of the units, which is both complicated and prone to errors. In most use cases it is sufficient 
      *     to provide custom {@link yfiles.graph.IUndoUnit}s or {@link yfiles.graph.IMementoSupport}.
      *   </li>
      * </ul>
@@ -57530,12 +57538,12 @@ declare namespace yfiles{
       beginCompoundEdit(undoName:string,redoName:string):yfiles.graph.ICompoundEdit;
       /**
        * Determines whether a call to {@link yfiles.graph.UndoEngine#redo} can be made.
-       * @returns
+       * @returns 
        */
       canRedo():boolean;
       /**
        * Determines whether a call to {@link yfiles.graph.UndoEngine#undo} can be made.
-       * @returns
+       * @returns 
        */
       canUndo():boolean;
       /**
@@ -57944,38 +57952,38 @@ declare namespace yfiles{
        */
       constructor(undoName:string,redoName?:string);
       /**
-       *
+       * 
        */
       dispose():void;
       /**
-       *
+       * 
        * @abstract
        */
       redo():void;
       /**
-       *
+       * 
        * @param unit
-       * @returns
+       * @returns 
        */
       tryMergeUnit(unit:yfiles.graph.IUndoUnit):boolean;
       /**
-       *
+       * 
        * @param unit
-       * @returns
+       * @returns 
        */
       tryReplaceUnit(unit:yfiles.graph.IUndoUnit):boolean;
       /**
-       *
+       * 
        * @abstract
        */
       undo():void;
       /**
-       *
+       * 
        * @type {string}
        */
       undoName:string;
       /**
-       *
+       * 
        * @type {string}
        */
       redoName:string;
@@ -57998,7 +58006,7 @@ declare namespace yfiles{
     export interface FoldingEdgeConverterBase extends yfiles.lang.Object,yfiles.graph.IFoldingEdgeConverter{}
     export class FoldingEdgeConverterBase {
       /**
-       *
+       * 
        * @param factory
        * @param foldingView
        * @param masterEdge
@@ -58006,7 +58014,7 @@ declare namespace yfiles{
        * @param sourceIsCollapsed
        * @param target
        * @param targetIsCollapsed
-       * @returns
+       * @returns 
        * @abstract
        */
       addFoldingEdge(factory:yfiles.graph.IFoldingEdgeFactory,foldingView:yfiles.graph.IFoldingView,masterEdge:yfiles.graph.IEdge,source:yfiles.graph.INode,sourceIsCollapsed:boolean,target:yfiles.graph.INode,targetIsCollapsed:boolean):yfiles.graph.IEdge;
@@ -58776,7 +58784,7 @@ declare namespace yfiles{
        * @param sourceIsCollapsed
        * @param target
        * @param targetIsCollapsed
-       * @returns
+       * @returns 
        */
       addFoldingEdge(factory:yfiles.graph.IFoldingEdgeFactory,foldingView:yfiles.graph.IFoldingView,masterEdge:yfiles.graph.IEdge,source:yfiles.graph.INode,sourceIsCollapsed:boolean,target:yfiles.graph.INode,targetIsCollapsed:boolean):yfiles.graph.IEdge;
       /**
@@ -58824,7 +58832,7 @@ declare namespace yfiles{
        * @param sourceIsCollapsed
        * @param targetSourceNode
        * @param targetIsCollapsed
-       * @returns
+       * @returns 
        * @protected
        */
       addFirstSeparateEdge(factory:yfiles.graph.IFoldingEdgeFactory,foldingView:yfiles.graph.IFoldingView,masterEdge:yfiles.graph.IEdge,viewSourceNode:yfiles.graph.INode,sourceIsCollapsed:boolean,targetSourceNode:yfiles.graph.INode,targetIsCollapsed:boolean):yfiles.graph.IEdge;
@@ -59171,7 +59179,7 @@ declare namespace yfiles{
        */
       clearBends():void;
       /**
-       *
+       * 
        * @param label
        */
       remove(label:yfiles.graph.FoldingLabelState):void;
@@ -59373,7 +59381,7 @@ declare namespace yfiles{
        */
       getFoldingPortState(masterPort:yfiles.graph.IPort):yfiles.graph.FoldingPortState;
       /**
-       *
+       * 
        * @param label
        */
       remove(label:yfiles.graph.FoldingLabelState):void;
@@ -59645,7 +59653,7 @@ declare namespace yfiles{
        * </p>
        * @param node The node relative to which the stripe layout is calculated. This should be the same node where {@link #table} for <code>stripe</code> is associated
        * to.
-       * @returns
+       * @returns 
        */
       getAbsoluteBounds?(node:yfiles.graph.INode):yfiles.geometry.Rect;
       /**
@@ -60075,7 +60083,7 @@ declare namespace yfiles{
       findStripes?(node:yfiles.graph.INode,location:yfiles.geometry.Point,stripeTypes:yfiles.graph.StripeTypes,filter:(obj:yfiles.graph.IStripe)=>boolean):yfiles.collections.IEnumerable<yfiles.graph.IStripe>;
       /**
        * Return the accumulated insets for the table.
-       * @returns
+       * @returns 
        */
       getAccumulatedInsets?():yfiles.geometry.Insets;
       /**
@@ -60635,21 +60643,21 @@ declare namespace yfiles{
        */
       constructor(options?:{insets?:yfiles.geometry.Insets,useActualInsets?:boolean});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
        * Creates the parameter for the given position.
        * @param position The position.
-       * @returns
+       * @returns 
        */
       createParameter(position:yfiles.graph.StretchStripeLabelModelPosition):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
@@ -60666,16 +60674,16 @@ declare namespace yfiles{
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -60816,21 +60824,21 @@ declare namespace yfiles{
        */
       constructor(options?:{ratio?:number,useActualInsets?:boolean});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       createDefaultParameter():yfiles.graph.ILabelModelParameter;
       /**
        * Creates the parameter for the given position.
        * @param position The position.
-       * @returns
+       * @returns 
        */
       createParameter(position:yfiles.graph.StripeLabelModelPosition):yfiles.graph.ILabelModelParameter;
       /**
-       *
+       * 
        * @param label
        * @param layoutParameter
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.graph.ILookup;
       /**
@@ -60847,16 +60855,16 @@ declare namespace yfiles{
        */
       getGeometry(label:yfiles.graph.ILabel,layoutParameter:yfiles.graph.ILabelModelParameter):yfiles.geometry.IOrientedRectangle;
       /**
-       *
+       * 
        * @param label
        * @param model
-       * @returns
+       * @returns 
        */
       getParameters(label:yfiles.graph.ILabel,model:yfiles.graph.ILabelModel):yfiles.collections.IEnumerable<yfiles.graph.ILabelModelParameter>;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -60946,18 +60954,18 @@ declare namespace yfiles{
        */
       constructor(options?:{insets?:yfiles.geometry.Insets,relativeLocation?:yfiles.geometry.Point,rowDefaults?:yfiles.graph.IStripeDefaults,columnDefaults?:yfiles.graph.IStripeDefaults});
       /**
-       *
+       * 
        * @param owner
        * @param text
        * @param [layoutParameter=null]
        * @param [style=null]
        * @param [preferredSize=null]
        * @param [tag=null]
-       * @returns
+       * @returns 
        */
       addLabel(owner:yfiles.graph.IStripe,text:string,layoutParameter?:yfiles.graph.ILabelModelParameter,style?:yfiles.styles.ILabelStyle,preferredSize?:yfiles.geometry.Size,tag?:any):yfiles.graph.ILabel;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.owner
        * @param options.text
@@ -60965,12 +60973,12 @@ declare namespace yfiles{
        * @param [options.style=null]
        * @param [options.preferredSize=null]
        * @param [options.tag=null]
-       * @returns
+       * @returns 
        */
       addLabel(options:{owner:yfiles.graph.IStripe,text:string,layoutParameter?:yfiles.graph.ILabelModelParameter,style?:yfiles.styles.ILabelStyle,preferredSize?:yfiles.geometry.Size,tag?:Object}):yfiles.graph.ILabel;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -61007,7 +61015,7 @@ declare namespace yfiles{
        */
       copyRow(row:yfiles.graph.IRow):yfiles.graph.IRow;
       /**
-       *
+       * 
        * @param owner
        * @param [width=null]
        * @param [minWidth=null]
@@ -61015,11 +61023,11 @@ declare namespace yfiles{
        * @param [style=null]
        * @param [tag=null]
        * @param [index=null]
-       * @returns
+       * @returns 
        */
       createChildColumn(owner:yfiles.graph.IColumn,width?:number,minWidth?:number,insets?:yfiles.geometry.Insets,style?:yfiles.styles.IStripeStyle,tag?:any,index?:number):yfiles.graph.IColumn;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.owner
        * @param [options.width=null]
@@ -61028,11 +61036,11 @@ declare namespace yfiles{
        * @param [options.style=null]
        * @param [options.tag=null]
        * @param [options.index=null]
-       * @returns
+       * @returns 
        */
       createChildColumn(options:{owner:yfiles.graph.IColumn,width?:number,minWidth?:number,insets?:yfiles.geometry.Insets,style?:yfiles.styles.IStripeStyle,tag?:Object,index?:number}):yfiles.graph.IColumn;
       /**
-       *
+       * 
        * @param owner
        * @param [height=null]
        * @param [minHeight=null]
@@ -61040,11 +61048,11 @@ declare namespace yfiles{
        * @param [style=null]
        * @param [tag=null]
        * @param [index=null]
-       * @returns
+       * @returns 
        */
       createChildRow(owner:yfiles.graph.IRow,height?:number,minHeight?:number,insets?:yfiles.geometry.Insets,style?:yfiles.styles.IStripeStyle,tag?:any,index?:number):yfiles.graph.IRow;
       /**
-       *
+       * 
        * @param {Object} options The parameters to pass.
        * @param options.owner
        * @param [options.height=null]
@@ -61053,7 +61061,7 @@ declare namespace yfiles{
        * @param [options.style=null]
        * @param [options.tag=null]
        * @param [options.index=null]
-       * @returns
+       * @returns 
        */
       createChildRow(options:{owner:yfiles.graph.IRow,height?:number,minHeight?:number,insets?:yfiles.geometry.Insets,style?:yfiles.styles.IStripeStyle,tag?:Object,index?:number}):yfiles.graph.IRow;
       /**
@@ -61097,9 +61105,9 @@ declare namespace yfiles{
        */
       static installStaticUndoSupport(graph:yfiles.graph.IGraph):void;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -61170,7 +61178,7 @@ declare namespace yfiles{
        */
       remove(label:yfiles.graph.ILabel):void;
       /**
-       *
+       * 
        * @param stripe
        */
       remove(stripe:yfiles.graph.IStripe):void;
@@ -61198,33 +61206,33 @@ declare namespace yfiles{
        */
       setLabelText(label:yfiles.graph.ILabel,text:string):void;
       /**
-       *
+       * 
        * @param stripe
        * @param minimumSize
        */
       setMinimumSize(stripe:yfiles.graph.IStripe,minimumSize:number):void;
       /**
-       *
+       * 
        * @param owner
        * @param column
        * @param [index=null]
        */
       setParent(owner:yfiles.graph.IColumn,column:yfiles.graph.IColumn,index?:number):void;
       /**
-       *
+       * 
        * @param owner
        * @param row
        * @param [index=null]
        */
       setParent(owner:yfiles.graph.IRow,row:yfiles.graph.IRow,index?:number):void;
       /**
-       *
+       * 
        * @param stripe
        * @param size
        */
       setSize(stripe:yfiles.graph.IStripe,size:number):void;
       /**
-       *
+       * 
        * @param stripe
        * @param insets
        */
@@ -61240,7 +61248,7 @@ declare namespace yfiles{
        */
       setStyle(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):void;
       /**
-       *
+       * 
        * @param stripe
        * @param style
        */
@@ -61298,13 +61306,13 @@ declare namespace yfiles{
        */
       columns:yfiles.collections.IEnumerable<yfiles.graph.IColumn>;
       /**
-       *
+       * 
        * @default '0'
        * @type {yfiles.geometry.Insets}
        */
       insets:yfiles.geometry.Insets;
       /**
-       *
+       * 
        * @default '0,0'
        * @type {yfiles.geometry.Point}
        */
@@ -61319,62 +61327,62 @@ declare namespace yfiles{
        */
       layout:yfiles.geometry.IRectangle;
       /**
-       *
+       * 
        * @param listener
        */
       addStripeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IStripe>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeStripeCreatedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.IStripe>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addStripeRemovedListener(listener:(sender:any,evt:yfiles.graph.StripeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeStripeRemovedListener(listener:(sender:any,evt:yfiles.graph.StripeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addStripeChangedListener(listener:(sender:any,evt:yfiles.graph.StripeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeStripeChangedListener(listener:(sender:any,evt:yfiles.graph.StripeEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelAddedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelRemovedListener(listener:(sender:any,evt:yfiles.graph.LabelEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelRemovedListener(listener:(sender:any,evt:yfiles.graph.LabelEventArgs)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       addLabelChangedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
       /**
-       *
+       * 
        * @param listener
        */
       removeLabelChangedListener(listener:(sender:any,evt:yfiles.collections.ItemEventArgs<yfiles.graph.ILabel>)=>void):void;
@@ -61405,12 +61413,12 @@ declare namespace yfiles{
        */
       columnDefaults:yfiles.graph.IStripeDefaults;
       /**
-       *
+       * 
        * @type {yfiles.graph.IRow}
        */
       rootRow:yfiles.graph.IRow;
       /**
-       *
+       * 
        * @type {yfiles.graph.IColumn}
        */
       rootColumn:yfiles.graph.IColumn;
@@ -61512,8 +61520,8 @@ declare namespace yfiles{
        */
       constructor(options?:{size?:number,minimumSize?:number,labels?:yfiles.graph.ILabelDefaults,style?:yfiles.styles.IStripeStyle,shareStyleInstance?:boolean});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getStyleInstance():yfiles.styles.IStripeStyle;
       /**
@@ -61537,17 +61545,17 @@ declare namespace yfiles{
        */
       minimumSize:number;
       /**
-       *
+       * 
        * @type {yfiles.graph.ILabelDefaults}
        */
       labels:yfiles.graph.ILabelDefaults;
       /**
-       *
+       * 
        * @type {yfiles.styles.IStripeStyle}
        */
       style:yfiles.styles.IStripeStyle;
       /**
-       *
+       * 
        * @default true
        * @type {boolean}
        */
@@ -62082,8 +62090,8 @@ declare namespace yfiles{
        */
       constructor(width:number,height:number);
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():yfiles.geometry.Size;
       /**
@@ -62221,8 +62229,8 @@ declare namespace yfiles{
        */
       add(otherPoint:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():yfiles.geometry.Point;
       /**
@@ -62235,7 +62243,7 @@ declare namespace yfiles{
       /**
        * Performs an implicit conversion from {@link yfiles.geometry.Point} to {@link yfiles.geometry.MutablePoint}.
        * @param point The point to convert.
-       * @returns
+       * @returns 
        * @static
        */
       static convertToMutablePoint(point:yfiles.geometry.Point):yfiles.geometry.MutablePoint;
@@ -62437,21 +62445,21 @@ declare namespace yfiles{
        */
       constructor(inset:number);
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():yfiles.geometry.Insets;
       /**
        * Calculates the union of this instance and the given inset which is done by performing {@link Math#max} on all four inset
        * values.
        * @param insets The insets to max with these insets.
-       * @returns
+       * @returns 
        */
       createUnion(insets:yfiles.geometry.Insets):yfiles.geometry.Insets;
       /**
        * Creates an enlarged instance by adding the insets of the specified insets to this instance and returning the result.
        * @param insets The insets to add to this instance.
-       * @returns
+       * @returns 
        */
       getEnlarged(insets:yfiles.geometry.Insets):yfiles.geometry.Insets;
       /**
@@ -62571,8 +62579,8 @@ declare namespace yfiles{
        */
       static add(firstRectangle:yfiles.geometry.Rect,secondRectangle:yfiles.geometry.Rect):yfiles.geometry.Rect;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():yfiles.geometry.Rect;
       /**
@@ -62620,7 +62628,7 @@ declare namespace yfiles{
        * If this instance {@link yfiles.geometry.Rect#isEmpty}, the result will be the same.
        * </p>
        * @param size The inset to add to each of the sides to grow the new instance.
-       * @returns
+       * @returns 
        * @see yfiles.geometry.Rect#getEnlarged
        */
       getEnlarged(size:number):yfiles.geometry.Rect;
@@ -62630,19 +62638,19 @@ declare namespace yfiles{
        * If this instance {@link yfiles.geometry.Rect#isEmpty}, the same will be returned.
        * </p>
        * @param insets The insets to use to add to the instance.
-       * @returns
+       * @returns 
        */
       getEnlarged(insets:yfiles.geometry.Insets):yfiles.geometry.Rect;
       /**
        * Transforms this instance using the specified matrix and returns the result.
        * @param transform The transform matrix to apply to this instance.
-       * @returns
+       * @returns 
        */
       getTransformed(transform:yfiles.geometry.Matrix):yfiles.geometry.Rect;
       /**
        * Returns a translated instance of this which has modified {@link yfiles.geometry.Rect#x} and {@link yfiles.geometry.Rect#y} by the given amount.
        * @param delta The delta to add to {@link #x} and {@link #y}.
-       * @returns
+       * @returns 
        */
       getTranslated(delta:yfiles.geometry.Point):yfiles.geometry.Rect;
       /**
@@ -63978,7 +63986,7 @@ declare namespace yfiles{
        * @param height
        * @param upX
        * @param upY
-       * @returns
+       * @returns 
        * @static
        */
       static createImmutable(anchorX:number,anchorY:number,width:number,height:number,upX:number,upY:number):yfiles.geometry.IOrientedRectangle;
@@ -64295,7 +64303,7 @@ declare namespace yfiles{
        * @param edge
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        * @protected
        */
       getIntersection(node:yfiles.graph.INode,nodeShapeGeometry:yfiles.styles.IShapeGeometry,edge:yfiles.graph.IEdge,inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
@@ -64344,7 +64352,7 @@ declare namespace yfiles{
        * @param node
        * @param nodeShapeGeometry
        * @param edge
-       * @returns
+       * @returns 
        * @protected
        */
       isInside(location:yfiles.geometry.Point,node:yfiles.graph.INode,nodeShapeGeometry:yfiles.styles.IShapeGeometry,edge:yfiles.graph.IEdge):boolean;
@@ -64546,28 +64554,28 @@ declare namespace yfiles{
        * Yields the {@link yfiles.view.IBoundsProvider#EMPTY} that will return empty bounds.
        * @param edge
        * @param style
-       * @returns
+       * @returns 
        */
       getBoundsProvider(edge:yfiles.graph.IEdge,style:yfiles.styles.IEdgeStyle):yfiles.view.IBoundsProvider;
       /**
        * Yields the {@link yfiles.graph.ILookup#EMPTY} that will not yield anything.
        * @param edge
        * @param style
-       * @returns
+       * @returns 
        */
       getContext(edge:yfiles.graph.IEdge,style:yfiles.styles.IEdgeStyle):yfiles.graph.ILookup;
       /**
        * Yields the {@link yfiles.input.IHitTestable#NEVER} that will always report misses.
        * @param edge
        * @param style
-       * @returns
+       * @returns 
        */
       getHitTestable(edge:yfiles.graph.IEdge,style:yfiles.styles.IEdgeStyle):yfiles.input.IHitTestable;
       /**
        * Yields the {@link yfiles.input.IMarqueeTestable#NEVER} that will always report misses.
        * @param edge
        * @param style
-       * @returns
+       * @returns 
        */
       getMarqueeTestable(edge:yfiles.graph.IEdge,style:yfiles.styles.IEdgeStyle):yfiles.input.IMarqueeTestable;
       /**
@@ -64582,14 +64590,14 @@ declare namespace yfiles{
        * Yields the {@link yfiles.view.IVisibilityTestable#NEVER} that will always claim invisibility.
        * @param edge
        * @param style
-       * @returns
+       * @returns 
        */
       getVisibilityTestable(edge:yfiles.graph.IEdge,style:yfiles.styles.IEdgeStyle):yfiles.view.IVisibilityTestable;
       /**
        * Yields the {@link yfiles.view.VoidVisualCreator#INSTANCE} that will do nothing.
        * @param edge
        * @param style
-       * @returns
+       * @returns 
        */
       getVisualCreator(edge:yfiles.graph.IEdge,style:yfiles.styles.IEdgeStyle):yfiles.view.IVisualCreator;
       /**
@@ -64893,49 +64901,49 @@ declare namespace yfiles{
        * Yields the {@link yfiles.view.IBoundsProvider#EMPTY} that will return empty bounds.
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getBoundsProvider(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.view.IBoundsProvider;
       /**
        * Yields the {@link yfiles.graph.ILookup#EMPTY} that will not yield anything.
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getContext(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.graph.ILookup;
       /**
        * Yields the {@link yfiles.input.IHitTestable#NEVER} that will always report misses.
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getHitTestable(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.input.IHitTestable;
       /**
        * Yields the {@link yfiles.input.IMarqueeTestable#NEVER} that will always report misses.
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getMarqueeTestable(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.input.IMarqueeTestable;
       /**
        * Yields {@link yfiles.geometry.Size#EMPTY}.
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getPreferredSize(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.geometry.Size;
       /**
        * Yields the {@link yfiles.view.IVisibilityTestable#NEVER} that will always claim invisibility.
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getVisibilityTestable(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.view.IVisibilityTestable;
       /**
        * Yields the {@link yfiles.view.VoidVisualCreator#INSTANCE} that will do nothing.
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getVisualCreator(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.view.IVisualCreator;
       /**
@@ -65196,28 +65204,28 @@ declare namespace yfiles{
        * Yields the {@link yfiles.view.IBoundsProvider#EMPTY} that will return empty bounds.
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getBoundsProvider(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IBoundsProvider;
       /**
        * Yields the {@link yfiles.graph.ILookup#EMPTY} that will not yield anything.
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getContext(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.graph.ILookup;
       /**
        * Yields the {@link yfiles.input.IHitTestable#NEVER} that will always report misses.
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getHitTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IHitTestable;
       /**
        * Yields the {@link yfiles.input.IMarqueeTestable#NEVER} that will always report misses.
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
@@ -65232,14 +65240,14 @@ declare namespace yfiles{
        * Yields the {@link yfiles.view.IVisibilityTestable#NEVER} that will always claim invisibility.
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getVisibilityTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisibilityTestable;
       /**
        * Yields the {@link yfiles.view.VoidVisualCreator#INSTANCE} that will do nothing.
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getVisualCreator(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisualCreator;
       /**
@@ -65465,42 +65473,42 @@ declare namespace yfiles{
        * Yields the {@link yfiles.view.IBoundsProvider#EMPTY} that will return empty bounds.
        * @param port
        * @param style
-       * @returns
+       * @returns 
        */
       getBoundsProvider(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):yfiles.view.IBoundsProvider;
       /**
        * Yields the {@link yfiles.graph.ILookup#EMPTY} that will not yield anything.
        * @param port
        * @param style
-       * @returns
+       * @returns 
        */
       getContext(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):yfiles.graph.ILookup;
       /**
        * Yields the {@link yfiles.input.IHitTestable#NEVER} that will always report misses.
        * @param port
        * @param style
-       * @returns
+       * @returns 
        */
       getHitTestable(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):yfiles.input.IHitTestable;
       /**
        * Yields the {@link yfiles.input.IMarqueeTestable#NEVER} that will always report misses.
        * @param port
        * @param style
-       * @returns
+       * @returns 
        */
       getMarqueeTestable(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):yfiles.input.IMarqueeTestable;
       /**
        * Yields the {@link yfiles.view.IVisibilityTestable#NEVER} that will always claim invisibility.
        * @param port
        * @param style
-       * @returns
+       * @returns 
        */
       getVisibilityTestable(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):yfiles.view.IVisibilityTestable;
       /**
        * Yields the {@link yfiles.view.VoidVisualCreator#INSTANCE} that will do nothing.
        * @param port
        * @param style
-       * @returns
+       * @returns 
        */
       getVisualCreator(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):yfiles.view.IVisualCreator;
       /**
@@ -65864,8 +65872,8 @@ declare namespace yfiles{
        */
       constructor(options?:{buttonPlacement?:yfiles.graph.ILabelModelParameter,insets?:yfiles.geometry.Insets});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -65891,7 +65899,7 @@ declare namespace yfiles{
        */
       insets:yfiles.geometry.Insets;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -65963,7 +65971,7 @@ declare namespace yfiles{
        * @param context The context.
        * @param expanded Specifies whether the button visual is created for the expanded or the collapsed state.
        * @param size The button size.
-       * @returns
+       * @returns 
        * @protected
        */
       createButton(context:yfiles.view.IRenderContext,expanded:boolean,size:yfiles.geometry.Size):yfiles.view.SvgVisual;
@@ -65982,13 +65990,13 @@ declare namespace yfiles{
        * placement of the button and use the {@link yfiles.styles.CollapsibleNodeStyleDecorator#wrapped wrapped style} to create the visual for the actual node.
        * </p>
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
        * Delegates to the {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#getWrappedStyle} and takes the button into account.
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -66002,7 +66010,7 @@ declare namespace yfiles{
       getBoundsProvider(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IBoundsProvider;
       /**
        * Yields the {@link yfiles.styles.CollapsibleNodeStyleDecorator#buttonPlacement} for the current {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#style}
-       * @returns
+       * @returns 
        * @protected
        */
       getButtonLocationParameter():yfiles.graph.ILabelModelParameter;
@@ -66040,7 +66048,7 @@ declare namespace yfiles{
        * Delegates to the {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#getWrappedStyle}.
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
@@ -66054,7 +66062,7 @@ declare namespace yfiles{
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
        * Delegates to the {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#getWrappedStyle}.
-       * @returns
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
@@ -66092,7 +66100,7 @@ declare namespace yfiles{
       getVisualCreator(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisualCreator;
       /**
        * Yields the {@link yfiles.styles.CollapsibleNodeStyleDecorator#wrapped} property for the current {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#style}
-       * @returns
+       * @returns 
        * @protected
        */
       getWrappedStyle():yfiles.styles.INodeStyle;
@@ -66100,33 +66108,33 @@ declare namespace yfiles{
        * Delegates to the {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#getWrappedStyle} and checks the button.
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
        * Delegates to the {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#getWrappedStyle}.
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
        * Delegates to the {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#getWrappedStyle}.
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
        * Delegates to the {@link yfiles.styles.CollapsibleNodeStyleDecoratorRenderer#getWrappedStyle}.
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
@@ -66139,15 +66147,15 @@ declare namespace yfiles{
        * @param expanded Specifies whether the button visual is updated for the expanded or the collapsed state.
        * @param size The button size.
        * @param oldButton The old button visual.
-       * @returns
+       * @returns 
        * @protected
        */
       updateButton(context:yfiles.view.IRenderContext,expanded:boolean,size:yfiles.geometry.Size,oldButton:yfiles.view.Visual):yfiles.view.SvgVisual;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -66801,6 +66809,9 @@ declare namespace yfiles{
     /**
      * A label style decorator that uses a node style instance to render the background and a label style instance to render
      * the foreground of a label.
+     * <p>
+     * The renderer of the {@link yfiles.styles.NodeStyleLabelStyleAdapter#nodeStyle} used by this class must create {@link yfiles.view.SvgVisual}s.
+     * </p>
      * @class
      * @implements {yfiles.styles.ILabelStyle}
      */
@@ -66862,12 +66873,12 @@ declare namespace yfiles{
        */
       constructor(options?:{autoFlip?:boolean,labelStyle?:yfiles.styles.ILabelStyle,labelStyleInsets?:yfiles.geometry.Insets,nodeStyle?:yfiles.styles.INodeStyle});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
-       *
+       * 
        * @type {yfiles.styles.ILabelStyleRenderer}
        */
       renderer:yfiles.styles.ILabelStyleRenderer;
@@ -66899,6 +66910,9 @@ declare namespace yfiles{
     }
     /**
      * A port style decorator that uses a node style instance to render the port.
+     * <p>
+     * The renderer of the {@link yfiles.styles.NodeStylePortStyleAdapter#nodeStyle} used by this class must create {@link yfiles.view.SvgVisual}s.
+     * </p>
      * @class
      * @implements {yfiles.styles.IPortStyle}
      */
@@ -66944,12 +66958,12 @@ declare namespace yfiles{
        */
       constructor(options?:{nodeStyle?:yfiles.styles.INodeStyle,renderSize?:yfiles.geometry.Size});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
-       *
+       * 
        * @type {yfiles.styles.IPortStyleRenderer}
        */
       renderer:yfiles.styles.IPortStyleRenderer;
@@ -67290,8 +67304,8 @@ declare namespace yfiles{
        */
       constructor(options?:{autoFlip?:boolean,backgroundFill?:yfiles.view.Fill,backgroundStroke?:yfiles.view.Stroke,clipText?:boolean,horizontalTextAlignment?:yfiles.view.HorizontalTextAlignment,textFill?:yfiles.view.Fill,textSize?:number,wrapping?:yfiles.view.TextWrapping,font?:yfiles.view.Font,verticalTextAlignment?:yfiles.view.VerticalTextAlignment});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -67349,7 +67363,7 @@ declare namespace yfiles{
        */
       backgroundStroke:yfiles.view.Stroke;
       /**
-       *
+       * 
        * @type {yfiles.styles.ILabelStyleRenderer}
        */
       renderer:yfiles.styles.ILabelStyleRenderer;
@@ -67470,8 +67484,8 @@ declare namespace yfiles{
        */
       constructor(options?:{autoFlip?:boolean,icon?:string,iconPlacement?:yfiles.graph.ILabelModelParameter,iconSize?:yfiles.geometry.Size,wrapped?:yfiles.styles.ILabelStyle,wrappedInsets?:yfiles.geometry.Insets});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -67532,7 +67546,7 @@ declare namespace yfiles{
        */
       wrappedInsets:yfiles.geometry.Insets;
       /**
-       *
+       * 
        * @type {yfiles.styles.ILabelStyleRenderer}
        */
       renderer:yfiles.styles.ILabelStyleRenderer;
@@ -67576,7 +67590,7 @@ declare namespace yfiles{
        * @param text The text content to add to the provided text element (may contain newline characters).
        * @param maxSize The bounds that shouldn't be exceeded when placing the text; <code>null</code> or not provided means unbound.
        * @param wrapping The {@link } policy to apply when the text exceeds the provided <code>maxSize</code>.
-       * @returns
+       * @returns 
        * @protected
        */
       addTextElements(textElement:SVGTextElement,font:yfiles.view.Font,text:string,maxSize:yfiles.geometry.Size,wrapping:yfiles.view.TextWrapping):string;
@@ -67595,15 +67609,15 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -67652,10 +67666,10 @@ declare namespace yfiles{
        */
       getMarqueeTestable(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.input.IMarqueeTestable;
       /**
-       *
+       * 
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getPreferredSize(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.geometry.Size;
       /**
@@ -67712,24 +67726,24 @@ declare namespace yfiles{
        */
       isClippingText():boolean;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
        * Uses the {@link yfiles.graph.ILabel#layout} to determine whether the clip intersects.
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
@@ -67755,10 +67769,10 @@ declare namespace yfiles{
        */
       measureText(text:string,font:yfiles.view.Font):yfiles.geometry.Size;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -67803,20 +67817,20 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @protected
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -67875,10 +67889,10 @@ declare namespace yfiles{
        */
       getMarqueeTestable(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.input.IMarqueeTestable;
       /**
-       *
+       * 
        * @param label
        * @param style
-       * @returns
+       * @returns 
        */
       getPreferredSize(label:yfiles.graph.ILabel,style:yfiles.styles.ILabelStyle):yfiles.geometry.Size;
       /**
@@ -67928,24 +67942,24 @@ declare namespace yfiles{
        */
       isAutoFlip():boolean;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
@@ -67969,10 +67983,10 @@ declare namespace yfiles{
        */
       shouldHitTestIcon():boolean;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -68036,8 +68050,8 @@ declare namespace yfiles{
        */
       constructor(options?:{fill?:yfiles.view.Fill,path?:yfiles.geometry.GeneralPath,stroke?:yfiles.view.Stroke});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -68053,7 +68067,7 @@ declare namespace yfiles{
        */
       path:yfiles.geometry.GeneralPath;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -68111,15 +68125,15 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -68154,10 +68168,10 @@ declare namespace yfiles{
        */
       getHitTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IHitTestable;
       /**
-       *
+       * 
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
@@ -68169,8 +68183,8 @@ declare namespace yfiles{
        */
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
@@ -68206,23 +68220,23 @@ declare namespace yfiles{
        */
       getVisualCreator(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisualCreator;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
@@ -68247,10 +68261,10 @@ declare namespace yfiles{
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -68295,7 +68309,7 @@ declare namespace yfiles{
     export interface PathBasedEdgeStyleRenderer<TStyle extends yfiles.styles.IEdgeStyle> extends yfiles.lang.Object,yfiles.styles.IEdgeStyleRenderer,yfiles.styles.IPathGeometry,yfiles.view.IBoundsProvider,yfiles.view.IVisibilityTestable,yfiles.input.IMarqueeTestable,yfiles.input.IHitTestable,yfiles.graph.ILookup,yfiles.view.IVisualCreator,yfiles.view.IObstacleProvider{}
     export class PathBasedEdgeStyleRenderer<TStyle extends yfiles.styles.IEdgeStyle> {
       /**
-       *
+       * 
        * @param edgeStyleType The exact type of style to use for this instance.
        */
       constructor(edgeStyleType:yfiles.lang.Class);
@@ -68349,14 +68363,14 @@ declare namespace yfiles{
       /**
        * Special implementation that will create a self loop path.
        * @param roundSelfLoop
-       * @returns
+       * @returns 
        * @protected
        */
       createSelfLoopPath(roundSelfLoop:boolean):yfiles.geometry.GeneralPath;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
@@ -68371,9 +68385,9 @@ declare namespace yfiles{
        */
       cropPath(path:yfiles.geometry.GeneralPath):yfiles.geometry.GeneralPath;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -68415,7 +68429,7 @@ declare namespace yfiles{
        * </p>
        * @param edge
        * @param style
-       * @returns
+       * @returns 
        * @see yfiles.styles.PathBasedEdgeStyleRenderer.<TStyle>#isHit
        * @see yfiles.styles.PathBasedEdgeStyleRenderer.<TStyle>#configure
        * @see yfiles.styles.IEdgeStyleRenderer#getHitTestable
@@ -68437,8 +68451,8 @@ declare namespace yfiles{
        */
       getObstacles(context:yfiles.view.IRenderContext):yfiles.geometry.GeneralPath;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getPath():yfiles.geometry.GeneralPath;
       /**
@@ -68569,16 +68583,16 @@ declare namespace yfiles{
        * </p>
        * @param context
        * @param location
-       * @returns
+       * @returns 
        * @see yfiles.styles.PathBasedEdgeStyleRenderer.<TStyle>#getHitTestable
        * @see yfiles.styles.PathBasedEdgeStyleRenderer.<TStyle>#configure
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
@@ -68594,16 +68608,16 @@ declare namespace yfiles{
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -68707,7 +68721,7 @@ declare namespace yfiles{
       constructor(options?:{stroke?:yfiles.view.Stroke,smoothingLength?:number,sourceArrow?:yfiles.styles.IArrow,targetArrow?:yfiles.styles.IArrow});
       /**
        * Performs a {@link any#memberwiseClone}
-       * @returns
+       * @returns 
        */
       clone():any;
       /**
@@ -68868,9 +68882,9 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
@@ -68921,10 +68935,10 @@ declare namespace yfiles{
        */
       getHitTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IHitTestable;
       /**
-       *
+       * 
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
@@ -68936,8 +68950,8 @@ declare namespace yfiles{
        */
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
@@ -68990,10 +69004,10 @@ declare namespace yfiles{
        */
       getVisualCreator(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisualCreator;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
@@ -69007,9 +69021,9 @@ declare namespace yfiles{
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
@@ -69034,10 +69048,10 @@ declare namespace yfiles{
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -69119,8 +69133,8 @@ declare namespace yfiles{
        */
       constructor(options?:{fill?:yfiles.view.Fill,stroke?:yfiles.view.Stroke,shape?:yfiles.styles.ShapeNodeShape});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -69151,7 +69165,7 @@ declare namespace yfiles{
        */
       shape:yfiles.styles.ShapeNodeShape;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -69270,7 +69284,7 @@ declare namespace yfiles{
       constructor(options?:{fixedHeight?:boolean,height?:number,stroke?:yfiles.view.Stroke,provideHeightHandle?:boolean,sourceArrow?:yfiles.styles.IArrow,targetArrow?:yfiles.styles.IArrow});
       /**
        * Performs a {@link any#memberwiseClone}
-       * @returns
+       * @returns 
        */
       clone():any;
       /**
@@ -69378,9 +69392,9 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
@@ -69422,10 +69436,10 @@ declare namespace yfiles{
        */
       getHitTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IHitTestable;
       /**
-       *
+       * 
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
@@ -69437,8 +69451,8 @@ declare namespace yfiles{
        */
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
@@ -69473,10 +69487,10 @@ declare namespace yfiles{
        */
       getVisualCreator(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisualCreator;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
@@ -69490,9 +69504,9 @@ declare namespace yfiles{
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
@@ -69503,16 +69517,16 @@ declare namespace yfiles{
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -69631,8 +69645,8 @@ declare namespace yfiles{
        */
       constructor(options?:{color?:yfiles.view.Color,drawShadow?:boolean,inset?:number,radius?:number});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -69661,7 +69675,7 @@ declare namespace yfiles{
        */
       color:yfiles.view.Color;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -69706,9 +69720,9 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
@@ -69743,7 +69757,7 @@ declare namespace yfiles{
       getContext(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.graph.ILookup;
       /**
        * Get the style's fallback image.
-       * @returns
+       * @returns 
        * @protected
        */
       getFallbackImage():string;
@@ -69757,7 +69771,7 @@ declare namespace yfiles{
       getHitTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IHitTestable;
       /**
        * Get the image that is currently used to render the style.
-       * @returns
+       * @returns 
        * @protected
        */
       getImage():string;
@@ -69765,7 +69779,7 @@ declare namespace yfiles{
        * Tries to use the {@link yfiles.styles.ImageNodeStyle#normalizedOutline} to perform the intersection calculation, otherwise reverts to default (rectangular) behavior.
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
@@ -69778,7 +69792,7 @@ declare namespace yfiles{
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
        * Tries to use the {@link yfiles.styles.ImageNodeStyle#normalizedOutline} to create the outline shape path, otherwise reverts to default (rectangular) behavior.
-       * @returns
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
@@ -69829,13 +69843,13 @@ declare namespace yfiles{
        * Tries to use the {@link yfiles.styles.ImageNodeStyle#normalizedOutline} to perform the marquee intersection analysis, otherwise reverts to default (rectangular) behavior.
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
        * Tries to use the {@link yfiles.styles.ImageNodeStyle#normalizedOutline} to perform the contains test, otherwise reverts to default (rectangular) behavior.
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
@@ -69860,10 +69874,10 @@ declare namespace yfiles{
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -69949,7 +69963,7 @@ declare namespace yfiles{
        */
       clone():any;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -69962,7 +69976,7 @@ declare namespace yfiles{
        */
       image:string;
       /**
-       *
+       * 
        * @default null
        * @type {string}
        */
@@ -70040,8 +70054,8 @@ declare namespace yfiles{
        */
       constructor(options?:{color?:yfiles.view.Color,insets?:yfiles.geometry.Insets,labelInsetsColor?:yfiles.view.Color});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -70080,7 +70094,7 @@ declare namespace yfiles{
        */
       insets:yfiles.geometry.Insets;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -70121,9 +70135,9 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
@@ -70133,9 +70147,9 @@ declare namespace yfiles{
        */
       drawShadow():boolean;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -70252,23 +70266,23 @@ declare namespace yfiles{
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -70336,8 +70350,8 @@ declare namespace yfiles{
        */
       constructor(options?:{wrapped?:yfiles.styles.INodeStyle});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -70346,7 +70360,7 @@ declare namespace yfiles{
        */
       wrapped:yfiles.styles.INodeStyle;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -70425,8 +70439,8 @@ declare namespace yfiles{
        */
       constructor(options?:{fill?:yfiles.view.Fill,drawShadow?:boolean,insets?:yfiles.geometry.Insets,stroke?:yfiles.view.Stroke,radius?:number});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -70479,7 +70493,7 @@ declare namespace yfiles{
        */
       insets:yfiles.geometry.Insets;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -70517,9 +70531,9 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
@@ -70529,9 +70543,9 @@ declare namespace yfiles{
        */
       drawShadow():boolean;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -70566,10 +70580,10 @@ declare namespace yfiles{
        */
       getHitTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IHitTestable;
       /**
-       *
+       * 
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
@@ -70581,8 +70595,8 @@ declare namespace yfiles{
        */
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
@@ -70618,10 +70632,10 @@ declare namespace yfiles{
        */
       getVisualCreator(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisualCreator;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
@@ -70635,29 +70649,29 @@ declare namespace yfiles{
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -70945,7 +70959,7 @@ declare namespace yfiles{
       /**
        * Gets the context by delegating to {@link yfiles.styles.TemplateStripeStyleBase#contextLookup}.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       getContextLookup(style:yfiles.styles.TemplateStripeStyleBase):yfiles.graph.IContextLookup;
@@ -71049,8 +71063,8 @@ declare namespace yfiles{
        */
       constructor(options?:{backgroundStyle?:yfiles.styles.INodeStyle,table?:yfiles.graph.ITable,tableRenderingOrder?:yfiles.styles.TableRenderingOrder});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -71107,7 +71121,7 @@ declare namespace yfiles{
        */
       table:yfiles.graph.ITable;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -71142,9 +71156,9 @@ declare namespace yfiles{
        */
       configure():void;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
@@ -71157,56 +71171,56 @@ declare namespace yfiles{
        */
       getBackgroundStyle():yfiles.styles.INodeStyle;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
-       *
+       * 
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getBoundsProvider(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IBoundsProvider;
       /**
-       *
+       * 
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getContext(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.graph.ILookup;
       /**
-       *
+       * 
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getHitTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IHitTestable;
       /**
-       *
+       * 
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
-       *
+       * 
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getMarqueeTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.input.IMarqueeTestable;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
-       *
+       * 
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getShapeGeometry(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.styles.IShapeGeometry;
       /**
@@ -71228,57 +71242,57 @@ declare namespace yfiles{
        */
       getTableRenderingOrder():yfiles.styles.TableRenderingOrder;
       /**
-       *
+       * 
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getVisibilityTestable(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisibilityTestable;
       /**
-       *
+       * 
        * @param node
        * @param style
-       * @returns
+       * @returns 
        */
       getVisualCreator(node:yfiles.graph.INode,style:yfiles.styles.INodeStyle):yfiles.view.IVisualCreator;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
-       *
+       * 
        * @param type
-       * @returns
+       * @returns 
        */
       lookup(type:yfiles.lang.Class):any;
       /**
-       *
+       * 
        * @param context
        * @param oldVisual
-       * @returns
+       * @returns 
        */
       updateVisual(context:yfiles.view.IRenderContext,oldVisual:yfiles.view.Visual):yfiles.view.Visual;
       /**
@@ -71523,7 +71537,7 @@ declare namespace yfiles{
        */
       preferredSize:yfiles.geometry.Size;
       /**
-       *
+       * 
        * @type {yfiles.styles.ILabelStyleRenderer}
        */
       renderer:yfiles.styles.ILabelStyleRenderer;
@@ -71793,9 +71807,9 @@ declare namespace yfiles{
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -71839,7 +71853,7 @@ declare namespace yfiles{
       /**
        * Gets the normalized outline by delegating to {@link yfiles.styles.TemplateLabelStyleBase#normalizedOutline}.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       getNormalizedOutline(style:yfiles.styles.TemplateLabelStyleBase):yfiles.geometry.GeneralPath;
@@ -71854,7 +71868,7 @@ declare namespace yfiles{
       /**
        * Gets the size of the preferred for the current configuration using the provided context.
        * @param context The context.
-       * @returns
+       * @returns 
        * @protected
        */
       getPreferredSizeCore(context:yfiles.view.IRenderContext):yfiles.geometry.Size;
@@ -71892,29 +71906,29 @@ declare namespace yfiles{
       /**
        * Delegates to the {@link yfiles.styles.TemplateLabelStyleBase}'s {@link yfiles.styles.TemplateLabelStyleBase#autoFlip} property.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       isAutoFlip(style:yfiles.styles.TemplateLabelStyleBase):boolean;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
        * Uses the {@link yfiles.graph.ILabel#layout layout} to determine whether the clip intersects.
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isVisible(context:yfiles.view.ICanvasContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
@@ -72103,7 +72117,7 @@ declare namespace yfiles{
        */
       normalizedOutline:yfiles.geometry.GeneralPath;
       /**
-       *
+       * 
        * @type {yfiles.styles.INodeStyleRenderer}
        */
       renderer:yfiles.styles.INodeStyleRenderer;
@@ -72414,7 +72428,7 @@ declare namespace yfiles{
       /**
        * Gets the context by delegating to {@link yfiles.styles.TemplateNodeStyleBase#contextLookup}.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       getContextLookup(style:yfiles.styles.TemplateNodeStyleBase):yfiles.graph.IContextLookup;
@@ -72433,7 +72447,7 @@ declare namespace yfiles{
       /**
        * Gets the insets by delegating to {@link yfiles.styles.TemplateNodeStyleBase#insets}.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       getInsets(style:yfiles.styles.TemplateNodeStyleBase):yfiles.geometry.Insets;
@@ -72442,7 +72456,7 @@ declare namespace yfiles{
        * behavior.
        * @param inner
        * @param outer
-       * @returns
+       * @returns 
        */
       getIntersection(inner:yfiles.geometry.Point,outer:yfiles.geometry.Point):yfiles.geometry.Point;
       /**
@@ -72461,20 +72475,20 @@ declare namespace yfiles{
       /**
        * Gets the minimum size by delegating to {@link yfiles.styles.TemplateNodeStyleBase#minimumSize}.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       getMinimumSize(style:yfiles.styles.TemplateNodeStyleBase):yfiles.geometry.Size;
       /**
        * Gets the normalized outline by delegating to {@link yfiles.styles.TemplateNodeStyleBase#normalizedOutline}.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       getNormalizedOutline(style:yfiles.styles.TemplateNodeStyleBase):yfiles.geometry.GeneralPath;
       /**
        * Tries to use the {@link yfiles.styles.TemplateNodeStyleRenderer#getNormalizedOutline outline shape} to create the outline shape path, otherwise reverts to default (rectangular) behavior.
-       * @returns
+       * @returns 
        */
       getOutline():yfiles.geometry.GeneralPath;
       /**
@@ -72549,13 +72563,13 @@ declare namespace yfiles{
        * behavior.
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
        * Tries to use the {@link yfiles.styles.TemplateNodeStyleRenderer#getNormalizedOutline outline shape} to perform the contains test, otherwise reverts to default (rectangular) behavior.
        * @param location
-       * @returns
+       * @returns 
        */
       isInside(location:yfiles.geometry.Point):boolean;
       /**
@@ -72726,7 +72740,7 @@ declare namespace yfiles{
        */
       normalizedOutline:yfiles.geometry.GeneralPath;
       /**
-       *
+       * 
        * @type {yfiles.styles.IPortStyleRenderer}
        */
       renderer:yfiles.styles.IPortStyleRenderer;
@@ -72872,9 +72886,9 @@ declare namespace yfiles{
        */
       createVisual(context:yfiles.view.IRenderContext):yfiles.view.Visual;
       /**
-       *
+       * 
        * @param context
-       * @returns
+       * @returns 
        */
       getBounds(context:yfiles.view.ICanvasContext):yfiles.geometry.Rect;
       /**
@@ -72919,7 +72933,7 @@ declare namespace yfiles{
       /**
        * Gets the normalized outline by delegating to {@link yfiles.styles.TemplatePortStyleBase#normalizedOutline}.
        * @param style
-       * @returns
+       * @returns 
        * @protected
        */
       getNormalizedOutline(style:yfiles.styles.TemplatePortStyleBase):yfiles.geometry.GeneralPath;
@@ -72969,17 +72983,17 @@ declare namespace yfiles{
        */
       getVisualCreator(port:yfiles.graph.IPort,style:yfiles.styles.IPortStyle):yfiles.view.IVisualCreator;
       /**
-       *
+       * 
        * @param context
        * @param location
-       * @returns
+       * @returns 
        */
       isHit(context:yfiles.input.IInputModeContext,location:yfiles.geometry.Point):boolean;
       /**
-       *
+       * 
        * @param context
        * @param rectangle
-       * @returns
+       * @returns 
        */
       isInBox(context:yfiles.input.IInputModeContext,rectangle:yfiles.geometry.Rect):boolean;
       /**
@@ -73015,7 +73029,7 @@ declare namespace yfiles{
        * @param style
        * @param port
        * @param type
-       * @returns
+       * @returns 
        * @protected
        */
       lookupContext(style:yfiles.styles.TemplatePortStyleBase,port:yfiles.graph.IPort,type:yfiles.lang.Class):any;
@@ -73274,14 +73288,14 @@ declare namespace yfiles{
        * Yields the {@link yfiles.graph.ILookup#EMPTY} that will not yield anything.
        * @param stripe
        * @param style
-       * @returns
+       * @returns 
        */
       getContext(stripe:yfiles.graph.IStripe,style:yfiles.styles.IStripeStyle):yfiles.graph.ILookup;
       /**
        * Yields the {@link yfiles.view.VoidVisualCreator#INSTANCE} that will do nothing.
        * @param stripe
        * @param style
-       * @returns
+       * @returns 
        */
       getVisualCreator(stripe:yfiles.graph.IStripe,style:yfiles.styles.IStripeStyle):yfiles.view.IVisualCreator;
       /**
@@ -73296,6 +73310,9 @@ declare namespace yfiles{
     }
     /**
      * A stripe style decorator that uses a node style instance to render the stripe.
+     * <p>
+     * The renderer of the {@link yfiles.styles.NodeStyleStripeStyleAdapter#nodeStyle} used by this class must create {@link yfiles.view.SvgVisual}s.
+     * </p>
      * @class
      * @implements {yfiles.styles.IStripeStyle}
      */
@@ -73324,12 +73341,12 @@ declare namespace yfiles{
        */
       constructor(options?:{nodeStyle?:yfiles.styles.INodeStyle});
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
-       *
+       * 
        * @type {yfiles.styles.IStripeStyleRenderer}
        */
       renderer:yfiles.styles.IStripeStyleRenderer;
@@ -75364,7 +75381,7 @@ declare namespace yfiles{
        * <p>
        * The new edge <code>e</code> has source node <code>v</code> and target node <code>w</code>.
        * <br />
-       *
+       * 
        * <br />
        * Edge <code>e</code> is inserted in such a way that an iteration over the edges at node <code>v</code> returns <code>e</code>
        * </p>
@@ -75408,7 +75425,7 @@ declare namespace yfiles{
        * Note that self-loops have the same node at both edge ends.
        * </p>
        * @param v
-       * @returns
+       * @returns 
        */
       opposite(v:yfiles.algorithms.Node):yfiles.algorithms.Node;
       /**
@@ -75552,7 +75569,7 @@ declare namespace yfiles{
       firstEdge():yfiles.algorithms.Edge;
       /**
        * Returns an enumerator for this collection.
-       * @returns
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<yfiles.algorithms.Edge>;
       /**
@@ -75567,7 +75584,7 @@ declare namespace yfiles{
       popEdge():yfiles.algorithms.Edge;
       /**
        * Returns an edge array containing all elements of this list in the canonical order.
-       * @returns
+       * @returns 
        */
       toEdgeArray():yfiles.algorithms.Edge[];
       static $class:yfiles.lang.Class;
@@ -75769,20 +75786,20 @@ declare namespace yfiles{
        * </p>
        * @param l1
        * @param l2
-       * @returns
+       * @returns 
        * @static
        */
       static getCrossing(l1:yfiles.algorithms.AffineLine,l2:yfiles.algorithms.AffineLine):yfiles.algorithms.YPoint;
       /**
        * Projects an point on the line in direction of the X-axis.
        * @param p
-       * @returns
+       * @returns 
        */
       getXProjection(p:yfiles.algorithms.YPoint):yfiles.algorithms.YPoint;
       /**
        * Projects an point on the line in direction of the Y-axis.
        * @param p
-       * @returns
+       * @returns 
        */
       getYProjection(p:yfiles.algorithms.YPoint):yfiles.algorithms.YPoint;
       /**
@@ -75821,12 +75838,12 @@ declare namespace yfiles{
       getValueAt(position:number):number;
       /**
        * Returns the next segment or <code>null</code> if there is no such segment.
-       * @returns
+       * @returns 
        */
       next():yfiles.algorithms.BorderLineSegment;
       /**
        * Returns the previous segment or <code>null</code> if there is no such segment.
-       * @returns
+       * @returns 
        */
       prev():yfiles.algorithms.BorderLineSegment;
       /**
@@ -75920,7 +75937,7 @@ declare namespace yfiles{
       createMin(other:yfiles.algorithms.BorderLine):yfiles.algorithms.BorderLine;
       /**
        * Returns the first segment or <code>null</code> if there is no such segment.
-       * @returns
+       * @returns 
        */
       firstSegment():yfiles.algorithms.BorderLineSegment;
       /**
@@ -75929,45 +75946,45 @@ declare namespace yfiles{
        * The other one is treated as if the values were all greater.
        * </p>
        * @param greater
-       * @returns
+       * @returns 
        */
       getDistanceTo(greater:yfiles.algorithms.BorderLine):number;
       /**
        * Returns the maximum position of the given segment.
        * @param s the segment
-       * @returns
+       * @returns 
        */
       getMax(s:yfiles.algorithms.BorderLineSegment):number;
       /**
        * Calculates the maximum value in the interval from->to.
        * @param from
        * @param to
-       * @returns
+       * @returns 
        */
       getMaxValue(from:number,to:number):number;
       /**
        * Returns the minimum position of the given segment.
        * @param s the segment
-       * @returns
+       * @returns 
        */
       getMin(s:yfiles.algorithms.BorderLineSegment):number;
       /**
        * Calculates the minimum value in the interval from->to.
        * @param from
        * @param to
-       * @returns
+       * @returns 
        */
       getMinValue(from:number,to:number):number;
       /**
        * Returns the segment at the given position.
        * @param pos the position
-       * @returns
+       * @returns 
        */
       getSegmentAt(pos:number):yfiles.algorithms.BorderLineSegment;
       /**
        * Returns the slope of the given segment.
        * @param s the segment
-       * @returns
+       * @returns 
        */
       getSlope(s:yfiles.algorithms.BorderLineSegment):number;
       /**
@@ -75977,7 +75994,7 @@ declare namespace yfiles{
        * the start of the slope.
        * </p>
        * @param s the segment
-       * @returns
+       * @returns 
        */
       getValue(s:yfiles.algorithms.BorderLineSegment):number;
       /**
@@ -76027,7 +76044,7 @@ declare namespace yfiles{
       grow(toMin:number,toMax:number,positive:boolean):void;
       /**
        * Returns the last segment or <code>null</code> if there is no such segment.
-       * @returns
+       * @returns 
        */
       lastSegment():yfiles.algorithms.BorderLineSegment;
       /**
@@ -76043,13 +76060,13 @@ declare namespace yfiles{
       /**
        * Returns the next segment or <code>null</code> if there is no such segment.
        * @param s
-       * @returns
+       * @returns 
        */
       next(s:yfiles.algorithms.BorderLineSegment):yfiles.algorithms.BorderLineSegment;
       /**
        * Returns the previous segment or <code>null</code> if there is no such segment.
        * @param s
-       * @returns
+       * @returns 
        */
       prev(s:yfiles.algorithms.BorderLineSegment):yfiles.algorithms.BorderLineSegment;
       /**
@@ -76175,7 +76192,7 @@ declare namespace yfiles{
        * @param r1 the first of a pair of <code>Rectangle2D</code> objects to be intersected with each other
        * @param r2 the second of a pair of <code>Rectangle2D</code> objects to be intersected with each other
        * @param dest the <code>Rectangle2D</code> that holds the results of the intersection of <code>r1</code> and <code>r2</code>
-       * @returns
+       * @returns 
        * @static
        */
       static calcIntersection(r1:yfiles.algorithms.Rectangle2D,r2:yfiles.algorithms.Rectangle2D,dest:yfiles.algorithms.Rectangle2D):yfiles.algorithms.Rectangle2D;
@@ -76190,7 +76207,7 @@ declare namespace yfiles{
        * @param r1 the first of a pair of <code>Rectangle2D</code> objects to be combined with each other
        * @param r2 the second of a pair of <code>Rectangle2D</code> objects to be combined with each other
        * @param dest the <code>Rectangle2D</code> that holds the results of the union of <code>r1</code> and <code>r2</code>
-       * @returns
+       * @returns 
        * @static
        */
       static calcUnion(r1:yfiles.algorithms.Rectangle2D,r2:yfiles.algorithms.Rectangle2D,dest:yfiles.algorithms.Rectangle2D):yfiles.algorithms.Rectangle2D;
@@ -76205,7 +76222,7 @@ declare namespace yfiles{
        * @param p
        * @param q
        * @param r
-       * @returns
+       * @returns 
        * @static
        */
       static collinear(p:yfiles.algorithms.YPoint,q:yfiles.algorithms.YPoint,r:yfiles.algorithms.YPoint):boolean;
@@ -76217,7 +76234,7 @@ declare namespace yfiles{
        * @param lineY1 the y coordinate of l1
        * @param lineX2 the x coordinate of l2
        * @param lineY2 the y coordinate of l2
-       * @returns
+       * @returns 
        * @static
        */
       static distanceToLineSegment(pointX:number,pointY:number,lineX1:number,lineY1:number,lineX2:number,lineY2:number):number;
@@ -76226,7 +76243,7 @@ declare namespace yfiles{
        * @param p
        * @param q
        * @param r
-       * @returns
+       * @returns 
        * @static
        */
       static leftTurn(p:yfiles.algorithms.YPoint,q:yfiles.algorithms.YPoint,r:yfiles.algorithms.YPoint):boolean;
@@ -76240,7 +76257,7 @@ declare namespace yfiles{
        * @param y3
        * @param x4
        * @param y4
-       * @returns
+       * @returns 
        * @static
        */
       static linesIntersect(x1:number,y1:number,x2:number,y2:number,x3:number,y3:number,x4:number,y4:number):boolean;
@@ -76252,7 +76269,7 @@ declare namespace yfiles{
        * @param qy
        * @param rx
        * @param ry
-       * @returns
+       * @returns 
        * @static
        */
       static orientation(px:number,py:number,qx:number,qy:number,rx:number,ry:number):number;
@@ -76288,7 +76305,7 @@ declare namespace yfiles{
        * @param lineY1 the y coordinate of l1
        * @param lineX2 the x coordinate of l2
        * @param lineY2 the y coordinate of l2
-       * @returns
+       * @returns 
        * @static
        */
       static projection(pointX:number,pointY:number,lineX1:number,lineY1:number,lineX2:number,lineY2:number):yfiles.algorithms.YPoint;
@@ -76297,7 +76314,7 @@ declare namespace yfiles{
        * @param p
        * @param q
        * @param r
-       * @returns
+       * @returns 
        * @static
        */
       static rightTurn(p:yfiles.algorithms.YPoint,q:yfiles.algorithms.YPoint,r:yfiles.algorithms.YPoint):boolean;
@@ -76308,21 +76325,21 @@ declare namespace yfiles{
        * @param b
        * @param c
        * @param d
-       * @returns
+       * @returns 
        * @static
        */
       static sideOfCircle(a:yfiles.algorithms.YPoint,b:yfiles.algorithms.YPoint,c:yfiles.algorithms.YPoint,d:yfiles.algorithms.YPoint):number;
       /**
        * Converts the given degree value from radian to angular
        * @param angrad
-       * @returns
+       * @returns 
        * @static
        */
       static toDegrees(angrad:number):number;
       /**
        * Converts the given degree value from angular to radian.
        * @param angdeg
-       * @returns
+       * @returns 
        * @static
        */
       static toRadians(angdeg:number):number;
@@ -76395,8 +76412,8 @@ declare namespace yfiles{
        */
       constructor(top:number,left:number,bottom:number,right:number);
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       clone():any;
       /**
@@ -76540,7 +76557,7 @@ declare namespace yfiles{
        * intersect.
        * @param s1 first line segment
        * @param s2 second line segment
-       * @returns
+       * @returns 
        * @static
        */
       static getIntersection(s1:yfiles.algorithms.LineSegment,s2:yfiles.algorithms.LineSegment):yfiles.algorithms.YPoint;
@@ -76570,13 +76587,13 @@ declare namespace yfiles{
       /**
        * Returns if the projection on the X axis of the line segment covers a certain point on the X Axis.
        * @param x
-       * @returns
+       * @returns 
        */
       isInXIntervall(x:number):boolean;
       /**
        * Returns if the projection on the Y axis of the line segment covers a certain point on the Y Axis.
        * @param y
-       * @returns
+       * @returns 
        */
       isInYIntervall(y:number):boolean;
       /**
@@ -76597,12 +76614,12 @@ declare namespace yfiles{
       length():number;
       /**
        * Returns the affine line defined by the end points of the line segment.
-       * @returns
+       * @returns 
        */
       toAffineLine():yfiles.algorithms.AffineLine;
       /**
        * Returns the vector pointing from the first end point to the second end point of the line segment.
-       * @returns
+       * @returns 
        */
       toYVector():yfiles.algorithms.YVector;
       /**
@@ -77073,9 +77090,9 @@ declare namespace yfiles{
        */
       constructor(width:number,height:number);
       /**
-       *
+       * 
        * @param o
-       * @returns
+       * @returns 
        */
       compareTo(o:any):number;
       /**
@@ -77397,7 +77414,7 @@ declare namespace yfiles{
        * Adds two points and returns the result.
        * @param p1 an arbitrary instance of YPoint.
        * @param p2 an arbitrary instance of YPoint.
-       * @returns
+       * @returns 
        * @static
        */
       static add(p1:yfiles.algorithms.YPoint,p2:yfiles.algorithms.YPoint):yfiles.algorithms.YPoint;
@@ -77408,7 +77425,7 @@ declare namespace yfiles{
        * by ascending y-coordinates.
        * </p>
        * @param o
-       * @returns
+       * @returns 
        */
       compareTo(o:any):number;
       /**
@@ -77446,7 +77463,7 @@ declare namespace yfiles{
        * Returns a point that geometrically lies in in the middle of the line formed by the given points.
        * @param p1 an arbitrary instance of YPoint.
        * @param p2 an arbitrary instance of YPoint.
-       * @returns
+       * @returns 
        * @static
        */
       static midPoint(p1:yfiles.algorithms.YPoint,p2:yfiles.algorithms.YPoint):yfiles.algorithms.YPoint;
@@ -77461,14 +77478,14 @@ declare namespace yfiles{
        * Subtracts two points (p1 - p2) and returns the result.
        * @param p1 an arbitrary instance of YPoint.
        * @param p2 an arbitrary instance of YPoint.
-       * @returns
+       * @returns 
        * @static
        */
       static subtract(p1:yfiles.algorithms.YPoint,p2:yfiles.algorithms.YPoint):yfiles.algorithms.YPoint;
       /**
        * Returns a copy of the given point with exchanged x- and y-coordinates.
        * @param p an arbitrary instance of YPoint.
-       * @returns
+       * @returns 
        * @static
        */
       static swap(p:yfiles.algorithms.YPoint):yfiles.algorithms.YPoint;
@@ -77528,38 +77545,38 @@ declare namespace yfiles{
       calculateLength():number;
       /**
        * Create a point path with reverse ordering of the points.
-       * @returns
+       * @returns 
        */
       createReverse():yfiles.algorithms.YPointPath;
       /**
        * Get the points in the path.
-       * @returns
+       * @returns 
        */
       cursor():yfiles.algorithms.ICursor;
       /**
        * Returns a line segment in the path.
        * @param i
-       * @returns
+       * @returns 
        */
       getLineSegment(i:number):yfiles.algorithms.LineSegment;
       /**
        * Get the number of points in the path.
-       * @returns
+       * @returns 
        */
       length():number;
       /**
        * Get the points in the path.
-       * @returns
+       * @returns 
        */
       lineSegments():yfiles.algorithms.ILineSegmentCursor;
       /**
        * Get the points in the path.
-       * @returns
+       * @returns 
        */
       points():yfiles.algorithms.IPointCursor;
       /**
        * Get the points in the list as array.
-       * @returns
+       * @returns 
        */
       toArray():yfiles.algorithms.YPoint[];
       /**
@@ -77621,13 +77638,13 @@ declare namespace yfiles{
       /**
        * Checks whether or not this <code>YRectangle</code> contains the given rectangle.
        * @param p
-       * @returns
+       * @returns 
        */
       contains(p:yfiles.algorithms.YRectangle):boolean;
       /**
        * Checks whether or not this <code>YRectangle</code> contains the given point.
        * @param p
-       * @returns
+       * @returns 
        */
       contains(p:yfiles.algorithms.YPoint):boolean;
       /**
@@ -77636,7 +77653,7 @@ declare namespace yfiles{
        * @param y
        * @param width
        * @param height
-       * @returns
+       * @returns 
        */
       contains(x:number,y:number,width:number,height:number):boolean;
       /**
@@ -77681,7 +77698,7 @@ declare namespace yfiles{
        * Returns whether or not the given rectangles intersect.
        * @param r1
        * @param r2
-       * @returns
+       * @returns 
        * @static
        */
       static intersects(r1:yfiles.algorithms.YRectangle,r2:yfiles.algorithms.YRectangle):boolean;
@@ -77793,14 +77810,14 @@ declare namespace yfiles{
        * </p>
        * @param v1
        * @param v2
-       * @returns
+       * @returns 
        * @static
        */
       static angle(v1:yfiles.algorithms.YVector,v2:yfiles.algorithms.YVector):number;
       /**
        * Returns this vector with unit length.
        * @param v
-       * @returns
+       * @returns 
        * @static
        */
       static getNormal(v:yfiles.algorithms.YVector):yfiles.algorithms.YVector;
@@ -77825,7 +77842,7 @@ declare namespace yfiles{
        * Returns true if vector v1 is on the right side of v2.
        * @param v1
        * @param v2
-       * @returns
+       * @returns 
        * @static
        */
       static rightOf(v1:yfiles.algorithms.YVector,v2:yfiles.algorithms.YVector):boolean;
@@ -77941,7 +77958,7 @@ declare namespace yfiles{
        * Edge <code>e</code> has source node <code>v := sourceReference.source()</code> or <code>v := newSource</code>, if <code>sourceReference == null</code> and target node <code>w := targetReference.target()</code>
        * or <code>w := newTarget</code>, if <code>targetReference == null</code>.
        * <br />
-       *
+       * 
        * <br />
        * Edge <code>e</code> is inserted in such a way that an iteration over the edges at <code>v</code> returns <code>e</code>
        * </p>
@@ -77972,7 +77989,7 @@ declare namespace yfiles{
        * <p>
        * Edge <code>e</code> has source node <code>v := e1.source()</code> and target node <code>w := e2.target()</code>.
        * <br />
-       *
+       * 
        * <br />
        * Edge <code>e</code> is inserted in such a way that an iteration over the edges at <code>v</code> returns <code>e</code>
        * </p>
@@ -78014,20 +78031,20 @@ declare namespace yfiles{
       /**
        * Whether or not this graph contains the given edge.
        * @param e
-       * @returns
+       * @returns 
        */
       contains(e:yfiles.algorithms.Edge):boolean;
       /**
        * Whether or not this graph contains the given node.
        * @param v
-       * @returns
+       * @returns 
        */
       contains(v:yfiles.algorithms.Node):boolean;
       /**
        * Returns whether or not this graph contains an edge that connects the given nodes.
        * @param source The source node.
        * @param target The target node.
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getEdgeTo
        * @see yfiles.algorithms.Node#getEdgeFrom
        * @see yfiles.algorithms.Node#getEdge
@@ -78047,7 +78064,7 @@ declare namespace yfiles{
        * <p>
        * The new edge <code>e</code> has source node <code>v</code> and target node <code>w</code>, i.e., would be written as edge <code>e = (v, w)</code>.
        * <br />
-       *
+       * 
        * <br />
        * Edge <code>e</code> is inserted in such a way that an iteration over the edges at node <code>v</code> returns <code>e</code>
        * </p>
@@ -78098,7 +78115,7 @@ declare namespace yfiles{
        * <p>
        * In order to release the resources held by this map, {@link yfiles.algorithms.Graph#disposeEdgeMap} has to be called.
        * </p>
-       * @returns
+       * @returns 
        */
       createEdgeMap():yfiles.algorithms.IEdgeMap;
       /**
@@ -78106,7 +78123,7 @@ declare namespace yfiles{
        * <p>
        * Subclasses should override this method.
        * </p>
-       * @returns
+       * @returns 
        */
       createGraph():yfiles.algorithms.Graph;
       /**
@@ -78126,7 +78143,7 @@ declare namespace yfiles{
        * <p>
        * In order to release the resources held by this map, {@link yfiles.algorithms.Graph#disposeNodeMap} has to be called.
        * </p>
-       * @returns
+       * @returns 
        */
       createNodeMap():yfiles.algorithms.INodeMap;
       /**
@@ -78158,7 +78175,7 @@ declare namespace yfiles{
       /**
        * Low-level iteration support for adjacent edges.
        * @param v
-       * @returns
+       * @returns 
        * @protected
        * @static
        */
@@ -78170,12 +78187,12 @@ declare namespace yfiles{
        * both.
        * </p>
        * @param providerKey
-       * @returns
+       * @returns 
        */
       getDataProvider(providerKey:any):yfiles.algorithms.IDataProvider;
       /**
        * Returns an array containing all edges of this graph.
-       * @returns
+       * @returns 
        */
       getEdgeArray():yfiles.algorithms.Edge[];
       /**
@@ -78185,7 +78202,7 @@ declare namespace yfiles{
       getEdgeCursor():yfiles.algorithms.IEdgeCursor;
       /**
        * Returns an array containing all nodes of this graph.
-       * @returns
+       * @returns 
        */
       getNodeArray():yfiles.algorithms.Node[];
       /**
@@ -79423,7 +79440,7 @@ declare namespace yfiles{
        * This method may throw an UnsupportedOperationException.
        * </p>
        * @param dataHolder
-       * @returns
+       * @returns 
        * @abstract
        */
       get(dataHolder:any):any;
@@ -79433,7 +79450,7 @@ declare namespace yfiles{
        * This method may throw an UnsupportedOperationException.
        * </p>
        * @param dataHolder
-       * @returns
+       * @returns 
        * @abstract
        */
       getBoolean(dataHolder:any):boolean;
@@ -79443,7 +79460,7 @@ declare namespace yfiles{
        * This method may throw an UnsupportedOperationException.
        * </p>
        * @param dataHolder
-       * @returns
+       * @returns 
        * @abstract
        */
       getInt(dataHolder:any):number;
@@ -79453,7 +79470,7 @@ declare namespace yfiles{
        * This method may throw an UnsupportedOperationException.
        * </p>
        * @param dataHolder
-       * @returns
+       * @returns 
        * @abstract
        */
       getNumber(dataHolder:any):number;
@@ -79650,7 +79667,7 @@ declare namespace yfiles{
        * <p>
        * If there is no predecessor, then <code>null</code> is returned.
        * </p>
-       * @returns
+       * @returns 
        */
       pred():yfiles.algorithms.ListCell;
       /**
@@ -79658,7 +79675,7 @@ declare namespace yfiles{
        * <p>
        * If there is no successor, then <code>null</code> is returned.
        * </p>
-       * @returns
+       * @returns 
        */
       succ():yfiles.algorithms.ListCell;
       /**
@@ -79846,14 +79863,14 @@ declare namespace yfiles{
        * Note that the first matching edge is returned, and that outgoing edges are tested prior to incoming edges.
        * </p>
        * @param opposite
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getEdgeFrom
        * @see yfiles.algorithms.Node#getEdgeTo
        */
       getEdge(opposite:yfiles.algorithms.Node):yfiles.algorithms.Edge;
       /**
        * Returns an edge cursor for all incoming and outgoing edges at this node.
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getInEdgeCursor
        * @see yfiles.algorithms.Node#getOutEdgeCursor
        */
@@ -79864,7 +79881,7 @@ declare namespace yfiles{
        * Otherwise <code>null</code> is returned.
        * </p>
        * @param source
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getEdge
        * @see yfiles.algorithms.Node#getEdgeTo
        */
@@ -79875,7 +79892,7 @@ declare namespace yfiles{
        * Otherwise <code>null</code> is returned.
        * </p>
        * @param target
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getEdge
        * @see yfiles.algorithms.Node#getEdgeFrom
        */
@@ -79887,7 +79904,7 @@ declare namespace yfiles{
        * {@link yfiles.algorithms.Node#getInEdgeCursor}.
        * </p>
        * @param [startEdge=null] The first edge being accessed by the returned cursor.
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getOutEdgeCursor
        */
       getInEdgeCursor(startEdge?:yfiles.algorithms.Edge):yfiles.algorithms.IEdgeCursor;
@@ -79896,7 +79913,7 @@ declare namespace yfiles{
        * <p>
        * Neighbor nodes are those at the opposite ends of both incoming and outgoing edges.
        * </p>
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getPredecessorCursor
        * @see yfiles.algorithms.Node#getSuccessorCursor
        */
@@ -79908,7 +79925,7 @@ declare namespace yfiles{
        * {@link yfiles.algorithms.Node#getOutEdgeCursor}.
        * </p>
        * @param [startEdge=null] The first edge being accessed by the returned cursor.
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getInEdgeCursor
        */
       getOutEdgeCursor(startEdge?:yfiles.algorithms.Edge):yfiles.algorithms.IEdgeCursor;
@@ -79917,7 +79934,7 @@ declare namespace yfiles{
        * <p>
        * Predecessor nodes are those at the opposite ends of incoming edges.
        * </p>
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getSuccessorCursor
        */
       getPredecessorCursor():yfiles.algorithms.INodeCursor;
@@ -79926,7 +79943,7 @@ declare namespace yfiles{
        * <p>
        * Successor nodes are those at the opposite ends of outgoing edges.
        * </p>
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.Node#getPredecessorCursor
        */
       getSuccessorCursor():yfiles.algorithms.INodeCursor;
@@ -80137,7 +80154,7 @@ declare namespace yfiles{
       firstNode():yfiles.algorithms.Node;
       /**
        * Returns an enumerator for this collection.
-       * @returns
+       * @returns 
        */
       getEnumerator():yfiles.collections.IEnumerator<yfiles.algorithms.Node>;
       /**
@@ -80157,7 +80174,7 @@ declare namespace yfiles{
       popNode():yfiles.algorithms.Node;
       /**
        * Returns a node array containing all elements of this list in the canonical order.
-       * @returns
+       * @returns 
        */
       toNodeArray():yfiles.algorithms.Node[];
       static $class:yfiles.lang.Class;
@@ -80580,7 +80597,7 @@ declare namespace yfiles{
        * @param rank the {@link } that will be filled during the execution and returns the integer ranking of each node
        * @param minLength the {@link } that returns an integer value (minimum/tight length) of each edge
        * @param [maximalDuration=0x7FFFFFFFFFFFFFFF] a preferred time limit for the algorithm (in milliseconds)
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.RankAssignments#simple
        * @static
        */
@@ -80737,7 +80754,7 @@ declare namespace yfiles{
        * from node <code>s</code> to all other nodes or {@link #POSITIVE_INFINITY} if no such paths exist
        * @param pred the {@link } that will be filled during the execution and returns for each node <code>t</code> the last edge on the
        * shortest path from <code>s</code> to <code>t</code> or <code>null</code> if <code>t == s</code> or no shortest path from <code>s</code> to <code>t</code> exists
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.ShortestPaths#bellmanFord
        * @static
        */
@@ -80762,7 +80779,7 @@ declare namespace yfiles{
        * @param [pred=null] an array of {@link }s that will be filled during the execution and returns for each node <code>t</code> the shortest
        * path edge <code>pred[t.index()]</code> which is the last edge on the shortest path from <code>s</code> to <code>t</code>. If <code>t == s</code> or if there is no shortest
        * path from <code>s</code> to <code>t</code>, then <code>pred[t.index()] == null</code>.
-       * @returns
+       * @returns 
        * @see yfiles.algorithms.ShortestPaths#constructNodePath
        * @see yfiles.algorithms.ShortestPaths#constructEdgePath
        * @see yfiles.algorithms.ShortestPaths#bellmanFord
@@ -81530,7 +81547,7 @@ declare namespace yfiles{
       static compare(d1:number,d2:number):number;
       /**
        * Returns a {@link yfiles.collections.IComparer.<T>} that compares to Objects of type Comparable.
-       * @returns
+       * @returns 
        * @static
        */
       static createComparableComparer():yfiles.collections.IComparer<any>;
@@ -81623,7 +81640,7 @@ declare namespace yfiles{
        * Creates a new cursor that provides a logical view on the concatenation of the two given cursors.
        * @param c1 - first concatenation argument
        * @param c2 - second concatenation argument
-       * @returns
+       * @returns 
        * @static
        */
       static concatenate(c1:yfiles.algorithms.ICursor,c2:yfiles.algorithms.ICursor):yfiles.algorithms.ICursor;
@@ -81709,28 +81726,28 @@ declare namespace yfiles{
       /**
        * Subclasses may override this method to provide access to object values.
        * @param dataHolder
-       * @returns
+       * @returns 
        * @throws {Stubs.Exceptions.NotSupportedError} unless overwritten.
        */
       get(dataHolder:any):any;
       /**
        * Subclasses may override this method to provide access to boolean values.
        * @param dataHolder
-       * @returns
+       * @returns 
        * @throws {Stubs.Exceptions.NotSupportedError} unless overwritten.
        */
       getBoolean(dataHolder:any):boolean;
       /**
        * Subclasses may override this method to provide access to integer values.
        * @param dataHolder
-       * @returns
+       * @returns 
        * @throws {Stubs.Exceptions.NotSupportedError} unless overwritten.
        */
       getInt(dataHolder:any):number;
       /**
        * Subclasses may override this method to provide access to double values.
        * @param dataHolder
-       * @returns
+       * @returns 
        * @throws {Stubs.Exceptions.NotSupportedError} unless overwritten.
        */
       getNumber(dataHolder:any):number;
@@ -81816,7 +81833,7 @@ declare namespace yfiles{
       /**
        * Returns a DataProvider that returns the negated boolean values provided by another data provider.
        * @param data
-       * @returns
+       * @returns 
        * @static
        */
       static createNegatedDataProvider(data:yfiles.algorithms.IDataProvider):yfiles.algorithms.IDataProvider;
@@ -81885,14 +81902,14 @@ declare namespace yfiles{
       /**
        * Returns a DataProvider for edges that return the data provider values bound to their source nodes.
        * @param nodeData
-       * @returns
+       * @returns 
        * @static
        */
       static createSourceDataProvider(nodeData:yfiles.algorithms.IDataProvider):yfiles.algorithms.IDataProvider;
       /**
        * Returns a DataProvider for edges that return the data provider values bound to their target nodes.
        * @param nodeData
-       * @returns
+       * @returns 
        * @static
        */
       static createTargetDataProvider(nodeData:yfiles.algorithms.IDataProvider):yfiles.algorithms.IDataProvider;
@@ -82353,7 +82370,7 @@ declare namespace yfiles{
        * given Map.
        * </p>
        * @param map
-       * @returns
+       * @returns 
        * @static
        */
       static createDataMap(map:yfiles.collections.IMap<any,any>):yfiles.algorithms.IDataMap;
@@ -82364,7 +82381,7 @@ declare namespace yfiles{
        * given Map.
        * </p>
        * @param map
-       * @returns
+       * @returns 
        * @static
        */
       static createEdgeMap(map:yfiles.collections.IMap<any,any>):yfiles.algorithms.IEdgeMap;
@@ -82373,7 +82390,7 @@ declare namespace yfiles{
        * <p>
        * The preconditions specified in java.util.HashMap apply for the keys and values of this map.
        * </p>
-       * @returns
+       * @returns 
        * @static
        */
       static createHashedDataMap():yfiles.algorithms.IDataMap;
@@ -82382,7 +82399,7 @@ declare namespace yfiles{
        * <p>
        * The preconditions specified in java.util.HashMap apply for the keys and values of this map.
        * </p>
-       * @returns
+       * @returns 
        * @static
        */
       static createHashedEdgeMap():yfiles.algorithms.IEdgeMap;
@@ -82391,7 +82408,7 @@ declare namespace yfiles{
        * <p>
        * The preconditions specified in java.util.HashMap apply for the keys and values of this map.
        * </p>
-       * @returns
+       * @returns 
        * @static
        */
       static createHashedNodeMap():yfiles.algorithms.INodeMap;
@@ -82424,7 +82441,7 @@ declare namespace yfiles{
        * @param backingProvider
        * @param backingAcceptor
        * @param defaultValue
-       * @returns
+       * @returns 
        * @static
        */
       static createHighPerformanceDoubleMap(backingProvider:yfiles.algorithms.IDataProvider,backingAcceptor:yfiles.algorithms.IDataAcceptor,defaultValue:number):yfiles.algorithms.INodeMap;
@@ -82436,7 +82453,7 @@ declare namespace yfiles{
        * </p>
        * @param backingMap
        * @param defaultValue
-       * @returns
+       * @returns 
        * @static
        */
       static createHighPerformanceDoubleMap(backingMap:yfiles.algorithms.IDataMap,defaultValue:number):yfiles.algorithms.INodeMap;
@@ -82449,7 +82466,7 @@ declare namespace yfiles{
        * @param backingProvider
        * @param backingAcceptor
        * @param defaultValue
-       * @returns
+       * @returns 
        * @static
        */
       static createHighPerformanceIntMap(backingProvider:yfiles.algorithms.IDataProvider,backingAcceptor:yfiles.algorithms.IDataAcceptor,defaultValue:number):yfiles.algorithms.INodeMap;
@@ -82461,7 +82478,7 @@ declare namespace yfiles{
        * </p>
        * @param backingMap
        * @param defaultValue
-       * @returns
+       * @returns 
        * @static
        */
       static createHighPerformanceIntMap(backingMap:yfiles.algorithms.IDataMap,defaultValue:number):yfiles.algorithms.INodeMap;
@@ -82474,7 +82491,7 @@ declare namespace yfiles{
        * @param backingProvider
        * @param backingAcceptor
        * @param defaultValue
-       * @returns
+       * @returns 
        * @static
        */
       static createHighPerformanceMap(backingProvider:yfiles.algorithms.IDataProvider,backingAcceptor:yfiles.algorithms.IDataAcceptor,defaultValue:any):yfiles.algorithms.INodeMap;
@@ -82486,7 +82503,7 @@ declare namespace yfiles{
        * </p>
        * @param backingMap
        * @param defaultValue
-       * @returns
+       * @returns 
        * @static
        */
       static createHighPerformanceMap(backingMap:yfiles.algorithms.IDataMap,defaultValue:any):yfiles.algorithms.INodeMap;
@@ -82658,7 +82675,7 @@ declare namespace yfiles{
        * given Map.
        * </p>
        * @param map
-       * @returns
+       * @returns 
        * @static
        */
       static createNodeMap(map:yfiles.collections.IMap<any,any>):yfiles.algorithms.INodeMap;
@@ -82737,10 +82754,10 @@ declare namespace yfiles{
        */
       addAll(collection:yfiles.collections.ICollection<any>):boolean;
       /**
-       *
+       * 
        * @param index
        * @param c
-       * @returns
+       * @returns 
        */
       addAll(index:number,c:yfiles.collections.ICollection<any>):boolean;
       /**
@@ -82781,7 +82798,7 @@ declare namespace yfiles{
        * Equality of elements is defined by the {@link any#equals} method.
        * </p>
        * @param collection
-       * @returns
+       * @returns 
        */
       containsAll(collection:yfiles.collections.ICollection<any>):boolean;
       /**
@@ -82797,7 +82814,7 @@ declare namespace yfiles{
        * modified during the traversal as long as the current ListCell the cursor points at is this in this list or has been
        * removed from this list but has not been added to another instance since then.
        * </p>
-       * @returns
+       * @returns 
        */
       cursor():yfiles.algorithms.ICursor;
       /**
@@ -82806,7 +82823,7 @@ declare namespace yfiles{
        * The last cell is returned as the cyclic predecessor of the first list cell.
        * </p>
        * @param c
-       * @returns
+       * @returns 
        */
       cyclicPred(c:yfiles.algorithms.ListCell):yfiles.algorithms.ListCell;
       /**
@@ -82815,13 +82832,13 @@ declare namespace yfiles{
        * The first cell is returned as the cyclic successor of the last list cell.
        * </p>
        * @param c
-       * @returns
+       * @returns 
        */
       cyclicSucc(c:yfiles.algorithms.ListCell):yfiles.algorithms.ListCell;
       /**
        * Returns the i-th element of this list.
        * @param i
-       * @returns
+       * @returns 
        */
       elementAt(i:number):any;
       /**
@@ -82856,7 +82873,7 @@ declare namespace yfiles{
       /**
        * Returns the element stored in the given list cell.
        * @param c
-       * @returns
+       * @returns 
        */
       getInfo(c:yfiles.algorithms.ListCell):any;
       /**
@@ -82865,7 +82882,7 @@ declare namespace yfiles{
        * Equality of elements is defined by the {@link any#equals} method.
        * </p>
        * @param o
-       * @returns
+       * @returns 
        */
       includes(o:any):boolean;
       /**
@@ -82874,11 +82891,11 @@ declare namespace yfiles{
        * If the given element is not in the list, -1 is returned.
        * </p>
        * @param obj
-       * @returns
+       * @returns 
        */
       indexOf(obj:any):number;
       /**
-       *
+       * 
        * @param index
        * @param element
        */
@@ -82935,40 +82952,40 @@ declare namespace yfiles{
       insertCellBefore(cellToInsert:yfiles.algorithms.ListCell,refCell:yfiles.algorithms.ListCell):void;
       /**
        * Checks whether this list contains elements.
-       * @returns
+       * @returns 
        */
       isEmpty():boolean;
       /**
-       *
+       * 
        * @param o
-       * @returns
+       * @returns 
        */
       lastIndexOf(o:any):number;
       /**
        * Equivalent to {@link yfiles.algorithms.YList#firstObject}.
-       * @returns
+       * @returns 
        */
       peek():any;
       /**
        * Removes the first element from this list and returns it.
-       * @returns
+       * @returns 
        */
       pop():any;
       /**
        * Removes the last element from this list and returns it.
-       * @returns
+       * @returns 
        */
       popLast():any;
       /**
        * Returns the predecessor cell of the given list cell.
        * @param c
-       * @returns
+       * @returns 
        */
       predCell(c:yfiles.algorithms.ListCell):yfiles.algorithms.ListCell;
       /**
        * Equivalent to {@link yfiles.algorithms.YList#addFirst}.
        * @param o
-       * @returns
+       * @returns 
        */
       push(o:any):yfiles.algorithms.ListCell;
       /**
@@ -82977,7 +82994,7 @@ declare namespace yfiles{
        * Only the first element for which equality to <code>o</code> holds gets removed.
        * </p>
        * @param o
-       * @returns
+       * @returns 
        */
       remove(o:any):boolean;
       /**
@@ -82987,7 +83004,7 @@ declare namespace yfiles{
        */
       removeAll(collection:yfiles.collections.ICollection<any>):boolean;
       /**
-       *
+       * 
        * @param index
        */
       removeAt(index:number):void;
@@ -83059,21 +83076,21 @@ declare namespace yfiles{
        */
       splice(list:yfiles.algorithms.YList):void;
       /**
-       *
+       * 
        * @param fromIndex
        * @param toIndex
-       * @returns
+       * @returns 
        */
       subList(fromIndex:number,toIndex:number):yfiles.collections.IList<any>;
       /**
        * Returns the successor cell of the given list cell.
        * @param c
-       * @returns
+       * @returns 
        */
       succCell(c:yfiles.algorithms.ListCell):yfiles.algorithms.ListCell;
       /**
        * Returns an array representation of this list.
-       * @returns
+       * @returns 
        */
       toArray():any[];
       /**
@@ -83997,12 +84014,12 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param labelBounds
        * @param edgeLayout
        * @param sourceNode
        * @param targetNode
-       * @returns
+       * @returns 
        */
       createModelParameter(labelBounds:yfiles.algorithms.YOrientedRectangle,edgeLayout:yfiles.layout.IEdgeLayout,sourceNode:yfiles.layout.INodeLayout,targetNode:yfiles.layout.INodeLayout):any;
       /**
@@ -84018,22 +84035,22 @@ declare namespace yfiles{
        */
       static createPositionParameter(position:number):any;
       /**
-       *
+       * 
        * @param label
        * @param edgeLayout
        * @param sourceNode
        * @param targetNode
-       * @returns
+       * @returns 
        */
       getLabelCandidates(label:yfiles.layout.IEdgeLabelLayout,edgeLayout:yfiles.layout.IEdgeLayout,sourceNode:yfiles.layout.INodeLayout,targetNode:yfiles.layout.INodeLayout):yfiles.algorithms.YList;
       /**
-       *
+       * 
        * @param labelSize
        * @param edgeLayout
        * @param sourceNode
        * @param targetNode
        * @param param
-       * @returns
+       * @returns 
        */
       getLabelPlacement(labelSize:yfiles.algorithms.YDimension,edgeLayout:yfiles.layout.IEdgeLayout,sourceNode:yfiles.layout.INodeLayout,targetNode:yfiles.layout.INodeLayout,param:any):yfiles.algorithms.YOrientedRectangle;
       /**
@@ -84164,25 +84181,25 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param labelBounds
        * @param nodeLayout
-       * @returns
+       * @returns 
        */
       createModelParameter(labelBounds:yfiles.algorithms.YOrientedRectangle,nodeLayout:yfiles.layout.INodeLayout):any;
       /**
-       *
+       * 
        * @param labelLayout
        * @param nodeLayout
-       * @returns
+       * @returns 
        */
       getLabelCandidates(labelLayout:yfiles.layout.INodeLabelLayout,nodeLayout:yfiles.layout.INodeLayout):yfiles.algorithms.YList;
       /**
-       *
+       * 
        * @param labelSize
        * @param nodeLayout
        * @param parameter
-       * @returns
+       * @returns 
        */
       getLabelPlacement(labelSize:yfiles.algorithms.YDimension,nodeLayout:yfiles.layout.INodeLayout,parameter:any):yfiles.algorithms.YOrientedRectangle;
       /**
@@ -84808,13 +84825,13 @@ declare namespace yfiles{
        */
       getLabelCandidates(labelLayout:yfiles.layout.IEdgeLabelLayout,edgeLayout:yfiles.layout.IEdgeLayout,sourceLayout:yfiles.layout.INodeLayout,targetLayout:yfiles.layout.INodeLayout):yfiles.algorithms.YList;
       /**
-       *
+       * 
        * @param labelSize
        * @param edgeLayout
        * @param sourceNode
        * @param targetNode
        * @param param
-       * @returns
+       * @returns 
        */
       getLabelPlacement(labelSize:yfiles.algorithms.YDimension,edgeLayout:yfiles.layout.IEdgeLayout,sourceNode:yfiles.layout.INodeLayout,targetNode:yfiles.layout.INodeLayout,param:any):yfiles.algorithms.YOrientedRectangle;
       /**
@@ -84910,11 +84927,11 @@ declare namespace yfiles{
        */
       getLabelCandidates(labelLayout:yfiles.layout.INodeLabelLayout,nodeLayout:yfiles.layout.INodeLayout):yfiles.algorithms.YList;
       /**
-       *
+       * 
        * @param labelSize
        * @param nodeLayout
        * @param param
-       * @returns
+       * @returns 
        */
       getLabelPlacement(labelSize:yfiles.algorithms.YDimension,nodeLayout:yfiles.layout.INodeLayout,param:any):yfiles.algorithms.YOrientedRectangle;
       /**
@@ -88083,14 +88100,14 @@ declare namespace yfiles{
       /**
        * Routes inter-edges using {@link yfiles.router.ChannelEdgeRouter}.
        * @param [router=null] The router instance to use for the edge routing. If not specified, a internal instance is used.
-       * @returns
+       * @returns 
        * @static
        */
       createChannelInterEdgeRouter?(router?:yfiles.router.ChannelEdgeRouter):yfiles.layout.IPartitionInterEdgeRouter;
       /**
        * Routes inter-edges using {@link yfiles.router.EdgeRouter}.
        * @param [router=null] The router instance to use for the edge routing. If not specified, a internal instance is used.
-       * @returns
+       * @returns 
        * @static
        */
       createPolylineInterEdgeRouter?(router?:yfiles.router.EdgeRouter):yfiles.layout.IPartitionInterEdgeRouter;
@@ -88346,7 +88363,7 @@ declare namespace yfiles{
        */
       boundingBox:yfiles.algorithms.YRectangle;
       /**
-       *
+       * 
        * @type {any}
        */
       modelParameter:any;
@@ -89687,7 +89704,7 @@ declare namespace yfiles{
        */
       constructor(coreLayouter?:yfiles.layout.ILayoutAlgorithm);
       /**
-       *
+       * 
        * @param graph
        * @abstract
        */
@@ -91817,9 +91834,9 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param candidate
-       * @returns
+       * @returns 
        */
       getProfit(candidate:yfiles.layout.LabelCandidate):number;
       static $class:yfiles.lang.Class;
@@ -91850,12 +91867,12 @@ declare namespace yfiles{
        */
       constructor(mode:yfiles.layout.SliderMode);
       /**
-       *
+       * 
        * @param labelBounds
        * @param edgeLayout
        * @param sourceNode
        * @param targetNode
-       * @returns
+       * @returns 
        */
       createModelParameter(labelBounds:yfiles.algorithms.YOrientedRectangle,edgeLayout:yfiles.layout.IEdgeLayout,sourceNode:yfiles.layout.INodeLayout,targetNode:yfiles.layout.INodeLayout):any;
       /**
@@ -91872,13 +91889,13 @@ declare namespace yfiles{
        */
       getLabelCandidates(labelLayout:yfiles.layout.IEdgeLabelLayout,edgeLayout:yfiles.layout.IEdgeLayout,sourceLayout:yfiles.layout.INodeLayout,targetLayout:yfiles.layout.INodeLayout):yfiles.algorithms.YList;
       /**
-       *
+       * 
        * @param labelSize
        * @param edgeLayout
        * @param sourceNode
        * @param targetNode
        * @param para
-       * @returns
+       * @returns 
        */
       getLabelPlacement(labelSize:yfiles.algorithms.YDimension,edgeLayout:yfiles.layout.IEdgeLayout,sourceNode:yfiles.layout.INodeLayout,targetNode:yfiles.layout.INodeLayout,para:any):yfiles.algorithms.YOrientedRectangle;
       /**
@@ -92203,7 +92220,7 @@ declare namespace yfiles{
        */
       static translate(graph:yfiles.layout.LayoutGraph,dx:number,dy:number):void;
       /**
-       *
+       * 
        * @type {yfiles.layout.ILayoutAlgorithm}
        */
       coreLayout:yfiles.layout.ILayoutAlgorithm;
@@ -92477,7 +92494,7 @@ declare namespace yfiles{
       /**
        * Creates a {@link yfiles.layout.IPartitionPlacer} that uses {@link yfiles.layout.ComponentLayout} to place the partitions.
        * @param [componentLayout=null] An optional {@link } to use.
-       * @returns
+       * @returns 
        * @static
        */
       static createComponentPartitionPlacer(componentLayout?:yfiles.layout.ComponentLayout):yfiles.layout.IPartitionPlacer;
@@ -92486,7 +92503,7 @@ declare namespace yfiles{
        * finding graph partitions.
        * @param [minimumPartitionCount=0] The minimum number of partitions the result should have.
        * @param [maximumPartitionCount=0x7FFFFFFF] The maximum number of partitions the result should have.
-       * @returns
+       * @returns 
        * @static
        */
       static createEdgeBetweennessPartitionFinder(minimumPartitionCount?:number,maximumPartitionCount?:number):yfiles.layout.IPartitionFinder;
@@ -92496,7 +92513,7 @@ declare namespace yfiles{
        * @param {Object} options The parameters to pass.
        * @param [options.minimumPartitionCount=0] The minimum number of partitions the result should have.
        * @param [options.maximumPartitionCount=0x7FFFFFFF] The maximum number of partitions the result should have.
-       * @returns
+       * @returns 
        * @static
        */
       static createEdgeBetweennessPartitionFinder(options:{minimumPartitionCount?:number,maximumPartitionCount?:number}):yfiles.layout.IPartitionFinder;
@@ -92684,27 +92701,27 @@ declare namespace yfiles{
        */
       constructor(keyType:yfiles.lang.Class,mapper:yfiles.collections.IMapper<TKey,TValue>);
       /**
-       *
+       * 
        * @param dataHolder
-       * @returns
+       * @returns 
        */
       get(dataHolder:any):any;
       /**
-       *
+       * 
        * @param dataHolder
-       * @returns
+       * @returns 
        */
       getBoolean(dataHolder:any):boolean;
       /**
-       *
+       * 
        * @param dataHolder
-       * @returns
+       * @returns 
        */
       getInt(dataHolder:any):number;
       /**
-       *
+       * 
        * @param dataHolder
-       * @returns
+       * @returns 
        */
       getNumber(dataHolder:any):number;
       static $class:yfiles.lang.Class;
@@ -92730,25 +92747,25 @@ declare namespace yfiles{
        */
       constructor(keyType:yfiles.lang.Class,valueType:yfiles.lang.Class,mapper:yfiles.collections.IMapper<K,V>);
       /**
-       *
+       * 
        * @param dataHolder
        * @param value
        */
       set(dataHolder:any,value:any):void;
       /**
-       *
+       * 
        * @param dataHolder
        * @param value
        */
       setBoolean(dataHolder:any,value:boolean):void;
       /**
-       *
+       * 
        * @param dataHolder
        * @param value
        */
       setInt(dataHolder:any,value:number):void;
       /**
-       *
+       * 
        * @param dataHolder
        * @param value
        */
@@ -92988,7 +93005,7 @@ declare namespace yfiles{
        * Provides a mapper describing which elements are contained in this {@link yfiles.layout.ItemCollection.<T>}.
        * @param adapter The graph adapter the mapper shall be provided for.
        * @param layout The layout using the item collection.
-       * @returns
+       * @returns 
        */
       provideMapper(adapter:yfiles.layout.LayoutGraphAdapter,layout:yfiles.layout.ILayoutAlgorithm):yfiles.collections.IMapper<TItem,boolean>;
       /**
@@ -93173,7 +93190,7 @@ declare namespace yfiles{
       createMorphAnimation():yfiles.view.IAnimation;
       /**
        * Creates an animation that morphs the layout of all {@link yfiles.graph.ITable}s in the graph.
-       * @returns
+       * @returns 
        * @see yfiles.view.TableAnimation
        * @see yfiles.layout.LayoutExecutor#configureTableLayout
        * @protected
@@ -93258,7 +93275,7 @@ declare namespace yfiles{
        * To just skip the animation but let the calculation finish normally, the {@link yfiles.layout.LayoutExecutor#duration} can be set to zero at any time before the
        * animation was started.
        * </p>
-       * @returns
+       * @returns 
        */
       stop():Promise<any>;
       /**
@@ -93486,7 +93503,7 @@ declare namespace yfiles{
        * @param keyType The type of the key to use.
        * @param dataKey The look-up key to register the data provider with.
        * @param mapper The mapper wrapped as data provider.
-       * @returns
+       * @returns 
        * @template K,V
        */
       addDataProvider<K,V>(keyType:yfiles.lang.Class,valueType:yfiles.lang.Class,dataKey:any,mapper:yfiles.collections.IMapper<K,V>):yfiles.algorithms.IDataProvider;
@@ -93553,26 +93570,26 @@ declare namespace yfiles{
        */
       createNodeLayout(node:yfiles.graph.INode):yfiles.layout.INodeLayout;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       edgeObjects():yfiles.collections.IEnumerable<any>;
       /**
-       *
+       * 
        * @param dataKey
-       * @returns
+       * @returns 
        */
       getDataProvider(dataKey:any):yfiles.algorithms.IDataProvider;
       /**
-       *
+       * 
        * @param edge
-       * @returns
+       * @returns 
        */
       getEdgeLabelLayout(edge:any):yfiles.layout.IEdgeLabelLayout[];
       /**
-       *
+       * 
        * @param edge
-       * @returns
+       * @returns 
        */
       getEdgeLayout(edge:any):yfiles.layout.IEdgeLayout;
       /**
@@ -93599,32 +93616,32 @@ declare namespace yfiles{
        */
       getLabelCandidateDescriptorProvider(graph:yfiles.graph.IGraph):yfiles.graph.ILabelCandidateDescriptorProvider;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getNodeLabelLayout(node:any):yfiles.layout.INodeLabelLayout[];
       /**
-       *
+       * 
        * @param o
-       * @returns
+       * @returns 
        */
       getNodeLayout(o:any):yfiles.layout.INodeLayout;
       /**
-       *
+       * 
        * @param edgeObject
-       * @returns
+       * @returns 
        */
       getSource(edgeObject:any):any;
       /**
-       *
+       * 
        * @param edgeObject
-       * @returns
+       * @returns 
        */
       getTarget(edgeObject:any):any;
       /**
-       *
-       * @returns
+       * 
+       * @returns 
        */
       nodeObjects():yfiles.collections.IEnumerable<any>;
       /**
@@ -93850,7 +93867,7 @@ declare namespace yfiles{
        */
       fixPorts:boolean;
       /**
-       *
+       * 
        * @type {Array.<any>}
        */
       dataProviderKeys:any[];
@@ -94987,7 +95004,7 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param graph
        * @param layers
        * @param ldp
@@ -95006,7 +95023,7 @@ declare namespace yfiles{
        */
       getMinDistance(graph:yfiles.layout.LayoutGraph,layer:yfiles.hierarchic.ILayer,ldp:yfiles.hierarchic.ILayoutDataProvider,left:yfiles.algorithms.Node,right:yfiles.algorithms.Node):number;
       /**
-       *
+       * 
        * @param graph
        * @param layers
        * @param ldp
@@ -95080,7 +95097,7 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param graph
        * @param glayers
        * @param ldp
@@ -95155,7 +95172,7 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param graph
        * @param ldp
        * @param srcLayers
@@ -98174,7 +98191,7 @@ declare namespace yfiles{
        * Destroys a proxy {@link yfiles.algorithms.Node} created using {@link yfiles.hierarchic.IItemFactory#createProxyNode} for the drawing
        * phase.
        * @param proxyNode the proxy {@link } to be destroyed
-       * @returns
+       * @returns 
        * @abstract
        */
       destroyProxyNode(proxyNode:yfiles.algorithms.Node):yfiles.algorithms.Edge;
@@ -98864,7 +98881,7 @@ declare namespace yfiles{
        */
       constructor(singleComponentLayerer:yfiles.hierarchic.ILayerer);
       /**
-       *
+       * 
        * @param graph
        * @param layers
        * @param ldp
@@ -99098,7 +99115,7 @@ declare namespace yfiles{
       /**
        * Returns the data provider that provides the port candidate sets for nodes.
        * @param graph The graph that stores the data provider
-       * @returns
+       * @returns 
        * @protected
        */
       getPortCandidateSetDataProvider(graph:yfiles.layout.LayoutGraph):yfiles.algorithms.IDataProvider;
@@ -99204,7 +99221,7 @@ declare namespace yfiles{
        * @param ldp the {@link } implementation which provides access to the {@link } and {@link }
        * instances
        * @param itemFactory the {@link  factory} that sets the temporary port constraints
-       * @returns
+       * @returns 
        * @see yfiles.hierarchic.IItemFactory#setTemporaryPortConstraint
        * @protected
        */
@@ -99557,7 +99574,7 @@ declare namespace yfiles{
     export class SimplexNodePlacer {
       constructor();
       /**
-       *
+       * 
        * @param graph
        * @param layoutDataProvider
        * @param layers
@@ -99579,7 +99596,7 @@ declare namespace yfiles{
        */
       assignNodesToSublayer(layerNodes:yfiles.algorithms.NodeList,ldp:yfiles.hierarchic.ILayoutDataProvider,graph:yfiles.layout.LayoutGraph,lowerSublayer:yfiles.algorithms.INodeMap):void;
       /**
-       *
+       * 
        * @param graph
        * @param layoutDataProvider
        * @param layers
@@ -99597,7 +99614,7 @@ declare namespace yfiles{
        * @param node the given node
        * @param layerIndex the index of the layer
        * @param minLayerHeight the minimum height of the layer
-       * @returns
+       * @returns 
        * @protected
        */
       getLayerAlignment(graph:yfiles.layout.LayoutGraph,ldp:yfiles.hierarchic.ILayoutDataProvider,node:yfiles.algorithms.Node,layerIndex:number,minLayerHeight:number):number;
@@ -99819,7 +99836,7 @@ declare namespace yfiles{
       /**
        * Implements the {@link yfiles.lang.IComparable} interface using the {@link yfiles.hierarchic.SwimlaneDescriptor#comparer} and {@link yfiles.hierarchic.SwimlaneDescriptor#clientObject} fields.
        * @param o
-       * @returns
+       * @returns 
        */
       compareTo(o:any):number;
       /**
@@ -99999,24 +100016,24 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param graph
        * @param layers
        * @param ldp
        */
       dispose(graph:yfiles.layout.LayoutGraph,layers:yfiles.hierarchic.ILayers,ldp:yfiles.hierarchic.ILayoutDataProvider):void;
       /**
-       *
+       * 
        * @param graph
        * @param layer
        * @param ldp
        * @param left
        * @param right
-       * @returns
+       * @returns 
        */
       getMinDistance(graph:yfiles.layout.LayoutGraph,layer:yfiles.hierarchic.ILayer,ldp:yfiles.hierarchic.ILayoutDataProvider,left:yfiles.algorithms.Node,right:yfiles.algorithms.Node):number;
       /**
-       *
+       * 
        * @param graph
        * @param layers
        * @param ldp
@@ -101363,7 +101380,7 @@ declare namespace yfiles{
        */
       static FIXED_NODE_DP_KEY:yfiles.algorithms.NodeDpKey<boolean>;
       /**
-       *
+       * 
        * @type {yfiles.layout.ILayoutAlgorithm}
        */
       coreLayout:yfiles.layout.ILayoutAlgorithm;
@@ -102830,7 +102847,7 @@ declare namespace yfiles{
        */
       minimumNodeDistance:number;
       /**
-       *
+       * 
        * @type {yfiles.layout.ILayoutAlgorithm}
        */
       coreLayout:yfiles.layout.ILayoutAlgorithm;
@@ -102938,7 +102955,7 @@ declare namespace yfiles{
        */
       splitNodeSize:number;
       /**
-       *
+       * 
        * @type {yfiles.layout.ILayoutAlgorithm}
        */
       coreLayout:yfiles.layout.ILayoutAlgorithm;
@@ -104867,21 +104884,21 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        */
       cleanup():void;
       /**
-       *
+       * 
        * @param createdCell
        */
       onCellCreated(createdCell:yfiles.router.PartitionCell):void;
       /**
-       *
+       * 
        * @param finalizedCell
        */
       onCellFinalized(finalizedCell:yfiles.router.PartitionCell):void;
       /**
-       *
+       * 
        * @param cell
        * @param subCells
        */
@@ -105288,7 +105305,7 @@ declare namespace yfiles{
       /**
        * Returns the {@link yfiles.router.Interval interval} bound that is closest to the given value.
        * @param value the value for which the closest interval bound will be returned
-       * @returns
+       * @returns 
        * <ul>
        * <li>the <code>value</code>, if the given value lies within the interval, or</li>
        * <li>the lower bound, if the given value is smaller than or equal to the lower bound, or</li>
@@ -112235,7 +112252,7 @@ declare namespace yfiles{
        * will return <code>false</code>.
        * </p>
        * @param nodePlacerMap a {@link } containing the corresponding {@link }s for the node
-       * @returns
+       * @returns 
        * @static
        */
       static createLeftRightDataProvider(nodePlacerMap:yfiles.algorithms.IDataProvider):yfiles.algorithms.IDataProvider;
@@ -112389,7 +112406,7 @@ declare namespace yfiles{
        * </p>
        * @param edge1 the first edge
        * @param edge2 the second edge
-       * @returns
+       * @returns 
        * @see yfiles.tree.NodeOrderComparer#NODE_ORDER_COMPARABLE_DP_KEY
        */
       compare(edge1:any,edge2:any):number;
@@ -113093,7 +113110,7 @@ declare namespace yfiles{
        */
       static DUMMY_NODE_DP_KEY:yfiles.algorithms.NodeDpKey<boolean>;
       /**
-       *
+       * 
        * @type {yfiles.layout.ILayoutAlgorithm}
        */
       coreLayout:yfiles.layout.ILayoutAlgorithm;
@@ -114348,54 +114365,54 @@ declare namespace yfiles{
        */
       constructor();
       /**
-       *
+       * 
        * @param context
        * @param connector
        * @param opposite
        * @param origEdgeId
        * @param atTarget
-       * @returns
+       * @returns 
        */
       createConnectorEdge(context:yfiles.multipage.LayoutContext,connector:yfiles.algorithms.Node,opposite:yfiles.algorithms.Node,origEdgeId:any,atTarget:boolean):yfiles.algorithms.Edge;
       /**
-       *
+       * 
        * @param context
        * @param edgeIds
        * @param representedNodeId
-       * @returns
+       * @returns 
        */
       createConnectorNode(context:yfiles.multipage.LayoutContext,edgeIds:yfiles.algorithms.YList,representedNodeId:any):yfiles.algorithms.Node;
       /**
-       *
+       * 
        * @param context
        * @param proxyNode
        * @param opposite
        * @param replacingEdgeId
        * @param origNodeId
-       * @returns
+       * @returns 
        */
       createProxyEdge(context:yfiles.multipage.LayoutContext,proxyNode:yfiles.algorithms.Node,opposite:yfiles.algorithms.Node,replacingEdgeId:any,origNodeId:any):yfiles.algorithms.Edge;
       /**
-       *
+       * 
        * @param context
        * @param origNodeId
-       * @returns
+       * @returns 
        */
       createProxyNode(context:yfiles.multipage.LayoutContext,origNodeId:any):yfiles.algorithms.Node;
       /**
-       *
+       * 
        * @param context
        * @param proxyReference
        * @param opposite
        * @param referencingCopyId
-       * @returns
+       * @returns 
        */
       createProxyReferenceEdge(context:yfiles.multipage.LayoutContext,proxyReference:yfiles.algorithms.Node,opposite:yfiles.algorithms.Node,referencingCopyId:any):yfiles.algorithms.Edge;
       /**
-       *
+       * 
        * @param context
        * @param referringProxyId
-       * @returns
+       * @returns 
        */
       createProxyReferenceNode(context:yfiles.multipage.LayoutContext,referringProxyId:any):yfiles.algorithms.Node;
       /**
@@ -114891,27 +114908,27 @@ declare namespace yfiles{
        */
       createNode(sameDataElementId:any):yfiles.algorithms.Node;
       /**
-       *
+       * 
        * @param edge
-       * @returns
+       * @returns 
        */
       getEdgeInfo(edge:yfiles.algorithms.Edge):yfiles.multipage.IEdgeInfo;
       /**
-       *
+       * 
        * @param edgeLabelLayout
-       * @returns
+       * @returns 
        */
       getEdgeLabelInfo(edgeLabelLayout:yfiles.layout.IEdgeLabelLayout):yfiles.multipage.IEdgeLabelInfo;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getNodeInfo(node:yfiles.algorithms.Node):yfiles.multipage.INodeInfo;
       /**
-       *
+       * 
        * @param nodeLabelLayout
-       * @returns
+       * @returns 
        */
       getNodeLabelInfo(nodeLabelLayout:yfiles.layout.INodeLabelLayout):yfiles.multipage.INodeLabelInfo;
       /**
@@ -114944,14 +114961,14 @@ declare namespace yfiles{
        * Removes a label from a given edge.
        * @param label the label that should be removed
        * @param labeledElement the edge owning the label
-       * @returns
+       * @returns 
        */
       removeEdgeLabel(label:yfiles.layout.IEdgeLabelLayout,labeledElement:yfiles.algorithms.Edge):boolean;
       /**
        * Removes a label from a given node.
        * @param label the label that should be removed
        * @param labeledElement the node owning the label
-       * @returns
+       * @returns 
        */
       removeNodeLabel(label:yfiles.layout.INodeLabelLayout,labeledElement:yfiles.algorithms.Node):boolean;
       /**
@@ -115264,27 +115281,27 @@ declare namespace yfiles{
     export interface MultiPageLayoutResult extends yfiles.lang.Object,yfiles.multipage.IElementInfoManager{}
     export class MultiPageLayoutResult {
       /**
-       *
+       * 
        * @param edge
-       * @returns
+       * @returns 
        */
       getEdgeInfo(edge:yfiles.algorithms.Edge):yfiles.multipage.IEdgeInfo;
       /**
-       *
+       * 
        * @param edgeLabelLayout
-       * @returns
+       * @returns 
        */
       getEdgeLabelInfo(edgeLabelLayout:yfiles.layout.IEdgeLabelLayout):yfiles.multipage.IEdgeLabelInfo;
       /**
-       *
+       * 
        * @param node
-       * @returns
+       * @returns 
        */
       getNodeInfo(node:yfiles.algorithms.Node):yfiles.multipage.INodeInfo;
       /**
-       *
+       * 
        * @param nodeLabelLayout
-       * @returns
+       * @returns 
        */
       getNodeLabelInfo(nodeLabelLayout:yfiles.layout.INodeLabelLayout):yfiles.multipage.INodeLabelInfo;
       /**
@@ -116085,7 +116102,8 @@ declare namespace yfiles{
       /**
        * Gets or sets whether or not a randomization strategy should be performed.
        * <p>
-       * The randomization will increase the overall layout quality with high probability.
+       * The randomization will increase the overall layout quality with high probability. The drawback is that the running time
+       * of the layout algorithm may increase.
        * </p>
        * @type {boolean}
        */
@@ -116217,10 +116235,16 @@ declare namespace yfiles{
      * This algorithm is implemented as a {@link yfiles.layout.PartitionLayout} and applies the following steps:
      * </p>
      * <ul>
-     * <li>Divides the graph into smaller partitions.</li>
+     * <li>
+     * Divides the graph into smaller partitions using the partition finder instance created by
+     * {@link yfiles.layout.PartitionLayout#createEdgeBetweennessPartitionFinder}.
+     * </li>
      * <li>Arranges the nodes of each graph partition using {@link yfiles.orthogonal.OrthogonalLayout}.</li>
-     * <li>Arranges the partitions themselves in a compact manner.</li>
-     * <li>Routes the edges between partitions (inter-edges) using an edge router.</li>
+     * <li>
+     * Arranges the partitions themselves in a compact manner using the partition placer instance created by
+     * {@link yfiles.layout.PartitionLayout#createComponentPartitionPlacer}.
+     * </li>
+     * <li>Routes the edges between partitions (inter-edges) using the router instance created by CreateChannelInterEdgeRouter.</li>
      * </ul>
      * <p>
      * Each of these steps can be individually configured and/or replaced. To do so, use methods {@link yfiles.layout.PartitionLayout#partitionFinder}, {@link yfiles.layout.LayoutStageBase#coreLayout}, {@link yfiles.layout.PartitionLayout#partitionPlacer} and {@link yfiles.layout.PartitionLayout#interEdgeRouter}, respectively.
@@ -116268,6 +116292,7 @@ declare namespace yfiles{
        * </p>
        * @throws {Stubs.Exceptions.ArgumentError} if the given aspect ratio is less than or equal to zero
        * @see yfiles.layout.PartitionLayout#partitionPlacer
+       * @see yfiles.layout.PartitionLayout.T1
        * @type {number}
        */
       aspectRatio:number;
diff --git a/types/yfiles/tslint.json b/types/yfiles/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/yfiles/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/yfiles/yfiles-tests.ts b/types/yfiles/yfiles-tests.ts
index f05acba4a4..5d13f4de75 100644
--- a/types/yfiles/yfiles-tests.ts
+++ b/types/yfiles/yfiles-tests.ts
@@ -1,5 +1,5 @@
 class BasicTest {
-    private graphComponent:yfiles.view.GraphComponent;
+    private readonly graphComponent:yfiles.view.GraphComponent;
 
     constructor() {
         this.graphComponent = new yfiles.view.GraphComponent("graphControl");
@@ -129,7 +129,7 @@ class BasicTest {
         var args = new yfiles.lang.EventArgs();
         yfiles.input.KeyEventRecognizers.META_PRESSED(null, args);
     }
-    
+
     testsForVersion2012() {
         //isInstance type-guard
         let r : any;
diff --git a/types/yog-bigpipe/index.d.ts b/types/yog-bigpipe/index.d.ts
index 2c275f73b2..5add225256 100644
--- a/types/yog-bigpipe/index.d.ts
+++ b/types/yog-bigpipe/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/fex-team/yog-bigpipe
 // Definitions by: ssddi456 <https://github.com/ssddi456>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { EventEmitter } from 'events';
 import { Readable } from 'stream';
diff --git a/types/yog-log/index.d.ts b/types/yog-log/index.d.ts
index ff30bc4b8a..28430cf71e 100644
--- a/types/yog-log/index.d.ts
+++ b/types/yog-log/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/fex-team/yog-log
 // Definitions by: ssddi456 <https://github.com/ssddi456>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Request, Response, NextFunction } from "express";
 
diff --git a/types/yog2-kernel/index.d.ts b/types/yog2-kernel/index.d.ts
index 9b1076dd7b..ea12cc4da9 100644
--- a/types/yog2-kernel/index.d.ts
+++ b/types/yog2-kernel/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/fex-team/yog2-kernel
 // Definitions by: ssddi456 <https://github.com/ssddi456>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as express from "express";
 import * as _ from "lodash";
diff --git a/types/yosay/tslint.json b/types/yosay/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/yosay/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/youtube-dl/index.d.ts b/types/youtube-dl/index.d.ts
new file mode 100644
index 0000000000..4daf21884b
--- /dev/null
+++ b/types/youtube-dl/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for youtube-dl 1.12
+// Project: https://www.npmjs.com/package/youtube-dl
+// Definitions by: Bogdan Surai <https://github.com/bsurai>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+import * as fs from "fs";
+
+export = youtubedl;
+declare function youtubedl(url: string, arg: string[], opt: {[key: string]: string}): youtubedl.Youtubedl;
+declare namespace youtubedl {
+    interface Youtubedl {
+        on(event: string, func: (info: Info) => void): this;
+        pipe(stream: fs.WriteStream): this;
+    }
+    interface Info {
+        _filename: string;
+        filename: string;
+        size: number;
+    }
+}
diff --git a/types/youtube-dl/tsconfig.json b/types/youtube-dl/tsconfig.json
new file mode 100644
index 0000000000..2634bd2234
--- /dev/null
+++ b/types/youtube-dl/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "files": [
+        "index.d.ts",
+        "youtube-dl-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/youtube-dl/tslint.json b/types/youtube-dl/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/youtube-dl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/youtube-dl/youtube-dl-tests.ts b/types/youtube-dl/youtube-dl-tests.ts
new file mode 100644
index 0000000000..c85b1ffc92
--- /dev/null
+++ b/types/youtube-dl/youtube-dl-tests.ts
@@ -0,0 +1,18 @@
+import * as fs from 'fs';
+import youtubedl = require('youtube-dl');
+
+const video = youtubedl('http://www.youtube.com/watch?v=90AiXO1pAiA',
+  // Optional arguments passed to youtube-dl.
+  ['--format=18'],
+  // Additional options can be given for calling `child_process.execFile()`.
+  { cwd: __dirname });
+
+// Will be called when the download starts.
+video.on('info', (info: youtubedl.Info) => {
+  console.log('Download started');
+  console.log('_filename: ' + info._filename);
+  console.log('filename: ' + info.filename);
+  console.log('size: ' + info.size);
+});
+
+video.pipe(fs.createWriteStream('myvideo.mp4'));
diff --git a/types/youtube/tslint.json b/types/youtube/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/youtube/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/yui/tslint.json b/types/yui/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/yui/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
new file mode 100644
index 0000000000..6c03557c60
--- /dev/null
+++ b/types/yup/index.d.ts
@@ -0,0 +1,242 @@
+// Type definitions for yup 0.23
+// Project: https://github.com/jquense/yup
+// Definitions by: Dominik Hardtke <https://github.com/dhardtke>, Vladyslav Tserman <https://github.com/vtserman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export function reach(schema: Schema, path: string, value?: any, context?: any): Schema;
+export function addMethod<T extends Schema>(schemaCtor: AnySchemaConstructor, name: string, method: (this: T, ...args: any[]) => T): void;
+export function ref(path: string, options?: { contextPrefix: string }): Ref;
+export function lazy(fn: (value: any) => Schema): Lazy;
+export function ValidationError(errors: string | string[], value: any, path: string, type?: any): ValidationError;
+
+export const mixed: MixedSchemaConstructor;
+export const string: StringSchemaConstructor;
+export const number: NumberSchemaConstructor;
+export const boolean: BooleanSchemaConstructor;
+export const bool: BooleanSchemaConstructor;
+export const date: DateSchemaConstructor;
+export const array: ArraySchemaConstructor;
+export const object: ObjectSchemaConstructor;
+
+export type AnySchemaConstructor = MixedSchemaConstructor
+    | StringSchemaConstructor
+    | NumberSchemaConstructor
+    | BooleanSchemaConstructor
+    | DateSchemaConstructor
+    | ArraySchemaConstructor
+    | ObjectSchemaConstructor;
+
+export interface Schema {
+    clone(): this;
+    label(label: string): this;
+    meta(metadata: any): this;
+    meta(): any;
+    describe(): SchemaDescription;
+    concat(schema: this): this;
+    validate<U>(value: U, options?: ValidateOptions): Promise<ValidationError|U>;
+    validateSync<U>(value: U, options?: ValidateOptions): ValidationError|U;
+    isValid(value: any, options?: any): Promise<boolean>;
+    isValidSync(value: any, options?: any): boolean;
+    cast(value: any, options?: any): any;
+    isType(value: any): boolean;
+    strict(isStrict: boolean): this;
+    strip(strip: boolean): this;
+    withMutation(fn: (current: this) => void): void;
+    default(value?: any): this;
+    nullable(isNullable: boolean): this;
+    required(message?: string): this;
+    typeError(message?: string): this;
+    oneOf(arrayOfValues: any[], message?: string): this;
+    notOneOf(arrayOfValues: any[], message?: string): this;
+    when(keys: string | any[], builder: WhenOptions<this>): this;
+    test(name: string, message: string, test: (value?: any) => boolean, callbackStyleAsync?: boolean): this;
+    test(options: TestOptions): this;
+    transform(fn: TransformFunction<this>): this;
+}
+
+export interface MixedSchemaConstructor {
+  (): MixedSchema;
+  new(options?: { type?: string, [key: string]: any }): MixedSchema;
+}
+
+// tslint:disable-next-line:no-empty-interface
+export interface MixedSchema extends Schema {
+}
+
+export interface StringSchemaConstructor {
+    (): StringSchema;
+    new(): StringSchema;
+}
+
+export interface StringSchema extends Schema {
+    min(limit: number | Ref, message?: string): StringSchema;
+    max(limit: number | Ref, message?: string): StringSchema;
+    matches(regex: RegExp, message?: string): StringSchema;
+    email(message?: string): StringSchema;
+    url(message?: string): StringSchema;
+    ensure(): StringSchema;
+    trim(message?: string): StringSchema;
+    lowercase(message?: string): StringSchema;
+    uppercase(message?: string): StringSchema;
+}
+
+export interface NumberSchemaConstructor {
+    (): NumberSchema;
+    new(): NumberSchema;
+}
+
+export interface NumberSchema extends Schema {
+    min(limit: number | Ref, message?: string): NumberSchema;
+    max(limit: number | Ref, message?: string): NumberSchema;
+    positive(message?: string): NumberSchema;
+    negative(message?: string): NumberSchema;
+    integer(message?: string): NumberSchema;
+    truncate(): NumberSchema;
+    round(type: "floor" | "ceil" | "trunc" | "round"): NumberSchema;
+}
+
+export interface BooleanSchemaConstructor {
+    (): BooleanSchema;
+    new(): BooleanSchema;
+}
+
+// tslint:disable-next-line:no-empty-interface
+export interface BooleanSchema extends Schema {
+}
+
+export interface DateSchemaConstructor {
+    (): DateSchema;
+    new(): DateSchema;
+}
+
+export interface DateSchema extends Schema {
+    min(limit: Date | string | Ref, message?: string): DateSchema;
+    max(limit: Date | string | Ref, message?: string): DateSchema;
+}
+
+export interface ArraySchemaConstructor {
+    (): ArraySchema;
+    new(): ArraySchema;
+}
+
+export interface ArraySchema extends Schema {
+    of(type: Schema): ArraySchema;
+    min(limit: number | Ref, message?: string): ArraySchema;
+    max(limit: number | Ref, message?: string): ArraySchema;
+    ensure(): ArraySchema;
+    compact(rejector: (value: any) => boolean): ArraySchema;
+}
+
+export interface ObjectSchemaConstructor {
+    (fields?: any): ObjectSchema;
+    new(): ObjectSchema;
+}
+
+export interface ObjectSchema extends Schema {
+    shape(fields: any, noSortEdges?: Array<[string, string]>): ObjectSchema;
+    from(fromKey: string, toKey: string, alias?: boolean): ObjectSchema;
+    noUnknown(onlyKnownKeys: boolean, message?: string): ObjectSchema;
+    transformKeys(callback: (key: any) => any): void;
+    camelCase(): ObjectSchema;
+    constantCase(): ObjectSchema;
+}
+
+export type TransformFunction<T> = ((this: T, value: any, originalValue: any) => any);
+
+export interface WhenOptionsBuilder<T> {
+    (value: any, schema: T): T;
+    (v1: any, v2: any, schema: T): T;
+    (v1: any, v2: any, v3: any, schema: T): T;
+    (v1: any, v2: any, v3: any, v4: any, schema: T): T;
+}
+
+export type WhenOptions<T> = WhenOptionsBuilder<T>
+| { is: boolean | ((value: any) => boolean), then: any, otherwise: any }
+| object;
+
+export interface ValidateOptions {
+    /**
+     * Only validate the input, and skip and coercion or transformation. Default - false
+     */
+    strict?: boolean;
+    /**
+     * Teturn from validation methods on the first error rather than after all validations run. Default - true
+     */
+    abortEarly?: boolean;
+    /**
+     * Remove unspecified keys from objects. Default - false
+     */
+    stripUnknown?: boolean;
+    /**
+     * When false validations will not descend into nested schema (relevant for objects or arrays). Default - true
+     */
+    recursive?: boolean;
+    /**
+     * Any context needed for validating schema conditions (see: when())
+     */
+    context?: object;
+}
+
+export interface TestOptions {
+    /**
+     * Unique name identifying the test
+     */
+    name?: string;
+
+    /**
+     * Test function, determines schema validity
+     */
+    test: (value: any) => boolean;
+
+    /**
+     * The validation error message
+     */
+    message?: string;
+
+    /**
+     * Values passed to message for interpolation
+     */
+    params?: object;
+
+    /**
+     * Mark the test as exclusive, meaning only one of the same can be active at once
+     */
+    exclusive?: boolean;
+}
+
+export interface SchemaDescription {
+    type: string;
+    label: string;
+    meta: object;
+    tests: string[];
+}
+
+export interface ValidationError {
+    name: string;
+    message: string;
+    value: any;
+    /**
+     * A string, indicating where there error was thrown. path is empty at the root level.
+     */
+    path: string;
+    type: any;
+    /**
+     * array of error messages
+     */
+    errors: string[];
+
+    /**
+     * In the case of aggregate errors, inner is an array of ValidationErrors throw earlier in the validation chain.
+     */
+    inner: ValidationError[];
+    params?: object;
+}
+
+export interface Ref {
+    [key: string]: any;
+}
+
+// tslint:disable-next-line:no-empty-interface
+export interface Lazy extends Schema {
+}
diff --git a/types/yup/tsconfig.json b/types/yup/tsconfig.json
new file mode 100644
index 0000000000..7a38726edd
--- /dev/null
+++ b/types/yup/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "yup-tests.ts"
+    ]
+}
diff --git a/types/yup/tslint.json b/types/yup/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/yup/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
new file mode 100644
index 0000000000..24c47fb418
--- /dev/null
+++ b/types/yup/yup-tests.ts
@@ -0,0 +1,254 @@
+import * as yup from 'yup';
+// tslint:disable-next-line:no-duplicate-imports
+import { reach, date, Schema, ObjectSchema, ValidationError, MixedSchema, SchemaDescription, TestOptions, ValidateOptions, NumberSchema } from 'yup';
+
+// reach function
+let schema = yup.object().shape({
+    nested: yup.object().shape({
+        arr: yup.array().of(
+            yup.object().shape({ num: yup.number().max(4) })
+        )
+    })
+  });
+reach(schema, 'nested.arr.num');
+reach(schema, 'nested.arr[].num');
+
+// addMethod function
+yup.addMethod<NumberSchema>(yup.number, 'minimum', function(this, minValue: number, message: string) {
+    return this.min(minValue, message);
+});
+yup.addMethod(yup.date, 'newMethod', function(this: yup.DateSchema, date: Date, message?: string) {
+    return this.max(date, message);
+});
+
+// ref function
+schema = yup.object().shape({
+    baz: yup.ref('foo.bar'),
+    foo: yup.object().shape({
+      bar: yup.string()
+    }),
+    x: yup.ref('$x')
+});
+
+schema.cast({ foo: { bar: 'boom' } }, { context: { x: 5 } });
+
+// lazy function
+const node: ObjectSchema = yup.object().shape({
+    id: yup.number(),
+    child: yup.lazy(() =>
+      node.default(undefined)
+    )
+});
+const renderable = yup.lazy(value => {
+    switch (typeof value) {
+      case 'number':
+        return yup.number();
+      case 'string':
+        return yup.string();
+      default:
+        return yup.mixed();
+    }
+});
+const renderables = yup.array().of(renderable);
+
+// ValidationError
+let error: ValidationError = yup.ValidationError('error', 'value', 'path');
+error = yup.ValidationError(['error', 'error2'], true, 'path');
+error = yup.ValidationError(['error', 'error2'], 5, 'path');
+error = yup.ValidationError(['error', 'error2'], {name: 'value'}, 'path');
+error = yup.ValidationError(['error', 'error2'], {name: 'value'}, 'path', 'type');
+error = {
+    name: 'ValidationError',
+    message: 'error',
+    path: 'path',
+    errors: ['error'],
+    inner: [yup.ValidationError('error', true, 'path')],
+    type: 'date',
+    value: {start: '2017-11-10'}
+};
+error.value = 'value';
+error.value = true;
+error.value = 5;
+error.value = {name: 'value'};
+error.type = {};
+error.type = [];
+error.errors = ['error'];
+
+// mixed
+let mixed: MixedSchema = yup.mixed();
+mixed.clone();
+mixed.label('label');
+mixed.meta({ meta: 'value' });
+mixed.describe().label;
+mixed.describe().meta;
+mixed.describe().tests;
+mixed.describe().type;
+mixed.concat(yup.string());
+mixed.validate({});
+mixed.validate({ hello: 'world' }, { strict: true }).then(value => value);
+mixed.isValid(undefined, (valid: true) => true);
+mixed.isValid({ hello: 'world' }).then(valid => valid);
+mixed.cast({});
+mixed.isType('hello');
+mixed.strict(true);
+mixed.strip(true);
+mixed.withMutation(schema => {});
+mixed.default({ number: 5});
+mixed.default(() => ({ number: 5}));
+mixed.default();
+mixed.nullable(true);
+mixed.required();
+mixed.typeError('type error');
+mixed.oneOf(['hello', 'world'], 'message');
+mixed.notOneOf(['hello', 'world'], 'message');
+mixed.when('isBig', {
+    is: value => true,
+    then: yup.number().min(5),
+    otherwise: yup.number().min(0)
+});
+mixed.when('isBig', {
+    is: true,
+    then: yup.number().min(5),
+    otherwise: yup.number().min(0)
+}).when('$other', (value: any, schema: MixedSchema) => value === 4 ? schema.required() : schema);
+// tslint:disable-next-line:no-invalid-template-strings
+mixed.test('is-jimmy', '${path} is not Jimmy', value => value === 'jimmy');
+mixed.test({
+    name: 'lessThan5',
+    exclusive: true,
+    // tslint:disable-next-line:no-invalid-template-strings
+    message: '${path} must be less than 5 characters',
+    test: value => value == null || value.length <= 5
+});
+
+yup.string().transform(function(this, value: any, originalvalue: any) {
+    return this.isType(value) && value !== null ? value.toUpperCase() : value;
+});
+
+// Extending Schema Types
+class ExtendsMixed extends yup.mixed {}
+mixed = new ExtendsMixed();
+
+class ExtendsMixed2 extends yup.mixed {
+    constructor() {
+        super({ type: 'CustomType' });
+    }
+}
+mixed = new ExtendsMixed2();
+
+/**
+ * Creating new Types
+ */
+class DateSchema extends yup.date {
+    isWednesday(message?: string): DateSchema {
+        return this.clone().test({
+            name: 'Wednesday',
+            // tslint:disable-next-line:no-invalid-template-strings
+            message: message || '${path} must be Wednesday',
+            test: value => true /* Check that day is Wednesday */,
+        });
+    }
+}
+yup.object().shape({
+    startDate: new DateSchema().isWednesday().required()
+}).isValidSync({
+    startDate: '2017-11-29',
+});
+
+// String schema
+const strSchema = yup.string();
+strSchema.isValid('hello'); // => true
+strSchema.required();
+strSchema.min(5, 'message');
+strSchema.max(5, 'message');
+strSchema.matches(/(hi|bye)/);
+strSchema.email();
+strSchema.url();
+strSchema.ensure();
+strSchema.trim();
+strSchema.lowercase();
+strSchema.uppercase();
+
+// Number schema
+const numSchema = yup.number();
+numSchema.isValid(10); // => true
+numSchema.min(5, 'message');
+numSchema.max(5, 'message');
+numSchema.positive();
+numSchema.negative();
+numSchema.integer();
+numSchema.truncate();
+numSchema.round('floor');
+numSchema.validate(5, { strict: true }).then(value => value).catch(err => err);
+
+// Boolean Schema
+const boolSchema = yup.boolean();
+boolSchema.isValid(true); // => true
+
+// Date Schema
+const dateSchema = yup.date();
+dateSchema.isValid(new Date()); // => true
+dateSchema.min(new Date());
+dateSchema.min('2017-11-12');
+dateSchema.min(new Date(), 'message');
+dateSchema.min('2017-11-12', 'message');
+dateSchema.max(new Date());
+dateSchema.max('2017-11-12');
+dateSchema.max(new Date(), 'message');
+dateSchema.max('2017-11-12', 'message');
+
+// Array Schema
+const arrSchema = yup.array().of(yup.number().min(2));
+arrSchema.isValid([2, 3]);   // => true
+arrSchema.isValid([1, -24]); // => false
+arrSchema.required();
+arrSchema.ensure();
+arrSchema.compact(value => value === null);
+
+// Object Schema
+const objSchema = yup.object().shape({
+    name: yup.string().required(),
+    age: yup.number().required().positive().integer(),
+    email: yup.string().email(),
+    website: yup.string().url(),
+});
+yup.object().shape({
+    num: yup.number()
+});
+// or
+yup.object({
+    num: yup.number()
+});
+
+objSchema.from('prop', 'myProp');
+objSchema.from('prop', 'myProp', true);
+objSchema.noUnknown(true);
+objSchema.noUnknown(true, 'message');
+objSchema.transformKeys(key => key.toUpperCase());
+objSchema.camelCase();
+objSchema.constantCase();
+
+const description: SchemaDescription = {
+    type: 'type',
+    label: 'label',
+    meta: { key: 'value' },
+    tests: ['test1', 'test2']
+};
+
+const testOptions: TestOptions = {
+    name: 'name',
+    test: value => true,
+    message: 'validation error message',
+    params: { param1: 'value'},
+    exclusive: true
+};
+
+const validateOptions: ValidateOptions = {
+    strict: true,
+    abortEarly: true,
+    stripUnknown: true,
+    recursive: true,
+    context: {
+        key: 'value'
+    }
+};
diff --git a/types/z-schema/index.d.ts b/types/z-schema/index.d.ts
index 695866a7e9..1be4dc4f1c 100644
--- a/types/z-schema/index.d.ts
+++ b/types/z-schema/index.d.ts
@@ -25,6 +25,7 @@ declare namespace Validator {
         breakOnFirstError?: boolean;
         pedanticCheck?: boolean;
         ignoreUnknownFormats?: boolean;
+        customValidator?: (report: Report, schema: any, json: any) => void;
     }
 
     export interface SchemaError extends Error {
@@ -143,4 +144,19 @@ declare class Validator {
     getLastErrors(): Validator.SchemaErrorDetail[];
 }
 
+/**
+ * Basic representation of the Report class -- just enough to support customValidator
+ */
+declare class Report {
+    /**
+     * @param errorCode - a string representing the code for the custom error, e.g. INVALID_VALUE_SET
+     * @param errorMessage - string with the message to be returned in the error
+     * @param params - an array of relevant params for the error, e.g. [fieldName, fieldValue]
+     * @param subReports - sub-schema involved in the error
+     * @param schemaDescription - description from the schema used in the validation
+     * Adds custom error to the errors array in the validation instance and sets valid to false if it is not already set as false
+     */
+    addCustomError: (errorCode: string, errorMessage: string, params: string[], subReports: string, schemaDescription: string) => void;
+}
+
 export = Validator;
diff --git a/types/z-schema/tslint.json b/types/z-schema/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/z-schema/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/zenscroll/index.d.ts b/types/zenscroll/index.d.ts
new file mode 100644
index 0000000000..4f46064a50
--- /dev/null
+++ b/types/zenscroll/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for zenscroll 4.0
+// Project: https://zengabor.github.io/zenscroll/
+// Definitions by: Hamed Fathi <https://github.com/HamedFathi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var zenScroll: ZenScroll.zenscroll;
+export = zenScroll;
+export as namespace zenScroll;
+
+declare namespace ZenScroll {
+    interface setupOption {
+        defaultDuration: number;
+        edgeOffset: number;
+    }
+
+    interface zenscroll {
+        setup(defaultDuration?: number, edgeOffset?: number): setupOption;
+        to(elem: HTMLElement, duration?: number, onDone?: () => void): void;
+        toY(targetY: number, duration?: number, onDone?: () => void): void;
+        intoView(elem: HTMLElement, duration?: number, onDone?: () => void): void;
+        center(elem: HTMLElement, duration?: number, offset?: number, onDone?: () => void): void;
+        stop(): void;
+        moving(): boolean;
+        getY(): number;
+        getTopOf(elem: HTMLElement): number;
+        createScroller(scrollContainer: HTMLElement, defaultDuration?: number, edgeOffset?: number): zenscroll;
+    }
+}
diff --git a/types/zenscroll/tsconfig.json b/types/zenscroll/tsconfig.json
new file mode 100644
index 0000000000..89fc59c020
--- /dev/null
+++ b/types/zenscroll/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+		"strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+		"zenscroll-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/zenscroll/tslint.json b/types/zenscroll/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/zenscroll/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/zenscroll/zenscroll-tests.ts b/types/zenscroll/zenscroll-tests.ts
new file mode 100644
index 0000000000..204d911816
--- /dev/null
+++ b/types/zenscroll/zenscroll-tests.ts
@@ -0,0 +1,57 @@
+import * as zenscroll from 'zenscroll';
+
+// Scroll to the top of an element
+const about = document.getElementById("about");
+zenscroll.to(about);
+
+// Scroll to a specific vertical position
+zenscroll.toY(50);
+
+// Scroll an element into view
+const image1 = document.getElementById("imageSample");
+zenscroll.intoView(image1, 400, () => console.log('scrolled'));
+
+// Scrolls the element to the center of the screen
+zenscroll.center(image1);
+
+const duration = 500; // milliseconds
+const offset = 200; // pixels
+zenscroll.center(image1, duration, offset);
+
+// Set the duration of the scroll
+zenscroll.toY(50, 100); // 100ms == 0.1 second
+zenscroll.to(about, 500); // 500ms == half a second
+zenscroll.center(image1, 2000); // 2 seconds
+zenscroll.to(about, 0); // 0 milliseconds == no smoothing
+
+// Scroll inside a scrollable DIV
+const defaultDuration = 500;
+const edgeOffset = 30;
+const myDiv = document.getElementById("container");
+const myScroller = zenscroll.createScroller(myDiv, defaultDuration, edgeOffset);
+const target = document.getElementById("item4");
+myScroller.center(target);
+myScroller.toY(500);
+myScroller.intoView(target);
+
+// Execute something when the scrolling is done
+zenscroll.intoView(myDiv, 100, () => myScroller.center(target));
+zenscroll.intoView(myDiv, 100, () => myScroller.toY(35));
+zenscroll.intoView(myDiv, 100, () => myScroller.intoView(target));
+
+// Change settings
+zenscroll.setup(defaultDuration, edgeOffset);
+myScroller.setup(500, 10);
+zenscroll.setup(777); // only updates defaultDuration to 777
+zenscroll.setup(null, 42); // only updates edgeOffset to 42
+const currentSettings = zenscroll.setup();
+const dd = currentSettings.defaultDuration;
+const eo = currentSettings.edgeOffset;
+
+// Additional functions
+const isScrolling = zenscroll.moving();
+zenscroll.stop();
+const bodyY = zenscroll.getY();
+const myDivY = myScroller.getY();
+const myElemY = zenscroll.getTopOf(about);
+const relativeTopOfElem = myScroller.getTopOf(about);
diff --git a/types/zepto/tslint.json b/types/zepto/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/zepto/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/zeroclipboard/tslint.json b/types/zeroclipboard/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/zeroclipboard/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/zeroclipboard/v1/tslint.json b/types/zeroclipboard/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/zeroclipboard/v1/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/zeromq/index.d.ts b/types/zeromq/index.d.ts
index b2ded80bbf..949a5f567b 100644
--- a/types/zeromq/index.d.ts
+++ b/types/zeromq/index.d.ts
@@ -56,7 +56,7 @@ export interface SocketOptions {
     zap_domain: number;
 }
 
-export interface Socket {
+export class Socket {
     /**
      * Set `opt` to `val`.
      *
@@ -148,8 +148,8 @@ export interface Socket {
      * 'accept', 'accept_error', 'close', 'close_error', 'disconnect'.
      * Each event receives the parameters: (eventValue, eventEndpointAddrress, error)
      *
-     * @param {Number} timer interval in ms > 0 or Undefined for default
-     * @return {Socket} for chaining
+     * @param timer interval in ms > 0 or Undefined for default
+     * @return for chaining
      */
     monitor(interval?: number): Socket;
 
@@ -161,8 +161,6 @@ export interface Socket {
 
     /**
      * Socket event - 'message'
-     * @param eventName {string}
-     * @param callback {Function}
      */
     on(eventName: string, callback: (...buffer: Buffer[]) => void): void;
 
@@ -204,16 +202,12 @@ export interface CurveKeyPair {
     /**
      * A Z85 string denoting the public portion of the Curve25519 key.
      *
-     * @name CurveKeyPair#public
-     * @type string
      */
     public: string;
 
     /**
      * A Z85 string denoting the private, secret portion of the Curve25519 key.
      *
-     * @name CurveKeyPair#secret
-     * @type string
      */
     secret: string;
 }
@@ -228,18 +222,18 @@ export let options: SocketOptions;
 
 /**
  * Creates a ZeroMQ socket of the specified type.
- * @return {Socket} The created socket in an unconnected state.
+ * @return The created socket in an unconnected state.
  */
 export function socket(type: string|number, options?: any): Socket;
 
 /**
  * Creates a ZeroMQ socket of the specified type.
- * @return {Socket} The created socket in an unconnected state.
+ * @return The created socket in an unconnected state.
  */
 export function createSocket(type: string, options?: any): Socket;
 
 /**
  * Generates a CurveZMQ (Curve25519) key pair.
- * @return {CurveKeyPair} The public and secret portions of the key.
+ * @return The public and secret portions of the key.
  */
 export function curveKeypair(): CurveKeyPair;
diff --git a/types/zeromq/tslint.json b/types/zeromq/tslint.json
index 495d29983d..f93cf8562a 100644
--- a/types/zeromq/tslint.json
+++ b/types/zeromq/tslint.json
@@ -1,5 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/zetapush-js/index.d.ts b/types/zetapush-js/index.d.ts
deleted file mode 100644
index afe0e3c6b0..0000000000
--- a/types/zetapush-js/index.d.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-// Type definitions for zetapush-js 3.1
-// Project: https://github.com/zetapush/zetapush-js
-// Definitions by: ghoullier <https://github.com/ghoullier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export interface HandshakeFields {
-  ext: any;
-}
-
-export interface AbstractHandshakeOptions {
-  authType: string;
-  sandboxId: string;
-  deploymentId: string;
-}
-
-export interface CredentialsHandshakeOptions {
-  authType: string;
-  deploymentId: string;
-  login: string;
-  password: string;
-}
-
-export interface TokenHandshakeOptions {
-  authType: string;
-  deploymentId: string;
-  token: string;
-}
-
-export interface AbstractHandshake {
-  authType: string;
-  authVersion: string;
-  sandboxId: string;
-  deploymentId: string;
-  getHandshakeFields(client: Client): HandshakeFields;
-}
-
-export interface CredentialsAuthData {
-  login: string;
-  password: string;
-}
-
-export interface CredentialsHandshake extends AbstractHandshake {
-  login: string;
-  password: string;
-  authData: CredentialsAuthData;
-}
-
-export interface TokenAuthData {
-  token: string;
-}
-
-export interface TokenHandshake extends AbstractHandshake {
-  token: string;
-  authData: TokenAuthData;
-}
-
-export type AuthenticationCallback = () => AbstractHandshake;
-
-export type AsyncMacroServicePublisher = (method: string, parameters: any, hardFail?: boolean, debug?: number) => Promise<any>;
-
-export type MacroServicePublisher = (method: string, parameters: any, hardFail?: boolean, debug?: number) => void;
-
-export type ServicePublisher = (method: string, parameters: any) => void;
-
-export interface Options {
-  apiUrl?: string;
-  sandboxId: string;
-  forceHttps?: boolean;
-  resource?: string;
-  transports?: any[];
-}
-
-export interface ClientOptions extends Options {
-  authentication(): AbstractHandshake;
-}
-
-export interface WeakClientOptions extends Options {
-  deploymentId?: string;
-}
-
-export interface Services {
-  Macro: AsyncMacroService;
-  Messaging: Service;
-}
-
-export interface Service {
-  DEFAULT_DEPLOYMENT_ID: string;
-  $publish: ServicePublisher;
-}
-
-export interface AsyncMacroService {
-  DEFAULT_DEPLOYMENT_ID: string;
-  $publish: AsyncMacroServicePublisher;
-}
-
-export interface MacroService {
-  DEFAULT_DEPLOYMENT_ID: string;
-  $publish: MacroServicePublisher;
-}
-
-export interface ServiceDeclaration {
-  Type: Service;
-  deploymentId?: string;
-}
-
-export interface Token {
-  token: string;
-}
-
-export interface Credentials {
-  login: string;
-  password: string;
-}
-
-export interface ClientHelper {
-  authentication: AuthenticationCallback;
-  servers: Promise<string[]>;
-  getUniqRequestId(): string;
-}
-
-export type ConnectionStatusHandler = number;
-
-export class Authentication {
-  static delegating({ token }: TokenAuthData): TokenHandshake;
-  static simple({ login, password }: CredentialsAuthData): CredentialsHandshake;
-  static weak({ token }: TokenAuthData): TokenHandshake;
-}
-
-export interface ConnectionStatusListener {
-  onConnectionBroken(): void;
-  onConnectionClosed(): void;
-  onConnectionEstablished(): void;
-  onConnectionToServerFail(failure: any): void;
-  onConnectionWillClose(): void;
-  onFailedHandshake(failure: any): void;
-  onMessageLost(): void;
-  onNoServerUrlAvailable(): void;
-  onSuccessfulHandshake(authentication: any): void;
-}
-
-export class Client {
-  helper: ClientHelper;
-  constructor(options: ClientOptions);
-  addConnectionStatusListener(listener: ConnectionStatusListener): ConnectionStatusHandler;
-  connect(): void;
-  createService(declaration: ServiceDeclaration): Service;
-  createAsyncMacroService(declaration: ServiceDeclaration): AsyncMacroService;
-  disconnect(): void;
-  isConnected(): boolean;
-  getSandboxId(): string;
-  getResource(): string;
-  getUserId(): string;
-  removeConnectionStatusListener(listener: ConnectionStatusHandler): void;
-  setAuthentication(authentication: AuthenticationCallback): void;
-  setLogLevel(level: string): void;
-  setResource(resource: string): void;
-  unsubscribe(service: Service): void;
-  //
-  onConnectionBroken(handler: () => void): void;
-  onConnectionClosed(handler: () => void): void;
-  onConnectionEstablished(handler: () => void): void;
-  onConnectionToServerFail(handler: (failure: any) => void): void;
-  onConnectionWillClose(handler: () => void): void;
-  onFailedHandshake(handler: (failure: any) => void): void;
-  onMessageLost(handler: () => void): void;
-  onNoServerUrlAvailable(handler: () => void): void;
-  onSuccessfulHandshake(handler: (authentication: any) => void): void;
-}
-
-export class SmartClient extends Client {
-  getCredentials(): any;
-  getSession(): any;
-  hasCredentials(): boolean;
-  isStronglyAuthenticated(session?: any): boolean;
-  isWeaklyAuthenticated(session?: any): boolean;
-  setCredentials(credentials: any): void;
-}
-export class WeakClient extends Client {
-  constructor(options: WeakClientOptions);
-  getToken(): Token;
-}
-
-export const services: Services;
-
-export const VERSION: string;
-
-export as namespace ZetaPush;
diff --git a/types/zetapush-js/tsconfig.json b/types/zetapush-js/tsconfig.json
deleted file mode 100644
index 3ce2c2d301..0000000000
--- a/types/zetapush-js/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "zetapush-js-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/zetapush-js/zetapush-js-tests.ts b/types/zetapush-js/zetapush-js-tests.ts
deleted file mode 100644
index 46eb822680..0000000000
--- a/types/zetapush-js/zetapush-js-tests.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Authentication, Client, WeakClient } from 'zetapush-js';
-
-const weak = new WeakClient({
-  sandboxId: ''
-});
-
-weak.onConnectionEstablished(() => {
-  // onConnectionEstablished;
-});
-weak.connect();
-
-const client = new Client({
-  apiUrl: '',
-  sandboxId: '',
-  authentication: () => Authentication.simple({
-    login: 'login',
-    password: 'password'
-  })
-});
-client.onConnectionEstablished(() => {
-  // onConnectionEstablished;
-});
-client.connect();
diff --git a/types/zip.js/tslint.json b/types/zip.js/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/zip.js/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/zipcodes/index.d.ts b/types/zipcodes/index.d.ts
new file mode 100644
index 0000000000..b1903ad48b
--- /dev/null
+++ b/types/zipcodes/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for zipcodes 6.0
+// Project: https://github.com/davglass/zipcodes#readme
+// Definitions by: Brayden Lopez <https://github.com/headdetect>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace ZipCodes;
+
+export interface ZipCode {
+    zip: string;
+    latitude: number;
+    longitude: number;
+    city: string;
+    state: string;
+    country: string;
+}
+
+export function lookup(zip: any): ZipCode;
+
+export function lookupByName(city: string, state: string): ZipCode[];
+
+export function lookupByState(state: string): ZipCode[];
+
+export function distance(zipA: ZipCode, zipB: ZipCode): number;
+
+export function radius(zip: ZipCode, miles: number, full: boolean): string | ZipCode[];
+
+export function toMiles(kilos: number): number;
+
+export function toKilometers(miles: number): number;
+
+export function lookupByCoords(lat: number, lon: number): ZipCode;
diff --git a/types/zipcodes/tsconfig.json b/types/zipcodes/tsconfig.json
new file mode 100644
index 0000000000..ff98ed05f8
--- /dev/null
+++ b/types/zipcodes/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "zipcodes-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/zipcodes/tslint.json b/types/zipcodes/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/zipcodes/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/zipcodes/zipcodes-tests.ts b/types/zipcodes/zipcodes-tests.ts
new file mode 100644
index 0000000000..43bb711474
--- /dev/null
+++ b/types/zipcodes/zipcodes-tests.ts
@@ -0,0 +1,36 @@
+import * as ZipCodes from 'zipcodes';
+
+const zipA: ZipCodes.ZipCode = {
+  zip: '90210',
+  latitude: 34.088808,
+  longitude: -118.406125,
+  city: 'Beverly Hills',
+  state: 'CA',
+  country: 'US'
+};
+
+const zipB: ZipCodes.ZipCode = {
+  zip: '95015',
+  latitude: 37.323,
+  longitude: -122.0527,
+  city: 'Cupertino',
+  state: 'CA',
+  country: 'US'
+};
+
+ZipCodes.lookup(zipA); // $ExpectType ZipCode
+
+ZipCodes.lookupByName('Cupertino', 'CA'); // $ExpectType ZipCode[]
+
+ZipCodes.lookupByState('CA'); // $ExpectType ZipCode[]
+
+ZipCodes.distance(zipA, zipB); // $ExpectType number
+
+ZipCodes.radius(zipA, 1, true); // $ExpectType string | ZipCode[]
+ZipCodes.radius(zipA, 1, false); // $ExpectType string | ZipCode[]
+
+ZipCodes.toMiles(3); // $ExpectType number
+
+ZipCodes.toKilometers(3); // $ExpectType number
+
+ZipCodes.lookupByCoords(37.323, -122.0527); // $ExpectType ZipCode
diff --git a/types/zmq/index.d.ts b/types/zmq/index.d.ts
index 910937c7c9..c1b321784f 100644
--- a/types/zmq/index.d.ts
+++ b/types/zmq/index.d.ts
@@ -44,7 +44,7 @@ interface SocketOptions {
     swap: number;
 }
 
-interface Socket extends EventEmitter {
+export class Socket implements EventEmitter {
     /**
      * Set `opt` to `val`.
      *
diff --git a/types/zmq/tslint.json b/types/zmq/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/zmq/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/zookeeper/index.d.ts b/types/zookeeper/index.d.ts
new file mode 100644
index 0000000000..92d1b06c96
--- /dev/null
+++ b/types/zookeeper/index.d.ts
@@ -0,0 +1,104 @@
+// Type definitions for zookeeper 3.4
+// Project: https://github.com/yfinkelstein/node-zookeeper#readme
+// Definitions by: xialeistudio <https://github.com/xialeistudio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+/// <reference types="node" />
+
+type ACL = number | { perms: number, scheme: string, auth: string };
+
+interface Stat {
+    czxid: number;
+    mzxid: number;
+    ctime: number;
+    mtime: number;
+    version: number;
+    cversion: number;
+    aversion: number;
+    ephemeralOwner: string;
+    dataLength: number;
+    numChildren: number;
+    pzxid: number;
+}
+
+interface ConnectionOptions {
+    connect?: string;
+    timeout?: number;
+    host_order_deterministic?: boolean;
+    data_as_buffer?: boolean;
+    debug_level?: number;
+}
+
+type child2_callback = (rc: number, error: string, children: string[], stat: Stat) => void;
+type watch_callback = (type: number, state: number, path: string) => void;
+type acl_callback = (rc: number, error: string, acl: ACL[], stat: Stat) => void;
+
+type Callback<T> = (rc: number, error: string, value: T) => void;
+export = Zookeeper;
+
+declare class Zookeeper extends Client {
+    constructor(options: ConnectionOptions);
+
+    connect(callback: (e: Error | null, client: Client) => void): void;
+
+    close(): void;
+}
+
+declare class Client {
+    client_id?: string;
+    client_password?: any;
+    state?: number;
+    timeout?: number;
+    is_unrecoverable?: boolean;
+
+    a_create(path: string, data: string | Buffer, flags: number, callback: Callback<string>): void;
+
+    mkdirp(path: string, callback: (e?: Error) => void): void;
+
+    a_exists(path: string, watch: boolean, callback: Callback<Stat>): void;
+
+    a_get(path: string, watch: boolean, callback: Callback<Buffer | string>): void;
+
+    a_get_children(path: string, watch: boolean, callback: Callback<string[]>): void;
+
+    a_get_children2(path: string, watch: boolean, callback: child2_callback): void;
+
+    a_set(path: string, data: Buffer | string, version: number, callback: Callback<Stat>): void;
+
+    a_delete_(path: string, version: number, callback: Callback<void>): void;
+
+    a_set_acl(path: string, version: number, acl: ACL[], callback: Callback<void>): void;
+
+    a_get_acl(path: string, callback: acl_callback): void;
+
+    add_auth(schema: string, auth: string, callback: Callback<void>): void;
+
+    aw_exists(path: string, watch_callback: watch_callback, callback: Callback<Stat>): void;
+
+    aw_get(path: string, watch_callback: watch_callback, callback: Callback<Buffer | string>): void;
+
+    aw_get_children(path: string, watch_callback: watch_callback, callback: Callback<string[]>): void;
+
+    aw_get_children2(path: string, watch_callback: watch_callback, callback: child2_callback): void;
+}
+
+declare namespace Zookeeper {
+    // log levels
+    const ZOO_LOG_LEVEL_ERROR = 1;
+    const ZOO_LOG_LEVEL_WARN = 2;
+    const ZOO_LOG_LEVEL_INFO = 3;
+    const ZOO_LOG_LEVEL_DEBUG = 4;
+    // acl permissions
+    const ZOO_OPEN_ACL_UNSAFE: number;
+    const ZOO_READ_ACL_UNSAFE: number;
+    const ZOO_CREATOR_ALL_ACL: number;
+    const ZOO_PERM_READ = 1;
+    const ZOO_PERM_WRITE = 2;
+    const ZOO_PERM_CREATE = 4;
+    const ZOO_PERM_DELETE = 8;
+    const ZOO_PERM_ADMIN = 16;
+    const ZOO_PERM_ALL = 31;
+    // Dunno
+    const ZOO_EPHEMERAL = 1;
+    const ZOO_SEQUENCE = 2;
+}
diff --git a/types/zookeeper/tsconfig.json b/types/zookeeper/tsconfig.json
new file mode 100644
index 0000000000..281f393e23
--- /dev/null
+++ b/types/zookeeper/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "zookeeper-tests.ts"
+    ]
+}
diff --git a/types/zookeeper/tslint.json b/types/zookeeper/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/zookeeper/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/zookeeper/zookeeper-tests.ts b/types/zookeeper/zookeeper-tests.ts
new file mode 100644
index 0000000000..63f4fe5d09
--- /dev/null
+++ b/types/zookeeper/zookeeper-tests.ts
@@ -0,0 +1,24 @@
+import ZooKeeper = require('zookeeper');
+
+const zk = new ZooKeeper({
+    connect: "localhost:2181",
+    timeout: 2000,
+    debug_level: ZooKeeper.ZOO_LOG_LEVEL_WARN,
+    host_order_deterministic: false,
+    data_as_buffer: true,
+});
+// test1
+zk.connect((e) => {
+    if (e) throw e;
+    console.log("zk session established, id=%s", zk.client_id);
+    zk.a_create("/node.js1", "some value", ZooKeeper.ZOO_SEQUENCE | ZooKeeper.ZOO_EPHEMERAL, (rc, error, path) => {
+        if (rc !== 0) {
+            console.log("zk node create result: %d, error: '%s', path=%s", rc, error, path);
+        } else {
+            console.log("created zk node %s", path);
+            process.nextTick(() => {
+                zk.close();
+            });
+        }
+    });
+});
diff --git a/types/zui/package.json b/types/zui/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/zui/package.json
+++ b/types/zui/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/zxcvbn/index.d.ts b/types/zxcvbn/index.d.ts
new file mode 100644
index 0000000000..da14a022eb
--- /dev/null
+++ b/types/zxcvbn/index.d.ts
@@ -0,0 +1,211 @@
+// Type definitions for zxcvbn 4.4
+// Project: https://github.com/dropbox/zxcvbn#readme
+// Definitions by: Matt Traynham <https://github.com/mtraynham>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace zxcvbn;
+
+export = zxcvbn;
+
+declare function zxcvbn(password: string, userInputs?: string[]): zxcvbn.ZXCVBNResult;
+
+declare namespace zxcvbn {
+    interface ZXCVBNResult {
+        /**
+         * estimated guesses needed to crack password
+         */
+        guesses: number;
+
+        /**
+         * order of magnitude of result.guesses
+         */
+        guesses_log10: number;
+
+        /**
+         * dictionary of back-of-the-envelope crack time
+         * estimations, in seconds, based on a few scenarios.
+         */
+        crack_times_seconds: ZXCVBNAttackTime;
+
+        /**
+         * same keys as result.crack_times_seconds,
+         * with friendlier display string values:
+         * "less than a second", "3 hours", "centuries", etc.
+         */
+        crack_times_display: ZXCVBNAttackTime;
+
+        /**
+         * Integer from 0-4 (useful for implementing a strength bar):
+         * 0 too guessable: risky password. (guesses < 10^3)
+         * 1 very guessable: protection from throttled online attacks. (guesses < 10^6)
+         * 2 somewhat guessable: protection from unthrottled online attacks. (guesses < 10^8)
+         * 3 safely unguessable: moderate protection from offline slow-hash scenario. (guesses < 10^10)
+         * 4 very unguessable: strong protection from offline slow-hash scenario. (guesses >= 10^10)
+         */
+        score: ZXCVBNScore;
+
+        /**
+         * verbal feedback to help choose better passwords. set when score <= 2.
+         */
+        feedback: ZXCVBNFeedback;
+
+        /**
+         * the list of patterns that zxcvbn based the
+         * guess calculation on.
+         */
+        sequence: ZXCVBNSequence[];
+
+        /**
+         * how long it took zxcvbn to calculate an answer,
+         * in milliseconds.
+         */
+        calc_time: number;
+    }
+
+    type ZXCVBNScore = 0 | 1 | 2 | 3 | 4;
+
+    interface ZXCVBNAttackTime {
+        /**
+         * online attack on a service that ratelimits password auth attempts.
+         */
+        online_throttling_100_per_hour: string | number;
+
+        /**
+         * online attack on a service that doesn't ratelimit,
+         * or where an attacker has outsmarted ratelimiting.
+         */
+        online_no_throttling_10_per_second: string | number;
+
+        /**
+         * offline attack. assumes multiple attackers,
+         * proper user-unique salting, and a slow hash function
+         * w/ moderate work factor, such as bcrypt, scrypt, PBKDF2.
+         */
+        offline_slow_hashing_1e4_per_second: string | number;
+
+        /**
+         * offline attack with user-unique salting but a fast hash
+         * function like SHA-1, SHA-256 or MD5. A wide range of
+         * reasonable numbers anywhere from one billion - one trillion
+         * guesses per second, depending on number of cores and machines.
+         * ballparking at 10B/sec.
+         */
+        offline_fast_hashing_1e10_per_second: string | number;
+    }
+
+    interface ZXCVBNFeedback {
+        /**
+         * explains what's wrong, eg. 'this is a top-10 common password'.
+         * not always set -- sometimes an empty string
+         */
+        warning: string;
+
+        /**
+         * a possibly-empty list of suggestions to help choose a less
+         * guessable password. eg. 'Add another word or two'
+         */
+        suggestions: string[];
+    }
+
+    interface ZXCVBNSequence {
+        /**
+         * if sequence is ascending.
+         */
+        ascending: boolean;
+
+        /**
+         * the base number of guesses.
+         */
+        base_guesses: number;
+
+        /**
+         * the base match to relate to.
+         */
+        base_matches: string;
+
+        /**
+         * the base token to relate to.
+         */
+        base_token: string;
+
+        /**
+         * the dictionary this sequence was found in.
+         */
+        dictionary_name: string;
+
+        /**
+         * estimated guesses needed to crack sequence.
+         */
+        guesses: number;
+
+        /**
+         * order of magnitude of guesses.
+         */
+        guesses_log10: number;
+
+        /**
+         * sequence index.
+         */
+        i: number;
+
+        /**
+         * sequence section number.
+         */
+        j: number;
+
+        /**
+         * is part of l33t speak.
+         */
+        l33t: boolean;
+
+        /**
+         * how many variations of l33t speak.
+         */
+        l33t_variations: number;
+
+        /**
+         * the word that was matched in dictionary.
+         */
+        matched_word: string;
+
+        /**
+         * what type of pattern the sequence contains.
+         */
+        pattern: string;
+
+        /**
+         * the rank of the sequence in the dictionary.
+         */
+        rank: number;
+
+        /**
+         * how many times the sequence is repeated.
+         */
+        repeat_count: number;
+
+        /**
+         * is reveresed.
+         */
+        reversed: boolean;
+
+        /**
+         * what type of sequence it is.
+         */
+        sequence_name: string;
+
+        /**
+         * how much space the sequence has left.
+         */
+        sequence_space: number;
+
+        /**
+         * the token the sequence is based off.
+         */
+        token: string;
+
+        /**
+         * uppercase variations of the token.
+         */
+        uppercase_variations: number;
+    }
+}
diff --git a/types/zxcvbn/tsconfig.json b/types/zxcvbn/tsconfig.json
new file mode 100644
index 0000000000..72bae94375
--- /dev/null
+++ b/types/zxcvbn/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "zxcvbn-tests.ts"
+    ]
+}
diff --git a/types/zxcvbn/tslint.json b/types/zxcvbn/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/zxcvbn/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/zxcvbn/zxcvbn-tests.ts b/types/zxcvbn/zxcvbn-tests.ts
new file mode 100644
index 0000000000..cf4a605864
--- /dev/null
+++ b/types/zxcvbn/zxcvbn-tests.ts
@@ -0,0 +1,14 @@
+import zxcvbn = require('zxcvbn');
+
+const testA: zxcvbn.ZXCVBNResult = zxcvbn('123456');
+const guesses: number = testA.guesses;
+const guessesLog10: number = testA.guesses_log10;
+const score: zxcvbn.ZXCVBNScore = testA.score;
+const calcTime: number = testA.calc_time;
+const crackTimeSeconds: zxcvbn.ZXCVBNAttackTime = testA.crack_times_seconds;
+const onlineThrottling100PerHour = crackTimeSeconds.online_throttling_100_per_hour;
+const feedback: zxcvbn.ZXCVBNFeedback = testA.feedback;
+const warning: string = feedback.warning;
+const suggestions: string[] = feedback.suggestions;
+
+const test2: zxcvbn.ZXCVBNResult = zxcvbn('123456', ['abc']);
diff --git a/types/zynga-scroller/index.d.ts b/types/zynga-scroller/index.d.ts
deleted file mode 100644
index 1ecf7e5f49..0000000000
--- a/types/zynga-scroller/index.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Type definitions for Zynga Scroller
-// Project: http://zynga.github.com/scroller/
-// Definitions by: Marcelo Haskell Camargo <https://github.com/haskellcamargo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class Scroller {
-  constructor(a: (left: number, top: number, zoom: number) => void, b?: {
-    scrollingX?: boolean;
-    scrollingY?: boolean;
-    animating?: boolean;
-    animationDuration?: number;
-    bouncing?: boolean;
-    locking?: boolean;
-    paging?: boolean;
-    snapping?: boolean;
-    zooming?: number;
-    minZoom?: number;
-    maxZoom?: number
-  });
-  setDimensions(clientWidth: number, clientHeight: number, contentWidth: number,
-    contentHeight: number): void;
-  setPosition(clientLeft: number, clientTop: number): void;
-  setSnapSize(width: number, height: number): void;
-  activatePullToRefresh<T>(height: number, activate: () => void,
-    deactivate: () => void, start: () => void): void;
-  finishPullToRefresh(): void;
-  getValues(): {
-    left: number;
-    top: number;
-    zoom: number
-  };
-  zoomTo(level: number, animate?: boolean, originLeft?: number,
-    originTop?: number): void;
-  zoomBy(factor: number, animate?: boolean, originLeft?: number,
-    originTop?: number): void;
-  scrollTo(left: number, top: number, animate?: boolean): void;
-  scrollBy(leftOffset: number, topOffset: number, animate?: boolean): void;
-  doMouseZoom(wheelData: number, timeStamp: number, pageX: number,
-    pageY: number): void;
-  doTouchStart(touches: {
-    pageX: number;
-    pageY: number
-  }, timeStamp: number): void;
-  doTouchMove(touches: {
-    pageX: number;
-    pageY: number
-  }, timeStamp: number, scale?: number): void;
-  doTouchMove(touches: [any], timeStamp: number): void;
-  doTouchEnd(timeStamp: number): void;
-}
\ No newline at end of file
diff --git a/types/zynga-scroller/tsconfig.json b/types/zynga-scroller/tsconfig.json
deleted file mode 100644
index 94cb1cf919..0000000000
--- a/types/zynga-scroller/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "zynga-scroller-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/zynga-scroller/zynga-scroller-tests.ts b/types/zynga-scroller/zynga-scroller-tests.ts
deleted file mode 100644
index 61f6008a33..0000000000
--- a/types/zynga-scroller/zynga-scroller-tests.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-var scroller: Scroller = new Scroller((left, top, zoom) => { });
-scroller = new Scroller((left, top, zoom) => { }, {
-  scrollingX: true,
-  scrollingY: true,
-  animating: true,
-  animationDuration: 400,
-  bouncing: false,
-  locking: false,
-  paging: false,
-  snapping: true,
-  zooming: 10,
-  minZoom: 1,
-  maxZoom: 2
-});
-
-scroller.setDimensions(10, 10, 10, 10);
-scroller.setPosition(200, 300);
-scroller.setSnapSize(300, 300);
-scroller.activatePullToRefresh(200, () => { }, () => { }, () => { });
-scroller.finishPullToRefresh();
-var data: {
-  left: number;
-  top: number;
-  zoom: number
-} = scroller.getValues();
-scroller.zoomTo(10);
-scroller.zoomBy(10);
-scroller.doMouseZoom(10, 10, 10, 10);
-scroller.doTouchStart({
-  pageX: 10,
-  pageY: 20
-}, 200);
-scroller.doTouchMove([10], 200);
-scroller.doTouchEnd(300);
\ No newline at end of file